diff --git a/.clang-format b/.clang-format new file mode 100644 index 0000000000..c7b900f060 --- /dev/null +++ b/.clang-format @@ -0,0 +1,23 @@ +IndentWidth: 4 +Language: Cpp +UseTab: Never +ColumnLimit: 120 +PointerAlignment: Left +BreakBeforeBraces: Attach +SpaceAfterCStyleCast: false +Cpp11BracedListStyle: false +IndentCaseLabels: true +BinPackArguments: true +BinPackParameters: true +AlignAfterOpenBracket: Align +AlignOperands: true +BreakBeforeTernaryOperators: true +BreakBeforeBinaryOperators: None +AllowShortBlocksOnASingleLine: true +AllowShortIfStatementsOnASingleLine: false +AllowShortLoopsOnASingleLine: false +AllowShortCaseLabelsOnASingleLine: false +AllowShortFunctionsOnASingleLine: false +AlignEscapedNewlines: Left +AlignTrailingComments: true +SortIncludes: false diff --git a/.clang-tidy b/.clang-tidy new file mode 100644 index 0000000000..4022a3f68a --- /dev/null +++ b/.clang-tidy @@ -0,0 +1,5 @@ +Checks: '-*,readability-braces-around-statements' +WarningsAsErrors: '' +HeaderFilterRegex: '(src|include)\/.*\.h$' +FormatStyle: 'file' +CheckOptions: diff --git a/.gitignore b/.gitignore index 76bc0fd81f..5f1493e3eb 100644 --- a/.gitignore +++ b/.gitignore @@ -17,12 +17,15 @@ baserom/ *.elf *.sra *.z64 +*.n64 +*.v64 *.map *.dump out.txt # Tool artifacts tools/ido7.1_compiler/* +tools/mipspro7.2_compiler/ tools/overlayhelpers/batchdisasm/output/* tools/overlayhelpers/batchdisasm/output2/* tools/overlayhelpers/batchdisasm/mipsdisasm/* @@ -41,4 +44,4 @@ tools/asmsplitter/c/* *.ci8.png #Per-user configuration -.python-version +.python-version \ No newline at end of file diff --git a/Jenkinsfile b/Jenkinsfile new file mode 100644 index 0000000000..f07d196083 --- /dev/null +++ b/Jenkinsfile @@ -0,0 +1,27 @@ +pipeline { + agent any + + stages { + stage('Setup') { + steps { + echo 'Setting up...' + sh 'cp /usr/local/etc/roms/baserom_oot.z64 baserom_original.z64' + sh 'git submodule update --init --recursive' + sh 'cp -r /usr/local/etc/ido/ido7.1_compiler tools/ido7.1_compiler' + sh 'chmod +x -R tools/ido*' + sh 'make -j`nproc` setup' + } + } + stage('Build') { + steps { + echo 'Building...' + sh 'make -j`nproc`' + } + } + } + post { + always { + cleanWs() + } + } +} diff --git a/README.md b/README.md index 47df5289e6..46f963b68a 100644 --- a/README.md +++ b/README.md @@ -14,8 +14,6 @@ This repo does not include all assets necessary for compiling the ROM. A prior c This is a disassembly and decompilation of Legend of Zelda: Ocarina of Time Master Quest (debug) It builds the following ROM: -* zelda_ocarina_mq_dbg.z64 `md5: 717179476af84133b14ff73af87db57a` +* zelda_ocarina_mq_dbg.z64 `md5: f0b7f35375f9cc8ca1b2d59d78e35405` -Please refer to the Getting Started guide in the Wiki for setup instructions. - -Thanks to z64me and CrookedPoe for their actor documentation. https://github.com/CrookedPoe/z64-rw +Please refer to the Getting Started guide in the Wiki for setup instructions. \ No newline at end of file diff --git a/THANKS.md b/THANKS.md new file mode 100644 index 0000000000..13b9dbc43e --- /dev/null +++ b/THANKS.md @@ -0,0 +1 @@ +Thanks to z64me and CrookedPoe for their actor documentation. https://github.com/CrookedPoe/z64-rw \ No newline at end of file diff --git a/asm/code_8008E4E0.s b/asm/code_8008E4E0.s deleted file mode 100644 index bea9204998..0000000000 --- a/asm/code_8008E4E0.s +++ /dev/null @@ -1,132 +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 purposee registers - -.section .text - -.align 4 - -glabel func_8008E4E0 -/* B05680 8008E4E0 AFA50004 */ sw $a1, 4($sp) -/* B05684 8008E4E4 AFA60008 */ sw $a2, 8($sp) -/* B05688 8008E4E8 00063400 */ sll $a2, $a2, 0x10 -/* B0568C 8008E4EC 00052C00 */ sll $a1, $a1, 0x10 -/* B05690 8008E4F0 00052C03 */ sra $a1, $a1, 0x10 -/* B05694 8008E4F4 00063403 */ sra $a2, $a2, 0x10 -/* B05698 8008E4F8 10A60007 */ beq $a1, $a2, .L8008E518 -/* B0569C 8008E4FC 00001825 */ move $v1, $zero -/* B056A0 8008E500 3C0E0001 */ lui $t6, 1 -/* B056A4 8008E504 01C47021 */ addu $t6, $t6, $a0 -/* B056A8 8008E508 8DCE1E08 */ lw $t6, 0x1e08($t6) -/* B056AC 8008E50C 000578C0 */ sll $t7, $a1, 3 -/* B056B0 8008E510 03E00008 */ jr $ra -/* B056B4 8008E514 01CF1021 */ addu $v0, $t6, $t7 -.L8008E518: -/* B056B8 8008E518 03E00008 */ jr $ra -/* B056BC 8008E51C 00601025 */ move $v0, $v1 - -glabel func_8008E520 -/* B056C0 8008E520 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* B056C4 8008E524 AFA60028 */ sw $a2, 0x28($sp) -/* B056C8 8008E528 00063400 */ sll $a2, $a2, 0x10 -/* B056CC 8008E52C 00063403 */ sra $a2, $a2, 0x10 -/* B056D0 8008E530 AFBF0014 */ sw $ra, 0x14($sp) -/* B056D4 8008E534 14A00005 */ bnez $a1, .L8008E54C -/* B056D8 8008E538 AFA7002C */ sw $a3, 0x2c($sp) -/* B056DC 8008E53C 3C01BF80 */ li $at, 0xBF800000 # 0.000000 -/* B056E0 8008E540 44810000 */ mtc1 $at, $f0 -/* B056E4 8008E544 1000002E */ b .L8008E600 -/* B056E8 8008E548 8FBF0014 */ lw $ra, 0x14($sp) -.L8008E54C: -/* B056EC 8008E54C 8CA30004 */ lw $v1, 4($a1) -/* B056F0 8008E550 3C198016 */ lui $t9, %hi(gSegments) -/* B056F4 8008E554 3C0100FF */ lui $at, (0x00FFFFFF >> 16) # lui $at, 0xff -/* B056F8 8008E558 00037100 */ sll $t6, $v1, 4 -/* B056FC 8008E55C 000E7F02 */ srl $t7, $t6, 0x1c -/* B05700 8008E560 000FC080 */ sll $t8, $t7, 2 -/* B05704 8008E564 0338C821 */ addu $t9, $t9, $t8 -/* B05708 8008E568 8F396FA8 */ lw $t9, %lo(gSegments)($t9) -/* B0570C 8008E56C 3421FFFF */ ori $at, (0x00FFFFFF & 0xFFFF) # ori $at, $at, 0xffff -/* B05710 8008E570 00614024 */ and $t0, $v1, $at -/* B05714 8008E574 00064880 */ sll $t1, $a2, 2 -/* B05718 8008E578 3C018000 */ lui $at, 0x8000 -/* B0571C 8008E57C 01264823 */ subu $t1, $t1, $a2 -/* B05720 8008E580 03281021 */ addu $v0, $t9, $t0 -/* B05724 8008E584 00411021 */ addu $v0, $v0, $at -/* B05728 8008E588 00094840 */ sll $t1, $t1, 1 -/* B0572C 8008E58C 01221021 */ addu $v0, $t1, $v0 -/* B05730 8008E590 844A0000 */ lh $t2, ($v0) -/* B05734 8008E594 844B0004 */ lh $t3, 4($v0) -/* B05738 8008E598 C4880024 */ lwc1 $f8, 0x24($a0) -/* B0573C 8008E59C 448A2000 */ mtc1 $t2, $f4 -/* B05740 8008E5A0 448B5000 */ mtc1 $t3, $f10 -/* B05744 8008E5A4 C492002C */ lwc1 $f18, 0x2c($a0) -/* B05748 8008E5A8 468021A0 */ cvt.s.w $f6, $f4 -/* B0574C 8008E5AC 46805420 */ cvt.s.w $f16, $f10 -/* B05750 8008E5B0 46083301 */ sub.s $f12, $f6, $f8 -/* B05754 8008E5B4 46128381 */ sub.s $f14, $f16, $f18 -/* B05758 8008E5B8 E7AC001C */ swc1 $f12, 0x1c($sp) -/* B0575C 8008E5BC 0C03F494 */ jal func_800FD250 -/* B05760 8008E5C0 E7AE0018 */ swc1 $f14, 0x18($sp) -/* B05764 8008E5C4 3C018014 */ lui $at, %hi(D_8013E760) -/* B05768 8008E5C8 C424E760 */ lwc1 $f4, %lo(D_8013E760)($at) -/* B0576C 8008E5CC C7AC001C */ lwc1 $f12, 0x1c($sp) -/* B05770 8008E5D0 C7AE0018 */ lwc1 $f14, 0x18($sp) -/* B05774 8008E5D4 46040182 */ mul.s $f6, $f0, $f4 -/* B05778 8008E5D8 8FAE002C */ lw $t6, 0x2c($sp) -/* B0577C 8008E5DC 460C6282 */ mul.s $f10, $f12, $f12 -/* B05780 8008E5E0 00000000 */ nop -/* B05784 8008E5E4 460E7402 */ mul.s $f16, $f14, $f14 -/* B05788 8008E5E8 4600320D */ trunc.w.s $f8, $f6 -/* B0578C 8008E5EC 46105000 */ add.s $f0, $f10, $f16 -/* B05790 8008E5F0 440D4000 */ mfc1 $t5, $f8 -/* B05794 8008E5F4 00000000 */ nop -/* B05798 8008E5F8 A5CD0000 */ sh $t5, ($t6) -/* B0579C 8008E5FC 8FBF0014 */ lw $ra, 0x14($sp) -.L8008E600: -/* B057A0 8008E600 27BD0020 */ addiu $sp, $sp, 0x20 -/* B057A4 8008E604 03E00008 */ jr $ra -/* B057A8 8008E608 00000000 */ nop - -glabel func_8008E60C -/* B057AC 8008E60C 10800022 */ beqz $a0, .L8008E698 -/* B057B0 8008E610 3C198016 */ lui $t9, %hi(gSegments) -/* B057B4 8008E614 8C830004 */ lw $v1, 4($a0) -/* B057B8 8008E618 908A0000 */ lbu $t2, ($a0) -/* B057BC 8008E61C 3C0100FF */ lui $at, (0x00FFFFFF >> 16) # lui $at, 0xff -/* B057C0 8008E620 00037100 */ sll $t6, $v1, 4 -/* B057C4 8008E624 000E7F02 */ srl $t7, $t6, 0x1c -/* B057C8 8008E628 000FC080 */ sll $t8, $t7, 2 -/* B057CC 8008E62C 0338C821 */ addu $t9, $t9, $t8 -/* B057D0 8008E630 8F396FA8 */ lw $t9, %lo(gSegments)($t9) -/* B057D4 8008E634 3421FFFF */ ori $at, (0x00FFFFFF & 0xFFFF) # ori $at, $at, 0xffff -/* B057D8 8008E638 00614024 */ and $t0, $v1, $at -/* B057DC 8008E63C 000A5880 */ sll $t3, $t2, 2 -/* B057E0 8008E640 016A5823 */ subu $t3, $t3, $t2 -/* B057E4 8008E644 000B5840 */ sll $t3, $t3, 1 -/* B057E8 8008E648 3C017FFF */ lui $at, (0x7FFFFFFA >> 16) # lui $at, 0x7fff -/* B057EC 8008E64C 03284821 */ addu $t1, $t9, $t0 -/* B057F0 8008E650 012B1021 */ addu $v0, $t1, $t3 -/* B057F4 8008E654 3421FFFA */ ori $at, (0x7FFFFFFA & 0xFFFF) # ori $at, $at, 0xfffa -/* B057F8 8008E658 00411021 */ addu $v0, $v0, $at -/* B057FC 8008E65C 844C0000 */ lh $t4, ($v0) -/* B05800 8008E660 448C2000 */ mtc1 $t4, $f4 -/* B05804 8008E664 00000000 */ nop -/* B05808 8008E668 468021A0 */ cvt.s.w $f6, $f4 -/* B0580C 8008E66C E4A60000 */ swc1 $f6, ($a1) -/* B05810 8008E670 844D0002 */ lh $t5, 2($v0) -/* B05814 8008E674 448D4000 */ mtc1 $t5, $f8 -/* B05818 8008E678 00000000 */ nop -/* B0581C 8008E67C 468042A0 */ cvt.s.w $f10, $f8 -/* B05820 8008E680 E4AA0004 */ swc1 $f10, 4($a1) -/* B05824 8008E684 844E0004 */ lh $t6, 4($v0) -/* B05828 8008E688 448E8000 */ mtc1 $t6, $f16 -/* B0582C 8008E68C 00000000 */ nop -/* B05830 8008E690 468084A0 */ cvt.s.w $f18, $f16 -/* B05834 8008E694 E4B20008 */ swc1 $f18, 8($a1) -.L8008E698: -/* B05838 8008E698 03E00008 */ jr $ra -/* B0583C 8008E69C 00000000 */ nop diff --git a/asm/code_80092500.s b/asm/code_80092500.s deleted file mode 100644 index c442fe4e0d..0000000000 --- a/asm/code_80092500.s +++ /dev/null @@ -1,1036 +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 purposee registers - -.section .text - -.align 4 - -glabel func_80092500 -/* B096A0 80092500 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* B096A4 80092504 AFBF0014 */ sw $ra, 0x14($sp) -/* B096A8 80092508 AFA40030 */ sw $a0, 0x30($sp) -/* B096AC 8009250C 00A03825 */ move $a3, $a1 -/* B096B0 80092510 AFA70034 */ sw $a3, 0x34($sp) -/* B096B4 80092514 00C02825 */ move $a1, $a2 -/* B096B8 80092518 0C01F097 */ jal func_8007C25C -/* B096BC 8009251C 27A40018 */ addiu $a0, $sp, 0x18 -/* B096C0 80092520 8FA70034 */ lw $a3, 0x34($sp) -/* B096C4 80092524 C7A60018 */ lwc1 $f6, 0x18($sp) -/* B096C8 80092528 C7B0001C */ lwc1 $f16, 0x1c($sp) -/* B096CC 8009252C C4E40000 */ lwc1 $f4, ($a3) -/* B096D0 80092530 27AE0024 */ addiu $t6, $sp, 0x24 -/* B096D4 80092534 8FA20030 */ lw $v0, 0x30($sp) -/* B096D8 80092538 46062200 */ add.s $f8, $f4, $f6 -/* B096DC 8009253C C7A60020 */ lwc1 $f6, 0x20($sp) -/* B096E0 80092540 E7A80024 */ swc1 $f8, 0x24($sp) -/* B096E4 80092544 C4EA0004 */ lwc1 $f10, 4($a3) -/* B096E8 80092548 46105480 */ add.s $f18, $f10, $f16 -/* B096EC 8009254C E7B20028 */ swc1 $f18, 0x28($sp) -/* B096F0 80092550 C4E40008 */ lwc1 $f4, 8($a3) -/* B096F4 80092554 46062200 */ add.s $f8, $f4, $f6 -/* B096F8 80092558 E7A8002C */ swc1 $f8, 0x2c($sp) -/* B096FC 8009255C 8DD80000 */ lw $t8, ($t6) -/* B09700 80092560 AC580000 */ sw $t8, ($v0) -/* B09704 80092564 8DCF0004 */ lw $t7, 4($t6) -/* B09708 80092568 AC4F0004 */ sw $t7, 4($v0) -/* B0970C 8009256C 8DD80008 */ lw $t8, 8($t6) -/* B09710 80092570 AC580008 */ sw $t8, 8($v0) -/* B09714 80092574 8FBF0014 */ lw $ra, 0x14($sp) -/* B09718 80092578 27BD0030 */ addiu $sp, $sp, 0x30 -/* B0971C 8009257C 03E00008 */ jr $ra -/* B09720 80092580 00000000 */ nop - -glabel func_80092584 -/* B09724 80092584 27BDFFA0 */ addiu $sp, $sp, -0x60 -/* B09728 80092588 AFBF0024 */ sw $ra, 0x24($sp) -/* B0972C 8009258C AFB10020 */ sw $s1, 0x20($sp) -/* B09730 80092590 AFB0001C */ sw $s0, 0x1c($sp) -/* B09734 80092594 F7B40010 */ sdc1 $f20, 0x10($sp) -/* B09738 80092598 AFA50064 */ sw $a1, 0x64($sp) -/* B0973C 8009259C AFA7006C */ sw $a3, 0x6c($sp) -/* B09740 800925A0 8C820004 */ lw $v0, 4($a0) -/* B09744 800925A4 848E001C */ lh $t6, 0x1c($a0) -/* B09748 800925A8 4486A000 */ mtc1 $a2, $f20 -/* B0974C 800925AC 00A03825 */ move $a3, $a1 -/* B09750 800925B0 00808025 */ move $s0, $a0 -/* B09754 800925B4 24460050 */ addiu $a2, $v0, 0x50 -/* B09758 800925B8 11C00031 */ beqz $t6, .L80092680 -/* B0975C 800925BC 2451005C */ addiu $s1, $v0, 0x5c -/* B09760 800925C0 44800000 */ mtc1 $zero, $f0 -/* B09764 800925C4 27A4003C */ addiu $a0, $sp, 0x3c -/* B09768 800925C8 02202825 */ move $a1, $s1 -/* B0976C 800925CC AFA70064 */ sw $a3, 0x64($sp) -/* B09770 800925D0 E7A0004C */ swc1 $f0, 0x4c($sp) -/* B09774 800925D4 E7A00050 */ swc1 $f0, 0x50($sp) -/* B09778 800925D8 0C01F124 */ jal func_8007C490 -/* B0977C 800925DC E7A00054 */ swc1 $f0, 0x54($sp) -/* B09780 800925E0 860F000C */ lh $t7, 0xc($s0) -/* B09784 800925E4 87B80040 */ lh $t8, 0x40($sp) -/* B09788 800925E8 87AA0042 */ lh $t2, 0x42($sp) -/* B0978C 800925EC 448F2000 */ mtc1 $t7, $f4 -/* B09790 800925F0 27B1004C */ addiu $s1, $sp, 0x4c -/* B09794 800925F4 02202025 */ move $a0, $s1 -/* B09798 800925F8 468021A0 */ cvt.s.w $f6, $f4 -/* B0979C 800925FC 02202825 */ move $a1, $s1 -/* B097A0 80092600 27A60044 */ addiu $a2, $sp, 0x44 -/* B097A4 80092604 46143202 */ mul.s $f8, $f6, $f20 -/* B097A8 80092608 E7A80044 */ swc1 $f8, 0x44($sp) -/* B097AC 8009260C 86190014 */ lh $t9, 0x14($s0) -/* B097B0 80092610 03194021 */ addu $t0, $t8, $t9 -/* B097B4 80092614 25094000 */ addiu $t1, $t0, 0x4000 -/* B097B8 80092618 A7A90048 */ sh $t1, 0x48($sp) -/* B097BC 8009261C 860B0016 */ lh $t3, 0x16($s0) -/* B097C0 80092620 014B6021 */ addu $t4, $t2, $t3 -/* B097C4 80092624 0C024940 */ jal func_80092500 -/* B097C8 80092628 A7AC004A */ sh $t4, 0x4a($sp) -/* B097CC 8009262C 860D000E */ lh $t5, 0xe($s0) -/* B097D0 80092630 C7B2006C */ lwc1 $f18, 0x6c($sp) -/* B097D4 80092634 87AE0040 */ lh $t6, 0x40($sp) -/* B097D8 80092638 448D5000 */ mtc1 $t5, $f10 -/* B097DC 8009263C 87B90042 */ lh $t9, 0x42($sp) -/* B097E0 80092640 02202025 */ move $a0, $s1 -/* B097E4 80092644 46805420 */ cvt.s.w $f16, $f10 -/* B097E8 80092648 02202825 */ move $a1, $s1 -/* B097EC 8009264C 27A60044 */ addiu $a2, $sp, 0x44 -/* B097F0 80092650 46128102 */ mul.s $f4, $f16, $f18 -/* B097F4 80092654 E7A40044 */ swc1 $f4, 0x44($sp) -/* B097F8 80092658 860F0014 */ lh $t7, 0x14($s0) -/* B097FC 8009265C 01CFC021 */ addu $t8, $t6, $t7 -/* B09800 80092660 A7B80048 */ sh $t8, 0x48($sp) -/* B09804 80092664 86080016 */ lh $t0, 0x16($s0) -/* B09808 80092668 03284821 */ addu $t1, $t9, $t0 -/* B0980C 8009266C 252A4000 */ addiu $t2, $t1, 0x4000 -/* B09810 80092670 0C024940 */ jal func_80092500 -/* B09814 80092674 A7AA004A */ sh $t2, 0x4a($sp) -/* B09818 80092678 1000001B */ b .L800926E8 -/* B0981C 8009267C 8FA70064 */ lw $a3, 0x64($sp) -.L80092680: -/* B09820 80092680 44800000 */ mtc1 $zero, $f0 -/* B09824 80092684 C7A4006C */ lwc1 $f4, 0x6c($sp) -/* B09828 80092688 27B1004C */ addiu $s1, $sp, 0x4c -/* B0982C 8009268C E7A0004C */ swc1 $f0, 0x4c($sp) -/* B09830 80092690 860B000C */ lh $t3, 0xc($s0) -/* B09834 80092694 E7A00054 */ swc1 $f0, 0x54($sp) -/* B09838 80092698 02202025 */ move $a0, $s1 -/* B0983C 8009269C 448B3000 */ mtc1 $t3, $f6 -/* B09840 800926A0 02202825 */ move $a1, $s1 -/* B09844 800926A4 27A60044 */ addiu $a2, $sp, 0x44 -/* B09848 800926A8 46803220 */ cvt.s.w $f8, $f6 -/* B0984C 800926AC 46144282 */ mul.s $f10, $f8, $f20 -/* B09850 800926B0 E7AA0050 */ swc1 $f10, 0x50($sp) -/* B09854 800926B4 860C000E */ lh $t4, 0xe($s0) -/* B09858 800926B8 448C8000 */ mtc1 $t4, $f16 -/* B0985C 800926BC 00000000 */ nop -/* B09860 800926C0 468084A0 */ cvt.s.w $f18, $f16 -/* B09864 800926C4 46049182 */ mul.s $f6, $f18, $f4 -/* B09868 800926C8 E7A60044 */ swc1 $f6, 0x44($sp) -/* B0986C 800926CC 860D0014 */ lh $t5, 0x14($s0) -/* B09870 800926D0 A7AD0048 */ sh $t5, 0x48($sp) -/* B09874 800926D4 860E0016 */ lh $t6, 0x16($s0) -/* B09878 800926D8 AFA70064 */ sw $a3, 0x64($sp) -/* B0987C 800926DC 0C024940 */ jal func_80092500 -/* B09880 800926E0 A7AE004A */ sh $t6, 0x4a($sp) -/* B09884 800926E4 8FA70064 */ lw $a3, 0x64($sp) -.L800926E8: -/* B09888 800926E8 8E380000 */ lw $t8, ($s1) -/* B0988C 800926EC 27A20030 */ addiu $v0, $sp, 0x30 -/* B09890 800926F0 8E2F0004 */ lw $t7, 4($s1) -/* B09894 800926F4 AC580000 */ sw $t8, ($v0) -/* B09898 800926F8 8E380008 */ lw $t8, 8($s1) -/* B0989C 800926FC 8C480000 */ lw $t0, ($v0) -/* B098A0 80092700 AC4F0004 */ sw $t7, 4($v0) -/* B098A4 80092704 AC580008 */ sw $t8, 8($v0) -/* B098A8 80092708 ACE8000C */ sw $t0, 0xc($a3) -/* B098AC 8009270C 8C590004 */ lw $t9, 4($v0) -/* B098B0 80092710 3C014700 */ li $at, 0x47000000 # 0.000000 -/* B098B4 80092714 44814000 */ mtc1 $at, $f8 -/* B098B8 80092718 ACF90010 */ sw $t9, 0x10($a3) -/* B098BC 8009271C 8C480008 */ lw $t0, 8($v0) -/* B098C0 80092720 46144282 */ mul.s $f10, $f8, $f20 -/* B098C4 80092724 ACE80014 */ sw $t0, 0x14($a3) -/* B098C8 80092728 8C4A0000 */ lw $t2, ($v0) -/* B098CC 8009272C ACEA0000 */ sw $t2, ($a3) -/* B098D0 80092730 4600540D */ trunc.w.s $f16, $f10 -/* B098D4 80092734 8C490004 */ lw $t1, 4($v0) -/* B098D8 80092738 ACE90004 */ sw $t1, 4($a3) -/* B098DC 8009273C 8C4A0008 */ lw $t2, 8($v0) -/* B098E0 80092740 440C8000 */ mfc1 $t4, $f16 -/* B098E4 80092744 ACEA0008 */ sw $t2, 8($a3) -/* B098E8 80092748 A4EC001A */ sh $t4, 0x1a($a3) -/* B098EC 8009274C 860D0012 */ lh $t5, 0x12($s0) -/* B098F0 80092750 448D9000 */ mtc1 $t5, $f18 -/* B098F4 80092754 00000000 */ nop -/* B098F8 80092758 46809120 */ cvt.s.w $f4, $f18 -/* B098FC 8009275C 46142182 */ mul.s $f6, $f4, $f20 -/* B09900 80092760 4600320D */ trunc.w.s $f8, $f6 -/* B09904 80092764 440F4000 */ mfc1 $t7, $f8 -/* B09908 80092768 00000000 */ nop -/* B0990C 8009276C A4EF0018 */ sh $t7, 0x18($a3) -/* B09910 80092770 86180010 */ lh $t8, 0x10($s0) -/* B09914 80092774 44985000 */ mtc1 $t8, $f10 -/* B09918 80092778 00000000 */ nop -/* B0991C 8009277C 46805420 */ cvt.s.w $f16, $f10 -/* B09920 80092780 46148482 */ mul.s $f18, $f16, $f20 -/* B09924 80092784 4600910D */ trunc.w.s $f4, $f18 -/* B09928 80092788 44082000 */ mfc1 $t0, $f4 -/* B0992C 8009278C 00000000 */ nop -/* B09930 80092790 A4E8001C */ sh $t0, 0x1c($a3) -/* B09934 80092794 8FBF0024 */ lw $ra, 0x24($sp) -/* B09938 80092798 8FB10020 */ lw $s1, 0x20($sp) -/* B0993C 8009279C 8FB0001C */ lw $s0, 0x1c($sp) -/* B09940 800927A0 D7B40010 */ ldc1 $f20, 0x10($sp) -/* B09944 800927A4 03E00008 */ jr $ra -/* B09948 800927A8 27BD0060 */ addiu $sp, $sp, 0x60 - -glabel func_800927AC -/* B0994C 800927AC 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* B09950 800927B0 AFBF001C */ sw $ra, 0x1c($sp) -/* B09954 800927B4 AFB00018 */ sw $s0, 0x18($sp) -/* B09958 800927B8 AFA5002C */ sw $a1, 0x2c($sp) -/* B0995C 800927BC 8483001E */ lh $v1, 0x1e($a0) -/* B09960 800927C0 00808025 */ move $s0, $a0 -/* B09964 800927C4 58600016 */ blezl $v1, .L80092820 -/* B09968 800927C8 8FBF001C */ lw $ra, 0x1c($sp) -/* B0996C 800927CC 848E001A */ lh $t6, 0x1a($a0) -/* B09970 800927D0 01C30019 */ multu $t6, $v1 -/* B09974 800927D4 00002012 */ mflo $a0 -/* B09978 800927D8 00042400 */ sll $a0, $a0, 0x10 -/* B0997C 800927DC 0C01DE1C */ jal Math_Sins -/* B09980 800927E0 00042403 */ sra $a0, $a0, 0x10 -/* B09984 800927E4 0C03F66B */ jal Math_Rand_ZeroOne -/* B09988 800927E8 E7A00020 */ swc1 $f0, 0x20($sp) -/* B0998C 800927EC C7A20020 */ lwc1 $f2, 0x20($sp) -/* B09990 800927F0 02002025 */ move $a0, $s0 -/* B09994 800927F4 8FA5002C */ lw $a1, 0x2c($sp) -/* B09998 800927F8 46020102 */ mul.s $f4, $f0, $f2 -/* B0999C 800927FC 44061000 */ mfc1 $a2, $f2 -/* B099A0 80092800 44072000 */ mfc1 $a3, $f4 -/* B099A4 80092804 0C024961 */ jal func_80092584 -/* B099A8 80092808 00000000 */ nop -/* B099AC 8009280C 860F001E */ lh $t7, 0x1e($s0) -/* B099B0 80092810 25F8FFFF */ addiu $t8, $t7, -1 -/* B099B4 80092814 A618001E */ sh $t8, 0x1e($s0) -/* B099B8 80092818 8603001E */ lh $v1, 0x1e($s0) -/* B099BC 8009281C 8FBF001C */ lw $ra, 0x1c($sp) -.L80092820: -/* B099C0 80092820 8FB00018 */ lw $s0, 0x18($sp) -/* B099C4 80092824 27BD0028 */ addiu $sp, $sp, 0x28 -/* B099C8 80092828 03E00008 */ jr $ra -/* B099CC 8009282C 00601025 */ move $v0, $v1 - -glabel func_80092830 -/* B099D0 80092830 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* B099D4 80092834 AFBF001C */ sw $ra, 0x1c($sp) -/* B099D8 80092838 AFB00018 */ sw $s0, 0x18($sp) -/* B099DC 8009283C AFA50024 */ sw $a1, 0x24($sp) -/* B099E0 80092840 8483001E */ lh $v1, 0x1e($a0) -/* B099E4 80092844 00808025 */ move $s0, $a0 -/* B099E8 80092848 58600011 */ blezl $v1, .L80092890 -/* B099EC 8009284C 8FBF001C */ lw $ra, 0x1c($sp) -/* B099F0 80092850 848E001A */ lh $t6, 0x1a($a0) -/* B099F4 80092854 01C30019 */ multu $t6, $v1 -/* B099F8 80092858 00002012 */ mflo $a0 -/* B099FC 8009285C 00042400 */ sll $a0, $a0, 0x10 -/* B09A00 80092860 0C01DE1C */ jal Math_Sins -/* B09A04 80092864 00042403 */ sra $a0, $a0, 0x10 -/* B09A08 80092868 44060000 */ mfc1 $a2, $f0 -/* B09A0C 8009286C 44070000 */ mfc1 $a3, $f0 -/* B09A10 80092870 02002025 */ move $a0, $s0 -/* B09A14 80092874 0C024961 */ jal func_80092584 -/* B09A18 80092878 8FA50024 */ lw $a1, 0x24($sp) -/* B09A1C 8009287C 860F001E */ lh $t7, 0x1e($s0) -/* B09A20 80092880 25F8FFFF */ addiu $t8, $t7, -1 -/* B09A24 80092884 A618001E */ sh $t8, 0x1e($s0) -/* B09A28 80092888 8603001E */ lh $v1, 0x1e($s0) -/* B09A2C 8009288C 8FBF001C */ lw $ra, 0x1c($sp) -.L80092890: -/* B09A30 80092890 8FB00018 */ lw $s0, 0x18($sp) -/* B09A34 80092894 27BD0020 */ addiu $sp, $sp, 0x20 -/* B09A38 80092898 03E00008 */ jr $ra -/* B09A3C 8009289C 00601025 */ move $v0, $v1 - -glabel func_800928A0 -/* B09A40 800928A0 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* B09A44 800928A4 AFBF001C */ sw $ra, 0x1c($sp) -/* B09A48 800928A8 AFB00018 */ sw $s0, 0x18($sp) -/* B09A4C 800928AC AFA5002C */ sw $a1, 0x2c($sp) -/* B09A50 800928B0 848E001E */ lh $t6, 0x1e($a0) -/* B09A54 800928B4 8498001A */ lh $t8, 0x1a($a0) -/* B09A58 800928B8 00808025 */ move $s0, $a0 -/* B09A5C 800928BC 25CFFFFF */ addiu $t7, $t6, -1 -/* B09A60 800928C0 A48F001E */ sh $t7, 0x1e($a0) -/* B09A64 800928C4 8499001E */ lh $t9, 0x1e($a0) -/* B09A68 800928C8 3328000F */ andi $t0, $t9, 0xf -/* B09A6C 800928CC 250901F4 */ addiu $t1, $t0, 0x1f4 -/* B09A70 800928D0 03090019 */ multu $t8, $t1 -/* B09A74 800928D4 00002012 */ mflo $a0 -/* B09A78 800928D8 00042400 */ sll $a0, $a0, 0x10 -/* B09A7C 800928DC 0C01DE1C */ jal Math_Sins -/* B09A80 800928E0 00042403 */ sra $a0, $a0, 0x10 -/* B09A84 800928E4 0C03F66B */ jal Math_Rand_ZeroOne -/* B09A88 800928E8 E7A00020 */ swc1 $f0, 0x20($sp) -/* B09A8C 800928EC C7A20020 */ lwc1 $f2, 0x20($sp) -/* B09A90 800928F0 02002025 */ move $a0, $s0 -/* B09A94 800928F4 8FA5002C */ lw $a1, 0x2c($sp) -/* B09A98 800928F8 46020102 */ mul.s $f4, $f0, $f2 -/* B09A9C 800928FC 44061000 */ mfc1 $a2, $f2 -/* B09AA0 80092900 44072000 */ mfc1 $a3, $f4 -/* B09AA4 80092904 0C024961 */ jal func_80092584 -/* B09AA8 80092908 00000000 */ nop -/* B09AAC 8009290C 8FBF001C */ lw $ra, 0x1c($sp) -/* B09AB0 80092910 8FB00018 */ lw $s0, 0x18($sp) -/* B09AB4 80092914 27BD0028 */ addiu $sp, $sp, 0x28 -/* B09AB8 80092918 03E00008 */ jr $ra -/* B09ABC 8009291C 24020001 */ li $v0, 1 - -glabel func_80092920 -/* B09AC0 80092920 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* B09AC4 80092924 AFBF001C */ sw $ra, 0x1c($sp) -/* B09AC8 80092928 AFB00018 */ sw $s0, 0x18($sp) -/* B09ACC 8009292C AFA50024 */ sw $a1, 0x24($sp) -/* B09AD0 80092930 8483001E */ lh $v1, 0x1e($a0) -/* B09AD4 80092934 00808025 */ move $s0, $a0 -/* B09AD8 80092938 5860001A */ blezl $v1, .L800929A4 -/* B09ADC 8009293C 8FBF001C */ lw $ra, 0x1c($sp) -/* B09AE0 80092940 848E001A */ lh $t6, 0x1a($a0) -/* B09AE4 80092944 01C30019 */ multu $t6, $v1 -/* B09AE8 80092948 00002012 */ mflo $a0 -/* B09AEC 8009294C 00042400 */ sll $a0, $a0, 0x10 -/* B09AF0 80092950 0C01DE1C */ jal Math_Sins -/* B09AF4 80092954 00042403 */ sra $a0, $a0, 0x10 -/* B09AF8 80092958 860F001E */ lh $t7, 0x1e($s0) -/* B09AFC 8009295C 86180002 */ lh $t8, 2($s0) -/* B09B00 80092960 02002025 */ move $a0, $s0 -/* B09B04 80092964 448F2000 */ mtc1 $t7, $f4 -/* B09B08 80092968 44984000 */ mtc1 $t8, $f8 -/* B09B0C 8009296C 8FA50024 */ lw $a1, 0x24($sp) -/* B09B10 80092970 468021A0 */ cvt.s.w $f6, $f4 -/* B09B14 80092974 468042A0 */ cvt.s.w $f10, $f8 -/* B09B18 80092978 460A3403 */ div.s $f16, $f6, $f10 -/* B09B1C 8009297C 46100082 */ mul.s $f2, $f0, $f16 -/* B09B20 80092980 44061000 */ mfc1 $a2, $f2 -/* B09B24 80092984 44071000 */ mfc1 $a3, $f2 -/* B09B28 80092988 0C024961 */ jal func_80092584 -/* B09B2C 8009298C 00000000 */ nop -/* B09B30 80092990 8619001E */ lh $t9, 0x1e($s0) -/* B09B34 80092994 2728FFFF */ addiu $t0, $t9, -1 -/* B09B38 80092998 A608001E */ sh $t0, 0x1e($s0) -/* B09B3C 8009299C 8603001E */ lh $v1, 0x1e($s0) -/* B09B40 800929A0 8FBF001C */ lw $ra, 0x1c($sp) -.L800929A4: -/* B09B44 800929A4 8FB00018 */ lw $s0, 0x18($sp) -/* B09B48 800929A8 27BD0020 */ addiu $sp, $sp, 0x20 -/* B09B4C 800929AC 03E00008 */ jr $ra -/* B09B50 800929B0 00601025 */ move $v0, $v1 - -glabel func_800929B4 -/* B09B54 800929B4 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* B09B58 800929B8 AFBF0014 */ sw $ra, 0x14($sp) -/* B09B5C 800929BC AFA50024 */ sw $a1, 0x24($sp) -/* B09B60 800929C0 8483001E */ lh $v1, 0x1e($a0) -/* B09B64 800929C4 58600013 */ blezl $v1, .L80092A14 -/* B09B68 800929C8 8FBF0014 */ lw $ra, 0x14($sp) -/* B09B6C 800929CC 0C03F66B */ jal Math_Rand_ZeroOne -/* B09B70 800929D0 AFA40020 */ sw $a0, 0x20($sp) -/* B09B74 800929D4 0C03F66B */ jal Math_Rand_ZeroOne -/* B09B78 800929D8 E7A0001C */ swc1 $f0, 0x1c($sp) -/* B09B7C 800929DC C7A2001C */ lwc1 $f2, 0x1c($sp) -/* B09B80 800929E0 8FA40020 */ lw $a0, 0x20($sp) -/* B09B84 800929E4 8FA50024 */ lw $a1, 0x24($sp) -/* B09B88 800929E8 46020102 */ mul.s $f4, $f0, $f2 -/* B09B8C 800929EC 44061000 */ mfc1 $a2, $f2 -/* B09B90 800929F0 44072000 */ mfc1 $a3, $f4 -/* B09B94 800929F4 0C024961 */ jal func_80092584 -/* B09B98 800929F8 00000000 */ nop -/* B09B9C 800929FC 8FA40020 */ lw $a0, 0x20($sp) -/* B09BA0 80092A00 848E001E */ lh $t6, 0x1e($a0) -/* B09BA4 80092A04 25CFFFFF */ addiu $t7, $t6, -1 -/* B09BA8 80092A08 A48F001E */ sh $t7, 0x1e($a0) -/* B09BAC 80092A0C 8483001E */ lh $v1, 0x1e($a0) -/* B09BB0 80092A10 8FBF0014 */ lw $ra, 0x14($sp) -.L80092A14: -/* B09BB4 80092A14 27BD0020 */ addiu $sp, $sp, 0x20 -/* B09BB8 80092A18 00601025 */ move $v0, $v1 -/* B09BBC 80092A1C 03E00008 */ jr $ra -/* B09BC0 80092A20 00000000 */ nop - -glabel func_80092A24 -/* B09BC4 80092A24 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* B09BC8 80092A28 AFBF001C */ sw $ra, 0x1c($sp) -/* B09BCC 80092A2C AFB00018 */ sw $s0, 0x18($sp) -/* B09BD0 80092A30 AFA5002C */ sw $a1, 0x2c($sp) -/* B09BD4 80092A34 8483001E */ lh $v1, 0x1e($a0) -/* B09BD8 80092A38 00808025 */ move $s0, $a0 -/* B09BDC 80092A3C 5860001A */ blezl $v1, .L80092AA8 -/* B09BE0 80092A40 8FBF001C */ lw $ra, 0x1c($sp) -/* B09BE4 80092A44 0C03F66B */ jal Math_Rand_ZeroOne -/* B09BE8 80092A48 00000000 */ nop -/* B09BEC 80092A4C 860E001E */ lh $t6, 0x1e($s0) -/* B09BF0 80092A50 860F0002 */ lh $t7, 2($s0) -/* B09BF4 80092A54 448E2000 */ mtc1 $t6, $f4 -/* B09BF8 80092A58 448F4000 */ mtc1 $t7, $f8 -/* B09BFC 80092A5C 468021A0 */ cvt.s.w $f6, $f4 -/* B09C00 80092A60 468042A0 */ cvt.s.w $f10, $f8 -/* B09C04 80092A64 460A3403 */ div.s $f16, $f6, $f10 -/* B09C08 80092A68 46100082 */ mul.s $f2, $f0, $f16 -/* B09C0C 80092A6C 0C03F66B */ jal Math_Rand_ZeroOne -/* B09C10 80092A70 E7A20024 */ swc1 $f2, 0x24($sp) -/* B09C14 80092A74 C7A20024 */ lwc1 $f2, 0x24($sp) -/* B09C18 80092A78 02002025 */ move $a0, $s0 -/* B09C1C 80092A7C 8FA5002C */ lw $a1, 0x2c($sp) -/* B09C20 80092A80 46020482 */ mul.s $f18, $f0, $f2 -/* B09C24 80092A84 44061000 */ mfc1 $a2, $f2 -/* B09C28 80092A88 44079000 */ mfc1 $a3, $f18 -/* B09C2C 80092A8C 0C024961 */ jal func_80092584 -/* B09C30 80092A90 00000000 */ nop -/* B09C34 80092A94 8618001E */ lh $t8, 0x1e($s0) -/* B09C38 80092A98 2719FFFF */ addiu $t9, $t8, -1 -/* B09C3C 80092A9C A619001E */ sh $t9, 0x1e($s0) -/* B09C40 80092AA0 8603001E */ lh $v1, 0x1e($s0) -/* B09C44 80092AA4 8FBF001C */ lw $ra, 0x1c($sp) -.L80092AA8: -/* B09C48 80092AA8 8FB00018 */ lw $s0, 0x18($sp) -/* B09C4C 80092AAC 27BD0028 */ addiu $sp, $sp, 0x28 -/* B09C50 80092AB0 03E00008 */ jr $ra -/* B09C54 80092AB4 00601025 */ move $v0, $v1 - -glabel func_80092AB8 -/* B09C58 80092AB8 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* B09C5C 80092ABC 3C028016 */ lui $v0, %hi(D_80160020) # $v0, 0x8016 -/* B09C60 80092AC0 AFBF0014 */ sw $ra, 0x14($sp) -/* B09C64 80092AC4 3C050001 */ lui $a1, 1 -/* B09C68 80092AC8 24420020 */ addiu $v0, %lo(D_80160020) # addiu $v0, $v0, 0x20 -/* B09C6C 80092ACC 8FA70018 */ lw $a3, 0x18($sp) -/* B09C70 80092AD0 00002025 */ move $a0, $zero -/* B09C74 80092AD4 24060004 */ li $a2, 4 -.L80092AD8: -/* B09C78 80092AD8 8C4E0008 */ lw $t6, 8($v0) -/* B09C7C 80092ADC 55C00005 */ bnezl $t6, .L80092AF4 -/* B09C80 80092AE0 8443001E */ lh $v1, 0x1e($v0) -/* B09C84 80092AE4 00803825 */ move $a3, $a0 -/* B09C88 80092AE8 1000000A */ b .L80092B14 -/* B09C8C 80092AEC 3C050002 */ lui $a1, 2 -/* B09C90 80092AF0 8443001E */ lh $v1, 0x1e($v0) -.L80092AF4: -/* B09C94 80092AF4 0065082A */ slt $at, $v1, $a1 -/* B09C98 80092AF8 50200004 */ beql $at, $zero, .L80092B0C -/* B09C9C 80092AFC 24840001 */ addiu $a0, $a0, 1 -/* B09CA0 80092B00 00602825 */ move $a1, $v1 -/* B09CA4 80092B04 00803825 */ move $a3, $a0 -/* B09CA8 80092B08 24840001 */ addiu $a0, $a0, 1 -.L80092B0C: -/* B09CAC 80092B0C 1486FFF2 */ bne $a0, $a2, .L80092AD8 -/* B09CB0 80092B10 24420024 */ addiu $v0, $v0, 0x24 -.L80092B14: -/* B09CB4 80092B14 3C010002 */ lui $at, 2 -/* B09CB8 80092B18 10A10006 */ beq $a1, $at, .L80092B34 -/* B09CBC 80092B1C 3C048014 */ lui $a0, %hi(D_8013E9E0) # $a0, 0x8014 -/* B09CC0 80092B20 2484E9E0 */ addiu $a0, %lo(D_8013E9E0) # addiu $a0, $a0, -0x1620 -/* B09CC4 80092B24 00E02825 */ move $a1, $a3 -/* B09CC8 80092B28 0C00084C */ jal osSyncPrintf -/* B09CCC 80092B2C AFA70018 */ sw $a3, 0x18($sp) -/* B09CD0 80092B30 8FA70018 */ lw $a3, 0x18($sp) -.L80092B34: -/* B09CD4 80092B34 8FBF0014 */ lw $ra, 0x14($sp) -/* B09CD8 80092B38 00071400 */ sll $v0, $a3, 0x10 -/* B09CDC 80092B3C 00021403 */ sra $v0, $v0, 0x10 -/* B09CE0 80092B40 03E00008 */ jr $ra -/* B09CE4 80092B44 27BD0020 */ addiu $sp, $sp, 0x20 - -glabel func_80092B48 -/* B09CE8 80092B48 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* B09CEC 80092B4C AFBF0014 */ sw $ra, 0x14($sp) -/* B09CF0 80092B50 AFA40020 */ sw $a0, 0x20($sp) -/* B09CF4 80092B54 0C024AAE */ jal func_80092AB8 -/* B09CF8 80092B58 AFA50024 */ sw $a1, 0x24($sp) -/* B09CFC 80092B5C 000270C0 */ sll $t6, $v0, 3 -/* B09D00 80092B60 01C27021 */ addu $t6, $t6, $v0 -/* B09D04 80092B64 3C0F8016 */ lui $t7, %hi(D_80160020) # $t7, 0x8016 -/* B09D08 80092B68 25EF0020 */ addiu $t7, %lo(D_80160020) # addiu $t7, $t7, 0x20 -/* B09D0C 80092B6C 000E7080 */ sll $t6, $t6, 2 -/* B09D10 80092B70 01CF2021 */ addu $a0, $t6, $t7 -/* B09D14 80092B74 A7A2001E */ sh $v0, 0x1e($sp) -/* B09D18 80092B78 AFA40018 */ sw $a0, 0x18($sp) -/* B09D1C 80092B7C 00002825 */ move $a1, $zero -/* B09D20 80092B80 0C041A18 */ jal func_80106860 -/* B09D24 80092B84 24060024 */ li $a2, 36 -/* B09D28 80092B88 8FA30018 */ lw $v1, 0x18($sp) -/* B09D2C 80092B8C 8FA40020 */ lw $a0, 0x20($sp) -/* B09D30 80092B90 24080001 */ li $t0, 1 -/* B09D34 80092B94 AC640004 */ sw $a0, 4($v1) -/* B09D38 80092B98 84980164 */ lh $t8, 0x164($a0) -/* B09D3C 80092B9C A4780020 */ sh $t8, 0x20($v1) -/* B09D40 80092BA0 8FB90024 */ lw $t9, 0x24($sp) -/* B09D44 80092BA4 A468001C */ sh $t0, 0x1c($v1) -/* B09D48 80092BA8 0C03F66B */ jal Math_Rand_ZeroOne -/* B09D4C 80092BAC AC790008 */ sw $t9, 8($v1) -/* B09D50 80092BB0 3C014780 */ li $at, 0x47800000 # 0.000000 -/* B09D54 80092BB4 44812000 */ mtc1 $at, $f4 -/* B09D58 80092BB8 87AE001E */ lh $t6, 0x1e($sp) -/* B09D5C 80092BBC 8FA20018 */ lw $v0, 0x18($sp) -/* B09D60 80092BC0 46040182 */ mul.s $f6, $f0, $f4 -/* B09D64 80092BC4 3C048012 */ lui $a0, %hi(D_80126254) # $a0, 0x8012 -/* B09D68 80092BC8 24846254 */ addiu $a0, %lo(D_80126254) # addiu $a0, $a0, 0x6254 -/* B09D6C 80092BCC 4600320D */ trunc.w.s $f8, $f6 -/* B09D70 80092BD0 440C4000 */ mfc1 $t4, $f8 -/* B09D74 80092BD4 00000000 */ nop -/* B09D78 80092BD8 318DFFFC */ andi $t5, $t4, 0xfffc -/* B09D7C 80092BDC 01AE7821 */ addu $t7, $t5, $t6 -/* B09D80 80092BE0 A44F0000 */ sh $t7, ($v0) -/* B09D84 80092BE4 84980000 */ lh $t8, ($a0) -/* B09D88 80092BE8 8FBF0014 */ lw $ra, 0x14($sp) -/* B09D8C 80092BEC 27BD0020 */ addiu $sp, $sp, 0x20 -/* B09D90 80092BF0 27190001 */ addiu $t9, $t8, 1 -/* B09D94 80092BF4 03E00008 */ jr $ra -/* B09D98 80092BF8 A4990000 */ sh $t9, ($a0) - -glabel func_80092BFC -/* B09D9C 80092BFC 3C028012 */ lui $v0, %hi(D_80126254) # $v0, 0x8012 -/* B09DA0 80092C00 240EFFFF */ li $t6, -1 -/* B09DA4 80092C04 24426254 */ addiu $v0, %lo(D_80126254) # addiu $v0, $v0, 0x6254 -/* B09DA8 80092C08 AC800008 */ sw $zero, 8($a0) -/* B09DAC 80092C0C A48E001E */ sh $t6, 0x1e($a0) -/* B09DB0 80092C10 844F0000 */ lh $t7, ($v0) -/* B09DB4 80092C14 25F8FFFF */ addiu $t8, $t7, -1 -/* B09DB8 80092C18 03E00008 */ jr $ra -/* B09DBC 80092C1C A4580000 */ sh $t8, ($v0) - -glabel func_80092C20 -/* B09DC0 80092C20 AFA40000 */ sw $a0, ($sp) -/* B09DC4 80092C24 00042400 */ sll $a0, $a0, 0x10 -/* B09DC8 80092C28 00042403 */ sra $a0, $a0, 0x10 -/* B09DCC 80092C2C 308E0003 */ andi $t6, $a0, 3 -/* B09DD0 80092C30 000E78C0 */ sll $t7, $t6, 3 -/* B09DD4 80092C34 01EE7821 */ addu $t7, $t7, $t6 -/* B09DD8 80092C38 3C188016 */ lui $t8, %hi(D_80160020) # $t8, 0x8016 -/* B09DDC 80092C3C 27180020 */ addiu $t8, %lo(D_80160020) # addiu $t8, $t8, 0x20 -/* B09DE0 80092C40 000F7880 */ sll $t7, $t7, 2 -/* B09DE4 80092C44 01F81821 */ addu $v1, $t7, $t8 -/* B09DE8 80092C48 8C790008 */ lw $t9, 8($v1) -/* B09DEC 80092C4C 57200004 */ bnezl $t9, .L80092C60 -/* B09DF0 80092C50 84680000 */ lh $t0, ($v1) -/* B09DF4 80092C54 03E00008 */ jr $ra -/* B09DF8 80092C58 00001025 */ move $v0, $zero -/* B09DFC 80092C5C 84680000 */ lh $t0, ($v1) -.L80092C60: -/* B09E00 80092C60 00601025 */ move $v0, $v1 -/* B09E04 80092C64 10880003 */ beq $a0, $t0, .L80092C74 -/* B09E08 80092C68 00000000 */ nop -/* B09E0C 80092C6C 03E00008 */ jr $ra -/* B09E10 80092C70 00001025 */ move $v0, $zero -.L80092C74: -/* B09E14 80092C74 03E00008 */ jr $ra -/* B09E18 80092C78 00000000 */ nop - -glabel func_80092C7C -/* B09E1C 80092C7C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* B09E20 80092C80 AFA5001C */ sw $a1, 0x1c($sp) -/* B09E24 80092C84 AFA60020 */ sw $a2, 0x20($sp) -/* B09E28 80092C88 00063400 */ sll $a2, $a2, 0x10 -/* B09E2C 80092C8C 00052C00 */ sll $a1, $a1, 0x10 -/* B09E30 80092C90 AFA40018 */ sw $a0, 0x18($sp) -/* B09E34 80092C94 00042400 */ sll $a0, $a0, 0x10 -/* B09E38 80092C98 00052C03 */ sra $a1, $a1, 0x10 -/* B09E3C 80092C9C 00063403 */ sra $a2, $a2, 0x10 -/* B09E40 80092CA0 AFBF0014 */ sw $ra, 0x14($sp) -/* B09E44 80092CA4 00042403 */ sra $a0, $a0, 0x10 -/* B09E48 80092CA8 A7A60022 */ sh $a2, 0x22($sp) -/* B09E4C 80092CAC 0C024B08 */ jal func_80092C20 -/* B09E50 80092CB0 A7A5001E */ sh $a1, 0x1e($sp) -/* B09E54 80092CB4 87A5001E */ lh $a1, 0x1e($sp) -/* B09E58 80092CB8 14400003 */ bnez $v0, .L80092CC8 -/* B09E5C 80092CBC 87A60022 */ lh $a2, 0x22($sp) -/* B09E60 80092CC0 10000036 */ b .L80092D9C -/* B09E64 80092CC4 00001025 */ move $v0, $zero -.L80092CC8: -/* B09E68 80092CC8 28A10081 */ slti $at, $a1, 0x81 -/* B09E6C 80092CCC 14200007 */ bnez $at, .L80092CEC -/* B09E70 80092CD0 24010100 */ li $at, 256 -/* B09E74 80092CD4 10A1002C */ beq $a1, $at, .L80092D88 -/* B09E78 80092CD8 24010200 */ li $at, 512 -/* B09E7C 80092CDC 50A1002F */ beql $a1, $at, .L80092D9C -/* B09E80 80092CE0 A446001C */ sh $a2, 0x1c($v0) -/* B09E84 80092CE4 1000002E */ b .L80092DA0 -/* B09E88 80092CE8 8FBF0014 */ lw $ra, 0x14($sp) -.L80092CEC: -/* B09E8C 80092CEC 28A10041 */ slti $at, $a1, 0x41 -/* B09E90 80092CF0 14200005 */ bnez $at, .L80092D08 -/* B09E94 80092CF4 24010080 */ li $at, 128 -/* B09E98 80092CF8 10A10021 */ beq $a1, $at, .L80092D80 -/* B09E9C 80092CFC 00000000 */ nop -/* B09EA0 80092D00 10000027 */ b .L80092DA0 -/* B09EA4 80092D04 8FBF0014 */ lw $ra, 0x14($sp) -.L80092D08: -/* B09EA8 80092D08 28A10021 */ slti $at, $a1, 0x21 -/* B09EAC 80092D0C 14200006 */ bnez $at, .L80092D28 -/* B09EB0 80092D10 24AEFFFF */ addiu $t6, $a1, -1 -/* B09EB4 80092D14 24010040 */ li $at, 64 -/* B09EB8 80092D18 10A10017 */ beq $a1, $at, .L80092D78 -/* B09EBC 80092D1C 00000000 */ nop -/* B09EC0 80092D20 1000001F */ b .L80092DA0 -/* B09EC4 80092D24 8FBF0014 */ lw $ra, 0x14($sp) -.L80092D28: -/* B09EC8 80092D28 2DC10020 */ sltiu $at, $t6, 0x20 -/* B09ECC 80092D2C 1020001B */ beqz $at, .L80092D9C -/* B09ED0 80092D30 000E7080 */ sll $t6, $t6, 2 -/* B09ED4 80092D34 3C018014 */ lui $at, %hi(jtbl_8013EA58) -/* B09ED8 80092D38 002E0821 */ addu $at, $at, $t6 -/* B09EDC 80092D3C 8C2EEA58 */ lw $t6, %lo(jtbl_8013EA58)($at) -/* B09EE0 80092D40 01C00008 */ jr $t6 -/* B09EE4 80092D44 00000000 */ nop -glabel L80092D48 -/* B09EE8 80092D48 10000014 */ b .L80092D9C -/* B09EEC 80092D4C A446001A */ sh $a2, 0x1a($v0) -glabel L80092D50 -/* B09EF0 80092D50 10000012 */ b .L80092D9C -/* B09EF4 80092D54 A446000C */ sh $a2, 0xc($v0) -glabel L80092D58 -/* B09EF8 80092D58 10000010 */ b .L80092D9C -/* B09EFC 80092D5C A446000E */ sh $a2, 0xe($v0) -glabel L80092D60 -/* B09F00 80092D60 1000000E */ b .L80092D9C -/* B09F04 80092D64 A4460010 */ sh $a2, 0x10($v0) -glabel L80092D68 -/* B09F08 80092D68 1000000C */ b .L80092D9C -/* B09F0C 80092D6C A4460012 */ sh $a2, 0x12($v0) -glabel L80092D70 -/* B09F10 80092D70 1000000A */ b .L80092D9C -/* B09F14 80092D74 A4460014 */ sh $a2, 0x14($v0) -.L80092D78: -/* B09F18 80092D78 10000008 */ b .L80092D9C -/* B09F1C 80092D7C A4460016 */ sh $a2, 0x16($v0) -.L80092D80: -/* B09F20 80092D80 10000006 */ b .L80092D9C -/* B09F24 80092D84 A4460018 */ sh $a2, 0x18($v0) -.L80092D88: -/* B09F28 80092D88 A446001E */ sh $a2, 0x1e($v0) -/* B09F2C 80092D8C 844F001E */ lh $t7, 0x1e($v0) -/* B09F30 80092D90 10000002 */ b .L80092D9C -/* B09F34 80092D94 A44F0002 */ sh $t7, 2($v0) -/* B09F38 80092D98 A446001C */ sh $a2, 0x1c($v0) -.L80092D9C: -glabel L80092D9C -/* B09F3C 80092D9C 8FBF0014 */ lw $ra, 0x14($sp) -.L80092DA0: -/* B09F40 80092DA0 27BD0018 */ addiu $sp, $sp, 0x18 -/* B09F44 80092DA4 03E00008 */ jr $ra -/* B09F48 80092DA8 00000000 */ nop - -glabel func_80092DAC -/* B09F4C 80092DAC 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* B09F50 80092DB0 AFA40018 */ sw $a0, 0x18($sp) -/* B09F54 80092DB4 00042400 */ sll $a0, $a0, 0x10 -/* B09F58 80092DB8 AFBF0014 */ sw $ra, 0x14($sp) -/* B09F5C 80092DBC 00042403 */ sra $a0, $a0, 0x10 -/* B09F60 80092DC0 0C024B08 */ jal func_80092C20 -/* B09F64 80092DC4 AFA5001C */ sw $a1, 0x1c($sp) -/* B09F68 80092DC8 10400004 */ beqz $v0, .L80092DDC -/* B09F6C 80092DCC 87AE001E */ lh $t6, 0x1e($sp) -/* B09F70 80092DD0 A44E001A */ sh $t6, 0x1a($v0) -/* B09F74 80092DD4 10000002 */ b .L80092DE0 -/* B09F78 80092DD8 24020001 */ li $v0, 1 -.L80092DDC: -/* B09F7C 80092DDC 00001025 */ move $v0, $zero -.L80092DE0: -/* B09F80 80092DE0 8FBF0014 */ lw $ra, 0x14($sp) -/* B09F84 80092DE4 27BD0018 */ addiu $sp, $sp, 0x18 -/* B09F88 80092DE8 03E00008 */ jr $ra -/* B09F8C 80092DEC 00000000 */ nop - -glabel func_80092DF0 -/* B09F90 80092DF0 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* B09F94 80092DF4 AFA40018 */ sw $a0, 0x18($sp) -/* B09F98 80092DF8 00042400 */ sll $a0, $a0, 0x10 -/* B09F9C 80092DFC AFBF0014 */ sw $ra, 0x14($sp) -/* B09FA0 80092E00 00042403 */ sra $a0, $a0, 0x10 -/* B09FA4 80092E04 0C024B08 */ jal func_80092C20 -/* B09FA8 80092E08 AFA5001C */ sw $a1, 0x1c($sp) -/* B09FAC 80092E0C 10400006 */ beqz $v0, .L80092E28 -/* B09FB0 80092E10 87AE001E */ lh $t6, 0x1e($sp) -/* B09FB4 80092E14 A44E001E */ sh $t6, 0x1e($v0) -/* B09FB8 80092E18 844F001E */ lh $t7, 0x1e($v0) -/* B09FBC 80092E1C A44F0002 */ sh $t7, 2($v0) -/* B09FC0 80092E20 10000002 */ b .L80092E2C -/* B09FC4 80092E24 24020001 */ li $v0, 1 -.L80092E28: -/* B09FC8 80092E28 00001025 */ move $v0, $zero -.L80092E2C: -/* B09FCC 80092E2C 8FBF0014 */ lw $ra, 0x14($sp) -/* B09FD0 80092E30 27BD0018 */ addiu $sp, $sp, 0x18 -/* B09FD4 80092E34 03E00008 */ jr $ra -/* B09FD8 80092E38 00000000 */ nop - -glabel func_80092E3C -/* B09FDC 80092E3C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* B09FE0 80092E40 AFA40018 */ sw $a0, 0x18($sp) -/* B09FE4 80092E44 00042400 */ sll $a0, $a0, 0x10 -/* B09FE8 80092E48 AFBF0014 */ sw $ra, 0x14($sp) -/* B09FEC 80092E4C 0C024B08 */ jal func_80092C20 -/* B09FF0 80092E50 00042403 */ sra $a0, $a0, 0x10 -/* B09FF4 80092E54 10400003 */ beqz $v0, .L80092E64 -/* B09FF8 80092E58 8FBF0014 */ lw $ra, 0x14($sp) -/* B09FFC 80092E5C 10000002 */ b .L80092E68 -/* B0A000 80092E60 8442001E */ lh $v0, 0x1e($v0) -.L80092E64: -/* B0A004 80092E64 00001025 */ move $v0, $zero -.L80092E68: -/* B0A008 80092E68 03E00008 */ jr $ra -/* B0A00C 80092E6C 27BD0018 */ addiu $sp, $sp, 0x18 - -glabel func_80092E70 -/* B0A010 80092E70 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* B0A014 80092E74 AFA40018 */ sw $a0, 0x18($sp) -/* B0A018 80092E78 00042400 */ sll $a0, $a0, 0x10 -/* B0A01C 80092E7C AFBF0014 */ sw $ra, 0x14($sp) -/* B0A020 80092E80 00042403 */ sra $a0, $a0, 0x10 -/* B0A024 80092E84 AFA5001C */ sw $a1, 0x1c($sp) -/* B0A028 80092E88 AFA60020 */ sw $a2, 0x20($sp) -/* B0A02C 80092E8C 0C024B08 */ jal func_80092C20 -/* B0A030 80092E90 AFA70024 */ sw $a3, 0x24($sp) -/* B0A034 80092E94 1040000A */ beqz $v0, .L80092EC0 -/* B0A038 80092E98 87AE001E */ lh $t6, 0x1e($sp) -/* B0A03C 80092E9C A44E000C */ sh $t6, 0xc($v0) -/* B0A040 80092EA0 87AF0022 */ lh $t7, 0x22($sp) -/* B0A044 80092EA4 A44F000E */ sh $t7, 0xe($v0) -/* B0A048 80092EA8 87B80026 */ lh $t8, 0x26($sp) -/* B0A04C 80092EAC A4580010 */ sh $t8, 0x10($v0) -/* B0A050 80092EB0 87B9002A */ lh $t9, 0x2a($sp) -/* B0A054 80092EB4 A4590012 */ sh $t9, 0x12($v0) -/* B0A058 80092EB8 10000002 */ b .L80092EC4 -/* B0A05C 80092EBC 24020001 */ li $v0, 1 -.L80092EC0: -/* B0A060 80092EC0 00001025 */ move $v0, $zero -.L80092EC4: -/* B0A064 80092EC4 8FBF0014 */ lw $ra, 0x14($sp) -/* B0A068 80092EC8 27BD0018 */ addiu $sp, $sp, 0x18 -/* B0A06C 80092ECC 03E00008 */ jr $ra -/* B0A070 80092ED0 00000000 */ nop - -glabel func_80092ED4 -/* B0A074 80092ED4 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* B0A078 80092ED8 AFA40018 */ sw $a0, 0x18($sp) -/* B0A07C 80092EDC 00042400 */ sll $a0, $a0, 0x10 -/* B0A080 80092EE0 AFBF0014 */ sw $ra, 0x14($sp) -/* B0A084 80092EE4 00042403 */ sra $a0, $a0, 0x10 -/* B0A088 80092EE8 AFA5001C */ sw $a1, 0x1c($sp) -/* B0A08C 80092EEC AFA60020 */ sw $a2, 0x20($sp) -/* B0A090 80092EF0 0C024B08 */ jal func_80092C20 -/* B0A094 80092EF4 AFA70024 */ sw $a3, 0x24($sp) -/* B0A098 80092EF8 1040000A */ beqz $v0, .L80092F24 -/* B0A09C 80092EFC 87AE001E */ lh $t6, 0x1e($sp) -/* B0A0A0 80092F00 A44E001C */ sh $t6, 0x1c($v0) -/* B0A0A4 80092F04 27AF0020 */ addiu $t7, $sp, 0x20 -/* B0A0A8 80092F08 8DF90000 */ lw $t9, ($t7) -/* B0A0AC 80092F0C A8590014 */ swl $t9, 0x14($v0) -/* B0A0B0 80092F10 B8590017 */ swr $t9, 0x17($v0) -/* B0A0B4 80092F14 95F90004 */ lhu $t9, 4($t7) -/* B0A0B8 80092F18 A4590018 */ sh $t9, 0x18($v0) -/* B0A0BC 80092F1C 10000002 */ b .L80092F28 -/* B0A0C0 80092F20 24020001 */ li $v0, 1 -.L80092F24: -/* B0A0C4 80092F24 00001025 */ move $v0, $zero -.L80092F28: -/* B0A0C8 80092F28 8FBF0014 */ lw $ra, 0x14($sp) -/* B0A0CC 80092F2C 27BD0018 */ addiu $sp, $sp, 0x18 -/* B0A0D0 80092F30 03E00008 */ jr $ra -/* B0A0D4 80092F34 00000000 */ nop - -glabel func_80092F38 -/* B0A0D8 80092F38 3C048016 */ lui $a0, %hi(D_80160020) # $a0, 0x8016 -/* B0A0DC 80092F3C 24840020 */ addiu $a0, %lo(D_80160020) # addiu $a0, $a0, 0x20 -/* B0A0E0 80092F40 00001025 */ move $v0, $zero -/* B0A0E4 80092F44 24050024 */ li $a1, 36 -.L80092F48: -/* B0A0E8 80092F48 00450019 */ multu $v0, $a1 -/* B0A0EC 80092F4C 24420001 */ addiu $v0, $v0, 1 -/* B0A0F0 80092F50 00021400 */ sll $v0, $v0, 0x10 -/* B0A0F4 80092F54 00021403 */ sra $v0, $v0, 0x10 -/* B0A0F8 80092F58 28410004 */ slti $at, $v0, 4 -/* B0A0FC 80092F5C 00007012 */ mflo $t6 -/* B0A100 80092F60 008E1821 */ addu $v1, $a0, $t6 -/* B0A104 80092F64 AC600008 */ sw $zero, 8($v1) -/* B0A108 80092F68 1420FFF7 */ bnez $at, .L80092F48 -/* B0A10C 80092F6C A460001E */ sh $zero, 0x1e($v1) -/* B0A110 80092F70 240F0001 */ li $t7, 1 -/* B0A114 80092F74 3C018012 */ lui $at, %hi(D_80126250) # $at, 0x8012 -/* B0A118 80092F78 A42F6250 */ sh $t7, %lo(D_80126250)($at) -/* B0A11C 80092F7C 3C018012 */ lui $at, %hi(D_80126254) -/* B0A120 80092F80 03E00008 */ jr $ra -/* B0A124 80092F84 A4206254 */ sh $zero, %lo(D_80126254)($at) - -glabel func_80092F88 -/* B0A128 80092F88 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* B0A12C 80092F8C AFBF0014 */ sw $ra, 0x14($sp) -/* B0A130 80092F90 0C024AD2 */ jal func_80092B48 -/* B0A134 80092F94 00000000 */ nop -/* B0A138 80092F98 8FBF0014 */ lw $ra, 0x14($sp) -/* B0A13C 80092F9C 84420000 */ lh $v0, ($v0) -/* B0A140 80092FA0 27BD0018 */ addiu $sp, $sp, 0x18 -/* B0A144 80092FA4 03E00008 */ jr $ra -/* B0A148 80092FA8 00000000 */ nop - -glabel func_80092FAC -/* B0A14C 80092FAC 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* B0A150 80092FB0 AFA40018 */ sw $a0, 0x18($sp) -/* B0A154 80092FB4 00042400 */ sll $a0, $a0, 0x10 -/* B0A158 80092FB8 AFBF0014 */ sw $ra, 0x14($sp) -/* B0A15C 80092FBC 0C024B08 */ jal func_80092C20 -/* B0A160 80092FC0 00042403 */ sra $a0, $a0, 0x10 -/* B0A164 80092FC4 10400005 */ beqz $v0, .L80092FDC -/* B0A168 80092FC8 00402025 */ move $a0, $v0 -/* B0A16C 80092FCC 0C024AFF */ jal func_80092BFC -/* B0A170 80092FD0 00000000 */ nop -/* B0A174 80092FD4 10000002 */ b .L80092FE0 -/* B0A178 80092FD8 24020001 */ li $v0, 1 -.L80092FDC: -/* B0A17C 80092FDC 00001025 */ move $v0, $zero -.L80092FE0: -/* B0A180 80092FE0 8FBF0014 */ lw $ra, 0x14($sp) -/* B0A184 80092FE4 27BD0018 */ addiu $sp, $sp, 0x18 -/* B0A188 80092FE8 03E00008 */ jr $ra -/* B0A18C 80092FEC 00000000 */ nop - -glabel func_80092FF0 -/* B0A190 80092FF0 27BDFF48 */ addiu $sp, $sp, -0xb8 -/* B0A194 80092FF4 44800000 */ mtc1 $zero, $f0 -/* B0A198 80092FF8 AFBF004C */ sw $ra, 0x4c($sp) -/* B0A19C 80092FFC AFB40048 */ sw $s4, 0x48($sp) -/* B0A1A0 80093000 AFB30044 */ sw $s3, 0x44($sp) -/* B0A1A4 80093004 AFB20040 */ sw $s2, 0x40($sp) -/* B0A1A8 80093008 AFB1003C */ sw $s1, 0x3c($sp) -/* B0A1AC 8009300C AFB00038 */ sw $s0, 0x38($sp) -/* B0A1B0 80093010 F7BA0030 */ sdc1 $f26, 0x30($sp) -/* B0A1B4 80093014 F7B80028 */ sdc1 $f24, 0x28($sp) -/* B0A1B8 80093018 F7B60020 */ sdc1 $f22, 0x20($sp) -/* B0A1BC 8009301C F7B40018 */ sdc1 $f20, 0x18($sp) -/* B0A1C0 80093020 AFA400B8 */ sw $a0, 0xb8($sp) -/* B0A1C4 80093024 8C8F008C */ lw $t7, 0x8c($a0) -/* B0A1C8 80093028 E7A00068 */ swc1 $f0, 0x68($sp) -/* B0A1CC 8009302C E7A0006C */ swc1 $f0, 0x6c($sp) -/* B0A1D0 80093030 E7A00070 */ swc1 $f0, 0x70($sp) -/* B0A1D4 80093034 AFAF0064 */ sw $t7, 0x64($sp) -/* B0A1D8 80093038 A4A00018 */ sh $zero, 0x18($a1) -/* B0A1DC 8009303C A4A0001A */ sh $zero, 0x1a($a1) -/* B0A1E0 80093040 A4A0001C */ sh $zero, 0x1c($a1) -/* B0A1E4 80093044 3C188012 */ lui $t8, %hi(D_80126254) # $t8, 0x8012 -/* B0A1E8 80093048 E4A00000 */ swc1 $f0, ($a1) -/* B0A1EC 8009304C E4A00004 */ swc1 $f0, 4($a1) -/* B0A1F0 80093050 E4A00008 */ swc1 $f0, 8($a1) -/* B0A1F4 80093054 E4A0000C */ swc1 $f0, 0xc($a1) -/* B0A1F8 80093058 E4A00010 */ swc1 $f0, 0x10($a1) -/* B0A1FC 8009305C E4A00014 */ swc1 $f0, 0x14($a1) -/* B0A200 80093060 E4A00020 */ swc1 $f0, 0x20($a1) -/* B0A204 80093064 87186254 */ lh $t8, %lo(D_80126254)($t8) -/* B0A208 80093068 00A08025 */ move $s0, $a1 -/* B0A20C 8009306C 00009025 */ move $s2, $zero -/* B0A210 80093070 17000003 */ bnez $t8, .L80093080 -/* B0A214 80093074 3C118016 */ lui $s1, %hi(D_80160020) # $s1, 0x8016 -/* B0A218 80093078 100000AE */ b .L80093334 -/* B0A21C 8009307C 00001025 */ move $v0, $zero -.L80093080: -/* B0A220 80093080 3C018014 */ lui $at, %hi(D_8013EAD8) -/* B0A224 80093084 C43AEAD8 */ lwc1 $f26, %lo(D_8013EAD8)($at) -/* B0A228 80093088 26310020 */ addiu $s1, %lo(D_80160020) # addiu $s1, $s1, 0x20 -/* B0A22C 8009308C 27B40068 */ addiu $s4, $sp, 0x68 -/* B0A230 80093090 27B3008C */ addiu $s3, $sp, 0x8c -/* B0A234 80093094 8E260008 */ lw $a2, 8($s1) -.L80093098: -/* B0A238 80093098 10C0009F */ beqz $a2, .L80093318 -/* B0A23C 8009309C 00000000 */ nop -/* B0A240 800930A0 86250020 */ lh $a1, 0x20($s1) -/* B0A244 800930A4 8FB90064 */ lw $t9, 0x64($sp) -/* B0A248 800930A8 3C048014 */ lui $a0, %hi(D_8013EA20) -/* B0A24C 800930AC 00054080 */ sll $t0, $a1, 2 -/* B0A250 800930B0 03284821 */ addu $t1, $t9, $t0 -/* B0A254 800930B4 8D2A0790 */ lw $t2, 0x790($t1) -/* B0A258 800930B8 8FAD00B8 */ lw $t5, 0xb8($sp) -/* B0A25C 800930BC 55400008 */ bnezl $t2, .L800930E0 -/* B0A260 800930C0 8E2B0004 */ lw $t3, 4($s1) -/* B0A264 800930C4 0C00084C */ jal osSyncPrintf -/* B0A268 800930C8 2484EA20 */ addiu $a0, %lo(D_8013EA20) # addiu $a0, $a0, -0x15e0 -/* B0A26C 800930CC 0C024AFF */ jal func_80092BFC -/* B0A270 800930D0 02202025 */ move $a0, $s1 -/* B0A274 800930D4 10000090 */ b .L80093318 -/* B0A278 800930D8 00000000 */ nop -/* B0A27C 800930DC 8E2B0004 */ lw $t3, 4($s1) -.L800930E0: -/* B0A280 800930E0 85AE0164 */ lh $t6, 0x164($t5) -/* B0A284 800930E4 8622001A */ lh $v0, 0x1a($s1) -/* B0A288 800930E8 856C0164 */ lh $t4, 0x164($t3) -/* B0A28C 800930EC 00021823 */ negu $v1, $v0 -/* B0A290 800930F0 018E3826 */ xor $a3, $t4, $t6 -/* B0A294 800930F4 04400003 */ bltz $v0, .L80093104 -/* B0A298 800930F8 0007382B */ sltu $a3, $zero, $a3 -/* B0A29C 800930FC 10000001 */ b .L80093104 -/* B0A2A0 80093100 00401825 */ move $v1, $v0 -.L80093104: -/* B0A2A4 80093104 44832000 */ mtc1 $v1, $f4 -/* B0A2A8 80093108 3C014700 */ li $at, 0x47000000 # 0.000000 -/* B0A2AC 8009310C 44814000 */ mtc1 $at, $f8 -/* B0A2B0 80093110 468021A0 */ cvt.s.w $f6, $f4 -/* B0A2B4 80093114 00067880 */ sll $t7, $a2, 2 -/* B0A2B8 80093118 3C198012 */ lui $t9, %hi(D_80126258) -/* B0A2BC 8009311C 032FC821 */ addu $t9, $t9, $t7 -/* B0A2C0 80093120 8F396258 */ lw $t9, %lo(D_80126258)($t9) -/* B0A2C4 80093124 02202025 */ move $a0, $s1 -/* B0A2C8 80093128 46083583 */ div.s $f22, $f6, $f8 -/* B0A2CC 8009312C 02602825 */ move $a1, $s3 -/* B0A2D0 80093130 AFA70074 */ sw $a3, 0x74($sp) -/* B0A2D4 80093134 0320F809 */ jalr $t9 -/* B0A2D8 80093138 4600B606 */ mov.s $f24, $f22 -/* B0A2DC 8009313C 14400005 */ bnez $v0, .L80093154 -/* B0A2E0 80093140 8FA70074 */ lw $a3, 0x74($sp) -/* B0A2E4 80093144 0C024AFF */ jal func_80092BFC -/* B0A2E8 80093148 02202025 */ move $a0, $s1 -/* B0A2EC 8009314C 10000072 */ b .L80093318 -/* B0A2F0 80093150 00000000 */ nop -.L80093154: -/* B0A2F4 80093154 14E00070 */ bnez $a3, .L80093318 -/* B0A2F8 80093158 02602025 */ move $a0, $s3 -/* B0A2FC 8009315C C6000000 */ lwc1 $f0, ($s0) -/* B0A300 80093160 C7AA008C */ lwc1 $f10, 0x8c($sp) -/* B0A304 80093164 46000085 */ abs.s $f2, $f0 -/* B0A308 80093168 46005005 */ abs.s $f0, $f10 -/* B0A30C 8009316C 4600103C */ c.lt.s $f2, $f0 -/* B0A310 80093170 00000000 */ nop -/* B0A314 80093174 45020003 */ bc1fl .L80093184 -/* B0A318 80093178 C6000004 */ lwc1 $f0, 4($s0) -/* B0A31C 8009317C E60A0000 */ swc1 $f10, ($s0) -/* B0A320 80093180 C6000004 */ lwc1 $f0, 4($s0) -.L80093184: -/* B0A324 80093184 C7B00090 */ lwc1 $f16, 0x90($sp) -/* B0A328 80093188 46000085 */ abs.s $f2, $f0 -/* B0A32C 8009318C 46008005 */ abs.s $f0, $f16 -/* B0A330 80093190 4600103C */ c.lt.s $f2, $f0 -/* B0A334 80093194 00000000 */ nop -/* B0A338 80093198 45020003 */ bc1fl .L800931A8 -/* B0A33C 8009319C C6000008 */ lwc1 $f0, 8($s0) -/* B0A340 800931A0 E6100004 */ swc1 $f16, 4($s0) -/* B0A344 800931A4 C6000008 */ lwc1 $f0, 8($s0) -.L800931A8: -/* B0A348 800931A8 C7B20094 */ lwc1 $f18, 0x94($sp) -/* B0A34C 800931AC 46000085 */ abs.s $f2, $f0 -/* B0A350 800931B0 46009005 */ abs.s $f0, $f18 -/* B0A354 800931B4 4600103C */ c.lt.s $f2, $f0 -/* B0A358 800931B8 00000000 */ nop -/* B0A35C 800931BC 45020003 */ bc1fl .L800931CC -/* B0A360 800931C0 C600000C */ lwc1 $f0, 0xc($s0) -/* B0A364 800931C4 E6120008 */ swc1 $f18, 8($s0) -/* B0A368 800931C8 C600000C */ lwc1 $f0, 0xc($s0) -.L800931CC: -/* B0A36C 800931CC C7A40098 */ lwc1 $f4, 0x98($sp) -/* B0A370 800931D0 46000085 */ abs.s $f2, $f0 -/* B0A374 800931D4 46002005 */ abs.s $f0, $f4 -/* B0A378 800931D8 4600103C */ c.lt.s $f2, $f0 -/* B0A37C 800931DC 00000000 */ nop -/* B0A380 800931E0 45020003 */ bc1fl .L800931F0 -/* B0A384 800931E4 C6000010 */ lwc1 $f0, 0x10($s0) -/* B0A388 800931E8 E604000C */ swc1 $f4, 0xc($s0) -/* B0A38C 800931EC C6000010 */ lwc1 $f0, 0x10($s0) -.L800931F0: -/* B0A390 800931F0 C7A6009C */ lwc1 $f6, 0x9c($sp) -/* B0A394 800931F4 46000085 */ abs.s $f2, $f0 -/* B0A398 800931F8 46003005 */ abs.s $f0, $f6 -/* B0A39C 800931FC 4600103C */ c.lt.s $f2, $f0 -/* B0A3A0 80093200 00000000 */ nop -/* B0A3A4 80093204 45020003 */ bc1fl .L80093214 -/* B0A3A8 80093208 C6000014 */ lwc1 $f0, 0x14($s0) -/* B0A3AC 8009320C E6060010 */ swc1 $f6, 0x10($s0) -/* B0A3B0 80093210 C6000014 */ lwc1 $f0, 0x14($s0) -.L80093214: -/* B0A3B4 80093214 C7A800A0 */ lwc1 $f8, 0xa0($sp) -/* B0A3B8 80093218 46000085 */ abs.s $f2, $f0 -/* B0A3BC 8009321C 46004005 */ abs.s $f0, $f8 -/* B0A3C0 80093220 4600103C */ c.lt.s $f2, $f0 -/* B0A3C4 80093224 00000000 */ nop -/* B0A3C8 80093228 45020003 */ bc1fl .L80093238 -/* B0A3CC 8009322C 86180018 */ lh $t8, 0x18($s0) -/* B0A3D0 80093230 E6080014 */ swc1 $f8, 0x14($s0) -/* B0A3D4 80093234 86180018 */ lh $t8, 0x18($s0) -.L80093238: -/* B0A3D8 80093238 87A800A4 */ lh $t0, 0xa4($sp) -/* B0A3DC 8009323C 0308082A */ slt $at, $t8, $t0 -/* B0A3E0 80093240 50200005 */ beql $at, $zero, .L80093258 -/* B0A3E4 80093244 860A001C */ lh $t2, 0x1c($s0) -/* B0A3E8 80093248 A6080018 */ sh $t0, 0x18($s0) -/* B0A3EC 8009324C 87A900A6 */ lh $t1, 0xa6($sp) -/* B0A3F0 80093250 A609001A */ sh $t1, 0x1a($s0) -/* B0A3F4 80093254 860A001C */ lh $t2, 0x1c($s0) -.L80093258: -/* B0A3F8 80093258 87AB00A8 */ lh $t3, 0xa8($sp) -/* B0A3FC 8009325C 014B082A */ slt $at, $t2, $t3 -/* B0A400 80093260 10200002 */ beqz $at, .L8009326C -/* B0A404 80093264 00000000 */ nop -/* B0A408 80093268 A60B001C */ sh $t3, 0x1c($s0) -.L8009326C: -/* B0A40C 8009326C 0C01EFE4 */ jal func_8007BF90 -/* B0A410 80093270 02802825 */ move $a1, $s4 -/* B0A414 80093274 46160502 */ mul.s $f20, $f0, $f22 -/* B0A418 80093278 27A40098 */ addiu $a0, $sp, 0x98 -/* B0A41C 8009327C 0C01EFE4 */ jal func_8007BF90 -/* B0A420 80093280 02802825 */ move $a1, $s4 -/* B0A424 80093284 46160082 */ mul.s $f2, $f0, $f22 -/* B0A428 80093288 26520001 */ addiu $s2, $s2, 1 -/* B0A42C 8009328C 4602A03C */ c.lt.s $f20, $f2 -/* B0A430 80093290 00000000 */ nop -/* B0A434 80093294 45020003 */ bc1fl .L800932A4 -/* B0A438 80093298 860D0018 */ lh $t5, 0x18($s0) -/* B0A43C 8009329C 46001506 */ mov.s $f20, $f2 -/* B0A440 800932A0 860D0018 */ lh $t5, 0x18($s0) -.L800932A4: -/* B0A444 800932A4 448D5000 */ mtc1 $t5, $f10 -/* B0A448 800932A8 00000000 */ nop -/* B0A44C 800932AC 46805420 */ cvt.s.w $f16, $f10 -/* B0A450 800932B0 461A8482 */ mul.s $f18, $f16, $f26 -/* B0A454 800932B4 00000000 */ nop -/* B0A458 800932B8 46189002 */ mul.s $f0, $f18, $f24 -/* B0A45C 800932BC 4600A03C */ c.lt.s $f20, $f0 -/* B0A460 800932C0 00000000 */ nop -/* B0A464 800932C4 45000002 */ bc1f .L800932D0 -/* B0A468 800932C8 00000000 */ nop -/* B0A46C 800932CC 46000506 */ mov.s $f20, $f0 -.L800932D0: -/* B0A470 800932D0 860C001C */ lh $t4, 0x1c($s0) -/* B0A474 800932D4 448C2000 */ mtc1 $t4, $f4 -/* B0A478 800932D8 00000000 */ nop -/* B0A47C 800932DC 468021A0 */ cvt.s.w $f6, $f4 -/* B0A480 800932E0 461A3202 */ mul.s $f8, $f6, $f26 -/* B0A484 800932E4 00000000 */ nop -/* B0A488 800932E8 46184002 */ mul.s $f0, $f8, $f24 -/* B0A48C 800932EC 4600A03C */ c.lt.s $f20, $f0 -/* B0A490 800932F0 00000000 */ nop -/* B0A494 800932F4 45000002 */ bc1f .L80093300 -/* B0A498 800932F8 00000000 */ nop -/* B0A49C 800932FC 46000506 */ mov.s $f20, $f0 -.L80093300: -/* B0A4A0 80093300 C60A0020 */ lwc1 $f10, 0x20($s0) -/* B0A4A4 80093304 4614503C */ c.lt.s $f10, $f20 -/* B0A4A8 80093308 00000000 */ nop -/* B0A4AC 8009330C 45000002 */ bc1f .L80093318 -/* B0A4B0 80093310 00000000 */ nop -/* B0A4B4 80093314 E6140020 */ swc1 $f20, 0x20($s0) -.L80093318: -/* B0A4B8 80093318 3C0E8016 */ lui $t6, %hi(D_80160020+0x24*4) # $t6, 0x8016 -/* B0A4BC 8009331C 25CE00B0 */ addiu $t6, %lo(D_80160020+0x24*4) # addiu $t6, $t6, 0xb0 -/* B0A4C0 80093320 26310024 */ addiu $s1, $s1, 0x24 -/* B0A4C4 80093324 562EFF5C */ bnel $s1, $t6, .L80093098 -/* B0A4C8 80093328 8E260008 */ lw $a2, 8($s1) -/* B0A4CC 8009332C 00121400 */ sll $v0, $s2, 0x10 -/* B0A4D0 80093330 00021403 */ sra $v0, $v0, 0x10 -.L80093334: -/* B0A4D4 80093334 8FBF004C */ lw $ra, 0x4c($sp) -/* B0A4D8 80093338 D7B40018 */ ldc1 $f20, 0x18($sp) -/* B0A4DC 8009333C D7B60020 */ ldc1 $f22, 0x20($sp) -/* B0A4E0 80093340 D7B80028 */ ldc1 $f24, 0x28($sp) -/* B0A4E4 80093344 D7BA0030 */ ldc1 $f26, 0x30($sp) -/* B0A4E8 80093348 8FB00038 */ lw $s0, 0x38($sp) -/* B0A4EC 8009334C 8FB1003C */ lw $s1, 0x3c($sp) -/* B0A4F0 80093350 8FB20040 */ lw $s2, 0x40($sp) -/* B0A4F4 80093354 8FB30044 */ lw $s3, 0x44($sp) -/* B0A4F8 80093358 8FB40048 */ lw $s4, 0x48($sp) -/* B0A4FC 8009335C 03E00008 */ jr $ra -/* B0A500 80093360 27BD00B8 */ addiu $sp, $sp, 0xb8 diff --git a/asm/code_800ACE70.s b/asm/code_800ACE70.s deleted file mode 100644 index 0aa384aba7..0000000000 --- a/asm/code_800ACE70.s +++ /dev/null @@ -1,121 +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 purposee registers - -.section .text - -.align 4 - -glabel func_800ACE70 -/* B24010 800ACE70 240200FF */ li $v0, 255 -/* B24014 800ACE74 AC800000 */ sw $zero, ($a0) -/* B24018 800ACE78 AC800004 */ sw $zero, 4($a0) -/* B2401C 800ACE7C A0820008 */ sb $v0, 8($a0) -/* B24020 800ACE80 A0820009 */ sb $v0, 9($a0) -/* B24024 800ACE84 A082000A */ sb $v0, 0xa($a0) -/* B24028 800ACE88 03E00008 */ jr $ra -/* B2402C 800ACE8C A082000B */ sb $v0, 0xb($a0) - -glabel func_800ACE90 -/* B24030 800ACE90 03E00008 */ jr $ra -/* B24034 800ACE94 AFA40000 */ sw $a0, ($sp) - -glabel func_800ACE98 -/* B24038 800ACE98 8CA20000 */ lw $v0, ($a1) -/* B2403C 800ACE9C 00803025 */ move $a2, $a0 -/* B24040 800ACEA0 3C03E700 */ lui $v1, 0xe700 -/* B24044 800ACEA4 00402025 */ move $a0, $v0 -/* B24048 800ACEA8 AC830000 */ sw $v1, ($a0) -/* B2404C 800ACEAC AC800004 */ sw $zero, 4($a0) -/* B24050 800ACEB0 24420008 */ addiu $v0, $v0, 8 -/* B24054 800ACEB4 00402025 */ move $a0, $v0 -/* B24058 800ACEB8 3C0EEE00 */ lui $t6, 0xee00 -/* B2405C 800ACEBC 240FFFFF */ li $t7, -1 -/* B24060 800ACEC0 AC8F0004 */ sw $t7, 4($a0) -/* B24064 800ACEC4 AC8E0000 */ sw $t6, ($a0) -/* B24068 800ACEC8 8CD80004 */ lw $t8, 4($a2) -/* B2406C 800ACECC 24420008 */ addiu $v0, $v0, 8 -/* B24070 800ACED0 24070001 */ li $a3, 1 -/* B24074 800ACED4 14F80007 */ bne $a3, $t8, .L800ACEF4 -/* B24078 800ACED8 00402025 */ move $a0, $v0 -/* B2407C 800ACEDC 3C080050 */ lui $t0, (0x005003C0 >> 16) # lui $t0, 0x50 -/* B24080 800ACEE0 350803C0 */ ori $t0, (0x005003C0 & 0xFFFF) # ori $t0, $t0, 0x3c0 -/* B24084 800ACEE4 3C19ED00 */ lui $t9, 0xed00 -/* B24088 800ACEE8 AC990000 */ sw $t9, ($a0) -/* B2408C 800ACEEC AC880004 */ sw $t0, 4($a0) -/* B24090 800ACEF0 24420008 */ addiu $v0, $v0, 8 -.L800ACEF4: -/* B24094 800ACEF4 8CC40000 */ lw $a0, ($a2) -/* B24098 800ACEF8 3C0A8013 */ lui $t2, %hi(D_8012AC40) # $t2, 0x8013 -/* B2409C 800ACEFC 254AAC40 */ addiu $t2, %lo(D_8012AC40) # addiu $t2, $t2, -0x53c0 -/* B240A0 800ACF00 1087000C */ beq $a0, $a3, .L800ACF34 -/* B240A4 800ACF04 3C09DE00 */ lui $t1, 0xde00 -/* B240A8 800ACF08 24010002 */ li $at, 2 -/* B240AC 800ACF0C 1081000E */ beq $a0, $at, .L800ACF48 -/* B240B0 800ACF10 3C0BFA00 */ lui $t3, 0xfa00 -/* B240B4 800ACF14 24010003 */ li $at, 3 -/* B240B8 800ACF18 10810018 */ beq $a0, $at, .L800ACF7C -/* B240BC 800ACF1C 3C0FF900 */ lui $t7, 0xf900 -/* B240C0 800ACF20 24010004 */ li $at, 4 -/* B240C4 800ACF24 10810022 */ beq $a0, $at, .L800ACFB0 -/* B240C8 800ACF28 3C09F800 */ lui $t1, 0xf800 -/* B240CC 800ACF2C 1000002D */ b .L800ACFE4 -/* B240D0 800ACF30 00402025 */ move $a0, $v0 -.L800ACF34: -/* B240D4 800ACF34 00402025 */ move $a0, $v0 -/* B240D8 800ACF38 AC890000 */ sw $t1, ($a0) -/* B240DC 800ACF3C AC8A0004 */ sw $t2, 4($a0) -/* B240E0 800ACF40 10000027 */ b .L800ACFE0 -/* B240E4 800ACF44 24420008 */ addiu $v0, $v0, 8 -.L800ACF48: -/* B240E8 800ACF48 00402025 */ move $a0, $v0 -/* B240EC 800ACF4C AC8B0000 */ sw $t3, ($a0) -/* B240F0 800ACF50 8CCC0008 */ lw $t4, 8($a2) -/* B240F4 800ACF54 24420008 */ addiu $v0, $v0, 8 -/* B240F8 800ACF58 3C0E8013 */ lui $t6, %hi(D_8012AC58) # $t6, 0x8013 -/* B240FC 800ACF5C AC8C0004 */ sw $t4, 4($a0) -/* B24100 800ACF60 00402025 */ move $a0, $v0 -/* B24104 800ACF64 25CEAC58 */ addiu $t6, %lo(D_8012AC58) # addiu $t6, $t6, -0x53a8 -/* B24108 800ACF68 3C0DDE00 */ lui $t5, 0xde00 -/* B2410C 800ACF6C AC8D0000 */ sw $t5, ($a0) -/* B24110 800ACF70 AC8E0004 */ sw $t6, 4($a0) -/* B24114 800ACF74 1000001A */ b .L800ACFE0 -/* B24118 800ACF78 24420008 */ addiu $v0, $v0, 8 -.L800ACF7C: -/* B2411C 800ACF7C 00402025 */ move $a0, $v0 -/* B24120 800ACF80 AC8F0000 */ sw $t7, ($a0) -/* B24124 800ACF84 8CD80008 */ lw $t8, 8($a2) -/* B24128 800ACF88 24420008 */ addiu $v0, $v0, 8 -/* B2412C 800ACF8C 3C088013 */ lui $t0, %hi(D_8012AC00) # $t0, 0x8013 -/* B24130 800ACF90 AC980004 */ sw $t8, 4($a0) -/* B24134 800ACF94 00402025 */ move $a0, $v0 -/* B24138 800ACF98 2508AC00 */ addiu $t0, %lo(D_8012AC00) # addiu $t0, $t0, -0x5400 -/* B2413C 800ACF9C 3C19DE00 */ lui $t9, 0xde00 -/* B24140 800ACFA0 AC990000 */ sw $t9, ($a0) -/* B24144 800ACFA4 AC880004 */ sw $t0, 4($a0) -/* B24148 800ACFA8 1000000D */ b .L800ACFE0 -/* B2414C 800ACFAC 24420008 */ addiu $v0, $v0, 8 -.L800ACFB0: -/* B24150 800ACFB0 00402025 */ move $a0, $v0 -/* B24154 800ACFB4 AC890000 */ sw $t1, ($a0) -/* B24158 800ACFB8 8CCA0008 */ lw $t2, 8($a2) -/* B2415C 800ACFBC 24420008 */ addiu $v0, $v0, 8 -/* B24160 800ACFC0 3C0C8013 */ lui $t4, %hi(D_8012AC28) # $t4, 0x8013 -/* B24164 800ACFC4 AC8A0004 */ sw $t2, 4($a0) -/* B24168 800ACFC8 00402025 */ move $a0, $v0 -/* B2416C 800ACFCC 258CAC28 */ addiu $t4, %lo(D_8012AC28) # addiu $t4, $t4, -0x53d8 -/* B24170 800ACFD0 3C0BDE00 */ lui $t3, 0xde00 -/* B24174 800ACFD4 AC8B0000 */ sw $t3, ($a0) -/* B24178 800ACFD8 AC8C0004 */ sw $t4, 4($a0) -/* B2417C 800ACFDC 24420008 */ addiu $v0, $v0, 8 -.L800ACFE0: -/* B24180 800ACFE0 00402025 */ move $a0, $v0 -.L800ACFE4: -/* B24184 800ACFE4 AC830000 */ sw $v1, ($a0) -/* B24188 800ACFE8 AC800004 */ sw $zero, 4($a0) -/* B2418C 800ACFEC 24420008 */ addiu $v0, $v0, 8 -/* B24190 800ACFF0 03E00008 */ jr $ra -/* B24194 800ACFF4 ACA20000 */ sw $v0, ($a1) diff --git a/asm/code_800B29D0.s b/asm/code_800B29D0.s index 242f8b07db..e060dbc26a 100644 --- a/asm/code_800B29D0.s +++ b/asm/code_800B29D0.s @@ -191,7 +191,7 @@ glabel func_800B2B98 /* B29DF8 800B2C58 9606000E */ lhu $a2, 0xe($s0) /* B29DFC 800B2C5C 9605000C */ lhu $a1, 0xc($s0) /* B29E00 800B2C60 AFA00010 */ sw $zero, 0x10($sp) -/* B29E04 800B2C64 0C02536E */ jal func_80094DB8 +/* B29E04 800B2C64 0C02536E */ jal Gfx_BranchTexScroll /* B29E08 800B2C68 00003825 */ move $a3, $zero /* B29E0C 800B2C6C 8FAB007C */ lw $t3, 0x7c($sp) /* B29E10 800B2C70 3C0DDB06 */ lui $t5, (0xDB060020 >> 16) # lui $t5, 0xdb06 diff --git a/asm/code_800B2E30.s b/asm/code_800B2E30.s index 48fb942bfe..450bc3ebb8 100644 --- a/asm/code_800B2E30.s +++ b/asm/code_800B2E30.s @@ -299,7 +299,7 @@ glabel func_800B31D0 /* B2A3D0 800B3230 AD4C0000 */ sw $t4, ($t2) /* B2A3D4 800B3234 8E06000C */ lw $a2, 0xc($s0) /* B2A3D8 800B3238 8E050008 */ lw $a1, 8($s0) -/* B2A3DC 800B323C 0C02536E */ jal func_80094DB8 +/* B2A3DC 800B323C 0C02536E */ jal Gfx_BranchTexScroll /* B2A3E0 800B3240 AFAD0010 */ sw $t5, 0x10($sp) /* B2A3E4 800B3244 8FAE007C */ lw $t6, 0x7c($sp) /* B2A3E8 800B3248 3C18DB06 */ lui $t8, (0xDB060024 >> 16) # lui $t8, 0xdb06 diff --git a/asm/code_800D31A0.s b/asm/code_800D31A0.s deleted file mode 100644 index 6828f4d684..0000000000 --- a/asm/code_800D31A0.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 purposee registers - -.section .text - -.align 4 - -glabel func_800D31A0 -/* B4A340 800D31A0 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* B4A344 800D31A4 AFBF0014 */ sw $ra, 0x14($sp) -/* B4A348 800D31A8 3C048014 */ lui $a0, %hi(D_80146670) # $a0, 0x8014 -/* B4A34C 800D31AC 0C00084C */ jal osSyncPrintf -/* B4A350 800D31B0 24846670 */ addiu $a0, %lo(D_80146670) # addiu $a0, $a0, 0x6670 -.L800D31B4: -/* B4A354 800D31B4 0C03FD2B */ jal func_800FF4AC -/* B4A358 800D31B8 240403E8 */ li $a0, 1000 -/* B4A35C 800D31BC 1000FFFD */ b .L800D31B4 -/* B4A360 800D31C0 00000000 */ nop -/* B4A364 800D31C4 00000000 */ nop -/* B4A368 800D31C8 00000000 */ nop -/* B4A36C 800D31CC 00000000 */ nop -/* B4A370 800D31D0 00000000 */ nop -/* B4A374 800D31D4 00000000 */ nop -/* B4A378 800D31D8 00000000 */ nop -/* B4A37C 800D31DC 00000000 */ nop -/* B4A380 800D31E0 8FBF0014 */ lw $ra, 0x14($sp) -/* B4A384 800D31E4 27BD0018 */ addiu $sp, $sp, 0x18 -/* B4A388 800D31E8 03E00008 */ jr $ra -/* B4A38C 800D31EC 00000000 */ nop - -glabel func_800D31F0 -/* B4A390 800D31F0 3C0E8016 */ lui $t6, %hi(gPadMgr) # $t6, 0x8016 -/* B4A394 800D31F4 25CE68C0 */ addiu $t6, %lo(gPadMgr) # addiu $t6, $t6, 0x68c0 -/* B4A398 800D31F8 91CF02A8 */ lbu $t7, 0x2a8($t6) -/* B4A39C 800D31FC 3C018013 */ lui $at, %hi(D_8012DBC0) -/* B4A3A0 800D3200 31F80002 */ andi $t8, $t7, 2 -/* B4A3A4 800D3204 0018C82B */ sltu $t9, $zero, $t8 -/* B4A3A8 800D3208 03E00008 */ jr $ra -/* B4A3AC 800D320C AC39DBC0 */ sw $t9, %lo(D_8012DBC0)($at) - -glabel func_800D3210 -/* B4A3B0 800D3210 3C018013 */ lui $at, %hi(D_8012DBC0) -/* B4A3B4 800D3214 03E00008 */ jr $ra -/* B4A3B8 800D3218 AC20DBC0 */ sw $zero, %lo(D_8012DBC0)($at) diff --git a/asm/code_800FCE80.s b/asm/code_800FCE80.s deleted file mode 100644 index 64806b0656..0000000000 --- a/asm/code_800FCE80.s +++ /dev/null @@ -1,519 +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 purposee registers - -.section .text - -.align 4 - -glabel func_800FCE80 -/* B74020 800FCE80 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* B74024 800FCE84 AFBF0014 */ sw $ra, 0x14($sp) -/* B74028 800FCE88 E7AC0020 */ swc1 $f12, 0x20($sp) -/* B7402C 800FCE8C 0C0400A4 */ jal sinf -/* B74030 800FCE90 C7AC0020 */ lwc1 $f12, 0x20($sp) -/* B74034 800FCE94 E7A0001C */ swc1 $f0, 0x1c($sp) -/* B74038 800FCE98 0C041184 */ jal cosf -/* B7403C 800FCE9C C7AC0020 */ lwc1 $f12, 0x20($sp) -/* B74040 800FCEA0 8FBF0014 */ lw $ra, 0x14($sp) -/* B74044 800FCEA4 C7A4001C */ lwc1 $f4, 0x1c($sp) -/* B74048 800FCEA8 27BD0020 */ addiu $sp, $sp, 0x20 -/* B7404C 800FCEAC 03E00008 */ jr $ra -/* B74050 800FCEB0 46002003 */ div.s $f0, $f4, $f0 - -glabel func_800FCEB4 -/* B74054 800FCEB4 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* B74058 800FCEB8 AFBF0014 */ sw $ra, 0x14($sp) -/* B7405C 800FCEBC 0C03F4E4 */ jal func_800FD390 -/* B74060 800FCEC0 00000000 */ nop -/* B74064 800FCEC4 8FBF0014 */ lw $ra, 0x14($sp) -/* B74068 800FCEC8 27BD0018 */ addiu $sp, $sp, 0x18 -/* B7406C 800FCECC 03E00008 */ jr $ra -/* B74070 800FCED0 00000000 */ nop - -glabel func_800FCED4 -/* B74074 800FCED4 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* B74078 800FCED8 AFBF0014 */ sw $ra, 0x14($sp) -/* B7407C 800FCEDC 0C03F4F2 */ jal func_800FD3C8 -/* B74080 800FCEE0 00000000 */ nop -/* B74084 800FCEE4 8FBF0014 */ lw $ra, 0x14($sp) -/* B74088 800FCEE8 27BD0018 */ addiu $sp, $sp, 0x18 -/* B7408C 800FCEEC 03E00008 */ jr $ra -/* B74090 800FCEF0 00000000 */ nop - -glabel func_800FCEF4 -/* B74094 800FCEF4 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* B74098 800FCEF8 AFBF0014 */ sw $ra, 0x14($sp) -/* B7409C 800FCEFC 0C03F51C */ jal func_800FD470 -/* B740A0 800FCF00 00000000 */ nop -/* B740A4 800FCF04 8FBF0014 */ lw $ra, 0x14($sp) -/* B740A8 800FCF08 27BD0018 */ addiu $sp, $sp, 0x18 -/* B740AC 800FCF0C 03E00008 */ jr $ra -/* B740B0 800FCF10 00000000 */ nop - -glabel func_800FCF14 -/* B740B4 800FCF14 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* B740B8 800FCF18 AFBF0014 */ sw $ra, 0x14($sp) -/* B740BC 800FCF1C 0C03F500 */ jal func_800FD400 -/* B740C0 800FCF20 00000000 */ nop -/* B740C4 800FCF24 8FBF0014 */ lw $ra, 0x14($sp) -/* B740C8 800FCF28 27BD0018 */ addiu $sp, $sp, 0x18 -/* B740CC 800FCF2C 03E00008 */ jr $ra -/* B740D0 800FCF30 00000000 */ nop - -glabel func_800FCF34 -/* B740D4 800FCF34 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* B740D8 800FCF38 AFBF0014 */ sw $ra, 0x14($sp) -/* B740DC 800FCF3C 0C03F50E */ jal func_800FD438 -/* B740E0 800FCF40 00000000 */ nop -/* B740E4 800FCF44 8FBF0014 */ lw $ra, 0x14($sp) -/* B740E8 800FCF48 27BD0018 */ addiu $sp, $sp, 0x18 -/* B740EC 800FCF4C 03E00008 */ jr $ra -/* B740F0 800FCF50 00000000 */ nop - -glabel func_800FCF54 -/* B740F4 800FCF54 460C6002 */ mul.s $f0, $f12, $f12 -/* B740F8 800FCF58 3C028015 */ lui $v0, %hi(D_8014AAC0) # $v0, 0x8015 -/* B740FC 800FCF5C 46006086 */ mov.s $f2, $f12 -/* B74100 800FCF60 2442AAC0 */ addiu $v0, %lo(D_8014AAC0) # addiu $v0, $v0, -0x5540 -/* B74104 800FCF64 46006382 */ mul.s $f14, $f12, $f0 -/* B74108 800FCF68 00000000 */ nop -.L800FCF6C: -/* B7410C 800FCF6C C4440000 */ lwc1 $f4, ($v0) -/* B74110 800FCF70 24420004 */ addiu $v0, $v0, 4 -/* B74114 800FCF74 460E2302 */ mul.s $f12, $f4, $f14 -/* B74118 800FCF78 460C1400 */ add.s $f16, $f2, $f12 -/* B7411C 800FCF7C 46101032 */ c.eq.s $f2, $f16 -/* B74120 800FCF80 00000000 */ nop -/* B74124 800FCF84 45010004 */ bc1t .L800FCF98 -/* B74128 800FCF88 00000000 */ nop -/* B7412C 800FCF8C 46007382 */ mul.s $f14, $f14, $f0 -/* B74130 800FCF90 1000FFF6 */ b .L800FCF6C -/* B74134 800FCF94 46008086 */ mov.s $f2, $f16 -.L800FCF98: -/* B74138 800FCF98 03E00008 */ jr $ra -/* B7413C 800FCF9C 46001006 */ mov.s $f0, $f2 - -glabel func_800FCFA0 -/* B74140 800FCFA0 44808000 */ mtc1 $zero, $f16 -/* B74144 800FCFA4 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* B74148 800FCFA8 AFBF0014 */ sw $ra, 0x14($sp) -/* B7414C 800FCFAC 460C803C */ c.lt.s $f16, $f12 -/* B74150 800FCFB0 46006386 */ mov.s $f14, $f12 -/* B74154 800FCFB4 3C018015 */ lui $at, %hi(D_8014AAE4) -/* B74158 800FCFB8 45020004 */ bc1fl .L800FCFCC -/* B7415C 800FCFBC 4610703C */ c.lt.s $f14, $f16 -/* B74160 800FCFC0 1000000F */ b .L800FD000 -/* B74164 800FCFC4 46006006 */ mov.s $f0, $f12 -/* B74168 800FCFC8 4610703C */ c.lt.s $f14, $f16 -.L800FCFCC: -/* B7416C 800FCFCC 00000000 */ nop -/* B74170 800FCFD0 45020004 */ bc1fl .L800FCFE4 -/* B74174 800FCFD4 46107032 */ c.eq.s $f14, $f16 -/* B74178 800FCFD8 10000009 */ b .L800FD000 -/* B7417C 800FCFDC 46007007 */ neg.s $f0, $f14 -/* B74180 800FCFE0 46107032 */ c.eq.s $f14, $f16 -.L800FCFE4: -/* B74184 800FCFE4 3C018013 */ lui $at, %hi(D_801344A4) -/* B74188 800FCFE8 45000003 */ bc1f .L800FCFF8 -/* B7418C 800FCFEC 00000000 */ nop -/* B74190 800FCFF0 10000030 */ b .L800FD0B4 -/* B74194 800FCFF4 46008006 */ mov.s $f0, $f16 -.L800FCFF8: -/* B74198 800FCFF8 1000002E */ b .L800FD0B4 -/* B7419C 800FCFFC C42044A4 */ lwc1 $f0, %lo(D_801344A4)($at) -.L800FD000: -/* B741A0 800FD000 C424AAE4 */ lwc1 $f4, %lo(D_8014AAE4)($at) -/* B741A4 800FD004 3C018015 */ lui $at, %hi(D_8014AAE8) -/* B741A8 800FD008 4604003E */ c.le.s $f0, $f4 -/* B741AC 800FD00C 00000000 */ nop -/* B741B0 800FD010 45000005 */ bc1f .L800FD028 -/* B741B4 800FD014 00000000 */ nop -/* B741B8 800FD018 0C03F3D5 */ jal func_800FCF54 -/* B741BC 800FD01C 46007306 */ mov.s $f12, $f14 -/* B741C0 800FD020 10000025 */ b .L800FD0B8 -/* B741C4 800FD024 8FBF0014 */ lw $ra, 0x14($sp) -.L800FD028: -/* B741C8 800FD028 C426AAE8 */ lwc1 $f6, %lo(D_8014AAE8)($at) -/* B741CC 800FD02C 3C013F80 */ li $at, 0x3F800000 # 0.000000 -/* B741D0 800FD030 4600303E */ c.le.s $f6, $f0 -/* B741D4 800FD034 00000000 */ nop -/* B741D8 800FD038 4502000D */ bc1fl .L800FD070 -/* B741DC 800FD03C 44811000 */ mtc1 $at, $f2 -/* B741E0 800FD040 3C013F80 */ li $at, 0x3F800000 # 0.000000 -/* B741E4 800FD044 44811000 */ mtc1 $at, $f2 -/* B741E8 800FD048 E7AE0018 */ swc1 $f14, 0x18($sp) -/* B741EC 800FD04C 0C03F3D5 */ jal func_800FCF54 -/* B741F0 800FD050 46001303 */ div.s $f12, $f2, $f0 -/* B741F4 800FD054 3C018015 */ lui $at, %hi(D_8014AAEC) -/* B741F8 800FD058 C428AAEC */ lwc1 $f8, %lo(D_8014AAEC)($at) -/* B741FC 800FD05C 44808000 */ mtc1 $zero, $f16 -/* B74200 800FD060 C7AE0018 */ lwc1 $f14, 0x18($sp) -/* B74204 800FD064 1000000C */ b .L800FD098 -/* B74208 800FD068 46004081 */ sub.s $f2, $f8, $f0 -/* B7420C 800FD06C 44811000 */ mtc1 $at, $f2 -.L800FD070: -/* B74210 800FD070 E7AE0018 */ swc1 $f14, 0x18($sp) -/* B74214 800FD074 46001281 */ sub.s $f10, $f2, $f0 -/* B74218 800FD078 46001480 */ add.s $f18, $f2, $f0 -/* B7421C 800FD07C 0C03F3D5 */ jal func_800FCF54 -/* B74220 800FD080 46125303 */ div.s $f12, $f10, $f18 -/* B74224 800FD084 3C018015 */ lui $at, %hi(D_8014AAF0) -/* B74228 800FD088 C424AAF0 */ lwc1 $f4, %lo(D_8014AAF0)($at) -/* B7422C 800FD08C 44808000 */ mtc1 $zero, $f16 -/* B74230 800FD090 C7AE0018 */ lwc1 $f14, 0x18($sp) -/* B74234 800FD094 46002081 */ sub.s $f2, $f4, $f0 -.L800FD098: -/* B74238 800FD098 460E803C */ c.lt.s $f16, $f14 -/* B7423C 800FD09C 00000000 */ nop -/* B74240 800FD0A0 45020004 */ bc1fl .L800FD0B4 -/* B74244 800FD0A4 46001007 */ neg.s $f0, $f2 -/* B74248 800FD0A8 10000002 */ b .L800FD0B4 -/* B7424C 800FD0AC 46001006 */ mov.s $f0, $f2 -/* B74250 800FD0B0 46001007 */ neg.s $f0, $f2 -.L800FD0B4: -/* B74254 800FD0B4 8FBF0014 */ lw $ra, 0x14($sp) -.L800FD0B8: -/* B74258 800FD0B8 27BD0018 */ addiu $sp, $sp, 0x18 -/* B7425C 800FD0BC 03E00008 */ jr $ra -/* B74260 800FD0C0 00000000 */ nop - -glabel func_800FD0C4 -/* B74264 800FD0C4 3C01BF80 */ li $at, 0xBF800000 # 0.000000 -/* B74268 800FD0C8 44810000 */ mtc1 $at, $f0 -/* B7426C 800FD0CC 3C013F80 */ lui $at, 0x3f80 -/* B74270 800FD0D0 460C003E */ c.le.s $f0, $f12 -/* B74274 800FD0D4 00000000 */ nop -/* B74278 800FD0D8 4502000A */ bc1fl .L800FD104 -/* B7427C 800FD0DC 3C013F80 */ li $at, 0x3F800000 # 0.000000 -/* B74280 800FD0E0 44818000 */ mtc1 $at, $f16 -/* B74284 800FD0E4 00000000 */ nop -/* B74288 800FD0E8 4610603E */ c.le.s $f12, $f16 -/* B7428C 800FD0EC 00000000 */ nop -/* B74290 800FD0F0 45020004 */ bc1fl .L800FD104 -/* B74294 800FD0F4 3C013F80 */ lui $at, 0x3f80 -/* B74298 800FD0F8 10000013 */ b .L800FD148 -/* B7429C 800FD0FC 00001025 */ move $v0, $zero -/* B742A0 800FD100 3C013F80 */ li $at, 0x3F800000 # 0.000000 -.L800FD104: -/* B742A4 800FD104 44818000 */ mtc1 $at, $f16 -/* B742A8 800FD108 24020001 */ li $v0, 1 -/* B742AC 800FD10C 460C803C */ c.lt.s $f16, $f12 -/* B742B0 800FD110 00000000 */ nop -/* B742B4 800FD114 45020004 */ bc1fl .L800FD128 -/* B742B8 800FD118 4600603C */ c.lt.s $f12, $f0 -/* B742BC 800FD11C 1000000A */ b .L800FD148 -/* B742C0 800FD120 460C8303 */ div.s $f12, $f16, $f12 -/* B742C4 800FD124 4600603C */ c.lt.s $f12, $f0 -.L800FD128: -/* B742C8 800FD128 2402FFFF */ li $v0, -1 -/* B742CC 800FD12C 3C018013 */ lui $at, %hi(D_801344A4) -/* B742D0 800FD130 45000003 */ bc1f .L800FD140 -/* B742D4 800FD134 00000000 */ nop -/* B742D8 800FD138 10000003 */ b .L800FD148 -/* B742DC 800FD13C 460C8303 */ div.s $f12, $f16, $f12 -.L800FD140: -/* B742E0 800FD140 03E00008 */ jr $ra -/* B742E4 800FD144 C42044A4 */ lwc1 $f0, %lo(D_801344A4)($at) - -.L800FD148: -/* B742E8 800FD148 3C014100 */ li $at, 0x41000000 # 0.000000 -/* B742EC 800FD14C 460C6002 */ mul.s $f0, $f12, $f12 -/* B742F0 800FD150 44801000 */ mtc1 $zero, $f2 -/* B742F4 800FD154 44817000 */ mtc1 $at, $f14 -/* B742F8 800FD158 24030008 */ li $v1, 8 -.L800FD15C: -/* B742FC 800FD15C 460E7482 */ mul.s $f18, $f14, $f14 -/* B74300 800FD160 460E7280 */ add.s $f10, $f14, $f14 -/* B74304 800FD164 2463FFFC */ addiu $v1, $v1, -4 -/* B74308 800FD168 46105280 */ add.s $f10, $f10, $f16 -/* B7430C 800FD16C 46009482 */ mul.s $f18, $f18, $f0 -/* B74310 800FD170 46107381 */ sub.s $f14, $f14, $f16 -/* B74314 800FD174 460E7202 */ mul.s $f8, $f14, $f14 -/* B74318 800FD178 46025280 */ add.s $f10, $f10, $f2 -/* B7431C 800FD17C 460E7180 */ add.s $f6, $f14, $f14 -/* B74320 800FD180 46004202 */ mul.s $f8, $f8, $f0 -/* B74324 800FD184 460A9083 */ div.s $f2, $f18, $f10 -/* B74328 800FD188 46103180 */ add.s $f6, $f6, $f16 -/* B7432C 800FD18C 46107381 */ sub.s $f14, $f14, $f16 -/* B74330 800FD190 460E7282 */ mul.s $f10, $f14, $f14 -/* B74334 800FD194 46023180 */ add.s $f6, $f6, $f2 -/* B74338 800FD198 460E7480 */ add.s $f18, $f14, $f14 -/* B7433C 800FD19C 46005282 */ mul.s $f10, $f10, $f0 -/* B74340 800FD1A0 46064083 */ div.s $f2, $f8, $f6 -/* B74344 800FD1A4 46109480 */ add.s $f18, $f18, $f16 -/* B74348 800FD1A8 46107381 */ sub.s $f14, $f14, $f16 -/* B7434C 800FD1AC 460E7182 */ mul.s $f6, $f14, $f14 -/* B74350 800FD1B0 46029480 */ add.s $f18, $f18, $f2 -/* B74354 800FD1B4 460E7200 */ add.s $f8, $f14, $f14 -/* B74358 800FD1B8 46003182 */ mul.s $f6, $f6, $f0 -/* B7435C 800FD1BC 46125083 */ div.s $f2, $f10, $f18 -/* B74360 800FD1C0 46104200 */ add.s $f8, $f8, $f16 -/* B74364 800FD1C4 46107381 */ sub.s $f14, $f14, $f16 -/* B74368 800FD1C8 46024200 */ add.s $f8, $f8, $f2 -/* B7436C 800FD1CC 1460FFE3 */ bnez $v1, .L800FD15C -/* B74370 800FD1D0 46083083 */ div.s $f2, $f6, $f8 -/* B74374 800FD1D4 46028100 */ add.s $f4, $f16, $f2 -/* B74378 800FD1D8 14400003 */ bnez $v0, .L800FD1E8 -/* B7437C 800FD1DC 46046083 */ div.s $f2, $f12, $f4 -/* B74380 800FD1E0 03E00008 */ jr $ra -/* B74384 800FD1E4 46001006 */ mov.s $f0, $f2 - -.L800FD1E8: -/* B74388 800FD1E8 18400005 */ blez $v0, .L800FD200 -/* B7438C 800FD1EC 3C018015 */ lui $at, %hi(D_8014AAF8) -/* B74390 800FD1F0 3C018015 */ lui $at, %hi(D_8014AAF4) -/* B74394 800FD1F4 C428AAF4 */ lwc1 $f8, %lo(D_8014AAF4)($at) -/* B74398 800FD1F8 03E00008 */ jr $ra -/* B7439C 800FD1FC 46024001 */ sub.s $f0, $f8, $f2 - -.L800FD200: -/* B743A0 800FD200 C42AAAF8 */ lwc1 $f10, %lo(D_8014AAF8)($at) -/* B743A4 800FD204 46025001 */ sub.s $f0, $f10, $f2 -/* B743A8 800FD208 03E00008 */ jr $ra -/* B743AC 800FD20C 00000000 */ nop - -glabel func_800FD210 -/* B743B0 800FD210 3C0E8017 */ lui $t6, %hi(D_80175600) # $t6, 0x8017 -/* B743B4 800FD214 8DCE5600 */ lw $t6, %lo(D_80175600)($t6) -/* B743B8 800FD218 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* B743BC 800FD21C AFBF0014 */ sw $ra, 0x14($sp) -/* B743C0 800FD220 15C00005 */ bnez $t6, .L800FD238 -/* B743C4 800FD224 00000000 */ nop -/* B743C8 800FD228 0C03F3E8 */ jal func_800FCFA0 -/* B743CC 800FD22C 00000000 */ nop -/* B743D0 800FD230 10000004 */ b .L800FD244 -/* B743D4 800FD234 8FBF0014 */ lw $ra, 0x14($sp) -.L800FD238: -/* B743D8 800FD238 0C03F431 */ jal func_800FD0C4 -/* B743DC 800FD23C 00000000 */ nop -/* B743E0 800FD240 8FBF0014 */ lw $ra, 0x14($sp) -.L800FD244: -/* B743E4 800FD244 27BD0018 */ addiu $sp, $sp, 0x18 -/* B743E8 800FD248 03E00008 */ jr $ra -/* B743EC 800FD24C 00000000 */ nop - -glabel func_800FD250 -/* B743F0 800FD250 44801000 */ mtc1 $zero, $f2 -/* B743F4 800FD254 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* B743F8 800FD258 F7B40010 */ sdc1 $f20, 0x10($sp) -/* B743FC 800FD25C 46027032 */ c.eq.s $f14, $f2 -/* B74400 800FD260 46006506 */ mov.s $f20, $f12 -/* B74404 800FD264 AFBF001C */ sw $ra, 0x1c($sp) -/* B74408 800FD268 45020017 */ bc1fl .L800FD2C8 -/* B7440C 800FD26C 460E103E */ c.le.s $f2, $f14 -/* B74410 800FD270 46026032 */ c.eq.s $f12, $f2 -/* B74414 800FD274 00000000 */ nop -/* B74418 800FD278 45020004 */ bc1fl .L800FD28C -/* B7441C 800FD27C 4614103C */ c.lt.s $f2, $f20 -/* B74420 800FD280 10000028 */ b .L800FD324 -/* B74424 800FD284 46001006 */ mov.s $f0, $f2 -/* B74428 800FD288 4614103C */ c.lt.s $f2, $f20 -.L800FD28C: -/* B7442C 800FD28C 3C018015 */ lui $at, %hi(D_8014AAFC) -/* B74430 800FD290 45020004 */ bc1fl .L800FD2A4 -/* B74434 800FD294 4602A03C */ c.lt.s $f20, $f2 -/* B74438 800FD298 10000022 */ b .L800FD324 -/* B7443C 800FD29C C420AAFC */ lwc1 $f0, %lo(D_8014AAFC)($at) -/* B74440 800FD2A0 4602A03C */ c.lt.s $f20, $f2 -.L800FD2A4: -/* B74444 800FD2A4 3C018013 */ lui $at, %hi(D_801344A4) -/* B74448 800FD2A8 45000004 */ bc1f .L800FD2BC -/* B7444C 800FD2AC 00000000 */ nop -/* B74450 800FD2B0 3C018015 */ lui $at, %hi(D_8014AB00) -/* B74454 800FD2B4 1000001B */ b .L800FD324 -/* B74458 800FD2B8 C420AB00 */ lwc1 $f0, %lo(D_8014AB00)($at) -.L800FD2BC: -/* B7445C 800FD2BC 10000019 */ b .L800FD324 -/* B74460 800FD2C0 C42044A4 */ lwc1 $f0, %lo(D_801344A4)($at) -/* B74464 800FD2C4 460E103E */ c.le.s $f2, $f14 -.L800FD2C8: -/* B74468 800FD2C8 00000000 */ nop -/* B7446C 800FD2CC 45020006 */ bc1fl .L800FD2E8 -/* B74470 800FD2D0 4602A03C */ c.lt.s $f20, $f2 -/* B74474 800FD2D4 0C03F484 */ jal func_800FD210 -/* B74478 800FD2D8 460EA303 */ div.s $f12, $f20, $f14 -/* B7447C 800FD2DC 10000012 */ b .L800FD328 -/* B74480 800FD2E0 8FBF001C */ lw $ra, 0x1c($sp) -/* B74484 800FD2E4 4602A03C */ c.lt.s $f20, $f2 -.L800FD2E8: -/* B74488 800FD2E8 00000000 */ nop -/* B7448C 800FD2EC 45020008 */ bc1fl .L800FD310 -/* B74490 800FD2F0 460EA303 */ div.s $f12, $f20, $f14 -/* B74494 800FD2F4 0C03F484 */ jal func_800FD210 -/* B74498 800FD2F8 460EA303 */ div.s $f12, $f20, $f14 -/* B7449C 800FD2FC 3C018015 */ lui $at, %hi(D_8014AB04) -/* B744A0 800FD300 C424AB04 */ lwc1 $f4, %lo(D_8014AB04)($at) -/* B744A4 800FD304 10000007 */ b .L800FD324 -/* B744A8 800FD308 46040001 */ sub.s $f0, $f0, $f4 -/* B744AC 800FD30C 460EA303 */ div.s $f12, $f20, $f14 -.L800FD310: -/* B744B0 800FD310 0C03F484 */ jal func_800FD210 -/* B744B4 800FD314 46006307 */ neg.s $f12, $f12 -/* B744B8 800FD318 3C018015 */ lui $at, %hi(D_8014AB08) -/* B744BC 800FD31C C426AB08 */ lwc1 $f6, %lo(D_8014AB08)($at) -/* B744C0 800FD320 46003001 */ sub.s $f0, $f6, $f0 -.L800FD324: -/* B744C4 800FD324 8FBF001C */ lw $ra, 0x1c($sp) -.L800FD328: -/* B744C8 800FD328 D7B40010 */ ldc1 $f20, 0x10($sp) -/* B744CC 800FD32C 27BD0020 */ addiu $sp, $sp, 0x20 -/* B744D0 800FD330 03E00008 */ jr $ra -/* B744D4 800FD334 00000000 */ nop - -glabel func_800FD338 -/* B744D8 800FD338 460C6182 */ mul.s $f6, $f12, $f12 -/* B744DC 800FD33C 3C013F80 */ li $at, 0x3F800000 # 0.000000 -/* B744E0 800FD340 44812000 */ mtc1 $at, $f4 -/* B744E4 800FD344 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* B744E8 800FD348 AFBF0014 */ sw $ra, 0x14($sp) -/* B744EC 800FD34C 46062001 */ sub.s $f0, $f4, $f6 -/* B744F0 800FD350 0C03F494 */ jal func_800FD250 -/* B744F4 800FD354 46000384 */ sqrt.s $f14, $f0 -/* B744F8 800FD358 8FBF0014 */ lw $ra, 0x14($sp) -/* B744FC 800FD35C 27BD0018 */ addiu $sp, $sp, 0x18 -/* B74500 800FD360 03E00008 */ jr $ra -/* B74504 800FD364 00000000 */ nop - -glabel func_800FD368 -/* B74508 800FD368 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* B7450C 800FD36C AFBF0014 */ sw $ra, 0x14($sp) -/* B74510 800FD370 0C03F4CE */ jal func_800FD338 -/* B74514 800FD374 00000000 */ nop -/* B74518 800FD378 8FBF0014 */ lw $ra, 0x14($sp) -/* B7451C 800FD37C 3C018015 */ lui $at, %hi(D_8014AB0C) -/* B74520 800FD380 C424AB0C */ lwc1 $f4, %lo(D_8014AB0C)($at) -/* B74524 800FD384 27BD0018 */ addiu $sp, $sp, 0x18 -/* B74528 800FD388 03E00008 */ jr $ra -/* B7452C 800FD38C 46002001 */ sub.s $f0, $f4, $f0 - -glabel func_800FD390 -/* B74530 800FD390 4600630F */ floor.w.s $f12, $f12 -/* B74534 800FD394 03E00008 */ jr $ra -/* B74538 800FD398 46806020 */ cvt.s.w $f0, $f12 - -glabel func_800FD39C -/* B7453C 800FD39C 4620630F */ floor.w.d $f12, $f12 -/* B74540 800FD3A0 03E00008 */ jr $ra -/* B74544 800FD3A4 46806021 */ cvt.d.w $f0, $f12 - -glabel func_800FD3A8 -/* B74548 800FD3A8 4600610F */ floor.w.s $f4, $f12 -/* B7454C 800FD3AC 44022000 */ mfc1 $v0, $f4 -/* B74550 800FD3B0 03E00008 */ jr $ra -/* B74554 800FD3B4 00000000 */ nop - -glabel func_800FD3B8 -/* B74558 800FD3B8 4620610F */ floor.w.d $f4, $f12 -/* B7455C 800FD3BC 44022000 */ mfc1 $v0, $f4 -/* B74560 800FD3C0 03E00008 */ jr $ra -/* B74564 800FD3C4 00000000 */ nop - -glabel func_800FD3C8 -/* B74568 800FD3C8 4600630E */ ceil.w.s $f12, $f12 -/* B7456C 800FD3CC 03E00008 */ jr $ra -/* B74570 800FD3D0 46806020 */ cvt.s.w $f0, $f12 - -glabel func_800FD3D4 -/* B74574 800FD3D4 4620630E */ ceil.w.d $f12, $f12 -/* B74578 800FD3D8 03E00008 */ jr $ra -/* B7457C 800FD3DC 46806021 */ cvt.d.w $f0, $f12 - -glabel func_800FD3E0 -/* B74580 800FD3E0 4600610E */ ceil.w.s $f4, $f12 -/* B74584 800FD3E4 44022000 */ mfc1 $v0, $f4 -/* B74588 800FD3E8 03E00008 */ jr $ra -/* B7458C 800FD3EC 00000000 */ nop - -glabel func_800FD3F0 -/* B74590 800FD3F0 4620610E */ ceil.w.d $f4, $f12 -/* B74594 800FD3F4 44022000 */ mfc1 $v0, $f4 -/* B74598 800FD3F8 03E00008 */ jr $ra -/* B7459C 800FD3FC 00000000 */ nop - -glabel func_800FD400 -/* B745A0 800FD400 4600630D */ trunc.w.s $f12, $f12 -/* B745A4 800FD404 03E00008 */ jr $ra -/* B745A8 800FD408 46806020 */ cvt.s.w $f0, $f12 - -glabel func_800FD40C -/* B745AC 800FD40C 4620630D */ trunc.w.d $f12, $f12 -/* B745B0 800FD410 03E00008 */ jr $ra -/* B745B4 800FD414 46806021 */ cvt.d.w $f0, $f12 - -glabel func_800FD418 -/* B745B8 800FD418 4600610D */ trunc.w.s $f4, $f12 -/* B745BC 800FD41C 44022000 */ mfc1 $v0, $f4 -/* B745C0 800FD420 03E00008 */ jr $ra -/* B745C4 800FD424 00000000 */ nop - -glabel func_800FD428 -/* B745C8 800FD428 4620610D */ trunc.w.d $f4, $f12 -/* B745CC 800FD42C 44022000 */ mfc1 $v0, $f4 -/* B745D0 800FD430 03E00008 */ jr $ra -/* B745D4 800FD434 00000000 */ nop - -glabel func_800FD438 -/* B745D8 800FD438 4600630C */ round.w.s $f12, $f12 -/* B745DC 800FD43C 03E00008 */ jr $ra -/* B745E0 800FD440 46806020 */ cvt.s.w $f0, $f12 - -glabel func_800FD444 -/* B745E4 800FD444 4620630C */ round.w.d $f12, $f12 -/* B745E8 800FD448 03E00008 */ jr $ra -/* B745EC 800FD44C 46806021 */ cvt.d.w $f0, $f12 - -glabel func_800FD450 -/* B745F0 800FD450 4600610C */ round.w.s $f4, $f12 -/* B745F4 800FD454 44022000 */ mfc1 $v0, $f4 -/* B745F8 800FD458 03E00008 */ jr $ra -/* B745FC 800FD45C 00000000 */ nop - -glabel func_800FD460 -/* B74600 800FD460 4620610C */ round.w.d $f4, $f12 -/* B74604 800FD464 44022000 */ mfc1 $v0, $f4 -/* B74608 800FD468 03E00008 */ jr $ra -/* B7460C 800FD46C 00000000 */ nop - -glabel func_800FD470 -/* B74610 800FD470 3C013F00 */ li $at, 0x3F000000 # 0.000000 -/* B74614 800FD474 44812000 */ mtc1 $at, $f4 -/* B74618 800FD478 00000000 */ nop -/* B7461C 800FD47C 46046000 */ add.s $f0, $f12, $f4 -/* B74620 800FD480 4600000F */ floor.w.s $f0, $f0 -/* B74624 800FD484 03E00008 */ jr $ra -/* B74628 800FD488 46800020 */ cvt.s.w $f0, $f0 - -glabel func_800FD48C -/* B7462C 800FD48C 3C013FE0 */ li $at, 0x3FE00000 # 0.000000 -/* B74630 800FD490 44812800 */ mtc1 $at, $f5 -/* B74634 800FD494 44802000 */ mtc1 $zero, $f4 -/* B74638 800FD498 00000000 */ nop -/* B7463C 800FD49C 46246000 */ add.d $f0, $f12, $f4 -/* B74640 800FD4A0 4620000F */ floor.w.d $f0, $f0 -/* B74644 800FD4A4 03E00008 */ jr $ra -/* B74648 800FD4A8 46800021 */ cvt.d.w $f0, $f0 - -glabel func_800FD4AC -/* B7464C 800FD4AC 3C013F00 */ li $at, 0x3F000000 # 0.000000 -/* B74650 800FD4B0 44812000 */ mtc1 $at, $f4 -/* B74654 800FD4B4 00000000 */ nop -/* B74658 800FD4B8 46046000 */ add.s $f0, $f12, $f4 -/* B7465C 800FD4BC 4600000F */ floor.w.s $f0, $f0 -/* B74660 800FD4C0 44020000 */ mfc1 $v0, $f0 -/* B74664 800FD4C4 03E00008 */ jr $ra -/* B74668 800FD4C8 00000000 */ nop - -glabel func_800FD4CC -/* B7466C 800FD4CC 3C013FE0 */ li $at, 0x3FE00000 # 0.000000 -/* B74670 800FD4D0 44812800 */ mtc1 $at, $f5 -/* B74674 800FD4D4 44802000 */ mtc1 $zero, $f4 -/* B74678 800FD4D8 00000000 */ nop -/* B7467C 800FD4DC 46246000 */ add.d $f0, $f12, $f4 -/* B74680 800FD4E0 4620000F */ floor.w.d $f0, $f0 -/* B74684 800FD4E4 44020000 */ mfc1 $v0, $f0 -/* B74688 800FD4E8 03E00008 */ jr $ra -/* B7468C 800FD4EC 00000000 */ nop diff --git a/asm/fp.s b/asm/fp.s new file mode 100644 index 0000000000..4954e8ddc0 --- /dev/null +++ b/asm/fp.s @@ -0,0 +1,138 @@ +.include "macro.inc" + + +.section .data + +glabel qNaN0x3FFFFF + .word 0x7FBFFFFF + +glabel qNaN0x10000 + .word 0x7F810000 + +glabel sNaN0x3FFFFF + .word 0x7FFFFFFF + + +.section .text + +glabel floorf + floor.w.s $f12, $f12 + cvt.s.w $f0, $f12 + jr $ra + +glabel floor + floor.w.d $f12, $f12 + cvt.d.w $f0, $f12 + jr $ra + +glabel lfloorf + floor.w.s $f4, $f12 + mfc1 $v0, $f4 + nop + jr $ra + +glabel lfloor + floor.w.d $f4, $f12 + mfc1 $v0, $f4 + nop + jr $ra + +glabel ceilf + ceil.w.s $f12, $f12 + cvt.s.w $f0, $f12 + jr $ra + +glabel ceil + ceil.w.d $f12, $f12 + cvt.d.w $f0, $f12 + jr $ra + +glabel lceilf + ceil.w.s $f4, $f12 + mfc1 $v0, $f4 + nop + jr $ra + +glabel lceil + ceil.w.d $f4, $f12 + mfc1 $v0, $f4 + nop + jr $ra + +glabel truncf + trunc.w.s $f12, $f12 + cvt.s.w $f0, $f12 + jr $ra + +glabel trunc + trunc.w.d $f12, $f12 + cvt.d.w $f0, $f12 + jr $ra + +glabel ltruncf + trunc.w.s $f4, $f12 + mfc1 $v0, $f4 + nop + jr $ra + +glabel ltrunc + trunc.w.d $f4, $f12 + mfc1 $v0, $f4 + nop + jr $ra + +glabel nearbyintf + round.w.s $f12, $f12 + cvt.s.w $f0, $f12 + jr $ra + +glabel nearbyint + round.w.d $f12, $f12 + cvt.d.w $f0, $f12 + jr $ra + +glabel lnearbyintf + round.w.s $f4, $f12 + mfc1 $v0, $f4 + nop + jr $ra + +glabel lnearbyint + round.w.d $f4, $f12 + mfc1 $v0, $f4 + nop + jr $ra + +glabel roundf + li.s $f4, 0.5 + nop + add.s $f0, $f12, $f4 + floor.w.s $f0, $f0 + cvt.s.w $f0, $f0 + jr $ra + +glabel round + li.d $f4, 0.5 + nop + add.d $f0, $f12, $f4 + floor.w.d $f0, $f0 + cvt.d.w $f0, $f0 + jr $ra + +glabel lroundf + li.s $f4, 0.5 + nop + add.s $f0, $f12, $f4 + floor.w.s $f0, $f0 + mfc1 $v0, $f0 + nop + jr $ra + +glabel lround + li.d $f4, 0.5 + nop + add.d $f0, $f12, $f4 + floor.w.d $f0, $f0 + mfc1 $v0, $f0 + nop + jr $ra diff --git a/asm/game.s b/asm/game.s index 794d7972bb..28e5e06a1e 100644 --- a/asm/game.s +++ b/asm/game.s @@ -411,11 +411,11 @@ glabel func_800C46EC /* B3B89C 800C46FC AFA50084 */ sw $a1, 0x84($sp) /* B3B8A0 800C4700 24C64D50 */ addiu $a2, %lo(D_80144D50) # addiu $a2, $a2, 0x4d50 /* B3B8A4 800C4704 27A40064 */ addiu $a0, $sp, 0x64 -/* B3B8A8 800C4708 0C031AB1 */ jal func_800C6AC4 +/* B3B8A8 800C4708 0C031AB1 */ jal Graph_OpenDisps /* B3B8AC 800C470C 240702EA */ li $a3, 746 /* B3B8B0 800C4710 8FAE0084 */ lw $t6, 0x84($sp) /* B3B8B4 800C4714 8DC402C0 */ lw $a0, 0x2c0($t6) -/* B3B8B8 800C4718 0C031B08 */ jal func_800C6C20 +/* B3B8B8 800C4718 0C031B08 */ jal Graph_GfxPlusOne /* B3B8BC 800C471C AFA40078 */ sw $a0, 0x78($sp) /* B3B8C0 800C4720 8FAF0084 */ lw $t7, 0x84($sp) /* B3B8C4 800C4724 AFA2007C */ sw $v0, 0x7c($sp) @@ -497,7 +497,7 @@ glabel func_800C46EC /* B3B9E4 800C4844 AD200004 */ sw $zero, 4($t1) /* B3B9E8 800C4848 AD2B0000 */ sw $t3, ($t1) /* B3B9EC 800C484C 8FA5007C */ lw $a1, 0x7c($sp) -/* B3B9F0 800C4850 0C031B0A */ jal func_800C6C28 +/* B3B9F0 800C4850 0C031B0A */ jal Graph_BranchDlist /* B3B9F4 800C4854 8FA40078 */ lw $a0, 0x78($sp) /* B3B9F8 800C4858 8FAC007C */ lw $t4, 0x7c($sp) /* B3B9FC 800C485C 8FAD0084 */ lw $t5, 0x84($sp) @@ -506,7 +506,7 @@ glabel func_800C46EC /* B3BA08 800C4868 ADAC02C0 */ sw $t4, 0x2c0($t5) /* B3BA0C 800C486C 8FA50084 */ lw $a1, 0x84($sp) /* B3BA10 800C4870 27A40064 */ addiu $a0, $sp, 0x64 -/* B3BA14 800C4874 0C031AD5 */ jal func_800C6B54 +/* B3BA14 800C4874 0C031AD5 */ jal Graph_CloseDisps /* B3BA18 800C4878 24070320 */ li $a3, 800 /* B3BA1C 800C487C 0C018F5F */ jal func_80063D7C /* B3BA20 800C4880 8FA40084 */ lw $a0, 0x84($sp) @@ -538,7 +538,7 @@ glabel func_800C48CC /* B3BA7C 800C48DC 24C64D98 */ addiu $a2, %lo(D_80144D98) # addiu $a2, $a2, 0x4d98 /* B3BA80 800C48E0 AFA50058 */ sw $a1, 0x58($sp) /* B3BA84 800C48E4 27A40044 */ addiu $a0, $sp, 0x44 -/* B3BA88 800C48E8 0C031AB1 */ jal func_800C6AC4 +/* B3BA88 800C48E8 0C031AB1 */ jal Graph_OpenDisps /* B3BA8C 800C48EC 2407032E */ li $a3, 814 /* B3BA90 800C48F0 8FA50058 */ lw $a1, 0x58($sp) /* B3BA94 800C48F4 3C06DB06 */ lui $a2, 0xdb06 @@ -599,7 +599,7 @@ glabel func_800C48CC /* B3BB70 800C49D0 ACB802B0 */ sw $t8, 0x2b0($a1) /* B3BB74 800C49D4 AC440004 */ sw $a0, 4($v0) /* B3BB78 800C49D8 27A40044 */ addiu $a0, $sp, 0x44 -/* B3BB7C 800C49DC 0C031AD5 */ jal func_800C6B54 +/* B3BB7C 800C49DC 0C031AD5 */ jal Graph_CloseDisps /* B3BB80 800C49E0 AC480000 */ sw $t0, ($v0) /* B3BB84 800C49E4 8FBF0014 */ lw $ra, 0x14($sp) /* B3BB88 800C49E8 27BD0058 */ addiu $sp, $sp, 0x58 @@ -615,11 +615,11 @@ glabel func_800C49F4 /* B3BBA8 800C4A08 24C64DB0 */ addiu $a2, %lo(D_80144DB0) # addiu $a2, $a2, 0x4db0 /* B3BBAC 800C4A0C 02002825 */ move $a1, $s0 /* B3BBB0 800C4A10 27A4002C */ addiu $a0, $sp, 0x2c -/* B3BBB4 800C4A14 0C031AB1 */ jal func_800C6AC4 +/* B3BBB4 800C4A14 0C031AB1 */ jal Graph_OpenDisps /* B3BBB8 800C4A18 2407034E */ li $a3, 846 /* B3BBBC 800C4A1C 8E0602C0 */ lw $a2, 0x2c0($s0) /* B3BBC0 800C4A20 00C02025 */ move $a0, $a2 -/* B3BBC4 800C4A24 0C031B08 */ jal func_800C6C20 +/* B3BBC4 800C4A24 0C031B08 */ jal Graph_GfxPlusOne /* B3BBC8 800C4A28 AFA60040 */ sw $a2, 0x40($sp) /* B3BBCC 800C4A2C 8E0402B0 */ lw $a0, 0x2b0($s0) /* B3BBD0 800C4A30 8FA60040 */ lw $a2, 0x40($sp) @@ -633,7 +633,7 @@ glabel func_800C49F4 /* B3BBF0 800C4A50 AC400004 */ sw $zero, 4($v0) /* B3BBF4 800C4A54 24450008 */ addiu $a1, $v0, 8 /* B3BBF8 800C4A58 AFA50044 */ sw $a1, 0x44($sp) -/* B3BBFC 800C4A5C 0C031B0A */ jal func_800C6C28 +/* B3BBFC 800C4A5C 0C031B0A */ jal Graph_BranchDlist /* B3BC00 800C4A60 00C02025 */ move $a0, $a2 /* B3BC04 800C4A64 8FA50044 */ lw $a1, 0x44($sp) /* B3BC08 800C4A68 3C068014 */ lui $a2, %hi(D_80144DBC) # $a2, 0x8014 @@ -641,7 +641,7 @@ glabel func_800C49F4 /* B3BC10 800C4A70 AE0502C0 */ sw $a1, 0x2c0($s0) /* B3BC14 800C4A74 02002825 */ move $a1, $s0 /* B3BC18 800C4A78 27A4002C */ addiu $a0, $sp, 0x2c -/* B3BC1C 800C4A7C 0C031AD5 */ jal func_800C6B54 +/* B3BC1C 800C4A7C 0C031AD5 */ jal Graph_CloseDisps /* B3BC20 800C4A80 24070361 */ li $a3, 865 /* B3BC24 800C4A84 8FBF001C */ lw $ra, 0x1c($sp) /* B3BC28 800C4A88 8FB00018 */ lw $s0, 0x18($sp) diff --git a/asm/graph.s b/asm/graph.s deleted file mode 100644 index 2c0e13348d..0000000000 --- a/asm/graph.s +++ /dev/null @@ -1,1381 +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 purposee registers - -.section .text - -.align 4 - -glabel func_800C5850 -/* B3C9F0 800C5850 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* B3C9F4 800C5854 AFBF0014 */ sw $ra, 0x14($sp) -/* B3C9F8 800C5858 0C0011D0 */ jal osViGetNextFramebuffer -/* B3C9FC 800C585C 00000000 */ nop -/* B3CA00 800C5860 AFA2001C */ sw $v0, 0x1c($sp) -/* B3CA04 800C5864 0C032942 */ jal SysCfb_GetFbPtr -/* B3CA08 800C5868 00002025 */ move $a0, $zero -/* B3CA0C 800C586C 8FAE001C */ lw $t6, 0x1c($sp) -/* B3CA10 800C5870 104E0005 */ beq $v0, $t6, .L800C5888 -/* B3CA14 800C5874 00000000 */ nop -/* B3CA18 800C5878 0C032942 */ jal SysCfb_GetFbPtr -/* B3CA1C 800C587C 00002025 */ move $a0, $zero -/* B3CA20 800C5880 10000004 */ b .L800C5894 -/* B3CA24 800C5884 00402025 */ move $a0, $v0 -.L800C5888: -/* B3CA28 800C5888 0C032942 */ jal SysCfb_GetFbPtr -/* B3CA2C 800C588C 24040001 */ li $a0, 1 -/* B3CA30 800C5890 00402025 */ move $a0, $v0 -.L800C5894: -/* B3CA34 800C5894 0C0019A4 */ jal osViSwapBuffer -/* B3CA38 800C5898 00000000 */ nop -/* B3CA3C 800C589C 0C035213 */ jal Fault_WaitForInput -/* B3CA40 800C58A0 00000000 */ nop -/* B3CA44 800C58A4 0C0019A4 */ jal osViSwapBuffer -/* B3CA48 800C58A8 8FA4001C */ lw $a0, 0x1c($sp) -/* B3CA4C 800C58AC 8FBF0014 */ lw $ra, 0x14($sp) -/* B3CA50 800C58B0 27BD0020 */ addiu $sp, $sp, 0x20 -/* B3CA54 800C58B4 03E00008 */ jr $ra -/* B3CA58 800C58B8 00000000 */ nop - -glabel func_800C58BC -/* B3CA5C 800C58BC 3C028016 */ lui $v0, %hi(gGameInfo) # $v0, 0x8016 -/* B3CA60 800C58C0 2442FA90 */ addiu $v0, %lo(gGameInfo) # addiu $v0, $v0, -0x570 -/* B3CA64 800C58C4 8C430000 */ lw $v1, ($v0) -/* B3CA68 800C58C8 27BDFF08 */ addiu $sp, $sp, -0xf8 -/* B3CA6C 800C58CC AFBF0014 */ sw $ra, 0x14($sp) -/* B3CA70 800C58D0 AFA400F8 */ sw $a0, 0xf8($sp) -/* B3CA74 800C58D4 846E1074 */ lh $t6, 0x1074($v1) -/* B3CA78 800C58D8 24010007 */ li $at, 7 -/* B3CA7C 800C58DC 55C10071 */ bnel $t6, $at, .L800C5AA4 -/* B3CA80 800C58E0 8FBF0014 */ lw $ra, 0x14($sp) -/* B3CA84 800C58E4 846F1076 */ lh $t7, 0x1076($v1) -/* B3CA88 800C58E8 51E0006E */ beql $t7, $zero, .L800C5AA4 -/* B3CA8C 800C58EC 8FBF0014 */ lw $ra, 0x14($sp) -/* B3CA90 800C58F0 0C035FD7 */ jal func_800D7F5C -/* B3CA94 800C58F4 27A40020 */ addiu $a0, $sp, 0x20 -/* B3CA98 800C58F8 3C028016 */ lui $v0, %hi(gGameInfo) # $v0, 0x8016 -/* B3CA9C 800C58FC 2442FA90 */ addiu $v0, %lo(gGameInfo) # addiu $v0, $v0, -0x570 -/* B3CAA0 800C5900 8C580000 */ lw $t8, ($v0) -/* B3CAA4 800C5904 3C068013 */ lui $a2, %hi(D_8012D230) # $a2, 0x8013 -/* B3CAA8 800C5908 24C6D230 */ addiu $a2, %lo(D_8012D230) # addiu $a2, $a2, -0x2dd0 -/* B3CAAC 800C590C 8719107A */ lh $t9, 0x107a($t8) -/* B3CAB0 800C5910 27A40020 */ addiu $a0, $sp, 0x20 -/* B3CAB4 800C5914 24050003 */ li $a1, 3 -/* B3CAB8 800C5918 0C036B20 */ jal func_800DAC80 -/* B3CABC 800C591C AFB900DC */ sw $t9, 0xdc($sp) -/* B3CAC0 800C5920 3C058015 */ lui $a1, %hi(D_80155F50) # $a1, 0x8015 -/* B3CAC4 800C5924 24A55F50 */ addiu $a1, %lo(D_80155F50) # addiu $a1, $a1, 0x5f50 -/* B3CAC8 800C5928 0C036B24 */ jal func_800DAC90 -/* B3CACC 800C592C 27A40020 */ addiu $a0, $sp, 0x20 -/* B3CAD0 800C5930 27A40020 */ addiu $a0, $sp, 0x20 -/* B3CAD4 800C5934 0C036100 */ jal func_800D8400 -/* B3CAD8 800C5938 8FA500F8 */ lw $a1, 0xf8($sp) -/* B3CADC 800C593C 3C028016 */ lui $v0, %hi(gGameInfo) # $v0, 0x8016 -/* B3CAE0 800C5940 2442FA90 */ addiu $v0, %lo(gGameInfo) # addiu $v0, $v0, -0x570 -/* B3CAE4 800C5944 8C490000 */ lw $t1, ($v0) -/* B3CAE8 800C5948 8FA800AC */ lw $t0, 0xac($sp) -/* B3CAEC 800C594C 24010001 */ li $at, 1 -/* B3CAF0 800C5950 3C048014 */ lui $a0, %hi(D_80145180) # $a0, 0x8014 -/* B3CAF4 800C5954 A528108E */ sh $t0, 0x108e($t1) -/* B3CAF8 800C5958 8FAA00BC */ lw $t2, 0xbc($sp) -/* B3CAFC 800C595C 8FAE00C0 */ lw $t6, 0xc0($sp) -/* B3CB00 800C5960 8FAC00B8 */ lw $t4, 0xb8($sp) -/* B3CB04 800C5964 8FB900C4 */ lw $t9, 0xc4($sp) -/* B3CB08 800C5968 000A5840 */ sll $t3, $t2, 1 -/* B3CB0C 800C596C 8C490000 */ lw $t1, ($v0) -/* B3CB10 800C5970 000E7840 */ sll $t7, $t6, 1 -/* B3CB14 800C5974 016C6821 */ addu $t5, $t3, $t4 -/* B3CB18 800C5978 01AFC021 */ addu $t8, $t5, $t7 -/* B3CB1C 800C597C 03194021 */ addu $t0, $t8, $t9 -/* B3CB20 800C5980 A528107C */ sh $t0, 0x107c($t1) -/* B3CB24 800C5984 8C4B0000 */ lw $t3, ($v0) -/* B3CB28 800C5988 8FAA00B0 */ lw $t2, 0xb0($sp) -/* B3CB2C 800C598C 24845180 */ addiu $a0, %lo(D_80145180) # addiu $a0, $a0, 0x5180 -/* B3CB30 800C5990 A56A107E */ sh $t2, 0x107e($t3) -/* B3CB34 800C5994 8C4E0000 */ lw $t6, ($v0) -/* B3CB38 800C5998 8FAC00B4 */ lw $t4, 0xb4($sp) -/* B3CB3C 800C599C A5CC1080 */ sh $t4, 0x1080($t6) -/* B3CB40 800C59A0 8C4F0000 */ lw $t7, ($v0) -/* B3CB44 800C59A4 8FAD00B8 */ lw $t5, 0xb8($sp) -/* B3CB48 800C59A8 A5ED1082 */ sh $t5, 0x1082($t7) -/* B3CB4C 800C59AC 8C590000 */ lw $t9, ($v0) -/* B3CB50 800C59B0 8FB800BC */ lw $t8, 0xbc($sp) -/* B3CB54 800C59B4 A7381084 */ sh $t8, 0x1084($t9) -/* B3CB58 800C59B8 8C490000 */ lw $t1, ($v0) -/* B3CB5C 800C59BC 8FA800C0 */ lw $t0, 0xc0($sp) -/* B3CB60 800C59C0 A5281086 */ sh $t0, 0x1086($t1) -/* B3CB64 800C59C4 8C4B0000 */ lw $t3, ($v0) -/* B3CB68 800C59C8 8FAA00C4 */ lw $t2, 0xc4($sp) -/* B3CB6C 800C59CC A56A1088 */ sh $t2, 0x1088($t3) -/* B3CB70 800C59D0 8C4E0000 */ lw $t6, ($v0) -/* B3CB74 800C59D4 8FAC00D8 */ lw $t4, 0xd8($sp) -/* B3CB78 800C59D8 A5CC108A */ sh $t4, 0x108a($t6) -/* B3CB7C 800C59DC 8C4F0000 */ lw $t7, ($v0) -/* B3CB80 800C59E0 8FAD00C8 */ lw $t5, 0xc8($sp) -/* B3CB84 800C59E4 A5ED108C */ sh $t5, 0x108c($t7) -/* B3CB88 800C59E8 8C580000 */ lw $t8, ($v0) -/* B3CB8C 800C59EC 87031078 */ lh $v1, 0x1078($t8) -/* B3CB90 800C59F0 10610003 */ beq $v1, $at, .L800C5A00 -/* B3CB94 800C59F4 24010002 */ li $at, 2 -/* B3CB98 800C59F8 14610027 */ bne $v1, $at, .L800C5A98 -/* B3CB9C 800C59FC 00000000 */ nop -.L800C5A00: -/* B3CBA0 800C5A00 0C00084C */ jal osSyncPrintf -/* B3CBA4 800C5A04 8FA500B0 */ lw $a1, 0xb0($sp) -/* B3CBA8 800C5A08 3C048014 */ lui $a0, %hi(D_8014518C) # $a0, 0x8014 -/* B3CBAC 800C5A0C 2484518C */ addiu $a0, %lo(D_8014518C) # addiu $a0, $a0, 0x518c -/* B3CBB0 800C5A10 0C00084C */ jal osSyncPrintf -/* B3CBB4 800C5A14 8FA500B4 */ lw $a1, 0xb4($sp) -/* B3CBB8 800C5A18 3C048014 */ lui $a0, %hi(D_8014519C) # $a0, 0x8014 -/* B3CBBC 800C5A1C 2484519C */ addiu $a0, %lo(D_8014519C) # addiu $a0, $a0, 0x519c -/* B3CBC0 800C5A20 0C00084C */ jal osSyncPrintf -/* B3CBC4 800C5A24 8FA500B8 */ lw $a1, 0xb8($sp) -/* B3CBC8 800C5A28 3C048014 */ lui $a0, %hi(D_801451AC) # $a0, 0x8014 -/* B3CBCC 800C5A2C 248451AC */ addiu $a0, %lo(D_801451AC) # addiu $a0, $a0, 0x51ac -/* B3CBD0 800C5A30 0C00084C */ jal osSyncPrintf -/* B3CBD4 800C5A34 8FA500BC */ lw $a1, 0xbc($sp) -/* B3CBD8 800C5A38 3C048014 */ lui $a0, %hi(D_801451BC) # $a0, 0x8014 -/* B3CBDC 800C5A3C 248451BC */ addiu $a0, %lo(D_801451BC) # addiu $a0, $a0, 0x51bc -/* B3CBE0 800C5A40 0C00084C */ jal osSyncPrintf -/* B3CBE4 800C5A44 8FA500C0 */ lw $a1, 0xc0($sp) -/* B3CBE8 800C5A48 3C048014 */ lui $a0, %hi(D_801451CC) # $a0, 0x8014 -/* B3CBEC 800C5A4C 248451CC */ addiu $a0, %lo(D_801451CC) # addiu $a0, $a0, 0x51cc -/* B3CBF0 800C5A50 0C00084C */ jal osSyncPrintf -/* B3CBF4 800C5A54 8FA500C4 */ lw $a1, 0xc4($sp) -/* B3CBF8 800C5A58 3C048014 */ lui $a0, %hi(D_801451DC) # $a0, 0x8014 -/* B3CBFC 800C5A5C 248451DC */ addiu $a0, %lo(D_801451DC) # addiu $a0, $a0, 0x51dc -/* B3CC00 800C5A60 0C00084C */ jal osSyncPrintf -/* B3CC04 800C5A64 8FA500D8 */ lw $a1, 0xd8($sp) -/* B3CC08 800C5A68 3C048014 */ lui $a0, %hi(D_801451EC) # $a0, 0x8014 -/* B3CC0C 800C5A6C 248451EC */ addiu $a0, %lo(D_801451EC) # addiu $a0, $a0, 0x51ec -/* B3CC10 800C5A70 0C00084C */ jal osSyncPrintf -/* B3CC14 800C5A74 8FA500C8 */ lw $a1, 0xc8($sp) -/* B3CC18 800C5A78 3C048014 */ lui $a0, %hi(D_80145200) # $a0, 0x8014 -/* B3CC1C 800C5A7C 24845200 */ addiu $a0, %lo(D_80145200) # addiu $a0, $a0, 0x5200 -/* B3CC20 800C5A80 0C00084C */ jal osSyncPrintf -/* B3CC24 800C5A84 8FA500A8 */ lw $a1, 0xa8($sp) -/* B3CC28 800C5A88 3C048014 */ lui $a0, %hi(D_80145210) # $a0, 0x8014 -/* B3CC2C 800C5A8C 24845210 */ addiu $a0, %lo(D_80145210) # addiu $a0, $a0, 0x5210 -/* B3CC30 800C5A90 0C00084C */ jal osSyncPrintf -/* B3CC34 800C5A94 8FA500AC */ lw $a1, 0xac($sp) -.L800C5A98: -/* B3CC38 800C5A98 0C035FF1 */ jal func_800D7FC4 -/* B3CC3C 800C5A9C 27A40020 */ addiu $a0, $sp, 0x20 -/* B3CC40 800C5AA0 8FBF0014 */ lw $ra, 0x14($sp) -.L800C5AA4: -/* B3CC44 800C5AA4 27BD00F8 */ addiu $sp, $sp, 0xf8 -/* B3CC48 800C5AA8 03E00008 */ jr $ra -/* B3CC4C 800C5AAC 00000000 */ nop - -glabel func_800C5AB0 -/* B3CC50 800C5AB0 27BDFF10 */ addiu $sp, $sp, -0xf0 -/* B3CC54 800C5AB4 AFBF0014 */ sw $ra, 0x14($sp) -/* B3CC58 800C5AB8 AFA400F0 */ sw $a0, 0xf0($sp) -/* B3CC5C 800C5ABC 0C035FD7 */ jal func_800D7F5C -/* B3CC60 800C5AC0 27A40018 */ addiu $a0, $sp, 0x18 -/* B3CC64 800C5AC4 240E0001 */ li $t6, 1 -/* B3CC68 800C5AC8 3C068013 */ lui $a2, %hi(D_8012D248) # $a2, 0x8013 -/* B3CC6C 800C5ACC AFAE00D4 */ sw $t6, 0xd4($sp) -/* B3CC70 800C5AD0 24C6D248 */ addiu $a2, %lo(D_8012D248) # addiu $a2, $a2, -0x2db8 -/* B3CC74 800C5AD4 27A40018 */ addiu $a0, $sp, 0x18 -/* B3CC78 800C5AD8 0C036B20 */ jal func_800DAC80 -/* B3CC7C 800C5ADC 24050003 */ li $a1, 3 -/* B3CC80 800C5AE0 3C058015 */ lui $a1, %hi(D_80155F50) # $a1, 0x8015 -/* B3CC84 800C5AE4 24A55F50 */ addiu $a1, %lo(D_80155F50) # addiu $a1, $a1, 0x5f50 -/* B3CC88 800C5AE8 0C036B24 */ jal func_800DAC90 -/* B3CC8C 800C5AEC 27A40018 */ addiu $a0, $sp, 0x18 -/* B3CC90 800C5AF0 27A40018 */ addiu $a0, $sp, 0x18 -/* B3CC94 800C5AF4 0C036100 */ jal func_800D8400 -/* B3CC98 800C5AF8 8FA500F0 */ lw $a1, 0xf0($sp) -/* B3CC9C 800C5AFC 0C035FF1 */ jal func_800D7FC4 -/* B3CCA0 800C5B00 27A40018 */ addiu $a0, $sp, 0x18 -/* B3CCA4 800C5B04 8FBF0014 */ lw $ra, 0x14($sp) -/* B3CCA8 800C5B08 27BD00F0 */ addiu $sp, $sp, 0xf0 -/* B3CCAC 800C5B0C 03E00008 */ jr $ra -/* B3CCB0 800C5B10 00000000 */ nop - -glabel func_800C5B14 -/* B3CCB4 800C5B14 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* B3CCB8 800C5B18 AFBF001C */ sw $ra, 0x1c($sp) -/* B3CCBC 800C5B1C AFB10018 */ sw $s1, 0x18($sp) -/* B3CCC0 800C5B20 AFB00014 */ sw $s0, 0x14($sp) -/* B3CCC4 800C5B24 8C8E02D8 */ lw $t6, 0x2d8($a0) -/* B3CCC8 800C5B28 3C19801B */ lui $t9, %hi(gGfxPools) # $t9, 0x801b -/* B3CCCC 800C5B2C 273941C0 */ addiu $t9, %lo(gGfxPools) # addiu $t9, $t9, 0x41c0 -/* B3CCD0 800C5B30 31CF0001 */ andi $t7, $t6, 1 -/* B3CCD4 800C5B34 000FC0C0 */ sll $t8, $t7, 3 -/* B3CCD8 800C5B38 030FC021 */ addu $t8, $t8, $t7 -/* B3CCDC 800C5B3C 0018C0C0 */ sll $t8, $t8, 3 -/* B3CCE0 800C5B40 030FC021 */ addu $t8, $t8, $t7 -/* B3CCE4 800C5B44 0018C180 */ sll $t8, $t8, 6 -/* B3CCE8 800C5B48 030FC021 */ addu $t8, $t8, $t7 -/* B3CCEC 800C5B4C 0018C100 */ sll $t8, $t8, 4 -/* B3CCF0 800C5B50 03198821 */ addu $s1, $t8, $t9 -/* B3CCF4 800C5B54 24081234 */ li $t0, 4660 -/* B3CCF8 800C5B58 3C010001 */ lui $at, 1 -/* B3CCFC 800C5B5C A6280000 */ sh $t0, ($s1) -/* B3CD00 800C5B60 00310821 */ addu $at, $at, $s1 -/* B3CD04 800C5B64 24095678 */ li $t1, 22136 -/* B3CD08 800C5B68 00808025 */ move $s0, $a0 -/* B3CD0C 800C5B6C A4292408 */ sh $t1, 0x2408($at) -/* B3CD10 800C5B70 26250008 */ addiu $a1, $s1, 8 -/* B3CD14 800C5B74 AFA50030 */ sw $a1, 0x30($sp) -/* B3CD18 800C5B78 248402B8 */ addiu $a0, $a0, 0x2b8 -/* B3CD1C 800C5B7C 0C030E20 */ jal THGA_Ct -/* B3CD20 800C5B80 3406BF00 */ li $a2, 48896 -/* B3CD24 800C5B84 3401BF08 */ li $at, 48904 -/* B3CD28 800C5B88 02212821 */ addu $a1, $s1, $at -/* B3CD2C 800C5B8C AFA5002C */ sw $a1, 0x2c($sp) -/* B3CD30 800C5B90 260402C8 */ addiu $a0, $s0, 0x2c8 -/* B3CD34 800C5B94 0C030E20 */ jal THGA_Ct -/* B3CD38 800C5B98 24064000 */ li $a2, 16384 -/* B3CD3C 800C5B9C 3401FF08 */ li $at, 65288 -/* B3CD40 800C5BA0 02212821 */ addu $a1, $s1, $at -/* B3CD44 800C5BA4 AFA50028 */ sw $a1, 0x28($sp) -/* B3CD48 800C5BA8 260402A8 */ addiu $a0, $s0, 0x2a8 -/* B3CD4C 800C5BAC 0C030E20 */ jal THGA_Ct -/* B3CD50 800C5BB0 24062000 */ li $a2, 8192 -/* B3CD54 800C5BB4 3C010001 */ lui $at, (0x00011F08 >> 16) # lui $at, 1 -/* B3CD58 800C5BB8 34211F08 */ ori $at, (0x00011F08 & 0xFFFF) # ori $at, $at, 0x1f08 -/* B3CD5C 800C5BBC 02212821 */ addu $a1, $s1, $at -/* B3CD60 800C5BC0 AFA50024 */ sw $a1, 0x24($sp) -/* B3CD64 800C5BC4 260401B4 */ addiu $a0, $s0, 0x1b4 -/* B3CD68 800C5BC8 0C030E20 */ jal THGA_Ct -/* B3CD6C 800C5BCC 24060400 */ li $a2, 1024 -/* B3CD70 800C5BD0 8FAA0030 */ lw $t2, 0x30($sp) -/* B3CD74 800C5BD4 8FA50024 */ lw $a1, 0x24($sp) -/* B3CD78 800C5BD8 8E0402E8 */ lw $a0, 0x2e8($s0) -/* B3CD7C 800C5BDC AE0A0000 */ sw $t2, ($s0) -/* B3CD80 800C5BE0 8FAB002C */ lw $t3, 0x2c($sp) -/* B3CD84 800C5BE4 AE0B0004 */ sw $t3, 4($s0) -/* B3CD88 800C5BE8 8FAC0028 */ lw $t4, 0x28($sp) -/* B3CD8C 800C5BEC AE0501B0 */ sw $a1, 0x1b0($s0) -/* B3CD90 800C5BF0 AE0C0010 */ sw $t4, 0x10($s0) -/* B3CD94 800C5BF4 04810004 */ bgez $a0, .L800C5C08 -/* B3CD98 800C5BF8 30840001 */ andi $a0, $a0, 1 -/* B3CD9C 800C5BFC 10800002 */ beqz $a0, .L800C5C08 -/* B3CDA0 800C5C00 00000000 */ nop -/* B3CDA4 800C5C04 2484FFFE */ addiu $a0, $a0, -2 -.L800C5C08: -/* B3CDA8 800C5C08 0C032942 */ jal SysCfb_GetFbPtr -/* B3CDAC 800C5C0C 00000000 */ nop -/* B3CDB0 800C5C10 AE0202DC */ sw $v0, 0x2dc($s0) -/* B3CDB4 800C5C14 AE000014 */ sw $zero, 0x14($s0) -/* B3CDB8 800C5C18 8FBF001C */ lw $ra, 0x1c($sp) -/* B3CDBC 800C5C1C 8FB10018 */ lw $s1, 0x18($sp) -/* B3CDC0 800C5C20 8FB00014 */ lw $s0, 0x14($sp) -/* B3CDC4 800C5C24 03E00008 */ jr $ra -/* B3CDC8 800C5C28 27BD0038 */ addiu $sp, $sp, 0x38 - -glabel func_800C5C2C -/* B3CDCC 800C5C2C 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* B3CDD0 800C5C30 AFBF0014 */ sw $ra, 0x14($sp) -/* B3CDD4 800C5C34 0C03151B */ jal func_800C546C -/* B3CDD8 800C5C38 00000000 */ nop -/* B3CDDC 800C5C3C 3C0E800C */ lui $t6, %hi(TitleSetup_Init) # $t6, 0x800c -/* B3CDE0 800C5C40 25CE4104 */ addiu $t6, %lo(TitleSetup_Init) # addiu $t6, $t6, 0x4104 -/* B3CDE4 800C5C44 144E0004 */ bne $v0, $t6, .L800C5C58 -/* B3CDE8 800C5C48 00403025 */ move $a2, $v0 -/* B3CDEC 800C5C4C 3C028012 */ lui $v0, %hi(D_8011F830) # $v0, 0x8012 -/* B3CDF0 800C5C50 10000029 */ b .L800C5CF8 -/* B3CDF4 800C5C54 2442F830 */ addiu $v0, %lo(D_8011F830) # addiu $v0, $v0, -0x7d0 -.L800C5C58: -/* B3CDF8 800C5C58 3C0F8080 */ lui $t7, %hi(func_80801E44) # $t7, 0x8080 -/* B3CDFC 800C5C5C 25EF1E44 */ addiu $t7, %lo(func_80801E44) # addiu $t7, $t7, 0x1e44 -/* B3CE00 800C5C60 144F0004 */ bne $v0, $t7, .L800C5C74 -/* B3CE04 800C5C64 3C188080 */ lui $t8, %hi(func_80800878) # $t8, 0x8080 -/* B3CE08 800C5C68 3C028012 */ lui $v0, %hi(D_8011F860) # $v0, 0x8012 -/* B3CE0C 800C5C6C 10000022 */ b .L800C5CF8 -/* B3CE10 800C5C70 2442F860 */ addiu $v0, %lo(D_8011F860) # addiu $v0, $v0, -0x7a0 -.L800C5C74: -/* B3CE14 800C5C74 27180878 */ addiu $t8, %lo(func_80800878) # addiu $t8, $t8, 0x878 -/* B3CE18 800C5C78 14580004 */ bne $v0, $t8, .L800C5C8C -/* B3CE1C 800C5C7C 3C19800C */ lui $t9, %hi(func_800BCA64) # $t9, 0x800c -/* B3CE20 800C5C80 3C028012 */ lui $v0, %hi(D_8011F890) # $v0, 0x8012 -/* B3CE24 800C5C84 1000001C */ b .L800C5CF8 -/* B3CE28 800C5C88 2442F890 */ addiu $v0, %lo(D_8011F890) # addiu $v0, $v0, -0x770 -.L800C5C8C: -/* B3CE2C 800C5C8C 2739CA64 */ addiu $t9, %lo(func_800BCA64) # addiu $t9, $t9, -0x359c -/* B3CE30 800C5C90 14590004 */ bne $v0, $t9, .L800C5CA4 -/* B3CE34 800C5C94 3C088080 */ lui $t0, %hi(Opening_Init) # $t0, 0x8080 -/* B3CE38 800C5C98 3C028012 */ lui $v0, %hi(D_8011F8C0) # $v0, 0x8012 -/* B3CE3C 800C5C9C 10000016 */ b .L800C5CF8 -/* B3CE40 800C5CA0 2442F8C0 */ addiu $v0, %lo(D_8011F8C0) # addiu $v0, $v0, -0x740 -.L800C5CA4: -/* B3CE44 800C5CA4 25083CAC */ addiu $t0, %lo(Opening_Init) # addiu $t0, $t0, 0x3cac -/* B3CE48 800C5CA8 14480004 */ bne $v0, $t0, .L800C5CBC -/* B3CE4C 800C5CAC 3C098081 */ lui $t1, %hi(func_80811A20) # $t1, 0x8081 -/* B3CE50 800C5CB0 3C028012 */ lui $v0, %hi(D_8011F8F0) # $v0, 0x8012 -/* B3CE54 800C5CB4 10000010 */ b .L800C5CF8 -/* B3CE58 800C5CB8 2442F8F0 */ addiu $v0, %lo(D_8011F8F0) # addiu $v0, $v0, -0x710 -.L800C5CBC: -/* B3CE5C 800C5CBC 25291A20 */ addiu $t1, %lo(func_80811A20) # addiu $t1, $t1, 0x1a20 -/* B3CE60 800C5CC0 14490004 */ bne $v0, $t1, .L800C5CD4 -/* B3CE64 800C5CC4 3C048014 */ lui $a0, %hi(D_8014521C) # $a0, 0x8014 -/* B3CE68 800C5CC8 3C028012 */ lui $v0, %hi(D_8011F920) # $v0, 0x8012 -/* B3CE6C 800C5CCC 1000000A */ b .L800C5CF8 -/* B3CE70 800C5CD0 2442F920 */ addiu $v0, %lo(D_8011F920) # addiu $v0, $v0, -0x6e0 -.L800C5CD4: -/* B3CE74 800C5CD4 2484521C */ addiu $a0, %lo(D_8014521C) # addiu $a0, $a0, 0x521c -/* B3CE78 800C5CD8 240502B8 */ li $a1, 696 -/* B3CE7C 800C5CDC 0C000B84 */ jal LogUtils_LogThreadId -/* B3CE80 800C5CE0 AFA6001C */ sw $a2, 0x1c($sp) -/* B3CE84 800C5CE4 3C048014 */ lui $a0, %hi(D_80145228) # $a0, 0x8014 -/* B3CE88 800C5CE8 24845228 */ addiu $a0, %lo(D_80145228) # addiu $a0, $a0, 0x5228 -/* B3CE8C 800C5CEC 0C00084C */ jal osSyncPrintf -/* B3CE90 800C5CF0 8FA5001C */ lw $a1, 0x1c($sp) -/* B3CE94 800C5CF4 00001025 */ move $v0, $zero -.L800C5CF8: -/* B3CE98 800C5CF8 8FBF0014 */ lw $ra, 0x14($sp) -/* B3CE9C 800C5CFC 27BD0020 */ addiu $sp, $sp, 0x20 -/* B3CEA0 800C5D00 03E00008 */ jr $ra -/* B3CEA4 800C5D04 00000000 */ nop - -glabel func_800C5D08 -/* B3CEA8 800C5D08 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* B3CEAC 800C5D0C AFBF0014 */ sw $ra, 0x14($sp) -/* B3CEB0 800C5D10 AFA40018 */ sw $a0, 0x18($sp) -/* B3CEB4 800C5D14 0C001114 */ jal bzero -/* B3CEB8 800C5D18 24050300 */ li $a1, 768 -/* B3CEBC 800C5D1C 8FA70018 */ lw $a3, 0x18($sp) -/* B3CEC0 800C5D20 3C0E8001 */ lui $t6, %hi(gViConfigFeatures) # $t6, 0x8001 -/* B3CEC4 800C5D24 3C018001 */ lui $at, %hi(gViConfigXScale) -/* B3CEC8 800C5D28 ACE002D8 */ sw $zero, 0x2d8($a3) -/* B3CECC 800C5D2C ACE002E8 */ sw $zero, 0x2e8($a3) -/* B3CED0 800C5D30 ACE00284 */ sw $zero, 0x284($a3) -/* B3CED4 800C5D34 8DCE943C */ lw $t6, %lo(gViConfigFeatures)($t6) -/* B3CED8 800C5D38 24060008 */ li $a2, 8 -/* B3CEDC 800C5D3C 24E4005C */ addiu $a0, $a3, 0x5c -/* B3CEE0 800C5D40 ACEE02E4 */ sw $t6, 0x2e4($a3) -/* B3CEE4 800C5D44 C4249440 */ lwc1 $f4, %lo(gViConfigXScale)($at) -/* B3CEE8 800C5D48 3C018001 */ lui $at, %hi(gViConfigYScale) -/* B3CEEC 800C5D4C 24E50038 */ addiu $a1, $a3, 0x38 -/* B3CEF0 800C5D50 E4E402F4 */ swc1 $f4, 0x2f4($a3) -/* B3CEF4 800C5D54 C4269444 */ lwc1 $f6, %lo(gViConfigYScale)($at) -/* B3CEF8 800C5D58 0C001874 */ jal osCreateMesgQueue -/* B3CEFC 800C5D5C E4E602F8 */ swc1 $f6, 0x2f8($a3) -/* B3CF00 800C5D60 0C034C7C */ jal func_800D31F0 -/* B3CF04 800C5D64 00000000 */ nop -/* B3CF08 800C5D68 3C048016 */ lui $a0, %hi(D_801665E0) # $a0, 0x8016 -/* B3CF0C 800C5D6C 3C05800C */ lui $a1, %hi(func_800C5850) # $a1, 0x800c -/* B3CF10 800C5D70 24A55850 */ addiu $a1, %lo(func_800C5850) # addiu $a1, $a1, 0x5850 -/* B3CF14 800C5D74 248465E0 */ addiu $a0, %lo(D_801665E0) # addiu $a0, $a0, 0x65e0 -/* B3CF18 800C5D78 00003025 */ move $a2, $zero -/* B3CF1C 800C5D7C 0C035077 */ jal Fault_AddClient -/* B3CF20 800C5D80 00003825 */ move $a3, $zero -/* B3CF24 800C5D84 8FBF0014 */ lw $ra, 0x14($sp) -/* B3CF28 800C5D88 27BD0018 */ addiu $sp, $sp, 0x18 -/* B3CF2C 800C5D8C 03E00008 */ jr $ra -/* B3CF30 800C5D90 00000000 */ nop - -glabel func_800C5D94 -/* B3CF34 800C5D94 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* B3CF38 800C5D98 AFBF0014 */ sw $ra, 0x14($sp) -/* B3CF3C 800C5D9C 0C034C84 */ jal func_800D3210 -/* B3CF40 800C5DA0 AFA40018 */ sw $a0, 0x18($sp) -/* B3CF44 800C5DA4 3C048016 */ lui $a0, %hi(D_801665E0) # $a0, 0x8016 -/* B3CF48 800C5DA8 0C0350B0 */ jal Fault_RemoveClient -/* B3CF4C 800C5DAC 248465E0 */ addiu $a0, %lo(D_801665E0) # addiu $a0, $a0, 0x65e0 -/* B3CF50 800C5DB0 8FBF0014 */ lw $ra, 0x14($sp) -/* B3CF54 800C5DB4 27BD0018 */ addiu $sp, $sp, 0x18 -/* B3CF58 800C5DB8 03E00008 */ jr $ra -/* B3CF5C 800C5DBC 00000000 */ nop - -glabel func_800C5DC0 -/* B3CF60 800C5DC0 27BDFF68 */ addiu $sp, $sp, -0x98 -/* B3CF64 800C5DC4 AFBF002C */ sw $ra, 0x2c($sp) -/* B3CF68 800C5DC8 AFB10028 */ sw $s1, 0x28($sp) -/* B3CF6C 800C5DCC 00808825 */ move $s1, $a0 -/* B3CF70 800C5DD0 0C001A78 */ jal osGetTime -/* B3CF74 800C5DD4 AFB00024 */ sw $s0, 0x24($sp) -/* B3CF78 800C5DD8 3C0E8016 */ lui $t6, %hi(D_801665D8) # $t6, 0x8016 -/* B3CF7C 800C5DDC 3C0F8016 */ lui $t7, %hi(D_801665DC) # $t7, 0x8016 -/* B3CF80 800C5DE0 8DEF65DC */ lw $t7, %lo(D_801665DC)($t7) -/* B3CF84 800C5DE4 8DCE65D8 */ lw $t6, %lo(D_801665D8)($t6) -/* B3CF88 800C5DE8 3C108017 */ lui $s0, %hi(D_8016A558) # $s0, 0x8017 -/* B3CF8C 800C5DEC 2610A558 */ addiu $s0, %lo(D_8016A558) # addiu $s0, $s0, -0x5aa8 -/* B3CF90 800C5DF0 8E080000 */ lw $t0, ($s0) -/* B3CF94 800C5DF4 8E090004 */ lw $t1, 4($s0) -/* B3CF98 800C5DF8 006F082B */ sltu $at, $v1, $t7 -/* B3CF9C 800C5DFC 004EC023 */ subu $t8, $v0, $t6 -/* B3CFA0 800C5E00 0301C023 */ subu $t8, $t8, $at -/* B3CFA4 800C5E04 006FC823 */ subu $t9, $v1, $t7 -/* B3CFA8 800C5E08 3C0C8017 */ lui $t4, %hi(D_8016A528) # $t4, 0x8017 -/* B3CFAC 800C5E0C 03085023 */ subu $t2, $t8, $t0 -/* B3CFB0 800C5E10 0329082B */ sltu $at, $t9, $t1 -/* B3CFB4 800C5E14 01415023 */ subu $t2, $t2, $at -/* B3CFB8 800C5E18 258CA528 */ addiu $t4, %lo(D_8016A528) # addiu $t4, $t4, -0x5ad8 -/* B3CFBC 800C5E1C AD8A0000 */ sw $t2, ($t4) -/* B3CFC0 800C5E20 03295823 */ subu $t3, $t9, $t1 -/* B3CFC4 800C5E24 AD8B0004 */ sw $t3, 4($t4) -/* B3CFC8 800C5E28 240F0000 */ li $t7, 0 -/* B3CFCC 800C5E2C 240E0000 */ li $t6, 0 -/* B3CFD0 800C5E30 3C070861 */ lui $a3, (0x0861C468 >> 16) # lui $a3, 0x861 -/* B3CFD4 800C5E34 2625005C */ addiu $a1, $s1, 0x5c -/* B3CFD8 800C5E38 240D029A */ li $t5, 666 -/* B3CFDC 800C5E3C AFAD001C */ sw $t5, 0x1c($sp) -/* B3CFE0 800C5E40 AFA50018 */ sw $a1, 0x18($sp) -/* B3CFE4 800C5E44 AFA50038 */ sw $a1, 0x38($sp) -/* B3CFE8 800C5E48 34E7C468 */ ori $a3, (0x0861C468 & 0xFFFF) # ori $a3, $a3, 0xc468 -/* B3CFEC 800C5E4C AFAE0010 */ sw $t6, 0x10($sp) -/* B3CFF0 800C5E50 AFAF0014 */ sw $t7, 0x14($sp) -/* B3CFF4 800C5E54 27A40070 */ addiu $a0, $sp, 0x70 -/* B3CFF8 800C5E58 0C0418B8 */ jal osSetTimer -/* B3CFFC 800C5E5C 24060000 */ li $a2, 0 -/* B3D000 800C5E60 8FA40038 */ lw $a0, 0x38($sp) -/* B3D004 800C5E64 27A5006C */ addiu $a1, $sp, 0x6c -/* B3D008 800C5E68 0C000CA0 */ jal osRecvMesg -/* B3D00C 800C5E6C 24060001 */ li $a2, 1 -/* B3D010 800C5E70 0C0408CC */ jal osStopTimer -/* B3D014 800C5E74 27A40070 */ addiu $a0, $sp, 0x70 -/* B3D018 800C5E78 8FB8006C */ lw $t8, 0x6c($sp) -/* B3D01C 800C5E7C 2401029A */ li $at, 666 -/* B3D020 800C5E80 1701002C */ bne $t8, $at, .L800C5F34 -/* B3D024 800C5E84 3C048014 */ lui $a0, %hi(D_80145240) # $a0, 0x8014 -/* B3D028 800C5E88 0C00084C */ jal osSyncPrintf -/* B3D02C 800C5E8C 24845240 */ addiu $a0, %lo(D_80145240) # addiu $a0, $a0, 0x5240 -/* B3D030 800C5E90 3C048014 */ lui $a0, %hi(D_80145248) # $a0, 0x8014 -/* B3D034 800C5E94 0C00084C */ jal osSyncPrintf -/* B3D038 800C5E98 24845248 */ addiu $a0, %lo(D_80145248) # addiu $a0, $a0, 0x5248 -/* B3D03C 800C5E9C 3C048014 */ lui $a0, %hi(D_80145264) # $a0, 0x8014 -/* B3D040 800C5EA0 0C00084C */ jal osSyncPrintf -/* B3D044 800C5EA4 24845264 */ addiu $a0, %lo(D_80145264) # addiu $a0, $a0, 0x5264 -/* B3D048 800C5EA8 3C04A404 */ lui $a0, 0xa404 -/* B3D04C 800C5EAC 0C000AC4 */ jal LogUtils_LogHexDump -/* B3D050 800C5EB0 24050020 */ li $a1, 32 -/* B3D054 800C5EB4 3C04A410 */ lui $a0, 0xa410 -/* B3D058 800C5EB8 0C000AC4 */ jal LogUtils_LogHexDump -/* B3D05C 800C5EBC 24050020 */ li $a1, 32 -/* B3D060 800C5EC0 3C04801B */ lui $a0, %hi(gGfxSPTaskYieldBuffer) # $a0, 0x801b -/* B3D064 800C5EC4 248431C0 */ addiu $a0, %lo(gGfxSPTaskYieldBuffer) # addiu $a0, $a0, 0x31c0 -/* B3D068 800C5EC8 0C000AC4 */ jal LogUtils_LogHexDump -/* B3D06C 800C5ECC 24050C00 */ li $a1, 3072 -/* B3D070 800C5ED0 3C028016 */ lui $v0, %hi(gGameInfo) # $v0, 0x8016 -/* B3D074 800C5ED4 3C048013 */ lui $a0, %hi(D_8012D260) # $a0, 0x8013 -/* B3D078 800C5ED8 8C84D260 */ lw $a0, %lo(D_8012D260)($a0) -/* B3D07C 800C5EDC 2442FA90 */ addiu $v0, %lo(gGameInfo) # addiu $v0, $v0, -0x570 -/* B3D080 800C5EE0 8C480000 */ lw $t0, ($v0) -/* B3D084 800C5EE4 2419FFFF */ li $t9, -1 -/* B3D088 800C5EE8 1080000D */ beqz $a0, .L800C5F20 -/* B3D08C 800C5EEC A51900E0 */ sh $t9, 0xe0($t0) -/* B3D090 800C5EF0 8C4A0000 */ lw $t2, ($v0) -/* B3D094 800C5EF4 24090007 */ li $t1, 7 -/* B3D098 800C5EF8 240B0001 */ li $t3, 1 -/* B3D09C 800C5EFC A5491074 */ sh $t1, 0x1074($t2) -/* B3D0A0 800C5F00 8C4C0000 */ lw $t4, ($v0) -/* B3D0A4 800C5F04 240E0002 */ li $t6, 2 -/* B3D0A8 800C5F08 3C018013 */ lui $at, %hi(D_8012D260) # $at, 0x8013 -/* B3D0AC 800C5F0C A58B1076 */ sh $t3, 0x1076($t4) -/* B3D0B0 800C5F10 8C4F0000 */ lw $t7, ($v0) -/* B3D0B4 800C5F14 A5EE107A */ sh $t6, 0x107a($t7) -/* B3D0B8 800C5F18 0C03162F */ jal func_800C58BC -/* B3D0BC 800C5F1C AC24D260 */ sw $a0, %lo(D_8012D260)($at) -.L800C5F20: -/* B3D0C0 800C5F20 3C048014 */ lui $a0, %hi(D_80145268) # $a0, 0x8014 -/* B3D0C4 800C5F24 3C058014 */ lui $a1, %hi(D_8014527C) # $a1, 0x8014 -/* B3D0C8 800C5F28 24A5527C */ addiu $a1, %lo(D_8014527C) # addiu $a1, $a1, 0x527c -/* B3D0CC 800C5F2C 0C0359AD */ jal Fault_AddHungupAndCrashImpl -/* B3D0D0 800C5F30 24845268 */ addiu $a0, %lo(D_80145268) # addiu $a0, $a0, 0x5268 -.L800C5F34: -/* B3D0D4 800C5F34 8FA40038 */ lw $a0, 0x38($sp) -/* B3D0D8 800C5F38 27A5006C */ addiu $a1, $sp, 0x6c -/* B3D0DC 800C5F3C 0C000CA0 */ jal osRecvMesg -/* B3D0E0 800C5F40 00003025 */ move $a2, $zero -/* B3D0E4 800C5F44 8E2602EC */ lw $a2, 0x2ec($s1) -/* B3D0E8 800C5F48 8E2401B0 */ lw $a0, 0x1b0($s1) -/* B3D0EC 800C5F4C 3C018013 */ lui $at, %hi(D_8012D260) # $at, 0x8013 -/* B3D0F0 800C5F50 10C00004 */ beqz $a2, .L800C5F64 -/* B3D0F4 800C5F54 AC24D260 */ sw $a0, %lo(D_8012D260)($at) -/* B3D0F8 800C5F58 02202025 */ move $a0, $s1 -/* B3D0FC 800C5F5C 00C0F809 */ jalr $a2 -/* B3D100 800C5F60 8E2502F0 */ lw $a1, 0x2f0($s1) -.L800C5F64: -/* B3D104 800C5F64 0C001A78 */ jal osGetTime -/* B3D108 800C5F68 00000000 */ nop -/* B3D10C 800C5F6C 3C048017 */ lui $a0, %hi(D_8016A550) # $a0, 0x8017 -/* B3D110 800C5F70 2484A550 */ addiu $a0, %lo(D_8016A550) # addiu $a0, $a0, -0x5ab0 -/* B3D114 800C5F74 8C980000 */ lw $t8, ($a0) -/* B3D118 800C5F78 8C990004 */ lw $t9, 4($a0) -/* B3D11C 800C5F7C 57000004 */ bnezl $t8, .L800C5F90 -/* B3D120 800C5F80 8E080000 */ lw $t0, ($s0) -/* B3D124 800C5F84 53200012 */ beql $t9, $zero, .L800C5FD0 -/* B3D128 800C5F88 8E180000 */ lw $t8, ($s0) -/* B3D12C 800C5F8C 8E080000 */ lw $t0, ($s0) -.L800C5F90: -/* B3D130 800C5F90 8E090004 */ lw $t1, 4($s0) -/* B3D134 800C5F94 8C8C0000 */ lw $t4, ($a0) -/* B3D138 800C5F98 8C8D0004 */ lw $t5, 4($a0) -/* B3D13C 800C5F9C 01235821 */ addu $t3, $t1, $v1 -/* B3D140 800C5FA0 0163082B */ sltu $at, $t3, $v1 -/* B3D144 800C5FA4 00285021 */ addu $t2, $at, $t0 -/* B3D148 800C5FA8 01425021 */ addu $t2, $t2, $v0 -/* B3D14C 800C5FAC 014C7023 */ subu $t6, $t2, $t4 -/* B3D150 800C5FB0 016D082B */ sltu $at, $t3, $t5 -/* B3D154 800C5FB4 01C17023 */ subu $t6, $t6, $at -/* B3D158 800C5FB8 AE0E0000 */ sw $t6, ($s0) -/* B3D15C 800C5FBC 016D7823 */ subu $t7, $t3, $t5 -/* B3D160 800C5FC0 AE0F0004 */ sw $t7, 4($s0) -/* B3D164 800C5FC4 AC820000 */ sw $v0, ($a0) -/* B3D168 800C5FC8 AC830004 */ sw $v1, 4($a0) -/* B3D16C 800C5FCC 8E180000 */ lw $t8, ($s0) -.L800C5FD0: -/* B3D170 800C5FD0 8E190004 */ lw $t9, 4($s0) -/* B3D174 800C5FD4 3C088017 */ lui $t0, %hi(D_8016A520) # $t0, 0x8017 -/* B3D178 800C5FD8 2508A520 */ addiu $t0, %lo(D_8016A520) # addiu $t0, $t0, -0x5ae0 -/* B3D17C 800C5FDC AD180000 */ sw $t8, ($t0) -/* B3D180 800C5FE0 240A0000 */ li $t2, 0 -/* B3D184 800C5FE4 AD190004 */ sw $t9, 4($t0) -/* B3D188 800C5FE8 AE0A0000 */ sw $t2, ($s0) -/* B3D18C 800C5FEC 240B0000 */ li $t3, 0 -/* B3D190 800C5FF0 0C001A78 */ jal osGetTime -/* B3D194 800C5FF4 AE0B0004 */ sw $t3, 4($s0) -/* B3D198 800C5FF8 3C018016 */ lui $at, %hi(D_801665DC) # $at, 0x8016 -/* B3D19C 800C5FFC AC2265D8 */ sw $v0, %lo(D_801665D8)($at) -/* B3D1A0 800C6000 AC2365DC */ sw $v1, %lo(D_801665DC)($at) -/* B3D1A4 800C6004 26300088 */ addiu $s0, $s1, 0x88 -/* B3D1A8 800C6008 24090001 */ li $t1, 1 -/* B3D1AC 800C600C 240C0004 */ li $t4, 4 -/* B3D1B0 800C6010 AE090000 */ sw $t1, ($s0) -/* B3D1B4 800C6014 0C034B7C */ jal func_800D2DF0 -/* B3D1B8 800C6018 AE0C0004 */ sw $t4, 4($s0) -/* B3D1BC 800C601C 0C034B7F */ jal func_800D2DFC -/* B3D1C0 800C6020 AE020008 */ sw $v0, 8($s0) -/* B3D1C4 800C6024 0C034B85 */ jal func_800D2E14 -/* B3D1C8 800C6028 AE02000C */ sw $v0, 0xc($s0) -/* B3D1CC 800C602C 0C034B88 */ jal func_800D2E20 -/* B3D1D0 800C6030 AE020010 */ sw $v0, 0x10($s0) -/* B3D1D4 800C6034 3C0F801B */ lui $t7, %hi(gGfxSPTaskStack) # $t7, 0x801b -/* B3D1D8 800C6038 3C19801A */ lui $t9, %hi(gGfxSPTaskOutputBuffer) # $t9, 0x801a -/* B3D1DC 800C603C 3C08801B */ lui $t0, %hi(gGfxSPTaskYieldBuffer) # $t0, 0x801b -/* B3D1E0 800C6040 240D1000 */ li $t5, 4096 -/* B3D1E4 800C6044 240E0800 */ li $t6, 2048 -/* B3D1E8 800C6048 25EF3DC0 */ addiu $t7, %lo(gGfxSPTaskStack) # addiu $t7, $t7, 0x3dc0 -/* B3D1EC 800C604C 24180400 */ li $t8, 1024 -/* B3D1F0 800C6050 2739B1C0 */ addiu $t9, %lo(gGfxSPTaskOutputBuffer) # addiu $t9, $t9, -0x4e40 -/* B3D1F4 800C6054 250831C0 */ addiu $t0, %lo(gGfxSPTaskYieldBuffer) # addiu $t0, $t0, 0x31c0 -/* B3D1F8 800C6058 AE020018 */ sw $v0, 0x18($s0) -/* B3D1FC 800C605C AE0D0014 */ sw $t5, 0x14($s0) -/* B3D200 800C6060 AE0E001C */ sw $t6, 0x1c($s0) -/* B3D204 800C6064 AE0F0020 */ sw $t7, 0x20($s0) -/* B3D208 800C6068 AE180024 */ sw $t8, 0x24($s0) -/* B3D20C 800C606C AE190028 */ sw $t9, 0x28($s0) -/* B3D210 800C6070 AE08002C */ sw $t0, 0x2c($s0) -/* B3D214 800C6074 8E2A01B0 */ lw $t2, 0x1b0($s1) -/* B3D218 800C6078 3C068014 */ lui $a2, %hi(D_8014528C) # $a2, 0x8014 -/* B3D21C 800C607C 24C6528C */ addiu $a2, %lo(D_8014528C) # addiu $a2, $a2, 0x528c -/* B3D220 800C6080 27A40048 */ addiu $a0, $sp, 0x48 -/* B3D224 800C6084 02202825 */ move $a1, $s1 -/* B3D228 800C6088 2407033C */ li $a3, 828 -/* B3D22C 800C608C 0C031AB1 */ jal func_800C6AC4 -/* B3D230 800C6090 AE0A0030 */ sw $t2, 0x30($s0) -/* B3D234 800C6094 8E2B01BC */ lw $t3, 0x1bc($s1) -/* B3D238 800C6098 8E2901B0 */ lw $t1, 0x1b0($s1) -/* B3D23C 800C609C 3C068014 */ lui $a2, %hi(D_80145298) # $a2, 0x8014 -/* B3D240 800C60A0 24C65298 */ addiu $a2, %lo(D_80145298) # addiu $a2, $a2, 0x5298 -/* B3D244 800C60A4 01696023 */ subu $t4, $t3, $t1 -/* B3D248 800C60A8 AE0C0034 */ sw $t4, 0x34($s0) -/* B3D24C 800C60AC 27A40048 */ addiu $a0, $sp, 0x48 -/* B3D250 800C60B0 02202825 */ move $a1, $s1 -/* B3D254 800C60B4 0C031AD5 */ jal func_800C6B54 -/* B3D258 800C60B8 2407033E */ li $a3, 830 -/* B3D25C 800C60BC 3C0D801B */ lui $t5, %hi(gGfxSPTaskYieldBuffer) # $t5, 0x801b -/* B3D260 800C60C0 25AD31C0 */ addiu $t5, %lo(gGfxSPTaskYieldBuffer) # addiu $t5, $t5, 0x31c0 -/* B3D264 800C60C4 240E0C00 */ li $t6, 3072 -/* B3D268 800C60C8 AE0D0038 */ sw $t5, 0x38($s0) -/* B3D26C 800C60CC AE0E003C */ sw $t6, 0x3c($s0) -/* B3D270 800C60D0 26250078 */ addiu $a1, $s1, 0x78 -/* B3D274 800C60D4 240F0063 */ li $t7, 99 -/* B3D278 800C60D8 ACA00000 */ sw $zero, ($a1) -/* B3D27C 800C60DC ACAF0008 */ sw $t7, 8($a1) -/* B3D280 800C60E0 3C028016 */ lui $v0, %hi(gGameInfo) # $v0, 0x8016 -/* B3D284 800C60E4 8C42FA90 */ lw $v0, %lo(gGameInfo)($v0) -/* B3D288 800C60E8 3C0E8016 */ lui $t6, %hi(D_801665F0) # $t6, 0x8016 -/* B3D28C 800C60EC 25CE65F0 */ addiu $t6, %lo(D_801665F0) # addiu $t6, $t6, 0x65f0 -/* B3D290 800C60F0 84430116 */ lh $v1, 0x116($v0) -/* B3D294 800C60F4 30780001 */ andi $t8, $v1, 1 -/* B3D298 800C60F8 13000009 */ beqz $t8, .L800C6120 -/* B3D29C 800C60FC 3079FFFE */ andi $t9, $v1, 0xfffe -/* B3D2A0 800C6100 A4590116 */ sh $t9, 0x116($v0) -/* B3D2A4 800C6104 8CA80008 */ lw $t0, 8($a1) -/* B3D2A8 800C6108 2401FFBF */ li $at, -65 -/* B3D2AC 800C610C 01015024 */ and $t2, $t0, $at -/* B3D2B0 800C6110 ACAA0008 */ sw $t2, 8($a1) -/* B3D2B4 800C6114 8E2B02E8 */ lw $t3, 0x2e8($s1) -/* B3D2B8 800C6118 2569FFFF */ addiu $t1, $t3, -1 -/* B3D2BC 800C611C AE2902E8 */ sw $t1, 0x2e8($s1) -.L800C6120: -/* B3D2C0 800C6120 3C038013 */ lui $v1, %hi(D_8012D264) # $v1, 0x8013 -/* B3D2C4 800C6124 8C63D264 */ lw $v1, %lo(D_8012D264)($v1) -/* B3D2C8 800C6128 24010003 */ li $at, 3 -/* B3D2CC 800C612C 8FAC0038 */ lw $t4, 0x38($sp) -/* B3D2D0 800C6130 000368C0 */ sll $t5, $v1, 3 -/* B3D2D4 800C6134 01A36823 */ subu $t5, $t5, $v1 -/* B3D2D8 800C6138 24630001 */ addiu $v1, $v1, 1 -/* B3D2DC 800C613C 0061001A */ div $zero, $v1, $at -/* B3D2E0 800C6140 ACA00054 */ sw $zero, 0x54($a1) -/* B3D2E4 800C6144 ACAC0050 */ sw $t4, 0x50($a1) -/* B3D2E8 800C6148 8E2F02DC */ lw $t7, 0x2dc($s1) -/* B3D2EC 800C614C 000D6880 */ sll $t5, $t5, 2 -/* B3D2F0 800C6150 01AE1021 */ addu $v0, $t5, $t6 -/* B3D2F4 800C6154 AC4F0000 */ sw $t7, ($v0) -/* B3D2F8 800C6158 8E3802DC */ lw $t8, 0x2dc($s1) -/* B3D2FC 800C615C 3C0A8016 */ lui $t2, %hi(gGameInfo) # $t2, 0x8016 -/* B3D300 800C6160 00001810 */ mfhi $v1 -/* B3D304 800C6164 AC580004 */ sw $t8, 4($v0) -/* B3D308 800C6168 8E390284 */ lw $t9, 0x284($s1) -/* B3D30C 800C616C 3C018013 */ lui $at, %hi(D_8012D264) # $at, 0x8013 -/* B3D310 800C6170 3C048016 */ lui $a0, %hi(gSchedContext+0x38) # $a0, 0x8016 -/* B3D314 800C6174 AC590008 */ sw $t9, 8($v0) -/* B3D318 800C6178 8E2802E4 */ lw $t0, 0x2e4($s1) -/* B3D31C 800C617C 248466A0 */ addiu $a0, %lo(gSchedContext+0x38) # addiu $a0, $a0, 0x66a0 -/* B3D320 800C6180 24060001 */ li $a2, 1 -/* B3D324 800C6184 AC48000C */ sw $t0, 0xc($v0) -/* B3D328 800C6188 C62402F4 */ lwc1 $f4, 0x2f4($s1) -/* B3D32C 800C618C E4440014 */ swc1 $f4, 0x14($v0) -/* B3D330 800C6190 C62602F8 */ lwc1 $f6, 0x2f8($s1) -/* B3D334 800C6194 A0400010 */ sb $zero, 0x10($v0) -/* B3D338 800C6198 E4460018 */ swc1 $f6, 0x18($v0) -/* B3D33C 800C619C 8D4AFA90 */ lw $t2, %lo(gGameInfo)($t2) -/* B3D340 800C61A0 854B0110 */ lh $t3, 0x110($t2) -/* B3D344 800C61A4 A04B0011 */ sb $t3, 0x11($v0) -/* B3D348 800C61A8 ACA2000C */ sw $v0, 0xc($a1) -/* B3D34C 800C61AC AC23D264 */ sw $v1, %lo(D_8012D264)($at) -/* B3D350 800C61B0 0C000C18 */ jal osSendMesg -/* B3D354 800C61B4 AE240058 */ sw $a0, 0x58($s1) -/* B3D358 800C61B8 3C048016 */ lui $a0, %hi(gSchedContext) # $a0, 0x8016 -/* B3D35C 800C61BC 0C03257E */ jal func_800C95F8 -/* B3D360 800C61C0 24846668 */ addiu $a0, %lo(gSchedContext) # addiu $a0, $a0, 0x6668 -/* B3D364 800C61C4 8FBF002C */ lw $ra, 0x2c($sp) -/* B3D368 800C61C8 8FB00024 */ lw $s0, 0x24($sp) -/* B3D36C 800C61CC 8FB10028 */ lw $s1, 0x28($sp) -/* B3D370 800C61D0 03E00008 */ jr $ra -/* B3D374 800C61D4 27BD0098 */ addiu $sp, $sp, 0x98 - -glabel func_800C61D8 -/* B3D378 800C61D8 27BDFF38 */ addiu $sp, $sp, -0xc8 -/* B3D37C 800C61DC AFBF001C */ sw $ra, 0x1c($sp) -/* B3D380 800C61E0 AFB00018 */ sw $s0, 0x18($sp) -/* B3D384 800C61E4 AFA500CC */ sw $a1, 0xcc($sp) -/* B3D388 800C61E8 00808025 */ move $s0, $a0 -/* B3D38C 800C61EC 0C0316C5 */ jal func_800C5B14 -/* B3D390 800C61F0 ACA000A0 */ sw $zero, 0xa0($a1) -/* B3D394 800C61F4 3C068014 */ lui $a2, %hi(D_801452A4) # $a2, 0x8014 -/* B3D398 800C61F8 24C652A4 */ addiu $a2, %lo(D_801452A4) # addiu $a2, $a2, 0x52a4 -/* B3D39C 800C61FC 27A400B0 */ addiu $a0, $sp, 0xb0 -/* B3D3A0 800C6200 02002825 */ move $a1, $s0 -/* B3D3A4 800C6204 0C031AB1 */ jal func_800C6AC4 -/* B3D3A8 800C6208 240703C6 */ li $a3, 966 -/* B3D3AC 800C620C 8E0201BC */ lw $v0, 0x1bc($s0) -/* B3D3B0 800C6210 3C188014 */ lui $t8, %hi(D_801452B0) # $t8, 0x8014 -/* B3D3B4 800C6214 271852B0 */ addiu $t8, %lo(D_801452B0) # addiu $t8, $t8, 0x52b0 -/* B3D3B8 800C6218 244F0008 */ addiu $t7, $v0, 8 -/* B3D3BC 800C621C AE0F01BC */ sw $t7, 0x1bc($s0) -/* B3D3C0 800C6220 3C080002 */ lui $t0, 2 -/* B3D3C4 800C6224 AC480000 */ sw $t0, ($v0) -/* B3D3C8 800C6228 AC580004 */ sw $t8, 4($v0) -/* B3D3CC 800C622C 8E0202C0 */ lw $v0, 0x2c0($s0) -/* B3D3D0 800C6230 3C098014 */ lui $t1, %hi(D_801452C0) # $t1, 0x8014 -/* B3D3D4 800C6234 252952C0 */ addiu $t1, %lo(D_801452C0) # addiu $t1, $t1, 0x52c0 -/* B3D3D8 800C6238 24590008 */ addiu $t9, $v0, 8 -/* B3D3DC 800C623C AE1902C0 */ sw $t9, 0x2c0($s0) -/* B3D3E0 800C6240 AC490004 */ sw $t1, 4($v0) -/* B3D3E4 800C6244 AC480000 */ sw $t0, ($v0) -/* B3D3E8 800C6248 8E0202D0 */ lw $v0, 0x2d0($s0) -/* B3D3EC 800C624C 3C0B8014 */ lui $t3, %hi(D_801452D4) # $t3, 0x8014 -/* B3D3F0 800C6250 256B52D4 */ addiu $t3, %lo(D_801452D4) # addiu $t3, $t3, 0x52d4 -/* B3D3F4 800C6254 244A0008 */ addiu $t2, $v0, 8 -/* B3D3F8 800C6258 AE0A02D0 */ sw $t2, 0x2d0($s0) -/* B3D3FC 800C625C AC4B0004 */ sw $t3, 4($v0) -/* B3D400 800C6260 AC480000 */ sw $t0, ($v0) -/* B3D404 800C6264 8E0202B0 */ lw $v0, 0x2b0($s0) -/* B3D408 800C6268 3C0D8014 */ lui $t5, %hi(D_801452E8) # $t5, 0x8014 -/* B3D40C 800C626C 25AD52E8 */ addiu $t5, %lo(D_801452E8) # addiu $t5, $t5, 0x52e8 -/* B3D410 800C6270 244C0008 */ addiu $t4, $v0, 8 -/* B3D414 800C6274 AE0C02B0 */ sw $t4, 0x2b0($s0) -/* B3D418 800C6278 3C068014 */ lui $a2, %hi(D_801452FC) # $a2, 0x8014 -/* B3D41C 800C627C 24C652FC */ addiu $a2, %lo(D_801452FC) # addiu $a2, $a2, 0x52fc -/* B3D420 800C6280 27A400B0 */ addiu $a0, $sp, 0xb0 -/* B3D424 800C6284 02002825 */ move $a1, $s0 -/* B3D428 800C6288 240703CF */ li $a3, 975 -/* B3D42C 800C628C AC4D0004 */ sw $t5, 4($v0) -/* B3D430 800C6290 0C031AD5 */ jal func_800C6B54 -/* B3D434 800C6294 AC480000 */ sw $t0, ($v0) -/* B3D438 800C6298 0C0312A6 */ jal func_800C4A98 -/* B3D43C 800C629C 8FA400CC */ lw $a0, 0xcc($sp) -/* B3D440 800C62A0 0C0312B2 */ jal func_800C4AC8 -/* B3D444 800C62A4 8FA400CC */ lw $a0, 0xcc($sp) -/* B3D448 800C62A8 3C068014 */ lui $a2, %hi(D_80145308) # $a2, 0x8014 -/* B3D44C 800C62AC 24C65308 */ addiu $a2, %lo(D_80145308) # addiu $a2, $a2, 0x5308 -/* B3D450 800C62B0 27A4008C */ addiu $a0, $sp, 0x8c -/* B3D454 800C62B4 02002825 */ move $a1, $s0 -/* B3D458 800C62B8 0C031AB1 */ jal func_800C6AC4 -/* B3D45C 800C62BC 240703DB */ li $a3, 987 -/* B3D460 800C62C0 8E0201BC */ lw $v0, 0x1bc($s0) -/* B3D464 800C62C4 3C0F8014 */ lui $t7, %hi(D_80145314) # $t7, 0x8014 -/* B3D468 800C62C8 3C080002 */ lui $t0, 2 -/* B3D46C 800C62CC 244E0008 */ addiu $t6, $v0, 8 -/* B3D470 800C62D0 AE0E01BC */ sw $t6, 0x1bc($s0) -/* B3D474 800C62D4 25EF5314 */ addiu $t7, %lo(D_80145314) # addiu $t7, $t7, 0x5314 -/* B3D478 800C62D8 AC4F0004 */ sw $t7, 4($v0) -/* B3D47C 800C62DC AC480000 */ sw $t0, ($v0) -/* B3D480 800C62E0 8E0202C0 */ lw $v0, 0x2c0($s0) -/* B3D484 800C62E4 3C198014 */ lui $t9, %hi(D_80145324) # $t9, 0x8014 -/* B3D488 800C62E8 27395324 */ addiu $t9, %lo(D_80145324) # addiu $t9, $t9, 0x5324 -/* B3D48C 800C62EC 24580008 */ addiu $t8, $v0, 8 -/* B3D490 800C62F0 AE1802C0 */ sw $t8, 0x2c0($s0) -/* B3D494 800C62F4 AC590004 */ sw $t9, 4($v0) -/* B3D498 800C62F8 AC480000 */ sw $t0, ($v0) -/* B3D49C 800C62FC 8E0202D0 */ lw $v0, 0x2d0($s0) -/* B3D4A0 800C6300 3C0A8014 */ lui $t2, %hi(D_80145338) # $t2, 0x8014 -/* B3D4A4 800C6304 254A5338 */ addiu $t2, %lo(D_80145338) # addiu $t2, $t2, 0x5338 -/* B3D4A8 800C6308 24490008 */ addiu $t1, $v0, 8 -/* B3D4AC 800C630C AE0902D0 */ sw $t1, 0x2d0($s0) -/* B3D4B0 800C6310 AC4A0004 */ sw $t2, 4($v0) -/* B3D4B4 800C6314 AC480000 */ sw $t0, ($v0) -/* B3D4B8 800C6318 8E0202B0 */ lw $v0, 0x2b0($s0) -/* B3D4BC 800C631C 3C0C8014 */ lui $t4, %hi(D_8014534C) # $t4, 0x8014 -/* B3D4C0 800C6320 258C534C */ addiu $t4, %lo(D_8014534C) # addiu $t4, $t4, 0x534c -/* B3D4C4 800C6324 244B0008 */ addiu $t3, $v0, 8 -/* B3D4C8 800C6328 AE0B02B0 */ sw $t3, 0x2b0($s0) -/* B3D4CC 800C632C 3C068014 */ lui $a2, %hi(D_80145360) # $a2, 0x8014 -/* B3D4D0 800C6330 24C65360 */ addiu $a2, %lo(D_80145360) # addiu $a2, $a2, 0x5360 -/* B3D4D4 800C6334 27A4008C */ addiu $a0, $sp, 0x8c -/* B3D4D8 800C6338 02002825 */ move $a1, $s0 -/* B3D4DC 800C633C 240703E4 */ li $a3, 996 -/* B3D4E0 800C6340 AC4C0004 */ sw $t4, 4($v0) -/* B3D4E4 800C6344 0C031AD5 */ jal func_800C6B54 -/* B3D4E8 800C6348 AC480000 */ sw $t0, ($v0) -/* B3D4EC 800C634C 3C068014 */ lui $a2, %hi(D_8014536C) # $a2, 0x8014 -/* B3D4F0 800C6350 24C6536C */ addiu $a2, %lo(D_8014536C) # addiu $a2, $a2, 0x536c -/* B3D4F4 800C6354 27A40068 */ addiu $a0, $sp, 0x68 -/* B3D4F8 800C6358 02002825 */ move $a1, $s0 -/* B3D4FC 800C635C 0C031AB1 */ jal func_800C6AC4 -/* B3D500 800C6360 240703E7 */ li $a3, 999 -/* B3D504 800C6364 8E0201BC */ lw $v0, 0x1bc($s0) -/* B3D508 800C6368 3C04DE01 */ lui $a0, 0xde01 -/* B3D50C 800C636C 3C0BE700 */ lui $t3, 0xe700 -/* B3D510 800C6370 244D0008 */ addiu $t5, $v0, 8 -/* B3D514 800C6374 AE0D01BC */ sw $t5, 0x1bc($s0) -/* B3D518 800C6378 AC440000 */ sw $a0, ($v0) -/* B3D51C 800C637C 8E0E0000 */ lw $t6, ($s0) -/* B3D520 800C6380 3C0DE900 */ lui $t5, 0xe900 -/* B3D524 800C6384 3C068014 */ lui $a2, %hi(D_80145378) # $a2, 0x8014 -/* B3D528 800C6388 AC4E0004 */ sw $t6, 4($v0) -/* B3D52C 800C638C 8E0202C0 */ lw $v0, 0x2c0($s0) -/* B3D530 800C6390 24C65378 */ addiu $a2, %lo(D_80145378) # addiu $a2, $a2, 0x5378 -/* B3D534 800C6394 02002825 */ move $a1, $s0 -/* B3D538 800C6398 244F0008 */ addiu $t7, $v0, 8 -/* B3D53C 800C639C AE0F02C0 */ sw $t7, 0x2c0($s0) -/* B3D540 800C63A0 AC440000 */ sw $a0, ($v0) -/* B3D544 800C63A4 8E180004 */ lw $t8, 4($s0) -/* B3D548 800C63A8 3C0FDF00 */ lui $t7, 0xdf00 -/* B3D54C 800C63AC 24070404 */ li $a3, 1028 -/* B3D550 800C63B0 AC580004 */ sw $t8, 4($v0) -/* B3D554 800C63B4 8E0202D0 */ lw $v0, 0x2d0($s0) -/* B3D558 800C63B8 24590008 */ addiu $t9, $v0, 8 -/* B3D55C 800C63BC AE1902D0 */ sw $t9, 0x2d0($s0) -/* B3D560 800C63C0 AC440000 */ sw $a0, ($v0) -/* B3D564 800C63C4 8E090010 */ lw $t1, 0x10($s0) -/* B3D568 800C63C8 27A40068 */ addiu $a0, $sp, 0x68 -/* B3D56C 800C63CC AC490004 */ sw $t1, 4($v0) -/* B3D570 800C63D0 8E0202B0 */ lw $v0, 0x2b0($s0) -/* B3D574 800C63D4 244A0008 */ addiu $t2, $v0, 8 -/* B3D578 800C63D8 AE0A02B0 */ sw $t2, 0x2b0($s0) -/* B3D57C 800C63DC AC400004 */ sw $zero, 4($v0) -/* B3D580 800C63E0 AC4B0000 */ sw $t3, ($v0) -/* B3D584 800C63E4 8E0202B0 */ lw $v0, 0x2b0($s0) -/* B3D588 800C63E8 244C0008 */ addiu $t4, $v0, 8 -/* B3D58C 800C63EC AE0C02B0 */ sw $t4, 0x2b0($s0) -/* B3D590 800C63F0 AC400004 */ sw $zero, 4($v0) -/* B3D594 800C63F4 AC4D0000 */ sw $t5, ($v0) -/* B3D598 800C63F8 8E0202B0 */ lw $v0, 0x2b0($s0) -/* B3D59C 800C63FC 244E0008 */ addiu $t6, $v0, 8 -/* B3D5A0 800C6400 AE0E02B0 */ sw $t6, 0x2b0($s0) -/* B3D5A4 800C6404 AC400004 */ sw $zero, 4($v0) -/* B3D5A8 800C6408 0C031AD5 */ jal func_800C6B54 -/* B3D5AC 800C640C AC4F0000 */ sw $t7, ($v0) -/* B3D5B0 800C6410 3C088016 */ lui $t0, %hi(gGameInfo) # $t0, 0x8016 -/* B3D5B4 800C6414 2508FA90 */ addiu $t0, %lo(gGameInfo) # addiu $t0, $t0, -0x570 -/* B3D5B8 800C6418 8D020000 */ lw $v0, ($t0) -/* B3D5BC 800C641C 2401000A */ li $at, 10 -/* B3D5C0 800C6420 84431074 */ lh $v1, 0x1074($v0) -/* B3D5C4 800C6424 54610010 */ bnel $v1, $at, .L800C6468 -/* B3D5C8 800C6428 24010007 */ li $at, 7 -/* B3D5CC 800C642C 8458108E */ lh $t8, 0x108e($v0) -/* B3D5D0 800C6430 24010002 */ li $at, 2 -/* B3D5D4 800C6434 24190007 */ li $t9, 7 -/* B3D5D8 800C6438 5701000B */ bnel $t8, $at, .L800C6468 -/* B3D5DC 800C643C 24010007 */ li $at, 7 -/* B3D5E0 800C6440 A4591074 */ sh $t9, 0x1074($v0) -/* B3D5E4 800C6444 8D0A0000 */ lw $t2, ($t0) -/* B3D5E8 800C6448 2409FFFF */ li $t1, -1 -/* B3D5EC 800C644C A5491076 */ sh $t1, 0x1076($t2) -/* B3D5F0 800C6450 8D020000 */ lw $v0, ($t0) -/* B3D5F4 800C6454 844B108C */ lh $t3, 0x108c($v0) -/* B3D5F8 800C6458 A44B107A */ sh $t3, 0x107a($v0) -/* B3D5FC 800C645C 8D020000 */ lw $v0, ($t0) -/* B3D600 800C6460 84431074 */ lh $v1, 0x1074($v0) -/* B3D604 800C6464 24010007 */ li $at, 7 -.L800C6468: -/* B3D608 800C6468 5461002D */ bnel $v1, $at, .L800C6520 -/* B3D60C 800C646C AFA000C4 */ sw $zero, 0xc4($sp) -/* B3D610 800C6470 844C1076 */ lh $t4, 0x1076($v0) -/* B3D614 800C6474 5180002A */ beql $t4, $zero, .L800C6520 -/* B3D618 800C6478 AFA000C4 */ sw $zero, 0xc4($sp) -/* B3D61C 800C647C 844D1078 */ lh $t5, 0x1078($v0) -/* B3D620 800C6480 24010003 */ li $at, 3 -/* B3D624 800C6484 3C048016 */ lui $a0, %hi(D_80166648) # $a0, 0x8016 -/* B3D628 800C6488 15A10007 */ bne $t5, $at, .L800C64A8 -/* B3D62C 800C648C 24846648 */ addiu $a0, %lo(D_80166648) # addiu $a0, $a0, 0x6648 -/* B3D630 800C6490 3C05800C */ lui $a1, %hi(func_800C5AB0) # $a1, 0x800c -/* B3D634 800C6494 3C078014 */ lui $a3, %hi(D_80145384) # $a3, 0x8014 -/* B3D638 800C6498 24E75384 */ addiu $a3, %lo(D_80145384) # addiu $a3, $a3, 0x5384 -/* B3D63C 800C649C 24A55AB0 */ addiu $a1, %lo(func_800C5AB0) # addiu $a1, $a1, 0x5ab0 -/* B3D640 800C64A0 0C035077 */ jal Fault_AddClient -/* B3D644 800C64A4 8E0601B0 */ lw $a2, 0x1b0($s0) -.L800C64A8: -/* B3D648 800C64A8 0C03162F */ jal func_800C58BC -/* B3D64C 800C64AC 8E0401B0 */ lw $a0, 0x1b0($s0) -/* B3D650 800C64B0 3C088016 */ lui $t0, %hi(gGameInfo) # $t0, 0x8016 -/* B3D654 800C64B4 2508FA90 */ addiu $t0, %lo(gGameInfo) # addiu $t0, $t0, -0x570 -/* B3D658 800C64B8 8D020000 */ lw $v0, ($t0) -/* B3D65C 800C64BC 24010003 */ li $at, 3 -/* B3D660 800C64C0 3C048016 */ lui $a0, %hi(D_80166648) # $a0, 0x8016 -/* B3D664 800C64C4 844E1078 */ lh $t6, 0x1078($v0) -/* B3D668 800C64C8 55C10006 */ bnel $t6, $at, .L800C64E4 -/* B3D66C 800C64CC 84431076 */ lh $v1, 0x1076($v0) -/* B3D670 800C64D0 0C0350B0 */ jal Fault_RemoveClient -/* B3D674 800C64D4 24846648 */ addiu $a0, %lo(D_80166648) # addiu $a0, $a0, 0x6648 -/* B3D678 800C64D8 3C028016 */ lui $v0, %hi(gGameInfo) # $v0, 0x8016 -/* B3D67C 800C64DC 8C42FA90 */ lw $v0, %lo(gGameInfo)($v0) -/* B3D680 800C64E0 84431076 */ lh $v1, 0x1076($v0) -.L800C64E4: -/* B3D684 800C64E4 3C04A404 */ lui $a0, 0xa404 -/* B3D688 800C64E8 04610009 */ bgez $v1, .L800C6510 -/* B3D68C 800C64EC 00000000 */ nop -/* B3D690 800C64F0 0C000AC4 */ jal LogUtils_LogHexDump -/* B3D694 800C64F4 24050020 */ li $a1, 32 -/* B3D698 800C64F8 3C04A410 */ lui $a0, 0xa410 -/* B3D69C 800C64FC 0C000AC4 */ jal LogUtils_LogHexDump -/* B3D6A0 800C6500 24050020 */ li $a1, 32 -/* B3D6A4 800C6504 3C028016 */ lui $v0, %hi(gGameInfo) # $v0, 0x8016 -/* B3D6A8 800C6508 8C42FA90 */ lw $v0, %lo(gGameInfo)($v0) -/* B3D6AC 800C650C 84431076 */ lh $v1, 0x1076($v0) -.L800C6510: -/* B3D6B0 800C6510 04630003 */ bgezl $v1, .L800C6520 -/* B3D6B4 800C6514 AFA000C4 */ sw $zero, 0xc4($sp) -/* B3D6B8 800C6518 A4401076 */ sh $zero, 0x1076($v0) -/* B3D6BC 800C651C AFA000C4 */ sw $zero, 0xc4($sp) -.L800C6520: -/* B3D6C0 800C6520 8E0F02D8 */ lw $t7, 0x2d8($s0) -/* B3D6C4 800C6524 3C09801B */ lui $t1, %hi(gGfxPools) # $t1, 0x801b -/* B3D6C8 800C6528 252941C0 */ addiu $t1, %lo(gGfxPools) # addiu $t1, $t1, 0x41c0 -/* B3D6CC 800C652C 31F80001 */ andi $t8, $t7, 1 -/* B3D6D0 800C6530 0018C8C0 */ sll $t9, $t8, 3 -/* B3D6D4 800C6534 0338C821 */ addu $t9, $t9, $t8 -/* B3D6D8 800C6538 0019C8C0 */ sll $t9, $t9, 3 -/* B3D6DC 800C653C 0338C821 */ addu $t9, $t9, $t8 -/* B3D6E0 800C6540 0019C980 */ sll $t9, $t9, 6 -/* B3D6E4 800C6544 0338C821 */ addu $t9, $t9, $t8 -/* B3D6E8 800C6548 0019C900 */ sll $t9, $t9, 4 -/* B3D6EC 800C654C 03295021 */ addu $t2, $t9, $t1 -/* B3D6F0 800C6550 AFAA004C */ sw $t2, 0x4c($sp) -/* B3D6F4 800C6554 954B0000 */ lhu $t3, ($t2) -/* B3D6F8 800C6558 24011234 */ li $at, 4660 -/* B3D6FC 800C655C 1161000B */ beq $t3, $at, .L800C658C -/* B3D700 800C6560 3C048014 */ lui $a0, %hi(D_80145394) # $a0, 0x8014 -/* B3D704 800C6564 24845394 */ addiu $a0, %lo(D_80145394) # addiu $a0, $a0, 0x5394 -/* B3D708 800C6568 0C00084C */ jal osSyncPrintf -/* B3D70C 800C656C 24050007 */ li $a1, 7 -/* B3D710 800C6570 3C048014 */ lui $a0, %hi(D_80145398) # $a0, 0x8014 -/* B3D714 800C6574 0C00084C */ jal osSyncPrintf -/* B3D718 800C6578 24845398 */ addiu $a0, %lo(D_80145398) # addiu $a0, $a0, 0x5398 -/* B3D71C 800C657C 3C048014 */ lui $a0, %hi(D_801453CC) # $a0, 0x8014 -/* B3D720 800C6580 248453CC */ addiu $a0, %lo(D_801453CC) # addiu $a0, $a0, 0x53cc -/* B3D724 800C6584 0C0359C3 */ jal Fault_AddHungupAndCrash -/* B3D728 800C6588 2405042E */ li $a1, 1070 -.L800C658C: -/* B3D72C 800C658C 8FAC004C */ lw $t4, 0x4c($sp) -/* B3D730 800C6590 3C0D0001 */ lui $t5, 1 -/* B3D734 800C6594 24015678 */ li $at, 22136 -/* B3D738 800C6598 01AC6821 */ addu $t5, $t5, $t4 -/* B3D73C 800C659C 95AD2408 */ lhu $t5, 0x2408($t5) -/* B3D740 800C65A0 11A1000D */ beq $t5, $at, .L800C65D8 -/* B3D744 800C65A4 240E0001 */ li $t6, 1 -/* B3D748 800C65A8 3C048014 */ lui $a0, %hi(D_801453D8) # $a0, 0x8014 -/* B3D74C 800C65AC AFAE00C4 */ sw $t6, 0xc4($sp) -/* B3D750 800C65B0 248453D8 */ addiu $a0, %lo(D_801453D8) # addiu $a0, $a0, 0x53d8 -/* B3D754 800C65B4 0C00084C */ jal osSyncPrintf -/* B3D758 800C65B8 24050007 */ li $a1, 7 -/* B3D75C 800C65BC 3C048014 */ lui $a0, %hi(D_801453DC) # $a0, 0x8014 -/* B3D760 800C65C0 0C00084C */ jal osSyncPrintf -/* B3D764 800C65C4 248453DC */ addiu $a0, %lo(D_801453DC) # addiu $a0, $a0, 0x53dc -/* B3D768 800C65C8 3C048014 */ lui $a0, %hi(D_80145410) # $a0, 0x8014 -/* B3D76C 800C65CC 24845410 */ addiu $a0, %lo(D_80145410) # addiu $a0, $a0, 0x5410 -/* B3D770 800C65D0 0C0359C3 */ jal Fault_AddHungupAndCrash -/* B3D774 800C65D4 24050434 */ li $a1, 1076 -.L800C65D8: -/* B3D778 800C65D8 0C030E30 */ jal THGA_IsCrash -/* B3D77C 800C65DC 260402B8 */ addiu $a0, $s0, 0x2b8 -/* B3D780 800C65E0 10400009 */ beqz $v0, .L800C6608 -/* B3D784 800C65E4 240F0001 */ li $t7, 1 -/* B3D788 800C65E8 3C048014 */ lui $a0, %hi(D_8014541C) # $a0, 0x8014 -/* B3D78C 800C65EC AFAF00C4 */ sw $t7, 0xc4($sp) -/* B3D790 800C65F0 2484541C */ addiu $a0, %lo(D_8014541C) # addiu $a0, $a0, 0x541c -/* B3D794 800C65F4 0C00084C */ jal osSyncPrintf -/* B3D798 800C65F8 24050007 */ li $a1, 7 -/* B3D79C 800C65FC 3C048014 */ lui $a0, %hi(D_80145420) # $a0, 0x8014 -/* B3D7A0 800C6600 0C00084C */ jal osSyncPrintf -/* B3D7A4 800C6604 24845420 */ addiu $a0, %lo(D_80145420) # addiu $a0, $a0, 0x5420 -.L800C6608: -/* B3D7A8 800C6608 0C030E30 */ jal THGA_IsCrash -/* B3D7AC 800C660C 260402C8 */ addiu $a0, $s0, 0x2c8 -/* B3D7B0 800C6610 10400009 */ beqz $v0, .L800C6638 -/* B3D7B4 800C6614 24180001 */ li $t8, 1 -/* B3D7B8 800C6618 3C048014 */ lui $a0, %hi(D_8014545C) # $a0, 0x8014 -/* B3D7BC 800C661C AFB800C4 */ sw $t8, 0xc4($sp) -/* B3D7C0 800C6620 2484545C */ addiu $a0, %lo(D_8014545C) # addiu $a0, $a0, 0x545c -/* B3D7C4 800C6624 0C00084C */ jal osSyncPrintf -/* B3D7C8 800C6628 24050007 */ li $a1, 7 -/* B3D7CC 800C662C 3C048014 */ lui $a0, %hi(D_80145460) # $a0, 0x8014 -/* B3D7D0 800C6630 0C00084C */ jal osSyncPrintf -/* B3D7D4 800C6634 24845460 */ addiu $a0, %lo(D_80145460) # addiu $a0, $a0, 0x5460 -.L800C6638: -/* B3D7D8 800C6638 0C030E30 */ jal THGA_IsCrash -/* B3D7DC 800C663C 260402A8 */ addiu $a0, $s0, 0x2a8 -/* B3D7E0 800C6640 10400009 */ beqz $v0, .L800C6668 -/* B3D7E4 800C6644 24190001 */ li $t9, 1 -/* B3D7E8 800C6648 3C048014 */ lui $a0, %hi(D_8014549C) # $a0, 0x8014 -/* B3D7EC 800C664C AFB900C4 */ sw $t9, 0xc4($sp) -/* B3D7F0 800C6650 2484549C */ addiu $a0, %lo(D_8014549C) # addiu $a0, $a0, 0x549c -/* B3D7F4 800C6654 0C00084C */ jal osSyncPrintf -/* B3D7F8 800C6658 24050007 */ li $a1, 7 -/* B3D7FC 800C665C 3C048014 */ lui $a0, %hi(D_801454A0) # $a0, 0x8014 -/* B3D800 800C6660 0C00084C */ jal osSyncPrintf -/* B3D804 800C6664 248454A0 */ addiu $a0, %lo(D_801454A0) # addiu $a0, $a0, 0x54a0 -.L800C6668: -/* B3D808 800C6668 8FA900C4 */ lw $t1, 0xc4($sp) -/* B3D80C 800C666C 15200009 */ bnez $t1, .L800C6694 -/* B3D810 800C6670 00000000 */ nop -/* B3D814 800C6674 0C031770 */ jal func_800C5DC0 -/* B3D818 800C6678 02002025 */ move $a0, $s0 -/* B3D81C 800C667C 8E0A02D8 */ lw $t2, 0x2d8($s0) -/* B3D820 800C6680 8E0C02E8 */ lw $t4, 0x2e8($s0) -/* B3D824 800C6684 254B0001 */ addiu $t3, $t2, 1 -/* B3D828 800C6688 258D0001 */ addiu $t5, $t4, 1 -/* B3D82C 800C668C AE0B02D8 */ sw $t3, 0x2d8($s0) -/* B3D830 800C6690 AE0D02E8 */ sw $t5, 0x2e8($s0) -.L800C6694: -/* B3D834 800C6694 0C03CC15 */ jal func_800F3054 -/* B3D838 800C6698 00000000 */ nop -/* B3D83C 800C669C 0C001A78 */ jal osGetTime -/* B3D840 800C66A0 00000000 */ nop -/* B3D844 800C66A4 3C048017 */ lui $a0, %hi(D_8016A568) # $a0, 0x8017 -/* B3D848 800C66A8 2484A568 */ addiu $a0, %lo(D_8016A568) # addiu $a0, $a0, -0x5a98 -/* B3D84C 800C66AC 8C8E0000 */ lw $t6, ($a0) -/* B3D850 800C66B0 8C8F0004 */ lw $t7, 4($a0) -/* B3D854 800C66B4 3C188017 */ lui $t8, %hi(D_8016A538) # $t8, 0x8017 -/* B3D858 800C66B8 2718A538 */ addiu $t8, %lo(D_8016A538) # addiu $t8, $t8, -0x5ac8 -/* B3D85C 800C66BC 3C058017 */ lui $a1, %hi(D_8016A560) # $a1, 0x8017 -/* B3D860 800C66C0 AF0E0000 */ sw $t6, ($t8) -/* B3D864 800C66C4 24A5A560 */ addiu $a1, %lo(D_8016A560) # addiu $a1, $a1, -0x5aa0 -/* B3D868 800C66C8 AF0F0004 */ sw $t7, 4($t8) -/* B3D86C 800C66CC 8CAA0000 */ lw $t2, ($a1) -/* B3D870 800C66D0 8CAB0004 */ lw $t3, 4($a1) -/* B3D874 800C66D4 3C198017 */ lui $t9, %hi(D_8016A530) # $t9, 0x8017 -/* B3D878 800C66D8 2739A530 */ addiu $t9, %lo(D_8016A530) # addiu $t9, $t9, -0x5ad0 -/* B3D87C 800C66DC 3C068017 */ lui $a2, %hi(D_8016A580) # $a2, 0x8017 -/* B3D880 800C66E0 AF2A0000 */ sw $t2, ($t9) -/* B3D884 800C66E4 24C6A580 */ addiu $a2, %lo(D_8016A580) # addiu $a2, $a2, -0x5a80 -/* B3D888 800C66E8 AF2B0004 */ sw $t3, 4($t9) -/* B3D88C 800C66EC 8CCC0000 */ lw $t4, ($a2) -/* B3D890 800C66F0 8CCD0004 */ lw $t5, 4($a2) -/* B3D894 800C66F4 3C098017 */ lui $t1, %hi(D_8016A540) # $t1, 0x8017 -/* B3D898 800C66F8 2529A540 */ addiu $t1, %lo(D_8016A540) # addiu $t1, $t1, -0x5ac0 -/* B3D89C 800C66FC AD2C0000 */ sw $t4, ($t1) -/* B3D8A0 800C6700 AD2D0004 */ sw $t5, 4($t1) -/* B3D8A4 800C6704 240E0000 */ li $t6, 0 -/* B3D8A8 800C6708 AC8E0000 */ sw $t6, ($a0) -/* B3D8AC 800C670C 240F0000 */ li $t7, 0 -/* B3D8B0 800C6710 AC8F0004 */ sw $t7, 4($a0) -/* B3D8B4 800C6714 24180000 */ li $t8, 0 -/* B3D8B8 800C6718 ACB80000 */ sw $t8, ($a1) -/* B3D8BC 800C671C 24190000 */ li $t9, 0 -/* B3D8C0 800C6720 ACB90004 */ sw $t9, 4($a1) -/* B3D8C4 800C6724 240A0000 */ li $t2, 0 -/* B3D8C8 800C6728 ACCA0000 */ sw $t2, ($a2) -/* B3D8CC 800C672C 240B0000 */ li $t3, 0 -/* B3D8D0 800C6730 ACCB0004 */ sw $t3, 4($a2) -/* B3D8D4 800C6734 3C0C8016 */ lui $t4, %hi(D_801665D0) # $t4, 0x8016 -/* B3D8D8 800C6738 8D8C65D0 */ lw $t4, %lo(D_801665D0)($t4) -/* B3D8DC 800C673C 3C0D8016 */ lui $t5, %hi(D_801665D4) # $t5, 0x8016 -/* B3D8E0 800C6740 8DAD65D4 */ lw $t5, %lo(D_801665D4)($t5) -/* B3D8E4 800C6744 AFAC0020 */ sw $t4, 0x20($sp) -/* B3D8E8 800C6748 15800002 */ bnez $t4, .L800C6754 -/* B3D8EC 800C674C AFAD0024 */ sw $t5, 0x24($sp) -/* B3D8F0 800C6750 11A00008 */ beqz $t5, .L800C6774 -.L800C6754: -/* B3D8F4 800C6754 006D082B */ sltu $at, $v1, $t5 -/* B3D8F8 800C6758 004C7023 */ subu $t6, $v0, $t4 -/* B3D8FC 800C675C 3C098017 */ lui $t1, %hi(D_8016A548) # $t1, 0x8017 -/* B3D900 800C6760 2529A548 */ addiu $t1, %lo(D_8016A548) # addiu $t1, $t1, -0x5ab8 -/* B3D904 800C6764 01C17023 */ subu $t6, $t6, $at -/* B3D908 800C6768 AD2E0000 */ sw $t6, ($t1) -/* B3D90C 800C676C 006D7823 */ subu $t7, $v1, $t5 -/* B3D910 800C6770 AD2F0004 */ sw $t7, 4($t1) -.L800C6774: -/* B3D914 800C6774 3C048013 */ lui $a0, %hi(D_8012DBC0) # $a0, 0x8013 -/* B3D918 800C6778 8C84DBC0 */ lw $a0, %lo(D_8012DBC0)($a0) -/* B3D91C 800C677C 3C018016 */ lui $at, %hi(D_801665D4) # $at, 0x8016 -/* B3D920 800C6780 AC2265D0 */ sw $v0, %lo(D_801665D0)($at) -/* B3D924 800C6784 10800015 */ beqz $a0, .L800C67DC -/* B3D928 800C6788 AC2365D4 */ sw $v1, %lo(D_801665D4)($at) -/* B3D92C 800C678C 8FA200CC */ lw $v0, 0xcc($sp) -/* B3D930 800C6790 2401DFFF */ li $at, -8193 -/* B3D934 800C6794 94580020 */ lhu $t8, 0x20($v0) -/* B3D938 800C6798 0301C827 */ nor $t9, $t8, $at -/* B3D93C 800C679C 1720000F */ bnez $t9, .L800C67DC -/* B3D940 800C67A0 00000000 */ nop -/* B3D944 800C67A4 944A0014 */ lhu $t2, 0x14($v0) -/* B3D948 800C67A8 2401FFCF */ li $at, -49 -/* B3D94C 800C67AC 3C0C8080 */ lui $t4, %hi(func_80801E44) # $t4, 0x8080 -/* B3D950 800C67B0 01415827 */ nor $t3, $t2, $at -/* B3D954 800C67B4 15600009 */ bnez $t3, .L800C67DC -/* B3D958 800C67B8 3C018016 */ lui $at, %hi(gSaveContext+0x135c) # $at, 0x8016 -/* B3D95C 800C67BC AC20F9BC */ sw $zero, %lo(gSaveContext+0x135c)($at) -/* B3D960 800C67C0 258C1E44 */ addiu $t4, %lo(func_80801E44) # addiu $t4, $t4, 0x1e44 -/* B3D964 800C67C4 240D0240 */ li $t5, 576 -/* B3D968 800C67C8 AC4D0010 */ sw $t5, 0x10($v0) -/* B3D96C 800C67CC AC4C000C */ sw $t4, 0xc($v0) -/* B3D970 800C67D0 AC400098 */ sw $zero, 0x98($v0) -/* B3D974 800C67D4 3C048013 */ lui $a0, %hi(D_8012DBC0) # $a0, 0x8013 -/* B3D978 800C67D8 8C84DBC0 */ lw $a0, %lo(D_8012DBC0)($a0) -.L800C67DC: -/* B3D97C 800C67DC 10800014 */ beqz $a0, .L800C6830 -/* B3D980 800C67E0 3C048016 */ lui $a0, %hi(gAppNmiBufferPtr) # $a0, 0x8016 -/* B3D984 800C67E4 0C01EFC2 */ jal func_8007BF08 -/* B3D988 800C67E8 8C846660 */ lw $a0, %lo(gAppNmiBufferPtr)($a0) -/* B3D98C 800C67EC 10400010 */ beqz $v0, .L800C6830 -/* B3D990 800C67F0 8FAE00CC */ lw $t6, 0xcc($sp) -/* B3D994 800C67F4 8DCF00A0 */ lw $t7, 0xa0($t6) -/* B3D998 800C67F8 3C048014 */ lui $a0, %hi(D_801454DC) # $a0, 0x8014 -/* B3D99C 800C67FC 55E0000D */ bnezl $t7, .L800C6834 -/* B3D9A0 800C6800 8FBF001C */ lw $ra, 0x1c($sp) -/* B3D9A4 800C6804 0C00084C */ jal osSyncPrintf -/* B3D9A8 800C6808 248454DC */ addiu $a0, %lo(D_801454DC) # addiu $a0, $a0, 0x54dc -/* B3D9AC 800C680C 8FB800CC */ lw $t8, 0xcc($sp) -/* B3D9B0 800C6810 3C098009 */ lui $t1, %hi(PreNMI_Init) # $t1, 0x8009 -/* B3D9B4 800C6814 252924B8 */ addiu $t1, %lo(PreNMI_Init) # addiu $t1, $t1, 0x24b8 -/* B3D9B8 800C6818 AF09000C */ sw $t1, 0xc($t8) -/* B3D9BC 800C681C 8FAA00CC */ lw $t2, 0xcc($sp) -/* B3D9C0 800C6820 241900AC */ li $t9, 172 -/* B3D9C4 800C6824 AD590010 */ sw $t9, 0x10($t2) -/* B3D9C8 800C6828 8FAB00CC */ lw $t3, 0xcc($sp) -/* B3D9CC 800C682C AD600098 */ sw $zero, 0x98($t3) -.L800C6830: -/* B3D9D0 800C6830 8FBF001C */ lw $ra, 0x1c($sp) -.L800C6834: -/* B3D9D4 800C6834 8FB00018 */ lw $s0, 0x18($sp) -/* B3D9D8 800C6838 27BD00C8 */ addiu $sp, $sp, 0xc8 -/* B3D9DC 800C683C 03E00008 */ jr $ra -/* B3D9E0 800C6840 00000000 */ nop - -glabel Graph_ThreadEntry -/* B3D9E4 800C6844 27BDFC60 */ addiu $sp, $sp, -0x3a0 -/* B3D9E8 800C6848 AFB00018 */ sw $s0, 0x18($sp) -/* B3D9EC 800C684C 3C108012 */ lui $s0, %hi(D_8011F830) # $s0, 0x8012 -/* B3D9F0 800C6850 AFA403A0 */ sw $a0, 0x3a0($sp) -/* B3D9F4 800C6854 2610F830 */ addiu $s0, %lo(D_8011F830) # addiu $s0, $s0, -0x7d0 -/* B3D9F8 800C6858 AFBF003C */ sw $ra, 0x3c($sp) -/* B3D9FC 800C685C AFB30024 */ sw $s3, 0x24($sp) -/* B3DA00 800C6860 3C048014 */ lui $a0, %hi(D_80145510) # $a0, 0x8014 -/* B3DA04 800C6864 AFBE0038 */ sw $fp, 0x38($sp) -/* B3DA08 800C6868 AFB70034 */ sw $s7, 0x34($sp) -/* B3DA0C 800C686C AFB60030 */ sw $s6, 0x30($sp) -/* B3DA10 800C6870 AFB5002C */ sw $s5, 0x2c($sp) -/* B3DA14 800C6874 AFB40028 */ sw $s4, 0x28($sp) -/* B3DA18 800C6878 AFB20020 */ sw $s2, 0x20($sp) -/* B3DA1C 800C687C AFB1001C */ sw $s1, 0x1c($sp) -/* B3DA20 800C6880 02009825 */ move $s3, $s0 -/* B3DA24 800C6884 0C00084C */ jal osSyncPrintf -/* B3DA28 800C6888 24845510 */ addiu $a0, %lo(D_80145510) # addiu $a0, $a0, 0x5510 -/* B3DA2C 800C688C 27B200A0 */ addiu $s2, $sp, 0xa0 -/* B3DA30 800C6890 0C031742 */ jal func_800C5D08 -/* B3DA34 800C6894 02402025 */ move $a0, $s2 -/* B3DA38 800C6898 1200003B */ beqz $s0, .L800C6988 -/* B3DA3C 800C689C 3C178014 */ lui $s7, %hi(D_80145548) # $s7, 0x8014 -/* B3DA40 800C68A0 3C1E8014 */ lui $fp, %hi(D_80145554) # $fp, 0x8014 -/* B3DA44 800C68A4 3C168014 */ lui $s6, %hi(D_80145530) # $s6, 0x8014 -/* B3DA48 800C68A8 26D65530 */ addiu $s6, %lo(D_80145530) # addiu $s6, $s6, 0x5530 -/* B3DA4C 800C68AC 27DE5554 */ addiu $fp, %lo(D_80145554) # addiu $fp, $fp, 0x5554 -/* B3DA50 800C68B0 26F75548 */ addiu $s7, %lo(D_80145548) # addiu $s7, $s7, 0x5548 -/* B3DA54 800C68B4 27B50040 */ addiu $s5, $sp, 0x40 -/* B3DA58 800C68B8 0260A025 */ move $s4, $s3 -.L800C68BC: -/* B3DA5C 800C68BC 0C00ABC0 */ jal Overlay_LoadGameState -/* B3DA60 800C68C0 02602025 */ move $a0, $s3 -/* B3DA64 800C68C4 8E71002C */ lw $s1, 0x2c($s3) -/* B3DA68 800C68C8 02C02025 */ move $a0, $s6 -/* B3DA6C 800C68CC 0C00084C */ jal osSyncPrintf -/* B3DA70 800C68D0 02202825 */ move $a1, $s1 -/* B3DA74 800C68D4 02202025 */ move $a0, $s1 -/* B3DA78 800C68D8 02E02825 */ move $a1, $s7 -/* B3DA7C 800C68DC 0C03F570 */ jal SystemArena_MallocDebug -/* B3DA80 800C68E0 240604AC */ li $a2, 1196 -/* B3DA84 800C68E4 1440000C */ bnez $v0, .L800C6918 -/* B3DA88 800C68E8 00408025 */ move $s0, $v0 -/* B3DA8C 800C68EC 0C00084C */ jal osSyncPrintf -/* B3DA90 800C68F0 03C02025 */ move $a0, $fp -/* B3DA94 800C68F4 3C058014 */ lui $a1, %hi(D_80145560) # $a1, 0x8014 -/* B3DA98 800C68F8 24A55560 */ addiu $a1, %lo(D_80145560) # addiu $a1, $a1, 0x5560 -/* B3DA9C 800C68FC 02A02025 */ move $a0, $s5 -/* B3DAA0 800C6900 0C000BD1 */ jal sprintf -/* B3DAA4 800C6904 02203025 */ move $a2, $s1 -/* B3DAA8 800C6908 3C048014 */ lui $a0, %hi(D_80145578) # $a0, 0x8014 -/* B3DAAC 800C690C 24845578 */ addiu $a0, %lo(D_80145578) # addiu $a0, $a0, 0x5578 -/* B3DAB0 800C6910 0C0359AD */ jal Fault_AddHungupAndCrashImpl -/* B3DAB4 800C6914 02A02825 */ move $a1, $s5 -.L800C6918: -/* B3DAB8 800C6918 02002025 */ move $a0, $s0 -/* B3DABC 800C691C 8E650018 */ lw $a1, 0x18($s3) -/* B3DAC0 800C6920 0C031420 */ jal func_800C5080 -/* B3DAC4 800C6924 02403025 */ move $a2, $s2 -/* B3DAC8 800C6928 0C03151F */ jal func_800C547C -/* B3DACC 800C692C 02002025 */ move $a0, $s0 -/* B3DAD0 800C6930 10400007 */ beqz $v0, .L800C6950 -/* B3DAD4 800C6934 02402025 */ move $a0, $s2 -.L800C6938: -/* B3DAD8 800C6938 0C031876 */ jal func_800C61D8 -/* B3DADC 800C693C 02002825 */ move $a1, $s0 -/* B3DAE0 800C6940 0C03151F */ jal func_800C547C -/* B3DAE4 800C6944 02002025 */ move $a0, $s0 -/* B3DAE8 800C6948 5440FFFB */ bnezl $v0, .L800C6938 -/* B3DAEC 800C694C 02402025 */ move $a0, $s2 -.L800C6950: -/* B3DAF0 800C6950 0C03170B */ jal func_800C5C2C -/* B3DAF4 800C6954 02002025 */ move $a0, $s0 -/* B3DAF8 800C6958 00409825 */ move $s3, $v0 -/* B3DAFC 800C695C 0C0314D8 */ jal func_800C5360 -/* B3DB00 800C6960 02002025 */ move $a0, $s0 -/* B3DB04 800C6964 3C058014 */ lui $a1, %hi(D_80145594) # $a1, 0x8014 -/* B3DB08 800C6968 24A55594 */ addiu $a1, %lo(D_80145594) # addiu $a1, $a1, 0x5594 -/* B3DB0C 800C696C 02002025 */ move $a0, $s0 -/* B3DB10 800C6970 0C03F5ED */ jal SystemArena_FreeDebug -/* B3DB14 800C6974 240604CB */ li $a2, 1227 -/* B3DB18 800C6978 0C00AC2A */ jal Overlay_FreeGameState -/* B3DB1C 800C697C 02802025 */ move $a0, $s4 -/* B3DB20 800C6980 5660FFCE */ bnezl $s3, .L800C68BC -/* B3DB24 800C6984 0260A025 */ move $s4, $s3 -.L800C6988: -/* B3DB28 800C6988 0C031765 */ jal func_800C5D94 -/* B3DB2C 800C698C 02402025 */ move $a0, $s2 -/* B3DB30 800C6990 3C048014 */ lui $a0, %hi(D_801455A0) # $a0, 0x8014 -/* B3DB34 800C6994 0C00084C */ jal osSyncPrintf -/* B3DB38 800C6998 248455A0 */ addiu $a0, %lo(D_801455A0) # addiu $a0, $a0, 0x55a0 -/* B3DB3C 800C699C 8FBF003C */ lw $ra, 0x3c($sp) -/* B3DB40 800C69A0 8FB00018 */ lw $s0, 0x18($sp) -/* B3DB44 800C69A4 8FB1001C */ lw $s1, 0x1c($sp) -/* B3DB48 800C69A8 8FB20020 */ lw $s2, 0x20($sp) -/* B3DB4C 800C69AC 8FB30024 */ lw $s3, 0x24($sp) -/* B3DB50 800C69B0 8FB40028 */ lw $s4, 0x28($sp) -/* B3DB54 800C69B4 8FB5002C */ lw $s5, 0x2c($sp) -/* B3DB58 800C69B8 8FB60030 */ lw $s6, 0x30($sp) -/* B3DB5C 800C69BC 8FB70034 */ lw $s7, 0x34($sp) -/* B3DB60 800C69C0 8FBE0038 */ lw $fp, 0x38($sp) -/* B3DB64 800C69C4 03E00008 */ jr $ra -/* B3DB68 800C69C8 27BD03A0 */ addiu $sp, $sp, 0x3a0 - -glabel Graph_Alloc -/* B3DB6C 800C69CC 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* B3DB70 800C69D0 3C0E8016 */ lui $t6, %hi(gGameInfo) # $t6, 0x8016 -/* B3DB74 800C69D4 8DCEFA90 */ lw $t6, %lo(gGameInfo)($t6) -/* B3DB78 800C69D8 AFBF001C */ sw $ra, 0x1c($sp) -/* B3DB7C 800C69DC AFA40020 */ sw $a0, 0x20($sp) -/* B3DB80 800C69E0 AFA50024 */ sw $a1, 0x24($sp) -/* B3DB84 800C69E4 85CF104A */ lh $t7, 0x104a($t6) -/* B3DB88 800C69E8 8FA20020 */ lw $v0, 0x20($sp) -/* B3DB8C 800C69EC 24010001 */ li $at, 1 -/* B3DB90 800C69F0 15E1000A */ bne $t7, $at, .L800C6A1C -/* B3DB94 800C69F4 244202B8 */ addiu $v0, $v0, 0x2b8 -/* B3DB98 800C69F8 8C580008 */ lw $t8, 8($v0) -/* B3DB9C 800C69FC 8C460000 */ lw $a2, ($v0) -/* B3DBA0 800C6A00 8C470004 */ lw $a3, 4($v0) -/* B3DBA4 800C6A04 AFB80010 */ sw $t8, 0x10($sp) -/* B3DBA8 800C6A08 8C59000C */ lw $t9, 0xc($v0) -/* B3DBAC 800C6A0C 3C048014 */ lui $a0, %hi(D_801455C0) # $a0, 0x8014 -/* B3DBB0 800C6A10 248455C0 */ addiu $a0, %lo(D_801455C0) # addiu $a0, $a0, 0x55c0 -/* B3DBB4 800C6A14 0C00084C */ jal osSyncPrintf -/* B3DBB8 800C6A18 AFB90014 */ sw $t9, 0x14($sp) -.L800C6A1C: -/* B3DBBC 800C6A1C 8FA50024 */ lw $a1, 0x24($sp) -/* B3DBC0 800C6A20 8FA40020 */ lw $a0, 0x20($sp) -/* B3DBC4 800C6A24 2401FFF0 */ li $at, -16 -/* B3DBC8 800C6A28 24A5000F */ addiu $a1, $a1, 0xf -/* B3DBCC 800C6A2C 00A12824 */ and $a1, $a1, $at -/* B3DBD0 800C6A30 0C030E78 */ jal THGA_AllocEnd -/* B3DBD4 800C6A34 248402B8 */ addiu $a0, $a0, 0x2b8 -/* B3DBD8 800C6A38 8FBF001C */ lw $ra, 0x1c($sp) -/* B3DBDC 800C6A3C 27BD0020 */ addiu $sp, $sp, 0x20 -/* B3DBE0 800C6A40 03E00008 */ jr $ra -/* B3DBE4 800C6A44 00000000 */ nop - -glabel func_800C6A48 -/* B3DBE8 800C6A48 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* B3DBEC 800C6A4C 3C0E8016 */ lui $t6, %hi(gGameInfo) # $t6, 0x8016 -/* B3DBF0 800C6A50 8DCEFA90 */ lw $t6, %lo(gGameInfo)($t6) -/* B3DBF4 800C6A54 AFBF001C */ sw $ra, 0x1c($sp) -/* B3DBF8 800C6A58 AFA40020 */ sw $a0, 0x20($sp) -/* B3DBFC 800C6A5C AFA50024 */ sw $a1, 0x24($sp) -/* B3DC00 800C6A60 85CF104A */ lh $t7, 0x104a($t6) -/* B3DC04 800C6A64 8FA20020 */ lw $v0, 0x20($sp) -/* B3DC08 800C6A68 24010001 */ li $at, 1 -/* B3DC0C 800C6A6C 15E1000A */ bne $t7, $at, .L800C6A98 -/* B3DC10 800C6A70 244202B8 */ addiu $v0, $v0, 0x2b8 -/* B3DC14 800C6A74 8C580008 */ lw $t8, 8($v0) -/* B3DC18 800C6A78 8C460000 */ lw $a2, ($v0) -/* B3DC1C 800C6A7C 8C470004 */ lw $a3, 4($v0) -/* B3DC20 800C6A80 AFB80010 */ sw $t8, 0x10($sp) -/* B3DC24 800C6A84 8C59000C */ lw $t9, 0xc($v0) -/* B3DC28 800C6A88 3C048014 */ lui $a0, %hi(D_80145604) # $a0, 0x8014 -/* B3DC2C 800C6A8C 24845604 */ addiu $a0, %lo(D_80145604) # addiu $a0, $a0, 0x5604 -/* B3DC30 800C6A90 0C00084C */ jal osSyncPrintf -/* B3DC34 800C6A94 AFB90014 */ sw $t9, 0x14($sp) -.L800C6A98: -/* B3DC38 800C6A98 8FA50024 */ lw $a1, 0x24($sp) -/* B3DC3C 800C6A9C 8FA40020 */ lw $a0, 0x20($sp) -/* B3DC40 800C6AA0 2401FFF0 */ li $at, -16 -/* B3DC44 800C6AA4 24A5000F */ addiu $a1, $a1, 0xf -/* B3DC48 800C6AA8 00A12824 */ and $a1, $a1, $at -/* B3DC4C 800C6AAC 0C030E78 */ jal THGA_AllocEnd -/* B3DC50 800C6AB0 248402B8 */ addiu $a0, $a0, 0x2b8 -/* B3DC54 800C6AB4 8FBF001C */ lw $ra, 0x1c($sp) -/* B3DC58 800C6AB8 27BD0020 */ addiu $sp, $sp, 0x20 -/* B3DC5C 800C6ABC 03E00008 */ jr $ra -/* B3DC60 800C6AC0 00000000 */ nop - -glabel func_800C6AC4 -/* B3DC64 800C6AC4 3C028016 */ lui $v0, %hi(gGameInfo) # $v0, 0x8016 -/* B3DC68 800C6AC8 8C42FA90 */ lw $v0, %lo(gGameInfo)($v0) -/* B3DC6C 800C6ACC 24010007 */ li $at, 7 -/* B3DC70 800C6AD0 844E1074 */ lh $t6, 0x1074($v0) -/* B3DC74 800C6AD4 15C1001D */ bne $t6, $at, .L800C6B4C -/* B3DC78 800C6AD8 00000000 */ nop -/* B3DC7C 800C6ADC 844F1078 */ lh $t7, 0x1078($v0) -/* B3DC80 800C6AE0 24010004 */ li $at, 4 -/* B3DC84 800C6AE4 11E10019 */ beq $t7, $at, .L800C6B4C -/* B3DC88 800C6AE8 00000000 */ nop -/* B3DC8C 800C6AEC 8CB802C0 */ lw $t8, 0x2c0($a1) -/* B3DC90 800C6AF0 3C010007 */ lui $at, 7 -/* B3DC94 800C6AF4 AC980000 */ sw $t8, ($a0) -/* B3DC98 800C6AF8 8CB902D0 */ lw $t9, 0x2d0($a1) -/* B3DC9C 800C6AFC AC990004 */ sw $t9, 4($a0) -/* B3DCA0 800C6B00 8CA802B0 */ lw $t0, 0x2b0($a1) -/* B3DCA4 800C6B04 AC880008 */ sw $t0, 8($a0) -/* B3DCA8 800C6B08 8CA202C0 */ lw $v0, 0x2c0($a1) -/* B3DCAC 800C6B0C 30E4FFFF */ andi $a0, $a3, 0xffff -/* B3DCB0 800C6B10 00812025 */ or $a0, $a0, $at -/* B3DCB4 800C6B14 24490008 */ addiu $t1, $v0, 8 -/* B3DCB8 800C6B18 ACA902C0 */ sw $t1, 0x2c0($a1) -/* B3DCBC 800C6B1C AC460004 */ sw $a2, 4($v0) -/* B3DCC0 800C6B20 AC440000 */ sw $a0, ($v0) -/* B3DCC4 800C6B24 8CA202D0 */ lw $v0, 0x2d0($a1) -/* B3DCC8 800C6B28 244A0008 */ addiu $t2, $v0, 8 -/* B3DCCC 800C6B2C ACAA02D0 */ sw $t2, 0x2d0($a1) -/* B3DCD0 800C6B30 AC460004 */ sw $a2, 4($v0) -/* B3DCD4 800C6B34 AC440000 */ sw $a0, ($v0) -/* B3DCD8 800C6B38 8CA202B0 */ lw $v0, 0x2b0($a1) -/* B3DCDC 800C6B3C 244B0008 */ addiu $t3, $v0, 8 -/* B3DCE0 800C6B40 ACAB02B0 */ sw $t3, 0x2b0($a1) -/* B3DCE4 800C6B44 AC460004 */ sw $a2, 4($v0) -/* B3DCE8 800C6B48 AC440000 */ sw $a0, ($v0) -.L800C6B4C: -/* B3DCEC 800C6B4C 03E00008 */ jr $ra -/* B3DCF0 800C6B50 00000000 */ nop - -glabel func_800C6B54 -/* B3DCF4 800C6B54 3C028016 */ lui $v0, %hi(gGameInfo) # $v0, 0x8016 -/* B3DCF8 800C6B58 8C42FA90 */ lw $v0, %lo(gGameInfo)($v0) -/* B3DCFC 800C6B5C 24010007 */ li $at, 7 -/* B3DD00 800C6B60 844E1074 */ lh $t6, 0x1074($v0) -/* B3DD04 800C6B64 15C1002C */ bne $t6, $at, .L800C6C18 -/* B3DD08 800C6B68 00000000 */ nop -/* B3DD0C 800C6B6C 844F1078 */ lh $t7, 0x1078($v0) -/* B3DD10 800C6B70 24010004 */ li $at, 4 -/* B3DD14 800C6B74 11E10028 */ beq $t7, $at, .L800C6C18 -/* B3DD18 800C6B78 00000000 */ nop -/* B3DD1C 800C6B7C 8C830000 */ lw $v1, ($a0) -/* B3DD20 800C6B80 8CA202C0 */ lw $v0, 0x2c0($a1) -/* B3DD24 800C6B84 30E9FFFF */ andi $t1, $a3, 0xffff -/* B3DD28 800C6B88 24780008 */ addiu $t8, $v1, 8 -/* B3DD2C 800C6B8C 14580003 */ bne $v0, $t8, .L800C6B9C -/* B3DD30 800C6B90 24590008 */ addiu $t9, $v0, 8 -/* B3DD34 800C6B94 10000006 */ b .L800C6BB0 -/* B3DD38 800C6B98 ACA302C0 */ sw $v1, 0x2c0($a1) -.L800C6B9C: -/* B3DD3C 800C6B9C ACB902C0 */ sw $t9, 0x2c0($a1) -/* B3DD40 800C6BA0 3C010008 */ lui $at, 8 -/* B3DD44 800C6BA4 01215025 */ or $t2, $t1, $at -/* B3DD48 800C6BA8 AC4A0000 */ sw $t2, ($v0) -/* B3DD4C 800C6BAC AC460004 */ sw $a2, 4($v0) -.L800C6BB0: -/* B3DD50 800C6BB0 8C820004 */ lw $v0, 4($a0) -/* B3DD54 800C6BB4 8CA302D0 */ lw $v1, 0x2d0($a1) -/* B3DD58 800C6BB8 3C010008 */ lui $at, 8 -/* B3DD5C 800C6BBC 244B0008 */ addiu $t3, $v0, 8 -/* B3DD60 800C6BC0 146B0003 */ bne $v1, $t3, .L800C6BD0 -/* B3DD64 800C6BC4 246C0008 */ addiu $t4, $v1, 8 -/* B3DD68 800C6BC8 10000006 */ b .L800C6BE4 -/* B3DD6C 800C6BCC ACA202D0 */ sw $v0, 0x2d0($a1) -.L800C6BD0: -/* B3DD70 800C6BD0 30E2FFFF */ andi $v0, $a3, 0xffff -/* B3DD74 800C6BD4 ACAC02D0 */ sw $t4, 0x2d0($a1) -/* B3DD78 800C6BD8 00411025 */ or $v0, $v0, $at -/* B3DD7C 800C6BDC AC620000 */ sw $v0, ($v1) -/* B3DD80 800C6BE0 AC660004 */ sw $a2, 4($v1) -.L800C6BE4: -/* B3DD84 800C6BE4 8C820008 */ lw $v0, 8($a0) -/* B3DD88 800C6BE8 8CA302B0 */ lw $v1, 0x2b0($a1) -/* B3DD8C 800C6BEC 3C010008 */ lui $at, 8 -/* B3DD90 800C6BF0 244D0008 */ addiu $t5, $v0, 8 -/* B3DD94 800C6BF4 146D0003 */ bne $v1, $t5, .L800C6C04 -/* B3DD98 800C6BF8 246E0008 */ addiu $t6, $v1, 8 -/* B3DD9C 800C6BFC 03E00008 */ jr $ra -/* B3DDA0 800C6C00 ACA202B0 */ sw $v0, 0x2b0($a1) - -.L800C6C04: -/* B3DDA4 800C6C04 30E2FFFF */ andi $v0, $a3, 0xffff -/* B3DDA8 800C6C08 ACAE02B0 */ sw $t6, 0x2b0($a1) -/* B3DDAC 800C6C0C 00411025 */ or $v0, $v0, $at -/* B3DDB0 800C6C10 AC620000 */ sw $v0, ($v1) -/* B3DDB4 800C6C14 AC660004 */ sw $a2, 4($v1) -.L800C6C18: -/* B3DDB8 800C6C18 03E00008 */ jr $ra -/* B3DDBC 800C6C1C 00000000 */ nop - -glabel func_800C6C20 -/* B3DDC0 800C6C20 03E00008 */ jr $ra -/* B3DDC4 800C6C24 24820008 */ addiu $v0, $a0, 8 - -glabel func_800C6C28 -/* B3DDC8 800C6C28 3C0EDE01 */ lui $t6, 0xde01 -/* B3DDCC 800C6C2C AC8E0000 */ sw $t6, ($a0) -/* B3DDD0 800C6C30 AC850004 */ sw $a1, 4($a0) -/* B3DDD4 800C6C34 03E00008 */ jr $ra -/* B3DDD8 800C6C38 00A01025 */ move $v0, $a1 - -glabel func_800C6C3C -/* B3DDDC 800C6C3C 8C820000 */ lw $v0, ($a0) -/* B3DDE0 800C6C40 24A50007 */ addiu $a1, $a1, 7 -/* B3DDE4 800C6C44 2401FFF8 */ li $at, -8 -/* B3DDE8 800C6C48 00A12824 */ and $a1, $a1, $at -/* B3DDEC 800C6C4C 24430008 */ addiu $v1, $v0, 8 -/* B3DDF0 800C6C50 00653021 */ addu $a2, $v1, $a1 -/* B3DDF4 800C6C54 3C0EDE01 */ lui $t6, 0xde01 -/* B3DDF8 800C6C58 AC4E0000 */ sw $t6, ($v0) -/* B3DDFC 800C6C5C AC460004 */ sw $a2, 4($v0) -/* B3DE00 800C6C60 AC860000 */ sw $a2, ($a0) -/* B3DE04 800C6C64 03E00008 */ jr $ra -/* B3DE08 800C6C68 00601025 */ move $v0, $v1 diff --git a/asm/non_matchings/boot/yaz0/Yaz0_DecompressImpl.s b/asm/non_matchings/boot/yaz0/Yaz0_DecompressImpl.s deleted file mode 100644 index 4219a519cc..0000000000 --- a/asm/non_matchings/boot/yaz0/Yaz0_DecompressImpl.s +++ /dev/null @@ -1,99 +0,0 @@ -glabel Yaz0_DecompressImpl -/* 0028B0 80001CB0 27BDFFC0 */ addiu $sp, $sp, -0x40 -/* 0028B4 80001CB4 AFBF002C */ sw $ra, 0x2c($sp) -/* 0028B8 80001CB8 AFB40028 */ sw $s4, 0x28($sp) -/* 0028BC 80001CBC AFB30024 */ sw $s3, 0x24($sp) -/* 0028C0 80001CC0 AFB20020 */ sw $s2, 0x20($sp) -/* 0028C4 80001CC4 AFB1001C */ sw $s1, 0x1c($sp) -/* 0028C8 80001CC8 AFB00018 */ sw $s0, 0x18($sp) -/* 0028CC 80001CCC 8C8E0004 */ lw $t6, 4($a0) -/* 0028D0 80001CD0 3C128001 */ lui $s2, %hi(sYaz0MaxPtr) # $s2, 0x8001 -/* 0028D4 80001CD4 3C138001 */ lui $s3, %hi(sYaz0CurSize) # $s3, 0x8001 -/* 0028D8 80001CD8 00A08025 */ move $s0, $a1 -/* 0028DC 80001CDC 00003025 */ move $a2, $zero -/* 0028E0 80001CE0 24910010 */ addiu $s1, $a0, 0x10 -/* 0028E4 80001CE4 267344E8 */ addiu $s3, %lo(sYaz0CurSize) # addiu $s3, $s3, 0x44e8 -/* 0028E8 80001CE8 265244EC */ addiu $s2, %lo(sYaz0MaxPtr) # addiu $s2, $s2, 0x44ec -/* 0028EC 80001CEC 8FA70030 */ lw $a3, 0x30($sp) -/* 0028F0 80001CF0 01C5A021 */ addu $s4, $t6, $a1 -.L80001CF4: -/* 0028F4 80001CF4 54C0000F */ bnezl $a2, .L80001D34 -/* 0028F8 80001CF8 30F90080 */ andi $t9, $a3, 0x80 -/* 0028FC 80001CFC 8E4F0000 */ lw $t7, ($s2) -/* 002900 80001D00 01F1082B */ sltu $at, $t7, $s1 -/* 002904 80001D04 50200008 */ beql $at, $zero, .L80001D28 -/* 002908 80001D08 92270000 */ lbu $a3, ($s1) -/* 00290C 80001D0C 8E780000 */ lw $t8, ($s3) -/* 002910 80001D10 53000005 */ beql $t8, $zero, .L80001D28 -/* 002914 80001D14 92270000 */ lbu $a3, ($s1) -/* 002918 80001D18 0C0006F2 */ jal Yaz0_NextDMA -/* 00291C 80001D1C 02202025 */ move $a0, $s1 -/* 002920 80001D20 00408825 */ move $s1, $v0 -/* 002924 80001D24 92270000 */ lbu $a3, ($s1) -.L80001D28: -/* 002928 80001D28 26310001 */ addiu $s1, $s1, 1 -/* 00292C 80001D2C 24060008 */ li $a2, 8 -/* 002930 80001D30 30F90080 */ andi $t9, $a3, 0x80 -.L80001D34: -/* 002934 80001D34 13200006 */ beqz $t9, .L80001D50 -/* 002938 80001D38 00073840 */ sll $a3, $a3, 1 -/* 00293C 80001D3C 92280000 */ lbu $t0, ($s1) -/* 002940 80001D40 26100001 */ addiu $s0, $s0, 1 -/* 002944 80001D44 26310001 */ addiu $s1, $s1, 1 -/* 002948 80001D48 10000027 */ b .L80001DE8 -/* 00294C 80001D4C A208FFFF */ sb $t0, -1($s0) -.L80001D50: -/* 002950 80001D50 92230000 */ lbu $v1, ($s1) -/* 002954 80001D54 92290001 */ lbu $t1, 1($s1) -/* 002958 80001D58 26310002 */ addiu $s1, $s1, 2 -/* 00295C 80001D5C 306A000F */ andi $t2, $v1, 0xf -/* 002960 80001D60 000A5A00 */ sll $t3, $t2, 8 -/* 002964 80001D64 00032903 */ sra $a1, $v1, 4 -/* 002968 80001D68 012B2025 */ or $a0, $t1, $t3 -/* 00296C 80001D6C 14A00005 */ bnez $a1, .L80001D84 -/* 002970 80001D70 02041023 */ subu $v0, $s0, $a0 -/* 002974 80001D74 92230000 */ lbu $v1, ($s1) -/* 002978 80001D78 26310001 */ addiu $s1, $s1, 1 -/* 00297C 80001D7C 10000002 */ b .L80001D88 -/* 002980 80001D80 24630012 */ addiu $v1, $v1, 0x12 -.L80001D84: -/* 002984 80001D84 24A30002 */ addiu $v1, $a1, 2 -.L80001D88: -/* 002988 80001D88 30650003 */ andi $a1, $v1, 3 -/* 00298C 80001D8C 00052823 */ negu $a1, $a1 -/* 002990 80001D90 10A00009 */ beqz $a1, .L80001DB8 -/* 002994 80001D94 00A32021 */ addu $a0, $a1, $v1 -.L80001D98: -/* 002998 80001D98 904CFFFF */ lbu $t4, -1($v0) -/* 00299C 80001D9C 2463FFFF */ addiu $v1, $v1, -1 -/* 0029A0 80001DA0 26100001 */ addiu $s0, $s0, 1 -/* 0029A4 80001DA4 24420001 */ addiu $v0, $v0, 1 -/* 0029A8 80001DA8 1483FFFB */ bne $a0, $v1, .L80001D98 -/* 0029AC 80001DAC A20CFFFF */ sb $t4, -1($s0) -/* 0029B0 80001DB0 1060000D */ beqz $v1, .L80001DE8 -/* 0029B4 80001DB4 00000000 */ nop -.L80001DB8: -/* 0029B8 80001DB8 904DFFFF */ lbu $t5, -1($v0) -/* 0029BC 80001DBC 2463FFFC */ addiu $v1, $v1, -4 -/* 0029C0 80001DC0 26100004 */ addiu $s0, $s0, 4 -/* 0029C4 80001DC4 A20DFFFC */ sb $t5, -4($s0) -/* 0029C8 80001DC8 904E0000 */ lbu $t6, ($v0) -/* 0029CC 80001DCC 24420004 */ addiu $v0, $v0, 4 -/* 0029D0 80001DD0 A20EFFFD */ sb $t6, -3($s0) -/* 0029D4 80001DD4 904FFFFD */ lbu $t7, -3($v0) -/* 0029D8 80001DD8 A20FFFFE */ sb $t7, -2($s0) -/* 0029DC 80001DDC 9058FFFE */ lbu $t8, -2($v0) -/* 0029E0 80001DE0 1460FFF5 */ bnez $v1, .L80001DB8 -/* 0029E4 80001DE4 A218FFFF */ sb $t8, -1($s0) -.L80001DE8: -/* 0029E8 80001DE8 1614FFC2 */ bne $s0, $s4, .L80001CF4 -/* 0029EC 80001DEC 24C6FFFF */ addiu $a2, $a2, -1 -/* 0029F0 80001DF0 8FBF002C */ lw $ra, 0x2c($sp) -/* 0029F4 80001DF4 AFA70030 */ sw $a3, 0x30($sp) -/* 0029F8 80001DF8 8FB00018 */ lw $s0, 0x18($sp) -/* 0029FC 80001DFC 8FB1001C */ lw $s1, 0x1c($sp) -/* 002A00 80001E00 8FB20020 */ lw $s2, 0x20($sp) -/* 002A04 80001E04 8FB30024 */ lw $s3, 0x24($sp) -/* 002A08 80001E08 8FB40028 */ lw $s4, 0x28($sp) -/* 002A0C 80001E0C 03E00008 */ jr $ra -/* 002A10 80001E10 27BD0040 */ addiu $sp, $sp, 0x40 \ No newline at end of file diff --git a/asm/non_matchings/code/__osMalloc/ArenaImpl_FaultClient.s b/asm/non_matchings/code/__osMalloc/ArenaImpl_FaultClient.s deleted file mode 100644 index f84268fe96..0000000000 --- a/asm/non_matchings/code/__osMalloc/ArenaImpl_FaultClient.s +++ /dev/null @@ -1,175 +0,0 @@ -.rdata -glabel D_8014B0A0 - .asciz "ARENA INFO (0x%08x)\n" - .balign 4 - -glabel D_8014B0B8 - .asciz "Arena is uninitalized\n" - .balign 4 - -glabel D_8014B0D0 - .asciz "Memory Block Region status size\n" - .balign 4 - -glabel D_8014B0F4 - .asciz "%08x-%08x%c %s %08x" - .balign 4 - -glabel D_8014B108 - .asciz "F" - .balign 4 - -glabel D_8014B10C - .asciz "A" - .balign 4 - -glabel D_8014B110 - .asciz "\n" - .balign 4 - -glabel D_8014B114 - .asciz "%08x Block Invalid\n" - .balign 4 - -glabel D_8014B128 - .asciz "Total Alloc Block Size %08x\n" - .balign 4 - -glabel D_8014B148 - .asciz "Total Free Block Size %08x\n" - .balign 4 - -glabel D_8014B168 - .asciz "Largest Free Block Size %08x\n" - .balign 4 - -.text -glabel ArenaImpl_FaultClient -/* B7624C 800FF0AC 27BDFFC0 */ addiu $sp, $sp, -0x40 -/* B76250 800FF0B0 AFB10020 */ sw $s1, 0x20($sp) -/* B76254 800FF0B4 00808825 */ move $s1, $a0 -/* B76258 800FF0B8 AFBF003C */ sw $ra, 0x3c($sp) -/* B7625C 800FF0BC 3C048015 */ lui $a0, %hi(D_8014B0A0) # $a0, 0x8015 -/* B76260 800FF0C0 AFB70038 */ sw $s7, 0x38($sp) -/* B76264 800FF0C4 AFB60034 */ sw $s6, 0x34($sp) -/* B76268 800FF0C8 AFB50030 */ sw $s5, 0x30($sp) -/* B7626C 800FF0CC AFB4002C */ sw $s4, 0x2c($sp) -/* B76270 800FF0D0 AFB30028 */ sw $s3, 0x28($sp) -/* B76274 800FF0D4 AFB20024 */ sw $s2, 0x24($sp) -/* B76278 800FF0D8 AFB0001C */ sw $s0, 0x1c($sp) -/* B7627C 800FF0DC 2484B0A0 */ addiu $a0, %lo(D_8014B0A0) # addiu $a0, $a0, -0x4f60 -/* B76280 800FF0E0 0C035C12 */ jal FaultDrawer_Printf -/* B76284 800FF0E4 02202825 */ move $a1, $s1 -/* B76288 800FF0E8 0C03F7D3 */ jal __osMallocIsInitalized -/* B7628C 800FF0EC 02202025 */ move $a0, $s1 -/* B76290 800FF0F0 14400007 */ bnez $v0, .L800FF110 -/* B76294 800FF0F4 00009825 */ move $s3, $zero -/* B76298 800FF0F8 3C048015 */ lui $a0, %hi(D_8014B0B8) # $a0, 0x8015 -/* B7629C 800FF0FC 2484B0B8 */ addiu $a0, %lo(D_8014B0B8) # addiu $a0, $a0, -0x4f48 -/* B762A0 800FF100 0C035C12 */ jal FaultDrawer_Printf -/* B762A4 800FF104 02202825 */ move $a1, $s1 -/* B762A8 800FF108 10000053 */ b .L800FF258 -/* B762AC 800FF10C 8FBF003C */ lw $ra, 0x3c($sp) -.L800FF110: -/* B762B0 800FF110 3C048015 */ lui $a0, %hi(D_8014B0D0) # $a0, 0x8015 -/* B762B4 800FF114 0000A025 */ move $s4, $zero -/* B762B8 800FF118 00009025 */ move $s2, $zero -/* B762BC 800FF11C 0C035C12 */ jal FaultDrawer_Printf -/* B762C0 800FF120 2484B0D0 */ addiu $a0, %lo(D_8014B0D0) # addiu $a0, $a0, -0x4f30 -/* B762C4 800FF124 8E300000 */ lw $s0, ($s1) -/* B762C8 800FF128 3C178015 */ lui $s7, %hi(D_8014B10C) # $s7, 0x8015 -/* B762CC 800FF12C 26F7B10C */ addiu $s7, %lo(D_8014B10C) # addiu $s7, $s7, -0x4ef4 -/* B762D0 800FF130 1200003A */ beqz $s0, .L800FF21C -/* B762D4 800FF134 3C168015 */ lui $s6, %hi(D_8014B108) # $s6, 0x8015 -/* B762D8 800FF138 26D6B108 */ addiu $s6, %lo(D_8014B108) # addiu $s6, $s6, -0x4ef8 -/* B762DC 800FF13C 24157373 */ li $s5, 29555 -.L800FF140: -/* B762E0 800FF140 1200002E */ beqz $s0, .L800FF1FC -/* B762E4 800FF144 3404F801 */ li $a0, 63489 -/* B762E8 800FF148 860E0000 */ lh $t6, ($s0) -/* B762EC 800FF14C 02002825 */ move $a1, $s0 -/* B762F0 800FF150 16AE002A */ bne $s5, $t6, .L800FF1FC -/* B762F4 800FF154 00000000 */ nop -/* B762F8 800FF158 8E110008 */ lw $s1, 8($s0) -/* B762FC 800FF15C 3C048015 */ lui $a0, %hi(D_8014B0F4) # $a0, 0x8015 -/* B76300 800FF160 02E01825 */ move $v1, $s7 -/* B76304 800FF164 56200004 */ bnezl $s1, .L800FF178 -/* B76308 800FF168 8E2F000C */ lw $t7, 0xc($s1) -/* B7630C 800FF16C 10000008 */ b .L800FF190 -/* B76310 800FF170 24070024 */ li $a3, 36 -/* B76314 800FF174 8E2F000C */ lw $t7, 0xc($s1) -.L800FF178: -/* B76318 800FF178 24020020 */ li $v0, 32 -/* B7631C 800FF17C 120F0003 */ beq $s0, $t7, .L800FF18C -/* B76320 800FF180 00000000 */ nop -/* B76324 800FF184 10000001 */ b .L800FF18C -/* B76328 800FF188 24020021 */ li $v0, 33 -.L800FF18C: -/* B7632C 800FF18C 00403825 */ move $a3, $v0 -.L800FF190: -/* B76330 800FF190 86180002 */ lh $t8, 2($s0) -/* B76334 800FF194 13000003 */ beqz $t8, .L800FF1A4 -/* B76338 800FF198 00000000 */ nop -/* B7633C 800FF19C 10000001 */ b .L800FF1A4 -/* B76340 800FF1A0 02C01825 */ move $v1, $s6 -.L800FF1A4: -/* B76344 800FF1A4 8E020004 */ lw $v0, 4($s0) -/* B76348 800FF1A8 AFA30010 */ sw $v1, 0x10($sp) -/* B7634C 800FF1AC 2484B0F4 */ addiu $a0, %lo(D_8014B0F4) # addiu $a0, $a0, -0x4f0c -/* B76350 800FF1B0 02023021 */ addu $a2, $s0, $v0 -/* B76354 800FF1B4 24C60030 */ addiu $a2, $a2, 0x30 -/* B76358 800FF1B8 0C035C12 */ jal FaultDrawer_Printf -/* B7635C 800FF1BC AFA20014 */ sw $v0, 0x14($sp) -/* B76360 800FF1C0 3C048015 */ lui $a0, %hi(D_8014B110) # $a0, 0x8015 -/* B76364 800FF1C4 0C035C12 */ jal FaultDrawer_Printf -/* B76368 800FF1C8 2484B110 */ addiu $a0, %lo(D_8014B110) # addiu $a0, $a0, -0x4ef0 -/* B7636C 800FF1CC 86190002 */ lh $t9, 2($s0) -/* B76370 800FF1D0 53200008 */ beql $t9, $zero, .L800FF1F4 -/* B76374 800FF1D4 8E080004 */ lw $t0, 4($s0) -/* B76378 800FF1D8 8E020004 */ lw $v0, 4($s0) -/* B7637C 800FF1DC 0262082B */ sltu $at, $s3, $v0 -/* B76380 800FF1E0 1020000C */ beqz $at, .L800FF214 -/* B76384 800FF1E4 0282A021 */ addu $s4, $s4, $v0 -/* B76388 800FF1E8 1000000A */ b .L800FF214 -/* B7638C 800FF1EC 00409825 */ move $s3, $v0 -/* B76390 800FF1F0 8E080004 */ lw $t0, 4($s0) -.L800FF1F4: -/* B76394 800FF1F4 10000007 */ b .L800FF214 -/* B76398 800FF1F8 02489021 */ addu $s2, $s2, $t0 -.L800FF1FC: -/* B7639C 800FF1FC 0C035AFB */ jal FaultDrawer_SetFontColor -/* B763A0 800FF200 00008825 */ move $s1, $zero -/* B763A4 800FF204 3C048015 */ lui $a0, %hi(D_8014B114) # $a0, 0x8015 -/* B763A8 800FF208 2484B114 */ addiu $a0, %lo(D_8014B114) # addiu $a0, $a0, -0x4eec -/* B763AC 800FF20C 0C035C12 */ jal FaultDrawer_Printf -/* B763B0 800FF210 02002825 */ move $a1, $s0 -.L800FF214: -/* B763B4 800FF214 1620FFCA */ bnez $s1, .L800FF140 -/* B763B8 800FF218 02208025 */ move $s0, $s1 -.L800FF21C: -/* B763BC 800FF21C 0C035AFB */ jal FaultDrawer_SetFontColor -/* B763C0 800FF220 240407F1 */ li $a0, 2033 -/* B763C4 800FF224 3C048015 */ lui $a0, %hi(D_8014B128) # $a0, 0x8015 -/* B763C8 800FF228 2484B128 */ addiu $a0, %lo(D_8014B128) # addiu $a0, $a0, -0x4ed8 -/* B763CC 800FF22C 0C035C12 */ jal FaultDrawer_Printf -/* B763D0 800FF230 02402825 */ move $a1, $s2 -/* B763D4 800FF234 3C048015 */ lui $a0, %hi(D_8014B148) # $a0, 0x8015 -/* B763D8 800FF238 2484B148 */ addiu $a0, %lo(D_8014B148) # addiu $a0, $a0, -0x4eb8 -/* B763DC 800FF23C 0C035C12 */ jal FaultDrawer_Printf -/* B763E0 800FF240 02802825 */ move $a1, $s4 -/* B763E4 800FF244 3C048015 */ lui $a0, %hi(D_8014B168) # $a0, 0x8015 -/* B763E8 800FF248 2484B168 */ addiu $a0, %lo(D_8014B168) # addiu $a0, $a0, -0x4e98 -/* B763EC 800FF24C 0C035C12 */ jal FaultDrawer_Printf -/* B763F0 800FF250 02602825 */ move $a1, $s3 -/* B763F4 800FF254 8FBF003C */ lw $ra, 0x3c($sp) -.L800FF258: -/* B763F8 800FF258 8FB0001C */ lw $s0, 0x1c($sp) -/* B763FC 800FF25C 8FB10020 */ lw $s1, 0x20($sp) -/* B76400 800FF260 8FB20024 */ lw $s2, 0x24($sp) -/* B76404 800FF264 8FB30028 */ lw $s3, 0x28($sp) -/* B76408 800FF268 8FB4002C */ lw $s4, 0x2c($sp) -/* B7640C 800FF26C 8FB50030 */ lw $s5, 0x30($sp) -/* B76410 800FF270 8FB60034 */ lw $s6, 0x34($sp) -/* B76414 800FF274 8FB70038 */ lw $s7, 0x38($sp) -/* B76418 800FF278 03E00008 */ jr $ra -/* B7641C 800FF27C 27BD0040 */ addiu $sp, $sp, 0x40 \ No newline at end of file diff --git a/asm/non_matchings/code/__osMalloc/__osDisplayArena.s b/asm/non_matchings/code/__osMalloc/__osDisplayArena.s deleted file mode 100644 index 6ca7ee11df..0000000000 --- a/asm/non_matchings/code/__osMalloc/__osDisplayArena.s +++ /dev/null @@ -1,208 +0,0 @@ -.rdata -glabel D_8014AF48 - .asciz "アリーナは初期化されていません\n" #Arena is not initalized - .balign 4 - -glabel D_8014AF68 - .asciz "アリーナの内容 (0x%08x)\n" #Arena contents - .balign 4 - -glabel D_8014AF84 - .asciz "メモリブロック範囲 status サイズ [時刻 s ms us ns: TID:src:行]\n" #Memory block range status size [time s ms us ns: TID: src: line] - .balign 4 - -glabel D_8014AFC8 - .asciz "%08x-%08x%c %s %08x" - .balign 4 - -glabel D_8014AFDC - .asciz "空き" #Free - .balign 4 - -glabel D_8014AFE4 - .asciz "確保" #Secure - .balign 4 - -glabel D_8014AFEC - .asciz " [%016llu:%2d:%s:%d]" - .balign 4 - -glabel D_8014B004 - .asciz "**NULL**" - .balign 4 - -glabel D_8014B010 - .asciz "\n" - .balign 4 - -glabel D_8014B014 - .asciz "%08x Block Invalid\n" - .balign 4 - -glabel D_8014B028 - .asciz "確保ブロックサイズの合計 0x%08x バイト\n" #Total reserved block size 0x% 08x bytes - .balign 4 - -glabel D_8014B050 - .asciz "空きブロックサイズの合計 0x%08x バイト\n" #Total free block size 0x% 08x bytes - .balign 4 - -glabel D_8014B078 - .asciz "最大空きブロックサイズ 0x%08x バイト\n" #Maximum free block size 0x% 08x bytes - .balign 4 - -.text -glabel __osDisplayArena -/* B76020 800FEE80 27BDFF98 */ addiu $sp, $sp, -0x68 -/* B76024 800FEE84 AFBF003C */ sw $ra, 0x3c($sp) -/* B76028 800FEE88 AFB40038 */ sw $s4, 0x38($sp) -/* B7602C 800FEE8C AFB30034 */ sw $s3, 0x34($sp) -/* B76030 800FEE90 AFB20030 */ sw $s2, 0x30($sp) -/* B76034 800FEE94 AFB1002C */ sw $s1, 0x2c($sp) -/* B76038 800FEE98 AFB00028 */ sw $s0, 0x28($sp) -/* B7603C 800FEE9C 0C03F7D3 */ jal __osMallocIsInitalized -/* B76040 800FEEA0 AFA40068 */ sw $a0, 0x68($sp) -/* B76044 800FEEA4 14400005 */ bnez $v0, .L800FEEBC -/* B76048 800FEEA8 3C048015 */ lui $a0, %hi(D_8014AF48) # $a0, 0x8015 -/* B7604C 800FEEAC 0C00084C */ jal osSyncPrintf -/* B76050 800FEEB0 2484AF48 */ addiu $a0, %lo(D_8014AF48) # addiu $a0, $a0, -0x50b8 -/* B76054 800FEEB4 10000076 */ b .L800FF090 -/* B76058 800FEEB8 8FBF003C */ lw $ra, 0x3c($sp) -.L800FEEBC: -/* B7605C 800FEEBC 0C03F70F */ jal ArenaImpl_Lock -/* B76060 800FEEC0 8FA40068 */ lw $a0, 0x68($sp) -/* B76064 800FEEC4 3C048015 */ lui $a0, %hi(D_8014AF68) # $a0, 0x8015 -/* B76068 800FEEC8 0000A025 */ move $s4, $zero -/* B7606C 800FEECC 00009025 */ move $s2, $zero -/* B76070 800FEED0 00009825 */ move $s3, $zero -/* B76074 800FEED4 2484AF68 */ addiu $a0, %lo(D_8014AF68) # addiu $a0, $a0, -0x5098 -/* B76078 800FEED8 0C00084C */ jal osSyncPrintf -/* B7607C 800FEEDC 8FA50068 */ lw $a1, 0x68($sp) -/* B76080 800FEEE0 3C048015 */ lui $a0, %hi(D_8014AF84) # $a0, 0x8015 -/* B76084 800FEEE4 0C00084C */ jal osSyncPrintf -/* B76088 800FEEE8 2484AF84 */ addiu $a0, %lo(D_8014AF84) # addiu $a0, $a0, -0x507c -/* B7608C 800FEEEC 8FAE0068 */ lw $t6, 0x68($sp) -/* B76090 800FEEF0 8DD00000 */ lw $s0, ($t6) -/* B76094 800FEEF4 12000057 */ beqz $s0, .L800FF054 -/* B76098 800FEEF8 00000000 */ nop -.L800FEEFC: -/* B7609C 800FEEFC 1200004F */ beqz $s0, .L800FF03C -/* B760A0 800FEF00 3C048015 */ lui $a0, %hi(D_8014B014) -/* B760A4 800FEF04 860F0000 */ lh $t7, ($s0) -/* B760A8 800FEF08 24017373 */ li $at, 29555 -/* B760AC 800FEF0C 02002825 */ move $a1, $s0 -/* B760B0 800FEF10 15E1004A */ bne $t7, $at, .L800FF03C -/* B760B4 800FEF14 00000000 */ nop -/* B760B8 800FEF18 8E110008 */ lw $s1, 8($s0) -/* B760BC 800FEF1C 3C038015 */ lui $v1, %hi(D_8014AFE4) # $v1, 0x8015 -/* B760C0 800FEF20 2463AFE4 */ addiu $v1, %lo(D_8014AFE4) # addiu $v1, $v1, -0x501c -/* B760C4 800FEF24 16200003 */ bnez $s1, .L800FEF34 -/* B760C8 800FEF28 3C048015 */ lui $a0, %hi(D_8014AFC8) # $a0, 0x8015 -/* B760CC 800FEF2C 10000008 */ b .L800FEF50 -/* B760D0 800FEF30 24070024 */ li $a3, 36 -.L800FEF34: -/* B760D4 800FEF34 8E38000C */ lw $t8, 0xc($s1) -/* B760D8 800FEF38 24020020 */ li $v0, 32 -/* B760DC 800FEF3C 12180003 */ beq $s0, $t8, .L800FEF4C -/* B760E0 800FEF40 00000000 */ nop -/* B760E4 800FEF44 10000001 */ b .L800FEF4C -/* B760E8 800FEF48 24020021 */ li $v0, 33 -.L800FEF4C: -/* B760EC 800FEF4C 00403825 */ move $a3, $v0 -.L800FEF50: -/* B760F0 800FEF50 86190002 */ lh $t9, 2($s0) -/* B760F4 800FEF54 13200004 */ beqz $t9, .L800FEF68 -/* B760F8 800FEF58 00000000 */ nop -/* B760FC 800FEF5C 3C038015 */ lui $v1, %hi(D_8014AFDC) # $v1, 0x8015 -/* B76100 800FEF60 10000001 */ b .L800FEF68 -/* B76104 800FEF64 2463AFDC */ addiu $v1, %lo(D_8014AFDC) # addiu $v1, $v1, -0x5024 -.L800FEF68: -/* B76108 800FEF68 8E020004 */ lw $v0, 4($s0) -/* B7610C 800FEF6C AFA30010 */ sw $v1, 0x10($sp) -/* B76110 800FEF70 2484AFC8 */ addiu $a0, %lo(D_8014AFC8) # addiu $a0, $a0, -0x5038 -/* B76114 800FEF74 02023021 */ addu $a2, $s0, $v0 -/* B76118 800FEF78 24C60030 */ addiu $a2, $a2, 0x30 -/* B7611C 800FEF7C 0C00084C */ jal osSyncPrintf -/* B76120 800FEF80 AFA20014 */ sw $v0, 0x14($sp) -/* B76124 800FEF84 86080002 */ lh $t0, 2($s0) -/* B76128 800FEF88 24060000 */ li $a2, 0 -/* B7612C 800FEF8C 24070040 */ li $a3, 64 -/* B76130 800FEF90 1500001B */ bnez $t0, .L800FF000 -/* B76134 800FEF94 00000000 */ nop -/* B76138 800FEF98 8E040020 */ lw $a0, 0x20($s0) -/* B7613C 800FEF9C 0C000E1E */ jal __ll_mul -/* B76140 800FEFA0 8E050024 */ lw $a1, 0x24($s0) -/* B76144 800FEFA4 00402025 */ move $a0, $v0 -/* B76148 800FEFA8 00602825 */ move $a1, $v1 -/* B7614C 800FEFAC 24060000 */ li $a2, 0 -/* B76150 800FEFB0 0C000DDE */ jal __ull_div -/* B76154 800FEFB4 24070003 */ li $a3, 3 -/* B76158 800FEFB8 AFA20040 */ sw $v0, 0x40($sp) -/* B7615C 800FEFBC AFA30044 */ sw $v1, 0x44($sp) -/* B76160 800FEFC0 8E040010 */ lw $a0, 0x10($s0) -/* B76164 800FEFC4 8FA70044 */ lw $a3, 0x44($sp) -/* B76168 800FEFC8 3C038015 */ lui $v1, %hi(D_8014B004) # $v1, 0x8015 -/* B7616C 800FEFCC 10800003 */ beqz $a0, .L800FEFDC -/* B76170 800FEFD0 8FA60040 */ lw $a2, 0x40($sp) -/* B76174 800FEFD4 10000002 */ b .L800FEFE0 -/* B76178 800FEFD8 00801825 */ move $v1, $a0 -.L800FEFDC: -/* B7617C 800FEFDC 2463B004 */ addiu $v1, %lo(D_8014B004) # addiu $v1, $v1, -0x4ffc -.L800FEFE0: -/* B76180 800FEFE0 8E090018 */ lw $t1, 0x18($s0) -/* B76184 800FEFE4 AFA30014 */ sw $v1, 0x14($sp) -/* B76188 800FEFE8 3C048015 */ lui $a0, %hi(D_8014AFEC) # $a0, 0x8015 -/* B7618C 800FEFEC AFA90010 */ sw $t1, 0x10($sp) -/* B76190 800FEFF0 8E0A0014 */ lw $t2, 0x14($s0) -/* B76194 800FEFF4 2484AFEC */ addiu $a0, %lo(D_8014AFEC) # addiu $a0, $a0, -0x5014 -/* B76198 800FEFF8 0C00084C */ jal osSyncPrintf -/* B7619C 800FEFFC AFAA0018 */ sw $t2, 0x18($sp) -.L800FF000: -/* B761A0 800FF000 3C048015 */ lui $a0, %hi(D_8014B010) # $a0, 0x8015 -/* B761A4 800FF004 0C00084C */ jal osSyncPrintf -/* B761A8 800FF008 2484B010 */ addiu $a0, %lo(D_8014B010) # addiu $a0, $a0, -0x4ff0 -/* B761AC 800FF00C 860B0002 */ lh $t3, 2($s0) -/* B761B0 800FF010 51600008 */ beql $t3, $zero, .L800FF034 -/* B761B4 800FF014 8E0C0004 */ lw $t4, 4($s0) -/* B761B8 800FF018 8E020004 */ lw $v0, 4($s0) -/* B761BC 800FF01C 0282082B */ sltu $at, $s4, $v0 -/* B761C0 800FF020 1020000A */ beqz $at, .L800FF04C -/* B761C4 800FF024 02429021 */ addu $s2, $s2, $v0 -/* B761C8 800FF028 10000008 */ b .L800FF04C -/* B761CC 800FF02C 0040A025 */ move $s4, $v0 -/* B761D0 800FF030 8E0C0004 */ lw $t4, 4($s0) -.L800FF034: -/* B761D4 800FF034 10000005 */ b .L800FF04C -/* B761D8 800FF038 026C9821 */ addu $s3, $s3, $t4 -.L800FF03C: -/* B761DC 800FF03C 2484B014 */ addiu $a0, %lo(D_8014B014) -/* B761E0 800FF040 02002825 */ move $a1, $s0 -/* B761E4 800FF044 0C00084C */ jal osSyncPrintf -/* B761E8 800FF048 00008825 */ move $s1, $zero -.L800FF04C: -/* B761EC 800FF04C 1620FFAB */ bnez $s1, .L800FEEFC -/* B761F0 800FF050 02208025 */ move $s0, $s1 -.L800FF054: -/* B761F4 800FF054 3C048015 */ lui $a0, %hi(D_8014B028) # $a0, 0x8015 -/* B761F8 800FF058 2484B028 */ addiu $a0, %lo(D_8014B028) # addiu $a0, $a0, -0x4fd8 -/* B761FC 800FF05C 0C00084C */ jal osSyncPrintf -/* B76200 800FF060 02602825 */ move $a1, $s3 -/* B76204 800FF064 3C048015 */ lui $a0, %hi(D_8014B050) # $a0, 0x8015 -/* B76208 800FF068 2484B050 */ addiu $a0, %lo(D_8014B050) # addiu $a0, $a0, -0x4fb0 -/* B7620C 800FF06C 0C00084C */ jal osSyncPrintf -/* B76210 800FF070 02402825 */ move $a1, $s2 -/* B76214 800FF074 3C048015 */ lui $a0, %hi(D_8014B078) # $a0, 0x8015 -/* B76218 800FF078 2484B078 */ addiu $a0, %lo(D_8014B078) # addiu $a0, $a0, -0x4f88 -/* B7621C 800FF07C 0C00084C */ jal osSyncPrintf -/* B76220 800FF080 02802825 */ move $a1, $s4 -/* B76224 800FF084 0C03F719 */ jal ArenaImpl_Unlock -/* B76228 800FF088 8FA40068 */ lw $a0, 0x68($sp) -/* B7622C 800FF08C 8FBF003C */ lw $ra, 0x3c($sp) -.L800FF090: -/* B76230 800FF090 8FB00028 */ lw $s0, 0x28($sp) -/* B76234 800FF094 8FB1002C */ lw $s1, 0x2c($sp) -/* B76238 800FF098 8FB20030 */ lw $s2, 0x30($sp) -/* B7623C 800FF09C 8FB30034 */ lw $s3, 0x34($sp) -/* B76240 800FF0A0 8FB40038 */ lw $s4, 0x38($sp) -/* B76244 800FF0A4 03E00008 */ jr $ra -/* B76248 800FF0A8 27BD0068 */ addiu $sp, $sp, 0x68 \ No newline at end of file diff --git a/asm/non_matchings/code/__osMalloc/__osFree_NoLock.s b/asm/non_matchings/code/__osMalloc/__osFree_NoLock.s deleted file mode 100644 index df7dbaa5f8..0000000000 --- a/asm/non_matchings/code/__osMalloc/__osFree_NoLock.s +++ /dev/null @@ -1,155 +0,0 @@ -.rdata -glabel D_8014ACBC - .asciz "\x1b[41;37m__osFree:不正解放(%08x)\n\x1b[m" #Unauthorized release - .balign 4 - -glabel D_8014ACE0 - .asciz "\x1b[41;37m__osFree:二重解放(%08x)\n\x1b[m" #Double release - .balign 4 - -glabel D_8014AD04 - .asciz "\x1b[41;37m__osFree:確保時と違う方法で解放しようとした (%08x:%08x)\n\x1b[m" #Tried to release in a different way than when it was secured - .balign 4 - - -.text -glabel __osFree_NoLock -/* B75784 800FE5E4 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* B75788 800FE5E8 AFBF001C */ sw $ra, 0x1c($sp) -/* B7578C 800FE5EC AFB10018 */ sw $s1, 0x18($sp) -/* B75790 800FE5F0 AFB00014 */ sw $s0, 0x14($sp) -/* B75794 800FE5F4 10A00076 */ beqz $a1, .L800FE7D0 -/* B75798 800FE5F8 00803825 */ move $a3, $a0 -/* B7579C 800FE5FC 24B0FFD0 */ addiu $s0, $a1, -0x30 -/* B757A0 800FE600 12000005 */ beqz $s0, .L800FE618 -/* B757A4 800FE604 3C048015 */ lui $a0, %hi(D_8014ACBC) # $a0, 0x8015 -/* B757A8 800FE608 860E0000 */ lh $t6, ($s0) -/* B757AC 800FE60C 24017373 */ li $at, 29555 -/* B757B0 800FE610 51C10006 */ beql $t6, $at, .L800FE62C -/* B757B4 800FE614 860F0002 */ lh $t7, 2($s0) -.L800FE618: -/* B757B8 800FE618 0C00084C */ jal osSyncPrintf -/* B757BC 800FE61C 2484ACBC */ addiu $a0, %lo(D_8014ACBC) # addiu $a0, $a0, -0x5344 -/* B757C0 800FE620 1000006C */ b .L800FE7D4 -/* B757C4 800FE624 8FBF001C */ lw $ra, 0x1c($sp) -/* B757C8 800FE628 860F0002 */ lh $t7, 2($s0) -.L800FE62C: -/* B757CC 800FE62C 3C048015 */ lui $a0, %hi(D_8014ACE0) # $a0, 0x8015 -/* B757D0 800FE630 51E00006 */ beql $t7, $zero, .L800FE64C -/* B757D4 800FE634 8E06001C */ lw $a2, 0x1c($s0) -/* B757D8 800FE638 0C00084C */ jal osSyncPrintf -/* B757DC 800FE63C 2484ACE0 */ addiu $a0, %lo(D_8014ACE0) # addiu $a0, $a0, -0x5320 -/* B757E0 800FE640 10000064 */ b .L800FE7D4 -/* B757E4 800FE644 8FBF001C */ lw $ra, 0x1c($sp) -/* B757E8 800FE648 8E06001C */ lw $a2, 0x1c($s0) -.L800FE64C: -/* B757EC 800FE64C 02002025 */ move $a0, $s0 -/* B757F0 800FE650 10E60008 */ beq $a3, $a2, .L800FE674 -/* B757F4 800FE654 00000000 */ nop -/* B757F8 800FE658 10E00006 */ beqz $a3, .L800FE674 -/* B757FC 800FE65C 00E02825 */ move $a1, $a3 -/* B75800 800FE660 3C048015 */ lui $a0, %hi(D_8014AD04) # $a0, 0x8015 -/* B75804 800FE664 0C00084C */ jal osSyncPrintf -/* B75808 800FE668 2484AD04 */ addiu $a0, %lo(D_8014AD04) # addiu $a0, $a0, -0x52fc -/* B7580C 800FE66C 10000059 */ b .L800FE7D4 -/* B75810 800FE670 8FBF001C */ lw $ra, 0x1c($sp) -.L800FE674: -/* B75814 800FE674 0C03F723 */ jal ArenaImpl_GetNextBlock -/* B75818 800FE678 AFA70030 */ sw $a3, 0x30($sp) -/* B7581C 800FE67C 00408825 */ move $s1, $v0 -/* B75820 800FE680 0C03F739 */ jal ArenaImpl_GetPrevBlock -/* B75824 800FE684 02002025 */ move $a0, $s0 -/* B75828 800FE688 24180001 */ li $t8, 1 -/* B7582C 800FE68C A6180002 */ sh $t8, 2($s0) -/* B75830 800FE690 AFA20024 */ sw $v0, 0x24($sp) -/* B75834 800FE694 8FA70030 */ lw $a3, 0x30($sp) -/* B75838 800FE698 02002025 */ move $a0, $s0 -/* B7583C 800FE69C 00002825 */ move $a1, $zero -/* B75840 800FE6A0 0C03F6F0 */ jal ArenaImpl_SetDebugInfo -/* B75844 800FE6A4 00003025 */ move $a2, $zero -/* B75848 800FE6A8 8FB90030 */ lw $t9, 0x30($sp) -/* B7584C 800FE6AC 8FA30024 */ lw $v1, 0x24($sp) -/* B75850 800FE6B0 26040030 */ addiu $a0, $s0, 0x30 -/* B75854 800FE6B4 93280022 */ lbu $t0, 0x22($t9) -/* B75858 800FE6B8 240500EF */ li $a1, 239 -/* B7585C 800FE6BC 31090002 */ andi $t1, $t0, 2 -/* B75860 800FE6C0 51200006 */ beql $t1, $zero, .L800FE6DC -/* B75864 800FE6C4 8E0A0004 */ lw $t2, 4($s0) -/* B75868 800FE6C8 8E060004 */ lw $a2, 4($s0) -/* B7586C 800FE6CC 0C041A18 */ jal func_80106860 -/* B75870 800FE6D0 AFA30024 */ sw $v1, 0x24($sp) -/* B75874 800FE6D4 8FA30024 */ lw $v1, 0x24($sp) -/* B75878 800FE6D8 8E0A0004 */ lw $t2, 4($s0) -.L800FE6DC: -/* B7587C 800FE6DC 020A5821 */ addu $t3, $s0, $t2 -/* B75880 800FE6E0 256C0030 */ addiu $t4, $t3, 0x30 -/* B75884 800FE6E4 162C001F */ bne $s1, $t4, .L800FE764 -/* B75888 800FE6E8 00000000 */ nop -/* B7588C 800FE6EC 862D0002 */ lh $t5, 2($s1) -/* B75890 800FE6F0 02202025 */ move $a0, $s1 -/* B75894 800FE6F4 11A0001B */ beqz $t5, .L800FE764 -/* B75898 800FE6F8 00000000 */ nop -/* B7589C 800FE6FC 0C03F723 */ jal ArenaImpl_GetNextBlock -/* B758A0 800FE700 AFA30024 */ sw $v1, 0x24($sp) -/* B758A4 800FE704 8FA30024 */ lw $v1, 0x24($sp) -/* B758A8 800FE708 10400002 */ beqz $v0, .L800FE714 -/* B758AC 800FE70C 00403825 */ move $a3, $v0 -/* B758B0 800FE710 AC50000C */ sw $s0, 0xc($v0) -.L800FE714: -/* B758B4 800FE714 8E0E0004 */ lw $t6, 4($s0) -/* B758B8 800FE718 8E2F0004 */ lw $t7, 4($s1) -/* B758BC 800FE71C 02202025 */ move $a0, $s1 -/* B758C0 800FE720 240500EF */ li $a1, 239 -/* B758C4 800FE724 01CFC021 */ addu $t8, $t6, $t7 -/* B758C8 800FE728 27190030 */ addiu $t9, $t8, 0x30 -/* B758CC 800FE72C AE190004 */ sw $t9, 4($s0) -/* B758D0 800FE730 8FA80030 */ lw $t0, 0x30($sp) -/* B758D4 800FE734 24060030 */ li $a2, 48 -/* B758D8 800FE738 91090022 */ lbu $t1, 0x22($t0) -/* B758DC 800FE73C 312A0002 */ andi $t2, $t1, 2 -/* B758E0 800FE740 51400007 */ beql $t2, $zero, .L800FE760 -/* B758E4 800FE744 AE070008 */ sw $a3, 8($s0) -/* B758E8 800FE748 AFA30024 */ sw $v1, 0x24($sp) -/* B758EC 800FE74C 0C041A18 */ jal func_80106860 -/* B758F0 800FE750 AFA70020 */ sw $a3, 0x20($sp) -/* B758F4 800FE754 8FA30024 */ lw $v1, 0x24($sp) -/* B758F8 800FE758 8FA70020 */ lw $a3, 0x20($sp) -/* B758FC 800FE75C AE070008 */ sw $a3, 8($s0) -.L800FE760: -/* B75900 800FE760 00E08825 */ move $s1, $a3 -.L800FE764: -/* B75904 800FE764 5060001B */ beql $v1, $zero, .L800FE7D4 -/* B75908 800FE768 8FBF001C */ lw $ra, 0x1c($sp) -/* B7590C 800FE76C 846B0002 */ lh $t3, 2($v1) -/* B75910 800FE770 51600018 */ beql $t3, $zero, .L800FE7D4 -/* B75914 800FE774 8FBF001C */ lw $ra, 0x1c($sp) -/* B75918 800FE778 8C620004 */ lw $v0, 4($v1) -/* B7591C 800FE77C 00626021 */ addu $t4, $v1, $v0 -/* B75920 800FE780 258D0030 */ addiu $t5, $t4, 0x30 -/* B75924 800FE784 560D0013 */ bnel $s0, $t5, .L800FE7D4 -/* B75928 800FE788 8FBF001C */ lw $ra, 0x1c($sp) -/* B7592C 800FE78C 12200003 */ beqz $s1, .L800FE79C -/* B75930 800FE790 02002025 */ move $a0, $s0 -/* B75934 800FE794 AE23000C */ sw $v1, 0xc($s1) -/* B75938 800FE798 8C620004 */ lw $v0, 4($v1) -.L800FE79C: -/* B7593C 800FE79C AC710008 */ sw $s1, 8($v1) -/* B75940 800FE7A0 8E0E0004 */ lw $t6, 4($s0) -/* B75944 800FE7A4 240500EF */ li $a1, 239 -/* B75948 800FE7A8 004E7821 */ addu $t7, $v0, $t6 -/* B7594C 800FE7AC 25F80030 */ addiu $t8, $t7, 0x30 -/* B75950 800FE7B0 AC780004 */ sw $t8, 4($v1) -/* B75954 800FE7B4 8FB90030 */ lw $t9, 0x30($sp) -/* B75958 800FE7B8 93280022 */ lbu $t0, 0x22($t9) -/* B7595C 800FE7BC 31090002 */ andi $t1, $t0, 2 -/* B75960 800FE7C0 51200004 */ beql $t1, $zero, .L800FE7D4 -/* B75964 800FE7C4 8FBF001C */ lw $ra, 0x1c($sp) -/* B75968 800FE7C8 0C041A18 */ jal func_80106860 -/* B7596C 800FE7CC 24060030 */ li $a2, 48 -.L800FE7D0: -/* B75970 800FE7D0 8FBF001C */ lw $ra, 0x1c($sp) -.L800FE7D4: -/* B75974 800FE7D4 8FB00014 */ lw $s0, 0x14($sp) -/* B75978 800FE7D8 8FB10018 */ lw $s1, 0x18($sp) -/* B7597C 800FE7DC 03E00008 */ jr $ra -/* B75980 800FE7E0 27BD0030 */ addiu $sp, $sp, 0x30 \ No newline at end of file diff --git a/asm/non_matchings/code/__osMalloc/__osFree_NoLockDebug.s b/asm/non_matchings/code/__osMalloc/__osFree_NoLockDebug.s deleted file mode 100644 index 8e10de1af9..0000000000 --- a/asm/non_matchings/code/__osMalloc/__osFree_NoLockDebug.s +++ /dev/null @@ -1,159 +0,0 @@ -.rdata -glabel D_8014AD48 - .asciz "\x1b[41;37m__osFree:不正解放(%08x) [%s:%d ]\n\x1b[m" #Unauthorized release - .balign 4 - -glabel D_8014AD78 - .asciz "\x1b[41;37m__osFree:二重解放(%08x) [%s:%d ]\n\x1b[m" #Double release - .balign 4 - -glabel D_8014ADA8 - .asciz "\x1b[41;37m__osFree:確保時と違う方法で解放しようとした (%08x:%08x)\n\x1b[m" #Tried to release in a different way than when it was secured - .balign 4 - - -.text -glabel __osFree_NoLockDebug -/* B759BC 800FE81C 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* B759C0 800FE820 AFB10018 */ sw $s1, 0x18($sp) -/* B759C4 800FE824 00808825 */ move $s1, $a0 -/* B759C8 800FE828 AFBF001C */ sw $ra, 0x1c($sp) -/* B759CC 800FE82C AFB00014 */ sw $s0, 0x14($sp) -/* B759D0 800FE830 10A00078 */ beqz $a1, .L800FEA14 -/* B759D4 800FE834 AFA60038 */ sw $a2, 0x38($sp) -/* B759D8 800FE838 24B0FFD0 */ addiu $s0, $a1, -0x30 -/* B759DC 800FE83C 12000004 */ beqz $s0, .L800FE850 -/* B759E0 800FE840 3C048015 */ lui $a0, %hi(D_8014AD48) # $a0, 0x8015 -/* B759E4 800FE844 860E0000 */ lh $t6, ($s0) -/* B759E8 800FE848 24017373 */ li $at, 29555 -/* B759EC 800FE84C 11C10005 */ beq $t6, $at, .L800FE864 -.L800FE850: -/* B759F0 800FE850 2484AD48 */ addiu $a0, %lo(D_8014AD48) # addiu $a0, $a0, -0x52b8 -/* B759F4 800FE854 0C00084C */ jal osSyncPrintf -/* B759F8 800FE858 8FA60038 */ lw $a2, 0x38($sp) -/* B759FC 800FE85C 1000006E */ b .L800FEA18 -/* B75A00 800FE860 8FBF001C */ lw $ra, 0x1c($sp) -.L800FE864: -/* B75A04 800FE864 860F0002 */ lh $t7, 2($s0) -/* B75A08 800FE868 3C048015 */ lui $a0, %hi(D_8014AD78) # $a0, 0x8015 -/* B75A0C 800FE86C 2484AD78 */ addiu $a0, %lo(D_8014AD78) # addiu $a0, $a0, -0x5288 -/* B75A10 800FE870 51E00006 */ beql $t7, $zero, .L800FE88C -/* B75A14 800FE874 8E06001C */ lw $a2, 0x1c($s0) -/* B75A18 800FE878 0C00084C */ jal osSyncPrintf -/* B75A1C 800FE87C 8FA60038 */ lw $a2, 0x38($sp) -/* B75A20 800FE880 10000065 */ b .L800FEA18 -/* B75A24 800FE884 8FBF001C */ lw $ra, 0x1c($sp) -/* B75A28 800FE888 8E06001C */ lw $a2, 0x1c($s0) -.L800FE88C: -/* B75A2C 800FE88C 02002025 */ move $a0, $s0 -/* B75A30 800FE890 52260009 */ beql $s1, $a2, .L800FE8B8 -/* B75A34 800FE894 AFA7003C */ sw $a3, 0x3c($sp) -/* B75A38 800FE898 12200006 */ beqz $s1, .L800FE8B4 -/* B75A3C 800FE89C 02202825 */ move $a1, $s1 -/* B75A40 800FE8A0 3C048015 */ lui $a0, %hi(D_8014ADA8) # $a0, 0x8015 -/* B75A44 800FE8A4 0C00084C */ jal osSyncPrintf -/* B75A48 800FE8A8 2484ADA8 */ addiu $a0, %lo(D_8014ADA8) # addiu $a0, $a0, -0x5258 -/* B75A4C 800FE8AC 1000005A */ b .L800FEA18 -/* B75A50 800FE8B0 8FBF001C */ lw $ra, 0x1c($sp) -.L800FE8B4: -/* B75A54 800FE8B4 AFA7003C */ sw $a3, 0x3c($sp) -.L800FE8B8: -/* B75A58 800FE8B8 0C03F723 */ jal ArenaImpl_GetNextBlock -/* B75A5C 800FE8BC AFB10030 */ sw $s1, 0x30($sp) -/* B75A60 800FE8C0 00408825 */ move $s1, $v0 -/* B75A64 800FE8C4 0C03F739 */ jal ArenaImpl_GetPrevBlock -/* B75A68 800FE8C8 02002025 */ move $a0, $s0 -/* B75A6C 800FE8CC 24180001 */ li $t8, 1 -/* B75A70 800FE8D0 A6180002 */ sh $t8, 2($s0) -/* B75A74 800FE8D4 AFA20024 */ sw $v0, 0x24($sp) -/* B75A78 800FE8D8 8FA70030 */ lw $a3, 0x30($sp) -/* B75A7C 800FE8DC 8FA6003C */ lw $a2, 0x3c($sp) -/* B75A80 800FE8E0 8FA50038 */ lw $a1, 0x38($sp) -/* B75A84 800FE8E4 0C03F6F0 */ jal ArenaImpl_SetDebugInfo -/* B75A88 800FE8E8 02002025 */ move $a0, $s0 -/* B75A8C 800FE8EC 8FB90030 */ lw $t9, 0x30($sp) -/* B75A90 800FE8F0 8FA30024 */ lw $v1, 0x24($sp) -/* B75A94 800FE8F4 26040030 */ addiu $a0, $s0, 0x30 -/* B75A98 800FE8F8 93280022 */ lbu $t0, 0x22($t9) -/* B75A9C 800FE8FC 240500EF */ li $a1, 239 -/* B75AA0 800FE900 31090002 */ andi $t1, $t0, 2 -/* B75AA4 800FE904 51200006 */ beql $t1, $zero, .L800FE920 -/* B75AA8 800FE908 8E0A0004 */ lw $t2, 4($s0) -/* B75AAC 800FE90C 8E060004 */ lw $a2, 4($s0) -/* B75AB0 800FE910 0C041A18 */ jal func_80106860 -/* B75AB4 800FE914 AFA30024 */ sw $v1, 0x24($sp) -/* B75AB8 800FE918 8FA30024 */ lw $v1, 0x24($sp) -/* B75ABC 800FE91C 8E0A0004 */ lw $t2, 4($s0) -.L800FE920: -/* B75AC0 800FE920 020A5821 */ addu $t3, $s0, $t2 -/* B75AC4 800FE924 256C0030 */ addiu $t4, $t3, 0x30 -/* B75AC8 800FE928 162C001F */ bne $s1, $t4, .L800FE9A8 -/* B75ACC 800FE92C 00000000 */ nop -/* B75AD0 800FE930 862D0002 */ lh $t5, 2($s1) -/* B75AD4 800FE934 02202025 */ move $a0, $s1 -/* B75AD8 800FE938 11A0001B */ beqz $t5, .L800FE9A8 -/* B75ADC 800FE93C 00000000 */ nop -/* B75AE0 800FE940 0C03F723 */ jal ArenaImpl_GetNextBlock -/* B75AE4 800FE944 AFA30024 */ sw $v1, 0x24($sp) -/* B75AE8 800FE948 8FA30024 */ lw $v1, 0x24($sp) -/* B75AEC 800FE94C 10400002 */ beqz $v0, .L800FE958 -/* B75AF0 800FE950 00403825 */ move $a3, $v0 -/* B75AF4 800FE954 AC50000C */ sw $s0, 0xc($v0) -.L800FE958: -/* B75AF8 800FE958 8E0E0004 */ lw $t6, 4($s0) -/* B75AFC 800FE95C 8E2F0004 */ lw $t7, 4($s1) -/* B75B00 800FE960 02202025 */ move $a0, $s1 -/* B75B04 800FE964 240500EF */ li $a1, 239 -/* B75B08 800FE968 01CFC021 */ addu $t8, $t6, $t7 -/* B75B0C 800FE96C 27190030 */ addiu $t9, $t8, 0x30 -/* B75B10 800FE970 AE190004 */ sw $t9, 4($s0) -/* B75B14 800FE974 8FA80030 */ lw $t0, 0x30($sp) -/* B75B18 800FE978 24060030 */ li $a2, 48 -/* B75B1C 800FE97C 91090022 */ lbu $t1, 0x22($t0) -/* B75B20 800FE980 312A0002 */ andi $t2, $t1, 2 -/* B75B24 800FE984 51400007 */ beql $t2, $zero, .L800FE9A4 -/* B75B28 800FE988 AE070008 */ sw $a3, 8($s0) -/* B75B2C 800FE98C AFA30024 */ sw $v1, 0x24($sp) -/* B75B30 800FE990 0C041A18 */ jal func_80106860 -/* B75B34 800FE994 AFA70020 */ sw $a3, 0x20($sp) -/* B75B38 800FE998 8FA30024 */ lw $v1, 0x24($sp) -/* B75B3C 800FE99C 8FA70020 */ lw $a3, 0x20($sp) -/* B75B40 800FE9A0 AE070008 */ sw $a3, 8($s0) -.L800FE9A4: -/* B75B44 800FE9A4 00E08825 */ move $s1, $a3 -.L800FE9A8: -/* B75B48 800FE9A8 5060001B */ beql $v1, $zero, .L800FEA18 -/* B75B4C 800FE9AC 8FBF001C */ lw $ra, 0x1c($sp) -/* B75B50 800FE9B0 846B0002 */ lh $t3, 2($v1) -/* B75B54 800FE9B4 51600018 */ beql $t3, $zero, .L800FEA18 -/* B75B58 800FE9B8 8FBF001C */ lw $ra, 0x1c($sp) -/* B75B5C 800FE9BC 8C620004 */ lw $v0, 4($v1) -/* B75B60 800FE9C0 00626021 */ addu $t4, $v1, $v0 -/* B75B64 800FE9C4 258D0030 */ addiu $t5, $t4, 0x30 -/* B75B68 800FE9C8 560D0013 */ bnel $s0, $t5, .L800FEA18 -/* B75B6C 800FE9CC 8FBF001C */ lw $ra, 0x1c($sp) -/* B75B70 800FE9D0 12200003 */ beqz $s1, .L800FE9E0 -/* B75B74 800FE9D4 02002025 */ move $a0, $s0 -/* B75B78 800FE9D8 AE23000C */ sw $v1, 0xc($s1) -/* B75B7C 800FE9DC 8C620004 */ lw $v0, 4($v1) -.L800FE9E0: -/* B75B80 800FE9E0 AC710008 */ sw $s1, 8($v1) -/* B75B84 800FE9E4 8E0E0004 */ lw $t6, 4($s0) -/* B75B88 800FE9E8 240500EF */ li $a1, 239 -/* B75B8C 800FE9EC 004E7821 */ addu $t7, $v0, $t6 -/* B75B90 800FE9F0 25F80030 */ addiu $t8, $t7, 0x30 -/* B75B94 800FE9F4 AC780004 */ sw $t8, 4($v1) -/* B75B98 800FE9F8 8FB90030 */ lw $t9, 0x30($sp) -/* B75B9C 800FE9FC 93280022 */ lbu $t0, 0x22($t9) -/* B75BA0 800FEA00 31090002 */ andi $t1, $t0, 2 -/* B75BA4 800FEA04 51200004 */ beql $t1, $zero, .L800FEA18 -/* B75BA8 800FEA08 8FBF001C */ lw $ra, 0x1c($sp) -/* B75BAC 800FEA0C 0C041A18 */ jal func_80106860 -/* B75BB0 800FEA10 24060030 */ li $a2, 48 -.L800FEA14: -/* B75BB4 800FEA14 8FBF001C */ lw $ra, 0x1c($sp) -.L800FEA18: -/* B75BB8 800FEA18 8FB00014 */ lw $s0, 0x14($sp) -/* B75BBC 800FEA1C 8FB10018 */ lw $s1, 0x18($sp) -/* B75BC0 800FEA20 03E00008 */ jr $ra -/* B75BC4 800FEA24 27BD0030 */ addiu $sp, $sp, 0x30 \ No newline at end of file diff --git a/asm/non_matchings/code/__osMalloc/__osMallocR.s b/asm/non_matchings/code/__osMalloc/__osMallocR.s deleted file mode 100644 index 9ddc2aa251..0000000000 --- a/asm/non_matchings/code/__osMalloc/__osMallocR.s +++ /dev/null @@ -1,95 +0,0 @@ -glabel __osMallocR -/* B75624 800FE484 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* B75628 800FE488 AFB1001C */ sw $s1, 0x1c($sp) -/* B7562C 800FE48C AFBF0024 */ sw $ra, 0x24($sp) -/* B75630 800FE490 AFB20020 */ sw $s2, 0x20($sp) -/* B75634 800FE494 24B1000F */ addiu $s1, $a1, 0xf -/* B75638 800FE498 2401FFF0 */ li $at, -16 -/* B7563C 800FE49C 00809025 */ move $s2, $a0 -/* B75640 800FE4A0 AFB00018 */ sw $s0, 0x18($sp) -/* B75644 800FE4A4 AFA00034 */ sw $zero, 0x34($sp) -/* B75648 800FE4A8 0C03F70F */ jal ArenaImpl_Lock -/* B7564C 800FE4AC 02218824 */ and $s1, $s1, $at -/* B75650 800FE4B0 0C03F74F */ jal ArenaImpl_GetLastBlock -/* B75654 800FE4B4 02402025 */ move $a0, $s2 -/* B75658 800FE4B8 10400041 */ beqz $v0, .L800FE5C0 -/* B7565C 800FE4BC 00408025 */ move $s0, $v0 -.L800FE4C0: -/* B75660 800FE4C0 844E0002 */ lh $t6, 2($v0) -/* B75664 800FE4C4 11C0003A */ beqz $t6, .L800FE5B0 -/* B75668 800FE4C8 00000000 */ nop -/* B7566C 800FE4CC 8C4F0004 */ lw $t7, 4($v0) -/* B75670 800FE4D0 01F1082B */ sltu $at, $t7, $s1 -/* B75674 800FE4D4 14200036 */ bnez $at, .L800FE5B0 -/* B75678 800FE4D8 00000000 */ nop -/* B7567C 800FE4DC 92580022 */ lbu $t8, 0x22($s2) -/* B75680 800FE4E0 02402025 */ move $a0, $s2 -/* B75684 800FE4E4 33190004 */ andi $t9, $t8, 4 -/* B75688 800FE4E8 53200004 */ beql $t9, $zero, .L800FE4FC -/* B7568C 800FE4EC 8E020004 */ lw $v0, 4($s0) -/* B75690 800FE4F0 0C03F7D5 */ jal __osMalloc_FreeBlockTest -/* B75694 800FE4F4 02002825 */ move $a1, $s0 -/* B75698 800FE4F8 8E020004 */ lw $v0, 4($s0) -.L800FE4FC: -/* B7569C 800FE4FC 2623000F */ addiu $v1, $s1, 0xf -/* B756A0 800FE500 2401FFF0 */ li $at, -16 -/* B756A4 800FE504 00611824 */ and $v1, $v1, $at -/* B756A8 800FE508 24630030 */ addiu $v1, $v1, 0x30 -/* B756AC 800FE50C 0062082B */ sltu $at, $v1, $v0 -/* B756B0 800FE510 10200016 */ beqz $at, .L800FE56C -/* B756B4 800FE514 02024021 */ addu $t0, $s0, $v0 -/* B756B8 800FE518 01112823 */ subu $a1, $t0, $s1 -/* B756BC 800FE51C AFA50040 */ sw $a1, 0x40($sp) -/* B756C0 800FE520 02002025 */ move $a0, $s0 -/* B756C4 800FE524 0C03F723 */ jal ArenaImpl_GetNextBlock -/* B756C8 800FE528 AFA3002C */ sw $v1, 0x2c($sp) -/* B756CC 800FE52C 8FA40040 */ lw $a0, 0x40($sp) -/* B756D0 800FE530 8FA3002C */ lw $v1, 0x2c($sp) -/* B756D4 800FE534 24097373 */ li $t1, 29555 -/* B756D8 800FE538 AC820008 */ sw $v0, 8($a0) -/* B756DC 800FE53C AC90000C */ sw $s0, 0xc($a0) -/* B756E0 800FE540 AC910004 */ sw $s1, 4($a0) -/* B756E4 800FE544 A4890000 */ sh $t1, ($a0) -/* B756E8 800FE548 8E0A0004 */ lw $t2, 4($s0) -/* B756EC 800FE54C AE040008 */ sw $a0, 8($s0) -/* B756F0 800FE550 01435823 */ subu $t3, $t2, $v1 -/* B756F4 800FE554 0C03F723 */ jal ArenaImpl_GetNextBlock -/* B756F8 800FE558 AE0B0004 */ sw $t3, 4($s0) -/* B756FC 800FE55C 10400002 */ beqz $v0, .L800FE568 -/* B75700 800FE560 8FA50040 */ lw $a1, 0x40($sp) -/* B75704 800FE564 AC45000C */ sw $a1, 0xc($v0) -.L800FE568: -/* B75708 800FE568 00A08025 */ move $s0, $a1 -.L800FE56C: -/* B7570C 800FE56C A6000002 */ sh $zero, 2($s0) -/* B75710 800FE570 02002025 */ move $a0, $s0 -/* B75714 800FE574 00002825 */ move $a1, $zero -/* B75718 800FE578 00003025 */ move $a2, $zero -/* B7571C 800FE57C 0C03F6F0 */ jal ArenaImpl_SetDebugInfo -/* B75720 800FE580 02403825 */ move $a3, $s2 -/* B75724 800FE584 26040030 */ addiu $a0, $s0, 0x30 -/* B75728 800FE588 AFA40034 */ sw $a0, 0x34($sp) -/* B7572C 800FE58C 924C0022 */ lbu $t4, 0x22($s2) -/* B75730 800FE590 240500CD */ li $a1, 205 -/* B75734 800FE594 318D0001 */ andi $t5, $t4, 1 -/* B75738 800FE598 11A00009 */ beqz $t5, .L800FE5C0 -/* B7573C 800FE59C 00000000 */ nop -/* B75740 800FE5A0 0C041A18 */ jal func_80106860 -/* B75744 800FE5A4 02203025 */ move $a2, $s1 -/* B75748 800FE5A8 10000005 */ b .L800FE5C0 -/* B7574C 800FE5AC 00000000 */ nop -.L800FE5B0: -/* B75750 800FE5B0 0C03F739 */ jal ArenaImpl_GetPrevBlock -/* B75754 800FE5B4 02002025 */ move $a0, $s0 -/* B75758 800FE5B8 1440FFC1 */ bnez $v0, .L800FE4C0 -/* B7575C 800FE5BC 00408025 */ move $s0, $v0 -.L800FE5C0: -/* B75760 800FE5C0 0C03F719 */ jal ArenaImpl_Unlock -/* B75764 800FE5C4 02402025 */ move $a0, $s2 -/* B75768 800FE5C8 8FBF0024 */ lw $ra, 0x24($sp) -/* B7576C 800FE5CC 8FA20034 */ lw $v0, 0x34($sp) -/* B75770 800FE5D0 8FB00018 */ lw $s0, 0x18($sp) -/* B75774 800FE5D4 8FB1001C */ lw $s1, 0x1c($sp) -/* B75778 800FE5D8 8FB20020 */ lw $s2, 0x20($sp) -/* B7577C 800FE5DC 03E00008 */ jr $ra -/* B75780 800FE5E0 27BD0048 */ addiu $sp, $sp, 0x48 \ No newline at end of file diff --git a/asm/non_matchings/code/__osMalloc/__osMallocRDebug.s b/asm/non_matchings/code/__osMalloc/__osMallocRDebug.s deleted file mode 100644 index 46e750650d..0000000000 --- a/asm/non_matchings/code/__osMalloc/__osMallocRDebug.s +++ /dev/null @@ -1,97 +0,0 @@ -glabel __osMallocRDebug -/* B75334 800FE194 27BDFFB8 */ addiu $sp, $sp, -0x48 -/* B75338 800FE198 AFB1001C */ sw $s1, 0x1c($sp) -/* B7533C 800FE19C AFBF0024 */ sw $ra, 0x24($sp) -/* B75340 800FE1A0 AFB20020 */ sw $s2, 0x20($sp) -/* B75344 800FE1A4 24B1000F */ addiu $s1, $a1, 0xf -/* B75348 800FE1A8 2401FFF0 */ li $at, -16 -/* B7534C 800FE1AC 00809025 */ move $s2, $a0 -/* B75350 800FE1B0 AFB00018 */ sw $s0, 0x18($sp) -/* B75354 800FE1B4 AFA60050 */ sw $a2, 0x50($sp) -/* B75358 800FE1B8 AFA70054 */ sw $a3, 0x54($sp) -/* B7535C 800FE1BC AFA00034 */ sw $zero, 0x34($sp) -/* B75360 800FE1C0 0C03F70F */ jal ArenaImpl_Lock -/* B75364 800FE1C4 02218824 */ and $s1, $s1, $at -/* B75368 800FE1C8 0C03F74F */ jal ArenaImpl_GetLastBlock -/* B7536C 800FE1CC 02402025 */ move $a0, $s2 -/* B75370 800FE1D0 10400041 */ beqz $v0, .L800FE2D8 -/* B75374 800FE1D4 00408025 */ move $s0, $v0 -.L800FE1D8: -/* B75378 800FE1D8 844E0002 */ lh $t6, 2($v0) -/* B7537C 800FE1DC 11C0003A */ beqz $t6, .L800FE2C8 -/* B75380 800FE1E0 00000000 */ nop -/* B75384 800FE1E4 8C4F0004 */ lw $t7, 4($v0) -/* B75388 800FE1E8 01F1082B */ sltu $at, $t7, $s1 -/* B7538C 800FE1EC 14200036 */ bnez $at, .L800FE2C8 -/* B75390 800FE1F0 00000000 */ nop -/* B75394 800FE1F4 92580022 */ lbu $t8, 0x22($s2) -/* B75398 800FE1F8 02402025 */ move $a0, $s2 -/* B7539C 800FE1FC 33190004 */ andi $t9, $t8, 4 -/* B753A0 800FE200 53200004 */ beql $t9, $zero, .L800FE214 -/* B753A4 800FE204 8E020004 */ lw $v0, 4($s0) -/* B753A8 800FE208 0C03F7D5 */ jal __osMalloc_FreeBlockTest -/* B753AC 800FE20C 02002825 */ move $a1, $s0 -/* B753B0 800FE210 8E020004 */ lw $v0, 4($s0) -.L800FE214: -/* B753B4 800FE214 2623000F */ addiu $v1, $s1, 0xf -/* B753B8 800FE218 2401FFF0 */ li $at, -16 -/* B753BC 800FE21C 00611824 */ and $v1, $v1, $at -/* B753C0 800FE220 24630030 */ addiu $v1, $v1, 0x30 -/* B753C4 800FE224 0062082B */ sltu $at, $v1, $v0 -/* B753C8 800FE228 10200016 */ beqz $at, .L800FE284 -/* B753CC 800FE22C 02024021 */ addu $t0, $s0, $v0 -/* B753D0 800FE230 01112823 */ subu $a1, $t0, $s1 -/* B753D4 800FE234 AFA50040 */ sw $a1, 0x40($sp) -/* B753D8 800FE238 02002025 */ move $a0, $s0 -/* B753DC 800FE23C 0C03F723 */ jal ArenaImpl_GetNextBlock -/* B753E0 800FE240 AFA3002C */ sw $v1, 0x2c($sp) -/* B753E4 800FE244 8FA40040 */ lw $a0, 0x40($sp) -/* B753E8 800FE248 8FA3002C */ lw $v1, 0x2c($sp) -/* B753EC 800FE24C 24097373 */ li $t1, 29555 -/* B753F0 800FE250 AC820008 */ sw $v0, 8($a0) -/* B753F4 800FE254 AC90000C */ sw $s0, 0xc($a0) -/* B753F8 800FE258 AC910004 */ sw $s1, 4($a0) -/* B753FC 800FE25C A4890000 */ sh $t1, ($a0) -/* B75400 800FE260 8E0A0004 */ lw $t2, 4($s0) -/* B75404 800FE264 AE040008 */ sw $a0, 8($s0) -/* B75408 800FE268 01435823 */ subu $t3, $t2, $v1 -/* B7540C 800FE26C 0C03F723 */ jal ArenaImpl_GetNextBlock -/* B75410 800FE270 AE0B0004 */ sw $t3, 4($s0) -/* B75414 800FE274 10400002 */ beqz $v0, .L800FE280 -/* B75418 800FE278 8FA50040 */ lw $a1, 0x40($sp) -/* B7541C 800FE27C AC45000C */ sw $a1, 0xc($v0) -.L800FE280: -/* B75420 800FE280 00A08025 */ move $s0, $a1 -.L800FE284: -/* B75424 800FE284 A6000002 */ sh $zero, 2($s0) -/* B75428 800FE288 8FA60054 */ lw $a2, 0x54($sp) -/* B7542C 800FE28C 8FA50050 */ lw $a1, 0x50($sp) -/* B75430 800FE290 02002025 */ move $a0, $s0 -/* B75434 800FE294 0C03F6F0 */ jal ArenaImpl_SetDebugInfo -/* B75438 800FE298 02403825 */ move $a3, $s2 -/* B7543C 800FE29C 26040030 */ addiu $a0, $s0, 0x30 -/* B75440 800FE2A0 AFA40034 */ sw $a0, 0x34($sp) -/* B75444 800FE2A4 924C0022 */ lbu $t4, 0x22($s2) -/* B75448 800FE2A8 240500CD */ li $a1, 205 -/* B7544C 800FE2AC 318D0001 */ andi $t5, $t4, 1 -/* B75450 800FE2B0 11A00009 */ beqz $t5, .L800FE2D8 -/* B75454 800FE2B4 00000000 */ nop -/* B75458 800FE2B8 0C041A18 */ jal func_80106860 -/* B7545C 800FE2BC 02203025 */ move $a2, $s1 -/* B75460 800FE2C0 10000005 */ b .L800FE2D8 -/* B75464 800FE2C4 00000000 */ nop -.L800FE2C8: -/* B75468 800FE2C8 0C03F739 */ jal ArenaImpl_GetPrevBlock -/* B7546C 800FE2CC 02002025 */ move $a0, $s0 -/* B75470 800FE2D0 1440FFC1 */ bnez $v0, .L800FE1D8 -/* B75474 800FE2D4 00408025 */ move $s0, $v0 -.L800FE2D8: -/* B75478 800FE2D8 0C03F719 */ jal ArenaImpl_Unlock -/* B7547C 800FE2DC 02402025 */ move $a0, $s2 -/* B75480 800FE2E0 8FBF0024 */ lw $ra, 0x24($sp) -/* B75484 800FE2E4 8FA20034 */ lw $v0, 0x34($sp) -/* B75488 800FE2E8 8FB00018 */ lw $s0, 0x18($sp) -/* B7548C 800FE2EC 8FB1001C */ lw $s1, 0x1c($sp) -/* B75490 800FE2F0 8FB20020 */ lw $s2, 0x20($sp) -/* B75494 800FE2F4 03E00008 */ jr $ra -/* B75498 800FE2F8 27BD0048 */ addiu $sp, $sp, 0x48 \ No newline at end of file diff --git a/asm/non_matchings/code/__osMalloc/__osMalloc_NoLock.s b/asm/non_matchings/code/__osMalloc/__osMalloc_NoLock.s deleted file mode 100644 index ae560752c2..0000000000 --- a/asm/non_matchings/code/__osMalloc/__osMalloc_NoLock.s +++ /dev/null @@ -1,89 +0,0 @@ -glabel __osMalloc_NoLock -/* B7549C 800FE2FC 27BDFFC0 */ addiu $sp, $sp, -0x40 -/* B754A0 800FE300 AFBF001C */ sw $ra, 0x1c($sp) -/* B754A4 800FE304 AFB10018 */ sw $s1, 0x18($sp) -/* B754A8 800FE308 AFB00014 */ sw $s0, 0x14($sp) -/* B754AC 800FE30C AFA40040 */ sw $a0, 0x40($sp) -/* B754B0 800FE310 AFA00030 */ sw $zero, 0x30($sp) -/* B754B4 800FE314 8C900000 */ lw $s0, ($a0) -/* B754B8 800FE318 24B1000F */ addiu $s1, $a1, 0xf -/* B754BC 800FE31C 2401FFF0 */ li $at, -16 -/* B754C0 800FE320 12000042 */ beqz $s0, .L800FE42C -/* B754C4 800FE324 02218824 */ and $s1, $s1, $at -.L800FE328: -/* B754C8 800FE328 860F0002 */ lh $t7, 2($s0) -/* B754CC 800FE32C 11E0003B */ beqz $t7, .L800FE41C -/* B754D0 800FE330 00000000 */ nop -/* B754D4 800FE334 8E020004 */ lw $v0, 4($s0) -/* B754D8 800FE338 0051082B */ sltu $at, $v0, $s1 -/* B754DC 800FE33C 14200037 */ bnez $at, .L800FE41C -/* B754E0 800FE340 00000000 */ nop -/* B754E4 800FE344 8FB80040 */ lw $t8, 0x40($sp) -/* B754E8 800FE348 93190022 */ lbu $t9, 0x22($t8) -/* B754EC 800FE34C 03002025 */ move $a0, $t8 -/* B754F0 800FE350 33280004 */ andi $t0, $t9, 4 -/* B754F4 800FE354 51000005 */ beql $t0, $zero, .L800FE36C -/* B754F8 800FE358 2623000F */ addiu $v1, $s1, 0xf -/* B754FC 800FE35C 0C03F7D5 */ jal __osMalloc_FreeBlockTest -/* B75500 800FE360 02002825 */ move $a1, $s0 -/* B75504 800FE364 8E020004 */ lw $v0, 4($s0) -/* B75508 800FE368 2623000F */ addiu $v1, $s1, 0xf -.L800FE36C: -/* B7550C 800FE36C 2401FFF0 */ li $at, -16 -/* B75510 800FE370 00611824 */ and $v1, $v1, $at -/* B75514 800FE374 24630030 */ addiu $v1, $v1, 0x30 -/* B75518 800FE378 0062082B */ sltu $at, $v1, $v0 -/* B7551C 800FE37C 10200015 */ beqz $at, .L800FE3D4 -/* B75520 800FE380 02002025 */ move $a0, $s0 -/* B75524 800FE384 0C03F723 */ jal ArenaImpl_GetNextBlock -/* B75528 800FE388 AFA30028 */ sw $v1, 0x28($sp) -/* B7552C 800FE38C 8FA30028 */ lw $v1, 0x28($sp) -/* B75530 800FE390 240B0001 */ li $t3, 1 -/* B75534 800FE394 240C7373 */ li $t4, 29555 -/* B75538 800FE398 02032021 */ addu $a0, $s0, $v1 -/* B7553C 800FE39C AC820008 */ sw $v0, 8($a0) -/* B75540 800FE3A0 AC90000C */ sw $s0, 0xc($a0) -/* B75544 800FE3A4 8E090004 */ lw $t1, 4($s0) -/* B75548 800FE3A8 A48B0002 */ sh $t3, 2($a0) -/* B7554C 800FE3AC A48C0000 */ sh $t4, ($a0) -/* B75550 800FE3B0 01235023 */ subu $t2, $t1, $v1 -/* B75554 800FE3B4 AC8A0004 */ sw $t2, 4($a0) -/* B75558 800FE3B8 AE040008 */ sw $a0, 8($s0) -/* B7555C 800FE3BC AE110004 */ sw $s1, 4($s0) -/* B75560 800FE3C0 0C03F723 */ jal ArenaImpl_GetNextBlock -/* B75564 800FE3C4 AFA40024 */ sw $a0, 0x24($sp) -/* B75568 800FE3C8 10400002 */ beqz $v0, .L800FE3D4 -/* B7556C 800FE3CC 8FA40024 */ lw $a0, 0x24($sp) -/* B75570 800FE3D0 AC44000C */ sw $a0, 0xc($v0) -.L800FE3D4: -/* B75574 800FE3D4 A6000002 */ sh $zero, 2($s0) -/* B75578 800FE3D8 8FA70040 */ lw $a3, 0x40($sp) -/* B7557C 800FE3DC 02002025 */ move $a0, $s0 -/* B75580 800FE3E0 00002825 */ move $a1, $zero -/* B75584 800FE3E4 0C03F6F0 */ jal ArenaImpl_SetDebugInfo -/* B75588 800FE3E8 00003025 */ move $a2, $zero -/* B7558C 800FE3EC 8FAD0040 */ lw $t5, 0x40($sp) -/* B75590 800FE3F0 26040030 */ addiu $a0, $s0, 0x30 -/* B75594 800FE3F4 AFA40030 */ sw $a0, 0x30($sp) -/* B75598 800FE3F8 91AE0022 */ lbu $t6, 0x22($t5) -/* B7559C 800FE3FC 240500CD */ li $a1, 205 -/* B755A0 800FE400 31CF0001 */ andi $t7, $t6, 1 -/* B755A4 800FE404 51E0000A */ beql $t7, $zero, .L800FE430 -/* B755A8 800FE408 8FBF001C */ lw $ra, 0x1c($sp) -/* B755AC 800FE40C 0C041A18 */ jal func_80106860 -/* B755B0 800FE410 02203025 */ move $a2, $s1 -/* B755B4 800FE414 10000006 */ b .L800FE430 -/* B755B8 800FE418 8FBF001C */ lw $ra, 0x1c($sp) -.L800FE41C: -/* B755BC 800FE41C 0C03F723 */ jal ArenaImpl_GetNextBlock -/* B755C0 800FE420 02002025 */ move $a0, $s0 -/* B755C4 800FE424 1440FFC0 */ bnez $v0, .L800FE328 -/* B755C8 800FE428 00408025 */ move $s0, $v0 -.L800FE42C: -/* B755CC 800FE42C 8FBF001C */ lw $ra, 0x1c($sp) -.L800FE430: -/* B755D0 800FE430 8FA20030 */ lw $v0, 0x30($sp) -/* B755D4 800FE434 8FB00014 */ lw $s0, 0x14($sp) -/* B755D8 800FE438 8FB10018 */ lw $s1, 0x18($sp) -/* B755DC 800FE43C 03E00008 */ jr $ra -/* B755E0 800FE440 27BD0040 */ addiu $sp, $sp, 0x40 \ No newline at end of file diff --git a/asm/non_matchings/code/__osMalloc/__osMalloc_NoLockDebug.s b/asm/non_matchings/code/__osMalloc/__osMalloc_NoLockDebug.s deleted file mode 100644 index 6b38370f41..0000000000 --- a/asm/non_matchings/code/__osMalloc/__osMalloc_NoLockDebug.s +++ /dev/null @@ -1,91 +0,0 @@ -glabel __osMalloc_NoLockDebug -/* B75194 800FDFF4 27BDFFC0 */ addiu $sp, $sp, -0x40 -/* B75198 800FDFF8 AFBF001C */ sw $ra, 0x1c($sp) -/* B7519C 800FDFFC AFB10018 */ sw $s1, 0x18($sp) -/* B751A0 800FE000 AFB00014 */ sw $s0, 0x14($sp) -/* B751A4 800FE004 AFA40040 */ sw $a0, 0x40($sp) -/* B751A8 800FE008 AFA60048 */ sw $a2, 0x48($sp) -/* B751AC 800FE00C AFA7004C */ sw $a3, 0x4c($sp) -/* B751B0 800FE010 AFA00030 */ sw $zero, 0x30($sp) -/* B751B4 800FE014 8C900000 */ lw $s0, ($a0) -/* B751B8 800FE018 24B1000F */ addiu $s1, $a1, 0xf -/* B751BC 800FE01C 2401FFF0 */ li $at, -16 -/* B751C0 800FE020 12000042 */ beqz $s0, .L800FE12C -/* B751C4 800FE024 02218824 */ and $s1, $s1, $at -.L800FE028: -/* B751C8 800FE028 860F0002 */ lh $t7, 2($s0) -/* B751CC 800FE02C 11E0003B */ beqz $t7, .L800FE11C -/* B751D0 800FE030 00000000 */ nop -/* B751D4 800FE034 8E020004 */ lw $v0, 4($s0) -/* B751D8 800FE038 0051082B */ sltu $at, $v0, $s1 -/* B751DC 800FE03C 14200037 */ bnez $at, .L800FE11C -/* B751E0 800FE040 00000000 */ nop -/* B751E4 800FE044 8FB80040 */ lw $t8, 0x40($sp) -/* B751E8 800FE048 93190022 */ lbu $t9, 0x22($t8) -/* B751EC 800FE04C 03002025 */ move $a0, $t8 -/* B751F0 800FE050 33280004 */ andi $t0, $t9, 4 -/* B751F4 800FE054 51000005 */ beql $t0, $zero, .L800FE06C -/* B751F8 800FE058 2623000F */ addiu $v1, $s1, 0xf -/* B751FC 800FE05C 0C03F7D5 */ jal __osMalloc_FreeBlockTest -/* B75200 800FE060 02002825 */ move $a1, $s0 -/* B75204 800FE064 8E020004 */ lw $v0, 4($s0) -/* B75208 800FE068 2623000F */ addiu $v1, $s1, 0xf -.L800FE06C: -/* B7520C 800FE06C 2401FFF0 */ li $at, -16 -/* B75210 800FE070 00611824 */ and $v1, $v1, $at -/* B75214 800FE074 24630030 */ addiu $v1, $v1, 0x30 -/* B75218 800FE078 0062082B */ sltu $at, $v1, $v0 -/* B7521C 800FE07C 10200015 */ beqz $at, .L800FE0D4 -/* B75220 800FE080 02002025 */ move $a0, $s0 -/* B75224 800FE084 0C03F723 */ jal ArenaImpl_GetNextBlock -/* B75228 800FE088 AFA30028 */ sw $v1, 0x28($sp) -/* B7522C 800FE08C 8FA30028 */ lw $v1, 0x28($sp) -/* B75230 800FE090 240B0001 */ li $t3, 1 -/* B75234 800FE094 240C7373 */ li $t4, 29555 -/* B75238 800FE098 02032021 */ addu $a0, $s0, $v1 -/* B7523C 800FE09C AC820008 */ sw $v0, 8($a0) -/* B75240 800FE0A0 AC90000C */ sw $s0, 0xc($a0) -/* B75244 800FE0A4 8E090004 */ lw $t1, 4($s0) -/* B75248 800FE0A8 A48B0002 */ sh $t3, 2($a0) -/* B7524C 800FE0AC A48C0000 */ sh $t4, ($a0) -/* B75250 800FE0B0 01235023 */ subu $t2, $t1, $v1 -/* B75254 800FE0B4 AC8A0004 */ sw $t2, 4($a0) -/* B75258 800FE0B8 AE040008 */ sw $a0, 8($s0) -/* B7525C 800FE0BC AE110004 */ sw $s1, 4($s0) -/* B75260 800FE0C0 0C03F723 */ jal ArenaImpl_GetNextBlock -/* B75264 800FE0C4 AFA40024 */ sw $a0, 0x24($sp) -/* B75268 800FE0C8 10400002 */ beqz $v0, .L800FE0D4 -/* B7526C 800FE0CC 8FA40024 */ lw $a0, 0x24($sp) -/* B75270 800FE0D0 AC44000C */ sw $a0, 0xc($v0) -.L800FE0D4: -/* B75274 800FE0D4 A6000002 */ sh $zero, 2($s0) -/* B75278 800FE0D8 8FA70040 */ lw $a3, 0x40($sp) -/* B7527C 800FE0DC 8FA6004C */ lw $a2, 0x4c($sp) -/* B75280 800FE0E0 8FA50048 */ lw $a1, 0x48($sp) -/* B75284 800FE0E4 0C03F6F0 */ jal ArenaImpl_SetDebugInfo -/* B75288 800FE0E8 02002025 */ move $a0, $s0 -/* B7528C 800FE0EC 8FAD0040 */ lw $t5, 0x40($sp) -/* B75290 800FE0F0 26040030 */ addiu $a0, $s0, 0x30 -/* B75294 800FE0F4 AFA40030 */ sw $a0, 0x30($sp) -/* B75298 800FE0F8 91AE0022 */ lbu $t6, 0x22($t5) -/* B7529C 800FE0FC 240500CD */ li $a1, 205 -/* B752A0 800FE100 31CF0001 */ andi $t7, $t6, 1 -/* B752A4 800FE104 51E0000A */ beql $t7, $zero, .L800FE130 -/* B752A8 800FE108 8FBF001C */ lw $ra, 0x1c($sp) -/* B752AC 800FE10C 0C041A18 */ jal func_80106860 -/* B752B0 800FE110 02203025 */ move $a2, $s1 -/* B752B4 800FE114 10000006 */ b .L800FE130 -/* B752B8 800FE118 8FBF001C */ lw $ra, 0x1c($sp) -.L800FE11C: -/* B752BC 800FE11C 0C03F723 */ jal ArenaImpl_GetNextBlock -/* B752C0 800FE120 02002025 */ move $a0, $s0 -/* B752C4 800FE124 1440FFC0 */ bnez $v0, .L800FE028 -/* B752C8 800FE128 00408025 */ move $s0, $v0 -.L800FE12C: -/* B752CC 800FE12C 8FBF001C */ lw $ra, 0x1c($sp) -.L800FE130: -/* B752D0 800FE130 8FA20030 */ lw $v0, 0x30($sp) -/* B752D4 800FE134 8FB00014 */ lw $s0, 0x14($sp) -/* B752D8 800FE138 8FB10018 */ lw $s1, 0x18($sp) -/* B752DC 800FE13C 03E00008 */ jr $ra -/* B752E0 800FE140 27BD0040 */ addiu $sp, $sp, 0x40 diff --git a/asm/non_matchings/code/__osMalloc/__osRealloc.s b/asm/non_matchings/code/__osMalloc/__osRealloc.s deleted file mode 100644 index 5ed23c5ba2..0000000000 --- a/asm/non_matchings/code/__osMalloc/__osRealloc.s +++ /dev/null @@ -1,247 +0,0 @@ -.rdata -glabel D_8014ADEC - .asciz "__osRealloc(%08x, %d)\n" - .balign 4 - -glabel D_8014AE04 - .asciz "メモリブロックサイズが変わらないためなにもしません\n" #Does nothing because the memory block size does not change - .balign 4 - -glabel D_8014AE38 - .asciz "現メモリブロックの後ろにフリーブロックがあるので結合します\n" #Merge because there is a free block after the current memory block - .balign 4 - -glabel D_8014AE74 - .asciz "新たにメモリブロックを確保して内容を移動します\n" #Allocate a new memory block and move the contents - .balign 4 - -glabel D_8014AEA4 - .asciz "現メモリブロックの後ろのフリーブロックを大きくしました\n" #Increased free block behind current memory block - .balign 4 - -glabel D_8014AEDC - .asciz "現メモリブロックの後ろにフリーブロックがないので生成します\n" #Generated because there is no free block after the current memory block - .balign 4 - -glabel D_8014AF18 - .asciz "フリーブロック生成するだけの空きがありません\n" #There is no room to generate free blocks - .balign 4 - -.text -glabel __osRealloc -/* B75C10 800FEA70 27BDFF78 */ addiu $sp, $sp, -0x88 -/* B75C14 800FEA74 AFB00018 */ sw $s0, 0x18($sp) -/* B75C18 800FEA78 AFA40088 */ sw $a0, 0x88($sp) -/* B75C1C 800FEA7C 24D0000F */ addiu $s0, $a2, 0xf -/* B75C20 800FEA80 2401FFF0 */ li $at, -16 -/* B75C24 800FEA84 AFBF001C */ sw $ra, 0x1c($sp) -/* B75C28 800FEA88 02018024 */ and $s0, $s0, $at -/* B75C2C 800FEA8C 3C048015 */ lui $a0, %hi(D_8014ADEC) # $a0, 0x8015 -/* B75C30 800FEA90 AFA5008C */ sw $a1, 0x8c($sp) -/* B75C34 800FEA94 2484ADEC */ addiu $a0, %lo(D_8014ADEC) # addiu $a0, $a0, -0x5214 -/* B75C38 800FEA98 0C00084C */ jal osSyncPrintf -/* B75C3C 800FEA9C 02003025 */ move $a2, $s0 -/* B75C40 800FEAA0 0C03F70F */ jal ArenaImpl_Lock -/* B75C44 800FEAA4 8FA40088 */ lw $a0, 0x88($sp) -/* B75C48 800FEAA8 8FAE008C */ lw $t6, 0x8c($sp) -/* B75C4C 800FEAAC 8FA40088 */ lw $a0, 0x88($sp) -/* B75C50 800FEAB0 15C00005 */ bnez $t6, .L800FEAC8 -/* B75C54 800FEAB4 00000000 */ nop -/* B75C58 800FEAB8 0C03F8BF */ jal __osMalloc_NoLock -/* B75C5C 800FEABC 02002825 */ move $a1, $s0 -/* B75C60 800FEAC0 100000AF */ b .L800FED80 -/* B75C64 800FEAC4 AFA2008C */ sw $v0, 0x8c($sp) -.L800FEAC8: -/* B75C68 800FEAC8 16000006 */ bnez $s0, .L800FEAE4 -/* B75C6C 800FEACC 8FA7008C */ lw $a3, 0x8c($sp) -/* B75C70 800FEAD0 8FA40088 */ lw $a0, 0x88($sp) -/* B75C74 800FEAD4 0C03F979 */ jal __osFree_NoLock -/* B75C78 800FEAD8 8FA5008C */ lw $a1, 0x8c($sp) -/* B75C7C 800FEADC 100000A8 */ b .L800FED80 -/* B75C80 800FEAE0 AFA0008C */ sw $zero, 0x8c($sp) -.L800FEAE4: -/* B75C84 800FEAE4 8CE3FFD4 */ lw $v1, -0x2c($a3) -/* B75C88 800FEAE8 24E7FFD0 */ addiu $a3, $a3, -0x30 -/* B75C8C 800FEAEC 3C048015 */ lui $a0, %hi(D_8014AE04) # $a0, 0x8015 -/* B75C90 800FEAF0 16030005 */ bne $s0, $v1, .L800FEB08 -/* B75C94 800FEAF4 0070082B */ sltu $at, $v1, $s0 -/* B75C98 800FEAF8 0C00084C */ jal osSyncPrintf -/* B75C9C 800FEAFC 2484AE04 */ addiu $a0, %lo(D_8014AE04) # addiu $a0, $a0, -0x51fc -/* B75CA0 800FEB00 1000009F */ b .L800FED80 -/* B75CA4 800FEB04 00000000 */ nop -.L800FEB08: -/* B75CA8 800FEB08 1020003C */ beqz $at, .L800FEBFC -/* B75CAC 800FEB0C 00E02025 */ move $a0, $a3 -/* B75CB0 800FEB10 0C03F723 */ jal ArenaImpl_GetNextBlock -/* B75CB4 800FEB14 AFA70024 */ sw $a3, 0x24($sp) -/* B75CB8 800FEB18 8FA70024 */ lw $a3, 0x24($sp) -/* B75CBC 800FEB1C 3C048015 */ lui $a0, %hi(D_8014AE74) # $a0, 0x8015 -/* B75CC0 800FEB20 2484AE74 */ addiu $a0, %lo(D_8014AE74) # addiu $a0, $a0, -0x518c -/* B75CC4 800FEB24 8CE30004 */ lw $v1, 4($a3) -/* B75CC8 800FEB28 00E37821 */ addu $t7, $a3, $v1 -/* B75CCC 800FEB2C 25F80030 */ addiu $t8, $t7, 0x30 -/* B75CD0 800FEB30 14580021 */ bne $v0, $t8, .L800FEBB8 -/* B75CD4 800FEB34 02034023 */ subu $t0, $s0, $v1 -/* B75CD8 800FEB38 84590002 */ lh $t9, 2($v0) -/* B75CDC 800FEB3C 1320001E */ beqz $t9, .L800FEBB8 -/* B75CE0 800FEB40 00000000 */ nop -/* B75CE4 800FEB44 8C490004 */ lw $t1, 4($v0) -/* B75CE8 800FEB48 0128082B */ sltu $at, $t1, $t0 -/* B75CEC 800FEB4C 1420001A */ bnez $at, .L800FEBB8 -/* B75CF0 800FEB50 00000000 */ nop -/* B75CF4 800FEB54 3C048015 */ lui $a0, %hi(D_8014AE38) # $a0, 0x8015 -/* B75CF8 800FEB58 2484AE38 */ addiu $a0, %lo(D_8014AE38) # addiu $a0, $a0, -0x51c8 -/* B75CFC 800FEB5C AFA2007C */ sw $v0, 0x7c($sp) -/* B75D00 800FEB60 AFA70024 */ sw $a3, 0x24($sp) -/* B75D04 800FEB64 0C00084C */ jal osSyncPrintf -/* B75D08 800FEB68 AFA80068 */ sw $t0, 0x68($sp) -/* B75D0C 800FEB6C 8FA4007C */ lw $a0, 0x7c($sp) -/* B75D10 800FEB70 8FA80068 */ lw $t0, 0x68($sp) -/* B75D14 800FEB74 8C8A0004 */ lw $t2, 4($a0) -/* B75D18 800FEB78 01485823 */ subu $t3, $t2, $t0 -/* B75D1C 800FEB7C 0C03F723 */ jal ArenaImpl_GetNextBlock -/* B75D20 800FEB80 AC8B0004 */ sw $t3, 4($a0) -/* B75D24 800FEB84 8FA5007C */ lw $a1, 0x7c($sp) -/* B75D28 800FEB88 8FA70024 */ lw $a3, 0x24($sp) -/* B75D2C 800FEB8C 10400003 */ beqz $v0, .L800FEB9C -/* B75D30 800FEB90 8FA80068 */ lw $t0, 0x68($sp) -/* B75D34 800FEB94 00A86021 */ addu $t4, $a1, $t0 -/* B75D38 800FEB98 AC4C000C */ sw $t4, 0xc($v0) -.L800FEB9C: -/* B75D3C 800FEB9C 00A82021 */ addu $a0, $a1, $t0 -/* B75D40 800FEBA0 ACE40008 */ sw $a0, 8($a3) -/* B75D44 800FEBA4 ACF00004 */ sw $s0, 4($a3) -/* B75D48 800FEBA8 0C041A2C */ jal func_801068B0 -/* B75D4C 800FEBAC 24060030 */ li $a2, 48 -/* B75D50 800FEBB0 10000073 */ b .L800FED80 -/* B75D54 800FEBB4 00000000 */ nop -.L800FEBB8: -/* B75D58 800FEBB8 0C00084C */ jal osSyncPrintf -/* B75D5C 800FEBBC AFA70024 */ sw $a3, 0x24($sp) -/* B75D60 800FEBC0 8FA40088 */ lw $a0, 0x88($sp) -/* B75D64 800FEBC4 0C03F8BF */ jal __osMalloc_NoLock -/* B75D68 800FEBC8 02002825 */ move $a1, $s0 -/* B75D6C 800FEBCC 8FA70024 */ lw $a3, 0x24($sp) -/* B75D70 800FEBD0 10400008 */ beqz $v0, .L800FEBF4 -/* B75D74 800FEBD4 00408025 */ move $s0, $v0 -/* B75D78 800FEBD8 8FA4008C */ lw $a0, 0x8c($sp) -/* B75D7C 800FEBDC 00402825 */ move $a1, $v0 -/* B75D80 800FEBE0 0C001BC4 */ jal bcopy -/* B75D84 800FEBE4 8CE60004 */ lw $a2, 4($a3) -/* B75D88 800FEBE8 8FA40088 */ lw $a0, 0x88($sp) -/* B75D8C 800FEBEC 0C03F979 */ jal __osFree_NoLock -/* B75D90 800FEBF0 8FA5008C */ lw $a1, 0x8c($sp) -.L800FEBF4: -/* B75D94 800FEBF4 10000062 */ b .L800FED80 -/* B75D98 800FEBF8 AFB0008C */ sw $s0, 0x8c($sp) -.L800FEBFC: -/* B75D9C 800FEBFC 0203082B */ sltu $at, $s0, $v1 -/* B75DA0 800FEC00 1020005F */ beqz $at, .L800FED80 -/* B75DA4 800FEC04 00E02025 */ move $a0, $a3 -/* B75DA8 800FEC08 0C03F723 */ jal ArenaImpl_GetNextBlock -/* B75DAC 800FEC0C AFA70024 */ sw $a3, 0x24($sp) -/* B75DB0 800FEC10 10400035 */ beqz $v0, .L800FECE8 -/* B75DB4 800FEC14 8FA70024 */ lw $a3, 0x24($sp) -/* B75DB8 800FEC18 844D0002 */ lh $t5, 2($v0) -/* B75DBC 800FEC1C 3C048015 */ lui $a0, %hi(D_8014AEA4) # $a0, 0x8015 -/* B75DC0 800FEC20 2484AEA4 */ addiu $a0, %lo(D_8014AEA4) # addiu $a0, $a0, -0x515c -/* B75DC4 800FEC24 51A00031 */ beql $t5, $zero, .L800FECEC -/* B75DC8 800FEC28 8CF90004 */ lw $t9, 4($a3) -/* B75DCC 800FEC2C AFA2006C */ sw $v0, 0x6c($sp) -/* B75DD0 800FEC30 0C00084C */ jal osSyncPrintf -/* B75DD4 800FEC34 AFA70024 */ sw $a3, 0x24($sp) -/* B75DD8 800FEC38 8FB8006C */ lw $t8, 0x6c($sp) -/* B75DDC 800FEC3C 27A20030 */ addiu $v0, $sp, 0x30 -/* B75DE0 800FEC40 8FA70024 */ lw $a3, 0x24($sp) -/* B75DE4 800FEC44 0040C825 */ move $t9, $v0 -/* B75DE8 800FEC48 27090030 */ addiu $t1, $t8, 0x30 -.L800FEC4C: -/* B75DEC 800FEC4C 8F0F0000 */ lw $t7, ($t8) -/* B75DF0 800FEC50 2718000C */ addiu $t8, $t8, 0xc -/* B75DF4 800FEC54 2739000C */ addiu $t9, $t9, 0xc -/* B75DF8 800FEC58 AF2FFFF4 */ sw $t7, -0xc($t9) -/* B75DFC 800FEC5C 8F0EFFF8 */ lw $t6, -8($t8) -/* B75E00 800FEC60 AF2EFFF8 */ sw $t6, -8($t9) -/* B75E04 800FEC64 8F0FFFFC */ lw $t7, -4($t8) -/* B75E08 800FEC68 1709FFF8 */ bne $t8, $t1, .L800FEC4C -/* B75E0C 800FEC6C AF2FFFFC */ sw $t7, -4($t9) -/* B75E10 800FEC70 260A000F */ addiu $t2, $s0, 0xf -/* B75E14 800FEC74 2401FFF0 */ li $at, -16 -/* B75E18 800FEC78 01415824 */ and $t3, $t2, $at -/* B75E1C 800FEC7C 00EB2021 */ addu $a0, $a3, $t3 -/* B75E20 800FEC80 24840030 */ addiu $a0, $a0, 0x30 -/* B75E24 800FEC84 0080C025 */ move $t8, $a0 -/* B75E28 800FEC88 00404825 */ move $t1, $v0 -/* B75E2C 800FEC8C 24590030 */ addiu $t9, $v0, 0x30 -.L800FEC90: -/* B75E30 800FEC90 8D2D0000 */ lw $t5, ($t1) -/* B75E34 800FEC94 2529000C */ addiu $t1, $t1, 0xc -/* B75E38 800FEC98 2718000C */ addiu $t8, $t8, 0xc -/* B75E3C 800FEC9C AF0DFFF4 */ sw $t5, -0xc($t8) -/* B75E40 800FECA0 8D2CFFF8 */ lw $t4, -8($t1) -/* B75E44 800FECA4 AF0CFFF8 */ sw $t4, -8($t8) -/* B75E48 800FECA8 8D2DFFFC */ lw $t5, -4($t1) -/* B75E4C 800FECAC 1539FFF8 */ bne $t1, $t9, .L800FEC90 -/* B75E50 800FECB0 AF0DFFFC */ sw $t5, -4($t8) -/* B75E54 800FECB4 8C8E0004 */ lw $t6, 4($a0) -/* B75E58 800FECB8 8CEF0004 */ lw $t7, 4($a3) -/* B75E5C 800FECBC 01CF5021 */ addu $t2, $t6, $t7 -/* B75E60 800FECC0 01505823 */ subu $t3, $t2, $s0 -/* B75E64 800FECC4 AC8B0004 */ sw $t3, 4($a0) -/* B75E68 800FECC8 ACE40008 */ sw $a0, 8($a3) -/* B75E6C 800FECCC ACF00004 */ sw $s0, 4($a3) -/* B75E70 800FECD0 0C03F723 */ jal ArenaImpl_GetNextBlock -/* B75E74 800FECD4 AFA40020 */ sw $a0, 0x20($sp) -/* B75E78 800FECD8 10400029 */ beqz $v0, .L800FED80 -/* B75E7C 800FECDC 8FA40020 */ lw $a0, 0x20($sp) -/* B75E80 800FECE0 10000027 */ b .L800FED80 -/* B75E84 800FECE4 AC44000C */ sw $a0, 0xc($v0) -.L800FECE8: -/* B75E88 800FECE8 8CF90004 */ lw $t9, 4($a3) -.L800FECEC: -/* B75E8C 800FECEC 26090030 */ addiu $t1, $s0, 0x30 -/* B75E90 800FECF0 3C048015 */ lui $a0, %hi(D_8014AF18) -/* B75E94 800FECF4 0139082B */ sltu $at, $t1, $t9 -/* B75E98 800FECF8 1020001E */ beqz $at, .L800FED74 -/* B75E9C 800FECFC 00000000 */ nop -/* B75EA0 800FED00 3C048015 */ lui $a0, %hi(D_8014AEDC) # $a0, 0x8015 -/* B75EA4 800FED04 2484AEDC */ addiu $a0, %lo(D_8014AEDC) # addiu $a0, $a0, -0x5124 -/* B75EA8 800FED08 0C00084C */ jal osSyncPrintf -/* B75EAC 800FED0C AFA70024 */ sw $a3, 0x24($sp) -/* B75EB0 800FED10 0C03F723 */ jal ArenaImpl_GetNextBlock -/* B75EB4 800FED14 8FA40024 */ lw $a0, 0x24($sp) -/* B75EB8 800FED18 8FA70024 */ lw $a3, 0x24($sp) -/* B75EBC 800FED1C 2603000F */ addiu $v1, $s0, 0xf -/* B75EC0 800FED20 2401FFF0 */ li $at, -16 -/* B75EC4 800FED24 00611824 */ and $v1, $v1, $at -/* B75EC8 800FED28 24630030 */ addiu $v1, $v1, 0x30 -/* B75ECC 800FED2C 00E32021 */ addu $a0, $a3, $v1 -/* B75ED0 800FED30 AC820008 */ sw $v0, 8($a0) -/* B75ED4 800FED34 AC87000C */ sw $a3, 0xc($a0) -/* B75ED8 800FED38 8CF80004 */ lw $t8, 4($a3) -/* B75EDC 800FED3C 240D0001 */ li $t5, 1 -/* B75EE0 800FED40 240E7373 */ li $t6, 29555 -/* B75EE4 800FED44 03036023 */ subu $t4, $t8, $v1 -/* B75EE8 800FED48 AC8C0004 */ sw $t4, 4($a0) -/* B75EEC 800FED4C A48D0002 */ sh $t5, 2($a0) -/* B75EF0 800FED50 A48E0000 */ sh $t6, ($a0) -/* B75EF4 800FED54 ACE40008 */ sw $a0, 8($a3) -/* B75EF8 800FED58 ACF00004 */ sw $s0, 4($a3) -/* B75EFC 800FED5C 0C03F723 */ jal ArenaImpl_GetNextBlock -/* B75F00 800FED60 AFA40020 */ sw $a0, 0x20($sp) -/* B75F04 800FED64 10400006 */ beqz $v0, .L800FED80 -/* B75F08 800FED68 8FA40020 */ lw $a0, 0x20($sp) -/* B75F0C 800FED6C 10000004 */ b .L800FED80 -/* B75F10 800FED70 AC44000C */ sw $a0, 0xc($v0) -.L800FED74: -/* B75F14 800FED74 0C00084C */ jal osSyncPrintf -/* B75F18 800FED78 2484AF18 */ addiu $a0, %lo(D_8014AF18) -/* B75F1C 800FED7C AFA0008C */ sw $zero, 0x8c($sp) -.L800FED80: -/* B75F20 800FED80 0C03F719 */ jal ArenaImpl_Unlock -/* B75F24 800FED84 8FA40088 */ lw $a0, 0x88($sp) -/* B75F28 800FED88 8FBF001C */ lw $ra, 0x1c($sp) -/* B75F2C 800FED8C 8FA2008C */ lw $v0, 0x8c($sp) -/* B75F30 800FED90 8FB00018 */ lw $s0, 0x18($sp) -/* B75F34 800FED94 03E00008 */ jr $ra -/* B75F38 800FED98 27BD0088 */ addiu $sp, $sp, 0x88 \ No newline at end of file diff --git a/asm/non_matchings/code/code_8006C360/func_8006C360.s b/asm/non_matchings/code/code_8006C360/func_8006C360.s deleted file mode 100644 index af861774b2..0000000000 --- a/asm/non_matchings/code/code_8006C360/func_8006C360.s +++ /dev/null @@ -1,17 +0,0 @@ -glabel func_8006C360 -/* AE3500 8006C360 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* AE3504 8006C364 AFBF0014 */ sw $ra, 0x14($sp) -/* AE3508 8006C368 0C023C20 */ jal func_8008F080 -/* AE350C 8006C36C AFA5001C */ sw $a1, 0x1c($sp) -/* AE3510 8006C370 8FAE001C */ lw $t6, 0x1c($sp) -/* AE3514 8006C374 0002C040 */ sll $t8, $v0, 1 -/* AE3518 8006C378 8FBF0014 */ lw $ra, 0x14($sp) -/* AE351C 8006C37C 000E78C0 */ sll $t7, $t6, 3 -/* AE3520 8006C380 01EE7821 */ addu $t7, $t7, $t6 -/* AE3524 8006C384 000F7840 */ sll $t7, $t7, 1 -/* AE3528 8006C388 01F8C821 */ addu $t9, $t7, $t8 -/* AE352C 8006C38C 3C028012 */ lui $v0, %hi(D_8011F3F0) -/* AE3530 8006C390 00591021 */ addu $v0, $v0, $t9 -/* AE3534 8006C394 9442F3F0 */ lhu $v0, %lo(D_8011F3F0)($v0) -/* AE3538 8006C398 03E00008 */ jr $ra -/* AE353C 8006C39C 27BD0018 */ addiu $sp, $sp, 0x18 \ No newline at end of file diff --git a/asm/non_matchings/code/code_8007BE60/func_8007BE60.s b/asm/non_matchings/code/code_8007BE60/func_8007BE60.s deleted file mode 100644 index beeb6015b1..0000000000 --- a/asm/non_matchings/code/code_8007BE60/func_8007BE60.s +++ /dev/null @@ -1,33 +0,0 @@ -glabel func_8007BE60 -/* AF3000 8007BE60 AC800000 */ sw $zero, ($a0) -/* AF3004 8007BE64 3C0E8000 */ lui $t6, %hi(osResetType) # $t6, 0x8000 -/* AF3008 8007BE68 8DCE030C */ lw $t6, %lo(osResetType)($t6) -/* AF300C 8007BE6C 24180000 */ li $t8, 0 -/* AF3010 8007BE70 24190000 */ li $t9, 0 -/* AF3014 8007BE74 55C00006 */ bnezl $t6, .L8007BE90 -/* AF3018 8007BE78 8C8F0004 */ lw $t7, 4($a0) -/* AF301C 8007BE7C AC800004 */ sw $zero, 4($a0) -/* AF3020 8007BE80 AC980008 */ sw $t8, 8($a0) -/* AF3024 8007BE84 1000000E */ b .L8007BEC0 -/* AF3028 8007BE88 AC99000C */ sw $t9, 0xc($a0) -/* AF302C 8007BE8C 8C8F0004 */ lw $t7, 4($a0) -.L8007BE90: -/* AF3030 8007BE90 8C8B000C */ lw $t3, 0xc($a0) -/* AF3034 8007BE94 8C8D0014 */ lw $t5, 0x14($a0) -/* AF3038 8007BE98 8C8A0008 */ lw $t2, 8($a0) -/* AF303C 8007BE9C 25E80001 */ addiu $t0, $t7, 1 -/* AF3040 8007BEA0 8C8C0010 */ lw $t4, 0x10($a0) -/* AF3044 8007BEA4 016D7821 */ addu $t7, $t3, $t5 -/* AF3048 8007BEA8 01ED082B */ sltu $at, $t7, $t5 -/* AF304C 8007BEAC 002A7021 */ addu $t6, $at, $t2 -/* AF3050 8007BEB0 01CC7021 */ addu $t6, $t6, $t4 -/* AF3054 8007BEB4 AC880004 */ sw $t0, 4($a0) -/* AF3058 8007BEB8 AC8E0008 */ sw $t6, 8($a0) -/* AF305C 8007BEBC AC8F000C */ sw $t7, 0xc($a0) -.L8007BEC0: -/* AF3060 8007BEC0 24180000 */ li $t8, 0 -/* AF3064 8007BEC4 24190000 */ li $t9, 0 -/* AF3068 8007BEC8 AC990014 */ sw $t9, 0x14($a0) -/* AF306C 8007BECC 03E00008 */ jr $ra -/* AF3070 8007BED0 AC980010 */ sw $t8, 0x10($a0) - diff --git a/asm/non_matchings/code/code_8007BF10/func_8007BF10.s b/asm/non_matchings/code/code_8007BF10/func_8007BF10.s deleted file mode 100644 index 658558825d..0000000000 --- a/asm/non_matchings/code/code_8007BF10/func_8007BF10.s +++ /dev/null @@ -1,30 +0,0 @@ -glabel func_8007BF10 -/* AF30B0 8007BF10 27BDFF60 */ addiu $sp, $sp, -0xa0 -/* AF30B4 8007BF14 AFBF0014 */ sw $ra, 0x14($sp) -/* AF30B8 8007BF18 27A40020 */ addiu $a0, $sp, 0x20 -/* AF30BC 8007BF1C 240E0003 */ li $t6, 3 -/* AF30C0 8007BF20 AFA00038 */ sw $zero, 0x38($sp) -/* AF30C4 8007BF24 AFAE0040 */ sw $t6, 0x40($sp) -/* AF30C8 8007BF28 AFA40088 */ sw $a0, 0x88($sp) -/* AF30CC 8007BF2C AFA0008C */ sw $zero, 0x8c($sp) -/* AF30D0 8007BF30 AFA00044 */ sw $zero, 0x44($sp) -/* AF30D4 8007BF34 AFA00048 */ sw $zero, 0x48($sp) -/* AF30D8 8007BF38 27A5001C */ addiu $a1, $sp, 0x1c -/* AF30DC 8007BF3C 0C001874 */ jal osCreateMesgQueue -/* AF30E0 8007BF40 24060001 */ li $a2, 1 -/* AF30E4 8007BF44 3C048016 */ lui $a0, %hi(gSchedContext+0x38) # $a0, 0x8016 -/* AF30E8 8007BF48 248466A0 */ addiu $a0, %lo(gSchedContext+0x38) # addiu $a0, $a0, 0x66a0 -/* AF30EC 8007BF4C 27A50038 */ addiu $a1, $sp, 0x38 -/* AF30F0 8007BF50 0C000C18 */ jal osSendMesg -/* AF30F4 8007BF54 24060001 */ li $a2, 1 -/* AF30F8 8007BF58 3C048016 */ lui $a0, %hi(gSchedContext) # $a0, 0x8016 -/* AF30FC 8007BF5C 0C03257E */ jal func_800C95F8 -/* AF3100 8007BF60 24846668 */ addiu $a0, %lo(gSchedContext) # addiu $a0, $a0, 0x6668 -/* AF3104 8007BF64 27A40020 */ addiu $a0, $sp, 0x20 -/* AF3108 8007BF68 00002825 */ move $a1, $zero -/* AF310C 8007BF6C 0C000CA0 */ jal osRecvMesg -/* AF3110 8007BF70 24060001 */ li $a2, 1 -/* AF3114 8007BF74 8FBF0014 */ lw $ra, 0x14($sp) -/* AF3118 8007BF78 27BD00A0 */ addiu $sp, $sp, 0xa0 -/* AF311C 8007BF7C 03E00008 */ jr $ra -/* AF3120 8007BF80 00000000 */ nop diff --git a/asm/non_matchings/code/code_8007BF90/func_8007C0F8.s b/asm/non_matchings/code/code_8007BF90/func_8007C0F8.s deleted file mode 100644 index cf1b78c994..0000000000 --- a/asm/non_matchings/code/code_8007BF90/func_8007C0F8.s +++ /dev/null @@ -1,52 +0,0 @@ -.late_rodata -glabel D_8013CB80 - .float 0.01 - -.text -glabel func_8007C0F8 -/* AF3298 8007C0F8 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* AF329C 8007C0FC AFBF0014 */ sw $ra, 0x14($sp) -/* AF32A0 8007C100 AFA40038 */ sw $a0, 0x38($sp) -/* AF32A4 8007C104 C4A60000 */ lwc1 $f6, ($a1) -/* AF32A8 8007C108 C4C40000 */ lwc1 $f4, ($a2) -/* AF32AC 8007C10C C4AA0004 */ lwc1 $f10, 4($a1) -/* AF32B0 8007C110 C4C80004 */ lwc1 $f8, 4($a2) -/* AF32B4 8007C114 46062081 */ sub.s $f2, $f4, $f6 -/* AF32B8 8007C118 C4A60008 */ lwc1 $f6, 8($a1) -/* AF32BC 8007C11C C4C40008 */ lwc1 $f4, 8($a2) -/* AF32C0 8007C120 460A4401 */ sub.s $f16, $f8, $f10 -/* AF32C4 8007C124 46021202 */ mul.s $f8, $f2, $f2 -/* AF32C8 8007C128 3C018014 */ lui $at, %hi(D_8013CB80) -/* AF32CC 8007C12C 46062481 */ sub.s $f18, $f4, $f6 -/* AF32D0 8007C130 46108282 */ mul.s $f10, $f16, $f16 -/* AF32D4 8007C134 C42ECB80 */ lwc1 $f14, %lo(D_8013CB80)($at) -/* AF32D8 8007C138 E7B00030 */ swc1 $f16, 0x30($sp) -/* AF32DC 8007C13C 46129182 */ mul.s $f6, $f18, $f18 -/* AF32E0 8007C140 E7B20034 */ swc1 $f18, 0x34($sp) -/* AF32E4 8007C144 E7A2002C */ swc1 $f2, 0x2c($sp) -/* AF32E8 8007C148 460A4100 */ add.s $f4, $f8, $f10 -/* AF32EC 8007C14C 46062000 */ add.s $f0, $f4, $f6 -/* AF32F0 8007C150 0C01F016 */ jal func_8007C058 -/* AF32F4 8007C154 46000304 */ sqrt.s $f12, $f0 -/* AF32F8 8007C158 C7A2002C */ lwc1 $f2, 0x2c($sp) -/* AF32FC 8007C15C C7B00030 */ lwc1 $f16, 0x30($sp) -/* AF3300 8007C160 C7B20034 */ lwc1 $f18, 0x34($sp) -/* AF3304 8007C164 46001203 */ div.s $f8, $f2, $f0 -/* AF3308 8007C168 27AE0020 */ addiu $t6, $sp, 0x20 -/* AF330C 8007C16C 8FA20038 */ lw $v0, 0x38($sp) -/* AF3310 8007C170 46008283 */ div.s $f10, $f16, $f0 -/* AF3314 8007C174 E7A80020 */ swc1 $f8, 0x20($sp) -/* AF3318 8007C178 46009103 */ div.s $f4, $f18, $f0 -/* AF331C 8007C17C E7AA0024 */ swc1 $f10, 0x24($sp) -/* AF3320 8007C180 E7A40028 */ swc1 $f4, 0x28($sp) -/* AF3324 8007C184 8DD80000 */ lw $t8, ($t6) -/* AF3328 8007C188 AC580000 */ sw $t8, ($v0) -/* AF332C 8007C18C 8DCF0004 */ lw $t7, 4($t6) -/* AF3330 8007C190 AC4F0004 */ sw $t7, 4($v0) -/* AF3334 8007C194 8DD80008 */ lw $t8, 8($t6) -/* AF3338 8007C198 AC580008 */ sw $t8, 8($v0) -/* AF333C 8007C19C 8FBF0014 */ lw $ra, 0x14($sp) -/* AF3340 8007C1A0 27BD0038 */ addiu $sp, $sp, 0x38 -/* AF3344 8007C1A4 03E00008 */ jr $ra -/* AF3348 8007C1A8 00000000 */ nop - diff --git a/asm/non_matchings/code/code_8007BF90/func_8007C1AC.s b/asm/non_matchings/code/code_8007BF90/func_8007C1AC.s deleted file mode 100644 index 7d9dbc6616..0000000000 --- a/asm/non_matchings/code/code_8007BF90/func_8007C1AC.s +++ /dev/null @@ -1,46 +0,0 @@ -glabel func_8007C1AC -/* AF334C 8007C1AC 27BDFFC0 */ addiu $sp, $sp, -0x40 -/* AF3350 8007C1B0 AFBF001C */ sw $ra, 0x1c($sp) -/* AF3354 8007C1B4 AFB00018 */ sw $s0, 0x18($sp) -/* AF3358 8007C1B8 AFA40040 */ sw $a0, 0x40($sp) -/* AF335C 8007C1BC 00A08025 */ move $s0, $a1 -/* AF3360 8007C1C0 0C01DE0D */ jal Math_Coss -/* AF3364 8007C1C4 84A40004 */ lh $a0, 4($a1) -/* AF3368 8007C1C8 E7A0002C */ swc1 $f0, 0x2c($sp) -/* AF336C 8007C1CC 0C01DE0D */ jal Math_Coss -/* AF3370 8007C1D0 86040006 */ lh $a0, 6($s0) -/* AF3374 8007C1D4 E7A00024 */ swc1 $f0, 0x24($sp) -/* AF3378 8007C1D8 0C01DE1C */ jal Math_Sins -/* AF337C 8007C1DC 86040004 */ lh $a0, 4($s0) -/* AF3380 8007C1E0 86040006 */ lh $a0, 6($s0) -/* AF3384 8007C1E4 0C01DE1C */ jal Math_Sins -/* AF3388 8007C1E8 E7A00030 */ swc1 $f0, 0x30($sp) -/* AF338C 8007C1EC C7A20030 */ lwc1 $f2, 0x30($sp) -/* AF3390 8007C1F0 C6040000 */ lwc1 $f4, ($s0) -/* AF3394 8007C1F4 C7B0002C */ lwc1 $f16, 0x2c($sp) -/* AF3398 8007C1F8 27AE0034 */ addiu $t6, $sp, 0x34 -/* AF339C 8007C1FC 46022182 */ mul.s $f6, $f4, $f2 -/* AF33A0 8007C200 8FA20040 */ lw $v0, 0x40($sp) -/* AF33A4 8007C204 46003202 */ mul.s $f8, $f6, $f0 -/* AF33A8 8007C208 E7A80034 */ swc1 $f8, 0x34($sp) -/* AF33AC 8007C20C C60A0000 */ lwc1 $f10, ($s0) -/* AF33B0 8007C210 C7A80024 */ lwc1 $f8, 0x24($sp) -/* AF33B4 8007C214 46105482 */ mul.s $f18, $f10, $f16 -/* AF33B8 8007C218 E7B20038 */ swc1 $f18, 0x38($sp) -/* AF33BC 8007C21C C6040000 */ lwc1 $f4, ($s0) -/* AF33C0 8007C220 46022182 */ mul.s $f6, $f4, $f2 -/* AF33C4 8007C224 00000000 */ nop -/* AF33C8 8007C228 46083282 */ mul.s $f10, $f6, $f8 -/* AF33CC 8007C22C E7AA003C */ swc1 $f10, 0x3c($sp) -/* AF33D0 8007C230 8DD80000 */ lw $t8, ($t6) -/* AF33D4 8007C234 AC580000 */ sw $t8, ($v0) -/* AF33D8 8007C238 8DCF0004 */ lw $t7, 4($t6) -/* AF33DC 8007C23C AC4F0004 */ sw $t7, 4($v0) -/* AF33E0 8007C240 8DD80008 */ lw $t8, 8($t6) -/* AF33E4 8007C244 AC580008 */ sw $t8, 8($v0) -/* AF33E8 8007C248 8FBF001C */ lw $ra, 0x1c($sp) -/* AF33EC 8007C24C 8FB00018 */ lw $s0, 0x18($sp) -/* AF33F0 8007C250 27BD0040 */ addiu $sp, $sp, 0x40 -/* AF33F4 8007C254 03E00008 */ jr $ra -/* AF33F8 8007C258 00000000 */ nop - diff --git a/asm/non_matchings/code/code_8007BF90/func_8007C29C.s b/asm/non_matchings/code/code_8007BF90/func_8007C29C.s index 8a5d50b887..340a29b9ce 100644 --- a/asm/non_matchings/code/code_8007BF90/func_8007C29C.s +++ b/asm/non_matchings/code/code_8007BF90/func_8007C29C.s @@ -40,7 +40,7 @@ glabel func_8007C29C /* AF3498 8007C2F8 C4AE0004 */ lwc1 $f14, 4($a1) .L8007C2FC: /* AF349C 8007C2FC E7B00024 */ swc1 $f16, 0x24($sp) -/* AF34A0 8007C300 0C03F494 */ jal func_800FD250 +/* AF34A0 8007C300 0C03F494 */ jal Math_atan2f /* AF34A4 8007C304 AFA50034 */ sw $a1, 0x34($sp) /* AF34A8 8007C308 3C018014 */ lui $at, %hi(D_8013CB84) /* AF34AC 8007C30C C42ACB84 */ lwc1 $f10, %lo(D_8013CB84)($at) @@ -77,7 +77,7 @@ glabel func_8007C29C /* AF3524 8007C384 10000010 */ b .L8007C3C8 /* AF3528 8007C388 A7A0002E */ sh $zero, 0x2e($sp) .L8007C38C: -/* AF352C 8007C38C 0C03F494 */ jal func_800FD250 +/* AF352C 8007C38C 0C03F494 */ jal Math_atan2f /* AF3530 8007C390 C4AE0008 */ lwc1 $f14, 8($a1) /* AF3534 8007C394 3C018014 */ lui $at, %hi(D_8013CB8C) /* AF3538 8007C398 C424CB8C */ lwc1 $f4, %lo(D_8013CB8C)($at) diff --git a/asm/non_matchings/code/code_800A9F30/func_800AA0F0.s b/asm/non_matchings/code/code_800A9F30/func_800AA0F0.s deleted file mode 100644 index 8f65b1511d..0000000000 --- a/asm/non_matchings/code/code_800A9F30/func_800AA0F0.s +++ /dev/null @@ -1,24 +0,0 @@ -glabel func_800AA0F0 -/* B21290 800AA0F0 3C0F8016 */ lui $t7, %hi(gPadMgr+0x460) # $t7, 0x8016 -/* B21294 800AA0F4 8DEF6D20 */ lw $t7, %lo(gPadMgr+0x460)($t7) -/* B21298 800AA0F8 3C0E800B */ lui $t6, %hi(func_800A9F30) # $t6, 0x800b -/* B2129C 800AA0FC 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* B212A0 800AA100 25CE9F30 */ addiu $t6, %lo(func_800A9F30) # addiu $t6, $t6, -0x60d0 -/* B212A4 800AA104 15CF0009 */ bne $t6, $t7, .L800AA12C -/* B212A8 800AA108 AFBF0014 */ sw $ra, 0x14($sp) -/* B212AC 800AA10C 3C188016 */ lui $t8, %hi(gPadMgr+0x464) # $t8, 0x8016 -/* B212B0 800AA110 8F186D24 */ lw $t8, %lo(gPadMgr+0x464)($t8) -/* B212B4 800AA114 3C018016 */ lui $at, %hi(gPadMgr+0x460) # $at, 0x8016 -/* B212B8 800AA118 17000004 */ bnez $t8, .L800AA12C -/* B212BC 800AA11C 00000000 */ nop -/* B212C0 800AA120 AC206D20 */ sw $zero, %lo(gPadMgr+0x460)($at) -/* B212C4 800AA124 3C018016 */ lui $at, %hi(gPadMgr+0x464) # $at, 0x8016 -/* B212C8 800AA128 AC206D24 */ sw $zero, %lo(gPadMgr+0x464)($at) -.L800AA12C: -/* B212CC 800AA12C 3C048016 */ lui $a0, %hi(D_80160FD0) # $a0, 0x8016 -/* B212D0 800AA130 0C034C5E */ jal func_800D3178 -/* B212D4 800AA134 24840FD0 */ addiu $a0, %lo(D_80160FD0) # addiu $a0, $a0, 0xfd0 -/* B212D8 800AA138 8FBF0014 */ lw $ra, 0x14($sp) -/* B212DC 800AA13C 27BD0018 */ addiu $sp, $sp, 0x18 -/* B212E0 800AA140 03E00008 */ jr $ra -/* B212E4 800AA144 00000000 */ nop \ No newline at end of file diff --git a/asm/non_matchings/code/fault/Fault_LogFReg.s b/asm/non_matchings/code/fault/Fault_LogFReg.s deleted file mode 100644 index eab46082ae..0000000000 --- a/asm/non_matchings/code/fault/Fault_LogFReg.s +++ /dev/null @@ -1,61 +0,0 @@ -.rdata - -glabel D_80146E8C - .asciz "F%02d:%14.7e " - .balign 4 -glabel D_80146E9C - .asciz "F%02d: %08x(16) " - .balign 4 - -.text -glabel Fault_LogFReg -/* B4BC40 800D4AA0 3C18FFFA */ lui $t8, (0xFFFA5A5A >> 16) # lui $t8, 0xfffa -/* B4BC44 800D4AA4 03A0C825 */ move $t9, $sp -/* B4BC48 800D4AA8 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* B4BC4C 800D4AAC 37185A5A */ ori $t8, (0xFFFA5A5A & 0xFFFF) # ori $t8, $t8, 0x5a5a -.L800D4AB0: -/* B4BC50 800D4AB0 2739FFF8 */ addiu $t9, $t9, -8 -/* B4BC54 800D4AB4 AF380000 */ sw $t8, ($t9) -/* B4BC58 800D4AB8 173DFFFD */ bne $t9, $sp, .L800D4AB0 -/* B4BC5C 800D4ABC AF380004 */ sw $t8, 4($t9) -/* B4BC60 800D4AC0 AFBF0014 */ sw $ra, 0x14($sp) -/* B4BC64 800D4AC4 AFA40018 */ sw $a0, 0x18($sp) -/* B4BC68 800D4AC8 AFA5001C */ sw $a1, 0x1c($sp) -/* B4BC6C 800D4ACC 8FAE001C */ lw $t6, 0x1c($sp) -/* B4BC70 800D4AD0 3C017F80 */ lui $at, 0x7f80 -/* B4BC74 800D4AD4 8DC60000 */ lw $a2, ($t6) -/* B4BC78 800D4AD8 00C11824 */ and $v1, $a2, $at -/* B4BC7C 800D4ADC 00031DC2 */ srl $v1, $v1, 0x17 -/* B4BC80 800D4AE0 2463FF81 */ addiu $v1, $v1, -0x7f -/* B4BC84 800D4AE4 2861FF82 */ slti $at, $v1, -0x7e -/* B4BC88 800D4AE8 14200004 */ bnez $at, .L800D4AFC -/* B4BC8C 800D4AEC 00C01025 */ move $v0, $a2 -/* B4BC90 800D4AF0 28610080 */ slti $at, $v1, 0x80 -/* B4BC94 800D4AF4 54200004 */ bnezl $at, .L800D4B08 -/* B4BC98 800D4AF8 8FAF001C */ lw $t7, 0x1c($sp) -.L800D4AFC: -/* B4BC9C 800D4AFC 1440000D */ bnez $v0, .L800D4B34 -/* B4BCA0 800D4B00 3C048014 */ lui $a0, %hi(D_80146E9C) -/* B4BCA4 800D4B04 8FAF001C */ lw $t7, 0x1c($sp) -.L800D4B08: -/* B4BCA8 800D4B08 3C048014 */ lui $a0, %hi(D_80146E8C) # $a0, 0x8014 -/* B4BCAC 800D4B0C 24846E8C */ addiu $a0, %lo(D_80146E8C) # addiu $a0, $a0, 0x6e8c -/* B4BCB0 800D4B10 C5E40000 */ lwc1 $f4, ($t7) -/* B4BCB4 800D4B14 8FA50018 */ lw $a1, 0x18($sp) -/* B4BCB8 800D4B18 460021A1 */ cvt.d.s $f6, $f4 -/* B4BCBC 800D4B1C 44073000 */ mfc1 $a3, $f6 -/* B4BCC0 800D4B20 44063800 */ mfc1 $a2, $f7 -/* B4BCC4 800D4B24 0C00084C */ jal osSyncPrintf -/* B4BCC8 800D4B28 00000000 */ nop -/* B4BCCC 800D4B2C 10000005 */ b .L800D4B44 -/* B4BCD0 800D4B30 8FBF0014 */ lw $ra, 0x14($sp) -.L800D4B34: -/* B4BCD4 800D4B34 24846E9C */ addiu $a0, %lo(D_80146E9C) -/* B4BCD8 800D4B38 0C00084C */ jal osSyncPrintf -/* B4BCDC 800D4B3C 8FA50018 */ lw $a1, 0x18($sp) -/* B4BCE0 800D4B40 8FBF0014 */ lw $ra, 0x14($sp) -.L800D4B44: -/* B4BCE4 800D4B44 27BD0018 */ addiu $sp, $sp, 0x18 -/* B4BCE8 800D4B48 03E00008 */ jr $ra -/* B4BCEC 800D4B4C 00000000 */ nop - diff --git a/asm/non_matchings/code/fault/Fault_ProcessClientContext.s b/asm/non_matchings/code/fault/Fault_ProcessClientContext.s deleted file mode 100644 index c0d0df462d..0000000000 --- a/asm/non_matchings/code/fault/Fault_ProcessClientContext.s +++ /dev/null @@ -1,105 +0,0 @@ -glabel Fault_ProcessClientContext -/* B4B1A4 800D4004 3C0DFFFA */ lui $t5, (0xFFFA5A5A >> 16) # lui $t5, 0xfffa -/* B4B1A8 800D4008 03A07025 */ move $t6, $sp -/* B4B1AC 800D400C 27BDFF58 */ addiu $sp, $sp, -0xa8 -/* B4B1B0 800D4010 35AD5A5A */ ori $t5, (0xFFFA5A5A & 0xFFFF) # ori $t5, $t5, 0x5a5a -.L800D4014: -/* B4B1B4 800D4014 25CEFFF8 */ addiu $t6, $t6, -8 -/* B4B1B8 800D4018 ADCD0000 */ sw $t5, ($t6) -/* B4B1BC 800D401C 15DDFFFD */ bne $t6, $sp, .L800D4014 -/* B4B1C0 800D4020 ADCD0004 */ sw $t5, 4($t6) -/* B4B1C4 800D4024 AFBE0050 */ sw $fp, 0x50($sp) -/* B4B1C8 800D4028 AFB00038 */ sw $s0, 0x38($sp) -/* B4B1CC 800D402C 27B00090 */ addiu $s0, $sp, 0x90 -/* B4B1D0 800D4030 03A0F025 */ move $fp, $sp -/* B4B1D4 800D4034 AFBF0054 */ sw $ra, 0x54($sp) -/* B4B1D8 800D4038 AFB5004C */ sw $s5, 0x4c($sp) -/* B4B1DC 800D403C AFB40048 */ sw $s4, 0x48($sp) -/* B4B1E0 800D4040 AFB30044 */ sw $s3, 0x44($sp) -/* B4B1E4 800D4044 AFB20040 */ sw $s2, 0x40($sp) -/* B4B1E8 800D4048 AFB1003C */ sw $s1, 0x3c($sp) -/* B4B1EC 800D404C AFA400A8 */ sw $a0, 0xa8($sp) -/* B4B1F0 800D4050 0000A825 */ move $s5, $zero -/* B4B1F4 800D4054 02002025 */ move $a0, $s0 -/* B4B1F8 800D4058 27C5008C */ addiu $a1, $fp, 0x8c -/* B4B1FC 800D405C 0C001874 */ jal osCreateMesgQueue -/* B4B200 800D4060 24060001 */ li $a2, 1 -/* B4B204 800D4064 8FC700A8 */ lw $a3, 0xa8($fp) -/* B4B208 800D4068 3C0E8017 */ lui $t6, %hi(sFaultStructPtr) # $t6, 0x8017 -/* B4B20C 800D406C 3C06800D */ lui $a2, %hi(Fault_ClientProcessThread) # $a2, 0x800d -/* B4B210 800D4070 ACF00010 */ sw $s0, 0x10($a3) -/* B4B214 800D4074 ACE00014 */ sw $zero, 0x14($a3) -/* B4B218 800D4078 8DCEA800 */ lw $t6, %lo(sFaultStructPtr)($t6) -/* B4B21C 800D407C 24C63F90 */ addiu $a2, %lo(Fault_ClientProcessThread) # addiu $a2, $a2, 0x3f90 -/* B4B220 800D4080 24050002 */ li $a1, 2 -/* B4B224 800D4084 8DC20848 */ lw $v0, 0x848($t6) -/* B4B228 800D4088 240F007E */ li $t7, 126 -/* B4B22C 800D408C 1040000B */ beqz $v0, .L800D40BC -/* B4B230 800D4090 00000000 */ nop -/* B4B234 800D4094 27BDFE50 */ addiu $sp, $sp, -0x1b0 -/* B4B238 800D4098 27B50020 */ addiu $s5, $sp, 0x20 -/* B4B23C 800D409C 02A02025 */ move $a0, $s5 -/* B4B240 800D40A0 AFA20010 */ sw $v0, 0x10($sp) -/* B4B244 800D40A4 0C001154 */ jal osCreateThread -/* B4B248 800D40A8 AFAF0014 */ sw $t7, 0x14($sp) -/* B4B24C 800D40AC 0C0023F0 */ jal osStartThread -/* B4B250 800D40B0 02A02025 */ move $a0, $s5 -/* B4B254 800D40B4 10000003 */ b .L800D40C4 -/* B4B258 800D40B8 00000000 */ nop -.L800D40BC: -/* B4B25C 800D40BC 0C034FE4 */ jal Fault_ClientProcessThread -/* B4B260 800D40C0 00E02025 */ move $a0, $a3 -.L800D40C4: -/* B4B264 800D40C4 3C138017 */ lui $s3, %hi(sFaultIsWaitingForInput) # $s3, 0x8017 -/* B4B268 800D40C8 2673A804 */ addiu $s3, %lo(sFaultIsWaitingForInput) # addiu $s3, $s3, -0x57fc -/* B4B26C 800D40CC 27D40060 */ addiu $s4, $fp, 0x60 -/* B4B270 800D40D0 2412029A */ li $s2, 666 -/* B4B274 800D40D4 27D10088 */ addiu $s1, $fp, 0x88 -/* B4B278 800D40D8 3C0702CB */ lui $a3, (0x02CB4178 >> 16) # lui $a3, 0x2cb -.L800D40DC: -/* B4B27C 800D40DC 24180000 */ li $t8, 0 -/* B4B280 800D40E0 24190000 */ li $t9, 0 -/* B4B284 800D40E4 2408029A */ li $t0, 666 -/* B4B288 800D40E8 AFA8001C */ sw $t0, 0x1c($sp) -/* B4B28C 800D40EC AFB90014 */ sw $t9, 0x14($sp) -/* B4B290 800D40F0 AFB80010 */ sw $t8, 0x10($sp) -/* B4B294 800D40F4 34E74178 */ ori $a3, (0x02CB4178 & 0xFFFF) # ori $a3, $a3, 0x4178 -/* B4B298 800D40F8 02802025 */ move $a0, $s4 -/* B4B29C 800D40FC 24060000 */ li $a2, 0 -/* B4B2A0 800D4100 0C0418B8 */ jal osSetTimer -/* B4B2A4 800D4104 AFB00018 */ sw $s0, 0x18($sp) -/* B4B2A8 800D4108 02002025 */ move $a0, $s0 -/* B4B2AC 800D410C 02202825 */ move $a1, $s1 -/* B4B2B0 800D4110 0C000CA0 */ jal osRecvMesg -/* B4B2B4 800D4114 24060001 */ li $a2, 1 -/* B4B2B8 800D4118 8FC90088 */ lw $t1, 0x88($fp) -/* B4B2BC 800D411C 15320007 */ bne $t1, $s2, .L800D413C -/* B4B2C0 800D4120 00000000 */ nop -/* B4B2C4 800D4124 926A0000 */ lbu $t2, ($s3) -/* B4B2C8 800D4128 5540FFEC */ bnezl $t2, .L800D40DC -/* B4B2CC 800D412C 3C0702CB */ lui $a3, 0x2cb -/* B4B2D0 800D4130 8FCC00A8 */ lw $t4, 0xa8($fp) -/* B4B2D4 800D4134 240BFFFF */ li $t3, -1 -/* B4B2D8 800D4138 AD8B000C */ sw $t3, 0xc($t4) -.L800D413C: -/* B4B2DC 800D413C 0C0408CC */ jal osStopTimer -/* B4B2E0 800D4140 02802025 */ move $a0, $s4 -/* B4B2E4 800D4144 52A00006 */ beql $s5, $zero, .L800D4160 -/* B4B2E8 800D4148 8FDF0054 */ lw $ra, 0x54($fp) -/* B4B2EC 800D414C 0C000C6C */ jal osStopThread -/* B4B2F0 800D4150 02A02025 */ move $a0, $s5 -/* B4B2F4 800D4154 0C0010D0 */ jal osDestroyThread -/* B4B2F8 800D4158 02A02025 */ move $a0, $s5 -/* B4B2FC 800D415C 8FDF0054 */ lw $ra, 0x54($fp) -.L800D4160: -/* B4B300 800D4160 03C0E825 */ move $sp, $fp -/* B4B304 800D4164 8FD00038 */ lw $s0, 0x38($fp) -/* B4B308 800D4168 8FD1003C */ lw $s1, 0x3c($fp) -/* B4B30C 800D416C 8FD20040 */ lw $s2, 0x40($fp) -/* B4B310 800D4170 8FD30044 */ lw $s3, 0x44($fp) -/* B4B314 800D4174 8FD40048 */ lw $s4, 0x48($fp) -/* B4B318 800D4178 8FD5004C */ lw $s5, 0x4c($fp) -/* B4B31C 800D417C 8FDE0050 */ lw $fp, 0x50($fp) -/* B4B320 800D4180 03E00008 */ jr $ra -/* B4B324 800D4184 27BD00A8 */ addiu $sp, $sp, 0xa8 - diff --git a/asm/non_matchings/code/fault_drawer/FaultDrawer_DrawChar.s b/asm/non_matchings/code/fault_drawer/FaultDrawer_DrawChar.s deleted file mode 100644 index 16994afb66..0000000000 --- a/asm/non_matchings/code/fault_drawer/FaultDrawer_DrawChar.s +++ /dev/null @@ -1,102 +0,0 @@ -glabel FaultDrawer_DrawChar -/* B4DA3C 800D689C AFA40000 */ sw $a0, ($sp) -/* B4DA40 800D68A0 3C0C8017 */ lui $t4, %hi(sFaultDrawerStruct) # $t4, 0x8017 -/* B4DA44 800D68A4 258CB680 */ addiu $t4, %lo(sFaultDrawerStruct) # addiu $t4, $t4, -0x4980 -/* B4DA48 800D68A8 308400FF */ andi $a0, $a0, 0xff -/* B4DA4C 800D68AC 95830016 */ lhu $v1, 0x16($t4) -/* B4DA50 800D68B0 95880004 */ lhu $t0, 4($t4) -/* B4DA54 800D68B4 00802825 */ move $a1, $a0 -/* B4DA58 800D68B8 30B80004 */ andi $t8, $a1, 4 -/* B4DA5C 800D68BC 01030019 */ multu $t0, $v1 -/* B4DA60 800D68C0 0018C883 */ sra $t9, $t8, 2 -/* B4DA64 800D68C4 8D980018 */ lw $t8, 0x18($t4) -/* B4DA68 800D68C8 95820014 */ lhu $v0, 0x14($t4) -/* B4DA6C 800D68CC 04A10003 */ bgez $a1, .L800D68DC -/* B4DA70 800D68D0 000570C3 */ sra $t6, $a1, 3 -/* B4DA74 800D68D4 24A10007 */ addiu $at, $a1, 7 -/* B4DA78 800D68D8 000170C3 */ sra $t6, $at, 3 -.L800D68DC: -/* B4DA7C 800D68DC 000E7900 */ sll $t7, $t6, 4 -/* B4DA80 800D68E0 01F96821 */ addu $t5, $t7, $t9 -/* B4DA84 800D68E4 00007812 */ mflo $t7 -/* B4DA88 800D68E8 000D7080 */ sll $t6, $t5, 2 -/* B4DA8C 800D68EC 000FC840 */ sll $t9, $t7, 1 -/* B4DA90 800D68F0 8D8D0000 */ lw $t5, ($t4) -/* B4DA94 800D68F4 958F000C */ lhu $t7, 0xc($t4) -/* B4DA98 800D68F8 030E3021 */ addu $a2, $t8, $t6 -/* B4DA9C 800D68FC 00027040 */ sll $t6, $v0, 1 -/* B4DAA0 800D6900 032DC021 */ addu $t8, $t9, $t5 -/* B4DAA4 800D6904 004F082A */ slt $at, $v0, $t7 -/* B4DAA8 800D6908 1420003E */ bnez $at, .L800D6A04 -/* B4DAAC 800D690C 030E3821 */ addu $a3, $t8, $t6 -/* B4DAB0 800D6910 9184001C */ lbu $a0, 0x1c($t4) -/* B4DAB4 800D6914 9599000E */ lhu $t9, 0xe($t4) -/* B4DAB8 800D6918 00826821 */ addu $t5, $a0, $v0 -/* B4DABC 800D691C 25B8FFFF */ addiu $t8, $t5, -1 -/* B4DAC0 800D6920 0338082A */ slt $at, $t9, $t8 -/* B4DAC4 800D6924 14200037 */ bnez $at, .L800D6A04 -/* B4DAC8 800D6928 00000000 */ nop -/* B4DACC 800D692C 958E0008 */ lhu $t6, 8($t4) -/* B4DAD0 800D6930 006E082A */ slt $at, $v1, $t6 -/* B4DAD4 800D6934 14200033 */ bnez $at, .L800D6A04 -/* B4DAD8 800D6938 00000000 */ nop -/* B4DADC 800D693C 9182001D */ lbu $v0, 0x1d($t4) -/* B4DAE0 800D6940 958F000A */ lhu $t7, 0xa($t4) -/* B4DAE4 800D6944 00436821 */ addu $t5, $v0, $v1 -/* B4DAE8 800D6948 25B9FFFF */ addiu $t9, $t5, -1 -/* B4DAEC 800D694C 01F9082A */ slt $at, $t7, $t9 -/* B4DAF0 800D6950 1420002C */ bnez $at, .L800D6A04 -/* B4DAF4 800D6954 00000000 */ nop -/* B4DAF8 800D6958 1840002A */ blez $v0, .L800D6A04 -/* B4DAFC 800D695C 00001825 */ move $v1, $zero -/* B4DB00 800D6960 04A10004 */ bgez $a1, .L800D6974 -/* B4DB04 800D6964 30B80003 */ andi $t8, $a1, 3 -/* B4DB08 800D6968 13000002 */ beqz $t8, .L800D6974 -/* B4DB0C 800D696C 00000000 */ nop -/* B4DB10 800D6970 2718FFFC */ addiu $t8, $t8, -4 -.L800D6974: -/* B4DB14 800D6974 3C0E1000 */ lui $t6, 0x1000 -/* B4DB18 800D6978 030E5804 */ sllv $t3, $t6, $t8 -/* B4DB1C 800D697C 01602825 */ move $a1, $t3 -.L800D6980: -/* B4DB20 800D6980 8CC90000 */ lw $t1, ($a2) -/* B4DB24 800D6984 18800018 */ blez $a0, .L800D69E8 -/* B4DB28 800D6988 00005025 */ move $t2, $zero -.L800D698C: -/* B4DB2C 800D698C 00A96824 */ and $t5, $a1, $t1 -/* B4DB30 800D6990 51A00008 */ beql $t5, $zero, .L800D69B4 -/* B4DB34 800D6994 95820012 */ lhu $v0, 0x12($t4) -/* B4DB38 800D6998 958F0010 */ lhu $t7, 0x10($t4) -/* B4DB3C 800D699C 000AC840 */ sll $t9, $t2, 1 -/* B4DB40 800D69A0 00F97021 */ addu $t6, $a3, $t9 -/* B4DB44 800D69A4 A5CF0000 */ sh $t7, ($t6) -/* B4DB48 800D69A8 10000009 */ b .L800D69D0 -/* B4DB4C 800D69AC 9184001C */ lbu $a0, 0x1c($t4) -/* B4DB50 800D69B0 95820012 */ lhu $v0, 0x12($t4) -.L800D69B4: -/* B4DB54 800D69B4 000A6840 */ sll $t5, $t2, 1 -/* B4DB58 800D69B8 00EDC821 */ addu $t9, $a3, $t5 -/* B4DB5C 800D69BC 30580001 */ andi $t8, $v0, 1 -/* B4DB60 800D69C0 53000004 */ beql $t8, $zero, .L800D69D4 -/* B4DB64 800D69C4 254A0001 */ addiu $t2, $t2, 1 -/* B4DB68 800D69C8 A7220000 */ sh $v0, ($t9) -/* B4DB6C 800D69CC 9184001C */ lbu $a0, 0x1c($t4) -.L800D69D0: -/* B4DB70 800D69D0 254A0001 */ addiu $t2, $t2, 1 -.L800D69D4: -/* B4DB74 800D69D4 0144082A */ slt $at, $t2, $a0 -/* B4DB78 800D69D8 1420FFEC */ bnez $at, .L800D698C -/* B4DB7C 800D69DC 00052902 */ srl $a1, $a1, 4 -/* B4DB80 800D69E0 95880004 */ lhu $t0, 4($t4) -/* B4DB84 800D69E4 9182001D */ lbu $v0, 0x1d($t4) -.L800D69E8: -/* B4DB88 800D69E8 00087840 */ sll $t7, $t0, 1 -/* B4DB8C 800D69EC 00EF3821 */ addu $a3, $a3, $t7 -/* B4DB90 800D69F0 24C60008 */ addiu $a2, $a2, 8 -/* B4DB94 800D69F4 24630001 */ addiu $v1, $v1, 1 -/* B4DB98 800D69F8 0062082A */ slt $at, $v1, $v0 -/* B4DB9C 800D69FC 5420FFE0 */ bnezl $at, .L800D6980 -/* B4DBA0 800D6A00 01602825 */ move $a1, $t3 -.L800D6A04: -/* B4DBA4 800D6A04 03E00008 */ jr $ra -/* B4DBA8 800D6A08 00000000 */ nop \ No newline at end of file diff --git a/asm/non_matchings/code/fault_drawer/FaultDrawer_DrawRecImpl.s b/asm/non_matchings/code/fault_drawer/FaultDrawer_DrawRecImpl.s deleted file mode 100644 index a0b2f6c39f..0000000000 --- a/asm/non_matchings/code/fault_drawer/FaultDrawer_DrawRecImpl.s +++ /dev/null @@ -1,82 +0,0 @@ -glabel FaultDrawer_DrawRecImpl -/* B4D920 800D6780 3C0EFFFA */ lui $t6, (0xFFFA5A5A >> 16) # lui $t6, 0xfffa -/* B4D924 800D6784 03A07825 */ move $t7, $sp -/* B4D928 800D6788 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* B4D92C 800D678C 35CE5A5A */ ori $t6, (0xFFFA5A5A & 0xFFFF) # ori $t6, $t6, 0x5a5a -.L800D6790: -/* B4D930 800D6790 25EFFFF8 */ addiu $t7, $t7, -8 -/* B4D934 800D6794 ADEE0000 */ sw $t6, ($t7) -/* B4D938 800D6798 15FDFFFD */ bne $t7, $sp, .L800D6790 -/* B4D93C 800D679C ADEE0004 */ sw $t6, 4($t7) -/* B4D940 800D67A0 3C0D8017 */ lui $t5, %hi(sFaultDrawerStruct) # $t5, 0x8017 -/* B4D944 800D67A4 25ADB680 */ addiu $t5, %lo(sFaultDrawerStruct) # addiu $t5, $t5, -0x4980 -/* B4D948 800D67A8 AFBF0014 */ sw $ra, 0x14($sp) -/* B4D94C 800D67AC 95A90004 */ lhu $t1, 4($t5) -/* B4D950 800D67B0 95AE0006 */ lhu $t6, 6($t5) -/* B4D954 800D67B4 00C41823 */ subu $v1, $a2, $a0 -/* B4D958 800D67B8 00E55823 */ subu $t3, $a3, $a1 -/* B4D95C 800D67BC 24630001 */ addiu $v1, $v1, 1 -/* B4D960 800D67C0 256B0001 */ addiu $t3, $t3, 1 -/* B4D964 800D67C4 01241023 */ subu $v0, $t1, $a0 -/* B4D968 800D67C8 00604025 */ move $t0, $v1 -/* B4D96C 800D67CC 01605025 */ move $t2, $t3 -/* B4D970 800D67D0 1840002E */ blez $v0, .L800D688C -/* B4D974 800D67D4 01C56023 */ subu $t4, $t6, $a1 -/* B4D978 800D67D8 1980002C */ blez $t4, .L800D688C -/* B4D97C 800D67DC 0043082A */ slt $at, $v0, $v1 -/* B4D980 800D67E0 50200003 */ beql $at, $zero, .L800D67F0 -/* B4D984 800D67E4 018B082A */ slt $at, $t4, $t3 -/* B4D988 800D67E8 00404025 */ move $t0, $v0 -/* B4D98C 800D67EC 018B082A */ slt $at, $t4, $t3 -.L800D67F0: -/* B4D990 800D67F0 10200002 */ beqz $at, .L800D67FC -/* B4D994 800D67F4 00000000 */ nop -/* B4D998 800D67F8 01805025 */ move $t2, $t4 -.L800D67FC: -/* B4D99C 800D67FC 01250019 */ multu $t1, $a1 -/* B4D9A0 800D6800 8DB90000 */ lw $t9, ($t5) -/* B4D9A4 800D6804 00003825 */ move $a3, $zero -/* B4D9A8 800D6808 00007812 */ mflo $t7 -/* B4D9AC 800D680C 000FC040 */ sll $t8, $t7, 1 -/* B4D9B0 800D6810 00047840 */ sll $t7, $a0, 1 -/* B4D9B4 800D6814 03197021 */ addu $t6, $t8, $t9 -/* B4D9B8 800D6818 1940001A */ blez $t2, .L800D6884 -/* B4D9BC 800D681C 01CF1021 */ addu $v0, $t6, $t7 -/* B4D9C0 800D6820 97A4002A */ lhu $a0, 0x2a($sp) -.L800D6824: -/* B4D9C4 800D6824 19000012 */ blez $t0, .L800D6870 -/* B4D9C8 800D6828 00001825 */ move $v1, $zero -/* B4D9CC 800D682C 31060003 */ andi $a2, $t0, 3 -/* B4D9D0 800D6830 10C00007 */ beqz $a2, .L800D6850 -/* B4D9D4 800D6834 3C098017 */ lui $t1, %hi(sFaultDrawerStruct+4) # $t1, 0x8017 -/* B4D9D8 800D6838 00C02825 */ move $a1, $a2 -.L800D683C: -/* B4D9DC 800D683C 24630001 */ addiu $v1, $v1, 1 -/* B4D9E0 800D6840 A4440000 */ sh $a0, ($v0) -/* B4D9E4 800D6844 14A3FFFD */ bne $a1, $v1, .L800D683C -/* B4D9E8 800D6848 24420002 */ addiu $v0, $v0, 2 -/* B4D9EC 800D684C 10680007 */ beq $v1, $t0, .L800D686C -.L800D6850: -/* B4D9F0 800D6850 24630004 */ addiu $v1, $v1, 4 -/* B4D9F4 800D6854 A4440002 */ sh $a0, 2($v0) -/* B4D9F8 800D6858 A4440004 */ sh $a0, 4($v0) -/* B4D9FC 800D685C A4440006 */ sh $a0, 6($v0) -/* B4DA00 800D6860 24420008 */ addiu $v0, $v0, 8 -/* B4DA04 800D6864 1468FFFA */ bne $v1, $t0, .L800D6850 -/* B4DA08 800D6868 A444FFF8 */ sh $a0, -8($v0) -.L800D686C: -/* B4DA0C 800D686C 9529B684 */ lhu $t1, %lo(sFaultDrawerStruct+4)($t1) -.L800D6870: -/* B4DA10 800D6870 0128C023 */ subu $t8, $t1, $t0 -/* B4DA14 800D6874 24E70001 */ addiu $a3, $a3, 1 -/* B4DA18 800D6878 0018C840 */ sll $t9, $t8, 1 -/* B4DA1C 800D687C 14EAFFE9 */ bne $a3, $t2, .L800D6824 -/* B4DA20 800D6880 00591021 */ addu $v0, $v0, $t9 -.L800D6884: -/* B4DA24 800D6884 0C041924 */ jal osWritebackDCacheAll -/* B4DA28 800D6888 00000000 */ nop -.L800D688C: -/* B4DA2C 800D688C 8FBF0014 */ lw $ra, 0x14($sp) -/* B4DA30 800D6890 27BD0018 */ addiu $sp, $sp, 0x18 -/* B4DA34 800D6894 03E00008 */ jr $ra -/* B4DA38 800D6898 00000000 */ nop \ No newline at end of file diff --git a/asm/non_matchings/code/fault_drawer/FaultDrawer_FormatStringFunc.s b/asm/non_matchings/code/fault_drawer/FaultDrawer_FormatStringFunc.s deleted file mode 100644 index 35f0091e78..0000000000 --- a/asm/non_matchings/code/fault_drawer/FaultDrawer_FormatStringFunc.s +++ /dev/null @@ -1,157 +0,0 @@ -.rdata - - -glabel D_80147998 - .asciz "\n" - .balign 4 -glabel D_8014799C - .asciz "%c" - .balign 4 - -.text -glabel FaultDrawer_FormatStringFunc -/* B4DF8C 800D6DEC 3C09FFFA */ lui $t1, (0xFFFA5A5A >> 16) # lui $t1, 0xfffa -/* B4DF90 800D6DF0 03A05025 */ move $t2, $sp -/* B4DF94 800D6DF4 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* B4DF98 800D6DF8 35295A5A */ ori $t1, (0xFFFA5A5A & 0xFFFF) # ori $t1, $t1, 0x5a5a -.L800D6DFC: -/* B4DF9C 800D6DFC 254AFFF8 */ addiu $t2, $t2, -8 -/* B4DFA0 800D6E00 AD490000 */ sw $t1, ($t2) -/* B4DFA4 800D6E04 155DFFFD */ bne $t2, $sp, .L800D6DFC -/* B4DFA8 800D6E08 AD490004 */ sw $t1, 4($t2) -/* B4DFAC 800D6E0C AFB2001C */ sw $s2, 0x1c($sp) -/* B4DFB0 800D6E10 AFB10018 */ sw $s1, 0x18($sp) -/* B4DFB4 800D6E14 00A08825 */ move $s1, $a1 -/* B4DFB8 800D6E18 00C09025 */ move $s2, $a2 -/* B4DFBC 800D6E1C AFBF0034 */ sw $ra, 0x34($sp) -/* B4DFC0 800D6E20 AFB70030 */ sw $s7, 0x30($sp) -/* B4DFC4 800D6E24 AFB6002C */ sw $s6, 0x2c($sp) -/* B4DFC8 800D6E28 AFB50028 */ sw $s5, 0x28($sp) -/* B4DFCC 800D6E2C AFB40024 */ sw $s4, 0x24($sp) -/* B4DFD0 800D6E30 AFB30020 */ sw $s3, 0x20($sp) -/* B4DFD4 800D6E34 AFB00014 */ sw $s0, 0x14($sp) -/* B4DFD8 800D6E38 AFA40038 */ sw $a0, 0x38($sp) -/* B4DFDC 800D6E3C 12400060 */ beqz $s2, .L800D6FC0 -/* B4DFE0 800D6E40 3C178014 */ lui $s7, %hi(D_80147998) # $s7, 0x8014 -/* B4DFE4 800D6E44 3C158014 */ lui $s5, %hi(D_8014799C) # $s5, 0x8014 -/* B4DFE8 800D6E48 3C108017 */ lui $s0, %hi(sFaultDrawerStruct) # $s0, 0x8017 -/* B4DFEC 800D6E4C 2610B680 */ addiu $s0, %lo(sFaultDrawerStruct) # addiu $s0, $s0, -0x4980 -/* B4DFF0 800D6E50 26B5799C */ addiu $s5, %lo(D_8014799C) # addiu $s5, $s5, 0x799c -/* B4DFF4 800D6E54 26F77998 */ addiu $s7, %lo(D_80147998) # addiu $s7, $s7, 0x7998 -/* B4DFF8 800D6E58 24160001 */ li $s6, 1 -/* B4DFFC 800D6E5C 2414001A */ li $s4, 26 -/* B4E000 800D6E60 2413000A */ li $s3, 10 -.L800D6E64: -/* B4E004 800D6E64 920E0034 */ lbu $t6, 0x34($s0) -/* B4E008 800D6E68 51C00011 */ beql $t6, $zero, .L800D6EB0 -/* B4E00C 800D6E6C 92240000 */ lbu $a0, ($s1) -/* B4E010 800D6E70 A2000034 */ sb $zero, 0x34($s0) -/* B4E014 800D6E74 92250000 */ lbu $a1, ($s1) -/* B4E018 800D6E78 28A10031 */ slti $at, $a1, 0x31 -/* B4E01C 800D6E7C 14200006 */ bnez $at, .L800D6E98 -/* B4E020 800D6E80 28A1003A */ slti $at, $a1, 0x3a -/* B4E024 800D6E84 10200004 */ beqz $at, .L800D6E98 -/* B4E028 800D6E88 00057840 */ sll $t7, $a1, 1 -/* B4E02C 800D6E8C 020FC021 */ addu $t8, $s0, $t7 -/* B4E030 800D6E90 0C035AD7 */ jal FaultDrawer_SetForeColor -/* B4E034 800D6E94 9704FFC0 */ lhu $a0, -0x40($t8) -.L800D6E98: -/* B4E038 800D6E98 9619000E */ lhu $t9, 0xe($s0) -/* B4E03C 800D6E9C 9208001C */ lbu $t0, 0x1c($s0) -/* B4E040 800D6EA0 96030014 */ lhu $v1, 0x14($s0) -/* B4E044 800D6EA4 1000002A */ b .L800D6F50 -/* B4E048 800D6EA8 03282023 */ subu $a0, $t9, $t0 -/* B4E04C 800D6EAC 92240000 */ lbu $a0, ($s1) -.L800D6EB0: -/* B4E050 800D6EB0 10930005 */ beq $a0, $s3, .L800D6EC8 -/* B4E054 800D6EB4 00802825 */ move $a1, $a0 -/* B4E058 800D6EB8 50940010 */ beql $a0, $s4, .L800D6EFC -/* B4E05C 800D6EBC 960D000E */ lhu $t5, 0xe($s0) -/* B4E060 800D6EC0 10000013 */ b .L800D6F10 -/* B4E064 800D6EC4 92020035 */ lbu $v0, 0x35($s0) -.L800D6EC8: -/* B4E068 800D6EC8 92090035 */ lbu $t1, 0x35($s0) -/* B4E06C 800D6ECC 51200004 */ beql $t1, $zero, .L800D6EE0 -/* B4E070 800D6ED0 960A0004 */ lhu $t2, 4($s0) -/* B4E074 800D6ED4 0C00084C */ jal osSyncPrintf -/* B4E078 800D6ED8 02E02025 */ move $a0, $s7 -/* B4E07C 800D6EDC 960A0004 */ lhu $t2, 4($s0) -.L800D6EE0: -/* B4E080 800D6EE0 960B000E */ lhu $t3, 0xe($s0) -/* B4E084 800D6EE4 920C001C */ lbu $t4, 0x1c($s0) -/* B4E088 800D6EE8 A60A0014 */ sh $t2, 0x14($s0) -/* B4E08C 800D6EEC 3143FFFF */ andi $v1, $t2, 0xffff -/* B4E090 800D6EF0 10000017 */ b .L800D6F50 -/* B4E094 800D6EF4 016C2023 */ subu $a0, $t3, $t4 -/* B4E098 800D6EF8 960D000E */ lhu $t5, 0xe($s0) -.L800D6EFC: -/* B4E09C 800D6EFC 920E001C */ lbu $t6, 0x1c($s0) -/* B4E0A0 800D6F00 A2160034 */ sb $s6, 0x34($s0) -/* B4E0A4 800D6F04 96030014 */ lhu $v1, 0x14($s0) -/* B4E0A8 800D6F08 10000011 */ b .L800D6F50 -/* B4E0AC 800D6F0C 01AE2023 */ subu $a0, $t5, $t6 -.L800D6F10: -/* B4E0B0 800D6F10 10400004 */ beqz $v0, .L800D6F24 -/* B4E0B4 800D6F14 00000000 */ nop -/* B4E0B8 800D6F18 0C00084C */ jal osSyncPrintf -/* B4E0BC 800D6F1C 02A02025 */ move $a0, $s5 -/* B4E0C0 800D6F20 92240000 */ lbu $a0, ($s1) -.L800D6F24: -/* B4E0C4 800D6F24 0C035A27 */ jal FaultDrawer_DrawChar -/* B4E0C8 800D6F28 00000000 */ nop -/* B4E0CC 800D6F2C 9202001C */ lbu $v0, 0x1c($s0) -/* B4E0D0 800D6F30 960F0014 */ lhu $t7, 0x14($s0) -/* B4E0D4 800D6F34 8219001E */ lb $t9, 0x1e($s0) -/* B4E0D8 800D6F38 9609000E */ lhu $t1, 0xe($s0) -/* B4E0DC 800D6F3C 01E2C021 */ addu $t8, $t7, $v0 -/* B4E0E0 800D6F40 03194021 */ addu $t0, $t8, $t9 -/* B4E0E4 800D6F44 A6080014 */ sh $t0, 0x14($s0) -/* B4E0E8 800D6F48 3103FFFF */ andi $v1, $t0, 0xffff -/* B4E0EC 800D6F4C 01222023 */ subu $a0, $t1, $v0 -.L800D6F50: -/* B4E0F0 800D6F50 0064082A */ slt $at, $v1, $a0 -/* B4E0F4 800D6F54 54200018 */ bnezl $at, .L800D6FB8 -/* B4E0F8 800D6F58 2652FFFF */ addiu $s2, $s2, -1 -/* B4E0FC 800D6F5C 9202001D */ lbu $v0, 0x1d($s0) -/* B4E100 800D6F60 960B0016 */ lhu $t3, 0x16($s0) -/* B4E104 800D6F64 820D001F */ lb $t5, 0x1f($s0) -/* B4E108 800D6F68 9618000A */ lhu $t8, 0xa($s0) -/* B4E10C 800D6F6C 01626021 */ addu $t4, $t3, $v0 -/* B4E110 800D6F70 018D7021 */ addu $t6, $t4, $t5 -/* B4E114 800D6F74 960A000C */ lhu $t2, 0xc($s0) -/* B4E118 800D6F78 31CFFFFF */ andi $t7, $t6, 0xffff -/* B4E11C 800D6F7C 0302C823 */ subu $t9, $t8, $v0 -/* B4E120 800D6F80 01F9082A */ slt $at, $t7, $t9 -/* B4E124 800D6F84 A60E0016 */ sh $t6, 0x16($s0) -/* B4E128 800D6F88 1420000A */ bnez $at, .L800D6FB4 -/* B4E12C 800D6F8C A60A0014 */ sh $t2, 0x14($s0) -/* B4E130 800D6F90 8E020038 */ lw $v0, 0x38($s0) -/* B4E134 800D6F94 50400006 */ beql $v0, $zero, .L800D6FB0 -/* B4E138 800D6F98 96080008 */ lhu $t0, 8($s0) -/* B4E13C 800D6F9C 0040F809 */ jalr $v0 -/* B4E140 800D6FA0 00000000 */ nop -/* B4E144 800D6FA4 0C035B57 */ jal FaultDrawer_FillScreen -/* B4E148 800D6FA8 00000000 */ nop -/* B4E14C 800D6FAC 96080008 */ lhu $t0, 8($s0) -.L800D6FB0: -/* B4E150 800D6FB0 A6080016 */ sh $t0, 0x16($s0) -.L800D6FB4: -/* B4E154 800D6FB4 2652FFFF */ addiu $s2, $s2, -1 -.L800D6FB8: -/* B4E158 800D6FB8 1640FFAA */ bnez $s2, .L800D6E64 -/* B4E15C 800D6FBC 26310001 */ addiu $s1, $s1, 1 -.L800D6FC0: -/* B4E160 800D6FC0 0C041924 */ jal osWritebackDCacheAll -/* B4E164 800D6FC4 00000000 */ nop -/* B4E168 800D6FC8 8FA20038 */ lw $v0, 0x38($sp) -/* B4E16C 800D6FCC 8FBF0034 */ lw $ra, 0x34($sp) -/* B4E170 800D6FD0 8FB00014 */ lw $s0, 0x14($sp) -/* B4E174 800D6FD4 8FB10018 */ lw $s1, 0x18($sp) -/* B4E178 800D6FD8 8FB2001C */ lw $s2, 0x1c($sp) -/* B4E17C 800D6FDC 8FB30020 */ lw $s3, 0x20($sp) -/* B4E180 800D6FE0 8FB40024 */ lw $s4, 0x24($sp) -/* B4E184 800D6FE4 8FB50028 */ lw $s5, 0x28($sp) -/* B4E188 800D6FE8 8FB6002C */ lw $s6, 0x2c($sp) -/* B4E18C 800D6FEC 8FB70030 */ lw $s7, 0x30($sp) -/* B4E190 800D6FF0 03E00008 */ jr $ra -/* B4E194 800D6FF4 27BD0038 */ addiu $sp, $sp, 0x38 \ No newline at end of file diff --git a/asm/non_matchings/code/flg_set/func_8002AAB0.s b/asm/non_matchings/code/flg_set/func_8002AAB0.s index 3041f253bc..a898bd350a 100644 --- a/asm/non_matchings/code/flg_set/func_8002AAB0.s +++ b/asm/non_matchings/code/flg_set/func_8002AAB0.s @@ -153,11 +153,11 @@ glabel func_8002AAB0 /* AA1CA8 8002AB08 27A40074 */ addiu $a0, $sp, 0x74 /* AA1CAC 8002AB0C 24070083 */ li $a3, 131 /* AA1CB0 8002AB10 8D650000 */ lw $a1, ($t3) -/* AA1CB4 8002AB14 0C031AB1 */ jal func_800C6AC4 +/* AA1CB4 8002AB14 0C031AB1 */ jal Graph_OpenDisps /* AA1CB8 8002AB18 AFA50094 */ sw $a1, 0x94($sp) /* AA1CBC 8002AB1C 8FAC0094 */ lw $t4, 0x94($sp) /* AA1CC0 8002AB20 8D8402C0 */ lw $a0, 0x2c0($t4) -/* AA1CC4 8002AB24 0C031B08 */ jal func_800C6C20 +/* AA1CC4 8002AB24 0C031B08 */ jal Graph_GfxPlusOne /* AA1CC8 8002AB28 AFA40088 */ sw $a0, 0x88($sp) /* AA1CCC 8002AB2C 8FA60094 */ lw $a2, 0x94($sp) /* AA1CD0 8002AB30 3C0ADE00 */ lui $t2, 0xde00 @@ -394,7 +394,7 @@ glabel func_8002AAB0 /* AA2024 8002AE84 24A50008 */ addiu $a1, $a1, 8 /* AA2028 8002AE88 AFA5008C */ sw $a1, 0x8c($sp) /* AA202C 8002AE8C 8FA40088 */ lw $a0, 0x88($sp) -/* AA2030 8002AE90 0C031B0A */ jal func_800C6C28 +/* AA2030 8002AE90 0C031B0A */ jal Graph_BranchDlist /* AA2034 8002AE94 AFA70034 */ sw $a3, 0x34($sp) /* AA2038 8002AE98 8FA5008C */ lw $a1, 0x8c($sp) /* AA203C 8002AE9C 8FAA0094 */ lw $t2, 0x94($sp) @@ -413,7 +413,7 @@ glabel func_8002AAB0 /* AA2070 8002AED0 A4200936 */ sh $zero, 0x936($at) .L8002AED4: /* AA2074 8002AED4 8FA50094 */ lw $a1, 0x94($sp) -/* AA2078 8002AED8 0C031AD5 */ jal func_800C6B54 +/* AA2078 8002AED8 0C031AD5 */ jal Graph_CloseDisps /* AA207C 8002AEDC 240700F1 */ li $a3, 241 /* AA2080 8002AEE0 8FBF0024 */ lw $ra, 0x24($sp) /* AA2084 8002AEE4 8FB00020 */ lw $s0, 0x20($sp) diff --git a/asm/non_matchings/code/gfxprint/GfxPrint_PrintChar.s b/asm/non_matchings/code/gfxprint/GfxPrint_PrintChar.s deleted file mode 100644 index a82d3e066b..0000000000 --- a/asm/non_matchings/code/gfxprint/GfxPrint_PrintChar.s +++ /dev/null @@ -1,142 +0,0 @@ -.late_rodata -glabel jtbl_8014A6F0 - .word L800FBA84 - .word L800FBA6C - .word L800FBA5C - .word L800FBA4C - .word L800FBA98 - -.text - -glabel GfxPrint_PrintChar -/* B72A8C 800FB8EC 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* B72A90 800FB8F0 AFA50024 */ sw $a1, 0x24($sp) -/* B72A94 800FB8F4 30A500FF */ andi $a1, $a1, 0xff -/* B72A98 800FB8F8 AFB00018 */ sw $s0, 0x18($sp) -/* B72A9C 800FB8FC 24010020 */ li $at, 32 -/* B72AA0 800FB900 00808025 */ move $s0, $a0 -/* B72AA4 800FB904 AFBF001C */ sw $ra, 0x1c($sp) -/* B72AA8 800FB908 30A600FF */ andi $a2, $a1, 0xff -/* B72AAC 800FB90C 14A10005 */ bne $a1, $at, .L800FB924 -/* B72AB0 800FB910 00A01025 */ move $v0, $a1 -/* B72AB4 800FB914 948E0008 */ lhu $t6, 8($a0) -/* B72AB8 800FB918 25CF0020 */ addiu $t7, $t6, 0x20 -/* B72ABC 800FB91C 1000005E */ b .L800FBA98 -/* B72AC0 800FB920 A48F0008 */ sh $t7, 8($a0) -.L800FB924: -/* B72AC4 800FB924 28410021 */ slti $at, $v0, 0x21 -/* B72AC8 800FB928 14200007 */ bnez $at, .L800FB948 -/* B72ACC 800FB92C 2841007F */ slti $at, $v0, 0x7f -/* B72AD0 800FB930 50200006 */ beql $at, $zero, .L800FB94C -/* B72AD4 800FB934 284100A0 */ slti $at, $v0, 0xa0 -/* B72AD8 800FB938 0C03ED16 */ jal GfxPrint_PrintCharImpl -/* B72ADC 800FB93C 02002025 */ move $a0, $s0 -/* B72AE0 800FB940 10000056 */ b .L800FBA9C -/* B72AE4 800FB944 8FBF001C */ lw $ra, 0x1c($sp) -.L800FB948: -/* B72AE8 800FB948 284100A0 */ slti $at, $v0, 0xa0 -.L800FB94C: -/* B72AEC 800FB94C 14200012 */ bnez $at, .L800FB998 -/* B72AF0 800FB950 284100E0 */ slti $at, $v0, 0xe0 -/* B72AF4 800FB954 10200010 */ beqz $at, .L800FB998 -/* B72AF8 800FB958 02002025 */ move $a0, $s0 -/* B72AFC 800FB95C 9218000F */ lbu $t8, 0xf($s0) -/* B72B00 800FB960 284100C0 */ slti $at, $v0, 0xc0 -/* B72B04 800FB964 33190001 */ andi $t9, $t8, 1 -/* B72B08 800FB968 13200007 */ beqz $t9, .L800FB988 -/* B72B0C 800FB96C 00000000 */ nop -/* B72B10 800FB970 10200004 */ beqz $at, .L800FB984 -/* B72B14 800FB974 24460020 */ addiu $a2, $v0, 0x20 -/* B72B18 800FB978 2446FFE0 */ addiu $a2, $v0, -0x20 -/* B72B1C 800FB97C 10000002 */ b .L800FB988 -/* B72B20 800FB980 30C600FF */ andi $a2, $a2, 0xff -.L800FB984: -/* B72B24 800FB984 30C600FF */ andi $a2, $a2, 0xff -.L800FB988: -/* B72B28 800FB988 0C03ED16 */ jal GfxPrint_PrintCharImpl -/* B72B2C 800FB98C 30C500FF */ andi $a1, $a2, 0xff -/* B72B30 800FB990 10000042 */ b .L800FBA9C -/* B72B34 800FB994 8FBF001C */ lw $ra, 0x1c($sp) -.L800FB998: -/* B72B38 800FB998 2841000B */ slti $at, $v0, 0xb -/* B72B3C 800FB99C 14200010 */ bnez $at, .L800FB9E0 -/* B72B40 800FB9A0 2841000E */ slti $at, $v0, 0xe -/* B72B44 800FB9A4 14200009 */ bnez $at, .L800FB9CC -/* B72B48 800FB9A8 2448FF76 */ addiu $t0, $v0, -0x8a -/* B72B4C 800FB9AC 2D010005 */ sltiu $at, $t0, 5 -/* B72B50 800FB9B0 10200039 */ beqz $at, .L800FBA98 -/* B72B54 800FB9B4 00084080 */ sll $t0, $t0, 2 -/* B72B58 800FB9B8 3C018015 */ lui $at, %hi(jtbl_8014A6F0) -/* B72B5C 800FB9BC 00280821 */ addu $at, $at, $t0 -/* B72B60 800FB9C0 8C28A6F0 */ lw $t0, %lo(jtbl_8014A6F0)($at) -/* B72B64 800FB9C4 01000008 */ jr $t0 -/* B72B68 800FB9C8 00000000 */ nop -.L800FB9CC: -/* B72B6C 800FB9CC 2401000D */ li $at, 13 -/* B72B70 800FB9D0 5041000D */ beql $v0, $at, .L800FBA08 -/* B72B74 800FB9D4 960B000C */ lhu $t3, 0xc($s0) -/* B72B78 800FB9D8 10000030 */ b .L800FBA9C -/* B72B7C 800FB9DC 8FBF001C */ lw $ra, 0x1c($sp) -.L800FB9E0: -/* B72B80 800FB9E0 1040002D */ beqz $v0, .L800FBA98 -/* B72B84 800FB9E4 24010009 */ li $at, 9 -/* B72B88 800FB9E8 10410009 */ beq $v0, $at, .L800FBA10 -/* B72B8C 800FB9EC 2401000A */ li $at, 10 -/* B72B90 800FB9F0 5441002A */ bnel $v0, $at, .L800FBA9C -/* B72B94 800FB9F4 8FBF001C */ lw $ra, 0x1c($sp) -/* B72B98 800FB9F8 9609000A */ lhu $t1, 0xa($s0) -/* B72B9C 800FB9FC 252A0020 */ addiu $t2, $t1, 0x20 -/* B72BA0 800FBA00 A60A000A */ sh $t2, 0xa($s0) -/* B72BA4 800FBA04 960B000C */ lhu $t3, 0xc($s0) -.L800FBA08: -/* B72BA8 800FBA08 10000023 */ b .L800FBA98 -/* B72BAC 800FBA0C A60B0008 */ sh $t3, 8($s0) -.L800FBA10: -/* B72BB0 800FBA10 02002025 */ move $a0, $s0 -.L800FBA14: -/* B72BB4 800FBA14 0C03ED16 */ jal GfxPrint_PrintCharImpl -/* B72BB8 800FBA18 24050020 */ li $a1, 32 -/* B72BBC 800FBA1C 960C0008 */ lhu $t4, 8($s0) -/* B72BC0 800FBA20 960D000C */ lhu $t5, 0xc($s0) -/* B72BC4 800FBA24 018D7023 */ subu $t6, $t4, $t5 -/* B72BC8 800FBA28 05C10004 */ bgez $t6, .L800FBA3C -/* B72BCC 800FBA2C 31CF00FF */ andi $t7, $t6, 0xff -/* B72BD0 800FBA30 11E00002 */ beqz $t7, .L800FBA3C -/* B72BD4 800FBA34 00000000 */ nop -/* B72BD8 800FBA38 25EFFF00 */ addiu $t7, $t7, -0x100 -.L800FBA3C: -/* B72BDC 800FBA3C 55E0FFF5 */ bnezl $t7, .L800FBA14 -/* B72BE0 800FBA40 02002025 */ move $a0, $s0 -/* B72BE4 800FBA44 10000015 */ b .L800FBA9C -/* B72BE8 800FBA48 8FBF001C */ lw $ra, 0x1c($sp) -glabel L800FBA4C -/* B72BEC 800FBA4C 9218000F */ lbu $t8, 0xf($s0) -/* B72BF0 800FBA50 37190001 */ ori $t9, $t8, 1 -/* B72BF4 800FBA54 10000010 */ b .L800FBA98 -/* B72BF8 800FBA58 A219000F */ sb $t9, 0xf($s0) -glabel L800FBA5C -/* B72BFC 800FBA5C 9208000F */ lbu $t0, 0xf($s0) -/* B72C00 800FBA60 3109FFFE */ andi $t1, $t0, 0xfffe -/* B72C04 800FBA64 1000000C */ b .L800FBA98 -/* B72C08 800FBA68 A209000F */ sb $t1, 0xf($s0) -glabel L800FBA6C -/* B72C0C 800FBA6C 920A000F */ lbu $t2, 0xf($s0) -/* B72C10 800FBA70 354C0002 */ ori $t4, $t2, 2 -/* B72C14 800FBA74 A20C000F */ sb $t4, 0xf($s0) -/* B72C18 800FBA78 358D0008 */ ori $t5, $t4, 8 -/* B72C1C 800FBA7C 10000006 */ b .L800FBA98 -/* B72C20 800FBA80 A20D000F */ sb $t5, 0xf($s0) -glabel L800FBA84 -/* B72C24 800FBA84 920E000F */ lbu $t6, 0xf($s0) -/* B72C28 800FBA88 31D8FFFD */ andi $t8, $t6, 0xfffd -/* B72C2C 800FBA8C A218000F */ sb $t8, 0xf($s0) -/* B72C30 800FBA90 37190008 */ ori $t9, $t8, 8 -/* B72C34 800FBA94 A219000F */ sb $t9, 0xf($s0) -.L800FBA98: -glabel L800FBA98 -/* B72C38 800FBA98 8FBF001C */ lw $ra, 0x1c($sp) -.L800FBA9C: -/* B72C3C 800FBA9C 8FB00018 */ lw $s0, 0x18($sp) -/* B72C40 800FBAA0 27BD0020 */ addiu $sp, $sp, 0x20 -/* B72C44 800FBAA4 03E00008 */ jr $ra -/* B72C48 800FBAA8 00000000 */ nop \ No newline at end of file diff --git a/asm/non_matchings/code/graph/Graph_TaskSet00.s b/asm/non_matchings/code/graph/Graph_TaskSet00.s new file mode 100644 index 0000000000..5a8983f0c3 --- /dev/null +++ b/asm/non_matchings/code/graph/Graph_TaskSet00.s @@ -0,0 +1,300 @@ +.rdata +glabel D_80145240 + .asciz "\x1b[31m" + .balign 4 + +glabel D_80145248 + .asciz "RCPが帰ってきませんでした。" + .balign 4 + +glabel D_80145264 + .asciz "\x1b[m" + .balign 4 + +glabel D_80145268 + .asciz "RCP is HUNG UP!!" + .balign 4 + +glabel D_8014527C + .asciz "Oh! MY GOD!!" + .balign 4 + +glabel D_8014528C + .asciz "../graph.c" + .balign 4 + +glabel D_80145298 + .asciz "../graph.c" + .balign 4 + + +.text +glabel Graph_TaskSet00 +/* B3CF60 800C5DC0 27BDFF68 */ addiu $sp, $sp, -0x98 +/* B3CF64 800C5DC4 AFBF002C */ sw $ra, 0x2c($sp) +/* B3CF68 800C5DC8 AFB10028 */ sw $s1, 0x28($sp) +/* B3CF6C 800C5DCC 00808825 */ move $s1, $a0 +/* B3CF70 800C5DD0 0C001A78 */ jal osGetTime +/* B3CF74 800C5DD4 AFB00024 */ sw $s0, 0x24($sp) +/* B3CF78 800C5DD8 3C0E8016 */ lui $t6, %hi(sGraphSetTaskTime) # $t6, 0x8016 +/* B3CF7C 800C5DDC 3C0F8016 */ lui $t7, %hi(sGraphSetTaskTime+4) # $t7, 0x8016 +/* B3CF80 800C5DE0 8DEF65DC */ lw $t7, %lo(sGraphSetTaskTime+4)($t7) +/* B3CF84 800C5DE4 8DCE65D8 */ lw $t6, %lo(sGraphSetTaskTime)($t6) +/* B3CF88 800C5DE8 3C108017 */ lui $s0, %hi(D_8016A558) # $s0, 0x8017 +/* B3CF8C 800C5DEC 2610A558 */ addiu $s0, %lo(D_8016A558) # addiu $s0, $s0, -0x5aa8 +/* B3CF90 800C5DF0 8E080000 */ lw $t0, ($s0) +/* B3CF94 800C5DF4 8E090004 */ lw $t1, 4($s0) +/* B3CF98 800C5DF8 006F082B */ sltu $at, $v1, $t7 +/* B3CF9C 800C5DFC 004EC023 */ subu $t8, $v0, $t6 +/* B3CFA0 800C5E00 0301C023 */ subu $t8, $t8, $at +/* B3CFA4 800C5E04 006FC823 */ subu $t9, $v1, $t7 +/* B3CFA8 800C5E08 3C0C8017 */ lui $t4, %hi(D_8016A528) # $t4, 0x8017 +/* B3CFAC 800C5E0C 03085023 */ subu $t2, $t8, $t0 +/* B3CFB0 800C5E10 0329082B */ sltu $at, $t9, $t1 +/* B3CFB4 800C5E14 01415023 */ subu $t2, $t2, $at +/* B3CFB8 800C5E18 258CA528 */ addiu $t4, %lo(D_8016A528) # addiu $t4, $t4, -0x5ad8 +/* B3CFBC 800C5E1C AD8A0000 */ sw $t2, ($t4) +/* B3CFC0 800C5E20 03295823 */ subu $t3, $t9, $t1 +/* B3CFC4 800C5E24 AD8B0004 */ sw $t3, 4($t4) +/* B3CFC8 800C5E28 240F0000 */ li $t7, 0 +/* B3CFCC 800C5E2C 240E0000 */ li $t6, 0 +/* B3CFD0 800C5E30 3C070861 */ lui $a3, (0x0861C468 >> 16) # lui $a3, 0x861 +/* B3CFD4 800C5E34 2625005C */ addiu $a1, $s1, 0x5c +/* B3CFD8 800C5E38 240D029A */ li $t5, 666 +/* B3CFDC 800C5E3C AFAD001C */ sw $t5, 0x1c($sp) +/* B3CFE0 800C5E40 AFA50018 */ sw $a1, 0x18($sp) +/* B3CFE4 800C5E44 AFA50038 */ sw $a1, 0x38($sp) +/* B3CFE8 800C5E48 34E7C468 */ ori $a3, (0x0861C468 & 0xFFFF) # ori $a3, $a3, 0xc468 +/* B3CFEC 800C5E4C AFAE0010 */ sw $t6, 0x10($sp) +/* B3CFF0 800C5E50 AFAF0014 */ sw $t7, 0x14($sp) +/* B3CFF4 800C5E54 27A40070 */ addiu $a0, $sp, 0x70 +/* B3CFF8 800C5E58 0C0418B8 */ jal osSetTimer +/* B3CFFC 800C5E5C 24060000 */ li $a2, 0 +/* B3D000 800C5E60 8FA40038 */ lw $a0, 0x38($sp) +/* B3D004 800C5E64 27A5006C */ addiu $a1, $sp, 0x6c +/* B3D008 800C5E68 0C000CA0 */ jal osRecvMesg +/* B3D00C 800C5E6C 24060001 */ li $a2, 1 +/* B3D010 800C5E70 0C0408CC */ jal osStopTimer +/* B3D014 800C5E74 27A40070 */ addiu $a0, $sp, 0x70 +/* B3D018 800C5E78 8FB8006C */ lw $t8, 0x6c($sp) +/* B3D01C 800C5E7C 2401029A */ li $at, 666 +/* B3D020 800C5E80 1701002C */ bne $t8, $at, .L800C5F34 +/* B3D024 800C5E84 3C048014 */ lui $a0, %hi(D_80145240) # $a0, 0x8014 +/* B3D028 800C5E88 0C00084C */ jal osSyncPrintf +/* B3D02C 800C5E8C 24845240 */ addiu $a0, %lo(D_80145240) # addiu $a0, $a0, 0x5240 +/* B3D030 800C5E90 3C048014 */ lui $a0, %hi(D_80145248) # $a0, 0x8014 +/* B3D034 800C5E94 0C00084C */ jal osSyncPrintf +/* B3D038 800C5E98 24845248 */ addiu $a0, %lo(D_80145248) # addiu $a0, $a0, 0x5248 +/* B3D03C 800C5E9C 3C048014 */ lui $a0, %hi(D_80145264) # $a0, 0x8014 +/* B3D040 800C5EA0 0C00084C */ jal osSyncPrintf +/* B3D044 800C5EA4 24845264 */ addiu $a0, %lo(D_80145264) # addiu $a0, $a0, 0x5264 +/* B3D048 800C5EA8 3C04A404 */ lui $a0, 0xa404 +/* B3D04C 800C5EAC 0C000AC4 */ jal LogUtils_LogHexDump +/* B3D050 800C5EB0 24050020 */ li $a1, 32 +/* B3D054 800C5EB4 3C04A410 */ lui $a0, 0xa410 +/* B3D058 800C5EB8 0C000AC4 */ jal LogUtils_LogHexDump +/* B3D05C 800C5EBC 24050020 */ li $a1, 32 +/* B3D060 800C5EC0 3C04801B */ lui $a0, %hi(gGfxSPTaskYieldBuffer) # $a0, 0x801b +/* B3D064 800C5EC4 248431C0 */ addiu $a0, %lo(gGfxSPTaskYieldBuffer) # addiu $a0, $a0, 0x31c0 +/* B3D068 800C5EC8 0C000AC4 */ jal LogUtils_LogHexDump +/* B3D06C 800C5ECC 24050C00 */ li $a1, 3072 +/* B3D070 800C5ED0 3C028016 */ lui $v0, %hi(gGameInfo) # $v0, 0x8016 +/* B3D074 800C5ED4 3C048013 */ lui $a0, %hi(D_8012D260) # $a0, 0x8013 +/* B3D078 800C5ED8 8C84D260 */ lw $a0, %lo(D_8012D260)($a0) +/* B3D07C 800C5EDC 2442FA90 */ addiu $v0, %lo(gGameInfo) # addiu $v0, $v0, -0x570 +/* B3D080 800C5EE0 8C480000 */ lw $t0, ($v0) +/* B3D084 800C5EE4 2419FFFF */ li $t9, -1 +/* B3D088 800C5EE8 1080000D */ beqz $a0, .L800C5F20 +/* B3D08C 800C5EEC A51900E0 */ sh $t9, 0xe0($t0) +/* B3D090 800C5EF0 8C4A0000 */ lw $t2, ($v0) +/* B3D094 800C5EF4 24090007 */ li $t1, 7 +/* B3D098 800C5EF8 240B0001 */ li $t3, 1 +/* B3D09C 800C5EFC A5491074 */ sh $t1, 0x1074($t2) +/* B3D0A0 800C5F00 8C4C0000 */ lw $t4, ($v0) +/* B3D0A4 800C5F04 240E0002 */ li $t6, 2 +/* B3D0A8 800C5F08 3C018013 */ lui $at, %hi(D_8012D260) # $at, 0x8013 +/* B3D0AC 800C5F0C A58B1076 */ sh $t3, 0x1076($t4) +/* B3D0B0 800C5F10 8C4F0000 */ lw $t7, ($v0) +/* B3D0B4 800C5F14 A5EE107A */ sh $t6, 0x107a($t7) +/* B3D0B8 800C5F18 0C03162F */ jal Graph_DisassembleUCode +/* B3D0BC 800C5F1C AC24D260 */ sw $a0, %lo(D_8012D260)($at) +.L800C5F20: +/* B3D0C0 800C5F20 3C048014 */ lui $a0, %hi(D_80145268) # $a0, 0x8014 +/* B3D0C4 800C5F24 3C058014 */ lui $a1, %hi(D_8014527C) # $a1, 0x8014 +/* B3D0C8 800C5F28 24A5527C */ addiu $a1, %lo(D_8014527C) # addiu $a1, $a1, 0x527c +/* B3D0CC 800C5F2C 0C0359AD */ jal Fault_AddHungupAndCrashImpl +/* B3D0D0 800C5F30 24845268 */ addiu $a0, %lo(D_80145268) # addiu $a0, $a0, 0x5268 +.L800C5F34: +/* B3D0D4 800C5F34 8FA40038 */ lw $a0, 0x38($sp) +/* B3D0D8 800C5F38 27A5006C */ addiu $a1, $sp, 0x6c +/* B3D0DC 800C5F3C 0C000CA0 */ jal osRecvMesg +/* B3D0E0 800C5F40 00003025 */ move $a2, $zero +/* B3D0E4 800C5F44 8E2602EC */ lw $a2, 0x2ec($s1) +/* B3D0E8 800C5F48 8E2401B0 */ lw $a0, 0x1b0($s1) +/* B3D0EC 800C5F4C 3C018013 */ lui $at, %hi(D_8012D260) # $at, 0x8013 +/* B3D0F0 800C5F50 10C00004 */ beqz $a2, .L800C5F64 +/* B3D0F4 800C5F54 AC24D260 */ sw $a0, %lo(D_8012D260)($at) +/* B3D0F8 800C5F58 02202025 */ move $a0, $s1 +/* B3D0FC 800C5F5C 00C0F809 */ jalr $a2 +/* B3D100 800C5F60 8E2502F0 */ lw $a1, 0x2f0($s1) +.L800C5F64: +/* B3D104 800C5F64 0C001A78 */ jal osGetTime +/* B3D108 800C5F68 00000000 */ nop +/* B3D10C 800C5F6C 3C048017 */ lui $a0, %hi(D_8016A550) # $a0, 0x8017 +/* B3D110 800C5F70 2484A550 */ addiu $a0, %lo(D_8016A550) # addiu $a0, $a0, -0x5ab0 +/* B3D114 800C5F74 8C980000 */ lw $t8, ($a0) +/* B3D118 800C5F78 8C990004 */ lw $t9, 4($a0) +/* B3D11C 800C5F7C 57000004 */ bnezl $t8, .L800C5F90 +/* B3D120 800C5F80 8E080000 */ lw $t0, ($s0) +/* B3D124 800C5F84 53200012 */ beql $t9, $zero, .L800C5FD0 +/* B3D128 800C5F88 8E180000 */ lw $t8, ($s0) +/* B3D12C 800C5F8C 8E080000 */ lw $t0, ($s0) +.L800C5F90: +/* B3D130 800C5F90 8E090004 */ lw $t1, 4($s0) +/* B3D134 800C5F94 8C8C0000 */ lw $t4, ($a0) +/* B3D138 800C5F98 8C8D0004 */ lw $t5, 4($a0) +/* B3D13C 800C5F9C 01235821 */ addu $t3, $t1, $v1 +/* B3D140 800C5FA0 0163082B */ sltu $at, $t3, $v1 +/* B3D144 800C5FA4 00285021 */ addu $t2, $at, $t0 +/* B3D148 800C5FA8 01425021 */ addu $t2, $t2, $v0 +/* B3D14C 800C5FAC 014C7023 */ subu $t6, $t2, $t4 +/* B3D150 800C5FB0 016D082B */ sltu $at, $t3, $t5 +/* B3D154 800C5FB4 01C17023 */ subu $t6, $t6, $at +/* B3D158 800C5FB8 AE0E0000 */ sw $t6, ($s0) +/* B3D15C 800C5FBC 016D7823 */ subu $t7, $t3, $t5 +/* B3D160 800C5FC0 AE0F0004 */ sw $t7, 4($s0) +/* B3D164 800C5FC4 AC820000 */ sw $v0, ($a0) +/* B3D168 800C5FC8 AC830004 */ sw $v1, 4($a0) +/* B3D16C 800C5FCC 8E180000 */ lw $t8, ($s0) +.L800C5FD0: +/* B3D170 800C5FD0 8E190004 */ lw $t9, 4($s0) +/* B3D174 800C5FD4 3C088017 */ lui $t0, %hi(D_8016A520) # $t0, 0x8017 +/* B3D178 800C5FD8 2508A520 */ addiu $t0, %lo(D_8016A520) # addiu $t0, $t0, -0x5ae0 +/* B3D17C 800C5FDC AD180000 */ sw $t8, ($t0) +/* B3D180 800C5FE0 240A0000 */ li $t2, 0 +/* B3D184 800C5FE4 AD190004 */ sw $t9, 4($t0) +/* B3D188 800C5FE8 AE0A0000 */ sw $t2, ($s0) +/* B3D18C 800C5FEC 240B0000 */ li $t3, 0 +/* B3D190 800C5FF0 0C001A78 */ jal osGetTime +/* B3D194 800C5FF4 AE0B0004 */ sw $t3, 4($s0) +/* B3D198 800C5FF8 3C018016 */ lui $at, %hi(sGraphSetTaskTime+4) # $at, 0x8016 +/* B3D19C 800C5FFC AC2265D8 */ sw $v0, %lo(sGraphSetTaskTime)($at) +/* B3D1A0 800C6000 AC2365DC */ sw $v1, %lo(sGraphSetTaskTime+4)($at) +/* B3D1A4 800C6004 26300088 */ addiu $s0, $s1, 0x88 +/* B3D1A8 800C6008 24090001 */ li $t1, 1 +/* B3D1AC 800C600C 240C0004 */ li $t4, 4 +/* B3D1B0 800C6010 AE090000 */ sw $t1, ($s0) +/* B3D1B4 800C6014 0C034B7C */ jal SysUcode_GetUCodeBoot +/* B3D1B8 800C6018 AE0C0004 */ sw $t4, 4($s0) +/* B3D1BC 800C601C 0C034B7F */ jal SysUcode_GetUcodeBootSize +/* B3D1C0 800C6020 AE020008 */ sw $v0, 8($s0) +/* B3D1C4 800C6024 0C034B85 */ jal SysUcode_GetUcode +/* B3D1C8 800C6028 AE02000C */ sw $v0, 0xc($s0) +/* B3D1CC 800C602C 0C034B88 */ jal SysUcode_GetUcodeData +/* B3D1D0 800C6030 AE020010 */ sw $v0, 0x10($s0) +/* B3D1D4 800C6034 3C0F801B */ lui $t7, %hi(gGfxSPTaskStack) # $t7, 0x801b +/* B3D1D8 800C6038 3C19801A */ lui $t9, %hi(gGfxSPTaskOutputBuffer) # $t9, 0x801a +/* B3D1DC 800C603C 3C08801B */ lui $t0, %hi(gGfxSPTaskYieldBuffer) # $t0, 0x801b +/* B3D1E0 800C6040 240D1000 */ li $t5, 4096 +/* B3D1E4 800C6044 240E0800 */ li $t6, 2048 +/* B3D1E8 800C6048 25EF3DC0 */ addiu $t7, %lo(gGfxSPTaskStack) # addiu $t7, $t7, 0x3dc0 +/* B3D1EC 800C604C 24180400 */ li $t8, 1024 +/* B3D1F0 800C6050 2739B1C0 */ addiu $t9, %lo(gGfxSPTaskOutputBuffer) # addiu $t9, $t9, -0x4e40 +/* B3D1F4 800C6054 250831C0 */ addiu $t0, %lo(gGfxSPTaskYieldBuffer) # addiu $t0, $t0, 0x31c0 +/* B3D1F8 800C6058 AE020018 */ sw $v0, 0x18($s0) +/* B3D1FC 800C605C AE0D0014 */ sw $t5, 0x14($s0) +/* B3D200 800C6060 AE0E001C */ sw $t6, 0x1c($s0) +/* B3D204 800C6064 AE0F0020 */ sw $t7, 0x20($s0) +/* B3D208 800C6068 AE180024 */ sw $t8, 0x24($s0) +/* B3D20C 800C606C AE190028 */ sw $t9, 0x28($s0) +/* B3D210 800C6070 AE08002C */ sw $t0, 0x2c($s0) +/* B3D214 800C6074 8E2A01B0 */ lw $t2, 0x1b0($s1) +/* B3D218 800C6078 3C068014 */ lui $a2, %hi(D_8014528C) # $a2, 0x8014 +/* B3D21C 800C607C 24C6528C */ addiu $a2, %lo(D_8014528C) # addiu $a2, $a2, 0x528c +/* B3D220 800C6080 27A40048 */ addiu $a0, $sp, 0x48 +/* B3D224 800C6084 02202825 */ move $a1, $s1 +/* B3D228 800C6088 2407033C */ li $a3, 828 +/* B3D22C 800C608C 0C031AB1 */ jal Graph_OpenDisps +/* B3D230 800C6090 AE0A0030 */ sw $t2, 0x30($s0) +/* B3D234 800C6094 8E2B01BC */ lw $t3, 0x1bc($s1) +/* B3D238 800C6098 8E2901B0 */ lw $t1, 0x1b0($s1) +/* B3D23C 800C609C 3C068014 */ lui $a2, %hi(D_80145298) # $a2, 0x8014 +/* B3D240 800C60A0 24C65298 */ addiu $a2, %lo(D_80145298) # addiu $a2, $a2, 0x5298 +/* B3D244 800C60A4 01696023 */ subu $t4, $t3, $t1 +/* B3D248 800C60A8 AE0C0034 */ sw $t4, 0x34($s0) +/* B3D24C 800C60AC 27A40048 */ addiu $a0, $sp, 0x48 +/* B3D250 800C60B0 02202825 */ move $a1, $s1 +/* B3D254 800C60B4 0C031AD5 */ jal Graph_CloseDisps +/* B3D258 800C60B8 2407033E */ li $a3, 830 +/* B3D25C 800C60BC 3C0D801B */ lui $t5, %hi(gGfxSPTaskYieldBuffer) # $t5, 0x801b +/* B3D260 800C60C0 25AD31C0 */ addiu $t5, %lo(gGfxSPTaskYieldBuffer) # addiu $t5, $t5, 0x31c0 +/* B3D264 800C60C4 240E0C00 */ li $t6, 3072 +/* B3D268 800C60C8 AE0D0038 */ sw $t5, 0x38($s0) +/* B3D26C 800C60CC AE0E003C */ sw $t6, 0x3c($s0) +/* B3D270 800C60D0 26250078 */ addiu $a1, $s1, 0x78 +/* B3D274 800C60D4 240F0063 */ li $t7, 99 +/* B3D278 800C60D8 ACA00000 */ sw $zero, ($a1) +/* B3D27C 800C60DC ACAF0008 */ sw $t7, 8($a1) +/* B3D280 800C60E0 3C028016 */ lui $v0, %hi(gGameInfo) # $v0, 0x8016 +/* B3D284 800C60E4 8C42FA90 */ lw $v0, %lo(gGameInfo)($v0) +/* B3D288 800C60E8 3C0E8016 */ lui $t6, %hi(sGraphCfbInfos) # $t6, 0x8016 +/* B3D28C 800C60EC 25CE65F0 */ addiu $t6, %lo(sGraphCfbInfos) # addiu $t6, $t6, 0x65f0 +/* B3D290 800C60F0 84430116 */ lh $v1, 0x116($v0) +/* B3D294 800C60F4 30780001 */ andi $t8, $v1, 1 +/* B3D298 800C60F8 13000009 */ beqz $t8, .L800C6120 +/* B3D29C 800C60FC 3079FFFE */ andi $t9, $v1, 0xfffe +/* B3D2A0 800C6100 A4590116 */ sh $t9, 0x116($v0) +/* B3D2A4 800C6104 8CA80008 */ lw $t0, 8($a1) +/* B3D2A8 800C6108 2401FFBF */ li $at, -65 +/* B3D2AC 800C610C 01015024 */ and $t2, $t0, $at +/* B3D2B0 800C6110 ACAA0008 */ sw $t2, 8($a1) +/* B3D2B4 800C6114 8E2B02E8 */ lw $t3, 0x2e8($s1) +/* B3D2B8 800C6118 2569FFFF */ addiu $t1, $t3, -1 +/* B3D2BC 800C611C AE2902E8 */ sw $t1, 0x2e8($s1) +.L800C6120: +/* B3D2C0 800C6120 3C038013 */ lui $v1, %hi(sGraphCfbInfoIdx) # $v1, 0x8013 +/* B3D2C4 800C6124 8C63D264 */ lw $v1, %lo(sGraphCfbInfoIdx)($v1) +/* B3D2C8 800C6128 24010003 */ li $at, 3 +/* B3D2CC 800C612C 8FAC0038 */ lw $t4, 0x38($sp) +/* B3D2D0 800C6130 000368C0 */ sll $t5, $v1, 3 +/* B3D2D4 800C6134 01A36823 */ subu $t5, $t5, $v1 +/* B3D2D8 800C6138 24630001 */ addiu $v1, $v1, 1 +/* B3D2DC 800C613C 0061001A */ div $zero, $v1, $at +/* B3D2E0 800C6140 ACA00054 */ sw $zero, 0x54($a1) +/* B3D2E4 800C6144 ACAC0050 */ sw $t4, 0x50($a1) +/* B3D2E8 800C6148 8E2F02DC */ lw $t7, 0x2dc($s1) +/* B3D2EC 800C614C 000D6880 */ sll $t5, $t5, 2 +/* B3D2F0 800C6150 01AE1021 */ addu $v0, $t5, $t6 +/* B3D2F4 800C6154 AC4F0000 */ sw $t7, ($v0) +/* B3D2F8 800C6158 8E3802DC */ lw $t8, 0x2dc($s1) +/* B3D2FC 800C615C 3C0A8016 */ lui $t2, %hi(gGameInfo) # $t2, 0x8016 +/* B3D300 800C6160 00001810 */ mfhi $v1 +/* B3D304 800C6164 AC580004 */ sw $t8, 4($v0) +/* B3D308 800C6168 8E390284 */ lw $t9, 0x284($s1) +/* B3D30C 800C616C 3C018013 */ lui $at, %hi(sGraphCfbInfoIdx) # $at, 0x8013 +/* B3D310 800C6170 3C048016 */ lui $a0, %hi(gSchedContext+0x38) # $a0, 0x8016 +/* B3D314 800C6174 AC590008 */ sw $t9, 8($v0) +/* B3D318 800C6178 8E2802E4 */ lw $t0, 0x2e4($s1) +/* B3D31C 800C617C 248466A0 */ addiu $a0, %lo(gSchedContext+0x38) # addiu $a0, $a0, 0x66a0 +/* B3D320 800C6180 24060001 */ li $a2, 1 +/* B3D324 800C6184 AC48000C */ sw $t0, 0xc($v0) +/* B3D328 800C6188 C62402F4 */ lwc1 $f4, 0x2f4($s1) +/* B3D32C 800C618C E4440014 */ swc1 $f4, 0x14($v0) +/* B3D330 800C6190 C62602F8 */ lwc1 $f6, 0x2f8($s1) +/* B3D334 800C6194 A0400010 */ sb $zero, 0x10($v0) +/* B3D338 800C6198 E4460018 */ swc1 $f6, 0x18($v0) +/* B3D33C 800C619C 8D4AFA90 */ lw $t2, %lo(gGameInfo)($t2) +/* B3D340 800C61A0 854B0110 */ lh $t3, 0x110($t2) +/* B3D344 800C61A4 A04B0011 */ sb $t3, 0x11($v0) +/* B3D348 800C61A8 ACA2000C */ sw $v0, 0xc($a1) +/* B3D34C 800C61AC AC23D264 */ sw $v1, %lo(sGraphCfbInfoIdx)($at) +/* B3D350 800C61B0 0C000C18 */ jal osSendMesg +/* B3D354 800C61B4 AE240058 */ sw $a0, 0x58($s1) +/* B3D358 800C61B8 3C048016 */ lui $a0, %hi(gSchedContext) # $a0, 0x8016 +/* B3D35C 800C61BC 0C03257E */ jal func_800C95F8 +/* B3D360 800C61C0 24846668 */ addiu $a0, %lo(gSchedContext) # addiu $a0, $a0, 0x6668 +/* B3D364 800C61C4 8FBF002C */ lw $ra, 0x2c($sp) +/* B3D368 800C61C8 8FB00024 */ lw $s0, 0x24($sp) +/* B3D36C 800C61CC 8FB10028 */ lw $s1, 0x28($sp) +/* B3D370 800C61D0 03E00008 */ jr $ra +/* B3D374 800C61D4 27BD0098 */ addiu $sp, $sp, 0x98 \ No newline at end of file diff --git a/asm/non_matchings/code/graph/Graph_Update.s b/asm/non_matchings/code/graph/Graph_Update.s new file mode 100644 index 0000000000..7bab0b0c32 --- /dev/null +++ b/asm/non_matchings/code/graph/Graph_Update.s @@ -0,0 +1,557 @@ +.rdata +glabel D_801452A4 + .asciz "../graph.c" + .balign 4 + +glabel D_801452B0 + .asciz "WORK_DISP 開始" + # EUC-JP: 開始 | Start + .balign 4 + +glabel D_801452C0 + .asciz "POLY_OPA_DISP 開始" + # EUC-JP: 開始 | Start + .balign 4 + +glabel D_801452D4 + .asciz "POLY_XLU_DISP 開始" + # EUC-JP: 開始 | Start + .balign 4 + +glabel D_801452E8 + .asciz "OVERLAY_DISP 開始" + # EUC-JP: 開始 | Start + .balign 4 + +glabel D_801452FC + .asciz "../graph.c" + .balign 4 + +glabel D_80145308 + .asciz "../graph.c" + .balign 4 + +glabel D_80145314 + .asciz "WORK_DISP 終了" + # EUC-JP: 終了 | End + .balign 4 + +glabel D_80145324 + .asciz "POLY_OPA_DISP 終了" + # EUC-JP: 終了 | End + .balign 4 + +glabel D_80145338 + .asciz "POLY_XLU_DISP 終了" + # EUC-JP: 終了 | End + .balign 4 + +glabel D_8014534C + .asciz "OVERLAY_DISP 終了" + # EUC-JP: 終了 | End + .balign 4 + +glabel D_80145360 + .asciz "../graph.c" + .balign 4 + +glabel D_8014536C + .asciz "../graph.c" + .balign 4 + +glabel D_80145378 + .asciz "../graph.c" + .balign 4 + +glabel D_80145384 + .asciz "do_count_fault" + .balign 4 + +glabel D_80145394 + .asciz "%c" + .balign 4 + +glabel D_80145398 + .asciz "\x1b[41;37mダイナミック領域先頭が破壊されています\n\x1b[m" + #ダイナミック領域先頭が破壊されています | Dynamic area head is destroyed + .balign 4 + +glabel D_801453CC + .asciz "../graph.c" + .balign 4 + +glabel D_801453D8 + .asciz "%c" + .balign 4 + +glabel D_801453DC + .asciz "\x1b[41;37mダイナミック領域末尾が破壊されています\n\x1b[m" + # EUC-JP: ダイナミック領域末尾が破壊されています | Dynamic region tail is destroyed + .balign 4 + +glabel D_80145410 + .asciz "../graph.c" + .balign 4 + +glabel D_8014541C + .asciz "%c" + .balign 4 + +glabel D_80145420 + .asciz "\x1b[41;37mゼルダ0は死んでしまった(graph_alloc is empty)\n\x1b[m" + # EUC-JP: ゼルダ0は死んでしまった | 'Zelda 0 is dead'? + .balign 4 + +glabel D_8014545C + .asciz "%c" + .balign 4 + +glabel D_80145460 + .asciz "\x1b[41;37mゼルダ1は死んでしまった(graph_alloc is empty)\n\x1b[m" + # EUC-JP: ゼルダ1は死んでしまった | 'Zelda 1 is dead'? + .balign 4 + +glabel D_8014549C + .asciz "%c" + .balign 4 + +glabel D_801454A0 + .asciz "\x1b[41;37mゼルダ4は死んでしまった(graph_alloc is empty)\n\x1b[m" + # EUC-JP: ゼルダ4は死んでしまった | 'Zelda 4 is dead'? + .balign 4 + +glabel D_801454DC + .asciz "\x1b[43;30mPRE-NMIによりリセットモードに移行します\n\x1b[m" + # EUC-JP: によりリセットモードに移行します | To reset mode + .balign 4 + +.text + +glabel Graph_Update +/* B3D378 800C61D8 27BDFF38 */ addiu $sp, $sp, -0xc8 +/* B3D37C 800C61DC AFBF001C */ sw $ra, 0x1c($sp) +/* B3D380 800C61E0 AFB00018 */ sw $s0, 0x18($sp) +/* B3D384 800C61E4 AFA500CC */ sw $a1, 0xcc($sp) +/* B3D388 800C61E8 00808025 */ move $s0, $a0 +/* B3D38C 800C61EC 0C0316C5 */ jal Graph_InitTHGA +/* B3D390 800C61F0 ACA000A0 */ sw $zero, 0xa0($a1) +/* B3D394 800C61F4 3C068014 */ lui $a2, %hi(D_801452A4) # $a2, 0x8014 +/* B3D398 800C61F8 24C652A4 */ addiu $a2, %lo(D_801452A4) # addiu $a2, $a2, 0x52a4 +/* B3D39C 800C61FC 27A400B0 */ addiu $a0, $sp, 0xb0 +/* B3D3A0 800C6200 02002825 */ move $a1, $s0 +/* B3D3A4 800C6204 0C031AB1 */ jal Graph_OpenDisps +/* B3D3A8 800C6208 240703C6 */ li $a3, 966 +/* B3D3AC 800C620C 8E0201BC */ lw $v0, 0x1bc($s0) +/* B3D3B0 800C6210 3C188014 */ lui $t8, %hi(D_801452B0) # $t8, 0x8014 +/* B3D3B4 800C6214 271852B0 */ addiu $t8, %lo(D_801452B0) # addiu $t8, $t8, 0x52b0 +/* B3D3B8 800C6218 244F0008 */ addiu $t7, $v0, 8 +/* B3D3BC 800C621C AE0F01BC */ sw $t7, 0x1bc($s0) +/* B3D3C0 800C6220 3C080002 */ lui $t0, 2 +/* B3D3C4 800C6224 AC480000 */ sw $t0, ($v0) +/* B3D3C8 800C6228 AC580004 */ sw $t8, 4($v0) +/* B3D3CC 800C622C 8E0202C0 */ lw $v0, 0x2c0($s0) +/* B3D3D0 800C6230 3C098014 */ lui $t1, %hi(D_801452C0) # $t1, 0x8014 +/* B3D3D4 800C6234 252952C0 */ addiu $t1, %lo(D_801452C0) # addiu $t1, $t1, 0x52c0 +/* B3D3D8 800C6238 24590008 */ addiu $t9, $v0, 8 +/* B3D3DC 800C623C AE1902C0 */ sw $t9, 0x2c0($s0) +/* B3D3E0 800C6240 AC490004 */ sw $t1, 4($v0) +/* B3D3E4 800C6244 AC480000 */ sw $t0, ($v0) +/* B3D3E8 800C6248 8E0202D0 */ lw $v0, 0x2d0($s0) +/* B3D3EC 800C624C 3C0B8014 */ lui $t3, %hi(D_801452D4) # $t3, 0x8014 +/* B3D3F0 800C6250 256B52D4 */ addiu $t3, %lo(D_801452D4) # addiu $t3, $t3, 0x52d4 +/* B3D3F4 800C6254 244A0008 */ addiu $t2, $v0, 8 +/* B3D3F8 800C6258 AE0A02D0 */ sw $t2, 0x2d0($s0) +/* B3D3FC 800C625C AC4B0004 */ sw $t3, 4($v0) +/* B3D400 800C6260 AC480000 */ sw $t0, ($v0) +/* B3D404 800C6264 8E0202B0 */ lw $v0, 0x2b0($s0) +/* B3D408 800C6268 3C0D8014 */ lui $t5, %hi(D_801452E8) # $t5, 0x8014 +/* B3D40C 800C626C 25AD52E8 */ addiu $t5, %lo(D_801452E8) # addiu $t5, $t5, 0x52e8 +/* B3D410 800C6270 244C0008 */ addiu $t4, $v0, 8 +/* B3D414 800C6274 AE0C02B0 */ sw $t4, 0x2b0($s0) +/* B3D418 800C6278 3C068014 */ lui $a2, %hi(D_801452FC) # $a2, 0x8014 +/* B3D41C 800C627C 24C652FC */ addiu $a2, %lo(D_801452FC) # addiu $a2, $a2, 0x52fc +/* B3D420 800C6280 27A400B0 */ addiu $a0, $sp, 0xb0 +/* B3D424 800C6284 02002825 */ move $a1, $s0 +/* B3D428 800C6288 240703CF */ li $a3, 975 +/* B3D42C 800C628C AC4D0004 */ sw $t5, 4($v0) +/* B3D430 800C6290 0C031AD5 */ jal Graph_CloseDisps +/* B3D434 800C6294 AC480000 */ sw $t0, ($v0) +/* B3D438 800C6298 0C0312A6 */ jal func_800C4A98 +/* B3D43C 800C629C 8FA400CC */ lw $a0, 0xcc($sp) +/* B3D440 800C62A0 0C0312B2 */ jal func_800C4AC8 +/* B3D444 800C62A4 8FA400CC */ lw $a0, 0xcc($sp) +/* B3D448 800C62A8 3C068014 */ lui $a2, %hi(D_80145308) # $a2, 0x8014 +/* B3D44C 800C62AC 24C65308 */ addiu $a2, %lo(D_80145308) # addiu $a2, $a2, 0x5308 +/* B3D450 800C62B0 27A4008C */ addiu $a0, $sp, 0x8c +/* B3D454 800C62B4 02002825 */ move $a1, $s0 +/* B3D458 800C62B8 0C031AB1 */ jal Graph_OpenDisps +/* B3D45C 800C62BC 240703DB */ li $a3, 987 +/* B3D460 800C62C0 8E0201BC */ lw $v0, 0x1bc($s0) +/* B3D464 800C62C4 3C0F8014 */ lui $t7, %hi(D_80145314) # $t7, 0x8014 +/* B3D468 800C62C8 3C080002 */ lui $t0, 2 +/* B3D46C 800C62CC 244E0008 */ addiu $t6, $v0, 8 +/* B3D470 800C62D0 AE0E01BC */ sw $t6, 0x1bc($s0) +/* B3D474 800C62D4 25EF5314 */ addiu $t7, %lo(D_80145314) # addiu $t7, $t7, 0x5314 +/* B3D478 800C62D8 AC4F0004 */ sw $t7, 4($v0) +/* B3D47C 800C62DC AC480000 */ sw $t0, ($v0) +/* B3D480 800C62E0 8E0202C0 */ lw $v0, 0x2c0($s0) +/* B3D484 800C62E4 3C198014 */ lui $t9, %hi(D_80145324) # $t9, 0x8014 +/* B3D488 800C62E8 27395324 */ addiu $t9, %lo(D_80145324) # addiu $t9, $t9, 0x5324 +/* B3D48C 800C62EC 24580008 */ addiu $t8, $v0, 8 +/* B3D490 800C62F0 AE1802C0 */ sw $t8, 0x2c0($s0) +/* B3D494 800C62F4 AC590004 */ sw $t9, 4($v0) +/* B3D498 800C62F8 AC480000 */ sw $t0, ($v0) +/* B3D49C 800C62FC 8E0202D0 */ lw $v0, 0x2d0($s0) +/* B3D4A0 800C6300 3C0A8014 */ lui $t2, %hi(D_80145338) # $t2, 0x8014 +/* B3D4A4 800C6304 254A5338 */ addiu $t2, %lo(D_80145338) # addiu $t2, $t2, 0x5338 +/* B3D4A8 800C6308 24490008 */ addiu $t1, $v0, 8 +/* B3D4AC 800C630C AE0902D0 */ sw $t1, 0x2d0($s0) +/* B3D4B0 800C6310 AC4A0004 */ sw $t2, 4($v0) +/* B3D4B4 800C6314 AC480000 */ sw $t0, ($v0) +/* B3D4B8 800C6318 8E0202B0 */ lw $v0, 0x2b0($s0) +/* B3D4BC 800C631C 3C0C8014 */ lui $t4, %hi(D_8014534C) # $t4, 0x8014 +/* B3D4C0 800C6320 258C534C */ addiu $t4, %lo(D_8014534C) # addiu $t4, $t4, 0x534c +/* B3D4C4 800C6324 244B0008 */ addiu $t3, $v0, 8 +/* B3D4C8 800C6328 AE0B02B0 */ sw $t3, 0x2b0($s0) +/* B3D4CC 800C632C 3C068014 */ lui $a2, %hi(D_80145360) # $a2, 0x8014 +/* B3D4D0 800C6330 24C65360 */ addiu $a2, %lo(D_80145360) # addiu $a2, $a2, 0x5360 +/* B3D4D4 800C6334 27A4008C */ addiu $a0, $sp, 0x8c +/* B3D4D8 800C6338 02002825 */ move $a1, $s0 +/* B3D4DC 800C633C 240703E4 */ li $a3, 996 +/* B3D4E0 800C6340 AC4C0004 */ sw $t4, 4($v0) +/* B3D4E4 800C6344 0C031AD5 */ jal Graph_CloseDisps +/* B3D4E8 800C6348 AC480000 */ sw $t0, ($v0) +/* B3D4EC 800C634C 3C068014 */ lui $a2, %hi(D_8014536C) # $a2, 0x8014 +/* B3D4F0 800C6350 24C6536C */ addiu $a2, %lo(D_8014536C) # addiu $a2, $a2, 0x536c +/* B3D4F4 800C6354 27A40068 */ addiu $a0, $sp, 0x68 +/* B3D4F8 800C6358 02002825 */ move $a1, $s0 +/* B3D4FC 800C635C 0C031AB1 */ jal Graph_OpenDisps +/* B3D500 800C6360 240703E7 */ li $a3, 999 +/* B3D504 800C6364 8E0201BC */ lw $v0, 0x1bc($s0) +/* B3D508 800C6368 3C04DE01 */ lui $a0, 0xde01 +/* B3D50C 800C636C 3C0BE700 */ lui $t3, 0xe700 +/* B3D510 800C6370 244D0008 */ addiu $t5, $v0, 8 +/* B3D514 800C6374 AE0D01BC */ sw $t5, 0x1bc($s0) +/* B3D518 800C6378 AC440000 */ sw $a0, ($v0) +/* B3D51C 800C637C 8E0E0000 */ lw $t6, ($s0) +/* B3D520 800C6380 3C0DE900 */ lui $t5, 0xe900 +/* B3D524 800C6384 3C068014 */ lui $a2, %hi(D_80145378) # $a2, 0x8014 +/* B3D528 800C6388 AC4E0004 */ sw $t6, 4($v0) +/* B3D52C 800C638C 8E0202C0 */ lw $v0, 0x2c0($s0) +/* B3D530 800C6390 24C65378 */ addiu $a2, %lo(D_80145378) # addiu $a2, $a2, 0x5378 +/* B3D534 800C6394 02002825 */ move $a1, $s0 +/* B3D538 800C6398 244F0008 */ addiu $t7, $v0, 8 +/* B3D53C 800C639C AE0F02C0 */ sw $t7, 0x2c0($s0) +/* B3D540 800C63A0 AC440000 */ sw $a0, ($v0) +/* B3D544 800C63A4 8E180004 */ lw $t8, 4($s0) +/* B3D548 800C63A8 3C0FDF00 */ lui $t7, 0xdf00 +/* B3D54C 800C63AC 24070404 */ li $a3, 1028 +/* B3D550 800C63B0 AC580004 */ sw $t8, 4($v0) +/* B3D554 800C63B4 8E0202D0 */ lw $v0, 0x2d0($s0) +/* B3D558 800C63B8 24590008 */ addiu $t9, $v0, 8 +/* B3D55C 800C63BC AE1902D0 */ sw $t9, 0x2d0($s0) +/* B3D560 800C63C0 AC440000 */ sw $a0, ($v0) +/* B3D564 800C63C4 8E090010 */ lw $t1, 0x10($s0) +/* B3D568 800C63C8 27A40068 */ addiu $a0, $sp, 0x68 +/* B3D56C 800C63CC AC490004 */ sw $t1, 4($v0) +/* B3D570 800C63D0 8E0202B0 */ lw $v0, 0x2b0($s0) +/* B3D574 800C63D4 244A0008 */ addiu $t2, $v0, 8 +/* B3D578 800C63D8 AE0A02B0 */ sw $t2, 0x2b0($s0) +/* B3D57C 800C63DC AC400004 */ sw $zero, 4($v0) +/* B3D580 800C63E0 AC4B0000 */ sw $t3, ($v0) +/* B3D584 800C63E4 8E0202B0 */ lw $v0, 0x2b0($s0) +/* B3D588 800C63E8 244C0008 */ addiu $t4, $v0, 8 +/* B3D58C 800C63EC AE0C02B0 */ sw $t4, 0x2b0($s0) +/* B3D590 800C63F0 AC400004 */ sw $zero, 4($v0) +/* B3D594 800C63F4 AC4D0000 */ sw $t5, ($v0) +/* B3D598 800C63F8 8E0202B0 */ lw $v0, 0x2b0($s0) +/* B3D59C 800C63FC 244E0008 */ addiu $t6, $v0, 8 +/* B3D5A0 800C6400 AE0E02B0 */ sw $t6, 0x2b0($s0) +/* B3D5A4 800C6404 AC400004 */ sw $zero, 4($v0) +/* B3D5A8 800C6408 0C031AD5 */ jal Graph_CloseDisps +/* B3D5AC 800C640C AC4F0000 */ sw $t7, ($v0) +/* B3D5B0 800C6410 3C088016 */ lui $t0, %hi(gGameInfo) # $t0, 0x8016 +/* B3D5B4 800C6414 2508FA90 */ addiu $t0, %lo(gGameInfo) # addiu $t0, $t0, -0x570 +/* B3D5B8 800C6418 8D020000 */ lw $v0, ($t0) +/* B3D5BC 800C641C 2401000A */ li $at, 10 +/* B3D5C0 800C6420 84431074 */ lh $v1, 0x1074($v0) +/* B3D5C4 800C6424 54610010 */ bnel $v1, $at, .L800C6468 +/* B3D5C8 800C6428 24010007 */ li $at, 7 +/* B3D5CC 800C642C 8458108E */ lh $t8, 0x108e($v0) +/* B3D5D0 800C6430 24010002 */ li $at, 2 +/* B3D5D4 800C6434 24190007 */ li $t9, 7 +/* B3D5D8 800C6438 5701000B */ bnel $t8, $at, .L800C6468 +/* B3D5DC 800C643C 24010007 */ li $at, 7 +/* B3D5E0 800C6440 A4591074 */ sh $t9, 0x1074($v0) +/* B3D5E4 800C6444 8D0A0000 */ lw $t2, ($t0) +/* B3D5E8 800C6448 2409FFFF */ li $t1, -1 +/* B3D5EC 800C644C A5491076 */ sh $t1, 0x1076($t2) +/* B3D5F0 800C6450 8D020000 */ lw $v0, ($t0) +/* B3D5F4 800C6454 844B108C */ lh $t3, 0x108c($v0) +/* B3D5F8 800C6458 A44B107A */ sh $t3, 0x107a($v0) +/* B3D5FC 800C645C 8D020000 */ lw $v0, ($t0) +/* B3D600 800C6460 84431074 */ lh $v1, 0x1074($v0) +/* B3D604 800C6464 24010007 */ li $at, 7 +.L800C6468: +/* B3D608 800C6468 5461002D */ bnel $v1, $at, .L800C6520 +/* B3D60C 800C646C AFA000C4 */ sw $zero, 0xc4($sp) +/* B3D610 800C6470 844C1076 */ lh $t4, 0x1076($v0) +/* B3D614 800C6474 5180002A */ beql $t4, $zero, .L800C6520 +/* B3D618 800C6478 AFA000C4 */ sw $zero, 0xc4($sp) +/* B3D61C 800C647C 844D1078 */ lh $t5, 0x1078($v0) +/* B3D620 800C6480 24010003 */ li $at, 3 +/* B3D624 800C6484 3C048016 */ lui $a0, %hi(sGraphUcodeFaultClient) # $a0, 0x8016 +/* B3D628 800C6488 15A10007 */ bne $t5, $at, .L800C64A8 +/* B3D62C 800C648C 24846648 */ addiu $a0, %lo(sGraphUcodeFaultClient) # addiu $a0, $a0, 0x6648 +/* B3D630 800C6490 3C05800C */ lui $a1, %hi(Graph_UCodeFaultClient) # $a1, 0x800c +/* B3D634 800C6494 3C078014 */ lui $a3, %hi(D_80145384) # $a3, 0x8014 +/* B3D638 800C6498 24E75384 */ addiu $a3, %lo(D_80145384) # addiu $a3, $a3, 0x5384 +/* B3D63C 800C649C 24A55AB0 */ addiu $a1, %lo(Graph_UCodeFaultClient) # addiu $a1, $a1, 0x5ab0 +/* B3D640 800C64A0 0C035077 */ jal Fault_AddClient +/* B3D644 800C64A4 8E0601B0 */ lw $a2, 0x1b0($s0) +.L800C64A8: +/* B3D648 800C64A8 0C03162F */ jal Graph_DisassembleUCode +/* B3D64C 800C64AC 8E0401B0 */ lw $a0, 0x1b0($s0) +/* B3D650 800C64B0 3C088016 */ lui $t0, %hi(gGameInfo) # $t0, 0x8016 +/* B3D654 800C64B4 2508FA90 */ addiu $t0, %lo(gGameInfo) # addiu $t0, $t0, -0x570 +/* B3D658 800C64B8 8D020000 */ lw $v0, ($t0) +/* B3D65C 800C64BC 24010003 */ li $at, 3 +/* B3D660 800C64C0 3C048016 */ lui $a0, %hi(sGraphUcodeFaultClient) # $a0, 0x8016 +/* B3D664 800C64C4 844E1078 */ lh $t6, 0x1078($v0) +/* B3D668 800C64C8 55C10006 */ bnel $t6, $at, .L800C64E4 +/* B3D66C 800C64CC 84431076 */ lh $v1, 0x1076($v0) +/* B3D670 800C64D0 0C0350B0 */ jal Fault_RemoveClient +/* B3D674 800C64D4 24846648 */ addiu $a0, %lo(sGraphUcodeFaultClient) # addiu $a0, $a0, 0x6648 +/* B3D678 800C64D8 3C028016 */ lui $v0, %hi(gGameInfo) # $v0, 0x8016 +/* B3D67C 800C64DC 8C42FA90 */ lw $v0, %lo(gGameInfo)($v0) +/* B3D680 800C64E0 84431076 */ lh $v1, 0x1076($v0) +.L800C64E4: +/* B3D684 800C64E4 3C04A404 */ lui $a0, 0xa404 +/* B3D688 800C64E8 04610009 */ bgez $v1, .L800C6510 +/* B3D68C 800C64EC 00000000 */ nop +/* B3D690 800C64F0 0C000AC4 */ jal LogUtils_LogHexDump +/* B3D694 800C64F4 24050020 */ li $a1, 32 +/* B3D698 800C64F8 3C04A410 */ lui $a0, 0xa410 +/* B3D69C 800C64FC 0C000AC4 */ jal LogUtils_LogHexDump +/* B3D6A0 800C6500 24050020 */ li $a1, 32 +/* B3D6A4 800C6504 3C028016 */ lui $v0, %hi(gGameInfo) # $v0, 0x8016 +/* B3D6A8 800C6508 8C42FA90 */ lw $v0, %lo(gGameInfo)($v0) +/* B3D6AC 800C650C 84431076 */ lh $v1, 0x1076($v0) +.L800C6510: +/* B3D6B0 800C6510 04630003 */ bgezl $v1, .L800C6520 +/* B3D6B4 800C6514 AFA000C4 */ sw $zero, 0xc4($sp) +/* B3D6B8 800C6518 A4401076 */ sh $zero, 0x1076($v0) +/* B3D6BC 800C651C AFA000C4 */ sw $zero, 0xc4($sp) +.L800C6520: +/* B3D6C0 800C6520 8E0F02D8 */ lw $t7, 0x2d8($s0) +/* B3D6C4 800C6524 3C09801B */ lui $t1, %hi(gGfxPools) # $t1, 0x801b +/* B3D6C8 800C6528 252941C0 */ addiu $t1, %lo(gGfxPools) # addiu $t1, $t1, 0x41c0 +/* B3D6CC 800C652C 31F80001 */ andi $t8, $t7, 1 +/* B3D6D0 800C6530 0018C8C0 */ sll $t9, $t8, 3 +/* B3D6D4 800C6534 0338C821 */ addu $t9, $t9, $t8 +/* B3D6D8 800C6538 0019C8C0 */ sll $t9, $t9, 3 +/* B3D6DC 800C653C 0338C821 */ addu $t9, $t9, $t8 +/* B3D6E0 800C6540 0019C980 */ sll $t9, $t9, 6 +/* B3D6E4 800C6544 0338C821 */ addu $t9, $t9, $t8 +/* B3D6E8 800C6548 0019C900 */ sll $t9, $t9, 4 +/* B3D6EC 800C654C 03295021 */ addu $t2, $t9, $t1 +/* B3D6F0 800C6550 AFAA004C */ sw $t2, 0x4c($sp) +/* B3D6F4 800C6554 954B0000 */ lhu $t3, ($t2) +/* B3D6F8 800C6558 24011234 */ li $at, 4660 +/* B3D6FC 800C655C 1161000B */ beq $t3, $at, .L800C658C +/* B3D700 800C6560 3C048014 */ lui $a0, %hi(D_80145394) # $a0, 0x8014 +/* B3D704 800C6564 24845394 */ addiu $a0, %lo(D_80145394) # addiu $a0, $a0, 0x5394 +/* B3D708 800C6568 0C00084C */ jal osSyncPrintf +/* B3D70C 800C656C 24050007 */ li $a1, 7 +/* B3D710 800C6570 3C048014 */ lui $a0, %hi(D_80145398) # $a0, 0x8014 +/* B3D714 800C6574 0C00084C */ jal osSyncPrintf +/* B3D718 800C6578 24845398 */ addiu $a0, %lo(D_80145398) # addiu $a0, $a0, 0x5398 +/* B3D71C 800C657C 3C048014 */ lui $a0, %hi(D_801453CC) # $a0, 0x8014 +/* B3D720 800C6580 248453CC */ addiu $a0, %lo(D_801453CC) # addiu $a0, $a0, 0x53cc +/* B3D724 800C6584 0C0359C3 */ jal Fault_AddHungupAndCrash +/* B3D728 800C6588 2405042E */ li $a1, 1070 +.L800C658C: +/* B3D72C 800C658C 8FAC004C */ lw $t4, 0x4c($sp) +/* B3D730 800C6590 3C0D0001 */ lui $t5, 1 +/* B3D734 800C6594 24015678 */ li $at, 22136 +/* B3D738 800C6598 01AC6821 */ addu $t5, $t5, $t4 +/* B3D73C 800C659C 95AD2408 */ lhu $t5, 0x2408($t5) +/* B3D740 800C65A0 11A1000D */ beq $t5, $at, .L800C65D8 +/* B3D744 800C65A4 240E0001 */ li $t6, 1 +/* B3D748 800C65A8 3C048014 */ lui $a0, %hi(D_801453D8) # $a0, 0x8014 +/* B3D74C 800C65AC AFAE00C4 */ sw $t6, 0xc4($sp) +/* B3D750 800C65B0 248453D8 */ addiu $a0, %lo(D_801453D8) # addiu $a0, $a0, 0x53d8 +/* B3D754 800C65B4 0C00084C */ jal osSyncPrintf +/* B3D758 800C65B8 24050007 */ li $a1, 7 +/* B3D75C 800C65BC 3C048014 */ lui $a0, %hi(D_801453DC) # $a0, 0x8014 +/* B3D760 800C65C0 0C00084C */ jal osSyncPrintf +/* B3D764 800C65C4 248453DC */ addiu $a0, %lo(D_801453DC) # addiu $a0, $a0, 0x53dc +/* B3D768 800C65C8 3C048014 */ lui $a0, %hi(D_80145410) # $a0, 0x8014 +/* B3D76C 800C65CC 24845410 */ addiu $a0, %lo(D_80145410) # addiu $a0, $a0, 0x5410 +/* B3D770 800C65D0 0C0359C3 */ jal Fault_AddHungupAndCrash +/* B3D774 800C65D4 24050434 */ li $a1, 1076 +.L800C65D8: +/* B3D778 800C65D8 0C030E30 */ jal THGA_IsCrash +/* B3D77C 800C65DC 260402B8 */ addiu $a0, $s0, 0x2b8 +/* B3D780 800C65E0 10400009 */ beqz $v0, .L800C6608 +/* B3D784 800C65E4 240F0001 */ li $t7, 1 +/* B3D788 800C65E8 3C048014 */ lui $a0, %hi(D_8014541C) # $a0, 0x8014 +/* B3D78C 800C65EC AFAF00C4 */ sw $t7, 0xc4($sp) +/* B3D790 800C65F0 2484541C */ addiu $a0, %lo(D_8014541C) # addiu $a0, $a0, 0x541c +/* B3D794 800C65F4 0C00084C */ jal osSyncPrintf +/* B3D798 800C65F8 24050007 */ li $a1, 7 +/* B3D79C 800C65FC 3C048014 */ lui $a0, %hi(D_80145420) # $a0, 0x8014 +/* B3D7A0 800C6600 0C00084C */ jal osSyncPrintf +/* B3D7A4 800C6604 24845420 */ addiu $a0, %lo(D_80145420) # addiu $a0, $a0, 0x5420 +.L800C6608: +/* B3D7A8 800C6608 0C030E30 */ jal THGA_IsCrash +/* B3D7AC 800C660C 260402C8 */ addiu $a0, $s0, 0x2c8 +/* B3D7B0 800C6610 10400009 */ beqz $v0, .L800C6638 +/* B3D7B4 800C6614 24180001 */ li $t8, 1 +/* B3D7B8 800C6618 3C048014 */ lui $a0, %hi(D_8014545C) # $a0, 0x8014 +/* B3D7BC 800C661C AFB800C4 */ sw $t8, 0xc4($sp) +/* B3D7C0 800C6620 2484545C */ addiu $a0, %lo(D_8014545C) # addiu $a0, $a0, 0x545c +/* B3D7C4 800C6624 0C00084C */ jal osSyncPrintf +/* B3D7C8 800C6628 24050007 */ li $a1, 7 +/* B3D7CC 800C662C 3C048014 */ lui $a0, %hi(D_80145460) # $a0, 0x8014 +/* B3D7D0 800C6630 0C00084C */ jal osSyncPrintf +/* B3D7D4 800C6634 24845460 */ addiu $a0, %lo(D_80145460) # addiu $a0, $a0, 0x5460 +.L800C6638: +/* B3D7D8 800C6638 0C030E30 */ jal THGA_IsCrash +/* B3D7DC 800C663C 260402A8 */ addiu $a0, $s0, 0x2a8 +/* B3D7E0 800C6640 10400009 */ beqz $v0, .L800C6668 +/* B3D7E4 800C6644 24190001 */ li $t9, 1 +/* B3D7E8 800C6648 3C048014 */ lui $a0, %hi(D_8014549C) # $a0, 0x8014 +/* B3D7EC 800C664C AFB900C4 */ sw $t9, 0xc4($sp) +/* B3D7F0 800C6650 2484549C */ addiu $a0, %lo(D_8014549C) # addiu $a0, $a0, 0x549c +/* B3D7F4 800C6654 0C00084C */ jal osSyncPrintf +/* B3D7F8 800C6658 24050007 */ li $a1, 7 +/* B3D7FC 800C665C 3C048014 */ lui $a0, %hi(D_801454A0) # $a0, 0x8014 +/* B3D800 800C6660 0C00084C */ jal osSyncPrintf +/* B3D804 800C6664 248454A0 */ addiu $a0, %lo(D_801454A0) # addiu $a0, $a0, 0x54a0 +.L800C6668: +/* B3D808 800C6668 8FA900C4 */ lw $t1, 0xc4($sp) +/* B3D80C 800C666C 15200009 */ bnez $t1, .L800C6694 +/* B3D810 800C6670 00000000 */ nop +/* B3D814 800C6674 0C031770 */ jal Graph_TaskSet00 +/* B3D818 800C6678 02002025 */ move $a0, $s0 +/* B3D81C 800C667C 8E0A02D8 */ lw $t2, 0x2d8($s0) +/* B3D820 800C6680 8E0C02E8 */ lw $t4, 0x2e8($s0) +/* B3D824 800C6684 254B0001 */ addiu $t3, $t2, 1 +/* B3D828 800C6688 258D0001 */ addiu $t5, $t4, 1 +/* B3D82C 800C668C AE0B02D8 */ sw $t3, 0x2d8($s0) +/* B3D830 800C6690 AE0D02E8 */ sw $t5, 0x2e8($s0) +.L800C6694: +/* B3D834 800C6694 0C03CC15 */ jal func_800F3054 +/* B3D838 800C6698 00000000 */ nop +/* B3D83C 800C669C 0C001A78 */ jal osGetTime +/* B3D840 800C66A0 00000000 */ nop +/* B3D844 800C66A4 3C048017 */ lui $a0, %hi(D_8016A568) # $a0, 0x8017 +/* B3D848 800C66A8 2484A568 */ addiu $a0, %lo(D_8016A568) # addiu $a0, $a0, -0x5a98 +/* B3D84C 800C66AC 8C8E0000 */ lw $t6, ($a0) +/* B3D850 800C66B0 8C8F0004 */ lw $t7, 4($a0) +/* B3D854 800C66B4 3C188017 */ lui $t8, %hi(D_8016A538) # $t8, 0x8017 +/* B3D858 800C66B8 2718A538 */ addiu $t8, %lo(D_8016A538) # addiu $t8, $t8, -0x5ac8 +/* B3D85C 800C66BC 3C058017 */ lui $a1, %hi(D_8016A560) # $a1, 0x8017 +/* B3D860 800C66C0 AF0E0000 */ sw $t6, ($t8) +/* B3D864 800C66C4 24A5A560 */ addiu $a1, %lo(D_8016A560) # addiu $a1, $a1, -0x5aa0 +/* B3D868 800C66C8 AF0F0004 */ sw $t7, 4($t8) +/* B3D86C 800C66CC 8CAA0000 */ lw $t2, ($a1) +/* B3D870 800C66D0 8CAB0004 */ lw $t3, 4($a1) +/* B3D874 800C66D4 3C198017 */ lui $t9, %hi(D_8016A530) # $t9, 0x8017 +/* B3D878 800C66D8 2739A530 */ addiu $t9, %lo(D_8016A530) # addiu $t9, $t9, -0x5ad0 +/* B3D87C 800C66DC 3C068017 */ lui $a2, %hi(D_8016A580) # $a2, 0x8017 +/* B3D880 800C66E0 AF2A0000 */ sw $t2, ($t9) +/* B3D884 800C66E4 24C6A580 */ addiu $a2, %lo(D_8016A580) # addiu $a2, $a2, -0x5a80 +/* B3D888 800C66E8 AF2B0004 */ sw $t3, 4($t9) +/* B3D88C 800C66EC 8CCC0000 */ lw $t4, ($a2) +/* B3D890 800C66F0 8CCD0004 */ lw $t5, 4($a2) +/* B3D894 800C66F4 3C098017 */ lui $t1, %hi(D_8016A540) # $t1, 0x8017 +/* B3D898 800C66F8 2529A540 */ addiu $t1, %lo(D_8016A540) # addiu $t1, $t1, -0x5ac0 +/* B3D89C 800C66FC AD2C0000 */ sw $t4, ($t1) +/* B3D8A0 800C6700 AD2D0004 */ sw $t5, 4($t1) +/* B3D8A4 800C6704 240E0000 */ li $t6, 0 +/* B3D8A8 800C6708 AC8E0000 */ sw $t6, ($a0) +/* B3D8AC 800C670C 240F0000 */ li $t7, 0 +/* B3D8B0 800C6710 AC8F0004 */ sw $t7, 4($a0) +/* B3D8B4 800C6714 24180000 */ li $t8, 0 +/* B3D8B8 800C6718 ACB80000 */ sw $t8, ($a1) +/* B3D8BC 800C671C 24190000 */ li $t9, 0 +/* B3D8C0 800C6720 ACB90004 */ sw $t9, 4($a1) +/* B3D8C4 800C6724 240A0000 */ li $t2, 0 +/* B3D8C8 800C6728 ACCA0000 */ sw $t2, ($a2) +/* B3D8CC 800C672C 240B0000 */ li $t3, 0 +/* B3D8D0 800C6730 ACCB0004 */ sw $t3, 4($a2) +/* B3D8D4 800C6734 3C0C8016 */ lui $t4, %hi(sGraphUpdateTime) # $t4, 0x8016 +/* B3D8D8 800C6738 8D8C65D0 */ lw $t4, %lo(sGraphUpdateTime)($t4) +/* B3D8DC 800C673C 3C0D8016 */ lui $t5, %hi(sGraphUpdateTime+4) # $t5, 0x8016 +/* B3D8E0 800C6740 8DAD65D4 */ lw $t5, %lo(sGraphUpdateTime+4)($t5) +/* B3D8E4 800C6744 AFAC0020 */ sw $t4, 0x20($sp) +/* B3D8E8 800C6748 15800002 */ bnez $t4, .L800C6754 +/* B3D8EC 800C674C AFAD0024 */ sw $t5, 0x24($sp) +/* B3D8F0 800C6750 11A00008 */ beqz $t5, .L800C6774 +.L800C6754: +/* B3D8F4 800C6754 006D082B */ sltu $at, $v1, $t5 +/* B3D8F8 800C6758 004C7023 */ subu $t6, $v0, $t4 +/* B3D8FC 800C675C 3C098017 */ lui $t1, %hi(D_8016A548) # $t1, 0x8017 +/* B3D900 800C6760 2529A548 */ addiu $t1, %lo(D_8016A548) # addiu $t1, $t1, -0x5ab8 +/* B3D904 800C6764 01C17023 */ subu $t6, $t6, $at +/* B3D908 800C6768 AD2E0000 */ sw $t6, ($t1) +/* B3D90C 800C676C 006D7823 */ subu $t7, $v1, $t5 +/* B3D910 800C6770 AD2F0004 */ sw $t7, 4($t1) +.L800C6774: +/* B3D914 800C6774 3C048013 */ lui $a0, %hi(D_8012DBC0) # $a0, 0x8013 +/* B3D918 800C6778 8C84DBC0 */ lw $a0, %lo(D_8012DBC0)($a0) +/* B3D91C 800C677C 3C018016 */ lui $at, %hi(sGraphUpdateTime+4) # $at, 0x8016 +/* B3D920 800C6780 AC2265D0 */ sw $v0, %lo(sGraphUpdateTime)($at) +/* B3D924 800C6784 10800015 */ beqz $a0, .L800C67DC +/* B3D928 800C6788 AC2365D4 */ sw $v1, %lo(sGraphUpdateTime+4)($at) +/* B3D92C 800C678C 8FA200CC */ lw $v0, 0xcc($sp) +/* B3D930 800C6790 2401DFFF */ li $at, -8193 +/* B3D934 800C6794 94580020 */ lhu $t8, 0x20($v0) +/* B3D938 800C6798 0301C827 */ nor $t9, $t8, $at +/* B3D93C 800C679C 1720000F */ bnez $t9, .L800C67DC +/* B3D940 800C67A0 00000000 */ nop +/* B3D944 800C67A4 944A0014 */ lhu $t2, 0x14($v0) +/* B3D948 800C67A8 2401FFCF */ li $at, -49 +/* B3D94C 800C67AC 3C0C8080 */ lui $t4, %hi(func_80801E44) # $t4, 0x8080 +/* B3D950 800C67B0 01415827 */ nor $t3, $t2, $at +/* B3D954 800C67B4 15600009 */ bnez $t3, .L800C67DC +/* B3D958 800C67B8 3C018016 */ lui $at, %hi(gSaveContext+0x135c) # $at, 0x8016 +/* B3D95C 800C67BC AC20F9BC */ sw $zero, %lo(gSaveContext+0x135c)($at) +/* B3D960 800C67C0 258C1E44 */ addiu $t4, %lo(func_80801E44) # addiu $t4, $t4, 0x1e44 +/* B3D964 800C67C4 240D0240 */ li $t5, 576 +/* B3D968 800C67C8 AC4D0010 */ sw $t5, 0x10($v0) +/* B3D96C 800C67CC AC4C000C */ sw $t4, 0xc($v0) +/* B3D970 800C67D0 AC400098 */ sw $zero, 0x98($v0) +/* B3D974 800C67D4 3C048013 */ lui $a0, %hi(D_8012DBC0) # $a0, 0x8013 +/* B3D978 800C67D8 8C84DBC0 */ lw $a0, %lo(D_8012DBC0)($a0) +.L800C67DC: +/* B3D97C 800C67DC 10800014 */ beqz $a0, .L800C6830 +/* B3D980 800C67E0 3C048016 */ lui $a0, %hi(gAppNmiBufferPtr) # $a0, 0x8016 +/* B3D984 800C67E4 0C01EFC2 */ jal PreNmiBuff_IsResetting +/* B3D988 800C67E8 8C846660 */ lw $a0, %lo(gAppNmiBufferPtr)($a0) +/* B3D98C 800C67EC 10400010 */ beqz $v0, .L800C6830 +/* B3D990 800C67F0 8FAE00CC */ lw $t6, 0xcc($sp) +/* B3D994 800C67F4 8DCF00A0 */ lw $t7, 0xa0($t6) +/* B3D998 800C67F8 3C048014 */ lui $a0, %hi(D_801454DC) # $a0, 0x8014 +/* B3D99C 800C67FC 55E0000D */ bnezl $t7, .L800C6834 +/* B3D9A0 800C6800 8FBF001C */ lw $ra, 0x1c($sp) +/* B3D9A4 800C6804 0C00084C */ jal osSyncPrintf +/* B3D9A8 800C6808 248454DC */ addiu $a0, %lo(D_801454DC) # addiu $a0, $a0, 0x54dc +/* B3D9AC 800C680C 8FB800CC */ lw $t8, 0xcc($sp) +/* B3D9B0 800C6810 3C098009 */ lui $t1, %hi(PreNMI_Init) # $t1, 0x8009 +/* B3D9B4 800C6814 252924B8 */ addiu $t1, %lo(PreNMI_Init) # addiu $t1, $t1, 0x24b8 +/* B3D9B8 800C6818 AF09000C */ sw $t1, 0xc($t8) +/* B3D9BC 800C681C 8FAA00CC */ lw $t2, 0xcc($sp) +/* B3D9C0 800C6820 241900AC */ li $t9, 172 +/* B3D9C4 800C6824 AD590010 */ sw $t9, 0x10($t2) +/* B3D9C8 800C6828 8FAB00CC */ lw $t3, 0xcc($sp) +/* B3D9CC 800C682C AD600098 */ sw $zero, 0x98($t3) +.L800C6830: +/* B3D9D0 800C6830 8FBF001C */ lw $ra, 0x1c($sp) +.L800C6834: +/* B3D9D4 800C6834 8FB00018 */ lw $s0, 0x18($sp) +/* B3D9D8 800C6838 27BD00C8 */ addiu $sp, $sp, 0xc8 +/* B3D9DC 800C683C 03E00008 */ jr $ra +/* B3D9E0 800C6840 00000000 */ nop \ No newline at end of file diff --git a/asm/non_matchings/code/speed_meter/func_800C99C4.s b/asm/non_matchings/code/speed_meter/func_800C99C4.s index aef1b548a8..2a95df626f 100644 --- a/asm/non_matchings/code/speed_meter/func_800C99C4.s +++ b/asm/non_matchings/code/speed_meter/func_800C99C4.s @@ -23,7 +23,7 @@ glabel func_800C99C4 /* B40B90 800C99F0 27A400B4 */ addiu $a0, $sp, 0xb4 /* B40B94 800C99F4 240700E1 */ li $a3, 225 /* B40B98 800C99F8 AFA20208 */ sw $v0, 0x208($sp) -/* B40B9C 800C99FC 0C031AB1 */ jal func_800C6AC4 +/* B40B9C 800C99FC 0C031AB1 */ jal Graph_OpenDisps /* B40BA0 800C9A00 24520002 */ addiu $s2, $v0, 2 /* B40BA4 800C9A04 3C0E8013 */ lui $t6, %hi(sIrqMgrRetraceTime) # $t6, 0x8013 /* B40BA8 800C9A08 25CEDBE0 */ addiu $t6, %lo(sIrqMgrRetraceTime) # addiu $t6, $t6, -0x2420 @@ -275,7 +275,7 @@ glabel func_800C99C4 /* B40F74 800C9DD4 3C068014 */ lui $a2, %hi(D_80146260) # $a2, 0x8014 /* B40F78 800C9DD8 24C66260 */ addiu $a2, %lo(D_80146260) # addiu $a2, $a2, 0x6260 /* B40F7C 800C9DDC AF3802B0 */ sw $t8, 0x2b0($t9) -/* B40F80 800C9DE0 0C031AD5 */ jal func_800C6B54 +/* B40F80 800C9DE0 0C031AD5 */ jal Graph_CloseDisps /* B40F84 800C9DE4 8FA50224 */ lw $a1, 0x224($sp) .L800C9DE8: /* B40F88 800C9DE8 8FBF0034 */ lw $ra, 0x34($sp) diff --git a/asm/non_matchings/code/speed_meter/func_800C9E44.s b/asm/non_matchings/code/speed_meter/func_800C9E44.s index bb8e80ec79..ad7f7a0adc 100644 --- a/asm/non_matchings/code/speed_meter/func_800C9E44.s +++ b/asm/non_matchings/code/speed_meter/func_800C9E44.s @@ -53,7 +53,7 @@ glabel func_800C9E44 .L800C9EA8: /* B41048 800C9EA8 3C068014 */ lui $a2, %hi(D_801462A8) # $a2, 0x8014 /* B4104C 800C9EAC 24C662A8 */ addiu $a2, %lo(D_801462A8) # addiu $a2, $a2, 0x62a8 -/* B41050 800C9EB0 0C031AB1 */ jal func_800C6AC4 +/* B41050 800C9EB0 0C031AB1 */ jal Graph_OpenDisps /* B41054 800C9EB4 2407013E */ li $a3, 318 /* B41058 800C9EB8 27A40080 */ addiu $a0, $sp, 0x80 /* B4105C 800C9EBC 0C02A89E */ jal func_800AA278 @@ -197,7 +197,7 @@ glabel func_800C9E44 /* B4127C 800CA0DC 8FAF01B4 */ lw $t7, 0x1b4($sp) /* B41280 800CA0E0 8FB8007C */ lw $t8, 0x7c($sp) /* B41284 800CA0E4 ADF802B0 */ sw $t8, 0x2b0($t7) -/* B41288 800CA0E8 0C031AD5 */ jal func_800C6B54 +/* B41288 800CA0E8 0C031AD5 */ jal Graph_CloseDisps /* B4128C 800CA0EC 8FA501B4 */ lw $a1, 0x1b4($sp) /* B41290 800CA0F0 8FBF001C */ lw $ra, 0x1c($sp) .L800CA0F4: diff --git a/asm/non_matchings/code/sys_cfb/SysCfb_Init.s b/asm/non_matchings/code/sys_cfb/SysCfb_Init.s deleted file mode 100644 index b963aaa53a..0000000000 --- a/asm/non_matchings/code/sys_cfb/SysCfb_Init.s +++ /dev/null @@ -1,123 +0,0 @@ -.rdata -glabel D_801462D0 - .asciz "８Ｍバイト以上のメモリが搭載されています\n" - # EUC-JP: ８Ｍバイト以上のメモリが搭載されています | 8MB or more memory is installed - .balign 4 - -glabel D_801462FC - .asciz "RAM 8M mode (N64DD対応)\n" - # EUC-JP: 対応 | Correspondence - .balign 4 - -glabel D_80146318 - .asciz "このバージョンのマージンは %dK バイトです\n" - # EUC-JP: このバージョンのマージンは %dK バイトです | The margin for this version is% dK bytes - .balign 4 - -glabel D_80146344 - .asciz "RAM4M mode\n" - .balign 4 - -glabel D_80146350 - .asciz "../sys_cfb.c" - .balign 4 - -glabel D_80146360 - .asciz "システムが使用する最終アドレスは %08x です\n" - # EUC-JP: システムが使用する最終アドレスは %08x です | The final address used by the system is% 08x - .balign 4 - -glabel D_8014638C - .asciz "フレームバッファのアドレスは %08x と %08x です\n" - # EUC-JP: フレームバッファのアドレスは %08x と %08x です | Frame buffer addresses are% 08x and% 08x - .balign 4 - -.text -glabel SysCfb_Init -/* B41540 800CA3A0 3C028000 */ lui $v0, %hi(osMemSize) # $v0, 0x8000 -/* B41544 800CA3A4 8C420318 */ lw $v0, %lo(osMemSize)($v0) -/* B41548 800CA3A8 3C010080 */ lui $at, 0x80 -/* B4154C 800CA3AC 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* B41550 800CA3B0 0041082B */ sltu $at, $v0, $at -/* B41554 800CA3B4 AFBF0014 */ sw $ra, 0x14($sp) -/* B41558 800CA3B8 1420001C */ bnez $at, .L800CA42C -/* B4155C 800CA3BC AFA40018 */ sw $a0, 0x18($sp) -/* B41560 800CA3C0 3C048014 */ lui $a0, %hi(D_801462D0) # $a0, 0x8014 -/* B41564 800CA3C4 0C00084C */ jal osSyncPrintf -/* B41568 800CA3C8 248462D0 */ addiu $a0, %lo(D_801462D0) # addiu $a0, $a0, 0x62d0 -/* B4156C 800CA3CC 8FAE0018 */ lw $t6, 0x18($sp) -/* B41570 800CA3D0 24010001 */ li $at, 1 -/* B41574 800CA3D4 3C048014 */ lui $a0, %hi(D_801462FC) # $a0, 0x8014 -/* B41578 800CA3D8 15C10009 */ bne $t6, $at, .L800CA400 -/* B4157C 800CA3DC 00000000 */ nop -/* B41580 800CA3E0 0C00084C */ jal osSyncPrintf -/* B41584 800CA3E4 248462FC */ addiu $a0, %lo(D_801462FC) # addiu $a0, $a0, 0x62fc -/* B41588 800CA3E8 3C028017 */ lui $v0, %hi(sSysCfbEnd) # $v0, 0x8017 -/* B4158C 800CA3EC 3C0F805F */ lui $t7, (0x805FB000 >> 16) # lui $t7, 0x805f -/* B41590 800CA3F0 2442A598 */ addiu $v0, %lo(sSysCfbEnd) # addiu $v0, $v0, -0x5a68 -/* B41594 800CA3F4 35EFB000 */ ori $t7, (0x805FB000 & 0xFFFF) # ori $t7, $t7, 0xb000 -/* B41598 800CA3F8 1000001E */ b .L800CA474 -/* B4159C 800CA3FC AC4F0000 */ sw $t7, ($v0) -.L800CA400: -/* B415A0 800CA400 3C048014 */ lui $a0, %hi(D_80146318) # $a0, 0x8014 -/* B415A4 800CA404 24846318 */ addiu $a0, %lo(D_80146318) # addiu $a0, $a0, 0x6318 -/* B415A8 800CA408 0C00084C */ jal osSyncPrintf -/* B415AC 800CA40C 2405012F */ li $a1, 303 -/* B415B0 800CA410 3C188044 */ lui $t8, (0x8044BE80 >> 16) # lui $t8, 0x8044 -/* B415B4 800CA414 3718BE80 */ ori $t8, (0x8044BE80 & 0xFFFF) # ori $t8, $t8, 0xbe80 -/* B415B8 800CA418 3C018017 */ lui $at, %hi(sSysCfbEnd) # $at, 0x8017 -/* B415BC 800CA41C 3C028017 */ lui $v0, %hi(sSysCfbEnd) # $v0, 0x8017 -/* B415C0 800CA420 2442A598 */ addiu $v0, %lo(sSysCfbEnd) # addiu $v0, $v0, -0x5a68 -/* B415C4 800CA424 10000013 */ b .L800CA474 -/* B415C8 800CA428 AC38A598 */ sw $t8, %lo(sSysCfbEnd)($at) -.L800CA42C: -/* B415CC 800CA42C 3C010040 */ lui $at, 0x40 -/* B415D0 800CA430 0041082B */ sltu $at, $v0, $at -/* B415D4 800CA434 1420000A */ bnez $at, .L800CA460 -/* B415D8 800CA438 3C048014 */ lui $a0, %hi(D_80146350) -/* B415DC 800CA43C 3C048014 */ lui $a0, %hi(D_80146344) # $a0, 0x8014 -/* B415E0 800CA440 0C00084C */ jal osSyncPrintf -/* B415E4 800CA444 24846344 */ addiu $a0, %lo(D_80146344) # addiu $a0, $a0, 0x6344 -/* B415E8 800CA448 3C198040 */ lui $t9, 0x8040 -/* B415EC 800CA44C 3C018017 */ lui $at, %hi(sSysCfbEnd) # $at, 0x8017 -/* B415F0 800CA450 3C028017 */ lui $v0, %hi(sSysCfbEnd) # $v0, 0x8017 -/* B415F4 800CA454 2442A598 */ addiu $v0, %lo(sSysCfbEnd) # addiu $v0, $v0, -0x5a68 -/* B415F8 800CA458 10000006 */ b .L800CA474 -/* B415FC 800CA45C AC39A598 */ sw $t9, %lo(sSysCfbEnd)($at) -.L800CA460: -/* B41600 800CA460 24846350 */ addiu $a0, %lo(D_80146350) -/* B41604 800CA464 0C000B94 */ jal LogUtils_HungupThread -/* B41608 800CA468 24050162 */ li $a1, 354 -/* B4160C 800CA46C 3C028017 */ lui $v0, %hi(sSysCfbEnd) # $v0, 0x8017 -/* B41610 800CA470 2442A598 */ addiu $v0, %lo(sSysCfbEnd) # addiu $v0, $v0, -0x5a68 -.L800CA474: -/* B41614 800CA474 8C480000 */ lw $t0, ($v0) -/* B41618 800CA478 2401FFC0 */ li $at, -64 -/* B4161C 800CA47C 3C048014 */ lui $a0, %hi(D_80146360) # $a0, 0x8014 -/* B41620 800CA480 01012824 */ and $a1, $t0, $at -/* B41624 800CA484 AC450000 */ sw $a1, ($v0) -/* B41628 800CA488 0C00084C */ jal osSyncPrintf -/* B4162C 800CA48C 24846360 */ addiu $a0, %lo(D_80146360) # addiu $a0, $a0, 0x6360 -/* B41630 800CA490 3C028017 */ lui $v0, %hi(sSysCfbEnd) # $v0, 0x8017 -/* B41634 800CA494 8C42A598 */ lw $v0, %lo(sSysCfbEnd)($v0) -/* B41638 800CA498 3C01FFFB */ lui $at, (0xFFFB5000 >> 16) # lui $at, 0xfffb -/* B4163C 800CA49C 34215000 */ ori $at, (0xFFFB5000 & 0xFFFF) # ori $at, $at, 0x5000 -/* B41640 800CA4A0 00415021 */ addu $t2, $v0, $at -/* B41644 800CA4A4 3C018017 */ lui $at, %hi(sSysCfbFbPtr) # $at, 0x8017 -/* B41648 800CA4A8 AC2AA590 */ sw $t2, %lo(sSysCfbFbPtr)($at) -/* B4164C 800CA4AC 3C01FFFD */ lui $at, (0xFFFDA800 >> 16) # lui $at, 0xfffd -/* B41650 800CA4B0 3421A800 */ ori $at, (0xFFFDA800 & 0xFFFF) # ori $at, $at, 0xa800 -/* B41654 800CA4B4 00415821 */ addu $t3, $v0, $at -/* B41658 800CA4B8 3C038017 */ lui $v1, %hi(sSysCfbFbPtr) # $v1, 0x8017 -/* B4165C 800CA4BC 3C018017 */ lui $at, %hi(sSysCfbFbPtr+4) # $at, 0x8017 -/* B41660 800CA4C0 2463A590 */ addiu $v1, %lo(sSysCfbFbPtr) # addiu $v1, $v1, -0x5a70 -/* B41664 800CA4C4 AC2BA594 */ sw $t3, %lo(sSysCfbFbPtr+4)($at) -/* B41668 800CA4C8 3C048014 */ lui $a0, %hi(D_8014638C) # $a0, 0x8014 -/* B4166C 800CA4CC 2484638C */ addiu $a0, %lo(D_8014638C) # addiu $a0, $a0, 0x638c -/* B41670 800CA4D0 8C660004 */ lw $a2, 4($v1) -/* B41674 800CA4D4 0C00084C */ jal osSyncPrintf -/* B41678 800CA4D8 8C650000 */ lw $a1, ($v1) -/* B4167C 800CA4DC 8FBF0014 */ lw $ra, 0x14($sp) -/* B41680 800CA4E0 27BD0018 */ addiu $sp, $sp, 0x18 -/* B41684 800CA4E4 03E00008 */ jr $ra -/* B41688 800CA4E8 00000000 */ nop diff --git a/asm/non_matchings/code/sys_matrix/func_800D20CC.s b/asm/non_matchings/code/sys_matrix/func_800D20CC.s index 77305e9643..5e3a8efcdd 100644 --- a/asm/non_matchings/code/sys_matrix/func_800D20CC.s +++ b/asm/non_matchings/code/sys_matrix/func_800D20CC.s @@ -30,7 +30,7 @@ glabel func_800D20CC /* B49298 800D20F8 46021102 */ mul.s $f4, $f2, $f2 /* B4929C 800D20FC 46006307 */ neg.s $f12, $f12 /* B492A0 800D2100 4604A500 */ add.s $f20, $f20, $f4 -/* B492A4 800D2104 0C03F494 */ jal func_800FD250 +/* B492A4 800D2104 0C03F494 */ jal Math_atan2f /* B492A8 800D2108 4600A384 */ sqrt.s $f14, $f20 /* B492AC 800D210C 3C018014 */ lui $at, %hi(D_80146640) /* B492B0 800D2110 C4266640 */ lwc1 $f6, %lo(D_80146640)($at) @@ -50,7 +50,7 @@ glabel func_800D20CC /* B492E4 800D2144 A6000004 */ sh $zero, 4($s0) /* B492E8 800D2148 C48C0008 */ lwc1 $f12, 8($a0) /* B492EC 800D214C C48E0000 */ lwc1 $f14, ($a0) -/* B492F0 800D2150 0C03F494 */ jal func_800FD250 +/* B492F0 800D2150 0C03F494 */ jal Math_atan2f /* B492F4 800D2154 46006307 */ neg.s $f12, $f12 /* B492F8 800D2158 3C018014 */ lui $at, %hi(D_80146644) /* B492FC 800D215C C4326644 */ lwc1 $f18, %lo(D_80146644)($at) @@ -62,7 +62,7 @@ glabel func_800D20CC /* B49314 800D2174 C48C0020 */ lwc1 $f12, 0x20($a0) .L800D2178: /* B49318 800D2178 C48E0028 */ lwc1 $f14, 0x28($a0) -/* B4931C 800D217C 0C03F494 */ jal func_800FD250 +/* B4931C 800D217C 0C03F494 */ jal Math_atan2f /* B49320 800D2180 AFA40028 */ sw $a0, 0x28($sp) /* B49324 800D2184 3C018014 */ lui $at, %hi(D_80146648) /* B49328 800D2188 C4286648 */ lwc1 $f8, %lo(D_80146648)($at) @@ -76,7 +76,7 @@ glabel func_800D20CC /* B49348 800D21A8 5540000C */ bnezl $t2, .L800D21DC /* B4934C 800D21AC C4940000 */ lwc1 $f20, ($a0) /* B49350 800D21B0 C48C0004 */ lwc1 $f12, 4($a0) -/* B49354 800D21B4 0C03F494 */ jal func_800FD250 +/* B49354 800D21B4 0C03F494 */ jal Math_atan2f /* B49358 800D21B8 C48E0014 */ lwc1 $f14, 0x14($a0) /* B4935C 800D21BC 3C018014 */ lui $at, %hi(D_8014664C) /* B49360 800D21C0 C424664C */ lwc1 $f4, %lo(D_8014664C)($at) @@ -107,7 +107,7 @@ glabel func_800D20CC /* B493C0 800D2220 46041080 */ add.s $f2, $f2, $f4 /* B493C4 800D2224 46061080 */ add.s $f2, $f2, $f6 /* B493C8 800D2228 46001004 */ sqrt.s $f0, $f2 -/* B493CC 800D222C 0C03F494 */ jal func_800FD250 +/* B493CC 800D222C 0C03F494 */ jal Math_atan2f /* B493D0 800D2230 46008383 */ div.s $f14, $f16, $f0 /* B493D4 800D2234 3C018014 */ lui $at, %hi(D_80146650) /* B493D8 800D2238 C4286650 */ lwc1 $f8, %lo(D_80146650)($at) diff --git a/asm/non_matchings/code/sys_matrix/func_800D2264.s b/asm/non_matchings/code/sys_matrix/func_800D2264.s index 707546874d..0d1893e827 100644 --- a/asm/non_matchings/code/sys_matrix/func_800D2264.s +++ b/asm/non_matchings/code/sys_matrix/func_800D2264.s @@ -30,7 +30,7 @@ glabel func_800D2264 /* B49430 800D2290 46021102 */ mul.s $f4, $f2, $f2 /* B49434 800D2294 46006307 */ neg.s $f12, $f12 /* B49438 800D2298 4604A500 */ add.s $f20, $f20, $f4 -/* B4943C 800D229C 0C03F494 */ jal func_800FD250 +/* B4943C 800D229C 0C03F494 */ jal Math_atan2f /* B49440 800D22A0 4600A384 */ sqrt.s $f14, $f20 /* B49444 800D22A4 3C018014 */ lui $at, %hi(D_80146654) /* B49448 800D22A8 C4266654 */ lwc1 $f6, %lo(D_80146654)($at) @@ -50,7 +50,7 @@ glabel func_800D2264 /* B4947C 800D22DC A6000000 */ sh $zero, ($s0) /* B49480 800D22E0 C48C0010 */ lwc1 $f12, 0x10($a0) /* B49484 800D22E4 C48E0014 */ lwc1 $f14, 0x14($a0) -/* B49488 800D22E8 0C03F494 */ jal func_800FD250 +/* B49488 800D22E8 0C03F494 */ jal Math_atan2f /* B4948C 800D22EC 46006307 */ neg.s $f12, $f12 /* B49490 800D22F0 3C018014 */ lui $at, %hi(D_80146658) /* B49494 800D22F4 C4326658 */ lwc1 $f18, %lo(D_80146658)($at) @@ -62,7 +62,7 @@ glabel func_800D2264 /* B494AC 800D230C C48C0004 */ lwc1 $f12, 4($a0) .L800D2310: /* B494B0 800D2310 C48E0000 */ lwc1 $f14, ($a0) -/* B494B4 800D2314 0C03F494 */ jal func_800FD250 +/* B494B4 800D2314 0C03F494 */ jal Math_atan2f /* B494B8 800D2318 AFA40028 */ sw $a0, 0x28($sp) /* B494BC 800D231C 3C018014 */ lui $at, %hi(D_8014665C) /* B494C0 800D2320 C428665C */ lwc1 $f8, %lo(D_8014665C)($at) @@ -76,7 +76,7 @@ glabel func_800D2264 /* B494E0 800D2340 5540000C */ bnezl $t2, .L800D2374 /* B494E4 800D2344 C4940010 */ lwc1 $f20, 0x10($a0) /* B494E8 800D2348 C48C0018 */ lwc1 $f12, 0x18($a0) -/* B494EC 800D234C 0C03F494 */ jal func_800FD250 +/* B494EC 800D234C 0C03F494 */ jal Math_atan2f /* B494F0 800D2350 C48E0028 */ lwc1 $f14, 0x28($a0) /* B494F4 800D2354 3C018014 */ lui $at, %hi(D_80146660) /* B494F8 800D2358 C4246660 */ lwc1 $f4, %lo(D_80146660)($at) @@ -107,7 +107,7 @@ glabel func_800D2264 /* B49558 800D23B8 46041080 */ add.s $f2, $f2, $f4 /* B4955C 800D23BC 46061080 */ add.s $f2, $f2, $f6 /* B49560 800D23C0 46001004 */ sqrt.s $f0, $f2 -/* B49564 800D23C4 0C03F494 */ jal func_800FD250 +/* B49564 800D23C4 0C03F494 */ jal Math_atan2f /* B49568 800D23C8 46008383 */ div.s $f14, $f16, $f0 /* B4956C 800D23CC 3C018014 */ lui $at, %hi(D_80146664) /* B49570 800D23D0 C4286664 */ lwc1 $f8, %lo(D_80146664)($at) diff --git a/asm/non_matchings/code/z_actor/ActorShadow_DrawFunc_Teardrop.s b/asm/non_matchings/code/z_actor/ActorShadow_DrawFunc_Teardrop.s index 034a5e4c36..11b39f0082 100644 --- a/asm/non_matchings/code/z_actor/ActorShadow_DrawFunc_Teardrop.s +++ b/asm/non_matchings/code/z_actor/ActorShadow_DrawFunc_Teardrop.s @@ -141,10 +141,10 @@ glabel ActorShadow_DrawFunc_Teardrop /* AA2C1C 8002BA7C 8E850000 */ lw $a1, ($s4) /* AA2C20 8002BA80 240706CD */ li $a3, 1741 /* AA2C24 8002BA84 26D6FFFE */ addiu $s6, $s6, -2 -/* AA2C28 8002BA88 0C031AB1 */ jal func_800C6AC4 +/* AA2C28 8002BA88 0C031AB1 */ jal Graph_OpenDisps /* AA2C2C 8002BA8C 00A08025 */ move $s0, $a1 /* AA2C30 8002BA90 8E0402C0 */ lw $a0, 0x2c0($s0) -/* AA2C34 8002BA94 0C024DDD */ jal func_80093774 +/* AA2C34 8002BA94 0C024DDD */ jal Gfx_CallSetupDL /* AA2C38 8002BA98 2405002C */ li $a1, 44 /* AA2C3C 8002BA9C 3C014248 */ li $at, 0x42480000 # 0.000000 /* AA2C40 8002BAA0 4481E000 */ mtc1 $at, $f28 @@ -340,7 +340,7 @@ glabel ActorShadow_DrawFunc_Teardrop .L8002BD5C: /* AA2EFC 8002BD5C 8E850000 */ lw $a1, ($s4) .L8002BD60: -/* AA2F00 8002BD60 0C031AD5 */ jal func_800C6B54 +/* AA2F00 8002BD60 0C031AD5 */ jal Graph_CloseDisps /* AA2F04 8002BD64 24070727 */ li $a3, 1831 .L8002BD68: /* AA2F08 8002BD68 8FBF007C */ lw $ra, 0x7c($sp) diff --git a/asm/non_matchings/code/z_actor/TitleCard_Draw.s b/asm/non_matchings/code/z_actor/TitleCard_Draw.s deleted file mode 100644 index de9f881306..0000000000 --- a/asm/non_matchings/code/z_actor/TitleCard_Draw.s +++ /dev/null @@ -1,388 +0,0 @@ -.rdata -glabel D_80136160 - .asciz "../z_actor.c" - .balign 4 - -glabel D_80136170 - .asciz "../z_actor.c" - .balign 4 - -.text -glabel TitleCard_Draw -/* AA414C 8002CFAC 27BDFF30 */ addiu $sp, $sp, -0xd0 -/* AA4150 8002CFB0 AFBF0014 */ sw $ra, 0x14($sp) -/* AA4154 8002CFB4 AFA400D0 */ sw $a0, 0xd0($sp) -/* AA4158 8002CFB8 AFA500D4 */ sw $a1, 0xd4($sp) -/* AA415C 8002CFBC 84AF000C */ lh $t7, 0xc($a1) -/* AA4160 8002CFC0 3C068013 */ lui $a2, %hi(D_80136160) # $a2, 0x8013 -/* AA4164 8002CFC4 24C66160 */ addiu $a2, %lo(D_80136160) # addiu $a2, $a2, 0x6160 -/* AA4168 8002CFC8 51E00159 */ beql $t7, $zero, .L8002D530 -/* AA416C 8002CFCC 8FBF0014 */ lw $ra, 0x14($sp) -/* AA4170 8002CFD0 90AA0008 */ lbu $t2, 8($a1) -/* AA4174 8002CFD4 84B80004 */ lh $t8, 4($a1) -/* AA4178 8002CFD8 90A90009 */ lbu $t1, 9($a1) -/* AA417C 8002CFDC 000A1040 */ sll $v0, $t2, 1 -/* AA4180 8002CFE0 0018C880 */ sll $t9, $t8, 2 -/* AA4184 8002CFE4 03227823 */ subu $t7, $t9, $v0 -/* AA4188 8002CFE8 AFAF00C0 */ sw $t7, 0xc0($sp) -/* AA418C 8002CFEC 84B80006 */ lh $t8, 6($a1) -/* AA4190 8002CFF0 00097840 */ sll $t7, $t1, 1 -/* AA4194 8002CFF4 24070B08 */ li $a3, 2824 -/* AA4198 8002CFF8 0018C880 */ sll $t9, $t8, 2 -/* AA419C 8002CFFC 032F7023 */ subu $t6, $t9, $t7 -/* AA41A0 8002D000 AFAE00B8 */ sw $t6, 0xb8($sp) -/* AA41A4 8002D004 8C850000 */ lw $a1, ($a0) -/* AA41A8 8002D008 AFA20038 */ sw $v0, 0x38($sp) -/* AA41AC 8002D00C 27A4009C */ addiu $a0, $sp, 0x9c -/* AA41B0 8002D010 AFAA00CC */ sw $t2, 0xcc($sp) -/* AA41B4 8002D014 AFA900C8 */ sw $t1, 0xc8($sp) -/* AA41B8 8002D018 0C031AB1 */ jal func_800C6AC4 -/* AA41BC 8002D01C AFA500AC */ sw $a1, 0xac($sp) -/* AA41C0 8002D020 8FA900C8 */ lw $t1, 0xc8($sp) -/* AA41C4 8002D024 8FAA00CC */ lw $t2, 0xcc($sp) -/* AA41C8 8002D028 3C198016 */ lui $t9, %hi(gSaveContext+0x1409) # $t9, 0x8016 -/* AA41CC 8002D02C 9339FA69 */ lbu $t9, %lo(gSaveContext+0x1409)($t9) -/* AA41D0 8002D030 01490019 */ multu $t2, $t1 -/* AA41D4 8002D034 8FA800AC */ lw $t0, 0xac($sp) -/* AA41D8 8002D038 8FAB00D4 */ lw $t3, 0xd4($sp) -/* AA41DC 8002D03C 240E1000 */ li $t6, 4096 -/* AA41E0 8002D040 00002812 */ mflo $a1 -/* AA41E4 8002D044 28A11001 */ slti $at, $a1, 0x1001 -/* AA41E8 8002D048 00000000 */ nop -/* AA41EC 8002D04C 00B90019 */ multu $a1, $t9 -/* AA41F0 8002D050 8FB900B8 */ lw $t9, 0xb8($sp) -/* AA41F4 8002D054 00007812 */ mflo $t7 -/* AA41F8 8002D058 AFAF00B0 */ sw $t7, 0xb0($sp) -/* AA41FC 8002D05C 54200011 */ bnezl $at, .L8002D0A4 -/* AA4200 8002D060 0009C080 */ sll $t8, $t1, 2 -/* AA4204 8002D064 01CA001A */ div $zero, $t6, $t2 -/* AA4208 8002D068 00004812 */ mflo $t1 -/* AA420C 8002D06C 15400002 */ bnez $t2, .L8002D078 -/* AA4210 8002D070 00000000 */ nop -/* AA4214 8002D074 0007000D */ break 7 -.L8002D078: -/* AA4218 8002D078 2401FFFF */ li $at, -1 -/* AA421C 8002D07C 15410004 */ bne $t2, $at, .L8002D090 -/* AA4220 8002D080 3C018000 */ lui $at, 0x8000 -/* AA4224 8002D084 15C10002 */ bne $t6, $at, .L8002D090 -/* AA4228 8002D088 00000000 */ nop -/* AA422C 8002D08C 0006000D */ break 6 -.L8002D090: -/* AA4230 8002D090 01490019 */ multu $t2, $t1 -/* AA4234 8002D094 00002812 */ mflo $a1 -/* AA4238 8002D098 00000000 */ nop -/* AA423C 8002D09C 00000000 */ nop -/* AA4240 8002D0A0 0009C080 */ sll $t8, $t1, 2 -.L8002D0A4: -/* AA4244 8002D0A4 03196021 */ addu $t4, $t8, $t9 -/* AA4248 8002D0A8 AFAC00B4 */ sw $t4, 0xb4($sp) -/* AA424C 8002D0AC 8D0402B0 */ lw $a0, 0x2b0($t0) -/* AA4250 8002D0B0 AFAC0030 */ sw $t4, 0x30($sp) -/* AA4254 8002D0B4 AFAA00CC */ sw $t2, 0xcc($sp) -/* AA4258 8002D0B8 AFA900C8 */ sw $t1, 0xc8($sp) -/* AA425C 8002D0BC AFA800AC */ sw $t0, 0xac($sp) -/* AA4260 8002D0C0 0C024E02 */ jal func_80093808 -/* AA4264 8002D0C4 AFA50034 */ sw $a1, 0x34($sp) -/* AA4268 8002D0C8 8FA800AC */ lw $t0, 0xac($sp) -/* AA426C 8002D0CC 8FA50034 */ lw $a1, 0x34($sp) -/* AA4270 8002D0D0 8FAA00CC */ lw $t2, 0xcc($sp) -/* AA4274 8002D0D4 8FAB00D4 */ lw $t3, 0xd4($sp) -/* AA4278 8002D0D8 8FA900C8 */ lw $t1, 0xc8($sp) -/* AA427C 8002D0DC 8FAC0030 */ lw $t4, 0x30($sp) -/* AA4280 8002D0E0 244F0008 */ addiu $t7, $v0, 8 -/* AA4284 8002D0E4 AD0202B0 */ sw $v0, 0x2b0($t0) -/* AA4288 8002D0E8 3C0EFA00 */ lui $t6, 0xfa00 -/* AA428C 8002D0EC AD0F02B0 */ sw $t7, 0x2b0($t0) -/* AA4290 8002D0F0 AC4E0000 */ sw $t6, ($v0) -/* AA4294 8002D0F4 9163000F */ lbu $v1, 0xf($t3) -/* AA4298 8002D0F8 01403825 */ move $a3, $t2 -/* AA429C 8002D0FC 24ED0007 */ addiu $t5, $a3, 7 -/* AA42A0 8002D100 0003C600 */ sll $t8, $v1, 0x18 -/* AA42A4 8002D104 0003CC00 */ sll $t9, $v1, 0x10 -/* AA42A8 8002D108 03197825 */ or $t7, $t8, $t9 -/* AA42AC 8002D10C 00037200 */ sll $t6, $v1, 8 -/* AA42B0 8002D110 01EEC025 */ or $t8, $t7, $t6 -/* AA42B4 8002D114 916F000D */ lbu $t7, 0xd($t3) -/* AA42B8 8002D118 24A30001 */ addiu $v1, $a1, 1 -/* AA42BC 8002D11C 00031843 */ sra $v1, $v1, 1 -/* AA42C0 8002D120 030F7025 */ or $t6, $t8, $t7 -/* AA42C4 8002D124 AC4E0004 */ sw $t6, 4($v0) -/* AA42C8 8002D128 8D0202B0 */ lw $v0, 0x2b0($t0) -/* AA42CC 8002D12C 3C18FD70 */ lui $t8, 0xfd70 -/* AA42D0 8002D130 2463FFFF */ addiu $v1, $v1, -1 -/* AA42D4 8002D134 24590008 */ addiu $t9, $v0, 8 -/* AA42D8 8002D138 AD1902B0 */ sw $t9, 0x2b0($t0) -/* AA42DC 8002D13C AC580000 */ sw $t8, ($v0) -/* AA42E0 8002D140 8FAE00B0 */ lw $t6, 0xb0($sp) -/* AA42E4 8002D144 8D6F0000 */ lw $t7, ($t3) -/* AA42E8 8002D148 000D68C3 */ sra $t5, $t5, 3 -/* AA42EC 8002D14C 31AD01FF */ andi $t5, $t5, 0x1ff -/* AA42F0 8002D150 01EEC821 */ addu $t9, $t7, $t6 -/* AA42F4 8002D154 AC590004 */ sw $t9, 4($v0) -/* AA42F8 8002D158 8D0202B0 */ lw $v0, 0x2b0($t0) -/* AA42FC 8002D15C 3C0E0700 */ lui $t6, 0x700 -/* AA4300 8002D160 3C0FF570 */ lui $t7, 0xf570 -/* AA4304 8002D164 24580008 */ addiu $t8, $v0, 8 -/* AA4308 8002D168 AD1802B0 */ sw $t8, 0x2b0($t0) -/* AA430C 8002D16C AC4E0004 */ sw $t6, 4($v0) -/* AA4310 8002D170 AC4F0000 */ sw $t7, ($v0) -/* AA4314 8002D174 8D0202B0 */ lw $v0, 0x2b0($t0) -/* AA4318 8002D178 3C18E600 */ lui $t8, 0xe600 -/* AA431C 8002D17C 3C0EF300 */ lui $t6, 0xf300 -/* AA4320 8002D180 24590008 */ addiu $t9, $v0, 8 -/* AA4324 8002D184 AD1902B0 */ sw $t9, 0x2b0($t0) -/* AA4328 8002D188 AC400004 */ sw $zero, 4($v0) -/* AA432C 8002D18C AC580000 */ sw $t8, ($v0) -/* AA4330 8002D190 8D0602B0 */ lw $a2, 0x2b0($t0) -/* AA4334 8002D194 286107FF */ slti $at, $v1, 0x7ff -/* AA4338 8002D198 000D6A40 */ sll $t5, $t5, 9 -/* AA433C 8002D19C 24CF0008 */ addiu $t7, $a2, 8 -/* AA4340 8002D1A0 AD0F02B0 */ sw $t7, 0x2b0($t0) -/* AA4344 8002D1A4 10200003 */ beqz $at, .L8002D1B4 -/* AA4348 8002D1A8 ACCE0000 */ sw $t6, ($a2) -/* AA434C 8002D1AC 10000002 */ b .L8002D1B8 -/* AA4350 8002D1B0 00602025 */ move $a0, $v1 -.L8002D1B4: -/* AA4354 8002D1B4 240407FF */ li $a0, 2047 -.L8002D1B8: -/* AA4358 8002D1B8 04E10003 */ bgez $a3, .L8002D1C8 -/* AA435C 8002D1BC 000728C3 */ sra $a1, $a3, 3 -/* AA4360 8002D1C0 24E10007 */ addiu $at, $a3, 7 -/* AA4364 8002D1C4 000128C3 */ sra $a1, $at, 3 -.L8002D1C8: -/* AA4368 8002D1C8 1CA00003 */ bgtz $a1, .L8002D1D8 -/* AA436C 8002D1CC 2547FFFF */ addiu $a3, $t2, -1 -/* AA4370 8002D1D0 10000002 */ b .L8002D1DC -/* AA4374 8002D1D4 24030001 */ li $v1, 1 -.L8002D1D8: -/* AA4378 8002D1D8 00A01825 */ move $v1, $a1 -.L8002D1DC: -/* AA437C 8002D1DC 1CA00003 */ bgtz $a1, .L8002D1EC -/* AA4380 8002D1E0 247907FF */ addiu $t9, $v1, 0x7ff -/* AA4384 8002D1E4 10000002 */ b .L8002D1F0 -/* AA4388 8002D1E8 24020001 */ li $v0, 1 -.L8002D1EC: -/* AA438C 8002D1EC 00A01025 */ move $v0, $a1 -.L8002D1F0: -/* AA4390 8002D1F0 0322001A */ div $zero, $t9, $v0 -/* AA4394 8002D1F4 14400002 */ bnez $v0, .L8002D200 -/* AA4398 8002D1F8 00000000 */ nop -/* AA439C 8002D1FC 0007000D */ break 7 -.L8002D200: -/* AA43A0 8002D200 2401FFFF */ li $at, -1 -/* AA43A4 8002D204 14410004 */ bne $v0, $at, .L8002D218 -/* AA43A8 8002D208 3C018000 */ lui $at, 0x8000 -/* AA43AC 8002D20C 17210002 */ bne $t9, $at, .L8002D218 -/* AA43B0 8002D210 00000000 */ nop -/* AA43B4 8002D214 0006000D */ break 6 -.L8002D218: -/* AA43B8 8002D218 0000C012 */ mflo $t8 -/* AA43BC 8002D21C 330F0FFF */ andi $t7, $t8, 0xfff -/* AA43C0 8002D220 3C010700 */ lui $at, 0x700 -/* AA43C4 8002D224 30990FFF */ andi $t9, $a0, 0xfff -/* AA43C8 8002D228 0019C300 */ sll $t8, $t9, 0xc -/* AA43CC 8002D22C 01E17025 */ or $t6, $t7, $at -/* AA43D0 8002D230 01D87825 */ or $t7, $t6, $t8 -/* AA43D4 8002D234 ACCF0004 */ sw $t7, 4($a2) -/* AA43D8 8002D238 8D0202B0 */ lw $v0, 0x2b0($t0) -/* AA43DC 8002D23C 3C0EE700 */ lui $t6, 0xe700 -/* AA43E0 8002D240 3C01F568 */ lui $at, 0xf568 -/* AA43E4 8002D244 24590008 */ addiu $t9, $v0, 8 -/* AA43E8 8002D248 AD1902B0 */ sw $t9, 0x2b0($t0) -/* AA43EC 8002D24C AC400004 */ sw $zero, 4($v0) -/* AA43F0 8002D250 AC4E0000 */ sw $t6, ($v0) -/* AA43F4 8002D254 8D0202B0 */ lw $v0, 0x2b0($t0) -/* AA43F8 8002D258 01A16825 */ or $t5, $t5, $at -/* AA43FC 8002D25C 252EFFFF */ addiu $t6, $t1, -1 -/* AA4400 8002D260 24580008 */ addiu $t8, $v0, 8 -/* AA4404 8002D264 AD1802B0 */ sw $t8, 0x2b0($t0) -/* AA4408 8002D268 AC400004 */ sw $zero, 4($v0) -/* AA440C 8002D26C AC4D0000 */ sw $t5, ($v0) -/* AA4410 8002D270 8D0202B0 */ lw $v0, 0x2b0($t0) -/* AA4414 8002D274 00073880 */ sll $a3, $a3, 2 -/* AA4418 8002D278 30E70FFF */ andi $a3, $a3, 0xfff -/* AA441C 8002D27C 244F0008 */ addiu $t7, $v0, 8 -/* AA4420 8002D280 AD0F02B0 */ sw $t7, 0x2b0($t0) -/* AA4424 8002D284 000EC080 */ sll $t8, $t6, 2 -/* AA4428 8002D288 3C19F200 */ lui $t9, 0xf200 -/* AA442C 8002D28C 330F0FFF */ andi $t7, $t8, 0xfff -/* AA4430 8002D290 00073B00 */ sll $a3, $a3, 0xc -/* AA4434 8002D294 AC590000 */ sw $t9, ($v0) -/* AA4438 8002D298 00EFC825 */ or $t9, $a3, $t7 -/* AA443C 8002D29C AC590004 */ sw $t9, 4($v0) -/* AA4440 8002D2A0 8D0202B0 */ lw $v0, 0x2b0($t0) -/* AA4444 8002D2A4 8FA600C0 */ lw $a2, 0xc0($sp) -/* AA4448 8002D2A8 2599FFFF */ addiu $t9, $t4, -1 -/* AA444C 8002D2AC 244E0008 */ addiu $t6, $v0, 8 -/* AA4450 8002D2B0 AD0E02B0 */ sw $t6, 0x2b0($t0) -/* AA4454 8002D2B4 8FB80038 */ lw $t8, 0x38($sp) -/* AA4458 8002D2B8 3C01E400 */ lui $at, 0xe400 -/* AA445C 8002D2BC 332E0FFF */ andi $t6, $t9, 0xfff -/* AA4460 8002D2C0 00187840 */ sll $t7, $t8, 1 -/* AA4464 8002D2C4 01E62021 */ addu $a0, $t7, $a2 -/* AA4468 8002D2C8 2484FFFC */ addiu $a0, $a0, -4 -/* AA446C 8002D2CC 30840FFF */ andi $a0, $a0, 0xfff -/* AA4470 8002D2D0 00042300 */ sll $a0, $a0, 0xc -/* AA4474 8002D2D4 00812025 */ or $a0, $a0, $at -/* AA4478 8002D2D8 008EC025 */ or $t8, $a0, $t6 -/* AA447C 8002D2DC AC580000 */ sw $t8, ($v0) -/* AA4480 8002D2E0 8FAF00B8 */ lw $t7, 0xb8($sp) -/* AA4484 8002D2E4 30DF0FFF */ andi $ra, $a2, 0xfff -/* AA4488 8002D2E8 001FFB00 */ sll $ra, $ra, 0xc -/* AA448C 8002D2EC 31F90FFF */ andi $t9, $t7, 0xfff -/* AA4490 8002D2F0 03F97025 */ or $t6, $ra, $t9 -/* AA4494 8002D2F4 AC4E0004 */ sw $t6, 4($v0) -/* AA4498 8002D2F8 AFA4001C */ sw $a0, 0x1c($sp) -/* AA449C 8002D2FC 8D0202B0 */ lw $v0, 0x2b0($t0) -/* AA44A0 8002D300 3C0CE100 */ lui $t4, 0xe100 -/* AA44A4 8002D304 3C0E0400 */ lui $t6, (0x04000400 >> 16) # lui $t6, 0x400 -/* AA44A8 8002D308 24580008 */ addiu $t8, $v0, 8 -/* AA44AC 8002D30C AD1802B0 */ sw $t8, 0x2b0($t0) -/* AA44B0 8002D310 AC400004 */ sw $zero, 4($v0) -/* AA44B4 8002D314 AC4C0000 */ sw $t4, ($v0) -/* AA44B8 8002D318 8D0202B0 */ lw $v0, 0x2b0($t0) -/* AA44BC 8002D31C 35CE0400 */ ori $t6, (0x04000400 & 0xFFFF) # ori $t6, $t6, 0x400 -/* AA44C0 8002D320 3C19F100 */ lui $t9, 0xf100 -/* AA44C4 8002D324 244F0008 */ addiu $t7, $v0, 8 -/* AA44C8 8002D328 AD0F02B0 */ sw $t7, 0x2b0($t0) -/* AA44CC 8002D32C AC4E0004 */ sw $t6, 4($v0) -/* AA44D0 8002D330 AC590000 */ sw $t9, ($v0) -/* AA44D4 8002D334 91780009 */ lbu $t8, 9($t3) -/* AA44D8 8002D338 00401825 */ move $v1, $v0 -/* AA44DC 8002D33C 03094823 */ subu $t1, $t8, $t1 -/* AA44E0 8002D340 59200074 */ blezl $t1, .L8002D514 -/* AA44E4 8002D344 8FB800D0 */ lw $t8, 0xd0($sp) -/* AA44E8 8002D348 8D0202B0 */ lw $v0, 0x2b0($t0) -/* AA44EC 8002D34C 3C19FD70 */ lui $t9, 0xfd70 -/* AA44F0 8002D350 01490019 */ multu $t2, $t1 -/* AA44F4 8002D354 244F0008 */ addiu $t7, $v0, 8 -/* AA44F8 8002D358 AD0F02B0 */ sw $t7, 0x2b0($t0) -/* AA44FC 8002D35C AC590000 */ sw $t9, ($v0) -/* AA4500 8002D360 8FB800B0 */ lw $t8, 0xb0($sp) -/* AA4504 8002D364 8D6E0000 */ lw $t6, ($t3) -/* AA4508 8002D368 240407FF */ li $a0, 2047 -/* AA450C 8002D36C 01D87821 */ addu $t7, $t6, $t8 -/* AA4510 8002D370 25F91000 */ addiu $t9, $t7, 0x1000 -/* AA4514 8002D374 AC590004 */ sw $t9, 4($v0) -/* AA4518 8002D378 8D0202B0 */ lw $v0, 0x2b0($t0) -/* AA451C 8002D37C 3C0F0700 */ lui $t7, 0x700 -/* AA4520 8002D380 3C18F570 */ lui $t8, 0xf570 -/* AA4524 8002D384 244E0008 */ addiu $t6, $v0, 8 -/* AA4528 8002D388 AD0E02B0 */ sw $t6, 0x2b0($t0) -/* AA452C 8002D38C AC4F0004 */ sw $t7, 4($v0) -/* AA4530 8002D390 AC580000 */ sw $t8, ($v0) -/* AA4534 8002D394 8D0202B0 */ lw $v0, 0x2b0($t0) -/* AA4538 8002D398 3C0EE600 */ lui $t6, 0xe600 -/* AA453C 8002D39C 00001812 */ mflo $v1 -/* AA4540 8002D3A0 24590008 */ addiu $t9, $v0, 8 -/* AA4544 8002D3A4 AD1902B0 */ sw $t9, 0x2b0($t0) -/* AA4548 8002D3A8 AC400004 */ sw $zero, 4($v0) -/* AA454C 8002D3AC AC4E0000 */ sw $t6, ($v0) -/* AA4550 8002D3B0 8D0602B0 */ lw $a2, 0x2b0($t0) -/* AA4554 8002D3B4 24630001 */ addiu $v1, $v1, 1 -/* AA4558 8002D3B8 00031843 */ sra $v1, $v1, 1 -/* AA455C 8002D3BC 2463FFFF */ addiu $v1, $v1, -1 -/* AA4560 8002D3C0 24D80008 */ addiu $t8, $a2, 8 -/* AA4564 8002D3C4 AD1802B0 */ sw $t8, 0x2b0($t0) -/* AA4568 8002D3C8 286107FF */ slti $at, $v1, 0x7ff -/* AA456C 8002D3CC 3C0FF300 */ lui $t7, 0xf300 -/* AA4570 8002D3D0 10200003 */ beqz $at, .L8002D3E0 -/* AA4574 8002D3D4 ACCF0000 */ sw $t7, ($a2) -/* AA4578 8002D3D8 10000001 */ b .L8002D3E0 -/* AA457C 8002D3DC 00602025 */ move $a0, $v1 -.L8002D3E0: -/* AA4580 8002D3E0 1CA00003 */ bgtz $a1, .L8002D3F0 -/* AA4584 8002D3E4 00A01825 */ move $v1, $a1 -/* AA4588 8002D3E8 10000001 */ b .L8002D3F0 -/* AA458C 8002D3EC 24030001 */ li $v1, 1 -.L8002D3F0: -/* AA4590 8002D3F0 1CA00003 */ bgtz $a1, .L8002D400 -/* AA4594 8002D3F4 247907FF */ addiu $t9, $v1, 0x7ff -/* AA4598 8002D3F8 10000002 */ b .L8002D404 -/* AA459C 8002D3FC 24020001 */ li $v0, 1 -.L8002D400: -/* AA45A0 8002D400 00A01025 */ move $v0, $a1 -.L8002D404: -/* AA45A4 8002D404 0322001A */ div $zero, $t9, $v0 -/* AA45A8 8002D408 14400002 */ bnez $v0, .L8002D414 -/* AA45AC 8002D40C 00000000 */ nop -/* AA45B0 8002D410 0007000D */ break 7 -.L8002D414: -/* AA45B4 8002D414 2401FFFF */ li $at, -1 -/* AA45B8 8002D418 14410004 */ bne $v0, $at, .L8002D42C -/* AA45BC 8002D41C 3C018000 */ lui $at, 0x8000 -/* AA45C0 8002D420 17210002 */ bne $t9, $at, .L8002D42C -/* AA45C4 8002D424 00000000 */ nop -/* AA45C8 8002D428 0006000D */ break 6 -.L8002D42C: -/* AA45CC 8002D42C 00007012 */ mflo $t6 -/* AA45D0 8002D430 31D80FFF */ andi $t8, $t6, 0xfff -/* AA45D4 8002D434 3C010700 */ lui $at, 0x700 -/* AA45D8 8002D438 30990FFF */ andi $t9, $a0, 0xfff -/* AA45DC 8002D43C 00197300 */ sll $t6, $t9, 0xc -/* AA45E0 8002D440 03017825 */ or $t7, $t8, $at -/* AA45E4 8002D444 01EEC025 */ or $t8, $t7, $t6 -/* AA45E8 8002D448 ACD80004 */ sw $t8, 4($a2) -/* AA45EC 8002D44C 8D0202B0 */ lw $v0, 0x2b0($t0) -/* AA45F0 8002D450 3C0FE700 */ lui $t7, 0xe700 -/* AA45F4 8002D454 24590008 */ addiu $t9, $v0, 8 -/* AA45F8 8002D458 AD1902B0 */ sw $t9, 0x2b0($t0) -/* AA45FC 8002D45C AC400004 */ sw $zero, 4($v0) -/* AA4600 8002D460 AC4F0000 */ sw $t7, ($v0) -/* AA4604 8002D464 8D0202B0 */ lw $v0, 0x2b0($t0) -/* AA4608 8002D468 252FFFFF */ addiu $t7, $t1, -1 -/* AA460C 8002D46C 3C19F200 */ lui $t9, 0xf200 -/* AA4610 8002D470 244E0008 */ addiu $t6, $v0, 8 -/* AA4614 8002D474 AD0E02B0 */ sw $t6, 0x2b0($t0) -/* AA4618 8002D478 AC400004 */ sw $zero, 4($v0) -/* AA461C 8002D47C AC4D0000 */ sw $t5, ($v0) -/* AA4620 8002D480 8D0202B0 */ lw $v0, 0x2b0($t0) -/* AA4624 8002D484 000F7080 */ sll $t6, $t7, 2 -/* AA4628 8002D488 24580008 */ addiu $t8, $v0, 8 -/* AA462C 8002D48C AD1802B0 */ sw $t8, 0x2b0($t0) -/* AA4630 8002D490 31D80FFF */ andi $t8, $t6, 0xfff -/* AA4634 8002D494 AC590000 */ sw $t9, ($v0) -/* AA4638 8002D498 00F8C825 */ or $t9, $a3, $t8 -/* AA463C 8002D49C AC590004 */ sw $t9, 4($v0) -/* AA4640 8002D4A0 8D0202B0 */ lw $v0, 0x2b0($t0) -/* AA4644 8002D4A4 8FA400B4 */ lw $a0, 0xb4($sp) -/* AA4648 8002D4A8 0009C080 */ sll $t8, $t1, 2 -/* AA464C 8002D4AC 244F0008 */ addiu $t7, $v0, 8 -/* AA4650 8002D4B0 AD0F02B0 */ sw $t7, 0x2b0($t0) -/* AA4654 8002D4B4 0098C821 */ addu $t9, $a0, $t8 -/* AA4658 8002D4B8 8FAE001C */ lw $t6, 0x1c($sp) -/* AA465C 8002D4BC 272FFFFF */ addiu $t7, $t9, -1 -/* AA4660 8002D4C0 31F80FFF */ andi $t8, $t7, 0xfff -/* AA4664 8002D4C4 308F0FFF */ andi $t7, $a0, 0xfff -/* AA4668 8002D4C8 01D8C825 */ or $t9, $t6, $t8 -/* AA466C 8002D4CC 03EF7025 */ or $t6, $ra, $t7 -/* AA4670 8002D4D0 AC4E0004 */ sw $t6, 4($v0) -/* AA4674 8002D4D4 AC590000 */ sw $t9, ($v0) -/* AA4678 8002D4D8 8D0202B0 */ lw $v0, 0x2b0($t0) -/* AA467C 8002D4DC 3C0E0400 */ lui $t6, (0x04000400 >> 16) # lui $t6, 0x400 -/* AA4680 8002D4E0 35CE0400 */ ori $t6, (0x04000400 & 0xFFFF) # ori $t6, $t6, 0x400 -/* AA4684 8002D4E4 24580008 */ addiu $t8, $v0, 8 -/* AA4688 8002D4E8 AD1802B0 */ sw $t8, 0x2b0($t0) -/* AA468C 8002D4EC AC400004 */ sw $zero, 4($v0) -/* AA4690 8002D4F0 AC4C0000 */ sw $t4, ($v0) -/* AA4694 8002D4F4 8D0202B0 */ lw $v0, 0x2b0($t0) -/* AA4698 8002D4F8 3C0FF100 */ lui $t7, 0xf100 -/* AA469C 8002D4FC 24590008 */ addiu $t9, $v0, 8 -/* AA46A0 8002D500 AD1902B0 */ sw $t9, 0x2b0($t0) -/* AA46A4 8002D504 AC4E0004 */ sw $t6, 4($v0) -/* AA46A8 8002D508 AC4F0000 */ sw $t7, ($v0) -/* AA46AC 8002D50C 00401825 */ move $v1, $v0 -/* AA46B0 8002D510 8FB800D0 */ lw $t8, 0xd0($sp) -.L8002D514: -/* AA46B4 8002D514 3C068013 */ lui $a2, %hi(D_80136170) # $a2, 0x8013 -/* AA46B8 8002D518 24C66170 */ addiu $a2, %lo(D_80136170) # addiu $a2, $a2, 0x6170 -/* AA46BC 8002D51C 27A4009C */ addiu $a0, $sp, 0x9c -/* AA46C0 8002D520 24070B40 */ li $a3, 2880 -/* AA46C4 8002D524 0C031AD5 */ jal func_800C6B54 -/* AA46C8 8002D528 8F050000 */ lw $a1, ($t8) -/* AA46CC 8002D52C 8FBF0014 */ lw $ra, 0x14($sp) -.L8002D530: -/* AA46D0 8002D530 27BD00D0 */ addiu $sp, $sp, 0xd0 -/* AA46D4 8002D534 03E00008 */ jr $ra -/* AA46D8 8002D538 00000000 */ nop - diff --git a/asm/non_matchings/code/z_actor/func_8002C124.s b/asm/non_matchings/code/z_actor/func_8002C124.s index 11197ef43f..9624e4c8a9 100644 --- a/asm/non_matchings/code/z_actor/func_8002C124.s +++ b/asm/non_matchings/code/z_actor/func_8002C124.s @@ -57,7 +57,7 @@ glabel func_8002C124 /* AA3318 8002C178 24C66110 */ addiu $a2, %lo(D_80136110) # addiu $a2, $a2, 0x6110 /* AA331C 8002C17C 27A400D8 */ addiu $a0, $sp, 0xd8 /* AA3320 8002C180 240707ED */ li $a3, 2029 -/* AA3324 8002C184 0C031AB1 */ jal func_800C6AC4 +/* AA3324 8002C184 0C031AB1 */ jal Graph_OpenDisps /* AA3328 8002C188 00A09825 */ move $s3, $a1 /* AA332C 8002C18C 8FA300F0 */ lw $v1, 0xf0($sp) /* AA3330 8002C190 8FB800F4 */ lw $t8, 0xf4($sp) @@ -195,7 +195,7 @@ glabel func_8002C124 /* AA3514 8002C374 52280089 */ beql $s1, $t0, .L8002C59C /* AA3518 8002C378 8FA300F0 */ lw $v1, 0xf0($sp) .L8002C37C: -/* AA351C 8002C37C 0C024DDD */ jal func_80093774 +/* AA351C 8002C37C 0C024DDD */ jal Gfx_CallSetupDL /* AA3520 8002C380 8E6402B0 */ lw $a0, 0x2b0($s3) /* AA3524 8002C384 AE6202B0 */ sw $v0, 0x2b0($s3) /* AA3528 8002C388 8FAA00B8 */ lw $t2, 0xb8($sp) @@ -355,7 +355,7 @@ glabel func_8002C124 /* AA3770 8002C5D0 8E6402D0 */ lw $a0, 0x2d0($s3) /* AA3774 8002C5D4 24050007 */ li $a1, 7 /* AA3778 8002C5D8 0009C8C0 */ sll $t9, $t1, 3 -/* AA377C 8002C5DC 0C024DDD */ jal func_80093774 +/* AA377C 8002C5DC 0C024DDD */ jal Gfx_CallSetupDL /* AA3780 8002C5E0 032A8021 */ addu $s0, $t9, $t2 /* AA3784 8002C5E4 AE6202D0 */ sw $v0, 0x2d0($s3) /* AA3788 8002C5E8 C6300054 */ lwc1 $f16, 0x54($s1) @@ -458,7 +458,7 @@ glabel func_8002C124 /* AA3904 8002C764 24C66140 */ addiu $a2, %lo(D_80136140) # addiu $a2, $a2, 0x6140 /* AA3908 8002C768 27A400D8 */ addiu $a0, $sp, 0xd8 /* AA390C 8002C76C 2407086E */ li $a3, 2158 -/* AA3910 8002C770 0C031AD5 */ jal func_800C6B54 +/* AA3910 8002C770 0C031AD5 */ jal Graph_CloseDisps /* AA3914 8002C774 8D450000 */ lw $a1, ($t2) /* AA3918 8002C778 8FBF006C */ lw $ra, 0x6c($sp) /* AA391C 8002C77C D7B40020 */ ldc1 $f20, 0x20($sp) diff --git a/asm/non_matchings/code/z_actor/func_8002FBAC.s b/asm/non_matchings/code/z_actor/func_8002FBAC.s index 58645043aa..3b42221d8e 100644 --- a/asm/non_matchings/code/z_actor/func_8002FBAC.s +++ b/asm/non_matchings/code/z_actor/func_8002FBAC.s @@ -61,7 +61,7 @@ glabel func_8002FBAC /* AA6D60 8002FBC0 24C662BC */ addiu $a2, %lo(D_801362BC) # addiu $a2, $a2, 0x62bc /* AA6D64 8002FBC4 27A400DC */ addiu $a0, $sp, 0xdc /* AA6D68 8002FBC8 240714BC */ li $a3, 5308 -/* AA6D6C 8002FBCC 0C031AB1 */ jal func_800C6AC4 +/* AA6D6C 8002FBCC 0C031AB1 */ jal Graph_OpenDisps /* AA6D70 8002FBD0 AFA500EC */ sw $a1, 0xec($sp) /* AA6D74 8002FBD4 3C088016 */ lui $t0, %hi(gSaveContext) # $t0, 0x8016 /* AA6D78 8002FBD8 2508E660 */ addiu $t0, %lo(gSaveContext) # addiu $t0, $t0, -0x19a0 @@ -432,7 +432,7 @@ glabel func_8002FBAC /* AA72EC 8003014C 572A00A3 */ bnel $t9, $t2, .L800303DC /* AA72F0 80030150 C50213A4 */ lwc1 $f2, 0x13a4($t0) /* AA72F4 80030154 8D6402D0 */ lw $a0, 0x2d0($t3) -/* AA72F8 80030158 0C024DDD */ jal func_80093774 +/* AA72F8 80030158 0C024DDD */ jal Gfx_CallSetupDL /* AA72FC 8003015C AFA20034 */ sw $v0, 0x34($sp) /* AA7300 80030160 8FAD00EC */ lw $t5, 0xec($sp) /* AA7304 80030164 3C038016 */ lui $v1, %hi(gSaveContext) # $v1, 0x8016 @@ -634,7 +634,7 @@ glabel func_8002FBAC /* AA7604 80030464 24C66304 */ addiu $a2, %lo(D_80136304) # addiu $a2, $a2, 0x6304 /* AA7608 80030468 27A400DC */ addiu $a0, $sp, 0xdc /* AA760C 8003046C 24071562 */ li $a3, 5474 -/* AA7610 80030470 0C031AD5 */ jal func_800C6B54 +/* AA7610 80030470 0C031AD5 */ jal Graph_CloseDisps /* AA7614 80030474 8DE50000 */ lw $a1, ($t7) .L80030478: /* AA7618 80030478 8FBF0024 */ lw $ra, 0x24($sp) diff --git a/asm/non_matchings/code/z_camera/func_80044ADC.s b/asm/non_matchings/code/z_camera/func_80044ADC.s index 64e0a6de68..a5be3f4cbc 100644 --- a/asm/non_matchings/code/z_camera/func_80044ADC.s +++ b/asm/non_matchings/code/z_camera/func_80044ADC.s @@ -215,7 +215,7 @@ glabel func_80044ADC /* ABBF64 80044DC4 46060302 */ mul.s $f12, $f0, $f6 /* ABBF68 80044DC8 00000000 */ nop /* ABBF6C 80044DCC 46082182 */ mul.s $f6, $f4, $f8 -/* ABBF70 80044DD0 0C03F494 */ jal func_800FD250 +/* ABBF70 80044DD0 0C03F494 */ jal Math_atan2f /* ABBF74 80044DD4 E7A60040 */ swc1 $f6, 0x40($sp) /* ABBF78 80044DD8 3C018014 */ lui $at, %hi(D_80139DC8) /* ABBF7C 80044DDC C42A9DC8 */ lwc1 $f10, %lo(D_80139DC8)($at) @@ -232,7 +232,7 @@ glabel func_80044ADC /* ABBFA8 80044E08 44104000 */ mfc1 $s0, $f8 /* ABBFAC 80044E0C 00000000 */ nop /* ABBFB0 80044E10 00108400 */ sll $s0, $s0, 0x10 -/* ABBFB4 80044E14 0C03F494 */ jal func_800FD250 +/* ABBFB4 80044E14 0C03F494 */ jal Math_atan2f /* ABBFB8 80044E18 00108403 */ sra $s0, $s0, 0x10 /* ABBFBC 80044E1C 3C018014 */ lui $at, %hi(D_80139DD0) /* ABBFC0 80044E20 C4269DD0 */ lwc1 $f6, %lo(D_80139DD0)($at) diff --git a/asm/non_matchings/code/z_camera/func_800457A8.s b/asm/non_matchings/code/z_camera/func_800457A8.s deleted file mode 100644 index a33dd631c6..0000000000 --- a/asm/non_matchings/code/z_camera/func_800457A8.s +++ /dev/null @@ -1,86 +0,0 @@ -.late_rodata -glabel D_80139DDC - .float 0.1 - -glabel D_80139DE0 - .float 0.2 - -.text -glabel func_800457A8 -/* ABC948 800457A8 27BDFFA0 */ addiu $sp, $sp, -0x60 -/* ABC94C 800457AC AFB00020 */ sw $s0, 0x20($sp) -/* ABC950 800457B0 00808025 */ move $s0, $a0 -/* ABC954 800457B4 AFBF0024 */ sw $ra, 0x24($sp) -/* ABC958 800457B8 AFA50064 */ sw $a1, 0x64($sp) -/* ABC95C 800457BC AFA60068 */ sw $a2, 0x68($sp) -/* ABC960 800457C0 AFA7006C */ sw $a3, 0x6c($sp) -/* ABC964 800457C4 0C00B721 */ jal func_8002DC84 -/* ABC968 800457C8 8C840090 */ lw $a0, 0x90($a0) -/* ABC96C 800457CC C7A40068 */ lwc1 $f4, 0x68($sp) -/* ABC970 800457D0 44801000 */ mtc1 $zero, $f2 -/* ABC974 800457D4 87AE006E */ lh $t6, 0x6e($sp) -/* ABC978 800457D8 46040180 */ add.s $f6, $f0, $f4 -/* ABC97C 800457DC 46000386 */ mov.s $f14, $f0 -/* ABC980 800457E0 E7A20050 */ swc1 $f2, 0x50($sp) -/* ABC984 800457E4 E7A20058 */ swc1 $f2, 0x58($sp) -/* ABC988 800457E8 11C00014 */ beqz $t6, .L8004583C -/* ABC98C 800457EC E7A60054 */ swc1 $f6, 0x54($sp) -/* ABC990 800457F0 3C188016 */ lui $t8, %hi(gGameInfo) # $t8, 0x8016 -/* ABC994 800457F4 8F18FA90 */ lw $t8, %lo(gGameInfo)($t8) -/* ABC998 800457F8 8FAF0064 */ lw $t7, 0x64($sp) -/* ABC99C 800457FC 860500A2 */ lh $a1, 0xa2($s0) -/* ABC9A0 80045800 871901A6 */ lh $t9, 0x1a6($t8) -/* ABC9A4 80045804 85E60006 */ lh $a2, 6($t7) -/* ABC9A8 80045808 E7AE0038 */ swc1 $f14, 0x38($sp) -/* ABC9AC 8004580C 44994000 */ mtc1 $t9, $f8 -/* ABC9B0 80045810 26040108 */ addiu $a0, $s0, 0x108 -/* ABC9B4 80045814 46804220 */ cvt.s.w $f8, $f8 -/* ABC9B8 80045818 44074000 */ mfc1 $a3, $f8 -/* ABC9BC 8004581C 0C0115C5 */ jal func_80045714 -/* ABC9C0 80045820 00000000 */ nop -/* ABC9C4 80045824 C7AE0038 */ lwc1 $f14, 0x38($sp) -/* ABC9C8 80045828 0C01F02A */ jal func_8007C0A8 -/* ABC9CC 8004582C 46000306 */ mov.s $f12, $f0 -/* ABC9D0 80045830 C7AA0054 */ lwc1 $f10, 0x54($sp) -/* ABC9D4 80045834 46005401 */ sub.s $f16, $f10, $f0 -/* ABC9D8 80045838 E7B00054 */ swc1 $f16, 0x54($sp) -.L8004583C: -/* ABC9DC 8004583C 3C018014 */ lui $at, %hi(D_80139DDC) -/* ABC9E0 80045840 C4329DDC */ lwc1 $f18, %lo(D_80139DDC)($at) -/* ABC9E4 80045844 8E0600D0 */ lw $a2, 0xd0($s0) -/* ABC9E8 80045848 8E0700CC */ lw $a3, 0xcc($s0) -/* ABC9EC 8004584C 26020094 */ addiu $v0, $s0, 0x94 -/* ABC9F0 80045850 AFA2002C */ sw $v0, 0x2c($sp) -/* ABC9F4 80045854 27A40050 */ addiu $a0, $sp, 0x50 -/* ABC9F8 80045858 260500E4 */ addiu $a1, $s0, 0xe4 -/* ABC9FC 8004585C 0C010E8F */ jal func_80043A3C -/* ABCA00 80045860 E7B20010 */ swc1 $f18, 0x10($sp) -/* ABCA04 80045864 8FA2002C */ lw $v0, 0x2c($sp) -/* ABCA08 80045868 C60600E4 */ lwc1 $f6, 0xe4($s0) -/* ABCA0C 8004586C 3C018014 */ lui $at, %hi(D_80139DE0) -/* ABCA10 80045870 C4440000 */ lwc1 $f4, ($v0) -/* ABCA14 80045874 27A40044 */ addiu $a0, $sp, 0x44 -/* ABCA18 80045878 26050050 */ addiu $a1, $s0, 0x50 -/* ABCA1C 8004587C 46062200 */ add.s $f8, $f4, $f6 -/* ABCA20 80045880 E7A80044 */ swc1 $f8, 0x44($sp) -/* ABCA24 80045884 C61000E8 */ lwc1 $f16, 0xe8($s0) -/* ABCA28 80045888 C44A0004 */ lwc1 $f10, 4($v0) -/* ABCA2C 8004588C 46105480 */ add.s $f18, $f10, $f16 -/* ABCA30 80045890 C42A9DE0 */ lwc1 $f10, %lo(D_80139DE0)($at) -/* ABCA34 80045894 E7B20048 */ swc1 $f18, 0x48($sp) -/* ABCA38 80045898 C60600EC */ lwc1 $f6, 0xec($s0) -/* ABCA3C 8004589C C4440008 */ lwc1 $f4, 8($v0) -/* ABCA40 800458A0 46062200 */ add.s $f8, $f4, $f6 -/* ABCA44 800458A4 E7A8004C */ swc1 $f8, 0x4c($sp) -/* ABCA48 800458A8 C6000100 */ lwc1 $f0, 0x100($s0) -/* ABCA4C 800458AC E7AA0010 */ swc1 $f10, 0x10($sp) -/* ABCA50 800458B0 44060000 */ mfc1 $a2, $f0 -/* ABCA54 800458B4 44070000 */ mfc1 $a3, $f0 -/* ABCA58 800458B8 0C010E8F */ jal func_80043A3C -/* ABCA5C 800458BC 00000000 */ nop -/* ABCA60 800458C0 8FBF0024 */ lw $ra, 0x24($sp) -/* ABCA64 800458C4 8FB00020 */ lw $s0, 0x20($sp) -/* ABCA68 800458C8 27BD0060 */ addiu $sp, $sp, 0x60 -/* ABCA6C 800458CC 03E00008 */ jr $ra -/* ABCA70 800458D0 24020001 */ li $v0, 1 - diff --git a/asm/non_matchings/code/z_camera/func_800458D4.s b/asm/non_matchings/code/z_camera/func_800458D4.s index ccb791ab3a..904f926a01 100644 --- a/asm/non_matchings/code/z_camera/func_800458D4.s +++ b/asm/non_matchings/code/z_camera/func_800458D4.s @@ -58,7 +58,7 @@ glabel func_800458D4 /* ABCB18 80045978 0C01F00A */ jal func_8007C028 /* ABCB1C 8004597C E7A60048 */ swc1 $f6, 0x48($sp) /* ABCB20 80045980 C7AC0048 */ lwc1 $f12, 0x48($sp) -/* ABCB24 80045984 0C03F494 */ jal func_800FD250 +/* ABCB24 80045984 0C03F494 */ jal Math_atan2f /* ABCB28 80045988 46000386 */ mov.s $f14, $f0 /* ABCB2C 8004598C 3C028016 */ lui $v0, %hi(gGameInfo) # $v0, 0x8016 /* ABCB30 80045990 8C42FA90 */ lw $v0, %lo(gGameInfo)($v0) diff --git a/asm/non_matchings/code/z_camera/func_80045C74.s b/asm/non_matchings/code/z_camera/func_80045C74.s index 89aab19cdc..ef494aaac1 100644 --- a/asm/non_matchings/code/z_camera/func_80045C74.s +++ b/asm/non_matchings/code/z_camera/func_80045C74.s @@ -138,7 +138,7 @@ glabel func_80045C74 /* ABCFB4 80045E14 46045501 */ sub.s $f20, $f10, $f4 /* ABCFB8 80045E18 4600A306 */ mov.s $f12, $f20 /* ABCFBC 80045E1C 46000386 */ mov.s $f14, $f0 -/* ABCFC0 80045E20 0C03F494 */ jal func_800FD250 +/* ABCFC0 80045E20 0C03F494 */ jal Math_atan2f /* ABCFC4 80045E24 E7A00054 */ swc1 $f0, 0x54($sp) /* ABCFC8 80045E28 3C018014 */ lui $at, %hi(D_80139E08) /* ABCFCC 80045E2C C4329E08 */ lwc1 $f18, %lo(D_80139E08)($at) @@ -148,7 +148,7 @@ glabel func_80045C74 /* ABCFDC 80045E3C 46083282 */ mul.s $f10, $f6, $f8 /* ABCFE0 80045E40 00000000 */ nop /* ABCFE4 80045E44 46125302 */ mul.s $f12, $f10, $f18 -/* ABCFE8 80045E48 0C03F3A0 */ jal func_800FCE80 +/* ABCFE8 80045E48 0C03F3A0 */ jal Math_tanf /* ABCFEC 80045E4C 00000000 */ nop /* ABCFF0 80045E50 C7B00054 */ lwc1 $f16, 0x54($sp) /* ABCFF4 80045E54 8FA2008C */ lw $v0, 0x8c($sp) @@ -191,7 +191,7 @@ glabel func_80045C74 /* ABD078 80045ED8 0C01F00A */ jal func_8007C028 /* ABD07C 80045EDC 46062501 */ sub.s $f20, $f4, $f6 /* ABD080 80045EE0 4600A306 */ mov.s $f12, $f20 -/* ABD084 80045EE4 0C03F494 */ jal func_800FD250 +/* ABD084 80045EE4 0C03F494 */ jal Math_atan2f /* ABD088 80045EE8 46000386 */ mov.s $f14, $f0 /* ABD08C 80045EEC 3C028016 */ lui $v0, %hi(gGameInfo) # $v0, 0x8016 /* ABD090 80045EF0 8C42FA90 */ lw $v0, %lo(gGameInfo)($v0) diff --git a/asm/non_matchings/code/z_camera/func_800460A8.s b/asm/non_matchings/code/z_camera/func_800460A8.s index 9f4718be2b..912e308255 100644 --- a/asm/non_matchings/code/z_camera/func_800460A8.s +++ b/asm/non_matchings/code/z_camera/func_800460A8.s @@ -297,7 +297,7 @@ glabel func_800460A8 /* ABD5F4 80046454 46044501 */ sub.s $f20, $f8, $f4 /* ABD5F8 80046458 4600A306 */ mov.s $f12, $f20 /* ABD5FC 8004645C 46000386 */ mov.s $f14, $f0 -/* ABD600 80046460 0C03F494 */ jal func_800FD250 +/* ABD600 80046460 0C03F494 */ jal Math_atan2f /* ABD604 80046464 E7A00068 */ swc1 $f0, 0x68($sp) /* ABD608 80046468 3C018014 */ lui $at, %hi(D_80139E40) /* ABD60C 8004646C C4329E40 */ lwc1 $f18, %lo(D_80139E40)($at) @@ -307,7 +307,7 @@ glabel func_800460A8 /* ABD61C 8004647C 46065202 */ mul.s $f8, $f10, $f6 /* ABD620 80046480 00000000 */ nop /* ABD624 80046484 46124302 */ mul.s $f12, $f8, $f18 -/* ABD628 80046488 0C03F3A0 */ jal func_800FCE80 +/* ABD628 80046488 0C03F3A0 */ jal Math_tanf /* ABD62C 8004648C 00000000 */ nop /* ABD630 80046490 C7B00068 */ lwc1 $f16, 0x68($sp) /* ABD634 80046494 8FA200BC */ lw $v0, 0xbc($sp) @@ -352,7 +352,7 @@ glabel func_800460A8 /* ABD6C0 80046520 0C01F00A */ jal func_8007C028 /* ABD6C4 80046524 460A2501 */ sub.s $f20, $f4, $f10 /* ABD6C8 80046528 4600A306 */ mov.s $f12, $f20 -/* ABD6CC 8004652C 0C03F494 */ jal func_800FD250 +/* ABD6CC 8004652C 0C03F494 */ jal Math_atan2f /* ABD6D0 80046530 46000386 */ mov.s $f14, $f0 /* ABD6D4 80046534 3C028016 */ lui $v0, %hi(gGameInfo) # $v0, 0x8016 /* ABD6D8 80046538 8C42FA90 */ lw $v0, %lo(gGameInfo)($v0) diff --git a/asm/non_matchings/code/z_camera/func_80057FC4.s b/asm/non_matchings/code/z_camera/func_80057FC4.s deleted file mode 100644 index f52414a759..0000000000 --- a/asm/non_matchings/code/z_camera/func_80057FC4.s +++ /dev/null @@ -1,116 +0,0 @@ -.rdata -glabel D_8013984C - .asciz "camera: room type: default set field\n" - .balign 4 - -glabel D_80139874 - .asciz "camera: room type: default set etc (%d)\n" - .balign 4 - -glabel D_801398A0 - .asciz "camera: room type: prerender\n" - .balign 4 - -.text -glabel func_80057FC4 -/* ACF164 80057FC4 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* ACF168 80057FC8 AFBF002C */ sw $ra, 0x2c($sp) -/* ACF16C 80057FCC AFB00028 */ sw $s0, 0x28($sp) -/* ACF170 80057FD0 8C82008C */ lw $v0, 0x8c($a0) -/* ACF174 80057FD4 3C010001 */ lui $at, 1 -/* ACF178 80057FD8 00808025 */ move $s0, $a0 -/* ACF17C 80057FDC 244E01E0 */ addiu $t6, $v0, 0x1e0 -/* ACF180 80057FE0 108E0009 */ beq $a0, $t6, .L80058008 -/* ACF184 80057FE4 00411821 */ addu $v1, $v0, $at -/* ACF188 80057FE8 8499014C */ lh $t9, 0x14c($a0) -/* ACF18C 80057FEC 240F0021 */ li $t7, 33 -/* ACF190 80057FF0 A48F0142 */ sh $t7, 0x142($a0) -/* ACF194 80057FF4 84980142 */ lh $t8, 0x142($a0) -/* ACF198 80057FF8 3328FFFB */ andi $t0, $t9, 0xfffb -/* ACF19C 80057FFC A488014C */ sh $t0, 0x14c($a0) -/* ACF1A0 80058000 1000004A */ b .L8005812C -/* ACF1A4 80058004 A4980154 */ sh $t8, 0x154($a0) -.L80058008: -/* ACF1A8 80058008 8C691CC4 */ lw $t1, 0x1cc4($v1) -/* ACF1AC 8005800C 24060001 */ li $a2, 1 -/* ACF1B0 80058010 3C048014 */ lui $a0, %hi(D_801398A0) -/* ACF1B4 80058014 912A0000 */ lbu $t2, ($t1) -/* ACF1B8 80058018 10CA003B */ beq $a2, $t2, .L80058108 -/* ACF1BC 8005801C 00000000 */ nop -/* ACF1C0 80058020 90651CBF */ lbu $a1, 0x1cbf($v1) -/* ACF1C4 80058024 3C048014 */ lui $a0, %hi(D_8013984C) -/* ACF1C8 80058028 10A00012 */ beqz $a1, .L80058074 -/* ACF1CC 8005802C 00000000 */ nop -/* ACF1D0 80058030 14A60021 */ bne $a1, $a2, .L800580B8 -/* ACF1D4 80058034 3C048014 */ lui $a0, %hi(D_80139874) # $a0, 0x8014 -/* ACF1D8 80058038 240B0012 */ li $t3, 18 -/* ACF1DC 8005803C 240C000A */ li $t4, 10 -/* ACF1E0 80058040 AFAC0018 */ sw $t4, 0x18($sp) -/* ACF1E4 80058044 AFAB0014 */ sw $t3, 0x14($sp) -/* ACF1E8 80058048 02002025 */ move $a0, $s0 -/* ACF1EC 8005804C 00002825 */ move $a1, $zero -/* ACF1F0 80058050 2406FF9D */ li $a2, -99 -/* ACF1F4 80058054 24070000 */ li $a3, 0 -/* ACF1F8 80058058 0C016B50 */ jal func_8005AD40 -/* ACF1FC 8005805C AFA00010 */ sw $zero, 0x10($sp) -/* ACF200 80058060 240D0003 */ li $t5, 3 -/* ACF204 80058064 A60D0142 */ sh $t5, 0x142($s0) -/* ACF208 80058068 860E0142 */ lh $t6, 0x142($s0) -/* ACF20C 8005806C 1000002F */ b .L8005812C -/* ACF210 80058070 A60E0154 */ sh $t6, 0x154($s0) -.L80058074: -/* ACF214 80058074 0C00084C */ jal osSyncPrintf -/* ACF218 80058078 2484984C */ addiu $a0, %lo(D_8013984C) # addiu $a0, $a0, -0x67b4 -/* ACF21C 8005807C 240F0012 */ li $t7, 18 -/* ACF220 80058080 2418000A */ li $t8, 10 -/* ACF224 80058084 AFB80018 */ sw $t8, 0x18($sp) -/* ACF228 80058088 AFAF0014 */ sw $t7, 0x14($sp) -/* ACF22C 8005808C 02002025 */ move $a0, $s0 -/* ACF230 80058090 00002825 */ move $a1, $zero -/* ACF234 80058094 2406FF9D */ li $a2, -99 -/* ACF238 80058098 24070000 */ li $a3, 0 -/* ACF23C 8005809C 0C016B50 */ jal func_8005AD40 -/* ACF240 800580A0 AFA00010 */ sw $zero, 0x10($sp) -/* ACF244 800580A4 24190001 */ li $t9, 1 -/* ACF248 800580A8 A6190142 */ sh $t9, 0x142($s0) -/* ACF24C 800580AC 86080142 */ lh $t0, 0x142($s0) -/* ACF250 800580B0 1000001E */ b .L8005812C -/* ACF254 800580B4 A6080154 */ sh $t0, 0x154($s0) -.L800580B8: -/* ACF258 800580B8 0C00084C */ jal osSyncPrintf -/* ACF25C 800580BC 24849874 */ addiu $a0, %lo(D_80139874) -/* ACF260 800580C0 24090012 */ li $t1, 18 -/* ACF264 800580C4 240A000A */ li $t2, 10 -/* ACF268 800580C8 AFAA0018 */ sw $t2, 0x18($sp) -/* ACF26C 800580CC AFA90014 */ sw $t1, 0x14($sp) -/* ACF270 800580D0 02002025 */ move $a0, $s0 -/* ACF274 800580D4 00002825 */ move $a1, $zero -/* ACF278 800580D8 2406FF9D */ li $a2, -99 -/* ACF27C 800580DC 24070000 */ li $a3, 0 -/* ACF280 800580E0 0C016B50 */ jal func_8005AD40 -/* ACF284 800580E4 AFA00010 */ sw $zero, 0x10($sp) -/* ACF288 800580E8 860D014C */ lh $t5, 0x14c($s0) -/* ACF28C 800580EC 240B0001 */ li $t3, 1 -/* ACF290 800580F0 A60B0142 */ sh $t3, 0x142($s0) -/* ACF294 800580F4 860C0142 */ lh $t4, 0x142($s0) -/* ACF298 800580F8 35AE0004 */ ori $t6, $t5, 4 -/* ACF29C 800580FC A60E014C */ sh $t6, 0x14c($s0) -/* ACF2A0 80058100 1000000A */ b .L8005812C -/* ACF2A4 80058104 A60C0154 */ sh $t4, 0x154($s0) -.L80058108: -/* ACF2A8 80058108 0C00084C */ jal osSyncPrintf -/* ACF2AC 8005810C 248498A0 */ addiu $a0, %lo(D_801398A0) -/* ACF2B0 80058110 240F0021 */ li $t7, 33 -/* ACF2B4 80058114 8619014C */ lh $t9, 0x14c($s0) -/* ACF2B8 80058118 A60F0142 */ sh $t7, 0x142($s0) -/* ACF2BC 8005811C 86180142 */ lh $t8, 0x142($s0) -/* ACF2C0 80058120 3328FFFB */ andi $t0, $t9, 0xfffb -/* ACF2C4 80058124 A608014C */ sh $t0, 0x14c($s0) -/* ACF2C8 80058128 A6180154 */ sh $t8, 0x154($s0) -.L8005812C: -/* ACF2CC 8005812C 8FBF002C */ lw $ra, 0x2c($sp) -/* ACF2D0 80058130 8FB00028 */ lw $s0, 0x28($sp) -/* ACF2D4 80058134 27BD0030 */ addiu $sp, $sp, 0x30 -/* ACF2D8 80058138 03E00008 */ jr $ra -/* ACF2DC 8005813C 00000000 */ nop - diff --git a/asm/non_matchings/code/z_camera/func_800588B4.s b/asm/non_matchings/code/z_camera/func_800588B4.s index 75de2174e2..02066ad4f7 100644 --- a/asm/non_matchings/code/z_camera/func_800588B4.s +++ b/asm/non_matchings/code/z_camera/func_800588B4.s @@ -213,7 +213,7 @@ glabel func_800588B4 /* ACFD30 80058B90 856C02F6 */ lh $t4, 0x2f6($t3) /* ACFD34 80058B94 5180000A */ beql $t4, $zero, .L80058BC0 /* ACFD38 80058B98 8FB9002C */ lw $t9, 0x2c($sp) -/* ACFD3C 80058B9C 0C024BEB */ jal func_80092FAC +/* ACFD3C 80058B9C 0C024BEB */ jal Quake_RemoveFromIdx /* ACFD40 80058BA0 85A40000 */ lh $a0, ($t5) /* ACFD44 80058BA4 8FAF002C */ lw $t7, 0x2c($sp) /* ACFD48 80058BA8 240EFFFF */ li $t6, -1 @@ -227,31 +227,31 @@ glabel func_800588B4 /* ACFD64 80058BC4 87240000 */ lh $a0, ($t9) /* ACFD68 80058BC8 50810006 */ beql $a0, $at, .L80058BE4 /* ACFD6C 80058BCC 02002025 */ move $a0, $s0 -/* ACFD70 80058BD0 0C024B8F */ jal func_80092E3C +/* ACFD70 80058BD0 0C024B8F */ jal Quake_GetCountdown /* ACFD74 80058BD4 00000000 */ nop /* ACFD78 80058BD8 2401000A */ li $at, 10 /* ACFD7C 80058BDC 14410015 */ bne $v0, $at, .L80058C34 /* ACFD80 80058BE0 02002025 */ move $a0, $s0 .L80058BE4: -/* ACFD84 80058BE4 0C024BE2 */ jal func_80092F88 +/* ACFD84 80058BE4 0C024BE2 */ jal Quake_Add /* ACFD88 80058BE8 24050005 */ li $a1, 5 /* ACFD8C 80058BEC 8FA8002C */ lw $t0, 0x2c($sp) /* ACFD90 80058BF0 10400010 */ beqz $v0, .L80058C34 /* ACFD94 80058BF4 A5020000 */ sh $v0, ($t0) /* ACFD98 80058BF8 8FA9002C */ lw $t1, 0x2c($sp) /* ACFD9C 80058BFC 24050226 */ li $a1, 550 -/* ACFDA0 80058C00 0C024B6B */ jal func_80092DAC +/* ACFDA0 80058C00 0C024B6B */ jal Quake_SetSpeed /* ACFDA4 80058C04 85240000 */ lh $a0, ($t1) /* ACFDA8 80058C08 8FAA002C */ lw $t2, 0x2c($sp) /* ACFDAC 80058C0C 24050001 */ li $a1, 1 /* ACFDB0 80058C10 24060001 */ li $a2, 1 /* ACFDB4 80058C14 85440000 */ lh $a0, ($t2) /* ACFDB8 80058C18 AFA00010 */ sw $zero, 0x10($sp) -/* ACFDBC 80058C1C 0C024B9C */ jal func_80092E70 +/* ACFDBC 80058C1C 0C024B9C */ jal Quake_SetQuakeValues /* ACFDC0 80058C20 240700B4 */ li $a3, 180 /* ACFDC4 80058C24 8FAB002C */ lw $t3, 0x2c($sp) /* ACFDC8 80058C28 240503E8 */ li $a1, 1000 -/* ACFDCC 80058C2C 0C024B7C */ jal func_80092DF0 +/* ACFDCC 80058C2C 0C024B7C */ jal Quake_SetCountdown /* ACFDD0 80058C30 85640000 */ lh $a0, ($t3) .L80058C34: /* ACFDD4 80058C34 86020150 */ lh $v0, 0x150($s0) @@ -295,7 +295,7 @@ glabel func_800588B4 /* ACFE60 80058CC0 85C40000 */ lh $a0, ($t6) /* ACFE64 80058CC4 50800004 */ beql $a0, $zero, .L80058CD8 /* ACFE68 80058CC8 A6000150 */ sh $zero, 0x150($s0) -/* ACFE6C 80058CCC 0C024BEB */ jal func_80092FAC +/* ACFE6C 80058CCC 0C024BEB */ jal Quake_RemoveFromIdx /* ACFE70 80058CD0 00000000 */ nop /* ACFE74 80058CD4 A6000150 */ sh $zero, 0x150($s0) .L80058CD8: diff --git a/asm/non_matchings/code/z_camera/func_800591EC.s b/asm/non_matchings/code/z_camera/func_800591EC.s index 8028c89968..53c215eadf 100644 --- a/asm/non_matchings/code/z_camera/func_800591EC.s +++ b/asm/non_matchings/code/z_camera/func_800591EC.s @@ -626,7 +626,7 @@ glabel func_800591EC /* AD0BB8 80059A18 10000126 */ b .L80059EB4 /* AD0BBC 80059A1C 8FA200E0 */ lw $v0, 0xe0($sp) .L80059A20: -/* AD0BC0 80059A20 0C024BFC */ jal func_80092FF0 +/* AD0BC0 80059A20 0C024BFC */ jal Quake_Calc /* AD0BC4 80059A24 27A5005C */ addiu $a1, $sp, 0x5c /* AD0BC8 80059A28 10400038 */ beqz $v0, .L80059B0C /* AD0BCC 80059A2C AFA200A8 */ sw $v0, 0xa8($sp) diff --git a/asm/non_matchings/code/z_camera/func_8005AA1C.s b/asm/non_matchings/code/z_camera/func_8005AA1C.s index 84ba5ca39f..ff26772c11 100644 --- a/asm/non_matchings/code/z_camera/func_8005AA1C.s +++ b/asm/non_matchings/code/z_camera/func_8005AA1C.s @@ -4,7 +4,7 @@ glabel func_8005AA1C /* AD1BC4 8005AA24 AFA5002C */ sw $a1, 0x2c($sp) /* AD1BC8 8005AA28 AFA60030 */ sw $a2, 0x30($sp) /* AD1BCC 8005AA2C AFA70034 */ sw $a3, 0x34($sp) -/* AD1BD0 8005AA30 0C024BE2 */ jal func_80092F88 +/* AD1BD0 8005AA30 0C024BE2 */ jal Quake_Add /* AD1BD4 8005AA34 24050003 */ li $a1, 3 /* AD1BD8 8005AA38 00022400 */ sll $a0, $v0, 0x10 /* AD1BDC 8005AA3C 14400003 */ bnez $v0, .L8005AA4C @@ -13,16 +13,16 @@ glabel func_8005AA1C /* AD1BE8 8005AA48 00001025 */ move $v0, $zero .L8005AA4C: /* AD1BEC 8005AA4C 240561A8 */ li $a1, 25000 -/* AD1BF0 8005AA50 0C024B6B */ jal func_80092DAC +/* AD1BF0 8005AA50 0C024B6B */ jal Quake_SetSpeed /* AD1BF4 8005AA54 A7A40026 */ sh $a0, 0x26($sp) /* AD1BF8 8005AA58 87A40026 */ lh $a0, 0x26($sp) /* AD1BFC 8005AA5C 87A50032 */ lh $a1, 0x32($sp) /* AD1C00 8005AA60 00003025 */ move $a2, $zero /* AD1C04 8005AA64 00003825 */ move $a3, $zero -/* AD1C08 8005AA68 0C024B9C */ jal func_80092E70 +/* AD1C08 8005AA68 0C024B9C */ jal Quake_SetQuakeValues /* AD1C0C 8005AA6C AFA00010 */ sw $zero, 0x10($sp) /* AD1C10 8005AA70 87A40026 */ lh $a0, 0x26($sp) -/* AD1C14 8005AA74 0C024B7C */ jal func_80092DF0 +/* AD1C14 8005AA74 0C024B7C */ jal Quake_SetCountdown /* AD1C18 8005AA78 87A50036 */ lh $a1, 0x36($sp) /* AD1C1C 8005AA7C 24020001 */ li $v0, 1 .L8005AA80: diff --git a/asm/non_matchings/code/z_collision_check/func_8005B2AC.s b/asm/non_matchings/code/z_collision_check/func_8005B2AC.s index fa87864a7b..071a9347af 100644 --- a/asm/non_matchings/code/z_collision_check/func_8005B2AC.s +++ b/asm/non_matchings/code/z_collision_check/func_8005B2AC.s @@ -28,7 +28,7 @@ glabel func_8005B2AC /* AD246C 8005B2CC 24C6A5B0 */ addiu $a2, %lo(D_8013A5B0) # addiu $a2, $a2, -0x5a50 /* AD2470 8005B2D0 240702C9 */ li $a3, 713 /* AD2474 8005B2D4 02002825 */ move $a1, $s0 -/* AD2478 8005B2D8 0C031AB1 */ jal func_800C6AC4 +/* AD2478 8005B2D8 0C031AB1 */ jal Graph_OpenDisps /* AD247C 8005B2DC 27A40064 */ addiu $a0, $sp, 0x64 /* AD2480 8005B2E0 8E0202C0 */ lw $v0, 0x2c0($s0) /* AD2484 8005B2E4 3C0FDA38 */ lui $t7, (0xDA380003 >> 16) # lui $t7, 0xda38 @@ -250,7 +250,7 @@ glabel func_8005B2AC /* AD27D4 8005B634 02002825 */ move $a1, $s0 /* AD27D8 8005B638 240702F5 */ li $a3, 757 /* AD27DC 8005B63C AC400004 */ sw $zero, 4($v0) -/* AD27E0 8005B640 0C031AD5 */ jal func_800C6B54 +/* AD27E0 8005B640 0C031AD5 */ jal Graph_CloseDisps /* AD27E4 8005B644 AC4B0000 */ sw $t3, ($v0) /* AD27E8 8005B648 8FBF002C */ lw $ra, 0x2c($sp) /* AD27EC 8005B64C 8FB00028 */ lw $s0, 0x28($sp) diff --git a/asm/non_matchings/code/z_debug/func_800636C0.s b/asm/non_matchings/code/z_debug/func_800636C0.s deleted file mode 100644 index 09f613b865..0000000000 --- a/asm/non_matchings/code/z_debug/func_800636C0.s +++ /dev/null @@ -1,48 +0,0 @@ -.rdata -glabel D_8013AD40 - .asciz "../z_debug.c" - .balign 4 - -.text -glabel func_800636C0 -/* ADA860 800636C0 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* ADA864 800636C4 AFBF0014 */ sw $ra, 0x14($sp) -/* ADA868 800636C8 3C058014 */ lui $a1, %hi(D_8013AD40) # $a1, 0x8014 -/* ADA86C 800636CC 24A5AD40 */ addiu $a1, %lo(D_8013AD40) # addiu $a1, $a1, -0x52c0 -/* ADA870 800636D0 240415D4 */ li $a0, 5588 -/* ADA874 800636D4 0C03F570 */ jal SystemArena_MallocDebug -/* ADA878 800636D8 24060104 */ li $a2, 260 -/* ADA87C 800636DC 3C048016 */ lui $a0, %hi(gGameInfo) # $a0, 0x8016 -/* ADA880 800636E0 2484FA90 */ addiu $a0, %lo(gGameInfo) # addiu $a0, $a0, -0x570 -/* ADA884 800636E4 AC820000 */ sw $v0, ($a0) -/* ADA888 800636E8 AC400000 */ sw $zero, ($v0) -/* ADA88C 800636EC 8C8F0000 */ lw $t7, ($a0) -/* ADA890 800636F0 240215C0 */ li $v0, 5568 -/* ADA894 800636F4 00001825 */ move $v1, $zero -/* ADA898 800636F8 ADE00004 */ sw $zero, 4($t7) -/* ADA89C 800636FC 8C980000 */ lw $t8, ($a0) -/* ADA8A0 80063700 AF000008 */ sw $zero, 8($t8) -/* ADA8A4 80063704 8C990000 */ lw $t9, ($a0) -/* ADA8A8 80063708 AF20000C */ sw $zero, 0xc($t9) -/* ADA8AC 8006370C 8C880000 */ lw $t0, ($a0) -/* ADA8B0 80063710 AD000010 */ sw $zero, 0x10($t0) -.L80063714: -/* ADA8B4 80063714 8C890000 */ lw $t1, ($a0) -/* ADA8B8 80063718 01235021 */ addu $t2, $t1, $v1 -/* ADA8BC 8006371C A5400014 */ sh $zero, 0x14($t2) -/* ADA8C0 80063720 8C8B0000 */ lw $t3, ($a0) -/* ADA8C4 80063724 01636021 */ addu $t4, $t3, $v1 -/* ADA8C8 80063728 A5800016 */ sh $zero, 0x16($t4) -/* ADA8CC 8006372C 8C8D0000 */ lw $t5, ($a0) -/* ADA8D0 80063730 01A37021 */ addu $t6, $t5, $v1 -/* ADA8D4 80063734 A5C00018 */ sh $zero, 0x18($t6) -/* ADA8D8 80063738 8C8F0000 */ lw $t7, ($a0) -/* ADA8DC 8006373C 01E3C021 */ addu $t8, $t7, $v1 -/* ADA8E0 80063740 24630008 */ addiu $v1, $v1, 8 -/* ADA8E4 80063744 1462FFF3 */ bne $v1, $v0, .L80063714 -/* ADA8E8 80063748 A700001A */ sh $zero, 0x1a($t8) -/* ADA8EC 8006374C 8FBF0014 */ lw $ra, 0x14($sp) -/* ADA8F0 80063750 27BD0018 */ addiu $sp, $sp, 0x18 -/* ADA8F4 80063754 03E00008 */ jr $ra -/* ADA8F8 80063758 00000000 */ nop - diff --git a/asm/non_matchings/code/z_debug/func_8006375C.s b/asm/non_matchings/code/z_debug/func_8006375C.s deleted file mode 100644 index 44630c7e23..0000000000 --- a/asm/non_matchings/code/z_debug/func_8006375C.s +++ /dev/null @@ -1,6 +0,0 @@ -glabel func_8006375C -/* ADA8FC 8006375C AFA40000 */ sw $a0, ($sp) -/* ADA900 80063760 AFA50004 */ sw $a1, 4($sp) -/* ADA904 80063764 03E00008 */ jr $ra -/* ADA908 80063768 AFA60008 */ sw $a2, 8($sp) - diff --git a/asm/non_matchings/code/z_debug/func_8006376C.s b/asm/non_matchings/code/z_debug/func_8006376C.s deleted file mode 100644 index d8645d0e1a..0000000000 --- a/asm/non_matchings/code/z_debug/func_8006376C.s +++ /dev/null @@ -1,52 +0,0 @@ -glabel func_8006376C -/* ADA90C 8006376C 3C098012 */ lui $t1, %hi(D_8011E0B0) # $t1, 0x8012 -/* ADA910 80063770 2529E0B0 */ addiu $t1, %lo(D_8011E0B0) # addiu $t1, $t1, -0x1f50 -/* ADA914 80063774 85230000 */ lh $v1, ($t1) -/* ADA918 80063778 27BDFFF8 */ addiu $sp, $sp, -8 -/* ADA91C 8006377C 3C0F8016 */ lui $t7, %hi(D_8015FA98) # $t7, 0x8016 -/* ADA920 80063780 00037080 */ sll $t6, $v1, 2 -/* ADA924 80063784 01C37023 */ subu $t6, $t6, $v1 -/* ADA928 80063788 AFB00004 */ sw $s0, 4($sp) -/* ADA92C 8006378C AFA40008 */ sw $a0, 8($sp) -/* ADA930 80063790 AFA5000C */ sw $a1, 0xc($sp) -/* ADA934 80063794 AFA60010 */ sw $a2, 0x10($sp) -/* ADA938 80063798 000E70C0 */ sll $t6, $t6, 3 -/* ADA93C 8006379C 25EFFA98 */ addiu $t7, %lo(D_8015FA98) # addiu $t7, $t7, -0x568 -/* ADA940 800637A0 28610016 */ slti $at, $v1, 0x16 -/* ADA944 800637A4 30C600FF */ andi $a2, $a2, 0xff -/* ADA948 800637A8 30A500FF */ andi $a1, $a1, 0xff -/* ADA94C 800637AC 308400FF */ andi $a0, $a0, 0xff -/* ADA950 800637B0 00E08025 */ move $s0, $a3 -/* ADA954 800637B4 10200019 */ beqz $at, .L8006381C -/* ADA958 800637B8 01CF1021 */ addu $v0, $t6, $t7 -/* ADA95C 800637BC A0440000 */ sb $a0, ($v0) -/* ADA960 800637C0 A0450001 */ sb $a1, 1($v0) -/* ADA964 800637C4 A0460002 */ sb $a2, 2($v0) -/* ADA968 800637C8 90E70000 */ lbu $a3, ($a3) -/* ADA96C 800637CC 00001825 */ move $v1, $zero -/* ADA970 800637D0 24480004 */ addiu $t0, $v0, 4 -/* ADA974 800637D4 26100001 */ addiu $s0, $s0, 1 -/* ADA978 800637D8 10E0000C */ beqz $a3, .L8006380C -/* ADA97C 800637DC A0470003 */ sb $a3, 3($v0) -.L800637E0: -/* ADA980 800637E0 28620015 */ slti $v0, $v1, 0x15 -/* ADA984 800637E4 24630001 */ addiu $v1, $v1, 1 -/* ADA988 800637E8 00031C00 */ sll $v1, $v1, 0x10 -/* ADA98C 800637EC 38420001 */ xori $v0, $v0, 1 -/* ADA990 800637F0 14400006 */ bnez $v0, .L8006380C -/* ADA994 800637F4 00031C03 */ sra $v1, $v1, 0x10 -/* ADA998 800637F8 92070000 */ lbu $a3, ($s0) -/* ADA99C 800637FC 25080001 */ addiu $t0, $t0, 1 -/* ADA9A0 80063800 26100001 */ addiu $s0, $s0, 1 -/* ADA9A4 80063804 14E0FFF6 */ bnez $a3, .L800637E0 -/* ADA9A8 80063808 A107FFFF */ sb $a3, -1($t0) -.L8006380C: -/* ADA9AC 8006380C A1000000 */ sb $zero, ($t0) -/* ADA9B0 80063810 85380000 */ lh $t8, ($t1) -/* ADA9B4 80063814 27190001 */ addiu $t9, $t8, 1 -/* ADA9B8 80063818 A5390000 */ sh $t9, ($t1) -.L8006381C: -/* ADA9BC 8006381C 8FB00004 */ lw $s0, 4($sp) -/* ADA9C0 80063820 03E00008 */ jr $ra -/* ADA9C4 80063824 27BD0008 */ addiu $sp, $sp, 8 - diff --git a/asm/non_matchings/code/z_debug/func_80063828.s b/asm/non_matchings/code/z_debug/func_80063828.s deleted file mode 100644 index 735375cf21..0000000000 --- a/asm/non_matchings/code/z_debug/func_80063828.s +++ /dev/null @@ -1,67 +0,0 @@ -.rdata -glabel D_8013AD50 - .asciz "%s" - .balign 4 - -.text -glabel func_80063828 -/* ADA9C8 80063828 27BDFFC0 */ addiu $sp, $sp, -0x40 -/* ADA9CC 8006382C AFB60038 */ sw $s6, 0x38($sp) -/* ADA9D0 80063830 3C168012 */ lui $s6, %hi(D_8011E0B0) # $s6, 0x8012 -/* ADA9D4 80063834 26D6E0B0 */ addiu $s6, %lo(D_8011E0B0) # addiu $s6, $s6, -0x1f50 -/* ADA9D8 80063838 86CE0000 */ lh $t6, ($s6) -/* ADA9DC 8006383C AFB3002C */ sw $s3, 0x2c($sp) -/* ADA9E0 80063840 AFB20028 */ sw $s2, 0x28($sp) -/* ADA9E4 80063844 00809825 */ move $s3, $a0 -/* ADA9E8 80063848 AFBF003C */ sw $ra, 0x3c($sp) -/* ADA9EC 8006384C AFB50034 */ sw $s5, 0x34($sp) -/* ADA9F0 80063850 AFB40030 */ sw $s4, 0x30($sp) -/* ADA9F4 80063854 AFB10024 */ sw $s1, 0x24($sp) -/* ADA9F8 80063858 AFB00020 */ sw $s0, 0x20($sp) -/* ADA9FC 8006385C 19C00021 */ blez $t6, .L800638E4 -/* ADAA00 80063860 00009025 */ move $s2, $zero -/* ADAA04 80063864 3C108016 */ lui $s0, %hi(D_8015FA98) # $s0, 0x8016 -/* ADAA08 80063868 3C118016 */ lui $s1, %hi(D_8015FA9B) # $s1, 0x8016 -/* ADAA0C 8006386C 3C158014 */ lui $s5, %hi(D_8013AD50) # $s5, 0x8014 -/* ADAA10 80063870 3C148012 */ lui $s4, %hi(D_8011E0B4) # $s4, 0x8012 -/* ADAA14 80063874 2694E0B4 */ addiu $s4, %lo(D_8011E0B4) # addiu $s4, $s4, -0x1f4c -/* ADAA18 80063878 26B5AD50 */ addiu $s5, %lo(D_8013AD50) # addiu $s5, $s5, -0x52b0 -/* ADAA1C 8006387C 2631FA9B */ addiu $s1, %lo(D_8015FA9B) # addiu $s1, $s1, -0x565 -/* ADAA20 80063880 2610FA98 */ addiu $s0, %lo(D_8015FA98) # addiu $s0, $s0, -0x568 -.L80063884: -/* ADAA24 80063884 920F0002 */ lbu $t7, 2($s0) -/* ADAA28 80063888 02602025 */ move $a0, $s3 -/* ADAA2C 8006388C 000FC080 */ sll $t8, $t7, 2 -/* ADAA30 80063890 02981021 */ addu $v0, $s4, $t8 -/* ADAA34 80063894 90590003 */ lbu $t9, 3($v0) -/* ADAA38 80063898 90450000 */ lbu $a1, ($v0) -/* ADAA3C 8006389C 90460001 */ lbu $a2, 1($v0) -/* ADAA40 800638A0 90470002 */ lbu $a3, 2($v0) -/* ADAA44 800638A4 0C03ECEB */ jal GfxPrint_SetColor -/* ADAA48 800638A8 AFB90010 */ sw $t9, 0x10($sp) -/* ADAA4C 800638AC 02602025 */ move $a0, $s3 -/* ADAA50 800638B0 92050000 */ lbu $a1, ($s0) -/* ADAA54 800638B4 0C03ED07 */ jal GfxPrint_SetPos -/* ADAA58 800638B8 92060001 */ lbu $a2, 1($s0) -/* ADAA5C 800638BC 02602025 */ move $a0, $s3 -/* ADAA60 800638C0 02A02825 */ move $a1, $s5 -/* ADAA64 800638C4 0C03EF2D */ jal GfxPrint_Printf -/* ADAA68 800638C8 02203025 */ move $a2, $s1 -/* ADAA6C 800638CC 86C80000 */ lh $t0, ($s6) -/* ADAA70 800638D0 26520001 */ addiu $s2, $s2, 1 -/* ADAA74 800638D4 26100018 */ addiu $s0, $s0, 0x18 -/* ADAA78 800638D8 0248082A */ slt $at, $s2, $t0 -/* ADAA7C 800638DC 1420FFE9 */ bnez $at, .L80063884 -/* ADAA80 800638E0 26310018 */ addiu $s1, $s1, 0x18 -.L800638E4: -/* ADAA84 800638E4 8FBF003C */ lw $ra, 0x3c($sp) -/* ADAA88 800638E8 8FB00020 */ lw $s0, 0x20($sp) -/* ADAA8C 800638EC 8FB10024 */ lw $s1, 0x24($sp) -/* ADAA90 800638F0 8FB20028 */ lw $s2, 0x28($sp) -/* ADAA94 800638F4 8FB3002C */ lw $s3, 0x2c($sp) -/* ADAA98 800638F8 8FB40030 */ lw $s4, 0x30($sp) -/* ADAA9C 800638FC 8FB50034 */ lw $s5, 0x34($sp) -/* ADAAA0 80063900 8FB60038 */ lw $s6, 0x38($sp) -/* ADAAA4 80063904 03E00008 */ jr $ra -/* ADAAA8 80063908 27BD0040 */ addiu $sp, $sp, 0x40 - diff --git a/asm/non_matchings/code/z_debug/func_8006390C.s b/asm/non_matchings/code/z_debug/func_8006390C.s deleted file mode 100644 index 70b4986eb7..0000000000 --- a/asm/non_matchings/code/z_debug/func_8006390C.s +++ /dev/null @@ -1,228 +0,0 @@ -.late_rodata -glabel jtbl_8013AD80 - .word L80063A18 - .word L80063A18 - .word L80063A18 - .word L80063A18 - .word L80063A18 - .word L80063A18 - -.text -glabel func_8006390C -/* ADAAAC 8006390C 3C0B8016 */ lui $t3, %hi(gGameInfo) # $t3, 0x8016 -/* ADAAB0 80063910 256BFA90 */ addiu $t3, %lo(gGameInfo) # addiu $t3, $t3, -0x570 -/* ADAAB4 80063914 8D680000 */ lw $t0, ($t3) -/* ADAAB8 80063918 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* ADAABC 8006391C AFBF0014 */ sw $ra, 0x14($sp) -/* ADAAC0 80063920 8D0A0004 */ lw $t2, 4($t0) -/* ADAAC4 80063924 8D090000 */ lw $t1, ($t0) -/* ADAAC8 80063928 94850000 */ lhu $a1, ($a0) -/* ADAACC 8006392C 000A7080 */ sll $t6, $t2, 2 -/* ADAAD0 80063930 01CA7023 */ subu $t6, $t6, $t2 -/* ADAAD4 80063934 000E7040 */ sll $t6, $t6, 1 -/* ADAAD8 80063938 2401FFDF */ li $at, -33 -/* ADAADC 8006393C 01C96021 */ addu $t4, $t6, $t1 -/* ADAAE0 80063940 000C6100 */ sll $t4, $t4, 4 -/* ADAAE4 80063944 00A17827 */ nor $t7, $a1, $at -/* ADAAE8 80063948 00803025 */ move $a2, $a0 -/* ADAAEC 8006394C 258CFFF0 */ addiu $t4, $t4, -0x10 -/* ADAAF0 80063950 11E00008 */ beqz $t7, .L80063974 -/* ADAAF4 80063954 30A70F00 */ andi $a3, $a1, 0xf00 -/* ADAAF8 80063958 2401FFEF */ li $at, -17 -/* ADAAFC 8006395C 00A1C027 */ nor $t8, $a1, $at -/* ADAB00 80063960 13000004 */ beqz $t8, .L80063974 -/* ADAB04 80063964 2401EFFF */ li $at, -4097 -/* ADAB08 80063968 00A1C827 */ nor $t9, $a1, $at -/* ADAB0C 8006396C 17200022 */ bnez $t9, .L800639F8 -/* ADAB10 80063970 252DFFFF */ addiu $t5, $t1, -1 -.L80063974: -/* ADAB14 80063974 3C028012 */ lui $v0, %hi(D_8011E0D4) # $v0, 0x8012 -/* ADAB18 80063978 2442E0D4 */ addiu $v0, %lo(D_8011E0D4) # addiu $v0, $v0, -0x1f2c -/* ADAB1C 8006397C 00001825 */ move $v1, $zero -/* ADAB20 80063980 2404001D */ li $a0, 29 -.L80063984: -/* ADAB24 80063984 944D0000 */ lhu $t5, ($v0) -/* ADAB28 80063988 01A07027 */ not $t6, $t5 -/* ADAB2C 8006398C 01C57827 */ nor $t7, $t6, $a1 -/* ADAB30 80063990 55E00008 */ bnezl $t7, .L800639B4 -/* ADAB34 80063994 24630001 */ addiu $v1, $v1, 1 -/* ADAB38 80063998 94580002 */ lhu $t8, 2($v0) -/* ADAB3C 8006399C 94CD000C */ lhu $t5, 0xc($a2) -/* ADAB40 800639A0 0300C827 */ not $t9, $t8 -/* ADAB44 800639A4 032D7027 */ nor $t6, $t9, $t5 -/* ADAB48 800639A8 51C00005 */ beql $t6, $zero, .L800639C0 -/* ADAB4C 800639AC 2861001D */ slti $at, $v1, 0x1d -/* ADAB50 800639B0 24630001 */ addiu $v1, $v1, 1 -.L800639B4: -/* ADAB54 800639B4 1464FFF3 */ bne $v1, $a0, .L80063984 -/* ADAB58 800639B8 24420004 */ addiu $v0, $v0, 4 -/* ADAB5C 800639BC 2861001D */ slti $at, $v1, 0x1d -.L800639C0: -/* ADAB60 800639C0 5020008D */ beql $at, $zero, .L80063BF8 -/* ADAB64 800639C4 8FBF0014 */ lw $ra, 0x14($sp) -/* ADAB68 800639C8 146A0007 */ bne $v1, $t2, .L800639E8 -/* ADAB6C 800639CC 252F0001 */ addiu $t7, $t1, 1 -/* ADAB70 800639D0 24010007 */ li $at, 7 -/* ADAB74 800639D4 01E1001A */ div $zero, $t7, $at -/* ADAB78 800639D8 0000C010 */ mfhi $t8 -/* ADAB7C 800639DC AD180000 */ sw $t8, ($t0) -/* ADAB80 800639E0 10000085 */ b .L80063BF8 -/* ADAB84 800639E4 8FBF0014 */ lw $ra, 0x14($sp) -.L800639E8: -/* ADAB88 800639E8 AD030004 */ sw $v1, 4($t0) -/* ADAB8C 800639EC 8D790000 */ lw $t9, ($t3) -/* ADAB90 800639F0 10000080 */ b .L80063BF4 -/* ADAB94 800639F4 AF200000 */ sw $zero, ($t9) -.L800639F8: -/* ADAB98 800639F8 2DA10006 */ sltiu $at, $t5, 6 -/* ADAB9C 800639FC 1020007D */ beqz $at, .L80063BF4 -/* ADABA0 80063A00 000D6880 */ sll $t5, $t5, 2 -/* ADABA4 80063A04 3C018014 */ lui $at, %hi(jtbl_8013AD80) -/* ADABA8 80063A08 002D0821 */ addu $at, $at, $t5 -/* ADABAC 80063A0C 8C2DAD80 */ lw $t5, %lo(jtbl_8013AD80)($at) -/* ADABB0 80063A10 01A00008 */ jr $t5 -/* ADABB4 80063A14 00000000 */ nop -glabel L80063A18 -/* ADABB8 80063A18 8D0E000C */ lw $t6, 0xc($t0) -/* ADABBC 80063A1C 240F0010 */ li $t7, 16 -/* ADABC0 80063A20 54EE0010 */ bnel $a3, $t6, .L80063A64 -/* ADABC4 80063A24 AD0F0010 */ sw $t7, 0x10($t0) -/* ADABC8 80063A28 8D0F0010 */ lw $t7, 0x10($t0) -/* ADABCC 80063A2C 240D0001 */ li $t5, 1 -/* ADABD0 80063A30 25F8FFFF */ addiu $t8, $t7, -1 -/* ADABD4 80063A34 AD180010 */ sw $t8, 0x10($t0) -/* ADABD8 80063A38 8D680000 */ lw $t0, ($t3) -/* ADABDC 80063A3C 8D190010 */ lw $t9, 0x10($t0) -/* ADABE0 80063A40 07230005 */ bgezl $t9, .L80063A58 -/* ADABE4 80063A44 8D0E000C */ lw $t6, 0xc($t0) -/* ADABE8 80063A48 AD0D0010 */ sw $t5, 0x10($t0) -/* ADABEC 80063A4C 10000008 */ b .L80063A70 -/* ADABF0 80063A50 8D680000 */ lw $t0, ($t3) -/* ADABF4 80063A54 8D0E000C */ lw $t6, 0xc($t0) -.L80063A58: -/* ADABF8 80063A58 10000005 */ b .L80063A70 -/* ADABFC 80063A5C 00EE3826 */ xor $a3, $a3, $t6 -/* ADAC00 80063A60 AD0F0010 */ sw $t7, 0x10($t0) -.L80063A64: -/* ADAC04 80063A64 8D780000 */ lw $t8, ($t3) -/* ADAC08 80063A68 AF07000C */ sw $a3, 0xc($t8) -/* ADAC0C 80063A6C 8D680000 */ lw $t0, ($t3) -.L80063A70: -/* ADAC10 80063A70 30F90100 */ andi $t9, $a3, 0x100 -/* ADAC14 80063A74 13200018 */ beqz $t9, .L80063AD8 -/* ADAC18 80063A78 30F80200 */ andi $t8, $a3, 0x200 -/* ADAC1C 80063A7C 94C50000 */ lhu $a1, ($a2) -/* ADAC20 80063A80 3C01FFFF */ lui $at, (0xFFFF3FFF >> 16) # lui $at, 0xffff -/* ADAC24 80063A84 34213FFF */ ori $at, (0xFFFF3FFF & 0xFFFF) # ori $at, $at, 0x3fff -/* ADAC28 80063A88 00A16827 */ nor $t5, $a1, $at -/* ADAC2C 80063A8C 15A00003 */ bnez $t5, .L80063A9C -/* ADAC30 80063A90 3C01FFFF */ lui $at, (0xFFFF7FFF >> 16) # lui $at, 0xffff -/* ADAC34 80063A94 1000002A */ b .L80063B40 -/* ADAC38 80063A98 240303E8 */ li $v1, 1000 -.L80063A9C: -/* ADAC3C 80063A9C 34217FFF */ ori $at, (0xFFFF7FFF & 0xFFFF) # ori $at, $at, 0x7fff -/* ADAC40 80063AA0 00A17027 */ nor $t6, $a1, $at -/* ADAC44 80063AA4 15C00003 */ bnez $t6, .L80063AB4 -/* ADAC48 80063AA8 2401BFFF */ li $at, -16385 -/* ADAC4C 80063AAC 10000007 */ b .L80063ACC -/* ADAC50 80063AB0 24030064 */ li $v1, 100 -.L80063AB4: -/* ADAC54 80063AB4 00A17827 */ nor $t7, $a1, $at -/* ADAC58 80063AB8 15E00003 */ bnez $t7, .L80063AC8 -/* ADAC5C 80063ABC 24020001 */ li $v0, 1 -/* ADAC60 80063AC0 10000001 */ b .L80063AC8 -/* ADAC64 80063AC4 2402000A */ li $v0, 10 -.L80063AC8: -/* ADAC68 80063AC8 00401825 */ move $v1, $v0 -.L80063ACC: -/* ADAC6C 80063ACC 00601025 */ move $v0, $v1 -/* ADAC70 80063AD0 1000001B */ b .L80063B40 -/* ADAC74 80063AD4 00401825 */ move $v1, $v0 -.L80063AD8: -/* ADAC78 80063AD8 13000018 */ beqz $t8, .L80063B3C -/* ADAC7C 80063ADC 00002025 */ move $a0, $zero -/* ADAC80 80063AE0 94C50000 */ lhu $a1, ($a2) -/* ADAC84 80063AE4 3C01FFFF */ lui $at, (0xFFFF3FFF >> 16) # lui $at, 0xffff -/* ADAC88 80063AE8 34213FFF */ ori $at, (0xFFFF3FFF & 0xFFFF) # ori $at, $at, 0x3fff -/* ADAC8C 80063AEC 00A1C827 */ nor $t9, $a1, $at -/* ADAC90 80063AF0 17200003 */ bnez $t9, .L80063B00 -/* ADAC94 80063AF4 3C01FFFF */ li $at, 0xFFFF0000 # 0.000000 -/* ADAC98 80063AF8 10000010 */ b .L80063B3C -/* ADAC9C 80063AFC 2404FC18 */ li $a0, -1000 -.L80063B00: -/* ADACA0 80063B00 34217FFF */ ori $at, (0xFFFF7FFF & 0xFFFF) # ori $at, $at, 0x7fff -/* ADACA4 80063B04 00A16827 */ nor $t5, $a1, $at -/* ADACA8 80063B08 15A00003 */ bnez $t5, .L80063B18 -/* ADACAC 80063B0C 2401BFFF */ li $at, -16385 -/* ADACB0 80063B10 10000007 */ b .L80063B30 -/* ADACB4 80063B14 2403FF9C */ li $v1, -100 -.L80063B18: -/* ADACB8 80063B18 00A17027 */ nor $t6, $a1, $at -/* ADACBC 80063B1C 15C00003 */ bnez $t6, .L80063B2C -/* ADACC0 80063B20 2402FFFF */ li $v0, -1 -/* ADACC4 80063B24 10000001 */ b .L80063B2C -/* ADACC8 80063B28 2402FFF6 */ li $v0, -10 -.L80063B2C: -/* ADACCC 80063B2C 00401825 */ move $v1, $v0 -.L80063B30: -/* ADACD0 80063B30 00601025 */ move $v0, $v1 -/* ADACD4 80063B34 10000001 */ b .L80063B3C -/* ADACD8 80063B38 00402025 */ move $a0, $v0 -.L80063B3C: -/* ADACDC 80063B3C 00801825 */ move $v1, $a0 -.L80063B40: -/* ADACE0 80063B40 8D0F0008 */ lw $t7, 8($t0) -/* ADACE4 80063B44 000C6840 */ sll $t5, $t4, 1 -/* ADACE8 80063B48 000FC040 */ sll $t8, $t7, 1 -/* ADACEC 80063B4C 0118C821 */ addu $t9, $t0, $t8 -/* ADACF0 80063B50 032D1021 */ addu $v0, $t9, $t5 -/* ADACF4 80063B54 844E0014 */ lh $t6, 0x14($v0) -/* ADACF8 80063B58 30F80800 */ andi $t8, $a3, 0x800 -/* ADACFC 80063B5C 01C37821 */ addu $t7, $t6, $v1 -/* ADAD00 80063B60 1300000C */ beqz $t8, .L80063B94 -/* ADAD04 80063B64 A44F0014 */ sh $t7, 0x14($v0) -/* ADAD08 80063B68 8D680000 */ lw $t0, ($t3) -/* ADAD0C 80063B6C 240F000F */ li $t7, 15 -/* ADAD10 80063B70 8D190008 */ lw $t9, 8($t0) -/* ADAD14 80063B74 272DFFFF */ addiu $t5, $t9, -1 -/* ADAD18 80063B78 AD0D0008 */ sw $t5, 8($t0) -/* ADAD1C 80063B7C 8D680000 */ lw $t0, ($t3) -/* ADAD20 80063B80 8D0E0008 */ lw $t6, 8($t0) -/* ADAD24 80063B84 05C30011 */ bgezl $t6, .L80063BCC -/* ADAD28 80063B88 8D680000 */ lw $t0, ($t3) -/* ADAD2C 80063B8C 1000000E */ b .L80063BC8 -/* ADAD30 80063B90 AD0F0008 */ sw $t7, 8($t0) -.L80063B94: -/* ADAD34 80063B94 30F80400 */ andi $t8, $a3, 0x400 -/* ADAD38 80063B98 5300000C */ beql $t8, $zero, .L80063BCC -/* ADAD3C 80063B9C 8D680000 */ lw $t0, ($t3) -/* ADAD40 80063BA0 8D680000 */ lw $t0, ($t3) -/* ADAD44 80063BA4 8D190008 */ lw $t9, 8($t0) -/* ADAD48 80063BA8 272D0001 */ addiu $t5, $t9, 1 -/* ADAD4C 80063BAC AD0D0008 */ sw $t5, 8($t0) -/* ADAD50 80063BB0 8D680000 */ lw $t0, ($t3) -/* ADAD54 80063BB4 8D0E0008 */ lw $t6, 8($t0) -/* ADAD58 80063BB8 29C10010 */ slti $at, $t6, 0x10 -/* ADAD5C 80063BBC 54200003 */ bnezl $at, .L80063BCC -/* ADAD60 80063BC0 8D680000 */ lw $t0, ($t3) -/* ADAD64 80063BC4 AD000008 */ sw $zero, 8($t0) -.L80063BC8: -/* ADAD68 80063BC8 8D680000 */ lw $t0, ($t3) -.L80063BCC: -/* ADAD6C 80063BCC 850F0CD4 */ lh $t7, 0xcd4($t0) -/* ADAD70 80063BD0 51E00009 */ beql $t7, $zero, .L80063BF8 -/* ADAD74 80063BD4 8FBF0014 */ lw $ra, 0x14($sp) -/* ADAD78 80063BD8 A5000CD4 */ sh $zero, 0xcd4($t0) -/* ADAD7C 80063BDC 8D680000 */ lw $t0, ($t3) -/* ADAD80 80063BE0 44806000 */ mtc1 $zero, $f12 -/* ADAD84 80063BE4 91050CD7 */ lbu $a1, 0xcd7($t0) -/* ADAD88 80063BE8 91060CD9 */ lbu $a2, 0xcd9($t0) -/* ADAD8C 80063BEC 0C02A800 */ jal func_800AA000 -/* ADAD90 80063BF0 91070CDB */ lbu $a3, 0xcdb($t0) -.L80063BF4: -/* ADAD94 80063BF4 8FBF0014 */ lw $ra, 0x14($sp) -.L80063BF8: -/* ADAD98 80063BF8 27BD0018 */ addiu $sp, $sp, 0x18 -/* ADAD9C 80063BFC 03E00008 */ jr $ra -/* ADADA0 80063C00 00000000 */ nop - diff --git a/asm/non_matchings/code/z_debug/func_80063C04.s b/asm/non_matchings/code/z_debug/func_80063C04.s deleted file mode 100644 index 321fc93946..0000000000 --- a/asm/non_matchings/code/z_debug/func_80063C04.s +++ /dev/null @@ -1,105 +0,0 @@ -.rdata -glabel D_8013AD54 - .asciz "%s%02d%6d" - .balign 4 - -.text -glabel func_80063C04 -/* ADADA4 80063C04 27BDFFA0 */ addiu $sp, $sp, -0x60 -/* ADADA8 80063C08 AFB30028 */ sw $s3, 0x28($sp) -/* ADADAC 80063C0C 3C138016 */ lui $s3, %hi(gGameInfo) # $s3, 0x8016 -/* ADADB0 80063C10 2673FA90 */ addiu $s3, %lo(gGameInfo) # addiu $s3, $s3, -0x570 -/* ADADB4 80063C14 8E620000 */ lw $v0, ($s3) -/* ADADB8 80063C18 AFBF003C */ sw $ra, 0x3c($sp) -/* ADADBC 80063C1C AFB70038 */ sw $s7, 0x38($sp) -/* ADADC0 80063C20 AFB60034 */ sw $s6, 0x34($sp) -/* ADADC4 80063C24 AFB50030 */ sw $s5, 0x30($sp) -/* ADADC8 80063C28 AFB4002C */ sw $s4, 0x2c($sp) -/* ADADCC 80063C2C AFB20024 */ sw $s2, 0x24($sp) -/* ADADD0 80063C30 AFB10020 */ sw $s1, 0x20($sp) -/* ADADD4 80063C34 AFB0001C */ sw $s0, 0x1c($sp) -/* ADADD8 80063C38 8C4E0004 */ lw $t6, 4($v0) -/* ADADDC 80063C3C 8C430000 */ lw $v1, ($v0) -/* ADADE0 80063C40 24180052 */ li $t8, 82 -/* ADADE4 80063C44 A3B8004C */ sb $t8, 0x4c($sp) -/* ADADE8 80063C48 8C590004 */ lw $t9, 4($v0) -/* ADADEC 80063C4C 000E7880 */ sll $t7, $t6, 2 -/* ADADF0 80063C50 3C088012 */ lui $t0, %hi(D_8011E148) -/* ADADF4 80063C54 01EE7823 */ subu $t7, $t7, $t6 -/* ADADF8 80063C58 000F7840 */ sll $t7, $t7, 1 -/* ADADFC 80063C5C 01194021 */ addu $t0, $t0, $t9 -/* ADAE00 80063C60 9108E148 */ lbu $t0, %lo(D_8011E148)($t0) -/* ADAE04 80063C64 01E3A821 */ addu $s5, $t7, $v1 -/* ADAE08 80063C68 0015A900 */ sll $s5, $s5, 4 -/* ADAE0C 80063C6C 24090080 */ li $t1, 128 -/* ADAE10 80063C70 0003A100 */ sll $s4, $v1, 4 -/* ADAE14 80063C74 00808825 */ move $s1, $a0 -/* ADAE18 80063C78 2694FFF0 */ addiu $s4, $s4, -0x10 -/* ADAE1C 80063C7C 26B5FFF0 */ addiu $s5, $s5, -0x10 -/* ADAE20 80063C80 A3A0004E */ sb $zero, 0x4e($sp) -/* ADAE24 80063C84 AFA90010 */ sw $t1, 0x10($sp) -/* ADAE28 80063C88 00002825 */ move $a1, $zero -/* ADAE2C 80063C8C 24060080 */ li $a2, 128 -/* ADAE30 80063C90 24070080 */ li $a3, 128 -/* ADAE34 80063C94 0C03ECEB */ jal GfxPrint_SetColor -/* ADAE38 80063C98 A3A8004D */ sb $t0, 0x4d($sp) -/* ADAE3C 80063C9C 02809025 */ move $s2, $s4 -/* ADAE40 80063CA0 3C148014 */ lui $s4, %hi(D_8013AD54) # $s4, 0x8014 -/* ADAE44 80063CA4 0015B840 */ sll $s7, $s5, 1 -/* ADAE48 80063CA8 27B5004C */ addiu $s5, $sp, 0x4c -/* ADAE4C 80063CAC 2694AD54 */ addiu $s4, %lo(D_8013AD54) # addiu $s4, $s4, -0x52ac -/* ADAE50 80063CB0 00008025 */ move $s0, $zero -/* ADAE54 80063CB4 24160010 */ li $s6, 16 -.L80063CB8: -/* ADAE58 80063CB8 8E6A0000 */ lw $t2, ($s3) -/* ADAE5C 80063CBC 02202025 */ move $a0, $s1 -/* ADAE60 80063CC0 00002825 */ move $a1, $zero -/* ADAE64 80063CC4 8D4B0008 */ lw $t3, 8($t2) -/* ADAE68 80063CC8 240600FF */ li $a2, 255 -/* ADAE6C 80063CCC 240700FF */ li $a3, 255 -/* ADAE70 80063CD0 160B0003 */ bne $s0, $t3, .L80063CE0 -/* ADAE74 80063CD4 240C00FF */ li $t4, 255 -/* ADAE78 80063CD8 0C03ECEB */ jal GfxPrint_SetColor -/* ADAE7C 80063CDC AFAC0010 */ sw $t4, 0x10($sp) -.L80063CE0: -/* ADAE80 80063CE0 02202025 */ move $a0, $s1 -/* ADAE84 80063CE4 24050003 */ li $a1, 3 -/* ADAE88 80063CE8 0C03ED07 */ jal GfxPrint_SetPos -/* ADAE8C 80063CEC 26060005 */ addiu $a2, $s0, 5 -/* ADAE90 80063CF0 8E6D0000 */ lw $t5, ($s3) -/* ADAE94 80063CF4 00107040 */ sll $t6, $s0, 1 -/* ADAE98 80063CF8 02202025 */ move $a0, $s1 -/* ADAE9C 80063CFC 01AE7821 */ addu $t7, $t5, $t6 -/* ADAEA0 80063D00 01F7C021 */ addu $t8, $t7, $s7 -/* ADAEA4 80063D04 87190014 */ lh $t9, 0x14($t8) -/* ADAEA8 80063D08 02802825 */ move $a1, $s4 -/* ADAEAC 80063D0C 02A03025 */ move $a2, $s5 -/* ADAEB0 80063D10 02403825 */ move $a3, $s2 -/* ADAEB4 80063D14 0C03EF2D */ jal GfxPrint_Printf -/* ADAEB8 80063D18 AFB90010 */ sw $t9, 0x10($sp) -/* ADAEBC 80063D1C 8E680000 */ lw $t0, ($s3) -/* ADAEC0 80063D20 02202025 */ move $a0, $s1 -/* ADAEC4 80063D24 00002825 */ move $a1, $zero -/* ADAEC8 80063D28 8D090008 */ lw $t1, 8($t0) -/* ADAECC 80063D2C 24060080 */ li $a2, 128 -/* ADAED0 80063D30 24070080 */ li $a3, 128 -/* ADAED4 80063D34 16090003 */ bne $s0, $t1, .L80063D44 -/* ADAED8 80063D38 240A0080 */ li $t2, 128 -/* ADAEDC 80063D3C 0C03ECEB */ jal GfxPrint_SetColor -/* ADAEE0 80063D40 AFAA0010 */ sw $t2, 0x10($sp) -.L80063D44: -/* ADAEE4 80063D44 26100001 */ addiu $s0, $s0, 1 -/* ADAEE8 80063D48 1616FFDB */ bne $s0, $s6, .L80063CB8 -/* ADAEEC 80063D4C 26520001 */ addiu $s2, $s2, 1 -/* ADAEF0 80063D50 8FBF003C */ lw $ra, 0x3c($sp) -/* ADAEF4 80063D54 8FB0001C */ lw $s0, 0x1c($sp) -/* ADAEF8 80063D58 8FB10020 */ lw $s1, 0x20($sp) -/* ADAEFC 80063D5C 8FB20024 */ lw $s2, 0x24($sp) -/* ADAF00 80063D60 8FB30028 */ lw $s3, 0x28($sp) -/* ADAF04 80063D64 8FB4002C */ lw $s4, 0x2c($sp) -/* ADAF08 80063D68 8FB50030 */ lw $s5, 0x30($sp) -/* ADAF0C 80063D6C 8FB60034 */ lw $s6, 0x34($sp) -/* ADAF10 80063D70 8FB70038 */ lw $s7, 0x38($sp) -/* ADAF14 80063D74 03E00008 */ jr $ra -/* ADAF18 80063D78 27BD0060 */ addiu $sp, $sp, 0x60 - diff --git a/asm/non_matchings/code/z_debug/func_80063D7C.s b/asm/non_matchings/code/z_debug/func_80063D7C.s deleted file mode 100644 index 061093264e..0000000000 --- a/asm/non_matchings/code/z_debug/func_80063D7C.s +++ /dev/null @@ -1,81 +0,0 @@ -.rdata -glabel D_8013AD60 - .asciz "../z_debug.c" - .balign 4 - -glabel D_8013AD70 - .asciz "../z_debug.c" - .balign 4 - -.text -glabel func_80063D7C -/* ADAF1C 80063D7C 27BDFF80 */ addiu $sp, $sp, -0x80 -/* ADAF20 80063D80 AFB00018 */ sw $s0, 0x18($sp) -/* ADAF24 80063D84 00808025 */ move $s0, $a0 -/* ADAF28 80063D88 AFBF001C */ sw $ra, 0x1c($sp) -/* ADAF2C 80063D8C 3C068014 */ lui $a2, %hi(D_8013AD60) # $a2, 0x8014 -/* ADAF30 80063D90 24C6AD60 */ addiu $a2, %lo(D_8013AD60) # addiu $a2, $a2, -0x52a0 -/* ADAF34 80063D94 02002825 */ move $a1, $s0 -/* ADAF38 80063D98 27A40030 */ addiu $a0, $sp, 0x30 -/* ADAF3C 80063D9C 0C031AB1 */ jal func_800C6AC4 -/* ADAF40 80063DA0 24070274 */ li $a3, 628 -/* ADAF44 80063DA4 0C03EEE3 */ jal GfxPrint_Ctor -/* ADAF48 80063DA8 27A40048 */ addiu $a0, $sp, 0x48 -/* ADAF4C 80063DAC 8E0402C0 */ lw $a0, 0x2c0($s0) -/* ADAF50 80063DB0 0C031B08 */ jal func_800C6C20 -/* ADAF54 80063DB4 AFA40078 */ sw $a0, 0x78($sp) -/* ADAF58 80063DB8 8E0402B0 */ lw $a0, 0x2b0($s0) -/* ADAF5C 80063DBC 3C0FDE00 */ lui $t7, 0xde00 -/* ADAF60 80063DC0 00402825 */ move $a1, $v0 -/* ADAF64 80063DC4 248E0008 */ addiu $t6, $a0, 8 -/* ADAF68 80063DC8 AE0E02B0 */ sw $t6, 0x2b0($s0) -/* ADAF6C 80063DCC AC820004 */ sw $v0, 4($a0) -/* ADAF70 80063DD0 AC8F0000 */ sw $t7, ($a0) -/* ADAF74 80063DD4 0C03EF07 */ jal GfxPrint_Open -/* ADAF78 80063DD8 27A40048 */ addiu $a0, $sp, 0x48 -/* ADAF7C 80063DDC 3C028016 */ lui $v0, %hi(gGameInfo) # $v0, 0x8016 -/* ADAF80 80063DE0 8C42FA90 */ lw $v0, %lo(gGameInfo)($v0) -/* ADAF84 80063DE4 24010001 */ li $at, 1 -/* ADAF88 80063DE8 84430194 */ lh $v1, 0x194($v0) -/* ADAF8C 80063DEC 10610003 */ beq $v1, $at, .L80063DFC -/* ADAF90 80063DF0 24010008 */ li $at, 8 -/* ADAF94 80063DF4 54610006 */ bnel $v1, $at, .L80063E10 -/* ADAF98 80063DF8 8C580000 */ lw $t8, ($v0) -.L80063DFC: -/* ADAF9C 80063DFC 0C018E0A */ jal func_80063828 -/* ADAFA0 80063E00 27A40048 */ addiu $a0, $sp, 0x48 -/* ADAFA4 80063E04 3C028016 */ lui $v0, %hi(gGameInfo) # $v0, 0x8016 -/* ADAFA8 80063E08 8C42FA90 */ lw $v0, %lo(gGameInfo)($v0) -/* ADAFAC 80063E0C 8C580000 */ lw $t8, ($v0) -.L80063E10: -/* ADAFB0 80063E10 13000003 */ beqz $t8, .L80063E20 -/* ADAFB4 80063E14 00000000 */ nop -/* ADAFB8 80063E18 0C018F01 */ jal func_80063C04 -/* ADAFBC 80063E1C 27A40048 */ addiu $a0, $sp, 0x48 -.L80063E20: -/* ADAFC0 80063E20 3C018012 */ lui $at, %hi(D_8011E0B0) # $at, 0x8012 -/* ADAFC4 80063E24 A420E0B0 */ sh $zero, %lo(D_8011E0B0)($at) -/* ADAFC8 80063E28 0C03EF19 */ jal GfxPrint_Close -/* ADAFCC 80063E2C 27A40048 */ addiu $a0, $sp, 0x48 -/* ADAFD0 80063E30 3C19DF00 */ lui $t9, 0xdf00 -/* ADAFD4 80063E34 AC590000 */ sw $t9, ($v0) -/* ADAFD8 80063E38 24450008 */ addiu $a1, $v0, 8 -/* ADAFDC 80063E3C AC400004 */ sw $zero, 4($v0) -/* ADAFE0 80063E40 AFA5007C */ sw $a1, 0x7c($sp) -/* ADAFE4 80063E44 0C031B0A */ jal func_800C6C28 -/* ADAFE8 80063E48 8FA40078 */ lw $a0, 0x78($sp) -/* ADAFEC 80063E4C 8FA5007C */ lw $a1, 0x7c($sp) -/* ADAFF0 80063E50 3C068014 */ lui $a2, %hi(D_8013AD70) # $a2, 0x8014 -/* ADAFF4 80063E54 24C6AD70 */ addiu $a2, %lo(D_8013AD70) # addiu $a2, $a2, -0x5290 -/* ADAFF8 80063E58 AE0502C0 */ sw $a1, 0x2c0($s0) -/* ADAFFC 80063E5C 02002825 */ move $a1, $s0 -/* ADB000 80063E60 27A40030 */ addiu $a0, $sp, 0x30 -/* ADB004 80063E64 0C031AD5 */ jal func_800C6B54 -/* ADB008 80063E68 24070298 */ li $a3, 664 -/* ADB00C 80063E6C 0C03EF05 */ jal GfxPrint_Dtor -/* ADB010 80063E70 27A40048 */ addiu $a0, $sp, 0x48 -/* ADB014 80063E74 8FBF001C */ lw $ra, 0x1c($sp) -/* ADB018 80063E78 8FB00018 */ lw $s0, 0x18($sp) -/* ADB01C 80063E7C 27BD0080 */ addiu $sp, $sp, 0x80 -/* ADB020 80063E80 03E00008 */ jr $ra -/* ADB024 80063E84 00000000 */ nop diff --git a/asm/non_matchings/code/z_demo/func_80064824.s b/asm/non_matchings/code/z_demo/func_80064824.s index 98859be542..87f7f684b4 100644 --- a/asm/non_matchings/code/z_demo/func_80064824.s +++ b/asm/non_matchings/code/z_demo/func_80064824.s @@ -276,22 +276,22 @@ glabel L80064B78 /* ADBD24 80064B84 24050006 */ li $a1, 6 /* ADBD28 80064B88 000B6080 */ sll $t4, $t3, 2 /* ADBD2C 80064B8C 020C6821 */ addu $t5, $s0, $t4 -/* ADBD30 80064B90 0C024BE2 */ jal func_80092F88 +/* ADBD30 80064B90 0C024BE2 */ jal Quake_Add /* ADBD34 80064B94 8DA40790 */ lw $a0, 0x790($t5) /* ADBD38 80064B98 3C108016 */ lui $s0, %hi(D_8015FCCA) # $s0, 0x8016 /* ADBD3C 80064B9C 2610FCCA */ addiu $s0, %lo(D_8015FCCA) # addiu $s0, $s0, -0x336 /* ADBD40 80064BA0 A6020000 */ sh $v0, ($s0) /* ADBD44 80064BA4 86040000 */ lh $a0, ($s0) -/* ADBD48 80064BA8 0C024B6B */ jal func_80092DAC +/* ADBD48 80064BA8 0C024B6B */ jal Quake_SetSpeed /* ADBD4C 80064BAC 24057FFF */ li $a1, 32767 /* ADBD50 80064BB0 86040000 */ lh $a0, ($s0) /* ADBD54 80064BB4 24050004 */ li $a1, 4 /* ADBD58 80064BB8 00003025 */ move $a2, $zero /* ADBD5C 80064BBC 240703E8 */ li $a3, 1000 -/* ADBD60 80064BC0 0C024B9C */ jal func_80092E70 +/* ADBD60 80064BC0 0C024B9C */ jal Quake_SetQuakeValues /* ADBD64 80064BC4 AFA00010 */ sw $zero, 0x10($sp) /* ADBD68 80064BC8 86040000 */ lh $a0, ($s0) -/* ADBD6C 80064BCC 0C024B7C */ jal func_80092DF0 +/* ADBD6C 80064BCC 0C024B7C */ jal Quake_SetCountdown /* ADBD70 80064BD0 24050320 */ li $a1, 800 /* ADBD74 80064BD4 100000F4 */ b .L80064FA8 /* ADBD78 80064BD8 8FBF002C */ lw $ra, 0x2c($sp) @@ -299,7 +299,7 @@ glabel L80064BDC /* ADBD7C 80064BDC 104000F1 */ beqz $v0, .L80064FA4 /* ADBD80 80064BE0 3C108016 */ lui $s0, %hi(D_8015FCCA) # $s0, 0x8016 /* ADBD84 80064BE4 2610FCCA */ addiu $s0, %lo(D_8015FCCA) # addiu $s0, $s0, -0x336 -/* ADBD88 80064BE8 0C024BEB */ jal func_80092FAC +/* ADBD88 80064BE8 0C024BEB */ jal Quake_RemoveFromIdx /* ADBD8C 80064BEC 86040000 */ lh $a0, ($s0) /* ADBD90 80064BF0 100000ED */ b .L80064FA8 /* ADBD94 80064BF4 8FBF002C */ lw $ra, 0x2c($sp) diff --git a/asm/non_matchings/code/z_eff_blure/func_80020FC0.s b/asm/non_matchings/code/z_eff_blure/func_80020FC0.s index 10585f1974..f218f0b4e3 100644 --- a/asm/non_matchings/code/z_eff_blure/func_80020FC0.s +++ b/asm/non_matchings/code/z_eff_blure/func_80020FC0.s @@ -34,7 +34,7 @@ glabel func_80020FC0 /* A98184 80020FE4 AFB00024 */ sw $s0, 0x24($sp) /* A98188 80020FE8 24070346 */ li $a3, 838 /* A9818C 80020FEC 24C651A8 */ addiu $a2, %lo(D_801351A8) # addiu $a2, $a2, 0x51a8 -/* A98190 80020FF0 0C031AB1 */ jal func_800C6AC4 +/* A98190 80020FF0 0C031AB1 */ jal Graph_OpenDisps /* A98194 80020FF4 27A40040 */ addiu $a0, $sp, 0x40 /* A98198 80020FF8 8FA50098 */ lw $a1, 0x98($sp) /* A9819C 80020FFC 27A4006C */ addiu $a0, $sp, 0x6c @@ -343,7 +343,7 @@ glabel func_80020FC0 /* A98648 800214A8 24C651F8 */ addiu $a2, %lo(D_801351F8) # addiu $a2, $a2, 0x51f8 /* A9864C 800214AC 27A40040 */ addiu $a0, $sp, 0x40 /* A98650 800214B0 02202825 */ move $a1, $s1 -/* A98654 800214B4 0C031AD5 */ jal func_800C6B54 +/* A98654 800214B4 0C031AD5 */ jal Graph_CloseDisps /* A98658 800214B8 240703A4 */ li $a3, 932 /* A9865C 800214BC 8FBF002C */ lw $ra, 0x2c($sp) /* A98660 800214C0 8FB00024 */ lw $s0, 0x24($sp) diff --git a/asm/non_matchings/code/z_eff_blure/func_800214D0.s b/asm/non_matchings/code/z_eff_blure/func_800214D0.s index 6f076d2c2e..c8d2e0c464 100644 --- a/asm/non_matchings/code/z_eff_blure/func_800214D0.s +++ b/asm/non_matchings/code/z_eff_blure/func_800214D0.s @@ -50,7 +50,7 @@ glabel func_800214D0 /* A986B4 80021514 F7B40028 */ sdc1 $f20, 0x28($sp) /* A986B8 80021518 240703CB */ li $a3, 971 /* A986BC 8002151C 24C6520C */ addiu $a2, %lo(D_8013520C) # addiu $a2, $a2, 0x520c -/* A986C0 80021520 0C031AB1 */ jal func_800C6AC4 +/* A986C0 80021520 0C031AB1 */ jal Graph_OpenDisps /* A986C4 80021524 27A40124 */ addiu $a0, $sp, 0x124 /* A986C8 80021528 27A40138 */ addiu $a0, $sp, 0x138 /* A986CC 8002152C 0C01DF97 */ jal Math_Vec3s_ToVec3f @@ -330,19 +330,19 @@ glabel func_800214D0 /* A98AE8 80021948 8C59000C */ lw $t9, 0xc($v0) /* A98AEC 8002194C AA99001C */ swl $t9, 0x1c($s4) /* A98AF0 80021950 BA99001F */ swr $t9, 0x1f($s4) -/* A98AF4 80021954 0C03F3CD */ jal func_800FCF34 +/* A98AF4 80021954 0C03F3CD */ jal Math_nearbyintf /* A98AF8 80021958 C7AC0158 */ lwc1 $f12, 0x158($sp) /* A98AFC 8002195C 4600018D */ trunc.w.s $f6, $f0 /* A98B00 80021960 440A3000 */ mfc1 $t2, $f6 /* A98B04 80021964 00000000 */ nop /* A98B08 80021968 A68A0000 */ sh $t2, ($s4) -/* A98B0C 8002196C 0C03F3CD */ jal func_800FCF34 +/* A98B0C 8002196C 0C03F3CD */ jal Math_nearbyintf /* A98B10 80021970 C7AC015C */ lwc1 $f12, 0x15c($sp) /* A98B14 80021974 4600040D */ trunc.w.s $f16, $f0 /* A98B18 80021978 440C8000 */ mfc1 $t4, $f16 /* A98B1C 8002197C 00000000 */ nop /* A98B20 80021980 A68C0002 */ sh $t4, 2($s4) -/* A98B24 80021984 0C03F3CD */ jal func_800FCF34 +/* A98B24 80021984 0C03F3CD */ jal Math_nearbyintf /* A98B28 80021988 C7AC0160 */ lwc1 $f12, 0x160($sp) /* A98B2C 8002198C 4600020D */ trunc.w.s $f8, $f0 /* A98B30 80021990 440E4000 */ mfc1 $t6, $f8 @@ -356,19 +356,19 @@ glabel func_800214D0 /* A98B50 800219B0 A299000E */ sb $t9, 0xe($s4) /* A98B54 800219B4 93A8014B */ lbu $t0, 0x14b($sp) /* A98B58 800219B8 A288000F */ sb $t0, 0xf($s4) -/* A98B5C 800219BC 0C03F3CD */ jal func_800FCF34 +/* A98B5C 800219BC 0C03F3CD */ jal Math_nearbyintf /* A98B60 800219C0 C7AC014C */ lwc1 $f12, 0x14c($sp) /* A98B64 800219C4 4600048D */ trunc.w.s $f18, $f0 /* A98B68 800219C8 440A9000 */ mfc1 $t2, $f18 /* A98B6C 800219CC 00000000 */ nop /* A98B70 800219D0 A68A0010 */ sh $t2, 0x10($s4) -/* A98B74 800219D4 0C03F3CD */ jal func_800FCF34 +/* A98B74 800219D4 0C03F3CD */ jal Math_nearbyintf /* A98B78 800219D8 C7AC0150 */ lwc1 $f12, 0x150($sp) /* A98B7C 800219DC 4600028D */ trunc.w.s $f10, $f0 /* A98B80 800219E0 440C5000 */ mfc1 $t4, $f10 /* A98B84 800219E4 00000000 */ nop /* A98B88 800219E8 A68C0012 */ sh $t4, 0x12($s4) -/* A98B8C 800219EC 0C03F3CD */ jal func_800FCF34 +/* A98B8C 800219EC 0C03F3CD */ jal Math_nearbyintf /* A98B90 800219F0 C7AC0154 */ lwc1 $f12, 0x154($sp) /* A98B94 800219F4 4600010D */ trunc.w.s $f4, $f0 /* A98B98 800219F8 24120001 */ li $s2, 1 @@ -520,19 +520,19 @@ glabel func_800214D0 /* A98DDC 80021C3C 8C4B000C */ lw $t3, 0xc($v0) /* A98DE0 80021C40 AA2B000C */ swl $t3, 0xc($s1) /* A98DE4 80021C44 BA2B000F */ swr $t3, 0xf($s1) -/* A98DE8 80021C48 0C03F3CD */ jal func_800FCF34 +/* A98DE8 80021C48 0C03F3CD */ jal Math_nearbyintf /* A98DEC 80021C4C C7AC0158 */ lwc1 $f12, 0x158($sp) /* A98DF0 80021C50 4600018D */ trunc.w.s $f6, $f0 /* A98DF4 80021C54 440E3000 */ mfc1 $t6, $f6 /* A98DF8 80021C58 00000000 */ nop /* A98DFC 80021C5C A60E0000 */ sh $t6, ($s0) -/* A98E00 80021C60 0C03F3CD */ jal func_800FCF34 +/* A98E00 80021C60 0C03F3CD */ jal Math_nearbyintf /* A98E04 80021C64 C7AC015C */ lwc1 $f12, 0x15c($sp) /* A98E08 80021C68 4600020D */ trunc.w.s $f8, $f0 /* A98E0C 80021C6C 44184000 */ mfc1 $t8, $f8 /* A98E10 80021C70 00000000 */ nop /* A98E14 80021C74 A6180002 */ sh $t8, 2($s0) -/* A98E18 80021C78 0C03F3CD */ jal func_800FCF34 +/* A98E18 80021C78 0C03F3CD */ jal Math_nearbyintf /* A98E1C 80021C7C C7AC0160 */ lwc1 $f12, 0x160($sp) /* A98E20 80021C80 4600048D */ trunc.w.s $f18, $f0 /* A98E24 80021C84 4406E000 */ mfc1 $a2, $f28 @@ -558,19 +558,19 @@ glabel func_800214D0 /* A98E74 80021CD4 0C009FA1 */ jal func_80027E84 /* A98E78 80021CD8 93A401A7 */ lbu $a0, 0x1a7($sp) /* A98E7C 80021CDC A202000F */ sb $v0, 0xf($s0) -/* A98E80 80021CE0 0C03F3CD */ jal func_800FCF34 +/* A98E80 80021CE0 0C03F3CD */ jal Math_nearbyintf /* A98E84 80021CE4 C7AC014C */ lwc1 $f12, 0x14c($sp) /* A98E88 80021CE8 4600028D */ trunc.w.s $f10, $f0 /* A98E8C 80021CEC 440A5000 */ mfc1 $t2, $f10 /* A98E90 80021CF0 00000000 */ nop /* A98E94 80021CF4 A62A0000 */ sh $t2, ($s1) -/* A98E98 80021CF8 0C03F3CD */ jal func_800FCF34 +/* A98E98 80021CF8 0C03F3CD */ jal Math_nearbyintf /* A98E9C 80021CFC C7AC0150 */ lwc1 $f12, 0x150($sp) /* A98EA0 80021D00 4600010D */ trunc.w.s $f4, $f0 /* A98EA4 80021D04 440C2000 */ mfc1 $t4, $f4 /* A98EA8 80021D08 00000000 */ nop /* A98EAC 80021D0C A62C0002 */ sh $t4, 2($s1) -/* A98EB0 80021D10 0C03F3CD */ jal func_800FCF34 +/* A98EB0 80021D10 0C03F3CD */ jal Math_nearbyintf /* A98EB4 80021D14 C7AC0154 */ lwc1 $f12, 0x154($sp) /* A98EB8 80021D18 4600040D */ trunc.w.s $f16, $f0 /* A98EBC 80021D1C 4406E000 */ mfc1 $a2, $f28 @@ -680,7 +680,7 @@ glabel func_800214D0 /* A99058 80021EB8 24C652B8 */ addiu $a2, %lo(D_801352B8) # addiu $a2, $a2, 0x52b8 /* A9905C 80021EBC 27A40124 */ addiu $a0, $sp, 0x124 /* A99060 80021EC0 8FA50204 */ lw $a1, 0x204($sp) -/* A99064 80021EC4 0C031AD5 */ jal func_800C6B54 +/* A99064 80021EC4 0C031AD5 */ jal Graph_CloseDisps /* A99068 80021EC8 240704A0 */ li $a3, 1184 /* A9906C 80021ECC 8FBF0064 */ lw $ra, 0x64($sp) /* A99070 80021ED0 D7B40028 */ ldc1 $f20, 0x28($sp) diff --git a/asm/non_matchings/code/z_eff_blure/func_80021F00.s b/asm/non_matchings/code/z_eff_blure/func_80021F00.s index f2296ce4bf..3c56e25f21 100644 --- a/asm/non_matchings/code/z_eff_blure/func_80021F00.s +++ b/asm/non_matchings/code/z_eff_blure/func_80021F00.s @@ -43,7 +43,7 @@ glabel func_80021F00 /* A990CC 80021F2C AFB00014 */ sw $s0, 0x14($sp) /* A990D0 80021F30 24C652CC */ addiu $a2, %lo(D_801352CC) # addiu $a2, $a2, 0x52cc /* A990D4 80021F34 27A40044 */ addiu $a0, $sp, 0x44 -/* A990D8 80021F38 0C031AB1 */ jal func_800C6AC4 +/* A990D8 80021F38 0C031AB1 */ jal Graph_OpenDisps /* A990DC 80021F3C 240704B1 */ li $a3, 1201 /* A990E0 80021F40 9284019E */ lbu $a0, 0x19e($s4) /* A990E4 80021F44 24120018 */ li $s2, 24 @@ -223,7 +223,7 @@ glabel func_80021F00 /* A99364 800221C4 24C652E0 */ addiu $a2, %lo(D_801352E0) # addiu $a2, $a2, 0x52e0 /* A99368 800221C8 27A40044 */ addiu $a0, $sp, 0x44 /* A9936C 800221CC 02A02825 */ move $a1, $s5 -/* A99370 800221D0 0C031AD5 */ jal func_800C6B54 +/* A99370 800221D0 0C031AD5 */ jal Graph_CloseDisps /* A99374 800221D4 240704EF */ li $a3, 1263 .L800221D8: /* A99378 800221D8 8FBF002C */ lw $ra, 0x2c($sp) @@ -246,18 +246,18 @@ glabel func_80021F00 /* A993B4 80022214 24C652F4 */ addiu $a2, %lo(D_801352F4) # addiu $a2, $a2, 0x52f4 /* A993B8 80022218 8FA50030 */ lw $a1, 0x30($sp) /* A993BC 8002221C 27A4001C */ addiu $a0, $sp, 0x1c -/* A993C0 80022220 0C031AB1 */ jal func_800C6AC4 +/* A993C0 80022220 0C031AB1 */ jal Graph_OpenDisps /* A993C4 80022224 24070500 */ li $a3, 1280 /* A993C8 80022228 8FAE0030 */ lw $t6, 0x30($sp) /* A993CC 8002222C 24050026 */ li $a1, 38 -/* A993D0 80022230 0C024DDD */ jal func_80093774 +/* A993D0 80022230 0C024DDD */ jal Gfx_CallSetupDL /* A993D4 80022234 8DC402D0 */ lw $a0, 0x2d0($t6) /* A993D8 80022238 8FA50030 */ lw $a1, 0x30($sp) /* A993DC 8002223C 3C068013 */ lui $a2, %hi(D_80135308) # $a2, 0x8013 /* A993E0 80022240 24C65308 */ addiu $a2, %lo(D_80135308) # addiu $a2, $a2, 0x5308 /* A993E4 80022244 27A4001C */ addiu $a0, $sp, 0x1c /* A993E8 80022248 24070505 */ li $a3, 1285 -/* A993EC 8002224C 0C031AD5 */ jal func_800C6B54 +/* A993EC 8002224C 0C031AD5 */ jal Graph_CloseDisps /* A993F0 80022250 ACA202D0 */ sw $v0, 0x2d0($a1) /* A993F4 80022254 8FBF0014 */ lw $ra, 0x14($sp) /* A993F8 80022258 27BD0030 */ addiu $sp, $sp, 0x30 @@ -274,7 +274,7 @@ glabel func_80021F00 /* A99420 80022280 24C6531C */ addiu $a2, %lo(D_8013531C) # addiu $a2, $a2, 0x531c /* A99424 80022284 02002825 */ move $a1, $s0 /* A99428 80022288 27A4006C */ addiu $a0, $sp, 0x6c -/* A9942C 8002228C 0C031AB1 */ jal func_800C6AC4 +/* A9942C 8002228C 0C031AB1 */ jal Graph_OpenDisps /* A99430 80022290 2407050E */ li $a3, 1294 /* A99434 80022294 8E0202D0 */ lw $v0, 0x2d0($s0) /* A99438 80022298 3C07E700 */ lui $a3, 0xe700 @@ -283,7 +283,7 @@ glabel func_80021F00 /* A99444 800222A4 AE0E02D0 */ sw $t6, 0x2d0($s0) /* A99448 800222A8 AC400004 */ sw $zero, 4($v0) /* A9944C 800222AC AC470000 */ sw $a3, ($v0) -/* A99450 800222B0 0C024DDD */ jal func_80093774 +/* A99450 800222B0 0C024DDD */ jal Gfx_CallSetupDL /* A99454 800222B4 8E0402D0 */ lw $a0, 0x2d0($s0) /* A99458 800222B8 8FA60084 */ lw $a2, 0x84($sp) /* A9945C 800222BC AE0202D0 */ sw $v0, 0x2d0($s0) @@ -421,7 +421,7 @@ glabel func_80021F00 /* A9966C 800224CC 3C068013 */ lui $a2, %hi(D_80135330) # $a2, 0x8013 /* A99670 800224D0 01E84825 */ or $t1, $t7, $t0 /* A99674 800224D4 24C65330 */ addiu $a2, %lo(D_80135330) # addiu $a2, $a2, 0x5330 -/* A99678 800224D8 0C031AD5 */ jal func_800C6B54 +/* A99678 800224D8 0C031AD5 */ jal Graph_CloseDisps /* A9967C 800224DC AC490004 */ sw $t1, 4($v0) /* A99680 800224E0 8FBF001C */ lw $ra, 0x1c($sp) /* A99684 800224E4 8FB00018 */ lw $s0, 0x18($sp) diff --git a/asm/non_matchings/code/z_eff_blure/func_800224F4.s b/asm/non_matchings/code/z_eff_blure/func_800224F4.s index 6f46437075..03bc2dcf3f 100644 --- a/asm/non_matchings/code/z_eff_blure/func_800224F4.s +++ b/asm/non_matchings/code/z_eff_blure/func_800224F4.s @@ -38,7 +38,7 @@ glabel func_800224F4 /* A996D8 80022538 24C65344 */ addiu $a2, %lo(D_80135344) # addiu $a2, $a2, 0x5344 /* A996DC 8002253C 02002825 */ move $a1, $s0 /* A996E0 80022540 27A401C0 */ addiu $a0, $sp, 0x1c0 -/* A996E4 80022544 0C031AB1 */ jal func_800C6AC4 +/* A996E4 80022544 0C031AB1 */ jal Graph_OpenDisps /* A996E8 80022548 2407054C */ li $a3, 1356 /* A996EC 8002254C 922E01A1 */ lbu $t6, 0x1a1($s1) /* A996F0 80022550 3C198011 */ lui $t9, %hi(D_80115780) @@ -340,7 +340,7 @@ glabel func_800224F4 /* A99B64 800229C4 24C653A4 */ addiu $a2, %lo(D_801353A4) # addiu $a2, $a2, 0x53a4 /* A99B68 800229C8 27A401C0 */ addiu $a0, $sp, 0x1c0 /* A99B6C 800229CC 02002825 */ move $a1, $s0 -/* A99B70 800229D0 0C031AD5 */ jal func_800C6B54 +/* A99B70 800229D0 0C031AD5 */ jal Graph_CloseDisps /* A99B74 800229D4 240705AC */ li $a3, 1452 /* A99B78 800229D8 8FBF0054 */ lw $ra, 0x54($sp) /* A99B7C 800229DC D7B40020 */ ldc1 $f20, 0x20($sp) diff --git a/asm/non_matchings/code/z_eff_blure/func_80022A10.s b/asm/non_matchings/code/z_eff_blure/func_80022A10.s index d84718541c..b4013d92c6 100644 --- a/asm/non_matchings/code/z_eff_blure/func_80022A10.s +++ b/asm/non_matchings/code/z_eff_blure/func_80022A10.s @@ -373,7 +373,7 @@ glabel func_80022A10 /* A9A0F8 80022F58 F7B40010 */ sdc1 $f20, 0x10($sp) /* A9A0FC 80022F5C 24C653E0 */ addiu $a2, %lo(D_801353E0) # addiu $a2, $a2, 0x53e0 /* A9A100 80022F60 27A40074 */ addiu $a0, $sp, 0x74 -/* A9A104 80022F64 0C031AB1 */ jal func_800C6AC4 +/* A9A104 80022F64 0C031AB1 */ jal Graph_OpenDisps /* A9A108 80022F68 2407063C */ li $a3, 1596 /* A9A10C 80022F6C 8EE602D0 */ lw $a2, 0x2d0($s7) /* A9A110 80022F70 3C0FDA38 */ lui $t7, (0xDA380003 >> 16) # lui $t7, 0xda38 @@ -691,7 +691,7 @@ glabel func_80022A10 /* A9A5A0 80023400 24C65418 */ addiu $a2, %lo(D_80135418) # addiu $a2, $a2, 0x5418 /* A9A5A4 80023404 27A40074 */ addiu $a0, $sp, 0x74 /* A9A5A8 80023408 02E02825 */ move $a1, $s7 -/* A9A5AC 8002340C 0C031AD5 */ jal func_800C6B54 +/* A9A5AC 8002340C 0C031AD5 */ jal Graph_CloseDisps /* A9A5B0 80023410 2407071F */ li $a3, 1823 /* A9A5B4 80023414 8FBF003C */ lw $ra, 0x3c($sp) /* A9A5B8 80023418 D7B40010 */ ldc1 $f20, 0x10($sp) diff --git a/asm/non_matchings/code/z_eff_shield_particle/func_800245BC.s b/asm/non_matchings/code/z_eff_shield_particle/func_800245BC.s index 042d7346ff..6d0ab5a11a 100644 --- a/asm/non_matchings/code/z_eff_shield_particle/func_800245BC.s +++ b/asm/non_matchings/code/z_eff_shield_particle/func_800245BC.s @@ -33,11 +33,11 @@ glabel func_800245BC /* A9B7A0 80024600 F7B40018 */ sdc1 $f20, 0x18($sp) /* A9B7A4 80024604 24C65498 */ addiu $a2, %lo(D_80135498) # addiu $a2, $a2, 0x5498 /* A9B7A8 80024608 27A4018C */ addiu $a0, $sp, 0x18c -/* A9B7AC 8002460C 0C031AB1 */ jal func_800C6AC4 +/* A9B7AC 8002460C 0C031AB1 */ jal Graph_OpenDisps /* A9B7B0 80024610 24070110 */ li $a3, 272 /* A9B7B4 80024614 12A00124 */ beqz $s5, .L80024AA8 /* A9B7B8 80024618 24050026 */ li $a1, 38 -/* A9B7BC 8002461C 0C024DDD */ jal func_80093774 +/* A9B7BC 8002461C 0C024DDD */ jal Gfx_CallSetupDL /* A9B7C0 80024620 8E8402D0 */ lw $a0, 0x2d0($s4) /* A9B7C4 80024624 00402025 */ move $a0, $v0 /* A9B7C8 80024628 AE8202D0 */ sw $v0, 0x2d0($s4) @@ -335,7 +335,7 @@ glabel func_800245BC /* A9BC4C 80024AAC 24C654B4 */ addiu $a2, %lo(D_801354B4) # addiu $a2, $a2, 0x54b4 /* A9BC50 80024AB0 27A4018C */ addiu $a0, $sp, 0x18c /* A9BC54 80024AB4 02802825 */ move $a1, $s4 -/* A9BC58 80024AB8 0C031AD5 */ jal func_800C6B54 +/* A9BC58 80024AB8 0C031AD5 */ jal Graph_CloseDisps /* A9BC5C 80024ABC 24070167 */ li $a3, 359 /* A9BC60 80024AC0 8FBF005C */ lw $ra, 0x5c($sp) /* A9BC64 80024AC4 D7B40018 */ ldc1 $f20, 0x18($sp) diff --git a/asm/non_matchings/code/z_eff_spark/func_80025000.s b/asm/non_matchings/code/z_eff_spark/func_80025000.s index a85b3b608c..3bd1194e3f 100644 --- a/asm/non_matchings/code/z_eff_spark/func_80025000.s +++ b/asm/non_matchings/code/z_eff_spark/func_80025000.s @@ -33,7 +33,7 @@ glabel func_80025000 /* A9C1E0 80025040 24C65548 */ addiu $a2, %lo(D_80135548) # addiu $a2, $a2, 0x5548 /* A9C1E4 80025044 27A401AC */ addiu $a0, $sp, 0x1ac /* A9C1E8 80025048 02C02825 */ move $a1, $s6 -/* A9C1EC 8002504C 0C031AB1 */ jal func_800C6AC4 +/* A9C1EC 8002504C 0C031AB1 */ jal Graph_OpenDisps /* A9C1F0 80025050 24070125 */ li $a3, 293 /* A9C1F4 80025054 12E00464 */ beqz $s7, .L800261E8 /* A9C1F8 80025058 3C0FDA38 */ lui $t7, (0xDA380003 >> 16) # lui $t7, 0xda38 @@ -46,7 +46,7 @@ glabel func_80025000 /* A9C214 80025074 AC8F0000 */ sw $t7, ($a0) /* A9C218 80025078 AC980004 */ sw $t8, 4($a0) /* A9C21C 8002507C 8EC402D0 */ lw $a0, 0x2d0($s6) -/* A9C220 80025080 0C024DDD */ jal func_80093774 +/* A9C220 80025080 0C024DDD */ jal Gfx_CallSetupDL /* A9C224 80025084 24050026 */ li $a1, 38 /* A9C228 80025088 00402025 */ move $a0, $v0 /* A9C22C 8002508C AEC202D0 */ sw $v0, 0x2d0($s6) @@ -1248,7 +1248,7 @@ glabel func_80025000 /* A9D38C 800261EC 24C65594 */ addiu $a2, %lo(D_80135594) # addiu $a2, $a2, 0x5594 /* A9D390 800261F0 27A401AC */ addiu $a0, $sp, 0x1ac /* A9D394 800261F4 02C02825 */ move $a1, $s6 -/* A9D398 800261F8 0C031AD5 */ jal func_800C6B54 +/* A9D398 800261F8 0C031AD5 */ jal Graph_CloseDisps /* A9D39C 800261FC 240701F2 */ li $a3, 498 /* A9D3A0 80026200 8FBF0034 */ lw $ra, 0x34($sp) /* A9D3A4 80026204 8FB00014 */ lw $s0, 0x14($sp) diff --git a/asm/non_matchings/code/z_eff_ss_dead/func_80026230.s b/asm/non_matchings/code/z_eff_ss_dead/func_80026230.s index db5c8759bb..410591f2fb 100644 --- a/asm/non_matchings/code/z_eff_ss_dead/func_80026230.s +++ b/asm/non_matchings/code/z_eff_ss_dead/func_80026230.s @@ -25,7 +25,7 @@ glabel func_80026230 /* A9D3F4 80026254 24C655C0 */ addiu $a2, %lo(D_801355C0) # addiu $a2, $a2, 0x55c0 /* A9D3F8 80026258 27A40038 */ addiu $a0, $sp, 0x38 /* A9D3FC 8002625C 24070071 */ li $a3, 113 -/* A9D400 80026260 0C031AB1 */ jal func_800C6AC4 +/* A9D400 80026260 0C031AB1 */ jal Graph_OpenDisps /* A9D404 80026264 AFA50048 */ sw $a1, 0x48($sp) /* A9D408 80026268 87B80066 */ lh $t8, 0x66($sp) /* A9D40C 8002626C 34198000 */ li $t9, 32768 @@ -130,7 +130,7 @@ glabel func_80026230 .L800263DC: /* A9D57C 800263DC AD0502C0 */ sw $a1, 0x2c0($t0) /* A9D580 800263E0 8FB90058 */ lw $t9, 0x58($sp) -/* A9D584 800263E4 0C031AD5 */ jal func_800C6B54 +/* A9D584 800263E4 0C031AD5 */ jal Graph_CloseDisps /* A9D588 800263E8 8F250000 */ lw $a1, ($t9) /* A9D58C 800263EC 8FBF001C */ lw $ra, 0x1c($sp) /* A9D590 800263F0 8FB00018 */ lw $s0, 0x18($sp) diff --git a/asm/non_matchings/code/z_eff_ss_dead/func_80026400.s b/asm/non_matchings/code/z_eff_ss_dead/func_80026400.s index d39b44f281..f1e7733a61 100644 --- a/asm/non_matchings/code/z_eff_ss_dead/func_80026400.s +++ b/asm/non_matchings/code/z_eff_ss_dead/func_80026400.s @@ -22,7 +22,7 @@ glabel func_80026400 /* A9D5C8 80026428 24C655E8 */ addiu $a2, %lo(D_801355E8) # addiu $a2, $a2, 0x55e8 /* A9D5CC 8002642C 27A40034 */ addiu $a0, $sp, 0x34 /* A9D5D0 80026430 2407008D */ li $a3, 141 -/* A9D5D4 80026434 0C031AB1 */ jal func_800C6AC4 +/* A9D5D4 80026434 0C031AB1 */ jal Graph_OpenDisps /* A9D5D8 80026438 AFA50044 */ sw $a1, 0x44($sp) /* A9D5DC 8002643C 87B8005E */ lh $t8, 0x5e($sp) /* A9D5E0 80026440 24194000 */ li $t9, 16384 @@ -142,7 +142,7 @@ glabel func_80026400 /* A9D784 800265E4 3C068013 */ lui $a2, %hi(D_801355FC) # $a2, 0x8013 /* A9D788 800265E8 24C655FC */ addiu $a2, %lo(D_801355FC) # addiu $a2, $a2, 0x55fc /* A9D78C 800265EC 27A40034 */ addiu $a0, $sp, 0x34 -/* A9D790 800265F0 0C031AD5 */ jal func_800C6B54 +/* A9D790 800265F0 0C031AD5 */ jal Graph_CloseDisps /* A9D794 800265F4 8DE50000 */ lw $a1, ($t7) .L800265F8: /* A9D798 800265F8 8FBF0014 */ lw $ra, 0x14($sp) diff --git a/asm/non_matchings/code/z_eff_ss_dead/func_80026608.s b/asm/non_matchings/code/z_eff_ss_dead/func_80026608.s index 7dc11dcf3d..7ebe64c007 100644 --- a/asm/non_matchings/code/z_eff_ss_dead/func_80026608.s +++ b/asm/non_matchings/code/z_eff_ss_dead/func_80026608.s @@ -17,7 +17,7 @@ glabel func_80026608 /* A9D7BC 8002661C 24C65610 */ addiu $a2, %lo(D_80135610) # addiu $a2, $a2, 0x5610 /* A9D7C0 80026620 27A40020 */ addiu $a0, $sp, 0x20 /* A9D7C4 80026624 2407009F */ li $a3, 159 -/* A9D7C8 80026628 0C031AB1 */ jal func_800C6AC4 +/* A9D7C8 80026628 0C031AB1 */ jal Graph_OpenDisps /* A9D7CC 8002662C AFA50030 */ sw $a1, 0x30($sp) /* A9D7D0 80026630 8FA80030 */ lw $t0, 0x30($sp) /* A9D7D4 80026634 3C18E700 */ lui $t8, 0xe700 @@ -37,7 +37,7 @@ glabel func_80026608 /* A9D80C 8002666C 8FB90038 */ lw $t9, 0x38($sp) /* A9D810 80026670 27A40020 */ addiu $a0, $sp, 0x20 /* A9D814 80026674 240700A4 */ li $a3, 164 -/* A9D818 80026678 0C031AD5 */ jal func_800C6B54 +/* A9D818 80026678 0C031AD5 */ jal Graph_CloseDisps /* A9D81C 8002667C 8F250000 */ lw $a1, ($t9) /* A9D820 80026680 8FBF0014 */ lw $ra, 0x14($sp) /* A9D824 80026684 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/asm/non_matchings/code/z_eff_ss_dead/func_80026690.s b/asm/non_matchings/code/z_eff_ss_dead/func_80026690.s index be57491478..2049610f47 100644 --- a/asm/non_matchings/code/z_eff_ss_dead/func_80026690.s +++ b/asm/non_matchings/code/z_eff_ss_dead/func_80026690.s @@ -25,7 +25,7 @@ glabel func_80026690 /* A9D854 800266B4 24C65638 */ addiu $a2, %lo(D_80135638) # addiu $a2, $a2, 0x5638 /* A9D858 800266B8 27A40038 */ addiu $a0, $sp, 0x38 /* A9D85C 800266BC 240700B2 */ li $a3, 178 -/* A9D860 800266C0 0C031AB1 */ jal func_800C6AC4 +/* A9D860 800266C0 0C031AB1 */ jal Graph_OpenDisps /* A9D864 800266C4 AFA50048 */ sw $a1, 0x48($sp) /* A9D868 800266C8 87B80066 */ lh $t8, 0x66($sp) /* A9D86C 800266CC 34198000 */ li $t9, 32768 @@ -130,7 +130,7 @@ glabel func_80026690 .L8002683C: /* A9D9DC 8002683C AD0502D0 */ sw $a1, 0x2d0($t0) /* A9D9E0 80026840 8FB90058 */ lw $t9, 0x58($sp) -/* A9D9E4 80026844 0C031AD5 */ jal func_800C6B54 +/* A9D9E4 80026844 0C031AD5 */ jal Graph_CloseDisps /* A9D9E8 80026848 8F250000 */ lw $a1, ($t9) /* A9D9EC 8002684C 8FBF001C */ lw $ra, 0x1c($sp) /* A9D9F0 80026850 8FB00018 */ lw $s0, 0x18($sp) diff --git a/asm/non_matchings/code/z_eff_ss_dead/func_80026860.s b/asm/non_matchings/code/z_eff_ss_dead/func_80026860.s index f65218d29a..bfc2d7fec4 100644 --- a/asm/non_matchings/code/z_eff_ss_dead/func_80026860.s +++ b/asm/non_matchings/code/z_eff_ss_dead/func_80026860.s @@ -20,7 +20,7 @@ glabel func_80026860 /* A9DA20 80026880 24C65660 */ addiu $a2, %lo(D_80135660) # addiu $a2, $a2, 0x5660 /* A9DA24 80026884 27A40034 */ addiu $a0, $sp, 0x34 /* A9DA28 80026888 240700C9 */ li $a3, 201 -/* A9DA2C 8002688C 0C031AB1 */ jal func_800C6AC4 +/* A9DA2C 8002688C 0C031AB1 */ jal Graph_OpenDisps /* A9DA30 80026890 AFA50044 */ sw $a1, 0x44($sp) /* A9DA34 80026894 87B8005E */ lh $t8, 0x5e($sp) /* A9DA38 80026898 24194000 */ li $t9, 16384 @@ -143,7 +143,7 @@ glabel func_80026860 /* A9DBE8 80026A48 ADE302D0 */ sw $v1, 0x2d0($t7) /* A9DBEC 80026A4C 8FB90050 */ lw $t9, 0x50($sp) /* A9DBF0 80026A50 27A40034 */ addiu $a0, $sp, 0x34 -/* A9DBF4 80026A54 0C031AD5 */ jal func_800C6B54 +/* A9DBF4 80026A54 0C031AD5 */ jal Graph_CloseDisps /* A9DBF8 80026A58 8F250000 */ lw $a1, ($t9) /* A9DBFC 80026A5C 8FBF0014 */ lw $ra, 0x14($sp) /* A9DC00 80026A60 27BD0050 */ addiu $sp, $sp, 0x50 diff --git a/asm/non_matchings/code/z_eff_ss_dead/func_80026A6C.s b/asm/non_matchings/code/z_eff_ss_dead/func_80026A6C.s index edf3cbc293..bb885f1628 100644 --- a/asm/non_matchings/code/z_eff_ss_dead/func_80026A6C.s +++ b/asm/non_matchings/code/z_eff_ss_dead/func_80026A6C.s @@ -17,7 +17,7 @@ glabel func_80026A6C /* A9DC20 80026A80 24C65688 */ addiu $a2, %lo(D_80135688) # addiu $a2, $a2, 0x5688 /* A9DC24 80026A84 27A40020 */ addiu $a0, $sp, 0x20 /* A9DC28 80026A88 240700D9 */ li $a3, 217 -/* A9DC2C 80026A8C 0C031AB1 */ jal func_800C6AC4 +/* A9DC2C 80026A8C 0C031AB1 */ jal Graph_OpenDisps /* A9DC30 80026A90 AFA50030 */ sw $a1, 0x30($sp) /* A9DC34 80026A94 8FA80030 */ lw $t0, 0x30($sp) /* A9DC38 80026A98 3C18E700 */ lui $t8, 0xe700 @@ -37,7 +37,7 @@ glabel func_80026A6C /* A9DC70 80026AD0 8FB90038 */ lw $t9, 0x38($sp) /* A9DC74 80026AD4 27A40020 */ addiu $a0, $sp, 0x20 /* A9DC78 80026AD8 240700DE */ li $a3, 222 -/* A9DC7C 80026ADC 0C031AD5 */ jal func_800C6B54 +/* A9DC7C 80026ADC 0C031AD5 */ jal Graph_CloseDisps /* A9DC80 80026AE0 8F250000 */ lw $a1, ($t9) /* A9DC84 80026AE4 8FBF0014 */ lw $ra, 0x14($sp) /* A9DC88 80026AE8 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/asm/non_matchings/code/code_80026B00/Effect_Add.s b/asm/non_matchings/code/z_effect/Effect_Add.s similarity index 100% rename from asm/non_matchings/code/code_80026B00/Effect_Add.s rename to asm/non_matchings/code/z_effect/Effect_Add.s diff --git a/asm/non_matchings/code/code_80026B00/func_80026B0C.s b/asm/non_matchings/code/z_effect/func_80026B0C.s similarity index 100% rename from asm/non_matchings/code/code_80026B00/func_80026B0C.s rename to asm/non_matchings/code/z_effect/func_80026B0C.s diff --git a/asm/non_matchings/code/code_80026B00/func_80026C2C.s b/asm/non_matchings/code/z_effect/func_80026C2C.s similarity index 100% rename from asm/non_matchings/code/code_80026B00/func_80026C2C.s rename to asm/non_matchings/code/z_effect/func_80026C2C.s diff --git a/asm/non_matchings/code/code_80026B00/func_80026E74.s b/asm/non_matchings/code/z_effect/func_80026E74.s similarity index 100% rename from asm/non_matchings/code/code_80026B00/func_80026E74.s rename to asm/non_matchings/code/z_effect/func_80026E74.s diff --git a/asm/non_matchings/code/code_80026B00/func_80026F70.s b/asm/non_matchings/code/z_effect/func_80026F70.s similarity index 100% rename from asm/non_matchings/code/code_80026B00/func_80026F70.s rename to asm/non_matchings/code/z_effect/func_80026F70.s diff --git a/asm/non_matchings/code/code_80026B00/func_8002709C.s b/asm/non_matchings/code/z_effect/func_8002709C.s similarity index 100% rename from asm/non_matchings/code/code_80026B00/func_8002709C.s rename to asm/non_matchings/code/z_effect/func_8002709C.s diff --git a/asm/non_matchings/code/code_80026B00/func_800271A8.s b/asm/non_matchings/code/z_effect/func_800271A8.s similarity index 100% rename from asm/non_matchings/code/code_80026B00/func_800271A8.s rename to asm/non_matchings/code/z_effect/func_800271A8.s diff --git a/asm/non_matchings/code/z_effect_soft_sprite_old_init/func_80027F80.s b/asm/non_matchings/code/z_effect_soft_sprite_old_init/func_80027F80.s index 009c7b17d6..d28ada8e06 100644 --- a/asm/non_matchings/code/z_effect_soft_sprite_old_init/func_80027F80.s +++ b/asm/non_matchings/code/z_effect_soft_sprite_old_init/func_80027F80.s @@ -34,7 +34,7 @@ glabel func_80027F80 /* A9F168 80027FC8 27A40040 */ addiu $a0, $sp, 0x40 /* A9F16C 80027FCC 240700C4 */ li $a3, 196 /* A9F170 80027FD0 02002825 */ move $a1, $s0 -/* A9F174 80027FD4 0C031AB1 */ jal func_800C6AC4 +/* A9F174 80027FD4 0C031AB1 */ jal Graph_OpenDisps /* A9F178 80027FD8 AFA80054 */ sw $t0, 0x54($sp) /* A9F17C 80027FDC 86290042 */ lh $t1, 0x42($s1) /* A9F180 80027FE0 3C018013 */ lui $at, %hi(D_80135C48) @@ -161,7 +161,7 @@ glabel func_80027F80 /* A9F360 800281C0 24C65C24 */ addiu $a2, %lo(D_80135C24) # addiu $a2, $a2, 0x5c24 /* A9F364 800281C4 27A40040 */ addiu $a0, $sp, 0x40 /* A9F368 800281C8 02002825 */ move $a1, $s0 -/* A9F36C 800281CC 0C031AD5 */ jal func_800C6B54 +/* A9F36C 800281CC 0C031AD5 */ jal Graph_CloseDisps /* A9F370 800281D0 240700F3 */ li $a3, 243 /* A9F374 800281D4 8FBF001C */ lw $ra, 0x1c($sp) /* A9F378 800281D8 8FB00014 */ lw $s0, 0x14($sp) diff --git a/asm/non_matchings/code/z_elf_message/func_8006BBC0.s b/asm/non_matchings/code/z_elf_message/ElfMessage_CheckCondition.s similarity index 95% rename from asm/non_matchings/code/z_elf_message/func_8006BBC0.s rename to asm/non_matchings/code/z_elf_message/ElfMessage_CheckCondition.s index 56f71e7c88..28f549982f 100644 --- a/asm/non_matchings/code/z_elf_message/func_8006BBC0.s +++ b/asm/non_matchings/code/z_elf_message/ElfMessage_CheckCondition.s @@ -91,7 +91,7 @@ glabel jtbl_8013B8C8 .word L8006BE10 .text -glabel func_8006BBC0 +glabel ElfMessage_CheckCondition /* AE2D60 8006BBC0 27BDFFE8 */ addiu $sp, $sp, -0x18 /* AE2D64 8006BBC4 AFBF0014 */ sw $ra, 0x14($sp) /* AE2D68 8006BBC8 90850000 */ lbu $a1, ($a0) @@ -133,12 +133,12 @@ glabel func_8006BBC0 /* AE2DF0 8006BC50 908E0001 */ lbu $t6, 1($a0) /* AE2DF4 8006BC54 24E7E660 */ addiu $a3, %lo(gSaveContext) # addiu $a3, $a3, -0x19a0 /* AE2DF8 8006BC58 94E91402 */ lhu $t1, 0x1402($a3) -/* AE2DFC 8006BC5C 3C088012 */ lui $t0, %hi(D_80126F50) +/* AE2DFC 8006BC5C 3C088012 */ lui $t0, %hi(gBitFlags-0x1d0) /* AE2E00 8006BC60 000EC080 */ sll $t8, $t6, 2 /* AE2E04 8006BC64 01184021 */ addu $t0, $t0, $t8 /* AE2E08 8006BC68 00E95021 */ addu $t2, $a3, $t1 /* AE2E0C 8006BC6C 914B00A8 */ lbu $t3, 0xa8($t2) -/* AE2E10 8006BC70 8D086F50 */ lw $t0, %lo(D_80126F50)($t0) +/* AE2E10 8006BC70 8D086F50 */ lw $t0, %lo(gBitFlags-0x1d0)($t0) /* AE2E14 8006BC74 30B90001 */ andi $t9, $a1, 1 /* AE2E18 8006BC78 3B2F0001 */ xori $t7, $t9, 1 /* AE2E1C 8006BC7C 010B6024 */ and $t4, $t0, $t3 @@ -196,13 +196,13 @@ glabel L8006BCFC /* AE2EE0 8006BD40 2C420001 */ sltiu $v0, $v0, 1 glabel L8006BD44 /* AE2EE4 8006BD44 908F0003 */ lbu $t7, 3($a0) -/* AE2EE8 8006BD48 3C188012 */ lui $t8, %hi(D_80127010) +/* AE2EE8 8006BD48 3C188012 */ lui $t8, %hi(gBitFlags-0x110) /* AE2EEC 8006BD4C 3C078016 */ lui $a3, %hi(gSaveContext) # $a3, 0x8016 /* AE2EF0 8006BD50 000F6880 */ sll $t5, $t7, 2 /* AE2EF4 8006BD54 030DC021 */ addu $t8, $t8, $t5 /* AE2EF8 8006BD58 3C098012 */ lui $t1, %hi(gEquipShifts+3) # $t1, 0x8012 /* AE2EFC 8006BD5C 912971F3 */ lbu $t1, %lo(gEquipShifts+3)($t1) -/* AE2F00 8006BD60 8F187010 */ lw $t8, %lo(D_80127010)($t8) +/* AE2F00 8006BD60 8F187010 */ lw $t8, %lo(gBitFlags-0x110)($t8) /* AE2F04 8006BD64 24E7E660 */ addiu $a3, %lo(gSaveContext) # addiu $a3, $a3, -0x19a0 /* AE2F08 8006BD68 94E8009C */ lhu $t0, 0x9c($a3) /* AE2F0C 8006BD6C 30AB0001 */ andi $t3, $a1, 1 @@ -217,11 +217,11 @@ glabel L8006BD44 glabel L8006BD90 /* AE2F30 8006BD90 908F0003 */ lbu $t7, 3($a0) /* AE2F34 8006BD94 3C078016 */ lui $a3, %hi(gSaveContext) # $a3, 0x8016 -/* AE2F38 8006BD98 3C188012 */ lui $t8, %hi(D_80126FD0) +/* AE2F38 8006BD98 3C188012 */ lui $t8, %hi(gBitFlags-0x150) /* AE2F3C 8006BD9C 000F6880 */ sll $t5, $t7, 2 /* AE2F40 8006BDA0 24E7E660 */ addiu $a3, %lo(gSaveContext) # addiu $a3, $a3, -0x19a0 /* AE2F44 8006BDA4 030DC021 */ addu $t8, $t8, $t5 -/* AE2F48 8006BDA8 8F186FD0 */ lw $t8, %lo(D_80126FD0)($t8) +/* AE2F48 8006BDA8 8F186FD0 */ lw $t8, %lo(gBitFlags-0x150)($t8) /* AE2F4C 8006BDAC 8CE900A4 */ lw $t1, 0xa4($a3) /* AE2F50 8006BDB0 30AE0001 */ andi $t6, $a1, 1 /* AE2F54 8006BDB4 39CB0001 */ xori $t3, $t6, 1 @@ -234,11 +234,11 @@ glabel L8006BD90 glabel L8006BDD0 /* AE2F70 8006BDD0 908C0003 */ lbu $t4, 3($a0) /* AE2F74 8006BDD4 3C078016 */ lui $a3, %hi(gSaveContext) # $a3, 0x8016 -/* AE2F78 8006BDD8 3C0F8012 */ lui $t7, %hi(D_80126F88) +/* AE2F78 8006BDD8 3C0F8012 */ lui $t7, %hi(gBitFlags-0x198) /* AE2F7C 8006BDDC 000CC880 */ sll $t9, $t4, 2 /* AE2F80 8006BDE0 24E7E660 */ addiu $a3, %lo(gSaveContext) # addiu $a3, $a3, -0x19a0 /* AE2F84 8006BDE4 01F97821 */ addu $t7, $t7, $t9 -/* AE2F88 8006BDE8 8DEF6F88 */ lw $t7, %lo(D_80126F88)($t7) +/* AE2F88 8006BDE8 8DEF6F88 */ lw $t7, %lo(gBitFlags-0x198)($t7) /* AE2F8C 8006BDEC 8CED00A4 */ lw $t5, 0xa4($a3) /* AE2F90 8006BDF0 30AA0001 */ andi $t2, $a1, 1 /* AE2F94 8006BDF4 394E0001 */ xori $t6, $t2, 1 diff --git a/asm/non_matchings/code/z_elf_message/func_8006BE88.s b/asm/non_matchings/code/z_elf_message/func_8006BE88.s deleted file mode 100644 index 0915b36fbe..0000000000 --- a/asm/non_matchings/code/z_elf_message/func_8006BE88.s +++ /dev/null @@ -1,44 +0,0 @@ -glabel func_8006BE88 -/* AE3028 8006BE88 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* AE302C 8006BE8C AFBF0024 */ sw $ra, 0x24($sp) -/* AE3030 8006BE90 AFB20020 */ sw $s2, 0x20($sp) -/* AE3034 8006BE94 AFB1001C */ sw $s1, 0x1c($sp) -/* AE3038 8006BE98 AFB00018 */ sw $s0, 0x18($sp) -/* AE303C 8006BE9C 8C850000 */ lw $a1, ($a0) -/* AE3040 8006BEA0 24120020 */ li $s2, 32 -/* AE3044 8006BEA4 00808025 */ move $s0, $a0 -/* AE3048 8006BEA8 90AE0000 */ lbu $t6, ($a1) -/* AE304C 8006BEAC 24110001 */ li $s1, 1 -/* AE3050 8006BEB0 31CF00E0 */ andi $t7, $t6, 0xe0 -/* AE3054 8006BEB4 164F000D */ bne $s2, $t7, .L8006BEEC -/* AE3058 8006BEB8 00000000 */ nop -.L8006BEBC: -/* AE305C 8006BEBC 0C01AEF0 */ jal func_8006BBC0 -/* AE3060 8006BEC0 00A02025 */ move $a0, $a1 -/* AE3064 8006BEC4 54400003 */ bnezl $v0, .L8006BED4 -/* AE3068 8006BEC8 8E180000 */ lw $t8, ($s0) -/* AE306C 8006BECC 00008825 */ move $s1, $zero -/* AE3070 8006BED0 8E180000 */ lw $t8, ($s0) -.L8006BED4: -/* AE3074 8006BED4 27050004 */ addiu $a1, $t8, 4 -/* AE3078 8006BED8 AE050000 */ sw $a1, ($s0) -/* AE307C 8006BEDC 90A80000 */ lbu $t0, ($a1) -/* AE3080 8006BEE0 310900E0 */ andi $t1, $t0, 0xe0 -/* AE3084 8006BEE4 1249FFF5 */ beq $s2, $t1, .L8006BEBC -/* AE3088 8006BEE8 00000000 */ nop -.L8006BEEC: -/* AE308C 8006BEEC 12200005 */ beqz $s1, .L8006BF04 -/* AE3090 8006BEF0 00001025 */ move $v0, $zero -/* AE3094 8006BEF4 0C01AEF0 */ jal func_8006BBC0 -/* AE3098 8006BEF8 00A02025 */ move $a0, $a1 -/* AE309C 8006BEFC 10000002 */ b .L8006BF08 -/* AE30A0 8006BF00 8FBF0024 */ lw $ra, 0x24($sp) -.L8006BF04: -/* AE30A4 8006BF04 8FBF0024 */ lw $ra, 0x24($sp) -.L8006BF08: -/* AE30A8 8006BF08 8FB00018 */ lw $s0, 0x18($sp) -/* AE30AC 8006BF0C 8FB1001C */ lw $s1, 0x1c($sp) -/* AE30B0 8006BF10 8FB20020 */ lw $s2, 0x20($sp) -/* AE30B4 8006BF14 03E00008 */ jr $ra -/* AE30B8 8006BF18 27BD0028 */ addiu $sp, $sp, 0x28 - diff --git a/asm/non_matchings/code/z_elf_message/func_8006BF1C.s b/asm/non_matchings/code/z_elf_message/func_8006BF1C.s deleted file mode 100644 index 3f686b48de..0000000000 --- a/asm/non_matchings/code/z_elf_message/func_8006BF1C.s +++ /dev/null @@ -1,144 +0,0 @@ -glabel func_8006BF1C -/* AE30BC 8006BF1C 27BDFF90 */ addiu $sp, $sp, -0x70 -/* AE30C0 8006BF20 AFB30020 */ sw $s3, 0x20($sp) -/* AE30C4 8006BF24 AFB2001C */ sw $s2, 0x1c($sp) -/* AE30C8 8006BF28 AFB10018 */ sw $s1, 0x18($sp) -/* AE30CC 8006BF2C AFBF0024 */ sw $ra, 0x24($sp) -/* AE30D0 8006BF30 AFB00014 */ sw $s0, 0x14($sp) -/* AE30D4 8006BF34 00808825 */ move $s1, $a0 -/* AE30D8 8006BF38 8C900000 */ lw $s0, ($a0) -/* AE30DC 8006BF3C 00009025 */ move $s2, $zero -/* AE30E0 8006BF40 00009825 */ move $s3, $zero -/* AE30E4 8006BF44 27A30044 */ addiu $v1, $sp, 0x44 -.L8006BF48: -/* AE30E8 8006BF48 02002025 */ move $a0, $s0 -/* AE30EC 8006BF4C 0C01AEF0 */ jal func_8006BBC0 -/* AE30F0 8006BF50 AFA30030 */ sw $v1, 0x30($sp) -/* AE30F4 8006BF54 8FA30030 */ lw $v1, 0x30($sp) -/* AE30F8 8006BF58 24010040 */ li $at, 64 -/* AE30FC 8006BF5C 02429021 */ addu $s2, $s2, $v0 -/* AE3100 8006BF60 AC620000 */ sw $v0, ($v1) -/* AE3104 8006BF64 920E0004 */ lbu $t6, 4($s0) -/* AE3108 8006BF68 26730001 */ addiu $s3, $s3, 1 -/* AE310C 8006BF6C 26100004 */ addiu $s0, $s0, 4 -/* AE3110 8006BF70 31CF00E0 */ andi $t7, $t6, 0xe0 -/* AE3114 8006BF74 11E1FFF4 */ beq $t7, $at, .L8006BF48 -/* AE3118 8006BF78 24630004 */ addiu $v1, $v1, 4 -/* AE311C 8006BF7C 56400004 */ bnezl $s2, .L8006BF90 -/* AE3120 8006BF80 44922000 */ mtc1 $s2, $f4 -/* AE3124 8006BF84 10000056 */ b .L8006C0E0 -/* AE3128 8006BF88 00001025 */ move $v0, $zero -/* AE312C 8006BF8C 44922000 */ mtc1 $s2, $f4 -.L8006BF90: -/* AE3130 8006BF90 0C00CFBE */ jal Math_Rand_ZeroFloat -/* AE3134 8006BF94 46802320 */ cvt.s.w $f12, $f4 -/* AE3138 8006BF98 4600018D */ trunc.w.s $f6, $f0 -/* AE313C 8006BF9C 00009025 */ move $s2, $zero -/* AE3140 8006BFA0 32650003 */ andi $a1, $s3, 3 -/* AE3144 8006BFA4 44023000 */ mfc1 $v0, $f6 -/* AE3148 8006BFA8 5A60004D */ blezl $s3, .L8006C0E0 -/* AE314C 8006BFAC 00001025 */ move $v0, $zero -/* AE3150 8006BFB0 10A00014 */ beqz $a1, .L8006C004 -/* AE3154 8006BFB4 00A02025 */ move $a0, $a1 -/* AE3158 8006BFB8 0000C880 */ sll $t9, $zero, 2 -/* AE315C 8006BFBC 27A80044 */ addiu $t0, $sp, 0x44 -/* AE3160 8006BFC0 03281821 */ addu $v1, $t9, $t0 -.L8006BFC4: -/* AE3164 8006BFC4 8C690000 */ lw $t1, ($v1) -/* AE3168 8006BFC8 51200008 */ beql $t1, $zero, .L8006BFEC -/* AE316C 8006BFCC 8E2A0000 */ lw $t2, ($s1) -/* AE3170 8006BFD0 18400003 */ blez $v0, .L8006BFE0 -/* AE3174 8006BFD4 00000000 */ nop -/* AE3178 8006BFD8 10000003 */ b .L8006BFE8 -/* AE317C 8006BFDC 2442FFFF */ addiu $v0, $v0, -1 -.L8006BFE0: -/* AE3180 8006BFE0 1000003F */ b .L8006C0E0 -/* AE3184 8006BFE4 24020001 */ li $v0, 1 -.L8006BFE8: -/* AE3188 8006BFE8 8E2A0000 */ lw $t2, ($s1) -.L8006BFEC: -/* AE318C 8006BFEC 26520001 */ addiu $s2, $s2, 1 -/* AE3190 8006BFF0 24630004 */ addiu $v1, $v1, 4 -/* AE3194 8006BFF4 254B0004 */ addiu $t3, $t2, 4 -/* AE3198 8006BFF8 1492FFF2 */ bne $a0, $s2, .L8006BFC4 -/* AE319C 8006BFFC AE2B0000 */ sw $t3, ($s1) -/* AE31A0 8006C000 12530036 */ beq $s2, $s3, .L8006C0DC -.L8006C004: -/* AE31A4 8006C004 00126080 */ sll $t4, $s2, 2 -/* AE31A8 8006C008 27AD0044 */ addiu $t5, $sp, 0x44 -/* AE31AC 8006C00C 018D1821 */ addu $v1, $t4, $t5 -.L8006C010: -/* AE31B0 8006C010 8C6E0000 */ lw $t6, ($v1) -/* AE31B4 8006C014 51C00008 */ beql $t6, $zero, .L8006C038 -/* AE31B8 8006C018 8E2F0000 */ lw $t7, ($s1) -/* AE31BC 8006C01C 18400003 */ blez $v0, .L8006C02C -/* AE31C0 8006C020 00000000 */ nop -/* AE31C4 8006C024 10000003 */ b .L8006C034 -/* AE31C8 8006C028 2442FFFF */ addiu $v0, $v0, -1 -.L8006C02C: -/* AE31CC 8006C02C 1000002C */ b .L8006C0E0 -/* AE31D0 8006C030 24020001 */ li $v0, 1 -.L8006C034: -/* AE31D4 8006C034 8E2F0000 */ lw $t7, ($s1) -.L8006C038: -/* AE31D8 8006C038 25F80004 */ addiu $t8, $t7, 4 -/* AE31DC 8006C03C AE380000 */ sw $t8, ($s1) -/* AE31E0 8006C040 8C790004 */ lw $t9, 4($v1) -/* AE31E4 8006C044 53200008 */ beql $t9, $zero, .L8006C068 -/* AE31E8 8006C048 8E280000 */ lw $t0, ($s1) -/* AE31EC 8006C04C 18400003 */ blez $v0, .L8006C05C -/* AE31F0 8006C050 00000000 */ nop -/* AE31F4 8006C054 10000003 */ b .L8006C064 -/* AE31F8 8006C058 2442FFFF */ addiu $v0, $v0, -1 -.L8006C05C: -/* AE31FC 8006C05C 10000020 */ b .L8006C0E0 -/* AE3200 8006C060 24020001 */ li $v0, 1 -.L8006C064: -/* AE3204 8006C064 8E280000 */ lw $t0, ($s1) -.L8006C068: -/* AE3208 8006C068 25090004 */ addiu $t1, $t0, 4 -/* AE320C 8006C06C AE290000 */ sw $t1, ($s1) -/* AE3210 8006C070 8C6A0008 */ lw $t2, 8($v1) -/* AE3214 8006C074 51400008 */ beql $t2, $zero, .L8006C098 -/* AE3218 8006C078 8E2B0000 */ lw $t3, ($s1) -/* AE321C 8006C07C 18400003 */ blez $v0, .L8006C08C -/* AE3220 8006C080 00000000 */ nop -/* AE3224 8006C084 10000003 */ b .L8006C094 -/* AE3228 8006C088 2442FFFF */ addiu $v0, $v0, -1 -.L8006C08C: -/* AE322C 8006C08C 10000014 */ b .L8006C0E0 -/* AE3230 8006C090 24020001 */ li $v0, 1 -.L8006C094: -/* AE3234 8006C094 8E2B0000 */ lw $t3, ($s1) -.L8006C098: -/* AE3238 8006C098 256C0004 */ addiu $t4, $t3, 4 -/* AE323C 8006C09C AE2C0000 */ sw $t4, ($s1) -/* AE3240 8006C0A0 8C6D000C */ lw $t5, 0xc($v1) -/* AE3244 8006C0A4 51A00008 */ beql $t5, $zero, .L8006C0C8 -/* AE3248 8006C0A8 8E2E0000 */ lw $t6, ($s1) -/* AE324C 8006C0AC 18400003 */ blez $v0, .L8006C0BC -/* AE3250 8006C0B0 00000000 */ nop -/* AE3254 8006C0B4 10000003 */ b .L8006C0C4 -/* AE3258 8006C0B8 2442FFFF */ addiu $v0, $v0, -1 -.L8006C0BC: -/* AE325C 8006C0BC 10000008 */ b .L8006C0E0 -/* AE3260 8006C0C0 24020001 */ li $v0, 1 -.L8006C0C4: -/* AE3264 8006C0C4 8E2E0000 */ lw $t6, ($s1) -.L8006C0C8: -/* AE3268 8006C0C8 26520004 */ addiu $s2, $s2, 4 -/* AE326C 8006C0CC 24630010 */ addiu $v1, $v1, 0x10 -/* AE3270 8006C0D0 25CF0004 */ addiu $t7, $t6, 4 -/* AE3274 8006C0D4 1653FFCE */ bne $s2, $s3, .L8006C010 -/* AE3278 8006C0D8 AE2F0000 */ sw $t7, ($s1) -.L8006C0DC: -/* AE327C 8006C0DC 00001025 */ move $v0, $zero -.L8006C0E0: -/* AE3280 8006C0E0 8FBF0024 */ lw $ra, 0x24($sp) -/* AE3284 8006C0E4 8FB00014 */ lw $s0, 0x14($sp) -/* AE3288 8006C0E8 8FB10018 */ lw $s1, 0x18($sp) -/* AE328C 8006C0EC 8FB2001C */ lw $s2, 0x1c($sp) -/* AE3290 8006C0F0 8FB30020 */ lw $s3, 0x20($sp) -/* AE3294 8006C0F4 03E00008 */ jr $ra -/* AE3298 8006C0F8 27BD0070 */ addiu $sp, $sp, 0x70 - diff --git a/asm/non_matchings/code/z_elf_message/func_8006C0FC.s b/asm/non_matchings/code/z_elf_message/func_8006C0FC.s deleted file mode 100644 index 8fb62237d1..0000000000 --- a/asm/non_matchings/code/z_elf_message/func_8006C0FC.s +++ /dev/null @@ -1,145 +0,0 @@ -.rdata -glabel D_8013B87C - .asciz "../z_elf_message.c" - .balign 4 - -glabel D_8013B890 - .asciz "\"企画外 条件\" = %s\n" - # EUC-JP: 企画外 条件 | Unplanned conditions - .balign 4 - -glabel D_8013B8A4 - .asciz "企画外 条件" - # EUC-JP: 企画外 条件 | Unplanned conditions - .balign 4 - -glabel D_8013B8B0 - .asciz "0" - .balign 4 - -glabel D_8013B8B4 - .asciz "../z_elf_message.c" - .balign 4 - -.text -glabel func_8006C0FC -/* AE329C 8006C0FC 27BDFFC0 */ addiu $sp, $sp, -0x40 -/* AE32A0 8006C100 AFBE0038 */ sw $fp, 0x38($sp) -/* AE32A4 8006C104 AFB70034 */ sw $s7, 0x34($sp) -/* AE32A8 8006C108 AFB60030 */ sw $s6, 0x30($sp) -/* AE32AC 8006C10C AFB5002C */ sw $s5, 0x2c($sp) -/* AE32B0 8006C110 AFB40028 */ sw $s4, 0x28($sp) -/* AE32B4 8006C114 AFB30024 */ sw $s3, 0x24($sp) -/* AE32B8 8006C118 AFB20020 */ sw $s2, 0x20($sp) -/* AE32BC 8006C11C AFB1001C */ sw $s1, 0x1c($sp) -/* AE32C0 8006C120 AFB00018 */ sw $s0, 0x18($sp) -/* AE32C4 8006C124 3C158014 */ lui $s5, %hi(D_8013B87C) # $s5, 0x8014 -/* AE32C8 8006C128 3C168014 */ lui $s6, %hi(D_8013B890) # $s6, 0x8014 -/* AE32CC 8006C12C 3C178014 */ lui $s7, %hi(D_8013B8A4) # $s7, 0x8014 -/* AE32D0 8006C130 3C1E8014 */ lui $fp, %hi(D_8013B8B0) # $fp, 0x8014 -/* AE32D4 8006C134 AFBF003C */ sw $ra, 0x3c($sp) -/* AE32D8 8006C138 AFA40040 */ sw $a0, 0x40($sp) -/* AE32DC 8006C13C 27DEB8B0 */ addiu $fp, %lo(D_8013B8B0) # addiu $fp, $fp, -0x4750 -/* AE32E0 8006C140 26F7B8A4 */ addiu $s7, %lo(D_8013B8A4) # addiu $s7, $s7, -0x475c -/* AE32E4 8006C144 26D6B890 */ addiu $s6, %lo(D_8013B890) # addiu $s6, $s6, -0x4770 -/* AE32E8 8006C148 26B5B87C */ addiu $s5, %lo(D_8013B87C) # addiu $s5, $s5, -0x4784 -/* AE32EC 8006C14C 27B00040 */ addiu $s0, $sp, 0x40 -/* AE32F0 8006C150 24110020 */ li $s1, 32 -/* AE32F4 8006C154 24120040 */ li $s2, 64 -/* AE32F8 8006C158 24130060 */ li $s3, 96 -/* AE32FC 8006C15C 241400E0 */ li $s4, 224 -.L8006C160: -/* AE3300 8006C160 8FAE0040 */ lw $t6, 0x40($sp) -/* AE3304 8006C164 91C20000 */ lbu $v0, ($t6) -/* AE3308 8006C168 304200E0 */ andi $v0, $v0, 0xe0 -/* AE330C 8006C16C 1040000B */ beqz $v0, .L8006C19C -/* AE3310 8006C170 00000000 */ nop -/* AE3314 8006C174 10510012 */ beq $v0, $s1, .L8006C1C0 -/* AE3318 8006C178 00000000 */ nop -/* AE331C 8006C17C 10520019 */ beq $v0, $s2, .L8006C1E4 -/* AE3320 8006C180 00000000 */ nop -/* AE3324 8006C184 10530020 */ beq $v0, $s3, .L8006C208 -/* AE3328 8006C188 02A02025 */ move $a0, $s5 -/* AE332C 8006C18C 5054002A */ beql $v0, $s4, .L8006C238 -/* AE3330 8006C190 8FAE0040 */ lw $t6, 0x40($sp) -/* AE3334 8006C194 1000002C */ b .L8006C248 -/* AE3338 8006C198 00000000 */ nop -.L8006C19C: -/* AE333C 8006C19C 0C01AEF0 */ jal func_8006BBC0 -/* AE3340 8006C1A0 8FA40040 */ lw $a0, 0x40($sp) -/* AE3344 8006C1A4 50400033 */ beql $v0, $zero, .L8006C274 -/* AE3348 8006C1A8 8FAF0040 */ lw $t7, 0x40($sp) -/* AE334C 8006C1AC 8FAF0040 */ lw $t7, 0x40($sp) -/* AE3350 8006C1B0 91E20002 */ lbu $v0, 2($t7) -/* AE3354 8006C1B4 34420100 */ ori $v0, $v0, 0x100 -/* AE3358 8006C1B8 10000031 */ b .L8006C280 -/* AE335C 8006C1BC 3042FFFF */ andi $v0, $v0, 0xffff -.L8006C1C0: -/* AE3360 8006C1C0 0C01AFA2 */ jal func_8006BE88 -/* AE3364 8006C1C4 02002025 */ move $a0, $s0 -/* AE3368 8006C1C8 5040002A */ beql $v0, $zero, .L8006C274 -/* AE336C 8006C1CC 8FAF0040 */ lw $t7, 0x40($sp) -/* AE3370 8006C1D0 8FB80040 */ lw $t8, 0x40($sp) -/* AE3374 8006C1D4 93020002 */ lbu $v0, 2($t8) -/* AE3378 8006C1D8 34420100 */ ori $v0, $v0, 0x100 -/* AE337C 8006C1DC 10000028 */ b .L8006C280 -/* AE3380 8006C1E0 3042FFFF */ andi $v0, $v0, 0xffff -.L8006C1E4: -/* AE3384 8006C1E4 0C01AFC7 */ jal func_8006BF1C -/* AE3388 8006C1E8 02002025 */ move $a0, $s0 -/* AE338C 8006C1EC 50400021 */ beql $v0, $zero, .L8006C274 -/* AE3390 8006C1F0 8FAF0040 */ lw $t7, 0x40($sp) -/* AE3394 8006C1F4 8FB90040 */ lw $t9, 0x40($sp) -/* AE3398 8006C1F8 93220002 */ lbu $v0, 2($t9) -/* AE339C 8006C1FC 34420100 */ ori $v0, $v0, 0x100 -/* AE33A0 8006C200 1000001F */ b .L8006C280 -/* AE33A4 8006C204 3042FFFF */ andi $v0, $v0, 0xffff -.L8006C208: -/* AE33A8 8006C208 0C01AEF0 */ jal func_8006BBC0 -/* AE33AC 8006C20C 8FA40040 */ lw $a0, 0x40($sp) -/* AE33B0 8006C210 10400017 */ beqz $v0, .L8006C270 -/* AE33B4 8006C214 8FA80040 */ lw $t0, 0x40($sp) -/* AE33B8 8006C218 910A0002 */ lbu $t2, 2($t0) -/* AE33BC 8006C21C 000A5880 */ sll $t3, $t2, 2 -/* AE33C0 8006C220 010B6021 */ addu $t4, $t0, $t3 -/* AE33C4 8006C224 AFAC0040 */ sw $t4, 0x40($sp) -/* AE33C8 8006C228 258DFFFC */ addiu $t5, $t4, -4 -/* AE33CC 8006C22C 10000010 */ b .L8006C270 -/* AE33D0 8006C230 AFAD0040 */ sw $t5, 0x40($sp) -/* AE33D4 8006C234 8FAE0040 */ lw $t6, 0x40($sp) -.L8006C238: -/* AE33D8 8006C238 91C20002 */ lbu $v0, 2($t6) -/* AE33DC 8006C23C 34420100 */ ori $v0, $v0, 0x100 -/* AE33E0 8006C240 1000000F */ b .L8006C280 -/* AE33E4 8006C244 3042FFFF */ andi $v0, $v0, 0xffff -.L8006C248: -/* AE33E8 8006C248 0C000B84 */ jal LogUtils_LogThreadId -/* AE33EC 8006C24C 24050119 */ li $a1, 281 -/* AE33F0 8006C250 02C02025 */ move $a0, $s6 -/* AE33F4 8006C254 0C00084C */ jal osSyncPrintf -/* AE33F8 8006C258 02E02825 */ move $a1, $s7 -/* AE33FC 8006C25C 3C058014 */ lui $a1, %hi(D_8013B8B4) # $a1, 0x8014 -/* AE3400 8006C260 24A5B8B4 */ addiu $a1, %lo(D_8013B8B4) # addiu $a1, $a1, -0x474c -/* AE3404 8006C264 03C02025 */ move $a0, $fp -/* AE3408 8006C268 0C0007FC */ jal __assert -/* AE340C 8006C26C 2406011A */ li $a2, 282 -.L8006C270: -/* AE3410 8006C270 8FAF0040 */ lw $t7, 0x40($sp) -.L8006C274: -/* AE3414 8006C274 25F80004 */ addiu $t8, $t7, 4 -/* AE3418 8006C278 1000FFB9 */ b .L8006C160 -/* AE341C 8006C27C AFB80040 */ sw $t8, 0x40($sp) -.L8006C280: -/* AE3420 8006C280 8FBF003C */ lw $ra, 0x3c($sp) -/* AE3424 8006C284 8FB00018 */ lw $s0, 0x18($sp) -/* AE3428 8006C288 8FB1001C */ lw $s1, 0x1c($sp) -/* AE342C 8006C28C 8FB20020 */ lw $s2, 0x20($sp) -/* AE3430 8006C290 8FB30024 */ lw $s3, 0x24($sp) -/* AE3434 8006C294 8FB40028 */ lw $s4, 0x28($sp) -/* AE3438 8006C298 8FB5002C */ lw $s5, 0x2c($sp) -/* AE343C 8006C29C 8FB60030 */ lw $s6, 0x30($sp) -/* AE3440 8006C2A0 8FB70034 */ lw $s7, 0x34($sp) -/* AE3444 8006C2A4 8FBE0038 */ lw $fp, 0x38($sp) -/* AE3448 8006C2A8 03E00008 */ jr $ra -/* AE344C 8006C2AC 27BD0040 */ addiu $sp, $sp, 0x40 - diff --git a/asm/non_matchings/code/z_elf_message/func_8006C2B0.s b/asm/non_matchings/code/z_elf_message/func_8006C2B0.s deleted file mode 100644 index 578fa29f27..0000000000 --- a/asm/non_matchings/code/z_elf_message/func_8006C2B0.s +++ /dev/null @@ -1,32 +0,0 @@ -glabel func_8006C2B0 -/* AE3450 8006C2B0 3C0E8016 */ lui $t6, %hi(gSaveContext+4) # $t6, 0x8016 -/* AE3454 8006C2B4 8DCEE664 */ lw $t6, %lo(gSaveContext+4)($t6) -/* AE3458 8006C2B8 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* AE345C 8006C2BC AFBF001C */ sw $ra, 0x1c($sp) -/* AE3460 8006C2C0 11C0000D */ beqz $t6, .L8006C2F8 -/* AE3464 8006C2C4 8C851C44 */ lw $a1, 0x1c44($a0) -/* AE3468 8006C2C8 3C014448 */ li $at, 0x44480000 # 0.000000 -/* AE346C 8006C2CC 44812000 */ mtc1 $at, $f4 -/* AE3470 8006C2D0 24060146 */ li $a2, 326 -/* AE3474 8006C2D4 24070004 */ li $a3, 4 -/* AE3478 8006C2D8 0C00D4FD */ jal Actor_FindNearby -/* AE347C 8006C2DC E7A40010 */ swc1 $f4, 0x10($sp) -/* AE3480 8006C2E0 14400003 */ bnez $v0, .L8006C2F0 -/* AE3484 8006C2E4 3C048012 */ lui $a0, %hi(D_8011F3A0) # $a0, 0x8012 -/* AE3488 8006C2E8 10000005 */ b .L8006C300 -/* AE348C 8006C2EC 2484F3A0 */ addiu $a0, %lo(D_8011F3A0) # addiu $a0, $a0, -0xc60 -.L8006C2F0: -/* AE3490 8006C2F0 10000005 */ b .L8006C308 -/* AE3494 8006C2F4 24020160 */ li $v0, 352 -.L8006C2F8: -/* AE3498 8006C2F8 3C048012 */ lui $a0, %hi(D_8011F3D4) # $a0, 0x8012 -/* AE349C 8006C2FC 2484F3D4 */ addiu $a0, %lo(D_8011F3D4) # addiu $a0, $a0, -0xc2c -.L8006C300: -/* AE34A0 8006C300 0C01B03F */ jal func_8006C0FC -/* AE34A4 8006C304 00000000 */ nop -.L8006C308: -/* AE34A8 8006C308 8FBF001C */ lw $ra, 0x1c($sp) -/* AE34AC 8006C30C 27BD0020 */ addiu $sp, $sp, 0x20 -/* AE34B0 8006C310 03E00008 */ jr $ra -/* AE34B4 8006C314 00000000 */ nop - diff --git a/asm/non_matchings/code/z_elf_message/func_8006C318.s b/asm/non_matchings/code/z_elf_message/func_8006C318.s deleted file mode 100644 index 8b96baa558..0000000000 --- a/asm/non_matchings/code/z_elf_message/func_8006C318.s +++ /dev/null @@ -1,18 +0,0 @@ -glabel func_8006C318 -/* AE34B8 8006C318 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* AE34BC 8006C31C 3C050001 */ lui $a1, 1 -/* AE34C0 8006C320 AFBF0014 */ sw $ra, 0x14($sp) -/* AE34C4 8006C324 00A42821 */ addu $a1, $a1, $a0 -/* AE34C8 8006C328 8CA51E0C */ lw $a1, 0x1e0c($a1) -/* AE34CC 8006C32C 14A00003 */ bnez $a1, .L8006C33C -/* AE34D0 8006C330 00000000 */ nop -/* AE34D4 8006C334 10000003 */ b .L8006C344 -/* AE34D8 8006C338 00001025 */ move $v0, $zero -.L8006C33C: -/* AE34DC 8006C33C 0C01B03F */ jal func_8006C0FC -/* AE34E0 8006C340 00A02025 */ move $a0, $a1 -.L8006C344: -/* AE34E4 8006C344 8FBF0014 */ lw $ra, 0x14($sp) -/* AE34E8 8006C348 27BD0018 */ addiu $sp, $sp, 0x18 -/* AE34EC 8006C34C 03E00008 */ jr $ra -/* AE34F0 8006C350 00000000 */ nop diff --git a/asm/non_matchings/code/z_fcurve_data_skelanime/func_8006CBAC.s b/asm/non_matchings/code/z_fcurve_data_skelanime/func_8006CBAC.s index b65c3a62a9..7bbe931745 100644 --- a/asm/non_matchings/code/z_fcurve_data_skelanime/func_8006CBAC.s +++ b/asm/non_matchings/code/z_fcurve_data_skelanime/func_8006CBAC.s @@ -55,10 +55,10 @@ glabel func_8006CBAC /* AE3DB4 8006CC14 24C6BA58 */ addiu $a2, %lo(D_8013BA58) # addiu $a2, $a2, -0x45a8 /* AE3DB8 8006CC18 27A40080 */ addiu $a0, $sp, 0x80 /* AE3DBC 8006CC1C 24070117 */ li $a3, 279 -/* AE3DC0 8006CC20 0C031AB1 */ jal func_800C6AC4 +/* AE3DC0 8006CC20 0C031AB1 */ jal Graph_OpenDisps /* AE3DC4 8006CC24 00A08025 */ move $s0, $a1 /* AE3DC8 8006CC28 0C034213 */ jal Matrix_Push -/* AE3DCC 8006CC2C 00000000 */ nop +/* AE3DCC 8006CC2C 00000000 */ nop /* AE3DD0 8006CC30 8FB900A4 */ lw $t9, 0xa4($sp) /* AE3DD4 8006CC34 5320000A */ beql $t9, $zero, .L8006CC60 /* AE3DD8 8006CC38 8FA800A0 */ lw $t0, 0xa0($sp) @@ -90,13 +90,13 @@ glabel func_8006CBAC /* AE3E3C 8006CC9C E7A80074 */ swc1 $f8, 0x74($sp) /* AE3E40 8006CCA0 844DFFF6 */ lh $t5, -0xa($v0) /* AE3E44 8006CCA4 448D5000 */ mtc1 $t5, $f10 -/* AE3E48 8006CCA8 00000000 */ nop +/* AE3E48 8006CCA8 00000000 */ nop /* AE3E4C 8006CCAC 46805420 */ cvt.s.w $f16, $f10 /* AE3E50 8006CCB0 46008482 */ mul.s $f18, $f16, $f0 /* AE3E54 8006CCB4 E7B20078 */ swc1 $f18, 0x78($sp) /* AE3E58 8006CCB8 844EFFF8 */ lh $t6, -8($v0) /* AE3E5C 8006CCBC 448E2000 */ mtc1 $t6, $f4 -/* AE3E60 8006CCC0 00000000 */ nop +/* AE3E60 8006CCC0 00000000 */ nop /* AE3E64 8006CCC4 468021A0 */ cvt.s.w $f6, $f4 /* AE3E68 8006CCC8 46003202 */ mul.s $f8, $f6, $f0 /* AE3E6C 8006CCCC E7A8007C */ swc1 $f8, 0x7c($sp) @@ -108,19 +108,19 @@ glabel func_8006CBAC /* AE3E84 8006CCE4 A7B90070 */ sh $t9, 0x70($sp) /* AE3E88 8006CCE8 84480000 */ lh $t0, ($v0) /* AE3E8C 8006CCEC 44885000 */ mtc1 $t0, $f10 -/* AE3E90 8006CCF0 00000000 */ nop +/* AE3E90 8006CCF0 00000000 */ nop /* AE3E94 8006CCF4 46805420 */ cvt.s.w $f16, $f10 /* AE3E98 8006CCF8 E7B00060 */ swc1 $f16, 0x60($sp) /* AE3E9C 8006CCFC 844B0002 */ lh $t3, 2($v0) /* AE3EA0 8006CD00 448B9000 */ mtc1 $t3, $f18 -/* AE3EA4 8006CD04 00000000 */ nop +/* AE3EA4 8006CD04 00000000 */ nop /* AE3EA8 8006CD08 46809120 */ cvt.s.w $f4, $f18 /* AE3EAC 8006CD0C E7A40064 */ swc1 $f4, 0x64($sp) /* AE3EB0 8006CD10 844A0004 */ lh $t2, 4($v0) /* AE3EB4 8006CD14 448A3000 */ mtc1 $t2, $f6 -/* AE3EB8 8006CD18 00000000 */ nop +/* AE3EB8 8006CD18 00000000 */ nop /* AE3EBC 8006CD1C 46803220 */ cvt.s.w $f8, $f6 -/* AE3EC0 8006CD20 0C0344D0 */ jal func_800D1340 +/* AE3EC0 8006CD20 0C0344D0 */ jal Matrix_TranslateThenRotateZYX /* AE3EC4 8006CD24 E7A80068 */ swc1 $f8, 0x68($sp) /* AE3EC8 8006CD28 C7AC0074 */ lwc1 $f12, 0x74($sp) /* AE3ECC 8006CD2C C7AE0078 */ lwc1 $f14, 0x78($sp) @@ -238,7 +238,7 @@ glabel func_8006CBAC /* AE4074 8006CED4 8FA600A0 */ lw $a2, 0xa0($sp) /* AE4078 8006CED8 8FA700A4 */ lw $a3, 0xa4($sp) /* AE407C 8006CEDC 10A10007 */ beq $a1, $at, .L8006CEFC -/* AE4080 8006CEE0 00000000 */ nop +/* AE4080 8006CEE0 00000000 */ nop /* AE4084 8006CEE4 8FA900AC */ lw $t1, 0xac($sp) /* AE4088 8006CEE8 8FAD00B0 */ lw $t5, 0xb0($sp) /* AE408C 8006CEEC AFB00010 */ sw $s0, 0x10($sp) @@ -247,7 +247,7 @@ glabel func_8006CBAC /* AE4098 8006CEF8 AFAD0018 */ sw $t5, 0x18($sp) .L8006CEFC: /* AE409C 8006CEFC 0C034221 */ jal Matrix_Pull -/* AE40A0 8006CF00 00000000 */ nop +/* AE40A0 8006CF00 00000000 */ nop /* AE40A4 8006CF04 8FAE0094 */ lw $t6, 0x94($sp) /* AE40A8 8006CF08 240100FF */ li $at, 255 /* AE40AC 8006CF0C 8FA40098 */ lw $a0, 0x98($sp) @@ -268,11 +268,11 @@ glabel func_8006CBAC /* AE40E4 8006CF44 24C6BAFC */ addiu $a2, %lo(D_8013BAFC) # addiu $a2, $a2, -0x4504 /* AE40E8 8006CF48 27A40080 */ addiu $a0, $sp, 0x80 /* AE40EC 8006CF4C 24070173 */ li $a3, 371 -/* AE40F0 8006CF50 0C031AD5 */ jal func_800C6B54 +/* AE40F0 8006CF50 0C031AD5 */ jal Graph_CloseDisps /* AE40F4 8006CF54 8F250000 */ lw $a1, ($t9) /* AE40F8 8006CF58 8FBF002C */ lw $ra, 0x2c($sp) /* AE40FC 8006CF5C 8FB00028 */ lw $s0, 0x28($sp) /* AE4100 8006CF60 27BD0098 */ addiu $sp, $sp, 0x98 /* AE4104 8006CF64 03E00008 */ jr $ra -/* AE4108 8006CF68 00000000 */ nop +/* AE4108 8006CF68 00000000 */ nop diff --git a/asm/non_matchings/code/z_jpeg/func_8006DE30.s b/asm/non_matchings/code/z_jpeg/func_8006DE30.s index 8e679d77ac..84bfe49f78 100644 --- a/asm/non_matchings/code/z_jpeg/func_8006DE30.s +++ b/asm/non_matchings/code/z_jpeg/func_8006DE30.s @@ -25,10 +25,10 @@ glabel func_8006DE30 /* AE502C 8006DE8C 3C018012 */ lui $at, %hi(D_8011FA64) # $at, 0x8012 /* AE5030 8006DE90 AC20FA64 */ sw $zero, %lo(D_8011FA64)($at) /* AE5034 8006DE94 AFA40028 */ sw $a0, 0x28($sp) -/* AE5038 8006DE98 0C034B7C */ jal func_800D2DF0 +/* AE5038 8006DE98 0C034B7C */ jal SysUcode_GetUCodeBoot /* AE503C 8006DE9C AFA30024 */ sw $v1, 0x24($sp) /* AE5040 8006DEA0 3C018012 */ lui $at, %hi(D_8011FA68) # $at, 0x8012 -/* AE5044 8006DEA4 0C034B7F */ jal func_800D2DFC +/* AE5044 8006DEA4 0C034B7F */ jal SysUcode_GetUcodeBootSize /* AE5048 8006DEA8 AC22FA68 */ sw $v0, %lo(D_8011FA68)($at) /* AE504C 8006DEAC 8FA30024 */ lw $v1, 0x24($sp) /* AE5050 8006DEB0 8FA70028 */ lw $a3, 0x28($sp) diff --git a/asm/non_matchings/code/z_jpeg/func_8006E418.s b/asm/non_matchings/code/z_jpeg/func_8006E418.s index ca42877a75..09a98ffa82 100644 --- a/asm/non_matchings/code/z_jpeg/func_8006E418.s +++ b/asm/non_matchings/code/z_jpeg/func_8006E418.s @@ -96,7 +96,7 @@ glabel func_8006E418 /* AE5620 8006E480 27A502B8 */ addiu $a1, $sp, 0x2b8 /* AE5624 8006E484 0C001874 */ jal osCreateMesgQueue /* AE5628 8006E488 24060001 */ li $a2, 1 -/* AE562C 8006E48C 0C01EFC4 */ jal func_8007BF10 +/* AE562C 8006E48C 0C01EFC4 */ jal MsgEvent_SendNullTask /* AE5630 8006E490 00000000 */ nop /* AE5634 8006E494 0C001A78 */ jal osGetTime /* AE5638 8006E498 00000000 */ nop diff --git a/asm/non_matchings/code/z_kankyo/func_80070C24.s b/asm/non_matchings/code/z_kankyo/func_80070C24.s index 61b0b48b9b..f99ae72e8a 100644 --- a/asm/non_matchings/code/z_kankyo/func_80070C24.s +++ b/asm/non_matchings/code/z_kankyo/func_80070C24.s @@ -236,11 +236,11 @@ glabel func_80070C24 /* AE8114 80070F74 8F250000 */ lw $a1, ($t9) /* AE8118 80070F78 E7AE0088 */ swc1 $f14, 0x88($sp) /* AE811C 80070F7C AFAA007C */ sw $t2, 0x7c($sp) -/* AE8120 80070F80 0C031AB1 */ jal func_800C6AC4 +/* AE8120 80070F80 0C031AB1 */ jal Graph_OpenDisps /* AE8124 80070F84 AFA5006C */ sw $a1, 0x6c($sp) /* AE8128 80070F88 8FAF006C */ lw $t7, 0x6c($sp) /* AE812C 80070F8C 8DE402C0 */ lw $a0, 0x2c0($t7) -/* AE8130 80070F90 0C031B08 */ jal func_800C6C20 +/* AE8130 80070F90 0C031B08 */ jal Graph_GfxPlusOne /* AE8134 80070F94 AFA40070 */ sw $a0, 0x70($sp) /* AE8138 80070F98 8FA6006C */ lw $a2, 0x6c($sp) /* AE813C 80070F9C AFA20074 */ sw $v0, 0x74($sp) @@ -269,7 +269,7 @@ glabel func_80070C24 /* AE8198 80070FF8 8FA50074 */ lw $a1, 0x74($sp) /* AE819C 80070FFC 8FA40070 */ lw $a0, 0x70($sp) /* AE81A0 80071000 AFAA007C */ sw $t2, 0x7c($sp) -/* AE81A4 80071004 0C031B0A */ jal func_800C6C28 +/* AE81A4 80071004 0C031B0A */ jal Graph_BranchDlist /* AE81A8 80071008 E7AE0088 */ swc1 $f14, 0x88($sp) /* AE81AC 8007100C 8FB90074 */ lw $t9, 0x74($sp) /* AE81B0 80071010 8FAF006C */ lw $t7, 0x6c($sp) @@ -283,7 +283,7 @@ glabel func_80070C24 /* AE81D0 80071030 27A4005C */ addiu $a0, $sp, 0x5c /* AE81D4 80071034 2407069A */ li $a3, 1690 /* AE81D8 80071038 AFAA007C */ sw $t2, 0x7c($sp) -/* AE81DC 8007103C 0C031AD5 */ jal func_800C6B54 +/* AE81DC 8007103C 0C031AD5 */ jal Graph_CloseDisps /* AE81E0 80071040 E7AE0088 */ swc1 $f14, 0x88($sp) /* AE81E4 80071044 3C0B8016 */ lui $t3, %hi(gGameInfo) # $t3, 0x8016 /* AE81E8 80071048 3C0D8016 */ lui $t5, %hi(gSaveContext) # $t5, 0x8016 diff --git a/asm/non_matchings/code/z_kankyo/func_800730DC.s b/asm/non_matchings/code/z_kankyo/func_800730DC.s index c17e2934ff..9f955639d7 100644 --- a/asm/non_matchings/code/z_kankyo/func_800730DC.s +++ b/asm/non_matchings/code/z_kankyo/func_800730DC.s @@ -9,7 +9,7 @@ glabel func_800730DC /* AEA298 800730F8 24C6C55C */ addiu $a2, %lo(D_8013C55C) # addiu $a2, $a2, -0x3aa4 /* AEA29C 800730FC 27A40060 */ addiu $a0, $sp, 0x60 /* AEA2A0 80073100 240708DA */ li $a3, 2266 -/* AEA2A4 80073104 0C031AB1 */ jal func_800C6AC4 +/* AEA2A4 80073104 0C031AB1 */ jal Graph_OpenDisps /* AEA2A8 80073108 00A08025 */ move $s0, $a1 /* AEA2AC 8007310C 922E1D6C */ lbu $t6, 0x1d6c($s1) /* AEA2B0 80073110 3C028016 */ lui $v0, %hi(gSaveContext+0xc) @@ -572,7 +572,7 @@ glabel func_800730DC /* AEAB00 80073960 24C6C58C */ addiu $a2, %lo(D_8013C58C) # addiu $a2, $a2, -0x3a74 /* AEAB04 80073964 27A40060 */ addiu $a0, $sp, 0x60 /* AEAB08 80073968 8E250000 */ lw $a1, ($s1) -/* AEAB0C 8007396C 0C031AD5 */ jal func_800C6B54 +/* AEAB0C 8007396C 0C031AD5 */ jal Graph_CloseDisps /* AEAB10 80073970 2407097D */ li $a3, 2429 /* AEAB14 80073974 8FBF0024 */ lw $ra, 0x24($sp) /* AEAB18 80073978 8FB0001C */ lw $s0, 0x1c($sp) diff --git a/asm/non_matchings/code/z_kankyo/func_80073A5C.s b/asm/non_matchings/code/z_kankyo/func_80073A5C.s index e62a1f0225..f898aedd7b 100644 --- a/asm/non_matchings/code/z_kankyo/func_80073A5C.s +++ b/asm/non_matchings/code/z_kankyo/func_80073A5C.s @@ -68,7 +68,7 @@ glabel func_80073A5C /* AEACFC 80073B5C 27A400B4 */ addiu $a0, $sp, 0xb4 /* AEAD00 80073B60 02002825 */ move $a1, $s0 /* AEAD04 80073B64 240709D4 */ li $a3, 2516 -/* AEAD08 80073B68 0C031AB1 */ jal func_800C6AC4 +/* AEAD08 80073B68 0C031AB1 */ jal Graph_OpenDisps /* AEAD0C 80073B6C AF090000 */ sw $t1, ($t8) /* AEAD10 80073B70 27A401C0 */ addiu $a0, $sp, 0x1c0 /* AEAD14 80073B74 0C032D9E */ jal func_800CB678 @@ -829,7 +829,7 @@ glabel func_80073A5C /* AEB840 800746A0 24C6C5BC */ addiu $a2, %lo(D_8013C5BC) # addiu $a2, $a2, -0x3a44 /* AEB844 800746A4 27A400B4 */ addiu $a0, $sp, 0xb4 /* AEB848 800746A8 02002825 */ move $a1, $s0 -/* AEB84C 800746AC 0C031AD5 */ jal func_800C6B54 +/* AEB84C 800746AC 0C031AD5 */ jal Graph_CloseDisps /* AEB850 800746B0 24070ABE */ li $a3, 2750 /* AEB854 800746B4 8FBF004C */ lw $ra, 0x4c($sp) /* AEB858 800746B8 D7B40020 */ ldc1 $f20, 0x20($sp) diff --git a/asm/non_matchings/code/z_kankyo/func_80074704.s b/asm/non_matchings/code/z_kankyo/func_80074704.s index fad4e823c3..4175edb51c 100644 --- a/asm/non_matchings/code/z_kankyo/func_80074704.s +++ b/asm/non_matchings/code/z_kankyo/func_80074704.s @@ -50,7 +50,7 @@ glabel func_80074704 /* AEB964 800747C4 15E00136 */ bnez $t7, .L80074CA0 /* AEB968 800747C8 27A400B8 */ addiu $a0, $sp, 0xb8 /* AEB96C 800747CC 24C6C5CC */ addiu $a2, %lo(D_8013C5CC) # addiu $a2, $a2, -0x3a34 -/* AEB970 800747D0 0C031AB1 */ jal func_800C6AC4 +/* AEB970 800747D0 0C031AB1 */ jal Graph_OpenDisps /* AEB974 800747D4 24070AEF */ li $a3, 2799 /* AEB978 800747D8 C6C20028 */ lwc1 $f2, 0x28($s6) /* AEB97C 800747DC C6C40034 */ lwc1 $f4, 0x34($s6) @@ -108,7 +108,7 @@ glabel func_80074704 /* AEBA4C 800748AC AE2802D0 */ sw $t0, 0x2d0($s1) /* AEBA50 800748B0 AC4A0004 */ sw $t2, 4($v0) /* AEBA54 800748B4 AC490000 */ sw $t1, ($v0) -/* AEBA58 800748B8 0C024DDD */ jal func_80093774 +/* AEBA58 800748B8 0C024DDD */ jal Gfx_CallSetupDL /* AEBA5C 800748BC 8E2402D0 */ lw $a0, 0x2d0($s1) /* AEBA60 800748C0 AE2202D0 */ sw $v0, 0x2d0($s1) /* AEBA64 800748C4 92830B13 */ lbu $v1, 0xb13($s4) @@ -367,7 +367,7 @@ glabel func_80074704 /* AEBE2C 80074C8C 24C6C5FC */ addiu $a2, %lo(D_8013C5FC) # addiu $a2, $a2, -0x3a04 /* AEBE30 80074C90 27A400B8 */ addiu $a0, $sp, 0xb8 /* AEBE34 80074C94 02202825 */ move $a1, $s1 -/* AEBE38 80074C98 0C031AD5 */ jal func_800C6B54 +/* AEBE38 80074C98 0C031AD5 */ jal Graph_CloseDisps /* AEBE3C 80074C9C 24070B82 */ li $a3, 2946 .L80074CA0: /* AEBE40 80074CA0 8FBF006C */ lw $ra, 0x6c($sp) diff --git a/asm/non_matchings/code/z_kankyo/func_80074D6C.s b/asm/non_matchings/code/z_kankyo/func_80074D6C.s index 5a7fe47b01..97e8f62036 100644 --- a/asm/non_matchings/code/z_kankyo/func_80074D6C.s +++ b/asm/non_matchings/code/z_kankyo/func_80074D6C.s @@ -22,7 +22,7 @@ glabel func_80074D6C /* AEBF54 80074DB4 AFA90028 */ sw $t1, 0x28($sp) /* AEBF58 80074DB8 27A40050 */ addiu $a0, $sp, 0x50 /* AEBF5C 80074DBC 24070BD8 */ li $a3, 3032 -/* AEBF60 80074DC0 0C031AB1 */ jal func_800C6AC4 +/* AEBF60 80074DC0 0C031AB1 */ jal Graph_OpenDisps /* AEBF64 80074DC4 AFA50060 */ sw $a1, 0x60($sp) /* AEBF68 80074DC8 0C024E2D */ jal func_800938B4 /* AEBF6C 80074DCC 8E040000 */ lw $a0, ($s0) @@ -117,7 +117,7 @@ glabel func_80074D6C /* AEC0BC 80074F1C AC600004 */ sw $zero, 4($v1) /* AEC0C0 80074F20 AC6B0000 */ sw $t3, ($v1) /* AEC0C4 80074F24 8E050000 */ lw $a1, ($s0) -/* AEC0C8 80074F28 0C031AD5 */ jal func_800C6B54 +/* AEC0C8 80074F28 0C031AD5 */ jal Graph_CloseDisps /* AEC0CC 80074F2C AFA90028 */ sw $t1, 0x28($sp) /* AEC0D0 80074F30 8FA90028 */ lw $t1, 0x28($sp) /* AEC0D4 80074F34 912E0B0D */ lbu $t6, 0xb0d($t1) @@ -129,7 +129,7 @@ glabel func_80074D6C /* AEC0E8 80074F48 8E050000 */ lw $a1, ($s0) /* AEC0EC 80074F4C AFA90028 */ sw $t1, 0x28($sp) /* AEC0F0 80074F50 24070BE8 */ li $a3, 3048 -/* AEC0F4 80074F54 0C031AB1 */ jal func_800C6AC4 +/* AEC0F4 80074F54 0C031AB1 */ jal Graph_OpenDisps /* AEC0F8 80074F58 AFA50044 */ sw $a1, 0x44($sp) /* AEC0FC 80074F5C 0C024E2D */ jal func_800938B4 /* AEC100 80074F60 8E040000 */ lw $a0, ($s0) @@ -162,7 +162,7 @@ glabel func_80074D6C /* AEC16C 80074FCC AC6E0000 */ sw $t6, ($v1) /* AEC170 80074FD0 8E050000 */ lw $a1, ($s0) /* AEC174 80074FD4 27A40034 */ addiu $a0, $sp, 0x34 -/* AEC178 80074FD8 0C031AD5 */ jal func_800C6B54 +/* AEC178 80074FD8 0C031AD5 */ jal Graph_CloseDisps /* AEC17C 80074FDC 24070BF0 */ li $a3, 3056 .L80074FE0: /* AEC180 80074FE0 8FBF001C */ lw $ra, 0x1c($sp) diff --git a/asm/non_matchings/code/z_kankyo/func_80074FF4.s b/asm/non_matchings/code/z_kankyo/func_80074FF4.s index 724f06cc96..f9afc06f76 100644 --- a/asm/non_matchings/code/z_kankyo/func_80074FF4.s +++ b/asm/non_matchings/code/z_kankyo/func_80074FF4.s @@ -10,7 +10,7 @@ glabel func_80074FF4 /* AEC1B4 80075014 24C6C64C */ addiu $a2, %lo(D_8013C64C) # addiu $a2, $a2, -0x39b4 /* AEC1B8 80075018 27A40024 */ addiu $a0, $sp, 0x24 /* AEC1BC 8007501C 24070BFD */ li $a3, 3069 -/* AEC1C0 80075020 0C031AB1 */ jal func_800C6AC4 +/* AEC1C0 80075020 0C031AB1 */ jal Graph_OpenDisps /* AEC1C4 80075024 AFA50034 */ sw $a1, 0x34($sp) /* AEC1C8 80075028 8FAF0038 */ lw $t7, 0x38($sp) /* AEC1CC 8007502C 0C024E2D */ jal func_800938B4 @@ -44,7 +44,7 @@ glabel func_80074FF4 /* AEC23C 8007509C AC780000 */ sw $t8, ($v1) /* AEC240 800750A0 8FB90038 */ lw $t9, 0x38($sp) /* AEC244 800750A4 24070C07 */ li $a3, 3079 -/* AEC248 800750A8 0C031AD5 */ jal func_800C6B54 +/* AEC248 800750A8 0C031AD5 */ jal Graph_CloseDisps /* AEC24C 800750AC 8F250000 */ lw $a1, ($t9) /* AEC250 800750B0 8FBF0014 */ lw $ra, 0x14($sp) /* AEC254 800750B4 27BD0038 */ addiu $sp, $sp, 0x38 diff --git a/asm/non_matchings/code/z_kankyo/func_8007542C.s b/asm/non_matchings/code/z_kankyo/func_8007542C.s index ce5ff06bc3..cfcabfb81a 100644 --- a/asm/non_matchings/code/z_kankyo/func_8007542C.s +++ b/asm/non_matchings/code/z_kankyo/func_8007542C.s @@ -40,7 +40,7 @@ glabel func_8007542C /* AEC664 800754C4 24C6C66C */ addiu $a2, %lo(D_8013C66C) # addiu $a2, $a2, -0x3994 /* AEC668 800754C8 27A40098 */ addiu $a0, $sp, 0x98 /* AEC66C 800754CC 24070CB5 */ li $a3, 3253 -/* AEC670 800754D0 0C031AB1 */ jal func_800C6AC4 +/* AEC670 800754D0 0C031AB1 */ jal Graph_OpenDisps /* AEC674 800754D4 00A09025 */ move $s2, $a1 /* AEC678 800754D8 3C018014 */ lui $at, %hi(D_8013C800) /* AEC67C 800754DC C43EC800 */ lwc1 $f30, %lo(D_8013C800)($at) @@ -277,7 +277,7 @@ glabel func_8007542C /* AEC9F4 80075854 24C6C68C */ addiu $a2, %lo(D_8013C68C) # addiu $a2, $a2, -0x3974 /* AEC9F8 80075858 27A40098 */ addiu $a0, $sp, 0x98 /* AEC9FC 8007585C 8E650000 */ lw $a1, ($s3) -/* AECA00 80075860 0C031AD5 */ jal func_800C6B54 +/* AECA00 80075860 0C031AD5 */ jal Graph_CloseDisps /* AECA04 80075864 24070D19 */ li $a3, 3353 /* AECA08 80075868 8FBF0064 */ lw $ra, 0x64($sp) /* AECA0C 8007586C D7B40010 */ ldc1 $f20, 0x10($sp) diff --git a/asm/non_matchings/code/z_kankyo/func_8007672C.s b/asm/non_matchings/code/z_kankyo/func_8007672C.s index 25aaf51c04..ebbfc930ca 100644 --- a/asm/non_matchings/code/z_kankyo/func_8007672C.s +++ b/asm/non_matchings/code/z_kankyo/func_8007672C.s @@ -12,7 +12,7 @@ glabel func_8007672C /* AED8F4 80076754 24C6C750 */ addiu $a2, %lo(D_8013C750) # addiu $a2, $a2, -0x38b0 /* AED8F8 80076758 27A4004C */ addiu $a0, $sp, 0x4c /* AED8FC 8007675C 02002825 */ move $a1, $s0 -/* AED900 80076760 0C031AB1 */ jal func_800C6AC4 +/* AED900 80076760 0C031AB1 */ jal Graph_OpenDisps /* AED904 80076764 24070EFB */ li $a3, 3835 /* AED908 80076768 93A50077 */ lbu $a1, 0x77($sp) /* AED90C 8007676C 30AF0001 */ andi $t7, $a1, 1 @@ -125,7 +125,7 @@ glabel func_8007672C /* AEDAAC 8007690C 24C6C760 */ addiu $a2, %lo(D_8013C760) # addiu $a2, $a2, -0x38a0 /* AEDAB0 80076910 27A4004C */ addiu $a0, $sp, 0x4c /* AEDAB4 80076914 02002825 */ move $a1, $s0 -/* AEDAB8 80076918 0C031AD5 */ jal func_800C6B54 +/* AEDAB8 80076918 0C031AD5 */ jal Graph_CloseDisps /* AEDABC 8007691C 24070F17 */ li $a3, 3863 .L80076920: /* AEDAC0 80076920 8FBF001C */ lw $ra, 0x1c($sp) diff --git a/asm/non_matchings/code/z_kankyo/func_80076934.s b/asm/non_matchings/code/z_kankyo/func_80076934.s index 16584a720a..fda95ecc31 100644 --- a/asm/non_matchings/code/z_kankyo/func_80076934.s +++ b/asm/non_matchings/code/z_kankyo/func_80076934.s @@ -591,7 +591,7 @@ glabel func_80076934 /* AEE330 80077190 A3AB00A2 */ sb $t3, 0xa2($sp) /* AEE334 80077194 A3AA00A1 */ sb $t2, 0xa1($sp) /* AEE338 80077198 A3A900A0 */ sb $t1, 0xa0($sp) -/* AEE33C 8007719C 0C031AB1 */ jal func_800C6AC4 +/* AEE33C 8007719C 0C031AB1 */ jal Graph_OpenDisps /* AEE340 800771A0 AFA5008C */ sw $a1, 0x8c($sp) /* AEE344 800771A4 8FA3008C */ lw $v1, 0x8c($sp) /* AEE348 800771A8 0C024FCD */ jal func_80093F34 @@ -681,7 +681,7 @@ glabel func_80076934 /* AEE498 800772F8 AFA3008C */ sw $v1, 0x8c($sp) /* AEE49C 800772FC E7AE0098 */ swc1 $f14, 0x98($sp) /* AEE4A0 80077300 AFA20068 */ sw $v0, 0x68($sp) -/* AEE4A4 80077304 0C0253D0 */ jal Draw_TwoTexScroll +/* AEE4A4 80077304 0C0253D0 */ jal Gfx_TwoTexScroll /* AEE4A8 80077308 30C60FFF */ andi $a2, $a2, 0xfff /* AEE4AC 8007730C 8FA80068 */ lw $t0, 0x68($sp) /* AEE4B0 80077310 8FA3008C */ lw $v1, 0x8c($sp) @@ -708,7 +708,7 @@ glabel func_80076934 /* AEE504 80077364 8F250000 */ lw $a1, ($t9) /* AEE508 80077368 27A4007C */ addiu $a0, $sp, 0x7c /* AEE50C 8007736C 24070FE4 */ li $a3, 4068 -/* AEE510 80077370 0C031AD5 */ jal func_800C6B54 +/* AEE510 80077370 0C031AD5 */ jal Graph_CloseDisps /* AEE514 80077374 E7AE0098 */ swc1 $f14, 0x98($sp) /* AEE518 80077378 C7AE0098 */ lwc1 $f14, 0x98($sp) /* AEE51C 8007737C 3C028016 */ lui $v0, %hi(D_8015FDB0) # $v0, 0x8016 diff --git a/asm/non_matchings/code/z_lib/Lib_MemSet.s b/asm/non_matchings/code/z_lib/Lib_MemSet.s deleted file mode 100644 index 94e04c8ff1..0000000000 --- a/asm/non_matchings/code/z_lib/Lib_MemSet.s +++ /dev/null @@ -1,26 +0,0 @@ -glabel Lib_MemSet -/* AEE980 800777E0 AFA60008 */ sw $a2, 8($sp) -/* AEE984 800777E4 30C600FF */ andi $a2, $a2, 0xff -/* AEE988 800777E8 10A00010 */ beqz $a1, .L8007782C -/* AEE98C 800777EC 00001025 */ move $v0, $zero -/* AEE990 800777F0 30A70003 */ andi $a3, $a1, 3 -/* AEE994 800777F4 10E00006 */ beqz $a3, .L80077810 -/* AEE998 800777F8 00E01825 */ move $v1, $a3 -.L800777FC: -/* AEE99C 800777FC 24420001 */ addiu $v0, $v0, 1 -/* AEE9A0 80077800 A0860000 */ sb $a2, ($a0) -/* AEE9A4 80077804 1462FFFD */ bne $v1, $v0, .L800777FC -/* AEE9A8 80077808 24840001 */ addiu $a0, $a0, 1 -/* AEE9AC 8007780C 10450007 */ beq $v0, $a1, .L8007782C -.L80077810: -/* AEE9B0 80077810 24420004 */ addiu $v0, $v0, 4 -/* AEE9B4 80077814 A0860000 */ sb $a2, ($a0) -/* AEE9B8 80077818 A0860001 */ sb $a2, 1($a0) -/* AEE9BC 8007781C A0860002 */ sb $a2, 2($a0) -/* AEE9C0 80077820 A0860003 */ sb $a2, 3($a0) -/* AEE9C4 80077824 1445FFFA */ bne $v0, $a1, .L80077810 -/* AEE9C8 80077828 24840004 */ addiu $a0, $a0, 4 -.L8007782C: -/* AEE9CC 8007782C 03E00008 */ jr $ra -/* AEE9D0 80077830 00000000 */ nop - diff --git a/asm/non_matchings/code/z_lib/Math_SmoothScaleMaxMinS.s b/asm/non_matchings/code/z_lib/Math_SmoothScaleMaxMinS.s deleted file mode 100644 index d28d2a5fe2..0000000000 --- a/asm/non_matchings/code/z_lib/Math_SmoothScaleMaxMinS.s +++ /dev/null @@ -1,82 +0,0 @@ -glabel Math_SmoothScaleMaxMinS -/* AEF83C 8007869C AFA50004 */ sw $a1, 4($sp) -/* AEF840 800786A0 AFA60008 */ sw $a2, 8($sp) -/* AEF844 800786A4 AFA7000C */ sw $a3, 0xc($sp) -/* AEF848 800786A8 84880000 */ lh $t0, ($a0) -/* AEF84C 800786AC 00052C00 */ sll $a1, $a1, 0x10 -/* AEF850 800786B0 00052C03 */ sra $a1, $a1, 0x10 -/* AEF854 800786B4 00A81823 */ subu $v1, $a1, $t0 -/* AEF858 800786B8 00063400 */ sll $a2, $a2, 0x10 -/* AEF85C 800786BC 00031C00 */ sll $v1, $v1, 0x10 -/* AEF860 800786C0 00063403 */ sra $a2, $a2, 0x10 -/* AEF864 800786C4 10A8003B */ beq $a1, $t0, .L800787B4 -/* AEF868 800786C8 00031C03 */ sra $v1, $v1, 0x10 -/* AEF86C 800786CC 0066001A */ div $zero, $v1, $a2 -/* AEF870 800786D0 87A90012 */ lh $t1, 0x12($sp) -/* AEF874 800786D4 14C00002 */ bnez $a2, .L800786E0 -/* AEF878 800786D8 00000000 */ nop -/* AEF87C 800786DC 0007000D */ break 7 -.L800786E0: -/* AEF880 800786E0 2401FFFF */ li $at, -1 -/* AEF884 800786E4 14C10004 */ bne $a2, $at, .L800786F8 -/* AEF888 800786E8 3C018000 */ lui $at, 0x8000 -/* AEF88C 800786EC 14610002 */ bne $v1, $at, .L800786F8 -/* AEF890 800786F0 00000000 */ nop -/* AEF894 800786F4 0006000D */ break 6 -.L800786F8: -/* AEF898 800786F8 00003812 */ mflo $a3 -/* AEF89C 800786FC 00075400 */ sll $t2, $a3, 0x10 -/* AEF8A0 80078700 000A5403 */ sra $t2, $t2, 0x10 -/* AEF8A4 80078704 00071400 */ sll $v0, $a3, 0x10 -/* AEF8A8 80078708 012A082A */ slt $at, $t1, $t2 -/* AEF8AC 8007870C 14200005 */ bnez $at, .L80078724 -/* AEF8B0 80078710 00021403 */ sra $v0, $v0, 0x10 -/* AEF8B4 80078714 00097023 */ negu $t6, $t1 -/* AEF8B8 80078718 014E082A */ slt $at, $t2, $t6 -/* AEF8BC 8007871C 10200010 */ beqz $at, .L80078760 -/* AEF8C0 80078720 00000000 */ nop -.L80078724: -/* AEF8C4 80078724 87AF000E */ lh $t7, 0xe($sp) -/* AEF8C8 80078728 87A5000E */ lh $a1, 0xe($sp) -/* AEF8CC 8007872C 01EA082A */ slt $at, $t7, $t2 -/* AEF8D0 80078730 10200002 */ beqz $at, .L8007873C -/* AEF8D4 80078734 00052823 */ negu $a1, $a1 -/* AEF8D8 80078738 01E01025 */ move $v0, $t7 -.L8007873C: -/* AEF8DC 8007873C 0045082A */ slt $at, $v0, $a1 -/* AEF8E0 80078740 50200004 */ beql $at, $zero, .L80078754 -/* AEF8E4 80078744 0102C021 */ addu $t8, $t0, $v0 -/* AEF8E8 80078748 00051400 */ sll $v0, $a1, 0x10 -/* AEF8EC 8007874C 00021403 */ sra $v0, $v0, 0x10 -/* AEF8F0 80078750 0102C021 */ addu $t8, $t0, $v0 -.L80078754: -/* AEF8F4 80078754 A4980000 */ sh $t8, ($a0) -/* AEF8F8 80078758 03E00008 */ jr $ra -/* AEF8FC 8007875C 00601025 */ move $v0, $v1 -.L80078760: -/* AEF900 80078760 0460000C */ bltz $v1, .L80078794 -/* AEF904 80078764 01097823 */ subu $t7, $t0, $t1 -/* AEF908 80078768 0109C821 */ addu $t9, $t0, $t1 -/* AEF90C 8007876C A4990000 */ sh $t9, ($a0) -/* AEF910 80078770 848B0000 */ lh $t3, ($a0) -/* AEF914 80078774 00601025 */ move $v0, $v1 -/* AEF918 80078778 00AB6023 */ subu $t4, $a1, $t3 -/* AEF91C 8007877C 000C6C00 */ sll $t5, $t4, 0x10 -/* AEF920 80078780 000D7403 */ sra $t6, $t5, 0x10 -/* AEF924 80078784 1DC0000B */ bgtz $t6, .L800787B4 -/* AEF928 80078788 00000000 */ nop -/* AEF92C 8007878C 03E00008 */ jr $ra -/* AEF930 80078790 A4850000 */ sh $a1, ($a0) -.L80078794: -/* AEF934 80078794 A48F0000 */ sh $t7, ($a0) -/* AEF938 80078798 84980000 */ lh $t8, ($a0) -/* AEF93C 8007879C 00B8C823 */ subu $t9, $a1, $t8 -/* AEF940 800787A0 00195C00 */ sll $t3, $t9, 0x10 -/* AEF944 800787A4 000B6403 */ sra $t4, $t3, 0x10 -/* AEF948 800787A8 05800002 */ bltz $t4, .L800787B4 -/* AEF94C 800787AC 00000000 */ nop -/* AEF950 800787B0 A4850000 */ sh $a1, ($a0) -.L800787B4: -/* AEF954 800787B4 03E00008 */ jr $ra -/* AEF958 800787B8 00601025 */ move $v0, $v1 - diff --git a/asm/non_matchings/code/z_lights/func_80079EFC.s b/asm/non_matchings/code/z_lights/func_80079EFC.s index 86d869c50a..6d9f00f941 100644 --- a/asm/non_matchings/code/z_lights/func_80079EFC.s +++ b/asm/non_matchings/code/z_lights/func_80079EFC.s @@ -18,7 +18,7 @@ glabel func_80079EFC /* AF10B4 80079F14 00A08025 */ move $s0, $a1 /* AF10B8 80079F18 24C6C8A0 */ addiu $a2, %lo(D_8013C8A0) # addiu $a2, $a2, -0x3760 /* AF10BC 80079F1C 27A4004C */ addiu $a0, $sp, 0x4c -/* AF10C0 80079F20 0C031AB1 */ jal func_800C6AC4 +/* AF10C0 80079F20 0C031AB1 */ jal Graph_OpenDisps /* AF10C4 80079F24 24070153 */ li $a3, 339 /* AF10C8 80079F28 8E0302C0 */ lw $v1, 0x2c0($s0) /* AF10CC 80079F2C 3C04DB02 */ lui $a0, 0xdb02 @@ -104,7 +104,7 @@ glabel func_80079EFC /* AF11FC 8007A05C 3C068014 */ lui $a2, %hi(D_8013C8B0) # $a2, 0x8014 /* AF1200 8007A060 AC640004 */ sw $a0, 4($v1) /* AF1204 8007A064 27A4004C */ addiu $a0, $sp, 0x4c -/* AF1208 8007A068 0C031AD5 */ jal func_800C6B54 +/* AF1208 8007A068 0C031AD5 */ jal Graph_CloseDisps /* AF120C 8007A06C 24C6C8B0 */ addiu $a2, %lo(D_8013C8B0) # addiu $a2, $a2, -0x3750 /* AF1210 8007A070 8FBF001C */ lw $ra, 0x1c($sp) /* AF1214 8007A074 8FB00014 */ lw $s0, 0x14($sp) diff --git a/asm/non_matchings/code/z_lights/func_8007ABBC.s b/asm/non_matchings/code/z_lights/func_8007ABBC.s index 08643edfd6..06c6a7433f 100644 --- a/asm/non_matchings/code/z_lights/func_8007ABBC.s +++ b/asm/non_matchings/code/z_lights/func_8007ABBC.s @@ -38,7 +38,7 @@ glabel func_8007ABBC /* AF1DA4 8007AC04 AFB000B0 */ sw $s0, 0xb0($sp) /* AF1DA8 8007AC08 27A40094 */ addiu $a0, $sp, 0x94 /* AF1DAC 8007AC0C 24070377 */ li $a3, 887 -/* AF1DB0 8007AC10 0C031AB1 */ jal func_800C6AC4 +/* AF1DB0 8007AC10 0C031AB1 */ jal Graph_OpenDisps /* AF1DB4 8007AC14 00A08825 */ move $s1, $a1 /* AF1DB8 8007AC18 8E2702D0 */ lw $a3, 0x2d0($s1) /* AF1DBC 8007AC1C 24EE0008 */ addiu $t6, $a3, 8 @@ -150,7 +150,7 @@ glabel func_8007ABBC /* AF1F58 8007ADB8 24C6C8E0 */ addiu $a2, %lo(D_8013C8E0) # addiu $a2, $a2, -0x3720 /* AF1F5C 8007ADBC 27A40094 */ addiu $a0, $sp, 0x94 /* AF1F60 8007ADC0 2407039F */ li $a3, 927 -/* AF1F64 8007ADC4 0C031AD5 */ jal func_800C6B54 +/* AF1F64 8007ADC4 0C031AD5 */ jal Graph_CloseDisps /* AF1F68 8007ADC8 8D850000 */ lw $a1, ($t4) /* AF1F6C 8007ADCC 8FBF004C */ lw $ra, 0x4c($sp) /* AF1F70 8007ADD0 D7B40018 */ ldc1 $f20, 0x18($sp) diff --git a/asm/non_matchings/code/z_map_exp/Interface_DrawMinimap.s b/asm/non_matchings/code/z_map_exp/Interface_DrawMinimap.s index 19968b867b..830db67c18 100644 --- a/asm/non_matchings/code/z_map_exp/Interface_DrawMinimap.s +++ b/asm/non_matchings/code/z_map_exp/Interface_DrawMinimap.s @@ -59,7 +59,7 @@ glabel Interface_DrawMinimap /* AF88A0 80081700 24C6D958 */ addiu $a2, %lo(D_8013D958) # addiu $a2, $a2, -0x26a8 /* AF88A4 80081704 27A400EC */ addiu $a0, $sp, 0xec /* AF88A8 80081708 24070272 */ li $a3, 626 -/* AF88AC 8008170C 0C031AB1 */ jal func_800C6AC4 +/* AF88AC 8008170C 0C031AB1 */ jal Graph_OpenDisps /* AF88B0 80081710 AFA500FC */ sw $a1, 0xfc($sp) /* AF88B4 80081714 8FB80110 */ lw $t8, 0x110($sp) /* AF88B8 80081718 3C190001 */ lui $t9, 1 @@ -798,7 +798,7 @@ glabel L80081AA0 /* AF93C4 80082224 24C6D988 */ addiu $a2, %lo(D_8013D988) # addiu $a2, $a2, -0x2678 /* AF93C8 80082228 27A400EC */ addiu $a0, $sp, 0xec /* AF93CC 8008222C 2407030E */ li $a3, 782 -/* AF93D0 80082230 0C031AD5 */ jal func_800C6B54 +/* AF93D0 80082230 0C031AD5 */ jal Graph_CloseDisps /* AF93D4 80082234 8DE50000 */ lw $a1, ($t7) /* AF93D8 80082238 8FBF001C */ lw $ra, 0x1c($sp) /* AF93DC 8008223C 27BD0110 */ addiu $sp, $sp, 0x110 diff --git a/asm/non_matchings/code/z_map_exp/func_80081240.s b/asm/non_matchings/code/z_map_exp/func_80081240.s index 415a87f32e..662f8a4cd5 100644 --- a/asm/non_matchings/code/z_map_exp/func_80081240.s +++ b/asm/non_matchings/code/z_map_exp/func_80081240.s @@ -35,7 +35,7 @@ glabel func_80081240 /* AF8400 80081260 8C850000 */ lw $a1, ($a0) /* AF8404 80081264 27A40050 */ addiu $a0, $sp, 0x50 /* AF8408 80081268 24070235 */ li $a3, 565 -/* AF840C 8008126C 0C031AB1 */ jal func_800C6AC4 +/* AF840C 8008126C 0C031AB1 */ jal Graph_OpenDisps /* AF8410 80081270 00A08025 */ move $s0, $a1 /* AF8414 80081274 8FA20070 */ lw $v0, 0x70($sp) /* AF8418 80081278 3C180001 */ lui $t8, 1 @@ -323,7 +323,7 @@ glabel func_80081240 /* AF8858 800816B8 24C6D948 */ addiu $a2, %lo(D_8013D948) # addiu $a2, $a2, -0x26b8 /* AF885C 800816BC 27A40050 */ addiu $a0, $sp, 0x50 /* AF8860 800816C0 8C450000 */ lw $a1, ($v0) -/* AF8864 800816C4 0C031AD5 */ jal func_800C6B54 +/* AF8864 800816C4 0C031AD5 */ jal Graph_CloseDisps /* AF8868 800816C8 2407025F */ li $a3, 607 /* AF886C 800816CC 8FBF001C */ lw $ra, 0x1c($sp) /* AF8870 800816D0 8FB00018 */ lw $s0, 0x18($sp) diff --git a/asm/non_matchings/code/z_message_PAL/func_80109B3C.s b/asm/non_matchings/code/z_message_PAL/func_80109B3C.s index 0d2a8a12e7..eeb25c3c11 100644 --- a/asm/non_matchings/code/z_message_PAL/func_80109B3C.s +++ b/asm/non_matchings/code/z_message_PAL/func_80109B3C.s @@ -431,7 +431,7 @@ glabel func_80109B3C /* B81308 8010A168 1420000A */ bnez $at, .L8010A194 /* B8130C 8010A16C A7A4007C */ sh $a0, 0x7c($sp) .L8010A170: -/* B81310 8010A170 2442FC18 */ addiu $v0, %lo(D_8015FC18) # addiu $v0, $v0, -0x3e8 +/* B81310 8010A170 2442FC18 */ addiu $v0, %lo(D_8015FA98 + (0x18*0x10)) # addiu $v0, $v0, -0x3e8 /* B81314 8010A174 00021400 */ sll $v0, $v0, 0x10 /* B81318 8010A178 24840001 */ addiu $a0, $a0, 1 /* B8131C 8010A17C 00021403 */ sra $v0, $v0, 0x10 diff --git a/asm/non_matchings/code/z_message_PAL/func_8010F2CC.s b/asm/non_matchings/code/z_message_PAL/func_8010F2CC.s index f475f3fe36..cf8d0f9767 100644 --- a/asm/non_matchings/code/z_message_PAL/func_8010F2CC.s +++ b/asm/non_matchings/code/z_message_PAL/func_8010F2CC.s @@ -6,7 +6,7 @@ glabel func_8010F2CC /* B8647C 8010F2DC 24C64984 */ addiu $a2, %lo(D_80154984) # addiu $a2, $a2, 0x4984 /* B86480 8010F2E0 27A40050 */ addiu $a0, $sp, 0x50 /* B86484 8010F2E4 AFA5006C */ sw $a1, 0x6c($sp) -/* B86488 8010F2E8 0C031AB1 */ jal func_800C6AC4 +/* B86488 8010F2E8 0C031AB1 */ jal Graph_OpenDisps /* B8648C 8010F2EC 24070D9D */ li $a3, 3485 /* B86490 8010F2F0 8FAE0068 */ lw $t6, 0x68($sp) /* B86494 8010F2F4 3C0F8015 */ lui $t7, %hi(D_80153CF8) # $t7, 0x8015 @@ -109,7 +109,7 @@ glabel func_8010F2CC /* B86610 8010F470 3C068015 */ lui $a2, %hi(D_80154998) # $a2, 0x8015 /* B86614 8010F474 24C64998 */ addiu $a2, %lo(D_80154998) # addiu $a2, $a2, 0x4998 /* B86618 8010F478 27A40050 */ addiu $a0, $sp, 0x50 -/* B8661C 8010F47C 0C031AD5 */ jal func_800C6B54 +/* B8661C 8010F47C 0C031AD5 */ jal Graph_CloseDisps /* B86620 8010F480 24070DB9 */ li $a3, 3513 /* B86624 8010F484 8FBF0014 */ lw $ra, 0x14($sp) /* B86628 8010F488 27BD0068 */ addiu $sp, $sp, 0x68 diff --git a/asm/non_matchings/code/z_message_PAL/func_8010F58C.s b/asm/non_matchings/code/z_message_PAL/func_8010F58C.s index 9a76f1e394..314036e7d5 100644 --- a/asm/non_matchings/code/z_message_PAL/func_8010F58C.s +++ b/asm/non_matchings/code/z_message_PAL/func_8010F58C.s @@ -9,7 +9,7 @@ glabel func_8010F58C /* B86748 8010F5A8 24C649C4 */ addiu $a2, %lo(D_801549C4) # addiu $a2, $a2, 0x49c4 /* B8674C 8010F5AC 27A40038 */ addiu $a0, $sp, 0x38 /* B86750 8010F5B0 24070DE2 */ li $a3, 3554 -/* B86754 8010F5B4 0C031AB1 */ jal func_800C6AC4 +/* B86754 8010F5B4 0C031AB1 */ jal Graph_OpenDisps /* B86758 8010F5B8 00A08025 */ move $s0, $a1 /* B8675C 8010F5BC 3C0E8016 */ lui $t6, %hi(gSaveContext+0xf40) # $t6, 0x8016 /* B86760 8010F5C0 91CEF5A0 */ lbu $t6, %lo(gSaveContext+0xf40)($t6) @@ -28,7 +28,7 @@ glabel func_8010F58C /* B86794 8010F5F4 5320001B */ beql $t9, $zero, .L8010F664 /* B86798 8010F5F8 8E0402C0 */ lw $a0, 0x2c0($s0) /* B8679C 8010F5FC 8E0402C0 */ lw $a0, 0x2c0($s0) -/* B867A0 8010F600 0C031B08 */ jal func_800C6C20 +/* B867A0 8010F600 0C031B08 */ jal Graph_GfxPlusOne /* B867A4 8010F604 AFA40050 */ sw $a0, 0x50($sp) /* B867A8 8010F608 AFA20054 */ sw $v0, 0x54($sp) /* B867AC 8010F60C 8E0302B0 */ lw $v1, 0x2b0($s0) @@ -48,13 +48,13 @@ glabel func_8010F58C /* B867E4 8010F644 AD600004 */ sw $zero, 4($t3) /* B867E8 8010F648 AD6D0000 */ sw $t5, ($t3) /* B867EC 8010F64C 8FA50054 */ lw $a1, 0x54($sp) -/* B867F0 8010F650 0C031B0A */ jal func_800C6C28 +/* B867F0 8010F650 0C031B0A */ jal Graph_BranchDlist /* B867F4 8010F654 8FA40050 */ lw $a0, 0x50($sp) /* B867F8 8010F658 8FAE0054 */ lw $t6, 0x54($sp) /* B867FC 8010F65C AE0E02C0 */ sw $t6, 0x2c0($s0) /* B86800 8010F660 8E0402C0 */ lw $a0, 0x2c0($s0) .L8010F664: -/* B86804 8010F664 0C031B08 */ jal func_800C6C20 +/* B86804 8010F664 0C031B08 */ jal Graph_GfxPlusOne /* B86808 8010F668 AFA40050 */ sw $a0, 0x50($sp) /* B8680C 8010F66C AFA20054 */ sw $v0, 0x54($sp) /* B86810 8010F670 8E0302B0 */ lw $v1, 0x2b0($s0) @@ -74,7 +74,7 @@ glabel func_8010F58C /* B86848 8010F6A8 AD000004 */ sw $zero, 4($t0) /* B8684C 8010F6AC AD0A0000 */ sw $t2, ($t0) /* B86850 8010F6B0 8FA50054 */ lw $a1, 0x54($sp) -/* B86854 8010F6B4 0C031B0A */ jal func_800C6C28 +/* B86854 8010F6B4 0C031B0A */ jal Graph_BranchDlist /* B86858 8010F6B8 8FA40050 */ lw $a0, 0x50($sp) /* B8685C 8010F6BC 8FAB0054 */ lw $t3, 0x54($sp) /* B86860 8010F6C0 3C068015 */ lui $a2, %hi(D_801549D8) # $a2, 0x8015 @@ -82,7 +82,7 @@ glabel func_8010F58C /* B86868 8010F6C8 AE0B02C0 */ sw $t3, 0x2c0($s0) /* B8686C 8010F6CC 8E250000 */ lw $a1, ($s1) /* B86870 8010F6D0 27A40038 */ addiu $a0, $sp, 0x38 -/* B86874 8010F6D4 0C031AD5 */ jal func_800C6B54 +/* B86874 8010F6D4 0C031AD5 */ jal Graph_CloseDisps /* B86878 8010F6D8 24070DFE */ li $a3, 3582 /* B8687C 8010F6DC 8FBF001C */ lw $ra, 0x1c($sp) /* B86880 8010F6E0 8FB00014 */ lw $s0, 0x14($sp) diff --git a/asm/non_matchings/code/z_onepointdemo/func_8007C704.s b/asm/non_matchings/code/z_onepointdemo/func_8007C704.s index 8d1152d2fc..c0dcb5ca7f 100644 --- a/asm/non_matchings/code/z_onepointdemo/func_8007C704.s +++ b/asm/non_matchings/code/z_onepointdemo/func_8007C704.s @@ -14,7 +14,7 @@ glabel func_8007C704 /* AF38B4 8007C714 C4860000 */ lwc1 $f6, ($a0) /* AF38B8 8007C718 C4A40000 */ lwc1 $f4, ($a1) /* AF38BC 8007C71C 460A4381 */ sub.s $f14, $f8, $f10 -/* AF38C0 8007C720 0C03F494 */ jal func_800FD250 +/* AF38C0 8007C720 0C03F494 */ jal Math_atan2f /* AF38C4 8007C724 46062301 */ sub.s $f12, $f4, $f6 /* AF38C8 8007C728 3C018014 */ lui $at, %hi(D_8013CE40) /* AF38CC 8007C72C C430CE40 */ lwc1 $f16, %lo(D_8013CE40)($at) diff --git a/asm/non_matchings/code/z_onepointdemo/func_8007C850.s b/asm/non_matchings/code/z_onepointdemo/func_8007C850.s index 66a257bf2e..34b5097e30 100644 --- a/asm/non_matchings/code/z_onepointdemo/func_8007C850.s +++ b/asm/non_matchings/code/z_onepointdemo/func_8007C850.s @@ -1180,12 +1180,12 @@ glabel func_8007C850 /* AF4260 8007D0C0 0C030202 */ jal func_800C0808 /* AF4264 8007D0C4 2407003C */ li $a3, 60 /* AF4268 8007D0C8 02602025 */ move $a0, $s3 -/* AF426C 8007D0CC 0C024BE2 */ jal func_80092F88 +/* AF426C 8007D0CC 0C024BE2 */ jal Quake_Add /* AF4270 8007D0D0 24050005 */ li $a1, 5 /* AF4274 8007D0D4 00022400 */ sll $a0, $v0, 0x10 /* AF4278 8007D0D8 00408825 */ move $s1, $v0 /* AF427C 8007D0DC 00042403 */ sra $a0, $a0, 0x10 -/* AF4280 8007D0E0 0C024B6B */ jal func_80092DAC +/* AF4280 8007D0E0 0C024B6B */ jal Quake_SetSpeed /* AF4284 8007D0E4 24050190 */ li $a1, 400 /* AF4288 8007D0E8 00118400 */ sll $s0, $s1, 0x10 /* AF428C 8007D0EC 00108403 */ sra $s0, $s0, 0x10 @@ -1195,11 +1195,11 @@ glabel func_8007C850 /* AF429C 8007D0FC 00042403 */ sra $a0, $a0, 0x10 /* AF42A0 8007D100 24050004 */ li $a1, 4 /* AF42A4 8007D104 24060005 */ li $a2, 5 -/* AF42A8 8007D108 0C024B9C */ jal func_80092E70 +/* AF42A8 8007D108 0C024B9C */ jal Quake_SetQuakeValues /* AF42AC 8007D10C 24070028 */ li $a3, 40 /* AF42B0 8007D110 00102400 */ sll $a0, $s0, 0x10 /* AF42B4 8007D114 00042403 */ sra $a0, $a0, 0x10 -/* AF42B8 8007D118 0C024B7C */ jal func_80092DF0 +/* AF42B8 8007D118 0C024B7C */ jal Quake_SetCountdown /* AF42BC 8007D11C 24050640 */ li $a1, 1600 /* AF42C0 8007D120 10000BA6 */ b .L8007FFBC /* AF42C4 8007D124 8FBF0044 */ lw $ra, 0x44($sp) @@ -1288,12 +1288,12 @@ glabel func_8007C850 /* AF43FC 8007D25C 0C030202 */ jal func_800C0808 /* AF4400 8007D260 2407003C */ li $a3, 60 /* AF4404 8007D264 02602025 */ move $a0, $s3 -/* AF4408 8007D268 0C024BE2 */ jal func_80092F88 +/* AF4408 8007D268 0C024BE2 */ jal Quake_Add /* AF440C 8007D26C 24050005 */ li $a1, 5 /* AF4410 8007D270 00022400 */ sll $a0, $v0, 0x10 /* AF4414 8007D274 00408825 */ move $s1, $v0 /* AF4418 8007D278 00042403 */ sra $a0, $a0, 0x10 -/* AF441C 8007D27C 0C024B6B */ jal func_80092DAC +/* AF441C 8007D27C 0C024B6B */ jal Quake_SetSpeed /* AF4420 8007D280 24050190 */ li $a1, 400 /* AF4424 8007D284 00118400 */ sll $s0, $s1, 0x10 /* AF4428 8007D288 00108403 */ sra $s0, $s0, 0x10 @@ -1303,11 +1303,11 @@ glabel func_8007C850 /* AF4438 8007D298 00042403 */ sra $a0, $a0, 0x10 /* AF443C 8007D29C 24050002 */ li $a1, 2 /* AF4440 8007D2A0 24060003 */ li $a2, 3 -/* AF4444 8007D2A4 0C024B9C */ jal func_80092E70 +/* AF4444 8007D2A4 0C024B9C */ jal Quake_SetQuakeValues /* AF4448 8007D2A8 240700C8 */ li $a3, 200 /* AF444C 8007D2AC 00102400 */ sll $a0, $s0, 0x10 /* AF4450 8007D2B0 00042403 */ sra $a0, $a0, 0x10 -/* AF4454 8007D2B4 0C024B7C */ jal func_80092DF0 +/* AF4454 8007D2B4 0C024B7C */ jal Quake_SetCountdown /* AF4458 8007D2B8 2405270F */ li $a1, 9999 /* AF445C 8007D2BC 10000B3F */ b .L8007FFBC /* AF4460 8007D2C0 8FBF0044 */ lw $ra, 0x44($sp) @@ -1324,12 +1324,12 @@ glabel func_8007C850 /* AF4488 8007D2E8 0C030202 */ jal func_800C0808 /* AF448C 8007D2EC 2407003C */ li $a3, 60 /* AF4490 8007D2F0 02602025 */ move $a0, $s3 -/* AF4494 8007D2F4 0C024BE2 */ jal func_80092F88 +/* AF4494 8007D2F4 0C024BE2 */ jal Quake_Add /* AF4498 8007D2F8 24050005 */ li $a1, 5 /* AF449C 8007D2FC 00022400 */ sll $a0, $v0, 0x10 /* AF44A0 8007D300 00408825 */ move $s1, $v0 /* AF44A4 8007D304 00042403 */ sra $a0, $a0, 0x10 -/* AF44A8 8007D308 0C024B6B */ jal func_80092DAC +/* AF44A8 8007D308 0C024B6B */ jal Quake_SetSpeed /* AF44AC 8007D30C 24050190 */ li $a1, 400 /* AF44B0 8007D310 00118400 */ sll $s0, $s1, 0x10 /* AF44B4 8007D314 00108403 */ sra $s0, $s0, 0x10 @@ -1338,11 +1338,11 @@ glabel func_8007C850 /* AF44C0 8007D320 24050002 */ li $a1, 2 /* AF44C4 8007D324 24060002 */ li $a2, 2 /* AF44C8 8007D328 24070032 */ li $a3, 50 -/* AF44CC 8007D32C 0C024B9C */ jal func_80092E70 +/* AF44CC 8007D32C 0C024B9C */ jal Quake_SetQuakeValues /* AF44D0 8007D330 AFA00010 */ sw $zero, 0x10($sp) /* AF44D4 8007D334 00102400 */ sll $a0, $s0, 0x10 /* AF44D8 8007D338 00042403 */ sra $a0, $a0, 0x10 -/* AF44DC 8007D33C 0C024B7C */ jal func_80092DF0 +/* AF44DC 8007D33C 0C024B7C */ jal Quake_SetCountdown /* AF44E0 8007D340 24050118 */ li $a1, 280 /* AF44E4 8007D344 10000B1D */ b .L8007FFBC /* AF44E8 8007D348 8FBF0044 */ lw $ra, 0x44($sp) @@ -1388,12 +1388,12 @@ glabel func_8007C850 /* AF457C 8007D3DC 0C030202 */ jal func_800C0808 /* AF4580 8007D3E0 2407003C */ li $a3, 60 /* AF4584 8007D3E4 02602025 */ move $a0, $s3 -/* AF4588 8007D3E8 0C024BE2 */ jal func_80092F88 +/* AF4588 8007D3E8 0C024BE2 */ jal Quake_Add /* AF458C 8007D3EC 24050005 */ li $a1, 5 /* AF4590 8007D3F0 00022400 */ sll $a0, $v0, 0x10 /* AF4594 8007D3F4 00408825 */ move $s1, $v0 /* AF4598 8007D3F8 00042403 */ sra $a0, $a0, 0x10 -/* AF459C 8007D3FC 0C024B6B */ jal func_80092DAC +/* AF459C 8007D3FC 0C024B6B */ jal Quake_SetSpeed /* AF45A0 8007D400 24050190 */ li $a1, 400 /* AF45A4 8007D404 00118400 */ sll $s0, $s1, 0x10 /* AF45A8 8007D408 00108403 */ sra $s0, $s0, 0x10 @@ -1402,11 +1402,11 @@ glabel func_8007C850 /* AF45B4 8007D414 24050002 */ li $a1, 2 /* AF45B8 8007D418 24060002 */ li $a2, 2 /* AF45BC 8007D41C 24070032 */ li $a3, 50 -/* AF45C0 8007D420 0C024B9C */ jal func_80092E70 +/* AF45C0 8007D420 0C024B9C */ jal Quake_SetQuakeValues /* AF45C4 8007D424 AFA00010 */ sw $zero, 0x10($sp) /* AF45C8 8007D428 00102400 */ sll $a0, $s0, 0x10 /* AF45CC 8007D42C 00042403 */ sra $a0, $a0, 0x10 -/* AF45D0 8007D430 0C024B7C */ jal func_80092DF0 +/* AF45D0 8007D430 0C024B7C */ jal Quake_SetCountdown /* AF45D4 8007D434 2405003C */ li $a1, 60 /* AF45D8 8007D438 10000AE0 */ b .L8007FFBC /* AF45DC 8007D43C 8FBF0044 */ lw $ra, 0x44($sp) @@ -2002,12 +2002,12 @@ glabel L8007DCF8 /* AF4EBC 8007DD1C 0C030202 */ jal func_800C0808 /* AF4EC0 8007DD20 2407003C */ li $a3, 60 /* AF4EC4 8007DD24 02602025 */ move $a0, $s3 -/* AF4EC8 8007DD28 0C024BE2 */ jal func_80092F88 +/* AF4EC8 8007DD28 0C024BE2 */ jal Quake_Add /* AF4ECC 8007DD2C 24050003 */ li $a1, 3 /* AF4ED0 8007DD30 00022400 */ sll $a0, $v0, 0x10 /* AF4ED4 8007DD34 00408825 */ move $s1, $v0 /* AF4ED8 8007DD38 00042403 */ sra $a0, $a0, 0x10 -/* AF4EDC 8007DD3C 0C024B6B */ jal func_80092DAC +/* AF4EDC 8007DD3C 0C024B6B */ jal Quake_SetSpeed /* AF4EE0 8007DD40 240555F0 */ li $a1, 22000 /* AF4EE4 8007DD44 00118400 */ sll $s0, $s1, 0x10 /* AF4EE8 8007DD48 00108403 */ sra $s0, $s0, 0x10 @@ -2016,11 +2016,11 @@ glabel L8007DCF8 /* AF4EF4 8007DD54 24050002 */ li $a1, 2 /* AF4EF8 8007DD58 00003025 */ move $a2, $zero /* AF4EFC 8007DD5C 240700C8 */ li $a3, 200 -/* AF4F00 8007DD60 0C024B9C */ jal func_80092E70 +/* AF4F00 8007DD60 0C024B9C */ jal Quake_SetQuakeValues /* AF4F04 8007DD64 AFA00010 */ sw $zero, 0x10($sp) /* AF4F08 8007DD68 00102400 */ sll $a0, $s0, 0x10 /* AF4F0C 8007DD6C 00042403 */ sra $a0, $a0, 0x10 -/* AF4F10 8007DD70 0C024B7C */ jal func_80092DF0 +/* AF4F10 8007DD70 0C024B7C */ jal Quake_SetCountdown /* AF4F14 8007DD74 2405000A */ li $a1, 10 /* AF4F18 8007DD78 10000890 */ b .L8007FFBC /* AF4F1C 8007DD7C 8FBF0044 */ lw $ra, 0x44($sp) @@ -2115,12 +2115,12 @@ glabel L8007DE9C /* AF5070 8007DED0 0C030202 */ jal func_800C0808 /* AF5074 8007DED4 2407003C */ li $a3, 60 /* AF5078 8007DED8 02602025 */ move $a0, $s3 -/* AF507C 8007DEDC 0C024BE2 */ jal func_80092F88 +/* AF507C 8007DEDC 0C024BE2 */ jal Quake_Add /* AF5080 8007DEE0 24050001 */ li $a1, 1 /* AF5084 8007DEE4 00022400 */ sll $a0, $v0, 0x10 /* AF5088 8007DEE8 00408825 */ move $s1, $v0 /* AF508C 8007DEEC 00042403 */ sra $a0, $a0, 0x10 -/* AF5090 8007DEF0 0C024B6B */ jal func_80092DAC +/* AF5090 8007DEF0 0C024B6B */ jal Quake_SetSpeed /* AF5094 8007DEF4 24055DC0 */ li $a1, 24000 /* AF5098 8007DEF8 00118400 */ sll $s0, $s1, 0x10 /* AF509C 8007DEFC 00108403 */ sra $s0, $s0, 0x10 @@ -2129,11 +2129,11 @@ glabel L8007DE9C /* AF50A8 8007DF08 24050002 */ li $a1, 2 /* AF50AC 8007DF0C 00003025 */ move $a2, $zero /* AF50B0 8007DF10 00003825 */ move $a3, $zero -/* AF50B4 8007DF14 0C024B9C */ jal func_80092E70 +/* AF50B4 8007DF14 0C024B9C */ jal Quake_SetQuakeValues /* AF50B8 8007DF18 AFA00010 */ sw $zero, 0x10($sp) /* AF50BC 8007DF1C 00102400 */ sll $a0, $s0, 0x10 /* AF50C0 8007DF20 00042403 */ sra $a0, $a0, 0x10 -/* AF50C4 8007DF24 0C024B7C */ jal func_80092DF0 +/* AF50C4 8007DF24 0C024B7C */ jal Quake_SetCountdown /* AF50C8 8007DF28 240500A0 */ li $a1, 160 /* AF50CC 8007DF2C 10000823 */ b .L8007FFBC /* AF50D0 8007DF30 8FBF0044 */ lw $ra, 0x44($sp) @@ -2263,12 +2263,12 @@ glabel L8007DF78 /* AF52A4 8007E104 00017043 */ sra $t6, $at, 1 .L8007E108: /* AF52A8 8007E108 018E7821 */ addu $t7, $t4, $t6 -/* AF52AC 8007E10C 0C024BE2 */ jal func_80092F88 +/* AF52AC 8007E10C 0C024BE2 */ jal Quake_Add /* AF52B0 8007E110 A46FFFDC */ sh $t7, -0x24($v1) /* AF52B4 8007E114 00022400 */ sll $a0, $v0, 0x10 /* AF52B8 8007E118 00408825 */ move $s1, $v0 /* AF52BC 8007E11C 00042403 */ sra $a0, $a0, 0x10 -/* AF52C0 8007E120 0C024B6B */ jal func_80092DAC +/* AF52C0 8007E120 0C024B6B */ jal Quake_SetSpeed /* AF52C4 8007E124 24057530 */ li $a1, 30000 /* AF52C8 8007E128 00118400 */ sll $s0, $s1, 0x10 /* AF52CC 8007E12C 00108403 */ sra $s0, $s0, 0x10 @@ -2277,11 +2277,11 @@ glabel L8007DF78 /* AF52D8 8007E138 24050002 */ li $a1, 2 /* AF52DC 8007E13C 24060001 */ li $a2, 1 /* AF52E0 8007E140 24070001 */ li $a3, 1 -/* AF52E4 8007E144 0C024B9C */ jal func_80092E70 +/* AF52E4 8007E144 0C024B9C */ jal Quake_SetQuakeValues /* AF52E8 8007E148 AFA00010 */ sw $zero, 0x10($sp) /* AF52EC 8007E14C 00102400 */ sll $a0, $s0, 0x10 /* AF52F0 8007E150 00042403 */ sra $a0, $a0, 0x10 -/* AF52F4 8007E154 0C024B7C */ jal func_80092DF0 +/* AF52F4 8007E154 0C024B7C */ jal Quake_SetCountdown /* AF52F8 8007E158 240500C8 */ li $a1, 200 /* AF52FC 8007E15C 10000797 */ b .L8007FFBC /* AF5300 8007E160 8FBF0044 */ lw $ra, 0x44($sp) @@ -2656,12 +2656,12 @@ glabel L8007E5DC /* AF58A0 8007E700 0C030136 */ jal func_800C04D8 /* AF58A4 8007E704 27A700B4 */ addiu $a3, $sp, 0xb4 /* AF58A8 8007E708 02602025 */ move $a0, $s3 -/* AF58AC 8007E70C 0C024BE2 */ jal func_80092F88 +/* AF58AC 8007E70C 0C024BE2 */ jal Quake_Add /* AF58B0 8007E710 24050003 */ li $a1, 3 /* AF58B4 8007E714 00022400 */ sll $a0, $v0, 0x10 /* AF58B8 8007E718 00408825 */ move $s1, $v0 /* AF58BC 8007E71C 00042403 */ sra $a0, $a0, 0x10 -/* AF58C0 8007E720 0C024B6B */ jal func_80092DAC +/* AF58C0 8007E720 0C024B6B */ jal Quake_SetSpeed /* AF58C4 8007E724 240555F0 */ li $a1, 22000 /* AF58C8 8007E728 00118400 */ sll $s0, $s1, 0x10 /* AF58CC 8007E72C 00108403 */ sra $s0, $s0, 0x10 @@ -2670,11 +2670,11 @@ glabel L8007E5DC /* AF58D8 8007E738 24050001 */ li $a1, 1 /* AF58DC 8007E73C 00003025 */ move $a2, $zero /* AF58E0 8007E740 00003825 */ move $a3, $zero -/* AF58E4 8007E744 0C024B9C */ jal func_80092E70 +/* AF58E4 8007E744 0C024B9C */ jal Quake_SetQuakeValues /* AF58E8 8007E748 AFA00010 */ sw $zero, 0x10($sp) /* AF58EC 8007E74C 00102400 */ sll $a0, $s0, 0x10 /* AF58F0 8007E750 00042403 */ sra $a0, $a0, 0x10 -/* AF58F4 8007E754 0C024B7C */ jal func_80092DF0 +/* AF58F4 8007E754 0C024B7C */ jal Quake_SetCountdown /* AF58F8 8007E758 2405005A */ li $a1, 90 /* AF58FC 8007E75C 10000617 */ b .L8007FFBC /* AF5900 8007E760 8FBF0044 */ lw $ra, 0x44($sp) @@ -2858,12 +2858,12 @@ glabel L8007E914 /* AF5BB4 8007EA14 02602025 */ move $a0, $s3 /* AF5BB8 8007EA18 02602025 */ move $a0, $s3 .L8007EA1C: -/* AF5BBC 8007EA1C 0C024BE2 */ jal func_80092F88 +/* AF5BBC 8007EA1C 0C024BE2 */ jal Quake_Add /* AF5BC0 8007EA20 24050001 */ li $a1, 1 /* AF5BC4 8007EA24 00022400 */ sll $a0, $v0, 0x10 /* AF5BC8 8007EA28 00408825 */ move $s1, $v0 /* AF5BCC 8007EA2C 00042403 */ sra $a0, $a0, 0x10 -/* AF5BD0 8007EA30 0C024B6B */ jal func_80092DAC +/* AF5BD0 8007EA30 0C024B6B */ jal Quake_SetSpeed /* AF5BD4 8007EA34 24057D00 */ li $a1, 32000 /* AF5BD8 8007EA38 00118400 */ sll $s0, $s1, 0x10 /* AF5BDC 8007EA3C 00108403 */ sra $s0, $s0, 0x10 @@ -2872,14 +2872,14 @@ glabel L8007E914 /* AF5BE8 8007EA48 00002825 */ move $a1, $zero /* AF5BEC 8007EA4C 00003025 */ move $a2, $zero /* AF5BF0 8007EA50 24070014 */ li $a3, 20 -/* AF5BF4 8007EA54 0C024B9C */ jal func_80092E70 +/* AF5BF4 8007EA54 0C024B9C */ jal Quake_SetQuakeValues /* AF5BF8 8007EA58 AFA00010 */ sw $zero, 0x10($sp) /* AF5BFC 8007EA5C 86450000 */ lh $a1, ($s2) /* AF5C00 8007EA60 00102400 */ sll $a0, $s0, 0x10 /* AF5C04 8007EA64 00042403 */ sra $a0, $a0, 0x10 /* AF5C08 8007EA68 24A5FFF6 */ addiu $a1, $a1, -0xa /* AF5C0C 8007EA6C 00052C00 */ sll $a1, $a1, 0x10 -/* AF5C10 8007EA70 0C024B7C */ jal func_80092DF0 +/* AF5C10 8007EA70 0C024B7C */ jal Quake_SetCountdown /* AF5C14 8007EA74 00052C03 */ sra $a1, $a1, 0x10 /* AF5C18 8007EA78 10000550 */ b .L8007FFBC /* AF5C1C 8007EA7C 8FBF0044 */ lw $ra, 0x44($sp) @@ -2926,12 +2926,12 @@ glabel L8007EA80 /* AF5CBC 8007EB1C 0C01F1DB */ jal func_8007C76C /* AF5CC0 8007EB20 24840050 */ addiu $a0, $a0, 0x50 /* AF5CC4 8007EB24 02602025 */ move $a0, $s3 -/* AF5CC8 8007EB28 0C024BE2 */ jal func_80092F88 +/* AF5CC8 8007EB28 0C024BE2 */ jal Quake_Add /* AF5CCC 8007EB2C 24050001 */ li $a1, 1 /* AF5CD0 8007EB30 00022400 */ sll $a0, $v0, 0x10 /* AF5CD4 8007EB34 00408825 */ move $s1, $v0 /* AF5CD8 8007EB38 00042403 */ sra $a0, $a0, 0x10 -/* AF5CDC 8007EB3C 0C024B6B */ jal func_80092DAC +/* AF5CDC 8007EB3C 0C024B6B */ jal Quake_SetSpeed /* AF5CE0 8007EB40 24054E20 */ li $a1, 20000 /* AF5CE4 8007EB44 00118400 */ sll $s0, $s1, 0x10 /* AF5CE8 8007EB48 00108403 */ sra $s0, $s0, 0x10 @@ -2940,14 +2940,14 @@ glabel L8007EA80 /* AF5CF4 8007EB54 24050001 */ li $a1, 1 /* AF5CF8 8007EB58 00003025 */ move $a2, $zero /* AF5CFC 8007EB5C 24070032 */ li $a3, 50 -/* AF5D00 8007EB60 0C024B9C */ jal func_80092E70 +/* AF5D00 8007EB60 0C024B9C */ jal Quake_SetQuakeValues /* AF5D04 8007EB64 AFA00010 */ sw $zero, 0x10($sp) /* AF5D08 8007EB68 86850000 */ lh $a1, ($s4) /* AF5D0C 8007EB6C 00102400 */ sll $a0, $s0, 0x10 /* AF5D10 8007EB70 00042403 */ sra $a0, $a0, 0x10 /* AF5D14 8007EB74 24A5FFEC */ addiu $a1, $a1, -0x14 /* AF5D18 8007EB78 00052C00 */ sll $a1, $a1, 0x10 -/* AF5D1C 8007EB7C 0C024B7C */ jal func_80092DF0 +/* AF5D1C 8007EB7C 0C024B7C */ jal Quake_SetCountdown /* AF5D20 8007EB80 00052C03 */ sra $a1, $a1, 0x10 /* AF5D24 8007EB84 1000050D */ b .L8007FFBC /* AF5D28 8007EB88 8FBF0044 */ lw $ra, 0x44($sp) @@ -2990,12 +2990,12 @@ glabel L8007EBE4 /* AF5DB4 8007EC14 0C0301E3 */ jal func_800C078C /* AF5DB8 8007EC18 00003025 */ move $a2, $zero /* AF5DBC 8007EC1C 02602025 */ move $a0, $s3 -/* AF5DC0 8007EC20 0C024BE2 */ jal func_80092F88 +/* AF5DC0 8007EC20 0C024BE2 */ jal Quake_Add /* AF5DC4 8007EC24 24050001 */ li $a1, 1 /* AF5DC8 8007EC28 00022400 */ sll $a0, $v0, 0x10 /* AF5DCC 8007EC2C 00408825 */ move $s1, $v0 /* AF5DD0 8007EC30 00042403 */ sra $a0, $a0, 0x10 -/* AF5DD4 8007EC34 0C024B6B */ jal func_80092DAC +/* AF5DD4 8007EC34 0C024B6B */ jal Quake_SetSpeed /* AF5DD8 8007EC38 24057D00 */ li $a1, 32000 /* AF5DDC 8007EC3C 00118400 */ sll $s0, $s1, 0x10 /* AF5DE0 8007EC40 00108403 */ sra $s0, $s0, 0x10 @@ -3004,11 +3004,11 @@ glabel L8007EBE4 /* AF5DEC 8007EC4C 24050002 */ li $a1, 2 /* AF5DF0 8007EC50 00003025 */ move $a2, $zero /* AF5DF4 8007EC54 00003825 */ move $a3, $zero -/* AF5DF8 8007EC58 0C024B9C */ jal func_80092E70 +/* AF5DF8 8007EC58 0C024B9C */ jal Quake_SetQuakeValues /* AF5DFC 8007EC5C AFA00010 */ sw $zero, 0x10($sp) /* AF5E00 8007EC60 00102400 */ sll $a0, $s0, 0x10 /* AF5E04 8007EC64 00042403 */ sra $a0, $a0, 0x10 -/* AF5E08 8007EC68 0C024B7C */ jal func_80092DF0 +/* AF5E08 8007EC68 0C024B7C */ jal Quake_SetCountdown /* AF5E0C 8007EC6C 87A500FA */ lh $a1, 0xfa($sp) /* AF5E10 8007EC70 100004D2 */ b .L8007FFBC /* AF5E14 8007EC74 8FBF0044 */ lw $ra, 0x44($sp) @@ -3052,12 +3052,12 @@ glabel L8007EC78 /* AF5EA8 8007ED08 0C030202 */ jal func_800C0808 /* AF5EAC 8007ED0C 2407003C */ li $a3, 60 /* AF5EB0 8007ED10 02602025 */ move $a0, $s3 -/* AF5EB4 8007ED14 0C024BE2 */ jal func_80092F88 +/* AF5EB4 8007ED14 0C024BE2 */ jal Quake_Add /* AF5EB8 8007ED18 24050003 */ li $a1, 3 /* AF5EBC 8007ED1C 00022400 */ sll $a0, $v0, 0x10 /* AF5EC0 8007ED20 00408825 */ move $s1, $v0 /* AF5EC4 8007ED24 00042403 */ sra $a0, $a0, 0x10 -/* AF5EC8 8007ED28 0C024B6B */ jal func_80092DAC +/* AF5EC8 8007ED28 0C024B6B */ jal Quake_SetSpeed /* AF5ECC 8007ED2C 24052EE0 */ li $a1, 12000 /* AF5ED0 8007ED30 00118400 */ sll $s0, $s1, 0x10 /* AF5ED4 8007ED34 00108403 */ sra $s0, $s0, 0x10 @@ -3066,11 +3066,11 @@ glabel L8007EC78 /* AF5EE0 8007ED40 00002825 */ move $a1, $zero /* AF5EE4 8007ED44 00003025 */ move $a2, $zero /* AF5EE8 8007ED48 240703E8 */ li $a3, 1000 -/* AF5EEC 8007ED4C 0C024B9C */ jal func_80092E70 +/* AF5EEC 8007ED4C 0C024B9C */ jal Quake_SetQuakeValues /* AF5EF0 8007ED50 AFA00010 */ sw $zero, 0x10($sp) /* AF5EF4 8007ED54 00102400 */ sll $a0, $s0, 0x10 /* AF5EF8 8007ED58 00042403 */ sra $a0, $a0, 0x10 -/* AF5EFC 8007ED5C 0C024B7C */ jal func_80092DF0 +/* AF5EFC 8007ED5C 0C024B7C */ jal Quake_SetCountdown /* AF5F00 8007ED60 24050005 */ li $a1, 5 /* AF5F04 8007ED64 10000495 */ b .L8007FFBC /* AF5F08 8007ED68 8FBF0044 */ lw $ra, 0x44($sp) @@ -3109,12 +3109,12 @@ glabel L8007ED6C /* AF5F88 8007EDE8 0C030202 */ jal func_800C0808 /* AF5F8C 8007EDEC 2407003C */ li $a3, 60 /* AF5F90 8007EDF0 02602025 */ move $a0, $s3 -/* AF5F94 8007EDF4 0C024BE2 */ jal func_80092F88 +/* AF5F94 8007EDF4 0C024BE2 */ jal Quake_Add /* AF5F98 8007EDF8 24050003 */ li $a1, 3 /* AF5F9C 8007EDFC 00022400 */ sll $a0, $v0, 0x10 /* AF5FA0 8007EE00 00408825 */ move $s1, $v0 /* AF5FA4 8007EE04 00042403 */ sra $a0, $a0, 0x10 -/* AF5FA8 8007EE08 0C024B6B */ jal func_80092DAC +/* AF5FA8 8007EE08 0C024B6B */ jal Quake_SetSpeed /* AF5FAC 8007EE0C 24052EE0 */ li $a1, 12000 /* AF5FB0 8007EE10 00118400 */ sll $s0, $s1, 0x10 /* AF5FB4 8007EE14 00108403 */ sra $s0, $s0, 0x10 @@ -3123,11 +3123,11 @@ glabel L8007ED6C /* AF5FC0 8007EE20 00002825 */ move $a1, $zero /* AF5FC4 8007EE24 00003025 */ move $a2, $zero /* AF5FC8 8007EE28 240703E8 */ li $a3, 1000 -/* AF5FCC 8007EE2C 0C024B9C */ jal func_80092E70 +/* AF5FCC 8007EE2C 0C024B9C */ jal Quake_SetQuakeValues /* AF5FD0 8007EE30 AFA00010 */ sw $zero, 0x10($sp) /* AF5FD4 8007EE34 00102400 */ sll $a0, $s0, 0x10 /* AF5FD8 8007EE38 00042403 */ sra $a0, $a0, 0x10 -/* AF5FDC 8007EE3C 0C024B7C */ jal func_80092DF0 +/* AF5FDC 8007EE3C 0C024B7C */ jal Quake_SetCountdown /* AF5FE0 8007EE40 24050005 */ li $a1, 5 /* AF5FE4 8007EE44 1000045D */ b .L8007FFBC /* AF5FE8 8007EE48 8FBF0044 */ lw $ra, 0x44($sp) @@ -3244,12 +3244,12 @@ glabel L8007EFBC /* AF6190 8007EFF0 0C030202 */ jal func_800C0808 /* AF6194 8007EFF4 2407003C */ li $a3, 60 /* AF6198 8007EFF8 02602025 */ move $a0, $s3 -/* AF619C 8007EFFC 0C024BE2 */ jal func_80092F88 +/* AF619C 8007EFFC 0C024BE2 */ jal Quake_Add /* AF61A0 8007F000 24050001 */ li $a1, 1 /* AF61A4 8007F004 00022400 */ sll $a0, $v0, 0x10 /* AF61A8 8007F008 00408825 */ move $s1, $v0 /* AF61AC 8007F00C 00042403 */ sra $a0, $a0, 0x10 -/* AF61B0 8007F010 0C024B6B */ jal func_80092DAC +/* AF61B0 8007F010 0C024B6B */ jal Quake_SetSpeed /* AF61B4 8007F014 24057D00 */ li $a1, 32000 /* AF61B8 8007F018 00118400 */ sll $s0, $s1, 0x10 /* AF61BC 8007F01C 00108403 */ sra $s0, $s0, 0x10 @@ -3258,11 +3258,11 @@ glabel L8007EFBC /* AF61C8 8007F028 24050004 */ li $a1, 4 /* AF61CC 8007F02C 00003025 */ move $a2, $zero /* AF61D0 8007F030 00003825 */ move $a3, $zero -/* AF61D4 8007F034 0C024B9C */ jal func_80092E70 +/* AF61D4 8007F034 0C024B9C */ jal Quake_SetQuakeValues /* AF61D8 8007F038 AFA00010 */ sw $zero, 0x10($sp) /* AF61DC 8007F03C 00102400 */ sll $a0, $s0, 0x10 /* AF61E0 8007F040 00042403 */ sra $a0, $a0, 0x10 -/* AF61E4 8007F044 0C024B7C */ jal func_80092DF0 +/* AF61E4 8007F044 0C024B7C */ jal Quake_SetCountdown /* AF61E8 8007F048 24050014 */ li $a1, 20 /* AF61EC 8007F04C 100003DB */ b .L8007FFBC /* AF61F0 8007F050 8FBF0044 */ lw $ra, 0x44($sp) @@ -3283,12 +3283,12 @@ glabel L8007F054 /* AF6228 8007F088 0C030202 */ jal func_800C0808 /* AF622C 8007F08C 2407003C */ li $a3, 60 /* AF6230 8007F090 02602025 */ move $a0, $s3 -/* AF6234 8007F094 0C024BE2 */ jal func_80092F88 +/* AF6234 8007F094 0C024BE2 */ jal Quake_Add /* AF6238 8007F098 24050001 */ li $a1, 1 /* AF623C 8007F09C 00022400 */ sll $a0, $v0, 0x10 /* AF6240 8007F0A0 00408825 */ move $s1, $v0 /* AF6244 8007F0A4 00042403 */ sra $a0, $a0, 0x10 -/* AF6248 8007F0A8 0C024B6B */ jal func_80092DAC +/* AF6248 8007F0A8 0C024B6B */ jal Quake_SetSpeed /* AF624C 8007F0AC 24057D00 */ li $a1, 32000 /* AF6250 8007F0B0 00118400 */ sll $s0, $s1, 0x10 /* AF6254 8007F0B4 00108403 */ sra $s0, $s0, 0x10 @@ -3297,11 +3297,11 @@ glabel L8007F054 /* AF6260 8007F0C0 24050002 */ li $a1, 2 /* AF6264 8007F0C4 00003025 */ move $a2, $zero /* AF6268 8007F0C8 00003825 */ move $a3, $zero -/* AF626C 8007F0CC 0C024B9C */ jal func_80092E70 +/* AF626C 8007F0CC 0C024B9C */ jal Quake_SetQuakeValues /* AF6270 8007F0D0 AFA00010 */ sw $zero, 0x10($sp) /* AF6274 8007F0D4 00102400 */ sll $a0, $s0, 0x10 /* AF6278 8007F0D8 00042403 */ sra $a0, $a0, 0x10 -/* AF627C 8007F0DC 0C024B7C */ jal func_80092DF0 +/* AF627C 8007F0DC 0C024B7C */ jal Quake_SetCountdown /* AF6280 8007F0E0 2405000A */ li $a1, 10 /* AF6284 8007F0E4 100003B5 */ b .L8007FFBC /* AF6288 8007F0E8 8FBF0044 */ lw $ra, 0x44($sp) @@ -3328,12 +3328,12 @@ glabel L8007F0EC /* AF62D8 8007F138 AE8F067C */ sw $t7, 0x67c($s4) /* AF62DC 8007F13C A6980110 */ sh $t8, 0x110($s4) /* AF62E0 8007F140 02602025 */ move $a0, $s3 -/* AF62E4 8007F144 0C024BE2 */ jal func_80092F88 +/* AF62E4 8007F144 0C024BE2 */ jal Quake_Add /* AF62E8 8007F148 24050001 */ li $a1, 1 /* AF62EC 8007F14C 00022400 */ sll $a0, $v0, 0x10 /* AF62F0 8007F150 00408825 */ move $s1, $v0 /* AF62F4 8007F154 00042403 */ sra $a0, $a0, 0x10 -/* AF62F8 8007F158 0C024B6B */ jal func_80092DAC +/* AF62F8 8007F158 0C024B6B */ jal Quake_SetSpeed /* AF62FC 8007F15C 24057D00 */ li $a1, 32000 /* AF6300 8007F160 00118400 */ sll $s0, $s1, 0x10 /* AF6304 8007F164 00108403 */ sra $s0, $s0, 0x10 @@ -3342,11 +3342,11 @@ glabel L8007F0EC /* AF6310 8007F170 24050002 */ li $a1, 2 /* AF6314 8007F174 00003025 */ move $a2, $zero /* AF6318 8007F178 00003825 */ move $a3, $zero -/* AF631C 8007F17C 0C024B9C */ jal func_80092E70 +/* AF631C 8007F17C 0C024B9C */ jal Quake_SetQuakeValues /* AF6320 8007F180 AFA00010 */ sw $zero, 0x10($sp) /* AF6324 8007F184 00102400 */ sll $a0, $s0, 0x10 /* AF6328 8007F188 00042403 */ sra $a0, $a0, 0x10 -/* AF632C 8007F18C 0C024B7C */ jal func_80092DF0 +/* AF632C 8007F18C 0C024B7C */ jal Quake_SetCountdown /* AF6330 8007F190 2405000A */ li $a1, 10 /* AF6334 8007F194 10000389 */ b .L8007FFBC /* AF6338 8007F198 8FBF0044 */ lw $ra, 0x44($sp) @@ -3367,12 +3367,12 @@ glabel L8007F19C /* AF6370 8007F1D0 0C030202 */ jal func_800C0808 /* AF6374 8007F1D4 2407003C */ li $a3, 60 /* AF6378 8007F1D8 02602025 */ move $a0, $s3 -/* AF637C 8007F1DC 0C024BE2 */ jal func_80092F88 +/* AF637C 8007F1DC 0C024BE2 */ jal Quake_Add /* AF6380 8007F1E0 24050001 */ li $a1, 1 /* AF6384 8007F1E4 00022400 */ sll $a0, $v0, 0x10 /* AF6388 8007F1E8 00408825 */ move $s1, $v0 /* AF638C 8007F1EC 00042403 */ sra $a0, $a0, 0x10 -/* AF6390 8007F1F0 0C024B6B */ jal func_80092DAC +/* AF6390 8007F1F0 0C024B6B */ jal Quake_SetSpeed /* AF6394 8007F1F4 24057D00 */ li $a1, 32000 /* AF6398 8007F1F8 00118400 */ sll $s0, $s1, 0x10 /* AF639C 8007F1FC 00108403 */ sra $s0, $s0, 0x10 @@ -3381,11 +3381,11 @@ glabel L8007F19C /* AF63A8 8007F208 24050001 */ li $a1, 1 /* AF63AC 8007F20C 00003025 */ move $a2, $zero /* AF63B0 8007F210 2407000A */ li $a3, 10 -/* AF63B4 8007F214 0C024B9C */ jal func_80092E70 +/* AF63B4 8007F214 0C024B9C */ jal Quake_SetQuakeValues /* AF63B8 8007F218 AFA00010 */ sw $zero, 0x10($sp) /* AF63BC 8007F21C 00102400 */ sll $a0, $s0, 0x10 /* AF63C0 8007F220 00042403 */ sra $a0, $a0, 0x10 -/* AF63C4 8007F224 0C024B7C */ jal func_80092DF0 +/* AF63C4 8007F224 0C024B7C */ jal Quake_SetCountdown /* AF63C8 8007F228 24050014 */ li $a1, 20 /* AF63CC 8007F22C 10000363 */ b .L8007FFBC /* AF63D0 8007F230 8FBF0044 */ lw $ra, 0x44($sp) @@ -3587,12 +3587,12 @@ glabel L8007F4EC /* AF66B8 8007F518 0C030202 */ jal func_800C0808 /* AF66BC 8007F51C 2407003C */ li $a3, 60 /* AF66C0 8007F520 02602025 */ move $a0, $s3 -/* AF66C4 8007F524 0C024BE2 */ jal func_80092F88 +/* AF66C4 8007F524 0C024BE2 */ jal Quake_Add /* AF66C8 8007F528 24050003 */ li $a1, 3 /* AF66CC 8007F52C 00022400 */ sll $a0, $v0, 0x10 /* AF66D0 8007F530 00408825 */ move $s1, $v0 /* AF66D4 8007F534 00042403 */ sra $a0, $a0, 0x10 -/* AF66D8 8007F538 0C024B6B */ jal func_80092DAC +/* AF66D8 8007F538 0C024B6B */ jal Quake_SetSpeed /* AF66DC 8007F53C 24052EE0 */ li $a1, 12000 /* AF66E0 8007F540 00118400 */ sll $s0, $s1, 0x10 /* AF66E4 8007F544 00108403 */ sra $s0, $s0, 0x10 @@ -3601,14 +3601,14 @@ glabel L8007F4EC /* AF66F0 8007F550 00002825 */ move $a1, $zero /* AF66F4 8007F554 24060001 */ li $a2, 1 /* AF66F8 8007F558 24070064 */ li $a3, 100 -/* AF66FC 8007F55C 0C024B9C */ jal func_80092E70 +/* AF66FC 8007F55C 0C024B9C */ jal Quake_SetQuakeValues /* AF6700 8007F560 AFA00010 */ sw $zero, 0x10($sp) /* AF6704 8007F564 87A500FA */ lh $a1, 0xfa($sp) /* AF6708 8007F568 00102400 */ sll $a0, $s0, 0x10 /* AF670C 8007F56C 00042403 */ sra $a0, $a0, 0x10 /* AF6710 8007F570 24A5FFB0 */ addiu $a1, $a1, -0x50 /* AF6714 8007F574 00052C00 */ sll $a1, $a1, 0x10 -/* AF6718 8007F578 0C024B7C */ jal func_80092DF0 +/* AF6718 8007F578 0C024B7C */ jal Quake_SetCountdown /* AF671C 8007F57C 00052C03 */ sra $a1, $a1, 0x10 /* AF6720 8007F580 1000028E */ b .L8007FFBC /* AF6724 8007F584 8FBF0044 */ lw $ra, 0x44($sp) @@ -3641,12 +3641,12 @@ glabel L8007F588 /* AF6784 8007F5E4 0C00B7CE */ jal func_8002DF38 /* AF6788 8007F5E8 24060001 */ li $a2, 1 /* AF678C 8007F5EC 02602025 */ move $a0, $s3 -/* AF6790 8007F5F0 0C024BE2 */ jal func_80092F88 +/* AF6790 8007F5F0 0C024BE2 */ jal Quake_Add /* AF6794 8007F5F4 24050003 */ li $a1, 3 /* AF6798 8007F5F8 00022400 */ sll $a0, $v0, 0x10 /* AF679C 8007F5FC 00408825 */ move $s1, $v0 /* AF67A0 8007F600 00042403 */ sra $a0, $a0, 0x10 -/* AF67A4 8007F604 0C024B6B */ jal func_80092DAC +/* AF67A4 8007F604 0C024B6B */ jal Quake_SetSpeed /* AF67A8 8007F608 24052EE0 */ li $a1, 12000 /* AF67AC 8007F60C 00118400 */ sll $s0, $s1, 0x10 /* AF67B0 8007F610 00108403 */ sra $s0, $s0, 0x10 @@ -3655,14 +3655,14 @@ glabel L8007F588 /* AF67BC 8007F61C 00002825 */ move $a1, $zero /* AF67C0 8007F620 24060001 */ li $a2, 1 /* AF67C4 8007F624 2407000A */ li $a3, 10 -/* AF67C8 8007F628 0C024B9C */ jal func_80092E70 +/* AF67C8 8007F628 0C024B9C */ jal Quake_SetQuakeValues /* AF67CC 8007F62C AFA00010 */ sw $zero, 0x10($sp) /* AF67D0 8007F630 87A500FA */ lh $a1, 0xfa($sp) /* AF67D4 8007F634 00102400 */ sll $a0, $s0, 0x10 /* AF67D8 8007F638 00042403 */ sra $a0, $a0, 0x10 /* AF67DC 8007F63C 24A5FFF6 */ addiu $a1, $a1, -0xa /* AF67E0 8007F640 00052C00 */ sll $a1, $a1, 0x10 -/* AF67E4 8007F644 0C024B7C */ jal func_80092DF0 +/* AF67E4 8007F644 0C024B7C */ jal Quake_SetCountdown /* AF67E8 8007F648 00052C03 */ sra $a1, $a1, 0x10 /* AF67EC 8007F64C 1000025B */ b .L8007FFBC /* AF67F0 8007F650 8FBF0044 */ lw $ra, 0x44($sp) diff --git a/asm/non_matchings/code/z_parameter/Interface_Draw.s b/asm/non_matchings/code/z_parameter/Interface_Draw.s index dd4c1be0a3..d64ce72794 100644 --- a/asm/non_matchings/code/z_parameter/Interface_Draw.s +++ b/asm/non_matchings/code/z_parameter/Interface_Draw.s @@ -92,7 +92,7 @@ glabel Interface_Draw /* B01BB4 8008AA14 27A40260 */ addiu $a0, $sp, 0x260 /* B01BB8 8008AA18 24C6E38C */ addiu $a2, %lo(D_8013E38C) # addiu $a2, $a2, -0x1c74 /* B01BBC 8008AA1C 24070D4D */ li $a3, 3405 -/* B01BC0 8008AA20 0C031AB1 */ jal func_800C6AC4 +/* B01BC0 8008AA20 0C031AB1 */ jal Graph_OpenDisps /* B01BC4 8008AA24 00A0A025 */ move $s4, $a1 /* B01BC8 8008AA28 8E8702B0 */ lw $a3, 0x2b0($s4) /* B01BCC 8008AA2C 3C18DB06 */ lui $t8, (0xDB060008 >> 16) # lui $t8, 0xdb06 @@ -179,7 +179,7 @@ glabel Interface_Draw /* B01D10 8008AB70 AFAA0020 */ sw $t2, 0x20($sp) /* B01D14 8008AB74 AFAB0024 */ sw $t3, 0x24($sp) /* B01D18 8008AB78 24070010 */ li $a3, 16 -/* B01D1C 8008AB7C 0C0210A6 */ jal Draw_TextureIA8 +/* B01D1C 8008AB7C 0C0210A6 */ jal Gfx_TextureIA8 /* B01D20 8008AB80 24060010 */ li $a2, 16 /* B01D24 8008AB84 AE8202B0 */ sw $v0, 0x2b0($s4) /* B01D28 8008AB88 86EC00A4 */ lh $t4, 0xa4($s7) @@ -239,7 +239,7 @@ glabel L8008ABB0 /* B01DFC 8008AC5C AFAE001C */ sw $t6, 0x1c($sp) /* B01E00 8008AC60 AFAC0014 */ sw $t4, 0x14($sp) /* B01E04 8008AC64 AFAB0010 */ sw $t3, 0x10($sp) -/* B01E08 8008AC68 0C0210A6 */ jal Draw_TextureIA8 +/* B01E08 8008AC68 0C0210A6 */ jal Gfx_TextureIA8 /* B01E0C 8008AC6C 24070010 */ li $a3, 16 /* B01E10 8008AC70 AE8202B0 */ sw $v0, 0x2b0($s4) /* B01E14 8008AC74 24590008 */ addiu $t9, $v0, 8 @@ -305,7 +305,7 @@ glabel L8008ABB0 /* B01EFC 8008AD5C AFAD0018 */ sw $t5, 0x18($sp) /* B01F00 8008AD60 AFAC0014 */ sw $t4, 0x14($sp) /* B01F04 8008AD64 AFAB0010 */ sw $t3, 0x10($sp) -/* B01F08 8008AD68 0C02112F */ jal Draw_TextureI8 +/* B01F08 8008AD68 0C02112F */ jal Gfx_TextureI8 /* B01F0C 8008AD6C 032A2821 */ addu $a1, $t9, $t2 /* B01F10 8008AD70 AE8202B0 */ sw $v0, 0x2b0($s4) /* B01F14 8008AD74 86C30238 */ lh $v1, 0x238($s6) @@ -328,7 +328,7 @@ glabel L8008ABB0 /* B01F54 8008ADB4 032A2821 */ addu $a1, $t9, $t2 /* B01F58 8008ADB8 AFB20010 */ sw $s2, 0x10($sp) /* B01F5C 8008ADBC 24060008 */ li $a2, 8 -/* B01F60 8008ADC0 0C02112F */ jal Draw_TextureI8 +/* B01F60 8008ADC0 0C02112F */ jal Gfx_TextureI8 /* B01F64 8008ADC4 24070010 */ li $a3, 16 /* B01F68 8008ADC8 AE8202B0 */ sw $v0, 0x2b0($s4) .L8008ADCC: @@ -482,7 +482,7 @@ glabel L8008ABB0 /* B02188 8008AFE8 AFB90024 */ sw $t9, 0x24($sp) /* B0218C 8008AFEC AFB20010 */ sw $s2, 0x10($sp) /* B02190 8008AFF0 24060008 */ li $a2, 8 -/* B02194 8008AFF4 0C02112F */ jal Draw_TextureI8 +/* B02194 8008AFF4 0C02112F */ jal Gfx_TextureI8 /* B02198 8008AFF8 24070010 */ li $a3, 16 /* B0219C 8008AFFC 26730001 */ addiu $s3, $s3, 1 /* B021A0 8008B000 00139C00 */ sll $s3, $s3, 0x10 @@ -1743,7 +1743,7 @@ glabel L8008ABB0 /* B034B4 8008C314 00021040 */ sll $v0, $v0, 1 /* B034B8 8008C318 3042FFFF */ andi $v0, $v0, 0xffff /* B034BC 8008C31C AFA20020 */ sw $v0, 0x20($sp) -/* B034C0 8008C320 0C02112F */ jal Draw_TextureI8 +/* B034C0 8008C320 0C02112F */ jal Gfx_TextureI8 /* B034C4 8008C324 AFA20024 */ sw $v0, 0x24($sp) /* B034C8 8008C328 26310009 */ addiu $s1, $s1, 9 /* B034CC 8008C32C 26100001 */ addiu $s0, $s0, 1 @@ -2897,7 +2897,7 @@ glabel L8008D1EC /* B044F8 8008D358 AFAC0020 */ sw $t4, 0x20($sp) /* B044FC 8008D35C AFAB001C */ sw $t3, 0x1c($sp) /* B04500 8008D360 24070010 */ li $a3, 16 -/* B04504 8008D364 0C0210A6 */ jal Draw_TextureIA8 +/* B04504 8008D364 0C0210A6 */ jal Gfx_TextureIA8 /* B04508 8008D368 AFB10010 */ sw $s1, 0x10($sp) /* B0450C 8008D36C 8FA90064 */ lw $t1, 0x64($sp) /* B04510 8008D370 AE8202B0 */ sw $v0, 0x2b0($s4) @@ -3000,7 +3000,7 @@ glabel L8008D1EC /* B04684 8008D4E4 AFA20024 */ sw $v0, 0x24($sp) /* B04688 8008D4E8 AFA90064 */ sw $t1, 0x64($sp) /* B0468C 8008D4EC 24060008 */ li $a2, 8 -/* B04690 8008D4F0 0C02112F */ jal Draw_TextureI8 +/* B04690 8008D4F0 0C02112F */ jal Gfx_TextureI8 /* B04694 8008D4F4 24070010 */ li $a3, 16 /* B04698 8008D4F8 26730001 */ addiu $s3, $s3, 1 /* B0469C 8008D4FC 00139C00 */ sll $s3, $s3, 0x10 @@ -3065,7 +3065,7 @@ glabel L8008D1EC /* B04780 8008D5E0 ACEA0000 */ sw $t2, ($a3) .L8008D5E4: /* B04784 8008D5E4 8EE50000 */ lw $a1, ($s7) -/* B04788 8008D5E8 0C031AD5 */ jal func_800C6B54 +/* B04788 8008D5E8 0C031AD5 */ jal Graph_CloseDisps /* B0478C 8008D5EC 240710AD */ li $a3, 4269 /* B04790 8008D5F0 8FBF004C */ lw $ra, 0x4c($sp) /* B04794 8008D5F4 8FB0002C */ lw $s0, 0x2c($sp) diff --git a/asm/non_matchings/code/z_parameter/Interface_DrawItemButtons.s b/asm/non_matchings/code/z_parameter/Interface_DrawItemButtons.s index 213bd0fa3c..c9fa4f2e05 100644 --- a/asm/non_matchings/code/z_parameter/Interface_DrawItemButtons.s +++ b/asm/non_matchings/code/z_parameter/Interface_DrawItemButtons.s @@ -19,7 +19,7 @@ glabel Interface_DrawItemButtons /* AFFE78 80088CD8 8C850000 */ lw $a1, ($a0) /* AFFE7C 80088CDC 27A40130 */ addiu $a0, $sp, 0x130 /* AFFE80 80088CE0 24070B54 */ li $a3, 2900 -/* AFFE84 80088CE4 0C031AB1 */ jal func_800C6AC4 +/* AFFE84 80088CE4 0C031AB1 */ jal Graph_OpenDisps /* AFFE88 80088CE8 AFA50140 */ sw $a1, 0x140($sp) /* AFFE8C 80088CEC 8FAA0140 */ lw $t2, 0x140($sp) /* AFFE90 80088CF0 3C19E700 */ lui $t9, 0xe700 @@ -89,7 +89,7 @@ glabel Interface_DrawItemButtons /* AFFF90 80088DF0 00084040 */ sll $t0, $t0, 1 /* AFFF94 80088DF4 3108FFFF */ andi $t0, $t0, 0xffff /* AFFF98 80088DF8 AFA80020 */ sw $t0, 0x20($sp) -/* AFFF9C 80088DFC 0C0210A6 */ jal Draw_TextureIA8 +/* AFFF9C 80088DFC 0C0210A6 */ jal Gfx_TextureIA8 /* AFFFA0 80088E00 AFA80024 */ sw $t0, 0x24($sp) /* AFFFA4 80088E04 8FAA0140 */ lw $t2, 0x140($sp) /* AFFFA8 80088E08 8FAC003C */ lw $t4, 0x3c($sp) @@ -908,7 +908,7 @@ glabel Interface_DrawItemButtons /* B00C24 80089A84 3108FFFF */ andi $t0, $t0, 0xffff /* B00C28 80089A88 AFA80020 */ sw $t0, 0x20($sp) /* B00C2C 80089A8C AFA80024 */ sw $t0, 0x24($sp) -/* B00C30 80089A90 0C0210A6 */ jal Draw_TextureIA8 +/* B00C30 80089A90 0C0210A6 */ jal Gfx_TextureIA8 /* B00C34 80089A94 A7A9014A */ sh $t1, 0x14a($sp) /* B00C38 80089A98 8FAA0140 */ lw $t2, 0x140($sp) /* B00C3C 80089A9C 87A9014A */ lh $t1, 0x14a($sp) @@ -931,7 +931,7 @@ glabel Interface_DrawItemButtons /* B00C7C 80089ADC 24C6E2EC */ addiu $a2, %lo(D_8013E2EC) # addiu $a2, $a2, -0x1d14 /* B00C80 80089AE0 27A40130 */ addiu $a0, $sp, 0x130 /* B00C84 80089AE4 24070BFF */ li $a3, 3071 -/* B00C88 80089AE8 0C031AD5 */ jal func_800C6B54 +/* B00C88 80089AE8 0C031AD5 */ jal Graph_CloseDisps /* B00C8C 80089AEC 8DC50000 */ lw $a1, ($t6) /* B00C90 80089AF0 8FBF002C */ lw $ra, 0x2c($sp) /* B00C94 80089AF4 27BD0158 */ addiu $sp, $sp, 0x158 diff --git a/asm/non_matchings/code/z_parameter/Item_Give.s b/asm/non_matchings/code/z_parameter/Item_Give.s index cdc94b57d0..e70cd5b905 100644 --- a/asm/non_matchings/code/z_parameter/Item_Give.s +++ b/asm/non_matchings/code/z_parameter/Item_Give.s @@ -160,9 +160,9 @@ glabel Item_Give /* AFBF64 80084DC4 2A01006C */ slti $at, $s0, 0x6c /* AFBF68 80084DC8 10200018 */ beqz $at, .L80084E2C /* AFBF6C 80084DCC 00106080 */ sll $t4, $s0, 2 -/* AFBF70 80084DD0 3C0D8012 */ lui $t5, %hi(D_80126F88) +/* AFBF70 80084DD0 3C0D8012 */ lui $t5, %hi(gBitFlags-0x198) /* AFBF74 80084DD4 01AC6821 */ addu $t5, $t5, $t4 -/* AFBF78 80084DD8 8DAD6F88 */ lw $t5, %lo(D_80126F88)($t5) +/* AFBF78 80084DD8 8DAD6F88 */ lw $t5, %lo(gBitFlags-0x198)($t5) /* AFBF7C 80084DDC 8E3900A4 */ lw $t9, 0xa4($s1) /* AFBF80 80084DE0 3C048014 */ lui $a0, %hi(D_8013DF58) # $a0, 0x8014 /* AFBF84 80084DE4 2484DF58 */ addiu $a0, %lo(D_8013DF58) # addiu $a0, $a0, -0x20a8 @@ -223,9 +223,9 @@ glabel Item_Give /* AFC054 80084EB4 2A01006F */ slti $at, $s0, 0x6f /* AFC058 80084EB8 10200013 */ beqz $at, .L80084F08 /* AFC05C 80084EBC 00107880 */ sll $t7, $s0, 2 -/* AFC060 80084EC0 3C188012 */ lui $t8, %hi(D_80126FB8) +/* AFC060 80084EC0 3C188012 */ lui $t8, %hi(gBitFlags-0x168) /* AFC064 80084EC4 030FC021 */ addu $t8, $t8, $t7 -/* AFC068 80084EC8 8F186FB8 */ lw $t8, %lo(D_80126FB8)($t8) +/* AFC068 80084EC8 8F186FB8 */ lw $t8, %lo(gBitFlags-0x168)($t8) /* AFC06C 80084ECC 8E2E00A4 */ lw $t6, 0xa4($s1) /* AFC070 80084ED0 3C048014 */ lui $a0, %hi(D_8013DFA0) # $a0, 0x8014 /* AFC074 80084ED4 2484DFA0 */ addiu $a0, %lo(D_8013DFA0) # addiu $a0, $a0, -0x2060 @@ -248,9 +248,9 @@ glabel Item_Give /* AFC0B4 80084F14 24010070 */ li $at, 112 /* AFC0B8 80084F18 16010012 */ bne $s0, $at, .L80084F64 .L80084F1C: -/* AFC0BC 80084F1C 3C0F8012 */ lui $t7, %hi(D_80126FB8) +/* AFC0BC 80084F1C 3C0F8012 */ lui $t7, %hi(gBitFlags-0x168) /* AFC0C0 80084F20 01ED7821 */ addu $t7, $t7, $t5 -/* AFC0C4 80084F24 8DEF6FB8 */ lw $t7, %lo(D_80126FB8)($t7) +/* AFC0C4 80084F24 8DEF6FB8 */ lw $t7, %lo(gBitFlags-0x168)($t7) /* AFC0C8 80084F28 8E3900A4 */ lw $t9, 0xa4($s1) /* AFC0CC 80084F2C 3C048014 */ lui $a0, %hi(D_8013DFBC) # $a0, 0x8014 /* AFC0D0 80084F30 2484DFBC */ addiu $a0, %lo(D_8013DFBC) # addiu $a0, $a0, -0x2044 @@ -270,9 +270,9 @@ glabel Item_Give /* AFC104 80084F64 24010071 */ li $at, 113 /* AFC108 80084F68 16010017 */ bne $s0, $at, .L80084FC8 /* AFC10C 80084F6C 00106080 */ sll $t4, $s0, 2 -/* AFC110 80084F70 3C0D8012 */ lui $t5, %hi(D_80126FB8) +/* AFC110 80084F70 3C0D8012 */ lui $t5, %hi(gBitFlags-0x168) /* AFC114 80084F74 01AC6821 */ addu $t5, $t5, $t4 -/* AFC118 80084F78 8DAD6FB8 */ lw $t5, %lo(D_80126FB8)($t5) +/* AFC118 80084F78 8DAD6FB8 */ lw $t5, %lo(gBitFlags-0x168)($t5) /* AFC11C 80084F7C 8E3800A4 */ lw $t8, 0xa4($s1) /* AFC120 80084F80 862F00D0 */ lh $t7, 0xd0($s1) /* AFC124 80084F84 3C048014 */ lui $a0, %hi(D_8013DFD8) # $a0, 0x8014 @@ -299,9 +299,9 @@ glabel Item_Give /* AFC174 80084FD4 10200031 */ beqz $at, .L8008509C /* AFC178 80084FD8 3C028012 */ lui $v0, %hi(gEquipShifts) # $v0, 0x8012 /* AFC17C 80084FDC 0010C080 */ sll $t8, $s0, 2 -/* AFC180 80084FE0 3C0D8012 */ lui $t5, %hi(D_80127034) +/* AFC180 80084FE0 3C0D8012 */ lui $t5, %hi(gBitFlags-0xec) /* AFC184 80084FE4 01B86821 */ addu $t5, $t5, $t8 -/* AFC188 80084FE8 8DAD7034 */ lw $t5, %lo(D_80127034)($t5) +/* AFC188 80084FE8 8DAD7034 */ lw $t5, %lo(gBitFlags-0xec)($t5) /* AFC18C 80084FEC 904271F0 */ lbu $v0, %lo(gEquipShifts)($v0) /* AFC190 80084FF0 962C009C */ lhu $t4, 0x9c($s1) /* AFC194 80084FF4 2401003D */ li $at, 61 @@ -354,11 +354,11 @@ glabel Item_Give /* AFC244 800850A4 2A010041 */ slti $at, $s0, 0x41 /* AFC248 800850A8 1020000C */ beqz $at, .L800850DC /* AFC24C 800850AC 00106880 */ sll $t5, $s0, 2 -/* AFC250 800850B0 3C0C8012 */ lui $t4, %hi(D_80127028) +/* AFC250 800850B0 3C0C8012 */ lui $t4, %hi(gBitFlags-0xf8) /* AFC254 800850B4 018D6021 */ addu $t4, $t4, $t5 /* AFC258 800850B8 3C198012 */ lui $t9, %hi(gEquipShifts+1) # $t9, 0x8012 /* AFC25C 800850BC 933971F1 */ lbu $t9, %lo(gEquipShifts+1)($t9) -/* AFC260 800850C0 8D8C7028 */ lw $t4, %lo(D_80127028)($t4) +/* AFC260 800850C0 8D8C7028 */ lw $t4, %lo(gBitFlags-0xf8)($t4) /* AFC264 800850C4 962E009C */ lhu $t6, 0x9c($s1) /* AFC268 800850C8 240200FF */ li $v0, 255 /* AFC26C 800850CC 032C7804 */ sllv $t7, $t4, $t9 @@ -371,11 +371,11 @@ glabel Item_Give /* AFC284 800850E4 2A010044 */ slti $at, $s0, 0x44 /* AFC288 800850E8 1020000C */ beqz $at, .L8008511C /* AFC28C 800850EC 00106880 */ sll $t5, $s0, 2 -/* AFC290 800850F0 3C0C8012 */ lui $t4, %hi(D_8012701C) +/* AFC290 800850F0 3C0C8012 */ lui $t4, %hi(gBitFlags-0x104) /* AFC294 800850F4 018D6021 */ addu $t4, $t4, $t5 /* AFC298 800850F8 3C198012 */ lui $t9, %hi(gEquipShifts+2) # $t9, 0x8012 /* AFC29C 800850FC 933971F2 */ lbu $t9, %lo(gEquipShifts+2)($t9) -/* AFC2A0 80085100 8D8C701C */ lw $t4, %lo(D_8012701C)($t4) +/* AFC2A0 80085100 8D8C701C */ lw $t4, %lo(gBitFlags-0x104)($t4) /* AFC2A4 80085104 962F009C */ lhu $t7, 0x9c($s1) /* AFC2A8 80085108 240200FF */ li $v0, 255 /* AFC2AC 8008510C 032C7004 */ sllv $t6, $t4, $t9 @@ -388,11 +388,11 @@ glabel Item_Give /* AFC2C4 80085124 2A010047 */ slti $at, $s0, 0x47 /* AFC2C8 80085128 1020000C */ beqz $at, .L8008515C /* AFC2CC 8008512C 00106880 */ sll $t5, $s0, 2 -/* AFC2D0 80085130 3C0C8012 */ lui $t4, %hi(D_80127010) +/* AFC2D0 80085130 3C0C8012 */ lui $t4, %hi(gBitFlags-0x110) /* AFC2D4 80085134 018D6021 */ addu $t4, $t4, $t5 /* AFC2D8 80085138 3C198012 */ lui $t9, %hi(gEquipShifts+3) # $t9, 0x8012 /* AFC2DC 8008513C 933971F3 */ lbu $t9, %lo(gEquipShifts+3)($t9) -/* AFC2E0 80085140 8D8C7010 */ lw $t4, %lo(D_80127010)($t4) +/* AFC2E0 80085140 8D8C7010 */ lw $t4, %lo(gBitFlags-0x110)($t4) /* AFC2E4 80085144 962E009C */ lhu $t6, 0x9c($s1) /* AFC2E8 80085148 240200FF */ li $v0, 255 /* AFC2EC 8008514C 032C7804 */ sllv $t7, $t4, $t9 @@ -410,11 +410,11 @@ glabel Item_Give /* AFC318 80085178 24010077 */ li $at, 119 .L8008517C: /* AFC31C 8008517C 962D1402 */ lhu $t5, 0x1402($s1) -/* AFC320 80085180 3C0E8012 */ lui $t6, %hi(D_80126F50) +/* AFC320 80085180 3C0E8012 */ lui $t6, %hi(gBitFlags-0x1d0) /* AFC324 80085184 01D97021 */ addu $t6, $t6, $t9 /* AFC328 80085188 022D1821 */ addu $v1, $s1, $t5 /* AFC32C 8008518C 906C00A8 */ lbu $t4, 0xa8($v1) -/* AFC330 80085190 8DCE6F50 */ lw $t6, %lo(D_80126F50)($t6) +/* AFC330 80085190 8DCE6F50 */ lw $t6, %lo(gBitFlags-0x1d0)($t6) /* AFC334 80085194 240200FF */ li $v0, 255 /* AFC338 80085198 018E7825 */ or $t7, $t4, $t6 /* AFC33C 8008519C 10000475 */ b .L80086374 diff --git a/asm/non_matchings/code/z_play/func_800BCA64.s b/asm/non_matchings/code/z_play/func_800BCA64.s index 875a374029..14b540a6fc 100644 --- a/asm/non_matchings/code/z_play/func_800BCA64.s +++ b/asm/non_matchings/code/z_play/func_800BCA64.s @@ -58,7 +58,7 @@ glabel func_800BCA64 /* B33C50 800BCAB0 AC8F000C */ sw $t7, 0xc($a0) .L800BCAB4: /* B33C54 800BCAB4 0C03F616 */ jal SystemArena_Display -/* B33C58 800BCAB8 00000000 */ nop +/* B33C58 800BCAB8 00000000 */ nop /* B33C5C 800BCABC 3C05001D */ lui $a1, (0x001D4790 >> 16) # lui $a1, 0x1d /* B33C60 800BCAC0 34A54790 */ ori $a1, (0x001D4790 & 0xFFFF) # ori $a1, $a1, 0x4790 /* B33C64 800BCAC4 0C0313C8 */ jal func_800C4F20 @@ -71,8 +71,8 @@ glabel func_800BCA64 /* B33C80 800BCAE0 02002825 */ move $a1, $s0 /* B33C84 800BCAE4 0C03DA0A */ jal func_800F6828 /* B33C88 800BCAE8 00002025 */ move $a0, $zero -/* B33C8C 800BCAEC 0C024BCE */ jal func_80092F38 -/* B33C90 800BCAF0 00000000 */ nop +/* B33C8C 800BCAEC 0C024BCE */ jal Quake_Init +/* B33C90 800BCAF0 00000000 */ nop /* B33C94 800BCAF4 00002025 */ move $a0, $zero /* B33C98 800BCAF8 02201025 */ move $v0, $s1 .L800BCAFC: @@ -139,7 +139,7 @@ glabel func_800BCA64 /* B33D88 800BCBE8 3C010001 */ lui $at, (0x00010B20 >> 16) # lui $at, 1 /* B33D8C 800BCBEC 34210B20 */ ori $at, (0x00010B20 & 0xFFFF) # ori $at, $at, 0xb20 /* B33D90 800BCBF0 02212021 */ addu $a0, $s1, $at -/* B33D94 800BCBF4 0C028CBB */ jal func_800A32EC +/* B33D94 800BCBF4 0C028CBB */ jal SkelAnime_AnimationCtxReset /* B33D98 800BCBF8 AFA4003C */ sw $a0, 0x3c($sp) /* B33D9C 800BCBFC 02202025 */ move $a0, $s1 /* B33DA0 800BCC00 0C019143 */ jal func_8006450C @@ -199,19 +199,19 @@ glabel func_800BCA64 /* B33E5C 800BCCBC 8E420004 */ lw $v0, 4($s2) .L800BCCC0: /* B33E60 800BCCC0 10400006 */ beqz $v0, .L800BCCDC -/* B33E64 800BCCC4 00000000 */ nop +/* B33E64 800BCCC4 00000000 */ nop /* B33E68 800BCCC8 8E580010 */ lw $t8, 0x10($s2) /* B33E6C 800BCCCC 17000003 */ bnez $t8, .L800BCCDC -/* B33E70 800BCCD0 00000000 */ nop +/* B33E70 800BCCD0 00000000 */ nop /* B33E74 800BCCD4 10000012 */ b .L800BCD20 /* B33E78 800BCCD8 AE401360 */ sw $zero, 0x1360($s2) .L800BCCDC: /* B33E7C 800BCCDC 10400007 */ beqz $v0, .L800BCCFC -/* B33E80 800BCCE0 00000000 */ nop +/* B33E80 800BCCE0 00000000 */ nop /* B33E84 800BCCE4 8E590010 */ lw $t9, 0x10($s2) /* B33E88 800BCCE8 24090001 */ li $t1, 1 /* B33E8C 800BCCEC 13200003 */ beqz $t9, .L800BCCFC -/* B33E90 800BCCF0 00000000 */ nop +/* B33E90 800BCCF0 00000000 */ nop /* B33E94 800BCCF4 1000000A */ b .L800BCD20 /* B33E98 800BCCF8 AE491360 */ sw $t1, 0x1360($s2) .L800BCCFC: @@ -310,17 +310,17 @@ glabel func_800BCA64 /* B33FF0 800BCE50 01394821 */ addu $t1, $t1, $t9 /* B33FF4 800BCE54 812981C0 */ lb $t1, %lo(gEntranceTable)($t1) /* B33FF8 800BCE58 1521000E */ bne $t1, $at, .L800BCE94 -/* B33FFC 800BCE5C 00000000 */ nop +/* B33FFC 800BCE5C 00000000 */ nop /* B34000 800BCE60 8E4A1360 */ lw $t2, 0x1360($s2) /* B34004 800BCE64 24010006 */ li $at, 6 /* B34008 800BCE68 3C048014 */ lui $a0, %hi(D_80144204) # $a0, 0x8014 /* B3400C 800BCE6C 15410009 */ bne $t2, $at, .L800BCE94 -/* B34010 800BCE70 00000000 */ nop +/* B34010 800BCE70 00000000 */ nop /* B34014 800BCE74 0C00084C */ jal osSyncPrintf /* B34018 800BCE78 24844204 */ addiu $a0, %lo(D_80144204) # addiu $a0, $a0, 0x4204 /* B3401C 800BCE7C 3C198100 */ lui $t9, 0x8100 /* B34020 800BCE80 0320F809 */ jalr $t9 -/* B34024 800BCE84 00000000 */ nop +/* B34024 800BCE84 00000000 */ nop /* B34028 800BCE88 3C048014 */ lui $a0, %hi(D_80144220) # $a0, 0x8014 /* B3402C 800BCE8C 0C00084C */ jal osSyncPrintf /* B34030 800BCE90 24844220 */ addiu $a0, %lo(D_80144220) # addiu $a0, $a0, 0x4220 @@ -400,7 +400,7 @@ glabel func_800BCA64 /* B34144 800BCFA4 0C0239A8 */ jal func_8008E6A0 /* B34148 800BCFA8 262407B8 */ addiu $a0, $s1, 0x7b8 /* B3414C 800BCFAC 0C001A78 */ jal osGetTime -/* B34150 800BCFB0 00000000 */ nop +/* B34150 800BCFB0 00000000 */ nop /* B34154 800BCFB4 0C03F668 */ jal func_800FD9A0 /* B34158 800BCFB8 00602025 */ move $a0, $v1 /* B3415C 800BCFBC 0C034204 */ jal Matrix_Init @@ -459,7 +459,7 @@ glabel func_800BCA64 /* B34228 800BD088 A02F1E5E */ sb $t7, 0x1e5e($at) .L800BD08C: /* B3422C 800BD08C 0C02CE42 */ jal func_800B3908 -/* B34230 800BD090 00000000 */ nop +/* B34230 800BD090 00000000 */ nop /* B34234 800BD094 3C010001 */ lui $at, (0x0001241C >> 16) # lui $at, 1 /* B34238 800BD098 3421241C */ ori $at, (0x0001241C & 0xFFFF) # ori $at, $at, 0x241c /* B3423C 800BD09C 02218021 */ addu $s0, $s1, $at @@ -556,7 +556,7 @@ glabel func_800BCA64 /* B343A0 800BD200 24844268 */ addiu $a0, %lo(D_80144268) # addiu $a0, $a0, 0x4268 /* B343A4 800BD204 321000FF */ andi $s0, $s0, 0xff /* B343A8 800BD208 12010006 */ beq $s0, $at, .L800BD224 -/* B343AC 800BD20C 00000000 */ nop +/* B343AC 800BD20C 00000000 */ nop /* B343B0 800BD210 0C00084C */ jal osSyncPrintf /* B343B4 800BD214 02002825 */ move $a1, $s0 /* B343B8 800BD218 8FA40038 */ lw $a0, 0x38($sp) diff --git a/asm/non_matchings/code/z_play/func_800BD314.s b/asm/non_matchings/code/z_play/func_800BD314.s index 57a45d94b5..25170f5a22 100644 --- a/asm/non_matchings/code/z_play/func_800BD314.s +++ b/asm/non_matchings/code/z_play/func_800BD314.s @@ -389,7 +389,7 @@ glabel func_800BD314 /* B344CC 800BD32C 844E00D6 */ lh $t6, 0xd6($v0) /* B344D0 800BD330 00808025 */ move $s0, $a0 /* B344D4 800BD334 05C00004 */ bltz $t6, .L800BD348 -/* B344D8 800BD338 00000000 */ nop +/* B344D8 800BD338 00000000 */ nop /* B344DC 800BD33C 844F0554 */ lh $t7, 0x554($v0) /* B344E0 800BD340 51E00006 */ beql $t7, $zero, .L800BD35C /* B344E4 800BD344 84581074 */ lh $t8, 0x1074($v0) @@ -494,11 +494,11 @@ glabel func_800BD314 /* B34654 800BD4B4 0C0239AB */ jal func_8008E6AC /* B34658 800BD4B8 AC590008 */ sw $t9, 8($v0) /* B3465C 800BD4BC 1040059C */ beqz $v0, .L800BEB30 -/* B34660 800BD4C0 00000000 */ nop +/* B34660 800BD4C0 00000000 */ nop /* B34664 800BD4C4 9229241B */ lbu $t1, 0x241b($s1) /* B34668 800BD4C8 3C028016 */ lui $v0, %hi(D_80161490) # $v0, 0x8016 /* B3466C 800BD4CC 15200007 */ bnez $t1, .L800BD4EC -/* B34670 800BD4D0 00000000 */ nop +/* B34670 800BD4D0 00000000 */ nop /* B34674 800BD4D4 822A1E15 */ lb $t2, 0x1e15($s1) /* B34678 800BD4D8 3C010001 */ lui $at, 1 /* B3467C 800BD4DC 00300821 */ addu $at, $at, $s0 @@ -550,7 +550,7 @@ glabel func_800BD314 .L800BD580: /* B34720 800BD580 24010001 */ li $at, 1 /* B34724 800BD584 108002F0 */ beqz $a0, .L800BE148 -/* B34728 800BD588 00000000 */ nop +/* B34728 800BD588 00000000 */ nop /* B3472C 800BD58C 10810008 */ beq $a0, $at, .L800BD5B0 /* B34730 800BD590 00801025 */ move $v0, $a0 /* B34734 800BD594 24010002 */ li $at, 2 @@ -565,7 +565,7 @@ glabel func_800BD314 /* B34754 800BD5B4 2401FFEC */ li $at, -20 /* B34758 800BD5B8 24040001 */ li $a0, 1 /* B3475C 800BD5BC 1301002C */ beq $t8, $at, .L800BD670 -/* B34760 800BD5C0 00000000 */ nop +/* B34760 800BD5C0 00000000 */ nop /* B34764 800BD5C4 0C020978 */ jal Interface_ChangeAlpha /* B34768 800BD5C8 A7A0006E */ sh $zero, 0x6e($sp) /* B3476C 800BD5CC 3C038016 */ lui $v1, %hi(gSaveContext+8) # $v1, 0x8016 @@ -589,15 +589,15 @@ glabel func_800BD314 /* B347B0 800BD610 958C81C2 */ lhu $t4, %lo(gEntranceTable+2)($t4) /* B347B4 800BD614 318D8000 */ andi $t5, $t4, 0x8000 /* B347B8 800BD618 15A00015 */ bnez $t5, .L800BD670 -/* B347BC 800BD61C 00000000 */ nop +/* B347BC 800BD61C 00000000 */ nop /* B347C0 800BD620 0C00084C */ jal osSyncPrintf /* B347C4 800BD624 2484431C */ addiu $a0, %lo(D_8014431C) # addiu $a0, $a0, 0x431c /* B347C8 800BD628 922E1E5E */ lbu $t6, 0x1e5e($s1) /* B347CC 800BD62C 29C10038 */ slti $at, $t6, 0x38 /* B347D0 800BD630 1020000F */ beqz $at, .L800BD670 -/* B347D4 800BD634 00000000 */ nop +/* B347D4 800BD634 00000000 */ nop /* B347D8 800BD638 0C01DD80 */ jal func_80077600 -/* B347DC 800BD63C 00000000 */ nop +/* B347DC 800BD63C 00000000 */ nop /* B347E0 800BD640 1440000B */ bnez $v0, .L800BD670 /* B347E4 800BD644 3C048014 */ lui $a0, %hi(D_80144340) # $a0, 0x8014 /* B347E8 800BD648 0C00084C */ jal osSyncPrintf @@ -616,7 +616,7 @@ glabel func_800BD314 /* B34818 800BD678 02002025 */ move $a0, $s0 /* B3481C 800BD67C 8459086A */ lh $t9, 0x86a($v0) /* B34820 800BD680 17200006 */ bnez $t9, .L800BD69C -/* B34824 800BD684 00000000 */ nop +/* B34824 800BD684 00000000 */ nop /* B34828 800BD688 02002025 */ move $a0, $s0 /* B3482C 800BD68C 0C02F178 */ jal func_800BC5E0 /* B34830 800BD690 92251E5E */ lbu $a1, 0x1e5e($s1) @@ -636,17 +636,17 @@ glabel func_800BD314 /* B3485C 800BD6BC AFA40040 */ sw $a0, 0x40($sp) /* B34860 800BD6C0 8E3923F4 */ lw $t9, 0x23f4($s1) /* B34864 800BD6C4 0320F809 */ jalr $t9 -/* B34868 800BD6C8 00000000 */ nop +/* B34868 800BD6C8 00000000 */ nop /* B3486C 800BD6CC 8E2323F0 */ lw $v1, 0x23f0($s1) /* B34870 800BD6D0 24010001 */ li $at, 1 /* B34874 800BD6D4 00034943 */ sra $t1, $v1, 5 /* B34878 800BD6D8 15210006 */ bne $t1, $at, .L800BD6F4 -/* B3487C 800BD6DC 00000000 */ nop +/* B3487C 800BD6DC 00000000 */ nop /* B34880 800BD6E0 8E392408 */ lw $t9, 0x2408($s1) /* B34884 800BD6E4 8FA40040 */ lw $a0, 0x40($sp) /* B34888 800BD6E8 34650080 */ ori $a1, $v1, 0x80 /* B3488C 800BD6EC 0320F809 */ jalr $t9 -/* B34890 800BD6F0 00000000 */ nop +/* B34890 800BD6F0 00000000 */ nop .L800BD6F4: /* B34894 800BD6F4 3C028016 */ lui $v0, %hi(gSaveContext) # $v0, 0x8016 /* B34898 800BD6F8 2442E660 */ addiu $v0, %lo(gSaveContext) # addiu $v0, $v0, -0x19a0 @@ -760,7 +760,7 @@ glabel func_800BD314 /* B34A1C 800BD87C 8FA40040 */ lw $a0, 0x40($sp) /* B34A20 800BD880 00002825 */ move $a1, $zero /* B34A24 800BD884 0320F809 */ jalr $t9 -/* B34A28 800BD888 00000000 */ nop +/* B34A28 800BD888 00000000 */ nop /* B34A2C 800BD88C 8E222410 */ lw $v0, 0x2410($s1) /* B34A30 800BD890 8FA40040 */ lw $a0, 0x40($sp) /* B34A34 800BD894 50400004 */ beql $v0, $zero, .L800BD8A8 @@ -776,7 +776,7 @@ glabel func_800BD314 /* B34A58 800BD8B8 8FA40040 */ lw $a0, 0x40($sp) /* B34A5C 800BD8BC 24050001 */ li $a1, 1 /* B34A60 800BD8C0 0320F809 */ jalr $t9 -/* B34A64 800BD8C4 00000000 */ nop +/* B34A64 800BD8C4 00000000 */ nop /* B34A68 800BD8C8 10000007 */ b .L800BD8E8 /* B34A6C 800BD8CC 8E392404 */ lw $t9, 0x2404($s1) /* B34A70 800BD8D0 8E392408 */ lw $t9, 0x2408($s1) @@ -784,12 +784,12 @@ glabel func_800BD314 /* B34A74 800BD8D4 8FA40040 */ lw $a0, 0x40($sp) /* B34A78 800BD8D8 24050002 */ li $a1, 2 /* B34A7C 800BD8DC 0320F809 */ jalr $t9 -/* B34A80 800BD8E0 00000000 */ nop +/* B34A80 800BD8E0 00000000 */ nop /* B34A84 800BD8E4 8E392404 */ lw $t9, 0x2404($s1) .L800BD8E8: /* B34A88 800BD8E8 8FA40040 */ lw $a0, 0x40($sp) /* B34A8C 800BD8EC 0320F809 */ jalr $t9 -/* B34A90 800BD8F0 00000000 */ nop +/* B34A90 800BD8F0 00000000 */ nop /* B34A94 800BD8F4 8E2923F0 */ lw $t1, 0x23f0($s1) /* B34A98 800BD8F8 2401000D */ li $at, 13 /* B34A9C 800BD8FC 240A000B */ li $t2, 11 @@ -813,7 +813,7 @@ glabel func_800BD314 /* B34AD8 800BD938 AFA40040 */ sw $a0, 0x40($sp) /* B34ADC 800BD93C 8E392414 */ lw $t9, 0x2414($s1) /* B34AE0 800BD940 0320F809 */ jalr $t9 -/* B34AE4 800BD944 00000000 */ nop +/* B34AE4 800BD944 00000000 */ nop /* B34AE8 800BD948 1040004F */ beqz $v0, .L800BDA88 /* B34AEC 800BD94C 3C098016 */ lui $t1, %hi(gGameInfo) /* B34AF0 800BD950 8E2C23F0 */ lw $t4, 0x23f0($s1) @@ -827,7 +827,7 @@ glabel func_800BD314 /* B34B10 800BD970 8E3923F8 */ lw $t9, 0x23f8($s1) /* B34B14 800BD974 8FA40040 */ lw $a0, 0x40($sp) /* B34B18 800BD978 0320F809 */ jalr $t9 -/* B34B1C 800BD97C 00000000 */ nop +/* B34B1C 800BD97C 00000000 */ nop /* B34B20 800BD980 0C02F223 */ jal func_800BC88C /* B34B24 800BD984 02002025 */ move $a0, $s0 /* B34B28 800BD988 3C010001 */ lui $at, 1 @@ -873,7 +873,7 @@ glabel func_800BD314 .L800BDA20: /* B34BC0 800BDA20 8FA40040 */ lw $a0, 0x40($sp) /* B34BC4 800BDA24 0320F809 */ jalr $t9 -/* B34BC8 800BDA28 00000000 */ nop +/* B34BC8 800BDA28 00000000 */ nop /* B34BCC 800BDA2C 0C02F223 */ jal func_800BC88C /* B34BD0 800BDA30 02002025 */ move $a0, $s0 /* B34BD4 800BDA34 3C010001 */ lui $at, 1 @@ -917,7 +917,7 @@ glabel func_800BD314 /* B34C54 800BDAB4 002A0821 */ addu $at, $at, $t2 /* B34C58 800BDAB8 8C2A49D0 */ lw $t2, %lo(jtbl_801449D0)($at) /* B34C5C 800BDABC 01400008 */ jr $t2 -/* B34C60 800BDAC0 00000000 */ nop +/* B34C60 800BDAC0 00000000 */ nop glabel L800BDAC4 /* B34C64 800BDAC4 3C038016 */ lui $v1, %hi(D_801614C8) # $v1, 0x8016 /* B34C68 800BDAC8 246314C8 */ addiu $v1, %lo(D_801614C8) # addiu $v1, $v1, 0x14c8 @@ -965,10 +965,10 @@ glabel L800BDB30 /* B34D08 800BDB68 460A4402 */ mul.s $f16, $f8, $f10 /* B34D0C 800BDB6C 4449F800 */ cfc1 $t1, $31 /* B34D10 800BDB70 44D9F800 */ ctc1 $t9, $31 -/* B34D14 800BDB74 00000000 */ nop +/* B34D14 800BDB74 00000000 */ nop /* B34D18 800BDB78 460084A4 */ cvt.w.s $f18, $f16 /* B34D1C 800BDB7C 4459F800 */ cfc1 $t9, $31 -/* B34D20 800BDB80 00000000 */ nop +/* B34D20 800BDB80 00000000 */ nop /* B34D24 800BDB84 33390078 */ andi $t9, $t9, 0x78 /* B34D28 800BDB88 53200013 */ beql $t9, $zero, .L800BDBD8 /* B34D2C 800BDB8C 44199000 */ mfc1 $t9, $f18 @@ -976,13 +976,13 @@ glabel L800BDB30 /* B34D34 800BDB94 24190001 */ li $t9, 1 /* B34D38 800BDB98 46128481 */ sub.s $f18, $f16, $f18 /* B34D3C 800BDB9C 44D9F800 */ ctc1 $t9, $31 -/* B34D40 800BDBA0 00000000 */ nop +/* B34D40 800BDBA0 00000000 */ nop /* B34D44 800BDBA4 460094A4 */ cvt.w.s $f18, $f18 /* B34D48 800BDBA8 4459F800 */ cfc1 $t9, $31 -/* B34D4C 800BDBAC 00000000 */ nop +/* B34D4C 800BDBAC 00000000 */ nop /* B34D50 800BDBB0 33390078 */ andi $t9, $t9, 0x78 /* B34D54 800BDBB4 17200005 */ bnez $t9, .L800BDBCC -/* B34D58 800BDBB8 00000000 */ nop +/* B34D58 800BDBB8 00000000 */ nop /* B34D5C 800BDBBC 44199000 */ mfc1 $t9, $f18 /* B34D60 800BDBC0 3C018000 */ lui $at, 0x8000 /* B34D64 800BDBC4 10000007 */ b .L800BDBE4 @@ -992,9 +992,9 @@ glabel L800BDB30 /* B34D70 800BDBD0 2419FFFF */ li $t9, -1 /* B34D74 800BDBD4 44199000 */ mfc1 $t9, $f18 .L800BDBD8: -/* B34D78 800BDBD8 00000000 */ nop +/* B34D78 800BDBD8 00000000 */ nop /* B34D7C 800BDBDC 0720FFFB */ bltz $t9, .L800BDBCC -/* B34D80 800BDBE0 00000000 */ nop +/* B34D80 800BDBE0 00000000 */ nop .L800BDBE4: /* B34D84 800BDBE4 A2390B09 */ sb $t9, 0xb09($s1) /* B34D88 800BDBE8 84620000 */ lh $v0, ($v1) @@ -1041,10 +1041,10 @@ glabel L800BDC40 /* B34E24 800BDC84 46049182 */ mul.s $f6, $f18, $f4 /* B34E28 800BDC88 444EF800 */ cfc1 $t6, $31 /* B34E2C 800BDC8C 44CFF800 */ ctc1 $t7, $31 -/* B34E30 800BDC90 00000000 */ nop +/* B34E30 800BDC90 00000000 */ nop /* B34E34 800BDC94 46003224 */ cvt.w.s $f8, $f6 /* B34E38 800BDC98 444FF800 */ cfc1 $t7, $31 -/* B34E3C 800BDC9C 00000000 */ nop +/* B34E3C 800BDC9C 00000000 */ nop /* B34E40 800BDCA0 31EF0078 */ andi $t7, $t7, 0x78 /* B34E44 800BDCA4 51E00013 */ beql $t7, $zero, .L800BDCF4 /* B34E48 800BDCA8 440F4000 */ mfc1 $t7, $f8 @@ -1052,13 +1052,13 @@ glabel L800BDC40 /* B34E50 800BDCB0 240F0001 */ li $t7, 1 /* B34E54 800BDCB4 46083201 */ sub.s $f8, $f6, $f8 /* B34E58 800BDCB8 44CFF800 */ ctc1 $t7, $31 -/* B34E5C 800BDCBC 00000000 */ nop +/* B34E5C 800BDCBC 00000000 */ nop /* B34E60 800BDCC0 46004224 */ cvt.w.s $f8, $f8 /* B34E64 800BDCC4 444FF800 */ cfc1 $t7, $31 -/* B34E68 800BDCC8 00000000 */ nop +/* B34E68 800BDCC8 00000000 */ nop /* B34E6C 800BDCCC 31EF0078 */ andi $t7, $t7, 0x78 /* B34E70 800BDCD0 15E00005 */ bnez $t7, .L800BDCE8 -/* B34E74 800BDCD4 00000000 */ nop +/* B34E74 800BDCD4 00000000 */ nop /* B34E78 800BDCD8 440F4000 */ mfc1 $t7, $f8 /* B34E7C 800BDCDC 3C018000 */ lui $at, 0x8000 /* B34E80 800BDCE0 10000007 */ b .L800BDD00 @@ -1068,9 +1068,9 @@ glabel L800BDC40 /* B34E8C 800BDCEC 240FFFFF */ li $t7, -1 /* B34E90 800BDCF0 440F4000 */ mfc1 $t7, $f8 .L800BDCF4: -/* B34E94 800BDCF4 00000000 */ nop +/* B34E94 800BDCF4 00000000 */ nop /* B34E98 800BDCF8 05E0FFFB */ bltz $t7, .L800BDCE8 -/* B34E9C 800BDCFC 00000000 */ nop +/* B34E9C 800BDCFC 00000000 */ nop .L800BDD00: /* B34EA0 800BDD00 A22F0B09 */ sb $t7, 0xb09($s1) /* B34EA4 800BDD04 84620000 */ lh $v0, ($v1) @@ -1221,7 +1221,7 @@ glabel L800BDEE0 /* B350C4 800BDF24 3C188016 */ lui $t8, %hi(gGameInfo) # $t8, 0x8016 /* B350C8 800BDF28 29C1006E */ slti $at, $t6, 0x6e /* B350CC 800BDF2C 10200086 */ beqz $at, .L800BE148 -/* B350D0 800BDF30 00000000 */ nop +/* B350D0 800BDF30 00000000 */ nop /* B350D4 800BDF34 8F18FA90 */ lw $t8, %lo(gGameInfo)($t8) /* B350D8 800BDF38 3C018016 */ lui $at, %hi(D_80161490) # $at, 0x8016 /* B350DC 800BDF3C AC201490 */ sw $zero, %lo(D_80161490)($at) @@ -1304,7 +1304,7 @@ glabel L800BE034 /* B35200 800BE060 82381E15 */ lb $t8, 0x1e15($s1) /* B35204 800BE064 2401FFEC */ li $at, -20 /* B35208 800BE068 17010037 */ bne $t8, $at, .L800BE148 -/* B3520C 800BE06C 00000000 */ nop +/* B3520C 800BE06C 00000000 */ nop /* B35210 800BE070 92290B0B */ lbu $t1, 0xb0b($s1) /* B35214 800BE074 3C018016 */ lui $at, %hi(D_80161490) # $at, 0x8016 /* B35218 800BE078 24190003 */ li $t9, 3 @@ -1342,7 +1342,7 @@ glabel L800BE0F0 /* B35290 800BE0F0 3C028016 */ lui $v0, %hi(gSaveContext+0x1410) # $v0, 0x8016 /* B35294 800BE0F4 9042FA70 */ lbu $v0, %lo(gSaveContext+0x1410)($v0) /* B35298 800BE0F8 10400013 */ beqz $v0, .L800BE148 -/* B3529C 800BE0FC 00000000 */ nop +/* B3529C 800BE0FC 00000000 */ nop /* B352A0 800BE100 A2220B09 */ sb $v0, 0xb09($s1) /* B352A4 800BE104 3C0E8016 */ lui $t6, %hi(gSaveContext+0x1410) # $t6, 0x8016 /* B352A8 800BE108 91CEFA70 */ lbu $t6, %lo(gSaveContext+0x1410)($t6) @@ -1350,7 +1350,7 @@ glabel L800BE0F0 /* B352B0 800BE110 3C188016 */ lui $t8, %hi(gGameInfo) # $t8, 0x8016 /* B352B4 800BE114 29C10065 */ slti $at, $t6, 0x65 /* B352B8 800BE118 1020000B */ beqz $at, .L800BE148 -/* B352BC 800BE11C 00000000 */ nop +/* B352BC 800BE11C 00000000 */ nop /* B352C0 800BE120 8F18FA90 */ lw $t8, %lo(gGameInfo)($t8) /* B352C4 800BE124 3C018016 */ lui $at, %hi(D_80161490) # $at, 0x8016 /* B352C8 800BE128 AC201490 */ sw $zero, %lo(D_80161490)($at) @@ -1367,7 +1367,7 @@ glabel L800BE148 /* B352EC 800BE14C 8D29FA90 */ lw $t1, %lo(gGameInfo)($t1) /* B352F0 800BE150 85241052 */ lh $a0, 0x1052($t1) /* B352F4 800BE154 1080000C */ beqz $a0, .L800BE188 -/* B352F8 800BE158 00000000 */ nop +/* B352F8 800BE158 00000000 */ nop /* B352FC 800BE15C 3C048014 */ lui $a0, %hi(D_801443B0) # $a0, 0x8014 /* B35300 800BE160 248443B0 */ addiu $a0, %lo(D_801443B0) # addiu $a0, $a0, 0x43b0 /* B35304 800BE164 0C000B84 */ jal LogUtils_LogThreadId @@ -1384,7 +1384,7 @@ glabel L800BE148 /* B3532C 800BE18C 8C421490 */ lw $v0, %lo(D_80161490)($v0) /* B35330 800BE190 24010003 */ li $at, 3 /* B35334 800BE194 10410276 */ beq $v0, $at, .L800BEB70 -/* B35338 800BE198 00000000 */ nop +/* B35338 800BE198 00000000 */ nop /* B3533C 800BE19C 10800008 */ beqz $a0, .L800BE1C0 /* B35340 800BE1A0 3C048014 */ lui $a0, %hi(D_801443C4) # $a0, 0x8014 /* B35344 800BE1A4 248443C4 */ addiu $a0, %lo(D_801443C4) # addiu $a0, $a0, 0x43c4 @@ -1398,13 +1398,13 @@ glabel L800BE148 /* B35360 800BE1C0 3C0A8016 */ lui $t2, %hi(gSaveContext+0x135c) # $t2, 0x8016 /* B35364 800BE1C4 8D4AF9BC */ lw $t2, %lo(gSaveContext+0x135c)($t2) /* B35368 800BE1C8 15400009 */ bnez $t2, .L800BE1F0 -/* B3536C 800BE1CC 00000000 */ nop +/* B3536C 800BE1CC 00000000 */ nop /* B35370 800BE1D0 922B03DC */ lbu $t3, 0x3dc($s1) /* B35374 800BE1D4 15600006 */ bnez $t3, .L800BE1F0 -/* B35378 800BE1D8 00000000 */ nop +/* B35378 800BE1D8 00000000 */ nop /* B3537C 800BE1DC 962C0A20 */ lhu $t4, 0xa20($s1) /* B35380 800BE1E0 15800003 */ bnez $t4, .L800BE1F0 -/* B35384 800BE1E4 00000000 */ nop +/* B35384 800BE1E4 00000000 */ nop /* B35388 800BE1E8 0C01BA8C */ jal func_8006EA30 /* B3538C 800BE1EC 02002025 */ move $a0, $s0 .L800BE1F0: @@ -1428,7 +1428,7 @@ glabel L800BE148 .L800BE234: /* B353D4 800BE234 0003182B */ sltu $v1, $zero, $v1 /* B353D8 800BE238 14600003 */ bnez $v1, .L800BE248 -/* B353DC 800BE23C 00000000 */ nop +/* B353DC 800BE23C 00000000 */ nop /* B353E0 800BE240 96230936 */ lhu $v1, 0x936($s1) /* B353E4 800BE244 0003182B */ sltu $v1, $zero, $v1 .L800BE248: @@ -1449,7 +1449,7 @@ glabel L800BE148 /* B3541C 800BE27C 34210B20 */ ori $at, (0x00010B20 & 0xFFFF) # ori $at, $at, 0xb20 /* B35420 800BE280 02012021 */ addu $a0, $s0, $at /* B35424 800BE284 AFA40034 */ sw $a0, 0x34($sp) -/* B35428 800BE288 0C028CBB */ jal func_800A32EC +/* B35428 800BE288 0C028CBB */ jal SkelAnime_AnimationCtxReset /* B3542C 800BE28C AFA30050 */ sw $v1, 0x50($sp) /* B35430 800BE290 3C0F8016 */ lui $t7, %hi(gGameInfo) # $t7, 0x8016 /* B35434 800BE294 8DEFFA90 */ lw $t7, %lo(gGameInfo)($t7) @@ -1493,7 +1493,7 @@ glabel L800BE148 /* B354C4 800BE324 8C42FA90 */ lw $v0, %lo(gGameInfo)($v0) /* B354C8 800BE328 844A0764 */ lh $t2, 0x764($v0) /* B354CC 800BE32C 154000E9 */ bnez $t2, .L800BE6D4 -/* B354D0 800BE330 00000000 */ nop +/* B354D0 800BE330 00000000 */ nop /* B354D4 800BE334 84441052 */ lh $a0, 0x1052($v0) /* B354D8 800BE338 24050DFC */ li $a1, 3580 /* B354DC 800BE33C 10800007 */ beqz $a0, .L800BE35C @@ -1654,7 +1654,7 @@ glabel L800BE148 .L800BE584: /* B35724 800BE584 02002025 */ move $a0, $s0 /* B35728 800BE588 15E00003 */ bnez $t7, .L800BE598 -/* B3572C 800BE58C 00000000 */ nop +/* B3572C 800BE58C 00000000 */ nop /* B35730 800BE590 0C00C18C */ jal Actor_UpdateAll /* B35734 800BE594 26051C24 */ addiu $a1, $s0, 0x1c24 .L800BE598: @@ -1698,7 +1698,7 @@ glabel L800BE148 /* B357C4 800BE624 248444E8 */ addiu $a0, %lo(D_801444E8) # addiu $a0, $a0, 0x44e8 /* B357C8 800BE628 854B1052 */ lh $t3, 0x1052($t2) /* B357CC 800BE62C 11600007 */ beqz $t3, .L800BE64C -/* B357D0 800BE630 00000000 */ nop +/* B357D0 800BE630 00000000 */ nop /* B357D4 800BE634 0C000B84 */ jal LogUtils_LogThreadId /* B357D8 800BE638 24050E43 */ li $a1, 3651 /* B357DC 800BE63C 3C048014 */ lui $a0, %hi(D_801444F4) # $a0, 0x8014 @@ -1714,7 +1714,7 @@ glabel L800BE148 /* B35800 800BE660 248444FC */ addiu $a0, %lo(D_801444FC) # addiu $a0, $a0, 0x44fc /* B35804 800BE664 858D1052 */ lh $t5, 0x1052($t4) /* B35808 800BE668 11A00007 */ beqz $t5, .L800BE688 -/* B3580C 800BE66C 00000000 */ nop +/* B3580C 800BE66C 00000000 */ nop /* B35810 800BE670 0C000B84 */ jal LogUtils_LogThreadId /* B35814 800BE674 24050E49 */ li $a1, 3657 /* B35818 800BE678 3C048014 */ lui $a0, %hi(D_80144508) # $a0, 0x8014 @@ -1729,7 +1729,7 @@ glabel L800BE148 /* B35838 800BE698 24050E4E */ li $a1, 3662 /* B3583C 800BE69C 85C41052 */ lh $a0, 0x1052($t6) /* B35840 800BE6A0 10800015 */ beqz $a0, .L800BE6F8 -/* B35844 800BE6A4 00000000 */ nop +/* B35844 800BE6A4 00000000 */ nop /* B35848 800BE6A8 3C048014 */ lui $a0, %hi(D_80144510) # $a0, 0x8014 /* B3584C 800BE6AC 0C000B84 */ jal LogUtils_LogThreadId /* B35850 800BE6B0 24844510 */ addiu $a0, %lo(D_80144510) # addiu $a0, $a0, 0x4510 @@ -1802,25 +1802,25 @@ glabel L800BE148 .L800BE7AC: /* B3594C 800BE7AC 922D242B */ lbu $t5, 0x242b($s1) /* B35950 800BE7B0 11A00034 */ beqz $t5, .L800BE884 -/* B35954 800BE7B4 00000000 */ nop +/* B35954 800BE7B4 00000000 */ nop /* B35958 800BE7B8 8FAE0044 */ lw $t6, 0x44($sp) /* B3595C 800BE7BC 2401FFF7 */ li $at, -9 /* B35960 800BE7C0 95CF000C */ lhu $t7, 0xc($t6) /* B35964 800BE7C4 01E1C027 */ nor $t8, $t7, $at /* B35968 800BE7C8 1700002C */ bnez $t8, .L800BE87C -/* B3596C 800BE7CC 00000000 */ nop +/* B3596C 800BE7CC 00000000 */ nop /* B35970 800BE7D0 96290934 */ lhu $t1, 0x934($s1) /* B35974 800BE7D4 3C048014 */ lui $a0, %hi(D_80144560) # $a0, 0x8014 /* B35978 800BE7D8 15200004 */ bnez $t1, .L800BE7EC -/* B3597C 800BE7DC 00000000 */ nop +/* B3597C 800BE7DC 00000000 */ nop /* B35980 800BE7E0 96390936 */ lhu $t9, 0x936($s1) /* B35984 800BE7E4 13200005 */ beqz $t9, .L800BE7FC -/* B35988 800BE7E8 00000000 */ nop +/* B35988 800BE7E8 00000000 */ nop .L800BE7EC: /* B3598C 800BE7EC 0C00084C */ jal osSyncPrintf /* B35990 800BE7F0 24844560 */ addiu $a0, %lo(D_80144560) # addiu $a0, $a0, 0x4560 /* B35994 800BE7F4 10000021 */ b .L800BE87C -/* B35998 800BE7F8 00000000 */ nop +/* B35998 800BE7F8 00000000 */ nop .L800BE7FC: /* B3599C 800BE7FC 0C023A62 */ jal func_8008E988 /* B359A0 800BE800 02002025 */ move $a0, $s0 @@ -1830,7 +1830,7 @@ glabel L800BE148 /* B359B0 800BE810 0C00084C */ jal osSyncPrintf /* B359B4 800BE814 2484459C */ addiu $a0, %lo(D_8014459C) # addiu $a0, $a0, 0x459c /* B359B8 800BE818 10000018 */ b .L800BE87C -/* B359BC 800BE81C 00000000 */ nop +/* B359BC 800BE81C 00000000 */ nop .L800BE820: /* B359C0 800BE820 8D4AFA90 */ lw $t2, %lo(gGameInfo)($t2) /* B359C4 800BE824 24010010 */ li $at, 16 @@ -1848,7 +1848,7 @@ glabel L800BE148 /* B359F4 800BE854 0C03DCE3 */ jal Audio_PlaySoundGeneral /* B359F8 800BE858 AFA70010 */ sw $a3, 0x10($sp) /* B359FC 800BE85C 10000007 */ b .L800BE87C -/* B35A00 800BE860 00000000 */ nop +/* B35A00 800BE860 00000000 */ nop .L800BE864: /* B35A04 800BE864 9225242B */ lbu $a1, 0x242b($s1) /* B35A08 800BE868 02002025 */ move $a0, $s0 @@ -1894,7 +1894,7 @@ glabel L800BE148 /* B35A9C 800BE8FC 96380934 */ lhu $t8, 0x934($s1) .L800BE900: /* B35AA0 800BE900 17000004 */ bnez $t8, .L800BE914 -/* B35AA4 800BE904 00000000 */ nop +/* B35AA4 800BE904 00000000 */ nop /* B35AA8 800BE908 96290936 */ lhu $t1, 0x936($s1) /* B35AAC 800BE90C 5120000F */ beql $t1, $zero, .L800BE94C /* B35AB0 800BE910 96390A20 */ lhu $t9, 0xa20($s1) @@ -1912,11 +1912,11 @@ glabel L800BE148 /* B35AD8 800BE938 0C02F05A */ jal KaleidoScopeCall_Update /* B35ADC 800BE93C 02002025 */ move $a0, $s0 /* B35AE0 800BE940 1000001C */ b .L800BE9B4 -/* B35AE4 800BE944 00000000 */ nop +/* B35AE4 800BE944 00000000 */ nop /* B35AE8 800BE948 96390A20 */ lhu $t9, 0xa20($s1) .L800BE94C: /* B35AEC 800BE94C 1320000E */ beqz $t9, .L800BE988 -/* B35AF0 800BE950 00000000 */ nop +/* B35AF0 800BE950 00000000 */ nop /* B35AF4 800BE954 10800008 */ beqz $a0, .L800BE978 /* B35AF8 800BE958 24050E8F */ li $a1, 3727 /* B35AFC 800BE95C 3C048014 */ lui $a0, %hi(D_80144608) # $a0, 0x8014 @@ -1930,7 +1930,7 @@ glabel L800BE148 /* B35B18 800BE978 0C044132 */ jal func_801104C8 /* B35B1C 800BE97C 02002025 */ move $a0, $s0 /* B35B20 800BE980 1000000C */ b .L800BE9B4 -/* B35B24 800BE984 00000000 */ nop +/* B35B24 800BE984 00000000 */ nop .L800BE988: /* B35B28 800BE988 10800008 */ beqz $a0, .L800BE9AC /* B35B2C 800BE98C 24050E95 */ li $a1, 3733 @@ -1950,7 +1950,7 @@ glabel L800BE148 /* B35B5C 800BE9BC 24050E99 */ li $a1, 3737 /* B35B60 800BE9C0 85441052 */ lh $a0, 0x1052($t2) /* B35B64 800BE9C4 1080000B */ beqz $a0, .L800BE9F4 -/* B35B68 800BE9C8 00000000 */ nop +/* B35B68 800BE9C8 00000000 */ nop /* B35B6C 800BE9CC 3C048014 */ lui $a0, %hi(D_80144630) # $a0, 0x8014 /* B35B70 800BE9D0 0C000B84 */ jal LogUtils_LogThreadId /* B35B74 800BE9D4 24844630 */ addiu $a0, %lo(D_80144630) # addiu $a0, $a0, 0x4630 @@ -1997,7 +1997,7 @@ glabel L800BE148 /* B35C0C 800BEA6C 2484466C */ addiu $a0, %lo(D_8014466C) # addiu $a0, $a0, 0x466c /* B35C10 800BEA70 85CF1052 */ lh $t7, 0x1052($t6) /* B35C14 800BEA74 11E00007 */ beqz $t7, .L800BEA94 -/* B35C18 800BEA78 00000000 */ nop +/* B35C18 800BEA78 00000000 */ nop /* B35C1C 800BEA7C 0C000B84 */ jal LogUtils_LogThreadId /* B35C20 800BEA80 24050EBB */ li $a1, 3771 /* B35C24 800BEA84 3C048014 */ lui $a0, %hi(D_80144678) # $a0, 0x8014 @@ -2013,7 +2013,7 @@ glabel L800BE148 /* B35C48 800BEAA8 24844680 */ addiu $a0, %lo(D_80144680) # addiu $a0, $a0, 0x4680 /* B35C4C 800BEAAC 84581052 */ lh $t8, 0x1052($v0) /* B35C50 800BEAB0 13000009 */ beqz $t8, .L800BEAD8 -/* B35C54 800BEAB4 00000000 */ nop +/* B35C54 800BEAB4 00000000 */ nop /* B35C58 800BEAB8 0C000B84 */ jal LogUtils_LogThreadId /* B35C5C 800BEABC 24050EC1 */ li $a1, 3777 /* B35C60 800BEAC0 3C048014 */ lui $a0, %hi(D_8014468C) # $a0, 0x8014 @@ -2051,7 +2051,7 @@ glabel L800BE148 /* B35CD4 800BEB34 8F39FA90 */ lw $t9, %lo(gGameInfo)($t9) /* B35CD8 800BEB38 87241052 */ lh $a0, 0x1052($t9) /* B35CDC 800BEB3C 1080000C */ beqz $a0, .L800BEB70 -/* B35CE0 800BEB40 00000000 */ nop +/* B35CE0 800BEB40 00000000 */ nop /* B35CE4 800BEB44 3C048014 */ lui $a0, %hi(D_801446A8) # $a0, 0x8014 /* B35CE8 800BEB48 248446A8 */ addiu $a0, %lo(D_801446A8) # addiu $a0, $a0, 0x46a8 /* B35CEC 800BEB4C 0C000B84 */ jal LogUtils_LogThreadId @@ -2079,7 +2079,7 @@ glabel L800BE148 /* B35D3C 800BEB9C 3C0C8012 */ lui $t4, %hi(D_8011D394) # $t4, 0x8012 /* B35D40 800BEBA0 8D8CD394 */ lw $t4, %lo(D_8011D394)($t4) /* B35D44 800BEBA4 11800044 */ beqz $t4, .L800BECB8 -/* B35D48 800BEBA8 00000000 */ nop +/* B35D48 800BEBA8 00000000 */ nop .L800BEBAC: /* B35D4C 800BEBAC 860D07A0 */ lh $t5, 0x7a0($s0) /* B35D50 800BEBB0 3C0E8016 */ lui $t6, %hi(gGameInfo) # $t6, 0x8016 @@ -2134,7 +2134,7 @@ glabel L800BE148 .L800BEC64: /* B35E04 800BEC64 24010004 */ li $at, 4 /* B35E08 800BEC68 1461FFE1 */ bne $v1, $at, .L800BEBF0 -/* B35E0C 800BEC6C 00000000 */ nop +/* B35E0C 800BEC6C 00000000 */ nop /* B35E10 800BEC70 0006C880 */ sll $t9, $a2, 2 /* B35E14 800BEC74 02195021 */ addu $t2, $s0, $t9 /* B35E18 800BEC78 8D450790 */ lw $a1, 0x790($t2) @@ -2146,7 +2146,7 @@ glabel L800BE148 /* B35E30 800BEC90 248446F8 */ addiu $a0, %lo(D_801446F8) # addiu $a0, $a0, 0x46f8 /* B35E34 800BEC94 856C1052 */ lh $t4, 0x1052($t3) /* B35E38 800BEC98 11800007 */ beqz $t4, .L800BECB8 -/* B35E3C 800BEC9C 00000000 */ nop +/* B35E3C 800BEC9C 00000000 */ nop /* B35E40 800BECA0 0C000B84 */ jal LogUtils_LogThreadId /* B35E44 800BECA4 24050EE6 */ li $a1, 3814 /* B35E48 800BECA8 3C048014 */ lui $a0, %hi(D_80144704) # $a0, 0x8014 diff --git a/asm/non_matchings/code/z_play/func_800BEDD8.s b/asm/non_matchings/code/z_play/func_800BEDD8.s index 040866161b..1860ef8bc7 100644 --- a/asm/non_matchings/code/z_play/func_800BEDD8.s +++ b/asm/non_matchings/code/z_play/func_800BEDD8.s @@ -23,7 +23,7 @@ glabel func_800BEDD8 /* B35F94 800BEDF4 24C64720 */ addiu $a2, %lo(D_80144720) # addiu $a2, $a2, 0x4720 /* B35F98 800BEDF8 27A40208 */ addiu $a0, $sp, 0x208 /* B35F9C 800BEDFC 24070F43 */ li $a3, 3907 -/* B35FA0 800BEE00 0C031AB1 */ jal func_800C6AC4 +/* B35FA0 800BEE00 0C031AB1 */ jal Graph_OpenDisps /* B35FA4 800BEE04 02202825 */ move $a1, $s1 /* B35FA8 800BEE08 3C040001 */ lui $a0, 1 /* B35FAC 800BEE0C 02044021 */ addu $t0, $s0, $a0 @@ -258,7 +258,7 @@ glabel func_800BEDD8 /* B3633C 800BF19C 00000000 */ nop /* B36340 800BF1A0 8E2402C0 */ lw $a0, 0x2c0($s1) .L800BF1A4: -/* B36344 800BF1A4 0C031B08 */ jal func_800C6C20 +/* B36344 800BF1A4 0C031B08 */ jal Graph_GfxPlusOne /* B36348 800BF1A8 AFA401CC */ sw $a0, 0x1cc($sp) /* B3634C 800BF1AC AFA201D0 */ sw $v0, 0x1d0($sp) /* B36350 800BF1B0 8E2202B0 */ lw $v0, 0x2b0($s1) @@ -331,7 +331,7 @@ glabel func_800BEDD8 /* B36450 800BF2B0 AD800004 */ sw $zero, 4($t4) /* B36454 800BF2B4 AD8E0000 */ sw $t6, ($t4) /* B36458 800BF2B8 8FA501D0 */ lw $a1, 0x1d0($sp) -/* B3645C 800BF2BC 0C031B0A */ jal func_800C6C28 +/* B3645C 800BF2BC 0C031B0A */ jal Graph_BranchDlist /* B36460 800BF2C0 8FA401CC */ lw $a0, 0x1cc($sp) /* B36464 800BF2C4 8FAF01D0 */ lw $t7, 0x1d0($sp) /* B36468 800BF2C8 AE2F02C0 */ sw $t7, 0x2c0($s1) @@ -370,7 +370,7 @@ glabel func_800BEDD8 /* B364E4 800BF344 84430190 */ lh $v1, 0x190($v0) /* B364E8 800BF348 5461000E */ bnel $v1, $at, .L800BF384 /* B364EC 800BF34C 28610004 */ slti $at, $v1, 4 -/* B364F0 800BF350 0C01EFC4 */ jal func_8007BF10 +/* B364F0 800BF350 0C01EFC4 */ jal MsgEvent_SendNullTask /* B364F4 800BF354 00000000 */ nop /* B364F8 800BF358 0C030DDC */ jal func_800C3770 /* B364FC 800BF35C 8FA4003C */ lw $a0, 0x3c($sp) @@ -895,7 +895,7 @@ glabel func_800BEDD8 /* B36C5C 800BFABC 24C64738 */ addiu $a2, %lo(D_80144738) # addiu $a2, $a2, 0x4738 /* B36C60 800BFAC0 27A40208 */ addiu $a0, $sp, 0x208 /* B36C64 800BFAC4 02202825 */ move $a1, $s1 -/* B36C68 800BFAC8 0C031AD5 */ jal func_800C6B54 +/* B36C68 800BFAC8 0C031AD5 */ jal Graph_CloseDisps /* B36C6C 800BFACC 2407119C */ li $a3, 4508 /* B36C70 800BFAD0 8FBF002C */ lw $ra, 0x2c($sp) /* B36C74 800BFAD4 8FB00024 */ lw $s0, 0x24($sp) diff --git a/asm/non_matchings/code/z_player_lib/func_8008F470.s b/asm/non_matchings/code/z_player_lib/func_8008F470.s index 0e043244a4..0dde717fd0 100644 --- a/asm/non_matchings/code/z_player_lib/func_8008F470.s +++ b/asm/non_matchings/code/z_player_lib/func_8008F470.s @@ -27,7 +27,7 @@ glabel func_8008F470 /* B0664C 8008F4AC 24C6E770 */ addiu $a2, %lo(D_8013E770) # addiu $a2, $a2, -0x1890 /* B06650 8008F4B0 27A40068 */ addiu $a0, $sp, 0x68 /* B06654 8008F4B4 240706B9 */ li $a3, 1721 -/* B06658 8008F4B8 0C031AB1 */ jal func_800C6AC4 +/* B06658 8008F4B8 0C031AB1 */ jal Graph_OpenDisps /* B0665C 8008F4BC AFA50078 */ sw $a1, 0x78($sp) /* B06660 8008F4C0 8FA90080 */ lw $t1, 0x80($sp) /* B06664 8008F4C4 8FA80078 */ lw $t0, 0x78($sp) @@ -125,7 +125,7 @@ glabel func_8008F470 /* B067CC 8008F62C AFA2001C */ sw $v0, 0x1c($sp) /* B067D0 8008F630 AFAF0018 */ sw $t7, 0x18($sp) /* B067D4 8008F634 AFAC0014 */ sw $t4, 0x14($sp) -/* B067D8 8008F638 0C02841B */ jal func_800A106C +/* B067D8 8008F638 0C02841B */ jal SkelAnime_LodDrawSV /* B067DC 8008F63C AFAD0010 */ sw $t5, 0x10($sp) /* B067E0 8008F640 8FA200A8 */ lw $v0, 0xa8($sp) /* B067E4 8008F644 3C0E8009 */ lui $t6, %hi(func_800902F0) # $t6, 0x8009 @@ -145,7 +145,7 @@ glabel func_8008F470 /* B0681C 8008F67C 3C0C8012 */ lui $t4, %hi(gUpgradeMasks+8) # $t4, 0x8012 /* B06820 8008F680 3C0E8012 */ lui $t6, %hi(gUpgradeShifts+2) # $t6, 0x8012 /* B06824 8008F684 17000066 */ bnez $t8, .L8008F820 -/* B06828 8008F688 00000000 */ nop +/* B06828 8008F688 00000000 */ nop /* B0682C 8008F68C 8C4D00A0 */ lw $t5, 0xa0($v0) /* B06830 8008F690 8D8C71B8 */ lw $t4, %lo(gUpgradeMasks+8)($t4) /* B06834 8008F694 91CE71F6 */ lbu $t6, %lo(gUpgradeShifts+2)($t6) @@ -272,10 +272,10 @@ glabel func_8008F470 /* B069F8 8008F858 24C6E784 */ addiu $a2, %lo(D_8013E784) # addiu $a2, $a2, -0x187c /* B069FC 8008F85C 27A40068 */ addiu $a0, $sp, 0x68 /* B06A00 8008F860 2407070B */ li $a3, 1803 -/* B06A04 8008F864 0C031AD5 */ jal func_800C6B54 +/* B06A04 8008F864 0C031AD5 */ jal Graph_CloseDisps /* B06A08 8008F868 8F050000 */ lw $a1, ($t8) /* B06A0C 8008F86C 8FBF0024 */ lw $ra, 0x24($sp) /* B06A10 8008F870 27BD0088 */ addiu $sp, $sp, 0x88 /* B06A14 8008F874 03E00008 */ jr $ra -/* B06A18 8008F878 00000000 */ nop +/* B06A18 8008F878 00000000 */ nop diff --git a/asm/non_matchings/code/z_player_lib/func_8008F87C.s b/asm/non_matchings/code/z_player_lib/func_8008F87C.s index a29f31e92b..d231070cc4 100644 --- a/asm/non_matchings/code/z_player_lib/func_8008F87C.s +++ b/asm/non_matchings/code/z_player_lib/func_8008F87C.s @@ -19,9 +19,9 @@ glabel func_8008F87C /* B06A34 8008F894 AFA700BC */ sw $a3, 0xbc($sp) /* B06A38 8008F898 C4A40054 */ lwc1 $f4, 0x54($a1) /* B06A3C 8008F89C 44803000 */ mtc1 $zero, $f6 -/* B06A40 8008F8A0 00000000 */ nop +/* B06A40 8008F8A0 00000000 */ nop /* B06A44 8008F8A4 4604303E */ c.le.s $f6, $f4 -/* B06A48 8008F8A8 00000000 */ nop +/* B06A48 8008F8A8 00000000 */ nop /* B06A4C 8008F8AC 45020102 */ bc1fl .L8008FCB8 /* B06A50 8008F8B0 8FBF0024 */ lw $ra, 0x24($sp) /* B06A54 8008F8B4 8CAF067C */ lw $t7, 0x67c($a1) @@ -51,7 +51,7 @@ glabel func_8008F87C /* B06AB4 8008F914 0C034213 */ jal Matrix_Push /* B06AB8 8008F918 46062501 */ sub.s $f20, $f4, $f6 /* B06ABC 8008F91C 8FA400BC */ lw $a0, 0xbc($sp) -/* B06AC0 8008F920 0C0344D0 */ jal func_800D1340 +/* B06AC0 8008F920 0C0344D0 */ jal Matrix_TranslateThenRotateZYX /* B06AC4 8008F924 8FA500C0 */ lw $a1, 0xc0($sp) /* B06AC8 8008F928 3C048012 */ lui $a0, %hi(D_8012602C) # $a0, 0x8012 /* B06ACC 8008F92C 2484602C */ addiu $a0, %lo(D_8012602C) # addiu $a0, $a0, 0x602c @@ -73,7 +73,7 @@ glabel func_8008F87C /* B06B0C 8008F96C 00021040 */ sll $v0, $v0, 1 /* B06B10 8008F970 AFA20038 */ sw $v0, 0x38($sp) /* B06B14 8008F974 01F82021 */ addu $a0, $t7, $t8 -/* B06B18 8008F978 0C0344D0 */ jal func_800D1340 +/* B06B18 8008F978 0C0344D0 */ jal Matrix_TranslateThenRotateZYX /* B06B1C 8008F97C 03222821 */ addu $a1, $t9, $v0 /* B06B20 8008F980 3C038016 */ lui $v1, %hi(gSaveContext+4) /* B06B24 8008F984 8C63E664 */ lw $v1, %lo(gSaveContext+4)($v1) @@ -94,7 +94,7 @@ glabel func_8008F87C /* B06B60 8008F9C0 0C0346BD */ jal Matrix_MultVec3f /* B06B64 8008F9C4 27A5008C */ addiu $a1, $sp, 0x8c /* B06B68 8008F9C8 0C034221 */ jal Matrix_Pull -/* B06B6C 8008F9CC 00000000 */ nop +/* B06B6C 8008F9CC 00000000 */ nop /* B06B70 8008F9D0 3C014170 */ li $at, 0x41700000 # 0.000000 /* B06B74 8008F9D4 44815000 */ mtc1 $at, $f10 /* B06B78 8008F9D8 C7A80090 */ lwc1 $f8, 0x90($sp) @@ -146,12 +146,12 @@ glabel func_8008F87C /* B06C30 8008FA90 4600A004 */ sqrt.s $f0, $f20 /* B06C34 8008FA94 4480A000 */ mtc1 $zero, $f20 /* B06C38 8008FA98 10000003 */ b .L8008FAA8 -/* B06C3C 8008FA9C 00000000 */ nop +/* B06C3C 8008FA9C 00000000 */ nop /* B06C40 8008FAA0 4600A004 */ sqrt.s $f0, $f20 .L8008FAA4: /* B06C44 8008FAA4 46000506 */ mov.s $f20, $f0 .L8008FAA8: -/* B06C48 8008FAA8 0C03F494 */ jal func_800FD250 +/* B06C48 8008FAA8 0C03F494 */ jal Math_atan2f /* B06C4C 8008FAAC 4600A306 */ mov.s $f12, $f20 /* B06C50 8008FAB0 C7A80080 */ lwc1 $f8, 0x80($sp) /* B06C54 8008FAB4 C7A600A8 */ lwc1 $f6, 0xa8($sp) @@ -180,16 +180,16 @@ glabel func_8008F87C /* B06CB0 8008FB10 4600A004 */ sqrt.s $f0, $f20 /* B06CB4 8008FB14 4480A000 */ mtc1 $zero, $f20 /* B06CB8 8008FB18 10000003 */ b .L8008FB28 -/* B06CBC 8008FB1C 00000000 */ nop +/* B06CBC 8008FB1C 00000000 */ nop /* B06CC0 8008FB20 4600A004 */ sqrt.s $f0, $f20 .L8008FB24: /* B06CC4 8008FB24 46000506 */ mov.s $f20, $f0 .L8008FB28: -/* B06CC8 8008FB28 0C03F494 */ jal func_800FD250 +/* B06CC8 8008FB28 0C03F494 */ jal Math_atan2f /* B06CCC 8008FB2C 4600A306 */ mov.s $f12, $f20 /* B06CD0 8008FB30 C7AC005C */ lwc1 $f12, 0x5c($sp) /* B06CD4 8008FB34 4600A386 */ mov.s $f14, $f20 -/* B06CD8 8008FB38 0C03F494 */ jal func_800FD250 +/* B06CD8 8008FB38 0C03F494 */ jal Math_atan2f /* B06CDC 8008FB3C E7A00050 */ swc1 $f0, 0x50($sp) /* B06CE0 8008FB40 3C018014 */ lui $at, %hi(D_8013E900) /* B06CE4 8008FB44 C42CE900 */ lwc1 $f12, %lo(D_8013E900)($at) @@ -215,7 +215,7 @@ glabel func_8008F87C /* B06D34 8008FB94 4600418D */ trunc.w.s $f6, $f8 /* B06D38 8008FB98 460C2202 */ mul.s $f8, $f4, $f12 /* B06D3C 8008FB9C 440E3000 */ mfc1 $t6, $f6 -/* B06D40 8008FBA0 00000000 */ nop +/* B06D40 8008FBA0 00000000 */ nop /* B06D44 8008FBA4 01D94823 */ subu $t1, $t6, $t9 /* B06D48 8008FBA8 00094C00 */ sll $t1, $t1, 0x10 /* B06D4C 8008FBAC 00094C03 */ sra $t1, $t1, 0x10 @@ -293,5 +293,5 @@ glabel func_8008F87C /* B06E58 8008FCB8 D7B40018 */ ldc1 $f20, 0x18($sp) /* B06E5C 8008FCBC 27BD00B0 */ addiu $sp, $sp, 0xb0 /* B06E60 8008FCC0 03E00008 */ jr $ra -/* B06E64 8008FCC4 00000000 */ nop +/* B06E64 8008FCC4 00000000 */ nop diff --git a/asm/non_matchings/code/z_player_lib/func_8008FCC8.s b/asm/non_matchings/code/z_player_lib/func_8008FCC8.s index 79abb7949a..923d4091fb 100644 --- a/asm/non_matchings/code/z_player_lib/func_8008FCC8.s +++ b/asm/non_matchings/code/z_player_lib/func_8008FCC8.s @@ -51,13 +51,13 @@ glabel func_8008FCC8 /* B06EC4 8008FD24 10600003 */ beqz $v1, .L8008FD34 /* B06EC8 8008FD28 30480001 */ andi $t0, $v0, 1 /* B06ECC 8008FD2C 1100000B */ beqz $t0, .L8008FD5C -/* B06ED0 8008FD30 00000000 */ nop +/* B06ED0 8008FD30 00000000 */ nop .L8008FD34: /* B06ED4 8008FD34 C420E90C */ lwc1 $f0, %lo(D_8013E90C)($at) /* B06ED8 8008FD38 C6240000 */ lwc1 $f4, ($s1) /* B06EDC 8008FD3C C6280008 */ lwc1 $f8, 8($s1) /* B06EE0 8008FD40 46002182 */ mul.s $f6, $f4, $f0 -/* B06EE4 8008FD44 00000000 */ nop +/* B06EE4 8008FD44 00000000 */ nop /* B06EE8 8008FD48 46004282 */ mul.s $f10, $f8, $f0 /* B06EEC 8008FD4C E6260000 */ swc1 $f6, ($s1) /* B06EF0 8008FD50 E62A0008 */ swc1 $f10, 8($s1) @@ -84,7 +84,7 @@ glabel func_8008FCC8 /* B06F34 8008FD94 5080009A */ beql $a0, $zero, .L80090000 /* B06F38 8008FD98 00001025 */ move $v0, $zero /* B06F3C 8008FD9C 0C01DE0D */ jal Math_Coss -/* B06F40 8008FDA0 00000000 */ nop +/* B06F40 8008FDA0 00000000 */ nop /* B06F44 8008FDA4 3C013F80 */ li $at, 0x3F800000 # 0.000000 /* B06F48 8008FDA8 44815000 */ mtc1 $at, $f10 /* B06F4C 8008FDAC 3C014348 */ li $at, 0x43480000 # 0.000000 @@ -105,16 +105,16 @@ glabel func_8008FCC8 /* B06F88 8008FDE8 468042A0 */ cvt.s.w $f10, $f8 /* B06F8C 8008FDEC 46105302 */ mul.s $f12, $f10, $f16 /* B06F90 8008FDF0 0C0342DC */ jal Matrix_RotateX -/* B06F94 8008FDF4 00000000 */ nop +/* B06F94 8008FDF4 00000000 */ nop /* B06F98 8008FDF8 8FA20040 */ lw $v0, 0x40($sp) /* B06F9C 8008FDFC 24070001 */ li $a3, 1 /* B06FA0 8008FE00 84440000 */ lh $a0, ($v0) /* B06FA4 8008FE04 84450002 */ lh $a1, 2($v0) -/* B06FA8 8008FE08 0C034421 */ jal Matrix_RotateXYZ +/* B06FA8 8008FE08 0C034421 */ jal Matrix_RotateZYX /* B06FAC 8008FE0C 84460004 */ lh $a2, 4($v0) /* B06FB0 8008FE10 8FA20040 */ lw $v0, 0x40($sp) /* B06FB4 8008FE14 44800000 */ mtc1 $zero, $f0 -/* B06FB8 8008FE18 00000000 */ nop +/* B06FB8 8008FE18 00000000 */ nop /* B06FBC 8008FE1C E6200008 */ swc1 $f0, 8($s1) /* B06FC0 8008FE20 E6200004 */ swc1 $f0, 4($s1) /* B06FC4 8008FE24 E6200000 */ swc1 $f0, ($s1) @@ -168,7 +168,7 @@ glabel func_8008FCC8 /* B07078 8008FED8 46809120 */ cvt.s.w $f4, $f18 /* B0707C 8008FEDC 46062302 */ mul.s $f12, $f4, $f6 /* B07080 8008FEE0 0C034348 */ jal Matrix_RotateY -/* B07084 8008FEE4 00000000 */ nop +/* B07084 8008FEE4 00000000 */ nop /* B07088 8008FEE8 860206BE */ lh $v0, 0x6be($s0) .L8008FEEC: /* B0708C 8008FEEC 5040000A */ beql $v0, $zero, .L8008FF18 @@ -180,7 +180,7 @@ glabel func_8008FCC8 /* B070A4 8008FF04 24050001 */ li $a1, 1 /* B070A8 8008FF08 46105302 */ mul.s $f12, $f10, $f16 /* B070AC 8008FF0C 0C034348 */ jal Matrix_RotateY -/* B070B0 8008FF10 00000000 */ nop +/* B070B0 8008FF10 00000000 */ nop /* B070B4 8008FF14 860206BC */ lh $v0, 0x6bc($s0) .L8008FF18: /* B070B8 8008FF18 5040000A */ beql $v0, $zero, .L8008FF44 @@ -192,7 +192,7 @@ glabel func_8008FCC8 /* B070D0 8008FF30 24050001 */ li $a1, 1 /* B070D4 8008FF34 46062302 */ mul.s $f12, $f4, $f6 /* B070D8 8008FF38 0C0342DC */ jal Matrix_RotateX -/* B070DC 8008FF3C 00000000 */ nop +/* B070DC 8008FF3C 00000000 */ nop /* B070E0 8008FF40 860206C0 */ lh $v0, 0x6c0($s0) .L8008FF44: /* B070E4 8008FF44 5040002E */ beql $v0, $zero, .L80090000 @@ -204,7 +204,7 @@ glabel func_8008FCC8 /* B070FC 8008FF5C 24050001 */ li $a1, 1 /* B07100 8008FF60 46105302 */ mul.s $f12, $f10, $f16 /* B07104 8008FF64 0C0343B5 */ jal Matrix_RotateZ -/* B07108 8008FF68 00000000 */ nop +/* B07108 8008FF68 00000000 */ nop /* B0710C 8008FF6C 10000024 */ b .L80090000 /* B07110 8008FF70 00001025 */ move $v0, $zero .L8008FF74: @@ -284,13 +284,13 @@ glabel func_8008FCC8 /* B07224 80090084 05E10004 */ bgez $t7, .L80090098 /* B07228 80090088 46803220 */ cvt.s.w $f8, $f6 /* B0722C 8009008C 44815000 */ mtc1 $at, $f10 -/* B07230 80090090 00000000 */ nop +/* B07230 80090090 00000000 */ nop /* B07234 80090094 460A4200 */ add.s $f8, $f8, $f10 .L80090098: /* B07238 80090098 4604403E */ c.le.s $f8, $f4 -/* B0723C 8009009C 00000000 */ nop +/* B0723C 8009009C 00000000 */ nop /* B07240 800900A0 45000003 */ bc1f .L800900B0 -/* B07244 800900A4 00000000 */ nop +/* B07244 800900A4 00000000 */ nop /* B07248 800900A8 10000025 */ b .L80090140 /* B0724C 800900AC 24420010 */ addiu $v0, $v0, 0x10 .L800900B0: @@ -314,19 +314,19 @@ glabel func_8008FCC8 .L800900F0: /* B07290 800900F0 3C014000 */ li $at, 0x40000000 # 0.000000 /* B07294 800900F4 15600012 */ bnez $t3, .L80090140 -/* B07298 800900F8 00000000 */ nop +/* B07298 800900F8 00000000 */ nop /* B0729C 800900FC 44818000 */ mtc1 $at, $f16 /* B072A0 80090100 C6120068 */ lwc1 $f18, 0x68($s0) /* B072A4 80090104 4612803C */ c.lt.s $f16, $f18 -/* B072A8 80090108 00000000 */ nop +/* B072A8 80090108 00000000 */ nop /* B072AC 8009010C 4500000C */ bc1f .L80090140 -/* B072B0 80090110 00000000 */ nop +/* B072B0 80090110 00000000 */ nop /* B072B4 80090114 8E0C067C */ lw $t4, 0x67c($s0) /* B072B8 80090118 3C188012 */ lui $t8, %hi(D_80125E18) # $t8, 0x8012 /* B072BC 8009011C 27185E18 */ addiu $t8, %lo(D_80125E18) # addiu $t8, $t8, 0x5e18 /* B072C0 80090120 000C6900 */ sll $t5, $t4, 4 /* B072C4 80090124 05A00006 */ bltz $t5, .L80090140 -/* B072C8 80090128 00000000 */ nop +/* B072C8 80090128 00000000 */ nop /* B072CC 8009012C 8CAE0004 */ lw $t6, 4($a1) /* B072D0 80090130 24190001 */ li $t9, 1 /* B072D4 80090134 AC990000 */ sw $t9, ($a0) @@ -362,9 +362,9 @@ glabel func_8008FCC8 /* B07340 800901A0 44813000 */ mtc1 $at, $f6 /* B07344 800901A4 C60A0068 */ lwc1 $f10, 0x68($s0) /* B07348 800901A8 460A303C */ c.lt.s $f6, $f10 -/* B0734C 800901AC 00000000 */ nop +/* B0734C 800901AC 00000000 */ nop /* B07350 800901B0 4500000D */ bc1f .L800901E8 -/* B07354 800901B4 00000000 */ nop +/* B07354 800901B4 00000000 */ nop /* B07358 800901B8 8E18067C */ lw $t8, 0x67c($s0) /* B0735C 800901BC 3C058016 */ lui $a1, %hi(gSaveContext) # $a1, 0x8016 /* B07360 800901C0 24A5E660 */ addiu $a1, %lo(gSaveContext) # addiu $a1, $a1, -0x19a0 @@ -394,7 +394,7 @@ glabel func_8008FCC8 /* B073B8 80090218 10410003 */ beq $v0, $at, .L80090228 /* B073BC 8009021C 3C058016 */ lui $a1, %hi(gSaveContext) # $a1, 0x8016 /* B073C0 80090220 14820010 */ bne $a0, $v0, .L80090264 -/* B073C4 80090224 00000000 */ nop +/* B073C4 80090224 00000000 */ nop .L80090228: /* B073C8 80090228 8202014E */ lb $v0, 0x14e($s0) /* B073CC 8009022C 24A5E660 */ addiu $a1, %lo(gSaveContext) # addiu $a1, $a1, -0x19a0 @@ -404,11 +404,11 @@ glabel func_8008FCC8 /* B073DC 8009023C 13200018 */ beqz $t9, .L800902A0 /* B073E0 80090240 28410002 */ slti $at, $v0, 2 /* B073E4 80090244 10200016 */ beqz $at, .L800902A0 -/* B073E8 80090248 00000000 */ nop +/* B073E8 80090248 00000000 */ nop /* B073EC 8009024C 90A80068 */ lbu $t0, 0x68($a1) /* B073F0 80090250 2401003B */ li $at, 59 /* B073F4 80090254 11010012 */ beq $t0, $at, .L800902A0 -/* B073F8 80090258 00000000 */ nop +/* B073F8 80090258 00000000 */ nop /* B073FC 8009025C 10000010 */ b .L800902A0 /* B07400 80090260 24630040 */ addiu $v1, $v1, 0x40 .L80090264: @@ -416,16 +416,16 @@ glabel func_8008FCC8 /* B07408 80090268 24A5E660 */ addiu $a1, %lo(gSaveContext) # addiu $a1, $a1, -0x19a0 /* B0740C 8009026C 8CA90004 */ lw $t1, 4($a1) /* B07410 80090270 1120000B */ beqz $t1, .L800902A0 -/* B07414 80090274 00000000 */ nop +/* B07414 80090274 00000000 */ nop /* B07418 80090278 10E20003 */ beq $a3, $v0, .L80090288 /* B0741C 8009027C 24010011 */ li $at, 17 /* B07420 80090280 14410007 */ bne $v0, $at, .L800902A0 -/* B07424 80090284 00000000 */ nop +/* B07424 80090284 00000000 */ nop .L80090288: /* B07428 80090288 90AA0068 */ lbu $t2, 0x68($a1) /* B0742C 8009028C 2401003B */ li $at, 59 /* B07430 80090290 11410003 */ beq $t2, $at, .L800902A0 -/* B07434 80090294 00000000 */ nop +/* B07434 80090294 00000000 */ nop /* B07438 80090298 3C038012 */ lui $v1, %hi(D_80125D68) # $v1, 0x8012 /* B0743C 8009029C 24635D68 */ addiu $v1, %lo(D_80125D68) # addiu $v1, $v1, 0x5d68 .L800902A0: diff --git a/asm/non_matchings/code/z_player_lib/func_800907E4.s b/asm/non_matchings/code/z_player_lib/func_800907E4.s index e1168f40b0..f8631dc8be 100644 --- a/asm/non_matchings/code/z_player_lib/func_800907E4.s +++ b/asm/non_matchings/code/z_player_lib/func_800907E4.s @@ -33,7 +33,7 @@ glabel func_800907E4 /* B079BC 8009081C E7A4004C */ swc1 $f4, 0x4c($sp) .L80090820: /* B079C0 80090820 44813000 */ mtc1 $at, $f6 -/* B079C4 80090824 00000000 */ nop +/* B079C4 80090824 00000000 */ nop /* B079C8 80090828 E7A6004C */ swc1 $f6, 0x4c($sp) .L8009082C: /* B079CC 8009082C 8FAF0050 */ lw $t7, 0x50($sp) @@ -41,7 +41,7 @@ glabel func_800907E4 /* B079D4 80090834 24C6E798 */ addiu $a2, %lo(D_8013E798) # addiu $a2, $a2, -0x1868 /* B079D8 80090838 8DE50000 */ lw $a1, ($t7) /* B079DC 8009083C 24070961 */ li $a3, 2401 -/* B079E0 80090840 0C031AB1 */ jal func_800C6AC4 +/* B079E0 80090840 0C031AB1 */ jal Graph_OpenDisps /* B079E4 80090844 AFA50048 */ sw $a1, 0x48($sp) /* B079E8 80090848 8E1801B0 */ lw $t8, 0x1b0($s0) /* B079EC 8009084C 3C018000 */ lui $at, 0x8000 @@ -93,7 +93,7 @@ glabel func_800907E4 /* B07AA4 80090904 46062200 */ add.s $f8, $f4, $f6 /* B07AA8 80090908 44064000 */ mfc1 $a2, $f8 /* B07AAC 8009090C 0C034261 */ jal Matrix_Translate -/* B07AB0 80090910 00000000 */ nop +/* B07AB0 80090910 00000000 */ nop /* B07AB4 80090914 8FAF0050 */ lw $t7, 0x50($sp) /* B07AB8 80090918 3C050001 */ lui $a1, 1 /* B07ABC 8009091C 00002025 */ move $a0, $zero @@ -108,7 +108,7 @@ glabel func_800907E4 /* B07AE0 80090940 00A12821 */ addu $a1, $a1, $at /* B07AE4 80090944 000528C0 */ sll $a1, $a1, 3 /* B07AE8 80090948 00052C00 */ sll $a1, $a1, 0x10 -/* B07AEC 8009094C 0C034421 */ jal Matrix_RotateXYZ +/* B07AEC 8009094C 0C034421 */ jal Matrix_RotateZYX /* B07AF0 80090950 00052C03 */ sra $a1, $a1, 0x10 /* B07AF4 80090954 3C018014 */ lui $at, %hi(D_8013E930) /* B07AF8 80090958 C42CE930 */ lwc1 $f12, %lo(D_8013E930)($at) @@ -127,11 +127,11 @@ glabel func_800907E4 /* B07B2C 8009098C 24C6E7AC */ addiu $a2, %lo(D_8013E7AC) # addiu $a2, $a2, -0x1854 /* B07B30 80090990 27A40038 */ addiu $a0, $sp, 0x38 /* B07B34 80090994 24070975 */ li $a3, 2421 -/* B07B38 80090998 0C031AD5 */ jal func_800C6B54 +/* B07B38 80090998 0C031AD5 */ jal Graph_CloseDisps /* B07B3C 8009099C 8F050000 */ lw $a1, ($t8) /* B07B40 800909A0 8FBF001C */ lw $ra, 0x1c($sp) /* B07B44 800909A4 8FB00018 */ lw $s0, 0x18($sp) /* B07B48 800909A8 27BD0050 */ addiu $sp, $sp, 0x50 /* B07B4C 800909AC 03E00008 */ jr $ra -/* B07B50 800909B0 00000000 */ nop +/* B07B50 800909B0 00000000 */ nop diff --git a/asm/non_matchings/code/z_player_lib/func_80090AFC.s b/asm/non_matchings/code/z_player_lib/func_80090AFC.s index dee7dd7b14..8d7f747df2 100644 --- a/asm/non_matchings/code/z_player_lib/func_80090AFC.s +++ b/asm/non_matchings/code/z_player_lib/func_80090AFC.s @@ -65,10 +65,10 @@ glabel func_80090AFC /* B07D44 80090BA4 24C6E7C0 */ addiu $a2, %lo(D_8013E7C0) # addiu $a2, $a2, -0x1840 /* B07D48 80090BA8 27A4004C */ addiu $a0, $sp, 0x4c /* B07D4C 80090BAC 24070A0C */ li $a3, 2572 -/* B07D50 80090BB0 0C031AB1 */ jal func_800C6AC4 +/* B07D50 80090BB0 0C031AB1 */ jal Graph_OpenDisps /* B07D54 80090BB4 00A08025 */ move $s0, $a1 /* B07D58 80090BB8 8E0402B0 */ lw $a0, 0x2b0($s0) -/* B07D5C 80090BBC 0C024DDD */ jal func_80093774 +/* B07D5C 80090BBC 0C024DDD */ jal Gfx_CallSetupDL /* B07D60 80090BC0 24050007 */ li $a1, 7 /* B07D64 80090BC4 AE0202B0 */ sw $v0, 0x2b0($s0) /* B07D68 80090BC8 8FA400A0 */ lw $a0, 0xa0($sp) @@ -152,7 +152,7 @@ glabel func_80090AFC /* B07E98 80090CF8 AC4E0004 */ sw $t6, 4($v0) /* B07E9C 80090CFC AC4D0000 */ sw $t5, ($v0) /* B07EA0 80090D00 8FAF00A0 */ lw $t7, 0xa0($sp) -/* B07EA4 80090D04 0C031AD5 */ jal func_800C6B54 +/* B07EA4 80090D04 0C031AD5 */ jal Graph_CloseDisps /* B07EA8 80090D08 8DE50000 */ lw $a1, ($t7) .L80090D0C: /* B07EAC 80090D0C 8FBF0034 */ lw $ra, 0x34($sp) diff --git a/asm/non_matchings/code/z_player_lib/func_80090D20.s b/asm/non_matchings/code/z_player_lib/func_80090D20.s index 53aed4536b..0ea03acd51 100644 --- a/asm/non_matchings/code/z_player_lib/func_80090D20.s +++ b/asm/non_matchings/code/z_player_lib/func_80090D20.s @@ -95,15 +95,15 @@ glabel func_80090D20 /* B07F34 80090D94 3C068014 */ lui $a2, %hi(D_8013E7FC) /* B07F38 80090D98 24C6E7FC */ addiu $a2, %lo(D_8013E7FC) # addiu $a2, $a2, -0x1804 /* B07F3C 80090D9C 24070A49 */ li $a3, 2633 -/* B07F40 80090DA0 0C031AB1 */ jal func_800C6AC4 +/* B07F40 80090DA0 0C031AB1 */ jal Graph_OpenDisps /* B07F44 80090DA4 AFA50120 */ sw $a1, 0x120($sp) /* B07F48 80090DA8 C6040054 */ lwc1 $f4, 0x54($s0) /* B07F4C 80090DAC 44803000 */ mtc1 $zero, $f6 /* B07F50 80090DB0 3C018014 */ lui $at, %hi(D_8013E940) /* B07F54 80090DB4 4604303E */ c.le.s $f6, $f4 -/* B07F58 80090DB8 00000000 */ nop +/* B07F58 80090DB8 00000000 */ nop /* B07F5C 80090DBC 45000014 */ bc1f .L80090E10 -/* B07F60 80090DC0 00000000 */ nop +/* B07F60 80090DC0 00000000 */ nop /* B07F64 80090DC4 C608085C */ lwc1 $f8, 0x85c($s0) /* B07F68 80090DC8 C42AE940 */ lwc1 $f10, %lo(D_8013E940)($at) /* B07F6C 80090DCC 3C018012 */ lui $at, %hi(D_80126080) @@ -120,7 +120,7 @@ glabel func_80090D20 /* B07F98 80090DF8 0C0241B5 */ jal func_800906D4 /* B07F9C 80090DFC 8FA40190 */ lw $a0, 0x190($sp) /* B07FA0 80090E00 10000003 */ b .L80090E10 -/* B07FA4 80090E04 00000000 */ nop +/* B07FA4 80090E04 00000000 */ nop .L80090E08: /* B07FA8 80090E08 0C01DF90 */ jal Math_Vec3f_Copy /* B07FAC 80090E0C 00C02825 */ move $a1, $a2 @@ -136,7 +136,7 @@ glabel func_80090D20 /* B07FD0 80090E30 24048000 */ li $a0, -32768 /* B07FD4 80090E34 00002825 */ move $a1, $zero /* B07FD8 80090E38 24064000 */ li $a2, 16384 -/* B07FDC 80090E3C 0C034421 */ jal Matrix_RotateXYZ +/* B07FDC 80090E3C 0C034421 */ jal Matrix_RotateZYX /* B07FE0 80090E40 24070001 */ li $a3, 1 /* B07FE4 80090E44 3C013F80 */ li $at, 0x3F800000 # 0.000000 /* B07FE8 80090E48 44816000 */ mtc1 $at, $f12 @@ -144,7 +144,7 @@ glabel func_80090D20 /* B07FF0 80090E50 24070001 */ li $a3, 1 /* B07FF4 80090E54 44066000 */ mfc1 $a2, $f12 /* B07FF8 80090E58 0C0342A3 */ jal Matrix_Scale -/* B07FFC 80090E5C 00000000 */ nop +/* B07FFC 80090E5C 00000000 */ nop /* B08000 80090E60 8FA70120 */ lw $a3, 0x120($sp) /* B08004 80090E64 3C0CDA38 */ lui $t4, (0xDA380003 >> 16) # lui $t4, 0xda38 /* B08008 80090E68 358C0003 */ ori $t4, (0xDA380003 & 0xFFFF) # ori $t4, $t4, 3 @@ -175,7 +175,7 @@ glabel func_80090D20 /* B0806C 80090ECC AC580000 */ sw $t8, ($v0) /* B08070 80090ED0 8FAA0190 */ lw $t2, 0x190($sp) /* B08074 80090ED4 24070A60 */ li $a3, 2656 -/* B08078 80090ED8 0C031AD5 */ jal func_800C6B54 +/* B08078 80090ED8 0C031AD5 */ jal Graph_CloseDisps /* B0807C 80090EDC 8D450000 */ lw $a1, ($t2) /* B08080 80090EE0 10000072 */ b .L800910AC /* B08084 80090EE4 C6000054 */ lwc1 $f0, 0x54($s0) @@ -184,7 +184,7 @@ glabel func_80090D20 /* B0808C 80090EEC 44809000 */ mtc1 $zero, $f18 /* B08090 80090EF0 8FAD0198 */ lw $t5, 0x198($sp) /* B08094 80090EF4 4600903E */ c.le.s $f18, $f0 -/* B08098 80090EF8 00000000 */ nop +/* B08098 80090EF8 00000000 */ nop /* B0809C 80090EFC 4502001E */ bc1fl .L80090F78 /* B080A0 80090F00 8DAF0000 */ lw $t7, ($t5) /* B080A4 80090F04 820B0843 */ lb $t3, 0x843($s0) @@ -239,7 +239,7 @@ glabel func_80090D20 /* B0815C 80090FBC AFA900E0 */ sw $t1, 0xe0($sp) /* B08160 80090FC0 27A400CC */ addiu $a0, $sp, 0xcc /* B08164 80090FC4 24070A96 */ li $a3, 2710 -/* B08168 80090FC8 0C031AB1 */ jal func_800C6AC4 +/* B08168 80090FC8 0C031AB1 */ jal Graph_OpenDisps /* B0816C 80090FCC AFA500DC */ sw $a1, 0xdc($sp) /* B08170 80090FD0 8FA800DC */ lw $t0, 0xdc($sp) /* B08174 80090FD4 8FA900E0 */ lw $t1, 0xe0($sp) @@ -293,15 +293,15 @@ glabel func_80090D20 /* B08234 80091094 24070A9D */ li $a3, 2717 /* B08238 80091098 AC4E0004 */ sw $t6, 4($v0) /* B0823C 8009109C 8FB80190 */ lw $t8, 0x190($sp) -/* B08240 800910A0 0C031AD5 */ jal func_800C6B54 +/* B08240 800910A0 0C031AD5 */ jal Graph_CloseDisps /* B08244 800910A4 8F050000 */ lw $a1, ($t8) /* B08248 800910A8 C6000054 */ lwc1 $f0, 0x54($s0) .L800910AC: /* B0824C 800910AC 44804000 */ mtc1 $zero, $f8 .L800910B0: -/* B08250 800910B0 00000000 */ nop +/* B08250 800910B0 00000000 */ nop /* B08254 800910B4 4600403E */ c.le.s $f8, $f0 -/* B08258 800910B8 00000000 */ nop +/* B08258 800910B8 00000000 */ nop /* B0825C 800910BC 4502019A */ bc1fl .L80091728 /* B08260 800910C0 8FBF0024 */ lw $ra, 0x24($sp) /* B08264 800910C4 0C023C41 */ jal func_8008F104 @@ -310,7 +310,7 @@ glabel func_80090D20 /* B08270 800910D0 260409E0 */ addiu $a0, $s0, 0x9e0 /* B08274 800910D4 8E0303AC */ lw $v1, 0x3ac($s0) /* B08278 800910D8 1060003C */ beqz $v1, .L800911CC -/* B0827C 800910DC 00000000 */ nop +/* B0827C 800910DC 00000000 */ nop /* B08280 800910E0 8E02067C */ lw $v0, 0x67c($s0) /* B08284 800910E4 3C048012 */ lui $a0, %hi(D_80126128) # $a0, 0x8012 /* B08288 800910E8 24846128 */ addiu $a0, %lo(D_80126128) # addiu $a0, $a0, 0x6128 @@ -323,7 +323,7 @@ glabel func_80090D20 /* B082A4 80091104 240469E8 */ li $a0, 27112 /* B082A8 80091108 2405A8F8 */ li $a1, -22280 /* B082AC 8009110C 2406458E */ li $a2, 17806 -/* B082B0 80091110 0C034421 */ jal Matrix_RotateXYZ +/* B082B0 80091110 0C034421 */ jal Matrix_RotateZYX /* B082B4 80091114 24070001 */ li $a3, 1 /* B082B8 80091118 0C034236 */ jal Matrix_Get /* B082BC 8009111C 27A4014C */ addiu $a0, $sp, 0x14c @@ -416,10 +416,10 @@ glabel func_80090D20 /* B08400 80091260 24C6E874 */ addiu $a2, %lo(D_8013E874) # addiu $a2, $a2, -0x178c /* B08404 80091264 27A4009C */ addiu $a0, $sp, 0x9c /* B08408 80091268 24070ADF */ li $a3, 2783 -/* B0840C 8009126C 0C031AB1 */ jal func_800C6AC4 +/* B0840C 8009126C 0C031AB1 */ jal Graph_OpenDisps /* B08410 80091270 AFA500AC */ sw $a1, 0xac($sp) /* B08414 80091274 0C034213 */ jal Matrix_Push -/* B08418 80091278 00000000 */ nop +/* B08418 80091278 00000000 */ nop /* B0841C 8009127C 8FA200B0 */ lw $v0, 0xb0($sp) /* B08420 80091280 24070001 */ li $a3, 1 /* B08424 80091284 C44C0004 */ lwc1 $f12, 4($v0) @@ -464,7 +464,7 @@ glabel func_80090D20 /* B084BC 8009131C E6060858 */ swc1 $f6, 0x858($s0) /* B084C0 80091320 C6080858 */ lwc1 $f8, 0x858($s0) /* B084C4 80091324 4608603C */ c.lt.s $f12, $f8 -/* B084C8 80091328 00000000 */ nop +/* B084C8 80091328 00000000 */ nop /* B084CC 8009132C 45020003 */ bc1fl .L8009133C /* B084D0 80091330 3C01BF00 */ lui $at, 0xbf00 /* B084D4 80091334 E60C0858 */ swc1 $f12, 0x858($s0) @@ -472,7 +472,7 @@ glabel func_80090D20 /* B084D8 80091338 3C01BF00 */ li $at, 0xBF000000 # 0.000000 .L8009133C: /* B084DC 8009133C 44815000 */ mtc1 $at, $f10 -/* B084E0 80091340 00000000 */ nop +/* B084E0 80091340 00000000 */ nop /* B084E4 80091344 E60A085C */ swc1 $f10, 0x85c($s0) /* B084E8 80091348 3C013F80 */ li $at, 0x3F800000 # 0.000000 .L8009134C: @@ -481,7 +481,7 @@ glabel func_80090D20 /* B084F4 80091354 24070001 */ li $a3, 1 /* B084F8 80091358 44066000 */ mfc1 $a2, $f12 /* B084FC 8009135C 0C0342A3 */ jal Matrix_Scale -/* B08500 80091360 00000000 */ nop +/* B08500 80091360 00000000 */ nop /* B08504 80091364 3C0D8016 */ lui $t5, %hi(gSaveContext+4) # $t5, 0x8016 /* B08508 80091368 8DADE664 */ lw $t5, %lo(gSaveContext+4)($t5) /* B0850C 8009136C 3C018014 */ lui $at, %hi(D_8013E954) @@ -492,7 +492,7 @@ glabel func_80090D20 /* B08520 80091380 24050001 */ li $a1, 1 /* B08524 80091384 46128302 */ mul.s $f12, $f16, $f18 /* B08528 80091388 0C0343B5 */ jal Matrix_RotateZ -/* B0852C 8009138C 00000000 */ nop +/* B0852C 8009138C 00000000 */ nop /* B08530 80091390 8FA700AC */ lw $a3, 0xac($sp) .L80091394: /* B08534 80091394 3C18DA38 */ lui $t8, (0xDA380003 >> 16) # lui $t8, 0xda38 @@ -525,7 +525,7 @@ glabel func_80090D20 /* B085A0 80091400 24C6E89C */ addiu $a2, %lo(D_8013E89C) # addiu $a2, $a2, -0x1764 /* B085A4 80091404 27A4009C */ addiu $a0, $sp, 0x9c /* B085A8 80091408 24070AF9 */ li $a3, 2809 -/* B085AC 8009140C 0C031AD5 */ jal func_800C6B54 +/* B085AC 8009140C 0C031AD5 */ jal Graph_CloseDisps /* B085B0 80091410 8DC50000 */ lw $a1, ($t6) /* B085B4 80091414 10000013 */ b .L80091464 /* B085B8 80091418 C6000054 */ lwc1 $f0, 0x54($s0) @@ -534,7 +534,7 @@ glabel func_80090D20 /* B085C0 80091420 44802000 */ mtc1 $zero, $f4 /* B085C4 80091424 2401000A */ li $at, 10 /* B085C8 80091428 4600203E */ c.le.s $f4, $f0 -/* B085CC 8009142C 00000000 */ nop +/* B085CC 8009142C 00000000 */ nop /* B085D0 80091430 4502000D */ bc1fl .L80091468 /* B085D4 80091434 44803000 */ mtc1 $zero, $f6 /* B085D8 80091438 5441000B */ bnel $v0, $at, .L80091468 @@ -551,9 +551,9 @@ glabel func_80090D20 .L80091464: /* B08604 80091464 44803000 */ mtc1 $zero, $f6 .L80091468: -/* B08608 80091468 00000000 */ nop +/* B08608 80091468 00000000 */ nop /* B0860C 8009146C 4600303E */ c.le.s $f6, $f0 -/* B08610 80091470 00000000 */ nop +/* B08610 80091470 00000000 */ nop /* B08614 80091474 450200AC */ bc1fl .L80091728 /* B08618 80091478 8FBF0024 */ lw $ra, 0x24($sp) /* B0861C 8009147C 82020151 */ lb $v0, 0x151($s0) @@ -577,7 +577,7 @@ glabel func_80090D20 /* B08660 800914C0 00002025 */ move $a0, $zero /* B08664 800914C4 2405C000 */ li $a1, -16384 /* B08668 800914C8 2406C000 */ li $a2, -16384 -/* B0866C 800914CC 0C034421 */ jal Matrix_RotateXYZ +/* B0866C 800914CC 0C034421 */ jal Matrix_RotateZYX /* B08670 800914D0 24070001 */ li $a3, 1 /* B08674 800914D4 0C034236 */ jal Matrix_Get /* B08678 800914D8 27A40044 */ addiu $a0, $sp, 0x44 @@ -683,7 +683,7 @@ glabel func_80090D20 /* B087E8 80091648 8FAC0194 */ lw $t4, 0x194($sp) /* B087EC 8009164C 24010014 */ li $at, 20 /* B087F0 80091650 4608503E */ c.le.s $f10, $f8 -/* B087F4 80091654 00000000 */ nop +/* B087F4 80091654 00000000 */ nop /* B087F8 80091658 45020033 */ bc1fl .L80091728 /* B087FC 8009165C 8FBF0024 */ lw $ra, 0x24($sp) /* B08800 80091660 15810019 */ bne $t4, $at, .L800916C8 @@ -707,7 +707,7 @@ glabel func_80090D20 /* B08844 800916A4 3C048012 */ lui $a0, %hi(D_801261CC) # $a0, 0x8012 /* B08848 800916A8 3C058012 */ lui $a1, %hi(D_801261D8) # $a1, 0x8012 /* B0884C 800916AC 24A561D8 */ addiu $a1, %lo(D_801261D8) # addiu $a1, $a1, 0x61d8 -/* B08850 800916B0 0C0344D0 */ jal func_800D1340 +/* B08850 800916B0 0C0344D0 */ jal Matrix_TranslateThenRotateZYX /* B08854 800916B4 248461CC */ addiu $a0, %lo(D_801261CC) # addiu $a0, $a0, 0x61cc /* B08858 800916B8 0C034236 */ jal Matrix_Get /* B0885C 800916BC 26040A20 */ addiu $a0, $s0, 0xa20 @@ -744,5 +744,5 @@ glabel func_80090D20 /* B088C8 80091728 8FB00020 */ lw $s0, 0x20($sp) /* B088CC 8009172C 27BD0190 */ addiu $sp, $sp, 0x190 /* B088D0 80091730 03E00008 */ jr $ra -/* B088D4 80091734 00000000 */ nop +/* B088D4 80091734 00000000 */ nop diff --git a/asm/non_matchings/code/z_player_lib/func_80091738.s b/asm/non_matchings/code/z_player_lib/func_80091738.s index cc4fe918ad..68482d397f 100644 --- a/asm/non_matchings/code/z_player_lib/func_80091738.s +++ b/asm/non_matchings/code/z_player_lib/func_80091738.s @@ -83,7 +83,7 @@ glabel func_80091738 /* B089F4 80091854 AFA30014 */ sw $v1, 0x14($sp) /* B089F8 80091858 AFA30018 */ sw $v1, 0x18($sp) /* B089FC 8009185C 8FA40048 */ lw $a0, 0x48($sp) -/* B08A00 80091860 0C028E6B */ jal func_800A39AC +/* B08A00 80091860 0C028E6B */ jal SkelAnime_InitLinkAnimetion /* B08A04 80091864 8FA50050 */ lw $a1, 0x50($sp) /* B08A08 80091868 8FBF002C */ lw $ra, 0x2c($sp) /* B08A0C 8009186C 34018890 */ li $at, 34960 diff --git a/asm/non_matchings/code/z_player_lib/func_80091A24.s b/asm/non_matchings/code/z_player_lib/func_80091A24.s index b39f0ac269..e7501dc6ef 100644 --- a/asm/non_matchings/code/z_player_lib/func_80091A24.s +++ b/asm/non_matchings/code/z_player_lib/func_80091A24.s @@ -30,7 +30,7 @@ glabel func_80091A24 /* B08C0C 80091A6C 24C6E8D8 */ addiu $a2, %lo(D_8013E8D8) # addiu $a2, $a2, -0x1728 /* B08C10 80091A70 27A40104 */ addiu $a0, $sp, 0x104 /* B08C14 80091A74 24070C39 */ li $a3, 3129 -/* B08C18 80091A78 0C031AB1 */ jal func_800C6AC4 +/* B08C18 80091A78 0C031AB1 */ jal Graph_OpenDisps /* B08C1C 80091A7C AFA50114 */ sw $a1, 0x114($sp) /* B08C20 80091A80 8FA30114 */ lw $v1, 0x114($sp) /* B08C24 80091A84 3C05DE00 */ lui $a1, 0xde00 @@ -395,7 +395,7 @@ glabel func_80091A24 /* B091C0 80092020 00002825 */ move $a1, $zero /* B091C4 80092024 00003025 */ move $a2, $zero /* B091C8 80092028 00003825 */ move $a3, $zero -/* B091CC 8009202C 0C024DC2 */ jal func_80093708 +/* B091CC 8009202C 0C024DC2 */ jal Gfx_SetFog2 /* B091D0 80092030 AC6E02C0 */ sw $t6, 0x2c0($v1) /* B091D4 80092034 8FA30114 */ lw $v1, 0x114($sp) /* B091D8 80092038 8FA80130 */ lw $t0, 0x130($sp) @@ -461,7 +461,7 @@ glabel func_80091A24 /* B092C8 80092128 AC8F0004 */ sw $t7, 4($a0) /* B092CC 8009212C 8FAE0130 */ lw $t6, 0x130($sp) /* B092D0 80092130 27A40104 */ addiu $a0, $sp, 0x104 -/* B092D4 80092134 0C031AD5 */ jal func_800C6B54 +/* B092D4 80092134 0C031AD5 */ jal Graph_CloseDisps /* B092D8 80092138 8DC50000 */ lw $a1, ($t6) /* B092DC 8009213C 8FBF0034 */ lw $ra, 0x34($sp) /* B092E0 80092140 27BD0130 */ addiu $sp, $sp, 0x130 diff --git a/asm/non_matchings/code/z_rcp/func_80094DB8.s b/asm/non_matchings/code/z_rcp/Gfx_BranchTexScroll.s similarity index 95% rename from asm/non_matchings/code/z_rcp/func_80094DB8.s rename to asm/non_matchings/code/z_rcp/Gfx_BranchTexScroll.s index 4b8d5fa002..7885189604 100644 --- a/asm/non_matchings/code/z_rcp/func_80094DB8.s +++ b/asm/non_matchings/code/z_rcp/Gfx_BranchTexScroll.s @@ -1,10 +1,10 @@ -glabel func_80094DB8 +glabel Gfx_BranchTexScroll /* B0BF58 80094DB8 27BDFFE8 */ addiu $sp, $sp, -0x18 /* B0BF5C 80094DBC AFBF0014 */ sw $ra, 0x14($sp) /* B0BF60 80094DC0 AFA5001C */ sw $a1, 0x1c($sp) /* B0BF64 80094DC4 AFA60020 */ sw $a2, 0x20($sp) /* B0BF68 80094DC8 AFA70024 */ sw $a3, 0x24($sp) -/* B0BF6C 80094DCC 0C031B0F */ jal func_800C6C3C +/* B0BF6C 80094DCC 0C031B0F */ jal Graph_DlistAlloc /* B0BF70 80094DD0 24050018 */ li $a1, 24 /* B0BF74 80094DD4 8FA4001C */ lw $a0, 0x1c($sp) /* B0BF78 80094DD8 8FA50020 */ lw $a1, 0x20($sp) diff --git a/asm/non_matchings/code/z_rcp/func_80093370.s b/asm/non_matchings/code/z_rcp/func_80093370.s deleted file mode 100644 index 43f7648f86..0000000000 --- a/asm/non_matchings/code/z_rcp/func_80093370.s +++ /dev/null @@ -1,132 +0,0 @@ -.rdata -glabel D_8013EAE0 - .asciz "n != f" - .balign 4 - -glabel D_8013EAE8 - .asciz "../z_rcp.c" - .balign 4 - -.text -glabel func_80093370 -/* B0A510 80093370 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* B0A514 80093374 AFB10018 */ sw $s1, 0x18($sp) -/* B0A518 80093378 8FB10034 */ lw $s1, 0x34($sp) -/* B0A51C 8009337C 8FAE0038 */ lw $t6, 0x38($sp) -/* B0A520 80093380 AFB00014 */ sw $s0, 0x14($sp) -/* B0A524 80093384 00808025 */ move $s0, $a0 -/* B0A528 80093388 AFBF001C */ sw $ra, 0x1c($sp) -/* B0A52C 8009338C AFA50024 */ sw $a1, 0x24($sp) -/* B0A530 80093390 AFA60028 */ sw $a2, 0x28($sp) -/* B0A534 80093394 15D10003 */ bne $t6, $s1, .L800933A4 -/* B0A538 80093398 AFA7002C */ sw $a3, 0x2c($sp) -/* B0A53C 8009339C 25CF0001 */ addiu $t7, $t6, 1 -/* B0A540 800933A0 AFAF0038 */ sw $t7, 0x38($sp) -.L800933A4: -/* B0A544 800933A4 8FB80038 */ lw $t8, 0x38($sp) -/* B0A548 800933A8 56380008 */ bnel $s1, $t8, .L800933CC -/* B0A54C 800933AC 02001025 */ move $v0, $s0 -/* B0A550 800933B0 3C048014 */ lui $a0, %hi(D_8013EAE0) # $a0, 0x8014 -/* B0A554 800933B4 3C058014 */ lui $a1, %hi(D_8013EAE8) # $a1, 0x8014 -/* B0A558 800933B8 24A5EAE8 */ addiu $a1, %lo(D_8013EAE8) # addiu $a1, $a1, -0x1518 -/* B0A55C 800933BC 2484EAE0 */ addiu $a0, %lo(D_8013EAE0) # addiu $a0, $a0, -0x1520 -/* B0A560 800933C0 0C0007FC */ jal __assert -/* B0A564 800933C4 24060483 */ li $a2, 1155 -/* B0A568 800933C8 02001025 */ move $v0, $s0 -.L800933CC: -/* B0A56C 800933CC 3C19F800 */ lui $t9, 0xf800 -/* B0A570 800933D0 AC590000 */ sw $t9, ($v0) -/* B0A574 800933D4 8FA90024 */ lw $t1, 0x24($sp) -/* B0A578 800933D8 8FAB0028 */ lw $t3, 0x28($sp) -/* B0A57C 800933DC 8FAF002C */ lw $t7, 0x2c($sp) -/* B0A580 800933E0 00095600 */ sll $t2, $t1, 0x18 -/* B0A584 800933E4 8FA90030 */ lw $t1, 0x30($sp) -/* B0A588 800933E8 316C00FF */ andi $t4, $t3, 0xff -/* B0A58C 800933EC 000C6C00 */ sll $t5, $t4, 0x10 -/* B0A590 800933F0 31F800FF */ andi $t8, $t7, 0xff -/* B0A594 800933F4 0018CA00 */ sll $t9, $t8, 8 -/* B0A598 800933F8 014D7025 */ or $t6, $t2, $t5 -/* B0A59C 800933FC 01D94025 */ or $t0, $t6, $t9 -/* B0A5A0 80093400 312B00FF */ andi $t3, $t1, 0xff -/* B0A5A4 80093404 010B6025 */ or $t4, $t0, $t3 -/* B0A5A8 80093408 2A2103E8 */ slti $at, $s1, 0x3e8 -/* B0A5AC 8009340C AC4C0004 */ sw $t4, 4($v0) -/* B0A5B0 80093410 14200007 */ bnez $at, .L80093430 -/* B0A5B4 80093414 26100008 */ addiu $s0, $s0, 8 -/* B0A5B8 80093418 02001025 */ move $v0, $s0 -/* B0A5BC 8009341C 3C0ADB08 */ lui $t2, 0xdb08 -/* B0A5C0 80093420 AC4A0000 */ sw $t2, ($v0) -/* B0A5C4 80093424 AC400004 */ sw $zero, 4($v0) -/* B0A5C8 80093428 1000003A */ b .L80093514 -/* B0A5CC 8009342C 26100008 */ addiu $s0, $s0, 8 -.L80093430: -/* B0A5D0 80093430 2A2103E5 */ slti $at, $s1, 0x3e5 -/* B0A5D4 80093434 14200008 */ bnez $at, .L80093458 -/* B0A5D8 80093438 02001025 */ move $v0, $s0 -/* B0A5DC 8009343C 3C0F7FFF */ lui $t7, (0x7FFF8100 >> 16) # lui $t7, 0x7fff -/* B0A5E0 80093440 35EF8100 */ ori $t7, (0x7FFF8100 & 0xFFFF) # ori $t7, $t7, 0x8100 -/* B0A5E4 80093444 3C0DDB08 */ lui $t5, 0xdb08 -/* B0A5E8 80093448 AC4D0000 */ sw $t5, ($v0) -/* B0A5EC 8009344C AC4F0004 */ sw $t7, 4($v0) -/* B0A5F0 80093450 10000030 */ b .L80093514 -/* B0A5F4 80093454 26100008 */ addiu $s0, $s0, 8 -.L80093458: -/* B0A5F8 80093458 06210008 */ bgez $s1, .L8009347C -/* B0A5FC 8009345C 02001025 */ move $v0, $s0 -/* B0A600 80093460 02001025 */ move $v0, $s0 -/* B0A604 80093464 3C18DB08 */ lui $t8, 0xdb08 -/* B0A608 80093468 240E00FF */ li $t6, 255 -/* B0A60C 8009346C AC4E0004 */ sw $t6, 4($v0) -/* B0A610 80093470 AC580000 */ sw $t8, ($v0) -/* B0A614 80093474 10000027 */ b .L80093514 -/* B0A618 80093478 26100008 */ addiu $s0, $s0, 8 -.L8009347C: -/* B0A61C 8009347C 3C19DB08 */ lui $t9, 0xdb08 -/* B0A620 80093480 AC590000 */ sw $t9, ($v0) -/* B0A624 80093484 8FA90038 */ lw $t1, 0x38($sp) -/* B0A628 80093488 3C080001 */ lui $t0, (0x0001F400 >> 16) # lui $t0, 1 -/* B0A62C 8009348C 3508F400 */ ori $t0, (0x0001F400 & 0xFFFF) # ori $t0, $t0, 0xf400 -/* B0A630 80093490 01311823 */ subu $v1, $t1, $s1 -/* B0A634 80093494 0103001A */ div $zero, $t0, $v1 -/* B0A638 80093498 00116823 */ negu $t5, $s1 -/* B0A63C 8009349C 000D7A00 */ sll $t7, $t5, 8 -/* B0A640 800934A0 01E8C021 */ addu $t8, $t7, $t0 -/* B0A644 800934A4 00005812 */ mflo $t3 -/* B0A648 800934A8 316CFFFF */ andi $t4, $t3, 0xffff -/* B0A64C 800934AC 000C5400 */ sll $t2, $t4, 0x10 -/* B0A650 800934B0 0303001A */ div $zero, $t8, $v1 -/* B0A654 800934B4 00007012 */ mflo $t6 -/* B0A658 800934B8 31D9FFFF */ andi $t9, $t6, 0xffff -/* B0A65C 800934BC 01594825 */ or $t1, $t2, $t9 -/* B0A660 800934C0 AC490004 */ sw $t1, 4($v0) -/* B0A664 800934C4 26100008 */ addiu $s0, $s0, 8 -/* B0A668 800934C8 14600002 */ bnez $v1, .L800934D4 -/* B0A66C 800934CC 00000000 */ nop -/* B0A670 800934D0 0007000D */ break 7 -.L800934D4: -/* B0A674 800934D4 2401FFFF */ li $at, -1 -/* B0A678 800934D8 14610004 */ bne $v1, $at, .L800934EC -/* B0A67C 800934DC 3C018000 */ lui $at, 0x8000 -/* B0A680 800934E0 15010002 */ bne $t0, $at, .L800934EC -/* B0A684 800934E4 00000000 */ nop -/* B0A688 800934E8 0006000D */ break 6 -.L800934EC: -/* B0A68C 800934EC 01000821 */ addu $at, $t0, $zero -/* B0A690 800934F0 14600002 */ bnez $v1, .L800934FC -/* B0A694 800934F4 00000000 */ nop -/* B0A698 800934F8 0007000D */ break 7 -.L800934FC: -/* B0A69C 800934FC 2401FFFF */ li $at, -1 -/* B0A6A0 80093500 14610004 */ bne $v1, $at, .L80093514 -/* B0A6A4 80093504 3C018000 */ lui $at, 0x8000 -/* B0A6A8 80093508 17010002 */ bne $t8, $at, .L80093514 -/* B0A6AC 8009350C 00000000 */ nop -/* B0A6B0 80093510 0006000D */ break 6 -.L80093514: -/* B0A6B4 80093514 8FBF001C */ lw $ra, 0x1c($sp) -/* B0A6B8 80093518 02001025 */ move $v0, $s0 -/* B0A6BC 8009351C 8FB00014 */ lw $s0, 0x14($sp) -/* B0A6C0 80093520 8FB10018 */ lw $s1, 0x18($sp) -/* B0A6C4 80093524 03E00008 */ jr $ra -/* B0A6C8 80093528 27BD0020 */ addiu $sp, $sp, 0x20 - diff --git a/asm/non_matchings/code/z_rcp/func_8009352C.s b/asm/non_matchings/code/z_rcp/func_8009352C.s deleted file mode 100644 index 272dbeb6c3..0000000000 --- a/asm/non_matchings/code/z_rcp/func_8009352C.s +++ /dev/null @@ -1,140 +0,0 @@ -.rdata -glabel D_8013EAF4 - .asciz "n != f" - .balign 4 - -glabel D_8013EAFC - .asciz "../z_rcp.c" - .balign 4 - -.text -glabel func_8009352C -/* B0A6CC 8009352C 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* B0A6D0 80093530 8FAE0038 */ lw $t6, 0x38($sp) -/* B0A6D4 80093534 8FAF0034 */ lw $t7, 0x34($sp) -/* B0A6D8 80093538 AFB00018 */ sw $s0, 0x18($sp) -/* B0A6DC 8009353C 00808025 */ move $s0, $a0 -/* B0A6E0 80093540 AFBF001C */ sw $ra, 0x1c($sp) -/* B0A6E4 80093544 AFA50024 */ sw $a1, 0x24($sp) -/* B0A6E8 80093548 AFA60028 */ sw $a2, 0x28($sp) -/* B0A6EC 8009354C 15CF0003 */ bne $t6, $t7, .L8009355C -/* B0A6F0 80093550 AFA7002C */ sw $a3, 0x2c($sp) -/* B0A6F4 80093554 25D80001 */ addiu $t8, $t6, 1 -/* B0A6F8 80093558 AFB80038 */ sw $t8, 0x38($sp) -.L8009355C: -/* B0A6FC 8009355C 8FB90034 */ lw $t9, 0x34($sp) -/* B0A700 80093560 8FA80038 */ lw $t0, 0x38($sp) -/* B0A704 80093564 57280008 */ bnel $t9, $t0, .L80093588 -/* B0A708 80093568 02001025 */ move $v0, $s0 -/* B0A70C 8009356C 3C048014 */ lui $a0, %hi(D_8013EAF4) # $a0, 0x8014 -/* B0A710 80093570 3C058014 */ lui $a1, %hi(D_8013EAFC) # $a1, 0x8014 -/* B0A714 80093574 24A5EAFC */ addiu $a1, %lo(D_8013EAFC) # addiu $a1, $a1, -0x1504 -/* B0A718 80093578 2484EAF4 */ addiu $a0, %lo(D_8013EAF4) # addiu $a0, $a0, -0x150c -/* B0A71C 8009357C 0C0007FC */ jal __assert -/* B0A720 80093580 240604A3 */ li $a2, 1187 -/* B0A724 80093584 02001025 */ move $v0, $s0 -.L80093588: -/* B0A728 80093588 3C09E700 */ lui $t1, 0xe700 -/* B0A72C 8009358C AC490000 */ sw $t1, ($v0) -/* B0A730 80093590 AC400004 */ sw $zero, 4($v0) -/* B0A734 80093594 26100008 */ addiu $s0, $s0, 8 -/* B0A738 80093598 02001025 */ move $v0, $s0 -/* B0A73C 8009359C 3C0AF800 */ lui $t2, 0xf800 -/* B0A740 800935A0 AC4A0000 */ sw $t2, ($v0) -/* B0A744 800935A4 8FAC0024 */ lw $t4, 0x24($sp) -/* B0A748 800935A8 8FAF0028 */ lw $t7, 0x28($sp) -/* B0A74C 800935AC 8FA8002C */ lw $t0, 0x2c($sp) -/* B0A750 800935B0 000C6E00 */ sll $t5, $t4, 0x18 -/* B0A754 800935B4 8FAC0030 */ lw $t4, 0x30($sp) -/* B0A758 800935B8 31EE00FF */ andi $t6, $t7, 0xff -/* B0A75C 800935BC 000EC400 */ sll $t8, $t6, 0x10 -/* B0A760 800935C0 310900FF */ andi $t1, $t0, 0xff -/* B0A764 800935C4 00095200 */ sll $t2, $t1, 8 -/* B0A768 800935C8 01B8C825 */ or $t9, $t5, $t8 -/* B0A76C 800935CC 032A5825 */ or $t3, $t9, $t2 -/* B0A770 800935D0 318F00FF */ andi $t7, $t4, 0xff -/* B0A774 800935D4 016F7025 */ or $t6, $t3, $t7 -/* B0A778 800935D8 AC4E0004 */ sw $t6, 4($v0) -/* B0A77C 800935DC 8FAD0034 */ lw $t5, 0x34($sp) -/* B0A780 800935E0 26100008 */ addiu $s0, $s0, 8 -/* B0A784 800935E4 02001025 */ move $v0, $s0 -/* B0A788 800935E8 29A103E8 */ slti $at, $t5, 0x3e8 -/* B0A78C 800935EC 14200006 */ bnez $at, .L80093608 -/* B0A790 800935F0 8FA80034 */ lw $t0, 0x34($sp) -/* B0A794 800935F4 3C18DB08 */ lui $t8, 0xdb08 -/* B0A798 800935F8 AC580000 */ sw $t8, ($v0) -/* B0A79C 800935FC 26100008 */ addiu $s0, $s0, 8 -/* B0A7A0 80093600 1000003C */ b .L800936F4 -/* B0A7A4 80093604 AC400004 */ sw $zero, 4($v0) -.L80093608: -/* B0A7A8 80093608 290103E5 */ slti $at, $t0, 0x3e5 -/* B0A7AC 8009360C 14200009 */ bnez $at, .L80093634 -/* B0A7B0 80093610 8FAA0034 */ lw $t2, 0x34($sp) -/* B0A7B4 80093614 02001025 */ move $v0, $s0 -/* B0A7B8 80093618 3C197FFF */ lui $t9, (0x7FFF8100 >> 16) # lui $t9, 0x7fff -/* B0A7BC 8009361C 37398100 */ ori $t9, (0x7FFF8100 & 0xFFFF) # ori $t9, $t9, 0x8100 -/* B0A7C0 80093620 3C09DB08 */ lui $t1, 0xdb08 -/* B0A7C4 80093624 AC490000 */ sw $t1, ($v0) -/* B0A7C8 80093628 AC590004 */ sw $t9, 4($v0) -/* B0A7CC 8009362C 10000031 */ b .L800936F4 -/* B0A7D0 80093630 26100008 */ addiu $s0, $s0, 8 -.L80093634: -/* B0A7D4 80093634 05410008 */ bgez $t2, .L80093658 -/* B0A7D8 80093638 02001025 */ move $v0, $s0 -/* B0A7DC 8009363C 02001025 */ move $v0, $s0 -/* B0A7E0 80093640 3C0CDB08 */ lui $t4, 0xdb08 -/* B0A7E4 80093644 240B00FF */ li $t3, 255 -/* B0A7E8 80093648 AC4B0004 */ sw $t3, 4($v0) -/* B0A7EC 8009364C AC4C0000 */ sw $t4, ($v0) -/* B0A7F0 80093650 10000028 */ b .L800936F4 -/* B0A7F4 80093654 26100008 */ addiu $s0, $s0, 8 -.L80093658: -/* B0A7F8 80093658 3C0FDB08 */ lui $t7, 0xdb08 -/* B0A7FC 8009365C AC4F0000 */ sw $t7, ($v0) -/* B0A800 80093660 8FAD0034 */ lw $t5, 0x34($sp) -/* B0A804 80093664 8FAE0038 */ lw $t6, 0x38($sp) -/* B0A808 80093668 3C180001 */ lui $t8, (0x0001F400 >> 16) # lui $t8, 1 -/* B0A80C 8009366C 3718F400 */ ori $t8, (0x0001F400 & 0xFFFF) # ori $t8, $t8, 0xf400 -/* B0A810 80093670 01CD1823 */ subu $v1, $t6, $t5 -/* B0A814 80093674 0303001A */ div $zero, $t8, $v1 -/* B0A818 80093678 000D5023 */ negu $t2, $t5 -/* B0A81C 8009367C 000A6200 */ sll $t4, $t2, 8 -/* B0A820 80093680 01985821 */ addu $t3, $t4, $t8 -/* B0A824 80093684 00004012 */ mflo $t0 -/* B0A828 80093688 3109FFFF */ andi $t1, $t0, 0xffff -/* B0A82C 8009368C 0009CC00 */ sll $t9, $t1, 0x10 -/* B0A830 80093690 0163001A */ div $zero, $t3, $v1 -/* B0A834 80093694 00007812 */ mflo $t7 -/* B0A838 80093698 31EEFFFF */ andi $t6, $t7, 0xffff -/* B0A83C 8009369C 26100008 */ addiu $s0, $s0, 8 -/* B0A840 800936A0 14600002 */ bnez $v1, .L800936AC -/* B0A844 800936A4 00000000 */ nop -/* B0A848 800936A8 0007000D */ break 7 -.L800936AC: -/* B0A84C 800936AC 2401FFFF */ li $at, -1 -/* B0A850 800936B0 14610004 */ bne $v1, $at, .L800936C4 -/* B0A854 800936B4 3C018000 */ lui $at, 0x8000 -/* B0A858 800936B8 17010002 */ bne $t8, $at, .L800936C4 -/* B0A85C 800936BC 00000000 */ nop -/* B0A860 800936C0 0006000D */ break 6 -.L800936C4: -/* B0A864 800936C4 03000821 */ addu $at, $t8, $zero -/* B0A868 800936C8 032EC025 */ or $t8, $t9, $t6 -/* B0A86C 800936CC AC580004 */ sw $t8, 4($v0) -/* B0A870 800936D0 14600002 */ bnez $v1, .L800936DC -/* B0A874 800936D4 00000000 */ nop -/* B0A878 800936D8 0007000D */ break 7 -.L800936DC: -/* B0A87C 800936DC 2401FFFF */ li $at, -1 -/* B0A880 800936E0 14610004 */ bne $v1, $at, .L800936F4 -/* B0A884 800936E4 3C018000 */ lui $at, 0x8000 -/* B0A888 800936E8 15610002 */ bne $t3, $at, .L800936F4 -/* B0A88C 800936EC 00000000 */ nop -/* B0A890 800936F0 0006000D */ break 6 -.L800936F4: -/* B0A894 800936F4 8FBF001C */ lw $ra, 0x1c($sp) -/* B0A898 800936F8 02001025 */ move $v0, $s0 -/* B0A89C 800936FC 8FB00018 */ lw $s0, 0x18($sp) -/* B0A8A0 80093700 03E00008 */ jr $ra -/* B0A8A4 80093704 27BD0020 */ addiu $sp, $sp, 0x20 - diff --git a/asm/non_matchings/code/z_rcp/func_80093708.s b/asm/non_matchings/code/z_rcp/func_80093708.s deleted file mode 100644 index 5f26bf8cae..0000000000 --- a/asm/non_matchings/code/z_rcp/func_80093708.s +++ /dev/null @@ -1,15 +0,0 @@ -glabel func_80093708 -/* B0A8A8 80093708 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* B0A8AC 8009370C 8FAE0038 */ lw $t6, 0x38($sp) -/* B0A8B0 80093710 8FAF003C */ lw $t7, 0x3c($sp) -/* B0A8B4 80093714 8FB80040 */ lw $t8, 0x40($sp) -/* B0A8B8 80093718 AFBF0024 */ sw $ra, 0x24($sp) -/* B0A8BC 8009371C AFAE0010 */ sw $t6, 0x10($sp) -/* B0A8C0 80093720 AFAF0014 */ sw $t7, 0x14($sp) -/* B0A8C4 80093724 0C024CDC */ jal func_80093370 -/* B0A8C8 80093728 AFB80018 */ sw $t8, 0x18($sp) -/* B0A8CC 8009372C 8FBF0024 */ lw $ra, 0x24($sp) -/* B0A8D0 80093730 27BD0028 */ addiu $sp, $sp, 0x28 -/* B0A8D4 80093734 03E00008 */ jr $ra -/* B0A8D8 80093738 00000000 */ nop - diff --git a/asm/non_matchings/code/z_rcp/func_8009373C.s b/asm/non_matchings/code/z_rcp/func_8009373C.s deleted file mode 100644 index 58ae18c744..0000000000 --- a/asm/non_matchings/code/z_rcp/func_8009373C.s +++ /dev/null @@ -1,16 +0,0 @@ -glabel func_8009373C -/* B0A8DC 8009373C 00057880 */ sll $t7, $a1, 2 -/* B0A8E0 80093740 01E57823 */ subu $t7, $t7, $a1 -/* B0A8E4 80093744 000F7840 */ sll $t7, $t7, 1 -/* B0A8E8 80093748 00801025 */ move $v0, $a0 -/* B0A8EC 8009374C 3C198012 */ lui $t9, %hi(D_80126280) # $t9, 0x8012 -/* B0A8F0 80093750 27396280 */ addiu $t9, %lo(D_80126280) # addiu $t9, $t9, 0x6280 -/* B0A8F4 80093754 000FC0C0 */ sll $t8, $t7, 3 -/* B0A8F8 80093758 03194021 */ addu $t0, $t8, $t9 -/* B0A8FC 8009375C 3C0EDE00 */ lui $t6, 0xde00 -/* B0A900 80093760 AC4E0000 */ sw $t6, ($v0) -/* B0A904 80093764 AC480004 */ sw $t0, 4($v0) -/* B0A908 80093768 24840008 */ addiu $a0, $a0, 8 -/* B0A90C 8009376C 03E00008 */ jr $ra -/* B0A910 80093770 00801025 */ move $v0, $a0 - diff --git a/asm/non_matchings/code/z_rcp/func_80093774.s b/asm/non_matchings/code/z_rcp/func_80093774.s deleted file mode 100644 index d666dc72b6..0000000000 --- a/asm/non_matchings/code/z_rcp/func_80093774.s +++ /dev/null @@ -1,10 +0,0 @@ -glabel func_80093774 -/* B0A914 80093774 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* B0A918 80093778 AFBF0014 */ sw $ra, 0x14($sp) -/* B0A91C 8009377C 0C024DCF */ jal func_8009373C -/* B0A920 80093780 00000000 */ nop -/* B0A924 80093784 8FBF0014 */ lw $ra, 0x14($sp) -/* B0A928 80093788 27BD0018 */ addiu $sp, $sp, 0x18 -/* B0A92C 8009378C 03E00008 */ jr $ra -/* B0A930 80093790 00000000 */ nop - diff --git a/asm/non_matchings/code/z_rcp/func_80093794.s b/asm/non_matchings/code/z_rcp/func_80093794.s deleted file mode 100644 index 94831e6524..0000000000 --- a/asm/non_matchings/code/z_rcp/func_80093794.s +++ /dev/null @@ -1,13 +0,0 @@ -glabel func_80093794 -/* B0A934 80093794 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* B0A938 80093798 AFBF0014 */ sw $ra, 0x14($sp) -/* B0A93C 8009379C AFA40018 */ sw $a0, 0x18($sp) -/* B0A940 800937A0 0C024DDD */ jal func_80093774 -/* B0A944 800937A4 8C840000 */ lw $a0, ($a0) -/* B0A948 800937A8 8FAF0018 */ lw $t7, 0x18($sp) -/* B0A94C 800937AC ADE20000 */ sw $v0, ($t7) -/* B0A950 800937B0 8FBF0014 */ lw $ra, 0x14($sp) -/* B0A954 800937B4 27BD0018 */ addiu $sp, $sp, 0x18 -/* B0A958 800937B8 03E00008 */ jr $ra -/* B0A95C 800937BC 00000000 */ nop - diff --git a/asm/non_matchings/code/z_rcp/func_800937C0.s b/asm/non_matchings/code/z_rcp/func_800937C0.s deleted file mode 100644 index fad49c6e47..0000000000 --- a/asm/non_matchings/code/z_rcp/func_800937C0.s +++ /dev/null @@ -1,11 +0,0 @@ -glabel func_800937C0 -/* B0A960 800937C0 00801025 */ move $v0, $a0 -/* B0A964 800937C4 3C0F8012 */ lui $t7, %hi(D_80126D30) # $t7, 0x8012 -/* B0A968 800937C8 25EF6D30 */ addiu $t7, %lo(D_80126D30) # addiu $t7, $t7, 0x6d30 -/* B0A96C 800937CC 3C0EDE00 */ lui $t6, 0xde00 -/* B0A970 800937D0 AC4E0000 */ sw $t6, ($v0) -/* B0A974 800937D4 AC4F0004 */ sw $t7, 4($v0) -/* B0A978 800937D8 24840008 */ addiu $a0, $a0, 8 -/* B0A97C 800937DC 03E00008 */ jr $ra -/* B0A980 800937E0 00801025 */ move $v0, $a0 - diff --git a/asm/non_matchings/code/z_rcp/func_800937E4.s b/asm/non_matchings/code/z_rcp/func_800937E4.s deleted file mode 100644 index 0b98e93fd3..0000000000 --- a/asm/non_matchings/code/z_rcp/func_800937E4.s +++ /dev/null @@ -1,11 +0,0 @@ -glabel func_800937E4 -/* B0A984 800937E4 00801025 */ move $v0, $a0 -/* B0A988 800937E8 3C0F8012 */ lui $t7, %hi(D_80126D30) # $t7, 0x8012 -/* B0A98C 800937EC 25EF6D30 */ addiu $t7, %lo(D_80126D30) # addiu $t7, $t7, 0x6d30 -/* B0A990 800937F0 3C0EDE00 */ lui $t6, 0xde00 -/* B0A994 800937F4 AC4E0000 */ sw $t6, ($v0) -/* B0A998 800937F8 AC4F0004 */ sw $t7, 4($v0) -/* B0A99C 800937FC 24840008 */ addiu $a0, $a0, 8 -/* B0A9A0 80093800 03E00008 */ jr $ra -/* B0A9A4 80093804 00801025 */ move $v0, $a0 - diff --git a/asm/non_matchings/code/z_rcp/func_80093808.s b/asm/non_matchings/code/z_rcp/func_80093808.s deleted file mode 100644 index ce90bf1867..0000000000 --- a/asm/non_matchings/code/z_rcp/func_80093808.s +++ /dev/null @@ -1,18 +0,0 @@ -glabel func_80093808 -/* B0A9A8 80093808 00801025 */ move $v0, $a0 -/* B0A9AC 8009380C 3C0F8012 */ lui $t7, %hi(D_80126C40) # $t7, 0x8012 -/* B0A9B0 80093810 25EF6C40 */ addiu $t7, %lo(D_80126C40) # addiu $t7, $t7, 0x6c40 -/* B0A9B4 80093814 3C0EDE00 */ lui $t6, 0xde00 -/* B0A9B8 80093818 AC4E0000 */ sw $t6, ($v0) -/* B0A9BC 8009381C AC4F0004 */ sw $t7, 4($v0) -/* B0A9C0 80093820 24840008 */ addiu $a0, $a0, 8 -/* B0A9C4 80093824 00801025 */ move $v0, $a0 -/* B0A9C8 80093828 3C18E300 */ lui $t8, (0xE3001801 >> 16) # lui $t8, 0xe300 -/* B0A9CC 8009382C 37181801 */ ori $t8, (0xE3001801 & 0xFFFF) # ori $t8, $t8, 0x1801 -/* B0A9D0 80093830 241900C0 */ li $t9, 192 -/* B0A9D4 80093834 AC590004 */ sw $t9, 4($v0) -/* B0A9D8 80093838 AC580000 */ sw $t8, ($v0) -/* B0A9DC 8009383C 24840008 */ addiu $a0, $a0, 8 -/* B0A9E0 80093840 03E00008 */ jr $ra -/* B0A9E4 80093844 00801025 */ move $v0, $a0 - diff --git a/asm/non_matchings/code/z_rcp/func_80093848.s b/asm/non_matchings/code/z_rcp/func_80093848.s deleted file mode 100644 index c29915ecfd..0000000000 --- a/asm/non_matchings/code/z_rcp/func_80093848.s +++ /dev/null @@ -1,39 +0,0 @@ -.rdata -glabel D_8013EB08 - .asciz "../z_rcp.c" - .balign 4 - -glabel D_8013EB14 - .asciz "../z_rcp.c" - .balign 4 - -.text -glabel func_80093848 -/* B0A9E8 80093848 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* B0A9EC 8009384C AFBF0014 */ sw $ra, 0x14($sp) -/* B0A9F0 80093850 00802825 */ move $a1, $a0 -/* B0A9F4 80093854 3C068014 */ lui $a2, %hi(D_8013EB08) # $a2, 0x8014 -/* B0A9F8 80093858 24C6EB08 */ addiu $a2, %lo(D_8013EB08) # addiu $a2, $a2, -0x14f8 -/* B0A9FC 8009385C AFA50038 */ sw $a1, 0x38($sp) -/* B0AA00 80093860 27A40024 */ addiu $a0, $sp, 0x24 -/* B0AA04 80093864 0C031AB1 */ jal func_800C6AC4 -/* B0AA08 80093868 2407050D */ li $a3, 1293 -/* B0AA0C 8009386C 8FA50038 */ lw $a1, 0x38($sp) -/* B0AA10 80093870 3C188012 */ lui $t8, %hi(D_80126D60) # $t8, 0x8012 -/* B0AA14 80093874 27186D60 */ addiu $t8, %lo(D_80126D60) # addiu $t8, $t8, 0x6d60 -/* B0AA18 80093878 8CA302C0 */ lw $v1, 0x2c0($a1) -/* B0AA1C 8009387C 3C0FDE00 */ lui $t7, 0xde00 -/* B0AA20 80093880 3C068014 */ lui $a2, %hi(D_8013EB14) # $a2, 0x8014 -/* B0AA24 80093884 246E0008 */ addiu $t6, $v1, 8 -/* B0AA28 80093888 ACAE02C0 */ sw $t6, 0x2c0($a1) -/* B0AA2C 8009388C 24C6EB14 */ addiu $a2, %lo(D_8013EB14) # addiu $a2, $a2, -0x14ec -/* B0AA30 80093890 27A40024 */ addiu $a0, $sp, 0x24 -/* B0AA34 80093894 24070511 */ li $a3, 1297 -/* B0AA38 80093898 AC780004 */ sw $t8, 4($v1) -/* B0AA3C 8009389C 0C031AD5 */ jal func_800C6B54 -/* B0AA40 800938A0 AC6F0000 */ sw $t7, ($v1) -/* B0AA44 800938A4 8FBF0014 */ lw $ra, 0x14($sp) -/* B0AA48 800938A8 27BD0038 */ addiu $sp, $sp, 0x38 -/* B0AA4C 800938AC 03E00008 */ jr $ra -/* B0AA50 800938B0 00000000 */ nop - diff --git a/asm/non_matchings/code/z_rcp/func_800938B4.s b/asm/non_matchings/code/z_rcp/func_800938B4.s deleted file mode 100644 index 86694ed28e..0000000000 --- a/asm/non_matchings/code/z_rcp/func_800938B4.s +++ /dev/null @@ -1,39 +0,0 @@ -.rdata -glabel D_8013EB20 - .asciz "../z_rcp.c" - .balign 4 - -glabel D_8013EB2C - .asciz "../z_rcp.c" - .balign 4 - -.text -glabel func_800938B4 -/* B0AA54 800938B4 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* B0AA58 800938B8 AFBF0014 */ sw $ra, 0x14($sp) -/* B0AA5C 800938BC 00802825 */ move $a1, $a0 -/* B0AA60 800938C0 3C068014 */ lui $a2, %hi(D_8013EB20) # $a2, 0x8014 -/* B0AA64 800938C4 24C6EB20 */ addiu $a2, %lo(D_8013EB20) # addiu $a2, $a2, -0x14e0 -/* B0AA68 800938C8 AFA50038 */ sw $a1, 0x38($sp) -/* B0AA6C 800938CC 27A40024 */ addiu $a0, $sp, 0x24 -/* B0AA70 800938D0 0C031AB1 */ jal func_800C6AC4 -/* B0AA74 800938D4 2407051D */ li $a3, 1309 -/* B0AA78 800938D8 8FA50038 */ lw $a1, 0x38($sp) -/* B0AA7C 800938DC 3C188012 */ lui $t8, %hi(D_80126D30) # $t8, 0x8012 -/* B0AA80 800938E0 27186D30 */ addiu $t8, %lo(D_80126D30) # addiu $t8, $t8, 0x6d30 -/* B0AA84 800938E4 8CA302C0 */ lw $v1, 0x2c0($a1) -/* B0AA88 800938E8 3C0FDE00 */ lui $t7, 0xde00 -/* B0AA8C 800938EC 3C068014 */ lui $a2, %hi(D_8013EB2C) # $a2, 0x8014 -/* B0AA90 800938F0 246E0008 */ addiu $t6, $v1, 8 -/* B0AA94 800938F4 ACAE02C0 */ sw $t6, 0x2c0($a1) -/* B0AA98 800938F8 24C6EB2C */ addiu $a2, %lo(D_8013EB2C) # addiu $a2, $a2, -0x14d4 -/* B0AA9C 800938FC 27A40024 */ addiu $a0, $sp, 0x24 -/* B0AAA0 80093900 24070521 */ li $a3, 1313 -/* B0AAA4 80093904 AC780004 */ sw $t8, 4($v1) -/* B0AAA8 80093908 0C031AD5 */ jal func_800C6B54 -/* B0AAAC 8009390C AC6F0000 */ sw $t7, ($v1) -/* B0AAB0 80093910 8FBF0014 */ lw $ra, 0x14($sp) -/* B0AAB4 80093914 27BD0038 */ addiu $sp, $sp, 0x38 -/* B0AAB8 80093918 03E00008 */ jr $ra -/* B0AABC 8009391C 00000000 */ nop - diff --git a/asm/non_matchings/code/z_rcp/func_80093920.s b/asm/non_matchings/code/z_rcp/func_80093920.s deleted file mode 100644 index 5809b8fb9c..0000000000 --- a/asm/non_matchings/code/z_rcp/func_80093920.s +++ /dev/null @@ -1,39 +0,0 @@ -.rdata -glabel D_8013EB38 - .asciz "../z_rcp.c" - .balign 4 - -glabel D_8013EB44 - .asciz "../z_rcp.c" - .balign 4 - -.text -glabel func_80093920 -/* B0AAC0 80093920 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* B0AAC4 80093924 AFBF0014 */ sw $ra, 0x14($sp) -/* B0AAC8 80093928 00802825 */ move $a1, $a0 -/* B0AACC 8009392C 3C068014 */ lui $a2, %hi(D_8013EB38) # $a2, 0x8014 -/* B0AAD0 80093930 24C6EB38 */ addiu $a2, %lo(D_8013EB38) # addiu $a2, $a2, -0x14c8 -/* B0AAD4 80093934 AFA50038 */ sw $a1, 0x38($sp) -/* B0AAD8 80093938 27A40024 */ addiu $a0, $sp, 0x24 -/* B0AADC 8009393C 0C031AB1 */ jal func_800C6AC4 -/* B0AAE0 80093940 2407052D */ li $a3, 1325 -/* B0AAE4 80093944 8FA50038 */ lw $a1, 0x38($sp) -/* B0AAE8 80093948 3C188012 */ lui $t8, %hi(D_80126BE0) # $t8, 0x8012 -/* B0AAEC 8009394C 27186BE0 */ addiu $t8, %lo(D_80126BE0) # addiu $t8, $t8, 0x6be0 -/* B0AAF0 80093950 8CA302C0 */ lw $v1, 0x2c0($a1) -/* B0AAF4 80093954 3C0FDE00 */ lui $t7, 0xde00 -/* B0AAF8 80093958 3C068014 */ lui $a2, %hi(D_8013EB44) # $a2, 0x8014 -/* B0AAFC 8009395C 246E0008 */ addiu $t6, $v1, 8 -/* B0AB00 80093960 ACAE02C0 */ sw $t6, 0x2c0($a1) -/* B0AB04 80093964 24C6EB44 */ addiu $a2, %lo(D_8013EB44) # addiu $a2, $a2, -0x14bc -/* B0AB08 80093968 27A40024 */ addiu $a0, $sp, 0x24 -/* B0AB0C 8009396C 24070531 */ li $a3, 1329 -/* B0AB10 80093970 AC780004 */ sw $t8, 4($v1) -/* B0AB14 80093974 0C031AD5 */ jal func_800C6B54 -/* B0AB18 80093978 AC6F0000 */ sw $t7, ($v1) -/* B0AB1C 8009397C 8FBF0014 */ lw $ra, 0x14($sp) -/* B0AB20 80093980 27BD0038 */ addiu $sp, $sp, 0x38 -/* B0AB24 80093984 03E00008 */ jr $ra -/* B0AB28 80093988 00000000 */ nop - diff --git a/asm/non_matchings/code/z_rcp/func_8009398C.s b/asm/non_matchings/code/z_rcp/func_8009398C.s deleted file mode 100644 index a4055ad148..0000000000 --- a/asm/non_matchings/code/z_rcp/func_8009398C.s +++ /dev/null @@ -1,38 +0,0 @@ -.rdata -glabel D_8013EB50 - .asciz "../z_rcp.c" - .balign 4 -glabel D_8013EB5C - .asciz "../z_rcp.c" - .balign 4 - -.text -glabel func_8009398C -/* B0AB2C 8009398C 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* B0AB30 80093990 AFBF0014 */ sw $ra, 0x14($sp) -/* B0AB34 80093994 00802825 */ move $a1, $a0 -/* B0AB38 80093998 3C068014 */ lui $a2, %hi(D_8013EB50) # $a2, 0x8014 -/* B0AB3C 8009399C 24C6EB50 */ addiu $a2, %lo(D_8013EB50) # addiu $a2, $a2, -0x14b0 -/* B0AB40 800939A0 AFA50038 */ sw $a1, 0x38($sp) -/* B0AB44 800939A4 27A40024 */ addiu $a0, $sp, 0x24 -/* B0AB48 800939A8 0C031AB1 */ jal func_800C6AC4 -/* B0AB4C 800939AC 2407053D */ li $a3, 1341 -/* B0AB50 800939B0 8FA50038 */ lw $a1, 0x38($sp) -/* B0AB54 800939B4 3C188012 */ lui $t8, %hi(D_80126C10) # $t8, 0x8012 -/* B0AB58 800939B8 27186C10 */ addiu $t8, %lo(D_80126C10) # addiu $t8, $t8, 0x6c10 -/* B0AB5C 800939BC 8CA302C0 */ lw $v1, 0x2c0($a1) -/* B0AB60 800939C0 3C0FDE00 */ lui $t7, 0xde00 -/* B0AB64 800939C4 3C068014 */ lui $a2, %hi(D_8013EB5C) # $a2, 0x8014 -/* B0AB68 800939C8 246E0008 */ addiu $t6, $v1, 8 -/* B0AB6C 800939CC ACAE02C0 */ sw $t6, 0x2c0($a1) -/* B0AB70 800939D0 24C6EB5C */ addiu $a2, %lo(D_8013EB5C) # addiu $a2, $a2, -0x14a4 -/* B0AB74 800939D4 27A40024 */ addiu $a0, $sp, 0x24 -/* B0AB78 800939D8 24070541 */ li $a3, 1345 -/* B0AB7C 800939DC AC780004 */ sw $t8, 4($v1) -/* B0AB80 800939E0 0C031AD5 */ jal func_800C6B54 -/* B0AB84 800939E4 AC6F0000 */ sw $t7, ($v1) -/* B0AB88 800939E8 8FBF0014 */ lw $ra, 0x14($sp) -/* B0AB8C 800939EC 27BD0038 */ addiu $sp, $sp, 0x38 -/* B0AB90 800939F0 03E00008 */ jr $ra -/* B0AB94 800939F4 00000000 */ nop - diff --git a/asm/non_matchings/code/z_rcp/func_800939F8.s b/asm/non_matchings/code/z_rcp/func_800939F8.s deleted file mode 100644 index 15c888775d..0000000000 --- a/asm/non_matchings/code/z_rcp/func_800939F8.s +++ /dev/null @@ -1,39 +0,0 @@ -.rdata -glabel D_8013EB68 - .asciz "../z_rcp.c" - .balign 4 - -glabel D_8013EB74 - .asciz "../z_rcp.c" - .balign 4 - -.text -glabel func_800939F8 -/* B0AB98 800939F8 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* B0AB9C 800939FC AFBF0014 */ sw $ra, 0x14($sp) -/* B0ABA0 80093A00 00802825 */ move $a1, $a0 -/* B0ABA4 80093A04 3C068014 */ lui $a2, %hi(D_8013EB68) # $a2, 0x8014 -/* B0ABA8 80093A08 24C6EB68 */ addiu $a2, %lo(D_8013EB68) # addiu $a2, $a2, -0x1498 -/* B0ABAC 80093A0C AFA50038 */ sw $a1, 0x38($sp) -/* B0ABB0 80093A10 27A40024 */ addiu $a0, $sp, 0x24 -/* B0ABB4 80093A14 0C031AB1 */ jal func_800C6AC4 -/* B0ABB8 80093A18 2407054D */ li $a3, 1357 -/* B0ABBC 80093A1C 8FA50038 */ lw $a1, 0x38($sp) -/* B0ABC0 80093A20 3C188012 */ lui $t8, %hi(D_80126C40) # $t8, 0x8012 -/* B0ABC4 80093A24 27186C40 */ addiu $t8, %lo(D_80126C40) # addiu $t8, $t8, 0x6c40 -/* B0ABC8 80093A28 8CA302D0 */ lw $v1, 0x2d0($a1) -/* B0ABCC 80093A2C 3C0FDE00 */ lui $t7, 0xde00 -/* B0ABD0 80093A30 3C068014 */ lui $a2, %hi(D_8013EB74) # $a2, 0x8014 -/* B0ABD4 80093A34 246E0008 */ addiu $t6, $v1, 8 -/* B0ABD8 80093A38 ACAE02D0 */ sw $t6, 0x2d0($a1) -/* B0ABDC 80093A3C 24C6EB74 */ addiu $a2, %lo(D_8013EB74) # addiu $a2, $a2, -0x148c -/* B0ABE0 80093A40 27A40024 */ addiu $a0, $sp, 0x24 -/* B0ABE4 80093A44 24070551 */ li $a3, 1361 -/* B0ABE8 80093A48 AC780004 */ sw $t8, 4($v1) -/* B0ABEC 80093A4C 0C031AD5 */ jal func_800C6B54 -/* B0ABF0 80093A50 AC6F0000 */ sw $t7, ($v1) -/* B0ABF4 80093A54 8FBF0014 */ lw $ra, 0x14($sp) -/* B0ABF8 80093A58 27BD0038 */ addiu $sp, $sp, 0x38 -/* B0ABFC 80093A5C 03E00008 */ jr $ra -/* B0AC00 80093A60 00000000 */ nop - diff --git a/asm/non_matchings/code/z_rcp/func_80093A64.s b/asm/non_matchings/code/z_rcp/func_80093A64.s deleted file mode 100644 index f982335099..0000000000 --- a/asm/non_matchings/code/z_rcp/func_80093A64.s +++ /dev/null @@ -1,39 +0,0 @@ -.rdata -glabel D_8013EB80 - .asciz "../z_rcp.c" - .balign 4 - -glabel D_8013EB8C - .asciz "../z_rcp.c" - .balign 4 - -.text -glabel func_80093A64 -/* B0AC04 80093A64 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* B0AC08 80093A68 AFBF0014 */ sw $ra, 0x14($sp) -/* B0AC0C 80093A6C 00802825 */ move $a1, $a0 -/* B0AC10 80093A70 3C068014 */ lui $a2, %hi(D_8013EB80) # $a2, 0x8014 -/* B0AC14 80093A74 24C6EB80 */ addiu $a2, %lo(D_8013EB80) # addiu $a2, $a2, -0x1480 -/* B0AC18 80093A78 AFA50038 */ sw $a1, 0x38($sp) -/* B0AC1C 80093A7C 27A40024 */ addiu $a0, $sp, 0x24 -/* B0AC20 80093A80 0C031AB1 */ jal func_800C6AC4 -/* B0AC24 80093A84 2407055D */ li $a3, 1373 -/* B0AC28 80093A88 8FA50038 */ lw $a1, 0x38($sp) -/* B0AC2C 80093A8C 3C188012 */ lui $t8, %hi(D_80126C70) # $t8, 0x8012 -/* B0AC30 80093A90 27186C70 */ addiu $t8, %lo(D_80126C70) # addiu $t8, $t8, 0x6c70 -/* B0AC34 80093A94 8CA302C0 */ lw $v1, 0x2c0($a1) -/* B0AC38 80093A98 3C0FDE00 */ lui $t7, 0xde00 -/* B0AC3C 80093A9C 3C068014 */ lui $a2, %hi(D_8013EB8C) # $a2, 0x8014 -/* B0AC40 80093AA0 246E0008 */ addiu $t6, $v1, 8 -/* B0AC44 80093AA4 ACAE02C0 */ sw $t6, 0x2c0($a1) -/* B0AC48 80093AA8 24C6EB8C */ addiu $a2, %lo(D_8013EB8C) # addiu $a2, $a2, -0x1474 -/* B0AC4C 80093AAC 27A40024 */ addiu $a0, $sp, 0x24 -/* B0AC50 80093AB0 24070561 */ li $a3, 1377 -/* B0AC54 80093AB4 AC780004 */ sw $t8, 4($v1) -/* B0AC58 80093AB8 0C031AD5 */ jal func_800C6B54 -/* B0AC5C 80093ABC AC6F0000 */ sw $t7, ($v1) -/* B0AC60 80093AC0 8FBF0014 */ lw $ra, 0x14($sp) -/* B0AC64 80093AC4 27BD0038 */ addiu $sp, $sp, 0x38 -/* B0AC68 80093AC8 03E00008 */ jr $ra -/* B0AC6C 80093ACC 00000000 */ nop - diff --git a/asm/non_matchings/code/z_rcp/func_80093AD0.s b/asm/non_matchings/code/z_rcp/func_80093AD0.s deleted file mode 100644 index 4c3873cfba..0000000000 --- a/asm/non_matchings/code/z_rcp/func_80093AD0.s +++ /dev/null @@ -1,39 +0,0 @@ -.rdata -glabel D_8013EB98 - .asciz "../z_rcp.c" - .balign 4 - -glabel D_8013EBA4 - .asciz "../z_rcp.c" - .balign 4 - -.text -glabel func_80093AD0 -/* B0AC70 80093AD0 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* B0AC74 80093AD4 AFBF0014 */ sw $ra, 0x14($sp) -/* B0AC78 80093AD8 00802825 */ move $a1, $a0 -/* B0AC7C 80093ADC 3C068014 */ lui $a2, %hi(D_8013EB98) # $a2, 0x8014 -/* B0AC80 80093AE0 24C6EB98 */ addiu $a2, %lo(D_8013EB98) # addiu $a2, $a2, -0x1468 -/* B0AC84 80093AE4 AFA50038 */ sw $a1, 0x38($sp) -/* B0AC88 80093AE8 27A40024 */ addiu $a0, $sp, 0x24 -/* B0AC8C 80093AEC 0C031AB1 */ jal func_800C6AC4 -/* B0AC90 80093AF0 2407056D */ li $a3, 1389 -/* B0AC94 80093AF4 8FA50038 */ lw $a1, 0x38($sp) -/* B0AC98 80093AF8 3C188012 */ lui $t8, %hi(D_80126CA0) # $t8, 0x8012 -/* B0AC9C 80093AFC 27186CA0 */ addiu $t8, %lo(D_80126CA0) # addiu $t8, $t8, 0x6ca0 -/* B0ACA0 80093B00 8CA302C0 */ lw $v1, 0x2c0($a1) -/* B0ACA4 80093B04 3C0FDE00 */ lui $t7, 0xde00 -/* B0ACA8 80093B08 3C068014 */ lui $a2, %hi(D_8013EBA4) # $a2, 0x8014 -/* B0ACAC 80093B0C 246E0008 */ addiu $t6, $v1, 8 -/* B0ACB0 80093B10 ACAE02C0 */ sw $t6, 0x2c0($a1) -/* B0ACB4 80093B14 24C6EBA4 */ addiu $a2, %lo(D_8013EBA4) # addiu $a2, $a2, -0x145c -/* B0ACB8 80093B18 27A40024 */ addiu $a0, $sp, 0x24 -/* B0ACBC 80093B1C 24070571 */ li $a3, 1393 -/* B0ACC0 80093B20 AC780004 */ sw $t8, 4($v1) -/* B0ACC4 80093B24 0C031AD5 */ jal func_800C6B54 -/* B0ACC8 80093B28 AC6F0000 */ sw $t7, ($v1) -/* B0ACCC 80093B2C 8FBF0014 */ lw $ra, 0x14($sp) -/* B0ACD0 80093B30 27BD0038 */ addiu $sp, $sp, 0x38 -/* B0ACD4 80093B34 03E00008 */ jr $ra -/* B0ACD8 80093B38 00000000 */ nop - diff --git a/asm/non_matchings/code/z_rcp/func_80093B3C.s b/asm/non_matchings/code/z_rcp/func_80093B3C.s deleted file mode 100644 index bed762b1c9..0000000000 --- a/asm/non_matchings/code/z_rcp/func_80093B3C.s +++ /dev/null @@ -1,39 +0,0 @@ -.rdata -glabel D_8013EBB0 - .asciz "../z_rcp.c" - .balign 4 - -glabel D_8013EBBC - .asciz "../z_rcp.c" - .balign 4 - -.text -glabel func_80093B3C -/* B0ACDC 80093B3C 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* B0ACE0 80093B40 AFBF0014 */ sw $ra, 0x14($sp) -/* B0ACE4 80093B44 00802825 */ move $a1, $a0 -/* B0ACE8 80093B48 3C068014 */ lui $a2, %hi(D_8013EBB0) # $a2, 0x8014 -/* B0ACEC 80093B4C 24C6EBB0 */ addiu $a2, %lo(D_8013EBB0) # addiu $a2, $a2, -0x1450 -/* B0ACF0 80093B50 AFA50038 */ sw $a1, 0x38($sp) -/* B0ACF4 80093B54 27A40024 */ addiu $a0, $sp, 0x24 -/* B0ACF8 80093B58 0C031AB1 */ jal func_800C6AC4 -/* B0ACFC 80093B5C 2407057D */ li $a3, 1405 -/* B0AD00 80093B60 8FA50038 */ lw $a1, 0x38($sp) -/* B0AD04 80093B64 3C188012 */ lui $t8, %hi(D_80126CD0) # $t8, 0x8012 -/* B0AD08 80093B68 27186CD0 */ addiu $t8, %lo(D_80126CD0) # addiu $t8, $t8, 0x6cd0 -/* B0AD0C 80093B6C 8CA302D0 */ lw $v1, 0x2d0($a1) -/* B0AD10 80093B70 3C0FDE00 */ lui $t7, 0xde00 -/* B0AD14 80093B74 3C068014 */ lui $a2, %hi(D_8013EBBC) # $a2, 0x8014 -/* B0AD18 80093B78 246E0008 */ addiu $t6, $v1, 8 -/* B0AD1C 80093B7C ACAE02D0 */ sw $t6, 0x2d0($a1) -/* B0AD20 80093B80 24C6EBBC */ addiu $a2, %lo(D_8013EBBC) # addiu $a2, $a2, -0x1444 -/* B0AD24 80093B84 27A40024 */ addiu $a0, $sp, 0x24 -/* B0AD28 80093B88 24070581 */ li $a3, 1409 -/* B0AD2C 80093B8C AC780004 */ sw $t8, 4($v1) -/* B0AD30 80093B90 0C031AD5 */ jal func_800C6B54 -/* B0AD34 80093B94 AC6F0000 */ sw $t7, ($v1) -/* B0AD38 80093B98 8FBF0014 */ lw $ra, 0x14($sp) -/* B0AD3C 80093B9C 27BD0038 */ addiu $sp, $sp, 0x38 -/* B0AD40 80093BA0 03E00008 */ jr $ra -/* B0AD44 80093BA4 00000000 */ nop - diff --git a/asm/non_matchings/code/z_rcp/func_80093BA8.s b/asm/non_matchings/code/z_rcp/func_80093BA8.s deleted file mode 100644 index 6f63f9fa73..0000000000 --- a/asm/non_matchings/code/z_rcp/func_80093BA8.s +++ /dev/null @@ -1,39 +0,0 @@ -.rdata -glabel D_8013EBC8 - .asciz "../z_rcp.c" - .balign 4 - -glabel D_8013EBD4 - .asciz "../z_rcp.c" - .balign 4 - -.text -glabel func_80093BA8 -/* B0AD48 80093BA8 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* B0AD4C 80093BAC AFBF0014 */ sw $ra, 0x14($sp) -/* B0AD50 80093BB0 00802825 */ move $a1, $a0 -/* B0AD54 80093BB4 3C068014 */ lui $a2, %hi(D_8013EBC8) # $a2, 0x8014 -/* B0AD58 80093BB8 24C6EBC8 */ addiu $a2, %lo(D_8013EBC8) # addiu $a2, $a2, -0x1438 -/* B0AD5C 80093BBC AFA50038 */ sw $a1, 0x38($sp) -/* B0AD60 80093BC0 27A40024 */ addiu $a0, $sp, 0x24 -/* B0AD64 80093BC4 0C031AB1 */ jal func_800C6AC4 -/* B0AD68 80093BC8 2407058D */ li $a3, 1421 -/* B0AD6C 80093BCC 8FA50038 */ lw $a1, 0x38($sp) -/* B0AD70 80093BD0 3C188012 */ lui $t8, %hi(D_80126760) # $t8, 0x8012 -/* B0AD74 80093BD4 27186760 */ addiu $t8, %lo(D_80126760) # addiu $t8, $t8, 0x6760 -/* B0AD78 80093BD8 8CA302C0 */ lw $v1, 0x2c0($a1) -/* B0AD7C 80093BDC 3C0FDE00 */ lui $t7, 0xde00 -/* B0AD80 80093BE0 3C068014 */ lui $a2, %hi(D_8013EBD4) # $a2, 0x8014 -/* B0AD84 80093BE4 246E0008 */ addiu $t6, $v1, 8 -/* B0AD88 80093BE8 ACAE02C0 */ sw $t6, 0x2c0($a1) -/* B0AD8C 80093BEC 24C6EBD4 */ addiu $a2, %lo(D_8013EBD4) # addiu $a2, $a2, -0x142c -/* B0AD90 80093BF0 27A40024 */ addiu $a0, $sp, 0x24 -/* B0AD94 80093BF4 24070591 */ li $a3, 1425 -/* B0AD98 80093BF8 AC780004 */ sw $t8, 4($v1) -/* B0AD9C 80093BFC 0C031AD5 */ jal func_800C6B54 -/* B0ADA0 80093C00 AC6F0000 */ sw $t7, ($v1) -/* B0ADA4 80093C04 8FBF0014 */ lw $ra, 0x14($sp) -/* B0ADA8 80093C08 27BD0038 */ addiu $sp, $sp, 0x38 -/* B0ADAC 80093C0C 03E00008 */ jr $ra -/* B0ADB0 80093C10 00000000 */ nop - diff --git a/asm/non_matchings/code/z_rcp/func_80093C14.s b/asm/non_matchings/code/z_rcp/func_80093C14.s deleted file mode 100644 index c39dcea04f..0000000000 --- a/asm/non_matchings/code/z_rcp/func_80093C14.s +++ /dev/null @@ -1,39 +0,0 @@ -.rdata -glabel D_8013EBE0 - .asciz "../z_rcp.c" - .balign 4 - -glabel D_8013EBEC - .asciz "../z_rcp.c" - .balign 4 - -.text -glabel func_80093C14 -/* B0ADB4 80093C14 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* B0ADB8 80093C18 AFBF0014 */ sw $ra, 0x14($sp) -/* B0ADBC 80093C1C 00802825 */ move $a1, $a0 -/* B0ADC0 80093C20 3C068014 */ lui $a2, %hi(D_8013EBE0) # $a2, 0x8014 -/* B0ADC4 80093C24 24C6EBE0 */ addiu $a2, %lo(D_8013EBE0) # addiu $a2, $a2, -0x1420 -/* B0ADC8 80093C28 AFA50038 */ sw $a1, 0x38($sp) -/* B0ADCC 80093C2C 27A40024 */ addiu $a0, $sp, 0x24 -/* B0ADD0 80093C30 0C031AB1 */ jal func_800C6AC4 -/* B0ADD4 80093C34 2407059F */ li $a3, 1439 -/* B0ADD8 80093C38 8FA50038 */ lw $a1, 0x38($sp) -/* B0ADDC 80093C3C 3C188012 */ lui $t8, %hi(D_80126730) # $t8, 0x8012 -/* B0ADE0 80093C40 27186730 */ addiu $t8, %lo(D_80126730) # addiu $t8, $t8, 0x6730 -/* B0ADE4 80093C44 8CA302D0 */ lw $v1, 0x2d0($a1) -/* B0ADE8 80093C48 3C0FDE00 */ lui $t7, 0xde00 -/* B0ADEC 80093C4C 3C068014 */ lui $a2, %hi(D_8013EBEC) # $a2, 0x8014 -/* B0ADF0 80093C50 246E0008 */ addiu $t6, $v1, 8 -/* B0ADF4 80093C54 ACAE02D0 */ sw $t6, 0x2d0($a1) -/* B0ADF8 80093C58 24C6EBEC */ addiu $a2, %lo(D_8013EBEC) # addiu $a2, $a2, -0x1414 -/* B0ADFC 80093C5C 27A40024 */ addiu $a0, $sp, 0x24 -/* B0AE00 80093C60 240705A3 */ li $a3, 1443 -/* B0AE04 80093C64 AC780004 */ sw $t8, 4($v1) -/* B0AE08 80093C68 0C031AD5 */ jal func_800C6B54 -/* B0AE0C 80093C6C AC6F0000 */ sw $t7, ($v1) -/* B0AE10 80093C70 8FBF0014 */ lw $ra, 0x14($sp) -/* B0AE14 80093C74 27BD0038 */ addiu $sp, $sp, 0x38 -/* B0AE18 80093C78 03E00008 */ jr $ra -/* B0AE1C 80093C7C 00000000 */ nop - diff --git a/asm/non_matchings/code/z_rcp/func_80093C80.s b/asm/non_matchings/code/z_rcp/func_80093C80.s deleted file mode 100644 index dcf76adf35..0000000000 --- a/asm/non_matchings/code/z_rcp/func_80093C80.s +++ /dev/null @@ -1,51 +0,0 @@ -.rdata -glabel D_8013EBF8 - .asciz "../z_rcp.c" - .balign 4 - -glabel D_8013EC04 - .asciz "../z_rcp.c" - .balign 4 - -.text -glabel func_80093C80 -/* B0AE20 80093C80 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* B0AE24 80093C84 AFBF0014 */ sw $ra, 0x14($sp) -/* B0AE28 80093C88 AFA40038 */ sw $a0, 0x38($sp) -/* B0AE2C 80093C8C 8C850000 */ lw $a1, ($a0) -/* B0AE30 80093C90 00A02025 */ move $a0, $a1 -/* B0AE34 80093C94 0C024F46 */ jal func_80093D18 -/* B0AE38 80093C98 AFA50034 */ sw $a1, 0x34($sp) -/* B0AE3C 80093C9C 8FAF0038 */ lw $t7, 0x38($sp) -/* B0AE40 80093CA0 3C180001 */ lui $t8, 1 -/* B0AE44 80093CA4 24010003 */ li $at, 3 -/* B0AE48 80093CA8 030FC021 */ addu $t8, $t8, $t7 -/* B0AE4C 80093CAC 93181CBF */ lbu $t8, 0x1cbf($t8) -/* B0AE50 80093CB0 8FA50034 */ lw $a1, 0x34($sp) -/* B0AE54 80093CB4 27A40020 */ addiu $a0, $sp, 0x20 -/* B0AE58 80093CB8 17010013 */ bne $t8, $at, .L80093D08 -/* B0AE5C 80093CBC 3C068014 */ lui $a2, %hi(D_8013EBF8) # $a2, 0x8014 -/* B0AE60 80093CC0 24C6EBF8 */ addiu $a2, %lo(D_8013EBF8) # addiu $a2, $a2, -0x1408 -/* B0AE64 80093CC4 240705B4 */ li $a3, 1460 -/* B0AE68 80093CC8 0C031AB1 */ jal func_800C6AC4 -/* B0AE6C 80093CCC AFA50034 */ sw $a1, 0x34($sp) -/* B0AE70 80093CD0 8FA50034 */ lw $a1, 0x34($sp) -/* B0AE74 80093CD4 3C08E300 */ lui $t0, (0xE3001801 >> 16) # lui $t0, 0xe300 -/* B0AE78 80093CD8 35081801 */ ori $t0, (0xE3001801 & 0xFFFF) # ori $t0, $t0, 0x1801 -/* B0AE7C 80093CDC 8CA302C0 */ lw $v1, 0x2c0($a1) -/* B0AE80 80093CE0 240900C0 */ li $t1, 192 -/* B0AE84 80093CE4 3C068014 */ lui $a2, %hi(D_8013EC04) # $a2, 0x8014 -/* B0AE88 80093CE8 24790008 */ addiu $t9, $v1, 8 -/* B0AE8C 80093CEC ACB902C0 */ sw $t9, 0x2c0($a1) -/* B0AE90 80093CF0 24C6EC04 */ addiu $a2, %lo(D_8013EC04) # addiu $a2, $a2, -0x13fc -/* B0AE94 80093CF4 27A40020 */ addiu $a0, $sp, 0x20 -/* B0AE98 80093CF8 240705B6 */ li $a3, 1462 -/* B0AE9C 80093CFC AC690004 */ sw $t1, 4($v1) -/* B0AEA0 80093D00 0C031AD5 */ jal func_800C6B54 -/* B0AEA4 80093D04 AC680000 */ sw $t0, ($v1) -.L80093D08: -/* B0AEA8 80093D08 8FBF0014 */ lw $ra, 0x14($sp) -/* B0AEAC 80093D0C 27BD0038 */ addiu $sp, $sp, 0x38 -/* B0AEB0 80093D10 03E00008 */ jr $ra -/* B0AEB4 80093D14 00000000 */ nop - diff --git a/asm/non_matchings/code/z_rcp/func_80093D18.s b/asm/non_matchings/code/z_rcp/func_80093D18.s deleted file mode 100644 index 0e62052dce..0000000000 --- a/asm/non_matchings/code/z_rcp/func_80093D18.s +++ /dev/null @@ -1,39 +0,0 @@ -.rdata -glabel D_8013EC10 - .asciz "../z_rcp.c" - .balign 4 - -glabel D_8013EC1C - .asciz "../z_rcp.c" - .balign 4 - -.text -glabel func_80093D18 -/* B0AEB8 80093D18 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* B0AEBC 80093D1C AFBF0014 */ sw $ra, 0x14($sp) -/* B0AEC0 80093D20 00802825 */ move $a1, $a0 -/* B0AEC4 80093D24 3C068014 */ lui $a2, %hi(D_8013EC10) # $a2, 0x8014 -/* B0AEC8 80093D28 24C6EC10 */ addiu $a2, %lo(D_8013EC10) # addiu $a2, $a2, -0x13f0 -/* B0AECC 80093D2C AFA50038 */ sw $a1, 0x38($sp) -/* B0AED0 80093D30 27A40024 */ addiu $a0, $sp, 0x24 -/* B0AED4 80093D34 0C031AB1 */ jal func_800C6AC4 -/* B0AED8 80093D38 240705C3 */ li $a3, 1475 -/* B0AEDC 80093D3C 8FA50038 */ lw $a1, 0x38($sp) -/* B0AEE0 80093D40 3C188012 */ lui $t8, %hi(D_80126730) # $t8, 0x8012 -/* B0AEE4 80093D44 27186730 */ addiu $t8, %lo(D_80126730) # addiu $t8, $t8, 0x6730 -/* B0AEE8 80093D48 8CA302C0 */ lw $v1, 0x2c0($a1) -/* B0AEEC 80093D4C 3C0FDE00 */ lui $t7, 0xde00 -/* B0AEF0 80093D50 3C068014 */ lui $a2, %hi(D_8013EC1C) # $a2, 0x8014 -/* B0AEF4 80093D54 246E0008 */ addiu $t6, $v1, 8 -/* B0AEF8 80093D58 ACAE02C0 */ sw $t6, 0x2c0($a1) -/* B0AEFC 80093D5C 24C6EC1C */ addiu $a2, %lo(D_8013EC1C) # addiu $a2, $a2, -0x13e4 -/* B0AF00 80093D60 27A40024 */ addiu $a0, $sp, 0x24 -/* B0AF04 80093D64 240705C7 */ li $a3, 1479 -/* B0AF08 80093D68 AC780004 */ sw $t8, 4($v1) -/* B0AF0C 80093D6C 0C031AD5 */ jal func_800C6B54 -/* B0AF10 80093D70 AC6F0000 */ sw $t7, ($v1) -/* B0AF14 80093D74 8FBF0014 */ lw $ra, 0x14($sp) -/* B0AF18 80093D78 27BD0038 */ addiu $sp, $sp, 0x38 -/* B0AF1C 80093D7C 03E00008 */ jr $ra -/* B0AF20 80093D80 00000000 */ nop - diff --git a/asm/non_matchings/code/z_rcp/func_80093D84.s b/asm/non_matchings/code/z_rcp/func_80093D84.s deleted file mode 100644 index 5565551883..0000000000 --- a/asm/non_matchings/code/z_rcp/func_80093D84.s +++ /dev/null @@ -1,39 +0,0 @@ -.rdata -glabel D_8013EC28 - .asciz "../z_rcp.c" - .balign 4 - -glabel D_8013EC34 - .asciz "../z_rcp.c" - .balign 4 - -.text -glabel func_80093D84 -/* B0AF24 80093D84 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* B0AF28 80093D88 AFBF0014 */ sw $ra, 0x14($sp) -/* B0AF2C 80093D8C 00802825 */ move $a1, $a0 -/* B0AF30 80093D90 3C068014 */ lui $a2, %hi(D_8013EC28) # $a2, 0x8014 -/* B0AF34 80093D94 24C6EC28 */ addiu $a2, %lo(D_8013EC28) # addiu $a2, $a2, -0x13d8 -/* B0AF38 80093D98 AFA50038 */ sw $a1, 0x38($sp) -/* B0AF3C 80093D9C 27A40024 */ addiu $a0, $sp, 0x24 -/* B0AF40 80093DA0 0C031AB1 */ jal func_800C6AC4 -/* B0AF44 80093DA4 240705D3 */ li $a3, 1491 -/* B0AF48 80093DA8 8FA50038 */ lw $a1, 0x38($sp) -/* B0AF4C 80093DAC 3C188012 */ lui $t8, %hi(D_80126730) # $t8, 0x8012 -/* B0AF50 80093DB0 27186730 */ addiu $t8, %lo(D_80126730) # addiu $t8, $t8, 0x6730 -/* B0AF54 80093DB4 8CA302D0 */ lw $v1, 0x2d0($a1) -/* B0AF58 80093DB8 3C0FDE00 */ lui $t7, 0xde00 -/* B0AF5C 80093DBC 3C068014 */ lui $a2, %hi(D_8013EC34) # $a2, 0x8014 -/* B0AF60 80093DC0 246E0008 */ addiu $t6, $v1, 8 -/* B0AF64 80093DC4 ACAE02D0 */ sw $t6, 0x2d0($a1) -/* B0AF68 80093DC8 24C6EC34 */ addiu $a2, %lo(D_8013EC34) # addiu $a2, $a2, -0x13cc -/* B0AF6C 80093DCC 27A40024 */ addiu $a0, $sp, 0x24 -/* B0AF70 80093DD0 240705D7 */ li $a3, 1495 -/* B0AF74 80093DD4 AC780004 */ sw $t8, 4($v1) -/* B0AF78 80093DD8 0C031AD5 */ jal func_800C6B54 -/* B0AF7C 80093DDC AC6F0000 */ sw $t7, ($v1) -/* B0AF80 80093DE0 8FBF0014 */ lw $ra, 0x14($sp) -/* B0AF84 80093DE4 27BD0038 */ addiu $sp, $sp, 0x38 -/* B0AF88 80093DE8 03E00008 */ jr $ra -/* B0AF8C 80093DEC 00000000 */ nop - diff --git a/asm/non_matchings/code/z_rcp/func_80093DF0.s b/asm/non_matchings/code/z_rcp/func_80093DF0.s deleted file mode 100644 index 7a5a3b1d1e..0000000000 --- a/asm/non_matchings/code/z_rcp/func_80093DF0.s +++ /dev/null @@ -1,39 +0,0 @@ -.rdata -glabel D_8013EC40 - .asciz "../z_rcp.c" - .balign 4 - -glabel D_8013EC4C - .asciz "../z_rcp.c" - .balign 4 - -.text -glabel func_80093DF0 -/* B0AF90 80093DF0 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* B0AF94 80093DF4 AFBF0014 */ sw $ra, 0x14($sp) -/* B0AF98 80093DF8 00802825 */ move $a1, $a0 -/* B0AF9C 80093DFC 3C068014 */ lui $a2, %hi(D_8013EC40) # $a2, 0x8014 -/* B0AFA0 80093E00 24C6EC40 */ addiu $a2, %lo(D_8013EC40) # addiu $a2, $a2, -0x13c0 -/* B0AFA4 80093E04 AFA50038 */ sw $a1, 0x38($sp) -/* B0AFA8 80093E08 27A40024 */ addiu $a0, $sp, 0x24 -/* B0AFAC 80093E0C 0C031AB1 */ jal func_800C6AC4 -/* B0AFB0 80093E10 240705E3 */ li $a3, 1507 -/* B0AFB4 80093E14 8FA50038 */ lw $a1, 0x38($sp) -/* B0AFB8 80093E18 3C188012 */ lui $t8, %hi(D_80126850) # $t8, 0x8012 -/* B0AFBC 80093E1C 27186850 */ addiu $t8, %lo(D_80126850) # addiu $t8, $t8, 0x6850 -/* B0AFC0 80093E20 8CA302C0 */ lw $v1, 0x2c0($a1) -/* B0AFC4 80093E24 3C0FDE00 */ lui $t7, 0xde00 -/* B0AFC8 80093E28 3C068014 */ lui $a2, %hi(D_8013EC4C) # $a2, 0x8014 -/* B0AFCC 80093E2C 246E0008 */ addiu $t6, $v1, 8 -/* B0AFD0 80093E30 ACAE02C0 */ sw $t6, 0x2c0($a1) -/* B0AFD4 80093E34 24C6EC4C */ addiu $a2, %lo(D_8013EC4C) # addiu $a2, $a2, -0x13b4 -/* B0AFD8 80093E38 27A40024 */ addiu $a0, $sp, 0x24 -/* B0AFDC 80093E3C 240705E7 */ li $a3, 1511 -/* B0AFE0 80093E40 AC780004 */ sw $t8, 4($v1) -/* B0AFE4 80093E44 0C031AD5 */ jal func_800C6B54 -/* B0AFE8 80093E48 AC6F0000 */ sw $t7, ($v1) -/* B0AFEC 80093E4C 8FBF0014 */ lw $ra, 0x14($sp) -/* B0AFF0 80093E50 27BD0038 */ addiu $sp, $sp, 0x38 -/* B0AFF4 80093E54 03E00008 */ jr $ra -/* B0AFF8 80093E58 00000000 */ nop - diff --git a/asm/non_matchings/code/z_rcp/func_80093E5C.s b/asm/non_matchings/code/z_rcp/func_80093E5C.s deleted file mode 100644 index 5cc52b222c..0000000000 --- a/asm/non_matchings/code/z_rcp/func_80093E5C.s +++ /dev/null @@ -1,39 +0,0 @@ -.rdata -glabel D_8013EC58 - .asciz "../z_rcp.c" - .balign 4 - -glabel D_8013EC64 - .asciz "../z_rcp.c" - .balign 4 - -.text -glabel func_80093E5C -/* B0AFFC 80093E5C 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* B0B000 80093E60 AFBF0014 */ sw $ra, 0x14($sp) -/* B0B004 80093E64 00802825 */ move $a1, $a0 -/* B0B008 80093E68 3C068014 */ lui $a2, %hi(D_8013EC58) # $a2, 0x8014 -/* B0B00C 80093E6C 24C6EC58 */ addiu $a2, %lo(D_8013EC58) # addiu $a2, $a2, -0x13a8 -/* B0B010 80093E70 AFA50038 */ sw $a1, 0x38($sp) -/* B0B014 80093E74 27A40024 */ addiu $a0, $sp, 0x24 -/* B0B018 80093E78 0C031AB1 */ jal func_800C6AC4 -/* B0B01C 80093E7C 240705F3 */ li $a3, 1523 -/* B0B020 80093E80 8FA50038 */ lw $a1, 0x38($sp) -/* B0B024 80093E84 3C188012 */ lui $t8, %hi(D_80126880) # $t8, 0x8012 -/* B0B028 80093E88 27186880 */ addiu $t8, %lo(D_80126880) # addiu $t8, $t8, 0x6880 -/* B0B02C 80093E8C 8CA302C0 */ lw $v1, 0x2c0($a1) -/* B0B030 80093E90 3C0FDE00 */ lui $t7, 0xde00 -/* B0B034 80093E94 3C068014 */ lui $a2, %hi(D_8013EC64) # $a2, 0x8014 -/* B0B038 80093E98 246E0008 */ addiu $t6, $v1, 8 -/* B0B03C 80093E9C ACAE02C0 */ sw $t6, 0x2c0($a1) -/* B0B040 80093EA0 24C6EC64 */ addiu $a2, %lo(D_8013EC64) # addiu $a2, $a2, -0x139c -/* B0B044 80093EA4 27A40024 */ addiu $a0, $sp, 0x24 -/* B0B048 80093EA8 240705F7 */ li $a3, 1527 -/* B0B04C 80093EAC AC780004 */ sw $t8, 4($v1) -/* B0B050 80093EB0 0C031AD5 */ jal func_800C6B54 -/* B0B054 80093EB4 AC6F0000 */ sw $t7, ($v1) -/* B0B058 80093EB8 8FBF0014 */ lw $ra, 0x14($sp) -/* B0B05C 80093EBC 27BD0038 */ addiu $sp, $sp, 0x38 -/* B0B060 80093EC0 03E00008 */ jr $ra -/* B0B064 80093EC4 00000000 */ nop - diff --git a/asm/non_matchings/code/z_rcp/func_80093EC8.s b/asm/non_matchings/code/z_rcp/func_80093EC8.s deleted file mode 100644 index 201a8b3a3a..0000000000 --- a/asm/non_matchings/code/z_rcp/func_80093EC8.s +++ /dev/null @@ -1,39 +0,0 @@ -.rdata -glabel D_8013EC70 - .asciz "../z_rcp.c" - .balign 4 - -glabel D_8013EC7C - .asciz "../z_rcp.c" - .balign 4 - -.text -glabel func_80093EC8 -/* B0B068 80093EC8 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* B0B06C 80093ECC AFBF0014 */ sw $ra, 0x14($sp) -/* B0B070 80093ED0 00802825 */ move $a1, $a0 -/* B0B074 80093ED4 3C068014 */ lui $a2, %hi(D_8013EC70) # $a2, 0x8014 -/* B0B078 80093ED8 24C6EC70 */ addiu $a2, %lo(D_8013EC70) # addiu $a2, $a2, -0x1390 -/* B0B07C 80093EDC AFA50038 */ sw $a1, 0x38($sp) -/* B0B080 80093EE0 27A40024 */ addiu $a0, $sp, 0x24 -/* B0B084 80093EE4 0C031AB1 */ jal func_800C6AC4 -/* B0B088 80093EE8 24070603 */ li $a3, 1539 -/* B0B08C 80093EEC 8FA50038 */ lw $a1, 0x38($sp) -/* B0B090 80093EF0 3C188012 */ lui $t8, %hi(D_801268B0) # $t8, 0x8012 -/* B0B094 80093EF4 271868B0 */ addiu $t8, %lo(D_801268B0) # addiu $t8, $t8, 0x68b0 -/* B0B098 80093EF8 8CA302C0 */ lw $v1, 0x2c0($a1) -/* B0B09C 80093EFC 3C0FDE00 */ lui $t7, 0xde00 -/* B0B0A0 80093F00 3C068014 */ lui $a2, %hi(D_8013EC7C) # $a2, 0x8014 -/* B0B0A4 80093F04 246E0008 */ addiu $t6, $v1, 8 -/* B0B0A8 80093F08 ACAE02C0 */ sw $t6, 0x2c0($a1) -/* B0B0AC 80093F0C 24C6EC7C */ addiu $a2, %lo(D_8013EC7C) # addiu $a2, $a2, -0x1384 -/* B0B0B0 80093F10 27A40024 */ addiu $a0, $sp, 0x24 -/* B0B0B4 80093F14 24070607 */ li $a3, 1543 -/* B0B0B8 80093F18 AC780004 */ sw $t8, 4($v1) -/* B0B0BC 80093F1C 0C031AD5 */ jal func_800C6B54 -/* B0B0C0 80093F20 AC6F0000 */ sw $t7, ($v1) -/* B0B0C4 80093F24 8FBF0014 */ lw $ra, 0x14($sp) -/* B0B0C8 80093F28 27BD0038 */ addiu $sp, $sp, 0x38 -/* B0B0CC 80093F2C 03E00008 */ jr $ra -/* B0B0D0 80093F30 00000000 */ nop - diff --git a/asm/non_matchings/code/z_rcp/func_80093F34.s b/asm/non_matchings/code/z_rcp/func_80093F34.s deleted file mode 100644 index 3ad4891cea..0000000000 --- a/asm/non_matchings/code/z_rcp/func_80093F34.s +++ /dev/null @@ -1,11 +0,0 @@ -glabel func_80093F34 -/* B0B0D4 80093F34 00801025 */ move $v0, $a0 -/* B0B0D8 80093F38 3C0F8012 */ lui $t7, %hi(D_80126E80) # $t7, 0x8012 -/* B0B0DC 80093F3C 25EF6E80 */ addiu $t7, %lo(D_80126E80) # addiu $t7, $t7, 0x6e80 -/* B0B0E0 80093F40 3C0EDE00 */ lui $t6, 0xde00 -/* B0B0E4 80093F44 AC4E0000 */ sw $t6, ($v0) -/* B0B0E8 80093F48 AC4F0004 */ sw $t7, 4($v0) -/* B0B0EC 80093F4C 24840008 */ addiu $a0, $a0, 8 -/* B0B0F0 80093F50 03E00008 */ jr $ra -/* B0B0F4 80093F54 00801025 */ move $v0, $a0 - diff --git a/asm/non_matchings/code/z_rcp/func_80093F58.s b/asm/non_matchings/code/z_rcp/func_80093F58.s deleted file mode 100644 index 0d59421f08..0000000000 --- a/asm/non_matchings/code/z_rcp/func_80093F58.s +++ /dev/null @@ -1,11 +0,0 @@ -glabel func_80093F58 -/* B0B0F8 80093F58 00801025 */ move $v0, $a0 -/* B0B0FC 80093F5C 3C0F8012 */ lui $t7, %hi(D_801268E0) # $t7, 0x8012 -/* B0B100 80093F60 25EF68E0 */ addiu $t7, %lo(D_801268E0) # addiu $t7, $t7, 0x68e0 -/* B0B104 80093F64 3C0EDE00 */ lui $t6, 0xde00 -/* B0B108 80093F68 AC4E0000 */ sw $t6, ($v0) -/* B0B10C 80093F6C AC4F0004 */ sw $t7, 4($v0) -/* B0B110 80093F70 24840008 */ addiu $a0, $a0, 8 -/* B0B114 80093F74 03E00008 */ jr $ra -/* B0B118 80093F78 00801025 */ move $v0, $a0 - diff --git a/asm/non_matchings/code/z_rcp/func_80093F7C.s b/asm/non_matchings/code/z_rcp/func_80093F7C.s deleted file mode 100644 index 5dcd31bc40..0000000000 --- a/asm/non_matchings/code/z_rcp/func_80093F7C.s +++ /dev/null @@ -1,35 +0,0 @@ -.rdata -glabel D_8013EC88 - .asciz "../z_rcp.c" - .balign 4 - -glabel D_8013EC94 - .asciz "../z_rcp.c" - .balign 4 - -.text -glabel func_80093F7C -/* B0B11C 80093F7C 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* B0B120 80093F80 AFBF0014 */ sw $ra, 0x14($sp) -/* B0B124 80093F84 AFA40030 */ sw $a0, 0x30($sp) -/* B0B128 80093F88 3C068014 */ lui $a2, %hi(D_8013EC88) # $a2, 0x8014 -/* B0B12C 80093F8C 24C6EC88 */ addiu $a2, %lo(D_8013EC88) # addiu $a2, $a2, -0x1378 -/* B0B130 80093F90 8FA50030 */ lw $a1, 0x30($sp) -/* B0B134 80093F94 27A4001C */ addiu $a0, $sp, 0x1c -/* B0B138 80093F98 0C031AB1 */ jal func_800C6AC4 -/* B0B13C 80093F9C 24070621 */ li $a3, 1569 -/* B0B140 80093FA0 8FAE0030 */ lw $t6, 0x30($sp) -/* B0B144 80093FA4 0C024FD6 */ jal func_80093F58 -/* B0B148 80093FA8 8DC402C0 */ lw $a0, 0x2c0($t6) -/* B0B14C 80093FAC 8FA50030 */ lw $a1, 0x30($sp) -/* B0B150 80093FB0 3C068014 */ lui $a2, %hi(D_8013EC94) # $a2, 0x8014 -/* B0B154 80093FB4 24C6EC94 */ addiu $a2, %lo(D_8013EC94) # addiu $a2, $a2, -0x136c -/* B0B158 80093FB8 27A4001C */ addiu $a0, $sp, 0x1c -/* B0B15C 80093FBC 24070625 */ li $a3, 1573 -/* B0B160 80093FC0 0C031AD5 */ jal func_800C6B54 -/* B0B164 80093FC4 ACA202C0 */ sw $v0, 0x2c0($a1) -/* B0B168 80093FC8 8FBF0014 */ lw $ra, 0x14($sp) -/* B0B16C 80093FCC 27BD0030 */ addiu $sp, $sp, 0x30 -/* B0B170 80093FD0 03E00008 */ jr $ra -/* B0B174 80093FD4 00000000 */ nop - diff --git a/asm/non_matchings/code/z_rcp/func_80093FD8.s b/asm/non_matchings/code/z_rcp/func_80093FD8.s deleted file mode 100644 index 25c5ccdd2b..0000000000 --- a/asm/non_matchings/code/z_rcp/func_80093FD8.s +++ /dev/null @@ -1,39 +0,0 @@ -.rdata -glabel D_8013ECA0 - .asciz "../z_rcp.c" - .balign 4 - -glabel D_8013ECAC - .asciz "../z_rcp.c" - .balign 4 - -.text -glabel func_80093FD8 -/* B0B178 80093FD8 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* B0B17C 80093FDC AFBF0014 */ sw $ra, 0x14($sp) -/* B0B180 80093FE0 00802825 */ move $a1, $a0 -/* B0B184 80093FE4 3C068014 */ lui $a2, %hi(D_8013ECA0) # $a2, 0x8014 -/* B0B188 80093FE8 24C6ECA0 */ addiu $a2, %lo(D_8013ECA0) # addiu $a2, $a2, -0x1360 -/* B0B18C 80093FEC AFA50038 */ sw $a1, 0x38($sp) -/* B0B190 80093FF0 27A40024 */ addiu $a0, $sp, 0x24 -/* B0B194 80093FF4 0C031AB1 */ jal func_800C6AC4 -/* B0B198 80093FF8 24070631 */ li $a3, 1585 -/* B0B19C 80093FFC 8FA50038 */ lw $a1, 0x38($sp) -/* B0B1A0 80094000 3C188012 */ lui $t8, %hi(D_80126910) # $t8, 0x8012 -/* B0B1A4 80094004 27186910 */ addiu $t8, %lo(D_80126910) # addiu $t8, $t8, 0x6910 -/* B0B1A8 80094008 8CA302C0 */ lw $v1, 0x2c0($a1) -/* B0B1AC 8009400C 3C0FDE00 */ lui $t7, 0xde00 -/* B0B1B0 80094010 3C068014 */ lui $a2, %hi(D_8013ECAC) # $a2, 0x8014 -/* B0B1B4 80094014 246E0008 */ addiu $t6, $v1, 8 -/* B0B1B8 80094018 ACAE02C0 */ sw $t6, 0x2c0($a1) -/* B0B1BC 8009401C 24C6ECAC */ addiu $a2, %lo(D_8013ECAC) # addiu $a2, $a2, -0x1354 -/* B0B1C0 80094020 27A40024 */ addiu $a0, $sp, 0x24 -/* B0B1C4 80094024 24070635 */ li $a3, 1589 -/* B0B1C8 80094028 AC780004 */ sw $t8, 4($v1) -/* B0B1CC 8009402C 0C031AD5 */ jal func_800C6B54 -/* B0B1D0 80094030 AC6F0000 */ sw $t7, ($v1) -/* B0B1D4 80094034 8FBF0014 */ lw $ra, 0x14($sp) -/* B0B1D8 80094038 27BD0038 */ addiu $sp, $sp, 0x38 -/* B0B1DC 8009403C 03E00008 */ jr $ra -/* B0B1E0 80094040 00000000 */ nop - diff --git a/asm/non_matchings/code/z_rcp/func_80094044.s b/asm/non_matchings/code/z_rcp/func_80094044.s deleted file mode 100644 index 6a10642c2b..0000000000 --- a/asm/non_matchings/code/z_rcp/func_80094044.s +++ /dev/null @@ -1,39 +0,0 @@ -.rdata -glabel D_8013ECB8 - .asciz "../z_rcp.c" - .balign 4 - -glabel D_8013ECC4 - .asciz "../z_rcp.c" - .balign 4 - -.text -glabel func_80094044 -/* B0B1E4 80094044 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* B0B1E8 80094048 AFBF0014 */ sw $ra, 0x14($sp) -/* B0B1EC 8009404C 00802825 */ move $a1, $a0 -/* B0B1F0 80094050 3C068014 */ lui $a2, %hi(D_8013ECB8) # $a2, 0x8014 -/* B0B1F4 80094054 24C6ECB8 */ addiu $a2, %lo(D_8013ECB8) # addiu $a2, $a2, -0x1348 -/* B0B1F8 80094058 AFA50038 */ sw $a1, 0x38($sp) -/* B0B1FC 8009405C 27A40024 */ addiu $a0, $sp, 0x24 -/* B0B200 80094060 0C031AB1 */ jal func_800C6AC4 -/* B0B204 80094064 24070641 */ li $a3, 1601 -/* B0B208 80094068 8FA50038 */ lw $a1, 0x38($sp) -/* B0B20C 8009406C 3C188012 */ lui $t8, %hi(D_80126AC0) # $t8, 0x8012 -/* B0B210 80094070 27186AC0 */ addiu $t8, %lo(D_80126AC0) # addiu $t8, $t8, 0x6ac0 -/* B0B214 80094074 8CA302D0 */ lw $v1, 0x2d0($a1) -/* B0B218 80094078 3C0FDE00 */ lui $t7, 0xde00 -/* B0B21C 8009407C 3C068014 */ lui $a2, %hi(D_8013ECC4) # $a2, 0x8014 -/* B0B220 80094080 246E0008 */ addiu $t6, $v1, 8 -/* B0B224 80094084 ACAE02D0 */ sw $t6, 0x2d0($a1) -/* B0B228 80094088 24C6ECC4 */ addiu $a2, %lo(D_8013ECC4) # addiu $a2, $a2, -0x133c -/* B0B22C 8009408C 27A40024 */ addiu $a0, $sp, 0x24 -/* B0B230 80094090 24070645 */ li $a3, 1605 -/* B0B234 80094094 AC780004 */ sw $t8, 4($v1) -/* B0B238 80094098 0C031AD5 */ jal func_800C6B54 -/* B0B23C 8009409C AC6F0000 */ sw $t7, ($v1) -/* B0B240 800940A0 8FBF0014 */ lw $ra, 0x14($sp) -/* B0B244 800940A4 27BD0038 */ addiu $sp, $sp, 0x38 -/* B0B248 800940A8 03E00008 */ jr $ra -/* B0B24C 800940AC 00000000 */ nop - diff --git a/asm/non_matchings/code/z_rcp/func_800940B0.s b/asm/non_matchings/code/z_rcp/func_800940B0.s deleted file mode 100644 index 7acf428572..0000000000 --- a/asm/non_matchings/code/z_rcp/func_800940B0.s +++ /dev/null @@ -1,39 +0,0 @@ -.rdata -glabel D_8013ECD0 - .asciz "../z_rcp.c" - .balign 4 - -glabel D_8013ECDC - .asciz "../z_rcp.c" - .balign 4 - -.text -glabel func_800940B0 -/* B0B250 800940B0 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* B0B254 800940B4 AFBF0014 */ sw $ra, 0x14($sp) -/* B0B258 800940B8 00802825 */ move $a1, $a0 -/* B0B25C 800940BC 3C068014 */ lui $a2, %hi(D_8013ECD0) # $a2, 0x8014 -/* B0B260 800940C0 24C6ECD0 */ addiu $a2, %lo(D_8013ECD0) # addiu $a2, $a2, -0x1330 -/* B0B264 800940C4 AFA50038 */ sw $a1, 0x38($sp) -/* B0B268 800940C8 27A40024 */ addiu $a0, $sp, 0x24 -/* B0B26C 800940CC 0C031AB1 */ jal func_800C6AC4 -/* B0B270 800940D0 24070651 */ li $a3, 1617 -/* B0B274 800940D4 8FA50038 */ lw $a1, 0x38($sp) -/* B0B278 800940D8 3C188012 */ lui $t8, %hi(D_80126940) # $t8, 0x8012 -/* B0B27C 800940DC 27186940 */ addiu $t8, %lo(D_80126940) # addiu $t8, $t8, 0x6940 -/* B0B280 800940E0 8CA302C0 */ lw $v1, 0x2c0($a1) -/* B0B284 800940E4 3C0FDE00 */ lui $t7, 0xde00 -/* B0B288 800940E8 3C068014 */ lui $a2, %hi(D_8013ECDC) # $a2, 0x8014 -/* B0B28C 800940EC 246E0008 */ addiu $t6, $v1, 8 -/* B0B290 800940F0 ACAE02C0 */ sw $t6, 0x2c0($a1) -/* B0B294 800940F4 24C6ECDC */ addiu $a2, %lo(D_8013ECDC) # addiu $a2, $a2, -0x1324 -/* B0B298 800940F8 27A40024 */ addiu $a0, $sp, 0x24 -/* B0B29C 800940FC 24070655 */ li $a3, 1621 -/* B0B2A0 80094100 AC780004 */ sw $t8, 4($v1) -/* B0B2A4 80094104 0C031AD5 */ jal func_800C6B54 -/* B0B2A8 80094108 AC6F0000 */ sw $t7, ($v1) -/* B0B2AC 8009410C 8FBF0014 */ lw $ra, 0x14($sp) -/* B0B2B0 80094110 27BD0038 */ addiu $sp, $sp, 0x38 -/* B0B2B4 80094114 03E00008 */ jr $ra -/* B0B2B8 80094118 00000000 */ nop - diff --git a/asm/non_matchings/code/z_rcp/func_8009411C.s b/asm/non_matchings/code/z_rcp/func_8009411C.s deleted file mode 100644 index 6a45eeb4f5..0000000000 --- a/asm/non_matchings/code/z_rcp/func_8009411C.s +++ /dev/null @@ -1,11 +0,0 @@ -glabel func_8009411C -/* B0B2BC 8009411C 00801025 */ move $v0, $a0 -/* B0B2C0 80094120 3C0F8012 */ lui $t7, %hi(D_801267C0) # $t7, 0x8012 -/* B0B2C4 80094124 25EF67C0 */ addiu $t7, %lo(D_801267C0) # addiu $t7, $t7, 0x67c0 -/* B0B2C8 80094128 3C0EDE00 */ lui $t6, 0xde00 -/* B0B2CC 8009412C AC4E0000 */ sw $t6, ($v0) -/* B0B2D0 80094130 AC4F0004 */ sw $t7, 4($v0) -/* B0B2D4 80094134 24840008 */ addiu $a0, $a0, 8 -/* B0B2D8 80094138 03E00008 */ jr $ra -/* B0B2DC 8009413C 00801025 */ move $v0, $a0 - diff --git a/asm/non_matchings/code/z_rcp/func_80094140.s b/asm/non_matchings/code/z_rcp/func_80094140.s deleted file mode 100644 index 79f0f4a1ed..0000000000 --- a/asm/non_matchings/code/z_rcp/func_80094140.s +++ /dev/null @@ -1,39 +0,0 @@ -.rdata -glabel D_8013ECE8 - .asciz "../z_rcp.c" - .balign 4 - -glabel D_8013ECF4 - .asciz "../z_rcp.c" - .balign 4 - -.text -glabel func_80094140 -/* B0B2E0 80094140 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* B0B2E4 80094144 AFBF0014 */ sw $ra, 0x14($sp) -/* B0B2E8 80094148 00802825 */ move $a1, $a0 -/* B0B2EC 8009414C 3C068014 */ lui $a2, %hi(D_8013ECE8) # $a2, 0x8014 -/* B0B2F0 80094150 24C6ECE8 */ addiu $a2, %lo(D_8013ECE8) # addiu $a2, $a2, -0x1318 -/* B0B2F4 80094154 AFA50038 */ sw $a1, 0x38($sp) -/* B0B2F8 80094158 27A40024 */ addiu $a0, $sp, 0x24 -/* B0B2FC 8009415C 0C031AB1 */ jal func_800C6AC4 -/* B0B300 80094160 24070668 */ li $a3, 1640 -/* B0B304 80094164 8FA50038 */ lw $a1, 0x38($sp) -/* B0B308 80094168 3C188012 */ lui $t8, %hi(D_801267C0) # $t8, 0x8012 -/* B0B30C 8009416C 271867C0 */ addiu $t8, %lo(D_801267C0) # addiu $t8, $t8, 0x67c0 -/* B0B310 80094170 8CA302C0 */ lw $v1, 0x2c0($a1) -/* B0B314 80094174 3C0FDE00 */ lui $t7, 0xde00 -/* B0B318 80094178 3C068014 */ lui $a2, %hi(D_8013ECF4) # $a2, 0x8014 -/* B0B31C 8009417C 246E0008 */ addiu $t6, $v1, 8 -/* B0B320 80094180 ACAE02C0 */ sw $t6, 0x2c0($a1) -/* B0B324 80094184 24C6ECF4 */ addiu $a2, %lo(D_8013ECF4) # addiu $a2, $a2, -0x130c -/* B0B328 80094188 27A40024 */ addiu $a0, $sp, 0x24 -/* B0B32C 8009418C 2407066C */ li $a3, 1644 -/* B0B330 80094190 AC780004 */ sw $t8, 4($v1) -/* B0B334 80094194 0C031AD5 */ jal func_800C6B54 -/* B0B338 80094198 AC6F0000 */ sw $t7, ($v1) -/* B0B33C 8009419C 8FBF0014 */ lw $ra, 0x14($sp) -/* B0B340 800941A0 27BD0038 */ addiu $sp, $sp, 0x38 -/* B0B344 800941A4 03E00008 */ jr $ra -/* B0B348 800941A8 00000000 */ nop - diff --git a/asm/non_matchings/code/z_rcp/func_800941AC.s b/asm/non_matchings/code/z_rcp/func_800941AC.s deleted file mode 100644 index f0838ab4f8..0000000000 --- a/asm/non_matchings/code/z_rcp/func_800941AC.s +++ /dev/null @@ -1,39 +0,0 @@ -.rdata -glabel D_8013ED00 - .asciz "../z_rcp.c" - .balign 4 - -glabel D_8013ED0C - .asciz "../z_rcp.c" - .balign 4 - -.text -glabel func_800941AC -/* B0B34C 800941AC 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* B0B350 800941B0 AFBF0014 */ sw $ra, 0x14($sp) -/* B0B354 800941B4 00802825 */ move $a1, $a0 -/* B0B358 800941B8 3C068014 */ lui $a2, %hi(D_8013ED00) # $a2, 0x8014 -/* B0B35C 800941BC 24C6ED00 */ addiu $a2, %lo(D_8013ED00) # addiu $a2, $a2, -0x1300 -/* B0B360 800941C0 AFA50038 */ sw $a1, 0x38($sp) -/* B0B364 800941C4 27A40024 */ addiu $a0, $sp, 0x24 -/* B0B368 800941C8 0C031AB1 */ jal func_800C6AC4 -/* B0B36C 800941CC 24070673 */ li $a3, 1651 -/* B0B370 800941D0 8FA50038 */ lw $a1, 0x38($sp) -/* B0B374 800941D4 3C188012 */ lui $t8, %hi(D_80126A90) # $t8, 0x8012 -/* B0B378 800941D8 27186A90 */ addiu $t8, %lo(D_80126A90) # addiu $t8, $t8, 0x6a90 -/* B0B37C 800941DC 8CA302C0 */ lw $v1, 0x2c0($a1) -/* B0B380 800941E0 3C0FDE00 */ lui $t7, 0xde00 -/* B0B384 800941E4 3C068014 */ lui $a2, %hi(D_8013ED0C) # $a2, 0x8014 -/* B0B388 800941E8 246E0008 */ addiu $t6, $v1, 8 -/* B0B38C 800941EC ACAE02C0 */ sw $t6, 0x2c0($a1) -/* B0B390 800941F0 24C6ED0C */ addiu $a2, %lo(D_8013ED0C) # addiu $a2, $a2, -0x12f4 -/* B0B394 800941F4 27A40024 */ addiu $a0, $sp, 0x24 -/* B0B398 800941F8 24070677 */ li $a3, 1655 -/* B0B39C 800941FC AC780004 */ sw $t8, 4($v1) -/* B0B3A0 80094200 0C031AD5 */ jal func_800C6B54 -/* B0B3A4 80094204 AC6F0000 */ sw $t7, ($v1) -/* B0B3A8 80094208 8FBF0014 */ lw $ra, 0x14($sp) -/* B0B3AC 8009420C 27BD0038 */ addiu $sp, $sp, 0x38 -/* B0B3B0 80094210 03E00008 */ jr $ra -/* B0B3B4 80094214 00000000 */ nop - diff --git a/asm/non_matchings/code/z_rcp/func_80094218.s b/asm/non_matchings/code/z_rcp/func_80094218.s deleted file mode 100644 index 049cee4597..0000000000 --- a/asm/non_matchings/code/z_rcp/func_80094218.s +++ /dev/null @@ -1,39 +0,0 @@ -.rdata -glabel D_8013ED18 - .asciz "../z_rcp.c" - .balign 4 - -glabel D_8013ED24 - .asciz "../z_rcp.c" - .balign 4 - -.text -glabel func_80094218 -/* B0B3B8 80094218 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* B0B3BC 8009421C AFBF0014 */ sw $ra, 0x14($sp) -/* B0B3C0 80094220 00802825 */ move $a1, $a0 -/* B0B3C4 80094224 3C068014 */ lui $a2, %hi(D_8013ED18) # $a2, 0x8014 -/* B0B3C8 80094228 24C6ED18 */ addiu $a2, %lo(D_8013ED18) # addiu $a2, $a2, -0x12e8 -/* B0B3CC 8009422C AFA50038 */ sw $a1, 0x38($sp) -/* B0B3D0 80094230 27A40024 */ addiu $a0, $sp, 0x24 -/* B0B3D4 80094234 0C031AB1 */ jal func_800C6AC4 -/* B0B3D8 80094238 24070686 */ li $a3, 1670 -/* B0B3DC 8009423C 8FA50038 */ lw $a1, 0x38($sp) -/* B0B3E0 80094240 3C188012 */ lui $t8, %hi(D_80126AF0) # $t8, 0x8012 -/* B0B3E4 80094244 27186AF0 */ addiu $t8, %lo(D_80126AF0) # addiu $t8, $t8, 0x6af0 -/* B0B3E8 80094248 8CA302C0 */ lw $v1, 0x2c0($a1) -/* B0B3EC 8009424C 3C0FDE00 */ lui $t7, 0xde00 -/* B0B3F0 80094250 3C068014 */ lui $a2, %hi(D_8013ED24) # $a2, 0x8014 -/* B0B3F4 80094254 246E0008 */ addiu $t6, $v1, 8 -/* B0B3F8 80094258 ACAE02C0 */ sw $t6, 0x2c0($a1) -/* B0B3FC 8009425C 24C6ED24 */ addiu $a2, %lo(D_8013ED24) # addiu $a2, $a2, -0x12dc -/* B0B400 80094260 27A40024 */ addiu $a0, $sp, 0x24 -/* B0B404 80094264 2407068A */ li $a3, 1674 -/* B0B408 80094268 AC780004 */ sw $t8, 4($v1) -/* B0B40C 8009426C 0C031AD5 */ jal func_800C6B54 -/* B0B410 80094270 AC6F0000 */ sw $t7, ($v1) -/* B0B414 80094274 8FBF0014 */ lw $ra, 0x14($sp) -/* B0B418 80094278 27BD0038 */ addiu $sp, $sp, 0x38 -/* B0B41C 8009427C 03E00008 */ jr $ra -/* B0B420 80094280 00000000 */ nop - diff --git a/asm/non_matchings/code/z_rcp/func_80094284.s b/asm/non_matchings/code/z_rcp/func_80094284.s deleted file mode 100644 index 6b6ae5f1c0..0000000000 --- a/asm/non_matchings/code/z_rcp/func_80094284.s +++ /dev/null @@ -1,39 +0,0 @@ -.rdata -glabel D_8013ED30 - .asciz "../z_rcp.c" - .balign 4 - -glabel D_8013ED3C - .asciz "../z_rcp.c" - .balign 4 - -.text -glabel func_80094284 -/* B0B424 80094284 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* B0B428 80094288 AFBF0014 */ sw $ra, 0x14($sp) -/* B0B42C 8009428C 00802825 */ move $a1, $a0 -/* B0B430 80094290 3C068014 */ lui $a2, %hi(D_8013ED30) # $a2, 0x8014 -/* B0B434 80094294 24C6ED30 */ addiu $a2, %lo(D_8013ED30) # addiu $a2, $a2, -0x12d0 -/* B0B438 80094298 AFA50038 */ sw $a1, 0x38($sp) -/* B0B43C 8009429C 27A40024 */ addiu $a0, $sp, 0x24 -/* B0B440 800942A0 0C031AB1 */ jal func_800C6AC4 -/* B0B444 800942A4 24070691 */ li $a3, 1681 -/* B0B448 800942A8 8FA50038 */ lw $a1, 0x38($sp) -/* B0B44C 800942AC 3C188012 */ lui $t8, %hi(D_80126B20) # $t8, 0x8012 -/* B0B450 800942B0 27186B20 */ addiu $t8, %lo(D_80126B20) # addiu $t8, $t8, 0x6b20 -/* B0B454 800942B4 8CA302B0 */ lw $v1, 0x2b0($a1) -/* B0B458 800942B8 3C0FDE00 */ lui $t7, 0xde00 -/* B0B45C 800942BC 3C068014 */ lui $a2, %hi(D_8013ED3C) # $a2, 0x8014 -/* B0B460 800942C0 246E0008 */ addiu $t6, $v1, 8 -/* B0B464 800942C4 ACAE02B0 */ sw $t6, 0x2b0($a1) -/* B0B468 800942C8 24C6ED3C */ addiu $a2, %lo(D_8013ED3C) # addiu $a2, $a2, -0x12c4 -/* B0B46C 800942CC 27A40024 */ addiu $a0, $sp, 0x24 -/* B0B470 800942D0 24070695 */ li $a3, 1685 -/* B0B474 800942D4 AC780004 */ sw $t8, 4($v1) -/* B0B478 800942D8 0C031AD5 */ jal func_800C6B54 -/* B0B47C 800942DC AC6F0000 */ sw $t7, ($v1) -/* B0B480 800942E0 8FBF0014 */ lw $ra, 0x14($sp) -/* B0B484 800942E4 27BD0038 */ addiu $sp, $sp, 0x38 -/* B0B488 800942E8 03E00008 */ jr $ra -/* B0B48C 800942EC 00000000 */ nop - diff --git a/asm/non_matchings/code/z_rcp/func_800942F0.s b/asm/non_matchings/code/z_rcp/func_800942F0.s deleted file mode 100644 index cf54d7bb4a..0000000000 --- a/asm/non_matchings/code/z_rcp/func_800942F0.s +++ /dev/null @@ -1,39 +0,0 @@ -.rdata -glabel D_8013ED48 - .asciz "../z_rcp.c" - .balign 4 - -glabel D_8013ED54 - .asciz "../z_rcp.c" - .balign 4 - -.text -glabel func_800942F0 -/* B0B490 800942F0 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* B0B494 800942F4 AFBF0014 */ sw $ra, 0x14($sp) -/* B0B498 800942F8 00802825 */ move $a1, $a0 -/* B0B49C 800942FC 3C068014 */ lui $a2, %hi(D_8013ED48) # $a2, 0x8014 -/* B0B4A0 80094300 24C6ED48 */ addiu $a2, %lo(D_8013ED48) # addiu $a2, $a2, -0x12b8 -/* B0B4A4 80094304 AFA50038 */ sw $a1, 0x38($sp) -/* B0B4A8 80094308 27A40024 */ addiu $a0, $sp, 0x24 -/* B0B4AC 8009430C 0C031AB1 */ jal func_800C6AC4 -/* B0B4B0 80094310 240706A4 */ li $a3, 1700 -/* B0B4B4 80094314 8FA50038 */ lw $a1, 0x38($sp) -/* B0B4B8 80094318 3C188012 */ lui $t8, %hi(D_801269A0) # $t8, 0x8012 -/* B0B4BC 8009431C 271869A0 */ addiu $t8, %lo(D_801269A0) # addiu $t8, $t8, 0x69a0 -/* B0B4C0 80094320 8CA302D0 */ lw $v1, 0x2d0($a1) -/* B0B4C4 80094324 3C0FDE00 */ lui $t7, 0xde00 -/* B0B4C8 80094328 3C068014 */ lui $a2, %hi(D_8013ED54) # $a2, 0x8014 -/* B0B4CC 8009432C 246E0008 */ addiu $t6, $v1, 8 -/* B0B4D0 80094330 ACAE02D0 */ sw $t6, 0x2d0($a1) -/* B0B4D4 80094334 24C6ED54 */ addiu $a2, %lo(D_8013ED54) # addiu $a2, $a2, -0x12ac -/* B0B4D8 80094338 27A40024 */ addiu $a0, $sp, 0x24 -/* B0B4DC 8009433C 240706A8 */ li $a3, 1704 -/* B0B4E0 80094340 AC780004 */ sw $t8, 4($v1) -/* B0B4E4 80094344 0C031AD5 */ jal func_800C6B54 -/* B0B4E8 80094348 AC6F0000 */ sw $t7, ($v1) -/* B0B4EC 8009434C 8FBF0014 */ lw $ra, 0x14($sp) -/* B0B4F0 80094350 27BD0038 */ addiu $sp, $sp, 0x38 -/* B0B4F4 80094354 03E00008 */ jr $ra -/* B0B4F8 80094358 00000000 */ nop - diff --git a/asm/non_matchings/code/z_rcp/func_8009435C.s b/asm/non_matchings/code/z_rcp/func_8009435C.s deleted file mode 100644 index 00cfe15595..0000000000 --- a/asm/non_matchings/code/z_rcp/func_8009435C.s +++ /dev/null @@ -1,39 +0,0 @@ -.rdata -glabel D_8013ED60 - .asciz "../z_rcp.c" - .balign 4 - -glabel D_8013ED6C - .asciz "../z_rcp.c" - .balign 4 - -.text -glabel func_8009435C -/* B0B4FC 8009435C 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* B0B500 80094360 AFBF0014 */ sw $ra, 0x14($sp) -/* B0B504 80094364 00802825 */ move $a1, $a0 -/* B0B508 80094368 3C068014 */ lui $a2, %hi(D_8013ED60) # $a2, 0x8014 -/* B0B50C 8009436C 24C6ED60 */ addiu $a2, %lo(D_8013ED60) # addiu $a2, $a2, -0x12a0 -/* B0B510 80094370 AFA50038 */ sw $a1, 0x38($sp) -/* B0B514 80094374 27A40024 */ addiu $a0, $sp, 0x24 -/* B0B518 80094378 0C031AB1 */ jal func_800C6AC4 -/* B0B51C 8009437C 240706BA */ li $a3, 1722 -/* B0B520 80094380 8FA50038 */ lw $a1, 0x38($sp) -/* B0B524 80094384 3C188012 */ lui $t8, %hi(D_80126340) # $t8, 0x8012 -/* B0B528 80094388 27186340 */ addiu $t8, %lo(D_80126340) # addiu $t8, $t8, 0x6340 -/* B0B52C 8009438C 8CA302D0 */ lw $v1, 0x2d0($a1) -/* B0B530 80094390 3C0FDE00 */ lui $t7, 0xde00 -/* B0B534 80094394 3C068014 */ lui $a2, %hi(D_8013ED6C) # $a2, 0x8014 -/* B0B538 80094398 246E0008 */ addiu $t6, $v1, 8 -/* B0B53C 8009439C ACAE02D0 */ sw $t6, 0x2d0($a1) -/* B0B540 800943A0 24C6ED6C */ addiu $a2, %lo(D_8013ED6C) # addiu $a2, $a2, -0x1294 -/* B0B544 800943A4 27A40024 */ addiu $a0, $sp, 0x24 -/* B0B548 800943A8 240706BE */ li $a3, 1726 -/* B0B54C 800943AC AC780004 */ sw $t8, 4($v1) -/* B0B550 800943B0 0C031AD5 */ jal func_800C6B54 -/* B0B554 800943B4 AC6F0000 */ sw $t7, ($v1) -/* B0B558 800943B8 8FBF0014 */ lw $ra, 0x14($sp) -/* B0B55C 800943BC 27BD0038 */ addiu $sp, $sp, 0x38 -/* B0B560 800943C0 03E00008 */ jr $ra -/* B0B564 800943C4 00000000 */ nop - diff --git a/asm/non_matchings/code/z_rcp/func_800943C8.s b/asm/non_matchings/code/z_rcp/func_800943C8.s deleted file mode 100644 index 28416bfab2..0000000000 --- a/asm/non_matchings/code/z_rcp/func_800943C8.s +++ /dev/null @@ -1,39 +0,0 @@ -.rdata -glabel D_8013ED78 - .asciz "../z_rcp.c" - .balign 4 - -glabel D_8013ED84 - .asciz "../z_rcp.c" - .balign 4 - -.text -glabel func_800943C8 -/* B0B568 800943C8 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* B0B56C 800943CC AFBF0014 */ sw $ra, 0x14($sp) -/* B0B570 800943D0 00802825 */ move $a1, $a0 -/* B0B574 800943D4 3C068014 */ lui $a2, %hi(D_8013ED78) # $a2, 0x8014 -/* B0B578 800943D8 24C6ED78 */ addiu $a2, %lo(D_8013ED78) # addiu $a2, $a2, -0x1288 -/* B0B57C 800943DC AFA50038 */ sw $a1, 0x38($sp) -/* B0B580 800943E0 27A40024 */ addiu $a0, $sp, 0x24 -/* B0B584 800943E4 0C031AB1 */ jal func_800C6AC4 -/* B0B588 800943E8 240706DE */ li $a3, 1758 -/* B0B58C 800943EC 8FA50038 */ lw $a1, 0x38($sp) -/* B0B590 800943F0 3C188012 */ lui $t8, %hi(D_80126970) # $t8, 0x8012 -/* B0B594 800943F4 27186970 */ addiu $t8, %lo(D_80126970) # addiu $t8, $t8, 0x6970 -/* B0B598 800943F8 8CA302C0 */ lw $v1, 0x2c0($a1) -/* B0B59C 800943FC 3C0FDE00 */ lui $t7, 0xde00 -/* B0B5A0 80094400 3C068014 */ lui $a2, %hi(D_8013ED84) # $a2, 0x8014 -/* B0B5A4 80094404 246E0008 */ addiu $t6, $v1, 8 -/* B0B5A8 80094408 ACAE02C0 */ sw $t6, 0x2c0($a1) -/* B0B5AC 8009440C 24C6ED84 */ addiu $a2, %lo(D_8013ED84) # addiu $a2, $a2, -0x127c -/* B0B5B0 80094410 27A40024 */ addiu $a0, $sp, 0x24 -/* B0B5B4 80094414 240706E2 */ li $a3, 1762 -/* B0B5B8 80094418 AC780004 */ sw $t8, 4($v1) -/* B0B5BC 8009441C 0C031AD5 */ jal func_800C6B54 -/* B0B5C0 80094420 AC6F0000 */ sw $t7, ($v1) -/* B0B5C4 80094424 8FBF0014 */ lw $ra, 0x14($sp) -/* B0B5C8 80094428 27BD0038 */ addiu $sp, $sp, 0x38 -/* B0B5CC 8009442C 03E00008 */ jr $ra -/* B0B5D0 80094430 00000000 */ nop - diff --git a/asm/non_matchings/code/z_rcp/func_80094434.s b/asm/non_matchings/code/z_rcp/func_80094434.s deleted file mode 100644 index 1f5d872296..0000000000 --- a/asm/non_matchings/code/z_rcp/func_80094434.s +++ /dev/null @@ -1,39 +0,0 @@ -.rdata -glabel D_8013ED90 - .asciz "../z_rcp.c" - .balign 4 - -glabel D_8013ED9C - .asciz "../z_rcp.c" - .balign 4 - -.text -glabel func_80094434 -/* B0B5D4 80094434 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* B0B5D8 80094438 AFBF0014 */ sw $ra, 0x14($sp) -/* B0B5DC 8009443C 00802825 */ move $a1, $a0 -/* B0B5E0 80094440 3C068014 */ lui $a2, %hi(D_8013ED90) # $a2, 0x8014 -/* B0B5E4 80094444 24C6ED90 */ addiu $a2, %lo(D_8013ED90) # addiu $a2, $a2, -0x1270 -/* B0B5E8 80094448 AFA50038 */ sw $a1, 0x38($sp) -/* B0B5EC 8009444C 27A40024 */ addiu $a0, $sp, 0x24 -/* B0B5F0 80094450 0C031AB1 */ jal func_800C6AC4 -/* B0B5F4 80094454 240706EF */ li $a3, 1775 -/* B0B5F8 80094458 8FA50038 */ lw $a1, 0x38($sp) -/* B0B5FC 8009445C 3C188012 */ lui $t8, %hi(D_801262E0) # $t8, 0x8012 -/* B0B600 80094460 271862E0 */ addiu $t8, %lo(D_801262E0) # addiu $t8, $t8, 0x62e0 -/* B0B604 80094464 8CA302C0 */ lw $v1, 0x2c0($a1) -/* B0B608 80094468 3C0FDE00 */ lui $t7, 0xde00 -/* B0B60C 8009446C 3C068014 */ lui $a2, %hi(D_8013ED9C) # $a2, 0x8014 -/* B0B610 80094470 246E0008 */ addiu $t6, $v1, 8 -/* B0B614 80094474 ACAE02C0 */ sw $t6, 0x2c0($a1) -/* B0B618 80094478 24C6ED9C */ addiu $a2, %lo(D_8013ED9C) # addiu $a2, $a2, -0x1264 -/* B0B61C 8009447C 27A40024 */ addiu $a0, $sp, 0x24 -/* B0B620 80094480 240706F3 */ li $a3, 1779 -/* B0B624 80094484 AC780004 */ sw $t8, 4($v1) -/* B0B628 80094488 0C031AD5 */ jal func_800C6B54 -/* B0B62C 8009448C AC6F0000 */ sw $t7, ($v1) -/* B0B630 80094490 8FBF0014 */ lw $ra, 0x14($sp) -/* B0B634 80094494 27BD0038 */ addiu $sp, $sp, 0x38 -/* B0B638 80094498 03E00008 */ jr $ra -/* B0B63C 8009449C 00000000 */ nop - diff --git a/asm/non_matchings/code/z_rcp/func_800944A0.s b/asm/non_matchings/code/z_rcp/func_800944A0.s deleted file mode 100644 index 130aab7e3d..0000000000 --- a/asm/non_matchings/code/z_rcp/func_800944A0.s +++ /dev/null @@ -1,11 +0,0 @@ -glabel func_800944A0 -/* B0B640 800944A0 00801025 */ move $v0, $a0 -/* B0B644 800944A4 3C0F8012 */ lui $t7, %hi(D_801269D0) # $t7, 0x8012 -/* B0B648 800944A8 25EF69D0 */ addiu $t7, %lo(D_801269D0) # addiu $t7, $t7, 0x69d0 -/* B0B64C 800944AC 3C0EDE00 */ lui $t6, 0xde00 -/* B0B650 800944B0 AC4E0000 */ sw $t6, ($v0) -/* B0B654 800944B4 AC4F0004 */ sw $t7, 4($v0) -/* B0B658 800944B8 24840008 */ addiu $a0, $a0, 8 -/* B0B65C 800944BC 03E00008 */ jr $ra -/* B0B660 800944C0 00801025 */ move $v0, $a0 - diff --git a/asm/non_matchings/code/z_rcp/func_800944C4.s b/asm/non_matchings/code/z_rcp/func_800944C4.s deleted file mode 100644 index 6b56d24455..0000000000 --- a/asm/non_matchings/code/z_rcp/func_800944C4.s +++ /dev/null @@ -1,35 +0,0 @@ -.rdata -glabel D_8013EDA8 - .asciz "../z_rcp.c" - .balign 4 - -glabel D_8013EDB4 - .asciz "../z_rcp.c" - .balign 4 - -.text -glabel func_800944C4 -/* B0B664 800944C4 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* B0B668 800944C8 AFBF0014 */ sw $ra, 0x14($sp) -/* B0B66C 800944CC AFA40030 */ sw $a0, 0x30($sp) -/* B0B670 800944D0 3C068014 */ lui $a2, %hi(D_8013EDA8) # $a2, 0x8014 -/* B0B674 800944D4 24C6EDA8 */ addiu $a2, %lo(D_8013EDA8) # addiu $a2, $a2, -0x1258 -/* B0B678 800944D8 8FA50030 */ lw $a1, 0x30($sp) -/* B0B67C 800944DC 27A4001C */ addiu $a0, $sp, 0x1c -/* B0B680 800944E0 0C031AB1 */ jal func_800C6AC4 -/* B0B684 800944E4 24070707 */ li $a3, 1799 -/* B0B688 800944E8 8FAE0030 */ lw $t6, 0x30($sp) -/* B0B68C 800944EC 0C025128 */ jal func_800944A0 -/* B0B690 800944F0 8DC402C0 */ lw $a0, 0x2c0($t6) -/* B0B694 800944F4 8FA50030 */ lw $a1, 0x30($sp) -/* B0B698 800944F8 3C068014 */ lui $a2, %hi(D_8013EDB4) # $a2, 0x8014 -/* B0B69C 800944FC 24C6EDB4 */ addiu $a2, %lo(D_8013EDB4) # addiu $a2, $a2, -0x124c -/* B0B6A0 80094500 27A4001C */ addiu $a0, $sp, 0x1c -/* B0B6A4 80094504 24070709 */ li $a3, 1801 -/* B0B6A8 80094508 0C031AD5 */ jal func_800C6B54 -/* B0B6AC 8009450C ACA202C0 */ sw $v0, 0x2c0($a1) -/* B0B6B0 80094510 8FBF0014 */ lw $ra, 0x14($sp) -/* B0B6B4 80094514 27BD0030 */ addiu $sp, $sp, 0x30 -/* B0B6B8 80094518 03E00008 */ jr $ra -/* B0B6BC 8009451C 00000000 */ nop - diff --git a/asm/non_matchings/code/z_rcp/func_80094520.s b/asm/non_matchings/code/z_rcp/func_80094520.s deleted file mode 100644 index 342557d0a3..0000000000 --- a/asm/non_matchings/code/z_rcp/func_80094520.s +++ /dev/null @@ -1,35 +0,0 @@ -.rdata -glabel D_8013EDC0 - .asciz "../z_rcp.c" - .balign 4 - -glabel D_8013EDCC - .asciz "../z_rcp.c" - .balign 4 - -.text -glabel func_80094520 -/* B0B6C0 80094520 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* B0B6C4 80094524 AFBF0014 */ sw $ra, 0x14($sp) -/* B0B6C8 80094528 AFA40030 */ sw $a0, 0x30($sp) -/* B0B6CC 8009452C 3C068014 */ lui $a2, %hi(D_8013EDC0) # $a2, 0x8014 -/* B0B6D0 80094530 24C6EDC0 */ addiu $a2, %lo(D_8013EDC0) # addiu $a2, $a2, -0x1240 -/* B0B6D4 80094534 8FA50030 */ lw $a1, 0x30($sp) -/* B0B6D8 80094538 27A4001C */ addiu $a0, $sp, 0x1c -/* B0B6DC 8009453C 0C031AB1 */ jal func_800C6AC4 -/* B0B6E0 80094540 24070711 */ li $a3, 1809 -/* B0B6E4 80094544 8FAE0030 */ lw $t6, 0x30($sp) -/* B0B6E8 80094548 0C025128 */ jal func_800944A0 -/* B0B6EC 8009454C 8DC402B0 */ lw $a0, 0x2b0($t6) -/* B0B6F0 80094550 8FA50030 */ lw $a1, 0x30($sp) -/* B0B6F4 80094554 3C068014 */ lui $a2, %hi(D_8013EDCC) # $a2, 0x8014 -/* B0B6F8 80094558 24C6EDCC */ addiu $a2, %lo(D_8013EDCC) # addiu $a2, $a2, -0x1234 -/* B0B6FC 8009455C 27A4001C */ addiu $a0, $sp, 0x1c -/* B0B700 80094560 24070713 */ li $a3, 1811 -/* B0B704 80094564 0C031AD5 */ jal func_800C6B54 -/* B0B708 80094568 ACA202B0 */ sw $v0, 0x2b0($a1) -/* B0B70C 8009456C 8FBF0014 */ lw $ra, 0x14($sp) -/* B0B710 80094570 27BD0030 */ addiu $sp, $sp, 0x30 -/* B0B714 80094574 03E00008 */ jr $ra -/* B0B718 80094578 00000000 */ nop - diff --git a/asm/non_matchings/code/z_rcp/func_8009457C.s b/asm/non_matchings/code/z_rcp/func_8009457C.s deleted file mode 100644 index 8dbcbb8108..0000000000 --- a/asm/non_matchings/code/z_rcp/func_8009457C.s +++ /dev/null @@ -1,11 +0,0 @@ -glabel func_8009457C -/* B0B71C 8009457C 8C830000 */ lw $v1, ($a0) -/* B0B720 80094580 3C0F8012 */ lui $t7, %hi(D_801269D0) # $t7, 0x8012 -/* B0B724 80094584 25EF69D0 */ addiu $t7, %lo(D_801269D0) # addiu $t7, $t7, 0x69d0 -/* B0B728 80094588 3C0EDE00 */ lui $t6, 0xde00 -/* B0B72C 8009458C AC6E0000 */ sw $t6, ($v1) -/* B0B730 80094590 AC6F0004 */ sw $t7, 4($v1) -/* B0B734 80094594 24620008 */ addiu $v0, $v1, 8 -/* B0B738 80094598 03E00008 */ jr $ra -/* B0B73C 8009459C AC820000 */ sw $v0, ($a0) - diff --git a/asm/non_matchings/code/z_rcp/func_800945A0.s b/asm/non_matchings/code/z_rcp/func_800945A0.s deleted file mode 100644 index 800516749c..0000000000 --- a/asm/non_matchings/code/z_rcp/func_800945A0.s +++ /dev/null @@ -1,39 +0,0 @@ -.rdata -glabel D_8013EDD8 - .asciz "../z_rcp.c" - .balign 4 - -glabel D_8013EDE4 - .asciz "../z_rcp.c" - .balign 4 - -.text -glabel func_800945A0 -/* B0B740 800945A0 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* B0B744 800945A4 AFBF0014 */ sw $ra, 0x14($sp) -/* B0B748 800945A8 00802825 */ move $a1, $a0 -/* B0B74C 800945AC 3C068014 */ lui $a2, %hi(D_8013EDD8) # $a2, 0x8014 -/* B0B750 800945B0 24C6EDD8 */ addiu $a2, %lo(D_8013EDD8) # addiu $a2, $a2, -0x1228 -/* B0B754 800945B4 AFA50038 */ sw $a1, 0x38($sp) -/* B0B758 800945B8 27A40024 */ addiu $a0, $sp, 0x24 -/* B0B75C 800945BC 0C031AB1 */ jal func_800C6AC4 -/* B0B760 800945C0 2407072D */ li $a3, 1837 -/* B0B764 800945C4 8FA50038 */ lw $a1, 0x38($sp) -/* B0B768 800945C8 3C188012 */ lui $t8, %hi(D_80126A00) # $t8, 0x8012 -/* B0B76C 800945CC 27186A00 */ addiu $t8, %lo(D_80126A00) # addiu $t8, $t8, 0x6a00 -/* B0B770 800945D0 8CA302C0 */ lw $v1, 0x2c0($a1) -/* B0B774 800945D4 3C0FDE00 */ lui $t7, 0xde00 -/* B0B778 800945D8 3C068014 */ lui $a2, %hi(D_8013EDE4) # $a2, 0x8014 -/* B0B77C 800945DC 246E0008 */ addiu $t6, $v1, 8 -/* B0B780 800945E0 ACAE02C0 */ sw $t6, 0x2c0($a1) -/* B0B784 800945E4 24C6EDE4 */ addiu $a2, %lo(D_8013EDE4) # addiu $a2, $a2, -0x121c -/* B0B788 800945E8 27A40024 */ addiu $a0, $sp, 0x24 -/* B0B78C 800945EC 24070731 */ li $a3, 1841 -/* B0B790 800945F0 AC780004 */ sw $t8, 4($v1) -/* B0B794 800945F4 0C031AD5 */ jal func_800C6B54 -/* B0B798 800945F8 AC6F0000 */ sw $t7, ($v1) -/* B0B79C 800945FC 8FBF0014 */ lw $ra, 0x14($sp) -/* B0B7A0 80094600 27BD0038 */ addiu $sp, $sp, 0x38 -/* B0B7A4 80094604 03E00008 */ jr $ra -/* B0B7A8 80094608 00000000 */ nop - diff --git a/asm/non_matchings/code/z_rcp/func_8009460C.s b/asm/non_matchings/code/z_rcp/func_8009460C.s deleted file mode 100644 index f1c9192439..0000000000 --- a/asm/non_matchings/code/z_rcp/func_8009460C.s +++ /dev/null @@ -1,39 +0,0 @@ -.rdata -glabel D_8013EDF0 - .asciz "../z_rcp.c" - .balign 4 - -glabel D_8013EDFC - .asciz "../z_rcp.c" - .balign 4 - -.text -glabel func_8009460C -/* B0B7AC 8009460C 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* B0B7B0 80094610 AFBF0014 */ sw $ra, 0x14($sp) -/* B0B7B4 80094614 00802825 */ move $a1, $a0 -/* B0B7B8 80094618 3C068014 */ lui $a2, %hi(D_8013EDF0) # $a2, 0x8014 -/* B0B7BC 8009461C 24C6EDF0 */ addiu $a2, %lo(D_8013EDF0) # addiu $a2, $a2, -0x1210 -/* B0B7C0 80094620 AFA50038 */ sw $a1, 0x38($sp) -/* B0B7C4 80094624 27A40024 */ addiu $a0, $sp, 0x24 -/* B0B7C8 80094628 0C031AB1 */ jal func_800C6AC4 -/* B0B7CC 8009462C 2407073D */ li $a3, 1853 -/* B0B7D0 80094630 8FA50038 */ lw $a1, 0x38($sp) -/* B0B7D4 80094634 3C188012 */ lui $t8, %hi(D_80126A30) # $t8, 0x8012 -/* B0B7D8 80094638 27186A30 */ addiu $t8, %lo(D_80126A30) # addiu $t8, $t8, 0x6a30 -/* B0B7DC 8009463C 8CA302C0 */ lw $v1, 0x2c0($a1) -/* B0B7E0 80094640 3C0FDE00 */ lui $t7, 0xde00 -/* B0B7E4 80094644 3C068014 */ lui $a2, %hi(D_8013EDFC) # $a2, 0x8014 -/* B0B7E8 80094648 246E0008 */ addiu $t6, $v1, 8 -/* B0B7EC 8009464C ACAE02C0 */ sw $t6, 0x2c0($a1) -/* B0B7F0 80094650 24C6EDFC */ addiu $a2, %lo(D_8013EDFC) # addiu $a2, $a2, -0x1204 -/* B0B7F4 80094654 27A40024 */ addiu $a0, $sp, 0x24 -/* B0B7F8 80094658 24070741 */ li $a3, 1857 -/* B0B7FC 8009465C AC780004 */ sw $t8, 4($v1) -/* B0B800 80094660 0C031AD5 */ jal func_800C6B54 -/* B0B804 80094664 AC6F0000 */ sw $t7, ($v1) -/* B0B808 80094668 8FBF0014 */ lw $ra, 0x14($sp) -/* B0B80C 8009466C 27BD0038 */ addiu $sp, $sp, 0x38 -/* B0B810 80094670 03E00008 */ jr $ra -/* B0B814 80094674 00000000 */ nop - diff --git a/asm/non_matchings/code/z_rcp/func_80094678.s b/asm/non_matchings/code/z_rcp/func_80094678.s deleted file mode 100644 index 9881241d06..0000000000 --- a/asm/non_matchings/code/z_rcp/func_80094678.s +++ /dev/null @@ -1,39 +0,0 @@ -.rdata -glabel D_8013EE08 - .asciz "../z_rcp.c" - .balign 4 - -glabel D_8013EE14 - .asciz "../z_rcp.c" - .balign 4 - -.text -glabel func_80094678 -/* B0B818 80094678 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* B0B81C 8009467C AFBF0014 */ sw $ra, 0x14($sp) -/* B0B820 80094680 00802825 */ move $a1, $a0 -/* B0B824 80094684 3C068014 */ lui $a2, %hi(D_8013EE08) # $a2, 0x8014 -/* B0B828 80094688 24C6EE08 */ addiu $a2, %lo(D_8013EE08) # addiu $a2, $a2, -0x11f8 -/* B0B82C 8009468C AFA50038 */ sw $a1, 0x38($sp) -/* B0B830 80094690 27A40024 */ addiu $a0, $sp, 0x24 -/* B0B834 80094694 0C031AB1 */ jal func_800C6AC4 -/* B0B838 80094698 2407074D */ li $a3, 1869 -/* B0B83C 8009469C 8FA50038 */ lw $a1, 0x38($sp) -/* B0B840 800946A0 3C188012 */ lui $t8, %hi(D_80126B50) # $t8, 0x8012 -/* B0B844 800946A4 27186B50 */ addiu $t8, %lo(D_80126B50) # addiu $t8, $t8, 0x6b50 -/* B0B848 800946A8 8CA302D0 */ lw $v1, 0x2d0($a1) -/* B0B84C 800946AC 3C0FDE00 */ lui $t7, 0xde00 -/* B0B850 800946B0 3C068014 */ lui $a2, %hi(D_8013EE14) # $a2, 0x8014 -/* B0B854 800946B4 246E0008 */ addiu $t6, $v1, 8 -/* B0B858 800946B8 ACAE02D0 */ sw $t6, 0x2d0($a1) -/* B0B85C 800946BC 24C6EE14 */ addiu $a2, %lo(D_8013EE14) # addiu $a2, $a2, -0x11ec -/* B0B860 800946C0 27A40024 */ addiu $a0, $sp, 0x24 -/* B0B864 800946C4 24070751 */ li $a3, 1873 -/* B0B868 800946C8 AC780004 */ sw $t8, 4($v1) -/* B0B86C 800946CC 0C031AD5 */ jal func_800C6B54 -/* B0B870 800946D0 AC6F0000 */ sw $t7, ($v1) -/* B0B874 800946D4 8FBF0014 */ lw $ra, 0x14($sp) -/* B0B878 800946D8 27BD0038 */ addiu $sp, $sp, 0x38 -/* B0B87C 800946DC 03E00008 */ jr $ra -/* B0B880 800946E0 00000000 */ nop - diff --git a/asm/non_matchings/code/z_rcp/func_800946E4.s b/asm/non_matchings/code/z_rcp/func_800946E4.s deleted file mode 100644 index d3e4ce20c3..0000000000 --- a/asm/non_matchings/code/z_rcp/func_800946E4.s +++ /dev/null @@ -1,11 +0,0 @@ -glabel func_800946E4 -/* B0B884 800946E4 00801025 */ move $v0, $a0 -/* B0B888 800946E8 3C0F8012 */ lui $t7, %hi(D_80126EE0) # $t7, 0x8012 -/* B0B88C 800946EC 25EF6EE0 */ addiu $t7, %lo(D_80126EE0) # addiu $t7, $t7, 0x6ee0 -/* B0B890 800946F0 3C0EDE00 */ lui $t6, 0xde00 -/* B0B894 800946F4 AC4E0000 */ sw $t6, ($v0) -/* B0B898 800946F8 AC4F0004 */ sw $t7, 4($v0) -/* B0B89C 800946FC 24840008 */ addiu $a0, $a0, 8 -/* B0B8A0 80094700 03E00008 */ jr $ra -/* B0B8A4 80094704 00801025 */ move $v0, $a0 - diff --git a/asm/non_matchings/code/z_rcp/func_80094708.s b/asm/non_matchings/code/z_rcp/func_80094708.s deleted file mode 100644 index 25c68a8b4f..0000000000 --- a/asm/non_matchings/code/z_rcp/func_80094708.s +++ /dev/null @@ -1,11 +0,0 @@ -glabel func_80094708 -/* B0B8A8 80094708 00801025 */ move $v0, $a0 -/* B0B8AC 8009470C 3C0F8012 */ lui $t7, %hi(D_80126F10) # $t7, 0x8012 -/* B0B8B0 80094710 25EF6F10 */ addiu $t7, %lo(D_80126F10) # addiu $t7, $t7, 0x6f10 -/* B0B8B4 80094714 3C0EDE00 */ lui $t6, 0xde00 -/* B0B8B8 80094718 AC4E0000 */ sw $t6, ($v0) -/* B0B8BC 8009471C AC4F0004 */ sw $t7, 4($v0) -/* B0B8C0 80094720 24840008 */ addiu $a0, $a0, 8 -/* B0B8C4 80094724 03E00008 */ jr $ra -/* B0B8C8 80094728 00801025 */ move $v0, $a0 - diff --git a/asm/non_matchings/code/z_rcp/func_8009472C.s b/asm/non_matchings/code/z_rcp/func_8009472C.s deleted file mode 100644 index f5d42a0699..0000000000 --- a/asm/non_matchings/code/z_rcp/func_8009472C.s +++ /dev/null @@ -1,18 +0,0 @@ -glabel func_8009472C -/* B0B8CC 8009472C 00801025 */ move $v0, $a0 -/* B0B8D0 80094730 3C0F8012 */ lui $t7, %hi(D_80126F40) # $t7, 0x8012 -/* B0B8D4 80094734 25EF6F40 */ addiu $t7, %lo(D_80126F40) # addiu $t7, $t7, 0x6f40 -/* B0B8D8 80094738 3C0EDE00 */ lui $t6, 0xde00 -/* B0B8DC 8009473C AC4E0000 */ sw $t6, ($v0) -/* B0B8E0 80094740 AC4F0004 */ sw $t7, 4($v0) -/* B0B8E4 80094744 24840008 */ addiu $a0, $a0, 8 -/* B0B8E8 80094748 00801025 */ move $v0, $a0 -/* B0B8EC 8009474C 3C18E300 */ lui $t8, (0xE3001801 >> 16) # lui $t8, 0xe300 -/* B0B8F0 80094750 37181801 */ ori $t8, (0xE3001801 & 0xFFFF) # ori $t8, $t8, 0x1801 -/* B0B8F4 80094754 241900C0 */ li $t9, 192 -/* B0B8F8 80094758 AC590004 */ sw $t9, 4($v0) -/* B0B8FC 8009475C AC580000 */ sw $t8, ($v0) -/* B0B900 80094760 24840008 */ addiu $a0, $a0, 8 -/* B0B904 80094764 03E00008 */ jr $ra -/* B0B908 80094768 00801025 */ move $v0, $a0 - diff --git a/asm/non_matchings/code/z_rcp/func_8009476C.s b/asm/non_matchings/code/z_rcp/func_8009476C.s deleted file mode 100644 index 33c42266fc..0000000000 --- a/asm/non_matchings/code/z_rcp/func_8009476C.s +++ /dev/null @@ -1,18 +0,0 @@ -glabel func_8009476C -/* B0B90C 8009476C 00801025 */ move $v0, $a0 -/* B0B910 80094770 3C0F8012 */ lui $t7, %hi(D_80126F70) # $t7, 0x8012 -/* B0B914 80094774 25EF6F70 */ addiu $t7, %lo(D_80126F70) # addiu $t7, $t7, 0x6f70 -/* B0B918 80094778 3C0EDE00 */ lui $t6, 0xde00 -/* B0B91C 8009477C AC4E0000 */ sw $t6, ($v0) -/* B0B920 80094780 AC4F0004 */ sw $t7, 4($v0) -/* B0B924 80094784 24840008 */ addiu $a0, $a0, 8 -/* B0B928 80094788 00801025 */ move $v0, $a0 -/* B0B92C 8009478C 3C18E300 */ lui $t8, (0xE3001801 >> 16) # lui $t8, 0xe300 -/* B0B930 80094790 37181801 */ ori $t8, (0xE3001801 & 0xFFFF) # ori $t8, $t8, 0x1801 -/* B0B934 80094794 241900C0 */ li $t9, 192 -/* B0B938 80094798 AC590004 */ sw $t9, 4($v0) -/* B0B93C 8009479C AC580000 */ sw $t8, ($v0) -/* B0B940 800947A0 24840008 */ addiu $a0, $a0, 8 -/* B0B944 800947A4 03E00008 */ jr $ra -/* B0B948 800947A8 00801025 */ move $v0, $a0 - diff --git a/asm/non_matchings/code/z_rcp/func_800947AC.s b/asm/non_matchings/code/z_rcp/func_800947AC.s deleted file mode 100644 index 33c334f76a..0000000000 --- a/asm/non_matchings/code/z_rcp/func_800947AC.s +++ /dev/null @@ -1,114 +0,0 @@ -glabel func_800947AC -/* B0B94C 800947AC 00801025 */ move $v0, $a0 -/* B0B950 800947B0 3C0F8012 */ lui $t7, %hi(D_80126EB0) # $t7, 0x8012 -/* B0B954 800947B4 25EF6EB0 */ addiu $t7, %lo(D_80126EB0) # addiu $t7, $t7, 0x6eb0 -/* B0B958 800947B8 3C0EDE00 */ lui $t6, 0xde00 -/* B0B95C 800947BC AC4E0000 */ sw $t6, ($v0) -/* B0B960 800947C0 AC4F0004 */ sw $t7, 4($v0) -/* B0B964 800947C4 24840008 */ addiu $a0, $a0, 8 -/* B0B968 800947C8 00801825 */ move $v1, $a0 -/* B0B96C 800947CC 3C02E300 */ lui $v0, (0xE3001801 >> 16) # lui $v0, 0xe300 -/* B0B970 800947D0 34421801 */ ori $v0, (0xE3001801 & 0xFFFF) # ori $v0, $v0, 0x1801 -/* B0B974 800947D4 240600C0 */ li $a2, 192 -/* B0B978 800947D8 AC660004 */ sw $a2, 4($v1) -/* B0B97C 800947DC AC620000 */ sw $v0, ($v1) -/* B0B980 800947E0 3C058016 */ lui $a1, %hi(gGameInfo) # $a1, 0x8016 -/* B0B984 800947E4 8CA5FA90 */ lw $a1, %lo(gGameInfo)($a1) -/* B0B988 800947E8 24070001 */ li $a3, 1 -/* B0B98C 800947EC 3C18E300 */ lui $t8, (0xE3001A01 >> 16) # lui $t8, 0xe300 -/* B0B990 800947F0 84A30FFE */ lh $v1, 0xffe($a1) -/* B0B994 800947F4 24840008 */ addiu $a0, $a0, 8 -/* B0B998 800947F8 37181A01 */ ori $t8, (0xE3001A01 & 0xFFFF) # ori $t8, $t8, 0x1a01 -/* B0B99C 800947FC 1067000C */ beq $v1, $a3, .L80094830 -/* B0B9A0 80094800 24190030 */ li $t9, 48 -/* B0B9A4 80094804 24010002 */ li $at, 2 -/* B0B9A8 80094808 10610010 */ beq $v1, $at, .L8009484C -/* B0B9AC 8009480C 3C08E300 */ lui $t0, (0xE3001A01 >> 16) # lui $t0, 0xe300 -/* B0B9B0 80094810 24010003 */ li $at, 3 -/* B0B9B4 80094814 10610015 */ beq $v1, $at, .L8009486C -/* B0B9B8 80094818 3C09E300 */ lui $t1, (0xE3001A01 >> 16) # lui $t1, 0xe300 -/* B0B9BC 8009481C 24010004 */ li $at, 4 -/* B0B9C0 80094820 1061001B */ beq $v1, $at, .L80094890 -/* B0B9C4 80094824 3C0BE300 */ lui $t3, (0xE3001A01 >> 16) # lui $t3, 0xe300 -/* B0B9C8 80094828 10000022 */ b .L800948B4 -/* B0B9CC 8009482C 84A31000 */ lh $v1, 0x1000($a1) -.L80094830: -/* B0B9D0 80094830 00801825 */ move $v1, $a0 -/* B0B9D4 80094834 AC780000 */ sw $t8, ($v1) -/* B0B9D8 80094838 AC790004 */ sw $t9, 4($v1) -/* B0B9DC 8009483C 3C058016 */ lui $a1, %hi(gGameInfo) # $a1, 0x8016 -/* B0B9E0 80094840 8CA5FA90 */ lw $a1, %lo(gGameInfo)($a1) -/* B0B9E4 80094844 1000001A */ b .L800948B0 -/* B0B9E8 80094848 24840008 */ addiu $a0, $a0, 8 -.L8009484C: -/* B0B9EC 8009484C 00801825 */ move $v1, $a0 -/* B0B9F0 80094850 35081A01 */ ori $t0, (0xE3001A01 & 0xFFFF) # ori $t0, $t0, 0x1a01 -/* B0B9F4 80094854 AC680000 */ sw $t0, ($v1) -/* B0B9F8 80094858 AC600004 */ sw $zero, 4($v1) -/* B0B9FC 8009485C 3C058016 */ lui $a1, %hi(gGameInfo) # $a1, 0x8016 -/* B0BA00 80094860 8CA5FA90 */ lw $a1, %lo(gGameInfo)($a1) -/* B0BA04 80094864 10000012 */ b .L800948B0 -/* B0BA08 80094868 24840008 */ addiu $a0, $a0, 8 -.L8009486C: -/* B0BA0C 8009486C 00801825 */ move $v1, $a0 -/* B0BA10 80094870 35291A01 */ ori $t1, (0xE3001A01 & 0xFFFF) # ori $t1, $t1, 0x1a01 -/* B0BA14 80094874 240A0010 */ li $t2, 16 -/* B0BA18 80094878 AC6A0004 */ sw $t2, 4($v1) -/* B0BA1C 8009487C AC690000 */ sw $t1, ($v1) -/* B0BA20 80094880 3C058016 */ lui $a1, %hi(gGameInfo) # $a1, 0x8016 -/* B0BA24 80094884 8CA5FA90 */ lw $a1, %lo(gGameInfo)($a1) -/* B0BA28 80094888 10000009 */ b .L800948B0 -/* B0BA2C 8009488C 24840008 */ addiu $a0, $a0, 8 -.L80094890: -/* B0BA30 80094890 00801825 */ move $v1, $a0 -/* B0BA34 80094894 356B1A01 */ ori $t3, (0xE3001A01 & 0xFFFF) # ori $t3, $t3, 0x1a01 -/* B0BA38 80094898 240C0020 */ li $t4, 32 -/* B0BA3C 8009489C AC6C0004 */ sw $t4, 4($v1) -/* B0BA40 800948A0 AC6B0000 */ sw $t3, ($v1) -/* B0BA44 800948A4 3C058016 */ lui $a1, %hi(gGameInfo) # $a1, 0x8016 -/* B0BA48 800948A8 8CA5FA90 */ lw $a1, %lo(gGameInfo)($a1) -/* B0BA4C 800948AC 24840008 */ addiu $a0, $a0, 8 -.L800948B0: -/* B0BA50 800948B0 84A31000 */ lh $v1, 0x1000($a1) -.L800948B4: -/* B0BA54 800948B4 24010002 */ li $at, 2 -/* B0BA58 800948B8 5067000B */ beql $v1, $a3, .L800948E8 -/* B0BA5C 800948BC 00801825 */ move $v1, $a0 -/* B0BA60 800948C0 1061000E */ beq $v1, $at, .L800948FC -/* B0BA64 800948C4 24010003 */ li $at, 3 -/* B0BA68 800948C8 10610012 */ beq $v1, $at, .L80094914 -/* B0BA6C 800948CC 240D0040 */ li $t5, 64 -/* B0BA70 800948D0 24010004 */ li $at, 4 -/* B0BA74 800948D4 10610015 */ beq $v1, $at, .L8009492C -/* B0BA78 800948D8 240E0080 */ li $t6, 128 -/* B0BA7C 800948DC 03E00008 */ jr $ra -/* B0BA80 800948E0 00801025 */ move $v0, $a0 -/* B0BA84 800948E4 00801825 */ move $v1, $a0 -.L800948E8: -/* B0BA88 800948E8 AC620000 */ sw $v0, ($v1) -/* B0BA8C 800948EC 24840008 */ addiu $a0, $a0, 8 -/* B0BA90 800948F0 AC660004 */ sw $a2, 4($v1) -/* B0BA94 800948F4 03E00008 */ jr $ra -/* B0BA98 800948F8 00801025 */ move $v0, $a0 -.L800948FC: -/* B0BA9C 800948FC 00801825 */ move $v1, $a0 -/* B0BAA0 80094900 AC620000 */ sw $v0, ($v1) -/* B0BAA4 80094904 24840008 */ addiu $a0, $a0, 8 -/* B0BAA8 80094908 AC600004 */ sw $zero, 4($v1) -/* B0BAAC 8009490C 03E00008 */ jr $ra -/* B0BAB0 80094910 00801025 */ move $v0, $a0 -.L80094914: -/* B0BAB4 80094914 00801825 */ move $v1, $a0 -/* B0BAB8 80094918 AC620000 */ sw $v0, ($v1) -/* B0BABC 8009491C 24840008 */ addiu $a0, $a0, 8 -/* B0BAC0 80094920 AC6D0004 */ sw $t5, 4($v1) -/* B0BAC4 80094924 03E00008 */ jr $ra -/* B0BAC8 80094928 00801025 */ move $v0, $a0 -.L8009492C: -/* B0BACC 8009492C 00801825 */ move $v1, $a0 -/* B0BAD0 80094930 AC620000 */ sw $v0, ($v1) -/* B0BAD4 80094934 AC6E0004 */ sw $t6, 4($v1) -/* B0BAD8 80094938 24840008 */ addiu $a0, $a0, 8 -/* B0BADC 8009493C 03E00008 */ jr $ra -/* B0BAE0 80094940 00801025 */ move $v0, $a0 - diff --git a/asm/non_matchings/code/z_rcp/func_80094944.s b/asm/non_matchings/code/z_rcp/func_80094944.s deleted file mode 100644 index 1fbdccf94a..0000000000 --- a/asm/non_matchings/code/z_rcp/func_80094944.s +++ /dev/null @@ -1,11 +0,0 @@ -glabel func_80094944 -/* B0BAE4 80094944 00801025 */ move $v0, $a0 -/* B0BAE8 80094948 3C0F8012 */ lui $t7, %hi(D_80126FA0) # $t7, 0x8012 -/* B0BAEC 8009494C 25EF6FA0 */ addiu $t7, %lo(D_80126FA0) # addiu $t7, $t7, 0x6fa0 -/* B0BAF0 80094950 3C0EDE00 */ lui $t6, 0xde00 -/* B0BAF4 80094954 AC4E0000 */ sw $t6, ($v0) -/* B0BAF8 80094958 AC4F0004 */ sw $t7, 4($v0) -/* B0BAFC 8009495C 24840008 */ addiu $a0, $a0, 8 -/* B0BB00 80094960 03E00008 */ jr $ra -/* B0BB04 80094964 00801025 */ move $v0, $a0 - diff --git a/asm/non_matchings/code/z_rcp/func_80094968.s b/asm/non_matchings/code/z_rcp/func_80094968.s deleted file mode 100644 index 5455fb708e..0000000000 --- a/asm/non_matchings/code/z_rcp/func_80094968.s +++ /dev/null @@ -1,18 +0,0 @@ -glabel func_80094968 -/* B0BB08 80094968 00801025 */ move $v0, $a0 -/* B0BB0C 8009496C 3C0F8012 */ lui $t7, %hi(D_80126640) # $t7, 0x8012 -/* B0BB10 80094970 25EF6640 */ addiu $t7, %lo(D_80126640) # addiu $t7, $t7, 0x6640 -/* B0BB14 80094974 3C0EDE00 */ lui $t6, 0xde00 -/* B0BB18 80094978 AC4E0000 */ sw $t6, ($v0) -/* B0BB1C 8009497C AC4F0004 */ sw $t7, 4($v0) -/* B0BB20 80094980 24840008 */ addiu $a0, $a0, 8 -/* B0BB24 80094984 00801025 */ move $v0, $a0 -/* B0BB28 80094988 3C18E300 */ lui $t8, (0xE3001801 >> 16) # lui $t8, 0xe300 -/* B0BB2C 8009498C 37181801 */ ori $t8, (0xE3001801 & 0xFFFF) # ori $t8, $t8, 0x1801 -/* B0BB30 80094990 241900C0 */ li $t9, 192 -/* B0BB34 80094994 AC590004 */ sw $t9, 4($v0) -/* B0BB38 80094998 AC580000 */ sw $t8, ($v0) -/* B0BB3C 8009499C 24840008 */ addiu $a0, $a0, 8 -/* B0BB40 800949A0 03E00008 */ jr $ra -/* B0BB44 800949A4 00801025 */ move $v0, $a0 - diff --git a/asm/non_matchings/code/z_rcp/func_800949A8.s b/asm/non_matchings/code/z_rcp/func_800949A8.s deleted file mode 100644 index 63f74ccb1c..0000000000 --- a/asm/non_matchings/code/z_rcp/func_800949A8.s +++ /dev/null @@ -1,39 +0,0 @@ -.rdata -glabel D_8013EE20 - .asciz "../z_rcp.c" - .balign 4 - -glabel D_8013EE2C - .asciz "../z_rcp.c" - .balign 4 - -.text -glabel func_800949A8 -/* B0BB48 800949A8 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* B0BB4C 800949AC AFBF0014 */ sw $ra, 0x14($sp) -/* B0BB50 800949B0 00802825 */ move $a1, $a0 -/* B0BB54 800949B4 3C068014 */ lui $a2, %hi(D_8013EE20) # $a2, 0x8014 -/* B0BB58 800949B8 24C6EE20 */ addiu $a2, %lo(D_8013EE20) # addiu $a2, $a2, -0x11e0 -/* B0BB5C 800949BC AFA50038 */ sw $a1, 0x38($sp) -/* B0BB60 800949C0 27A40024 */ addiu $a0, $sp, 0x24 -/* B0BB64 800949C4 0C031AB1 */ jal func_800C6AC4 -/* B0BB68 800949C8 240707A1 */ li $a3, 1953 -/* B0BB6C 800949CC 8FA50038 */ lw $a1, 0x38($sp) -/* B0BB70 800949D0 3C188012 */ lui $t8, %hi(D_80126A60) # $t8, 0x8012 -/* B0BB74 800949D4 27186A60 */ addiu $t8, %lo(D_80126A60) # addiu $t8, $t8, 0x6a60 -/* B0BB78 800949D8 8CA302C0 */ lw $v1, 0x2c0($a1) -/* B0BB7C 800949DC 3C0FDE00 */ lui $t7, 0xde00 -/* B0BB80 800949E0 3C068014 */ lui $a2, %hi(D_8013EE2C) # $a2, 0x8014 -/* B0BB84 800949E4 246E0008 */ addiu $t6, $v1, 8 -/* B0BB88 800949E8 ACAE02C0 */ sw $t6, 0x2c0($a1) -/* B0BB8C 800949EC 24C6EE2C */ addiu $a2, %lo(D_8013EE2C) # addiu $a2, $a2, -0x11d4 -/* B0BB90 800949F0 27A40024 */ addiu $a0, $sp, 0x24 -/* B0BB94 800949F4 240707A5 */ li $a3, 1957 -/* B0BB98 800949F8 AC780004 */ sw $t8, 4($v1) -/* B0BB9C 800949FC 0C031AD5 */ jal func_800C6B54 -/* B0BBA0 80094A00 AC6F0000 */ sw $t7, ($v1) -/* B0BBA4 80094A04 8FBF0014 */ lw $ra, 0x14($sp) -/* B0BBA8 80094A08 27BD0038 */ addiu $sp, $sp, 0x38 -/* B0BBAC 80094A0C 03E00008 */ jr $ra -/* B0BBB0 80094A10 00000000 */ nop - diff --git a/asm/non_matchings/code/z_rcp/func_80094A14.s b/asm/non_matchings/code/z_rcp/func_80094A14.s deleted file mode 100644 index 1f811ea2cd..0000000000 --- a/asm/non_matchings/code/z_rcp/func_80094A14.s +++ /dev/null @@ -1,39 +0,0 @@ -.rdata -glabel D_8013EE38 - .asciz "../z_rcp.c" - .balign 4 - -glabel D_8013EE44 - .asciz "../z_rcp.c" - .balign 4 - -.text -glabel func_80094A14 -/* B0BBB4 80094A14 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* B0BBB8 80094A18 AFBF0014 */ sw $ra, 0x14($sp) -/* B0BBBC 80094A1C 00802825 */ move $a1, $a0 -/* B0BBC0 80094A20 3C068014 */ lui $a2, %hi(D_8013EE38) # $a2, 0x8014 -/* B0BBC4 80094A24 24C6EE38 */ addiu $a2, %lo(D_8013EE38) # addiu $a2, $a2, -0x11c8 -/* B0BBC8 80094A28 AFA50038 */ sw $a1, 0x38($sp) -/* B0BBCC 80094A2C 27A40024 */ addiu $a0, $sp, 0x24 -/* B0BBD0 80094A30 0C031AB1 */ jal func_800C6AC4 -/* B0BBD4 80094A34 240707AC */ li $a3, 1964 -/* B0BBD8 80094A38 8FA50038 */ lw $a1, 0x38($sp) -/* B0BBDC 80094A3C 3C188012 */ lui $t8, %hi(D_80126A60) # $t8, 0x8012 -/* B0BBE0 80094A40 27186A60 */ addiu $t8, %lo(D_80126A60) # addiu $t8, $t8, 0x6a60 -/* B0BBE4 80094A44 8CA302B0 */ lw $v1, 0x2b0($a1) -/* B0BBE8 80094A48 3C0FDE00 */ lui $t7, 0xde00 -/* B0BBEC 80094A4C 3C068014 */ lui $a2, %hi(D_8013EE44) # $a2, 0x8014 -/* B0BBF0 80094A50 246E0008 */ addiu $t6, $v1, 8 -/* B0BBF4 80094A54 ACAE02B0 */ sw $t6, 0x2b0($a1) -/* B0BBF8 80094A58 24C6EE44 */ addiu $a2, %lo(D_8013EE44) # addiu $a2, $a2, -0x11bc -/* B0BBFC 80094A5C 27A40024 */ addiu $a0, $sp, 0x24 -/* B0BC00 80094A60 240707B0 */ li $a3, 1968 -/* B0BC04 80094A64 AC780004 */ sw $t8, 4($v1) -/* B0BC08 80094A68 0C031AD5 */ jal func_800C6B54 -/* B0BC0C 80094A6C AC6F0000 */ sw $t7, ($v1) -/* B0BC10 80094A70 8FBF0014 */ lw $ra, 0x14($sp) -/* B0BC14 80094A74 27BD0038 */ addiu $sp, $sp, 0x38 -/* B0BC18 80094A78 03E00008 */ jr $ra -/* B0BC1C 80094A7C 00000000 */ nop - diff --git a/asm/non_matchings/code/z_rcp/func_80094A80.s b/asm/non_matchings/code/z_rcp/func_80094A80.s deleted file mode 100644 index b6387134f9..0000000000 --- a/asm/non_matchings/code/z_rcp/func_80094A80.s +++ /dev/null @@ -1,39 +0,0 @@ -.rdata -glabel D_8013EE50 - .asciz "../z_rcp.c" - .balign 4 - -glabel D_8013EE5C - .asciz "../z_rcp.c" - .balign 4 - -.text -glabel func_80094A80 -/* B0BC20 80094A80 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* B0BC24 80094A84 AFBF0014 */ sw $ra, 0x14($sp) -/* B0BC28 80094A88 00802825 */ move $a1, $a0 -/* B0BC2C 80094A8C 3C068014 */ lui $a2, %hi(D_8013EE50) # $a2, 0x8014 -/* B0BC30 80094A90 24C6EE50 */ addiu $a2, %lo(D_8013EE50) # addiu $a2, $a2, -0x11b0 -/* B0BC34 80094A94 AFA50038 */ sw $a1, 0x38($sp) -/* B0BC38 80094A98 27A40024 */ addiu $a0, $sp, 0x24 -/* B0BC3C 80094A9C 0C031AB1 */ jal func_800C6AC4 -/* B0BC40 80094AA0 240707C8 */ li $a3, 1992 -/* B0BC44 80094AA4 8FA50038 */ lw $a1, 0x38($sp) -/* B0BC48 80094AA8 3C188012 */ lui $t8, %hi(D_80126B80) # $t8, 0x8012 -/* B0BC4C 80094AAC 27186B80 */ addiu $t8, %lo(D_80126B80) # addiu $t8, $t8, 0x6b80 -/* B0BC50 80094AB0 8CA302C0 */ lw $v1, 0x2c0($a1) -/* B0BC54 80094AB4 3C0FDE00 */ lui $t7, 0xde00 -/* B0BC58 80094AB8 3C068014 */ lui $a2, %hi(D_8013EE5C) # $a2, 0x8014 -/* B0BC5C 80094ABC 246E0008 */ addiu $t6, $v1, 8 -/* B0BC60 80094AC0 ACAE02C0 */ sw $t6, 0x2c0($a1) -/* B0BC64 80094AC4 24C6EE5C */ addiu $a2, %lo(D_8013EE5C) # addiu $a2, $a2, -0x11a4 -/* B0BC68 80094AC8 27A40024 */ addiu $a0, $sp, 0x24 -/* B0BC6C 80094ACC 240707CC */ li $a3, 1996 -/* B0BC70 80094AD0 AC780004 */ sw $t8, 4($v1) -/* B0BC74 80094AD4 0C031AD5 */ jal func_800C6B54 -/* B0BC78 80094AD8 AC6F0000 */ sw $t7, ($v1) -/* B0BC7C 80094ADC 8FBF0014 */ lw $ra, 0x14($sp) -/* B0BC80 80094AE0 27BD0038 */ addiu $sp, $sp, 0x38 -/* B0BC84 80094AE4 03E00008 */ jr $ra -/* B0BC88 80094AE8 00000000 */ nop - diff --git a/asm/non_matchings/code/z_rcp/func_80094AEC.s b/asm/non_matchings/code/z_rcp/func_80094AEC.s deleted file mode 100644 index e9204734f1..0000000000 --- a/asm/non_matchings/code/z_rcp/func_80094AEC.s +++ /dev/null @@ -1,39 +0,0 @@ -.rdata -glabel D_8013EE68 - .asciz "../z_rcp.c" - .balign 4 - -glabel D_8013EE74 - .asciz "../z_rcp.c" - .balign 4 - -.text -glabel func_80094AEC -/* B0BC8C 80094AEC 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* B0BC90 80094AF0 AFBF0014 */ sw $ra, 0x14($sp) -/* B0BC94 80094AF4 00802825 */ move $a1, $a0 -/* B0BC98 80094AF8 3C068014 */ lui $a2, %hi(D_8013EE68) # $a2, 0x8014 -/* B0BC9C 80094AFC 24C6EE68 */ addiu $a2, %lo(D_8013EE68) # addiu $a2, $a2, -0x1198 -/* B0BCA0 80094B00 AFA50038 */ sw $a1, 0x38($sp) -/* B0BCA4 80094B04 27A40024 */ addiu $a0, $sp, 0x24 -/* B0BCA8 80094B08 0C031AB1 */ jal func_800C6AC4 -/* B0BCAC 80094B0C 240707D8 */ li $a3, 2008 -/* B0BCB0 80094B10 8FA50038 */ lw $a1, 0x38($sp) -/* B0BCB4 80094B14 3C188012 */ lui $t8, %hi(D_80126BB0) # $t8, 0x8012 -/* B0BCB8 80094B18 27186BB0 */ addiu $t8, %lo(D_80126BB0) # addiu $t8, $t8, 0x6bb0 -/* B0BCBC 80094B1C 8CA302D0 */ lw $v1, 0x2d0($a1) -/* B0BCC0 80094B20 3C0FDE00 */ lui $t7, 0xde00 -/* B0BCC4 80094B24 3C068014 */ lui $a2, %hi(D_8013EE74) # $a2, 0x8014 -/* B0BCC8 80094B28 246E0008 */ addiu $t6, $v1, 8 -/* B0BCCC 80094B2C ACAE02D0 */ sw $t6, 0x2d0($a1) -/* B0BCD0 80094B30 24C6EE74 */ addiu $a2, %lo(D_8013EE74) # addiu $a2, $a2, -0x118c -/* B0BCD4 80094B34 27A40024 */ addiu $a0, $sp, 0x24 -/* B0BCD8 80094B38 240707DC */ li $a3, 2012 -/* B0BCDC 80094B3C AC780004 */ sw $t8, 4($v1) -/* B0BCE0 80094B40 0C031AD5 */ jal func_800C6B54 -/* B0BCE4 80094B44 AC6F0000 */ sw $t7, ($v1) -/* B0BCE8 80094B48 8FBF0014 */ lw $ra, 0x14($sp) -/* B0BCEC 80094B4C 27BD0038 */ addiu $sp, $sp, 0x38 -/* B0BCF0 80094B50 03E00008 */ jr $ra -/* B0BCF4 80094B54 00000000 */ nop - diff --git a/asm/non_matchings/code/z_rcp/func_80094B58.s b/asm/non_matchings/code/z_rcp/func_80094B58.s deleted file mode 100644 index 58fc08afeb..0000000000 --- a/asm/non_matchings/code/z_rcp/func_80094B58.s +++ /dev/null @@ -1,39 +0,0 @@ -.rdata -glabel D_8013EE80 - .asciz "../z_rcp.c" - .balign 4 - -glabel D_8013EE8C - .asciz "../z_rcp.c" - .balign 4 - -.text -glabel func_80094B58 -/* B0BCF8 80094B58 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* B0BCFC 80094B5C AFBF0014 */ sw $ra, 0x14($sp) -/* B0BD00 80094B60 00802825 */ move $a1, $a0 -/* B0BD04 80094B64 3C068014 */ lui $a2, %hi(D_8013EE80) # $a2, 0x8014 -/* B0BD08 80094B68 24C6EE80 */ addiu $a2, %lo(D_8013EE80) # addiu $a2, $a2, -0x1180 -/* B0BD0C 80094B6C AFA50038 */ sw $a1, 0x38($sp) -/* B0BD10 80094B70 27A40024 */ addiu $a0, $sp, 0x24 -/* B0BD14 80094B74 0C031AB1 */ jal func_800C6AC4 -/* B0BD18 80094B78 240707E8 */ li $a3, 2024 -/* B0BD1C 80094B7C 8FA50038 */ lw $a1, 0x38($sp) -/* B0BD20 80094B80 3C188012 */ lui $t8, %hi(D_80126790) # $t8, 0x8012 -/* B0BD24 80094B84 27186790 */ addiu $t8, %lo(D_80126790) # addiu $t8, $t8, 0x6790 -/* B0BD28 80094B88 8CA302D0 */ lw $v1, 0x2d0($a1) -/* B0BD2C 80094B8C 3C0FDE00 */ lui $t7, 0xde00 -/* B0BD30 80094B90 3C068014 */ lui $a2, %hi(D_8013EE8C) # $a2, 0x8014 -/* B0BD34 80094B94 246E0008 */ addiu $t6, $v1, 8 -/* B0BD38 80094B98 ACAE02D0 */ sw $t6, 0x2d0($a1) -/* B0BD3C 80094B9C 24C6EE8C */ addiu $a2, %lo(D_8013EE8C) # addiu $a2, $a2, -0x1174 -/* B0BD40 80094BA0 27A40024 */ addiu $a0, $sp, 0x24 -/* B0BD44 80094BA4 240707EC */ li $a3, 2028 -/* B0BD48 80094BA8 AC780004 */ sw $t8, 4($v1) -/* B0BD4C 80094BAC 0C031AD5 */ jal func_800C6B54 -/* B0BD50 80094BB0 AC6F0000 */ sw $t7, ($v1) -/* B0BD54 80094BB4 8FBF0014 */ lw $ra, 0x14($sp) -/* B0BD58 80094BB8 27BD0038 */ addiu $sp, $sp, 0x38 -/* B0BD5C 80094BBC 03E00008 */ jr $ra -/* B0BD60 80094BC0 00000000 */ nop - diff --git a/asm/non_matchings/code/z_rcp/func_80094BC4.s b/asm/non_matchings/code/z_rcp/func_80094BC4.s deleted file mode 100644 index a355789898..0000000000 --- a/asm/non_matchings/code/z_rcp/func_80094BC4.s +++ /dev/null @@ -1,47 +0,0 @@ -.rdata -glabel D_8013EE98 - .asciz "../z_rcp.c" - .balign 4 - -glabel D_8013EEA4 - .asciz "../z_rcp.c" - .balign 4 - -.text -glabel func_80094BC4 -/* B0BD64 80094BC4 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* B0BD68 80094BC8 AFBF0014 */ sw $ra, 0x14($sp) -/* B0BD6C 80094BCC 00802825 */ move $a1, $a0 -/* B0BD70 80094BD0 3C068014 */ lui $a2, %hi(D_8013EE98) # $a2, 0x8014 -/* B0BD74 80094BD4 24C6EE98 */ addiu $a2, %lo(D_8013EE98) # addiu $a2, $a2, -0x1168 -/* B0BD78 80094BD8 AFA50038 */ sw $a1, 0x38($sp) -/* B0BD7C 80094BDC 27A40024 */ addiu $a0, $sp, 0x24 -/* B0BD80 80094BE0 0C031AB1 */ jal func_800C6AC4 -/* B0BD84 80094BE4 240707F8 */ li $a3, 2040 -/* B0BD88 80094BE8 8FA50038 */ lw $a1, 0x38($sp) -/* B0BD8C 80094BEC 3C188012 */ lui $t8, %hi(D_80126DC0) # $t8, 0x8012 -/* B0BD90 80094BF0 27186DC0 */ addiu $t8, %lo(D_80126DC0) # addiu $t8, $t8, 0x6dc0 -/* B0BD94 80094BF4 8CA302D0 */ lw $v1, 0x2d0($a1) -/* B0BD98 80094BF8 3C0FDE00 */ lui $t7, 0xde00 -/* B0BD9C 80094BFC 3C08E300 */ lui $t0, (0xE3001801 >> 16) # lui $t0, 0xe300 -/* B0BDA0 80094C00 246E0008 */ addiu $t6, $v1, 8 -/* B0BDA4 80094C04 ACAE02D0 */ sw $t6, 0x2d0($a1) -/* B0BDA8 80094C08 AC780004 */ sw $t8, 4($v1) -/* B0BDAC 80094C0C AC6F0000 */ sw $t7, ($v1) -/* B0BDB0 80094C10 8CA302D0 */ lw $v1, 0x2d0($a1) -/* B0BDB4 80094C14 35081801 */ ori $t0, (0xE3001801 & 0xFFFF) # ori $t0, $t0, 0x1801 -/* B0BDB8 80094C18 240900C0 */ li $t1, 192 -/* B0BDBC 80094C1C 24790008 */ addiu $t9, $v1, 8 -/* B0BDC0 80094C20 3C068014 */ lui $a2, %hi(D_8013EEA4) # $a2, 0x8014 -/* B0BDC4 80094C24 ACB902D0 */ sw $t9, 0x2d0($a1) -/* B0BDC8 80094C28 24C6EEA4 */ addiu $a2, %lo(D_8013EEA4) # addiu $a2, $a2, -0x115c -/* B0BDCC 80094C2C 27A40024 */ addiu $a0, $sp, 0x24 -/* B0BDD0 80094C30 240707FB */ li $a3, 2043 -/* B0BDD4 80094C34 AC690004 */ sw $t1, 4($v1) -/* B0BDD8 80094C38 0C031AD5 */ jal func_800C6B54 -/* B0BDDC 80094C3C AC680000 */ sw $t0, ($v1) -/* B0BDE0 80094C40 8FBF0014 */ lw $ra, 0x14($sp) -/* B0BDE4 80094C44 27BD0038 */ addiu $sp, $sp, 0x38 -/* B0BDE8 80094C48 03E00008 */ jr $ra -/* B0BDEC 80094C4C 00000000 */ nop - diff --git a/asm/non_matchings/code/z_rcp/func_80094C50.s b/asm/non_matchings/code/z_rcp/func_80094C50.s deleted file mode 100644 index a86ddaf37d..0000000000 --- a/asm/non_matchings/code/z_rcp/func_80094C50.s +++ /dev/null @@ -1,39 +0,0 @@ -.rdata -glabel D_8013EEB0 - .asciz "../z_rcp.c" - .balign 4 - -glabel D_8013EEBC - .asciz "../z_rcp.c" - .balign 4 - -.text -glabel func_80094C50 -/* B0BDF0 80094C50 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* B0BDF4 80094C54 AFBF0014 */ sw $ra, 0x14($sp) -/* B0BDF8 80094C58 00802825 */ move $a1, $a0 -/* B0BDFC 80094C5C 3C068014 */ lui $a2, %hi(D_8013EEB0) # $a2, 0x8014 -/* B0BE00 80094C60 24C6EEB0 */ addiu $a2, %lo(D_8013EEB0) # addiu $a2, $a2, -0x1150 -/* B0BE04 80094C64 AFA50038 */ sw $a1, 0x38($sp) -/* B0BE08 80094C68 27A40024 */ addiu $a0, $sp, 0x24 -/* B0BE0C 80094C6C 0C031AB1 */ jal func_800C6AC4 -/* B0BE10 80094C70 24070808 */ li $a3, 2056 -/* B0BE14 80094C74 8FA50038 */ lw $a1, 0x38($sp) -/* B0BE18 80094C78 3C188012 */ lui $t8, %hi(D_80126DF0) # $t8, 0x8012 -/* B0BE1C 80094C7C 27186DF0 */ addiu $t8, %lo(D_80126DF0) # addiu $t8, $t8, 0x6df0 -/* B0BE20 80094C80 8CA302D0 */ lw $v1, 0x2d0($a1) -/* B0BE24 80094C84 3C0FDE00 */ lui $t7, 0xde00 -/* B0BE28 80094C88 3C068014 */ lui $a2, %hi(D_8013EEBC) # $a2, 0x8014 -/* B0BE2C 80094C8C 246E0008 */ addiu $t6, $v1, 8 -/* B0BE30 80094C90 ACAE02D0 */ sw $t6, 0x2d0($a1) -/* B0BE34 80094C94 24C6EEBC */ addiu $a2, %lo(D_8013EEBC) # addiu $a2, $a2, -0x1144 -/* B0BE38 80094C98 27A40024 */ addiu $a0, $sp, 0x24 -/* B0BE3C 80094C9C 2407080A */ li $a3, 2058 -/* B0BE40 80094CA0 AC780004 */ sw $t8, 4($v1) -/* B0BE44 80094CA4 0C031AD5 */ jal func_800C6B54 -/* B0BE48 80094CA8 AC6F0000 */ sw $t7, ($v1) -/* B0BE4C 80094CAC 8FBF0014 */ lw $ra, 0x14($sp) -/* B0BE50 80094CB0 27BD0038 */ addiu $sp, $sp, 0x38 -/* B0BE54 80094CB4 03E00008 */ jr $ra -/* B0BE58 80094CB8 00000000 */ nop - diff --git a/asm/non_matchings/code/z_rcp/func_80094CBC.s b/asm/non_matchings/code/z_rcp/func_80094CBC.s deleted file mode 100644 index 598d5e75bf..0000000000 --- a/asm/non_matchings/code/z_rcp/func_80094CBC.s +++ /dev/null @@ -1,39 +0,0 @@ -.rdata -glabel D_8013EEC8 - .asciz "../z_rcp.c" - .balign 4 - -glabel D_8013EED4 - .asciz "../z_rcp.c" - .balign 4 - -.text -glabel func_80094CBC -/* B0BE5C 80094CBC 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* B0BE60 80094CC0 AFBF0014 */ sw $ra, 0x14($sp) -/* B0BE64 80094CC4 00802825 */ move $a1, $a0 -/* B0BE68 80094CC8 3C068014 */ lui $a2, %hi(D_8013EEC8) # $a2, 0x8014 -/* B0BE6C 80094CCC 24C6EEC8 */ addiu $a2, %lo(D_8013EEC8) # addiu $a2, $a2, -0x1138 -/* B0BE70 80094CD0 AFA50038 */ sw $a1, 0x38($sp) -/* B0BE74 80094CD4 27A40024 */ addiu $a0, $sp, 0x24 -/* B0BE78 80094CD8 0C031AB1 */ jal func_800C6AC4 -/* B0BE7C 80094CDC 24070826 */ li $a3, 2086 -/* B0BE80 80094CE0 8FA50038 */ lw $a1, 0x38($sp) -/* B0BE84 80094CE4 3C188012 */ lui $t8, %hi(D_80126D00) # $t8, 0x8012 -/* B0BE88 80094CE8 27186D00 */ addiu $t8, %lo(D_80126D00) # addiu $t8, $t8, 0x6d00 -/* B0BE8C 80094CEC 8CA302C0 */ lw $v1, 0x2c0($a1) -/* B0BE90 80094CF0 3C0FDE00 */ lui $t7, 0xde00 -/* B0BE94 80094CF4 3C068014 */ lui $a2, %hi(D_8013EED4) # $a2, 0x8014 -/* B0BE98 80094CF8 246E0008 */ addiu $t6, $v1, 8 -/* B0BE9C 80094CFC ACAE02C0 */ sw $t6, 0x2c0($a1) -/* B0BEA0 80094D00 24C6EED4 */ addiu $a2, %lo(D_8013EED4) # addiu $a2, $a2, -0x112c -/* B0BEA4 80094D04 27A40024 */ addiu $a0, $sp, 0x24 -/* B0BEA8 80094D08 2407082A */ li $a3, 2090 -/* B0BEAC 80094D0C AC780004 */ sw $t8, 4($v1) -/* B0BEB0 80094D10 0C031AD5 */ jal func_800C6B54 -/* B0BEB4 80094D14 AC6F0000 */ sw $t7, ($v1) -/* B0BEB8 80094D18 8FBF0014 */ lw $ra, 0x14($sp) -/* B0BEBC 80094D1C 27BD0038 */ addiu $sp, $sp, 0x38 -/* B0BEC0 80094D20 03E00008 */ jr $ra -/* B0BEC4 80094D24 00000000 */ nop - diff --git a/asm/non_matchings/code/z_rcp/func_80094D28.s b/asm/non_matchings/code/z_rcp/func_80094D28.s deleted file mode 100644 index 7de47190d1..0000000000 --- a/asm/non_matchings/code/z_rcp/func_80094D28.s +++ /dev/null @@ -1,11 +0,0 @@ -glabel func_80094D28 -/* B0BEC8 80094D28 8C830000 */ lw $v1, ($a0) -/* B0BECC 80094D2C 3C0F8012 */ lui $t7, %hi(D_80126D00) # $t7, 0x8012 -/* B0BED0 80094D30 25EF6D00 */ addiu $t7, %lo(D_80126D00) # addiu $t7, $t7, 0x6d00 -/* B0BED4 80094D34 3C0EDE00 */ lui $t6, 0xde00 -/* B0BED8 80094D38 AC6E0000 */ sw $t6, ($v1) -/* B0BEDC 80094D3C AC6F0004 */ sw $t7, 4($v1) -/* B0BEE0 80094D40 24620008 */ addiu $v0, $v1, 8 -/* B0BEE4 80094D44 03E00008 */ jr $ra -/* B0BEE8 80094D48 AC820000 */ sw $v0, ($a0) - diff --git a/asm/non_matchings/code/z_rcp/func_80094D4C.s b/asm/non_matchings/code/z_rcp/func_80094D4C.s deleted file mode 100644 index d2e8b7af2d..0000000000 --- a/asm/non_matchings/code/z_rcp/func_80094D4C.s +++ /dev/null @@ -1,39 +0,0 @@ -.rdata -glabel D_8013EEE0 - .asciz "../z_rcp.c" - .balign 4 - -glabel D_8013EEEC - .asciz "../z_rcp.c" - .balign 4 - -.text -glabel func_80094D4C -/* B0BEEC 80094D4C 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* B0BEF0 80094D50 AFBF0014 */ sw $ra, 0x14($sp) -/* B0BEF4 80094D54 00802825 */ move $a1, $a0 -/* B0BEF8 80094D58 3C068014 */ lui $a2, %hi(D_8013EEE0) # $a2, 0x8014 -/* B0BEFC 80094D5C 24C6EEE0 */ addiu $a2, %lo(D_8013EEE0) # addiu $a2, $a2, -0x1120 -/* B0BF00 80094D60 AFA50038 */ sw $a1, 0x38($sp) -/* B0BF04 80094D64 27A40024 */ addiu $a0, $sp, 0x24 -/* B0BF08 80094D68 0C031AB1 */ jal func_800C6AC4 -/* B0BF0C 80094D6C 24070840 */ li $a3, 2112 -/* B0BF10 80094D70 8FA50038 */ lw $a1, 0x38($sp) -/* B0BF14 80094D74 3C188012 */ lui $t8, %hi(D_80126D90) # $t8, 0x8012 -/* B0BF18 80094D78 27186D90 */ addiu $t8, %lo(D_80126D90) # addiu $t8, $t8, 0x6d90 -/* B0BF1C 80094D7C 8CA302C0 */ lw $v1, 0x2c0($a1) -/* B0BF20 80094D80 3C0FDE00 */ lui $t7, 0xde00 -/* B0BF24 80094D84 3C068014 */ lui $a2, %hi(D_8013EEEC) # $a2, 0x8014 -/* B0BF28 80094D88 246E0008 */ addiu $t6, $v1, 8 -/* B0BF2C 80094D8C ACAE02C0 */ sw $t6, 0x2c0($a1) -/* B0BF30 80094D90 24C6EEEC */ addiu $a2, %lo(D_8013EEEC) # addiu $a2, $a2, -0x1114 -/* B0BF34 80094D94 27A40024 */ addiu $a0, $sp, 0x24 -/* B0BF38 80094D98 24070844 */ li $a3, 2116 -/* B0BF3C 80094D9C AC780004 */ sw $t8, 4($v1) -/* B0BF40 80094DA0 0C031AD5 */ jal func_800C6B54 -/* B0BF44 80094DA4 AC6F0000 */ sw $t7, ($v1) -/* B0BF48 80094DA8 8FBF0014 */ lw $ra, 0x14($sp) -/* B0BF4C 80094DAC 27BD0038 */ addiu $sp, $sp, 0x38 -/* B0BF50 80094DB0 03E00008 */ jr $ra -/* B0BF54 80094DB4 00000000 */ nop - diff --git a/asm/non_matchings/code/z_rcp/func_80094E54.s b/asm/non_matchings/code/z_rcp/func_80094E54.s deleted file mode 100644 index ffd19a5e76..0000000000 --- a/asm/non_matchings/code/z_rcp/func_80094E54.s +++ /dev/null @@ -1,11 +0,0 @@ -glabel func_80094E54 -/* B0BFF4 80094E54 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* B0BFF8 80094E58 AFBF001C */ sw $ra, 0x1c($sp) -/* B0BFFC 80094E5C AFA00010 */ sw $zero, 0x10($sp) -/* B0C000 80094E60 0C02536E */ jal func_80094DB8 -/* B0C004 80094E64 00003825 */ move $a3, $zero -/* B0C008 80094E68 8FBF001C */ lw $ra, 0x1c($sp) -/* B0C00C 80094E6C 27BD0020 */ addiu $sp, $sp, 0x20 -/* B0C010 80094E70 03E00008 */ jr $ra -/* B0C014 80094E74 00000000 */ nop - diff --git a/asm/non_matchings/code/z_rcp/func_800951D0.s b/asm/non_matchings/code/z_rcp/func_800951D0.s deleted file mode 100644 index 2837d18a34..0000000000 --- a/asm/non_matchings/code/z_rcp/func_800951D0.s +++ /dev/null @@ -1,32 +0,0 @@ -glabel func_800951D0 -/* B0C370 800951D0 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* B0C374 800951D4 AFBF0014 */ sw $ra, 0x14($sp) -/* B0C378 800951D8 AFA5001C */ sw $a1, 0x1c($sp) -/* B0C37C 800951DC AFA60020 */ sw $a2, 0x20($sp) -/* B0C380 800951E0 AFA70024 */ sw $a3, 0x24($sp) -/* B0C384 800951E4 0C031A73 */ jal Graph_Alloc -/* B0C388 800951E8 24050010 */ li $a1, 16 -/* B0C38C 800951EC 3C0EFB00 */ lui $t6, 0xfb00 -/* B0C390 800951F0 AC4E0000 */ sw $t6, ($v0) -/* B0C394 800951F4 8FB8001C */ lw $t8, 0x1c($sp) -/* B0C398 800951F8 8FA80020 */ lw $t0, 0x20($sp) -/* B0C39C 800951FC 8FAC0024 */ lw $t4, 0x24($sp) -/* B0C3A0 80095200 0018CE00 */ sll $t9, $t8, 0x18 -/* B0C3A4 80095204 8FB80028 */ lw $t8, 0x28($sp) -/* B0C3A8 80095208 310900FF */ andi $t1, $t0, 0xff -/* B0C3AC 8009520C 00095400 */ sll $t2, $t1, 0x10 -/* B0C3B0 80095210 318D00FF */ andi $t5, $t4, 0xff -/* B0C3B4 80095214 000D7200 */ sll $t6, $t5, 8 -/* B0C3B8 80095218 032A5825 */ or $t3, $t9, $t2 -/* B0C3BC 8009521C 016E7825 */ or $t7, $t3, $t6 -/* B0C3C0 80095220 330800FF */ andi $t0, $t8, 0xff -/* B0C3C4 80095224 01E84825 */ or $t1, $t7, $t0 -/* B0C3C8 80095228 3C19DF00 */ lui $t9, 0xdf00 -/* B0C3CC 8009522C AC490004 */ sw $t1, 4($v0) -/* B0C3D0 80095230 AC590008 */ sw $t9, 8($v0) -/* B0C3D4 80095234 AC40000C */ sw $zero, 0xc($v0) -/* B0C3D8 80095238 8FBF0014 */ lw $ra, 0x14($sp) -/* B0C3DC 8009523C 27BD0018 */ addiu $sp, $sp, 0x18 -/* B0C3E0 80095240 03E00008 */ jr $ra -/* B0C3E4 80095244 00000000 */ nop - diff --git a/asm/non_matchings/code/z_rcp/func_80095248.s b/asm/non_matchings/code/z_rcp/func_80095248.s deleted file mode 100644 index 9476ef88df..0000000000 --- a/asm/non_matchings/code/z_rcp/func_80095248.s +++ /dev/null @@ -1,478 +0,0 @@ -.rdata -glabel D_8013EEF8 - .asciz "../z_rcp.c" - .balign 4 - -glabel D_8013EF04 - .asciz "../z_rcp.c" - .balign 4 - -.text -glabel func_80095248 -/* B0C3E8 80095248 27BDFF38 */ addiu $sp, $sp, -0xc8 -/* B0C3EC 8009524C AFA500CC */ sw $a1, 0xcc($sp) -/* B0C3F0 80095250 AFA600D0 */ sw $a2, 0xd0($sp) -/* B0C3F4 80095254 00802825 */ move $a1, $a0 -/* B0C3F8 80095258 AFBF0014 */ sw $ra, 0x14($sp) -/* B0C3FC 8009525C AFA400C8 */ sw $a0, 0xc8($sp) -/* B0C400 80095260 AFA700D4 */ sw $a3, 0xd4($sp) -/* B0C404 80095264 3C068014 */ lui $a2, %hi(D_8013EEF8) # $a2, 0x8014 -/* B0C408 80095268 24C6EEF8 */ addiu $a2, %lo(D_8013EEF8) # addiu $a2, $a2, -0x1108 -/* B0C40C 8009526C 24070952 */ li $a3, 2386 -/* B0C410 80095270 AFA500C8 */ sw $a1, 0xc8($sp) -/* B0C414 80095274 0C031AB1 */ jal func_800C6AC4 -/* B0C418 80095278 27A400B4 */ addiu $a0, $sp, 0xb4 -/* B0C41C 8009527C 8FA500C8 */ lw $a1, 0xc8($sp) -/* B0C420 80095280 93AC00CF */ lbu $t4, 0xcf($sp) -/* B0C424 80095284 3C048012 */ lui $a0, %hi(D_80126FD0) # $a0, 0x8012 -/* B0C428 80095288 8CA202C0 */ lw $v0, 0x2c0($a1) -/* B0C42C 8009528C 24846FD0 */ addiu $a0, %lo(D_80126FD0) # addiu $a0, $a0, 0x6fd0 -/* B0C430 80095290 3C06DE00 */ lui $a2, 0xde00 -/* B0C434 80095294 244E0008 */ addiu $t6, $v0, 8 -/* B0C438 80095298 ACAE02C0 */ sw $t6, 0x2c0($a1) -/* B0C43C 8009529C AC440004 */ sw $a0, 4($v0) -/* B0C440 800952A0 AC460000 */ sw $a2, ($v0) -/* B0C444 800952A4 8CA202D0 */ lw $v0, 0x2d0($a1) -/* B0C448 800952A8 3C098013 */ lui $t1, %hi(gScreenWidth) # $t1, 0x8013 -/* B0C44C 800952AC 2529D270 */ addiu $t1, %lo(gScreenWidth) # addiu $t1, $t1, -0x2d90 -/* B0C450 800952B0 244F0008 */ addiu $t7, $v0, 8 -/* B0C454 800952B4 ACAF02D0 */ sw $t7, 0x2d0($a1) -/* B0C458 800952B8 AC440004 */ sw $a0, 4($v0) -/* B0C45C 800952BC AC460000 */ sw $a2, ($v0) -/* B0C460 800952C0 8CA202B0 */ lw $v0, 0x2b0($a1) -/* B0C464 800952C4 3C014080 */ li $at, 0x40800000 # 0.000000 -/* B0C468 800952C8 44810000 */ mtc1 $at, $f0 -/* B0C46C 800952CC 24580008 */ addiu $t8, $v0, 8 -/* B0C470 800952D0 ACB802B0 */ sw $t8, 0x2b0($a1) -/* B0C474 800952D4 AC440004 */ sw $a0, 4($v0) -/* B0C478 800952D8 AC460000 */ sw $a2, ($v0) -/* B0C47C 800952DC 8CA202C0 */ lw $v0, 0x2c0($a1) -/* B0C480 800952E0 3C04ED00 */ lui $a0, 0xed00 -/* B0C484 800952E4 3C068013 */ lui $a2, %hi(gScreenHeight) # $a2, 0x8013 -/* B0C488 800952E8 24590008 */ addiu $t9, $v0, 8 -/* B0C48C 800952EC ACB902C0 */ sw $t9, 0x2c0($a1) -/* B0C490 800952F0 AC440000 */ sw $a0, ($v0) -/* B0C494 800952F4 8D2E0000 */ lw $t6, ($t1) -/* B0C498 800952F8 24C6D274 */ addiu $a2, %lo(gScreenHeight) # addiu $a2, $a2, -0x2d8c -/* B0C49C 800952FC 8CCF0000 */ lw $t7, ($a2) -/* B0C4A0 80095300 448E2000 */ mtc1 $t6, $f4 -/* B0C4A4 80095304 3C0BFF10 */ li $t3, 0xFF100000 # 0.000000 -/* B0C4A8 80095308 448F8000 */ mtc1 $t7, $f16 -/* B0C4AC 8009530C 468021A0 */ cvt.s.w $f6, $f4 -/* B0C4B0 80095310 3C088017 */ lui $t0, %hi(D_801759C0) # $t0, 0x8017 -/* B0C4B4 80095314 250859C0 */ addiu $t0, %lo(D_801759C0) # addiu $t0, $t0, 0x59c0 -/* B0C4B8 80095318 3C038016 */ lui $v1, %hi(gGameInfo) # $v1, 0x8016 -/* B0C4BC 8009531C 2463FA90 */ addiu $v1, %lo(gGameInfo) # addiu $v1, $v1, -0x570 -/* B0C4C0 80095320 468084A0 */ cvt.s.w $f18, $f16 -/* B0C4C4 80095324 46003202 */ mul.s $f8, $f6, $f0 -/* B0C4C8 80095328 4600428D */ trunc.w.s $f10, $f8 -/* B0C4CC 8009532C 46009102 */ mul.s $f4, $f18, $f0 -/* B0C4D0 80095330 44185000 */ mfc1 $t8, $f10 -/* B0C4D4 80095334 00000000 */ nop -/* B0C4D8 80095338 33190FFF */ andi $t9, $t8, 0xfff -/* B0C4DC 8009533C 4600218D */ trunc.w.s $f6, $f4 -/* B0C4E0 80095340 00197300 */ sll $t6, $t9, 0xc -/* B0C4E4 80095344 44193000 */ mfc1 $t9, $f6 -/* B0C4E8 80095348 00000000 */ nop -/* B0C4EC 8009534C 332F0FFF */ andi $t7, $t9, 0xfff -/* B0C4F0 80095350 01CFC025 */ or $t8, $t6, $t7 -/* B0C4F4 80095354 AC580004 */ sw $t8, 4($v0) -/* B0C4F8 80095358 8CA202D0 */ lw $v0, 0x2d0($a1) -/* B0C4FC 8009535C 24590008 */ addiu $t9, $v0, 8 -/* B0C500 80095360 ACB902D0 */ sw $t9, 0x2d0($a1) -/* B0C504 80095364 AC440000 */ sw $a0, ($v0) -/* B0C508 80095368 8D2E0000 */ lw $t6, ($t1) -/* B0C50C 8009536C 8CCF0000 */ lw $t7, ($a2) -/* B0C510 80095370 448E4000 */ mtc1 $t6, $f8 -/* B0C514 80095374 448F2000 */ mtc1 $t7, $f4 -/* B0C518 80095378 468042A0 */ cvt.s.w $f10, $f8 -/* B0C51C 8009537C 468021A0 */ cvt.s.w $f6, $f4 -/* B0C520 80095380 46005402 */ mul.s $f16, $f10, $f0 -/* B0C524 80095384 4600848D */ trunc.w.s $f18, $f16 -/* B0C528 80095388 46003202 */ mul.s $f8, $f6, $f0 -/* B0C52C 8009538C 44189000 */ mfc1 $t8, $f18 -/* B0C530 80095390 00000000 */ nop -/* B0C534 80095394 33190FFF */ andi $t9, $t8, 0xfff -/* B0C538 80095398 4600428D */ trunc.w.s $f10, $f8 -/* B0C53C 8009539C 00197300 */ sll $t6, $t9, 0xc -/* B0C540 800953A0 44195000 */ mfc1 $t9, $f10 -/* B0C544 800953A4 00000000 */ nop -/* B0C548 800953A8 332F0FFF */ andi $t7, $t9, 0xfff -/* B0C54C 800953AC 01CFC025 */ or $t8, $t6, $t7 -/* B0C550 800953B0 AC580004 */ sw $t8, 4($v0) -/* B0C554 800953B4 8CA202B0 */ lw $v0, 0x2b0($a1) -/* B0C558 800953B8 24590008 */ addiu $t9, $v0, 8 -/* B0C55C 800953BC ACB902B0 */ sw $t9, 0x2b0($a1) -/* B0C560 800953C0 AC440000 */ sw $a0, ($v0) -/* B0C564 800953C4 8D2E0000 */ lw $t6, ($t1) -/* B0C568 800953C8 8CCF0000 */ lw $t7, ($a2) -/* B0C56C 800953CC 3C04FE00 */ li $a0, 0xFE000000 # 0.000000 -/* B0C570 800953D0 448E8000 */ mtc1 $t6, $f16 -/* B0C574 800953D4 448F4000 */ mtc1 $t7, $f8 -/* B0C578 800953D8 468084A0 */ cvt.s.w $f18, $f16 -/* B0C57C 800953DC 468042A0 */ cvt.s.w $f10, $f8 -/* B0C580 800953E0 46009102 */ mul.s $f4, $f18, $f0 -/* B0C584 800953E4 4600218D */ trunc.w.s $f6, $f4 -/* B0C588 800953E8 46005402 */ mul.s $f16, $f10, $f0 -/* B0C58C 800953EC 44183000 */ mfc1 $t8, $f6 -/* B0C590 800953F0 00000000 */ nop -/* B0C594 800953F4 33190FFF */ andi $t9, $t8, 0xfff -/* B0C598 800953F8 4600848D */ trunc.w.s $f18, $f16 -/* B0C59C 800953FC 00197300 */ sll $t6, $t9, 0xc -/* B0C5A0 80095400 44199000 */ mfc1 $t9, $f18 -/* B0C5A4 80095404 00000000 */ nop -/* B0C5A8 80095408 332F0FFF */ andi $t7, $t9, 0xfff -/* B0C5AC 8009540C 01CFC025 */ or $t8, $t6, $t7 -/* B0C5B0 80095410 AC580004 */ sw $t8, 4($v0) -/* B0C5B4 80095414 8CA202C0 */ lw $v0, 0x2c0($a1) -/* B0C5B8 80095418 24590008 */ addiu $t9, $v0, 8 -/* B0C5BC 8009541C ACB902C0 */ sw $t9, 0x2c0($a1) -/* B0C5C0 80095420 8D2E0000 */ lw $t6, ($t1) -/* B0C5C4 80095424 25CFFFFF */ addiu $t7, $t6, -1 -/* B0C5C8 80095428 31F80FFF */ andi $t8, $t7, 0xfff -/* B0C5CC 8009542C 030BC825 */ or $t9, $t8, $t3 -/* B0C5D0 80095430 AC590000 */ sw $t9, ($v0) -/* B0C5D4 80095434 8CAE02DC */ lw $t6, 0x2dc($a1) -/* B0C5D8 80095438 AC4E0004 */ sw $t6, 4($v0) -/* B0C5DC 8009543C 8CA202C0 */ lw $v0, 0x2c0($a1) -/* B0C5E0 80095440 244F0008 */ addiu $t7, $v0, 8 -/* B0C5E4 80095444 ACAF02C0 */ sw $t7, 0x2c0($a1) -/* B0C5E8 80095448 8D380000 */ lw $t8, ($t1) -/* B0C5EC 8009544C 2719FFFF */ addiu $t9, $t8, -1 -/* B0C5F0 80095450 332E0FFF */ andi $t6, $t9, 0xfff -/* B0C5F4 80095454 01CB7825 */ or $t7, $t6, $t3 -/* B0C5F8 80095458 AC4F0000 */ sw $t7, ($v0) -/* B0C5FC 8009545C 8CB802DC */ lw $t8, 0x2dc($a1) -/* B0C600 80095460 AC580004 */ sw $t8, 4($v0) -/* B0C604 80095464 8CA202D0 */ lw $v0, 0x2d0($a1) -/* B0C608 80095468 24590008 */ addiu $t9, $v0, 8 -/* B0C60C 8009546C ACB902D0 */ sw $t9, 0x2d0($a1) -/* B0C610 80095470 8D2E0000 */ lw $t6, ($t1) -/* B0C614 80095474 25CFFFFF */ addiu $t7, $t6, -1 -/* B0C618 80095478 31F80FFF */ andi $t8, $t7, 0xfff -/* B0C61C 8009547C 030BC825 */ or $t9, $t8, $t3 -/* B0C620 80095480 AC590000 */ sw $t9, ($v0) -/* B0C624 80095484 8CAE02DC */ lw $t6, 0x2dc($a1) -/* B0C628 80095488 AC4E0004 */ sw $t6, 4($v0) -/* B0C62C 8009548C 8CA202B0 */ lw $v0, 0x2b0($a1) -/* B0C630 80095490 244F0008 */ addiu $t7, $v0, 8 -/* B0C634 80095494 ACAF02B0 */ sw $t7, 0x2b0($a1) -/* B0C638 80095498 8D380000 */ lw $t8, ($t1) -/* B0C63C 8009549C 2719FFFF */ addiu $t9, $t8, -1 -/* B0C640 800954A0 332E0FFF */ andi $t6, $t9, 0xfff -/* B0C644 800954A4 01CB7825 */ or $t7, $t6, $t3 -/* B0C648 800954A8 AC4F0000 */ sw $t7, ($v0) -/* B0C64C 800954AC 8CB802DC */ lw $t8, 0x2dc($a1) -/* B0C650 800954B0 AC580004 */ sw $t8, 4($v0) -/* B0C654 800954B4 8CA202C0 */ lw $v0, 0x2c0($a1) -/* B0C658 800954B8 24590008 */ addiu $t9, $v0, 8 -/* B0C65C 800954BC ACB902C0 */ sw $t9, 0x2c0($a1) -/* B0C660 800954C0 AC480004 */ sw $t0, 4($v0) -/* B0C664 800954C4 AC440000 */ sw $a0, ($v0) -/* B0C668 800954C8 8CA202D0 */ lw $v0, 0x2d0($a1) -/* B0C66C 800954CC 244E0008 */ addiu $t6, $v0, 8 -/* B0C670 800954D0 ACAE02D0 */ sw $t6, 0x2d0($a1) -/* B0C674 800954D4 AC480004 */ sw $t0, 4($v0) -/* B0C678 800954D8 AC440000 */ sw $a0, ($v0) -/* B0C67C 800954DC 8CA202B0 */ lw $v0, 0x2b0($a1) -/* B0C680 800954E0 3C0E8016 */ lui $t6, %hi(D_80161490) # $t6, 0x8016 -/* B0C684 800954E4 244F0008 */ addiu $t7, $v0, 8 -/* B0C688 800954E8 ACAF02B0 */ sw $t7, 0x2b0($a1) -/* B0C68C 800954EC AC480004 */ sw $t0, 4($v0) -/* B0C690 800954F0 AC440000 */ sw $a0, ($v0) -/* B0C694 800954F4 8C780000 */ lw $t8, ($v1) -/* B0C698 800954F8 87190190 */ lh $t9, 0x190($t8) -/* B0C69C 800954FC 2B210002 */ slti $at, $t9, 2 -/* B0C6A0 80095500 10200113 */ beqz $at, .L80095950 -/* B0C6A4 80095504 00000000 */ nop -/* B0C6A8 80095508 8DCE1490 */ lw $t6, %lo(D_80161490)($t6) -/* B0C6AC 8009550C 29C10002 */ slti $at, $t6, 2 -/* B0C6B0 80095510 1020010F */ beqz $at, .L80095950 -/* B0C6B4 80095514 00000000 */ nop -/* B0C6B8 80095518 AFA500C8 */ sw $a1, 0xc8($sp) -/* B0C6BC 8009551C AFA8002C */ sw $t0, 0x2c($sp) -/* B0C6C0 80095520 0C02CE3F */ jal func_800B38FC -/* B0C6C4 80095524 A3AC00CF */ sb $t4, 0xcf($sp) -/* B0C6C8 80095528 3C038016 */ lui $v1, %hi(gGameInfo) # $v1, 0x8016 -/* B0C6CC 8009552C 2463FA90 */ addiu $v1, %lo(gGameInfo) # addiu $v1, $v1, -0x570 -/* B0C6D0 80095530 8C640000 */ lw $a0, ($v1) -/* B0C6D4 80095534 24060010 */ li $a2, 16 -/* B0C6D8 80095538 3C098013 */ lui $t1, %hi(gScreenWidth) # $t1, 0x8013 -/* B0C6DC 8009553C 848F1074 */ lh $t7, 0x1074($a0) -/* B0C6E0 80095540 2529D270 */ addiu $t1, %lo(gScreenWidth) # addiu $t1, $t1, -0x2d90 -/* B0C6E4 80095544 8FA500C8 */ lw $a1, 0xc8($sp) -/* B0C6E8 80095548 8FA8002C */ lw $t0, 0x2c($sp) -/* B0C6EC 8009554C 3C0BFF10 */ lui $t3, 0xff10 -/* B0C6F0 80095550 93AC00CF */ lbu $t4, 0xcf($sp) -/* B0C6F4 80095554 14CF0041 */ bne $a2, $t7, .L8009565C -/* B0C6F8 80095558 00405025 */ move $t2, $v0 -/* B0C6FC 8009555C 84981092 */ lh $t8, 0x1092($a0) -/* B0C700 80095560 24070003 */ li $a3, 3 -/* B0C704 80095564 50D80020 */ beql $a2, $t8, .L800955E8 -/* B0C708 80095568 84861076 */ lh $a2, 0x1076($a0) -/* B0C70C 8009556C A4871076 */ sh $a3, 0x1076($a0) -/* B0C710 80095570 8C790000 */ lw $t9, ($v1) -/* B0C714 80095574 A7271078 */ sh $a3, 0x1078($t9) -/* B0C718 80095578 8C6E0000 */ lw $t6, ($v1) -/* B0C71C 8009557C A5C0107A */ sh $zero, 0x107a($t6) -/* B0C720 80095580 8C6F0000 */ lw $t7, ($v1) -/* B0C724 80095584 A5E0107C */ sh $zero, 0x107c($t7) -/* B0C728 80095588 8C780000 */ lw $t8, ($v1) -/* B0C72C 8009558C A700107E */ sh $zero, 0x107e($t8) -/* B0C730 80095590 8C790000 */ lw $t9, ($v1) -/* B0C734 80095594 A7201080 */ sh $zero, 0x1080($t9) -/* B0C738 80095598 8C6E0000 */ lw $t6, ($v1) -/* B0C73C 8009559C A5C01082 */ sh $zero, 0x1082($t6) -/* B0C740 800955A0 8C6F0000 */ lw $t7, ($v1) -/* B0C744 800955A4 A5E01084 */ sh $zero, 0x1084($t7) -/* B0C748 800955A8 8C780000 */ lw $t8, ($v1) -/* B0C74C 800955AC A7001086 */ sh $zero, 0x1086($t8) -/* B0C750 800955B0 8C790000 */ lw $t9, ($v1) -/* B0C754 800955B4 A7201088 */ sh $zero, 0x1088($t9) -/* B0C758 800955B8 8C6E0000 */ lw $t6, ($v1) -/* B0C75C 800955BC A5C0108A */ sh $zero, 0x108a($t6) -/* B0C760 800955C0 8C6F0000 */ lw $t7, ($v1) -/* B0C764 800955C4 A5E0108C */ sh $zero, 0x108c($t7) -/* B0C768 800955C8 8C780000 */ lw $t8, ($v1) -/* B0C76C 800955CC A700108E */ sh $zero, 0x108e($t8) -/* B0C770 800955D0 8C790000 */ lw $t9, ($v1) -/* B0C774 800955D4 A7201090 */ sh $zero, 0x1090($t9) -/* B0C778 800955D8 8C6E0000 */ lw $t6, ($v1) -/* B0C77C 800955DC A5C61092 */ sh $a2, 0x1092($t6) -/* B0C780 800955E0 8C640000 */ lw $a0, ($v1) -/* B0C784 800955E4 84861076 */ lh $a2, 0x1076($a0) -.L800955E8: -/* B0C788 800955E8 30CF0001 */ andi $t7, $a2, 1 -/* B0C78C 800955EC 51E00005 */ beql $t7, $zero, .L80095604 -/* B0C790 800955F0 30D80002 */ andi $t8, $a2, 2 -/* B0C794 800955F4 A482107A */ sh $v0, 0x107a($a0) -/* B0C798 800955F8 8C640000 */ lw $a0, ($v1) -/* B0C79C 800955FC 84861076 */ lh $a2, 0x1076($a0) -/* B0C7A0 80095600 30D80002 */ andi $t8, $a2, 2 -.L80095604: -/* B0C7A4 80095604 5300000A */ beql $t8, $zero, .L80095630 -/* B0C7A8 80095608 84821078 */ lh $v0, 0x1078($a0) -/* B0C7AC 8009560C A48C107C */ sh $t4, 0x107c($a0) -/* B0C7B0 80095610 8C6E0000 */ lw $t6, ($v1) -/* B0C7B4 80095614 93B900D3 */ lbu $t9, 0xd3($sp) -/* B0C7B8 80095618 A5D9107E */ sh $t9, 0x107e($t6) -/* B0C7BC 8009561C 8C780000 */ lw $t8, ($v1) -/* B0C7C0 80095620 93AF00D7 */ lbu $t7, 0xd7($sp) -/* B0C7C4 80095624 A70F1080 */ sh $t7, 0x1080($t8) -/* B0C7C8 80095628 8C640000 */ lw $a0, ($v1) -/* B0C7CC 8009562C 84821078 */ lh $v0, 0x1078($a0) -.L80095630: -/* B0C7D0 80095630 30590001 */ andi $t9, $v0, 1 -/* B0C7D4 80095634 13200002 */ beqz $t9, .L80095640 -/* B0C7D8 80095638 304E0002 */ andi $t6, $v0, 2 -/* B0C7DC 8009563C 848A107A */ lh $t2, 0x107a($a0) -.L80095640: -/* B0C7E0 80095640 51C00007 */ beql $t6, $zero, .L80095660 -/* B0C7E4 80095644 93B900D7 */ lbu $t9, 0xd7($sp) -/* B0C7E8 80095648 848F107E */ lh $t7, 0x107e($a0) -/* B0C7EC 8009564C 908C107D */ lbu $t4, 0x107d($a0) -/* B0C7F0 80095650 A3AF00D3 */ sb $t7, 0xd3($sp) -/* B0C7F4 80095654 84981080 */ lh $t8, 0x1080($a0) -/* B0C7F8 80095658 A3B800D7 */ sb $t8, 0xd7($sp) -.L8009565C: -/* B0C7FC 8009565C 93B900D7 */ lbu $t9, 0xd7($sp) -.L80095660: -/* B0C800 80095660 93BF00D3 */ lbu $ra, 0xd3($sp) -/* B0C804 80095664 3C04E300 */ lui $a0, (0xE3000001 >> 16) # lui $a0, 0xe300 -/* B0C808 80095668 AFB90020 */ sw $t9, 0x20($sp) -/* B0C80C 8009566C 8CA202C0 */ lw $v0, 0x2c0($a1) -/* B0C810 80095670 34840A01 */ ori $a0, (0xE3000A01 & 0xFFFF) # ori $a0, $a0, 0xa01 -/* B0C814 80095674 3C070030 */ lui $a3, 0x30 -/* B0C818 80095678 244E0008 */ addiu $t6, $v0, 8 -/* B0C81C 8009567C ACAE02C0 */ sw $t6, 0x2c0($a1) -/* B0C820 80095680 8D2F0000 */ lw $t7, ($t1) -/* B0C824 80095684 AC480004 */ sw $t0, 4($v0) -/* B0C828 80095688 3C08F600 */ lui $t0, 0xf600 -/* B0C82C 8009568C 25F8FFFF */ addiu $t8, $t7, -1 -/* B0C830 80095690 33190FFF */ andi $t9, $t8, 0xfff -/* B0C834 80095694 032B7025 */ or $t6, $t9, $t3 -/* B0C838 80095698 AC4E0000 */ sw $t6, ($v0) -/* B0C83C 8009569C 8CA202C0 */ lw $v0, 0x2c0($a1) -/* B0C840 800956A0 3C19E200 */ lui $t9, (0xE200001C >> 16) # lui $t9, 0xe200 -/* B0C844 800956A4 3739001C */ ori $t9, (0xE200001C & 0xFFFF) # ori $t9, $t9, 0x1c -/* B0C848 800956A8 244F0008 */ addiu $t7, $v0, 8 -/* B0C84C 800956AC ACAF02C0 */ sw $t7, 0x2c0($a1) -/* B0C850 800956B0 AC470004 */ sw $a3, 4($v0) -/* B0C854 800956B4 AC440000 */ sw $a0, ($v0) -/* B0C858 800956B8 8CA202C0 */ lw $v0, 0x2c0($a1) -/* B0C85C 800956BC 3C0FF700 */ lui $t7, 0xf700 -/* B0C860 800956C0 314603FF */ andi $a2, $t2, 0x3ff -/* B0C864 800956C4 24580008 */ addiu $t8, $v0, 8 -/* B0C868 800956C8 ACB802C0 */ sw $t8, 0x2c0($a1) -/* B0C86C 800956CC AC400004 */ sw $zero, 4($v0) -/* B0C870 800956D0 AC590000 */ sw $t9, ($v0) -/* B0C874 800956D4 8CA202C0 */ lw $v0, 0x2c0($a1) -/* B0C878 800956D8 3C18FFFC */ lui $t8, (0xFFFCFFFC >> 16) # lui $t8, 0xfffc -/* B0C87C 800956DC 3718FFFC */ ori $t8, (0xFFFCFFFC & 0xFFFF) # ori $t8, $t8, 0xfffc -/* B0C880 800956E0 244E0008 */ addiu $t6, $v0, 8 -/* B0C884 800956E4 ACAE02C0 */ sw $t6, 0x2c0($a1) -/* B0C888 800956E8 AC580004 */ sw $t8, 4($v0) -/* B0C88C 800956EC AC4F0000 */ sw $t7, ($v0) -/* B0C890 800956F0 8CA202C0 */ lw $v0, 0x2c0($a1) -/* B0C894 800956F4 00063080 */ sll $a2, $a2, 2 -/* B0C898 800956F8 01806825 */ move $t5, $t4 -/* B0C89C 800956FC 24590008 */ addiu $t9, $v0, 8 -/* B0C8A0 80095700 ACB902C0 */ sw $t9, 0x2c0($a1) -/* B0C8A4 80095704 8D2E0000 */ lw $t6, ($t1) -/* B0C8A8 80095708 3C0CE700 */ lui $t4, 0xe700 -/* B0C8AC 8009570C 25CFFFFF */ addiu $t7, $t6, -1 -/* B0C8B0 80095710 31F803FF */ andi $t8, $t7, 0x3ff -/* B0C8B4 80095714 3C0F8013 */ lui $t7, %hi(gScreenHeight) # $t7, 0x8013 -/* B0C8B8 80095718 8DEFD274 */ lw $t7, %lo(gScreenHeight)($t7) -/* B0C8BC 8009571C 0018CB80 */ sll $t9, $t8, 0xe -/* B0C8C0 80095720 03287025 */ or $t6, $t9, $t0 -/* B0C8C4 80095724 01EAC023 */ subu $t8, $t7, $t2 -/* B0C8C8 80095728 2719FFFF */ addiu $t9, $t8, -1 -/* B0C8CC 8009572C 332F03FF */ andi $t7, $t9, 0x3ff -/* B0C8D0 80095730 000FC080 */ sll $t8, $t7, 2 -/* B0C8D4 80095734 01D8C825 */ or $t9, $t6, $t8 -/* B0C8D8 80095738 AC590000 */ sw $t9, ($v0) -/* B0C8DC 8009573C AC460004 */ sw $a2, 4($v0) -/* B0C8E0 80095740 8CA202C0 */ lw $v0, 0x2c0($a1) -/* B0C8E4 80095744 244F0008 */ addiu $t7, $v0, 8 -/* B0C8E8 80095748 ACAF02C0 */ sw $t7, 0x2c0($a1) -/* B0C8EC 8009574C AC400004 */ sw $zero, 4($v0) -/* B0C8F0 80095750 AC4C0000 */ sw $t4, ($v0) -/* B0C8F4 80095754 8CA202C0 */ lw $v0, 0x2c0($a1) -/* B0C8F8 80095758 244E0008 */ addiu $t6, $v0, 8 -/* B0C8FC 8009575C ACAE02C0 */ sw $t6, 0x2c0($a1) -/* B0C900 80095760 8D380000 */ lw $t8, ($t1) -/* B0C904 80095764 2719FFFF */ addiu $t9, $t8, -1 -/* B0C908 80095768 332F0FFF */ andi $t7, $t9, 0xfff -/* B0C90C 8009576C 01EB7025 */ or $t6, $t7, $t3 -/* B0C910 80095770 AC4E0000 */ sw $t6, ($v0) -/* B0C914 80095774 8CB802DC */ lw $t8, 0x2dc($a1) -/* B0C918 80095778 3C0EE200 */ lui $t6, (0xE200001C >> 16) # lui $t6, 0xe200 -/* B0C91C 8009577C 35CE001C */ ori $t6, (0xE200001C & 0xFFFF) # ori $t6, $t6, 0x1c -/* B0C920 80095780 AC580004 */ sw $t8, 4($v0) -/* B0C924 80095784 8CA202C0 */ lw $v0, 0x2c0($a1) -/* B0C928 80095788 3C0BF700 */ lui $t3, 0xf700 -/* B0C92C 8009578C 24590008 */ addiu $t9, $v0, 8 -/* B0C930 80095790 ACB902C0 */ sw $t9, 0x2c0($a1) -/* B0C934 80095794 AC470004 */ sw $a3, 4($v0) -/* B0C938 80095798 AC440000 */ sw $a0, ($v0) -/* B0C93C 8009579C 8CA202C0 */ lw $v0, 0x2c0($a1) -/* B0C940 800957A0 000DCA00 */ sll $t9, $t5, 8 -/* B0C944 800957A4 244F0008 */ addiu $t7, $v0, 8 -/* B0C948 800957A8 ACAF02C0 */ sw $t7, 0x2c0($a1) -/* B0C94C 800957AC AC400004 */ sw $zero, 4($v0) -/* B0C950 800957B0 AC4E0000 */ sw $t6, ($v0) -/* B0C954 800957B4 8CA202C0 */ lw $v0, 0x2c0($a1) -/* B0C958 800957B8 001F70C0 */ sll $t6, $ra, 3 -/* B0C95C 800957BC 332FF800 */ andi $t7, $t9, 0xf800 -/* B0C960 800957C0 24580008 */ addiu $t8, $v0, 8 -/* B0C964 800957C4 ACB802C0 */ sw $t8, 0x2c0($a1) -/* B0C968 800957C8 31D807C0 */ andi $t8, $t6, 0x7c0 -/* B0C96C 800957CC AC4B0000 */ sw $t3, ($v0) -/* B0C970 800957D0 8FAE0020 */ lw $t6, 0x20($sp) -/* B0C974 800957D4 01F8C825 */ or $t9, $t7, $t8 -/* B0C978 800957D8 000E7883 */ sra $t7, $t6, 2 -/* B0C97C 800957DC 31F8003E */ andi $t8, $t7, 0x3e -/* B0C980 800957E0 03382025 */ or $a0, $t9, $t8 -/* B0C984 800957E4 34840001 */ ori $a0, (0xE3000001 & 0xFFFF) # ori $a0, $a0, 1 -/* B0C988 800957E8 00047400 */ sll $t6, $a0, 0x10 -/* B0C98C 800957EC 01C43825 */ or $a3, $t6, $a0 -/* B0C990 800957F0 AC470004 */ sw $a3, 4($v0) -/* B0C994 800957F4 8CA202C0 */ lw $v0, 0x2c0($a1) -/* B0C998 800957F8 3C048013 */ lui $a0, %hi(gScreenHeight) # $a0, 0x8013 -/* B0C99C 800957FC 2484D274 */ addiu $a0, %lo(gScreenHeight) # addiu $a0, $a0, -0x2d8c -/* B0C9A0 80095800 244F0008 */ addiu $t7, $v0, 8 -/* B0C9A4 80095804 ACAF02C0 */ sw $t7, 0x2c0($a1) -/* B0C9A8 80095808 8D390000 */ lw $t9, ($t1) -/* B0C9AC 8009580C 2738FFFF */ addiu $t8, $t9, -1 -/* B0C9B0 80095810 330E03FF */ andi $t6, $t8, 0x3ff -/* B0C9B4 80095814 8C980000 */ lw $t8, ($a0) -/* B0C9B8 80095818 000E7B80 */ sll $t7, $t6, 0xe -/* B0C9BC 8009581C 01E8C825 */ or $t9, $t7, $t0 -/* B0C9C0 80095820 030A7023 */ subu $t6, $t8, $t2 -/* B0C9C4 80095824 25CFFFFF */ addiu $t7, $t6, -1 -/* B0C9C8 80095828 31F803FF */ andi $t8, $t7, 0x3ff -/* B0C9CC 8009582C 00187080 */ sll $t6, $t8, 2 -/* B0C9D0 80095830 032E7825 */ or $t7, $t9, $t6 -/* B0C9D4 80095834 AC4F0000 */ sw $t7, ($v0) -/* B0C9D8 80095838 AC460004 */ sw $a2, 4($v0) -/* B0C9DC 8009583C 8CA202C0 */ lw $v0, 0x2c0($a1) -/* B0C9E0 80095840 24580008 */ addiu $t8, $v0, 8 -/* B0C9E4 80095844 ACB802C0 */ sw $t8, 0x2c0($a1) -/* B0C9E8 80095848 AC400004 */ sw $zero, 4($v0) -/* B0C9EC 8009584C 19400040 */ blez $t2, .L80095950 -/* B0C9F0 80095850 AC4C0000 */ sw $t4, ($v0) -/* B0C9F4 80095854 8CA202B0 */ lw $v0, 0x2b0($a1) -/* B0C9F8 80095858 3C0FE300 */ lui $t7, (0xE3000A01 >> 16) # lui $t7, 0xe300 -/* B0C9FC 8009585C 35EF0A01 */ ori $t7, (0xE3000A01 & 0xFFFF) # ori $t7, $t7, 0xa01 -/* B0CA00 80095860 24590008 */ addiu $t9, $v0, 8 -/* B0CA04 80095864 ACB902B0 */ sw $t9, 0x2b0($a1) -/* B0CA08 80095868 AC400004 */ sw $zero, 4($v0) -/* B0CA0C 8009586C AC4C0000 */ sw $t4, ($v0) -/* B0CA10 80095870 8CA202B0 */ lw $v0, 0x2b0($a1) -/* B0CA14 80095874 3C180030 */ lui $t8, 0x30 -/* B0CA18 80095878 244E0008 */ addiu $t6, $v0, 8 -/* B0CA1C 8009587C ACAE02B0 */ sw $t6, 0x2b0($a1) -/* B0CA20 80095880 AC580004 */ sw $t8, 4($v0) -/* B0CA24 80095884 AC4F0000 */ sw $t7, ($v0) -/* B0CA28 80095888 8CA202B0 */ lw $v0, 0x2b0($a1) -/* B0CA2C 8009588C 3C0EE200 */ lui $t6, (0xE200001C >> 16) # lui $t6, 0xe200 -/* B0CA30 80095890 35CE001C */ ori $t6, (0xE200001C & 0xFFFF) # ori $t6, $t6, 0x1c -/* B0CA34 80095894 24590008 */ addiu $t9, $v0, 8 -/* B0CA38 80095898 ACB902B0 */ sw $t9, 0x2b0($a1) -/* B0CA3C 8009589C AC400004 */ sw $zero, 4($v0) -/* B0CA40 800958A0 AC4E0000 */ sw $t6, ($v0) -/* B0CA44 800958A4 8CA202B0 */ lw $v0, 0x2b0($a1) -/* B0CA48 800958A8 244F0008 */ addiu $t7, $v0, 8 -/* B0CA4C 800958AC ACAF02B0 */ sw $t7, 0x2b0($a1) -/* B0CA50 800958B0 AC470004 */ sw $a3, 4($v0) -/* B0CA54 800958B4 AC4B0000 */ sw $t3, ($v0) -/* B0CA58 800958B8 8CA202B0 */ lw $v0, 0x2b0($a1) -/* B0CA5C 800958BC 24580008 */ addiu $t8, $v0, 8 -/* B0CA60 800958C0 ACB802B0 */ sw $t8, 0x2b0($a1) -/* B0CA64 800958C4 8D390000 */ lw $t9, ($t1) -/* B0CA68 800958C8 AC400004 */ sw $zero, 4($v0) -/* B0CA6C 800958CC 272EFFFF */ addiu $t6, $t9, -1 -/* B0CA70 800958D0 31CF03FF */ andi $t7, $t6, 0x3ff -/* B0CA74 800958D4 000FC380 */ sll $t8, $t7, 0xe -/* B0CA78 800958D8 254EFFFF */ addiu $t6, $t2, -1 -/* B0CA7C 800958DC 31CF03FF */ andi $t7, $t6, 0x3ff -/* B0CA80 800958E0 0308C825 */ or $t9, $t8, $t0 -/* B0CA84 800958E4 000FC080 */ sll $t8, $t7, 2 -/* B0CA88 800958E8 03387025 */ or $t6, $t9, $t8 -/* B0CA8C 800958EC AC4E0000 */ sw $t6, ($v0) -/* B0CA90 800958F0 8CA202B0 */ lw $v0, 0x2b0($a1) -/* B0CA94 800958F4 244F0008 */ addiu $t7, $v0, 8 -/* B0CA98 800958F8 ACAF02B0 */ sw $t7, 0x2b0($a1) -/* B0CA9C 800958FC 8D390000 */ lw $t9, ($t1) -/* B0CAA0 80095900 2738FFFF */ addiu $t8, $t9, -1 -/* B0CAA4 80095904 330E03FF */ andi $t6, $t8, 0x3ff -/* B0CAA8 80095908 8C980000 */ lw $t8, ($a0) -/* B0CAAC 8009590C 000E7B80 */ sll $t7, $t6, 0xe -/* B0CAB0 80095910 01E8C825 */ or $t9, $t7, $t0 -/* B0CAB4 80095914 270EFFFF */ addiu $t6, $t8, -1 -/* B0CAB8 80095918 31CF03FF */ andi $t7, $t6, 0x3ff -/* B0CABC 8009591C 000FC080 */ sll $t8, $t7, 2 -/* B0CAC0 80095920 03387025 */ or $t6, $t9, $t8 -/* B0CAC4 80095924 AC4E0000 */ sw $t6, ($v0) -/* B0CAC8 80095928 8C8F0000 */ lw $t7, ($a0) -/* B0CACC 8009592C 01EAC823 */ subu $t9, $t7, $t2 -/* B0CAD0 80095930 333803FF */ andi $t8, $t9, 0x3ff -/* B0CAD4 80095934 00187080 */ sll $t6, $t8, 2 -/* B0CAD8 80095938 AC4E0004 */ sw $t6, 4($v0) -/* B0CADC 8009593C 8CA202B0 */ lw $v0, 0x2b0($a1) -/* B0CAE0 80095940 244F0008 */ addiu $t7, $v0, 8 -/* B0CAE4 80095944 ACAF02B0 */ sw $t7, 0x2b0($a1) -/* B0CAE8 80095948 AC400004 */ sw $zero, 4($v0) -/* B0CAEC 8009594C AC4C0000 */ sw $t4, ($v0) -.L80095950: -/* B0CAF0 80095950 3C068014 */ lui $a2, %hi(D_8013EF04) # $a2, 0x8014 -/* B0CAF4 80095954 24C6EF04 */ addiu $a2, %lo(D_8013EF04) # addiu $a2, $a2, -0x10fc -/* B0CAF8 80095958 27A400B4 */ addiu $a0, $sp, 0xb4 -/* B0CAFC 8009595C 0C031AD5 */ jal func_800C6B54 -/* B0CB00 80095960 240709C1 */ li $a3, 2497 -/* B0CB04 80095964 8FBF0014 */ lw $ra, 0x14($sp) -/* B0CB08 80095968 27BD00C8 */ addiu $sp, $sp, 0xc8 -/* B0CB0C 8009596C 03E00008 */ jr $ra -/* B0CB10 80095970 00000000 */ nop - diff --git a/asm/non_matchings/code/z_rcp/func_80095974.s b/asm/non_matchings/code/z_rcp/func_80095974.s deleted file mode 100644 index 97b6d642ef..0000000000 --- a/asm/non_matchings/code/z_rcp/func_80095974.s +++ /dev/null @@ -1,84 +0,0 @@ -.rdata -glabel D_8013EF10 - .asciz "../z_rcp.c" - .balign 4 - -glabel D_8013EF1C - .asciz "../z_rcp.c" - .balign 4 - -.text -glabel func_80095974 -/* B0CB14 80095974 27BDFFC0 */ addiu $sp, $sp, -0x40 -/* B0CB18 80095978 AFBF0014 */ sw $ra, 0x14($sp) -/* B0CB1C 8009597C 00802825 */ move $a1, $a0 -/* B0CB20 80095980 3C068014 */ lui $a2, %hi(D_8013EF10) # $a2, 0x8014 -/* B0CB24 80095984 24C6EF10 */ addiu $a2, %lo(D_8013EF10) # addiu $a2, $a2, -0x10f0 -/* B0CB28 80095988 AFA50040 */ sw $a1, 0x40($sp) -/* B0CB2C 8009598C 27A4002C */ addiu $a0, $sp, 0x2c -/* B0CB30 80095990 0C031AB1 */ jal func_800C6AC4 -/* B0CB34 80095994 240709C7 */ li $a3, 2503 -/* B0CB38 80095998 8FA50040 */ lw $a1, 0x40($sp) -/* B0CB3C 8009599C 3C188012 */ lui $t8, %hi(D_80126FD0) # $t8, 0x8012 -/* B0CB40 800959A0 27186FD0 */ addiu $t8, %lo(D_80126FD0) # addiu $t8, $t8, 0x6fd0 -/* B0CB44 800959A4 8CA202C0 */ lw $v0, 0x2c0($a1) -/* B0CB48 800959A8 3C0FDE00 */ lui $t7, 0xde00 -/* B0CB4C 800959AC 3C048013 */ lui $a0, %hi(gScreenWidth) # $a0, 0x8013 -/* B0CB50 800959B0 244E0008 */ addiu $t6, $v0, 8 -/* B0CB54 800959B4 ACAE02C0 */ sw $t6, 0x2c0($a1) -/* B0CB58 800959B8 AC580004 */ sw $t8, 4($v0) -/* B0CB5C 800959BC AC4F0000 */ sw $t7, ($v0) -/* B0CB60 800959C0 8CA202C0 */ lw $v0, 0x2c0($a1) -/* B0CB64 800959C4 3C08ED00 */ li $t0, 0xED000000 # 0.000000 -/* B0CB68 800959C8 2484D270 */ addiu $a0, %lo(gScreenWidth) # addiu $a0, $a0, -0x2d90 -/* B0CB6C 800959CC 24590008 */ addiu $t9, $v0, 8 -/* B0CB70 800959D0 ACB902C0 */ sw $t9, 0x2c0($a1) -/* B0CB74 800959D4 AC480000 */ sw $t0, ($v0) -/* B0CB78 800959D8 8C890000 */ lw $t1, ($a0) -/* B0CB7C 800959DC 3C0E8013 */ lui $t6, %hi(gScreenHeight) -/* B0CB80 800959E0 8DCED274 */ lw $t6, %lo(gScreenHeight)($t6) -/* B0CB84 800959E4 44892000 */ mtc1 $t1, $f4 -/* B0CB88 800959E8 3C014080 */ li $at, 0x40800000 # 0.000000 -/* B0CB8C 800959EC 448E8000 */ mtc1 $t6, $f16 -/* B0CB90 800959F0 468021A0 */ cvt.s.w $f6, $f4 -/* B0CB94 800959F4 44810000 */ mtc1 $at, $f0 -/* B0CB98 800959F8 3C0AFE00 */ lui $t2, 0xfe00 -/* B0CB9C 800959FC 3C01FF10 */ lui $at, 0xff10 -/* B0CBA0 80095A00 3C068014 */ lui $a2, %hi(D_8013EF1C) # $a2, 0x8014 -/* B0CBA4 80095A04 468084A0 */ cvt.s.w $f18, $f16 -/* B0CBA8 80095A08 46003202 */ mul.s $f8, $f6, $f0 -/* B0CBAC 80095A0C 24C6EF1C */ addiu $a2, %lo(D_8013EF1C) # addiu $a2, $a2, -0x10e4 -/* B0CBB0 80095A10 240709D1 */ li $a3, 2513 -/* B0CBB4 80095A14 46009102 */ mul.s $f4, $f18, $f0 -/* B0CBB8 80095A18 4600428D */ trunc.w.s $f10, $f8 -/* B0CBBC 80095A1C 4600218D */ trunc.w.s $f6, $f4 -/* B0CBC0 80095A20 440B5000 */ mfc1 $t3, $f10 -/* B0CBC4 80095A24 44183000 */ mfc1 $t8, $f6 -/* B0CBC8 80095A28 316C0FFF */ andi $t4, $t3, 0xfff -/* B0CBCC 80095A2C 000C6B00 */ sll $t5, $t4, 0xc -/* B0CBD0 80095A30 33190FFF */ andi $t9, $t8, 0xfff -/* B0CBD4 80095A34 01B94025 */ or $t0, $t5, $t9 -/* B0CBD8 80095A38 AC480004 */ sw $t0, 4($v0) -/* B0CBDC 80095A3C 8CA202C0 */ lw $v0, 0x2c0($a1) -/* B0CBE0 80095A40 3C0B8017 */ lui $t3, %hi(D_801759C0) # $t3, 0x8017 -/* B0CBE4 80095A44 256B59C0 */ addiu $t3, %lo(D_801759C0) # addiu $t3, $t3, 0x59c0 -/* B0CBE8 80095A48 24490008 */ addiu $t1, $v0, 8 -/* B0CBEC 80095A4C ACA902C0 */ sw $t1, 0x2c0($a1) -/* B0CBF0 80095A50 AC4B0004 */ sw $t3, 4($v0) -/* B0CBF4 80095A54 AC4A0000 */ sw $t2, ($v0) -/* B0CBF8 80095A58 8CA202C0 */ lw $v0, 0x2c0($a1) -/* B0CBFC 80095A5C 244C0008 */ addiu $t4, $v0, 8 -/* B0CC00 80095A60 ACAC02C0 */ sw $t4, 0x2c0($a1) -/* B0CC04 80095A64 8C8E0000 */ lw $t6, ($a0) -/* B0CC08 80095A68 27A4002C */ addiu $a0, $sp, 0x2c -/* B0CC0C 80095A6C 25CFFFFF */ addiu $t7, $t6, -1 -/* B0CC10 80095A70 31F80FFF */ andi $t8, $t7, 0xfff -/* B0CC14 80095A74 03016825 */ or $t5, $t8, $at -/* B0CC18 80095A78 AC4D0000 */ sw $t5, ($v0) -/* B0CC1C 80095A7C 8CB902DC */ lw $t9, 0x2dc($a1) -/* B0CC20 80095A80 0C031AD5 */ jal func_800C6B54 -/* B0CC24 80095A84 AC590004 */ sw $t9, 4($v0) -/* B0CC28 80095A88 8FBF0014 */ lw $ra, 0x14($sp) -/* B0CC2C 80095A8C 27BD0040 */ addiu $sp, $sp, 0x40 -/* B0CC30 80095A90 03E00008 */ jr $ra -/* B0CC34 80095A94 00000000 */ nop diff --git a/asm/non_matchings/code/z_room/func_80095D04.s b/asm/non_matchings/code/z_room/func_80095D04.s index a073b50d99..be9916ef29 100644 --- a/asm/non_matchings/code/z_room/func_80095D04.s +++ b/asm/non_matchings/code/z_room/func_80095D04.s @@ -31,7 +31,7 @@ glabel func_80095D04 /* B0CED0 80095D30 AFA000B4 */ sw $zero, 0xb4($sp) /* B0CED4 80095D34 27A4005C */ addiu $a0, $sp, 0x5c /* B0CED8 80095D38 2407011F */ li $a3, 287 -/* B0CEDC 80095D3C 0C031AB1 */ jal func_800C6AC4 +/* B0CEDC 80095D3C 0C031AB1 */ jal Graph_OpenDisps /* B0CEE0 80095D40 AFA5006C */ sw $a1, 0x6c($sp) /* B0CEE4 80095D44 32110001 */ andi $s1, $s0, 1 /* B0CEE8 80095D48 8FA9006C */ lw $t1, 0x6c($sp) @@ -367,7 +367,7 @@ glabel func_80095D04 /* B0D3B0 80096210 24C6EF80 */ addiu $a2, %lo(D_8013EF80) # addiu $a2, $a2, -0x1080 /* B0D3B4 80096214 27A4005C */ addiu $a0, $sp, 0x5c /* B0D3B8 80096218 240701AE */ li $a3, 430 -/* B0D3BC 8009621C 0C031AD5 */ jal func_800C6B54 +/* B0D3BC 8009621C 0C031AD5 */ jal Graph_CloseDisps /* B0D3C0 80096220 8DC50000 */ lw $a1, ($t6) /* B0D3C4 80096224 8FBF001C */ lw $ra, 0x1c($sp) /* B0D3C8 80096228 8FB00014 */ lw $s0, 0x14($sp) diff --git a/asm/non_matchings/code/z_room/func_80096B6C.s b/asm/non_matchings/code/z_room/func_80096B6C.s index dd8e978216..283f293554 100644 --- a/asm/non_matchings/code/z_room/func_80096B6C.s +++ b/asm/non_matchings/code/z_room/func_80096B6C.s @@ -33,7 +33,7 @@ glabel func_80096B6C /* B0DD2C 80096B8C 24C6F0FC */ addiu $a2, %lo(D_8013F0FC) # addiu $a2, $a2, -0xf04 /* B0DD30 80096B90 27A40078 */ addiu $a0, $sp, 0x78 /* B0DD34 80096B94 240702F0 */ li $a3, 752 -/* B0DD38 80096B98 0C031AB1 */ jal func_800C6AC4 +/* B0DD38 80096B98 0C031AB1 */ jal Graph_OpenDisps /* B0DD3C 80096B9C 00A08025 */ move $s0, $a1 /* B0DD40 80096BA0 8FA500B0 */ lw $a1, 0xb0($sp) /* B0DD44 80096BA4 8FAC00B4 */ lw $t4, 0xb4($sp) @@ -224,7 +224,7 @@ glabel func_80096B6C /* B0E010 80096E70 AE0A02C0 */ sw $t2, 0x2c0($s0) /* B0E014 80096E74 AF2B0000 */ sw $t3, ($t9) /* B0E018 80096E78 AFB90058 */ sw $t9, 0x58($sp) -/* B0E01C 80096E7C 0C034B88 */ jal func_800D2E20 +/* B0E01C 80096E7C 0C034B88 */ jal SysUcode_GetUcodeData /* B0E020 80096E80 AFA80048 */ sw $t0, 0x48($sp) /* B0E024 80096E84 8FA40058 */ lw $a0, 0x58($sp) /* B0E028 80096E88 3C0DDD00 */ lui $t5, (0xDD0007FF >> 16) # lui $t5, 0xdd00 @@ -234,7 +234,7 @@ glabel func_80096B6C /* B0E038 80096E98 246C0008 */ addiu $t4, $v1, 8 /* B0E03C 80096E9C AE0C02C0 */ sw $t4, 0x2c0($s0) /* B0E040 80096EA0 AC6D0000 */ sw $t5, ($v1) -/* B0E044 80096EA4 0C034B85 */ jal func_800D2E14 +/* B0E044 80096EA4 0C034B85 */ jal SysUcode_GetUcode /* B0E048 80096EA8 AFA30058 */ sw $v1, 0x58($sp) /* B0E04C 80096EAC 8FA40058 */ lw $a0, 0x58($sp) /* B0E050 80096EB0 8FA80048 */ lw $t0, 0x48($sp) @@ -279,7 +279,7 @@ glabel func_80096B6C /* B0E0E4 80096F44 24C6F108 */ addiu $a2, %lo(D_8013F108) # addiu $a2, $a2, -0xef8 /* B0E0E8 80096F48 27A40078 */ addiu $a0, $sp, 0x78 /* B0E0EC 80096F4C 24070333 */ li $a3, 819 -/* B0E0F0 80096F50 0C031AD5 */ jal func_800C6B54 +/* B0E0F0 80096F50 0C031AD5 */ jal Graph_CloseDisps /* B0E0F4 80096F54 8F250000 */ lw $a1, ($t9) /* B0E0F8 80096F58 8FBF003C */ lw $ra, 0x3c($sp) /* B0E0FC 80096F5C 8FB00038 */ lw $s0, 0x38($sp) diff --git a/asm/non_matchings/code/z_sample/func_80097604.s b/asm/non_matchings/code/z_sample/Sample_Draw.s similarity index 97% rename from asm/non_matchings/code/z_sample/func_80097604.s rename to asm/non_matchings/code/z_sample/Sample_Draw.s index d00da8bad3..b3c4c8e967 100644 --- a/asm/non_matchings/code/z_sample/func_80097604.s +++ b/asm/non_matchings/code/z_sample/Sample_Draw.s @@ -8,7 +8,7 @@ glabel D_8013F2D0 .balign 4 .text -glabel func_80097604 +glabel Sample_Draw /* B0E7A4 80097604 27BDFF90 */ addiu $sp, $sp, -0x70 /* B0E7A8 80097608 AFBF002C */ sw $ra, 0x2c($sp) /* B0E7AC 8009760C AFB00028 */ sw $s0, 0x28($sp) @@ -18,7 +18,7 @@ glabel func_80097604 /* B0E7BC 8009761C 24C6F2C0 */ addiu $a2, %lo(D_8013F2C0) # addiu $a2, $a2, -0xd40 /* B0E7C0 80097620 27A40054 */ addiu $a0, $sp, 0x54 /* B0E7C4 80097624 2407003E */ li $a3, 62 -/* B0E7C8 80097628 0C031AB1 */ jal func_800C6AC4 +/* B0E7C8 80097628 0C031AB1 */ jal Graph_OpenDisps /* B0E7CC 8009762C 02002825 */ move $a1, $s0 /* B0E7D0 80097630 8E0202C0 */ lw $v0, 0x2c0($s0) /* B0E7D4 80097634 3C18DB06 */ lui $t8, 0xdb06 @@ -96,7 +96,7 @@ glabel func_80097604 /* B0E8F4 80097754 AFA00018 */ sw $zero, 0x18($sp) /* B0E8F8 80097758 AFA00014 */ sw $zero, 0x14($sp) /* B0E8FC 8009775C AFA00010 */ sw $zero, 0x10($sp) -/* B0E900 80097760 0C024DC2 */ jal func_80093708 +/* B0E900 80097760 0C024DC2 */ jal Gfx_SetFog2 /* B0E904 80097764 240700FF */ li $a3, 255 /* B0E908 80097768 AE0202C0 */ sw $v0, 0x2c0($s0) /* B0E90C 8009776C 0C024F46 */ jal func_80093D18 @@ -137,7 +137,7 @@ glabel func_80097604 /* B0E998 800977F8 02002825 */ move $a1, $s0 /* B0E99C 800977FC 2407006F */ li $a3, 111 /* B0E9A0 80097800 AC4B0004 */ sw $t3, 4($v0) -/* B0E9A4 80097804 0C031AD5 */ jal func_800C6B54 +/* B0E9A4 80097804 0C031AD5 */ jal Graph_CloseDisps /* B0E9A8 80097808 AC4A0000 */ sw $t2, ($v0) /* B0E9AC 8009780C 8FBF002C */ lw $ra, 0x2c($sp) /* B0E9B0 80097810 8FB00028 */ lw $s0, 0x28($sp) diff --git a/asm/non_matchings/code/z_sample/func_800975D0.s b/asm/non_matchings/code/z_sample/func_800975D0.s deleted file mode 100644 index 55ae52cfd8..0000000000 --- a/asm/non_matchings/code/z_sample/func_800975D0.s +++ /dev/null @@ -1,16 +0,0 @@ -glabel func_800975D0 -/* B0E770 800975D0 948E0020 */ lhu $t6, 0x20($a0) -/* B0E774 800975D4 2401EFFF */ li $at, -4097 -/* B0E778 800975D8 3C18800C */ lui $t8, %hi(func_800BCA64) # $t8, 0x800c -/* B0E77C 800975DC 01C17827 */ nor $t7, $t6, $at -/* B0E780 800975E0 15E00006 */ bnez $t7, .L800975FC -/* B0E784 800975E4 2718CA64 */ addiu $t8, %lo(func_800BCA64) # addiu $t8, $t8, -0x359c -/* B0E788 800975E8 3C190001 */ lui $t9, (0x00012518 >> 16) # lui $t9, 1 -/* B0E78C 800975EC 37392518 */ ori $t9, (0x00012518 & 0xFFFF) # ori $t9, $t9, 0x2518 -/* B0E790 800975F0 AC990010 */ sw $t9, 0x10($a0) -/* B0E794 800975F4 AC98000C */ sw $t8, 0xc($a0) -/* B0E798 800975F8 AC800098 */ sw $zero, 0x98($a0) -.L800975FC: -/* B0E79C 800975FC 03E00008 */ jr $ra -/* B0E7A0 80097600 00000000 */ nop - diff --git a/asm/non_matchings/code/z_sample/func_80097820.s b/asm/non_matchings/code/z_sample/func_80097820.s deleted file mode 100644 index bc130040d0..0000000000 --- a/asm/non_matchings/code/z_sample/func_80097820.s +++ /dev/null @@ -1,12 +0,0 @@ -glabel func_80097820 -/* B0E9C0 80097820 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* B0E9C4 80097824 AFBF0014 */ sw $ra, 0x14($sp) -/* B0E9C8 80097828 0C025D81 */ jal func_80097604 -/* B0E9CC 8009782C AFA40018 */ sw $a0, 0x18($sp) -/* B0E9D0 80097830 0C025D74 */ jal func_800975D0 -/* B0E9D4 80097834 8FA40018 */ lw $a0, 0x18($sp) -/* B0E9D8 80097838 8FBF0014 */ lw $ra, 0x14($sp) -/* B0E9DC 8009783C 27BD0018 */ addiu $sp, $sp, 0x18 -/* B0E9E0 80097840 03E00008 */ jr $ra -/* B0E9E4 80097844 00000000 */ nop - diff --git a/asm/non_matchings/code/z_sample/func_80097848.s b/asm/non_matchings/code/z_sample/func_80097848.s deleted file mode 100644 index 6b04677c80..0000000000 --- a/asm/non_matchings/code/z_sample/func_80097848.s +++ /dev/null @@ -1,4 +0,0 @@ -glabel func_80097848 -/* B0E9E8 80097848 03E00008 */ jr $ra -/* B0E9EC 8009784C AFA40000 */ sw $a0, ($sp) - diff --git a/asm/non_matchings/code/z_sample/func_80097850.s b/asm/non_matchings/code/z_sample/func_80097850.s deleted file mode 100644 index 6e99b41be4..0000000000 --- a/asm/non_matchings/code/z_sample/func_80097850.s +++ /dev/null @@ -1,52 +0,0 @@ -.late_rodata -glabel D_8013F300 - .float 3000 - -.text -glabel func_80097850 -/* B0E9F0 80097850 27BDFFA0 */ addiu $sp, $sp, -0x60 -/* B0E9F4 80097854 AFB00018 */ sw $s0, 0x18($sp) -/* B0E9F8 80097858 AFBF001C */ sw $ra, 0x1c($sp) -/* B0E9FC 8009785C 8C850000 */ lw $a1, ($a0) -/* B0EA00 80097860 249000A8 */ addiu $s0, $a0, 0xa8 -/* B0EA04 80097864 0C02A89E */ jal func_800AA278 -/* B0EA08 80097868 02002025 */ move $a0, $s0 -/* B0EA0C 8009786C 240E00F0 */ li $t6, 240 -/* B0EA10 80097870 240F0140 */ li $t7, 320 -/* B0EA14 80097874 AFAF0054 */ sw $t7, 0x54($sp) -/* B0EA18 80097878 AFAE004C */ sw $t6, 0x4c($sp) -/* B0EA1C 8009787C AFA00048 */ sw $zero, 0x48($sp) -/* B0EA20 80097880 AFA00050 */ sw $zero, 0x50($sp) -/* B0EA24 80097884 02002025 */ move $a0, $s0 -/* B0EA28 80097888 0C02A93F */ jal func_800AA4FC -/* B0EA2C 8009788C 27A50048 */ addiu $a1, $sp, 0x48 -/* B0EA30 80097890 02002025 */ move $a0, $s0 -/* B0EA34 80097894 3C054270 */ lui $a1, 0x4270 -/* B0EA38 80097898 3C064120 */ lui $a2, 0x4120 -/* B0EA3C 8009789C 0C02A918 */ jal func_800AA460 -/* B0EA40 800978A0 3C074648 */ li $a3, 0x46480000 # 0.000000 -/* B0EA44 800978A4 44800000 */ mtc1 $zero, $f0 -/* B0EA48 800978A8 3C018014 */ lui $at, %hi(D_8013F300) -/* B0EA4C 800978AC C424F300 */ lwc1 $f4, %lo(D_8013F300)($at) -/* B0EA50 800978B0 3C013F80 */ li $at, 0x3F800000 # 0.000000 -/* B0EA54 800978B4 44813000 */ mtc1 $at, $f6 -/* B0EA58 800978B8 02002025 */ move $a0, $s0 -/* B0EA5C 800978BC 27A5003C */ addiu $a1, $sp, 0x3c -/* B0EA60 800978C0 27A60030 */ addiu $a2, $sp, 0x30 -/* B0EA64 800978C4 27A70024 */ addiu $a3, $sp, 0x24 -/* B0EA68 800978C8 E7A0003C */ swc1 $f0, 0x3c($sp) -/* B0EA6C 800978CC E7A00040 */ swc1 $f0, 0x40($sp) -/* B0EA70 800978D0 E7A00030 */ swc1 $f0, 0x30($sp) -/* B0EA74 800978D4 E7A00034 */ swc1 $f0, 0x34($sp) -/* B0EA78 800978D8 E7A00038 */ swc1 $f0, 0x38($sp) -/* B0EA7C 800978DC E7A00024 */ swc1 $f0, 0x24($sp) -/* B0EA80 800978E0 E7A0002C */ swc1 $f0, 0x2c($sp) -/* B0EA84 800978E4 E7A40044 */ swc1 $f4, 0x44($sp) -/* B0EA88 800978E8 0C02A8D6 */ jal func_800AA358 -/* B0EA8C 800978EC E7A60028 */ swc1 $f6, 0x28($sp) -/* B0EA90 800978F0 8FBF001C */ lw $ra, 0x1c($sp) -/* B0EA94 800978F4 8FB00018 */ lw $s0, 0x18($sp) -/* B0EA98 800978F8 27BD0060 */ addiu $sp, $sp, 0x60 -/* B0EA9C 800978FC 03E00008 */ jr $ra -/* B0EAA0 80097900 00000000 */ nop - diff --git a/asm/non_matchings/code/z_sample/func_80097904.s b/asm/non_matchings/code/z_sample/func_80097904.s deleted file mode 100644 index 359cf0b232..0000000000 --- a/asm/non_matchings/code/z_sample/func_80097904.s +++ /dev/null @@ -1,40 +0,0 @@ -.rdata -glabel D_8013F2E0 - .asciz "../z_sample.c" - .balign 4 - -glabel D_8013F2F0 - .asciz "../z_sample.c" - .balign 4 - -.text -glabel func_80097904 -/* B0EAA4 80097904 3C0E01AF */ lui $t6, %hi(_title_staticSegmentRomEnd) # $t6, 0x1af -/* B0EAA8 80097908 3C0F01AA */ lui $t7, %hi(_title_staticSegmentRomStart) # $t7, 0x1aa -/* B0EAAC 8009790C 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* B0EAB0 80097910 25EF4000 */ addiu $t7, %lo(_title_staticSegmentRomStart) # addiu $t7, $t7, 0x4000 -/* B0EAB4 80097914 25CEB440 */ addiu $t6, %lo(_title_staticSegmentRomEnd) # addiu $t6, $t6, -0x4bc0 -/* B0EAB8 80097918 AFBF001C */ sw $ra, 0x1c($sp) -/* B0EABC 8009791C 01CF2823 */ subu $a1, $t6, $t7 -/* B0EAC0 80097920 3C068014 */ lui $a2, %hi(D_8013F2E0) # $a2, 0x8014 -/* B0EAC4 80097924 AFA40028 */ sw $a0, 0x28($sp) -/* B0EAC8 80097928 24C6F2E0 */ addiu $a2, %lo(D_8013F2E0) # addiu $a2, $a2, -0xd20 -/* B0EACC 8009792C AFA50020 */ sw $a1, 0x20($sp) -/* B0EAD0 80097930 0C031521 */ jal Game_Alloc -/* B0EAD4 80097934 240700A3 */ li $a3, 163 -/* B0EAD8 80097938 8FB80028 */ lw $t8, 0x28($sp) -/* B0EADC 8009793C 3C0501AA */ lui $a1, %hi(_title_staticSegmentRomStart) # $a1, 0x1aa -/* B0EAE0 80097940 3C078014 */ lui $a3, %hi(D_8013F2F0) # $a3, 0x8014 -/* B0EAE4 80097944 241900A4 */ li $t9, 164 -/* B0EAE8 80097948 AF0200A4 */ sw $v0, 0xa4($t8) -/* B0EAEC 8009794C AFB90010 */ sw $t9, 0x10($sp) -/* B0EAF0 80097950 8FA60020 */ lw $a2, 0x20($sp) -/* B0EAF4 80097954 24E7F2F0 */ addiu $a3, %lo(D_8013F2F0) # addiu $a3, $a3, -0xd10 -/* B0EAF8 80097958 24A54000 */ addiu $a1, %lo(_title_staticSegmentRomStart) # addiu $a1, $a1, 0x4000 -/* B0EAFC 8009795C 0C0006A8 */ jal DmaMgr_SendRequest1 -/* B0EB00 80097960 00402025 */ move $a0, $v0 -/* B0EB04 80097964 8FBF001C */ lw $ra, 0x1c($sp) -/* B0EB08 80097968 27BD0028 */ addiu $sp, $sp, 0x28 -/* B0EB0C 8009796C 03E00008 */ jr $ra -/* B0EB10 80097970 00000000 */ nop - diff --git a/asm/non_matchings/code/z_sample/func_80097974.s b/asm/non_matchings/code/z_sample/func_80097974.s deleted file mode 100644 index 41bd087462..0000000000 --- a/asm/non_matchings/code/z_sample/func_80097974.s +++ /dev/null @@ -1,36 +0,0 @@ -glabel func_80097974 -/* B0EB14 80097974 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* B0EB18 80097978 AFBF0014 */ sw $ra, 0x14($sp) -/* B0EB1C 8009797C 3C0E8009 */ lui $t6, %hi(func_80097820) # $t6, 0x8009 -/* B0EB20 80097980 3C0F8009 */ lui $t7, %hi(func_80097848) # $t7, 0x8009 -/* B0EB24 80097984 3C028016 */ lui $v0, %hi(gGameInfo) # $v0, 0x8016 -/* B0EB28 80097988 25CE7820 */ addiu $t6, %lo(func_80097820) # addiu $t6, $t6, 0x7820 -/* B0EB2C 8009798C 25EF7848 */ addiu $t7, %lo(func_80097848) # addiu $t7, $t7, 0x7848 -/* B0EB30 80097990 2442FA90 */ addiu $v0, %lo(gGameInfo) # addiu $v0, $v0, -0x570 -/* B0EB34 80097994 AC8E0004 */ sw $t6, 4($a0) -/* B0EB38 80097998 AC8F0008 */ sw $t7, 8($a0) -/* B0EB3C 8009799C 8C590000 */ lw $t9, ($v0) -/* B0EB40 800979A0 24180001 */ li $t8, 1 -/* B0EB44 800979A4 A7380110 */ sh $t8, 0x110($t9) -/* B0EB48 800979A8 0C025E14 */ jal func_80097850 -/* B0EB4C 800979AC AFA40018 */ sw $a0, 0x18($sp) -/* B0EB50 800979B0 0C025E41 */ jal func_80097904 -/* B0EB54 800979B4 8FA40018 */ lw $a0, 0x18($sp) -/* B0EB58 800979B8 3C028016 */ lui $v0, %hi(gGameInfo) # $v0, 0x8016 -/* B0EB5C 800979BC 2442FA90 */ addiu $v0, %lo(gGameInfo) # addiu $v0, $v0, -0x570 -/* B0EB60 800979C0 8C480000 */ lw $t0, ($v0) -/* B0EB64 800979C4 A500011E */ sh $zero, 0x11e($t0) -/* B0EB68 800979C8 8C490000 */ lw $t1, ($v0) -/* B0EB6C 800979CC A5200120 */ sh $zero, 0x120($t1) -/* B0EB70 800979D0 8C4A0000 */ lw $t2, ($v0) -/* B0EB74 800979D4 A5400122 */ sh $zero, 0x122($t2) -/* B0EB78 800979D8 8C4B0000 */ lw $t3, ($v0) -/* B0EB7C 800979DC A5600124 */ sh $zero, 0x124($t3) -/* B0EB80 800979E0 8C4C0000 */ lw $t4, ($v0) -/* B0EB84 800979E4 A5800126 */ sh $zero, 0x126($t4) -/* B0EB88 800979E8 8C4D0000 */ lw $t5, ($v0) -/* B0EB8C 800979EC A5A00128 */ sh $zero, 0x128($t5) -/* B0EB90 800979F0 8FBF0014 */ lw $ra, 0x14($sp) -/* B0EB94 800979F4 27BD0018 */ addiu $sp, $sp, 0x18 -/* B0EB98 800979F8 03E00008 */ jr $ra -/* B0EB9C 800979FC 00000000 */ nop diff --git a/asm/non_matchings/code/z_scene_table/func_8009BEEC.s b/asm/non_matchings/code/z_scene_table/func_8009BEEC.s index b0d9726800..e3a4107e28 100644 --- a/asm/non_matchings/code/z_scene_table/func_8009BEEC.s +++ b/asm/non_matchings/code/z_scene_table/func_8009BEEC.s @@ -24,12 +24,12 @@ glabel func_8009BEEC /* B130C4 8009BF24 000FC080 */ sll $t8, $t7, 2 /* B130C8 8009BF28 0098C821 */ addu $t9, $a0, $t8 /* B130CC 8009BF2C 8F240790 */ lw $a0, 0x790($t9) -/* B130D0 8009BF30 0C024BE2 */ jal func_80092F88 +/* B130D0 8009BF30 0C024BE2 */ jal Quake_Add /* B130D4 8009BF34 AFA2002C */ sw $v0, 0x2c($sp) /* B130D8 8009BF38 00022400 */ sll $a0, $v0, 0x10 /* B130DC 8009BF3C AFA20034 */ sw $v0, 0x34($sp) /* B130E0 8009BF40 00042403 */ sra $a0, $a0, 0x10 -/* B130E4 8009BF44 0C024B6B */ jal func_80092DAC +/* B130E4 8009BF44 0C024B6B */ jal Quake_SetSpeed /* B130E8 8009BF48 24052710 */ li $a1, 10000 /* B130EC 8009BF4C 87B00036 */ lh $s0, 0x36($sp) /* B130F0 8009BF50 24050004 */ li $a1, 4 @@ -37,11 +37,11 @@ glabel func_8009BEEC /* B130F8 8009BF58 00102400 */ sll $a0, $s0, 0x10 /* B130FC 8009BF5C 00042403 */ sra $a0, $a0, 0x10 /* B13100 8009BF60 00003825 */ move $a3, $zero -/* B13104 8009BF64 0C024B9C */ jal func_80092E70 +/* B13104 8009BF64 0C024B9C */ jal Quake_SetQuakeValues /* B13108 8009BF68 AFA00010 */ sw $zero, 0x10($sp) /* B1310C 8009BF6C 00102400 */ sll $a0, $s0, 0x10 /* B13110 8009BF70 00042403 */ sra $a0, $a0, 0x10 -/* B13114 8009BF74 0C024B7C */ jal func_80092DF0 +/* B13114 8009BF74 0C024B7C */ jal Quake_SetCountdown /* B13118 8009BF78 2405007F */ li $a1, 127 /* B1311C 8009BF7C 8FA8002C */ lw $t0, 0x2c($sp) /* B13120 8009BF80 8D031DE4 */ lw $v1, 0x1de4($t0) @@ -61,7 +61,7 @@ glabel func_8009BEEC /* B13154 8009BFB4 24050003 */ li $a1, 3 /* B13158 8009BFB8 000A5880 */ sll $t3, $t2, 2 /* B1315C 8009BFBC 022B6021 */ addu $t4, $s1, $t3 -/* B13160 8009BFC0 0C024BE2 */ jal func_80092F88 +/* B13160 8009BFC0 0C024BE2 */ jal Quake_Add /* B13164 8009BFC4 8D840790 */ lw $a0, 0x790($t4) /* B13168 8009BFC8 0C03F66B */ jal Math_Rand_ZeroOne /* B1316C 8009BFCC AFA20034 */ sw $v0, 0x34($sp) @@ -78,7 +78,7 @@ glabel func_8009BEEC /* B13198 8009BFF8 44059000 */ mfc1 $a1, $f18 /* B1319C 8009BFFC 00000000 */ nop /* B131A0 8009C000 00052C00 */ sll $a1, $a1, 0x10 -/* B131A4 8009C004 0C024B6B */ jal func_80092DAC +/* B131A4 8009C004 0C024B6B */ jal Quake_SetSpeed /* B131A8 8009C008 00052C03 */ sra $a1, $a1, 0x10 /* B131AC 8009C00C 0C03F66B */ jal Math_Rand_ZeroOne /* B131B0 8009C010 00000000 */ nop @@ -97,7 +97,7 @@ glabel func_8009BEEC /* B131E4 8009C044 44058000 */ mfc1 $a1, $f16 /* B131E8 8009C048 00000000 */ nop /* B131EC 8009C04C 00052C00 */ sll $a1, $a1, 0x10 -/* B131F0 8009C050 0C024B9C */ jal func_80092E70 +/* B131F0 8009C050 0C024B9C */ jal Quake_SetQuakeValues /* B131F4 8009C054 00052C03 */ sra $a1, $a1, 0x10 /* B131F8 8009C058 0C03F66B */ jal Math_Rand_ZeroOne /* B131FC 8009C05C 00000000 */ nop @@ -113,7 +113,7 @@ glabel func_8009BEEC /* B13224 8009C084 44055000 */ mfc1 $a1, $f10 /* B13228 8009C088 00000000 */ nop /* B1322C 8009C08C 00052C00 */ sll $a1, $a1, 0x10 -/* B13230 8009C090 0C024B7C */ jal func_80092DF0 +/* B13230 8009C090 0C024B7C */ jal Quake_SetCountdown /* B13234 8009C094 00052C03 */ sra $a1, $a1, 0x10 /* B13238 8009C098 8FBF0024 */ lw $ra, 0x24($sp) .L8009C09C: diff --git a/asm/non_matchings/code/z_scene_table/func_8009FE58.s b/asm/non_matchings/code/z_scene_table/func_8009FE58.s index 71aef940f9..f3ce4f04d9 100644 --- a/asm/non_matchings/code/z_scene_table/func_8009FE58.s +++ b/asm/non_matchings/code/z_scene_table/func_8009FE58.s @@ -53,7 +53,7 @@ glabel func_8009FE58 /* B17010 8009FE70 24C6FE60 */ addiu $a2, %lo(D_8013FE60) # addiu $a2, $a2, -0x1a0 /* B17014 8009FE74 27A4007C */ addiu $a0, $sp, 0x7c /* B17018 8009FE78 24071E20 */ li $a3, 7712 -/* B1701C 8009FE7C 0C031AB1 */ jal func_800C6AC4 +/* B1701C 8009FE7C 0C031AB1 */ jal Graph_OpenDisps /* B17020 8009FE80 00A08025 */ move $s0, $a1 /* B17024 8009FE84 8FAA0098 */ lw $t2, 0x98($sp) /* B17028 8009FE88 3C010001 */ lui $at, 1 @@ -91,7 +91,7 @@ glabel func_8009FE58 /* B170A8 8009FF08 AFB9001C */ sw $t9, 0x1c($sp) /* B170AC 8009FF0C AFA80094 */ sw $t0, 0x94($sp) /* B170B0 8009FF10 00002825 */ move $a1, $zero -/* B170B4 8009FF14 0C0253D0 */ jal Draw_TwoTexScroll +/* B170B4 8009FF14 0C0253D0 */ jal Gfx_TwoTexScroll /* B170B8 8009FF18 AFA20078 */ sw $v0, 0x78($sp) /* B170BC 8009FF1C 8FA30078 */ lw $v1, 0x78($sp) /* B170C0 8009FF20 8FA80094 */ lw $t0, 0x94($sp) @@ -122,7 +122,7 @@ glabel func_8009FE58 /* B17124 8009FF84 AFA0001C */ sw $zero, 0x1c($sp) /* B17128 8009FF88 00002825 */ move $a1, $zero /* B1712C 8009FF8C 00003025 */ move $a2, $zero -/* B17130 8009FF90 0C0253D0 */ jal Draw_TwoTexScroll +/* B17130 8009FF90 0C0253D0 */ jal Gfx_TwoTexScroll /* B17134 8009FF94 AFA20074 */ sw $v0, 0x74($sp) /* B17138 8009FF98 8FA30074 */ lw $v1, 0x74($sp) /* B1713C 8009FF9C 10000012 */ b .L8009FFE8 @@ -141,7 +141,7 @@ glabel func_8009FE58 /* B1716C 8009FFCC 30A5007F */ andi $a1, $a1, 0x7f /* B17170 8009FFD0 3106007F */ andi $a2, $t0, 0x7f /* B17174 8009FFD4 24070020 */ li $a3, 32 -/* B17178 8009FFD8 0C0253A7 */ jal Draw_TexScroll +/* B17178 8009FFD8 0C0253A7 */ jal Gfx_TexScroll /* B1717C 8009FFDC AFA20070 */ sw $v0, 0x70($sp) /* B17180 8009FFE0 8FA90070 */ lw $t1, 0x70($sp) /* B17184 8009FFE4 AD220004 */ sw $v0, 4($t1) @@ -359,7 +359,7 @@ glabel func_8009FE58 /* B174AC 800A030C 8FAE0098 */ lw $t6, 0x98($sp) /* B174B0 800A0310 27A4007C */ addiu $a0, $sp, 0x7c /* B174B4 800A0314 24071E83 */ li $a3, 7811 -/* B174B8 800A0318 0C031AD5 */ jal func_800C6B54 +/* B174B8 800A0318 0C031AD5 */ jal Graph_CloseDisps /* B174BC 800A031C 8DC50000 */ lw $a1, ($t6) /* B174C0 800A0320 8FBF003C */ lw $ra, 0x3c($sp) /* B174C4 800A0324 8FB00038 */ lw $s0, 0x38($sp) diff --git a/asm/non_matchings/code/z_skelanime/SkelAnime_ChangeAnimation.s b/asm/non_matchings/code/z_skelanime/SkelAnime_ChangeAnimation.s deleted file mode 100644 index 0142b207e3..0000000000 --- a/asm/non_matchings/code/z_skelanime/SkelAnime_ChangeAnimation.s +++ /dev/null @@ -1,20 +0,0 @@ -glabel SkelAnime_ChangeAnimation -/* B1C340 800A51A0 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* B1C344 800A51A4 44866000 */ mtc1 $a2, $f12 -/* B1C348 800A51A8 44877000 */ mtc1 $a3, $f14 -/* B1C34C 800A51AC C7A40038 */ lwc1 $f4, 0x38($sp) -/* B1C350 800A51B0 93AE003F */ lbu $t6, 0x3f($sp) -/* B1C354 800A51B4 C7A60040 */ lwc1 $f6, 0x40($sp) -/* B1C358 800A51B8 AFBF0024 */ sw $ra, 0x24($sp) -/* B1C35C 800A51BC 44066000 */ mfc1 $a2, $f12 -/* B1C360 800A51C0 44077000 */ mfc1 $a3, $f14 -/* B1C364 800A51C4 AFA0001C */ sw $zero, 0x1c($sp) -/* B1C368 800A51C8 E7A40010 */ swc1 $f4, 0x10($sp) -/* B1C36C 800A51CC AFAE0014 */ sw $t6, 0x14($sp) -/* B1C370 800A51D0 0C0293F9 */ jal func_800A4FE4 -/* B1C374 800A51D4 E7A60018 */ swc1 $f6, 0x18($sp) -/* B1C378 800A51D8 8FBF0024 */ lw $ra, 0x24($sp) -/* B1C37C 800A51DC 27BD0028 */ addiu $sp, $sp, 0x28 -/* B1C380 800A51E0 03E00008 */ jr $ra -/* B1C384 800A51E4 00000000 */ nop - diff --git a/asm/non_matchings/code/z_skelanime/SkelAnime_Draw.s b/asm/non_matchings/code/z_skelanime/SkelAnime_Draw.s deleted file mode 100644 index caf6fe1af1..0000000000 --- a/asm/non_matchings/code/z_skelanime/SkelAnime_Draw.s +++ /dev/null @@ -1,181 +0,0 @@ -.rdata -glabel D_80140104 - .asciz "\x1b[31m" - .balign 4 - -glabel D_8014010C - .asciz "Si2_draw():skelがNULLです。\n" - # EUC-JP: がNULLです。| Is null - .balign 4 - -glabel D_8014012C - .asciz "\x1b[m" - .balign 4 - -glabel D_80140130 - .asciz "../z_skelanime.c" - .balign 4 - -glabel D_80140144 - .asciz "../z_skelanime.c" - .balign 4 - -glabel D_80140158 - .asciz "../z_skelanime.c" - .balign 4 - -.text -glabel SkelAnime_Draw -/* B18768 800A15C8 27BDFF98 */ addiu $sp, $sp, -0x68 -/* B1876C 800A15CC AFBF0024 */ sw $ra, 0x24($sp) -/* B18770 800A15D0 AFA40068 */ sw $a0, 0x68($sp) -/* B18774 800A15D4 AFA5006C */ sw $a1, 0x6c($sp) -/* B18778 800A15D8 AFA60070 */ sw $a2, 0x70($sp) -/* B1877C 800A15DC 14A0000C */ bnez $a1, .L800A1610 -/* B18780 800A15E0 AFA70074 */ sw $a3, 0x74($sp) -/* B18784 800A15E4 3C048014 */ lui $a0, %hi(D_80140104) # $a0, 0x8014 -/* B18788 800A15E8 0C00084C */ jal osSyncPrintf -/* B1878C 800A15EC 24840104 */ addiu $a0, %lo(D_80140104) # addiu $a0, $a0, 0x104 -/* B18790 800A15F0 3C048014 */ lui $a0, %hi(D_8014010C) # $a0, 0x8014 -/* B18794 800A15F4 0C00084C */ jal osSyncPrintf -/* B18798 800A15F8 2484010C */ addiu $a0, %lo(D_8014010C) # addiu $a0, $a0, 0x10c -/* B1879C 800A15FC 3C048014 */ lui $a0, %hi(D_8014012C) # $a0, 0x8014 -/* B187A0 800A1600 0C00084C */ jal osSyncPrintf -/* B187A4 800A1604 2484012C */ addiu $a0, %lo(D_8014012C) # addiu $a0, $a0, 0x12c -/* B187A8 800A1608 1000007D */ b .L800A1800 -/* B187AC 800A160C 8FBF0024 */ lw $ra, 0x24($sp) -.L800A1610: -/* B187B0 800A1610 8FAF0068 */ lw $t7, 0x68($sp) -/* B187B4 800A1614 3C068014 */ lui $a2, %hi(D_80140130) # $a2, 0x8014 -/* B187B8 800A1618 24C60130 */ addiu $a2, %lo(D_80140130) # addiu $a2, $a2, 0x130 -/* B187BC 800A161C 8DE50000 */ lw $a1, ($t7) -/* B187C0 800A1620 27A40034 */ addiu $a0, $sp, 0x34 -/* B187C4 800A1624 2407047C */ li $a3, 1148 -/* B187C8 800A1628 0C031AB1 */ jal func_800C6AC4 -/* B187CC 800A162C AFA50044 */ sw $a1, 0x44($sp) -/* B187D0 800A1630 0C034213 */ jal Matrix_Push -/* B187D4 800A1634 00000000 */ nop -/* B187D8 800A1638 8FB8006C */ lw $t8, 0x6c($sp) -/* B187DC 800A163C 3C0B8016 */ lui $t3, %hi(gSegments) -/* B187E0 800A1640 3C0100FF */ lui $at, (0x00FFFFFF >> 16) # lui $at, 0xff -/* B187E4 800A1644 8F020000 */ lw $v0, ($t8) -/* B187E8 800A1648 3421FFFF */ ori $at, (0x00FFFFFF & 0xFFFF) # ori $at, $at, 0xffff -/* B187EC 800A164C 8FA30070 */ lw $v1, 0x70($sp) -/* B187F0 800A1650 00024100 */ sll $t0, $v0, 4 -/* B187F4 800A1654 00084F02 */ srl $t1, $t0, 0x1c -/* B187F8 800A1658 00095080 */ sll $t2, $t1, 2 -/* B187FC 800A165C 016A5821 */ addu $t3, $t3, $t2 -/* B18800 800A1660 8D6B6FA8 */ lw $t3, %lo(gSegments)($t3) -/* B18804 800A1664 0041C824 */ and $t9, $v0, $at -/* B18808 800A1668 3C018000 */ lui $at, 0x8000 -/* B1880C 800A166C 032B6021 */ addu $t4, $t9, $t3 -/* B18810 800A1670 01816821 */ addu $t5, $t4, $at -/* B18814 800A1674 AFAD0064 */ sw $t5, 0x64($sp) -/* B18818 800A1678 846E0000 */ lh $t6, ($v1) -/* B1881C 800A167C 27A80048 */ addiu $t0, $sp, 0x48 -/* B18820 800A1680 27AD0048 */ addiu $t5, $sp, 0x48 -/* B18824 800A1684 448E2000 */ mtc1 $t6, $f4 -/* B18828 800A1688 24050001 */ li $a1, 1 -/* B1882C 800A168C 27A6005C */ addiu $a2, $sp, 0x5c -/* B18830 800A1690 468021A0 */ cvt.s.w $f6, $f4 -/* B18834 800A1694 27A70050 */ addiu $a3, $sp, 0x50 -/* B18838 800A1698 E7A60050 */ swc1 $f6, 0x50($sp) -/* B1883C 800A169C 846F0002 */ lh $t7, 2($v1) -/* B18840 800A16A0 448F4000 */ mtc1 $t7, $f8 -/* B18844 800A16A4 00000000 */ nop -/* B18848 800A16A8 468042A0 */ cvt.s.w $f10, $f8 -/* B1884C 800A16AC E7AA0054 */ swc1 $f10, 0x54($sp) -/* B18850 800A16B0 84780004 */ lh $t8, 4($v1) -/* B18854 800A16B4 44988000 */ mtc1 $t8, $f16 -/* B18858 800A16B8 00000000 */ nop -/* B1885C 800A16BC 468084A0 */ cvt.s.w $f18, $f16 -/* B18860 800A16C0 E7B20058 */ swc1 $f18, 0x58($sp) -/* B18864 800A16C4 886A0006 */ lwl $t2, 6($v1) -/* B18868 800A16C8 986A0009 */ lwr $t2, 9($v1) -/* B1886C 800A16CC AD0A0000 */ sw $t2, ($t0) -/* B18870 800A16D0 946A000A */ lhu $t2, 0xa($v1) -/* B18874 800A16D4 A50A0004 */ sh $t2, 4($t0) -/* B18878 800A16D8 8FB90064 */ lw $t9, 0x64($sp) -/* B1887C 800A16DC 8FAC0074 */ lw $t4, 0x74($sp) -/* B18880 800A16E0 8FA40068 */ lw $a0, 0x68($sp) -/* B18884 800A16E4 8F2B0008 */ lw $t3, 8($t9) -/* B18888 800A16E8 11800006 */ beqz $t4, .L800A1704 -/* B1888C 800A16EC AFAB005C */ sw $t3, 0x5c($sp) -/* B18890 800A16F0 8FAE007C */ lw $t6, 0x7c($sp) -/* B18894 800A16F4 AFAD0010 */ sw $t5, 0x10($sp) -/* B18898 800A16F8 0180F809 */ jalr $t4 -/* B1889C 800A16FC AFAE0014 */ sw $t6, 0x14($sp) -/* B188A0 800A1700 1440001E */ bnez $v0, .L800A177C -.L800A1704: -/* B188A4 800A1704 27A40050 */ addiu $a0, $sp, 0x50 -/* B188A8 800A1708 0C0344D0 */ jal func_800D1340 -/* B188AC 800A170C 27A50048 */ addiu $a1, $sp, 0x48 -/* B188B0 800A1710 8FAF005C */ lw $t7, 0x5c($sp) -/* B188B4 800A1714 8FA70044 */ lw $a3, 0x44($sp) -/* B188B8 800A1718 3C08DA38 */ lui $t0, (0xDA380003 >> 16) # lui $t0, 0xda38 -/* B188BC 800A171C 51E00018 */ beql $t7, $zero, .L800A1780 -/* B188C0 800A1720 8FA20078 */ lw $v0, 0x78($sp) -/* B188C4 800A1724 8CE202C0 */ lw $v0, 0x2c0($a3) -/* B188C8 800A1728 35080003 */ ori $t0, (0xDA380003 & 0xFFFF) # ori $t0, $t0, 3 -/* B188CC 800A172C 3C058014 */ lui $a1, %hi(D_80140144) # $a1, 0x8014 -/* B188D0 800A1730 24580008 */ addiu $t8, $v0, 8 -/* B188D4 800A1734 ACF802C0 */ sw $t8, 0x2c0($a3) -/* B188D8 800A1738 AC480000 */ sw $t0, ($v0) -/* B188DC 800A173C 8FA90068 */ lw $t1, 0x68($sp) -/* B188E0 800A1740 24A50144 */ addiu $a1, %lo(D_80140144) # addiu $a1, $a1, 0x144 -/* B188E4 800A1744 24060498 */ li $a2, 1176 -/* B188E8 800A1748 8D240000 */ lw $a0, ($t1) -/* B188EC 800A174C 0C0346A2 */ jal Matrix_NewMtx -/* B188F0 800A1750 AFA20030 */ sw $v0, 0x30($sp) -/* B188F4 800A1754 8FA30030 */ lw $v1, 0x30($sp) -/* B188F8 800A1758 3C0BDE00 */ lui $t3, 0xde00 -/* B188FC 800A175C AC620004 */ sw $v0, 4($v1) -/* B18900 800A1760 8FAA0044 */ lw $t2, 0x44($sp) -/* B18904 800A1764 8D4202C0 */ lw $v0, 0x2c0($t2) -/* B18908 800A1768 24590008 */ addiu $t9, $v0, 8 -/* B1890C 800A176C AD5902C0 */ sw $t9, 0x2c0($t2) -/* B18910 800A1770 AC4B0000 */ sw $t3, ($v0) -/* B18914 800A1774 8FAD005C */ lw $t5, 0x5c($sp) -/* B18918 800A1778 AC4D0004 */ sw $t5, 4($v0) -.L800A177C: -/* B1891C 800A177C 8FA20078 */ lw $v0, 0x78($sp) -.L800A1780: -/* B18920 800A1780 8FA40068 */ lw $a0, 0x68($sp) -/* B18924 800A1784 24050001 */ li $a1, 1 -/* B18928 800A1788 10400006 */ beqz $v0, .L800A17A4 -/* B1892C 800A178C 27A6005C */ addiu $a2, $sp, 0x5c -/* B18930 800A1790 8FAE007C */ lw $t6, 0x7c($sp) -/* B18934 800A1794 27A70048 */ addiu $a3, $sp, 0x48 -/* B18938 800A1798 0040F809 */ jalr $v0 -/* B1893C 800A179C AFAE0010 */ sw $t6, 0x10($sp) -/* B18940 800A17A0 8FA20078 */ lw $v0, 0x78($sp) -.L800A17A4: -/* B18944 800A17A4 8FAC0064 */ lw $t4, 0x64($sp) -/* B18948 800A17A8 240100FF */ li $at, 255 -/* B1894C 800A17AC 8FA40068 */ lw $a0, 0x68($sp) -/* B18950 800A17B0 91850006 */ lbu $a1, 6($t4) -/* B18954 800A17B4 8FA6006C */ lw $a2, 0x6c($sp) -/* B18958 800A17B8 8FA70070 */ lw $a3, 0x70($sp) -/* B1895C 800A17BC 10A10006 */ beq $a1, $at, .L800A17D8 -/* B18960 800A17C0 8FAF0074 */ lw $t7, 0x74($sp) -/* B18964 800A17C4 8FB8007C */ lw $t8, 0x7c($sp) -/* B18968 800A17C8 AFAF0010 */ sw $t7, 0x10($sp) -/* B1896C 800A17CC AFA20014 */ sw $v0, 0x14($sp) -/* B18970 800A17D0 0C0284D1 */ jal func_800A1344 -/* B18974 800A17D4 AFB80018 */ sw $t8, 0x18($sp) -.L800A17D8: -/* B18978 800A17D8 0C034221 */ jal Matrix_Pull -/* B1897C 800A17DC 00000000 */ nop -/* B18980 800A17E0 8FA80068 */ lw $t0, 0x68($sp) -/* B18984 800A17E4 3C068014 */ lui $a2, %hi(D_80140158) # $a2, 0x8014 -/* B18988 800A17E8 24C60158 */ addiu $a2, %lo(D_80140158) # addiu $a2, $a2, 0x158 -/* B1898C 800A17EC 27A40034 */ addiu $a0, $sp, 0x34 -/* B18990 800A17F0 240704A6 */ li $a3, 1190 -/* B18994 800A17F4 0C031AD5 */ jal func_800C6B54 -/* B18998 800A17F8 8D050000 */ lw $a1, ($t0) -/* B1899C 800A17FC 8FBF0024 */ lw $ra, 0x24($sp) -.L800A1800: -/* B189A0 800A1800 27BD0068 */ addiu $sp, $sp, 0x68 -/* B189A4 800A1804 03E00008 */ jr $ra -/* B189A8 800A1808 00000000 */ nop - diff --git a/asm/non_matchings/code/z_skelanime/SkelAnime_FrameUpdateMatrix.s b/asm/non_matchings/code/z_skelanime/SkelAnime_FrameUpdateMatrix.s deleted file mode 100644 index dd17ccf2b7..0000000000 --- a/asm/non_matchings/code/z_skelanime/SkelAnime_FrameUpdateMatrix.s +++ /dev/null @@ -1,11 +0,0 @@ -glabel SkelAnime_FrameUpdateMatrix -/* B1BB9C 800A49FC 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* B1BBA0 800A4A00 AFBF0014 */ sw $ra, 0x14($sp) -/* B1BBA4 800A4A04 8C990030 */ lw $t9, 0x30($a0) -/* B1BBA8 800A4A08 0320F809 */ jalr $t9 -/* B1BBAC 800A4A0C 00000000 */ nop -/* B1BBB0 800A4A10 8FBF0014 */ lw $ra, 0x14($sp) -/* B1BBB4 800A4A14 27BD0018 */ addiu $sp, $sp, 0x18 -/* B1BBB8 800A4A18 03E00008 */ jr $ra -/* B1BBBC 800A4A1C 00000000 */ nop - diff --git a/asm/non_matchings/code/z_skelanime/SkelAnime_GetFrameCount.s b/asm/non_matchings/code/z_skelanime/SkelAnime_GetFrameCount.s deleted file mode 100644 index 6d6a54360b..0000000000 --- a/asm/non_matchings/code/z_skelanime/SkelAnime_GetFrameCount.s +++ /dev/null @@ -1,19 +0,0 @@ -glabel SkelAnime_GetFrameCount -/* B191A0 800A2000 00047100 */ sll $t6, $a0, 4 -/* B191A4 800A2004 000E7F02 */ srl $t7, $t6, 0x1c -/* B191A8 800A2008 000FC080 */ sll $t8, $t7, 2 -/* B191AC 800A200C 3C198016 */ lui $t9, %hi(gSegments) -/* B191B0 800A2010 0338C821 */ addu $t9, $t9, $t8 -/* B191B4 800A2014 3C0100FF */ lui $at, (0x00FFFFFF >> 16) # lui $at, 0xff -/* B191B8 800A2018 8F396FA8 */ lw $t9, %lo(gSegments)($t9) -/* B191BC 800A201C 3421FFFF */ ori $at, (0x00FFFFFF & 0xFFFF) # ori $at, $at, 0xffff -/* B191C0 800A2020 00814024 */ and $t0, $a0, $at -/* B191C4 800A2024 3C018000 */ lui $at, 0x8000 -/* B191C8 800A2028 03281821 */ addu $v1, $t9, $t0 -/* B191CC 800A202C 00611821 */ addu $v1, $v1, $at -/* B191D0 800A2030 94620000 */ lhu $v0, ($v1) -/* B191D4 800A2034 2442FFFF */ addiu $v0, $v0, -1 -/* B191D8 800A2038 00021400 */ sll $v0, $v0, 0x10 -/* B191DC 800A203C 03E00008 */ jr $ra -/* B191E0 800A2040 00021403 */ sra $v0, $v0, 0x10 - diff --git a/asm/non_matchings/code/z_skelanime/SkelAnime_Init.s b/asm/non_matchings/code/z_skelanime/SkelAnime_Init.s deleted file mode 100644 index 770338d8d2..0000000000 --- a/asm/non_matchings/code/z_skelanime/SkelAnime_Init.s +++ /dev/null @@ -1,134 +0,0 @@ -.rdata -glabel D_80140464 - .asciz "../z_skelanime.c" - .balign 4 - -glabel D_80140478 - .asciz "../z_skelanime.c" - .balign 4 - -glabel D_8014048C - .asciz "joint_buff_num == this->joint_num" - .balign 4 - -glabel D_801404B0 - .asciz "../z_skelanime.c" - .balign 4 - -glabel D_801404C4 - .asciz "\x1b[31m" - .balign 4 - -glabel D_801404CC - .asciz "Skeleton_Info2_ct メモリアロケーションエラー\n" - # EUC-JP: メモリアロケーションエラー | Memory allocation error - .balign 4 - -glabel D_801404FC - .asciz "\x1b[m" - .balign 4 - -.text -glabel SkelAnime_Init -/* B1B71C 800A457C 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* B1B720 800A4580 AFA40020 */ sw $a0, 0x20($sp) -/* B1B724 800A4584 00067100 */ sll $t6, $a2, 4 -/* B1B728 800A4588 3C048016 */ lui $a0, %hi(gSegments) # $a0, 0x8016 -/* B1B72C 800A458C 000E7F02 */ srl $t7, $t6, 0x1c -/* B1B730 800A4590 24846FA8 */ addiu $a0, %lo(gSegments) # addiu $a0, $a0, 0x6fa8 -/* B1B734 800A4594 000FC080 */ sll $t8, $t7, 2 -/* B1B738 800A4598 0098C821 */ addu $t9, $a0, $t8 -/* B1B73C 800A459C 8F2A0000 */ lw $t2, ($t9) -/* B1B740 800A45A0 3C0800FF */ lui $t0, (0x00FFFFFF >> 16) # lui $t0, 0xff -/* B1B744 800A45A4 3508FFFF */ ori $t0, (0x00FFFFFF & 0xFFFF) # ori $t0, $t0, 0xffff -/* B1B748 800A45A8 00C85824 */ and $t3, $a2, $t0 -/* B1B74C 800A45AC 3C098000 */ lui $t1, 0x8000 -/* B1B750 800A45B0 014B6021 */ addu $t4, $t2, $t3 -/* B1B754 800A45B4 AFBF001C */ sw $ra, 0x1c($sp) -/* B1B758 800A45B8 AFB00018 */ sw $s0, 0x18($sp) -/* B1B75C 800A45BC AFA7002C */ sw $a3, 0x2c($sp) -/* B1B760 800A45C0 01891021 */ addu $v0, $t4, $t1 -/* B1B764 800A45C4 904D0004 */ lbu $t5, 4($v0) -/* B1B768 800A45C8 00A08025 */ move $s0, $a1 -/* B1B76C 800A45CC 24060B98 */ li $a2, 2968 -/* B1B770 800A45D0 25AE0001 */ addiu $t6, $t5, 1 -/* B1B774 800A45D4 A0AE0000 */ sb $t6, ($a1) -/* B1B778 800A45D8 8C430000 */ lw $v1, ($v0) -/* B1B77C 800A45DC 00037900 */ sll $t7, $v1, 4 -/* B1B780 800A45E0 000FC702 */ srl $t8, $t7, 0x1c -/* B1B784 800A45E4 0018C880 */ sll $t9, $t8, 2 -/* B1B788 800A45E8 00995021 */ addu $t2, $a0, $t9 -/* B1B78C 800A45EC 8D4B0000 */ lw $t3, ($t2) -/* B1B790 800A45F0 00686024 */ and $t4, $v1, $t0 -/* B1B794 800A45F4 016C6821 */ addu $t5, $t3, $t4 -/* B1B798 800A45F8 01A97021 */ addu $t6, $t5, $t1 -/* B1B79C 800A45FC ACAE0004 */ sw $t6, 4($a1) -/* B1B7A0 800A4600 8FAF0030 */ lw $t7, 0x30($sp) -/* B1B7A4 800A4604 8FB80038 */ lw $t8, 0x38($sp) -/* B1B7A8 800A4608 55E00016 */ bnezl $t7, .L800A4664 -/* B1B7AC 800A460C 92190000 */ lbu $t9, ($s0) -/* B1B7B0 800A4610 90A40000 */ lbu $a0, ($a1) -/* B1B7B4 800A4614 3C058014 */ lui $a1, %hi(D_80140464) # $a1, 0x8014 -/* B1B7B8 800A4618 24A50464 */ addiu $a1, %lo(D_80140464) # addiu $a1, $a1, 0x464 -/* B1B7BC 800A461C 00800821 */ addu $at, $a0, $zero -/* B1B7C0 800A4620 00042080 */ sll $a0, $a0, 2 -/* B1B7C4 800A4624 00812023 */ subu $a0, $a0, $at -/* B1B7C8 800A4628 0C01EBB8 */ jal ZeldaArena_MallocDebug -/* B1B7CC 800A462C 00042040 */ sll $a0, $a0, 1 -/* B1B7D0 800A4630 92040000 */ lbu $a0, ($s0) -/* B1B7D4 800A4634 3C058014 */ lui $a1, %hi(D_80140478) # $a1, 0x8014 -/* B1B7D8 800A4638 AE020020 */ sw $v0, 0x20($s0) -/* B1B7DC 800A463C 00800821 */ addu $at, $a0, $zero -/* B1B7E0 800A4640 00042080 */ sll $a0, $a0, 2 -/* B1B7E4 800A4644 00812023 */ subu $a0, $a0, $at -/* B1B7E8 800A4648 00042040 */ sll $a0, $a0, 1 -/* B1B7EC 800A464C 24A50478 */ addiu $a1, %lo(D_80140478) # addiu $a1, $a1, 0x478 -/* B1B7F0 800A4650 0C01EBB8 */ jal ZeldaArena_MallocDebug -/* B1B7F4 800A4654 24060B99 */ li $a2, 2969 -/* B1B7F8 800A4658 1000000D */ b .L800A4690 -/* B1B7FC 800A465C AE020024 */ sw $v0, 0x24($s0) -/* B1B800 800A4660 92190000 */ lbu $t9, ($s0) -.L800A4664: -/* B1B804 800A4664 3C048014 */ lui $a0, %hi(D_8014048C) # $a0, 0x8014 -/* B1B808 800A4668 2484048C */ addiu $a0, %lo(D_8014048C) # addiu $a0, $a0, 0x48c -/* B1B80C 800A466C 13190004 */ beq $t8, $t9, .L800A4680 -/* B1B810 800A4670 3C058014 */ lui $a1, %hi(D_801404B0) # $a1, 0x8014 -/* B1B814 800A4674 24A504B0 */ addiu $a1, %lo(D_801404B0) # addiu $a1, $a1, 0x4b0 -/* B1B818 800A4678 0C0007FC */ jal __assert -/* B1B81C 800A467C 24060B9D */ li $a2, 2973 -.L800A4680: -/* B1B820 800A4680 8FAA0030 */ lw $t2, 0x30($sp) -/* B1B824 800A4684 AE0A0020 */ sw $t2, 0x20($s0) -/* B1B828 800A4688 8FAB0034 */ lw $t3, 0x34($sp) -/* B1B82C 800A468C AE0B0024 */ sw $t3, 0x24($s0) -.L800A4690: -/* B1B830 800A4690 8E0C0020 */ lw $t4, 0x20($s0) -/* B1B834 800A4694 3C048014 */ lui $a0, %hi(D_801404C4) # $a0, 0x8014 -/* B1B838 800A4698 11800004 */ beqz $t4, .L800A46AC -/* B1B83C 800A469C 00000000 */ nop -/* B1B840 800A46A0 8E0D0024 */ lw $t5, 0x24($s0) -/* B1B844 800A46A4 55A0000A */ bnezl $t5, .L800A46D0 -/* B1B848 800A46A8 8FAE002C */ lw $t6, 0x2c($sp) -.L800A46AC: -/* B1B84C 800A46AC 0C00084C */ jal osSyncPrintf -/* B1B850 800A46B0 248404C4 */ addiu $a0, %lo(D_801404C4) # addiu $a0, $a0, 0x4c4 -/* B1B854 800A46B4 3C048014 */ lui $a0, %hi(D_801404CC) # $a0, 0x8014 -/* B1B858 800A46B8 0C00084C */ jal osSyncPrintf -/* B1B85C 800A46BC 248404CC */ addiu $a0, %lo(D_801404CC) # addiu $a0, $a0, 0x4cc -/* B1B860 800A46C0 3C048014 */ lui $a0, %hi(D_801404FC) # $a0, 0x8014 -/* B1B864 800A46C4 0C00084C */ jal osSyncPrintf -/* B1B868 800A46C8 248404FC */ addiu $a0, %lo(D_801404FC) # addiu $a0, $a0, 0x4fc -/* B1B86C 800A46CC 8FAE002C */ lw $t6, 0x2c($sp) -.L800A46D0: -/* B1B870 800A46D0 02002025 */ move $a0, $s0 -/* B1B874 800A46D4 51C00004 */ beql $t6, $zero, .L800A46E8 -/* B1B878 800A46D8 8FBF001C */ lw $ra, 0x1c($sp) -/* B1B87C 800A46DC 0C0294BE */ jal func_800A52F8 -/* B1B880 800A46E0 01C02825 */ move $a1, $t6 -/* B1B884 800A46E4 8FBF001C */ lw $ra, 0x1c($sp) -.L800A46E8: -/* B1B888 800A46E8 8FB00018 */ lw $s0, 0x18($sp) -/* B1B88C 800A46EC 27BD0020 */ addiu $sp, $sp, 0x20 -/* B1B890 800A46F0 03E00008 */ jr $ra -/* B1B894 800A46F4 00000000 */ nop - diff --git a/asm/non_matchings/code/z_skelanime/func_800A08A0.s b/asm/non_matchings/code/z_skelanime/func_800A08A0.s deleted file mode 100644 index f2e4b7ae6f..0000000000 --- a/asm/non_matchings/code/z_skelanime/func_800A08A0.s +++ /dev/null @@ -1,189 +0,0 @@ -.rdata -glabel D_8013FF50 - .asciz "../z_skelanime.c" - .balign 4 - -glabel D_8013FF64 - .asciz "../z_skelanime.c" - .balign 4 - -glabel D_8013FF78 - .asciz "../z_skelanime.c" - .balign 4 - -.text -glabel func_800A08A0 -/* B17A40 800A08A0 27BDFF98 */ addiu $sp, $sp, -0x68 -/* B17A44 800A08A4 AFBF0024 */ sw $ra, 0x24($sp) -/* B17A48 800A08A8 AFA40068 */ sw $a0, 0x68($sp) -/* B17A4C 800A08AC AFA5006C */ sw $a1, 0x6c($sp) -/* B17A50 800A08B0 AFA60070 */ sw $a2, 0x70($sp) -/* B17A54 800A08B4 AFA70074 */ sw $a3, 0x74($sp) -/* B17A58 800A08B8 8C850000 */ lw $a1, ($a0) -/* B17A5C 800A08BC 3C068014 */ lui $a2, %hi(D_8013FF50) # $a2, 0x8014 -/* B17A60 800A08C0 24C6FF50 */ addiu $a2, %lo(D_8013FF50) # addiu $a2, $a2, -0xb0 -/* B17A64 800A08C4 27A40038 */ addiu $a0, $sp, 0x38 -/* B17A68 800A08C8 24070305 */ li $a3, 773 -/* B17A6C 800A08CC 0C031AB1 */ jal func_800C6AC4 -/* B17A70 800A08D0 AFA50048 */ sw $a1, 0x48($sp) -/* B17A74 800A08D4 0C034213 */ jal Matrix_Push -/* B17A78 800A08D8 00000000 */ nop -/* B17A7C 800A08DC 8FB8006C */ lw $t8, 0x6c($sp) -/* B17A80 800A08E0 8FAF0070 */ lw $t7, 0x70($sp) -/* B17A84 800A08E4 3C0E8016 */ lui $t6, %hi(gSegments) -/* B17A88 800A08E8 0018C880 */ sll $t9, $t8, 2 -/* B17A8C 800A08EC 01F94821 */ addu $t1, $t7, $t9 -/* B17A90 800A08F0 8D220000 */ lw $v0, ($t1) -/* B17A94 800A08F4 270F0001 */ addiu $t7, $t8, 1 -/* B17A98 800A08F8 8FA90074 */ lw $t1, 0x74($sp) -/* B17A9C 800A08FC 00025900 */ sll $t3, $v0, 4 -/* B17AA0 800A0900 000B6702 */ srl $t4, $t3, 0x1c -/* B17AA4 800A0904 000C6880 */ sll $t5, $t4, 2 -/* B17AA8 800A0908 01CD7021 */ addu $t6, $t6, $t5 -/* B17AAC 800A090C 8DCE6FA8 */ lw $t6, %lo(gSegments)($t6) -/* B17AB0 800A0910 3C0100FF */ lui $at, (0x00FFFFFF >> 16) # lui $at, 0xff -/* B17AB4 800A0914 000F5880 */ sll $t3, $t7, 2 -/* B17AB8 800A0918 3421FFFF */ ori $at, (0x00FFFFFF & 0xFFFF) # ori $at, $at, 0xffff -/* B17ABC 800A091C 016F5823 */ subu $t3, $t3, $t7 -/* B17AC0 800A0920 000B5840 */ sll $t3, $t3, 1 -/* B17AC4 800A0924 00415024 */ and $t2, $v0, $at -/* B17AC8 800A0928 AFAF006C */ sw $t7, 0x6c($sp) -/* B17ACC 800A092C 012B6021 */ addu $t4, $t1, $t3 -/* B17AD0 800A0930 014E4021 */ addu $t0, $t2, $t6 -/* B17AD4 800A0934 898A0000 */ lwl $t2, ($t4) -/* B17AD8 800A0938 998A0003 */ lwr $t2, 3($t4) -/* B17ADC 800A093C 27B9004C */ addiu $t9, $sp, 0x4c -/* B17AE0 800A0940 3C018000 */ lui $at, 0x8000 -/* B17AE4 800A0944 AF2A0000 */ sw $t2, ($t9) -/* B17AE8 800A0948 958A0004 */ lhu $t2, 4($t4) -/* B17AEC 800A094C 01014021 */ addu $t0, $t0, $at -/* B17AF0 800A0950 27A60060 */ addiu $a2, $sp, 0x60 -/* B17AF4 800A0954 A72A0004 */ sh $t2, 4($t9) -/* B17AF8 800A0958 850E0000 */ lh $t6, ($t0) -/* B17AFC 800A095C 8FA90084 */ lw $t1, 0x84($sp) -/* B17B00 800A0960 8FAD0078 */ lw $t5, 0x78($sp) -/* B17B04 800A0964 448E2000 */ mtc1 $t6, $f4 -/* B17B08 800A0968 00095880 */ sll $t3, $t1, 2 -/* B17B0C 800A096C 010BC821 */ addu $t9, $t0, $t3 -/* B17B10 800A0970 468021A0 */ cvt.s.w $f6, $f4 -/* B17B14 800A0974 8FA5006C */ lw $a1, 0x6c($sp) -/* B17B18 800A0978 8FA40068 */ lw $a0, 0x68($sp) -/* B17B1C 800A097C 27AA004C */ addiu $t2, $sp, 0x4c -/* B17B20 800A0980 27A70054 */ addiu $a3, $sp, 0x54 -/* B17B24 800A0984 E7A60054 */ swc1 $f6, 0x54($sp) -/* B17B28 800A0988 85180002 */ lh $t8, 2($t0) -/* B17B2C 800A098C 44984000 */ mtc1 $t8, $f8 -/* B17B30 800A0990 00000000 */ nop -/* B17B34 800A0994 468042A0 */ cvt.s.w $f10, $f8 -/* B17B38 800A0998 E7AA0058 */ swc1 $f10, 0x58($sp) -/* B17B3C 800A099C 850F0004 */ lh $t7, 4($t0) -/* B17B40 800A09A0 448F8000 */ mtc1 $t7, $f16 -/* B17B44 800A09A4 00000000 */ nop -/* B17B48 800A09A8 468084A0 */ cvt.s.w $f18, $f16 -/* B17B4C 800A09AC E7B2005C */ swc1 $f18, 0x5c($sp) -/* B17B50 800A09B0 8F2C0008 */ lw $t4, 8($t9) -/* B17B54 800A09B4 11A00008 */ beqz $t5, .L800A09D8 -/* B17B58 800A09B8 AFAC0060 */ sw $t4, 0x60($sp) -/* B17B5C 800A09BC 8FAE0080 */ lw $t6, 0x80($sp) -/* B17B60 800A09C0 AFAA0010 */ sw $t2, 0x10($sp) -/* B17B64 800A09C4 AFA80064 */ sw $t0, 0x64($sp) -/* B17B68 800A09C8 01A0F809 */ jalr $t5 -/* B17B6C 800A09CC AFAE0014 */ sw $t6, 0x14($sp) -/* B17B70 800A09D0 14400022 */ bnez $v0, .L800A0A5C -/* B17B74 800A09D4 8FA80064 */ lw $t0, 0x64($sp) -.L800A09D8: -/* B17B78 800A09D8 27A40054 */ addiu $a0, $sp, 0x54 -/* B17B7C 800A09DC 27A5004C */ addiu $a1, $sp, 0x4c -/* B17B80 800A09E0 0C0344D0 */ jal func_800D1340 -/* B17B84 800A09E4 AFA80064 */ sw $t0, 0x64($sp) -/* B17B88 800A09E8 8FB80060 */ lw $t8, 0x60($sp) -/* B17B8C 800A09EC 8FA80064 */ lw $t0, 0x64($sp) -/* B17B90 800A09F0 8FA70048 */ lw $a3, 0x48($sp) -/* B17B94 800A09F4 13000019 */ beqz $t8, .L800A0A5C -/* B17B98 800A09F8 3C09DA38 */ lui $t1, (0xDA380003 >> 16) # lui $t1, 0xda38 -/* B17B9C 800A09FC 8CE202C0 */ lw $v0, 0x2c0($a3) -/* B17BA0 800A0A00 35290003 */ ori $t1, (0xDA380003 & 0xFFFF) # ori $t1, $t1, 3 -/* B17BA4 800A0A04 3C058014 */ lui $a1, %hi(D_8013FF64) # $a1, 0x8014 -/* B17BA8 800A0A08 244F0008 */ addiu $t7, $v0, 8 -/* B17BAC 800A0A0C ACEF02C0 */ sw $t7, 0x2c0($a3) -/* B17BB0 800A0A10 AC490000 */ sw $t1, ($v0) -/* B17BB4 800A0A14 8FAB0068 */ lw $t3, 0x68($sp) -/* B17BB8 800A0A18 24A5FF64 */ addiu $a1, %lo(D_8013FF64) # addiu $a1, $a1, -0x9c -/* B17BBC 800A0A1C 24060325 */ li $a2, 805 -/* B17BC0 800A0A20 8D640000 */ lw $a0, ($t3) -/* B17BC4 800A0A24 AFA80064 */ sw $t0, 0x64($sp) -/* B17BC8 800A0A28 0C0346A2 */ jal Matrix_NewMtx -/* B17BCC 800A0A2C AFA20034 */ sw $v0, 0x34($sp) -/* B17BD0 800A0A30 8FA30034 */ lw $v1, 0x34($sp) -/* B17BD4 800A0A34 8FA80064 */ lw $t0, 0x64($sp) -/* B17BD8 800A0A38 3C0ADE00 */ lui $t2, 0xde00 -/* B17BDC 800A0A3C AC620004 */ sw $v0, 4($v1) -/* B17BE0 800A0A40 8FB90048 */ lw $t9, 0x48($sp) -/* B17BE4 800A0A44 8F2202C0 */ lw $v0, 0x2c0($t9) -/* B17BE8 800A0A48 244C0008 */ addiu $t4, $v0, 8 -/* B17BEC 800A0A4C AF2C02C0 */ sw $t4, 0x2c0($t9) -/* B17BF0 800A0A50 AC4A0000 */ sw $t2, ($v0) -/* B17BF4 800A0A54 8FAE0060 */ lw $t6, 0x60($sp) -/* B17BF8 800A0A58 AC4E0004 */ sw $t6, 4($v0) -.L800A0A5C: -/* B17BFC 800A0A5C 8FAD007C */ lw $t5, 0x7c($sp) -/* B17C00 800A0A60 8FA40068 */ lw $a0, 0x68($sp) -/* B17C04 800A0A64 8FA5006C */ lw $a1, 0x6c($sp) -/* B17C08 800A0A68 11A00007 */ beqz $t5, .L800A0A88 -/* B17C0C 800A0A6C 27A60060 */ addiu $a2, $sp, 0x60 -/* B17C10 800A0A70 8FB80080 */ lw $t8, 0x80($sp) -/* B17C14 800A0A74 27A7004C */ addiu $a3, $sp, 0x4c -/* B17C18 800A0A78 AFA80064 */ sw $t0, 0x64($sp) -/* B17C1C 800A0A7C 01A0F809 */ jalr $t5 -/* B17C20 800A0A80 AFB80010 */ sw $t8, 0x10($sp) -/* B17C24 800A0A84 8FA80064 */ lw $t0, 0x64($sp) -.L800A0A88: -/* B17C28 800A0A88 91050006 */ lbu $a1, 6($t0) -/* B17C2C 800A0A8C 240100FF */ li $at, 255 -/* B17C30 800A0A90 8FA40068 */ lw $a0, 0x68($sp) -/* B17C34 800A0A94 10A1000D */ beq $a1, $at, .L800A0ACC -/* B17C38 800A0A98 8FA60070 */ lw $a2, 0x70($sp) -/* B17C3C 800A0A9C 8FAF0078 */ lw $t7, 0x78($sp) -/* B17C40 800A0AA0 8FA9007C */ lw $t1, 0x7c($sp) -/* B17C44 800A0AA4 8FAB0080 */ lw $t3, 0x80($sp) -/* B17C48 800A0AA8 8FAC0084 */ lw $t4, 0x84($sp) -/* B17C4C 800A0AAC 8FA70074 */ lw $a3, 0x74($sp) -/* B17C50 800A0AB0 AFA80064 */ sw $t0, 0x64($sp) -/* B17C54 800A0AB4 AFAF0010 */ sw $t7, 0x10($sp) -/* B17C58 800A0AB8 AFA90014 */ sw $t1, 0x14($sp) -/* B17C5C 800A0ABC AFAB0018 */ sw $t3, 0x18($sp) -/* B17C60 800A0AC0 0C028228 */ jal func_800A08A0 -/* B17C64 800A0AC4 AFAC001C */ sw $t4, 0x1c($sp) -/* B17C68 800A0AC8 8FA80064 */ lw $t0, 0x64($sp) -.L800A0ACC: -/* B17C6C 800A0ACC 0C034221 */ jal Matrix_Pull -/* B17C70 800A0AD0 AFA80064 */ sw $t0, 0x64($sp) -/* B17C74 800A0AD4 8FA80064 */ lw $t0, 0x64($sp) -/* B17C78 800A0AD8 240100FF */ li $at, 255 -/* B17C7C 800A0ADC 8FA40068 */ lw $a0, 0x68($sp) -/* B17C80 800A0AE0 91050007 */ lbu $a1, 7($t0) -/* B17C84 800A0AE4 8FA60070 */ lw $a2, 0x70($sp) -/* B17C88 800A0AE8 8FA70074 */ lw $a3, 0x74($sp) -/* B17C8C 800A0AEC 10A10009 */ beq $a1, $at, .L800A0B14 -/* B17C90 800A0AF0 8FB90078 */ lw $t9, 0x78($sp) -/* B17C94 800A0AF4 8FAA007C */ lw $t2, 0x7c($sp) -/* B17C98 800A0AF8 8FAE0080 */ lw $t6, 0x80($sp) -/* B17C9C 800A0AFC 8FB80084 */ lw $t8, 0x84($sp) -/* B17CA0 800A0B00 AFB90010 */ sw $t9, 0x10($sp) -/* B17CA4 800A0B04 AFAA0014 */ sw $t2, 0x14($sp) -/* B17CA8 800A0B08 AFAE0018 */ sw $t6, 0x18($sp) -/* B17CAC 800A0B0C 0C028228 */ jal func_800A08A0 -/* B17CB0 800A0B10 AFB8001C */ sw $t8, 0x1c($sp) -.L800A0B14: -/* B17CB4 800A0B14 8FAD0068 */ lw $t5, 0x68($sp) -/* B17CB8 800A0B18 3C068014 */ lui $a2, %hi(D_8013FF78) # $a2, 0x8014 -/* B17CBC 800A0B1C 24C6FF78 */ addiu $a2, %lo(D_8013FF78) # addiu $a2, $a2, -0x88 -/* B17CC0 800A0B20 27A40038 */ addiu $a0, $sp, 0x38 -/* B17CC4 800A0B24 24070335 */ li $a3, 821 -/* B17CC8 800A0B28 0C031AD5 */ jal func_800C6B54 -/* B17CCC 800A0B2C 8DA50000 */ lw $a1, ($t5) -/* B17CD0 800A0B30 8FBF0024 */ lw $ra, 0x24($sp) -/* B17CD4 800A0B34 27BD0068 */ addiu $sp, $sp, 0x68 -/* B17CD8 800A0B38 03E00008 */ jr $ra -/* B17CDC 800A0B3C 00000000 */ nop - diff --git a/asm/non_matchings/code/z_skelanime/func_800A0B40.s b/asm/non_matchings/code/z_skelanime/func_800A0B40.s deleted file mode 100644 index 54889d1b72..0000000000 --- a/asm/non_matchings/code/z_skelanime/func_800A0B40.s +++ /dev/null @@ -1,185 +0,0 @@ -.rdata -glabel D_8013FF8C - .asciz "\x1b[31m" - .balign 4 - -glabel D_8013FF94 - .asciz "Si2_Lod_draw():skelがNULLです。\n" - # EUC-JP: がNULLです。| Is null - .balign 4 - -glabel D_8013FFB8 - .asciz "\x1b[m" - .balign 4 - -glabel D_8013FFBC - .asciz "../z_skelanime.c" - .balign 4 - -glabel D_8013FFD0 - .asciz "../z_skelanime.c" - .balign 4 - -glabel D_8013FFE4 - .asciz "../z_skelanime.c" - .balign 4 - -.text -glabel func_800A0B40 -/* B17CE0 800A0B40 27BDFF98 */ addiu $sp, $sp, -0x68 -/* B17CE4 800A0B44 AFBF0024 */ sw $ra, 0x24($sp) -/* B17CE8 800A0B48 AFA40068 */ sw $a0, 0x68($sp) -/* B17CEC 800A0B4C AFA5006C */ sw $a1, 0x6c($sp) -/* B17CF0 800A0B50 AFA60070 */ sw $a2, 0x70($sp) -/* B17CF4 800A0B54 14A0000C */ bnez $a1, .L800A0B88 -/* B17CF8 800A0B58 AFA70074 */ sw $a3, 0x74($sp) -/* B17CFC 800A0B5C 3C048014 */ lui $a0, %hi(D_8013FF8C) # $a0, 0x8014 -/* B17D00 800A0B60 0C00084C */ jal osSyncPrintf -/* B17D04 800A0B64 2484FF8C */ addiu $a0, %lo(D_8013FF8C) # addiu $a0, $a0, -0x74 -/* B17D08 800A0B68 3C048014 */ lui $a0, %hi(D_8013FF94) # $a0, 0x8014 -/* B17D0C 800A0B6C 0C00084C */ jal osSyncPrintf -/* B17D10 800A0B70 2484FF94 */ addiu $a0, %lo(D_8013FF94) # addiu $a0, $a0, -0x6c -/* B17D14 800A0B74 3C048014 */ lui $a0, %hi(D_8013FFB8) # $a0, 0x8014 -/* B17D18 800A0B78 0C00084C */ jal osSyncPrintf -/* B17D1C 800A0B7C 2484FFB8 */ addiu $a0, %lo(D_8013FFB8) # addiu $a0, $a0, -0x48 -/* B17D20 800A0B80 10000081 */ b .L800A0D88 -/* B17D24 800A0B84 8FBF0024 */ lw $ra, 0x24($sp) -.L800A0B88: -/* B17D28 800A0B88 8FAF0068 */ lw $t7, 0x68($sp) -/* B17D2C 800A0B8C 3C068014 */ lui $a2, %hi(D_8013FFBC) # $a2, 0x8014 -/* B17D30 800A0B90 24C6FFBC */ addiu $a2, %lo(D_8013FFBC) # addiu $a2, $a2, -0x44 -/* B17D34 800A0B94 8DE50000 */ lw $a1, ($t7) -/* B17D38 800A0B98 27A40034 */ addiu $a0, $sp, 0x34 -/* B17D3C 800A0B9C 24070351 */ li $a3, 849 -/* B17D40 800A0BA0 0C031AB1 */ jal func_800C6AC4 -/* B17D44 800A0BA4 AFA50044 */ sw $a1, 0x44($sp) -/* B17D48 800A0BA8 0C034213 */ jal Matrix_Push -/* B17D4C 800A0BAC 00000000 */ nop -/* B17D50 800A0BB0 8FB8006C */ lw $t8, 0x6c($sp) -/* B17D54 800A0BB4 3C0B8016 */ lui $t3, %hi(gSegments) -/* B17D58 800A0BB8 3C0100FF */ lui $at, (0x00FFFFFF >> 16) # lui $at, 0xff -/* B17D5C 800A0BBC 8F020000 */ lw $v0, ($t8) -/* B17D60 800A0BC0 3421FFFF */ ori $at, (0x00FFFFFF & 0xFFFF) # ori $at, $at, 0xffff -/* B17D64 800A0BC4 8FA30070 */ lw $v1, 0x70($sp) -/* B17D68 800A0BC8 00024100 */ sll $t0, $v0, 4 -/* B17D6C 800A0BCC 00084F02 */ srl $t1, $t0, 0x1c -/* B17D70 800A0BD0 00095080 */ sll $t2, $t1, 2 -/* B17D74 800A0BD4 016A5821 */ addu $t3, $t3, $t2 -/* B17D78 800A0BD8 8D6B6FA8 */ lw $t3, %lo(gSegments)($t3) -/* B17D7C 800A0BDC 0041C824 */ and $t9, $v0, $at -/* B17D80 800A0BE0 3C018000 */ lui $at, 0x8000 -/* B17D84 800A0BE4 032B6021 */ addu $t4, $t9, $t3 -/* B17D88 800A0BE8 01816821 */ addu $t5, $t4, $at -/* B17D8C 800A0BEC AFAD0064 */ sw $t5, 0x64($sp) -/* B17D90 800A0BF0 846E0000 */ lh $t6, ($v1) -/* B17D94 800A0BF4 27A80048 */ addiu $t0, $sp, 0x48 -/* B17D98 800A0BF8 24050001 */ li $a1, 1 -/* B17D9C 800A0BFC 448E2000 */ mtc1 $t6, $f4 -/* B17DA0 800A0C00 27A6005C */ addiu $a2, $sp, 0x5c -/* B17DA4 800A0C04 27A70050 */ addiu $a3, $sp, 0x50 -/* B17DA8 800A0C08 468021A0 */ cvt.s.w $f6, $f4 -/* B17DAC 800A0C0C E7A60050 */ swc1 $f6, 0x50($sp) -/* B17DB0 800A0C10 846F0002 */ lh $t7, 2($v1) -/* B17DB4 800A0C14 448F4000 */ mtc1 $t7, $f8 -/* B17DB8 800A0C18 00000000 */ nop -/* B17DBC 800A0C1C 468042A0 */ cvt.s.w $f10, $f8 -/* B17DC0 800A0C20 E7AA0054 */ swc1 $f10, 0x54($sp) -/* B17DC4 800A0C24 84780004 */ lh $t8, 4($v1) -/* B17DC8 800A0C28 44988000 */ mtc1 $t8, $f16 -/* B17DCC 800A0C2C 27B80048 */ addiu $t8, $sp, 0x48 -/* B17DD0 800A0C30 468084A0 */ cvt.s.w $f18, $f16 -/* B17DD4 800A0C34 E7B20058 */ swc1 $f18, 0x58($sp) -/* B17DD8 800A0C38 886A0006 */ lwl $t2, 6($v1) -/* B17DDC 800A0C3C 986A0009 */ lwr $t2, 9($v1) -/* B17DE0 800A0C40 AD0A0000 */ sw $t2, ($t0) -/* B17DE4 800A0C44 946A000A */ lhu $t2, 0xa($v1) -/* B17DE8 800A0C48 A50A0004 */ sh $t2, 4($t0) -/* B17DEC 800A0C4C 8FAB0080 */ lw $t3, 0x80($sp) -/* B17DF0 800A0C50 8FB90064 */ lw $t9, 0x64($sp) -/* B17DF4 800A0C54 8FAF0074 */ lw $t7, 0x74($sp) -/* B17DF8 800A0C58 000B6080 */ sll $t4, $t3, 2 -/* B17DFC 800A0C5C 032C6821 */ addu $t5, $t9, $t4 -/* B17E00 800A0C60 8DAE0008 */ lw $t6, 8($t5) -/* B17E04 800A0C64 8FA40068 */ lw $a0, 0x68($sp) -/* B17E08 800A0C68 11E00006 */ beqz $t7, .L800A0C84 -/* B17E0C 800A0C6C AFAE005C */ sw $t6, 0x5c($sp) -/* B17E10 800A0C70 8FA8007C */ lw $t0, 0x7c($sp) -/* B17E14 800A0C74 AFB80010 */ sw $t8, 0x10($sp) -/* B17E18 800A0C78 01E0F809 */ jalr $t7 -/* B17E1C 800A0C7C AFA80014 */ sw $t0, 0x14($sp) -/* B17E20 800A0C80 1440001E */ bnez $v0, .L800A0CFC -.L800A0C84: -/* B17E24 800A0C84 27A40050 */ addiu $a0, $sp, 0x50 -/* B17E28 800A0C88 0C0344D0 */ jal func_800D1340 -/* B17E2C 800A0C8C 27A50048 */ addiu $a1, $sp, 0x48 -/* B17E30 800A0C90 8FA9005C */ lw $t1, 0x5c($sp) -/* B17E34 800A0C94 8FA70044 */ lw $a3, 0x44($sp) -/* B17E38 800A0C98 3C0BDA38 */ lui $t3, (0xDA380003 >> 16) # lui $t3, 0xda38 -/* B17E3C 800A0C9C 51200018 */ beql $t1, $zero, .L800A0D00 -/* B17E40 800A0CA0 8FA20078 */ lw $v0, 0x78($sp) -/* B17E44 800A0CA4 8CE202C0 */ lw $v0, 0x2c0($a3) -/* B17E48 800A0CA8 356B0003 */ ori $t3, (0xDA380003 & 0xFFFF) # ori $t3, $t3, 3 -/* B17E4C 800A0CAC 3C058014 */ lui $a1, %hi(D_8013FFD0) # $a1, 0x8014 -/* B17E50 800A0CB0 244A0008 */ addiu $t2, $v0, 8 -/* B17E54 800A0CB4 ACEA02C0 */ sw $t2, 0x2c0($a3) -/* B17E58 800A0CB8 AC4B0000 */ sw $t3, ($v0) -/* B17E5C 800A0CBC 8FB90068 */ lw $t9, 0x68($sp) -/* B17E60 800A0CC0 24A5FFD0 */ addiu $a1, %lo(D_8013FFD0) # addiu $a1, $a1, -0x30 -/* B17E64 800A0CC4 24060371 */ li $a2, 881 -/* B17E68 800A0CC8 8F240000 */ lw $a0, ($t9) -/* B17E6C 800A0CCC 0C0346A2 */ jal Matrix_NewMtx -/* B17E70 800A0CD0 AFA20030 */ sw $v0, 0x30($sp) -/* B17E74 800A0CD4 8FA30030 */ lw $v1, 0x30($sp) -/* B17E78 800A0CD8 3C0EDE00 */ lui $t6, 0xde00 -/* B17E7C 800A0CDC AC620004 */ sw $v0, 4($v1) -/* B17E80 800A0CE0 8FAC0044 */ lw $t4, 0x44($sp) -/* B17E84 800A0CE4 8D8202C0 */ lw $v0, 0x2c0($t4) -/* B17E88 800A0CE8 244D0008 */ addiu $t5, $v0, 8 -/* B17E8C 800A0CEC AD8D02C0 */ sw $t5, 0x2c0($t4) -/* B17E90 800A0CF0 AC4E0000 */ sw $t6, ($v0) -/* B17E94 800A0CF4 8FB8005C */ lw $t8, 0x5c($sp) -/* B17E98 800A0CF8 AC580004 */ sw $t8, 4($v0) -.L800A0CFC: -/* B17E9C 800A0CFC 8FA20078 */ lw $v0, 0x78($sp) -.L800A0D00: -/* B17EA0 800A0D00 8FA40068 */ lw $a0, 0x68($sp) -/* B17EA4 800A0D04 24050001 */ li $a1, 1 -/* B17EA8 800A0D08 10400006 */ beqz $v0, .L800A0D24 -/* B17EAC 800A0D0C 27A6005C */ addiu $a2, $sp, 0x5c -/* B17EB0 800A0D10 8FA8007C */ lw $t0, 0x7c($sp) -/* B17EB4 800A0D14 27A70048 */ addiu $a3, $sp, 0x48 -/* B17EB8 800A0D18 0040F809 */ jalr $v0 -/* B17EBC 800A0D1C AFA80010 */ sw $t0, 0x10($sp) -/* B17EC0 800A0D20 8FA20078 */ lw $v0, 0x78($sp) -.L800A0D24: -/* B17EC4 800A0D24 8FAF0064 */ lw $t7, 0x64($sp) -/* B17EC8 800A0D28 240100FF */ li $at, 255 -/* B17ECC 800A0D2C 8FA40068 */ lw $a0, 0x68($sp) -/* B17ED0 800A0D30 91E50006 */ lbu $a1, 6($t7) -/* B17ED4 800A0D34 8FA6006C */ lw $a2, 0x6c($sp) -/* B17ED8 800A0D38 8FA70070 */ lw $a3, 0x70($sp) -/* B17EDC 800A0D3C 10A10008 */ beq $a1, $at, .L800A0D60 -/* B17EE0 800A0D40 8FA90074 */ lw $t1, 0x74($sp) -/* B17EE4 800A0D44 8FAA007C */ lw $t2, 0x7c($sp) -/* B17EE8 800A0D48 8FAB0080 */ lw $t3, 0x80($sp) -/* B17EEC 800A0D4C AFA90010 */ sw $t1, 0x10($sp) -/* B17EF0 800A0D50 AFA20014 */ sw $v0, 0x14($sp) -/* B17EF4 800A0D54 AFAA0018 */ sw $t2, 0x18($sp) -/* B17EF8 800A0D58 0C028228 */ jal func_800A08A0 -/* B17EFC 800A0D5C AFAB001C */ sw $t3, 0x1c($sp) -.L800A0D60: -/* B17F00 800A0D60 0C034221 */ jal Matrix_Pull -/* B17F04 800A0D64 00000000 */ nop -/* B17F08 800A0D68 8FB90068 */ lw $t9, 0x68($sp) -/* B17F0C 800A0D6C 3C068014 */ lui $a2, %hi(D_8013FFE4) # $a2, 0x8014 -/* B17F10 800A0D70 24C6FFE4 */ addiu $a2, %lo(D_8013FFE4) # addiu $a2, $a2, -0x1c -/* B17F14 800A0D74 27A40034 */ addiu $a0, $sp, 0x34 -/* B17F18 800A0D78 2407037E */ li $a3, 894 -/* B17F1C 800A0D7C 0C031AD5 */ jal func_800C6B54 -/* B17F20 800A0D80 8F250000 */ lw $a1, ($t9) -/* B17F24 800A0D84 8FBF0024 */ lw $ra, 0x24($sp) -.L800A0D88: -/* B17F28 800A0D88 27BD0068 */ addiu $sp, $sp, 0x68 -/* B17F2C 800A0D8C 03E00008 */ jr $ra -/* B17F30 800A0D90 00000000 */ nop - diff --git a/asm/non_matchings/code/z_skelanime/func_800A0D94.s b/asm/non_matchings/code/z_skelanime/func_800A0D94.s deleted file mode 100644 index eb10592b7e..0000000000 --- a/asm/non_matchings/code/z_skelanime/func_800A0D94.s +++ /dev/null @@ -1,208 +0,0 @@ -.rdata -glabel D_8013FFF8 - .asciz "../z_skelanime.c" - .balign 4 - -glabel D_8014000C - .asciz "../z_skelanime.c" - .balign 4 - -glabel D_80140020 - .asciz "../z_skelanime.c" - .balign 4 - -glabel D_80140034 - .asciz "../z_skelanime.c" - .balign 4 - -.text -glabel func_800A0D94 -/* B17F34 800A0D94 27BDFF90 */ addiu $sp, $sp, -0x70 -/* B17F38 800A0D98 AFBF002C */ sw $ra, 0x2c($sp) -/* B17F3C 800A0D9C AFA40070 */ sw $a0, 0x70($sp) -/* B17F40 800A0DA0 AFA50074 */ sw $a1, 0x74($sp) -/* B17F44 800A0DA4 AFA60078 */ sw $a2, 0x78($sp) -/* B17F48 800A0DA8 0C034213 */ jal Matrix_Push -/* B17F4C 800A0DAC AFA7007C */ sw $a3, 0x7c($sp) -/* B17F50 800A0DB0 8FAF0074 */ lw $t7, 0x74($sp) -/* B17F54 800A0DB4 8FAE0078 */ lw $t6, 0x78($sp) -/* B17F58 800A0DB8 3C0D8016 */ lui $t5, %hi(gSegments) -/* B17F5C 800A0DBC 000FC080 */ sll $t8, $t7, 2 -/* B17F60 800A0DC0 01D8C821 */ addu $t9, $t6, $t8 -/* B17F64 800A0DC4 8F220000 */ lw $v0, ($t9) -/* B17F68 800A0DC8 25EE0001 */ addiu $t6, $t7, 1 -/* B17F6C 800A0DCC 8FB9007C */ lw $t9, 0x7c($sp) -/* B17F70 800A0DD0 00025100 */ sll $t2, $v0, 4 -/* B17F74 800A0DD4 000A5F02 */ srl $t3, $t2, 0x1c -/* B17F78 800A0DD8 000B6080 */ sll $t4, $t3, 2 -/* B17F7C 800A0DDC 01AC6821 */ addu $t5, $t5, $t4 -/* B17F80 800A0DE0 8DAD6FA8 */ lw $t5, %lo(gSegments)($t5) -/* B17F84 800A0DE4 3C0100FF */ lui $at, (0x00FFFFFF >> 16) # lui $at, 0xff -/* B17F88 800A0DE8 000E5080 */ sll $t2, $t6, 2 -/* B17F8C 800A0DEC 3421FFFF */ ori $at, (0x00FFFFFF & 0xFFFF) # ori $at, $at, 0xffff -/* B17F90 800A0DF0 014E5023 */ subu $t2, $t2, $t6 -/* B17F94 800A0DF4 000A5040 */ sll $t2, $t2, 1 -/* B17F98 800A0DF8 00414824 */ and $t1, $v0, $at -/* B17F9C 800A0DFC AFAE0074 */ sw $t6, 0x74($sp) -/* B17FA0 800A0E00 032A5821 */ addu $t3, $t9, $t2 -/* B17FA4 800A0E04 012D1821 */ addu $v1, $t1, $t5 -/* B17FA8 800A0E08 89690000 */ lwl $t1, ($t3) -/* B17FAC 800A0E0C 99690003 */ lwr $t1, 3($t3) -/* B17FB0 800A0E10 27B80050 */ addiu $t8, $sp, 0x50 -/* B17FB4 800A0E14 3C018000 */ lui $at, 0x8000 -/* B17FB8 800A0E18 AF090000 */ sw $t1, ($t8) -/* B17FBC 800A0E1C 95690004 */ lhu $t1, 4($t3) -/* B17FC0 800A0E20 00611821 */ addu $v1, $v1, $at -/* B17FC4 800A0E24 27A60068 */ addiu $a2, $sp, 0x68 -/* B17FC8 800A0E28 A7090004 */ sh $t1, 4($t8) -/* B17FCC 800A0E2C 846D0000 */ lh $t5, ($v1) -/* B17FD0 800A0E30 8FB9008C */ lw $t9, 0x8c($sp) -/* B17FD4 800A0E34 8FAC0080 */ lw $t4, 0x80($sp) -/* B17FD8 800A0E38 448D2000 */ mtc1 $t5, $f4 -/* B17FDC 800A0E3C 00195080 */ sll $t2, $t9, 2 -/* B17FE0 800A0E40 006AC021 */ addu $t8, $v1, $t2 -/* B17FE4 800A0E44 468021A0 */ cvt.s.w $f6, $f4 -/* B17FE8 800A0E48 8FA50074 */ lw $a1, 0x74($sp) -/* B17FEC 800A0E4C 8FA40070 */ lw $a0, 0x70($sp) -/* B17FF0 800A0E50 27A90050 */ addiu $t1, $sp, 0x50 -/* B17FF4 800A0E54 27A70058 */ addiu $a3, $sp, 0x58 -/* B17FF8 800A0E58 E7A60058 */ swc1 $f6, 0x58($sp) -/* B17FFC 800A0E5C 846F0002 */ lh $t7, 2($v1) -/* B18000 800A0E60 448F4000 */ mtc1 $t7, $f8 -/* B18004 800A0E64 00000000 */ nop -/* B18008 800A0E68 468042A0 */ cvt.s.w $f10, $f8 -/* B1800C 800A0E6C E7AA005C */ swc1 $f10, 0x5c($sp) -/* B18010 800A0E70 846E0004 */ lh $t6, 4($v1) -/* B18014 800A0E74 448E8000 */ mtc1 $t6, $f16 -/* B18018 800A0E78 00000000 */ nop -/* B1801C 800A0E7C 468084A0 */ cvt.s.w $f18, $f16 -/* B18020 800A0E80 E7B20060 */ swc1 $f18, 0x60($sp) -/* B18024 800A0E84 8F0B0008 */ lw $t3, 8($t8) -/* B18028 800A0E88 AFA3006C */ sw $v1, 0x6c($sp) -/* B1802C 800A0E8C AFAB0064 */ sw $t3, 0x64($sp) -/* B18030 800A0E90 11800007 */ beqz $t4, .L800A0EB0 -/* B18034 800A0E94 AFAB0068 */ sw $t3, 0x68($sp) -/* B18038 800A0E98 8FAD0088 */ lw $t5, 0x88($sp) -/* B1803C 800A0E9C AFA90010 */ sw $t1, 0x10($sp) -/* B18040 800A0EA0 AFA3006C */ sw $v1, 0x6c($sp) -/* B18044 800A0EA4 0180F809 */ jalr $t4 -/* B18048 800A0EA8 AFAD0014 */ sw $t5, 0x14($sp) -/* B1804C 800A0EAC 1440003C */ bnez $v0, .L800A0FA0 -.L800A0EB0: -/* B18050 800A0EB0 27A40058 */ addiu $a0, $sp, 0x58 -/* B18054 800A0EB4 0C0344D0 */ jal func_800D1340 -/* B18058 800A0EB8 27A50050 */ addiu $a1, $sp, 0x50 -/* B1805C 800A0EBC 8FAF0068 */ lw $t7, 0x68($sp) -/* B18060 800A0EC0 8FAE0090 */ lw $t6, 0x90($sp) -/* B18064 800A0EC4 3C058014 */ lui $a1, %hi(D_8013FFF8) # $a1, 0x8014 -/* B18068 800A0EC8 11E0002A */ beqz $t7, .L800A0F74 -/* B1806C 800A0ECC 8FAB0064 */ lw $t3, 0x64($sp) -/* B18070 800A0ED0 8DC40000 */ lw $a0, ($t6) -/* B18074 800A0ED4 24A5FFF8 */ addiu $a1, %lo(D_8013FFF8) # addiu $a1, $a1, -8 -/* B18078 800A0ED8 0C034695 */ jal Matrix_ToMtx -/* B1807C 800A0EDC 240603B1 */ li $a2, 945 -/* B18080 800A0EE0 8FB90070 */ lw $t9, 0x70($sp) -/* B18084 800A0EE4 3C068014 */ lui $a2, %hi(D_8014000C) # $a2, 0x8014 -/* B18088 800A0EE8 24C6000C */ addiu $a2, %lo(D_8014000C) # addiu $a2, $a2, 0xc -/* B1808C 800A0EEC 8F250000 */ lw $a1, ($t9) -/* B18090 800A0EF0 27A4003C */ addiu $a0, $sp, 0x3c -/* B18094 800A0EF4 240703B2 */ li $a3, 946 -/* B18098 800A0EF8 0C031AB1 */ jal func_800C6AC4 -/* B1809C 800A0EFC AFA5004C */ sw $a1, 0x4c($sp) -/* B180A0 800A0F00 8FA8004C */ lw $t0, 0x4c($sp) -/* B180A4 800A0F04 3C18DA38 */ lui $t8, (0xDA380003 >> 16) # lui $t8, 0xda38 -/* B180A8 800A0F08 37180003 */ ori $t8, (0xDA380003 & 0xFFFF) # ori $t8, $t8, 3 -/* B180AC 800A0F0C 8D0302C0 */ lw $v1, 0x2c0($t0) -/* B180B0 800A0F10 3C0CDE00 */ lui $t4, 0xde00 -/* B180B4 800A0F14 3C068014 */ lui $a2, %hi(D_80140020) # $a2, 0x8014 -/* B180B8 800A0F18 246A0008 */ addiu $t2, $v1, 8 -/* B180BC 800A0F1C AD0A02C0 */ sw $t2, 0x2c0($t0) -/* B180C0 800A0F20 AC780000 */ sw $t8, ($v1) -/* B180C4 800A0F24 8FAB0090 */ lw $t3, 0x90($sp) -/* B180C8 800A0F28 24C60020 */ addiu $a2, %lo(D_80140020) # addiu $a2, $a2, 0x20 -/* B180CC 800A0F2C 27A4003C */ addiu $a0, $sp, 0x3c -/* B180D0 800A0F30 8D690000 */ lw $t1, ($t3) -/* B180D4 800A0F34 240703B5 */ li $a3, 949 -/* B180D8 800A0F38 AC690004 */ sw $t1, 4($v1) -/* B180DC 800A0F3C 8D0302C0 */ lw $v1, 0x2c0($t0) -/* B180E0 800A0F40 246D0008 */ addiu $t5, $v1, 8 -/* B180E4 800A0F44 AD0D02C0 */ sw $t5, 0x2c0($t0) -/* B180E8 800A0F48 AC6C0000 */ sw $t4, ($v1) -/* B180EC 800A0F4C 8FAF0068 */ lw $t7, 0x68($sp) -/* B180F0 800A0F50 AC6F0004 */ sw $t7, 4($v1) -/* B180F4 800A0F54 8FAE0070 */ lw $t6, 0x70($sp) -/* B180F8 800A0F58 0C031AD5 */ jal func_800C6B54 -/* B180FC 800A0F5C 8DC50000 */ lw $a1, ($t6) -/* B18100 800A0F60 8FB90090 */ lw $t9, 0x90($sp) -/* B18104 800A0F64 8F2A0000 */ lw $t2, ($t9) -/* B18108 800A0F68 25580040 */ addiu $t8, $t2, 0x40 -/* B1810C 800A0F6C 1000000C */ b .L800A0FA0 -/* B18110 800A0F70 AF380000 */ sw $t8, ($t9) -.L800A0F74: -/* B18114 800A0F74 1160000A */ beqz $t3, .L800A0FA0 -/* B18118 800A0F78 8FA90090 */ lw $t1, 0x90($sp) -/* B1811C 800A0F7C 3C058014 */ lui $a1, %hi(D_80140034) # $a1, 0x8014 -/* B18120 800A0F80 24A50034 */ addiu $a1, %lo(D_80140034) # addiu $a1, $a1, 0x34 -/* B18124 800A0F84 8D240000 */ lw $a0, ($t1) -/* B18128 800A0F88 0C034695 */ jal Matrix_ToMtx -/* B1812C 800A0F8C 240603BA */ li $a2, 954 -/* B18130 800A0F90 8FAD0090 */ lw $t5, 0x90($sp) -/* B18134 800A0F94 8DAC0000 */ lw $t4, ($t5) -/* B18138 800A0F98 258F0040 */ addiu $t7, $t4, 0x40 -/* B1813C 800A0F9C ADAF0000 */ sw $t7, ($t5) -.L800A0FA0: -/* B18140 800A0FA0 8FAE0084 */ lw $t6, 0x84($sp) -/* B18144 800A0FA4 8FA40070 */ lw $a0, 0x70($sp) -/* B18148 800A0FA8 8FA50074 */ lw $a1, 0x74($sp) -/* B1814C 800A0FAC 11C00005 */ beqz $t6, .L800A0FC4 -/* B18150 800A0FB0 27A60064 */ addiu $a2, $sp, 0x64 -/* B18154 800A0FB4 8FAA0088 */ lw $t2, 0x88($sp) -/* B18158 800A0FB8 27A70050 */ addiu $a3, $sp, 0x50 -/* B1815C 800A0FBC 01C0F809 */ jalr $t6 -/* B18160 800A0FC0 AFAA0010 */ sw $t2, 0x10($sp) -.L800A0FC4: -/* B18164 800A0FC4 8FB8006C */ lw $t8, 0x6c($sp) -/* B18168 800A0FC8 240100FF */ li $at, 255 -/* B1816C 800A0FCC 8FA40070 */ lw $a0, 0x70($sp) -/* B18170 800A0FD0 93050006 */ lbu $a1, 6($t8) -/* B18174 800A0FD4 8FA60078 */ lw $a2, 0x78($sp) -/* B18178 800A0FD8 8FA7007C */ lw $a3, 0x7c($sp) -/* B1817C 800A0FDC 10A1000B */ beq $a1, $at, .L800A100C -/* B18180 800A0FE0 8FB90080 */ lw $t9, 0x80($sp) -/* B18184 800A0FE4 8FAB0084 */ lw $t3, 0x84($sp) -/* B18188 800A0FE8 8FA90088 */ lw $t1, 0x88($sp) -/* B1818C 800A0FEC 8FAC008C */ lw $t4, 0x8c($sp) -/* B18190 800A0FF0 8FAF0090 */ lw $t7, 0x90($sp) -/* B18194 800A0FF4 AFB90010 */ sw $t9, 0x10($sp) -/* B18198 800A0FF8 AFAB0014 */ sw $t3, 0x14($sp) -/* B1819C 800A0FFC AFA90018 */ sw $t1, 0x18($sp) -/* B181A0 800A1000 AFAC001C */ sw $t4, 0x1c($sp) -/* B181A4 800A1004 0C028365 */ jal func_800A0D94 -/* B181A8 800A1008 AFAF0020 */ sw $t7, 0x20($sp) -.L800A100C: -/* B181AC 800A100C 0C034221 */ jal Matrix_Pull -/* B181B0 800A1010 00000000 */ nop -/* B181B4 800A1014 8FAD006C */ lw $t5, 0x6c($sp) -/* B181B8 800A1018 240100FF */ li $at, 255 -/* B181BC 800A101C 8FA40070 */ lw $a0, 0x70($sp) -/* B181C0 800A1020 91A50007 */ lbu $a1, 7($t5) -/* B181C4 800A1024 8FA60078 */ lw $a2, 0x78($sp) -/* B181C8 800A1028 8FA7007C */ lw $a3, 0x7c($sp) -/* B181CC 800A102C 10A1000B */ beq $a1, $at, .L800A105C -/* B181D0 800A1030 8FAA0080 */ lw $t2, 0x80($sp) -/* B181D4 800A1034 8FAE0084 */ lw $t6, 0x84($sp) -/* B181D8 800A1038 8FB80088 */ lw $t8, 0x88($sp) -/* B181DC 800A103C 8FB9008C */ lw $t9, 0x8c($sp) -/* B181E0 800A1040 8FAB0090 */ lw $t3, 0x90($sp) -/* B181E4 800A1044 AFAA0010 */ sw $t2, 0x10($sp) -/* B181E8 800A1048 AFAE0014 */ sw $t6, 0x14($sp) -/* B181EC 800A104C AFB80018 */ sw $t8, 0x18($sp) -/* B181F0 800A1050 AFB9001C */ sw $t9, 0x1c($sp) -/* B181F4 800A1054 0C028365 */ jal func_800A0D94 -/* B181F8 800A1058 AFAB0020 */ sw $t3, 0x20($sp) -.L800A105C: -/* B181FC 800A105C 8FBF002C */ lw $ra, 0x2c($sp) -/* B18200 800A1060 27BD0070 */ addiu $sp, $sp, 0x70 -/* B18204 800A1064 03E00008 */ jr $ra -/* B18208 800A1068 00000000 */ nop - diff --git a/asm/non_matchings/code/z_skelanime/func_800A106C.s b/asm/non_matchings/code/z_skelanime/func_800A106C.s deleted file mode 100644 index 17d1a117f3..0000000000 --- a/asm/non_matchings/code/z_skelanime/func_800A106C.s +++ /dev/null @@ -1,222 +0,0 @@ -.rdata -glabel D_80140048 - .asciz "\x1b[31m" - .balign 4 - -glabel D_80140050 - .asciz "Si2_Lod_draw_SV():skelがNULLです。\n" - # EUC-JP: がNULLです。| Is null - .balign 4 - -glabel D_80140074 - .asciz "\x1b[m" - .balign 4 - -glabel D_80140078 - .asciz "../z_skelanime.c" - .balign 4 - -glabel D_8014008C - .asciz "../z_skelanime.c" - .balign 4 - -glabel D_801400A0 - .asciz "../z_skelanime.c" - .balign 4 - -glabel D_801400B4 - .asciz "../z_skelanime.c" - .balign 4 - -.text -glabel func_800A106C -/* B1820C 800A106C 27BDFF80 */ addiu $sp, $sp, -0x80 -/* B18210 800A1070 AFBF002C */ sw $ra, 0x2c($sp) -/* B18214 800A1074 AFA40080 */ sw $a0, 0x80($sp) -/* B18218 800A1078 AFA50084 */ sw $a1, 0x84($sp) -/* B1821C 800A107C AFA60088 */ sw $a2, 0x88($sp) -/* B18220 800A1080 8C840000 */ lw $a0, ($a0) -/* B18224 800A1084 0C031A73 */ jal Graph_Alloc -/* B18228 800A1088 00072980 */ sll $a1, $a3, 6 -/* B1822C 800A108C 8FAF0084 */ lw $t7, 0x84($sp) -/* B18230 800A1090 AFA20058 */ sw $v0, 0x58($sp) -/* B18234 800A1094 8FB80080 */ lw $t8, 0x80($sp) -/* B18238 800A1098 15E0000C */ bnez $t7, .L800A10CC -/* B1823C 800A109C 27A40044 */ addiu $a0, $sp, 0x44 -/* B18240 800A10A0 3C048014 */ lui $a0, %hi(D_80140048) # $a0, 0x8014 -/* B18244 800A10A4 0C00084C */ jal osSyncPrintf -/* B18248 800A10A8 24840048 */ addiu $a0, %lo(D_80140048) # addiu $a0, $a0, 0x48 -/* B1824C 800A10AC 3C048014 */ lui $a0, %hi(D_80140050) # $a0, 0x8014 -/* B18250 800A10B0 0C00084C */ jal osSyncPrintf -/* B18254 800A10B4 24840050 */ addiu $a0, %lo(D_80140050) # addiu $a0, $a0, 0x50 -/* B18258 800A10B8 3C048014 */ lui $a0, %hi(D_80140074) # $a0, 0x8014 -/* B1825C 800A10BC 0C00084C */ jal osSyncPrintf -/* B18260 800A10C0 24840074 */ addiu $a0, %lo(D_80140074) # addiu $a0, $a0, 0x74 -/* B18264 800A10C4 1000009C */ b .L800A1338 -/* B18268 800A10C8 8FBF002C */ lw $ra, 0x2c($sp) -.L800A10CC: -/* B1826C 800A10CC 8F050000 */ lw $a1, ($t8) -/* B18270 800A10D0 3C068014 */ lui $a2, %hi(D_80140078) # $a2, 0x8014 -/* B18274 800A10D4 24C60078 */ addiu $a2, %lo(D_80140078) # addiu $a2, $a2, 0x78 -/* B18278 800A10D8 240703E8 */ li $a3, 1000 -/* B1827C 800A10DC 0C031AB1 */ jal func_800C6AC4 -/* B18280 800A10E0 AFA50054 */ sw $a1, 0x54($sp) -/* B18284 800A10E4 8FA80054 */ lw $t0, 0x54($sp) -/* B18288 800A10E8 3C09DB06 */ lui $t1, (0xDB060034 >> 16) # lui $t1, 0xdb06 -/* B1828C 800A10EC 35290034 */ ori $t1, (0xDB060034 & 0xFFFF) # ori $t1, $t1, 0x34 -/* B18290 800A10F0 8D0202C0 */ lw $v0, 0x2c0($t0) -/* B18294 800A10F4 24590008 */ addiu $t9, $v0, 8 -/* B18298 800A10F8 AD1902C0 */ sw $t9, 0x2c0($t0) -/* B1829C 800A10FC AC490000 */ sw $t1, ($v0) -/* B182A0 800A1100 8FAA0058 */ lw $t2, 0x58($sp) -/* B182A4 800A1104 AC4A0004 */ sw $t2, 4($v0) -/* B182A8 800A1108 0C034213 */ jal Matrix_Push -/* B182AC 800A110C AFA80054 */ sw $t0, 0x54($sp) -/* B182B0 800A1110 8FAB0084 */ lw $t3, 0x84($sp) -/* B182B4 800A1114 3C188016 */ lui $t8, %hi(gSegments) -/* B182B8 800A1118 3C0100FF */ lui $at, (0x00FFFFFF >> 16) # lui $at, 0xff -/* B182BC 800A111C 8D620000 */ lw $v0, ($t3) -/* B182C0 800A1120 3421FFFF */ ori $at, (0x00FFFFFF & 0xFFFF) # ori $at, $at, 0xffff -/* B182C4 800A1124 8FA30088 */ lw $v1, 0x88($sp) -/* B182C8 800A1128 00026900 */ sll $t5, $v0, 4 -/* B182CC 800A112C 000D7702 */ srl $t6, $t5, 0x1c -/* B182D0 800A1130 000E7880 */ sll $t7, $t6, 2 -/* B182D4 800A1134 030FC021 */ addu $t8, $t8, $t7 -/* B182D8 800A1138 8F186FA8 */ lw $t8, %lo(gSegments)($t8) -/* B182DC 800A113C 00416024 */ and $t4, $v0, $at -/* B182E0 800A1140 3C018000 */ lui $at, 0x8000 -/* B182E4 800A1144 0198C821 */ addu $t9, $t4, $t8 -/* B182E8 800A1148 03214821 */ addu $t1, $t9, $at -/* B182EC 800A114C AFA9007C */ sw $t1, 0x7c($sp) -/* B182F0 800A1150 846A0000 */ lh $t2, ($v1) -/* B182F4 800A1154 8FA80054 */ lw $t0, 0x54($sp) -/* B182F8 800A1158 27AE005C */ addiu $t6, $sp, 0x5c -/* B182FC 800A115C 448A2000 */ mtc1 $t2, $f4 -/* B18300 800A1160 24050001 */ li $a1, 1 -/* B18304 800A1164 27A60074 */ addiu $a2, $sp, 0x74 -/* B18308 800A1168 468021A0 */ cvt.s.w $f6, $f4 -/* B1830C 800A116C 27A70064 */ addiu $a3, $sp, 0x64 -/* B18310 800A1170 E7A60064 */ swc1 $f6, 0x64($sp) -/* B18314 800A1174 846B0002 */ lh $t3, 2($v1) -/* B18318 800A1178 448B4000 */ mtc1 $t3, $f8 -/* B1831C 800A117C 00000000 */ nop -/* B18320 800A1180 468042A0 */ cvt.s.w $f10, $f8 -/* B18324 800A1184 E7AA0068 */ swc1 $f10, 0x68($sp) -/* B18328 800A1188 846D0004 */ lh $t5, 4($v1) -/* B1832C 800A118C 448D8000 */ mtc1 $t5, $f16 -/* B18330 800A1190 00000000 */ nop -/* B18334 800A1194 468084A0 */ cvt.s.w $f18, $f16 -/* B18338 800A1198 E7B2006C */ swc1 $f18, 0x6c($sp) -/* B1833C 800A119C 886C0006 */ lwl $t4, 6($v1) -/* B18340 800A11A0 986C0009 */ lwr $t4, 9($v1) -/* B18344 800A11A4 ADCC0000 */ sw $t4, ($t6) -/* B18348 800A11A8 946C000A */ lhu $t4, 0xa($v1) -/* B1834C 800A11AC A5CC0004 */ sh $t4, 4($t6) -/* B18350 800A11B0 8FB9009C */ lw $t9, 0x9c($sp) -/* B18354 800A11B4 8FB8007C */ lw $t8, 0x7c($sp) -/* B18358 800A11B8 8FAD0090 */ lw $t5, 0x90($sp) -/* B1835C 800A11BC 00194880 */ sll $t1, $t9, 2 -/* B18360 800A11C0 03095021 */ addu $t2, $t8, $t1 -/* B18364 800A11C4 8D4B0008 */ lw $t3, 8($t2) -/* B18368 800A11C8 8FA40080 */ lw $a0, 0x80($sp) -/* B1836C 800A11CC 27AE005C */ addiu $t6, $sp, 0x5c -/* B18370 800A11D0 AFAB0070 */ sw $t3, 0x70($sp) -/* B18374 800A11D4 11A00008 */ beqz $t5, .L800A11F8 -/* B18378 800A11D8 AFAB0074 */ sw $t3, 0x74($sp) -/* B1837C 800A11DC 8FAF0098 */ lw $t7, 0x98($sp) -/* B18380 800A11E0 AFAE0010 */ sw $t6, 0x10($sp) -/* B18384 800A11E4 AFA80054 */ sw $t0, 0x54($sp) -/* B18388 800A11E8 01A0F809 */ jalr $t5 -/* B1838C 800A11EC AFAF0014 */ sw $t7, 0x14($sp) -/* B18390 800A11F0 1440002C */ bnez $v0, .L800A12A4 -/* B18394 800A11F4 8FA80054 */ lw $t0, 0x54($sp) -.L800A11F8: -/* B18398 800A11F8 27A40064 */ addiu $a0, $sp, 0x64 -/* B1839C 800A11FC 27A5005C */ addiu $a1, $sp, 0x5c -/* B183A0 800A1200 0C0344D0 */ jal func_800D1340 -/* B183A4 800A1204 AFA80054 */ sw $t0, 0x54($sp) -/* B183A8 800A1208 8FAC0074 */ lw $t4, 0x74($sp) -/* B183AC 800A120C 8FA80054 */ lw $t0, 0x54($sp) -/* B183B0 800A1210 8FA40058 */ lw $a0, 0x58($sp) -/* B183B4 800A1214 11800019 */ beqz $t4, .L800A127C -/* B183B8 800A1218 3C058014 */ lui $a1, %hi(D_8014008C) # $a1, 0x8014 -/* B183BC 800A121C 24A5008C */ addiu $a1, %lo(D_8014008C) # addiu $a1, $a1, 0x8c -/* B183C0 800A1220 24060409 */ li $a2, 1033 -/* B183C4 800A1224 0C034695 */ jal Matrix_ToMtx -/* B183C8 800A1228 AFA80054 */ sw $t0, 0x54($sp) -/* B183CC 800A122C 8FA80054 */ lw $t0, 0x54($sp) -/* B183D0 800A1230 3C18DA38 */ lui $t8, (0xDA380003 >> 16) # lui $t8, 0xda38 -/* B183D4 800A1234 37180003 */ ori $t8, (0xDA380003 & 0xFFFF) # ori $t8, $t8, 3 -/* B183D8 800A1238 8D0202C0 */ lw $v0, 0x2c0($t0) -/* B183DC 800A123C 3C0BDE00 */ lui $t3, 0xde00 -/* B183E0 800A1240 24590008 */ addiu $t9, $v0, 8 -/* B183E4 800A1244 AD1902C0 */ sw $t9, 0x2c0($t0) -/* B183E8 800A1248 AC580000 */ sw $t8, ($v0) -/* B183EC 800A124C 8FA90058 */ lw $t1, 0x58($sp) -/* B183F0 800A1250 AC490004 */ sw $t1, 4($v0) -/* B183F4 800A1254 8D0202C0 */ lw $v0, 0x2c0($t0) -/* B183F8 800A1258 244A0008 */ addiu $t2, $v0, 8 -/* B183FC 800A125C AD0A02C0 */ sw $t2, 0x2c0($t0) -/* B18400 800A1260 AC4B0000 */ sw $t3, ($v0) -/* B18404 800A1264 8FAE0074 */ lw $t6, 0x74($sp) -/* B18408 800A1268 AC4E0004 */ sw $t6, 4($v0) -/* B1840C 800A126C 8FAF0058 */ lw $t7, 0x58($sp) -/* B18410 800A1270 25ED0040 */ addiu $t5, $t7, 0x40 -/* B18414 800A1274 1000000B */ b .L800A12A4 -/* B18418 800A1278 AFAD0058 */ sw $t5, 0x58($sp) -.L800A127C: -/* B1841C 800A127C 8FAC0070 */ lw $t4, 0x70($sp) -/* B18420 800A1280 3C058014 */ lui $a1, %hi(D_801400A0) # $a1, 0x8014 -/* B18424 800A1284 24A500A0 */ addiu $a1, %lo(D_801400A0) # addiu $a1, $a1, 0xa0 -/* B18428 800A1288 11800006 */ beqz $t4, .L800A12A4 -/* B1842C 800A128C 8FA40058 */ lw $a0, 0x58($sp) -/* B18430 800A1290 0C034695 */ jal Matrix_ToMtx -/* B18434 800A1294 24060410 */ li $a2, 1040 -/* B18438 800A1298 8FB90058 */ lw $t9, 0x58($sp) -/* B1843C 800A129C 27380040 */ addiu $t8, $t9, 0x40 -/* B18440 800A12A0 AFB80058 */ sw $t8, 0x58($sp) -.L800A12A4: -/* B18444 800A12A4 8FA20094 */ lw $v0, 0x94($sp) -/* B18448 800A12A8 8FA40080 */ lw $a0, 0x80($sp) -/* B1844C 800A12AC 24050001 */ li $a1, 1 -/* B18450 800A12B0 10400006 */ beqz $v0, .L800A12CC -/* B18454 800A12B4 27A60070 */ addiu $a2, $sp, 0x70 -/* B18458 800A12B8 8FA90098 */ lw $t1, 0x98($sp) -/* B1845C 800A12BC 27A7005C */ addiu $a3, $sp, 0x5c -/* B18460 800A12C0 0040F809 */ jalr $v0 -/* B18464 800A12C4 AFA90010 */ sw $t1, 0x10($sp) -/* B18468 800A12C8 8FA20094 */ lw $v0, 0x94($sp) -.L800A12CC: -/* B1846C 800A12CC 8FAA007C */ lw $t2, 0x7c($sp) -/* B18470 800A12D0 240100FF */ li $at, 255 -/* B18474 800A12D4 8FA40080 */ lw $a0, 0x80($sp) -/* B18478 800A12D8 91450006 */ lbu $a1, 6($t2) -/* B1847C 800A12DC 8FA60084 */ lw $a2, 0x84($sp) -/* B18480 800A12E0 8FA70088 */ lw $a3, 0x88($sp) -/* B18484 800A12E4 10A1000A */ beq $a1, $at, .L800A1310 -/* B18488 800A12E8 8FAB0090 */ lw $t3, 0x90($sp) -/* B1848C 800A12EC 8FAE0098 */ lw $t6, 0x98($sp) -/* B18490 800A12F0 8FAF009C */ lw $t7, 0x9c($sp) -/* B18494 800A12F4 27AD0058 */ addiu $t5, $sp, 0x58 -/* B18498 800A12F8 AFAD0020 */ sw $t5, 0x20($sp) -/* B1849C 800A12FC AFAB0010 */ sw $t3, 0x10($sp) -/* B184A0 800A1300 AFA20014 */ sw $v0, 0x14($sp) -/* B184A4 800A1304 AFAE0018 */ sw $t6, 0x18($sp) -/* B184A8 800A1308 0C028365 */ jal func_800A0D94 -/* B184AC 800A130C AFAF001C */ sw $t7, 0x1c($sp) -.L800A1310: -/* B184B0 800A1310 0C034221 */ jal Matrix_Pull -/* B184B4 800A1314 00000000 */ nop -/* B184B8 800A1318 8FAC0080 */ lw $t4, 0x80($sp) -/* B184BC 800A131C 3C068014 */ lui $a2, %hi(D_801400B4) # $a2, 0x8014 -/* B184C0 800A1320 24C600B4 */ addiu $a2, %lo(D_801400B4) # addiu $a2, $a2, 0xb4 -/* B184C4 800A1324 27A40044 */ addiu $a0, $sp, 0x44 -/* B184C8 800A1328 2407041D */ li $a3, 1053 -/* B184CC 800A132C 0C031AD5 */ jal func_800C6B54 -/* B184D0 800A1330 8D850000 */ lw $a1, ($t4) -/* B184D4 800A1334 8FBF002C */ lw $ra, 0x2c($sp) -.L800A1338: -/* B184D8 800A1338 27BD0080 */ addiu $sp, $sp, 0x80 -/* B184DC 800A133C 03E00008 */ jr $ra -/* B184E0 800A1340 00000000 */ nop - diff --git a/asm/non_matchings/code/z_skelanime/func_800A1344.s b/asm/non_matchings/code/z_skelanime/func_800A1344.s deleted file mode 100644 index 9bfe4a4cc0..0000000000 --- a/asm/non_matchings/code/z_skelanime/func_800A1344.s +++ /dev/null @@ -1,182 +0,0 @@ -.rdata -glabel D_801400C8 - .asciz "../z_skelanime.c" - .balign 4 - -glabel D_801400DC - .asciz "../z_skelanime.c" - .balign 4 - -glabel D_801400F0 - .asciz "../z_skelanime.c" - .balign 4 - -.text -glabel func_800A1344 -/* B184E4 800A1344 27BDFF98 */ addiu $sp, $sp, -0x68 -/* B184E8 800A1348 AFBF0024 */ sw $ra, 0x24($sp) -/* B184EC 800A134C AFA40068 */ sw $a0, 0x68($sp) -/* B184F0 800A1350 AFA5006C */ sw $a1, 0x6c($sp) -/* B184F4 800A1354 AFA60070 */ sw $a2, 0x70($sp) -/* B184F8 800A1358 AFA70074 */ sw $a3, 0x74($sp) -/* B184FC 800A135C 8C850000 */ lw $a1, ($a0) -/* B18500 800A1360 3C068014 */ lui $a2, %hi(D_801400C8) # $a2, 0x8014 -/* B18504 800A1364 24C600C8 */ addiu $a2, %lo(D_801400C8) # addiu $a2, $a2, 0xc8 -/* B18508 800A1368 27A40038 */ addiu $a0, $sp, 0x38 -/* B1850C 800A136C 24070434 */ li $a3, 1076 -/* B18510 800A1370 0C031AB1 */ jal func_800C6AC4 -/* B18514 800A1374 AFA50048 */ sw $a1, 0x48($sp) -/* B18518 800A1378 0C034213 */ jal Matrix_Push -/* B1851C 800A137C 00000000 */ nop -/* B18520 800A1380 8FB8006C */ lw $t8, 0x6c($sp) -/* B18524 800A1384 8FAF0070 */ lw $t7, 0x70($sp) -/* B18528 800A1388 3C0E8016 */ lui $t6, %hi(gSegments) -/* B1852C 800A138C 0018C880 */ sll $t9, $t8, 2 -/* B18530 800A1390 01F94821 */ addu $t1, $t7, $t9 -/* B18534 800A1394 8D220000 */ lw $v0, ($t1) -/* B18538 800A1398 270F0001 */ addiu $t7, $t8, 1 -/* B1853C 800A139C 8FA90074 */ lw $t1, 0x74($sp) -/* B18540 800A13A0 00025900 */ sll $t3, $v0, 4 -/* B18544 800A13A4 000B6702 */ srl $t4, $t3, 0x1c -/* B18548 800A13A8 000C6880 */ sll $t5, $t4, 2 -/* B1854C 800A13AC 01CD7021 */ addu $t6, $t6, $t5 -/* B18550 800A13B0 8DCE6FA8 */ lw $t6, %lo(gSegments)($t6) -/* B18554 800A13B4 3C0100FF */ lui $at, (0x00FFFFFF >> 16) # lui $at, 0xff -/* B18558 800A13B8 000F5880 */ sll $t3, $t7, 2 -/* B1855C 800A13BC 3421FFFF */ ori $at, (0x00FFFFFF & 0xFFFF) # ori $at, $at, 0xffff -/* B18560 800A13C0 016F5823 */ subu $t3, $t3, $t7 -/* B18564 800A13C4 000B5840 */ sll $t3, $t3, 1 -/* B18568 800A13C8 00415024 */ and $t2, $v0, $at -/* B1856C 800A13CC AFAF006C */ sw $t7, 0x6c($sp) -/* B18570 800A13D0 012B6021 */ addu $t4, $t1, $t3 -/* B18574 800A13D4 014E4021 */ addu $t0, $t2, $t6 -/* B18578 800A13D8 898A0000 */ lwl $t2, ($t4) -/* B1857C 800A13DC 998A0003 */ lwr $t2, 3($t4) -/* B18580 800A13E0 27B9004C */ addiu $t9, $sp, 0x4c -/* B18584 800A13E4 3C018000 */ lui $at, 0x8000 -/* B18588 800A13E8 AF2A0000 */ sw $t2, ($t9) -/* B1858C 800A13EC 958A0004 */ lhu $t2, 4($t4) -/* B18590 800A13F0 01014021 */ addu $t0, $t0, $at -/* B18594 800A13F4 27A60060 */ addiu $a2, $sp, 0x60 -/* B18598 800A13F8 A72A0004 */ sh $t2, 4($t9) -/* B1859C 800A13FC 850E0000 */ lh $t6, ($t0) -/* B185A0 800A1400 8FAB0078 */ lw $t3, 0x78($sp) -/* B185A4 800A1404 8FA5006C */ lw $a1, 0x6c($sp) -/* B185A8 800A1408 448E2000 */ mtc1 $t6, $f4 -/* B185AC 800A140C 8FA40068 */ lw $a0, 0x68($sp) -/* B185B0 800A1410 27B9004C */ addiu $t9, $sp, 0x4c -/* B185B4 800A1414 468021A0 */ cvt.s.w $f6, $f4 -/* B185B8 800A1418 27A70054 */ addiu $a3, $sp, 0x54 -/* B185BC 800A141C E7A60054 */ swc1 $f6, 0x54($sp) -/* B185C0 800A1420 85180002 */ lh $t8, 2($t0) -/* B185C4 800A1424 44984000 */ mtc1 $t8, $f8 -/* B185C8 800A1428 00000000 */ nop -/* B185CC 800A142C 468042A0 */ cvt.s.w $f10, $f8 -/* B185D0 800A1430 E7AA0058 */ swc1 $f10, 0x58($sp) -/* B185D4 800A1434 850F0004 */ lh $t7, 4($t0) -/* B185D8 800A1438 448F8000 */ mtc1 $t7, $f16 -/* B185DC 800A143C 00000000 */ nop -/* B185E0 800A1440 468084A0 */ cvt.s.w $f18, $f16 -/* B185E4 800A1444 E7B2005C */ swc1 $f18, 0x5c($sp) -/* B185E8 800A1448 8D090008 */ lw $t1, 8($t0) -/* B185EC 800A144C 11600008 */ beqz $t3, .L800A1470 -/* B185F0 800A1450 AFA90060 */ sw $t1, 0x60($sp) -/* B185F4 800A1454 8FAC0080 */ lw $t4, 0x80($sp) -/* B185F8 800A1458 AFB90010 */ sw $t9, 0x10($sp) -/* B185FC 800A145C AFA80064 */ sw $t0, 0x64($sp) -/* B18600 800A1460 0160F809 */ jalr $t3 -/* B18604 800A1464 AFAC0014 */ sw $t4, 0x14($sp) -/* B18608 800A1468 14400022 */ bnez $v0, .L800A14F4 -/* B1860C 800A146C 8FA80064 */ lw $t0, 0x64($sp) -.L800A1470: -/* B18610 800A1470 27A40054 */ addiu $a0, $sp, 0x54 -/* B18614 800A1474 27A5004C */ addiu $a1, $sp, 0x4c -/* B18618 800A1478 0C0344D0 */ jal func_800D1340 -/* B1861C 800A147C AFA80064 */ sw $t0, 0x64($sp) -/* B18620 800A1480 8FAD0060 */ lw $t5, 0x60($sp) -/* B18624 800A1484 8FA80064 */ lw $t0, 0x64($sp) -/* B18628 800A1488 8FA70048 */ lw $a3, 0x48($sp) -/* B1862C 800A148C 11A00019 */ beqz $t5, .L800A14F4 -/* B18630 800A1490 3C0EDA38 */ lui $t6, (0xDA380003 >> 16) # lui $t6, 0xda38 -/* B18634 800A1494 8CE202C0 */ lw $v0, 0x2c0($a3) -/* B18638 800A1498 35CE0003 */ ori $t6, (0xDA380003 & 0xFFFF) # ori $t6, $t6, 3 -/* B1863C 800A149C 3C058014 */ lui $a1, %hi(D_801400DC) # $a1, 0x8014 -/* B18640 800A14A0 244A0008 */ addiu $t2, $v0, 8 -/* B18644 800A14A4 ACEA02C0 */ sw $t2, 0x2c0($a3) -/* B18648 800A14A8 AC4E0000 */ sw $t6, ($v0) -/* B1864C 800A14AC 8FB80068 */ lw $t8, 0x68($sp) -/* B18650 800A14B0 24A500DC */ addiu $a1, %lo(D_801400DC) # addiu $a1, $a1, 0xdc -/* B18654 800A14B4 2406044F */ li $a2, 1103 -/* B18658 800A14B8 8F040000 */ lw $a0, ($t8) -/* B1865C 800A14BC AFA80064 */ sw $t0, 0x64($sp) -/* B18660 800A14C0 0C0346A2 */ jal Matrix_NewMtx -/* B18664 800A14C4 AFA20034 */ sw $v0, 0x34($sp) -/* B18668 800A14C8 8FA30034 */ lw $v1, 0x34($sp) -/* B1866C 800A14CC 8FA80064 */ lw $t0, 0x64($sp) -/* B18670 800A14D0 3C19DE00 */ lui $t9, 0xde00 -/* B18674 800A14D4 AC620004 */ sw $v0, 4($v1) -/* B18678 800A14D8 8FAF0048 */ lw $t7, 0x48($sp) -/* B1867C 800A14DC 8DE202C0 */ lw $v0, 0x2c0($t7) -/* B18680 800A14E0 24490008 */ addiu $t1, $v0, 8 -/* B18684 800A14E4 ADE902C0 */ sw $t1, 0x2c0($t7) -/* B18688 800A14E8 AC590000 */ sw $t9, ($v0) -/* B1868C 800A14EC 8FAC0060 */ lw $t4, 0x60($sp) -/* B18690 800A14F0 AC4C0004 */ sw $t4, 4($v0) -.L800A14F4: -/* B18694 800A14F4 8FAB007C */ lw $t3, 0x7c($sp) -/* B18698 800A14F8 8FA40068 */ lw $a0, 0x68($sp) -/* B1869C 800A14FC 8FA5006C */ lw $a1, 0x6c($sp) -/* B186A0 800A1500 11600007 */ beqz $t3, .L800A1520 -/* B186A4 800A1504 27A60060 */ addiu $a2, $sp, 0x60 -/* B186A8 800A1508 8FAD0080 */ lw $t5, 0x80($sp) -/* B186AC 800A150C 27A7004C */ addiu $a3, $sp, 0x4c -/* B186B0 800A1510 AFA80064 */ sw $t0, 0x64($sp) -/* B186B4 800A1514 0160F809 */ jalr $t3 -/* B186B8 800A1518 AFAD0010 */ sw $t5, 0x10($sp) -/* B186BC 800A151C 8FA80064 */ lw $t0, 0x64($sp) -.L800A1520: -/* B186C0 800A1520 91050006 */ lbu $a1, 6($t0) -/* B186C4 800A1524 240100FF */ li $at, 255 -/* B186C8 800A1528 8FA40068 */ lw $a0, 0x68($sp) -/* B186CC 800A152C 10A1000B */ beq $a1, $at, .L800A155C -/* B186D0 800A1530 8FA60070 */ lw $a2, 0x70($sp) -/* B186D4 800A1534 8FAA0078 */ lw $t2, 0x78($sp) -/* B186D8 800A1538 8FAE007C */ lw $t6, 0x7c($sp) -/* B186DC 800A153C 8FB80080 */ lw $t8, 0x80($sp) -/* B186E0 800A1540 8FA70074 */ lw $a3, 0x74($sp) -/* B186E4 800A1544 AFA80064 */ sw $t0, 0x64($sp) -/* B186E8 800A1548 AFAA0010 */ sw $t2, 0x10($sp) -/* B186EC 800A154C AFAE0014 */ sw $t6, 0x14($sp) -/* B186F0 800A1550 0C0284D1 */ jal func_800A1344 -/* B186F4 800A1554 AFB80018 */ sw $t8, 0x18($sp) -/* B186F8 800A1558 8FA80064 */ lw $t0, 0x64($sp) -.L800A155C: -/* B186FC 800A155C 0C034221 */ jal Matrix_Pull -/* B18700 800A1560 AFA80064 */ sw $t0, 0x64($sp) -/* B18704 800A1564 8FA80064 */ lw $t0, 0x64($sp) -/* B18708 800A1568 240100FF */ li $at, 255 -/* B1870C 800A156C 8FA40068 */ lw $a0, 0x68($sp) -/* B18710 800A1570 91050007 */ lbu $a1, 7($t0) -/* B18714 800A1574 8FA60070 */ lw $a2, 0x70($sp) -/* B18718 800A1578 8FA70074 */ lw $a3, 0x74($sp) -/* B1871C 800A157C 10A10007 */ beq $a1, $at, .L800A159C -/* B18720 800A1580 8FA90078 */ lw $t1, 0x78($sp) -/* B18724 800A1584 8FAF007C */ lw $t7, 0x7c($sp) -/* B18728 800A1588 8FB90080 */ lw $t9, 0x80($sp) -/* B1872C 800A158C AFA90010 */ sw $t1, 0x10($sp) -/* B18730 800A1590 AFAF0014 */ sw $t7, 0x14($sp) -/* B18734 800A1594 0C0284D1 */ jal func_800A1344 -/* B18738 800A1598 AFB90018 */ sw $t9, 0x18($sp) -.L800A159C: -/* B1873C 800A159C 8FAC0068 */ lw $t4, 0x68($sp) -/* B18740 800A15A0 3C068014 */ lui $a2, %hi(D_801400F0) # $a2, 0x8014 -/* B18744 800A15A4 24C600F0 */ addiu $a2, %lo(D_801400F0) # addiu $a2, $a2, 0xf0 -/* B18748 800A15A8 27A40038 */ addiu $a0, $sp, 0x38 -/* B1874C 800A15AC 24070461 */ li $a3, 1121 -/* B18750 800A15B0 0C031AD5 */ jal func_800C6B54 -/* B18754 800A15B4 8D850000 */ lw $a1, ($t4) -/* B18758 800A15B8 8FBF0024 */ lw $ra, 0x24($sp) -/* B1875C 800A15BC 27BD0068 */ addiu $sp, $sp, 0x68 -/* B18760 800A15C0 03E00008 */ jr $ra -/* B18764 800A15C4 00000000 */ nop - diff --git a/asm/non_matchings/code/z_skelanime/func_800A180C.s b/asm/non_matchings/code/z_skelanime/func_800A180C.s deleted file mode 100644 index cfb1c9d1e8..0000000000 --- a/asm/non_matchings/code/z_skelanime/func_800A180C.s +++ /dev/null @@ -1,201 +0,0 @@ -.rdata -glabel D_8014016C - .asciz "../z_skelanime.c" - .balign 4 - -glabel D_80140180 - .asciz "../z_skelanime.c" - .balign 4 - -glabel D_80140194 - .asciz "../z_skelanime.c" - .balign 4 - -glabel D_801401A8 - .asciz "../z_skelanime.c" - .balign 4 - -.text -glabel func_800A180C -/* B189AC 800A180C 27BDFF98 */ addiu $sp, $sp, -0x68 -/* B189B0 800A1810 AFBF0024 */ sw $ra, 0x24($sp) -/* B189B4 800A1814 AFA40068 */ sw $a0, 0x68($sp) -/* B189B8 800A1818 AFA5006C */ sw $a1, 0x6c($sp) -/* B189BC 800A181C AFA60070 */ sw $a2, 0x70($sp) -/* B189C0 800A1820 AFA70074 */ sw $a3, 0x74($sp) -/* B189C4 800A1824 8C850000 */ lw $a1, ($a0) -/* B189C8 800A1828 3C068014 */ lui $a2, %hi(D_8014016C) # $a2, 0x8014 -/* B189CC 800A182C 24C6016C */ addiu $a2, %lo(D_8014016C) # addiu $a2, $a2, 0x16c -/* B189D0 800A1830 27A40034 */ addiu $a0, $sp, 0x34 -/* B189D4 800A1834 240704BE */ li $a3, 1214 -/* B189D8 800A1838 0C031AB1 */ jal func_800C6AC4 -/* B189DC 800A183C AFA50044 */ sw $a1, 0x44($sp) -/* B189E0 800A1840 0C034213 */ jal Matrix_Push -/* B189E4 800A1844 00000000 */ nop -/* B189E8 800A1848 8FB8006C */ lw $t8, 0x6c($sp) -/* B189EC 800A184C 8FAF0070 */ lw $t7, 0x70($sp) -/* B189F0 800A1850 3C0D8016 */ lui $t5, %hi(gSegments) -/* B189F4 800A1854 0018C880 */ sll $t9, $t8, 2 -/* B189F8 800A1858 01F94021 */ addu $t0, $t7, $t9 -/* B189FC 800A185C 8D020000 */ lw $v0, ($t0) -/* B18A00 800A1860 270E0001 */ addiu $t6, $t8, 1 -/* B18A04 800A1864 8FB90074 */ lw $t9, 0x74($sp) -/* B18A08 800A1868 000E4080 */ sll $t0, $t6, 2 -/* B18A0C 800A186C 00025100 */ sll $t2, $v0, 4 -/* B18A10 800A1870 000A5F02 */ srl $t3, $t2, 0x1c -/* B18A14 800A1874 010E4023 */ subu $t0, $t0, $t6 -/* B18A18 800A1878 000B6080 */ sll $t4, $t3, 2 -/* B18A1C 800A187C 00084040 */ sll $t0, $t0, 1 -/* B18A20 800A1880 01AC6821 */ addu $t5, $t5, $t4 -/* B18A24 800A1884 AFAE006C */ sw $t6, 0x6c($sp) -/* B18A28 800A1888 03285021 */ addu $t2, $t9, $t0 -/* B18A2C 800A188C 894C0000 */ lwl $t4, ($t2) -/* B18A30 800A1890 994C0003 */ lwr $t4, 3($t2) -/* B18A34 800A1894 8DAD6FA8 */ lw $t5, %lo(gSegments)($t5) -/* B18A38 800A1898 3C0100FF */ lui $at, (0x00FFFFFF >> 16) # lui $at, 0xff -/* B18A3C 800A189C 27AF0048 */ addiu $t7, $sp, 0x48 -/* B18A40 800A18A0 3421FFFF */ ori $at, (0x00FFFFFF & 0xFFFF) # ori $at, $at, 0xffff -/* B18A44 800A18A4 ADEC0000 */ sw $t4, ($t7) -/* B18A48 800A18A8 954C0004 */ lhu $t4, 4($t2) -/* B18A4C 800A18AC 00414824 */ and $t1, $v0, $at -/* B18A50 800A18B0 3C018000 */ lui $at, 0x8000 -/* B18A54 800A18B4 012D1821 */ addu $v1, $t1, $t5 -/* B18A58 800A18B8 00611821 */ addu $v1, $v1, $at -/* B18A5C 800A18BC A5EC0004 */ sh $t4, 4($t7) -/* B18A60 800A18C0 84690000 */ lh $t1, ($v1) -/* B18A64 800A18C4 8FA80078 */ lw $t0, 0x78($sp) -/* B18A68 800A18C8 8FA5006C */ lw $a1, 0x6c($sp) -/* B18A6C 800A18CC 44892000 */ mtc1 $t1, $f4 -/* B18A70 800A18D0 8FA40068 */ lw $a0, 0x68($sp) -/* B18A74 800A18D4 27AF0048 */ addiu $t7, $sp, 0x48 -/* B18A78 800A18D8 468021A0 */ cvt.s.w $f6, $f4 -/* B18A7C 800A18DC 27A60060 */ addiu $a2, $sp, 0x60 -/* B18A80 800A18E0 27A70050 */ addiu $a3, $sp, 0x50 -/* B18A84 800A18E4 E7A60050 */ swc1 $f6, 0x50($sp) -/* B18A88 800A18E8 846D0002 */ lh $t5, 2($v1) -/* B18A8C 800A18EC 448D4000 */ mtc1 $t5, $f8 -/* B18A90 800A18F0 00000000 */ nop -/* B18A94 800A18F4 468042A0 */ cvt.s.w $f10, $f8 -/* B18A98 800A18F8 E7AA0054 */ swc1 $f10, 0x54($sp) -/* B18A9C 800A18FC 84780004 */ lh $t8, 4($v1) -/* B18AA0 800A1900 44988000 */ mtc1 $t8, $f16 -/* B18AA4 800A1904 00000000 */ nop -/* B18AA8 800A1908 468084A0 */ cvt.s.w $f18, $f16 -/* B18AAC 800A190C E7B20058 */ swc1 $f18, 0x58($sp) -/* B18AB0 800A1910 8C6E0008 */ lw $t6, 8($v1) -/* B18AB4 800A1914 AFA30064 */ sw $v1, 0x64($sp) -/* B18AB8 800A1918 AFAE005C */ sw $t6, 0x5c($sp) -/* B18ABC 800A191C 11000007 */ beqz $t0, .L800A193C -/* B18AC0 800A1920 AFAE0060 */ sw $t6, 0x60($sp) -/* B18AC4 800A1924 8FAA0080 */ lw $t2, 0x80($sp) -/* B18AC8 800A1928 AFAF0010 */ sw $t7, 0x10($sp) -/* B18ACC 800A192C AFA30064 */ sw $v1, 0x64($sp) -/* B18AD0 800A1930 0100F809 */ jalr $t0 -/* B18AD4 800A1934 AFAA0014 */ sw $t2, 0x14($sp) -/* B18AD8 800A1938 1440002D */ bnez $v0, .L800A19F0 -.L800A193C: -/* B18ADC 800A193C 27A40050 */ addiu $a0, $sp, 0x50 -/* B18AE0 800A1940 0C0344D0 */ jal func_800D1340 -/* B18AE4 800A1944 27A50048 */ addiu $a1, $sp, 0x48 -/* B18AE8 800A1948 8FAB0060 */ lw $t3, 0x60($sp) -/* B18AEC 800A194C 8FAC0084 */ lw $t4, 0x84($sp) -/* B18AF0 800A1950 3C058014 */ lui $a1, %hi(D_80140180) # $a1, 0x8014 -/* B18AF4 800A1954 1160001B */ beqz $t3, .L800A19C4 -/* B18AF8 800A1958 8FA9005C */ lw $t1, 0x5c($sp) -/* B18AFC 800A195C 8D840000 */ lw $a0, ($t4) -/* B18B00 800A1960 24A50180 */ addiu $a1, %lo(D_80140180) # addiu $a1, $a1, 0x180 -/* B18B04 800A1964 0C034695 */ jal Matrix_ToMtx -/* B18B08 800A1968 240604DA */ li $a2, 1242 -/* B18B0C 800A196C 8FA40044 */ lw $a0, 0x44($sp) -/* B18B10 800A1970 3C0DDA38 */ lui $t5, (0xDA380003 >> 16) # lui $t5, 0xda38 -/* B18B14 800A1974 35AD0003 */ ori $t5, (0xDA380003 & 0xFFFF) # ori $t5, $t5, 3 -/* B18B18 800A1978 8C8302C0 */ lw $v1, 0x2c0($a0) -/* B18B1C 800A197C 3C0FDE00 */ lui $t7, 0xde00 -/* B18B20 800A1980 24690008 */ addiu $t1, $v1, 8 -/* B18B24 800A1984 AC8902C0 */ sw $t1, 0x2c0($a0) -/* B18B28 800A1988 AC6D0000 */ sw $t5, ($v1) -/* B18B2C 800A198C 8FB80084 */ lw $t8, 0x84($sp) -/* B18B30 800A1990 8F0E0000 */ lw $t6, ($t8) -/* B18B34 800A1994 AC6E0004 */ sw $t6, 4($v1) -/* B18B38 800A1998 8C8302C0 */ lw $v1, 0x2c0($a0) -/* B18B3C 800A199C 24790008 */ addiu $t9, $v1, 8 -/* B18B40 800A19A0 AC9902C0 */ sw $t9, 0x2c0($a0) -/* B18B44 800A19A4 AC6F0000 */ sw $t7, ($v1) -/* B18B48 800A19A8 8FAA0060 */ lw $t2, 0x60($sp) -/* B18B4C 800A19AC AC6A0004 */ sw $t2, 4($v1) -/* B18B50 800A19B0 8FA80084 */ lw $t0, 0x84($sp) -/* B18B54 800A19B4 8D0B0000 */ lw $t3, ($t0) -/* B18B58 800A19B8 256C0040 */ addiu $t4, $t3, 0x40 -/* B18B5C 800A19BC 1000000C */ b .L800A19F0 -/* B18B60 800A19C0 AD0C0000 */ sw $t4, ($t0) -.L800A19C4: -/* B18B64 800A19C4 1120000A */ beqz $t1, .L800A19F0 -/* B18B68 800A19C8 8FAD0084 */ lw $t5, 0x84($sp) -/* B18B6C 800A19CC 3C058014 */ lui $a1, %hi(D_80140194) # $a1, 0x8014 -/* B18B70 800A19D0 24A50194 */ addiu $a1, %lo(D_80140194) # addiu $a1, $a1, 0x194 -/* B18B74 800A19D4 8DA40000 */ lw $a0, ($t5) -/* B18B78 800A19D8 0C034695 */ jal Matrix_ToMtx -/* B18B7C 800A19DC 240604E1 */ li $a2, 1249 -/* B18B80 800A19E0 8FB80084 */ lw $t8, 0x84($sp) -/* B18B84 800A19E4 8F0E0000 */ lw $t6, ($t8) -/* B18B88 800A19E8 25D90040 */ addiu $t9, $t6, 0x40 -/* B18B8C 800A19EC AF190000 */ sw $t9, ($t8) -.L800A19F0: -/* B18B90 800A19F0 8FAF007C */ lw $t7, 0x7c($sp) -/* B18B94 800A19F4 8FA40068 */ lw $a0, 0x68($sp) -/* B18B98 800A19F8 8FA5006C */ lw $a1, 0x6c($sp) -/* B18B9C 800A19FC 11E00005 */ beqz $t7, .L800A1A14 -/* B18BA0 800A1A00 27A6005C */ addiu $a2, $sp, 0x5c -/* B18BA4 800A1A04 8FAA0080 */ lw $t2, 0x80($sp) -/* B18BA8 800A1A08 27A70048 */ addiu $a3, $sp, 0x48 -/* B18BAC 800A1A0C 01E0F809 */ jalr $t7 -/* B18BB0 800A1A10 AFAA0010 */ sw $t2, 0x10($sp) -.L800A1A14: -/* B18BB4 800A1A14 8FAB0064 */ lw $t3, 0x64($sp) -/* B18BB8 800A1A18 240100FF */ li $at, 255 -/* B18BBC 800A1A1C 8FA40068 */ lw $a0, 0x68($sp) -/* B18BC0 800A1A20 91650006 */ lbu $a1, 6($t3) -/* B18BC4 800A1A24 8FA60070 */ lw $a2, 0x70($sp) -/* B18BC8 800A1A28 8FA70074 */ lw $a3, 0x74($sp) -/* B18BCC 800A1A2C 10A10009 */ beq $a1, $at, .L800A1A54 -/* B18BD0 800A1A30 8FAC0078 */ lw $t4, 0x78($sp) -/* B18BD4 800A1A34 8FA8007C */ lw $t0, 0x7c($sp) -/* B18BD8 800A1A38 8FA90080 */ lw $t1, 0x80($sp) -/* B18BDC 800A1A3C 8FAD0084 */ lw $t5, 0x84($sp) -/* B18BE0 800A1A40 AFAC0010 */ sw $t4, 0x10($sp) -/* B18BE4 800A1A44 AFA80014 */ sw $t0, 0x14($sp) -/* B18BE8 800A1A48 AFA90018 */ sw $t1, 0x18($sp) -/* B18BEC 800A1A4C 0C028603 */ jal func_800A180C -/* B18BF0 800A1A50 AFAD001C */ sw $t5, 0x1c($sp) -.L800A1A54: -/* B18BF4 800A1A54 0C034221 */ jal Matrix_Pull -/* B18BF8 800A1A58 00000000 */ nop -/* B18BFC 800A1A5C 8FAE0064 */ lw $t6, 0x64($sp) -/* B18C00 800A1A60 240100FF */ li $at, 255 -/* B18C04 800A1A64 8FA40068 */ lw $a0, 0x68($sp) -/* B18C08 800A1A68 91C50007 */ lbu $a1, 7($t6) -/* B18C0C 800A1A6C 8FA60070 */ lw $a2, 0x70($sp) -/* B18C10 800A1A70 8FA70074 */ lw $a3, 0x74($sp) -/* B18C14 800A1A74 10A10009 */ beq $a1, $at, .L800A1A9C -/* B18C18 800A1A78 8FB90078 */ lw $t9, 0x78($sp) -/* B18C1C 800A1A7C 8FB8007C */ lw $t8, 0x7c($sp) -/* B18C20 800A1A80 8FAA0080 */ lw $t2, 0x80($sp) -/* B18C24 800A1A84 8FAF0084 */ lw $t7, 0x84($sp) -/* B18C28 800A1A88 AFB90010 */ sw $t9, 0x10($sp) -/* B18C2C 800A1A8C AFB80014 */ sw $t8, 0x14($sp) -/* B18C30 800A1A90 AFAA0018 */ sw $t2, 0x18($sp) -/* B18C34 800A1A94 0C028603 */ jal func_800A180C -/* B18C38 800A1A98 AFAF001C */ sw $t7, 0x1c($sp) -.L800A1A9C: -/* B18C3C 800A1A9C 8FAB0068 */ lw $t3, 0x68($sp) -/* B18C40 800A1AA0 3C068014 */ lui $a2, %hi(D_801401A8) # $a2, 0x8014 -/* B18C44 800A1AA4 24C601A8 */ addiu $a2, %lo(D_801401A8) # addiu $a2, $a2, 0x1a8 -/* B18C48 800A1AA8 27A40034 */ addiu $a0, $sp, 0x34 -/* B18C4C 800A1AAC 240704F1 */ li $a3, 1265 -/* B18C50 800A1AB0 0C031AD5 */ jal func_800C6B54 -/* B18C54 800A1AB4 8D650000 */ lw $a1, ($t3) -/* B18C58 800A1AB8 8FBF0024 */ lw $ra, 0x24($sp) -/* B18C5C 800A1ABC 27BD0068 */ addiu $sp, $sp, 0x68 -/* B18C60 800A1AC0 03E00008 */ jr $ra -/* B18C64 800A1AC4 00000000 */ nop - diff --git a/asm/non_matchings/code/z_skelanime/func_800A1AC8.s b/asm/non_matchings/code/z_skelanime/func_800A1AC8.s deleted file mode 100644 index 6774b024f5..0000000000 --- a/asm/non_matchings/code/z_skelanime/func_800A1AC8.s +++ /dev/null @@ -1,217 +0,0 @@ -.rdata -glabel D_801401BC - .asciz "\x1b[31m" - .balign 4 - -glabel D_801401C4 - .asciz "Si2_draw_SV():skelがNULLです。\n" - # EUC-JP: がNULLです。| Is null - .balign 4 - -glabel D_801401E4 - .asciz "\x1b[m" - .balign 4 - -glabel D_801401E8 - .asciz "../z_skelanime.c" - .balign 4 - -glabel D_801401FC - .asciz "../z_skelanime.c" - .balign 4 - -glabel D_80140210 - .asciz "../z_skelanime.c" - .balign 4 - -glabel D_80140224 - .asciz "../z_skelanime.c" - .balign 4 - -.text -glabel func_800A1AC8 -/* B18C68 800A1AC8 27BDFF88 */ addiu $sp, $sp, -0x78 -/* B18C6C 800A1ACC AFBF0024 */ sw $ra, 0x24($sp) -/* B18C70 800A1AD0 AFA40078 */ sw $a0, 0x78($sp) -/* B18C74 800A1AD4 AFA5007C */ sw $a1, 0x7c($sp) -/* B18C78 800A1AD8 AFA60080 */ sw $a2, 0x80($sp) -/* B18C7C 800A1ADC 8C840000 */ lw $a0, ($a0) -/* B18C80 800A1AE0 0C031A73 */ jal Graph_Alloc -/* B18C84 800A1AE4 00072980 */ sll $a1, $a3, 6 -/* B18C88 800A1AE8 8FAF007C */ lw $t7, 0x7c($sp) -/* B18C8C 800A1AEC AFA20050 */ sw $v0, 0x50($sp) -/* B18C90 800A1AF0 8FB80078 */ lw $t8, 0x78($sp) -/* B18C94 800A1AF4 15E0000C */ bnez $t7, .L800A1B28 -/* B18C98 800A1AF8 27A4003C */ addiu $a0, $sp, 0x3c -/* B18C9C 800A1AFC 3C048014 */ lui $a0, %hi(D_801401BC) # $a0, 0x8014 -/* B18CA0 800A1B00 0C00084C */ jal osSyncPrintf -/* B18CA4 800A1B04 248401BC */ addiu $a0, %lo(D_801401BC) # addiu $a0, $a0, 0x1bc -/* B18CA8 800A1B08 3C048014 */ lui $a0, %hi(D_801401C4) # $a0, 0x8014 -/* B18CAC 800A1B0C 0C00084C */ jal osSyncPrintf -/* B18CB0 800A1B10 248401C4 */ addiu $a0, %lo(D_801401C4) # addiu $a0, $a0, 0x1c4 -/* B18CB4 800A1B14 3C048014 */ lui $a0, %hi(D_801401E4) # $a0, 0x8014 -/* B18CB8 800A1B18 0C00084C */ jal osSyncPrintf -/* B18CBC 800A1B1C 248401E4 */ addiu $a0, %lo(D_801401E4) # addiu $a0, $a0, 0x1e4 -/* B18CC0 800A1B20 10000097 */ b .L800A1D80 -/* B18CC4 800A1B24 8FBF0024 */ lw $ra, 0x24($sp) -.L800A1B28: -/* B18CC8 800A1B28 8F050000 */ lw $a1, ($t8) -/* B18CCC 800A1B2C 3C068014 */ lui $a2, %hi(D_801401E8) # $a2, 0x8014 -/* B18CD0 800A1B30 24C601E8 */ addiu $a2, %lo(D_801401E8) # addiu $a2, $a2, 0x1e8 -/* B18CD4 800A1B34 2407050E */ li $a3, 1294 -/* B18CD8 800A1B38 0C031AB1 */ jal func_800C6AC4 -/* B18CDC 800A1B3C AFA5004C */ sw $a1, 0x4c($sp) -/* B18CE0 800A1B40 8FA8004C */ lw $t0, 0x4c($sp) -/* B18CE4 800A1B44 3C09DB06 */ lui $t1, (0xDB060034 >> 16) # lui $t1, 0xdb06 -/* B18CE8 800A1B48 35290034 */ ori $t1, (0xDB060034 & 0xFFFF) # ori $t1, $t1, 0x34 -/* B18CEC 800A1B4C 8D0202C0 */ lw $v0, 0x2c0($t0) -/* B18CF0 800A1B50 24590008 */ addiu $t9, $v0, 8 -/* B18CF4 800A1B54 AD1902C0 */ sw $t9, 0x2c0($t0) -/* B18CF8 800A1B58 AC490000 */ sw $t1, ($v0) -/* B18CFC 800A1B5C 8FAA0050 */ lw $t2, 0x50($sp) -/* B18D00 800A1B60 AC4A0004 */ sw $t2, 4($v0) -/* B18D04 800A1B64 0C034213 */ jal Matrix_Push -/* B18D08 800A1B68 AFA8004C */ sw $t0, 0x4c($sp) -/* B18D0C 800A1B6C 8FAB007C */ lw $t3, 0x7c($sp) -/* B18D10 800A1B70 3C188016 */ lui $t8, %hi(gSegments) -/* B18D14 800A1B74 3C0100FF */ lui $at, (0x00FFFFFF >> 16) # lui $at, 0xff -/* B18D18 800A1B78 8D620000 */ lw $v0, ($t3) -/* B18D1C 800A1B7C 3421FFFF */ ori $at, (0x00FFFFFF & 0xFFFF) # ori $at, $at, 0xffff -/* B18D20 800A1B80 8FA30080 */ lw $v1, 0x80($sp) -/* B18D24 800A1B84 00026900 */ sll $t5, $v0, 4 -/* B18D28 800A1B88 000D7702 */ srl $t6, $t5, 0x1c -/* B18D2C 800A1B8C 000E7880 */ sll $t7, $t6, 2 -/* B18D30 800A1B90 030FC021 */ addu $t8, $t8, $t7 -/* B18D34 800A1B94 8F186FA8 */ lw $t8, %lo(gSegments)($t8) -/* B18D38 800A1B98 00416024 */ and $t4, $v0, $at -/* B18D3C 800A1B9C 3C018000 */ lui $at, 0x8000 -/* B18D40 800A1BA0 0198C821 */ addu $t9, $t4, $t8 -/* B18D44 800A1BA4 03214821 */ addu $t1, $t9, $at -/* B18D48 800A1BA8 AFA90074 */ sw $t1, 0x74($sp) -/* B18D4C 800A1BAC 846A0000 */ lh $t2, ($v1) -/* B18D50 800A1BB0 8FA8004C */ lw $t0, 0x4c($sp) -/* B18D54 800A1BB4 27AE0054 */ addiu $t6, $sp, 0x54 -/* B18D58 800A1BB8 448A2000 */ mtc1 $t2, $f4 -/* B18D5C 800A1BBC 27AA0054 */ addiu $t2, $sp, 0x54 -/* B18D60 800A1BC0 24050001 */ li $a1, 1 -/* B18D64 800A1BC4 468021A0 */ cvt.s.w $f6, $f4 -/* B18D68 800A1BC8 27A6006C */ addiu $a2, $sp, 0x6c -/* B18D6C 800A1BCC 27A7005C */ addiu $a3, $sp, 0x5c -/* B18D70 800A1BD0 E7A6005C */ swc1 $f6, 0x5c($sp) -/* B18D74 800A1BD4 846B0002 */ lh $t3, 2($v1) -/* B18D78 800A1BD8 448B4000 */ mtc1 $t3, $f8 -/* B18D7C 800A1BDC 00000000 */ nop -/* B18D80 800A1BE0 468042A0 */ cvt.s.w $f10, $f8 -/* B18D84 800A1BE4 E7AA0060 */ swc1 $f10, 0x60($sp) -/* B18D88 800A1BE8 846D0004 */ lh $t5, 4($v1) -/* B18D8C 800A1BEC 448D8000 */ mtc1 $t5, $f16 -/* B18D90 800A1BF0 00000000 */ nop -/* B18D94 800A1BF4 468084A0 */ cvt.s.w $f18, $f16 -/* B18D98 800A1BF8 E7B20064 */ swc1 $f18, 0x64($sp) -/* B18D9C 800A1BFC 886C0006 */ lwl $t4, 6($v1) -/* B18DA0 800A1C00 986C0009 */ lwr $t4, 9($v1) -/* B18DA4 800A1C04 ADCC0000 */ sw $t4, ($t6) -/* B18DA8 800A1C08 946C000A */ lhu $t4, 0xa($v1) -/* B18DAC 800A1C0C A5CC0004 */ sh $t4, 4($t6) -/* B18DB0 800A1C10 8FB80074 */ lw $t8, 0x74($sp) -/* B18DB4 800A1C14 8FA90088 */ lw $t1, 0x88($sp) -/* B18DB8 800A1C18 8FA40078 */ lw $a0, 0x78($sp) -/* B18DBC 800A1C1C 8F190008 */ lw $t9, 8($t8) -/* B18DC0 800A1C20 AFB90068 */ sw $t9, 0x68($sp) -/* B18DC4 800A1C24 11200008 */ beqz $t1, .L800A1C48 -/* B18DC8 800A1C28 AFB9006C */ sw $t9, 0x6c($sp) -/* B18DCC 800A1C2C 8FAB0090 */ lw $t3, 0x90($sp) -/* B18DD0 800A1C30 AFAA0010 */ sw $t2, 0x10($sp) -/* B18DD4 800A1C34 AFA8004C */ sw $t0, 0x4c($sp) -/* B18DD8 800A1C38 0120F809 */ jalr $t1 -/* B18DDC 800A1C3C AFAB0014 */ sw $t3, 0x14($sp) -/* B18DE0 800A1C40 1440002C */ bnez $v0, .L800A1CF4 -/* B18DE4 800A1C44 8FA8004C */ lw $t0, 0x4c($sp) -.L800A1C48: -/* B18DE8 800A1C48 27A4005C */ addiu $a0, $sp, 0x5c -/* B18DEC 800A1C4C 27A50054 */ addiu $a1, $sp, 0x54 -/* B18DF0 800A1C50 0C0344D0 */ jal func_800D1340 -/* B18DF4 800A1C54 AFA8004C */ sw $t0, 0x4c($sp) -/* B18DF8 800A1C58 8FAD006C */ lw $t5, 0x6c($sp) -/* B18DFC 800A1C5C 8FA8004C */ lw $t0, 0x4c($sp) -/* B18E00 800A1C60 8FA40050 */ lw $a0, 0x50($sp) -/* B18E04 800A1C64 11A00019 */ beqz $t5, .L800A1CCC -/* B18E08 800A1C68 3C058014 */ lui $a1, %hi(D_801401FC) # $a1, 0x8014 -/* B18E0C 800A1C6C 24A501FC */ addiu $a1, %lo(D_801401FC) # addiu $a1, $a1, 0x1fc -/* B18E10 800A1C70 2406052F */ li $a2, 1327 -/* B18E14 800A1C74 0C034695 */ jal Matrix_ToMtx -/* B18E18 800A1C78 AFA8004C */ sw $t0, 0x4c($sp) -/* B18E1C 800A1C7C 8FA8004C */ lw $t0, 0x4c($sp) -/* B18E20 800A1C80 3C0FDA38 */ lui $t7, (0xDA380003 >> 16) # lui $t7, 0xda38 -/* B18E24 800A1C84 35EF0003 */ ori $t7, (0xDA380003 & 0xFFFF) # ori $t7, $t7, 3 -/* B18E28 800A1C88 8D0202C0 */ lw $v0, 0x2c0($t0) -/* B18E2C 800A1C8C 3C19DE00 */ lui $t9, 0xde00 -/* B18E30 800A1C90 244E0008 */ addiu $t6, $v0, 8 -/* B18E34 800A1C94 AD0E02C0 */ sw $t6, 0x2c0($t0) -/* B18E38 800A1C98 AC4F0000 */ sw $t7, ($v0) -/* B18E3C 800A1C9C 8FAC0050 */ lw $t4, 0x50($sp) -/* B18E40 800A1CA0 AC4C0004 */ sw $t4, 4($v0) -/* B18E44 800A1CA4 8D0202C0 */ lw $v0, 0x2c0($t0) -/* B18E48 800A1CA8 24580008 */ addiu $t8, $v0, 8 -/* B18E4C 800A1CAC AD1802C0 */ sw $t8, 0x2c0($t0) -/* B18E50 800A1CB0 AC590000 */ sw $t9, ($v0) -/* B18E54 800A1CB4 8FAA006C */ lw $t2, 0x6c($sp) -/* B18E58 800A1CB8 AC4A0004 */ sw $t2, 4($v0) -/* B18E5C 800A1CBC 8FAB0050 */ lw $t3, 0x50($sp) -/* B18E60 800A1CC0 25690040 */ addiu $t1, $t3, 0x40 -/* B18E64 800A1CC4 1000000B */ b .L800A1CF4 -/* B18E68 800A1CC8 AFA90050 */ sw $t1, 0x50($sp) -.L800A1CCC: -/* B18E6C 800A1CCC 8FAD0068 */ lw $t5, 0x68($sp) -/* B18E70 800A1CD0 3C058014 */ lui $a1, %hi(D_80140210) # $a1, 0x8014 -/* B18E74 800A1CD4 24A50210 */ addiu $a1, %lo(D_80140210) # addiu $a1, $a1, 0x210 -/* B18E78 800A1CD8 11A00006 */ beqz $t5, .L800A1CF4 -/* B18E7C 800A1CDC 8FA40050 */ lw $a0, 0x50($sp) -/* B18E80 800A1CE0 0C034695 */ jal Matrix_ToMtx -/* B18E84 800A1CE4 24060536 */ li $a2, 1334 -/* B18E88 800A1CE8 8FAE0050 */ lw $t6, 0x50($sp) -/* B18E8C 800A1CEC 25CF0040 */ addiu $t7, $t6, 0x40 -/* B18E90 800A1CF0 AFAF0050 */ sw $t7, 0x50($sp) -.L800A1CF4: -/* B18E94 800A1CF4 8FA2008C */ lw $v0, 0x8c($sp) -/* B18E98 800A1CF8 8FA40078 */ lw $a0, 0x78($sp) -/* B18E9C 800A1CFC 24050001 */ li $a1, 1 -/* B18EA0 800A1D00 10400006 */ beqz $v0, .L800A1D1C -/* B18EA4 800A1D04 27A60068 */ addiu $a2, $sp, 0x68 -/* B18EA8 800A1D08 8FAC0090 */ lw $t4, 0x90($sp) -/* B18EAC 800A1D0C 27A70054 */ addiu $a3, $sp, 0x54 -/* B18EB0 800A1D10 0040F809 */ jalr $v0 -/* B18EB4 800A1D14 AFAC0010 */ sw $t4, 0x10($sp) -/* B18EB8 800A1D18 8FA2008C */ lw $v0, 0x8c($sp) -.L800A1D1C: -/* B18EBC 800A1D1C 8FB80074 */ lw $t8, 0x74($sp) -/* B18EC0 800A1D20 240100FF */ li $at, 255 -/* B18EC4 800A1D24 8FA40078 */ lw $a0, 0x78($sp) -/* B18EC8 800A1D28 93050006 */ lbu $a1, 6($t8) -/* B18ECC 800A1D2C 8FA6007C */ lw $a2, 0x7c($sp) -/* B18ED0 800A1D30 8FA70080 */ lw $a3, 0x80($sp) -/* B18ED4 800A1D34 10A10008 */ beq $a1, $at, .L800A1D58 -/* B18ED8 800A1D38 8FB90088 */ lw $t9, 0x88($sp) -/* B18EDC 800A1D3C 8FAA0090 */ lw $t2, 0x90($sp) -/* B18EE0 800A1D40 27AB0050 */ addiu $t3, $sp, 0x50 -/* B18EE4 800A1D44 AFAB001C */ sw $t3, 0x1c($sp) -/* B18EE8 800A1D48 AFB90010 */ sw $t9, 0x10($sp) -/* B18EEC 800A1D4C AFA20014 */ sw $v0, 0x14($sp) -/* B18EF0 800A1D50 0C028603 */ jal func_800A180C -/* B18EF4 800A1D54 AFAA0018 */ sw $t2, 0x18($sp) -.L800A1D58: -/* B18EF8 800A1D58 0C034221 */ jal Matrix_Pull -/* B18EFC 800A1D5C 00000000 */ nop -/* B18F00 800A1D60 8FA90078 */ lw $t1, 0x78($sp) -/* B18F04 800A1D64 3C068014 */ lui $a2, %hi(D_80140224) # $a2, 0x8014 -/* B18F08 800A1D68 24C60224 */ addiu $a2, %lo(D_80140224) # addiu $a2, $a2, 0x224 -/* B18F0C 800A1D6C 27A4003C */ addiu $a0, $sp, 0x3c -/* B18F10 800A1D70 24070543 */ li $a3, 1347 -/* B18F14 800A1D74 0C031AD5 */ jal func_800C6B54 -/* B18F18 800A1D78 8D250000 */ lw $a1, ($t1) -/* B18F1C 800A1D7C 8FBF0024 */ lw $ra, 0x24($sp) -.L800A1D80: -/* B18F20 800A1D80 27BD0078 */ addiu $sp, $sp, 0x78 -/* B18F24 800A1D84 03E00008 */ jr $ra -/* B18F28 800A1D88 00000000 */ nop - diff --git a/asm/non_matchings/code/z_skelanime/func_800A1D8C.s b/asm/non_matchings/code/z_skelanime/func_800A1D8C.s deleted file mode 100644 index b9b6131c10..0000000000 --- a/asm/non_matchings/code/z_skelanime/func_800A1D8C.s +++ /dev/null @@ -1,189 +0,0 @@ -.rdata -glabel D_80140238 - .asciz "../z_skelanime.c" - .balign 4 - -glabel D_8014024C - .asciz "out = %08x\n" - .balign 4 - -glabel D_80140258 - .asciz "../z_skelanime.c" - .balign 4 - -glabel D_8014026C - .asciz "ref_tbl = %08x\n" - .balign 4 - -glabel D_8014027C - .asciz "../z_skelanime.c" - .balign 4 - -glabel D_80140290 - .asciz "frame_tbl = %08x\n" - .balign 4 - -glabel D_801402A4 - .asciz "../z_skelanime.c" - .balign 4 - -glabel D_801402B8 - .asciz "tbl = %08x\n" - .balign 4 - -.text -glabel func_800A1D8C -/* B18F2C 800A1D8C 27BDFFC0 */ addiu $sp, $sp, -0x40 -/* B18F30 800A1D90 00047100 */ sll $t6, $a0, 4 -/* B18F34 800A1D94 3C098016 */ lui $t1, %hi(gSegments) # $t1, 0x8016 -/* B18F38 800A1D98 000E7F02 */ srl $t7, $t6, 0x1c -/* B18F3C 800A1D9C 25296FA8 */ addiu $t1, %lo(gSegments) # addiu $t1, $t1, 0x6fa8 -/* B18F40 800A1DA0 000FC080 */ sll $t8, $t7, 2 -/* B18F44 800A1DA4 0138C821 */ addu $t9, $t1, $t8 -/* B18F48 800A1DA8 8F2D0000 */ lw $t5, ($t9) -/* B18F4C 800A1DAC 3C0A00FF */ lui $t2, (0x00FFFFFF >> 16) # lui $t2, 0xff -/* B18F50 800A1DB0 354AFFFF */ ori $t2, (0x00FFFFFF & 0xFFFF) # ori $t2, $t2, 0xffff -/* B18F54 800A1DB4 008A7024 */ and $t6, $a0, $t2 -/* B18F58 800A1DB8 3C0B8000 */ lui $t3, 0x8000 -/* B18F5C 800A1DBC 01AE7821 */ addu $t7, $t5, $t6 -/* B18F60 800A1DC0 AFBF003C */ sw $ra, 0x3c($sp) -/* B18F64 800A1DC4 AFBE0038 */ sw $fp, 0x38($sp) -/* B18F68 800A1DC8 AFB70034 */ sw $s7, 0x34($sp) -/* B18F6C 800A1DCC AFB60030 */ sw $s6, 0x30($sp) -/* B18F70 800A1DD0 AFB5002C */ sw $s5, 0x2c($sp) -/* B18F74 800A1DD4 AFB40028 */ sw $s4, 0x28($sp) -/* B18F78 800A1DD8 AFB30024 */ sw $s3, 0x24($sp) -/* B18F7C 800A1DDC AFB20020 */ sw $s2, 0x20($sp) -/* B18F80 800A1DE0 AFB1001C */ sw $s1, 0x1c($sp) -/* B18F84 800A1DE4 AFB00018 */ sw $s0, 0x18($sp) -/* B18F88 800A1DE8 01EB1021 */ addu $v0, $t7, $t3 -/* B18F8C 800A1DEC 8C430008 */ lw $v1, 8($v0) -/* B18F90 800A1DF0 8C480004 */ lw $t0, 4($v0) -/* B18F94 800A1DF4 00E08025 */ move $s0, $a3 -/* B18F98 800A1DF8 0003C100 */ sll $t8, $v1, 4 -/* B18F9C 800A1DFC 0018CF02 */ srl $t9, $t8, 0x1c -/* B18FA0 800A1E00 00196880 */ sll $t5, $t9, 2 -/* B18FA4 800A1E04 012D7021 */ addu $t6, $t1, $t5 -/* B18FA8 800A1E08 8DCF0000 */ lw $t7, ($t6) -/* B18FAC 800A1E0C 006AC024 */ and $t8, $v1, $t2 -/* B18FB0 800A1E10 00086900 */ sll $t5, $t0, 4 -/* B18FB4 800A1E14 01F8C821 */ addu $t9, $t7, $t8 -/* B18FB8 800A1E18 000D7702 */ srl $t6, $t5, 0x1c -/* B18FBC 800A1E1C 000E7880 */ sll $t7, $t6, 2 -/* B18FC0 800A1E20 032B8821 */ addu $s1, $t9, $t3 -/* B18FC4 800A1E24 012FC021 */ addu $t8, $t1, $t7 -/* B18FC8 800A1E28 8F190000 */ lw $t9, ($t8) -/* B18FCC 800A1E2C 010A6824 */ and $t5, $t0, $t2 -/* B18FD0 800A1E30 00C0B025 */ move $s6, $a2 -/* B18FD4 800A1E34 032D7021 */ addu $t6, $t9, $t5 -/* B18FD8 800A1E38 01CB9021 */ addu $s2, $t6, $t3 -/* B18FDC 800A1E3C 944C000C */ lhu $t4, 0xc($v0) -/* B18FE0 800A1E40 18C00055 */ blez $a2, .L800A1F98 -/* B18FE4 800A1E44 0000A025 */ move $s4, $zero -/* B18FE8 800A1E48 00057840 */ sll $t7, $a1, 1 -/* B18FEC 800A1E4C 3C1E8014 */ lui $fp, %hi(D_8014024C) # $fp, 0x8014 -/* B18FF0 800A1E50 3C178014 */ lui $s7, %hi(D_80140238) # $s7, 0x8014 -/* B18FF4 800A1E54 26F70238 */ addiu $s7, %lo(D_80140238) # addiu $s7, $s7, 0x238 -/* B18FF8 800A1E58 27DE024C */ addiu $fp, %lo(D_8014024C) # addiu $fp, $fp, 0x24c -/* B18FFC 800A1E5C 01F29821 */ addu $s3, $t7, $s2 -/* B19000 800A1E60 0180A825 */ move $s5, $t4 -.L800A1E64: -/* B19004 800A1E64 12000007 */ beqz $s0, .L800A1E84 -/* B19008 800A1E68 02E02025 */ move $a0, $s7 -/* B1900C 800A1E6C 12200005 */ beqz $s1, .L800A1E84 -/* B19010 800A1E70 00000000 */ nop -/* B19014 800A1E74 12600003 */ beqz $s3, .L800A1E84 -/* B19018 800A1E78 00000000 */ nop -/* B1901C 800A1E7C 5640001F */ bnezl $s2, .L800A1EFC -/* B19020 800A1E80 96220000 */ lhu $v0, ($s1) -.L800A1E84: -/* B19024 800A1E84 0C000B84 */ jal LogUtils_LogThreadId -/* B19028 800A1E88 24050570 */ li $a1, 1392 -/* B1902C 800A1E8C 03C02025 */ move $a0, $fp -/* B19030 800A1E90 0C00084C */ jal osSyncPrintf -/* B19034 800A1E94 02002825 */ move $a1, $s0 -/* B19038 800A1E98 3C048014 */ lui $a0, %hi(D_80140258) # $a0, 0x8014 -/* B1903C 800A1E9C 24840258 */ addiu $a0, %lo(D_80140258) # addiu $a0, $a0, 0x258 -/* B19040 800A1EA0 0C000B84 */ jal LogUtils_LogThreadId -/* B19044 800A1EA4 24050571 */ li $a1, 1393 -/* B19048 800A1EA8 3C048014 */ lui $a0, %hi(D_8014026C) # $a0, 0x8014 -/* B1904C 800A1EAC 2484026C */ addiu $a0, %lo(D_8014026C) # addiu $a0, $a0, 0x26c -/* B19050 800A1EB0 0C00084C */ jal osSyncPrintf -/* B19054 800A1EB4 02202825 */ move $a1, $s1 -/* B19058 800A1EB8 3C048014 */ lui $a0, %hi(D_8014027C) # $a0, 0x8014 -/* B1905C 800A1EBC 2484027C */ addiu $a0, %lo(D_8014027C) # addiu $a0, $a0, 0x27c -/* B19060 800A1EC0 0C000B84 */ jal LogUtils_LogThreadId -/* B19064 800A1EC4 24050572 */ li $a1, 1394 -/* B19068 800A1EC8 3C048014 */ lui $a0, %hi(D_80140290) # $a0, 0x8014 -/* B1906C 800A1ECC 24840290 */ addiu $a0, %lo(D_80140290) # addiu $a0, $a0, 0x290 -/* B19070 800A1ED0 0C00084C */ jal osSyncPrintf -/* B19074 800A1ED4 02602825 */ move $a1, $s3 -/* B19078 800A1ED8 3C048014 */ lui $a0, %hi(D_801402A4) # $a0, 0x8014 -/* B1907C 800A1EDC 248402A4 */ addiu $a0, %lo(D_801402A4) # addiu $a0, $a0, 0x2a4 -/* B19080 800A1EE0 0C000B84 */ jal LogUtils_LogThreadId -/* B19084 800A1EE4 24050573 */ li $a1, 1395 -/* B19088 800A1EE8 3C048014 */ lui $a0, %hi(D_801402B8) # $a0, 0x8014 -/* B1908C 800A1EEC 248402B8 */ addiu $a0, %lo(D_801402B8) # addiu $a0, $a0, 0x2b8 -/* B19090 800A1EF0 0C00084C */ jal osSyncPrintf -/* B19094 800A1EF4 02402825 */ move $a1, $s2 -/* B19098 800A1EF8 96220000 */ lhu $v0, ($s1) -.L800A1EFC: -/* B1909C 800A1EFC 26940001 */ addiu $s4, $s4, 1 -/* B190A0 800A1F00 0055082A */ slt $at, $v0, $s5 -/* B190A4 800A1F04 14200006 */ bnez $at, .L800A1F20 -/* B190A8 800A1F08 00027040 */ sll $t6, $v0, 1 -/* B190AC 800A1F0C 0002C040 */ sll $t8, $v0, 1 -/* B190B0 800A1F10 0278C821 */ addu $t9, $s3, $t8 -/* B190B4 800A1F14 872D0000 */ lh $t5, ($t9) -/* B190B8 800A1F18 10000004 */ b .L800A1F2C -/* B190BC 800A1F1C A60D0000 */ sh $t5, ($s0) -.L800A1F20: -/* B190C0 800A1F20 024E7821 */ addu $t7, $s2, $t6 -/* B190C4 800A1F24 85F80000 */ lh $t8, ($t7) -/* B190C8 800A1F28 A6180000 */ sh $t8, ($s0) -.L800A1F2C: -/* B190CC 800A1F2C 96220002 */ lhu $v0, 2($s1) -/* B190D0 800A1F30 0055082A */ slt $at, $v0, $s5 -/* B190D4 800A1F34 14200006 */ bnez $at, .L800A1F50 -/* B190D8 800A1F38 00027840 */ sll $t7, $v0, 1 -/* B190DC 800A1F3C 0002C840 */ sll $t9, $v0, 1 -/* B190E0 800A1F40 02796821 */ addu $t5, $s3, $t9 -/* B190E4 800A1F44 85AE0000 */ lh $t6, ($t5) -/* B190E8 800A1F48 10000004 */ b .L800A1F5C -/* B190EC 800A1F4C A60E0002 */ sh $t6, 2($s0) -.L800A1F50: -/* B190F0 800A1F50 024FC021 */ addu $t8, $s2, $t7 -/* B190F4 800A1F54 87190000 */ lh $t9, ($t8) -/* B190F8 800A1F58 A6190002 */ sh $t9, 2($s0) -.L800A1F5C: -/* B190FC 800A1F5C 96220004 */ lhu $v0, 4($s1) -/* B19100 800A1F60 26310006 */ addiu $s1, $s1, 6 -/* B19104 800A1F64 0055082A */ slt $at, $v0, $s5 -/* B19108 800A1F68 14200006 */ bnez $at, .L800A1F84 -/* B1910C 800A1F6C 0002C040 */ sll $t8, $v0, 1 -/* B19110 800A1F70 00026840 */ sll $t5, $v0, 1 -/* B19114 800A1F74 026D7021 */ addu $t6, $s3, $t5 -/* B19118 800A1F78 85CF0000 */ lh $t7, ($t6) -/* B1911C 800A1F7C 10000004 */ b .L800A1F90 -/* B19120 800A1F80 A60F0004 */ sh $t7, 4($s0) -.L800A1F84: -/* B19124 800A1F84 0258C821 */ addu $t9, $s2, $t8 -/* B19128 800A1F88 872D0000 */ lh $t5, ($t9) -/* B1912C 800A1F8C A60D0004 */ sh $t5, 4($s0) -.L800A1F90: -/* B19130 800A1F90 1696FFB4 */ bne $s4, $s6, .L800A1E64 -/* B19134 800A1F94 26100006 */ addiu $s0, $s0, 6 -.L800A1F98: -/* B19138 800A1F98 8FBF003C */ lw $ra, 0x3c($sp) -/* B1913C 800A1F9C 8FB00018 */ lw $s0, 0x18($sp) -/* B19140 800A1FA0 8FB1001C */ lw $s1, 0x1c($sp) -/* B19144 800A1FA4 8FB20020 */ lw $s2, 0x20($sp) -/* B19148 800A1FA8 8FB30024 */ lw $s3, 0x24($sp) -/* B1914C 800A1FAC 8FB40028 */ lw $s4, 0x28($sp) -/* B19150 800A1FB0 8FB5002C */ lw $s5, 0x2c($sp) -/* B19154 800A1FB4 8FB60030 */ lw $s6, 0x30($sp) -/* B19158 800A1FB8 8FB70034 */ lw $s7, 0x34($sp) -/* B1915C 800A1FBC 8FBE0038 */ lw $fp, 0x38($sp) -/* B19160 800A1FC0 03E00008 */ jr $ra -/* B19164 800A1FC4 27BD0040 */ addiu $sp, $sp, 0x40 - diff --git a/asm/non_matchings/code/z_skelanime/func_800A1FC8.s b/asm/non_matchings/code/z_skelanime/func_800A1FC8.s deleted file mode 100644 index 0eea34027e..0000000000 --- a/asm/non_matchings/code/z_skelanime/func_800A1FC8.s +++ /dev/null @@ -1,16 +0,0 @@ -glabel func_800A1FC8 -/* B19168 800A1FC8 00047100 */ sll $t6, $a0, 4 -/* B1916C 800A1FCC 000E7F02 */ srl $t7, $t6, 0x1c -/* B19170 800A1FD0 000FC080 */ sll $t8, $t7, 2 -/* B19174 800A1FD4 3C198016 */ lui $t9, %hi(gSegments) -/* B19178 800A1FD8 0338C821 */ addu $t9, $t9, $t8 -/* B1917C 800A1FDC 3C0100FF */ lui $at, (0x00FFFFFF >> 16) # lui $at, 0xff -/* B19180 800A1FE0 8F396FA8 */ lw $t9, %lo(gSegments)($t9) -/* B19184 800A1FE4 3421FFFF */ ori $at, (0x00FFFFFF & 0xFFFF) # ori $at, $at, 0xffff -/* B19188 800A1FE8 00814024 */ and $t0, $a0, $at -/* B1918C 800A1FEC 3C018000 */ lui $at, 0x8000 -/* B19190 800A1FF0 03281821 */ addu $v1, $t9, $t0 -/* B19194 800A1FF4 00611821 */ addu $v1, $v1, $at -/* B19198 800A1FF8 03E00008 */ jr $ra -/* B1919C 800A1FFC 84620000 */ lh $v0, ($v1) - diff --git a/asm/non_matchings/code/z_skelanime/func_800A2044.s b/asm/non_matchings/code/z_skelanime/func_800A2044.s deleted file mode 100644 index b8879e3ae4..0000000000 --- a/asm/non_matchings/code/z_skelanime/func_800A2044.s +++ /dev/null @@ -1,158 +0,0 @@ -.rdata -glabel D_801402C4 - .asciz "../z_skelanime.c" - .balign 4 - -.text -glabel func_800A2044 -/* B191E4 800A2044 27BDFFA8 */ addiu $sp, $sp, -0x58 -/* B191E8 800A2048 AFBF002C */ sw $ra, 0x2c($sp) -/* B191EC 800A204C AFB00028 */ sw $s0, 0x28($sp) -/* B191F0 800A2050 AFA40058 */ sw $a0, 0x58($sp) -/* B191F4 800A2054 AFA5005C */ sw $a1, 0x5c($sp) -/* B191F8 800A2058 AFA60060 */ sw $a2, 0x60($sp) -/* B191FC 800A205C 0C034213 */ jal Matrix_Push -/* B19200 800A2060 AFA70064 */ sw $a3, 0x64($sp) -/* B19204 800A2064 8FAF005C */ lw $t7, 0x5c($sp) -/* B19208 800A2068 8FAE0060 */ lw $t6, 0x60($sp) -/* B1920C 800A206C 3C0C8016 */ lui $t4, %hi(gSegments) -/* B19210 800A2070 000FC080 */ sll $t8, $t7, 2 -/* B19214 800A2074 01D8C821 */ addu $t9, $t6, $t8 -/* B19218 800A2078 8F220000 */ lw $v0, ($t9) -/* B1921C 800A207C 25ED0001 */ addiu $t5, $t7, 1 -/* B19220 800A2080 8FB80064 */ lw $t8, 0x64($sp) -/* B19224 800A2084 000DC880 */ sll $t9, $t5, 2 -/* B19228 800A2088 00024900 */ sll $t1, $v0, 4 -/* B1922C 800A208C 00095702 */ srl $t2, $t1, 0x1c -/* B19230 800A2090 032DC823 */ subu $t9, $t9, $t5 -/* B19234 800A2094 000A5880 */ sll $t3, $t2, 2 -/* B19238 800A2098 0019C840 */ sll $t9, $t9, 1 -/* B1923C 800A209C 018B6021 */ addu $t4, $t4, $t3 -/* B19240 800A20A0 AFAD005C */ sw $t5, 0x5c($sp) -/* B19244 800A20A4 03194821 */ addu $t1, $t8, $t9 -/* B19248 800A20A8 892B0000 */ lwl $t3, ($t1) -/* B1924C 800A20AC 992B0003 */ lwr $t3, 3($t1) -/* B19250 800A20B0 8D8C6FA8 */ lw $t4, %lo(gSegments)($t4) -/* B19254 800A20B4 3C0100FF */ lui $at, (0x00FFFFFF >> 16) # lui $at, 0xff -/* B19258 800A20B8 27AE003C */ addiu $t6, $sp, 0x3c -/* B1925C 800A20BC 3421FFFF */ ori $at, (0x00FFFFFF & 0xFFFF) # ori $at, $at, 0xffff -/* B19260 800A20C0 ADCB0000 */ sw $t3, ($t6) -/* B19264 800A20C4 952B0004 */ lhu $t3, 4($t1) -/* B19268 800A20C8 00414024 */ and $t0, $v0, $at -/* B1926C 800A20CC 3C018000 */ lui $at, 0x8000 -/* B19270 800A20D0 010C8021 */ addu $s0, $t0, $t4 -/* B19274 800A20D4 02018021 */ addu $s0, $s0, $at -/* B19278 800A20D8 A5CB0004 */ sh $t3, 4($t6) -/* B1927C 800A20DC 86080000 */ lh $t0, ($s0) -/* B19280 800A20E0 8FB80068 */ lw $t8, 0x68($sp) -/* B19284 800A20E4 8FA5005C */ lw $a1, 0x5c($sp) -/* B19288 800A20E8 44882000 */ mtc1 $t0, $f4 -/* B1928C 800A20EC 8FA40058 */ lw $a0, 0x58($sp) -/* B19290 800A20F0 27A90074 */ addiu $t1, $sp, 0x74 -/* B19294 800A20F4 468021A0 */ cvt.s.w $f6, $f4 -/* B19298 800A20F8 27B9003C */ addiu $t9, $sp, 0x3c -/* B1929C 800A20FC 27A60050 */ addiu $a2, $sp, 0x50 -/* B192A0 800A2100 27A70044 */ addiu $a3, $sp, 0x44 -/* B192A4 800A2104 E7A60044 */ swc1 $f6, 0x44($sp) -/* B192A8 800A2108 860C0002 */ lh $t4, 2($s0) -/* B192AC 800A210C 448C4000 */ mtc1 $t4, $f8 -/* B192B0 800A2110 00000000 */ nop -/* B192B4 800A2114 468042A0 */ cvt.s.w $f10, $f8 -/* B192B8 800A2118 E7AA0048 */ swc1 $f10, 0x48($sp) -/* B192BC 800A211C 860F0004 */ lh $t7, 4($s0) -/* B192C0 800A2120 448F8000 */ mtc1 $t7, $f16 -/* B192C4 800A2124 00000000 */ nop -/* B192C8 800A2128 468084A0 */ cvt.s.w $f18, $f16 -/* B192CC 800A212C E7B2004C */ swc1 $f18, 0x4c($sp) -/* B192D0 800A2130 8E0D0008 */ lw $t5, 8($s0) -/* B192D4 800A2134 13000007 */ beqz $t8, .L800A2154 -/* B192D8 800A2138 AFAD0050 */ sw $t5, 0x50($sp) -/* B192DC 800A213C 8FAE0070 */ lw $t6, 0x70($sp) -/* B192E0 800A2140 AFB90010 */ sw $t9, 0x10($sp) -/* B192E4 800A2144 AFA90018 */ sw $t1, 0x18($sp) -/* B192E8 800A2148 0300F809 */ jalr $t8 -/* B192EC 800A214C AFAE0014 */ sw $t6, 0x14($sp) -/* B192F0 800A2150 1440001B */ bnez $v0, .L800A21C0 -.L800A2154: -/* B192F4 800A2154 27A40044 */ addiu $a0, $sp, 0x44 -/* B192F8 800A2158 0C0344D0 */ jal func_800D1340 -/* B192FC 800A215C 27A5003C */ addiu $a1, $sp, 0x3c -/* B19300 800A2160 8FAA0050 */ lw $t2, 0x50($sp) -/* B19304 800A2164 8FAB0074 */ lw $t3, 0x74($sp) -/* B19308 800A2168 3C0CDA38 */ lui $t4, (0xDA380003 >> 16) # lui $t4, 0xda38 -/* B1930C 800A216C 11400014 */ beqz $t2, .L800A21C0 -/* B19310 800A2170 25680008 */ addiu $t0, $t3, 8 -/* B19314 800A2174 AFA80074 */ sw $t0, 0x74($sp) -/* B19318 800A2178 358C0003 */ ori $t4, (0xDA380003 & 0xFFFF) # ori $t4, $t4, 3 -/* B1931C 800A217C AD6C0000 */ sw $t4, ($t3) -/* B19320 800A2180 8FAF0058 */ lw $t7, 0x58($sp) -/* B19324 800A2184 3C058014 */ lui $a1, %hi(D_801402C4) # $a1, 0x8014 -/* B19328 800A2188 24A502C4 */ addiu $a1, %lo(D_801402C4) # addiu $a1, $a1, 0x2c4 -/* B1932C 800A218C 8DE40000 */ lw $a0, ($t7) -/* B19330 800A2190 AFAB0038 */ sw $t3, 0x38($sp) -/* B19334 800A2194 0C0346A2 */ jal Matrix_NewMtx -/* B19338 800A2198 240605D1 */ li $a2, 1489 -/* B1933C 800A219C 8FA30038 */ lw $v1, 0x38($sp) -/* B19340 800A21A0 3C0EDE00 */ lui $t6, 0xde00 -/* B19344 800A21A4 AC620004 */ sw $v0, 4($v1) -/* B19348 800A21A8 8FAD0074 */ lw $t5, 0x74($sp) -/* B1934C 800A21AC 25B90008 */ addiu $t9, $t5, 8 -/* B19350 800A21B0 AFB90074 */ sw $t9, 0x74($sp) -/* B19354 800A21B4 ADAE0000 */ sw $t6, ($t5) -/* B19358 800A21B8 8FA90050 */ lw $t1, 0x50($sp) -/* B1935C 800A21BC ADA90004 */ sw $t1, 4($t5) -.L800A21C0: -/* B19360 800A21C0 8FB8006C */ lw $t8, 0x6c($sp) -/* B19364 800A21C4 8FA40058 */ lw $a0, 0x58($sp) -/* B19368 800A21C8 8FA5005C */ lw $a1, 0x5c($sp) -/* B1936C 800A21CC 13000007 */ beqz $t8, .L800A21EC -/* B19370 800A21D0 27A60050 */ addiu $a2, $sp, 0x50 -/* B19374 800A21D4 8FAA0070 */ lw $t2, 0x70($sp) -/* B19378 800A21D8 27AB0074 */ addiu $t3, $sp, 0x74 -/* B1937C 800A21DC AFAB0014 */ sw $t3, 0x14($sp) -/* B19380 800A21E0 27A7003C */ addiu $a3, $sp, 0x3c -/* B19384 800A21E4 0300F809 */ jalr $t8 -/* B19388 800A21E8 AFAA0010 */ sw $t2, 0x10($sp) -.L800A21EC: -/* B1938C 800A21EC 92050006 */ lbu $a1, 6($s0) -/* B19390 800A21F0 240100FF */ li $at, 255 -/* B19394 800A21F4 8FA40058 */ lw $a0, 0x58($sp) -/* B19398 800A21F8 10A1000C */ beq $a1, $at, .L800A222C -/* B1939C 800A21FC 8FA60060 */ lw $a2, 0x60($sp) -/* B193A0 800A2200 8FA80068 */ lw $t0, 0x68($sp) -/* B193A4 800A2204 8FAC006C */ lw $t4, 0x6c($sp) -/* B193A8 800A2208 8FAF0070 */ lw $t7, 0x70($sp) -/* B193AC 800A220C 8FAD0074 */ lw $t5, 0x74($sp) -/* B193B0 800A2210 8FA70064 */ lw $a3, 0x64($sp) -/* B193B4 800A2214 AFA80010 */ sw $t0, 0x10($sp) -/* B193B8 800A2218 AFAC0014 */ sw $t4, 0x14($sp) -/* B193BC 800A221C AFAF0018 */ sw $t7, 0x18($sp) -/* B193C0 800A2220 0C028811 */ jal func_800A2044 -/* B193C4 800A2224 AFAD001C */ sw $t5, 0x1c($sp) -/* B193C8 800A2228 AFA20074 */ sw $v0, 0x74($sp) -.L800A222C: -/* B193CC 800A222C 0C034221 */ jal Matrix_Pull -/* B193D0 800A2230 00000000 */ nop -/* B193D4 800A2234 92050007 */ lbu $a1, 7($s0) -/* B193D8 800A2238 240100FF */ li $at, 255 -/* B193DC 800A223C 8FA40058 */ lw $a0, 0x58($sp) -/* B193E0 800A2240 10A1000C */ beq $a1, $at, .L800A2274 -/* B193E4 800A2244 8FA60060 */ lw $a2, 0x60($sp) -/* B193E8 800A2248 8FB90068 */ lw $t9, 0x68($sp) -/* B193EC 800A224C 8FAE006C */ lw $t6, 0x6c($sp) -/* B193F0 800A2250 8FA90070 */ lw $t1, 0x70($sp) -/* B193F4 800A2254 8FAA0074 */ lw $t2, 0x74($sp) -/* B193F8 800A2258 8FA70064 */ lw $a3, 0x64($sp) -/* B193FC 800A225C AFB90010 */ sw $t9, 0x10($sp) -/* B19400 800A2260 AFAE0014 */ sw $t6, 0x14($sp) -/* B19404 800A2264 AFA90018 */ sw $t1, 0x18($sp) -/* B19408 800A2268 0C028811 */ jal func_800A2044 -/* B1940C 800A226C AFAA001C */ sw $t2, 0x1c($sp) -/* B19410 800A2270 AFA20074 */ sw $v0, 0x74($sp) -.L800A2274: -/* B19414 800A2274 8FBF002C */ lw $ra, 0x2c($sp) -/* B19418 800A2278 8FA20074 */ lw $v0, 0x74($sp) -/* B1941C 800A227C 8FB00028 */ lw $s0, 0x28($sp) -/* B19420 800A2280 03E00008 */ jr $ra -/* B19424 800A2284 27BD0058 */ addiu $sp, $sp, 0x58 - diff --git a/asm/non_matchings/code/z_skelanime/func_800A2288.s b/asm/non_matchings/code/z_skelanime/func_800A2288.s deleted file mode 100644 index 1ccfab24a7..0000000000 --- a/asm/non_matchings/code/z_skelanime/func_800A2288.s +++ /dev/null @@ -1,161 +0,0 @@ -.rdata -glabel D_801402D8 - .asciz "\x1b[31m" - .balign 4 - -glabel D_801402E0 - .asciz "Si2_draw2():skelがNULLです。NULLを返します。\n" - # EUC-JP: がNULLです。| Is null. Returns null. - .balign 4 - -glabel D_80140310 - .asciz "\x1b[m" - .balign 4 - -glabel D_80140314 - .asciz "../z_skelanime.c" - .balign 4 - -.text -glabel func_800A2288 -/* B19428 800A2288 27BDFFA8 */ addiu $sp, $sp, -0x58 -/* B1942C 800A228C AFBF0024 */ sw $ra, 0x24($sp) -/* B19430 800A2290 AFA40058 */ sw $a0, 0x58($sp) -/* B19434 800A2294 AFA5005C */ sw $a1, 0x5c($sp) -/* B19438 800A2298 AFA60060 */ sw $a2, 0x60($sp) -/* B1943C 800A229C 14A0000C */ bnez $a1, .L800A22D0 -/* B19440 800A22A0 AFA70064 */ sw $a3, 0x64($sp) -/* B19444 800A22A4 3C048014 */ lui $a0, %hi(D_801402D8) # $a0, 0x8014 -/* B19448 800A22A8 0C00084C */ jal osSyncPrintf -/* B1944C 800A22AC 248402D8 */ addiu $a0, %lo(D_801402D8) # addiu $a0, $a0, 0x2d8 -/* B19450 800A22B0 3C048014 */ lui $a0, %hi(D_801402E0) # $a0, 0x8014 -/* B19454 800A22B4 0C00084C */ jal osSyncPrintf -/* B19458 800A22B8 248402E0 */ addiu $a0, %lo(D_801402E0) # addiu $a0, $a0, 0x2e0 -/* B1945C 800A22BC 3C048014 */ lui $a0, %hi(D_80140310) # $a0, 0x8014 -/* B19460 800A22C0 0C00084C */ jal osSyncPrintf -/* B19464 800A22C4 24840310 */ addiu $a0, %lo(D_80140310) # addiu $a0, $a0, 0x310 -/* B19468 800A22C8 10000071 */ b .L800A2490 -/* B1946C 800A22CC 00001025 */ move $v0, $zero -.L800A22D0: -/* B19470 800A22D0 0C034213 */ jal Matrix_Push -/* B19474 800A22D4 00000000 */ nop -/* B19478 800A22D8 8FAF005C */ lw $t7, 0x5c($sp) -/* B1947C 800A22DC 3C0A8016 */ lui $t2, %hi(gSegments) -/* B19480 800A22E0 3C0100FF */ lui $at, (0x00FFFFFF >> 16) # lui $at, 0xff -/* B19484 800A22E4 8DE20000 */ lw $v0, ($t7) -/* B19488 800A22E8 3421FFFF */ ori $at, (0x00FFFFFF & 0xFFFF) # ori $at, $at, 0xffff -/* B1948C 800A22EC 8FA30060 */ lw $v1, 0x60($sp) -/* B19490 800A22F0 0002C900 */ sll $t9, $v0, 4 -/* B19494 800A22F4 00194702 */ srl $t0, $t9, 0x1c -/* B19498 800A22F8 00084880 */ sll $t1, $t0, 2 -/* B1949C 800A22FC 01495021 */ addu $t2, $t2, $t1 -/* B194A0 800A2300 8D4A6FA8 */ lw $t2, %lo(gSegments)($t2) -/* B194A4 800A2304 0041C024 */ and $t8, $v0, $at -/* B194A8 800A2308 3C018000 */ lui $at, 0x8000 -/* B194AC 800A230C 030A5821 */ addu $t3, $t8, $t2 -/* B194B0 800A2310 01616021 */ addu $t4, $t3, $at -/* B194B4 800A2314 AFAC0054 */ sw $t4, 0x54($sp) -/* B194B8 800A2318 846D0000 */ lh $t5, ($v1) -/* B194BC 800A231C 27B90038 */ addiu $t9, $sp, 0x38 -/* B194C0 800A2320 27AC0038 */ addiu $t4, $sp, 0x38 -/* B194C4 800A2324 448D2000 */ mtc1 $t5, $f4 -/* B194C8 800A2328 24050001 */ li $a1, 1 -/* B194CC 800A232C 27A6004C */ addiu $a2, $sp, 0x4c -/* B194D0 800A2330 468021A0 */ cvt.s.w $f6, $f4 -/* B194D4 800A2334 27A70040 */ addiu $a3, $sp, 0x40 -/* B194D8 800A2338 E7A60040 */ swc1 $f6, 0x40($sp) -/* B194DC 800A233C 846E0002 */ lh $t6, 2($v1) -/* B194E0 800A2340 448E4000 */ mtc1 $t6, $f8 -/* B194E4 800A2344 27AE0070 */ addiu $t6, $sp, 0x70 -/* B194E8 800A2348 468042A0 */ cvt.s.w $f10, $f8 -/* B194EC 800A234C E7AA0044 */ swc1 $f10, 0x44($sp) -/* B194F0 800A2350 846F0004 */ lh $t7, 4($v1) -/* B194F4 800A2354 448F8000 */ mtc1 $t7, $f16 -/* B194F8 800A2358 00000000 */ nop -/* B194FC 800A235C 468084A0 */ cvt.s.w $f18, $f16 -/* B19500 800A2360 E7B20048 */ swc1 $f18, 0x48($sp) -/* B19504 800A2364 88690006 */ lwl $t1, 6($v1) -/* B19508 800A2368 98690009 */ lwr $t1, 9($v1) -/* B1950C 800A236C AF290000 */ sw $t1, ($t9) -/* B19510 800A2370 9469000A */ lhu $t1, 0xa($v1) -/* B19514 800A2374 A7290004 */ sh $t1, 4($t9) -/* B19518 800A2378 8FB80054 */ lw $t8, 0x54($sp) -/* B1951C 800A237C 8FAB0064 */ lw $t3, 0x64($sp) -/* B19520 800A2380 8FA40058 */ lw $a0, 0x58($sp) -/* B19524 800A2384 8F0A0008 */ lw $t2, 8($t8) -/* B19528 800A2388 11600007 */ beqz $t3, .L800A23A8 -/* B1952C 800A238C AFAA004C */ sw $t2, 0x4c($sp) -/* B19530 800A2390 8FAD006C */ lw $t5, 0x6c($sp) -/* B19534 800A2394 AFAC0010 */ sw $t4, 0x10($sp) -/* B19538 800A2398 AFAE0018 */ sw $t6, 0x18($sp) -/* B1953C 800A239C 0160F809 */ jalr $t3 -/* B19540 800A23A0 AFAD0014 */ sw $t5, 0x14($sp) -/* B19544 800A23A4 1440001B */ bnez $v0, .L800A2414 -.L800A23A8: -/* B19548 800A23A8 27A40040 */ addiu $a0, $sp, 0x40 -/* B1954C 800A23AC 0C0344D0 */ jal func_800D1340 -/* B19550 800A23B0 27A50038 */ addiu $a1, $sp, 0x38 -/* B19554 800A23B4 8FAF004C */ lw $t7, 0x4c($sp) -/* B19558 800A23B8 8FB90070 */ lw $t9, 0x70($sp) -/* B1955C 800A23BC 3C09DA38 */ lui $t1, (0xDA380003 >> 16) # lui $t1, 0xda38 -/* B19560 800A23C0 11E00014 */ beqz $t7, .L800A2414 -/* B19564 800A23C4 27280008 */ addiu $t0, $t9, 8 -/* B19568 800A23C8 AFA80070 */ sw $t0, 0x70($sp) -/* B1956C 800A23CC 35290003 */ ori $t1, (0xDA380003 & 0xFFFF) # ori $t1, $t1, 3 -/* B19570 800A23D0 AF290000 */ sw $t1, ($t9) -/* B19574 800A23D4 8FB80058 */ lw $t8, 0x58($sp) -/* B19578 800A23D8 3C058014 */ lui $a1, %hi(D_80140314) # $a1, 0x8014 -/* B1957C 800A23DC 24A50314 */ addiu $a1, %lo(D_80140314) # addiu $a1, $a1, 0x314 -/* B19580 800A23E0 8F040000 */ lw $a0, ($t8) -/* B19584 800A23E4 AFB90034 */ sw $t9, 0x34($sp) -/* B19588 800A23E8 0C0346A2 */ jal Matrix_NewMtx -/* B1958C 800A23EC 24060616 */ li $a2, 1558 -/* B19590 800A23F0 8FA30034 */ lw $v1, 0x34($sp) -/* B19594 800A23F4 3C0DDE00 */ lui $t5, 0xde00 -/* B19598 800A23F8 AC620004 */ sw $v0, 4($v1) -/* B1959C 800A23FC 8FAA0070 */ lw $t2, 0x70($sp) -/* B195A0 800A2400 254C0008 */ addiu $t4, $t2, 8 -/* B195A4 800A2404 AFAC0070 */ sw $t4, 0x70($sp) -/* B195A8 800A2408 AD4D0000 */ sw $t5, ($t2) -/* B195AC 800A240C 8FAE004C */ lw $t6, 0x4c($sp) -/* B195B0 800A2410 AD4E0004 */ sw $t6, 4($t2) -.L800A2414: -/* B195B4 800A2414 8FA20068 */ lw $v0, 0x68($sp) -/* B195B8 800A2418 8FA40058 */ lw $a0, 0x58($sp) -/* B195BC 800A241C 24050001 */ li $a1, 1 -/* B195C0 800A2420 10400008 */ beqz $v0, .L800A2444 -/* B195C4 800A2424 27A6004C */ addiu $a2, $sp, 0x4c -/* B195C8 800A2428 8FAB006C */ lw $t3, 0x6c($sp) -/* B195CC 800A242C 27AF0070 */ addiu $t7, $sp, 0x70 -/* B195D0 800A2430 AFAF0014 */ sw $t7, 0x14($sp) -/* B195D4 800A2434 27A70038 */ addiu $a3, $sp, 0x38 -/* B195D8 800A2438 0040F809 */ jalr $v0 -/* B195DC 800A243C AFAB0010 */ sw $t3, 0x10($sp) -/* B195E0 800A2440 8FA20068 */ lw $v0, 0x68($sp) -.L800A2444: -/* B195E4 800A2444 8FB90054 */ lw $t9, 0x54($sp) -/* B195E8 800A2448 240100FF */ li $at, 255 -/* B195EC 800A244C 8FA40058 */ lw $a0, 0x58($sp) -/* B195F0 800A2450 93250006 */ lbu $a1, 6($t9) -/* B195F4 800A2454 8FA6005C */ lw $a2, 0x5c($sp) -/* B195F8 800A2458 8FA70060 */ lw $a3, 0x60($sp) -/* B195FC 800A245C 10A10009 */ beq $a1, $at, .L800A2484 -/* B19600 800A2460 8FA80064 */ lw $t0, 0x64($sp) -/* B19604 800A2464 8FA9006C */ lw $t1, 0x6c($sp) -/* B19608 800A2468 8FB80070 */ lw $t8, 0x70($sp) -/* B1960C 800A246C AFA80010 */ sw $t0, 0x10($sp) -/* B19610 800A2470 AFA20014 */ sw $v0, 0x14($sp) -/* B19614 800A2474 AFA90018 */ sw $t1, 0x18($sp) -/* B19618 800A2478 0C028811 */ jal func_800A2044 -/* B1961C 800A247C AFB8001C */ sw $t8, 0x1c($sp) -/* B19620 800A2480 AFA20070 */ sw $v0, 0x70($sp) -.L800A2484: -/* B19624 800A2484 0C034221 */ jal Matrix_Pull -/* B19628 800A2488 00000000 */ nop -/* B1962C 800A248C 8FA20070 */ lw $v0, 0x70($sp) -.L800A2490: -/* B19630 800A2490 8FBF0024 */ lw $ra, 0x24($sp) -/* B19634 800A2494 27BD0058 */ addiu $sp, $sp, 0x58 -/* B19638 800A2498 03E00008 */ jr $ra -/* B1963C 800A249C 00000000 */ nop - diff --git a/asm/non_matchings/code/z_skelanime/func_800A24A0.s b/asm/non_matchings/code/z_skelanime/func_800A24A0.s deleted file mode 100644 index 292cb29a24..0000000000 --- a/asm/non_matchings/code/z_skelanime/func_800A24A0.s +++ /dev/null @@ -1,185 +0,0 @@ -.rdata -glabel D_80140328 - .asciz "../z_skelanime.c" - .balign 4 - -glabel D_8014033C - .asciz "../z_skelanime.c" - .balign 4 - -.text -glabel func_800A24A0 -/* B19640 800A24A0 27BDFF98 */ addiu $sp, $sp, -0x68 -/* B19644 800A24A4 AFBF0034 */ sw $ra, 0x34($sp) -/* B19648 800A24A8 AFB00030 */ sw $s0, 0x30($sp) -/* B1964C 800A24AC AFA40068 */ sw $a0, 0x68($sp) -/* B19650 800A24B0 AFA5006C */ sw $a1, 0x6c($sp) -/* B19654 800A24B4 AFA60070 */ sw $a2, 0x70($sp) -/* B19658 800A24B8 0C034213 */ jal Matrix_Push -/* B1965C 800A24BC AFA70074 */ sw $a3, 0x74($sp) -/* B19660 800A24C0 8FAF006C */ lw $t7, 0x6c($sp) -/* B19664 800A24C4 8FAE0070 */ lw $t6, 0x70($sp) -/* B19668 800A24C8 3C0C8016 */ lui $t4, %hi(gSegments) -/* B1966C 800A24CC 000FC080 */ sll $t8, $t7, 2 -/* B19670 800A24D0 01D8C821 */ addu $t9, $t6, $t8 -/* B19674 800A24D4 8F220000 */ lw $v0, ($t9) -/* B19678 800A24D8 25ED0001 */ addiu $t5, $t7, 1 -/* B1967C 800A24DC 8FB80074 */ lw $t8, 0x74($sp) -/* B19680 800A24E0 000DC880 */ sll $t9, $t5, 2 -/* B19684 800A24E4 00024900 */ sll $t1, $v0, 4 -/* B19688 800A24E8 00095702 */ srl $t2, $t1, 0x1c -/* B1968C 800A24EC 032DC823 */ subu $t9, $t9, $t5 -/* B19690 800A24F0 000A5880 */ sll $t3, $t2, 2 -/* B19694 800A24F4 0019C840 */ sll $t9, $t9, 1 -/* B19698 800A24F8 018B6021 */ addu $t4, $t4, $t3 -/* B1969C 800A24FC AFAD006C */ sw $t5, 0x6c($sp) -/* B196A0 800A2500 03194821 */ addu $t1, $t8, $t9 -/* B196A4 800A2504 892B0000 */ lwl $t3, ($t1) -/* B196A8 800A2508 992B0003 */ lwr $t3, 3($t1) -/* B196AC 800A250C 8D8C6FA8 */ lw $t4, %lo(gSegments)($t4) -/* B196B0 800A2510 3C0100FF */ lui $at, (0x00FFFFFF >> 16) # lui $at, 0xff -/* B196B4 800A2514 27AE0048 */ addiu $t6, $sp, 0x48 -/* B196B8 800A2518 3421FFFF */ ori $at, (0x00FFFFFF & 0xFFFF) # ori $at, $at, 0xffff -/* B196BC 800A251C ADCB0000 */ sw $t3, ($t6) -/* B196C0 800A2520 952B0004 */ lhu $t3, 4($t1) -/* B196C4 800A2524 00414024 */ and $t0, $v0, $at -/* B196C8 800A2528 3C018000 */ lui $at, 0x8000 -/* B196CC 800A252C 010C8021 */ addu $s0, $t0, $t4 -/* B196D0 800A2530 02018021 */ addu $s0, $s0, $at -/* B196D4 800A2534 A5CB0004 */ sh $t3, 4($t6) -/* B196D8 800A2538 86080000 */ lh $t0, ($s0) -/* B196DC 800A253C 8FB90078 */ lw $t9, 0x78($sp) -/* B196E0 800A2540 8FA5006C */ lw $a1, 0x6c($sp) -/* B196E4 800A2544 44882000 */ mtc1 $t0, $f4 -/* B196E8 800A2548 8FA40068 */ lw $a0, 0x68($sp) -/* B196EC 800A254C 27AE0048 */ addiu $t6, $sp, 0x48 -/* B196F0 800A2550 468021A0 */ cvt.s.w $f6, $f4 -/* B196F4 800A2554 27AA0088 */ addiu $t2, $sp, 0x88 -/* B196F8 800A2558 27A60060 */ addiu $a2, $sp, 0x60 -/* B196FC 800A255C 27A70050 */ addiu $a3, $sp, 0x50 -/* B19700 800A2560 E7A60050 */ swc1 $f6, 0x50($sp) -/* B19704 800A2564 860C0002 */ lh $t4, 2($s0) -/* B19708 800A2568 448C4000 */ mtc1 $t4, $f8 -/* B1970C 800A256C 00000000 */ nop -/* B19710 800A2570 468042A0 */ cvt.s.w $f10, $f8 -/* B19714 800A2574 E7AA0054 */ swc1 $f10, 0x54($sp) -/* B19718 800A2578 860F0004 */ lh $t7, 4($s0) -/* B1971C 800A257C 448F8000 */ mtc1 $t7, $f16 -/* B19720 800A2580 00000000 */ nop -/* B19724 800A2584 468084A0 */ cvt.s.w $f18, $f16 -/* B19728 800A2588 E7B20058 */ swc1 $f18, 0x58($sp) -/* B1972C 800A258C 8E0D0008 */ lw $t5, 8($s0) -/* B19730 800A2590 AFAD005C */ sw $t5, 0x5c($sp) -/* B19734 800A2594 13200007 */ beqz $t9, .L800A25B4 -/* B19738 800A2598 AFAD0060 */ sw $t5, 0x60($sp) -/* B1973C 800A259C 8FA90080 */ lw $t1, 0x80($sp) -/* B19740 800A25A0 AFAE0010 */ sw $t6, 0x10($sp) -/* B19744 800A25A4 AFAA0018 */ sw $t2, 0x18($sp) -/* B19748 800A25A8 0320F809 */ jalr $t9 -/* B1974C 800A25AC AFA90014 */ sw $t1, 0x14($sp) -/* B19750 800A25B0 1440002C */ bnez $v0, .L800A2664 -.L800A25B4: -/* B19754 800A25B4 27A40050 */ addiu $a0, $sp, 0x50 -/* B19758 800A25B8 0C0344D0 */ jal func_800D1340 -/* B1975C 800A25BC 27A50048 */ addiu $a1, $sp, 0x48 -/* B19760 800A25C0 8FAB0060 */ lw $t3, 0x60($sp) -/* B19764 800A25C4 8FA80084 */ lw $t0, 0x84($sp) -/* B19768 800A25C8 3C058014 */ lui $a1, %hi(D_80140328) # $a1, 0x8014 -/* B1976C 800A25CC 1160001A */ beqz $t3, .L800A2638 -/* B19770 800A25D0 8FAD005C */ lw $t5, 0x5c($sp) -/* B19774 800A25D4 8D040000 */ lw $a0, ($t0) -/* B19778 800A25D8 24A50328 */ addiu $a1, %lo(D_80140328) # addiu $a1, $a1, 0x328 -/* B1977C 800A25DC 0C034695 */ jal Matrix_ToMtx -/* B19780 800A25E0 24060657 */ li $a2, 1623 -/* B19784 800A25E4 8FAC0088 */ lw $t4, 0x88($sp) -/* B19788 800A25E8 3C0DDA38 */ lui $t5, (0xDA380003 >> 16) # lui $t5, 0xda38 -/* B1978C 800A25EC 35AD0003 */ ori $t5, (0xDA380003 & 0xFFFF) # ori $t5, $t5, 3 -/* B19790 800A25F0 258F0008 */ addiu $t7, $t4, 8 -/* B19794 800A25F4 AFAF0088 */ sw $t7, 0x88($sp) -/* B19798 800A25F8 AD8D0000 */ sw $t5, ($t4) -/* B1979C 800A25FC 8FB80084 */ lw $t8, 0x84($sp) -/* B197A0 800A2600 3C19DE00 */ lui $t9, 0xde00 -/* B197A4 800A2604 8F0E0000 */ lw $t6, ($t8) -/* B197A8 800A2608 AD8E0004 */ sw $t6, 4($t4) -/* B197AC 800A260C 8FA90088 */ lw $t1, 0x88($sp) -/* B197B0 800A2610 252A0008 */ addiu $t2, $t1, 8 -/* B197B4 800A2614 AFAA0088 */ sw $t2, 0x88($sp) -/* B197B8 800A2618 AD390000 */ sw $t9, ($t1) -/* B197BC 800A261C 8FAB0060 */ lw $t3, 0x60($sp) -/* B197C0 800A2620 AD2B0004 */ sw $t3, 4($t1) -/* B197C4 800A2624 8FA80084 */ lw $t0, 0x84($sp) -/* B197C8 800A2628 8D0C0000 */ lw $t4, ($t0) -/* B197CC 800A262C 258F0040 */ addiu $t7, $t4, 0x40 -/* B197D0 800A2630 1000000C */ b .L800A2664 -/* B197D4 800A2634 AD0F0000 */ sw $t7, ($t0) -.L800A2638: -/* B197D8 800A2638 11A0000A */ beqz $t5, .L800A2664 -/* B197DC 800A263C 8FB80084 */ lw $t8, 0x84($sp) -/* B197E0 800A2640 3C058014 */ lui $a1, %hi(D_8014033C) # $a1, 0x8014 -/* B197E4 800A2644 24A5033C */ addiu $a1, %lo(D_8014033C) # addiu $a1, $a1, 0x33c -/* B197E8 800A2648 8F040000 */ lw $a0, ($t8) -/* B197EC 800A264C 0C034695 */ jal Matrix_ToMtx -/* B197F0 800A2650 2406065E */ li $a2, 1630 -/* B197F4 800A2654 8FAE0084 */ lw $t6, 0x84($sp) -/* B197F8 800A2658 8DC90000 */ lw $t1, ($t6) -/* B197FC 800A265C 252A0040 */ addiu $t2, $t1, 0x40 -/* B19800 800A2660 ADCA0000 */ sw $t2, ($t6) -.L800A2664: -/* B19804 800A2664 8FB9007C */ lw $t9, 0x7c($sp) -/* B19808 800A2668 8FA40068 */ lw $a0, 0x68($sp) -/* B1980C 800A266C 8FA5006C */ lw $a1, 0x6c($sp) -/* B19810 800A2670 13200007 */ beqz $t9, .L800A2690 -/* B19814 800A2674 27A6005C */ addiu $a2, $sp, 0x5c -/* B19818 800A2678 8FAB0080 */ lw $t3, 0x80($sp) -/* B1981C 800A267C 27AC0088 */ addiu $t4, $sp, 0x88 -/* B19820 800A2680 AFAC0014 */ sw $t4, 0x14($sp) -/* B19824 800A2684 27A70048 */ addiu $a3, $sp, 0x48 -/* B19828 800A2688 0320F809 */ jalr $t9 -/* B1982C 800A268C AFAB0010 */ sw $t3, 0x10($sp) -.L800A2690: -/* B19830 800A2690 92050006 */ lbu $a1, 6($s0) -/* B19834 800A2694 240100FF */ li $at, 255 -/* B19838 800A2698 8FA40068 */ lw $a0, 0x68($sp) -/* B1983C 800A269C 10A1000E */ beq $a1, $at, .L800A26D8 -/* B19840 800A26A0 8FA60070 */ lw $a2, 0x70($sp) -/* B19844 800A26A4 8FAF0078 */ lw $t7, 0x78($sp) -/* B19848 800A26A8 8FA8007C */ lw $t0, 0x7c($sp) -/* B1984C 800A26AC 8FAD0080 */ lw $t5, 0x80($sp) -/* B19850 800A26B0 8FB80084 */ lw $t8, 0x84($sp) -/* B19854 800A26B4 8FA90088 */ lw $t1, 0x88($sp) -/* B19858 800A26B8 8FA70074 */ lw $a3, 0x74($sp) -/* B1985C 800A26BC AFAF0010 */ sw $t7, 0x10($sp) -/* B19860 800A26C0 AFA80014 */ sw $t0, 0x14($sp) -/* B19864 800A26C4 AFAD0018 */ sw $t5, 0x18($sp) -/* B19868 800A26C8 AFB8001C */ sw $t8, 0x1c($sp) -/* B1986C 800A26CC 0C028928 */ jal func_800A24A0 -/* B19870 800A26D0 AFA90020 */ sw $t1, 0x20($sp) -/* B19874 800A26D4 AFA20088 */ sw $v0, 0x88($sp) -.L800A26D8: -/* B19878 800A26D8 0C034221 */ jal Matrix_Pull -/* B1987C 800A26DC 00000000 */ nop -/* B19880 800A26E0 92050007 */ lbu $a1, 7($s0) -/* B19884 800A26E4 240100FF */ li $at, 255 -/* B19888 800A26E8 8FA40068 */ lw $a0, 0x68($sp) -/* B1988C 800A26EC 10A1000E */ beq $a1, $at, .L800A2728 -/* B19890 800A26F0 8FA60070 */ lw $a2, 0x70($sp) -/* B19894 800A26F4 8FAA0078 */ lw $t2, 0x78($sp) -/* B19898 800A26F8 8FAE007C */ lw $t6, 0x7c($sp) -/* B1989C 800A26FC 8FAB0080 */ lw $t3, 0x80($sp) -/* B198A0 800A2700 8FAC0084 */ lw $t4, 0x84($sp) -/* B198A4 800A2704 8FB90088 */ lw $t9, 0x88($sp) -/* B198A8 800A2708 8FA70074 */ lw $a3, 0x74($sp) -/* B198AC 800A270C AFAA0010 */ sw $t2, 0x10($sp) -/* B198B0 800A2710 AFAE0014 */ sw $t6, 0x14($sp) -/* B198B4 800A2714 AFAB0018 */ sw $t3, 0x18($sp) -/* B198B8 800A2718 AFAC001C */ sw $t4, 0x1c($sp) -/* B198BC 800A271C 0C028928 */ jal func_800A24A0 -/* B198C0 800A2720 AFB90020 */ sw $t9, 0x20($sp) -/* B198C4 800A2724 AFA20088 */ sw $v0, 0x88($sp) -.L800A2728: -/* B198C8 800A2728 8FBF0034 */ lw $ra, 0x34($sp) -/* B198CC 800A272C 8FA20088 */ lw $v0, 0x88($sp) -/* B198D0 800A2730 8FB00030 */ lw $s0, 0x30($sp) -/* B198D4 800A2734 03E00008 */ jr $ra -/* B198D8 800A2738 27BD0068 */ addiu $sp, $sp, 0x68 - diff --git a/asm/non_matchings/code/z_skelanime/func_800A273C.s b/asm/non_matchings/code/z_skelanime/func_800A273C.s deleted file mode 100644 index b63757c2fe..0000000000 --- a/asm/non_matchings/code/z_skelanime/func_800A273C.s +++ /dev/null @@ -1,192 +0,0 @@ -.rdata -glabel D_80140350 - .asciz "\x1b[31m" - .balign 4 - -glabel D_80140358 - .asciz "Si2_draw2_SV():skelがNULLです。NULLを返します。\n" - # EUC-JP: がNULLです。| Is null. Returns null. - .balign 4 - -glabel D_8014038C - .asciz "\x1b[m" - .balign 4 - -glabel D_80140390 - .asciz "../z_skelanime.c" - .balign 4 - -glabel D_801403A4 - .asciz "../z_skelanime.c" - .balign 4 - -.text -glabel func_800A273C -/* B198DC 800A273C 27BDFF98 */ addiu $sp, $sp, -0x68 -/* B198E0 800A2740 AFBF002C */ sw $ra, 0x2c($sp) -/* B198E4 800A2744 AFA40068 */ sw $a0, 0x68($sp) -/* B198E8 800A2748 AFA5006C */ sw $a1, 0x6c($sp) -/* B198EC 800A274C AFA60070 */ sw $a2, 0x70($sp) -/* B198F0 800A2750 8C840000 */ lw $a0, ($a0) -/* B198F4 800A2754 0C031A73 */ jal Graph_Alloc -/* B198F8 800A2758 00072980 */ sll $a1, $a3, 6 -/* B198FC 800A275C 8FAF006C */ lw $t7, 0x6c($sp) -/* B19900 800A2760 8FB80084 */ lw $t8, 0x84($sp) -/* B19904 800A2764 AFA20040 */ sw $v0, 0x40($sp) -/* B19908 800A2768 15E0000C */ bnez $t7, .L800A279C -/* B1990C 800A276C 27190008 */ addiu $t9, $t8, 8 -/* B19910 800A2770 3C048014 */ lui $a0, %hi(D_80140350) # $a0, 0x8014 -/* B19914 800A2774 0C00084C */ jal osSyncPrintf -/* B19918 800A2778 24840350 */ addiu $a0, %lo(D_80140350) # addiu $a0, $a0, 0x350 -/* B1991C 800A277C 3C048014 */ lui $a0, %hi(D_80140358) # $a0, 0x8014 -/* B19920 800A2780 0C00084C */ jal osSyncPrintf -/* B19924 800A2784 24840358 */ addiu $a0, %lo(D_80140358) # addiu $a0, $a0, 0x358 -/* B19928 800A2788 3C048014 */ lui $a0, %hi(D_8014038C) # $a0, 0x8014 -/* B1992C 800A278C 0C00084C */ jal osSyncPrintf -/* B19930 800A2790 2484038C */ addiu $a0, %lo(D_8014038C) # addiu $a0, $a0, 0x38c -/* B19934 800A2794 10000085 */ b .L800A29AC -/* B19938 800A2798 00001025 */ move $v0, $zero -.L800A279C: -/* B1993C 800A279C 3C08DB06 */ lui $t0, (0xDB060034 >> 16) # lui $t0, 0xdb06 -/* B19940 800A27A0 35080034 */ ori $t0, (0xDB060034 & 0xFFFF) # ori $t0, $t0, 0x34 -/* B19944 800A27A4 AFB90084 */ sw $t9, 0x84($sp) -/* B19948 800A27A8 AF080000 */ sw $t0, ($t8) -/* B1994C 800A27AC 8FA90040 */ lw $t1, 0x40($sp) -/* B19950 800A27B0 0C034213 */ jal Matrix_Push -/* B19954 800A27B4 AF090004 */ sw $t1, 4($t8) -/* B19958 800A27B8 8FAA006C */ lw $t2, 0x6c($sp) -/* B1995C 800A27BC 3C0F8016 */ lui $t7, %hi(gSegments) -/* B19960 800A27C0 3C0100FF */ lui $at, (0x00FFFFFF >> 16) # lui $at, 0xff -/* B19964 800A27C4 8D420000 */ lw $v0, ($t2) -/* B19968 800A27C8 3421FFFF */ ori $at, (0x00FFFFFF & 0xFFFF) # ori $at, $at, 0xffff -/* B1996C 800A27CC 8FA30070 */ lw $v1, 0x70($sp) -/* B19970 800A27D0 00026100 */ sll $t4, $v0, 4 -/* B19974 800A27D4 000C6F02 */ srl $t5, $t4, 0x1c -/* B19978 800A27D8 000D7080 */ sll $t6, $t5, 2 -/* B1997C 800A27DC 01EE7821 */ addu $t7, $t7, $t6 -/* B19980 800A27E0 8DEF6FA8 */ lw $t7, %lo(gSegments)($t7) -/* B19984 800A27E4 00415824 */ and $t3, $v0, $at -/* B19988 800A27E8 3C018000 */ lui $at, 0x8000 -/* B1998C 800A27EC 016FC021 */ addu $t8, $t3, $t7 -/* B19990 800A27F0 0301C821 */ addu $t9, $t8, $at -/* B19994 800A27F4 AFB90064 */ sw $t9, 0x64($sp) -/* B19998 800A27F8 84680000 */ lh $t0, ($v1) -/* B1999C 800A27FC 27AC0044 */ addiu $t4, $sp, 0x44 -/* B199A0 800A2800 27B90044 */ addiu $t9, $sp, 0x44 -/* B199A4 800A2804 44882000 */ mtc1 $t0, $f4 -/* B199A8 800A2808 24050001 */ li $a1, 1 -/* B199AC 800A280C 27A6005C */ addiu $a2, $sp, 0x5c -/* B199B0 800A2810 468021A0 */ cvt.s.w $f6, $f4 -/* B199B4 800A2814 27A7004C */ addiu $a3, $sp, 0x4c -/* B199B8 800A2818 E7A6004C */ swc1 $f6, 0x4c($sp) -/* B199BC 800A281C 84690002 */ lh $t1, 2($v1) -/* B199C0 800A2820 44894000 */ mtc1 $t1, $f8 -/* B199C4 800A2824 27A90084 */ addiu $t1, $sp, 0x84 -/* B199C8 800A2828 468042A0 */ cvt.s.w $f10, $f8 -/* B199CC 800A282C E7AA0050 */ swc1 $f10, 0x50($sp) -/* B199D0 800A2830 846A0004 */ lh $t2, 4($v1) -/* B199D4 800A2834 448A8000 */ mtc1 $t2, $f16 -/* B199D8 800A2838 00000000 */ nop -/* B199DC 800A283C 468084A0 */ cvt.s.w $f18, $f16 -/* B199E0 800A2840 E7B20054 */ swc1 $f18, 0x54($sp) -/* B199E4 800A2844 886E0006 */ lwl $t6, 6($v1) -/* B199E8 800A2848 986E0009 */ lwr $t6, 9($v1) -/* B199EC 800A284C AD8E0000 */ sw $t6, ($t4) -/* B199F0 800A2850 946E000A */ lhu $t6, 0xa($v1) -/* B199F4 800A2854 A58E0004 */ sh $t6, 4($t4) -/* B199F8 800A2858 8FAB0064 */ lw $t3, 0x64($sp) -/* B199FC 800A285C 8FB80078 */ lw $t8, 0x78($sp) -/* B19A00 800A2860 8FA40068 */ lw $a0, 0x68($sp) -/* B19A04 800A2864 8D6F0008 */ lw $t7, 8($t3) -/* B19A08 800A2868 AFAF0058 */ sw $t7, 0x58($sp) -/* B19A0C 800A286C 13000007 */ beqz $t8, .L800A288C -/* B19A10 800A2870 AFAF005C */ sw $t7, 0x5c($sp) -/* B19A14 800A2874 8FA80080 */ lw $t0, 0x80($sp) -/* B19A18 800A2878 AFB90010 */ sw $t9, 0x10($sp) -/* B19A1C 800A287C AFA90018 */ sw $t1, 0x18($sp) -/* B19A20 800A2880 0300F809 */ jalr $t8 -/* B19A24 800A2884 AFA80014 */ sw $t0, 0x14($sp) -/* B19A28 800A2888 14400027 */ bnez $v0, .L800A2928 -.L800A288C: -/* B19A2C 800A288C 27A4004C */ addiu $a0, $sp, 0x4c -/* B19A30 800A2890 0C0344D0 */ jal func_800D1340 -/* B19A34 800A2894 27A50044 */ addiu $a1, $sp, 0x44 -/* B19A38 800A2898 8FAA005C */ lw $t2, 0x5c($sp) -/* B19A3C 800A289C 8FA40040 */ lw $a0, 0x40($sp) -/* B19A40 800A28A0 3C058014 */ lui $a1, %hi(D_80140390) # $a1, 0x8014 -/* B19A44 800A28A4 11400017 */ beqz $t2, .L800A2904 -/* B19A48 800A28A8 8FAC0058 */ lw $t4, 0x58($sp) -/* B19A4C 800A28AC 24A50390 */ addiu $a1, %lo(D_80140390) # addiu $a1, $a1, 0x390 -/* B19A50 800A28B0 0C034695 */ jal Matrix_ToMtx -/* B19A54 800A28B4 240606AE */ li $a2, 1710 -/* B19A58 800A28B8 8FAC0084 */ lw $t4, 0x84($sp) -/* B19A5C 800A28BC 3C0EDA38 */ lui $t6, (0xDA380003 >> 16) # lui $t6, 0xda38 -/* B19A60 800A28C0 35CE0003 */ ori $t6, (0xDA380003 & 0xFFFF) # ori $t6, $t6, 3 -/* B19A64 800A28C4 258D0008 */ addiu $t5, $t4, 8 -/* B19A68 800A28C8 AFAD0084 */ sw $t5, 0x84($sp) -/* B19A6C 800A28CC AD8E0000 */ sw $t6, ($t4) -/* B19A70 800A28D0 8FAB0040 */ lw $t3, 0x40($sp) -/* B19A74 800A28D4 3C08DE00 */ lui $t0, 0xde00 -/* B19A78 800A28D8 AD8B0004 */ sw $t3, 4($t4) -/* B19A7C 800A28DC 8FAF0084 */ lw $t7, 0x84($sp) -/* B19A80 800A28E0 25F90008 */ addiu $t9, $t7, 8 -/* B19A84 800A28E4 AFB90084 */ sw $t9, 0x84($sp) -/* B19A88 800A28E8 ADE80000 */ sw $t0, ($t7) -/* B19A8C 800A28EC 8FA9005C */ lw $t1, 0x5c($sp) -/* B19A90 800A28F0 ADE90004 */ sw $t1, 4($t7) -/* B19A94 800A28F4 8FB80040 */ lw $t8, 0x40($sp) -/* B19A98 800A28F8 270A0040 */ addiu $t2, $t8, 0x40 -/* B19A9C 800A28FC 1000000A */ b .L800A2928 -/* B19AA0 800A2900 AFAA0040 */ sw $t2, 0x40($sp) -.L800A2904: -/* B19AA4 800A2904 11800008 */ beqz $t4, .L800A2928 -/* B19AA8 800A2908 8FA40040 */ lw $a0, 0x40($sp) -/* B19AAC 800A290C 3C058014 */ lui $a1, %hi(D_801403A4) # $a1, 0x8014 -/* B19AB0 800A2910 24A503A4 */ addiu $a1, %lo(D_801403A4) # addiu $a1, $a1, 0x3a4 -/* B19AB4 800A2914 0C034695 */ jal Matrix_ToMtx -/* B19AB8 800A2918 240606B5 */ li $a2, 1717 -/* B19ABC 800A291C 8FAD0040 */ lw $t5, 0x40($sp) -/* B19AC0 800A2920 25AE0040 */ addiu $t6, $t5, 0x40 -/* B19AC4 800A2924 AFAE0040 */ sw $t6, 0x40($sp) -.L800A2928: -/* B19AC8 800A2928 8FA2007C */ lw $v0, 0x7c($sp) -/* B19ACC 800A292C 8FA40068 */ lw $a0, 0x68($sp) -/* B19AD0 800A2930 24050001 */ li $a1, 1 -/* B19AD4 800A2934 10400008 */ beqz $v0, .L800A2958 -/* B19AD8 800A2938 27A60058 */ addiu $a2, $sp, 0x58 -/* B19ADC 800A293C 8FAB0080 */ lw $t3, 0x80($sp) -/* B19AE0 800A2940 27AF0084 */ addiu $t7, $sp, 0x84 -/* B19AE4 800A2944 AFAF0014 */ sw $t7, 0x14($sp) -/* B19AE8 800A2948 27A70044 */ addiu $a3, $sp, 0x44 -/* B19AEC 800A294C 0040F809 */ jalr $v0 -/* B19AF0 800A2950 AFAB0010 */ sw $t3, 0x10($sp) -/* B19AF4 800A2954 8FA2007C */ lw $v0, 0x7c($sp) -.L800A2958: -/* B19AF8 800A2958 8FB90064 */ lw $t9, 0x64($sp) -/* B19AFC 800A295C 240100FF */ li $at, 255 -/* B19B00 800A2960 8FA40068 */ lw $a0, 0x68($sp) -/* B19B04 800A2964 93250006 */ lbu $a1, 6($t9) -/* B19B08 800A2968 8FA6006C */ lw $a2, 0x6c($sp) -/* B19B0C 800A296C 8FA70070 */ lw $a3, 0x70($sp) -/* B19B10 800A2970 10A1000B */ beq $a1, $at, .L800A29A0 -/* B19B14 800A2974 8FA80078 */ lw $t0, 0x78($sp) -/* B19B18 800A2978 8FA90080 */ lw $t1, 0x80($sp) -/* B19B1C 800A297C 8FAA0084 */ lw $t2, 0x84($sp) -/* B19B20 800A2980 27B80040 */ addiu $t8, $sp, 0x40 -/* B19B24 800A2984 AFB8001C */ sw $t8, 0x1c($sp) -/* B19B28 800A2988 AFA80010 */ sw $t0, 0x10($sp) -/* B19B2C 800A298C AFA20014 */ sw $v0, 0x14($sp) -/* B19B30 800A2990 AFA90018 */ sw $t1, 0x18($sp) -/* B19B34 800A2994 0C028928 */ jal func_800A24A0 -/* B19B38 800A2998 AFAA0020 */ sw $t2, 0x20($sp) -/* B19B3C 800A299C AFA20084 */ sw $v0, 0x84($sp) -.L800A29A0: -/* B19B40 800A29A0 0C034221 */ jal Matrix_Pull -/* B19B44 800A29A4 00000000 */ nop -/* B19B48 800A29A8 8FA20084 */ lw $v0, 0x84($sp) -.L800A29AC: -/* B19B4C 800A29AC 8FBF002C */ lw $ra, 0x2c($sp) -/* B19B50 800A29B0 27BD0068 */ addiu $sp, $sp, 0x68 -/* B19B54 800A29B4 03E00008 */ jr $ra -/* B19B58 800A29B8 00000000 */ nop - diff --git a/asm/non_matchings/code/z_skelanime/func_800A2DBC.s b/asm/non_matchings/code/z_skelanime/func_800A2DBC.s deleted file mode 100644 index 8945726cca..0000000000 --- a/asm/non_matchings/code/z_skelanime/func_800A2DBC.s +++ /dev/null @@ -1,16 +0,0 @@ -glabel func_800A2DBC -/* B19F5C 800A2DBC 00047100 */ sll $t6, $a0, 4 -/* B19F60 800A2DC0 000E7F02 */ srl $t7, $t6, 0x1c -/* B19F64 800A2DC4 000FC080 */ sll $t8, $t7, 2 -/* B19F68 800A2DC8 3C198016 */ lui $t9, %hi(gSegments) -/* B19F6C 800A2DCC 0338C821 */ addu $t9, $t9, $t8 -/* B19F70 800A2DD0 3C0100FF */ lui $at, (0x00FFFFFF >> 16) # lui $at, 0xff -/* B19F74 800A2DD4 8F396FA8 */ lw $t9, %lo(gSegments)($t9) -/* B19F78 800A2DD8 3421FFFF */ ori $at, (0x00FFFFFF & 0xFFFF) # ori $at, $at, 0xffff -/* B19F7C 800A2DDC 00814024 */ and $t0, $a0, $at -/* B19F80 800A2DE0 3C018000 */ lui $at, 0x8000 -/* B19F84 800A2DE4 03281821 */ addu $v1, $t9, $t0 -/* B19F88 800A2DE8 00611821 */ addu $v1, $v1, $at -/* B19F8C 800A2DEC 03E00008 */ jr $ra -/* B19F90 800A2DF0 84620002 */ lh $v0, 2($v1) - diff --git a/asm/non_matchings/code/z_skelanime/func_800A2DF4.s b/asm/non_matchings/code/z_skelanime/func_800A2DF4.s deleted file mode 100644 index d83fd92139..0000000000 --- a/asm/non_matchings/code/z_skelanime/func_800A2DF4.s +++ /dev/null @@ -1,16 +0,0 @@ -glabel func_800A2DF4 -/* B19F94 800A2DF4 00047100 */ sll $t6, $a0, 4 -/* B19F98 800A2DF8 000E7F02 */ srl $t7, $t6, 0x1c -/* B19F9C 800A2DFC 000FC080 */ sll $t8, $t7, 2 -/* B19FA0 800A2E00 3C198016 */ lui $t9, %hi(gSegments) -/* B19FA4 800A2E04 0338C821 */ addu $t9, $t9, $t8 -/* B19FA8 800A2E08 3C0100FF */ lui $at, (0x00FFFFFF >> 16) # lui $at, 0xff -/* B19FAC 800A2E0C 8F396FA8 */ lw $t9, %lo(gSegments)($t9) -/* B19FB0 800A2E10 3421FFFF */ ori $at, (0x00FFFFFF & 0xFFFF) # ori $at, $at, 0xffff -/* B19FB4 800A2E14 00814024 */ and $t0, $a0, $at -/* B19FB8 800A2E18 3C018000 */ lui $at, 0x8000 -/* B19FBC 800A2E1C 03281821 */ addu $v1, $t9, $t0 -/* B19FC0 800A2E20 00611821 */ addu $v1, $v1, $at -/* B19FC4 800A2E24 03E00008 */ jr $ra -/* B19FC8 800A2E28 84620000 */ lh $v0, ($v1) - diff --git a/asm/non_matchings/code/z_skelanime/func_800A2E2C.s b/asm/non_matchings/code/z_skelanime/func_800A2E2C.s deleted file mode 100644 index 1a71415232..0000000000 --- a/asm/non_matchings/code/z_skelanime/func_800A2E2C.s +++ /dev/null @@ -1,19 +0,0 @@ -glabel func_800A2E2C -/* B19FCC 800A2E2C 00047100 */ sll $t6, $a0, 4 -/* B19FD0 800A2E30 000E7F02 */ srl $t7, $t6, 0x1c -/* B19FD4 800A2E34 000FC080 */ sll $t8, $t7, 2 -/* B19FD8 800A2E38 3C198016 */ lui $t9, %hi(gSegments) -/* B19FDC 800A2E3C 0338C821 */ addu $t9, $t9, $t8 -/* B19FE0 800A2E40 3C0100FF */ lui $at, (0x00FFFFFF >> 16) # lui $at, 0xff -/* B19FE4 800A2E44 8F396FA8 */ lw $t9, %lo(gSegments)($t9) -/* B19FE8 800A2E48 3421FFFF */ ori $at, (0x00FFFFFF & 0xFFFF) # ori $at, $at, 0xffff -/* B19FEC 800A2E4C 00814024 */ and $t0, $a0, $at -/* B19FF0 800A2E50 3C018000 */ lui $at, 0x8000 -/* B19FF4 800A2E54 03281821 */ addu $v1, $t9, $t0 -/* B19FF8 800A2E58 00611821 */ addu $v1, $v1, $at -/* B19FFC 800A2E5C 84620000 */ lh $v0, ($v1) -/* B1A000 800A2E60 2442FFFF */ addiu $v0, $v0, -1 -/* B1A004 800A2E64 00021400 */ sll $v0, $v0, 0x10 -/* B1A008 800A2E68 03E00008 */ jr $ra -/* B1A00C 800A2E6C 00021403 */ sra $v0, $v0, 0x10 - diff --git a/asm/non_matchings/code/z_skelanime/func_800A2E70.s b/asm/non_matchings/code/z_skelanime/func_800A2E70.s deleted file mode 100644 index 9eeadbd18a..0000000000 --- a/asm/non_matchings/code/z_skelanime/func_800A2E70.s +++ /dev/null @@ -1,297 +0,0 @@ -glabel func_800A2E70 -/* B1A010 800A2E70 27BDFFF8 */ addiu $sp, $sp, -8 -/* B1A014 800A2E74 3C013F80 */ li $at, 0x3F800000 # 0.000000 -/* B1A018 800A2E78 C7AC0018 */ lwc1 $f12, 0x18($sp) -/* B1A01C 800A2E7C 44812000 */ mtc1 $at, $f4 -/* B1A020 800A2E80 AFB00004 */ sw $s0, 4($sp) -/* B1A024 800A2E84 00A08025 */ move $s0, $a1 -/* B1A028 800A2E88 4604603C */ c.lt.s $f12, $f4 -/* B1A02C 800A2E8C 00000000 */ nop -/* B1A030 800A2E90 450000E6 */ bc1f .L800A322C -/* B1A034 800A2E94 00000000 */ nop -/* B1A038 800A2E98 18800111 */ blez $a0, .L800A32E0 -/* B1A03C 800A2E9C 00001025 */ move $v0, $zero -/* B1A040 800A2EA0 30830001 */ andi $v1, $a0, 1 -/* B1A044 800A2EA4 50600030 */ beql $v1, $zero, .L800A2F68 -/* B1A048 800A2EA8 24420002 */ addiu $v0, $v0, 2 -/* B1A04C 800A2EAC 84C30000 */ lh $v1, ($a2) -/* B1A050 800A2EB0 84EE0000 */ lh $t6, ($a3) -/* B1A054 800A2EB4 24020001 */ li $v0, 1 -/* B1A058 800A2EB8 26100006 */ addiu $s0, $s0, 6 -/* B1A05C 800A2EBC 01C32823 */ subu $a1, $t6, $v1 -/* B1A060 800A2EC0 00052C00 */ sll $a1, $a1, 0x10 -/* B1A064 800A2EC4 00052C03 */ sra $a1, $a1, 0x10 -/* B1A068 800A2EC8 44853000 */ mtc1 $a1, $f6 -/* B1A06C 800A2ECC 24C60006 */ addiu $a2, $a2, 6 -/* B1A070 800A2ED0 24E70006 */ addiu $a3, $a3, 6 -/* B1A074 800A2ED4 46803220 */ cvt.s.w $f8, $f6 -/* B1A078 800A2ED8 460C4282 */ mul.s $f10, $f8, $f12 -/* B1A07C 800A2EDC 4600540D */ trunc.w.s $f16, $f10 -/* B1A080 800A2EE0 44088000 */ mfc1 $t0, $f16 -/* B1A084 800A2EE4 00000000 */ nop -/* B1A088 800A2EE8 01034821 */ addu $t1, $t0, $v1 -/* B1A08C 800A2EEC A609FFFA */ sh $t1, -6($s0) -/* B1A090 800A2EF0 84EAFFFC */ lh $t2, -4($a3) -/* B1A094 800A2EF4 84C3FFFC */ lh $v1, -4($a2) -/* B1A098 800A2EF8 01432823 */ subu $a1, $t2, $v1 -/* B1A09C 800A2EFC 00052C00 */ sll $a1, $a1, 0x10 -/* B1A0A0 800A2F00 00052C03 */ sra $a1, $a1, 0x10 -/* B1A0A4 800A2F04 44859000 */ mtc1 $a1, $f18 -/* B1A0A8 800A2F08 00000000 */ nop -/* B1A0AC 800A2F0C 46809120 */ cvt.s.w $f4, $f18 -/* B1A0B0 800A2F10 460C2182 */ mul.s $f6, $f4, $f12 -/* B1A0B4 800A2F14 4600320D */ trunc.w.s $f8, $f6 -/* B1A0B8 800A2F18 440E4000 */ mfc1 $t6, $f8 -/* B1A0BC 800A2F1C 00000000 */ nop -/* B1A0C0 800A2F20 01C37821 */ addu $t7, $t6, $v1 -/* B1A0C4 800A2F24 A60FFFFC */ sh $t7, -4($s0) -/* B1A0C8 800A2F28 84F8FFFE */ lh $t8, -2($a3) -/* B1A0CC 800A2F2C 84C3FFFE */ lh $v1, -2($a2) -/* B1A0D0 800A2F30 03032823 */ subu $a1, $t8, $v1 -/* B1A0D4 800A2F34 00052C00 */ sll $a1, $a1, 0x10 -/* B1A0D8 800A2F38 00052C03 */ sra $a1, $a1, 0x10 -/* B1A0DC 800A2F3C 44855000 */ mtc1 $a1, $f10 -/* B1A0E0 800A2F40 00000000 */ nop -/* B1A0E4 800A2F44 46805420 */ cvt.s.w $f16, $f10 -/* B1A0E8 800A2F48 460C8482 */ mul.s $f18, $f16, $f12 -/* B1A0EC 800A2F4C 4600910D */ trunc.w.s $f4, $f18 -/* B1A0F0 800A2F50 440A2000 */ mfc1 $t2, $f4 -/* B1A0F4 800A2F54 00000000 */ nop -/* B1A0F8 800A2F58 01435821 */ addu $t3, $t2, $v1 -/* B1A0FC 800A2F5C 104400E0 */ beq $v0, $a0, .L800A32E0 -/* B1A100 800A2F60 A60BFFFE */ sh $t3, -2($s0) -/* B1A104 800A2F64 24420002 */ addiu $v0, $v0, 2 -.L800A2F68: -/* B1A108 800A2F68 84C30000 */ lh $v1, ($a2) -/* B1A10C 800A2F6C 10440059 */ beq $v0, $a0, .L800A30D4 -/* B1A110 800A2F70 84EC0000 */ lh $t4, ($a3) -.L800A2F74: -/* B1A114 800A2F74 01832823 */ subu $a1, $t4, $v1 -/* B1A118 800A2F78 00052C00 */ sll $a1, $a1, 0x10 -/* B1A11C 800A2F7C 00052C03 */ sra $a1, $a1, 0x10 -/* B1A120 800A2F80 44859000 */ mtc1 $a1, $f18 -/* B1A124 800A2F84 24420002 */ addiu $v0, $v0, 2 -/* B1A128 800A2F88 2610000C */ addiu $s0, $s0, 0xc -/* B1A12C 800A2F8C 468094A0 */ cvt.s.w $f18, $f18 -/* B1A130 800A2F90 24C6000C */ addiu $a2, $a2, 0xc -/* B1A134 800A2F94 24E7000C */ addiu $a3, $a3, 0xc -/* B1A138 800A2F98 460C9482 */ mul.s $f18, $f18, $f12 -/* B1A13C 800A2F9C 4600948D */ trunc.w.s $f18, $f18 -/* B1A140 800A2FA0 44189000 */ mfc1 $t8, $f18 -/* B1A144 800A2FA4 00000000 */ nop -/* B1A148 800A2FA8 0303C821 */ addu $t9, $t8, $v1 -/* B1A14C 800A2FAC A619FFF4 */ sh $t9, -0xc($s0) -/* B1A150 800A2FB0 84C3FFF6 */ lh $v1, -0xa($a2) -/* B1A154 800A2FB4 84E8FFF6 */ lh $t0, -0xa($a3) -/* B1A158 800A2FB8 01032823 */ subu $a1, $t0, $v1 -/* B1A15C 800A2FBC 00052C00 */ sll $a1, $a1, 0x10 -/* B1A160 800A2FC0 00052C03 */ sra $a1, $a1, 0x10 -/* B1A164 800A2FC4 44859000 */ mtc1 $a1, $f18 -/* B1A168 800A2FC8 00000000 */ nop -/* B1A16C 800A2FCC 468094A0 */ cvt.s.w $f18, $f18 -/* B1A170 800A2FD0 460C9482 */ mul.s $f18, $f18, $f12 -/* B1A174 800A2FD4 4600948D */ trunc.w.s $f18, $f18 -/* B1A178 800A2FD8 440C9000 */ mfc1 $t4, $f18 -/* B1A17C 800A2FDC 00000000 */ nop -/* B1A180 800A2FE0 01836821 */ addu $t5, $t4, $v1 -/* B1A184 800A2FE4 A60DFFF6 */ sh $t5, -0xa($s0) -/* B1A188 800A2FE8 84C3FFF8 */ lh $v1, -8($a2) -/* B1A18C 800A2FEC 84EEFFF8 */ lh $t6, -8($a3) -/* B1A190 800A2FF0 01C32823 */ subu $a1, $t6, $v1 -/* B1A194 800A2FF4 00052C00 */ sll $a1, $a1, 0x10 -/* B1A198 800A2FF8 00052C03 */ sra $a1, $a1, 0x10 -/* B1A19C 800A2FFC 44859000 */ mtc1 $a1, $f18 -/* B1A1A0 800A3000 00000000 */ nop -/* B1A1A4 800A3004 468094A0 */ cvt.s.w $f18, $f18 -/* B1A1A8 800A3008 460C9482 */ mul.s $f18, $f18, $f12 -/* B1A1AC 800A300C 4600948D */ trunc.w.s $f18, $f18 -/* B1A1B0 800A3010 44089000 */ mfc1 $t0, $f18 -/* B1A1B4 800A3014 00000000 */ nop -/* B1A1B8 800A3018 01034821 */ addu $t1, $t0, $v1 -/* B1A1BC 800A301C A609FFF8 */ sh $t1, -8($s0) -/* B1A1C0 800A3020 84C3FFFA */ lh $v1, -6($a2) -/* B1A1C4 800A3024 84EAFFFA */ lh $t2, -6($a3) -/* B1A1C8 800A3028 01432823 */ subu $a1, $t2, $v1 -/* B1A1CC 800A302C 00052C00 */ sll $a1, $a1, 0x10 -/* B1A1D0 800A3030 00052C03 */ sra $a1, $a1, 0x10 -/* B1A1D4 800A3034 44859000 */ mtc1 $a1, $f18 -/* B1A1D8 800A3038 00000000 */ nop -/* B1A1DC 800A303C 468094A0 */ cvt.s.w $f18, $f18 -/* B1A1E0 800A3040 460C9482 */ mul.s $f18, $f18, $f12 -/* B1A1E4 800A3044 4600948D */ trunc.w.s $f18, $f18 -/* B1A1E8 800A3048 440E9000 */ mfc1 $t6, $f18 -/* B1A1EC 800A304C 00000000 */ nop -/* B1A1F0 800A3050 01C37821 */ addu $t7, $t6, $v1 -/* B1A1F4 800A3054 A60FFFFA */ sh $t7, -6($s0) -/* B1A1F8 800A3058 84C3FFFC */ lh $v1, -4($a2) -/* B1A1FC 800A305C 84F8FFFC */ lh $t8, -4($a3) -/* B1A200 800A3060 03032823 */ subu $a1, $t8, $v1 -/* B1A204 800A3064 00052C00 */ sll $a1, $a1, 0x10 -/* B1A208 800A3068 00052C03 */ sra $a1, $a1, 0x10 -/* B1A20C 800A306C 44859000 */ mtc1 $a1, $f18 -/* B1A210 800A3070 00000000 */ nop -/* B1A214 800A3074 468094A0 */ cvt.s.w $f18, $f18 -/* B1A218 800A3078 460C9482 */ mul.s $f18, $f18, $f12 -/* B1A21C 800A307C 4600948D */ trunc.w.s $f18, $f18 -/* B1A220 800A3080 440A9000 */ mfc1 $t2, $f18 -/* B1A224 800A3084 00000000 */ nop -/* B1A228 800A3088 01435821 */ addu $t3, $t2, $v1 -/* B1A22C 800A308C A60BFFFC */ sh $t3, -4($s0) -/* B1A230 800A3090 84C3FFFE */ lh $v1, -2($a2) -/* B1A234 800A3094 84ECFFFE */ lh $t4, -2($a3) -/* B1A238 800A3098 01832823 */ subu $a1, $t4, $v1 -/* B1A23C 800A309C 00052C00 */ sll $a1, $a1, 0x10 -/* B1A240 800A30A0 00052C03 */ sra $a1, $a1, 0x10 -/* B1A244 800A30A4 44859000 */ mtc1 $a1, $f18 -/* B1A248 800A30A8 00000000 */ nop -/* B1A24C 800A30AC 468094A0 */ cvt.s.w $f18, $f18 -/* B1A250 800A30B0 460C9482 */ mul.s $f18, $f18, $f12 -/* B1A254 800A30B4 4600948D */ trunc.w.s $f18, $f18 -/* B1A258 800A30B8 44189000 */ mfc1 $t8, $f18 -/* B1A25C 800A30BC 00000000 */ nop -/* B1A260 800A30C0 0303C821 */ addu $t9, $t8, $v1 -/* B1A264 800A30C4 A619FFFE */ sh $t9, -2($s0) -/* B1A268 800A30C8 84C30000 */ lh $v1, ($a2) -/* B1A26C 800A30CC 1444FFA9 */ bne $v0, $a0, .L800A2F74 -/* B1A270 800A30D0 84EC0000 */ lh $t4, ($a3) -.L800A30D4: -/* B1A274 800A30D4 01832823 */ subu $a1, $t4, $v1 -/* B1A278 800A30D8 00052C00 */ sll $a1, $a1, 0x10 -/* B1A27C 800A30DC 00052C03 */ sra $a1, $a1, 0x10 -/* B1A280 800A30E0 44859000 */ mtc1 $a1, $f18 -/* B1A284 800A30E4 2610000C */ addiu $s0, $s0, 0xc -/* B1A288 800A30E8 24C6000C */ addiu $a2, $a2, 0xc -/* B1A28C 800A30EC 468094A0 */ cvt.s.w $f18, $f18 -/* B1A290 800A30F0 24E7000C */ addiu $a3, $a3, 0xc -/* B1A294 800A30F4 460C9482 */ mul.s $f18, $f18, $f12 -/* B1A298 800A30F8 4600948D */ trunc.w.s $f18, $f18 -/* B1A29C 800A30FC 44189000 */ mfc1 $t8, $f18 -/* B1A2A0 800A3100 00000000 */ nop -/* B1A2A4 800A3104 0303C821 */ addu $t9, $t8, $v1 -/* B1A2A8 800A3108 A619FFF4 */ sh $t9, -0xc($s0) -/* B1A2AC 800A310C 84C3FFF6 */ lh $v1, -0xa($a2) -/* B1A2B0 800A3110 84E8FFF6 */ lh $t0, -0xa($a3) -/* B1A2B4 800A3114 01032823 */ subu $a1, $t0, $v1 -/* B1A2B8 800A3118 00052C00 */ sll $a1, $a1, 0x10 -/* B1A2BC 800A311C 00052C03 */ sra $a1, $a1, 0x10 -/* B1A2C0 800A3120 44859000 */ mtc1 $a1, $f18 -/* B1A2C4 800A3124 00000000 */ nop -/* B1A2C8 800A3128 468094A0 */ cvt.s.w $f18, $f18 -/* B1A2CC 800A312C 460C9482 */ mul.s $f18, $f18, $f12 -/* B1A2D0 800A3130 4600948D */ trunc.w.s $f18, $f18 -/* B1A2D4 800A3134 440C9000 */ mfc1 $t4, $f18 -/* B1A2D8 800A3138 00000000 */ nop -/* B1A2DC 800A313C 01836821 */ addu $t5, $t4, $v1 -/* B1A2E0 800A3140 A60DFFF6 */ sh $t5, -0xa($s0) -/* B1A2E4 800A3144 84C3FFF8 */ lh $v1, -8($a2) -/* B1A2E8 800A3148 84EEFFF8 */ lh $t6, -8($a3) -/* B1A2EC 800A314C 01C32823 */ subu $a1, $t6, $v1 -/* B1A2F0 800A3150 00052C00 */ sll $a1, $a1, 0x10 -/* B1A2F4 800A3154 00052C03 */ sra $a1, $a1, 0x10 -/* B1A2F8 800A3158 44859000 */ mtc1 $a1, $f18 -/* B1A2FC 800A315C 00000000 */ nop -/* B1A300 800A3160 468094A0 */ cvt.s.w $f18, $f18 -/* B1A304 800A3164 460C9482 */ mul.s $f18, $f18, $f12 -/* B1A308 800A3168 4600948D */ trunc.w.s $f18, $f18 -/* B1A30C 800A316C 44089000 */ mfc1 $t0, $f18 -/* B1A310 800A3170 00000000 */ nop -/* B1A314 800A3174 01034821 */ addu $t1, $t0, $v1 -/* B1A318 800A3178 A609FFF8 */ sh $t1, -8($s0) -/* B1A31C 800A317C 84EAFFFA */ lh $t2, -6($a3) -/* B1A320 800A3180 84C3FFFA */ lh $v1, -6($a2) -/* B1A324 800A3184 01432823 */ subu $a1, $t2, $v1 -/* B1A328 800A3188 00052C00 */ sll $a1, $a1, 0x10 -/* B1A32C 800A318C 00052C03 */ sra $a1, $a1, 0x10 -/* B1A330 800A3190 44859000 */ mtc1 $a1, $f18 -/* B1A334 800A3194 00000000 */ nop -/* B1A338 800A3198 468094A0 */ cvt.s.w $f18, $f18 -/* B1A33C 800A319C 460C9482 */ mul.s $f18, $f18, $f12 -/* B1A340 800A31A0 4600948D */ trunc.w.s $f18, $f18 -/* B1A344 800A31A4 440E9000 */ mfc1 $t6, $f18 -/* B1A348 800A31A8 00000000 */ nop -/* B1A34C 800A31AC 01C37821 */ addu $t7, $t6, $v1 -/* B1A350 800A31B0 A60FFFFA */ sh $t7, -6($s0) -/* B1A354 800A31B4 84F8FFFC */ lh $t8, -4($a3) -/* B1A358 800A31B8 84C3FFFC */ lh $v1, -4($a2) -/* B1A35C 800A31BC 03032823 */ subu $a1, $t8, $v1 -/* B1A360 800A31C0 00052C00 */ sll $a1, $a1, 0x10 -/* B1A364 800A31C4 00052C03 */ sra $a1, $a1, 0x10 -/* B1A368 800A31C8 44859000 */ mtc1 $a1, $f18 -/* B1A36C 800A31CC 00000000 */ nop -/* B1A370 800A31D0 468094A0 */ cvt.s.w $f18, $f18 -/* B1A374 800A31D4 460C9482 */ mul.s $f18, $f18, $f12 -/* B1A378 800A31D8 4600948D */ trunc.w.s $f18, $f18 -/* B1A37C 800A31DC 440A9000 */ mfc1 $t2, $f18 -/* B1A380 800A31E0 00000000 */ nop -/* B1A384 800A31E4 01435821 */ addu $t3, $t2, $v1 -/* B1A388 800A31E8 A60BFFFC */ sh $t3, -4($s0) -/* B1A38C 800A31EC 84ECFFFE */ lh $t4, -2($a3) -/* B1A390 800A31F0 84C3FFFE */ lh $v1, -2($a2) -/* B1A394 800A31F4 01832823 */ subu $a1, $t4, $v1 -/* B1A398 800A31F8 00052C00 */ sll $a1, $a1, 0x10 -/* B1A39C 800A31FC 00052C03 */ sra $a1, $a1, 0x10 -/* B1A3A0 800A3200 44859000 */ mtc1 $a1, $f18 -/* B1A3A4 800A3204 00000000 */ nop -/* B1A3A8 800A3208 468094A0 */ cvt.s.w $f18, $f18 -/* B1A3AC 800A320C 460C9482 */ mul.s $f18, $f18, $f12 -/* B1A3B0 800A3210 4600948D */ trunc.w.s $f18, $f18 -/* B1A3B4 800A3214 44189000 */ mfc1 $t8, $f18 -/* B1A3B8 800A3218 00000000 */ nop -/* B1A3BC 800A321C 0303C821 */ addu $t9, $t8, $v1 -/* B1A3C0 800A3220 A619FFFE */ sh $t9, -2($s0) -/* B1A3C4 800A3224 1000002F */ b .L800A32E4 -/* B1A3C8 800A3228 8FB00004 */ lw $s0, 4($sp) -.L800A322C: -/* B1A3CC 800A322C 1880002C */ blez $a0, .L800A32E0 -/* B1A3D0 800A3230 00001025 */ move $v0, $zero -/* B1A3D4 800A3234 30850003 */ andi $a1, $a0, 3 -/* B1A3D8 800A3238 10A0000D */ beqz $a1, .L800A3270 -/* B1A3DC 800A323C 00A01825 */ move $v1, $a1 -.L800A3240: -/* B1A3E0 800A3240 84E80000 */ lh $t0, ($a3) -/* B1A3E4 800A3244 24420001 */ addiu $v0, $v0, 1 -/* B1A3E8 800A3248 26100006 */ addiu $s0, $s0, 6 -/* B1A3EC 800A324C A608FFFA */ sh $t0, -6($s0) -/* B1A3F0 800A3250 84E90002 */ lh $t1, 2($a3) -/* B1A3F4 800A3254 24E70006 */ addiu $a3, $a3, 6 -/* B1A3F8 800A3258 A609FFFC */ sh $t1, -4($s0) -/* B1A3FC 800A325C 84EAFFFE */ lh $t2, -2($a3) -/* B1A400 800A3260 1462FFF7 */ bne $v1, $v0, .L800A3240 -/* B1A404 800A3264 A60AFFFE */ sh $t2, -2($s0) -/* B1A408 800A3268 5044001E */ beql $v0, $a0, .L800A32E4 -/* B1A40C 800A326C 8FB00004 */ lw $s0, 4($sp) -.L800A3270: -/* B1A410 800A3270 84EB0000 */ lh $t3, ($a3) -/* B1A414 800A3274 24420004 */ addiu $v0, $v0, 4 -/* B1A418 800A3278 26100018 */ addiu $s0, $s0, 0x18 -/* B1A41C 800A327C A60BFFE8 */ sh $t3, -0x18($s0) -/* B1A420 800A3280 84EC0002 */ lh $t4, 2($a3) -/* B1A424 800A3284 24E70018 */ addiu $a3, $a3, 0x18 -/* B1A428 800A3288 A60CFFEA */ sh $t4, -0x16($s0) -/* B1A42C 800A328C 84EDFFEC */ lh $t5, -0x14($a3) -/* B1A430 800A3290 A60DFFEC */ sh $t5, -0x14($s0) -/* B1A434 800A3294 84EEFFEE */ lh $t6, -0x12($a3) -/* B1A438 800A3298 A60EFFEE */ sh $t6, -0x12($s0) -/* B1A43C 800A329C 84EFFFF0 */ lh $t7, -0x10($a3) -/* B1A440 800A32A0 A60FFFF0 */ sh $t7, -0x10($s0) -/* B1A444 800A32A4 84F8FFF2 */ lh $t8, -0xe($a3) -/* B1A448 800A32A8 A618FFF2 */ sh $t8, -0xe($s0) -/* B1A44C 800A32AC 84F9FFF4 */ lh $t9, -0xc($a3) -/* B1A450 800A32B0 A619FFF4 */ sh $t9, -0xc($s0) -/* B1A454 800A32B4 84E8FFF6 */ lh $t0, -0xa($a3) -/* B1A458 800A32B8 A608FFF6 */ sh $t0, -0xa($s0) -/* B1A45C 800A32BC 84E9FFF8 */ lh $t1, -8($a3) -/* B1A460 800A32C0 A609FFF8 */ sh $t1, -8($s0) -/* B1A464 800A32C4 84EAFFFA */ lh $t2, -6($a3) -/* B1A468 800A32C8 A60AFFFA */ sh $t2, -6($s0) -/* B1A46C 800A32CC 84EBFFFC */ lh $t3, -4($a3) -/* B1A470 800A32D0 A60BFFFC */ sh $t3, -4($s0) -/* B1A474 800A32D4 84ECFFFE */ lh $t4, -2($a3) -/* B1A478 800A32D8 1444FFE5 */ bne $v0, $a0, .L800A3270 -/* B1A47C 800A32DC A60CFFFE */ sh $t4, -2($s0) -.L800A32E0: -/* B1A480 800A32E0 8FB00004 */ lw $s0, 4($sp) -.L800A32E4: -/* B1A484 800A32E4 03E00008 */ jr $ra -/* B1A488 800A32E8 27BD0008 */ addiu $sp, $sp, 8 - diff --git a/asm/non_matchings/code/z_skelanime/func_800A32EC.s b/asm/non_matchings/code/z_skelanime/func_800A32EC.s deleted file mode 100644 index a95d26106e..0000000000 --- a/asm/non_matchings/code/z_skelanime/func_800A32EC.s +++ /dev/null @@ -1,4 +0,0 @@ -glabel func_800A32EC -/* B1A48C 800A32EC 03E00008 */ jr $ra -/* B1A490 800A32F0 A4800000 */ sh $zero, ($a0) - diff --git a/asm/non_matchings/code/z_skelanime/func_800A32F4.s b/asm/non_matchings/code/z_skelanime/func_800A32F4.s deleted file mode 100644 index 6f18607ae1..0000000000 --- a/asm/non_matchings/code/z_skelanime/func_800A32F4.s +++ /dev/null @@ -1,9 +0,0 @@ -glabel func_800A32F4 -/* B1A494 800A32F4 3C028016 */ lui $v0, %hi(D_801600B0) # $v0, 0x8016 -/* B1A498 800A32F8 244200B0 */ addiu $v0, %lo(D_801600B0) # addiu $v0, $v0, 0xb0 -/* B1A49C 800A32FC 8C4E0000 */ lw $t6, ($v0) -/* B1A4A0 800A3300 AFA40000 */ sw $a0, ($sp) -/* B1A4A4 800A3304 000E7840 */ sll $t7, $t6, 1 -/* B1A4A8 800A3308 03E00008 */ jr $ra -/* B1A4AC 800A330C AC4F0000 */ sw $t7, ($v0) - diff --git a/asm/non_matchings/code/z_skelanime/func_800A3310.s b/asm/non_matchings/code/z_skelanime/func_800A3310.s deleted file mode 100644 index 79bb0776d1..0000000000 --- a/asm/non_matchings/code/z_skelanime/func_800A3310.s +++ /dev/null @@ -1,11 +0,0 @@ -glabel func_800A3310 -/* B1A4B0 800A3310 3C028013 */ lui $v0, %hi(D_8012A480) # $v0, 0x8013 -/* B1A4B4 800A3314 2442A480 */ addiu $v0, %lo(D_8012A480) # addiu $v0, $v0, -0x5b80 -/* B1A4B8 800A3318 3C0F8016 */ lui $t7, %hi(D_801600B0) # $t7, 0x8016 -/* B1A4BC 800A331C 8DEF00B0 */ lw $t7, %lo(D_801600B0)($t7) -/* B1A4C0 800A3320 8C4E0000 */ lw $t6, ($v0) -/* B1A4C4 800A3324 AFA40000 */ sw $a0, ($sp) -/* B1A4C8 800A3328 01CFC025 */ or $t8, $t6, $t7 -/* B1A4CC 800A332C 03E00008 */ jr $ra -/* B1A4D0 800A3330 AC580000 */ sw $t8, ($v0) - diff --git a/asm/non_matchings/code/z_skelanime/func_800A3334.s b/asm/non_matchings/code/z_skelanime/func_800A3334.s deleted file mode 100644 index bc04aca981..0000000000 --- a/asm/non_matchings/code/z_skelanime/func_800A3334.s +++ /dev/null @@ -1,18 +0,0 @@ -glabel func_800A3334 -/* B1A4D4 800A3334 84830000 */ lh $v1, ($a0) -/* B1A4D8 800A3338 00A03025 */ move $a2, $a1 -/* B1A4DC 800A333C 28610032 */ slti $at, $v1, 0x32 -/* B1A4E0 800A3340 14200003 */ bnez $at, .L800A3350 -/* B1A4E4 800A3344 246E0001 */ addiu $t6, $v1, 1 -/* B1A4E8 800A3348 03E00008 */ jr $ra -/* B1A4EC 800A334C 00001025 */ move $v0, $zero - -.L800A3350: -/* B1A4F0 800A3350 00037980 */ sll $t7, $v1, 6 -/* B1A4F4 800A3354 008F2821 */ addu $a1, $a0, $t7 -/* B1A4F8 800A3358 A48E0000 */ sh $t6, ($a0) -/* B1A4FC 800A335C A0A60004 */ sb $a2, 4($a1) -/* B1A500 800A3360 24A20004 */ addiu $v0, $a1, 4 -/* B1A504 800A3364 03E00008 */ jr $ra -/* B1A508 800A3368 00000000 */ nop - diff --git a/asm/non_matchings/code/z_skelanime/func_800A336C.s b/asm/non_matchings/code/z_skelanime/func_800A336C.s deleted file mode 100644 index 0d19fff586..0000000000 --- a/asm/non_matchings/code/z_skelanime/func_800A336C.s +++ /dev/null @@ -1,76 +0,0 @@ -.rdata -glabel D_801403B8 - .asciz "../z_skelanime.c" - .balign 4 - -.text -glabel func_800A336C -/* B1A50C 800A336C 27BDFFC0 */ addiu $sp, $sp, -0x40 -/* B1A510 800A3370 3C010001 */ lui $at, (0x00010B20 >> 16) # lui $at, 1 -/* B1A514 800A3374 AFBF002C */ sw $ra, 0x2c($sp) -/* B1A518 800A3378 AFA40040 */ sw $a0, 0x40($sp) -/* B1A51C 800A337C AFA50044 */ sw $a1, 0x44($sp) -/* B1A520 800A3380 34210B20 */ ori $at, (0x00010B20 & 0xFFFF) # ori $at, $at, 0xb20 -/* B1A524 800A3384 AFA60048 */ sw $a2, 0x48($sp) -/* B1A528 800A3388 AFA7004C */ sw $a3, 0x4c($sp) -/* B1A52C 800A338C 00812021 */ addu $a0, $a0, $at -/* B1A530 800A3390 0C028CCD */ jal func_800A3334 -/* B1A534 800A3394 00002825 */ move $a1, $zero -/* B1A538 800A3398 10400033 */ beqz $v0, .L800A3468 -/* B1A53C 800A339C 8FA70044 */ lw $a3, 0x44($sp) -/* B1A540 800A33A0 00077100 */ sll $t6, $a3, 4 -/* B1A544 800A33A4 000E7F02 */ srl $t7, $t6, 0x1c -/* B1A548 800A33A8 000FC080 */ sll $t8, $t7, 2 -/* B1A54C 800A33AC 3C198016 */ lui $t9, %hi(gSegments) -/* B1A550 800A33B0 0338C821 */ addu $t9, $t9, $t8 -/* B1A554 800A33B4 3C0100FF */ lui $at, (0x00FFFFFF >> 16) # lui $at, 0xff -/* B1A558 800A33B8 8F396FA8 */ lw $t9, %lo(gSegments)($t9) -/* B1A55C 800A33BC 3421FFFF */ ori $at, (0x00FFFFFF & 0xFFFF) # ori $at, $at, 0xffff -/* B1A560 800A33C0 00E14024 */ and $t0, $a3, $at -/* B1A564 800A33C4 3C018000 */ lui $at, 0x8000 -/* B1A568 800A33C8 03284821 */ addu $t1, $t9, $t0 -/* B1A56C 800A33CC 01215021 */ addu $t2, $t1, $at -/* B1A570 800A33D0 24440024 */ addiu $a0, $v0, 0x24 -/* B1A574 800A33D4 AFAA0038 */ sw $t2, 0x38($sp) -/* B1A578 800A33D8 AFA40030 */ sw $a0, 0x30($sp) -/* B1A57C 800A33DC 2445003C */ addiu $a1, $v0, 0x3c -/* B1A580 800A33E0 24060001 */ li $a2, 1 -/* B1A584 800A33E4 0C001874 */ jal osCreateMesgQueue -/* B1A588 800A33E8 AFA2003C */ sw $v0, 0x3c($sp) -/* B1A58C 800A33EC 8FA7004C */ lw $a3, 0x4c($sp) -/* B1A590 800A33F0 8FB90048 */ lw $t9, 0x48($sp) -/* B1A594 800A33F4 8FAB0038 */ lw $t3, 0x38($sp) -/* B1A598 800A33F8 00E00821 */ addu $at, $a3, $zero -/* B1A59C 800A33FC 00073880 */ sll $a3, $a3, 2 -/* B1A5A0 800A3400 00E13823 */ subu $a3, $a3, $at -/* B1A5A4 800A3404 00073840 */ sll $a3, $a3, 1 -/* B1A5A8 800A3408 24E70002 */ addiu $a3, $a3, 2 -/* B1A5AC 800A340C 00F90019 */ multu $a3, $t9 -/* B1A5B0 800A3410 8D6C0004 */ lw $t4, 4($t3) -/* B1A5B4 800A3414 3C0D004E */ lui $t5, %hi(_link_animetionSegmentRomStart) # $t5, 0x4e -/* B1A5B8 800A3418 25AD5C00 */ addiu $t5, %lo(_link_animetionSegmentRomStart) # addiu $t5, $t5, 0x5c00 -/* B1A5BC 800A341C 3C0F0700 */ lui $t7, 0x700 -/* B1A5C0 800A3420 8FA3003C */ lw $v1, 0x3c($sp) -/* B1A5C4 800A3424 8FA90030 */ lw $t1, 0x30($sp) -/* B1A5C8 800A3428 25EF0000 */ addiu $t7, $t7, 0 -/* B1A5CC 800A342C 3C0A8014 */ lui $t2, %hi(D_801403B8) # $t2, 0x8014 -/* B1A5D0 800A3430 018D7021 */ addu $t6, $t4, $t5 -/* B1A5D4 800A3434 01CFC023 */ subu $t8, $t6, $t7 -/* B1A5D8 800A3438 254A03B8 */ addiu $t2, %lo(D_801403B8) # addiu $t2, $t2, 0x3b8 -/* B1A5DC 800A343C 240B07D4 */ li $t3, 2004 -/* B1A5E0 800A3440 00004012 */ mflo $t0 -/* B1A5E4 800A3444 03083021 */ addu $a2, $t8, $t0 -/* B1A5E8 800A3448 AFAB0020 */ sw $t3, 0x20($sp) -/* B1A5EC 800A344C AFAA001C */ sw $t2, 0x1c($sp) -/* B1A5F0 800A3450 AFA00018 */ sw $zero, 0x18($sp) -/* B1A5F4 800A3454 AFA00010 */ sw $zero, 0x10($sp) -/* B1A5F8 800A3458 8FA50050 */ lw $a1, 0x50($sp) -/* B1A5FC 800A345C 24640004 */ addiu $a0, $v1, 4 -/* B1A600 800A3460 0C000697 */ jal DmaMgr_SendRequest2 -/* B1A604 800A3464 AFA90014 */ sw $t1, 0x14($sp) -.L800A3468: -/* B1A608 800A3468 8FBF002C */ lw $ra, 0x2c($sp) -/* B1A60C 800A346C 27BD0040 */ addiu $sp, $sp, 0x40 -/* B1A610 800A3470 03E00008 */ jr $ra -/* B1A614 800A3474 00000000 */ nop - diff --git a/asm/non_matchings/code/z_skelanime/func_800A3478.s b/asm/non_matchings/code/z_skelanime/func_800A3478.s deleted file mode 100644 index eedd4bc19a..0000000000 --- a/asm/non_matchings/code/z_skelanime/func_800A3478.s +++ /dev/null @@ -1,28 +0,0 @@ -glabel func_800A3478 -/* B1A618 800A3478 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* B1A61C 800A347C 3C010001 */ lui $at, (0x00010B20 >> 16) # lui $at, 1 -/* B1A620 800A3480 AFBF0014 */ sw $ra, 0x14($sp) -/* B1A624 800A3484 AFA40018 */ sw $a0, 0x18($sp) -/* B1A628 800A3488 AFA5001C */ sw $a1, 0x1c($sp) -/* B1A62C 800A348C 34210B20 */ ori $at, (0x00010B20 & 0xFFFF) # ori $at, $at, 0xb20 -/* B1A630 800A3490 AFA60020 */ sw $a2, 0x20($sp) -/* B1A634 800A3494 AFA70024 */ sw $a3, 0x24($sp) -/* B1A638 800A3498 00812021 */ addu $a0, $a0, $at -/* B1A63C 800A349C 0C028CCD */ jal func_800A3334 -/* B1A640 800A34A0 24050001 */ li $a1, 1 -/* B1A644 800A34A4 10400009 */ beqz $v0, .L800A34CC -/* B1A648 800A34A8 3C0E8016 */ lui $t6, %hi(D_801600B0) # $t6, 0x8016 -/* B1A64C 800A34AC 8DCE00B0 */ lw $t6, %lo(D_801600B0)($t6) -/* B1A650 800A34B0 A04E0004 */ sb $t6, 4($v0) -/* B1A654 800A34B4 8FAF001C */ lw $t7, 0x1c($sp) -/* B1A658 800A34B8 A04F0005 */ sb $t7, 5($v0) -/* B1A65C 800A34BC 8FB80020 */ lw $t8, 0x20($sp) -/* B1A660 800A34C0 AC580008 */ sw $t8, 8($v0) -/* B1A664 800A34C4 8FB90024 */ lw $t9, 0x24($sp) -/* B1A668 800A34C8 AC59000C */ sw $t9, 0xc($v0) -.L800A34CC: -/* B1A66C 800A34CC 8FBF0014 */ lw $ra, 0x14($sp) -/* B1A670 800A34D0 27BD0018 */ addiu $sp, $sp, 0x18 -/* B1A674 800A34D4 03E00008 */ jr $ra -/* B1A678 800A34D8 00000000 */ nop - diff --git a/asm/non_matchings/code/z_skelanime/func_800A34DC.s b/asm/non_matchings/code/z_skelanime/func_800A34DC.s deleted file mode 100644 index 2256c0c15b..0000000000 --- a/asm/non_matchings/code/z_skelanime/func_800A34DC.s +++ /dev/null @@ -1,30 +0,0 @@ -glabel func_800A34DC -/* B1A67C 800A34DC 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* B1A680 800A34E0 3C010001 */ lui $at, (0x00010B20 >> 16) # lui $at, 1 -/* B1A684 800A34E4 AFBF0014 */ sw $ra, 0x14($sp) -/* B1A688 800A34E8 AFA40018 */ sw $a0, 0x18($sp) -/* B1A68C 800A34EC AFA5001C */ sw $a1, 0x1c($sp) -/* B1A690 800A34F0 34210B20 */ ori $at, (0x00010B20 & 0xFFFF) # ori $at, $at, 0xb20 -/* B1A694 800A34F4 AFA60020 */ sw $a2, 0x20($sp) -/* B1A698 800A34F8 AFA70024 */ sw $a3, 0x24($sp) -/* B1A69C 800A34FC 00812021 */ addu $a0, $a0, $at -/* B1A6A0 800A3500 0C028CCD */ jal func_800A3334 -/* B1A6A4 800A3504 24050002 */ li $a1, 2 -/* B1A6A8 800A3508 1040000B */ beqz $v0, .L800A3538 -/* B1A6AC 800A350C 3C0E8016 */ lui $t6, %hi(D_801600B0) # $t6, 0x8016 -/* B1A6B0 800A3510 8DCE00B0 */ lw $t6, %lo(D_801600B0)($t6) -/* B1A6B4 800A3514 A04E0004 */ sb $t6, 4($v0) -/* B1A6B8 800A3518 8FAF001C */ lw $t7, 0x1c($sp) -/* B1A6BC 800A351C A04F0005 */ sb $t7, 5($v0) -/* B1A6C0 800A3520 8FB80020 */ lw $t8, 0x20($sp) -/* B1A6C4 800A3524 AC580008 */ sw $t8, 8($v0) -/* B1A6C8 800A3528 8FB90024 */ lw $t9, 0x24($sp) -/* B1A6CC 800A352C AC59000C */ sw $t9, 0xc($v0) -/* B1A6D0 800A3530 C7A40028 */ lwc1 $f4, 0x28($sp) -/* B1A6D4 800A3534 E4440010 */ swc1 $f4, 0x10($v0) -.L800A3538: -/* B1A6D8 800A3538 8FBF0014 */ lw $ra, 0x14($sp) -/* B1A6DC 800A353C 27BD0018 */ addiu $sp, $sp, 0x18 -/* B1A6E0 800A3540 03E00008 */ jr $ra -/* B1A6E4 800A3544 00000000 */ nop - diff --git a/asm/non_matchings/code/z_skelanime/func_800A3548.s b/asm/non_matchings/code/z_skelanime/func_800A3548.s deleted file mode 100644 index aa9944c65d..0000000000 --- a/asm/non_matchings/code/z_skelanime/func_800A3548.s +++ /dev/null @@ -1,30 +0,0 @@ -glabel func_800A3548 -/* B1A6E8 800A3548 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* B1A6EC 800A354C 3C010001 */ lui $at, (0x00010B20 >> 16) # lui $at, 1 -/* B1A6F0 800A3550 AFBF0014 */ sw $ra, 0x14($sp) -/* B1A6F4 800A3554 AFA40018 */ sw $a0, 0x18($sp) -/* B1A6F8 800A3558 AFA5001C */ sw $a1, 0x1c($sp) -/* B1A6FC 800A355C 34210B20 */ ori $at, (0x00010B20 & 0xFFFF) # ori $at, $at, 0xb20 -/* B1A700 800A3560 AFA60020 */ sw $a2, 0x20($sp) -/* B1A704 800A3564 AFA70024 */ sw $a3, 0x24($sp) -/* B1A708 800A3568 00812021 */ addu $a0, $a0, $at -/* B1A70C 800A356C 0C028CCD */ jal func_800A3334 -/* B1A710 800A3570 24050003 */ li $a1, 3 -/* B1A714 800A3574 1040000B */ beqz $v0, .L800A35A4 -/* B1A718 800A3578 3C0E8016 */ lui $t6, %hi(D_801600B0) # $t6, 0x8016 -/* B1A71C 800A357C 8DCE00B0 */ lw $t6, %lo(D_801600B0)($t6) -/* B1A720 800A3580 A04E0004 */ sb $t6, 4($v0) -/* B1A724 800A3584 8FAF001C */ lw $t7, 0x1c($sp) -/* B1A728 800A3588 A04F0005 */ sb $t7, 5($v0) -/* B1A72C 800A358C 8FB80020 */ lw $t8, 0x20($sp) -/* B1A730 800A3590 AC580008 */ sw $t8, 8($v0) -/* B1A734 800A3594 8FB90024 */ lw $t9, 0x24($sp) -/* B1A738 800A3598 AC59000C */ sw $t9, 0xc($v0) -/* B1A73C 800A359C 8FA80028 */ lw $t0, 0x28($sp) -/* B1A740 800A35A0 AC480010 */ sw $t0, 0x10($v0) -.L800A35A4: -/* B1A744 800A35A4 8FBF0014 */ lw $ra, 0x14($sp) -/* B1A748 800A35A8 27BD0018 */ addiu $sp, $sp, 0x18 -/* B1A74C 800A35AC 03E00008 */ jr $ra -/* B1A750 800A35B0 00000000 */ nop - diff --git a/asm/non_matchings/code/z_skelanime/func_800A35B4.s b/asm/non_matchings/code/z_skelanime/func_800A35B4.s deleted file mode 100644 index 3bee273f83..0000000000 --- a/asm/non_matchings/code/z_skelanime/func_800A35B4.s +++ /dev/null @@ -1,30 +0,0 @@ -glabel func_800A35B4 -/* B1A754 800A35B4 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* B1A758 800A35B8 3C010001 */ lui $at, (0x00010B20 >> 16) # lui $at, 1 -/* B1A75C 800A35BC AFBF0014 */ sw $ra, 0x14($sp) -/* B1A760 800A35C0 AFA40018 */ sw $a0, 0x18($sp) -/* B1A764 800A35C4 AFA5001C */ sw $a1, 0x1c($sp) -/* B1A768 800A35C8 34210B20 */ ori $at, (0x00010B20 & 0xFFFF) # ori $at, $at, 0xb20 -/* B1A76C 800A35CC AFA60020 */ sw $a2, 0x20($sp) -/* B1A770 800A35D0 AFA70024 */ sw $a3, 0x24($sp) -/* B1A774 800A35D4 00812021 */ addu $a0, $a0, $at -/* B1A778 800A35D8 0C028CCD */ jal func_800A3334 -/* B1A77C 800A35DC 24050004 */ li $a1, 4 -/* B1A780 800A35E0 1040000B */ beqz $v0, .L800A3610 -/* B1A784 800A35E4 3C0E8016 */ lui $t6, %hi(D_801600B0) # $t6, 0x8016 -/* B1A788 800A35E8 8DCE00B0 */ lw $t6, %lo(D_801600B0)($t6) -/* B1A78C 800A35EC A04E0004 */ sb $t6, 4($v0) -/* B1A790 800A35F0 8FAF001C */ lw $t7, 0x1c($sp) -/* B1A794 800A35F4 A04F0005 */ sb $t7, 5($v0) -/* B1A798 800A35F8 8FB80020 */ lw $t8, 0x20($sp) -/* B1A79C 800A35FC AC580008 */ sw $t8, 8($v0) -/* B1A7A0 800A3600 8FB90024 */ lw $t9, 0x24($sp) -/* B1A7A4 800A3604 AC59000C */ sw $t9, 0xc($v0) -/* B1A7A8 800A3608 8FA80028 */ lw $t0, 0x28($sp) -/* B1A7AC 800A360C AC480010 */ sw $t0, 0x10($v0) -.L800A3610: -/* B1A7B0 800A3610 8FBF0014 */ lw $ra, 0x14($sp) -/* B1A7B4 800A3614 27BD0018 */ addiu $sp, $sp, 0x18 -/* B1A7B8 800A3618 03E00008 */ jr $ra -/* B1A7BC 800A361C 00000000 */ nop - diff --git a/asm/non_matchings/code/z_skelanime/func_800A3620.s b/asm/non_matchings/code/z_skelanime/func_800A3620.s deleted file mode 100644 index d61d4383bc..0000000000 --- a/asm/non_matchings/code/z_skelanime/func_800A3620.s +++ /dev/null @@ -1,25 +0,0 @@ -glabel func_800A3620 -/* B1A7C0 800A3620 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* B1A7C4 800A3624 3C010001 */ lui $at, (0x00010B20 >> 16) # lui $at, 1 -/* B1A7C8 800A3628 AFBF0014 */ sw $ra, 0x14($sp) -/* B1A7CC 800A362C AFA40018 */ sw $a0, 0x18($sp) -/* B1A7D0 800A3630 AFA5001C */ sw $a1, 0x1c($sp) -/* B1A7D4 800A3634 34210B20 */ ori $at, (0x00010B20 & 0xFFFF) # ori $at, $at, 0xb20 -/* B1A7D8 800A3638 AFA60020 */ sw $a2, 0x20($sp) -/* B1A7DC 800A363C AFA70024 */ sw $a3, 0x24($sp) -/* B1A7E0 800A3640 00812021 */ addu $a0, $a0, $at -/* B1A7E4 800A3644 0C028CCD */ jal func_800A3334 -/* B1A7E8 800A3648 24050005 */ li $a1, 5 -/* B1A7EC 800A364C 10400006 */ beqz $v0, .L800A3668 -/* B1A7F0 800A3650 8FAE001C */ lw $t6, 0x1c($sp) -/* B1A7F4 800A3654 AC4E0004 */ sw $t6, 4($v0) -/* B1A7F8 800A3658 8FAF0020 */ lw $t7, 0x20($sp) -/* B1A7FC 800A365C AC4F0008 */ sw $t7, 8($v0) -/* B1A800 800A3660 C7A40024 */ lwc1 $f4, 0x24($sp) -/* B1A804 800A3664 E444000C */ swc1 $f4, 0xc($v0) -.L800A3668: -/* B1A808 800A3668 8FBF0014 */ lw $ra, 0x14($sp) -/* B1A80C 800A366C 27BD0018 */ addiu $sp, $sp, 0x18 -/* B1A810 800A3670 03E00008 */ jr $ra -/* B1A814 800A3674 00000000 */ nop - diff --git a/asm/non_matchings/code/z_skelanime/func_800A3678.s b/asm/non_matchings/code/z_skelanime/func_800A3678.s deleted file mode 100644 index facc92f4f1..0000000000 --- a/asm/non_matchings/code/z_skelanime/func_800A3678.s +++ /dev/null @@ -1,13 +0,0 @@ -glabel func_800A3678 -/* B1A818 800A3678 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* B1A81C 800A367C AFA40018 */ sw $a0, 0x18($sp) -/* B1A820 800A3680 AFBF0014 */ sw $ra, 0x14($sp) -/* B1A824 800A3684 24A40020 */ addiu $a0, $a1, 0x20 -/* B1A828 800A3688 00002825 */ move $a1, $zero -/* B1A82C 800A368C 0C000CA0 */ jal osRecvMesg -/* B1A830 800A3690 24060001 */ li $a2, 1 -/* B1A834 800A3694 8FBF0014 */ lw $ra, 0x14($sp) -/* B1A838 800A3698 27BD0018 */ addiu $sp, $sp, 0x18 -/* B1A83C 800A369C 03E00008 */ jr $ra -/* B1A840 800A36A0 00000000 */ nop - diff --git a/asm/non_matchings/code/z_skelanime/func_800A36A4.s b/asm/non_matchings/code/z_skelanime/func_800A36A4.s deleted file mode 100644 index 3259d6f1e4..0000000000 --- a/asm/non_matchings/code/z_skelanime/func_800A36A4.s +++ /dev/null @@ -1,32 +0,0 @@ -glabel func_800A36A4 -/* B1A844 800A36A4 AFA40000 */ sw $a0, ($sp) -/* B1A848 800A36A8 3C0F8013 */ lui $t7, %hi(D_8012A480) # $t7, 0x8013 -/* B1A84C 800A36AC 8DEFA480 */ lw $t7, %lo(D_8012A480)($t7) -/* B1A850 800A36B0 90AE0000 */ lbu $t6, ($a1) -/* B1A854 800A36B4 00A01025 */ move $v0, $a1 -/* B1A858 800A36B8 01CFC024 */ and $t8, $t6, $t7 -/* B1A85C 800A36BC 17000013 */ bnez $t8, .L800A370C -/* B1A860 800A36C0 00000000 */ nop -/* B1A864 800A36C4 90B90001 */ lbu $t9, 1($a1) -/* B1A868 800A36C8 8CA30004 */ lw $v1, 4($a1) -/* B1A86C 800A36CC 8CA40008 */ lw $a0, 8($a1) -/* B1A870 800A36D0 1B20000E */ blez $t9, .L800A370C -/* B1A874 800A36D4 00003025 */ move $a2, $zero -/* B1A878 800A36D8 88890000 */ lwl $t1, ($a0) -.L800A36DC: -/* B1A87C 800A36DC 98890003 */ lwr $t1, 3($a0) -/* B1A880 800A36E0 24C60001 */ addiu $a2, $a2, 1 -/* B1A884 800A36E4 24630006 */ addiu $v1, $v1, 6 -/* B1A888 800A36E8 A869FFFA */ swl $t1, -6($v1) -/* B1A88C 800A36EC B869FFFD */ swr $t1, -3($v1) -/* B1A890 800A36F0 94890004 */ lhu $t1, 4($a0) -/* B1A894 800A36F4 24840006 */ addiu $a0, $a0, 6 -/* B1A898 800A36F8 A469FFFE */ sh $t1, -2($v1) -/* B1A89C 800A36FC 904A0001 */ lbu $t2, 1($v0) -/* B1A8A0 800A3700 00CA082A */ slt $at, $a2, $t2 -/* B1A8A4 800A3704 5420FFF5 */ bnezl $at, .L800A36DC -/* B1A8A8 800A3708 88890000 */ lwl $t1, ($a0) -.L800A370C: -/* B1A8AC 800A370C 03E00008 */ jr $ra -/* B1A8B0 800A3710 00000000 */ nop - diff --git a/asm/non_matchings/code/z_skelanime/func_800A3714.s b/asm/non_matchings/code/z_skelanime/func_800A3714.s deleted file mode 100644 index e90d9c8c14..0000000000 --- a/asm/non_matchings/code/z_skelanime/func_800A3714.s +++ /dev/null @@ -1,26 +0,0 @@ -glabel func_800A3714 -/* B1A8B4 800A3714 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* B1A8B8 800A3718 AFBF0024 */ sw $ra, 0x24($sp) -/* B1A8BC 800A371C AFB00020 */ sw $s0, 0x20($sp) -/* B1A8C0 800A3720 AFA40028 */ sw $a0, 0x28($sp) -/* B1A8C4 800A3724 3C0F8013 */ lui $t7, %hi(D_8012A480) # $t7, 0x8013 -/* B1A8C8 800A3728 8DEFA480 */ lw $t7, %lo(D_8012A480)($t7) -/* B1A8CC 800A372C 90AE0000 */ lbu $t6, ($a1) -/* B1A8D0 800A3730 00A08025 */ move $s0, $a1 -/* B1A8D4 800A3734 01CFC024 */ and $t8, $t6, $t7 -/* B1A8D8 800A3738 57000009 */ bnezl $t8, .L800A3760 -/* B1A8DC 800A373C 8FBF0024 */ lw $ra, 0x24($sp) -/* B1A8E0 800A3740 90A40001 */ lbu $a0, 1($a1) -/* B1A8E4 800A3744 8CA50004 */ lw $a1, 4($a1) -/* B1A8E8 800A3748 C604000C */ lwc1 $f4, 0xc($s0) -/* B1A8EC 800A374C 8E070008 */ lw $a3, 8($s0) -/* B1A8F0 800A3750 00A03025 */ move $a2, $a1 -/* B1A8F4 800A3754 0C028B9C */ jal func_800A2E70 -/* B1A8F8 800A3758 E7A40010 */ swc1 $f4, 0x10($sp) -/* B1A8FC 800A375C 8FBF0024 */ lw $ra, 0x24($sp) -.L800A3760: -/* B1A900 800A3760 8FB00020 */ lw $s0, 0x20($sp) -/* B1A904 800A3764 27BD0028 */ addiu $sp, $sp, 0x28 -/* B1A908 800A3768 03E00008 */ jr $ra -/* B1A90C 800A376C 00000000 */ nop - diff --git a/asm/non_matchings/code/z_skelanime/func_800A3770.s b/asm/non_matchings/code/z_skelanime/func_800A3770.s deleted file mode 100644 index 910f30d3b8..0000000000 --- a/asm/non_matchings/code/z_skelanime/func_800A3770.s +++ /dev/null @@ -1,37 +0,0 @@ -glabel func_800A3770 -/* B1A910 800A3770 AFA40000 */ sw $a0, ($sp) -/* B1A914 800A3774 3C0F8013 */ lui $t7, %hi(D_8012A480) # $t7, 0x8013 -/* B1A918 800A3778 8DEFA480 */ lw $t7, %lo(D_8012A480)($t7) -/* B1A91C 800A377C 90AE0000 */ lbu $t6, ($a1) -/* B1A920 800A3780 00A01025 */ move $v0, $a1 -/* B1A924 800A3784 00003825 */ move $a3, $zero -/* B1A928 800A3788 01CFC024 */ and $t8, $t6, $t7 -/* B1A92C 800A378C 17000016 */ bnez $t8, .L800A37E8 -/* B1A930 800A3790 00000000 */ nop -/* B1A934 800A3794 90B90001 */ lbu $t9, 1($a1) -/* B1A938 800A3798 8CA30004 */ lw $v1, 4($a1) -/* B1A93C 800A379C 8CA40008 */ lw $a0, 8($a1) -/* B1A940 800A37A0 1B200011 */ blez $t9, .L800A37E8 -/* B1A944 800A37A4 8CA6000C */ lw $a2, 0xc($a1) -.L800A37A8: -/* B1A948 800A37A8 90C50000 */ lbu $a1, ($a2) -/* B1A94C 800A37AC 24C60001 */ addiu $a2, $a2, 1 -/* B1A950 800A37B0 50A00008 */ beql $a1, $zero, .L800A37D4 -/* B1A954 800A37B4 904A0001 */ lbu $t2, 1($v0) -/* B1A958 800A37B8 88890000 */ lwl $t1, ($a0) -/* B1A95C 800A37BC 98890003 */ lwr $t1, 3($a0) -/* B1A960 800A37C0 A8690000 */ swl $t1, ($v1) -/* B1A964 800A37C4 B8690003 */ swr $t1, 3($v1) -/* B1A968 800A37C8 94890004 */ lhu $t1, 4($a0) -/* B1A96C 800A37CC A4690004 */ sh $t1, 4($v1) -/* B1A970 800A37D0 904A0001 */ lbu $t2, 1($v0) -.L800A37D4: -/* B1A974 800A37D4 24E70001 */ addiu $a3, $a3, 1 -/* B1A978 800A37D8 24630006 */ addiu $v1, $v1, 6 -/* B1A97C 800A37DC 00EA082A */ slt $at, $a3, $t2 -/* B1A980 800A37E0 1420FFF1 */ bnez $at, .L800A37A8 -/* B1A984 800A37E4 24840006 */ addiu $a0, $a0, 6 -.L800A37E8: -/* B1A988 800A37E8 03E00008 */ jr $ra -/* B1A98C 800A37EC 00000000 */ nop - diff --git a/asm/non_matchings/code/z_skelanime/func_800A37F0.s b/asm/non_matchings/code/z_skelanime/func_800A37F0.s deleted file mode 100644 index 30436995c1..0000000000 --- a/asm/non_matchings/code/z_skelanime/func_800A37F0.s +++ /dev/null @@ -1,38 +0,0 @@ -glabel func_800A37F0 -/* B1A990 800A37F0 AFA40000 */ sw $a0, ($sp) -/* B1A994 800A37F4 3C0F8013 */ lui $t7, %hi(D_8012A480) # $t7, 0x8013 -/* B1A998 800A37F8 8DEFA480 */ lw $t7, %lo(D_8012A480)($t7) -/* B1A99C 800A37FC 90AE0000 */ lbu $t6, ($a1) -/* B1A9A0 800A3800 00A01025 */ move $v0, $a1 -/* B1A9A4 800A3804 00003825 */ move $a3, $zero -/* B1A9A8 800A3808 01CFC024 */ and $t8, $t6, $t7 -/* B1A9AC 800A380C 17000017 */ bnez $t8, .L800A386C -/* B1A9B0 800A3810 00000000 */ nop -/* B1A9B4 800A3814 90B90001 */ lbu $t9, 1($a1) -/* B1A9B8 800A3818 8CA30004 */ lw $v1, 4($a1) -/* B1A9BC 800A381C 8CA40008 */ lw $a0, 8($a1) -/* B1A9C0 800A3820 1B200012 */ blez $t9, .L800A386C -/* B1A9C4 800A3824 8CA6000C */ lw $a2, 0xc($a1) -.L800A3828: -/* B1A9C8 800A3828 90C50000 */ lbu $a1, ($a2) -/* B1A9CC 800A382C 24C60001 */ addiu $a2, $a2, 1 -/* B1A9D0 800A3830 2CA50001 */ sltiu $a1, $a1, 1 -/* B1A9D4 800A3834 50A00008 */ beql $a1, $zero, .L800A3858 -/* B1A9D8 800A3838 904A0001 */ lbu $t2, 1($v0) -/* B1A9DC 800A383C 88890000 */ lwl $t1, ($a0) -/* B1A9E0 800A3840 98890003 */ lwr $t1, 3($a0) -/* B1A9E4 800A3844 A8690000 */ swl $t1, ($v1) -/* B1A9E8 800A3848 B8690003 */ swr $t1, 3($v1) -/* B1A9EC 800A384C 94890004 */ lhu $t1, 4($a0) -/* B1A9F0 800A3850 A4690004 */ sh $t1, 4($v1) -/* B1A9F4 800A3854 904A0001 */ lbu $t2, 1($v0) -.L800A3858: -/* B1A9F8 800A3858 24E70001 */ addiu $a3, $a3, 1 -/* B1A9FC 800A385C 24630006 */ addiu $v1, $v1, 6 -/* B1AA00 800A3860 00EA082A */ slt $at, $a3, $t2 -/* B1AA04 800A3864 1420FFF0 */ bnez $at, .L800A3828 -/* B1AA08 800A3868 24840006 */ addiu $a0, $a0, 6 -.L800A386C: -/* B1AA0C 800A386C 03E00008 */ jr $ra -/* B1AA10 800A3870 00000000 */ nop - diff --git a/asm/non_matchings/code/z_skelanime/func_800A3874.s b/asm/non_matchings/code/z_skelanime/func_800A3874.s deleted file mode 100644 index 4532135476..0000000000 --- a/asm/non_matchings/code/z_skelanime/func_800A3874.s +++ /dev/null @@ -1,40 +0,0 @@ -glabel func_800A3874 -/* B1AA14 800A3874 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* B1AA18 800A3878 AFBF0014 */ sw $ra, 0x14($sp) -/* B1AA1C 800A387C AFA40030 */ sw $a0, 0x30($sp) -/* B1AA20 800A3880 8CA20000 */ lw $v0, ($a1) -/* B1AA24 800A3884 8CA40004 */ lw $a0, 4($a1) -/* B1AA28 800A3888 00A03825 */ move $a3, $a1 -/* B1AA2C 800A388C 844600B6 */ lh $a2, 0xb6($v0) -/* B1AA30 800A3890 AFA70034 */ sw $a3, 0x34($sp) -/* B1AA34 800A3894 27A5001C */ addiu $a1, $sp, 0x1c -/* B1AA38 800A3898 0C02953F */ jal func_800A54FC -/* B1AA3C 800A389C AFA20028 */ sw $v0, 0x28($sp) -/* B1AA40 800A38A0 8FA20028 */ lw $v0, 0x28($sp) -/* B1AA44 800A38A4 C7A4001C */ lwc1 $f4, 0x1c($sp) -/* B1AA48 800A38A8 8FA70034 */ lw $a3, 0x34($sp) -/* B1AA4C 800A38AC C4460050 */ lwc1 $f6, 0x50($v0) -/* B1AA50 800A38B0 C44A0024 */ lwc1 $f10, 0x24($v0) -/* B1AA54 800A38B4 46062202 */ mul.s $f8, $f4, $f6 -/* B1AA58 800A38B8 C4440054 */ lwc1 $f4, 0x54($v0) -/* B1AA5C 800A38BC 46085400 */ add.s $f16, $f10, $f8 -/* B1AA60 800A38C0 E4500024 */ swc1 $f16, 0x24($v0) -/* B1AA64 800A38C4 C7B20020 */ lwc1 $f18, 0x20($sp) -/* B1AA68 800A38C8 C4EA0008 */ lwc1 $f10, 8($a3) -/* B1AA6C 800A38CC C4500028 */ lwc1 $f16, 0x28($v0) -/* B1AA70 800A38D0 46049182 */ mul.s $f6, $f18, $f4 -/* B1AA74 800A38D4 00000000 */ nop -/* B1AA78 800A38D8 460A3202 */ mul.s $f8, $f6, $f10 -/* B1AA7C 800A38DC C4460058 */ lwc1 $f6, 0x58($v0) -/* B1AA80 800A38E0 46088480 */ add.s $f18, $f16, $f8 -/* B1AA84 800A38E4 C450002C */ lwc1 $f16, 0x2c($v0) -/* B1AA88 800A38E8 E4520028 */ swc1 $f18, 0x28($v0) -/* B1AA8C 800A38EC C7A40024 */ lwc1 $f4, 0x24($sp) -/* B1AA90 800A38F0 46062282 */ mul.s $f10, $f4, $f6 -/* B1AA94 800A38F4 460A8200 */ add.s $f8, $f16, $f10 -/* B1AA98 800A38F8 E448002C */ swc1 $f8, 0x2c($v0) -/* B1AA9C 800A38FC 8FBF0014 */ lw $ra, 0x14($sp) -/* B1AAA0 800A3900 27BD0030 */ addiu $sp, $sp, 0x30 -/* B1AAA4 800A3904 03E00008 */ jr $ra -/* B1AAA8 800A3908 00000000 */ nop - diff --git a/asm/non_matchings/code/z_skelanime/func_800A390C.s b/asm/non_matchings/code/z_skelanime/func_800A390C.s deleted file mode 100644 index 2e01f280d6..0000000000 --- a/asm/non_matchings/code/z_skelanime/func_800A390C.s +++ /dev/null @@ -1,44 +0,0 @@ -glabel func_800A390C -/* B1AAAC 800A390C 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* B1AAB0 800A3910 AFBF0024 */ sw $ra, 0x24($sp) -/* B1AAB4 800A3914 AFB30020 */ sw $s3, 0x20($sp) -/* B1AAB8 800A3918 AFB2001C */ sw $s2, 0x1c($sp) -/* B1AABC 800A391C AFB10018 */ sw $s1, 0x18($sp) -/* B1AAC0 800A3920 AFB00014 */ sw $s0, 0x14($sp) -/* B1AAC4 800A3924 84AE0000 */ lh $t6, ($a1) -/* B1AAC8 800A3928 00A08825 */ move $s1, $a1 -/* B1AACC 800A392C 00809025 */ move $s2, $a0 -/* B1AAD0 800A3930 11C00012 */ beqz $t6, .L800A397C -/* B1AAD4 800A3934 24B00004 */ addiu $s0, $a1, 4 -/* B1AAD8 800A3938 3C138013 */ lui $s3, %hi(D_8012A484) # $s3, 0x8013 -/* B1AADC 800A393C 2673A484 */ addiu $s3, %lo(D_8012A484) # addiu $s3, $s3, -0x5b7c -/* B1AAE0 800A3940 920F0000 */ lbu $t7, ($s0) -.L800A3944: -/* B1AAE4 800A3944 02402025 */ move $a0, $s2 -/* B1AAE8 800A3948 26050004 */ addiu $a1, $s0, 4 -/* B1AAEC 800A394C 000FC080 */ sll $t8, $t7, 2 -/* B1AAF0 800A3950 0278C821 */ addu $t9, $s3, $t8 -/* B1AAF4 800A3954 8F390000 */ lw $t9, ($t9) -/* B1AAF8 800A3958 0320F809 */ jalr $t9 -/* B1AAFC 800A395C 00000000 */ nop -/* B1AB00 800A3960 86280000 */ lh $t0, ($s1) -/* B1AB04 800A3964 26100040 */ addiu $s0, $s0, 0x40 -/* B1AB08 800A3968 2509FFFF */ addiu $t1, $t0, -1 -/* B1AB0C 800A396C A6290000 */ sh $t1, ($s1) -/* B1AB10 800A3970 862A0000 */ lh $t2, ($s1) -/* B1AB14 800A3974 5540FFF3 */ bnezl $t2, .L800A3944 -/* B1AB18 800A3978 920F0000 */ lbu $t7, ($s0) -.L800A397C: -/* B1AB1C 800A397C 8FBF0024 */ lw $ra, 0x24($sp) -/* B1AB20 800A3980 240B0001 */ li $t3, 1 -/* B1AB24 800A3984 3C018016 */ lui $at, %hi(D_801600B0) # $at, 0x8016 -/* B1AB28 800A3988 AC2B00B0 */ sw $t3, %lo(D_801600B0)($at) -/* B1AB2C 800A398C 3C018013 */ lui $at, %hi(D_8012A480) # $at, 0x8013 -/* B1AB30 800A3990 8FB00014 */ lw $s0, 0x14($sp) -/* B1AB34 800A3994 8FB10018 */ lw $s1, 0x18($sp) -/* B1AB38 800A3998 8FB2001C */ lw $s2, 0x1c($sp) -/* B1AB3C 800A399C 8FB30020 */ lw $s3, 0x20($sp) -/* B1AB40 800A39A0 AC20A480 */ sw $zero, %lo(D_8012A480)($at) -/* B1AB44 800A39A4 03E00008 */ jr $ra -/* B1AB48 800A39A8 27BD0028 */ addiu $sp, $sp, 0x28 - diff --git a/asm/non_matchings/code/z_skelanime/func_800A39AC.s b/asm/non_matchings/code/z_skelanime/func_800A39AC.s deleted file mode 100644 index ca01e4b9a6..0000000000 --- a/asm/non_matchings/code/z_skelanime/func_800A39AC.s +++ /dev/null @@ -1,163 +0,0 @@ -.rdata -glabel D_801403CC - .asciz "../z_skelanime.c" - .balign 4 - -glabel D_801403E0 - .asciz "../z_skelanime.c" - .balign 4 - -glabel D_801403F4 - .asciz "joint_buff_num == joint_num" - .balign 4 - -glabel D_80140410 - .asciz "../z_skelanime.c" - .balign 4 - -glabel D_80140424 - .asciz "\x1b[31m" - .balign 4 - -glabel D_8014042C - .asciz "Skeleton_Info_Rom_SV_ct メモリアロケーションエラー\n" - # EUC-JP: メモリアロケーションエラー | Memory allocation error - .balign 4 - -glabel D_80140460 - .asciz "\x1b[m" - .balign 4 - -.text -glabel func_800A39AC -/* B1AB4C 800A39AC 00067100 */ sll $t6, $a2, 4 -/* B1AB50 800A39B0 3C098016 */ lui $t1, %hi(gSegments) # $t1, 0x8016 -/* B1AB54 800A39B4 000E7F02 */ srl $t7, $t6, 0x1c -/* B1AB58 800A39B8 25296FA8 */ addiu $t1, %lo(gSegments) # addiu $t1, $t1, 0x6fa8 -/* B1AB5C 800A39BC 000FC080 */ sll $t8, $t7, 2 -/* B1AB60 800A39C0 27BDFFC0 */ addiu $sp, $sp, -0x40 -/* B1AB64 800A39C4 0138C821 */ addu $t9, $t1, $t8 -/* B1AB68 800A39C8 8F2C0000 */ lw $t4, ($t9) -/* B1AB6C 800A39CC 3C0A00FF */ lui $t2, (0x00FFFFFF >> 16) # lui $t2, 0xff -/* B1AB70 800A39D0 354AFFFF */ ori $t2, (0x00FFFFFF & 0xFFFF) # ori $t2, $t2, 0xffff -/* B1AB74 800A39D4 00CA6824 */ and $t5, $a2, $t2 -/* B1AB78 800A39D8 8FAF0050 */ lw $t7, 0x50($sp) -/* B1AB7C 800A39DC 3C0B8000 */ lui $t3, 0x8000 -/* B1AB80 800A39E0 018D7021 */ addu $t6, $t4, $t5 -/* B1AB84 800A39E4 AFBF002C */ sw $ra, 0x2c($sp) -/* B1AB88 800A39E8 AFB00028 */ sw $s0, 0x28($sp) -/* B1AB8C 800A39EC AFA40040 */ sw $a0, 0x40($sp) -/* B1AB90 800A39F0 AFA7004C */ sw $a3, 0x4c($sp) -/* B1AB94 800A39F4 01CB4021 */ addu $t0, $t6, $t3 -/* B1AB98 800A39F8 91020004 */ lbu $v0, 4($t0) -/* B1AB9C 800A39FC A0AF0034 */ sb $t7, 0x34($a1) -/* B1ABA0 800A3A00 8FB80050 */ lw $t8, 0x50($sp) -/* B1ABA4 800A3A04 8FAC0050 */ lw $t4, 0x50($sp) -/* B1ABA8 800A3A08 00A08025 */ move $s0, $a1 -/* B1ABAC 800A3A0C 33190002 */ andi $t9, $t8, 2 -/* B1ABB0 800A3A10 13200003 */ beqz $t9, .L800A3A20 -/* B1ABB4 800A3A14 318D0001 */ andi $t5, $t4, 1 -/* B1ABB8 800A3A18 10000002 */ b .L800A3A24 -/* B1ABBC 800A3A1C 00401825 */ move $v1, $v0 -.L800A3A20: -/* B1ABC0 800A3A20 24030001 */ li $v1, 1 -.L800A3A24: -/* B1ABC4 800A3A24 11A00002 */ beqz $t5, .L800A3A30 -/* B1ABC8 800A3A28 8FAE0050 */ lw $t6, 0x50($sp) -/* B1ABCC 800A3A2C 00621821 */ addu $v1, $v1, $v0 -.L800A3A30: -/* B1ABD0 800A3A30 31CF0004 */ andi $t7, $t6, 4 -/* B1ABD4 800A3A34 11E00002 */ beqz $t7, .L800A3A40 -/* B1ABD8 800A3A38 2406093C */ li $a2, 2364 -/* B1ABDC 800A3A3C 00621821 */ addu $v1, $v1, $v0 -.L800A3A40: -/* B1ABE0 800A3A40 A2030000 */ sb $v1, ($s0) -/* B1ABE4 800A3A44 91180008 */ lbu $t8, 8($t0) -/* B1ABE8 800A3A48 00032880 */ sll $a1, $v1, 2 -/* B1ABEC 800A3A4C 00A32823 */ subu $a1, $a1, $v1 -/* B1ABF0 800A3A50 A2180002 */ sb $t8, 2($s0) -/* B1ABF4 800A3A54 8D020000 */ lw $v0, ($t0) -/* B1ABF8 800A3A58 00052840 */ sll $a1, $a1, 1 -/* B1ABFC 800A3A5C 00A02025 */ move $a0, $a1 -/* B1AC00 800A3A60 0002C900 */ sll $t9, $v0, 4 -/* B1AC04 800A3A64 00196702 */ srl $t4, $t9, 0x1c -/* B1AC08 800A3A68 000C6880 */ sll $t5, $t4, 2 -/* B1AC0C 800A3A6C 012D7021 */ addu $t6, $t1, $t5 -/* B1AC10 800A3A70 8DCF0000 */ lw $t7, ($t6) -/* B1AC14 800A3A74 004AC024 */ and $t8, $v0, $t2 -/* B1AC18 800A3A78 01F8C821 */ addu $t9, $t7, $t8 -/* B1AC1C 800A3A7C 032B6021 */ addu $t4, $t9, $t3 -/* B1AC20 800A3A80 AE0C0004 */ sw $t4, 4($s0) -/* B1AC24 800A3A84 8FAD0050 */ lw $t5, 0x50($sp) -/* B1AC28 800A3A88 8FAF0054 */ lw $t7, 0x54($sp) -/* B1AC2C 800A3A8C 8FB8005C */ lw $t8, 0x5c($sp) -/* B1AC30 800A3A90 31AE0008 */ andi $t6, $t5, 8 -/* B1AC34 800A3A94 11C00002 */ beqz $t6, .L800A3AA0 -/* B1AC38 800A3A98 00000000 */ nop -/* B1AC3C 800A3A9C 24A40002 */ addiu $a0, $a1, 2 -.L800A3AA0: -/* B1AC40 800A3AA0 15E0000C */ bnez $t7, .L800A3AD4 -/* B1AC44 800A3AA4 3C058014 */ lui $a1, %hi(D_801403CC) # $a1, 0x8014 -/* B1AC48 800A3AA8 24A503CC */ addiu $a1, %lo(D_801403CC) # addiu $a1, $a1, 0x3cc -/* B1AC4C 800A3AAC 0C01EBB8 */ jal ZeldaArena_MallocDebug -/* B1AC50 800A3AB0 AFA40030 */ sw $a0, 0x30($sp) -/* B1AC54 800A3AB4 8FA40030 */ lw $a0, 0x30($sp) -/* B1AC58 800A3AB8 3C058014 */ lui $a1, %hi(D_801403E0) # $a1, 0x8014 -/* B1AC5C 800A3ABC AE020020 */ sw $v0, 0x20($s0) -/* B1AC60 800A3AC0 24A503E0 */ addiu $a1, %lo(D_801403E0) # addiu $a1, $a1, 0x3e0 -/* B1AC64 800A3AC4 0C01EBB8 */ jal ZeldaArena_MallocDebug -/* B1AC68 800A3AC8 2406093D */ li $a2, 2365 -/* B1AC6C 800A3ACC 10000011 */ b .L800A3B14 -/* B1AC70 800A3AD0 AE020024 */ sw $v0, 0x24($s0) -.L800A3AD4: -/* B1AC74 800A3AD4 13030006 */ beq $t8, $v1, .L800A3AF0 -/* B1AC78 800A3AD8 3C048014 */ lui $a0, %hi(D_801403F4) # $a0, 0x8014 -/* B1AC7C 800A3ADC 3C058014 */ lui $a1, %hi(D_80140410) # $a1, 0x8014 -/* B1AC80 800A3AE0 24A50410 */ addiu $a1, %lo(D_80140410) # addiu $a1, $a1, 0x410 -/* B1AC84 800A3AE4 248403F4 */ addiu $a0, %lo(D_801403F4) # addiu $a0, $a0, 0x3f4 -/* B1AC88 800A3AE8 0C0007FC */ jal __assert -/* B1AC8C 800A3AEC 24060941 */ li $a2, 2369 -.L800A3AF0: -/* B1AC90 800A3AF0 8FB90054 */ lw $t9, 0x54($sp) -/* B1AC94 800A3AF4 2402FFF0 */ li $v0, -16 -/* B1AC98 800A3AF8 272C000F */ addiu $t4, $t9, 0xf -/* B1AC9C 800A3AFC 01826824 */ and $t5, $t4, $v0 -/* B1ACA0 800A3B00 AE0D0020 */ sw $t5, 0x20($s0) -/* B1ACA4 800A3B04 8FAE0058 */ lw $t6, 0x58($sp) -/* B1ACA8 800A3B08 25CF000F */ addiu $t7, $t6, 0xf -/* B1ACAC 800A3B0C 01E2C024 */ and $t8, $t7, $v0 -/* B1ACB0 800A3B10 AE180024 */ sw $t8, 0x24($s0) -.L800A3B14: -/* B1ACB4 800A3B14 8E190020 */ lw $t9, 0x20($s0) -/* B1ACB8 800A3B18 3C048014 */ lui $a0, %hi(D_80140424) -/* B1ACBC 800A3B1C 13200004 */ beqz $t9, .L800A3B30 -/* B1ACC0 800A3B20 00000000 */ nop -/* B1ACC4 800A3B24 8E0C0024 */ lw $t4, 0x24($s0) -/* B1ACC8 800A3B28 5580000A */ bnezl $t4, .L800A3B54 -/* B1ACCC 800A3B2C 44800000 */ mtc1 $zero, $f0 -.L800A3B30: -/* B1ACD0 800A3B30 0C00084C */ jal osSyncPrintf -/* B1ACD4 800A3B34 24840424 */ addiu $a0, %lo(D_80140424) -/* B1ACD8 800A3B38 3C048014 */ lui $a0, %hi(D_8014042C) # $a0, 0x8014 -/* B1ACDC 800A3B3C 0C00084C */ jal osSyncPrintf -/* B1ACE0 800A3B40 2484042C */ addiu $a0, %lo(D_8014042C) # addiu $a0, $a0, 0x42c -/* B1ACE4 800A3B44 3C048014 */ lui $a0, %hi(D_80140460) -/* B1ACE8 800A3B48 0C00084C */ jal osSyncPrintf -/* B1ACEC 800A3B4C 24840460 */ addiu $a0, %lo(D_80140460) # addiu $a0, $a0, 0x460 -/* B1ACF0 800A3B50 44800000 */ mtc1 $zero, $f0 -.L800A3B54: -/* B1ACF4 800A3B54 8FA40040 */ lw $a0, 0x40($sp) -/* B1ACF8 800A3B58 02002825 */ move $a1, $s0 -/* B1ACFC 800A3B5C 8FA6004C */ lw $a2, 0x4c($sp) -/* B1AD00 800A3B60 3C073F80 */ lui $a3, 0x3f80 -/* B1AD04 800A3B64 AFA00018 */ sw $zero, 0x18($sp) -/* B1AD08 800A3B68 E7A00010 */ swc1 $f0, 0x10($sp) -/* B1AD0C 800A3B6C E7A00014 */ swc1 $f0, 0x14($sp) -/* B1AD10 800A3B70 0C028FC2 */ jal func_800A3F08 -/* B1AD14 800A3B74 E7A0001C */ swc1 $f0, 0x1c($sp) -/* B1AD18 800A3B78 8FBF002C */ lw $ra, 0x2c($sp) -/* B1AD1C 800A3B7C 8FB00028 */ lw $s0, 0x28($sp) -/* B1AD20 800A3B80 27BD0040 */ addiu $sp, $sp, 0x40 -/* B1AD24 800A3B84 03E00008 */ jr $ra -/* B1AD28 800A3B88 00000000 */ nop - diff --git a/asm/non_matchings/code/z_skelanime/func_800A3B8C.s b/asm/non_matchings/code/z_skelanime/func_800A3B8C.s deleted file mode 100644 index e9be35c47f..0000000000 --- a/asm/non_matchings/code/z_skelanime/func_800A3B8C.s +++ /dev/null @@ -1,17 +0,0 @@ -glabel func_800A3B8C -/* B1AD2C 800A3B8C 908E0001 */ lbu $t6, 1($a0) -/* B1AD30 800A3B90 3C18800A */ lui $t8, %hi(func_800A3E0C) -/* B1AD34 800A3B94 44802000 */ mtc1 $zero, $f4 -/* B1AD38 800A3B98 29C10002 */ slti $at, $t6, 2 -/* B1AD3C 800A3B9C 10200005 */ beqz $at, .L800A3BB4 -/* B1AD40 800A3BA0 27183E0C */ addiu $t8, %lo(func_800A3E0C) -/* B1AD44 800A3BA4 3C0F800A */ lui $t7, %hi(func_800A3D70) # $t7, 0x800a -/* B1AD48 800A3BA8 25EF3D70 */ addiu $t7, %lo(func_800A3D70) # addiu $t7, $t7, 0x3d70 -/* B1AD4C 800A3BAC 10000002 */ b .L800A3BB8 -/* B1AD50 800A3BB0 AC8F0030 */ sw $t7, 0x30($a0) -.L800A3BB4: -/* B1AD54 800A3BB4 AC980030 */ sw $t8, 0x30($a0) -.L800A3BB8: -/* B1AD58 800A3BB8 03E00008 */ jr $ra -/* B1AD5C 800A3BBC E4840028 */ swc1 $f4, 0x28($a0) - diff --git a/asm/non_matchings/code/z_skelanime/func_800A3BC0.s b/asm/non_matchings/code/z_skelanime/func_800A3BC0.s deleted file mode 100644 index 5130d0cb8b..0000000000 --- a/asm/non_matchings/code/z_skelanime/func_800A3BC0.s +++ /dev/null @@ -1,11 +0,0 @@ -glabel func_800A3BC0 -/* B1AD60 800A3BC0 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* B1AD64 800A3BC4 AFBF0014 */ sw $ra, 0x14($sp) -/* B1AD68 800A3BC8 8CB90030 */ lw $t9, 0x30($a1) -/* B1AD6C 800A3BCC 0320F809 */ jalr $t9 -/* B1AD70 800A3BD0 00000000 */ nop -/* B1AD74 800A3BD4 8FBF0014 */ lw $ra, 0x14($sp) -/* B1AD78 800A3BD8 27BD0018 */ addiu $sp, $sp, 0x18 -/* B1AD7C 800A3BDC 03E00008 */ jr $ra -/* B1AD80 800A3BE0 00000000 */ nop - diff --git a/asm/non_matchings/code/z_skelanime/func_800A3BE4.s b/asm/non_matchings/code/z_skelanime/func_800A3BE4.s deleted file mode 100644 index 8347a2f618..0000000000 --- a/asm/non_matchings/code/z_skelanime/func_800A3BE4.s +++ /dev/null @@ -1,49 +0,0 @@ -glabel func_800A3BE4 -/* B1AD84 800A3BE4 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* B1AD88 800A3BE8 3C0E8016 */ lui $t6, %hi(gGameInfo) -/* B1AD8C 800A3BEC 8DCEFA90 */ lw $t6, %lo(gGameInfo)($t6) -/* B1AD90 800A3BF0 AFBF0024 */ sw $ra, 0x24($sp) -/* B1AD94 800A3BF4 AFB00020 */ sw $s0, 0x20($sp) -/* B1AD98 800A3BF8 AFA40030 */ sw $a0, 0x30($sp) -/* B1AD9C 800A3BFC 85CF0110 */ lh $t7, 0x110($t6) -/* B1ADA0 800A3C00 3C013F00 */ li $at, 0x3F000000 # 0.000000 -/* B1ADA4 800A3C04 44814000 */ mtc1 $at, $f8 -/* B1ADA8 800A3C08 448F2000 */ mtc1 $t7, $f4 -/* B1ADAC 800A3C0C C4AA002C */ lwc1 $f10, 0x2c($a1) -/* B1ADB0 800A3C10 C4A00028 */ lwc1 $f0, 0x28($a1) -/* B1ADB4 800A3C14 468021A0 */ cvt.s.w $f6, $f4 -/* B1ADB8 800A3C18 44802000 */ mtc1 $zero, $f4 -/* B1ADBC 800A3C1C 46000306 */ mov.s $f12, $f0 -/* B1ADC0 800A3C20 00A08025 */ move $s0, $a1 -/* B1ADC4 800A3C24 00A02025 */ move $a0, $a1 -/* B1ADC8 800A3C28 46083082 */ mul.s $f2, $f6, $f8 -/* B1ADCC 800A3C2C 00000000 */ nop -/* B1ADD0 800A3C30 46025402 */ mul.s $f16, $f10, $f2 -/* B1ADD4 800A3C34 46100481 */ sub.s $f18, $f0, $f16 -/* B1ADD8 800A3C38 E4B20028 */ swc1 $f18, 0x28($a1) -/* B1ADDC 800A3C3C C4A00028 */ lwc1 $f0, 0x28($a1) -/* B1ADE0 800A3C40 4604003E */ c.le.s $f0, $f4 -/* B1ADE4 800A3C44 00000000 */ nop -/* B1ADE8 800A3C48 45000005 */ bc1f .L800A3C60 -/* B1ADEC 800A3C4C 00000000 */ nop -/* B1ADF0 800A3C50 0C028EE3 */ jal func_800A3B8C -/* B1ADF4 800A3C54 E7AC002C */ swc1 $f12, 0x2c($sp) -/* B1ADF8 800A3C58 C7AC002C */ lwc1 $f12, 0x2c($sp) -/* B1ADFC 800A3C5C C6000028 */ lwc1 $f0, 0x28($s0) -.L800A3C60: -/* B1AE00 800A3C60 460C0203 */ div.s $f8, $f0, $f12 -/* B1AE04 800A3C64 3C013F80 */ li $at, 0x3F800000 # 0.000000 -/* B1AE08 800A3C68 44813000 */ mtc1 $at, $f6 -/* B1AE0C 800A3C6C 92050000 */ lbu $a1, ($s0) -/* B1AE10 800A3C70 8E060020 */ lw $a2, 0x20($s0) -/* B1AE14 800A3C74 8E070024 */ lw $a3, 0x24($s0) -/* B1AE18 800A3C78 8FA40030 */ lw $a0, 0x30($sp) -/* B1AE1C 800A3C7C 46083281 */ sub.s $f10, $f6, $f8 -/* B1AE20 800A3C80 0C028D37 */ jal func_800A34DC -/* B1AE24 800A3C84 E7AA0010 */ swc1 $f10, 0x10($sp) -/* B1AE28 800A3C88 8FBF0024 */ lw $ra, 0x24($sp) -/* B1AE2C 800A3C8C 8FB00020 */ lw $s0, 0x20($sp) -/* B1AE30 800A3C90 27BD0030 */ addiu $sp, $sp, 0x30 -/* B1AE34 800A3C94 03E00008 */ jr $ra -/* B1AE38 800A3C98 00001025 */ move $v0, $zero - diff --git a/asm/non_matchings/code/z_skelanime/func_800A3C9C.s b/asm/non_matchings/code/z_skelanime/func_800A3C9C.s deleted file mode 100644 index fbfdc05530..0000000000 --- a/asm/non_matchings/code/z_skelanime/func_800A3C9C.s +++ /dev/null @@ -1,58 +0,0 @@ -glabel func_800A3C9C -/* B1AE3C 800A3C9C 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* B1AE40 800A3CA0 AFB00020 */ sw $s0, 0x20($sp) -/* B1AE44 800A3CA4 00A08025 */ move $s0, $a1 -/* B1AE48 800A3CA8 AFBF0024 */ sw $ra, 0x24($sp) -/* B1AE4C 800A3CAC AFA40028 */ sw $a0, 0x28($sp) -/* B1AE50 800A3CB0 C6040018 */ lwc1 $f4, 0x18($s0) -/* B1AE54 800A3CB4 8E0F0020 */ lw $t7, 0x20($s0) -/* B1AE58 800A3CB8 92070000 */ lbu $a3, ($s0) -/* B1AE5C 800A3CBC 4600218D */ trunc.w.s $f6, $f4 -/* B1AE60 800A3CC0 8CA50008 */ lw $a1, 8($a1) -/* B1AE64 800A3CC4 AFAF0010 */ sw $t7, 0x10($sp) -/* B1AE68 800A3CC8 44063000 */ mfc1 $a2, $f6 -/* B1AE6C 800A3CCC 0C028CDB */ jal func_800A336C -/* B1AE70 800A3CD0 00000000 */ nop -/* B1AE74 800A3CD4 C6000028 */ lwc1 $f0, 0x28($s0) -/* B1AE78 800A3CD8 44804000 */ mtc1 $zero, $f8 -/* B1AE7C 800A3CDC 3C188016 */ lui $t8, %hi(gGameInfo) -/* B1AE80 800A3CE0 46004032 */ c.eq.s $f8, $f0 -/* B1AE84 800A3CE4 00000000 */ nop -/* B1AE88 800A3CE8 4503001D */ bc1tl .L800A3D60 -/* B1AE8C 800A3CEC 8FBF0024 */ lw $ra, 0x24($sp) -/* B1AE90 800A3CF0 8F18FA90 */ lw $t8, %lo(gGameInfo)($t8) -/* B1AE94 800A3CF4 3C013F00 */ li $at, 0x3F000000 # 0.000000 -/* B1AE98 800A3CF8 44819000 */ mtc1 $at, $f18 -/* B1AE9C 800A3CFC 87190110 */ lh $t9, 0x110($t8) -/* B1AEA0 800A3D00 C604002C */ lwc1 $f4, 0x2c($s0) -/* B1AEA4 800A3D04 44806000 */ mtc1 $zero, $f12 -/* B1AEA8 800A3D08 44995000 */ mtc1 $t9, $f10 -/* B1AEAC 800A3D0C 00000000 */ nop -/* B1AEB0 800A3D10 46805420 */ cvt.s.w $f16, $f10 -/* B1AEB4 800A3D14 46128082 */ mul.s $f2, $f16, $f18 -/* B1AEB8 800A3D18 00000000 */ nop -/* B1AEBC 800A3D1C 46022182 */ mul.s $f6, $f4, $f2 -/* B1AEC0 800A3D20 46060201 */ sub.s $f8, $f0, $f6 -/* B1AEC4 800A3D24 E6080028 */ swc1 $f8, 0x28($s0) -/* B1AEC8 800A3D28 C6000028 */ lwc1 $f0, 0x28($s0) -/* B1AECC 800A3D2C 8FA40028 */ lw $a0, 0x28($sp) -/* B1AED0 800A3D30 460C003E */ c.le.s $f0, $f12 -/* B1AED4 800A3D34 00000000 */ nop -/* B1AED8 800A3D38 45000003 */ bc1f .L800A3D48 -/* B1AEDC 800A3D3C 00000000 */ nop -/* B1AEE0 800A3D40 10000006 */ b .L800A3D5C -/* B1AEE4 800A3D44 E60C0028 */ swc1 $f12, 0x28($s0) -.L800A3D48: -/* B1AEE8 800A3D48 92050000 */ lbu $a1, ($s0) -/* B1AEEC 800A3D4C 8E060020 */ lw $a2, 0x20($s0) -/* B1AEF0 800A3D50 8E070024 */ lw $a3, 0x24($s0) -/* B1AEF4 800A3D54 0C028D37 */ jal func_800A34DC -/* B1AEF8 800A3D58 E7A00010 */ swc1 $f0, 0x10($sp) -.L800A3D5C: -/* B1AEFC 800A3D5C 8FBF0024 */ lw $ra, 0x24($sp) -.L800A3D60: -/* B1AF00 800A3D60 8FB00020 */ lw $s0, 0x20($sp) -/* B1AF04 800A3D64 27BD0028 */ addiu $sp, $sp, 0x28 -/* B1AF08 800A3D68 03E00008 */ jr $ra -/* B1AF0C 800A3D6C 00000000 */ nop - diff --git a/asm/non_matchings/code/z_skelanime/func_800A3D70.s b/asm/non_matchings/code/z_skelanime/func_800A3D70.s deleted file mode 100644 index 3462864250..0000000000 --- a/asm/non_matchings/code/z_skelanime/func_800A3D70.s +++ /dev/null @@ -1,43 +0,0 @@ -glabel func_800A3D70 -/* B1AF10 800A3D70 3C0E8016 */ lui $t6, %hi(gGameInfo) -/* B1AF14 800A3D74 8DCEFA90 */ lw $t6, %lo(gGameInfo)($t6) -/* B1AF18 800A3D78 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* B1AF1C 800A3D7C AFBF0014 */ sw $ra, 0x14($sp) -/* B1AF20 800A3D80 85CF0110 */ lh $t7, 0x110($t6) -/* B1AF24 800A3D84 3C013F00 */ li $at, 0x3F000000 # 0.000000 -/* B1AF28 800A3D88 44814000 */ mtc1 $at, $f8 -/* B1AF2C 800A3D8C 448F2000 */ mtc1 $t7, $f4 -/* B1AF30 800A3D90 C4B0001C */ lwc1 $f16, 0x1c($a1) -/* B1AF34 800A3D94 C4AA0018 */ lwc1 $f10, 0x18($a1) -/* B1AF38 800A3D98 468021A0 */ cvt.s.w $f6, $f4 -/* B1AF3C 800A3D9C 46083082 */ mul.s $f2, $f6, $f8 -/* B1AF40 800A3DA0 44803000 */ mtc1 $zero, $f6 -/* B1AF44 800A3DA4 46028482 */ mul.s $f18, $f16, $f2 -/* B1AF48 800A3DA8 46125100 */ add.s $f4, $f10, $f18 -/* B1AF4C 800A3DAC E4A40018 */ swc1 $f4, 0x18($a1) -/* B1AF50 800A3DB0 C4A00018 */ lwc1 $f0, 0x18($a1) -/* B1AF54 800A3DB4 4606003C */ c.lt.s $f0, $f6 -/* B1AF58 800A3DB8 00000000 */ nop -/* B1AF5C 800A3DBC 45020006 */ bc1fl .L800A3DD8 -/* B1AF60 800A3DC0 C4A20014 */ lwc1 $f2, 0x14($a1) -/* B1AF64 800A3DC4 C4A80014 */ lwc1 $f8, 0x14($a1) -/* B1AF68 800A3DC8 46080400 */ add.s $f16, $f0, $f8 -/* B1AF6C 800A3DCC 10000008 */ b .L800A3DF0 -/* B1AF70 800A3DD0 E4B00018 */ swc1 $f16, 0x18($a1) -/* B1AF74 800A3DD4 C4A20014 */ lwc1 $f2, 0x14($a1) -.L800A3DD8: -/* B1AF78 800A3DD8 4600103E */ c.le.s $f2, $f0 -/* B1AF7C 800A3DDC 00000000 */ nop -/* B1AF80 800A3DE0 45000003 */ bc1f .L800A3DF0 -/* B1AF84 800A3DE4 00000000 */ nop -/* B1AF88 800A3DE8 46020281 */ sub.s $f10, $f0, $f2 -/* B1AF8C 800A3DEC E4AA0018 */ swc1 $f10, 0x18($a1) -.L800A3DF0: -/* B1AF90 800A3DF0 0C028F27 */ jal func_800A3C9C -/* B1AF94 800A3DF4 00000000 */ nop -/* B1AF98 800A3DF8 8FBF0014 */ lw $ra, 0x14($sp) -/* B1AF9C 800A3DFC 27BD0018 */ addiu $sp, $sp, 0x18 -/* B1AFA0 800A3E00 00001025 */ move $v0, $zero -/* B1AFA4 800A3E04 03E00008 */ jr $ra -/* B1AFA8 800A3E08 00000000 */ nop - diff --git a/asm/non_matchings/code/z_skelanime/func_800A3E0C.s b/asm/non_matchings/code/z_skelanime/func_800A3E0C.s deleted file mode 100644 index baf9686fc4..0000000000 --- a/asm/non_matchings/code/z_skelanime/func_800A3E0C.s +++ /dev/null @@ -1,62 +0,0 @@ -glabel func_800A3E0C -/* B1AFAC 800A3E0C 3C0E8016 */ lui $t6, %hi(gGameInfo) -/* B1AFB0 800A3E10 8DCEFA90 */ lw $t6, %lo(gGameInfo)($t6) -/* B1AFB4 800A3E14 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* B1AFB8 800A3E18 AFBF0014 */ sw $ra, 0x14($sp) -/* B1AFBC 800A3E1C 85CF0110 */ lh $t7, 0x110($t6) -/* B1AFC0 800A3E20 C4A00018 */ lwc1 $f0, 0x18($a1) -/* B1AFC4 800A3E24 C4AC0010 */ lwc1 $f12, 0x10($a1) -/* B1AFC8 800A3E28 448F2000 */ mtc1 $t7, $f4 -/* B1AFCC 800A3E2C 3C013F00 */ li $at, 0x3F000000 # 0.000000 -/* B1AFD0 800A3E30 46006032 */ c.eq.s $f12, $f0 -/* B1AFD4 800A3E34 44814000 */ mtc1 $at, $f8 -/* B1AFD8 800A3E38 468021A0 */ cvt.s.w $f6, $f4 -/* B1AFDC 800A3E3C 46083382 */ mul.s $f14, $f6, $f8 -/* B1AFE0 800A3E40 45020006 */ bc1fl .L800A3E5C -/* B1AFE4 800A3E44 C4A2001C */ lwc1 $f2, 0x1c($a1) -/* B1AFE8 800A3E48 0C028F27 */ jal func_800A3C9C -/* B1AFEC 800A3E4C 00000000 */ nop -/* B1AFF0 800A3E50 10000021 */ b .L800A3ED8 -/* B1AFF4 800A3E54 24020001 */ li $v0, 1 -/* B1AFF8 800A3E58 C4A2001C */ lwc1 $f2, 0x1c($a1) -.L800A3E5C: -/* B1AFFC 800A3E5C 44808000 */ mtc1 $zero, $f16 -/* B1B000 800A3E60 460E1282 */ mul.s $f10, $f2, $f14 -/* B1B004 800A3E64 460A0480 */ add.s $f18, $f0, $f10 -/* B1B008 800A3E68 E4B20018 */ swc1 $f18, 0x18($a1) -/* B1B00C 800A3E6C C4A00018 */ lwc1 $f0, 0x18($a1) -/* B1B010 800A3E70 460C0101 */ sub.s $f4, $f0, $f12 -/* B1B014 800A3E74 46022182 */ mul.s $f6, $f4, $f2 -/* B1B018 800A3E78 4606803C */ c.lt.s $f16, $f6 -/* B1B01C 800A3E7C 00000000 */ nop -/* B1B020 800A3E80 45020004 */ bc1fl .L800A3E94 -/* B1B024 800A3E84 4610003C */ c.lt.s $f0, $f16 -/* B1B028 800A3E88 10000010 */ b .L800A3ECC -/* B1B02C 800A3E8C E4AC0018 */ swc1 $f12, 0x18($a1) -/* B1B030 800A3E90 4610003C */ c.lt.s $f0, $f16 -.L800A3E94: -/* B1B034 800A3E94 00000000 */ nop -/* B1B038 800A3E98 45020006 */ bc1fl .L800A3EB4 -/* B1B03C 800A3E9C C4A20014 */ lwc1 $f2, 0x14($a1) -/* B1B040 800A3EA0 C4A80014 */ lwc1 $f8, 0x14($a1) -/* B1B044 800A3EA4 46080280 */ add.s $f10, $f0, $f8 -/* B1B048 800A3EA8 10000008 */ b .L800A3ECC -/* B1B04C 800A3EAC E4AA0018 */ swc1 $f10, 0x18($a1) -/* B1B050 800A3EB0 C4A20014 */ lwc1 $f2, 0x14($a1) -.L800A3EB4: -/* B1B054 800A3EB4 4600103E */ c.le.s $f2, $f0 -/* B1B058 800A3EB8 00000000 */ nop -/* B1B05C 800A3EBC 45000003 */ bc1f .L800A3ECC -/* B1B060 800A3EC0 00000000 */ nop -/* B1B064 800A3EC4 46020481 */ sub.s $f18, $f0, $f2 -/* B1B068 800A3EC8 E4B20018 */ swc1 $f18, 0x18($a1) -.L800A3ECC: -/* B1B06C 800A3ECC 0C028F27 */ jal func_800A3C9C -/* B1B070 800A3ED0 00000000 */ nop -/* B1B074 800A3ED4 00001025 */ move $v0, $zero -.L800A3ED8: -/* B1B078 800A3ED8 8FBF0014 */ lw $ra, 0x14($sp) -/* B1B07C 800A3EDC 27BD0018 */ addiu $sp, $sp, 0x18 -/* B1B080 800A3EE0 03E00008 */ jr $ra -/* B1B084 800A3EE4 00000000 */ nop - diff --git a/asm/non_matchings/code/z_skelanime/func_800A3EE8.s b/asm/non_matchings/code/z_skelanime/func_800A3EE8.s deleted file mode 100644 index 391aeba461..0000000000 --- a/asm/non_matchings/code/z_skelanime/func_800A3EE8.s +++ /dev/null @@ -1,10 +0,0 @@ -glabel func_800A3EE8 -/* B1B088 800A3EE8 3C013F80 */ li $at, 0x3F800000 # 0.000000 -/* B1B08C 800A3EEC 44810000 */ mtc1 $at, $f0 -/* B1B090 800A3EF0 44866000 */ mtc1 $a2, $f12 -/* B1B094 800A3EF4 AFA40000 */ sw $a0, ($sp) -/* B1B098 800A3EF8 E4A00028 */ swc1 $f0, 0x28($a1) -/* B1B09C 800A3EFC 460C0103 */ div.s $f4, $f0, $f12 -/* B1B0A0 800A3F00 03E00008 */ jr $ra -/* B1B0A4 800A3F04 E4A4002C */ swc1 $f4, 0x2c($a1) - diff --git a/asm/non_matchings/code/z_skelanime/func_800A3F08.s b/asm/non_matchings/code/z_skelanime/func_800A3F08.s deleted file mode 100644 index 2b6bdb2303..0000000000 --- a/asm/non_matchings/code/z_skelanime/func_800A3F08.s +++ /dev/null @@ -1,100 +0,0 @@ -glabel func_800A3F08 -/* B1B0A8 800A3F08 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* B1B0AC 800A3F0C C7AC0044 */ lwc1 $f12, 0x44($sp) -/* B1B0B0 800A3F10 44802000 */ mtc1 $zero, $f4 -/* B1B0B4 800A3F14 93AE0043 */ lbu $t6, 0x43($sp) -/* B1B0B8 800A3F18 AFBF0024 */ sw $ra, 0x24($sp) -/* B1B0BC 800A3F1C 46046032 */ c.eq.s $f12, $f4 -/* B1B0C0 800A3F20 AFB10020 */ sw $s1, 0x20($sp) -/* B1B0C4 800A3F24 AFB0001C */ sw $s0, 0x1c($sp) -/* B1B0C8 800A3F28 AFA40028 */ sw $a0, 0x28($sp) -/* B1B0CC 800A3F2C AFA70034 */ sw $a3, 0x34($sp) -/* B1B0D0 800A3F30 00A08025 */ move $s0, $a1 -/* B1B0D4 800A3F34 00C08825 */ move $s1, $a2 -/* B1B0D8 800A3F38 4501002D */ bc1t .L800A3FF0 -/* B1B0DC 800A3F3C A0AE0001 */ sb $t6, 1($a1) -/* B1B0E0 800A3F40 8CAF0008 */ lw $t7, 8($a1) -/* B1B0E4 800A3F44 C7A60038 */ lwc1 $f6, 0x38($sp) -/* B1B0E8 800A3F48 54CF0007 */ bnel $a2, $t7, .L800A3F68 -/* B1B0EC 800A3F4C 44805000 */ mtc1 $zero, $f10 -/* B1B0F0 800A3F50 C4A80018 */ lwc1 $f8, 0x18($a1) -/* B1B0F4 800A3F54 46083032 */ c.eq.s $f6, $f8 -/* B1B0F8 800A3F58 00000000 */ nop -/* B1B0FC 800A3F5C 45010024 */ bc1t .L800A3FF0 -/* B1B100 800A3F60 00000000 */ nop -/* B1B104 800A3F64 44805000 */ mtc1 $zero, $f10 -.L800A3F68: -/* B1B108 800A3F68 3C18800A */ lui $t8, %hi(func_800A3BE4) # $t8, 0x800a -/* B1B10C 800A3F6C 02002025 */ move $a0, $s0 -/* B1B110 800A3F70 460A603C */ c.lt.s $f12, $f10 -/* B1B114 800A3F74 27183BE4 */ addiu $t8, %lo(func_800A3BE4) # addiu $t8, $t8, 0x3be4 -/* B1B118 800A3F78 4502000B */ bc1fl .L800A3FA8 -/* B1B11C 800A3F7C AE180030 */ sw $t8, 0x30($s0) -/* B1B120 800A3F80 0C028EE3 */ jal func_800A3B8C -/* B1B124 800A3F84 E7AC0044 */ swc1 $f12, 0x44($sp) -/* B1B128 800A3F88 02002025 */ move $a0, $s0 -/* B1B12C 800A3F8C 8E050024 */ lw $a1, 0x24($s0) -/* B1B130 800A3F90 0C0295DD */ jal func_800A5774 -/* B1B134 800A3F94 8E060020 */ lw $a2, 0x20($s0) -/* B1B138 800A3F98 C7AC0044 */ lwc1 $f12, 0x44($sp) -/* B1B13C 800A3F9C 1000000D */ b .L800A3FD4 -/* B1B140 800A3FA0 46006307 */ neg.s $f12, $f12 -/* B1B144 800A3FA4 AE180030 */ sw $t8, 0x30($s0) -.L800A3FA8: -/* B1B148 800A3FA8 C7B00038 */ lwc1 $f16, 0x38($sp) -/* B1B14C 800A3FAC 8E080024 */ lw $t0, 0x24($s0) -/* B1B150 800A3FB0 92070000 */ lbu $a3, ($s0) -/* B1B154 800A3FB4 4600848D */ trunc.w.s $f18, $f16 -/* B1B158 800A3FB8 E7AC0044 */ swc1 $f12, 0x44($sp) -/* B1B15C 800A3FBC 8FA40028 */ lw $a0, 0x28($sp) -/* B1B160 800A3FC0 02202825 */ move $a1, $s1 -/* B1B164 800A3FC4 44069000 */ mfc1 $a2, $f18 -/* B1B168 800A3FC8 0C028CDB */ jal func_800A336C -/* B1B16C 800A3FCC AFA80010 */ sw $t0, 0x10($sp) -/* B1B170 800A3FD0 C7AC0044 */ lwc1 $f12, 0x44($sp) -.L800A3FD4: -/* B1B174 800A3FD4 3C013F80 */ li $at, 0x3F800000 # 0.000000 -/* B1B178 800A3FD8 44810000 */ mtc1 $at, $f0 -/* B1B17C 800A3FDC 00000000 */ nop -/* B1B180 800A3FE0 460C0103 */ div.s $f4, $f0, $f12 -/* B1B184 800A3FE4 E6000028 */ swc1 $f0, 0x28($s0) -/* B1B188 800A3FE8 10000010 */ b .L800A402C -/* B1B18C 800A3FEC E604002C */ swc1 $f4, 0x2c($s0) -.L800A3FF0: -/* B1B190 800A3FF0 0C028EE3 */ jal func_800A3B8C -/* B1B194 800A3FF4 02002025 */ move $a0, $s0 -/* B1B198 800A3FF8 C7A60038 */ lwc1 $f6, 0x38($sp) -/* B1B19C 800A3FFC 8E0A0020 */ lw $t2, 0x20($s0) -/* B1B1A0 800A4000 92070000 */ lbu $a3, ($s0) -/* B1B1A4 800A4004 4600320D */ trunc.w.s $f8, $f6 -/* B1B1A8 800A4008 8FA40028 */ lw $a0, 0x28($sp) -/* B1B1AC 800A400C 02202825 */ move $a1, $s1 -/* B1B1B0 800A4010 AFAA0010 */ sw $t2, 0x10($sp) -/* B1B1B4 800A4014 44064000 */ mfc1 $a2, $f8 -/* B1B1B8 800A4018 0C028CDB */ jal func_800A336C -/* B1B1BC 800A401C 00000000 */ nop -/* B1B1C0 800A4020 44805000 */ mtc1 $zero, $f10 -/* B1B1C4 800A4024 00000000 */ nop -/* B1B1C8 800A4028 E60A0028 */ swc1 $f10, 0x28($s0) -.L800A402C: -/* B1B1CC 800A402C AE110008 */ sw $s1, 8($s0) -/* B1B1D0 800A4030 C7B00038 */ lwc1 $f16, 0x38($sp) -/* B1B1D4 800A4034 02202025 */ move $a0, $s1 -/* B1B1D8 800A4038 E610000C */ swc1 $f16, 0xc($s0) -/* B1B1DC 800A403C C7B20038 */ lwc1 $f18, 0x38($sp) -/* B1B1E0 800A4040 E6120018 */ swc1 $f18, 0x18($s0) -/* B1B1E4 800A4044 C7A4003C */ lwc1 $f4, 0x3c($sp) -/* B1B1E8 800A4048 0C0287F2 */ jal func_800A1FC8 -/* B1B1EC 800A404C E6040010 */ swc1 $f4, 0x10($s0) -/* B1B1F0 800A4050 44823000 */ mtc1 $v0, $f6 -/* B1B1F4 800A4054 00000000 */ nop -/* B1B1F8 800A4058 46803220 */ cvt.s.w $f8, $f6 -/* B1B1FC 800A405C E6080014 */ swc1 $f8, 0x14($s0) -/* B1B200 800A4060 C7AA0034 */ lwc1 $f10, 0x34($sp) -/* B1B204 800A4064 E60A001C */ swc1 $f10, 0x1c($s0) -/* B1B208 800A4068 8FBF0024 */ lw $ra, 0x24($sp) -/* B1B20C 800A406C 8FB10020 */ lw $s1, 0x20($sp) -/* B1B210 800A4070 8FB0001C */ lw $s0, 0x1c($sp) -/* B1B214 800A4074 03E00008 */ jr $ra -/* B1B218 800A4078 27BD0028 */ addiu $sp, $sp, 0x28 - diff --git a/asm/non_matchings/code/z_skelanime/func_800A407C.s b/asm/non_matchings/code/z_skelanime/func_800A407C.s deleted file mode 100644 index f996c1ff58..0000000000 --- a/asm/non_matchings/code/z_skelanime/func_800A407C.s +++ /dev/null @@ -1,26 +0,0 @@ -glabel func_800A407C -/* B1B21C 800A407C 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* B1B220 800A4080 AFBF0024 */ sw $ra, 0x24($sp) -/* B1B224 800A4084 AFA40028 */ sw $a0, 0x28($sp) -/* B1B228 800A4088 AFA5002C */ sw $a1, 0x2c($sp) -/* B1B22C 800A408C AFA60030 */ sw $a2, 0x30($sp) -/* B1B230 800A4090 0C028800 */ jal SkelAnime_GetFrameCount -/* B1B234 800A4094 00C02025 */ move $a0, $a2 -/* B1B238 800A4098 44822000 */ mtc1 $v0, $f4 -/* B1B23C 800A409C 44800000 */ mtc1 $zero, $f0 -/* B1B240 800A40A0 240E0002 */ li $t6, 2 -/* B1B244 800A40A4 468021A0 */ cvt.s.w $f6, $f4 -/* B1B248 800A40A8 AFAE0018 */ sw $t6, 0x18($sp) -/* B1B24C 800A40AC 8FA40028 */ lw $a0, 0x28($sp) -/* B1B250 800A40B0 8FA5002C */ lw $a1, 0x2c($sp) -/* B1B254 800A40B4 8FA60030 */ lw $a2, 0x30($sp) -/* B1B258 800A40B8 3C073F80 */ lui $a3, 0x3f80 -/* B1B25C 800A40BC E7A60014 */ swc1 $f6, 0x14($sp) -/* B1B260 800A40C0 E7A00010 */ swc1 $f0, 0x10($sp) -/* B1B264 800A40C4 0C028FC2 */ jal func_800A3F08 -/* B1B268 800A40C8 E7A0001C */ swc1 $f0, 0x1c($sp) -/* B1B26C 800A40CC 8FBF0024 */ lw $ra, 0x24($sp) -/* B1B270 800A40D0 27BD0028 */ addiu $sp, $sp, 0x28 -/* B1B274 800A40D4 03E00008 */ jr $ra -/* B1B278 800A40D8 00000000 */ nop - diff --git a/asm/non_matchings/code/z_skelanime/func_800A40DC.s b/asm/non_matchings/code/z_skelanime/func_800A40DC.s deleted file mode 100644 index d12eff6e07..0000000000 --- a/asm/non_matchings/code/z_skelanime/func_800A40DC.s +++ /dev/null @@ -1,27 +0,0 @@ -glabel func_800A40DC -/* B1B27C 800A40DC 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* B1B280 800A40E0 AFBF0024 */ sw $ra, 0x24($sp) -/* B1B284 800A40E4 AFA40028 */ sw $a0, 0x28($sp) -/* B1B288 800A40E8 AFA5002C */ sw $a1, 0x2c($sp) -/* B1B28C 800A40EC AFA60030 */ sw $a2, 0x30($sp) -/* B1B290 800A40F0 AFA70034 */ sw $a3, 0x34($sp) -/* B1B294 800A40F4 0C028800 */ jal SkelAnime_GetFrameCount -/* B1B298 800A40F8 00C02025 */ move $a0, $a2 -/* B1B29C 800A40FC 44822000 */ mtc1 $v0, $f4 -/* B1B2A0 800A4100 44800000 */ mtc1 $zero, $f0 -/* B1B2A4 800A4104 240E0002 */ li $t6, 2 -/* B1B2A8 800A4108 468021A0 */ cvt.s.w $f6, $f4 -/* B1B2AC 800A410C AFAE0018 */ sw $t6, 0x18($sp) -/* B1B2B0 800A4110 8FA40028 */ lw $a0, 0x28($sp) -/* B1B2B4 800A4114 8FA5002C */ lw $a1, 0x2c($sp) -/* B1B2B8 800A4118 8FA60030 */ lw $a2, 0x30($sp) -/* B1B2BC 800A411C 8FA70034 */ lw $a3, 0x34($sp) -/* B1B2C0 800A4120 E7A60014 */ swc1 $f6, 0x14($sp) -/* B1B2C4 800A4124 E7A00010 */ swc1 $f0, 0x10($sp) -/* B1B2C8 800A4128 0C028FC2 */ jal func_800A3F08 -/* B1B2CC 800A412C E7A0001C */ swc1 $f0, 0x1c($sp) -/* B1B2D0 800A4130 8FBF0024 */ lw $ra, 0x24($sp) -/* B1B2D4 800A4134 27BD0028 */ addiu $sp, $sp, 0x28 -/* B1B2D8 800A4138 03E00008 */ jr $ra -/* B1B2DC 800A413C 00000000 */ nop - diff --git a/asm/non_matchings/code/z_skelanime/func_800A4140.s b/asm/non_matchings/code/z_skelanime/func_800A4140.s deleted file mode 100644 index 40f035d4d6..0000000000 --- a/asm/non_matchings/code/z_skelanime/func_800A4140.s +++ /dev/null @@ -1,25 +0,0 @@ -glabel func_800A4140 -/* B1B2E0 800A4140 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* B1B2E4 800A4144 AFBF0024 */ sw $ra, 0x24($sp) -/* B1B2E8 800A4148 AFA40028 */ sw $a0, 0x28($sp) -/* B1B2EC 800A414C AFA5002C */ sw $a1, 0x2c($sp) -/* B1B2F0 800A4150 AFA60030 */ sw $a2, 0x30($sp) -/* B1B2F4 800A4154 0C028800 */ jal SkelAnime_GetFrameCount -/* B1B2F8 800A4158 00C02025 */ move $a0, $a2 -/* B1B2FC 800A415C 44822000 */ mtc1 $v0, $f4 -/* B1B300 800A4160 44800000 */ mtc1 $zero, $f0 -/* B1B304 800A4164 8FA40028 */ lw $a0, 0x28($sp) -/* B1B308 800A4168 468021A0 */ cvt.s.w $f6, $f4 -/* B1B30C 800A416C 8FA5002C */ lw $a1, 0x2c($sp) -/* B1B310 800A4170 8FA60030 */ lw $a2, 0x30($sp) -/* B1B314 800A4174 3C073F80 */ lui $a3, 0x3f80 -/* B1B318 800A4178 AFA00018 */ sw $zero, 0x18($sp) -/* B1B31C 800A417C E7A00010 */ swc1 $f0, 0x10($sp) -/* B1B320 800A4180 E7A60014 */ swc1 $f6, 0x14($sp) -/* B1B324 800A4184 0C028FC2 */ jal func_800A3F08 -/* B1B328 800A4188 E7A0001C */ swc1 $f0, 0x1c($sp) -/* B1B32C 800A418C 8FBF0024 */ lw $ra, 0x24($sp) -/* B1B330 800A4190 27BD0028 */ addiu $sp, $sp, 0x28 -/* B1B334 800A4194 03E00008 */ jr $ra -/* B1B338 800A4198 00000000 */ nop - diff --git a/asm/non_matchings/code/z_skelanime/func_800A419C.s b/asm/non_matchings/code/z_skelanime/func_800A419C.s deleted file mode 100644 index 16d7446c24..0000000000 --- a/asm/non_matchings/code/z_skelanime/func_800A419C.s +++ /dev/null @@ -1,26 +0,0 @@ -glabel func_800A419C -/* B1B33C 800A419C 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* B1B340 800A41A0 AFBF0024 */ sw $ra, 0x24($sp) -/* B1B344 800A41A4 AFA40028 */ sw $a0, 0x28($sp) -/* B1B348 800A41A8 AFA5002C */ sw $a1, 0x2c($sp) -/* B1B34C 800A41AC AFA60030 */ sw $a2, 0x30($sp) -/* B1B350 800A41B0 AFA70034 */ sw $a3, 0x34($sp) -/* B1B354 800A41B4 0C028800 */ jal SkelAnime_GetFrameCount -/* B1B358 800A41B8 00C02025 */ move $a0, $a2 -/* B1B35C 800A41BC 44822000 */ mtc1 $v0, $f4 -/* B1B360 800A41C0 44800000 */ mtc1 $zero, $f0 -/* B1B364 800A41C4 8FA40028 */ lw $a0, 0x28($sp) -/* B1B368 800A41C8 468021A0 */ cvt.s.w $f6, $f4 -/* B1B36C 800A41CC 8FA5002C */ lw $a1, 0x2c($sp) -/* B1B370 800A41D0 8FA60030 */ lw $a2, 0x30($sp) -/* B1B374 800A41D4 8FA70034 */ lw $a3, 0x34($sp) -/* B1B378 800A41D8 AFA00018 */ sw $zero, 0x18($sp) -/* B1B37C 800A41DC E7A00010 */ swc1 $f0, 0x10($sp) -/* B1B380 800A41E0 E7A60014 */ swc1 $f6, 0x14($sp) -/* B1B384 800A41E4 0C028FC2 */ jal func_800A3F08 -/* B1B388 800A41E8 E7A0001C */ swc1 $f0, 0x1c($sp) -/* B1B38C 800A41EC 8FBF0024 */ lw $ra, 0x24($sp) -/* B1B390 800A41F0 27BD0028 */ addiu $sp, $sp, 0x28 -/* B1B394 800A41F4 03E00008 */ jr $ra -/* B1B398 800A41F8 00000000 */ nop - diff --git a/asm/non_matchings/code/z_skelanime/func_800A41FC.s b/asm/non_matchings/code/z_skelanime/func_800A41FC.s deleted file mode 100644 index 8fdc4ffdfc..0000000000 --- a/asm/non_matchings/code/z_skelanime/func_800A41FC.s +++ /dev/null @@ -1,14 +0,0 @@ -glabel func_800A41FC -/* B1B39C 800A41FC 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* B1B3A0 800A4200 AFBF0014 */ sw $ra, 0x14($sp) -/* B1B3A4 800A4204 AFA5001C */ sw $a1, 0x1c($sp) -/* B1B3A8 800A4208 00A07025 */ move $t6, $a1 -/* B1B3AC 800A420C 8DC60024 */ lw $a2, 0x24($t6) -/* B1B3B0 800A4210 8DC70020 */ lw $a3, 0x20($t6) -/* B1B3B4 800A4214 0C028D1E */ jal func_800A3478 -/* B1B3B8 800A4218 90A50000 */ lbu $a1, ($a1) -/* B1B3BC 800A421C 8FBF0014 */ lw $ra, 0x14($sp) -/* B1B3C0 800A4220 27BD0018 */ addiu $sp, $sp, 0x18 -/* B1B3C4 800A4224 03E00008 */ jr $ra -/* B1B3C8 800A4228 00000000 */ nop - diff --git a/asm/non_matchings/code/z_skelanime/func_800A422C.s b/asm/non_matchings/code/z_skelanime/func_800A422C.s deleted file mode 100644 index 407987b893..0000000000 --- a/asm/non_matchings/code/z_skelanime/func_800A422C.s +++ /dev/null @@ -1,14 +0,0 @@ -glabel func_800A422C -/* B1B3CC 800A422C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* B1B3D0 800A4230 AFBF0014 */ sw $ra, 0x14($sp) -/* B1B3D4 800A4234 AFA5001C */ sw $a1, 0x1c($sp) -/* B1B3D8 800A4238 00A07025 */ move $t6, $a1 -/* B1B3DC 800A423C 8DC60020 */ lw $a2, 0x20($t6) -/* B1B3E0 800A4240 8DC70024 */ lw $a3, 0x24($t6) -/* B1B3E4 800A4244 0C028D1E */ jal func_800A3478 -/* B1B3E8 800A4248 90A50000 */ lbu $a1, ($a1) -/* B1B3EC 800A424C 8FBF0014 */ lw $ra, 0x14($sp) -/* B1B3F0 800A4250 27BD0018 */ addiu $sp, $sp, 0x18 -/* B1B3F4 800A4254 03E00008 */ jr $ra -/* B1B3F8 800A4258 00000000 */ nop - diff --git a/asm/non_matchings/code/z_skelanime/func_800A425C.s b/asm/non_matchings/code/z_skelanime/func_800A425C.s deleted file mode 100644 index 0a38414a94..0000000000 --- a/asm/non_matchings/code/z_skelanime/func_800A425C.s +++ /dev/null @@ -1,19 +0,0 @@ -glabel func_800A425C -/* B1B3FC 800A425C 44876000 */ mtc1 $a3, $f12 -/* B1B400 800A4260 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* B1B404 800A4264 AFA50024 */ sw $a1, 0x24($sp) -/* B1B408 800A4268 4600610D */ trunc.w.s $f4, $f12 -/* B1B40C 800A426C 8FAF0024 */ lw $t7, 0x24($sp) -/* B1B410 800A4270 AFA60028 */ sw $a2, 0x28($sp) -/* B1B414 800A4274 AFBF001C */ sw $ra, 0x1c($sp) -/* B1B418 800A4278 8DF80024 */ lw $t8, 0x24($t7) -/* B1B41C 800A427C 00C02825 */ move $a1, $a2 -/* B1B420 800A4280 44062000 */ mfc1 $a2, $f4 -/* B1B424 800A4284 91E70000 */ lbu $a3, ($t7) -/* B1B428 800A4288 0C028CDB */ jal func_800A336C -/* B1B42C 800A428C AFB80010 */ sw $t8, 0x10($sp) -/* B1B430 800A4290 8FBF001C */ lw $ra, 0x1c($sp) -/* B1B434 800A4294 27BD0020 */ addiu $sp, $sp, 0x20 -/* B1B438 800A4298 03E00008 */ jr $ra -/* B1B43C 800A429C 00000000 */ nop - diff --git a/asm/non_matchings/code/z_skelanime/func_800A42A0.s b/asm/non_matchings/code/z_skelanime/func_800A42A0.s deleted file mode 100644 index 993397e476..0000000000 --- a/asm/non_matchings/code/z_skelanime/func_800A42A0.s +++ /dev/null @@ -1,19 +0,0 @@ -glabel func_800A42A0 -/* B1B440 800A42A0 44876000 */ mtc1 $a3, $f12 -/* B1B444 800A42A4 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* B1B448 800A42A8 AFA50024 */ sw $a1, 0x24($sp) -/* B1B44C 800A42AC 4600610D */ trunc.w.s $f4, $f12 -/* B1B450 800A42B0 8FAF0024 */ lw $t7, 0x24($sp) -/* B1B454 800A42B4 AFA60028 */ sw $a2, 0x28($sp) -/* B1B458 800A42B8 AFBF001C */ sw $ra, 0x1c($sp) -/* B1B45C 800A42BC 8DF80020 */ lw $t8, 0x20($t7) -/* B1B460 800A42C0 00C02825 */ move $a1, $a2 -/* B1B464 800A42C4 44062000 */ mfc1 $a2, $f4 -/* B1B468 800A42C8 91E70000 */ lbu $a3, ($t7) -/* B1B46C 800A42CC 0C028CDB */ jal func_800A336C -/* B1B470 800A42D0 AFB80010 */ sw $t8, 0x10($sp) -/* B1B474 800A42D4 8FBF001C */ lw $ra, 0x1c($sp) -/* B1B478 800A42D8 27BD0020 */ addiu $sp, $sp, 0x20 -/* B1B47C 800A42DC 03E00008 */ jr $ra -/* B1B480 800A42E0 00000000 */ nop - diff --git a/asm/non_matchings/code/z_skelanime/func_800A42E4.s b/asm/non_matchings/code/z_skelanime/func_800A42E4.s deleted file mode 100644 index 0d340935ed..0000000000 --- a/asm/non_matchings/code/z_skelanime/func_800A42E4.s +++ /dev/null @@ -1,16 +0,0 @@ -glabel func_800A42E4 -/* B1B484 800A42E4 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* B1B488 800A42E8 AFBF001C */ sw $ra, 0x1c($sp) -/* B1B48C 800A42EC AFA50024 */ sw $a1, 0x24($sp) -/* B1B490 800A42F0 00A07025 */ move $t6, $a1 -/* B1B494 800A42F4 44866000 */ mtc1 $a2, $f12 -/* B1B498 800A42F8 8DC60020 */ lw $a2, 0x20($t6) -/* B1B49C 800A42FC 8DC70024 */ lw $a3, 0x24($t6) -/* B1B4A0 800A4300 90A50000 */ lbu $a1, ($a1) -/* B1B4A4 800A4304 0C028D37 */ jal func_800A34DC -/* B1B4A8 800A4308 E7AC0010 */ swc1 $f12, 0x10($sp) -/* B1B4AC 800A430C 8FBF001C */ lw $ra, 0x1c($sp) -/* B1B4B0 800A4310 27BD0020 */ addiu $sp, $sp, 0x20 -/* B1B4B4 800A4314 03E00008 */ jr $ra -/* B1B4B8 800A4318 00000000 */ nop - diff --git a/asm/non_matchings/code/z_skelanime/func_800A431C.s b/asm/non_matchings/code/z_skelanime/func_800A431C.s deleted file mode 100644 index 951123c44e..0000000000 --- a/asm/non_matchings/code/z_skelanime/func_800A431C.s +++ /dev/null @@ -1,41 +0,0 @@ -glabel func_800A431C -/* B1B4BC 800A431C 44876000 */ mtc1 $a3, $f12 -/* B1B4C0 800A4320 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* B1B4C4 800A4324 AFB00020 */ sw $s0, 0x20($sp) -/* B1B4C8 800A4328 4600610D */ trunc.w.s $f4, $f12 -/* B1B4CC 800A432C 00A08025 */ move $s0, $a1 -/* B1B4D0 800A4330 AFA60038 */ sw $a2, 0x38($sp) -/* B1B4D4 800A4334 AFBF0024 */ sw $ra, 0x24($sp) -/* B1B4D8 800A4338 AFA40030 */ sw $a0, 0x30($sp) -/* B1B4DC 800A433C 8E0F0020 */ lw $t7, 0x20($s0) -/* B1B4E0 800A4340 00C02825 */ move $a1, $a2 -/* B1B4E4 800A4344 44062000 */ mfc1 $a2, $f4 -/* B1B4E8 800A4348 92070000 */ lbu $a3, ($s0) -/* B1B4EC 800A434C 0C028CDB */ jal func_800A336C -/* B1B4F0 800A4350 AFAF0010 */ sw $t7, 0x10($sp) -/* B1B4F4 800A4354 C7A60044 */ lwc1 $f6, 0x44($sp) -/* B1B4F8 800A4358 8FA2004C */ lw $v0, 0x4c($sp) -/* B1B4FC 800A435C 2401FFF0 */ li $at, -16 -/* B1B500 800A4360 4600320D */ trunc.w.s $f8, $f6 -/* B1B504 800A4364 2442000F */ addiu $v0, $v0, 0xf -/* B1B508 800A4368 00411024 */ and $v0, $v0, $at -/* B1B50C 800A436C 92070000 */ lbu $a3, ($s0) -/* B1B510 800A4370 44064000 */ mfc1 $a2, $f8 -/* B1B514 800A4374 AFA20028 */ sw $v0, 0x28($sp) -/* B1B518 800A4378 AFA20010 */ sw $v0, 0x10($sp) -/* B1B51C 800A437C 8FA40030 */ lw $a0, 0x30($sp) -/* B1B520 800A4380 0C028CDB */ jal func_800A336C -/* B1B524 800A4384 8FA50040 */ lw $a1, 0x40($sp) -/* B1B528 800A4388 C7AA0048 */ lwc1 $f10, 0x48($sp) -/* B1B52C 800A438C 92050000 */ lbu $a1, ($s0) -/* B1B530 800A4390 8E060020 */ lw $a2, 0x20($s0) -/* B1B534 800A4394 8FA40030 */ lw $a0, 0x30($sp) -/* B1B538 800A4398 8FA70028 */ lw $a3, 0x28($sp) -/* B1B53C 800A439C 0C028D37 */ jal func_800A34DC -/* B1B540 800A43A0 E7AA0010 */ swc1 $f10, 0x10($sp) -/* B1B544 800A43A4 8FBF0024 */ lw $ra, 0x24($sp) -/* B1B548 800A43A8 8FB00020 */ lw $s0, 0x20($sp) -/* B1B54C 800A43AC 27BD0030 */ addiu $sp, $sp, 0x30 -/* B1B550 800A43B0 03E00008 */ jr $ra -/* B1B554 800A43B4 00000000 */ nop - diff --git a/asm/non_matchings/code/z_skelanime/func_800A43B8.s b/asm/non_matchings/code/z_skelanime/func_800A43B8.s deleted file mode 100644 index 04d465f107..0000000000 --- a/asm/non_matchings/code/z_skelanime/func_800A43B8.s +++ /dev/null @@ -1,41 +0,0 @@ -glabel func_800A43B8 -/* B1B558 800A43B8 44876000 */ mtc1 $a3, $f12 -/* B1B55C 800A43BC 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* B1B560 800A43C0 AFB00020 */ sw $s0, 0x20($sp) -/* B1B564 800A43C4 4600610D */ trunc.w.s $f4, $f12 -/* B1B568 800A43C8 00A08025 */ move $s0, $a1 -/* B1B56C 800A43CC AFA60038 */ sw $a2, 0x38($sp) -/* B1B570 800A43D0 AFBF0024 */ sw $ra, 0x24($sp) -/* B1B574 800A43D4 AFA40030 */ sw $a0, 0x30($sp) -/* B1B578 800A43D8 8E0F0024 */ lw $t7, 0x24($s0) -/* B1B57C 800A43DC 00C02825 */ move $a1, $a2 -/* B1B580 800A43E0 44062000 */ mfc1 $a2, $f4 -/* B1B584 800A43E4 92070000 */ lbu $a3, ($s0) -/* B1B588 800A43E8 0C028CDB */ jal func_800A336C -/* B1B58C 800A43EC AFAF0010 */ sw $t7, 0x10($sp) -/* B1B590 800A43F0 C7A60044 */ lwc1 $f6, 0x44($sp) -/* B1B594 800A43F4 8FA2004C */ lw $v0, 0x4c($sp) -/* B1B598 800A43F8 2401FFF0 */ li $at, -16 -/* B1B59C 800A43FC 4600320D */ trunc.w.s $f8, $f6 -/* B1B5A0 800A4400 2442000F */ addiu $v0, $v0, 0xf -/* B1B5A4 800A4404 00411024 */ and $v0, $v0, $at -/* B1B5A8 800A4408 92070000 */ lbu $a3, ($s0) -/* B1B5AC 800A440C 44064000 */ mfc1 $a2, $f8 -/* B1B5B0 800A4410 AFA20028 */ sw $v0, 0x28($sp) -/* B1B5B4 800A4414 AFA20010 */ sw $v0, 0x10($sp) -/* B1B5B8 800A4418 8FA40030 */ lw $a0, 0x30($sp) -/* B1B5BC 800A441C 0C028CDB */ jal func_800A336C -/* B1B5C0 800A4420 8FA50040 */ lw $a1, 0x40($sp) -/* B1B5C4 800A4424 C7AA0048 */ lwc1 $f10, 0x48($sp) -/* B1B5C8 800A4428 92050000 */ lbu $a1, ($s0) -/* B1B5CC 800A442C 8E060024 */ lw $a2, 0x24($s0) -/* B1B5D0 800A4430 8FA40030 */ lw $a0, 0x30($sp) -/* B1B5D4 800A4434 8FA70028 */ lw $a3, 0x28($sp) -/* B1B5D8 800A4438 0C028D37 */ jal func_800A34DC -/* B1B5DC 800A443C E7AA0010 */ swc1 $f10, 0x10($sp) -/* B1B5E0 800A4440 8FBF0024 */ lw $ra, 0x24($sp) -/* B1B5E4 800A4444 8FB00020 */ lw $s0, 0x20($sp) -/* B1B5E8 800A4448 27BD0030 */ addiu $sp, $sp, 0x30 -/* B1B5EC 800A444C 03E00008 */ jr $ra -/* B1B5F0 800A4450 00000000 */ nop - diff --git a/asm/non_matchings/code/z_skelanime/func_800A4454.s b/asm/non_matchings/code/z_skelanime/func_800A4454.s deleted file mode 100644 index 136d1ec1be..0000000000 --- a/asm/non_matchings/code/z_skelanime/func_800A4454.s +++ /dev/null @@ -1,11 +0,0 @@ -glabel func_800A4454 -/* B1B5F4 800A4454 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* B1B5F8 800A4458 AFBF0014 */ sw $ra, 0x14($sp) -/* B1B5FC 800A445C 240E0002 */ li $t6, 2 -/* B1B600 800A4460 0C028EE3 */ jal func_800A3B8C -/* B1B604 800A4464 A08E0001 */ sb $t6, 1($a0) -/* B1B608 800A4468 8FBF0014 */ lw $ra, 0x14($sp) -/* B1B60C 800A446C 27BD0018 */ addiu $sp, $sp, 0x18 -/* B1B610 800A4470 03E00008 */ jr $ra -/* B1B614 800A4474 00000000 */ nop - diff --git a/asm/non_matchings/code/z_skelanime/func_800A4478.s b/asm/non_matchings/code/z_skelanime/func_800A4478.s deleted file mode 100644 index 2f2315e989..0000000000 --- a/asm/non_matchings/code/z_skelanime/func_800A4478.s +++ /dev/null @@ -1,53 +0,0 @@ -glabel func_800A4478 -/* B1B618 800A4478 44866000 */ mtc1 $a2, $f12 -/* B1B61C 800A447C C484001C */ lwc1 $f4, 0x1c($a0) -/* B1B620 800A4480 C4860018 */ lwc1 $f6, 0x18($a0) -/* B1B624 800A4484 44808000 */ mtc1 $zero, $f16 -/* B1B628 800A4488 460C2002 */ mul.s $f0, $f4, $f12 -/* B1B62C 800A448C 44857000 */ mtc1 $a1, $f14 -/* B1B630 800A4490 00001025 */ move $v0, $zero -/* B1B634 800A4494 46003081 */ sub.s $f2, $f6, $f0 -/* B1B638 800A4498 4610103C */ c.lt.s $f2, $f16 -/* B1B63C 800A449C 00000000 */ nop -/* B1B640 800A44A0 45020005 */ bc1fl .L800A44B8 -/* B1B644 800A44A4 C48C0014 */ lwc1 $f12, 0x14($a0) -/* B1B648 800A44A8 C48C0014 */ lwc1 $f12, 0x14($a0) -/* B1B64C 800A44AC 10000007 */ b .L800A44CC -/* B1B650 800A44B0 460C1080 */ add.s $f2, $f2, $f12 -/* B1B654 800A44B4 C48C0014 */ lwc1 $f12, 0x14($a0) -.L800A44B8: -/* B1B658 800A44B8 4602603E */ c.le.s $f12, $f2 -/* B1B65C 800A44BC 00000000 */ nop -/* B1B660 800A44C0 45020003 */ bc1fl .L800A44D0 -/* B1B664 800A44C4 46107032 */ c.eq.s $f14, $f16 -/* B1B668 800A44C8 460C1081 */ sub.s $f2, $f2, $f12 -.L800A44CC: -/* B1B66C 800A44CC 46107032 */ c.eq.s $f14, $f16 -.L800A44D0: -/* B1B670 800A44D0 46001200 */ add.s $f8, $f2, $f0 -/* B1B674 800A44D4 45020007 */ bc1fl .L800A44F4 -/* B1B678 800A44D8 460E4301 */ sub.s $f12, $f8, $f14 -/* B1B67C 800A44DC 4600803C */ c.lt.s $f16, $f0 -/* B1B680 800A44E0 00000000 */ nop -/* B1B684 800A44E4 45020003 */ bc1fl .L800A44F4 -/* B1B688 800A44E8 460E4301 */ sub.s $f12, $f8, $f14 -/* B1B68C 800A44EC 46006386 */ mov.s $f14, $f12 -/* B1B690 800A44F0 460E4301 */ sub.s $f12, $f8, $f14 -.L800A44F4: -/* B1B694 800A44F4 46006282 */ mul.s $f10, $f12, $f0 -/* B1B698 800A44F8 460A803E */ c.le.s $f16, $f10 -/* B1B69C 800A44FC 00000000 */ nop -/* B1B6A0 800A4500 45000009 */ bc1f .L800A4528 -/* B1B6A4 800A4504 00000000 */ nop -/* B1B6A8 800A4508 46006481 */ sub.s $f18, $f12, $f0 -/* B1B6AC 800A450C 46009102 */ mul.s $f4, $f18, $f0 -/* B1B6B0 800A4510 4610203C */ c.lt.s $f4, $f16 -/* B1B6B4 800A4514 00000000 */ nop -/* B1B6B8 800A4518 45000003 */ bc1f .L800A4528 -/* B1B6BC 800A451C 00000000 */ nop -/* B1B6C0 800A4520 03E00008 */ jr $ra -/* B1B6C4 800A4524 24020001 */ li $v0, 1 -.L800A4528: -/* B1B6C8 800A4528 03E00008 */ jr $ra -/* B1B6CC 800A452C 00000000 */ nop - diff --git a/asm/non_matchings/code/z_skelanime/func_800A4530.s b/asm/non_matchings/code/z_skelanime/func_800A4530.s deleted file mode 100644 index 03c97f246e..0000000000 --- a/asm/non_matchings/code/z_skelanime/func_800A4530.s +++ /dev/null @@ -1,21 +0,0 @@ -glabel func_800A4530 -/* B1B6D0 800A4530 3C0E8016 */ lui $t6, %hi(gGameInfo) -/* B1B6D4 800A4534 8DCEFA90 */ lw $t6, %lo(gGameInfo)($t6) -/* B1B6D8 800A4538 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* B1B6DC 800A453C AFBF0014 */ sw $ra, 0x14($sp) -/* B1B6E0 800A4540 85CF0110 */ lh $t7, 0x110($t6) -/* B1B6E4 800A4544 3C013F00 */ li $at, 0x3F000000 # 0.000000 -/* B1B6E8 800A4548 44814000 */ mtc1 $at, $f8 -/* B1B6EC 800A454C 448F2000 */ mtc1 $t7, $f4 -/* B1B6F0 800A4550 44856000 */ mtc1 $a1, $f12 -/* B1B6F4 800A4554 468021A0 */ cvt.s.w $f6, $f4 -/* B1B6F8 800A4558 44056000 */ mfc1 $a1, $f12 -/* B1B6FC 800A455C 46083002 */ mul.s $f0, $f6, $f8 -/* B1B700 800A4560 44060000 */ mfc1 $a2, $f0 -/* B1B704 800A4564 0C02911E */ jal func_800A4478 -/* B1B708 800A4568 00000000 */ nop -/* B1B70C 800A456C 8FBF0014 */ lw $ra, 0x14($sp) -/* B1B710 800A4570 27BD0018 */ addiu $sp, $sp, 0x18 -/* B1B714 800A4574 03E00008 */ jr $ra -/* B1B718 800A4578 00000000 */ nop - diff --git a/asm/non_matchings/code/z_skelanime/func_800A46F8.s b/asm/non_matchings/code/z_skelanime/func_800A46F8.s deleted file mode 100644 index 3e21d05f2b..0000000000 --- a/asm/non_matchings/code/z_skelanime/func_800A46F8.s +++ /dev/null @@ -1,136 +0,0 @@ -.rdata -glabel D_80140500 - .asciz "../z_skelanime.c" - .balign 4 - -glabel D_80140514 - .asciz "../z_skelanime.c" - .balign 4 - -glabel D_80140528 - .asciz "joint_buff_num == this->joint_num" - .balign 4 - -glabel D_8014054C - .asciz "../z_skelanime.c" - .balign 4 - -glabel D_80140560 - .asciz "\x1b[31m" - .balign 4 - -glabel D_80140568 - .asciz "Skeleton_Info_Rom_SV_ct メモリアロケーションエラー\n" - # EUC-JP: メモリアロケーションエラー | Memory allocation error - .balign 4 - -glabel D_8014059C - .asciz "\x1b[m" - .balign 4 - -.text -glabel func_800A46F8 -/* B1B898 800A46F8 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* B1B89C 800A46FC AFA40020 */ sw $a0, 0x20($sp) -/* B1B8A0 800A4700 00067100 */ sll $t6, $a2, 4 -/* B1B8A4 800A4704 3C048016 */ lui $a0, %hi(gSegments) # $a0, 0x8016 -/* B1B8A8 800A4708 000E7F02 */ srl $t7, $t6, 0x1c -/* B1B8AC 800A470C 24846FA8 */ addiu $a0, %lo(gSegments) # addiu $a0, $a0, 0x6fa8 -/* B1B8B0 800A4710 000FC080 */ sll $t8, $t7, 2 -/* B1B8B4 800A4714 0098C821 */ addu $t9, $a0, $t8 -/* B1B8B8 800A4718 8F2A0000 */ lw $t2, ($t9) -/* B1B8BC 800A471C 3C0800FF */ lui $t0, (0x00FFFFFF >> 16) # lui $t0, 0xff -/* B1B8C0 800A4720 3508FFFF */ ori $t0, (0x00FFFFFF & 0xFFFF) # ori $t0, $t0, 0xffff -/* B1B8C4 800A4724 00C85824 */ and $t3, $a2, $t0 -/* B1B8C8 800A4728 3C098000 */ lui $t1, 0x8000 -/* B1B8CC 800A472C 014B6021 */ addu $t4, $t2, $t3 -/* B1B8D0 800A4730 AFBF001C */ sw $ra, 0x1c($sp) -/* B1B8D4 800A4734 AFB00018 */ sw $s0, 0x18($sp) -/* B1B8D8 800A4738 AFA7002C */ sw $a3, 0x2c($sp) -/* B1B8DC 800A473C 01891021 */ addu $v0, $t4, $t1 -/* B1B8E0 800A4740 904D0004 */ lbu $t5, 4($v0) -/* B1B8E4 800A4744 00A08025 */ move $s0, $a1 -/* B1B8E8 800A4748 24060BE7 */ li $a2, 3047 -/* B1B8EC 800A474C 25AE0001 */ addiu $t6, $t5, 1 -/* B1B8F0 800A4750 A0AE0000 */ sb $t6, ($a1) -/* B1B8F4 800A4754 904F0008 */ lbu $t7, 8($v0) -/* B1B8F8 800A4758 A0AF0002 */ sb $t7, 2($a1) -/* B1B8FC 800A475C 8C430000 */ lw $v1, ($v0) -/* B1B900 800A4760 0003C100 */ sll $t8, $v1, 4 -/* B1B904 800A4764 0018CF02 */ srl $t9, $t8, 0x1c -/* B1B908 800A4768 00195080 */ sll $t2, $t9, 2 -/* B1B90C 800A476C 008A5821 */ addu $t3, $a0, $t2 -/* B1B910 800A4770 8D6C0000 */ lw $t4, ($t3) -/* B1B914 800A4774 00686824 */ and $t5, $v1, $t0 -/* B1B918 800A4778 018D7021 */ addu $t6, $t4, $t5 -/* B1B91C 800A477C 01C97821 */ addu $t7, $t6, $t1 -/* B1B920 800A4780 ACAF0004 */ sw $t7, 4($a1) -/* B1B924 800A4784 8FB80030 */ lw $t8, 0x30($sp) -/* B1B928 800A4788 8FB90038 */ lw $t9, 0x38($sp) -/* B1B92C 800A478C 57000016 */ bnezl $t8, .L800A47E8 -/* B1B930 800A4790 920A0000 */ lbu $t2, ($s0) -/* B1B934 800A4794 90A40000 */ lbu $a0, ($a1) -/* B1B938 800A4798 3C058014 */ lui $a1, %hi(D_80140500) # $a1, 0x8014 -/* B1B93C 800A479C 24A50500 */ addiu $a1, %lo(D_80140500) # addiu $a1, $a1, 0x500 -/* B1B940 800A47A0 00800821 */ addu $at, $a0, $zero -/* B1B944 800A47A4 00042080 */ sll $a0, $a0, 2 -/* B1B948 800A47A8 00812023 */ subu $a0, $a0, $at -/* B1B94C 800A47AC 0C01EBB8 */ jal ZeldaArena_MallocDebug -/* B1B950 800A47B0 00042040 */ sll $a0, $a0, 1 -/* B1B954 800A47B4 92040000 */ lbu $a0, ($s0) -/* B1B958 800A47B8 3C058014 */ lui $a1, %hi(D_80140514) # $a1, 0x8014 -/* B1B95C 800A47BC AE020020 */ sw $v0, 0x20($s0) -/* B1B960 800A47C0 00800821 */ addu $at, $a0, $zero -/* B1B964 800A47C4 00042080 */ sll $a0, $a0, 2 -/* B1B968 800A47C8 00812023 */ subu $a0, $a0, $at -/* B1B96C 800A47CC 00042040 */ sll $a0, $a0, 1 -/* B1B970 800A47D0 24A50514 */ addiu $a1, %lo(D_80140514) # addiu $a1, $a1, 0x514 -/* B1B974 800A47D4 0C01EBB8 */ jal ZeldaArena_MallocDebug -/* B1B978 800A47D8 24060BE8 */ li $a2, 3048 -/* B1B97C 800A47DC 1000000D */ b .L800A4814 -/* B1B980 800A47E0 AE020024 */ sw $v0, 0x24($s0) -/* B1B984 800A47E4 920A0000 */ lbu $t2, ($s0) -.L800A47E8: -/* B1B988 800A47E8 3C048014 */ lui $a0, %hi(D_80140528) # $a0, 0x8014 -/* B1B98C 800A47EC 24840528 */ addiu $a0, %lo(D_80140528) # addiu $a0, $a0, 0x528 -/* B1B990 800A47F0 132A0004 */ beq $t9, $t2, .L800A4804 -/* B1B994 800A47F4 3C058014 */ lui $a1, %hi(D_8014054C) # $a1, 0x8014 -/* B1B998 800A47F8 24A5054C */ addiu $a1, %lo(D_8014054C) # addiu $a1, $a1, 0x54c -/* B1B99C 800A47FC 0C0007FC */ jal __assert -/* B1B9A0 800A4800 24060BEC */ li $a2, 3052 -.L800A4804: -/* B1B9A4 800A4804 8FAB0030 */ lw $t3, 0x30($sp) -/* B1B9A8 800A4808 AE0B0020 */ sw $t3, 0x20($s0) -/* B1B9AC 800A480C 8FAC0034 */ lw $t4, 0x34($sp) -/* B1B9B0 800A4810 AE0C0024 */ sw $t4, 0x24($s0) -.L800A4814: -/* B1B9B4 800A4814 8E0D0020 */ lw $t5, 0x20($s0) -/* B1B9B8 800A4818 3C048014 */ lui $a0, %hi(D_80140560) # $a0, 0x8014 -/* B1B9BC 800A481C 11A00004 */ beqz $t5, .L800A4830 -/* B1B9C0 800A4820 00000000 */ nop -/* B1B9C4 800A4824 8E0E0024 */ lw $t6, 0x24($s0) -/* B1B9C8 800A4828 55C0000A */ bnezl $t6, .L800A4854 -/* B1B9CC 800A482C 8FAF002C */ lw $t7, 0x2c($sp) -.L800A4830: -/* B1B9D0 800A4830 0C00084C */ jal osSyncPrintf -/* B1B9D4 800A4834 24840560 */ addiu $a0, %lo(D_80140560) # addiu $a0, $a0, 0x560 -/* B1B9D8 800A4838 3C048014 */ lui $a0, %hi(D_80140568) # $a0, 0x8014 -/* B1B9DC 800A483C 0C00084C */ jal osSyncPrintf -/* B1B9E0 800A4840 24840568 */ addiu $a0, %lo(D_80140568) # addiu $a0, $a0, 0x568 -/* B1B9E4 800A4844 3C048014 */ lui $a0, %hi(D_8014059C) # $a0, 0x8014 -/* B1B9E8 800A4848 0C00084C */ jal osSyncPrintf -/* B1B9EC 800A484C 2484059C */ addiu $a0, %lo(D_8014059C) # addiu $a0, $a0, 0x59c -/* B1B9F0 800A4850 8FAF002C */ lw $t7, 0x2c($sp) -.L800A4854: -/* B1B9F4 800A4854 02002025 */ move $a0, $s0 -/* B1B9F8 800A4858 51E00004 */ beql $t7, $zero, .L800A486C -/* B1B9FC 800A485C 8FBF001C */ lw $ra, 0x1c($sp) -/* B1BA00 800A4860 0C0294BE */ jal func_800A52F8 -/* B1BA04 800A4864 01E02825 */ move $a1, $t7 -/* B1BA08 800A4868 8FBF001C */ lw $ra, 0x1c($sp) -.L800A486C: -/* B1BA0C 800A486C 8FB00018 */ lw $s0, 0x18($sp) -/* B1BA10 800A4870 27BD0020 */ addiu $sp, $sp, 0x20 -/* B1BA14 800A4874 03E00008 */ jr $ra -/* B1BA18 800A4878 00000000 */ nop - diff --git a/asm/non_matchings/code/z_skelanime/func_800A487C.s b/asm/non_matchings/code/z_skelanime/func_800A487C.s deleted file mode 100644 index b873d9cf02..0000000000 --- a/asm/non_matchings/code/z_skelanime/func_800A487C.s +++ /dev/null @@ -1,105 +0,0 @@ -.rdata -glabel D_801405A0 - .asciz "../z_skelanime.c" - .balign 4 - -glabel D_801405B4 - .asciz "../z_skelanime.c" - .balign 4 - -glabel D_801405C8 - .asciz "\x1b[31m" - .balign 4 - -glabel D_801405D0 - .asciz "Skeleton_Info2_skin2_ct メモリアロケーションエラー\n" - # EUC-JP: メモリアロケーションエラー | Memory allocation error - .balign 4 - -glabel D_80140604 - .asciz "\x1b[m" - .balign 4 - -.text -glabel func_800A487C -/* B1BA1C 800A487C 00067900 */ sll $t7, $a2, 4 -/* B1BA20 800A4880 3C088016 */ lui $t0, %hi(gSegments) # $t0, 0x8016 -/* B1BA24 800A4884 000FC702 */ srl $t8, $t7, 0x1c -/* B1BA28 800A4888 25086FA8 */ addiu $t0, %lo(gSegments) # addiu $t0, $t0, 0x6fa8 -/* B1BA2C 800A488C 0018C880 */ sll $t9, $t8, 2 -/* B1BA30 800A4890 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* B1BA34 800A4894 01195821 */ addu $t3, $t0, $t9 -/* B1BA38 800A4898 8D6C0000 */ lw $t4, ($t3) -/* B1BA3C 800A489C 3C0900FF */ lui $t1, (0x00FFFFFF >> 16) # lui $t1, 0xff -/* B1BA40 800A48A0 3529FFFF */ ori $t1, (0x00FFFFFF & 0xFFFF) # ori $t1, $t1, 0xffff -/* B1BA44 800A48A4 00C96824 */ and $t5, $a2, $t1 -/* B1BA48 800A48A8 3C0A8000 */ lui $t2, 0x8000 -/* B1BA4C 800A48AC 018D7821 */ addu $t7, $t4, $t5 -/* B1BA50 800A48B0 AFBF001C */ sw $ra, 0x1c($sp) -/* B1BA54 800A48B4 AFB00018 */ sw $s0, 0x18($sp) -/* B1BA58 800A48B8 AFA40020 */ sw $a0, 0x20($sp) -/* B1BA5C 800A48BC AFA60028 */ sw $a2, 0x28($sp) -/* B1BA60 800A48C0 AFA7002C */ sw $a3, 0x2c($sp) -/* B1BA64 800A48C4 01EA1021 */ addu $v0, $t7, $t2 -/* B1BA68 800A48C8 90580004 */ lbu $t8, 4($v0) -/* B1BA6C 800A48CC 00A08025 */ move $s0, $a1 -/* B1BA70 800A48D0 24060C30 */ li $a2, 3120 -/* B1BA74 800A48D4 27190001 */ addiu $t9, $t8, 1 -/* B1BA78 800A48D8 A0B90000 */ sb $t9, ($a1) -/* B1BA7C 800A48DC 8C430000 */ lw $v1, ($v0) -/* B1BA80 800A48E0 90A40000 */ lbu $a0, ($a1) -/* B1BA84 800A48E4 00035900 */ sll $t3, $v1, 4 -/* B1BA88 800A48E8 000B7702 */ srl $t6, $t3, 0x1c -/* B1BA8C 800A48EC 000E6080 */ sll $t4, $t6, 2 -/* B1BA90 800A48F0 010C6821 */ addu $t5, $t0, $t4 -/* B1BA94 800A48F4 8DAF0000 */ lw $t7, ($t5) -/* B1BA98 800A48F8 0069C024 */ and $t8, $v1, $t1 -/* B1BA9C 800A48FC 00800821 */ addu $at, $a0, $zero -/* B1BAA0 800A4900 01F8C821 */ addu $t9, $t7, $t8 -/* B1BAA4 800A4904 032A5821 */ addu $t3, $t9, $t2 -/* B1BAA8 800A4908 ACAB0004 */ sw $t3, 4($a1) -/* B1BAAC 800A490C 00042080 */ sll $a0, $a0, 2 -/* B1BAB0 800A4910 00812023 */ subu $a0, $a0, $at -/* B1BAB4 800A4914 3C058014 */ lui $a1, %hi(D_801405A0) # $a1, 0x8014 -/* B1BAB8 800A4918 24A505A0 */ addiu $a1, %lo(D_801405A0) # addiu $a1, $a1, 0x5a0 -/* B1BABC 800A491C 0C01EBB8 */ jal ZeldaArena_MallocDebug -/* B1BAC0 800A4920 00042040 */ sll $a0, $a0, 1 -/* B1BAC4 800A4924 92040000 */ lbu $a0, ($s0) -/* B1BAC8 800A4928 3C058014 */ lui $a1, %hi(D_801405B4) # $a1, 0x8014 -/* B1BACC 800A492C AE020020 */ sw $v0, 0x20($s0) -/* B1BAD0 800A4930 00800821 */ addu $at, $a0, $zero -/* B1BAD4 800A4934 00042080 */ sll $a0, $a0, 2 -/* B1BAD8 800A4938 00812023 */ subu $a0, $a0, $at -/* B1BADC 800A493C 00042040 */ sll $a0, $a0, 1 -/* B1BAE0 800A4940 24A505B4 */ addiu $a1, %lo(D_801405B4) # addiu $a1, $a1, 0x5b4 -/* B1BAE4 800A4944 0C01EBB8 */ jal ZeldaArena_MallocDebug -/* B1BAE8 800A4948 24060C31 */ li $a2, 3121 -/* B1BAEC 800A494C 8E0E0020 */ lw $t6, 0x20($s0) -/* B1BAF0 800A4950 AE020024 */ sw $v0, 0x24($s0) -/* B1BAF4 800A4954 3C048014 */ lui $a0, %hi(D_801405C8) # $a0, 0x8014 -/* B1BAF8 800A4958 11C00003 */ beqz $t6, .L800A4968 -/* B1BAFC 800A495C 00000000 */ nop -/* B1BB00 800A4960 5440000A */ bnezl $v0, .L800A498C -/* B1BB04 800A4964 8FA5002C */ lw $a1, 0x2c($sp) -.L800A4968: -/* B1BB08 800A4968 0C00084C */ jal osSyncPrintf -/* B1BB0C 800A496C 248405C8 */ addiu $a0, %lo(D_801405C8) # addiu $a0, $a0, 0x5c8 -/* B1BB10 800A4970 3C048014 */ lui $a0, %hi(D_801405D0) # $a0, 0x8014 -/* B1BB14 800A4974 0C00084C */ jal osSyncPrintf -/* B1BB18 800A4978 248405D0 */ addiu $a0, %lo(D_801405D0) # addiu $a0, $a0, 0x5d0 -/* B1BB1C 800A497C 3C048014 */ lui $a0, %hi(D_80140604) # $a0, 0x8014 -/* B1BB20 800A4980 0C00084C */ jal osSyncPrintf -/* B1BB24 800A4984 24840604 */ addiu $a0, %lo(D_80140604) # addiu $a0, $a0, 0x604 -/* B1BB28 800A4988 8FA5002C */ lw $a1, 0x2c($sp) -.L800A498C: -/* B1BB2C 800A498C 50A00004 */ beql $a1, $zero, .L800A49A0 -/* B1BB30 800A4990 8FBF001C */ lw $ra, 0x1c($sp) -/* B1BB34 800A4994 0C0294BE */ jal func_800A52F8 -/* B1BB38 800A4998 02002025 */ move $a0, $s0 -/* B1BB3C 800A499C 8FBF001C */ lw $ra, 0x1c($sp) -.L800A49A0: -/* B1BB40 800A49A0 8FB00018 */ lw $s0, 0x18($sp) -/* B1BB44 800A49A4 27BD0020 */ addiu $sp, $sp, 0x20 -/* B1BB48 800A49A8 03E00008 */ jr $ra -/* B1BB4C 800A49AC 00000000 */ nop - diff --git a/asm/non_matchings/code/z_skelanime/func_800A49B0.s b/asm/non_matchings/code/z_skelanime/func_800A49B0.s deleted file mode 100644 index 1c48c71a4c..0000000000 --- a/asm/non_matchings/code/z_skelanime/func_800A49B0.s +++ /dev/null @@ -1,23 +0,0 @@ -glabel func_800A49B0 -/* B1BB50 800A49B0 90820001 */ lbu $v0, 1($a0) -/* B1BB54 800A49B4 3C0E800A */ lui $t6, %hi(func_800A4D9C) # $t6, 0x800a -/* B1BB58 800A49B8 25CE4D9C */ addiu $t6, %lo(func_800A4D9C) # addiu $t6, $t6, 0x4d9c -/* B1BB5C 800A49BC 28410002 */ slti $at, $v0, 2 -/* B1BB60 800A49C0 50200004 */ beql $at, $zero, .L800A49D4 -/* B1BB64 800A49C4 28410004 */ slti $at, $v0, 4 -/* B1BB68 800A49C8 03E00008 */ jr $ra -/* B1BB6C 800A49CC AC8E0030 */ sw $t6, 0x30($a0) -/* B1BB70 800A49D0 28410004 */ slti $at, $v0, 4 -.L800A49D4: -/* B1BB74 800A49D4 10200005 */ beqz $at, .L800A49EC -/* B1BB78 800A49D8 3C18800A */ lui $t8, %hi(func_800A4E38) -/* B1BB7C 800A49DC 3C0F800A */ lui $t7, %hi(func_800A4EE0) # $t7, 0x800a -/* B1BB80 800A49E0 25EF4EE0 */ addiu $t7, %lo(func_800A4EE0) # addiu $t7, $t7, 0x4ee0 -/* B1BB84 800A49E4 03E00008 */ jr $ra -/* B1BB88 800A49E8 AC8F0030 */ sw $t7, 0x30($a0) -.L800A49EC: -/* B1BB8C 800A49EC 27184E38 */ addiu $t8, %lo(func_800A4E38) -/* B1BB90 800A49F0 AC980030 */ sw $t8, 0x30($a0) -/* B1BB94 800A49F4 03E00008 */ jr $ra -/* B1BB98 800A49F8 00000000 */ nop - diff --git a/asm/non_matchings/code/z_skelanime/func_800A4A20.s b/asm/non_matchings/code/z_skelanime/func_800A4A20.s deleted file mode 100644 index 04df19448c..0000000000 --- a/asm/non_matchings/code/z_skelanime/func_800A4A20.s +++ /dev/null @@ -1,54 +0,0 @@ -.late_rodata -glabel D_80140668 - .float 0.33333334 - -.text -glabel func_800A4A20 -/* B1BBC0 800A4A20 3C0E8016 */ lui $t6, %hi(gGameInfo) -/* B1BBC4 800A4A24 8DCEFA90 */ lw $t6, %lo(gGameInfo)($t6) -/* B1BBC8 800A4A28 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* B1BBCC 800A4A2C AFBF0024 */ sw $ra, 0x24($sp) -/* B1BBD0 800A4A30 AFB00020 */ sw $s0, 0x20($sp) -/* B1BBD4 800A4A34 85CF0110 */ lh $t7, 0x110($t6) -/* B1BBD8 800A4A38 3C018014 */ lui $at, %hi(D_80140668) -/* B1BBDC 800A4A3C C4280668 */ lwc1 $f8, %lo(D_80140668)($at) -/* B1BBE0 800A4A40 448F2000 */ mtc1 $t7, $f4 -/* B1BBE4 800A4A44 C48A002C */ lwc1 $f10, 0x2c($a0) -/* B1BBE8 800A4A48 C4800028 */ lwc1 $f0, 0x28($a0) -/* B1BBEC 800A4A4C 468021A0 */ cvt.s.w $f6, $f4 -/* B1BBF0 800A4A50 44802000 */ mtc1 $zero, $f4 -/* B1BBF4 800A4A54 46000306 */ mov.s $f12, $f0 -/* B1BBF8 800A4A58 00808025 */ move $s0, $a0 -/* B1BBFC 800A4A5C 46083082 */ mul.s $f2, $f6, $f8 -/* B1BC00 800A4A60 00000000 */ nop -/* B1BC04 800A4A64 46025402 */ mul.s $f16, $f10, $f2 -/* B1BC08 800A4A68 46100481 */ sub.s $f18, $f0, $f16 -/* B1BC0C 800A4A6C E4920028 */ swc1 $f18, 0x28($a0) -/* B1BC10 800A4A70 C4800028 */ lwc1 $f0, 0x28($a0) -/* B1BC14 800A4A74 4604003E */ c.le.s $f0, $f4 -/* B1BC18 800A4A78 00000000 */ nop -/* B1BC1C 800A4A7C 45000007 */ bc1f .L800A4A9C -/* B1BC20 800A4A80 00000000 */ nop -/* B1BC24 800A4A84 0C02926C */ jal func_800A49B0 -/* B1BC28 800A4A88 E7AC002C */ swc1 $f12, 0x2c($sp) -/* B1BC2C 800A4A8C 44803000 */ mtc1 $zero, $f6 -/* B1BC30 800A4A90 C7AC002C */ lwc1 $f12, 0x2c($sp) -/* B1BC34 800A4A94 E6060028 */ swc1 $f6, 0x28($s0) -/* B1BC38 800A4A98 C6000028 */ lwc1 $f0, 0x28($s0) -.L800A4A9C: -/* B1BC3C 800A4A9C 460C0283 */ div.s $f10, $f0, $f12 -/* B1BC40 800A4AA0 3C013F80 */ li $at, 0x3F800000 # 0.000000 -/* B1BC44 800A4AA4 44814000 */ mtc1 $at, $f8 -/* B1BC48 800A4AA8 8E050020 */ lw $a1, 0x20($s0) -/* B1BC4C 800A4AAC 92040000 */ lbu $a0, ($s0) -/* B1BC50 800A4AB0 8E070024 */ lw $a3, 0x24($s0) -/* B1BC54 800A4AB4 00A03025 */ move $a2, $a1 -/* B1BC58 800A4AB8 460A4401 */ sub.s $f16, $f8, $f10 -/* B1BC5C 800A4ABC 0C028B9C */ jal func_800A2E70 -/* B1BC60 800A4AC0 E7B00010 */ swc1 $f16, 0x10($sp) -/* B1BC64 800A4AC4 8FBF0024 */ lw $ra, 0x24($sp) -/* B1BC68 800A4AC8 8FB00020 */ lw $s0, 0x20($sp) -/* B1BC6C 800A4ACC 27BD0030 */ addiu $sp, $sp, 0x30 -/* B1BC70 800A4AD0 03E00008 */ jr $ra -/* B1BC74 800A4AD4 00001025 */ move $v0, $zero - diff --git a/asm/non_matchings/code/z_skelanime/func_800A4AD8.s b/asm/non_matchings/code/z_skelanime/func_800A4AD8.s deleted file mode 100644 index d6fdfc52d1..0000000000 --- a/asm/non_matchings/code/z_skelanime/func_800A4AD8.s +++ /dev/null @@ -1,108 +0,0 @@ -.late_rodata -glabel D_8014066C - .float 0.33333334 - -.text -glabel func_800A4AD8 -/* B1BC78 800A4AD8 3C0F8016 */ lui $t7, %hi(gGameInfo) -/* B1BC7C 800A4ADC 8DEFFA90 */ lw $t7, %lo(gGameInfo)($t7) -/* B1BC80 800A4AE0 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* B1BC84 800A4AE4 AFBF0024 */ sw $ra, 0x24($sp) -/* B1BC88 800A4AE8 AFB00020 */ sw $s0, 0x20($sp) -/* B1BC8C 800A4AEC 85F80110 */ lh $t8, 0x110($t7) -/* B1BC90 800A4AF0 3C014680 */ li $at, 0x46800000 # 0.000000 -/* B1BC94 800A4AF4 44812000 */ mtc1 $at, $f4 -/* B1BC98 800A4AF8 44985000 */ mtc1 $t8, $f10 -/* B1BC9C 800A4AFC C4800028 */ lwc1 $f0, 0x28($a0) -/* B1BCA0 800A4B00 3C018014 */ lui $at, %hi(D_8014066C) -/* B1BCA4 800A4B04 46805420 */ cvt.s.w $f16, $f10 -/* B1BCA8 800A4B08 46040182 */ mul.s $f6, $f0, $f4 -/* B1BCAC 800A4B0C C432066C */ lwc1 $f18, %lo(D_8014066C)($at) -/* B1BCB0 800A4B10 C484002C */ lwc1 $f4, 0x2c($a0) -/* B1BCB4 800A4B14 44805000 */ mtc1 $zero, $f10 -/* B1BCB8 800A4B18 00808025 */ move $s0, $a0 -/* B1BCBC 800A4B1C 46128082 */ mul.s $f2, $f16, $f18 -/* B1BCC0 800A4B20 4600320D */ trunc.w.s $f8, $f6 -/* B1BCC4 800A4B24 46022182 */ mul.s $f6, $f4, $f2 -/* B1BCC8 800A4B28 44064000 */ mfc1 $a2, $f8 -/* B1BCCC 800A4B2C 00000000 */ nop -/* B1BCD0 800A4B30 00063400 */ sll $a2, $a2, 0x10 -/* B1BCD4 800A4B34 46060201 */ sub.s $f8, $f0, $f6 -/* B1BCD8 800A4B38 00063403 */ sra $a2, $a2, 0x10 -/* B1BCDC 800A4B3C E4880028 */ swc1 $f8, 0x28($a0) -/* B1BCE0 800A4B40 C4800028 */ lwc1 $f0, 0x28($a0) -/* B1BCE4 800A4B44 460A003E */ c.le.s $f0, $f10 -/* B1BCE8 800A4B48 00000000 */ nop -/* B1BCEC 800A4B4C 45020008 */ bc1fl .L800A4B70 -/* B1BCF0 800A4B50 3C014680 */ li $at, 0x46800000 # 0.000000 -/* B1BCF4 800A4B54 0C02926C */ jal func_800A49B0 -/* B1BCF8 800A4B58 A7A6002E */ sh $a2, 0x2e($sp) -/* B1BCFC 800A4B5C 44808000 */ mtc1 $zero, $f16 -/* B1BD00 800A4B60 87A6002E */ lh $a2, 0x2e($sp) -/* B1BD04 800A4B64 E6100028 */ swc1 $f16, 0x28($s0) -/* B1BD08 800A4B68 C6000028 */ lwc1 $f0, 0x28($s0) -/* B1BD0C 800A4B6C 3C014680 */ li $at, 0x46800000 # 0.000000 -.L800A4B70: -/* B1BD10 800A4B70 44819000 */ mtc1 $at, $f18 -/* B1BD14 800A4B74 82080003 */ lb $t0, 3($s0) -/* B1BD18 800A4B78 00062400 */ sll $a0, $a2, 0x10 -/* B1BD1C 800A4B7C 46120102 */ mul.s $f4, $f0, $f18 -/* B1BD20 800A4B80 00042403 */ sra $a0, $a0, 0x10 -/* B1BD24 800A4B84 4600218D */ trunc.w.s $f6, $f4 -/* B1BD28 800A4B88 44053000 */ mfc1 $a1, $f6 -/* B1BD2C 800A4B8C 00000000 */ nop -/* B1BD30 800A4B90 00052C00 */ sll $a1, $a1, 0x10 -/* B1BD34 800A4B94 05010011 */ bgez $t0, .L800A4BDC -/* B1BD38 800A4B98 00052C03 */ sra $a1, $a1, 0x10 -/* B1BD3C 800A4B9C 00062400 */ sll $a0, $a2, 0x10 -/* B1BD40 800A4BA0 00042403 */ sra $a0, $a0, 0x10 -/* B1BD44 800A4BA4 0C01DE0D */ jal Math_Coss -/* B1BD48 800A4BA8 A7A5002C */ sh $a1, 0x2c($sp) -/* B1BD4C 800A4BAC 3C013F80 */ li $at, 0x3F800000 # 0.000000 -/* B1BD50 800A4BB0 44814000 */ mtc1 $at, $f8 -/* B1BD54 800A4BB4 87A5002C */ lh $a1, 0x2c($sp) -/* B1BD58 800A4BB8 46004281 */ sub.s $f10, $f8, $f0 -/* B1BD5C 800A4BBC 00052400 */ sll $a0, $a1, 0x10 -/* B1BD60 800A4BC0 00042403 */ sra $a0, $a0, 0x10 -/* B1BD64 800A4BC4 0C01DE0D */ jal Math_Coss -/* B1BD68 800A4BC8 E7AA0028 */ swc1 $f10, 0x28($sp) -/* B1BD6C 800A4BCC 3C013F80 */ li $at, 0x3F800000 # 0.000000 -/* B1BD70 800A4BD0 44818000 */ mtc1 $at, $f16 -/* B1BD74 800A4BD4 10000009 */ b .L800A4BFC -/* B1BD78 800A4BD8 46008081 */ sub.s $f2, $f16, $f0 -.L800A4BDC: -/* B1BD7C 800A4BDC 0C01DE1C */ jal Math_Sins -/* B1BD80 800A4BE0 A7A5002C */ sh $a1, 0x2c($sp) -/* B1BD84 800A4BE4 87A5002C */ lh $a1, 0x2c($sp) -/* B1BD88 800A4BE8 E7A00028 */ swc1 $f0, 0x28($sp) -/* B1BD8C 800A4BEC 00052400 */ sll $a0, $a1, 0x10 -/* B1BD90 800A4BF0 0C01DE1C */ jal Math_Sins -/* B1BD94 800A4BF4 00042403 */ sra $a0, $a0, 0x10 -/* B1BD98 800A4BF8 46000086 */ mov.s $f2, $f0 -.L800A4BFC: -/* B1BD9C 800A4BFC 44809000 */ mtc1 $zero, $f18 -/* B1BDA0 800A4C00 3C013F80 */ li $at, 0x3F800000 # 0.000000 -/* B1BDA4 800A4C04 44813000 */ mtc1 $at, $f6 -/* B1BDA8 800A4C08 46121032 */ c.eq.s $f2, $f18 -/* B1BDAC 800A4C0C C7A40028 */ lwc1 $f4, 0x28($sp) -/* B1BDB0 800A4C10 45030004 */ bc1tl .L800A4C24 -/* B1BDB4 800A4C14 44801000 */ mtc1 $zero, $f2 -/* B1BDB8 800A4C18 10000003 */ b .L800A4C28 -/* B1BDBC 800A4C1C 46041083 */ div.s $f2, $f2, $f4 -/* B1BDC0 800A4C20 44801000 */ mtc1 $zero, $f2 -.L800A4C24: -/* B1BDC4 800A4C24 00000000 */ nop -.L800A4C28: -/* B1BDC8 800A4C28 46023201 */ sub.s $f8, $f6, $f2 -/* B1BDCC 800A4C2C 8E050020 */ lw $a1, 0x20($s0) -/* B1BDD0 800A4C30 92040000 */ lbu $a0, ($s0) -/* B1BDD4 800A4C34 8E070024 */ lw $a3, 0x24($s0) -/* B1BDD8 800A4C38 E7A80010 */ swc1 $f8, 0x10($sp) -/* B1BDDC 800A4C3C 0C028B9C */ jal func_800A2E70 -/* B1BDE0 800A4C40 00A03025 */ move $a2, $a1 -/* B1BDE4 800A4C44 8FBF0024 */ lw $ra, 0x24($sp) -/* B1BDE8 800A4C48 8FB00020 */ lw $s0, 0x20($sp) -/* B1BDEC 800A4C4C 27BD0030 */ addiu $sp, $sp, 0x30 -/* B1BDF0 800A4C50 03E00008 */ jr $ra -/* B1BDF4 800A4C54 00001025 */ move $v0, $zero - diff --git a/asm/non_matchings/code/z_skelanime/func_800A4C58.s b/asm/non_matchings/code/z_skelanime/func_800A4C58.s deleted file mode 100644 index 0a0f6d6419..0000000000 --- a/asm/non_matchings/code/z_skelanime/func_800A4C58.s +++ /dev/null @@ -1,93 +0,0 @@ -.late_rodata -glabel D_80140670 - .float 0.33333334 - -.text -glabel func_800A4C58 -/* B1BDF8 800A4C58 27BDFD70 */ addiu $sp, $sp, -0x290 -/* B1BDFC 800A4C5C AFB00020 */ sw $s0, 0x20($sp) -/* B1BE00 800A4C60 00808025 */ move $s0, $a0 -/* B1BE04 800A4C64 AFBF0024 */ sw $ra, 0x24($sp) -/* B1BE08 800A4C68 C6040018 */ lwc1 $f4, 0x18($s0) -/* B1BE0C 800A4C6C 8E070020 */ lw $a3, 0x20($s0) -/* B1BE10 800A4C70 92060000 */ lbu $a2, ($s0) -/* B1BE14 800A4C74 4600218D */ trunc.w.s $f6, $f4 -/* B1BE18 800A4C78 8C840008 */ lw $a0, 8($a0) -/* B1BE1C 800A4C7C 44053000 */ mfc1 $a1, $f6 -/* B1BE20 800A4C80 0C028763 */ jal func_800A1D8C -/* B1BE24 800A4C84 00000000 */ nop -/* B1BE28 800A4C88 920F0001 */ lbu $t7, 1($s0) -/* B1BE2C 800A4C8C 27A70038 */ addiu $a3, $sp, 0x38 -/* B1BE30 800A4C90 31F80001 */ andi $t8, $t7, 1 -/* B1BE34 800A4C94 5300001B */ beql $t8, $zero, .L800A4D04 -/* B1BE38 800A4C98 C6000028 */ lwc1 $f0, 0x28($s0) -/* B1BE3C 800A4C9C C6000018 */ lwc1 $f0, 0x18($s0) -/* B1BE40 800A4CA0 C6120014 */ lwc1 $f18, 0x14($s0) -/* B1BE44 800A4CA4 4600020D */ trunc.w.s $f8, $f0 -/* B1BE48 800A4CA8 4600910D */ trunc.w.s $f4, $f18 -/* B1BE4C 800A4CAC 44054000 */ mfc1 $a1, $f8 -/* B1BE50 800A4CB0 00000000 */ nop -/* B1BE54 800A4CB4 44855000 */ mtc1 $a1, $f10 -/* B1BE58 800A4CB8 44092000 */ mfc1 $t1, $f4 -/* B1BE5C 800A4CBC 24A50001 */ addiu $a1, $a1, 1 -/* B1BE60 800A4CC0 46805420 */ cvt.s.w $f16, $f10 -/* B1BE64 800A4CC4 00A9082A */ slt $at, $a1, $t1 -/* B1BE68 800A4CC8 14200002 */ bnez $at, .L800A4CD4 -/* B1BE6C 800A4CCC 46100081 */ sub.s $f2, $f0, $f16 -/* B1BE70 800A4CD0 00002825 */ move $a1, $zero -.L800A4CD4: -/* B1BE74 800A4CD4 8E040008 */ lw $a0, 8($s0) -/* B1BE78 800A4CD8 92060000 */ lbu $a2, ($s0) -/* B1BE7C 800A4CDC 0C028763 */ jal func_800A1D8C -/* B1BE80 800A4CE0 E7A20030 */ swc1 $f2, 0x30($sp) -/* B1BE84 800A4CE4 C7A20030 */ lwc1 $f2, 0x30($sp) -/* B1BE88 800A4CE8 8E050020 */ lw $a1, 0x20($s0) -/* B1BE8C 800A4CEC 92040000 */ lbu $a0, ($s0) -/* B1BE90 800A4CF0 27A70038 */ addiu $a3, $sp, 0x38 -/* B1BE94 800A4CF4 E7A20010 */ swc1 $f2, 0x10($sp) -/* B1BE98 800A4CF8 0C028B9C */ jal func_800A2E70 -/* B1BE9C 800A4CFC 00A03025 */ move $a2, $a1 -/* B1BEA0 800A4D00 C6000028 */ lwc1 $f0, 0x28($s0) -.L800A4D04: -/* B1BEA4 800A4D04 44803000 */ mtc1 $zero, $f6 -/* B1BEA8 800A4D08 3C0A8016 */ lui $t2, %hi(gGameInfo) # $t2, 0x8016 -/* B1BEAC 800A4D0C 46003032 */ c.eq.s $f6, $f0 -/* B1BEB0 800A4D10 00000000 */ nop -/* B1BEB4 800A4D14 4503001D */ bc1tl .L800A4D8C -/* B1BEB8 800A4D18 8FBF0024 */ lw $ra, 0x24($sp) -/* B1BEBC 800A4D1C 8D4AFA90 */ lw $t2, %lo(gGameInfo)($t2) -/* B1BEC0 800A4D20 3C018014 */ lui $at, %hi(D_80140670) -/* B1BEC4 800A4D24 C4300670 */ lwc1 $f16, %lo(D_80140670)($at) -/* B1BEC8 800A4D28 854B0110 */ lh $t3, 0x110($t2) -/* B1BECC 800A4D2C C612002C */ lwc1 $f18, 0x2c($s0) -/* B1BED0 800A4D30 44806000 */ mtc1 $zero, $f12 -/* B1BED4 800A4D34 448B4000 */ mtc1 $t3, $f8 -/* B1BED8 800A4D38 00000000 */ nop -/* B1BEDC 800A4D3C 468042A0 */ cvt.s.w $f10, $f8 -/* B1BEE0 800A4D40 46105082 */ mul.s $f2, $f10, $f16 -/* B1BEE4 800A4D44 00000000 */ nop -/* B1BEE8 800A4D48 46029102 */ mul.s $f4, $f18, $f2 -/* B1BEEC 800A4D4C 46040181 */ sub.s $f6, $f0, $f4 -/* B1BEF0 800A4D50 E6060028 */ swc1 $f6, 0x28($s0) -/* B1BEF4 800A4D54 C6000028 */ lwc1 $f0, 0x28($s0) -/* B1BEF8 800A4D58 460C003E */ c.le.s $f0, $f12 -/* B1BEFC 800A4D5C 00000000 */ nop -/* B1BF00 800A4D60 45000003 */ bc1f .L800A4D70 -/* B1BF04 800A4D64 00000000 */ nop -/* B1BF08 800A4D68 10000007 */ b .L800A4D88 -/* B1BF0C 800A4D6C E60C0028 */ swc1 $f12, 0x28($s0) -.L800A4D70: -/* B1BF10 800A4D70 8E050020 */ lw $a1, 0x20($s0) -/* B1BF14 800A4D74 92040000 */ lbu $a0, ($s0) -/* B1BF18 800A4D78 8E070024 */ lw $a3, 0x24($s0) -/* B1BF1C 800A4D7C E7A00010 */ swc1 $f0, 0x10($sp) -/* B1BF20 800A4D80 0C028B9C */ jal func_800A2E70 -/* B1BF24 800A4D84 00A03025 */ move $a2, $a1 -.L800A4D88: -/* B1BF28 800A4D88 8FBF0024 */ lw $ra, 0x24($sp) -.L800A4D8C: -/* B1BF2C 800A4D8C 8FB00020 */ lw $s0, 0x20($sp) -/* B1BF30 800A4D90 27BD0290 */ addiu $sp, $sp, 0x290 -/* B1BF34 800A4D94 03E00008 */ jr $ra -/* B1BF38 800A4D98 00000000 */ nop - diff --git a/asm/non_matchings/code/z_skelanime/func_800A4D9C.s b/asm/non_matchings/code/z_skelanime/func_800A4D9C.s deleted file mode 100644 index a061493acc..0000000000 --- a/asm/non_matchings/code/z_skelanime/func_800A4D9C.s +++ /dev/null @@ -1,48 +0,0 @@ -.late_rodata -glabel D_80140674 - .float 0.33333334 - -.text -glabel func_800A4D9C -/* B1BF3C 800A4D9C 3C0E8016 */ lui $t6, %hi(gGameInfo) -/* B1BF40 800A4DA0 8DCEFA90 */ lw $t6, %lo(gGameInfo)($t6) -/* B1BF44 800A4DA4 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* B1BF48 800A4DA8 AFBF0014 */ sw $ra, 0x14($sp) -/* B1BF4C 800A4DAC 85CF0110 */ lh $t7, 0x110($t6) -/* B1BF50 800A4DB0 3C018014 */ lui $at, %hi(D_80140674) -/* B1BF54 800A4DB4 C4280674 */ lwc1 $f8, %lo(D_80140674)($at) -/* B1BF58 800A4DB8 448F2000 */ mtc1 $t7, $f4 -/* B1BF5C 800A4DBC C490001C */ lwc1 $f16, 0x1c($a0) -/* B1BF60 800A4DC0 C48A0018 */ lwc1 $f10, 0x18($a0) -/* B1BF64 800A4DC4 468021A0 */ cvt.s.w $f6, $f4 -/* B1BF68 800A4DC8 46083082 */ mul.s $f2, $f6, $f8 -/* B1BF6C 800A4DCC 44803000 */ mtc1 $zero, $f6 -/* B1BF70 800A4DD0 46028482 */ mul.s $f18, $f16, $f2 -/* B1BF74 800A4DD4 46125100 */ add.s $f4, $f10, $f18 -/* B1BF78 800A4DD8 E4840018 */ swc1 $f4, 0x18($a0) -/* B1BF7C 800A4DDC C4800018 */ lwc1 $f0, 0x18($a0) -/* B1BF80 800A4DE0 4606003C */ c.lt.s $f0, $f6 -/* B1BF84 800A4DE4 00000000 */ nop -/* B1BF88 800A4DE8 45020006 */ bc1fl .L800A4E04 -/* B1BF8C 800A4DEC C4820014 */ lwc1 $f2, 0x14($a0) -/* B1BF90 800A4DF0 C4880014 */ lwc1 $f8, 0x14($a0) -/* B1BF94 800A4DF4 46080400 */ add.s $f16, $f0, $f8 -/* B1BF98 800A4DF8 10000008 */ b .L800A4E1C -/* B1BF9C 800A4DFC E4900018 */ swc1 $f16, 0x18($a0) -/* B1BFA0 800A4E00 C4820014 */ lwc1 $f2, 0x14($a0) -.L800A4E04: -/* B1BFA4 800A4E04 4600103E */ c.le.s $f2, $f0 -/* B1BFA8 800A4E08 00000000 */ nop -/* B1BFAC 800A4E0C 45000003 */ bc1f .L800A4E1C -/* B1BFB0 800A4E10 00000000 */ nop -/* B1BFB4 800A4E14 46020281 */ sub.s $f10, $f0, $f2 -/* B1BFB8 800A4E18 E48A0018 */ swc1 $f10, 0x18($a0) -.L800A4E1C: -/* B1BFBC 800A4E1C 0C029316 */ jal func_800A4C58 -/* B1BFC0 800A4E20 00000000 */ nop -/* B1BFC4 800A4E24 8FBF0014 */ lw $ra, 0x14($sp) -/* B1BFC8 800A4E28 27BD0018 */ addiu $sp, $sp, 0x18 -/* B1BFCC 800A4E2C 00001025 */ move $v0, $zero -/* B1BFD0 800A4E30 03E00008 */ jr $ra -/* B1BFD4 800A4E34 00000000 */ nop - diff --git a/asm/non_matchings/code/z_skelanime/func_800A4E38.s b/asm/non_matchings/code/z_skelanime/func_800A4E38.s deleted file mode 100644 index 4415188d3b..0000000000 --- a/asm/non_matchings/code/z_skelanime/func_800A4E38.s +++ /dev/null @@ -1,51 +0,0 @@ -.late_rodata -glabel D_80140678 - .float 0.33333334 - -.text -glabel func_800A4E38 -/* B1BFD8 800A4E38 3C0E8016 */ lui $t6, %hi(gGameInfo) # $t6, 0x8016 -/* B1BFDC 800A4E3C 8DCEFA90 */ lw $t6, %lo(gGameInfo)($t6) -/* B1BFE0 800A4E40 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* B1BFE4 800A4E44 AFBF0014 */ sw $ra, 0x14($sp) -/* B1BFE8 800A4E48 85CF0110 */ lh $t7, 0x110($t6) -/* B1BFEC 800A4E4C 3C018014 */ lui $at, %hi(D_80140678) -/* B1BFF0 800A4E50 C4280678 */ lwc1 $f8, %lo(D_80140678)($at) -/* B1BFF4 800A4E54 448F2000 */ mtc1 $t7, $f4 -/* B1BFF8 800A4E58 C490001C */ lwc1 $f16, 0x1c($a0) -/* B1BFFC 800A4E5C C48A0018 */ lwc1 $f10, 0x18($a0) -/* B1C000 800A4E60 468021A0 */ cvt.s.w $f6, $f4 -/* B1C004 800A4E64 C48C000C */ lwc1 $f12, 0xc($a0) -/* B1C008 800A4E68 46083082 */ mul.s $f2, $f6, $f8 -/* B1C00C 800A4E6C 00000000 */ nop -/* B1C010 800A4E70 46028482 */ mul.s $f18, $f16, $f2 -/* B1C014 800A4E74 46125100 */ add.s $f4, $f10, $f18 -/* B1C018 800A4E78 E4840018 */ swc1 $f4, 0x18($a0) -/* B1C01C 800A4E7C C4800018 */ lwc1 $f0, 0x18($a0) -/* B1C020 800A4E80 460C003C */ c.lt.s $f0, $f12 -/* B1C024 800A4E84 00000000 */ nop -/* B1C028 800A4E88 45000006 */ bc1f .L800A4EA4 -/* B1C02C 800A4E8C 00000000 */ nop -/* B1C030 800A4E90 460C0181 */ sub.s $f6, $f0, $f12 -/* B1C034 800A4E94 C4880010 */ lwc1 $f8, 0x10($a0) -/* B1C038 800A4E98 46083400 */ add.s $f16, $f6, $f8 -/* B1C03C 800A4E9C 10000009 */ b .L800A4EC4 -/* B1C040 800A4EA0 E4900018 */ swc1 $f16, 0x18($a0) -.L800A4EA4: -/* B1C044 800A4EA4 C4820010 */ lwc1 $f2, 0x10($a0) -/* B1C048 800A4EA8 4600103E */ c.le.s $f2, $f0 -/* B1C04C 800A4EAC 00000000 */ nop -/* B1C050 800A4EB0 45000004 */ bc1f .L800A4EC4 -/* B1C054 800A4EB4 00000000 */ nop -/* B1C058 800A4EB8 46020281 */ sub.s $f10, $f0, $f2 -/* B1C05C 800A4EBC 460C5480 */ add.s $f18, $f10, $f12 -/* B1C060 800A4EC0 E4920018 */ swc1 $f18, 0x18($a0) -.L800A4EC4: -/* B1C064 800A4EC4 0C029316 */ jal func_800A4C58 -/* B1C068 800A4EC8 00000000 */ nop -/* B1C06C 800A4ECC 8FBF0014 */ lw $ra, 0x14($sp) -/* B1C070 800A4ED0 27BD0018 */ addiu $sp, $sp, 0x18 -/* B1C074 800A4ED4 00001025 */ move $v0, $zero -/* B1C078 800A4ED8 03E00008 */ jr $ra -/* B1C07C 800A4EDC 00000000 */ nop - diff --git a/asm/non_matchings/code/z_skelanime/func_800A4EE0.s b/asm/non_matchings/code/z_skelanime/func_800A4EE0.s deleted file mode 100644 index 3aac74911e..0000000000 --- a/asm/non_matchings/code/z_skelanime/func_800A4EE0.s +++ /dev/null @@ -1,77 +0,0 @@ -.late_rodata -glabel D_8014067C - .float 0.33333334 - -.text -glabel func_800A4EE0 -/* B1C080 800A4EE0 3C0E8016 */ lui $t6, %hi(gGameInfo) # $t6, 0x8016 -/* B1C084 800A4EE4 8DCEFA90 */ lw $t6, %lo(gGameInfo)($t6) -/* B1C088 800A4EE8 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* B1C08C 800A4EEC AFBF001C */ sw $ra, 0x1c($sp) -/* B1C090 800A4EF0 AFB00018 */ sw $s0, 0x18($sp) -/* B1C094 800A4EF4 85CF0110 */ lh $t7, 0x110($t6) -/* B1C098 800A4EF8 C4800018 */ lwc1 $f0, 0x18($a0) -/* B1C09C 800A4EFC C48C0010 */ lwc1 $f12, 0x10($a0) -/* B1C0A0 800A4F00 448F2000 */ mtc1 $t7, $f4 -/* B1C0A4 800A4F04 3C018014 */ lui $at, %hi(D_8014067C) -/* B1C0A8 800A4F08 46006032 */ c.eq.s $f12, $f0 -/* B1C0AC 800A4F0C C428067C */ lwc1 $f8, %lo(D_8014067C)($at) -/* B1C0B0 800A4F10 468021A0 */ cvt.s.w $f6, $f4 -/* B1C0B4 800A4F14 00808025 */ move $s0, $a0 -/* B1C0B8 800A4F18 46083382 */ mul.s $f14, $f6, $f8 -/* B1C0BC 800A4F1C 4502000D */ bc1fl .L800A4F54 -/* B1C0C0 800A4F20 C602001C */ lwc1 $f2, 0x1c($s0) -/* B1C0C4 800A4F24 4600028D */ trunc.w.s $f10, $f0 -/* B1C0C8 800A4F28 8C840008 */ lw $a0, 8($a0) -/* B1C0CC 800A4F2C 92060000 */ lbu $a2, ($s0) -/* B1C0D0 800A4F30 8E070020 */ lw $a3, 0x20($s0) -/* B1C0D4 800A4F34 44055000 */ mfc1 $a1, $f10 -/* B1C0D8 800A4F38 0C028763 */ jal func_800A1D8C -/* B1C0DC 800A4F3C 00000000 */ nop -/* B1C0E0 800A4F40 0C029316 */ jal func_800A4C58 -/* B1C0E4 800A4F44 02002025 */ move $a0, $s0 -/* B1C0E8 800A4F48 10000021 */ b .L800A4FD0 -/* B1C0EC 800A4F4C 24020001 */ li $v0, 1 -/* B1C0F0 800A4F50 C602001C */ lwc1 $f2, 0x1c($s0) -.L800A4F54: -/* B1C0F4 800A4F54 44808000 */ mtc1 $zero, $f16 -/* B1C0F8 800A4F58 460E1482 */ mul.s $f18, $f2, $f14 -/* B1C0FC 800A4F5C 46120100 */ add.s $f4, $f0, $f18 -/* B1C100 800A4F60 E6040018 */ swc1 $f4, 0x18($s0) -/* B1C104 800A4F64 C6000018 */ lwc1 $f0, 0x18($s0) -/* B1C108 800A4F68 460C0181 */ sub.s $f6, $f0, $f12 -/* B1C10C 800A4F6C 46023202 */ mul.s $f8, $f6, $f2 -/* B1C110 800A4F70 4608803C */ c.lt.s $f16, $f8 -/* B1C114 800A4F74 00000000 */ nop -/* B1C118 800A4F78 45020004 */ bc1fl .L800A4F8C -/* B1C11C 800A4F7C 4610003C */ c.lt.s $f0, $f16 -/* B1C120 800A4F80 10000010 */ b .L800A4FC4 -/* B1C124 800A4F84 E60C0018 */ swc1 $f12, 0x18($s0) -/* B1C128 800A4F88 4610003C */ c.lt.s $f0, $f16 -.L800A4F8C: -/* B1C12C 800A4F8C 00000000 */ nop -/* B1C130 800A4F90 45020006 */ bc1fl .L800A4FAC -/* B1C134 800A4F94 C6020014 */ lwc1 $f2, 0x14($s0) -/* B1C138 800A4F98 C60A0014 */ lwc1 $f10, 0x14($s0) -/* B1C13C 800A4F9C 460A0480 */ add.s $f18, $f0, $f10 -/* B1C140 800A4FA0 10000008 */ b .L800A4FC4 -/* B1C144 800A4FA4 E6120018 */ swc1 $f18, 0x18($s0) -/* B1C148 800A4FA8 C6020014 */ lwc1 $f2, 0x14($s0) -.L800A4FAC: -/* B1C14C 800A4FAC 4600103E */ c.le.s $f2, $f0 -/* B1C150 800A4FB0 00000000 */ nop -/* B1C154 800A4FB4 45000003 */ bc1f .L800A4FC4 -/* B1C158 800A4FB8 00000000 */ nop -/* B1C15C 800A4FBC 46020101 */ sub.s $f4, $f0, $f2 -/* B1C160 800A4FC0 E6040018 */ swc1 $f4, 0x18($s0) -.L800A4FC4: -/* B1C164 800A4FC4 0C029316 */ jal func_800A4C58 -/* B1C168 800A4FC8 02002025 */ move $a0, $s0 -/* B1C16C 800A4FCC 00001025 */ move $v0, $zero -.L800A4FD0: -/* B1C170 800A4FD0 8FBF001C */ lw $ra, 0x1c($sp) -/* B1C174 800A4FD4 8FB00018 */ lw $s0, 0x18($sp) -/* B1C178 800A4FD8 27BD0020 */ addiu $sp, $sp, 0x20 -/* B1C17C 800A4FDC 03E00008 */ jr $ra -/* B1C180 800A4FE0 00000000 */ nop - diff --git a/asm/non_matchings/code/z_skelanime/func_800A4FE4.s b/asm/non_matchings/code/z_skelanime/func_800A4FE4.s deleted file mode 100644 index 3a18613b11..0000000000 --- a/asm/non_matchings/code/z_skelanime/func_800A4FE4.s +++ /dev/null @@ -1,122 +0,0 @@ -glabel func_800A4FE4 -/* B1C184 800A4FE4 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* B1C188 800A4FE8 C7AC0038 */ lwc1 $f12, 0x38($sp) -/* B1C18C 800A4FEC 44802000 */ mtc1 $zero, $f4 -/* B1C190 800A4FF0 93AE0037 */ lbu $t6, 0x37($sp) -/* B1C194 800A4FF4 AFBF001C */ sw $ra, 0x1c($sp) -/* B1C198 800A4FF8 46046032 */ c.eq.s $f12, $f4 -/* B1C19C 800A4FFC AFB00018 */ sw $s0, 0x18($sp) -/* B1C1A0 800A5000 AFA50024 */ sw $a1, 0x24($sp) -/* B1C1A4 800A5004 AFA60028 */ sw $a2, 0x28($sp) -/* B1C1A8 800A5008 AFA7002C */ sw $a3, 0x2c($sp) -/* B1C1AC 800A500C 00808025 */ move $s0, $a0 -/* B1C1B0 800A5010 45010035 */ bc1t .L800A50E8 -/* B1C1B4 800A5014 A08E0001 */ sb $t6, 1($a0) -/* B1C1B8 800A5018 8FAF0024 */ lw $t7, 0x24($sp) -/* B1C1BC 800A501C 8C980008 */ lw $t8, 8($a0) -/* B1C1C0 800A5020 C7A6002C */ lwc1 $f6, 0x2c($sp) -/* B1C1C4 800A5024 55F80007 */ bnel $t7, $t8, .L800A5044 -/* B1C1C8 800A5028 44805000 */ mtc1 $zero, $f10 -/* B1C1CC 800A502C C4880018 */ lwc1 $f8, 0x18($a0) -/* B1C1D0 800A5030 46083032 */ c.eq.s $f6, $f8 -/* B1C1D4 800A5034 00000000 */ nop -/* B1C1D8 800A5038 4501002B */ bc1t .L800A50E8 -/* B1C1DC 800A503C 00000000 */ nop -/* B1C1E0 800A5040 44805000 */ mtc1 $zero, $f10 -.L800A5044: -/* B1C1E4 800A5044 02002025 */ move $a0, $s0 -/* B1C1E8 800A5048 83A2003F */ lb $v0, 0x3f($sp) -/* B1C1EC 800A504C 460A603C */ c.lt.s $f12, $f10 -/* B1C1F0 800A5050 00000000 */ nop -/* B1C1F4 800A5054 4500000A */ bc1f .L800A5080 -/* B1C1F8 800A5058 00000000 */ nop -/* B1C1FC 800A505C 0C02926C */ jal func_800A49B0 -/* B1C200 800A5060 E7AC0038 */ swc1 $f12, 0x38($sp) -/* B1C204 800A5064 02002025 */ move $a0, $s0 -/* B1C208 800A5068 8E050024 */ lw $a1, 0x24($s0) -/* B1C20C 800A506C 0C0295DD */ jal func_800A5774 -/* B1C210 800A5070 8E060020 */ lw $a2, 0x20($s0) -/* B1C214 800A5074 C7AC0038 */ lwc1 $f12, 0x38($sp) -/* B1C218 800A5078 10000014 */ b .L800A50CC -/* B1C21C 800A507C 46006307 */ neg.s $f12, $f12 -.L800A5080: -/* B1C220 800A5080 10400006 */ beqz $v0, .L800A509C -/* B1C224 800A5084 3C08800A */ lui $t0, %hi(func_800A4A20) # $t0, 0x800A -/* B1C228 800A5088 3C19800A */ lui $t9, %hi(func_800A4AD8) # $t9, 0x800A -/* B1C22C 800A508C 27394AD8 */ addiu $t9, %lo(func_800A4AD8) # addiu $t9, $t9, 0x4ad8 -/* B1C230 800A5090 AE190030 */ sw $t9, 0x30($s0) -/* B1C234 800A5094 10000003 */ b .L800A50A4 -/* B1C238 800A5098 A2020003 */ sb $v0, 3($s0) -.L800A509C: -/* B1C23C 800A509C 25084A20 */ addiu $t0, %lo(func_800A4A20) # addiu $t0, $t0, 0x4a20 -/* B1C240 800A50A0 AE080030 */ sw $t0, 0x30($s0) -.L800A50A4: -/* B1C244 800A50A4 C7B0002C */ lwc1 $f16, 0x2c($sp) -/* B1C248 800A50A8 92060000 */ lbu $a2, ($s0) -/* B1C24C 800A50AC 8E070024 */ lw $a3, 0x24($s0) -/* B1C250 800A50B0 4600848D */ trunc.w.s $f18, $f16 -/* B1C254 800A50B4 E7AC0038 */ swc1 $f12, 0x38($sp) -/* B1C258 800A50B8 8FA40024 */ lw $a0, 0x24($sp) -/* B1C25C 800A50BC 44059000 */ mfc1 $a1, $f18 -/* B1C260 800A50C0 0C028763 */ jal func_800A1D8C -/* B1C264 800A50C4 00000000 */ nop -/* B1C268 800A50C8 C7AC0038 */ lwc1 $f12, 0x38($sp) -.L800A50CC: -/* B1C26C 800A50CC 3C013F80 */ li $at, 0x3F800000 # 0.000000 -/* B1C270 800A50D0 44813000 */ mtc1 $at, $f6 -/* B1C274 800A50D4 44812000 */ mtc1 $at, $f4 -/* B1C278 800A50D8 460C3203 */ div.s $f8, $f6, $f12 -/* B1C27C 800A50DC E6040028 */ swc1 $f4, 0x28($s0) -/* B1C280 800A50E0 1000000E */ b .L800A511C -/* B1C284 800A50E4 E608002C */ swc1 $f8, 0x2c($s0) -.L800A50E8: -/* B1C288 800A50E8 0C02926C */ jal func_800A49B0 -/* B1C28C 800A50EC 02002025 */ move $a0, $s0 -/* B1C290 800A50F0 C7AA002C */ lwc1 $f10, 0x2c($sp) -/* B1C294 800A50F4 8FA40024 */ lw $a0, 0x24($sp) -/* B1C298 800A50F8 92060000 */ lbu $a2, ($s0) -/* B1C29C 800A50FC 4600540D */ trunc.w.s $f16, $f10 -/* B1C2A0 800A5100 8E070020 */ lw $a3, 0x20($s0) -/* B1C2A4 800A5104 44058000 */ mfc1 $a1, $f16 -/* B1C2A8 800A5108 0C028763 */ jal func_800A1D8C -/* B1C2AC 800A510C 00000000 */ nop -/* B1C2B0 800A5110 44809000 */ mtc1 $zero, $f18 -/* B1C2B4 800A5114 00000000 */ nop -/* B1C2B8 800A5118 E6120028 */ swc1 $f18, 0x28($s0) -.L800A511C: -/* B1C2BC 800A511C 8FAB0024 */ lw $t3, 0x24($sp) -/* B1C2C0 800A5120 AE0B0008 */ sw $t3, 8($s0) -/* B1C2C4 800A5124 C7A4002C */ lwc1 $f4, 0x2c($sp) -/* B1C2C8 800A5128 E604000C */ swc1 $f4, 0xc($s0) -/* B1C2CC 800A512C C7A60030 */ lwc1 $f6, 0x30($sp) -/* B1C2D0 800A5130 E6060010 */ swc1 $f6, 0x10($s0) -/* B1C2D4 800A5134 0C0287F2 */ jal func_800A1FC8 -/* B1C2D8 800A5138 8FA40024 */ lw $a0, 0x24($sp) -/* B1C2DC 800A513C 44824000 */ mtc1 $v0, $f8 -/* B1C2E0 800A5140 92030001 */ lbu $v1, 1($s0) -/* B1C2E4 800A5144 468042A0 */ cvt.s.w $f10, $f8 -/* B1C2E8 800A5148 28610004 */ slti $at, $v1, 4 -/* B1C2EC 800A514C 14200004 */ bnez $at, .L800A5160 -/* B1C2F0 800A5150 E60A0014 */ swc1 $f10, 0x14($s0) -/* B1C2F4 800A5154 44808000 */ mtc1 $zero, $f16 -/* B1C2F8 800A5158 1000000A */ b .L800A5184 -/* B1C2FC 800A515C E6100018 */ swc1 $f16, 0x18($s0) -.L800A5160: -/* B1C300 800A5160 C7B2002C */ lwc1 $f18, 0x2c($sp) -/* B1C304 800A5164 28610002 */ slti $at, $v1, 2 -/* B1C308 800A5168 10200006 */ beqz $at, .L800A5184 -/* B1C30C 800A516C E6120018 */ swc1 $f18, 0x18($s0) -/* B1C310 800A5170 3C013F80 */ li $at, 0x3F800000 # 0.000000 -/* B1C314 800A5174 44813000 */ mtc1 $at, $f6 -/* B1C318 800A5178 C6040014 */ lwc1 $f4, 0x14($s0) -/* B1C31C 800A517C 46062201 */ sub.s $f8, $f4, $f6 -/* B1C320 800A5180 E6080010 */ swc1 $f8, 0x10($s0) -.L800A5184: -/* B1C324 800A5184 C7AA0028 */ lwc1 $f10, 0x28($sp) -/* B1C328 800A5188 E60A001C */ swc1 $f10, 0x1c($s0) -/* B1C32C 800A518C 8FBF001C */ lw $ra, 0x1c($sp) -/* B1C330 800A5190 8FB00018 */ lw $s0, 0x18($sp) -/* B1C334 800A5194 27BD0020 */ addiu $sp, $sp, 0x20 -/* B1C338 800A5198 03E00008 */ jr $ra -/* B1C33C 800A519C 00000000 */ nop - diff --git a/asm/non_matchings/code/z_skelanime/func_800A51E8.s b/asm/non_matchings/code/z_skelanime/func_800A51E8.s deleted file mode 100644 index 9dd3dc73c0..0000000000 --- a/asm/non_matchings/code/z_skelanime/func_800A51E8.s +++ /dev/null @@ -1,24 +0,0 @@ -glabel func_800A51E8 -/* B1C388 800A51E8 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* B1C38C 800A51EC AFBF0024 */ sw $ra, 0x24($sp) -/* B1C390 800A51F0 AFA40028 */ sw $a0, 0x28($sp) -/* B1C394 800A51F4 AFA5002C */ sw $a1, 0x2c($sp) -/* B1C398 800A51F8 0C028800 */ jal SkelAnime_GetFrameCount -/* B1C39C 800A51FC 00A02025 */ move $a0, $a1 -/* B1C3A0 800A5200 44822000 */ mtc1 $v0, $f4 -/* B1C3A4 800A5204 44800000 */ mtc1 $zero, $f0 -/* B1C3A8 800A5208 240E0002 */ li $t6, 2 -/* B1C3AC 800A520C 468021A0 */ cvt.s.w $f6, $f4 -/* B1C3B0 800A5210 44070000 */ mfc1 $a3, $f0 -/* B1C3B4 800A5214 AFAE0014 */ sw $t6, 0x14($sp) -/* B1C3B8 800A5218 8FA40028 */ lw $a0, 0x28($sp) -/* B1C3BC 800A521C 8FA5002C */ lw $a1, 0x2c($sp) -/* B1C3C0 800A5220 3C063F80 */ lui $a2, 0x3f80 -/* B1C3C4 800A5224 E7A60010 */ swc1 $f6, 0x10($sp) -/* B1C3C8 800A5228 0C029468 */ jal SkelAnime_ChangeAnimation -/* B1C3CC 800A522C E7A00018 */ swc1 $f0, 0x18($sp) -/* B1C3D0 800A5230 8FBF0024 */ lw $ra, 0x24($sp) -/* B1C3D4 800A5234 27BD0028 */ addiu $sp, $sp, 0x28 -/* B1C3D8 800A5238 03E00008 */ jr $ra -/* B1C3DC 800A523C 00000000 */ nop - diff --git a/asm/non_matchings/code/z_skelanime/func_800A5240.s b/asm/non_matchings/code/z_skelanime/func_800A5240.s deleted file mode 100644 index ea3265ce69..0000000000 --- a/asm/non_matchings/code/z_skelanime/func_800A5240.s +++ /dev/null @@ -1,25 +0,0 @@ -glabel func_800A5240 -/* B1C3E0 800A5240 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* B1C3E4 800A5244 AFBF0024 */ sw $ra, 0x24($sp) -/* B1C3E8 800A5248 AFA40028 */ sw $a0, 0x28($sp) -/* B1C3EC 800A524C AFA5002C */ sw $a1, 0x2c($sp) -/* B1C3F0 800A5250 AFA60030 */ sw $a2, 0x30($sp) -/* B1C3F4 800A5254 0C028800 */ jal SkelAnime_GetFrameCount -/* B1C3F8 800A5258 00A02025 */ move $a0, $a1 -/* B1C3FC 800A525C 44822000 */ mtc1 $v0, $f4 -/* B1C400 800A5260 C7A80030 */ lwc1 $f8, 0x30($sp) -/* B1C404 800A5264 240E0002 */ li $t6, 2 -/* B1C408 800A5268 468021A0 */ cvt.s.w $f6, $f4 -/* B1C40C 800A526C AFAE0014 */ sw $t6, 0x14($sp) -/* B1C410 800A5270 8FA40028 */ lw $a0, 0x28($sp) -/* B1C414 800A5274 8FA5002C */ lw $a1, 0x2c($sp) -/* B1C418 800A5278 3C063F80 */ lui $a2, 0x3f80 -/* B1C41C 800A527C 24070000 */ li $a3, 0 -/* B1C420 800A5280 E7A60010 */ swc1 $f6, 0x10($sp) -/* B1C424 800A5284 0C029468 */ jal SkelAnime_ChangeAnimation -/* B1C428 800A5288 E7A80018 */ swc1 $f8, 0x18($sp) -/* B1C42C 800A528C 8FBF0024 */ lw $ra, 0x24($sp) -/* B1C430 800A5290 27BD0028 */ addiu $sp, $sp, 0x28 -/* B1C434 800A5294 03E00008 */ jr $ra -/* B1C438 800A5298 00000000 */ nop - diff --git a/asm/non_matchings/code/z_skelanime/func_800A529C.s b/asm/non_matchings/code/z_skelanime/func_800A529C.s deleted file mode 100644 index 7898c1bf07..0000000000 --- a/asm/non_matchings/code/z_skelanime/func_800A529C.s +++ /dev/null @@ -1,25 +0,0 @@ -glabel func_800A529C -/* B1C43C 800A529C 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* B1C440 800A52A0 AFBF0024 */ sw $ra, 0x24($sp) -/* B1C444 800A52A4 AFA40028 */ sw $a0, 0x28($sp) -/* B1C448 800A52A8 AFA5002C */ sw $a1, 0x2c($sp) -/* B1C44C 800A52AC AFA60030 */ sw $a2, 0x30($sp) -/* B1C450 800A52B0 0C028800 */ jal SkelAnime_GetFrameCount -/* B1C454 800A52B4 00A02025 */ move $a0, $a1 -/* B1C458 800A52B8 44822000 */ mtc1 $v0, $f4 -/* B1C45C 800A52BC 44800000 */ mtc1 $zero, $f0 -/* B1C460 800A52C0 240E0002 */ li $t6, 2 -/* B1C464 800A52C4 468021A0 */ cvt.s.w $f6, $f4 -/* B1C468 800A52C8 44070000 */ mfc1 $a3, $f0 -/* B1C46C 800A52CC AFAE0014 */ sw $t6, 0x14($sp) -/* B1C470 800A52D0 8FA40028 */ lw $a0, 0x28($sp) -/* B1C474 800A52D4 8FA5002C */ lw $a1, 0x2c($sp) -/* B1C478 800A52D8 8FA60030 */ lw $a2, 0x30($sp) -/* B1C47C 800A52DC E7A60010 */ swc1 $f6, 0x10($sp) -/* B1C480 800A52E0 0C029468 */ jal SkelAnime_ChangeAnimation -/* B1C484 800A52E4 E7A00018 */ swc1 $f0, 0x18($sp) -/* B1C488 800A52E8 8FBF0024 */ lw $ra, 0x24($sp) -/* B1C48C 800A52EC 27BD0028 */ addiu $sp, $sp, 0x28 -/* B1C490 800A52F0 03E00008 */ jr $ra -/* B1C494 800A52F4 00000000 */ nop - diff --git a/asm/non_matchings/code/z_skelanime/func_800A52F8.s b/asm/non_matchings/code/z_skelanime/func_800A52F8.s deleted file mode 100644 index 1b2d268e62..0000000000 --- a/asm/non_matchings/code/z_skelanime/func_800A52F8.s +++ /dev/null @@ -1,23 +0,0 @@ -glabel func_800A52F8 -/* B1C498 800A52F8 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* B1C49C 800A52FC AFBF0024 */ sw $ra, 0x24($sp) -/* B1C4A0 800A5300 AFA40028 */ sw $a0, 0x28($sp) -/* B1C4A4 800A5304 AFA5002C */ sw $a1, 0x2c($sp) -/* B1C4A8 800A5308 0C028800 */ jal SkelAnime_GetFrameCount -/* B1C4AC 800A530C 00A02025 */ move $a0, $a1 -/* B1C4B0 800A5310 44822000 */ mtc1 $v0, $f4 -/* B1C4B4 800A5314 44800000 */ mtc1 $zero, $f0 -/* B1C4B8 800A5318 8FA40028 */ lw $a0, 0x28($sp) -/* B1C4BC 800A531C 468021A0 */ cvt.s.w $f6, $f4 -/* B1C4C0 800A5320 44070000 */ mfc1 $a3, $f0 -/* B1C4C4 800A5324 8FA5002C */ lw $a1, 0x2c($sp) -/* B1C4C8 800A5328 3C063F80 */ lui $a2, 0x3f80 -/* B1C4CC 800A532C AFA00014 */ sw $zero, 0x14($sp) -/* B1C4D0 800A5330 E7A00018 */ swc1 $f0, 0x18($sp) -/* B1C4D4 800A5334 0C029468 */ jal SkelAnime_ChangeAnimation -/* B1C4D8 800A5338 E7A60010 */ swc1 $f6, 0x10($sp) -/* B1C4DC 800A533C 8FBF0024 */ lw $ra, 0x24($sp) -/* B1C4E0 800A5340 27BD0028 */ addiu $sp, $sp, 0x28 -/* B1C4E4 800A5344 03E00008 */ jr $ra -/* B1C4E8 800A5348 00000000 */ nop - diff --git a/asm/non_matchings/code/z_skelanime/func_800A534C.s b/asm/non_matchings/code/z_skelanime/func_800A534C.s deleted file mode 100644 index 5e43743869..0000000000 --- a/asm/non_matchings/code/z_skelanime/func_800A534C.s +++ /dev/null @@ -1,16 +0,0 @@ -glabel func_800A534C -/* B1C4EC 800A534C 44800000 */ mtc1 $zero, $f0 -/* B1C4F0 800A5350 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* B1C4F4 800A5354 44866000 */ mtc1 $a2, $f12 -/* B1C4F8 800A5358 AFBF0024 */ sw $ra, 0x24($sp) -/* B1C4FC 800A535C 44070000 */ mfc1 $a3, $f0 -/* B1C500 800A5360 3C063F80 */ lui $a2, 0x3f80 -/* B1C504 800A5364 AFA00014 */ sw $zero, 0x14($sp) -/* B1C508 800A5368 E7A00010 */ swc1 $f0, 0x10($sp) -/* B1C50C 800A536C 0C029468 */ jal SkelAnime_ChangeAnimation -/* B1C510 800A5370 E7AC0018 */ swc1 $f12, 0x18($sp) -/* B1C514 800A5374 8FBF0024 */ lw $ra, 0x24($sp) -/* B1C518 800A5378 27BD0028 */ addiu $sp, $sp, 0x28 -/* B1C51C 800A537C 03E00008 */ jr $ra -/* B1C520 800A5380 00000000 */ nop - diff --git a/asm/non_matchings/code/z_skelanime/func_800A5384.s b/asm/non_matchings/code/z_skelanime/func_800A5384.s deleted file mode 100644 index 5b3adaaef7..0000000000 --- a/asm/non_matchings/code/z_skelanime/func_800A5384.s +++ /dev/null @@ -1,24 +0,0 @@ -glabel func_800A5384 -/* B1C524 800A5384 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* B1C528 800A5388 AFBF0024 */ sw $ra, 0x24($sp) -/* B1C52C 800A538C AFA40028 */ sw $a0, 0x28($sp) -/* B1C530 800A5390 AFA5002C */ sw $a1, 0x2c($sp) -/* B1C534 800A5394 AFA60030 */ sw $a2, 0x30($sp) -/* B1C538 800A5398 0C028800 */ jal SkelAnime_GetFrameCount -/* B1C53C 800A539C 00A02025 */ move $a0, $a1 -/* B1C540 800A53A0 44822000 */ mtc1 $v0, $f4 -/* B1C544 800A53A4 44800000 */ mtc1 $zero, $f0 -/* B1C548 800A53A8 8FA40028 */ lw $a0, 0x28($sp) -/* B1C54C 800A53AC 468021A0 */ cvt.s.w $f6, $f4 -/* B1C550 800A53B0 44070000 */ mfc1 $a3, $f0 -/* B1C554 800A53B4 8FA5002C */ lw $a1, 0x2c($sp) -/* B1C558 800A53B8 8FA60030 */ lw $a2, 0x30($sp) -/* B1C55C 800A53BC AFA00014 */ sw $zero, 0x14($sp) -/* B1C560 800A53C0 E7A00018 */ swc1 $f0, 0x18($sp) -/* B1C564 800A53C4 0C029468 */ jal SkelAnime_ChangeAnimation -/* B1C568 800A53C8 E7A60010 */ swc1 $f6, 0x10($sp) -/* B1C56C 800A53CC 8FBF0024 */ lw $ra, 0x24($sp) -/* B1C570 800A53D0 27BD0028 */ addiu $sp, $sp, 0x28 -/* B1C574 800A53D4 03E00008 */ jr $ra -/* B1C578 800A53D8 00000000 */ nop - diff --git a/asm/non_matchings/code/z_skelanime/func_800A53DC.s b/asm/non_matchings/code/z_skelanime/func_800A53DC.s deleted file mode 100644 index b35d39022a..0000000000 --- a/asm/non_matchings/code/z_skelanime/func_800A53DC.s +++ /dev/null @@ -1,13 +0,0 @@ -glabel func_800A53DC -/* B1C57C 800A53DC 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* B1C580 800A53E0 AFBF0014 */ sw $ra, 0x14($sp) -/* B1C584 800A53E4 C4840014 */ lwc1 $f4, 0x14($a0) -/* B1C588 800A53E8 240E0002 */ li $t6, 2 -/* B1C58C 800A53EC A08E0001 */ sb $t6, 1($a0) -/* B1C590 800A53F0 0C02926C */ jal func_800A49B0 -/* B1C594 800A53F4 E4840010 */ swc1 $f4, 0x10($a0) -/* B1C598 800A53F8 8FBF0014 */ lw $ra, 0x14($sp) -/* B1C59C 800A53FC 27BD0018 */ addiu $sp, $sp, 0x18 -/* B1C5A0 800A5400 03E00008 */ jr $ra -/* B1C5A4 800A5404 00000000 */ nop - diff --git a/asm/non_matchings/code/z_skelanime/func_800A5408.s b/asm/non_matchings/code/z_skelanime/func_800A5408.s deleted file mode 100644 index dbec4d43e7..0000000000 --- a/asm/non_matchings/code/z_skelanime/func_800A5408.s +++ /dev/null @@ -1,10 +0,0 @@ -glabel func_800A5408 -/* B1C5A8 800A5408 C486001C */ lwc1 $f6, 0x1c($a0) -/* B1C5AC 800A540C C480000C */ lwc1 $f0, 0xc($a0) -/* B1C5B0 800A5410 C4840010 */ lwc1 $f4, 0x10($a0) -/* B1C5B4 800A5414 46003207 */ neg.s $f8, $f6 -/* B1C5B8 800A5418 E4800010 */ swc1 $f0, 0x10($a0) -/* B1C5BC 800A541C E488001C */ swc1 $f8, 0x1c($a0) -/* B1C5C0 800A5420 03E00008 */ jr $ra -/* B1C5C4 800A5424 E484000C */ swc1 $f4, 0xc($a0) - diff --git a/asm/non_matchings/code/z_skelanime/func_800A5428.s b/asm/non_matchings/code/z_skelanime/func_800A5428.s deleted file mode 100644 index 4cb8230d33..0000000000 --- a/asm/non_matchings/code/z_skelanime/func_800A5428.s +++ /dev/null @@ -1,31 +0,0 @@ -glabel func_800A5428 -/* B1C5C8 800A5428 27BDFFF8 */ addiu $sp, $sp, -8 -/* B1C5CC 800A542C AFB00004 */ sw $s0, 4($sp) -/* B1C5D0 800A5430 90830000 */ lbu $v1, ($a0) -/* B1C5D4 800A5434 00A08025 */ move $s0, $a1 -/* B1C5D8 800A5438 00001025 */ move $v0, $zero -/* B1C5DC 800A543C 58600012 */ blezl $v1, .L800A5488 -/* B1C5E0 800A5440 8FB00004 */ lw $s0, 4($sp) -.L800A5444: -/* B1C5E4 800A5444 90E50000 */ lbu $a1, ($a3) -/* B1C5E8 800A5448 24420001 */ addiu $v0, $v0, 1 -/* B1C5EC 800A544C 24E70001 */ addiu $a3, $a3, 1 -/* B1C5F0 800A5450 50A00009 */ beql $a1, $zero, .L800A5478 -/* B1C5F4 800A5454 0043082A */ slt $at, $v0, $v1 -/* B1C5F8 800A5458 88CF0000 */ lwl $t7, ($a2) -/* B1C5FC 800A545C 98CF0003 */ lwr $t7, 3($a2) -/* B1C600 800A5460 AA0F0000 */ swl $t7, ($s0) -/* B1C604 800A5464 BA0F0003 */ swr $t7, 3($s0) -/* B1C608 800A5468 94CF0004 */ lhu $t7, 4($a2) -/* B1C60C 800A546C A60F0004 */ sh $t7, 4($s0) -/* B1C610 800A5470 90830000 */ lbu $v1, ($a0) -/* B1C614 800A5474 0043082A */ slt $at, $v0, $v1 -.L800A5478: -/* B1C618 800A5478 26100006 */ addiu $s0, $s0, 6 -/* B1C61C 800A547C 1420FFF1 */ bnez $at, .L800A5444 -/* B1C620 800A5480 24C60006 */ addiu $a2, $a2, 6 -/* B1C624 800A5484 8FB00004 */ lw $s0, 4($sp) -.L800A5488: -/* B1C628 800A5488 03E00008 */ jr $ra -/* B1C62C 800A548C 27BD0008 */ addiu $sp, $sp, 8 - diff --git a/asm/non_matchings/code/z_skelanime/func_800A5490.s b/asm/non_matchings/code/z_skelanime/func_800A5490.s deleted file mode 100644 index 5a92919a18..0000000000 --- a/asm/non_matchings/code/z_skelanime/func_800A5490.s +++ /dev/null @@ -1,32 +0,0 @@ -glabel func_800A5490 -/* B1C630 800A5490 27BDFFF8 */ addiu $sp, $sp, -8 -/* B1C634 800A5494 AFB00004 */ sw $s0, 4($sp) -/* B1C638 800A5498 90830000 */ lbu $v1, ($a0) -/* B1C63C 800A549C 00A08025 */ move $s0, $a1 -/* B1C640 800A54A0 00001025 */ move $v0, $zero -/* B1C644 800A54A4 58600013 */ blezl $v1, .L800A54F4 -/* B1C648 800A54A8 8FB00004 */ lw $s0, 4($sp) -.L800A54AC: -/* B1C64C 800A54AC 90E50000 */ lbu $a1, ($a3) -/* B1C650 800A54B0 24420001 */ addiu $v0, $v0, 1 -/* B1C654 800A54B4 24E70001 */ addiu $a3, $a3, 1 -/* B1C658 800A54B8 2CA50001 */ sltiu $a1, $a1, 1 -/* B1C65C 800A54BC 50A00009 */ beql $a1, $zero, .L800A54E4 -/* B1C660 800A54C0 0043082A */ slt $at, $v0, $v1 -/* B1C664 800A54C4 88CF0000 */ lwl $t7, ($a2) -/* B1C668 800A54C8 98CF0003 */ lwr $t7, 3($a2) -/* B1C66C 800A54CC AA0F0000 */ swl $t7, ($s0) -/* B1C670 800A54D0 BA0F0003 */ swr $t7, 3($s0) -/* B1C674 800A54D4 94CF0004 */ lhu $t7, 4($a2) -/* B1C678 800A54D8 A60F0004 */ sh $t7, 4($s0) -/* B1C67C 800A54DC 90830000 */ lbu $v1, ($a0) -/* B1C680 800A54E0 0043082A */ slt $at, $v0, $v1 -.L800A54E4: -/* B1C684 800A54E4 26100006 */ addiu $s0, $s0, 6 -/* B1C688 800A54E8 1420FFF0 */ bnez $at, .L800A54AC -/* B1C68C 800A54EC 24C60006 */ addiu $a2, $a2, 6 -/* B1C690 800A54F0 8FB00004 */ lw $s0, 4($sp) -.L800A54F4: -/* B1C694 800A54F4 03E00008 */ jr $ra -/* B1C698 800A54F8 27BD0008 */ addiu $sp, $sp, 8 - diff --git a/asm/non_matchings/code/z_skelanime/func_800A54FC.s b/asm/non_matchings/code/z_skelanime/func_800A54FC.s deleted file mode 100644 index 2f6b917efe..0000000000 --- a/asm/non_matchings/code/z_skelanime/func_800A54FC.s +++ /dev/null @@ -1,123 +0,0 @@ -glabel func_800A54FC -/* B1C69C 800A54FC 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* B1C6A0 800A5500 AFBF0034 */ sw $ra, 0x34($sp) -/* B1C6A4 800A5504 AFB10030 */ sw $s1, 0x30($sp) -/* B1C6A8 800A5508 AFB0002C */ sw $s0, 0x2c($sp) -/* B1C6AC 800A550C F7B80020 */ sdc1 $f24, 0x20($sp) -/* B1C6B0 800A5510 F7B60018 */ sdc1 $f22, 0x18($sp) -/* B1C6B4 800A5514 F7B40010 */ sdc1 $f20, 0x10($sp) -/* B1C6B8 800A5518 AFA60040 */ sw $a2, 0x40($sp) -/* B1C6BC 800A551C 908E0035 */ lbu $t6, 0x35($a0) -/* B1C6C0 800A5520 00808025 */ move $s0, $a0 -/* B1C6C4 800A5524 00A08825 */ move $s1, $a1 -/* B1C6C8 800A5528 31CF0010 */ andi $t7, $t6, 0x10 -/* B1C6CC 800A552C 51E00007 */ beql $t7, $zero, .L800A554C -/* B1C6D0 800A5530 8E020020 */ lw $v0, 0x20($s0) -/* B1C6D4 800A5534 44800000 */ mtc1 $zero, $f0 -/* B1C6D8 800A5538 00000000 */ nop -/* B1C6DC 800A553C E4A00008 */ swc1 $f0, 8($a1) -/* B1C6E0 800A5540 10000030 */ b .L800A5604 -/* B1C6E4 800A5544 E4A00000 */ swc1 $f0, ($a1) -/* B1C6E8 800A5548 8E020020 */ lw $v0, 0x20($s0) -.L800A554C: -/* B1C6EC 800A554C 87A40042 */ lh $a0, 0x42($sp) -/* B1C6F0 800A5550 84580000 */ lh $t8, ($v0) -/* B1C6F4 800A5554 84590004 */ lh $t9, 4($v0) -/* B1C6F8 800A5558 44982000 */ mtc1 $t8, $f4 -/* B1C6FC 800A555C 44993000 */ mtc1 $t9, $f6 -/* B1C700 800A5560 46802520 */ cvt.s.w $f20, $f4 -/* B1C704 800A5564 0C01DE1C */ jal Math_Sins -/* B1C708 800A5568 468035A0 */ cvt.s.w $f22, $f6 -/* B1C70C 800A556C 46000606 */ mov.s $f24, $f0 -/* B1C710 800A5570 0C01DE0D */ jal Math_Coss -/* B1C714 800A5574 87A40042 */ lh $a0, 0x42($sp) -/* B1C718 800A5578 4600A202 */ mul.s $f8, $f20, $f0 -/* B1C71C 800A557C 00000000 */ nop -/* B1C720 800A5580 4618B282 */ mul.s $f10, $f22, $f24 -/* B1C724 800A5584 00000000 */ nop -/* B1C728 800A5588 4600B482 */ mul.s $f18, $f22, $f0 -/* B1C72C 800A558C 00000000 */ nop -/* B1C730 800A5590 4618A102 */ mul.s $f4, $f20, $f24 -/* B1C734 800A5594 460A4400 */ add.s $f16, $f8, $f10 -/* B1C738 800A5598 E6300000 */ swc1 $f16, ($s1) -/* B1C73C 800A559C 46049181 */ sub.s $f6, $f18, $f4 -/* B1C740 800A55A0 E6260008 */ swc1 $f6, 8($s1) -/* B1C744 800A55A4 86080038 */ lh $t0, 0x38($s0) -/* B1C748 800A55A8 8609003C */ lh $t1, 0x3c($s0) -/* B1C74C 800A55AC 86040036 */ lh $a0, 0x36($s0) -/* B1C750 800A55B0 44884000 */ mtc1 $t0, $f8 -/* B1C754 800A55B4 44895000 */ mtc1 $t1, $f10 -/* B1C758 800A55B8 46804520 */ cvt.s.w $f20, $f8 -/* B1C75C 800A55BC 0C01DE1C */ jal Math_Sins -/* B1C760 800A55C0 468055A0 */ cvt.s.w $f22, $f10 -/* B1C764 800A55C4 46000606 */ mov.s $f24, $f0 -/* B1C768 800A55C8 0C01DE0D */ jal Math_Coss -/* B1C76C 800A55CC 86040036 */ lh $a0, 0x36($s0) -/* B1C770 800A55D0 4600A402 */ mul.s $f16, $f20, $f0 -/* B1C774 800A55D4 C6260000 */ lwc1 $f6, ($s1) -/* B1C778 800A55D8 4618B482 */ mul.s $f18, $f22, $f24 -/* B1C77C 800A55DC 46128100 */ add.s $f4, $f16, $f18 -/* B1C780 800A55E0 4600B282 */ mul.s $f10, $f22, $f0 -/* B1C784 800A55E4 44800000 */ mtc1 $zero, $f0 -/* B1C788 800A55E8 4618A402 */ mul.s $f16, $f20, $f24 -/* B1C78C 800A55EC 46043201 */ sub.s $f8, $f6, $f4 -/* B1C790 800A55F0 C6260008 */ lwc1 $f6, 8($s1) -/* B1C794 800A55F4 E6280000 */ swc1 $f8, ($s1) -/* B1C798 800A55F8 46105481 */ sub.s $f18, $f10, $f16 -/* B1C79C 800A55FC 46123101 */ sub.s $f4, $f6, $f18 -/* B1C7A0 800A5600 E6240008 */ swc1 $f4, 8($s1) -.L800A5604: -/* B1C7A4 800A5604 87AA0042 */ lh $t2, 0x42($sp) -/* B1C7A8 800A5608 8E020020 */ lw $v0, 0x20($s0) -/* B1C7AC 800A560C 860C003E */ lh $t4, 0x3e($s0) -/* B1C7B0 800A5610 A60A0036 */ sh $t2, 0x36($s0) -/* B1C7B4 800A5614 844B0000 */ lh $t3, ($v0) -/* B1C7B8 800A5618 A60B0038 */ sh $t3, 0x38($s0) -/* B1C7BC 800A561C A44C0000 */ sh $t4, ($v0) -/* B1C7C0 800A5620 8E020020 */ lw $v0, 0x20($s0) -/* B1C7C4 800A5624 860E0042 */ lh $t6, 0x42($s0) -/* B1C7C8 800A5628 844D0004 */ lh $t5, 4($v0) -/* B1C7CC 800A562C A60D003C */ sh $t5, 0x3c($s0) -/* B1C7D0 800A5630 A44E0004 */ sh $t6, 4($v0) -/* B1C7D4 800A5634 92030035 */ lbu $v1, 0x35($s0) -/* B1C7D8 800A5638 306F0002 */ andi $t7, $v1, 2 -/* B1C7DC 800A563C 11E00013 */ beqz $t7, .L800A568C -/* B1C7E0 800A5640 30780010 */ andi $t8, $v1, 0x10 -/* B1C7E4 800A5644 53000004 */ beql $t8, $zero, .L800A5658 -/* B1C7E8 800A5648 8E190020 */ lw $t9, 0x20($s0) -/* B1C7EC 800A564C 10000009 */ b .L800A5674 -/* B1C7F0 800A5650 E6200004 */ swc1 $f0, 4($s1) -/* B1C7F4 800A5654 8E190020 */ lw $t9, 0x20($s0) -.L800A5658: -/* B1C7F8 800A5658 8609003A */ lh $t1, 0x3a($s0) -/* B1C7FC 800A565C 87280002 */ lh $t0, 2($t9) -/* B1C800 800A5660 01095023 */ subu $t2, $t0, $t1 -/* B1C804 800A5664 448A4000 */ mtc1 $t2, $f8 -/* B1C808 800A5668 00000000 */ nop -/* B1C80C 800A566C 468042A0 */ cvt.s.w $f10, $f8 -/* B1C810 800A5670 E62A0004 */ swc1 $f10, 4($s1) -.L800A5674: -/* B1C814 800A5674 8E020020 */ lw $v0, 0x20($s0) -/* B1C818 800A5678 860C0040 */ lh $t4, 0x40($s0) -/* B1C81C 800A567C 844B0002 */ lh $t3, 2($v0) -/* B1C820 800A5680 A60B003A */ sh $t3, 0x3a($s0) -/* B1C824 800A5684 10000005 */ b .L800A569C -/* B1C828 800A5688 A44C0002 */ sh $t4, 2($v0) -.L800A568C: -/* B1C82C 800A568C E6200004 */ swc1 $f0, 4($s1) -/* B1C830 800A5690 8E0D0020 */ lw $t5, 0x20($s0) -/* B1C834 800A5694 85AE0002 */ lh $t6, 2($t5) -/* B1C838 800A5698 A60E003A */ sh $t6, 0x3a($s0) -.L800A569C: -/* B1C83C 800A569C 920F0035 */ lbu $t7, 0x35($s0) -/* B1C840 800A56A0 31F8FFEF */ andi $t8, $t7, 0xffef -/* B1C844 800A56A4 A2180035 */ sb $t8, 0x35($s0) -/* B1C848 800A56A8 8FBF0034 */ lw $ra, 0x34($sp) -/* B1C84C 800A56AC 8FB10030 */ lw $s1, 0x30($sp) -/* B1C850 800A56B0 8FB0002C */ lw $s0, 0x2c($sp) -/* B1C854 800A56B4 D7B80020 */ ldc1 $f24, 0x20($sp) -/* B1C858 800A56B8 D7B60018 */ ldc1 $f22, 0x18($sp) -/* B1C85C 800A56BC D7B40010 */ ldc1 $f20, 0x10($sp) -/* B1C860 800A56C0 03E00008 */ jr $ra -/* B1C864 800A56C4 27BD0038 */ addiu $sp, $sp, 0x38 - diff --git a/asm/non_matchings/code/z_skelanime/func_800A56C8.s b/asm/non_matchings/code/z_skelanime/func_800A56C8.s deleted file mode 100644 index 17dcc3c703..0000000000 --- a/asm/non_matchings/code/z_skelanime/func_800A56C8.s +++ /dev/null @@ -1,12 +0,0 @@ -glabel func_800A56C8 -/* B1C868 800A56C8 44856000 */ mtc1 $a1, $f12 -/* B1C86C 800A56CC 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* B1C870 800A56D0 AFBF0014 */ sw $ra, 0x14($sp) -/* B1C874 800A56D4 44056000 */ mfc1 $a1, $f12 -/* B1C878 800A56D8 0C02911E */ jal func_800A4478 -/* B1C87C 800A56DC 3C063F80 */ lui $a2, 0x3f80 -/* B1C880 800A56E0 8FBF0014 */ lw $ra, 0x14($sp) -/* B1C884 800A56E4 27BD0018 */ addiu $sp, $sp, 0x18 -/* B1C888 800A56E8 03E00008 */ jr $ra -/* B1C88C 800A56EC 00000000 */ nop - diff --git a/asm/non_matchings/code/z_skelanime/func_800A56F0.s b/asm/non_matchings/code/z_skelanime/func_800A56F0.s deleted file mode 100644 index e52bacbae7..0000000000 --- a/asm/non_matchings/code/z_skelanime/func_800A56F0.s +++ /dev/null @@ -1,59 +0,0 @@ -.rdata -glabel D_80140608 - .asciz "../z_skelanime.c" - .balign 4 - -glabel D_8014061C - .asciz "now_joint あきまへん！！\n" - # EUC-JP: あきまへん！！ | 'Akimane!!'? - .balign 4 - -glabel D_80140638 - .asciz "../z_skelanime.c" - .balign 4 - -glabel D_8014064C - .asciz "morf_joint あきまへん！！\n" - # EUC-JP: あきまへん！！ | 'Akimane!!'? - .balign 4 - -.text -glabel func_800A56F0 -/* B1C890 800A56F0 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* B1C894 800A56F4 AFBF0014 */ sw $ra, 0x14($sp) -/* B1C898 800A56F8 AFA40018 */ sw $a0, 0x18($sp) -/* B1C89C 800A56FC AFA5001C */ sw $a1, 0x1c($sp) -/* B1C8A0 800A5700 8C870020 */ lw $a3, 0x20($a0) -/* B1C8A4 800A5704 3C058014 */ lui $a1, %hi(D_80140608) # $a1, 0x8014 -/* B1C8A8 800A5708 24A50608 */ addiu $a1, %lo(D_80140608) # addiu $a1, $a1, 0x608 -/* B1C8AC 800A570C 10E00006 */ beqz $a3, .L800A5728 -/* B1C8B0 800A5710 3C048014 */ lui $a0, %hi(D_8014061C) # $a0, 0x8014 -/* B1C8B4 800A5714 00E02025 */ move $a0, $a3 -/* B1C8B8 800A5718 0C01EC35 */ jal ZeldaArena_FreeDebug -/* B1C8BC 800A571C 24060E91 */ li $a2, 3729 -/* B1C8C0 800A5720 10000004 */ b .L800A5734 -/* B1C8C4 800A5724 8FAF0018 */ lw $t7, 0x18($sp) -.L800A5728: -/* B1C8C8 800A5728 0C00084C */ jal osSyncPrintf -/* B1C8CC 800A572C 2484061C */ addiu $a0, %lo(D_8014061C) # addiu $a0, $a0, 0x61c -/* B1C8D0 800A5730 8FAF0018 */ lw $t7, 0x18($sp) -.L800A5734: -/* B1C8D4 800A5734 3C058014 */ lui $a1, %hi(D_80140638) # $a1, 0x8014 -/* B1C8D8 800A5738 24A50638 */ addiu $a1, %lo(D_80140638) # addiu $a1, $a1, 0x638 -/* B1C8DC 800A573C 8DE40024 */ lw $a0, 0x24($t7) -/* B1C8E0 800A5740 10800005 */ beqz $a0, .L800A5758 -/* B1C8E4 800A5744 00000000 */ nop -/* B1C8E8 800A5748 0C01EC35 */ jal ZeldaArena_FreeDebug -/* B1C8EC 800A574C 24060E93 */ li $a2, 3731 -/* B1C8F0 800A5750 10000005 */ b .L800A5768 -/* B1C8F4 800A5754 8FBF0014 */ lw $ra, 0x14($sp) -.L800A5758: -/* B1C8F8 800A5758 3C048014 */ lui $a0, %hi(D_8014064C) # $a0, 0x8014 -/* B1C8FC 800A575C 0C00084C */ jal osSyncPrintf -/* B1C900 800A5760 2484064C */ addiu $a0, %lo(D_8014064C) # addiu $a0, $a0, 0x64c -/* B1C904 800A5764 8FBF0014 */ lw $ra, 0x14($sp) -.L800A5768: -/* B1C908 800A5768 27BD0018 */ addiu $sp, $sp, 0x18 -/* B1C90C 800A576C 03E00008 */ jr $ra -/* B1C910 800A5770 00000000 */ nop - diff --git a/asm/non_matchings/code/z_skelanime/func_800A5774.s b/asm/non_matchings/code/z_skelanime/func_800A5774.s deleted file mode 100644 index 2316cd30e7..0000000000 --- a/asm/non_matchings/code/z_skelanime/func_800A5774.s +++ /dev/null @@ -1,22 +0,0 @@ -glabel func_800A5774 -/* B1C914 800A5774 908E0000 */ lbu $t6, ($a0) -/* B1C918 800A5778 00001025 */ move $v0, $zero -/* B1C91C 800A577C 19C0000E */ blez $t6, .L800A57B8 -/* B1C920 800A5780 00000000 */ nop -/* B1C924 800A5784 88D80000 */ lwl $t8, ($a2) -.L800A5788: -/* B1C928 800A5788 98D80003 */ lwr $t8, 3($a2) -/* B1C92C 800A578C 24420001 */ addiu $v0, $v0, 1 -/* B1C930 800A5790 24A50006 */ addiu $a1, $a1, 6 -/* B1C934 800A5794 A8B8FFFA */ swl $t8, -6($a1) -/* B1C938 800A5798 B8B8FFFD */ swr $t8, -3($a1) -/* B1C93C 800A579C 94D80004 */ lhu $t8, 4($a2) -/* B1C940 800A57A0 24C60006 */ addiu $a2, $a2, 6 -/* B1C944 800A57A4 A4B8FFFE */ sh $t8, -2($a1) -/* B1C948 800A57A8 90990000 */ lbu $t9, ($a0) -/* B1C94C 800A57AC 0059082A */ slt $at, $v0, $t9 -/* B1C950 800A57B0 5420FFF5 */ bnezl $at, .L800A5788 -/* B1C954 800A57B4 88D80000 */ lwl $t8, ($a2) -.L800A57B8: -/* B1C958 800A57B8 03E00008 */ jr $ra -/* B1C95C 800A57BC 00000000 */ nop diff --git a/asm/non_matchings/code/z_skin/func_800A598C.s b/asm/non_matchings/code/z_skin/func_800A598C.s index 2c561b7a29..426db7cc80 100644 --- a/asm/non_matchings/code/z_skin/func_800A598C.s +++ b/asm/non_matchings/code/z_skin/func_800A598C.s @@ -38,7 +38,7 @@ glabel func_800A598C /* B1CB84 800A59E4 24C60680 */ addiu $a2, %lo(D_80140680) # addiu $a2, $a2, 0x680 /* B1CB88 800A59E8 240700FE */ li $a3, 254 /* B1CB8C 800A59EC 8FA50118 */ lw $a1, 0x118($sp) -/* B1CB90 800A59F0 0C031AB1 */ jal func_800C6AC4 +/* B1CB90 800A59F0 0C031AB1 */ jal Graph_OpenDisps /* B1CB94 800A59F4 27A400B8 */ addiu $a0, $sp, 0xb8 /* B1CB98 800A59F8 8E0E0000 */ lw $t6, ($s0) /* B1CB9C 800A59FC 3C0A8016 */ lui $t2, %hi(gSegments) # $t2, 0x8016 @@ -297,7 +297,7 @@ glabel func_800A598C /* B1CF70 800A5DD0 A1B80000 */ sb $t8, ($t5) /* B1CF74 800A5DD4 A1A00000 */ sb $zero, ($t5) .L800A5DD8: -/* B1CF78 800A5DD8 0C031AD5 */ jal func_800C6B54 +/* B1CF78 800A5DD8 0C031AD5 */ jal Graph_CloseDisps /* B1CF7C 800A5DDC 24070158 */ li $a3, 344 /* B1CF80 800A5DE0 8FBF0074 */ lw $ra, 0x74($sp) /* B1CF84 800A5DE4 D7B40020 */ ldc1 $f20, 0x20($sp) diff --git a/asm/non_matchings/code/z_skin/func_800A5E28.s b/asm/non_matchings/code/z_skin/func_800A5E28.s index ed6a2cde3b..3656c6933d 100644 --- a/asm/non_matchings/code/z_skin/func_800A5E28.s +++ b/asm/non_matchings/code/z_skin/func_800A5E28.s @@ -20,7 +20,7 @@ glabel func_800A5E28 /* B1CFE8 800A5E48 24C60698 */ addiu $a2, %lo(D_80140698) # addiu $a2, $a2, 0x698 /* B1CFEC 800A5E4C 2407016C */ li $a3, 364 /* B1CFF0 800A5E50 02002825 */ move $a1, $s0 -/* B1CFF4 800A5E54 0C031AB1 */ jal func_800C6AC4 +/* B1CFF4 800A5E54 0C031AB1 */ jal Graph_OpenDisps /* B1CFF8 800A5E58 27A4002C */ addiu $a0, $sp, 0x2c /* B1CFFC 800A5E5C 8FAE004C */ lw $t6, 0x4c($sp) /* B1D000 800A5E60 3C068016 */ lui $a2, %hi(gSegments) # $a2, 0x8016 @@ -81,7 +81,7 @@ glabel func_800A5E28 /* B1D0D8 800A5F38 27A4002C */ addiu $a0, $sp, 0x2c /* B1D0DC 800A5F3C 02002825 */ move $a1, $s0 /* B1D0E0 800A5F40 24070179 */ li $a3, 377 -/* B1D0E4 800A5F44 0C031AD5 */ jal func_800C6B54 +/* B1D0E4 800A5F44 0C031AD5 */ jal Graph_CloseDisps /* B1D0E8 800A5F48 AC6D0004 */ sw $t5, 4($v1) /* B1D0EC 800A5F4C 8FBF001C */ lw $ra, 0x1c($sp) /* B1D0F0 800A5F50 8FB00018 */ lw $s0, 0x18($sp) diff --git a/asm/non_matchings/code/z_skin/func_800A5F60.s b/asm/non_matchings/code/z_skin/func_800A5F60.s index 4debffede1..91d3c6f58d 100644 --- a/asm/non_matchings/code/z_skin/func_800A5F60.s +++ b/asm/non_matchings/code/z_skin/func_800A5F60.s @@ -22,7 +22,7 @@ glabel func_800A5F60 /* B1D128 800A5F88 AFA80054 */ sw $t0, 0x54($sp) /* B1D12C 800A5F8C 2407018B */ li $a3, 395 /* B1D130 800A5F90 02002825 */ move $a1, $s0 -/* B1D134 800A5F94 0C031AB1 */ jal func_800C6AC4 +/* B1D134 800A5F94 0C031AB1 */ jal Graph_OpenDisps /* B1D138 800A5F98 27A40038 */ addiu $a0, $sp, 0x38 /* B1D13C 800A5F9C 8FAE005C */ lw $t6, 0x5c($sp) /* B1D140 800A5FA0 3C048016 */ lui $a0, %hi(gSegments) # $a0, 0x8016 @@ -98,7 +98,7 @@ glabel func_800A5F60 /* B1D250 800A60B0 24C606BC */ addiu $a2, %lo(D_801406BC) # addiu $a2, $a2, 0x6bc /* B1D254 800A60B4 27A40038 */ addiu $a0, $sp, 0x38 /* B1D258 800A60B8 02002825 */ move $a1, $s0 -/* B1D25C 800A60BC 0C031AD5 */ jal func_800C6B54 +/* B1D25C 800A60BC 0C031AD5 */ jal Graph_CloseDisps /* B1D260 800A60C0 240701B1 */ li $a3, 433 /* B1D264 800A60C4 8FBF001C */ lw $ra, 0x1c($sp) /* B1D268 800A60C8 8FB00018 */ lw $s0, 0x18($sp) diff --git a/asm/non_matchings/code/z_skin/func_800A60D8.s b/asm/non_matchings/code/z_skin/func_800A60D8.s index 84adcf6aea..434dd796fb 100644 --- a/asm/non_matchings/code/z_skin/func_800A60D8.s +++ b/asm/non_matchings/code/z_skin/func_800A60D8.s @@ -29,7 +29,7 @@ glabel func_800A60D8 /* B1D2BC 800A611C 24C606C8 */ addiu $a2, %lo(D_801406C8) # addiu $a2, $a2, 0x6c8 /* B1D2C0 800A6120 240701D7 */ li $a3, 471 /* B1D2C4 800A6124 27A40060 */ addiu $a0, $sp, 0x60 -/* B1D2C8 800A6128 0C031AB1 */ jal func_800C6AC4 +/* B1D2C8 800A6128 0C031AB1 */ jal Graph_OpenDisps /* B1D2CC 800A612C 02A02825 */ move $a1, $s5 /* B1D2D0 800A6130 8FB600A4 */ lw $s6, 0xa4($sp) /* B1D2D4 800A6134 3C058016 */ lui $a1, %hi(D_801600C0) # $a1, 0x8016 @@ -154,7 +154,7 @@ glabel func_800A60D8 /* B1D48C 800A62EC 24C606D4 */ addiu $a2, %lo(D_801406D4) # addiu $a2, $a2, 0x6d4 /* B1D490 800A62F0 27A40060 */ addiu $a0, $sp, 0x60 /* B1D494 800A62F4 02A02825 */ move $a1, $s5 -/* B1D498 800A62F8 0C031AD5 */ jal func_800C6B54 +/* B1D498 800A62F8 0C031AD5 */ jal Graph_CloseDisps /* B1D49C 800A62FC 24070216 */ li $a3, 534 /* B1D4A0 800A6300 8FBF0044 */ lw $ra, 0x44($sp) /* B1D4A4 800A6304 8FB00020 */ lw $s0, 0x20($sp) diff --git a/asm/non_matchings/code/z_skin_awb/func_800A663C.s b/asm/non_matchings/code/z_skin_awb/func_800A663C.s index 3b24472695..154816ca35 100644 --- a/asm/non_matchings/code/z_skin_awb/func_800A663C.s +++ b/asm/non_matchings/code/z_skin_awb/func_800A663C.s @@ -178,7 +178,7 @@ glabel func_800A663C /* B1D9E4 800A6844 8FA40048 */ lw $a0, 0x48($sp) /* B1D9E8 800A6848 26A5004C */ addiu $a1, $s5, 0x4c /* B1D9EC 800A684C 8FA60050 */ lw $a2, 0x50($sp) -/* B1D9F0 800A6850 0C02921F */ jal func_800A487C +/* B1D9F0 800A6850 0C02921F */ jal SkelAnime_InitSkin /* B1D9F4 800A6854 8FA70054 */ lw $a3, 0x54($sp) /* B1D9F8 800A6858 8FBF003C */ lw $ra, 0x3c($sp) /* B1D9FC 800A685C 8FB00018 */ lw $s0, 0x18($sp) diff --git a/asm/non_matchings/code/z_skin_awb/func_800A6888.s b/asm/non_matchings/code/z_skin_awb/func_800A6888.s index 5d61414c8a..b20412c9ee 100644 --- a/asm/non_matchings/code/z_skin_awb/func_800A6888.s +++ b/asm/non_matchings/code/z_skin_awb/func_800A6888.s @@ -73,7 +73,7 @@ glabel func_800A6888 /* B1DAFC 800A695C 2406011E */ li $a2, 286 .L800A6960: /* B1DB00 800A6960 2624004C */ addiu $a0, $s1, 0x4c -/* B1DB04 800A6964 0C0295BC */ jal func_800A56F0 +/* B1DB04 800A6964 0C0295BC */ jal SkelAnime_Free /* B1DB08 800A6968 8FA50030 */ lw $a1, 0x30($sp) /* B1DB0C 800A696C 8FBF002C */ lw $ra, 0x2c($sp) .L800A6970: diff --git a/asm/non_matchings/code/z_view/func_800AA550.s b/asm/non_matchings/code/z_view/func_800AA550.s index 1b421d5978..88a5f063e2 100644 --- a/asm/non_matchings/code/z_view/func_800AA550.s +++ b/asm/non_matchings/code/z_view/func_800AA550.s @@ -110,7 +110,7 @@ glabel func_800AA550 /* B217E0 800AA640 24C61110 */ addiu $a2, %lo(D_80141110) # addiu $a2, $a2, 0x1110 /* B217E4 800AA644 27A4003C */ addiu $a0, $sp, 0x3c /* B217E8 800AA648 02002825 */ move $a1, $s0 -/* B217EC 800AA64C 0C031AB1 */ jal func_800C6AC4 +/* B217EC 800AA64C 0C031AB1 */ jal Graph_OpenDisps /* B217F0 800AA650 240701CB */ li $a3, 459 /* B217F4 800AA654 8E0302C0 */ lw $v1, 0x2c0($s0) /* B217F8 800AA658 3C06E700 */ lui $a2, 0xe700 @@ -175,7 +175,7 @@ glabel func_800AA550 /* B218E4 800AA744 AC650004 */ sw $a1, 4($v1) /* B218E8 800AA748 AC640000 */ sw $a0, ($v1) /* B218EC 800AA74C 27A4003C */ addiu $a0, $sp, 0x3c -/* B218F0 800AA750 0C031AD5 */ jal func_800C6B54 +/* B218F0 800AA750 0C031AD5 */ jal Graph_CloseDisps /* B218F4 800AA754 02002825 */ move $a1, $s0 /* B218F8 800AA758 8FBF001C */ lw $ra, 0x1c($sp) /* B218FC 800AA75C 8FB00018 */ lw $s0, 0x18($sp) diff --git a/asm/non_matchings/code/z_view/func_800AAA9C.s b/asm/non_matchings/code/z_view/func_800AAA9C.s index 8fa379b248..08af43396b 100644 --- a/asm/non_matchings/code/z_view/func_800AAA9C.s +++ b/asm/non_matchings/code/z_view/func_800AAA9C.s @@ -76,7 +76,7 @@ glabel func_800AAA9C /* B21C5C 800AAABC 24C61134 */ addiu $a2, %lo(D_80141134) # addiu $a2, $a2, 0x1134 /* B21C60 800AAAC0 27A40108 */ addiu $a0, $sp, 0x108 /* B21C64 800AAAC4 24070254 */ li $a3, 596 -/* B21C68 800AAAC8 0C031AB1 */ jal func_800C6AC4 +/* B21C68 800AAAC8 0C031AB1 */ jal Graph_OpenDisps /* B21C6C 800AAACC 02402825 */ move $a1, $s2 /* B21C70 800AAAD0 02402025 */ move $a0, $s2 /* B21C74 800AAAD4 0C031A73 */ jal Graph_Alloc @@ -453,7 +453,7 @@ glabel func_800AAA9C /* B22218 800AB078 3C068014 */ lui $a2, %hi(D_801411F4) # $a2, 0x8014 /* B2221C 800AB07C AC440000 */ sw $a0, ($v0) /* B22220 800AB080 27A40108 */ addiu $a0, $sp, 0x108 -/* B22224 800AB084 0C031AD5 */ jal func_800C6B54 +/* B22224 800AB084 0C031AD5 */ jal Graph_CloseDisps /* B22228 800AB088 24C611F4 */ addiu $a2, %lo(D_801411F4) # addiu $a2, $a2, 0x11f4 /* B2222C 800AB08C 8FBF004C */ lw $ra, 0x4c($sp) /* B22230 800AB090 8FB00040 */ lw $s0, 0x40($sp) diff --git a/asm/non_matchings/code/z_view/func_800AB0A8.s b/asm/non_matchings/code/z_view/func_800AB0A8.s index 3e8a0f2f80..7ce8e60621 100644 --- a/asm/non_matchings/code/z_view/func_800AB0A8.s +++ b/asm/non_matchings/code/z_view/func_800AB0A8.s @@ -36,7 +36,7 @@ glabel func_800AB0A8 /* B22268 800AB0C8 24C61200 */ addiu $a2, %lo(D_80141200) # addiu $a2, $a2, 0x1200 /* B2226C 800AB0CC 27A40050 */ addiu $a0, $sp, 0x50 /* B22270 800AB0D0 240702D6 */ li $a3, 726 -/* B22274 800AB0D4 0C031AB1 */ jal func_800C6AC4 +/* B22274 800AB0D4 0C031AB1 */ jal Graph_OpenDisps /* B22278 800AB0D8 02002825 */ move $a1, $s0 /* B2227C 800AB0DC 02002025 */ move $a0, $s0 /* B22280 800AB0E0 0C031A73 */ jal Graph_Alloc @@ -152,7 +152,7 @@ glabel func_800AB0A8 /* B22434 800AB294 AE1902D0 */ sw $t9, 0x2d0($s0) /* B22438 800AB298 AC640000 */ sw $a0, ($v1) /* B2243C 800AB29C 27A40050 */ addiu $a0, $sp, 0x50 -/* B22440 800AB2A0 0C031AD5 */ jal func_800C6B54 +/* B22440 800AB2A0 0C031AD5 */ jal Graph_CloseDisps /* B22444 800AB2A4 AC710004 */ sw $s1, 4($v1) /* B22448 800AB2A8 8FBF0034 */ lw $ra, 0x34($sp) /* B2244C 800AB2AC 8FB00028 */ lw $s0, 0x28($sp) diff --git a/asm/non_matchings/code/z_view/func_800AB2C4.s b/asm/non_matchings/code/z_view/func_800AB2C4.s index ce239ec00d..3b5574356c 100644 --- a/asm/non_matchings/code/z_view/func_800AB2C4.s +++ b/asm/non_matchings/code/z_view/func_800AB2C4.s @@ -36,7 +36,7 @@ glabel func_800AB2C4 /* B22484 800AB2E4 24C61240 */ addiu $a2, %lo(D_80141240) # addiu $a2, $a2, 0x1240 /* B22488 800AB2E8 27A40050 */ addiu $a0, $sp, 0x50 /* B2248C 800AB2EC 24070309 */ li $a3, 777 -/* B22490 800AB2F0 0C031AB1 */ jal func_800C6AC4 +/* B22490 800AB2F0 0C031AB1 */ jal Graph_OpenDisps /* B22494 800AB2F4 02002825 */ move $a1, $s0 /* B22498 800AB2F8 02002025 */ move $a0, $s0 /* B2249C 800AB2FC 0C031A73 */ jal Graph_Alloc @@ -184,7 +184,7 @@ glabel func_800AB2C4 /* B226D0 800AB530 02002825 */ move $a1, $s0 /* B226D4 800AB534 24070321 */ li $a3, 801 /* B226D8 800AB538 AC510004 */ sw $s1, 4($v0) -/* B226DC 800AB53C 0C031AD5 */ jal func_800C6B54 +/* B226DC 800AB53C 0C031AD5 */ jal Graph_CloseDisps /* B226E0 800AB540 AC4A0000 */ sw $t2, ($v0) /* B226E4 800AB544 8FBF0034 */ lw $ra, 0x34($sp) /* B226E8 800AB548 8FB00028 */ lw $s0, 0x28($sp) diff --git a/asm/non_matchings/code/z_view/func_800AB560.s b/asm/non_matchings/code/z_view/func_800AB560.s index 80e6dd3aeb..445bb178dc 100644 --- a/asm/non_matchings/code/z_view/func_800AB560.s +++ b/asm/non_matchings/code/z_view/func_800AB560.s @@ -43,7 +43,7 @@ glabel func_800AB560 /* B2271C 800AB57C 24C61280 */ addiu $a2, %lo(D_80141280) # addiu $a2, $a2, 0x1280 /* B22720 800AB580 27A40060 */ addiu $a0, $sp, 0x60 /* B22724 800AB584 24070330 */ li $a3, 816 -/* B22728 800AB588 0C031AB1 */ jal func_800C6AC4 +/* B22728 800AB588 0C031AB1 */ jal Graph_OpenDisps /* B2272C 800AB58C 02202825 */ move $a1, $s1 /* B22730 800AB590 02202025 */ move $a0, $s1 /* B22734 800AB594 0C031A73 */ jal Graph_Alloc @@ -277,7 +277,7 @@ glabel func_800AB560 /* B22AB8 800AB918 AC440004 */ sw $a0, 4($v0) /* B22ABC 800AB91C 27A40060 */ addiu $a0, $sp, 0x60 /* B22AC0 800AB920 24070367 */ li $a3, 871 -/* B22AC4 800AB924 0C031AD5 */ jal func_800C6B54 +/* B22AC4 800AB924 0C031AD5 */ jal Graph_CloseDisps /* B22AC8 800AB928 AC4D0000 */ sw $t5, ($v0) /* B22ACC 800AB92C 8FBF0034 */ lw $ra, 0x34($sp) /* B22AD0 800AB930 8FB0002C */ lw $s0, 0x2c($sp) diff --git a/asm/non_matchings/code/z_view/func_800AB944.s b/asm/non_matchings/code/z_view/func_800AB944.s index b591def69b..0be78263ca 100644 --- a/asm/non_matchings/code/z_view/func_800AB944.s +++ b/asm/non_matchings/code/z_view/func_800AB944.s @@ -17,7 +17,7 @@ glabel func_800AB944 /* B22AF8 800AB958 24C612D4 */ addiu $a2, %lo(D_801412D4) # addiu $a2, $a2, 0x12d4 /* B22AFC 800AB95C 8E050004 */ lw $a1, 4($s0) /* B22B00 800AB960 27A4003C */ addiu $a0, $sp, 0x3c -/* B22B04 800AB964 0C031AB1 */ jal func_800C6AC4 +/* B22B04 800AB964 0C031AB1 */ jal Graph_OpenDisps /* B22B08 800AB968 2407036E */ li $a3, 878 /* B22B0C 800AB96C C60C0028 */ lwc1 $f12, 0x28($s0) /* B22B10 800AB970 C60E002C */ lwc1 $f14, 0x2c($s0) @@ -44,7 +44,7 @@ glabel func_800AB944 /* B22B64 800AB9C4 24C612E0 */ addiu $a2, %lo(D_801412E0) # addiu $a2, $a2, 0x12e0 /* B22B68 800AB9C8 27A4003C */ addiu $a0, $sp, 0x3c /* B22B6C 800AB9CC 8E050004 */ lw $a1, 4($s0) -/* B22B70 800AB9D0 0C031AD5 */ jal func_800C6B54 +/* B22B70 800AB9D0 0C031AD5 */ jal Graph_CloseDisps /* B22B74 800AB9D4 24070376 */ li $a3, 886 /* B22B78 800AB9D8 8FBF0034 */ lw $ra, 0x34($sp) /* B22B7C 800AB9DC 8FB00030 */ lw $s0, 0x30($sp) diff --git a/asm/non_matchings/code/z_vismono/func_800AD5C0.s b/asm/non_matchings/code/z_vismono/func_800AD5C0.s index 18133011e6..153daad0a5 100644 --- a/asm/non_matchings/code/z_vismono/func_800AD5C0.s +++ b/asm/non_matchings/code/z_vismono/func_800AD5C0.s @@ -54,7 +54,7 @@ glabel func_800AD5C0 /* B24788 800AD5E8 10000007 */ b .L800AD608 /* B2478C 800AD5EC AFA20058 */ sw $v0, 0x58($sp) .L800AD5F0: -/* B24790 800AD5F0 0C031B0F */ jal func_800C6C3C +/* B24790 800AD5F0 0C031B0F */ jal Graph_DlistAlloc /* B24794 800AD5F4 24050200 */ li $a1, 512 /* B24798 800AD5F8 AFA20058 */ sw $v0, 0x58($sp) /* B2479C 800AD5FC 8FA40060 */ lw $a0, 0x60($sp) @@ -69,7 +69,7 @@ glabel func_800AD5C0 /* B247BC 800AD61C 10000037 */ b .L800AD6FC /* B247C0 800AD620 AFA20054 */ sw $v0, 0x54($sp) .L800AD624: -/* B247C4 800AD624 0C031B0F */ jal func_800C6C3C +/* B247C4 800AD624 0C031B0F */ jal Graph_DlistAlloc /* B247C8 800AD628 24052338 */ li $a1, 9016 /* B247CC 800AD62C AFA20054 */ sw $v0, 0x54($sp) /* B247D0 800AD630 8FA40060 */ lw $a0, 0x60($sp) diff --git a/asm/non_matchings/code/z_vr_box_draw/func_800B10C4.s b/asm/non_matchings/code/z_vr_box_draw/func_800B10C4.s index b763944ee9..1ba4f04a41 100644 --- a/asm/non_matchings/code/z_vr_box_draw/func_800B10C4.s +++ b/asm/non_matchings/code/z_vr_box_draw/func_800B10C4.s @@ -23,7 +23,7 @@ glabel func_800B10C4 /* B28280 800B10E0 00A08025 */ move $s0, $a1 /* B28284 800B10E4 24C62E94 */ addiu $a2, %lo(D_80142E94) # addiu $a2, $a2, 0x2e94 /* B28288 800B10E8 24070034 */ li $a3, 52 -/* B2828C 800B10EC 0C031AB1 */ jal func_800C6AC4 +/* B2828C 800B10EC 0C031AB1 */ jal Graph_OpenDisps /* B28290 800B10F0 27A400F4 */ addiu $a0, $sp, 0xf4 /* B28294 800B10F4 0C025168 */ jal func_800945A0 /* B28298 800B10F8 02002025 */ move $a0, $s0 @@ -426,7 +426,7 @@ glabel func_800B10C4 /* B288BC 800B171C 02002825 */ move $a1, $s0 /* B288C0 800B1720 27A400F4 */ addiu $a0, $sp, 0xf4 /* B288C4 800B1724 2407007D */ li $a3, 125 -/* B288C8 800B1728 0C031AD5 */ jal func_800C6B54 +/* B288C8 800B1728 0C031AD5 */ jal Graph_CloseDisps /* B288CC 800B172C AC400004 */ sw $zero, 4($v0) /* B288D0 800B1730 8FBF001C */ lw $ra, 0x1c($sp) /* B288D4 800B1734 8FB00018 */ lw $s0, 0x18($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Arms_Hook/ArmsHook_Draw.s b/asm/non_matchings/overlays/actors/ovl_Arms_Hook/ArmsHook_Draw.s index deb1d4ec56..dc9c29e734 100644 --- a/asm/non_matchings/overlays/actors/ovl_Arms_Hook/ArmsHook_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Arms_Hook/ArmsHook_Draw.s @@ -17,7 +17,7 @@ glabel ArmsHook_Draw /* 0096C 8086586C AFA20084 */ sw $v0, 0x0084($sp) /* 00970 80865870 24C65BC0 */ addiu $a2, $a2, %lo(D_80865BC0) ## $a2 = 80865BC0 /* 00974 80865874 24070352 */ addiu $a3, $zero, 0x0352 ## $a3 = 00000352 -/* 00978 80865878 0C031AB1 */ jal func_800C6AC4 +/* 00978 80865878 0C031AB1 */ jal Graph_OpenDisps /* 0097C 8086587C AFA50054 */ sw $a1, 0x0054($sp) /* 00980 80865880 8E190214 */ lw $t9, 0x0214($s0) ## 00000214 /* 00984 80865884 3C088086 */ lui $t0, %hi(func_8086518C) ## $t0 = 80860000 @@ -110,14 +110,14 @@ glabel ArmsHook_Draw /* 00AD0 808659D0 46062080 */ add.s $f2, $f4, $f6 /* 00AD4 808659D4 46001004 */ sqrt.s $f0, $f2 /* 00AD8 808659D8 E7A20058 */ swc1 $f2, 0x0058($sp) -/* 00ADC 808659DC 0C03F494 */ jal func_800FD250 +/* 00ADC 808659DC 0C03F494 */ jal Math_atan2f /* 00AE0 808659E0 E7A0005C */ swc1 $f0, 0x005C($sp) /* 00AE4 808659E4 46000306 */ mov.s $f12, $f0 /* 00AE8 808659E8 0C034348 */ jal Matrix_RotateY /* 00AEC 808659EC 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 /* 00AF0 808659F0 C7A2007C */ lwc1 $f2, 0x007C($sp) /* 00AF4 808659F4 C7AE005C */ lwc1 $f14, 0x005C($sp) -/* 00AF8 808659F8 0C03F494 */ jal func_800FD250 +/* 00AF8 808659F8 0C03F494 */ jal Math_atan2f /* 00AFC 808659FC 46001307 */ neg.s $f12, $f2 /* 00B00 80865A00 46000306 */ mov.s $f12, $f0 /* 00B04 80865A04 0C0342DC */ jal Matrix_RotateX @@ -166,7 +166,7 @@ glabel ArmsHook_Draw /* 00BB0 80865AB0 24C65BFC */ addiu $a2, $a2, %lo(D_80865BFC) ## $a2 = 80865BFC /* 00BB4 80865AB4 27A40044 */ addiu $a0, $sp, 0x0044 ## $a0 = FFFFFFB4 /* 00BB8 80865AB8 24070391 */ addiu $a3, $zero, 0x0391 ## $a3 = 00000391 -/* 00BBC 80865ABC 0C031AD5 */ jal func_800C6B54 +/* 00BBC 80865ABC 0C031AD5 */ jal Graph_CloseDisps /* 00BC0 80865AC0 8F050000 */ lw $a1, 0x0000($t8) ## 00000000 .L80865AC4: /* 00BC4 80865AC4 8FBF0024 */ lw $ra, 0x0024($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Arrow_Fire/ArrowFire_Destroy.s b/asm/non_matchings/overlays/actors/ovl_Arrow_Fire/ArrowFire_Destroy.s deleted file mode 100644 index 3f47789010..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Arrow_Fire/ArrowFire_Destroy.s +++ /dev/null @@ -1,23 +0,0 @@ -glabel ArrowFire_Destroy -/* 00080 80865D90 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00084 80865D94 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00088 80865D98 AFA40018 */ sw $a0, 0x0018($sp) -/* 0008C 80865D9C 0C021DB2 */ jal func_800876C8 -/* 00090 80865DA0 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 00094 80865DA4 3C048086 */ lui $a0, %hi(D_80867B30) ## $a0 = 80860000 -/* 00098 80865DA8 24847B30 */ addiu $a0, $a0, %lo(D_80867B30) ## $a0 = 80867B30 -/* 0009C 80865DAC 0C000B84 */ jal LogUtils_LogThreadId - -/* 000A0 80865DB0 240501A5 */ addiu $a1, $zero, 0x01A5 ## $a1 = 000001A5 -/* 000A4 80865DB4 3C048086 */ lui $a0, %hi(D_80867B44) ## $a0 = 80860000 -/* 000A8 80865DB8 3C058086 */ lui $a1, %hi(D_80867B54) ## $a1 = 80860000 -/* 000AC 80865DBC 24A57B54 */ addiu $a1, $a1, %lo(D_80867B54) ## $a1 = 80867B54 -/* 000B0 80865DC0 0C00084C */ jal osSyncPrintf - -/* 000B4 80865DC4 24847B44 */ addiu $a0, $a0, %lo(D_80867B44) ## $a0 = 80867B44 -/* 000B8 80865DC8 8FBF0014 */ lw $ra, 0x0014($sp) -/* 000BC 80865DCC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 000C0 80865DD0 03E00008 */ jr $ra -/* 000C4 80865DD4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Arrow_Fire/ArrowFire_Draw.s b/asm/non_matchings/overlays/actors/ovl_Arrow_Fire/ArrowFire_Draw.s index e64c2360bb..a374291d7e 100644 --- a/asm/non_matchings/overlays/actors/ovl_Arrow_Fire/ArrowFire_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Arrow_Fire/ArrowFire_Draw.s @@ -1,112 +1,112 @@ glabel ArrowFire_Draw /* 00580 80866290 27BDFF68 */ addiu $sp, $sp, 0xFF68 ## $sp = FFFFFF68 -/* 00584 80866294 AFBF003C */ sw $ra, 0x003C($sp) -/* 00588 80866298 AFB00038 */ sw $s0, 0x0038($sp) -/* 0058C 8086629C AFA40098 */ sw $a0, 0x0098($sp) -/* 00590 808662A0 AFA5009C */ sw $a1, 0x009C($sp) +/* 00584 80866294 AFBF003C */ sw $ra, 0x003C($sp) +/* 00588 80866298 AFB00038 */ sw $s0, 0x0038($sp) +/* 0058C 8086629C AFA40098 */ sw $a0, 0x0098($sp) +/* 00590 808662A0 AFA5009C */ sw $a1, 0x009C($sp) /* 00594 808662A4 8CAF009C */ lw $t7, 0x009C($a1) ## 0000009C -/* 00598 808662A8 AFAF008C */ sw $t7, 0x008C($sp) +/* 00598 808662A8 AFAF008C */ sw $t7, 0x008C($sp) /* 0059C 808662AC 8C830118 */ lw $v1, 0x0118($a0) ## 00000118 -/* 005A0 808662B0 50600106 */ beql $v1, $zero, .L808666CC -/* 005A4 808662B4 8FBF003C */ lw $ra, 0x003C($sp) +/* 005A0 808662B0 50600106 */ beql $v1, $zero, .L808666CC +/* 005A4 808662B4 8FBF003C */ lw $ra, 0x003C($sp) /* 005A8 808662B8 8C790130 */ lw $t9, 0x0130($v1) ## 00000130 -/* 005AC 808662BC 53200103 */ beql $t9, $zero, .L808666CC -/* 005B0 808662C0 8FBF003C */ lw $ra, 0x003C($sp) +/* 005AC 808662BC 53200103 */ beql $t9, $zero, .L808666CC +/* 005B0 808662C0 8FBF003C */ lw $ra, 0x003C($sp) /* 005B4 808662C4 948C0166 */ lhu $t4, 0x0166($a0) ## 00000166 /* 005B8 808662C8 3C068086 */ lui $a2, %hi(D_80867B5C) ## $a2 = 80860000 /* 005BC 808662CC 24C67B5C */ addiu $a2, $a2, %lo(D_80867B5C) ## $a2 = 80867B5C -/* 005C0 808662D0 298100FF */ slti $at, $t4, 0x00FF -/* 005C4 808662D4 102000FC */ beq $at, $zero, .L808666C8 -/* 005C8 808662D8 8FAF009C */ lw $t7, 0x009C($sp) +/* 005C0 808662D0 298100FF */ slti $at, $t4, 0x00FF +/* 005C4 808662D4 102000FC */ beq $at, $zero, .L808666C8 +/* 005C8 808662D8 8FAF009C */ lw $t7, 0x009C($sp) /* 005CC 808662DC 906D0249 */ lbu $t5, 0x0249($v1) ## 00000249 /* 005D0 808662E0 2407026A */ addiu $a3, $zero, 0x026A ## $a3 = 0000026A /* 005D4 808662E4 31AE0002 */ andi $t6, $t5, 0x0002 ## $t6 = 00000000 -/* 005D8 808662E8 51C00004 */ beql $t6, $zero, .L808662FC +/* 005D8 808662E8 51C00004 */ beql $t6, $zero, .L808662FC /* 005DC 808662EC 00601025 */ or $v0, $v1, $zero ## $v0 = 00000000 -/* 005E0 808662F0 10000002 */ beq $zero, $zero, .L808662FC +/* 005E0 808662F0 10000002 */ beq $zero, $zero, .L808662FC /* 005E4 808662F4 00801025 */ or $v0, $a0, $zero ## $v0 = 00000000 /* 005E8 808662F8 00601025 */ or $v0, $v1, $zero ## $v0 = 00000000 .L808662FC: /* 005EC 808662FC 8DE50000 */ lw $a1, 0x0000($t7) ## 00000000 -/* 005F0 80866300 AFA20084 */ sw $v0, 0x0084($sp) +/* 005F0 80866300 AFA20084 */ sw $v0, 0x0084($sp) /* 005F4 80866304 27A40070 */ addiu $a0, $sp, 0x0070 ## $a0 = FFFFFFD8 -/* 005F8 80866308 0C031AB1 */ jal func_800C6AC4 +/* 005F8 80866308 0C031AB1 */ jal Graph_OpenDisps /* 005FC 8086630C 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 -/* 00600 80866310 8FA20084 */ lw $v0, 0x0084($sp) +/* 00600 80866310 8FA20084 */ lw $v0, 0x0084($sp) /* 00604 80866314 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 /* 00608 80866318 C44C0024 */ lwc1 $f12, 0x0024($v0) ## 00000024 /* 0060C 8086631C C44E0028 */ lwc1 $f14, 0x0028($v0) ## 00000028 -/* 00610 80866320 0C034261 */ jal Matrix_Translate +/* 00610 80866320 0C034261 */ jal Matrix_Translate /* 00614 80866324 8C46002C */ lw $a2, 0x002C($v0) ## 0000002C -/* 00618 80866328 8FA20084 */ lw $v0, 0x0084($sp) +/* 00618 80866328 8FA20084 */ lw $v0, 0x0084($sp) /* 0061C 8086632C 3C018086 */ lui $at, %hi(D_80867BAC) ## $at = 80860000 -/* 00620 80866330 C4287BAC */ lwc1 $f8, %lo(D_80867BAC)($at) +/* 00620 80866330 C4287BAC */ lwc1 $f8, %lo(D_80867BAC)($at) /* 00624 80866334 845800B6 */ lh $t8, 0x00B6($v0) ## 000000B6 /* 00628 80866338 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 /* 0062C 8086633C 44982000 */ mtc1 $t8, $f4 ## $f4 = 0.00 /* 00630 80866340 00000000 */ nop -/* 00634 80866344 468021A0 */ cvt.s.w $f6, $f4 -/* 00638 80866348 46083302 */ mul.s $f12, $f6, $f8 -/* 0063C 8086634C 0C034348 */ jal Matrix_RotateY +/* 00634 80866344 468021A0 */ cvt.s.w $f6, $f4 +/* 00638 80866348 46083302 */ mul.s $f12, $f6, $f8 +/* 0063C 8086634C 0C034348 */ jal Matrix_RotateY /* 00640 80866350 00000000 */ nop -/* 00644 80866354 8FA20084 */ lw $v0, 0x0084($sp) +/* 00644 80866354 8FA20084 */ lw $v0, 0x0084($sp) /* 00648 80866358 3C018086 */ lui $at, %hi(D_80867BB0) ## $at = 80860000 -/* 0064C 8086635C C4327BB0 */ lwc1 $f18, %lo(D_80867BB0)($at) +/* 0064C 8086635C C4327BB0 */ lwc1 $f18, %lo(D_80867BB0)($at) /* 00650 80866360 845900B4 */ lh $t9, 0x00B4($v0) ## 000000B4 /* 00654 80866364 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 /* 00658 80866368 44995000 */ mtc1 $t9, $f10 ## $f10 = 0.00 /* 0065C 8086636C 00000000 */ nop -/* 00660 80866370 46805420 */ cvt.s.w $f16, $f10 -/* 00664 80866374 46128302 */ mul.s $f12, $f16, $f18 -/* 00668 80866378 0C0342DC */ jal Matrix_RotateX +/* 00660 80866370 46805420 */ cvt.s.w $f16, $f10 +/* 00664 80866374 46128302 */ mul.s $f12, $f16, $f18 +/* 00668 80866378 0C0342DC */ jal Matrix_RotateX /* 0066C 8086637C 00000000 */ nop -/* 00670 80866380 8FA20084 */ lw $v0, 0x0084($sp) +/* 00670 80866380 8FA20084 */ lw $v0, 0x0084($sp) /* 00674 80866384 3C018086 */ lui $at, %hi(D_80867BB4) ## $at = 80860000 -/* 00678 80866388 C4287BB4 */ lwc1 $f8, %lo(D_80867BB4)($at) +/* 00678 80866388 C4287BB4 */ lwc1 $f8, %lo(D_80867BB4)($at) /* 0067C 8086638C 844B00B8 */ lh $t3, 0x00B8($v0) ## 000000B8 /* 00680 80866390 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 /* 00684 80866394 448B2000 */ mtc1 $t3, $f4 ## $f4 = 0.00 /* 00688 80866398 00000000 */ nop -/* 0068C 8086639C 468021A0 */ cvt.s.w $f6, $f4 -/* 00690 808663A0 46083302 */ mul.s $f12, $f6, $f8 -/* 00694 808663A4 0C0343B5 */ jal Matrix_RotateZ +/* 0068C 8086639C 468021A0 */ cvt.s.w $f6, $f4 +/* 00690 808663A0 46083302 */ mul.s $f12, $f6, $f8 +/* 00694 808663A4 0C0343B5 */ jal Matrix_RotateZ /* 00698 808663A8 00000000 */ nop /* 0069C 808663AC 3C018086 */ lui $at, %hi(D_80867BB8) ## $at = 80860000 -/* 006A0 808663B0 C42C7BB8 */ lwc1 $f12, %lo(D_80867BB8)($at) +/* 006A0 808663B0 C42C7BB8 */ lwc1 $f12, %lo(D_80867BB8)($at) /* 006A4 808663B4 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 006A8 808663B8 44066000 */ mfc1 $a2, $f12 -/* 006AC 808663BC 0C0342A3 */ jal Matrix_Scale -/* 006B0 808663C0 46006386 */ mov.s $f14, $f12 -/* 006B4 808663C4 8FAC0098 */ lw $t4, 0x0098($sp) +/* 006A8 808663B8 44066000 */ mfc1 $a2, $f12 +/* 006AC 808663BC 0C0342A3 */ jal Matrix_Scale +/* 006B0 808663C0 46006386 */ mov.s $f14, $f12 +/* 006B4 808663C4 8FAC0098 */ lw $t4, 0x0098($sp) /* 006B8 808663C8 44805000 */ mtc1 $zero, $f10 ## $f10 = 0.00 /* 006BC 808663CC C590015C */ lwc1 $f16, 0x015C($t4) ## 0000015C -/* 006C0 808663D0 4610503C */ c.lt.s $f10, $f16 +/* 006C0 808663D0 4610503C */ c.lt.s $f10, $f16 /* 006C4 808663D4 00000000 */ nop -/* 006C8 808663D8 45020030 */ bc1fl .L8086649C -/* 006CC 808663DC 8FAE009C */ lw $t6, 0x009C($sp) -/* 006D0 808663E0 0C024DF0 */ jal func_800937C0 +/* 006C8 808663D8 45020030 */ bc1fl .L8086649C +/* 006CC 808663DC 8FAE009C */ lw $t6, 0x009C($sp) +/* 006D0 808663E0 0C024DF0 */ jal func_800937C0 /* 006D4 808663E4 8E0402D0 */ lw $a0, 0x02D0($s0) ## 000002D0 /* 006D8 808663E8 AE0202D0 */ sw $v0, 0x02D0($s0) ## 000002D0 /* 006DC 808663EC 244D0008 */ addiu $t5, $v0, 0x0008 ## $t5 = 00000008 /* 006E0 808663F0 AE0D02D0 */ sw $t5, 0x02D0($s0) ## 000002D0 /* 006E4 808663F4 3C0EFA00 */ lui $t6, 0xFA00 ## $t6 = FA000000 /* 006E8 808663F8 AC4E0000 */ sw $t6, 0x0000($v0) ## 00000000 -/* 006EC 808663FC 8FAF0098 */ lw $t7, 0x0098($sp) +/* 006EC 808663FC 8FAF0098 */ lw $t7, 0x0098($sp) /* 006F0 80866400 3C014220 */ lui $at, 0x4220 ## $at = 42200000 /* 006F4 80866404 44819000 */ mtc1 $at, $f18 ## $f18 = 40.00 /* 006F8 80866408 C5E0015C */ lwc1 $f0, 0x015C($t7) ## 0000015C /* 006FC 8086640C 3C014316 */ lui $at, 0x4316 ## $at = 43160000 /* 00700 80866410 44814000 */ mtc1 $at, $f8 ## $f8 = 150.00 -/* 00704 80866414 46120102 */ mul.s $f4, $f0, $f18 +/* 00704 80866414 46120102 */ mul.s $f4, $f0, $f18 /* 00708 80866418 3C0EE300 */ lui $t6, 0xE300 ## $t6 = E3000000 /* 0070C 8086641C 35CE1A01 */ ori $t6, $t6, 0x1A01 ## $t6 = E3001A01 -/* 00710 80866420 46004282 */ mul.s $f10, $f8, $f0 +/* 00710 80866420 46004282 */ mul.s $f10, $f8, $f0 /* 00714 80866424 240F0030 */ addiu $t7, $zero, 0x0030 ## $t7 = 00000030 -/* 00718 80866428 4600218D */ trunc.w.s $f6, $f4 -/* 0071C 8086642C 4600540D */ trunc.w.s $f16, $f10 -/* 00720 80866430 440C3000 */ mfc1 $t4, $f6 -/* 00724 80866434 44188000 */ mfc1 $t8, $f16 -/* 00728 80866438 000C6E00 */ sll $t5, $t4, 24 +/* 00718 80866428 4600218D */ trunc.w.s $f6, $f4 +/* 0071C 8086642C 4600540D */ trunc.w.s $f16, $f10 +/* 00720 80866430 440C3000 */ mfc1 $t4, $f6 +/* 00724 80866434 44188000 */ mfc1 $t8, $f16 +/* 00728 80866438 000C6E00 */ sll $t5, $t4, 24 /* 0072C 8086643C 331900FF */ andi $t9, $t8, 0x00FF ## $t9 = 00000000 /* 00730 80866440 01B95825 */ or $t3, $t5, $t9 ## $t3 = 00000008 /* 00734 80866444 AC4B0004 */ sw $t3, 0x0004($v0) ## 00000004 @@ -130,9 +130,9 @@ glabel ArrowFire_Draw /* 0077C 8086648C AE0B02D0 */ sw $t3, 0x02D0($s0) ## 000002D0 /* 00780 80866490 AC400004 */ sw $zero, 0x0004($v0) ## 00000004 /* 00784 80866494 AC4C0000 */ sw $t4, 0x0000($v0) ## 00000000 -/* 00788 80866498 8FAE009C */ lw $t6, 0x009C($sp) +/* 00788 80866498 8FAE009C */ lw $t6, 0x009C($sp) .L8086649C: -/* 0078C 8086649C 0C024F61 */ jal func_80093D84 +/* 0078C 8086649C 0C024F61 */ jal func_80093D84 /* 00790 808664A0 8DC40000 */ lw $a0, 0x0000($t6) ## E3001A01 /* 00794 808664A4 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 /* 00798 808664A8 3C18FA00 */ lui $t8, 0xFA00 ## $t8 = FA000000 @@ -140,7 +140,7 @@ glabel ArrowFire_Draw /* 007A0 808664B0 244F0008 */ addiu $t7, $v0, 0x0008 ## $t7 = 00000008 /* 007A4 808664B4 AE0F02D0 */ sw $t7, 0x02D0($s0) ## 000002D0 /* 007A8 808664B8 AC580000 */ sw $t8, 0x0000($v0) ## 00000000 -/* 007AC 808664BC 8FAD0098 */ lw $t5, 0x0098($sp) +/* 007AC 808664BC 8FAD0098 */ lw $t5, 0x0098($sp) /* 007B0 808664C0 3C01FFC8 */ lui $at, 0xFFC8 ## $at = FFC80000 /* 007B4 808664C4 3C18FF00 */ lui $t8, 0xFF00 ## $t8 = FF000000 /* 007B8 808664C8 91AB0168 */ lbu $t3, 0x0168($t5) ## 00000168 @@ -156,47 +156,47 @@ glabel ArrowFire_Draw /* 007E0 808664F0 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 /* 007E4 808664F4 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 /* 007E8 808664F8 AC580004 */ sw $t8, 0x0004($v0) ## 00000004 -/* 007EC 808664FC 0C034421 */ jal Matrix_RotateXYZ +/* 007EC 808664FC 0C034421 */ jal Matrix_RotateZYX /* 007F0 80866500 AC4F0000 */ sw $t7, 0x0000($v0) ## 00000000 -/* 007F4 80866504 8FAD0098 */ lw $t5, 0x0098($sp) +/* 007F4 80866504 8FAD0098 */ lw $t5, 0x0098($sp) /* 007F8 80866508 3C018086 */ lui $at, %hi(D_80867BBC) ## $at = 80860000 /* 007FC 8086650C 24060000 */ addiu $a2, $zero, 0x0000 ## $a2 = 00000000 /* 00800 80866510 95B90166 */ lhu $t9, 0x0166($t5) ## 00000166 /* 00804 80866514 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 00808 80866518 53200009 */ beql $t9, $zero, .L80866540 +/* 00808 80866518 53200009 */ beql $t9, $zero, .L80866540 /* 0080C 8086651C 44806000 */ mtc1 $zero, $f12 ## $f12 = 0.00 /* 00810 80866520 44806000 */ mtc1 $zero, $f12 ## $f12 = 0.00 /* 00814 80866524 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 00818 80866528 44066000 */ mfc1 $a2, $f12 -/* 0081C 8086652C 0C034261 */ jal Matrix_Translate -/* 00820 80866530 46006386 */ mov.s $f14, $f12 -/* 00824 80866534 10000005 */ beq $zero, $zero, .L8086654C -/* 00828 80866538 8FAB0098 */ lw $t3, 0x0098($sp) +/* 00818 80866528 44066000 */ mfc1 $a2, $f12 +/* 0081C 8086652C 0C034261 */ jal Matrix_Translate +/* 00820 80866530 46006386 */ mov.s $f14, $f12 +/* 00824 80866534 10000005 */ beq $zero, $zero, .L8086654C +/* 00828 80866538 8FAB0098 */ lw $t3, 0x0098($sp) /* 0082C 8086653C 44806000 */ mtc1 $zero, $f12 ## $f12 = 0.00 .L80866540: -/* 00830 80866540 0C034261 */ jal Matrix_Translate -/* 00834 80866544 C42E7BBC */ lwc1 $f14, %lo(D_80867BBC)($at) -/* 00838 80866548 8FAB0098 */ lw $t3, 0x0098($sp) +/* 00830 80866540 0C034261 */ jal Matrix_Translate +/* 00834 80866544 C42E7BBC */ lwc1 $f14, %lo(D_80867BBC)($at) +/* 00838 80866548 8FAB0098 */ lw $t3, 0x0098($sp) .L8086654C: /* 0083C 8086654C 3C018086 */ lui $at, %hi(D_80867BC0) ## $at = 80860000 -/* 00840 80866550 C4267BC0 */ lwc1 $f6, %lo(D_80867BC0)($at) +/* 00840 80866550 C4267BC0 */ lwc1 $f6, %lo(D_80867BC0)($at) /* 00844 80866554 856C0164 */ lh $t4, 0x0164($t3) ## 00000164 /* 00848 80866558 3C014080 */ lui $at, 0x4080 ## $at = 40800000 /* 0084C 8086655C 44815000 */ mtc1 $at, $f10 ## $f10 = 4.00 /* 00850 80866560 448C9000 */ mtc1 $t4, $f18 ## $f18 = 0.00 /* 00854 80866564 C5680158 */ lwc1 $f8, 0x0158($t3) ## 00000158 /* 00858 80866568 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 0085C 8086656C 46809120 */ cvt.s.w $f4, $f18 -/* 00860 80866570 46062302 */ mul.s $f12, $f4, $f6 -/* 00864 80866574 44066000 */ mfc1 $a2, $f12 -/* 00868 80866578 460A4382 */ mul.s $f14, $f8, $f10 -/* 0086C 8086657C 0C0342A3 */ jal Matrix_Scale +/* 0085C 8086656C 46809120 */ cvt.s.w $f4, $f18 +/* 00860 80866570 46062302 */ mul.s $f12, $f4, $f6 +/* 00864 80866574 44066000 */ mfc1 $a2, $f12 +/* 00868 80866578 460A4382 */ mul.s $f14, $f8, $f10 +/* 0086C 8086657C 0C0342A3 */ jal Matrix_Scale /* 00870 80866580 00000000 */ nop /* 00874 80866584 44806000 */ mtc1 $zero, $f12 ## $f12 = 0.00 /* 00878 80866588 3C01C42F */ lui $at, 0xC42F ## $at = C42F0000 /* 0087C 8086658C 44817000 */ mtc1 $at, $f14 ## $f14 = -700.00 -/* 00880 80866590 44066000 */ mfc1 $a2, $f12 -/* 00884 80866594 0C034261 */ jal Matrix_Translate +/* 00880 80866590 44066000 */ mfc1 $a2, $f12 +/* 00884 80866594 0C034261 */ jal Matrix_Translate /* 00888 80866598 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 /* 0088C 8086659C 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 /* 00890 808665A0 3C0FDA38 */ lui $t7, 0xDA38 ## $t7 = DA380000 @@ -204,14 +204,14 @@ glabel ArrowFire_Draw /* 00898 808665A8 244E0008 */ addiu $t6, $v0, 0x0008 ## $t6 = 00000008 /* 0089C 808665AC AE0E02D0 */ sw $t6, 0x02D0($s0) ## 000002D0 /* 008A0 808665B0 AC4F0000 */ sw $t7, 0x0000($v0) ## 00000000 -/* 008A4 808665B4 8FB8009C */ lw $t8, 0x009C($sp) +/* 008A4 808665B4 8FB8009C */ lw $t8, 0x009C($sp) /* 008A8 808665B8 3C058086 */ lui $a1, %hi(D_80867B70) ## $a1 = 80860000 /* 008AC 808665BC 24A57B70 */ addiu $a1, $a1, %lo(D_80867B70) ## $a1 = 80867B70 /* 008B0 808665C0 8F040000 */ lw $a0, 0x0000($t8) ## 00000000 /* 008B4 808665C4 2406029A */ addiu $a2, $zero, 0x029A ## $a2 = 0000029A -/* 008B8 808665C8 0C0346A2 */ jal Matrix_NewMtx -/* 008BC 808665CC AFA20054 */ sw $v0, 0x0054($sp) -/* 008C0 808665D0 8FA30054 */ lw $v1, 0x0054($sp) +/* 008B8 808665C8 0C0346A2 */ jal Matrix_NewMtx +/* 008BC 808665CC AFA20054 */ sw $v0, 0x0054($sp) +/* 008C0 808665D0 8FA30054 */ lw $v1, 0x0054($sp) /* 008C4 808665D4 3C198086 */ lui $t9, %hi(D_80867990) ## $t9 = 80860000 /* 008C8 808665D8 27397990 */ addiu $t9, $t9, %lo(D_80867990) ## $t9 = 80867990 /* 008CC 808665DC AC620004 */ sw $v0, 0x0004($v1) ## 00000004 @@ -223,40 +223,40 @@ glabel ArrowFire_Draw /* 008E4 808665F4 AC490000 */ sw $t1, 0x0000($v0) ## 00000000 /* 008E8 808665F8 AC590004 */ sw $t9, 0x0004($v0) ## 00000004 /* 008EC 808665FC 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 008F0 80866600 8FAA008C */ lw $t2, 0x008C($sp) +/* 008F0 80866600 8FAA008C */ lw $t2, 0x008C($sp) /* 008F4 80866604 24180040 */ addiu $t8, $zero, 0x0040 ## $t8 = 00000040 /* 008F8 80866608 244C0008 */ addiu $t4, $v0, 0x0008 ## $t4 = 00000008 /* 008FC 8086660C AE0C02D0 */ sw $t4, 0x02D0($s0) ## 000002D0 /* 00900 80866610 AC490000 */ sw $t1, 0x0000($v0) ## 00000000 -/* 00904 80866614 8FAB009C */ lw $t3, 0x009C($sp) -/* 00908 80866618 000A7040 */ sll $t6, $t2, 1 +/* 00904 80866614 8FAB009C */ lw $t3, 0x009C($sp) +/* 00908 80866618 000A7040 */ sll $t6, $t2, 1 /* 0090C 8086661C 31CF00FF */ andi $t7, $t6, 0x00FF ## $t7 = 00000000 /* 00910 80866620 8D640000 */ lw $a0, 0x0000($t3) ## 00000000 -/* 00914 80866624 000A7080 */ sll $t6, $t2, 2 -/* 00918 80866628 01CA7021 */ addu $t6, $t6, $t2 -/* 0091C 8086662C 000E7040 */ sll $t6, $t6, 1 -/* 00920 80866630 AFB80010 */ sw $t8, 0x0010($sp) -/* 00924 80866634 010F3023 */ subu $a2, $t0, $t7 +/* 00914 80866624 000A7080 */ sll $t6, $t2, 2 +/* 00918 80866628 01CA7021 */ addu $t6, $t6, $t2 +/* 0091C 8086662C 000E7040 */ sll $t6, $t6, 1 +/* 00920 80866630 AFB80010 */ sw $t8, 0x0010($sp) +/* 00924 80866634 010F3023 */ subu $a2, $t0, $t7 /* 00928 80866638 24190001 */ addiu $t9, $zero, 0x0001 ## $t9 = 00000001 /* 0092C 8086663C 240D0020 */ addiu $t5, $zero, 0x0020 ## $t5 = 00000020 /* 00930 80866640 314C00FF */ andi $t4, $t2, 0x00FF ## $t4 = 00000000 -/* 00934 80866644 010C5823 */ subu $t3, $t0, $t4 -/* 00938 80866648 AFAD0014 */ sw $t5, 0x0014($sp) -/* 0093C 8086664C AFB90018 */ sw $t9, 0x0018($sp) +/* 00934 80866644 010C5823 */ subu $t3, $t0, $t4 +/* 00938 80866648 AFAD0014 */ sw $t5, 0x0014($sp) +/* 0093C 8086664C AFB90018 */ sw $t9, 0x0018($sp) /* 00940 80866650 31CF01FF */ andi $t7, $t6, 0x01FF ## $t7 = 00000000 /* 00944 80866654 241801FF */ addiu $t8, $zero, 0x01FF ## $t8 = 000001FF -/* 00948 80866658 030F6823 */ subu $t5, $t8, $t7 +/* 00948 80866658 030F6823 */ subu $t5, $t8, $t7 /* 0094C 8086665C 24190040 */ addiu $t9, $zero, 0x0040 ## $t9 = 00000040 /* 00950 80866660 240C0040 */ addiu $t4, $zero, 0x0040 ## $t4 = 00000040 -/* 00954 80866664 AFAC0028 */ sw $t4, 0x0028($sp) -/* 00958 80866668 AFB90024 */ sw $t9, 0x0024($sp) -/* 0095C 8086666C AFAD0020 */ sw $t5, 0x0020($sp) -/* 00960 80866670 AFAB001C */ sw $t3, 0x001C($sp) +/* 00954 80866664 AFAC0028 */ sw $t4, 0x0028($sp) +/* 00958 80866668 AFB90024 */ sw $t9, 0x0024($sp) +/* 0095C 8086666C AFAD0020 */ sw $t5, 0x0020($sp) +/* 00960 80866670 AFAB001C */ sw $t3, 0x001C($sp) /* 00964 80866674 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 00968 80866678 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 0096C 8086667C 0C0253D0 */ jal Draw_TwoTexScroll -/* 00970 80866680 AFA2004C */ sw $v0, 0x004C($sp) -/* 00974 80866684 8FA3004C */ lw $v1, 0x004C($sp) +/* 0096C 8086667C 0C0253D0 */ jal Gfx_TwoTexScroll +/* 00970 80866680 AFA2004C */ sw $v0, 0x004C($sp) +/* 00974 80866684 8FA3004C */ lw $v1, 0x004C($sp) /* 00978 80866688 3C188086 */ lui $t8, %hi(D_80867A40) ## $t8 = 80860000 /* 0097C 8086668C 27187A40 */ addiu $t8, $t8, %lo(D_80867A40) ## $t8 = 80867A40 /* 00980 80866690 AC620004 */ sw $v0, 0x0004($v1) ## 00000004 @@ -267,18 +267,18 @@ glabel ArrowFire_Draw /* 00994 808666A4 AE0B02D0 */ sw $t3, 0x02D0($s0) ## 000002D0 /* 00998 808666A8 AC580004 */ sw $t8, 0x0004($v0) ## 00000004 /* 0099C 808666AC AC4E0000 */ sw $t6, 0x0000($v0) ## 00000000 -/* 009A0 808666B0 8FAF009C */ lw $t7, 0x009C($sp) +/* 009A0 808666B0 8FAF009C */ lw $t7, 0x009C($sp) /* 009A4 808666B4 24C67B84 */ addiu $a2, $a2, %lo(D_80867B84) ## $a2 = 80867B84 /* 009A8 808666B8 27A40070 */ addiu $a0, $sp, 0x0070 ## $a0 = FFFFFFD8 /* 009AC 808666BC 240702AA */ addiu $a3, $zero, 0x02AA ## $a3 = 000002AA -/* 009B0 808666C0 0C031AD5 */ jal func_800C6B54 +/* 009B0 808666C0 0C031AD5 */ jal Graph_CloseDisps /* 009B4 808666C4 8DE50000 */ lw $a1, 0x0000($t7) ## 00000000 .L808666C8: -/* 009B8 808666C8 8FBF003C */ lw $ra, 0x003C($sp) +/* 009B8 808666C8 8FBF003C */ lw $ra, 0x003C($sp) .L808666CC: -/* 009BC 808666CC 8FB00038 */ lw $s0, 0x0038($sp) +/* 009BC 808666CC 8FB00038 */ lw $s0, 0x0038($sp) /* 009C0 808666D0 27BD0098 */ addiu $sp, $sp, 0x0098 ## $sp = 00000000 -/* 009C4 808666D4 03E00008 */ jr $ra +/* 009C4 808666D4 03E00008 */ jr $ra /* 009C8 808666D8 00000000 */ nop /* 009CC 808666DC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Arrow_Fire/ArrowFire_Init.s b/asm/non_matchings/overlays/actors/ovl_Arrow_Fire/ArrowFire_Init.s deleted file mode 100644 index 049fe5e5f1..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Arrow_Fire/ArrowFire_Init.s +++ /dev/null @@ -1,35 +0,0 @@ -glabel ArrowFire_Init -/* 00008 80865D18 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 0000C 80865D1C AFA50024 */ sw $a1, 0x0024($sp) -/* 00010 80865D20 AFBF001C */ sw $ra, 0x001C($sp) -/* 00014 80865D24 AFB00018 */ sw $s0, 0x0018($sp) -/* 00018 80865D28 3C058086 */ lui $a1, %hi(D_80867B20) ## $a1 = 80860000 -/* 0001C 80865D2C 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00020 80865D30 0C01E037 */ jal Actor_ProcessInitChain - -/* 00024 80865D34 24A57B20 */ addiu $a1, $a1, %lo(D_80867B20) ## $a1 = 80867B20 -/* 00028 80865D38 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 0002C 80865D3C 44812000 */ mtc1 $at, $f4 ## $f4 = 1.00 -/* 00030 80865D40 3C058086 */ lui $a1, %hi(func_80865DD8) ## $a1 = 80860000 -/* 00034 80865D44 A6000164 */ sh $zero, 0x0164($s0) ## 00000164 -/* 00038 80865D48 24A55DD8 */ addiu $a1, $a1, %lo(func_80865DD8) ## $a1 = 80865DD8 -/* 0003C 80865D4C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00040 80865D50 0C219744 */ jal func_80865D10 -/* 00044 80865D54 E6040158 */ swc1 $f4, 0x0158($s0) ## 00000158 -/* 00048 80865D58 3C053C23 */ lui $a1, 0x3C23 ## $a1 = 3C230000 -/* 0004C 80865D5C 34A5D70A */ ori $a1, $a1, 0xD70A ## $a1 = 3C23D70A -/* 00050 80865D60 0C00B58B */ jal Actor_SetScale - -/* 00054 80865D64 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00058 80865D68 44803000 */ mtc1 $zero, $f6 ## $f6 = 0.00 -/* 0005C 80865D6C 240E00A0 */ addiu $t6, $zero, 0x00A0 ## $t6 = 000000A0 -/* 00060 80865D70 A20E0168 */ sb $t6, 0x0168($s0) ## 00000168 -/* 00064 80865D74 A6000166 */ sh $zero, 0x0166($s0) ## 00000166 -/* 00068 80865D78 E606015C */ swc1 $f6, 0x015C($s0) ## 0000015C -/* 0006C 80865D7C 8FBF001C */ lw $ra, 0x001C($sp) -/* 00070 80865D80 8FB00018 */ lw $s0, 0x0018($sp) -/* 00074 80865D84 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 00078 80865D88 03E00008 */ jr $ra -/* 0007C 80865D8C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Arrow_Fire/ArrowFire_Update.s b/asm/non_matchings/overlays/actors/ovl_Arrow_Fire/ArrowFire_Update.s deleted file mode 100644 index 14134057f6..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Arrow_Fire/ArrowFire_Update.s +++ /dev/null @@ -1,28 +0,0 @@ -glabel ArrowFire_Update -/* 0052C 8086623C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00530 80866240 3C020001 */ lui $v0, 0x0001 ## $v0 = 00010000 -/* 00534 80866244 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00538 80866248 00451021 */ addu $v0, $v0, $a1 -/* 0053C 8086624C 904203DC */ lbu $v0, 0x03DC($v0) ## 000103DC -/* 00540 80866250 2401000D */ addiu $at, $zero, 0x000D ## $at = 0000000D -/* 00544 80866254 10410003 */ beq $v0, $at, .L80866264 -/* 00548 80866258 24010011 */ addiu $at, $zero, 0x0011 ## $at = 00000011 -/* 0054C 8086625C 54410006 */ bnel $v0, $at, .L80866278 -/* 00550 80866260 8C990160 */ lw $t9, 0x0160($a0) ## 00000160 -.L80866264: -/* 00554 80866264 0C00B55C */ jal Actor_Kill - -/* 00558 80866268 00000000 */ nop -/* 0055C 8086626C 10000005 */ beq $zero, $zero, .L80866284 -/* 00560 80866270 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00564 80866274 8C990160 */ lw $t9, 0x0160($a0) ## 00000160 -.L80866278: -/* 00568 80866278 0320F809 */ jalr $ra, $t9 -/* 0056C 8086627C 00000000 */ nop -/* 00570 80866280 8FBF0014 */ lw $ra, 0x0014($sp) -.L80866284: -/* 00574 80866284 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00578 80866288 03E00008 */ jr $ra -/* 0057C 8086628C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Arrow_Fire/func_80865D10.s b/asm/non_matchings/overlays/actors/ovl_Arrow_Fire/func_80865D10.s deleted file mode 100644 index f8968f4ff5..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Arrow_Fire/func_80865D10.s +++ /dev/null @@ -1,5 +0,0 @@ -glabel func_80865D10 -/* 00000 80865D10 03E00008 */ jr $ra -/* 00004 80865D14 AC850160 */ sw $a1, 0x0160($a0) ## 00000160 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Arrow_Fire/func_80865DD8.s b/asm/non_matchings/overlays/actors/ovl_Arrow_Fire/func_80865DD8.s deleted file mode 100644 index 8f1ecd2bf0..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Arrow_Fire/func_80865DD8.s +++ /dev/null @@ -1,69 +0,0 @@ -glabel func_80865DD8 -/* 000C8 80865DD8 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 000CC 80865DDC AFBF0014 */ sw $ra, 0x0014($sp) -/* 000D0 80865DE0 AFA50024 */ sw $a1, 0x0024($sp) -/* 000D4 80865DE4 8C820118 */ lw $v0, 0x0118($a0) ## 00000118 -/* 000D8 80865DE8 10400004 */ beq $v0, $zero, .L80865DFC -/* 000DC 80865DEC 00000000 */ nop -/* 000E0 80865DF0 8C4E0130 */ lw $t6, 0x0130($v0) ## 00000130 -/* 000E4 80865DF4 55C00006 */ bnel $t6, $zero, .L80865E10 -/* 000E8 80865DF8 84830164 */ lh $v1, 0x0164($a0) ## 00000164 -.L80865DFC: -/* 000EC 80865DFC 0C00B55C */ jal Actor_Kill - -/* 000F0 80865E00 00000000 */ nop -/* 000F4 80865E04 1000002E */ beq $zero, $zero, .L80865EC0 -/* 000F8 80865E08 8FBF0014 */ lw $ra, 0x0014($sp) -/* 000FC 80865E0C 84830164 */ lh $v1, 0x0164($a0) ## 00000164 -.L80865E10: -/* 00100 80865E10 2861000A */ slti $at, $v1, 0x000A -/* 00104 80865E14 10200002 */ beq $at, $zero, .L80865E20 -/* 00108 80865E18 246F0001 */ addiu $t7, $v1, 0x0001 ## $t7 = 00000001 -/* 0010C 80865E1C A48F0164 */ sh $t7, 0x0164($a0) ## 00000164 -.L80865E20: -/* 00110 80865E20 8C590024 */ lw $t9, 0x0024($v0) ## 00000024 -/* 00114 80865E24 24830024 */ addiu $v1, $a0, 0x0024 ## $v1 = 00000024 -/* 00118 80865E28 2405007D */ addiu $a1, $zero, 0x007D ## $a1 = 0000007D -/* 0011C 80865E2C AC790000 */ sw $t9, 0x0000($v1) ## 00000024 -/* 00120 80865E30 8C580028 */ lw $t8, 0x0028($v0) ## 00000028 -/* 00124 80865E34 AC780004 */ sw $t8, 0x0004($v1) ## 00000028 -/* 00128 80865E38 8C59002C */ lw $t9, 0x002C($v0) ## 0000002C -/* 0012C 80865E3C AC790008 */ sw $t9, 0x0008($v1) ## 0000002C -/* 00130 80865E40 884900B4 */ lwl $t1, 0x00B4($v0) ## 000000B4 -/* 00134 80865E44 984900B7 */ lwr $t1, 0x00B7($v0) ## 000000B7 -/* 00138 80865E48 A88900B4 */ swl $t1, 0x00B4($a0) ## 000000B4 -/* 0013C 80865E4C B88900B7 */ swr $t1, 0x00B7($a0) ## 000000B7 -/* 00140 80865E50 944900B8 */ lhu $t1, 0x00B8($v0) ## 000000B8 -/* 00144 80865E54 A48900B8 */ sh $t1, 0x00B8($a0) ## 000000B8 -/* 00148 80865E58 AFA40020 */ sw $a0, 0x0020($sp) -/* 0014C 80865E5C AFA30018 */ sw $v1, 0x0018($sp) -/* 00150 80865E60 0C00BE5D */ jal func_8002F974 -/* 00154 80865E64 AFA2001C */ sw $v0, 0x001C($sp) -/* 00158 80865E68 8FA2001C */ lw $v0, 0x001C($sp) -/* 0015C 80865E6C 8FA30018 */ lw $v1, 0x0018($sp) -/* 00160 80865E70 8FA40020 */ lw $a0, 0x0020($sp) -/* 00164 80865E74 8C4A0118 */ lw $t2, 0x0118($v0) ## 00000118 -/* 00168 80865E78 55400011 */ bnel $t2, $zero, .L80865EC0 -/* 0016C 80865E7C 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00170 80865E80 8C6C0000 */ lw $t4, 0x0000($v1) ## 00000000 -/* 00174 80865E84 240D000A */ addiu $t5, $zero, 0x000A ## $t5 = 0000000A -/* 00178 80865E88 3C058086 */ lui $a1, %hi(func_808660E8) ## $a1 = 80860000 -/* 0017C 80865E8C AC8C014C */ sw $t4, 0x014C($a0) ## 0000014C -/* 00180 80865E90 8C6B0004 */ lw $t3, 0x0004($v1) ## 00000004 -/* 00184 80865E94 24A560E8 */ addiu $a1, $a1, %lo(func_808660E8) ## $a1 = 808660E8 -/* 00188 80865E98 AC8B0150 */ sw $t3, 0x0150($a0) ## 00000150 -/* 0018C 80865E9C 8C6C0008 */ lw $t4, 0x0008($v1) ## 00000008 -/* 00190 80865EA0 A48D0164 */ sh $t5, 0x0164($a0) ## 00000164 -/* 00194 80865EA4 AC8C0154 */ sw $t4, 0x0154($a0) ## 00000154 -/* 00198 80865EA8 0C219744 */ jal func_80865D10 -/* 0019C 80865EAC AFA40020 */ sw $a0, 0x0020($sp) -/* 001A0 80865EB0 8FA40020 */ lw $a0, 0x0020($sp) -/* 001A4 80865EB4 240E00FF */ addiu $t6, $zero, 0x00FF ## $t6 = 000000FF -/* 001A8 80865EB8 A08E0168 */ sb $t6, 0x0168($a0) ## 00000168 -/* 001AC 80865EBC 8FBF0014 */ lw $ra, 0x0014($sp) -.L80865EC0: -/* 001B0 80865EC0 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 001B4 80865EC4 03E00008 */ jr $ra -/* 001B8 80865EC8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Arrow_Fire/func_80865ECC.s b/asm/non_matchings/overlays/actors/ovl_Arrow_Fire/func_80865ECC.s deleted file mode 100644 index 8eaf606ac7..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Arrow_Fire/func_80865ECC.s +++ /dev/null @@ -1,23 +0,0 @@ -glabel func_80865ECC -/* 001BC 80865ECC C4800000 */ lwc1 $f0, 0x0000($a0) ## 00000000 -/* 001C0 80865ED0 C4A40000 */ lwc1 $f4, 0x0000($a1) ## 00000000 -/* 001C4 80865ED4 44866000 */ mtc1 $a2, $f12 ## $f12 = 0.00 -/* 001C8 80865ED8 C4820004 */ lwc1 $f2, 0x0004($a0) ## 00000004 -/* 001CC 80865EDC 46002181 */ sub.s $f6, $f4, $f0 -/* 001D0 80865EE0 C48E0008 */ lwc1 $f14, 0x0008($a0) ## 00000008 -/* 001D4 80865EE4 460C3202 */ mul.s $f8, $f6, $f12 -/* 001D8 80865EE8 46080280 */ add.s $f10, $f0, $f8 -/* 001DC 80865EEC E48A0000 */ swc1 $f10, 0x0000($a0) ## 00000000 -/* 001E0 80865EF0 C4B00004 */ lwc1 $f16, 0x0004($a1) ## 00000004 -/* 001E4 80865EF4 46028481 */ sub.s $f18, $f16, $f2 -/* 001E8 80865EF8 460C9102 */ mul.s $f4, $f18, $f12 -/* 001EC 80865EFC 46041180 */ add.s $f6, $f2, $f4 -/* 001F0 80865F00 E4860004 */ swc1 $f6, 0x0004($a0) ## 00000004 -/* 001F4 80865F04 C4A80008 */ lwc1 $f8, 0x0008($a1) ## 00000008 -/* 001F8 80865F08 460E4281 */ sub.s $f10, $f8, $f14 -/* 001FC 80865F0C 460C5402 */ mul.s $f16, $f10, $f12 -/* 00200 80865F10 46107480 */ add.s $f18, $f14, $f16 -/* 00204 80865F14 03E00008 */ jr $ra -/* 00208 80865F18 E4920008 */ swc1 $f18, 0x0008($a0) ## 00000008 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Arrow_Fire/func_80865F1C.s b/asm/non_matchings/overlays/actors/ovl_Arrow_Fire/func_80865F1C.s deleted file mode 100644 index bf8a719221..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Arrow_Fire/func_80865F1C.s +++ /dev/null @@ -1,128 +0,0 @@ -glabel func_80865F1C -/* 0020C 80865F1C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00210 80865F20 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00214 80865F24 AFA5001C */ sw $a1, 0x001C($sp) -/* 00218 80865F28 3C014248 */ lui $at, 0x4248 ## $at = 42480000 -/* 0021C 80865F2C 44811000 */ mtc1 $at, $f2 ## $f2 = 50.00 -/* 00220 80865F30 C48000F0 */ lwc1 $f0, 0x00F0($a0) ## 000000F0 -/* 00224 80865F34 3C018086 */ lui $at, %hi(D_80867B98) ## $at = 80860000 -/* 00228 80865F38 4602003C */ c.lt.s $f0, $f2 -/* 0022C 80865F3C 00000000 */ nop -/* 00230 80865F40 45000005 */ bc1f .L80865F58 -/* 00234 80865F44 00000000 */ nop -/* 00238 80865F48 3C014120 */ lui $at, 0x4120 ## $at = 41200000 -/* 0023C 80865F4C 44816000 */ mtc1 $at, $f12 ## $f12 = 10.00 -/* 00240 80865F50 10000012 */ beq $zero, $zero, .L80865F9C -/* 00244 80865F54 94830166 */ lhu $v1, 0x0166($a0) ## 00000166 -.L80865F58: -/* 00248 80865F58 C4247B98 */ lwc1 $f4, %lo(D_80867B98)($at) -/* 0024C 80865F5C 3C018086 */ lui $at, %hi(D_80867B9C) ## $at = 80860000 -/* 00250 80865F60 4600203C */ c.lt.s $f4, $f0 -/* 00254 80865F64 00000000 */ nop -/* 00258 80865F68 45020006 */ bc1fl .L80865F84 -/* 0025C 80865F6C 46020181 */ sub.s $f6, $f0, $f2 -/* 00260 80865F70 3C01439B */ lui $at, 0x439B ## $at = 439B0000 -/* 00264 80865F74 44816000 */ mtc1 $at, $f12 ## $f12 = 310.00 -/* 00268 80865F78 10000008 */ beq $zero, $zero, .L80865F9C -/* 0026C 80865F7C 94830166 */ lhu $v1, 0x0166($a0) ## 00000166 -/* 00270 80865F80 46020181 */ sub.s $f6, $f0, $f2 -.L80865F84: -/* 00274 80865F84 C4287B9C */ lwc1 $f8, %lo(D_80867B9C)($at) -/* 00278 80865F88 3C014120 */ lui $at, 0x4120 ## $at = 41200000 -/* 0027C 80865F8C 44818000 */ mtc1 $at, $f16 ## $f16 = 10.00 -/* 00280 80865F90 46083282 */ mul.s $f10, $f6, $f8 -/* 00284 80865F94 46105300 */ add.s $f12, $f10, $f16 -/* 00288 80865F98 94830166 */ lhu $v1, 0x0166($a0) ## 00000166 -.L80865F9C: -/* 0028C 80865F9C 240A00FF */ addiu $t2, $zero, 0x00FF ## $t2 = 000000FF -/* 00290 80865FA0 10600029 */ beq $v1, $zero, .L80866048 -/* 00294 80865FA4 246EFFFF */ addiu $t6, $v1, 0xFFFF ## $t6 = FFFFFFFF -/* 00298 80865FA8 31C3FFFF */ andi $v1, $t6, 0xFFFF ## $v1 = 0000FFFF -/* 0029C 80865FAC 28610008 */ slti $at, $v1, 0x0008 -/* 002A0 80865FB0 A48E0166 */ sh $t6, 0x0166($a0) ## 00000166 -/* 002A4 80865FB4 14200024 */ bne $at, $zero, .L80866048 -/* 002A8 80865FB8 00601025 */ or $v0, $v1, $zero ## $v0 = 0000FFFF -/* 002AC 80865FBC 244FFFF8 */ addiu $t7, $v0, 0xFFF8 ## $t7 = 0000FFF7 -/* 002B0 80865FC0 448F9000 */ mtc1 $t7, $f18 ## $f18 = 0.00 -/* 002B4 80865FC4 3C018086 */ lui $at, %hi(D_80867BA0) ## $at = 80860000 -/* 002B8 80865FC8 C4267BA0 */ lwc1 $f6, %lo(D_80867BA0)($at) -/* 002BC 80865FCC 46809120 */ cvt.s.w $f4, $f18 -/* 002C0 80865FD0 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 002C4 80865FD4 44814000 */ mtc1 $at, $f8 ## $f8 = 1.00 -/* 002C8 80865FD8 3C014120 */ lui $at, 0x4120 ## $at = 41200000 -/* 002CC 80865FDC 44819000 */ mtc1 $at, $f18 ## $f18 = 10.00 -/* 002D0 80865FE0 3C014000 */ lui $at, 0x4000 ## $at = 40000000 -/* 002D4 80865FE4 46062002 */ mul.s $f0, $f4, $f6 -/* 002D8 80865FE8 C4820158 */ lwc1 $f2, 0x0158($a0) ## 00000158 -/* 002DC 80865FEC 000240C0 */ sll $t0, $v0, 3 -/* 002E0 80865FF0 01024021 */ addu $t0, $t0, $v0 -/* 002E4 80865FF4 00084080 */ sll $t0, $t0, 2 -/* 002E8 80865FF8 01024023 */ subu $t0, $t0, $v0 -/* 002EC 80865FFC 2509FEE8 */ addiu $t1, $t0, 0xFEE8 ## $t1 = FFFFFEE8 -/* 002F0 80866000 46000002 */ mul.s $f0, $f0, $f0 -/* 002F4 80866004 46004281 */ sub.s $f10, $f8, $f0 -/* 002F8 80866008 44814000 */ mtc1 $at, $f8 ## $f8 = 2.00 -/* 002FC 8086600C 3C018086 */ lui $at, %hi(D_80867BA4) ## $at = 80860000 -/* 00300 80866010 460C5402 */ mul.s $f16, $f10, $f12 -/* 00304 80866014 46024281 */ sub.s $f10, $f8, $f2 -/* 00308 80866018 46128100 */ add.s $f4, $f16, $f18 -/* 0030C 8086601C 4600218D */ trunc.w.s $f6, $f4 -/* 00310 80866020 44193000 */ mfc1 $t9, $f6 -/* 00314 80866024 00000000 */ nop -/* 00318 80866028 A4990164 */ sh $t9, 0x0164($a0) ## 00000164 -/* 0031C 8086602C C4307BA4 */ lwc1 $f16, %lo(D_80867BA4)($at) -/* 00320 80866030 28410010 */ slti $at, $v0, 0x0010 -/* 00324 80866034 46105482 */ mul.s $f18, $f10, $f16 -/* 00328 80866038 46121100 */ add.s $f4, $f2, $f18 -/* 0032C 8086603C 10200002 */ beq $at, $zero, .L80866048 -/* 00330 80866040 E4840158 */ swc1 $f4, 0x0158($a0) ## 00000158 -/* 00334 80866044 A0890168 */ sb $t1, 0x0168($a0) ## 00000168 -.L80866048: -/* 00338 80866048 28610009 */ slti $at, $v1, 0x0009 -/* 0033C 8086604C 1420000E */ bne $at, $zero, .L80866088 -/* 00340 80866050 00601025 */ or $v0, $v1, $zero ## $v0 = 0000FFFF -/* 00344 80866054 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 00348 80866058 44813000 */ mtc1 $at, $f6 ## $f6 = 1.00 -/* 0034C 8086605C C480015C */ lwc1 $f0, 0x015C($a0) ## 0000015C -/* 00350 80866060 3C013E80 */ lui $at, 0x3E80 ## $at = 3E800000 -/* 00354 80866064 4606003C */ c.lt.s $f0, $f6 -/* 00358 80866068 00000000 */ nop -/* 0035C 8086606C 45020012 */ bc1fl .L808660B8 -/* 00360 80866070 28410008 */ slti $at, $v0, 0x0008 -/* 00364 80866074 44814000 */ mtc1 $at, $f8 ## $f8 = 0.25 -/* 00368 80866078 94820166 */ lhu $v0, 0x0166($a0) ## 00000166 -/* 0036C 8086607C 46080280 */ add.s $f10, $f0, $f8 -/* 00370 80866080 1000000C */ beq $zero, $zero, .L808660B4 -/* 00374 80866084 E48A015C */ swc1 $f10, 0x015C($a0) ## 0000015C -.L80866088: -/* 00378 80866088 C480015C */ lwc1 $f0, 0x015C($a0) ## 0000015C -/* 0037C 8086608C 44808000 */ mtc1 $zero, $f16 ## $f16 = 0.00 -/* 00380 80866090 3C013E00 */ lui $at, 0x3E00 ## $at = 3E000000 -/* 00384 80866094 4600803C */ c.lt.s $f16, $f0 -/* 00388 80866098 00000000 */ nop -/* 0038C 8086609C 45020006 */ bc1fl .L808660B8 -/* 00390 808660A0 28410008 */ slti $at, $v0, 0x0008 -/* 00394 808660A4 44819000 */ mtc1 $at, $f18 ## $f18 = 0.12 -/* 00398 808660A8 94820166 */ lhu $v0, 0x0166($a0) ## 00000166 -/* 0039C 808660AC 46120101 */ sub.s $f4, $f0, $f18 -/* 003A0 808660B0 E484015C */ swc1 $f4, 0x015C($a0) ## 0000015C -.L808660B4: -/* 003A4 808660B4 28410008 */ slti $at, $v0, 0x0008 -.L808660B8: -/* 003A8 808660B8 10200003 */ beq $at, $zero, .L808660C8 -/* 003AC 808660BC 00000000 */ nop -/* 003B0 808660C0 A0800168 */ sb $zero, 0x0168($a0) ## 00000168 -/* 003B4 808660C4 94820166 */ lhu $v0, 0x0166($a0) ## 00000166 -.L808660C8: -/* 003B8 808660C8 54400004 */ bnel $v0, $zero, .L808660DC -/* 003BC 808660CC 8FBF0014 */ lw $ra, 0x0014($sp) -/* 003C0 808660D0 0C00B55C */ jal Actor_Kill - -/* 003C4 808660D4 A48A0166 */ sh $t2, 0x0166($a0) ## 00000166 -/* 003C8 808660D8 8FBF0014 */ lw $ra, 0x0014($sp) -.L808660DC: -/* 003CC 808660DC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 003D0 808660E0 03E00008 */ jr $ra -/* 003D4 808660E4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Arrow_Fire/func_808660E8.s b/asm/non_matchings/overlays/actors/ovl_Arrow_Fire/func_808660E8.s deleted file mode 100644 index 74a33ed19d..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Arrow_Fire/func_808660E8.s +++ /dev/null @@ -1,99 +0,0 @@ -glabel func_808660E8 -/* 003D8 808660E8 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 003DC 808660EC AFBF001C */ sw $ra, 0x001C($sp) -/* 003E0 808660F0 AFB00018 */ sw $s0, 0x0018($sp) -/* 003E4 808660F4 AFA5003C */ sw $a1, 0x003C($sp) -/* 003E8 808660F8 8C820118 */ lw $v0, 0x0118($a0) ## 00000118 -/* 003EC 808660FC 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 003F0 80866100 10400004 */ beq $v0, $zero, .L80866114 -/* 003F4 80866104 00000000 */ nop -/* 003F8 80866108 8C4E0130 */ lw $t6, 0x0130($v0) ## 00000130 -/* 003FC 8086610C 55C00006 */ bnel $t6, $zero, .L80866128 -/* 00400 80866110 8C580024 */ lw $t8, 0x0024($v0) ## 00000024 -.L80866114: -/* 00404 80866114 0C00B55C */ jal Actor_Kill - -/* 00408 80866118 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0040C 8086611C 10000043 */ beq $zero, $zero, .L8086622C -/* 00410 80866120 8FBF001C */ lw $ra, 0x001C($sp) -/* 00414 80866124 8C580024 */ lw $t8, 0x0024($v0) ## 00000024 -.L80866128: -/* 00418 80866128 26050024 */ addiu $a1, $s0, 0x0024 ## $a1 = 00000024 -/* 0041C 8086612C 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C -/* 00420 80866130 ACB80000 */ sw $t8, 0x0000($a1) ## 00000024 -/* 00424 80866134 8C4F0028 */ lw $t7, 0x0028($v0) ## 00000028 -/* 00428 80866138 ACAF0004 */ sw $t7, 0x0004($a1) ## 00000028 -/* 0042C 8086613C 8C58002C */ lw $t8, 0x002C($v0) ## 0000002C -/* 00430 80866140 ACB80008 */ sw $t8, 0x0008($a1) ## 0000002C -/* 00434 80866144 884800B4 */ lwl $t0, 0x00B4($v0) ## 000000B4 -/* 00438 80866148 984800B7 */ lwr $t0, 0x00B7($v0) ## 000000B7 -/* 0043C 8086614C AA0800B4 */ swl $t0, 0x00B4($s0) ## 000000B4 -/* 00440 80866150 BA0800B7 */ swr $t0, 0x00B7($s0) ## 000000B7 -/* 00444 80866154 944800B8 */ lhu $t0, 0x00B8($v0) ## 000000B8 -/* 00448 80866158 A60800B8 */ sh $t0, 0x00B8($s0) ## 000000B8 -/* 0044C 8086615C AFA50028 */ sw $a1, 0x0028($sp) -/* 00450 80866160 AFA40024 */ sw $a0, 0x0024($sp) -/* 00454 80866164 0C01DFE4 */ jal Math_Vec3f_DistXYZ - -/* 00458 80866168 AFA20034 */ sw $v0, 0x0034($sp) -/* 0045C 8086616C 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 00460 80866170 44816000 */ mtc1 $at, $f12 ## $f12 = 1.00 -/* 00464 80866174 3C018086 */ lui $at, %hi(D_80867BA8) ## $at = 80860000 -/* 00468 80866178 C4247BA8 */ lwc1 $f4, %lo(D_80867BA8)($at) -/* 0046C 8086617C 8FA20034 */ lw $v0, 0x0034($sp) -/* 00470 80866180 8FA40024 */ lw $a0, 0x0024($sp) -/* 00474 80866184 46040082 */ mul.s $f2, $f0, $f4 -/* 00478 80866188 8FA50028 */ lw $a1, 0x0028($sp) -/* 0047C 8086618C 3C063D4C */ lui $a2, 0x3D4C ## $a2 = 3D4C0000 -/* 00480 80866190 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3D4CCCCD -/* 00484 80866194 460C103C */ c.lt.s $f2, $f12 -/* 00488 80866198 E6020158 */ swc1 $f2, 0x0158($s0) ## 00000158 -/* 0048C 8086619C 45000002 */ bc1f .L808661A8 -/* 00490 808661A0 00000000 */ nop -/* 00494 808661A4 E60C0158 */ swc1 $f12, 0x0158($s0) ## 00000158 -.L808661A8: -/* 00498 808661A8 0C2197B3 */ jal func_80865ECC -/* 0049C 808661AC AFA20034 */ sw $v0, 0x0034($sp) -/* 004A0 808661B0 8FA20034 */ lw $v0, 0x0034($sp) -/* 004A4 808661B4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 004A8 808661B8 90490249 */ lbu $t1, 0x0249($v0) ## 00000249 -/* 004AC 808661BC 312A0001 */ andi $t2, $t1, 0x0001 ## $t2 = 00000000 -/* 004B0 808661C0 5140000D */ beql $t2, $zero, .L808661F8 -/* 004B4 808661C4 904D0248 */ lbu $t5, 0x0248($v0) ## 00000248 -/* 004B8 808661C8 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 004BC 808661CC 2405183A */ addiu $a1, $zero, 0x183A ## $a1 = 0000183A -/* 004C0 808661D0 3C058086 */ lui $a1, %hi(func_80865F1C) ## $a1 = 80860000 -/* 004C4 808661D4 24A55F1C */ addiu $a1, $a1, %lo(func_80865F1C) ## $a1 = 80865F1C -/* 004C8 808661D8 0C219744 */ jal func_80865D10 -/* 004CC 808661DC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 004D0 808661E0 240B0020 */ addiu $t3, $zero, 0x0020 ## $t3 = 00000020 -/* 004D4 808661E4 240C00FF */ addiu $t4, $zero, 0x00FF ## $t4 = 000000FF -/* 004D8 808661E8 A60B0166 */ sh $t3, 0x0166($s0) ## 00000166 -/* 004DC 808661EC 1000000E */ beq $zero, $zero, .L80866228 -/* 004E0 808661F0 A20C0168 */ sb $t4, 0x0168($s0) ## 00000168 -/* 004E4 808661F4 904D0248 */ lbu $t5, 0x0248($v0) ## 00000248 -.L808661F8: -/* 004E8 808661F8 29A10022 */ slti $at, $t5, 0x0022 -/* 004EC 808661FC 5020000B */ beql $at, $zero, .L8086622C -/* 004F0 80866200 8FBF001C */ lw $ra, 0x001C($sp) -/* 004F4 80866204 92020168 */ lbu $v0, 0x0168($s0) ## 00000168 -/* 004F8 80866208 28410023 */ slti $at, $v0, 0x0023 -/* 004FC 8086620C 10200005 */ beq $at, $zero, .L80866224 -/* 00500 80866210 244EFFE7 */ addiu $t6, $v0, 0xFFE7 ## $t6 = FFFFFFE7 -/* 00504 80866214 0C00B55C */ jal Actor_Kill - -/* 00508 80866218 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0050C 8086621C 10000003 */ beq $zero, $zero, .L8086622C -/* 00510 80866220 8FBF001C */ lw $ra, 0x001C($sp) -.L80866224: -/* 00514 80866224 A20E0168 */ sb $t6, 0x0168($s0) ## 00000168 -.L80866228: -/* 00518 80866228 8FBF001C */ lw $ra, 0x001C($sp) -.L8086622C: -/* 0051C 8086622C 8FB00018 */ lw $s0, 0x0018($sp) -/* 00520 80866230 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 -/* 00524 80866234 03E00008 */ jr $ra -/* 00528 80866238 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Arrow_Ice/ArrowIce_Destroy.s b/asm/non_matchings/overlays/actors/ovl_Arrow_Ice/ArrowIce_Destroy.s deleted file mode 100644 index a931d808f4..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Arrow_Ice/ArrowIce_Destroy.s +++ /dev/null @@ -1,23 +0,0 @@ -glabel ArrowIce_Destroy -/* 00080 80867D50 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00084 80867D54 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00088 80867D58 AFA40018 */ sw $a0, 0x0018($sp) -/* 0008C 80867D5C 0C021DB2 */ jal func_800876C8 -/* 00090 80867D60 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 00094 80867D64 3C048087 */ lui $a0, %hi(D_80869B10) ## $a0 = 80870000 -/* 00098 80867D68 24849B10 */ addiu $a0, $a0, %lo(D_80869B10) ## $a0 = 80869B10 -/* 0009C 80867D6C 0C000B84 */ jal LogUtils_LogThreadId - -/* 000A0 80867D70 2405019F */ addiu $a1, $zero, 0x019F ## $a1 = 0000019F -/* 000A4 80867D74 3C048087 */ lui $a0, %hi(D_80869B24) ## $a0 = 80870000 -/* 000A8 80867D78 3C058087 */ lui $a1, %hi(D_80869B34) ## $a1 = 80870000 -/* 000AC 80867D7C 24A59B34 */ addiu $a1, $a1, %lo(D_80869B34) ## $a1 = 80869B34 -/* 000B0 80867D80 0C00084C */ jal osSyncPrintf - -/* 000B4 80867D84 24849B24 */ addiu $a0, $a0, %lo(D_80869B24) ## $a0 = 80869B24 -/* 000B8 80867D88 8FBF0014 */ lw $ra, 0x0014($sp) -/* 000BC 80867D8C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 000C0 80867D90 03E00008 */ jr $ra -/* 000C4 80867D94 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Arrow_Ice/ArrowIce_Draw.s b/asm/non_matchings/overlays/actors/ovl_Arrow_Ice/ArrowIce_Draw.s index 57317ce687..1f420aa367 100644 --- a/asm/non_matchings/overlays/actors/ovl_Arrow_Ice/ArrowIce_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Arrow_Ice/ArrowIce_Draw.s @@ -1,118 +1,118 @@ glabel ArrowIce_Draw /* 00580 80868250 27BDFF68 */ addiu $sp, $sp, 0xFF68 ## $sp = FFFFFF68 -/* 00584 80868254 AFBF003C */ sw $ra, 0x003C($sp) -/* 00588 80868258 AFB00038 */ sw $s0, 0x0038($sp) -/* 0058C 8086825C AFA40098 */ sw $a0, 0x0098($sp) -/* 00590 80868260 AFA5009C */ sw $a1, 0x009C($sp) +/* 00584 80868254 AFBF003C */ sw $ra, 0x003C($sp) +/* 00588 80868258 AFB00038 */ sw $s0, 0x0038($sp) +/* 0058C 8086825C AFA40098 */ sw $a0, 0x0098($sp) +/* 00590 80868260 AFA5009C */ sw $a1, 0x009C($sp) /* 00594 80868264 8CAF009C */ lw $t7, 0x009C($a1) ## 0000009C -/* 00598 80868268 AFAF0088 */ sw $t7, 0x0088($sp) +/* 00598 80868268 AFAF0088 */ sw $t7, 0x0088($sp) /* 0059C 8086826C 8C830118 */ lw $v1, 0x0118($a0) ## 00000118 -/* 005A0 80868270 5060010E */ beql $v1, $zero, .L808686AC -/* 005A4 80868274 8FBF003C */ lw $ra, 0x003C($sp) +/* 005A0 80868270 5060010E */ beql $v1, $zero, .L808686AC +/* 005A4 80868274 8FBF003C */ lw $ra, 0x003C($sp) /* 005A8 80868278 8C790130 */ lw $t9, 0x0130($v1) ## 00000130 -/* 005AC 8086827C 5320010B */ beql $t9, $zero, .L808686AC -/* 005B0 80868280 8FBF003C */ lw $ra, 0x003C($sp) +/* 005AC 8086827C 5320010B */ beql $t9, $zero, .L808686AC +/* 005B0 80868280 8FBF003C */ lw $ra, 0x003C($sp) /* 005B4 80868284 948D014E */ lhu $t5, 0x014E($a0) ## 0000014E /* 005B8 80868288 3C068087 */ lui $a2, %hi(D_80869B3C) ## $a2 = 80870000 /* 005BC 8086828C 24C69B3C */ addiu $a2, $a2, %lo(D_80869B3C) ## $a2 = 80869B3C -/* 005C0 80868290 29A100FF */ slti $at, $t5, 0x00FF -/* 005C4 80868294 10200104 */ beq $at, $zero, .L808686A8 -/* 005C8 80868298 8FB8009C */ lw $t8, 0x009C($sp) +/* 005C0 80868290 29A100FF */ slti $at, $t5, 0x00FF +/* 005C4 80868294 10200104 */ beq $at, $zero, .L808686A8 +/* 005C8 80868298 8FB8009C */ lw $t8, 0x009C($sp) /* 005CC 8086829C 906E0249 */ lbu $t6, 0x0249($v1) ## 00000249 /* 005D0 808682A0 24070262 */ addiu $a3, $zero, 0x0262 ## $a3 = 00000262 /* 005D4 808682A4 31CF0002 */ andi $t7, $t6, 0x0002 ## $t7 = 00000000 -/* 005D8 808682A8 51E00004 */ beql $t7, $zero, .L808682BC +/* 005D8 808682A8 51E00004 */ beql $t7, $zero, .L808682BC /* 005DC 808682AC 00601025 */ or $v0, $v1, $zero ## $v0 = 00000000 -/* 005E0 808682B0 10000002 */ beq $zero, $zero, .L808682BC +/* 005E0 808682B0 10000002 */ beq $zero, $zero, .L808682BC /* 005E4 808682B4 00801025 */ or $v0, $a0, $zero ## $v0 = 00000000 /* 005E8 808682B8 00601025 */ or $v0, $v1, $zero ## $v0 = 00000000 .L808682BC: /* 005EC 808682BC 8F050000 */ lw $a1, 0x0000($t8) ## 00000000 -/* 005F0 808682C0 AFA2008C */ sw $v0, 0x008C($sp) +/* 005F0 808682C0 AFA2008C */ sw $v0, 0x008C($sp) /* 005F4 808682C4 27A40070 */ addiu $a0, $sp, 0x0070 ## $a0 = FFFFFFD8 -/* 005F8 808682C8 0C031AB1 */ jal func_800C6AC4 +/* 005F8 808682C8 0C031AB1 */ jal Graph_OpenDisps /* 005FC 808682CC 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 -/* 00600 808682D0 8FA2008C */ lw $v0, 0x008C($sp) +/* 00600 808682D0 8FA2008C */ lw $v0, 0x008C($sp) /* 00604 808682D4 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 /* 00608 808682D8 C44C0024 */ lwc1 $f12, 0x0024($v0) ## 00000024 /* 0060C 808682DC C44E0028 */ lwc1 $f14, 0x0028($v0) ## 00000028 -/* 00610 808682E0 0C034261 */ jal Matrix_Translate +/* 00610 808682E0 0C034261 */ jal Matrix_Translate /* 00614 808682E4 8C46002C */ lw $a2, 0x002C($v0) ## 0000002C -/* 00618 808682E8 8FA2008C */ lw $v0, 0x008C($sp) +/* 00618 808682E8 8FA2008C */ lw $v0, 0x008C($sp) /* 0061C 808682EC 3C018087 */ lui $at, %hi(D_80869B8C) ## $at = 80870000 -/* 00620 808682F0 C4289B8C */ lwc1 $f8, %lo(D_80869B8C)($at) +/* 00620 808682F0 C4289B8C */ lwc1 $f8, %lo(D_80869B8C)($at) /* 00624 808682F4 845900B6 */ lh $t9, 0x00B6($v0) ## 000000B6 /* 00628 808682F8 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 /* 0062C 808682FC 44992000 */ mtc1 $t9, $f4 ## $f4 = 0.00 /* 00630 80868300 00000000 */ nop -/* 00634 80868304 468021A0 */ cvt.s.w $f6, $f4 -/* 00638 80868308 46083302 */ mul.s $f12, $f6, $f8 -/* 0063C 8086830C 0C034348 */ jal Matrix_RotateY +/* 00634 80868304 468021A0 */ cvt.s.w $f6, $f4 +/* 00638 80868308 46083302 */ mul.s $f12, $f6, $f8 +/* 0063C 8086830C 0C034348 */ jal Matrix_RotateY /* 00640 80868310 00000000 */ nop -/* 00644 80868314 8FA2008C */ lw $v0, 0x008C($sp) +/* 00644 80868314 8FA2008C */ lw $v0, 0x008C($sp) /* 00648 80868318 3C018087 */ lui $at, %hi(D_80869B90) ## $at = 80870000 -/* 0064C 8086831C C4329B90 */ lwc1 $f18, %lo(D_80869B90)($at) +/* 0064C 8086831C C4329B90 */ lwc1 $f18, %lo(D_80869B90)($at) /* 00650 80868320 844C00B4 */ lh $t4, 0x00B4($v0) ## 000000B4 /* 00654 80868324 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 /* 00658 80868328 448C5000 */ mtc1 $t4, $f10 ## $f10 = 0.00 /* 0065C 8086832C 00000000 */ nop -/* 00660 80868330 46805420 */ cvt.s.w $f16, $f10 -/* 00664 80868334 46128302 */ mul.s $f12, $f16, $f18 -/* 00668 80868338 0C0342DC */ jal Matrix_RotateX +/* 00660 80868330 46805420 */ cvt.s.w $f16, $f10 +/* 00664 80868334 46128302 */ mul.s $f12, $f16, $f18 +/* 00668 80868338 0C0342DC */ jal Matrix_RotateX /* 0066C 8086833C 00000000 */ nop -/* 00670 80868340 8FA2008C */ lw $v0, 0x008C($sp) +/* 00670 80868340 8FA2008C */ lw $v0, 0x008C($sp) /* 00674 80868344 3C018087 */ lui $at, %hi(D_80869B94) ## $at = 80870000 -/* 00678 80868348 C4289B94 */ lwc1 $f8, %lo(D_80869B94)($at) +/* 00678 80868348 C4289B94 */ lwc1 $f8, %lo(D_80869B94)($at) /* 0067C 8086834C 844D00B8 */ lh $t5, 0x00B8($v0) ## 000000B8 /* 00680 80868350 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 /* 00684 80868354 448D2000 */ mtc1 $t5, $f4 ## $f4 = 0.00 /* 00688 80868358 00000000 */ nop -/* 0068C 8086835C 468021A0 */ cvt.s.w $f6, $f4 -/* 00690 80868360 46083302 */ mul.s $f12, $f6, $f8 -/* 00694 80868364 0C0343B5 */ jal Matrix_RotateZ +/* 0068C 8086835C 468021A0 */ cvt.s.w $f6, $f4 +/* 00690 80868360 46083302 */ mul.s $f12, $f6, $f8 +/* 00694 80868364 0C0343B5 */ jal Matrix_RotateZ /* 00698 80868368 00000000 */ nop /* 0069C 8086836C 3C018087 */ lui $at, %hi(D_80869B98) ## $at = 80870000 -/* 006A0 80868370 C42C9B98 */ lwc1 $f12, %lo(D_80869B98)($at) +/* 006A0 80868370 C42C9B98 */ lwc1 $f12, %lo(D_80869B98)($at) /* 006A4 80868374 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 006A8 80868378 44066000 */ mfc1 $a2, $f12 -/* 006AC 8086837C 0C0342A3 */ jal Matrix_Scale -/* 006B0 80868380 46006386 */ mov.s $f14, $f12 -/* 006B4 80868384 8FAE0098 */ lw $t6, 0x0098($sp) +/* 006A8 80868378 44066000 */ mfc1 $a2, $f12 +/* 006AC 8086837C 0C0342A3 */ jal Matrix_Scale +/* 006B0 80868380 46006386 */ mov.s $f14, $f12 +/* 006B4 80868384 8FAE0098 */ lw $t6, 0x0098($sp) /* 006B8 80868388 44805000 */ mtc1 $zero, $f10 ## $f10 = 0.00 /* 006BC 8086838C C5D00164 */ lwc1 $f16, 0x0164($t6) ## 00000164 -/* 006C0 80868390 4610503C */ c.lt.s $f10, $f16 +/* 006C0 80868390 4610503C */ c.lt.s $f10, $f16 /* 006C4 80868394 00000000 */ nop -/* 006C8 80868398 4502003A */ bc1fl .L80868484 -/* 006CC 8086839C 8FAE009C */ lw $t6, 0x009C($sp) -/* 006D0 808683A0 0C024DF0 */ jal func_800937C0 +/* 006C8 80868398 4502003A */ bc1fl .L80868484 +/* 006CC 8086839C 8FAE009C */ lw $t6, 0x009C($sp) +/* 006D0 808683A0 0C024DF0 */ jal func_800937C0 /* 006D4 808683A4 8E0402D0 */ lw $a0, 0x02D0($s0) ## 000002D0 /* 006D8 808683A8 AE0202D0 */ sw $v0, 0x02D0($s0) ## 000002D0 /* 006DC 808683AC 244F0008 */ addiu $t7, $v0, 0x0008 ## $t7 = 00000008 /* 006E0 808683B0 AE0F02D0 */ sw $t7, 0x02D0($s0) ## 000002D0 /* 006E4 808683B4 3C18FA00 */ lui $t8, 0xFA00 ## $t8 = FA000000 /* 006E8 808683B8 AC580000 */ sw $t8, 0x0000($v0) ## 00000000 -/* 006EC 808683BC 8FB90098 */ lw $t9, 0x0098($sp) +/* 006EC 808683BC 8FB90098 */ lw $t9, 0x0098($sp) /* 006F0 808683C0 3C014120 */ lui $at, 0x4120 ## $at = 41200000 /* 006F4 808683C4 44819000 */ mtc1 $at, $f18 ## $f18 = 10.00 /* 006F8 808683C8 C7200164 */ lwc1 $f0, 0x0164($t9) ## 00000164 /* 006FC 808683CC 3C014248 */ lui $at, 0x4248 ## $at = 42480000 /* 00700 808683D0 44814000 */ mtc1 $at, $f8 ## $f8 = 50.00 -/* 00704 808683D4 46120102 */ mul.s $f4, $f0, $f18 +/* 00704 808683D4 46120102 */ mul.s $f4, $f0, $f18 /* 00708 808683D8 3C014316 */ lui $at, 0x4316 ## $at = 43160000 /* 0070C 808683DC 44819000 */ mtc1 $at, $f18 ## $f18 = 150.00 -/* 00710 808683E0 46004282 */ mul.s $f10, $f8, $f0 -/* 00714 808683E4 4600218D */ trunc.w.s $f6, $f4 -/* 00718 808683E8 46009102 */ mul.s $f4, $f18, $f0 -/* 0071C 808683EC 440E3000 */ mfc1 $t6, $f6 -/* 00720 808683F0 4600540D */ trunc.w.s $f16, $f10 +/* 00710 808683E0 46004282 */ mul.s $f10, $f8, $f0 +/* 00714 808683E4 4600218D */ trunc.w.s $f6, $f4 +/* 00718 808683E8 46009102 */ mul.s $f4, $f18, $f0 +/* 0071C 808683EC 440E3000 */ mfc1 $t6, $f6 +/* 00720 808683F0 4600540D */ trunc.w.s $f16, $f10 /* 00724 808683F4 31CF00FF */ andi $t7, $t6, 0x00FF ## $t7 = 00000000 -/* 00728 808683F8 000FC400 */ sll $t8, $t7, 16 -/* 0072C 808683FC 4600218D */ trunc.w.s $f6, $f4 -/* 00730 80868400 440D8000 */ mfc1 $t5, $f16 +/* 00728 808683F8 000FC400 */ sll $t8, $t7, 16 +/* 0072C 808683FC 4600218D */ trunc.w.s $f6, $f4 +/* 00730 80868400 440D8000 */ mfc1 $t5, $f16 /* 00734 80868404 00000000 */ nop /* 00738 80868408 31AE00FF */ andi $t6, $t5, 0x00FF ## $t6 = 00000000 -/* 0073C 8086840C 000E7A00 */ sll $t7, $t6, 8 -/* 00740 80868410 440E3000 */ mfc1 $t6, $f6 +/* 0073C 8086840C 000E7A00 */ sll $t7, $t6, 8 +/* 00740 80868410 440E3000 */ mfc1 $t6, $f6 /* 00744 80868414 030FC825 */ or $t9, $t8, $t7 ## $t9 = FA000000 /* 00748 80868418 3C0DE300 */ lui $t5, 0xE300 ## $t5 = E3000000 /* 0074C 8086841C 31D800FF */ andi $t8, $t6, 0x00FF ## $t8 = 00000000 @@ -140,9 +140,9 @@ glabel ArrowIce_Draw /* 007A4 80868474 AE0C02D0 */ sw $t4, 0x02D0($s0) ## 000002D0 /* 007A8 80868478 AC400004 */ sw $zero, 0x0004($v0) ## 00000004 /* 007AC 8086847C AC4D0000 */ sw $t5, 0x0000($v0) ## 00000000 -/* 007B0 80868480 8FAE009C */ lw $t6, 0x009C($sp) +/* 007B0 80868480 8FAE009C */ lw $t6, 0x009C($sp) .L80868484: -/* 007B4 80868484 0C024F61 */ jal func_80093D84 +/* 007B4 80868484 0C024F61 */ jal func_80093D84 /* 007B8 80868488 8DC40000 */ lw $a0, 0x0000($t6) ## 00000030 /* 007BC 8086848C 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 /* 007C0 80868490 3C18FA00 */ lui $t8, 0xFA00 ## $t8 = FA000000 @@ -150,7 +150,7 @@ glabel ArrowIce_Draw /* 007C8 80868498 24590008 */ addiu $t9, $v0, 0x0008 ## $t9 = 00000008 /* 007CC 8086849C AE1902D0 */ sw $t9, 0x02D0($s0) ## 000002D0 /* 007D0 808684A0 AC580000 */ sw $t8, 0x0000($v0) ## 00000000 -/* 007D4 808684A4 8FAF0098 */ lw $t7, 0x0098($sp) +/* 007D4 808684A4 8FAF0098 */ lw $t7, 0x0098($sp) /* 007D8 808684A8 3C01AAFF */ lui $at, 0xAAFF ## $at = AAFF0000 /* 007DC 808684AC 3421FF00 */ ori $at, $at, 0xFF00 ## $at = AAFFFF00 /* 007E0 808684B0 91ED0150 */ lbu $t5, 0x0150($t7) ## 00000150 @@ -166,47 +166,47 @@ glabel ArrowIce_Draw /* 00808 808684D8 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 /* 0080C 808684DC 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 /* 00810 808684E0 AC4F0004 */ sw $t7, 0x0004($v0) ## 00000004 -/* 00814 808684E4 0C034421 */ jal Matrix_RotateXYZ +/* 00814 808684E4 0C034421 */ jal Matrix_RotateZYX /* 00818 808684E8 AC580000 */ sw $t8, 0x0000($v0) ## 00000000 -/* 0081C 808684EC 8FAC0098 */ lw $t4, 0x0098($sp) +/* 0081C 808684EC 8FAC0098 */ lw $t4, 0x0098($sp) /* 00820 808684F0 3C018087 */ lui $at, %hi(D_80869B9C) ## $at = 80870000 /* 00824 808684F4 24060000 */ addiu $a2, $zero, 0x0000 ## $a2 = 00000000 /* 00828 808684F8 958D014E */ lhu $t5, 0x014E($t4) ## 0000014E /* 0082C 808684FC 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 00830 80868500 51A00009 */ beql $t5, $zero, .L80868528 +/* 00830 80868500 51A00009 */ beql $t5, $zero, .L80868528 /* 00834 80868504 44806000 */ mtc1 $zero, $f12 ## $f12 = 0.00 /* 00838 80868508 44806000 */ mtc1 $zero, $f12 ## $f12 = 0.00 /* 0083C 8086850C 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 00840 80868510 44066000 */ mfc1 $a2, $f12 -/* 00844 80868514 0C034261 */ jal Matrix_Translate -/* 00848 80868518 46006386 */ mov.s $f14, $f12 -/* 0084C 8086851C 10000005 */ beq $zero, $zero, .L80868534 -/* 00850 80868520 8FAE0098 */ lw $t6, 0x0098($sp) +/* 00840 80868510 44066000 */ mfc1 $a2, $f12 +/* 00844 80868514 0C034261 */ jal Matrix_Translate +/* 00848 80868518 46006386 */ mov.s $f14, $f12 +/* 0084C 8086851C 10000005 */ beq $zero, $zero, .L80868534 +/* 00850 80868520 8FAE0098 */ lw $t6, 0x0098($sp) /* 00854 80868524 44806000 */ mtc1 $zero, $f12 ## $f12 = 0.00 .L80868528: -/* 00858 80868528 0C034261 */ jal Matrix_Translate -/* 0085C 8086852C C42E9B9C */ lwc1 $f14, %lo(D_80869B9C)($at) -/* 00860 80868530 8FAE0098 */ lw $t6, 0x0098($sp) +/* 00858 80868528 0C034261 */ jal Matrix_Translate +/* 0085C 8086852C C42E9B9C */ lwc1 $f14, %lo(D_80869B9C)($at) +/* 00860 80868530 8FAE0098 */ lw $t6, 0x0098($sp) .L80868534: /* 00864 80868534 3C018087 */ lui $at, %hi(D_80869BA0) ## $at = 80870000 -/* 00868 80868538 C4309BA0 */ lwc1 $f16, %lo(D_80869BA0)($at) +/* 00868 80868538 C4309BA0 */ lwc1 $f16, %lo(D_80869BA0)($at) /* 0086C 8086853C 85D9014C */ lh $t9, 0x014C($t6) ## 0000014C /* 00870 80868540 3C014040 */ lui $at, 0x4040 ## $at = 40400000 /* 00874 80868544 44812000 */ mtc1 $at, $f4 ## $f4 = 3.00 /* 00878 80868548 44994000 */ mtc1 $t9, $f8 ## $f8 = 0.00 /* 0087C 8086854C C5D20160 */ lwc1 $f18, 0x0160($t6) ## 00000160 /* 00880 80868550 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 00884 80868554 468042A0 */ cvt.s.w $f10, $f8 -/* 00888 80868558 46105302 */ mul.s $f12, $f10, $f16 -/* 0088C 8086855C 44066000 */ mfc1 $a2, $f12 -/* 00890 80868560 46049382 */ mul.s $f14, $f18, $f4 -/* 00894 80868564 0C0342A3 */ jal Matrix_Scale +/* 00884 80868554 468042A0 */ cvt.s.w $f10, $f8 +/* 00888 80868558 46105302 */ mul.s $f12, $f10, $f16 +/* 0088C 8086855C 44066000 */ mfc1 $a2, $f12 +/* 00890 80868560 46049382 */ mul.s $f14, $f18, $f4 +/* 00894 80868564 0C0342A3 */ jal Matrix_Scale /* 00898 80868568 00000000 */ nop /* 0089C 8086856C 44806000 */ mtc1 $zero, $f12 ## $f12 = 0.00 /* 008A0 80868570 3C01C42F */ lui $at, 0xC42F ## $at = C42F0000 /* 008A4 80868574 44817000 */ mtc1 $at, $f14 ## $f14 = -700.00 -/* 008A8 80868578 44066000 */ mfc1 $a2, $f12 -/* 008AC 8086857C 0C034261 */ jal Matrix_Translate +/* 008A8 80868578 44066000 */ mfc1 $a2, $f12 +/* 008AC 8086857C 0C034261 */ jal Matrix_Translate /* 008B0 80868580 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 /* 008B4 80868584 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 /* 008B8 80868588 3C0FDA38 */ lui $t7, 0xDA38 ## $t7 = DA380000 @@ -214,14 +214,14 @@ glabel ArrowIce_Draw /* 008C0 80868590 24580008 */ addiu $t8, $v0, 0x0008 ## $t8 = 00000008 /* 008C4 80868594 AE1802D0 */ sw $t8, 0x02D0($s0) ## 000002D0 /* 008C8 80868598 AC4F0000 */ sw $t7, 0x0000($v0) ## 00000000 -/* 008CC 8086859C 8FAC009C */ lw $t4, 0x009C($sp) +/* 008CC 8086859C 8FAC009C */ lw $t4, 0x009C($sp) /* 008D0 808685A0 3C058087 */ lui $a1, %hi(D_80869B50) ## $a1 = 80870000 /* 008D4 808685A4 24A59B50 */ addiu $a1, $a1, %lo(D_80869B50) ## $a1 = 80869B50 /* 008D8 808685A8 8D840000 */ lw $a0, 0x0000($t4) ## 00000000 /* 008DC 808685AC 24060294 */ addiu $a2, $zero, 0x0294 ## $a2 = 00000294 -/* 008E0 808685B0 0C0346A2 */ jal Matrix_NewMtx -/* 008E4 808685B4 AFA20054 */ sw $v0, 0x0054($sp) -/* 008E8 808685B8 8FA30054 */ lw $v1, 0x0054($sp) +/* 008E0 808685B0 0C0346A2 */ jal Matrix_NewMtx +/* 008E4 808685B4 AFA20054 */ sw $v0, 0x0054($sp) +/* 008E8 808685B8 8FA30054 */ lw $v1, 0x0054($sp) /* 008EC 808685BC 3C198087 */ lui $t9, %hi(D_80869970) ## $t9 = 80870000 /* 008F0 808685C0 27399970 */ addiu $t9, $t9, %lo(D_80869970) ## $t9 = 80869970 /* 008F4 808685C4 AC620004 */ sw $v0, 0x0004($v1) ## 00000004 @@ -233,38 +233,38 @@ glabel ArrowIce_Draw /* 0090C 808685DC AC4A0000 */ sw $t2, 0x0000($v0) ## 00000000 /* 00910 808685E0 AC590004 */ sw $t9, 0x0004($v0) ## 00000004 /* 00914 808685E4 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 00918 808685E8 8FAB0088 */ lw $t3, 0x0088($sp) +/* 00918 808685E8 8FAB0088 */ lw $t3, 0x0088($sp) /* 0091C 808685EC 240D0080 */ addiu $t5, $zero, 0x0080 ## $t5 = 00000080 /* 00920 808685F0 244E0008 */ addiu $t6, $v0, 0x0008 ## $t6 = 00000008 /* 00924 808685F4 AE0E02D0 */ sw $t6, 0x02D0($s0) ## 000002D0 /* 00928 808685F8 AC4A0000 */ sw $t2, 0x0000($v0) ## 00000000 -/* 0092C 808685FC 8FB8009C */ lw $t8, 0x009C($sp) -/* 00930 80868600 000B7880 */ sll $t7, $t3, 2 -/* 00934 80868604 01EB7821 */ addu $t7, $t7, $t3 +/* 0092C 808685FC 8FB8009C */ lw $t8, 0x009C($sp) +/* 00930 80868600 000B7880 */ sll $t7, $t3, 2 +/* 00934 80868604 01EB7821 */ addu $t7, $t7, $t3 /* 00938 80868608 8F040000 */ lw $a0, 0x0000($t8) ## 00000000 -/* 0093C 8086860C 000BC080 */ sll $t8, $t3, 2 +/* 0093C 8086860C 000BC080 */ sll $t8, $t3, 2 /* 00940 80868610 31EC01FF */ andi $t4, $t7, 0x01FF ## $t4 = 00000000 -/* 00944 80868614 030BC021 */ addu $t8, $t8, $t3 -/* 00948 80868618 0018C040 */ sll $t8, $t8, 1 +/* 00944 80868614 030BC021 */ addu $t8, $t8, $t3 +/* 00948 80868618 0018C040 */ sll $t8, $t8, 1 /* 0094C 8086861C 330F01FF */ andi $t7, $t8, 0x01FF ## $t7 = 00000000 -/* 00950 80868620 012C3023 */ subu $a2, $t1, $t4 -/* 00954 80868624 AFAD0010 */ sw $t5, 0x0010($sp) +/* 00950 80868620 012C3023 */ subu $a2, $t1, $t4 +/* 00954 80868624 AFAD0010 */ sw $t5, 0x0010($sp) /* 00958 80868628 240D0010 */ addiu $t5, $zero, 0x0010 ## $t5 = 00000010 /* 0095C 8086862C 240C0004 */ addiu $t4, $zero, 0x0004 ## $t4 = 00000004 -/* 00960 80868630 012F1823 */ subu $v1, $t1, $t7 +/* 00960 80868630 012F1823 */ subu $v1, $t1, $t7 /* 00964 80868634 240E0001 */ addiu $t6, $zero, 0x0001 ## $t6 = 00000001 /* 00968 80868638 24190020 */ addiu $t9, $zero, 0x0020 ## $t9 = 00000020 -/* 0096C 8086863C AFB90014 */ sw $t9, 0x0014($sp) -/* 00970 80868640 AFAE0018 */ sw $t6, 0x0018($sp) -/* 00974 80868644 AFA3001C */ sw $v1, 0x001C($sp) -/* 00978 80868648 AFA30020 */ sw $v1, 0x0020($sp) -/* 0097C 8086864C AFAC0024 */ sw $t4, 0x0024($sp) -/* 00980 80868650 AFAD0028 */ sw $t5, 0x0028($sp) +/* 0096C 8086863C AFB90014 */ sw $t9, 0x0014($sp) +/* 00970 80868640 AFAE0018 */ sw $t6, 0x0018($sp) +/* 00974 80868644 AFA3001C */ sw $v1, 0x001C($sp) +/* 00978 80868648 AFA30020 */ sw $v1, 0x0020($sp) +/* 0097C 8086864C AFAC0024 */ sw $t4, 0x0024($sp) +/* 00980 80868650 AFAD0028 */ sw $t5, 0x0028($sp) /* 00984 80868654 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 00988 80868658 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 0098C 8086865C 0C0253D0 */ jal Draw_TwoTexScroll -/* 00990 80868660 AFA2004C */ sw $v0, 0x004C($sp) -/* 00994 80868664 8FA8004C */ lw $t0, 0x004C($sp) +/* 0098C 8086865C 0C0253D0 */ jal Gfx_TwoTexScroll +/* 00990 80868660 AFA2004C */ sw $v0, 0x004C($sp) +/* 00994 80868664 8FA8004C */ lw $t0, 0x004C($sp) /* 00998 80868668 3C188087 */ lui $t8, %hi(D_80869A20) ## $t8 = 80870000 /* 0099C 8086866C 27189A20 */ addiu $t8, $t8, %lo(D_80869A20) ## $t8 = 80869A20 /* 009A0 80868670 AD020004 */ sw $v0, 0x0004($t0) ## 00000004 @@ -275,18 +275,18 @@ glabel ArrowIce_Draw /* 009B4 80868684 AE1902D0 */ sw $t9, 0x02D0($s0) ## 000002D0 /* 009B8 80868688 AC580004 */ sw $t8, 0x0004($v0) ## 00000004 /* 009BC 8086868C AC4E0000 */ sw $t6, 0x0000($v0) ## 00000000 -/* 009C0 80868690 8FAF009C */ lw $t7, 0x009C($sp) +/* 009C0 80868690 8FAF009C */ lw $t7, 0x009C($sp) /* 009C4 80868694 24C69B64 */ addiu $a2, $a2, %lo(D_80869B64) ## $a2 = 80869B64 /* 009C8 80868698 27A40070 */ addiu $a0, $sp, 0x0070 ## $a0 = FFFFFFD8 /* 009CC 8086869C 240702A4 */ addiu $a3, $zero, 0x02A4 ## $a3 = 000002A4 -/* 009D0 808686A0 0C031AD5 */ jal func_800C6B54 +/* 009D0 808686A0 0C031AD5 */ jal Graph_CloseDisps /* 009D4 808686A4 8DE50000 */ lw $a1, 0x0000($t7) ## 00000000 .L808686A8: -/* 009D8 808686A8 8FBF003C */ lw $ra, 0x003C($sp) +/* 009D8 808686A8 8FBF003C */ lw $ra, 0x003C($sp) .L808686AC: -/* 009DC 808686AC 8FB00038 */ lw $s0, 0x0038($sp) +/* 009DC 808686AC 8FB00038 */ lw $s0, 0x0038($sp) /* 009E0 808686B0 27BD0098 */ addiu $sp, $sp, 0x0098 ## $sp = 00000000 -/* 009E4 808686B4 03E00008 */ jr $ra +/* 009E4 808686B4 03E00008 */ jr $ra /* 009E8 808686B8 00000000 */ nop /* 009EC 808686BC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Arrow_Ice/ArrowIce_Init.s b/asm/non_matchings/overlays/actors/ovl_Arrow_Ice/ArrowIce_Init.s deleted file mode 100644 index 188497ebb0..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Arrow_Ice/ArrowIce_Init.s +++ /dev/null @@ -1,35 +0,0 @@ -glabel ArrowIce_Init -/* 00008 80867CD8 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 0000C 80867CDC AFA50024 */ sw $a1, 0x0024($sp) -/* 00010 80867CE0 AFBF001C */ sw $ra, 0x001C($sp) -/* 00014 80867CE4 AFB00018 */ sw $s0, 0x0018($sp) -/* 00018 80867CE8 3C058087 */ lui $a1, %hi(D_80869B00) ## $a1 = 80870000 -/* 0001C 80867CEC 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00020 80867CF0 0C01E037 */ jal Actor_ProcessInitChain - -/* 00024 80867CF4 24A59B00 */ addiu $a1, $a1, %lo(D_80869B00) ## $a1 = 80869B00 -/* 00028 80867CF8 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 0002C 80867CFC 44812000 */ mtc1 $at, $f4 ## $f4 = 1.00 -/* 00030 80867D00 3C058086 */ lui $a1, %hi(func_80867D98) ## $a1 = 80860000 -/* 00034 80867D04 A600014C */ sh $zero, 0x014C($s0) ## 0000014C -/* 00038 80867D08 24A57D98 */ addiu $a1, $a1, %lo(func_80867D98) ## $a1 = 80867D98 -/* 0003C 80867D0C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00040 80867D10 0C219F34 */ jal func_80867CD0 -/* 00044 80867D14 E6040160 */ swc1 $f4, 0x0160($s0) ## 00000160 -/* 00048 80867D18 3C053C23 */ lui $a1, 0x3C23 ## $a1 = 3C230000 -/* 0004C 80867D1C 34A5D70A */ ori $a1, $a1, 0xD70A ## $a1 = 3C23D70A -/* 00050 80867D20 0C00B58B */ jal Actor_SetScale - -/* 00054 80867D24 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00058 80867D28 44803000 */ mtc1 $zero, $f6 ## $f6 = 0.00 -/* 0005C 80867D2C 240E0064 */ addiu $t6, $zero, 0x0064 ## $t6 = 00000064 -/* 00060 80867D30 A20E0150 */ sb $t6, 0x0150($s0) ## 00000150 -/* 00064 80867D34 A600014E */ sh $zero, 0x014E($s0) ## 0000014E -/* 00068 80867D38 E6060164 */ swc1 $f6, 0x0164($s0) ## 00000164 -/* 0006C 80867D3C 8FBF001C */ lw $ra, 0x001C($sp) -/* 00070 80867D40 8FB00018 */ lw $s0, 0x0018($sp) -/* 00074 80867D44 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 00078 80867D48 03E00008 */ jr $ra -/* 0007C 80867D4C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Arrow_Ice/ArrowIce_Update.s b/asm/non_matchings/overlays/actors/ovl_Arrow_Ice/ArrowIce_Update.s deleted file mode 100644 index f82d10d8ed..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Arrow_Ice/ArrowIce_Update.s +++ /dev/null @@ -1,28 +0,0 @@ -glabel ArrowIce_Update -/* 0052C 808681FC 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00530 80868200 3C020001 */ lui $v0, 0x0001 ## $v0 = 00010000 -/* 00534 80868204 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00538 80868208 00451021 */ addu $v0, $v0, $a1 -/* 0053C 8086820C 904203DC */ lbu $v0, 0x03DC($v0) ## 000103DC -/* 00540 80868210 2401000D */ addiu $at, $zero, 0x000D ## $at = 0000000D -/* 00544 80868214 10410003 */ beq $v0, $at, .L80868224 -/* 00548 80868218 24010011 */ addiu $at, $zero, 0x0011 ## $at = 00000011 -/* 0054C 8086821C 54410006 */ bnel $v0, $at, .L80868238 -/* 00550 80868220 8C990168 */ lw $t9, 0x0168($a0) ## 00000168 -.L80868224: -/* 00554 80868224 0C00B55C */ jal Actor_Kill - -/* 00558 80868228 00000000 */ nop -/* 0055C 8086822C 10000005 */ beq $zero, $zero, .L80868244 -/* 00560 80868230 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00564 80868234 8C990168 */ lw $t9, 0x0168($a0) ## 00000168 -.L80868238: -/* 00568 80868238 0320F809 */ jalr $ra, $t9 -/* 0056C 8086823C 00000000 */ nop -/* 00570 80868240 8FBF0014 */ lw $ra, 0x0014($sp) -.L80868244: -/* 00574 80868244 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00578 80868248 03E00008 */ jr $ra -/* 0057C 8086824C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Arrow_Ice/func_80867CD0.s b/asm/non_matchings/overlays/actors/ovl_Arrow_Ice/func_80867CD0.s deleted file mode 100644 index c67b438181..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Arrow_Ice/func_80867CD0.s +++ /dev/null @@ -1,5 +0,0 @@ -glabel func_80867CD0 -/* 00000 80867CD0 03E00008 */ jr $ra -/* 00004 80867CD4 AC850168 */ sw $a1, 0x0168($a0) ## 00000168 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Arrow_Ice/func_80867D98.s b/asm/non_matchings/overlays/actors/ovl_Arrow_Ice/func_80867D98.s deleted file mode 100644 index 8eefa1396e..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Arrow_Ice/func_80867D98.s +++ /dev/null @@ -1,69 +0,0 @@ -glabel func_80867D98 -/* 000C8 80867D98 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 000CC 80867D9C AFBF0014 */ sw $ra, 0x0014($sp) -/* 000D0 80867DA0 AFA50024 */ sw $a1, 0x0024($sp) -/* 000D4 80867DA4 8C820118 */ lw $v0, 0x0118($a0) ## 00000118 -/* 000D8 80867DA8 10400004 */ beq $v0, $zero, .L80867DBC -/* 000DC 80867DAC 00000000 */ nop -/* 000E0 80867DB0 8C4E0130 */ lw $t6, 0x0130($v0) ## 00000130 -/* 000E4 80867DB4 55C00006 */ bnel $t6, $zero, .L80867DD0 -/* 000E8 80867DB8 8483014C */ lh $v1, 0x014C($a0) ## 0000014C -.L80867DBC: -/* 000EC 80867DBC 0C00B55C */ jal Actor_Kill - -/* 000F0 80867DC0 00000000 */ nop -/* 000F4 80867DC4 1000002E */ beq $zero, $zero, .L80867E80 -/* 000F8 80867DC8 8FBF0014 */ lw $ra, 0x0014($sp) -/* 000FC 80867DCC 8483014C */ lh $v1, 0x014C($a0) ## 0000014C -.L80867DD0: -/* 00100 80867DD0 2861000A */ slti $at, $v1, 0x000A -/* 00104 80867DD4 10200002 */ beq $at, $zero, .L80867DE0 -/* 00108 80867DD8 246F0001 */ addiu $t7, $v1, 0x0001 ## $t7 = 00000001 -/* 0010C 80867DDC A48F014C */ sh $t7, 0x014C($a0) ## 0000014C -.L80867DE0: -/* 00110 80867DE0 8C590024 */ lw $t9, 0x0024($v0) ## 00000024 -/* 00114 80867DE4 24830024 */ addiu $v1, $a0, 0x0024 ## $v1 = 00000024 -/* 00118 80867DE8 2405007E */ addiu $a1, $zero, 0x007E ## $a1 = 0000007E -/* 0011C 80867DEC AC790000 */ sw $t9, 0x0000($v1) ## 00000024 -/* 00120 80867DF0 8C580028 */ lw $t8, 0x0028($v0) ## 00000028 -/* 00124 80867DF4 AC780004 */ sw $t8, 0x0004($v1) ## 00000028 -/* 00128 80867DF8 8C59002C */ lw $t9, 0x002C($v0) ## 0000002C -/* 0012C 80867DFC AC790008 */ sw $t9, 0x0008($v1) ## 0000002C -/* 00130 80867E00 884900B4 */ lwl $t1, 0x00B4($v0) ## 000000B4 -/* 00134 80867E04 984900B7 */ lwr $t1, 0x00B7($v0) ## 000000B7 -/* 00138 80867E08 A88900B4 */ swl $t1, 0x00B4($a0) ## 000000B4 -/* 0013C 80867E0C B88900B7 */ swr $t1, 0x00B7($a0) ## 000000B7 -/* 00140 80867E10 944900B8 */ lhu $t1, 0x00B8($v0) ## 000000B8 -/* 00144 80867E14 A48900B8 */ sh $t1, 0x00B8($a0) ## 000000B8 -/* 00148 80867E18 AFA40020 */ sw $a0, 0x0020($sp) -/* 0014C 80867E1C AFA30018 */ sw $v1, 0x0018($sp) -/* 00150 80867E20 0C00BE5D */ jal func_8002F974 -/* 00154 80867E24 AFA2001C */ sw $v0, 0x001C($sp) -/* 00158 80867E28 8FA2001C */ lw $v0, 0x001C($sp) -/* 0015C 80867E2C 8FA30018 */ lw $v1, 0x0018($sp) -/* 00160 80867E30 8FA40020 */ lw $a0, 0x0020($sp) -/* 00164 80867E34 8C4A0118 */ lw $t2, 0x0118($v0) ## 00000118 -/* 00168 80867E38 55400011 */ bnel $t2, $zero, .L80867E80 -/* 0016C 80867E3C 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00170 80867E40 8C6C0000 */ lw $t4, 0x0000($v1) ## 00000000 -/* 00174 80867E44 240D000A */ addiu $t5, $zero, 0x000A ## $t5 = 0000000A -/* 00178 80867E48 3C058087 */ lui $a1, %hi(func_808680A8) ## $a1 = 80870000 -/* 0017C 80867E4C AC8C0154 */ sw $t4, 0x0154($a0) ## 00000154 -/* 00180 80867E50 8C6B0004 */ lw $t3, 0x0004($v1) ## 00000004 -/* 00184 80867E54 24A580A8 */ addiu $a1, $a1, %lo(func_808680A8) ## $a1 = 808680A8 -/* 00188 80867E58 AC8B0158 */ sw $t3, 0x0158($a0) ## 00000158 -/* 0018C 80867E5C 8C6C0008 */ lw $t4, 0x0008($v1) ## 00000008 -/* 00190 80867E60 A48D014C */ sh $t5, 0x014C($a0) ## 0000014C -/* 00194 80867E64 AC8C015C */ sw $t4, 0x015C($a0) ## 0000015C -/* 00198 80867E68 0C219F34 */ jal func_80867CD0 -/* 0019C 80867E6C AFA40020 */ sw $a0, 0x0020($sp) -/* 001A0 80867E70 8FA40020 */ lw $a0, 0x0020($sp) -/* 001A4 80867E74 240E00FF */ addiu $t6, $zero, 0x00FF ## $t6 = 000000FF -/* 001A8 80867E78 A08E0150 */ sb $t6, 0x0150($a0) ## 00000150 -/* 001AC 80867E7C 8FBF0014 */ lw $ra, 0x0014($sp) -.L80867E80: -/* 001B0 80867E80 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 001B4 80867E84 03E00008 */ jr $ra -/* 001B8 80867E88 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Arrow_Ice/func_80867E8C.s b/asm/non_matchings/overlays/actors/ovl_Arrow_Ice/func_80867E8C.s deleted file mode 100644 index 19eed90b19..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Arrow_Ice/func_80867E8C.s +++ /dev/null @@ -1,23 +0,0 @@ -glabel func_80867E8C -/* 001BC 80867E8C C4800000 */ lwc1 $f0, 0x0000($a0) ## 00000000 -/* 001C0 80867E90 C4A40000 */ lwc1 $f4, 0x0000($a1) ## 00000000 -/* 001C4 80867E94 44866000 */ mtc1 $a2, $f12 ## $f12 = 0.00 -/* 001C8 80867E98 C4820004 */ lwc1 $f2, 0x0004($a0) ## 00000004 -/* 001CC 80867E9C 46002181 */ sub.s $f6, $f4, $f0 -/* 001D0 80867EA0 C48E0008 */ lwc1 $f14, 0x0008($a0) ## 00000008 -/* 001D4 80867EA4 460C3202 */ mul.s $f8, $f6, $f12 -/* 001D8 80867EA8 46080280 */ add.s $f10, $f0, $f8 -/* 001DC 80867EAC E48A0000 */ swc1 $f10, 0x0000($a0) ## 00000000 -/* 001E0 80867EB0 C4B00004 */ lwc1 $f16, 0x0004($a1) ## 00000004 -/* 001E4 80867EB4 46028481 */ sub.s $f18, $f16, $f2 -/* 001E8 80867EB8 460C9102 */ mul.s $f4, $f18, $f12 -/* 001EC 80867EBC 46041180 */ add.s $f6, $f2, $f4 -/* 001F0 80867EC0 E4860004 */ swc1 $f6, 0x0004($a0) ## 00000004 -/* 001F4 80867EC4 C4A80008 */ lwc1 $f8, 0x0008($a1) ## 00000008 -/* 001F8 80867EC8 460E4281 */ sub.s $f10, $f8, $f14 -/* 001FC 80867ECC 460C5402 */ mul.s $f16, $f10, $f12 -/* 00200 80867ED0 46107480 */ add.s $f18, $f14, $f16 -/* 00204 80867ED4 03E00008 */ jr $ra -/* 00208 80867ED8 E4920008 */ swc1 $f18, 0x0008($a0) ## 00000008 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Arrow_Ice/func_80867EDC.s b/asm/non_matchings/overlays/actors/ovl_Arrow_Ice/func_80867EDC.s deleted file mode 100644 index 5db49a724a..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Arrow_Ice/func_80867EDC.s +++ /dev/null @@ -1,128 +0,0 @@ -glabel func_80867EDC -/* 0020C 80867EDC 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00210 80867EE0 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00214 80867EE4 AFA5001C */ sw $a1, 0x001C($sp) -/* 00218 80867EE8 3C014248 */ lui $at, 0x4248 ## $at = 42480000 -/* 0021C 80867EEC 44811000 */ mtc1 $at, $f2 ## $f2 = 50.00 -/* 00220 80867EF0 C48000F0 */ lwc1 $f0, 0x00F0($a0) ## 000000F0 -/* 00224 80867EF4 3C018087 */ lui $at, %hi(D_80869B78) ## $at = 80870000 -/* 00228 80867EF8 4602003C */ c.lt.s $f0, $f2 -/* 0022C 80867EFC 00000000 */ nop -/* 00230 80867F00 45000005 */ bc1f .L80867F18 -/* 00234 80867F04 00000000 */ nop -/* 00238 80867F08 3C014120 */ lui $at, 0x4120 ## $at = 41200000 -/* 0023C 80867F0C 44816000 */ mtc1 $at, $f12 ## $f12 = 10.00 -/* 00240 80867F10 10000012 */ beq $zero, $zero, .L80867F5C -/* 00244 80867F14 9483014E */ lhu $v1, 0x014E($a0) ## 0000014E -.L80867F18: -/* 00248 80867F18 C4249B78 */ lwc1 $f4, %lo(D_80869B78)($at) -/* 0024C 80867F1C 3C018087 */ lui $at, %hi(D_80869B7C) ## $at = 80870000 -/* 00250 80867F20 4600203C */ c.lt.s $f4, $f0 -/* 00254 80867F24 00000000 */ nop -/* 00258 80867F28 45020006 */ bc1fl .L80867F44 -/* 0025C 80867F2C 46020181 */ sub.s $f6, $f0, $f2 -/* 00260 80867F30 3C01439B */ lui $at, 0x439B ## $at = 439B0000 -/* 00264 80867F34 44816000 */ mtc1 $at, $f12 ## $f12 = 310.00 -/* 00268 80867F38 10000008 */ beq $zero, $zero, .L80867F5C -/* 0026C 80867F3C 9483014E */ lhu $v1, 0x014E($a0) ## 0000014E -/* 00270 80867F40 46020181 */ sub.s $f6, $f0, $f2 -.L80867F44: -/* 00274 80867F44 C4289B7C */ lwc1 $f8, %lo(D_80869B7C)($at) -/* 00278 80867F48 3C014120 */ lui $at, 0x4120 ## $at = 41200000 -/* 0027C 80867F4C 44818000 */ mtc1 $at, $f16 ## $f16 = 10.00 -/* 00280 80867F50 46083282 */ mul.s $f10, $f6, $f8 -/* 00284 80867F54 46105300 */ add.s $f12, $f10, $f16 -/* 00288 80867F58 9483014E */ lhu $v1, 0x014E($a0) ## 0000014E -.L80867F5C: -/* 0028C 80867F5C 240A00FF */ addiu $t2, $zero, 0x00FF ## $t2 = 000000FF -/* 00290 80867F60 10600029 */ beq $v1, $zero, .L80868008 -/* 00294 80867F64 246EFFFF */ addiu $t6, $v1, 0xFFFF ## $t6 = FFFFFFFF -/* 00298 80867F68 31C3FFFF */ andi $v1, $t6, 0xFFFF ## $v1 = 0000FFFF -/* 0029C 80867F6C 28610008 */ slti $at, $v1, 0x0008 -/* 002A0 80867F70 A48E014E */ sh $t6, 0x014E($a0) ## 0000014E -/* 002A4 80867F74 14200024 */ bne $at, $zero, .L80868008 -/* 002A8 80867F78 00601025 */ or $v0, $v1, $zero ## $v0 = 0000FFFF -/* 002AC 80867F7C 244FFFF8 */ addiu $t7, $v0, 0xFFF8 ## $t7 = 0000FFF7 -/* 002B0 80867F80 448F9000 */ mtc1 $t7, $f18 ## $f18 = 0.00 -/* 002B4 80867F84 3C018087 */ lui $at, %hi(D_80869B80) ## $at = 80870000 -/* 002B8 80867F88 C4269B80 */ lwc1 $f6, %lo(D_80869B80)($at) -/* 002BC 80867F8C 46809120 */ cvt.s.w $f4, $f18 -/* 002C0 80867F90 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 002C4 80867F94 44814000 */ mtc1 $at, $f8 ## $f8 = 1.00 -/* 002C8 80867F98 3C014120 */ lui $at, 0x4120 ## $at = 41200000 -/* 002CC 80867F9C 44819000 */ mtc1 $at, $f18 ## $f18 = 10.00 -/* 002D0 80867FA0 3C014000 */ lui $at, 0x4000 ## $at = 40000000 -/* 002D4 80867FA4 46062002 */ mul.s $f0, $f4, $f6 -/* 002D8 80867FA8 C4820160 */ lwc1 $f2, 0x0160($a0) ## 00000160 -/* 002DC 80867FAC 000240C0 */ sll $t0, $v0, 3 -/* 002E0 80867FB0 01024021 */ addu $t0, $t0, $v0 -/* 002E4 80867FB4 00084080 */ sll $t0, $t0, 2 -/* 002E8 80867FB8 01024023 */ subu $t0, $t0, $v0 -/* 002EC 80867FBC 2509FEE8 */ addiu $t1, $t0, 0xFEE8 ## $t1 = FFFFFEE8 -/* 002F0 80867FC0 46000002 */ mul.s $f0, $f0, $f0 -/* 002F4 80867FC4 46004281 */ sub.s $f10, $f8, $f0 -/* 002F8 80867FC8 44814000 */ mtc1 $at, $f8 ## $f8 = 2.00 -/* 002FC 80867FCC 3C018087 */ lui $at, %hi(D_80869B84) ## $at = 80870000 -/* 00300 80867FD0 460C5402 */ mul.s $f16, $f10, $f12 -/* 00304 80867FD4 46024281 */ sub.s $f10, $f8, $f2 -/* 00308 80867FD8 46128100 */ add.s $f4, $f16, $f18 -/* 0030C 80867FDC 4600218D */ trunc.w.s $f6, $f4 -/* 00310 80867FE0 44193000 */ mfc1 $t9, $f6 -/* 00314 80867FE4 00000000 */ nop -/* 00318 80867FE8 A499014C */ sh $t9, 0x014C($a0) ## 0000014C -/* 0031C 80867FEC C4309B84 */ lwc1 $f16, %lo(D_80869B84)($at) -/* 00320 80867FF0 28410010 */ slti $at, $v0, 0x0010 -/* 00324 80867FF4 46105482 */ mul.s $f18, $f10, $f16 -/* 00328 80867FF8 46121100 */ add.s $f4, $f2, $f18 -/* 0032C 80867FFC 10200002 */ beq $at, $zero, .L80868008 -/* 00330 80868000 E4840160 */ swc1 $f4, 0x0160($a0) ## 00000160 -/* 00334 80868004 A0890150 */ sb $t1, 0x0150($a0) ## 00000150 -.L80868008: -/* 00338 80868008 28610009 */ slti $at, $v1, 0x0009 -/* 0033C 8086800C 1420000E */ bne $at, $zero, .L80868048 -/* 00340 80868010 00601025 */ or $v0, $v1, $zero ## $v0 = 0000FFFF -/* 00344 80868014 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 00348 80868018 44813000 */ mtc1 $at, $f6 ## $f6 = 1.00 -/* 0034C 8086801C C4800164 */ lwc1 $f0, 0x0164($a0) ## 00000164 -/* 00350 80868020 3C013E80 */ lui $at, 0x3E80 ## $at = 3E800000 -/* 00354 80868024 4606003C */ c.lt.s $f0, $f6 -/* 00358 80868028 00000000 */ nop -/* 0035C 8086802C 45020012 */ bc1fl .L80868078 -/* 00360 80868030 28410008 */ slti $at, $v0, 0x0008 -/* 00364 80868034 44814000 */ mtc1 $at, $f8 ## $f8 = 0.25 -/* 00368 80868038 9482014E */ lhu $v0, 0x014E($a0) ## 0000014E -/* 0036C 8086803C 46080280 */ add.s $f10, $f0, $f8 -/* 00370 80868040 1000000C */ beq $zero, $zero, .L80868074 -/* 00374 80868044 E48A0164 */ swc1 $f10, 0x0164($a0) ## 00000164 -.L80868048: -/* 00378 80868048 C4800164 */ lwc1 $f0, 0x0164($a0) ## 00000164 -/* 0037C 8086804C 44808000 */ mtc1 $zero, $f16 ## $f16 = 0.00 -/* 00380 80868050 3C013E00 */ lui $at, 0x3E00 ## $at = 3E000000 -/* 00384 80868054 4600803C */ c.lt.s $f16, $f0 -/* 00388 80868058 00000000 */ nop -/* 0038C 8086805C 45020006 */ bc1fl .L80868078 -/* 00390 80868060 28410008 */ slti $at, $v0, 0x0008 -/* 00394 80868064 44819000 */ mtc1 $at, $f18 ## $f18 = 0.12 -/* 00398 80868068 9482014E */ lhu $v0, 0x014E($a0) ## 0000014E -/* 0039C 8086806C 46120101 */ sub.s $f4, $f0, $f18 -/* 003A0 80868070 E4840164 */ swc1 $f4, 0x0164($a0) ## 00000164 -.L80868074: -/* 003A4 80868074 28410008 */ slti $at, $v0, 0x0008 -.L80868078: -/* 003A8 80868078 10200003 */ beq $at, $zero, .L80868088 -/* 003AC 8086807C 00000000 */ nop -/* 003B0 80868080 A0800150 */ sb $zero, 0x0150($a0) ## 00000150 -/* 003B4 80868084 9482014E */ lhu $v0, 0x014E($a0) ## 0000014E -.L80868088: -/* 003B8 80868088 54400004 */ bnel $v0, $zero, .L8086809C -/* 003BC 8086808C 8FBF0014 */ lw $ra, 0x0014($sp) -/* 003C0 80868090 0C00B55C */ jal Actor_Kill - -/* 003C4 80868094 A48A014E */ sh $t2, 0x014E($a0) ## 0000014E -/* 003C8 80868098 8FBF0014 */ lw $ra, 0x0014($sp) -.L8086809C: -/* 003CC 8086809C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 003D0 808680A0 03E00008 */ jr $ra -/* 003D4 808680A4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Arrow_Ice/func_808680A8.s b/asm/non_matchings/overlays/actors/ovl_Arrow_Ice/func_808680A8.s deleted file mode 100644 index 0707e0080f..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Arrow_Ice/func_808680A8.s +++ /dev/null @@ -1,99 +0,0 @@ -glabel func_808680A8 -/* 003D8 808680A8 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 003DC 808680AC AFBF001C */ sw $ra, 0x001C($sp) -/* 003E0 808680B0 AFB00018 */ sw $s0, 0x0018($sp) -/* 003E4 808680B4 AFA5003C */ sw $a1, 0x003C($sp) -/* 003E8 808680B8 8C820118 */ lw $v0, 0x0118($a0) ## 00000118 -/* 003EC 808680BC 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 003F0 808680C0 10400004 */ beq $v0, $zero, .L808680D4 -/* 003F4 808680C4 00000000 */ nop -/* 003F8 808680C8 8C4E0130 */ lw $t6, 0x0130($v0) ## 00000130 -/* 003FC 808680CC 55C00006 */ bnel $t6, $zero, .L808680E8 -/* 00400 808680D0 8C580024 */ lw $t8, 0x0024($v0) ## 00000024 -.L808680D4: -/* 00404 808680D4 0C00B55C */ jal Actor_Kill - -/* 00408 808680D8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0040C 808680DC 10000043 */ beq $zero, $zero, .L808681EC -/* 00410 808680E0 8FBF001C */ lw $ra, 0x001C($sp) -/* 00414 808680E4 8C580024 */ lw $t8, 0x0024($v0) ## 00000024 -.L808680E8: -/* 00418 808680E8 26050024 */ addiu $a1, $s0, 0x0024 ## $a1 = 00000024 -/* 0041C 808680EC 26040154 */ addiu $a0, $s0, 0x0154 ## $a0 = 00000154 -/* 00420 808680F0 ACB80000 */ sw $t8, 0x0000($a1) ## 00000024 -/* 00424 808680F4 8C4F0028 */ lw $t7, 0x0028($v0) ## 00000028 -/* 00428 808680F8 ACAF0004 */ sw $t7, 0x0004($a1) ## 00000028 -/* 0042C 808680FC 8C58002C */ lw $t8, 0x002C($v0) ## 0000002C -/* 00430 80868100 ACB80008 */ sw $t8, 0x0008($a1) ## 0000002C -/* 00434 80868104 884800B4 */ lwl $t0, 0x00B4($v0) ## 000000B4 -/* 00438 80868108 984800B7 */ lwr $t0, 0x00B7($v0) ## 000000B7 -/* 0043C 8086810C AA0800B4 */ swl $t0, 0x00B4($s0) ## 000000B4 -/* 00440 80868110 BA0800B7 */ swr $t0, 0x00B7($s0) ## 000000B7 -/* 00444 80868114 944800B8 */ lhu $t0, 0x00B8($v0) ## 000000B8 -/* 00448 80868118 A60800B8 */ sh $t0, 0x00B8($s0) ## 000000B8 -/* 0044C 8086811C AFA50028 */ sw $a1, 0x0028($sp) -/* 00450 80868120 AFA40024 */ sw $a0, 0x0024($sp) -/* 00454 80868124 0C01DFE4 */ jal Math_Vec3f_DistXYZ - -/* 00458 80868128 AFA20034 */ sw $v0, 0x0034($sp) -/* 0045C 8086812C 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 00460 80868130 44816000 */ mtc1 $at, $f12 ## $f12 = 1.00 -/* 00464 80868134 3C018087 */ lui $at, %hi(D_80869B88) ## $at = 80870000 -/* 00468 80868138 C4249B88 */ lwc1 $f4, %lo(D_80869B88)($at) -/* 0046C 8086813C 8FA20034 */ lw $v0, 0x0034($sp) -/* 00470 80868140 8FA40024 */ lw $a0, 0x0024($sp) -/* 00474 80868144 46040082 */ mul.s $f2, $f0, $f4 -/* 00478 80868148 8FA50028 */ lw $a1, 0x0028($sp) -/* 0047C 8086814C 3C063D4C */ lui $a2, 0x3D4C ## $a2 = 3D4C0000 -/* 00480 80868150 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3D4CCCCD -/* 00484 80868154 460C103C */ c.lt.s $f2, $f12 -/* 00488 80868158 E6020160 */ swc1 $f2, 0x0160($s0) ## 00000160 -/* 0048C 8086815C 45000002 */ bc1f .L80868168 -/* 00490 80868160 00000000 */ nop -/* 00494 80868164 E60C0160 */ swc1 $f12, 0x0160($s0) ## 00000160 -.L80868168: -/* 00498 80868168 0C219FA3 */ jal func_80867E8C -/* 0049C 8086816C AFA20034 */ sw $v0, 0x0034($sp) -/* 004A0 80868170 8FA20034 */ lw $v0, 0x0034($sp) -/* 004A4 80868174 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 004A8 80868178 90490249 */ lbu $t1, 0x0249($v0) ## 00000249 -/* 004AC 8086817C 312A0001 */ andi $t2, $t1, 0x0001 ## $t2 = 00000000 -/* 004B0 80868180 5140000D */ beql $t2, $zero, .L808681B8 -/* 004B4 80868184 904D0248 */ lbu $t5, 0x0248($v0) ## 00000248 -/* 004B8 80868188 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 004BC 8086818C 2405183B */ addiu $a1, $zero, 0x183B ## $a1 = 0000183B -/* 004C0 80868190 3C058086 */ lui $a1, %hi(func_80867EDC) ## $a1 = 80860000 -/* 004C4 80868194 24A57EDC */ addiu $a1, $a1, %lo(func_80867EDC) ## $a1 = 80867EDC -/* 004C8 80868198 0C219F34 */ jal func_80867CD0 -/* 004CC 8086819C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 004D0 808681A0 240B0020 */ addiu $t3, $zero, 0x0020 ## $t3 = 00000020 -/* 004D4 808681A4 240C00FF */ addiu $t4, $zero, 0x00FF ## $t4 = 000000FF -/* 004D8 808681A8 A60B014E */ sh $t3, 0x014E($s0) ## 0000014E -/* 004DC 808681AC 1000000E */ beq $zero, $zero, .L808681E8 -/* 004E0 808681B0 A20C0150 */ sb $t4, 0x0150($s0) ## 00000150 -/* 004E4 808681B4 904D0248 */ lbu $t5, 0x0248($v0) ## 00000248 -.L808681B8: -/* 004E8 808681B8 29A10022 */ slti $at, $t5, 0x0022 -/* 004EC 808681BC 5020000B */ beql $at, $zero, .L808681EC -/* 004F0 808681C0 8FBF001C */ lw $ra, 0x001C($sp) -/* 004F4 808681C4 92020150 */ lbu $v0, 0x0150($s0) ## 00000150 -/* 004F8 808681C8 28410023 */ slti $at, $v0, 0x0023 -/* 004FC 808681CC 10200005 */ beq $at, $zero, .L808681E4 -/* 00500 808681D0 244EFFE7 */ addiu $t6, $v0, 0xFFE7 ## $t6 = FFFFFFE7 -/* 00504 808681D4 0C00B55C */ jal Actor_Kill - -/* 00508 808681D8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0050C 808681DC 10000003 */ beq $zero, $zero, .L808681EC -/* 00510 808681E0 8FBF001C */ lw $ra, 0x001C($sp) -.L808681E4: -/* 00514 808681E4 A20E0150 */ sb $t6, 0x0150($s0) ## 00000150 -.L808681E8: -/* 00518 808681E8 8FBF001C */ lw $ra, 0x001C($sp) -.L808681EC: -/* 0051C 808681EC 8FB00018 */ lw $s0, 0x0018($sp) -/* 00520 808681F0 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 -/* 00524 808681F4 03E00008 */ jr $ra -/* 00528 808681F8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Arrow_Light/ArrowLight_Destroy.s b/asm/non_matchings/overlays/actors/ovl_Arrow_Light/ArrowLight_Destroy.s deleted file mode 100644 index 95ba6ee6d9..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Arrow_Light/ArrowLight_Destroy.s +++ /dev/null @@ -1,23 +0,0 @@ -glabel ArrowLight_Destroy -/* 00080 80869D30 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00084 80869D34 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00088 80869D38 AFA40018 */ sw $a0, 0x0018($sp) -/* 0008C 80869D3C 0C021DB2 */ jal func_800876C8 -/* 00090 80869D40 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 00094 80869D44 3C048087 */ lui $a0, %hi(D_8086BB00) ## $a0 = 80870000 -/* 00098 80869D48 2484BB00 */ addiu $a0, $a0, %lo(D_8086BB00) ## $a0 = 8086BB00 -/* 0009C 80869D4C 0C000B84 */ jal LogUtils_LogThreadId - -/* 000A0 80869D50 24050193 */ addiu $a1, $zero, 0x0193 ## $a1 = 00000193 -/* 000A4 80869D54 3C048087 */ lui $a0, %hi(D_8086BB14) ## $a0 = 80870000 -/* 000A8 80869D58 3C058087 */ lui $a1, %hi(D_8086BB24) ## $a1 = 80870000 -/* 000AC 80869D5C 24A5BB24 */ addiu $a1, $a1, %lo(D_8086BB24) ## $a1 = 8086BB24 -/* 000B0 80869D60 0C00084C */ jal osSyncPrintf - -/* 000B4 80869D64 2484BB14 */ addiu $a0, $a0, %lo(D_8086BB14) ## $a0 = 8086BB14 -/* 000B8 80869D68 8FBF0014 */ lw $ra, 0x0014($sp) -/* 000BC 80869D6C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 000C0 80869D70 03E00008 */ jr $ra -/* 000C4 80869D74 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Arrow_Light/ArrowLight_Draw.s b/asm/non_matchings/overlays/actors/ovl_Arrow_Light/ArrowLight_Draw.s index e5db139a55..318be74c72 100644 --- a/asm/non_matchings/overlays/actors/ovl_Arrow_Light/ArrowLight_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Arrow_Light/ArrowLight_Draw.s @@ -1,120 +1,120 @@ glabel ArrowLight_Draw /* 00580 8086A230 27BDFF68 */ addiu $sp, $sp, 0xFF68 ## $sp = FFFFFF68 -/* 00584 8086A234 AFBF003C */ sw $ra, 0x003C($sp) -/* 00588 8086A238 AFB00038 */ sw $s0, 0x0038($sp) -/* 0058C 8086A23C AFA40098 */ sw $a0, 0x0098($sp) -/* 00590 8086A240 AFA5009C */ sw $a1, 0x009C($sp) +/* 00584 8086A234 AFBF003C */ sw $ra, 0x003C($sp) +/* 00588 8086A238 AFB00038 */ sw $s0, 0x0038($sp) +/* 0058C 8086A23C AFA40098 */ sw $a0, 0x0098($sp) +/* 00590 8086A240 AFA5009C */ sw $a1, 0x009C($sp) /* 00594 8086A244 8CAF009C */ lw $t7, 0x009C($a1) ## 0000009C -/* 00598 8086A248 AFAF008C */ sw $t7, 0x008C($sp) +/* 00598 8086A248 AFAF008C */ sw $t7, 0x008C($sp) /* 0059C 8086A24C 8C830118 */ lw $v1, 0x0118($a0) ## 00000118 -/* 005A0 8086A250 50600112 */ beql $v1, $zero, .L8086A69C -/* 005A4 8086A254 8FBF003C */ lw $ra, 0x003C($sp) +/* 005A0 8086A250 50600112 */ beql $v1, $zero, .L8086A69C +/* 005A4 8086A254 8FBF003C */ lw $ra, 0x003C($sp) /* 005A8 8086A258 8C790130 */ lw $t9, 0x0130($v1) ## 00000130 -/* 005AC 8086A25C 5320010F */ beql $t9, $zero, .L8086A69C -/* 005B0 8086A260 8FBF003C */ lw $ra, 0x003C($sp) +/* 005AC 8086A25C 5320010F */ beql $t9, $zero, .L8086A69C +/* 005B0 8086A260 8FBF003C */ lw $ra, 0x003C($sp) /* 005B4 8086A264 948C014E */ lhu $t4, 0x014E($a0) ## 0000014E /* 005B8 8086A268 3C068087 */ lui $a2, %hi(D_8086BB2C) ## $a2 = 80870000 /* 005BC 8086A26C 24C6BB2C */ addiu $a2, $a2, %lo(D_8086BB2C) ## $a2 = 8086BB2C -/* 005C0 8086A270 298100FF */ slti $at, $t4, 0x00FF -/* 005C4 8086A274 10200108 */ beq $at, $zero, .L8086A698 -/* 005C8 8086A278 8FAF009C */ lw $t7, 0x009C($sp) +/* 005C0 8086A270 298100FF */ slti $at, $t4, 0x00FF +/* 005C4 8086A274 10200108 */ beq $at, $zero, .L8086A698 +/* 005C8 8086A278 8FAF009C */ lw $t7, 0x009C($sp) /* 005CC 8086A27C 906D0249 */ lbu $t5, 0x0249($v1) ## 00000249 /* 005D0 8086A280 24070256 */ addiu $a3, $zero, 0x0256 ## $a3 = 00000256 /* 005D4 8086A284 31AE0002 */ andi $t6, $t5, 0x0002 ## $t6 = 00000000 -/* 005D8 8086A288 51C00004 */ beql $t6, $zero, .L8086A29C +/* 005D8 8086A288 51C00004 */ beql $t6, $zero, .L8086A29C /* 005DC 8086A28C 00601025 */ or $v0, $v1, $zero ## $v0 = 00000000 -/* 005E0 8086A290 10000002 */ beq $zero, $zero, .L8086A29C +/* 005E0 8086A290 10000002 */ beq $zero, $zero, .L8086A29C /* 005E4 8086A294 00801025 */ or $v0, $a0, $zero ## $v0 = 00000000 /* 005E8 8086A298 00601025 */ or $v0, $v1, $zero ## $v0 = 00000000 .L8086A29C: /* 005EC 8086A29C 8DE50000 */ lw $a1, 0x0000($t7) ## 00000000 -/* 005F0 8086A2A0 AFA20084 */ sw $v0, 0x0084($sp) +/* 005F0 8086A2A0 AFA20084 */ sw $v0, 0x0084($sp) /* 005F4 8086A2A4 27A40070 */ addiu $a0, $sp, 0x0070 ## $a0 = FFFFFFD8 -/* 005F8 8086A2A8 0C031AB1 */ jal func_800C6AC4 +/* 005F8 8086A2A8 0C031AB1 */ jal Graph_OpenDisps /* 005FC 8086A2AC 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 -/* 00600 8086A2B0 8FA20084 */ lw $v0, 0x0084($sp) +/* 00600 8086A2B0 8FA20084 */ lw $v0, 0x0084($sp) /* 00604 8086A2B4 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 /* 00608 8086A2B8 C44C0024 */ lwc1 $f12, 0x0024($v0) ## 00000024 /* 0060C 8086A2BC C44E0028 */ lwc1 $f14, 0x0028($v0) ## 00000028 -/* 00610 8086A2C0 0C034261 */ jal Matrix_Translate +/* 00610 8086A2C0 0C034261 */ jal Matrix_Translate /* 00614 8086A2C4 8C46002C */ lw $a2, 0x002C($v0) ## 0000002C -/* 00618 8086A2C8 8FA20084 */ lw $v0, 0x0084($sp) +/* 00618 8086A2C8 8FA20084 */ lw $v0, 0x0084($sp) /* 0061C 8086A2CC 3C018087 */ lui $at, %hi(D_8086BB7C) ## $at = 80870000 -/* 00620 8086A2D0 C428BB7C */ lwc1 $f8, %lo(D_8086BB7C)($at) +/* 00620 8086A2D0 C428BB7C */ lwc1 $f8, %lo(D_8086BB7C)($at) /* 00624 8086A2D4 845800B6 */ lh $t8, 0x00B6($v0) ## 000000B6 /* 00628 8086A2D8 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 /* 0062C 8086A2DC 44982000 */ mtc1 $t8, $f4 ## $f4 = 0.00 /* 00630 8086A2E0 00000000 */ nop -/* 00634 8086A2E4 468021A0 */ cvt.s.w $f6, $f4 -/* 00638 8086A2E8 46083302 */ mul.s $f12, $f6, $f8 -/* 0063C 8086A2EC 0C034348 */ jal Matrix_RotateY +/* 00634 8086A2E4 468021A0 */ cvt.s.w $f6, $f4 +/* 00638 8086A2E8 46083302 */ mul.s $f12, $f6, $f8 +/* 0063C 8086A2EC 0C034348 */ jal Matrix_RotateY /* 00640 8086A2F0 00000000 */ nop -/* 00644 8086A2F4 8FA20084 */ lw $v0, 0x0084($sp) +/* 00644 8086A2F4 8FA20084 */ lw $v0, 0x0084($sp) /* 00648 8086A2F8 3C018087 */ lui $at, %hi(D_8086BB80) ## $at = 80870000 -/* 0064C 8086A2FC C432BB80 */ lwc1 $f18, %lo(D_8086BB80)($at) +/* 0064C 8086A2FC C432BB80 */ lwc1 $f18, %lo(D_8086BB80)($at) /* 00650 8086A300 845900B4 */ lh $t9, 0x00B4($v0) ## 000000B4 /* 00654 8086A304 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 /* 00658 8086A308 44995000 */ mtc1 $t9, $f10 ## $f10 = 0.00 /* 0065C 8086A30C 00000000 */ nop -/* 00660 8086A310 46805420 */ cvt.s.w $f16, $f10 -/* 00664 8086A314 46128302 */ mul.s $f12, $f16, $f18 -/* 00668 8086A318 0C0342DC */ jal Matrix_RotateX +/* 00660 8086A310 46805420 */ cvt.s.w $f16, $f10 +/* 00664 8086A314 46128302 */ mul.s $f12, $f16, $f18 +/* 00668 8086A318 0C0342DC */ jal Matrix_RotateX /* 0066C 8086A31C 00000000 */ nop -/* 00670 8086A320 8FA20084 */ lw $v0, 0x0084($sp) +/* 00670 8086A320 8FA20084 */ lw $v0, 0x0084($sp) /* 00674 8086A324 3C018087 */ lui $at, %hi(D_8086BB84) ## $at = 80870000 -/* 00678 8086A328 C428BB84 */ lwc1 $f8, %lo(D_8086BB84)($at) +/* 00678 8086A328 C428BB84 */ lwc1 $f8, %lo(D_8086BB84)($at) /* 0067C 8086A32C 844B00B8 */ lh $t3, 0x00B8($v0) ## 000000B8 /* 00680 8086A330 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 /* 00684 8086A334 448B2000 */ mtc1 $t3, $f4 ## $f4 = 0.00 /* 00688 8086A338 00000000 */ nop -/* 0068C 8086A33C 468021A0 */ cvt.s.w $f6, $f4 -/* 00690 8086A340 46083302 */ mul.s $f12, $f6, $f8 -/* 00694 8086A344 0C0343B5 */ jal Matrix_RotateZ +/* 0068C 8086A33C 468021A0 */ cvt.s.w $f6, $f4 +/* 00690 8086A340 46083302 */ mul.s $f12, $f6, $f8 +/* 00694 8086A344 0C0343B5 */ jal Matrix_RotateZ /* 00698 8086A348 00000000 */ nop /* 0069C 8086A34C 3C018087 */ lui $at, %hi(D_8086BB88) ## $at = 80870000 -/* 006A0 8086A350 C42CBB88 */ lwc1 $f12, %lo(D_8086BB88)($at) +/* 006A0 8086A350 C42CBB88 */ lwc1 $f12, %lo(D_8086BB88)($at) /* 006A4 8086A354 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 006A8 8086A358 44066000 */ mfc1 $a2, $f12 -/* 006AC 8086A35C 0C0342A3 */ jal Matrix_Scale -/* 006B0 8086A360 46006386 */ mov.s $f14, $f12 -/* 006B4 8086A364 8FAC0098 */ lw $t4, 0x0098($sp) +/* 006A8 8086A358 44066000 */ mfc1 $a2, $f12 +/* 006AC 8086A35C 0C0342A3 */ jal Matrix_Scale +/* 006B0 8086A360 46006386 */ mov.s $f14, $f12 +/* 006B4 8086A364 8FAC0098 */ lw $t4, 0x0098($sp) /* 006B8 8086A368 44805000 */ mtc1 $zero, $f10 ## $f10 = 0.00 /* 006BC 8086A36C C5900164 */ lwc1 $f16, 0x0164($t4) ## 00000164 -/* 006C0 8086A370 4610503C */ c.lt.s $f10, $f16 +/* 006C0 8086A370 4610503C */ c.lt.s $f10, $f16 /* 006C4 8086A374 00000000 */ nop -/* 006C8 8086A378 45020039 */ bc1fl .L8086A460 -/* 006CC 8086A37C 8FAE009C */ lw $t6, 0x009C($sp) -/* 006D0 8086A380 0C024DF0 */ jal func_800937C0 +/* 006C8 8086A378 45020039 */ bc1fl .L8086A460 +/* 006CC 8086A37C 8FAE009C */ lw $t6, 0x009C($sp) +/* 006D0 8086A380 0C024DF0 */ jal func_800937C0 /* 006D4 8086A384 8E0402D0 */ lw $a0, 0x02D0($s0) ## 000002D0 /* 006D8 8086A388 AE0202D0 */ sw $v0, 0x02D0($s0) ## 000002D0 /* 006DC 8086A38C 244D0008 */ addiu $t5, $v0, 0x0008 ## $t5 = 00000008 /* 006E0 8086A390 AE0D02D0 */ sw $t5, 0x02D0($s0) ## 000002D0 /* 006E4 8086A394 3C0EFA00 */ lui $t6, 0xFA00 ## $t6 = FA000000 /* 006E8 8086A398 AC4E0000 */ sw $t6, 0x0000($v0) ## 00000000 -/* 006EC 8086A39C 8FAF0098 */ lw $t7, 0x0098($sp) +/* 006EC 8086A39C 8FAF0098 */ lw $t7, 0x0098($sp) /* 006F0 8086A3A0 3C0141F0 */ lui $at, 0x41F0 ## $at = 41F00000 /* 006F4 8086A3A4 44819000 */ mtc1 $at, $f18 ## $f18 = 30.00 /* 006F8 8086A3A8 C5E00164 */ lwc1 $f0, 0x0164($t7) ## 00000164 /* 006FC 8086A3AC 3C014220 */ lui $at, 0x4220 ## $at = 42200000 /* 00700 8086A3B0 44814000 */ mtc1 $at, $f8 ## $f8 = 40.00 -/* 00704 8086A3B4 46120102 */ mul.s $f4, $f0, $f18 +/* 00704 8086A3B4 46120102 */ mul.s $f4, $f0, $f18 /* 00708 8086A3B8 3C014316 */ lui $at, 0x4316 ## $at = 43160000 /* 0070C 8086A3BC 44819000 */ mtc1 $at, $f18 ## $f18 = 150.00 -/* 00710 8086A3C0 46004282 */ mul.s $f10, $f8, $f0 +/* 00710 8086A3C0 46004282 */ mul.s $f10, $f8, $f0 /* 00714 8086A3C4 3C0EE300 */ lui $t6, 0xE300 ## $t6 = E3000000 /* 00718 8086A3C8 35CE1A01 */ ori $t6, $t6, 0x1A01 ## $t6 = E3001A01 /* 0071C 8086A3CC 240F0030 */ addiu $t7, $zero, 0x0030 ## $t7 = 00000030 -/* 00720 8086A3D0 4600218D */ trunc.w.s $f6, $f4 -/* 00724 8086A3D4 46009102 */ mul.s $f4, $f18, $f0 -/* 00728 8086A3D8 440C3000 */ mfc1 $t4, $f6 -/* 0072C 8086A3DC 4600540D */ trunc.w.s $f16, $f10 -/* 00730 8086A3E0 000C6E00 */ sll $t5, $t4, 24 -/* 00734 8086A3E4 4600218D */ trunc.w.s $f6, $f4 -/* 00738 8086A3E8 44188000 */ mfc1 $t8, $f16 +/* 00720 8086A3D0 4600218D */ trunc.w.s $f6, $f4 +/* 00724 8086A3D4 46009102 */ mul.s $f4, $f18, $f0 +/* 00728 8086A3D8 440C3000 */ mfc1 $t4, $f6 +/* 0072C 8086A3DC 4600540D */ trunc.w.s $f16, $f10 +/* 00730 8086A3E0 000C6E00 */ sll $t5, $t4, 24 +/* 00734 8086A3E4 4600218D */ trunc.w.s $f6, $f4 +/* 00738 8086A3E8 44188000 */ mfc1 $t8, $f16 /* 0073C 8086A3EC 00000000 */ nop /* 00740 8086A3F0 331900FF */ andi $t9, $t8, 0x00FF ## $t9 = 00000000 -/* 00744 8086A3F4 44183000 */ mfc1 $t8, $f6 -/* 00748 8086A3F8 00195C00 */ sll $t3, $t9, 16 +/* 00744 8086A3F4 44183000 */ mfc1 $t8, $f6 +/* 00748 8086A3F8 00195C00 */ sll $t3, $t9, 16 /* 0074C 8086A3FC 01AB6025 */ or $t4, $t5, $t3 ## $t4 = 00000008 /* 00750 8086A400 331900FF */ andi $t9, $t8, 0x00FF ## $t9 = 00000000 /* 00754 8086A404 01996825 */ or $t5, $t4, $t9 ## $t5 = 00000008 @@ -139,9 +139,9 @@ glabel ArrowLight_Draw /* 007A0 8086A450 AE0D02D0 */ sw $t5, 0x02D0($s0) ## 000002D0 /* 007A4 8086A454 AC400004 */ sw $zero, 0x0004($v0) ## 00000004 /* 007A8 8086A458 AC4B0000 */ sw $t3, 0x0000($v0) ## 00000000 -/* 007AC 8086A45C 8FAE009C */ lw $t6, 0x009C($sp) +/* 007AC 8086A45C 8FAE009C */ lw $t6, 0x009C($sp) .L8086A460: -/* 007B0 8086A460 0C024F61 */ jal func_80093D84 +/* 007B0 8086A460 0C024F61 */ jal func_80093D84 /* 007B4 8086A464 8DC40000 */ lw $a0, 0x0000($t6) ## E3001A01 /* 007B8 8086A468 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 /* 007BC 8086A46C 3C18FA00 */ lui $t8, 0xFA00 ## $t8 = FA000000 @@ -149,7 +149,7 @@ glabel ArrowLight_Draw /* 007C4 8086A474 244F0008 */ addiu $t7, $v0, 0x0008 ## $t7 = 00000008 /* 007C8 8086A478 AE0F02D0 */ sw $t7, 0x02D0($s0) ## 000002D0 /* 007CC 8086A47C AC580000 */ sw $t8, 0x0000($v0) ## 00000000 -/* 007D0 8086A480 8FAC0098 */ lw $t4, 0x0098($sp) +/* 007D0 8086A480 8FAC0098 */ lw $t4, 0x0098($sp) /* 007D4 8086A484 2401AA00 */ addiu $at, $zero, 0xAA00 ## $at = FFFFAA00 /* 007D8 8086A488 3C18FFFF */ lui $t8, 0xFFFF ## $t8 = FFFF0000 /* 007DC 8086A48C 918D0150 */ lbu $t5, 0x0150($t4) ## 00000150 @@ -165,47 +165,47 @@ glabel ArrowLight_Draw /* 00804 8086A4B4 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 /* 00808 8086A4B8 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 /* 0080C 8086A4BC AC580004 */ sw $t8, 0x0004($v0) ## 00000004 -/* 00810 8086A4C0 0C034421 */ jal Matrix_RotateXYZ +/* 00810 8086A4C0 0C034421 */ jal Matrix_RotateZYX /* 00814 8086A4C4 AC4F0000 */ sw $t7, 0x0000($v0) ## 00000000 -/* 00818 8086A4C8 8FAC0098 */ lw $t4, 0x0098($sp) +/* 00818 8086A4C8 8FAC0098 */ lw $t4, 0x0098($sp) /* 0081C 8086A4CC 3C018087 */ lui $at, %hi(D_8086BB8C) ## $at = 80870000 /* 00820 8086A4D0 24060000 */ addiu $a2, $zero, 0x0000 ## $a2 = 00000000 /* 00824 8086A4D4 9599014E */ lhu $t9, 0x014E($t4) ## 0000014E /* 00828 8086A4D8 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 0082C 8086A4DC 53200009 */ beql $t9, $zero, .L8086A504 +/* 0082C 8086A4DC 53200009 */ beql $t9, $zero, .L8086A504 /* 00830 8086A4E0 44806000 */ mtc1 $zero, $f12 ## $f12 = 0.00 /* 00834 8086A4E4 44806000 */ mtc1 $zero, $f12 ## $f12 = 0.00 /* 00838 8086A4E8 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 0083C 8086A4EC 44066000 */ mfc1 $a2, $f12 -/* 00840 8086A4F0 0C034261 */ jal Matrix_Translate -/* 00844 8086A4F4 46006386 */ mov.s $f14, $f12 -/* 00848 8086A4F8 10000005 */ beq $zero, $zero, .L8086A510 -/* 0084C 8086A4FC 8FAD0098 */ lw $t5, 0x0098($sp) +/* 0083C 8086A4EC 44066000 */ mfc1 $a2, $f12 +/* 00840 8086A4F0 0C034261 */ jal Matrix_Translate +/* 00844 8086A4F4 46006386 */ mov.s $f14, $f12 +/* 00848 8086A4F8 10000005 */ beq $zero, $zero, .L8086A510 +/* 0084C 8086A4FC 8FAD0098 */ lw $t5, 0x0098($sp) /* 00850 8086A500 44806000 */ mtc1 $zero, $f12 ## $f12 = 0.00 .L8086A504: -/* 00854 8086A504 0C034261 */ jal Matrix_Translate -/* 00858 8086A508 C42EBB8C */ lwc1 $f14, %lo(D_8086BB8C)($at) -/* 0085C 8086A50C 8FAD0098 */ lw $t5, 0x0098($sp) +/* 00854 8086A504 0C034261 */ jal Matrix_Translate +/* 00858 8086A508 C42EBB8C */ lwc1 $f14, %lo(D_8086BB8C)($at) +/* 0085C 8086A50C 8FAD0098 */ lw $t5, 0x0098($sp) .L8086A510: /* 00860 8086A510 3C018087 */ lui $at, %hi(D_8086BB90) ## $at = 80870000 -/* 00864 8086A514 C430BB90 */ lwc1 $f16, %lo(D_8086BB90)($at) +/* 00864 8086A514 C430BB90 */ lwc1 $f16, %lo(D_8086BB90)($at) /* 00868 8086A518 85AB014C */ lh $t3, 0x014C($t5) ## 0000014C /* 0086C 8086A51C 3C014080 */ lui $at, 0x4080 ## $at = 40800000 /* 00870 8086A520 44812000 */ mtc1 $at, $f4 ## $f4 = 4.00 /* 00874 8086A524 448B4000 */ mtc1 $t3, $f8 ## $f8 = 0.00 /* 00878 8086A528 C5B20160 */ lwc1 $f18, 0x0160($t5) ## 00000160 /* 0087C 8086A52C 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 00880 8086A530 468042A0 */ cvt.s.w $f10, $f8 -/* 00884 8086A534 46105302 */ mul.s $f12, $f10, $f16 -/* 00888 8086A538 44066000 */ mfc1 $a2, $f12 -/* 0088C 8086A53C 46049382 */ mul.s $f14, $f18, $f4 -/* 00890 8086A540 0C0342A3 */ jal Matrix_Scale +/* 00880 8086A530 468042A0 */ cvt.s.w $f10, $f8 +/* 00884 8086A534 46105302 */ mul.s $f12, $f10, $f16 +/* 00888 8086A538 44066000 */ mfc1 $a2, $f12 +/* 0088C 8086A53C 46049382 */ mul.s $f14, $f18, $f4 +/* 00890 8086A540 0C0342A3 */ jal Matrix_Scale /* 00894 8086A544 00000000 */ nop /* 00898 8086A548 44806000 */ mtc1 $zero, $f12 ## $f12 = 0.00 /* 0089C 8086A54C 3C01C42F */ lui $at, 0xC42F ## $at = C42F0000 /* 008A0 8086A550 44817000 */ mtc1 $at, $f14 ## $f14 = -700.00 -/* 008A4 8086A554 44066000 */ mfc1 $a2, $f12 -/* 008A8 8086A558 0C034261 */ jal Matrix_Translate +/* 008A4 8086A554 44066000 */ mfc1 $a2, $f12 +/* 008A8 8086A558 0C034261 */ jal Matrix_Translate /* 008AC 8086A55C 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 /* 008B0 8086A560 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 /* 008B4 8086A564 3C0FDA38 */ lui $t7, 0xDA38 ## $t7 = DA380000 @@ -213,14 +213,14 @@ glabel ArrowLight_Draw /* 008BC 8086A56C 244E0008 */ addiu $t6, $v0, 0x0008 ## $t6 = 00000008 /* 008C0 8086A570 AE0E02D0 */ sw $t6, 0x02D0($s0) ## 000002D0 /* 008C4 8086A574 AC4F0000 */ sw $t7, 0x0000($v0) ## 00000000 -/* 008C8 8086A578 8FB8009C */ lw $t8, 0x009C($sp) +/* 008C8 8086A578 8FB8009C */ lw $t8, 0x009C($sp) /* 008CC 8086A57C 3C058087 */ lui $a1, %hi(D_8086BB40) ## $a1 = 80870000 /* 008D0 8086A580 24A5BB40 */ addiu $a1, $a1, %lo(D_8086BB40) ## $a1 = 8086BB40 /* 008D4 8086A584 8F040000 */ lw $a0, 0x0000($t8) ## 00000000 /* 008D8 8086A588 24060288 */ addiu $a2, $zero, 0x0288 ## $a2 = 00000288 -/* 008DC 8086A58C 0C0346A2 */ jal Matrix_NewMtx -/* 008E0 8086A590 AFA20054 */ sw $v0, 0x0054($sp) -/* 008E4 8086A594 8FA30054 */ lw $v1, 0x0054($sp) +/* 008DC 8086A58C 0C0346A2 */ jal Matrix_NewMtx +/* 008E0 8086A590 AFA20054 */ sw $v0, 0x0054($sp) +/* 008E4 8086A594 8FA30054 */ lw $v1, 0x0054($sp) /* 008E8 8086A598 3C198087 */ lui $t9, %hi(D_8086B960) ## $t9 = 80870000 /* 008EC 8086A59C 2739B960 */ addiu $t9, $t9, %lo(D_8086B960) ## $t9 = 8086B960 /* 008F0 8086A5A0 AC620004 */ sw $v0, 0x0004($v1) ## 00000004 @@ -232,43 +232,43 @@ glabel ArrowLight_Draw /* 00908 8086A5B8 AC490000 */ sw $t1, 0x0000($v0) ## 00000000 /* 0090C 8086A5BC AC590004 */ sw $t9, 0x0004($v0) ## 00000004 /* 00910 8086A5C0 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 00914 8086A5C4 8FAA008C */ lw $t2, 0x008C($sp) +/* 00914 8086A5C4 8FAA008C */ lw $t2, 0x008C($sp) /* 00918 8086A5C8 24180004 */ addiu $t8, $zero, 0x0004 ## $t8 = 00000004 /* 0091C 8086A5CC 244B0008 */ addiu $t3, $v0, 0x0008 ## $t3 = 00000008 /* 00920 8086A5D0 AE0B02D0 */ sw $t3, 0x02D0($s0) ## 000002D0 /* 00924 8086A5D4 AC490000 */ sw $t1, 0x0000($v0) ## 00000000 -/* 00928 8086A5D8 8FAD009C */ lw $t5, 0x009C($sp) -/* 0092C 8086A5DC 000A7080 */ sll $t6, $t2, 2 -/* 00930 8086A5E0 01CA7021 */ addu $t6, $t6, $t2 +/* 00928 8086A5D8 8FAD009C */ lw $t5, 0x009C($sp) +/* 0092C 8086A5DC 000A7080 */ sll $t6, $t2, 2 +/* 00930 8086A5E0 01CA7021 */ addu $t6, $t6, $t2 /* 00934 8086A5E4 8DA40000 */ lw $a0, 0x0000($t5) ## 00000000 /* 00938 8086A5E8 31CF01FF */ andi $t7, $t6, 0x01FF ## $t7 = 00000000 -/* 0093C 8086A5EC 006F3023 */ subu $a2, $v1, $t7 -/* 00940 8086A5F0 000A5880 */ sll $t3, $t2, 2 -/* 00944 8086A5F4 016A5821 */ addu $t3, $t3, $t2 -/* 00948 8086A5F8 000A7900 */ sll $t7, $t2, 4 -/* 0094C 8086A5FC 000B5840 */ sll $t3, $t3, 1 -/* 00950 8086A600 01EA7823 */ subu $t7, $t7, $t2 -/* 00954 8086A604 000F7840 */ sll $t7, $t7, 1 +/* 0093C 8086A5EC 006F3023 */ subu $a2, $v1, $t7 +/* 00940 8086A5F0 000A5880 */ sll $t3, $t2, 2 +/* 00944 8086A5F4 016A5821 */ addu $t3, $t3, $t2 +/* 00948 8086A5F8 000A7900 */ sll $t7, $t2, 4 +/* 0094C 8086A5FC 000B5840 */ sll $t3, $t3, 1 +/* 00950 8086A600 01EA7823 */ subu $t7, $t7, $t2 +/* 00954 8086A604 000F7840 */ sll $t7, $t7, 1 /* 00958 8086A608 316D01FF */ andi $t5, $t3, 0x01FF ## $t5 = 00000008 -/* 0095C 8086A60C AFB80010 */ sw $t8, 0x0010($sp) +/* 0095C 8086A60C AFB80010 */ sw $t8, 0x0010($sp) /* 00960 8086A610 24190001 */ addiu $t9, $zero, 0x0001 ## $t9 = 00000001 /* 00964 8086A614 240C0020 */ addiu $t4, $zero, 0x0020 ## $t4 = 00000020 -/* 00968 8086A618 AFAC0014 */ sw $t4, 0x0014($sp) -/* 0096C 8086A61C AFB90018 */ sw $t9, 0x0018($sp) +/* 00968 8086A618 AFAC0014 */ sw $t4, 0x0014($sp) +/* 0096C 8086A61C AFB90018 */ sw $t9, 0x0018($sp) /* 00970 8086A620 31F801FF */ andi $t8, $t7, 0x01FF ## $t8 = 00000000 -/* 00974 8086A624 00786023 */ subu $t4, $v1, $t8 +/* 00974 8086A624 00786023 */ subu $t4, $v1, $t8 /* 00978 8086A628 24190008 */ addiu $t9, $zero, 0x0008 ## $t9 = 00000008 -/* 0097C 8086A62C 006D7023 */ subu $t6, $v1, $t5 +/* 0097C 8086A62C 006D7023 */ subu $t6, $v1, $t5 /* 00980 8086A630 240B0010 */ addiu $t3, $zero, 0x0010 ## $t3 = 00000010 -/* 00984 8086A634 AFAB0028 */ sw $t3, 0x0028($sp) -/* 00988 8086A638 AFAE001C */ sw $t6, 0x001C($sp) -/* 0098C 8086A63C AFB90024 */ sw $t9, 0x0024($sp) -/* 00990 8086A640 AFAC0020 */ sw $t4, 0x0020($sp) +/* 00984 8086A634 AFAB0028 */ sw $t3, 0x0028($sp) +/* 00988 8086A638 AFAE001C */ sw $t6, 0x001C($sp) +/* 0098C 8086A63C AFB90024 */ sw $t9, 0x0024($sp) +/* 00990 8086A640 AFAC0020 */ sw $t4, 0x0020($sp) /* 00994 8086A644 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 00998 8086A648 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 0099C 8086A64C 0C0253D0 */ jal Draw_TwoTexScroll -/* 009A0 8086A650 AFA2004C */ sw $v0, 0x004C($sp) -/* 009A4 8086A654 8FA8004C */ lw $t0, 0x004C($sp) +/* 0099C 8086A64C 0C0253D0 */ jal Gfx_TwoTexScroll +/* 009A0 8086A650 AFA2004C */ sw $v0, 0x004C($sp) +/* 009A4 8086A654 8FA8004C */ lw $t0, 0x004C($sp) /* 009A8 8086A658 3C0F8087 */ lui $t7, %hi(D_8086BA10) ## $t7 = 80870000 /* 009AC 8086A65C 25EFBA10 */ addiu $t7, $t7, %lo(D_8086BA10) ## $t7 = 8086BA10 /* 009B0 8086A660 AD020004 */ sw $v0, 0x0004($t0) ## 00000004 @@ -279,18 +279,18 @@ glabel ArrowLight_Draw /* 009C4 8086A674 AE0D02D0 */ sw $t5, 0x02D0($s0) ## 000002D0 /* 009C8 8086A678 AC4F0004 */ sw $t7, 0x0004($v0) ## 00000004 /* 009CC 8086A67C AC4E0000 */ sw $t6, 0x0000($v0) ## 00000000 -/* 009D0 8086A680 8FB8009C */ lw $t8, 0x009C($sp) +/* 009D0 8086A680 8FB8009C */ lw $t8, 0x009C($sp) /* 009D4 8086A684 24C6BB54 */ addiu $a2, $a2, %lo(D_8086BB54) ## $a2 = 8086BB54 /* 009D8 8086A688 27A40070 */ addiu $a0, $sp, 0x0070 ## $a0 = FFFFFFD8 /* 009DC 8086A68C 24070298 */ addiu $a3, $zero, 0x0298 ## $a3 = 00000298 -/* 009E0 8086A690 0C031AD5 */ jal func_800C6B54 +/* 009E0 8086A690 0C031AD5 */ jal Graph_CloseDisps /* 009E4 8086A694 8F050000 */ lw $a1, 0x0000($t8) ## 00000000 .L8086A698: -/* 009E8 8086A698 8FBF003C */ lw $ra, 0x003C($sp) +/* 009E8 8086A698 8FBF003C */ lw $ra, 0x003C($sp) .L8086A69C: -/* 009EC 8086A69C 8FB00038 */ lw $s0, 0x0038($sp) +/* 009EC 8086A69C 8FB00038 */ lw $s0, 0x0038($sp) /* 009F0 8086A6A0 27BD0098 */ addiu $sp, $sp, 0x0098 ## $sp = 00000000 -/* 009F4 8086A6A4 03E00008 */ jr $ra +/* 009F4 8086A6A4 03E00008 */ jr $ra /* 009F8 8086A6A8 00000000 */ nop /* 009FC 8086A6AC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Arrow_Light/ArrowLight_Init.s b/asm/non_matchings/overlays/actors/ovl_Arrow_Light/ArrowLight_Init.s deleted file mode 100644 index cc8f959a4f..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Arrow_Light/ArrowLight_Init.s +++ /dev/null @@ -1,35 +0,0 @@ -glabel ArrowLight_Init -/* 00008 80869CB8 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 0000C 80869CBC AFA50024 */ sw $a1, 0x0024($sp) -/* 00010 80869CC0 AFBF001C */ sw $ra, 0x001C($sp) -/* 00014 80869CC4 AFB00018 */ sw $s0, 0x0018($sp) -/* 00018 80869CC8 3C058087 */ lui $a1, %hi(D_8086BAF0) ## $a1 = 80870000 -/* 0001C 80869CCC 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00020 80869CD0 0C01E037 */ jal Actor_ProcessInitChain - -/* 00024 80869CD4 24A5BAF0 */ addiu $a1, $a1, %lo(D_8086BAF0) ## $a1 = 8086BAF0 -/* 00028 80869CD8 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 0002C 80869CDC 44812000 */ mtc1 $at, $f4 ## $f4 = 1.00 -/* 00030 80869CE0 3C058087 */ lui $a1, %hi(func_80869D78) ## $a1 = 80870000 -/* 00034 80869CE4 A600014C */ sh $zero, 0x014C($s0) ## 0000014C -/* 00038 80869CE8 24A59D78 */ addiu $a1, $a1, %lo(func_80869D78) ## $a1 = 80869D78 -/* 0003C 80869CEC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00040 80869CF0 0C21A72C */ jal func_80869CB0 -/* 00044 80869CF4 E6040160 */ swc1 $f4, 0x0160($s0) ## 00000160 -/* 00048 80869CF8 3C053C23 */ lui $a1, 0x3C23 ## $a1 = 3C230000 -/* 0004C 80869CFC 34A5D70A */ ori $a1, $a1, 0xD70A ## $a1 = 3C23D70A -/* 00050 80869D00 0C00B58B */ jal Actor_SetScale - -/* 00054 80869D04 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00058 80869D08 44803000 */ mtc1 $zero, $f6 ## $f6 = 0.00 -/* 0005C 80869D0C 240E0082 */ addiu $t6, $zero, 0x0082 ## $t6 = 00000082 -/* 00060 80869D10 A20E0150 */ sb $t6, 0x0150($s0) ## 00000150 -/* 00064 80869D14 A600014E */ sh $zero, 0x014E($s0) ## 0000014E -/* 00068 80869D18 E6060164 */ swc1 $f6, 0x0164($s0) ## 00000164 -/* 0006C 80869D1C 8FBF001C */ lw $ra, 0x001C($sp) -/* 00070 80869D20 8FB00018 */ lw $s0, 0x0018($sp) -/* 00074 80869D24 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 00078 80869D28 03E00008 */ jr $ra -/* 0007C 80869D2C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Arrow_Light/ArrowLight_Update.s b/asm/non_matchings/overlays/actors/ovl_Arrow_Light/ArrowLight_Update.s deleted file mode 100644 index 9357b7f1f4..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Arrow_Light/ArrowLight_Update.s +++ /dev/null @@ -1,28 +0,0 @@ -glabel ArrowLight_Update -/* 0052C 8086A1DC 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00530 8086A1E0 3C020001 */ lui $v0, 0x0001 ## $v0 = 00010000 -/* 00534 8086A1E4 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00538 8086A1E8 00451021 */ addu $v0, $v0, $a1 -/* 0053C 8086A1EC 904203DC */ lbu $v0, 0x03DC($v0) ## 000103DC -/* 00540 8086A1F0 2401000D */ addiu $at, $zero, 0x000D ## $at = 0000000D -/* 00544 8086A1F4 10410003 */ beq $v0, $at, .L8086A204 -/* 00548 8086A1F8 24010011 */ addiu $at, $zero, 0x0011 ## $at = 00000011 -/* 0054C 8086A1FC 54410006 */ bnel $v0, $at, .L8086A218 -/* 00550 8086A200 8C990168 */ lw $t9, 0x0168($a0) ## 00000168 -.L8086A204: -/* 00554 8086A204 0C00B55C */ jal Actor_Kill - -/* 00558 8086A208 00000000 */ nop -/* 0055C 8086A20C 10000005 */ beq $zero, $zero, .L8086A224 -/* 00560 8086A210 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00564 8086A214 8C990168 */ lw $t9, 0x0168($a0) ## 00000168 -.L8086A218: -/* 00568 8086A218 0320F809 */ jalr $ra, $t9 -/* 0056C 8086A21C 00000000 */ nop -/* 00570 8086A220 8FBF0014 */ lw $ra, 0x0014($sp) -.L8086A224: -/* 00574 8086A224 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00578 8086A228 03E00008 */ jr $ra -/* 0057C 8086A22C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Arrow_Light/func_80869CB0.s b/asm/non_matchings/overlays/actors/ovl_Arrow_Light/func_80869CB0.s deleted file mode 100644 index 8b54394d72..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Arrow_Light/func_80869CB0.s +++ /dev/null @@ -1,5 +0,0 @@ -glabel func_80869CB0 -/* 00000 80869CB0 03E00008 */ jr $ra -/* 00004 80869CB4 AC850168 */ sw $a1, 0x0168($a0) ## 00000168 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Arrow_Light/func_80869D78.s b/asm/non_matchings/overlays/actors/ovl_Arrow_Light/func_80869D78.s deleted file mode 100644 index d412f9e701..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Arrow_Light/func_80869D78.s +++ /dev/null @@ -1,69 +0,0 @@ -glabel func_80869D78 -/* 000C8 80869D78 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 000CC 80869D7C AFBF0014 */ sw $ra, 0x0014($sp) -/* 000D0 80869D80 AFA50024 */ sw $a1, 0x0024($sp) -/* 000D4 80869D84 8C820118 */ lw $v0, 0x0118($a0) ## 00000118 -/* 000D8 80869D88 10400004 */ beq $v0, $zero, .L80869D9C -/* 000DC 80869D8C 00000000 */ nop -/* 000E0 80869D90 8C4E0130 */ lw $t6, 0x0130($v0) ## 00000130 -/* 000E4 80869D94 55C00006 */ bnel $t6, $zero, .L80869DB0 -/* 000E8 80869D98 8483014C */ lh $v1, 0x014C($a0) ## 0000014C -.L80869D9C: -/* 000EC 80869D9C 0C00B55C */ jal Actor_Kill - -/* 000F0 80869DA0 00000000 */ nop -/* 000F4 80869DA4 1000002E */ beq $zero, $zero, .L80869E60 -/* 000F8 80869DA8 8FBF0014 */ lw $ra, 0x0014($sp) -/* 000FC 80869DAC 8483014C */ lh $v1, 0x014C($a0) ## 0000014C -.L80869DB0: -/* 00100 80869DB0 2861000A */ slti $at, $v1, 0x000A -/* 00104 80869DB4 10200002 */ beq $at, $zero, .L80869DC0 -/* 00108 80869DB8 246F0001 */ addiu $t7, $v1, 0x0001 ## $t7 = 00000001 -/* 0010C 80869DBC A48F014C */ sh $t7, 0x014C($a0) ## 0000014C -.L80869DC0: -/* 00110 80869DC0 8C590024 */ lw $t9, 0x0024($v0) ## 00000024 -/* 00114 80869DC4 24830024 */ addiu $v1, $a0, 0x0024 ## $v1 = 00000024 -/* 00118 80869DC8 2405007F */ addiu $a1, $zero, 0x007F ## $a1 = 0000007F -/* 0011C 80869DCC AC790000 */ sw $t9, 0x0000($v1) ## 00000024 -/* 00120 80869DD0 8C580028 */ lw $t8, 0x0028($v0) ## 00000028 -/* 00124 80869DD4 AC780004 */ sw $t8, 0x0004($v1) ## 00000028 -/* 00128 80869DD8 8C59002C */ lw $t9, 0x002C($v0) ## 0000002C -/* 0012C 80869DDC AC790008 */ sw $t9, 0x0008($v1) ## 0000002C -/* 00130 80869DE0 884900B4 */ lwl $t1, 0x00B4($v0) ## 000000B4 -/* 00134 80869DE4 984900B7 */ lwr $t1, 0x00B7($v0) ## 000000B7 -/* 00138 80869DE8 A88900B4 */ swl $t1, 0x00B4($a0) ## 000000B4 -/* 0013C 80869DEC B88900B7 */ swr $t1, 0x00B7($a0) ## 000000B7 -/* 00140 80869DF0 944900B8 */ lhu $t1, 0x00B8($v0) ## 000000B8 -/* 00144 80869DF4 A48900B8 */ sh $t1, 0x00B8($a0) ## 000000B8 -/* 00148 80869DF8 AFA40020 */ sw $a0, 0x0020($sp) -/* 0014C 80869DFC AFA30018 */ sw $v1, 0x0018($sp) -/* 00150 80869E00 0C00BE5D */ jal func_8002F974 -/* 00154 80869E04 AFA2001C */ sw $v0, 0x001C($sp) -/* 00158 80869E08 8FA2001C */ lw $v0, 0x001C($sp) -/* 0015C 80869E0C 8FA30018 */ lw $v1, 0x0018($sp) -/* 00160 80869E10 8FA40020 */ lw $a0, 0x0020($sp) -/* 00164 80869E14 8C4A0118 */ lw $t2, 0x0118($v0) ## 00000118 -/* 00168 80869E18 55400011 */ bnel $t2, $zero, .L80869E60 -/* 0016C 80869E1C 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00170 80869E20 8C6C0000 */ lw $t4, 0x0000($v1) ## 00000000 -/* 00174 80869E24 240D000A */ addiu $t5, $zero, 0x000A ## $t5 = 0000000A -/* 00178 80869E28 3C058087 */ lui $a1, %hi(func_8086A088) ## $a1 = 80870000 -/* 0017C 80869E2C AC8C0154 */ sw $t4, 0x0154($a0) ## 00000154 -/* 00180 80869E30 8C6B0004 */ lw $t3, 0x0004($v1) ## 00000004 -/* 00184 80869E34 24A5A088 */ addiu $a1, $a1, %lo(func_8086A088) ## $a1 = 8086A088 -/* 00188 80869E38 AC8B0158 */ sw $t3, 0x0158($a0) ## 00000158 -/* 0018C 80869E3C 8C6C0008 */ lw $t4, 0x0008($v1) ## 00000008 -/* 00190 80869E40 A48D014C */ sh $t5, 0x014C($a0) ## 0000014C -/* 00194 80869E44 AC8C015C */ sw $t4, 0x015C($a0) ## 0000015C -/* 00198 80869E48 0C21A72C */ jal func_80869CB0 -/* 0019C 80869E4C AFA40020 */ sw $a0, 0x0020($sp) -/* 001A0 80869E50 8FA40020 */ lw $a0, 0x0020($sp) -/* 001A4 80869E54 240E00FF */ addiu $t6, $zero, 0x00FF ## $t6 = 000000FF -/* 001A8 80869E58 A08E0150 */ sb $t6, 0x0150($a0) ## 00000150 -/* 001AC 80869E5C 8FBF0014 */ lw $ra, 0x0014($sp) -.L80869E60: -/* 001B0 80869E60 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 001B4 80869E64 03E00008 */ jr $ra -/* 001B8 80869E68 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Arrow_Light/func_80869E6C.s b/asm/non_matchings/overlays/actors/ovl_Arrow_Light/func_80869E6C.s deleted file mode 100644 index 9a70855be0..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Arrow_Light/func_80869E6C.s +++ /dev/null @@ -1,23 +0,0 @@ -glabel func_80869E6C -/* 001BC 80869E6C C4800000 */ lwc1 $f0, 0x0000($a0) ## 00000000 -/* 001C0 80869E70 C4A40000 */ lwc1 $f4, 0x0000($a1) ## 00000000 -/* 001C4 80869E74 44866000 */ mtc1 $a2, $f12 ## $f12 = 0.00 -/* 001C8 80869E78 C4820004 */ lwc1 $f2, 0x0004($a0) ## 00000004 -/* 001CC 80869E7C 46002181 */ sub.s $f6, $f4, $f0 -/* 001D0 80869E80 C48E0008 */ lwc1 $f14, 0x0008($a0) ## 00000008 -/* 001D4 80869E84 460C3202 */ mul.s $f8, $f6, $f12 -/* 001D8 80869E88 46080280 */ add.s $f10, $f0, $f8 -/* 001DC 80869E8C E48A0000 */ swc1 $f10, 0x0000($a0) ## 00000000 -/* 001E0 80869E90 C4B00004 */ lwc1 $f16, 0x0004($a1) ## 00000004 -/* 001E4 80869E94 46028481 */ sub.s $f18, $f16, $f2 -/* 001E8 80869E98 460C9102 */ mul.s $f4, $f18, $f12 -/* 001EC 80869E9C 46041180 */ add.s $f6, $f2, $f4 -/* 001F0 80869EA0 E4860004 */ swc1 $f6, 0x0004($a0) ## 00000004 -/* 001F4 80869EA4 C4A80008 */ lwc1 $f8, 0x0008($a1) ## 00000008 -/* 001F8 80869EA8 460E4281 */ sub.s $f10, $f8, $f14 -/* 001FC 80869EAC 460C5402 */ mul.s $f16, $f10, $f12 -/* 00200 80869EB0 46107480 */ add.s $f18, $f14, $f16 -/* 00204 80869EB4 03E00008 */ jr $ra -/* 00208 80869EB8 E4920008 */ swc1 $f18, 0x0008($a0) ## 00000008 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Arrow_Light/func_80869EBC.s b/asm/non_matchings/overlays/actors/ovl_Arrow_Light/func_80869EBC.s deleted file mode 100644 index 209e6c0196..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Arrow_Light/func_80869EBC.s +++ /dev/null @@ -1,128 +0,0 @@ -glabel func_80869EBC -/* 0020C 80869EBC 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00210 80869EC0 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00214 80869EC4 AFA5001C */ sw $a1, 0x001C($sp) -/* 00218 80869EC8 3C014248 */ lui $at, 0x4248 ## $at = 42480000 -/* 0021C 80869ECC 44811000 */ mtc1 $at, $f2 ## $f2 = 50.00 -/* 00220 80869ED0 C48000F0 */ lwc1 $f0, 0x00F0($a0) ## 000000F0 -/* 00224 80869ED4 3C018087 */ lui $at, %hi(D_8086BB68) ## $at = 80870000 -/* 00228 80869ED8 4602003C */ c.lt.s $f0, $f2 -/* 0022C 80869EDC 00000000 */ nop -/* 00230 80869EE0 45000005 */ bc1f .L80869EF8 -/* 00234 80869EE4 00000000 */ nop -/* 00238 80869EE8 3C014120 */ lui $at, 0x4120 ## $at = 41200000 -/* 0023C 80869EEC 44816000 */ mtc1 $at, $f12 ## $f12 = 10.00 -/* 00240 80869EF0 10000012 */ beq $zero, $zero, .L80869F3C -/* 00244 80869EF4 9483014E */ lhu $v1, 0x014E($a0) ## 0000014E -.L80869EF8: -/* 00248 80869EF8 C424BB68 */ lwc1 $f4, %lo(D_8086BB68)($at) -/* 0024C 80869EFC 3C018087 */ lui $at, %hi(D_8086BB6C) ## $at = 80870000 -/* 00250 80869F00 4600203C */ c.lt.s $f4, $f0 -/* 00254 80869F04 00000000 */ nop -/* 00258 80869F08 45020006 */ bc1fl .L80869F24 -/* 0025C 80869F0C 46020181 */ sub.s $f6, $f0, $f2 -/* 00260 80869F10 3C01439B */ lui $at, 0x439B ## $at = 439B0000 -/* 00264 80869F14 44816000 */ mtc1 $at, $f12 ## $f12 = 310.00 -/* 00268 80869F18 10000008 */ beq $zero, $zero, .L80869F3C -/* 0026C 80869F1C 9483014E */ lhu $v1, 0x014E($a0) ## 0000014E -/* 00270 80869F20 46020181 */ sub.s $f6, $f0, $f2 -.L80869F24: -/* 00274 80869F24 C428BB6C */ lwc1 $f8, %lo(D_8086BB6C)($at) -/* 00278 80869F28 3C014120 */ lui $at, 0x4120 ## $at = 41200000 -/* 0027C 80869F2C 44818000 */ mtc1 $at, $f16 ## $f16 = 10.00 -/* 00280 80869F30 46083282 */ mul.s $f10, $f6, $f8 -/* 00284 80869F34 46105300 */ add.s $f12, $f10, $f16 -/* 00288 80869F38 9483014E */ lhu $v1, 0x014E($a0) ## 0000014E -.L80869F3C: -/* 0028C 80869F3C 240A00FF */ addiu $t2, $zero, 0x00FF ## $t2 = 000000FF -/* 00290 80869F40 10600029 */ beq $v1, $zero, .L80869FE8 -/* 00294 80869F44 246EFFFF */ addiu $t6, $v1, 0xFFFF ## $t6 = FFFFFFFF -/* 00298 80869F48 31C3FFFF */ andi $v1, $t6, 0xFFFF ## $v1 = 0000FFFF -/* 0029C 80869F4C 28610008 */ slti $at, $v1, 0x0008 -/* 002A0 80869F50 A48E014E */ sh $t6, 0x014E($a0) ## 0000014E -/* 002A4 80869F54 14200024 */ bne $at, $zero, .L80869FE8 -/* 002A8 80869F58 00601025 */ or $v0, $v1, $zero ## $v0 = 0000FFFF -/* 002AC 80869F5C 244FFFF8 */ addiu $t7, $v0, 0xFFF8 ## $t7 = 0000FFF7 -/* 002B0 80869F60 448F9000 */ mtc1 $t7, $f18 ## $f18 = 0.00 -/* 002B4 80869F64 3C018087 */ lui $at, %hi(D_8086BB70) ## $at = 80870000 -/* 002B8 80869F68 C426BB70 */ lwc1 $f6, %lo(D_8086BB70)($at) -/* 002BC 80869F6C 46809120 */ cvt.s.w $f4, $f18 -/* 002C0 80869F70 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 002C4 80869F74 44814000 */ mtc1 $at, $f8 ## $f8 = 1.00 -/* 002C8 80869F78 3C014120 */ lui $at, 0x4120 ## $at = 41200000 -/* 002CC 80869F7C 44819000 */ mtc1 $at, $f18 ## $f18 = 10.00 -/* 002D0 80869F80 3C014000 */ lui $at, 0x4000 ## $at = 40000000 -/* 002D4 80869F84 46062002 */ mul.s $f0, $f4, $f6 -/* 002D8 80869F88 C4820160 */ lwc1 $f2, 0x0160($a0) ## 00000160 -/* 002DC 80869F8C 000240C0 */ sll $t0, $v0, 3 -/* 002E0 80869F90 01024021 */ addu $t0, $t0, $v0 -/* 002E4 80869F94 00084080 */ sll $t0, $t0, 2 -/* 002E8 80869F98 01024023 */ subu $t0, $t0, $v0 -/* 002EC 80869F9C 2509FEE8 */ addiu $t1, $t0, 0xFEE8 ## $t1 = FFFFFEE8 -/* 002F0 80869FA0 46000002 */ mul.s $f0, $f0, $f0 -/* 002F4 80869FA4 46004281 */ sub.s $f10, $f8, $f0 -/* 002F8 80869FA8 44814000 */ mtc1 $at, $f8 ## $f8 = 2.00 -/* 002FC 80869FAC 3C018087 */ lui $at, %hi(D_8086BB74) ## $at = 80870000 -/* 00300 80869FB0 460C5402 */ mul.s $f16, $f10, $f12 -/* 00304 80869FB4 46024281 */ sub.s $f10, $f8, $f2 -/* 00308 80869FB8 46128100 */ add.s $f4, $f16, $f18 -/* 0030C 80869FBC 4600218D */ trunc.w.s $f6, $f4 -/* 00310 80869FC0 44193000 */ mfc1 $t9, $f6 -/* 00314 80869FC4 00000000 */ nop -/* 00318 80869FC8 A499014C */ sh $t9, 0x014C($a0) ## 0000014C -/* 0031C 80869FCC C430BB74 */ lwc1 $f16, %lo(D_8086BB74)($at) -/* 00320 80869FD0 28410010 */ slti $at, $v0, 0x0010 -/* 00324 80869FD4 46105482 */ mul.s $f18, $f10, $f16 -/* 00328 80869FD8 46121100 */ add.s $f4, $f2, $f18 -/* 0032C 80869FDC 10200002 */ beq $at, $zero, .L80869FE8 -/* 00330 80869FE0 E4840160 */ swc1 $f4, 0x0160($a0) ## 00000160 -/* 00334 80869FE4 A0890150 */ sb $t1, 0x0150($a0) ## 00000150 -.L80869FE8: -/* 00338 80869FE8 28610009 */ slti $at, $v1, 0x0009 -/* 0033C 80869FEC 1420000E */ bne $at, $zero, .L8086A028 -/* 00340 80869FF0 00601025 */ or $v0, $v1, $zero ## $v0 = 0000FFFF -/* 00344 80869FF4 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 00348 80869FF8 44813000 */ mtc1 $at, $f6 ## $f6 = 1.00 -/* 0034C 80869FFC C4800164 */ lwc1 $f0, 0x0164($a0) ## 00000164 -/* 00350 8086A000 3C013E80 */ lui $at, 0x3E80 ## $at = 3E800000 -/* 00354 8086A004 4606003C */ c.lt.s $f0, $f6 -/* 00358 8086A008 00000000 */ nop -/* 0035C 8086A00C 45020012 */ bc1fl .L8086A058 -/* 00360 8086A010 28410008 */ slti $at, $v0, 0x0008 -/* 00364 8086A014 44814000 */ mtc1 $at, $f8 ## $f8 = 0.25 -/* 00368 8086A018 9482014E */ lhu $v0, 0x014E($a0) ## 0000014E -/* 0036C 8086A01C 46080280 */ add.s $f10, $f0, $f8 -/* 00370 8086A020 1000000C */ beq $zero, $zero, .L8086A054 -/* 00374 8086A024 E48A0164 */ swc1 $f10, 0x0164($a0) ## 00000164 -.L8086A028: -/* 00378 8086A028 C4800164 */ lwc1 $f0, 0x0164($a0) ## 00000164 -/* 0037C 8086A02C 44808000 */ mtc1 $zero, $f16 ## $f16 = 0.00 -/* 00380 8086A030 3C013E00 */ lui $at, 0x3E00 ## $at = 3E000000 -/* 00384 8086A034 4600803C */ c.lt.s $f16, $f0 -/* 00388 8086A038 00000000 */ nop -/* 0038C 8086A03C 45020006 */ bc1fl .L8086A058 -/* 00390 8086A040 28410008 */ slti $at, $v0, 0x0008 -/* 00394 8086A044 44819000 */ mtc1 $at, $f18 ## $f18 = 0.12 -/* 00398 8086A048 9482014E */ lhu $v0, 0x014E($a0) ## 0000014E -/* 0039C 8086A04C 46120101 */ sub.s $f4, $f0, $f18 -/* 003A0 8086A050 E4840164 */ swc1 $f4, 0x0164($a0) ## 00000164 -.L8086A054: -/* 003A4 8086A054 28410008 */ slti $at, $v0, 0x0008 -.L8086A058: -/* 003A8 8086A058 10200003 */ beq $at, $zero, .L8086A068 -/* 003AC 8086A05C 00000000 */ nop -/* 003B0 8086A060 A0800150 */ sb $zero, 0x0150($a0) ## 00000150 -/* 003B4 8086A064 9482014E */ lhu $v0, 0x014E($a0) ## 0000014E -.L8086A068: -/* 003B8 8086A068 54400004 */ bnel $v0, $zero, .L8086A07C -/* 003BC 8086A06C 8FBF0014 */ lw $ra, 0x0014($sp) -/* 003C0 8086A070 0C00B55C */ jal Actor_Kill - -/* 003C4 8086A074 A48A014E */ sh $t2, 0x014E($a0) ## 0000014E -/* 003C8 8086A078 8FBF0014 */ lw $ra, 0x0014($sp) -.L8086A07C: -/* 003CC 8086A07C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 003D0 8086A080 03E00008 */ jr $ra -/* 003D4 8086A084 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Arrow_Light/func_8086A088.s b/asm/non_matchings/overlays/actors/ovl_Arrow_Light/func_8086A088.s deleted file mode 100644 index 3314640165..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Arrow_Light/func_8086A088.s +++ /dev/null @@ -1,99 +0,0 @@ -glabel func_8086A088 -/* 003D8 8086A088 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 003DC 8086A08C AFBF001C */ sw $ra, 0x001C($sp) -/* 003E0 8086A090 AFB00018 */ sw $s0, 0x0018($sp) -/* 003E4 8086A094 AFA5003C */ sw $a1, 0x003C($sp) -/* 003E8 8086A098 8C820118 */ lw $v0, 0x0118($a0) ## 00000118 -/* 003EC 8086A09C 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 003F0 8086A0A0 10400004 */ beq $v0, $zero, .L8086A0B4 -/* 003F4 8086A0A4 00000000 */ nop -/* 003F8 8086A0A8 8C4E0130 */ lw $t6, 0x0130($v0) ## 00000130 -/* 003FC 8086A0AC 55C00006 */ bnel $t6, $zero, .L8086A0C8 -/* 00400 8086A0B0 8C580024 */ lw $t8, 0x0024($v0) ## 00000024 -.L8086A0B4: -/* 00404 8086A0B4 0C00B55C */ jal Actor_Kill - -/* 00408 8086A0B8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0040C 8086A0BC 10000043 */ beq $zero, $zero, .L8086A1CC -/* 00410 8086A0C0 8FBF001C */ lw $ra, 0x001C($sp) -/* 00414 8086A0C4 8C580024 */ lw $t8, 0x0024($v0) ## 00000024 -.L8086A0C8: -/* 00418 8086A0C8 26050024 */ addiu $a1, $s0, 0x0024 ## $a1 = 00000024 -/* 0041C 8086A0CC 26040154 */ addiu $a0, $s0, 0x0154 ## $a0 = 00000154 -/* 00420 8086A0D0 ACB80000 */ sw $t8, 0x0000($a1) ## 00000024 -/* 00424 8086A0D4 8C4F0028 */ lw $t7, 0x0028($v0) ## 00000028 -/* 00428 8086A0D8 ACAF0004 */ sw $t7, 0x0004($a1) ## 00000028 -/* 0042C 8086A0DC 8C58002C */ lw $t8, 0x002C($v0) ## 0000002C -/* 00430 8086A0E0 ACB80008 */ sw $t8, 0x0008($a1) ## 0000002C -/* 00434 8086A0E4 884800B4 */ lwl $t0, 0x00B4($v0) ## 000000B4 -/* 00438 8086A0E8 984800B7 */ lwr $t0, 0x00B7($v0) ## 000000B7 -/* 0043C 8086A0EC AA0800B4 */ swl $t0, 0x00B4($s0) ## 000000B4 -/* 00440 8086A0F0 BA0800B7 */ swr $t0, 0x00B7($s0) ## 000000B7 -/* 00444 8086A0F4 944800B8 */ lhu $t0, 0x00B8($v0) ## 000000B8 -/* 00448 8086A0F8 A60800B8 */ sh $t0, 0x00B8($s0) ## 000000B8 -/* 0044C 8086A0FC AFA50028 */ sw $a1, 0x0028($sp) -/* 00450 8086A100 AFA40024 */ sw $a0, 0x0024($sp) -/* 00454 8086A104 0C01DFE4 */ jal Math_Vec3f_DistXYZ - -/* 00458 8086A108 AFA20034 */ sw $v0, 0x0034($sp) -/* 0045C 8086A10C 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 00460 8086A110 44816000 */ mtc1 $at, $f12 ## $f12 = 1.00 -/* 00464 8086A114 3C018087 */ lui $at, %hi(D_8086BB78) ## $at = 80870000 -/* 00468 8086A118 C424BB78 */ lwc1 $f4, %lo(D_8086BB78)($at) -/* 0046C 8086A11C 8FA20034 */ lw $v0, 0x0034($sp) -/* 00470 8086A120 8FA40024 */ lw $a0, 0x0024($sp) -/* 00474 8086A124 46040082 */ mul.s $f2, $f0, $f4 -/* 00478 8086A128 8FA50028 */ lw $a1, 0x0028($sp) -/* 0047C 8086A12C 3C063D4C */ lui $a2, 0x3D4C ## $a2 = 3D4C0000 -/* 00480 8086A130 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3D4CCCCD -/* 00484 8086A134 460C103C */ c.lt.s $f2, $f12 -/* 00488 8086A138 E6020160 */ swc1 $f2, 0x0160($s0) ## 00000160 -/* 0048C 8086A13C 45000002 */ bc1f .L8086A148 -/* 00490 8086A140 00000000 */ nop -/* 00494 8086A144 E60C0160 */ swc1 $f12, 0x0160($s0) ## 00000160 -.L8086A148: -/* 00498 8086A148 0C21A79B */ jal func_80869E6C -/* 0049C 8086A14C AFA20034 */ sw $v0, 0x0034($sp) -/* 004A0 8086A150 8FA20034 */ lw $v0, 0x0034($sp) -/* 004A4 8086A154 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 004A8 8086A158 90490249 */ lbu $t1, 0x0249($v0) ## 00000249 -/* 004AC 8086A15C 312A0001 */ andi $t2, $t1, 0x0001 ## $t2 = 00000000 -/* 004B0 8086A160 5140000D */ beql $t2, $zero, .L8086A198 -/* 004B4 8086A164 904D0248 */ lbu $t5, 0x0248($v0) ## 00000248 -/* 004B8 8086A168 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 004BC 8086A16C 2405183C */ addiu $a1, $zero, 0x183C ## $a1 = 0000183C -/* 004C0 8086A170 3C058087 */ lui $a1, %hi(func_80869EBC) ## $a1 = 80870000 -/* 004C4 8086A174 24A59EBC */ addiu $a1, $a1, %lo(func_80869EBC) ## $a1 = 80869EBC -/* 004C8 8086A178 0C21A72C */ jal func_80869CB0 -/* 004CC 8086A17C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 004D0 8086A180 240B0020 */ addiu $t3, $zero, 0x0020 ## $t3 = 00000020 -/* 004D4 8086A184 240C00FF */ addiu $t4, $zero, 0x00FF ## $t4 = 000000FF -/* 004D8 8086A188 A60B014E */ sh $t3, 0x014E($s0) ## 0000014E -/* 004DC 8086A18C 1000000E */ beq $zero, $zero, .L8086A1C8 -/* 004E0 8086A190 A20C0150 */ sb $t4, 0x0150($s0) ## 00000150 -/* 004E4 8086A194 904D0248 */ lbu $t5, 0x0248($v0) ## 00000248 -.L8086A198: -/* 004E8 8086A198 29A10022 */ slti $at, $t5, 0x0022 -/* 004EC 8086A19C 5020000B */ beql $at, $zero, .L8086A1CC -/* 004F0 8086A1A0 8FBF001C */ lw $ra, 0x001C($sp) -/* 004F4 8086A1A4 92020150 */ lbu $v0, 0x0150($s0) ## 00000150 -/* 004F8 8086A1A8 28410023 */ slti $at, $v0, 0x0023 -/* 004FC 8086A1AC 10200005 */ beq $at, $zero, .L8086A1C4 -/* 00500 8086A1B0 244EFFE7 */ addiu $t6, $v0, 0xFFE7 ## $t6 = FFFFFFE7 -/* 00504 8086A1B4 0C00B55C */ jal Actor_Kill - -/* 00508 8086A1B8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0050C 8086A1BC 10000003 */ beq $zero, $zero, .L8086A1CC -/* 00510 8086A1C0 8FBF001C */ lw $ra, 0x001C($sp) -.L8086A1C4: -/* 00514 8086A1C4 A20E0150 */ sb $t6, 0x0150($s0) ## 00000150 -.L8086A1C8: -/* 00518 8086A1C8 8FBF001C */ lw $ra, 0x001C($sp) -.L8086A1CC: -/* 0051C 8086A1CC 8FB00018 */ lw $s0, 0x0018($sp) -/* 00520 8086A1D0 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 -/* 00524 8086A1D4 03E00008 */ jr $ra -/* 00528 8086A1D8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Bdan_Objects/BgBdanObjects_Draw.s b/asm/non_matchings/overlays/actors/ovl_Bg_Bdan_Objects/BgBdanObjects_Draw.s index bfc490c637..b8a177b8ed 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Bdan_Objects/BgBdanObjects_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Bdan_Objects/BgBdanObjects_Draw.s @@ -37,7 +37,7 @@ glabel BgBdanObjects_Draw /* 01068 8086CD08 8FA4001C */ lw $a0, 0x001C($sp) /* 0106C 8086CD0C 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 01070 8086CD10 24A538E8 */ addiu $a1, $a1, 0x38E8 ## $a1 = 060038E8 -/* 01074 8086CD14 0C00D4C9 */ jal Draw_DListXlu +/* 01074 8086CD14 0C00D4C9 */ jal Gfx_DrawDListXlu /* 01078 8086CD18 8FA4001C */ lw $a0, 0x001C($sp) /* 0107C 8086CD1C 10000007 */ beq $zero, $zero, .L8086CD3C @@ -46,7 +46,7 @@ glabel BgBdanObjects_Draw /* 01084 8086CD24 0002C080 */ sll $t8, $v0, 2 /* 01088 8086CD28 3C058087 */ lui $a1, %hi(D_8086CDA0) ## $a1 = 80870000 /* 0108C 8086CD2C 00B82821 */ addu $a1, $a1, $t8 -/* 01090 8086CD30 0C00D498 */ jal Draw_DListOpa +/* 01090 8086CD30 0C00D498 */ jal Gfx_DrawDListOpa /* 01094 8086CD34 8CA5CDA0 */ lw $a1, %lo(D_8086CDA0)($a1) /* 01098 8086CD38 8FBF0014 */ lw $ra, 0x0014($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Bdan_Objects/func_8086C29C.s b/asm/non_matchings/overlays/actors/ovl_Bg_Bdan_Objects/func_8086C29C.s index 55e0433a45..e714104d7c 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Bdan_Objects/func_8086C29C.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Bdan_Objects/func_8086C29C.s @@ -16,12 +16,12 @@ glabel func_8086C29C /* 00634 8086C2D4 0018C880 */ sll $t9, $t8, 2 /* 00638 8086C2D8 00B94021 */ addu $t0, $a1, $t9 /* 0063C 8086C2DC 8D040790 */ lw $a0, 0x0790($t0) ## 00000790 -/* 00640 8086C2E0 0C024BE2 */ jal func_80092F88 +/* 00640 8086C2E0 0C024BE2 */ jal Quake_Add /* 00644 8086C2E4 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 /* 00648 8086C2E8 00022400 */ sll $a0, $v0, 16 /* 0064C 8086C2EC AFA20044 */ sw $v0, 0x0044($sp) /* 00650 8086C2F0 00042403 */ sra $a0, $a0, 16 -/* 00654 8086C2F4 0C024B6B */ jal func_80092DAC +/* 00654 8086C2F4 0C024B6B */ jal Quake_SetSpeed /* 00658 8086C2F8 24053A98 */ addiu $a1, $zero, 0x3A98 ## $a1 = 00003A98 /* 0065C 8086C2FC 87A40046 */ lh $a0, 0x0046($sp) /* 00660 8086C300 24090001 */ addiu $t1, $zero, 0x0001 ## $t1 = 00000001 @@ -29,10 +29,10 @@ glabel func_8086C29C /* 00668 8086C308 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 0066C 8086C30C 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 /* 00670 8086C310 240700FA */ addiu $a3, $zero, 0x00FA ## $a3 = 000000FA -/* 00674 8086C314 0C024B9C */ jal func_80092E70 +/* 00674 8086C314 0C024B9C */ jal Quake_SetQuakeValues /* 00678 8086C318 AFA40040 */ sw $a0, 0x0040($sp) /* 0067C 8086C31C 8FA40040 */ lw $a0, 0x0040($sp) -/* 00680 8086C320 0C024B7C */ jal func_80092DF0 +/* 00680 8086C320 0C024B7C */ jal Quake_SetCountdown /* 00684 8086C324 2405000A */ addiu $a1, $zero, 0x000A ## $a1 = 0000000A .L8086C328: /* 00688 8086C328 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Bombwall/BgBombwall_Draw.s b/asm/non_matchings/overlays/actors/ovl_Bg_Bombwall/BgBombwall_Draw.s index 27946a0c9a..359ce2a803 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Bombwall/BgBombwall_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Bombwall/BgBombwall_Draw.s @@ -3,7 +3,7 @@ glabel BgBombwall_Draw /* 00728 8086EEF8 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 /* 0072C 8086EEFC AFBF0014 */ sw $ra, 0x0014($sp) /* 00730 8086EF00 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 00734 8086EF04 0C00D498 */ jal Draw_DListOpa +/* 00734 8086EF04 0C00D498 */ jal Gfx_DrawDListOpa /* 00738 8086EF08 8CC5029C */ lw $a1, 0x029C($a2) ## 0000029C /* 0073C 8086EF0C 8FBF0014 */ lw $ra, 0x0014($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Bowl_Wall/BgBowlWall_Draw.s b/asm/non_matchings/overlays/actors/ovl_Bg_Bowl_Wall/BgBowlWall_Draw.s index 24c32ea6d8..7aee86f05a 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Bowl_Wall/BgBowlWall_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Bowl_Wall/BgBowlWall_Draw.s @@ -10,7 +10,7 @@ glabel BgBowlWall_Draw /* 00784 8086F8E4 24C6FAD4 */ addiu $a2, $a2, %lo(D_8086FAD4) ## $a2 = 8086FAD4 /* 00788 8086F8E8 27A40040 */ addiu $a0, $sp, 0x0040 ## $a0 = FFFFFFE0 /* 0078C 8086F8EC 240701B9 */ addiu $a3, $zero, 0x01B9 ## $a3 = 000001B9 -/* 00790 8086F8F0 0C031AB1 */ jal func_800C6AC4 +/* 00790 8086F8F0 0C031AB1 */ jal Graph_OpenDisps /* 00794 8086F8F4 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 /* 00798 8086F8F8 0C024F61 */ jal func_80093D84 /* 0079C 8086F8FC 8E240000 */ lw $a0, 0x0000($s1) ## 00000000 @@ -28,7 +28,7 @@ glabel BgBowlWall_Draw /* 007CC 8086F92C AFB80010 */ sw $t8, 0x0010($sp) /* 007D0 8086F930 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 007D4 8086F934 24070010 */ addiu $a3, $zero, 0x0010 ## $a3 = 00000010 -/* 007D8 8086F938 0C0253A7 */ jal Draw_TexScroll +/* 007D8 8086F938 0C0253A7 */ jal Gfx_TexScroll /* 007DC 8086F93C AFA2003C */ sw $v0, 0x003C($sp) /* 007E0 8086F940 8FA8003C */ lw $t0, 0x003C($sp) /* 007E4 8086F944 3C09E700 */ lui $t1, 0xE700 ## $t1 = E7000000 @@ -79,7 +79,7 @@ glabel BgBowlWall_Draw /* 00894 8086F9F4 AC4A0004 */ sw $t2, 0x0004($v0) ## 00000004 /* 00898 8086F9F8 AC490000 */ sw $t1, 0x0000($v0) ## 00000000 .L8086F9FC: -/* 0089C 8086F9FC 0C031AD5 */ jal func_800C6B54 +/* 0089C 8086F9FC 0C031AD5 */ jal Graph_CloseDisps /* 008A0 8086FA00 8E250000 */ lw $a1, 0x0000($s1) ## 00000000 /* 008A4 8086FA04 8FBF0024 */ lw $ra, 0x0024($sp) /* 008A8 8086FA08 8FB0001C */ lw $s0, 0x001C($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Bowl_Wall/func_8086F464.s b/asm/non_matchings/overlays/actors/ovl_Bg_Bowl_Wall/func_8086F464.s index 65f1c322de..bcb159579e 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Bowl_Wall/func_8086F464.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Bowl_Wall/func_8086F464.s @@ -142,24 +142,24 @@ glabel func_8086F464 /* 00510 8086F670 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 /* 00514 8086F674 00194080 */ sll $t0, $t9, 2 /* 00518 8086F678 02684821 */ addu $t1, $s3, $t0 -/* 0051C 8086F67C 0C024BE2 */ jal func_80092F88 +/* 0051C 8086F67C 0C024BE2 */ jal Quake_Add /* 00520 8086F680 8D240790 */ lw $a0, 0x0790($t1) ## 00000790 /* 00524 8086F684 00028400 */ sll $s0, $v0, 16 /* 00528 8086F688 00022400 */ sll $a0, $v0, 16 /* 0052C 8086F68C 00108403 */ sra $s0, $s0, 16 /* 00530 8086F690 00042403 */ sra $a0, $a0, 16 -/* 00534 8086F694 0C024B6B */ jal func_80092DAC +/* 00534 8086F694 0C024B6B */ jal Quake_SetSpeed /* 00538 8086F698 24057FFF */ addiu $a1, $zero, 0x7FFF ## $a1 = 00007FFF /* 0053C 8086F69C 00102400 */ sll $a0, $s0, 16 /* 00540 8086F6A0 00042403 */ sra $a0, $a0, 16 /* 00544 8086F6A4 2405012C */ addiu $a1, $zero, 0x012C ## $a1 = 0000012C /* 00548 8086F6A8 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 /* 0054C 8086F6AC 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 00550 8086F6B0 0C024B9C */ jal func_80092E70 +/* 00550 8086F6B0 0C024B9C */ jal Quake_SetQuakeValues /* 00554 8086F6B4 AFA00010 */ sw $zero, 0x0010($sp) /* 00558 8086F6B8 00102400 */ sll $a0, $s0, 16 /* 0055C 8086F6BC 00042403 */ sra $a0, $a0, 16 -/* 00560 8086F6C0 0C024B7C */ jal func_80092DF0 +/* 00560 8086F6C0 0C024B7C */ jal Quake_SetCountdown /* 00564 8086F6C4 2405001E */ addiu $a1, $zero, 0x001E ## $a1 = 0000001E /* 00568 8086F6C8 3C0B8087 */ lui $t3, %hi(func_8086F718) ## $t3 = 80870000 /* 0056C 8086F6CC 240A0014 */ addiu $t2, $zero, 0x0014 ## $t2 = 00000014 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Breakwall/func_8086FDC0.s b/asm/non_matchings/overlays/actors/ovl_Bg_Breakwall/func_8086FDC0.s index 555792df76..f439c5cdd5 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Breakwall/func_8086FDC0.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Breakwall/func_8086FDC0.s @@ -1,25 +1,25 @@ glabel func_8086FDC0 /* 001E0 8086FDC0 27BDFE08 */ addiu $sp, $sp, 0xFE08 ## $sp = FFFFFE08 /* 001E4 8086FDC4 3C0F8087 */ lui $t7, %hi(D_808707F0) ## $t7 = 80870000 -/* 001E8 8086FDC8 AFBF0084 */ sw $ra, 0x0084($sp) -/* 001EC 8086FDCC AFBE0080 */ sw $s8, 0x0080($sp) -/* 001F0 8086FDD0 AFB7007C */ sw $s7, 0x007C($sp) -/* 001F4 8086FDD4 AFB60078 */ sw $s6, 0x0078($sp) -/* 001F8 8086FDD8 AFB50074 */ sw $s5, 0x0074($sp) -/* 001FC 8086FDDC AFB40070 */ sw $s4, 0x0070($sp) -/* 00200 8086FDE0 AFB3006C */ sw $s3, 0x006C($sp) -/* 00204 8086FDE4 AFB20068 */ sw $s2, 0x0068($sp) -/* 00208 8086FDE8 AFB10064 */ sw $s1, 0x0064($sp) -/* 0020C 8086FDEC AFB00060 */ sw $s0, 0x0060($sp) -/* 00210 8086FDF0 F7BE0058 */ sdc1 $f30, 0x0058($sp) -/* 00214 8086FDF4 F7BC0050 */ sdc1 $f28, 0x0050($sp) -/* 00218 8086FDF8 F7BA0048 */ sdc1 $f26, 0x0048($sp) -/* 0021C 8086FDFC F7B80040 */ sdc1 $f24, 0x0040($sp) -/* 00220 8086FE00 F7B60038 */ sdc1 $f22, 0x0038($sp) -/* 00224 8086FE04 F7B40030 */ sdc1 $f20, 0x0030($sp) -/* 00228 8086FE08 AFA60200 */ sw $a2, 0x0200($sp) -/* 0022C 8086FE0C AFA70204 */ sw $a3, 0x0204($sp) -/* 00230 8086FE10 A7A001D8 */ sh $zero, 0x01D8($sp) +/* 001E8 8086FDC8 AFBF0084 */ sw $ra, 0x0084($sp) +/* 001EC 8086FDCC AFBE0080 */ sw $s8, 0x0080($sp) +/* 001F0 8086FDD0 AFB7007C */ sw $s7, 0x007C($sp) +/* 001F4 8086FDD4 AFB60078 */ sw $s6, 0x0078($sp) +/* 001F8 8086FDD8 AFB50074 */ sw $s5, 0x0074($sp) +/* 001FC 8086FDDC AFB40070 */ sw $s4, 0x0070($sp) +/* 00200 8086FDE0 AFB3006C */ sw $s3, 0x006C($sp) +/* 00204 8086FDE4 AFB20068 */ sw $s2, 0x0068($sp) +/* 00208 8086FDE8 AFB10064 */ sw $s1, 0x0064($sp) +/* 0020C 8086FDEC AFB00060 */ sw $s0, 0x0060($sp) +/* 00210 8086FDF0 F7BE0058 */ sdc1 $f30, 0x0058($sp) +/* 00214 8086FDF4 F7BC0050 */ sdc1 $f28, 0x0050($sp) +/* 00218 8086FDF8 F7BA0048 */ sdc1 $f26, 0x0048($sp) +/* 0021C 8086FDFC F7B80040 */ sdc1 $f24, 0x0040($sp) +/* 00220 8086FE00 F7B60038 */ sdc1 $f22, 0x0038($sp) +/* 00224 8086FE04 F7B40030 */ sdc1 $f20, 0x0030($sp) +/* 00228 8086FE08 AFA60200 */ sw $a2, 0x0200($sp) +/* 0022C 8086FE0C AFA70204 */ sw $a3, 0x0204($sp) +/* 00230 8086FE10 A7A001D8 */ sh $zero, 0x01D8($sp) /* 00234 8086FE14 25EF07F0 */ addiu $t7, $t7, %lo(D_808707F0) ## $t7 = 808707F0 /* 00238 8086FE18 8DF90000 */ lw $t9, 0x0000($t7) ## 808707F0 /* 0023C 8086FE1C 27AE01CC */ addiu $t6, $sp, 0x01CC ## $t6 = FFFFFFD4 @@ -56,7 +56,7 @@ glabel func_8086FDC0 /* 002B4 8086FE94 8DAEFFF8 */ lw $t6, -0x0008($t5) ## 80870818 /* 002B8 8086FE98 AD8EFFF8 */ sw $t6, -0x0008($t4) ## FFFFFF90 /* 002BC 8086FE9C 8DAFFFFC */ lw $t7, -0x0004($t5) ## 8087081C -/* 002C0 8086FEA0 15B8FFF8 */ bne $t5, $t8, .L8086FE84 +/* 002C0 8086FEA0 15B8FFF8 */ bne $t5, $t8, .L8086FE84 /* 002C4 8086FEA4 AD8FFFFC */ sw $t7, -0x0004($t4) ## FFFFFF94 /* 002C8 8086FEA8 3C088087 */ lui $t0, %hi(D_80870844) ## $t0 = 80870000 /* 002CC 8086FEAC 25080844 */ addiu $t0, $t0, %lo(D_80870844) ## $t0 = 80870844 @@ -70,267 +70,267 @@ glabel func_8086FDC0 /* 002E8 8086FEC8 8D09FFF8 */ lw $t1, -0x0008($t0) ## 80870848 /* 002EC 8086FECC AF29FFF8 */ sw $t1, -0x0008($t9) ## FFFFFED0 /* 002F0 8086FED0 8D0AFFFC */ lw $t2, -0x0004($t0) ## 8087084C -/* 002F4 8086FED4 150BFFF8 */ bne $t0, $t3, .L8086FEB8 +/* 002F4 8086FED4 150BFFF8 */ bne $t0, $t3, .L8086FEB8 /* 002F8 8086FED8 AF2AFFFC */ sw $t2, -0x0004($t9) ## FFFFFED4 /* 002FC 8086FEDC 27A20184 */ addiu $v0, $sp, 0x0184 ## $v0 = FFFFFF8C /* 00300 8086FEE0 00402025 */ or $a0, $v0, $zero ## $a0 = FFFFFF8C /* 00304 8086FEE4 27B201A8 */ addiu $s2, $sp, 0x01A8 ## $s2 = FFFFFFB0 -/* 00308 8086FEE8 C7A20208 */ lwc1 $f2, 0x0208($sp) -/* 0030C 8086FEEC C7A0020C */ lwc1 $f0, 0x020C($sp) +/* 00308 8086FEE8 C7A20208 */ lwc1 $f2, 0x0208($sp) +/* 0030C 8086FEEC C7A0020C */ lwc1 $f0, 0x020C($sp) /* 00310 8086FEF0 27A301A8 */ addiu $v1, $sp, 0x01A8 ## $v1 = FFFFFFB0 .L8086FEF4: -/* 00314 8086FEF4 52420004 */ beql $s2, $v0, .L8086FF08 +/* 00314 8086FEF4 52420004 */ beql $s2, $v0, .L8086FF08 /* 00318 8086FEF8 C6440000 */ lwc1 $f4, 0x0000($s2) ## FFFFFFB0 -/* 0031C 8086FEFC 5643000E */ bnel $s2, $v1, .L8086FF38 +/* 0031C 8086FEFC 5643000E */ bnel $s2, $v1, .L8086FF38 /* 00320 8086FF00 C6440000 */ lwc1 $f4, 0x0000($s2) ## FFFFFFB0 /* 00324 8086FF04 C6440000 */ lwc1 $f4, 0x0000($s2) ## FFFFFFB0 .L8086FF08: /* 00328 8086FF08 C6480004 */ lwc1 $f8, 0x0004($s2) ## FFFFFFB4 /* 0032C 8086FF0C C6500008 */ lwc1 $f16, 0x0008($s2) ## FFFFFFB8 -/* 00330 8086FF10 46002182 */ mul.s $f6, $f4, $f0 +/* 00330 8086FF10 46002182 */ mul.s $f6, $f4, $f0 /* 00334 8086FF14 00000000 */ nop -/* 00338 8086FF18 46024282 */ mul.s $f10, $f8, $f2 +/* 00338 8086FF18 46024282 */ mul.s $f10, $f8, $f2 /* 0033C 8086FF1C 00000000 */ nop -/* 00340 8086FF20 46028482 */ mul.s $f18, $f16, $f2 +/* 00340 8086FF20 46028482 */ mul.s $f18, $f16, $f2 /* 00344 8086FF24 E6460000 */ swc1 $f6, 0x0000($s2) ## FFFFFFB0 /* 00348 8086FF28 E64A0004 */ swc1 $f10, 0x0004($s2) ## FFFFFFB4 -/* 0034C 8086FF2C 1000000C */ beq $zero, $zero, .L8086FF60 +/* 0034C 8086FF2C 1000000C */ beq $zero, $zero, .L8086FF60 /* 00350 8086FF30 E6520008 */ swc1 $f18, 0x0008($s2) ## FFFFFFB8 /* 00354 8086FF34 C6440000 */ lwc1 $f4, 0x0000($s2) ## FFFFFFB0 .L8086FF38: /* 00358 8086FF38 C6480004 */ lwc1 $f8, 0x0004($s2) ## FFFFFFB4 /* 0035C 8086FF3C C6500008 */ lwc1 $f16, 0x0008($s2) ## FFFFFFB8 -/* 00360 8086FF40 46022182 */ mul.s $f6, $f4, $f2 +/* 00360 8086FF40 46022182 */ mul.s $f6, $f4, $f2 /* 00364 8086FF44 00000000 */ nop -/* 00368 8086FF48 46004282 */ mul.s $f10, $f8, $f0 +/* 00368 8086FF48 46004282 */ mul.s $f10, $f8, $f0 /* 0036C 8086FF4C 00000000 */ nop -/* 00370 8086FF50 46008482 */ mul.s $f18, $f16, $f0 +/* 00370 8086FF50 46008482 */ mul.s $f18, $f16, $f0 /* 00374 8086FF54 E6460000 */ swc1 $f6, 0x0000($s2) ## FFFFFFB0 /* 00378 8086FF58 E64A0004 */ swc1 $f10, 0x0004($s2) ## FFFFFFB4 /* 0037C 8086FF5C E6520008 */ swc1 $f18, 0x0008($s2) ## FFFFFFB8 .L8086FF60: /* 00380 8086FF60 2652FFF4 */ addiu $s2, $s2, 0xFFF4 ## $s2 = FFFFFFA4 -/* 00384 8086FF64 0244082B */ sltu $at, $s2, $a0 -/* 00388 8086FF68 1020FFE2 */ beq $at, $zero, .L8086FEF4 +/* 00384 8086FF64 0244082B */ sltu $at, $s2, $a0 +/* 00388 8086FF68 1020FFE2 */ beq $at, $zero, .L8086FEF4 /* 0038C 8086FF6C 00000000 */ nop -/* 00390 8086FF70 8FAD0210 */ lw $t5, 0x0210($sp) -/* 00394 8086FF74 AFA001DC */ sw $zero, 0x01DC($sp) +/* 00390 8086FF70 8FAD0210 */ lw $t5, 0x0210($sp) +/* 00394 8086FF74 AFA001DC */ sw $zero, 0x01DC($sp) /* 00398 8086FF78 26EC1C24 */ addiu $t4, $s7, 0x1C24 ## $t4 = 00001C24 -/* 0039C 8086FF7C 19A000B1 */ blez $t5, .L80870244 +/* 0039C 8086FF7C 19A000B1 */ blez $t5, .L80870244 /* 003A0 8086FF80 3C018087 */ lui $at, %hi(D_808709AC) ## $at = 80870000 -/* 003A4 8086FF84 C43C09AC */ lwc1 $f28, %lo(D_808709AC)($at) +/* 003A4 8086FF84 C43C09AC */ lwc1 $f28, %lo(D_808709AC)($at) /* 003A8 8086FF88 3C018087 */ lui $at, %hi(D_808709B0) ## $at = 80870000 -/* 003AC 8086FF8C C43A09B0 */ lwc1 $f26, %lo(D_808709B0)($at) +/* 003AC 8086FF8C C43A09B0 */ lwc1 $f26, %lo(D_808709B0)($at) /* 003B0 8086FF90 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 /* 003B4 8086FF94 4481C000 */ mtc1 $at, $f24 ## $f24 = 20.00 -/* 003B8 8086FF98 AFAC009C */ sw $t4, 0x009C($sp) -/* 003BC 8086FF9C AFA501FC */ sw $a1, 0x01FC($sp) -/* 003C0 8086FFA0 C7BE0214 */ lwc1 $f30, 0x0214($sp) +/* 003B8 8086FF98 AFAC009C */ sw $t4, 0x009C($sp) +/* 003BC 8086FF9C AFA501FC */ sw $a1, 0x01FC($sp) +/* 003C0 8086FFA0 C7BE0214 */ lwc1 $f30, 0x0214($sp) /* 003C4 8086FFA4 27B501E8 */ addiu $s5, $sp, 0x01E8 ## $s5 = FFFFFFF0 .L8086FFA8: -/* 003C8 8086FFA8 8FA501FC */ lw $a1, 0x01FC($sp) +/* 003C8 8086FFA8 8FA501FC */ lw $a1, 0x01FC($sp) /* 003CC 8086FFAC 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 /* 003D0 8086FFB0 84A20032 */ lh $v0, 0x0032($a1) ## 00000032 -/* 003D4 8086FFB4 04400003 */ bltz $v0, .L8086FFC4 -/* 003D8 8086FFB8 00028023 */ subu $s0, $zero, $v0 -/* 003DC 8086FFBC 10000001 */ beq $zero, $zero, .L8086FFC4 +/* 003D4 8086FFB4 04400003 */ bltz $v0, .L8086FFC4 +/* 003D8 8086FFB8 00028023 */ subu $s0, $zero, $v0 +/* 003DC 8086FFBC 10000001 */ beq $zero, $zero, .L8086FFC4 /* 003E0 8086FFC0 00408025 */ or $s0, $v0, $zero ## $s0 = FFFFFF8C .L8086FFC4: /* 003E4 8086FFC4 C4AC0024 */ lwc1 $f12, 0x0024($a1) ## 00000024 /* 003E8 8086FFC8 C4AE0028 */ lwc1 $f14, 0x0028($a1) ## 00000028 /* 003EC 8086FFCC 8CA6002C */ lw $a2, 0x002C($a1) ## 0000002C -/* 003F0 8086FFD0 0C034261 */ jal Matrix_Translate -/* 003F4 8086FFD4 AFA501FC */ sw $a1, 0x01FC($sp) -/* 003F8 8086FFD8 8FA201FC */ lw $v0, 0x01FC($sp) +/* 003F0 8086FFD0 0C034261 */ jal Matrix_Translate +/* 003F4 8086FFD4 AFA501FC */ sw $a1, 0x01FC($sp) +/* 003F8 8086FFD8 8FA201FC */ lw $v0, 0x01FC($sp) /* 003FC 8086FFDC 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 /* 00400 8086FFE0 84440030 */ lh $a0, 0x0030($v0) ## 00000030 /* 00404 8086FFE4 84450032 */ lh $a1, 0x0032($v0) ## 00000032 -/* 00408 8086FFE8 0C034421 */ jal Matrix_RotateXYZ +/* 00408 8086FFE8 0C034421 */ jal Matrix_RotateZYX /* 0040C 8086FFEC 84460034 */ lh $a2, 0x0034($v0) ## 00000034 -/* 00410 8086FFF0 8FA20200 */ lw $v0, 0x0200($sp) +/* 00410 8086FFF0 8FA20200 */ lw $v0, 0x0200($sp) /* 00414 8086FFF4 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 /* 00418 8086FFF8 C44C0000 */ lwc1 $f12, 0x0000($v0) ## 00000000 /* 0041C 8086FFFC C44E0004 */ lwc1 $f14, 0x0004($v0) ## 00000004 -/* 00420 80870000 0C034261 */ jal Matrix_Translate +/* 00420 80870000 0C034261 */ jal Matrix_Translate /* 00424 80870004 8C460008 */ lw $a2, 0x0008($v0) ## 00000008 -/* 00428 80870008 87AE01D8 */ lh $t6, 0x01D8($sp) +/* 00428 80870008 87AE01D8 */ lh $t6, 0x01D8($sp) /* 0042C 8087000C 24030003 */ addiu $v1, $zero, 0x0003 ## $v1 = 00000003 /* 00430 80870010 27A60154 */ addiu $a2, $sp, 0x0154 ## $a2 = FFFFFF5C -/* 00434 80870014 020EF021 */ addu $s8, $s0, $t6 -/* 00438 80870018 001EF400 */ sll $s8, $s8, 16 -/* 0043C 8087001C 001EF403 */ sra $s8, $s8, 16 -/* 00440 80870020 AFA600A4 */ sw $a2, 0x00A4($sp) -/* 00444 80870024 AFA301E0 */ sw $v1, 0x01E0($sp) +/* 00434 80870014 020EF021 */ addu $s8, $s0, $t6 +/* 00438 80870018 001EF400 */ sll $s8, $s8, 16 +/* 0043C 8087001C 001EF403 */ sra $s8, $s8, 16 +/* 00440 80870020 AFA600A4 */ sw $a2, 0x00A4($sp) +/* 00444 80870024 AFA301E0 */ sw $v1, 0x01E0($sp) .L80870028: -/* 00448 80870028 8FA301E0 */ lw $v1, 0x01E0($sp) -/* 0044C 8087002C 8FA600A4 */ lw $a2, 0x00A4($sp) +/* 00448 80870028 8FA301E0 */ lw $v1, 0x01E0($sp) +/* 0044C 8087002C 8FA600A4 */ lw $a2, 0x00A4($sp) /* 00450 80870030 24130024 */ addiu $s3, $zero, 0x0024 ## $s3 = 00000024 /* 00454 80870034 27B101C6 */ addiu $s1, $sp, 0x01C6 ## $s1 = FFFFFFCE /* 00458 80870038 30760001 */ andi $s6, $v1, 0x0001 ## $s6 = 00000001 /* 0045C 8087003C 24D40024 */ addiu $s4, $a2, 0x0024 ## $s4 = FFFFFF80 .L80870040: /* 00460 80870040 02802025 */ or $a0, $s4, $zero ## $a0 = FFFFFF80 -/* 00464 80870044 0C0346BD */ jal Matrix_MultVec3f +/* 00464 80870044 0C0346BD */ jal Matrix_MultVec3f /* 00468 80870048 02A02825 */ or $a1, $s5, $zero ## $a1 = FFFFFFF0 /* 0046C 8087004C 0C00CFC8 */ jal Math_Rand_CenteredFloat - -/* 00470 80870050 4600C306 */ mov.s $f12, $f24 -/* 00474 80870054 46000506 */ mov.s $f20, $f0 + +/* 00470 80870050 4600C306 */ mov.s $f12, $f24 +/* 00474 80870054 46000506 */ mov.s $f20, $f0 /* 00478 80870058 0C00CFC8 */ jal Math_Rand_CenteredFloat - -/* 0047C 8087005C 4600C306 */ mov.s $f12, $f24 -/* 00480 80870060 46000586 */ mov.s $f22, $f0 + +/* 0047C 8087005C 4600C306 */ mov.s $f12, $f24 +/* 00480 80870060 46000586 */ mov.s $f22, $f0 /* 00484 80870064 0C00CFC8 */ jal Math_Rand_CenteredFloat - -/* 00488 80870068 4600C306 */ mov.s $f12, $f24 -/* 0048C 8087006C C7A801EC */ lwc1 $f8, 0x01EC($sp) -/* 00490 80870070 C7B001F0 */ lwc1 $f16, 0x01F0($sp) -/* 00494 80870074 C7A401E8 */ lwc1 $f4, 0x01E8($sp) -/* 00498 80870078 4608B280 */ add.s $f10, $f22, $f8 + +/* 00488 80870068 4600C306 */ mov.s $f12, $f24 +/* 0048C 8087006C C7A801EC */ lwc1 $f8, 0x01EC($sp) +/* 00490 80870070 C7B001F0 */ lwc1 $f16, 0x01F0($sp) +/* 00494 80870074 C7A401E8 */ lwc1 $f4, 0x01E8($sp) +/* 00498 80870078 4608B280 */ add.s $f10, $f22, $f8 /* 0049C 8087007C 2409000B */ addiu $t1, $zero, 0x000B ## $t1 = 0000000B -/* 004A0 80870080 8FA4009C */ lw $a0, 0x009C($sp) -/* 004A4 80870084 46100480 */ add.s $f18, $f0, $f16 -/* 004A8 80870088 E7AA0010 */ swc1 $f10, 0x0010($sp) +/* 004A0 80870080 8FA4009C */ lw $a0, 0x009C($sp) +/* 004A4 80870084 46100480 */ add.s $f18, $f0, $f16 +/* 004A8 80870088 E7AA0010 */ swc1 $f10, 0x0010($sp) /* 004AC 8087008C 02E02825 */ or $a1, $s7, $zero ## $a1 = 00000000 -/* 004B0 80870090 4604A180 */ add.s $f6, $f20, $f4 -/* 004B4 80870094 E7B20014 */ swc1 $f18, 0x0014($sp) +/* 004B0 80870090 4604A180 */ add.s $f6, $f20, $f4 +/* 004B4 80870094 E7B20014 */ swc1 $f18, 0x0014($sp) /* 004B8 80870098 862F0000 */ lh $t7, 0x0000($s1) ## FFFFFFCE /* 004BC 8087009C 24060039 */ addiu $a2, $zero, 0x0039 ## $a2 = 00000039 -/* 004C0 808700A0 44073000 */ mfc1 $a3, $f6 -/* 004C4 808700A4 AFAF0018 */ sw $t7, 0x0018($sp) +/* 004C0 808700A0 44073000 */ mfc1 $a3, $f6 +/* 004C4 808700A4 AFAF0018 */ sw $t7, 0x0018($sp) /* 004C8 808700A8 862B0002 */ lh $t3, 0x0002($s1) ## FFFFFFD0 -/* 004CC 808700AC 017E4021 */ addu $t0, $t3, $s8 -/* 004D0 808700B0 AFA8001C */ sw $t0, 0x001C($sp) +/* 004CC 808700AC 017E4021 */ addu $t0, $t3, $s8 +/* 004D0 808700B0 AFA8001C */ sw $t0, 0x001C($sp) /* 004D4 808700B4 86390004 */ lh $t9, 0x0004($s1) ## FFFFFFD2 -/* 004D8 808700B8 AFA90024 */ sw $t1, 0x0024($sp) +/* 004D8 808700B8 AFA90024 */ sw $t1, 0x0024($sp) /* 004DC 808700BC 0C00C7D4 */ jal Actor_Spawn ## ActorSpawn -/* 004E0 808700C0 AFB90020 */ sw $t9, 0x0020($sp) -/* 004E4 808700C4 16C00010 */ bne $s6, $zero, .L80870108 +/* 004E0 808700C0 AFB90020 */ sw $t9, 0x0020($sp) +/* 004E4 808700C4 16C00010 */ bne $s6, $zero, .L80870108 /* 004E8 808700C8 00408025 */ or $s0, $v0, $zero ## $s0 = 00000000 /* 004EC 808700CC 3C014348 */ lui $at, 0x4348 ## $at = 43480000 /* 004F0 808700D0 44813000 */ mtc1 $at, $f6 ## $f6 = 200.00 -/* 004F4 808700D4 C7A40204 */ lwc1 $f4, 0x0204($sp) +/* 004F4 808700D4 C7A40204 */ lwc1 $f4, 0x0204($sp) /* 004F8 808700D8 240A028A */ addiu $t2, $zero, 0x028A ## $t2 = 0000028A /* 004FC 808700DC 24180096 */ addiu $t8, $zero, 0x0096 ## $t8 = 00000096 -/* 00500 808700E0 46062202 */ mul.s $f8, $f4, $f6 +/* 00500 808700E0 46062202 */ mul.s $f8, $f4, $f6 /* 00504 808700E4 240D0001 */ addiu $t5, $zero, 0x0001 ## $t5 = 00000001 -/* 00508 808700E8 AFAD0018 */ sw $t5, 0x0018($sp) -/* 0050C 808700EC AFB80014 */ sw $t8, 0x0014($sp) -/* 00510 808700F0 AFAA0010 */ sw $t2, 0x0010($sp) +/* 00508 808700E8 AFAD0018 */ sw $t5, 0x0018($sp) +/* 0050C 808700EC AFB80014 */ sw $t8, 0x0014($sp) +/* 00510 808700F0 AFAA0010 */ sw $t2, 0x0010($sp) /* 00514 808700F4 02E02025 */ or $a0, $s7, $zero ## $a0 = 00000000 /* 00518 808700F8 02A02825 */ or $a1, $s5, $zero ## $a1 = FFFFFFF0 -/* 0051C 808700FC 44064000 */ mfc1 $a2, $f8 -/* 00520 80870100 0C00CD20 */ jal func_80033480 +/* 0051C 808700FC 44064000 */ mfc1 $a2, $f8 +/* 00520 80870100 0C00CD20 */ jal func_80033480 /* 00524 80870104 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 .L80870108: -/* 00528 80870108 12000038 */ beq $s0, $zero, .L808701EC +/* 00528 80870108 12000038 */ beq $s0, $zero, .L808701EC /* 0052C 8087010C 3C018087 */ lui $at, %hi(D_808709B4) ## $at = 80870000 -/* 00530 80870110 C42A09B4 */ lwc1 $f10, %lo(D_808709B4)($at) +/* 00530 80870110 C42A09B4 */ lwc1 $f10, %lo(D_808709B4)($at) /* 00534 80870114 27AC0184 */ addiu $t4, $sp, 0x0184 ## $t4 = FFFFFF8C -/* 00538 80870118 026C9021 */ addu $s2, $s3, $t4 -/* 0053C 8087011C 460AF502 */ mul.s $f20, $f30, $f10 +/* 00538 80870118 026C9021 */ addu $s2, $s3, $t4 +/* 0053C 8087011C 460AF502 */ mul.s $f20, $f30, $f10 /* 00540 80870120 0C03F66B */ jal Math_Rand_ZeroOne ## Rand.Next() float /* 00544 80870124 00000000 */ nop -/* 00548 80870128 46140400 */ add.s $f16, $f0, $f20 +/* 00548 80870128 46140400 */ add.s $f16, $f0, $f20 /* 0054C 8087012C 0C03F66B */ jal Math_Rand_ZeroOne ## Rand.Next() float /* 00550 80870130 E6100068 */ swc1 $f16, 0x0068($s0) ## 00000068 -/* 00554 80870134 46140480 */ add.s $f18, $f0, $f20 +/* 00554 80870134 46140480 */ add.s $f18, $f0, $f20 /* 00558 80870138 0C03F66B */ jal Math_Rand_ZeroOne ## Rand.Next() float /* 0055C 8087013C E6120060 */ swc1 $f18, 0x0060($s0) ## 00000060 /* 00560 80870140 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 /* 00564 80870144 44812000 */ mtc1 $at, $f4 ## $f4 = 0.50 /* 00568 80870148 3C018087 */ lui $at, %hi(D_808709B8) ## $at = 80870000 -/* 0056C 8087014C C42809B8 */ lwc1 $f8, %lo(D_808709B8)($at) -/* 00570 80870150 46040181 */ sub.s $f6, $f0, $f4 +/* 0056C 8087014C C42809B8 */ lwc1 $f8, %lo(D_808709B8)($at) +/* 00570 80870150 46040181 */ sub.s $f6, $f0, $f4 /* 00574 80870154 86190032 */ lh $t9, 0x0032($s0) ## 00000032 -/* 00578 80870158 46083282 */ mul.s $f10, $f6, $f8 -/* 0057C 8087015C 4600540D */ trunc.w.s $f16, $f10 -/* 00580 80870160 44088000 */ mfc1 $t0, $f16 +/* 00578 80870158 46083282 */ mul.s $f10, $f6, $f8 +/* 0057C 8087015C 4600540D */ trunc.w.s $f16, $f10 +/* 00580 80870160 44088000 */ mfc1 $t0, $f16 /* 00584 80870164 00000000 */ nop -/* 00588 80870168 03284821 */ addu $t1, $t9, $t0 +/* 00588 80870168 03284821 */ addu $t1, $t9, $t0 /* 0058C 8087016C 0C03F66B */ jal Math_Rand_ZeroOne ## Rand.Next() float /* 00590 80870170 A6090032 */ sh $t1, 0x0032($s0) ## 00000032 -/* 00594 80870174 461C0482 */ mul.s $f18, $f0, $f28 -/* 00598 80870178 4600910D */ trunc.w.s $f4, $f18 -/* 0059C 8087017C 440C2000 */ mfc1 $t4, $f4 +/* 00594 80870174 461C0482 */ mul.s $f18, $f0, $f28 +/* 00598 80870178 4600910D */ trunc.w.s $f4, $f18 +/* 0059C 8087017C 440C2000 */ mfc1 $t4, $f4 /* 005A0 80870180 00000000 */ nop /* 005A4 80870184 258E07D0 */ addiu $t6, $t4, 0x07D0 ## $t6 = 000007D0 /* 005A8 80870188 0C03F66B */ jal Math_Rand_ZeroOne ## Rand.Next() float /* 005AC 8087018C A60E0030 */ sh $t6, 0x0030($s0) ## 00000030 -/* 005B0 80870190 461C0182 */ mul.s $f6, $f0, $f28 -/* 005B4 80870194 4600D306 */ mov.s $f12, $f26 -/* 005B8 80870198 4600320D */ trunc.w.s $f8, $f6 -/* 005BC 8087019C 44084000 */ mfc1 $t0, $f8 +/* 005B0 80870190 461C0182 */ mul.s $f6, $f0, $f28 +/* 005B4 80870194 4600D306 */ mov.s $f12, $f26 +/* 005B8 80870198 4600320D */ trunc.w.s $f8, $f6 +/* 005BC 8087019C 44084000 */ mfc1 $t0, $f8 /* 005C0 808701A0 00000000 */ nop /* 005C4 808701A4 250907D0 */ addiu $t1, $t0, 0x07D0 ## $t1 = 000007D0 /* 005C8 808701A8 A6090034 */ sh $t1, 0x0034($s0) ## 00000034 -/* 005CC 808701AC 8FAA01FC */ lw $t2, 0x01FC($sp) +/* 005CC 808701AC 8FAA01FC */ lw $t2, 0x01FC($sp) /* 005D0 808701B0 0C00CFC8 */ jal Math_Rand_CenteredFloat - + /* 005D4 808701B4 AE0A0118 */ sw $t2, 0x0118($s0) ## 00000118 /* 005D8 808701B8 C64A0000 */ lwc1 $f10, 0x0000($s2) ## FFFFFFA4 -/* 005DC 808701BC 4600D306 */ mov.s $f12, $f26 -/* 005E0 808701C0 460A0400 */ add.s $f16, $f0, $f10 +/* 005DC 808701BC 4600D306 */ mov.s $f12, $f26 +/* 005E0 808701C0 460A0400 */ add.s $f16, $f0, $f10 /* 005E4 808701C4 0C00CFC8 */ jal Math_Rand_CenteredFloat - + /* 005E8 808701C8 E6100050 */ swc1 $f16, 0x0050($s0) ## 00000050 /* 005EC 808701CC C6520004 */ lwc1 $f18, 0x0004($s2) ## FFFFFFA8 -/* 005F0 808701D0 4600D306 */ mov.s $f12, $f26 -/* 005F4 808701D4 46120100 */ add.s $f4, $f0, $f18 +/* 005F0 808701D0 4600D306 */ mov.s $f12, $f26 +/* 005F4 808701D4 46120100 */ add.s $f4, $f0, $f18 /* 005F8 808701D8 0C00CFC8 */ jal Math_Rand_CenteredFloat - + /* 005FC 808701DC E6040054 */ swc1 $f4, 0x0054($s0) ## 00000054 /* 00600 808701E0 C6460008 */ lwc1 $f6, 0x0008($s2) ## FFFFFFAC -/* 00604 808701E4 46060200 */ add.s $f8, $f0, $f6 +/* 00604 808701E4 46060200 */ add.s $f8, $f0, $f6 /* 00608 808701E8 E6080058 */ swc1 $f8, 0x0058($s0) ## 00000058 .L808701EC: /* 0060C 808701EC 2631FFFA */ addiu $s1, $s1, 0xFFFA ## $s1 = FFFFFFC8 /* 00610 808701F0 27B801B4 */ addiu $t8, $sp, 0x01B4 ## $t8 = FFFFFFBC -/* 00614 808701F4 0238082B */ sltu $at, $s1, $t8 +/* 00614 808701F4 0238082B */ sltu $at, $s1, $t8 /* 00618 808701F8 2673FFF4 */ addiu $s3, $s3, 0xFFF4 ## $s3 = 00000018 -/* 0061C 808701FC 1020FF90 */ beq $at, $zero, .L80870040 +/* 0061C 808701FC 1020FF90 */ beq $at, $zero, .L80870040 /* 00620 80870200 2694FFF4 */ addiu $s4, $s4, 0xFFF4 ## $s4 = FFFFFF74 -/* 00624 80870204 8FAD01E0 */ lw $t5, 0x01E0($sp) -/* 00628 80870208 8FAE00A4 */ lw $t6, 0x00A4($sp) +/* 00624 80870204 8FAD01E0 */ lw $t5, 0x01E0($sp) +/* 00628 80870208 8FAE00A4 */ lw $t6, 0x00A4($sp) /* 0062C 8087020C 25ACFFFF */ addiu $t4, $t5, 0xFFFF ## $t4 = FFFFFFFF /* 00630 80870210 25CFFFD0 */ addiu $t7, $t6, 0xFFD0 ## $t7 = FFFFFFD0 -/* 00634 80870214 AFAF00A4 */ sw $t7, 0x00A4($sp) -/* 00638 80870218 0581FF83 */ bgez $t4, .L80870028 -/* 0063C 8087021C AFAC01E0 */ sw $t4, 0x01E0($sp) -/* 00640 80870220 87AB01D8 */ lh $t3, 0x01D8($sp) -/* 00644 80870224 8FA201DC */ lw $v0, 0x01DC($sp) -/* 00648 80870228 8FA80210 */ lw $t0, 0x0210($sp) +/* 00634 80870214 AFAF00A4 */ sw $t7, 0x00A4($sp) +/* 00638 80870218 0581FF83 */ bgez $t4, .L80870028 +/* 0063C 8087021C AFAC01E0 */ sw $t4, 0x01E0($sp) +/* 00640 80870220 87AB01D8 */ lh $t3, 0x01D8($sp) +/* 00644 80870224 8FA201DC */ lw $v0, 0x01DC($sp) +/* 00648 80870228 8FA80210 */ lw $t0, 0x0210($sp) /* 0064C 8087022C 25794000 */ addiu $t9, $t3, 0x4000 ## $t9 = 00004000 /* 00650 80870230 24420001 */ addiu $v0, $v0, 0x0001 ## $v0 = 00000001 -/* 00654 80870234 AFA201DC */ sw $v0, 0x01DC($sp) -/* 00658 80870238 1448FF5B */ bne $v0, $t0, .L8086FFA8 -/* 0065C 8087023C A7B901D8 */ sh $t9, 0x01D8($sp) -/* 00660 80870240 AFB001F4 */ sw $s0, 0x01F4($sp) +/* 00654 80870234 AFA201DC */ sw $v0, 0x01DC($sp) +/* 00658 80870238 1448FF5B */ bne $v0, $t0, .L8086FFA8 +/* 0065C 8087023C A7B901D8 */ sh $t9, 0x01D8($sp) +/* 00660 80870240 AFB001F4 */ sw $s0, 0x01F4($sp) .L80870244: -/* 00664 80870244 8FBF0084 */ lw $ra, 0x0084($sp) -/* 00668 80870248 8FA201F4 */ lw $v0, 0x01F4($sp) -/* 0066C 8087024C D7B40030 */ ldc1 $f20, 0x0030($sp) -/* 00670 80870250 D7B60038 */ ldc1 $f22, 0x0038($sp) -/* 00674 80870254 D7B80040 */ ldc1 $f24, 0x0040($sp) -/* 00678 80870258 D7BA0048 */ ldc1 $f26, 0x0048($sp) -/* 0067C 8087025C D7BC0050 */ ldc1 $f28, 0x0050($sp) -/* 00680 80870260 D7BE0058 */ ldc1 $f30, 0x0058($sp) -/* 00684 80870264 8FB00060 */ lw $s0, 0x0060($sp) -/* 00688 80870268 8FB10064 */ lw $s1, 0x0064($sp) -/* 0068C 8087026C 8FB20068 */ lw $s2, 0x0068($sp) -/* 00690 80870270 8FB3006C */ lw $s3, 0x006C($sp) -/* 00694 80870274 8FB40070 */ lw $s4, 0x0070($sp) -/* 00698 80870278 8FB50074 */ lw $s5, 0x0074($sp) -/* 0069C 8087027C 8FB60078 */ lw $s6, 0x0078($sp) -/* 006A0 80870280 8FB7007C */ lw $s7, 0x007C($sp) -/* 006A4 80870284 8FBE0080 */ lw $s8, 0x0080($sp) -/* 006A8 80870288 03E00008 */ jr $ra +/* 00664 80870244 8FBF0084 */ lw $ra, 0x0084($sp) +/* 00668 80870248 8FA201F4 */ lw $v0, 0x01F4($sp) +/* 0066C 8087024C D7B40030 */ ldc1 $f20, 0x0030($sp) +/* 00670 80870250 D7B60038 */ ldc1 $f22, 0x0038($sp) +/* 00674 80870254 D7B80040 */ ldc1 $f24, 0x0040($sp) +/* 00678 80870258 D7BA0048 */ ldc1 $f26, 0x0048($sp) +/* 0067C 8087025C D7BC0050 */ ldc1 $f28, 0x0050($sp) +/* 00680 80870260 D7BE0058 */ ldc1 $f30, 0x0058($sp) +/* 00684 80870264 8FB00060 */ lw $s0, 0x0060($sp) +/* 00688 80870268 8FB10064 */ lw $s1, 0x0064($sp) +/* 0068C 8087026C 8FB20068 */ lw $s2, 0x0068($sp) +/* 00690 80870270 8FB3006C */ lw $s3, 0x006C($sp) +/* 00694 80870274 8FB40070 */ lw $s4, 0x0070($sp) +/* 00698 80870278 8FB50074 */ lw $s5, 0x0074($sp) +/* 0069C 8087027C 8FB60078 */ lw $s6, 0x0078($sp) +/* 006A0 80870280 8FB7007C */ lw $s7, 0x007C($sp) +/* 006A4 80870284 8FBE0080 */ lw $s8, 0x0080($sp) +/* 006A8 80870288 03E00008 */ jr $ra /* 006AC 8087028C 27BD01F8 */ addiu $sp, $sp, 0x01F8 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Breakwall/func_808705D8.s b/asm/non_matchings/overlays/actors/ovl_Bg_Breakwall/func_808705D8.s index 5436f44533..d6c5276a5e 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Breakwall/func_808705D8.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Breakwall/func_808705D8.s @@ -16,7 +16,7 @@ glabel func_808705D8 /* 00A30 80870610 3C068087 */ lui $a2, %hi(D_80870970) ## $a2 = 80870000 /* 00A34 80870614 24C60970 */ addiu $a2, $a2, %lo(D_80870970) ## $a2 = 80870970 /* 00A38 80870618 240702FF */ addiu $a3, $zero, 0x02FF ## $a3 = 000002FF -/* 00A3C 8087061C 0C031AB1 */ jal func_800C6AC4 +/* 00A3C 8087061C 0C031AB1 */ jal Graph_OpenDisps /* 00A40 80870620 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 /* 00A44 80870624 0C024F46 */ jal func_80093D18 /* 00A48 80870628 8EA40000 */ lw $a0, 0x0000($s5) ## 00000000 @@ -80,7 +80,7 @@ glabel func_808705D8 /* 00B24 80870704 24C60998 */ addiu $a2, $a2, %lo(D_80870998) ## $a2 = 80870998 /* 00B28 80870708 27A40084 */ addiu $a0, $sp, 0x0084 ## $a0 = FFFFFFE4 /* 00B2C 8087070C 8EA50000 */ lw $a1, 0x0000($s5) ## 00000000 -/* 00B30 80870710 0C031AD5 */ jal func_800C6B54 +/* 00B30 80870710 0C031AD5 */ jal Graph_CloseDisps /* 00B34 80870714 24070336 */ addiu $a3, $zero, 0x0336 ## $a3 = 00000336 .L80870718: /* 00B38 80870718 8FBF0034 */ lw $ra, 0x0034($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Ddan_Jd/BgDdanJd_Draw.s b/asm/non_matchings/overlays/actors/ovl_Bg_Ddan_Jd/BgDdanJd_Draw.s index 479b1524ae..85f336795e 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Ddan_Jd/BgDdanJd_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Ddan_Jd/BgDdanJd_Draw.s @@ -4,7 +4,7 @@ glabel BgDdanJd_Draw /* 00580 80871030 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 /* 00584 80871034 AFBF0014 */ sw $ra, 0x0014($sp) /* 00588 80871038 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 0058C 8087103C 0C00D498 */ jal Draw_DListOpa +/* 0058C 8087103C 0C00D498 */ jal Gfx_DrawDListOpa /* 00590 80871040 24A537B8 */ addiu $a1, $a1, 0x37B8 ## $a1 = 060037B8 /* 00594 80871044 8FBF0014 */ lw $ra, 0x0014($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Ddan_Kd/BgDdanKd_Draw.s b/asm/non_matchings/overlays/actors/ovl_Bg_Ddan_Kd/BgDdanKd_Draw.s index 4410b90b01..cbee6f2623 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Ddan_Kd/BgDdanKd_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Ddan_Kd/BgDdanKd_Draw.s @@ -4,7 +4,7 @@ glabel BgDdanKd_Draw /* 00780 80871870 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 /* 00784 80871874 AFBF0014 */ sw $ra, 0x0014($sp) /* 00788 80871878 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 0078C 8087187C 0C00D498 */ jal Draw_DListOpa +/* 0078C 8087187C 0C00D498 */ jal Gfx_DrawDListOpa /* 00790 80871880 24A548A8 */ addiu $a1, $a1, 0x48A8 ## $a1 = 060048A8 /* 00794 80871884 8FBF0014 */ lw $ra, 0x0014($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Dodoago/BgDodoago_Draw.s b/asm/non_matchings/overlays/actors/ovl_Bg_Dodoago/BgDodoago_Draw.s index c634c301a3..02080d0489 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Dodoago/BgDodoago_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Dodoago/BgDodoago_Draw.s @@ -9,7 +9,7 @@ glabel BgDodoago_Draw /* 00A5C 8087245C 24C62650 */ addiu $a2, $a2, %lo(D_80872650) ## $a2 = 80872650 /* 00A60 80872460 27A4002C */ addiu $a0, $sp, 0x002C ## $a0 = FFFFFFEC /* 00A64 80872464 240702A0 */ addiu $a3, $zero, 0x02A0 ## $a3 = 000002A0 -/* 00A68 80872468 0C031AB1 */ jal func_800C6AC4 +/* 00A68 80872468 0C031AB1 */ jal Graph_OpenDisps /* 00A6C 8087246C 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 /* 00A70 80872470 0C00D6D3 */ jal Flags_GetEventChkInf @@ -47,7 +47,7 @@ glabel BgDodoago_Draw /* 00AEC 808724EC 24C62678 */ addiu $a2, $a2, %lo(D_80872678) ## $a2 = 80872678 /* 00AF0 808724F0 27A4002C */ addiu $a0, $sp, 0x002C ## $a0 = FFFFFFEC /* 00AF4 808724F4 240702A9 */ addiu $a3, $zero, 0x02A9 ## $a3 = 000002A9 -/* 00AF8 808724F8 0C031AD5 */ jal func_800C6B54 +/* 00AF8 808724F8 0C031AD5 */ jal Graph_CloseDisps /* 00AFC 808724FC 8D850000 */ lw $a1, 0x0000($t4) ## 00000000 /* 00B00 80872500 8FBF001C */ lw $ra, 0x001C($sp) /* 00B04 80872504 8FB00018 */ lw $s0, 0x0018($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/BgDyYoseizo_Init.s b/asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/BgDyYoseizo_Init.s index 558b8d0649..5a5caa2575 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/BgDyYoseizo_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/BgDyYoseizo_Init.s @@ -1,10 +1,10 @@ glabel BgDyYoseizo_Init /* 00000 80872830 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 /* 00004 80872834 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 00008 80872838 AFBF002C */ sw $ra, 0x002C($sp) -/* 0000C 8087283C AFB10028 */ sw $s1, 0x0028($sp) -/* 00010 80872840 AFB00024 */ sw $s0, 0x0024($sp) -/* 00014 80872844 00A11021 */ addu $v0, $a1, $at +/* 00008 80872838 AFBF002C */ sw $ra, 0x002C($sp) +/* 0000C 8087283C AFB10028 */ sw $s1, 0x0028($sp) +/* 00010 80872840 AFB00024 */ sw $s0, 0x0024($sp) +/* 00014 80872844 00A11021 */ addu $v0, $a1, $at /* 00018 80872848 904E1DEA */ lbu $t6, 0x1DEA($v0) ## 00001DEA /* 0001C 8087284C 3C014220 */ lui $at, 0x4220 ## $at = 42200000 /* 00020 80872850 44812000 */ mtc1 $at, $f4 ## $f4 = 40.00 @@ -12,14 +12,14 @@ glabel BgDyYoseizo_Init /* 00028 80872858 848F02EC */ lh $t7, 0x02EC($a0) ## 000002EC /* 0002C 8087285C 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 00030 80872860 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 -/* 00034 80872864 05E30003 */ bgezl $t7, .L80872874 +/* 00034 80872864 05E30003 */ bgezl $t7, .L80872874 /* 00038 80872868 C6000028 */ lwc1 $f0, 0x0028($s0) ## 00000028 /* 0003C 8087286C A48002EC */ sh $zero, 0x02EC($a0) ## 000002EC /* 00040 80872870 C6000028 */ lwc1 $f0, 0x0028($s0) ## 00000028 .L80872874: /* 00044 80872874 8E190024 */ lw $t9, 0x0024($s0) ## 00000024 /* 00048 80872878 8E180028 */ lw $t8, 0x0028($s0) ## 00000028 -/* 0004C 8087287C 46040180 */ add.s $f6, $f0, $f4 +/* 0004C 8087287C 46040180 */ add.s $f6, $f0, $f4 /* 00050 80872880 AE190038 */ sw $t9, 0x0038($s0) ## 00000038 /* 00054 80872884 8E19002C */ lw $t9, 0x002C($s0) ## 0000002C /* 00058 80872888 E6000310 */ swc1 $f0, 0x0310($s0) ## 00000310 @@ -29,53 +29,53 @@ glabel BgDyYoseizo_Init /* 00068 80872898 862800A4 */ lh $t0, 0x00A4($s1) ## 000000A4 /* 0006C 8087289C 2401003B */ addiu $at, $zero, 0x003B ## $at = 0000003B /* 00070 808728A0 3C048087 */ lui $a0, %hi(D_80875510) ## $a0 = 80870000 -/* 00074 808728A4 15010014 */ bne $t0, $at, .L808728F8 +/* 00074 808728A4 15010014 */ bne $t0, $at, .L808728F8 /* 00078 808728A8 24845510 */ addiu $a0, $a0, %lo(D_80875510) ## $a0 = 80875510 /* 0007C 808728AC 3C048087 */ lui $a0, %hi(D_808754E0) ## $a0 = 80870000 /* 00080 808728B0 248454E0 */ addiu $a0, $a0, %lo(D_808754E0) ## $a0 = 808754E0 /* 00084 808728B4 0C00084C */ jal osSyncPrintf - + /* 00088 808728B8 90451DEA */ lbu $a1, 0x1DEA($v0) ## 00001DEA /* 0008C 808728BC 3C060602 */ lui $a2, 0x0602 ## $a2 = 06020000 /* 00090 808728C0 3C070601 */ lui $a3, 0x0601 ## $a3 = 06010000 /* 00094 808728C4 26090194 */ addiu $t1, $s0, 0x0194 ## $t1 = 00000194 /* 00098 808728C8 260A023C */ addiu $t2, $s0, 0x023C ## $t2 = 0000023C /* 0009C 808728CC 240B001C */ addiu $t3, $zero, 0x001C ## $t3 = 0000001C -/* 000A0 808728D0 AFAB0018 */ sw $t3, 0x0018($sp) -/* 000A4 808728D4 AFAA0014 */ sw $t2, 0x0014($sp) -/* 000A8 808728D8 AFA90010 */ sw $t1, 0x0010($sp) +/* 000A0 808728D0 AFAB0018 */ sw $t3, 0x0018($sp) +/* 000A4 808728D4 AFAA0014 */ sw $t2, 0x0014($sp) +/* 000A8 808728D8 AFA90010 */ sw $t1, 0x0010($sp) /* 000AC 808728DC 24E78698 */ addiu $a3, $a3, 0x8698 ## $a3 = 06008698 /* 000B0 808728E0 24C6C450 */ addiu $a2, $a2, 0xC450 ## $a2 = 0601C450 /* 000B4 808728E4 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 000B8 808728E8 0C0291BE */ jal func_800A46F8 +/* 000B8 808728E8 0C0291BE */ jal SkelAnime_InitSV /* 000BC 808728EC 26050150 */ addiu $a1, $s0, 0x0150 ## $a1 = 00000150 -/* 000C0 808728F0 10000010 */ beq $zero, $zero, .L80872934 +/* 000C0 808728F0 10000010 */ beq $zero, $zero, .L80872934 /* 000C4 808728F4 00000000 */ nop .L808728F8: /* 000C8 808728F8 0C00084C */ jal osSyncPrintf - + /* 000CC 808728FC 90451DEA */ lbu $a1, 0x1DEA($v0) ## 00001DEA /* 000D0 80872900 3C060602 */ lui $a2, 0x0602 ## $a2 = 06020000 /* 000D4 80872904 3C070600 */ lui $a3, 0x0600 ## $a3 = 06000000 /* 000D8 80872908 260C0194 */ addiu $t4, $s0, 0x0194 ## $t4 = 00000194 /* 000DC 8087290C 260D023C */ addiu $t5, $s0, 0x023C ## $t5 = 0000023C /* 000E0 80872910 240E001C */ addiu $t6, $zero, 0x001C ## $t6 = 0000001C -/* 000E4 80872914 AFAE0018 */ sw $t6, 0x0018($sp) -/* 000E8 80872918 AFAD0014 */ sw $t5, 0x0014($sp) -/* 000EC 8087291C AFAC0010 */ sw $t4, 0x0010($sp) +/* 000E4 80872914 AFAE0018 */ sw $t6, 0x0018($sp) +/* 000E8 80872918 AFAD0014 */ sw $t5, 0x0014($sp) +/* 000EC 8087291C AFAC0010 */ sw $t4, 0x0010($sp) /* 000F0 80872920 24E731C0 */ addiu $a3, $a3, 0x31C0 ## $a3 = 060031C0 /* 000F4 80872924 24C6C450 */ addiu $a2, $a2, 0xC450 ## $a2 = 0601C450 /* 000F8 80872928 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 000FC 8087292C 0C0291BE */ jal func_800A46F8 +/* 000FC 8087292C 0C0291BE */ jal SkelAnime_InitSV /* 00100 80872930 26050150 */ addiu $a1, $s0, 0x0150 ## $a1 = 00000150 .L80872934: /* 00104 80872934 3C0F8087 */ lui $t7, %hi(func_80872D20) ## $t7 = 80870000 /* 00108 80872938 25EF2D20 */ addiu $t7, $t7, %lo(func_80872D20) ## $t7 = 80872D20 /* 0010C 8087293C AE0F014C */ sw $t7, 0x014C($s0) ## 0000014C -/* 00110 80872940 8FBF002C */ lw $ra, 0x002C($sp) -/* 00114 80872944 8FB10028 */ lw $s1, 0x0028($sp) -/* 00118 80872948 8FB00024 */ lw $s0, 0x0024($sp) -/* 0011C 8087294C 03E00008 */ jr $ra +/* 00110 80872940 8FBF002C */ lw $ra, 0x002C($sp) +/* 00114 80872944 8FB10028 */ lw $s1, 0x0028($sp) +/* 00118 80872948 8FB00024 */ lw $s0, 0x0024($sp) +/* 0011C 8087294C 03E00008 */ jr $ra /* 00120 80872950 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/func_8087328C.s b/asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/func_8087328C.s index d0e24b24ad..6c658a7e21 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/func_8087328C.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/func_8087328C.s @@ -1,71 +1,71 @@ glabel func_8087328C /* 00A5C 8087328C 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 00A60 80873290 AFBF002C */ sw $ra, 0x002C($sp) -/* 00A64 80873294 AFB00028 */ sw $s0, 0x0028($sp) -/* 00A68 80873298 AFA50034 */ sw $a1, 0x0034($sp) +/* 00A60 80873290 AFBF002C */ sw $ra, 0x002C($sp) +/* 00A64 80873294 AFB00028 */ sw $s0, 0x0028($sp) +/* 00A68 80873298 AFA50034 */ sw $a1, 0x0034($sp) /* 00A6C 8087329C 84AF00A4 */ lh $t7, 0x00A4($a1) ## 000000A4 /* 00A70 808732A0 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 00A74 808732A4 2401003B */ addiu $at, $zero, 0x003B ## $at = 0000003B -/* 00A78 808732A8 15E10015 */ bne $t7, $at, .L80873300 +/* 00A78 808732A8 15E10015 */ bne $t7, $at, .L80873300 /* 00A7C 808732AC 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 /* 00A80 808732B0 3C040601 */ lui $a0, 0x0601 ## $a0 = 06010000 /* 00A84 808732B4 0C028800 */ jal SkelAnime_GetFrameCount - + /* 00A88 808732B8 24848698 */ addiu $a0, $a0, 0x8698 ## $a0 = 06008698 /* 00A8C 808732BC 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 00A90 808732C0 3C01C120 */ lui $at, 0xC120 ## $at = C1200000 /* 00A94 808732C4 44813000 */ mtc1 $at, $f6 ## $f6 = -10.00 -/* 00A98 808732C8 46802020 */ cvt.s.w $f0, $f4 +/* 00A98 808732C8 46802020 */ cvt.s.w $f0, $f4 /* 00A9C 808732CC 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 /* 00AA0 808732D0 24180002 */ addiu $t8, $zero, 0x0002 ## $t8 = 00000002 /* 00AA4 808732D4 24A58698 */ addiu $a1, $a1, 0x8698 ## $a1 = 06008698 /* 00AA8 808732D8 26040150 */ addiu $a0, $s0, 0x0150 ## $a0 = 00000150 /* 00AAC 808732DC 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 00AB0 808732E0 E600032C */ swc1 $f0, 0x032C($s0) ## 0000032C -/* 00AB4 808732E4 AFB80014 */ sw $t8, 0x0014($sp) -/* 00AB8 808732E8 E7A00010 */ swc1 $f0, 0x0010($sp) +/* 00AB4 808732E4 AFB80014 */ sw $t8, 0x0014($sp) +/* 00AB8 808732E8 E7A00010 */ swc1 $f0, 0x0010($sp) /* 00ABC 808732EC 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 00AC0 808732F0 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 00AC4 808732F4 E7A60018 */ swc1 $f6, 0x0018($sp) -/* 00AC8 808732F8 10000013 */ beq $zero, $zero, .L80873348 +/* 00AC0 808732F0 0C029468 */ jal SkelAnime_ChangeAnim + +/* 00AC4 808732F4 E7A60018 */ swc1 $f6, 0x0018($sp) +/* 00AC8 808732F8 10000013 */ beq $zero, $zero, .L80873348 /* 00ACC 808732FC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 .L80873300: /* 00AD0 80873300 0C028800 */ jal SkelAnime_GetFrameCount - + /* 00AD4 80873304 248431C0 */ addiu $a0, $a0, 0x31C0 ## $a0 = 000031C0 /* 00AD8 80873308 44824000 */ mtc1 $v0, $f8 ## $f8 = 0.00 /* 00ADC 8087330C 3C01C120 */ lui $at, 0xC120 ## $at = C1200000 /* 00AE0 80873310 44815000 */ mtc1 $at, $f10 ## $f10 = -10.00 -/* 00AE4 80873314 46804020 */ cvt.s.w $f0, $f8 +/* 00AE4 80873314 46804020 */ cvt.s.w $f0, $f8 /* 00AE8 80873318 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 00AEC 8087331C 24190002 */ addiu $t9, $zero, 0x0002 ## $t9 = 00000002 /* 00AF0 80873320 24A531C0 */ addiu $a1, $a1, 0x31C0 ## $a1 = 060031C0 /* 00AF4 80873324 26040150 */ addiu $a0, $s0, 0x0150 ## $a0 = 00000150 /* 00AF8 80873328 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 00AFC 8087332C E600032C */ swc1 $f0, 0x032C($s0) ## 0000032C -/* 00B00 80873330 AFB90014 */ sw $t9, 0x0014($sp) -/* 00B04 80873334 E7A00010 */ swc1 $f0, 0x0010($sp) +/* 00B00 80873330 AFB90014 */ sw $t9, 0x0014($sp) +/* 00B04 80873334 E7A00010 */ swc1 $f0, 0x0010($sp) /* 00B08 80873338 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 00B0C 8087333C 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 00B10 80873340 E7AA0018 */ swc1 $f10, 0x0018($sp) +/* 00B0C 8087333C 0C029468 */ jal SkelAnime_ChangeAnim + +/* 00B10 80873340 E7AA0018 */ swc1 $f10, 0x0018($sp) /* 00B14 80873344 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 .L80873348: /* 00B18 80873348 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 00B1C 8087334C 24056858 */ addiu $a1, $zero, 0x6858 ## $a1 = 00006858 -/* 00B20 80873350 8FA40034 */ lw $a0, 0x0034($sp) +/* 00B20 80873350 8FA40034 */ lw $a0, 0x0034($sp) /* 00B24 80873354 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 00B28 80873358 0C00B7D5 */ jal func_8002DF54 +/* 00B28 80873358 0C00B7D5 */ jal func_8002DF54 /* 00B2C 8087335C 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 /* 00B30 80873360 3C088087 */ lui $t0, %hi(func_80873380) ## $t0 = 80870000 /* 00B34 80873364 25083380 */ addiu $t0, $t0, %lo(func_80873380) ## $t0 = 80873380 /* 00B38 80873368 AE08014C */ sw $t0, 0x014C($s0) ## 0000014C -/* 00B3C 8087336C 8FBF002C */ lw $ra, 0x002C($sp) -/* 00B40 80873370 8FB00028 */ lw $s0, 0x0028($sp) +/* 00B3C 8087336C 8FBF002C */ lw $ra, 0x002C($sp) +/* 00B40 80873370 8FB00028 */ lw $s0, 0x0028($sp) /* 00B44 80873374 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 00B48 80873378 03E00008 */ jr $ra +/* 00B48 80873378 03E00008 */ jr $ra /* 00B4C 8087337C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/func_8087358C.s b/asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/func_8087358C.s index f0cb96be7e..17c6d208c4 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/func_8087358C.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/func_8087358C.s @@ -1,79 +1,79 @@ glabel func_8087358C /* 00D5C 8087358C 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 00D60 80873590 AFB00028 */ sw $s0, 0x0028($sp) +/* 00D60 80873590 AFB00028 */ sw $s0, 0x0028($sp) /* 00D64 80873594 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00D68 80873598 AFBF002C */ sw $ra, 0x002C($sp) -/* 00D6C 8087359C AFA50034 */ sw $a1, 0x0034($sp) +/* 00D68 80873598 AFBF002C */ sw $ra, 0x002C($sp) +/* 00D6C 8087359C AFA50034 */ sw $a1, 0x0034($sp) /* 00D70 808735A0 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 /* 00D74 808735A4 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 00D78 808735A8 0C00B7D5 */ jal func_8002DF54 +/* 00D78 808735A8 0C00B7D5 */ jal func_8002DF54 /* 00D7C 808735AC 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 -/* 00D80 808735B0 8FAE0034 */ lw $t6, 0x0034($sp) +/* 00D80 808735B0 8FAE0034 */ lw $t6, 0x0034($sp) /* 00D84 808735B4 2401003B */ addiu $at, $zero, 0x003B ## $at = 0000003B /* 00D88 808735B8 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 /* 00D8C 808735BC 85CF00A4 */ lh $t7, 0x00A4($t6) ## 000000A4 -/* 00D90 808735C0 15E10014 */ bne $t7, $at, .L80873614 +/* 00D90 808735C0 15E10014 */ bne $t7, $at, .L80873614 /* 00D94 808735C4 00000000 */ nop /* 00D98 808735C8 3C040602 */ lui $a0, 0x0602 ## $a0 = 06020000 /* 00D9C 808735CC 0C028800 */ jal SkelAnime_GetFrameCount - + /* 00DA0 808735D0 2484D514 */ addiu $a0, $a0, 0xD514 ## $a0 = 0601D514 /* 00DA4 808735D4 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 00DA8 808735D8 3C01C120 */ lui $at, 0xC120 ## $at = C1200000 /* 00DAC 808735DC 44813000 */ mtc1 $at, $f6 ## $f6 = -10.00 -/* 00DB0 808735E0 46802020 */ cvt.s.w $f0, $f4 +/* 00DB0 808735E0 46802020 */ cvt.s.w $f0, $f4 /* 00DB4 808735E4 3C050602 */ lui $a1, 0x0602 ## $a1 = 06020000 /* 00DB8 808735E8 24A5D514 */ addiu $a1, $a1, 0xD514 ## $a1 = 0601D514 /* 00DBC 808735EC 26040150 */ addiu $a0, $s0, 0x0150 ## $a0 = 00000150 /* 00DC0 808735F0 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 00DC4 808735F4 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 /* 00DC8 808735F8 E600032C */ swc1 $f0, 0x032C($s0) ## 0000032C -/* 00DCC 808735FC AFA00014 */ sw $zero, 0x0014($sp) -/* 00DD0 80873600 E7A00010 */ swc1 $f0, 0x0010($sp) -/* 00DD4 80873604 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 00DD8 80873608 E7A60018 */ swc1 $f6, 0x0018($sp) -/* 00DDC 8087360C 10000012 */ beq $zero, $zero, .L80873658 +/* 00DCC 808735FC AFA00014 */ sw $zero, 0x0014($sp) +/* 00DD0 80873600 E7A00010 */ swc1 $f0, 0x0010($sp) +/* 00DD4 80873604 0C029468 */ jal SkelAnime_ChangeAnim + +/* 00DD8 80873608 E7A60018 */ swc1 $f6, 0x0018($sp) +/* 00DDC 8087360C 10000012 */ beq $zero, $zero, .L80873658 /* 00DE0 80873610 241800DB */ addiu $t8, $zero, 0x00DB ## $t8 = 000000DB .L80873614: /* 00DE4 80873614 0C028800 */ jal SkelAnime_GetFrameCount - + /* 00DE8 80873618 24841DF0 */ addiu $a0, $a0, 0x1DF0 ## $a0 = 00001DF0 /* 00DEC 8087361C 44824000 */ mtc1 $v0, $f8 ## $f8 = 0.00 /* 00DF0 80873620 3C01C120 */ lui $at, 0xC120 ## $at = C1200000 /* 00DF4 80873624 44815000 */ mtc1 $at, $f10 ## $f10 = -10.00 -/* 00DF8 80873628 46804020 */ cvt.s.w $f0, $f8 +/* 00DF8 80873628 46804020 */ cvt.s.w $f0, $f8 /* 00DFC 8087362C 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 00E00 80873630 24A51DF0 */ addiu $a1, $a1, 0x1DF0 ## $a1 = 06001DF0 /* 00E04 80873634 26040150 */ addiu $a0, $s0, 0x0150 ## $a0 = 00000150 /* 00E08 80873638 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 00E0C 8087363C 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 /* 00E10 80873640 E600032C */ swc1 $f0, 0x032C($s0) ## 0000032C -/* 00E14 80873644 AFA00014 */ sw $zero, 0x0014($sp) -/* 00E18 80873648 E7A00010 */ swc1 $f0, 0x0010($sp) -/* 00E1C 8087364C 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 00E20 80873650 E7AA0018 */ swc1 $f10, 0x0018($sp) +/* 00E14 80873644 AFA00014 */ sw $zero, 0x0014($sp) +/* 00E18 80873648 E7A00010 */ swc1 $f0, 0x0010($sp) +/* 00E1C 8087364C 0C029468 */ jal SkelAnime_ChangeAnim + +/* 00E20 80873650 E7AA0018 */ swc1 $f10, 0x0018($sp) /* 00E24 80873654 241800DB */ addiu $t8, $zero, 0x00DB ## $t8 = 000000DB .L80873658: /* 00E28 80873658 24190005 */ addiu $t9, $zero, 0x0005 ## $t9 = 00000005 /* 00E2C 8087365C A618010E */ sh $t8, 0x010E($s0) ## 0000010E /* 00E30 80873660 A61902EE */ sh $t9, 0x02EE($s0) ## 000002EE -/* 00E34 80873664 8FA40034 */ lw $a0, 0x0034($sp) +/* 00E34 80873664 8FA40034 */ lw $a0, 0x0034($sp) /* 00E38 80873668 3305FFFF */ andi $a1, $t8, 0xFFFF ## $a1 = 000000DB -/* 00E3C 8087366C 0C042DA0 */ jal func_8010B680 +/* 00E3C 8087366C 0C042DA0 */ jal func_8010B680 /* 00E40 80873670 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 /* 00E44 80873674 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00E48 80873678 8FA50034 */ lw $a1, 0x0034($sp) -/* 00E4C 8087367C 0C21CA58 */ jal func_80872960 +/* 00E48 80873678 8FA50034 */ lw $a1, 0x0034($sp) +/* 00E4C 8087367C 0C21CA58 */ jal func_80872960 /* 00E50 80873680 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 /* 00E54 80873684 3C088087 */ lui $t0, %hi(func_808736A4) ## $t0 = 80870000 /* 00E58 80873688 250836A4 */ addiu $t0, $t0, %lo(func_808736A4) ## $t0 = 808736A4 /* 00E5C 8087368C AE08014C */ sw $t0, 0x014C($s0) ## 0000014C -/* 00E60 80873690 8FBF002C */ lw $ra, 0x002C($sp) -/* 00E64 80873694 8FB00028 */ lw $s0, 0x0028($sp) +/* 00E60 80873690 8FBF002C */ lw $ra, 0x002C($sp) +/* 00E64 80873694 8FB00028 */ lw $s0, 0x0028($sp) /* 00E68 80873698 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 00E6C 8087369C 03E00008 */ jr $ra +/* 00E6C 8087369C 03E00008 */ jr $ra /* 00E70 808736A0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/func_80873780.s b/asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/func_80873780.s index 4f2c400257..01b2aa2ed7 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/func_80873780.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/func_80873780.s @@ -1,68 +1,68 @@ glabel func_80873780 /* 00F50 80873780 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 00F54 80873784 AFBF002C */ sw $ra, 0x002C($sp) -/* 00F58 80873788 AFB00028 */ sw $s0, 0x0028($sp) +/* 00F54 80873784 AFBF002C */ sw $ra, 0x002C($sp) +/* 00F58 80873788 AFB00028 */ sw $s0, 0x0028($sp) /* 00F5C 8087378C 84AE00A4 */ lh $t6, 0x00A4($a1) ## 000000A4 /* 00F60 80873790 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 00F64 80873794 2401003B */ addiu $at, $zero, 0x003B ## $at = 0000003B -/* 00F68 80873798 15C10015 */ bne $t6, $at, .L808737F0 +/* 00F68 80873798 15C10015 */ bne $t6, $at, .L808737F0 /* 00F6C 8087379C 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 /* 00F70 808737A0 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 /* 00F74 808737A4 0C028800 */ jal SkelAnime_GetFrameCount - + /* 00F78 808737A8 248469E8 */ addiu $a0, $a0, 0x69E8 ## $a0 = 060069E8 /* 00F7C 808737AC 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 00F80 808737B0 3C01C120 */ lui $at, 0xC120 ## $at = C1200000 /* 00F84 808737B4 44813000 */ mtc1 $at, $f6 ## $f6 = -10.00 -/* 00F88 808737B8 46802020 */ cvt.s.w $f0, $f4 +/* 00F88 808737B8 46802020 */ cvt.s.w $f0, $f4 /* 00F8C 808737BC 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 00F90 808737C0 240F0002 */ addiu $t7, $zero, 0x0002 ## $t7 = 00000002 /* 00F94 808737C4 24A569E8 */ addiu $a1, $a1, 0x69E8 ## $a1 = 060069E8 /* 00F98 808737C8 26040150 */ addiu $a0, $s0, 0x0150 ## $a0 = 00000150 /* 00F9C 808737CC 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 00FA0 808737D0 E600032C */ swc1 $f0, 0x032C($s0) ## 0000032C -/* 00FA4 808737D4 AFAF0014 */ sw $t7, 0x0014($sp) -/* 00FA8 808737D8 E7A00010 */ swc1 $f0, 0x0010($sp) +/* 00FA4 808737D4 AFAF0014 */ sw $t7, 0x0014($sp) +/* 00FA8 808737D8 E7A00010 */ swc1 $f0, 0x0010($sp) /* 00FAC 808737DC 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 00FB0 808737E0 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 00FB4 808737E4 E7A60018 */ swc1 $f6, 0x0018($sp) -/* 00FB8 808737E8 10000013 */ beq $zero, $zero, .L80873838 +/* 00FB0 808737E0 0C029468 */ jal SkelAnime_ChangeAnim + +/* 00FB4 808737E4 E7A60018 */ swc1 $f6, 0x0018($sp) +/* 00FB8 808737E8 10000013 */ beq $zero, $zero, .L80873838 /* 00FBC 808737EC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 .L808737F0: /* 00FC0 808737F0 0C028800 */ jal SkelAnime_GetFrameCount - + /* 00FC4 808737F4 24845810 */ addiu $a0, $a0, 0x5810 ## $a0 = 00005810 /* 00FC8 808737F8 44824000 */ mtc1 $v0, $f8 ## $f8 = 0.00 /* 00FCC 808737FC 3C01C120 */ lui $at, 0xC120 ## $at = C1200000 /* 00FD0 80873800 44815000 */ mtc1 $at, $f10 ## $f10 = -10.00 -/* 00FD4 80873804 46804020 */ cvt.s.w $f0, $f8 +/* 00FD4 80873804 46804020 */ cvt.s.w $f0, $f8 /* 00FD8 80873808 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 00FDC 8087380C 24180002 */ addiu $t8, $zero, 0x0002 ## $t8 = 00000002 /* 00FE0 80873810 24A55810 */ addiu $a1, $a1, 0x5810 ## $a1 = 06005810 /* 00FE4 80873814 26040150 */ addiu $a0, $s0, 0x0150 ## $a0 = 00000150 /* 00FE8 80873818 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 00FEC 8087381C E600032C */ swc1 $f0, 0x032C($s0) ## 0000032C -/* 00FF0 80873820 AFB80014 */ sw $t8, 0x0014($sp) -/* 00FF4 80873824 E7A00010 */ swc1 $f0, 0x0010($sp) +/* 00FF0 80873820 AFB80014 */ sw $t8, 0x0014($sp) +/* 00FF4 80873824 E7A00010 */ swc1 $f0, 0x0010($sp) /* 00FF8 80873828 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 00FFC 8087382C 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 01000 80873830 E7AA0018 */ swc1 $f10, 0x0018($sp) +/* 00FFC 8087382C 0C029468 */ jal SkelAnime_ChangeAnim + +/* 01000 80873830 E7AA0018 */ swc1 $f10, 0x0018($sp) /* 01004 80873834 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 .L80873838: /* 01008 80873838 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 0100C 8087383C 24056859 */ addiu $a1, $zero, 0x6859 ## $a1 = 00006859 /* 01010 80873840 3C088087 */ lui $t0, %hi(func_80873868) ## $t0 = 80870000 /* 01014 80873844 24190001 */ addiu $t9, $zero, 0x0001 ## $t9 = 00000001 /* 01018 80873848 25083868 */ addiu $t0, $t0, %lo(func_80873868) ## $t0 = 80873868 /* 0101C 8087384C A61902F6 */ sh $t9, 0x02F6($s0) ## 000002F6 /* 01020 80873850 AE08014C */ sw $t0, 0x014C($s0) ## 0000014C -/* 01024 80873854 8FBF002C */ lw $ra, 0x002C($sp) -/* 01028 80873858 8FB00028 */ lw $s0, 0x0028($sp) +/* 01024 80873854 8FBF002C */ lw $ra, 0x002C($sp) +/* 01028 80873858 8FB00028 */ lw $s0, 0x0028($sp) /* 0102C 8087385C 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 01030 80873860 03E00008 */ jr $ra +/* 01030 80873860 03E00008 */ jr $ra /* 01034 80873864 00000000 */ nop 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 506e99d396..eb3fe58ff3 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 @@ -1,99 +1,99 @@ glabel func_80873868 /* 01038 80873868 27BDFFA0 */ addiu $sp, $sp, 0xFFA0 ## $sp = FFFFFFA0 -/* 0103C 8087386C AFBF003C */ sw $ra, 0x003C($sp) -/* 01040 80873870 AFB00038 */ sw $s0, 0x0038($sp) -/* 01044 80873874 AFA50064 */ sw $a1, 0x0064($sp) +/* 0103C 8087386C AFBF003C */ sw $ra, 0x003C($sp) +/* 01040 80873870 AFB00038 */ sw $s0, 0x0038($sp) +/* 01044 80873874 AFA50064 */ sw $a1, 0x0064($sp) /* 01048 80873878 8CAF1C44 */ lw $t7, 0x1C44($a1) ## 00001C44 /* 0104C 8087387C 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 01050 80873880 3C018087 */ lui $at, %hi(D_808756A4) ## $at = 80870000 -/* 01054 80873884 AFAF005C */ sw $t7, 0x005C($sp) +/* 01054 80873884 AFAF005C */ sw $t7, 0x005C($sp) /* 01058 80873888 849802FC */ lh $t8, 0x02FC($a0) ## 000002FC /* 0105C 8087388C C4820168 */ lwc1 $f2, 0x0168($a0) ## 00000168 -/* 01060 80873890 1300000E */ beq $t8, $zero, .L808738CC -/* 01064 80873894 46001306 */ mov.s $f12, $f2 -/* 01068 80873898 C42E56A4 */ lwc1 $f14, %lo(D_808756A4)($at) +/* 01060 80873890 1300000E */ beq $t8, $zero, .L808738CC +/* 01064 80873894 46001306 */ mov.s $f12, $f2 +/* 01068 80873898 C42E56A4 */ lwc1 $f14, %lo(D_808756A4)($at) /* 0106C 8087389C C484032C */ lwc1 $f4, 0x032C($a0) ## 0000032C -/* 01070 808738A0 460E1002 */ mul.s $f0, $f2, $f14 +/* 01070 808738A0 460E1002 */ mul.s $f0, $f2, $f14 /* 01074 808738A4 00000000 */ nop -/* 01078 808738A8 460E2182 */ mul.s $f6, $f4, $f14 +/* 01078 808738A8 460E2182 */ mul.s $f6, $f4, $f14 /* 0107C 808738AC E4800324 */ swc1 $f0, 0x0324($a0) ## 00000324 -/* 01080 808738B0 4600303E */ c.le.s $f6, $f0 +/* 01080 808738B0 4600303E */ c.le.s $f6, $f0 /* 01084 808738B4 00000000 */ nop -/* 01088 808738B8 45000004 */ bc1f .L808738CC +/* 01088 808738B8 45000004 */ bc1f .L808738CC /* 0108C 808738BC 00000000 */ nop /* 01090 808738C0 44804000 */ mtc1 $zero, $f8 ## $f8 = 0.00 /* 01094 808738C4 00000000 */ nop /* 01098 808738C8 E4880324 */ swc1 $f8, 0x0324($a0) ## 00000324 .L808738CC: /* 0109C 808738CC 26040150 */ addiu $a0, $s0, 0x0150 ## $a0 = 00000150 -/* 010A0 808738D0 AFA40044 */ sw $a0, 0x0044($sp) +/* 010A0 808738D0 AFA40044 */ sw $a0, 0x0044($sp) /* 010A4 808738D4 0C02927F */ jal SkelAnime_FrameUpdateMatrix - -/* 010A8 808738D8 E7AC0058 */ swc1 $f12, 0x0058($sp) -/* 010AC 808738DC C7AC0058 */ lwc1 $f12, 0x0058($sp) + +/* 010A8 808738D8 E7AC0058 */ swc1 $f12, 0x0058($sp) +/* 010AC 808738DC C7AC0058 */ lwc1 $f12, 0x0058($sp) /* 010B0 808738E0 C60A032C */ lwc1 $f10, 0x032C($s0) ## 0000032C -/* 010B4 808738E4 460C503E */ c.le.s $f10, $f12 +/* 010B4 808738E4 460C503E */ c.le.s $f10, $f12 /* 010B8 808738E8 00000000 */ nop -/* 010BC 808738EC 4502004F */ bc1fl .L80873A2C +/* 010BC 808738EC 4502004F */ bc1fl .L80873A2C /* 010C0 808738F0 86020306 */ lh $v0, 0x0306($s0) ## 00000306 /* 010C4 808738F4 861902FC */ lh $t9, 0x02FC($s0) ## 000002FC -/* 010C8 808738F8 8FA90064 */ lw $t1, 0x0064($sp) -/* 010CC 808738FC 5720004B */ bnel $t9, $zero, .L80873A2C +/* 010C8 808738F8 8FA90064 */ lw $t1, 0x0064($sp) +/* 010CC 808738FC 5720004B */ bnel $t9, $zero, .L80873A2C /* 010D0 80873900 86020306 */ lh $v0, 0x0306($s0) ## 00000306 /* 010D4 80873904 852A00A4 */ lh $t2, 0x00A4($t1) ## 000000A4 /* 010D8 80873908 2401003B */ addiu $at, $zero, 0x003B ## $at = 0000003B /* 010DC 8087390C 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 -/* 010E0 80873910 15410014 */ bne $t2, $at, .L80873964 +/* 010E0 80873910 15410014 */ bne $t2, $at, .L80873964 /* 010E4 80873914 00000000 */ nop /* 010E8 80873918 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 /* 010EC 8087391C 0C028800 */ jal SkelAnime_GetFrameCount - + /* 010F0 80873920 24847CA8 */ addiu $a0, $a0, 0x7CA8 ## $a0 = 06007CA8 /* 010F4 80873924 44828000 */ mtc1 $v0, $f16 ## $f16 = 0.00 /* 010F8 80873928 3C01C120 */ lui $at, 0xC120 ## $at = C1200000 /* 010FC 8087392C 44819000 */ mtc1 $at, $f18 ## $f18 = -10.00 -/* 01100 80873930 46808020 */ cvt.s.w $f0, $f16 +/* 01100 80873930 46808020 */ cvt.s.w $f0, $f16 /* 01104 80873934 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 01108 80873938 24A57CA8 */ addiu $a1, $a1, 0x7CA8 ## $a1 = 06007CA8 /* 0110C 8087393C 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 01110 80873940 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 /* 01114 80873944 E600032C */ swc1 $f0, 0x032C($s0) ## 0000032C -/* 01118 80873948 AFA00014 */ sw $zero, 0x0014($sp) -/* 0111C 8087394C E7A00010 */ swc1 $f0, 0x0010($sp) -/* 01120 80873950 8FA40044 */ lw $a0, 0x0044($sp) -/* 01124 80873954 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 01128 80873958 E7B20018 */ swc1 $f18, 0x0018($sp) -/* 0112C 8087395C 10000012 */ beq $zero, $zero, .L808739A8 +/* 01118 80873948 AFA00014 */ sw $zero, 0x0014($sp) +/* 0111C 8087394C E7A00010 */ swc1 $f0, 0x0010($sp) +/* 01120 80873950 8FA40044 */ lw $a0, 0x0044($sp) +/* 01124 80873954 0C029468 */ jal SkelAnime_ChangeAnim + +/* 01128 80873958 E7B20018 */ swc1 $f18, 0x0018($sp) +/* 0112C 8087395C 10000012 */ beq $zero, $zero, .L808739A8 /* 01130 80873960 860C02EA */ lh $t4, 0x02EA($s0) ## 000002EA .L80873964: /* 01134 80873964 0C028800 */ jal SkelAnime_GetFrameCount - + /* 01138 80873968 24844344 */ addiu $a0, $a0, 0x4344 ## $a0 = 00004344 /* 0113C 8087396C 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 01140 80873970 3C01C120 */ lui $at, 0xC120 ## $at = C1200000 /* 01144 80873974 44813000 */ mtc1 $at, $f6 ## $f6 = -10.00 -/* 01148 80873978 46802020 */ cvt.s.w $f0, $f4 +/* 01148 80873978 46802020 */ cvt.s.w $f0, $f4 /* 0114C 8087397C 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 01150 80873980 24A54344 */ addiu $a1, $a1, 0x4344 ## $a1 = 06004344 /* 01154 80873984 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 01158 80873988 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 /* 0115C 8087398C E600032C */ swc1 $f0, 0x032C($s0) ## 0000032C -/* 01160 80873990 AFA00014 */ sw $zero, 0x0014($sp) -/* 01164 80873994 E7A00010 */ swc1 $f0, 0x0010($sp) -/* 01168 80873998 8FA40044 */ lw $a0, 0x0044($sp) -/* 0116C 8087399C 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 01170 808739A0 E7A60018 */ swc1 $f6, 0x0018($sp) +/* 01160 80873990 AFA00014 */ sw $zero, 0x0014($sp) +/* 01164 80873994 E7A00010 */ swc1 $f0, 0x0010($sp) +/* 01168 80873998 8FA40044 */ lw $a0, 0x0044($sp) +/* 0116C 8087399C 0C029468 */ jal SkelAnime_ChangeAnim + +/* 01170 808739A0 E7A60018 */ swc1 $f6, 0x0018($sp) /* 01174 808739A4 860C02EA */ lh $t4, 0x02EA($s0) ## 000002EA .L808739A8: /* 01178 808739A8 24080001 */ addiu $t0, $zero, 0x0001 ## $t0 = 00000001 /* 0117C 808739AC 240B0096 */ addiu $t3, $zero, 0x0096 ## $t3 = 00000096 /* 01180 808739B0 A60B0302 */ sh $t3, 0x0302($s0) ## 00000302 -/* 01184 808739B4 1580001C */ bne $t4, $zero, .L80873A28 +/* 01184 808739B4 1580001C */ bne $t4, $zero, .L80873A28 /* 01188 808739B8 A60802FC */ sh $t0, 0x02FC($s0) ## 000002FC -/* 0118C 808739BC 8FA60064 */ lw $a2, 0x0064($sp) -/* 01190 808739C0 8FA2005C */ lw $v0, 0x005C($sp) +/* 0118C 808739BC 8FA60064 */ lw $a2, 0x0064($sp) +/* 01190 808739C0 8FA2005C */ lw $v0, 0x005C($sp) /* 01194 808739C4 3C014348 */ lui $at, 0x4348 ## $at = 43480000 /* 01198 808739C8 44815000 */ mtc1 $at, $f10 ## $f10 = 200.00 /* 0119C 808739CC 84CD00A4 */ lh $t5, 0x00A4($a2) ## 000000A4 @@ -101,52 +101,52 @@ glabel func_80873868 /* 011A4 808739D4 2401003B */ addiu $at, $zero, 0x003B ## $at = 0000003B /* 011A8 808739D8 C4400024 */ lwc1 $f0, 0x0024($v0) ## 00000024 /* 011AC 808739DC C44C002C */ lwc1 $f12, 0x002C($v0) ## 0000002C -/* 011B0 808739E0 15A10003 */ bne $t5, $at, .L808739F0 -/* 011B4 808739E4 460A4080 */ add.s $f2, $f8, $f10 -/* 011B8 808739E8 10000003 */ beq $zero, $zero, .L808739F8 +/* 011B0 808739E0 15A10003 */ bne $t5, $at, .L808739F0 +/* 011B4 808739E4 460A4080 */ add.s $f2, $f8, $f10 +/* 011B8 808739E8 10000003 */ beq $zero, $zero, .L808739F8 /* 011BC 808739EC 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 .L808739F0: -/* 011C0 808739F0 00081400 */ sll $v0, $t0, 16 -/* 011C4 808739F4 00021403 */ sra $v0, $v0, 16 +/* 011C0 808739F0 00081400 */ sll $v0, $t0, 16 +/* 011C4 808739F4 00021403 */ sra $v0, $v0, 16 .L808739F8: /* 011C8 808739F8 24C41C24 */ addiu $a0, $a2, 0x1C24 ## $a0 = 00001C24 /* 011CC 808739FC 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 011D0 80873A00 24070184 */ addiu $a3, $zero, 0x0184 ## $a3 = 00000184 -/* 011D4 80873A04 E7A00010 */ swc1 $f0, 0x0010($sp) -/* 011D8 80873A08 E7A20014 */ swc1 $f2, 0x0014($sp) -/* 011DC 80873A0C E7AC0018 */ swc1 $f12, 0x0018($sp) -/* 011E0 80873A10 AFA0001C */ sw $zero, 0x001C($sp) -/* 011E4 80873A14 AFA00020 */ sw $zero, 0x0020($sp) -/* 011E8 80873A18 AFA00024 */ sw $zero, 0x0024($sp) +/* 011D4 80873A04 E7A00010 */ swc1 $f0, 0x0010($sp) +/* 011D8 80873A08 E7A20014 */ swc1 $f2, 0x0014($sp) +/* 011DC 80873A0C E7AC0018 */ swc1 $f12, 0x0018($sp) +/* 011E0 80873A10 AFA0001C */ sw $zero, 0x001C($sp) +/* 011E4 80873A14 AFA00020 */ sw $zero, 0x0020($sp) +/* 011E8 80873A18 AFA00024 */ sw $zero, 0x0024($sp) /* 011EC 80873A1C 0C00C916 */ jal Actor_SpawnAttached - -/* 011F0 80873A20 AFA20028 */ sw $v0, 0x0028($sp) + +/* 011F0 80873A20 AFA20028 */ sw $v0, 0x0028($sp) /* 011F4 80873A24 AE020340 */ sw $v0, 0x0340($s0) ## 00000340 .L80873A28: /* 011F8 80873A28 86020306 */ lh $v0, 0x0306($s0) ## 00000306 .L80873A2C: /* 011FC 80873A2C 24080001 */ addiu $t0, $zero, 0x0001 ## $t0 = 00000001 /* 01200 80873A30 3C038016 */ lui $v1, 0x8016 ## $v1 = 80160000 -/* 01204 80873A34 28410002 */ slti $at, $v0, 0x0002 -/* 01208 80873A38 14200002 */ bne $at, $zero, .L80873A44 +/* 01204 80873A34 28410002 */ slti $at, $v0, 0x0002 +/* 01208 80873A38 14200002 */ bne $at, $zero, .L80873A44 /* 0120C 80873A3C 244EFFFF */ addiu $t6, $v0, 0xFFFF ## $t6 = FFFFFFFF /* 01210 80873A40 A60E0306 */ sh $t6, 0x0306($s0) ## 00000306 .L80873A44: /* 01214 80873A44 86020302 */ lh $v0, 0x0302($s0) ## 00000302 /* 01218 80873A48 2463E660 */ addiu $v1, $v1, 0xE660 ## $v1 = 8015E660 /* 0121C 80873A4C 24180140 */ addiu $t8, $zero, 0x0140 ## $t8 = 00000140 -/* 01220 80873A50 2841006E */ slti $at, $v0, 0x006E -/* 01224 80873A54 14200003 */ bne $at, $zero, .L80873A64 +/* 01220 80873A50 2841006E */ slti $at, $v0, 0x006E +/* 01224 80873A54 14200003 */ bne $at, $zero, .L80873A64 /* 01228 80873A58 244FFFFF */ addiu $t7, $v0, 0xFFFF ## $t7 = FFFFFFFF /* 0122C 80873A5C A60F0302 */ sh $t7, 0x0302($s0) ## 00000302 /* 01230 80873A60 86020302 */ lh $v0, 0x0302($s0) ## 00000302 .L80873A64: /* 01234 80873A64 2401006E */ addiu $at, $zero, 0x006E ## $at = 0000006E -/* 01238 80873A68 14410008 */ bne $v0, $at, .L80873A8C +/* 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 -/* 01248 80873A78 8FA40064 */ lw $a0, 0x0064($sp) +/* 01244 80873A74 0C021DA0 */ jal func_80087680 +/* 01248 80873A78 8FA40064 */ lw $a0, 0x0064($sp) /* 0124C 80873A7C 241900C8 */ addiu $t9, $zero, 0x00C8 ## $t9 = 000000C8 /* 01250 80873A80 A6190306 */ sh $t9, 0x0306($s0) ## 00000306 /* 01254 80873A84 86020302 */ lh $v0, 0x0302($s0) ## 00000302 @@ -158,24 +158,24 @@ glabel func_80873868 /* 01268 80873A98 846A002E */ lh $t2, 0x002E($v1) ## 8015E68E /* 0126C 80873A9C 241900DA */ addiu $t9, $zero, 0x00DA ## $t9 = 000000DA /* 01270 80873AA0 3325FFFF */ andi $a1, $t9, 0xFFFF ## $a1 = 000000DA -/* 01274 80873AA4 152A0005 */ bne $t1, $t2, .L80873ABC +/* 01274 80873AA4 152A0005 */ bne $t1, $t2, .L80873ABC /* 01278 80873AA8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 0127C 80873AAC 846B13F4 */ lh $t3, 0x13F4($v1) ## 8015FA54 /* 01280 80873AB0 806C0033 */ lb $t4, 0x0033($v1) ## 8015E693 -/* 01284 80873AB4 516C0004 */ beql $t3, $t4, .L80873AC8 +/* 01284 80873AB4 516C0004 */ beql $t3, $t4, .L80873AC8 /* 01288 80873AB8 244EFFFF */ addiu $t6, $v0, 0xFFFF ## $t6 = FFFFFFFF .L80873ABC: /* 0128C 80873ABC 860D0306 */ lh $t5, 0x0306($s0) ## 00000306 -/* 01290 80873AC0 150D000D */ bne $t0, $t5, .L80873AF8 +/* 01290 80873AC0 150D000D */ bne $t0, $t5, .L80873AF8 /* 01294 80873AC4 244EFFFF */ addiu $t6, $v0, 0xFFFF ## $t6 = FFFFFFFF .L80873AC8: /* 01298 80873AC8 A60E0302 */ sh $t6, 0x0302($s0) ## 00000302 /* 0129C 80873ACC 86020302 */ lh $v0, 0x0302($s0) ## 00000302 /* 012A0 80873AD0 2401005A */ addiu $at, $zero, 0x005A ## $at = 0000005A -/* 012A4 80873AD4 14410008 */ bne $v0, $at, .L80873AF8 +/* 012A4 80873AD4 14410008 */ bne $v0, $at, .L80873AF8 /* 012A8 80873AD8 00000000 */ nop /* 012AC 80873ADC 860F02EA */ lh $t7, 0x02EA($s0) ## 000002EA -/* 012B0 80873AE0 55E00004 */ bnel $t7, $zero, .L80873AF4 +/* 012B0 80873AE0 55E00004 */ bnel $t7, $zero, .L80873AF4 /* 012B4 80873AE4 A60002EA */ sh $zero, 0x02EA($s0) ## 000002EA /* 012B8 80873AE8 8E180340 */ lw $t8, 0x0340($s0) ## 00000340 /* 012BC 80873AEC A7080152 */ sh $t0, 0x0152($t8) ## 00000152 @@ -183,24 +183,24 @@ glabel func_80873868 .L80873AF4: /* 012C4 80873AF4 86020302 */ lh $v0, 0x0302($s0) ## 00000302 .L80873AF8: -/* 012C8 80873AF8 15020009 */ bne $t0, $v0, .L80873B20 +/* 012C8 80873AF8 15020009 */ bne $t0, $v0, .L80873B20 /* 012CC 80873AFC 24090005 */ addiu $t1, $zero, 0x0005 ## $t1 = 00000005 /* 012D0 80873B00 A619010E */ sh $t9, 0x010E($s0) ## 0000010E /* 012D4 80873B04 A60902EE */ sh $t1, 0x02EE($s0) ## 000002EE -/* 012D8 80873B08 0C042DC8 */ jal func_8010B720 -/* 012DC 80873B0C 8FA40064 */ lw $a0, 0x0064($sp) +/* 012D8 80873B08 0C042DC8 */ jal func_8010B720 +/* 012DC 80873B0C 8FA40064 */ lw $a0, 0x0064($sp) /* 012E0 80873B10 3C0A8087 */ lui $t2, %hi(func_80873B3C) ## $t2 = 80870000 /* 012E4 80873B14 254A3B3C */ addiu $t2, $t2, %lo(func_80873B3C) ## $t2 = 80873B3C -/* 012E8 80873B18 10000003 */ beq $zero, $zero, .L80873B28 +/* 012E8 80873B18 10000003 */ beq $zero, $zero, .L80873B28 /* 012EC 80873B1C AE0A014C */ sw $t2, 0x014C($s0) ## 0000014C .L80873B20: -/* 012F0 80873B20 0C21CB16 */ jal func_80872C58 -/* 012F4 80873B24 8FA50064 */ lw $a1, 0x0064($sp) +/* 012F0 80873B20 0C21CB16 */ jal func_80872C58 +/* 012F4 80873B24 8FA50064 */ lw $a1, 0x0064($sp) .L80873B28: -/* 012F8 80873B28 8FBF003C */ lw $ra, 0x003C($sp) -/* 012FC 80873B2C 8FB00038 */ lw $s0, 0x0038($sp) +/* 012F8 80873B28 8FBF003C */ lw $ra, 0x003C($sp) +/* 012FC 80873B2C 8FB00038 */ lw $s0, 0x0038($sp) /* 01300 80873B30 27BD0060 */ addiu $sp, $sp, 0x0060 ## $sp = 00000000 -/* 01304 80873B34 03E00008 */ jr $ra +/* 01304 80873B34 03E00008 */ jr $ra /* 01308 80873B38 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/func_80873C14.s b/asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/func_80873C14.s index 9f7b877e52..5c6eb75b40 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/func_80873C14.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/func_80873C14.s @@ -1,54 +1,54 @@ glabel func_80873C14 /* 013E4 80873C14 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 013E8 80873C18 AFBF002C */ sw $ra, 0x002C($sp) -/* 013EC 80873C1C AFB00028 */ sw $s0, 0x0028($sp) +/* 013E8 80873C18 AFBF002C */ sw $ra, 0x002C($sp) +/* 013EC 80873C1C AFB00028 */ sw $s0, 0x0028($sp) /* 013F0 80873C20 84AE00A4 */ lh $t6, 0x00A4($a1) ## 000000A4 /* 013F4 80873C24 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 013F8 80873C28 2401003B */ addiu $at, $zero, 0x003B ## $at = 0000003B -/* 013FC 80873C2C 15C10015 */ bne $t6, $at, .L80873C84 +/* 013FC 80873C2C 15C10015 */ bne $t6, $at, .L80873C84 /* 01400 80873C30 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 /* 01404 80873C34 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 /* 01408 80873C38 0C028800 */ jal SkelAnime_GetFrameCount - + /* 0140C 80873C3C 24845E60 */ addiu $a0, $a0, 0x5E60 ## $a0 = 06005E60 /* 01410 80873C40 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 01414 80873C44 3C01C120 */ lui $at, 0xC120 ## $at = C1200000 /* 01418 80873C48 44813000 */ mtc1 $at, $f6 ## $f6 = -10.00 -/* 0141C 80873C4C 46802020 */ cvt.s.w $f0, $f4 +/* 0141C 80873C4C 46802020 */ cvt.s.w $f0, $f4 /* 01420 80873C50 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 01424 80873C54 240F0002 */ addiu $t7, $zero, 0x0002 ## $t7 = 00000002 /* 01428 80873C58 24A55E60 */ addiu $a1, $a1, 0x5E60 ## $a1 = 06005E60 /* 0142C 80873C5C 26040150 */ addiu $a0, $s0, 0x0150 ## $a0 = 00000150 /* 01430 80873C60 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 01434 80873C64 E600032C */ swc1 $f0, 0x032C($s0) ## 0000032C -/* 01438 80873C68 AFAF0014 */ sw $t7, 0x0014($sp) -/* 0143C 80873C6C E7A00010 */ swc1 $f0, 0x0010($sp) +/* 01438 80873C68 AFAF0014 */ sw $t7, 0x0014($sp) +/* 0143C 80873C6C E7A00010 */ swc1 $f0, 0x0010($sp) /* 01440 80873C70 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 01444 80873C74 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 01448 80873C78 E7A60018 */ swc1 $f6, 0x0018($sp) -/* 0144C 80873C7C 10000013 */ beq $zero, $zero, .L80873CCC +/* 01444 80873C74 0C029468 */ jal SkelAnime_ChangeAnim + +/* 01448 80873C78 E7A60018 */ swc1 $f6, 0x0018($sp) +/* 0144C 80873C7C 10000013 */ beq $zero, $zero, .L80873CCC /* 01450 80873C80 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 .L80873C84: /* 01454 80873C84 0C028800 */ jal SkelAnime_GetFrameCount - + /* 01458 80873C88 2484092C */ addiu $a0, $a0, 0x092C ## $a0 = 0000092C /* 0145C 80873C8C 44824000 */ mtc1 $v0, $f8 ## $f8 = 0.00 /* 01460 80873C90 3C01C120 */ lui $at, 0xC120 ## $at = C1200000 /* 01464 80873C94 44815000 */ mtc1 $at, $f10 ## $f10 = -10.00 -/* 01468 80873C98 46804020 */ cvt.s.w $f0, $f8 +/* 01468 80873C98 46804020 */ cvt.s.w $f0, $f8 /* 0146C 80873C9C 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 01470 80873CA0 24180002 */ addiu $t8, $zero, 0x0002 ## $t8 = 00000002 /* 01474 80873CA4 24A5092C */ addiu $a1, $a1, 0x092C ## $a1 = 0600092C /* 01478 80873CA8 26040150 */ addiu $a0, $s0, 0x0150 ## $a0 = 00000150 /* 0147C 80873CAC 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 01480 80873CB0 E600032C */ swc1 $f0, 0x032C($s0) ## 0000032C -/* 01484 80873CB4 AFB80014 */ sw $t8, 0x0014($sp) -/* 01488 80873CB8 E7A00010 */ swc1 $f0, 0x0010($sp) +/* 01484 80873CB4 AFB80014 */ sw $t8, 0x0014($sp) +/* 01488 80873CB8 E7A00010 */ swc1 $f0, 0x0010($sp) /* 0148C 80873CBC 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 01490 80873CC0 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 01494 80873CC4 E7AA0018 */ swc1 $f10, 0x0018($sp) +/* 01490 80873CC0 0C029468 */ jal SkelAnime_ChangeAnim + +/* 01494 80873CC4 E7AA0018 */ swc1 $f10, 0x0018($sp) /* 01498 80873CC8 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 .L80873CCC: /* 0149C 80873CCC 24190005 */ addiu $t9, $zero, 0x0005 ## $t9 = 00000005 @@ -57,19 +57,19 @@ glabel func_80873C14 /* 014A8 80873CD8 24056858 */ addiu $a1, $zero, 0x6858 ## $a1 = 00006858 /* 014AC 80873CDC E6000318 */ swc1 $f0, 0x0318($s0) ## 00000318 /* 014B0 80873CE0 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 014B4 80873CE4 E6000314 */ swc1 $f0, 0x0314($s0) ## 00000314 /* 014B8 80873CE8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 014BC 80873CEC 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 014C0 80873CF0 24052880 */ addiu $a1, $zero, 0x2880 ## $a1 = 00002880 /* 014C4 80873CF4 3C088087 */ lui $t0, %hi(func_80873D14) ## $t0 = 80870000 /* 014C8 80873CF8 25083D14 */ addiu $t0, $t0, %lo(func_80873D14) ## $t0 = 80873D14 /* 014CC 80873CFC AE08014C */ sw $t0, 0x014C($s0) ## 0000014C -/* 014D0 80873D00 8FBF002C */ lw $ra, 0x002C($sp) -/* 014D4 80873D04 8FB00028 */ lw $s0, 0x0028($sp) +/* 014D0 80873D00 8FBF002C */ lw $ra, 0x002C($sp) +/* 014D4 80873D04 8FB00028 */ lw $s0, 0x0028($sp) /* 014D8 80873D08 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 014DC 80873D0C 03E00008 */ jr $ra +/* 014DC 80873D0C 03E00008 */ jr $ra /* 014E0 80873D10 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/func_80873EA4.s b/asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/func_80873EA4.s index 09e6e0e4aa..13878182de 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/func_80873EA4.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/func_80873EA4.s @@ -1,89 +1,89 @@ glabel func_80873EA4 /* 01674 80873EA4 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 01678 80873EA8 AFBF002C */ sw $ra, 0x002C($sp) -/* 0167C 80873EAC AFB00028 */ sw $s0, 0x0028($sp) +/* 01678 80873EA8 AFBF002C */ sw $ra, 0x002C($sp) +/* 0167C 80873EAC AFB00028 */ sw $s0, 0x0028($sp) /* 01680 80873EB0 90AE1D6C */ lbu $t6, 0x1D6C($a1) ## 00001D6C /* 01684 80873EB4 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 01688 80873EB8 00A03825 */ or $a3, $a1, $zero ## $a3 = 00000000 -/* 0168C 80873EBC 51C00042 */ beql $t6, $zero, .L80873FC8 -/* 01690 80873EC0 8FBF002C */ lw $ra, 0x002C($sp) +/* 0168C 80873EBC 51C00042 */ beql $t6, $zero, .L80873FC8 +/* 01690 80873EC0 8FBF002C */ lw $ra, 0x002C($sp) /* 01694 80873EC4 8CA21D8C */ lw $v0, 0x1D8C($a1) ## 00001D8C -/* 01698 80873EC8 5040003F */ beql $v0, $zero, .L80873FC8 -/* 0169C 80873ECC 8FBF002C */ lw $ra, 0x002C($sp) +/* 01698 80873EC8 5040003F */ beql $v0, $zero, .L80873FC8 +/* 0169C 80873ECC 8FBF002C */ lw $ra, 0x002C($sp) /* 016A0 80873ED0 944F0000 */ lhu $t7, 0x0000($v0) ## 00000000 /* 016A4 80873ED4 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 /* 016A8 80873ED8 3C188087 */ lui $t8, %hi(func_80874BE0) ## $t8 = 80870000 -/* 016AC 80873EDC 15E10039 */ bne $t7, $at, .L80873FC4 +/* 016AC 80873EDC 15E10039 */ bne $t7, $at, .L80873FC4 /* 016B0 80873EE0 27184BE0 */ addiu $t8, $t8, %lo(func_80874BE0) ## $t8 = 80874BE0 /* 016B4 80873EE4 AC980134 */ sw $t8, 0x0134($a0) ## 00000134 /* 016B8 80873EE8 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 /* 016BC 80873EEC 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 016C0 80873EF0 AFA70034 */ sw $a3, 0x0034($sp) -/* 016C4 80873EF4 0C00B7D5 */ jal func_8002DF54 +/* 016C0 80873EF0 AFA70034 */ sw $a3, 0x0034($sp) +/* 016C4 80873EF4 0C00B7D5 */ jal func_8002DF54 /* 016C8 80873EF8 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 -/* 016CC 80873EFC 8FA70034 */ lw $a3, 0x0034($sp) +/* 016CC 80873EFC 8FA70034 */ lw $a3, 0x0034($sp) /* 016D0 80873F00 A60002FE */ sh $zero, 0x02FE($s0) ## 000002FE /* 016D4 80873F04 2401003B */ addiu $at, $zero, 0x003B ## $at = 0000003B /* 016D8 80873F08 84F900A4 */ lh $t9, 0x00A4($a3) ## 000000A4 /* 016DC 80873F0C 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 -/* 016E0 80873F10 17210015 */ bne $t9, $at, .L80873F68 +/* 016E0 80873F10 17210015 */ bne $t9, $at, .L80873F68 /* 016E4 80873F14 00000000 */ nop /* 016E8 80873F18 3C040601 */ lui $a0, 0x0601 ## $a0 = 06010000 /* 016EC 80873F1C 0C028800 */ jal SkelAnime_GetFrameCount - + /* 016F0 80873F20 24848698 */ addiu $a0, $a0, 0x8698 ## $a0 = 06008698 /* 016F4 80873F24 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 016F8 80873F28 3C01C120 */ lui $at, 0xC120 ## $at = C1200000 /* 016FC 80873F2C 44813000 */ mtc1 $at, $f6 ## $f6 = -10.00 -/* 01700 80873F30 46802020 */ cvt.s.w $f0, $f4 +/* 01700 80873F30 46802020 */ cvt.s.w $f0, $f4 /* 01704 80873F34 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 /* 01708 80873F38 24080002 */ addiu $t0, $zero, 0x0002 ## $t0 = 00000002 /* 0170C 80873F3C 24A58698 */ addiu $a1, $a1, 0x8698 ## $a1 = 06008698 /* 01710 80873F40 26040150 */ addiu $a0, $s0, 0x0150 ## $a0 = 00000150 /* 01714 80873F44 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 01718 80873F48 E600032C */ swc1 $f0, 0x032C($s0) ## 0000032C -/* 0171C 80873F4C AFA80014 */ sw $t0, 0x0014($sp) -/* 01720 80873F50 E7A00010 */ swc1 $f0, 0x0010($sp) +/* 0171C 80873F4C AFA80014 */ sw $t0, 0x0014($sp) +/* 01720 80873F50 E7A00010 */ swc1 $f0, 0x0010($sp) /* 01724 80873F54 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 01728 80873F58 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 0172C 80873F5C E7A60018 */ swc1 $f6, 0x0018($sp) -/* 01730 80873F60 10000013 */ beq $zero, $zero, .L80873FB0 +/* 01728 80873F58 0C029468 */ jal SkelAnime_ChangeAnim + +/* 0172C 80873F5C E7A60018 */ swc1 $f6, 0x0018($sp) +/* 01730 80873F60 10000013 */ beq $zero, $zero, .L80873FB0 /* 01734 80873F64 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 .L80873F68: /* 01738 80873F68 0C028800 */ jal SkelAnime_GetFrameCount - + /* 0173C 80873F6C 248431C0 */ addiu $a0, $a0, 0x31C0 ## $a0 = 000031C0 /* 01740 80873F70 44824000 */ mtc1 $v0, $f8 ## $f8 = 0.00 /* 01744 80873F74 3C01C120 */ lui $at, 0xC120 ## $at = C1200000 /* 01748 80873F78 44815000 */ mtc1 $at, $f10 ## $f10 = -10.00 -/* 0174C 80873F7C 46804020 */ cvt.s.w $f0, $f8 +/* 0174C 80873F7C 46804020 */ cvt.s.w $f0, $f8 /* 01750 80873F80 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 01754 80873F84 24090002 */ addiu $t1, $zero, 0x0002 ## $t1 = 00000002 /* 01758 80873F88 24A531C0 */ addiu $a1, $a1, 0x31C0 ## $a1 = 060031C0 /* 0175C 80873F8C 26040150 */ addiu $a0, $s0, 0x0150 ## $a0 = 00000150 /* 01760 80873F90 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 01764 80873F94 E600032C */ swc1 $f0, 0x032C($s0) ## 0000032C -/* 01768 80873F98 AFA90014 */ sw $t1, 0x0014($sp) -/* 0176C 80873F9C E7A00010 */ swc1 $f0, 0x0010($sp) +/* 01768 80873F98 AFA90014 */ sw $t1, 0x0014($sp) +/* 0176C 80873F9C E7A00010 */ swc1 $f0, 0x0010($sp) /* 01770 80873FA0 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 01774 80873FA4 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 01778 80873FA8 E7AA0018 */ swc1 $f10, 0x0018($sp) +/* 01774 80873FA4 0C029468 */ jal SkelAnime_ChangeAnim + +/* 01778 80873FA8 E7AA0018 */ swc1 $f10, 0x0018($sp) /* 0177C 80873FAC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 .L80873FB0: /* 01780 80873FB0 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 01784 80873FB4 2405287F */ addiu $a1, $zero, 0x287F ## $a1 = 0000287F /* 01788 80873FB8 3C0A8087 */ lui $t2, %hi(func_80873FD8) ## $t2 = 80870000 /* 0178C 80873FBC 254A3FD8 */ addiu $t2, $t2, %lo(func_80873FD8) ## $t2 = 80873FD8 /* 01790 80873FC0 AE0A014C */ sw $t2, 0x014C($s0) ## 0000014C .L80873FC4: -/* 01794 80873FC4 8FBF002C */ lw $ra, 0x002C($sp) +/* 01794 80873FC4 8FBF002C */ lw $ra, 0x002C($sp) .L80873FC8: -/* 01798 80873FC8 8FB00028 */ lw $s0, 0x0028($sp) +/* 01798 80873FC8 8FB00028 */ lw $s0, 0x0028($sp) /* 0179C 80873FCC 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 017A0 80873FD0 03E00008 */ jr $ra +/* 017A0 80873FD0 03E00008 */ jr $ra /* 017A4 80873FD4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/func_80873FD8.s b/asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/func_80873FD8.s index a91c4a8345..ae03c4c71b 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/func_80873FD8.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/func_80873FD8.s @@ -1,17 +1,17 @@ glabel func_80873FD8 /* 017A8 80873FD8 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 017AC 80873FDC AFBF002C */ sw $ra, 0x002C($sp) -/* 017B0 80873FE0 AFB00028 */ sw $s0, 0x0028($sp) -/* 017B4 80873FE4 AFA5003C */ sw $a1, 0x003C($sp) +/* 017AC 80873FDC AFBF002C */ sw $ra, 0x002C($sp) +/* 017B0 80873FE0 AFB00028 */ sw $s0, 0x0028($sp) +/* 017B4 80873FE4 AFA5003C */ sw $a1, 0x003C($sp) /* 017B8 80873FE8 848E02FE */ lh $t6, 0x02FE($a0) ## 000002FE /* 017BC 80873FEC 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 017C0 80873FF0 C4800168 */ lwc1 $f0, 0x0168($a0) ## 00000168 -/* 017C4 80873FF4 15C00044 */ bne $t6, $zero, .L80874108 +/* 017C4 80873FF4 15C00044 */ bne $t6, $zero, .L80874108 /* 017C8 80873FF8 24840028 */ addiu $a0, $a0, 0x0028 ## $a0 = 00000028 /* 017CC 80873FFC 8E05030C */ lw $a1, 0x030C($s0) ## 0000030C /* 017D0 80874000 8E060314 */ lw $a2, 0x0314($s0) ## 00000314 /* 017D4 80874004 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 017D8 80874008 3C0742C8 */ lui $a3, 0x42C8 ## $a3 = 42C80000 /* 017DC 8087400C 3C053D0F */ lui $a1, 0x3D0F ## $a1 = 3D0F0000 /* 017E0 80874010 3C073BA3 */ lui $a3, 0x3BA3 ## $a3 = 3BA30000 @@ -19,7 +19,7 @@ glabel func_80873FD8 /* 017E8 80874018 34A55C29 */ ori $a1, $a1, 0x5C29 ## $a1 = 3D0F5C29 /* 017EC 8087401C 26040308 */ addiu $a0, $s0, 0x0308 ## $a0 = 00000308 /* 017F0 80874020 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 017F4 80874024 8E060318 */ lw $a2, 0x0318($s0) ## 00000318 /* 017F8 80874028 3C053F4C */ lui $a1, 0x3F4C ## $a1 = 3F4C0000 /* 017FC 8087402C 3C063DCC */ lui $a2, 0x3DCC ## $a2 = 3DCC0000 @@ -28,7 +28,7 @@ glabel func_80873FD8 /* 01808 80874038 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3DCCCCCD /* 0180C 8087403C 34A5CCCD */ ori $a1, $a1, 0xCCCD ## $a1 = 3F4CCCCD /* 01810 80874040 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 01814 80874044 26040314 */ addiu $a0, $s0, 0x0314 ## $a0 = 00000314 /* 01818 80874048 3C053E4C */ lui $a1, 0x3E4C ## $a1 = 3E4C0000 /* 0181C 8087404C 3C063CF5 */ lui $a2, 0x3CF5 ## $a2 = 3CF50000 @@ -37,179 +37,179 @@ glabel func_80873FD8 /* 01828 80874058 34C6C28F */ ori $a2, $a2, 0xC28F ## $a2 = 3CF5C28F /* 0182C 8087405C 34A5CCCD */ ori $a1, $a1, 0xCCCD ## $a1 = 3E4CCCCD /* 01830 80874060 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 01834 80874064 26040318 */ addiu $a0, $s0, 0x0318 ## $a0 = 00000318 /* 01838 80874068 3C018087 */ lui $at, %hi(D_808756AC) ## $at = 80870000 -/* 0183C 8087406C C42656AC */ lwc1 $f6, %lo(D_808756AC)($at) +/* 0183C 8087406C C42656AC */ lwc1 $f6, %lo(D_808756AC)($at) /* 01840 80874070 C6040308 */ lwc1 $f4, 0x0308($s0) ## 00000308 -/* 01844 80874074 4604303E */ c.le.s $f6, $f4 +/* 01844 80874074 4604303E */ c.le.s $f6, $f4 /* 01848 80874078 00000000 */ nop -/* 0184C 8087407C 4502001F */ bc1fl .L808740FC +/* 0184C 8087407C 4502001F */ bc1fl .L808740FC /* 01850 80874080 860800B6 */ lh $t0, 0x00B6($s0) ## 000000B6 /* 01854 80874084 860200B6 */ lh $v0, 0x00B6($s0) ## 000000B6 -/* 01858 80874088 2841E0C1 */ slti $at, $v0, 0xE0C1 -/* 0185C 8087408C 14200018 */ bne $at, $zero, .L808740F0 +/* 01858 80874088 2841E0C1 */ slti $at, $v0, 0xE0C1 +/* 0185C 8087408C 14200018 */ bne $at, $zero, .L808740F0 /* 01860 80874090 24590BB8 */ addiu $t9, $v0, 0x0BB8 ## $t9 = 00000BB8 -/* 01864 80874094 284103E8 */ slti $at, $v0, 0x03E8 -/* 01868 80874098 10200015 */ beq $at, $zero, .L808740F0 +/* 01864 80874094 284103E8 */ slti $at, $v0, 0x03E8 +/* 01868 80874098 10200015 */ beq $at, $zero, .L808740F0 /* 0186C 8087409C 00000000 */ nop /* 01870 808740A0 0C02927F */ jal SkelAnime_FrameUpdateMatrix - + /* 01874 808740A4 26040150 */ addiu $a0, $s0, 0x0150 ## $a0 = 00000150 /* 01878 808740A8 260400B6 */ addiu $a0, $s0, 0x00B6 ## $a0 = 000000B6 /* 0187C 808740AC 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 01880 808740B0 24060005 */ addiu $a2, $zero, 0x0005 ## $a2 = 00000005 /* 01884 808740B4 0C01E1EF */ jal Math_SmoothScaleMaxS - + /* 01888 808740B8 240703E8 */ addiu $a3, $zero, 0x03E8 ## $a3 = 000003E8 /* 0188C 808740BC 860F00B6 */ lh $t7, 0x00B6($s0) ## 000000B6 /* 01890 808740C0 3C014248 */ lui $at, 0x4248 ## $at = 42480000 /* 01894 808740C4 44815000 */ mtc1 $at, $f10 ## $f10 = 50.00 /* 01898 808740C8 448F4000 */ mtc1 $t7, $f8 ## $f8 = 0.00 /* 0189C 808740CC 24180001 */ addiu $t8, $zero, 0x0001 ## $t8 = 00000001 -/* 018A0 808740D0 46804020 */ cvt.s.w $f0, $f8 -/* 018A4 808740D4 46000005 */ abs.s $f0, $f0 -/* 018A8 808740D8 460A003C */ c.lt.s $f0, $f10 +/* 018A0 808740D0 46804020 */ cvt.s.w $f0, $f8 +/* 018A4 808740D4 46000005 */ abs.s $f0, $f0 +/* 018A8 808740D8 460A003C */ c.lt.s $f0, $f10 /* 018AC 808740DC 00000000 */ nop -/* 018B0 808740E0 45020080 */ bc1fl .L808742E4 +/* 018B0 808740E0 45020080 */ bc1fl .L808742E4 /* 018B4 808740E4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 018B8 808740E8 1000007D */ beq $zero, $zero, .L808742E0 +/* 018B8 808740E8 1000007D */ beq $zero, $zero, .L808742E0 /* 018BC 808740EC A61802FE */ sh $t8, 0x02FE($s0) ## 000002FE .L808740F0: -/* 018C0 808740F0 1000007B */ beq $zero, $zero, .L808742E0 +/* 018C0 808740F0 1000007B */ beq $zero, $zero, .L808742E0 /* 018C4 808740F4 A61900B6 */ sh $t9, 0x00B6($s0) ## 000000B6 /* 018C8 808740F8 860800B6 */ lh $t0, 0x00B6($s0) ## 000000B6 .L808740FC: /* 018CC 808740FC 25090BB8 */ addiu $t1, $t0, 0x0BB8 ## $t1 = 00000BB8 -/* 018D0 80874100 10000077 */ beq $zero, $zero, .L808742E0 +/* 018D0 80874100 10000077 */ beq $zero, $zero, .L808742E0 /* 018D4 80874104 A60900B6 */ sh $t1, 0x00B6($s0) ## 000000B6 .L80874108: /* 018D8 80874108 26040150 */ addiu $a0, $s0, 0x0150 ## $a0 = 00000150 -/* 018DC 8087410C AFA40030 */ sw $a0, 0x0030($sp) +/* 018DC 8087410C AFA40030 */ sw $a0, 0x0030($sp) /* 018E0 80874110 0C02927F */ jal SkelAnime_FrameUpdateMatrix - -/* 018E4 80874114 E7A00034 */ swc1 $f0, 0x0034($sp) -/* 018E8 80874118 C7A00034 */ lwc1 $f0, 0x0034($sp) + +/* 018E4 80874114 E7A00034 */ swc1 $f0, 0x0034($sp) +/* 018E8 80874118 C7A00034 */ lwc1 $f0, 0x0034($sp) /* 018EC 8087411C C610032C */ lwc1 $f16, 0x032C($s0) ## 0000032C -/* 018F0 80874120 4600803E */ c.le.s $f16, $f0 +/* 018F0 80874120 4600803E */ c.le.s $f16, $f0 /* 018F4 80874124 00000000 */ nop -/* 018F8 80874128 45020030 */ bc1fl .L808741EC -/* 018FC 8087412C 8FAE003C */ lw $t6, 0x003C($sp) +/* 018F8 80874128 45020030 */ bc1fl .L808741EC +/* 018FC 8087412C 8FAE003C */ lw $t6, 0x003C($sp) /* 01900 80874130 860A02FC */ lh $t2, 0x02FC($s0) ## 000002FC -/* 01904 80874134 8FAB003C */ lw $t3, 0x003C($sp) -/* 01908 80874138 5540002C */ bnel $t2, $zero, .L808741EC -/* 0190C 8087413C 8FAE003C */ lw $t6, 0x003C($sp) +/* 01904 80874134 8FAB003C */ lw $t3, 0x003C($sp) +/* 01908 80874138 5540002C */ bnel $t2, $zero, .L808741EC +/* 0190C 8087413C 8FAE003C */ lw $t6, 0x003C($sp) /* 01910 80874140 856C00A4 */ lh $t4, 0x00A4($t3) ## 000000A4 /* 01914 80874144 2401003B */ addiu $at, $zero, 0x003B ## $at = 0000003B /* 01918 80874148 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 -/* 0191C 8087414C 15810014 */ bne $t4, $at, .L808741A0 +/* 0191C 8087414C 15810014 */ bne $t4, $at, .L808741A0 /* 01920 80874150 00000000 */ nop /* 01924 80874154 3C040602 */ lui $a0, 0x0602 ## $a0 = 06020000 /* 01928 80874158 0C028800 */ jal SkelAnime_GetFrameCount - + /* 0192C 8087415C 2484D514 */ addiu $a0, $a0, 0xD514 ## $a0 = 0601D514 /* 01930 80874160 44829000 */ mtc1 $v0, $f18 ## $f18 = 0.00 /* 01934 80874164 3C01C120 */ lui $at, 0xC120 ## $at = C1200000 /* 01938 80874168 44812000 */ mtc1 $at, $f4 ## $f4 = -10.00 -/* 0193C 8087416C 46809020 */ cvt.s.w $f0, $f18 +/* 0193C 8087416C 46809020 */ cvt.s.w $f0, $f18 /* 01940 80874170 3C050602 */ lui $a1, 0x0602 ## $a1 = 06020000 /* 01944 80874174 24A5D514 */ addiu $a1, $a1, 0xD514 ## $a1 = 0601D514 /* 01948 80874178 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 0194C 8087417C 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 /* 01950 80874180 E600032C */ swc1 $f0, 0x032C($s0) ## 0000032C -/* 01954 80874184 AFA00014 */ sw $zero, 0x0014($sp) -/* 01958 80874188 E7A00010 */ swc1 $f0, 0x0010($sp) -/* 0195C 8087418C 8FA40030 */ lw $a0, 0x0030($sp) -/* 01960 80874190 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 01964 80874194 E7A40018 */ swc1 $f4, 0x0018($sp) -/* 01968 80874198 10000012 */ beq $zero, $zero, .L808741E4 +/* 01954 80874184 AFA00014 */ sw $zero, 0x0014($sp) +/* 01958 80874188 E7A00010 */ swc1 $f0, 0x0010($sp) +/* 0195C 8087418C 8FA40030 */ lw $a0, 0x0030($sp) +/* 01960 80874190 0C029468 */ jal SkelAnime_ChangeAnim + +/* 01964 80874194 E7A40018 */ swc1 $f4, 0x0018($sp) +/* 01968 80874198 10000012 */ beq $zero, $zero, .L808741E4 /* 0196C 8087419C 240D0001 */ addiu $t5, $zero, 0x0001 ## $t5 = 00000001 .L808741A0: /* 01970 808741A0 0C028800 */ jal SkelAnime_GetFrameCount - + /* 01974 808741A4 24841DF0 */ addiu $a0, $a0, 0x1DF0 ## $a0 = 00001DF0 /* 01978 808741A8 44823000 */ mtc1 $v0, $f6 ## $f6 = 0.00 /* 0197C 808741AC 3C01C120 */ lui $at, 0xC120 ## $at = C1200000 /* 01980 808741B0 44814000 */ mtc1 $at, $f8 ## $f8 = -10.00 -/* 01984 808741B4 46803020 */ cvt.s.w $f0, $f6 +/* 01984 808741B4 46803020 */ cvt.s.w $f0, $f6 /* 01988 808741B8 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 0198C 808741BC 24A51DF0 */ addiu $a1, $a1, 0x1DF0 ## $a1 = 06001DF0 /* 01990 808741C0 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 01994 808741C4 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 /* 01998 808741C8 E600032C */ swc1 $f0, 0x032C($s0) ## 0000032C -/* 0199C 808741CC AFA00014 */ sw $zero, 0x0014($sp) -/* 019A0 808741D0 E7A00010 */ swc1 $f0, 0x0010($sp) -/* 019A4 808741D4 8FA40030 */ lw $a0, 0x0030($sp) -/* 019A8 808741D8 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 019AC 808741DC E7A80018 */ swc1 $f8, 0x0018($sp) +/* 0199C 808741CC AFA00014 */ sw $zero, 0x0014($sp) +/* 019A0 808741D0 E7A00010 */ swc1 $f0, 0x0010($sp) +/* 019A4 808741D4 8FA40030 */ lw $a0, 0x0030($sp) +/* 019A8 808741D8 0C029468 */ jal SkelAnime_ChangeAnim + +/* 019AC 808741DC E7A80018 */ swc1 $f8, 0x0018($sp) /* 019B0 808741E0 240D0001 */ addiu $t5, $zero, 0x0001 ## $t5 = 00000001 .L808741E4: /* 019B4 808741E4 A60D02FC */ sh $t5, 0x02FC($s0) ## 000002FC -/* 019B8 808741E8 8FAE003C */ lw $t6, 0x003C($sp) +/* 019B8 808741E8 8FAE003C */ lw $t6, 0x003C($sp) .L808741EC: /* 019BC 808741EC 91CF1D6C */ lbu $t7, 0x1D6C($t6) ## 00001D6C -/* 019C0 808741F0 51E0003C */ beql $t7, $zero, .L808742E4 +/* 019C0 808741F0 51E0003C */ beql $t7, $zero, .L808742E4 /* 019C4 808741F4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 019C8 808741F8 8DC21D8C */ lw $v0, 0x1D8C($t6) ## 00001D8C -/* 019CC 808741FC 50400039 */ beql $v0, $zero, .L808742E4 +/* 019CC 808741FC 50400039 */ beql $v0, $zero, .L808742E4 /* 019D0 80874200 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 019D4 80874204 94580000 */ lhu $t8, 0x0000($v0) ## 00000000 /* 019D8 80874208 24010003 */ addiu $at, $zero, 0x0003 ## $at = 00000003 -/* 019DC 8087420C 57010035 */ bnel $t8, $at, .L808742E4 +/* 019DC 8087420C 57010035 */ bnel $t8, $at, .L808742E4 /* 019E0 80874210 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 019E4 80874214 A60002FC */ sh $zero, 0x02FC($s0) ## 000002FC /* 019E8 80874218 861902FC */ lh $t9, 0x02FC($s0) ## 000002FC /* 019EC 8087421C 2401003B */ addiu $at, $zero, 0x003B ## $at = 0000003B /* 019F0 80874220 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 /* 019F4 80874224 A61902FE */ sh $t9, 0x02FE($s0) ## 000002FE -/* 019F8 80874228 8FA8003C */ lw $t0, 0x003C($sp) +/* 019F8 80874228 8FA8003C */ lw $t0, 0x003C($sp) /* 019FC 8087422C 850900A4 */ lh $t1, 0x00A4($t0) ## 000000A4 -/* 01A00 80874230 15210015 */ bne $t1, $at, .L80874288 +/* 01A00 80874230 15210015 */ bne $t1, $at, .L80874288 /* 01A04 80874234 00000000 */ nop /* 01A08 80874238 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 /* 01A0C 8087423C 0C028800 */ jal SkelAnime_GetFrameCount - + /* 01A10 80874240 248469E8 */ addiu $a0, $a0, 0x69E8 ## $a0 = 060069E8 /* 01A14 80874244 44825000 */ mtc1 $v0, $f10 ## $f10 = 0.00 /* 01A18 80874248 3C01C120 */ lui $at, 0xC120 ## $at = C1200000 /* 01A1C 8087424C 44818000 */ mtc1 $at, $f16 ## $f16 = -10.00 -/* 01A20 80874250 46805020 */ cvt.s.w $f0, $f10 +/* 01A20 80874250 46805020 */ cvt.s.w $f0, $f10 /* 01A24 80874254 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 01A28 80874258 240A0002 */ addiu $t2, $zero, 0x0002 ## $t2 = 00000002 /* 01A2C 8087425C 24A569E8 */ addiu $a1, $a1, 0x69E8 ## $a1 = 060069E8 /* 01A30 80874260 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 01A34 80874264 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 /* 01A38 80874268 E600032C */ swc1 $f0, 0x032C($s0) ## 0000032C -/* 01A3C 8087426C AFAA0014 */ sw $t2, 0x0014($sp) -/* 01A40 80874270 E7A00010 */ swc1 $f0, 0x0010($sp) -/* 01A44 80874274 8FA40030 */ lw $a0, 0x0030($sp) -/* 01A48 80874278 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 01A4C 8087427C E7B00018 */ swc1 $f16, 0x0018($sp) -/* 01A50 80874280 10000012 */ beq $zero, $zero, .L808742CC +/* 01A3C 8087426C AFAA0014 */ sw $t2, 0x0014($sp) +/* 01A40 80874270 E7A00010 */ swc1 $f0, 0x0010($sp) +/* 01A44 80874274 8FA40030 */ lw $a0, 0x0030($sp) +/* 01A48 80874278 0C029468 */ jal SkelAnime_ChangeAnim + +/* 01A4C 8087427C E7B00018 */ swc1 $f16, 0x0018($sp) +/* 01A50 80874280 10000012 */ beq $zero, $zero, .L808742CC /* 01A54 80874284 00000000 */ nop .L80874288: /* 01A58 80874288 0C028800 */ jal SkelAnime_GetFrameCount - + /* 01A5C 8087428C 24845810 */ addiu $a0, $a0, 0x5810 ## $a0 = 00005810 /* 01A60 80874290 44829000 */ mtc1 $v0, $f18 ## $f18 = 0.00 /* 01A64 80874294 3C01C120 */ lui $at, 0xC120 ## $at = C1200000 /* 01A68 80874298 44812000 */ mtc1 $at, $f4 ## $f4 = -10.00 -/* 01A6C 8087429C 46809020 */ cvt.s.w $f0, $f18 +/* 01A6C 8087429C 46809020 */ cvt.s.w $f0, $f18 /* 01A70 808742A0 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 01A74 808742A4 240B0002 */ addiu $t3, $zero, 0x0002 ## $t3 = 00000002 /* 01A78 808742A8 24A55810 */ addiu $a1, $a1, 0x5810 ## $a1 = 06005810 /* 01A7C 808742AC 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 01A80 808742B0 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 /* 01A84 808742B4 E600032C */ swc1 $f0, 0x032C($s0) ## 0000032C -/* 01A88 808742B8 AFAB0014 */ sw $t3, 0x0014($sp) -/* 01A8C 808742BC E7A00010 */ swc1 $f0, 0x0010($sp) -/* 01A90 808742C0 8FA40030 */ lw $a0, 0x0030($sp) -/* 01A94 808742C4 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 01A98 808742C8 E7A40018 */ swc1 $f4, 0x0018($sp) +/* 01A88 808742B8 AFAB0014 */ sw $t3, 0x0014($sp) +/* 01A8C 808742BC E7A00010 */ swc1 $f0, 0x0010($sp) +/* 01A90 808742C0 8FA40030 */ lw $a0, 0x0030($sp) +/* 01A94 808742C4 0C029468 */ jal SkelAnime_ChangeAnim + +/* 01A98 808742C8 E7A40018 */ swc1 $f4, 0x0018($sp) .L808742CC: /* 01A9C 808742CC 3C0D8087 */ lui $t5, %hi(func_80874304) ## $t5 = 80870000 /* 01AA0 808742D0 240C0001 */ addiu $t4, $zero, 0x0001 ## $t4 = 00000001 @@ -219,13 +219,13 @@ glabel func_80873FD8 .L808742E0: /* 01AB0 808742E0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 .L808742E4: -/* 01AB4 808742E4 8FA5003C */ lw $a1, 0x003C($sp) -/* 01AB8 808742E8 0C21CA58 */ jal func_80872960 +/* 01AB4 808742E4 8FA5003C */ lw $a1, 0x003C($sp) +/* 01AB8 808742E8 0C21CA58 */ jal func_80872960 /* 01ABC 808742EC 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 01AC0 808742F0 8FBF002C */ lw $ra, 0x002C($sp) -/* 01AC4 808742F4 8FB00028 */ lw $s0, 0x0028($sp) +/* 01AC0 808742F0 8FBF002C */ lw $ra, 0x002C($sp) +/* 01AC4 808742F4 8FB00028 */ lw $s0, 0x0028($sp) /* 01AC8 808742F8 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 -/* 01ACC 808742FC 03E00008 */ jr $ra +/* 01ACC 808742FC 03E00008 */ jr $ra /* 01AD0 80874300 00000000 */ nop 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 e34d26e5a9..4f76771ce1 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 @@ -1,90 +1,90 @@ glabel func_80874304 /* 01AD4 80874304 27BDFFA0 */ addiu $sp, $sp, 0xFFA0 ## $sp = FFFFFFA0 -/* 01AD8 80874308 AFBF003C */ sw $ra, 0x003C($sp) -/* 01ADC 8087430C AFB10038 */ sw $s1, 0x0038($sp) -/* 01AE0 80874310 AFB00034 */ sw $s0, 0x0034($sp) +/* 01AD8 80874308 AFBF003C */ sw $ra, 0x003C($sp) +/* 01ADC 8087430C AFB10038 */ sw $s1, 0x0038($sp) +/* 01AE0 80874310 AFB00034 */ sw $s0, 0x0034($sp) /* 01AE4 80874314 8CAE1C44 */ lw $t6, 0x1C44($a1) ## 00001C44 /* 01AE8 80874318 C4820168 */ lwc1 $f2, 0x0168($a0) ## 00000168 /* 01AEC 8087431C 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 01AF0 80874320 AFAE0058 */ sw $t6, 0x0058($sp) +/* 01AF0 80874320 AFAE0058 */ sw $t6, 0x0058($sp) /* 01AF4 80874324 848F02FC */ lh $t7, 0x02FC($a0) ## 000002FC /* 01AF8 80874328 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 /* 01AFC 8087432C 3C0144AF */ lui $at, 0x44AF ## $at = 44AF0000 -/* 01B00 80874330 11E0000E */ beq $t7, $zero, .L8087436C -/* 01B04 80874334 46001306 */ mov.s $f12, $f2 +/* 01B00 80874330 11E0000E */ beq $t7, $zero, .L8087436C +/* 01B04 80874334 46001306 */ mov.s $f12, $f2 /* 01B08 80874338 44817000 */ mtc1 $at, $f14 ## $f14 = 1400.00 /* 01B0C 8087433C C484032C */ lwc1 $f4, 0x032C($a0) ## 0000032C -/* 01B10 80874340 460E1002 */ mul.s $f0, $f2, $f14 +/* 01B10 80874340 460E1002 */ mul.s $f0, $f2, $f14 /* 01B14 80874344 00000000 */ nop -/* 01B18 80874348 460E2182 */ mul.s $f6, $f4, $f14 +/* 01B18 80874348 460E2182 */ mul.s $f6, $f4, $f14 /* 01B1C 8087434C E4800324 */ swc1 $f0, 0x0324($a0) ## 00000324 -/* 01B20 80874350 4600303E */ c.le.s $f6, $f0 +/* 01B20 80874350 4600303E */ c.le.s $f6, $f0 /* 01B24 80874354 00000000 */ nop -/* 01B28 80874358 45000004 */ bc1f .L8087436C +/* 01B28 80874358 45000004 */ bc1f .L8087436C /* 01B2C 8087435C 00000000 */ nop /* 01B30 80874360 44804000 */ mtc1 $zero, $f8 ## $f8 = 0.00 /* 01B34 80874364 00000000 */ nop /* 01B38 80874368 E4880324 */ swc1 $f8, 0x0324($a0) ## 00000324 .L8087436C: /* 01B3C 8087436C 26040150 */ addiu $a0, $s0, 0x0150 ## $a0 = 00000150 -/* 01B40 80874370 AFA40040 */ sw $a0, 0x0040($sp) +/* 01B40 80874370 AFA40040 */ sw $a0, 0x0040($sp) /* 01B44 80874374 0C02927F */ jal SkelAnime_FrameUpdateMatrix - -/* 01B48 80874378 E7AC005C */ swc1 $f12, 0x005C($sp) -/* 01B4C 8087437C C7AC005C */ lwc1 $f12, 0x005C($sp) + +/* 01B48 80874378 E7AC005C */ swc1 $f12, 0x005C($sp) +/* 01B4C 8087437C C7AC005C */ lwc1 $f12, 0x005C($sp) /* 01B50 80874380 C60A032C */ lwc1 $f10, 0x032C($s0) ## 0000032C -/* 01B54 80874384 460C503E */ c.le.s $f10, $f12 +/* 01B54 80874384 460C503E */ c.le.s $f10, $f12 /* 01B58 80874388 00000000 */ nop -/* 01B5C 8087438C 4502002F */ bc1fl .L8087444C +/* 01B5C 8087438C 4502002F */ bc1fl .L8087444C /* 01B60 80874390 8E2B1D8C */ lw $t3, 0x1D8C($s1) ## 00001D8C /* 01B64 80874394 861802FC */ lh $t8, 0x02FC($s0) ## 000002FC -/* 01B68 80874398 5700002C */ bnel $t8, $zero, .L8087444C +/* 01B68 80874398 5700002C */ bnel $t8, $zero, .L8087444C /* 01B6C 8087439C 8E2B1D8C */ lw $t3, 0x1D8C($s1) ## 00001D8C /* 01B70 808743A0 863900A4 */ lh $t9, 0x00A4($s1) ## 000000A4 /* 01B74 808743A4 2401003B */ addiu $at, $zero, 0x003B ## $at = 0000003B /* 01B78 808743A8 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 -/* 01B7C 808743AC 17210014 */ bne $t9, $at, .L80874400 +/* 01B7C 808743AC 17210014 */ bne $t9, $at, .L80874400 /* 01B80 808743B0 00000000 */ nop /* 01B84 808743B4 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 /* 01B88 808743B8 0C028800 */ jal SkelAnime_GetFrameCount - + /* 01B8C 808743BC 24847CA8 */ addiu $a0, $a0, 0x7CA8 ## $a0 = 06007CA8 /* 01B90 808743C0 44828000 */ mtc1 $v0, $f16 ## $f16 = 0.00 /* 01B94 808743C4 3C01C120 */ lui $at, 0xC120 ## $at = C1200000 /* 01B98 808743C8 44819000 */ mtc1 $at, $f18 ## $f18 = -10.00 -/* 01B9C 808743CC 46808020 */ cvt.s.w $f0, $f16 +/* 01B9C 808743CC 46808020 */ cvt.s.w $f0, $f16 /* 01BA0 808743D0 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 01BA4 808743D4 24A57CA8 */ addiu $a1, $a1, 0x7CA8 ## $a1 = 06007CA8 /* 01BA8 808743D8 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 01BAC 808743DC 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 /* 01BB0 808743E0 E600032C */ swc1 $f0, 0x032C($s0) ## 0000032C -/* 01BB4 808743E4 AFA00014 */ sw $zero, 0x0014($sp) -/* 01BB8 808743E8 E7A00010 */ swc1 $f0, 0x0010($sp) -/* 01BBC 808743EC 8FA40040 */ lw $a0, 0x0040($sp) -/* 01BC0 808743F0 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 01BC4 808743F4 E7B20018 */ swc1 $f18, 0x0018($sp) -/* 01BC8 808743F8 10000012 */ beq $zero, $zero, .L80874444 +/* 01BB4 808743E4 AFA00014 */ sw $zero, 0x0014($sp) +/* 01BB8 808743E8 E7A00010 */ swc1 $f0, 0x0010($sp) +/* 01BBC 808743EC 8FA40040 */ lw $a0, 0x0040($sp) +/* 01BC0 808743F0 0C029468 */ jal SkelAnime_ChangeAnim + +/* 01BC4 808743F4 E7B20018 */ swc1 $f18, 0x0018($sp) +/* 01BC8 808743F8 10000012 */ beq $zero, $zero, .L80874444 /* 01BCC 808743FC 240A0001 */ addiu $t2, $zero, 0x0001 ## $t2 = 00000001 .L80874400: /* 01BD0 80874400 0C028800 */ jal SkelAnime_GetFrameCount - + /* 01BD4 80874404 24844344 */ addiu $a0, $a0, 0x4344 ## $a0 = 00004344 /* 01BD8 80874408 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 01BDC 8087440C 3C01C120 */ lui $at, 0xC120 ## $at = C1200000 /* 01BE0 80874410 44813000 */ mtc1 $at, $f6 ## $f6 = -10.00 -/* 01BE4 80874414 46802020 */ cvt.s.w $f0, $f4 +/* 01BE4 80874414 46802020 */ cvt.s.w $f0, $f4 /* 01BE8 80874418 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 01BEC 8087441C 24A54344 */ addiu $a1, $a1, 0x4344 ## $a1 = 06004344 /* 01BF0 80874420 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 01BF4 80874424 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 /* 01BF8 80874428 E600032C */ swc1 $f0, 0x032C($s0) ## 0000032C -/* 01BFC 8087442C AFA00014 */ sw $zero, 0x0014($sp) -/* 01C00 80874430 E7A00010 */ swc1 $f0, 0x0010($sp) -/* 01C04 80874434 8FA40040 */ lw $a0, 0x0040($sp) -/* 01C08 80874438 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 01C0C 8087443C E7A60018 */ swc1 $f6, 0x0018($sp) +/* 01BFC 8087442C AFA00014 */ sw $zero, 0x0014($sp) +/* 01C00 80874430 E7A00010 */ swc1 $f0, 0x0010($sp) +/* 01C04 80874434 8FA40040 */ lw $a0, 0x0040($sp) +/* 01C08 80874438 0C029468 */ jal SkelAnime_ChangeAnim + +/* 01C0C 8087443C E7A60018 */ swc1 $f6, 0x0018($sp) /* 01C10 80874440 240A0001 */ addiu $t2, $zero, 0x0001 ## $t2 = 00000001 .L80874444: /* 01C14 80874444 A60A02FC */ sh $t2, 0x02FC($s0) ## 000002FC @@ -94,90 +94,90 @@ glabel func_80874304 /* 01C20 80874450 3C0C8087 */ lui $t4, %hi(func_80873C14) ## $t4 = 80870000 /* 01C24 80874454 95620000 */ lhu $v0, 0x0000($t3) ## 00000000 /* 01C28 80874458 258C3C14 */ addiu $t4, $t4, %lo(func_80873C14) ## $t4 = 80873C14 -/* 01C2C 8087445C 54410004 */ bnel $v0, $at, .L80874470 -/* 01C30 80874460 28410004 */ slti $at, $v0, 0x0004 -/* 01C34 80874464 10000135 */ beq $zero, $zero, .L8087493C +/* 01C2C 8087445C 54410004 */ bnel $v0, $at, .L80874470 +/* 01C30 80874460 28410004 */ slti $at, $v0, 0x0004 +/* 01C34 80874464 10000135 */ beq $zero, $zero, .L8087493C /* 01C38 80874468 AE0C014C */ sw $t4, 0x014C($s0) ## 0000014C -/* 01C3C 8087446C 28410004 */ slti $at, $v0, 0x0004 +/* 01C3C 8087446C 28410004 */ slti $at, $v0, 0x0004 .L80874470: -/* 01C40 80874470 14200030 */ bne $at, $zero, .L80874534 +/* 01C40 80874470 14200030 */ bne $at, $zero, .L80874534 /* 01C44 80874474 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01C48 80874478 28410007 */ slti $at, $v0, 0x0007 -/* 01C4C 8087447C 1020002D */ beq $at, $zero, .L80874534 +/* 01C48 80874478 28410007 */ slti $at, $v0, 0x0007 +/* 01C4C 8087447C 1020002D */ beq $at, $zero, .L80874534 /* 01C50 80874480 244DFFFC */ addiu $t5, $v0, 0xFFFC ## $t5 = FFFFFFFC -/* 01C54 80874484 A7AD0056 */ sh $t5, 0x0056($sp) +/* 01C54 80874484 A7AD0056 */ sh $t5, 0x0056($sp) /* 01C58 80874488 862300A4 */ lh $v1, 0x00A4($s1) ## 000000A4 -/* 01C5C 8087448C 87AE0056 */ lh $t6, 0x0056($sp) +/* 01C5C 8087448C 87AE0056 */ lh $t6, 0x0056($sp) /* 01C60 80874490 2401003B */ addiu $at, $zero, 0x003B ## $at = 0000003B -/* 01C64 80874494 14610009 */ bne $v1, $at, .L808744BC +/* 01C64 80874494 14610009 */ bne $v1, $at, .L808744BC /* 01C68 80874498 25CF0001 */ addiu $t7, $t6, 0x0001 ## $t7 = 00000001 -/* 01C6C 8087449C 000F3400 */ sll $a2, $t7, 16 -/* 01C70 808744A0 A7AF0056 */ sh $t7, 0x0056($sp) -/* 01C74 808744A4 00063403 */ sra $a2, $a2, 16 +/* 01C6C 8087449C 000F3400 */ sll $a2, $t7, 16 +/* 01C70 808744A0 A7AF0056 */ sh $t7, 0x0056($sp) +/* 01C74 808744A4 00063403 */ sra $a2, $a2, 16 /* 01C78 808744A8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01C7C 808744AC 0C21CA58 */ jal func_80872960 +/* 01C7C 808744AC 0C21CA58 */ jal func_80872960 /* 01C80 808744B0 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 01C84 808744B4 10000023 */ beq $zero, $zero, .L80874544 +/* 01C84 808744B4 10000023 */ beq $zero, $zero, .L80874544 /* 01C88 808744B8 862300A4 */ lh $v1, 0x00A4($s1) ## 000000A4 .L808744BC: /* 01C8C 808744BC 921802E4 */ lbu $t8, 0x02E4($s0) ## 000002E4 -/* 01C90 808744C0 87B90056 */ lh $t9, 0x0056($sp) +/* 01C90 808744C0 87B90056 */ lh $t9, 0x0056($sp) /* 01C94 808744C4 3C028087 */ lui $v0, %hi(D_808754B0) ## $v0 = 80870000 -/* 01C98 808744C8 1700001E */ bne $t8, $zero, .L80874544 -/* 01C9C 808744CC 00195040 */ sll $t2, $t9, 1 -/* 01CA0 808744D0 004A1021 */ addu $v0, $v0, $t2 -/* 01CA4 808744D4 844254B0 */ lh $v0, %lo(D_808754B0)($v0) +/* 01C98 808744C8 1700001E */ bne $t8, $zero, .L80874544 +/* 01C9C 808744CC 00195040 */ sll $t2, $t9, 1 +/* 01CA0 808744D0 004A1021 */ addu $v0, $v0, $t2 +/* 01CA4 808744D4 844254B0 */ lh $v0, %lo(D_808754B0)($v0) /* 01CA8 808744D8 C6080028 */ lwc1 $f8, 0x0028($s0) ## 00000028 /* 01CAC 808744DC 8E070024 */ lw $a3, 0x0024($s0) ## 00000024 -/* 01CB0 808744E0 00021300 */ sll $v0, $v0, 12 -/* 01CB4 808744E4 00021400 */ sll $v0, $v0, 16 -/* 01CB8 808744E8 E7A80010 */ swc1 $f8, 0x0010($sp) +/* 01CB0 808744E0 00021300 */ sll $v0, $v0, 12 +/* 01CB4 808744E4 00021400 */ sll $v0, $v0, 16 +/* 01CB8 808744E8 E7A80010 */ swc1 $f8, 0x0010($sp) /* 01CBC 808744EC C60A002C */ lwc1 $f10, 0x002C($s0) ## 0000002C -/* 01CC0 808744F0 00021403 */ sra $v0, $v0, 16 +/* 01CC0 808744F0 00021403 */ sra $v0, $v0, 16 /* 01CC4 808744F4 34420012 */ ori $v0, $v0, 0x0012 ## $v0 = 80870012 -/* 01CC8 808744F8 00021400 */ sll $v0, $v0, 16 -/* 01CCC 808744FC 00021403 */ sra $v0, $v0, 16 -/* 01CD0 80874500 AFA20024 */ sw $v0, 0x0024($sp) -/* 01CD4 80874504 AFA00020 */ sw $zero, 0x0020($sp) -/* 01CD8 80874508 AFA0001C */ sw $zero, 0x001C($sp) -/* 01CDC 8087450C AFA00018 */ sw $zero, 0x0018($sp) +/* 01CC8 808744F8 00021400 */ sll $v0, $v0, 16 +/* 01CCC 808744FC 00021403 */ sra $v0, $v0, 16 +/* 01CD0 80874500 AFA20024 */ sw $v0, 0x0024($sp) +/* 01CD4 80874504 AFA00020 */ sw $zero, 0x0020($sp) +/* 01CD8 80874508 AFA0001C */ sw $zero, 0x001C($sp) +/* 01CDC 8087450C AFA00018 */ sw $zero, 0x0018($sp) /* 01CE0 80874510 26241C24 */ addiu $a0, $s1, 0x1C24 ## $a0 = 00001C24 /* 01CE4 80874514 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 /* 01CE8 80874518 2406008B */ addiu $a2, $zero, 0x008B ## $a2 = 0000008B /* 01CEC 8087451C 0C00C7D4 */ jal Actor_Spawn ## ActorSpawn -/* 01CF0 80874520 E7AA0014 */ swc1 $f10, 0x0014($sp) +/* 01CF0 80874520 E7AA0014 */ swc1 $f10, 0x0014($sp) /* 01CF4 80874524 240B0001 */ addiu $t3, $zero, 0x0001 ## $t3 = 00000001 /* 01CF8 80874528 A20B02E4 */ sb $t3, 0x02E4($s0) ## 000002E4 -/* 01CFC 8087452C 10000005 */ beq $zero, $zero, .L80874544 +/* 01CFC 8087452C 10000005 */ beq $zero, $zero, .L80874544 /* 01D00 80874530 862300A4 */ lh $v1, 0x00A4($s1) ## 000000A4 .L80874534: /* 01D04 80874534 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 01D08 80874538 0C21CA58 */ jal func_80872960 +/* 01D08 80874538 0C21CA58 */ jal func_80872960 /* 01D0C 8087453C 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 /* 01D10 80874540 862300A4 */ lh $v1, 0x00A4($s1) ## 000000A4 .L80874544: /* 01D14 80874544 2401003B */ addiu $at, $zero, 0x003B ## $at = 0000003B -/* 01D18 80874548 54610043 */ bnel $v1, $at, .L80874658 +/* 01D18 80874548 54610043 */ bnel $v1, $at, .L80874658 /* 01D1C 8087454C 862300A4 */ lh $v1, 0x00A4($s1) ## 000000A4 /* 01D20 80874550 8E2C1D8C */ lw $t4, 0x1D8C($s1) ## 00001D8C /* 01D24 80874554 95820000 */ lhu $v0, 0x0000($t4) ## 00000000 -/* 01D28 80874558 2841000A */ slti $at, $v0, 0x000A -/* 01D2C 8087455C 1420003D */ bne $at, $zero, .L80874654 -/* 01D30 80874560 2841000D */ slti $at, $v0, 0x000D -/* 01D34 80874564 1020003B */ beq $at, $zero, .L80874654 +/* 01D28 80874558 2841000A */ slti $at, $v0, 0x000A +/* 01D2C 8087455C 1420003D */ bne $at, $zero, .L80874654 +/* 01D30 80874560 2841000D */ slti $at, $v0, 0x000D +/* 01D34 80874564 1020003B */ beq $at, $zero, .L80874654 /* 01D38 80874568 2443FFF6 */ addiu $v1, $v0, 0xFFF6 ## $v1 = FFFFFFF6 -/* 01D3C 8087456C 00031C00 */ sll $v1, $v1, 16 -/* 01D40 80874570 00031C03 */ sra $v1, $v1, 16 -/* 01D44 80874574 10600009 */ beq $v1, $zero, .L8087459C +/* 01D3C 8087456C 00031C00 */ sll $v1, $v1, 16 +/* 01D40 80874570 00031C03 */ sra $v1, $v1, 16 +/* 01D44 80874574 10600009 */ beq $v1, $zero, .L8087459C /* 01D48 80874578 240D0001 */ addiu $t5, $zero, 0x0001 ## $t5 = 00000001 /* 01D4C 8087457C 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 01D50 80874580 10610010 */ beq $v1, $at, .L808745C4 +/* 01D50 80874580 10610010 */ beq $v1, $at, .L808745C4 /* 01D54 80874584 3C0F8016 */ lui $t7, 0x8016 ## $t7 = 80160000 /* 01D58 80874588 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 01D5C 8087458C 1061001F */ beq $v1, $at, .L8087460C +/* 01D5C 8087458C 1061001F */ beq $v1, $at, .L8087460C /* 01D60 80874590 240B0001 */ addiu $t3, $zero, 0x0001 ## $t3 = 00000001 -/* 01D64 80874594 10000024 */ beq $zero, $zero, .L80874628 +/* 01D64 80874594 10000024 */ beq $zero, $zero, .L80874628 /* 01D68 80874598 920C02E6 */ lbu $t4, 0x02E6($s0) ## 000002E6 .L8087459C: /* 01D6C 8087459C 3C018016 */ lui $at, 0x8016 ## $at = 80160000 @@ -186,15 +186,15 @@ glabel func_80874304 /* 01D78 808745A8 240E0030 */ addiu $t6, $zero, 0x0030 ## $t6 = 00000030 /* 01D7C 808745AC A42EFA56 */ sh $t6, -0x05AA($at) ## 8015FA56 /* 01D80 808745B0 24040009 */ addiu $a0, $zero, 0x0009 ## $a0 = 00000009 -/* 01D84 808745B4 0C020978 */ jal Interface_ChangeAlpha -/* 01D88 808745B8 A7A30056 */ sh $v1, 0x0056($sp) -/* 01D8C 808745BC 10000019 */ beq $zero, $zero, .L80874624 -/* 01D90 808745C0 87A30056 */ lh $v1, 0x0056($sp) +/* 01D84 808745B4 0C020978 */ jal Interface_ChangeAlpha +/* 01D88 808745B8 A7A30056 */ sh $v1, 0x0056($sp) +/* 01D8C 808745BC 10000019 */ beq $zero, $zero, .L80874624 +/* 01D90 808745C0 87A30056 */ lh $v1, 0x0056($sp) .L808745C4: /* 01D94 808745C4 91EFE69A */ lbu $t7, -0x1966($t7) ## FFFFE69A /* 01D98 808745C8 24190001 */ addiu $t9, $zero, 0x0001 ## $t9 = 00000001 /* 01D9C 808745CC 240A0060 */ addiu $t2, $zero, 0x0060 ## $t2 = 00000060 -/* 01DA0 808745D0 15E00004 */ bne $t7, $zero, .L808745E4 +/* 01DA0 808745D0 15E00004 */ bne $t7, $zero, .L808745E4 /* 01DA4 808745D4 24040009 */ addiu $a0, $zero, 0x0009 ## $a0 = 00000009 /* 01DA8 808745D8 24180001 */ addiu $t8, $zero, 0x0001 ## $t8 = 00000001 /* 01DAC 808745DC 3C018016 */ lui $at, 0x8016 ## $at = 80160000 @@ -206,152 +206,152 @@ glabel func_80874304 /* 01DC0 808745F0 A42AFA56 */ sh $t2, -0x05AA($at) ## 8015FA56 /* 01DC4 808745F4 3C018016 */ lui $at, 0x8016 ## $at = 80160000 /* 01DC8 808745F8 A020E692 */ sb $zero, -0x196E($at) ## 8015E692 -/* 01DCC 808745FC 0C020978 */ jal Interface_ChangeAlpha -/* 01DD0 80874600 A7A30056 */ sh $v1, 0x0056($sp) -/* 01DD4 80874604 10000007 */ beq $zero, $zero, .L80874624 -/* 01DD8 80874608 87A30056 */ lh $v1, 0x0056($sp) +/* 01DCC 808745FC 0C020978 */ jal Interface_ChangeAlpha +/* 01DD0 80874600 A7A30056 */ sh $v1, 0x0056($sp) +/* 01DD4 80874604 10000007 */ beq $zero, $zero, .L80874624 +/* 01DD8 80874608 87A30056 */ lh $v1, 0x0056($sp) .L8087460C: /* 01DDC 8087460C 3C018016 */ lui $at, 0x8016 ## $at = 80160000 /* 01DE0 80874610 A02BE69D */ sb $t3, -0x1963($at) ## 8015E69D /* 01DE4 80874614 24040009 */ addiu $a0, $zero, 0x0009 ## $a0 = 00000009 -/* 01DE8 80874618 0C020978 */ jal Interface_ChangeAlpha -/* 01DEC 8087461C A7A30056 */ sh $v1, 0x0056($sp) -/* 01DF0 80874620 87A30056 */ lh $v1, 0x0056($sp) +/* 01DE8 80874618 0C020978 */ jal Interface_ChangeAlpha +/* 01DEC 8087461C A7A30056 */ sh $v1, 0x0056($sp) +/* 01DF0 80874620 87A30056 */ lh $v1, 0x0056($sp) .L80874624: /* 01DF4 80874624 920C02E6 */ lbu $t4, 0x02E6($s0) ## 000002E6 .L80874628: /* 01DF8 80874628 3C098016 */ lui $t1, 0x8016 ## $t1 = 80160000 /* 01DFC 8087462C 2529E660 */ addiu $t1, $t1, 0xE660 ## $t1 = 8015E660 -/* 01E00 80874630 15800008 */ bne $t4, $zero, .L80874654 +/* 01E00 80874630 15800008 */ bne $t4, $zero, .L80874654 /* 01E04 80874634 240D0140 */ addiu $t5, $zero, 0x0140 ## $t5 = 00000140 /* 01E08 80874638 A52D1424 */ sh $t5, 0x1424($t1) ## 8015FA84 /* 01E0C 8087463C 240E0001 */ addiu $t6, $zero, 0x0001 ## $t6 = 00000001 /* 01E10 80874640 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 01E14 80874644 14610003 */ bne $v1, $at, .L80874654 +/* 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 func_80087680 /* 01E20 80874650 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 .L80874654: /* 01E24 80874654 862300A4 */ lh $v1, 0x00A4($s1) ## 000000A4 .L80874658: /* 01E28 80874658 3C098016 */ lui $t1, 0x8016 ## $t1 = 80160000 /* 01E2C 8087465C 2401003B */ addiu $at, $zero, 0x003B ## $at = 0000003B -/* 01E30 80874660 10610074 */ beq $v1, $at, .L80874834 +/* 01E30 80874660 10610074 */ beq $v1, $at, .L80874834 /* 01E34 80874664 2529E660 */ addiu $t1, $t1, 0xE660 ## $t1 = 8015E660 /* 01E38 80874668 8E2F1D8C */ lw $t7, 0x1D8C($s1) ## 00001D8C /* 01E3C 8087466C 95E20000 */ lhu $v0, 0x0000($t7) ## 00000000 -/* 01E40 80874670 2841000E */ slti $at, $v0, 0x000E -/* 01E44 80874674 1420006F */ bne $at, $zero, .L80874834 -/* 01E48 80874678 28410011 */ slti $at, $v0, 0x0011 -/* 01E4C 8087467C 5020006E */ beql $at, $zero, .L80874838 +/* 01E40 80874670 2841000E */ slti $at, $v0, 0x000E +/* 01E44 80874674 1420006F */ bne $at, $zero, .L80874834 +/* 01E48 80874678 28410011 */ slti $at, $v0, 0x0011 +/* 01E4C 8087467C 5020006E */ beql $at, $zero, .L80874838 /* 01E50 80874680 2401003B */ addiu $at, $zero, 0x003B ## $at = 0000003B /* 01E54 80874684 86180300 */ lh $t8, 0x0300($s0) ## 00000300 /* 01E58 80874688 2443FFF2 */ addiu $v1, $v0, 0xFFF2 ## $v1 = FFFFFFF2 -/* 01E5C 8087468C 00031C00 */ sll $v1, $v1, 16 -/* 01E60 80874690 1700004C */ bne $t8, $zero, .L808747C4 -/* 01E64 80874694 00031C03 */ sra $v1, $v1, 16 +/* 01E5C 8087468C 00031C00 */ sll $v1, $v1, 16 +/* 01E60 80874690 1700004C */ bne $t8, $zero, .L808747C4 +/* 01E64 80874694 00031C03 */ sra $v1, $v1, 16 /* 01E68 80874698 8D390004 */ lw $t9, 0x0004($t1) ## 8015E664 -/* 01E6C 8087469C 8FA80058 */ lw $t0, 0x0058($sp) +/* 01E6C 8087469C 8FA80058 */ lw $t0, 0x0058($sp) /* 01E70 808746A0 26241C24 */ addiu $a0, $s1, 0x1C24 ## $a0 = 00001C24 -/* 01E74 808746A4 17200006 */ bne $t9, $zero, .L808746C0 +/* 01E74 808746A4 17200006 */ bne $t9, $zero, .L808746C0 /* 01E78 808746A8 C50C0024 */ lwc1 $f12, 0x0024($t0) ## 00000024 /* 01E7C 808746AC 3C014292 */ lui $at, 0x4292 ## $at = 42920000 /* 01E80 808746B0 44819000 */ mtc1 $at, $f18 ## $f18 = 73.00 /* 01E84 808746B4 C5100028 */ lwc1 $f16, 0x0028($t0) ## 00000028 -/* 01E88 808746B8 10000005 */ beq $zero, $zero, .L808746D0 -/* 01E8C 808746BC 46128080 */ add.s $f2, $f16, $f18 +/* 01E88 808746B8 10000005 */ beq $zero, $zero, .L808746D0 +/* 01E8C 808746BC 46128080 */ add.s $f2, $f16, $f18 .L808746C0: /* 01E90 808746C0 3C014254 */ lui $at, 0x4254 ## $at = 42540000 /* 01E94 808746C4 44813000 */ mtc1 $at, $f6 ## $f6 = 53.00 /* 01E98 808746C8 C5040028 */ lwc1 $f4, 0x0028($t0) ## 00000028 -/* 01E9C 808746CC 46062080 */ add.s $f2, $f4, $f6 +/* 01E9C 808746CC 46062080 */ add.s $f2, $f4, $f6 .L808746D0: /* 01EA0 808746D0 C500002C */ lwc1 $f0, 0x002C($t0) ## 0000002C -/* 01EA4 808746D4 00031040 */ sll $v0, $v1, 1 +/* 01EA4 808746D4 00031040 */ sll $v0, $v1, 1 /* 01EA8 808746D8 3C0A8087 */ lui $t2, %hi(D_808754B8) ## $t2 = 80870000 -/* 01EAC 808746DC 01425021 */ addu $t2, $t2, $v0 -/* 01EB0 808746E0 854A54B8 */ lh $t2, %lo(D_808754B8)($t2) -/* 01EB4 808746E4 AFA20040 */ sw $v0, 0x0040($sp) -/* 01EB8 808746E8 A7A30056 */ sh $v1, 0x0056($sp) -/* 01EBC 808746EC AFA00024 */ sw $zero, 0x0024($sp) -/* 01EC0 808746F0 AFA00020 */ sw $zero, 0x0020($sp) -/* 01EC4 808746F4 AFA0001C */ sw $zero, 0x001C($sp) -/* 01EC8 808746F8 E7A20014 */ swc1 $f2, 0x0014($sp) -/* 01ECC 808746FC E7AC0010 */ swc1 $f12, 0x0010($sp) +/* 01EAC 808746DC 01425021 */ addu $t2, $t2, $v0 +/* 01EB0 808746E0 854A54B8 */ lh $t2, %lo(D_808754B8)($t2) +/* 01EB4 808746E4 AFA20040 */ sw $v0, 0x0040($sp) +/* 01EB8 808746E8 A7A30056 */ sh $v1, 0x0056($sp) +/* 01EBC 808746EC AFA00024 */ sw $zero, 0x0024($sp) +/* 01EC0 808746F0 AFA00020 */ sw $zero, 0x0020($sp) +/* 01EC4 808746F4 AFA0001C */ sw $zero, 0x001C($sp) +/* 01EC8 808746F8 E7A20014 */ swc1 $f2, 0x0014($sp) +/* 01ECC 808746FC E7AC0010 */ swc1 $f12, 0x0010($sp) /* 01ED0 80874700 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 01ED4 80874704 02203025 */ or $a2, $s1, $zero ## $a2 = 00000000 /* 01ED8 80874708 24070168 */ addiu $a3, $zero, 0x0168 ## $a3 = 00000168 -/* 01EDC 8087470C E7A00018 */ swc1 $f0, 0x0018($sp) +/* 01EDC 8087470C E7A00018 */ swc1 $f0, 0x0018($sp) /* 01EE0 80874710 0C00C916 */ jal Actor_SpawnAttached - -/* 01EE4 80874714 AFAA0028 */ sw $t2, 0x0028($sp) -/* 01EE8 80874718 87A30056 */ lh $v1, 0x0056($sp) -/* 01EEC 8087471C 10400025 */ beq $v0, $zero, .L808747B4 + +/* 01EE4 80874714 AFAA0028 */ sw $t2, 0x0028($sp) +/* 01EE8 80874718 87A30056 */ lh $v1, 0x0056($sp) +/* 01EEC 8087471C 10400025 */ beq $v0, $zero, .L808747B4 /* 01EF0 80874720 AE020344 */ sw $v0, 0x0344($s0) ## 00000344 /* 01EF4 80874724 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 /* 01EF8 80874728 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 /* 01EFC 8087472C 904B003A */ lbu $t3, 0x003A($v0) ## 8015E69A /* 01F00 80874730 240C0001 */ addiu $t4, $zero, 0x0001 ## $t4 = 00000001 /* 01F04 80874734 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 01F08 80874738 15600003 */ bne $t3, $zero, .L80874748 +/* 01F08 80874738 15600003 */ bne $t3, $zero, .L80874748 /* 01F0C 8087473C 00000000 */ nop -/* 01F10 80874740 10000006 */ beq $zero, $zero, .L8087475C +/* 01F10 80874740 10000006 */ beq $zero, $zero, .L8087475C /* 01F14 80874744 A04C003A */ sb $t4, 0x003A($v0) ## 8015E69A .L80874748: -/* 01F18 80874748 0C021DA0 */ jal func_80087680 -/* 01F1C 8087474C A7A30056 */ sh $v1, 0x0056($sp) +/* 01F18 80874748 0C021DA0 */ jal func_80087680 +/* 01F1C 8087474C A7A30056 */ sh $v1, 0x0056($sp) /* 01F20 80874750 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 /* 01F24 80874754 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 -/* 01F28 80874758 87A30056 */ lh $v1, 0x0056($sp) +/* 01F28 80874758 87A30056 */ lh $v1, 0x0056($sp) .L8087475C: /* 01F2C 8087475C 240D0001 */ addiu $t5, $zero, 0x0001 ## $t5 = 00000001 /* 01F30 80874760 A60D0300 */ sh $t5, 0x0300($s0) ## 00000300 /* 01F34 80874764 240E0140 */ addiu $t6, $zero, 0x0140 ## $t6 = 00000140 /* 01F38 80874768 A44E1424 */ sh $t6, 0x1424($v0) ## 8015FA84 -/* 01F3C 8087476C A7A30056 */ sh $v1, 0x0056($sp) -/* 01F40 80874770 0C020978 */ jal Interface_ChangeAlpha +/* 01F3C 8087476C A7A30056 */ sh $v1, 0x0056($sp) +/* 01F40 80874770 0C020978 */ jal Interface_ChangeAlpha /* 01F44 80874774 24040009 */ addiu $a0, $zero, 0x0009 ## $a0 = 00000009 -/* 01F48 80874778 8FB80040 */ lw $t8, 0x0040($sp) +/* 01F48 80874778 8FB80040 */ lw $t8, 0x0040($sp) /* 01F4C 8087477C 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 /* 01F50 80874780 3C198087 */ lui $t9, %hi(D_808754C0) ## $t9 = 80870000 /* 01F54 80874784 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 -/* 01F58 80874788 0338C821 */ addu $t9, $t9, $t8 -/* 01F5C 8087478C 873954C0 */ lh $t9, %lo(D_808754C0)($t9) +/* 01F58 80874788 0338C821 */ addu $t9, $t9, $t8 +/* 01F5C 8087478C 873954C0 */ lh $t9, %lo(D_808754C0)($t9) /* 01F60 80874790 944F0EF2 */ lhu $t7, 0x0EF2($v0) ## 8015F552 -/* 01F64 80874794 87A30056 */ lh $v1, 0x0056($sp) +/* 01F64 80874794 87A30056 */ lh $v1, 0x0056($sp) /* 01F68 80874798 3C058087 */ lui $a1, %hi(D_808754C8) ## $a1 = 80870000 /* 01F6C 8087479C 01F95025 */ or $t2, $t7, $t9 ## $t2 = 80870000 /* 01F70 808747A0 A44A0EF2 */ sh $t2, 0x0EF2($v0) ## 8015F552 -/* 01F74 808747A4 00A32821 */ addu $a1, $a1, $v1 -/* 01F78 808747A8 90A554C8 */ lbu $a1, %lo(D_808754C8)($a1) -/* 01F7C 808747AC 0C021344 */ jal Item_Give +/* 01F74 808747A4 00A32821 */ addu $a1, $a1, $v1 +/* 01F78 808747A8 90A554C8 */ lbu $a1, %lo(D_808754C8)($a1) +/* 01F7C 808747AC 0C021344 */ jal Item_Give /* 01F80 808747B0 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 .L808747B4: /* 01F84 808747B4 3C098016 */ lui $t1, 0x8016 ## $t1 = 80160000 /* 01F88 808747B8 2529E660 */ addiu $t1, $t1, 0xE660 ## $t1 = 8015E660 -/* 01F8C 808747BC 1000001D */ beq $zero, $zero, .L80874834 +/* 01F8C 808747BC 1000001D */ beq $zero, $zero, .L80874834 /* 01F90 808747C0 862300A4 */ lh $v1, 0x00A4($s1) ## 000000A4 .L808747C4: -/* 01F94 808747C4 8FA50058 */ lw $a1, 0x0058($sp) +/* 01F94 808747C4 8FA50058 */ lw $a1, 0x0058($sp) /* 01F98 808747C8 8E0B0344 */ lw $t3, 0x0344($s0) ## 00000344 /* 01F9C 808747CC 3C014254 */ lui $at, 0x4254 ## $at = 42540000 /* 01FA0 808747D0 C4A80024 */ lwc1 $f8, 0x0024($a1) ## 00000024 /* 01FA4 808747D4 E5680024 */ swc1 $f8, 0x0024($t3) ## 00000024 /* 01FA8 808747D8 8D2C0004 */ lw $t4, 0x0004($t1) ## 8015E664 -/* 01FAC 808747DC 55800009 */ bnel $t4, $zero, .L80874804 +/* 01FAC 808747DC 55800009 */ bnel $t4, $zero, .L80874804 /* 01FB0 808747E0 C4A40028 */ lwc1 $f4, 0x0028($a1) ## 00000028 /* 01FB4 808747E4 3C014292 */ lui $at, 0x4292 ## $at = 42920000 /* 01FB8 808747E8 44818000 */ mtc1 $at, $f16 ## $f16 = 73.00 /* 01FBC 808747EC C4AA0028 */ lwc1 $f10, 0x0028($a1) ## 00000028 /* 01FC0 808747F0 8E0D0344 */ lw $t5, 0x0344($s0) ## 00000344 -/* 01FC4 808747F4 46105480 */ add.s $f18, $f10, $f16 -/* 01FC8 808747F8 10000006 */ beq $zero, $zero, .L80874814 +/* 01FC4 808747F4 46105480 */ add.s $f18, $f10, $f16 +/* 01FC8 808747F8 10000006 */ beq $zero, $zero, .L80874814 /* 01FCC 808747FC E5B20028 */ swc1 $f18, 0x0028($t5) ## 00000028 /* 01FD0 80874800 C4A40028 */ lwc1 $f4, 0x0028($a1) ## 00000028 .L80874804: /* 01FD4 80874804 44813000 */ mtc1 $at, $f6 ## $f6 = 73.00 /* 01FD8 80874808 8E0E0344 */ lw $t6, 0x0344($s0) ## 00000344 -/* 01FDC 8087480C 46062200 */ add.s $f8, $f4, $f6 +/* 01FDC 8087480C 46062200 */ add.s $f8, $f4, $f6 /* 01FE0 80874810 E5C80028 */ swc1 $f8, 0x0028($t6) ## 00000028 .L80874814: /* 01FE4 80874814 C4AA002C */ lwc1 $f10, 0x002C($a1) ## 0000002C @@ -359,24 +359,24 @@ glabel func_80874304 /* 01FEC 8087481C 3C018087 */ lui $at, %hi(D_808756B0) ## $at = 80870000 /* 01FF0 80874820 E70A002C */ swc1 $f10, 0x002C($t8) ## 0000002C /* 01FF4 80874824 8E0F0344 */ lw $t7, 0x0344($s0) ## 00000344 -/* 01FF8 80874828 C43056B0 */ lwc1 $f16, %lo(D_808756B0)($at) +/* 01FF8 80874828 C43056B0 */ lwc1 $f16, %lo(D_808756B0)($at) /* 01FFC 8087482C E5F00164 */ swc1 $f16, 0x0164($t7) ## 00000164 /* 02000 80874830 862300A4 */ lh $v1, 0x00A4($s1) ## 000000A4 .L80874834: /* 02004 80874834 2401003B */ addiu $at, $zero, 0x003B ## $at = 0000003B .L80874838: -/* 02008 80874838 50610010 */ beql $v1, $at, .L8087487C +/* 02008 80874838 50610010 */ beql $v1, $at, .L8087487C /* 0200C 8087483C 2401003B */ addiu $at, $zero, 0x003B ## $at = 0000003B /* 02010 80874840 8E391D8C */ lw $t9, 0x1D8C($s1) ## 00001D8C /* 02014 80874844 24010011 */ addiu $at, $zero, 0x0011 ## $at = 00000011 /* 02018 80874848 972A0000 */ lhu $t2, 0x0000($t9) ## 00000000 -/* 0201C 8087484C 5541000B */ bnel $t2, $at, .L8087487C +/* 0201C 8087484C 5541000B */ bnel $t2, $at, .L8087487C /* 02020 80874850 2401003B */ addiu $at, $zero, 0x003B ## $at = 0000003B /* 02024 80874854 8E040344 */ lw $a0, 0x0344($s0) ## 00000344 -/* 02028 80874858 50800008 */ beql $a0, $zero, .L8087487C +/* 02028 80874858 50800008 */ beql $a0, $zero, .L8087487C /* 0202C 8087485C 2401003B */ addiu $at, $zero, 0x003B ## $at = 0000003B /* 02030 80874860 0C00B55C */ jal Actor_Kill - + /* 02034 80874864 00000000 */ nop /* 02038 80874868 AE000344 */ sw $zero, 0x0344($s0) ## 00000344 /* 0203C 8087486C 3C098016 */ lui $t1, 0x8016 ## $t1 = 80160000 @@ -384,65 +384,65 @@ glabel func_80874304 /* 02044 80874874 862300A4 */ lh $v1, 0x00A4($s1) ## 000000A4 /* 02048 80874878 2401003B */ addiu $at, $zero, 0x003B ## $at = 0000003B .L8087487C: -/* 0204C 8087487C 54610009 */ bnel $v1, $at, .L808748A4 +/* 0204C 8087487C 54610009 */ bnel $v1, $at, .L808748A4 /* 02050 80874880 920E02E5 */ lbu $t6, 0x02E5($s0) ## 000002E5 /* 02054 80874884 8E2B1D8C */ lw $t3, 0x1D8C($s1) ## 00001D8C /* 02058 80874888 24010012 */ addiu $at, $zero, 0x0012 ## $at = 00000012 /* 0205C 8087488C 240D0001 */ addiu $t5, $zero, 0x0001 ## $t5 = 00000001 /* 02060 80874890 956C0000 */ lhu $t4, 0x0000($t3) ## 00000000 -/* 02064 80874894 55810003 */ bnel $t4, $at, .L808748A4 +/* 02064 80874894 55810003 */ bnel $t4, $at, .L808748A4 /* 02068 80874898 920E02E5 */ lbu $t6, 0x02E5($s0) ## 000002E5 /* 0206C 8087489C A20D02E5 */ sb $t5, 0x02E5($s0) ## 000002E5 /* 02070 808748A0 920E02E5 */ lbu $t6, 0x02E5($s0) ## 000002E5 .L808748A4: -/* 02074 808748A4 51C00007 */ beql $t6, $zero, .L808748C4 +/* 02074 808748A4 51C00007 */ beql $t6, $zero, .L808748C4 /* 02078 808748A8 8E2F1D8C */ lw $t7, 0x1D8C($s1) ## 00001D8C /* 0207C 808748AC 812200CF */ lb $v0, 0x00CF($t1) ## 8015E72F -/* 02080 808748B0 28410014 */ slti $at, $v0, 0x0014 -/* 02084 808748B4 10200002 */ beq $at, $zero, .L808748C0 +/* 02080 808748B0 28410014 */ slti $at, $v0, 0x0014 +/* 02084 808748B4 10200002 */ beq $at, $zero, .L808748C0 /* 02088 808748B8 24580001 */ addiu $t8, $v0, 0x0001 ## $t8 = 00000001 /* 0208C 808748BC A13800CF */ sb $t8, 0x00CF($t1) ## 8015E72F .L808748C0: /* 02090 808748C0 8E2F1D8C */ lw $t7, 0x1D8C($s1) ## 00001D8C .L808748C4: /* 02094 808748C4 95E20000 */ lhu $v0, 0x0000($t7) ## 00000000 -/* 02098 808748C8 28410013 */ slti $at, $v0, 0x0013 -/* 0209C 808748CC 14200018 */ bne $at, $zero, .L80874930 -/* 020A0 808748D0 28410016 */ slti $at, $v0, 0x0016 -/* 020A4 808748D4 50200017 */ beql $at, $zero, .L80874934 +/* 02098 808748C8 28410013 */ slti $at, $v0, 0x0013 +/* 0209C 808748CC 14200018 */ bne $at, $zero, .L80874930 +/* 020A0 808748D0 28410016 */ slti $at, $v0, 0x0016 +/* 020A4 808748D4 50200017 */ beql $at, $zero, .L80874934 /* 020A8 808748D8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 020AC 808748DC 86190304 */ lh $t9, 0x0304($s0) ## 00000304 /* 020B0 808748E0 2443FFF5 */ addiu $v1, $v0, 0xFFF5 ## $v1 = FFFFFFF5 -/* 020B4 808748E4 8FA80058 */ lw $t0, 0x0058($sp) -/* 020B8 808748E8 17200011 */ bne $t9, $zero, .L80874930 -/* 020BC 808748EC 00031C00 */ sll $v1, $v1, 16 +/* 020B4 808748E4 8FA80058 */ lw $t0, 0x0058($sp) +/* 020B8 808748E8 17200011 */ bne $t9, $zero, .L80874930 +/* 020BC 808748EC 00031C00 */ sll $v1, $v1, 16 /* 020C0 808748F0 C5120028 */ lwc1 $f18, 0x0028($t0) ## 00000028 /* 020C4 808748F4 8D070024 */ lw $a3, 0x0024($t0) ## 00000024 -/* 020C8 808748F8 00031C03 */ sra $v1, $v1, 16 -/* 020CC 808748FC E7B20010 */ swc1 $f18, 0x0010($sp) +/* 020C8 808748F8 00031C03 */ sra $v1, $v1, 16 +/* 020CC 808748FC E7B20010 */ swc1 $f18, 0x0010($sp) /* 020D0 80874900 C504002C */ lwc1 $f4, 0x002C($t0) ## 0000002C -/* 020D4 80874904 AFA30024 */ sw $v1, 0x0024($sp) -/* 020D8 80874908 AFA00020 */ sw $zero, 0x0020($sp) -/* 020DC 8087490C AFA0001C */ sw $zero, 0x001C($sp) -/* 020E0 80874910 AFA00018 */ sw $zero, 0x0018($sp) +/* 020D4 80874904 AFA30024 */ sw $v1, 0x0024($sp) +/* 020D8 80874908 AFA00020 */ sw $zero, 0x0020($sp) +/* 020DC 8087490C AFA0001C */ sw $zero, 0x001C($sp) +/* 020E0 80874910 AFA00018 */ sw $zero, 0x0018($sp) /* 020E4 80874914 26241C24 */ addiu $a0, $s1, 0x1C24 ## $a0 = 00001C24 /* 020E8 80874918 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 /* 020EC 8087491C 2406005D */ addiu $a2, $zero, 0x005D ## $a2 = 0000005D /* 020F0 80874920 0C00C7D4 */ jal Actor_Spawn ## ActorSpawn -/* 020F4 80874924 E7A40014 */ swc1 $f4, 0x0014($sp) +/* 020F4 80874924 E7A40014 */ swc1 $f4, 0x0014($sp) /* 020F8 80874928 240A0001 */ addiu $t2, $zero, 0x0001 ## $t2 = 00000001 /* 020FC 8087492C A60A0304 */ sh $t2, 0x0304($s0) ## 00000304 .L80874930: /* 02100 80874930 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 .L80874934: -/* 02104 80874934 0C21CB16 */ jal func_80872C58 +/* 02104 80874934 0C21CB16 */ jal func_80872C58 /* 02108 80874938 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 .L8087493C: -/* 0210C 8087493C 8FBF003C */ lw $ra, 0x003C($sp) -/* 02110 80874940 8FB00034 */ lw $s0, 0x0034($sp) -/* 02114 80874944 8FB10038 */ lw $s1, 0x0038($sp) -/* 02118 80874948 03E00008 */ jr $ra +/* 0210C 8087493C 8FBF003C */ lw $ra, 0x003C($sp) +/* 02110 80874940 8FB00034 */ lw $s0, 0x0034($sp) +/* 02114 80874944 8FB10038 */ lw $s1, 0x0038($sp) +/* 02118 80874948 03E00008 */ jr $ra /* 0211C 8087494C 27BD0060 */ addiu $sp, $sp, 0x0060 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/func_80874BE0.s b/asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/func_80874BE0.s index 17d474a733..af87f8020f 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/func_80874BE0.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/func_80874BE0.s @@ -1,26 +1,26 @@ glabel func_80874BE0 /* 023B0 80874BE0 27BDFFA8 */ addiu $sp, $sp, 0xFFA8 ## $sp = FFFFFFA8 -/* 023B4 80874BE4 AFB10028 */ sw $s1, 0x0028($sp) +/* 023B4 80874BE4 AFB10028 */ sw $s1, 0x0028($sp) /* 023B8 80874BE8 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 -/* 023BC 80874BEC AFBF002C */ sw $ra, 0x002C($sp) -/* 023C0 80874BF0 AFB00024 */ sw $s0, 0x0024($sp) +/* 023BC 80874BEC AFBF002C */ sw $ra, 0x002C($sp) +/* 023C0 80874BF0 AFB00024 */ sw $s0, 0x0024($sp) /* 023C4 80874BF4 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 /* 023C8 80874BF8 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 023CC 80874BFC 3C068087 */ lui $a2, %hi(D_80875608) ## $a2 = 80870000 /* 023D0 80874C00 24C65608 */ addiu $a2, $a2, %lo(D_80875608) ## $a2 = 80875608 /* 023D4 80874C04 27A40040 */ addiu $a0, $sp, 0x0040 ## $a0 = FFFFFFE8 /* 023D8 80874C08 24070649 */ addiu $a3, $zero, 0x0649 ## $a3 = 00000649 -/* 023DC 80874C0C 0C031AB1 */ jal func_800C6AC4 -/* 023E0 80874C10 AFA50050 */ sw $a1, 0x0050($sp) +/* 023DC 80874C0C 0C031AB1 */ jal Graph_OpenDisps +/* 023E0 80874C10 AFA50050 */ sw $a1, 0x0050($sp) /* 023E4 80874C14 8E0F014C */ lw $t7, 0x014C($s0) ## 0000014C /* 023E8 80874C18 3C0E8087 */ lui $t6, %hi(func_80873E04) ## $t6 = 80870000 /* 023EC 80874C1C 25CE3E04 */ addiu $t6, $t6, %lo(func_80873E04) ## $t6 = 80873E04 -/* 023F0 80874C20 11CF0050 */ beq $t6, $t7, .L80874D64 -/* 023F4 80874C24 8FA80050 */ lw $t0, 0x0050($sp) +/* 023F0 80874C20 11CF0050 */ beq $t6, $t7, .L80874D64 +/* 023F4 80874C24 8FA80050 */ lw $t0, 0x0050($sp) /* 023F8 80874C28 8E240000 */ lw $a0, 0x0000($s1) ## 00000000 -/* 023FC 80874C2C 0C024F46 */ jal func_80093D18 -/* 02400 80874C30 AFA80050 */ sw $t0, 0x0050($sp) -/* 02404 80874C34 8FA80050 */ lw $t0, 0x0050($sp) +/* 023FC 80874C2C 0C024F46 */ jal func_80093D18 +/* 02400 80874C30 AFA80050 */ sw $t0, 0x0050($sp) +/* 02404 80874C34 8FA80050 */ lw $t0, 0x0050($sp) /* 02408 80874C38 3C19DB06 */ lui $t9, 0xDB06 ## $t9 = DB060000 /* 0240C 80874C3C 37390020 */ ori $t9, $t9, 0x0020 ## $t9 = DB060020 /* 02410 80874C40 8D0202C0 */ lw $v0, 0x02C0($t0) ## 000002C0 @@ -32,20 +32,20 @@ glabel func_80874BE0 /* 02428 80874C58 860A02F2 */ lh $t2, 0x02F2($s0) ## 000002F2 /* 0242C 80874C5C 3C068016 */ lui $a2, 0x8016 ## $a2 = 80160000 /* 02430 80874C60 24C66FA8 */ addiu $a2, $a2, 0x6FA8 ## $a2 = 80166FA8 -/* 02434 80874C64 000A5880 */ sll $t3, $t2, 2 -/* 02438 80874C68 012B6021 */ addu $t4, $t1, $t3 +/* 02434 80874C64 000A5880 */ sll $t3, $t2, 2 +/* 02438 80874C68 012B6021 */ addu $t4, $t1, $t3 /* 0243C 80874C6C 8D840000 */ lw $a0, 0x0000($t4) ## 00000000 /* 02440 80874C70 3C0500FF */ lui $a1, 0x00FF ## $a1 = 00FF0000 /* 02444 80874C74 34A5FFFF */ ori $a1, $a1, 0xFFFF ## $a1 = 00FFFFFF -/* 02448 80874C78 00047100 */ sll $t6, $a0, 4 -/* 0244C 80874C7C 000E7F02 */ srl $t7, $t6, 28 -/* 02450 80874C80 000FC080 */ sll $t8, $t7, 2 -/* 02454 80874C84 00D8C821 */ addu $t9, $a2, $t8 +/* 02448 80874C78 00047100 */ sll $t6, $a0, 4 +/* 0244C 80874C7C 000E7F02 */ srl $t7, $t6, 28 +/* 02450 80874C80 000FC080 */ sll $t8, $t7, 2 +/* 02454 80874C84 00D8C821 */ addu $t9, $a2, $t8 /* 02458 80874C88 8F2A0000 */ lw $t2, 0x0000($t9) ## DB060020 -/* 0245C 80874C8C 00856824 */ and $t5, $a0, $a1 +/* 0245C 80874C8C 00856824 */ and $t5, $a0, $a1 /* 02460 80874C90 3C078000 */ lui $a3, 0x8000 ## $a3 = 80000000 -/* 02464 80874C94 01AA5821 */ addu $t3, $t5, $t2 -/* 02468 80874C98 01676021 */ addu $t4, $t3, $a3 +/* 02464 80874C94 01AA5821 */ addu $t3, $t5, $t2 +/* 02468 80874C98 01676021 */ addu $t4, $t3, $a3 /* 0246C 80874C9C AC4C0004 */ sw $t4, 0x0004($v0) ## 00000004 /* 02470 80874CA0 8D0202C0 */ lw $v0, 0x02C0($t0) ## 000002C0 /* 02474 80874CA4 3C0FDB06 */ lui $t7, 0xDB06 ## $t7 = DB060000 @@ -54,18 +54,18 @@ glabel func_80874BE0 /* 02480 80874CB0 AD0E02C0 */ sw $t6, 0x02C0($t0) ## 000002C0 /* 02484 80874CB4 AC4F0000 */ sw $t7, 0x0000($v0) ## 00000000 /* 02488 80874CB8 861802F4 */ lh $t8, 0x02F4($s0) ## 000002F4 -/* 0248C 80874CBC 0018C880 */ sll $t9, $t8, 2 -/* 02490 80874CC0 01396821 */ addu $t5, $t1, $t9 +/* 0248C 80874CBC 0018C880 */ sll $t9, $t8, 2 +/* 02490 80874CC0 01396821 */ addu $t5, $t1, $t9 /* 02494 80874CC4 8DA40000 */ lw $a0, 0x0000($t5) ## 00000000 -/* 02498 80874CC8 00045900 */ sll $t3, $a0, 4 -/* 0249C 80874CCC 000B6702 */ srl $t4, $t3, 28 -/* 024A0 80874CD0 000C7080 */ sll $t6, $t4, 2 -/* 024A4 80874CD4 00CE7821 */ addu $t7, $a2, $t6 +/* 02498 80874CC8 00045900 */ sll $t3, $a0, 4 +/* 0249C 80874CCC 000B6702 */ srl $t4, $t3, 28 +/* 024A0 80874CD0 000C7080 */ sll $t6, $t4, 2 +/* 024A4 80874CD4 00CE7821 */ addu $t7, $a2, $t6 /* 024A8 80874CD8 8DF80000 */ lw $t8, 0x0000($t7) ## DB060024 -/* 024AC 80874CDC 00855024 */ and $t2, $a0, $a1 +/* 024AC 80874CDC 00855024 */ and $t2, $a0, $a1 /* 024B0 80874CE0 3C0CDB06 */ lui $t4, 0xDB06 ## $t4 = DB060000 -/* 024B4 80874CE4 0158C821 */ addu $t9, $t2, $t8 -/* 024B8 80874CE8 03276821 */ addu $t5, $t9, $a3 +/* 024B4 80874CE4 0158C821 */ addu $t9, $t2, $t8 +/* 024B8 80874CE8 03276821 */ addu $t5, $t9, $a3 /* 024BC 80874CEC AC4D0004 */ sw $t5, 0x0004($v0) ## 00000004 /* 024C0 80874CF0 8D0202C0 */ lw $v0, 0x02C0($t0) ## 000002C0 /* 024C4 80874CF4 358C0028 */ ori $t4, $t4, 0x0028 ## $t4 = DB060028 @@ -74,42 +74,42 @@ glabel func_80874BE0 /* 024D0 80874D00 AD0B02C0 */ sw $t3, 0x02C0($t0) ## 000002C0 /* 024D4 80874D04 AC4C0000 */ sw $t4, 0x0000($v0) ## 00000000 /* 024D8 80874D08 860E02F6 */ lh $t6, 0x02F6($s0) ## 000002F6 -/* 024DC 80874D0C 000E7880 */ sll $t7, $t6, 2 -/* 024E0 80874D10 008F2021 */ addu $a0, $a0, $t7 -/* 024E4 80874D14 8C8454D8 */ lw $a0, %lo(D_808754D8)($a0) -/* 024E8 80874D18 0004C100 */ sll $t8, $a0, 4 -/* 024EC 80874D1C 0018CF02 */ srl $t9, $t8, 28 -/* 024F0 80874D20 00196880 */ sll $t5, $t9, 2 -/* 024F4 80874D24 00CD5821 */ addu $t3, $a2, $t5 +/* 024DC 80874D0C 000E7880 */ sll $t7, $t6, 2 +/* 024E0 80874D10 008F2021 */ addu $a0, $a0, $t7 +/* 024E4 80874D14 8C8454D8 */ lw $a0, %lo(D_808754D8)($a0) +/* 024E8 80874D18 0004C100 */ sll $t8, $a0, 4 +/* 024EC 80874D1C 0018CF02 */ srl $t9, $t8, 28 +/* 024F0 80874D20 00196880 */ sll $t5, $t9, 2 +/* 024F4 80874D24 00CD5821 */ addu $t3, $a2, $t5 /* 024F8 80874D28 8D6C0000 */ lw $t4, 0x0000($t3) ## 00000008 -/* 024FC 80874D2C 00855024 */ and $t2, $a0, $a1 +/* 024FC 80874D2C 00855024 */ and $t2, $a0, $a1 /* 02500 80874D30 3C188087 */ lui $t8, %hi(func_80874B7C) ## $t8 = 80870000 -/* 02504 80874D34 014C7021 */ addu $t6, $t2, $t4 -/* 02508 80874D38 01C77821 */ addu $t7, $t6, $a3 +/* 02504 80874D34 014C7021 */ addu $t6, $t2, $t4 +/* 02508 80874D38 01C77821 */ addu $t7, $t6, $a3 /* 0250C 80874D3C AC4F0004 */ sw $t7, 0x0004($v0) ## 00000004 /* 02510 80874D40 92070152 */ lbu $a3, 0x0152($s0) ## 00000152 /* 02514 80874D44 8E060170 */ lw $a2, 0x0170($s0) ## 00000170 /* 02518 80874D48 8E050154 */ lw $a1, 0x0154($s0) ## 00000154 /* 0251C 80874D4C 27184B7C */ addiu $t8, $t8, %lo(func_80874B7C) ## $t8 = 80874B7C -/* 02520 80874D50 AFB80010 */ sw $t8, 0x0010($sp) -/* 02524 80874D54 AFB00018 */ sw $s0, 0x0018($sp) -/* 02528 80874D58 AFA00014 */ sw $zero, 0x0014($sp) -/* 0252C 80874D5C 0C0286B2 */ jal func_800A1AC8 +/* 02520 80874D50 AFB80010 */ sw $t8, 0x0010($sp) +/* 02524 80874D54 AFB00018 */ sw $s0, 0x0018($sp) +/* 02528 80874D58 AFA00014 */ sw $zero, 0x0014($sp) +/* 0252C 80874D5C 0C0286B2 */ jal SkelAnime_DrawSV /* 02530 80874D60 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 .L80874D64: /* 02534 80874D64 3C068087 */ lui $a2, %hi(D_80875620) ## $a2 = 80870000 /* 02538 80874D68 24C65620 */ addiu $a2, $a2, %lo(D_80875620) ## $a2 = 80875620 /* 0253C 80874D6C 27A40040 */ addiu $a0, $sp, 0x0040 ## $a0 = FFFFFFE8 /* 02540 80874D70 8E250000 */ lw $a1, 0x0000($s1) ## 00000000 -/* 02544 80874D74 0C031AD5 */ jal func_800C6B54 +/* 02544 80874D74 0C031AD5 */ jal Graph_CloseDisps /* 02548 80874D78 2407065D */ addiu $a3, $zero, 0x065D ## $a3 = 0000065D /* 0254C 80874D7C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02550 80874D80 0C21D468 */ jal func_808751A0 +/* 02550 80874D80 0C21D468 */ jal func_808751A0 /* 02554 80874D84 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 02558 80874D88 8FBF002C */ lw $ra, 0x002C($sp) -/* 0255C 80874D8C 8FB00024 */ lw $s0, 0x0024($sp) -/* 02560 80874D90 8FB10028 */ lw $s1, 0x0028($sp) -/* 02564 80874D94 03E00008 */ jr $ra +/* 02558 80874D88 8FBF002C */ lw $ra, 0x002C($sp) +/* 0255C 80874D8C 8FB00024 */ lw $s0, 0x0024($sp) +/* 02560 80874D90 8FB10028 */ lw $s1, 0x0028($sp) +/* 02564 80874D94 03E00008 */ jr $ra /* 02568 80874D98 27BD0058 */ addiu $sp, $sp, 0x0058 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/func_808751A0.s b/asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/func_808751A0.s index 751da434d8..2a15dfd8b5 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/func_808751A0.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Dy_Yoseizo/func_808751A0.s @@ -19,7 +19,7 @@ glabel func_808751A0 /* 029B4 808751E4 24C65638 */ addiu $a2, $a2, %lo(D_80875638) ## $a2 = 80875638 /* 029B8 808751E8 27A4007C */ addiu $a0, $sp, 0x007C ## $a0 = FFFFFFDC /* 029BC 808751EC 240706E7 */ addiu $a3, $zero, 0x06E7 ## $a3 = 000006E7 -/* 029C0 808751F0 0C031AB1 */ jal func_800C6AC4 +/* 029C0 808751F0 0C031AB1 */ jal Graph_OpenDisps /* 029C4 808751F4 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 /* 029C8 808751F8 8FAF00A4 */ lw $t7, 0x00A4($sp) /* 029CC 808751FC 0C024F61 */ jal func_80093D84 @@ -153,7 +153,7 @@ glabel func_808751A0 /* 02BC0 808753F0 24C65668 */ addiu $a2, $a2, %lo(D_80875668) ## $a2 = 80875668 /* 02BC4 808753F4 27A4007C */ addiu $a0, $sp, 0x007C ## $a0 = FFFFFFDC /* 02BC8 808753F8 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 02BCC 808753FC 0C031AD5 */ jal func_800C6B54 +/* 02BCC 808753FC 0C031AD5 */ jal Graph_CloseDisps /* 02BD0 80875400 2407071B */ addiu $a3, $zero, 0x071B ## $a3 = 0000071B /* 02BD4 80875404 8FBF0044 */ lw $ra, 0x0044($sp) /* 02BD8 80875408 D7B40018 */ ldc1 $f20, 0x0018($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Ganon_Otyuka/BgGanonOtyuka_Draw.s b/asm/non_matchings/overlays/actors/ovl_Bg_Ganon_Otyuka/BgGanonOtyuka_Draw.s index f0f39c3839..846ffe67a6 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Ganon_Otyuka/BgGanonOtyuka_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Ganon_Otyuka/BgGanonOtyuka_Draw.s @@ -27,7 +27,7 @@ glabel BgGanonOtyuka_Draw /* 00874 80876194 24C67F24 */ addiu $a2, $a2, %lo(D_80877F24) ## $a2 = 80877F24 /* 00878 80876198 27A400A8 */ addiu $a0, $sp, 0x00A8 ## $a0 = FFFFFFC8 /* 0087C 8087619C 240702BE */ addiu $a3, $zero, 0x02BE ## $a3 = 000002BE -/* 00880 808761A0 0C031AB1 */ jal func_800C6AC4 +/* 00880 808761A0 0C031AB1 */ jal Graph_OpenDisps /* 00884 808761A4 00A09825 */ or $s3, $a1, $zero ## $s3 = 00000000 /* 00888 808761A8 8FA300E4 */ lw $v1, 0x00E4($sp) /* 0088C 808761AC 240200E8 */ addiu $v0, $zero, 0x00E8 ## $v0 = 000000E8 @@ -271,7 +271,7 @@ glabel BgGanonOtyuka_Draw /* 00C10 80876530 AFAA0018 */ sw $t2, 0x0018($sp) /* 00C14 80876534 AFA90014 */ sw $t1, 0x0014($sp) /* 00C18 80876538 AFA80010 */ sw $t0, 0x0010($sp) -/* 00C1C 8087653C 0C0253D0 */ jal Draw_TwoTexScroll +/* 00C1C 8087653C 0C0253D0 */ jal Gfx_TwoTexScroll /* 00C20 80876540 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 /* 00C24 80876544 AE020004 */ sw $v0, 0x0004($s0) ## 00000006 /* 00C28 80876548 8E6302D0 */ lw $v1, 0x02D0($s3) ## 000002D0 @@ -596,7 +596,7 @@ glabel BgGanonOtyuka_Draw /* 010C8 808769E8 24C67F84 */ addiu $a2, $a2, %lo(D_80877F84) ## $a2 = 80877F84 /* 010CC 808769EC 27A400A8 */ addiu $a0, $sp, 0x00A8 ## $a0 = FFFFFFC8 /* 010D0 808769F0 24070359 */ addiu $a3, $zero, 0x0359 ## $a3 = 00000359 -/* 010D4 808769F4 0C031AD5 */ jal func_800C6B54 +/* 010D4 808769F4 0C031AD5 */ jal Graph_CloseDisps /* 010D8 808769F8 8D250000 */ lw $a1, 0x0000($t1) ## 00000000 /* 010DC 808769FC 8FBF006C */ lw $ra, 0x006C($sp) /* 010E0 80876A00 D7B40038 */ ldc1 $f20, 0x0038($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Gate_Shutter/BgGateShutter_Destroy.s b/asm/non_matchings/overlays/actors/ovl_Bg_Gate_Shutter/BgGateShutter_Destroy.s deleted file mode 100644 index 6fb3929a19..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Gate_Shutter/BgGateShutter_Destroy.s +++ /dev/null @@ -1,16 +0,0 @@ -glabel BgGateShutter_Destroy -/* 000FC 8087825C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00100 80878260 AFA40018 */ sw $a0, 0x0018($sp) -/* 00104 80878264 8FAE0018 */ lw $t6, 0x0018($sp) -/* 00108 80878268 AFBF0014 */ sw $ra, 0x0014($sp) -/* 0010C 8087826C 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 00110 80878270 24A50810 */ addiu $a1, $a1, 0x0810 ## $a1 = 00000810 -/* 00114 80878274 0C00FB56 */ jal DynaPolyInfo_Free - ## DynaPolyInfo_delReserve -/* 00118 80878278 8DC6014C */ lw $a2, 0x014C($t6) ## 0000014C -/* 0011C 8087827C 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00120 80878280 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00124 80878284 03E00008 */ jr $ra -/* 00128 80878288 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Gate_Shutter/BgGateShutter_Draw.s b/asm/non_matchings/overlays/actors/ovl_Bg_Gate_Shutter/BgGateShutter_Draw.s deleted file mode 100644 index bbc1eb91aa..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Gate_Shutter/BgGateShutter_Draw.s +++ /dev/null @@ -1,54 +0,0 @@ -glabel BgGateShutter_Draw -/* 00360 808784C0 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 -/* 00364 808784C4 AFBF001C */ sw $ra, 0x001C($sp) -/* 00368 808784C8 AFB00018 */ sw $s0, 0x0018($sp) -/* 0036C 808784CC AFA40040 */ sw $a0, 0x0040($sp) -/* 00370 808784D0 AFA50044 */ sw $a1, 0x0044($sp) -/* 00374 808784D4 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 -/* 00378 808784D8 3C068088 */ lui $a2, %hi(D_808785E0) ## $a2 = 80880000 -/* 0037C 808784DC 24C685E0 */ addiu $a2, $a2, %lo(D_808785E0) ## $a2 = 808785E0 -/* 00380 808784E0 27A4002C */ addiu $a0, $sp, 0x002C ## $a0 = FFFFFFEC -/* 00384 808784E4 24070143 */ addiu $a3, $zero, 0x0143 ## $a3 = 00000143 -/* 00388 808784E8 0C031AB1 */ jal func_800C6AC4 -/* 0038C 808784EC 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 -/* 00390 808784F0 8FAF0044 */ lw $t7, 0x0044($sp) -/* 00394 808784F4 0C024F46 */ jal func_80093D18 -/* 00398 808784F8 8DE40000 */ lw $a0, 0x0000($t7) ## 00000000 -/* 0039C 808784FC 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 -/* 003A0 80878500 3C19DA38 */ lui $t9, 0xDA38 ## $t9 = DA380000 -/* 003A4 80878504 37390003 */ ori $t9, $t9, 0x0003 ## $t9 = DA380003 -/* 003A8 80878508 24580008 */ addiu $t8, $v0, 0x0008 ## $t8 = 00000008 -/* 003AC 8087850C AE1802C0 */ sw $t8, 0x02C0($s0) ## 000002C0 -/* 003B0 80878510 AC590000 */ sw $t9, 0x0000($v0) ## 00000000 -/* 003B4 80878514 8FA80044 */ lw $t0, 0x0044($sp) -/* 003B8 80878518 3C058088 */ lui $a1, %hi(D_808785F8) ## $a1 = 80880000 -/* 003BC 8087851C 24A585F8 */ addiu $a1, $a1, %lo(D_808785F8) ## $a1 = 808785F8 -/* 003C0 80878520 8D040000 */ lw $a0, 0x0000($t0) ## 00000000 -/* 003C4 80878524 24060148 */ addiu $a2, $zero, 0x0148 ## $a2 = 00000148 -/* 003C8 80878528 0C0346A2 */ jal Matrix_NewMtx -/* 003CC 8087852C AFA20028 */ sw $v0, 0x0028($sp) -/* 003D0 80878530 8FA30028 */ lw $v1, 0x0028($sp) -/* 003D4 80878534 3C0B0600 */ lui $t3, 0x0600 ## $t3 = 06000000 -/* 003D8 80878538 256B1CD0 */ addiu $t3, $t3, 0x1CD0 ## $t3 = 06001CD0 -/* 003DC 8087853C AC620004 */ sw $v0, 0x0004($v1) ## 00000004 -/* 003E0 80878540 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 -/* 003E4 80878544 3C0ADE00 */ lui $t2, 0xDE00 ## $t2 = DE000000 -/* 003E8 80878548 3C068088 */ lui $a2, %hi(D_80878610) ## $a2 = 80880000 -/* 003EC 8087854C 24490008 */ addiu $t1, $v0, 0x0008 ## $t1 = 00000008 -/* 003F0 80878550 AE0902C0 */ sw $t1, 0x02C0($s0) ## 000002C0 -/* 003F4 80878554 AC4B0004 */ sw $t3, 0x0004($v0) ## 00000004 -/* 003F8 80878558 AC4A0000 */ sw $t2, 0x0000($v0) ## 00000000 -/* 003FC 8087855C 8FAC0044 */ lw $t4, 0x0044($sp) -/* 00400 80878560 24C68610 */ addiu $a2, $a2, %lo(D_80878610) ## $a2 = 80878610 -/* 00404 80878564 27A4002C */ addiu $a0, $sp, 0x002C ## $a0 = FFFFFFEC -/* 00408 80878568 2407014D */ addiu $a3, $zero, 0x014D ## $a3 = 0000014D -/* 0040C 8087856C 0C031AD5 */ jal func_800C6B54 -/* 00410 80878570 8D850000 */ lw $a1, 0x0000($t4) ## 00000000 -/* 00414 80878574 8FBF001C */ lw $ra, 0x001C($sp) -/* 00418 80878578 8FB00018 */ lw $s0, 0x0018($sp) -/* 0041C 8087857C 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 -/* 00420 80878580 03E00008 */ jr $ra -/* 00424 80878584 00000000 */ nop -/* 00428 80878588 00000000 */ nop -/* 0042C 8087858C 00000000 */ nop - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Gate_Shutter/BgGateShutter_Init.s b/asm/non_matchings/overlays/actors/ovl_Bg_Gate_Shutter/BgGateShutter_Init.s deleted file mode 100644 index 314c0cf2a9..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Gate_Shutter/BgGateShutter_Init.s +++ /dev/null @@ -1,74 +0,0 @@ -glabel BgGateShutter_Init -/* 00000 80878160 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 00004 80878164 AFBF001C */ sw $ra, 0x001C($sp) -/* 00008 80878168 AFB00018 */ sw $s0, 0x0018($sp) -/* 0000C 8087816C AFA50034 */ sw $a1, 0x0034($sp) -/* 00010 80878170 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00014 80878174 AFA00020 */ sw $zero, 0x0020($sp) -/* 00018 80878178 0C010D20 */ jal DynaPolyInfo_SetActorMove - -/* 0001C 8087817C 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 00020 80878180 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 -/* 00024 80878184 24841DA8 */ addiu $a0, $a0, 0x1DA8 ## $a0 = 06001DA8 -/* 00028 80878188 0C010620 */ jal DynaPolyInfo_Alloc - -/* 0002C 8087818C 27A50020 */ addiu $a1, $sp, 0x0020 ## $a1 = FFFFFFF0 -/* 00030 80878190 8FA40034 */ lw $a0, 0x0034($sp) -/* 00034 80878194 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 -/* 00038 80878198 8FA70020 */ lw $a3, 0x0020($sp) -/* 0003C 8087819C 0C00FA9D */ jal DynaPolyInfo_RegisterActor - ## DynaPolyInfo_setActor -/* 00040 808781A0 24850810 */ addiu $a1, $a0, 0x0810 ## $a1 = 00000810 -/* 00044 808781A4 C6040024 */ lwc1 $f4, 0x0024($s0) ## 00000024 -/* 00048 808781A8 C6060028 */ lwc1 $f6, 0x0028($s0) ## 00000028 -/* 0004C 808781AC C608002C */ lwc1 $f8, 0x002C($s0) ## 0000002C -/* 00050 808781B0 3C038016 */ lui $v1, 0x8016 ## $v1 = 80160000 -/* 00054 808781B4 2463E660 */ addiu $v1, $v1, 0xE660 ## $v1 = 8015E660 -/* 00058 808781B8 AE02014C */ sw $v0, 0x014C($s0) ## 0000014C -/* 0005C 808781BC E604016C */ swc1 $f4, 0x016C($s0) ## 0000016C -/* 00060 808781C0 E6060170 */ swc1 $f6, 0x0170($s0) ## 00000170 -/* 00064 808781C4 E6080174 */ swc1 $f8, 0x0174($s0) ## 00000174 -/* 00068 808781C8 946E0F06 */ lhu $t6, 0x0F06($v1) ## 8015F566 -/* 0006C 808781CC 8FA80034 */ lw $t0, 0x0034($sp) -/* 00070 808781D0 31CF0040 */ andi $t7, $t6, 0x0040 ## $t7 = 00000000 -/* 00074 808781D4 55E00006 */ bnel $t7, $zero, .L808781F0 -/* 00078 808781D8 850900A4 */ lh $t1, 0x00A4($t0) ## 000000A4 -/* 0007C 808781DC 94780EDC */ lhu $t8, 0x0EDC($v1) ## 8015F53C -/* 00080 808781E0 33190020 */ andi $t9, $t8, 0x0020 ## $t9 = 00000000 -/* 00084 808781E4 5320000B */ beql $t9, $zero, .L80878214 -/* 00088 808781E8 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 0008C 808781EC 850900A4 */ lh $t1, 0x00A4($t0) ## 000000A4 -.L808781F0: -/* 00090 808781F0 24010052 */ addiu $at, $zero, 0x0052 ## $at = 00000052 -/* 00094 808781F4 15210006 */ bne $t1, $at, .L80878210 -/* 00098 808781F8 3C01C2B2 */ lui $at, 0xC2B2 ## $at = C2B20000 -/* 0009C 808781FC 44815000 */ mtc1 $at, $f10 ## $f10 = -89.00 -/* 000A0 80878200 3C018088 */ lui $at, %hi(D_80878628) ## $at = 80880000 -/* 000A4 80878204 E60A0024 */ swc1 $f10, 0x0024($s0) ## 00000024 -/* 000A8 80878208 C4308628 */ lwc1 $f16, %lo(D_80878628)($at) -/* 000AC 8087820C E610002C */ swc1 $f16, 0x002C($s0) ## 0000002C -.L80878210: -/* 000B0 80878210 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -.L80878214: -/* 000B4 80878214 44810000 */ mtc1 $at, $f0 ## $f0 = 1.00 -/* 000B8 80878218 3C048088 */ lui $a0, %hi(D_808785B0) ## $a0 = 80880000 -/* 000BC 8087821C 248485B0 */ addiu $a0, $a0, %lo(D_808785B0) ## $a0 = 808785B0 -/* 000C0 80878220 E6000050 */ swc1 $f0, 0x0050($s0) ## 00000050 -/* 000C4 80878224 E6000054 */ swc1 $f0, 0x0054($s0) ## 00000054 -/* 000C8 80878228 0C00084C */ jal osSyncPrintf - -/* 000CC 8087822C E6000058 */ swc1 $f0, 0x0058($s0) ## 00000058 -/* 000D0 80878230 3C048088 */ lui $a0, %hi(D_808785B4) ## $a0 = 80880000 -/* 000D4 80878234 0C00084C */ jal osSyncPrintf - -/* 000D8 80878238 248485B4 */ addiu $a0, $a0, %lo(D_808785B4) ## $a0 = 808785B4 -/* 000DC 8087823C 3C0A8088 */ lui $t2, %hi(func_8087828C) ## $t2 = 80880000 -/* 000E0 80878240 254A828C */ addiu $t2, $t2, %lo(func_8087828C) ## $t2 = 8087828C -/* 000E4 80878244 AE0A0164 */ sw $t2, 0x0164($s0) ## 00000164 -/* 000E8 80878248 8FBF001C */ lw $ra, 0x001C($sp) -/* 000EC 8087824C 8FB00018 */ lw $s0, 0x0018($sp) -/* 000F0 80878250 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 000F4 80878254 03E00008 */ jr $ra -/* 000F8 80878258 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Gate_Shutter/BgGateShutter_Update.s b/asm/non_matchings/overlays/actors/ovl_Bg_Gate_Shutter/BgGateShutter_Update.s deleted file mode 100644 index 935caa05c2..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Gate_Shutter/BgGateShutter_Update.s +++ /dev/null @@ -1,17 +0,0 @@ -glabel BgGateShutter_Update -/* 0032C 8087848C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00330 80878490 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00334 80878494 84820178 */ lh $v0, 0x0178($a0) ## 00000178 -/* 00338 80878498 10400002 */ beq $v0, $zero, .L808784A4 -/* 0033C 8087849C 244EFFFF */ addiu $t6, $v0, 0xFFFF ## $t6 = FFFFFFFF -/* 00340 808784A0 A48E0178 */ sh $t6, 0x0178($a0) ## 00000178 -.L808784A4: -/* 00344 808784A4 8C990164 */ lw $t9, 0x0164($a0) ## 00000164 -/* 00348 808784A8 0320F809 */ jalr $ra, $t9 -/* 0034C 808784AC 00000000 */ nop -/* 00350 808784B0 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00354 808784B4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00358 808784B8 03E00008 */ jr $ra -/* 0035C 808784BC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Gate_Shutter/func_8087828C.s b/asm/non_matchings/overlays/actors/ovl_Bg_Gate_Shutter/func_8087828C.s deleted file mode 100644 index 297619a72e..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Gate_Shutter/func_8087828C.s +++ /dev/null @@ -1,35 +0,0 @@ -glabel func_8087828C -/* 0012C 8087828C AFA50004 */ sw $a1, 0x0004($sp) -/* 00130 80878290 84820168 */ lh $v0, 0x0168($a0) ## 00000168 -/* 00134 80878294 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 00138 80878298 3C0E8016 */ lui $t6, 0x8016 ## $t6 = 80160000 -/* 0013C 8087829C 1441000B */ bne $v0, $at, .L808782CC -/* 00140 808782A0 24030002 */ addiu $v1, $zero, 0x0002 ## $v1 = 00000002 -/* 00144 808782A4 95CEF566 */ lhu $t6, -0x0A9A($t6) ## 8015F566 -/* 00148 808782A8 3C188088 */ lui $t8, %hi(func_80878300) ## $t8 = 80880000 -/* 0014C 808782AC 27188300 */ addiu $t8, $t8, %lo(func_80878300) ## $t8 = 80878300 -/* 00150 808782B0 31CF0040 */ andi $t7, $t6, 0x0040 ## $t7 = 00000000 -/* 00154 808782B4 15E00005 */ bne $t7, $zero, .L808782CC -/* 00158 808782B8 00000000 */ nop -/* 0015C 808782BC 24030002 */ addiu $v1, $zero, 0x0002 ## $v1 = 00000002 -/* 00160 808782C0 A4830178 */ sh $v1, 0x0178($a0) ## 00000178 -/* 00164 808782C4 03E00008 */ jr $ra -/* 00168 808782C8 AC980164 */ sw $t8, 0x0164($a0) ## 00000164 -.L808782CC: -/* 0016C 808782CC 14620005 */ bne $v1, $v0, .L808782E4 -/* 00170 808782D0 3C198088 */ lui $t9, %hi(func_80878300) ## $t9 = 80880000 -/* 00174 808782D4 27398300 */ addiu $t9, $t9, %lo(func_80878300) ## $t9 = 80878300 -/* 00178 808782D8 A4830178 */ sh $v1, 0x0178($a0) ## 00000178 -/* 0017C 808782DC 03E00008 */ jr $ra -/* 00180 808782E0 AC990164 */ sw $t9, 0x0164($a0) ## 00000164 -.L808782E4: -/* 00184 808782E4 04410004 */ bgez $v0, .L808782F8 -/* 00188 808782E8 3C088088 */ lui $t0, %hi(func_808783D4) ## $t0 = 80880000 -/* 0018C 808782EC 250883D4 */ addiu $t0, $t0, %lo(func_808783D4) ## $t0 = 808783D4 -/* 00190 808782F0 A4830178 */ sh $v1, 0x0178($a0) ## 00000178 -/* 00194 808782F4 AC880164 */ sw $t0, 0x0164($a0) ## 00000164 -.L808782F8: -/* 00198 808782F8 03E00008 */ jr $ra -/* 0019C 808782FC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Gate_Shutter/func_80878300.s b/asm/non_matchings/overlays/actors/ovl_Bg_Gate_Shutter/func_80878300.s deleted file mode 100644 index dcc9629abf..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Gate_Shutter/func_80878300.s +++ /dev/null @@ -1,50 +0,0 @@ -glabel func_80878300 -/* 001A0 80878300 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 001A4 80878304 AFBF001C */ sw $ra, 0x001C($sp) -/* 001A8 80878308 AFB00018 */ sw $s0, 0x0018($sp) -/* 001AC 8087830C AFA50024 */ sw $a1, 0x0024($sp) -/* 001B0 80878310 848E0178 */ lh $t6, 0x0178($a0) ## 00000178 -/* 001B4 80878314 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 001B8 80878318 55C00020 */ bnel $t6, $zero, .L8087839C -/* 001BC 8087831C 8FBF001C */ lw $ra, 0x001C($sp) -/* 001C0 80878320 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 001C4 80878324 24052067 */ addiu $a1, $zero, 0x2067 ## $a1 = 00002067 -/* 001C8 80878328 3C014000 */ lui $at, 0x4000 ## $at = 40000000 -/* 001CC 8087832C 44813000 */ mtc1 $at, $f6 ## $f6 = 2.00 -/* 001D0 80878330 C6040024 */ lwc1 $f4, 0x0024($s0) ## 00000024 -/* 001D4 80878334 3C05C4AB */ lui $a1, 0xC4AB ## $a1 = C4AB0000 -/* 001D8 80878338 3C063F4C */ lui $a2, 0x3F4C ## $a2 = 3F4C0000 -/* 001DC 8087833C 46062201 */ sub.s $f8, $f4, $f6 -/* 001E0 80878340 3C073E99 */ lui $a3, 0x3E99 ## $a3 = 3E990000 -/* 001E4 80878344 34E7999A */ ori $a3, $a3, 0x999A ## $a3 = 3E99999A -/* 001E8 80878348 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3F4CCCCD -/* 001EC 8087834C E6080024 */ swc1 $f8, 0x0024($s0) ## 00000024 -/* 001F0 80878350 34A5E000 */ ori $a1, $a1, 0xE000 ## $a1 = C4ABE000 -/* 001F4 80878354 0C01E107 */ jal Math_SmoothScaleMaxF - -/* 001F8 80878358 2604002C */ addiu $a0, $s0, 0x002C ## $a0 = 0000002C -/* 001FC 8087835C 3C01C2B2 */ lui $at, 0xC2B2 ## $at = C2B20000 -/* 00200 80878360 44818000 */ mtc1 $at, $f16 ## $f16 = -89.00 -/* 00204 80878364 C60A0024 */ lwc1 $f10, 0x0024($s0) ## 00000024 -/* 00208 80878368 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0020C 8087836C 4610503C */ c.lt.s $f10, $f16 -/* 00210 80878370 00000000 */ nop -/* 00214 80878374 45020009 */ bc1fl .L8087839C -/* 00218 80878378 8FBF001C */ lw $ra, 0x001C($sp) -/* 0021C 8087837C 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 00220 80878380 2405280E */ addiu $a1, $zero, 0x280E ## $a1 = 0000280E -/* 00224 80878384 3C188088 */ lui $t8, %hi(func_808783AC) ## $t8 = 80880000 -/* 00228 80878388 240F001E */ addiu $t7, $zero, 0x001E ## $t7 = 0000001E -/* 0022C 8087838C 271883AC */ addiu $t8, $t8, %lo(func_808783AC) ## $t8 = 808783AC -/* 00230 80878390 A60F0178 */ sh $t7, 0x0178($s0) ## 00000178 -/* 00234 80878394 AE180164 */ sw $t8, 0x0164($s0) ## 00000164 -/* 00238 80878398 8FBF001C */ lw $ra, 0x001C($sp) -.L8087839C: -/* 0023C 8087839C 8FB00018 */ lw $s0, 0x0018($sp) -/* 00240 808783A0 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 00244 808783A4 03E00008 */ jr $ra -/* 00248 808783A8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Gate_Shutter/func_808783AC.s b/asm/non_matchings/overlays/actors/ovl_Bg_Gate_Shutter/func_808783AC.s deleted file mode 100644 index 375c43f2dd..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Gate_Shutter/func_808783AC.s +++ /dev/null @@ -1,14 +0,0 @@ -glabel func_808783AC -/* 0024C 808783AC AFA50004 */ sw $a1, 0x0004($sp) -/* 00250 808783B0 848E0178 */ lh $t6, 0x0178($a0) ## 00000178 -/* 00254 808783B4 3C0F8088 */ lui $t7, %hi(func_8087828C) ## $t7 = 80880000 -/* 00258 808783B8 25EF828C */ addiu $t7, $t7, %lo(func_8087828C) ## $t7 = 8087828C -/* 0025C 808783BC 15C00003 */ bne $t6, $zero, .L808783CC -/* 00260 808783C0 00000000 */ nop -/* 00264 808783C4 A4800168 */ sh $zero, 0x0168($a0) ## 00000168 -/* 00268 808783C8 AC8F0164 */ sw $t7, 0x0164($a0) ## 00000164 -.L808783CC: -/* 0026C 808783CC 03E00008 */ jr $ra -/* 00270 808783D0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Gate_Shutter/func_808783D4.s b/asm/non_matchings/overlays/actors/ovl_Bg_Gate_Shutter/func_808783D4.s deleted file mode 100644 index 838cb21690..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Gate_Shutter/func_808783D4.s +++ /dev/null @@ -1,53 +0,0 @@ -glabel func_808783D4 -/* 00274 808783D4 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 00278 808783D8 AFBF001C */ sw $ra, 0x001C($sp) -/* 0027C 808783DC AFB00018 */ sw $s0, 0x0018($sp) -/* 00280 808783E0 AFA50024 */ sw $a1, 0x0024($sp) -/* 00284 808783E4 848E0178 */ lh $t6, 0x0178($a0) ## 00000178 -/* 00288 808783E8 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 0028C 808783EC 55C00023 */ bnel $t6, $zero, .L8087847C -/* 00290 808783F0 8FBF001C */ lw $ra, 0x001C($sp) -/* 00294 808783F4 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 00298 808783F8 24052067 */ addiu $a1, $zero, 0x2067 ## $a1 = 00002067 -/* 0029C 808783FC 3C014000 */ lui $at, 0x4000 ## $at = 40000000 -/* 002A0 80878400 44813000 */ mtc1 $at, $f6 ## $f6 = 2.00 -/* 002A4 80878404 C6040024 */ lwc1 $f4, 0x0024($s0) ## 00000024 -/* 002A8 80878408 3C05C4A8 */ lui $a1, 0xC4A8 ## $a1 = C4A80000 -/* 002AC 8087840C 3C063F4C */ lui $a2, 0x3F4C ## $a2 = 3F4C0000 -/* 002B0 80878410 46062200 */ add.s $f8, $f4, $f6 -/* 002B4 80878414 3C073E99 */ lui $a3, 0x3E99 ## $a3 = 3E990000 -/* 002B8 80878418 34E7999A */ ori $a3, $a3, 0x999A ## $a3 = 3E99999A -/* 002BC 8087841C 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3F4CCCCD -/* 002C0 80878420 E6080024 */ swc1 $f8, 0x0024($s0) ## 00000024 -/* 002C4 80878424 34A5C000 */ ori $a1, $a1, 0xC000 ## $a1 = C4A8C000 -/* 002C8 80878428 0C01E107 */ jal Math_SmoothScaleMaxF - -/* 002CC 8087842C 2604002C */ addiu $a0, $s0, 0x002C ## $a0 = 0000002C -/* 002D0 80878430 3C0142B4 */ lui $at, 0x42B4 ## $at = 42B40000 -/* 002D4 80878434 44815000 */ mtc1 $at, $f10 ## $f10 = 90.00 -/* 002D8 80878438 C6100024 */ lwc1 $f16, 0x0024($s0) ## 00000024 -/* 002DC 8087843C 3C0142B6 */ lui $at, 0x42B6 ## $at = 42B60000 -/* 002E0 80878440 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 002E4 80878444 4610503C */ c.lt.s $f10, $f16 -/* 002E8 80878448 00000000 */ nop -/* 002EC 8087844C 4502000B */ bc1fl .L8087847C -/* 002F0 80878450 8FBF001C */ lw $ra, 0x001C($sp) -/* 002F4 80878454 44819000 */ mtc1 $at, $f18 ## $f18 = 91.00 -/* 002F8 80878458 2405280E */ addiu $a1, $zero, 0x280E ## $a1 = 0000280E -/* 002FC 8087845C 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 00300 80878460 E6120024 */ swc1 $f18, 0x0024($s0) ## 00000024 -/* 00304 80878464 3C188088 */ lui $t8, %hi(func_808783AC) ## $t8 = 80880000 -/* 00308 80878468 240F001E */ addiu $t7, $zero, 0x001E ## $t7 = 0000001E -/* 0030C 8087846C 271883AC */ addiu $t8, $t8, %lo(func_808783AC) ## $t8 = 808783AC -/* 00310 80878470 A60F0178 */ sh $t7, 0x0178($s0) ## 00000178 -/* 00314 80878474 AE180164 */ sw $t8, 0x0164($s0) ## 00000164 -/* 00318 80878478 8FBF001C */ lw $ra, 0x001C($sp) -.L8087847C: -/* 0031C 8087847C 8FB00018 */ lw $s0, 0x0018($sp) -/* 00320 80878480 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 00324 80878484 03E00008 */ jr $ra -/* 00328 80878488 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Gjyo_Bridge/BgGjyoBridge_Destroy.s b/asm/non_matchings/overlays/actors/ovl_Bg_Gjyo_Bridge/BgGjyoBridge_Destroy.s deleted file mode 100644 index 5e3d8d5678..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Gjyo_Bridge/BgGjyoBridge_Destroy.s +++ /dev/null @@ -1,16 +0,0 @@ -glabel BgGjyoBridge_Destroy -/* 000B4 80878774 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 000B8 80878778 AFA40018 */ sw $a0, 0x0018($sp) -/* 000BC 8087877C 8FAE0018 */ lw $t6, 0x0018($sp) -/* 000C0 80878780 AFBF0014 */ sw $ra, 0x0014($sp) -/* 000C4 80878784 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 000C8 80878788 24A50810 */ addiu $a1, $a1, 0x0810 ## $a1 = 00000810 -/* 000CC 8087878C 0C00FB56 */ jal DynaPolyInfo_Free - ## DynaPolyInfo_delReserve -/* 000D0 80878790 8DC6014C */ lw $a2, 0x014C($t6) ## 0000014C -/* 000D4 80878794 8FBF0014 */ lw $ra, 0x0014($sp) -/* 000D8 80878798 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 000DC 8087879C 03E00008 */ jr $ra -/* 000E0 808787A0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Gjyo_Bridge/BgGjyoBridge_Draw.s b/asm/non_matchings/overlays/actors/ovl_Bg_Gjyo_Bridge/BgGjyoBridge_Draw.s deleted file mode 100644 index 413c8c638e..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Gjyo_Bridge/BgGjyoBridge_Draw.s +++ /dev/null @@ -1,103 +0,0 @@ -glabel BgGjyoBridge_Draw -/* 002DC 8087899C 27BDFF90 */ addiu $sp, $sp, 0xFF90 ## $sp = FFFFFF90 -/* 002E0 808789A0 AFB10038 */ sw $s1, 0x0038($sp) -/* 002E4 808789A4 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 -/* 002E8 808789A8 AFBF003C */ sw $ra, 0x003C($sp) -/* 002EC 808789AC AFB00034 */ sw $s0, 0x0034($sp) -/* 002F0 808789B0 AFA40070 */ sw $a0, 0x0070($sp) -/* 002F4 808789B4 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 -/* 002F8 808789B8 3C068088 */ lui $a2, %hi(D_80878B60) ## $a2 = 80880000 -/* 002FC 808789BC 24C68B60 */ addiu $a2, $a2, %lo(D_80878B60) ## $a2 = 80878B60 -/* 00300 808789C0 27A40058 */ addiu $a0, $sp, 0x0058 ## $a0 = FFFFFFE8 -/* 00304 808789C4 24070104 */ addiu $a3, $zero, 0x0104 ## $a3 = 00000104 -/* 00308 808789C8 0C031AB1 */ jal func_800C6AC4 -/* 0030C 808789CC 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 -/* 00310 808789D0 0C024F61 */ jal func_80093D84 -/* 00314 808789D4 8E240000 */ lw $a0, 0x0000($s1) ## 00000000 -/* 00318 808789D8 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 0031C 808789DC 3C0FDB06 */ lui $t7, 0xDB06 ## $t7 = DB060000 -/* 00320 808789E0 35EF0020 */ ori $t7, $t7, 0x0020 ## $t7 = DB060020 -/* 00324 808789E4 244E0008 */ addiu $t6, $v0, 0x0008 ## $t6 = 00000008 -/* 00328 808789E8 AE0E02D0 */ sw $t6, 0x02D0($s0) ## 000002D0 -/* 0032C 808789EC 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 00330 808789F0 02214821 */ addu $t1, $s1, $at -/* 00334 808789F4 AC4F0000 */ sw $t7, 0x0000($v0) ## 00000000 -/* 00338 808789F8 8D231DE4 */ lw $v1, 0x1DE4($t1) ## 00001DE4 -/* 0033C 808789FC 8E240000 */ lw $a0, 0x0000($s1) ## 00000000 -/* 00340 80878A00 24180020 */ addiu $t8, $zero, 0x0020 ## $t8 = 00000020 -/* 00344 80878A04 00030823 */ subu $at, $zero, $v1 -/* 00348 80878A08 00013080 */ sll $a2, $at, 2 -/* 0034C 80878A0C 00C13023 */ subu $a2, $a2, $at -/* 00350 80878A10 30C6007F */ andi $a2, $a2, 0x007F ## $a2 = 00000000 -/* 00354 80878A14 AFB80010 */ sw $t8, 0x0010($sp) -/* 00358 80878A18 AFA90044 */ sw $t1, 0x0044($sp) -/* 0035C 80878A1C 24070020 */ addiu $a3, $zero, 0x0020 ## $a3 = 00000020 -/* 00360 80878A20 AFA20054 */ sw $v0, 0x0054($sp) -/* 00364 80878A24 0C0253A7 */ jal Draw_TexScroll -/* 00368 80878A28 3065007F */ andi $a1, $v1, 0x007F ## $a1 = 00000000 -/* 0036C 80878A2C 8FA80054 */ lw $t0, 0x0054($sp) -/* 00370 80878A30 8FA90044 */ lw $t1, 0x0044($sp) -/* 00374 80878A34 3C0ADB06 */ lui $t2, 0xDB06 ## $t2 = DB060000 -/* 00378 80878A38 AD020004 */ sw $v0, 0x0004($t0) ## 00000004 -/* 0037C 80878A3C 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 00380 80878A40 354A0024 */ ori $t2, $t2, 0x0024 ## $t2 = DB060024 -/* 00384 80878A44 240B0020 */ addiu $t3, $zero, 0x0020 ## $t3 = 00000020 -/* 00388 80878A48 24590008 */ addiu $t9, $v0, 0x0008 ## $t9 = 00000008 -/* 0038C 80878A4C AE1902D0 */ sw $t9, 0x02D0($s0) ## 000002D0 -/* 00390 80878A50 AC4A0000 */ sw $t2, 0x0000($v0) ## 00000000 -/* 00394 80878A54 8D231DE4 */ lw $v1, 0x1DE4($t1) ## 00001DE4 -/* 00398 80878A58 8E240000 */ lw $a0, 0x0000($s1) ## 00000000 -/* 0039C 80878A5C 240C0020 */ addiu $t4, $zero, 0x0020 ## $t4 = 00000020 -/* 003A0 80878A60 240D0001 */ addiu $t5, $zero, 0x0001 ## $t5 = 00000001 -/* 003A4 80878A64 240F0020 */ addiu $t7, $zero, 0x0020 ## $t7 = 00000020 -/* 003A8 80878A68 24180020 */ addiu $t8, $zero, 0x0020 ## $t8 = 00000020 -/* 003AC 80878A6C 00033823 */ subu $a3, $zero, $v1 -/* 003B0 80878A70 306E007F */ andi $t6, $v1, 0x007F ## $t6 = 00000000 -/* 003B4 80878A74 AFAE0020 */ sw $t6, 0x0020($sp) -/* 003B8 80878A78 30E7007F */ andi $a3, $a3, 0x007F ## $a3 = 00000000 -/* 003BC 80878A7C AFB80028 */ sw $t8, 0x0028($sp) -/* 003C0 80878A80 AFAF0024 */ sw $t7, 0x0024($sp) -/* 003C4 80878A84 AFAD0018 */ sw $t5, 0x0018($sp) -/* 003C8 80878A88 AFAC0014 */ sw $t4, 0x0014($sp) -/* 003CC 80878A8C AFA0001C */ sw $zero, 0x001C($sp) -/* 003D0 80878A90 AFAB0010 */ sw $t3, 0x0010($sp) -/* 003D4 80878A94 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 003D8 80878A98 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 003DC 80878A9C 0C0253D0 */ jal Draw_TwoTexScroll -/* 003E0 80878AA0 AFA20050 */ sw $v0, 0x0050($sp) -/* 003E4 80878AA4 8FA80050 */ lw $t0, 0x0050($sp) -/* 003E8 80878AA8 3C0ADA38 */ lui $t2, 0xDA38 ## $t2 = DA380000 -/* 003EC 80878AAC 354A0003 */ ori $t2, $t2, 0x0003 ## $t2 = DA380003 -/* 003F0 80878AB0 AD020004 */ sw $v0, 0x0004($t0) ## 00000004 -/* 003F4 80878AB4 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 003F8 80878AB8 3C058088 */ lui $a1, %hi(D_80878B78) ## $a1 = 80880000 -/* 003FC 80878ABC 24A58B78 */ addiu $a1, $a1, %lo(D_80878B78) ## $a1 = 80878B78 -/* 00400 80878AC0 24590008 */ addiu $t9, $v0, 0x0008 ## $t9 = 00000008 -/* 00404 80878AC4 AE1902D0 */ sw $t9, 0x02D0($s0) ## 000002D0 -/* 00408 80878AC8 AC4A0000 */ sw $t2, 0x0000($v0) ## 00000000 -/* 0040C 80878ACC 8E240000 */ lw $a0, 0x0000($s1) ## 00000000 -/* 00410 80878AD0 24060119 */ addiu $a2, $zero, 0x0119 ## $a2 = 00000119 -/* 00414 80878AD4 0C0346A2 */ jal Matrix_NewMtx -/* 00418 80878AD8 AFA2004C */ sw $v0, 0x004C($sp) -/* 0041C 80878ADC 8FA3004C */ lw $v1, 0x004C($sp) -/* 00420 80878AE0 3C0D0600 */ lui $t5, 0x0600 ## $t5 = 06000000 -/* 00424 80878AE4 25AD0600 */ addiu $t5, $t5, 0x0600 ## $t5 = 06000600 -/* 00428 80878AE8 AC620004 */ sw $v0, 0x0004($v1) ## 00000004 -/* 0042C 80878AEC 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 00430 80878AF0 3C0CDE00 */ lui $t4, 0xDE00 ## $t4 = DE000000 -/* 00434 80878AF4 3C068088 */ lui $a2, %hi(D_80878B90) ## $a2 = 80880000 -/* 00438 80878AF8 244B0008 */ addiu $t3, $v0, 0x0008 ## $t3 = 00000008 -/* 0043C 80878AFC AE0B02D0 */ sw $t3, 0x02D0($s0) ## 000002D0 -/* 00440 80878B00 AC4D0004 */ sw $t5, 0x0004($v0) ## 00000004 -/* 00444 80878B04 AC4C0000 */ sw $t4, 0x0000($v0) ## 00000000 -/* 00448 80878B08 8E250000 */ lw $a1, 0x0000($s1) ## 00000000 -/* 0044C 80878B0C 24C68B90 */ addiu $a2, $a2, %lo(D_80878B90) ## $a2 = 80878B90 -/* 00450 80878B10 27A40058 */ addiu $a0, $sp, 0x0058 ## $a0 = FFFFFFE8 -/* 00454 80878B14 0C031AD5 */ jal func_800C6B54 -/* 00458 80878B18 2407011D */ addiu $a3, $zero, 0x011D ## $a3 = 0000011D -/* 0045C 80878B1C 8FBF003C */ lw $ra, 0x003C($sp) -/* 00460 80878B20 8FB00034 */ lw $s0, 0x0034($sp) -/* 00464 80878B24 8FB10038 */ lw $s1, 0x0038($sp) -/* 00468 80878B28 03E00008 */ jr $ra -/* 0046C 80878B2C 27BD0070 */ addiu $sp, $sp, 0x0070 ## $sp = 00000000 - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Gjyo_Bridge/BgGjyoBridge_Init.s b/asm/non_matchings/overlays/actors/ovl_Bg_Gjyo_Bridge/BgGjyoBridge_Init.s deleted file mode 100644 index 5906d4139e..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Gjyo_Bridge/BgGjyoBridge_Init.s +++ /dev/null @@ -1,54 +0,0 @@ -glabel BgGjyoBridge_Init -/* 00000 808786C0 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 00004 808786C4 AFA50034 */ sw $a1, 0x0034($sp) -/* 00008 808786C8 AFBF001C */ sw $ra, 0x001C($sp) -/* 0000C 808786CC AFB00018 */ sw $s0, 0x0018($sp) -/* 00010 808786D0 3C058088 */ lui $a1, %hi(D_80878B50) ## $a1 = 80880000 -/* 00014 808786D4 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00018 808786D8 AFA00024 */ sw $zero, 0x0024($sp) -/* 0001C 808786DC 0C01E037 */ jal Actor_ProcessInitChain - -/* 00020 808786E0 24A58B50 */ addiu $a1, $a1, %lo(D_80878B50) ## $a1 = 80878B50 -/* 00024 808786E4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00028 808786E8 0C010D20 */ jal DynaPolyInfo_SetActorMove - -/* 0002C 808786EC 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 00030 808786F0 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 -/* 00034 808786F4 24840DB8 */ addiu $a0, $a0, 0x0DB8 ## $a0 = 06000DB8 -/* 00038 808786F8 0C010620 */ jal DynaPolyInfo_Alloc - -/* 0003C 808786FC 27A50024 */ addiu $a1, $sp, 0x0024 ## $a1 = FFFFFFF4 -/* 00040 80878700 8FA40034 */ lw $a0, 0x0034($sp) -/* 00044 80878704 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 -/* 00048 80878708 8FA70024 */ lw $a3, 0x0024($sp) -/* 0004C 8087870C 24850810 */ addiu $a1, $a0, 0x0810 ## $a1 = 00000810 -/* 00050 80878710 0C00FA9D */ jal DynaPolyInfo_RegisterActor - ## DynaPolyInfo_setActor -/* 00054 80878714 AFA50020 */ sw $a1, 0x0020($sp) -/* 00058 80878718 8FA50020 */ lw $a1, 0x0020($sp) -/* 0005C 8087871C AE02014C */ sw $v0, 0x014C($s0) ## 0000014C -/* 00060 80878720 3C0E8016 */ lui $t6, 0x8016 ## $t6 = 80160000 -/* 00064 80878724 95CEF53C */ lhu $t6, -0x0AC4($t6) ## 8015F53C -/* 00068 80878728 3C188088 */ lui $t8, %hi(func_808787A4) ## $t8 = 80880000 -/* 0006C 8087872C 271887A4 */ addiu $t8, $t8, %lo(func_808787A4) ## $t8 = 808787A4 -/* 00070 80878730 31CF2000 */ andi $t7, $t6, 0x2000 ## $t7 = 00000000 -/* 00074 80878734 51E00004 */ beql $t7, $zero, .L80878748 -/* 00078 80878738 AE000134 */ sw $zero, 0x0134($s0) ## 00000134 -/* 0007C 8087873C 10000008 */ beq $zero, $zero, .L80878760 -/* 00080 80878740 AE180164 */ sw $t8, 0x0164($s0) ## 00000164 -/* 00084 80878744 AE000134 */ sw $zero, 0x0134($s0) ## 00000134 -.L80878748: -/* 00088 80878748 8FA40034 */ lw $a0, 0x0034($sp) -/* 0008C 8087874C 0C00FAFE */ jal func_8003EBF8 -/* 00090 80878750 8E06014C */ lw $a2, 0x014C($s0) ## 0000014C -/* 00094 80878754 3C198088 */ lui $t9, %hi(func_808787B0) ## $t9 = 80880000 -/* 00098 80878758 273987B0 */ addiu $t9, $t9, %lo(func_808787B0) ## $t9 = 808787B0 -/* 0009C 8087875C AE190164 */ sw $t9, 0x0164($s0) ## 00000164 -.L80878760: -/* 000A0 80878760 8FBF001C */ lw $ra, 0x001C($sp) -/* 000A4 80878764 8FB00018 */ lw $s0, 0x0018($sp) -/* 000A8 80878768 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 000AC 8087876C 03E00008 */ jr $ra -/* 000B0 80878770 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Gjyo_Bridge/BgGjyoBridge_Update.s b/asm/non_matchings/overlays/actors/ovl_Bg_Gjyo_Bridge/BgGjyoBridge_Update.s deleted file mode 100644 index fd319bd8f8..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Gjyo_Bridge/BgGjyoBridge_Update.s +++ /dev/null @@ -1,12 +0,0 @@ -glabel BgGjyoBridge_Update -/* 002B8 80878978 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 002BC 8087897C AFBF0014 */ sw $ra, 0x0014($sp) -/* 002C0 80878980 8C990164 */ lw $t9, 0x0164($a0) ## 00000164 -/* 002C4 80878984 0320F809 */ jalr $ra, $t9 -/* 002C8 80878988 00000000 */ nop -/* 002CC 8087898C 8FBF0014 */ lw $ra, 0x0014($sp) -/* 002D0 80878990 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 002D4 80878994 03E00008 */ jr $ra -/* 002D8 80878998 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Gjyo_Bridge/func_808787A4.s b/asm/non_matchings/overlays/actors/ovl_Bg_Gjyo_Bridge/func_808787A4.s deleted file mode 100644 index 3083c7d524..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Gjyo_Bridge/func_808787A4.s +++ /dev/null @@ -1,6 +0,0 @@ -glabel func_808787A4 -/* 000E4 808787A4 AFA40000 */ sw $a0, 0x0000($sp) -/* 000E8 808787A8 03E00008 */ jr $ra -/* 000EC 808787AC AFA50004 */ sw $a1, 0x0004($sp) - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Gjyo_Bridge/func_808787B0.s b/asm/non_matchings/overlays/actors/ovl_Bg_Gjyo_Bridge/func_808787B0.s deleted file mode 100644 index 0fd26face6..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Gjyo_Bridge/func_808787B0.s +++ /dev/null @@ -1,90 +0,0 @@ -glabel func_808787B0 -/* 000F0 808787B0 3C068012 */ lui $a2, 0x8012 ## $a2 = 80120000 -/* 000F4 808787B4 3C078016 */ lui $a3, 0x8016 ## $a3 = 80160000 -/* 000F8 808787B8 24E7E660 */ addiu $a3, $a3, 0xE660 ## $a3 = 8015E660 -/* 000FC 808787BC 24C67120 */ addiu $a2, $a2, 0x7120 ## $a2 = 80127120 -/* 00100 808787C0 8CCE000C */ lw $t6, 0x000C($a2) ## 8012712C -/* 00104 808787C4 8CE200A4 */ lw $v0, 0x00A4($a3) ## 8015E704 -/* 00108 808787C8 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 0010C 808787CC AFBF0014 */ sw $ra, 0x0014($sp) -/* 00110 808787D0 AFA40018 */ sw $a0, 0x0018($sp) -/* 00114 808787D4 01C27824 */ and $t7, $t6, $v0 -/* 00118 808787D8 11E00046 */ beq $t7, $zero, .L808788F4 -/* 0011C 808787DC 8CA31C44 */ lw $v1, 0x1C44($a1) ## 00001C44 -/* 00120 808787E0 8CD80010 */ lw $t8, 0x0010($a2) ## 80127130 -/* 00124 808787E4 3C088012 */ lui $t0, 0x8012 ## $t0 = 80120000 -/* 00128 808787E8 0302C824 */ and $t9, $t8, $v0 -/* 0012C 808787EC 53200042 */ beql $t9, $zero, .L808788F8 -/* 00130 808787F0 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00134 808787F4 91087476 */ lbu $t0, 0x7476($t0) ## 80127476 -/* 00138 808787F8 24010012 */ addiu $at, $zero, 0x0012 ## $at = 00000012 -/* 0013C 808787FC 00E84821 */ addu $t1, $a3, $t0 -/* 00140 80878800 912A0074 */ lbu $t2, 0x0074($t1) ## 00000074 -/* 00144 80878804 1541003B */ bne $t2, $at, .L808788F4 -/* 00148 80878808 3C01C28C */ lui $at, 0xC28C ## $at = C28C0000 -/* 0014C 8087880C 44812000 */ mtc1 $at, $f4 ## $f4 = -70.00 -/* 00150 80878810 C4600024 */ lwc1 $f0, 0x0024($v1) ## 00000024 -/* 00154 80878814 3C014396 */ lui $at, 0x4396 ## $at = 43960000 -/* 00158 80878818 4600203C */ c.lt.s $f4, $f0 -/* 0015C 8087881C 00000000 */ nop -/* 00160 80878820 45020035 */ bc1fl .L808788F8 -/* 00164 80878824 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00168 80878828 44813000 */ mtc1 $at, $f6 ## $f6 = 300.00 -/* 0016C 8087882C 3C018088 */ lui $at, %hi(D_80878BA8) ## $at = 80880000 -/* 00170 80878830 4606003C */ c.lt.s $f0, $f6 -/* 00174 80878834 00000000 */ nop -/* 00178 80878838 4502002F */ bc1fl .L808788F8 -/* 0017C 8087883C 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00180 80878840 C4228BA8 */ lwc1 $f2, %lo(D_80878BA8)($at) -/* 00184 80878844 C4680028 */ lwc1 $f8, 0x0028($v1) ## 00000028 -/* 00188 80878848 4608103C */ c.lt.s $f2, $f8 -/* 0018C 8087884C 00000000 */ nop -/* 00190 80878850 45020029 */ bc1fl .L808788F8 -/* 00194 80878854 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00198 80878858 C460002C */ lwc1 $f0, 0x002C($v1) ## 0000002C -/* 0019C 8087885C 3C018088 */ lui $at, %hi(D_80878BAC) ## $at = 80880000 -/* 001A0 80878860 4600103C */ c.lt.s $f2, $f0 -/* 001A4 80878864 00000000 */ nop -/* 001A8 80878868 45020023 */ bc1fl .L808788F8 -/* 001AC 8087886C 8FBF0014 */ lw $ra, 0x0014($sp) -/* 001B0 80878870 C42A8BAC */ lwc1 $f10, %lo(D_80878BAC)($at) -/* 001B4 80878874 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 001B8 80878878 460A003C */ c.lt.s $f0, $f10 -/* 001BC 8087887C 00000000 */ nop -/* 001C0 80878880 4502001D */ bc1fl .L808788F8 -/* 001C4 80878884 8FBF0014 */ lw $ra, 0x0014($sp) -/* 001C8 80878888 0C02FF21 */ jal func_800BFC84 -/* 001CC 8087888C AFA5001C */ sw $a1, 0x001C($sp) -/* 001D0 80878890 3C078016 */ lui $a3, 0x8016 ## $a3 = 80160000 -/* 001D4 80878894 24E7E660 */ addiu $a3, $a3, 0xE660 ## $a3 = 8015E660 -/* 001D8 80878898 14400016 */ bne $v0, $zero, .L808788F4 -/* 001DC 8087889C 8FA5001C */ lw $a1, 0x001C($sp) -/* 001E0 808788A0 3C020200 */ lui $v0, 0x0200 ## $v0 = 02000000 -/* 001E4 808788A4 24422640 */ addiu $v0, $v0, 0x2640 ## $v0 = 02002640 -/* 001E8 808788A8 00025900 */ sll $t3, $v0, 4 -/* 001EC 808788AC 000B6702 */ srl $t4, $t3, 28 -/* 001F0 808788B0 000C6880 */ sll $t5, $t4, 2 -/* 001F4 808788B4 3C0E8016 */ lui $t6, 0x8016 ## $t6 = 80160000 -/* 001F8 808788B8 01CD7021 */ addu $t6, $t6, $t5 -/* 001FC 808788BC 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 -/* 00200 808788C0 8DCE6FA8 */ lw $t6, 0x6FA8($t6) ## 80166FA8 -/* 00204 808788C4 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF -/* 00208 808788C8 00417824 */ and $t7, $v0, $at -/* 0020C 808788CC 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 00210 808788D0 01CFC021 */ addu $t8, $t6, $t7 -/* 00214 808788D4 0301C821 */ addu $t9, $t8, $at -/* 00218 808788D8 ACB91D68 */ sw $t9, 0x1D68($a1) ## 00001D68 -/* 0021C 808788DC 8FAA0018 */ lw $t2, 0x0018($sp) -/* 00220 808788E0 24080001 */ addiu $t0, $zero, 0x0001 ## $t0 = 00000001 -/* 00224 808788E4 3C098088 */ lui $t1, %hi(func_80878904) ## $t1 = 80880000 -/* 00228 808788E8 A0E81414 */ sb $t0, 0x1414($a3) ## 8015FA74 -/* 0022C 808788EC 25298904 */ addiu $t1, $t1, %lo(func_80878904) ## $t1 = 80878904 -/* 00230 808788F0 AD490164 */ sw $t1, 0x0164($t2) ## 00000164 -.L808788F4: -/* 00234 808788F4 8FBF0014 */ lw $ra, 0x0014($sp) -.L808788F8: -/* 00238 808788F8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 0023C 808788FC 03E00008 */ jr $ra -/* 00240 80878900 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Gjyo_Bridge/func_80878904.s b/asm/non_matchings/overlays/actors/ovl_Bg_Gjyo_Bridge/func_80878904.s deleted file mode 100644 index 6a5e058af3..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Gjyo_Bridge/func_80878904.s +++ /dev/null @@ -1,34 +0,0 @@ -glabel func_80878904 -/* 00244 80878904 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00248 80878908 AFBF0014 */ sw $ra, 0x0014($sp) -/* 0024C 8087890C AFA40018 */ sw $a0, 0x0018($sp) -/* 00250 80878910 90AE1D6C */ lbu $t6, 0x1D6C($a1) ## 00001D6C -/* 00254 80878914 51C00015 */ beql $t6, $zero, .L8087896C -/* 00258 80878918 8FBF0014 */ lw $ra, 0x0014($sp) -/* 0025C 8087891C 8CA21D94 */ lw $v0, 0x1D94($a1) ## 00001D94 -/* 00260 80878920 50400012 */ beql $v0, $zero, .L8087896C -/* 00264 80878924 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00268 80878928 944F0000 */ lhu $t7, 0x0000($v0) ## 00000000 -/* 0026C 8087892C 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 00270 80878930 3C188088 */ lui $t8, %hi(BgGjyoBridge_Draw) ## $t8 = 80880000 -/* 00274 80878934 15E1000C */ bne $t7, $at, .L80878968 -/* 00278 80878938 2718899C */ addiu $t8, $t8, %lo(BgGjyoBridge_Draw) ## $t8 = 8087899C -/* 0027C 8087893C AC980134 */ sw $t8, 0x0134($a0) ## 00000134 -/* 00280 80878940 8FA80018 */ lw $t0, 0x0018($sp) -/* 00284 80878944 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 00288 80878948 24A50810 */ addiu $a1, $a1, 0x0810 ## $a1 = 00000810 -/* 0028C 8087894C 0C00FB14 */ jal func_8003EC50 -/* 00290 80878950 8D06014C */ lw $a2, 0x014C($t0) ## 0000014C -/* 00294 80878954 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 00298 80878958 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 -/* 0029C 8087895C 94490EDC */ lhu $t1, 0x0EDC($v0) ## 8015F53C -/* 002A0 80878960 352A2000 */ ori $t2, $t1, 0x2000 ## $t2 = 00002000 -/* 002A4 80878964 A44A0EDC */ sh $t2, 0x0EDC($v0) ## 8015F53C -.L80878968: -/* 002A8 80878968 8FBF0014 */ lw $ra, 0x0014($sp) -.L8087896C: -/* 002AC 8087896C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 002B0 80878970 03E00008 */ jr $ra -/* 002B4 80878974 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Gnd_Darkmeiro/func_808791BC.s b/asm/non_matchings/overlays/actors/ovl_Bg_Gnd_Darkmeiro/func_808791BC.s index 1f1cc96d69..6a690dc1e8 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Gnd_Darkmeiro/func_808791BC.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Gnd_Darkmeiro/func_808791BC.s @@ -4,7 +4,7 @@ glabel func_808791BC /* 00594 808791C4 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 /* 00598 808791C8 AFBF0014 */ sw $ra, 0x0014($sp) /* 0059C 808791CC 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 -/* 005A0 808791D0 0C00D4C9 */ jal Draw_DListXlu +/* 005A0 808791D0 0C00D4C9 */ jal Gfx_DrawDListXlu /* 005A4 808791D4 24A588B0 */ addiu $a1, $a1, 0x88B0 ## $a1 = 060088B0 /* 005A8 808791D8 8FBF0014 */ lw $ra, 0x0014($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Gnd_Darkmeiro/func_808791E8.s b/asm/non_matchings/overlays/actors/ovl_Bg_Gnd_Darkmeiro/func_808791E8.s index 796f9b7a75..a470ae49ab 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Gnd_Darkmeiro/func_808791E8.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Gnd_Darkmeiro/func_808791E8.s @@ -58,7 +58,7 @@ glabel func_808791E8 /* 00680 808792B0 8D850000 */ lw $a1, 0x0000($t4) ## 00000000 /* 00684 808792B4 27A4002C */ addiu $a0, $sp, 0x002C ## $a0 = FFFFFFE4 /* 00688 808792B8 2407017A */ addiu $a3, $zero, 0x017A ## $a3 = 0000017A -/* 0068C 808792BC 0C031AB1 */ jal func_800C6AC4 +/* 0068C 808792BC 0C031AB1 */ jal Graph_OpenDisps /* 00690 808792C0 AFA5003C */ sw $a1, 0x003C($sp) /* 00694 808792C4 8FA8003C */ lw $t0, 0x003C($sp) /* 00698 808792C8 3C0EFA00 */ lui $t6, 0xFA00 ## $t6 = FA000000 @@ -77,11 +77,11 @@ glabel func_808791E8 /* 006CC 808792FC AC790004 */ sw $t9, 0x0004($v1) ## 00000004 /* 006D0 80879300 8FA9004C */ lw $t1, 0x004C($sp) /* 006D4 80879304 2407017C */ addiu $a3, $zero, 0x017C ## $a3 = 0000017C -/* 006D8 80879308 0C031AD5 */ jal func_800C6B54 +/* 006D8 80879308 0C031AD5 */ jal Graph_CloseDisps /* 006DC 8087930C 8D250000 */ lw $a1, 0x0000($t1) ## 00000000 /* 006E0 80879310 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 /* 006E4 80879314 24A5BEC0 */ addiu $a1, $a1, 0xBEC0 ## $a1 = 0600BEC0 -/* 006E8 80879318 0C00D4C9 */ jal Draw_DListXlu +/* 006E8 80879318 0C00D4C9 */ jal Gfx_DrawDListXlu /* 006EC 8087931C 8FA4004C */ lw $a0, 0x004C($sp) .L80879320: diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Gnd_Darkmeiro/func_80879334.s b/asm/non_matchings/overlays/actors/ovl_Bg_Gnd_Darkmeiro/func_80879334.s index 4f01c99cee..cb2b3c5efd 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Gnd_Darkmeiro/func_80879334.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Gnd_Darkmeiro/func_80879334.s @@ -8,7 +8,7 @@ glabel func_80879334 /* 0071C 8087934C 24C69410 */ addiu $a2, $a2, %lo(D_80879410) ## $a2 = 80879410 /* 00720 80879350 27A40024 */ addiu $a0, $sp, 0x0024 ## $a0 = FFFFFFEC /* 00724 80879354 24070187 */ addiu $a3, $zero, 0x0187 ## $a3 = 00000187 -/* 00728 80879358 0C031AB1 */ jal func_800C6AC4 +/* 00728 80879358 0C031AB1 */ jal Graph_OpenDisps /* 0072C 8087935C AFA50034 */ sw $a1, 0x0034($sp) /* 00730 80879360 8FA80034 */ lw $t0, 0x0034($sp) /* 00734 80879364 3C19C6CA */ lui $t9, 0xC6CA ## $t9 = C6CA0000 @@ -24,11 +24,11 @@ glabel func_80879334 /* 0075C 8087938C 24C69428 */ addiu $a2, $a2, %lo(D_80879428) ## $a2 = 80879428 /* 00760 80879390 27A40024 */ addiu $a0, $sp, 0x0024 ## $a0 = FFFFFFEC /* 00764 80879394 24070189 */ addiu $a3, $zero, 0x0189 ## $a3 = 00000189 -/* 00768 80879398 0C031AD5 */ jal func_800C6B54 +/* 00768 80879398 0C031AD5 */ jal Graph_CloseDisps /* 0076C 8087939C 8D250000 */ lw $a1, 0x0000($t1) ## 00000000 /* 00770 808793A0 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 /* 00774 808793A4 24A5BEC0 */ addiu $a1, $a1, 0xBEC0 ## $a1 = 0600BEC0 -/* 00778 808793A8 0C00D4C9 */ jal Draw_DListXlu +/* 00778 808793A8 0C00D4C9 */ jal Gfx_DrawDListXlu /* 0077C 808793AC 8FA4003C */ lw $a0, 0x003C($sp) /* 00780 808793B0 8FBF0014 */ lw $ra, 0x0014($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Gnd_Firemeiro/BgGndFiremeiro_Draw.s b/asm/non_matchings/overlays/actors/ovl_Bg_Gnd_Firemeiro/BgGndFiremeiro_Draw.s index 378f716f11..d9a330ba7d 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Gnd_Firemeiro/BgGndFiremeiro_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Gnd_Firemeiro/BgGndFiremeiro_Draw.s @@ -9,7 +9,7 @@ glabel BgGndFiremeiro_Draw /* 00448 80879908 24C699E0 */ addiu $a2, $a2, %lo(D_808799E0) ## $a2 = 808799E0 /* 0044C 8087990C 27A4002C */ addiu $a0, $sp, 0x002C ## $a0 = FFFFFFEC /* 00450 80879910 24070118 */ addiu $a3, $zero, 0x0118 ## $a3 = 00000118 -/* 00454 80879914 0C031AB1 */ jal func_800C6AC4 +/* 00454 80879914 0C031AB1 */ jal Graph_OpenDisps /* 00458 80879918 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 /* 0045C 8087991C 8FAF0044 */ lw $t7, 0x0044($sp) /* 00460 80879920 0C0250F2 */ jal func_800943C8 @@ -42,7 +42,7 @@ glabel BgGndFiremeiro_Draw /* 004CC 8087998C 24C69A10 */ addiu $a2, $a2, %lo(D_80879A10) ## $a2 = 80879A10 /* 004D0 80879990 27A4002C */ addiu $a0, $sp, 0x002C ## $a0 = FFFFFFEC /* 004D4 80879994 2407011D */ addiu $a3, $zero, 0x011D ## $a3 = 0000011D -/* 004D8 80879998 0C031AD5 */ jal func_800C6B54 +/* 004D8 80879998 0C031AD5 */ jal Graph_CloseDisps /* 004DC 8087999C 8D850000 */ lw $a1, 0x0000($t4) ## 00000000 /* 004E0 808799A0 8FBF001C */ lw $ra, 0x001C($sp) /* 004E4 808799A4 8FB00018 */ lw $s0, 0x0018($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Gnd_Iceblock/BgGndIceblock_Draw.s b/asm/non_matchings/overlays/actors/ovl_Bg_Gnd_Iceblock/BgGndIceblock_Draw.s index c9d6c8895d..cacf36f81b 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Gnd_Iceblock/BgGndIceblock_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Gnd_Iceblock/BgGndIceblock_Draw.s @@ -4,7 +4,7 @@ glabel BgGndIceblock_Draw /* 00C58 8087A6F8 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 /* 00C5C 8087A6FC AFBF0014 */ sw $ra, 0x0014($sp) /* 00C60 8087A700 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 00C64 8087A704 0C00D498 */ jal Draw_DListOpa +/* 00C64 8087A704 0C00D498 */ jal Gfx_DrawDListOpa /* 00C68 8087A708 24A54420 */ addiu $a1, $a1, 0x4420 ## $a1 = 06004420 /* 00C6C 8087A70C 8FBF0014 */ lw $ra, 0x0014($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Gnd_Soulmeiro/BgGndSoulmeiro_Draw.s b/asm/non_matchings/overlays/actors/ovl_Bg_Gnd_Soulmeiro/BgGndSoulmeiro_Draw.s index 877b54e23b..1be383c008 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Gnd_Soulmeiro/BgGndSoulmeiro_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Gnd_Soulmeiro/BgGndSoulmeiro_Draw.s @@ -21,7 +21,7 @@ glabel BgGndSoulmeiro_Draw /* 00654 8087B414 AFA80044 */ sw $t0, 0x0044($sp) /* 00658 8087B418 24C6B590 */ addiu $a2, $a2, %lo(D_8087B590) ## $a2 = 8087B590 /* 0065C 8087B41C 2407018E */ addiu $a3, $zero, 0x018E ## $a3 = 0000018E -/* 00660 8087B420 0C031AB1 */ jal func_800C6AC4 +/* 00660 8087B420 0C031AB1 */ jal Graph_OpenDisps /* 00664 8087B424 AFA50040 */ sw $a1, 0x0040($sp) /* 00668 8087B428 0C024F61 */ jal func_80093D84 /* 0066C 8087B42C 8E040000 */ lw $a0, 0x0000($s0) ## 00000000 @@ -58,7 +58,7 @@ glabel BgGndSoulmeiro_Draw /* 006E8 8087B4A8 27A40030 */ addiu $a0, $sp, 0x0030 ## $a0 = FFFFFFE8 /* 006EC 8087B4AC AC4B0004 */ sw $t3, 0x0004($v0) ## 00000004 /* 006F0 8087B4B0 8E050000 */ lw $a1, 0x0000($s0) ## 00000000 -/* 006F4 8087B4B4 0C031AD5 */ jal func_800C6B54 +/* 006F4 8087B4B4 0C031AD5 */ jal Graph_CloseDisps /* 006F8 8087B4B8 24070193 */ addiu $a3, $zero, 0x0193 ## $a3 = 00000193 /* 006FC 8087B4BC 1000000E */ beq $zero, $zero, .L8087B4F8 /* 00700 8087B4C0 8FBF001C */ lw $ra, 0x001C($sp) @@ -66,7 +66,7 @@ glabel BgGndSoulmeiro_Draw /* 00704 8087B4C4 00086080 */ sll $t4, $t0, 2 /* 00708 8087B4C8 3C058088 */ lui $a1, %hi(D_8087B578) ## $a1 = 80880000 /* 0070C 8087B4CC 00AC2821 */ addu $a1, $a1, $t4 -/* 00710 8087B4D0 0C00D4C9 */ jal Draw_DListXlu +/* 00710 8087B4D0 0C00D4C9 */ jal Gfx_DrawDListXlu /* 00714 8087B4D4 8CA5B578 */ lw $a1, %lo(D_8087B578)($a1) /* 00718 8087B4D8 10000007 */ beq $zero, $zero, .L8087B4F8 @@ -75,7 +75,7 @@ glabel BgGndSoulmeiro_Draw /* 00720 8087B4E0 00086880 */ sll $t5, $t0, 2 /* 00724 8087B4E4 3C058088 */ lui $a1, %hi(D_8087B578) ## $a1 = 80880000 /* 00728 8087B4E8 00AD2821 */ addu $a1, $a1, $t5 -/* 0072C 8087B4EC 0C00D498 */ jal Draw_DListOpa +/* 0072C 8087B4EC 0C00D498 */ jal Gfx_DrawDListOpa /* 00730 8087B4F0 8CA5B578 */ lw $a1, %lo(D_8087B578)($a1) /* 00734 8087B4F4 8FBF001C */ lw $ra, 0x001C($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Haka/BgHaka_Draw.s b/asm/non_matchings/overlays/actors/ovl_Bg_Haka/BgHaka_Draw.s index 120922e2a9..0210cbb21a 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Haka/BgHaka_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Haka/BgHaka_Draw.s @@ -10,7 +10,7 @@ glabel BgHaka_Draw /* 004F0 8087BBA0 24C6BD00 */ addiu $a2, $a2, %lo(D_8087BD00) ## $a2 = 8087BD00 /* 004F4 8087BBA4 27A40034 */ addiu $a0, $sp, 0x0034 ## $a0 = FFFFFFEC /* 004F8 8087BBA8 24070191 */ addiu $a3, $zero, 0x0191 ## $a3 = 00000191 -/* 004FC 8087BBAC 0C031AB1 */ jal func_800C6AC4 +/* 004FC 8087BBAC 0C031AB1 */ jal Graph_OpenDisps /* 00500 8087BBB0 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 /* 00504 8087BBB4 0C024F46 */ jal func_80093D18 /* 00508 8087BBB8 8E240000 */ lw $a0, 0x0000($s1) ## 00000000 @@ -75,7 +75,7 @@ glabel BgHaka_Draw /* 005F4 8087BCA4 8E250000 */ lw $a1, 0x0000($s1) ## 00000000 /* 005F8 8087BCA8 24C6BD30 */ addiu $a2, $a2, %lo(D_8087BD30) ## $a2 = 8087BD30 /* 005FC 8087BCAC 27A40034 */ addiu $a0, $sp, 0x0034 ## $a0 = FFFFFFEC -/* 00600 8087BCB0 0C031AD5 */ jal func_800C6B54 +/* 00600 8087BCB0 0C031AD5 */ jal Graph_CloseDisps /* 00604 8087BCB4 240701A5 */ addiu $a3, $zero, 0x01A5 ## $a3 = 000001A5 /* 00608 8087BCB8 8FBF001C */ lw $ra, 0x001C($sp) /* 0060C 8087BCBC 8FB00014 */ lw $s0, 0x0014($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Gate/BgHakaGate_Draw.s b/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Gate/BgHakaGate_Draw.s index c3c92547c5..b0afcadec7 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Gate/BgHakaGate_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Gate/BgHakaGate_Draw.s @@ -11,7 +11,7 @@ glabel BgHakaGate_Draw /* 00CA4 8087CA94 17010006 */ bne $t8, $at, .L8087CAB0 /* 00CA8 8087CA98 8FB90094 */ lw $t9, 0x0094($sp) /* 00CAC 8087CA9C 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 -/* 00CB0 8087CAA0 0C00D4C9 */ jal Draw_DListXlu +/* 00CB0 8087CAA0 0C00D4C9 */ jal Gfx_DrawDListXlu /* 00CB4 8087CAA4 24A5F1B0 */ addiu $a1, $a1, 0xF1B0 ## $a1 = 0600F1B0 /* 00CB8 8087CAA8 1000007C */ beq $zero, $zero, .L8087CC9C @@ -32,7 +32,7 @@ glabel BgHakaGate_Draw /* 00CF0 8087CAE0 24C6CD4C */ addiu $a2, $a2, %lo(D_8087CD4C) ## $a2 = 8087CD4C /* 00CF4 8087CAE4 27A40038 */ addiu $a0, $sp, 0x0038 ## $a0 = FFFFFFA8 /* 00CF8 8087CAE8 2407030D */ addiu $a3, $zero, 0x030D ## $a3 = 0000030D -/* 00CFC 8087CAEC 0C031AB1 */ jal func_800C6AC4 +/* 00CFC 8087CAEC 0C031AB1 */ jal Graph_OpenDisps /* 00D00 8087CAF0 00A08025 */ or $s0, $a1, $zero ## $s0 = 80880000 /* 00D04 8087CAF4 0C034236 */ jal Matrix_Get /* 00D08 8087CAF8 27A4004C */ addiu $a0, $sp, 0x004C ## $a0 = FFFFFFBC @@ -132,13 +132,13 @@ glabel BgHakaGate_Draw /* 00E80 8087CC70 24C6CD88 */ addiu $a2, $a2, %lo(D_8087CD88) ## $a2 = 8087CD88 /* 00E84 8087CC74 27A40038 */ addiu $a0, $sp, 0x0038 ## $a0 = FFFFFFA8 /* 00E88 8087CC78 24070320 */ addiu $a3, $zero, 0x0320 ## $a3 = 00000320 -/* 00E8C 8087CC7C 0C031AD5 */ jal func_800C6B54 +/* 00E8C 8087CC7C 0C031AD5 */ jal Graph_CloseDisps /* 00E90 8087CC80 8F250000 */ lw $a1, 0x0000($t9) ## 00000000 /* 00E94 8087CC84 10000005 */ beq $zero, $zero, .L8087CC9C /* 00E98 8087CC88 8FA40090 */ lw $a0, 0x0090($sp) .L8087CC8C: /* 00E9C 8087CC8C 00A82821 */ addu $a1, $a1, $t0 -/* 00EA0 8087CC90 0C00D498 */ jal Draw_DListOpa +/* 00EA0 8087CC90 0C00D498 */ jal Gfx_DrawDListOpa /* 00EA4 8087CC94 8CA5CD00 */ lw $a1, %lo(D_8087CD00)($a1) /* 00EA8 8087CC98 8FA40090 */ lw $a0, 0x0090($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Gate/func_8087C85C.s b/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Gate/func_8087C85C.s index 2464bcd6c8..a2d2957ca2 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Gate/func_8087C85C.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Gate/func_8087C85C.s @@ -12,7 +12,7 @@ glabel func_8087C85C /* 00A94 8087C884 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 /* 00A98 8087C888 24C6CD10 */ addiu $a2, $a2, %lo(D_8087CD10) ## $a2 = 8087CD10 /* 00A9C 8087C88C 240702CC */ addiu $a3, $zero, 0x02CC ## $a3 = 000002CC -/* 00AA0 8087C890 0C031AB1 */ jal func_800C6AC4 +/* 00AA0 8087C890 0C031AB1 */ jal Graph_OpenDisps /* 00AA4 8087C894 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 /* 00AA8 8087C898 0C024F61 */ jal func_80093D84 /* 00AAC 8087C89C 8E240000 */ lw $a0, 0x0000($s1) ## 00000000 @@ -45,7 +45,7 @@ glabel func_8087C85C /* 00B18 8087C908 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 00B1C 8087C90C 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 /* 00B20 8087C910 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 00B24 8087C914 0C0253D0 */ jal Draw_TwoTexScroll +/* 00B24 8087C914 0C0253D0 */ jal Gfx_TwoTexScroll /* 00B28 8087C918 AFA20058 */ sw $v0, 0x0058($sp) /* 00B2C 8087C91C 8FA30058 */ lw $v1, 0x0058($sp) /* 00B30 8087C920 3C08FA00 */ lui $t0, 0xFA00 ## $t0 = FA000000 @@ -125,7 +125,7 @@ glabel func_8087C85C /* 00C58 8087CA48 8E250000 */ lw $a1, 0x0000($s1) ## 00000000 /* 00C5C 8087CA4C 24C6CD38 */ addiu $a2, $a2, %lo(D_8087CD38) ## $a2 = 8087CD38 /* 00C60 8087CA50 27A4005C */ addiu $a0, $sp, 0x005C ## $a0 = FFFFFFE4 -/* 00C64 8087CA54 0C031AD5 */ jal func_800C6B54 +/* 00C64 8087CA54 0C031AD5 */ jal Graph_CloseDisps /* 00C68 8087CA58 240702ED */ addiu $a3, $zero, 0x02ED ## $a3 = 000002ED .L8087CA5C: /* 00C6C 8087CA5C 8FBF003C */ lw $ra, 0x003C($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Huta/BgHakaHuta_Draw.s b/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Huta/BgHakaHuta_Draw.s index 165ad3aba2..0120211561 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Huta/BgHakaHuta_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Huta/BgHakaHuta_Draw.s @@ -4,7 +4,7 @@ glabel BgHakaHuta_Draw /* 00938 8087D8F8 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 /* 0093C 8087D8FC AFBF0014 */ sw $ra, 0x0014($sp) /* 00940 8087D900 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 00944 8087D904 0C00D498 */ jal Draw_DListOpa +/* 00944 8087D904 0C00D498 */ jal Gfx_DrawDListOpa /* 00948 8087D908 24A506B0 */ addiu $a1, $a1, 0x06B0 ## $a1 = 060006B0 /* 0094C 8087D90C 8FBF0014 */ lw $ra, 0x0014($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Huta/func_8087D720.s b/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Huta/func_8087D720.s index b4234b7807..d2a246f26f 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Huta/func_8087D720.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Huta/func_8087D720.s @@ -17,22 +17,22 @@ glabel func_8087D720 /* 0079C 8087D75C 00194080 */ sll $t0, $t9, 2 /* 007A0 8087D760 00A84821 */ addu $t1, $a1, $t0 /* 007A4 8087D764 8D240790 */ lw $a0, 0x0790($t1) ## 00000790 -/* 007A8 8087D768 0C024BE2 */ jal func_80092F88 +/* 007A8 8087D768 0C024BE2 */ jal Quake_Add /* 007AC 8087D76C 24050003 */ addiu $a1, $zero, 0x0003 ## $a1 = 00000003 /* 007B0 8087D770 00022400 */ sll $a0, $v0, 16 /* 007B4 8087D774 AFA20030 */ sw $v0, 0x0030($sp) /* 007B8 8087D778 00042403 */ sra $a0, $a0, 16 -/* 007BC 8087D77C 0C024B6B */ jal func_80092DAC +/* 007BC 8087D77C 0C024B6B */ jal Quake_SetSpeed /* 007C0 8087D780 24057530 */ addiu $a1, $zero, 0x7530 ## $a1 = 00007530 /* 007C4 8087D784 87A40032 */ lh $a0, 0x0032($sp) /* 007C8 8087D788 24050004 */ addiu $a1, $zero, 0x0004 ## $a1 = 00000004 /* 007CC 8087D78C 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 /* 007D0 8087D790 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 /* 007D4 8087D794 AFA00010 */ sw $zero, 0x0010($sp) -/* 007D8 8087D798 0C024B9C */ jal func_80092E70 +/* 007D8 8087D798 0C024B9C */ jal Quake_SetQuakeValues /* 007DC 8087D79C AFA4002C */ sw $a0, 0x002C($sp) /* 007E0 8087D7A0 8FA4002C */ lw $a0, 0x002C($sp) -/* 007E4 8087D7A4 0C024B7C */ jal func_80092DF0 +/* 007E4 8087D7A4 0C024B7C */ jal Quake_SetCountdown /* 007E8 8087D7A8 24050002 */ addiu $a1, $zero, 0x0002 ## $a1 = 00000002 /* 007EC 8087D7AC 10000007 */ beq $zero, $zero, .L8087D7CC /* 007F0 8087D7B0 86030168 */ lh $v1, 0x0168($s0) ## 00000168 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Megane/BgHakaMegane_Destroy.s b/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Megane/BgHakaMegane_Destroy.s deleted file mode 100644 index 6e38aca86e..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Megane/BgHakaMegane_Destroy.s +++ /dev/null @@ -1,16 +0,0 @@ -glabel BgHakaMegane_Destroy -/* 000B4 8087DAF4 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 000B8 8087DAF8 AFA40018 */ sw $a0, 0x0018($sp) -/* 000BC 8087DAFC 8FAE0018 */ lw $t6, 0x0018($sp) -/* 000C0 8087DB00 AFBF0014 */ sw $ra, 0x0014($sp) -/* 000C4 8087DB04 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 000C8 8087DB08 24A50810 */ addiu $a1, $a1, 0x0810 ## $a1 = 00000810 -/* 000CC 8087DB0C 0C00FB56 */ jal DynaPolyInfo_Free - ## DynaPolyInfo_delReserve -/* 000D0 8087DB10 8DC6014C */ lw $a2, 0x014C($t6) ## 0000014C -/* 000D4 8087DB14 8FBF0014 */ lw $ra, 0x0014($sp) -/* 000D8 8087DB18 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 000DC 8087DB1C 03E00008 */ jr $ra -/* 000E0 8087DB20 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Megane/BgHakaMegane_Init.s b/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Megane/BgHakaMegane_Init.s deleted file mode 100644 index 1845ff85c2..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Megane/BgHakaMegane_Init.s +++ /dev/null @@ -1,57 +0,0 @@ -glabel BgHakaMegane_Init -/* 00000 8087DA40 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 00004 8087DA44 AFA50024 */ sw $a1, 0x0024($sp) -/* 00008 8087DA48 AFBF001C */ sw $ra, 0x001C($sp) -/* 0000C 8087DA4C AFB00018 */ sw $s0, 0x0018($sp) -/* 00010 8087DA50 3C058088 */ lui $a1, %hi(D_8087DD50) ## $a1 = 80880000 -/* 00014 8087DA54 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00018 8087DA58 0C01E037 */ jal Actor_ProcessInitChain - -/* 0001C 8087DA5C 24A5DD50 */ addiu $a1, $a1, %lo(D_8087DD50) ## $a1 = 8087DD50 -/* 00020 8087DA60 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00024 8087DA64 0C010D20 */ jal DynaPolyInfo_SetActorMove - -/* 00028 8087DA68 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 0002C 8087DA6C 860E001C */ lh $t6, 0x001C($s0) ## 0000001C -/* 00030 8087DA70 8FA40024 */ lw $a0, 0x0024($sp) -/* 00034 8087DA74 24050069 */ addiu $a1, $zero, 0x0069 ## $a1 = 00000069 -/* 00038 8087DA78 29C10003 */ slti $at, $t6, 0x0003 -/* 0003C 8087DA7C 5020000A */ beql $at, $zero, .L8087DAA8 -/* 00040 8087DA80 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 00044 8087DA84 8FA40024 */ lw $a0, 0x0024($sp) -/* 00048 8087DA88 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 0004C 8087DA8C 342117A4 */ ori $at, $at, 0x17A4 ## $at = 000117A4 -/* 00050 8087DA90 2405008D */ addiu $a1, $zero, 0x008D ## $a1 = 0000008D -/* 00054 8087DA94 0C02604B */ jal Object_GetIndex - ## ObjectIndex -/* 00058 8087DA98 00812021 */ addu $a0, $a0, $at -/* 0005C 8087DA9C 10000006 */ beq $zero, $zero, .L8087DAB8 -/* 00060 8087DAA0 A2020169 */ sb $v0, 0x0169($s0) ## 00000169 -/* 00064 8087DAA4 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -.L8087DAA8: -/* 00068 8087DAA8 342117A4 */ ori $at, $at, 0x17A4 ## $at = 000117A4 -/* 0006C 8087DAAC 0C02604B */ jal Object_GetIndex - ## ObjectIndex -/* 00070 8087DAB0 00812021 */ addu $a0, $a0, $at -/* 00074 8087DAB4 A2020169 */ sb $v0, 0x0169($s0) ## 00000169 -.L8087DAB8: -/* 00078 8087DAB8 820F0169 */ lb $t7, 0x0169($s0) ## 00000169 -/* 0007C 8087DABC 3C188088 */ lui $t8, %hi(func_8087DB24) ## $t8 = 80880000 -/* 00080 8087DAC0 2718DB24 */ addiu $t8, $t8, %lo(func_8087DB24) ## $t8 = 8087DB24 -/* 00084 8087DAC4 05E30006 */ bgezl $t7, .L8087DAE0 -/* 00088 8087DAC8 AE180164 */ sw $t8, 0x0164($s0) ## 00000164 -/* 0008C 8087DACC 0C00B55C */ jal Actor_Kill - -/* 00090 8087DAD0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00094 8087DAD4 10000003 */ beq $zero, $zero, .L8087DAE4 -/* 00098 8087DAD8 8FBF001C */ lw $ra, 0x001C($sp) -/* 0009C 8087DADC AE180164 */ sw $t8, 0x0164($s0) ## 00000164 -.L8087DAE0: -/* 000A0 8087DAE0 8FBF001C */ lw $ra, 0x001C($sp) -.L8087DAE4: -/* 000A4 8087DAE4 8FB00018 */ lw $s0, 0x0018($sp) -/* 000A8 8087DAE8 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 000AC 8087DAEC 03E00008 */ jr $ra -/* 000B0 8087DAF0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Megane/BgHakaMegane_Update.s b/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Megane/BgHakaMegane_Update.s deleted file mode 100644 index e2ad034ac0..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Megane/BgHakaMegane_Update.s +++ /dev/null @@ -1,12 +0,0 @@ -glabel BgHakaMegane_Update -/* 00230 8087DC70 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00234 8087DC74 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00238 8087DC78 8C990164 */ lw $t9, 0x0164($a0) ## 00000164 -/* 0023C 8087DC7C 0320F809 */ jalr $ra, $t9 -/* 00240 8087DC80 00000000 */ nop -/* 00244 8087DC84 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00248 8087DC88 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 0024C 8087DC8C 03E00008 */ jr $ra -/* 00250 8087DC90 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Megane/func_8087DBF0.s b/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Megane/func_8087DBF0.s deleted file mode 100644 index 23e2a2b082..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Megane/func_8087DBF0.s +++ /dev/null @@ -1,34 +0,0 @@ -glabel func_8087DBF0 -/* 001B0 8087DBF0 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 001B4 8087DBF4 AFBF001C */ sw $ra, 0x001C($sp) -/* 001B8 8087DBF8 AFB00018 */ sw $s0, 0x0018($sp) -/* 001BC 8087DBFC 90AE1C27 */ lbu $t6, 0x1C27($a1) ## 00001C27 -/* 001C0 8087DC00 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 -/* 001C4 8087DC04 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 -/* 001C8 8087DC08 11C0000A */ beq $t6, $zero, .L8087DC34 -/* 001CC 8087DC0C 2401FF7F */ addiu $at, $zero, 0xFF7F ## $at = FFFFFF7F -/* 001D0 8087DC10 8C8F0004 */ lw $t7, 0x0004($a0) ## 00000004 -/* 001D4 8087DC14 35F80080 */ ori $t8, $t7, 0x0080 ## $t8 = 00000080 -/* 001D8 8087DC18 AC980004 */ sw $t8, 0x0004($a0) ## 00000004 -/* 001DC 8087DC1C 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 001E0 8087DC20 24A50810 */ addiu $a1, $a1, 0x0810 ## $a1 = 00000810 -/* 001E4 8087DC24 0C00FAFE */ jal func_8003EBF8 -/* 001E8 8087DC28 8CE6014C */ lw $a2, 0x014C($a3) ## 0000014C -/* 001EC 8087DC2C 10000009 */ beq $zero, $zero, .L8087DC54 -/* 001F0 8087DC30 8FBF001C */ lw $ra, 0x001C($sp) -.L8087DC34: -/* 001F4 8087DC34 8CF90004 */ lw $t9, 0x0004($a3) ## 00000004 -/* 001F8 8087DC38 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 001FC 8087DC3C 26050810 */ addiu $a1, $s0, 0x0810 ## $a1 = 00000810 -/* 00200 8087DC40 03214024 */ and $t0, $t9, $at -/* 00204 8087DC44 ACE80004 */ sw $t0, 0x0004($a3) ## 00000004 -/* 00208 8087DC48 0C00FB14 */ jal func_8003EC50 -/* 0020C 8087DC4C 8CE6014C */ lw $a2, 0x014C($a3) ## 0000014C -/* 00210 8087DC50 8FBF001C */ lw $ra, 0x001C($sp) -.L8087DC54: -/* 00214 8087DC54 8FB00018 */ lw $s0, 0x0018($sp) -/* 00218 8087DC58 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 0021C 8087DC5C 03E00008 */ jr $ra -/* 00220 8087DC60 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Megane/func_8087DC64.s b/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Megane/func_8087DC64.s deleted file mode 100644 index 3f17a97c65..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Megane/func_8087DC64.s +++ /dev/null @@ -1,6 +0,0 @@ -glabel func_8087DC64 -/* 00224 8087DC64 AFA40000 */ sw $a0, 0x0000($sp) -/* 00228 8087DC68 03E00008 */ jr $ra -/* 0022C 8087DC6C AFA50004 */ sw $a1, 0x0004($sp) - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Megane/func_8087DC94.s b/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Megane/func_8087DC94.s deleted file mode 100644 index 3f612a4b87..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Megane/func_8087DC94.s +++ /dev/null @@ -1,47 +0,0 @@ -glabel func_8087DC94 -/* 00254 8087DC94 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00258 8087DC98 AFBF0014 */ sw $ra, 0x0014($sp) -/* 0025C 8087DC9C AFA5001C */ sw $a1, 0x001C($sp) -/* 00260 8087DCA0 8C8E0004 */ lw $t6, 0x0004($a0) ## 00000004 -/* 00264 8087DCA4 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 -/* 00268 8087DCA8 24010080 */ addiu $at, $zero, 0x0080 ## $at = 00000080 -/* 0026C 8087DCAC 31CF0080 */ andi $t7, $t6, 0x0080 ## $t7 = 00000000 -/* 00270 8087DCB0 15E1000B */ bne $t7, $at, .L8087DCE0 -/* 00274 8087DCB4 8FA4001C */ lw $a0, 0x001C($sp) -/* 00278 8087DCB8 84D8001C */ lh $t8, 0x001C($a2) ## 0000001C -/* 0027C 8087DCBC 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 00280 8087DCC0 3C058088 */ lui $a1, %hi(D_8087DD88) ## $a1 = 80880000 -/* 00284 8087DCC4 0018C880 */ sll $t9, $t8, 2 -/* 00288 8087DCC8 00B92821 */ addu $a1, $a1, $t9 -/* 0028C 8087DCCC 8CA5DD88 */ lw $a1, %lo(D_8087DD88)($a1) -/* 00290 8087DCD0 0C00D4C9 */ jal Draw_DListXlu - -/* 00294 8087DCD4 AFA60018 */ sw $a2, 0x0018($sp) -/* 00298 8087DCD8 10000009 */ beq $zero, $zero, .L8087DD00 -/* 0029C 8087DCDC 8FAA0018 */ lw $t2, 0x0018($sp) -.L8087DCE0: -/* 002A0 8087DCE0 84C8001C */ lh $t0, 0x001C($a2) ## 0000001C -/* 002A4 8087DCE4 3C058088 */ lui $a1, %hi(D_8087DD88) ## $a1 = 80880000 -/* 002A8 8087DCE8 AFA60018 */ sw $a2, 0x0018($sp) -/* 002AC 8087DCEC 00084880 */ sll $t1, $t0, 2 -/* 002B0 8087DCF0 00A92821 */ addu $a1, $a1, $t1 -/* 002B4 8087DCF4 0C00D498 */ jal Draw_DListOpa - -/* 002B8 8087DCF8 8CA5DD88 */ lw $a1, %lo(D_8087DD88)($a1) -/* 002BC 8087DCFC 8FAA0018 */ lw $t2, 0x0018($sp) -.L8087DD00: -/* 002C0 8087DD00 8FA4001C */ lw $a0, 0x001C($sp) -/* 002C4 8087DD04 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 002C8 8087DD08 854B001C */ lh $t3, 0x001C($t2) ## 0000001C -/* 002CC 8087DD0C 55600004 */ bnel $t3, $zero, .L8087DD20 -/* 002D0 8087DD10 8FBF0014 */ lw $ra, 0x0014($sp) -/* 002D4 8087DD14 0C00D4C9 */ jal Draw_DListXlu - -/* 002D8 8087DD18 24A51250 */ addiu $a1, $a1, 0x1250 ## $a1 = 06001250 -/* 002DC 8087DD1C 8FBF0014 */ lw $ra, 0x0014($sp) -.L8087DD20: -/* 002E0 8087DD20 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 002E4 8087DD24 03E00008 */ jr $ra -/* 002E8 8087DD28 00000000 */ nop -/* 002EC 8087DD2C 00000000 */ nop - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Haka_MeganeBG/BgHakaMeganeBG_Draw.s b/asm/non_matchings/overlays/actors/ovl_Bg_Haka_MeganeBG/BgHakaMeganeBG_Draw.s index 84830587f1..4a6121496a 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Haka_MeganeBG/BgHakaMeganeBG_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Haka_MeganeBG/BgHakaMeganeBG_Draw.s @@ -8,7 +8,7 @@ glabel BgHakaMeganeBG_Draw /* 00564 8087E394 00027080 */ sll $t6, $v0, 2 /* 00568 8087E398 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 /* 0056C 8087E39C 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 -/* 00570 8087E3A0 0C00D4C9 */ jal Draw_DListXlu +/* 00570 8087E3A0 0C00D4C9 */ jal Gfx_DrawDListXlu /* 00574 8087E3A4 24A58EB0 */ addiu $a1, $a1, 0x8EB0 ## $a1 = 06008EB0 /* 00578 8087E3A8 10000006 */ beq $zero, $zero, .L8087E3C4 @@ -16,7 +16,7 @@ glabel BgHakaMeganeBG_Draw .L8087E3B0: /* 00580 8087E3B0 3C058088 */ lui $a1, %hi(D_8087E410) ## $a1 = 80880000 /* 00584 8087E3B4 00AE2821 */ addu $a1, $a1, $t6 -/* 00588 8087E3B8 0C00D498 */ jal Draw_DListOpa +/* 00588 8087E3B8 0C00D498 */ jal Gfx_DrawDListOpa /* 0058C 8087E3BC 8CA5E410 */ lw $a1, %lo(D_8087E410)($a1) /* 00590 8087E3C0 8FBF0014 */ lw $ra, 0x0014($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Sgami/func_8087EDC0.s b/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Sgami/func_8087EDC0.s index 02f58ad14b..9c99f42c26 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Sgami/func_8087EDC0.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Sgami/func_8087EDC0.s @@ -7,7 +7,7 @@ glabel func_8087EDC0 /* 008F4 8087EDD4 848F001C */ lh $t7, 0x001C($a0) ## 0000001C /* 008F8 8087EDD8 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 /* 008FC 8087EDDC 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 -/* 00900 8087EDE0 0C00D4C9 */ jal Draw_DListXlu +/* 00900 8087EDE0 0C00D4C9 */ jal Gfx_DrawDListXlu /* 00904 8087EDE4 24A5BF20 */ addiu $a1, $a1, 0xBF20 ## $a1 = 0600BF20 /* 00908 8087EDE8 1000000F */ beq $zero, $zero, .L8087EE28 @@ -20,13 +20,13 @@ glabel func_8087EDC0 /* 00920 8087EE00 00000000 */ nop /* 00924 8087EE04 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 /* 00928 8087EE08 24A5BF20 */ addiu $a1, $a1, 0xBF20 ## $a1 = 0600BF20 -/* 0092C 8087EE0C 0C00D498 */ jal Draw_DListOpa +/* 0092C 8087EE0C 0C00D498 */ jal Gfx_DrawDListOpa /* 00930 8087EE10 00C02025 */ or $a0, $a2, $zero ## $a0 = 00000000 /* 00934 8087EE14 10000004 */ beq $zero, $zero, .L8087EE28 /* 00938 8087EE18 8FBF0014 */ lw $ra, 0x0014($sp) .L8087EE1C: -/* 0093C 8087EE1C 0C00D498 */ jal Draw_DListOpa +/* 0093C 8087EE1C 0C00D498 */ jal Gfx_DrawDListOpa /* 00940 8087EE20 24A521F0 */ addiu $a1, $a1, 0x21F0 ## $a1 = 000021F0 /* 00944 8087EE24 8FBF0014 */ lw $ra, 0x0014($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Ship/BgHakaShip_Draw.s b/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Ship/BgHakaShip_Draw.s index b5e2f545ea..ca12bdf7d5 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Ship/BgHakaShip_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Ship/BgHakaShip_Draw.s @@ -9,7 +9,7 @@ glabel BgHakaShip_Draw /* 006D0 8087F7D0 24C6FAF8 */ addiu $a2, $a2, %lo(D_8087FAF8) ## $a2 = 8087FAF8 /* 006D4 8087F7D4 27A4005C */ addiu $a0, $sp, 0x005C ## $a0 = FFFFFFE4 /* 006D8 8087F7D8 24070210 */ addiu $a3, $zero, 0x0210 ## $a3 = 00000210 -/* 006DC 8087F7DC 0C031AB1 */ jal func_800C6AC4 +/* 006DC 8087F7DC 0C031AB1 */ jal Graph_OpenDisps /* 006E0 8087F7E0 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 /* 006E4 8087F7E4 8FAF007C */ lw $t7, 0x007C($sp) /* 006E8 8087F7E8 0C024F46 */ jal func_80093D18 @@ -148,7 +148,7 @@ glabel BgHakaShip_Draw /* 008F4 8087F9F4 24C6FB5C */ addiu $a2, $a2, %lo(D_8087FB5C) ## $a2 = 8087FB5C /* 008F8 8087F9F8 27A4005C */ addiu $a0, $sp, 0x005C ## $a0 = FFFFFFE4 /* 008FC 8087F9FC 24070238 */ addiu $a3, $zero, 0x0238 ## $a3 = 00000238 -/* 00900 8087FA00 0C031AD5 */ jal func_800C6B54 +/* 00900 8087FA00 0C031AD5 */ jal Graph_CloseDisps /* 00904 8087FA04 8DA50000 */ lw $a1, 0x0000($t5) ## 00000000 /* 00908 8087FA08 8FA30078 */ lw $v1, 0x0078($sp) /* 0090C 8087FA0C 3C0E8088 */ lui $t6, %hi(func_8087F364) ## $t6 = 80880000 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Trap/BgHakaTrap_Draw.s b/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Trap/BgHakaTrap_Draw.s index c26a2783a9..0f8dee9cd5 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Trap/BgHakaTrap_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Trap/BgHakaTrap_Draw.s @@ -24,7 +24,7 @@ glabel BgHakaTrap_Draw /* 011B8 80880E58 8FA40044 */ lw $a0, 0x0044($sp) /* 011BC 80880E5C 0018C880 */ sll $t9, $t8, 2 /* 011C0 80880E60 00B92821 */ addu $a1, $a1, $t9 -/* 011C4 80880E64 0C00D498 */ jal Draw_DListOpa +/* 011C4 80880E64 0C00D498 */ jal Gfx_DrawDListOpa /* 011C8 80880E68 8CA51028 */ lw $a1, %lo(D_80881028)($a1) /* 011CC 80880E6C 8E020164 */ lw $v0, 0x0164($s0) ## 00000164 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Tubo/BgHakaTubo_Draw.s b/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Tubo/BgHakaTubo_Draw.s index 94b5d53645..cb0c09aa18 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Tubo/BgHakaTubo_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Tubo/BgHakaTubo_Draw.s @@ -5,7 +5,7 @@ glabel BgHakaTubo_Draw /* 008B8 80881B08 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 /* 008BC 80881B0C AFBF0014 */ sw $ra, 0x0014($sp) /* 008C0 80881B10 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 -/* 008C4 80881B14 0C00D498 */ jal Draw_DListOpa +/* 008C4 80881B14 0C00D498 */ jal Gfx_DrawDListOpa /* 008C8 80881B18 24A5FE40 */ addiu $a1, $a1, 0xFE40 ## $a1 = 0600FE40 /* 008CC 80881B1C 8FA40018 */ lw $a0, 0x0018($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Tubo/func_80881904.s b/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Tubo/func_80881904.s index d23e408a85..6a788a4fec 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Tubo/func_80881904.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Tubo/func_80881904.s @@ -9,7 +9,7 @@ glabel func_80881904 /* 006D0 80881920 24C61BD0 */ addiu $a2, $a2, %lo(D_80881BD0) ## $a2 = 80881BD0 /* 006D4 80881924 27A40058 */ addiu $a0, $sp, 0x0058 ## $a0 = FFFFFFE8 /* 006D8 80881928 240701DC */ addiu $a3, $zero, 0x01DC ## $a3 = 000001DC -/* 006DC 8088192C 0C031AB1 */ jal func_800C6AC4 +/* 006DC 8088192C 0C031AB1 */ jal Graph_OpenDisps /* 006E0 80881930 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 /* 006E4 80881934 8FAF0074 */ lw $t7, 0x0074($sp) /* 006E8 80881938 0C024F61 */ jal func_80093D84 @@ -86,7 +86,7 @@ glabel func_80881904 /* 00804 80881A54 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 00808 80881A58 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 /* 0080C 80881A5C AFA2004C */ sw $v0, 0x004C($sp) -/* 00810 80881A60 0C0253D0 */ jal Draw_TwoTexScroll +/* 00810 80881A60 0C0253D0 */ jal Gfx_TwoTexScroll /* 00814 80881A64 3066007F */ andi $a2, $v1, 0x007F ## $a2 = 00000000 /* 00818 80881A68 8FA8004C */ lw $t0, 0x004C($sp) /* 0081C 80881A6C 3C09DA38 */ lui $t1, 0xDA38 ## $t1 = DA380000 @@ -118,7 +118,7 @@ glabel func_80881904 /* 00884 80881AD4 24C61BF8 */ addiu $a2, $a2, %lo(D_80881BF8) ## $a2 = 80881BF8 /* 00888 80881AD8 27A40058 */ addiu $a0, $sp, 0x0058 ## $a0 = FFFFFFE8 /* 0088C 80881ADC 240701F5 */ addiu $a3, $zero, 0x01F5 ## $a3 = 000001F5 -/* 00890 80881AE0 0C031AD5 */ jal func_800C6B54 +/* 00890 80881AE0 0C031AD5 */ jal Graph_CloseDisps /* 00894 80881AE4 8DC50000 */ lw $a1, 0x0000($t6) ## 00000000 /* 00898 80881AE8 8FBF003C */ lw $ra, 0x003C($sp) /* 0089C 80881AEC 8FB00038 */ lw $s0, 0x0038($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Water/BgHakaWater_Draw.s b/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Water/BgHakaWater_Draw.s index 2d4cc99ce3..80c92e3d8b 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Water/BgHakaWater_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Water/BgHakaWater_Draw.s @@ -9,7 +9,7 @@ glabel BgHakaWater_Draw /* 003E0 808820E0 24C624C0 */ addiu $a2, $a2, %lo(D_808824C0) ## $a2 = 808824C0 /* 003E4 808820E4 27A4006C */ addiu $a0, $sp, 0x006C ## $a0 = FFFFFFDC /* 003E8 808820E8 2407011F */ addiu $a3, $zero, 0x011F ## $a3 = 0000011F -/* 003EC 808820EC 0C031AB1 */ jal func_800C6AC4 +/* 003EC 808820EC 0C031AB1 */ jal Graph_OpenDisps /* 003F0 808820F0 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 /* 003F4 808820F4 8FAF0094 */ lw $t7, 0x0094($sp) /* 003F8 808820F8 0C024F61 */ jal func_80093D84 @@ -108,7 +108,7 @@ glabel BgHakaWater_Draw /* 00558 80882258 E7A00084 */ swc1 $f0, 0x0084($sp) /* 0055C 8088225C AFA0001C */ sw $zero, 0x001C($sp) /* 00560 80882260 AFAA0010 */ sw $t2, 0x0010($sp) -/* 00564 80882264 0C0253D0 */ jal Draw_TwoTexScroll +/* 00564 80882264 0C0253D0 */ jal Gfx_TwoTexScroll /* 00568 80882268 AFA20064 */ sw $v0, 0x0064($sp) /* 0056C 8088226C 8FA80064 */ lw $t0, 0x0064($sp) /* 00570 80882270 C7A00084 */ lwc1 $f0, 0x0084($sp) @@ -244,7 +244,7 @@ glabel BgHakaWater_Draw /* 00768 80882468 24C62508 */ addiu $a2, $a2, %lo(D_80882508) ## $a2 = 80882508 /* 0076C 8088246C 27A4006C */ addiu $a0, $sp, 0x006C ## $a0 = FFFFFFDC /* 00770 80882470 2407014C */ addiu $a3, $zero, 0x014C ## $a3 = 0000014C -/* 00774 80882474 0C031AD5 */ jal func_800C6B54 +/* 00774 80882474 0C031AD5 */ jal Graph_CloseDisps /* 00778 80882478 8DC50000 */ lw $a1, 0x0000($t6) ## 00000000 /* 0077C 8088247C 8FBF003C */ lw $ra, 0x003C($sp) /* 00780 80882480 8FB00038 */ lw $s0, 0x0038($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Zou/func_808835B8.s b/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Zou/func_808835B8.s index ef64230ad0..65ca9ffaff 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Zou/func_808835B8.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Haka_Zou/func_808835B8.s @@ -7,7 +7,7 @@ glabel func_808835B8 /* 0100C 808835CC 3C058088 */ lui $a1, %hi(D_80883650) ## $a1 = 80880000 /* 01010 808835D0 000E7880 */ sll $t7, $t6, 2 /* 01014 808835D4 00AF2821 */ addu $a1, $a1, $t7 -/* 01018 808835D8 0C00D498 */ jal Draw_DListOpa +/* 01018 808835D8 0C00D498 */ jal Gfx_DrawDListOpa /* 0101C 808835DC 8CA53650 */ lw $a1, %lo(D_80883650)($a1) /* 01020 808835E0 8FBF0014 */ lw $ra, 0x0014($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Heavy_Block/BgHeavyBlock_Draw.s b/asm/non_matchings/overlays/actors/ovl_Bg_Heavy_Block/BgHeavyBlock_Draw.s index 00718d6b40..01fe60ac15 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Heavy_Block/BgHeavyBlock_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Heavy_Block/BgHeavyBlock_Draw.s @@ -11,7 +11,7 @@ glabel BgHeavyBlock_Draw /* 014A0 80884C30 27A40030 */ addiu $a0, $sp, 0x0030 ## $a0 = FFFFFFE0 /* 014A4 80884C34 24070388 */ addiu $a3, $zero, 0x0388 ## $a3 = 00000388 /* 014A8 80884C38 AFA20044 */ sw $v0, 0x0044($sp) -/* 014AC 80884C3C 0C031AB1 */ jal func_800C6AC4 +/* 014AC 80884C3C 0C031AB1 */ jal Graph_OpenDisps /* 014B0 80884C40 AFA50040 */ sw $a1, 0x0040($sp) /* 014B4 80884C44 8E030174 */ lw $v1, 0x0174($s0) ## 00000174 /* 014B8 80884C48 3C0F8088 */ lui $t7, %hi(func_808844D0) ## $t7 = 80880000 @@ -100,7 +100,7 @@ glabel BgHeavyBlock_Draw /* 015FC 80884D8C 24C64F90 */ addiu $a2, $a2, %lo(D_80884F90) ## $a2 = 80884F90 /* 01600 80884D90 27A40030 */ addiu $a0, $sp, 0x0030 ## $a0 = FFFFFFE0 /* 01604 80884D94 240703A7 */ addiu $a3, $zero, 0x03A7 ## $a3 = 000003A7 -/* 01608 80884D98 0C031AD5 */ jal func_800C6B54 +/* 01608 80884D98 0C031AD5 */ jal Graph_CloseDisps /* 0160C 80884D9C 8DE50000 */ lw $a1, 0x0000($t7) ## 00000000 /* 01610 80884DA0 8FBF001C */ lw $ra, 0x001C($sp) /* 01614 80884DA4 8FB00018 */ lw $s0, 0x0018($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Heavy_Block/func_808843B0.s b/asm/non_matchings/overlays/actors/ovl_Bg_Heavy_Block/func_808843B0.s index f5db0e74d5..84a7fc1e8f 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Heavy_Block/func_808843B0.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Heavy_Block/func_808843B0.s @@ -48,12 +48,12 @@ glabel func_808843B0 /* 00CC8 80884458 24050003 */ addiu $a1, $zero, 0x0003 ## $a1 = 00000003 /* 00CCC 8088445C 000E7880 */ sll $t7, $t6, 2 /* 00CD0 80884460 020FC021 */ addu $t8, $s0, $t7 -/* 00CD4 80884464 0C024BE2 */ jal func_80092F88 +/* 00CD4 80884464 0C024BE2 */ jal Quake_Add /* 00CD8 80884468 8F040790 */ lw $a0, 0x0790($t8) ## 00000790 /* 00CDC 8088446C 00022400 */ sll $a0, $v0, 16 /* 00CE0 80884470 AFA2002C */ sw $v0, 0x002C($sp) /* 00CE4 80884474 00042403 */ sra $a0, $a0, 16 -/* 00CE8 80884478 0C024B6B */ jal func_80092DAC +/* 00CE8 80884478 0C024B6B */ jal Quake_SetSpeed /* 00CEC 8088447C 240561A8 */ addiu $a1, $zero, 0x61A8 ## $a1 = 000061A8 /* 00CF0 80884480 87B0002E */ lh $s0, 0x002E($sp) /* 00CF4 80884484 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 @@ -61,11 +61,11 @@ glabel func_808843B0 /* 00CFC 8088448C 00102400 */ sll $a0, $s0, 16 /* 00D00 80884490 00042403 */ sra $a0, $a0, 16 /* 00D04 80884494 24070005 */ addiu $a3, $zero, 0x0005 ## $a3 = 00000005 -/* 00D08 80884498 0C024B9C */ jal func_80092E70 +/* 00D08 80884498 0C024B9C */ jal Quake_SetQuakeValues /* 00D0C 8088449C AFA00010 */ sw $zero, 0x0010($sp) /* 00D10 808844A0 00102400 */ sll $a0, $s0, 16 /* 00D14 808844A4 00042403 */ sra $a0, $a0, 16 -/* 00D18 808844A8 0C024B7C */ jal func_80092DF0 +/* 00D18 808844A8 0C024B7C */ jal Quake_SetCountdown /* 00D1C 808844AC 2405000A */ addiu $a1, $zero, 0x000A ## $a1 = 0000000A /* 00D20 808844B0 3C198088 */ lui $t9, %hi(func_808844D0) ## $t9 = 80880000 /* 00D24 808844B4 273944D0 */ addiu $t9, $t9, %lo(func_808844D0) ## $t9 = 808844D0 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Heavy_Block/func_80884658.s b/asm/non_matchings/overlays/actors/ovl_Bg_Heavy_Block/func_80884658.s index 34288e0a66..a3c00594fe 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Heavy_Block/func_80884658.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Heavy_Block/func_80884658.s @@ -62,43 +62,43 @@ glabel func_80884658 /* 00FA8 80884738 24050003 */ addiu $a1, $zero, 0x0003 ## $a1 = 00000003 /* 00FAC 8088473C 000FC080 */ sll $t8, $t7, 2 /* 00FB0 80884740 0238C821 */ addu $t9, $s1, $t8 -/* 00FB4 80884744 0C024BE2 */ jal func_80092F88 +/* 00FB4 80884744 0C024BE2 */ jal Quake_Add /* 00FB8 80884748 8F240790 */ lw $a0, 0x0790($t9) ## 00000790 /* 00FBC 8088474C 00022400 */ sll $a0, $v0, 16 /* 00FC0 80884750 AFA20040 */ sw $v0, 0x0040($sp) /* 00FC4 80884754 00042403 */ sra $a0, $a0, 16 -/* 00FC8 80884758 0C024B6B */ jal func_80092DAC +/* 00FC8 80884758 0C024B6B */ jal Quake_SetSpeed /* 00FCC 8088475C 24056D60 */ addiu $a1, $zero, 0x6D60 ## $a1 = 00006D60 /* 00FD0 80884760 87A40042 */ lh $a0, 0x0042($sp) /* 00FD4 80884764 2405000E */ addiu $a1, $zero, 0x000E ## $a1 = 0000000E /* 00FD8 80884768 24060002 */ addiu $a2, $zero, 0x0002 ## $a2 = 00000002 /* 00FDC 8088476C 24070064 */ addiu $a3, $zero, 0x0064 ## $a3 = 00000064 /* 00FE0 80884770 AFA00010 */ sw $zero, 0x0010($sp) -/* 00FE4 80884774 0C024B9C */ jal func_80092E70 +/* 00FE4 80884774 0C024B9C */ jal Quake_SetQuakeValues /* 00FE8 80884778 AFA40028 */ sw $a0, 0x0028($sp) /* 00FEC 8088477C 8FA40028 */ lw $a0, 0x0028($sp) -/* 00FF0 80884780 0C024B7C */ jal func_80092DF0 +/* 00FF0 80884780 0C024B7C */ jal Quake_SetCountdown /* 00FF4 80884784 2405001E */ addiu $a1, $zero, 0x001E ## $a1 = 0000001E /* 00FF8 80884788 862807A0 */ lh $t0, 0x07A0($s1) ## 000007A0 /* 00FFC 8088478C 24050002 */ addiu $a1, $zero, 0x0002 ## $a1 = 00000002 /* 01000 80884790 00084880 */ sll $t1, $t0, 2 /* 01004 80884794 02295021 */ addu $t2, $s1, $t1 -/* 01008 80884798 0C024BE2 */ jal func_80092F88 +/* 01008 80884798 0C024BE2 */ jal Quake_Add /* 0100C 8088479C 8D440790 */ lw $a0, 0x0790($t2) ## 00000790 /* 01010 808847A0 00022400 */ sll $a0, $v0, 16 /* 01014 808847A4 AFA20040 */ sw $v0, 0x0040($sp) /* 01018 808847A8 00042403 */ sra $a0, $a0, 16 -/* 0101C 808847AC 0C024B6B */ jal func_80092DAC +/* 0101C 808847AC 0C024B6B */ jal Quake_SetSpeed /* 01020 808847B0 24052EE0 */ addiu $a1, $zero, 0x2EE0 ## $a1 = 00002EE0 /* 01024 808847B4 87A40042 */ lh $a0, 0x0042($sp) /* 01028 808847B8 24050005 */ addiu $a1, $zero, 0x0005 ## $a1 = 00000005 /* 0102C 808847BC 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 /* 01030 808847C0 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 /* 01034 808847C4 AFA00010 */ sw $zero, 0x0010($sp) -/* 01038 808847C8 0C024B9C */ jal func_80092E70 +/* 01038 808847C8 0C024B9C */ jal Quake_SetQuakeValues /* 0103C 808847CC AFA40028 */ sw $a0, 0x0028($sp) /* 01040 808847D0 8FA40028 */ lw $a0, 0x0028($sp) -/* 01044 808847D4 0C024B7C */ jal func_80092DF0 +/* 01044 808847D4 0C024B7C */ jal Quake_SetCountdown /* 01048 808847D8 240503E7 */ addiu $a1, $zero, 0x03E7 ## $a1 = 000003E7 /* 0104C 808847DC 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 01050 808847E0 26050024 */ addiu $a1, $s0, 0x0024 ## $a1 = 00000024 @@ -116,22 +116,22 @@ glabel func_80884658 /* 01074 80884804 24050003 */ addiu $a1, $zero, 0x0003 ## $a1 = 00000003 /* 01078 80884808 000B6080 */ sll $t4, $t3, 2 /* 0107C 8088480C 022C6821 */ addu $t5, $s1, $t4 -/* 01080 80884810 0C024BE2 */ jal func_80092F88 +/* 01080 80884810 0C024BE2 */ jal Quake_Add /* 01084 80884814 8DA40790 */ lw $a0, 0x0790($t5) ## 00000790 /* 01088 80884818 00022400 */ sll $a0, $v0, 16 /* 0108C 8088481C AFA20040 */ sw $v0, 0x0040($sp) /* 01090 80884820 00042403 */ sra $a0, $a0, 16 -/* 01094 80884824 0C024B6B */ jal func_80092DAC +/* 01094 80884824 0C024B6B */ jal Quake_SetSpeed /* 01098 80884828 24056D60 */ addiu $a1, $zero, 0x6D60 ## $a1 = 00006D60 /* 0109C 8088482C 87A40042 */ lh $a0, 0x0042($sp) /* 010A0 80884830 24050010 */ addiu $a1, $zero, 0x0010 ## $a1 = 00000010 /* 010A4 80884834 24060002 */ addiu $a2, $zero, 0x0002 ## $a2 = 00000002 /* 010A8 80884838 24070078 */ addiu $a3, $zero, 0x0078 ## $a3 = 00000078 /* 010AC 8088483C AFA00010 */ sw $zero, 0x0010($sp) -/* 010B0 80884840 0C024B9C */ jal func_80092E70 +/* 010B0 80884840 0C024B9C */ jal Quake_SetQuakeValues /* 010B4 80884844 AFA40028 */ sw $a0, 0x0028($sp) /* 010B8 80884848 8FA40028 */ lw $a0, 0x0028($sp) -/* 010BC 8088484C 0C024B7C */ jal func_80092DF0 +/* 010BC 8088484C 0C024B7C */ jal Quake_SetCountdown /* 010C0 80884850 24050028 */ addiu $a1, $zero, 0x0028 ## $a1 = 00000028 /* 010C4 80884854 8605001C */ lh $a1, 0x001C($s0) ## 0000001C /* 010C8 80884858 3C0E8088 */ lui $t6, %hi(func_80884978) ## $t6 = 80880000 @@ -152,22 +152,22 @@ glabel func_80884658 /* 010F8 80884888 24050003 */ addiu $a1, $zero, 0x0003 ## $a1 = 00000003 /* 010FC 8088488C 000FC080 */ sll $t8, $t7, 2 /* 01100 80884890 0238C821 */ addu $t9, $s1, $t8 -/* 01104 80884894 0C024BE2 */ jal func_80092F88 +/* 01104 80884894 0C024BE2 */ jal Quake_Add /* 01108 80884898 8F240790 */ lw $a0, 0x0790($t9) ## 00000790 /* 0110C 8088489C 00022400 */ sll $a0, $v0, 16 /* 01110 808848A0 AFA20040 */ sw $v0, 0x0040($sp) /* 01114 808848A4 00042403 */ sra $a0, $a0, 16 -/* 01118 808848A8 0C024B6B */ jal func_80092DAC +/* 01118 808848A8 0C024B6B */ jal Quake_SetSpeed /* 0111C 808848AC 24056D60 */ addiu $a1, $zero, 0x6D60 ## $a1 = 00006D60 /* 01120 808848B0 87A40042 */ lh $a0, 0x0042($sp) /* 01124 808848B4 2405000E */ addiu $a1, $zero, 0x000E ## $a1 = 0000000E /* 01128 808848B8 24060002 */ addiu $a2, $zero, 0x0002 ## $a2 = 00000002 /* 0112C 808848BC 24070064 */ addiu $a3, $zero, 0x0064 ## $a3 = 00000064 /* 01130 808848C0 AFA00010 */ sw $zero, 0x0010($sp) -/* 01134 808848C4 0C024B9C */ jal func_80092E70 +/* 01134 808848C4 0C024B9C */ jal Quake_SetQuakeValues /* 01138 808848C8 AFA40028 */ sw $a0, 0x0028($sp) /* 0113C 808848CC 8FA40028 */ lw $a0, 0x0028($sp) -/* 01140 808848D0 0C024B7C */ jal func_80092DF0 +/* 01140 808848D0 0C024B7C */ jal Quake_SetCountdown /* 01144 808848D4 24050028 */ addiu $a1, $zero, 0x0028 ## $a1 = 00000028 /* 01148 808848D8 3C088088 */ lui $t0, %hi(func_80884978) ## $t0 = 80880000 /* 0114C 808848DC 25084978 */ addiu $t0, $t0, %lo(func_80884978) ## $t0 = 80884978 @@ -178,22 +178,22 @@ glabel func_80884658 /* 0115C 808848EC 24050003 */ addiu $a1, $zero, 0x0003 ## $a1 = 00000003 /* 01160 808848F0 00095080 */ sll $t2, $t1, 2 /* 01164 808848F4 022A5821 */ addu $t3, $s1, $t2 -/* 01168 808848F8 0C024BE2 */ jal func_80092F88 +/* 01168 808848F8 0C024BE2 */ jal Quake_Add /* 0116C 808848FC 8D640790 */ lw $a0, 0x0790($t3) ## 00000790 /* 01170 80884900 00022400 */ sll $a0, $v0, 16 /* 01174 80884904 AFA20040 */ sw $v0, 0x0040($sp) /* 01178 80884908 00042403 */ sra $a0, $a0, 16 -/* 0117C 8088490C 0C024B6B */ jal func_80092DAC +/* 0117C 8088490C 0C024B6B */ jal Quake_SetSpeed /* 01180 80884910 24056D60 */ addiu $a1, $zero, 0x6D60 ## $a1 = 00006D60 /* 01184 80884914 87A40042 */ lh $a0, 0x0042($sp) /* 01188 80884918 2405000E */ addiu $a1, $zero, 0x000E ## $a1 = 0000000E /* 0118C 8088491C 24060002 */ addiu $a2, $zero, 0x0002 ## $a2 = 00000002 /* 01190 80884920 24070064 */ addiu $a3, $zero, 0x0064 ## $a3 = 00000064 /* 01194 80884924 AFA00010 */ sw $zero, 0x0010($sp) -/* 01198 80884928 0C024B9C */ jal func_80092E70 +/* 01198 80884928 0C024B9C */ jal Quake_SetQuakeValues /* 0119C 8088492C AFA40028 */ sw $a0, 0x0028($sp) /* 011A0 80884930 8FA40028 */ lw $a0, 0x0028($sp) -/* 011A4 80884934 0C024B7C */ jal func_80092DF0 +/* 011A4 80884934 0C024B7C */ jal Quake_SetCountdown /* 011A8 80884938 24050028 */ addiu $a1, $zero, 0x0028 ## $a1 = 00000028 /* 011AC 8088493C 3C0C8088 */ lui $t4, %hi(func_80884978) ## $t4 = 80880000 /* 011B0 80884940 258C4978 */ addiu $t4, $t4, %lo(func_80884978) ## $t4 = 80884978 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Heavy_Block/func_80884DB4.s b/asm/non_matchings/overlays/actors/ovl_Bg_Heavy_Block/func_80884DB4.s index 2946e25cc8..4cf3626390 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Heavy_Block/func_80884DB4.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Heavy_Block/func_80884DB4.s @@ -21,7 +21,7 @@ glabel func_80884DB4 /* 0166C 80884DFC 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 /* 01670 80884E00 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 01674 80884E04 24A518A0 */ addiu $a1, $a1, 0x18A0 ## $a1 = 060018A0 -/* 01678 80884E08 0C00D498 */ jal Draw_DListOpa +/* 01678 80884E08 0C00D498 */ jal Gfx_DrawDListOpa /* 0167C 80884E0C 8FA4001C */ lw $a0, 0x001C($sp) /* 01680 80884E10 1000000C */ beq $zero, $zero, .L80884E44 @@ -35,7 +35,7 @@ glabel func_80884DB4 /* 0169C 80884E2C 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 /* 016A0 80884E30 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 016A4 80884E34 24A51A30 */ addiu $a1, $a1, 0x1A30 ## $a1 = 06001A30 -/* 016A8 80884E38 0C00D498 */ jal Draw_DListOpa +/* 016A8 80884E38 0C00D498 */ jal Gfx_DrawDListOpa /* 016AC 80884E3C 8FA4001C */ lw $a0, 0x001C($sp) /* 016B0 80884E40 8FBF0014 */ lw $ra, 0x0014($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Curtain/BgHidanCurtain_Draw.s b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Curtain/BgHidanCurtain_Draw.s index 5d28a23795..2c752f7744 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Curtain/BgHidanCurtain_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Curtain/BgHidanCurtain_Draw.s @@ -10,7 +10,7 @@ glabel BgHidanCurtain_Draw /* 0086C 80885A0C 24C65CCC */ addiu $a2, $a2, %lo(D_80885CCC) ## $a2 = 80885CCC /* 00870 80885A10 27A40058 */ addiu $a0, $sp, 0x0058 ## $a0 = FFFFFFE8 /* 00874 80885A14 240702AD */ addiu $a3, $zero, 0x02AD ## $a3 = 000002AD -/* 00878 80885A18 0C031AB1 */ jal func_800C6AC4 +/* 00878 80885A18 0C031AB1 */ jal Graph_OpenDisps /* 0087C 80885A1C 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 /* 00880 80885A20 0C024F61 */ jal func_80093D84 /* 00884 80885A24 8E240000 */ lw $a0, 0x0000($s1) ## 00000000 @@ -59,7 +59,7 @@ glabel BgHidanCurtain_Draw /* 00930 80885AD0 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 00934 80885AD4 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 /* 00938 80885AD8 AFA2004C */ sw $v0, 0x004C($sp) -/* 0093C 80885ADC 0C0253D0 */ jal Draw_TwoTexScroll +/* 0093C 80885ADC 0C0253D0 */ jal Gfx_TwoTexScroll /* 00940 80885AE0 3066007F */ andi $a2, $v1, 0x007F ## $a2 = 00000000 /* 00944 80885AE4 8FA8004C */ lw $t0, 0x004C($sp) /* 00948 80885AE8 3C18DA38 */ lui $t8, 0xDA38 ## $t8 = DA380000 @@ -89,7 +89,7 @@ glabel BgHidanCurtain_Draw /* 009A8 80885B48 8E250000 */ lw $a1, 0x0000($s1) ## 00000000 /* 009AC 80885B4C 24C65CFC */ addiu $a2, $a2, %lo(D_80885CFC) ## $a2 = 80885CFC /* 009B0 80885B50 27A40058 */ addiu $a0, $sp, 0x0058 ## $a0 = FFFFFFE8 -/* 009B4 80885B54 0C031AD5 */ jal func_800C6B54 +/* 009B4 80885B54 0C031AD5 */ jal Graph_CloseDisps /* 009B8 80885B58 240702BE */ addiu $a3, $zero, 0x02BE ## $a3 = 000002BE /* 009BC 80885B5C 8FBF003C */ lw $ra, 0x003C($sp) /* 009C0 80885B60 8FB00034 */ lw $s0, 0x0034($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Dalm/BgHidanDalm_Draw.s b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Dalm/BgHidanDalm_Draw.s index 5b01f771ba..e704c14648 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Dalm/BgHidanDalm_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Dalm/BgHidanDalm_Draw.s @@ -9,7 +9,7 @@ glabel BgHidanDalm_Draw /* 00600 80886420 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 /* 00604 80886424 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 /* 00608 80886428 24A5BBF0 */ addiu $a1, $a1, 0xBBF0 ## $a1 = 0600BBF0 -/* 0060C 8088642C 0C00D498 */ jal Draw_DListOpa +/* 0060C 8088642C 0C00D498 */ jal Gfx_DrawDListOpa /* 00610 80886430 AFA60018 */ sw $a2, 0x0018($sp) /* 00614 80886434 10000006 */ beq $zero, $zero, .L80886450 @@ -17,7 +17,7 @@ glabel BgHidanDalm_Draw .L8088643C: /* 0061C 8088643C 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 /* 00620 80886440 24A5BDF0 */ addiu $a1, $a1, 0xBDF0 ## $a1 = 0600BDF0 -/* 00624 80886444 0C00D498 */ jal Draw_DListOpa +/* 00624 80886444 0C00D498 */ jal Gfx_DrawDListOpa /* 00628 80886448 AFA60018 */ sw $a2, 0x0018($sp) /* 0062C 8088644C 8FA60018 */ lw $a2, 0x0018($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Firewall/func_80886B34.s b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Firewall/func_80886B34.s index 985a78fed5..dc8dac4fe5 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Firewall/func_80886B34.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Firewall/func_80886B34.s @@ -9,10 +9,10 @@ glabel func_80886B34 /* 004F0 80886B50 24C66D30 */ addiu $a2, $a2, %lo(D_80886D30) ## $a2 = 80886D30 /* 004F4 80886B54 27A40038 */ addiu $a0, $sp, 0x0038 ## $a0 = FFFFFFE8 /* 004F8 80886B58 240701C0 */ addiu $a3, $zero, 0x01C0 ## $a3 = 000001C0 -/* 004FC 80886B5C 0C031AB1 */ jal func_800C6AC4 +/* 004FC 80886B5C 0C031AB1 */ jal Graph_OpenDisps /* 00500 80886B60 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 /* 00504 80886B64 8E0402D0 */ lw $a0, 0x02D0($s0) ## 000002D0 -/* 00508 80886B68 0C024DDD */ jal func_80093774 +/* 00508 80886B68 0C024DDD */ jal Gfx_CallSetupDL /* 0050C 80886B6C 24050014 */ addiu $a1, $zero, 0x0014 ## $a1 = 00000014 /* 00510 80886B70 AE0202D0 */ sw $v0, 0x02D0($s0) ## 000002D0 /* 00514 80886B74 244F0008 */ addiu $t7, $v0, 0x0008 ## $t7 = 00000008 @@ -84,7 +84,7 @@ glabel func_80886B34 /* 0061C 80886C7C 24C66D68 */ addiu $a2, $a2, %lo(D_80886D68) ## $a2 = 80886D68 /* 00620 80886C80 27A40038 */ addiu $a0, $sp, 0x0038 ## $a0 = FFFFFFE8 /* 00624 80886C84 240701CF */ addiu $a3, $zero, 0x01CF ## $a3 = 000001CF -/* 00628 80886C88 0C031AD5 */ jal func_800C6B54 +/* 00628 80886C88 0C031AD5 */ jal Graph_CloseDisps /* 0062C 80886C8C 8D250000 */ lw $a1, 0x0000($t1) ## 00000000 /* 00630 80886C90 8FBF001C */ lw $ra, 0x001C($sp) /* 00634 80886C94 8FB00018 */ lw $s0, 0x0018($sp) 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 index 8c32c764f0..35df922959 100644 --- 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 @@ -10,7 +10,7 @@ glabel BgHidanFwbig_Draw /* 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 func_800C6AC4 +/* 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 @@ -148,7 +148,7 @@ glabel BgHidanFwbig_Draw /* 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 Draw_TwoTexScroll +/* 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 @@ -178,7 +178,7 @@ glabel BgHidanFwbig_Draw /* 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 func_800C6B54 +/* 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) diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Hamstep/BgHidanHamstep_Draw.s b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Hamstep/BgHidanHamstep_Draw.s index 548a5e6a01..c1a905b1b1 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Hamstep/BgHidanHamstep_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Hamstep/BgHidanHamstep_Draw.s @@ -9,7 +9,7 @@ glabel BgHidanHamstep_Draw /* 00C44 80888C84 24C68F84 */ addiu $a2, $a2, %lo(D_80888F84) ## $a2 = 80888F84 /* 00C48 80888C88 27A40034 */ addiu $a0, $sp, 0x0034 ## $a0 = FFFFFFEC /* 00C4C 80888C8C 2407030E */ addiu $a3, $zero, 0x030E ## $a3 = 0000030E -/* 00C50 80888C90 0C031AB1 */ jal func_800C6AC4 +/* 00C50 80888C90 0C031AB1 */ jal Graph_OpenDisps /* 00C54 80888C94 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 /* 00C58 80888C98 8FAF004C */ lw $t7, 0x004C($sp) /* 00C5C 80888C9C 0C024F46 */ jal func_80093D18 @@ -58,7 +58,7 @@ glabel BgHidanHamstep_Draw .L80888D44: /* 00D04 80888D44 8FA8004C */ lw $t0, 0x004C($sp) /* 00D08 80888D48 2407031C */ addiu $a3, $zero, 0x031C ## $a3 = 0000031C -/* 00D0C 80888D4C 0C031AD5 */ jal func_800C6B54 +/* 00D0C 80888D4C 0C031AD5 */ jal Graph_CloseDisps /* 00D10 80888D50 8D050000 */ lw $a1, 0x0000($t0) ## 00000000 /* 00D14 80888D54 8FBF001C */ lw $ra, 0x001C($sp) /* 00D18 80888D58 8FB00018 */ lw $s0, 0x0018($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Hamstep/func_80888860.s b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Hamstep/func_80888860.s index 2889fabf69..848498e992 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Hamstep/func_80888860.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Hamstep/func_80888860.s @@ -50,22 +50,22 @@ glabel func_80888860 /* 008D8 80888918 844807A0 */ lh $t0, 0x07A0($v0) ## 000007A0 /* 008DC 8088891C 00084880 */ sll $t1, $t0, 2 /* 008E0 80888920 00495021 */ addu $t2, $v0, $t1 -/* 008E4 80888924 0C024BE2 */ jal func_80092F88 +/* 008E4 80888924 0C024BE2 */ jal Quake_Add /* 008E8 80888928 8D440790 */ lw $a0, 0x0790($t2) ## 00000790 /* 008EC 8088892C 00022400 */ sll $a0, $v0, 16 /* 008F0 80888930 AFA2002C */ sw $v0, 0x002C($sp) /* 008F4 80888934 00042403 */ sra $a0, $a0, 16 -/* 008F8 80888938 0C024B6B */ jal func_80092DAC +/* 008F8 80888938 0C024B6B */ jal Quake_SetSpeed /* 008FC 8088893C 2405C350 */ addiu $a1, $zero, 0xC350 ## $a1 = FFFFC350 /* 00900 80888940 87A4002E */ lh $a0, 0x002E($sp) /* 00904 80888944 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 00908 80888948 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 /* 0090C 8088894C 240701F4 */ addiu $a3, $zero, 0x01F4 ## $a3 = 000001F4 /* 00910 80888950 AFA00010 */ sw $zero, 0x0010($sp) -/* 00914 80888954 0C024B9C */ jal func_80092E70 +/* 00914 80888954 0C024B9C */ jal Quake_SetQuakeValues /* 00918 80888958 AFA40028 */ sw $a0, 0x0028($sp) /* 0091C 8088895C 8FA40028 */ lw $a0, 0x0028($sp) -/* 00920 80888960 0C024B7C */ jal func_80092DF0 +/* 00920 80888960 0C024B7C */ jal Quake_SetCountdown /* 00924 80888964 24050014 */ addiu $a1, $zero, 0x0014 ## $a1 = 00000014 /* 00928 80888968 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 0092C 8088896C 0C00BE0A */ jal Audio_PlayActorSound2 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Hamstep/func_80888A58.s b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Hamstep/func_80888A58.s index a9abac1011..3284cd0d33 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Hamstep/func_80888A58.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Hamstep/func_80888A58.s @@ -80,22 +80,22 @@ glabel func_80888A58 /* 00B38 80888B78 844E07A0 */ lh $t6, 0x07A0($v0) ## 000007A0 /* 00B3C 80888B7C 000E7880 */ sll $t7, $t6, 2 /* 00B40 80888B80 004FC021 */ addu $t8, $v0, $t7 -/* 00B44 80888B84 0C024BE2 */ jal func_80092F88 +/* 00B44 80888B84 0C024BE2 */ jal Quake_Add /* 00B48 80888B88 8F040790 */ lw $a0, 0x0790($t8) ## 00000790 /* 00B4C 80888B8C 00022400 */ sll $a0, $v0, 16 /* 00B50 80888B90 AFA2002C */ sw $v0, 0x002C($sp) /* 00B54 80888B94 00042403 */ sra $a0, $a0, 16 -/* 00B58 80888B98 0C024B6B */ jal func_80092DAC +/* 00B58 80888B98 0C024B6B */ jal Quake_SetSpeed /* 00B5C 80888B9C 2405C350 */ addiu $a1, $zero, 0xC350 ## $a1 = FFFFC350 /* 00B60 80888BA0 87A4002E */ lh $a0, 0x002E($sp) /* 00B64 80888BA4 24050014 */ addiu $a1, $zero, 0x0014 ## $a1 = 00000014 /* 00B68 80888BA8 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 /* 00B6C 80888BAC 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 /* 00B70 80888BB0 AFA00010 */ sw $zero, 0x0010($sp) -/* 00B74 80888BB4 0C024B9C */ jal func_80092E70 +/* 00B74 80888BB4 0C024B9C */ jal Quake_SetQuakeValues /* 00B78 80888BB8 AFA40028 */ sw $a0, 0x0028($sp) /* 00B7C 80888BBC 8FA40028 */ lw $a0, 0x0028($sp) -/* 00B80 80888BC0 0C024B7C */ jal func_80092DF0 +/* 00B80 80888BC0 0C024B7C */ jal Quake_SetCountdown /* 00B84 80888BC4 24050007 */ addiu $a1, $zero, 0x0007 ## $a1 = 00000007 /* 00B88 80888BC8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 00B8C 80888BCC 0C00BE0A */ jal Audio_PlayActorSound2 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Hrock/BgHidanHrock_Draw.s b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Hrock/BgHidanHrock_Draw.s index d177a0be0d..00a7c45c99 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Hrock/BgHidanHrock_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Hrock/BgHidanHrock_Draw.s @@ -7,7 +7,7 @@ glabel BgHidanHrock_Draw /* 006A0 808897D0 3C058089 */ lui $a1, %hi(D_808898B0) ## $a1 = 80890000 /* 006A4 808897D4 000E7880 */ sll $t7, $t6, 2 /* 006A8 808897D8 00AF2821 */ addu $a1, $a1, $t7 -/* 006AC 808897DC 0C00D498 */ jal Draw_DListOpa +/* 006AC 808897DC 0C00D498 */ jal Gfx_DrawDListOpa /* 006B0 808897E0 8CA598B0 */ lw $a1, %lo(D_808898B0)($a1) /* 006B4 808897E4 8FBF0014 */ lw $ra, 0x0014($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Kousi/BgHidanKousi_Draw.s b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Kousi/BgHidanKousi_Draw.s index e9aa7155b3..f437fb2297 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Kousi/BgHidanKousi_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Kousi/BgHidanKousi_Draw.s @@ -9,7 +9,7 @@ glabel BgHidanKousi_Draw /* 00414 80889D74 24C69EEC */ addiu $a2, $a2, %lo(D_80889EEC) ## $a2 = 80889EEC /* 00418 80889D78 27A4002C */ addiu $a0, $sp, 0x002C ## $a0 = FFFFFFEC /* 0041C 80889D7C 2407015E */ addiu $a3, $zero, 0x015E ## $a3 = 0000015E -/* 00420 80889D80 0C031AB1 */ jal func_800C6AC4 +/* 00420 80889D80 0C031AB1 */ jal Graph_OpenDisps /* 00424 80889D84 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 /* 00428 80889D88 8FAF0044 */ lw $t7, 0x0044($sp) /* 0042C 80889D8C 0C024F46 */ jal func_80093D18 @@ -47,7 +47,7 @@ glabel BgHidanKousi_Draw /* 004AC 80889E0C 8DEF9E84 */ lw $t7, %lo(D_80889E84)($t7) /* 004B0 80889E10 AC4F0004 */ sw $t7, 0x0004($v0) ## 00000004 /* 004B4 80889E14 8FB80044 */ lw $t8, 0x0044($sp) -/* 004B8 80889E18 0C031AD5 */ jal func_800C6B54 +/* 004B8 80889E18 0C031AD5 */ jal Graph_CloseDisps /* 004BC 80889E1C 8F050000 */ lw $a1, 0x0000($t8) ## 00000000 /* 004C0 80889E20 8FBF001C */ lw $ra, 0x001C($sp) /* 004C4 80889E24 8FB00018 */ lw $s0, 0x0018($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Kowarerukabe/BgHidanKowarerukabe_Draw.s b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Kowarerukabe/BgHidanKowarerukabe_Draw.s index 0684b0b8eb..0f5b78c8f1 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Kowarerukabe/BgHidanKowarerukabe_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Kowarerukabe/BgHidanKowarerukabe_Draw.s @@ -9,7 +9,7 @@ glabel BgHidanKowarerukabe_Draw /* 00CF8 8088AD18 24C6AF30 */ addiu $a2, $a2, %lo(D_8088AF30) ## $a2 = 8088AF30 /* 00CFC 8088AD1C 27A40030 */ addiu $a0, $sp, 0x0030 ## $a0 = FFFFFFE8 /* 00D00 8088AD20 24070235 */ addiu $a3, $zero, 0x0235 ## $a3 = 00000235 -/* 00D04 8088AD24 0C031AB1 */ jal func_800C6AC4 +/* 00D04 8088AD24 0C031AB1 */ jal Graph_OpenDisps /* 00D08 8088AD28 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 /* 00D0C 8088AD2C 8FAF004C */ lw $t7, 0x004C($sp) /* 00D10 8088AD30 0C024F46 */ jal func_80093D18 @@ -50,7 +50,7 @@ glabel BgHidanKowarerukabe_Draw /* 00D9C 8088ADBC 24C6AF70 */ addiu $a2, $a2, %lo(D_8088AF70) ## $a2 = 8088AF70 /* 00DA0 8088ADC0 27A40030 */ addiu $a0, $sp, 0x0030 ## $a0 = FFFFFFE8 /* 00DA4 8088ADC4 2407023D */ addiu $a3, $zero, 0x023D ## $a3 = 0000023D -/* 00DA8 8088ADC8 0C031AD5 */ jal func_800C6B54 +/* 00DA8 8088ADC8 0C031AD5 */ jal Graph_CloseDisps /* 00DAC 8088ADCC 8DE50000 */ lw $a1, 0x0000($t7) ## 00000000 /* 00DB0 8088ADD0 8FBF001C */ lw $ra, 0x001C($sp) /* 00DB4 8088ADD4 8FB00018 */ lw $s0, 0x0018($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Rock/BgHidanRock_Draw.s b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Rock/BgHidanRock_Draw.s index 49d57f2afb..9117c0d74c 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Rock/BgHidanRock_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Rock/BgHidanRock_Draw.s @@ -10,14 +10,14 @@ glabel BgHidanRock_Draw /* 00E24 8088BEA4 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 00E28 8088BEA8 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 /* 00E2C 8088BEAC 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 -/* 00E30 8088BEB0 0C00D498 */ jal Draw_DListOpa +/* 00E30 8088BEB0 0C00D498 */ jal Gfx_DrawDListOpa /* 00E34 8088BEB4 24A5C100 */ addiu $a1, $a1, 0xC100 ## $a1 = 0600C100 /* 00E38 8088BEB8 10000005 */ beq $zero, $zero, .L8088BED0 /* 00E3C 8088BEBC 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 .L8088BEC0: /* 00E40 8088BEC0 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 -/* 00E44 8088BEC4 0C00D498 */ jal Draw_DListOpa +/* 00E44 8088BEC4 0C00D498 */ jal Gfx_DrawDListOpa /* 00E48 8088BEC8 24A5C1F0 */ addiu $a1, $a1, 0xC1F0 ## $a1 = 0600C1F0 /* 00E4C 8088BECC 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Rock/func_8088BC40.s b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Rock/func_8088BC40.s index 465eb46b5f..8f3bf10872 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Rock/func_8088BC40.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Rock/func_8088BC40.s @@ -1,18 +1,18 @@ glabel func_8088BC40 /* 00BC0 8088BC40 27BDFFA8 */ addiu $sp, $sp, 0xFFA8 ## $sp = FFFFFFA8 -/* 00BC4 8088BC44 AFBF001C */ sw $ra, 0x001C($sp) -/* 00BC8 8088BC48 AFB00018 */ sw $s0, 0x0018($sp) -/* 00BCC 8088BC4C AFA40058 */ sw $a0, 0x0058($sp) -/* 00BD0 8088BC50 AFA5005C */ sw $a1, 0x005C($sp) +/* 00BC4 8088BC44 AFBF001C */ sw $ra, 0x001C($sp) +/* 00BC8 8088BC48 AFB00018 */ sw $s0, 0x0018($sp) +/* 00BCC 8088BC4C AFA40058 */ sw $a0, 0x0058($sp) +/* 00BD0 8088BC50 AFA5005C */ sw $a1, 0x005C($sp) /* 00BD4 8088BC54 8C850000 */ lw $a1, 0x0000($a0) ## 00000000 /* 00BD8 8088BC58 3C068089 */ lui $a2, %hi(D_8088BFF0) ## $a2 = 80890000 /* 00BDC 8088BC5C 24C6BFF0 */ addiu $a2, $a2, %lo(D_8088BFF0) ## $a2 = 8088BFF0 /* 00BE0 8088BC60 27A40040 */ addiu $a0, $sp, 0x0040 ## $a0 = FFFFFFE8 /* 00BE4 8088BC64 24070328 */ addiu $a3, $zero, 0x0328 ## $a3 = 00000328 -/* 00BE8 8088BC68 0C031AB1 */ jal func_800C6AC4 +/* 00BE8 8088BC68 0C031AB1 */ jal Graph_OpenDisps /* 00BEC 8088BC6C 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 /* 00BF0 8088BC70 8E0402D0 */ lw $a0, 0x02D0($s0) ## 000002D0 -/* 00BF4 8088BC74 0C024DDD */ jal func_80093774 +/* 00BF4 8088BC74 0C024DDD */ jal Gfx_CallSetupDL /* 00BF8 8088BC78 24050014 */ addiu $a1, $zero, 0x0014 ## $a1 = 00000014 /* 00BFC 8088BC7C AE0202D0 */ sw $v0, 0x02D0($s0) ## 000002D0 /* 00C00 8088BC80 244F0008 */ addiu $t7, $v0, 0x0008 ## $t7 = 00000008 @@ -31,13 +31,13 @@ glabel func_8088BC40 /* 00C34 8088BCB4 3C09FB00 */ lui $t1, 0xFB00 ## $t1 = FB000000 /* 00C38 8088BCB8 AC490000 */ sw $t1, 0x0000($v0) ## 00000000 /* 00C3C 8088BCBC AC4A0004 */ sw $t2, 0x0004($v0) ## 00000004 -/* 00C40 8088BCC0 8FA3005C */ lw $v1, 0x005C($sp) +/* 00C40 8088BCC0 8FA3005C */ lw $v1, 0x005C($sp) /* 00C44 8088BCC4 3C028089 */ lui $v0, %hi(D_8088BF60) ## $v0 = 80890000 /* 00C48 8088BCC8 2442BF60 */ addiu $v0, $v0, %lo(D_8088BF60) ## $v0 = 8088BF60 /* 00C4C 8088BCCC 906B0168 */ lbu $t3, 0x0168($v1) ## 00000168 /* 00C50 8088BCD0 3C014220 */ lui $at, 0x4220 ## $at = 42200000 /* 00C54 8088BCD4 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 00C58 8088BCD8 5560000C */ bnel $t3, $zero, .L8088BD0C +/* 00C58 8088BCD8 5560000C */ bnel $t3, $zero, .L8088BD0C /* 00C5C 8088BCDC C468000C */ lwc1 $f8, 0x000C($v1) ## 0000000C /* 00C60 8088BCE0 3C014220 */ lui $at, 0x4220 ## $at = 42200000 /* 00C64 8088BCE4 44813000 */ mtc1 $at, $f6 ## $f6 = 40.00 @@ -45,72 +45,72 @@ glabel func_8088BC40 /* 00C6C 8088BCEC C44C0000 */ lwc1 $f12, 0x0000($v0) ## 8088BF60 /* 00C70 8088BCF0 8C460008 */ lw $a2, 0x0008($v0) ## 8088BF68 /* 00C74 8088BCF4 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 00C78 8088BCF8 0C034261 */ jal Matrix_Translate -/* 00C7C 8088BCFC 46062381 */ sub.s $f14, $f4, $f6 -/* 00C80 8088BD00 10000008 */ beq $zero, $zero, .L8088BD24 -/* 00C84 8088BD04 8FA20058 */ lw $v0, 0x0058($sp) +/* 00C78 8088BCF8 0C034261 */ jal Matrix_Translate +/* 00C7C 8088BCFC 46062381 */ sub.s $f14, $f4, $f6 +/* 00C80 8088BD00 10000008 */ beq $zero, $zero, .L8088BD24 +/* 00C84 8088BD04 8FA20058 */ lw $v0, 0x0058($sp) /* 00C88 8088BD08 C468000C */ lwc1 $f8, 0x000C($v1) ## 0000000C .L8088BD0C: /* 00C8C 8088BD0C 44815000 */ mtc1 $at, $f10 ## $f10 = 0.00 /* 00C90 8088BD10 C46C0008 */ lwc1 $f12, 0x0008($v1) ## 00000008 /* 00C94 8088BD14 8C660010 */ lw $a2, 0x0010($v1) ## 00000010 -/* 00C98 8088BD18 0C034261 */ jal Matrix_Translate -/* 00C9C 8088BD1C 460A4381 */ sub.s $f14, $f8, $f10 -/* 00CA0 8088BD20 8FA20058 */ lw $v0, 0x0058($sp) +/* 00C98 8088BD18 0C034261 */ jal Matrix_Translate +/* 00C9C 8088BD1C 460A4381 */ sub.s $f14, $f8, $f10 +/* 00CA0 8088BD20 8FA20058 */ lw $v0, 0x0058($sp) .L8088BD24: /* 00CA4 8088BD24 844C07A0 */ lh $t4, 0x07A0($v0) ## 000007A0 -/* 00CA8 8088BD28 000C6880 */ sll $t5, $t4, 2 -/* 00CAC 8088BD2C 004D7021 */ addu $t6, $v0, $t5 -/* 00CB0 8088BD30 0C016A7D */ jal func_8005A9F4 +/* 00CA8 8088BD28 000C6880 */ sll $t5, $t4, 2 +/* 00CAC 8088BD2C 004D7021 */ addu $t6, $v0, $t5 +/* 00CB0 8088BD30 0C016A7D */ jal func_8005A9F4 /* 00CB4 8088BD34 8DC40790 */ lw $a0, 0x0790($t6) ## 00000790 /* 00CB8 8088BD38 34018000 */ ori $at, $zero, 0x8000 ## $at = 00008000 -/* 00CBC 8088BD3C 00412821 */ addu $a1, $v0, $at -/* 00CC0 8088BD40 00052C00 */ sll $a1, $a1, 16 -/* 00CC4 8088BD44 00052C03 */ sra $a1, $a1, 16 +/* 00CBC 8088BD3C 00412821 */ addu $a1, $v0, $at +/* 00CC0 8088BD40 00052C00 */ sll $a1, $a1, 16 +/* 00CC4 8088BD44 00052C03 */ sra $a1, $a1, 16 /* 00CC8 8088BD48 00002025 */ or $a0, $zero, $zero ## $a0 = 00000000 /* 00CCC 8088BD4C 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 00CD0 8088BD50 0C034421 */ jal Matrix_RotateXYZ +/* 00CD0 8088BD50 0C034421 */ jal Matrix_RotateZYX /* 00CD4 8088BD54 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 /* 00CD8 8088BD58 44807000 */ mtc1 $zero, $f14 ## $f14 = 0.00 /* 00CDC 8088BD5C 3C01C128 */ lui $at, 0xC128 ## $at = C1280000 /* 00CE0 8088BD60 44816000 */ mtc1 $at, $f12 ## $f12 = -10.50 -/* 00CE4 8088BD64 44067000 */ mfc1 $a2, $f14 -/* 00CE8 8088BD68 0C034261 */ jal Matrix_Translate +/* 00CE4 8088BD64 44067000 */ mfc1 $a2, $f14 +/* 00CE8 8088BD68 0C034261 */ jal Matrix_Translate /* 00CEC 8088BD6C 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 /* 00CF0 8088BD70 3C0140C0 */ lui $at, 0x40C0 ## $at = 40C00000 /* 00CF4 8088BD74 44816000 */ mtc1 $at, $f12 ## $f12 = 6.00 -/* 00CF8 8088BD78 8FAF005C */ lw $t7, 0x005C($sp) +/* 00CF8 8088BD78 8FAF005C */ lw $t7, 0x005C($sp) /* 00CFC 8088BD7C 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 00D00 8088BD80 44066000 */ mfc1 $a2, $f12 -/* 00D04 8088BD84 0C0342A3 */ jal Matrix_Scale +/* 00D00 8088BD80 44066000 */ mfc1 $a2, $f12 +/* 00D04 8088BD84 0C0342A3 */ jal Matrix_Scale /* 00D08 8088BD88 C5EE016C */ lwc1 $f14, 0x016C($t7) ## 0000016C /* 00D0C 8088BD8C 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 00D10 8088BD90 8FA70058 */ lw $a3, 0x0058($sp) +/* 00D10 8088BD90 8FA70058 */ lw $a3, 0x0058($sp) /* 00D14 8088BD94 3C19DB06 */ lui $t9, 0xDB06 ## $t9 = DB060000 /* 00D18 8088BD98 24580008 */ addiu $t8, $v0, 0x0008 ## $t8 = 00000008 /* 00D1C 8088BD9C AE1802D0 */ sw $t8, 0x02D0($s0) ## 000002D0 /* 00D20 8088BDA0 37390020 */ ori $t9, $t9, 0x0020 ## $t9 = DB060020 /* 00D24 8088BDA4 3C080001 */ lui $t0, 0x0001 ## $t0 = 00010000 /* 00D28 8088BDA8 AC590000 */ sw $t9, 0x0000($v0) ## 00000000 -/* 00D2C 8088BDAC 01074021 */ addu $t0, $t0, $a3 +/* 00D2C 8088BDAC 01074021 */ addu $t0, $t0, $a3 /* 00D30 8088BDB0 8D081DE4 */ lw $t0, 0x1DE4($t0) ## 00011DE4 /* 00D34 8088BDB4 3C048089 */ lui $a0, %hi(D_8088BFC4) ## $a0 = 80890000 /* 00D38 8088BDB8 3C0F8016 */ lui $t7, 0x8016 ## $t7 = 80160000 /* 00D3C 8088BDBC 31090007 */ andi $t1, $t0, 0x0007 ## $t1 = 00000000 -/* 00D40 8088BDC0 00095080 */ sll $t2, $t1, 2 -/* 00D44 8088BDC4 008A2021 */ addu $a0, $a0, $t2 -/* 00D48 8088BDC8 8C84BFC4 */ lw $a0, %lo(D_8088BFC4)($a0) +/* 00D40 8088BDC0 00095080 */ sll $t2, $t1, 2 +/* 00D44 8088BDC4 008A2021 */ addu $a0, $a0, $t2 +/* 00D48 8088BDC8 8C84BFC4 */ lw $a0, %lo(D_8088BFC4)($a0) /* 00D4C 8088BDCC 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 /* 00D50 8088BDD0 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF -/* 00D54 8088BDD4 00046100 */ sll $t4, $a0, 4 -/* 00D58 8088BDD8 000C6F02 */ srl $t5, $t4, 28 -/* 00D5C 8088BDDC 000D7080 */ sll $t6, $t5, 2 -/* 00D60 8088BDE0 01EE7821 */ addu $t7, $t7, $t6 +/* 00D54 8088BDD4 00046100 */ sll $t4, $a0, 4 +/* 00D58 8088BDD8 000C6F02 */ srl $t5, $t4, 28 +/* 00D5C 8088BDDC 000D7080 */ sll $t6, $t5, 2 +/* 00D60 8088BDE0 01EE7821 */ addu $t7, $t7, $t6 /* 00D64 8088BDE4 8DEF6FA8 */ lw $t7, 0x6FA8($t7) ## 80166FA8 -/* 00D68 8088BDE8 00815824 */ and $t3, $a0, $at +/* 00D68 8088BDE8 00815824 */ and $t3, $a0, $at /* 00D6C 8088BDEC 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 00D70 8088BDF0 016FC021 */ addu $t8, $t3, $t7 -/* 00D74 8088BDF4 0301C821 */ addu $t9, $t8, $at +/* 00D70 8088BDF0 016FC021 */ addu $t8, $t3, $t7 +/* 00D74 8088BDF4 0301C821 */ addu $t9, $t8, $at /* 00D78 8088BDF8 AC590004 */ sw $t9, 0x0004($v0) ## 00000004 /* 00D7C 8088BDFC 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 /* 00D80 8088BE00 3C09DA38 */ lui $t1, 0xDA38 ## $t1 = DA380000 @@ -122,9 +122,9 @@ glabel func_8088BC40 /* 00D98 8088BE18 8CE40000 */ lw $a0, 0x0000($a3) ## 00000000 /* 00D9C 8088BE1C 24A5C008 */ addiu $a1, $a1, %lo(D_8088C008) ## $a1 = 8088C008 /* 00DA0 8088BE20 24060355 */ addiu $a2, $zero, 0x0355 ## $a2 = 00000355 -/* 00DA4 8088BE24 0C0346A2 */ jal Matrix_NewMtx -/* 00DA8 8088BE28 AFA20030 */ sw $v0, 0x0030($sp) -/* 00DAC 8088BE2C 8FA30030 */ lw $v1, 0x0030($sp) +/* 00DA4 8088BE24 0C0346A2 */ jal Matrix_NewMtx +/* 00DA8 8088BE28 AFA20030 */ sw $v0, 0x0030($sp) +/* 00DAC 8088BE2C 8FA30030 */ lw $v1, 0x0030($sp) /* 00DB0 8088BE30 3C0D0601 */ lui $t5, 0x0601 ## $t5 = 06010000 /* 00DB4 8088BE34 25ADCA10 */ addiu $t5, $t5, 0xCA10 ## $t5 = 0600CA10 /* 00DB8 8088BE38 AC620004 */ sw $v0, 0x0004($v1) ## 00000004 @@ -135,16 +135,16 @@ glabel func_8088BC40 /* 00DCC 8088BE4C AE0A02D0 */ sw $t2, 0x02D0($s0) ## 000002D0 /* 00DD0 8088BE50 AC4D0004 */ sw $t5, 0x0004($v0) ## 00000004 /* 00DD4 8088BE54 AC4C0000 */ sw $t4, 0x0000($v0) ## 00000000 -/* 00DD8 8088BE58 8FAE0058 */ lw $t6, 0x0058($sp) +/* 00DD8 8088BE58 8FAE0058 */ lw $t6, 0x0058($sp) /* 00DDC 8088BE5C 24C6C020 */ addiu $a2, $a2, %lo(D_8088C020) ## $a2 = 8088C020 /* 00DE0 8088BE60 27A40040 */ addiu $a0, $sp, 0x0040 ## $a0 = FFFFFFE8 /* 00DE4 8088BE64 24070359 */ addiu $a3, $zero, 0x0359 ## $a3 = 00000359 -/* 00DE8 8088BE68 0C031AD5 */ jal func_800C6B54 +/* 00DE8 8088BE68 0C031AD5 */ jal Graph_CloseDisps /* 00DEC 8088BE6C 8DC50000 */ lw $a1, 0x0000($t6) ## 00000000 -/* 00DF0 8088BE70 8FBF001C */ lw $ra, 0x001C($sp) -/* 00DF4 8088BE74 8FB00018 */ lw $s0, 0x0018($sp) +/* 00DF0 8088BE70 8FBF001C */ lw $ra, 0x001C($sp) +/* 00DF4 8088BE74 8FB00018 */ lw $s0, 0x0018($sp) /* 00DF8 8088BE78 27BD0058 */ addiu $sp, $sp, 0x0058 ## $sp = 00000000 -/* 00DFC 8088BE7C 03E00008 */ jr $ra +/* 00DFC 8088BE7C 03E00008 */ jr $ra /* 00E00 8088BE80 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Rsekizou/BgHidanRsekizou_Draw.s b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Rsekizou/BgHidanRsekizou_Draw.s index 36d55848a8..c64cbb27f9 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Rsekizou/BgHidanRsekizou_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Rsekizou/BgHidanRsekizou_Draw.s @@ -14,7 +14,7 @@ glabel BgHidanRsekizou_Draw /* 0086C 8088CA6C 24C6CDBC */ addiu $a2, $a2, %lo(D_8088CDBC) ## $a2 = 8088CDBC /* 00870 8088CA70 27A40048 */ addiu $a0, $sp, 0x0048 ## $a0 = FFFFFFA0 /* 00874 8088CA74 24070234 */ addiu $a3, $zero, 0x0234 ## $a3 = 00000234 -/* 00878 8088CA78 0C031AB1 */ jal func_800C6AC4 +/* 00878 8088CA78 0C031AB1 */ jal Graph_OpenDisps /* 0087C 8088CA7C 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 /* 00880 8088CA80 0C024F46 */ jal func_80093D18 /* 00884 8088CA84 8EA40000 */ lw $a0, 0x0000($s5) ## 00000000 @@ -45,7 +45,7 @@ glabel BgHidanRsekizou_Draw /* 008E8 8088CAE8 0C0346EA */ jal Matrix_MtxFCopy /* 008EC 8088CAEC AC480004 */ sw $t0, 0x0004($v0) ## 00000004 /* 008F0 8088CAF0 8E2402D0 */ lw $a0, 0x02D0($s1) ## 000002D0 -/* 008F4 8088CAF4 0C024DDD */ jal func_80093774 +/* 008F4 8088CAF4 0C024DDD */ jal Gfx_CallSetupDL /* 008F8 8088CAF8 24050014 */ addiu $a1, $zero, 0x0014 ## $a1 = 00000014 /* 008FC 8088CAFC AE2202D0 */ sw $v0, 0x02D0($s1) ## 000002D0 /* 00900 8088CB00 86A907A0 */ lh $t1, 0x07A0($s5) ## 000007A0 @@ -127,7 +127,7 @@ glabel BgHidanRsekizou_Draw /* 00A1C 8088CC1C 24C6CDF4 */ addiu $a2, $a2, %lo(D_8088CDF4) ## $a2 = 8088CDF4 /* 00A20 8088CC20 27A40048 */ addiu $a0, $sp, 0x0048 ## $a0 = FFFFFFA0 /* 00A24 8088CC24 8EA50000 */ lw $a1, 0x0000($s5) ## 00000000 -/* 00A28 8088CC28 0C031AD5 */ jal func_800C6B54 +/* 00A28 8088CC28 0C031AD5 */ jal Graph_CloseDisps /* 00A2C 8088CC2C 24070258 */ addiu $a3, $zero, 0x0258 ## $a3 = 00000258 /* 00A30 8088CC30 8FBF0034 */ lw $ra, 0x0034($sp) /* 00A34 8088CC34 8FB0001C */ lw $s0, 0x001C($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Sekizou/BgHidanSekizou_Draw.s b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Sekizou/BgHidanSekizou_Draw.s index aad2e9f8be..92dd077828 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Sekizou/BgHidanSekizou_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Sekizou/BgHidanSekizou_Draw.s @@ -13,7 +13,7 @@ glabel BgHidanSekizou_Draw /* 01054 8088DF14 24C6E2B8 */ addiu $a2, $a2, %lo(D_8088E2B8) ## $a2 = 8088E2B8 /* 01058 8088DF18 27A40058 */ addiu $a0, $sp, 0x0058 ## $a0 = FFFFFFD0 /* 0105C 8088DF1C 2407033B */ addiu $a3, $zero, 0x033B ## $a3 = 0000033B -/* 01060 8088DF20 0C031AB1 */ jal func_800C6AC4 +/* 01060 8088DF20 0C031AB1 */ jal Graph_OpenDisps /* 01064 8088DF24 00A09825 */ or $s3, $a1, $zero ## $s3 = 00000000 /* 01068 8088DF28 0C024F46 */ jal func_80093D18 /* 0106C 8088DF2C 8E840000 */ lw $a0, 0x0000($s4) ## 00000000 @@ -52,7 +52,7 @@ glabel BgHidanSekizou_Draw /* 010EC 8088DFAC AC4C0004 */ sw $t4, 0x0004($v0) ## 00000004 /* 010F0 8088DFB0 AC4B0000 */ sw $t3, 0x0000($v0) ## 00000000 .L8088DFB4: -/* 010F4 8088DFB4 0C024DDD */ jal func_80093774 +/* 010F4 8088DFB4 0C024DDD */ jal Gfx_CallSetupDL /* 010F8 8088DFB8 8E6402D0 */ lw $a0, 0x02D0($s3) ## 000002D0 /* 010FC 8088DFBC AE6202D0 */ sw $v0, 0x02D0($s3) ## 000002D0 /* 01100 8088DFC0 862D001C */ lh $t5, 0x001C($s1) ## 0000001C @@ -154,7 +154,7 @@ glabel BgHidanSekizou_Draw /* 0126C 8088E12C 24C6E2E8 */ addiu $a2, $a2, %lo(D_8088E2E8) ## $a2 = 8088E2E8 /* 01270 8088E130 27A40058 */ addiu $a0, $sp, 0x0058 ## $a0 = FFFFFFD0 /* 01274 8088E134 8E850000 */ lw $a1, 0x0000($s4) ## 00000000 -/* 01278 8088E138 0C031AD5 */ jal func_800C6B54 +/* 01278 8088E138 0C031AD5 */ jal Graph_CloseDisps /* 0127C 8088E13C 24070383 */ addiu $a3, $zero, 0x0383 ## $a3 = 00000383 /* 01280 8088E140 8FBF0034 */ lw $ra, 0x0034($sp) /* 01284 8088E144 8FB00020 */ lw $s0, 0x0020($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Sima/BgHidanSima_Draw.s b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Sima/BgHidanSima_Draw.s index e3238b62e2..057d8420e6 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Sima/BgHidanSima_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Sima/BgHidanSima_Draw.s @@ -9,7 +9,7 @@ glabel BgHidanSima_Draw /* 00C54 8088F024 24C6F250 */ addiu $a2, $a2, %lo(D_8088F250) ## $a2 = 8088F250 /* 00C58 8088F028 27A40038 */ addiu $a0, $sp, 0x0038 ## $a0 = FFFFFFE8 /* 00C5C 8088F02C 24070281 */ addiu $a3, $zero, 0x0281 ## $a3 = 00000281 -/* 00C60 8088F030 0C031AB1 */ jal func_800C6AC4 +/* 00C60 8088F030 0C031AB1 */ jal Graph_OpenDisps /* 00C64 8088F034 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 /* 00C68 8088F038 8FAF0054 */ lw $t7, 0x0054($sp) /* 00C6C 8088F03C 0C024F46 */ jal func_80093D18 @@ -56,7 +56,7 @@ glabel BgHidanSima_Draw /* 00D0C 8088F0DC 2718E7A8 */ addiu $t8, $t8, %lo(func_8088E7A8) ## $t8 = 8088E7A8 /* 00D10 8088F0E0 17190019 */ bne $t8, $t9, .L8088F148 /* 00D14 8088F0E4 24050014 */ addiu $a1, $zero, 0x0014 ## $a1 = 00000014 -/* 00D18 8088F0E8 0C024DDD */ jal func_80093774 +/* 00D18 8088F0E8 0C024DDD */ jal Gfx_CallSetupDL /* 00D1C 8088F0EC 8E0402D0 */ lw $a0, 0x02D0($s0) ## 000002D0 /* 00D20 8088F0F0 AE0202D0 */ sw $v0, 0x02D0($s0) ## 000002D0 /* 00D24 8088F0F4 24480008 */ addiu $t0, $v0, 0x0008 ## $t0 = 00000008 @@ -86,7 +86,7 @@ glabel BgHidanSima_Draw /* 00D80 8088F150 24C6F280 */ addiu $a2, $a2, %lo(D_8088F280) ## $a2 = 8088F280 /* 00D84 8088F154 27A40038 */ addiu $a0, $sp, 0x0038 ## $a0 = FFFFFFE8 /* 00D88 8088F158 2407029C */ addiu $a3, $zero, 0x029C ## $a3 = 0000029C -/* 00D8C 8088F15C 0C031AD5 */ jal func_800C6B54 +/* 00D8C 8088F15C 0C031AD5 */ jal Graph_CloseDisps /* 00D90 8088F160 8DC50000 */ lw $a1, 0x0000($t6) ## 00000000 /* 00D94 8088F164 8FBF001C */ lw $ra, 0x001C($sp) /* 00D98 8088F168 8FB00018 */ lw $s0, 0x0018($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Ice_Objects/BgIceObjects_Draw.s b/asm/non_matchings/overlays/actors/ovl_Bg_Ice_Objects/BgIceObjects_Draw.s index 30d93e5531..9710891feb 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Ice_Objects/BgIceObjects_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Ice_Objects/BgIceObjects_Draw.s @@ -4,7 +4,7 @@ glabel BgIceObjects_Draw /* 00C50 80890460 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 /* 00C54 80890464 AFBF0014 */ sw $ra, 0x0014($sp) /* 00C58 80890468 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 00C5C 8089046C 0C00D498 */ jal Draw_DListOpa +/* 00C5C 8089046C 0C00D498 */ jal Gfx_DrawDListOpa /* 00C60 80890470 24A50190 */ addiu $a1, $a1, 0x0190 ## $a1 = 06000190 /* 00C64 80890474 8FBF0014 */ lw $ra, 0x0014($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Ice_Shelter/BgIceShelter_Draw.s b/asm/non_matchings/overlays/actors/ovl_Bg_Ice_Shelter/BgIceShelter_Draw.s index 73608e4e97..9a268af8d6 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Ice_Shelter/BgIceShelter_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Ice_Shelter/BgIceShelter_Draw.s @@ -10,7 +10,7 @@ glabel BgIceShelter_Draw /* 00C9C 808913DC 24C61878 */ addiu $a2, $a2, %lo(D_80891878) ## $a2 = 80891878 /* 00CA0 808913E0 27A4006C */ addiu $a0, $sp, 0x006C ## $a0 = FFFFFFE4 /* 00CA4 808913E4 240702EC */ addiu $a3, $zero, 0x02EC ## $a3 = 000002EC -/* 00CA8 808913E8 0C031AB1 */ jal func_800C6AC4 +/* 00CA8 808913E8 0C031AB1 */ jal Graph_OpenDisps /* 00CAC 808913EC 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 /* 00CB0 808913F0 0C024F61 */ jal func_80093D84 /* 00CB4 808913F4 8E240000 */ lw $a0, 0x0000($s1) ## 00000000 @@ -96,7 +96,7 @@ glabel L808914C8 /* 00DE8 80891528 AFA6001C */ sw $a2, 0x001C($sp) /* 00DEC 8089152C AFAA0010 */ sw $t2, 0x0010($sp) /* 00DF0 80891530 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 00DF4 80891534 0C0253D0 */ jal Draw_TwoTexScroll +/* 00DF4 80891534 0C0253D0 */ jal Gfx_TwoTexScroll /* 00DF8 80891538 AFA20060 */ sw $v0, 0x0060($sp) /* 00DFC 8089153C 8FA80060 */ lw $t0, 0x0060($sp) /* 00E00 80891540 3C0A0600 */ lui $t2, 0x0600 ## $t2 = 06000000 @@ -138,7 +138,7 @@ glabel L80891568 /* 00E8C 808915CC 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 00E90 808915D0 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 /* 00E94 808915D4 AFA20058 */ sw $v0, 0x0058($sp) -/* 00E98 808915D8 0C0253D0 */ jal Draw_TwoTexScroll +/* 00E98 808915D8 0C0253D0 */ jal Gfx_TwoTexScroll /* 00E9C 808915DC 306700FF */ andi $a3, $v1, 0x00FF ## $a3 = 00000000 /* 00EA0 808915E0 8FA80058 */ lw $t0, 0x0058($sp) /* 00EA4 808915E4 8FA90044 */ lw $t1, 0x0044($sp) @@ -167,7 +167,7 @@ glabel L80891568 /* 00F00 80891640 AFAF0014 */ sw $t7, 0x0014($sp) /* 00F04 80891644 AFAE0010 */ sw $t6, 0x0010($sp) /* 00F08 80891648 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 00F0C 8089164C 0C0253D0 */ jal Draw_TwoTexScroll +/* 00F0C 8089164C 0C0253D0 */ jal Gfx_TwoTexScroll /* 00F10 80891650 AFA20054 */ sw $v0, 0x0054($sp) /* 00F14 80891654 8FA80054 */ lw $t0, 0x0054($sp) /* 00F18 80891658 3C0D0600 */ lui $t5, 0x0600 ## $t5 = 06000000 @@ -194,7 +194,7 @@ glabel L80891680 /* 00F64 808916A4 24C618A8 */ addiu $a2, $a2, %lo(D_808918A8) ## $a2 = 808918A8 /* 00F68 808916A8 27A4006C */ addiu $a0, $sp, 0x006C ## $a0 = FFFFFFE4 /* 00F6C 808916AC 8E250000 */ lw $a1, 0x0000($s1) ## 00000000 -/* 00F70 808916B0 0C031AD5 */ jal func_800C6B54 +/* 00F70 808916B0 0C031AD5 */ jal Graph_CloseDisps /* 00F74 808916B4 2407032F */ addiu $a3, $zero, 0x032F ## $a3 = 0000032F /* 00F78 808916B8 8FBF003C */ lw $ra, 0x003C($sp) /* 00F7C 808916BC 8FB00034 */ lw $s0, 0x0034($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Ice_Shutter/BgIceShutter_Draw.s b/asm/non_matchings/overlays/actors/ovl_Bg_Ice_Shutter/BgIceShutter_Draw.s index bfcf7a8ee9..69466c570e 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Ice_Shutter/BgIceShutter_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Ice_Shutter/BgIceShutter_Draw.s @@ -4,7 +4,7 @@ glabel BgIceShutter_Draw /* 003A8 80891E68 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 /* 003AC 80891E6C AFBF0014 */ sw $ra, 0x0014($sp) /* 003B0 80891E70 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 003B4 80891E74 0C00D498 */ jal Draw_DListOpa +/* 003B4 80891E74 0C00D498 */ jal Gfx_DrawDListOpa /* 003B8 80891E78 24A52740 */ addiu $a1, $a1, 0x2740 ## $a1 = 06002740 /* 003BC 80891E7C 8FBF0014 */ lw $ra, 0x0014($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Ice_Turara/BgIceTurara_Draw.s b/asm/non_matchings/overlays/actors/ovl_Bg_Ice_Turara/BgIceTurara_Draw.s index 0738a9ad08..cddf868fdd 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Ice_Turara/BgIceTurara_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Ice_Turara/BgIceTurara_Draw.s @@ -4,7 +4,7 @@ glabel BgIceTurara_Draw /* 006D0 808925F0 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 /* 006D4 808925F4 AFBF0014 */ sw $ra, 0x0014($sp) /* 006D8 808925F8 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 006DC 808925FC 0C00D498 */ jal Draw_DListOpa +/* 006DC 808925FC 0C00D498 */ jal Gfx_DrawDListOpa /* 006E0 80892600 24A523D0 */ addiu $a1, $a1, 0x23D0 ## $a1 = 060023D0 /* 006E4 80892604 8FBF0014 */ lw $ra, 0x0014($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Ingate/BgIngate_Draw.s b/asm/non_matchings/overlays/actors/ovl_Bg_Ingate/BgIngate_Draw.s index ab60bafdf2..ca00f035b8 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Ingate/BgIngate_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Ingate/BgIngate_Draw.s @@ -9,7 +9,7 @@ glabel BgIngate_Draw /* 0029C 808929DC 24C62AB0 */ addiu $a2, $a2, %lo(D_80892AB0) ## $a2 = 80892AB0 /* 002A0 808929E0 27A4002C */ addiu $a0, $sp, 0x002C ## $a0 = FFFFFFEC /* 002A4 808929E4 240700F0 */ addiu $a3, $zero, 0x00F0 ## $a3 = 000000F0 -/* 002A8 808929E8 0C031AB1 */ jal func_800C6AC4 +/* 002A8 808929E8 0C031AB1 */ jal Graph_OpenDisps /* 002AC 808929EC 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 /* 002B0 808929F0 8FAF0044 */ lw $t7, 0x0044($sp) /* 002B4 808929F4 0C024F46 */ jal func_80093D18 @@ -42,7 +42,7 @@ glabel BgIngate_Draw /* 00320 80892A60 24C62AD8 */ addiu $a2, $a2, %lo(D_80892AD8) ## $a2 = 80892AD8 /* 00324 80892A64 27A4002C */ addiu $a0, $sp, 0x002C ## $a0 = FFFFFFEC /* 00328 80892A68 240700FA */ addiu $a3, $zero, 0x00FA ## $a3 = 000000FA -/* 0032C 80892A6C 0C031AD5 */ jal func_800C6B54 +/* 0032C 80892A6C 0C031AD5 */ jal Graph_CloseDisps /* 00330 80892A70 8D850000 */ lw $a1, 0x0000($t4) ## 00000000 /* 00334 80892A74 8FBF001C */ lw $ra, 0x001C($sp) /* 00338 80892A78 8FB00018 */ lw $s0, 0x0018($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_1flift/BgJya1flift_Draw.s b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_1flift/BgJya1flift_Draw.s index 8f6962179d..4ce00c773c 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_1flift/BgJya1flift_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_1flift/BgJya1flift_Draw.s @@ -4,7 +4,7 @@ glabel BgJya1flift_Draw /* 00550 808930B0 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 /* 00554 808930B4 AFBF0014 */ sw $ra, 0x0014($sp) /* 00558 808930B8 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 0055C 808930BC 0C00D498 */ jal Draw_DListOpa +/* 0055C 808930BC 0C00D498 */ jal Gfx_DrawDListOpa /* 00560 808930C0 24A501F0 */ addiu $a1, $a1, 0x01F0 ## $a1 = 060001F0 /* 00564 808930C4 8FBF0014 */ lw $ra, 0x0014($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Bigmirror/BgJyaBigmirror_Draw.s b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Bigmirror/BgJyaBigmirror_Draw.s index 2011f63428..595852404f 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Bigmirror/BgJyaBigmirror_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Bigmirror/BgJyaBigmirror_Draw.s @@ -9,12 +9,12 @@ glabel BgJyaBigmirror_Draw /* 0078C 80893E6C 11C0000A */ beq $t6, $zero, .L80893E98 /* 00790 80893E70 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 /* 00794 80893E74 24A5E1B0 */ addiu $a1, $a1, 0xE1B0 ## $a1 = 0600E1B0 -/* 00798 80893E78 0C00D498 */ jal Draw_DListOpa +/* 00798 80893E78 0C00D498 */ jal Gfx_DrawDListOpa /* 0079C 80893E7C AFA60018 */ sw $a2, 0x0018($sp) /* 007A0 80893E80 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 /* 007A4 80893E84 24A5E2D0 */ addiu $a1, $a1, 0xE2D0 ## $a1 = 0600E2D0 -/* 007A8 80893E88 0C00D4C9 */ jal Draw_DListXlu +/* 007A8 80893E88 0C00D4C9 */ jal Gfx_DrawDListXlu /* 007AC 80893E8C 8FA4001C */ lw $a0, 0x001C($sp) /* 007B0 80893E90 8FA60018 */ lw $a2, 0x0018($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Bigmirror/func_80893C68.s b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Bigmirror/func_80893C68.s index d37c906641..1340505049 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Bigmirror/func_80893C68.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Bigmirror/func_80893C68.s @@ -9,7 +9,7 @@ glabel func_80893C68 /* 005A4 80893C84 24C64030 */ addiu $a2, $a2, %lo(D_80894030) ## $a2 = 80894030 /* 005A8 80893C88 27A40034 */ addiu $a0, $sp, 0x0034 ## $a0 = FFFFFFE4 /* 005AC 80893C8C 240701B3 */ addiu $a3, $zero, 0x01B3 ## $a3 = 000001B3 -/* 005B0 80893C90 0C031AB1 */ jal func_800C6AC4 +/* 005B0 80893C90 0C031AB1 */ jal Graph_OpenDisps /* 005B4 80893C94 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 /* 005B8 80893C98 8FAF0054 */ lw $t7, 0x0054($sp) /* 005BC 80893C9C 0C024F61 */ jal func_80093D84 @@ -117,7 +117,7 @@ glabel func_80893C68 /* 00748 80893E28 24C64078 */ addiu $a2, $a2, %lo(D_80894078) ## $a2 = 80894078 /* 0074C 80893E2C 27A40034 */ addiu $a0, $sp, 0x0034 ## $a0 = FFFFFFE4 /* 00750 80893E30 240701DC */ addiu $a3, $zero, 0x01DC ## $a3 = 000001DC -/* 00754 80893E34 0C031AD5 */ jal func_800C6B54 +/* 00754 80893E34 0C031AD5 */ jal Graph_CloseDisps /* 00758 80893E38 8D650000 */ lw $a1, 0x0000($t3) ## 00000000 /* 0075C 80893E3C 8FBF001C */ lw $ra, 0x001C($sp) /* 00760 80893E40 8FB00018 */ lw $s0, 0x0018($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Block/BgJyaBlock_Draw.s b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Block/BgJyaBlock_Draw.s index 15edea8cf8..a013828b32 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Block/BgJyaBlock_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Block/BgJyaBlock_Draw.s @@ -9,7 +9,7 @@ glabel BgJyaBlock_Draw /* 00120 808942C0 24C64410 */ addiu $a2, $a2, %lo(D_80894410) ## $a2 = 80894410 /* 00124 808942C4 27A40034 */ addiu $a0, $sp, 0x0034 ## $a0 = FFFFFFEC /* 00128 808942C8 24070091 */ addiu $a3, $zero, 0x0091 ## $a3 = 00000091 -/* 0012C 808942CC 0C031AB1 */ jal func_800C6AC4 +/* 0012C 808942CC 0C031AB1 */ jal Graph_OpenDisps /* 00130 808942D0 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 /* 00134 808942D4 8FAF004C */ lw $t7, 0x004C($sp) /* 00138 808942D8 0C024F46 */ jal func_80093D18 @@ -71,7 +71,7 @@ glabel BgJyaBlock_Draw /* 00218 808943B8 24C64438 */ addiu $a2, $a2, %lo(D_80894438) ## $a2 = 80894438 /* 0021C 808943BC 27A40034 */ addiu $a0, $sp, 0x0034 ## $a0 = FFFFFFEC /* 00220 808943C0 2407009E */ addiu $a3, $zero, 0x009E ## $a3 = 0000009E -/* 00224 808943C4 0C031AD5 */ jal func_800C6B54 +/* 00224 808943C4 0C031AD5 */ jal Graph_CloseDisps /* 00228 808943C8 8DC50000 */ lw $a1, 0x0000($t6) ## 00000000 /* 0022C 808943CC 8FBF001C */ lw $ra, 0x001C($sp) /* 00230 808943D0 8FB00018 */ lw $s0, 0x0018($sp) 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 index 7b47a7c9a8..1e589b84ee 100644 --- 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 @@ -9,7 +9,7 @@ glabel BgJyaBombchuiwa_Draw /* 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 Draw_DListOpa +/* 009E4 80894E84 0C00D498 */ jal Gfx_DrawDListOpa /* 009E8 80894E88 24A5E8D0 */ addiu $a1, $a1, 0xE8D0 ## $a1 = 0600E8D0 /* 009EC 80894E8C 00002025 */ or $a0, $zero, $zero ## $a0 = 00000000 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 index 0c2800424d..4ea2ed395c 100644 --- 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 @@ -8,7 +8,7 @@ glabel func_80894B04 /* 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 func_800C6AC4 +/* 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 @@ -41,7 +41,7 @@ glabel func_80894B04 /* 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 func_800C6B54 +/* 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) 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 index 622e9f64d2..dd466fdc49 100644 --- 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 @@ -8,7 +8,7 @@ glabel func_80894BC8 /* 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 func_800C6AC4 +/* 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 @@ -166,7 +166,7 @@ glabel func_80894BC8 /* 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 func_800C6B54 +/* 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 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Bombiwa/BgJyaBombiwa_Draw.s b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Bombiwa/BgJyaBombiwa_Draw.s index 8e5d45fd66..531ae0d54d 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Bombiwa/BgJyaBombiwa_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Bombiwa/BgJyaBombiwa_Draw.s @@ -4,7 +4,7 @@ glabel BgJyaBombiwa_Draw /* 00524 808956C4 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 /* 00528 808956C8 AFBF0014 */ sw $ra, 0x0014($sp) /* 0052C 808956CC 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 -/* 00530 808956D0 0C00D498 */ jal Draw_DListOpa +/* 00530 808956D0 0C00D498 */ jal Gfx_DrawDListOpa /* 00534 808956D4 24A5E490 */ addiu $a1, $a1, 0xE490 ## $a1 = 0600E490 /* 00538 808956D8 8FA50018 */ lw $a1, 0x0018($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Cobra/BgJyaCobra_Draw.s b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Cobra/BgJyaCobra_Draw.s index b84940406c..78a3c7db6c 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Cobra/BgJyaCobra_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Cobra/BgJyaCobra_Draw.s @@ -9,7 +9,7 @@ glabel BgJyaCobra_Draw /* 018D4 808971C4 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 /* 018D8 808971C8 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 /* 018DC 808971CC 24A50790 */ addiu $a1, $a1, 0x0790 ## $a1 = 06010790 -/* 018E0 808971D0 0C00D498 */ jal Draw_DListOpa +/* 018E0 808971D0 0C00D498 */ jal Gfx_DrawDListOpa /* 018E4 808971D4 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 018E8 808971D8 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Cobra/func_80896CB4.s b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Cobra/func_80896CB4.s index 3b1be6e2ed..663f0767f8 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Cobra/func_80896CB4.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Cobra/func_80896CB4.s @@ -8,7 +8,7 @@ glabel func_80896CB4 /* 013DC 80896CCC 24C67648 */ addiu $a2, $a2, %lo(D_80897648) ## $a2 = 80897648 /* 013E0 80896CD0 27A4002C */ addiu $a0, $sp, 0x002C ## $a0 = FFFFFFEC /* 013E4 80896CD4 24070360 */ addiu $a3, $zero, 0x0360 ## $a3 = 00000360 -/* 013E8 80896CD8 0C031AB1 */ jal func_800C6AC4 +/* 013E8 80896CD8 0C031AB1 */ jal Graph_OpenDisps /* 013EC 80896CDC 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 /* 013F0 80896CE0 8FAF0040 */ lw $t7, 0x0040($sp) /* 013F4 80896CE4 0C024F61 */ jal func_80093D84 @@ -41,7 +41,7 @@ glabel func_80896CB4 /* 01460 80896D50 24C67670 */ addiu $a2, $a2, %lo(D_80897670) ## $a2 = 80897670 /* 01464 80896D54 27A4002C */ addiu $a0, $sp, 0x002C ## $a0 = FFFFFFEC /* 01468 80896D58 24070368 */ addiu $a3, $zero, 0x0368 ## $a3 = 00000368 -/* 0146C 80896D5C 0C031AD5 */ jal func_800C6B54 +/* 0146C 80896D5C 0C031AD5 */ jal Graph_CloseDisps /* 01470 80896D60 8D850000 */ lw $a1, 0x0000($t4) ## 00000000 /* 01474 80896D64 8FBF001C */ lw $ra, 0x001C($sp) /* 01478 80896D68 8FB00018 */ lw $s0, 0x0018($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Cobra/func_80896D78.s b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Cobra/func_80896D78.s index 72a37fb5bc..86ff3e9c23 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Cobra/func_80896D78.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Cobra/func_80896D78.s @@ -10,7 +10,7 @@ glabel func_80896D78 /* 014A8 80896D98 24C67684 */ addiu $a2, $a2, %lo(D_80897684) ## $a2 = 80897684 /* 014AC 80896D9C 27A40030 */ addiu $a0, $sp, 0x0030 ## $a0 = FFFFFFE0 /* 014B0 80896DA0 2407039C */ addiu $a3, $zero, 0x039C ## $a3 = 0000039C -/* 014B4 80896DA4 0C031AB1 */ jal func_800C6AC4 +/* 014B4 80896DA4 0C031AB1 */ jal Graph_OpenDisps /* 014B8 80896DA8 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 /* 014BC 80896DAC 8FAF0054 */ lw $t7, 0x0054($sp) /* 014C0 80896DB0 0C024F61 */ jal func_80093D84 @@ -83,7 +83,7 @@ glabel func_80896D78 /* 015CC 80896EBC AC4F0004 */ sw $t7, 0x0004($v0) ## 00000004 /* 015D0 80896EC0 AC4E0000 */ sw $t6, 0x0000($v0) ## 00000000 /* 015D4 80896EC4 8FB80054 */ lw $t8, 0x0054($sp) -/* 015D8 80896EC8 0C031AD5 */ jal func_800C6B54 +/* 015D8 80896EC8 0C031AD5 */ jal Graph_CloseDisps /* 015DC 80896ECC 8F050000 */ lw $a1, 0x0000($t8) ## 00000000 /* 015E0 80896ED0 8FBF001C */ lw $ra, 0x001C($sp) /* 015E4 80896ED4 8FB00014 */ lw $s0, 0x0014($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Cobra/func_80896EE4.s b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Cobra/func_80896EE4.s index 2f7e14f464..b7a0d646c8 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Cobra/func_80896EE4.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Cobra/func_80896EE4.s @@ -12,7 +12,7 @@ glabel func_80896EE4 /* 0161C 80896F0C 24C676C0 */ addiu $a2, $a2, %lo(D_808976C0) ## $a2 = 808976C0 /* 01620 80896F10 27A4004C */ addiu $a0, $sp, 0x004C ## $a0 = FFFFFFD4 /* 01624 80896F14 240703C6 */ addiu $a3, $zero, 0x03C6 ## $a3 = 000003C6 -/* 01628 80896F18 0C031AB1 */ jal func_800C6AC4 +/* 01628 80896F18 0C031AB1 */ jal Graph_OpenDisps /* 0162C 80896F1C AFA5005C */ sw $a1, 0x005C($sp) /* 01630 80896F20 8FB9007C */ lw $t9, 0x007C($sp) /* 01634 80896F24 0C025011 */ jal func_80094044 @@ -173,7 +173,7 @@ glabel func_80896EE4 /* 01890 80897180 24C676E8 */ addiu $a2, $a2, %lo(D_808976E8) ## $a2 = 808976E8 /* 01894 80897184 27A4004C */ addiu $a0, $sp, 0x004C ## $a0 = FFFFFFD4 /* 01898 80897188 240703EE */ addiu $a3, $zero, 0x03EE ## $a3 = 000003EE -/* 0189C 8089718C 0C031AD5 */ jal func_800C6B54 +/* 0189C 8089718C 0C031AD5 */ jal Graph_CloseDisps /* 018A0 80897190 8F050000 */ lw $a1, 0x0000($t8) ## 00000008 /* 018A4 80897194 8FBF001C */ lw $ra, 0x001C($sp) /* 018A8 80897198 8FB00018 */ lw $s0, 0x0018($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Goroiwa/BgJyaGoroiwa_Draw.s b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Goroiwa/BgJyaGoroiwa_Draw.s index fc5352ca5a..ba1714de60 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Goroiwa/BgJyaGoroiwa_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Goroiwa/BgJyaGoroiwa_Draw.s @@ -4,7 +4,7 @@ glabel BgJyaGoroiwa_Draw /* 005BC 80897F2C 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 /* 005C0 80897F30 AFBF0014 */ sw $ra, 0x0014($sp) /* 005C4 80897F34 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 005C8 80897F38 0C00D498 */ jal Draw_DListOpa +/* 005C8 80897F38 0C00D498 */ jal Gfx_DrawDListOpa /* 005CC 80897F3C 24A506B0 */ addiu $a1, $a1, 0x06B0 ## $a1 = 060006B0 /* 005D0 80897F40 8FBF0014 */ lw $ra, 0x0014($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Haheniron/BgJyaHaheniron_Draw.s b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Haheniron/BgJyaHaheniron_Draw.s index b5c91ebeda..e6ad39289b 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Haheniron/BgJyaHaheniron_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Haheniron/BgJyaHaheniron_Draw.s @@ -16,7 +16,7 @@ glabel BgJyaHaheniron_Draw /* 00630 808986F0 3C05808A */ lui $a1, %hi(D_808987B8) ## $a1 = 808A0000 /* 00634 808986F4 00AE2821 */ addu $a1, $a1, $t6 /* 00638 808986F8 8CA587B8 */ lw $a1, %lo(D_808987B8)($a1) -/* 0063C 808986FC 0C00D498 */ jal Draw_DListOpa +/* 0063C 808986FC 0C00D498 */ jal Gfx_DrawDListOpa /* 00640 80898700 8FA4001C */ lw $a0, 0x001C($sp) /* 00644 80898704 8FBF0014 */ lw $ra, 0x0014($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Ironobj/BgJyaIronobj_Draw.s b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Ironobj/BgJyaIronobj_Draw.s index afa469e47e..cb173c5c80 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Ironobj/BgJyaIronobj_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Ironobj/BgJyaIronobj_Draw.s @@ -8,7 +8,7 @@ glabel BgJyaIronobj_Draw /* 00BBC 8089945C 31CF0001 */ andi $t7, $t6, 0x0001 ## $t7 = 00000000 /* 00BC0 80899460 000FC080 */ sll $t8, $t7, 2 /* 00BC4 80899464 00B82821 */ addu $a1, $a1, $t8 -/* 00BC8 80899468 0C00D498 */ jal Draw_DListOpa +/* 00BC8 80899468 0C00D498 */ jal Gfx_DrawDListOpa /* 00BCC 8089946C 8CA594A4 */ lw $a1, %lo(D_808994A4)($a1) /* 00BD0 80899470 8FBF0014 */ lw $ra, 0x0014($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Kanaami/func_80899950.s b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Kanaami/func_80899950.s index 7fb32f6182..c6d547e333 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Kanaami/func_80899950.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Kanaami/func_80899950.s @@ -26,22 +26,22 @@ glabel func_80899950 /* 00268 808999A8 845807A0 */ lh $t8, 0x07A0($v0) ## 000007A0 /* 0026C 808999AC 0018C880 */ sll $t9, $t8, 2 /* 00270 808999B0 00594021 */ addu $t0, $v0, $t9 -/* 00274 808999B4 0C024BE2 */ jal func_80092F88 +/* 00274 808999B4 0C024BE2 */ jal Quake_Add /* 00278 808999B8 8D040790 */ lw $a0, 0x0790($t0) ## 00000790 /* 0027C 808999BC 00022400 */ sll $a0, $v0, 16 /* 00280 808999C0 AFA20024 */ sw $v0, 0x0024($sp) /* 00284 808999C4 00042403 */ sra $a0, $a0, 16 -/* 00288 808999C8 0C024B6B */ jal func_80092DAC +/* 00288 808999C8 0C024B6B */ jal Quake_SetSpeed /* 0028C 808999CC 240561A8 */ addiu $a1, $zero, 0x61A8 ## $a1 = 000061A8 /* 00290 808999D0 87A40026 */ lh $a0, 0x0026($sp) /* 00294 808999D4 24050002 */ addiu $a1, $zero, 0x0002 ## $a1 = 00000002 /* 00298 808999D8 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 /* 0029C 808999DC 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 /* 002A0 808999E0 AFA00010 */ sw $zero, 0x0010($sp) -/* 002A4 808999E4 0C024B9C */ jal func_80092E70 +/* 002A4 808999E4 0C024B9C */ jal Quake_SetQuakeValues /* 002A8 808999E8 AFA40020 */ sw $a0, 0x0020($sp) /* 002AC 808999EC 8FA40020 */ lw $a0, 0x0020($sp) -/* 002B0 808999F0 0C024B7C */ jal func_80092DF0 +/* 002B0 808999F0 0C024B7C */ jal Quake_SetCountdown /* 002B4 808999F4 24050010 */ addiu $a1, $zero, 0x0010 ## $a1 = 00000010 .L808999F8: /* 002B8 808999F8 8FBF001C */ lw $ra, 0x001C($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Lift/BgJyaLift_Draw.s b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Lift/BgJyaLift_Draw.s index cfbcc4da06..6daab6fc50 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Lift/BgJyaLift_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Lift/BgJyaLift_Draw.s @@ -4,7 +4,7 @@ glabel BgJyaLift_Draw /* 00454 80899FF4 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 /* 00458 80899FF8 AFBF0014 */ sw $ra, 0x0014($sp) /* 0045C 80899FFC 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 -/* 00460 8089A000 0C00D498 */ jal Draw_DListOpa +/* 00460 8089A000 0C00D498 */ jal Gfx_DrawDListOpa /* 00464 8089A004 24A5CCE0 */ addiu $a1, $a1, 0xCCE0 ## $a1 = 0600CCE0 /* 00468 8089A008 8FBF0014 */ lw $ra, 0x0014($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Megami/func_8089ABC8.s b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Megami/func_8089ABC8.s index 3efb2be832..038a7c0f17 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Megami/func_8089ABC8.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Megami/func_8089ABC8.s @@ -9,7 +9,7 @@ glabel func_8089ABC8 /* 00AB4 8089ABE4 24C6B210 */ addiu $a2, $a2, %lo(D_8089B210) ## $a2 = 8089B210 /* 00AB8 8089ABE8 27A40034 */ addiu $a0, $sp, 0x0034 ## $a0 = FFFFFFEC /* 00ABC 8089ABEC 240702C2 */ addiu $a3, $zero, 0x02C2 ## $a3 = 000002C2 -/* 00AC0 8089ABF0 0C031AB1 */ jal func_800C6AC4 +/* 00AC0 8089ABF0 0C031AB1 */ jal Graph_OpenDisps /* 00AC4 8089ABF4 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 /* 00AC8 8089ABF8 8FAF004C */ lw $t7, 0x004C($sp) /* 00ACC 8089ABFC 0C024F46 */ jal func_80093D18 @@ -88,7 +88,7 @@ glabel func_8089ABC8 /* 00BF0 8089AD20 24C6B240 */ addiu $a2, $a2, %lo(D_8089B240) ## $a2 = 8089B240 /* 00BF4 8089AD24 27A40034 */ addiu $a0, $sp, 0x0034 ## $a0 = FFFFFFEC /* 00BF8 8089AD28 240702D0 */ addiu $a3, $zero, 0x02D0 ## $a3 = 000002D0 -/* 00BFC 8089AD2C 0C031AD5 */ jal func_800C6B54 +/* 00BFC 8089AD2C 0C031AD5 */ jal Graph_CloseDisps /* 00C00 8089AD30 8D450000 */ lw $a1, 0x0000($t2) ## 00000000 /* 00C04 8089AD34 8FBF001C */ lw $ra, 0x001C($sp) /* 00C08 8089AD38 8FB00018 */ lw $s0, 0x0018($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Megami/func_8089AD48.s b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Megami/func_8089AD48.s index 45d11402d5..70479ee6df 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Megami/func_8089AD48.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Megami/func_8089AD48.s @@ -20,7 +20,7 @@ glabel func_8089AD48 /* 00C60 8089AD90 24C6B258 */ addiu $a2, $a2, %lo(D_8089B258) ## $a2 = 8089B258 /* 00C64 8089AD94 27A40078 */ addiu $a0, $sp, 0x0078 ## $a0 = FFFFFFE0 /* 00C68 8089AD98 240702EA */ addiu $a3, $zero, 0x02EA ## $a3 = 000002EA -/* 00C6C 8089AD9C 0C031AB1 */ jal func_800C6AC4 +/* 00C6C 8089AD9C 0C031AB1 */ jal Graph_OpenDisps /* 00C70 8089ADA0 00A0A825 */ or $s5, $a1, $zero ## $s5 = 00000000 /* 00C74 8089ADA4 0C024F46 */ jal func_80093D18 /* 00C78 8089ADA8 8EC40000 */ lw $a0, 0x0000($s6) ## 00000000 @@ -114,7 +114,7 @@ glabel func_8089AD48 /* 00DD4 8089AF04 24C6B288 */ addiu $a2, $a2, %lo(D_8089B288) ## $a2 = 8089B288 /* 00DD8 8089AF08 27A40078 */ addiu $a0, $sp, 0x0078 ## $a0 = FFFFFFE0 /* 00DDC 8089AF0C 8EC50000 */ lw $a1, 0x0000($s6) ## 00000000 -/* 00DE0 8089AF10 0C031AD5 */ jal func_800C6B54 +/* 00DE0 8089AF10 0C031AD5 */ jal Graph_CloseDisps /* 00DE4 8089AF14 2407030F */ addiu $a3, $zero, 0x030F ## $a3 = 0000030F /* 00DE8 8089AF18 8FBF0054 */ lw $ra, 0x0054($sp) /* 00DEC 8089AF1C D7B40018 */ ldc1 $f20, 0x0018($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Zurerukabe/BgJyaZurerukabe_Draw.s b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Zurerukabe/BgJyaZurerukabe_Draw.s index 53f7ec5256..4d4ec35f0a 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Zurerukabe/BgJyaZurerukabe_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Jya_Zurerukabe/BgJyaZurerukabe_Draw.s @@ -4,7 +4,7 @@ glabel BgJyaZurerukabe_Draw /* 00558 8089B998 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 /* 0055C 8089B99C AFBF0014 */ sw $ra, 0x0014($sp) /* 00560 8089B9A0 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 -/* 00564 8089B9A4 0C00D498 */ jal Draw_DListOpa +/* 00564 8089B9A4 0C00D498 */ jal Gfx_DrawDListOpa /* 00568 8089B9A8 24A52340 */ addiu $a1, $a1, 0x2340 ## $a1 = 06012340 /* 0056C 8089B9AC 8FBF0014 */ lw $ra, 0x0014($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Menkuri_Eye/BgMenkuriEye_Draw.s b/asm/non_matchings/overlays/actors/ovl_Bg_Menkuri_Eye/BgMenkuriEye_Draw.s index 4329662882..fb5e7abcce 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Menkuri_Eye/BgMenkuriEye_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Menkuri_Eye/BgMenkuriEye_Draw.s @@ -1,25 +1,25 @@ glabel BgMenkuriEye_Draw /* 00270 8089BEE0 27BDFFA8 */ addiu $sp, $sp, 0xFFA8 ## $sp = FFFFFFA8 -/* 00274 8089BEE4 AFBF001C */ sw $ra, 0x001C($sp) -/* 00278 8089BEE8 AFB10018 */ sw $s1, 0x0018($sp) -/* 0027C 8089BEEC AFB00014 */ sw $s0, 0x0014($sp) -/* 00280 8089BEF0 AFA5005C */ sw $a1, 0x005C($sp) +/* 00274 8089BEE4 AFBF001C */ sw $ra, 0x001C($sp) +/* 00278 8089BEE8 AFB10018 */ sw $s1, 0x0018($sp) +/* 0027C 8089BEEC AFB00014 */ sw $s0, 0x0014($sp) +/* 00280 8089BEF0 AFA5005C */ sw $a1, 0x005C($sp) /* 00284 8089BEF4 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 /* 00288 8089BEF8 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 0028C 8089BEFC 3C06808A */ lui $a2, %hi(D_8089C0D0) ## $a2 = 808A0000 /* 00290 8089BF00 24C6C0D0 */ addiu $a2, $a2, %lo(D_8089C0D0) ## $a2 = 8089C0D0 /* 00294 8089BF04 27A4003C */ addiu $a0, $sp, 0x003C ## $a0 = FFFFFFE4 /* 00298 8089BF08 24070124 */ addiu $a3, $zero, 0x0124 ## $a3 = 00000124 -/* 0029C 8089BF0C 0C031AB1 */ jal func_800C6AC4 +/* 0029C 8089BF0C 0C031AB1 */ jal Graph_OpenDisps /* 002A0 8089BF10 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 -/* 002A4 8089BF14 8FAF005C */ lw $t7, 0x005C($sp) -/* 002A8 8089BF18 0C024F61 */ jal func_80093D84 +/* 002A4 8089BF14 8FAF005C */ lw $t7, 0x005C($sp) +/* 002A8 8089BF18 0C024F61 */ jal func_80093D84 /* 002AC 8089BF1C 8DE40000 */ lw $a0, 0x0000($t7) ## 00000000 -/* 002B0 8089BF20 8FA4005C */ lw $a0, 0x005C($sp) +/* 002B0 8089BF20 8FA4005C */ lw $a0, 0x005C($sp) /* 002B4 8089BF24 0C00B2D0 */ jal Flags_GetSwitch - + /* 002B8 8089BF28 8605001C */ lh $a1, 0x001C($s0) ## 0000001C -/* 002BC 8089BF2C 1040000A */ beq $v0, $zero, .L8089BF58 +/* 002BC 8089BF2C 1040000A */ beq $v0, $zero, .L8089BF58 /* 002C0 8089BF30 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 /* 002C4 8089BF34 8E2202D0 */ lw $v0, 0x02D0($s1) ## 000002D0 /* 002C8 8089BF38 3C08C800 */ lui $t0, 0xC800 ## $t0 = C8000000 @@ -28,13 +28,13 @@ glabel BgMenkuriEye_Draw /* 002D4 8089BF44 AE3802D0 */ sw $t8, 0x02D0($s1) ## 000002D0 /* 002D8 8089BF48 3C19FB00 */ lui $t9, 0xFB00 ## $t9 = FB000000 /* 002DC 8089BF4C AC590000 */ sw $t9, 0x0000($v0) ## 00000000 -/* 002E0 8089BF50 10000015 */ beq $zero, $zero, .L8089BFA8 +/* 002E0 8089BF50 10000015 */ beq $zero, $zero, .L8089BFA8 /* 002E4 8089BF54 AC480004 */ sw $t0, 0x0004($v0) ## 00000004 .L8089BF58: /* 002E8 8089BF58 8609014C */ lh $t1, 0x014C($s0) ## 0000014C /* 002EC 8089BF5C 2401FFFF */ addiu $at, $zero, 0xFFFF ## $at = FFFFFFFF /* 002F0 8089BF60 3C0EFB00 */ lui $t6, 0xFB00 ## $t6 = FB000000 -/* 002F4 8089BF64 5521000A */ bnel $t1, $at, .L8089BF90 +/* 002F4 8089BF64 5521000A */ bnel $t1, $at, .L8089BF90 /* 002F8 8089BF68 8E2202D0 */ lw $v0, 0x02D0($s1) ## 000002D0 /* 002FC 8089BF6C 8E2202D0 */ lw $v0, 0x02D0($s1) ## 000002D0 /* 00300 8089BF70 3C0BFB00 */ lui $t3, 0xFB00 ## $t3 = FB000000 @@ -42,7 +42,7 @@ glabel BgMenkuriEye_Draw /* 00308 8089BF78 244A0008 */ addiu $t2, $v0, 0x0008 ## $t2 = 00000008 /* 0030C 8089BF7C AE2A02D0 */ sw $t2, 0x02D0($s1) ## 000002D0 /* 00310 8089BF80 AC4C0004 */ sw $t4, 0x0004($v0) ## 00000004 -/* 00314 8089BF84 10000008 */ beq $zero, $zero, .L8089BFA8 +/* 00314 8089BF84 10000008 */ beq $zero, $zero, .L8089BFA8 /* 00318 8089BF88 AC4B0000 */ sw $t3, 0x0000($v0) ## 00000000 /* 0031C 8089BF8C 8E2202D0 */ lw $v0, 0x02D0($s1) ## 000002D0 .L8089BF90: @@ -55,17 +55,17 @@ glabel BgMenkuriEye_Draw .L8089BFA8: /* 00338 8089BFA8 C60C0024 */ lwc1 $f12, 0x0024($s0) ## 00000024 /* 0033C 8089BFAC C60E0028 */ lwc1 $f14, 0x0028($s0) ## 00000028 -/* 00340 8089BFB0 0C034261 */ jal Matrix_Translate +/* 00340 8089BFB0 0C034261 */ jal Matrix_Translate /* 00344 8089BFB4 8E06002C */ lw $a2, 0x002C($s0) ## 0000002C /* 00348 8089BFB8 86040030 */ lh $a0, 0x0030($s0) ## 00000030 /* 0034C 8089BFBC 86050032 */ lh $a1, 0x0032($s0) ## 00000032 /* 00350 8089BFC0 86060034 */ lh $a2, 0x0034($s0) ## 00000034 -/* 00354 8089BFC4 0C034421 */ jal Matrix_RotateXYZ +/* 00354 8089BFC4 0C034421 */ jal Matrix_RotateZYX /* 00358 8089BFC8 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 /* 0035C 8089BFCC C60C0050 */ lwc1 $f12, 0x0050($s0) ## 00000050 /* 00360 8089BFD0 C60E0054 */ lwc1 $f14, 0x0054($s0) ## 00000054 /* 00364 8089BFD4 8E060058 */ lw $a2, 0x0058($s0) ## 00000058 -/* 00368 8089BFD8 0C0342A3 */ jal Matrix_Scale +/* 00368 8089BFD8 0C0342A3 */ jal Matrix_Scale /* 0036C 8089BFDC 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 /* 00370 8089BFE0 8E2202D0 */ lw $v0, 0x02D0($s1) ## 000002D0 /* 00374 8089BFE4 3C19DA38 */ lui $t9, 0xDA38 ## $t9 = DA380000 @@ -73,12 +73,12 @@ glabel BgMenkuriEye_Draw /* 0037C 8089BFEC 24580008 */ addiu $t8, $v0, 0x0008 ## $t8 = 00000008 /* 00380 8089BFF0 AE3802D0 */ sw $t8, 0x02D0($s1) ## 000002D0 /* 00384 8089BFF4 AC590000 */ sw $t9, 0x0000($v0) ## 00000000 -/* 00388 8089BFF8 8FA8005C */ lw $t0, 0x005C($sp) +/* 00388 8089BFF8 8FA8005C */ lw $t0, 0x005C($sp) /* 0038C 8089BFFC 3C05808A */ lui $a1, %hi(D_8089C0E8) ## $a1 = 808A0000 /* 00390 8089C000 24A5C0E8 */ addiu $a1, $a1, %lo(D_8089C0E8) ## $a1 = 8089C0E8 /* 00394 8089C004 2406014B */ addiu $a2, $zero, 0x014B ## $a2 = 0000014B /* 00398 8089C008 00408025 */ or $s0, $v0, $zero ## $s0 = 00000000 -/* 0039C 8089C00C 0C0346A2 */ jal Matrix_NewMtx +/* 0039C 8089C00C 0C0346A2 */ jal Matrix_NewMtx /* 003A0 8089C010 8D040000 */ lw $a0, 0x0000($t0) ## 00000000 /* 003A4 8089C014 AE020004 */ sw $v0, 0x0004($s0) ## 00000004 /* 003A8 8089C018 8E2202D0 */ lw $v0, 0x02D0($s1) ## 000002D0 @@ -89,17 +89,17 @@ glabel BgMenkuriEye_Draw /* 003BC 8089C02C 3C0ADE00 */ lui $t2, 0xDE00 ## $t2 = DE000000 /* 003C0 8089C030 AC4A0000 */ sw $t2, 0x0000($v0) ## 00000000 /* 003C4 8089C034 AC4B0004 */ sw $t3, 0x0004($v0) ## 00000004 -/* 003C8 8089C038 8FAC005C */ lw $t4, 0x005C($sp) +/* 003C8 8089C038 8FAC005C */ lw $t4, 0x005C($sp) /* 003CC 8089C03C 3C06808A */ lui $a2, %hi(D_8089C100) ## $a2 = 808A0000 /* 003D0 8089C040 24C6C100 */ addiu $a2, $a2, %lo(D_8089C100) ## $a2 = 8089C100 /* 003D4 8089C044 27A4003C */ addiu $a0, $sp, 0x003C ## $a0 = FFFFFFE4 /* 003D8 8089C048 2407014F */ addiu $a3, $zero, 0x014F ## $a3 = 0000014F -/* 003DC 8089C04C 0C031AD5 */ jal func_800C6B54 +/* 003DC 8089C04C 0C031AD5 */ jal Graph_CloseDisps /* 003E0 8089C050 8D850000 */ lw $a1, 0x0000($t4) ## 00000000 -/* 003E4 8089C054 8FBF001C */ lw $ra, 0x001C($sp) -/* 003E8 8089C058 8FB00014 */ lw $s0, 0x0014($sp) -/* 003EC 8089C05C 8FB10018 */ lw $s1, 0x0018($sp) -/* 003F0 8089C060 03E00008 */ jr $ra +/* 003E4 8089C054 8FBF001C */ lw $ra, 0x001C($sp) +/* 003E8 8089C058 8FB00014 */ lw $s0, 0x0014($sp) +/* 003EC 8089C05C 8FB10018 */ lw $s1, 0x0018($sp) +/* 003F0 8089C060 03E00008 */ jr $ra /* 003F4 8089C064 27BD0058 */ addiu $sp, $sp, 0x0058 ## $sp = 00000000 /* 003F8 8089C068 00000000 */ nop /* 003FC 8089C06C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Menkuri_Nisekabe/BgMenkuriNisekabe_Draw.s b/asm/non_matchings/overlays/actors/ovl_Bg_Menkuri_Nisekabe/BgMenkuriNisekabe_Draw.s index 5efa0c5b28..67a4e3aef1 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Menkuri_Nisekabe/BgMenkuriNisekabe_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Menkuri_Nisekabe/BgMenkuriNisekabe_Draw.s @@ -12,7 +12,7 @@ glabel BgMenkuriNisekabe_Draw /* 00090 8089C3C0 3C05808A */ lui $a1, %hi(D_8089C430) ## $a1 = 808A0000 /* 00094 8089C3C4 0002C080 */ sll $t8, $v0, 2 /* 00098 8089C3C8 00B82821 */ addu $a1, $a1, $t8 -/* 0009C 8089C3CC 0C00D4C9 */ jal Draw_DListXlu +/* 0009C 8089C3CC 0C00D4C9 */ jal Gfx_DrawDListXlu /* 000A0 8089C3D0 8CA5C430 */ lw $a1, %lo(D_8089C430)($a1) /* 000A4 8089C3D4 10000008 */ beq $zero, $zero, .L8089C3F8 @@ -22,7 +22,7 @@ glabel BgMenkuriNisekabe_Draw /* 000B0 8089C3E0 3C05808A */ lui $a1, %hi(D_8089C430) ## $a1 = 808A0000 /* 000B4 8089C3E4 00B92821 */ addu $a1, $a1, $t9 /* 000B8 8089C3E8 8CA5C430 */ lw $a1, %lo(D_8089C430)($a1) -/* 000BC 8089C3EC 0C00D498 */ jal Draw_DListOpa +/* 000BC 8089C3EC 0C00D498 */ jal Gfx_DrawDListOpa /* 000C0 8089C3F0 00C02025 */ or $a0, $a2, $zero ## $a0 = 00000000 /* 000C4 8089C3F4 8FBF0014 */ lw $ra, 0x0014($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Mizu_Bwall/BgMizuBwall_Draw.s b/asm/non_matchings/overlays/actors/ovl_Bg_Mizu_Bwall/BgMizuBwall_Draw.s index fc4e5a75ea..19b66488c3 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Mizu_Bwall/BgMizuBwall_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Mizu_Bwall/BgMizuBwall_Draw.s @@ -10,7 +10,7 @@ glabel BgMizuBwall_Draw /* 00F4C 8089D3CC 24C6DA14 */ addiu $a2, $a2, %lo(D_8089DA14) ## $a2 = 8089DA14 /* 00F50 8089D3D0 27A40070 */ addiu $a0, $sp, 0x0070 ## $a0 = FFFFFFE0 /* 00F54 8089D3D4 24070447 */ addiu $a3, $zero, 0x0447 ## $a3 = 00000447 -/* 00F58 8089D3D8 0C031AB1 */ jal func_800C6AC4 +/* 00F58 8089D3D8 0C031AB1 */ jal Graph_OpenDisps /* 00F5C 8089D3DC 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 /* 00F60 8089D3E0 3C0E0001 */ lui $t6, 0x0001 ## $t6 = 00010000 /* 00F64 8089D3E4 01D17021 */ addu $t6, $t6, $s1 @@ -47,7 +47,7 @@ glabel BgMizuBwall_Draw /* 00FE0 8089D460 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 /* 00FE4 8089D464 AFA2006C */ sw $v0, 0x006C($sp) /* 00FE8 8089D468 AFA60054 */ sw $a2, 0x0054($sp) -/* 00FEC 8089D46C 0C02541A */ jal Draw_TwoTexScrollEnvColor +/* 00FEC 8089D46C 0C02541A */ jal Gfx_TwoTexScrollEnvColor /* 00FF0 8089D470 AFAD0038 */ sw $t5, 0x0038($sp) /* 00FF4 8089D474 8FA3006C */ lw $v1, 0x006C($sp) /* 00FF8 8089D478 3C0FDB06 */ lui $t7, 0xDB06 ## $t7 = DB060000 @@ -79,7 +79,7 @@ glabel BgMizuBwall_Draw /* 01060 8089D4E0 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 01064 8089D4E4 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 /* 01068 8089D4E8 AFA20068 */ sw $v0, 0x0068($sp) -/* 0106C 8089D4EC 0C02541A */ jal Draw_TwoTexScrollEnvColor +/* 0106C 8089D4EC 0C02541A */ jal Gfx_TwoTexScrollEnvColor /* 01070 8089D4F0 AFAC0038 */ sw $t4, 0x0038($sp) /* 01074 8089D4F4 8FA30068 */ lw $v1, 0x0068($sp) /* 01078 8089D4F8 3C0EDB06 */ lui $t6, 0xDB06 ## $t6 = DB060000 @@ -111,7 +111,7 @@ glabel BgMizuBwall_Draw /* 010E0 8089D560 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 010E4 8089D564 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 /* 010E8 8089D568 AFA20064 */ sw $v0, 0x0064($sp) -/* 010EC 8089D56C 0C02541A */ jal Draw_TwoTexScrollEnvColor +/* 010EC 8089D56C 0C02541A */ jal Gfx_TwoTexScrollEnvColor /* 010F0 8089D570 AFAB0038 */ sw $t3, 0x0038($sp) /* 010F4 8089D574 8FA30064 */ lw $v1, 0x0064($sp) /* 010F8 8089D578 3C0DDB06 */ lui $t5, 0xDB06 ## $t5 = DB060000 @@ -146,7 +146,7 @@ glabel BgMizuBwall_Draw /* 0116C 8089D5EC 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 01170 8089D5F0 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 /* 01174 8089D5F4 AFA20060 */ sw $v0, 0x0060($sp) -/* 01178 8089D5F8 0C02541A */ jal Draw_TwoTexScrollEnvColor +/* 01178 8089D5F8 0C02541A */ jal Gfx_TwoTexScrollEnvColor /* 0117C 8089D5FC AFAA0038 */ sw $t2, 0x0038($sp) /* 01180 8089D600 8FA30060 */ lw $v1, 0x0060($sp) /* 01184 8089D604 3C0CDA38 */ lui $t4, 0xDA38 ## $t4 = DA380000 @@ -181,7 +181,7 @@ glabel BgMizuBwall_Draw /* 011F8 8089D678 8F2802B8 */ lw $t0, 0x02B8($t9) ## 000002B8 /* 011FC 8089D67C AC480004 */ sw $t0, 0x0004($v0) ## 00000004 .L8089D680: -/* 01200 8089D680 0C031AD5 */ jal func_800C6B54 +/* 01200 8089D680 0C031AD5 */ jal Graph_CloseDisps /* 01204 8089D684 8E250000 */ lw $a1, 0x0000($s1) ## 00000000 /* 01208 8089D688 8FBF004C */ lw $ra, 0x004C($sp) /* 0120C 8089D68C 8FB00044 */ lw $s0, 0x0044($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Mizu_Movebg/BgMizuMovebg_Draw.s b/asm/non_matchings/overlays/actors/ovl_Bg_Mizu_Movebg/BgMizuMovebg_Draw.s index 566cde9bec..1d43b544f5 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Mizu_Movebg/BgMizuMovebg_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Mizu_Movebg/BgMizuMovebg_Draw.s @@ -10,7 +10,7 @@ glabel BgMizuMovebg_Draw /* 00C20 8089E850 24C6EBC0 */ addiu $a2, $a2, %lo(D_8089EBC0) ## $a2 = 8089EBC0 /* 00C24 8089E854 27A40070 */ addiu $a0, $sp, 0x0070 ## $a0 = FFFFFFE0 /* 00C28 8089E858 240702F2 */ addiu $a3, $zero, 0x02F2 ## $a3 = 000002F2 -/* 00C2C 8089E85C 0C031AB1 */ jal func_800C6AC4 +/* 00C2C 8089E85C 0C031AB1 */ jal Graph_OpenDisps /* 00C30 8089E860 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 /* 00C34 8089E864 3C0E0001 */ lui $t6, 0x0001 ## $t6 = 00010000 /* 00C38 8089E868 01D17021 */ addu $t6, $t6, $s1 @@ -47,7 +47,7 @@ glabel BgMizuMovebg_Draw /* 00CB4 8089E8E4 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 /* 00CB8 8089E8E8 AFA2006C */ sw $v0, 0x006C($sp) /* 00CBC 8089E8EC AFA60054 */ sw $a2, 0x0054($sp) -/* 00CC0 8089E8F0 0C02541A */ jal Draw_TwoTexScrollEnvColor +/* 00CC0 8089E8F0 0C02541A */ jal Gfx_TwoTexScrollEnvColor /* 00CC4 8089E8F4 AFAD0038 */ sw $t5, 0x0038($sp) /* 00CC8 8089E8F8 8FA3006C */ lw $v1, 0x006C($sp) /* 00CCC 8089E8FC 3C0FDB06 */ lui $t7, 0xDB06 ## $t7 = DB060000 @@ -79,7 +79,7 @@ glabel BgMizuMovebg_Draw /* 00D34 8089E964 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 00D38 8089E968 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 /* 00D3C 8089E96C AFA20068 */ sw $v0, 0x0068($sp) -/* 00D40 8089E970 0C02541A */ jal Draw_TwoTexScrollEnvColor +/* 00D40 8089E970 0C02541A */ jal Gfx_TwoTexScrollEnvColor /* 00D44 8089E974 AFAC0038 */ sw $t4, 0x0038($sp) /* 00D48 8089E978 8FA30068 */ lw $v1, 0x0068($sp) /* 00D4C 8089E97C 3C0EDB06 */ lui $t6, 0xDB06 ## $t6 = DB060000 @@ -111,7 +111,7 @@ glabel BgMizuMovebg_Draw /* 00DB4 8089E9E4 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 00DB8 8089E9E8 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 /* 00DBC 8089E9EC AFA20064 */ sw $v0, 0x0064($sp) -/* 00DC0 8089E9F0 0C02541A */ jal Draw_TwoTexScrollEnvColor +/* 00DC0 8089E9F0 0C02541A */ jal Gfx_TwoTexScrollEnvColor /* 00DC4 8089E9F4 AFAB0038 */ sw $t3, 0x0038($sp) /* 00DC8 8089E9F8 8FA30064 */ lw $v1, 0x0064($sp) /* 00DCC 8089E9FC 3C0DDB06 */ lui $t5, 0xDB06 ## $t5 = DB060000 @@ -146,7 +146,7 @@ glabel BgMizuMovebg_Draw /* 00E40 8089EA70 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 00E44 8089EA74 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 /* 00E48 8089EA78 AFA20060 */ sw $v0, 0x0060($sp) -/* 00E4C 8089EA7C 0C02541A */ jal Draw_TwoTexScrollEnvColor +/* 00E4C 8089EA7C 0C02541A */ jal Gfx_TwoTexScrollEnvColor /* 00E50 8089EA80 AFAA0038 */ sw $t2, 0x0038($sp) /* 00E54 8089EA84 8FA30060 */ lw $v1, 0x0060($sp) /* 00E58 8089EA88 3C0CDA38 */ lui $t4, 0xDA38 ## $t4 = DA380000 @@ -181,7 +181,7 @@ glabel BgMizuMovebg_Draw /* 00ECC 8089EAFC 8F280180 */ lw $t0, 0x0180($t9) ## 00000180 /* 00ED0 8089EB00 AC480004 */ sw $t0, 0x0004($v0) ## 00000004 .L8089EB04: -/* 00ED4 8089EB04 0C031AD5 */ jal func_800C6B54 +/* 00ED4 8089EB04 0C031AD5 */ jal Graph_CloseDisps /* 00ED8 8089EB08 8E250000 */ lw $a1, 0x0000($s1) ## 00000000 /* 00EDC 8089EB0C 8FBF004C */ lw $ra, 0x004C($sp) /* 00EE0 8089EB10 8FB00044 */ lw $s0, 0x0044($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Mizu_Shutter/BgMizuShutter_Draw.s b/asm/non_matchings/overlays/actors/ovl_Bg_Mizu_Shutter/BgMizuShutter_Draw.s index 57bf770a8b..44be37bac1 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Mizu_Shutter/BgMizuShutter_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Mizu_Shutter/BgMizuShutter_Draw.s @@ -9,7 +9,7 @@ glabel BgMizuShutter_Draw /* 00614 8089F464 24C6F580 */ addiu $a2, $a2, %lo(D_8089F580) ## $a2 = 8089F580 /* 00618 8089F468 27A4002C */ addiu $a0, $sp, 0x002C ## $a0 = FFFFFFE4 /* 0061C 8089F46C 2407019A */ addiu $a3, $zero, 0x019A ## $a3 = 0000019A -/* 00620 8089F470 0C031AB1 */ jal func_800C6AC4 +/* 00620 8089F470 0C031AB1 */ jal Graph_OpenDisps /* 00624 8089F474 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 /* 00628 8089F478 8FAF004C */ lw $t7, 0x004C($sp) /* 0062C 8089F47C 0C024F46 */ jal func_80093D18 @@ -46,7 +46,7 @@ glabel BgMizuShutter_Draw /* 006A8 8089F4F8 8FAD004C */ lw $t5, 0x004C($sp) .L8089F4FC: /* 006AC 8089F4FC 27A4002C */ addiu $a0, $sp, 0x002C ## $a0 = FFFFFFE4 -/* 006B0 8089F500 0C031AD5 */ jal func_800C6B54 +/* 006B0 8089F500 0C031AD5 */ jal Graph_CloseDisps /* 006B4 8089F504 8DA50000 */ lw $a1, 0x0000($t5) ## 00000000 /* 006B8 8089F508 8FBF001C */ lw $ra, 0x001C($sp) /* 006BC 8089F50C 8FB00018 */ lw $s0, 0x0018($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Mizu_Water/BgMizuWater_Draw.s b/asm/non_matchings/overlays/actors/ovl_Bg_Mizu_Water/BgMizuWater_Draw.s index c0b1495d7d..ff5d8c59ad 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Mizu_Water/BgMizuWater_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Mizu_Water/BgMizuWater_Draw.s @@ -10,7 +10,7 @@ glabel BgMizuWater_Draw /* 00B08 808A03B8 24C605A8 */ addiu $a2, $a2, %lo(D_808A05A8) ## $a2 = 808A05A8 /* 00B0C 808A03BC 27A4005C */ addiu $a0, $sp, 0x005C ## $a0 = FFFFFFE4 /* 00B10 808A03C0 240702E2 */ addiu $a3, $zero, 0x02E2 ## $a3 = 000002E2 -/* 00B14 808A03C4 0C031AB1 */ jal func_800C6AC4 +/* 00B14 808A03C4 0C031AB1 */ jal Graph_OpenDisps /* 00B18 808A03C8 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 /* 00B1C 808A03CC 3C030001 */ lui $v1, 0x0001 ## $v1 = 00010000 /* 00B20 808A03D0 00711821 */ addu $v1, $v1, $s1 @@ -40,7 +40,7 @@ glabel BgMizuWater_Draw /* 00B80 808A0430 AFB80010 */ sw $t8, 0x0010($sp) /* 00B84 808A0434 AFA0001C */ sw $zero, 0x001C($sp) /* 00B88 808A0438 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 00B8C 808A043C 0C0253D0 */ jal Draw_TwoTexScroll +/* 00B8C 808A043C 0C0253D0 */ jal Gfx_TwoTexScroll /* 00B90 808A0440 AFA20058 */ sw $v0, 0x0058($sp) /* 00B94 808A0444 8FA80058 */ lw $t0, 0x0058($sp) /* 00B98 808A0448 3C0DDA38 */ lui $t5, 0xDA38 ## $t5 = DA380000 @@ -84,7 +84,7 @@ glabel BgMizuWater_Draw /* 00C30 808A04E0 8E250000 */ lw $a1, 0x0000($s1) ## 00000000 /* 00C34 808A04E4 24C605D8 */ addiu $a2, $a2, %lo(D_808A05D8) ## $a2 = 808A05D8 /* 00C38 808A04E8 27A4005C */ addiu $a0, $sp, 0x005C ## $a0 = FFFFFFE4 -/* 00C3C 808A04EC 0C031AD5 */ jal func_800C6B54 +/* 00C3C 808A04EC 0C031AD5 */ jal Graph_CloseDisps /* 00C40 808A04F0 240702F4 */ addiu $a3, $zero, 0x02F4 ## $a3 = 000002F4 /* 00C44 808A04F4 8FBF003C */ lw $ra, 0x003C($sp) /* 00C48 808A04F8 8FB00034 */ lw $s0, 0x0034($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Bigst/func_808A10D4.s b/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Bigst/func_808A10D4.s index cf26bc27ce..07625a221d 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Bigst/func_808A10D4.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Bigst/func_808A10D4.s @@ -14,22 +14,22 @@ glabel func_808A10D4 /* 00544 808A1104 24050003 */ addiu $a1, $zero, 0x0003 ## $a1 = 00000003 /* 00548 808A1108 0018C880 */ sll $t9, $t8, 2 /* 0054C 808A110C 00594021 */ addu $t0, $v0, $t9 -/* 00550 808A1110 0C024BE2 */ jal func_80092F88 +/* 00550 808A1110 0C024BE2 */ jal Quake_Add /* 00554 808A1114 8D040790 */ lw $a0, 0x0790($t0) ## 00000790 /* 00558 808A1118 00022400 */ sll $a0, $v0, 16 /* 0055C 808A111C AFA20028 */ sw $v0, 0x0028($sp) /* 00560 808A1120 00042403 */ sra $a0, $a0, 16 -/* 00564 808A1124 0C024B6B */ jal func_80092DAC +/* 00564 808A1124 0C024B6B */ jal Quake_SetSpeed /* 00568 808A1128 240561A8 */ addiu $a1, $zero, 0x61A8 ## $a1 = 000061A8 /* 0056C 808A112C 87A4002A */ lh $a0, 0x002A($sp) /* 00570 808A1130 24050005 */ addiu $a1, $zero, 0x0005 ## $a1 = 00000005 /* 00574 808A1134 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 /* 00578 808A1138 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 /* 0057C 808A113C AFA00010 */ sw $zero, 0x0010($sp) -/* 00580 808A1140 0C024B9C */ jal func_80092E70 +/* 00580 808A1140 0C024B9C */ jal Quake_SetQuakeValues /* 00584 808A1144 AFA40024 */ sw $a0, 0x0024($sp) /* 00588 808A1148 8FA40024 */ lw $a0, 0x0024($sp) -/* 0058C 808A114C 0C024B7C */ jal func_80092DF0 +/* 0058C 808A114C 0C024B7C */ jal Quake_SetCountdown /* 00590 808A1150 24050010 */ addiu $a1, $zero, 0x0010 ## $a1 = 00000010 /* 00594 808A1154 8FBF001C */ lw $ra, 0x001C($sp) /* 00598 808A1158 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Bigst/func_808A13B4.s b/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Bigst/func_808A13B4.s index 8c2397602b..2dc4fa3ae2 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Bigst/func_808A13B4.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Bigst/func_808A13B4.s @@ -10,7 +10,7 @@ glabel func_808A13B4 /* 00814 808A13D4 24C61668 */ addiu $a2, $a2, %lo(D_808A1668) ## $a2 = 808A1668 /* 00818 808A13D8 27A40034 */ addiu $a0, $sp, 0x0034 ## $a0 = FFFFFFE4 /* 0081C 808A13DC 2407021D */ addiu $a3, $zero, 0x021D ## $a3 = 0000021D -/* 00820 808A13E0 0C031AB1 */ jal func_800C6AC4 +/* 00820 808A13E0 0C031AB1 */ jal Graph_OpenDisps /* 00824 808A13E4 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 /* 00828 808A13E8 0C024F46 */ jal func_80093D18 /* 0082C 808A13EC 8E240000 */ lw $a0, 0x0000($s1) ## 00000000 @@ -56,7 +56,7 @@ glabel func_808A13B4 /* 008CC 808A148C 8E250000 */ lw $a1, 0x0000($s1) ## 00000000 /* 008D0 808A1490 24C61698 */ addiu $a2, $a2, %lo(D_808A1698) ## $a2 = 808A1698 /* 008D4 808A1494 27A40034 */ addiu $a0, $sp, 0x0034 ## $a0 = FFFFFFE4 -/* 008D8 808A1498 0C031AD5 */ jal func_800C6B54 +/* 008D8 808A1498 0C031AD5 */ jal Graph_CloseDisps /* 008DC 808A149C 24070229 */ addiu $a3, $zero, 0x0229 ## $a3 = 00000229 /* 008E0 808A14A0 8FBF001C */ lw $ra, 0x001C($sp) /* 008E4 808A14A4 8FB00014 */ lw $s0, 0x0014($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Elevator/func_808A210C.s b/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Elevator/func_808A210C.s index 0489344e20..cf3c5c9d48 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Elevator/func_808A210C.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Elevator/func_808A210C.s @@ -10,7 +10,7 @@ glabel func_808A210C /* 0092C 808A212C 24C6236C */ addiu $a2, $a2, %lo(D_808A236C) ## $a2 = 808A236C /* 00930 808A2130 27A40034 */ addiu $a0, $sp, 0x0034 ## $a0 = FFFFFFE4 /* 00934 808A2134 2407023F */ addiu $a3, $zero, 0x023F ## $a3 = 0000023F -/* 00938 808A2138 0C031AB1 */ jal func_800C6AC4 +/* 00938 808A2138 0C031AB1 */ jal Graph_OpenDisps /* 0093C 808A213C 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 /* 00940 808A2140 0C024F46 */ jal func_80093D18 /* 00944 808A2144 8E240000 */ lw $a0, 0x0000($s1) ## 00000000 @@ -56,7 +56,7 @@ glabel func_808A210C /* 009E4 808A21E4 8E250000 */ lw $a1, 0x0000($s1) ## 00000000 /* 009E8 808A21E8 24C6239C */ addiu $a2, $a2, %lo(D_808A239C) ## $a2 = 808A239C /* 009EC 808A21EC 27A40034 */ addiu $a0, $sp, 0x0034 ## $a0 = FFFFFFE4 -/* 009F0 808A21F0 0C031AD5 */ jal func_800C6B54 +/* 009F0 808A21F0 0C031AD5 */ jal Graph_CloseDisps /* 009F4 808A21F4 24070248 */ addiu $a3, $zero, 0x0248 ## $a3 = 00000248 /* 009F8 808A21F8 8FBF001C */ lw $ra, 0x001C($sp) /* 009FC 808A21FC 8FB00014 */ lw $s0, 0x0014($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Hashigo/func_808A2C28.s b/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Hashigo/func_808A2C28.s index 13cc2f7519..9332cf45aa 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Hashigo/func_808A2C28.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Hashigo/func_808A2C28.s @@ -8,7 +8,7 @@ glabel func_808A2C28 /* 006E0 808A2C40 24C62F28 */ addiu $a2, $a2, %lo(D_808A2F28) ## $a2 = 808A2F28 /* 006E4 808A2C44 27A40034 */ addiu $a0, $sp, 0x0034 ## $a0 = FFFFFFE4 /* 006E8 808A2C48 24070204 */ addiu $a3, $zero, 0x0204 ## $a3 = 00000204 -/* 006EC 808A2C4C 0C031AB1 */ jal func_800C6AC4 +/* 006EC 808A2C4C 0C031AB1 */ jal Graph_OpenDisps /* 006F0 808A2C50 AFA50044 */ sw $a1, 0x0044($sp) /* 006F4 808A2C54 8FAF0054 */ lw $t7, 0x0054($sp) /* 006F8 808A2C58 0C024F46 */ jal func_80093D18 @@ -81,7 +81,7 @@ glabel func_808A2C28 /* 007F8 808A2D58 8FAE0054 */ lw $t6, 0x0054($sp) .L808A2D5C: /* 007FC 808A2D5C 24070213 */ addiu $a3, $zero, 0x0213 ## $a3 = 00000213 -/* 00800 808A2D60 0C031AD5 */ jal func_800C6B54 +/* 00800 808A2D60 0C031AD5 */ jal Graph_CloseDisps /* 00804 808A2D64 8DC50000 */ lw $a1, 0x0000($t6) ## 00000000 /* 00808 808A2D68 8FBF0014 */ lw $ra, 0x0014($sp) /* 0080C 808A2D6C 27BD0050 */ addiu $sp, $sp, 0x0050 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Hashira4/func_808A3484.s b/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Hashira4/func_808A3484.s index 76843a0b13..57d5982627 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Hashira4/func_808A3484.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Hashira4/func_808A3484.s @@ -10,7 +10,7 @@ glabel func_808A3484 /* 00444 808A34A4 24C636A4 */ addiu $a2, $a2, %lo(D_808A36A4) ## $a2 = 808A36A4 /* 00448 808A34A8 27A40034 */ addiu $a0, $sp, 0x0034 ## $a0 = FFFFFFE4 /* 0044C 808A34AC 24070153 */ addiu $a3, $zero, 0x0153 ## $a3 = 00000153 -/* 00450 808A34B0 0C031AB1 */ jal func_800C6AC4 +/* 00450 808A34B0 0C031AB1 */ jal Graph_OpenDisps /* 00454 808A34B4 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 /* 00458 808A34B8 0C024F46 */ jal func_80093D18 /* 0045C 808A34BC 8E240000 */ lw $a0, 0x0000($s1) ## 00000000 @@ -60,7 +60,7 @@ glabel func_808A3484 /* 0050C 808A356C 01194021 */ addu $t0, $t0, $t9 /* 00510 808A3570 8D0835D0 */ lw $t0, %lo(D_808A35D0)($t0) /* 00514 808A3574 AC480004 */ sw $t0, 0x0004($v0) ## 00000004 -/* 00518 808A3578 0C031AD5 */ jal func_800C6B54 +/* 00518 808A3578 0C031AD5 */ jal Graph_CloseDisps /* 0051C 808A357C 8E250000 */ lw $a1, 0x0000($s1) ## 00000000 /* 00520 808A3580 8FBF001C */ lw $ra, 0x001C($sp) /* 00524 808A3584 8FB00014 */ lw $s0, 0x0014($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Hineri/func_808A3F58.s b/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Hineri/func_808A3F58.s index 1366433fd4..bcade15d72 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Hineri/func_808A3F58.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Hineri/func_808A3F58.s @@ -1,37 +1,37 @@ glabel func_808A3F58 /* 00788 808A3F58 27BDFF50 */ addiu $sp, $sp, 0xFF50 ## $sp = FFFFFF50 -/* 0078C 808A3F5C AFBF001C */ sw $ra, 0x001C($sp) -/* 00790 808A3F60 AFB00018 */ sw $s0, 0x0018($sp) -/* 00794 808A3F64 AFA400B0 */ sw $a0, 0x00B0($sp) -/* 00798 808A3F68 AFA500B4 */ sw $a1, 0x00B4($sp) +/* 0078C 808A3F5C AFBF001C */ sw $ra, 0x001C($sp) +/* 00790 808A3F60 AFB00018 */ sw $s0, 0x0018($sp) +/* 00794 808A3F64 AFA400B0 */ sw $a0, 0x00B0($sp) +/* 00798 808A3F68 AFA500B4 */ sw $a1, 0x00B4($sp) /* 0079C 808A3F6C 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 /* 007A0 808A3F70 3C06808A */ lui $a2, %hi(D_808A4420) ## $a2 = 808A0000 /* 007A4 808A3F74 24C64420 */ addiu $a2, $a2, %lo(D_808A4420) ## $a2 = 808A4420 /* 007A8 808A3F78 27A40054 */ addiu $a0, $sp, 0x0054 ## $a0 = FFFFFFA4 /* 007AC 808A3F7C 24070263 */ addiu $a3, $zero, 0x0263 ## $a3 = 00000263 -/* 007B0 808A3F80 0C031AB1 */ jal func_800C6AC4 +/* 007B0 808A3F80 0C031AB1 */ jal Graph_OpenDisps /* 007B4 808A3F84 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 -/* 007B8 808A3F88 8FAF00B4 */ lw $t7, 0x00B4($sp) -/* 007BC 808A3F8C 0C024F46 */ jal func_80093D18 +/* 007B8 808A3F88 8FAF00B4 */ lw $t7, 0x00B4($sp) +/* 007BC 808A3F8C 0C024F46 */ jal func_80093D18 /* 007C0 808A3F90 8DE40000 */ lw $a0, 0x0000($t7) ## 00000000 /* 007C4 808A3F94 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 -/* 007C8 808A3F98 8FA700B4 */ lw $a3, 0x00B4($sp) +/* 007C8 808A3F98 8FA700B4 */ lw $a3, 0x00B4($sp) /* 007CC 808A3F9C 3C19DB06 */ lui $t9, 0xDB06 ## $t9 = DB060000 /* 007D0 808A3FA0 24580008 */ addiu $t8, $v0, 0x0008 ## $t8 = 00000008 /* 007D4 808A3FA4 AE1802C0 */ sw $t8, 0x02C0($s0) ## 000002C0 /* 007D8 808A3FA8 37390020 */ ori $t9, $t9, 0x0020 ## $t9 = DB060020 /* 007DC 808A3FAC AC590000 */ sw $t9, 0x0000($v0) ## 00000000 -/* 007E0 808A3FB0 8FA800B0 */ lw $t0, 0x00B0($sp) +/* 007E0 808A3FB0 8FA800B0 */ lw $t0, 0x00B0($sp) /* 007E4 808A3FB4 3C0C0001 */ lui $t4, 0x0001 ## $t4 = 00010000 /* 007E8 808A3FB8 3C0EDA38 */ lui $t6, 0xDA38 ## $t6 = DA380000 /* 007EC 808A3FBC 81090169 */ lb $t1, 0x0169($t0) ## 00000169 /* 007F0 808A3FC0 35CE0003 */ ori $t6, $t6, 0x0003 ## $t6 = DA380003 /* 007F4 808A3FC4 3C05808A */ lui $a1, %hi(D_808A4438) ## $a1 = 808A0000 -/* 007F8 808A3FC8 00095100 */ sll $t2, $t1, 4 -/* 007FC 808A3FCC 01495021 */ addu $t2, $t2, $t1 -/* 00800 808A3FD0 000A5080 */ sll $t2, $t2, 2 -/* 00804 808A3FD4 00EA5821 */ addu $t3, $a3, $t2 -/* 00808 808A3FD8 018B6021 */ addu $t4, $t4, $t3 +/* 007F8 808A3FC8 00095100 */ sll $t2, $t1, 4 +/* 007FC 808A3FCC 01495021 */ addu $t2, $t2, $t1 +/* 00800 808A3FD0 000A5080 */ sll $t2, $t2, 2 +/* 00804 808A3FD4 00EA5821 */ addu $t3, $a3, $t2 +/* 00808 808A3FD8 018B6021 */ addu $t4, $t4, $t3 /* 0080C 808A3FDC 8D8C17B4 */ lw $t4, 0x17B4($t4) ## 000117B4 /* 00810 808A3FE0 24A54438 */ addiu $a1, $a1, %lo(D_808A4438) ## $a1 = 808A4438 /* 00814 808A3FE4 2406026A */ addiu $a2, $zero, 0x026A ## $a2 = 0000026A @@ -41,75 +41,75 @@ glabel func_808A3F58 /* 00824 808A3FF4 AE0D02C0 */ sw $t5, 0x02C0($s0) ## 000002C0 /* 00828 808A3FF8 AC4E0000 */ sw $t6, 0x0000($v0) ## 00000000 /* 0082C 808A3FFC 8CE40000 */ lw $a0, 0x0000($a3) ## 00000000 -/* 00830 808A4000 0C0346A2 */ jal Matrix_NewMtx -/* 00834 808A4004 AFA2004C */ sw $v0, 0x004C($sp) -/* 00838 808A4008 8FA3004C */ lw $v1, 0x004C($sp) +/* 00830 808A4000 0C0346A2 */ jal Matrix_NewMtx +/* 00834 808A4004 AFA2004C */ sw $v0, 0x004C($sp) +/* 00838 808A4008 8FA3004C */ lw $v1, 0x004C($sp) /* 0083C 808A400C 3C18DE00 */ lui $t8, 0xDE00 ## $t8 = DE000000 /* 00840 808A4010 3C09808A */ lui $t1, %hi(D_808A4408) ## $t1 = 808A0000 /* 00844 808A4014 AC620004 */ sw $v0, 0x0004($v1) ## 00000004 /* 00848 808A4018 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 -/* 0084C 808A401C 8FA600B0 */ lw $a2, 0x00B0($sp) +/* 0084C 808A401C 8FA600B0 */ lw $a2, 0x00B0($sp) /* 00850 808A4020 244F0008 */ addiu $t7, $v0, 0x0008 ## $t7 = 00000008 /* 00854 808A4024 AE0F02C0 */ sw $t7, 0x02C0($s0) ## 000002C0 /* 00858 808A4028 AC580000 */ sw $t8, 0x0000($v0) ## 00000000 /* 0085C 808A402C 84D9001C */ lh $t9, 0x001C($a2) ## 0000001C -/* 00860 808A4030 00194080 */ sll $t0, $t9, 2 -/* 00864 808A4034 01284821 */ addu $t1, $t1, $t0 -/* 00868 808A4038 8D294408 */ lw $t1, %lo(D_808A4408)($t1) +/* 00860 808A4030 00194080 */ sll $t0, $t9, 2 +/* 00864 808A4034 01284821 */ addu $t1, $t1, $t0 +/* 00868 808A4038 8D294408 */ lw $t1, %lo(D_808A4408)($t1) /* 0086C 808A403C AC490004 */ sw $t1, 0x0004($v0) ## 00000004 /* 00870 808A4040 80CA016A */ lb $t2, 0x016A($a2) ## 0000016A -/* 00874 808A4044 59400005 */ blezl $t2, .L808A405C +/* 00874 808A4044 59400005 */ blezl $t2, .L808A405C /* 00878 808A4048 8CCC0164 */ lw $t4, 0x0164($a2) ## 00000164 -/* 0087C 808A404C 0C034236 */ jal Matrix_Get +/* 0087C 808A404C 0C034236 */ jal Matrix_Get /* 00880 808A4050 27A40068 */ addiu $a0, $sp, 0x0068 ## $a0 = FFFFFFB8 -/* 00884 808A4054 8FA600B0 */ lw $a2, 0x00B0($sp) +/* 00884 808A4054 8FA600B0 */ lw $a2, 0x00B0($sp) /* 00888 808A4058 8CCC0164 */ lw $t4, 0x0164($a2) ## 00000164 .L808A405C: /* 0088C 808A405C 3C0B808A */ lui $t3, %hi(func_808A3C8C) ## $t3 = 808A0000 /* 00890 808A4060 256B3C8C */ addiu $t3, $t3, %lo(func_808A3C8C) ## $t3 = 808A3C8C -/* 00894 808A4064 556C0042 */ bnel $t3, $t4, .L808A4170 +/* 00894 808A4064 556C0042 */ bnel $t3, $t4, .L808A4170 /* 00898 808A4068 80CE016A */ lb $t6, 0x016A($a2) ## 0000016A /* 0089C 808A406C 84CD00B8 */ lh $t5, 0x00B8($a2) ## 000000B8 -/* 008A0 808A4070 8FAE00B4 */ lw $t6, 0x00B4($sp) -/* 008A4 808A4074 51A0003E */ beql $t5, $zero, .L808A4170 +/* 008A0 808A4070 8FAE00B4 */ lw $t6, 0x00B4($sp) +/* 008A4 808A4074 51A0003E */ beql $t5, $zero, .L808A4170 /* 008A8 808A4078 80CE016A */ lb $t6, 0x016A($a2) ## 0000016A -/* 008AC 808A407C 0C024F46 */ jal func_80093D18 +/* 008AC 808A407C 0C024F46 */ jal func_80093D18 /* 008B0 808A4080 8DC40000 */ lw $a0, 0x0000($t6) ## 00000000 -/* 008B4 808A4084 8FAF00B0 */ lw $t7, 0x00B0($sp) +/* 008B4 808A4084 8FAF00B0 */ lw $t7, 0x00B0($sp) /* 008B8 808A4088 3C06C4E3 */ lui $a2, 0xC4E3 ## $a2 = C4E30000 /* 008BC 808A408C 34C6A000 */ ori $a2, $a2, 0xA000 ## $a2 = C4E3A000 /* 008C0 808A4090 85F8001C */ lh $t8, 0x001C($t7) ## 0000001C /* 008C4 808A4094 3C01808A */ lui $at, %hi(D_808A44C8) ## $at = 808A0000 /* 008C8 808A4098 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 008CC 808A409C 1700000B */ bne $t8, $zero, .L808A40CC +/* 008CC 808A409C 1700000B */ bne $t8, $zero, .L808A40CC /* 008D0 808A40A0 00000000 */ nop /* 008D4 808A40A4 3C01808A */ lui $at, %hi(D_808A44C0) ## $at = 808A0000 -/* 008D8 808A40A8 C42C44C0 */ lwc1 $f12, %lo(D_808A44C0)($at) +/* 008D8 808A40A8 C42C44C0 */ lwc1 $f12, %lo(D_808A44C0)($at) /* 008DC 808A40AC 3C01808A */ lui $at, %hi(D_808A44C4) ## $at = 808A0000 /* 008E0 808A40B0 3C06C4E3 */ lui $a2, 0xC4E3 ## $a2 = C4E30000 /* 008E4 808A40B4 34C6A000 */ ori $a2, $a2, 0xA000 ## $a2 = C4E3A000 -/* 008E8 808A40B8 C42E44C4 */ lwc1 $f14, %lo(D_808A44C4)($at) -/* 008EC 808A40BC 0C034261 */ jal Matrix_Translate +/* 008E8 808A40B8 C42E44C4 */ lwc1 $f14, %lo(D_808A44C4)($at) +/* 008EC 808A40BC 0C034261 */ jal Matrix_Translate /* 008F0 808A40C0 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 008F4 808A40C4 10000006 */ beq $zero, $zero, .L808A40E0 -/* 008F8 808A40C8 8FB900B0 */ lw $t9, 0x00B0($sp) +/* 008F4 808A40C4 10000006 */ beq $zero, $zero, .L808A40E0 +/* 008F8 808A40C8 8FB900B0 */ lw $t9, 0x00B0($sp) .L808A40CC: -/* 008FC 808A40CC C42C44C8 */ lwc1 $f12, %lo(D_808A44C8)($at) +/* 008FC 808A40CC C42C44C8 */ lwc1 $f12, %lo(D_808A44C8)($at) /* 00900 808A40D0 3C01808A */ lui $at, %hi(D_808A44CC) ## $at = 808A0000 -/* 00904 808A40D4 0C034261 */ jal Matrix_Translate -/* 00908 808A40D8 C42E44CC */ lwc1 $f14, %lo(D_808A44CC)($at) -/* 0090C 808A40DC 8FB900B0 */ lw $t9, 0x00B0($sp) +/* 00904 808A40D4 0C034261 */ jal Matrix_Translate +/* 00908 808A40D8 C42E44CC */ lwc1 $f14, %lo(D_808A44CC)($at) +/* 0090C 808A40DC 8FB900B0 */ lw $t9, 0x00B0($sp) .L808A40E0: /* 00910 808A40E0 00002025 */ or $a0, $zero, $zero ## $a0 = 00000000 /* 00914 808A40E4 24058000 */ addiu $a1, $zero, 0x8000 ## $a1 = FFFF8000 /* 00918 808A40E8 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 0091C 808A40EC 0C034421 */ jal Matrix_RotateXYZ +/* 0091C 808A40EC 0C034421 */ jal Matrix_RotateZYX /* 00920 808A40F0 872600B8 */ lh $a2, 0x00B8($t9) ## 000000B8 /* 00924 808A40F4 44806000 */ mtc1 $zero, $f12 ## $f12 = 0.00 /* 00928 808A40F8 3C01C248 */ lui $at, 0xC248 ## $at = C2480000 /* 0092C 808A40FC 44817000 */ mtc1 $at, $f14 ## $f14 = -50.00 -/* 00930 808A4100 44066000 */ mfc1 $a2, $f12 -/* 00934 808A4104 0C034261 */ jal Matrix_Translate +/* 00930 808A4100 44066000 */ mfc1 $a2, $f12 +/* 00934 808A4104 0C034261 */ jal Matrix_Translate /* 00938 808A4108 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 /* 0093C 808A410C 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 /* 00940 808A4110 3C09DA38 */ lui $t1, 0xDA38 ## $t1 = DA380000 @@ -117,14 +117,14 @@ glabel func_808A3F58 /* 00948 808A4118 24480008 */ addiu $t0, $v0, 0x0008 ## $t0 = 00000008 /* 0094C 808A411C AE0802C0 */ sw $t0, 0x02C0($s0) ## 000002C0 /* 00950 808A4120 AC490000 */ sw $t1, 0x0000($v0) ## 00000000 -/* 00954 808A4124 8FAA00B4 */ lw $t2, 0x00B4($sp) +/* 00954 808A4124 8FAA00B4 */ lw $t2, 0x00B4($sp) /* 00958 808A4128 3C05808A */ lui $a1, %hi(D_808A4450) ## $a1 = 808A0000 /* 0095C 808A412C 24A54450 */ addiu $a1, $a1, %lo(D_808A4450) ## $a1 = 808A4450 /* 00960 808A4130 8D440000 */ lw $a0, 0x0000($t2) ## 00000000 /* 00964 808A4134 2406028C */ addiu $a2, $zero, 0x028C ## $a2 = 0000028C -/* 00968 808A4138 0C0346A2 */ jal Matrix_NewMtx -/* 0096C 808A413C AFA20044 */ sw $v0, 0x0044($sp) -/* 00970 808A4140 8FA30044 */ lw $v1, 0x0044($sp) +/* 00968 808A4138 0C0346A2 */ jal Matrix_NewMtx +/* 0096C 808A413C AFA20044 */ sw $v0, 0x0044($sp) +/* 00970 808A4140 8FA30044 */ lw $v1, 0x0044($sp) /* 00974 808A4144 3C0D0405 */ lui $t5, 0x0405 ## $t5 = 04050000 /* 00978 808A4148 25AD9FE0 */ addiu $t5, $t5, 0x9FE0 ## $t5 = 04049FE0 /* 0097C 808A414C AC620004 */ sw $v0, 0x0004($v1) ## 00000004 @@ -134,47 +134,47 @@ glabel func_808A3F58 /* 0098C 808A415C AE0B02C0 */ sw $t3, 0x02C0($s0) ## 000002C0 /* 00990 808A4160 AC4D0004 */ sw $t5, 0x0004($v0) ## 00000004 /* 00994 808A4164 AC4C0000 */ sw $t4, 0x0000($v0) ## 00000000 -/* 00998 808A4168 8FA600B0 */ lw $a2, 0x00B0($sp) +/* 00998 808A4168 8FA600B0 */ lw $a2, 0x00B0($sp) /* 0099C 808A416C 80CE016A */ lb $t6, 0x016A($a2) ## 0000016A .L808A4170: /* 009A0 808A4170 3C010001 */ lui $at, 0x0001 ## $at = 00010000 /* 009A4 808A4174 342117A4 */ ori $at, $at, 0x17A4 ## $at = 000117A4 -/* 009A8 808A4178 19C0008A */ blez $t6, .L808A43A4 -/* 009AC 808A417C 8FA400B4 */ lw $a0, 0x00B4($sp) -/* 009B0 808A4180 00812021 */ addu $a0, $a0, $at -/* 009B4 808A4184 AFA40020 */ sw $a0, 0x0020($sp) +/* 009A8 808A4178 19C0008A */ blez $t6, .L808A43A4 +/* 009AC 808A417C 8FA400B4 */ lw $a0, 0x00B4($sp) +/* 009B0 808A4180 00812021 */ addu $a0, $a0, $at +/* 009B4 808A4184 AFA40020 */ sw $a0, 0x0020($sp) /* 009B8 808A4188 0C02604B */ jal Object_GetIndex ## ObjectIndex /* 009BC 808A418C 2405000E */ addiu $a1, $zero, 0x000E ## $a1 = 0000000E -/* 009C0 808A4190 8FAF00B0 */ lw $t7, 0x00B0($sp) -/* 009C4 808A4194 0002C600 */ sll $t8, $v0, 24 -/* 009C8 808A4198 0018CE03 */ sra $t9, $t8, 24 -/* 009CC 808A419C 8FA40020 */ lw $a0, 0x0020($sp) -/* 009D0 808A41A0 1B200080 */ blez $t9, .L808A43A4 +/* 009C0 808A4190 8FAF00B0 */ lw $t7, 0x00B0($sp) +/* 009C4 808A4194 0002C600 */ sll $t8, $v0, 24 +/* 009C8 808A4198 0018CE03 */ sra $t9, $t8, 24 +/* 009CC 808A419C 8FA40020 */ lw $a0, 0x0020($sp) +/* 009D0 808A41A0 1B200080 */ blez $t9, .L808A43A4 /* 009D4 808A41A4 A1E2016A */ sb $v0, 0x016A($t7) ## 0000016A -/* 009D8 808A41A8 8FA800B0 */ lw $t0, 0x00B0($sp) +/* 009D8 808A41A8 8FA800B0 */ lw $t0, 0x00B0($sp) /* 009DC 808A41AC 0C026062 */ jal Object_IsLoaded - + /* 009E0 808A41B0 8105016A */ lb $a1, 0x016A($t0) ## 0000016A -/* 009E4 808A41B4 5040007C */ beql $v0, $zero, .L808A43A8 -/* 009E8 808A41B8 8FAD00B4 */ lw $t5, 0x00B4($sp) +/* 009E4 808A41B4 5040007C */ beql $v0, $zero, .L808A43A8 +/* 009E8 808A41B8 8FAD00B4 */ lw $t5, 0x00B4($sp) /* 009EC 808A41BC 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 /* 009F0 808A41C0 3C0ADB06 */ lui $t2, 0xDB06 ## $t2 = DB060000 /* 009F4 808A41C4 354A0018 */ ori $t2, $t2, 0x0018 ## $t2 = DB060018 /* 009F8 808A41C8 24490008 */ addiu $t1, $v0, 0x0008 ## $t1 = 00000008 /* 009FC 808A41CC AE0902C0 */ sw $t1, 0x02C0($s0) ## 000002C0 /* 00A00 808A41D0 AC4A0000 */ sw $t2, 0x0000($v0) ## 00000000 -/* 00A04 808A41D4 8FAC00B0 */ lw $t4, 0x00B0($sp) -/* 00A08 808A41D8 8FAB00B4 */ lw $t3, 0x00B4($sp) +/* 00A04 808A41D4 8FAC00B0 */ lw $t4, 0x00B0($sp) +/* 00A08 808A41D8 8FAB00B4 */ lw $t3, 0x00B4($sp) /* 00A0C 808A41DC 3C180001 */ lui $t8, 0x0001 ## $t8 = 00010000 /* 00A10 808A41E0 818D016A */ lb $t5, 0x016A($t4) ## 0000016A /* 00A14 808A41E4 3C098011 */ lui $t1, 0x8011 ## $t1 = 80110000 /* 00A18 808A41E8 3C08DB06 */ lui $t0, 0xDB06 ## $t0 = DB060000 -/* 00A1C 808A41EC 000D7100 */ sll $t6, $t5, 4 -/* 00A20 808A41F0 01CD7021 */ addu $t6, $t6, $t5 -/* 00A24 808A41F4 000E7080 */ sll $t6, $t6, 2 -/* 00A28 808A41F8 016E7821 */ addu $t7, $t3, $t6 -/* 00A2C 808A41FC 030FC021 */ addu $t8, $t8, $t7 +/* 00A1C 808A41EC 000D7100 */ sll $t6, $t5, 4 +/* 00A20 808A41F0 01CD7021 */ addu $t6, $t6, $t5 +/* 00A24 808A41F4 000E7080 */ sll $t6, $t6, 2 +/* 00A28 808A41F8 016E7821 */ addu $t7, $t3, $t6 +/* 00A2C 808A41FC 030FC021 */ addu $t8, $t8, $t7 /* 00A30 808A4200 8F1817B4 */ lw $t8, 0x17B4($t8) ## 000117B4 /* 00A34 808A4204 35080020 */ ori $t0, $t0, 0x0020 ## $t0 = DB060020 /* 00A38 808A4208 25296290 */ addiu $t1, $t1, 0x6290 ## $t1 = 80116290 @@ -184,7 +184,7 @@ glabel func_808A3F58 /* 00A48 808A4218 24590008 */ addiu $t9, $v0, 0x0008 ## $t9 = 00000008 /* 00A4C 808A421C AE1902C0 */ sw $t9, 0x02C0($s0) ## 000002C0 /* 00A50 808A4220 AC490004 */ sw $t1, 0x0004($v0) ## 00000004 -/* 00A54 808A4224 0C03423F */ jal Matrix_Put +/* 00A54 808A4224 0C03423F */ jal Matrix_Put /* 00A58 808A4228 AC480000 */ sw $t0, 0x0000($v0) ## 00000000 /* 00A5C 808A422C 3C014313 */ lui $at, 0x4313 ## $at = 43130000 /* 00A60 808A4230 44816000 */ mtc1 $at, $f12 ## $f12 = 147.00 @@ -192,32 +192,32 @@ glabel func_808A3F58 /* 00A68 808A4238 44817000 */ mtc1 $at, $f14 ## $f14 = -245.00 /* 00A6C 808A423C 3C06C3E2 */ lui $a2, 0xC3E2 ## $a2 = C3E20000 /* 00A70 808A4240 34C68000 */ ori $a2, $a2, 0x8000 ## $a2 = C3E28000 -/* 00A74 808A4244 0C034261 */ jal Matrix_Translate +/* 00A74 808A4244 0C034261 */ jal Matrix_Translate /* 00A78 808A4248 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 /* 00A7C 808A424C 3C01808A */ lui $at, %hi(D_808A44D0) ## $at = 808A0000 -/* 00A80 808A4250 C42C44D0 */ lwc1 $f12, %lo(D_808A44D0)($at) -/* 00A84 808A4254 0C034348 */ jal Matrix_RotateY +/* 00A80 808A4250 C42C44D0 */ lwc1 $f12, %lo(D_808A44D0)($at) +/* 00A84 808A4254 0C034348 */ jal Matrix_RotateY /* 00A88 808A4258 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 /* 00A8C 808A425C 3C01808A */ lui $at, %hi(D_808A44D4) ## $at = 808A0000 -/* 00A90 808A4260 C42C44D4 */ lwc1 $f12, %lo(D_808A44D4)($at) +/* 00A90 808A4260 C42C44D4 */ lwc1 $f12, %lo(D_808A44D4)($at) /* 00A94 808A4264 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 00A98 808A4268 44066000 */ mfc1 $a2, $f12 -/* 00A9C 808A426C 0C0342A3 */ jal Matrix_Scale -/* 00AA0 808A4270 46006386 */ mov.s $f14, $f12 +/* 00A98 808A4268 44066000 */ mfc1 $a2, $f12 +/* 00A9C 808A426C 0C0342A3 */ jal Matrix_Scale +/* 00AA0 808A4270 46006386 */ mov.s $f14, $f12 /* 00AA4 808A4274 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 /* 00AA8 808A4278 3C0CDA38 */ lui $t4, 0xDA38 ## $t4 = DA380000 /* 00AAC 808A427C 358C0003 */ ori $t4, $t4, 0x0003 ## $t4 = DA380003 /* 00AB0 808A4280 244A0008 */ addiu $t2, $v0, 0x0008 ## $t2 = 00000008 /* 00AB4 808A4284 AE0A02C0 */ sw $t2, 0x02C0($s0) ## 000002C0 /* 00AB8 808A4288 AC4C0000 */ sw $t4, 0x0000($v0) ## 00000000 -/* 00ABC 808A428C 8FAD00B4 */ lw $t5, 0x00B4($sp) +/* 00ABC 808A428C 8FAD00B4 */ lw $t5, 0x00B4($sp) /* 00AC0 808A4290 3C05808A */ lui $a1, %hi(D_808A4468) ## $a1 = 808A0000 /* 00AC4 808A4294 24A54468 */ addiu $a1, $a1, %lo(D_808A4468) ## $a1 = 808A4468 /* 00AC8 808A4298 8DA40000 */ lw $a0, 0x0000($t5) ## 00000000 /* 00ACC 808A429C 240602B1 */ addiu $a2, $zero, 0x02B1 ## $a2 = 000002B1 -/* 00AD0 808A42A0 0C0346A2 */ jal Matrix_NewMtx -/* 00AD4 808A42A4 AFA20034 */ sw $v0, 0x0034($sp) -/* 00AD8 808A42A8 8FA30034 */ lw $v1, 0x0034($sp) +/* 00AD0 808A42A0 0C0346A2 */ jal Matrix_NewMtx +/* 00AD4 808A42A4 AFA20034 */ sw $v0, 0x0034($sp) +/* 00AD8 808A42A8 8FA30034 */ lw $v1, 0x0034($sp) /* 00ADC 808A42AC 3C0F0600 */ lui $t7, 0x0600 ## $t7 = 06000000 /* 00AE0 808A42B0 25EF0AE8 */ addiu $t7, $t7, 0x0AE8 ## $t7 = 06000AE8 /* 00AE4 808A42B4 AC620004 */ sw $v0, 0x0004($v1) ## 00000004 @@ -227,7 +227,7 @@ glabel func_808A3F58 /* 00AF4 808A42C4 244B0008 */ addiu $t3, $v0, 0x0008 ## $t3 = 00000008 /* 00AF8 808A42C8 AE0B02C0 */ sw $t3, 0x02C0($s0) ## 000002C0 /* 00AFC 808A42CC AC4F0004 */ sw $t7, 0x0004($v0) ## 00000004 -/* 00B00 808A42D0 0C03423F */ jal Matrix_Put +/* 00B00 808A42D0 0C03423F */ jal Matrix_Put /* 00B04 808A42D4 AC4E0000 */ sw $t6, 0x0000($v0) ## 00000000 /* 00B08 808A42D8 3C014327 */ lui $at, 0x4327 ## $at = 43270000 /* 00B0C 808A42DC 44816000 */ mtc1 $at, $f12 ## $f12 = 167.00 @@ -235,45 +235,45 @@ glabel func_808A3F58 /* 00B14 808A42E4 44817000 */ mtc1 $at, $f14 ## $f14 = -218.00 /* 00B18 808A42E8 3C06C3E2 */ lui $a2, 0xC3E2 ## $a2 = C3E20000 /* 00B1C 808A42EC 34C68000 */ ori $a2, $a2, 0x8000 ## $a2 = C3E28000 -/* 00B20 808A42F0 0C034261 */ jal Matrix_Translate +/* 00B20 808A42F0 0C034261 */ jal Matrix_Translate /* 00B24 808A42F4 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 00B28 808A42F8 8FA400B4 */ lw $a0, 0x00B4($sp) +/* 00B28 808A42F8 8FA400B4 */ lw $a0, 0x00B4($sp) /* 00B2C 808A42FC 0C00B32C */ jal Flags_GetTreasure - + /* 00B30 808A4300 2405000E */ addiu $a1, $zero, 0x000E ## $a1 = 0000000E -/* 00B34 808A4304 10400007 */ beq $v0, $zero, .L808A4324 +/* 00B34 808A4304 10400007 */ beq $v0, $zero, .L808A4324 /* 00B38 808A4308 3C01808A */ lui $at, %hi(D_808A44DC) ## $at = 808A0000 /* 00B3C 808A430C 3C01808A */ lui $at, %hi(D_808A44D8) ## $at = 808A0000 -/* 00B40 808A4310 C42C44D8 */ lwc1 $f12, %lo(D_808A44D8)($at) -/* 00B44 808A4314 0C0343B5 */ jal Matrix_RotateZ +/* 00B40 808A4310 C42C44D8 */ lwc1 $f12, %lo(D_808A44D8)($at) +/* 00B44 808A4314 0C0343B5 */ jal Matrix_RotateZ /* 00B48 808A4318 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 -/* 00B4C 808A431C 10000004 */ beq $zero, $zero, .L808A4330 +/* 00B4C 808A431C 10000004 */ beq $zero, $zero, .L808A4330 /* 00B50 808A4320 00000000 */ nop .L808A4324: -/* 00B54 808A4324 C42C44DC */ lwc1 $f12, %lo(D_808A44DC)($at) -/* 00B58 808A4328 0C0343B5 */ jal Matrix_RotateZ +/* 00B54 808A4324 C42C44DC */ lwc1 $f12, %lo(D_808A44DC)($at) +/* 00B58 808A4328 0C0343B5 */ jal Matrix_RotateZ /* 00B5C 808A432C 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 .L808A4330: /* 00B60 808A4330 3C01808A */ lui $at, %hi(D_808A44E0) ## $at = 808A0000 -/* 00B64 808A4334 C42C44E0 */ lwc1 $f12, %lo(D_808A44E0)($at) +/* 00B64 808A4334 C42C44E0 */ lwc1 $f12, %lo(D_808A44E0)($at) /* 00B68 808A4338 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 00B6C 808A433C 44066000 */ mfc1 $a2, $f12 -/* 00B70 808A4340 0C0342A3 */ jal Matrix_Scale -/* 00B74 808A4344 46006386 */ mov.s $f14, $f12 +/* 00B6C 808A433C 44066000 */ mfc1 $a2, $f12 +/* 00B70 808A4340 0C0342A3 */ jal Matrix_Scale +/* 00B74 808A4344 46006386 */ mov.s $f14, $f12 /* 00B78 808A4348 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 /* 00B7C 808A434C 3C19DA38 */ lui $t9, 0xDA38 ## $t9 = DA380000 /* 00B80 808A4350 37390003 */ ori $t9, $t9, 0x0003 ## $t9 = DA380003 /* 00B84 808A4354 24580008 */ addiu $t8, $v0, 0x0008 ## $t8 = 00000008 /* 00B88 808A4358 AE1802C0 */ sw $t8, 0x02C0($s0) ## 000002C0 /* 00B8C 808A435C AC590000 */ sw $t9, 0x0000($v0) ## 00000000 -/* 00B90 808A4360 8FA800B4 */ lw $t0, 0x00B4($sp) +/* 00B90 808A4360 8FA800B4 */ lw $t0, 0x00B4($sp) /* 00B94 808A4364 3C05808A */ lui $a1, %hi(D_808A4480) ## $a1 = 808A0000 /* 00B98 808A4368 24A54480 */ addiu $a1, $a1, %lo(D_808A4480) ## $a1 = 808A4480 /* 00B9C 808A436C 8D040000 */ lw $a0, 0x0000($t0) ## 00000000 /* 00BA0 808A4370 240602BF */ addiu $a2, $zero, 0x02BF ## $a2 = 000002BF -/* 00BA4 808A4374 0C0346A2 */ jal Matrix_NewMtx -/* 00BA8 808A4378 AFA2002C */ sw $v0, 0x002C($sp) -/* 00BAC 808A437C 8FA3002C */ lw $v1, 0x002C($sp) +/* 00BA4 808A4374 0C0346A2 */ jal Matrix_NewMtx +/* 00BA8 808A4378 AFA2002C */ sw $v0, 0x002C($sp) +/* 00BAC 808A437C 8FA3002C */ lw $v1, 0x002C($sp) /* 00BB0 808A4380 3C0C0600 */ lui $t4, 0x0600 ## $t4 = 06000000 /* 00BB4 808A4384 258C1678 */ addiu $t4, $t4, 0x1678 ## $t4 = 06001678 /* 00BB8 808A4388 AC620004 */ sw $v0, 0x0004($v1) ## 00000004 @@ -284,18 +284,18 @@ glabel func_808A3F58 /* 00BCC 808A439C AC4C0004 */ sw $t4, 0x0004($v0) ## 00000004 /* 00BD0 808A43A0 AC4A0000 */ sw $t2, 0x0000($v0) ## 00000000 .L808A43A4: -/* 00BD4 808A43A4 8FAD00B4 */ lw $t5, 0x00B4($sp) +/* 00BD4 808A43A4 8FAD00B4 */ lw $t5, 0x00B4($sp) .L808A43A8: /* 00BD8 808A43A8 3C06808A */ lui $a2, %hi(D_808A4498) ## $a2 = 808A0000 /* 00BDC 808A43AC 24C64498 */ addiu $a2, $a2, %lo(D_808A4498) ## $a2 = 808A4498 /* 00BE0 808A43B0 27A40054 */ addiu $a0, $sp, 0x0054 ## $a0 = FFFFFFA4 /* 00BE4 808A43B4 240702C5 */ addiu $a3, $zero, 0x02C5 ## $a3 = 000002C5 -/* 00BE8 808A43B8 0C031AD5 */ jal func_800C6B54 +/* 00BE8 808A43B8 0C031AD5 */ jal Graph_CloseDisps /* 00BEC 808A43BC 8DA50000 */ lw $a1, 0x0000($t5) ## 00000000 -/* 00BF0 808A43C0 8FBF001C */ lw $ra, 0x001C($sp) -/* 00BF4 808A43C4 8FB00018 */ lw $s0, 0x0018($sp) +/* 00BF0 808A43C0 8FBF001C */ lw $ra, 0x001C($sp) +/* 00BF4 808A43C4 8FB00018 */ lw $s0, 0x0018($sp) /* 00BF8 808A43C8 27BD00B0 */ addiu $sp, $sp, 0x00B0 ## $sp = 00000000 -/* 00BFC 808A43CC 03E00008 */ jr $ra +/* 00BFC 808A43CC 03E00008 */ jr $ra /* 00C00 808A43D0 00000000 */ nop /* 00C04 808A43D4 00000000 */ nop /* 00C08 808A43D8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Idomizu/func_808A4A64.s b/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Idomizu/func_808A4A64.s index c60e8624d1..71d88ba755 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Idomizu/func_808A4A64.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Idomizu/func_808A4A64.s @@ -14,7 +14,7 @@ glabel func_808A4A64 /* 00454 808A4A94 24C64CAC */ addiu $a2, $a2, %lo(D_808A4CAC) ## $a2 = 808A4CAC /* 00458 808A4A98 27A40060 */ addiu $a0, $sp, 0x0060 ## $a0 = FFFFFFE0 /* 0045C 808A4A9C 24070164 */ addiu $a3, $zero, 0x0164 ## $a3 = 00000164 -/* 00460 808A4AA0 0C031AB1 */ jal func_800C6AC4 +/* 00460 808A4AA0 0C031AB1 */ jal Graph_OpenDisps /* 00464 808A4AA4 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 /* 00468 808A4AA8 0C024F61 */ jal func_80093D84 /* 0046C 808A4AAC 8E240000 */ lw $a0, 0x0000($s1) ## 00000000 @@ -80,7 +80,7 @@ glabel func_808A4A64 /* 0055C 808A4B9C AFAA0028 */ sw $t2, 0x0028($sp) /* 00560 808A4BA0 AFAF0014 */ sw $t7, 0x0014($sp) /* 00564 808A4BA4 AFAE0010 */ sw $t6, 0x0010($sp) -/* 00568 808A4BA8 0C0253D0 */ jal Draw_TwoTexScroll +/* 00568 808A4BA8 0C0253D0 */ jal Gfx_TwoTexScroll /* 0056C 808A4BAC AFA20050 */ sw $v0, 0x0050($sp) /* 00570 808A4BB0 8FA80050 */ lw $t0, 0x0050($sp) /* 00574 808A4BB4 3C0D0600 */ lui $t5, 0x0600 ## $t5 = 06000000 @@ -96,7 +96,7 @@ glabel func_808A4A64 /* 0059C 808A4BDC 8E250000 */ lw $a1, 0x0000($s1) ## 00000000 /* 005A0 808A4BE0 24C64CDC */ addiu $a2, $a2, %lo(D_808A4CDC) ## $a2 = 808A4CDC /* 005A4 808A4BE4 27A40060 */ addiu $a0, $sp, 0x0060 ## $a0 = FFFFFFE0 -/* 005A8 808A4BE8 0C031AD5 */ jal func_800C6B54 +/* 005A8 808A4BE8 0C031AD5 */ jal Graph_CloseDisps /* 005AC 808A4BEC 2407017E */ addiu $a3, $zero, 0x017E ## $a3 = 0000017E /* 005B0 808A4BF0 8FBF003C */ lw $ra, 0x003C($sp) /* 005B4 808A4BF4 8FB00034 */ lw $s0, 0x0034($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Kaitenkabe/func_808A52AC.s b/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Kaitenkabe/func_808A52AC.s index b82d3e4472..1fc11afc40 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Kaitenkabe/func_808A52AC.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Kaitenkabe/func_808A52AC.s @@ -10,7 +10,7 @@ glabel func_808A52AC /* 0050C 808A52CC 24C6545C */ addiu $a2, $a2, %lo(D_808A545C) ## $a2 = 808A545C /* 00510 808A52D0 27A40034 */ addiu $a0, $sp, 0x0034 ## $a0 = FFFFFFE4 /* 00514 808A52D4 2407015B */ addiu $a3, $zero, 0x015B ## $a3 = 0000015B -/* 00518 808A52D8 0C031AB1 */ jal func_800C6AC4 +/* 00518 808A52D8 0C031AB1 */ jal Graph_OpenDisps /* 0051C 808A52DC 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 /* 00520 808A52E0 0C024F46 */ jal func_80093D18 /* 00524 808A52E4 8E240000 */ lw $a0, 0x0000($s1) ## 00000000 @@ -56,7 +56,7 @@ glabel func_808A52AC /* 005C4 808A5384 8E250000 */ lw $a1, 0x0000($s1) ## 00000000 /* 005C8 808A5388 24C65494 */ addiu $a2, $a2, %lo(D_808A5494) ## $a2 = 808A5494 /* 005CC 808A538C 27A40034 */ addiu $a0, $sp, 0x0034 ## $a0 = FFFFFFE4 -/* 005D0 808A5390 0C031AD5 */ jal func_800C6B54 +/* 005D0 808A5390 0C031AD5 */ jal Graph_CloseDisps /* 005D4 808A5394 24070164 */ addiu $a3, $zero, 0x0164 ## $a3 = 00000164 /* 005D8 808A5398 8FBF001C */ lw $ra, 0x001C($sp) /* 005DC 808A539C 8FB00014 */ lw $s0, 0x0014($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Rakkatenjo/func_808A5A0C.s b/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Rakkatenjo/func_808A5A0C.s index 88e08a4ea6..7449221fb6 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Rakkatenjo/func_808A5A0C.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Rakkatenjo/func_808A5A0C.s @@ -71,12 +71,12 @@ glabel func_808A5A0C /* 005A4 808A5B14 84CD07A0 */ lh $t5, 0x07A0($a2) ## 000007A0 /* 005A8 808A5B18 000D7080 */ sll $t6, $t5, 2 /* 005AC 808A5B1C 00CE7821 */ addu $t7, $a2, $t6 -/* 005B0 808A5B20 0C024BE2 */ jal func_80092F88 +/* 005B0 808A5B20 0C024BE2 */ jal Quake_Add /* 005B4 808A5B24 8DE40790 */ lw $a0, 0x0790($t7) ## 00000790 /* 005B8 808A5B28 00022400 */ sll $a0, $v0, 16 /* 005BC 808A5B2C AFA2002C */ sw $v0, 0x002C($sp) /* 005C0 808A5B30 00042403 */ sra $a0, $a0, 16 -/* 005C4 808A5B34 0C024B6B */ jal func_80092DAC +/* 005C4 808A5B34 0C024B6B */ jal Quake_SetSpeed /* 005C8 808A5B38 2405C350 */ addiu $a1, $zero, 0xC350 ## $a1 = FFFFC350 /* 005CC 808A5B3C 87B0002E */ lh $s0, 0x002E($sp) /* 005D0 808A5B40 24050005 */ addiu $a1, $zero, 0x0005 ## $a1 = 00000005 @@ -84,11 +84,11 @@ glabel func_808A5A0C /* 005D8 808A5B48 00102400 */ sll $a0, $s0, 16 /* 005DC 808A5B4C 00042403 */ sra $a0, $a0, 16 /* 005E0 808A5B50 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 005E4 808A5B54 0C024B9C */ jal func_80092E70 +/* 005E4 808A5B54 0C024B9C */ jal Quake_SetQuakeValues /* 005E8 808A5B58 AFA00010 */ sw $zero, 0x0010($sp) /* 005EC 808A5B5C 00102400 */ sll $a0, $s0, 16 /* 005F0 808A5B60 00042403 */ sra $a0, $a0, 16 -/* 005F4 808A5B64 0C024B7C */ jal func_80092DF0 +/* 005F4 808A5B64 0C024B7C */ jal Quake_SetCountdown /* 005F8 808A5B68 24050005 */ addiu $a1, $zero, 0x0005 ## $a1 = 00000005 /* 005FC 808A5B6C 8FBF0024 */ lw $ra, 0x0024($sp) .L808A5B70: diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Rakkatenjo/func_808A5D60.s b/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Rakkatenjo/func_808A5D60.s index 4725175320..52c5dc08e6 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Rakkatenjo/func_808A5D60.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Mori_Rakkatenjo/func_808A5D60.s @@ -10,7 +10,7 @@ glabel func_808A5D60 /* 00810 808A5D80 24C65FF8 */ addiu $a2, $a2, %lo(D_808A5FF8) ## $a2 = 808A5FF8 /* 00814 808A5D84 27A40034 */ addiu $a0, $sp, 0x0034 ## $a0 = FFFFFFE4 /* 00818 808A5D88 240701F1 */ addiu $a3, $zero, 0x01F1 ## $a3 = 000001F1 -/* 0081C 808A5D8C 0C031AB1 */ jal func_800C6AC4 +/* 0081C 808A5D8C 0C031AB1 */ jal Graph_OpenDisps /* 00820 808A5D90 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 /* 00824 808A5D94 0C024F46 */ jal func_80093D18 /* 00828 808A5D98 8E240000 */ lw $a0, 0x0000($s1) ## 00000000 @@ -56,7 +56,7 @@ glabel func_808A5D60 /* 008C8 808A5E38 8E250000 */ lw $a1, 0x0000($s1) ## 00000000 /* 008CC 808A5E3C 24C66030 */ addiu $a2, $a2, %lo(D_808A6030) ## $a2 = 808A6030 /* 008D0 808A5E40 27A40034 */ addiu $a0, $sp, 0x0034 ## $a0 = FFFFFFE4 -/* 008D4 808A5E44 0C031AD5 */ jal func_800C6B54 +/* 008D4 808A5E44 0C031AD5 */ jal Graph_CloseDisps /* 008D8 808A5E48 240701FA */ addiu $a3, $zero, 0x01FA ## $a3 = 000001FA /* 008DC 808A5E4C 8FBF001C */ lw $ra, 0x001C($sp) /* 008E0 808A5E50 8FB00014 */ lw $s0, 0x0014($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Po_Event/BgPoEvent_Draw.s b/asm/non_matchings/overlays/actors/ovl_Bg_Po_Event/BgPoEvent_Draw.s index 951dcb93e2..ba74430e69 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Po_Event/BgPoEvent_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Po_Event/BgPoEvent_Draw.s @@ -9,7 +9,7 @@ glabel BgPoEvent_Draw /* 01828 808A7A38 24C67DB0 */ addiu $a2, $a2, %lo(D_808A7DB0) ## $a2 = 808A7DB0 /* 0182C 808A7A3C 27A40030 */ addiu $a0, $sp, 0x0030 ## $a0 = FFFFFFC0 /* 01830 808A7A40 240705C9 */ addiu $a3, $zero, 0x05C9 ## $a3 = 000005C9 -/* 01834 808A7A44 0C031AB1 */ jal func_800C6AC4 +/* 01834 808A7A44 0C031AB1 */ jal Graph_OpenDisps /* 01838 808A7A48 AFA50040 */ sw $a1, 0x0040($sp) /* 0183C 808A7A4C 8FAF0074 */ lw $t7, 0x0074($sp) /* 01840 808A7A50 0C024F46 */ jal func_80093D18 @@ -80,7 +80,7 @@ glabel BgPoEvent_Draw /* 01934 808A7B44 240705E4 */ addiu $a3, $zero, 0x05E4 ## $a3 = 000005E4 /* 01938 808A7B48 AC4B0004 */ sw $t3, 0x0004($v0) ## 00000004 /* 0193C 808A7B4C 8FAC0074 */ lw $t4, 0x0074($sp) -/* 01940 808A7B50 0C031AD5 */ jal func_800C6B54 +/* 01940 808A7B50 0C031AD5 */ jal Graph_CloseDisps /* 01944 808A7B54 8D850000 */ lw $a1, 0x0000($t4) ## 00000000 /* 01948 808A7B58 92020168 */ lbu $v0, 0x0168($s0) ## 00000168 /* 0194C 808A7B5C 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Po_Syokudai/BgPoSyokudai_Draw.s b/asm/non_matchings/overlays/actors/ovl_Bg_Po_Syokudai/BgPoSyokudai_Draw.s index 8ef7e79f14..2226a1a6ce 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Po_Syokudai/BgPoSyokudai_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Po_Syokudai/BgPoSyokudai_Draw.s @@ -10,7 +10,7 @@ glabel BgPoSyokudai_Draw /* 003B0 808A8460 24C689D0 */ addiu $a2, $a2, %lo(D_808A89D0) ## $a2 = 808A89D0 /* 003B4 808A8464 27A40070 */ addiu $a0, $sp, 0x0070 ## $a0 = FFFFFFE0 /* 003B8 808A8468 2407013B */ addiu $a3, $zero, 0x013B ## $a3 = 0000013B -/* 003BC 808A846C 0C031AB1 */ jal func_800C6AC4 +/* 003BC 808A846C 0C031AB1 */ jal Graph_OpenDisps /* 003C0 808A8470 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 /* 003C4 808A8474 0C024F46 */ jal func_80093D18 /* 003C8 808A8478 8E240000 */ lw $a0, 0x0000($s1) ## 00000000 @@ -239,7 +239,7 @@ glabel BgPoSyokudai_Draw /* 0070C 808A87BC 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 /* 00710 808A87C0 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 /* 00714 808A87C4 AFA2005C */ sw $v0, 0x005C($sp) -/* 00718 808A87C8 0C0253D0 */ jal Draw_TwoTexScroll +/* 00718 808A87C8 0C0253D0 */ jal Gfx_TwoTexScroll /* 0071C 808A87CC AFA80064 */ sw $t0, 0x0064($sp) /* 00720 808A87D0 8FA3005C */ lw $v1, 0x005C($sp) /* 00724 808A87D4 8FA80064 */ lw $t0, 0x0064($sp) @@ -335,7 +335,7 @@ glabel BgPoSyokudai_Draw /* 00888 808A8938 24C68A18 */ addiu $a2, $a2, %lo(D_808A8A18) ## $a2 = 808A8A18 /* 0088C 808A893C 27A40070 */ addiu $a0, $sp, 0x0070 ## $a0 = FFFFFFE0 /* 00890 808A8940 8E250000 */ lw $a1, 0x0000($s1) ## 00000000 -/* 00894 808A8944 0C031AD5 */ jal func_800C6B54 +/* 00894 808A8944 0C031AD5 */ jal Graph_CloseDisps /* 00898 808A8948 24070175 */ addiu $a3, $zero, 0x0175 ## $a3 = 00000175 /* 0089C 808A894C 8FBF003C */ lw $ra, 0x003C($sp) /* 008A0 808A8950 8FB00034 */ lw $s0, 0x0034($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Relay_Objects/BgRelayObjects_Draw.s b/asm/non_matchings/overlays/actors/ovl_Bg_Relay_Objects/BgRelayObjects_Draw.s index 55f4ecc24e..e204aaf03a 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Relay_Objects/BgRelayObjects_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Relay_Objects/BgRelayObjects_Draw.s @@ -8,14 +8,14 @@ glabel BgRelayObjects_Draw /* 00658 808A94A8 00000000 */ nop /* 0065C 808A94AC 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 /* 00660 808A94B0 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 00664 808A94B4 0C00D498 */ jal Draw_DListOpa +/* 00664 808A94B4 0C00D498 */ jal Gfx_DrawDListOpa /* 00668 808A94B8 24A51AB0 */ addiu $a1, $a1, 0x1AB0 ## $a1 = 06001AB0 /* 0066C 808A94BC 10000005 */ beq $zero, $zero, .L808A94D4 /* 00670 808A94C0 8FBF0014 */ lw $ra, 0x0014($sp) .L808A94C4: /* 00674 808A94C4 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 00678 808A94C8 0C00D498 */ jal Draw_DListOpa +/* 00678 808A94C8 0C00D498 */ jal Gfx_DrawDListOpa /* 0067C 808A94CC 24A501A0 */ addiu $a1, $a1, 0x01A0 ## $a1 = 060001A0 /* 00680 808A94D0 8FBF0014 */ lw $ra, 0x0014($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot00_Hanebasi/BgSpot00Hanebasi_Draw.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot00_Hanebasi/BgSpot00Hanebasi_Draw.s index 3c5ba4ab00..5bafcdb1e4 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot00_Hanebasi/BgSpot00Hanebasi_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Spot00_Hanebasi/BgSpot00Hanebasi_Draw.s @@ -19,7 +19,7 @@ glabel BgSpot00Hanebasi_Draw /* 00E4C 808AA5CC 8D250000 */ lw $a1, 0x0000($t1) ## 00000000 /* 00E50 808AA5D0 27A40034 */ addiu $a0, $sp, 0x0034 ## $a0 = FFFFFFD4 /* 00E54 808AA5D4 240702BA */ addiu $a3, $zero, 0x02BA ## $a3 = 000002BA -/* 00E58 808AA5D8 0C031AB1 */ jal func_800C6AC4 +/* 00E58 808AA5D8 0C031AB1 */ jal Graph_OpenDisps /* 00E5C 808AA5DC AFA50044 */ sw $a1, 0x0044($sp) /* 00E60 808AA5E0 8FAA0064 */ lw $t2, 0x0064($sp) /* 00E64 808AA5E4 0C024F46 */ jal func_80093D18 @@ -126,7 +126,7 @@ glabel BgSpot00Hanebasi_Draw /* 00FE4 808AA764 24C6A85C */ addiu $a2, $a2, %lo(D_808AA85C) ## $a2 = 808AA85C /* 00FE8 808AA768 27A40034 */ addiu $a0, $sp, 0x0034 ## $a0 = FFFFFFD4 /* 00FEC 808AA76C 240702DD */ addiu $a3, $zero, 0x02DD ## $a3 = 000002DD -/* 00FF0 808AA770 0C031AD5 */ jal func_800C6B54 +/* 00FF0 808AA770 0C031AD5 */ jal Graph_CloseDisps /* 00FF4 808AA774 8DC50000 */ lw $a1, 0x0000($t6) ## 00000000 /* 00FF8 808AA778 8FBF001C */ lw $ra, 0x001C($sp) /* 00FFC 808AA77C 8FB00018 */ lw $s0, 0x0018($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot00_Hanebasi/func_808AA2B0.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot00_Hanebasi/func_808AA2B0.s index 79a814cf33..d2189ddb67 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot00_Hanebasi/func_808AA2B0.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Spot00_Hanebasi/func_808AA2B0.s @@ -22,7 +22,7 @@ glabel func_808AA2B0 /* 00B80 808AA300 24C6A7D0 */ addiu $a2, $a2, %lo(D_808AA7D0) ## $a2 = 808AA7D0 /* 00B84 808AA304 27A400B0 */ addiu $a0, $sp, 0x00B0 ## $a0 = FFFFFFE0 /* 00B88 808AA308 24070279 */ addiu $a3, $zero, 0x0279 ## $a3 = 00000279 -/* 00B8C 808AA30C 0C031AB1 */ jal func_800C6AC4 +/* 00B8C 808AA30C 0C031AB1 */ jal Graph_OpenDisps /* 00B90 808AA310 00A09025 */ or $s2, $a1, $zero ## $s2 = 00000000 /* 00B94 808AA314 0C024F61 */ jal func_80093D84 /* 00B98 808AA318 8E640000 */ lw $a0, 0x0000($s3) ## 00000000 @@ -121,7 +121,7 @@ glabel func_808AA2B0 /* 00D00 808AA480 00408025 */ or $s0, $v0, $zero ## $s0 = 00000000 /* 00D04 808AA484 0000C012 */ mflo $t8 /* 00D08 808AA488 331901FF */ andi $t9, $t8, 0x01FF ## $t9 = 000000FF -/* 00D0C 808AA48C 0C0253D0 */ jal Draw_TwoTexScroll +/* 00D0C 808AA48C 0C0253D0 */ jal Gfx_TwoTexScroll /* 00D10 808AA490 AFB90020 */ sw $t9, 0x0020($sp) /* 00D14 808AA494 16200003 */ bne $s1, $zero, .L808AA4A4 /* 00D18 808AA498 AE020004 */ sw $v0, 0x0004($s0) ## 00000004 @@ -167,7 +167,7 @@ glabel func_808AA2B0 /* 00DB0 808AA530 24C6A808 */ addiu $a2, $a2, %lo(D_808AA808) ## $a2 = 808AA808 /* 00DB4 808AA534 27A400B0 */ addiu $a0, $sp, 0x00B0 ## $a0 = FFFFFFE0 /* 00DB8 808AA538 8E650000 */ lw $a1, 0x0000($s3) ## 00000000 -/* 00DBC 808AA53C 0C031AD5 */ jal func_800C6B54 +/* 00DBC 808AA53C 0C031AD5 */ jal Graph_CloseDisps /* 00DC0 808AA540 240702A9 */ addiu $a3, $zero, 0x02A9 ## $a3 = 000002A9 /* 00DC4 808AA544 8FBF0084 */ lw $ra, 0x0084($sp) /* 00DC8 808AA548 D7B40038 */ ldc1 $f20, 0x0038($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot01_Idohashira/func_808AB700.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot01_Idohashira/func_808AB700.s index de67ccb2dd..33379752c6 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot01_Idohashira/func_808AB700.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Spot01_Idohashira/func_808AB700.s @@ -9,7 +9,7 @@ glabel func_808AB700 /* 00A3C 808AB71C 24C6B938 */ addiu $a2, $a2, %lo(D_808AB938) ## $a2 = 808AB938 /* 00A40 808AB720 27A40030 */ addiu $a0, $sp, 0x0030 ## $a0 = FFFFFFE8 /* 00A44 808AB724 240702B1 */ addiu $a3, $zero, 0x02B1 ## $a3 = 000002B1 -/* 00A48 808AB728 0C031AB1 */ jal func_800C6AC4 +/* 00A48 808AB728 0C031AB1 */ jal Graph_OpenDisps /* 00A4C 808AB72C 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 00A50 808AB730 0C024F46 */ jal func_80093D18 /* 00A54 808AB734 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 @@ -42,7 +42,7 @@ glabel func_808AB700 /* 00AC0 808AB7A0 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 00AC4 808AB7A4 240702C4 */ addiu $a3, $zero, 0x02C4 ## $a3 = 000002C4 /* 00AC8 808AB7A8 AC680000 */ sw $t0, 0x0000($v1) ## 00000000 -/* 00ACC 808AB7AC 0C031AD5 */ jal func_800C6B54 +/* 00ACC 808AB7AC 0C031AD5 */ jal Graph_CloseDisps /* 00AD0 808AB7B0 AC690004 */ sw $t1, 0x0004($v1) ## 00000004 /* 00AD4 808AB7B4 8FBF001C */ lw $ra, 0x001C($sp) /* 00AD8 808AB7B8 8FB00018 */ lw $s0, 0x0018($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot01_Idomizu/BgSpot01Idomizu_Draw.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot01_Idomizu/BgSpot01Idomizu_Draw.s index ab83b5a04e..fc74c069b1 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot01_Idomizu/BgSpot01Idomizu_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Spot01_Idomizu/BgSpot01Idomizu_Draw.s @@ -10,7 +10,7 @@ glabel BgSpot01Idomizu_Draw /* 00198 808ABC78 24C6BDC0 */ addiu $a2, $a2, %lo(D_808ABDC0) ## $a2 = 808ABDC0 /* 0019C 808ABC7C 27A40058 */ addiu $a0, $sp, 0x0058 ## $a0 = FFFFFFE8 /* 001A0 808ABC80 240700E4 */ addiu $a3, $zero, 0x00E4 ## $a3 = 000000E4 -/* 001A4 808ABC84 0C031AB1 */ jal func_800C6AC4 +/* 001A4 808ABC84 0C031AB1 */ jal Graph_OpenDisps /* 001A8 808ABC88 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 /* 001AC 808ABC8C 0C024F61 */ jal func_80093D84 /* 001B0 808ABC90 8E240000 */ lw $a0, 0x0000($s1) ## 00000000 @@ -53,7 +53,7 @@ glabel BgSpot01Idomizu_Draw /* 00244 808ABD24 AFAC0014 */ sw $t4, 0x0014($sp) /* 00248 808ABD28 AFAB0010 */ sw $t3, 0x0010($sp) /* 0024C 808ABD2C 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 00250 808ABD30 0C0253D0 */ jal Draw_TwoTexScroll +/* 00250 808ABD30 0C0253D0 */ jal Gfx_TwoTexScroll /* 00254 808ABD34 AFA20050 */ sw $v0, 0x0050($sp) /* 00258 808ABD38 8FA90050 */ lw $t1, 0x0050($sp) /* 0025C 808ABD3C 3C0A0600 */ lui $t2, 0x0600 ## $t2 = 06000000 @@ -69,7 +69,7 @@ glabel BgSpot01Idomizu_Draw /* 00284 808ABD64 8E250000 */ lw $a1, 0x0000($s1) ## 00000000 /* 00288 808ABD68 24C6BDF8 */ addiu $a2, $a2, %lo(D_808ABDF8) ## $a2 = 808ABDF8 /* 0028C 808ABD6C 27A40058 */ addiu $a0, $sp, 0x0058 ## $a0 = FFFFFFE8 -/* 00290 808ABD70 0C031AD5 */ jal func_800C6B54 +/* 00290 808ABD70 0C031AD5 */ jal Graph_CloseDisps /* 00294 808ABD74 240700F4 */ addiu $a3, $zero, 0x00F4 ## $a3 = 000000F4 /* 00298 808ABD78 8FBF003C */ lw $ra, 0x003C($sp) /* 0029C 808ABD7C 8FB00034 */ lw $s0, 0x0034($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot01_Objects2/func_808AC4A4.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot01_Objects2/func_808AC4A4.s index ac2eca6026..ad6a6213d2 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot01_Objects2/func_808AC4A4.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Spot01_Objects2/func_808AC4A4.s @@ -8,7 +8,7 @@ glabel func_808AC4A4 /* 0037C 808AC4BC 31CF0007 */ andi $t7, $t6, 0x0007 ## $t7 = 00000000 /* 00380 808AC4C0 000FC080 */ sll $t8, $t7, 2 /* 00384 808AC4C4 00B82821 */ addu $a1, $a1, $t8 -/* 00388 808AC4C8 0C00D498 */ jal Draw_DListOpa +/* 00388 808AC4C8 0C00D498 */ jal Gfx_DrawDListOpa /* 0038C 808AC4CC 8CA5C510 */ lw $a1, %lo(D_808AC510)($a1) /* 00390 808AC4D0 8FBF0014 */ lw $ra, 0x0014($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot02_Objects/BgSpot02Objects_Draw.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot02_Objects/BgSpot02Objects_Draw.s index 5fc41a4abe..e5aa8c7754 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot02_Objects/BgSpot02Objects_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Spot02_Objects/BgSpot02Objects_Draw.s @@ -7,7 +7,7 @@ glabel BgSpot02Objects_Draw /* 005B0 808ACC10 3C05808B */ lui $a1, %hi(D_808AD8B0) ## $a1 = 808B0000 /* 005B4 808ACC14 000E7880 */ sll $t7, $t6, 2 /* 005B8 808ACC18 00AF2821 */ addu $a1, $a1, $t7 -/* 005BC 808ACC1C 0C00D498 */ jal Draw_DListOpa +/* 005BC 808ACC1C 0C00D498 */ jal Gfx_DrawDListOpa /* 005C0 808ACC20 8CA5D8B0 */ lw $a1, %lo(D_808AD8B0)($a1) /* 005C4 808ACC24 8FBF0014 */ lw $ra, 0x0014($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot02_Objects/func_808ACCB8.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot02_Objects/func_808ACCB8.s index 5aeff92ae8..406bf7f0a3 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot02_Objects/func_808ACCB8.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Spot02_Objects/func_808ACCB8.s @@ -10,7 +10,7 @@ glabel func_808ACCB8 /* 00678 808ACCD8 24C6D8C0 */ addiu $a2, $a2, %lo(D_808AD8C0) ## $a2 = 808AD8C0 /* 0067C 808ACCDC 27A40050 */ addiu $a0, $sp, 0x0050 ## $a0 = FFFFFFD8 /* 00680 808ACCE0 24070258 */ addiu $a3, $zero, 0x0258 ## $a3 = 00000258 -/* 00684 808ACCE4 0C031AB1 */ jal func_800C6AC4 +/* 00684 808ACCE4 0C031AB1 */ jal Graph_OpenDisps /* 00688 808ACCE8 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 /* 0068C 808ACCEC 922E1D6C */ lbu $t6, 0x1D6C($s1) ## 00001D6C /* 00690 808ACCF0 11C001AD */ beq $t6, $zero, .L808AD3A8 @@ -472,7 +472,7 @@ glabel func_808ACCB8 /* 00D4C 808AD3AC 24C6D8F8 */ addiu $a2, $a2, %lo(D_808AD8F8) ## $a2 = 808AD8F8 /* 00D50 808AD3B0 27A40050 */ addiu $a0, $sp, 0x0050 ## $a0 = FFFFFFD8 /* 00D54 808AD3B4 8E250000 */ lw $a1, 0x0000($s1) ## 00000000 -/* 00D58 808AD3B8 0C031AD5 */ jal func_800C6B54 +/* 00D58 808AD3B8 0C031AD5 */ jal Graph_CloseDisps /* 00D5C 808AD3BC 240702B4 */ addiu $a3, $zero, 0x02B4 ## $a3 = 000002B4 /* 00D60 808AD3C0 8FBF001C */ lw $ra, 0x001C($sp) /* 00D64 808AD3C4 8FB00014 */ lw $s0, 0x0014($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot02_Objects/func_808AD450.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot02_Objects/func_808AD450.s index 1152b8f08c..bb554b7535 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot02_Objects/func_808AD450.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Spot02_Objects/func_808AD450.s @@ -11,7 +11,7 @@ glabel func_808AD450 /* 00E14 808AD474 24C6D914 */ addiu $a2, $a2, %lo(D_808AD914) ## $a2 = 808AD914 /* 00E18 808AD478 27A40078 */ addiu $a0, $sp, 0x0078 ## $a0 = FFFFFFE0 /* 00E1C 808AD47C 240702E0 */ addiu $a3, $zero, 0x02E0 ## $a3 = 000002E0 -/* 00E20 808AD480 0C031AB1 */ jal func_800C6AC4 +/* 00E20 808AD480 0C031AB1 */ jal Graph_OpenDisps /* 00E24 808AD484 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 /* 00E28 808AD488 922E1D6C */ lbu $t6, 0x1D6C($s1) ## 00001D6C /* 00E2C 808AD48C 11C000E4 */ beq $t6, $zero, .L808AD820 @@ -229,7 +229,7 @@ glabel func_808AD450 /* 01158 808AD7B8 AFAD0010 */ sw $t5, 0x0010($sp) /* 0115C 808AD7BC 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 01160 808AD7C0 AFA20060 */ sw $v0, 0x0060($sp) -/* 01164 808AD7C4 0C0253D0 */ jal Draw_TwoTexScroll +/* 01164 808AD7C4 0C0253D0 */ jal Gfx_TwoTexScroll /* 01168 808AD7C8 00033040 */ sll $a2, $v1, 1 /* 0116C 808AD7CC 8FA80060 */ lw $t0, 0x0060($sp) /* 01170 808AD7D0 3C04E700 */ lui $a0, 0xE700 ## $a0 = E7000000 @@ -257,7 +257,7 @@ glabel func_808AD450 /* 011C4 808AD824 24C6D94C */ addiu $a2, $a2, %lo(D_808AD94C) ## $a2 = 808AD94C /* 011C8 808AD828 27A40078 */ addiu $a0, $sp, 0x0078 ## $a0 = FFFFFFE0 /* 011CC 808AD82C 8E250000 */ lw $a1, 0x0000($s1) ## 00000000 -/* 011D0 808AD830 0C031AD5 */ jal func_800C6B54 +/* 011D0 808AD830 0C031AD5 */ jal Graph_CloseDisps /* 011D4 808AD834 24070332 */ addiu $a3, $zero, 0x0332 ## $a3 = 00000332 /* 011D8 808AD838 8FBF0044 */ lw $ra, 0x0044($sp) /* 011DC 808AD83C 8FB00038 */ lw $s0, 0x0038($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot03_Taki/BgSpot03Taki_Draw.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot03_Taki/BgSpot03Taki_Draw.s index f778b38b09..58f8011d53 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot03_Taki/BgSpot03Taki_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Spot03_Taki/BgSpot03Taki_Draw.s @@ -9,7 +9,7 @@ glabel BgSpot03Taki_Draw /* 00620 808AE100 24C6E3C0 */ addiu $a2, $a2, %lo(D_808AE3C0) ## $a2 = 808AE3C0 /* 00624 808AE104 27A40068 */ addiu $a0, $sp, 0x0068 ## $a0 = FFFFFFE0 /* 00628 808AE108 24070141 */ addiu $a3, $zero, 0x0141 ## $a3 = 00000141 -/* 0062C 808AE10C 0C031AB1 */ jal func_800C6AC4 +/* 0062C 808AE10C 0C031AB1 */ jal Graph_OpenDisps /* 00630 808AE110 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 /* 00634 808AE114 8FA7008C */ lw $a3, 0x008C($sp) /* 00638 808AE118 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 @@ -61,7 +61,7 @@ glabel BgSpot03Taki_Draw /* 006F0 808AE1D0 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 006F4 808AE1D4 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 /* 006F8 808AE1D8 AFA20060 */ sw $v0, 0x0060($sp) -/* 006FC 808AE1DC 0C0253D0 */ jal Draw_TwoTexScroll +/* 006FC 808AE1DC 0C0253D0 */ jal Gfx_TwoTexScroll /* 00700 808AE1E0 AFA8007C */ sw $t0, 0x007C($sp) /* 00704 808AE1E4 8FA30060 */ lw $v1, 0x0060($sp) /* 00708 808AE1E8 8FA8007C */ lw $t0, 0x007C($sp) @@ -130,7 +130,7 @@ glabel BgSpot03Taki_Draw /* 007FC 808AE2DC AFAF001C */ sw $t7, 0x001C($sp) /* 00800 808AE2E0 AFB90028 */ sw $t9, 0x0028($sp) /* 00804 808AE2E4 AFB80024 */ sw $t8, 0x0024($sp) -/* 00808 808AE2E8 0C0253D0 */ jal Draw_TwoTexScroll +/* 00808 808AE2E8 0C0253D0 */ jal Gfx_TwoTexScroll /* 0080C 808AE2EC AFA2004C */ sw $v0, 0x004C($sp) /* 00810 808AE2F0 8FA3004C */ lw $v1, 0x004C($sp) /* 00814 808AE2F4 3C0C0600 */ lui $t4, 0x0600 ## $t4 = 06000000 @@ -147,7 +147,7 @@ glabel BgSpot03Taki_Draw /* 00840 808AE320 24C6E3F0 */ addiu $a2, $a2, %lo(D_808AE3F0) ## $a2 = 808AE3F0 /* 00844 808AE324 27A40068 */ addiu $a0, $sp, 0x0068 ## $a0 = FFFFFFE0 /* 00848 808AE328 24070166 */ addiu $a3, $zero, 0x0166 ## $a3 = 00000166 -/* 0084C 808AE32C 0C031AD5 */ jal func_800C6B54 +/* 0084C 808AE32C 0C031AD5 */ jal Graph_CloseDisps /* 00850 808AE330 8DA50000 */ lw $a1, 0x0000($t5) ## 00000000 /* 00854 808AE334 8FA90088 */ lw $t1, 0x0088($sp) /* 00858 808AE338 912E0174 */ lbu $t6, 0x0174($t1) ## 00000174 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot05_Soko/BgSpot05Soko_Destroy.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot05_Soko/BgSpot05Soko_Destroy.s deleted file mode 100644 index 079cd08691..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot05_Soko/BgSpot05Soko_Destroy.s +++ /dev/null @@ -1,16 +0,0 @@ -glabel BgSpot05Soko_Destroy -/* 00108 808AE578 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 0010C 808AE57C AFA40018 */ sw $a0, 0x0018($sp) -/* 00110 808AE580 8FAE0018 */ lw $t6, 0x0018($sp) -/* 00114 808AE584 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00118 808AE588 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 0011C 808AE58C 24A50810 */ addiu $a1, $a1, 0x0810 ## $a1 = 00000810 -/* 00120 808AE590 0C00FB56 */ jal DynaPolyInfo_Free - ## DynaPolyInfo_delReserve -/* 00124 808AE594 8DC6014C */ lw $a2, 0x014C($t6) ## 0000014C -/* 00128 808AE598 8FBF0014 */ lw $ra, 0x0014($sp) -/* 0012C 808AE59C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00130 808AE5A0 03E00008 */ jr $ra -/* 00134 808AE5A4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot05_Soko/BgSpot05Soko_Draw.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot05_Soko/BgSpot05Soko_Draw.s deleted file mode 100644 index 3b6bf9d45a..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot05_Soko/BgSpot05Soko_Draw.s +++ /dev/null @@ -1,19 +0,0 @@ -glabel BgSpot05Soko_Draw -/* 00250 808AE6C0 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00254 808AE6C4 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00258 808AE6C8 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 -/* 0025C 808AE6CC 84EE001C */ lh $t6, 0x001C($a3) ## 0000001C -/* 00260 808AE6D0 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 00264 808AE6D4 3C05808B */ lui $a1, %hi(D_808AE724) ## $a1 = 808B0000 -/* 00268 808AE6D8 000E7880 */ sll $t7, $t6, 2 -/* 0026C 808AE6DC 00AF2821 */ addu $a1, $a1, $t7 -/* 00270 808AE6E0 0C00D498 */ jal Draw_DListOpa - -/* 00274 808AE6E4 8CA5E724 */ lw $a1, %lo(D_808AE724)($a1) -/* 00278 808AE6E8 8FBF0014 */ lw $ra, 0x0014($sp) -/* 0027C 808AE6EC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00280 808AE6F0 03E00008 */ jr $ra -/* 00284 808AE6F4 00000000 */ nop -/* 00288 808AE6F8 00000000 */ nop -/* 0028C 808AE6FC 00000000 */ nop - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot05_Soko/BgSpot05Soko_Init.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot05_Soko/BgSpot05Soko_Init.s deleted file mode 100644 index efc5c4244b..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot05_Soko/BgSpot05Soko_Init.s +++ /dev/null @@ -1,82 +0,0 @@ -glabel BgSpot05Soko_Init -/* 00000 808AE470 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 00004 808AE474 AFA50034 */ sw $a1, 0x0034($sp) -/* 00008 808AE478 AFBF001C */ sw $ra, 0x001C($sp) -/* 0000C 808AE47C AFB00018 */ sw $s0, 0x0018($sp) -/* 00010 808AE480 3C05808B */ lui $a1, %hi(D_808AE720) ## $a1 = 808B0000 -/* 00014 808AE484 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00018 808AE488 AFA00024 */ sw $zero, 0x0024($sp) -/* 0001C 808AE48C 0C01E037 */ jal Actor_ProcessInitChain - -/* 00020 808AE490 24A5E720 */ addiu $a1, $a1, %lo(D_808AE720) ## $a1 = 808AE720 -/* 00024 808AE494 860E001C */ lh $t6, 0x001C($s0) ## 0000001C -/* 00028 808AE498 8619001C */ lh $t9, 0x001C($s0) ## 0000001C -/* 0002C 808AE49C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00030 808AE4A0 000E7A03 */ sra $t7, $t6, 8 -/* 00034 808AE4A4 31F800FF */ andi $t8, $t7, 0x00FF ## $t8 = 00000000 -/* 00038 808AE4A8 332800FF */ andi $t0, $t9, 0x00FF ## $t0 = 00000000 -/* 0003C 808AE4AC AE180168 */ sw $t8, 0x0168($s0) ## 00000168 -/* 00040 808AE4B0 A608001C */ sh $t0, 0x001C($s0) ## 0000001C -/* 00044 808AE4B4 0C010D20 */ jal DynaPolyInfo_SetActorMove - -/* 00048 808AE4B8 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 0004C 808AE4BC 8609001C */ lh $t1, 0x001C($s0) ## 0000001C -/* 00050 808AE4C0 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 -/* 00054 808AE4C4 27A50024 */ addiu $a1, $sp, 0x0024 ## $a1 = FFFFFFF4 -/* 00058 808AE4C8 15200010 */ bne $t1, $zero, .L808AE50C -/* 0005C 808AE4CC 248412C0 */ addiu $a0, $a0, 0x12C0 ## $a0 = 060012C0 -/* 00060 808AE4D0 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 -/* 00064 808AE4D4 0C010620 */ jal DynaPolyInfo_Alloc - -/* 00068 808AE4D8 24840918 */ addiu $a0, $a0, 0x0918 ## $a0 = 06000918 -/* 0006C 808AE4DC 3C0A8016 */ lui $t2, 0x8016 ## $t2 = 80160000 -/* 00070 808AE4E0 8D4AE664 */ lw $t2, -0x199C($t2) ## 8015E664 -/* 00074 808AE4E4 3C0B808B */ lui $t3, %hi(func_808AE5A8) ## $t3 = 808B0000 -/* 00078 808AE4E8 256BE5A8 */ addiu $t3, $t3, %lo(func_808AE5A8) ## $t3 = 808AE5A8 -/* 0007C 808AE4EC 15400005 */ bne $t2, $zero, .L808AE504 -/* 00080 808AE4F0 00000000 */ nop -/* 00084 808AE4F4 0C00B55C */ jal Actor_Kill - -/* 00088 808AE4F8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0008C 808AE4FC 10000014 */ beq $zero, $zero, .L808AE550 -/* 00090 808AE500 8FA40034 */ lw $a0, 0x0034($sp) -.L808AE504: -/* 00094 808AE504 10000011 */ beq $zero, $zero, .L808AE54C -/* 00098 808AE508 AE0B0164 */ sw $t3, 0x0164($s0) ## 00000164 -.L808AE50C: -/* 0009C 808AE50C 0C010620 */ jal DynaPolyInfo_Alloc - -/* 000A0 808AE510 27A50024 */ addiu $a1, $sp, 0x0024 ## $a1 = FFFFFFF4 -/* 000A4 808AE514 8FA40034 */ lw $a0, 0x0034($sp) -/* 000A8 808AE518 0C00B2D0 */ jal Flags_GetSwitch - -/* 000AC 808AE51C 8E050168 */ lw $a1, 0x0168($s0) ## 00000168 -/* 000B0 808AE520 10400005 */ beq $v0, $zero, .L808AE538 -/* 000B4 808AE524 3C0C808B */ lui $t4, %hi(func_808AE5B4) ## $t4 = 808B0000 -/* 000B8 808AE528 0C00B55C */ jal Actor_Kill - -/* 000BC 808AE52C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 000C0 808AE530 10000007 */ beq $zero, $zero, .L808AE550 -/* 000C4 808AE534 8FA40034 */ lw $a0, 0x0034($sp) -.L808AE538: -/* 000C8 808AE538 8E0D0004 */ lw $t5, 0x0004($s0) ## 00000004 -/* 000CC 808AE53C 258CE5B4 */ addiu $t4, $t4, %lo(func_808AE5B4) ## $t4 = FFFFE5B4 -/* 000D0 808AE540 AE0C0164 */ sw $t4, 0x0164($s0) ## 00000164 -/* 000D4 808AE544 35AE0010 */ ori $t6, $t5, 0x0010 ## $t6 = 00000010 -/* 000D8 808AE548 AE0E0004 */ sw $t6, 0x0004($s0) ## 00000004 -.L808AE54C: -/* 000DC 808AE54C 8FA40034 */ lw $a0, 0x0034($sp) -.L808AE550: -/* 000E0 808AE550 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 -/* 000E4 808AE554 8FA70024 */ lw $a3, 0x0024($sp) -/* 000E8 808AE558 0C00FA9D */ jal DynaPolyInfo_RegisterActor - ## DynaPolyInfo_setActor -/* 000EC 808AE55C 24850810 */ addiu $a1, $a0, 0x0810 ## $a1 = 00000810 -/* 000F0 808AE560 AE02014C */ sw $v0, 0x014C($s0) ## 0000014C -/* 000F4 808AE564 8FBF001C */ lw $ra, 0x001C($sp) -/* 000F8 808AE568 8FB00018 */ lw $s0, 0x0018($sp) -/* 000FC 808AE56C 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 00100 808AE570 03E00008 */ jr $ra -/* 00104 808AE574 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot05_Soko/BgSpot05Soko_Update.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot05_Soko/BgSpot05Soko_Update.s deleted file mode 100644 index f4e14b2486..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot05_Soko/BgSpot05Soko_Update.s +++ /dev/null @@ -1,12 +0,0 @@ -glabel BgSpot05Soko_Update -/* 0022C 808AE69C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00230 808AE6A0 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00234 808AE6A4 8C990164 */ lw $t9, 0x0164($a0) ## 00000164 -/* 00238 808AE6A8 0320F809 */ jalr $ra, $t9 -/* 0023C 808AE6AC 00000000 */ nop -/* 00240 808AE6B0 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00244 808AE6B4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00248 808AE6B8 03E00008 */ jr $ra -/* 0024C 808AE6BC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot05_Soko/func_808AE5A8.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot05_Soko/func_808AE5A8.s deleted file mode 100644 index c2c475fc36..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot05_Soko/func_808AE5A8.s +++ /dev/null @@ -1,6 +0,0 @@ -glabel func_808AE5A8 -/* 00138 808AE5A8 AFA40000 */ sw $a0, 0x0000($sp) -/* 0013C 808AE5AC 03E00008 */ jr $ra -/* 00140 808AE5B0 AFA50004 */ sw $a1, 0x0004($sp) - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot05_Soko/func_808AE5B4.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot05_Soko/func_808AE5B4.s deleted file mode 100644 index 1c52374e33..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot05_Soko/func_808AE5B4.s +++ /dev/null @@ -1,38 +0,0 @@ -glabel func_808AE5B4 -/* 00144 808AE5B4 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 00148 808AE5B8 AFB00018 */ sw $s0, 0x0018($sp) -/* 0014C 808AE5BC 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00150 808AE5C0 AFBF001C */ sw $ra, 0x001C($sp) -/* 00154 808AE5C4 AFA50024 */ sw $a1, 0x0024($sp) -/* 00158 808AE5C8 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 0015C 808AE5CC 0C00B2D0 */ jal Flags_GetSwitch - -/* 00160 808AE5D0 8E050168 */ lw $a1, 0x0168($s0) ## 00000168 -/* 00164 808AE5D4 10400011 */ beq $v0, $zero, .L808AE61C -/* 00168 808AE5D8 8FA40024 */ lw $a0, 0x0024($sp) -/* 0016C 808AE5DC 26050024 */ addiu $a1, $s0, 0x0024 ## $a1 = 00000024 -/* 00170 808AE5E0 2406001E */ addiu $a2, $zero, 0x001E ## $a2 = 0000001E -/* 00174 808AE5E4 0C01AEB6 */ jal Audio_PlaySoundAtPosition - -/* 00178 808AE5E8 2407285A */ addiu $a3, $zero, 0x285A ## $a3 = 0000285A -/* 0017C 808AE5EC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00180 808AE5F0 0C00B56E */ jal Actor_SetHeight - -/* 00184 808AE5F4 3C054248 */ lui $a1, 0x4248 ## $a1 = 42480000 -/* 00188 808AE5F8 8FA40024 */ lw $a0, 0x0024($sp) -/* 0018C 808AE5FC 0C020120 */ jal func_80080480 -/* 00190 808AE600 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 00194 808AE604 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 -/* 00198 808AE608 44812000 */ mtc1 $at, $f4 ## $f4 = 0.50 -/* 0019C 808AE60C 3C0E808B */ lui $t6, %hi(func_808AE630) ## $t6 = 808B0000 -/* 001A0 808AE610 25CEE630 */ addiu $t6, $t6, %lo(func_808AE630) ## $t6 = 808AE630 -/* 001A4 808AE614 AE0E0164 */ sw $t6, 0x0164($s0) ## 00000164 -/* 001A8 808AE618 E6040068 */ swc1 $f4, 0x0068($s0) ## 00000068 -.L808AE61C: -/* 001AC 808AE61C 8FBF001C */ lw $ra, 0x001C($sp) -/* 001B0 808AE620 8FB00018 */ lw $s0, 0x0018($sp) -/* 001B4 808AE624 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 001B8 808AE628 03E00008 */ jr $ra -/* 001BC 808AE62C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot05_Soko/func_808AE630.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot05_Soko/func_808AE630.s deleted file mode 100644 index c9504af5e0..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot05_Soko/func_808AE630.s +++ /dev/null @@ -1,33 +0,0 @@ -glabel func_808AE630 -/* 001C0 808AE630 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 001C4 808AE634 AFBF0014 */ sw $ra, 0x0014($sp) -/* 001C8 808AE638 AFA5001C */ sw $a1, 0x001C($sp) -/* 001CC 808AE63C 3C013FC0 */ lui $at, 0x3FC0 ## $at = 3FC00000 -/* 001D0 808AE640 44813000 */ mtc1 $at, $f6 ## $f6 = 1.50 -/* 001D4 808AE644 C4840068 */ lwc1 $f4, 0x0068($a0) ## 00000068 -/* 001D8 808AE648 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 -/* 001DC 808AE64C 3C0142F0 */ lui $at, 0x42F0 ## $at = 42F00000 -/* 001E0 808AE650 46062202 */ mul.s $f8, $f4, $f6 -/* 001E4 808AE654 44818000 */ mtc1 $at, $f16 ## $f16 = 120.00 -/* 001E8 808AE658 24840028 */ addiu $a0, $a0, 0x0028 ## $a0 = 00000028 -/* 001EC 808AE65C E4880040 */ swc1 $f8, 0x0040($a0) ## 00000068 -/* 001F0 808AE660 C4EA000C */ lwc1 $f10, 0x000C($a3) ## 0000000C -/* 001F4 808AE664 8CE60068 */ lw $a2, 0x0068($a3) ## 00000068 -/* 001F8 808AE668 AFA70018 */ sw $a3, 0x0018($sp) -/* 001FC 808AE66C 46105481 */ sub.s $f18, $f10, $f16 -/* 00200 808AE670 44059000 */ mfc1 $a1, $f18 -/* 00204 808AE674 0C01DE80 */ jal Math_ApproxF - -/* 00208 808AE678 00000000 */ nop -/* 0020C 808AE67C 10400003 */ beq $v0, $zero, .L808AE68C -/* 00210 808AE680 8FA70018 */ lw $a3, 0x0018($sp) -/* 00214 808AE684 0C00B55C */ jal Actor_Kill - -/* 00218 808AE688 00E02025 */ or $a0, $a3, $zero ## $a0 = 00000000 -.L808AE68C: -/* 0021C 808AE68C 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00220 808AE690 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00224 808AE694 03E00008 */ jr $ra -/* 00228 808AE698 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot06_Objects/BgSpot06Objects_Draw.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot06_Objects/BgSpot06Objects_Draw.s index 7d679bbc31..1c97e4e26a 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot06_Objects/BgSpot06Objects_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Spot06_Objects/BgSpot06Objects_Draw.s @@ -19,7 +19,7 @@ glabel BgSpot06Objects_Draw /* 00FFC 808AF77C 8FBF0014 */ lw $ra, 0x0014($sp) .L808AF780: /* 01000 808AF780 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 01004 808AF784 0C00D498 */ jal Draw_DListOpa +/* 01004 808AF784 0C00D498 */ jal Gfx_DrawDListOpa /* 01008 808AF788 24A50E10 */ addiu $a1, $a1, 0x0E10 ## $a1 = 06000E10 /* 0100C 808AF78C 10000018 */ beq $zero, $zero, .L808AF7F0 @@ -27,7 +27,7 @@ glabel BgSpot06Objects_Draw .L808AF794: /* 01014 808AF794 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 01018 808AF798 24A52490 */ addiu $a1, $a1, 0x2490 ## $a1 = 06002490 -/* 0101C 808AF79C 0C00D498 */ jal Draw_DListOpa +/* 0101C 808AF79C 0C00D498 */ jal Gfx_DrawDListOpa /* 01020 808AF7A0 AFA60018 */ sw $a2, 0x0018($sp) /* 01024 808AF7A4 8FA60018 */ lw $a2, 0x0018($sp) @@ -48,7 +48,7 @@ glabel BgSpot06Objects_Draw /* 0105C 808AF7DC 8FBF0014 */ lw $ra, 0x0014($sp) .L808AF7E0: /* 01060 808AF7E0 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 01064 808AF7E4 0C00D498 */ jal Draw_DListOpa +/* 01064 808AF7E4 0C00D498 */ jal Gfx_DrawDListOpa /* 01068 808AF7E8 24A51160 */ addiu $a1, $a1, 0x1160 ## $a1 = 06001160 /* 0106C 808AF7EC 8FBF0014 */ lw $ra, 0x0014($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot06_Objects/func_808AF524.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot06_Objects/func_808AF524.s index da199d90d9..ff6f2a1cbf 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot06_Objects/func_808AF524.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Spot06_Objects/func_808AF524.s @@ -11,7 +11,7 @@ glabel func_808AF524 /* 00DC8 808AF548 24C6F994 */ addiu $a2, $a2, %lo(D_808AF994) ## $a2 = 808AF994 /* 00DCC 808AF54C 27A4006C */ addiu $a0, $sp, 0x006C ## $a0 = FFFFFFE4 /* 00DD0 808AF550 2407034C */ addiu $a3, $zero, 0x034C ## $a3 = 0000034C -/* 00DD4 808AF554 0C031AB1 */ jal func_800C6AC4 +/* 00DD4 808AF554 0C031AB1 */ jal Graph_OpenDisps /* 00DD8 808AF558 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 /* 00DDC 808AF55C 0C024F61 */ jal func_80093D84 /* 00DE0 808AF560 8E440000 */ lw $a0, 0x0000($s2) ## 00000000 @@ -52,7 +52,7 @@ glabel func_808AF524 /* 00E6C 808AF5EC AFA20064 */ sw $v0, 0x0064($sp) /* 00E70 808AF5F0 AFB00020 */ sw $s0, 0x0020($sp) /* 00E74 808AF5F4 AFB0001C */ sw $s0, 0x001C($sp) -/* 00E78 808AF5F8 0C0253D0 */ jal Draw_TwoTexScroll +/* 00E78 808AF5F8 0C0253D0 */ jal Gfx_TwoTexScroll /* 00E7C 808AF5FC 02003825 */ or $a3, $s0, $zero ## $a3 = 00000000 /* 00E80 808AF600 8FA30064 */ lw $v1, 0x0064($sp) /* 00E84 808AF604 8FA60050 */ lw $a2, 0x0050($sp) @@ -80,7 +80,7 @@ glabel func_808AF524 /* 00EDC 808AF65C AFA70020 */ sw $a3, 0x0020($sp) /* 00EE0 808AF660 AFB0001C */ sw $s0, 0x001C($sp) /* 00EE4 808AF664 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 00EE8 808AF668 0C0253D0 */ jal Draw_TwoTexScroll +/* 00EE8 808AF668 0C0253D0 */ jal Gfx_TwoTexScroll /* 00EEC 808AF66C AFA20060 */ sw $v0, 0x0060($sp) /* 00EF0 808AF670 8FA30060 */ lw $v1, 0x0060($sp) /* 00EF4 808AF674 3C0BFB00 */ lui $t3, 0xFB00 ## $t3 = FB000000 @@ -126,7 +126,7 @@ glabel func_808AF524 /* 00F90 808AF710 AC4A0004 */ sw $t2, 0x0004($v0) ## 00000004 /* 00F94 808AF714 AC490000 */ sw $t1, 0x0000($v0) ## 00000000 .L808AF718: -/* 00F98 808AF718 0C031AD5 */ jal func_800C6B54 +/* 00F98 808AF718 0C031AD5 */ jal Graph_CloseDisps /* 00F9C 808AF71C 8E450000 */ lw $a1, 0x0000($s2) ## 00000000 /* 00FA0 808AF720 8FBF0044 */ lw $ra, 0x0044($sp) /* 00FA4 808AF724 8FB00038 */ lw $s0, 0x0038($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot07_Taki/BgSpot07Taki_Draw.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot07_Taki/BgSpot07Taki_Draw.s index 062bed49c9..02a5183847 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot07_Taki/BgSpot07Taki_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Spot07_Taki/BgSpot07Taki_Draw.s @@ -9,7 +9,7 @@ glabel BgSpot07Taki_Draw /* 00124 808AFD54 24C60210 */ addiu $a2, $a2, %lo(D_808B0210) ## $a2 = 808B0210 /* 00128 808AFD58 27A40084 */ addiu $a0, $sp, 0x0084 ## $a0 = FFFFFFE4 /* 0012C 808AFD5C 240700A9 */ addiu $a3, $zero, 0x00A9 ## $a3 = 000000A9 -/* 00130 808AFD60 0C031AB1 */ jal func_800C6AC4 +/* 00130 808AFD60 0C031AB1 */ jal Graph_OpenDisps /* 00134 808AFD64 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 /* 00138 808AFD68 8FA200A4 */ lw $v0, 0x00A4($sp) /* 0013C 808AFD6C 3C0F0001 */ lui $t7, 0x0001 ## $t7 = 00010000 @@ -105,7 +105,7 @@ glabel BgSpot07Taki_Draw /* 0029C 808AFECC AFA7001C */ sw $a3, 0x001C($sp) /* 002A0 808AFED0 AFB80010 */ sw $t8, 0x0010($sp) /* 002A4 808AFED4 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 002A8 808AFED8 0C0253D0 */ jal Draw_TwoTexScroll +/* 002A8 808AFED8 0C0253D0 */ jal Gfx_TwoTexScroll /* 002AC 808AFEDC AFA20070 */ sw $v0, 0x0070($sp) /* 002B0 808AFEE0 8FA30070 */ lw $v1, 0x0070($sp) /* 002B4 808AFEE4 8FA70048 */ lw $a3, 0x0048($sp) @@ -157,7 +157,7 @@ glabel BgSpot07Taki_Draw /* 0036C 808AFF9C 8FA60048 */ lw $a2, 0x0048($sp) /* 00370 808AFFA0 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 00374 808AFFA4 AFA20068 */ sw $v0, 0x0068($sp) -/* 00378 808AFFA8 0C0253D0 */ jal Draw_TwoTexScroll +/* 00378 808AFFA8 0C0253D0 */ jal Gfx_TwoTexScroll /* 0037C 808AFFAC AFAF001C */ sw $t7, 0x001C($sp) /* 00380 808AFFB0 8FA30068 */ lw $v1, 0x0068($sp) /* 00384 808AFFB4 3C0ADB06 */ lui $t2, 0xDB06 ## $t2 = DB060000 @@ -188,7 +188,7 @@ glabel BgSpot07Taki_Draw /* 003E8 808B0018 AFAC0010 */ sw $t4, 0x0010($sp) /* 003EC 808B001C 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 003F0 808B0020 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 003F4 808B0024 0C0253D0 */ jal Draw_TwoTexScroll +/* 003F4 808B0024 0C0253D0 */ jal Gfx_TwoTexScroll /* 003F8 808B0028 AFA20064 */ sw $v0, 0x0064($sp) /* 003FC 808B002C 8FA30064 */ lw $v1, 0x0064($sp) /* 00400 808B0030 3C0A0600 */ lui $t2, 0x0600 ## $t2 = 06000000 @@ -220,7 +220,7 @@ glabel BgSpot07Taki_Draw /* 00464 808B0094 AFB80018 */ sw $t8, 0x0018($sp) /* 00468 808B0098 AFAF0014 */ sw $t7, 0x0014($sp) /* 0046C 808B009C AFAE0010 */ sw $t6, 0x0010($sp) -/* 00470 808B00A0 0C0253D0 */ jal Draw_TwoTexScroll +/* 00470 808B00A0 0C0253D0 */ jal Gfx_TwoTexScroll /* 00474 808B00A4 AFA2005C */ sw $v0, 0x005C($sp) /* 00478 808B00A8 8FA3005C */ lw $v1, 0x005C($sp) /* 0047C 808B00AC 8FA60044 */ lw $a2, 0x0044($sp) @@ -251,7 +251,7 @@ glabel BgSpot07Taki_Draw /* 004E0 808B0110 AFAD0010 */ sw $t5, 0x0010($sp) /* 004E4 808B0114 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 004E8 808B0118 AFA6001C */ sw $a2, 0x001C($sp) -/* 004EC 808B011C 0C0253D0 */ jal Draw_TwoTexScroll +/* 004EC 808B011C 0C0253D0 */ jal Gfx_TwoTexScroll /* 004F0 808B0120 AFA20058 */ sw $v0, 0x0058($sp) /* 004F4 808B0124 8FA30058 */ lw $v1, 0x0058($sp) /* 004F8 808B0128 3C0B0600 */ lui $t3, 0x0600 ## $t3 = 06000000 @@ -293,7 +293,7 @@ glabel BgSpot07Taki_Draw /* 0057C 808B01AC 24C60258 */ addiu $a2, $a2, %lo(D_808B0258) ## $a2 = 808B0258 /* 00580 808B01B0 27A40084 */ addiu $a0, $sp, 0x0084 ## $a0 = FFFFFFE4 /* 00584 808B01B4 24070110 */ addiu $a3, $zero, 0x0110 ## $a3 = 00000110 -/* 00588 808B01B8 0C031AD5 */ jal func_800C6B54 +/* 00588 808B01B8 0C031AD5 */ jal Graph_CloseDisps /* 0058C 808B01BC 8D650000 */ lw $a1, 0x0000($t3) ## 06000BE0 /* 00590 808B01C0 8FBF003C */ lw $ra, 0x003C($sp) /* 00594 808B01C4 8FB00038 */ lw $s0, 0x0038($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot08_Bakudankabe/BgSpot08Bakudankabe_Draw.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot08_Bakudankabe/BgSpot08Bakudankabe_Draw.s index aa2cb88ace..8dad3f3969 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot08_Bakudankabe/BgSpot08Bakudankabe_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Spot08_Bakudankabe/BgSpot08Bakudankabe_Draw.s @@ -16,7 +16,7 @@ glabel BgSpot08Bakudankabe_Draw /* 00514 808B07E4 8FA50018 */ lw $a1, 0x0018($sp) /* 00518 808B07E8 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 0051C 808B07EC 24A53898 */ addiu $a1, $a1, 0x3898 ## $a1 = 06003898 -/* 00520 808B07F0 0C00D498 */ jal Draw_DListOpa +/* 00520 808B07F0 0C00D498 */ jal Gfx_DrawDListOpa /* 00524 808B07F4 8FA40024 */ lw $a0, 0x0024($sp) /* 00528 808B07F8 8FBF0014 */ lw $ra, 0x0014($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot08_Iceblock/BgSpot08Iceblock_Draw.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot08_Iceblock/BgSpot08Iceblock_Draw.s index 78371436be..0bbb940ea6 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot08_Iceblock/BgSpot08Iceblock_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Spot08_Iceblock/BgSpot08Iceblock_Draw.s @@ -20,7 +20,7 @@ glabel BgSpot08Iceblock_Draw /* 00D0C 808B166C 25EF0DE0 */ addiu $t7, $t7, 0x0DE0 ## $t7 = 06000DE0 /* 00D10 808B1670 AFAF001C */ sw $t7, 0x001C($sp) .L808B1674: -/* 00D14 808B1674 0C00D498 */ jal Draw_DListOpa +/* 00D14 808B1674 0C00D498 */ jal Gfx_DrawDListOpa /* 00D18 808B1678 8FA5001C */ lw $a1, 0x001C($sp) /* 00D1C 808B167C 8FBF0014 */ lw $ra, 0x0014($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot08_Iceblock/func_808B0CE0.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot08_Iceblock/func_808B0CE0.s index 0070a98175..2503e86c5d 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot08_Iceblock/func_808B0CE0.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Spot08_Iceblock/func_808B0CE0.s @@ -211,7 +211,7 @@ glabel func_808B0CE0 /* 00680 808B0FE0 8FA50024 */ lw $a1, 0x0024($sp) /* 00684 808B0FE4 0C032BFB */ jal func_800CAFEC /* 00688 808B0FE8 AFA7002C */ sw $a3, 0x002C($sp) -/* 0068C 808B0FEC 0C03F4DA */ jal func_800FD368 +/* 0068C 808B0FEC 0C03F4DA */ jal Math_acosf /* 00690 808B0FF0 46000306 */ mov.s $f12, $f0 /* 00694 808B0FF4 8FA5002C */ lw $a1, 0x002C($sp) /* 00698 808B0FF8 46000306 */ mov.s $f12, $f0 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot09_Obj/BgSpot09Obj_Destroy.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot09_Obj/BgSpot09Obj_Destroy.s deleted file mode 100644 index 2201d2e723..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot09_Obj/BgSpot09Obj_Destroy.s +++ /dev/null @@ -1,19 +0,0 @@ -glabel BgSpot09Obj_Destroy -/* 0035C 808B1E3C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00360 808B1E40 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00364 808B1E44 AFA40018 */ sw $a0, 0x0018($sp) -/* 00368 808B1E48 848F001C */ lh $t7, 0x001C($a0) ## 0000001C -/* 0036C 808B1E4C 00807025 */ or $t6, $a0, $zero ## $t6 = 00000000 -/* 00370 808B1E50 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 00374 808B1E54 11E00003 */ beq $t7, $zero, .L808B1E64 -/* 00378 808B1E58 24A50810 */ addiu $a1, $a1, 0x0810 ## $a1 = 00000810 -/* 0037C 808B1E5C 0C00FB56 */ jal DynaPolyInfo_Free - ## DynaPolyInfo_delReserve -/* 00380 808B1E60 8DC6014C */ lw $a2, 0x014C($t6) ## 0000014C -.L808B1E64: -/* 00384 808B1E64 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00388 808B1E68 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 0038C 808B1E6C 03E00008 */ jr $ra -/* 00390 808B1E70 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot09_Obj/BgSpot09Obj_Draw.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot09_Obj/BgSpot09Obj_Draw.s deleted file mode 100644 index f87970d293..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot09_Obj/BgSpot09Obj_Draw.s +++ /dev/null @@ -1,64 +0,0 @@ -glabel BgSpot09Obj_Draw -/* 003A0 808B1E80 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 -/* 003A4 808B1E84 AFB00014 */ sw $s0, 0x0014($sp) -/* 003A8 808B1E88 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 003AC 808B1E8C AFBF001C */ sw $ra, 0x001C($sp) -/* 003B0 808B1E90 AFB10018 */ sw $s1, 0x0018($sp) -/* 003B4 808B1E94 860E001C */ lh $t6, 0x001C($s0) ## 0000001C -/* 003B8 808B1E98 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 -/* 003BC 808B1E9C 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 003C0 808B1EA0 3C05808B */ lui $a1, %hi(D_808B1FC8) ## $a1 = 808B0000 -/* 003C4 808B1EA4 000E7880 */ sll $t7, $t6, 2 -/* 003C8 808B1EA8 00AF2821 */ addu $a1, $a1, $t7 -/* 003CC 808B1EAC 0C00D498 */ jal Draw_DListOpa - -/* 003D0 808B1EB0 8CA51FC8 */ lw $a1, %lo(D_808B1FC8)($a1) -/* 003D4 808B1EB4 8618001C */ lh $t8, 0x001C($s0) ## 0000001C -/* 003D8 808B1EB8 24010003 */ addiu $at, $zero, 0x0003 ## $at = 00000003 -/* 003DC 808B1EBC 27A4002C */ addiu $a0, $sp, 0x002C ## $a0 = FFFFFFEC -/* 003E0 808B1EC0 17010024 */ bne $t8, $at, .L808B1F54 -/* 003E4 808B1EC4 3C06808B */ lui $a2, %hi(D_808B207C) ## $a2 = 808B0000 -/* 003E8 808B1EC8 8E250000 */ lw $a1, 0x0000($s1) ## 00000000 -/* 003EC 808B1ECC 24C6207C */ addiu $a2, $a2, %lo(D_808B207C) ## $a2 = 808B207C -/* 003F0 808B1ED0 24070184 */ addiu $a3, $zero, 0x0184 ## $a3 = 00000184 -/* 003F4 808B1ED4 0C031AB1 */ jal func_800C6AC4 -/* 003F8 808B1ED8 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 -/* 003FC 808B1EDC 0C024F61 */ jal func_80093D84 -/* 00400 808B1EE0 8E240000 */ lw $a0, 0x0000($s1) ## 00000000 -/* 00404 808B1EE4 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 00408 808B1EE8 3C08DA38 */ lui $t0, 0xDA38 ## $t0 = DA380000 -/* 0040C 808B1EEC 35080003 */ ori $t0, $t0, 0x0003 ## $t0 = DA380003 -/* 00410 808B1EF0 24590008 */ addiu $t9, $v0, 0x0008 ## $t9 = 00000008 -/* 00414 808B1EF4 AE1902D0 */ sw $t9, 0x02D0($s0) ## 000002D0 -/* 00418 808B1EF8 AC480000 */ sw $t0, 0x0000($v0) ## 00000000 -/* 0041C 808B1EFC 8E240000 */ lw $a0, 0x0000($s1) ## 00000000 -/* 00420 808B1F00 3C05808B */ lui $a1, %hi(D_808B2094) ## $a1 = 808B0000 -/* 00424 808B1F04 24A52094 */ addiu $a1, $a1, %lo(D_808B2094) ## $a1 = 808B2094 -/* 00428 808B1F08 24060187 */ addiu $a2, $zero, 0x0187 ## $a2 = 00000187 -/* 0042C 808B1F0C 0C0346A2 */ jal Matrix_NewMtx -/* 00430 808B1F10 AFA20028 */ sw $v0, 0x0028($sp) -/* 00434 808B1F14 8FA30028 */ lw $v1, 0x0028($sp) -/* 00438 808B1F18 3C0B0601 */ lui $t3, 0x0601 ## $t3 = 06010000 -/* 0043C 808B1F1C 256B8010 */ addiu $t3, $t3, 0x8010 ## $t3 = 06008010 -/* 00440 808B1F20 AC620004 */ sw $v0, 0x0004($v1) ## 00000004 -/* 00444 808B1F24 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 00448 808B1F28 3C0ADE00 */ lui $t2, 0xDE00 ## $t2 = DE000000 -/* 0044C 808B1F2C 3C06808B */ lui $a2, %hi(D_808B20AC) ## $a2 = 808B0000 -/* 00450 808B1F30 24490008 */ addiu $t1, $v0, 0x0008 ## $t1 = 00000008 -/* 00454 808B1F34 AE0902D0 */ sw $t1, 0x02D0($s0) ## 000002D0 -/* 00458 808B1F38 AC4B0004 */ sw $t3, 0x0004($v0) ## 00000004 -/* 0045C 808B1F3C AC4A0000 */ sw $t2, 0x0000($v0) ## 00000000 -/* 00460 808B1F40 8E250000 */ lw $a1, 0x0000($s1) ## 00000000 -/* 00464 808B1F44 24C620AC */ addiu $a2, $a2, %lo(D_808B20AC) ## $a2 = 808B20AC -/* 00468 808B1F48 27A4002C */ addiu $a0, $sp, 0x002C ## $a0 = FFFFFFEC -/* 0046C 808B1F4C 0C031AD5 */ jal func_800C6B54 -/* 00470 808B1F50 2407018C */ addiu $a3, $zero, 0x018C ## $a3 = 0000018C -.L808B1F54: -/* 00474 808B1F54 8FBF001C */ lw $ra, 0x001C($sp) -/* 00478 808B1F58 8FB00014 */ lw $s0, 0x0014($sp) -/* 0047C 808B1F5C 8FB10018 */ lw $s1, 0x0018($sp) -/* 00480 808B1F60 03E00008 */ jr $ra -/* 00484 808B1F64 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 -/* 00488 808B1F68 00000000 */ nop -/* 0048C 808B1F6C 00000000 */ nop - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot09_Obj/BgSpot09Obj_Init.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot09_Obj/BgSpot09Obj_Init.s deleted file mode 100644 index cef88b2b9d..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot09_Obj/BgSpot09Obj_Init.s +++ /dev/null @@ -1,57 +0,0 @@ -glabel BgSpot09Obj_Init -/* 002A4 808B1D84 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 002A8 808B1D88 AFB00018 */ sw $s0, 0x0018($sp) -/* 002AC 808B1D8C 3C068016 */ lui $a2, 0x8016 ## $a2 = 80160000 -/* 002B0 808B1D90 94C6F546 */ lhu $a2, -0x0ABA($a2) ## 8015F546 -/* 002B4 808B1D94 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 002B8 808B1D98 AFBF001C */ sw $ra, 0x001C($sp) -/* 002BC 808B1D9C AFA50024 */ sw $a1, 0x0024($sp) -/* 002C0 808B1DA0 3C04808B */ lui $a0, %hi(D_808B1FE0) ## $a0 = 808B0000 -/* 002C4 808B1DA4 24841FE0 */ addiu $a0, $a0, %lo(D_808B1FE0) ## $a0 = 808B1FE0 -/* 002C8 808B1DA8 8605001C */ lh $a1, 0x001C($s0) ## 0000001C -/* 002CC 808B1DAC 0C00084C */ jal osSyncPrintf - -/* 002D0 808B1DB0 30C6000F */ andi $a2, $a2, 0x000F ## $a2 = 00000000 -/* 002D4 808B1DB4 860E001C */ lh $t6, 0x001C($s0) ## 0000001C -/* 002D8 808B1DB8 3C04808B */ lui $a0, %hi(D_808B2018) ## $a0 = 808B0000 -/* 002DC 808B1DBC 3C05808B */ lui $a1, %hi(D_808B2064) ## $a1 = 808B0000 -/* 002E0 808B1DC0 31CF00FF */ andi $t7, $t6, 0x00FF ## $t7 = 00000000 -/* 002E4 808B1DC4 A60F001C */ sh $t7, 0x001C($s0) ## 0000001C -/* 002E8 808B1DC8 8607001C */ lh $a3, 0x001C($s0) ## 0000001C -/* 002EC 808B1DCC 24A52064 */ addiu $a1, $a1, %lo(D_808B2064) ## $a1 = 808B2064 -/* 002F0 808B1DD0 24842018 */ addiu $a0, $a0, %lo(D_808B2018) ## $a0 = 808B2018 -/* 002F4 808B1DD4 04E00003 */ bltz $a3, .L808B1DE4 -/* 002F8 808B1DD8 28E10005 */ slti $at, $a3, 0x0005 -/* 002FC 808B1DDC 54200004 */ bnel $at, $zero, .L808B1DF0 -/* 00300 808B1DE0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -.L808B1DE4: -/* 00304 808B1DE4 0C00084C */ jal osSyncPrintf - -/* 00308 808B1DE8 24060142 */ addiu $a2, $zero, 0x0142 ## $a2 = 00000142 -/* 0030C 808B1DEC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -.L808B1DF0: -/* 00310 808B1DF0 0C22C71C */ jal func_808B1C70 -/* 00314 808B1DF4 8FA50024 */ lw $a1, 0x0024($sp) -/* 00318 808B1DF8 14400005 */ bne $v0, $zero, .L808B1E10 -/* 0031C 808B1DFC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00320 808B1E00 0C00B55C */ jal Actor_Kill - -/* 00324 808B1E04 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00328 808B1E08 10000008 */ beq $zero, $zero, .L808B1E2C -/* 0032C 808B1E0C 8FBF001C */ lw $ra, 0x001C($sp) -.L808B1E10: -/* 00330 808B1E10 0C22C751 */ jal func_808B1D44 -/* 00334 808B1E14 8FA50024 */ lw $a1, 0x0024($sp) -/* 00338 808B1E18 54400004 */ bnel $v0, $zero, .L808B1E2C -/* 0033C 808B1E1C 8FBF001C */ lw $ra, 0x001C($sp) -/* 00340 808B1E20 0C00B55C */ jal Actor_Kill - -/* 00344 808B1E24 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00348 808B1E28 8FBF001C */ lw $ra, 0x001C($sp) -.L808B1E2C: -/* 0034C 808B1E2C 8FB00018 */ lw $s0, 0x0018($sp) -/* 00350 808B1E30 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 00354 808B1E34 03E00008 */ jr $ra -/* 00358 808B1E38 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot09_Obj/BgSpot09Obj_Update.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot09_Obj/BgSpot09Obj_Update.s deleted file mode 100644 index 04fa8a39b9..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot09_Obj/BgSpot09Obj_Update.s +++ /dev/null @@ -1,6 +0,0 @@ -glabel BgSpot09Obj_Update -/* 00394 808B1E74 AFA40000 */ sw $a0, 0x0000($sp) -/* 00398 808B1E78 03E00008 */ jr $ra -/* 0039C 808B1E7C AFA50004 */ sw $a1, 0x0004($sp) - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot09_Obj/func_808B1AE0.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot09_Obj/func_808B1AE0.s deleted file mode 100644 index 70aba536af..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot09_Obj/func_808B1AE0.s +++ /dev/null @@ -1,62 +0,0 @@ -glabel func_808B1AE0 -/* 00000 808B1AE0 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 00004 808B1AE4 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 -/* 00008 808B1AE8 8C4E1360 */ lw $t6, 0x1360($v0) ## 8015F9C0 -/* 0000C 808B1AEC AFA50004 */ sw $a1, 0x0004($sp) -/* 00010 808B1AF0 29C10004 */ slti $at, $t6, 0x0004 -/* 00014 808B1AF4 54200005 */ bnel $at, $zero, .L808B1B0C -/* 00018 808B1AF8 94430EE6 */ lhu $v1, 0x0EE6($v0) ## 8015F546 -/* 0001C 808B1AFC 8482001C */ lh $v0, 0x001C($a0) ## 0000001C -/* 00020 808B1B00 03E00008 */ jr $ra -/* 00024 808B1B04 2C420001 */ sltiu $v0, $v0, 0x0001 -.L808B1B08: -/* 00028 808B1B08 94430EE6 */ lhu $v1, 0x0EE6($v0) ## 8015F546 -.L808B1B0C: -/* 0002C 808B1B0C 8C4F0004 */ lw $t7, 0x0004($v0) ## 8015E664 -/* 00030 808B1B10 24010011 */ addiu $at, $zero, 0x0011 ## $at = 00000011 -/* 00034 808B1B14 3063000F */ andi $v1, $v1, 0x000F ## $v1 = 00000000 -/* 00038 808B1B18 3863000F */ xori $v1, $v1, 0x000F ## $v1 = 0000000F -/* 0003C 808B1B1C 11E00003 */ beq $t7, $zero, .L808B1B2C -/* 00040 808B1B20 2C630001 */ sltiu $v1, $v1, 0x0001 -/* 00044 808B1B24 10000002 */ beq $zero, $zero, .L808B1B30 -/* 00048 808B1B28 24020005 */ addiu $v0, $zero, 0x0005 ## $v0 = 00000005 -.L808B1B2C: -/* 0004C 808B1B2C 24020011 */ addiu $v0, $zero, 0x0011 ## $v0 = 00000011 -.L808B1B30: -/* 00050 808B1B30 54410016 */ bnel $v0, $at, .L808B1B8C -/* 00054 808B1B34 8482001C */ lh $v0, 0x001C($a0) ## 0000001C -/* 00058 808B1B38 8482001C */ lh $v0, 0x001C($a0) ## 0000001C -/* 0005C 808B1B3C 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 00060 808B1B40 10400009 */ beq $v0, $zero, .L808B1B68 -/* 00064 808B1B44 00000000 */ nop -/* 00068 808B1B48 10410009 */ beq $v0, $at, .L808B1B70 -/* 0006C 808B1B4C 24010003 */ addiu $at, $zero, 0x0003 ## $at = 00000003 -/* 00070 808B1B50 1041000B */ beq $v0, $at, .L808B1B80 -/* 00074 808B1B54 24010004 */ addiu $at, $zero, 0x0004 ## $at = 00000004 -/* 00078 808B1B58 10410007 */ beq $v0, $at, .L808B1B78 -/* 0007C 808B1B5C 00000000 */ nop -/* 00080 808B1B60 1000000D */ beq $zero, $zero, .L808B1B98 -/* 00084 808B1B64 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -.L808B1B68: -/* 00088 808B1B68 03E00008 */ jr $ra -/* 0008C 808B1B6C 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -.L808B1B70: -/* 00090 808B1B70 03E00008 */ jr $ra -/* 00094 808B1B74 2C620001 */ sltiu $v0, $v1, 0x0001 -.L808B1B78: -/* 00098 808B1B78 03E00008 */ jr $ra -/* 0009C 808B1B7C 00601025 */ or $v0, $v1, $zero ## $v0 = 0000000F -.L808B1B80: -/* 000A0 808B1B80 03E00008 */ jr $ra -/* 000A4 808B1B84 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -.L808B1B88: -/* 000A8 808B1B88 8482001C */ lh $v0, 0x001C($a0) ## 0000001C -.L808B1B8C: -/* 000AC 808B1B8C 38420002 */ xori $v0, $v0, 0x0002 ## $v0 = 00000003 -/* 000B0 808B1B90 03E00008 */ jr $ra -/* 000B4 808B1B94 2C420001 */ sltiu $v0, $v0, 0x0001 -.L808B1B98: -/* 000B8 808B1B98 03E00008 */ jr $ra -/* 000BC 808B1B9C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot09_Obj/func_808B1BA0.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot09_Obj/func_808B1BA0.s deleted file mode 100644 index 21df73bd41..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot09_Obj/func_808B1BA0.s +++ /dev/null @@ -1,26 +0,0 @@ -glabel func_808B1BA0 -/* 000C0 808B1BA0 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 000C4 808B1BA4 AFBF0014 */ sw $ra, 0x0014($sp) -/* 000C8 808B1BA8 AFA5001C */ sw $a1, 0x001C($sp) -/* 000CC 808B1BAC 848E001C */ lh $t6, 0x001C($a0) ## 0000001C -/* 000D0 808B1BB0 24010003 */ addiu $at, $zero, 0x0003 ## $at = 00000003 -/* 000D4 808B1BB4 3C053DCC */ lui $a1, 0x3DCC ## $a1 = 3DCC0000 -/* 000D8 808B1BB8 15C10005 */ bne $t6, $at, .L808B1BD0 -/* 000DC 808B1BBC 00000000 */ nop -/* 000E0 808B1BC0 0C00B58B */ jal Actor_SetScale - -/* 000E4 808B1BC4 34A5CCCD */ ori $a1, $a1, 0xCCCD ## $a1 = 3DCCCCCD -/* 000E8 808B1BC8 10000004 */ beq $zero, $zero, .L808B1BDC -/* 000EC 808B1BCC 8FBF0014 */ lw $ra, 0x0014($sp) -.L808B1BD0: -/* 000F0 808B1BD0 0C00B58B */ jal Actor_SetScale - -/* 000F4 808B1BD4 3C053F80 */ lui $a1, 0x3F80 ## $a1 = 3F800000 -/* 000F8 808B1BD8 8FBF0014 */ lw $ra, 0x0014($sp) -.L808B1BDC: -/* 000FC 808B1BDC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00100 808B1BE0 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -/* 00104 808B1BE4 03E00008 */ jr $ra -/* 00108 808B1BE8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot09_Obj/func_808B1BEC.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot09_Obj/func_808B1BEC.s deleted file mode 100644 index 56294c2b08..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot09_Obj/func_808B1BEC.s +++ /dev/null @@ -1,40 +0,0 @@ -glabel func_808B1BEC -/* 0010C 808B1BEC 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 00110 808B1BF0 AFBF001C */ sw $ra, 0x001C($sp) -/* 00114 808B1BF4 AFB00018 */ sw $s0, 0x0018($sp) -/* 00118 808B1BF8 AFA50034 */ sw $a1, 0x0034($sp) -/* 0011C 808B1BFC AFA00028 */ sw $zero, 0x0028($sp) -/* 00120 808B1C00 848E001C */ lh $t6, 0x001C($a0) ## 0000001C -/* 00124 808B1C04 3C18808B */ lui $t8, %hi(D_808B1F90) ## $t8 = 808B0000 -/* 00128 808B1C08 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 0012C 808B1C0C 000E7880 */ sll $t7, $t6, 2 -/* 00130 808B1C10 030FC021 */ addu $t8, $t8, $t7 -/* 00134 808B1C14 8F181F90 */ lw $t8, %lo(D_808B1F90)($t8) -/* 00138 808B1C18 53000011 */ beql $t8, $zero, .L808B1C60 -/* 0013C 808B1C1C 8FBF001C */ lw $ra, 0x001C($sp) -/* 00140 808B1C20 0C010D20 */ jal DynaPolyInfo_SetActorMove - -/* 00144 808B1C24 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 00148 808B1C28 8619001C */ lh $t9, 0x001C($s0) ## 0000001C -/* 0014C 808B1C2C 3C04808B */ lui $a0, %hi(D_808B1F90) ## $a0 = 808B0000 -/* 00150 808B1C30 27A50028 */ addiu $a1, $sp, 0x0028 ## $a1 = FFFFFFF8 -/* 00154 808B1C34 00194080 */ sll $t0, $t9, 2 -/* 00158 808B1C38 00882021 */ addu $a0, $a0, $t0 -/* 0015C 808B1C3C 0C010620 */ jal DynaPolyInfo_Alloc - -/* 00160 808B1C40 8C841F90 */ lw $a0, %lo(D_808B1F90)($a0) -/* 00164 808B1C44 8FA40034 */ lw $a0, 0x0034($sp) -/* 00168 808B1C48 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 -/* 0016C 808B1C4C 8FA70028 */ lw $a3, 0x0028($sp) -/* 00170 808B1C50 0C00FA9D */ jal DynaPolyInfo_RegisterActor - ## DynaPolyInfo_setActor -/* 00174 808B1C54 24850810 */ addiu $a1, $a0, 0x0810 ## $a1 = 00000810 -/* 00178 808B1C58 AE02014C */ sw $v0, 0x014C($s0) ## 0000014C -/* 0017C 808B1C5C 8FBF001C */ lw $ra, 0x001C($sp) -.L808B1C60: -/* 00180 808B1C60 8FB00018 */ lw $s0, 0x0018($sp) -/* 00184 808B1C64 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 00188 808B1C68 03E00008 */ jr $ra -/* 0018C 808B1C6C 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot09_Obj/func_808B1C70.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot09_Obj/func_808B1C70.s deleted file mode 100644 index 9606370b3d..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot09_Obj/func_808B1C70.s +++ /dev/null @@ -1,37 +0,0 @@ -glabel func_808B1C70 -/* 00190 808B1C70 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 00194 808B1C74 AFB30020 */ sw $s3, 0x0020($sp) -/* 00198 808B1C78 AFB00014 */ sw $s0, 0x0014($sp) -/* 0019C 808B1C7C AFB2001C */ sw $s2, 0x001C($sp) -/* 001A0 808B1C80 AFB10018 */ sw $s1, 0x0018($sp) -/* 001A4 808B1C84 3C10808B */ lui $s0, %hi(D_808B1FA4) ## $s0 = 808B0000 -/* 001A8 808B1C88 3C13808B */ lui $s3, %hi(D_808B1FB0) ## $s3 = 808B0000 -/* 001AC 808B1C8C 00808825 */ or $s1, $a0, $zero ## $s1 = 00000000 -/* 001B0 808B1C90 00A09025 */ or $s2, $a1, $zero ## $s2 = 00000000 -/* 001B4 808B1C94 AFBF0024 */ sw $ra, 0x0024($sp) -/* 001B8 808B1C98 26731FB0 */ addiu $s3, $s3, %lo(D_808B1FB0) ## $s3 = 808B1FB0 -/* 001BC 808B1C9C 26101FA4 */ addiu $s0, $s0, %lo(D_808B1FA4) ## $s0 = 808B1FA4 -/* 001C0 808B1CA0 8E190000 */ lw $t9, 0x0000($s0) ## 808B1FA4 -.L808B1CA4: -/* 001C4 808B1CA4 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 001C8 808B1CA8 02402825 */ or $a1, $s2, $zero ## $a1 = 00000000 -/* 001CC 808B1CAC 0320F809 */ jalr $ra, $t9 -/* 001D0 808B1CB0 00000000 */ nop -/* 001D4 808B1CB4 14400003 */ bne $v0, $zero, .L808B1CC4 -/* 001D8 808B1CB8 26100004 */ addiu $s0, $s0, 0x0004 ## $s0 = 808B1FA8 -/* 001DC 808B1CBC 10000004 */ beq $zero, $zero, .L808B1CD0 -/* 001E0 808B1CC0 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -.L808B1CC4: -/* 001E4 808B1CC4 5613FFF7 */ bnel $s0, $s3, .L808B1CA4 -/* 001E8 808B1CC8 8E190000 */ lw $t9, 0x0000($s0) ## 808B1FA8 -/* 001EC 808B1CCC 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -.L808B1CD0: -/* 001F0 808B1CD0 8FBF0024 */ lw $ra, 0x0024($sp) -/* 001F4 808B1CD4 8FB00014 */ lw $s0, 0x0014($sp) -/* 001F8 808B1CD8 8FB10018 */ lw $s1, 0x0018($sp) -/* 001FC 808B1CDC 8FB2001C */ lw $s2, 0x001C($sp) -/* 00200 808B1CE0 8FB30020 */ lw $s3, 0x0020($sp) -/* 00204 808B1CE4 03E00008 */ jr $ra -/* 00208 808B1CE8 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot09_Obj/func_808B1CEC.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot09_Obj/func_808B1CEC.s deleted file mode 100644 index dd9f40be3f..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot09_Obj/func_808B1CEC.s +++ /dev/null @@ -1,15 +0,0 @@ -glabel func_808B1CEC -/* 0020C 808B1CEC 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00210 808B1CF0 AFA5001C */ sw $a1, 0x001C($sp) -/* 00214 808B1CF4 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00218 808B1CF8 3C05808B */ lui $a1, %hi(D_808B1FB0) ## $a1 = 808B0000 -/* 0021C 808B1CFC 0C01E037 */ jal Actor_ProcessInitChain - -/* 00220 808B1D00 24A51FB0 */ addiu $a1, $a1, %lo(D_808B1FB0) ## $a1 = 808B1FB0 -/* 00224 808B1D04 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00228 808B1D08 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 0022C 808B1D0C 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -/* 00230 808B1D10 03E00008 */ jr $ra -/* 00234 808B1D14 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot09_Obj/func_808B1D18.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot09_Obj/func_808B1D18.s deleted file mode 100644 index 379052251e..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot09_Obj/func_808B1D18.s +++ /dev/null @@ -1,15 +0,0 @@ -glabel func_808B1D18 -/* 00238 808B1D18 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 0023C 808B1D1C AFA5001C */ sw $a1, 0x001C($sp) -/* 00240 808B1D20 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00244 808B1D24 3C05808B */ lui $a1, %hi(D_808B1FBC) ## $a1 = 808B0000 -/* 00248 808B1D28 0C01E037 */ jal Actor_ProcessInitChain - -/* 0024C 808B1D2C 24A51FBC */ addiu $a1, $a1, %lo(D_808B1FBC) ## $a1 = 808B1FBC -/* 00250 808B1D30 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00254 808B1D34 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00258 808B1D38 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -/* 0025C 808B1D3C 03E00008 */ jr $ra -/* 00260 808B1D40 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot09_Obj/func_808B1D44.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot09_Obj/func_808B1D44.s deleted file mode 100644 index 702a22028d..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot09_Obj/func_808B1D44.s +++ /dev/null @@ -1,21 +0,0 @@ -glabel func_808B1D44 -/* 00264 808B1D44 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00268 808B1D48 AFBF0014 */ sw $ra, 0x0014($sp) -/* 0026C 808B1D4C 848E001C */ lh $t6, 0x001C($a0) ## 0000001C -/* 00270 808B1D50 24010003 */ addiu $at, $zero, 0x0003 ## $at = 00000003 -/* 00274 808B1D54 15C10005 */ bne $t6, $at, .L808B1D6C -/* 00278 808B1D58 00000000 */ nop -/* 0027C 808B1D5C 0C22C746 */ jal func_808B1D18 -/* 00280 808B1D60 00000000 */ nop -/* 00284 808B1D64 10000004 */ beq $zero, $zero, .L808B1D78 -/* 00288 808B1D68 8FBF0014 */ lw $ra, 0x0014($sp) -.L808B1D6C: -/* 0028C 808B1D6C 0C22C73B */ jal func_808B1CEC -/* 00290 808B1D70 00000000 */ nop -/* 00294 808B1D74 8FBF0014 */ lw $ra, 0x0014($sp) -.L808B1D78: -/* 00298 808B1D78 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 0029C 808B1D7C 03E00008 */ jr $ra -/* 002A0 808B1D80 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot11_Bakudankabe/BgSpot11Bakudankabe_Draw.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot11_Bakudankabe/BgSpot11Bakudankabe_Draw.s index 8e881749ef..562bac6a11 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot11_Bakudankabe/BgSpot11Bakudankabe_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Spot11_Bakudankabe/BgSpot11Bakudankabe_Draw.s @@ -4,7 +4,7 @@ glabel BgSpot11Bakudankabe_Draw /* 0053C 808B26BC 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 /* 00540 808B26C0 AFBF0014 */ sw $ra, 0x0014($sp) /* 00544 808B26C4 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 00548 808B26C8 0C00D498 */ jal Draw_DListOpa +/* 00548 808B26C8 0C00D498 */ jal Gfx_DrawDListOpa /* 0054C 808B26CC 24A51980 */ addiu $a1, $a1, 0x1980 ## $a1 = 06001980 /* 00550 808B26D0 8FBF0014 */ lw $ra, 0x0014($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 index 4ef91f7329..7c2ab326f3 100644 --- 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 @@ -14,7 +14,7 @@ glabel func_808B2CA8 /* 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 func_800C6AC4 +/* 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 @@ -57,7 +57,7 @@ glabel func_808B2CA8 /* 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 Draw_TwoTexScroll +/* 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 @@ -73,7 +73,7 @@ glabel func_808B2CA8 /* 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 func_800C6B54 +/* 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) diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot12_Gate/BgSpot12Gate_Destroy.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot12_Gate/BgSpot12Gate_Destroy.s deleted file mode 100644 index 34d4e0f551..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot12_Gate/BgSpot12Gate_Destroy.s +++ /dev/null @@ -1,16 +0,0 @@ -glabel BgSpot12Gate_Destroy -/* 00100 808B3090 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00104 808B3094 AFA40018 */ sw $a0, 0x0018($sp) -/* 00108 808B3098 8FAE0018 */ lw $t6, 0x0018($sp) -/* 0010C 808B309C AFBF0014 */ sw $ra, 0x0014($sp) -/* 00110 808B30A0 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 00114 808B30A4 24A50810 */ addiu $a1, $a1, 0x0810 ## $a1 = 00000810 -/* 00118 808B30A8 0C00FB56 */ jal DynaPolyInfo_Free - ## DynaPolyInfo_delReserve -/* 0011C 808B30AC 8DC6014C */ lw $a2, 0x014C($t6) ## 0000014C -/* 00120 808B30B0 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00124 808B30B4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00128 808B30B8 03E00008 */ jr $ra -/* 0012C 808B30BC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot12_Gate/BgSpot12Gate_Draw.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot12_Gate/BgSpot12Gate_Draw.s deleted file mode 100644 index 34a49ac654..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot12_Gate/BgSpot12Gate_Draw.s +++ /dev/null @@ -1,17 +0,0 @@ -glabel BgSpot12Gate_Draw -/* 00348 808B32D8 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 0034C 808B32DC AFA40018 */ sw $a0, 0x0018($sp) -/* 00350 808B32E0 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 00354 808B32E4 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00358 808B32E8 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 0035C 808B32EC 0C00D498 */ jal Draw_DListOpa - -/* 00360 808B32F0 24A51080 */ addiu $a1, $a1, 0x1080 ## $a1 = 06001080 -/* 00364 808B32F4 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00368 808B32F8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 0036C 808B32FC 03E00008 */ jr $ra -/* 00370 808B3300 00000000 */ nop -/* 00374 808B3304 00000000 */ nop -/* 00378 808B3308 00000000 */ nop -/* 0037C 808B330C 00000000 */ nop - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot12_Gate/BgSpot12Gate_Init.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot12_Gate/BgSpot12Gate_Init.s deleted file mode 100644 index f77f5a919c..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot12_Gate/BgSpot12Gate_Init.s +++ /dev/null @@ -1,37 +0,0 @@ -glabel BgSpot12Gate_Init -/* 00088 808B3018 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 0008C 808B301C AFBF001C */ sw $ra, 0x001C($sp) -/* 00090 808B3020 AFB00018 */ sw $s0, 0x0018($sp) -/* 00094 808B3024 3C060600 */ lui $a2, 0x0600 ## $a2 = 06000000 -/* 00098 808B3028 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 0009C 808B302C AFA50024 */ sw $a1, 0x0024($sp) -/* 000A0 808B3030 24C611EC */ addiu $a2, $a2, 0x11EC ## $a2 = 060011EC -/* 000A4 808B3034 0C22CBE4 */ jal func_808B2F90 -/* 000A8 808B3038 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 000AC 808B303C 3C05808B */ lui $a1, %hi(D_808B3330) ## $a1 = 808B0000 -/* 000B0 808B3040 24A53330 */ addiu $a1, $a1, %lo(D_808B3330) ## $a1 = 808B3330 -/* 000B4 808B3044 0C01E037 */ jal Actor_ProcessInitChain - -/* 000B8 808B3048 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 000BC 808B304C 8605001C */ lh $a1, 0x001C($s0) ## 0000001C -/* 000C0 808B3050 8FA40024 */ lw $a0, 0x0024($sp) -/* 000C4 808B3054 0C00B2D0 */ jal Flags_GetSwitch - -/* 000C8 808B3058 30A5003F */ andi $a1, $a1, 0x003F ## $a1 = 00000000 -/* 000CC 808B305C 10400005 */ beq $v0, $zero, .L808B3074 -/* 000D0 808B3060 00000000 */ nop -/* 000D4 808B3064 0C22CC9D */ jal func_808B3274 -/* 000D8 808B3068 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 000DC 808B306C 10000004 */ beq $zero, $zero, .L808B3080 -/* 000E0 808B3070 8FBF001C */ lw $ra, 0x001C($sp) -.L808B3074: -/* 000E4 808B3074 0C22CC30 */ jal func_808B30C0 -/* 000E8 808B3078 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 000EC 808B307C 8FBF001C */ lw $ra, 0x001C($sp) -.L808B3080: -/* 000F0 808B3080 8FB00018 */ lw $s0, 0x0018($sp) -/* 000F4 808B3084 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 000F8 808B3088 03E00008 */ jr $ra -/* 000FC 808B308C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot12_Gate/BgSpot12Gate_Update.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot12_Gate/BgSpot12Gate_Update.s deleted file mode 100644 index 275228c3e3..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot12_Gate/BgSpot12Gate_Update.s +++ /dev/null @@ -1,17 +0,0 @@ -glabel BgSpot12Gate_Update -/* 00314 808B32A4 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00318 808B32A8 AFBF0014 */ sw $ra, 0x0014($sp) -/* 0031C 808B32AC 84820168 */ lh $v0, 0x0168($a0) ## 00000168 -/* 00320 808B32B0 18400002 */ blez $v0, .L808B32BC -/* 00324 808B32B4 244EFFFF */ addiu $t6, $v0, 0xFFFF ## $t6 = FFFFFFFF -/* 00328 808B32B8 A48E0168 */ sh $t6, 0x0168($a0) ## 00000168 -.L808B32BC: -/* 0032C 808B32BC 8C990164 */ lw $t9, 0x0164($a0) ## 00000164 -/* 00330 808B32C0 0320F809 */ jalr $ra, $t9 -/* 00334 808B32C4 00000000 */ nop -/* 00338 808B32C8 8FBF0014 */ lw $ra, 0x0014($sp) -/* 0033C 808B32CC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00340 808B32D0 03E00008 */ jr $ra -/* 00344 808B32D4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot12_Gate/func_808B2F90.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot12_Gate/func_808B2F90.s deleted file mode 100644 index b4aa10b68f..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot12_Gate/func_808B2F90.s +++ /dev/null @@ -1,42 +0,0 @@ -glabel func_808B2F90 -/* 00000 808B2F90 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 00004 808B2F94 AFBF0024 */ sw $ra, 0x0024($sp) -/* 00008 808B2F98 AFB00020 */ sw $s0, 0x0020($sp) -/* 0000C 808B2F9C AFA5003C */ sw $a1, 0x003C($sp) -/* 00010 808B2FA0 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00014 808B2FA4 AFA60040 */ sw $a2, 0x0040($sp) -/* 00018 808B2FA8 AFA00030 */ sw $zero, 0x0030($sp) -/* 0001C 808B2FAC 0C010D20 */ jal DynaPolyInfo_SetActorMove - -/* 00020 808B2FB0 00E02825 */ or $a1, $a3, $zero ## $a1 = 00000000 -/* 00024 808B2FB4 8FA40040 */ lw $a0, 0x0040($sp) -/* 00028 808B2FB8 0C010620 */ jal DynaPolyInfo_Alloc - -/* 0002C 808B2FBC 27A50030 */ addiu $a1, $sp, 0x0030 ## $a1 = FFFFFFF8 -/* 00030 808B2FC0 8FA4003C */ lw $a0, 0x003C($sp) -/* 00034 808B2FC4 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 -/* 00038 808B2FC8 8FA70030 */ lw $a3, 0x0030($sp) -/* 0003C 808B2FCC 0C00FA9D */ jal DynaPolyInfo_RegisterActor - ## DynaPolyInfo_setActor -/* 00040 808B2FD0 24850810 */ addiu $a1, $a0, 0x0810 ## $a1 = 00000810 -/* 00044 808B2FD4 24010032 */ addiu $at, $zero, 0x0032 ## $at = 00000032 -/* 00048 808B2FD8 1441000A */ bne $v0, $at, .L808B3004 -/* 0004C 808B2FDC AE02014C */ sw $v0, 0x014C($s0) ## 0000014C -/* 00050 808B2FE0 860E001C */ lh $t6, 0x001C($s0) ## 0000001C -/* 00054 808B2FE4 3C04808B */ lui $a0, %hi(D_808B3340) ## $a0 = 808B0000 -/* 00058 808B2FE8 3C05808B */ lui $a1, %hi(D_808B3380) ## $a1 = 808B0000 -/* 0005C 808B2FEC 86070000 */ lh $a3, 0x0000($s0) ## 00000000 -/* 00060 808B2FF0 24A53380 */ addiu $a1, $a1, %lo(D_808B3380) ## $a1 = 808B3380 -/* 00064 808B2FF4 24843340 */ addiu $a0, $a0, %lo(D_808B3340) ## $a0 = 808B3340 -/* 00068 808B2FF8 24060091 */ addiu $a2, $zero, 0x0091 ## $a2 = 00000091 -/* 0006C 808B2FFC 0C00084C */ jal osSyncPrintf - -/* 00070 808B3000 AFAE0010 */ sw $t6, 0x0010($sp) -.L808B3004: -/* 00074 808B3004 8FBF0024 */ lw $ra, 0x0024($sp) -/* 00078 808B3008 8FB00020 */ lw $s0, 0x0020($sp) -/* 0007C 808B300C 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 -/* 00080 808B3010 03E00008 */ jr $ra -/* 00084 808B3014 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot12_Gate/func_808B30C0.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot12_Gate/func_808B30C0.s deleted file mode 100644 index 661b051144..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot12_Gate/func_808B30C0.s +++ /dev/null @@ -1,9 +0,0 @@ -glabel func_808B30C0 -/* 00130 808B30C0 C484000C */ lwc1 $f4, 0x000C($a0) ## 0000000C -/* 00134 808B30C4 3C0E808B */ lui $t6, %hi(func_808B30D8) ## $t6 = 808B0000 -/* 00138 808B30C8 25CE30D8 */ addiu $t6, $t6, %lo(func_808B30D8) ## $t6 = 808B30D8 -/* 0013C 808B30CC AC8E0164 */ sw $t6, 0x0164($a0) ## 00000164 -/* 00140 808B30D0 03E00008 */ jr $ra -/* 00144 808B30D4 E4840028 */ swc1 $f4, 0x0028($a0) ## 00000028 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot12_Gate/func_808B30D8.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot12_Gate/func_808B30D8.s deleted file mode 100644 index da55ab1c17..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot12_Gate/func_808B30D8.s +++ /dev/null @@ -1,28 +0,0 @@ -glabel func_808B30D8 -/* 00148 808B30D8 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 0014C 808B30DC AFA40020 */ sw $a0, 0x0020($sp) -/* 00150 808B30E0 8FAE0020 */ lw $t6, 0x0020($sp) -/* 00154 808B30E4 AFBF001C */ sw $ra, 0x001C($sp) -/* 00158 808B30E8 AFA50024 */ sw $a1, 0x0024($sp) -/* 0015C 808B30EC 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 00160 808B30F0 85C5001C */ lh $a1, 0x001C($t6) ## 0000001C -/* 00164 808B30F4 0C00B2D0 */ jal Flags_GetSwitch - -/* 00168 808B30F8 30A5003F */ andi $a1, $a1, 0x003F ## $a1 = 00000000 -/* 0016C 808B30FC 5040000A */ beql $v0, $zero, .L808B3128 -/* 00170 808B3100 8FBF001C */ lw $ra, 0x001C($sp) -/* 00174 808B3104 0C22CC4D */ jal func_808B3134 -/* 00178 808B3108 8FA40020 */ lw $a0, 0x0020($sp) -/* 0017C 808B310C 8FA40024 */ lw $a0, 0x0024($sp) -/* 00180 808B3110 24051040 */ addiu $a1, $zero, 0x1040 ## $a1 = 00001040 -/* 00184 808B3114 2406FF9D */ addiu $a2, $zero, 0xFF9D ## $a2 = FFFFFF9D -/* 00188 808B3118 8FA70020 */ lw $a3, 0x0020($sp) -/* 0018C 808B311C 0C02003E */ jal func_800800F8 -/* 00190 808B3120 AFA00010 */ sw $zero, 0x0010($sp) -/* 00194 808B3124 8FBF001C */ lw $ra, 0x001C($sp) -.L808B3128: -/* 00198 808B3128 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 0019C 808B312C 03E00008 */ jr $ra -/* 001A0 808B3130 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot12_Gate/func_808B3134.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot12_Gate/func_808B3134.s deleted file mode 100644 index 0d71903ec2..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot12_Gate/func_808B3134.s +++ /dev/null @@ -1,9 +0,0 @@ -glabel func_808B3134 -/* 001A4 808B3134 3C0E808B */ lui $t6, %hi(func_808B314C) ## $t6 = 808B0000 -/* 001A8 808B3138 25CE314C */ addiu $t6, $t6, %lo(func_808B314C) ## $t6 = 808B314C -/* 001AC 808B313C 240F0028 */ addiu $t7, $zero, 0x0028 ## $t7 = 00000028 -/* 001B0 808B3140 AC8E0164 */ sw $t6, 0x0164($a0) ## 00000164 -/* 001B4 808B3144 03E00008 */ jr $ra -/* 001B8 808B3148 A48F0168 */ sh $t7, 0x0168($a0) ## 00000168 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot12_Gate/func_808B314C.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot12_Gate/func_808B314C.s deleted file mode 100644 index a6831e2823..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot12_Gate/func_808B314C.s +++ /dev/null @@ -1,16 +0,0 @@ -glabel func_808B314C -/* 001BC 808B314C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 001C0 808B3150 AFBF0014 */ sw $ra, 0x0014($sp) -/* 001C4 808B3154 AFA5001C */ sw $a1, 0x001C($sp) -/* 001C8 808B3158 848E0168 */ lh $t6, 0x0168($a0) ## 00000168 -/* 001CC 808B315C 5DC00004 */ bgtzl $t6, .L808B3170 -/* 001D0 808B3160 8FBF0014 */ lw $ra, 0x0014($sp) -/* 001D4 808B3164 0C22CC5F */ jal func_808B317C -/* 001D8 808B3168 00000000 */ nop -/* 001DC 808B316C 8FBF0014 */ lw $ra, 0x0014($sp) -.L808B3170: -/* 001E0 808B3170 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 001E4 808B3174 03E00008 */ jr $ra -/* 001E8 808B3178 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot12_Gate/func_808B317C.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot12_Gate/func_808B317C.s deleted file mode 100644 index 2fd18e3ea3..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot12_Gate/func_808B317C.s +++ /dev/null @@ -1,7 +0,0 @@ -glabel func_808B317C -/* 001EC 808B317C 3C0E808B */ lui $t6, %hi(func_808B318C) ## $t6 = 808B0000 -/* 001F0 808B3180 25CE318C */ addiu $t6, $t6, %lo(func_808B318C) ## $t6 = 808B318C -/* 001F4 808B3184 03E00008 */ jr $ra -/* 001F8 808B3188 AC8E0164 */ sw $t6, 0x0164($a0) ## 00000164 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot12_Gate/func_808B318C.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot12_Gate/func_808B318C.s deleted file mode 100644 index 143ee7731f..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot12_Gate/func_808B318C.s +++ /dev/null @@ -1,66 +0,0 @@ -glabel func_808B318C -/* 001FC 808B318C 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 00200 808B3190 AFB00020 */ sw $s0, 0x0020($sp) -/* 00204 808B3194 AFA5003C */ sw $a1, 0x003C($sp) -/* 00208 808B3198 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 0020C 808B319C AFBF0024 */ sw $ra, 0x0024($sp) -/* 00210 808B31A0 3C053FCC */ lui $a1, 0x3FCC ## $a1 = 3FCC0000 -/* 00214 808B31A4 3C063CF5 */ lui $a2, 0x3CF5 ## $a2 = 3CF50000 -/* 00218 808B31A8 34C6C28F */ ori $a2, $a2, 0xC28F ## $a2 = 3CF5C28F -/* 0021C 808B31AC 34A5CCCD */ ori $a1, $a1, 0xCCCD ## $a1 = 3FCCCCCD -/* 00220 808B31B0 0C01DE80 */ jal Math_ApproxF - -/* 00224 808B31B4 24840060 */ addiu $a0, $a0, 0x0060 ## $a0 = 00000060 -/* 00228 808B31B8 3C014348 */ lui $at, 0x4348 ## $at = 43480000 -/* 0022C 808B31BC 44813000 */ mtc1 $at, $f6 ## $f6 = 200.00 -/* 00230 808B31C0 C604000C */ lwc1 $f4, 0x000C($s0) ## 0000000C -/* 00234 808B31C4 26040028 */ addiu $a0, $s0, 0x0028 ## $a0 = 00000028 -/* 00238 808B31C8 8E060060 */ lw $a2, 0x0060($s0) ## 00000060 -/* 0023C 808B31CC 46062200 */ add.s $f8, $f4, $f6 -/* 00240 808B31D0 44054000 */ mfc1 $a1, $f8 -/* 00244 808B31D4 0C01DE80 */ jal Math_ApproxF - -/* 00248 808B31D8 00000000 */ nop -/* 0024C 808B31DC 1040001E */ beq $v0, $zero, .L808B3258 -/* 00250 808B31E0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00254 808B31E4 0C22CC9D */ jal func_808B3274 -/* 00258 808B31E8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0025C 808B31EC 8FA2003C */ lw $v0, 0x003C($sp) -/* 00260 808B31F0 24050003 */ addiu $a1, $zero, 0x0003 ## $a1 = 00000003 -/* 00264 808B31F4 844E07A0 */ lh $t6, 0x07A0($v0) ## 000007A0 -/* 00268 808B31F8 000E7880 */ sll $t7, $t6, 2 -/* 0026C 808B31FC 004FC021 */ addu $t8, $v0, $t7 -/* 00270 808B3200 0C024BE2 */ jal func_80092F88 -/* 00274 808B3204 8F040790 */ lw $a0, 0x0790($t8) ## 00000790 -/* 00278 808B3208 00022400 */ sll $a0, $v0, 16 -/* 0027C 808B320C AFA20030 */ sw $v0, 0x0030($sp) -/* 00280 808B3210 00042403 */ sra $a0, $a0, 16 -/* 00284 808B3214 0C024B6B */ jal func_80092DAC -/* 00288 808B3218 2405C350 */ addiu $a1, $zero, 0xC350 ## $a1 = FFFFC350 -/* 0028C 808B321C 87A40032 */ lh $a0, 0x0032($sp) -/* 00290 808B3220 24050003 */ addiu $a1, $zero, 0x0003 ## $a1 = 00000003 -/* 00294 808B3224 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 00298 808B3228 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 0029C 808B322C AFA00010 */ sw $zero, 0x0010($sp) -/* 002A0 808B3230 0C024B9C */ jal func_80092E70 -/* 002A4 808B3234 AFA4002C */ sw $a0, 0x002C($sp) -/* 002A8 808B3238 8FA4002C */ lw $a0, 0x002C($sp) -/* 002AC 808B323C 0C024B7C */ jal func_80092DF0 -/* 002B0 808B3240 2405000C */ addiu $a1, $zero, 0x000C ## $a1 = 0000000C -/* 002B4 808B3244 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 002B8 808B3248 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 002BC 808B324C 2405280E */ addiu $a1, $zero, 0x280E ## $a1 = 0000280E -/* 002C0 808B3250 10000004 */ beq $zero, $zero, .L808B3264 -/* 002C4 808B3254 8FBF0024 */ lw $ra, 0x0024($sp) -.L808B3258: -/* 002C8 808B3258 0C00BE5D */ jal func_8002F974 -/* 002CC 808B325C 24052067 */ addiu $a1, $zero, 0x2067 ## $a1 = 00002067 -/* 002D0 808B3260 8FBF0024 */ lw $ra, 0x0024($sp) -.L808B3264: -/* 002D4 808B3264 8FB00020 */ lw $s0, 0x0020($sp) -/* 002D8 808B3268 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 -/* 002DC 808B326C 03E00008 */ jr $ra -/* 002E0 808B3270 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot12_Gate/func_808B3274.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot12_Gate/func_808B3274.s deleted file mode 100644 index 12c439236c..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot12_Gate/func_808B3274.s +++ /dev/null @@ -1,12 +0,0 @@ -glabel func_808B3274 -/* 002E4 808B3274 3C014348 */ lui $at, 0x4348 ## $at = 43480000 -/* 002E8 808B3278 44813000 */ mtc1 $at, $f6 ## $f6 = 200.00 -/* 002EC 808B327C C484000C */ lwc1 $f4, 0x000C($a0) ## 0000000C -/* 002F0 808B3280 3C0E808B */ lui $t6, %hi(func_808B3298) ## $t6 = 808B0000 -/* 002F4 808B3284 25CE3298 */ addiu $t6, $t6, %lo(func_808B3298) ## $t6 = 808B3298 -/* 002F8 808B3288 46062200 */ add.s $f8, $f4, $f6 -/* 002FC 808B328C AC8E0164 */ sw $t6, 0x0164($a0) ## 00000164 -/* 00300 808B3290 03E00008 */ jr $ra -/* 00304 808B3294 E4880028 */ swc1 $f8, 0x0028($a0) ## 00000028 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot12_Gate/func_808B3298.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot12_Gate/func_808B3298.s deleted file mode 100644 index e019848f93..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot12_Gate/func_808B3298.s +++ /dev/null @@ -1,6 +0,0 @@ -glabel func_808B3298 -/* 00308 808B3298 AFA40000 */ sw $a0, 0x0000($sp) -/* 0030C 808B329C 03E00008 */ jr $ra -/* 00310 808B32A0 AFA50004 */ sw $a1, 0x0004($sp) - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot12_Saku/BgSpot12Saku_Destroy.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot12_Saku/BgSpot12Saku_Destroy.s deleted file mode 100644 index 2f1fc7aada..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot12_Saku/BgSpot12Saku_Destroy.s +++ /dev/null @@ -1,16 +0,0 @@ -glabel BgSpot12Saku_Destroy -/* 00100 808B3520 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00104 808B3524 AFA40018 */ sw $a0, 0x0018($sp) -/* 00108 808B3528 8FAE0018 */ lw $t6, 0x0018($sp) -/* 0010C 808B352C AFBF0014 */ sw $ra, 0x0014($sp) -/* 00110 808B3530 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 00114 808B3534 24A50810 */ addiu $a1, $a1, 0x0810 ## $a1 = 00000810 -/* 00118 808B3538 0C00FB56 */ jal DynaPolyInfo_Free - ## DynaPolyInfo_delReserve -/* 0011C 808B353C 8DC6014C */ lw $a2, 0x014C($t6) ## 0000014C -/* 00120 808B3540 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00124 808B3544 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00128 808B3548 03E00008 */ jr $ra -/* 0012C 808B354C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot12_Saku/BgSpot12Saku_Draw.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot12_Saku/BgSpot12Saku_Draw.s deleted file mode 100644 index b3390cc086..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot12_Saku/BgSpot12Saku_Draw.s +++ /dev/null @@ -1,16 +0,0 @@ -glabel BgSpot12Saku_Draw -/* 003CC 808B37EC 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 003D0 808B37F0 AFA40018 */ sw $a0, 0x0018($sp) -/* 003D4 808B37F4 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 003D8 808B37F8 AFBF0014 */ sw $ra, 0x0014($sp) -/* 003DC 808B37FC 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 003E0 808B3800 0C00D498 */ jal Draw_DListOpa - -/* 003E4 808B3804 24A52260 */ addiu $a1, $a1, 0x2260 ## $a1 = 06002260 -/* 003E8 808B3808 8FBF0014 */ lw $ra, 0x0014($sp) -/* 003EC 808B380C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 003F0 808B3810 03E00008 */ jr $ra -/* 003F4 808B3814 00000000 */ nop -/* 003F8 808B3818 00000000 */ nop -/* 003FC 808B381C 00000000 */ nop - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot12_Saku/BgSpot12Saku_Init.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot12_Saku/BgSpot12Saku_Init.s deleted file mode 100644 index 4604d0e183..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot12_Saku/BgSpot12Saku_Init.s +++ /dev/null @@ -1,37 +0,0 @@ -glabel BgSpot12Saku_Init -/* 00088 808B34A8 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 0008C 808B34AC AFBF001C */ sw $ra, 0x001C($sp) -/* 00090 808B34B0 AFB00018 */ sw $s0, 0x0018($sp) -/* 00094 808B34B4 3C060600 */ lui $a2, 0x0600 ## $a2 = 06000000 -/* 00098 808B34B8 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 0009C 808B34BC AFA50024 */ sw $a1, 0x0024($sp) -/* 000A0 808B34C0 24C6238C */ addiu $a2, $a2, 0x238C ## $a2 = 0600238C -/* 000A4 808B34C4 0C22CD08 */ jal func_808B3420 -/* 000A8 808B34C8 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 000AC 808B34CC 3C05808B */ lui $a1, %hi(D_808B3840) ## $a1 = 808B0000 -/* 000B0 808B34D0 24A53840 */ addiu $a1, $a1, %lo(D_808B3840) ## $a1 = 808B3840 -/* 000B4 808B34D4 0C01E037 */ jal Actor_ProcessInitChain - -/* 000B8 808B34D8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 000BC 808B34DC 8605001C */ lh $a1, 0x001C($s0) ## 0000001C -/* 000C0 808B34E0 8FA40024 */ lw $a0, 0x0024($sp) -/* 000C4 808B34E4 0C00B2D0 */ jal Flags_GetSwitch - -/* 000C8 808B34E8 30A5003F */ andi $a1, $a1, 0x003F ## $a1 = 00000000 -/* 000CC 808B34EC 10400005 */ beq $v0, $zero, .L808B3504 -/* 000D0 808B34F0 00000000 */ nop -/* 000D4 808B34F4 0C22CDC5 */ jal func_808B3714 -/* 000D8 808B34F8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 000DC 808B34FC 10000004 */ beq $zero, $zero, .L808B3510 -/* 000E0 808B3500 8FBF001C */ lw $ra, 0x001C($sp) -.L808B3504: -/* 000E4 808B3504 0C22CD54 */ jal func_808B3550 -/* 000E8 808B3508 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 000EC 808B350C 8FBF001C */ lw $ra, 0x001C($sp) -.L808B3510: -/* 000F0 808B3510 8FB00018 */ lw $s0, 0x0018($sp) -/* 000F4 808B3514 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 000F8 808B3518 03E00008 */ jr $ra -/* 000FC 808B351C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot12_Saku/BgSpot12Saku_Update.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot12_Saku/BgSpot12Saku_Update.s deleted file mode 100644 index 1dbbee3206..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot12_Saku/BgSpot12Saku_Update.s +++ /dev/null @@ -1,17 +0,0 @@ -glabel BgSpot12Saku_Update -/* 00398 808B37B8 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 0039C 808B37BC AFBF0014 */ sw $ra, 0x0014($sp) -/* 003A0 808B37C0 84820168 */ lh $v0, 0x0168($a0) ## 00000168 -/* 003A4 808B37C4 18400002 */ blez $v0, .L808B37D0 -/* 003A8 808B37C8 244EFFFF */ addiu $t6, $v0, 0xFFFF ## $t6 = FFFFFFFF -/* 003AC 808B37CC A48E0168 */ sh $t6, 0x0168($a0) ## 00000168 -.L808B37D0: -/* 003B0 808B37D0 8C990164 */ lw $t9, 0x0164($a0) ## 00000164 -/* 003B4 808B37D4 0320F809 */ jalr $ra, $t9 -/* 003B8 808B37D8 00000000 */ nop -/* 003BC 808B37DC 8FBF0014 */ lw $ra, 0x0014($sp) -/* 003C0 808B37E0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 003C4 808B37E4 03E00008 */ jr $ra -/* 003C8 808B37E8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot12_Saku/func_808B3420.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot12_Saku/func_808B3420.s deleted file mode 100644 index a88e8132f6..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot12_Saku/func_808B3420.s +++ /dev/null @@ -1,42 +0,0 @@ -glabel func_808B3420 -/* 00000 808B3420 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 00004 808B3424 AFBF0024 */ sw $ra, 0x0024($sp) -/* 00008 808B3428 AFB00020 */ sw $s0, 0x0020($sp) -/* 0000C 808B342C AFA5003C */ sw $a1, 0x003C($sp) -/* 00010 808B3430 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00014 808B3434 AFA60040 */ sw $a2, 0x0040($sp) -/* 00018 808B3438 AFA00030 */ sw $zero, 0x0030($sp) -/* 0001C 808B343C 0C010D20 */ jal DynaPolyInfo_SetActorMove - -/* 00020 808B3440 00E02825 */ or $a1, $a3, $zero ## $a1 = 00000000 -/* 00024 808B3444 8FA40040 */ lw $a0, 0x0040($sp) -/* 00028 808B3448 0C010620 */ jal DynaPolyInfo_Alloc - -/* 0002C 808B344C 27A50030 */ addiu $a1, $sp, 0x0030 ## $a1 = FFFFFFF8 -/* 00030 808B3450 8FA4003C */ lw $a0, 0x003C($sp) -/* 00034 808B3454 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 -/* 00038 808B3458 8FA70030 */ lw $a3, 0x0030($sp) -/* 0003C 808B345C 0C00FA9D */ jal DynaPolyInfo_RegisterActor - ## DynaPolyInfo_setActor -/* 00040 808B3460 24850810 */ addiu $a1, $a0, 0x0810 ## $a1 = 00000810 -/* 00044 808B3464 24010032 */ addiu $at, $zero, 0x0032 ## $at = 00000032 -/* 00048 808B3468 1441000A */ bne $v0, $at, .L808B3494 -/* 0004C 808B346C AE02014C */ sw $v0, 0x014C($s0) ## 0000014C -/* 00050 808B3470 860E001C */ lh $t6, 0x001C($s0) ## 0000001C -/* 00054 808B3474 3C04808B */ lui $a0, %hi(D_808B3850) ## $a0 = 808B0000 -/* 00058 808B3478 3C05808B */ lui $a1, %hi(D_808B3890) ## $a1 = 808B0000 -/* 0005C 808B347C 86070000 */ lh $a3, 0x0000($s0) ## 00000000 -/* 00060 808B3480 24A53890 */ addiu $a1, $a1, %lo(D_808B3890) ## $a1 = 808B3890 -/* 00064 808B3484 24843850 */ addiu $a0, $a0, %lo(D_808B3850) ## $a0 = 808B3850 -/* 00068 808B3488 2406008C */ addiu $a2, $zero, 0x008C ## $a2 = 0000008C -/* 0006C 808B348C 0C00084C */ jal osSyncPrintf - -/* 00070 808B3490 AFAE0010 */ sw $t6, 0x0010($sp) -.L808B3494: -/* 00074 808B3494 8FBF0024 */ lw $ra, 0x0024($sp) -/* 00078 808B3498 8FB00020 */ lw $s0, 0x0020($sp) -/* 0007C 808B349C 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 -/* 00080 808B34A0 03E00008 */ jr $ra -/* 00084 808B34A4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot12_Saku/func_808B3550.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot12_Saku/func_808B3550.s deleted file mode 100644 index fccff5da5d..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot12_Saku/func_808B3550.s +++ /dev/null @@ -1,14 +0,0 @@ -glabel func_808B3550 -/* 00130 808B3550 3C0E808B */ lui $t6, %hi(func_808B357C) ## $t6 = 808B0000 -/* 00134 808B3554 25CE357C */ addiu $t6, $t6, %lo(func_808B357C) ## $t6 = 808B357C -/* 00138 808B3558 AC8E0164 */ sw $t6, 0x0164($a0) ## 00000164 -/* 0013C 808B355C 3C01808B */ lui $at, %hi(D_808B38A8) ## $at = 808B0000 -/* 00140 808B3560 C42438A8 */ lwc1 $f4, %lo(D_808B38A8)($at) -/* 00144 808B3564 C4860008 */ lwc1 $f6, 0x0008($a0) ## 00000008 -/* 00148 808B3568 C4880010 */ lwc1 $f8, 0x0010($a0) ## 00000010 -/* 0014C 808B356C E4840050 */ swc1 $f4, 0x0050($a0) ## 00000050 -/* 00150 808B3570 E4860024 */ swc1 $f6, 0x0024($a0) ## 00000024 -/* 00154 808B3574 03E00008 */ jr $ra -/* 00158 808B3578 E488002C */ swc1 $f8, 0x002C($a0) ## 0000002C - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot12_Saku/func_808B357C.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot12_Saku/func_808B357C.s deleted file mode 100644 index 4388f48498..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot12_Saku/func_808B357C.s +++ /dev/null @@ -1,31 +0,0 @@ -glabel func_808B357C -/* 0015C 808B357C 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 00160 808B3580 AFA40020 */ sw $a0, 0x0020($sp) -/* 00164 808B3584 8FAE0020 */ lw $t6, 0x0020($sp) -/* 00168 808B3588 AFBF001C */ sw $ra, 0x001C($sp) -/* 0016C 808B358C AFA50024 */ sw $a1, 0x0024($sp) -/* 00170 808B3590 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 00174 808B3594 85C5001C */ lh $a1, 0x001C($t6) ## 0000001C -/* 00178 808B3598 0C00B2D0 */ jal Flags_GetSwitch - -/* 0017C 808B359C 30A5003F */ andi $a1, $a1, 0x003F ## $a1 = 00000000 -/* 00180 808B35A0 5040000D */ beql $v0, $zero, .L808B35D8 -/* 00184 808B35A4 8FBF001C */ lw $ra, 0x001C($sp) -/* 00188 808B35A8 0C22CD79 */ jal func_808B35E4 -/* 0018C 808B35AC 8FA40020 */ lw $a0, 0x0020($sp) -/* 00190 808B35B0 8FB80020 */ lw $t8, 0x0020($sp) -/* 00194 808B35B4 240F0014 */ addiu $t7, $zero, 0x0014 ## $t7 = 00000014 -/* 00198 808B35B8 2405104A */ addiu $a1, $zero, 0x104A ## $a1 = 0000104A -/* 0019C 808B35BC A70F0168 */ sh $t7, 0x0168($t8) ## 00000168 -/* 001A0 808B35C0 AFA00010 */ sw $zero, 0x0010($sp) -/* 001A4 808B35C4 8FA70020 */ lw $a3, 0x0020($sp) -/* 001A8 808B35C8 8FA40024 */ lw $a0, 0x0024($sp) -/* 001AC 808B35CC 0C02003E */ jal func_800800F8 -/* 001B0 808B35D0 2406FF9D */ addiu $a2, $zero, 0xFF9D ## $a2 = FFFFFF9D -/* 001B4 808B35D4 8FBF001C */ lw $ra, 0x001C($sp) -.L808B35D8: -/* 001B8 808B35D8 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 001BC 808B35DC 03E00008 */ jr $ra -/* 001C0 808B35E0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot12_Saku/func_808B35E4.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot12_Saku/func_808B35E4.s deleted file mode 100644 index bc80b4f073..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot12_Saku/func_808B35E4.s +++ /dev/null @@ -1,12 +0,0 @@ -glabel func_808B35E4 -/* 001C4 808B35E4 848E0168 */ lh $t6, 0x0168($a0) ## 00000168 -/* 001C8 808B35E8 3C0F808B */ lui $t7, %hi(func_808B3604) ## $t7 = 808B0000 -/* 001CC 808B35EC 25EF3604 */ addiu $t7, $t7, %lo(func_808B3604) ## $t7 = 808B3604 -/* 001D0 808B35F0 15C00002 */ bne $t6, $zero, .L808B35FC -/* 001D4 808B35F4 00000000 */ nop -/* 001D8 808B35F8 AC8F0164 */ sw $t7, 0x0164($a0) ## 00000164 -.L808B35FC: -/* 001DC 808B35FC 03E00008 */ jr $ra -/* 001E0 808B3600 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot12_Saku/func_808B3604.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot12_Saku/func_808B3604.s deleted file mode 100644 index 9d3a30464a..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot12_Saku/func_808B3604.s +++ /dev/null @@ -1,77 +0,0 @@ -glabel func_808B3604 -/* 001E4 808B3604 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 001E8 808B3608 3C01808B */ lui $at, %hi(D_808B38AC) ## $at = 808B0000 -/* 001EC 808B360C C42438AC */ lwc1 $f4, %lo(D_808B38AC)($at) -/* 001F0 808B3610 AFB00020 */ sw $s0, 0x0020($sp) -/* 001F4 808B3614 AFA50034 */ sw $a1, 0x0034($sp) -/* 001F8 808B3618 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 001FC 808B361C AFBF0024 */ sw $ra, 0x0024($sp) -/* 00200 808B3620 3C053BEA */ lui $a1, 0x3BEA ## $a1 = 3BEA0000 -/* 00204 808B3624 3C063E23 */ lui $a2, 0x3E23 ## $a2 = 3E230000 -/* 00208 808B3628 3C073B10 */ lui $a3, 0x3B10 ## $a3 = 3B100000 -/* 0020C 808B362C 34E72DE0 */ ori $a3, $a3, 0x2DE0 ## $a3 = 3B102DE0 -/* 00210 808B3630 34C6D70A */ ori $a2, $a2, 0xD70A ## $a2 = 3E23D70A -/* 00214 808B3634 34A50EA2 */ ori $a1, $a1, 0x0EA2 ## $a1 = 3BEA0EA2 -/* 00218 808B3638 24840050 */ addiu $a0, $a0, 0x0050 ## $a0 = 00000050 -/* 0021C 808B363C 0C01E0C4 */ jal Math_SmoothScaleMaxMinF - -/* 00220 808B3640 E7A40010 */ swc1 $f4, 0x0010($sp) -/* 00224 808B3644 E7A0002C */ swc1 $f0, 0x002C($sp) -/* 00228 808B3648 3C01808B */ lui $at, %hi(D_808B38B0) ## $at = 808B0000 -/* 0022C 808B364C C42638B0 */ lwc1 $f6, %lo(D_808B38B0)($at) -/* 00230 808B3650 C6080050 */ lwc1 $f8, 0x0050($s0) ## 00000050 -/* 00234 808B3654 3C014452 */ lui $at, 0x4452 ## $at = 44520000 -/* 00238 808B3658 44818000 */ mtc1 $at, $f16 ## $f16 = 840.00 -/* 0023C 808B365C 46083281 */ sub.s $f10, $f6, $f8 -/* 00240 808B3660 46105482 */ mul.s $f18, $f10, $f16 -/* 00244 808B3664 E7B20028 */ swc1 $f18, 0x0028($sp) -/* 00248 808B3668 860400B6 */ lh $a0, 0x00B6($s0) ## 000000B6 -/* 0024C 808B366C 24844000 */ addiu $a0, $a0, 0x4000 ## $a0 = 00004000 -/* 00250 808B3670 00042400 */ sll $a0, $a0, 16 -/* 00254 808B3674 0C01DE1C */ jal Math_Sins - ## sins? -/* 00258 808B3678 00042403 */ sra $a0, $a0, 16 -/* 0025C 808B367C C7A60028 */ lwc1 $f6, 0x0028($sp) -/* 00260 808B3680 C6040008 */ lwc1 $f4, 0x0008($s0) ## 00000008 -/* 00264 808B3684 860400B6 */ lh $a0, 0x00B6($s0) ## 000000B6 -/* 00268 808B3688 46060202 */ mul.s $f8, $f0, $f6 -/* 0026C 808B368C 24844000 */ addiu $a0, $a0, 0x4000 ## $a0 = 00004000 -/* 00270 808B3690 00042400 */ sll $a0, $a0, 16 -/* 00274 808B3694 00042403 */ sra $a0, $a0, 16 -/* 00278 808B3698 46082281 */ sub.s $f10, $f4, $f8 -/* 0027C 808B369C 0C01DE0D */ jal Math_Coss - ## coss? -/* 00280 808B36A0 E60A0024 */ swc1 $f10, 0x0024($s0) ## 00000024 -/* 00284 808B36A4 C7B20028 */ lwc1 $f18, 0x0028($sp) -/* 00288 808B36A8 C6100010 */ lwc1 $f16, 0x0010($s0) ## 00000010 -/* 0028C 808B36AC 3C01808B */ lui $at, %hi(D_808B38B4) ## $at = 808B0000 -/* 00290 808B36B0 46120182 */ mul.s $f6, $f0, $f18 -/* 00294 808B36B4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00298 808B36B8 46068101 */ sub.s $f4, $f16, $f6 -/* 0029C 808B36BC E604002C */ swc1 $f4, 0x002C($s0) ## 0000002C -/* 002A0 808B36C0 C7A0002C */ lwc1 $f0, 0x002C($sp) -/* 002A4 808B36C4 C42838B4 */ lwc1 $f8, %lo(D_808B38B4)($at) -/* 002A8 808B36C8 46000005 */ abs.s $f0, $f0 -/* 002AC 808B36CC 4608003C */ c.lt.s $f0, $f8 -/* 002B0 808B36D0 00000000 */ nop -/* 002B4 808B36D4 45000008 */ bc1f .L808B36F8 -/* 002B8 808B36D8 00000000 */ nop -/* 002BC 808B36DC 0C22CDC5 */ jal func_808B3714 -/* 002C0 808B36E0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 002C4 808B36E4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 002C8 808B36E8 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 002CC 808B36EC 2405280E */ addiu $a1, $zero, 0x280E ## $a1 = 0000280E -/* 002D0 808B36F0 10000004 */ beq $zero, $zero, .L808B3704 -/* 002D4 808B36F4 8FBF0024 */ lw $ra, 0x0024($sp) -.L808B36F8: -/* 002D8 808B36F8 0C00BE5D */ jal func_8002F974 -/* 002DC 808B36FC 24052067 */ addiu $a1, $zero, 0x2067 ## $a1 = 00002067 -/* 002E0 808B3700 8FBF0024 */ lw $ra, 0x0024($sp) -.L808B3704: -/* 002E4 808B3704 8FB00020 */ lw $s0, 0x0020($sp) -/* 002E8 808B3708 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 002EC 808B370C 03E00008 */ jr $ra -/* 002F0 808B3710 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot12_Saku/func_808B3714.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot12_Saku/func_808B3714.s deleted file mode 100644 index c137e524a4..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot12_Saku/func_808B3714.s +++ /dev/null @@ -1,43 +0,0 @@ -glabel func_808B3714 -/* 002F4 808B3714 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 002F8 808B3718 3C0E808B */ lui $t6, %hi(func_808B37AC) ## $t6 = 808B0000 -/* 002FC 808B371C AFBF0014 */ sw $ra, 0x0014($sp) -/* 00300 808B3720 25CE37AC */ addiu $t6, $t6, %lo(func_808B37AC) ## $t6 = 808B37AC -/* 00304 808B3724 AC8E0164 */ sw $t6, 0x0164($a0) ## 00000164 -/* 00308 808B3728 3C01808B */ lui $at, %hi(D_808B38B8) ## $at = 808B0000 -/* 0030C 808B372C C42438B8 */ lwc1 $f4, %lo(D_808B38B8)($at) -/* 00310 808B3730 00802825 */ or $a1, $a0, $zero ## $a1 = 00000000 -/* 00314 808B3734 E4840050 */ swc1 $f4, 0x0050($a0) ## 00000050 -/* 00318 808B3738 848400B6 */ lh $a0, 0x00B6($a0) ## 000000B6 -/* 0031C 808B373C AFA50018 */ sw $a1, 0x0018($sp) -/* 00320 808B3740 24844000 */ addiu $a0, $a0, 0x4000 ## $a0 = 00004000 -/* 00324 808B3744 00042400 */ sll $a0, $a0, 16 -/* 00328 808B3748 0C01DE1C */ jal Math_Sins - ## sins? -/* 0032C 808B374C 00042403 */ sra $a0, $a0, 16 -/* 00330 808B3750 3C01429C */ lui $at, 0x429C ## $at = 429C0000 -/* 00334 808B3754 44814000 */ mtc1 $at, $f8 ## $f8 = 78.00 -/* 00338 808B3758 8FA50018 */ lw $a1, 0x0018($sp) -/* 0033C 808B375C 46080282 */ mul.s $f10, $f0, $f8 -/* 00340 808B3760 C4A60008 */ lwc1 $f6, 0x0008($a1) ## 00000008 -/* 00344 808B3764 84A400B6 */ lh $a0, 0x00B6($a1) ## 000000B6 -/* 00348 808B3768 24844000 */ addiu $a0, $a0, 0x4000 ## $a0 = 00004000 -/* 0034C 808B376C 00042400 */ sll $a0, $a0, 16 -/* 00350 808B3770 460A3401 */ sub.s $f16, $f6, $f10 -/* 00354 808B3774 00042403 */ sra $a0, $a0, 16 -/* 00358 808B3778 0C01DE0D */ jal Math_Coss - ## coss? -/* 0035C 808B377C E4B00024 */ swc1 $f16, 0x0024($a1) ## 00000024 -/* 00360 808B3780 3C01429C */ lui $at, 0x429C ## $at = 429C0000 -/* 00364 808B3784 44812000 */ mtc1 $at, $f4 ## $f4 = 78.00 -/* 00368 808B3788 8FA50018 */ lw $a1, 0x0018($sp) -/* 0036C 808B378C 46040202 */ mul.s $f8, $f0, $f4 -/* 00370 808B3790 C4B20010 */ lwc1 $f18, 0x0010($a1) ## 00000010 -/* 00374 808B3794 46089181 */ sub.s $f6, $f18, $f8 -/* 00378 808B3798 E4A6002C */ swc1 $f6, 0x002C($a1) ## 0000002C -/* 0037C 808B379C 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00380 808B37A0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00384 808B37A4 03E00008 */ jr $ra -/* 00388 808B37A8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot12_Saku/func_808B37AC.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot12_Saku/func_808B37AC.s deleted file mode 100644 index 3e8b36554c..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot12_Saku/func_808B37AC.s +++ /dev/null @@ -1,6 +0,0 @@ -glabel func_808B37AC -/* 0038C 808B37AC AFA40000 */ sw $a0, 0x0000($sp) -/* 00390 808B37B0 03E00008 */ jr $ra -/* 00394 808B37B4 AFA50004 */ sw $a1, 0x0004($sp) - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot15_Rrbox/BgSpot15Rrbox_Draw.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot15_Rrbox/BgSpot15Rrbox_Draw.s index e5227fd9ff..41232d2af0 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot15_Rrbox/BgSpot15Rrbox_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Spot15_Rrbox/BgSpot15Rrbox_Draw.s @@ -4,7 +4,7 @@ glabel BgSpot15Rrbox_Draw /* 00C00 808B4560 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 /* 00C04 808B4564 AFBF0014 */ sw $ra, 0x0014($sp) /* 00C08 808B4568 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 00C0C 808B456C 0C00D498 */ jal Draw_DListOpa +/* 00C0C 808B456C 0C00D498 */ jal Gfx_DrawDListOpa /* 00C10 808B4570 24A50180 */ addiu $a1, $a1, 0x0180 ## $a1 = 06000180 /* 00C14 808B4574 8FBF0014 */ lw $ra, 0x0014($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot16_Bombstone/BgSpot16Bombstone_Draw.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot16_Bombstone/BgSpot16Bombstone_Draw.s index b92f474a12..c715d9236a 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot16_Bombstone/BgSpot16Bombstone_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Spot16_Bombstone/BgSpot16Bombstone_Draw.s @@ -10,7 +10,7 @@ glabel BgSpot16Bombstone_Draw /* 01088 808B5CB8 24C661E4 */ addiu $a2, $a2, %lo(D_808B61E4) ## $a2 = 808B61E4 /* 0108C 808B5CBC 27A40034 */ addiu $a0, $sp, 0x0034 ## $a0 = FFFFFFE4 /* 01090 808B5CC0 240704E5 */ addiu $a3, $zero, 0x04E5 ## $a3 = 000004E5 -/* 01094 808B5CC4 0C031AB1 */ jal func_800C6AC4 +/* 01094 808B5CC4 0C031AB1 */ jal Graph_OpenDisps /* 01098 808B5CC8 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 /* 0109C 808B5CCC 0C024F46 */ jal func_80093D18 /* 010A0 808B5CD0 8E240000 */ lw $a0, 0x0000($s1) ## 00000000 @@ -69,7 +69,7 @@ glabel BgSpot16Bombstone_Draw /* 01170 808B5DA0 AC480004 */ sw $t0, 0x0004($v0) ## 00000004 .L808B5DA4: /* 01174 808B5DA4 27A40034 */ addiu $a0, $sp, 0x0034 ## $a0 = FFFFFFE4 -/* 01178 808B5DA8 0C031AD5 */ jal func_800C6B54 +/* 01178 808B5DA8 0C031AD5 */ jal Graph_CloseDisps /* 0117C 808B5DAC 8E250000 */ lw $a1, 0x0000($s1) ## 00000000 /* 01180 808B5DB0 8FBF001C */ lw $ra, 0x001C($sp) /* 01184 808B5DB4 8FB00014 */ lw $s0, 0x0014($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot16_Doughnut/BgSpot16Doughnut_Draw.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot16_Doughnut/BgSpot16Doughnut_Draw.s index 3f1bfa781b..d0a53b4958 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot16_Doughnut/BgSpot16Doughnut_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Spot16_Doughnut/BgSpot16Doughnut_Draw.s @@ -14,7 +14,7 @@ glabel BgSpot16Doughnut_Draw /* 002D8 808B6718 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 /* 002DC 808B671C 27A40060 */ addiu $a0, $sp, 0x0060 ## $a0 = FFFFFFE0 /* 002E0 808B6720 240700D2 */ addiu $a3, $zero, 0x00D2 ## $a3 = 000000D2 -/* 002E4 808B6724 0C031AB1 */ jal func_800C6AC4 +/* 002E4 808B6724 0C031AB1 */ jal Graph_OpenDisps /* 002E8 808B6728 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 /* 002EC 808B672C 8FB90084 */ lw $t9, 0x0084($sp) /* 002F0 808B6730 0C024F61 */ jal func_80093D84 @@ -64,7 +64,7 @@ glabel BgSpot16Doughnut_Draw /* 003A0 808B67E0 AFA8001C */ sw $t0, 0x001C($sp) /* 003A4 808B67E4 AFAB0014 */ sw $t3, 0x0014($sp) /* 003A8 808B67E8 AFAA0010 */ sw $t2, 0x0010($sp) -/* 003AC 808B67EC 0C0253D0 */ jal Draw_TwoTexScroll +/* 003AC 808B67EC 0C0253D0 */ jal Gfx_TwoTexScroll /* 003B0 808B67F0 AFA20058 */ sw $v0, 0x0058($sp) /* 003B4 808B67F4 8FA30058 */ lw $v1, 0x0058($sp) /* 003B8 808B67F8 3C19FB00 */ lui $t9, 0xFB00 ## $t9 = FB000000 @@ -118,7 +118,7 @@ glabel BgSpot16Doughnut_Draw /* 00470 808B68B0 24C66AA0 */ addiu $a2, $a2, %lo(D_808B6AA0) ## $a2 = 808B6AA0 /* 00474 808B68B4 27A40060 */ addiu $a0, $sp, 0x0060 ## $a0 = FFFFFFE0 /* 00478 808B68B8 240700EE */ addiu $a3, $zero, 0x00EE ## $a3 = 000000EE -/* 0047C 808B68BC 0C031AD5 */ jal func_800C6B54 +/* 0047C 808B68BC 0C031AD5 */ jal Graph_CloseDisps /* 00480 808B68C0 8D850000 */ lw $a1, 0x0000($t4) ## 00000000 /* 00484 808B68C4 8FBF003C */ lw $ra, 0x003C($sp) /* 00488 808B68C8 8FB00038 */ lw $s0, 0x0038($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot16_Doughnut/func_808B68D8.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot16_Doughnut/func_808B68D8.s index 8a561c8912..2b37a7b8de 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot16_Doughnut/func_808B68D8.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Spot16_Doughnut/func_808B68D8.s @@ -9,7 +9,7 @@ glabel func_808B68D8 /* 004B4 808B68F4 24C66ABC */ addiu $a2, $a2, %lo(D_808B6ABC) ## $a2 = 808B6ABC /* 004B8 808B68F8 27A40038 */ addiu $a0, $sp, 0x0038 ## $a0 = FFFFFFE8 /* 004BC 808B68FC 240700F5 */ addiu $a3, $zero, 0x00F5 ## $a3 = 000000F5 -/* 004C0 808B6900 0C031AB1 */ jal func_800C6AC4 +/* 004C0 808B6900 0C031AB1 */ jal Graph_OpenDisps /* 004C4 808B6904 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 /* 004C8 808B6908 8FAF0054 */ lw $t7, 0x0054($sp) /* 004CC 808B690C 0C024F61 */ jal func_80093D84 @@ -59,7 +59,7 @@ glabel func_808B68D8 /* 0057C 808B69BC AC4A0004 */ sw $t2, 0x0004($v0) ## 00000004 /* 00580 808B69C0 AC490000 */ sw $t1, 0x0000($v0) ## 00000000 /* 00584 808B69C4 8FAB0054 */ lw $t3, 0x0054($sp) -/* 00588 808B69C8 0C031AD5 */ jal func_800C6B54 +/* 00588 808B69C8 0C031AD5 */ jal Graph_CloseDisps /* 0058C 808B69CC 8D650000 */ lw $a1, 0x0000($t3) ## 00000000 /* 00590 808B69D0 8FBF001C */ lw $ra, 0x001C($sp) /* 00594 808B69D4 8FB00018 */ lw $s0, 0x0018($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot17_Bakudankabe/BgSpot17Bakudankabe_Draw.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot17_Bakudankabe/BgSpot17Bakudankabe_Draw.s index 89ce173aa6..62c6ababe5 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot17_Bakudankabe/BgSpot17Bakudankabe_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Spot17_Bakudankabe/BgSpot17Bakudankabe_Draw.s @@ -41,7 +41,7 @@ glabel BgSpot17Bakudankabe_Draw /* 00518 808B70D8 24C672B0 */ addiu $a2, $a2, %lo(D_808B72B0) ## $a2 = 808B72B0 /* 0051C 808B70DC 27A4004C */ addiu $a0, $sp, 0x004C ## $a0 = FFFFFFE4 /* 00520 808B70E0 2407010D */ addiu $a3, $zero, 0x010D ## $a3 = 0000010D -/* 00524 808B70E4 0C031AB1 */ jal func_800C6AC4 +/* 00524 808B70E4 0C031AB1 */ jal Graph_OpenDisps /* 00528 808B70E8 AFA5005C */ sw $a1, 0x005C($sp) /* 0052C 808B70EC 0C024F46 */ jal func_80093D18 /* 00530 808B70F0 8E040000 */ lw $a0, 0x0000($s0) ## 00000000 @@ -95,14 +95,14 @@ glabel BgSpot17Bakudankabe_Draw /* 005F0 808B71B0 8E050000 */ lw $a1, 0x0000($s0) ## 00000000 /* 005F4 808B71B4 24C672F0 */ addiu $a2, $a2, %lo(D_808B72F0) ## $a2 = 808B72F0 /* 005F8 808B71B8 27A4004C */ addiu $a0, $sp, 0x004C ## $a0 = FFFFFFE4 -/* 005FC 808B71BC 0C031AD5 */ jal func_800C6B54 +/* 005FC 808B71BC 0C031AD5 */ jal Graph_CloseDisps /* 00600 808B71C0 2407011B */ addiu $a3, $zero, 0x011B ## $a3 = 0000011B /* 00604 808B71C4 8E050000 */ lw $a1, 0x0000($s0) ## 00000000 /* 00608 808B71C8 3C06808B */ lui $a2, %hi(D_808B7310) ## $a2 = 808B0000 /* 0060C 808B71CC 24C67310 */ addiu $a2, $a2, %lo(D_808B7310) ## $a2 = 808B7310 /* 00610 808B71D0 27A4002C */ addiu $a0, $sp, 0x002C ## $a0 = FFFFFFC4 /* 00614 808B71D4 2407011E */ addiu $a3, $zero, 0x011E ## $a3 = 0000011E -/* 00618 808B71D8 0C031AB1 */ jal func_800C6AC4 +/* 00618 808B71D8 0C031AB1 */ jal Graph_OpenDisps /* 0061C 808B71DC AFA5003C */ sw $a1, 0x003C($sp) /* 00620 808B71E0 0C024F61 */ jal func_80093D84 /* 00624 808B71E4 8E040000 */ lw $a0, 0x0000($s0) ## 00000000 @@ -134,7 +134,7 @@ glabel BgSpot17Bakudankabe_Draw /* 0068C 808B724C AC590004 */ sw $t9, 0x0004($v0) ## 00000004 /* 00690 808B7250 AC580000 */ sw $t8, 0x0000($v0) ## 00000000 /* 00694 808B7254 8E050000 */ lw $a1, 0x0000($s0) ## 00000000 -/* 00698 808B7258 0C031AD5 */ jal func_800C6B54 +/* 00698 808B7258 0C031AD5 */ jal Graph_CloseDisps /* 0069C 808B725C 24070127 */ addiu $a3, $zero, 0x0127 ## $a3 = 00000127 /* 006A0 808B7260 8FBF001C */ lw $ra, 0x001C($sp) /* 006A4 808B7264 8FB00018 */ lw $s0, 0x0018($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot17_Funen/func_808B7478.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot17_Funen/func_808B7478.s index b5b5327cce..328436b91c 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot17_Funen/func_808B7478.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Spot17_Funen/func_808B7478.s @@ -10,7 +10,7 @@ glabel func_808B7478 /* 00098 808B7498 24C67654 */ addiu $a2, $a2, %lo(D_808B7654) ## $a2 = 808B7654 /* 0009C 808B749C 27A40058 */ addiu $a0, $sp, 0x0058 ## $a0 = FFFFFFE8 /* 000A0 808B74A0 24070099 */ addiu $a3, $zero, 0x0099 ## $a3 = 00000099 -/* 000A4 808B74A4 0C031AB1 */ jal func_800C6AC4 +/* 000A4 808B74A4 0C031AB1 */ jal Graph_OpenDisps /* 000A8 808B74A8 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 /* 000AC 808B74AC 0C024F61 */ jal func_80093D84 /* 000B0 808B74B0 8E240000 */ lw $a0, 0x0000($s1) ## 00000000 @@ -74,7 +74,7 @@ glabel func_808B7478 /* 00198 808B7598 AFA0001C */ sw $zero, 0x001C($sp) /* 0019C 808B759C 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 001A0 808B75A0 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 001A4 808B75A4 0C0253D0 */ jal Draw_TwoTexScroll +/* 001A4 808B75A4 0C0253D0 */ jal Gfx_TwoTexScroll /* 001A8 808B75A8 AFA20050 */ sw $v0, 0x0050($sp) /* 001AC 808B75AC 8FA30050 */ lw $v1, 0x0050($sp) /* 001B0 808B75B0 3C0E0600 */ lui $t6, 0x0600 ## $t6 = 06000000 @@ -90,7 +90,7 @@ glabel func_808B7478 /* 001D8 808B75D8 8E250000 */ lw $a1, 0x0000($s1) ## 00000000 /* 001DC 808B75DC 24C67684 */ addiu $a2, $a2, %lo(D_808B7684) ## $a2 = 808B7684 /* 001E0 808B75E0 27A40058 */ addiu $a0, $sp, 0x0058 ## $a0 = FFFFFFE8 -/* 001E4 808B75E4 0C031AD5 */ jal func_800C6B54 +/* 001E4 808B75E4 0C031AD5 */ jal Graph_CloseDisps /* 001E8 808B75E8 240700B0 */ addiu $a3, $zero, 0x00B0 ## $a3 = 000000B0 /* 001EC 808B75EC 8FBF003C */ lw $ra, 0x003C($sp) /* 001F0 808B75F0 8FB00034 */ lw $s0, 0x0034($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot18_Basket/BgSpot18Basket_Draw.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot18_Basket/BgSpot18Basket_Draw.s index 4a9511749b..b3bcffdea6 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot18_Basket/BgSpot18Basket_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Spot18_Basket/BgSpot18Basket_Draw.s @@ -13,7 +13,7 @@ glabel BgSpot18Basket_Draw /* 00E10 808B8520 24040001 */ addiu $a0, $zero, 0x0001 ## $a0 = 00000001 /* 00E14 808B8524 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 00E18 808B8528 24A518B0 */ addiu $a1, $a1, 0x18B0 ## $a1 = 060018B0 -/* 00E1C 808B852C 0C00D498 */ jal Draw_DListOpa +/* 00E1C 808B852C 0C00D498 */ jal Gfx_DrawDListOpa /* 00E20 808B8530 8FA40024 */ lw $a0, 0x0024($sp) /* 00E24 808B8534 8FBF0014 */ lw $ra, 0x0014($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot18_Obj/BgSpot18Obj_Draw.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot18_Obj/BgSpot18Obj_Draw.s index 074d2ae758..5faa4eab86 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot18_Obj/BgSpot18Obj_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Spot18_Obj/BgSpot18Obj_Draw.s @@ -8,7 +8,7 @@ glabel BgSpot18Obj_Draw /* 0079C 808B90AC 31CF000F */ andi $t7, $t6, 0x000F ## $t7 = 00000000 /* 007A0 808B90B0 000FC080 */ sll $t8, $t7, 2 /* 007A4 808B90B4 00B82821 */ addu $a1, $a1, $t8 -/* 007A8 808B90B8 0C00D498 */ jal Draw_DListOpa +/* 007A8 808B90B8 0C00D498 */ jal Gfx_DrawDListOpa /* 007AC 808B90BC 8CA59144 */ lw $a1, %lo(D_808B9144)($a1) /* 007B0 808B90C0 8FBF0014 */ lw $ra, 0x0014($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Spot18_Shutter/BgSpot18Shutter_Draw.s b/asm/non_matchings/overlays/actors/ovl_Bg_Spot18_Shutter/BgSpot18Shutter_Draw.s index 4cb338548a..528049e1f4 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Spot18_Shutter/BgSpot18Shutter_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Spot18_Shutter/BgSpot18Shutter_Draw.s @@ -4,7 +4,7 @@ glabel BgSpot18Shutter_Draw /* 00454 808B9824 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 /* 00458 808B9828 AFBF0014 */ sw $ra, 0x0014($sp) /* 0045C 808B982C 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 00460 808B9830 0C00D498 */ jal Draw_DListOpa +/* 00460 808B9830 0C00D498 */ jal Gfx_DrawDListOpa /* 00464 808B9834 24A50420 */ addiu $a1, $a1, 0x0420 ## $a1 = 06000420 /* 00468 808B9838 8FBF0014 */ lw $ra, 0x0014($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Sst_Floor/BgSstFloor_Draw.s b/asm/non_matchings/overlays/actors/ovl_Bg_Sst_Floor/BgSstFloor_Draw.s index 12842aef54..f3474a5d1a 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Sst_Floor/BgSstFloor_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Sst_Floor/BgSstFloor_Draw.s @@ -9,7 +9,7 @@ glabel BgSstFloor_Draw /* 00420 808B9D30 24C69E40 */ addiu $a2, $a2, %lo(D_808B9E40) ## $a2 = 808B9E40 /* 00424 808B9D34 27A40030 */ addiu $a0, $sp, 0x0030 ## $a0 = FFFFFFE8 /* 00428 808B9D38 24070115 */ addiu $a3, $zero, 0x0115 ## $a3 = 00000115 -/* 0042C 808B9D3C 0C031AB1 */ jal func_800C6AC4 +/* 0042C 808B9D3C 0C031AB1 */ jal Graph_OpenDisps /* 00430 808B9D40 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 /* 00434 808B9D44 8FAF004C */ lw $t7, 0x004C($sp) /* 00438 808B9D48 0C024F46 */ jal func_80093D18 @@ -55,7 +55,7 @@ glabel BgSstFloor_Draw /* 004D8 808B9DE8 24C69E68 */ addiu $a2, $a2, %lo(D_808B9E68) ## $a2 = 808B9E68 /* 004DC 808B9DEC 27A40030 */ addiu $a0, $sp, 0x0030 ## $a0 = FFFFFFE8 /* 004E0 808B9DF0 2407011F */ addiu $a3, $zero, 0x011F ## $a3 = 0000011F -/* 004E4 808B9DF4 0C031AD5 */ jal func_800C6B54 +/* 004E4 808B9DF4 0C031AD5 */ jal Graph_CloseDisps /* 004E8 808B9DF8 8DC50000 */ lw $a1, 0x0000($t6) ## 00000000 /* 004EC 808B9DFC 8FBF001C */ lw $ra, 0x001C($sp) /* 004F0 808B9E00 8FB00018 */ lw $s0, 0x0018($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Toki_Hikari/func_808BA018.s b/asm/non_matchings/overlays/actors/ovl_Bg_Toki_Hikari/func_808BA018.s index a59eb865f7..9a950d092d 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Toki_Hikari/func_808BA018.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Toki_Hikari/func_808BA018.s @@ -10,7 +10,7 @@ glabel func_808BA018 /* 00138 808BA038 24C6AC80 */ addiu $a2, $a2, %lo(D_808BAC80) ## $a2 = 808BAC80 /* 0013C 808BA03C 27A40050 */ addiu $a0, $sp, 0x0050 ## $a0 = FFFFFFE8 /* 00140 808BA040 240700F6 */ addiu $a3, $zero, 0x00F6 ## $a3 = 000000F6 -/* 00144 808BA044 0C031AB1 */ jal func_800C6AC4 +/* 00144 808BA044 0C031AB1 */ jal Graph_OpenDisps /* 00148 808BA048 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 /* 0014C 808BA04C 0C024F46 */ jal func_80093D18 /* 00150 808BA050 8E240000 */ lw $a0, 0x0000($s1) ## 00000000 @@ -68,7 +68,7 @@ glabel func_808BA018 /* 0021C 808BA11C 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 00220 808BA120 24070040 */ addiu $a3, $zero, 0x0040 ## $a3 = 00000040 /* 00224 808BA124 AFA20040 */ sw $v0, 0x0040($sp) -/* 00228 808BA128 0C0253A7 */ jal Draw_TexScroll +/* 00228 808BA128 0C0253A7 */ jal Gfx_TexScroll /* 0022C 808BA12C 30C6007F */ andi $a2, $a2, 0x007F ## $a2 = 00000000 /* 00230 808BA130 8FA30040 */ lw $v1, 0x0040($sp) /* 00234 808BA134 8FA80030 */ lw $t0, 0x0030($sp) @@ -86,7 +86,7 @@ glabel func_808BA018 /* 00264 808BA164 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 00268 808BA168 24070040 */ addiu $a3, $zero, 0x0040 ## $a3 = 00000040 /* 0026C 808BA16C AFA2003C */ sw $v0, 0x003C($sp) -/* 00270 808BA170 0C0253A7 */ jal Draw_TexScroll +/* 00270 808BA170 0C0253A7 */ jal Gfx_TexScroll /* 00274 808BA174 30C6007F */ andi $a2, $a2, 0x007F ## $a2 = 00000000 /* 00278 808BA178 8FA3003C */ lw $v1, 0x003C($sp) /* 0027C 808BA17C 3C0CDA38 */ lui $t4, 0xDA38 ## $t4 = DA380000 @@ -117,7 +117,7 @@ glabel func_808BA018 /* 002DC 808BA1DC 24C6ACC8 */ addiu $a2, $a2, %lo(D_808BACC8) ## $a2 = 808BACC8 /* 002E0 808BA1E0 27A40050 */ addiu $a0, $sp, 0x0050 ## $a0 = FFFFFFE8 /* 002E4 808BA1E4 8E250000 */ lw $a1, 0x0000($s1) ## 00000000 -/* 002E8 808BA1E8 0C031AD5 */ jal func_800C6B54 +/* 002E8 808BA1E8 0C031AD5 */ jal Graph_CloseDisps /* 002EC 808BA1EC 2407011C */ addiu $a3, $zero, 0x011C ## $a3 = 0000011C /* 002F0 808BA1F0 8FBF0024 */ lw $ra, 0x0024($sp) /* 002F4 808BA1F4 8FB0001C */ lw $s0, 0x001C($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Toki_Hikari/func_808BA2CC.s b/asm/non_matchings/overlays/actors/ovl_Bg_Toki_Hikari/func_808BA2CC.s index b870f5fdd8..5d2859446b 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Toki_Hikari/func_808BA2CC.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Toki_Hikari/func_808BA2CC.s @@ -9,7 +9,7 @@ glabel func_808BA2CC /* 003E8 808BA2E8 24C6ACE0 */ addiu $a2, $a2, %lo(D_808BACE0) ## $a2 = 808BACE0 /* 003EC 808BA2EC 27A4008C */ addiu $a0, $sp, 0x008C ## $a0 = FFFFFFE4 /* 003F0 808BA2F0 2407015E */ addiu $a3, $zero, 0x015E ## $a3 = 0000015E -/* 003F4 808BA2F4 0C031AB1 */ jal func_800C6AC4 +/* 003F4 808BA2F4 0C031AB1 */ jal Graph_OpenDisps /* 003F8 808BA2F8 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 /* 003FC 808BA2FC 3C01438A */ lui $at, 0x438A ## $at = 438A0000 /* 00400 808BA300 44817000 */ mtc1 $at, $f14 ## $f14 = 276.00 @@ -270,7 +270,7 @@ glabel func_808BA2CC /* 007CC 808BA6CC AFA00020 */ sw $zero, 0x0020($sp) /* 007D0 808BA6D0 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 007D4 808BA6D4 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 007D8 808BA6D8 0C0253D0 */ jal Draw_TwoTexScroll +/* 007D8 808BA6D8 0C0253D0 */ jal Gfx_TwoTexScroll /* 007DC 808BA6DC AFA20078 */ sw $v0, 0x0078($sp) /* 007E0 808BA6E0 8FA80078 */ lw $t0, 0x0078($sp) /* 007E4 808BA6E4 3C0D0600 */ lui $t5, 0x0600 ## $t5 = 06000000 @@ -631,7 +631,7 @@ glabel func_808BA2CC /* 00D28 808BAC28 24C6AD40 */ addiu $a2, $a2, %lo(D_808BAD40) ## $a2 = 808BAD40 /* 00D2C 808BAC2C 27A4008C */ addiu $a0, $sp, 0x008C ## $a0 = FFFFFFE4 /* 00D30 808BAC30 240701BB */ addiu $a3, $zero, 0x01BB ## $a3 = 000001BB -/* 00D34 808BAC34 0C031AD5 */ jal func_800C6B54 +/* 00D34 808BAC34 0C031AD5 */ jal Graph_CloseDisps /* 00D38 808BAC38 8D650000 */ lw $a1, 0x0000($t3) ## 00000000 /* 00D3C 808BAC3C 8FBF003C */ lw $ra, 0x003C($sp) /* 00D40 808BAC40 8FB00038 */ lw $s0, 0x0038($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Toki_Swd/BgTokiSwd_Destroy.s b/asm/non_matchings/overlays/actors/ovl_Bg_Toki_Swd/BgTokiSwd_Destroy.s deleted file mode 100644 index 00f28795cd..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Toki_Swd/BgTokiSwd_Destroy.s +++ /dev/null @@ -1,14 +0,0 @@ -glabel BgTokiSwd_Destroy -/* 000D8 808BAF18 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 000DC 808BAF1C 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 -/* 000E0 808BAF20 AFBF0014 */ sw $ra, 0x0014($sp) -/* 000E4 808BAF24 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 000E8 808BAF28 0C0170EB */ jal ActorCollider_FreeCylinder - -/* 000EC 808BAF2C 24C50150 */ addiu $a1, $a2, 0x0150 ## $a1 = 00000150 -/* 000F0 808BAF30 8FBF0014 */ lw $ra, 0x0014($sp) -/* 000F4 808BAF34 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 000F8 808BAF38 03E00008 */ jr $ra -/* 000FC 808BAF3C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Toki_Swd/BgTokiSwd_Draw.s b/asm/non_matchings/overlays/actors/ovl_Bg_Toki_Swd/BgTokiSwd_Draw.s deleted file mode 100644 index 32b688400d..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Toki_Swd/BgTokiSwd_Draw.s +++ /dev/null @@ -1,77 +0,0 @@ -glabel BgTokiSwd_Draw -/* 00384 808BB1C4 27BDFFA0 */ addiu $sp, $sp, 0xFFA0 ## $sp = FFFFFFA0 -/* 00388 808BB1C8 AFB0001C */ sw $s0, 0x001C($sp) -/* 0038C 808BB1CC 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 -/* 00390 808BB1D0 AFBF0024 */ sw $ra, 0x0024($sp) -/* 00394 808BB1D4 AFB10020 */ sw $s1, 0x0020($sp) -/* 00398 808BB1D8 AFA40060 */ sw $a0, 0x0060($sp) -/* 0039C 808BB1DC 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 -/* 003A0 808BB1E0 3C06808C */ lui $a2, %hi(D_808BC420) ## $a2 = 808C0000 -/* 003A4 808BB1E4 24C6C420 */ addiu $a2, $a2, %lo(D_808BC420) ## $a2 = 808BC420 -/* 003A8 808BB1E8 27A40038 */ addiu $a0, $sp, 0x0038 ## $a0 = FFFFFFD8 -/* 003AC 808BB1EC 240702D7 */ addiu $a3, $zero, 0x02D7 ## $a3 = 000002D7 -/* 003B0 808BB1F0 0C031AB1 */ jal func_800C6AC4 -/* 003B4 808BB1F4 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 -/* 003B8 808BB1F8 0C024F46 */ jal func_80093D18 -/* 003BC 808BB1FC 8E040000 */ lw $a0, 0x0000($s0) ## 00000000 -/* 003C0 808BB200 8FA40060 */ lw $a0, 0x0060($sp) -/* 003C4 808BB204 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 003C8 808BB208 0C00BAF3 */ jal func_8002EBCC -/* 003CC 808BB20C 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 003D0 808BB210 8E2202C0 */ lw $v0, 0x02C0($s1) ## 000002C0 -/* 003D4 808BB214 3C0FDB06 */ lui $t7, 0xDB06 ## $t7 = DB060000 -/* 003D8 808BB218 35EF0020 */ ori $t7, $t7, 0x0020 ## $t7 = DB060020 -/* 003DC 808BB21C 244E0008 */ addiu $t6, $v0, 0x0008 ## $t6 = 00000008 -/* 003E0 808BB220 AE2E02C0 */ sw $t6, 0x02C0($s1) ## 000002C0 -/* 003E4 808BB224 3C060001 */ lui $a2, 0x0001 ## $a2 = 00010000 -/* 003E8 808BB228 00D03021 */ addu $a2, $a2, $s0 -/* 003EC 808BB22C AC4F0000 */ sw $t7, 0x0000($v0) ## 00000000 -/* 003F0 808BB230 8CC61DE4 */ lw $a2, 0x1DE4($a2) ## 00011DE4 -/* 003F4 808BB234 8E040000 */ lw $a0, 0x0000($s0) ## 00000000 -/* 003F8 808BB238 24180020 */ addiu $t8, $zero, 0x0020 ## $t8 = 00000020 -/* 003FC 808BB23C 30C6007F */ andi $a2, $a2, 0x007F ## $a2 = 00000000 -/* 00400 808BB240 00063023 */ subu $a2, $zero, $a2 -/* 00404 808BB244 AFB80010 */ sw $t8, 0x0010($sp) -/* 00408 808BB248 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 0040C 808BB24C 24070020 */ addiu $a3, $zero, 0x0020 ## $a3 = 00000020 -/* 00410 808BB250 0C0253A7 */ jal Draw_TexScroll -/* 00414 808BB254 AFA20034 */ sw $v0, 0x0034($sp) -/* 00418 808BB258 8FA30034 */ lw $v1, 0x0034($sp) -/* 0041C 808BB25C 3C08DA38 */ lui $t0, 0xDA38 ## $t0 = DA380000 -/* 00420 808BB260 35080003 */ ori $t0, $t0, 0x0003 ## $t0 = DA380003 -/* 00424 808BB264 AC620004 */ sw $v0, 0x0004($v1) ## 00000004 -/* 00428 808BB268 8E2202C0 */ lw $v0, 0x02C0($s1) ## 000002C0 -/* 0042C 808BB26C 3C05808C */ lui $a1, %hi(D_808BC434) ## $a1 = 808C0000 -/* 00430 808BB270 24A5C434 */ addiu $a1, $a1, %lo(D_808BC434) ## $a1 = 808BC434 -/* 00434 808BB274 24590008 */ addiu $t9, $v0, 0x0008 ## $t9 = 00000008 -/* 00438 808BB278 AE3902C0 */ sw $t9, 0x02C0($s1) ## 000002C0 -/* 0043C 808BB27C AC480000 */ sw $t0, 0x0000($v0) ## 00000000 -/* 00440 808BB280 8E040000 */ lw $a0, 0x0000($s0) ## 00000000 -/* 00444 808BB284 240602E6 */ addiu $a2, $zero, 0x02E6 ## $a2 = 000002E6 -/* 00448 808BB288 0C0346A2 */ jal Matrix_NewMtx -/* 0044C 808BB28C AFA20030 */ sw $v0, 0x0030($sp) -/* 00450 808BB290 8FA30030 */ lw $v1, 0x0030($sp) -/* 00454 808BB294 3C0B0600 */ lui $t3, 0x0600 ## $t3 = 06000000 -/* 00458 808BB298 256B1BD0 */ addiu $t3, $t3, 0x1BD0 ## $t3 = 06001BD0 -/* 0045C 808BB29C AC620004 */ sw $v0, 0x0004($v1) ## 00000004 -/* 00460 808BB2A0 8E2202C0 */ lw $v0, 0x02C0($s1) ## 000002C0 -/* 00464 808BB2A4 3C0ADE00 */ lui $t2, 0xDE00 ## $t2 = DE000000 -/* 00468 808BB2A8 3C06808C */ lui $a2, %hi(D_808BC448) ## $a2 = 808C0000 -/* 0046C 808BB2AC 24490008 */ addiu $t1, $v0, 0x0008 ## $t1 = 00000008 -/* 00470 808BB2B0 AE2902C0 */ sw $t1, 0x02C0($s1) ## 000002C0 -/* 00474 808BB2B4 AC4B0004 */ sw $t3, 0x0004($v0) ## 00000004 -/* 00478 808BB2B8 AC4A0000 */ sw $t2, 0x0000($v0) ## 00000000 -/* 0047C 808BB2BC 8E050000 */ lw $a1, 0x0000($s0) ## 00000000 -/* 00480 808BB2C0 24C6C448 */ addiu $a2, $a2, %lo(D_808BC448) ## $a2 = 808BC448 -/* 00484 808BB2C4 27A40038 */ addiu $a0, $sp, 0x0038 ## $a0 = FFFFFFD8 -/* 00488 808BB2C8 0C031AD5 */ jal func_800C6B54 -/* 0048C 808BB2CC 24070308 */ addiu $a3, $zero, 0x0308 ## $a3 = 00000308 -/* 00490 808BB2D0 8FBF0024 */ lw $ra, 0x0024($sp) -/* 00494 808BB2D4 8FB0001C */ lw $s0, 0x001C($sp) -/* 00498 808BB2D8 8FB10020 */ lw $s1, 0x0020($sp) -/* 0049C 808BB2DC 03E00008 */ jr $ra -/* 004A0 808BB2E0 27BD0060 */ addiu $sp, $sp, 0x0060 ## $sp = 00000000 -/* 004A4 808BB2E4 00000000 */ nop -/* 004A8 808BB2E8 00000000 */ nop -/* 004AC 808BB2EC 00000000 */ nop - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Toki_Swd/BgTokiSwd_Init.s b/asm/non_matchings/overlays/actors/ovl_Bg_Toki_Swd/BgTokiSwd_Init.s deleted file mode 100644 index b1e064bbbb..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Toki_Swd/BgTokiSwd_Init.s +++ /dev/null @@ -1,61 +0,0 @@ -glabel BgTokiSwd_Init -/* 00008 808BAE48 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 0000C 808BAE4C AFA50034 */ sw $a1, 0x0034($sp) -/* 00010 808BAE50 AFBF001C */ sw $ra, 0x001C($sp) -/* 00014 808BAE54 AFB00018 */ sw $s0, 0x0018($sp) -/* 00018 808BAE58 3C05808C */ lui $a1, %hi(D_808BC414) ## $a1 = 808C0000 -/* 0001C 808BAE5C 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00020 808BAE60 0C01E037 */ jal Actor_ProcessInitChain - -/* 00024 808BAE64 24A5C414 */ addiu $a1, $a1, %lo(D_808BC414) ## $a1 = 808BC414 -/* 00028 808BAE68 3C014448 */ lui $at, 0x4448 ## $at = 44480000 -/* 0002C 808BAE6C 44812000 */ mtc1 $at, $f4 ## $f4 = 800.00 -/* 00030 808BAE70 3C05808C */ lui $a1, %hi(func_808BAF40) ## $a1 = 808C0000 -/* 00034 808BAE74 24A5AF40 */ addiu $a1, $a1, %lo(func_808BAF40) ## $a1 = 808BAF40 -/* 00038 808BAE78 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0003C 808BAE7C 0C22EB90 */ jal func_808BAE40 -/* 00040 808BAE80 E60400BC */ swc1 $f4, 0x00BC($s0) ## 000000BC -/* 00044 808BAE84 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 00048 808BAE88 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 -/* 0004C 808BAE8C 8C4E0004 */ lw $t6, 0x0004($v0) ## 8015E664 -/* 00050 808BAE90 26050150 */ addiu $a1, $s0, 0x0150 ## $a1 = 00000150 -/* 00054 808BAE94 55C00003 */ bnel $t6, $zero, .L808BAEA4 -/* 00058 808BAE98 8C4F1360 */ lw $t7, 0x1360($v0) ## 8015F9C0 -/* 0005C 808BAE9C AE000134 */ sw $zero, 0x0134($s0) ## 00000134 -/* 00060 808BAEA0 8C4F1360 */ lw $t7, 0x1360($v0) ## 8015F9C0 -.L808BAEA4: -/* 00064 808BAEA4 24010005 */ addiu $at, $zero, 0x0005 ## $at = 00000005 -/* 00068 808BAEA8 8FB90034 */ lw $t9, 0x0034($sp) -/* 0006C 808BAEAC 15E10004 */ bne $t7, $at, .L808BAEC0 -/* 00070 808BAEB0 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 00074 808BAEB4 00390821 */ addu $at, $at, $t9 -/* 00078 808BAEB8 241800FF */ addiu $t8, $zero, 0x00FF ## $t8 = 000000FF -/* 0007C 808BAEBC A4381D30 */ sh $t8, 0x1D30($at) ## 00011D30 -.L808BAEC0: -/* 00080 808BAEC0 8FA40034 */ lw $a0, 0x0034($sp) -/* 00084 808BAEC4 0C0170D9 */ jal ActorCollider_AllocCylinder - -/* 00088 808BAEC8 AFA50024 */ sw $a1, 0x0024($sp) -/* 0008C 808BAECC 3C07808C */ lui $a3, %hi(D_808BC3E0) ## $a3 = 808C0000 -/* 00090 808BAED0 24E7C3E0 */ addiu $a3, $a3, %lo(D_808BC3E0) ## $a3 = 808BC3E0 -/* 00094 808BAED4 8FA40034 */ lw $a0, 0x0034($sp) -/* 00098 808BAED8 8FA50024 */ lw $a1, 0x0024($sp) -/* 0009C 808BAEDC 0C01712B */ jal ActorCollider_InitCylinder - -/* 000A0 808BAEE0 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 -/* 000A4 808BAEE4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 000A8 808BAEE8 0C0189B7 */ jal ActorCollider_Cylinder_Update - -/* 000AC 808BAEEC 8FA50024 */ lw $a1, 0x0024($sp) -/* 000B0 808BAEF0 3C06808C */ lui $a2, %hi(D_808BC40C) ## $a2 = 808C0000 -/* 000B4 808BAEF4 24C6C40C */ addiu $a2, $a2, %lo(D_808BC40C) ## $a2 = 808BC40C -/* 000B8 808BAEF8 26040098 */ addiu $a0, $s0, 0x0098 ## $a0 = 00000098 -/* 000BC 808BAEFC 0C0187B5 */ jal func_80061ED4 -/* 000C0 808BAF00 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 000C4 808BAF04 8FBF001C */ lw $ra, 0x001C($sp) -/* 000C8 808BAF08 8FB00018 */ lw $s0, 0x0018($sp) -/* 000CC 808BAF0C 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 000D0 808BAF10 03E00008 */ jr $ra -/* 000D4 808BAF14 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Toki_Swd/BgTokiSwd_Update.s b/asm/non_matchings/overlays/actors/ovl_Bg_Toki_Swd/BgTokiSwd_Update.s deleted file mode 100644 index 48df28b486..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Toki_Swd/BgTokiSwd_Update.s +++ /dev/null @@ -1,22 +0,0 @@ -glabel BgTokiSwd_Update -/* 0033C 808BB17C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00340 808BB180 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00344 808BB184 AFA5001C */ sw $a1, 0x001C($sp) -/* 00348 808BB188 AFA40018 */ sw $a0, 0x0018($sp) -/* 0034C 808BB18C 8C99014C */ lw $t9, 0x014C($a0) ## 0000014C -/* 00350 808BB190 0320F809 */ jalr $ra, $t9 -/* 00354 808BB194 00000000 */ nop -/* 00358 808BB198 8FA4001C */ lw $a0, 0x001C($sp) -/* 0035C 808BB19C 8FA70018 */ lw $a3, 0x0018($sp) -/* 00360 808BB1A0 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 00364 808BB1A4 34211E60 */ ori $at, $at, 0x1E60 ## $at = 00011E60 -/* 00368 808BB1A8 00812821 */ addu $a1, $a0, $at -/* 0036C 808BB1AC 0C017713 */ jal Actor_CollisionCheck_SetOT - ## CollisionCheck_setOT -/* 00370 808BB1B0 24E60150 */ addiu $a2, $a3, 0x0150 ## $a2 = 00000150 -/* 00374 808BB1B4 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00378 808BB1B8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 0037C 808BB1BC 03E00008 */ jr $ra -/* 00380 808BB1C0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Toki_Swd/func_808BAE40.s b/asm/non_matchings/overlays/actors/ovl_Bg_Toki_Swd/func_808BAE40.s deleted file mode 100644 index cf2c1d0e52..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Toki_Swd/func_808BAE40.s +++ /dev/null @@ -1,5 +0,0 @@ -glabel func_808BAE40 -/* 00000 808BAE40 03E00008 */ jr $ra -/* 00004 808BAE44 AC85014C */ sw $a1, 0x014C($a0) ## 0000014C - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Toki_Swd/func_808BAF40.s b/asm/non_matchings/overlays/actors/ovl_Bg_Toki_Swd/func_808BAF40.s deleted file mode 100644 index 9a2cf736a8..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Toki_Swd/func_808BAF40.s +++ /dev/null @@ -1,106 +0,0 @@ -glabel func_808BAF40 -/* 00100 808BAF40 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 00104 808BAF44 AFB00014 */ sw $s0, 0x0014($sp) -/* 00108 808BAF48 3C108016 */ lui $s0, 0x8016 ## $s0 = 80160000 -/* 0010C 808BAF4C 2610E660 */ addiu $s0, $s0, 0xE660 ## $s0 = 8015E660 -/* 00110 808BAF50 960E0EDC */ lhu $t6, 0x0EDC($s0) ## 8015F53C -/* 00114 808BAF54 AFB10018 */ sw $s1, 0x0018($sp) -/* 00118 808BAF58 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 -/* 0011C 808BAF5C 31CF8000 */ andi $t7, $t6, 0x8000 ## $t7 = 00000000 -/* 00120 808BAF60 AFBF001C */ sw $ra, 0x001C($sp) -/* 00124 808BAF64 15E00015 */ bne $t7, $zero, .L808BAFBC -/* 00128 808BAF68 AFA40020 */ sw $a0, 0x0020($sp) -/* 0012C 808BAF6C 8E181360 */ lw $t8, 0x1360($s0) ## 8015F9C0 -/* 00130 808BAF70 3C054448 */ lui $a1, 0x4448 ## $a1 = 44480000 -/* 00134 808BAF74 2B010004 */ slti $at, $t8, 0x0004 -/* 00138 808BAF78 50200011 */ beql $at, $zero, .L808BAFC0 -/* 0013C 808BAF7C 8E0B0004 */ lw $t3, 0x0004($s0) ## 8015E664 -/* 00140 808BAF80 0C00B84B */ jal func_8002E12C -/* 00144 808BAF84 24067530 */ addiu $a2, $zero, 0x7530 ## $a2 = 00007530 -/* 00148 808BAF88 5040000D */ beql $v0, $zero, .L808BAFC0 -/* 0014C 808BAF8C 8E0B0004 */ lw $t3, 0x0004($s0) ## 8015E664 -/* 00150 808BAF90 0C02FF21 */ jal func_800BFC84 -/* 00154 808BAF94 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 00158 808BAF98 14400008 */ bne $v0, $zero, .L808BAFBC -/* 0015C 808BAF9C 3C09808C */ lui $t1, %hi(D_808BBD90) ## $t1 = 808C0000 -/* 00160 808BAFA0 96190EDC */ lhu $t9, 0x0EDC($s0) ## 8015F53C -/* 00164 808BAFA4 2529BD90 */ addiu $t1, $t1, %lo(D_808BBD90) ## $t1 = 808BBD90 -/* 00168 808BAFA8 240A0001 */ addiu $t2, $zero, 0x0001 ## $t2 = 00000001 -/* 0016C 808BAFAC 37288000 */ ori $t0, $t9, 0x8000 ## $t0 = 00008000 -/* 00170 808BAFB0 A6080EDC */ sh $t0, 0x0EDC($s0) ## 8015F53C -/* 00174 808BAFB4 AE291D68 */ sw $t1, 0x1D68($s1) ## 00001D68 -/* 00178 808BAFB8 A20A1414 */ sb $t2, 0x1414($s0) ## 8015FA74 -.L808BAFBC: -/* 0017C 808BAFBC 8E0B0004 */ lw $t3, 0x0004($s0) ## 8015E664 -.L808BAFC0: -/* 00180 808BAFC0 8FA40020 */ lw $a0, 0x0020($sp) -/* 00184 808BAFC4 15600005 */ bne $t3, $zero, .L808BAFDC -/* 00188 808BAFC8 00000000 */ nop -/* 0018C 808BAFCC 960C0EDE */ lhu $t4, 0x0EDE($s0) ## 8015F53E -/* 00190 808BAFD0 318D0020 */ andi $t5, $t4, 0x0020 ## $t5 = 00000000 -/* 00194 808BAFD4 51A00026 */ beql $t5, $zero, .L808BB070 -/* 00198 808BAFD8 8E081360 */ lw $t0, 0x1360($s0) ## 8015F9C0 -.L808BAFDC: -/* 0019C 808BAFDC 0C00BD04 */ jal func_8002F410 -/* 001A0 808BAFE0 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 001A4 808BAFE4 1040001B */ beq $v0, $zero, .L808BB054 -/* 001A8 808BAFE8 8FA40020 */ lw $a0, 0x0020($sp) -/* 001AC 808BAFEC 8E0E0004 */ lw $t6, 0x0004($s0) ## 8015E664 -/* 001B0 808BAFF0 3C18808C */ lui $t8, %hi(D_808BB7A0) ## $t8 = 808C0000 -/* 001B4 808BAFF4 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 001B8 808BAFF8 11C00007 */ beq $t6, $zero, .L808BB018 -/* 001BC 808BAFFC 2718B7A0 */ addiu $t8, $t8, %lo(D_808BB7A0) ## $t8 = 808BB7A0 -/* 001C0 808BB000 0C021344 */ jal Item_Give -/* 001C4 808BB004 2405003C */ addiu $a1, $zero, 0x003C ## $a1 = 0000003C -/* 001C8 808BB008 3C0F808C */ lui $t7, %hi(D_808BB2F0) ## $t7 = 808C0000 -/* 001CC 808BB00C 25EFB2F0 */ addiu $t7, $t7, %lo(D_808BB2F0) ## $t7 = 808BB2F0 -/* 001D0 808BB010 10000002 */ beq $zero, $zero, .L808BB01C -/* 001D4 808BB014 AE2F1D68 */ sw $t7, 0x1D68($s1) ## 00001D68 -.L808BB018: -/* 001D8 808BB018 AE381D68 */ sw $t8, 0x1D68($s1) ## 00001D68 -.L808BB01C: -/* 001DC 808BB01C 3C041000 */ lui $a0, 0x1000 ## $a0 = 10000000 -/* 001E0 808BB020 0C03E803 */ jal Audio_SetBGM - -/* 001E4 808BB024 348400FF */ ori $a0, $a0, 0x00FF ## $a0 = 100000FF -/* 001E8 808BB028 0C03E803 */ jal Audio_SetBGM - -/* 001EC 808BB02C 24040053 */ addiu $a0, $zero, 0x0053 ## $a0 = 00000053 -/* 001F0 808BB030 8FA40020 */ lw $a0, 0x0020($sp) -/* 001F4 808BB034 24190001 */ addiu $t9, $zero, 0x0001 ## $t9 = 00000001 -/* 001F8 808BB038 A2191414 */ sb $t9, 0x1414($s0) ## 8015FA74 -/* 001FC 808BB03C 3C05808C */ lui $a1, %hi(func_808BB0AC) ## $a1 = 808C0000 -/* 00200 808BB040 24A5B0AC */ addiu $a1, $a1, %lo(func_808BB0AC) ## $a1 = 808BB0AC -/* 00204 808BB044 0C22EB90 */ jal func_808BAE40 -/* 00208 808BB048 AC800118 */ sw $zero, 0x0118($a0) ## 00000118 -/* 0020C 808BB04C 10000008 */ beq $zero, $zero, .L808BB070 -/* 00210 808BB050 8E081360 */ lw $t0, 0x1360($s0) ## 8015F9C0 -.L808BB054: -/* 00214 808BB054 0C00B821 */ jal func_8002E084 -/* 00218 808BB058 24052000 */ addiu $a1, $zero, 0x2000 ## $a1 = 00002000 -/* 0021C 808BB05C 10400003 */ beq $v0, $zero, .L808BB06C -/* 00220 808BB060 8FA40020 */ lw $a0, 0x0020($sp) -/* 00224 808BB064 0C00BD60 */ jal func_8002F580 -/* 00228 808BB068 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -.L808BB06C: -/* 0022C 808BB06C 8E081360 */ lw $t0, 0x1360($s0) ## 8015F9C0 -.L808BB070: -/* 00230 808BB070 24010005 */ addiu $at, $zero, 0x0005 ## $at = 00000005 -/* 00234 808BB074 15010008 */ bne $t0, $at, .L808BB098 -/* 00238 808BB078 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 0023C 808BB07C 02211021 */ addu $v0, $s1, $at -/* 00240 808BB080 84431D30 */ lh $v1, 0x1D30($v0) ## 00001D30 -/* 00244 808BB084 18600003 */ blez $v1, .L808BB094 -/* 00248 808BB088 2469FFFF */ addiu $t1, $v1, 0xFFFF ## $t1 = FFFFFFFF -/* 0024C 808BB08C 10000002 */ beq $zero, $zero, .L808BB098 -/* 00250 808BB090 A4491D30 */ sh $t1, 0x1D30($v0) ## 00001D30 -.L808BB094: -/* 00254 808BB094 A4401D30 */ sh $zero, 0x1D30($v0) ## 00001D30 -.L808BB098: -/* 00258 808BB098 8FBF001C */ lw $ra, 0x001C($sp) -/* 0025C 808BB09C 8FB00014 */ lw $s0, 0x0014($sp) -/* 00260 808BB0A0 8FB10018 */ lw $s1, 0x0018($sp) -/* 00264 808BB0A4 03E00008 */ jr $ra -/* 00268 808BB0A8 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Toki_Swd/func_808BB0AC.s b/asm/non_matchings/overlays/actors/ovl_Bg_Toki_Swd/func_808BB0AC.s deleted file mode 100644 index 714956b3c3..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Toki_Swd/func_808BB0AC.s +++ /dev/null @@ -1,39 +0,0 @@ -glabel func_808BB0AC -/* 0026C 808BB0AC 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00270 808BB0B0 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00274 808BB0B4 AFA5001C */ sw $a1, 0x001C($sp) -/* 00278 808BB0B8 0C00BD04 */ jal func_8002F410 -/* 0027C 808BB0BC AFA40018 */ sw $a0, 0x0018($sp) -/* 00280 808BB0C0 10400012 */ beq $v0, $zero, .L808BB10C -/* 00284 808BB0C4 8FA40018 */ lw $a0, 0x0018($sp) -/* 00288 808BB0C8 3C0E8016 */ lui $t6, 0x8016 ## $t6 = 80160000 -/* 0028C 808BB0CC 8DCEE664 */ lw $t6, -0x199C($t6) ## 8015E664 -/* 00290 808BB0D0 3C0F808C */ lui $t7, %hi(BgTokiSwd_Draw) ## $t7 = 808C0000 -/* 00294 808BB0D4 2405182D */ addiu $a1, $zero, 0x182D ## $a1 = 0000182D -/* 00298 808BB0D8 11C00006 */ beq $t6, $zero, .L808BB0F4 -/* 0029C 808BB0DC 25EFB1C4 */ addiu $t7, $t7, %lo(BgTokiSwd_Draw) ## $t7 = 808BB1C4 -/* 002A0 808BB0E0 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 002A4 808BB0E4 AFA40018 */ sw $a0, 0x0018($sp) -/* 002A8 808BB0E8 8FA40018 */ lw $a0, 0x0018($sp) -/* 002AC 808BB0EC 10000002 */ beq $zero, $zero, .L808BB0F8 -/* 002B0 808BB0F0 AC800134 */ sw $zero, 0x0134($a0) ## 00000134 -.L808BB0F4: -/* 002B4 808BB0F4 AC8F0134 */ sw $t7, 0x0134($a0) ## 00000134 -.L808BB0F8: -/* 002B8 808BB0F8 3C05808C */ lui $a1, %hi(func_808BB128) ## $a1 = 808C0000 -/* 002BC 808BB0FC 0C22EB90 */ jal func_808BAE40 -/* 002C0 808BB100 24A5B128 */ addiu $a1, $a1, %lo(func_808BB128) ## $a1 = 808BB128 -/* 002C4 808BB104 10000005 */ beq $zero, $zero, .L808BB11C -/* 002C8 808BB108 8FBF0014 */ lw $ra, 0x0014($sp) -.L808BB10C: -/* 002CC 808BB10C 8FB8001C */ lw $t8, 0x001C($sp) -/* 002D0 808BB110 8F021C44 */ lw $v0, 0x1C44($t8) ## 00001C44 -/* 002D4 808BB114 AC440438 */ sw $a0, 0x0438($v0) ## 00000438 -/* 002D8 808BB118 8FBF0014 */ lw $ra, 0x0014($sp) -.L808BB11C: -/* 002DC 808BB11C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 002E0 808BB120 03E00008 */ jr $ra -/* 002E4 808BB124 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Toki_Swd/func_808BB128.s b/asm/non_matchings/overlays/actors/ovl_Bg_Toki_Swd/func_808BB128.s deleted file mode 100644 index 11b8e59c4e..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Toki_Swd/func_808BB128.s +++ /dev/null @@ -1,26 +0,0 @@ -glabel func_808BB128 -/* 002E8 808BB128 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 002EC 808BB12C AFA40018 */ sw $a0, 0x0018($sp) -/* 002F0 808BB130 AFBF0014 */ sw $ra, 0x0014($sp) -/* 002F4 808BB134 AFA5001C */ sw $a1, 0x001C($sp) -/* 002F8 808BB138 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 002FC 808BB13C 0C01B129 */ jal func_8006C4A4 -/* 00300 808BB140 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 -/* 00304 808BB144 5040000A */ beql $v0, $zero, .L808BB170 -/* 00308 808BB148 8FBF0014 */ lw $ra, 0x0014($sp) -/* 0030C 808BB14C 8FA2001C */ lw $v0, 0x001C($sp) -/* 00310 808BB150 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 00314 808BB154 00411021 */ addu $v0, $v0, $at -/* 00318 808BB158 84431D30 */ lh $v1, 0x1D30($v0) ## 00001D30 -/* 0031C 808BB15C 286100FF */ slti $at, $v1, 0x00FF -/* 00320 808BB160 10200002 */ beq $at, $zero, .L808BB16C -/* 00324 808BB164 246E0005 */ addiu $t6, $v1, 0x0005 ## $t6 = 00000005 -/* 00328 808BB168 A44E1D30 */ sh $t6, 0x1D30($v0) ## 00001D30 -.L808BB16C: -/* 0032C 808BB16C 8FBF0014 */ lw $ra, 0x0014($sp) -.L808BB170: -/* 00330 808BB170 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00334 808BB174 03E00008 */ jr $ra -/* 00338 808BB178 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Treemouth/BgTreemouth_Draw.s b/asm/non_matchings/overlays/actors/ovl_Bg_Treemouth/BgTreemouth_Draw.s index 105fa52095..7b625f3ecb 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Treemouth/BgTreemouth_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Treemouth/BgTreemouth_Draw.s @@ -10,7 +10,7 @@ glabel BgTreemouth_Draw /* 0073C 808BCC3C A7A90042 */ sh $t1, 0x0042($sp) /* 00740 808BCC40 27A4002C */ addiu $a0, $sp, 0x002C ## $a0 = FFFFFFE4 /* 00744 808BCC44 2407037D */ addiu $a3, $zero, 0x037D ## $a3 = 0000037D -/* 00748 808BCC48 0C031AB1 */ jal func_800C6AC4 +/* 00748 808BCC48 0C031AB1 */ jal Graph_OpenDisps /* 0074C 808BCC4C AFA5003C */ sw $a1, 0x003C($sp) /* 00750 808BCC50 8FAF004C */ lw $t7, 0x004C($sp) /* 00754 808BCC54 0C024F46 */ jal func_80093D18 @@ -128,7 +128,7 @@ glabel BgTreemouth_Draw /* 008F8 808BCDF8 24C6DA08 */ addiu $a2, $a2, %lo(D_808BDA08) ## $a2 = 808BDA08 /* 008FC 808BCDFC 27A4002C */ addiu $a0, $sp, 0x002C ## $a0 = FFFFFFE4 /* 00900 808BCE00 240703A9 */ addiu $a3, $zero, 0x03A9 ## $a3 = 000003A9 -/* 00904 808BCE04 0C031AD5 */ jal func_800C6B54 +/* 00904 808BCE04 0C031AD5 */ jal Graph_CloseDisps /* 00908 808BCE08 8F050000 */ lw $a1, 0x0000($t8) ## 00000000 /* 0090C 808BCE0C 8FBF0014 */ lw $ra, 0x0014($sp) /* 00910 808BCE10 27BD0048 */ addiu $sp, $sp, 0x0048 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Vb_Sima/BgVbSima_Draw.s b/asm/non_matchings/overlays/actors/ovl_Bg_Vb_Sima/BgVbSima_Draw.s index f40308bb14..a6c0cfb3c7 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Vb_Sima/BgVbSima_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Vb_Sima/BgVbSima_Draw.s @@ -9,7 +9,7 @@ glabel BgVbSima_Draw /* 005E0 808BE340 24C6E420 */ addiu $a2, $a2, %lo(D_808BE420) ## $a2 = 808BE420 /* 005E4 808BE344 27A4002C */ addiu $a0, $sp, 0x002C ## $a0 = FFFFFFEC /* 005E8 808BE348 2407011D */ addiu $a3, $zero, 0x011D ## $a3 = 0000011D -/* 005EC 808BE34C 0C031AB1 */ jal func_800C6AC4 +/* 005EC 808BE34C 0C031AB1 */ jal Graph_OpenDisps /* 005F0 808BE350 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 /* 005F4 808BE354 8FAF0044 */ lw $t7, 0x0044($sp) /* 005F8 808BE358 0C024F46 */ jal func_80093D18 @@ -42,7 +42,7 @@ glabel BgVbSima_Draw /* 00664 808BE3C4 24C6E448 */ addiu $a2, $a2, %lo(D_808BE448) ## $a2 = 808BE448 /* 00668 808BE3C8 27A4002C */ addiu $a0, $sp, 0x002C ## $a0 = FFFFFFEC /* 0066C 808BE3CC 24070128 */ addiu $a3, $zero, 0x0128 ## $a3 = 00000128 -/* 00670 808BE3D0 0C031AD5 */ jal func_800C6B54 +/* 00670 808BE3D0 0C031AD5 */ jal Graph_CloseDisps /* 00674 808BE3D4 8D850000 */ lw $a1, 0x0000($t4) ## 00000000 /* 00678 808BE3D8 8FBF001C */ lw $ra, 0x001C($sp) /* 0067C 808BE3DC 8FB00018 */ lw $s0, 0x0018($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Ydan_Hasi/BgYdanHasi_Draw.s b/asm/non_matchings/overlays/actors/ovl_Bg_Ydan_Hasi/BgYdanHasi_Draw.s index 2ae88db6ee..88bd3fa285 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Ydan_Hasi/BgYdanHasi_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Ydan_Hasi/BgYdanHasi_Draw.s @@ -14,7 +14,7 @@ glabel BgYdanHasi_Draw /* 005BC 808BEABC 00027080 */ sll $t6, $v0, 2 /* 005C0 808BEAC0 3C05808C */ lui $a1, %hi(D_808BEC24) ## $a1 = 808C0000 /* 005C4 808BEAC4 00AE2821 */ addu $a1, $a1, $t6 -/* 005C8 808BEAC8 0C00D498 */ jal Draw_DListOpa +/* 005C8 808BEAC8 0C00D498 */ jal Gfx_DrawDListOpa /* 005CC 808BEACC 8CA5EC24 */ lw $a1, %lo(D_808BEC24)($a1) /* 005D0 808BEAD0 10000044 */ beq $zero, $zero, .L808BEBE4 @@ -24,7 +24,7 @@ glabel BgYdanHasi_Draw /* 005DC 808BEADC 27A40050 */ addiu $a0, $sp, 0x0050 ## $a0 = FFFFFFE8 /* 005E0 808BEAE0 24C6EC30 */ addiu $a2, $a2, %lo(D_808BEC30) ## $a2 = FFFFEC30 /* 005E4 808BEAE4 24070241 */ addiu $a3, $zero, 0x0241 ## $a3 = 00000241 -/* 005E8 808BEAE8 0C031AB1 */ jal func_800C6AC4 +/* 005E8 808BEAE8 0C031AB1 */ jal Graph_OpenDisps /* 005EC 808BEAEC 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 /* 005F0 808BEAF0 0C024F61 */ jal func_80093D84 /* 005F4 808BEAF4 8E240000 */ lw $a0, 0x0000($s1) ## 00000000 @@ -54,7 +54,7 @@ glabel BgYdanHasi_Draw /* 00654 808BEB54 AFA90014 */ sw $t1, 0x0014($sp) /* 00658 808BEB58 AFB90010 */ sw $t9, 0x0010($sp) /* 0065C 808BEB5C 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 00660 808BEB60 0C0253D0 */ jal Draw_TwoTexScroll +/* 00660 808BEB60 0C0253D0 */ jal Gfx_TwoTexScroll /* 00664 808BEB64 AFA2004C */ sw $v0, 0x004C($sp) /* 00668 808BEB68 8FA8004C */ lw $t0, 0x004C($sp) /* 0066C 808BEB6C 3C0EDA38 */ lui $t6, 0xDA38 ## $t6 = DA380000 @@ -84,7 +84,7 @@ glabel BgYdanHasi_Draw /* 006CC 808BEBCC 8E250000 */ lw $a1, 0x0000($s1) ## 00000000 /* 006D0 808BEBD0 24C6EC58 */ addiu $a2, $a2, %lo(D_808BEC58) ## $a2 = 808BEC58 /* 006D4 808BEBD4 27A40050 */ addiu $a0, $sp, 0x0050 ## $a0 = FFFFFFE8 -/* 006D8 808BEBD8 0C031AD5 */ jal func_800C6B54 +/* 006D8 808BEBD8 0C031AD5 */ jal Graph_CloseDisps /* 006DC 808BEBDC 24070255 */ addiu $a3, $zero, 0x0255 ## $a3 = 00000255 /* 006E0 808BEBE0 8FBF003C */ lw $ra, 0x003C($sp) .L808BEBE4: diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Ydan_Maruta/BgYdanMaruta_Draw.s b/asm/non_matchings/overlays/actors/ovl_Bg_Ydan_Maruta/BgYdanMaruta_Draw.s index 719ad6ba12..dc96899f1c 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Ydan_Maruta/BgYdanMaruta_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Ydan_Maruta/BgYdanMaruta_Draw.s @@ -8,14 +8,14 @@ glabel BgYdanMaruta_Draw /* 00564 808BF2A4 00000000 */ nop /* 00568 808BF2A8 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 /* 0056C 808BF2AC 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 -/* 00570 808BF2B0 0C00D498 */ jal Draw_DListOpa +/* 00570 808BF2B0 0C00D498 */ jal Gfx_DrawDListOpa /* 00574 808BF2B4 24A58D88 */ addiu $a1, $a1, 0x8D88 ## $a1 = 06008D88 /* 00578 808BF2B8 10000005 */ beq $zero, $zero, .L808BF2D0 /* 0057C 808BF2BC 8FBF0014 */ lw $ra, 0x0014($sp) .L808BF2C0: /* 00580 808BF2C0 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 00584 808BF2C4 0C00D498 */ jal Draw_DListOpa +/* 00584 808BF2C4 0C00D498 */ jal Gfx_DrawDListOpa /* 00588 808BF2C8 24A56570 */ addiu $a1, $a1, 0x6570 ## $a1 = 06006570 /* 0058C 808BF2CC 8FBF0014 */ lw $ra, 0x0014($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Ydan_Sp/BgYdanSp_Draw.s b/asm/non_matchings/overlays/actors/ovl_Bg_Ydan_Sp/BgYdanSp_Draw.s index 6f92d495c7..4e4f47c40b 100644 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Ydan_Sp/BgYdanSp_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Bg_Ydan_Sp/BgYdanSp_Draw.s @@ -1,27 +1,27 @@ glabel BgYdanSp_Draw /* 011B8 808C05C8 27BDFF40 */ addiu $sp, $sp, 0xFF40 ## $sp = FFFFFF40 -/* 011BC 808C05CC AFB40030 */ sw $s4, 0x0030($sp) +/* 011BC 808C05CC AFB40030 */ sw $s4, 0x0030($sp) /* 011C0 808C05D0 00A0A025 */ or $s4, $a1, $zero ## $s4 = 00000000 -/* 011C4 808C05D4 AFBF0034 */ sw $ra, 0x0034($sp) -/* 011C8 808C05D8 AFB3002C */ sw $s3, 0x002C($sp) -/* 011CC 808C05DC AFB20028 */ sw $s2, 0x0028($sp) -/* 011D0 808C05E0 AFB10024 */ sw $s1, 0x0024($sp) -/* 011D4 808C05E4 AFB00020 */ sw $s0, 0x0020($sp) -/* 011D8 808C05E8 F7B40018 */ sdc1 $f20, 0x0018($sp) +/* 011C4 808C05D4 AFBF0034 */ sw $ra, 0x0034($sp) +/* 011C8 808C05D8 AFB3002C */ sw $s3, 0x002C($sp) +/* 011CC 808C05DC AFB20028 */ sw $s2, 0x0028($sp) +/* 011D0 808C05E0 AFB10024 */ sw $s1, 0x0024($sp) +/* 011D4 808C05E4 AFB00020 */ sw $s0, 0x0020($sp) +/* 011D8 808C05E8 F7B40018 */ sdc1 $f20, 0x0018($sp) /* 011DC 808C05EC 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 /* 011E0 808C05F0 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 011E4 808C05F4 3C06808C */ lui $a2, %hi(D_808C09F0) ## $a2 = 808C0000 /* 011E8 808C05F8 24C609F0 */ addiu $a2, $a2, %lo(D_808C09F0) ## $a2 = 808C09F0 /* 011EC 808C05FC 27A40064 */ addiu $a0, $sp, 0x0064 ## $a0 = FFFFFFA4 /* 011F0 808C0600 2407030D */ addiu $a3, $zero, 0x030D ## $a3 = 0000030D -/* 011F4 808C0604 0C031AB1 */ jal func_800C6AC4 +/* 011F4 808C0604 0C031AB1 */ jal Graph_OpenDisps /* 011F8 808C0608 00A09025 */ or $s2, $a1, $zero ## $s2 = 00000000 -/* 011FC 808C060C 0C024F61 */ jal func_80093D84 +/* 011FC 808C060C 0C024F61 */ jal func_80093D84 /* 01200 808C0610 8E840000 */ lw $a0, 0x0000($s4) ## 00000000 /* 01204 808C0614 860E001C */ lh $t6, 0x001C($s0) ## 0000001C /* 01208 808C0618 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 /* 0120C 808C061C 3C18DA38 */ lui $t8, 0xDA38 ## $t8 = DA380000 -/* 01210 808C0620 15C10014 */ bne $t6, $at, .L808C0674 +/* 01210 808C0620 15C10014 */ bne $t6, $at, .L808C0674 /* 01214 808C0624 37180003 */ ori $t8, $t8, 0x0003 ## $t8 = DA380003 /* 01218 808C0628 8E5002D0 */ lw $s0, 0x02D0($s2) ## 000002D0 /* 0121C 808C062C 3C05808C */ lui $a1, %hi(D_808C0A04) ## $a1 = 808C0000 @@ -30,7 +30,7 @@ glabel BgYdanSp_Draw /* 01228 808C0638 AE4F02D0 */ sw $t7, 0x02D0($s2) ## 000002D0 /* 0122C 808C063C AE180000 */ sw $t8, 0x0000($s0) ## 00000000 /* 01230 808C0640 8E840000 */ lw $a0, 0x0000($s4) ## 00000000 -/* 01234 808C0644 0C0346A2 */ jal Matrix_NewMtx +/* 01234 808C0644 0C0346A2 */ jal Matrix_NewMtx /* 01238 808C0648 24060313 */ addiu $a2, $zero, 0x0313 ## $a2 = 00000313 /* 0123C 808C064C AE020004 */ sw $v0, 0x0004($s0) ## 00000004 /* 01240 808C0650 8E4302D0 */ lw $v1, 0x02D0($s2) ## 000002D0 @@ -40,45 +40,45 @@ glabel BgYdanSp_Draw /* 01250 808C0660 AE5902D0 */ sw $t9, 0x02D0($s2) ## 000002D0 /* 01254 808C0664 3C08DE00 */ lui $t0, 0xDE00 ## $t0 = DE000000 /* 01258 808C0668 AC680000 */ sw $t0, 0x0000($v1) ## 00000000 -/* 0125C 808C066C 10000099 */ beq $zero, $zero, .L808C08D4 +/* 0125C 808C066C 10000099 */ beq $zero, $zero, .L808C08D4 /* 01260 808C0670 AC690004 */ sw $t1, 0x0004($v1) ## 00000004 .L808C0674: /* 01264 808C0674 8E0B0164 */ lw $t3, 0x0164($s0) ## 00000164 /* 01268 808C0678 3C0A808C */ lui $t2, %hi(func_808BFC50) ## $t2 = 808C0000 /* 0126C 808C067C 254AFC50 */ addiu $t2, $t2, %lo(func_808BFC50) ## $t2 = 808BFC50 -/* 01270 808C0680 554B0067 */ bnel $t2, $t3, .L808C0820 +/* 01270 808C0680 554B0067 */ bnel $t2, $t3, .L808C0820 /* 01274 808C0684 C610000C */ lwc1 $f16, 0x000C($s0) ## 0000000C -/* 01278 808C0688 0C034236 */ jal Matrix_Get +/* 01278 808C0688 0C034236 */ jal Matrix_Get /* 0127C 808C068C 27A40078 */ addiu $a0, $sp, 0x0078 ## $a0 = FFFFFFB8 /* 01280 808C0690 860C016A */ lh $t4, 0x016A($s0) ## 0000016A /* 01284 808C0694 24010028 */ addiu $at, $zero, 0x0028 ## $at = 00000028 -/* 01288 808C0698 55810030 */ bnel $t4, $at, .L808C075C +/* 01288 808C0698 55810030 */ bnel $t4, $at, .L808C075C /* 0128C 808C069C 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 /* 01290 808C06A0 C604000C */ lwc1 $f4, 0x000C($s0) ## 0000000C /* 01294 808C06A4 C6060028 */ lwc1 $f6, 0x0028($s0) ## 00000028 /* 01298 808C06A8 3C014120 */ lui $at, 0x4120 ## $at = 41200000 /* 0129C 808C06AC 44806000 */ mtc1 $zero, $f12 ## $f12 = 0.00 -/* 012A0 808C06B0 46062201 */ sub.s $f8, $f4, $f6 +/* 012A0 808C06B0 46062201 */ sub.s $f8, $f4, $f6 /* 012A4 808C06B4 44815000 */ mtc1 $at, $f10 ## $f10 = 10.00 -/* 012A8 808C06B8 44066000 */ mfc1 $a2, $f12 +/* 012A8 808C06B8 44066000 */ mfc1 $a2, $f12 /* 012AC 808C06BC 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 012B0 808C06C0 460A4382 */ mul.s $f14, $f8, $f10 -/* 012B4 808C06C4 0C034261 */ jal Matrix_Translate +/* 012B0 808C06C0 460A4382 */ mul.s $f14, $f8, $f10 +/* 012B4 808C06C4 0C034261 */ jal Matrix_Translate /* 012B8 808C06C8 00000000 */ nop /* 012BC 808C06CC C610000C */ lwc1 $f16, 0x000C($s0) ## 0000000C /* 012C0 808C06D0 C6120028 */ lwc1 $f18, 0x0028($s0) ## 00000028 /* 012C4 808C06D4 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 /* 012C8 808C06D8 44816000 */ mtc1 $at, $f12 ## $f12 = 1.00 -/* 012CC 808C06DC 46128101 */ sub.s $f4, $f16, $f18 +/* 012CC 808C06DC 46128101 */ sub.s $f4, $f16, $f18 /* 012D0 808C06E0 3C014120 */ lui $at, 0x4120 ## $at = 41200000 /* 012D4 808C06E4 44813000 */ mtc1 $at, $f6 ## $f6 = 10.00 /* 012D8 808C06E8 3C01808C */ lui $at, %hi(D_808C0A90) ## $at = 808C0000 -/* 012DC 808C06EC C42A0A90 */ lwc1 $f10, %lo(D_808C0A90)($at) -/* 012E0 808C06F0 46062200 */ add.s $f8, $f4, $f6 -/* 012E4 808C06F4 44066000 */ mfc1 $a2, $f12 +/* 012DC 808C06EC C42A0A90 */ lwc1 $f10, %lo(D_808C0A90)($at) +/* 012E0 808C06F0 46062200 */ add.s $f8, $f4, $f6 +/* 012E4 808C06F4 44066000 */ mfc1 $a2, $f12 /* 012E8 808C06F8 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 012EC 808C06FC 460A4382 */ mul.s $f14, $f8, $f10 -/* 012F0 808C0700 0C0342A3 */ jal Matrix_Scale +/* 012EC 808C06FC 460A4382 */ mul.s $f14, $f8, $f10 +/* 012F0 808C0700 0C0342A3 */ jal Matrix_Scale /* 012F4 808C0704 00000000 */ nop /* 012F8 808C0708 8E5002D0 */ lw $s0, 0x02D0($s2) ## 000002D0 /* 012FC 808C070C 3C0EDA38 */ lui $t6, 0xDA38 ## $t6 = DA380000 @@ -89,7 +89,7 @@ glabel BgYdanSp_Draw /* 01310 808C0720 AE0E0000 */ sw $t6, 0x0000($s0) ## 00000000 /* 01314 808C0724 8E840000 */ lw $a0, 0x0000($s4) ## 00000000 /* 01318 808C0728 24A50A18 */ addiu $a1, $a1, %lo(D_808C0A18) ## $a1 = 808C0A18 -/* 0131C 808C072C 0C0346A2 */ jal Matrix_NewMtx +/* 0131C 808C072C 0C0346A2 */ jal Matrix_NewMtx /* 01320 808C0730 24060328 */ addiu $a2, $zero, 0x0328 ## $a2 = 00000328 /* 01324 808C0734 AE020004 */ sw $v0, 0x0004($s0) ## 00000004 /* 01328 808C0738 8E4302D0 */ lw $v1, 0x02D0($s2) ## 000002D0 @@ -107,26 +107,26 @@ glabel BgYdanSp_Draw /* 01354 808C0764 26733850 */ addiu $s3, $s3, 0x3850 ## $s3 = 06003850 /* 01358 808C0768 00008825 */ or $s1, $zero, $zero ## $s1 = 00000000 .L808C076C: -/* 0135C 808C076C 0C03423F */ jal Matrix_Put +/* 0135C 808C076C 0C03423F */ jal Matrix_Put /* 01360 808C0770 27A40078 */ addiu $a0, $sp, 0x0078 ## $a0 = FFFFFFB8 -/* 01364 808C0774 00112C00 */ sll $a1, $s1, 16 -/* 01368 808C0778 00052C03 */ sra $a1, $a1, 16 +/* 01364 808C0774 00112C00 */ sll $a1, $s1, 16 +/* 01368 808C0778 00052C03 */ sra $a1, $a1, 16 /* 0136C 808C077C 2404FA60 */ addiu $a0, $zero, 0xFA60 ## $a0 = FFFFFA60 /* 01370 808C0780 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 01374 808C0784 0C034421 */ jal Matrix_RotateXYZ +/* 01374 808C0784 0C034421 */ jal Matrix_RotateZYX /* 01378 808C0788 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 /* 0137C 808C078C 3C01442F */ lui $at, 0x442F ## $at = 442F0000 /* 01380 808C0790 44817000 */ mtc1 $at, $f14 ## $f14 = 700.00 /* 01384 808C0794 44806000 */ mtc1 $zero, $f12 ## $f12 = 0.00 /* 01388 808C0798 3C06C461 */ lui $a2, 0xC461 ## $a2 = C4610000 -/* 0138C 808C079C 0C034261 */ jal Matrix_Translate +/* 0138C 808C079C 0C034261 */ jal Matrix_Translate /* 01390 808C07A0 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 /* 01394 808C07A4 3C014060 */ lui $at, 0x4060 ## $at = 40600000 /* 01398 808C07A8 44816000 */ mtc1 $at, $f12 ## $f12 = 3.50 /* 0139C 808C07AC 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 /* 013A0 808C07B0 44817000 */ mtc1 $at, $f14 ## $f14 = 5.00 -/* 013A4 808C07B4 4406A000 */ mfc1 $a2, $f20 -/* 013A8 808C07B8 0C0342A3 */ jal Matrix_Scale +/* 013A4 808C07B4 4406A000 */ mfc1 $a2, $f20 +/* 013A8 808C07B8 0C0342A3 */ jal Matrix_Scale /* 013AC 808C07BC 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 /* 013B0 808C07C0 8E5002D0 */ lw $s0, 0x02D0($s2) ## 000002D0 /* 013B4 808C07C4 3C09DA38 */ lui $t1, 0xDA38 ## $t1 = DA380000 @@ -137,7 +137,7 @@ glabel BgYdanSp_Draw /* 013C8 808C07D8 AE090000 */ sw $t1, 0x0000($s0) ## 00000000 /* 013CC 808C07DC 8E840000 */ lw $a0, 0x0000($s4) ## 00000000 /* 013D0 808C07E0 24A50A2C */ addiu $a1, $a1, %lo(D_808C0A2C) ## $a1 = 808C0A2C -/* 013D4 808C07E4 0C0346A2 */ jal Matrix_NewMtx +/* 013D4 808C07E4 0C0346A2 */ jal Matrix_NewMtx /* 013D8 808C07E8 2406033E */ addiu $a2, $zero, 0x033E ## $a2 = 0000033E /* 013DC 808C07EC AE020004 */ sw $v0, 0x0004($s0) ## 00000004 /* 013E0 808C07F0 8E4302D0 */ lw $v1, 0x02D0($s2) ## 000002D0 @@ -147,36 +147,36 @@ glabel BgYdanSp_Draw /* 013F0 808C0800 AE4A02D0 */ sw $t2, 0x02D0($s2) ## 000002D0 /* 013F4 808C0804 3C0BDE00 */ lui $t3, 0xDE00 ## $t3 = DE000000 /* 013F8 808C0808 AC6B0000 */ sw $t3, 0x0000($v1) ## 00000000 -/* 013FC 808C080C 1621FFD7 */ bne $s1, $at, .L808C076C +/* 013FC 808C080C 1621FFD7 */ bne $s1, $at, .L808C076C /* 01400 808C0810 AC730004 */ sw $s3, 0x0004($v1) ## 00000004 -/* 01404 808C0814 1000002F */ beq $zero, $zero, .L808C08D4 +/* 01404 808C0814 1000002F */ beq $zero, $zero, .L808C08D4 /* 01408 808C0818 00000000 */ nop /* 0140C 808C081C C610000C */ lwc1 $f16, 0x000C($s0) ## 0000000C .L808C0820: /* 01410 808C0820 C6120028 */ lwc1 $f18, 0x0028($s0) ## 00000028 /* 01414 808C0824 3C014120 */ lui $at, 0x4120 ## $at = 41200000 /* 01418 808C0828 44813000 */ mtc1 $at, $f6 ## $f6 = 10.00 -/* 0141C 808C082C 46128101 */ sub.s $f4, $f16, $f18 +/* 0141C 808C082C 46128101 */ sub.s $f4, $f16, $f18 /* 01420 808C0830 44806000 */ mtc1 $zero, $f12 ## $f12 = 0.00 /* 01424 808C0834 24060000 */ addiu $a2, $zero, 0x0000 ## $a2 = 00000000 /* 01428 808C0838 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 0142C 808C083C 46062382 */ mul.s $f14, $f4, $f6 -/* 01430 808C0840 0C034261 */ jal Matrix_Translate +/* 0142C 808C083C 46062382 */ mul.s $f14, $f4, $f6 +/* 01430 808C0840 0C034261 */ jal Matrix_Translate /* 01434 808C0844 00000000 */ nop /* 01438 808C0848 C608000C */ lwc1 $f8, 0x000C($s0) ## 0000000C /* 0143C 808C084C C60A0028 */ lwc1 $f10, 0x0028($s0) ## 00000028 /* 01440 808C0850 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 /* 01444 808C0854 44816000 */ mtc1 $at, $f12 ## $f12 = 1.00 -/* 01448 808C0858 460A4401 */ sub.s $f16, $f8, $f10 +/* 01448 808C0858 460A4401 */ sub.s $f16, $f8, $f10 /* 0144C 808C085C 3C014120 */ lui $at, 0x4120 ## $at = 41200000 /* 01450 808C0860 44819000 */ mtc1 $at, $f18 ## $f18 = 10.00 /* 01454 808C0864 3C01808C */ lui $at, %hi(D_808C0A94) ## $at = 808C0000 -/* 01458 808C0868 C4260A94 */ lwc1 $f6, %lo(D_808C0A94)($at) -/* 0145C 808C086C 46128100 */ add.s $f4, $f16, $f18 -/* 01460 808C0870 44066000 */ mfc1 $a2, $f12 +/* 01458 808C0868 C4260A94 */ lwc1 $f6, %lo(D_808C0A94)($at) +/* 0145C 808C086C 46128100 */ add.s $f4, $f16, $f18 +/* 01460 808C0870 44066000 */ mfc1 $a2, $f12 /* 01464 808C0874 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 01468 808C0878 46062382 */ mul.s $f14, $f4, $f6 -/* 0146C 808C087C 0C0342A3 */ jal Matrix_Scale +/* 01468 808C0878 46062382 */ mul.s $f14, $f4, $f6 +/* 0146C 808C087C 0C0342A3 */ jal Matrix_Scale /* 01470 808C0880 00000000 */ nop /* 01474 808C0884 8E5002D0 */ lw $s0, 0x02D0($s2) ## 000002D0 /* 01478 808C0888 3C0DDA38 */ lui $t5, 0xDA38 ## $t5 = DA380000 @@ -187,7 +187,7 @@ glabel BgYdanSp_Draw /* 0148C 808C089C AE0D0000 */ sw $t5, 0x0000($s0) ## 00000000 /* 01490 808C08A0 8E840000 */ lw $a0, 0x0000($s4) ## 00000000 /* 01494 808C08A4 24A50A40 */ addiu $a1, $a1, %lo(D_808C0A40) ## $a1 = 808C0A40 -/* 01498 808C08A8 0C0346A2 */ jal Matrix_NewMtx +/* 01498 808C08A8 0C0346A2 */ jal Matrix_NewMtx /* 0149C 808C08AC 24060351 */ addiu $a2, $zero, 0x0351 ## $a2 = 00000351 /* 014A0 808C08B0 AE020004 */ sw $v0, 0x0004($s0) ## 00000004 /* 014A4 808C08B4 8E4302D0 */ lw $v1, 0x02D0($s2) ## 000002D0 @@ -203,15 +203,15 @@ glabel BgYdanSp_Draw /* 014C8 808C08D8 24C60A54 */ addiu $a2, $a2, %lo(D_808C0A54) ## $a2 = 808C0A54 /* 014CC 808C08DC 27A40064 */ addiu $a0, $sp, 0x0064 ## $a0 = FFFFFFA4 /* 014D0 808C08E0 8E850000 */ lw $a1, 0x0000($s4) ## 00000000 -/* 014D4 808C08E4 0C031AD5 */ jal func_800C6B54 +/* 014D4 808C08E4 0C031AD5 */ jal Graph_CloseDisps /* 014D8 808C08E8 24070358 */ addiu $a3, $zero, 0x0358 ## $a3 = 00000358 -/* 014DC 808C08EC 8FBF0034 */ lw $ra, 0x0034($sp) -/* 014E0 808C08F0 D7B40018 */ ldc1 $f20, 0x0018($sp) -/* 014E4 808C08F4 8FB00020 */ lw $s0, 0x0020($sp) -/* 014E8 808C08F8 8FB10024 */ lw $s1, 0x0024($sp) -/* 014EC 808C08FC 8FB20028 */ lw $s2, 0x0028($sp) -/* 014F0 808C0900 8FB3002C */ lw $s3, 0x002C($sp) -/* 014F4 808C0904 8FB40030 */ lw $s4, 0x0030($sp) -/* 014F8 808C0908 03E00008 */ jr $ra +/* 014DC 808C08EC 8FBF0034 */ lw $ra, 0x0034($sp) +/* 014E0 808C08F0 D7B40018 */ ldc1 $f20, 0x0018($sp) +/* 014E4 808C08F4 8FB00020 */ lw $s0, 0x0020($sp) +/* 014E8 808C08F8 8FB10024 */ lw $s1, 0x0024($sp) +/* 014EC 808C08FC 8FB20028 */ lw $s2, 0x0028($sp) +/* 014F0 808C0900 8FB3002C */ lw $s3, 0x002C($sp) +/* 014F4 808C0904 8FB40030 */ lw $s4, 0x0030($sp) +/* 014F8 808C0908 03E00008 */ jr $ra /* 014FC 808C090C 27BD00C0 */ addiu $sp, $sp, 0x00C0 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Zg/BgZg_Destroy.s b/asm/non_matchings/overlays/actors/ovl_Bg_Zg/BgZg_Destroy.s deleted file mode 100644 index 12e174449e..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Zg/BgZg_Destroy.s +++ /dev/null @@ -1,16 +0,0 @@ -glabel BgZg_Destroy -/* 00000 808C0C20 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00004 808C0C24 AFA40018 */ sw $a0, 0x0018($sp) -/* 00008 808C0C28 8FAE0018 */ lw $t6, 0x0018($sp) -/* 0000C 808C0C2C AFBF0014 */ sw $ra, 0x0014($sp) -/* 00010 808C0C30 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 00014 808C0C34 24A50810 */ addiu $a1, $a1, 0x0810 ## $a1 = 00000810 -/* 00018 808C0C38 0C00FB56 */ jal DynaPolyInfo_Free - ## DynaPolyInfo_delReserve -/* 0001C 808C0C3C 8DC6014C */ lw $a2, 0x014C($t6) ## 0000014C -/* 00020 808C0C40 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00024 808C0C44 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00028 808C0C48 03E00008 */ jr $ra -/* 0002C 808C0C4C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Zg/BgZg_Draw.s b/asm/non_matchings/overlays/actors/ovl_Bg_Zg/BgZg_Draw.s deleted file mode 100644 index 11c8a28ef3..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Zg/BgZg_Draw.s +++ /dev/null @@ -1,32 +0,0 @@ -glabel BgZg_Draw -/* 00388 808C0FA8 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 0038C 808C0FAC AFBF0014 */ sw $ra, 0x0014($sp) -/* 00390 808C0FB0 8C820168 */ lw $v0, 0x0168($a0) ## 00000168 -/* 00394 808C0FB4 04400008 */ bltz $v0, .L808C0FD8 -/* 00398 808C0FB8 00000000 */ nop -/* 0039C 808C0FBC 1C400006 */ bgtz $v0, .L808C0FD8 -/* 003A0 808C0FC0 00027080 */ sll $t6, $v0, 2 -/* 003A4 808C0FC4 3C03808C */ lui $v1, %hi(D_808C101C) ## $v1 = 808C0000 -/* 003A8 808C0FC8 006E1821 */ addu $v1, $v1, $t6 -/* 003AC 808C0FCC 8C63101C */ lw $v1, %lo(D_808C101C)($v1) -/* 003B0 808C0FD0 14600006 */ bne $v1, $zero, .L808C0FEC -/* 003B4 808C0FD4 00000000 */ nop -.L808C0FD8: -/* 003B8 808C0FD8 3C04808C */ lui $a0, %hi(D_808C10AC) ## $a0 = 808C0000 -/* 003BC 808C0FDC 0C00084C */ jal osSyncPrintf - -/* 003C0 808C0FE0 248410AC */ addiu $a0, $a0, %lo(D_808C10AC) ## $a0 = 808C10AC -/* 003C4 808C0FE4 10000004 */ beq $zero, $zero, .L808C0FF8 -/* 003C8 808C0FE8 8FBF0014 */ lw $ra, 0x0014($sp) -.L808C0FEC: -/* 003CC 808C0FEC 0060F809 */ jalr $ra, $v1 -/* 003D0 808C0FF0 00000000 */ nop -/* 003D4 808C0FF4 8FBF0014 */ lw $ra, 0x0014($sp) -.L808C0FF8: -/* 003D8 808C0FF8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 003DC 808C0FFC 03E00008 */ jr $ra -/* 003E0 808C1000 00000000 */ nop -/* 003E4 808C1004 00000000 */ nop -/* 003E8 808C1008 00000000 */ nop -/* 003EC 808C100C 00000000 */ nop - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Zg/BgZg_Init.s b/asm/non_matchings/overlays/actors/ovl_Bg_Zg/BgZg_Init.s deleted file mode 100644 index 1d0af8010d..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Zg/BgZg_Init.s +++ /dev/null @@ -1,69 +0,0 @@ -glabel BgZg_Init -/* 001E4 808C0E04 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 001E8 808C0E08 AFA50034 */ sw $a1, 0x0034($sp) -/* 001EC 808C0E0C AFBF001C */ sw $ra, 0x001C($sp) -/* 001F0 808C0E10 AFB00018 */ sw $s0, 0x0018($sp) -/* 001F4 808C0E14 3C05808C */ lui $a1, %hi(D_808C1018) ## $a1 = 808C0000 -/* 001F8 808C0E18 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 001FC 808C0E1C 0C01E037 */ jal Actor_ProcessInitChain - -/* 00200 808C0E20 24A51018 */ addiu $a1, $a1, %lo(D_808C1018) ## $a1 = 808C1018 -/* 00204 808C0E24 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00208 808C0E28 0C010D20 */ jal DynaPolyInfo_SetActorMove - -/* 0020C 808C0E2C 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 00210 808C0E30 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 -/* 00214 808C0E34 AFA00020 */ sw $zero, 0x0020($sp) -/* 00218 808C0E38 248411D4 */ addiu $a0, $a0, 0x11D4 ## $a0 = 060011D4 -/* 0021C 808C0E3C 0C010620 */ jal DynaPolyInfo_Alloc - -/* 00220 808C0E40 27A50020 */ addiu $a1, $sp, 0x0020 ## $a1 = FFFFFFF0 -/* 00224 808C0E44 8FA40034 */ lw $a0, 0x0034($sp) -/* 00228 808C0E48 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 -/* 0022C 808C0E4C 8FA70020 */ lw $a3, 0x0020($sp) -/* 00230 808C0E50 0C00FA9D */ jal DynaPolyInfo_RegisterActor - ## DynaPolyInfo_setActor -/* 00234 808C0E54 24850810 */ addiu $a1, $a0, 0x0810 ## $a1 = 00000810 -/* 00238 808C0E58 AE02014C */ sw $v0, 0x014C($s0) ## 0000014C -/* 0023C 808C0E5C 0C230332 */ jal func_808C0CC8 -/* 00240 808C0E60 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00244 808C0E64 24010008 */ addiu $at, $zero, 0x0008 ## $at = 00000008 -/* 00248 808C0E68 10410005 */ beq $v0, $at, .L808C0E80 -/* 0024C 808C0E6C 00000000 */ nop -/* 00250 808C0E70 0C230332 */ jal func_808C0CC8 -/* 00254 808C0E74 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00258 808C0E78 24010009 */ addiu $at, $zero, 0x0009 ## $at = 00000009 -/* 0025C 808C0E7C 1441000D */ bne $v0, $at, .L808C0EB4 -.L808C0E80: -/* 00260 808C0E80 3C01808C */ lui $at, %hi(D_808C10E8) ## $at = 808C0000 -/* 00264 808C0E84 C42010E8 */ lwc1 $f0, %lo(D_808C10E8)($at) -/* 00268 808C0E88 C6040050 */ lwc1 $f4, 0x0050($s0) ## 00000050 -/* 0026C 808C0E8C C6080058 */ lwc1 $f8, 0x0058($s0) ## 00000058 -/* 00270 808C0E90 3C01808C */ lui $at, %hi(D_808C10EC) ## $at = 808C0000 -/* 00274 808C0E94 46002182 */ mul.s $f6, $f4, $f0 -/* 00278 808C0E98 C6100054 */ lwc1 $f16, 0x0054($s0) ## 00000054 -/* 0027C 808C0E9C 46004282 */ mul.s $f10, $f8, $f0 -/* 00280 808C0EA0 E6060050 */ swc1 $f6, 0x0050($s0) ## 00000050 -/* 00284 808C0EA4 E60A0058 */ swc1 $f10, 0x0058($s0) ## 00000058 -/* 00288 808C0EA8 C43210EC */ lwc1 $f18, %lo(D_808C10EC)($at) -/* 0028C 808C0EAC 46128102 */ mul.s $f4, $f16, $f18 -/* 00290 808C0EB0 E6040054 */ swc1 $f4, 0x0054($s0) ## 00000054 -.L808C0EB4: -/* 00294 808C0EB4 AE000164 */ sw $zero, 0x0164($s0) ## 00000164 -/* 00298 808C0EB8 AE000168 */ sw $zero, 0x0168($s0) ## 00000168 -/* 0029C 808C0EBC 8FA50034 */ lw $a1, 0x0034($sp) -/* 002A0 808C0EC0 0C230326 */ jal func_808C0C98 -/* 002A4 808C0EC4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 002A8 808C0EC8 50400004 */ beql $v0, $zero, .L808C0EDC -/* 002AC 808C0ECC 8FBF001C */ lw $ra, 0x001C($sp) -/* 002B0 808C0ED0 0C00B55C */ jal Actor_Kill - -/* 002B4 808C0ED4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 002B8 808C0ED8 8FBF001C */ lw $ra, 0x001C($sp) -.L808C0EDC: -/* 002BC 808C0EDC 8FB00018 */ lw $s0, 0x0018($sp) -/* 002C0 808C0EE0 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 002C4 808C0EE4 03E00008 */ jr $ra -/* 002C8 808C0EE8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Zg/BgZg_Update.s b/asm/non_matchings/overlays/actors/ovl_Bg_Zg/BgZg_Update.s deleted file mode 100644 index a60ee97dd9..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Zg/BgZg_Update.s +++ /dev/null @@ -1,30 +0,0 @@ -glabel BgZg_Update -/* 00188 808C0DA8 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 0018C 808C0DAC AFBF0014 */ sw $ra, 0x0014($sp) -/* 00190 808C0DB0 8C820164 */ lw $v0, 0x0164($a0) ## 00000164 -/* 00194 808C0DB4 04400008 */ bltz $v0, .L808C0DD8 -/* 00198 808C0DB8 28410002 */ slti $at, $v0, 0x0002 -/* 0019C 808C0DBC 10200006 */ beq $at, $zero, .L808C0DD8 -/* 001A0 808C0DC0 00027080 */ sll $t6, $v0, 2 -/* 001A4 808C0DC4 3C03808C */ lui $v1, %hi(D_808C1010) ## $v1 = 808C0000 -/* 001A8 808C0DC8 006E1821 */ addu $v1, $v1, $t6 -/* 001AC 808C0DCC 8C631010 */ lw $v1, %lo(D_808C1010)($v1) -/* 001B0 808C0DD0 14600006 */ bne $v1, $zero, .L808C0DEC -/* 001B4 808C0DD4 00000000 */ nop -.L808C0DD8: -/* 001B8 808C0DD8 3C04808C */ lui $a0, %hi(D_808C1040) ## $a0 = 808C0000 -/* 001BC 808C0DDC 0C00084C */ jal osSyncPrintf - -/* 001C0 808C0DE0 24841040 */ addiu $a0, $a0, %lo(D_808C1040) ## $a0 = 808C1040 -/* 001C4 808C0DE4 10000004 */ beq $zero, $zero, .L808C0DF8 -/* 001C8 808C0DE8 8FBF0014 */ lw $ra, 0x0014($sp) -.L808C0DEC: -/* 001CC 808C0DEC 0060F809 */ jalr $ra, $v1 -/* 001D0 808C0DF0 00000000 */ nop -/* 001D4 808C0DF4 8FBF0014 */ lw $ra, 0x0014($sp) -.L808C0DF8: -/* 001D8 808C0DF8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 001DC 808C0DFC 03E00008 */ jr $ra -/* 001E0 808C0E00 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Zg/func_808C0C50.s b/asm/non_matchings/overlays/actors/ovl_Bg_Zg/func_808C0C50.s deleted file mode 100644 index 01a7dc5a76..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Zg/func_808C0C50.s +++ /dev/null @@ -1,22 +0,0 @@ -glabel func_808C0C50 -/* 00030 808C0C50 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 00034 808C0C54 AFA40020 */ sw $a0, 0x0020($sp) -/* 00038 808C0C58 8FA50020 */ lw $a1, 0x0020($sp) -/* 0003C 808C0C5C 3C078013 */ lui $a3, 0x8013 ## $a3 = 80130000 -/* 00040 808C0C60 3C0E8013 */ lui $t6, 0x8013 ## $t6 = 80130000 -/* 00044 808C0C64 24E733E0 */ addiu $a3, $a3, 0x33E0 ## $a3 = 801333E0 -/* 00048 808C0C68 AFBF001C */ sw $ra, 0x001C($sp) -/* 0004C 808C0C6C 25CE33E8 */ addiu $t6, $t6, 0x33E8 ## $t6 = 801333E8 -/* 00050 808C0C70 AFAE0014 */ sw $t6, 0x0014($sp) -/* 00054 808C0C74 AFA70010 */ sw $a3, 0x0010($sp) -/* 00058 808C0C78 24042859 */ addiu $a0, $zero, 0x2859 ## $a0 = 00002859 -/* 0005C 808C0C7C 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 -/* 00060 808C0C80 0C03DCE3 */ jal Audio_PlaySoundGeneral - -/* 00064 808C0C84 24A500E4 */ addiu $a1, $a1, 0x00E4 ## $a1 = 000000E4 -/* 00068 808C0C88 8FBF001C */ lw $ra, 0x001C($sp) -/* 0006C 808C0C8C 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 00070 808C0C90 03E00008 */ jr $ra -/* 00074 808C0C94 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Zg/func_808C0C98.s b/asm/non_matchings/overlays/actors/ovl_Bg_Zg/func_808C0C98.s deleted file mode 100644 index fdf9c48315..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Zg/func_808C0C98.s +++ /dev/null @@ -1,16 +0,0 @@ -glabel func_808C0C98 -/* 00078 808C0C98 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 0007C 808C0C9C AFBF0014 */ sw $ra, 0x0014($sp) -/* 00080 808C0CA0 00A03825 */ or $a3, $a1, $zero ## $a3 = 00000000 -/* 00084 808C0CA4 8485001C */ lh $a1, 0x001C($a0) ## 0000001C -/* 00088 808C0CA8 00E02025 */ or $a0, $a3, $zero ## $a0 = 00000000 -/* 0008C 808C0CAC 00052A03 */ sra $a1, $a1, 8 -/* 00090 808C0CB0 0C00B2D0 */ jal Flags_GetSwitch - -/* 00094 808C0CB4 30A500FF */ andi $a1, $a1, 0x00FF ## $a1 = 00000000 -/* 00098 808C0CB8 8FBF0014 */ lw $ra, 0x0014($sp) -/* 0009C 808C0CBC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 000A0 808C0CC0 03E00008 */ jr $ra -/* 000A4 808C0CC4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Zg/func_808C0CC8.s b/asm/non_matchings/overlays/actors/ovl_Bg_Zg/func_808C0CC8.s deleted file mode 100644 index 37811b7e0c..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Zg/func_808C0CC8.s +++ /dev/null @@ -1,6 +0,0 @@ -glabel func_808C0CC8 -/* 000A8 808C0CC8 8483001C */ lh $v1, 0x001C($a0) ## 0000001C -/* 000AC 808C0CCC 03E00008 */ jr $ra -/* 000B0 808C0CD0 306200FF */ andi $v0, $v1, 0x00FF ## $v0 = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Zg/func_808C0CD4.s b/asm/non_matchings/overlays/actors/ovl_Bg_Zg/func_808C0CD4.s deleted file mode 100644 index 78c0d2e9ca..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Zg/func_808C0CD4.s +++ /dev/null @@ -1,17 +0,0 @@ -glabel func_808C0CD4 -/* 000B4 808C0CD4 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 000B8 808C0CD8 AFBF0014 */ sw $ra, 0x0014($sp) -/* 000BC 808C0CDC 0C230326 */ jal func_808C0C98 -/* 000C0 808C0CE0 AFA40018 */ sw $a0, 0x0018($sp) -/* 000C4 808C0CE4 10400004 */ beq $v0, $zero, .L808C0CF8 -/* 000C8 808C0CE8 8FA40018 */ lw $a0, 0x0018($sp) -/* 000CC 808C0CEC 240E0001 */ addiu $t6, $zero, 0x0001 ## $t6 = 00000001 -/* 000D0 808C0CF0 0C230314 */ jal func_808C0C50 -/* 000D4 808C0CF4 AC8E0164 */ sw $t6, 0x0164($a0) ## 00000164 -.L808C0CF8: -/* 000D8 808C0CF8 8FBF0014 */ lw $ra, 0x0014($sp) -/* 000DC 808C0CFC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 000E0 808C0D00 03E00008 */ jr $ra -/* 000E4 808C0D04 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Zg/func_808C0D08.s b/asm/non_matchings/overlays/actors/ovl_Bg_Zg/func_808C0D08.s deleted file mode 100644 index 948fcbad58..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Zg/func_808C0D08.s +++ /dev/null @@ -1,45 +0,0 @@ -glabel func_808C0D08 -/* 000E8 808C0D08 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 000EC 808C0D0C 2442FA90 */ addiu $v0, $v0, 0xFA90 ## $v0 = 8015FA90 -/* 000F0 808C0D10 8C4E0000 */ lw $t6, 0x0000($v0) ## 8015FA90 -/* 000F4 808C0D14 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 000F8 808C0D18 AFBF0014 */ sw $ra, 0x0014($sp) -/* 000FC 808C0D1C AFA5001C */ sw $a1, 0x001C($sp) -/* 00100 808C0D20 85CF1474 */ lh $t7, 0x1474($t6) ## 00001474 -/* 00104 808C0D24 3C01808C */ lui $at, %hi(D_808C10E4) ## $at = 808C0000 -/* 00108 808C0D28 C42010E4 */ lwc1 $f0, %lo(D_808C10E4)($at) -/* 0010C 808C0D2C 448F2000 */ mtc1 $t7, $f4 ## $f4 = 0.00 -/* 00110 808C0D30 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 -/* 00114 808C0D34 44814000 */ mtc1 $at, $f8 ## $f8 = 20.00 -/* 00118 808C0D38 468021A0 */ cvt.s.w $f6, $f4 -/* 0011C 808C0D3C C4920028 */ lwc1 $f18, 0x0028($a0) ## 00000028 -/* 00120 808C0D40 3C014348 */ lui $at, 0x4348 ## $at = 43480000 -/* 00124 808C0D44 46083280 */ add.s $f10, $f6, $f8 -/* 00128 808C0D48 46005402 */ mul.s $f16, $f10, $f0 -/* 0012C 808C0D4C 46109100 */ add.s $f4, $f18, $f16 -/* 00130 808C0D50 44819000 */ mtc1 $at, $f18 ## $f18 = 200.00 -/* 00134 808C0D54 E4840028 */ swc1 $f4, 0x0028($a0) ## 00000028 -/* 00138 808C0D58 8C580000 */ lw $t8, 0x0000($v0) ## 8015FA90 -/* 0013C 808C0D5C C4860028 */ lwc1 $f6, 0x0028($a0) ## 00000028 -/* 00140 808C0D60 87191476 */ lh $t9, 0x1476($t8) ## 00001476 -/* 00144 808C0D64 44994000 */ mtc1 $t9, $f8 ## $f8 = 0.00 -/* 00148 808C0D68 00000000 */ nop -/* 0014C 808C0D6C 468042A0 */ cvt.s.w $f10, $f8 -/* 00150 808C0D70 C488000C */ lwc1 $f8, 0x000C($a0) ## 0000000C -/* 00154 808C0D74 46125400 */ add.s $f16, $f10, $f18 -/* 00158 808C0D78 46008102 */ mul.s $f4, $f16, $f0 -/* 0015C 808C0D7C 46082280 */ add.s $f10, $f4, $f8 -/* 00160 808C0D80 4606503E */ c.le.s $f10, $f6 -/* 00164 808C0D84 00000000 */ nop -/* 00168 808C0D88 45020004 */ bc1fl .L808C0D9C -/* 0016C 808C0D8C 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00170 808C0D90 0C00B55C */ jal Actor_Kill - -/* 00174 808C0D94 00000000 */ nop -/* 00178 808C0D98 8FBF0014 */ lw $ra, 0x0014($sp) -.L808C0D9C: -/* 0017C 808C0D9C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00180 808C0DA0 03E00008 */ jr $ra -/* 00184 808C0DA4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Bg_Zg/func_808C0EEC.s b/asm/non_matchings/overlays/actors/ovl_Bg_Zg/func_808C0EEC.s deleted file mode 100644 index 198f798de0..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Bg_Zg/func_808C0EEC.s +++ /dev/null @@ -1,50 +0,0 @@ -glabel func_808C0EEC -/* 002CC 808C0EEC 27BDFFB8 */ addiu $sp, $sp, 0xFFB8 ## $sp = FFFFFFB8 -/* 002D0 808C0EF0 AFBF001C */ sw $ra, 0x001C($sp) -/* 002D4 808C0EF4 AFB00018 */ sw $s0, 0x0018($sp) -/* 002D8 808C0EF8 AFA40048 */ sw $a0, 0x0048($sp) -/* 002DC 808C0EFC AFA5004C */ sw $a1, 0x004C($sp) -/* 002E0 808C0F00 8CB00000 */ lw $s0, 0x0000($a1) ## 00000000 -/* 002E4 808C0F04 3C06808C */ lui $a2, %hi(D_808C107C) ## $a2 = 808C0000 -/* 002E8 808C0F08 24C6107C */ addiu $a2, $a2, %lo(D_808C107C) ## $a2 = 808C107C -/* 002EC 808C0F0C 27A40030 */ addiu $a0, $sp, 0x0030 ## $a0 = FFFFFFE8 -/* 002F0 808C0F10 24070137 */ addiu $a3, $zero, 0x0137 ## $a3 = 00000137 -/* 002F4 808C0F14 0C031AB1 */ jal func_800C6AC4 -/* 002F8 808C0F18 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 002FC 808C0F1C 0C024F46 */ jal func_80093D18 -/* 00300 808C0F20 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00304 808C0F24 8E0302C0 */ lw $v1, 0x02C0($s0) ## 000002C0 -/* 00308 808C0F28 3C18DA38 */ lui $t8, 0xDA38 ## $t8 = DA380000 -/* 0030C 808C0F2C 37180003 */ ori $t8, $t8, 0x0003 ## $t8 = DA380003 -/* 00310 808C0F30 246F0008 */ addiu $t7, $v1, 0x0008 ## $t7 = 00000008 -/* 00314 808C0F34 AE0F02C0 */ sw $t7, 0x02C0($s0) ## 000002C0 -/* 00318 808C0F38 3C05808C */ lui $a1, %hi(D_808C108C) ## $a1 = 808C0000 -/* 0031C 808C0F3C AC780000 */ sw $t8, 0x0000($v1) ## 00000000 -/* 00320 808C0F40 24A5108C */ addiu $a1, $a1, %lo(D_808C108C) ## $a1 = 808C108C -/* 00324 808C0F44 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00328 808C0F48 2406013B */ addiu $a2, $zero, 0x013B ## $a2 = 0000013B -/* 0032C 808C0F4C 0C0346A2 */ jal Matrix_NewMtx -/* 00330 808C0F50 AFA3002C */ sw $v1, 0x002C($sp) -/* 00334 808C0F54 8FA7002C */ lw $a3, 0x002C($sp) -/* 00338 808C0F58 3C090600 */ lui $t1, 0x0600 ## $t1 = 06000000 -/* 0033C 808C0F5C 25291080 */ addiu $t1, $t1, 0x1080 ## $t1 = 06001080 -/* 00340 808C0F60 ACE20004 */ sw $v0, 0x0004($a3) ## 00000004 -/* 00344 808C0F64 8E0302C0 */ lw $v1, 0x02C0($s0) ## 000002C0 -/* 00348 808C0F68 3C08DE00 */ lui $t0, 0xDE00 ## $t0 = DE000000 -/* 0034C 808C0F6C 3C06808C */ lui $a2, %hi(D_808C109C) ## $a2 = 808C0000 -/* 00350 808C0F70 24790008 */ addiu $t9, $v1, 0x0008 ## $t9 = 00000008 -/* 00354 808C0F74 AE1902C0 */ sw $t9, 0x02C0($s0) ## 000002C0 -/* 00358 808C0F78 24C6109C */ addiu $a2, $a2, %lo(D_808C109C) ## $a2 = 808C109C -/* 0035C 808C0F7C 24070140 */ addiu $a3, $zero, 0x0140 ## $a3 = 00000140 -/* 00360 808C0F80 27A40030 */ addiu $a0, $sp, 0x0030 ## $a0 = FFFFFFE8 -/* 00364 808C0F84 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 00368 808C0F88 AC690004 */ sw $t1, 0x0004($v1) ## 00000004 -/* 0036C 808C0F8C 0C031AD5 */ jal func_800C6B54 -/* 00370 808C0F90 AC680000 */ sw $t0, 0x0000($v1) ## 00000000 -/* 00374 808C0F94 8FBF001C */ lw $ra, 0x001C($sp) -/* 00378 808C0F98 8FB00018 */ lw $s0, 0x0018($sp) -/* 0037C 808C0F9C 27BD0048 */ addiu $sp, $sp, 0x0048 ## $sp = 00000000 -/* 00380 808C0FA0 03E00008 */ jr $ra -/* 00384 808C0FA4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/BossDodongo_Destroy.s b/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/BossDodongo_Destroy.s index 13e0880d8c..78b6e51015 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/BossDodongo_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/BossDodongo_Destroy.s @@ -1,17 +1,17 @@ glabel BossDodongo_Destroy /* 00AB8 808C1C48 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00ABC 808C1C4C AFBF0014 */ sw $ra, 0x0014($sp) -/* 00AC0 808C1C50 AFA40018 */ sw $a0, 0x0018($sp) -/* 00AC4 808C1C54 AFA5001C */ sw $a1, 0x001C($sp) -/* 00AC8 808C1C58 0C0295BC */ jal func_800A56F0 +/* 00ABC 808C1C4C AFBF0014 */ sw $ra, 0x0014($sp) +/* 00AC0 808C1C50 AFA40018 */ sw $a0, 0x0018($sp) +/* 00AC4 808C1C54 AFA5001C */ sw $a1, 0x001C($sp) +/* 00AC8 808C1C58 0C0295BC */ jal SkelAnime_Free /* 00ACC 808C1C5C 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 00AD0 808C1C60 8FA50018 */ lw $a1, 0x0018($sp) -/* 00AD4 808C1C64 8FA4001C */ lw $a0, 0x001C($sp) -/* 00AD8 808C1C68 0C016F32 */ jal func_8005BCC8 +/* 00AD0 808C1C60 8FA50018 */ lw $a1, 0x0018($sp) +/* 00AD4 808C1C64 8FA4001C */ lw $a0, 0x001C($sp) +/* 00AD8 808C1C68 0C016F32 */ jal func_8005BCC8 /* 00ADC 808C1C6C 24A50440 */ addiu $a1, $a1, 0x0440 ## $a1 = 00000440 -/* 00AE0 808C1C70 8FBF0014 */ lw $ra, 0x0014($sp) +/* 00AE0 808C1C70 8FBF0014 */ lw $ra, 0x0014($sp) /* 00AE4 808C1C74 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00AE8 808C1C78 03E00008 */ jr $ra +/* 00AE8 808C1C78 03E00008 */ jr $ra /* 00AEC 808C1C7C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/BossDodongo_Draw.s b/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/BossDodongo_Draw.s index 097904281a..98846d3935 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/BossDodongo_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/BossDodongo_Draw.s @@ -11,7 +11,7 @@ glabel BossDodongo_Draw /* 03B04 808C4C94 24C6A5DC */ addiu $a2, $a2, %lo(D_808CA5DC) ## $a2 = 808CA5DC /* 03B08 808C4C98 27A4003C */ addiu $a0, $sp, 0x003C ## $a0 = FFFFFFE4 /* 03B0C 808C4C9C 24070F52 */ addiu $a3, $zero, 0x0F52 ## $a3 = 00000F52 -/* 03B10 808C4CA0 0C031AB1 */ jal func_800C6AC4 +/* 03B10 808C4CA0 0C031AB1 */ jal Graph_OpenDisps /* 03B14 808C4CA4 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 /* 03B18 808C4CA8 0C024F46 */ jal func_80093D18 /* 03B1C 808C4CAC 8E440000 */ lw $a0, 0x0000($s2) ## 00000000 @@ -29,7 +29,7 @@ glabel BossDodongo_Draw /* 03B4C 808C4CDC AFAF0014 */ sw $t7, 0x0014($sp) /* 03B50 808C4CE0 AFA00010 */ sw $zero, 0x0010($sp) /* 03B54 808C4CE4 240500FF */ addiu $a1, $zero, 0x00FF ## $a1 = 000000FF -/* 03B58 808C4CE8 0C024CDC */ jal func_80093370 +/* 03B58 808C4CE8 0C024CDC */ jal Gfx_SetFog /* 03B5C 808C4CEC 240700FF */ addiu $a3, $zero, 0x00FF ## $a3 = 000000FF /* 03B60 808C4CF0 10000073 */ beq $zero, $zero, .L808C4EC0 /* 03B64 808C4CF4 AE2202C0 */ sw $v0, 0x02C0($s1) ## 000002C0 @@ -154,7 +154,7 @@ glabel BossDodongo_Draw /* 03D18 808C4EA8 C6080220 */ lwc1 $f8, 0x0220($s0) ## 00000220 /* 03D1C 808C4EAC 4600428D */ trunc.w.s $f10, $f8 /* 03D20 808C4EB0 440D5000 */ mfc1 $t5, $f10 -/* 03D24 808C4EB4 0C024CDC */ jal func_80093370 +/* 03D24 808C4EB4 0C024CDC */ jal Gfx_SetFog /* 03D28 808C4EB8 AFAD0018 */ sw $t5, 0x0018($sp) /* 03D2C 808C4EBC AE2202C0 */ sw $v0, 0x02C0($s1) ## 000002C0 .L808C4EC0: @@ -192,7 +192,7 @@ glabel BossDodongo_Draw /* 03DA8 808C4F38 24C6A5F0 */ addiu $a2, $a2, %lo(D_808CA5F0) ## $a2 = 808CA5F0 /* 03DAC 808C4F3C 8E450000 */ lw $a1, 0x0000($s2) ## 00000000 /* 03DB0 808C4F40 27A4003C */ addiu $a0, $sp, 0x003C ## $a0 = FFFFFFE4 -/* 03DB4 808C4F44 0C031AD5 */ jal func_800C6B54 +/* 03DB4 808C4F44 0C031AD5 */ jal Graph_CloseDisps /* 03DB8 808C4F48 24070F8D */ addiu $a3, $zero, 0x0F8D ## $a3 = 00000F8D /* 03DBC 808C4F4C 0C231B7A */ jal func_808C6DE8 /* 03DC0 808C4F50 02402025 */ or $a0, $s2, $zero ## $a0 = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/BossDodongo_Init.s b/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/BossDodongo_Init.s index da157b61e5..a5a09b4938 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/BossDodongo_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/BossDodongo_Init.s @@ -1,19 +1,19 @@ glabel BossDodongo_Init /* 007E0 808C1970 27BDFFA0 */ addiu $sp, $sp, 0xFFA0 ## $sp = FFFFFFA0 -/* 007E4 808C1974 AFB30040 */ sw $s3, 0x0040($sp) +/* 007E4 808C1974 AFB30040 */ sw $s3, 0x0040($sp) /* 007E8 808C1978 3C010001 */ lui $at, 0x0001 ## $at = 00010000 /* 007EC 808C197C 00A09825 */ or $s3, $a1, $zero ## $s3 = 00000000 -/* 007F0 808C1980 00250821 */ addu $at, $at, $a1 -/* 007F4 808C1984 AFBF0044 */ sw $ra, 0x0044($sp) -/* 007F8 808C1988 AFB2003C */ sw $s2, 0x003C($sp) -/* 007FC 808C198C AFB10038 */ sw $s1, 0x0038($sp) -/* 00800 808C1990 AFB00034 */ sw $s0, 0x0034($sp) +/* 007F0 808C1980 00250821 */ addu $at, $at, $a1 +/* 007F4 808C1984 AFBF0044 */ sw $ra, 0x0044($sp) +/* 007F8 808C1988 AFB2003C */ sw $s2, 0x003C($sp) +/* 007FC 808C198C AFB10038 */ sw $s1, 0x0038($sp) +/* 00800 808C1990 AFB00034 */ sw $s0, 0x0034($sp) /* 00804 808C1994 248E0920 */ addiu $t6, $a0, 0x0920 ## $t6 = 00000920 /* 00808 808C1998 3C05808D */ lui $a1, %hi(D_808CA3C8) ## $a1 = 808D0000 /* 0080C 808C199C 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 00810 808C19A0 AC2E1E10 */ sw $t6, 0x1E10($at) ## 00011E10 /* 00814 808C19A4 0C01E037 */ jal Actor_ProcessInitChain - + /* 00818 808C19A8 24A5A3C8 */ addiu $a1, $a1, %lo(D_808CA3C8) ## $a1 = 808CA3C8 /* 0081C 808C19AC 3C05460F */ lui $a1, 0x460F ## $a1 = 460F0000 /* 00820 808C19B0 3C068003 */ lui $a2, 0x8003 ## $a2 = 80030000 @@ -21,12 +21,12 @@ glabel BossDodongo_Init /* 00828 808C19B8 34A5C000 */ ori $a1, $a1, 0xC000 ## $a1 = 460FC000 /* 0082C 808C19BC 260400B4 */ addiu $a0, $s0, 0x00B4 ## $a0 = 000000B4 /* 00830 808C19C0 0C00AC78 */ jal ActorShape_Init - + /* 00834 808C19C4 3C07437A */ lui $a3, 0x437A ## $a3 = 437A0000 /* 00838 808C19C8 3C053C23 */ lui $a1, 0x3C23 ## $a1 = 3C230000 /* 0083C 808C19CC 34A5D70A */ ori $a1, $a1, 0xD70A ## $a1 = 3C23D70A /* 00840 808C19D0 0C00B58B */ jal Actor_SetScale - + /* 00844 808C19D4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 00848 808C19D8 3C120601 */ lui $s2, 0x0601 ## $s2 = 06010000 /* 0084C 808C19DC 2652F0D8 */ addiu $s2, $s2, 0xF0D8 ## $s2 = 0600F0D8 @@ -36,24 +36,24 @@ glabel BossDodongo_Init /* 0085C 808C19EC 02202825 */ or $a1, $s1, $zero ## $a1 = 0000014C /* 00860 808C19F0 02403825 */ or $a3, $s2, $zero ## $a3 = 0600F0D8 /* 00864 808C19F4 02602025 */ or $a0, $s3, $zero ## $a0 = 00000000 -/* 00868 808C19F8 AFA00010 */ sw $zero, 0x0010($sp) -/* 0086C 808C19FC AFA00014 */ sw $zero, 0x0014($sp) +/* 00868 808C19F8 AFA00010 */ sw $zero, 0x0010($sp) +/* 0086C 808C19FC AFA00014 */ sw $zero, 0x0014($sp) /* 00870 808C1A00 0C02915F */ jal SkelAnime_Init - -/* 00874 808C1A04 AFA00018 */ sw $zero, 0x0018($sp) + +/* 00874 808C1A04 AFA00018 */ sw $zero, 0x0018($sp) /* 00878 808C1A08 02202025 */ or $a0, $s1, $zero ## $a0 = 0000014C -/* 0087C 808C1A0C 0C0294BE */ jal func_800A52F8 +/* 0087C 808C1A0C 0C0294BE */ jal SkelAnime_ChangeAnimDefaultRepeat /* 00880 808C1A10 02402825 */ or $a1, $s2, $zero ## $a1 = 0600F0D8 /* 00884 808C1A14 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 /* 00888 808C1A18 44812000 */ mtc1 $at, $f4 ## $f4 = 1.00 /* 0088C 808C1A1C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 00890 808C1A20 02602825 */ or $a1, $s3, $zero ## $a1 = 00000000 -/* 00894 808C1A24 0C230720 */ jal func_808C1C80 +/* 00894 808C1A24 0C230720 */ jal func_808C1C80 /* 00898 808C1A28 E60401F8 */ swc1 $f4, 0x01F8($s0) ## 000001F8 /* 0089C 808C1A2C 240F000C */ addiu $t7, $zero, 0x000C ## $t7 = 0000000C /* 008A0 808C1A30 A60F0194 */ sh $t7, 0x0194($s0) ## 00000194 /* 008A4 808C1A34 3C01808D */ lui $at, %hi(D_808CA644) ## $at = 808D0000 -/* 008A8 808C1A38 C426A644 */ lwc1 $f6, %lo(D_808CA644)($at) +/* 008A8 808C1A38 C426A644 */ lwc1 $f6, %lo(D_808CA644)($at) /* 008AC 808C1A3C 3C01447A */ lui $at, 0x447A ## $at = 447A0000 /* 008B0 808C1A40 44814000 */ mtc1 $at, $f8 ## $f8 = 1000.00 /* 008B4 808C1A44 3C014000 */ lui $at, 0x4000 ## $at = 40000000 @@ -64,133 +64,133 @@ glabel BossDodongo_Init /* 008C8 808C1A58 E606021C */ swc1 $f6, 0x021C($s0) ## 0000021C /* 008CC 808C1A5C E6080220 */ swc1 $f8, 0x0220($s0) ## 00000220 /* 008D0 808C1A60 E60A0224 */ swc1 $f10, 0x0224($s0) ## 00000224 -/* 008D4 808C1A64 C430A648 */ lwc1 $f16, %lo(D_808CA648)($at) +/* 008D4 808C1A64 C430A648 */ lwc1 $f16, %lo(D_808CA648)($at) /* 008D8 808C1A68 26110440 */ addiu $s1, $s0, 0x0440 ## $s1 = 00000440 /* 008DC 808C1A6C 02202825 */ or $a1, $s1, $zero ## $a1 = 00000440 /* 008E0 808C1A70 02602025 */ or $a0, $s3, $zero ## $a0 = 00000000 -/* 008E4 808C1A74 0C016EFE */ jal func_8005BBF8 +/* 008E4 808C1A74 0C016EFE */ jal func_8005BBF8 /* 008E8 808C1A78 E6100228 */ swc1 $f16, 0x0228($s0) ## 00000228 /* 008EC 808C1A7C 3C07808C */ lui $a3, %hi(D_808C73AC) ## $a3 = 808C0000 /* 008F0 808C1A80 26190460 */ addiu $t9, $s0, 0x0460 ## $t9 = 00000460 -/* 008F4 808C1A84 AFB90010 */ sw $t9, 0x0010($sp) +/* 008F4 808C1A84 AFB90010 */ sw $t9, 0x0010($sp) /* 008F8 808C1A88 24E773AC */ addiu $a3, $a3, %lo(D_808C73AC) ## $a3 = 808C73AC /* 008FC 808C1A8C 02602025 */ or $a0, $s3, $zero ## $a0 = 00000000 /* 00900 808C1A90 02202825 */ or $a1, $s1, $zero ## $a1 = 00000440 -/* 00904 808C1A94 0C017014 */ jal func_8005C050 +/* 00904 808C1A94 0C017014 */ jal func_8005C050 /* 00908 808C1A98 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 0090C 808C1A9C 3C050001 */ lui $a1, 0x0001 ## $a1 = 00010000 -/* 00910 808C1AA0 00B32821 */ addu $a1, $a1, $s3 +/* 00910 808C1AA0 00B32821 */ addu $a1, $a1, $s3 /* 00914 808C1AA4 80A51CBC */ lb $a1, 0x1CBC($a1) ## 00011CBC /* 00918 808C1AA8 0C00B337 */ jal Flags_GetClear - + /* 0091C 808C1AAC 02602025 */ or $a0, $s3, $zero ## $a0 = 00000000 -/* 00920 808C1AB0 1040005A */ beq $v0, $zero, .L808C1C1C +/* 00920 808C1AB0 1040005A */ beq $v0, $zero, .L808C1C1C /* 00924 808C1AB4 3C058016 */ lui $a1, 0x8016 ## $a1 = 80160000 /* 00928 808C1AB8 3C020300 */ lui $v0, 0x0300 ## $v0 = 03000000 /* 0092C 808C1ABC 3C03808D */ lui $v1, %hi(D_808C93C8) ## $v1 = 808D0000 /* 00930 808C1AC0 244221D8 */ addiu $v0, $v0, 0x21D8 ## $v0 = 030021D8 /* 00934 808C1AC4 246393C8 */ addiu $v1, $v1, %lo(D_808C93C8) ## $v1 = 808C93C8 -/* 00938 808C1AC8 00024100 */ sll $t0, $v0, 4 -/* 0093C 808C1ACC 00037900 */ sll $t7, $v1, 4 +/* 00938 808C1AC8 00024100 */ sll $t0, $v0, 4 +/* 0093C 808C1ACC 00037900 */ sll $t7, $v1, 4 /* 00940 808C1AD0 24A56FA8 */ addiu $a1, $a1, 0x6FA8 ## $a1 = 80166FA8 -/* 00944 808C1AD4 00084F02 */ srl $t1, $t0, 28 -/* 00948 808C1AD8 000FC702 */ srl $t8, $t7, 28 -/* 0094C 808C1ADC 00095080 */ sll $t2, $t1, 2 -/* 00950 808C1AE0 0018C880 */ sll $t9, $t8, 2 +/* 00944 808C1AD4 00084F02 */ srl $t1, $t0, 28 +/* 00948 808C1AD8 000FC702 */ srl $t8, $t7, 28 +/* 0094C 808C1ADC 00095080 */ sll $t2, $t1, 2 +/* 00950 808C1AE0 0018C880 */ sll $t9, $t8, 2 /* 00954 808C1AE4 3C0600FF */ lui $a2, 0x00FF ## $a2 = 00FF0000 -/* 00958 808C1AE8 00AA5821 */ addu $t3, $a1, $t2 -/* 0095C 808C1AEC 00B94021 */ addu $t0, $a1, $t9 +/* 00958 808C1AE8 00AA5821 */ addu $t3, $a1, $t2 +/* 0095C 808C1AEC 00B94021 */ addu $t0, $a1, $t9 /* 00960 808C1AF0 8D6C0000 */ lw $t4, 0x0000($t3) ## 00000000 /* 00964 808C1AF4 8D090000 */ lw $t1, 0x0000($t0) ## 00000000 /* 00968 808C1AF8 34C6FFFF */ ori $a2, $a2, 0xFFFF ## $a2 = 00FFFFFF -/* 0096C 808C1AFC 00466824 */ and $t5, $v0, $a2 -/* 00970 808C1B00 00665024 */ and $t2, $v1, $a2 +/* 0096C 808C1AFC 00466824 */ and $t5, $v0, $a2 +/* 00970 808C1B00 00665024 */ and $t2, $v1, $a2 /* 00974 808C1B04 3C078000 */ lui $a3, 0x8000 ## $a3 = 80000000 -/* 00978 808C1B08 018D7021 */ addu $t6, $t4, $t5 -/* 0097C 808C1B0C 012A5821 */ addu $t3, $t1, $t2 -/* 00980 808C1B10 01C78821 */ addu $s1, $t6, $a3 -/* 00984 808C1B14 01679021 */ addu $s2, $t3, $a3 +/* 00978 808C1B08 018D7021 */ addu $t6, $t4, $t5 +/* 0097C 808C1B0C 012A5821 */ addu $t3, $t1, $t2 +/* 00980 808C1B10 01C78821 */ addu $s1, $t6, $a3 +/* 00984 808C1B14 01679021 */ addu $s2, $t3, $a3 /* 00988 808C1B18 0C00B55C */ jal Actor_Kill - + /* 0098C 808C1B1C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 00990 808C1B20 3C01808D */ lui $at, %hi(D_808CA64C) ## $at = 808D0000 -/* 00994 808C1B24 C432A64C */ lwc1 $f18, %lo(D_808CA64C)($at) +/* 00994 808C1B24 C432A64C */ lwc1 $f18, %lo(D_808CA64C)($at) /* 00998 808C1B28 3C01808D */ lui $at, %hi(D_808CA650) ## $at = 808D0000 -/* 0099C 808C1B2C C424A650 */ lwc1 $f4, %lo(D_808CA650)($at) +/* 0099C 808C1B2C C424A650 */ lwc1 $f4, %lo(D_808CA650)($at) /* 009A0 808C1B30 3C01808D */ lui $at, %hi(D_808CA654) ## $at = 808D0000 -/* 009A4 808C1B34 C426A654 */ lwc1 $f6, %lo(D_808CA654)($at) +/* 009A4 808C1B34 C426A654 */ lwc1 $f6, %lo(D_808CA654)($at) /* 009A8 808C1B38 26641C24 */ addiu $a0, $s3, 0x1C24 ## $a0 = 00001C24 -/* 009AC 808C1B3C AFA40048 */ sw $a0, 0x0048($sp) +/* 009AC 808C1B3C AFA40048 */ sw $a0, 0x0048($sp) /* 009B0 808C1B40 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 009B4 808C1B44 02603025 */ or $a2, $s3, $zero ## $a2 = 00000000 /* 009B8 808C1B48 2407005D */ addiu $a3, $zero, 0x005D ## $a3 = 0000005D -/* 009BC 808C1B4C AFA0001C */ sw $zero, 0x001C($sp) -/* 009C0 808C1B50 AFA00020 */ sw $zero, 0x0020($sp) -/* 009C4 808C1B54 AFA00024 */ sw $zero, 0x0024($sp) -/* 009C8 808C1B58 AFA00028 */ sw $zero, 0x0028($sp) -/* 009CC 808C1B5C E7B20010 */ swc1 $f18, 0x0010($sp) -/* 009D0 808C1B60 E7A40014 */ swc1 $f4, 0x0014($sp) +/* 009BC 808C1B4C AFA0001C */ sw $zero, 0x001C($sp) +/* 009C0 808C1B50 AFA00020 */ sw $zero, 0x0020($sp) +/* 009C4 808C1B54 AFA00024 */ sw $zero, 0x0024($sp) +/* 009C8 808C1B58 AFA00028 */ sw $zero, 0x0028($sp) +/* 009CC 808C1B5C E7B20010 */ swc1 $f18, 0x0010($sp) +/* 009D0 808C1B60 E7A40014 */ swc1 $f4, 0x0014($sp) /* 009D4 808C1B64 0C00C916 */ jal Actor_SpawnAttached - -/* 009D8 808C1B68 E7A60018 */ swc1 $f6, 0x0018($sp) + +/* 009D8 808C1B68 E7A60018 */ swc1 $f6, 0x0018($sp) /* 009DC 808C1B6C 3C01808D */ lui $at, %hi(D_808CA658) ## $at = 808D0000 -/* 009E0 808C1B70 C428A658 */ lwc1 $f8, %lo(D_808CA658)($at) +/* 009E0 808C1B70 C428A658 */ lwc1 $f8, %lo(D_808CA658)($at) /* 009E4 808C1B74 3C01808D */ lui $at, %hi(D_808CA65C) ## $at = 808D0000 -/* 009E8 808C1B78 C42AA65C */ lwc1 $f10, %lo(D_808CA65C)($at) +/* 009E8 808C1B78 C42AA65C */ lwc1 $f10, %lo(D_808CA65C)($at) /* 009EC 808C1B7C 3C07C45E */ lui $a3, 0xC45E ## $a3 = C45E0000 /* 009F0 808C1B80 240C6000 */ addiu $t4, $zero, 0x6000 ## $t4 = 00006000 -/* 009F4 808C1B84 AFAC0024 */ sw $t4, 0x0024($sp) +/* 009F4 808C1B84 AFAC0024 */ sw $t4, 0x0024($sp) /* 009F8 808C1B88 34E78000 */ ori $a3, $a3, 0x8000 ## $a3 = C45E8000 -/* 009FC 808C1B8C 8FA40048 */ lw $a0, 0x0048($sp) +/* 009FC 808C1B8C 8FA40048 */ lw $a0, 0x0048($sp) /* 00A00 808C1B90 02602825 */ or $a1, $s3, $zero ## $a1 = 00000000 /* 00A04 808C1B94 24060059 */ addiu $a2, $zero, 0x0059 ## $a2 = 00000059 -/* 00A08 808C1B98 AFA00018 */ sw $zero, 0x0018($sp) -/* 00A0C 808C1B9C AFA0001C */ sw $zero, 0x001C($sp) -/* 00A10 808C1BA0 AFA00020 */ sw $zero, 0x0020($sp) -/* 00A14 808C1BA4 E7A80010 */ swc1 $f8, 0x0010($sp) +/* 00A08 808C1B98 AFA00018 */ sw $zero, 0x0018($sp) +/* 00A0C 808C1B9C AFA0001C */ sw $zero, 0x001C($sp) +/* 00A10 808C1BA0 AFA00020 */ sw $zero, 0x0020($sp) +/* 00A14 808C1BA4 E7A80010 */ swc1 $f8, 0x0010($sp) /* 00A18 808C1BA8 0C00C7D4 */ jal Actor_Spawn ## ActorSpawn -/* 00A1C 808C1BAC E7AA0014 */ swc1 $f10, 0x0014($sp) +/* 00A1C 808C1BAC E7AA0014 */ swc1 $f10, 0x0014($sp) /* 00A20 808C1BB0 3C01808D */ lui $at, %hi(D_808CA660) ## $at = 808D0000 -/* 00A24 808C1BB4 C430A660 */ lwc1 $f16, %lo(D_808CA660)($at) +/* 00A24 808C1BB4 C430A660 */ lwc1 $f16, %lo(D_808CA660)($at) /* 00A28 808C1BB8 3C01808D */ lui $at, %hi(D_808CA664) ## $at = 808D0000 -/* 00A2C 808C1BBC C432A664 */ lwc1 $f18, %lo(D_808CA664)($at) +/* 00A2C 808C1BBC C432A664 */ lwc1 $f18, %lo(D_808CA664)($at) /* 00A30 808C1BC0 3C07C42C */ lui $a3, 0xC42C ## $a3 = C42C0000 /* 00A34 808C1BC4 34E78000 */ ori $a3, $a3, 0x8000 ## $a3 = C42C8000 -/* 00A38 808C1BC8 8FA40048 */ lw $a0, 0x0048($sp) +/* 00A38 808C1BC8 8FA40048 */ lw $a0, 0x0048($sp) /* 00A3C 808C1BCC 02602825 */ or $a1, $s3, $zero ## $a1 = 00000000 /* 00A40 808C1BD0 2406005F */ addiu $a2, $zero, 0x005F ## $a2 = 0000005F -/* 00A44 808C1BD4 AFA00018 */ sw $zero, 0x0018($sp) -/* 00A48 808C1BD8 AFA0001C */ sw $zero, 0x001C($sp) -/* 00A4C 808C1BDC AFA00020 */ sw $zero, 0x0020($sp) -/* 00A50 808C1BE0 AFA00024 */ sw $zero, 0x0024($sp) -/* 00A54 808C1BE4 E7B00010 */ swc1 $f16, 0x0010($sp) +/* 00A44 808C1BD4 AFA00018 */ sw $zero, 0x0018($sp) +/* 00A48 808C1BD8 AFA0001C */ sw $zero, 0x001C($sp) +/* 00A4C 808C1BDC AFA00020 */ sw $zero, 0x0020($sp) +/* 00A50 808C1BE0 AFA00024 */ sw $zero, 0x0024($sp) +/* 00A54 808C1BE4 E7B00010 */ swc1 $f16, 0x0010($sp) /* 00A58 808C1BE8 0C00C7D4 */ jal Actor_Spawn ## ActorSpawn -/* 00A5C 808C1BEC E7B20014 */ swc1 $f18, 0x0014($sp) +/* 00A5C 808C1BEC E7B20014 */ swc1 $f18, 0x0014($sp) /* 00A60 808C1BF0 00001825 */ or $v1, $zero, $zero ## $v1 = 00000000 .L808C1BF4: -/* 00A64 808C1BF4 00031040 */ sll $v0, $v1, 1 +/* 00A64 808C1BF4 00031040 */ sll $v0, $v1, 1 /* 00A68 808C1BF8 24630001 */ addiu $v1, $v1, 0x0001 ## $v1 = 00000001 -/* 00A6C 808C1BFC 00031C00 */ sll $v1, $v1, 16 -/* 00A70 808C1C00 02426821 */ addu $t5, $s2, $v0 +/* 00A6C 808C1BFC 00031C00 */ sll $v1, $v1, 16 +/* 00A70 808C1C00 02426821 */ addu $t5, $s2, $v0 /* 00A74 808C1C04 95AE0000 */ lhu $t6, 0x0000($t5) ## 00000000 -/* 00A78 808C1C08 00031C03 */ sra $v1, $v1, 16 -/* 00A7C 808C1C0C 28610800 */ slti $at, $v1, 0x0800 -/* 00A80 808C1C10 02227821 */ addu $t7, $s1, $v0 -/* 00A84 808C1C14 1420FFF7 */ bne $at, $zero, .L808C1BF4 +/* 00A78 808C1C08 00031C03 */ sra $v1, $v1, 16 +/* 00A7C 808C1C0C 28610800 */ slti $at, $v1, 0x0800 +/* 00A80 808C1C10 02227821 */ addu $t7, $s1, $v0 +/* 00A84 808C1C14 1420FFF7 */ bne $at, $zero, .L808C1BF4 /* 00A88 808C1C18 A5EE0000 */ sh $t6, 0x0000($t7) ## 00000000 .L808C1C1C: /* 00A8C 808C1C1C 8E180004 */ lw $t8, 0x0004($s0) ## 00000004 /* 00A90 808C1C20 2401FFFE */ addiu $at, $zero, 0xFFFE ## $at = FFFFFFFE -/* 00A94 808C1C24 0301C824 */ and $t9, $t8, $at +/* 00A94 808C1C24 0301C824 */ and $t9, $t8, $at /* 00A98 808C1C28 AE190004 */ sw $t9, 0x0004($s0) ## 00000004 -/* 00A9C 808C1C2C 8FBF0044 */ lw $ra, 0x0044($sp) -/* 00AA0 808C1C30 8FB30040 */ lw $s3, 0x0040($sp) -/* 00AA4 808C1C34 8FB2003C */ lw $s2, 0x003C($sp) -/* 00AA8 808C1C38 8FB10038 */ lw $s1, 0x0038($sp) -/* 00AAC 808C1C3C 8FB00034 */ lw $s0, 0x0034($sp) -/* 00AB0 808C1C40 03E00008 */ jr $ra +/* 00A9C 808C1C2C 8FBF0044 */ lw $ra, 0x0044($sp) +/* 00AA0 808C1C30 8FB30040 */ lw $s3, 0x0040($sp) +/* 00AA4 808C1C34 8FB2003C */ lw $s2, 0x003C($sp) +/* 00AA8 808C1C38 8FB10038 */ lw $s1, 0x0038($sp) +/* 00AAC 808C1C3C 8FB00034 */ lw $s0, 0x0034($sp) +/* 00AB0 808C1C40 03E00008 */ jr $ra /* 00AB4 808C1C44 27BD0060 */ addiu $sp, $sp, 0x0060 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/func_808C1C80.s b/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/func_808C1C80.s index f23d2508c0..712afc71f8 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/func_808C1C80.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/func_808C1C80.s @@ -1,37 +1,37 @@ glabel func_808C1C80 /* 00AF0 808C1C80 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 00AF4 808C1C84 AFA40028 */ sw $a0, 0x0028($sp) -/* 00AF8 808C1C88 AFBF0024 */ sw $ra, 0x0024($sp) +/* 00AF4 808C1C84 AFA40028 */ sw $a0, 0x0028($sp) +/* 00AF8 808C1C88 AFBF0024 */ sw $ra, 0x0024($sp) /* 00AFC 808C1C8C 3C040601 */ lui $a0, 0x0601 ## $a0 = 06010000 -/* 00B00 808C1C90 AFA5002C */ sw $a1, 0x002C($sp) +/* 00B00 808C1C90 AFA5002C */ sw $a1, 0x002C($sp) /* 00B04 808C1C94 0C028800 */ jal SkelAnime_GetFrameCount - + /* 00B08 808C1C98 2484F0D8 */ addiu $a0, $a0, 0xF0D8 ## $a0 = 0600F0D8 /* 00B0C 808C1C9C 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 00B10 808C1CA0 3C01C120 */ lui $at, 0xC120 ## $at = C1200000 -/* 00B14 808C1CA4 8FA30028 */ lw $v1, 0x0028($sp) -/* 00B18 808C1CA8 468021A0 */ cvt.s.w $f6, $f4 +/* 00B14 808C1CA4 8FA30028 */ lw $v1, 0x0028($sp) +/* 00B18 808C1CA8 468021A0 */ cvt.s.w $f6, $f4 /* 00B1C 808C1CAC 44814000 */ mtc1 $at, $f8 ## $f8 = -10.00 /* 00B20 808C1CB0 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 /* 00B24 808C1CB4 24A5F0D8 */ addiu $a1, $a1, 0xF0D8 ## $a1 = 0600F0D8 /* 00B28 808C1CB8 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 00B2C 808C1CBC 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 00B30 808C1CC0 E7A60010 */ swc1 $f6, 0x0010($sp) -/* 00B34 808C1CC4 AFA00014 */ sw $zero, 0x0014($sp) +/* 00B30 808C1CC0 E7A60010 */ swc1 $f6, 0x0010($sp) +/* 00B34 808C1CC4 AFA00014 */ sw $zero, 0x0014($sp) /* 00B38 808C1CC8 2464014C */ addiu $a0, $v1, 0x014C ## $a0 = 0000014C -/* 00B3C 808C1CCC 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 00B40 808C1CD0 E7A80018 */ swc1 $f8, 0x0018($sp) -/* 00B44 808C1CD4 8FA30028 */ lw $v1, 0x0028($sp) +/* 00B3C 808C1CCC 0C029468 */ jal SkelAnime_ChangeAnim + +/* 00B40 808C1CD0 E7A80018 */ swc1 $f8, 0x0018($sp) +/* 00B44 808C1CD4 8FA30028 */ lw $v1, 0x0028($sp) /* 00B48 808C1CD8 3C0E808C */ lui $t6, %hi(func_808C1D00) ## $t6 = 808C0000 /* 00B4C 808C1CDC 25CE1D00 */ addiu $t6, $t6, %lo(func_808C1D00) ## $t6 = 808C1D00 /* 00B50 808C1CE0 240F0001 */ addiu $t7, $zero, 0x0001 ## $t7 = 00000001 /* 00B54 808C1CE4 AC6E0190 */ sw $t6, 0x0190($v1) ## 00000190 /* 00B58 808C1CE8 A460019C */ sh $zero, 0x019C($v1) ## 0000019C /* 00B5C 808C1CEC A46F01BC */ sh $t7, 0x01BC($v1) ## 000001BC -/* 00B60 808C1CF0 8FBF0024 */ lw $ra, 0x0024($sp) +/* 00B60 808C1CF0 8FBF0024 */ lw $ra, 0x0024($sp) /* 00B64 808C1CF4 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 00B68 808C1CF8 03E00008 */ jr $ra +/* 00B68 808C1CF8 03E00008 */ jr $ra /* 00B6C 808C1CFC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/func_808C1D00.s b/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/func_808C1D00.s index 784c4e7e2c..cb992811e9 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/func_808C1D00.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/func_808C1D00.s @@ -1,110 +1,110 @@ glabel func_808C1D00 /* 00B70 808C1D00 27BDFF88 */ addiu $sp, $sp, 0xFF88 ## $sp = FFFFFF88 -/* 00B74 808C1D04 AFB00028 */ sw $s0, 0x0028($sp) -/* 00B78 808C1D08 AFBF002C */ sw $ra, 0x002C($sp) +/* 00B74 808C1D04 AFB00028 */ sw $s0, 0x0028($sp) +/* 00B78 808C1D08 AFBF002C */ sw $ra, 0x002C($sp) /* 00B7C 808C1D0C 8CAE1C44 */ lw $t6, 0x1C44($a1) ## 00001C44 /* 00B80 808C1D10 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 00B84 808C1D14 00A03025 */ or $a2, $a1, $zero ## $a2 = 00000000 /* 00B88 808C1D18 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 /* 00B8C 808C1D1C 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 00B90 808C1D20 AFA6007C */ sw $a2, 0x007C($sp) -/* 00B94 808C1D24 0C030129 */ jal func_800C04A4 -/* 00B98 808C1D28 AFAE006C */ sw $t6, 0x006C($sp) -/* 00B9C 808C1D2C AFA20070 */ sw $v0, 0x0070($sp) +/* 00B90 808C1D20 AFA6007C */ sw $a2, 0x007C($sp) +/* 00B94 808C1D24 0C030129 */ jal func_800C04A4 +/* 00B98 808C1D28 AFAE006C */ sw $t6, 0x006C($sp) +/* 00B9C 808C1D2C AFA20070 */ sw $v0, 0x0070($sp) /* 00BA0 808C1D30 86030196 */ lh $v1, 0x0196($s0) ## 00000196 -/* 00BA4 808C1D34 10600002 */ beq $v1, $zero, .L808C1D40 +/* 00BA4 808C1D34 10600002 */ beq $v1, $zero, .L808C1D40 /* 00BA8 808C1D38 246FFFFF */ addiu $t7, $v1, 0xFFFF ## $t7 = FFFFFFFF /* 00BAC 808C1D3C A60F0196 */ sh $t7, 0x0196($s0) ## 00000196 .L808C1D40: /* 00BB0 808C1D40 86030198 */ lh $v1, 0x0198($s0) ## 00000198 -/* 00BB4 808C1D44 10600002 */ beq $v1, $zero, .L808C1D50 +/* 00BB4 808C1D44 10600002 */ beq $v1, $zero, .L808C1D50 /* 00BB8 808C1D48 2478FFFF */ addiu $t8, $v1, 0xFFFF ## $t8 = FFFFFFFF /* 00BBC 808C1D4C A6180198 */ sh $t8, 0x0198($s0) ## 00000198 .L808C1D50: /* 00BC0 808C1D50 8602019A */ lh $v0, 0x019A($s0) ## 0000019A -/* 00BC4 808C1D54 10400002 */ beq $v0, $zero, .L808C1D60 +/* 00BC4 808C1D54 10400002 */ beq $v0, $zero, .L808C1D60 /* 00BC8 808C1D58 2459FFFF */ addiu $t9, $v0, 0xFFFF ## $t9 = FFFFFFFF /* 00BCC 808C1D5C A619019A */ sh $t9, 0x019A($s0) ## 0000019A .L808C1D60: /* 00BD0 808C1D60 9608019C */ lhu $t0, 0x019C($s0) ## 0000019C -/* 00BD4 808C1D64 2D010005 */ sltiu $at, $t0, 0x0005 -/* 00BD8 808C1D68 1020026F */ beq $at, $zero, .L808C2728 -/* 00BDC 808C1D6C 00084080 */ sll $t0, $t0, 2 +/* 00BD4 808C1D64 2D010005 */ sltiu $at, $t0, 0x0005 +/* 00BD8 808C1D68 1020026F */ beq $at, $zero, .L808C2728 +/* 00BDC 808C1D6C 00084080 */ sll $t0, $t0, 2 /* 00BE0 808C1D70 3C01808D */ lui $at, %hi(jtbl_808CA668) ## $at = 808D0000 -/* 00BE4 808C1D74 00280821 */ addu $at, $at, $t0 -/* 00BE8 808C1D78 8C28A668 */ lw $t0, %lo(jtbl_808CA668)($at) -/* 00BEC 808C1D7C 01000008 */ jr $t0 +/* 00BE4 808C1D74 00280821 */ addu $at, $at, $t0 +/* 00BE8 808C1D78 8C28A668 */ lw $t0, %lo(jtbl_808CA668)($at) +/* 00BEC 808C1D7C 01000008 */ jr $t0 /* 00BF0 808C1D80 00000000 */ nop glabel L808C1D84 -/* 00BF4 808C1D84 8FA9006C */ lw $t1, 0x006C($sp) +/* 00BF4 808C1D84 8FA9006C */ lw $t1, 0x006C($sp) /* 00BF8 808C1D88 3C01808D */ lui $at, %hi(D_808CA67C) ## $at = 808D0000 -/* 00BFC 808C1D8C C426A67C */ lwc1 $f6, %lo(D_808CA67C)($at) +/* 00BFC 808C1D8C C426A67C */ lwc1 $f6, %lo(D_808CA67C)($at) /* 00C00 808C1D90 C5240028 */ lwc1 $f4, 0x0028($t1) ## 00000028 /* 00C04 808C1D94 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 /* 00C08 808C1D98 3C01808D */ lui $at, %hi(D_808CA680) ## $at = 808D0000 -/* 00C0C 808C1D9C 4606203C */ c.lt.s $f4, $f6 +/* 00C0C 808C1D9C 4606203C */ c.lt.s $f4, $f6 /* 00C10 808C1DA0 00000000 */ nop -/* 00C14 808C1DA4 45020261 */ bc1fl .L808C272C +/* 00C14 808C1DA4 45020261 */ bc1fl .L808C272C /* 00C18 808C1DA8 860B01B4 */ lh $t3, 0x01B4($s0) ## 000001B4 /* 00C1C 808C1DAC A602019C */ sh $v0, 0x019C($s0) ## 0000019C -/* 00C20 808C1DB0 C428A680 */ lwc1 $f8, %lo(D_808CA680)($at) +/* 00C20 808C1DB0 C428A680 */ lwc1 $f8, %lo(D_808CA680)($at) /* 00C24 808C1DB4 3C01808D */ lui $at, %hi(D_808CA684) ## $at = 808D0000 /* 00C28 808C1DB8 E6080024 */ swc1 $f8, 0x0024($s0) ## 00000024 -/* 00C2C 808C1DBC C42AA684 */ lwc1 $f10, %lo(D_808CA684)($at) +/* 00C2C 808C1DBC C42AA684 */ lwc1 $f10, %lo(D_808CA684)($at) /* 00C30 808C1DC0 A60201A0 */ sh $v0, 0x01A0($s0) ## 000001A0 -/* 00C34 808C1DC4 10000258 */ beq $zero, $zero, .L808C2728 +/* 00C34 808C1DC4 10000258 */ beq $zero, $zero, .L808C2728 /* 00C38 808C1DC8 E60A002C */ swc1 $f10, 0x002C($s0) ## 0000002C glabel L808C1DCC -/* 00C3C 808C1DCC 8FA4007C */ lw $a0, 0x007C($sp) -/* 00C40 808C1DD0 0C019148 */ jal func_80064520 +/* 00C3C 808C1DCC 8FA4007C */ lw $a0, 0x007C($sp) +/* 00C40 808C1DD0 0C019148 */ jal func_80064520 /* 00C44 808C1DD4 24851D64 */ addiu $a1, $a0, 0x1D64 ## $a1 = 00001D64 -/* 00C48 808C1DD8 8FA4007C */ lw $a0, 0x007C($sp) +/* 00C48 808C1DD8 8FA4007C */ lw $a0, 0x007C($sp) /* 00C4C 808C1DDC 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 00C50 808C1DE0 0C00B7D5 */ jal func_8002DF54 +/* 00C50 808C1DE0 0C00B7D5 */ jal func_8002DF54 /* 00C54 808C1DE4 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 -/* 00C58 808C1DE8 0C03010E */ jal func_800C0438 -/* 00C5C 808C1DEC 8FA4007C */ lw $a0, 0x007C($sp) -/* 00C60 808C1DF0 0C03008C */ jal func_800C0230 -/* 00C64 808C1DF4 8FA4007C */ lw $a0, 0x007C($sp) +/* 00C58 808C1DE8 0C03010E */ jal func_800C0438 +/* 00C5C 808C1DEC 8FA4007C */ lw $a0, 0x007C($sp) +/* 00C60 808C1DF0 0C03008C */ jal func_800C0230 +/* 00C64 808C1DF4 8FA4007C */ lw $a0, 0x007C($sp) /* 00C68 808C1DF8 A60201B4 */ sh $v0, 0x01B4($s0) ## 000001B4 -/* 00C6C 808C1DFC 8FA4007C */ lw $a0, 0x007C($sp) +/* 00C6C 808C1DFC 8FA4007C */ lw $a0, 0x007C($sp) /* 00C70 808C1E00 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 00C74 808C1E04 0C0300C5 */ jal func_800C0314 +/* 00C74 808C1E04 0C0300C5 */ jal func_800C0314 /* 00C78 808C1E08 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 -/* 00C7C 808C1E0C 8FA4007C */ lw $a0, 0x007C($sp) +/* 00C7C 808C1E0C 8FA4007C */ lw $a0, 0x007C($sp) /* 00C80 808C1E10 860501B4 */ lh $a1, 0x01B4($s0) ## 000001B4 -/* 00C84 808C1E14 0C0300C5 */ jal func_800C0314 +/* 00C84 808C1E14 0C0300C5 */ jal func_800C0314 /* 00C88 808C1E18 24060007 */ addiu $a2, $zero, 0x0007 ## $a2 = 00000007 /* 00C8C 808C1E1C 3C01808D */ lui $at, %hi(D_808CA688) ## $at = 808D0000 -/* 00C90 808C1E20 C420A688 */ lwc1 $f0, %lo(D_808CA688)($at) +/* 00C90 808C1E20 C420A688 */ lwc1 $f0, %lo(D_808CA688)($at) /* 00C94 808C1E24 3C0143F0 */ lui $at, 0x43F0 ## $at = 43F00000 /* 00C98 808C1E28 44818000 */ mtc1 $at, $f16 ## $f16 = 480.00 /* 00C9C 808C1E2C 3C014248 */ lui $at, 0x4248 ## $at = 42480000 /* 00CA0 808C1E30 44812000 */ mtc1 $at, $f4 ## $f4 = 50.00 -/* 00CA4 808C1E34 46100481 */ sub.s $f18, $f0, $f16 +/* 00CA4 808C1E34 46100481 */ sub.s $f18, $f0, $f16 /* 00CA8 808C1E38 240B0002 */ addiu $t3, $zero, 0x0002 ## $t3 = 00000002 /* 00CAC 808C1E3C 240C003C */ addiu $t4, $zero, 0x003C ## $t4 = 0000003C /* 00CB0 808C1E40 240D00A0 */ addiu $t5, $zero, 0x00A0 ## $t5 = 000000A0 /* 00CB4 808C1E44 A60B019C */ sh $t3, 0x019C($s0) ## 0000019C /* 00CB8 808C1E48 A60C0196 */ sh $t4, 0x0196($s0) ## 00000196 /* 00CBC 808C1E4C A60D0198 */ sh $t5, 0x0198($s0) ## 00000198 -/* 00CC0 808C1E50 46049180 */ add.s $f6, $f18, $f4 -/* 00CC4 808C1E54 8FAE006C */ lw $t6, 0x006C($sp) +/* 00CC0 808C1E50 46049180 */ add.s $f6, $f18, $f4 +/* 00CC4 808C1E54 8FAE006C */ lw $t6, 0x006C($sp) /* 00CC8 808C1E58 E5C00028 */ swc1 $f0, 0x0028($t6) ## 00000028 /* 00CCC 808C1E5C E606042C */ swc1 $f6, 0x042C($s0) ## 0000042C glabel L808C1E60 /* 00CD0 808C1E60 86030198 */ lh $v1, 0x0198($s0) ## 00000198 -/* 00CD4 808C1E64 8FA2006C */ lw $v0, 0x006C($sp) +/* 00CD4 808C1E64 8FA2006C */ lw $v0, 0x006C($sp) /* 00CD8 808C1E68 240F3FFF */ addiu $t7, $zero, 0x3FFF ## $t7 = 00003FFF -/* 00CDC 808C1E6C 28610083 */ slti $at, $v1, 0x0083 -/* 00CE0 808C1E70 1420001C */ bne $at, $zero, .L808C1EE4 +/* 00CDC 808C1E6C 28610083 */ slti $at, $v1, 0x0083 +/* 00CE0 808C1E70 1420001C */ bne $at, $zero, .L808C1EE4 /* 00CE4 808C1E74 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 00CE8 808C1E78 3C01808D */ lui $at, %hi(D_808CA68C) ## $at = 808D0000 -/* 00CEC 808C1E7C C420A68C */ lwc1 $f0, %lo(D_808CA68C)($at) +/* 00CEC 808C1E7C C420A68C */ lwc1 $f0, %lo(D_808CA68C)($at) /* 00CF0 808C1E80 3C01808D */ lui $at, %hi(D_808CA690) ## $at = 808D0000 /* 00CF4 808C1E84 44805000 */ mtc1 $zero, $f10 ## $f10 = 0.00 /* 00CF8 808C1E88 E4400024 */ swc1 $f0, 0x0024($v0) ## 00000024 -/* 00CFC 808C1E8C C428A690 */ lwc1 $f8, %lo(D_808CA690)($at) +/* 00CFC 808C1E8C C428A690 */ lwc1 $f8, %lo(D_808CA690)($at) /* 00D00 808C1E90 A44F0032 */ sh $t7, 0x0032($v0) ## 00000032 /* 00D04 808C1E94 84580032 */ lh $t8, 0x0032($v0) ## 00000032 /* 00D08 808C1E98 E44A0068 */ swc1 $f10, 0x0068($v0) ## 00000068 @@ -116,40 +116,40 @@ glabel L808C1E60 /* 00D20 808C1EB0 44819000 */ mtc1 $at, $f18 ## $f18 = 100.00 /* 00D24 808C1EB4 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 /* 00D28 808C1EB8 44815000 */ mtc1 $at, $f10 ## $f10 = 20.00 -/* 00D2C 808C1EBC 46128101 */ sub.s $f4, $f16, $f18 +/* 00D2C 808C1EBC 46128101 */ sub.s $f4, $f16, $f18 /* 00D30 808C1EC0 86030198 */ lh $v1, 0x0198($s0) ## 00000198 /* 00D34 808C1EC4 E6040430 */ swc1 $f4, 0x0430($s0) ## 00000430 /* 00D38 808C1EC8 C4460024 */ lwc1 $f6, 0x0024($v0) ## 00000024 /* 00D3C 808C1ECC E6060434 */ swc1 $f6, 0x0434($s0) ## 00000434 /* 00D40 808C1ED0 C4480028 */ lwc1 $f8, 0x0028($v0) ## 00000028 -/* 00D44 808C1ED4 460A4400 */ add.s $f16, $f8, $f10 +/* 00D44 808C1ED4 460A4400 */ add.s $f16, $f8, $f10 /* 00D48 808C1ED8 E6100438 */ swc1 $f16, 0x0438($s0) ## 00000438 /* 00D4C 808C1EDC C452002C */ lwc1 $f18, 0x002C($v0) ## 0000002C /* 00D50 808C1EE0 E612043C */ swc1 $f18, 0x043C($s0) ## 0000043C .L808C1EE4: /* 00D54 808C1EE4 2401006E */ addiu $at, $zero, 0x006E ## $at = 0000006E -/* 00D58 808C1EE8 14610006 */ bne $v1, $at, .L808C1F04 -/* 00D5C 808C1EEC 8FA2006C */ lw $v0, 0x006C($sp) -/* 00D60 808C1EF0 8FA4007C */ lw $a0, 0x007C($sp) -/* 00D64 808C1EF4 0C00B7D5 */ jal func_8002DF54 +/* 00D58 808C1EE8 14610006 */ bne $v1, $at, .L808C1F04 +/* 00D5C 808C1EEC 8FA2006C */ lw $v0, 0x006C($sp) +/* 00D60 808C1EF0 8FA4007C */ lw $a0, 0x007C($sp) +/* 00D64 808C1EF4 0C00B7D5 */ jal func_8002DF54 /* 00D68 808C1EF8 24060009 */ addiu $a2, $zero, 0x0009 ## $a2 = 00000009 /* 00D6C 808C1EFC 86030198 */ lh $v1, 0x0198($s0) ## 00000198 -/* 00D70 808C1F00 8FA2006C */ lw $v0, 0x006C($sp) +/* 00D70 808C1F00 8FA2006C */ lw $v0, 0x006C($sp) .L808C1F04: /* 00D74 808C1F04 24010005 */ addiu $at, $zero, 0x0005 ## $at = 00000005 -/* 00D78 808C1F08 14610006 */ bne $v1, $at, .L808C1F24 -/* 00D7C 808C1F0C 8FA4007C */ lw $a0, 0x007C($sp) +/* 00D78 808C1F08 14610006 */ bne $v1, $at, .L808C1F24 +/* 00D7C 808C1F0C 8FA4007C */ lw $a0, 0x007C($sp) /* 00D80 808C1F10 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 00D84 808C1F14 0C00B7D5 */ jal func_8002DF54 +/* 00D84 808C1F14 0C00B7D5 */ jal func_8002DF54 /* 00D88 808C1F18 2406000C */ addiu $a2, $zero, 0x000C ## $a2 = 0000000C /* 00D8C 808C1F1C 86030198 */ lh $v1, 0x0198($s0) ## 00000198 -/* 00D90 808C1F20 8FA2006C */ lw $v0, 0x006C($sp) +/* 00D90 808C1F20 8FA2006C */ lw $v0, 0x006C($sp) .L808C1F24: -/* 00D94 808C1F24 28610006 */ slti $at, $v1, 0x0006 -/* 00D98 808C1F28 10200004 */ beq $at, $zero, .L808C1F3C +/* 00D94 808C1F24 28610006 */ slti $at, $v1, 0x0006 +/* 00D98 808C1F28 10200004 */ beq $at, $zero, .L808C1F3C /* 00D9C 808C1F2C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 00DA0 808C1F30 2419BFFF */ addiu $t9, $zero, 0xBFFF ## $t9 = FFFFBFFF -/* 00DA4 808C1F34 10000003 */ beq $zero, $zero, .L808C1F44 +/* 00DA4 808C1F34 10000003 */ beq $zero, $zero, .L808C1F44 /* 00DA8 808C1F38 A45900B6 */ sh $t9, 0x00B6($v0) ## 000000B6 .L808C1F3C: /* 00DAC 808C1F3C 24083FFF */ addiu $t0, $zero, 0x3FFF ## $t0 = 00003FFF @@ -158,27 +158,27 @@ glabel L808C1E60 /* 00DB4 808C1F44 86090198 */ lh $t1, 0x0198($s0) ## 00000198 /* 00DB8 808C1F48 240A0001 */ addiu $t2, $zero, 0x0001 ## $t2 = 00000001 /* 00DBC 808C1F4C 240B0002 */ addiu $t3, $zero, 0x0002 ## $t3 = 00000002 -/* 00DC0 808C1F50 2921003C */ slti $at, $t1, 0x003C -/* 00DC4 808C1F54 50200004 */ beql $at, $zero, .L808C1F68 +/* 00DC0 808C1F50 2921003C */ slti $at, $t1, 0x003C +/* 00DC4 808C1F54 50200004 */ beql $at, $zero, .L808C1F68 /* 00DC8 808C1F58 A60B01BC */ sh $t3, 0x01BC($s0) ## 000001BC -/* 00DCC 808C1F5C 10000002 */ beq $zero, $zero, .L808C1F68 +/* 00DCC 808C1F5C 10000002 */ beq $zero, $zero, .L808C1F68 /* 00DD0 808C1F60 A60A01BC */ sh $t2, 0x01BC($s0) ## 000001BC /* 00DD4 808C1F64 A60B01BC */ sh $t3, 0x01BC($s0) ## 000001BC .L808C1F68: -/* 00DD8 808C1F68 0C230CBD */ jal func_808C32F4 -/* 00DDC 808C1F6C 8FA5007C */ lw $a1, 0x007C($sp) +/* 00DD8 808C1F68 0C230CBD */ jal func_808C32F4 +/* 00DDC 808C1F6C 8FA5007C */ lw $a1, 0x007C($sp) /* 00DE0 808C1F70 86030196 */ lh $v1, 0x0196($s0) ## 00000196 /* 00DE4 808C1F74 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 /* 00DE8 808C1F78 3C041001 */ lui $a0, 0x1001 ## $a0 = 10010000 -/* 00DEC 808C1F7C 14610004 */ bne $v1, $at, .L808C1F90 +/* 00DEC 808C1F7C 14610004 */ bne $v1, $at, .L808C1F90 /* 00DF0 808C1F80 00000000 */ nop /* 00DF4 808C1F84 0C03E803 */ jal Audio_SetBGM - + /* 00DF8 808C1F88 348400FF */ ori $a0, $a0, 0x00FF ## $a0 = 100100FF /* 00DFC 808C1F8C 86030196 */ lh $v1, 0x0196($s0) ## 00000196 .L808C1F90: -/* 00E00 808C1F90 1460003A */ bne $v1, $zero, .L808C207C -/* 00E04 808C1F94 8FAC006C */ lw $t4, 0x006C($sp) +/* 00E00 808C1F90 1460003A */ bne $v1, $zero, .L808C207C +/* 00E04 808C1F94 8FAC006C */ lw $t4, 0x006C($sp) /* 00E08 808C1F98 3C0141F0 */ lui $at, 0x41F0 ## $at = 41F00000 /* 00E0C 808C1F9C 44813000 */ mtc1 $at, $f6 ## $f6 = 30.00 /* 00E10 808C1FA0 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 @@ -186,30 +186,30 @@ glabel L808C1E60 /* 00E18 808C1FA8 C60A0204 */ lwc1 $f10, 0x0204($s0) ## 00000204 /* 00E1C 808C1FAC C60403EC */ lwc1 $f4, 0x03EC($s0) ## 000003EC /* 00E20 808C1FB0 3C063E4C */ lui $a2, 0x3E4C ## $a2 = 3E4C0000 -/* 00E24 808C1FB4 46105482 */ mul.s $f18, $f10, $f16 -/* 00E28 808C1FB8 46062200 */ add.s $f8, $f4, $f6 +/* 00E24 808C1FB4 46105482 */ mul.s $f18, $f10, $f16 +/* 00E28 808C1FB8 46062200 */ add.s $f8, $f4, $f6 /* 00E2C 808C1FBC 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 /* 00E30 808C1FC0 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3E4CCCCD /* 00E34 808C1FC4 26040428 */ addiu $a0, $s0, 0x0428 ## $a0 = 00000428 -/* 00E38 808C1FC8 44054000 */ mfc1 $a1, $f8 -/* 00E3C 808C1FCC E7A40010 */ swc1 $f4, 0x0010($sp) -/* 00E40 808C1FD0 44079000 */ mfc1 $a3, $f18 +/* 00E38 808C1FC8 44054000 */ mfc1 $a1, $f8 +/* 00E3C 808C1FCC E7A40010 */ swc1 $f4, 0x0010($sp) +/* 00E40 808C1FD0 44079000 */ mfc1 $a3, $f18 /* 00E44 808C1FD4 0C01E0C4 */ jal Math_SmoothScaleMaxMinF - + /* 00E48 808C1FD8 00000000 */ nop /* 00E4C 808C1FDC 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 /* 00E50 808C1FE0 44814000 */ mtc1 $at, $f8 ## $f8 = 20.00 /* 00E54 808C1FE4 C6060204 */ lwc1 $f6, 0x0204($s0) ## 00000204 /* 00E58 808C1FE8 44808000 */ mtc1 $zero, $f16 ## $f16 = 0.00 /* 00E5C 808C1FEC 8E0503F0 */ lw $a1, 0x03F0($s0) ## 000003F0 -/* 00E60 808C1FF0 46083282 */ mul.s $f10, $f6, $f8 +/* 00E60 808C1FF0 46083282 */ mul.s $f10, $f6, $f8 /* 00E64 808C1FF4 3C063E4C */ lui $a2, 0x3E4C ## $a2 = 3E4C0000 /* 00E68 808C1FF8 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3E4CCCCD /* 00E6C 808C1FFC 2604042C */ addiu $a0, $s0, 0x042C ## $a0 = 0000042C -/* 00E70 808C2000 E7B00010 */ swc1 $f16, 0x0010($sp) -/* 00E74 808C2004 44075000 */ mfc1 $a3, $f10 +/* 00E70 808C2000 E7B00010 */ swc1 $f16, 0x0010($sp) +/* 00E74 808C2004 44075000 */ mfc1 $a3, $f10 /* 00E78 808C2008 0C01E0C4 */ jal Math_SmoothScaleMaxMinF - + /* 00E7C 808C200C 00000000 */ nop /* 00E80 808C2010 3C014120 */ lui $at, 0x4120 ## $at = 41200000 /* 00E84 808C2014 44812000 */ mtc1 $at, $f4 ## $f4 = 10.00 @@ -218,16 +218,16 @@ glabel L808C1E60 /* 00E90 808C2020 C6080204 */ lwc1 $f8, 0x0204($s0) ## 00000204 /* 00E94 808C2024 C61203F4 */ lwc1 $f18, 0x03F4($s0) ## 000003F4 /* 00E98 808C2028 3C063E4C */ lui $a2, 0x3E4C ## $a2 = 3E4C0000 -/* 00E9C 808C202C 460A4402 */ mul.s $f16, $f8, $f10 -/* 00EA0 808C2030 46049180 */ add.s $f6, $f18, $f4 +/* 00E9C 808C202C 460A4402 */ mul.s $f16, $f8, $f10 +/* 00EA0 808C2030 46049180 */ add.s $f6, $f18, $f4 /* 00EA4 808C2034 44809000 */ mtc1 $zero, $f18 ## $f18 = 0.00 /* 00EA8 808C2038 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3E4CCCCD /* 00EAC 808C203C 26040430 */ addiu $a0, $s0, 0x0430 ## $a0 = 00000430 -/* 00EB0 808C2040 44053000 */ mfc1 $a1, $f6 -/* 00EB4 808C2044 E7B20010 */ swc1 $f18, 0x0010($sp) -/* 00EB8 808C2048 44078000 */ mfc1 $a3, $f16 +/* 00EB0 808C2040 44053000 */ mfc1 $a1, $f6 +/* 00EB4 808C2044 E7B20010 */ swc1 $f18, 0x0010($sp) +/* 00EB8 808C2048 44078000 */ mfc1 $a3, $f16 /* 00EBC 808C204C 0C01E0C4 */ jal Math_SmoothScaleMaxMinF - + /* 00EC0 808C2050 00000000 */ nop /* 00EC4 808C2054 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 /* 00EC8 808C2058 3C073CA3 */ lui $a3, 0x3CA3 ## $a3 = 3CA30000 @@ -236,39 +236,39 @@ glabel L808C1E60 /* 00ED4 808C2064 3C053F80 */ lui $a1, 0x3F80 ## $a1 = 3F800000 /* 00ED8 808C2068 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 00EDC 808C206C 0C01E0C4 */ jal Math_SmoothScaleMaxMinF - -/* 00EE0 808C2070 E7A40010 */ swc1 $f4, 0x0010($sp) -/* 00EE4 808C2074 1000000C */ beq $zero, $zero, .L808C20A8 + +/* 00EE0 808C2070 E7A40010 */ swc1 $f4, 0x0010($sp) +/* 00EE4 808C2074 1000000C */ beq $zero, $zero, .L808C20A8 /* 00EE8 808C2078 00000000 */ nop .L808C207C: /* 00EEC 808C207C C5860024 */ lwc1 $f6, 0x0024($t4) ## 00000024 /* 00EF0 808C2080 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 /* 00EF4 808C2084 44815000 */ mtc1 $at, $f10 ## $f10 = 20.00 /* 00EF8 808C2088 E6060434 */ swc1 $f6, 0x0434($s0) ## 00000434 -/* 00EFC 808C208C 8FAD006C */ lw $t5, 0x006C($sp) +/* 00EFC 808C208C 8FAD006C */ lw $t5, 0x006C($sp) /* 00F00 808C2090 C5A80028 */ lwc1 $f8, 0x0028($t5) ## 00000028 -/* 00F04 808C2094 460A4400 */ add.s $f16, $f8, $f10 +/* 00F04 808C2094 460A4400 */ add.s $f16, $f8, $f10 /* 00F08 808C2098 E6100438 */ swc1 $f16, 0x0438($s0) ## 00000438 -/* 00F0C 808C209C 8FAE006C */ lw $t6, 0x006C($sp) +/* 00F0C 808C209C 8FAE006C */ lw $t6, 0x006C($sp) /* 00F10 808C20A0 C5D2002C */ lwc1 $f18, 0x002C($t6) ## 0000002C /* 00F14 808C20A4 E612043C */ swc1 $f18, 0x043C($s0) ## 0000043C .L808C20A8: /* 00F18 808C20A8 3C0F8016 */ lui $t7, 0x8016 ## $t7 = 80160000 /* 00F1C 808C20AC 95EFF542 */ lhu $t7, -0x0ABE($t7) ## 8015F542 /* 00F20 808C20B0 31F80002 */ andi $t8, $t7, 0x0002 ## $t8 = 00000000 -/* 00F24 808C20B4 5300002D */ beql $t8, $zero, .L808C216C +/* 00F24 808C20B4 5300002D */ beql $t8, $zero, .L808C216C /* 00F28 808C20B8 860E0198 */ lh $t6, 0x0198($s0) ## 00000198 /* 00F2C 808C20BC 86190198 */ lh $t9, 0x0198($s0) ## 00000198 /* 00F30 808C20C0 24010064 */ addiu $at, $zero, 0x0064 ## $at = 00000064 /* 00F34 808C20C4 24083FFF */ addiu $t0, $zero, 0x3FFF ## $t0 = 00003FFF -/* 00F38 808C20C8 17210197 */ bne $t9, $at, .L808C2728 +/* 00F38 808C20C8 17210197 */ bne $t9, $at, .L808C2728 /* 00F3C 808C20CC 24090002 */ addiu $t1, $zero, 0x0002 ## $t1 = 00000002 /* 00F40 808C20D0 3C01808D */ lui $at, %hi(D_808CA694) ## $at = 808D0000 -/* 00F44 808C20D4 C424A694 */ lwc1 $f4, %lo(D_808CA694)($at) +/* 00F44 808C20D4 C424A694 */ lwc1 $f4, %lo(D_808CA694)($at) /* 00F48 808C20D8 3C01808D */ lui $at, %hi(D_808CA698) ## $at = 808D0000 /* 00F4C 808C20DC 44804000 */ mtc1 $zero, $f8 ## $f8 = 0.00 /* 00F50 808C20E0 E6040024 */ swc1 $f4, 0x0024($s0) ## 00000024 -/* 00F54 808C20E4 C426A698 */ lwc1 $f6, %lo(D_808CA698)($at) +/* 00F54 808C20E4 C426A698 */ lwc1 $f6, %lo(D_808CA698)($at) /* 00F58 808C20E8 240A0004 */ addiu $t2, $zero, 0x0004 ## $t2 = 00000004 /* 00F5C 808C20EC 240B001E */ addiu $t3, $zero, 0x001E ## $t3 = 0000001E /* 00F60 808C20F0 240C0096 */ addiu $t4, $zero, 0x0096 ## $t4 = 00000096 @@ -282,65 +282,65 @@ glabel L808C1E60 /* 00F80 808C2110 24848EEC */ addiu $a0, $a0, 0x8EEC ## $a0 = 06008EEC /* 00F84 808C2114 E6080204 */ swc1 $f8, 0x0204($s0) ## 00000204 /* 00F88 808C2118 0C028800 */ jal SkelAnime_GetFrameCount - + /* 00F8C 808C211C E606002C */ swc1 $f6, 0x002C($s0) ## 0000002C /* 00F90 808C2120 44825000 */ mtc1 $v0, $f10 ## $f10 = 0.00 /* 00F94 808C2124 44809000 */ mtc1 $zero, $f18 ## $f18 = 0.00 /* 00F98 808C2128 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C -/* 00F9C 808C212C 46805420 */ cvt.s.w $f16, $f10 +/* 00F9C 808C212C 46805420 */ cvt.s.w $f16, $f10 /* 00FA0 808C2130 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 /* 00FA4 808C2134 240D0002 */ addiu $t5, $zero, 0x0002 ## $t5 = 00000002 -/* 00FA8 808C2138 AFAD0014 */ sw $t5, 0x0014($sp) +/* 00FA8 808C2138 AFAD0014 */ sw $t5, 0x0014($sp) /* 00FAC 808C213C 24A58EEC */ addiu $a1, $a1, 0x8EEC ## $a1 = 06008EEC -/* 00FB0 808C2140 AFA4003C */ sw $a0, 0x003C($sp) -/* 00FB4 808C2144 E7B00010 */ swc1 $f16, 0x0010($sp) +/* 00FB0 808C2140 AFA4003C */ sw $a0, 0x003C($sp) +/* 00FB4 808C2144 E7B00010 */ swc1 $f16, 0x0010($sp) /* 00FB8 808C2148 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 00FBC 808C214C 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 00FC0 808C2150 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 00FC4 808C2154 E7B20018 */ swc1 $f18, 0x0018($sp) +/* 00FC0 808C2150 0C029468 */ jal SkelAnime_ChangeAnim + +/* 00FC4 808C2154 E7B20018 */ swc1 $f18, 0x0018($sp) /* 00FC8 808C2158 0C02927F */ jal SkelAnime_FrameUpdateMatrix - -/* 00FCC 808C215C 8FA4003C */ lw $a0, 0x003C($sp) -/* 00FD0 808C2160 10000172 */ beq $zero, $zero, .L808C272C + +/* 00FCC 808C215C 8FA4003C */ lw $a0, 0x003C($sp) +/* 00FD0 808C2160 10000172 */ beq $zero, $zero, .L808C272C /* 00FD4 808C2164 860B01B4 */ lh $t3, 0x01B4($s0) ## 000001B4 /* 00FD8 808C2168 860E0198 */ lh $t6, 0x0198($s0) ## 00000198 .L808C216C: /* 00FDC 808C216C 240F0003 */ addiu $t7, $zero, 0x0003 ## $t7 = 00000003 /* 00FE0 808C2170 24180014 */ addiu $t8, $zero, 0x0014 ## $t8 = 00000014 -/* 00FE4 808C2174 55C0016D */ bnel $t6, $zero, .L808C272C +/* 00FE4 808C2174 55C0016D */ bnel $t6, $zero, .L808C272C /* 00FE8 808C2178 860B01B4 */ lh $t3, 0x01B4($s0) ## 000001B4 /* 00FEC 808C217C 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 /* 00FF0 808C2180 A60F019C */ sh $t7, 0x019C($s0) ## 0000019C /* 00FF4 808C2184 A618019E */ sh $t8, 0x019E($s0) ## 0000019E -/* 00FF8 808C2188 10000167 */ beq $zero, $zero, .L808C2728 +/* 00FF8 808C2188 10000167 */ beq $zero, $zero, .L808C2728 /* 00FFC 808C218C E6040204 */ swc1 $f4, 0x0204($s0) ## 00000204 glabel L808C2190 /* 01000 808C2190 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01004 808C2194 0C230CBD */ jal func_808C32F4 -/* 01008 808C2198 8FA5007C */ lw $a1, 0x007C($sp) +/* 01004 808C2194 0C230CBD */ jal func_808C32F4 +/* 01008 808C2198 8FA5007C */ lw $a1, 0x007C($sp) /* 0100C 808C219C 8619019E */ lh $t9, 0x019E($s0) ## 0000019E /* 01010 808C21A0 3C01808D */ lui $at, %hi(D_808CA69C) ## $at = 808D0000 -/* 01014 808C21A4 C42AA69C */ lwc1 $f10, %lo(D_808CA69C)($at) +/* 01014 808C21A4 C42AA69C */ lwc1 $f10, %lo(D_808CA69C)($at) /* 01018 808C21A8 44993000 */ mtc1 $t9, $f6 ## $f6 = 0.00 /* 0101C 808C21AC 00000000 */ nop -/* 01020 808C21B0 46803220 */ cvt.s.w $f8, $f6 -/* 01024 808C21B4 460A4302 */ mul.s $f12, $f8, $f10 +/* 01020 808C21B0 46803220 */ cvt.s.w $f8, $f6 +/* 01024 808C21B4 460A4302 */ mul.s $f12, $f8, $f10 /* 01028 808C21B8 0C0400A4 */ jal sinf - + /* 0102C 808C21BC 00000000 */ nop /* 01030 808C21C0 3C01808D */ lui $at, %hi(D_808CA6A0) ## $at = 808D0000 -/* 01034 808C21C4 C430A6A0 */ lwc1 $f16, %lo(D_808CA6A0)($at) +/* 01034 808C21C4 C430A6A0 */ lwc1 $f16, %lo(D_808CA6A0)($at) /* 01038 808C21C8 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 /* 0103C 808C21CC 3C073C23 */ lui $a3, 0x3C23 ## $a3 = 3C230000 -/* 01040 808C21D0 46100482 */ mul.s $f18, $f0, $f16 +/* 01040 808C21D0 46100482 */ mul.s $f18, $f0, $f16 /* 01044 808C21D4 34E7D70A */ ori $a3, $a3, 0xD70A ## $a3 = 3C23D70A /* 01048 808C21D8 2604020C */ addiu $a0, $s0, 0x020C ## $a0 = 0000020C /* 0104C 808C21DC 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 01050 808C21E0 E7A40010 */ swc1 $f4, 0x0010($sp) -/* 01054 808C21E4 44059000 */ mfc1 $a1, $f18 +/* 01050 808C21E0 E7A40010 */ swc1 $f4, 0x0010($sp) +/* 01054 808C21E4 44059000 */ mfc1 $a1, $f18 /* 01058 808C21E8 0C01E0C4 */ jal Math_SmoothScaleMaxMinF - + /* 0105C 808C21EC 00000000 */ nop /* 01060 808C21F0 3C0142B4 */ lui $at, 0x42B4 ## $at = 42B40000 /* 01064 808C21F4 44814000 */ mtc1 $at, $f8 ## $f8 = 90.00 @@ -349,16 +349,16 @@ glabel L808C2190 /* 01070 808C2200 C6100204 */ lwc1 $f16, 0x0204($s0) ## 00000204 /* 01074 808C2204 C60603EC */ lwc1 $f6, 0x03EC($s0) ## 000003EC /* 01078 808C2208 3C063E4C */ lui $a2, 0x3E4C ## $a2 = 3E4C0000 -/* 0107C 808C220C 46128102 */ mul.s $f4, $f16, $f18 -/* 01080 808C2210 46083280 */ add.s $f10, $f6, $f8 +/* 0107C 808C220C 46128102 */ mul.s $f4, $f16, $f18 +/* 01080 808C2210 46083280 */ add.s $f10, $f6, $f8 /* 01084 808C2214 44803000 */ mtc1 $zero, $f6 ## $f6 = 0.00 /* 01088 808C2218 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3E4CCCCD /* 0108C 808C221C 26040428 */ addiu $a0, $s0, 0x0428 ## $a0 = 00000428 -/* 01090 808C2220 44055000 */ mfc1 $a1, $f10 -/* 01094 808C2224 E7A60010 */ swc1 $f6, 0x0010($sp) -/* 01098 808C2228 44072000 */ mfc1 $a3, $f4 +/* 01090 808C2220 44055000 */ mfc1 $a1, $f10 +/* 01094 808C2224 E7A60010 */ swc1 $f6, 0x0010($sp) +/* 01098 808C2228 44072000 */ mfc1 $a3, $f4 /* 0109C 808C222C 0C01E0C4 */ jal Math_SmoothScaleMaxMinF - + /* 010A0 808C2230 00000000 */ nop /* 010A4 808C2234 3C014248 */ lui $at, 0x4248 ## $at = 42480000 /* 010A8 808C2238 44815000 */ mtc1 $at, $f10 ## $f10 = 50.00 @@ -367,30 +367,30 @@ glabel L808C2190 /* 010B4 808C2244 C6120204 */ lwc1 $f18, 0x0204($s0) ## 00000204 /* 010B8 808C2248 C60803F0 */ lwc1 $f8, 0x03F0($s0) ## 000003F0 /* 010BC 808C224C 3C063E4C */ lui $a2, 0x3E4C ## $a2 = 3E4C0000 -/* 010C0 808C2250 46049182 */ mul.s $f6, $f18, $f4 -/* 010C4 808C2254 460A4400 */ add.s $f16, $f8, $f10 +/* 010C0 808C2250 46049182 */ mul.s $f6, $f18, $f4 +/* 010C4 808C2254 460A4400 */ add.s $f16, $f8, $f10 /* 010C8 808C2258 44804000 */ mtc1 $zero, $f8 ## $f8 = 0.00 /* 010CC 808C225C 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3E4CCCCD /* 010D0 808C2260 2604042C */ addiu $a0, $s0, 0x042C ## $a0 = 0000042C -/* 010D4 808C2264 44058000 */ mfc1 $a1, $f16 -/* 010D8 808C2268 E7A80010 */ swc1 $f8, 0x0010($sp) -/* 010DC 808C226C 44073000 */ mfc1 $a3, $f6 +/* 010D4 808C2264 44058000 */ mfc1 $a1, $f16 +/* 010D8 808C2268 E7A80010 */ swc1 $f8, 0x0010($sp) +/* 010DC 808C226C 44073000 */ mfc1 $a3, $f6 /* 010E0 808C2270 0C01E0C4 */ jal Math_SmoothScaleMaxMinF - + /* 010E4 808C2274 00000000 */ nop /* 010E8 808C2278 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 /* 010EC 808C227C 44818000 */ mtc1 $at, $f16 ## $f16 = 20.00 /* 010F0 808C2280 C60A0204 */ lwc1 $f10, 0x0204($s0) ## 00000204 /* 010F4 808C2284 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 /* 010F8 808C2288 8E0503F4 */ lw $a1, 0x03F4($s0) ## 000003F4 -/* 010FC 808C228C 46105482 */ mul.s $f18, $f10, $f16 +/* 010FC 808C228C 46105482 */ mul.s $f18, $f10, $f16 /* 01100 808C2290 3C063E4C */ lui $a2, 0x3E4C ## $a2 = 3E4C0000 /* 01104 808C2294 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3E4CCCCD /* 01108 808C2298 26040430 */ addiu $a0, $s0, 0x0430 ## $a0 = 00000430 -/* 0110C 808C229C E7A40010 */ swc1 $f4, 0x0010($sp) -/* 01110 808C22A0 44079000 */ mfc1 $a3, $f18 +/* 0110C 808C229C E7A40010 */ swc1 $f4, 0x0010($sp) +/* 01110 808C22A0 44079000 */ mfc1 $a3, $f18 /* 01114 808C22A4 0C01E0C4 */ jal Math_SmoothScaleMaxMinF - + /* 01118 808C22A8 00000000 */ nop /* 0111C 808C22AC 3C014120 */ lui $at, 0x4120 ## $at = 41200000 /* 01120 808C22B0 44814000 */ mtc1 $at, $f8 ## $f8 = 10.00 @@ -399,16 +399,16 @@ glabel L808C2190 /* 0112C 808C22BC C6100204 */ lwc1 $f16, 0x0204($s0) ## 00000204 /* 01130 808C22C0 C60603F0 */ lwc1 $f6, 0x03F0($s0) ## 000003F0 /* 01134 808C22C4 3C063E4C */ lui $a2, 0x3E4C ## $a2 = 3E4C0000 -/* 01138 808C22C8 46128102 */ mul.s $f4, $f16, $f18 -/* 0113C 808C22CC 46083281 */ sub.s $f10, $f6, $f8 +/* 01138 808C22C8 46128102 */ mul.s $f4, $f16, $f18 +/* 0113C 808C22CC 46083281 */ sub.s $f10, $f6, $f8 /* 01140 808C22D0 44803000 */ mtc1 $zero, $f6 ## $f6 = 0.00 /* 01144 808C22D4 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3E4CCCCD /* 01148 808C22D8 26040438 */ addiu $a0, $s0, 0x0438 ## $a0 = 00000438 -/* 0114C 808C22DC 44055000 */ mfc1 $a1, $f10 -/* 01150 808C22E0 E7A60010 */ swc1 $f6, 0x0010($sp) -/* 01154 808C22E4 44072000 */ mfc1 $a3, $f4 +/* 0114C 808C22DC 44055000 */ mfc1 $a1, $f10 +/* 01150 808C22E0 E7A60010 */ swc1 $f6, 0x0010($sp) +/* 01154 808C22E4 44072000 */ mfc1 $a3, $f4 /* 01158 808C22E8 0C01E0C4 */ jal Math_SmoothScaleMaxMinF - + /* 0115C 808C22EC 00000000 */ nop /* 01160 808C22F0 44804000 */ mtc1 $zero, $f8 ## $f8 = 0.00 /* 01164 808C22F4 3C073CA3 */ lui $a3, 0x3CA3 ## $a3 = 3CA30000 @@ -417,66 +417,66 @@ glabel L808C2190 /* 01170 808C2300 3C053F80 */ lui $a1, 0x3F80 ## $a1 = 3F800000 /* 01174 808C2304 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 01178 808C2308 0C01E0C4 */ jal Math_SmoothScaleMaxMinF - -/* 0117C 808C230C E7A80010 */ swc1 $f8, 0x0010($sp) -/* 01180 808C2310 8FA8006C */ lw $t0, 0x006C($sp) + +/* 0117C 808C230C E7A80010 */ swc1 $f8, 0x0010($sp) +/* 01180 808C2310 8FA8006C */ lw $t0, 0x006C($sp) /* 01184 808C2314 C6100024 */ lwc1 $f16, 0x0024($s0) ## 00000024 /* 01188 808C2318 3C014348 */ lui $at, 0x4348 ## $at = 43480000 /* 0118C 808C231C C50A0024 */ lwc1 $f10, 0x0024($t0) ## 00000024 /* 01190 808C2320 44819000 */ mtc1 $at, $f18 ## $f18 = 200.00 /* 01194 808C2324 3C040601 */ lui $a0, 0x0601 ## $a0 = 06010000 -/* 01198 808C2328 46105001 */ sub.s $f0, $f10, $f16 +/* 01198 808C2328 46105001 */ sub.s $f0, $f10, $f16 /* 0119C 808C232C 24090004 */ addiu $t1, $zero, 0x0004 ## $t1 = 00000004 /* 011A0 808C2330 240A001E */ addiu $t2, $zero, 0x001E ## $t2 = 0000001E /* 011A4 808C2334 240B0096 */ addiu $t3, $zero, 0x0096 ## $t3 = 00000096 -/* 011A8 808C2338 46000005 */ abs.s $f0, $f0 +/* 011A8 808C2338 46000005 */ abs.s $f0, $f0 /* 011AC 808C233C 24848EEC */ addiu $a0, $a0, 0x8EEC ## $a0 = 06008EEC -/* 011B0 808C2340 4612003C */ c.lt.s $f0, $f18 +/* 011B0 808C2340 4612003C */ c.lt.s $f0, $f18 /* 011B4 808C2344 00000000 */ nop -/* 011B8 808C2348 450200F8 */ bc1fl .L808C272C +/* 011B8 808C2348 450200F8 */ bc1fl .L808C272C /* 011BC 808C234C 860B01B4 */ lh $t3, 0x01B4($s0) ## 000001B4 /* 011C0 808C2350 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 /* 011C4 808C2354 A609019C */ sh $t1, 0x019C($s0) ## 0000019C /* 011C8 808C2358 A60A0196 */ sh $t2, 0x0196($s0) ## 00000196 /* 011CC 808C235C A60B0198 */ sh $t3, 0x0198($s0) ## 00000198 /* 011D0 808C2360 0C028800 */ jal SkelAnime_GetFrameCount - + /* 011D4 808C2364 E6040204 */ swc1 $f4, 0x0204($s0) ## 00000204 /* 011D8 808C2368 44823000 */ mtc1 $v0, $f6 ## $f6 = 0.00 /* 011DC 808C236C 3C01C0A0 */ lui $at, 0xC0A0 ## $at = C0A00000 /* 011E0 808C2370 44815000 */ mtc1 $at, $f10 ## $f10 = -5.00 -/* 011E4 808C2374 46803220 */ cvt.s.w $f8, $f6 +/* 011E4 808C2374 46803220 */ cvt.s.w $f8, $f6 /* 011E8 808C2378 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 /* 011EC 808C237C 240C0002 */ addiu $t4, $zero, 0x0002 ## $t4 = 00000002 -/* 011F0 808C2380 AFAC0014 */ sw $t4, 0x0014($sp) +/* 011F0 808C2380 AFAC0014 */ sw $t4, 0x0014($sp) /* 011F4 808C2384 24A58EEC */ addiu $a1, $a1, 0x8EEC ## $a1 = 06008EEC /* 011F8 808C2388 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C -/* 011FC 808C238C E7A80010 */ swc1 $f8, 0x0010($sp) +/* 011FC 808C238C E7A80010 */ swc1 $f8, 0x0010($sp) /* 01200 808C2390 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 01204 808C2394 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 01208 808C2398 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 0120C 808C239C E7AA0018 */ swc1 $f10, 0x0018($sp) -/* 01210 808C23A0 100000E2 */ beq $zero, $zero, .L808C272C +/* 01208 808C2398 0C029468 */ jal SkelAnime_ChangeAnim + +/* 0120C 808C239C E7AA0018 */ swc1 $f10, 0x0018($sp) +/* 01210 808C23A0 100000E2 */ beq $zero, $zero, .L808C272C /* 01214 808C23A4 860B01B4 */ lh $t3, 0x01B4($s0) ## 000001B4 glabel L808C23A8 /* 01218 808C23A8 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 /* 0121C 808C23AC 3C073C23 */ lui $a3, 0x3C23 ## $a3 = 3C230000 /* 01220 808C23B0 34E7D70A */ ori $a3, $a3, 0xD70A ## $a3 = 3C23D70A -/* 01224 808C23B4 44050000 */ mfc1 $a1, $f0 +/* 01224 808C23B4 44050000 */ mfc1 $a1, $f0 /* 01228 808C23B8 2604020C */ addiu $a0, $s0, 0x020C ## $a0 = 0000020C /* 0122C 808C23BC 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 01230 808C23C0 0C01E0C4 */ jal Math_SmoothScaleMaxMinF - -/* 01234 808C23C4 E7A00010 */ swc1 $f0, 0x0010($sp) + +/* 01234 808C23C4 E7A00010 */ swc1 $f0, 0x0010($sp) /* 01238 808C23C8 3C0D8016 */ lui $t5, 0x8016 ## $t5 = 80160000 /* 0123C 808C23CC 95ADF542 */ lhu $t5, -0x0ABE($t5) ## 8015F542 -/* 01240 808C23D0 8FAF006C */ lw $t7, 0x006C($sp) +/* 01240 808C23D0 8FAF006C */ lw $t7, 0x006C($sp) /* 01244 808C23D4 31AE0002 */ andi $t6, $t5, 0x0002 ## $t6 = 00000000 -/* 01248 808C23D8 11C00004 */ beq $t6, $zero, .L808C23EC +/* 01248 808C23D8 11C00004 */ beq $t6, $zero, .L808C23EC /* 0124C 808C23DC 3C01C248 */ lui $at, 0xC248 ## $at = C2480000 /* 01250 808C23E0 44810000 */ mtc1 $at, $f0 ## $f0 = -50.00 -/* 01254 808C23E4 10000004 */ beq $zero, $zero, .L808C23F8 +/* 01254 808C23E4 10000004 */ beq $zero, $zero, .L808C23F8 /* 01258 808C23E8 3C01428C */ lui $at, 0x428C ## $at = 428C0000 .L808C23EC: /* 0125C 808C23EC 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 @@ -488,114 +488,114 @@ glabel L808C23A8 /* 01270 808C2400 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 /* 01274 808C2404 44815000 */ mtc1 $at, $f10 ## $f10 = 20.00 /* 01278 808C2408 C6080204 */ lwc1 $f8, 0x0204($s0) ## 00000204 -/* 0127C 808C240C 46008480 */ add.s $f18, $f16, $f0 +/* 0127C 808C240C 46008480 */ add.s $f18, $f16, $f0 /* 01280 808C2410 26040428 */ addiu $a0, $s0, 0x0428 ## $a0 = 00000428 -/* 01284 808C2414 460A4402 */ mul.s $f16, $f8, $f10 +/* 01284 808C2414 460A4402 */ mul.s $f16, $f8, $f10 /* 01288 808C2418 3C063E4C */ lui $a2, 0x3E4C ## $a2 = 3E4C0000 -/* 0128C 808C241C 46049180 */ add.s $f6, $f18, $f4 +/* 0128C 808C241C 46049180 */ add.s $f6, $f18, $f4 /* 01290 808C2420 44809000 */ mtc1 $zero, $f18 ## $f18 = 0.00 /* 01294 808C2424 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3E4CCCCD -/* 01298 808C2428 AFA40038 */ sw $a0, 0x0038($sp) -/* 0129C 808C242C 44053000 */ mfc1 $a1, $f6 -/* 012A0 808C2430 44078000 */ mfc1 $a3, $f16 +/* 01298 808C2428 AFA40038 */ sw $a0, 0x0038($sp) +/* 0129C 808C242C 44053000 */ mfc1 $a1, $f6 +/* 012A0 808C2430 44078000 */ mfc1 $a3, $f16 /* 012A4 808C2434 0C01E0C4 */ jal Math_SmoothScaleMaxMinF - -/* 012A8 808C2438 E7B20010 */ swc1 $f18, 0x0010($sp) + +/* 012A8 808C2438 E7B20010 */ swc1 $f18, 0x0010($sp) /* 012AC 808C243C 3C014120 */ lui $at, 0x4120 ## $at = 41200000 /* 012B0 808C2440 44813000 */ mtc1 $at, $f6 ## $f6 = 10.00 /* 012B4 808C2444 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 /* 012B8 808C2448 44818000 */ mtc1 $at, $f16 ## $f16 = 20.00 -/* 012BC 808C244C 8FB8006C */ lw $t8, 0x006C($sp) +/* 012BC 808C244C 8FB8006C */ lw $t8, 0x006C($sp) /* 012C0 808C2450 C60A0204 */ lwc1 $f10, 0x0204($s0) ## 00000204 /* 012C4 808C2454 3C063E4C */ lui $a2, 0x3E4C ## $a2 = 3E4C0000 /* 012C8 808C2458 C7040028 */ lwc1 $f4, 0x0028($t8) ## 00000028 -/* 012CC 808C245C 46105482 */ mul.s $f18, $f10, $f16 +/* 012CC 808C245C 46105482 */ mul.s $f18, $f10, $f16 /* 012D0 808C2460 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3E4CCCCD -/* 012D4 808C2464 46062200 */ add.s $f8, $f4, $f6 +/* 012D4 808C2464 46062200 */ add.s $f8, $f4, $f6 /* 012D8 808C2468 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 /* 012DC 808C246C 2604042C */ addiu $a0, $s0, 0x042C ## $a0 = 0000042C -/* 012E0 808C2470 44054000 */ mfc1 $a1, $f8 -/* 012E4 808C2474 44079000 */ mfc1 $a3, $f18 +/* 012E0 808C2470 44054000 */ mfc1 $a1, $f8 +/* 012E4 808C2474 44079000 */ mfc1 $a3, $f18 /* 012E8 808C2478 0C01E0C4 */ jal Math_SmoothScaleMaxMinF - -/* 012EC 808C247C E7A40010 */ swc1 $f4, 0x0010($sp) + +/* 012EC 808C247C E7A40010 */ swc1 $f4, 0x0010($sp) /* 012F0 808C2480 3C014270 */ lui $at, 0x4270 ## $at = 42700000 /* 012F4 808C2484 44814000 */ mtc1 $at, $f8 ## $f8 = 60.00 /* 012F8 808C2488 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 /* 012FC 808C248C 44819000 */ mtc1 $at, $f18 ## $f18 = 20.00 -/* 01300 808C2490 8FB9006C */ lw $t9, 0x006C($sp) +/* 01300 808C2490 8FB9006C */ lw $t9, 0x006C($sp) /* 01304 808C2494 C6100204 */ lwc1 $f16, 0x0204($s0) ## 00000204 /* 01308 808C2498 3C063E4C */ lui $a2, 0x3E4C ## $a2 = 3E4C0000 /* 0130C 808C249C C726002C */ lwc1 $f6, 0x002C($t9) ## 0000002C -/* 01310 808C24A0 46128102 */ mul.s $f4, $f16, $f18 +/* 01310 808C24A0 46128102 */ mul.s $f4, $f16, $f18 /* 01314 808C24A4 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3E4CCCCD -/* 01318 808C24A8 46083281 */ sub.s $f10, $f6, $f8 +/* 01318 808C24A8 46083281 */ sub.s $f10, $f6, $f8 /* 0131C 808C24AC 44803000 */ mtc1 $zero, $f6 ## $f6 = 0.00 /* 01320 808C24B0 26040430 */ addiu $a0, $s0, 0x0430 ## $a0 = 00000430 -/* 01324 808C24B4 44055000 */ mfc1 $a1, $f10 -/* 01328 808C24B8 44072000 */ mfc1 $a3, $f4 +/* 01324 808C24B4 44055000 */ mfc1 $a1, $f10 +/* 01328 808C24B8 44072000 */ mfc1 $a3, $f4 /* 0132C 808C24BC 0C01E0C4 */ jal Math_SmoothScaleMaxMinF - -/* 01330 808C24C0 E7A60010 */ swc1 $f6, 0x0010($sp) + +/* 01330 808C24C0 E7A60010 */ swc1 $f6, 0x0010($sp) /* 01334 808C24C4 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 /* 01338 808C24C8 44815000 */ mtc1 $at, $f10 ## $f10 = 20.00 /* 0133C 808C24CC C6080204 */ lwc1 $f8, 0x0204($s0) ## 00000204 /* 01340 808C24D0 44809000 */ mtc1 $zero, $f18 ## $f18 = 0.00 /* 01344 808C24D4 26040434 */ addiu $a0, $s0, 0x0434 ## $a0 = 00000434 -/* 01348 808C24D8 460A4402 */ mul.s $f16, $f8, $f10 +/* 01348 808C24D8 460A4402 */ mul.s $f16, $f8, $f10 /* 0134C 808C24DC 8E0503EC */ lw $a1, 0x03EC($s0) ## 000003EC /* 01350 808C24E0 3C063E4C */ lui $a2, 0x3E4C ## $a2 = 3E4C0000 /* 01354 808C24E4 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3E4CCCCD -/* 01358 808C24E8 AFA40034 */ sw $a0, 0x0034($sp) -/* 0135C 808C24EC E7B20010 */ swc1 $f18, 0x0010($sp) -/* 01360 808C24F0 44078000 */ mfc1 $a3, $f16 +/* 01358 808C24E8 AFA40034 */ sw $a0, 0x0034($sp) +/* 0135C 808C24EC E7B20010 */ swc1 $f18, 0x0010($sp) +/* 01360 808C24F0 44078000 */ mfc1 $a3, $f16 /* 01364 808C24F4 0C01E0C4 */ jal Math_SmoothScaleMaxMinF - + /* 01368 808C24F8 00000000 */ nop /* 0136C 808C24FC 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 /* 01370 808C2500 44813000 */ mtc1 $at, $f6 ## $f6 = 20.00 /* 01374 808C2504 C6040204 */ lwc1 $f4, 0x0204($s0) ## 00000204 /* 01378 808C2508 44805000 */ mtc1 $zero, $f10 ## $f10 = 0.00 /* 0137C 808C250C 8E0503F0 */ lw $a1, 0x03F0($s0) ## 000003F0 -/* 01380 808C2510 46062202 */ mul.s $f8, $f4, $f6 +/* 01380 808C2510 46062202 */ mul.s $f8, $f4, $f6 /* 01384 808C2514 3C063E4C */ lui $a2, 0x3E4C ## $a2 = 3E4C0000 /* 01388 808C2518 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3E4CCCCD /* 0138C 808C251C 26040438 */ addiu $a0, $s0, 0x0438 ## $a0 = 00000438 -/* 01390 808C2520 E7AA0010 */ swc1 $f10, 0x0010($sp) -/* 01394 808C2524 44074000 */ mfc1 $a3, $f8 +/* 01390 808C2520 E7AA0010 */ swc1 $f10, 0x0010($sp) +/* 01394 808C2524 44074000 */ mfc1 $a3, $f8 /* 01398 808C2528 0C01E0C4 */ jal Math_SmoothScaleMaxMinF - + /* 0139C 808C252C 00000000 */ nop /* 013A0 808C2530 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 /* 013A4 808C2534 44819000 */ mtc1 $at, $f18 ## $f18 = 20.00 /* 013A8 808C2538 C6100204 */ lwc1 $f16, 0x0204($s0) ## 00000204 /* 013AC 808C253C 44803000 */ mtc1 $zero, $f6 ## $f6 = 0.00 /* 013B0 808C2540 8E0503F4 */ lw $a1, 0x03F4($s0) ## 000003F4 -/* 013B4 808C2544 46128102 */ mul.s $f4, $f16, $f18 +/* 013B4 808C2544 46128102 */ mul.s $f4, $f16, $f18 /* 013B8 808C2548 3C063E4C */ lui $a2, 0x3E4C ## $a2 = 3E4C0000 /* 013BC 808C254C 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3E4CCCCD /* 013C0 808C2550 2604043C */ addiu $a0, $s0, 0x043C ## $a0 = 0000043C -/* 013C4 808C2554 E7A60010 */ swc1 $f6, 0x0010($sp) -/* 013C8 808C2558 44072000 */ mfc1 $a3, $f4 +/* 013C4 808C2554 E7A60010 */ swc1 $f6, 0x0010($sp) +/* 013C8 808C2558 44072000 */ mfc1 $a3, $f4 /* 013CC 808C255C 0C01E0C4 */ jal Math_SmoothScaleMaxMinF - + /* 013D0 808C2560 00000000 */ nop /* 013D4 808C2564 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 /* 013D8 808C2568 44811000 */ mtc1 $at, $f2 ## $f2 = 1.00 /* 013DC 808C256C 44804000 */ mtc1 $zero, $f8 ## $f8 = 0.00 /* 013E0 808C2570 3C073CA3 */ lui $a3, 0x3CA3 ## $a3 = 3CA30000 -/* 013E4 808C2574 44051000 */ mfc1 $a1, $f2 -/* 013E8 808C2578 44061000 */ mfc1 $a2, $f2 +/* 013E4 808C2574 44051000 */ mfc1 $a1, $f2 +/* 013E8 808C2578 44061000 */ mfc1 $a2, $f2 /* 013EC 808C257C 34E7D70A */ ori $a3, $a3, 0xD70A ## $a3 = 3CA3D70A /* 013F0 808C2580 26040204 */ addiu $a0, $s0, 0x0204 ## $a0 = 00000204 /* 013F4 808C2584 0C01E0C4 */ jal Math_SmoothScaleMaxMinF - -/* 013F8 808C2588 E7A80010 */ swc1 $f8, 0x0010($sp) + +/* 013F8 808C2588 E7A80010 */ swc1 $f8, 0x0010($sp) /* 013FC 808C258C 86080196 */ lh $t0, 0x0196($s0) ## 00000196 -/* 01400 808C2590 5500000D */ bnel $t0, $zero, .L808C25C8 +/* 01400 808C2590 5500000D */ bnel $t0, $zero, .L808C25C8 /* 01404 808C2594 86030198 */ lh $v1, 0x0198($s0) ## 00000198 /* 01408 808C2598 0C02927F */ jal SkelAnime_FrameUpdateMatrix - + /* 0140C 808C259C 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C /* 01410 808C25A0 44805000 */ mtc1 $zero, $f10 ## $f10 = 0.00 /* 01414 808C25A4 3C053D4C */ lui $a1, 0x3D4C ## $a1 = 3D4C0000 @@ -605,60 +605,60 @@ glabel L808C23A8 /* 01424 808C25B4 26040208 */ addiu $a0, $s0, 0x0208 ## $a0 = 00000208 /* 01428 808C25B8 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 0142C 808C25BC 0C01E0C4 */ jal Math_SmoothScaleMaxMinF - -/* 01430 808C25C0 E7AA0010 */ swc1 $f10, 0x0010($sp) + +/* 01430 808C25C0 E7AA0010 */ swc1 $f10, 0x0010($sp) /* 01434 808C25C4 86030198 */ lh $v1, 0x0198($s0) ## 00000198 .L808C25C8: /* 01438 808C25C8 24010064 */ addiu $at, $zero, 0x0064 ## $at = 00000064 /* 0143C 808C25CC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01440 808C25D0 54610005 */ bnel $v1, $at, .L808C25E8 +/* 01440 808C25D0 54610005 */ bnel $v1, $at, .L808C25E8 /* 01444 808C25D4 2401005A */ addiu $at, $zero, 0x005A ## $at = 0000005A /* 01448 808C25D8 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 0144C 808C25DC 24053852 */ addiu $a1, $zero, 0x3852 ## $a1 = 00003852 /* 01450 808C25E0 86030198 */ lh $v1, 0x0198($s0) ## 00000198 /* 01454 808C25E4 2401005A */ addiu $at, $zero, 0x005A ## $at = 0000005A .L808C25E8: -/* 01458 808C25E8 1461001F */ bne $v1, $at, .L808C2668 +/* 01458 808C25E8 1461001F */ bne $v1, $at, .L808C2668 /* 0145C 808C25EC 3C098016 */ lui $t1, 0x8016 ## $t1 = 80160000 /* 01460 808C25F0 9529F542 */ lhu $t1, -0x0ABE($t1) ## 8015F542 -/* 01464 808C25F4 8FA4007C */ lw $a0, 0x007C($sp) +/* 01464 808C25F4 8FA4007C */ lw $a0, 0x007C($sp) /* 01468 808C25F8 3C020601 */ lui $v0, 0x0601 ## $v0 = 06010000 /* 0146C 808C25FC 312A0002 */ andi $t2, $t1, 0x0002 ## $t2 = 00000000 -/* 01470 808C2600 15400016 */ bne $t2, $zero, .L808C265C +/* 01470 808C2600 15400016 */ bne $t2, $zero, .L808C265C /* 01474 808C2604 24851D4C */ addiu $a1, $a0, 0x1D4C ## $a1 = 00001D4C /* 01478 808C2608 24427410 */ addiu $v0, $v0, 0x7410 ## $v0 = 06017410 -/* 0147C 808C260C 00025900 */ sll $t3, $v0, 4 -/* 01480 808C2610 000B6702 */ srl $t4, $t3, 28 -/* 01484 808C2614 000C6880 */ sll $t5, $t4, 2 +/* 0147C 808C260C 00025900 */ sll $t3, $v0, 4 +/* 01480 808C2610 000B6702 */ srl $t4, $t3, 28 +/* 01484 808C2614 000C6880 */ sll $t5, $t4, 2 /* 01488 808C2618 3C0E8016 */ lui $t6, 0x8016 ## $t6 = 80160000 -/* 0148C 808C261C 01CD7021 */ addu $t6, $t6, $t5 +/* 0148C 808C261C 01CD7021 */ addu $t6, $t6, $t5 /* 01490 808C2620 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 /* 01494 808C2624 8DCE6FA8 */ lw $t6, 0x6FA8($t6) ## 80166FA8 /* 01498 808C2628 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF -/* 0149C 808C262C 00417824 */ and $t7, $v0, $at +/* 0149C 808C262C 00417824 */ and $t7, $v0, $at /* 014A0 808C2630 3C018000 */ lui $at, 0x8000 ## $at = 80000000 /* 014A4 808C2634 241800B4 */ addiu $t8, $zero, 0x00B4 ## $t8 = 000000B4 /* 014A8 808C2638 24190080 */ addiu $t9, $zero, 0x0080 ## $t9 = 00000080 /* 014AC 808C263C 24080028 */ addiu $t0, $zero, 0x0028 ## $t0 = 00000028 -/* 014B0 808C2640 01CF3021 */ addu $a2, $t6, $t7 -/* 014B4 808C2644 00C13021 */ addu $a2, $a2, $at -/* 014B8 808C2648 AFA80018 */ sw $t0, 0x0018($sp) -/* 014BC 808C264C AFB90014 */ sw $t9, 0x0014($sp) -/* 014C0 808C2650 AFB80010 */ sw $t8, 0x0010($sp) +/* 014B0 808C2640 01CF3021 */ addu $a2, $t6, $t7 +/* 014B4 808C2644 00C13021 */ addu $a2, $a2, $at +/* 014B8 808C2648 AFA80018 */ sw $t0, 0x0018($sp) +/* 014BC 808C264C AFB90014 */ sw $t9, 0x0014($sp) +/* 014C0 808C2650 AFB80010 */ sw $t8, 0x0010($sp) /* 014C4 808C2654 0C00B380 */ jal TitleCard_InitBossName - + /* 014C8 808C2658 240700A0 */ addiu $a3, $zero, 0x00A0 ## $a3 = 000000A0 .L808C265C: /* 014CC 808C265C 0C03E803 */ jal Audio_SetBGM - + /* 014D0 808C2660 2404006B */ addiu $a0, $zero, 0x006B ## $a0 = 0000006B /* 014D4 808C2664 86030198 */ lh $v1, 0x0198($s0) ## 00000198 .L808C2668: -/* 014D8 808C2668 54600030 */ bnel $v1, $zero, .L808C272C +/* 014D8 808C2668 54600030 */ bnel $v1, $zero, .L808C272C /* 014DC 808C266C 860B01B4 */ lh $t3, 0x01B4($s0) ## 000001B4 -/* 014E0 808C2670 8FA30038 */ lw $v1, 0x0038($sp) -/* 014E4 808C2674 8FA20070 */ lw $v0, 0x0070($sp) +/* 014E0 808C2670 8FA30038 */ lw $v1, 0x0038($sp) +/* 014E4 808C2674 8FA20070 */ lw $v0, 0x0070($sp) /* 014E8 808C2678 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 /* 014EC 808C267C 8C6A0000 */ lw $t2, 0x0000($v1) ## 00000000 /* 014F0 808C2680 AC4A005C */ sw $t2, 0x005C($v0) ## 0000005C @@ -672,7 +672,7 @@ glabel L808C23A8 /* 01510 808C26A0 AC4B0078 */ sw $t3, 0x0078($v0) ## 00000078 /* 01514 808C26A4 8C6C0008 */ lw $t4, 0x0008($v1) ## 00000008 /* 01518 808C26A8 AC4C007C */ sw $t4, 0x007C($v0) ## 0000007C -/* 0151C 808C26AC 8FAD0034 */ lw $t5, 0x0034($sp) +/* 0151C 808C26AC 8FAD0034 */ lw $t5, 0x0034($sp) /* 01520 808C26B0 8DAF0000 */ lw $t7, 0x0000($t5) ## 00000000 /* 01524 808C26B4 AC4F0050 */ sw $t7, 0x0050($v0) ## 00000050 /* 01528 808C26B8 8DAE0004 */ lw $t6, 0x0004($t5) ## 00000004 @@ -680,22 +680,22 @@ glabel L808C23A8 /* 01530 808C26C0 8DAF0008 */ lw $t7, 0x0008($t5) ## 00000008 /* 01534 808C26C4 AC4F0058 */ sw $t7, 0x0058($v0) ## 00000058 /* 01538 808C26C8 860501B4 */ lh $a1, 0x01B4($s0) ## 000001B4 -/* 0153C 808C26CC 0C03022B */ jal func_800C08AC -/* 01540 808C26D0 8FA4007C */ lw $a0, 0x007C($sp) -/* 01544 808C26D4 8FA4007C */ lw $a0, 0x007C($sp) +/* 0153C 808C26CC 0C03022B */ jal func_800C08AC +/* 01540 808C26D0 8FA4007C */ lw $a0, 0x007C($sp) +/* 01544 808C26D4 8FA4007C */ lw $a0, 0x007C($sp) /* 01548 808C26D8 A60001B4 */ sh $zero, 0x01B4($s0) ## 000001B4 -/* 0154C 808C26DC 0C01914D */ jal func_80064534 +/* 0154C 808C26DC 0C01914D */ jal func_80064534 /* 01550 808C26E0 24851D64 */ addiu $a1, $a0, 0x1D64 ## $a1 = 00001D64 -/* 01554 808C26E4 8FA4007C */ lw $a0, 0x007C($sp) +/* 01554 808C26E4 8FA4007C */ lw $a0, 0x007C($sp) /* 01558 808C26E8 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 0155C 808C26EC 0C00B7D5 */ jal func_8002DF54 +/* 0155C 808C26EC 0C00B7D5 */ jal func_8002DF54 /* 01560 808C26F0 24060007 */ addiu $a2, $zero, 0x0007 ## $a2 = 00000007 -/* 01564 808C26F4 0C230A6C */ jal func_808C29B0 +/* 01564 808C26F4 0C230A6C */ jal func_808C29B0 /* 01568 808C26F8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 0156C 808C26FC 24180032 */ addiu $t8, $zero, 0x0032 ## $t8 = 00000032 /* 01570 808C2700 A61801DA */ sh $t8, 0x01DA($s0) ## 000001DA /* 01574 808C2704 A60001BC */ sh $zero, 0x01BC($s0) ## 000001BC -/* 01578 808C2708 8FA8006C */ lw $t0, 0x006C($sp) +/* 01578 808C2708 8FA8006C */ lw $t0, 0x006C($sp) /* 0157C 808C270C 2419BFFE */ addiu $t9, $zero, 0xBFFE ## $t9 = FFFFBFFE /* 01580 808C2710 3C098016 */ lui $t1, 0x8016 ## $t1 = 80160000 /* 01584 808C2714 A51900B6 */ sh $t9, 0x00B6($t0) ## 000000B6 @@ -706,93 +706,93 @@ glabel L808C23A8 .L808C2728: /* 01598 808C2728 860B01B4 */ lh $t3, 0x01B4($s0) ## 000001B4 .L808C272C: -/* 0159C 808C272C 5160004F */ beql $t3, $zero, .L808C286C -/* 015A0 808C2730 8FBF002C */ lw $ra, 0x002C($sp) +/* 0159C 808C272C 5160004F */ beql $t3, $zero, .L808C286C +/* 015A0 808C2730 8FBF002C */ lw $ra, 0x002C($sp) /* 015A4 808C2734 860201B6 */ lh $v0, 0x01B6($s0) ## 000001B6 -/* 015A8 808C2738 10400002 */ beq $v0, $zero, .L808C2744 +/* 015A8 808C2738 10400002 */ beq $v0, $zero, .L808C2744 /* 015AC 808C273C 244CFFFF */ addiu $t4, $v0, 0xFFFF ## $t4 = FFFFFFFF /* 015B0 808C2740 A60C01B6 */ sh $t4, 0x01B6($s0) ## 000001B6 .L808C2744: /* 015B4 808C2744 C6100428 */ lwc1 $f16, 0x0428($s0) ## 00000428 /* 015B8 808C2748 3C01808D */ lui $at, %hi(D_808CA6A4) ## $at = 808D0000 -/* 015BC 808C274C C426A6A4 */ lwc1 $f6, %lo(D_808CA6A4)($at) -/* 015C0 808C2750 E7B00060 */ swc1 $f16, 0x0060($sp) +/* 015BC 808C274C C426A6A4 */ lwc1 $f6, %lo(D_808CA6A4)($at) +/* 015C0 808C2750 E7B00060 */ swc1 $f16, 0x0060($sp) /* 015C4 808C2754 860D01B6 */ lh $t5, 0x01B6($s0) ## 000001B6 /* 015C8 808C2758 3C0142B4 */ lui $at, 0x42B4 ## $at = 42B40000 /* 015CC 808C275C 44815000 */ mtc1 $at, $f10 ## $f10 = 90.00 /* 015D0 808C2760 448D9000 */ mtc1 $t5, $f18 ## $f18 = 0.00 /* 015D4 808C2764 3C014334 */ lui $at, 0x4334 ## $at = 43340000 -/* 015D8 808C2768 46809120 */ cvt.s.w $f4, $f18 +/* 015D8 808C2768 46809120 */ cvt.s.w $f4, $f18 /* 015DC 808C276C 44819000 */ mtc1 $at, $f18 ## $f18 = 180.00 -/* 015E0 808C2770 46062202 */ mul.s $f8, $f4, $f6 +/* 015E0 808C2770 46062202 */ mul.s $f8, $f4, $f6 /* 015E4 808C2774 00000000 */ nop -/* 015E8 808C2778 460A4402 */ mul.s $f16, $f8, $f10 +/* 015E8 808C2778 460A4402 */ mul.s $f16, $f8, $f10 /* 015EC 808C277C 0C0400A4 */ jal sinf - -/* 015F0 808C2780 46128303 */ div.s $f12, $f16, $f18 + +/* 015F0 808C2780 46128303 */ div.s $f12, $f16, $f18 /* 015F4 808C2784 860E01B6 */ lh $t6, 0x01B6($s0) ## 000001B6 /* 015F8 808C2788 3C01808D */ lui $at, %hi(D_808CA6A8) ## $at = 808D0000 -/* 015FC 808C278C C42AA6A8 */ lwc1 $f10, %lo(D_808CA6A8)($at) +/* 015FC 808C278C C42AA6A8 */ lwc1 $f10, %lo(D_808CA6A8)($at) /* 01600 808C2790 448E2000 */ mtc1 $t6, $f4 ## $f4 = 0.00 /* 01604 808C2794 C612042C */ lwc1 $f18, 0x042C($s0) ## 0000042C /* 01608 808C2798 3C01808D */ lui $at, %hi(D_808CA6AC) ## $at = 808D0000 -/* 0160C 808C279C 468021A0 */ cvt.s.w $f6, $f4 -/* 01610 808C27A0 46003202 */ mul.s $f8, $f6, $f0 +/* 0160C 808C279C 468021A0 */ cvt.s.w $f6, $f4 +/* 01610 808C27A0 46003202 */ mul.s $f8, $f6, $f0 /* 01614 808C27A4 00000000 */ nop -/* 01618 808C27A8 460A4402 */ mul.s $f16, $f8, $f10 -/* 0161C 808C27AC 46128100 */ add.s $f4, $f16, $f18 -/* 01620 808C27B0 C432A6AC */ lwc1 $f18, %lo(D_808CA6AC)($at) +/* 01618 808C27A8 460A4402 */ mul.s $f16, $f8, $f10 +/* 0161C 808C27AC 46128100 */ add.s $f4, $f16, $f18 +/* 01620 808C27B0 C432A6AC */ lwc1 $f18, %lo(D_808CA6AC)($at) /* 01624 808C27B4 3C0142B4 */ lui $at, 0x42B4 ## $at = 42B40000 -/* 01628 808C27B8 E7A40064 */ swc1 $f4, 0x0064($sp) +/* 01628 808C27B8 E7A40064 */ swc1 $f4, 0x0064($sp) /* 0162C 808C27BC C6060430 */ lwc1 $f6, 0x0430($s0) ## 00000430 -/* 01630 808C27C0 E7A60068 */ swc1 $f6, 0x0068($sp) +/* 01630 808C27C0 E7A60068 */ swc1 $f6, 0x0068($sp) /* 01634 808C27C4 C6080434 */ lwc1 $f8, 0x0434($s0) ## 00000434 /* 01638 808C27C8 44813000 */ mtc1 $at, $f6 ## $f6 = 90.00 /* 0163C 808C27CC 3C014334 */ lui $at, 0x4334 ## $at = 43340000 -/* 01640 808C27D0 E7A80054 */ swc1 $f8, 0x0054($sp) +/* 01640 808C27D0 E7A80054 */ swc1 $f8, 0x0054($sp) /* 01644 808C27D4 860F01B6 */ lh $t7, 0x01B6($s0) ## 000001B6 /* 01648 808C27D8 448F5000 */ mtc1 $t7, $f10 ## $f10 = 0.00 /* 0164C 808C27DC 00000000 */ nop -/* 01650 808C27E0 46805420 */ cvt.s.w $f16, $f10 +/* 01650 808C27E0 46805420 */ cvt.s.w $f16, $f10 /* 01654 808C27E4 44815000 */ mtc1 $at, $f10 ## $f10 = 180.00 -/* 01658 808C27E8 46128102 */ mul.s $f4, $f16, $f18 +/* 01658 808C27E8 46128102 */ mul.s $f4, $f16, $f18 /* 0165C 808C27EC 00000000 */ nop -/* 01660 808C27F0 46062202 */ mul.s $f8, $f4, $f6 +/* 01660 808C27F0 46062202 */ mul.s $f8, $f4, $f6 /* 01664 808C27F4 0C0400A4 */ jal sinf - -/* 01668 808C27F8 460A4303 */ div.s $f12, $f8, $f10 + +/* 01668 808C27F8 460A4303 */ div.s $f12, $f8, $f10 /* 0166C 808C27FC 861801B6 */ lh $t8, 0x01B6($s0) ## 000001B6 /* 01670 808C2800 3C01808D */ lui $at, %hi(D_808CA6B0) ## $at = 808D0000 -/* 01674 808C2804 C426A6B0 */ lwc1 $f6, %lo(D_808CA6B0)($at) +/* 01674 808C2804 C426A6B0 */ lwc1 $f6, %lo(D_808CA6B0)($at) /* 01678 808C2808 44988000 */ mtc1 $t8, $f16 ## $f16 = 0.00 /* 0167C 808C280C C60A0438 */ lwc1 $f10, 0x0438($s0) ## 00000438 /* 01680 808C2810 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 01684 808C2814 468084A0 */ cvt.s.w $f18, $f16 +/* 01684 808C2814 468084A0 */ cvt.s.w $f18, $f16 /* 01688 808C2818 27B90048 */ addiu $t9, $sp, 0x0048 ## $t9 = FFFFFFD0 -/* 0168C 808C281C 8FA4007C */ lw $a0, 0x007C($sp) +/* 0168C 808C281C 8FA4007C */ lw $a0, 0x007C($sp) /* 01690 808C2820 27A60054 */ addiu $a2, $sp, 0x0054 ## $a2 = FFFFFFDC /* 01694 808C2824 27A70060 */ addiu $a3, $sp, 0x0060 ## $a3 = FFFFFFE8 -/* 01698 808C2828 46009102 */ mul.s $f4, $f18, $f0 +/* 01698 808C2828 46009102 */ mul.s $f4, $f18, $f0 /* 0169C 808C282C 00000000 */ nop -/* 016A0 808C2830 46062202 */ mul.s $f8, $f4, $f6 +/* 016A0 808C2830 46062202 */ mul.s $f8, $f4, $f6 /* 016A4 808C2834 44813000 */ mtc1 $at, $f6 ## $f6 = 1.00 -/* 016A8 808C2838 460A4400 */ add.s $f16, $f8, $f10 -/* 016AC 808C283C E7B00058 */ swc1 $f16, 0x0058($sp) +/* 016A8 808C2838 460A4400 */ add.s $f16, $f8, $f10 +/* 016AC 808C283C E7B00058 */ swc1 $f16, 0x0058($sp) /* 016B0 808C2840 C612043C */ lwc1 $f18, 0x043C($s0) ## 0000043C -/* 016B4 808C2844 E7B2005C */ swc1 $f18, 0x005C($sp) +/* 016B4 808C2844 E7B2005C */ swc1 $f18, 0x005C($sp) /* 016B8 808C2848 C604020C */ lwc1 $f4, 0x020C($s0) ## 0000020C -/* 016BC 808C284C E7A6004C */ swc1 $f6, 0x004C($sp) -/* 016C0 808C2850 E7A40048 */ swc1 $f4, 0x0048($sp) +/* 016BC 808C284C E7A6004C */ swc1 $f6, 0x004C($sp) +/* 016C0 808C2850 E7A40048 */ swc1 $f4, 0x0048($sp) /* 016C4 808C2854 C608020C */ lwc1 $f8, 0x020C($s0) ## 0000020C -/* 016C8 808C2858 E7A80050 */ swc1 $f8, 0x0050($sp) +/* 016C8 808C2858 E7A80050 */ swc1 $f8, 0x0050($sp) /* 016CC 808C285C 860501B4 */ lh $a1, 0x01B4($s0) ## 000001B4 -/* 016D0 808C2860 0C030179 */ jal func_800C05E4 -/* 016D4 808C2864 AFB90010 */ sw $t9, 0x0010($sp) -/* 016D8 808C2868 8FBF002C */ lw $ra, 0x002C($sp) +/* 016D0 808C2860 0C030179 */ jal func_800C05E4 +/* 016D4 808C2864 AFB90010 */ sw $t9, 0x0010($sp) +/* 016D8 808C2868 8FBF002C */ lw $ra, 0x002C($sp) .L808C286C: -/* 016DC 808C286C 8FB00028 */ lw $s0, 0x0028($sp) +/* 016DC 808C286C 8FB00028 */ lw $s0, 0x0028($sp) /* 016E0 808C2870 27BD0078 */ addiu $sp, $sp, 0x0078 ## $sp = 00000000 -/* 016E4 808C2874 03E00008 */ jr $ra +/* 016E4 808C2874 03E00008 */ jr $ra /* 016E8 808C2878 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/func_808C287C.s b/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/func_808C287C.s index 646c4f88fe..ef25f5d3b7 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/func_808C287C.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/func_808C287C.s @@ -1,42 +1,42 @@ glabel func_808C287C /* 016EC 808C287C 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 016F0 808C2880 AFBF0024 */ sw $ra, 0x0024($sp) -/* 016F4 808C2884 AFA40030 */ sw $a0, 0x0030($sp) +/* 016F0 808C2880 AFBF0024 */ sw $ra, 0x0024($sp) +/* 016F4 808C2884 AFA40030 */ sw $a0, 0x0030($sp) /* 016F8 808C2888 8C8F0190 */ lw $t7, 0x0190($a0) ## 00000190 /* 016FC 808C288C 3C03808C */ lui $v1, %hi(func_808C2BC8) ## $v1 = 808C0000 /* 01700 808C2890 24632BC8 */ addiu $v1, $v1, %lo(func_808C2BC8) ## $v1 = 808C2BC8 -/* 01704 808C2894 106F0016 */ beq $v1, $t7, .L808C28F0 +/* 01704 808C2894 106F0016 */ beq $v1, $t7, .L808C28F0 /* 01708 808C2898 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 /* 0170C 808C289C 24841074 */ addiu $a0, $a0, 0x1074 ## $a0 = 06001074 /* 01710 808C28A0 0C028800 */ jal SkelAnime_GetFrameCount - -/* 01714 808C28A4 AFA30028 */ sw $v1, 0x0028($sp) + +/* 01714 808C28A4 AFA30028 */ sw $v1, 0x0028($sp) /* 01718 808C28A8 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 0171C 808C28AC 3C01C0A0 */ lui $at, 0xC0A0 ## $at = C0A00000 /* 01720 808C28B0 44814000 */ mtc1 $at, $f8 ## $f8 = -5.00 -/* 01724 808C28B4 468021A0 */ cvt.s.w $f6, $f4 -/* 01728 808C28B8 8FA40030 */ lw $a0, 0x0030($sp) +/* 01724 808C28B4 468021A0 */ cvt.s.w $f6, $f4 +/* 01728 808C28B8 8FA40030 */ lw $a0, 0x0030($sp) /* 0172C 808C28BC 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 01730 808C28C0 24180002 */ addiu $t8, $zero, 0x0002 ## $t8 = 00000002 -/* 01734 808C28C4 AFB80014 */ sw $t8, 0x0014($sp) +/* 01734 808C28C4 AFB80014 */ sw $t8, 0x0014($sp) /* 01738 808C28C8 24A51074 */ addiu $a1, $a1, 0x1074 ## $a1 = 06001074 -/* 0173C 808C28CC E7A60010 */ swc1 $f6, 0x0010($sp) +/* 0173C 808C28CC E7A60010 */ swc1 $f6, 0x0010($sp) /* 01740 808C28D0 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 01744 808C28D4 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 01748 808C28D8 E7A80018 */ swc1 $f8, 0x0018($sp) -/* 0174C 808C28DC 0C029468 */ jal SkelAnime_ChangeAnimation - +/* 01748 808C28D8 E7A80018 */ swc1 $f8, 0x0018($sp) +/* 0174C 808C28DC 0C029468 */ jal SkelAnime_ChangeAnim + /* 01750 808C28E0 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 01754 808C28E4 8FA30028 */ lw $v1, 0x0028($sp) -/* 01758 808C28E8 8FB90030 */ lw $t9, 0x0030($sp) +/* 01754 808C28E4 8FA30028 */ lw $v1, 0x0028($sp) +/* 01758 808C28E8 8FB90030 */ lw $t9, 0x0030($sp) /* 0175C 808C28EC AF230190 */ sw $v1, 0x0190($t9) ## 00000190 .L808C28F0: -/* 01760 808C28F0 8FA90030 */ lw $t1, 0x0030($sp) +/* 01760 808C28F0 8FA90030 */ lw $t1, 0x0030($sp) /* 01764 808C28F4 24080064 */ addiu $t0, $zero, 0x0064 ## $t0 = 00000064 /* 01768 808C28F8 A52801DA */ sh $t0, 0x01DA($t1) ## 000001DA -/* 0176C 808C28FC 8FBF0024 */ lw $ra, 0x0024($sp) +/* 0176C 808C28FC 8FBF0024 */ lw $ra, 0x0024($sp) /* 01770 808C2900 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 01774 808C2904 03E00008 */ jr $ra +/* 01774 808C2904 03E00008 */ jr $ra /* 01778 808C2908 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/func_808C290C.s b/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/func_808C290C.s index 008e988768..0cca9f5d2f 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/func_808C290C.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/func_808C290C.s @@ -1,27 +1,27 @@ glabel func_808C290C /* 0177C 808C290C 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 01780 808C2910 AFB00028 */ sw $s0, 0x0028($sp) +/* 01780 808C2910 AFB00028 */ sw $s0, 0x0028($sp) /* 01784 808C2914 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 01788 808C2918 AFBF002C */ sw $ra, 0x002C($sp) +/* 01788 808C2918 AFBF002C */ sw $ra, 0x002C($sp) /* 0178C 808C291C 3C040601 */ lui $a0, 0x0601 ## $a0 = 06010000 /* 01790 808C2920 0C028800 */ jal SkelAnime_GetFrameCount - + /* 01794 808C2924 2484E848 */ addiu $a0, $a0, 0xE848 ## $a0 = 0600E848 /* 01798 808C2928 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 0179C 808C292C 3C01C0A0 */ lui $at, 0xC0A0 ## $at = C0A00000 /* 017A0 808C2930 44814000 */ mtc1 $at, $f8 ## $f8 = -5.00 -/* 017A4 808C2934 468021A0 */ cvt.s.w $f6, $f4 +/* 017A4 808C2934 468021A0 */ cvt.s.w $f6, $f4 /* 017A8 808C2938 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 /* 017AC 808C293C 240E0002 */ addiu $t6, $zero, 0x0002 ## $t6 = 00000002 -/* 017B0 808C2940 AFAE0014 */ sw $t6, 0x0014($sp) +/* 017B0 808C2940 AFAE0014 */ sw $t6, 0x0014($sp) /* 017B4 808C2944 24A5E848 */ addiu $a1, $a1, 0xE848 ## $a1 = 0600E848 /* 017B8 808C2948 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C -/* 017BC 808C294C E7A60010 */ swc1 $f6, 0x0010($sp) +/* 017BC 808C294C E7A60010 */ swc1 $f6, 0x0010($sp) /* 017C0 808C2950 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 017C4 808C2954 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 017C8 808C2958 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 017CC 808C295C E7A80018 */ swc1 $f8, 0x0018($sp) +/* 017C8 808C2958 0C029468 */ jal SkelAnime_ChangeAnim + +/* 017CC 808C295C E7A80018 */ swc1 $f8, 0x0018($sp) /* 017D0 808C2960 3C014248 */ lui $at, 0x4248 ## $at = 42480000 /* 017D4 808C2964 44815000 */ mtc1 $at, $f10 ## $f10 = 50.00 /* 017D8 808C2968 3C014396 */ lui $at, 0x4396 ## $at = 43960000 @@ -37,10 +37,10 @@ glabel func_808C290C /* 01800 808C2990 A60801DA */ sh $t0, 0x01DA($s0) ## 000001DA /* 01804 808C2994 E60A01FC */ swc1 $f10, 0x01FC($s0) ## 000001FC /* 01808 808C2998 E6100200 */ swc1 $f16, 0x0200($s0) ## 00000200 -/* 0180C 808C299C 8FBF002C */ lw $ra, 0x002C($sp) -/* 01810 808C29A0 8FB00028 */ lw $s0, 0x0028($sp) +/* 0180C 808C299C 8FBF002C */ lw $ra, 0x002C($sp) +/* 01810 808C29A0 8FB00028 */ lw $s0, 0x0028($sp) /* 01814 808C29A4 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 01818 808C29A8 03E00008 */ jr $ra +/* 01818 808C29A8 03E00008 */ jr $ra /* 0181C 808C29AC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/func_808C29B0.s b/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/func_808C29B0.s index 911d182492..5c4d339d1f 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/func_808C29B0.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/func_808C29B0.s @@ -1,27 +1,27 @@ glabel func_808C29B0 /* 01820 808C29B0 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 01824 808C29B4 AFB00028 */ sw $s0, 0x0028($sp) +/* 01824 808C29B4 AFB00028 */ sw $s0, 0x0028($sp) /* 01828 808C29B8 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 0182C 808C29BC AFBF002C */ sw $ra, 0x002C($sp) +/* 0182C 808C29BC AFBF002C */ sw $ra, 0x002C($sp) /* 01830 808C29C0 3C040602 */ lui $a0, 0x0602 ## $a0 = 06020000 /* 01834 808C29C4 0C028800 */ jal SkelAnime_GetFrameCount - + /* 01838 808C29C8 2484D934 */ addiu $a0, $a0, 0xD934 ## $a0 = 0601D934 /* 0183C 808C29CC 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 01840 808C29D0 3C01C120 */ lui $at, 0xC120 ## $at = C1200000 /* 01844 808C29D4 44814000 */ mtc1 $at, $f8 ## $f8 = -10.00 -/* 01848 808C29D8 468021A0 */ cvt.s.w $f6, $f4 +/* 01848 808C29D8 468021A0 */ cvt.s.w $f6, $f4 /* 0184C 808C29DC 3C050602 */ lui $a1, 0x0602 ## $a1 = 06020000 /* 01850 808C29E0 240E0002 */ addiu $t6, $zero, 0x0002 ## $t6 = 00000002 -/* 01854 808C29E4 AFAE0014 */ sw $t6, 0x0014($sp) +/* 01854 808C29E4 AFAE0014 */ sw $t6, 0x0014($sp) /* 01858 808C29E8 24A5D934 */ addiu $a1, $a1, 0xD934 ## $a1 = 0601D934 /* 0185C 808C29EC 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C -/* 01860 808C29F0 E7A60010 */ swc1 $f6, 0x0010($sp) +/* 01860 808C29F0 E7A60010 */ swc1 $f6, 0x0010($sp) /* 01864 808C29F4 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 01868 808C29F8 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 0186C 808C29FC 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 01870 808C2A00 E7A80018 */ swc1 $f8, 0x0018($sp) +/* 0186C 808C29FC 0C029468 */ jal SkelAnime_ChangeAnim + +/* 01870 808C2A00 E7A80018 */ swc1 $f8, 0x0018($sp) /* 01874 808C2A04 8E180004 */ lw $t8, 0x0004($s0) ## 00000004 /* 01878 808C2A08 44805000 */ mtc1 $zero, $f10 ## $f10 = 0.00 /* 0187C 808C2A0C 3C0F808C */ lui $t7, %hi(func_808C32F4) ## $t7 = 808C0000 @@ -32,10 +32,10 @@ glabel func_808C29B0 /* 01890 808C2A20 A60001DA */ sh $zero, 0x01DA($s0) ## 000001DA /* 01894 808C2A24 AE190004 */ sw $t9, 0x0004($s0) ## 00000004 /* 01898 808C2A28 E60A01E4 */ swc1 $f10, 0x01E4($s0) ## 000001E4 -/* 0189C 808C2A2C 8FBF002C */ lw $ra, 0x002C($sp) -/* 018A0 808C2A30 8FB00028 */ lw $s0, 0x0028($sp) +/* 0189C 808C2A2C 8FBF002C */ lw $ra, 0x002C($sp) +/* 018A0 808C2A30 8FB00028 */ lw $s0, 0x0028($sp) /* 018A4 808C2A34 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 018A8 808C2A38 03E00008 */ jr $ra +/* 018A8 808C2A38 03E00008 */ jr $ra /* 018AC 808C2A3C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/func_808C2A40.s b/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/func_808C2A40.s index 3488eba914..64cf04f03c 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/func_808C2A40.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/func_808C2A40.s @@ -4,29 +4,29 @@ glabel func_808C2A40 /* 018B8 808C2A48 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 /* 018BC 808C2A4C 3C01C0A0 */ lui $at, 0xC0A0 ## $at = C0A00000 /* 018C0 808C2A50 44813000 */ mtc1 $at, $f6 ## $f6 = -5.00 -/* 018C4 808C2A54 AFBF0024 */ sw $ra, 0x0024($sp) -/* 018C8 808C2A58 AFA40028 */ sw $a0, 0x0028($sp) +/* 018C4 808C2A54 AFBF0024 */ sw $ra, 0x0024($sp) +/* 018C8 808C2A58 AFA40028 */ sw $a0, 0x0028($sp) /* 018CC 808C2A5C 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 /* 018D0 808C2A60 240E0002 */ addiu $t6, $zero, 0x0002 ## $t6 = 00000002 -/* 018D4 808C2A64 AFAE0014 */ sw $t6, 0x0014($sp) +/* 018D4 808C2A64 AFAE0014 */ sw $t6, 0x0014($sp) /* 018D8 808C2A68 24A5DF38 */ addiu $a1, $a1, 0xDF38 ## $a1 = 0600DF38 /* 018DC 808C2A6C 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C /* 018E0 808C2A70 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 018E4 808C2A74 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 018E8 808C2A78 E7A40010 */ swc1 $f4, 0x0010($sp) -/* 018EC 808C2A7C 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 018F0 808C2A80 E7A60018 */ swc1 $f6, 0x0018($sp) -/* 018F4 808C2A84 8FA20028 */ lw $v0, 0x0028($sp) +/* 018E8 808C2A78 E7A40010 */ swc1 $f4, 0x0010($sp) +/* 018EC 808C2A7C 0C029468 */ jal SkelAnime_ChangeAnim + +/* 018F0 808C2A80 E7A60018 */ swc1 $f6, 0x0018($sp) +/* 018F4 808C2A84 8FA20028 */ lw $v0, 0x0028($sp) /* 018F8 808C2A88 3C0F808C */ lui $t7, %hi(func_808C3704) ## $t7 = 808C0000 /* 018FC 808C2A8C 25EF3704 */ addiu $t7, $t7, %lo(func_808C3704) ## $t7 = 808C3704 /* 01900 808C2A90 2418001B */ addiu $t8, $zero, 0x001B ## $t8 = 0000001B /* 01904 808C2A94 AC4F0190 */ sw $t7, 0x0190($v0) ## 00000190 /* 01908 808C2A98 A44001A8 */ sh $zero, 0x01A8($v0) ## 000001A8 /* 0190C 808C2A9C A45801DA */ sh $t8, 0x01DA($v0) ## 000001DA -/* 01910 808C2AA0 8FBF0024 */ lw $ra, 0x0024($sp) +/* 01910 808C2AA0 8FBF0024 */ lw $ra, 0x0024($sp) /* 01914 808C2AA4 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 01918 808C2AA8 03E00008 */ jr $ra +/* 01918 808C2AA8 03E00008 */ jr $ra /* 0191C 808C2AAC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/func_808C2AB0.s b/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/func_808C2AB0.s index 7a14e7c994..00e204dc82 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/func_808C2AB0.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/func_808C2AB0.s @@ -1,39 +1,39 @@ glabel func_808C2AB0 /* 01920 808C2AB0 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 /* 01924 808C2AB4 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 01928 808C2AB8 AFB00028 */ sw $s0, 0x0028($sp) -/* 0192C 808C2ABC AFBF002C */ sw $ra, 0x002C($sp) +/* 01928 808C2AB8 AFB00028 */ sw $s0, 0x0028($sp) +/* 0192C 808C2ABC AFBF002C */ sw $ra, 0x002C($sp) /* 01930 808C2AC0 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 01934 808C2AC4 E4800068 */ swc1 $f0, 0x0068($a0) ## 00000068 /* 01938 808C2AC8 E48001E4 */ swc1 $f0, 0x01E4($a0) ## 000001E4 /* 0193C 808C2ACC 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 /* 01940 808C2AD0 0C028800 */ jal SkelAnime_GetFrameCount - + /* 01944 808C2AD4 248461D4 */ addiu $a0, $a0, 0x61D4 ## $a0 = 060061D4 /* 01948 808C2AD8 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 0194C 808C2ADC 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 /* 01950 808C2AE0 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 01954 808C2AE4 468021A0 */ cvt.s.w $f6, $f4 +/* 01954 808C2AE4 468021A0 */ cvt.s.w $f6, $f4 /* 01958 808C2AE8 240E0002 */ addiu $t6, $zero, 0x0002 ## $t6 = 00000002 -/* 0195C 808C2AEC 44070000 */ mfc1 $a3, $f0 -/* 01960 808C2AF0 AFAE0014 */ sw $t6, 0x0014($sp) +/* 0195C 808C2AEC 44070000 */ mfc1 $a3, $f0 +/* 01960 808C2AF0 AFAE0014 */ sw $t6, 0x0014($sp) /* 01964 808C2AF4 24A561D4 */ addiu $a1, $a1, 0x61D4 ## $a1 = 060061D4 /* 01968 808C2AF8 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C -/* 0196C 808C2AFC E7A60010 */ swc1 $f6, 0x0010($sp) +/* 0196C 808C2AFC E7A60010 */ swc1 $f6, 0x0010($sp) /* 01970 808C2B00 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 01974 808C2B04 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 01978 808C2B08 E7A00018 */ swc1 $f0, 0x0018($sp) +/* 01974 808C2B04 0C029468 */ jal SkelAnime_ChangeAnim + +/* 01978 808C2B08 E7A00018 */ swc1 $f0, 0x0018($sp) /* 0197C 808C2B0C 3C0F808C */ lui $t7, %hi(func_808C30F4) ## $t7 = 808C0000 /* 01980 808C2B10 25EF30F4 */ addiu $t7, $t7, %lo(func_808C30F4) ## $t7 = 808C30F4 /* 01984 808C2B14 24180032 */ addiu $t8, $zero, 0x0032 ## $t8 = 00000032 /* 01988 808C2B18 AE0F0190 */ sw $t7, 0x0190($s0) ## 00000190 /* 0198C 808C2B1C A61801DA */ sh $t8, 0x01DA($s0) ## 000001DA /* 01990 808C2B20 A60001AE */ sh $zero, 0x01AE($s0) ## 000001AE -/* 01994 808C2B24 8FBF002C */ lw $ra, 0x002C($sp) -/* 01998 808C2B28 8FB00028 */ lw $s0, 0x0028($sp) +/* 01994 808C2B24 8FBF002C */ lw $ra, 0x002C($sp) +/* 01998 808C2B28 8FB00028 */ lw $s0, 0x0028($sp) /* 0199C 808C2B2C 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 019A0 808C2B30 03E00008 */ jr $ra +/* 019A0 808C2B30 03E00008 */ jr $ra /* 019A4 808C2B34 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/func_808C2B38.s b/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/func_808C2B38.s index 00a5c911f5..282607b9f8 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/func_808C2B38.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/func_808C2B38.s @@ -1,29 +1,29 @@ glabel func_808C2B38 /* 019A8 808C2B38 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 /* 019AC 808C2B3C 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 019B0 808C2B40 AFB00028 */ sw $s0, 0x0028($sp) -/* 019B4 808C2B44 AFBF002C */ sw $ra, 0x002C($sp) +/* 019B0 808C2B40 AFB00028 */ sw $s0, 0x0028($sp) +/* 019B4 808C2B44 AFBF002C */ sw $ra, 0x002C($sp) /* 019B8 808C2B48 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 019BC 808C2B4C E4840068 */ swc1 $f4, 0x0068($a0) ## 00000068 /* 019C0 808C2B50 3C040601 */ lui $a0, 0x0601 ## $a0 = 06010000 /* 019C4 808C2B54 0C028800 */ jal SkelAnime_GetFrameCount - + /* 019C8 808C2B58 24848EEC */ addiu $a0, $a0, 0x8EEC ## $a0 = 06008EEC /* 019CC 808C2B5C 44823000 */ mtc1 $v0, $f6 ## $f6 = 0.00 /* 019D0 808C2B60 3C01C0A0 */ lui $at, 0xC0A0 ## $at = C0A00000 /* 019D4 808C2B64 44815000 */ mtc1 $at, $f10 ## $f10 = -5.00 -/* 019D8 808C2B68 46803220 */ cvt.s.w $f8, $f6 +/* 019D8 808C2B68 46803220 */ cvt.s.w $f8, $f6 /* 019DC 808C2B6C 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 /* 019E0 808C2B70 240E0002 */ addiu $t6, $zero, 0x0002 ## $t6 = 00000002 -/* 019E4 808C2B74 AFAE0014 */ sw $t6, 0x0014($sp) +/* 019E4 808C2B74 AFAE0014 */ sw $t6, 0x0014($sp) /* 019E8 808C2B78 24A58EEC */ addiu $a1, $a1, 0x8EEC ## $a1 = 06008EEC /* 019EC 808C2B7C 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C -/* 019F0 808C2B80 E7A80010 */ swc1 $f8, 0x0010($sp) +/* 019F0 808C2B80 E7A80010 */ swc1 $f8, 0x0010($sp) /* 019F4 808C2B84 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 019F8 808C2B88 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 019FC 808C2B8C 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 01A00 808C2B90 E7AA0018 */ swc1 $f10, 0x0018($sp) +/* 019FC 808C2B8C 0C029468 */ jal SkelAnime_ChangeAnim + +/* 01A00 808C2B90 E7AA0018 */ swc1 $f10, 0x0018($sp) /* 01A04 808C2B94 3C0F808C */ lui $t7, %hi(func_808C3224) ## $t7 = 808C0000 /* 01A08 808C2B98 25EF3224 */ addiu $t7, $t7, %lo(func_808C3224) ## $t7 = 808C3224 /* 01A0C 808C2B9C 24180064 */ addiu $t8, $zero, 0x0064 ## $t8 = 00000064 @@ -32,10 +32,10 @@ glabel func_808C2B38 /* 01A18 808C2BA8 A61801DA */ sh $t8, 0x01DA($s0) ## 000001DA /* 01A1C 808C2BAC A60001AC */ sh $zero, 0x01AC($s0) ## 000001AC /* 01A20 808C2BB0 A21901E2 */ sb $t9, 0x01E2($s0) ## 000001E2 -/* 01A24 808C2BB4 8FBF002C */ lw $ra, 0x002C($sp) -/* 01A28 808C2BB8 8FB00028 */ lw $s0, 0x0028($sp) +/* 01A24 808C2BB4 8FBF002C */ lw $ra, 0x002C($sp) +/* 01A28 808C2BB8 8FB00028 */ lw $s0, 0x0028($sp) /* 01A2C 808C2BBC 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 01A30 808C2BC0 03E00008 */ jr $ra +/* 01A30 808C2BC0 03E00008 */ jr $ra /* 01A34 808C2BC4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/func_808C2C78.s b/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/func_808C2C78.s index 6316f6f311..567cc1c159 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/func_808C2C78.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/func_808C2C78.s @@ -1,44 +1,44 @@ glabel func_808C2C78 /* 01AE8 808C2C78 27BDFF60 */ addiu $sp, $sp, 0xFF60 ## $sp = FFFFFF60 -/* 01AEC 808C2C7C AFB70068 */ sw $s7, 0x0068($sp) +/* 01AEC 808C2C7C AFB70068 */ sw $s7, 0x0068($sp) /* 01AF0 808C2C80 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 /* 01AF4 808C2C84 00A0B825 */ or $s7, $a1, $zero ## $s7 = 00000000 -/* 01AF8 808C2C88 AFB10050 */ sw $s1, 0x0050($sp) +/* 01AF8 808C2C88 AFB10050 */ sw $s1, 0x0050($sp) /* 01AFC 808C2C8C 00808825 */ or $s1, $a0, $zero ## $s1 = 00000000 -/* 01B00 808C2C90 AFBF006C */ sw $ra, 0x006C($sp) +/* 01B00 808C2C90 AFBF006C */ sw $ra, 0x006C($sp) /* 01B04 808C2C94 3C053D4C */ lui $a1, 0x3D4C ## $a1 = 3D4C0000 /* 01B08 808C2C98 3C073BA3 */ lui $a3, 0x3BA3 ## $a3 = 3BA30000 -/* 01B0C 808C2C9C AFB60064 */ sw $s6, 0x0064($sp) -/* 01B10 808C2CA0 AFB50060 */ sw $s5, 0x0060($sp) -/* 01B14 808C2CA4 AFB4005C */ sw $s4, 0x005C($sp) -/* 01B18 808C2CA8 AFB30058 */ sw $s3, 0x0058($sp) -/* 01B1C 808C2CAC AFB20054 */ sw $s2, 0x0054($sp) -/* 01B20 808C2CB0 AFB0004C */ sw $s0, 0x004C($sp) -/* 01B24 808C2CB4 F7BA0040 */ sdc1 $f26, 0x0040($sp) -/* 01B28 808C2CB8 F7B80038 */ sdc1 $f24, 0x0038($sp) -/* 01B2C 808C2CBC F7B60030 */ sdc1 $f22, 0x0030($sp) -/* 01B30 808C2CC0 F7B40028 */ sdc1 $f20, 0x0028($sp) +/* 01B0C 808C2C9C AFB60064 */ sw $s6, 0x0064($sp) +/* 01B10 808C2CA0 AFB50060 */ sw $s5, 0x0060($sp) +/* 01B14 808C2CA4 AFB4005C */ sw $s4, 0x005C($sp) +/* 01B18 808C2CA8 AFB30058 */ sw $s3, 0x0058($sp) +/* 01B1C 808C2CAC AFB20054 */ sw $s2, 0x0054($sp) +/* 01B20 808C2CB0 AFB0004C */ sw $s0, 0x004C($sp) +/* 01B24 808C2CB4 F7BA0040 */ sdc1 $f26, 0x0040($sp) +/* 01B28 808C2CB8 F7B80038 */ sdc1 $f24, 0x0038($sp) +/* 01B2C 808C2CBC F7B60030 */ sdc1 $f22, 0x0030($sp) +/* 01B30 808C2CC0 F7B40028 */ sdc1 $f20, 0x0028($sp) /* 01B34 808C2CC4 34E7D70A */ ori $a3, $a3, 0xD70A ## $a3 = 3BA3D70A /* 01B38 808C2CC8 34A5CCCD */ ori $a1, $a1, 0xCCCD ## $a1 = 3D4CCCCD /* 01B3C 808C2CCC 24840208 */ addiu $a0, $a0, 0x0208 ## $a0 = 00000208 /* 01B40 808C2CD0 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 01B44 808C2CD4 0C01E0C4 */ jal Math_SmoothScaleMaxMinF - -/* 01B48 808C2CD8 E7A40010 */ swc1 $f4, 0x0010($sp) + +/* 01B48 808C2CD8 E7A40010 */ swc1 $f4, 0x0010($sp) /* 01B4C 808C2CDC 2624014C */ addiu $a0, $s1, 0x014C ## $a0 = 0000014C /* 01B50 808C2CE0 0C02927F */ jal SkelAnime_FrameUpdateMatrix - -/* 01B54 808C2CE4 AFA40070 */ sw $a0, 0x0070($sp) + +/* 01B54 808C2CE4 AFA40070 */ sw $a0, 0x0070($sp) /* 01B58 808C2CE8 862E01DA */ lh $t6, 0x01DA($s1) ## 000001DA /* 01B5C 808C2CEC 00008025 */ or $s0, $zero, $zero ## $s0 = 00000000 /* 01B60 808C2CF0 3C0142B4 */ lui $at, 0x42B4 ## $at = 42B40000 -/* 01B64 808C2CF4 15C00066 */ bne $t6, $zero, .L808C2E90 +/* 01B64 808C2CF4 15C00066 */ bne $t6, $zero, .L808C2E90 /* 01B68 808C2CF8 3C16808D */ lui $s6, %hi(D_808CA3DC) ## $s6 = 808D0000 /* 01B6C 808C2CFC 4481D000 */ mtc1 $at, $f26 ## $f26 = 90.00 /* 01B70 808C2D00 3C014040 */ lui $at, 0x4040 ## $at = 40400000 /* 01B74 808C2D04 4481C000 */ mtc1 $at, $f24 ## $f24 = 3.00 /* 01B78 808C2D08 3C01808D */ lui $at, %hi(D_808CA6B8) ## $at = 808D0000 -/* 01B7C 808C2D0C C436A6B8 */ lwc1 $f22, %lo(D_808CA6B8)($at) +/* 01B7C 808C2D0C C436A6B8 */ lwc1 $f22, %lo(D_808CA6B8)($at) /* 01B80 808C2D10 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 /* 01B84 808C2D14 3C15808D */ lui $s5, %hi(D_808CA3D8) ## $s5 = 808D0000 /* 01B88 808C2D18 4481A000 */ mtc1 $at, $f20 ## $f20 = 20.00 @@ -49,116 +49,116 @@ glabel func_808C2C78 /* 01B9C 808C2D2C 27B20078 */ addiu $s2, $sp, 0x0078 ## $s2 = FFFFFFD8 .L808C2D30: /* 01BA0 808C2D30 0C00CFC8 */ jal Math_Rand_CenteredFloat - -/* 01BA4 808C2D34 4600A306 */ mov.s $f12, $f20 -/* 01BA8 808C2D38 E7A00090 */ swc1 $f0, 0x0090($sp) + +/* 01BA4 808C2D34 4600A306 */ mov.s $f12, $f20 +/* 01BA8 808C2D38 E7A00090 */ swc1 $f0, 0x0090($sp) /* 01BAC 808C2D3C 0C00CFC8 */ jal Math_Rand_CenteredFloat - -/* 01BB0 808C2D40 4600A306 */ mov.s $f12, $f20 -/* 01BB4 808C2D44 E7A00094 */ swc1 $f0, 0x0094($sp) + +/* 01BB0 808C2D40 4600A306 */ mov.s $f12, $f20 +/* 01BB4 808C2D44 E7A00094 */ swc1 $f0, 0x0094($sp) /* 01BB8 808C2D48 0C00CFC8 */ jal Math_Rand_CenteredFloat - -/* 01BBC 808C2D4C 4600A306 */ mov.s $f12, $f20 -/* 01BC0 808C2D50 C7A60090 */ lwc1 $f6, 0x0090($sp) -/* 01BC4 808C2D54 C7AA0094 */ lwc1 $f10, 0x0094($sp) -/* 01BC8 808C2D58 E7A00098 */ swc1 $f0, 0x0098($sp) -/* 01BCC 808C2D5C 46163202 */ mul.s $f8, $f6, $f22 + +/* 01BBC 808C2D4C 4600A306 */ mov.s $f12, $f20 +/* 01BC0 808C2D50 C7A60090 */ lwc1 $f6, 0x0090($sp) +/* 01BC4 808C2D54 C7AA0094 */ lwc1 $f10, 0x0094($sp) +/* 01BC8 808C2D58 E7A00098 */ swc1 $f0, 0x0098($sp) +/* 01BCC 808C2D5C 46163202 */ mul.s $f8, $f6, $f22 /* 01BD0 808C2D60 240F01F4 */ addiu $t7, $zero, 0x01F4 ## $t7 = 000001F4 /* 01BD4 808C2D64 2418000A */ addiu $t8, $zero, 0x000A ## $t8 = 0000000A -/* 01BD8 808C2D68 46165402 */ mul.s $f16, $f10, $f22 +/* 01BD8 808C2D68 46165402 */ mul.s $f16, $f10, $f22 /* 01BDC 808C2D6C 2419000A */ addiu $t9, $zero, 0x000A ## $t9 = 0000000A /* 01BE0 808C2D70 02E02025 */ or $a0, $s7, $zero ## $a0 = 00000000 -/* 01BE4 808C2D74 46160482 */ mul.s $f18, $f0, $f22 -/* 01BE8 808C2D78 E7A80084 */ swc1 $f8, 0x0084($sp) +/* 01BE4 808C2D74 46160482 */ mul.s $f18, $f0, $f22 +/* 01BE8 808C2D78 E7A80084 */ swc1 $f8, 0x0084($sp) /* 01BEC 808C2D7C 02402825 */ or $a1, $s2, $zero ## $a1 = FFFFFFD8 -/* 01BF0 808C2D80 46183202 */ mul.s $f8, $f6, $f24 -/* 01BF4 808C2D84 E7B00088 */ swc1 $f16, 0x0088($sp) +/* 01BF0 808C2D80 46183202 */ mul.s $f8, $f6, $f24 +/* 01BF4 808C2D84 E7B00088 */ swc1 $f16, 0x0088($sp) /* 01BF8 808C2D88 02603025 */ or $a2, $s3, $zero ## $a2 = FFFFFFF0 /* 01BFC 808C2D8C 02803825 */ or $a3, $s4, $zero ## $a3 = FFFFFFE4 -/* 01C00 808C2D90 E7B2008C */ swc1 $f18, 0x008C($sp) +/* 01C00 808C2D90 E7B2008C */ swc1 $f18, 0x008C($sp) /* 01C04 808C2D94 C6240024 */ lwc1 $f4, 0x0024($s1) ## 00000024 -/* 01C08 808C2D98 46082400 */ add.s $f16, $f4, $f8 -/* 01C0C 808C2D9C 46185102 */ mul.s $f4, $f10, $f24 -/* 01C10 808C2DA0 E7B00078 */ swc1 $f16, 0x0078($sp) +/* 01C08 808C2D98 46082400 */ add.s $f16, $f4, $f8 +/* 01C0C 808C2D9C 46185102 */ mul.s $f4, $f10, $f24 +/* 01C10 808C2DA0 E7B00078 */ swc1 $f16, 0x0078($sp) /* 01C14 808C2DA4 C6320028 */ lwc1 $f18, 0x0028($s1) ## 00000028 -/* 01C18 808C2DA8 461A9180 */ add.s $f6, $f18, $f26 -/* 01C1C 808C2DAC 46180482 */ mul.s $f18, $f0, $f24 -/* 01C20 808C2DB0 46043200 */ add.s $f8, $f6, $f4 -/* 01C24 808C2DB4 E7A8007C */ swc1 $f8, 0x007C($sp) +/* 01C18 808C2DA8 461A9180 */ add.s $f6, $f18, $f26 +/* 01C1C 808C2DAC 46180482 */ mul.s $f18, $f0, $f24 +/* 01C20 808C2DB0 46043200 */ add.s $f8, $f6, $f4 +/* 01C24 808C2DB4 E7A8007C */ swc1 $f8, 0x007C($sp) /* 01C28 808C2DB8 C630002C */ lwc1 $f16, 0x002C($s1) ## 0000002C -/* 01C2C 808C2DBC AFB90020 */ sw $t9, 0x0020($sp) -/* 01C30 808C2DC0 AFB8001C */ sw $t8, 0x001C($sp) -/* 01C34 808C2DC4 46128280 */ add.s $f10, $f16, $f18 -/* 01C38 808C2DC8 AFAF0018 */ sw $t7, 0x0018($sp) -/* 01C3C 808C2DCC AFB60014 */ sw $s6, 0x0014($sp) -/* 01C40 808C2DD0 AFB50010 */ sw $s5, 0x0010($sp) -/* 01C44 808C2DD4 0C00A0DB */ jal func_8002836C -/* 01C48 808C2DD8 E7AA0080 */ swc1 $f10, 0x0080($sp) +/* 01C2C 808C2DBC AFB90020 */ sw $t9, 0x0020($sp) +/* 01C30 808C2DC0 AFB8001C */ sw $t8, 0x001C($sp) +/* 01C34 808C2DC4 46128280 */ add.s $f10, $f16, $f18 +/* 01C38 808C2DC8 AFAF0018 */ sw $t7, 0x0018($sp) +/* 01C3C 808C2DCC AFB60014 */ sw $s6, 0x0014($sp) +/* 01C40 808C2DD0 AFB50010 */ sw $s5, 0x0010($sp) +/* 01C44 808C2DD4 0C00A0DB */ jal func_8002836C +/* 01C48 808C2DD8 E7AA0080 */ swc1 $f10, 0x0080($sp) /* 01C4C 808C2DDC 26100001 */ addiu $s0, $s0, 0x0001 ## $s0 = 00000001 -/* 01C50 808C2DE0 00108400 */ sll $s0, $s0, 16 -/* 01C54 808C2DE4 00108403 */ sra $s0, $s0, 16 -/* 01C58 808C2DE8 2A01001E */ slti $at, $s0, 0x001E -/* 01C5C 808C2DEC 1420FFD0 */ bne $at, $zero, .L808C2D30 +/* 01C50 808C2DE0 00108400 */ sll $s0, $s0, 16 +/* 01C54 808C2DE4 00108403 */ sra $s0, $s0, 16 +/* 01C58 808C2DE8 2A01001E */ slti $at, $s0, 0x001E +/* 01C5C 808C2DEC 1420FFD0 */ bne $at, $zero, .L808C2D30 /* 01C60 808C2DF0 00000000 */ nop /* 01C64 808C2DF4 3C100600 */ lui $s0, 0x0600 ## $s0 = 06000000 /* 01C68 808C2DF8 26104E0C */ addiu $s0, $s0, 0x4E0C ## $s0 = 06004E0C /* 01C6C 808C2DFC 0C028800 */ jal SkelAnime_GetFrameCount - + /* 01C70 808C2E00 02002025 */ or $a0, $s0, $zero ## $a0 = 06004E0C /* 01C74 808C2E04 44823000 */ mtc1 $v0, $f6 ## $f6 = 0.00 /* 01C78 808C2E08 3C01C0A0 */ lui $at, 0xC0A0 ## $at = C0A00000 /* 01C7C 808C2E0C 44814000 */ mtc1 $at, $f8 ## $f8 = -5.00 -/* 01C80 808C2E10 46803120 */ cvt.s.w $f4, $f6 +/* 01C80 808C2E10 46803120 */ cvt.s.w $f4, $f6 /* 01C84 808C2E14 24080002 */ addiu $t0, $zero, 0x0002 ## $t0 = 00000002 -/* 01C88 808C2E18 AFA80014 */ sw $t0, 0x0014($sp) -/* 01C8C 808C2E1C 8FA40070 */ lw $a0, 0x0070($sp) +/* 01C88 808C2E18 AFA80014 */ sw $t0, 0x0014($sp) +/* 01C8C 808C2E1C 8FA40070 */ lw $a0, 0x0070($sp) /* 01C90 808C2E20 02002825 */ or $a1, $s0, $zero ## $a1 = 06004E0C /* 01C94 808C2E24 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 01C98 808C2E28 E7A40010 */ swc1 $f4, 0x0010($sp) +/* 01C98 808C2E28 E7A40010 */ swc1 $f4, 0x0010($sp) /* 01C9C 808C2E2C 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 01CA0 808C2E30 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 01CA4 808C2E34 E7A80018 */ swc1 $f8, 0x0018($sp) +/* 01CA0 808C2E30 0C029468 */ jal SkelAnime_ChangeAnim + +/* 01CA4 808C2E34 E7A80018 */ swc1 $f8, 0x0018($sp) /* 01CA8 808C2E38 3C09808C */ lui $t1, %hi(func_808C2ECC) ## $t1 = 808C0000 /* 01CAC 808C2E3C 25292ECC */ addiu $t1, $t1, %lo(func_808C2ECC) ## $t1 = 808C2ECC /* 01CB0 808C2E40 AE290190 */ sw $t1, 0x0190($s1) ## 00000190 /* 01CB4 808C2E44 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 01CB8 808C2E48 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 01CBC 808C2E4C 2405180E */ addiu $a1, $zero, 0x180E ## $a1 = 0000180E /* 01CC0 808C2E50 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 01CC4 808C2E54 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 01CC8 808C2E58 24053806 */ addiu $a1, $zero, 0x3806 ## $a1 = 00003806 /* 01CCC 808C2E5C 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 01CD0 808C2E60 02E02825 */ or $a1, $s7, $zero ## $a1 = 00000000 /* 01CD4 808C2E64 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 -/* 01CD8 808C2E68 0C00CFA2 */ jal func_80033E88 +/* 01CD8 808C2E68 0C00CFA2 */ jal func_80033E88 /* 01CDC 808C2E6C 2407000A */ addiu $a3, $zero, 0x000A ## $a3 = 0000000A /* 01CE0 808C2E70 862A0194 */ lh $t2, 0x0194($s1) ## 00000194 /* 01CE4 808C2E74 240D0001 */ addiu $t5, $zero, 0x0001 ## $t5 = 00000001 /* 01CE8 808C2E78 254BFFFE */ addiu $t3, $t2, 0xFFFE ## $t3 = FFFFFFFE /* 01CEC 808C2E7C A62B0194 */ sh $t3, 0x0194($s1) ## 00000194 /* 01CF0 808C2E80 862C0194 */ lh $t4, 0x0194($s1) ## 00000194 -/* 01CF4 808C2E84 5D800003 */ bgtzl $t4, .L808C2E94 -/* 01CF8 808C2E88 8FBF006C */ lw $ra, 0x006C($sp) +/* 01CF4 808C2E84 5D800003 */ bgtzl $t4, .L808C2E94 +/* 01CF8 808C2E88 8FBF006C */ lw $ra, 0x006C($sp) /* 01CFC 808C2E8C A62D0194 */ sh $t5, 0x0194($s1) ## 00000194 .L808C2E90: -/* 01D00 808C2E90 8FBF006C */ lw $ra, 0x006C($sp) +/* 01D00 808C2E90 8FBF006C */ lw $ra, 0x006C($sp) .L808C2E94: -/* 01D04 808C2E94 D7B40028 */ ldc1 $f20, 0x0028($sp) -/* 01D08 808C2E98 D7B60030 */ ldc1 $f22, 0x0030($sp) -/* 01D0C 808C2E9C D7B80038 */ ldc1 $f24, 0x0038($sp) -/* 01D10 808C2EA0 D7BA0040 */ ldc1 $f26, 0x0040($sp) -/* 01D14 808C2EA4 8FB0004C */ lw $s0, 0x004C($sp) -/* 01D18 808C2EA8 8FB10050 */ lw $s1, 0x0050($sp) -/* 01D1C 808C2EAC 8FB20054 */ lw $s2, 0x0054($sp) -/* 01D20 808C2EB0 8FB30058 */ lw $s3, 0x0058($sp) -/* 01D24 808C2EB4 8FB4005C */ lw $s4, 0x005C($sp) -/* 01D28 808C2EB8 8FB50060 */ lw $s5, 0x0060($sp) -/* 01D2C 808C2EBC 8FB60064 */ lw $s6, 0x0064($sp) -/* 01D30 808C2EC0 8FB70068 */ lw $s7, 0x0068($sp) -/* 01D34 808C2EC4 03E00008 */ jr $ra +/* 01D04 808C2E94 D7B40028 */ ldc1 $f20, 0x0028($sp) +/* 01D08 808C2E98 D7B60030 */ ldc1 $f22, 0x0030($sp) +/* 01D0C 808C2E9C D7B80038 */ ldc1 $f24, 0x0038($sp) +/* 01D10 808C2EA0 D7BA0040 */ ldc1 $f26, 0x0040($sp) +/* 01D14 808C2EA4 8FB0004C */ lw $s0, 0x004C($sp) +/* 01D18 808C2EA8 8FB10050 */ lw $s1, 0x0050($sp) +/* 01D1C 808C2EAC 8FB20054 */ lw $s2, 0x0054($sp) +/* 01D20 808C2EB0 8FB30058 */ lw $s3, 0x0058($sp) +/* 01D24 808C2EB4 8FB4005C */ lw $s4, 0x005C($sp) +/* 01D28 808C2EB8 8FB50060 */ lw $s5, 0x0060($sp) +/* 01D2C 808C2EBC 8FB60064 */ lw $s6, 0x0064($sp) +/* 01D30 808C2EC0 8FB70068 */ lw $s7, 0x0068($sp) +/* 01D34 808C2EC4 03E00008 */ jr $ra /* 01D38 808C2EC8 27BD00A0 */ addiu $sp, $sp, 0x00A0 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/func_808C2ECC.s b/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/func_808C2ECC.s index d71de774e5..acbbe41a8c 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/func_808C2ECC.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/func_808C2ECC.s @@ -1,12 +1,12 @@ glabel func_808C2ECC /* 01D3C 808C2ECC 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 01D40 808C2ED0 AFBF002C */ sw $ra, 0x002C($sp) -/* 01D44 808C2ED4 AFB00028 */ sw $s0, 0x0028($sp) -/* 01D48 808C2ED8 AFA5003C */ sw $a1, 0x003C($sp) +/* 01D40 808C2ED0 AFBF002C */ sw $ra, 0x002C($sp) +/* 01D44 808C2ED4 AFB00028 */ sw $s0, 0x0028($sp) +/* 01D48 808C2ED8 AFA5003C */ sw $a1, 0x003C($sp) /* 01D4C 808C2EDC 240E000A */ addiu $t6, $zero, 0x000A ## $t6 = 0000000A /* 01D50 808C2EE0 A48E01BE */ sh $t6, 0x01BE($a0) ## 000001BE /* 01D54 808C2EE4 3C01808D */ lui $at, %hi(D_808CA6BC) ## $at = 808D0000 -/* 01D58 808C2EE8 C424A6BC */ lwc1 $f4, %lo(D_808CA6BC)($at) +/* 01D58 808C2EE8 C424A6BC */ lwc1 $f4, %lo(D_808CA6BC)($at) /* 01D5C 808C2EEC 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 01D60 808C2EF0 3C053FA6 */ lui $a1, 0x3FA6 ## $a1 = 3FA60000 /* 01D64 808C2EF4 3C073DCC */ lui $a3, 0x3DCC ## $a3 = 3DCC0000 @@ -15,51 +15,51 @@ glabel func_808C2ECC /* 01D70 808C2F00 248401F8 */ addiu $a0, $a0, 0x01F8 ## $a0 = 000001F8 /* 01D74 808C2F04 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 01D78 808C2F08 0C01E0C4 */ jal Math_SmoothScaleMaxMinF - -/* 01D7C 808C2F0C E7A40010 */ swc1 $f4, 0x0010($sp) + +/* 01D7C 808C2F0C E7A40010 */ swc1 $f4, 0x0010($sp) /* 01D80 808C2F10 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C /* 01D84 808C2F14 0C02927F */ jal SkelAnime_FrameUpdateMatrix - -/* 01D88 808C2F18 AFA40030 */ sw $a0, 0x0030($sp) + +/* 01D88 808C2F18 AFA40030 */ sw $a0, 0x0030($sp) /* 01D8C 808C2F1C 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 /* 01D90 808C2F20 0C028800 */ jal SkelAnime_GetFrameCount - + /* 01D94 808C2F24 24844E0C */ addiu $a0, $a0, 0x4E0C ## $a0 = 06004E0C /* 01D98 808C2F28 44823000 */ mtc1 $v0, $f6 ## $f6 = 0.00 -/* 01D9C 808C2F2C 8FA40030 */ lw $a0, 0x0030($sp) -/* 01DA0 808C2F30 468031A0 */ cvt.s.w $f6, $f6 -/* 01DA4 808C2F34 44053000 */ mfc1 $a1, $f6 -/* 01DA8 808C2F38 0C0295B2 */ jal func_800A56C8 +/* 01D9C 808C2F2C 8FA40030 */ lw $a0, 0x0030($sp) +/* 01DA0 808C2F30 468031A0 */ cvt.s.w $f6, $f6 +/* 01DA4 808C2F34 44053000 */ mfc1 $a1, $f6 +/* 01DA8 808C2F38 0C0295B2 */ jal func_800A56C8 /* 01DAC 808C2F3C 00000000 */ nop -/* 01DB0 808C2F40 10400015 */ beq $v0, $zero, .L808C2F98 +/* 01DB0 808C2F40 10400015 */ beq $v0, $zero, .L808C2F98 /* 01DB4 808C2F44 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 /* 01DB8 808C2F48 0C028800 */ jal SkelAnime_GetFrameCount - + /* 01DBC 808C2F4C 248442A8 */ addiu $a0, $a0, 0x42A8 ## $a0 = 060042A8 /* 01DC0 808C2F50 44824000 */ mtc1 $v0, $f8 ## $f8 = 0.00 /* 01DC4 808C2F54 3C01C0A0 */ lui $at, 0xC0A0 ## $at = C0A00000 /* 01DC8 808C2F58 44818000 */ mtc1 $at, $f16 ## $f16 = -5.00 -/* 01DCC 808C2F5C 468042A0 */ cvt.s.w $f10, $f8 +/* 01DCC 808C2F5C 468042A0 */ cvt.s.w $f10, $f8 /* 01DD0 808C2F60 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 01DD4 808C2F64 24A542A8 */ addiu $a1, $a1, 0x42A8 ## $a1 = 060042A8 -/* 01DD8 808C2F68 8FA40030 */ lw $a0, 0x0030($sp) +/* 01DD8 808C2F68 8FA40030 */ lw $a0, 0x0030($sp) /* 01DDC 808C2F6C 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 01DE0 808C2F70 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 01DE4 808C2F74 E7AA0010 */ swc1 $f10, 0x0010($sp) -/* 01DE8 808C2F78 AFA00014 */ sw $zero, 0x0014($sp) -/* 01DEC 808C2F7C 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 01DF0 808C2F80 E7B00018 */ swc1 $f16, 0x0018($sp) +/* 01DE4 808C2F74 E7AA0010 */ swc1 $f10, 0x0010($sp) +/* 01DE8 808C2F78 AFA00014 */ sw $zero, 0x0014($sp) +/* 01DEC 808C2F7C 0C029468 */ jal SkelAnime_ChangeAnim + +/* 01DF0 808C2F80 E7B00018 */ swc1 $f16, 0x0018($sp) /* 01DF4 808C2F84 3C0F808C */ lui $t7, %hi(func_808C2FAC) ## $t7 = 808C0000 /* 01DF8 808C2F88 25EF2FAC */ addiu $t7, $t7, %lo(func_808C2FAC) ## $t7 = 808C2FAC /* 01DFC 808C2F8C 24180064 */ addiu $t8, $zero, 0x0064 ## $t8 = 00000064 /* 01E00 808C2F90 AE0F0190 */ sw $t7, 0x0190($s0) ## 00000190 /* 01E04 808C2F94 A61801DA */ sh $t8, 0x01DA($s0) ## 000001DA .L808C2F98: -/* 01E08 808C2F98 8FBF002C */ lw $ra, 0x002C($sp) -/* 01E0C 808C2F9C 8FB00028 */ lw $s0, 0x0028($sp) +/* 01E08 808C2F98 8FBF002C */ lw $ra, 0x002C($sp) +/* 01E0C 808C2F9C 8FB00028 */ lw $s0, 0x0028($sp) /* 01E10 808C2FA0 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 -/* 01E14 808C2FA4 03E00008 */ jr $ra +/* 01E14 808C2FA4 03E00008 */ jr $ra /* 01E18 808C2FA8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/func_808C2FAC.s b/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/func_808C2FAC.s index 69a2734f0c..394253bcd4 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/func_808C2FAC.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/func_808C2FAC.s @@ -1,24 +1,24 @@ glabel func_808C2FAC /* 01E1C 808C2FAC 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 01E20 808C2FB0 AFBF002C */ sw $ra, 0x002C($sp) -/* 01E24 808C2FB4 AFB00028 */ sw $s0, 0x0028($sp) -/* 01E28 808C2FB8 AFA5003C */ sw $a1, 0x003C($sp) +/* 01E20 808C2FB0 AFBF002C */ sw $ra, 0x002C($sp) +/* 01E24 808C2FB4 AFB00028 */ sw $s0, 0x0028($sp) +/* 01E28 808C2FB8 AFA5003C */ sw $a1, 0x003C($sp) /* 01E2C 808C2FBC 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 01E30 808C2FC0 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 01E34 808C2FC4 24053051 */ addiu $a1, $zero, 0x3051 ## $a1 = 00003051 /* 01E38 808C2FC8 240E000A */ addiu $t6, $zero, 0x000A ## $t6 = 0000000A /* 01E3C 808C2FCC A60E01BE */ sh $t6, 0x01BE($s0) ## 000001BE /* 01E40 808C2FD0 3C01808D */ lui $at, %hi(D_808CA6C0) ## $at = 808D0000 -/* 01E44 808C2FD4 C424A6C0 */ lwc1 $f4, %lo(D_808CA6C0)($at) +/* 01E44 808C2FD4 C424A6C0 */ lwc1 $f4, %lo(D_808CA6C0)($at) /* 01E48 808C2FD8 3C073CA3 */ lui $a3, 0x3CA3 ## $a3 = 3CA30000 /* 01E4C 808C2FDC 34E7D70A */ ori $a3, $a3, 0xD70A ## $a3 = 3CA3D70A /* 01E50 808C2FE0 260401F8 */ addiu $a0, $s0, 0x01F8 ## $a0 = 000001F8 /* 01E54 808C2FE4 3C053F80 */ lui $a1, 0x3F80 ## $a1 = 3F800000 /* 01E58 808C2FE8 3C063F00 */ lui $a2, 0x3F00 ## $a2 = 3F000000 /* 01E5C 808C2FEC 0C01E0C4 */ jal Math_SmoothScaleMaxMinF - -/* 01E60 808C2FF0 E7A40010 */ swc1 $f4, 0x0010($sp) + +/* 01E60 808C2FF0 E7A40010 */ swc1 $f4, 0x0010($sp) /* 01E64 808C2FF4 44803000 */ mtc1 $zero, $f6 ## $f6 = 0.00 /* 01E68 808C2FF8 3C053D4C */ lui $a1, 0x3D4C ## $a1 = 3D4C0000 /* 01E6C 808C2FFC 3C073BA3 */ lui $a3, 0x3BA3 ## $a3 = 3BA30000 @@ -27,42 +27,42 @@ glabel func_808C2FAC /* 01E78 808C3008 26040208 */ addiu $a0, $s0, 0x0208 ## $a0 = 00000208 /* 01E7C 808C300C 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 01E80 808C3010 0C01E0C4 */ jal Math_SmoothScaleMaxMinF - -/* 01E84 808C3014 E7A60010 */ swc1 $f6, 0x0010($sp) + +/* 01E84 808C3014 E7A60010 */ swc1 $f6, 0x0010($sp) /* 01E88 808C3018 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C /* 01E8C 808C301C 0C02927F */ jal SkelAnime_FrameUpdateMatrix - -/* 01E90 808C3020 AFA40030 */ sw $a0, 0x0030($sp) + +/* 01E90 808C3020 AFA40030 */ sw $a0, 0x0030($sp) /* 01E94 808C3024 860F01DA */ lh $t7, 0x01DA($s0) ## 000001DA /* 01E98 808C3028 3C040601 */ lui $a0, 0x0601 ## $a0 = 06010000 -/* 01E9C 808C302C 55E00015 */ bnel $t7, $zero, .L808C3084 -/* 01EA0 808C3030 8FBF002C */ lw $ra, 0x002C($sp) +/* 01E9C 808C302C 55E00015 */ bnel $t7, $zero, .L808C3084 +/* 01EA0 808C3030 8FBF002C */ lw $ra, 0x002C($sp) /* 01EA4 808C3034 0C028800 */ jal SkelAnime_GetFrameCount - + /* 01EA8 808C3038 24849D10 */ addiu $a0, $a0, 0x9D10 ## $a0 = 06009D10 /* 01EAC 808C303C 44824000 */ mtc1 $v0, $f8 ## $f8 = 0.00 /* 01EB0 808C3040 3C01C0A0 */ lui $at, 0xC0A0 ## $at = C0A00000 /* 01EB4 808C3044 44818000 */ mtc1 $at, $f16 ## $f16 = -5.00 -/* 01EB8 808C3048 468042A0 */ cvt.s.w $f10, $f8 +/* 01EB8 808C3048 468042A0 */ cvt.s.w $f10, $f8 /* 01EBC 808C304C 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 /* 01EC0 808C3050 24180002 */ addiu $t8, $zero, 0x0002 ## $t8 = 00000002 -/* 01EC4 808C3054 AFB80014 */ sw $t8, 0x0014($sp) +/* 01EC4 808C3054 AFB80014 */ sw $t8, 0x0014($sp) /* 01EC8 808C3058 24A59D10 */ addiu $a1, $a1, 0x9D10 ## $a1 = 06009D10 -/* 01ECC 808C305C 8FA40030 */ lw $a0, 0x0030($sp) -/* 01ED0 808C3060 E7AA0010 */ swc1 $f10, 0x0010($sp) +/* 01ECC 808C305C 8FA40030 */ lw $a0, 0x0030($sp) +/* 01ED0 808C3060 E7AA0010 */ swc1 $f10, 0x0010($sp) /* 01ED4 808C3064 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 01ED8 808C3068 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 01EDC 808C306C 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 01EE0 808C3070 E7B00018 */ swc1 $f16, 0x0018($sp) +/* 01EDC 808C306C 0C029468 */ jal SkelAnime_ChangeAnim + +/* 01EE0 808C3070 E7B00018 */ swc1 $f16, 0x0018($sp) /* 01EE4 808C3074 3C19808C */ lui $t9, %hi(func_808C3094) ## $t9 = 808C0000 /* 01EE8 808C3078 27393094 */ addiu $t9, $t9, %lo(func_808C3094) ## $t9 = 808C3094 /* 01EEC 808C307C AE190190 */ sw $t9, 0x0190($s0) ## 00000190 -/* 01EF0 808C3080 8FBF002C */ lw $ra, 0x002C($sp) +/* 01EF0 808C3080 8FBF002C */ lw $ra, 0x002C($sp) .L808C3084: -/* 01EF4 808C3084 8FB00028 */ lw $s0, 0x0028($sp) +/* 01EF4 808C3084 8FB00028 */ lw $s0, 0x0028($sp) /* 01EF8 808C3088 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 -/* 01EFC 808C308C 03E00008 */ jr $ra +/* 01EFC 808C308C 03E00008 */ jr $ra /* 01F00 808C3090 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/func_808C32F4.s b/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/func_808C32F4.s index a4e46a6654..5be1d58ff5 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/func_808C32F4.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/func_808C32F4.s @@ -1,57 +1,57 @@ glabel func_808C32F4 /* 02164 808C32F4 27BDFFB0 */ addiu $sp, $sp, 0xFFB0 ## $sp = FFFFFFB0 -/* 02168 808C32F8 AFBF0034 */ sw $ra, 0x0034($sp) -/* 0216C 808C32FC AFB00030 */ sw $s0, 0x0030($sp) -/* 02170 808C3300 AFA50054 */ sw $a1, 0x0054($sp) +/* 02168 808C32F8 AFBF0034 */ sw $ra, 0x0034($sp) +/* 0216C 808C32FC AFB00030 */ sw $s0, 0x0030($sp) +/* 02170 808C3300 AFA50054 */ sw $a1, 0x0054($sp) /* 02174 808C3304 848E01AA */ lh $t6, 0x01AA($a0) ## 000001AA /* 02178 808C3308 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 0217C 808C330C 15C0000C */ bne $t6, $zero, .L808C3340 +/* 0217C 808C330C 15C0000C */ bne $t6, $zero, .L808C3340 /* 02180 808C3310 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 02184 808C3314 AFA4003C */ sw $a0, 0x003C($sp) -/* 02188 808C3318 0C0295B2 */ jal func_800A56C8 +/* 02184 808C3314 AFA4003C */ sw $a0, 0x003C($sp) +/* 02188 808C3318 0C0295B2 */ jal func_800A56C8 /* 0218C 808C331C 3C054160 */ lui $a1, 0x4160 ## $a1 = 41600000 -/* 02190 808C3320 10400050 */ beq $v0, $zero, .L808C3464 -/* 02194 808C3324 8FA4003C */ lw $a0, 0x003C($sp) +/* 02190 808C3320 10400050 */ beq $v0, $zero, .L808C3464 +/* 02194 808C3324 8FA4003C */ lw $a0, 0x003C($sp) /* 02198 808C3328 3C050602 */ lui $a1, 0x0602 ## $a1 = 06020000 -/* 0219C 808C332C 0C0294BE */ jal func_800A52F8 +/* 0219C 808C332C 0C0294BE */ jal SkelAnime_ChangeAnimDefaultRepeat /* 021A0 808C3330 24A5CAE0 */ addiu $a1, $a1, 0xCAE0 ## $a1 = 0601CAE0 /* 021A4 808C3334 24030001 */ addiu $v1, $zero, 0x0001 ## $v1 = 00000001 -/* 021A8 808C3338 1000004A */ beq $zero, $zero, .L808C3464 +/* 021A8 808C3338 1000004A */ beq $zero, $zero, .L808C3464 /* 021AC 808C333C A60301AA */ sh $v1, 0x01AA($s0) ## 000001AA .L808C3340: /* 021B0 808C3340 860F01BC */ lh $t7, 0x01BC($s0) ## 000001BC /* 021B4 808C3344 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 021B8 808C3348 11E10046 */ beq $t7, $at, .L808C3464 +/* 021B8 808C3348 11E10046 */ beq $t7, $at, .L808C3464 /* 021BC 808C334C 00000000 */ nop /* 021C0 808C3350 C6040164 */ lwc1 $f4, 0x0164($s0) ## 00000164 /* 021C4 808C3354 24030001 */ addiu $v1, $zero, 0x0001 ## $v1 = 00000001 /* 021C8 808C3358 2401001F */ addiu $at, $zero, 0x001F ## $at = 0000001F -/* 021CC 808C335C 4600218D */ trunc.w.s $f6, $f4 -/* 021D0 808C3360 44023000 */ mfc1 $v0, $f6 +/* 021CC 808C335C 4600218D */ trunc.w.s $f6, $f4 +/* 021D0 808C3360 44023000 */ mfc1 $v0, $f6 /* 021D4 808C3364 00000000 */ nop -/* 021D8 808C3368 10620003 */ beq $v1, $v0, .L808C3378 +/* 021D8 808C3368 10620003 */ beq $v1, $v0, .L808C3378 /* 021DC 808C336C 00000000 */ nop -/* 021E0 808C3370 1441003C */ bne $v0, $at, .L808C3464 +/* 021E0 808C3370 1441003C */ bne $v0, $at, .L808C3464 /* 021E4 808C3374 00000000 */ nop .L808C3378: -/* 021E8 808C3378 14620012 */ bne $v1, $v0, .L808C33C4 -/* 021EC 808C337C 8FA40054 */ lw $a0, 0x0054($sp) +/* 021E8 808C3378 14620012 */ bne $v1, $v0, .L808C33C4 +/* 021EC 808C337C 8FA40054 */ lw $a0, 0x0054($sp) /* 021F0 808C3380 3C014100 */ lui $at, 0x4100 ## $at = 41000000 /* 021F4 808C3384 44814000 */ mtc1 $at, $f8 ## $f8 = 8.00 /* 021F8 808C3388 2419000A */ addiu $t9, $zero, 0x000A ## $t9 = 0000000A /* 021FC 808C338C 240801F4 */ addiu $t0, $zero, 0x01F4 ## $t0 = 000001F4 /* 02200 808C3390 2409000A */ addiu $t1, $zero, 0x000A ## $t1 = 0000000A -/* 02204 808C3394 AFA9001C */ sw $t1, 0x001C($sp) -/* 02208 808C3398 AFA80018 */ sw $t0, 0x0018($sp) -/* 0220C 808C339C AFB90010 */ sw $t9, 0x0010($sp) -/* 02210 808C33A0 8FA40054 */ lw $a0, 0x0054($sp) +/* 02204 808C3394 AFA9001C */ sw $t1, 0x001C($sp) +/* 02208 808C3398 AFA80018 */ sw $t0, 0x0018($sp) +/* 0220C 808C339C AFB90010 */ sw $t9, 0x0010($sp) +/* 02210 808C33A0 8FA40054 */ lw $a0, 0x0054($sp) /* 02214 808C33A4 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 02218 808C33A8 26060410 */ addiu $a2, $s0, 0x0410 ## $a2 = 00000410 /* 0221C 808C33AC 3C0741C8 */ lui $a3, 0x41C8 ## $a3 = 41C80000 -/* 02220 808C33B0 AFA00020 */ sw $zero, 0x0020($sp) -/* 02224 808C33B4 0C00CC98 */ jal func_80033260 -/* 02228 808C33B8 E7A80014 */ swc1 $f8, 0x0014($sp) -/* 0222C 808C33BC 10000010 */ beq $zero, $zero, .L808C3400 +/* 02220 808C33B0 AFA00020 */ sw $zero, 0x0020($sp) +/* 02224 808C33B4 0C00CC98 */ jal func_80033260 +/* 02228 808C33B8 E7A80014 */ swc1 $f8, 0x0014($sp) +/* 0222C 808C33BC 10000010 */ beq $zero, $zero, .L808C3400 /* 02230 808C33C0 860D01BC */ lh $t5, 0x01BC($s0) ## 000001BC .L808C33C4: /* 02234 808C33C4 3C014100 */ lui $at, 0x4100 ## $at = 41000000 @@ -59,76 +59,76 @@ glabel func_808C32F4 /* 0223C 808C33CC 240A000A */ addiu $t2, $zero, 0x000A ## $t2 = 0000000A /* 02240 808C33D0 240B01F4 */ addiu $t3, $zero, 0x01F4 ## $t3 = 000001F4 /* 02244 808C33D4 240C000A */ addiu $t4, $zero, 0x000A ## $t4 = 0000000A -/* 02248 808C33D8 AFAC001C */ sw $t4, 0x001C($sp) -/* 0224C 808C33DC AFAB0018 */ sw $t3, 0x0018($sp) -/* 02250 808C33E0 AFAA0010 */ sw $t2, 0x0010($sp) +/* 02248 808C33D8 AFAC001C */ sw $t4, 0x001C($sp) +/* 0224C 808C33DC AFAB0018 */ sw $t3, 0x0018($sp) +/* 02250 808C33E0 AFAA0010 */ sw $t2, 0x0010($sp) /* 02254 808C33E4 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 02258 808C33E8 26060404 */ addiu $a2, $s0, 0x0404 ## $a2 = 00000404 /* 0225C 808C33EC 3C0741C8 */ lui $a3, 0x41C8 ## $a3 = 41C80000 -/* 02260 808C33F0 AFA00020 */ sw $zero, 0x0020($sp) -/* 02264 808C33F4 0C00CC98 */ jal func_80033260 -/* 02268 808C33F8 E7AA0014 */ swc1 $f10, 0x0014($sp) +/* 02260 808C33F0 AFA00020 */ sw $zero, 0x0020($sp) +/* 02264 808C33F4 0C00CC98 */ jal func_80033260 +/* 02268 808C33F8 E7AA0014 */ swc1 $f10, 0x0014($sp) /* 0226C 808C33FC 860D01BC */ lh $t5, 0x01BC($s0) ## 000001BC .L808C3400: /* 02270 808C3400 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02274 808C3404 11A00005 */ beq $t5, $zero, .L808C341C +/* 02274 808C3404 11A00005 */ beq $t5, $zero, .L808C341C /* 02278 808C3408 00000000 */ nop -/* 0227C 808C340C 0C01E221 */ jal func_80078884 +/* 0227C 808C340C 0C01E221 */ jal func_80078884 /* 02280 808C3410 24043808 */ addiu $a0, $zero, 0x3808 ## $a0 = 00003808 -/* 02284 808C3414 10000004 */ beq $zero, $zero, .L808C3428 +/* 02284 808C3414 10000004 */ beq $zero, $zero, .L808C3428 /* 02288 808C3418 860E01B4 */ lh $t6, 0x01B4($s0) ## 000001B4 .L808C341C: /* 0228C 808C341C 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 02290 808C3420 24053808 */ addiu $a1, $zero, 0x3808 ## $a1 = 00003808 /* 02294 808C3424 860E01B4 */ lh $t6, 0x01B4($s0) ## 000001B4 .L808C3428: /* 02298 808C3428 240F000A */ addiu $t7, $zero, 0x000A ## $t7 = 0000000A /* 0229C 808C342C 240500B4 */ addiu $a1, $zero, 0x00B4 ## $a1 = 000000B4 -/* 022A0 808C3430 15C00008 */ bne $t6, $zero, .L808C3454 +/* 022A0 808C3430 15C00008 */ bne $t6, $zero, .L808C3454 /* 022A4 808C3434 24060014 */ addiu $a2, $zero, 0x0014 ## $a2 = 00000014 /* 022A8 808C3438 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 022AC 808C343C 8FA50054 */ lw $a1, 0x0054($sp) +/* 022AC 808C343C 8FA50054 */ lw $a1, 0x0054($sp) /* 022B0 808C3440 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 -/* 022B4 808C3444 0C00CFA2 */ jal func_80033E88 +/* 022B4 808C3444 0C00CFA2 */ jal func_80033E88 /* 022B8 808C3448 2407000A */ addiu $a3, $zero, 0x000A ## $a3 = 0000000A -/* 022BC 808C344C 10000005 */ beq $zero, $zero, .L808C3464 +/* 022BC 808C344C 10000005 */ beq $zero, $zero, .L808C3464 /* 022C0 808C3450 00000000 */ nop .L808C3454: /* 022C4 808C3454 44806000 */ mtc1 $zero, $f12 ## $f12 = 0.00 /* 022C8 808C3458 A60F01B6 */ sh $t7, 0x01B6($s0) ## 000001B6 -/* 022CC 808C345C 0C02A7DB */ jal func_800A9F6C +/* 022CC 808C345C 0C02A7DB */ jal func_800A9F6C /* 022D0 808C3460 24070064 */ addiu $a3, $zero, 0x0064 ## $a3 = 00000064 .L808C3464: /* 022D4 808C3464 0C02927F */ jal SkelAnime_FrameUpdateMatrix - + /* 022D8 808C3468 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C /* 022DC 808C346C 3C01808D */ lui $at, %hi(D_808CA6C4) ## $at = 808D0000 -/* 022E0 808C3470 C420A6C4 */ lwc1 $f0, %lo(D_808CA6C4)($at) +/* 022E0 808C3470 C420A6C4 */ lwc1 $f0, %lo(D_808CA6C4)($at) /* 022E4 808C3474 3C014080 */ lui $at, 0x4080 ## $at = 40800000 /* 022E8 808C3478 44818000 */ mtc1 $at, $f16 ## $f16 = 4.00 /* 022EC 808C347C 3C013E80 */ lui $at, 0x3E80 ## $at = 3E800000 /* 022F0 808C3480 44812000 */ mtc1 $at, $f4 ## $f4 = 0.25 -/* 022F4 808C3484 46100482 */ mul.s $f18, $f0, $f16 +/* 022F4 808C3484 46100482 */ mul.s $f18, $f0, $f16 /* 022F8 808C3488 861801A0 */ lh $t8, 0x01A0($s0) ## 000001A0 /* 022FC 808C348C 3C08808D */ lui $t0, %hi(D_808CA3F8) ## $t0 = 808D0000 -/* 02300 808C3490 46040182 */ mul.s $f6, $f0, $f4 -/* 02304 808C3494 0018C880 */ sll $t9, $t8, 2 -/* 02308 808C3498 0338C823 */ subu $t9, $t9, $t8 -/* 0230C 808C349C 0019C880 */ sll $t9, $t9, 2 +/* 02300 808C3490 46040182 */ mul.s $f6, $f0, $f4 +/* 02304 808C3494 0018C880 */ sll $t9, $t8, 2 +/* 02308 808C3498 0338C823 */ subu $t9, $t9, $t8 +/* 0230C 808C349C 0019C880 */ sll $t9, $t9, 2 /* 02310 808C34A0 2508A3F8 */ addiu $t0, $t0, %lo(D_808CA3F8) ## $t0 = 808CA3F8 -/* 02314 808C34A4 03284821 */ addu $t1, $t9, $t0 +/* 02314 808C34A4 03284821 */ addu $t1, $t9, $t0 /* 02318 808C34A8 44804000 */ mtc1 $zero, $f8 ## $f8 = 0.00 -/* 0231C 808C34AC AFA9004C */ sw $t1, 0x004C($sp) -/* 02320 808C34B0 44073000 */ mfc1 $a3, $f6 -/* 02324 808C34B4 44059000 */ mfc1 $a1, $f18 +/* 0231C 808C34AC AFA9004C */ sw $t1, 0x004C($sp) +/* 02320 808C34B0 44073000 */ mfc1 $a3, $f6 +/* 02324 808C34B4 44059000 */ mfc1 $a1, $f18 /* 02328 808C34B8 E60001EC */ swc1 $f0, 0x01EC($s0) ## 000001EC /* 0232C 808C34BC 260401E4 */ addiu $a0, $s0, 0x01E4 ## $a0 = 000001E4 /* 02330 808C34C0 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 02334 808C34C4 0C01E0C4 */ jal Math_SmoothScaleMaxMinF - -/* 02338 808C34C8 E7A80010 */ swc1 $f8, 0x0010($sp) -/* 0233C 808C34CC 8FAA004C */ lw $t2, 0x004C($sp) + +/* 02338 808C34C8 E7A80010 */ swc1 $f8, 0x0010($sp) +/* 0233C 808C34CC 8FAA004C */ lw $t2, 0x004C($sp) /* 02340 808C34D0 44805000 */ mtc1 $zero, $f10 ## $f10 = 0.00 /* 02344 808C34D4 3C063E99 */ lui $a2, 0x3E99 ## $a2 = 3E990000 /* 02348 808C34D8 8E0701E4 */ lw $a3, 0x01E4($s0) ## 000001E4 @@ -136,9 +136,9 @@ glabel func_808C32F4 /* 02350 808C34E0 34C6999A */ ori $a2, $a2, 0x999A ## $a2 = 3E99999A /* 02354 808C34E4 26040024 */ addiu $a0, $s0, 0x0024 ## $a0 = 00000024 /* 02358 808C34E8 0C01E0C4 */ jal Math_SmoothScaleMaxMinF - -/* 0235C 808C34EC E7AA0010 */ swc1 $f10, 0x0010($sp) -/* 02360 808C34F0 8FAB004C */ lw $t3, 0x004C($sp) + +/* 0235C 808C34EC E7AA0010 */ swc1 $f10, 0x0010($sp) +/* 02360 808C34F0 8FAB004C */ lw $t3, 0x004C($sp) /* 02364 808C34F4 44808000 */ mtc1 $zero, $f16 ## $f16 = 0.00 /* 02368 808C34F8 3C063E99 */ lui $a2, 0x3E99 ## $a2 = 3E990000 /* 0236C 808C34FC 8E0701E4 */ lw $a3, 0x01E4($s0) ## 000001E4 @@ -146,87 +146,87 @@ glabel func_808C32F4 /* 02374 808C3504 34C6999A */ ori $a2, $a2, 0x999A ## $a2 = 3E99999A /* 02378 808C3508 2604002C */ addiu $a0, $s0, 0x002C ## $a0 = 0000002C /* 0237C 808C350C 0C01E0C4 */ jal Math_SmoothScaleMaxMinF - -/* 02380 808C3510 E7B00010 */ swc1 $f16, 0x0010($sp) -/* 02384 808C3514 8FA2004C */ lw $v0, 0x004C($sp) + +/* 02380 808C3510 E7B00010 */ swc1 $f16, 0x0010($sp) +/* 02384 808C3514 8FA2004C */ lw $v0, 0x004C($sp) /* 02388 808C3518 C6040024 */ lwc1 $f4, 0x0024($s0) ## 00000024 /* 0238C 808C351C 3C0142A0 */ lui $at, 0x42A0 ## $at = 42A00000 /* 02390 808C3520 C4520000 */ lwc1 $f18, 0x0000($v0) ## 00000000 /* 02394 808C3524 260401E8 */ addiu $a0, $s0, 0x01E8 ## $a0 = 000001E8 /* 02398 808C3528 3C0544FA */ lui $a1, 0x44FA ## $a1 = 44FA0000 -/* 0239C 808C352C 46049181 */ sub.s $f6, $f18, $f4 +/* 0239C 808C352C 46049181 */ sub.s $f6, $f18, $f4 /* 023A0 808C3530 44812000 */ mtc1 $at, $f4 ## $f4 = 80.00 /* 023A4 808C3534 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 023A8 808C3538 E7A60048 */ swc1 $f6, 0x0048($sp) +/* 023A8 808C3538 E7A60048 */ swc1 $f6, 0x0048($sp) /* 023AC 808C353C C60A002C */ lwc1 $f10, 0x002C($s0) ## 0000002C /* 023B0 808C3540 C4480008 */ lwc1 $f8, 0x0008($v0) ## 00000008 -/* 023B4 808C3544 460A4401 */ sub.s $f16, $f8, $f10 +/* 023B4 808C3544 460A4401 */ sub.s $f16, $f8, $f10 /* 023B8 808C3548 44804000 */ mtc1 $zero, $f8 ## $f8 = 0.00 -/* 023BC 808C354C E7B00044 */ swc1 $f16, 0x0044($sp) +/* 023BC 808C354C E7B00044 */ swc1 $f16, 0x0044($sp) /* 023C0 808C3550 C61201EC */ lwc1 $f18, 0x01EC($s0) ## 000001EC -/* 023C4 808C3554 E7A80010 */ swc1 $f8, 0x0010($sp) -/* 023C8 808C3558 46049182 */ mul.s $f6, $f18, $f4 -/* 023CC 808C355C 44073000 */ mfc1 $a3, $f6 +/* 023C4 808C3554 E7A80010 */ swc1 $f8, 0x0010($sp) +/* 023C8 808C3558 46049182 */ mul.s $f6, $f18, $f4 +/* 023CC 808C355C 44073000 */ mfc1 $a3, $f6 /* 023D0 808C3560 0C01E0C4 */ jal Math_SmoothScaleMaxMinF - + /* 023D4 808C3564 00000000 */ nop -/* 023D8 808C3568 C7AC0048 */ lwc1 $f12, 0x0048($sp) -/* 023DC 808C356C 0C03F494 */ jal func_800FD250 -/* 023E0 808C3570 C7AE0044 */ lwc1 $f14, 0x0044($sp) +/* 023D8 808C3568 C7AC0048 */ lwc1 $f12, 0x0048($sp) +/* 023DC 808C356C 0C03F494 */ jal Math_atan2f +/* 023E0 808C3570 C7AE0044 */ lwc1 $f14, 0x0044($sp) /* 023E4 808C3574 3C01808D */ lui $at, %hi(D_808CA6C8) ## $at = 808D0000 -/* 023E8 808C3578 C42AA6C8 */ lwc1 $f10, %lo(D_808CA6C8)($at) +/* 023E8 808C3578 C42AA6C8 */ lwc1 $f10, %lo(D_808CA6C8)($at) /* 023EC 808C357C C60401EC */ lwc1 $f4, 0x01EC($s0) ## 000001EC /* 023F0 808C3580 C60601E8 */ lwc1 $f6, 0x01E8($s0) ## 000001E8 -/* 023F4 808C3584 460A0402 */ mul.s $f16, $f0, $f10 +/* 023F4 808C3584 460A0402 */ mul.s $f16, $f0, $f10 /* 023F8 808C3588 240E0005 */ addiu $t6, $zero, 0x0005 ## $t6 = 00000005 -/* 023FC 808C358C AFAE0010 */ sw $t6, 0x0010($sp) -/* 02400 808C3590 46062202 */ mul.s $f8, $f4, $f6 +/* 023FC 808C358C AFAE0010 */ sw $t6, 0x0010($sp) +/* 02400 808C3590 46062202 */ mul.s $f8, $f4, $f6 /* 02404 808C3594 26040032 */ addiu $a0, $s0, 0x0032 ## $a0 = 00000032 /* 02408 808C3598 24060005 */ addiu $a2, $zero, 0x0005 ## $a2 = 00000005 -/* 0240C 808C359C 4600848D */ trunc.w.s $f18, $f16 -/* 02410 808C35A0 4600428D */ trunc.w.s $f10, $f8 -/* 02414 808C35A4 44059000 */ mfc1 $a1, $f18 -/* 02418 808C35A8 44075000 */ mfc1 $a3, $f10 -/* 0241C 808C35AC 00052C00 */ sll $a1, $a1, 16 -/* 02420 808C35B0 00052C03 */ sra $a1, $a1, 16 -/* 02424 808C35B4 00073C00 */ sll $a3, $a3, 16 +/* 0240C 808C359C 4600848D */ trunc.w.s $f18, $f16 +/* 02410 808C35A0 4600428D */ trunc.w.s $f10, $f8 +/* 02414 808C35A4 44059000 */ mfc1 $a1, $f18 +/* 02418 808C35A8 44075000 */ mfc1 $a3, $f10 +/* 0241C 808C35AC 00052C00 */ sll $a1, $a1, 16 +/* 02420 808C35B0 00052C03 */ sra $a1, $a1, 16 +/* 02424 808C35B4 00073C00 */ sll $a3, $a3, 16 /* 02428 808C35B8 0C01E1A7 */ jal Math_SmoothScaleMaxMinS - -/* 0242C 808C35BC 00073C03 */ sra $a3, $a3, 16 + +/* 0242C 808C35BC 00073C03 */ sra $a3, $a3, 16 /* 02430 808C35C0 260401C4 */ addiu $a0, $s0, 0x01C4 ## $a0 = 000001C4 /* 02434 808C35C4 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 02438 808C35C8 24060002 */ addiu $a2, $zero, 0x0002 ## $a2 = 00000002 /* 0243C 808C35CC 240707D0 */ addiu $a3, $zero, 0x07D0 ## $a3 = 000007D0 /* 02440 808C35D0 0C01E1A7 */ jal Math_SmoothScaleMaxMinS - -/* 02444 808C35D4 AFA00010 */ sw $zero, 0x0010($sp) -/* 02448 808C35D8 C7A00048 */ lwc1 $f0, 0x0048($sp) + +/* 02444 808C35D4 AFA00010 */ sw $zero, 0x0010($sp) +/* 02448 808C35D8 C7A00048 */ lwc1 $f0, 0x0048($sp) /* 0244C 808C35DC 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 /* 02450 808C35E0 44811000 */ mtc1 $at, $f2 ## $f2 = 5.00 -/* 02454 808C35E4 46000005 */ abs.s $f0, $f0 -/* 02458 808C35E8 4602003E */ c.le.s $f0, $f2 -/* 0245C 808C35EC C7A00044 */ lwc1 $f0, 0x0044($sp) -/* 02460 808C35F0 4502001E */ bc1fl .L808C366C +/* 02454 808C35E4 46000005 */ abs.s $f0, $f0 +/* 02458 808C35E8 4602003E */ c.le.s $f0, $f2 +/* 0245C 808C35EC C7A00044 */ lwc1 $f0, 0x0044($sp) +/* 02460 808C35F0 4502001E */ bc1fl .L808C366C /* 02464 808C35F4 860D01DA */ lh $t5, 0x01DA($s0) ## 000001DA -/* 02468 808C35F8 46000005 */ abs.s $f0, $f0 -/* 0246C 808C35FC 4602003E */ c.le.s $f0, $f2 +/* 02468 808C35F8 46000005 */ abs.s $f0, $f0 +/* 0246C 808C35FC 4602003E */ c.le.s $f0, $f2 /* 02470 808C3600 00000000 */ nop -/* 02474 808C3604 45020019 */ bc1fl .L808C366C +/* 02474 808C3604 45020019 */ bc1fl .L808C366C /* 02478 808C3608 860D01DA */ lh $t5, 0x01DA($s0) ## 000001DA /* 0247C 808C360C 860F01A2 */ lh $t7, 0x01A2($s0) ## 000001A2 /* 02480 808C3610 44808000 */ mtc1 $zero, $f16 ## $f16 = 0.00 /* 02484 808C3614 44809000 */ mtc1 $zero, $f18 ## $f18 = 0.00 /* 02488 808C3618 E61001E8 */ swc1 $f16, 0x01E8($s0) ## 000001E8 -/* 0248C 808C361C 15E0000A */ bne $t7, $zero, .L808C3648 +/* 0248C 808C361C 15E0000A */ bne $t7, $zero, .L808C3648 /* 02490 808C3620 E61201E4 */ swc1 $f18, 0x01E4($s0) ## 000001E4 /* 02494 808C3624 861801A0 */ lh $t8, 0x01A0($s0) ## 000001A0 /* 02498 808C3628 27190001 */ addiu $t9, $t8, 0x0001 ## $t9 = 00000001 /* 0249C 808C362C A61901A0 */ sh $t9, 0x01A0($s0) ## 000001A0 /* 024A0 808C3630 860801A0 */ lh $t0, 0x01A0($s0) ## 000001A0 -/* 024A4 808C3634 29010004 */ slti $at, $t0, 0x0004 -/* 024A8 808C3638 5420000C */ bnel $at, $zero, .L808C366C +/* 024A4 808C3634 29010004 */ slti $at, $t0, 0x0004 +/* 024A8 808C3638 5420000C */ bnel $at, $zero, .L808C366C /* 024AC 808C363C 860D01DA */ lh $t5, 0x01DA($s0) ## 000001DA -/* 024B0 808C3640 10000009 */ beq $zero, $zero, .L808C3668 +/* 024B0 808C3640 10000009 */ beq $zero, $zero, .L808C3668 /* 024B4 808C3644 A60001A0 */ sh $zero, 0x01A0($s0) ## 000001A0 .L808C3648: /* 024B8 808C3648 860901A0 */ lh $t1, 0x01A0($s0) ## 000001A0 @@ -234,51 +234,51 @@ glabel func_808C32F4 /* 024C0 808C3650 252AFFFF */ addiu $t2, $t1, 0xFFFF ## $t2 = FFFFFFFF /* 024C4 808C3654 A60A01A0 */ sh $t2, 0x01A0($s0) ## 000001A0 /* 024C8 808C3658 860B01A0 */ lh $t3, 0x01A0($s0) ## 000001A0 -/* 024CC 808C365C 05630003 */ bgezl $t3, .L808C366C +/* 024CC 808C365C 05630003 */ bgezl $t3, .L808C366C /* 024D0 808C3660 860D01DA */ lh $t5, 0x01DA($s0) ## 000001DA /* 024D4 808C3664 A60C01A0 */ sh $t4, 0x01A0($s0) ## 000001A0 .L808C3668: /* 024D8 808C3668 860D01DA */ lh $t5, 0x01DA($s0) ## 000001DA .L808C366C: -/* 024DC 808C366C 55A00021 */ bnel $t5, $zero, .L808C36F4 -/* 024E0 808C3670 8FBF0034 */ lw $ra, 0x0034($sp) +/* 024DC 808C366C 55A00021 */ bnel $t5, $zero, .L808C36F4 +/* 024E0 808C3670 8FBF0034 */ lw $ra, 0x0034($sp) /* 024E4 808C3674 860E01BC */ lh $t6, 0x01BC($s0) ## 000001BC /* 024E8 808C3678 3C0143FA */ lui $at, 0x43FA ## $at = 43FA0000 -/* 024EC 808C367C 55C0001D */ bnel $t6, $zero, .L808C36F4 -/* 024F0 808C3680 8FBF0034 */ lw $ra, 0x0034($sp) +/* 024EC 808C367C 55C0001D */ bnel $t6, $zero, .L808C36F4 +/* 024F0 808C3680 8FBF0034 */ lw $ra, 0x0034($sp) /* 024F4 808C3684 C6040090 */ lwc1 $f4, 0x0090($s0) ## 00000090 /* 024F8 808C3688 44813000 */ mtc1 $at, $f6 ## $f6 = 500.00 /* 024FC 808C368C 00000000 */ nop -/* 02500 808C3690 4606203C */ c.lt.s $f4, $f6 +/* 02500 808C3690 4606203C */ c.lt.s $f4, $f6 /* 02504 808C3694 00000000 */ nop -/* 02508 808C3698 4502000E */ bc1fl .L808C36D4 +/* 02508 808C3698 4502000E */ bc1fl .L808C36D4 /* 0250C 808C369C 861901BA */ lh $t9, 0x01BA($s0) ## 000001BA /* 02510 808C36A0 860F01A4 */ lh $t7, 0x01A4($s0) ## 000001A4 -/* 02514 808C36A4 51E0000B */ beql $t7, $zero, .L808C36D4 +/* 02514 808C36A4 51E0000B */ beql $t7, $zero, .L808C36D4 /* 02518 808C36A8 861901BA */ lh $t9, 0x01BA($s0) ## 000001BA /* 0251C 808C36AC 861801BA */ lh $t8, 0x01BA($s0) ## 000001BA -/* 02520 808C36B0 57000008 */ bnel $t8, $zero, .L808C36D4 +/* 02520 808C36B0 57000008 */ bnel $t8, $zero, .L808C36D4 /* 02524 808C36B4 861901BA */ lh $t9, 0x01BA($s0) ## 000001BA -/* 02528 808C36B8 0C230ACE */ jal func_808C2B38 +/* 02528 808C36B8 0C230ACE */ jal func_808C2B38 /* 0252C 808C36BC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 02530 808C36C0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02534 808C36C4 8FA50054 */ lw $a1, 0x0054($sp) -/* 02538 808C36C8 0C2314B8 */ jal func_808C52E0 +/* 02534 808C36C4 8FA50054 */ lw $a1, 0x0054($sp) +/* 02538 808C36C8 0C2314B8 */ jal func_808C52E0 /* 0253C 808C36CC 2406FFFF */ addiu $a2, $zero, 0xFFFF ## $a2 = FFFFFFFF /* 02540 808C36D0 861901BA */ lh $t9, 0x01BA($s0) ## 000001BA .L808C36D4: -/* 02544 808C36D4 57200007 */ bnel $t9, $zero, .L808C36F4 -/* 02548 808C36D8 8FBF0034 */ lw $ra, 0x0034($sp) +/* 02544 808C36D4 57200007 */ bnel $t9, $zero, .L808C36F4 +/* 02548 808C36D8 8FBF0034 */ lw $ra, 0x0034($sp) /* 0254C 808C36DC 860801B8 */ lh $t0, 0x01B8($s0) ## 000001B8 -/* 02550 808C36E0 55000004 */ bnel $t0, $zero, .L808C36F4 -/* 02554 808C36E4 8FBF0034 */ lw $ra, 0x0034($sp) -/* 02558 808C36E8 0C230A90 */ jal func_808C2A40 +/* 02550 808C36E0 55000004 */ bnel $t0, $zero, .L808C36F4 +/* 02554 808C36E4 8FBF0034 */ lw $ra, 0x0034($sp) +/* 02558 808C36E8 0C230A90 */ jal func_808C2A40 /* 0255C 808C36EC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02560 808C36F0 8FBF0034 */ lw $ra, 0x0034($sp) +/* 02560 808C36F0 8FBF0034 */ lw $ra, 0x0034($sp) .L808C36F4: -/* 02564 808C36F4 8FB00030 */ lw $s0, 0x0030($sp) +/* 02564 808C36F4 8FB00030 */ lw $s0, 0x0030($sp) /* 02568 808C36F8 27BD0050 */ addiu $sp, $sp, 0x0050 ## $sp = 00000000 -/* 0256C 808C36FC 03E00008 */ jr $ra +/* 0256C 808C36FC 03E00008 */ jr $ra /* 02570 808C3700 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/func_808C3704.s b/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/func_808C3704.s index 457bd279e7..d9980754cd 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/func_808C3704.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/func_808C3704.s @@ -143,7 +143,7 @@ glabel func_808C3704 /* 0277C 808C390C 00000000 */ nop /* 02780 808C3910 C7AC004C */ lwc1 $f12, 0x004C($sp) -/* 02784 808C3914 0C03F494 */ jal func_800FD250 +/* 02784 808C3914 0C03F494 */ jal Math_atan2f /* 02788 808C3918 C7AE0048 */ lwc1 $f14, 0x0048($sp) /* 0278C 808C391C 3C01808D */ lui $at, %hi(D_808CA6D0) ## $at = 808D0000 /* 02790 808C3920 C42AA6D0 */ lwc1 $f10, %lo(D_808CA6D0)($at) diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/func_808C4940.s b/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/func_808C4940.s index 4077b1343e..bee79f236f 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/func_808C4940.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/func_808C4940.s @@ -1,119 +1,119 @@ glabel func_808C4940 /* 037B0 808C4940 27BDFFB0 */ addiu $sp, $sp, 0xFFB0 ## $sp = FFFFFFB0 /* 037B4 808C4944 24010006 */ addiu $at, $zero, 0x0006 ## $at = 00000006 -/* 037B8 808C4948 AFBF0014 */ sw $ra, 0x0014($sp) -/* 037BC 808C494C AFA40050 */ sw $a0, 0x0050($sp) -/* 037C0 808C4950 AFA50054 */ sw $a1, 0x0054($sp) -/* 037C4 808C4954 10A10001 */ beq $a1, $at, .L808C495C -/* 037C8 808C4958 AFA60058 */ sw $a2, 0x0058($sp) +/* 037B8 808C4948 AFBF0014 */ sw $ra, 0x0014($sp) +/* 037BC 808C494C AFA40050 */ sw $a0, 0x0050($sp) +/* 037C0 808C4950 AFA50054 */ sw $a1, 0x0054($sp) +/* 037C4 808C4954 10A10001 */ beq $a1, $at, .L808C495C +/* 037C8 808C4958 AFA60058 */ sw $a2, 0x0058($sp) .L808C495C: /* 037CC 808C495C 00E02025 */ or $a0, $a3, $zero ## $a0 = 00000000 -/* 037D0 808C4960 0C0344D0 */ jal func_800D1340 -/* 037D4 808C4964 8FA50060 */ lw $a1, 0x0060($sp) -/* 037D8 808C4968 8FAF0058 */ lw $t7, 0x0058($sp) +/* 037D0 808C4960 0C0344D0 */ jal Matrix_TranslateThenRotateZYX +/* 037D4 808C4964 8FA50060 */ lw $a1, 0x0060($sp) +/* 037D8 808C4968 8FAF0058 */ lw $t7, 0x0058($sp) /* 037DC 808C496C 3C06808D */ lui $a2, %hi(D_808CA5A0) ## $a2 = 808D0000 /* 037E0 808C4970 24C6A5A0 */ addiu $a2, $a2, %lo(D_808CA5A0) ## $a2 = 808CA5A0 /* 037E4 808C4974 8DF80000 */ lw $t8, 0x0000($t7) ## 00000000 -/* 037E8 808C4978 8FB90050 */ lw $t9, 0x0050($sp) +/* 037E8 808C4978 8FB90050 */ lw $t9, 0x0050($sp) /* 037EC 808C497C 27A40030 */ addiu $a0, $sp, 0x0030 ## $a0 = FFFFFFE0 -/* 037F0 808C4980 5300007F */ beql $t8, $zero, .L808C4B80 -/* 037F4 808C4984 8FBF0014 */ lw $ra, 0x0014($sp) +/* 037F0 808C4980 5300007F */ beql $t8, $zero, .L808C4B80 +/* 037F4 808C4984 8FBF0014 */ lw $ra, 0x0014($sp) /* 037F8 808C4988 8F250000 */ lw $a1, 0x0000($t9) ## 00000000 /* 037FC 808C498C 24070ECB */ addiu $a3, $zero, 0x0ECB ## $a3 = 00000ECB -/* 03800 808C4990 0C031AB1 */ jal func_800C6AC4 -/* 03804 808C4994 AFA50040 */ sw $a1, 0x0040($sp) +/* 03800 808C4990 0C031AB1 */ jal Graph_OpenDisps +/* 03804 808C4994 AFA50040 */ sw $a1, 0x0040($sp) /* 03808 808C4998 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 /* 0380C 808C499C 44817000 */ mtc1 $at, $f14 ## $f14 = 1.00 -/* 03810 808C49A0 8FA30054 */ lw $v1, 0x0054($sp) +/* 03810 808C49A0 8FA30054 */ lw $v1, 0x0054($sp) /* 03814 808C49A4 24010021 */ addiu $at, $zero, 0x0021 ## $at = 00000021 -/* 03818 808C49A8 8FA80064 */ lw $t0, 0x0064($sp) -/* 0381C 808C49AC 10610004 */ beq $v1, $at, .L808C49C0 -/* 03820 808C49B0 46007006 */ mov.s $f0, $f14 +/* 03818 808C49A8 8FA80064 */ lw $t0, 0x0064($sp) +/* 0381C 808C49AC 10610004 */ beq $v1, $at, .L808C49C0 +/* 03820 808C49B0 46007006 */ mov.s $f0, $f14 /* 03824 808C49B4 24010030 */ addiu $at, $zero, 0x0030 ## $at = 00000030 -/* 03828 808C49B8 54610004 */ bnel $v1, $at, .L808C49CC -/* 0382C 808C49BC E7A00048 */ swc1 $f0, 0x0048($sp) +/* 03828 808C49B8 54610004 */ bnel $v1, $at, .L808C49CC +/* 0382C 808C49BC E7A00048 */ swc1 $f0, 0x0048($sp) .L808C49C0: /* 03830 808C49C0 C50001F8 */ lwc1 $f0, 0x01F8($t0) ## 000001F8 -/* 03834 808C49C4 46000386 */ mov.s $f14, $f0 -/* 03838 808C49C8 E7A00048 */ swc1 $f0, 0x0048($sp) +/* 03834 808C49C4 46000386 */ mov.s $f14, $f0 +/* 03838 808C49C8 E7A00048 */ swc1 $f0, 0x0048($sp) .L808C49CC: -/* 0383C 808C49CC 0C034213 */ jal Matrix_Push -/* 03840 808C49D0 E7AE004C */ swc1 $f14, 0x004C($sp) -/* 03844 808C49D4 C7A00048 */ lwc1 $f0, 0x0048($sp) +/* 0383C 808C49CC 0C034213 */ jal Matrix_Push +/* 03840 808C49D0 E7AE004C */ swc1 $f14, 0x004C($sp) +/* 03844 808C49D4 C7A00048 */ lwc1 $f0, 0x0048($sp) /* 03848 808C49D8 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 /* 0384C 808C49DC 44816000 */ mtc1 $at, $f12 ## $f12 = 1.00 -/* 03850 808C49E0 44060000 */ mfc1 $a2, $f0 -/* 03854 808C49E4 C7AE004C */ lwc1 $f14, 0x004C($sp) -/* 03858 808C49E8 0C0342A3 */ jal Matrix_Scale +/* 03850 808C49E0 44060000 */ mfc1 $a2, $f0 +/* 03854 808C49E4 C7AE004C */ lwc1 $f14, 0x004C($sp) +/* 03858 808C49E8 0C0342A3 */ jal Matrix_Scale /* 0385C 808C49EC 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 03860 808C49F0 8FA30054 */ lw $v1, 0x0054($sp) +/* 03860 808C49F0 8FA30054 */ lw $v1, 0x0054($sp) /* 03864 808C49F4 24010006 */ addiu $at, $zero, 0x0006 ## $at = 00000006 -/* 03868 808C49F8 1061003F */ beq $v1, $at, .L808C4AF8 +/* 03868 808C49F8 1061003F */ beq $v1, $at, .L808C4AF8 /* 0386C 808C49FC 24010007 */ addiu $at, $zero, 0x0007 ## $at = 00000007 -/* 03870 808C4A00 1061003D */ beq $v1, $at, .L808C4AF8 -/* 03874 808C4A04 8FA90064 */ lw $t1, 0x0064($sp) -/* 03878 808C4A08 00035080 */ sll $t2, $v1, 2 -/* 0387C 808C4A0C 012A1021 */ addu $v0, $t1, $t2 +/* 03870 808C4A00 1061003D */ beq $v1, $at, .L808C4AF8 +/* 03874 808C4A04 8FA90064 */ lw $t1, 0x0064($sp) +/* 03878 808C4A08 00035080 */ sll $t2, $v1, 2 +/* 0387C 808C4A0C 012A1021 */ addu $v0, $t1, $t2 /* 03880 808C4A10 3C01808D */ lui $at, %hi(D_808CA728) ## $at = 808D0000 -/* 03884 808C4A14 C426A728 */ lwc1 $f6, %lo(D_808CA728)($at) +/* 03884 808C4A14 C426A728 */ lwc1 $f6, %lo(D_808CA728)($at) /* 03888 808C4A18 C444025C */ lwc1 $f4, 0x025C($v0) ## 0000025C -/* 0388C 808C4A1C AFA20020 */ sw $v0, 0x0020($sp) +/* 0388C 808C4A1C AFA20020 */ sw $v0, 0x0020($sp) /* 03890 808C4A20 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 -/* 03894 808C4A24 46062302 */ mul.s $f12, $f4, $f6 -/* 03898 808C4A28 0C0342DC */ jal Matrix_RotateX +/* 03894 808C4A24 46062302 */ mul.s $f12, $f4, $f6 +/* 03898 808C4A28 0C0342DC */ jal Matrix_RotateX /* 0389C 808C4A2C 00000000 */ nop -/* 038A0 808C4A30 8FAB0020 */ lw $t3, 0x0020($sp) +/* 038A0 808C4A30 8FAB0020 */ lw $t3, 0x0020($sp) /* 038A4 808C4A34 3C01808D */ lui $at, %hi(D_808CA72C) ## $at = 808D0000 -/* 038A8 808C4A38 C42AA72C */ lwc1 $f10, %lo(D_808CA72C)($at) +/* 038A8 808C4A38 C42AA72C */ lwc1 $f10, %lo(D_808CA72C)($at) /* 038AC 808C4A3C C568025C */ lwc1 $f8, 0x025C($t3) ## 0000025C /* 038B0 808C4A40 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 -/* 038B4 808C4A44 460A4302 */ mul.s $f12, $f8, $f10 -/* 038B8 808C4A48 0C034348 */ jal Matrix_RotateY +/* 038B4 808C4A44 460A4302 */ mul.s $f12, $f8, $f10 +/* 038B8 808C4A48 0C034348 */ jal Matrix_RotateY /* 038BC 808C4A4C 00000000 */ nop -/* 038C0 808C4A50 8FAC0020 */ lw $t4, 0x0020($sp) +/* 038C0 808C4A50 8FAC0020 */ lw $t4, 0x0020($sp) /* 038C4 808C4A54 3C01808D */ lui $at, %hi(D_808CA730) ## $at = 808D0000 -/* 038C8 808C4A58 C432A730 */ lwc1 $f18, %lo(D_808CA730)($at) +/* 038C8 808C4A58 C432A730 */ lwc1 $f18, %lo(D_808CA730)($at) /* 038CC 808C4A5C C590025C */ lwc1 $f16, 0x025C($t4) ## 0000025C /* 038D0 808C4A60 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 -/* 038D4 808C4A64 46128302 */ mul.s $f12, $f16, $f18 -/* 038D8 808C4A68 0C0343B5 */ jal Matrix_RotateZ +/* 038D4 808C4A64 46128302 */ mul.s $f12, $f16, $f18 +/* 038D8 808C4A68 0C0343B5 */ jal Matrix_RotateZ /* 038DC 808C4A6C 00000000 */ nop -/* 038E0 808C4A70 8FAD0064 */ lw $t5, 0x0064($sp) +/* 038E0 808C4A70 8FAD0064 */ lw $t5, 0x0064($sp) /* 038E4 808C4A74 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 /* 038E8 808C4A78 44811000 */ mtc1 $at, $f2 ## $f2 = 1.00 /* 038EC 808C4A7C C5A00208 */ lwc1 $f0, 0x0208($t5) ## 00000208 /* 038F0 808C4A80 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 038F4 808C4A84 46001301 */ sub.s $f12, $f2, $f0 -/* 038F8 808C4A88 46020380 */ add.s $f14, $f0, $f2 -/* 038FC 808C4A8C 44066000 */ mfc1 $a2, $f12 -/* 03900 808C4A90 0C0342A3 */ jal Matrix_Scale +/* 038F4 808C4A84 46001301 */ sub.s $f12, $f2, $f0 +/* 038F8 808C4A88 46020380 */ add.s $f14, $f0, $f2 +/* 038FC 808C4A8C 44066000 */ mfc1 $a2, $f12 +/* 03900 808C4A90 0C0342A3 */ jal Matrix_Scale /* 03904 808C4A94 00000000 */ nop -/* 03908 808C4A98 8FAE0020 */ lw $t6, 0x0020($sp) +/* 03908 808C4A98 8FAE0020 */ lw $t6, 0x0020($sp) /* 0390C 808C4A9C 3C01808D */ lui $at, %hi(D_808CA734) ## $at = 808D0000 -/* 03910 808C4AA0 C426A734 */ lwc1 $f6, %lo(D_808CA734)($at) +/* 03910 808C4AA0 C426A734 */ lwc1 $f6, %lo(D_808CA734)($at) /* 03914 808C4AA4 C5C4025C */ lwc1 $f4, 0x025C($t6) ## 0000025C /* 03918 808C4AA8 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 -/* 0391C 808C4AAC 46062302 */ mul.s $f12, $f4, $f6 -/* 03920 808C4AB0 0C0343B5 */ jal Matrix_RotateZ -/* 03924 808C4AB4 46006307 */ neg.s $f12, $f12 -/* 03928 808C4AB8 8FAF0020 */ lw $t7, 0x0020($sp) +/* 0391C 808C4AAC 46062302 */ mul.s $f12, $f4, $f6 +/* 03920 808C4AB0 0C0343B5 */ jal Matrix_RotateZ +/* 03924 808C4AB4 46006307 */ neg.s $f12, $f12 +/* 03928 808C4AB8 8FAF0020 */ lw $t7, 0x0020($sp) /* 0392C 808C4ABC 3C01808D */ lui $at, %hi(D_808CA738) ## $at = 808D0000 -/* 03930 808C4AC0 C42AA738 */ lwc1 $f10, %lo(D_808CA738)($at) +/* 03930 808C4AC0 C42AA738 */ lwc1 $f10, %lo(D_808CA738)($at) /* 03934 808C4AC4 C5E8025C */ lwc1 $f8, 0x025C($t7) ## 0000025C /* 03938 808C4AC8 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 -/* 0393C 808C4ACC 460A4302 */ mul.s $f12, $f8, $f10 -/* 03940 808C4AD0 0C034348 */ jal Matrix_RotateY -/* 03944 808C4AD4 46006307 */ neg.s $f12, $f12 -/* 03948 808C4AD8 8FB80020 */ lw $t8, 0x0020($sp) +/* 0393C 808C4ACC 460A4302 */ mul.s $f12, $f8, $f10 +/* 03940 808C4AD0 0C034348 */ jal Matrix_RotateY +/* 03944 808C4AD4 46006307 */ neg.s $f12, $f12 +/* 03948 808C4AD8 8FB80020 */ lw $t8, 0x0020($sp) /* 0394C 808C4ADC 3C01808D */ lui $at, %hi(D_808CA73C) ## $at = 808D0000 -/* 03950 808C4AE0 C432A73C */ lwc1 $f18, %lo(D_808CA73C)($at) +/* 03950 808C4AE0 C432A73C */ lwc1 $f18, %lo(D_808CA73C)($at) /* 03954 808C4AE4 C710025C */ lwc1 $f16, 0x025C($t8) ## 0000025C /* 03958 808C4AE8 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 -/* 0395C 808C4AEC 46128302 */ mul.s $f12, $f16, $f18 -/* 03960 808C4AF0 0C0342DC */ jal Matrix_RotateX -/* 03964 808C4AF4 46006307 */ neg.s $f12, $f12 +/* 0395C 808C4AEC 46128302 */ mul.s $f12, $f16, $f18 +/* 03960 808C4AF0 0C0342DC */ jal Matrix_RotateX +/* 03964 808C4AF4 46006307 */ neg.s $f12, $f12 .L808C4AF8: -/* 03968 808C4AF8 8FA70040 */ lw $a3, 0x0040($sp) +/* 03968 808C4AF8 8FA70040 */ lw $a3, 0x0040($sp) /* 0396C 808C4AFC 3C08DA38 */ lui $t0, 0xDA38 ## $t0 = DA380000 /* 03970 808C4B00 35080003 */ ori $t0, $t0, 0x0003 ## $t0 = DA380003 /* 03974 808C4B04 8CE202C0 */ lw $v0, 0x02C0($a3) ## 000002C0 @@ -122,35 +122,35 @@ glabel func_808C4940 /* 03980 808C4B10 24590008 */ addiu $t9, $v0, 0x0008 ## $t9 = 00000008 /* 03984 808C4B14 ACF902C0 */ sw $t9, 0x02C0($a3) ## 000002C0 /* 03988 808C4B18 AC480000 */ sw $t0, 0x0000($v0) ## 00000000 -/* 0398C 808C4B1C 8FA90050 */ lw $t1, 0x0050($sp) +/* 0398C 808C4B1C 8FA90050 */ lw $t1, 0x0050($sp) /* 03990 808C4B20 24060EEE */ addiu $a2, $zero, 0x0EEE ## $a2 = 00000EEE /* 03994 808C4B24 8D240000 */ lw $a0, 0x0000($t1) ## 00000000 -/* 03998 808C4B28 0C0346A2 */ jal Matrix_NewMtx -/* 0399C 808C4B2C AFA2002C */ sw $v0, 0x002C($sp) -/* 039A0 808C4B30 8FA3002C */ lw $v1, 0x002C($sp) +/* 03998 808C4B28 0C0346A2 */ jal Matrix_NewMtx +/* 0399C 808C4B2C AFA2002C */ sw $v0, 0x002C($sp) +/* 039A0 808C4B30 8FA3002C */ lw $v1, 0x002C($sp) /* 039A4 808C4B34 3C0CDE00 */ lui $t4, 0xDE00 ## $t4 = DE000000 /* 039A8 808C4B38 AC620004 */ sw $v0, 0x0004($v1) ## 00000004 -/* 039AC 808C4B3C 8FAA0040 */ lw $t2, 0x0040($sp) +/* 039AC 808C4B3C 8FAA0040 */ lw $t2, 0x0040($sp) /* 039B0 808C4B40 8D4202C0 */ lw $v0, 0x02C0($t2) ## 000002C0 /* 039B4 808C4B44 244B0008 */ addiu $t3, $v0, 0x0008 ## $t3 = 00000008 /* 039B8 808C4B48 AD4B02C0 */ sw $t3, 0x02C0($t2) ## 000002C0 /* 039BC 808C4B4C AC4C0000 */ sw $t4, 0x0000($v0) ## 00000000 -/* 039C0 808C4B50 8FAD0058 */ lw $t5, 0x0058($sp) +/* 039C0 808C4B50 8FAD0058 */ lw $t5, 0x0058($sp) /* 039C4 808C4B54 8DAE0000 */ lw $t6, 0x0000($t5) ## 00000000 -/* 039C8 808C4B58 0C034221 */ jal Matrix_Pull +/* 039C8 808C4B58 0C034221 */ jal Matrix_Pull /* 039CC 808C4B5C AC4E0004 */ sw $t6, 0x0004($v0) ## 00000004 -/* 039D0 808C4B60 8FAF0050 */ lw $t7, 0x0050($sp) +/* 039D0 808C4B60 8FAF0050 */ lw $t7, 0x0050($sp) /* 039D4 808C4B64 3C06808D */ lui $a2, %hi(D_808CA5C8) ## $a2 = 808D0000 /* 039D8 808C4B68 24C6A5C8 */ addiu $a2, $a2, %lo(D_808CA5C8) ## $a2 = 808CA5C8 /* 039DC 808C4B6C 27A40030 */ addiu $a0, $sp, 0x0030 ## $a0 = FFFFFFE0 /* 039E0 808C4B70 24070EF2 */ addiu $a3, $zero, 0x0EF2 ## $a3 = 00000EF2 -/* 039E4 808C4B74 0C031AD5 */ jal func_800C6B54 +/* 039E4 808C4B74 0C031AD5 */ jal Graph_CloseDisps /* 039E8 808C4B78 8DE50000 */ lw $a1, 0x0000($t7) ## 00000000 -/* 039EC 808C4B7C 8FBF0014 */ lw $ra, 0x0014($sp) +/* 039EC 808C4B7C 8FBF0014 */ lw $ra, 0x0014($sp) .L808C4B80: /* 039F0 808C4B80 27BD0050 */ addiu $sp, $sp, 0x0050 ## $sp = 00000000 /* 039F4 808C4B84 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -/* 039F8 808C4B88 03E00008 */ jr $ra +/* 039F8 808C4B88 03E00008 */ jr $ra /* 039FC 808C4B8C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/func_808C54C0.s b/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/func_808C54C0.s index 49de0b81c5..2fc9364996 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/func_808C54C0.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/func_808C54C0.s @@ -1,53 +1,53 @@ glabel func_808C54C0 /* 04330 808C54C0 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 /* 04334 808C54C4 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 04338 808C54C8 AFB00028 */ sw $s0, 0x0028($sp) -/* 0433C 808C54CC AFBF002C */ sw $ra, 0x002C($sp) +/* 04338 808C54C8 AFB00028 */ sw $s0, 0x0028($sp) +/* 0433C 808C54CC AFBF002C */ sw $ra, 0x002C($sp) /* 04340 808C54D0 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 04344 808C54D4 E4800068 */ swc1 $f0, 0x0068($a0) ## 00000068 /* 04348 808C54D8 E48001E4 */ swc1 $f0, 0x01E4($a0) ## 000001E4 /* 0434C 808C54DC 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 /* 04350 808C54E0 0C028800 */ jal SkelAnime_GetFrameCount - + /* 04354 808C54E4 24842D0C */ addiu $a0, $a0, 0x2D0C ## $a0 = 06002D0C /* 04358 808C54E8 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 0435C 808C54EC 3C01C0A0 */ lui $at, 0xC0A0 ## $at = C0A00000 /* 04360 808C54F0 44814000 */ mtc1 $at, $f8 ## $f8 = -5.00 -/* 04364 808C54F4 468021A0 */ cvt.s.w $f6, $f4 +/* 04364 808C54F4 468021A0 */ cvt.s.w $f6, $f4 /* 04368 808C54F8 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 0436C 808C54FC 240E0002 */ addiu $t6, $zero, 0x0002 ## $t6 = 00000002 -/* 04370 808C5500 AFAE0014 */ sw $t6, 0x0014($sp) +/* 04370 808C5500 AFAE0014 */ sw $t6, 0x0014($sp) /* 04374 808C5504 24A52D0C */ addiu $a1, $a1, 0x2D0C ## $a1 = 06002D0C /* 04378 808C5508 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C -/* 0437C 808C550C E7A60010 */ swc1 $f6, 0x0010($sp) +/* 0437C 808C550C E7A60010 */ swc1 $f6, 0x0010($sp) /* 04380 808C5510 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 04384 808C5514 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 04388 808C5518 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 0438C 808C551C E7A80018 */ swc1 $f8, 0x0018($sp) +/* 04388 808C5518 0C029468 */ jal SkelAnime_ChangeAnim + +/* 0438C 808C551C E7A80018 */ swc1 $f8, 0x0018($sp) /* 04390 808C5520 3C0F808C */ lui $t7, %hi(func_808C5578) ## $t7 = 808C0000 /* 04394 808C5524 25EF5578 */ addiu $t7, $t7, %lo(func_808C5578) ## $t7 = 808C5578 /* 04398 808C5528 AE0F0190 */ sw $t7, 0x0190($s0) ## 00000190 /* 0439C 808C552C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 043A0 808C5530 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 043A4 808C5534 24053807 */ addiu $a1, $zero, 0x3807 ## $a1 = 00003807 /* 043A8 808C5538 8E180004 */ lw $t8, 0x0004($s0) ## 00000004 /* 043AC 808C553C 2401FFFA */ addiu $at, $zero, 0xFFFA ## $at = FFFFFFFA /* 043B0 808C5540 24080001 */ addiu $t0, $zero, 0x0001 ## $t0 = 00000001 /* 043B4 808C5544 3C041001 */ lui $a0, 0x1001 ## $a0 = 10010000 -/* 043B8 808C5548 0301C824 */ and $t9, $t8, $at +/* 043B8 808C5548 0301C824 */ and $t9, $t8, $at /* 043BC 808C554C A60001DA */ sh $zero, 0x01DA($s0) ## 000001DA /* 043C0 808C5550 A600019C */ sh $zero, 0x019C($s0) ## 0000019C /* 043C4 808C5554 AE190004 */ sw $t9, 0x0004($s0) ## 00000004 /* 043C8 808C5558 A60801BC */ sh $t0, 0x01BC($s0) ## 000001BC /* 043CC 808C555C 0C03E803 */ jal Audio_SetBGM - + /* 043D0 808C5560 348400FF */ ori $a0, $a0, 0x00FF ## $a0 = 100100FF -/* 043D4 808C5564 8FBF002C */ lw $ra, 0x002C($sp) -/* 043D8 808C5568 8FB00028 */ lw $s0, 0x0028($sp) +/* 043D4 808C5564 8FBF002C */ lw $ra, 0x002C($sp) +/* 043D8 808C5568 8FB00028 */ lw $s0, 0x0028($sp) /* 043DC 808C556C 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 043E0 808C5570 03E00008 */ jr $ra +/* 043E0 808C5570 03E00008 */ jr $ra /* 043E4 808C5574 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/func_808C5578.s b/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/func_808C5578.s index 6051242b08..e889bf6a41 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/func_808C5578.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/func_808C5578.s @@ -1,55 +1,55 @@ glabel func_808C5578 /* 043E8 808C5578 27BDFE60 */ addiu $sp, $sp, 0xFE60 ## $sp = FFFFFE60 -/* 043EC 808C557C AFB00038 */ sw $s0, 0x0038($sp) -/* 043F0 808C5580 AFBF003C */ sw $ra, 0x003C($sp) -/* 043F4 808C5584 AFA501A4 */ sw $a1, 0x01A4($sp) +/* 043EC 808C557C AFB00038 */ sw $s0, 0x0038($sp) +/* 043F0 808C5580 AFBF003C */ sw $ra, 0x003C($sp) +/* 043F4 808C5584 AFA501A4 */ sw $a1, 0x01A4($sp) /* 043F8 808C5588 8CAF1C44 */ lw $t7, 0x1C44($a1) ## 00001C44 /* 043FC 808C558C 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 04400 808C5590 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 04404 808C5594 AFA4004C */ sw $a0, 0x004C($sp) +/* 04404 808C5594 AFA4004C */ sw $a0, 0x004C($sp) /* 04408 808C5598 0C02927F */ jal SkelAnime_FrameUpdateMatrix - -/* 0440C 808C559C AFAF0160 */ sw $t7, 0x0160($sp) + +/* 0440C 808C559C AFAF0160 */ sw $t7, 0x0160($sp) /* 04410 808C55A0 8603019C */ lh $v1, 0x019C($s0) ## 0000019C -/* 04414 808C55A4 2861000A */ slti $at, $v1, 0x000A -/* 04418 808C55A8 14200006 */ bne $at, $zero, .L808C55C4 -/* 0441C 808C55AC 0003C080 */ sll $t8, $v1, 2 +/* 04414 808C55A4 2861000A */ slti $at, $v1, 0x000A +/* 04418 808C55A8 14200006 */ bne $at, $zero, .L808C55C4 +/* 0441C 808C55AC 0003C080 */ sll $t8, $v1, 2 /* 04420 808C55B0 24010064 */ addiu $at, $zero, 0x0064 ## $at = 00000064 -/* 04424 808C55B4 5061057B */ beql $v1, $at, .L808C6BA4 +/* 04424 808C55B4 5061057B */ beql $v1, $at, .L808C6BA4 /* 04428 808C55B8 860801DA */ lh $t0, 0x01DA($s0) ## 000001DA -/* 0442C 808C55BC 100005B2 */ beq $zero, $zero, .L808C6C88 +/* 0442C 808C55BC 100005B2 */ beq $zero, $zero, .L808C6C88 /* 04430 808C55C0 860501B4 */ lh $a1, 0x01B4($s0) ## 000001B4 .L808C55C4: -/* 04434 808C55C4 2C61000A */ sltiu $at, $v1, 0x000A -/* 04438 808C55C8 102005AE */ beq $at, $zero, .L808C6C84 +/* 04434 808C55C4 2C61000A */ sltiu $at, $v1, 0x000A +/* 04438 808C55C8 102005AE */ beq $at, $zero, .L808C6C84 /* 0443C 808C55CC 3C01808D */ lui $at, %hi(jtbl_808CA744) ## $at = 808D0000 -/* 04440 808C55D0 00380821 */ addu $at, $at, $t8 -/* 04444 808C55D4 8C38A744 */ lw $t8, %lo(jtbl_808CA744)($at) -/* 04448 808C55D8 03000008 */ jr $t8 +/* 04440 808C55D0 00380821 */ addu $at, $at, $t8 +/* 04444 808C55D4 8C38A744 */ lw $t8, %lo(jtbl_808CA744)($at) +/* 04448 808C55D8 03000008 */ jr $t8 /* 0444C 808C55DC 00000000 */ nop glabel L808C55E0 -/* 04450 808C55E0 8FA401A4 */ lw $a0, 0x01A4($sp) +/* 04450 808C55E0 8FA401A4 */ lw $a0, 0x01A4($sp) /* 04454 808C55E4 24190005 */ addiu $t9, $zero, 0x0005 ## $t9 = 00000005 /* 04458 808C55E8 A619019C */ sh $t9, 0x019C($s0) ## 0000019C -/* 0445C 808C55EC 0C019148 */ jal func_80064520 +/* 0445C 808C55EC 0C019148 */ jal func_80064520 /* 04460 808C55F0 24851D64 */ addiu $a1, $a0, 0x1D64 ## $a1 = 00001D64 -/* 04464 808C55F4 8FA401A4 */ lw $a0, 0x01A4($sp) +/* 04464 808C55F4 8FA401A4 */ lw $a0, 0x01A4($sp) /* 04468 808C55F8 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 0446C 808C55FC 0C00B7D5 */ jal func_8002DF54 +/* 0446C 808C55FC 0C00B7D5 */ jal func_8002DF54 /* 04470 808C5600 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 -/* 04474 808C5604 0C03008C */ jal func_800C0230 -/* 04478 808C5608 8FA401A4 */ lw $a0, 0x01A4($sp) +/* 04474 808C5604 0C03008C */ jal func_800C0230 +/* 04478 808C5608 8FA401A4 */ lw $a0, 0x01A4($sp) /* 0447C 808C560C A60201B4 */ sh $v0, 0x01B4($s0) ## 000001B4 -/* 04480 808C5610 8FA401A4 */ lw $a0, 0x01A4($sp) +/* 04480 808C5610 8FA401A4 */ lw $a0, 0x01A4($sp) /* 04484 808C5614 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 04488 808C5618 0C0300C5 */ jal func_800C0314 +/* 04488 808C5618 0C0300C5 */ jal func_800C0314 /* 0448C 808C561C 24060003 */ addiu $a2, $zero, 0x0003 ## $a2 = 00000003 -/* 04490 808C5620 8FA401A4 */ lw $a0, 0x01A4($sp) +/* 04490 808C5620 8FA401A4 */ lw $a0, 0x01A4($sp) /* 04494 808C5624 860501B4 */ lh $a1, 0x01B4($s0) ## 000001B4 -/* 04498 808C5628 0C0300C5 */ jal func_800C0314 +/* 04498 808C5628 0C0300C5 */ jal func_800C0314 /* 0449C 808C562C 24060007 */ addiu $a2, $zero, 0x0007 ## $a2 = 00000007 -/* 044A0 808C5630 8FA401A4 */ lw $a0, 0x01A4($sp) -/* 044A4 808C5634 0C030129 */ jal func_800C04A4 +/* 044A0 808C5630 8FA401A4 */ lw $a0, 0x01A4($sp) +/* 044A4 808C5634 0C030129 */ jal func_800C04A4 /* 044A8 808C5638 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 044AC 808C563C C444005C */ lwc1 $f4, 0x005C($v0) ## 0000005C /* 044B0 808C5640 E6040428 */ swc1 $f4, 0x0428($s0) ## 00000428 @@ -62,53 +62,53 @@ glabel L808C55E0 /* 044CC 808C565C C4520054 */ lwc1 $f18, 0x0054($v0) ## 00000054 /* 044D0 808C5660 E6120438 */ swc1 $f18, 0x0438($s0) ## 00000438 /* 044D4 808C5664 C4440058 */ lwc1 $f4, 0x0058($v0) ## 00000058 -/* 044D8 808C5668 10000586 */ beq $zero, $zero, .L808C6C84 +/* 044D8 808C5668 10000586 */ beq $zero, $zero, .L808C6C84 /* 044DC 808C566C E604043C */ swc1 $f4, 0x043C($s0) ## 0000043C glabel L808C5670 /* 044E0 808C5670 860400B6 */ lh $a0, 0x00B6($s0) ## 000000B6 /* 044E4 808C5674 2484EC78 */ addiu $a0, $a0, 0xEC78 ## $a0 = FFFFEC78 -/* 044E8 808C5678 00042400 */ sll $a0, $a0, 16 +/* 044E8 808C5678 00042400 */ sll $a0, $a0, 16 /* 044EC 808C567C 0C01DE1C */ jal Math_Sins ## sins? -/* 044F0 808C5680 00042403 */ sra $a0, $a0, 16 +/* 044F0 808C5680 00042403 */ sra $a0, $a0, 16 /* 044F4 808C5684 3C014316 */ lui $at, 0x4316 ## $at = 43160000 /* 044F8 808C5688 44813000 */ mtc1 $at, $f6 ## $f6 = 150.00 /* 044FC 808C568C 860400B6 */ lh $a0, 0x00B6($s0) ## 000000B6 -/* 04500 808C5690 46060302 */ mul.s $f12, $f0, $f6 +/* 04500 808C5690 46060302 */ mul.s $f12, $f0, $f6 /* 04504 808C5694 2484EC78 */ addiu $a0, $a0, 0xEC78 ## $a0 = FFFFEC78 -/* 04508 808C5698 00042400 */ sll $a0, $a0, 16 -/* 0450C 808C569C 00042403 */ sra $a0, $a0, 16 +/* 04508 808C5698 00042400 */ sll $a0, $a0, 16 +/* 0450C 808C569C 00042403 */ sra $a0, $a0, 16 /* 04510 808C56A0 0C01DE0D */ jal Math_Coss ## coss? -/* 04514 808C56A4 E7AC0180 */ swc1 $f12, 0x0180($sp) +/* 04514 808C56A4 E7AC0180 */ swc1 $f12, 0x0180($sp) /* 04518 808C56A8 3C014316 */ lui $at, 0x4316 ## $at = 43160000 /* 0451C 808C56AC 44814000 */ mtc1 $at, $f8 ## $f8 = 150.00 -/* 04520 808C56B0 C7AC0180 */ lwc1 $f12, 0x0180($sp) +/* 04520 808C56B0 C7AC0180 */ lwc1 $f12, 0x0180($sp) /* 04524 808C56B4 C60A0024 */ lwc1 $f10, 0x0024($s0) ## 00000024 -/* 04528 808C56B8 46080382 */ mul.s $f14, $f0, $f8 -/* 0452C 808C56BC 8FA40160 */ lw $a0, 0x0160($sp) -/* 04530 808C56C0 460C5480 */ add.s $f18, $f10, $f12 +/* 04528 808C56B8 46080382 */ mul.s $f14, $f0, $f8 +/* 0452C 808C56BC 8FA40160 */ lw $a0, 0x0160($sp) +/* 04530 808C56C0 460C5480 */ add.s $f18, $f10, $f12 /* 04534 808C56C4 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 /* 04538 808C56C8 3C063F00 */ lui $a2, 0x3F00 ## $a2 = 3F000000 /* 0453C 808C56CC 3C0740A0 */ lui $a3, 0x40A0 ## $a3 = 40A00000 -/* 04540 808C56D0 44059000 */ mfc1 $a1, $f18 -/* 04544 808C56D4 E7AE017C */ swc1 $f14, 0x017C($sp) +/* 04540 808C56D0 44059000 */ mfc1 $a1, $f18 +/* 04544 808C56D4 E7AE017C */ swc1 $f14, 0x017C($sp) /* 04548 808C56D8 24840024 */ addiu $a0, $a0, 0x0024 ## $a0 = 00000024 /* 0454C 808C56DC 0C01E0C4 */ jal Math_SmoothScaleMaxMinF - -/* 04550 808C56E0 E7A40010 */ swc1 $f4, 0x0010($sp) -/* 04554 808C56E4 C7AE017C */ lwc1 $f14, 0x017C($sp) + +/* 04550 808C56E0 E7A40010 */ swc1 $f4, 0x0010($sp) +/* 04554 808C56E4 C7AE017C */ lwc1 $f14, 0x017C($sp) /* 04558 808C56E8 C606002C */ lwc1 $f6, 0x002C($s0) ## 0000002C -/* 0455C 808C56EC 8FA40160 */ lw $a0, 0x0160($sp) +/* 0455C 808C56EC 8FA40160 */ lw $a0, 0x0160($sp) /* 04560 808C56F0 44805000 */ mtc1 $zero, $f10 ## $f10 = 0.00 -/* 04564 808C56F4 460E3200 */ add.s $f8, $f6, $f14 +/* 04564 808C56F4 460E3200 */ add.s $f8, $f6, $f14 /* 04568 808C56F8 3C063F00 */ lui $a2, 0x3F00 ## $a2 = 3F000000 /* 0456C 808C56FC 3C0740A0 */ lui $a3, 0x40A0 ## $a3 = 40A00000 /* 04570 808C5700 2484002C */ addiu $a0, $a0, 0x002C ## $a0 = 0000002C -/* 04574 808C5704 44054000 */ mfc1 $a1, $f8 +/* 04574 808C5704 44054000 */ mfc1 $a1, $f8 /* 04578 808C5708 0C01E0C4 */ jal Math_SmoothScaleMaxMinF - -/* 0457C 808C570C E7AA0010 */ swc1 $f10, 0x0010($sp) + +/* 0457C 808C570C E7AA0010 */ swc1 $f10, 0x0010($sp) /* 04580 808C5710 44809000 */ mtc1 $zero, $f18 ## $f18 = 0.00 /* 04584 808C5714 3C053D8F */ lui $a1, 0x3D8F ## $a1 = 3D8F0000 /* 04588 808C5718 3C073BA3 */ lui $a3, 0x3BA3 ## $a3 = 3BA30000 @@ -117,223 +117,223 @@ glabel L808C5670 /* 04594 808C5724 26040208 */ addiu $a0, $s0, 0x0208 ## $a0 = 00000208 /* 04598 808C5728 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 0459C 808C572C 0C01E0C4 */ jal Math_SmoothScaleMaxMinF - -/* 045A0 808C5730 E7B20010 */ swc1 $f18, 0x0010($sp) + +/* 045A0 808C5730 E7B20010 */ swc1 $f18, 0x0010($sp) /* 045A4 808C5734 0C01DE1C */ jal Math_Sins ## sins? /* 045A8 808C5738 86040032 */ lh $a0, 0x0032($s0) ## 00000032 /* 045AC 808C573C 3C014366 */ lui $at, 0x4366 ## $at = 43660000 /* 045B0 808C5740 44812000 */ mtc1 $at, $f4 ## $f4 = 230.00 /* 045B4 808C5744 86040032 */ lh $a0, 0x0032($s0) ## 00000032 -/* 045B8 808C5748 46040302 */ mul.s $f12, $f0, $f4 +/* 045B8 808C5748 46040302 */ mul.s $f12, $f0, $f4 /* 045BC 808C574C 0C01DE0D */ jal Math_Coss ## coss? -/* 045C0 808C5750 E7AC0180 */ swc1 $f12, 0x0180($sp) +/* 045C0 808C5750 E7AC0180 */ swc1 $f12, 0x0180($sp) /* 045C4 808C5754 3C014366 */ lui $at, 0x4366 ## $at = 43660000 /* 045C8 808C5758 44813000 */ mtc1 $at, $f6 ## $f6 = 230.00 -/* 045CC 808C575C C7AC0180 */ lwc1 $f12, 0x0180($sp) +/* 045CC 808C575C C7AC0180 */ lwc1 $f12, 0x0180($sp) /* 045D0 808C5760 C6080024 */ lwc1 $f8, 0x0024($s0) ## 00000024 -/* 045D4 808C5764 46060382 */ mul.s $f14, $f0, $f6 +/* 045D4 808C5764 46060382 */ mul.s $f14, $f0, $f6 /* 045D8 808C5768 3C01808D */ lui $at, %hi(D_808CA76C) ## $at = 808D0000 -/* 045DC 808C576C 460C4280 */ add.s $f10, $f8, $f12 -/* 045E0 808C5770 C432A76C */ lwc1 $f18, %lo(D_808CA76C)($at) +/* 045DC 808C576C 460C4280 */ add.s $f10, $f8, $f12 +/* 045E0 808C5770 C432A76C */ lwc1 $f18, %lo(D_808CA76C)($at) /* 045E4 808C5774 3C063E4C */ lui $a2, 0x3E4C ## $a2 = 3E4C0000 /* 045E8 808C5778 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3E4CCCCD -/* 045EC 808C577C 44055000 */ mfc1 $a1, $f10 -/* 045F0 808C5780 E7AE017C */ swc1 $f14, 0x017C($sp) +/* 045EC 808C577C 44055000 */ mfc1 $a1, $f10 +/* 045F0 808C5780 E7AE017C */ swc1 $f14, 0x017C($sp) /* 045F4 808C5784 26040428 */ addiu $a0, $s0, 0x0428 ## $a0 = 00000428 /* 045F8 808C5788 3C074248 */ lui $a3, 0x4248 ## $a3 = 42480000 /* 045FC 808C578C 0C01E0C4 */ jal Math_SmoothScaleMaxMinF - -/* 04600 808C5790 E7B20010 */ swc1 $f18, 0x0010($sp) + +/* 04600 808C5790 E7B20010 */ swc1 $f18, 0x0010($sp) /* 04604 808C5794 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 /* 04608 808C5798 44813000 */ mtc1 $at, $f6 ## $f6 = 20.00 /* 0460C 808C579C C6040028 */ lwc1 $f4, 0x0028($s0) ## 00000028 /* 04610 808C57A0 3C01808D */ lui $at, %hi(D_808CA770) ## $at = 808D0000 -/* 04614 808C57A4 C42AA770 */ lwc1 $f10, %lo(D_808CA770)($at) -/* 04618 808C57A8 46062200 */ add.s $f8, $f4, $f6 +/* 04614 808C57A4 C42AA770 */ lwc1 $f10, %lo(D_808CA770)($at) +/* 04618 808C57A8 46062200 */ add.s $f8, $f4, $f6 /* 0461C 808C57AC 3C063E4C */ lui $a2, 0x3E4C ## $a2 = 3E4C0000 /* 04620 808C57B0 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3E4CCCCD /* 04624 808C57B4 2604042C */ addiu $a0, $s0, 0x042C ## $a0 = 0000042C -/* 04628 808C57B8 44054000 */ mfc1 $a1, $f8 +/* 04628 808C57B8 44054000 */ mfc1 $a1, $f8 /* 0462C 808C57BC 3C074248 */ lui $a3, 0x4248 ## $a3 = 42480000 /* 04630 808C57C0 0C01E0C4 */ jal Math_SmoothScaleMaxMinF - -/* 04634 808C57C4 E7AA0010 */ swc1 $f10, 0x0010($sp) -/* 04638 808C57C8 C7AE017C */ lwc1 $f14, 0x017C($sp) + +/* 04634 808C57C4 E7AA0010 */ swc1 $f10, 0x0010($sp) +/* 04638 808C57C8 C7AE017C */ lwc1 $f14, 0x017C($sp) /* 0463C 808C57CC C612002C */ lwc1 $f18, 0x002C($s0) ## 0000002C /* 04640 808C57D0 3C01808D */ lui $at, %hi(D_808CA774) ## $at = 808D0000 -/* 04644 808C57D4 C426A774 */ lwc1 $f6, %lo(D_808CA774)($at) -/* 04648 808C57D8 460E9100 */ add.s $f4, $f18, $f14 +/* 04644 808C57D4 C426A774 */ lwc1 $f6, %lo(D_808CA774)($at) +/* 04648 808C57D8 460E9100 */ add.s $f4, $f18, $f14 /* 0464C 808C57DC 3C063E4C */ lui $a2, 0x3E4C ## $a2 = 3E4C0000 /* 04650 808C57E0 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3E4CCCCD /* 04654 808C57E4 26040430 */ addiu $a0, $s0, 0x0430 ## $a0 = 00000430 -/* 04658 808C57E8 44052000 */ mfc1 $a1, $f4 +/* 04658 808C57E8 44052000 */ mfc1 $a1, $f4 /* 0465C 808C57EC 3C074248 */ lui $a3, 0x4248 ## $a3 = 42480000 /* 04660 808C57F0 0C01E0C4 */ jal Math_SmoothScaleMaxMinF - -/* 04664 808C57F4 E7A60010 */ swc1 $f6, 0x0010($sp) + +/* 04664 808C57F4 E7A60010 */ swc1 $f6, 0x0010($sp) /* 04668 808C57F8 3C01808D */ lui $at, %hi(D_808CA778) ## $at = 808D0000 -/* 0466C 808C57FC C428A778 */ lwc1 $f8, %lo(D_808CA778)($at) +/* 0466C 808C57FC C428A778 */ lwc1 $f8, %lo(D_808CA778)($at) /* 04670 808C5800 8E050024 */ lw $a1, 0x0024($s0) ## 00000024 /* 04674 808C5804 3C063E4C */ lui $a2, 0x3E4C ## $a2 = 3E4C0000 /* 04678 808C5808 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3E4CCCCD /* 0467C 808C580C 26040434 */ addiu $a0, $s0, 0x0434 ## $a0 = 00000434 /* 04680 808C5810 3C0741F0 */ lui $a3, 0x41F0 ## $a3 = 41F00000 /* 04684 808C5814 0C01E0C4 */ jal Math_SmoothScaleMaxMinF - -/* 04688 808C5818 E7A80010 */ swc1 $f8, 0x0010($sp) + +/* 04688 808C5818 E7A80010 */ swc1 $f8, 0x0010($sp) /* 0468C 808C581C 3C01428C */ lui $at, 0x428C ## $at = 428C0000 /* 04690 808C5820 44819000 */ mtc1 $at, $f18 ## $f18 = 70.00 /* 04694 808C5824 C60A003C */ lwc1 $f10, 0x003C($s0) ## 0000003C /* 04698 808C5828 3C01808D */ lui $at, %hi(D_808CA77C) ## $at = 808D0000 -/* 0469C 808C582C C426A77C */ lwc1 $f6, %lo(D_808CA77C)($at) -/* 046A0 808C5830 46125101 */ sub.s $f4, $f10, $f18 +/* 0469C 808C582C C426A77C */ lwc1 $f6, %lo(D_808CA77C)($at) +/* 046A0 808C5830 46125101 */ sub.s $f4, $f10, $f18 /* 046A4 808C5834 3C063E4C */ lui $a2, 0x3E4C ## $a2 = 3E4C0000 /* 046A8 808C5838 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3E4CCCCD /* 046AC 808C583C 26040438 */ addiu $a0, $s0, 0x0438 ## $a0 = 00000438 -/* 046B0 808C5840 44052000 */ mfc1 $a1, $f4 +/* 046B0 808C5840 44052000 */ mfc1 $a1, $f4 /* 046B4 808C5844 3C0741F0 */ lui $a3, 0x41F0 ## $a3 = 41F00000 /* 046B8 808C5848 0C01E0C4 */ jal Math_SmoothScaleMaxMinF - -/* 046BC 808C584C E7A60010 */ swc1 $f6, 0x0010($sp) + +/* 046BC 808C584C E7A60010 */ swc1 $f6, 0x0010($sp) /* 046C0 808C5850 3C01808D */ lui $at, %hi(D_808CA780) ## $at = 808D0000 -/* 046C4 808C5854 C428A780 */ lwc1 $f8, %lo(D_808CA780)($at) +/* 046C4 808C5854 C428A780 */ lwc1 $f8, %lo(D_808CA780)($at) /* 046C8 808C5858 8E05002C */ lw $a1, 0x002C($s0) ## 0000002C /* 046CC 808C585C 3C063E4C */ lui $a2, 0x3E4C ## $a2 = 3E4C0000 /* 046D0 808C5860 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3E4CCCCD /* 046D4 808C5864 2604043C */ addiu $a0, $s0, 0x043C ## $a0 = 0000043C /* 046D8 808C5868 3C0741F0 */ lui $a3, 0x41F0 ## $a3 = 41F00000 /* 046DC 808C586C 0C01E0C4 */ jal Math_SmoothScaleMaxMinF - -/* 046E0 808C5870 E7A80010 */ swc1 $f8, 0x0010($sp) + +/* 046E0 808C5870 E7A80010 */ swc1 $f8, 0x0010($sp) /* 046E4 808C5874 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 /* 046E8 808C5878 0C028800 */ jal SkelAnime_GetFrameCount - + /* 046EC 808C587C 24842D0C */ addiu $a0, $a0, 0x2D0C ## $a0 = 06002D0C /* 046F0 808C5880 44825000 */ mtc1 $v0, $f10 ## $f10 = 0.00 -/* 046F4 808C5884 8FA4004C */ lw $a0, 0x004C($sp) -/* 046F8 808C5888 468052A0 */ cvt.s.w $f10, $f10 -/* 046FC 808C588C 44055000 */ mfc1 $a1, $f10 -/* 04700 808C5890 0C0295B2 */ jal func_800A56C8 +/* 046F4 808C5884 8FA4004C */ lw $a0, 0x004C($sp) +/* 046F8 808C5888 468052A0 */ cvt.s.w $f10, $f10 +/* 046FC 808C588C 44055000 */ mfc1 $a1, $f10 +/* 04700 808C5890 0C0295B2 */ jal func_800A56C8 /* 04704 808C5894 00000000 */ nop -/* 04708 808C5898 104004FA */ beq $v0, $zero, .L808C6C84 +/* 04708 808C5898 104004FA */ beq $v0, $zero, .L808C6C84 /* 0470C 808C589C 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 /* 04710 808C58A0 0C028800 */ jal SkelAnime_GetFrameCount - + /* 04714 808C58A4 24843CF8 */ addiu $a0, $a0, 0x3CF8 ## $a0 = 06003CF8 /* 04718 808C58A8 44829000 */ mtc1 $v0, $f18 ## $f18 = 0.00 /* 0471C 808C58AC 3C01BF80 */ lui $at, 0xBF80 ## $at = BF800000 /* 04720 808C58B0 44813000 */ mtc1 $at, $f6 ## $f6 = -1.00 -/* 04724 808C58B4 46809120 */ cvt.s.w $f4, $f18 +/* 04724 808C58B4 46809120 */ cvt.s.w $f4, $f18 /* 04728 808C58B8 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 0472C 808C58BC 24080002 */ addiu $t0, $zero, 0x0002 ## $t0 = 00000002 -/* 04730 808C58C0 AFA80014 */ sw $t0, 0x0014($sp) +/* 04730 808C58C0 AFA80014 */ sw $t0, 0x0014($sp) /* 04734 808C58C4 24A53CF8 */ addiu $a1, $a1, 0x3CF8 ## $a1 = 06003CF8 -/* 04738 808C58C8 8FA4004C */ lw $a0, 0x004C($sp) -/* 0473C 808C58CC E7A40010 */ swc1 $f4, 0x0010($sp) +/* 04738 808C58C8 8FA4004C */ lw $a0, 0x004C($sp) +/* 0473C 808C58CC E7A40010 */ swc1 $f4, 0x0010($sp) /* 04740 808C58D0 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 04744 808C58D4 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 04748 808C58D8 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 0474C 808C58DC E7A60018 */ swc1 $f6, 0x0018($sp) +/* 04748 808C58D8 0C029468 */ jal SkelAnime_ChangeAnim + +/* 0474C 808C58DC E7A60018 */ swc1 $f6, 0x0018($sp) /* 04750 808C58E0 24090006 */ addiu $t1, $zero, 0x0006 ## $t1 = 00000006 /* 04754 808C58E4 A609019C */ sh $t1, 0x019C($s0) ## 0000019C /* 04758 808C58E8 3C01808D */ lui $at, %hi(D_808CA784) ## $at = 808D0000 -/* 0475C 808C58EC C428A784 */ lwc1 $f8, %lo(D_808CA784)($at) +/* 0475C 808C58EC C428A784 */ lwc1 $f8, %lo(D_808CA784)($at) /* 04760 808C58F0 3C01808D */ lui $at, %hi(D_808CA788) ## $at = 808D0000 -/* 04764 808C58F4 C42AA788 */ lwc1 $f10, %lo(D_808CA788)($at) -/* 04768 808C58F8 8FA501A4 */ lw $a1, 0x01A4($sp) +/* 04764 808C58F4 C42AA788 */ lwc1 $f10, %lo(D_808CA788)($at) +/* 04768 808C58F8 8FA501A4 */ lw $a1, 0x01A4($sp) /* 0476C 808C58FC 3C07C45E */ lui $a3, 0xC45E ## $a3 = C45E0000 /* 04770 808C5900 240B6000 */ addiu $t3, $zero, 0x6000 ## $t3 = 00006000 -/* 04774 808C5904 AFAB0024 */ sw $t3, 0x0024($sp) +/* 04774 808C5904 AFAB0024 */ sw $t3, 0x0024($sp) /* 04778 808C5908 34E78000 */ ori $a3, $a3, 0x8000 ## $a3 = C45E8000 -/* 0477C 808C590C AFA00020 */ sw $zero, 0x0020($sp) -/* 04780 808C5910 AFA0001C */ sw $zero, 0x001C($sp) -/* 04784 808C5914 AFA00018 */ sw $zero, 0x0018($sp) +/* 0477C 808C590C AFA00020 */ sw $zero, 0x0020($sp) +/* 04780 808C5910 AFA0001C */ sw $zero, 0x001C($sp) +/* 04784 808C5914 AFA00018 */ sw $zero, 0x0018($sp) /* 04788 808C5918 24060059 */ addiu $a2, $zero, 0x0059 ## $a2 = 00000059 -/* 0478C 808C591C E7A80010 */ swc1 $f8, 0x0010($sp) -/* 04790 808C5920 E7AA0014 */ swc1 $f10, 0x0014($sp) +/* 0478C 808C591C E7A80010 */ swc1 $f8, 0x0010($sp) +/* 04790 808C5920 E7AA0014 */ swc1 $f10, 0x0014($sp) /* 04794 808C5924 0C00C7D4 */ jal Actor_Spawn ## ActorSpawn /* 04798 808C5928 24A41C24 */ addiu $a0, $a1, 0x1C24 ## $a0 = 00001C24 -/* 0479C 808C592C 100004D6 */ beq $zero, $zero, .L808C6C88 +/* 0479C 808C592C 100004D6 */ beq $zero, $zero, .L808C6C88 /* 047A0 808C5930 860501B4 */ lh $a1, 0x01B4($s0) ## 000001B4 glabel L808C5934 /* 047A4 808C5934 3C01808D */ lui $at, %hi(D_808CA78C) ## $at = 808D0000 -/* 047A8 808C5938 C432A78C */ lwc1 $f18, %lo(D_808CA78C)($at) +/* 047A8 808C5938 C432A78C */ lwc1 $f18, %lo(D_808CA78C)($at) /* 047AC 808C593C 8E050024 */ lw $a1, 0x0024($s0) ## 00000024 /* 047B0 808C5940 3C063E4C */ lui $a2, 0x3E4C ## $a2 = 3E4C0000 /* 047B4 808C5944 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3E4CCCCD /* 047B8 808C5948 26040434 */ addiu $a0, $s0, 0x0434 ## $a0 = 00000434 /* 047BC 808C594C 3C0741F0 */ lui $a3, 0x41F0 ## $a3 = 41F00000 /* 047C0 808C5950 0C01E0C4 */ jal Math_SmoothScaleMaxMinF - -/* 047C4 808C5954 E7B20010 */ swc1 $f18, 0x0010($sp) + +/* 047C4 808C5954 E7B20010 */ swc1 $f18, 0x0010($sp) /* 047C8 808C5958 3C01428C */ lui $at, 0x428C ## $at = 428C0000 /* 047CC 808C595C 44813000 */ mtc1 $at, $f6 ## $f6 = 70.00 /* 047D0 808C5960 C6040028 */ lwc1 $f4, 0x0028($s0) ## 00000028 /* 047D4 808C5964 3C014302 */ lui $at, 0x4302 ## $at = 43020000 /* 047D8 808C5968 44815000 */ mtc1 $at, $f10 ## $f10 = 130.00 -/* 047DC 808C596C 46062201 */ sub.s $f8, $f4, $f6 +/* 047DC 808C596C 46062201 */ sub.s $f8, $f4, $f6 /* 047E0 808C5970 3C01808D */ lui $at, %hi(D_808CA790) ## $at = 808D0000 -/* 047E4 808C5974 C424A790 */ lwc1 $f4, %lo(D_808CA790)($at) +/* 047E4 808C5974 C424A790 */ lwc1 $f4, %lo(D_808CA790)($at) /* 047E8 808C5978 3C063E4C */ lui $a2, 0x3E4C ## $a2 = 3E4C0000 -/* 047EC 808C597C 460A4480 */ add.s $f18, $f8, $f10 +/* 047EC 808C597C 460A4480 */ add.s $f18, $f8, $f10 /* 047F0 808C5980 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3E4CCCCD /* 047F4 808C5984 26040438 */ addiu $a0, $s0, 0x0438 ## $a0 = 00000438 /* 047F8 808C5988 3C0741A0 */ lui $a3, 0x41A0 ## $a3 = 41A00000 -/* 047FC 808C598C 44059000 */ mfc1 $a1, $f18 +/* 047FC 808C598C 44059000 */ mfc1 $a1, $f18 /* 04800 808C5990 0C01E0C4 */ jal Math_SmoothScaleMaxMinF - -/* 04804 808C5994 E7A40010 */ swc1 $f4, 0x0010($sp) + +/* 04804 808C5994 E7A40010 */ swc1 $f4, 0x0010($sp) /* 04808 808C5998 3C01808D */ lui $at, %hi(D_808CA794) ## $at = 808D0000 -/* 0480C 808C599C C426A794 */ lwc1 $f6, %lo(D_808CA794)($at) +/* 0480C 808C599C C426A794 */ lwc1 $f6, %lo(D_808CA794)($at) /* 04810 808C59A0 8E05002C */ lw $a1, 0x002C($s0) ## 0000002C /* 04814 808C59A4 3C063E4C */ lui $a2, 0x3E4C ## $a2 = 3E4C0000 /* 04818 808C59A8 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3E4CCCCD /* 0481C 808C59AC 2604043C */ addiu $a0, $s0, 0x043C ## $a0 = 0000043C /* 04820 808C59B0 3C0741F0 */ lui $a3, 0x41F0 ## $a3 = 41F00000 /* 04824 808C59B4 0C01E0C4 */ jal Math_SmoothScaleMaxMinF - -/* 04828 808C59B8 E7A60010 */ swc1 $f6, 0x0010($sp) + +/* 04828 808C59B8 E7A60010 */ swc1 $f6, 0x0010($sp) /* 0482C 808C59BC 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 /* 04830 808C59C0 0C028800 */ jal SkelAnime_GetFrameCount - + /* 04834 808C59C4 24843CF8 */ addiu $a0, $a0, 0x3CF8 ## $a0 = 06003CF8 /* 04838 808C59C8 44824000 */ mtc1 $v0, $f8 ## $f8 = 0.00 -/* 0483C 808C59CC 8FA4004C */ lw $a0, 0x004C($sp) -/* 04840 808C59D0 46804220 */ cvt.s.w $f8, $f8 -/* 04844 808C59D4 44054000 */ mfc1 $a1, $f8 -/* 04848 808C59D8 0C0295B2 */ jal func_800A56C8 +/* 0483C 808C59CC 8FA4004C */ lw $a0, 0x004C($sp) +/* 04840 808C59D0 46804220 */ cvt.s.w $f8, $f8 +/* 04844 808C59D4 44054000 */ mfc1 $a1, $f8 +/* 04848 808C59D8 0C0295B2 */ jal func_800A56C8 /* 0484C 808C59DC 00000000 */ nop -/* 04850 808C59E0 104004A8 */ beq $v0, $zero, .L808C6C84 -/* 04854 808C59E4 8FA4004C */ lw $a0, 0x004C($sp) +/* 04850 808C59E0 104004A8 */ beq $v0, $zero, .L808C6C84 +/* 04854 808C59E4 8FA4004C */ lw $a0, 0x004C($sp) /* 04858 808C59E8 3C01426C */ lui $at, 0x426C ## $at = 426C0000 /* 0485C 808C59EC 44815000 */ mtc1 $at, $f10 ## $f10 = 59.00 /* 04860 808C59F0 3C01BF80 */ lui $at, 0xBF80 ## $at = BF800000 /* 04864 808C59F4 44819000 */ mtc1 $at, $f18 ## $f18 = -1.00 /* 04868 808C59F8 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 /* 0486C 808C59FC 240C0002 */ addiu $t4, $zero, 0x0002 ## $t4 = 00000002 -/* 04870 808C5A00 AFAC0014 */ sw $t4, 0x0014($sp) +/* 04870 808C5A00 AFAC0014 */ sw $t4, 0x0014($sp) /* 04874 808C5A04 24A5DF38 */ addiu $a1, $a1, 0xDF38 ## $a1 = 0600DF38 /* 04878 808C5A08 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 0487C 808C5A0C 3C0741F0 */ lui $a3, 0x41F0 ## $a3 = 41F00000 -/* 04880 808C5A10 E7AA0010 */ swc1 $f10, 0x0010($sp) -/* 04884 808C5A14 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 04888 808C5A18 E7B20018 */ swc1 $f18, 0x0018($sp) +/* 04880 808C5A10 E7AA0010 */ swc1 $f10, 0x0010($sp) +/* 04884 808C5A14 0C029468 */ jal SkelAnime_ChangeAnim + +/* 04888 808C5A18 E7B20018 */ swc1 $f18, 0x0018($sp) /* 0488C 808C5A1C 240D0007 */ addiu $t5, $zero, 0x0007 ## $t5 = 00000007 /* 04890 808C5A20 A60D019C */ sh $t5, 0x019C($s0) ## 0000019C /* 04894 808C5A24 3C01808D */ lui $at, %hi(D_808CA798) ## $at = 808D0000 -/* 04898 808C5A28 C424A798 */ lwc1 $f4, %lo(D_808CA798)($at) +/* 04898 808C5A28 C424A798 */ lwc1 $f4, %lo(D_808CA798)($at) /* 0489C 808C5A2C 44803000 */ mtc1 $zero, $f6 ## $f6 = 0.00 /* 048A0 808C5A30 44804000 */ mtc1 $zero, $f8 ## $f8 = 0.00 /* 048A4 808C5A34 A60001A8 */ sh $zero, 0x01A8($s0) ## 000001A8 /* 048A8 808C5A38 A600019E */ sh $zero, 0x019E($s0) ## 0000019E /* 048AC 808C5A3C E6040228 */ swc1 $f4, 0x0228($s0) ## 00000228 /* 048B0 808C5A40 E6060204 */ swc1 $f6, 0x0204($s0) ## 00000204 -/* 048B4 808C5A44 1000048F */ beq $zero, $zero, .L808C6C84 +/* 048B4 808C5A44 1000048F */ beq $zero, $zero, .L808C6C84 /* 048B8 808C5A48 E60801E4 */ swc1 $f8, 0x01E4($s0) ## 000001E4 glabel L808C5A4C /* 048BC 808C5A4C 860E01C4 */ lh $t6, 0x01C4($s0) ## 000001C4 @@ -346,24 +346,24 @@ glabel L808C5A4C /* 048D8 808C5A68 26040434 */ addiu $a0, $s0, 0x0434 ## $a0 = 00000434 /* 048DC 808C5A6C 3C0741F0 */ lui $a3, 0x41F0 ## $a3 = 41F00000 /* 048E0 808C5A70 0C01E0C4 */ jal Math_SmoothScaleMaxMinF - -/* 048E4 808C5A74 E7AA0010 */ swc1 $f10, 0x0010($sp) + +/* 048E4 808C5A74 E7AA0010 */ swc1 $f10, 0x0010($sp) /* 048E8 808C5A78 3C01428C */ lui $at, 0x428C ## $at = 428C0000 /* 048EC 808C5A7C 44812000 */ mtc1 $at, $f4 ## $f4 = 70.00 /* 048F0 808C5A80 C6120028 */ lwc1 $f18, 0x0028($s0) ## 00000028 /* 048F4 808C5A84 3C014302 */ lui $at, 0x4302 ## $at = 43020000 /* 048F8 808C5A88 44814000 */ mtc1 $at, $f8 ## $f8 = 130.00 -/* 048FC 808C5A8C 46049181 */ sub.s $f6, $f18, $f4 +/* 048FC 808C5A8C 46049181 */ sub.s $f6, $f18, $f4 /* 04900 808C5A90 44809000 */ mtc1 $zero, $f18 ## $f18 = 0.00 /* 04904 808C5A94 3C063E4C */ lui $a2, 0x3E4C ## $a2 = 3E4C0000 /* 04908 808C5A98 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3E4CCCCD -/* 0490C 808C5A9C 46083280 */ add.s $f10, $f6, $f8 +/* 0490C 808C5A9C 46083280 */ add.s $f10, $f6, $f8 /* 04910 808C5AA0 26040438 */ addiu $a0, $s0, 0x0438 ## $a0 = 00000438 /* 04914 808C5AA4 3C0741A0 */ lui $a3, 0x41A0 ## $a3 = 41A00000 -/* 04918 808C5AA8 E7B20010 */ swc1 $f18, 0x0010($sp) -/* 0491C 808C5AAC 44055000 */ mfc1 $a1, $f10 +/* 04918 808C5AA8 E7B20010 */ swc1 $f18, 0x0010($sp) +/* 0491C 808C5AAC 44055000 */ mfc1 $a1, $f10 /* 04920 808C5AB0 0C01E0C4 */ jal Math_SmoothScaleMaxMinF - + /* 04924 808C5AB4 00000000 */ nop /* 04928 808C5AB8 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 /* 0492C 808C5ABC 8E05002C */ lw $a1, 0x002C($s0) ## 0000002C @@ -372,68 +372,68 @@ glabel L808C5A4C /* 04938 808C5AC8 2604043C */ addiu $a0, $s0, 0x043C ## $a0 = 0000043C /* 0493C 808C5ACC 3C0741F0 */ lui $a3, 0x41F0 ## $a3 = 41F00000 /* 04940 808C5AD0 0C01E0C4 */ jal Math_SmoothScaleMaxMinF - -/* 04944 808C5AD4 E7A40010 */ swc1 $f4, 0x0010($sp) + +/* 04944 808C5AD4 E7A40010 */ swc1 $f4, 0x0010($sp) /* 04948 808C5AD8 3C01808D */ lui $at, %hi(D_808CA79C) ## $at = 808D0000 -/* 0494C 808C5ADC C422A79C */ lwc1 $f2, %lo(D_808CA79C)($at) +/* 0494C 808C5ADC C422A79C */ lwc1 $f2, %lo(D_808CA79C)($at) /* 04950 808C5AE0 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 /* 04954 808C5AE4 44814000 */ mtc1 $at, $f8 ## $f8 = 5.00 /* 04958 808C5AE8 C6060204 */ lwc1 $f6, 0x0204($s0) ## 00000204 /* 0495C 808C5AEC 3C05C45E */ lui $a1, 0xC45E ## $a1 = C45E0000 -/* 04960 808C5AF0 44061000 */ mfc1 $a2, $f2 -/* 04964 808C5AF4 46083282 */ mul.s $f10, $f6, $f8 +/* 04960 808C5AF0 44061000 */ mfc1 $a2, $f2 +/* 04964 808C5AF4 46083282 */ mul.s $f10, $f6, $f8 /* 04968 808C5AF8 34A58000 */ ori $a1, $a1, 0x8000 ## $a1 = C45E8000 /* 0496C 808C5AFC 26040428 */ addiu $a0, $s0, 0x0428 ## $a0 = 00000428 -/* 04970 808C5B00 E7A20010 */ swc1 $f2, 0x0010($sp) -/* 04974 808C5B04 44075000 */ mfc1 $a3, $f10 +/* 04970 808C5B00 E7A20010 */ swc1 $f2, 0x0010($sp) +/* 04974 808C5B04 44075000 */ mfc1 $a3, $f10 /* 04978 808C5B08 0C01E0C4 */ jal Math_SmoothScaleMaxMinF - + /* 0497C 808C5B0C 00000000 */ nop /* 04980 808C5B10 3C01808D */ lui $at, %hi(D_808CA7A0) ## $at = 808D0000 -/* 04984 808C5B14 C422A7A0 */ lwc1 $f2, %lo(D_808CA7A0)($at) +/* 04984 808C5B14 C422A7A0 */ lwc1 $f2, %lo(D_808CA7A0)($at) /* 04988 808C5B18 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 /* 0498C 808C5B1C 44812000 */ mtc1 $at, $f4 ## $f4 = 5.00 /* 04990 808C5B20 C6120204 */ lwc1 $f18, 0x0204($s0) ## 00000204 /* 04994 808C5B24 3C05C54E */ lui $a1, 0xC54E ## $a1 = C54E0000 -/* 04998 808C5B28 44061000 */ mfc1 $a2, $f2 -/* 0499C 808C5B2C 46049182 */ mul.s $f6, $f18, $f4 +/* 04998 808C5B28 44061000 */ mfc1 $a2, $f2 +/* 0499C 808C5B2C 46049182 */ mul.s $f6, $f18, $f4 /* 049A0 808C5B30 34A58000 */ ori $a1, $a1, 0x8000 ## $a1 = C54E8000 /* 049A4 808C5B34 26040430 */ addiu $a0, $s0, 0x0430 ## $a0 = 00000430 -/* 049A8 808C5B38 E7A20010 */ swc1 $f2, 0x0010($sp) -/* 049AC 808C5B3C 44073000 */ mfc1 $a3, $f6 +/* 049A8 808C5B38 E7A20010 */ swc1 $f2, 0x0010($sp) +/* 049AC 808C5B3C 44073000 */ mfc1 $a3, $f6 /* 049B0 808C5B40 0C01E0C4 */ jal Math_SmoothScaleMaxMinF - + /* 049B4 808C5B44 00000000 */ nop /* 049B8 808C5B48 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 /* 049BC 808C5B4C 44811000 */ mtc1 $at, $f2 ## $f2 = 1.00 /* 049C0 808C5B50 44804000 */ mtc1 $zero, $f8 ## $f8 = 0.00 /* 049C4 808C5B54 3C073DCC */ lui $a3, 0x3DCC ## $a3 = 3DCC0000 -/* 049C8 808C5B58 44051000 */ mfc1 $a1, $f2 -/* 049CC 808C5B5C 44061000 */ mfc1 $a2, $f2 +/* 049C8 808C5B58 44051000 */ mfc1 $a1, $f2 +/* 049CC 808C5B5C 44061000 */ mfc1 $a2, $f2 /* 049D0 808C5B60 34E7CCCD */ ori $a3, $a3, 0xCCCD ## $a3 = 3DCCCCCD /* 049D4 808C5B64 26040204 */ addiu $a0, $s0, 0x0204 ## $a0 = 00000204 /* 049D8 808C5B68 0C01E0C4 */ jal Math_SmoothScaleMaxMinF - -/* 049DC 808C5B6C E7A80010 */ swc1 $f8, 0x0010($sp) + +/* 049DC 808C5B6C E7A80010 */ swc1 $f8, 0x0010($sp) /* 049E0 808C5B70 861801DA */ lh $t8, 0x01DA($s0) ## 000001DA /* 049E4 808C5B74 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 /* 049E8 808C5B78 3C0C808D */ lui $t4, %hi(D_808CA3F8) ## $t4 = 808D0000 -/* 049EC 808C5B7C 17010018 */ bne $t8, $at, .L808C5BE0 +/* 049EC 808C5B7C 17010018 */ bne $t8, $at, .L808C5BE0 /* 049F0 808C5B80 258CA3F8 */ addiu $t4, $t4, %lo(D_808CA3F8) ## $t4 = 808CA3F8 /* 049F4 808C5B84 3C013FC0 */ lui $at, 0x3FC0 ## $at = 3FC00000 /* 049F8 808C5B88 44819000 */ mtc1 $at, $f18 ## $f18 = 1.50 /* 049FC 808C5B8C C60A01E4 */ lwc1 $f10, 0x01E4($s0) ## 000001E4 /* 04A00 808C5B90 860801A2 */ lh $t0, 0x01A2($s0) ## 000001A2 /* 04A04 808C5B94 24190008 */ addiu $t9, $zero, 0x0008 ## $t9 = 00000008 -/* 04A08 808C5B98 46125103 */ div.s $f4, $f10, $f18 +/* 04A08 808C5B98 46125103 */ div.s $f4, $f10, $f18 /* 04A0C 808C5B9C A619019C */ sh $t9, 0x019C($s0) ## 0000019C /* 04A10 808C5BA0 3C01C37A */ lui $at, 0xC37A ## $at = C37A0000 /* 04A14 808C5BA4 240903E8 */ addiu $t1, $zero, 0x03E8 ## $t1 = 000003E8 -/* 04A18 808C5BA8 15000005 */ bne $t0, $zero, .L808C5BC0 +/* 04A18 808C5BA8 15000005 */ bne $t0, $zero, .L808C5BC0 /* 04A1C 808C5BAC E6040068 */ swc1 $f4, 0x0068($s0) ## 00000068 /* 04A20 808C5BB0 3C01437A */ lui $at, 0x437A ## $at = 437A0000 /* 04A24 808C5BB4 44813000 */ mtc1 $at, $f6 ## $f6 = 250.00 -/* 04A28 808C5BB8 10000004 */ beq $zero, $zero, .L808C5BCC +/* 04A28 808C5BB8 10000004 */ beq $zero, $zero, .L808C5BCC /* 04A2C 808C5BBC E6060238 */ swc1 $f6, 0x0238($s0) ## 00000238 .L808C5BC0: /* 04A30 808C5BC0 44814000 */ mtc1 $at, $f8 ## $f8 = 250.00 @@ -443,7 +443,7 @@ glabel L808C5A4C /* 04A3C 808C5BCC 3C0144FA */ lui $at, 0x44FA ## $at = 44FA0000 /* 04A40 808C5BD0 44815000 */ mtc1 $at, $f10 ## $f10 = 2000.00 /* 04A44 808C5BD4 A60901DA */ sh $t1, 0x01DA($s0) ## 000001DA -/* 04A48 808C5BD8 1000042A */ beq $zero, $zero, .L808C6C84 +/* 04A48 808C5BD8 1000042A */ beq $zero, $zero, .L808C6C84 /* 04A4C 808C5BDC E60A0234 */ swc1 $f10, 0x0234($s0) ## 00000234 .L808C5BE0: /* 04A50 808C5BE0 3C014040 */ lui $at, 0x4040 ## $at = 40400000 @@ -452,241 +452,241 @@ glabel L808C5A4C /* 04A5C 808C5BEC 44819000 */ mtc1 $at, $f18 ## $f18 = 5.00 /* 04A60 808C5BF0 3C013E80 */ lui $at, 0x3E80 ## $at = 3E800000 /* 04A64 808C5BF4 44813000 */ mtc1 $at, $f6 ## $f6 = 0.25 -/* 04A68 808C5BF8 46120102 */ mul.s $f4, $f0, $f18 +/* 04A68 808C5BF8 46120102 */ mul.s $f4, $f0, $f18 /* 04A6C 808C5BFC 860A01A0 */ lh $t2, 0x01A0($s0) ## 000001A0 /* 04A70 808C5C00 44805000 */ mtc1 $zero, $f10 ## $f10 = 0.00 -/* 04A74 808C5C04 46060202 */ mul.s $f8, $f0, $f6 -/* 04A78 808C5C08 000A5880 */ sll $t3, $t2, 2 -/* 04A7C 808C5C0C 016A5823 */ subu $t3, $t3, $t2 -/* 04A80 808C5C10 000B5880 */ sll $t3, $t3, 2 -/* 04A84 808C5C14 016C6821 */ addu $t5, $t3, $t4 -/* 04A88 808C5C18 AFAD019C */ sw $t5, 0x019C($sp) -/* 04A8C 808C5C1C 44052000 */ mfc1 $a1, $f4 -/* 04A90 808C5C20 44074000 */ mfc1 $a3, $f8 +/* 04A74 808C5C04 46060202 */ mul.s $f8, $f0, $f6 +/* 04A78 808C5C08 000A5880 */ sll $t3, $t2, 2 +/* 04A7C 808C5C0C 016A5823 */ subu $t3, $t3, $t2 +/* 04A80 808C5C10 000B5880 */ sll $t3, $t3, 2 +/* 04A84 808C5C14 016C6821 */ addu $t5, $t3, $t4 +/* 04A88 808C5C18 AFAD019C */ sw $t5, 0x019C($sp) +/* 04A8C 808C5C1C 44052000 */ mfc1 $a1, $f4 +/* 04A90 808C5C20 44074000 */ mfc1 $a3, $f8 /* 04A94 808C5C24 E60001EC */ swc1 $f0, 0x01EC($s0) ## 000001EC /* 04A98 808C5C28 260401E4 */ addiu $a0, $s0, 0x01E4 ## $a0 = 000001E4 /* 04A9C 808C5C2C 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 04AA0 808C5C30 0C01E0C4 */ jal Math_SmoothScaleMaxMinF - -/* 04AA4 808C5C34 E7AA0010 */ swc1 $f10, 0x0010($sp) -/* 04AA8 808C5C38 8FA2019C */ lw $v0, 0x019C($sp) + +/* 04AA4 808C5C34 E7AA0010 */ swc1 $f10, 0x0010($sp) +/* 04AA8 808C5C38 8FA2019C */ lw $v0, 0x019C($sp) /* 04AAC 808C5C3C C6040024 */ lwc1 $f4, 0x0024($s0) ## 00000024 /* 04AB0 808C5C40 C608002C */ lwc1 $f8, 0x002C($s0) ## 0000002C /* 04AB4 808C5C44 C4520000 */ lwc1 $f18, 0x0000($v0) ## 00000000 /* 04AB8 808C5C48 C4460008 */ lwc1 $f6, 0x0008($v0) ## 00000008 /* 04ABC 808C5C4C 3C014348 */ lui $at, 0x4348 ## $at = 43480000 -/* 04AC0 808C5C50 46049301 */ sub.s $f12, $f18, $f4 +/* 04AC0 808C5C50 46049301 */ sub.s $f12, $f18, $f4 /* 04AC4 808C5C54 44818000 */ mtc1 $at, $f16 ## $f16 = 200.00 /* 04AC8 808C5C58 3C01428C */ lui $at, 0x428C ## $at = 428C0000 -/* 04ACC 808C5C5C 46083381 */ sub.s $f14, $f6, $f8 -/* 04AD0 808C5C60 460C6282 */ mul.s $f10, $f12, $f12 +/* 04ACC 808C5C5C 46083381 */ sub.s $f14, $f6, $f8 +/* 04AD0 808C5C60 460C6282 */ mul.s $f10, $f12, $f12 /* 04AD4 808C5C64 00000000 */ nop -/* 04AD8 808C5C68 460E7482 */ mul.s $f18, $f14, $f14 -/* 04ADC 808C5C6C 46125000 */ add.s $f0, $f10, $f18 -/* 04AE0 808C5C70 46000004 */ sqrt.s $f0, $f0 -/* 04AE4 808C5C74 4610003C */ c.lt.s $f0, $f16 -/* 04AE8 808C5C78 46100081 */ sub.s $f2, $f0, $f16 +/* 04AD8 808C5C68 460E7482 */ mul.s $f18, $f14, $f14 +/* 04ADC 808C5C6C 46125000 */ add.s $f0, $f10, $f18 +/* 04AE0 808C5C70 46000004 */ sqrt.s $f0, $f0 +/* 04AE4 808C5C74 4610003C */ c.lt.s $f0, $f16 +/* 04AE8 808C5C78 46100081 */ sub.s $f2, $f0, $f16 /* 04AEC 808C5C7C 44810000 */ mtc1 $at, $f0 ## $f0 = 70.00 -/* 04AF0 808C5C80 45010004 */ bc1t .L808C5C94 +/* 04AF0 808C5C80 45010004 */ bc1t .L808C5C94 /* 04AF4 808C5C84 00000000 */ nop /* 04AF8 808C5C88 860E01DA */ lh $t6, 0x01DA($s0) ## 000001DA -/* 04AFC 808C5C8C 51C00004 */ beql $t6, $zero, .L808C5CA0 -/* 04B00 808C5C90 4602003C */ c.lt.s $f0, $f2 +/* 04AFC 808C5C8C 51C00004 */ beql $t6, $zero, .L808C5CA0 +/* 04B00 808C5C90 4602003C */ c.lt.s $f0, $f2 .L808C5C94: /* 04B04 808C5C94 44801000 */ mtc1 $zero, $f2 ## $f2 = 0.00 /* 04B08 808C5C98 00000000 */ nop -/* 04B0C 808C5C9C 4602003C */ c.lt.s $f0, $f2 +/* 04B0C 808C5C9C 4602003C */ c.lt.s $f0, $f2 .L808C5CA0: /* 04B10 808C5CA0 00000000 */ nop -/* 04B14 808C5CA4 45020003 */ bc1fl .L808C5CB4 +/* 04B14 808C5CA4 45020003 */ bc1fl .L808C5CB4 /* 04B18 808C5CA8 8604019E */ lh $a0, 0x019E($s0) ## 0000019E -/* 04B1C 808C5CAC 46000086 */ mov.s $f2, $f0 +/* 04B1C 808C5CAC 46000086 */ mov.s $f2, $f0 /* 04B20 808C5CB0 8604019E */ lh $a0, 0x019E($s0) ## 0000019E .L808C5CB4: -/* 04B24 808C5CB4 E7A20178 */ swc1 $f2, 0x0178($sp) -/* 04B28 808C5CB8 00800821 */ addu $at, $a0, $zero -/* 04B2C 808C5CBC 00042140 */ sll $a0, $a0, 5 -/* 04B30 808C5CC0 00812023 */ subu $a0, $a0, $at -/* 04B34 808C5CC4 00042080 */ sll $a0, $a0, 2 -/* 04B38 808C5CC8 00812021 */ addu $a0, $a0, $at -/* 04B3C 808C5CCC 000420C0 */ sll $a0, $a0, 3 -/* 04B40 808C5CD0 00042400 */ sll $a0, $a0, 16 +/* 04B24 808C5CB4 E7A20178 */ swc1 $f2, 0x0178($sp) +/* 04B28 808C5CB8 00800821 */ addu $at, $a0, $zero +/* 04B2C 808C5CBC 00042140 */ sll $a0, $a0, 5 +/* 04B30 808C5CC0 00812023 */ subu $a0, $a0, $at +/* 04B34 808C5CC4 00042080 */ sll $a0, $a0, 2 +/* 04B38 808C5CC8 00812021 */ addu $a0, $a0, $at +/* 04B3C 808C5CCC 000420C0 */ sll $a0, $a0, 3 +/* 04B40 808C5CD0 00042400 */ sll $a0, $a0, 16 /* 04B44 808C5CD4 0C01DE1C */ jal Math_Sins ## sins? -/* 04B48 808C5CD8 00042403 */ sra $a0, $a0, 16 +/* 04B48 808C5CD8 00042403 */ sra $a0, $a0, 16 /* 04B4C 808C5CDC 3C01C248 */ lui $at, 0xC248 ## $at = C2480000 /* 04B50 808C5CE0 44816000 */ mtc1 $at, $f12 ## $f12 = -50.00 /* 04B54 808C5CE4 3C0142C8 */ lui $at, 0x42C8 ## $at = 42C80000 /* 04B58 808C5CE8 44813000 */ mtc1 $at, $f6 ## $f6 = 100.00 -/* 04B5C 808C5CEC 460C0102 */ mul.s $f4, $f0, $f12 +/* 04B5C 808C5CEC 460C0102 */ mul.s $f4, $f0, $f12 /* 04B60 808C5CF0 8604019E */ lh $a0, 0x019E($s0) ## 0000019E -/* 04B64 808C5CF4 00800821 */ addu $at, $a0, $zero -/* 04B68 808C5CF8 00042140 */ sll $a0, $a0, 5 -/* 04B6C 808C5CFC 00812023 */ subu $a0, $a0, $at -/* 04B70 808C5D00 46062203 */ div.s $f8, $f4, $f6 -/* 04B74 808C5D04 00042080 */ sll $a0, $a0, 2 -/* 04B78 808C5D08 00812021 */ addu $a0, $a0, $at -/* 04B7C 808C5D0C 000420C0 */ sll $a0, $a0, 3 -/* 04B80 808C5D10 00042400 */ sll $a0, $a0, 16 -/* 04B84 808C5D14 00042403 */ sra $a0, $a0, 16 +/* 04B64 808C5CF4 00800821 */ addu $at, $a0, $zero +/* 04B68 808C5CF8 00042140 */ sll $a0, $a0, 5 +/* 04B6C 808C5CFC 00812023 */ subu $a0, $a0, $at +/* 04B70 808C5D00 46062203 */ div.s $f8, $f4, $f6 +/* 04B74 808C5D04 00042080 */ sll $a0, $a0, 2 +/* 04B78 808C5D08 00812021 */ addu $a0, $a0, $at +/* 04B7C 808C5D0C 000420C0 */ sll $a0, $a0, 3 +/* 04B80 808C5D10 00042400 */ sll $a0, $a0, 16 +/* 04B84 808C5D14 00042403 */ sra $a0, $a0, 16 /* 04B88 808C5D18 0C01DE1C */ jal Math_Sins ## sins? /* 04B8C 808C5D1C E608023C */ swc1 $f8, 0x023C($s0) ## 0000023C -/* 04B90 808C5D20 C7A20178 */ lwc1 $f2, 0x0178($sp) +/* 04B90 808C5D20 C7A20178 */ lwc1 $f2, 0x0178($sp) /* 04B94 808C5D24 44809000 */ mtc1 $zero, $f18 ## $f18 = 0.00 /* 04B98 808C5D28 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 -/* 04B9C 808C5D2C 46020282 */ mul.s $f10, $f0, $f2 -/* 04BA0 808C5D30 E7B20198 */ swc1 $f18, 0x0198($sp) -/* 04BA4 808C5D34 E7A40194 */ swc1 $f4, 0x0194($sp) +/* 04B9C 808C5D2C 46020282 */ mul.s $f10, $f0, $f2 +/* 04BA0 808C5D30 E7B20198 */ swc1 $f18, 0x0198($sp) +/* 04BA4 808C5D34 E7A40194 */ swc1 $f4, 0x0194($sp) /* 04BA8 808C5D38 3C01808D */ lui $at, %hi(D_808CA7A4) ## $at = 808D0000 /* 04BAC 808C5D3C 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 04BB0 808C5D40 E7AA0190 */ swc1 $f10, 0x0190($sp) +/* 04BB0 808C5D40 E7AA0190 */ swc1 $f10, 0x0190($sp) /* 04BB4 808C5D44 860F00B6 */ lh $t7, 0x00B6($s0) ## 000000B6 -/* 04BB8 808C5D48 C42AA7A4 */ lwc1 $f10, %lo(D_808CA7A4)($at) +/* 04BB8 808C5D48 C42AA7A4 */ lwc1 $f10, %lo(D_808CA7A4)($at) /* 04BBC 808C5D4C 448F3000 */ mtc1 $t7, $f6 ## $f6 = 0.00 /* 04BC0 808C5D50 00000000 */ nop -/* 04BC4 808C5D54 46803220 */ cvt.s.w $f8, $f6 -/* 04BC8 808C5D58 460A4302 */ mul.s $f12, $f8, $f10 -/* 04BCC 808C5D5C 0C034348 */ jal Matrix_RotateY +/* 04BC4 808C5D54 46803220 */ cvt.s.w $f8, $f6 +/* 04BC8 808C5D58 460A4302 */ mul.s $f12, $f8, $f10 +/* 04BCC 808C5D5C 0C034348 */ jal Matrix_RotateY /* 04BD0 808C5D60 00000000 */ nop /* 04BD4 808C5D64 27A40190 */ addiu $a0, $sp, 0x0190 ## $a0 = FFFFFFF0 -/* 04BD8 808C5D68 0C0346BD */ jal Matrix_MultVec3f +/* 04BD8 808C5D68 0C0346BD */ jal Matrix_MultVec3f /* 04BDC 808C5D6C 27A50184 */ addiu $a1, $sp, 0x0184 ## $a1 = FFFFFFE4 -/* 04BE0 808C5D70 8FB8019C */ lw $t8, 0x019C($sp) -/* 04BE4 808C5D74 C7A40184 */ lwc1 $f4, 0x0184($sp) +/* 04BE0 808C5D70 8FB8019C */ lw $t8, 0x019C($sp) +/* 04BE4 808C5D74 C7A40184 */ lwc1 $f4, 0x0184($sp) /* 04BE8 808C5D78 44804000 */ mtc1 $zero, $f8 ## $f8 = 0.00 /* 04BEC 808C5D7C C7120000 */ lwc1 $f18, 0x0000($t8) ## 00000000 /* 04BF0 808C5D80 26040024 */ addiu $a0, $s0, 0x0024 ## $a0 = 00000024 /* 04BF4 808C5D84 8E0701E4 */ lw $a3, 0x01E4($s0) ## 000001E4 -/* 04BF8 808C5D88 46049180 */ add.s $f6, $f18, $f4 -/* 04BFC 808C5D8C AFA40048 */ sw $a0, 0x0048($sp) +/* 04BF8 808C5D88 46049180 */ add.s $f6, $f18, $f4 +/* 04BFC 808C5D8C AFA40048 */ sw $a0, 0x0048($sp) /* 04C00 808C5D90 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 04C04 808C5D94 E7A80010 */ swc1 $f8, 0x0010($sp) -/* 04C08 808C5D98 44053000 */ mfc1 $a1, $f6 +/* 04C04 808C5D94 E7A80010 */ swc1 $f8, 0x0010($sp) +/* 04C08 808C5D98 44053000 */ mfc1 $a1, $f6 /* 04C0C 808C5D9C 0C01E0C4 */ jal Math_SmoothScaleMaxMinF - + /* 04C10 808C5DA0 00000000 */ nop -/* 04C14 808C5DA4 8FB9019C */ lw $t9, 0x019C($sp) -/* 04C18 808C5DA8 C7B2018C */ lwc1 $f18, 0x018C($sp) +/* 04C14 808C5DA4 8FB9019C */ lw $t9, 0x019C($sp) +/* 04C18 808C5DA8 C7B2018C */ lwc1 $f18, 0x018C($sp) /* 04C1C 808C5DAC 44803000 */ mtc1 $zero, $f6 ## $f6 = 0.00 /* 04C20 808C5DB0 C72A0008 */ lwc1 $f10, 0x0008($t9) ## 00000008 /* 04C24 808C5DB4 8E0701E4 */ lw $a3, 0x01E4($s0) ## 000001E4 /* 04C28 808C5DB8 2604002C */ addiu $a0, $s0, 0x002C ## $a0 = 0000002C -/* 04C2C 808C5DBC 46125100 */ add.s $f4, $f10, $f18 +/* 04C2C 808C5DBC 46125100 */ add.s $f4, $f10, $f18 /* 04C30 808C5DC0 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 04C34 808C5DC4 E7A60010 */ swc1 $f6, 0x0010($sp) -/* 04C38 808C5DC8 44052000 */ mfc1 $a1, $f4 +/* 04C34 808C5DC4 E7A60010 */ swc1 $f6, 0x0010($sp) +/* 04C38 808C5DC8 44052000 */ mfc1 $a1, $f4 /* 04C3C 808C5DCC 0C01E0C4 */ jal Math_SmoothScaleMaxMinF - + /* 04C40 808C5DD0 00000000 */ nop /* 04C44 808C5DD4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 04C48 808C5DD8 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 04C4C 808C5DDC 2405304E */ addiu $a1, $zero, 0x304E ## $a1 = 0000304E /* 04C50 808C5DE0 8603019E */ lh $v1, 0x019E($s0) ## 0000019E -/* 04C54 808C5DE4 8FA401A4 */ lw $a0, 0x01A4($sp) +/* 04C54 808C5DE4 8FA401A4 */ lw $a0, 0x01A4($sp) /* 04C58 808C5DE8 24050002 */ addiu $a1, $zero, 0x0002 ## $a1 = 00000002 /* 04C5C 808C5DEC 30680007 */ andi $t0, $v1, 0x0007 ## $t0 = 00000000 -/* 04C60 808C5DF0 15000005 */ bne $t0, $zero, .L808C5E08 +/* 04C60 808C5DF0 15000005 */ bne $t0, $zero, .L808C5E08 /* 04C64 808C5DF4 248401E0 */ addiu $a0, $a0, 0x01E0 ## $a0 = 000001E0 /* 04C68 808C5DF8 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 -/* 04C6C 808C5DFC 0C016A87 */ jal func_8005AA1C +/* 04C6C 808C5DFC 0C016A87 */ jal func_8005AA1C /* 04C70 808C5E00 24070008 */ addiu $a3, $zero, 0x0008 ## $a3 = 00000008 /* 04C74 808C5E04 8603019E */ lh $v1, 0x019E($s0) ## 0000019E .L808C5E08: /* 04C78 808C5E08 30690001 */ andi $t1, $v1, 0x0001 ## $t1 = 00000000 -/* 04C7C 808C5E0C 1520000F */ bne $t1, $zero, .L808C5E4C -/* 04C80 808C5E10 8FA401A4 */ lw $a0, 0x01A4($sp) +/* 04C7C 808C5E0C 1520000F */ bne $t1, $zero, .L808C5E4C +/* 04C80 808C5E10 8FA401A4 */ lw $a0, 0x01A4($sp) /* 04C84 808C5E14 3C014100 */ lui $at, 0x4100 ## $at = 41000000 /* 04C88 808C5E18 44814000 */ mtc1 $at, $f8 ## $f8 = 8.00 /* 04C8C 808C5E1C 240A0003 */ addiu $t2, $zero, 0x0003 ## $t2 = 00000003 /* 04C90 808C5E20 240B01F4 */ addiu $t3, $zero, 0x01F4 ## $t3 = 000001F4 /* 04C94 808C5E24 240C000A */ addiu $t4, $zero, 0x000A ## $t4 = 0000000A -/* 04C98 808C5E28 AFAC001C */ sw $t4, 0x001C($sp) -/* 04C9C 808C5E2C AFAB0018 */ sw $t3, 0x0018($sp) -/* 04CA0 808C5E30 AFAA0010 */ sw $t2, 0x0010($sp) +/* 04C98 808C5E28 AFAC001C */ sw $t4, 0x001C($sp) +/* 04C9C 808C5E2C AFAB0018 */ sw $t3, 0x0018($sp) +/* 04CA0 808C5E30 AFAA0010 */ sw $t2, 0x0010($sp) /* 04CA4 808C5E34 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 04CA8 808C5E38 8FA60048 */ lw $a2, 0x0048($sp) +/* 04CA8 808C5E38 8FA60048 */ lw $a2, 0x0048($sp) /* 04CAC 808C5E3C 3C074220 */ lui $a3, 0x4220 ## $a3 = 42200000 -/* 04CB0 808C5E40 AFA00020 */ sw $zero, 0x0020($sp) -/* 04CB4 808C5E44 0C00CC98 */ jal func_80033260 -/* 04CB8 808C5E48 E7A80014 */ swc1 $f8, 0x0014($sp) +/* 04CB0 808C5E40 AFA00020 */ sw $zero, 0x0020($sp) +/* 04CB4 808C5E44 0C00CC98 */ jal func_80033260 +/* 04CB8 808C5E48 E7A80014 */ swc1 $f8, 0x0014($sp) .L808C5E4C: -/* 04CBC 808C5E4C 8FAD019C */ lw $t5, 0x019C($sp) +/* 04CBC 808C5E4C 8FAD019C */ lw $t5, 0x019C($sp) /* 04CC0 808C5E50 C6120024 */ lwc1 $f18, 0x0024($s0) ## 00000024 /* 04CC4 808C5E54 3C0142C8 */ lui $at, 0x42C8 ## $at = 42C80000 /* 04CC8 808C5E58 C5AA0000 */ lwc1 $f10, 0x0000($t5) ## 00000000 /* 04CCC 808C5E5C C60801EC */ lwc1 $f8, 0x01EC($s0) ## 000001EC /* 04CD0 808C5E60 C606002C */ lwc1 $f6, 0x002C($s0) ## 0000002C -/* 04CD4 808C5E64 46125301 */ sub.s $f12, $f10, $f18 +/* 04CD4 808C5E64 46125301 */ sub.s $f12, $f10, $f18 /* 04CD8 808C5E68 44815000 */ mtc1 $at, $f10 ## $f10 = 100.00 /* 04CDC 808C5E6C C5A40008 */ lwc1 $f4, 0x0008($t5) ## 00000008 /* 04CE0 808C5E70 3C0544BB */ lui $a1, 0x44BB ## $a1 = 44BB0000 -/* 04CE4 808C5E74 460A4482 */ mul.s $f18, $f8, $f10 -/* 04CE8 808C5E78 46062381 */ sub.s $f14, $f4, $f6 +/* 04CE4 808C5E74 460A4482 */ mul.s $f18, $f8, $f10 +/* 04CE8 808C5E78 46062381 */ sub.s $f14, $f4, $f6 /* 04CEC 808C5E7C 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 /* 04CF0 808C5E80 34A58000 */ ori $a1, $a1, 0x8000 ## $a1 = 44BB8000 -/* 04CF4 808C5E84 E7AC0180 */ swc1 $f12, 0x0180($sp) -/* 04CF8 808C5E88 E7AE017C */ swc1 $f14, 0x017C($sp) +/* 04CF4 808C5E84 E7AC0180 */ swc1 $f12, 0x0180($sp) +/* 04CF8 808C5E88 E7AE017C */ swc1 $f14, 0x017C($sp) /* 04CFC 808C5E8C 260401E8 */ addiu $a0, $s0, 0x01E8 ## $a0 = 000001E8 -/* 04D00 808C5E90 44079000 */ mfc1 $a3, $f18 +/* 04D00 808C5E90 44079000 */ mfc1 $a3, $f18 /* 04D04 808C5E94 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 04D08 808C5E98 0C01E0C4 */ jal Math_SmoothScaleMaxMinF - -/* 04D0C 808C5E9C E7A40010 */ swc1 $f4, 0x0010($sp) -/* 04D10 808C5EA0 C7AC0180 */ lwc1 $f12, 0x0180($sp) -/* 04D14 808C5EA4 0C03F494 */ jal func_800FD250 -/* 04D18 808C5EA8 C7AE017C */ lwc1 $f14, 0x017C($sp) + +/* 04D0C 808C5E9C E7A40010 */ swc1 $f4, 0x0010($sp) +/* 04D10 808C5EA0 C7AC0180 */ lwc1 $f12, 0x0180($sp) +/* 04D14 808C5EA4 0C03F494 */ jal Math_atan2f +/* 04D18 808C5EA8 C7AE017C */ lwc1 $f14, 0x017C($sp) /* 04D1C 808C5EAC 3C01808D */ lui $at, %hi(D_808CA7A8) ## $at = 808D0000 -/* 04D20 808C5EB0 C426A7A8 */ lwc1 $f6, %lo(D_808CA7A8)($at) +/* 04D20 808C5EB0 C426A7A8 */ lwc1 $f6, %lo(D_808CA7A8)($at) /* 04D24 808C5EB4 C61201EC */ lwc1 $f18, 0x01EC($s0) ## 000001EC /* 04D28 808C5EB8 C60401E8 */ lwc1 $f4, 0x01E8($s0) ## 000001E8 -/* 04D2C 808C5EBC 46060202 */ mul.s $f8, $f0, $f6 -/* 04D30 808C5EC0 AFA00010 */ sw $zero, 0x0010($sp) +/* 04D2C 808C5EBC 46060202 */ mul.s $f8, $f0, $f6 +/* 04D30 808C5EC0 AFA00010 */ sw $zero, 0x0010($sp) /* 04D34 808C5EC4 26040032 */ addiu $a0, $s0, 0x0032 ## $a0 = 00000032 -/* 04D38 808C5EC8 46049182 */ mul.s $f6, $f18, $f4 +/* 04D38 808C5EC8 46049182 */ mul.s $f6, $f18, $f4 /* 04D3C 808C5ECC 24060005 */ addiu $a2, $zero, 0x0005 ## $a2 = 00000005 -/* 04D40 808C5ED0 4600428D */ trunc.w.s $f10, $f8 -/* 04D44 808C5ED4 4600320D */ trunc.w.s $f8, $f6 -/* 04D48 808C5ED8 44055000 */ mfc1 $a1, $f10 -/* 04D4C 808C5EDC 44074000 */ mfc1 $a3, $f8 -/* 04D50 808C5EE0 00052C00 */ sll $a1, $a1, 16 -/* 04D54 808C5EE4 00052C03 */ sra $a1, $a1, 16 -/* 04D58 808C5EE8 00073C00 */ sll $a3, $a3, 16 +/* 04D40 808C5ED0 4600428D */ trunc.w.s $f10, $f8 +/* 04D44 808C5ED4 4600320D */ trunc.w.s $f8, $f6 +/* 04D48 808C5ED8 44055000 */ mfc1 $a1, $f10 +/* 04D4C 808C5EDC 44074000 */ mfc1 $a3, $f8 +/* 04D50 808C5EE0 00052C00 */ sll $a1, $a1, 16 +/* 04D54 808C5EE4 00052C03 */ sra $a1, $a1, 16 +/* 04D58 808C5EE8 00073C00 */ sll $a3, $a3, 16 /* 04D5C 808C5EEC 0C01E1A7 */ jal Math_SmoothScaleMaxMinS - -/* 04D60 808C5EF0 00073C03 */ sra $a3, $a3, 16 -/* 04D64 808C5EF4 C7AC0180 */ lwc1 $f12, 0x0180($sp) + +/* 04D60 808C5EF0 00073C03 */ sra $a3, $a3, 16 +/* 04D64 808C5EF4 C7AC0180 */ lwc1 $f12, 0x0180($sp) /* 04D68 808C5EF8 3C014170 */ lui $at, 0x4170 ## $at = 41700000 /* 04D6C 808C5EFC 44811000 */ mtc1 $at, $f2 ## $f2 = 15.00 -/* 04D70 808C5F00 46006005 */ abs.s $f0, $f12 -/* 04D74 808C5F04 C7AE017C */ lwc1 $f14, 0x017C($sp) -/* 04D78 808C5F08 4602003E */ c.le.s $f0, $f2 +/* 04D70 808C5F00 46006005 */ abs.s $f0, $f12 +/* 04D74 808C5F04 C7AE017C */ lwc1 $f14, 0x017C($sp) +/* 04D78 808C5F08 4602003E */ c.le.s $f0, $f2 /* 04D7C 808C5F0C 00000000 */ nop -/* 04D80 808C5F10 4502035D */ bc1fl .L808C6C88 +/* 04D80 808C5F10 4502035D */ bc1fl .L808C6C88 /* 04D84 808C5F14 860501B4 */ lh $a1, 0x01B4($s0) ## 000001B4 -/* 04D88 808C5F18 46007005 */ abs.s $f0, $f14 +/* 04D88 808C5F18 46007005 */ abs.s $f0, $f14 /* 04D8C 808C5F1C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 04D90 808C5F20 4602003E */ c.le.s $f0, $f2 +/* 04D90 808C5F20 4602003E */ c.le.s $f0, $f2 /* 04D94 808C5F24 2405384D */ addiu $a1, $zero, 0x384D ## $a1 = 0000384D -/* 04D98 808C5F28 45020357 */ bc1fl .L808C6C88 +/* 04D98 808C5F28 45020357 */ bc1fl .L808C6C88 /* 04D9C 808C5F2C 860501B4 */ lh $a1, 0x01B4($s0) ## 000001B4 /* 04DA0 808C5F30 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 04DA4 808C5F34 E6020060 */ swc1 $f2, 0x0060($s0) ## 00000060 /* 04DA8 808C5F38 861801A2 */ lh $t8, 0x01A2($s0) ## 000001A2 /* 04DAC 808C5F3C 240E000A */ addiu $t6, $zero, 0x000A ## $t6 = 0000000A /* 04DB0 808C5F40 27A50154 */ addiu $a1, $sp, 0x0154 ## $a1 = FFFFFFB4 -/* 04DB4 808C5F44 5700000B */ bnel $t8, $zero, .L808C5F74 +/* 04DB4 808C5F44 5700000B */ bnel $t8, $zero, .L808C5F74 /* 04DB8 808C5F48 860A01A0 */ lh $t2, 0x01A0($s0) ## 000001A0 /* 04DBC 808C5F4C 861901A0 */ lh $t9, 0x01A0($s0) ## 000001A0 /* 04DC0 808C5F50 27280001 */ addiu $t0, $t9, 0x0001 ## $t0 = 00000001 /* 04DC4 808C5F54 A60801A0 */ sh $t0, 0x01A0($s0) ## 000001A0 /* 04DC8 808C5F58 860901A0 */ lh $t1, 0x01A0($s0) ## 000001A0 -/* 04DCC 808C5F5C 29210004 */ slti $at, $t1, 0x0004 -/* 04DD0 808C5F60 5420000C */ bnel $at, $zero, .L808C5F94 +/* 04DCC 808C5F5C 29210004 */ slti $at, $t1, 0x0004 +/* 04DD0 808C5F60 5420000C */ bnel $at, $zero, .L808C5F94 /* 04DD4 808C5F64 C60A0024 */ lwc1 $f10, 0x0024($s0) ## 00000024 -/* 04DD8 808C5F68 10000009 */ beq $zero, $zero, .L808C5F90 +/* 04DD8 808C5F68 10000009 */ beq $zero, $zero, .L808C5F90 /* 04DDC 808C5F6C A60001A0 */ sh $zero, 0x01A0($s0) ## 000001A0 /* 04DE0 808C5F70 860A01A0 */ lh $t2, 0x01A0($s0) ## 000001A0 .L808C5F74: @@ -694,7 +694,7 @@ glabel L808C5A4C /* 04DE8 808C5F78 254BFFFF */ addiu $t3, $t2, 0xFFFF ## $t3 = FFFFFFFF /* 04DEC 808C5F7C A60B01A0 */ sh $t3, 0x01A0($s0) ## 000001A0 /* 04DF0 808C5F80 860C01A0 */ lh $t4, 0x01A0($s0) ## 000001A0 -/* 04DF4 808C5F84 05830003 */ bgezl $t4, .L808C5F94 +/* 04DF4 808C5F84 05830003 */ bgezl $t4, .L808C5F94 /* 04DF8 808C5F88 C60A0024 */ lwc1 $f10, 0x0024($s0) ## 00000024 /* 04DFC 808C5F8C A60D01A0 */ sh $t5, 0x01A0($s0) ## 000001A0 .L808C5F90: @@ -702,59 +702,59 @@ glabel L808C5A4C .L808C5F94: /* 04E04 808C5F94 A60E01DA */ sh $t6, 0x01DA($s0) ## 000001DA /* 04E08 808C5F98 3C014270 */ lui $at, 0x4270 ## $at = 42700000 -/* 04E0C 808C5F9C E7AA0154 */ swc1 $f10, 0x0154($sp) +/* 04E0C 808C5F9C E7AA0154 */ swc1 $f10, 0x0154($sp) /* 04E10 808C5FA0 C6120028 */ lwc1 $f18, 0x0028($s0) ## 00000028 /* 04E14 808C5FA4 44812000 */ mtc1 $at, $f4 ## $f4 = 60.00 /* 04E18 808C5FA8 240F0320 */ addiu $t7, $zero, 0x0320 ## $t7 = 00000320 /* 04E1C 808C5FAC 2418000A */ addiu $t8, $zero, 0x000A ## $t8 = 0000000A -/* 04E20 808C5FB0 46049180 */ add.s $f6, $f18, $f4 -/* 04E24 808C5FB4 8FA401A4 */ lw $a0, 0x01A4($sp) +/* 04E20 808C5FB0 46049180 */ add.s $f6, $f18, $f4 +/* 04E24 808C5FB4 8FA401A4 */ lw $a0, 0x01A4($sp) /* 04E28 808C5FB8 3C06437A */ lui $a2, 0x437A ## $a2 = 437A0000 /* 04E2C 808C5FBC 24070028 */ addiu $a3, $zero, 0x0028 ## $a3 = 00000028 -/* 04E30 808C5FC0 E7A60158 */ swc1 $f6, 0x0158($sp) +/* 04E30 808C5FC0 E7A60158 */ swc1 $f6, 0x0158($sp) /* 04E34 808C5FC4 C608002C */ lwc1 $f8, 0x002C($s0) ## 0000002C -/* 04E38 808C5FC8 AFA00018 */ sw $zero, 0x0018($sp) -/* 04E3C 808C5FCC AFB80014 */ sw $t8, 0x0014($sp) -/* 04E40 808C5FD0 AFAF0010 */ sw $t7, 0x0010($sp) -/* 04E44 808C5FD4 0C00CD20 */ jal func_80033480 -/* 04E48 808C5FD8 E7A8015C */ swc1 $f8, 0x015C($sp) -/* 04E4C 808C5FDC 1000032A */ beq $zero, $zero, .L808C6C88 +/* 04E38 808C5FC8 AFA00018 */ sw $zero, 0x0018($sp) +/* 04E3C 808C5FCC AFB80014 */ sw $t8, 0x0014($sp) +/* 04E40 808C5FD0 AFAF0010 */ sw $t7, 0x0010($sp) +/* 04E44 808C5FD4 0C00CD20 */ jal func_80033480 +/* 04E48 808C5FD8 E7A8015C */ swc1 $f8, 0x015C($sp) +/* 04E4C 808C5FDC 1000032A */ beq $zero, $zero, .L808C6C88 /* 04E50 808C5FE0 860501B4 */ lh $a1, 0x01B4($s0) ## 000001B4 glabel L808C5FE4 /* 04E54 808C5FE4 860301DA */ lh $v1, 0x01DA($s0) ## 000001DA /* 04E58 808C5FE8 24010374 */ addiu $at, $zero, 0x0374 ## $at = 00000374 /* 04E5C 808C5FEC 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 -/* 04E60 808C5FF0 54610024 */ bnel $v1, $at, .L808C6084 -/* 04E64 808C5FF4 28610356 */ slti $at, $v1, 0x0356 +/* 04E60 808C5FF0 54610024 */ bnel $v1, $at, .L808C6084 +/* 04E64 808C5FF4 28610356 */ slti $at, $v1, 0x0356 /* 04E68 808C5FF8 0C028800 */ jal SkelAnime_GetFrameCount - + /* 04E6C 808C5FFC 248442A8 */ addiu $a0, $a0, 0x42A8 ## $a0 = 060042A8 /* 04E70 808C6000 44825000 */ mtc1 $v0, $f10 ## $f10 = 0.00 /* 04E74 808C6004 3C01C1A0 */ lui $at, 0xC1A0 ## $at = C1A00000 /* 04E78 808C6008 44812000 */ mtc1 $at, $f4 ## $f4 = -20.00 -/* 04E7C 808C600C 468054A0 */ cvt.s.w $f18, $f10 +/* 04E7C 808C600C 468054A0 */ cvt.s.w $f18, $f10 /* 04E80 808C6010 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 04E84 808C6014 24A542A8 */ addiu $a1, $a1, 0x42A8 ## $a1 = 060042A8 -/* 04E88 808C6018 8FA4004C */ lw $a0, 0x004C($sp) +/* 04E88 808C6018 8FA4004C */ lw $a0, 0x004C($sp) /* 04E8C 808C601C 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 04E90 808C6020 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 04E94 808C6024 E7B20010 */ swc1 $f18, 0x0010($sp) -/* 04E98 808C6028 AFA00014 */ sw $zero, 0x0014($sp) -/* 04E9C 808C602C 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 04EA0 808C6030 E7A40018 */ swc1 $f4, 0x0018($sp) +/* 04E94 808C6024 E7B20010 */ swc1 $f18, 0x0010($sp) +/* 04E98 808C6028 AFA00014 */ sw $zero, 0x0014($sp) +/* 04E9C 808C602C 0C029468 */ jal SkelAnime_ChangeAnim + +/* 04EA0 808C6030 E7A40018 */ swc1 $f4, 0x0018($sp) /* 04EA4 808C6034 C6060428 */ lwc1 $f6, 0x0428($s0) ## 00000428 /* 04EA8 808C6038 C6080024 */ lwc1 $f8, 0x0024($s0) ## 00000024 /* 04EAC 808C603C C60A0430 */ lwc1 $f10, 0x0430($s0) ## 00000430 /* 04EB0 808C6040 C612002C */ lwc1 $f18, 0x002C($s0) ## 0000002C -/* 04EB4 808C6044 46083301 */ sub.s $f12, $f6, $f8 -/* 04EB8 808C6048 46125381 */ sub.s $f14, $f10, $f18 -/* 04EBC 808C604C 460C6102 */ mul.s $f4, $f12, $f12 +/* 04EB4 808C6044 46083301 */ sub.s $f12, $f6, $f8 +/* 04EB8 808C6048 46125381 */ sub.s $f14, $f10, $f18 +/* 04EBC 808C604C 460C6102 */ mul.s $f4, $f12, $f12 /* 04EC0 808C6050 00000000 */ nop -/* 04EC4 808C6054 460E7182 */ mul.s $f6, $f14, $f14 -/* 04EC8 808C6058 46062000 */ add.s $f0, $f4, $f6 -/* 04ECC 808C605C 46000004 */ sqrt.s $f0, $f0 -/* 04ED0 808C6060 0C03F494 */ jal func_800FD250 +/* 04EC4 808C6054 460E7182 */ mul.s $f6, $f14, $f14 +/* 04EC8 808C6058 46062000 */ add.s $f0, $f4, $f6 +/* 04ECC 808C605C 46000004 */ sqrt.s $f0, $f0 +/* 04ED0 808C6060 0C03F494 */ jal Math_atan2f /* 04ED4 808C6064 E600022C */ swc1 $f0, 0x022C($s0) ## 0000022C /* 04ED8 808C6068 2419015E */ addiu $t9, $zero, 0x015E ## $t9 = 0000015E /* 04EDC 808C606C 24080009 */ addiu $t0, $zero, 0x0009 ## $t0 = 00000009 @@ -762,82 +762,82 @@ glabel L808C5FE4 /* 04EE4 808C6074 A61901DC */ sh $t9, 0x01DC($s0) ## 000001DC /* 04EE8 808C6078 A608019C */ sh $t0, 0x019C($s0) ## 0000019C /* 04EEC 808C607C 860301DA */ lh $v1, 0x01DA($s0) ## 000001DA -/* 04EF0 808C6080 28610356 */ slti $at, $v1, 0x0356 +/* 04EF0 808C6080 28610356 */ slti $at, $v1, 0x0356 .L808C6084: -/* 04EF4 808C6084 10200013 */ beq $at, $zero, .L808C60D4 +/* 04EF4 808C6084 10200013 */ beq $at, $zero, .L808C60D4 /* 04EF8 808C6088 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 .L808C608C: /* 04EFC 808C608C 3C04808C */ lui $a0, %hi(D_808C7000) ## $a0 = 808C0000 /* 04F00 808C6090 860501CC */ lh $a1, 0x01CC($s0) ## 000001CC -/* 04F04 808C6094 A7A20176 */ sh $v0, 0x0176($sp) -/* 04F08 808C6098 0C2304B1 */ jal func_808C12C4 +/* 04F04 808C6094 A7A20176 */ sh $v0, 0x0176($sp) +/* 04F08 808C6098 0C2304B1 */ jal func_808C12C4 /* 04F0C 808C609C 24847000 */ addiu $a0, $a0, %lo(D_808C7000) ## $a0 = 808C7000 /* 04F10 808C60A0 860301CC */ lh $v1, 0x01CC($s0) ## 000001CC -/* 04F14 808C60A4 87A20176 */ lh $v0, 0x0176($sp) -/* 04F18 808C60A8 28610100 */ slti $at, $v1, 0x0100 -/* 04F1C 808C60AC 10200003 */ beq $at, $zero, .L808C60BC +/* 04F14 808C60A4 87A20176 */ lh $v0, 0x0176($sp) +/* 04F18 808C60A8 28610100 */ slti $at, $v1, 0x0100 +/* 04F1C 808C60AC 10200003 */ beq $at, $zero, .L808C60BC /* 04F20 808C60B0 24420001 */ addiu $v0, $v0, 0x0001 ## $v0 = 00000001 /* 04F24 808C60B4 24690001 */ addiu $t1, $v1, 0x0001 ## $t1 = 00000001 /* 04F28 808C60B8 A60901CC */ sh $t1, 0x01CC($s0) ## 000001CC .L808C60BC: -/* 04F2C 808C60BC 00021400 */ sll $v0, $v0, 16 -/* 04F30 808C60C0 00021403 */ sra $v0, $v0, 16 -/* 04F34 808C60C4 28410002 */ slti $at, $v0, 0x0002 -/* 04F38 808C60C8 1420FFF0 */ bne $at, $zero, .L808C608C +/* 04F2C 808C60BC 00021400 */ sll $v0, $v0, 16 +/* 04F30 808C60C0 00021403 */ sra $v0, $v0, 16 +/* 04F34 808C60C4 28410002 */ slti $at, $v0, 0x0002 +/* 04F38 808C60C8 1420FFF0 */ bne $at, $zero, .L808C608C /* 04F3C 808C60CC 00000000 */ nop /* 04F40 808C60D0 860301DA */ lh $v1, 0x01DA($s0) ## 000001DA .L808C60D4: -/* 04F44 808C60D4 286103D8 */ slti $at, $v1, 0x03D8 -/* 04F48 808C60D8 10200007 */ beq $at, $zero, .L808C60F8 +/* 04F44 808C60D4 286103D8 */ slti $at, $v1, 0x03D8 +/* 04F48 808C60D8 10200007 */ beq $at, $zero, .L808C60F8 /* 04F4C 808C60DC 260401C4 */ addiu $a0, $s0, 0x01C4 ## $a0 = 000001C4 /* 04F50 808C60E0 2405C000 */ addiu $a1, $zero, 0xC000 ## $a1 = FFFFC000 /* 04F54 808C60E4 2406000A */ addiu $a2, $zero, 0x000A ## $a2 = 0000000A /* 04F58 808C60E8 2407012C */ addiu $a3, $zero, 0x012C ## $a3 = 0000012C /* 04F5C 808C60EC 0C01E1A7 */ jal Math_SmoothScaleMaxMinS - -/* 04F60 808C60F0 AFA00010 */ sw $zero, 0x0010($sp) + +/* 04F60 808C60F0 AFA00010 */ sw $zero, 0x0010($sp) /* 04F64 808C60F4 860301DA */ lh $v1, 0x01DA($s0) ## 000001DA .L808C60F8: /* 04F68 808C60F8 24010388 */ addiu $at, $zero, 0x0388 ## $at = 00000388 -/* 04F6C 808C60FC 14610004 */ bne $v1, $at, .L808C6110 +/* 04F6C 808C60FC 14610004 */ bne $v1, $at, .L808C6110 /* 04F70 808C6100 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 04F74 808C6104 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 04F78 808C6108 24053853 */ addiu $a1, $zero, 0x3853 ## $a1 = 00003853 /* 04F7C 808C610C 860301DA */ lh $v1, 0x01DA($s0) ## 000001DA .L808C6110: -/* 04F80 808C6110 28610356 */ slti $at, $v1, 0x0356 -/* 04F84 808C6114 10200004 */ beq $at, $zero, .L808C6128 +/* 04F80 808C6110 28610356 */ slti $at, $v1, 0x0356 +/* 04F84 808C6114 10200004 */ beq $at, $zero, .L808C6128 /* 04F88 808C6118 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 04F8C 808C611C 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 04F90 808C6120 24053054 */ addiu $a1, $zero, 0x3054 ## $a1 = 00003054 /* 04F94 808C6124 860301DA */ lh $v1, 0x01DA($s0) ## 000001DA .L808C6128: /* 04F98 808C6128 240103C0 */ addiu $at, $zero, 0x03C0 ## $at = 000003C0 -/* 04F9C 808C612C 14610004 */ bne $v1, $at, .L808C6140 +/* 04F9C 808C612C 14610004 */ bne $v1, $at, .L808C6140 /* 04FA0 808C6130 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 04FA4 808C6134 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 04FA8 808C6138 24053855 */ addiu $a1, $zero, 0x3855 ## $a1 = 00003855 /* 04FAC 808C613C 860301DA */ lh $v1, 0x01DA($s0) ## 000001DA .L808C6140: -/* 04FB0 808C6140 286103C0 */ slti $at, $v1, 0x03C0 -/* 04FB4 808C6144 102000BE */ beq $at, $zero, .L808C6440 +/* 04FB0 808C6140 286103C0 */ slti $at, $v1, 0x03C0 +/* 04FB4 808C6144 102000BE */ beq $at, $zero, .L808C6440 /* 04FB8 808C6148 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 04FBC 808C614C 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 /* 04FC0 808C6150 260400C4 */ addiu $a0, $s0, 0x00C4 ## $a0 = 000000C4 /* 04FC4 808C6154 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 04FC8 808C6158 44050000 */ mfc1 $a1, $f0 +/* 04FC8 808C6158 44050000 */ mfc1 $a1, $f0 /* 04FCC 808C615C 3C074120 */ lui $a3, 0x4120 ## $a3 = 41200000 /* 04FD0 808C6160 0C01E0C4 */ jal Math_SmoothScaleMaxMinF - -/* 04FD4 808C6164 E7A00010 */ swc1 $f0, 0x0010($sp) + +/* 04FD4 808C6164 E7A00010 */ swc1 $f0, 0x0010($sp) /* 04FD8 808C6168 860301DA */ lh $v1, 0x01DA($s0) ## 000001DA -/* 04FDC 808C616C 286102C6 */ slti $at, $v1, 0x02C6 -/* 04FE0 808C6170 142000C7 */ bne $at, $zero, .L808C6490 +/* 04FDC 808C616C 286102C6 */ slti $at, $v1, 0x02C6 +/* 04FE0 808C6170 142000C7 */ bne $at, $zero, .L808C6490 /* 04FE4 808C6174 240102C6 */ addiu $at, $zero, 0x02C6 ## $at = 000002C6 -/* 04FE8 808C6178 14610035 */ bne $v1, $at, .L808C6250 +/* 04FE8 808C6178 14610035 */ bne $v1, $at, .L808C6250 /* 04FEC 808C617C 27A400F4 */ addiu $a0, $sp, 0x00F4 ## $a0 = FFFFFF54 /* 04FF0 808C6180 3C0A808D */ lui $t2, %hi(D_808CA498) ## $t2 = 808D0000 /* 04FF4 808C6184 27A30124 */ addiu $v1, $sp, 0x0124 ## $v1 = FFFFFF84 @@ -852,7 +852,7 @@ glabel L808C5FE4 /* 05014 808C61A4 8D4BFFF8 */ lw $t3, -0x0008($t2) ## 808CA49C /* 05018 808C61A8 ADABFFF8 */ sw $t3, -0x0008($t5) ## FFFFFF88 /* 0501C 808C61AC 8D4CFFFC */ lw $t4, -0x0004($t2) ## 808CA4A0 -/* 05020 808C61B0 154EFFF8 */ bne $t2, $t6, .L808C6194 +/* 05020 808C61B0 154EFFF8 */ bne $t2, $t6, .L808C6194 /* 05024 808C61B4 ADACFFFC */ sw $t4, -0x0004($t5) ## FFFFFF8C /* 05028 808C61B8 3C0F808D */ lui $t7, %hi(D_808CA4C8) ## $t7 = 808D0000 /* 0502C 808C61BC 25EFA4C8 */ addiu $t7, $t7, %lo(D_808CA4C8) ## $t7 = 808CA4C8 @@ -866,39 +866,39 @@ glabel L808C5FE4 /* 05048 808C61D8 8DF8FFF8 */ lw $t8, -0x0008($t7) ## 808CA4CC /* 0504C 808C61DC AD18FFF8 */ sw $t8, -0x0008($t0) ## FFFFFF58 /* 05050 808C61E0 8DF9FFFC */ lw $t9, -0x0004($t7) ## 808CA4D0 -/* 05054 808C61E4 15E9FFF8 */ bne $t7, $t1, .L808C61C8 +/* 05054 808C61E4 15E9FFF8 */ bne $t7, $t1, .L808C61C8 /* 05058 808C61E8 AD19FFFC */ sw $t9, -0x0004($t0) ## FFFFFF5C /* 0505C 808C61EC 860A01A2 */ lh $t2, 0x01A2($s0) ## 000001A2 /* 05060 808C61F0 240E0001 */ addiu $t6, $zero, 0x0001 ## $t6 = 00000001 /* 05064 808C61F4 A60E01C6 */ sh $t6, 0x01C6($s0) ## 000001C6 -/* 05068 808C61F8 55400008 */ bnel $t2, $zero, .L808C621C +/* 05068 808C61F8 55400008 */ bnel $t2, $zero, .L808C621C /* 0506C 808C61FC 860C01A0 */ lh $t4, 0x01A0($s0) ## 000001A0 /* 05070 808C6200 860D01A0 */ lh $t5, 0x01A0($s0) ## 000001A0 -/* 05074 808C6204 000D5880 */ sll $t3, $t5, 2 -/* 05078 808C6208 016D5823 */ subu $t3, $t3, $t5 -/* 0507C 808C620C 000B5880 */ sll $t3, $t3, 2 -/* 05080 808C6210 10000006 */ beq $zero, $zero, .L808C622C -/* 05084 808C6214 006B1021 */ addu $v0, $v1, $t3 +/* 05074 808C6204 000D5880 */ sll $t3, $t5, 2 +/* 05078 808C6208 016D5823 */ subu $t3, $t3, $t5 +/* 0507C 808C620C 000B5880 */ sll $t3, $t3, 2 +/* 05080 808C6210 10000006 */ beq $zero, $zero, .L808C622C +/* 05084 808C6214 006B1021 */ addu $v0, $v1, $t3 /* 05088 808C6218 860C01A0 */ lh $t4, 0x01A0($s0) ## 000001A0 .L808C621C: -/* 0508C 808C621C 000C4880 */ sll $t1, $t4, 2 -/* 05090 808C6220 012C4823 */ subu $t1, $t1, $t4 -/* 05094 808C6224 00094880 */ sll $t1, $t1, 2 -/* 05098 808C6228 00891021 */ addu $v0, $a0, $t1 +/* 0508C 808C621C 000C4880 */ sll $t1, $t4, 2 +/* 05090 808C6220 012C4823 */ subu $t1, $t1, $t4 +/* 05094 808C6224 00094880 */ sll $t1, $t1, 2 +/* 05098 808C6228 00891021 */ addu $v0, $a0, $t1 .L808C622C: /* 0509C 808C622C C4480000 */ lwc1 $f8, 0x0000($v0) ## 00000000 -/* 050A0 808C6230 8FAF0160 */ lw $t7, 0x0160($sp) +/* 050A0 808C6230 8FAF0160 */ lw $t7, 0x0160($sp) /* 050A4 808C6234 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 /* 050A8 808C6238 E5E80024 */ swc1 $f8, 0x0024($t7) ## 808CA4F8 -/* 050AC 808C623C 8FA80160 */ lw $t0, 0x0160($sp) +/* 050AC 808C623C 8FA80160 */ lw $t0, 0x0160($sp) /* 050B0 808C6240 C44A0008 */ lwc1 $f10, 0x0008($v0) ## 00000008 /* 050B4 808C6244 E50A002C */ swc1 $f10, 0x002C($t0) ## FFFFFF8C /* 050B8 808C6248 860301DA */ lh $v1, 0x01DA($s0) ## 000001DA /* 050BC 808C624C E6000204 */ swc1 $f0, 0x0204($s0) ## 00000204 .L808C6250: /* 050C0 808C6250 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 050C4 808C6254 28610375 */ slti $at, $v1, 0x0375 -/* 050C8 808C6258 1420000A */ bne $at, $zero, .L808C6284 +/* 050C4 808C6254 28610375 */ slti $at, $v1, 0x0375 +/* 050C8 808C6258 1420000A */ bne $at, $zero, .L808C6284 /* 050CC 808C625C 26040228 */ addiu $a0, $s0, 0x0228 ## $a0 = 00000228 /* 050D0 808C6260 3C063E4C */ lui $a2, 0x3E4C ## $a2 = 3E4C0000 /* 050D4 808C6264 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3E4CCCCD @@ -906,9 +906,9 @@ glabel L808C5FE4 /* 050DC 808C626C 3C054348 */ lui $a1, 0x4348 ## $a1 = 43480000 /* 050E0 808C6270 3C0742C8 */ lui $a3, 0x42C8 ## $a3 = 42C80000 /* 050E4 808C6274 0C01E0C4 */ jal Math_SmoothScaleMaxMinF - -/* 050E8 808C6278 E7A00010 */ swc1 $f0, 0x0010($sp) -/* 050EC 808C627C 10000008 */ beq $zero, $zero, .L808C62A0 + +/* 050E8 808C6278 E7A00010 */ swc1 $f0, 0x0010($sp) +/* 050EC 808C627C 10000008 */ beq $zero, $zero, .L808C62A0 /* 050F0 808C6280 00000000 */ nop .L808C6284: /* 050F4 808C6284 3C05C5CE */ lui $a1, 0xC5CE ## $a1 = C5CE0000 @@ -917,8 +917,8 @@ glabel L808C5FE4 /* 05100 808C6290 34A54000 */ ori $a1, $a1, 0x4000 ## $a1 = C5CE4000 /* 05104 808C6294 3C0741F0 */ lui $a3, 0x41F0 ## $a3 = 41F00000 /* 05108 808C6298 0C01E0C4 */ jal Math_SmoothScaleMaxMinF - -/* 0510C 808C629C E7A00010 */ swc1 $f0, 0x0010($sp) + +/* 0510C 808C629C E7A00010 */ swc1 $f0, 0x0010($sp) .L808C62A0: /* 05110 808C62A0 3C19808D */ lui $t9, %hi(D_808CA4F8) ## $t9 = 808D0000 /* 05114 808C62A4 2739A4F8 */ addiu $t9, $t9, %lo(D_808CA4F8) ## $t9 = 808CA4F8 @@ -936,26 +936,26 @@ glabel L808C5FE4 /* 05144 808C62D4 44816000 */ mtc1 $at, $f12 ## $f12 = 120.00 /* 05148 808C62D8 ADAC0004 */ sw $t4, 0x0004($t5) ## FFFFFF40 /* 0514C 808C62DC 0C00CFC8 */ jal Math_Rand_CenteredFloat - + /* 05150 808C62E0 ADA90000 */ sw $t1, 0x0000($t5) ## FFFFFF3C /* 05154 808C62E4 C6120038 */ lwc1 $f18, 0x0038($s0) ## 00000038 /* 05158 808C62E8 3C014248 */ lui $at, 0x4248 ## $at = 42480000 /* 0515C 808C62EC 44816000 */ mtc1 $at, $f12 ## $f12 = 50.00 -/* 05160 808C62F0 46120100 */ add.s $f4, $f0, $f18 +/* 05160 808C62F0 46120100 */ add.s $f4, $f0, $f18 /* 05164 808C62F4 0C00CFBE */ jal Math_Rand_ZeroFloat - -/* 05168 808C62F8 E7A40168 */ swc1 $f4, 0x0168($sp) + +/* 05168 808C62F8 E7A40168 */ swc1 $f4, 0x0168($sp) /* 0516C 808C62FC C6060028 */ lwc1 $f6, 0x0028($s0) ## 00000028 /* 05170 808C6300 3C0142F0 */ lui $at, 0x42F0 ## $at = 42F00000 /* 05174 808C6304 44816000 */ mtc1 $at, $f12 ## $f12 = 120.00 -/* 05178 808C6308 46060200 */ add.s $f8, $f0, $f6 +/* 05178 808C6308 46060200 */ add.s $f8, $f0, $f6 /* 0517C 808C630C 0C00CFC8 */ jal Math_Rand_CenteredFloat - -/* 05180 808C6310 E7A8016C */ swc1 $f8, 0x016C($sp) + +/* 05180 808C6310 E7A8016C */ swc1 $f8, 0x016C($sp) /* 05184 808C6314 C60A0040 */ lwc1 $f10, 0x0040($s0) ## 00000040 /* 05188 808C6318 3C0F808D */ lui $t7, %hi(D_808CA588) ## $t7 = 808D0000 /* 0518C 808C631C 3C08808D */ lui $t0, %hi(D_808CA58C) ## $t0 = 808D0000 -/* 05190 808C6320 460A0480 */ add.s $f18, $f0, $f10 +/* 05190 808C6320 460A0480 */ add.s $f18, $f0, $f10 /* 05194 808C6324 2508A58C */ addiu $t0, $t0, %lo(D_808CA58C) ## $t0 = 808CA58C /* 05198 808C6328 25EFA588 */ addiu $t7, $t7, %lo(D_808CA588) ## $t7 = 808CA588 /* 0519C 808C632C 3C06808D */ lui $a2, %hi(D_808CA570) ## $a2 = 808D0000 @@ -963,198 +963,198 @@ glabel L808C5FE4 /* 051A4 808C6334 241801F4 */ addiu $t8, $zero, 0x01F4 ## $t8 = 000001F4 /* 051A8 808C6338 2419000A */ addiu $t9, $zero, 0x000A ## $t9 = 0000000A /* 051AC 808C633C 240E000A */ addiu $t6, $zero, 0x000A ## $t6 = 0000000A -/* 051B0 808C6340 E7B20170 */ swc1 $f18, 0x0170($sp) -/* 051B4 808C6344 AFAE0020 */ sw $t6, 0x0020($sp) -/* 051B8 808C6348 AFB9001C */ sw $t9, 0x001C($sp) -/* 051BC 808C634C AFB80018 */ sw $t8, 0x0018($sp) +/* 051B0 808C6340 E7B20170 */ swc1 $f18, 0x0170($sp) +/* 051B4 808C6344 AFAE0020 */ sw $t6, 0x0020($sp) +/* 051B8 808C6348 AFB9001C */ sw $t9, 0x001C($sp) +/* 051BC 808C634C AFB80018 */ sw $t8, 0x0018($sp) /* 051C0 808C6350 24E7A57C */ addiu $a3, $a3, %lo(D_808CA57C) ## $a3 = 808CA57C /* 051C4 808C6354 24C6A570 */ addiu $a2, $a2, %lo(D_808CA570) ## $a2 = 808CA570 -/* 051C8 808C6358 AFAF0010 */ sw $t7, 0x0010($sp) -/* 051CC 808C635C AFA80014 */ sw $t0, 0x0014($sp) -/* 051D0 808C6360 8FA401A4 */ lw $a0, 0x01A4($sp) -/* 051D4 808C6364 0C00A0DB */ jal func_8002836C +/* 051C8 808C6358 AFAF0010 */ sw $t7, 0x0010($sp) +/* 051CC 808C635C AFA80014 */ sw $t0, 0x0014($sp) +/* 051D0 808C6360 8FA401A4 */ lw $a0, 0x01A4($sp) +/* 051D4 808C6364 0C00A0DB */ jal func_8002836C /* 051D8 808C6368 27A50168 */ addiu $a1, $sp, 0x0168 ## $a1 = FFFFFFC8 /* 051DC 808C636C 3C0142F0 */ lui $at, 0x42F0 ## $at = 42F00000 /* 051E0 808C6370 44816000 */ mtc1 $at, $f12 ## $f12 = 120.00 /* 051E4 808C6374 0C00CFC8 */ jal Math_Rand_CenteredFloat - + /* 051E8 808C6378 00000000 */ nop /* 051EC 808C637C C6040038 */ lwc1 $f4, 0x0038($s0) ## 00000038 /* 051F0 808C6380 3C01808D */ lui $at, %hi(D_808CA7AC) ## $at = 808D0000 -/* 051F4 808C6384 C428A7AC */ lwc1 $f8, %lo(D_808CA7AC)($at) -/* 051F8 808C6388 46040180 */ add.s $f6, $f0, $f4 +/* 051F4 808C6384 C428A7AC */ lwc1 $f8, %lo(D_808CA7AC)($at) +/* 051F8 808C6388 46040180 */ add.s $f6, $f0, $f4 /* 051FC 808C638C 3C0142F0 */ lui $at, 0x42F0 ## $at = 42F00000 /* 05200 808C6390 44816000 */ mtc1 $at, $f12 ## $f12 = 120.00 -/* 05204 808C6394 E7A8016C */ swc1 $f8, 0x016C($sp) +/* 05204 808C6394 E7A8016C */ swc1 $f8, 0x016C($sp) /* 05208 808C6398 0C00CFC8 */ jal Math_Rand_CenteredFloat - -/* 0520C 808C639C E7A60168 */ swc1 $f6, 0x0168($sp) + +/* 0520C 808C639C E7A60168 */ swc1 $f6, 0x0168($sp) /* 05210 808C63A0 C60A0040 */ lwc1 $f10, 0x0040($s0) ## 00000040 -/* 05214 808C63A4 460A0480 */ add.s $f18, $f0, $f10 +/* 05214 808C63A4 460A0480 */ add.s $f18, $f0, $f10 /* 05218 808C63A8 0C03F66B */ jal Math_Rand_ZeroOne ## Rand.Next() float -/* 0521C 808C63AC E7B20170 */ swc1 $f18, 0x0170($sp) +/* 0521C 808C63AC E7B20170 */ swc1 $f18, 0x0170($sp) /* 05220 808C63B0 3C01808D */ lui $at, %hi(D_808CA7B0) ## $at = 808D0000 -/* 05224 808C63B4 C424A7B0 */ lwc1 $f4, %lo(D_808CA7B0)($at) -/* 05228 808C63B8 46040182 */ mul.s $f6, $f0, $f4 -/* 0522C 808C63BC 4600320D */ trunc.w.s $f8, $f6 -/* 05230 808C63C0 44034000 */ mfc1 $v1, $f8 +/* 05224 808C63B4 C424A7B0 */ lwc1 $f4, %lo(D_808CA7B0)($at) +/* 05228 808C63B8 46040182 */ mul.s $f6, $f0, $f4 +/* 0522C 808C63BC 4600320D */ trunc.w.s $f8, $f6 +/* 05230 808C63C0 44034000 */ mfc1 $v1, $f8 /* 05234 808C63C4 00000000 */ nop -/* 05238 808C63C8 00031C00 */ sll $v1, $v1, 16 -/* 0523C 808C63CC 00031C03 */ sra $v1, $v1, 16 +/* 05238 808C63C8 00031C00 */ sll $v1, $v1, 16 +/* 0523C 808C63CC 00031C03 */ sra $v1, $v1, 16 /* 05240 808C63D0 0C03F66B */ jal Math_Rand_ZeroOne ## Rand.Next() float -/* 05244 808C63D4 A7A300EE */ sh $v1, 0x00EE($sp) +/* 05244 808C63D4 A7A300EE */ sh $v1, 0x00EE($sp) /* 05248 808C63D8 3C0142C8 */ lui $at, 0x42C8 ## $at = 42C80000 /* 0524C 808C63DC 44815000 */ mtc1 $at, $f10 ## $f10 = 100.00 -/* 05250 808C63E0 87A300EE */ lh $v1, 0x00EE($sp) +/* 05250 808C63E0 87A300EE */ lh $v1, 0x00EE($sp) /* 05254 808C63E4 2409000A */ addiu $t1, $zero, 0x000A ## $t1 = 0000000A -/* 05258 808C63E8 460A0482 */ mul.s $f18, $f0, $f10 -/* 0525C 808C63EC 00036080 */ sll $t4, $v1, 2 -/* 05260 808C63F0 01836021 */ addu $t4, $t4, $v1 -/* 05264 808C63F4 012C7823 */ subu $t7, $t1, $t4 +/* 05258 808C63E8 460A0482 */ mul.s $f18, $f0, $f10 +/* 0525C 808C63EC 00036080 */ sll $t4, $v1, 2 +/* 05260 808C63F0 01836021 */ addu $t4, $t4, $v1 +/* 05264 808C63F4 012C7823 */ subu $t7, $t1, $t4 /* 05268 808C63F8 27AD00E4 */ addiu $t5, $sp, 0x00E4 ## $t5 = FFFFFF44 /* 0526C 808C63FC 27AB00DC */ addiu $t3, $sp, 0x00DC ## $t3 = FFFFFF3C -/* 05270 808C6400 00031080 */ sll $v0, $v1, 2 -/* 05274 808C6404 4600910D */ trunc.w.s $f4, $f18 -/* 05278 808C6408 004D3021 */ addu $a2, $v0, $t5 -/* 0527C 808C640C 004B3821 */ addu $a3, $v0, $t3 -/* 05280 808C6410 AFAF0010 */ sw $t7, 0x0010($sp) -/* 05284 808C6414 44182000 */ mfc1 $t8, $f4 -/* 05288 808C6418 8FA401A4 */ lw $a0, 0x01A4($sp) +/* 05270 808C6400 00031080 */ sll $v0, $v1, 2 +/* 05274 808C6404 4600910D */ trunc.w.s $f4, $f18 +/* 05278 808C6408 004D3021 */ addu $a2, $v0, $t5 +/* 0527C 808C640C 004B3821 */ addu $a3, $v0, $t3 +/* 05280 808C6410 AFAF0010 */ sw $t7, 0x0010($sp) +/* 05284 808C6414 44182000 */ mfc1 $t8, $f4 +/* 05288 808C6418 8FA401A4 */ lw $a0, 0x01A4($sp) /* 0528C 808C641C 27A50168 */ addiu $a1, $sp, 0x0168 ## $a1 = FFFFFFC8 -/* 05290 808C6420 0018CC00 */ sll $t9, $t8, 16 -/* 05294 808C6424 00197403 */ sra $t6, $t9, 16 +/* 05290 808C6420 0018CC00 */ sll $t9, $t8, 16 +/* 05294 808C6424 00197403 */ sra $t6, $t9, 16 /* 05298 808C6428 25CA0064 */ addiu $t2, $t6, 0x0064 ## $t2 = 00000064 -/* 0529C 808C642C AFAA0018 */ sw $t2, 0x0018($sp) -/* 052A0 808C6430 0C00A6E4 */ jal func_80029B90 -/* 052A4 808C6434 AFA30014 */ sw $v1, 0x0014($sp) -/* 052A8 808C6438 10000016 */ beq $zero, $zero, .L808C6494 +/* 0529C 808C642C AFAA0018 */ sw $t2, 0x0018($sp) +/* 052A0 808C6430 0C00A6E4 */ jal func_80029B90 +/* 052A4 808C6434 AFA30014 */ sw $v1, 0x0014($sp) +/* 052A8 808C6438 10000016 */ beq $zero, $zero, .L808C6494 /* 052AC 808C643C 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 .L808C6440: /* 052B0 808C6440 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 052B4 808C6444 2405304E */ addiu $a1, $zero, 0x304E ## $a1 = 0000304E /* 052B8 808C6448 860D019E */ lh $t5, 0x019E($s0) ## 0000019E -/* 052BC 808C644C 8FA401A4 */ lw $a0, 0x01A4($sp) +/* 052BC 808C644C 8FA401A4 */ lw $a0, 0x01A4($sp) /* 052C0 808C6450 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 052C4 808C6454 31AB0001 */ andi $t3, $t5, 0x0001 ## $t3 = 00000000 -/* 052C8 808C6458 1560000D */ bne $t3, $zero, .L808C6490 +/* 052C8 808C6458 1560000D */ bne $t3, $zero, .L808C6490 /* 052CC 808C645C 26060024 */ addiu $a2, $s0, 0x0024 ## $a2 = 00000024 /* 052D0 808C6460 3C014100 */ lui $at, 0x4100 ## $at = 41000000 /* 052D4 808C6464 44813000 */ mtc1 $at, $f6 ## $f6 = 8.00 /* 052D8 808C6468 24090003 */ addiu $t1, $zero, 0x0003 ## $t1 = 00000003 /* 052DC 808C646C 240C01F4 */ addiu $t4, $zero, 0x01F4 ## $t4 = 000001F4 /* 052E0 808C6470 240F000A */ addiu $t7, $zero, 0x000A ## $t7 = 0000000A -/* 052E4 808C6474 AFAF001C */ sw $t7, 0x001C($sp) -/* 052E8 808C6478 AFAC0018 */ sw $t4, 0x0018($sp) -/* 052EC 808C647C AFA90010 */ sw $t1, 0x0010($sp) +/* 052E4 808C6474 AFAF001C */ sw $t7, 0x001C($sp) +/* 052E8 808C6478 AFAC0018 */ sw $t4, 0x0018($sp) +/* 052EC 808C647C AFA90010 */ sw $t1, 0x0010($sp) /* 052F0 808C6480 3C074220 */ lui $a3, 0x4220 ## $a3 = 42200000 -/* 052F4 808C6484 AFA00020 */ sw $zero, 0x0020($sp) -/* 052F8 808C6488 0C00CC98 */ jal func_80033260 -/* 052FC 808C648C E7A60014 */ swc1 $f6, 0x0014($sp) +/* 052F4 808C6484 AFA00020 */ sw $zero, 0x0020($sp) +/* 052F8 808C6488 0C00CC98 */ jal func_80033260 +/* 052FC 808C648C E7A60014 */ swc1 $f6, 0x0014($sp) .L808C6490: /* 05300 808C6490 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 .L808C6494: /* 05304 808C6494 3C063E4C */ lui $a2, 0x3E4C ## $a2 = 3E4C0000 /* 05308 808C6498 3C073DCC */ lui $a3, 0x3DCC ## $a3 = 3DCC0000 -/* 0530C 808C649C 44050000 */ mfc1 $a1, $f0 +/* 0530C 808C649C 44050000 */ mfc1 $a1, $f0 /* 05310 808C64A0 34E7CCCD */ ori $a3, $a3, 0xCCCD ## $a3 = 3DCCCCCD /* 05314 808C64A4 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3E4CCCCD /* 05318 808C64A8 26040068 */ addiu $a0, $s0, 0x0068 ## $a0 = 00000068 /* 0531C 808C64AC 0C01E0C4 */ jal Math_SmoothScaleMaxMinF - -/* 05320 808C64B0 E7A00010 */ swc1 $f0, 0x0010($sp) + +/* 05320 808C64B0 E7A00010 */ swc1 $f0, 0x0010($sp) /* 05324 808C64B4 C6020238 */ lwc1 $f2, 0x0238($s0) ## 00000238 /* 05328 808C64B8 C60A0234 */ lwc1 $f10, 0x0234($s0) ## 00000234 /* 0532C 808C64BC 86080032 */ lh $t0, 0x0032($s0) ## 00000032 -/* 05330 808C64C0 4600120D */ trunc.w.s $f8, $f2 +/* 05330 808C64C0 4600120D */ trunc.w.s $f8, $f2 /* 05334 808C64C4 860B01C4 */ lh $t3, 0x01C4($s0) ## 000001C4 /* 05338 808C64C8 860E01DA */ lh $t6, 0x01DA($s0) ## 000001DA -/* 0533C 808C64CC 4600548D */ trunc.w.s $f18, $f10 -/* 05340 808C64D0 440A4000 */ mfc1 $t2, $f8 -/* 05344 808C64D4 29C10367 */ slti $at, $t6, 0x0367 +/* 0533C 808C64CC 4600548D */ trunc.w.s $f18, $f10 +/* 05340 808C64D0 440A4000 */ mfc1 $t2, $f8 +/* 05344 808C64D4 29C10367 */ slti $at, $t6, 0x0367 /* 05348 808C64D8 26040238 */ addiu $a0, $s0, 0x0238 ## $a0 = 00000238 -/* 0534C 808C64DC 44189000 */ mfc1 $t8, $f18 -/* 05350 808C64E0 010A6821 */ addu $t5, $t0, $t2 +/* 0534C 808C64DC 44189000 */ mfc1 $t8, $f18 +/* 05350 808C64E0 010A6821 */ addu $t5, $t0, $t2 /* 05354 808C64E4 A60D0032 */ sh $t5, 0x0032($s0) ## 00000032 -/* 05358 808C64E8 0178C821 */ addu $t9, $t3, $t8 -/* 0535C 808C64EC 1420001C */ bne $at, $zero, .L808C6560 +/* 05358 808C64E8 0178C821 */ addu $t9, $t3, $t8 +/* 0535C 808C64EC 1420001C */ bne $at, $zero, .L808C6560 /* 05360 808C64F0 A61901C4 */ sh $t9, 0x01C4($s0) ## 000001C4 /* 05364 808C64F4 860801A2 */ lh $t0, 0x01A2($s0) ## 000001A2 /* 05368 808C64F8 3C01C3E1 */ lui $at, 0xC3E1 ## $at = C3E10000 -/* 0536C 808C64FC 5500000E */ bnel $t0, $zero, .L808C6538 +/* 0536C 808C64FC 5500000E */ bnel $t0, $zero, .L808C6538 /* 05370 808C6500 44815000 */ mtc1 $at, $f10 ## $f10 = -450.00 /* 05374 808C6504 3C0143E1 */ lui $at, 0x43E1 ## $at = 43E10000 /* 05378 808C6508 44812000 */ mtc1 $at, $f4 ## $f4 = 450.00 /* 0537C 808C650C 3C014120 */ lui $at, 0x4120 ## $at = 41200000 -/* 05380 808C6510 4604103C */ c.lt.s $f2, $f4 +/* 05380 808C6510 4604103C */ c.lt.s $f2, $f4 /* 05384 808C6514 00000000 */ nop -/* 05388 808C6518 45020019 */ bc1fl .L808C6580 +/* 05388 808C6518 45020019 */ bc1fl .L808C6580 /* 0538C 808C651C 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 /* 05390 808C6520 44813000 */ mtc1 $at, $f6 ## $f6 = 10.00 /* 05394 808C6524 00000000 */ nop -/* 05398 808C6528 46061200 */ add.s $f8, $f2, $f6 -/* 0539C 808C652C 10000013 */ beq $zero, $zero, .L808C657C +/* 05398 808C6528 46061200 */ add.s $f8, $f2, $f6 +/* 0539C 808C652C 10000013 */ beq $zero, $zero, .L808C657C /* 053A0 808C6530 E6080238 */ swc1 $f8, 0x0238($s0) ## 00000238 /* 053A4 808C6534 44815000 */ mtc1 $at, $f10 ## $f10 = 10.00 .L808C6538: /* 053A8 808C6538 3C014120 */ lui $at, 0x4120 ## $at = 41200000 -/* 053AC 808C653C 4602503C */ c.lt.s $f10, $f2 +/* 053AC 808C653C 4602503C */ c.lt.s $f10, $f2 /* 053B0 808C6540 00000000 */ nop -/* 053B4 808C6544 4502000E */ bc1fl .L808C6580 +/* 053B4 808C6544 4502000E */ bc1fl .L808C6580 /* 053B8 808C6548 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 /* 053BC 808C654C 44819000 */ mtc1 $at, $f18 ## $f18 = 10.00 /* 053C0 808C6550 00000000 */ nop -/* 053C4 808C6554 46121101 */ sub.s $f4, $f2, $f18 -/* 053C8 808C6558 10000008 */ beq $zero, $zero, .L808C657C +/* 053C4 808C6554 46121101 */ sub.s $f4, $f2, $f18 +/* 053C8 808C6558 10000008 */ beq $zero, $zero, .L808C657C /* 053CC 808C655C E6040238 */ swc1 $f4, 0x0238($s0) ## 00000238 .L808C6560: /* 053D0 808C6560 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 /* 053D4 808C6564 3C063D4C */ lui $a2, 0x3D4C ## $a2 = 3D4C0000 /* 053D8 808C6568 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3D4CCCCD -/* 053DC 808C656C 44050000 */ mfc1 $a1, $f0 +/* 053DC 808C656C 44050000 */ mfc1 $a1, $f0 /* 053E0 808C6570 3C074220 */ lui $a3, 0x4220 ## $a3 = 42200000 /* 053E4 808C6574 0C01E0C4 */ jal Math_SmoothScaleMaxMinF - -/* 053E8 808C6578 E7A00010 */ swc1 $f0, 0x0010($sp) + +/* 053E8 808C6578 E7A00010 */ swc1 $f0, 0x0010($sp) .L808C657C: /* 053EC 808C657C 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 .L808C6580: /* 053F0 808C6580 3C063E4C */ lui $a2, 0x3E4C ## $a2 = 3E4C0000 /* 053F4 808C6584 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3E4CCCCD -/* 053F8 808C6588 44050000 */ mfc1 $a1, $f0 +/* 053F8 808C6588 44050000 */ mfc1 $a1, $f0 /* 053FC 808C658C 26040234 */ addiu $a0, $s0, 0x0234 ## $a0 = 00000234 /* 05400 808C6590 3C074188 */ lui $a3, 0x4188 ## $a3 = 41880000 /* 05404 808C6594 0C01E0C4 */ jal Math_SmoothScaleMaxMinF - -/* 05408 808C6598 E7A00010 */ swc1 $f0, 0x0010($sp) + +/* 05408 808C6598 E7A00010 */ swc1 $f0, 0x0010($sp) /* 0540C 808C659C 44803000 */ mtc1 $zero, $f6 ## $f6 = 0.00 /* 05410 808C65A0 26040434 */ addiu $a0, $s0, 0x0434 ## $a0 = 00000434 /* 05414 808C65A4 8E050024 */ lw $a1, 0x0024($s0) ## 00000024 /* 05418 808C65A8 3C063E4C */ lui $a2, 0x3E4C ## $a2 = 3E4C0000 /* 0541C 808C65AC 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3E4CCCCD -/* 05420 808C65B0 AFA40048 */ sw $a0, 0x0048($sp) +/* 05420 808C65B0 AFA40048 */ sw $a0, 0x0048($sp) /* 05424 808C65B4 3C0741F0 */ lui $a3, 0x41F0 ## $a3 = 41F00000 /* 05428 808C65B8 0C01E0C4 */ jal Math_SmoothScaleMaxMinF - -/* 0542C 808C65BC E7A60010 */ swc1 $f6, 0x0010($sp) + +/* 0542C 808C65BC E7A60010 */ swc1 $f6, 0x0010($sp) /* 05430 808C65C0 3C01428C */ lui $at, 0x428C ## $at = 428C0000 /* 05434 808C65C4 44815000 */ mtc1 $at, $f10 ## $f10 = 70.00 /* 05438 808C65C8 C6080028 */ lwc1 $f8, 0x0028($s0) ## 00000028 /* 0543C 808C65CC 3C014302 */ lui $at, 0x4302 ## $at = 43020000 /* 05440 808C65D0 44812000 */ mtc1 $at, $f4 ## $f4 = 130.00 -/* 05444 808C65D4 460A4481 */ sub.s $f18, $f8, $f10 +/* 05444 808C65D4 460A4481 */ sub.s $f18, $f8, $f10 /* 05448 808C65D8 44804000 */ mtc1 $zero, $f8 ## $f8 = 0.00 /* 0544C 808C65DC 3C063E4C */ lui $a2, 0x3E4C ## $a2 = 3E4C0000 /* 05450 808C65E0 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3E4CCCCD -/* 05454 808C65E4 46049180 */ add.s $f6, $f18, $f4 +/* 05454 808C65E4 46049180 */ add.s $f6, $f18, $f4 /* 05458 808C65E8 26040438 */ addiu $a0, $s0, 0x0438 ## $a0 = 00000438 /* 0545C 808C65EC 3C0741A0 */ lui $a3, 0x41A0 ## $a3 = 41A00000 -/* 05460 808C65F0 E7A80010 */ swc1 $f8, 0x0010($sp) -/* 05464 808C65F4 44053000 */ mfc1 $a1, $f6 +/* 05460 808C65F0 E7A80010 */ swc1 $f8, 0x0010($sp) +/* 05464 808C65F4 44053000 */ mfc1 $a1, $f6 /* 05468 808C65F8 0C01E0C4 */ jal Math_SmoothScaleMaxMinF - + /* 0546C 808C65FC 00000000 */ nop /* 05470 808C6600 44805000 */ mtc1 $zero, $f10 ## $f10 = 0.00 /* 05474 808C6604 8E05002C */ lw $a1, 0x002C($s0) ## 0000002C @@ -1163,17 +1163,17 @@ glabel L808C5FE4 /* 05480 808C6610 2604043C */ addiu $a0, $s0, 0x043C ## $a0 = 0000043C /* 05484 808C6614 3C0741F0 */ lui $a3, 0x41F0 ## $a3 = 41F00000 /* 05488 808C6618 0C01E0C4 */ jal Math_SmoothScaleMaxMinF - -/* 0548C 808C661C E7AA0010 */ swc1 $f10, 0x0010($sp) + +/* 0548C 808C661C E7AA0010 */ swc1 $f10, 0x0010($sp) /* 05490 808C6620 860A019C */ lh $t2, 0x019C($s0) ## 0000019C /* 05494 808C6624 24010009 */ addiu $at, $zero, 0x0009 ## $at = 00000009 -/* 05498 808C6628 554100B8 */ bnel $t2, $at, .L808C690C +/* 05498 808C6628 554100B8 */ bnel $t2, $at, .L808C690C /* 0549C 808C662C 860A01A2 */ lh $t2, 0x01A2($s0) ## 000001A2 /* 054A0 808C6630 860D01DA */ lh $t5, 0x01DA($s0) ## 000001DA /* 054A4 808C6634 27A300AC */ addiu $v1, $sp, 0x00AC ## $v1 = FFFFFF0C /* 054A8 808C6638 3C09808D */ lui $t1, %hi(D_808CA508) ## $t1 = 808D0000 -/* 054AC 808C663C 29A102C6 */ slti $at, $t5, 0x02C6 -/* 054B0 808C6640 10200064 */ beq $at, $zero, .L808C67D4 +/* 054AC 808C663C 29A102C6 */ slti $at, $t5, 0x02C6 +/* 054B0 808C6640 10200064 */ beq $at, $zero, .L808C67D4 /* 054B4 808C6644 2604022C */ addiu $a0, $s0, 0x022C ## $a0 = 0000022C /* 054B8 808C6648 2529A508 */ addiu $t1, $t1, %lo(D_808CA508) ## $t1 = 808CA508 /* 054BC 808C664C 27A4007C */ addiu $a0, $sp, 0x007C ## $a0 = FFFFFEDC @@ -1187,7 +1187,7 @@ glabel L808C5FE4 /* 054D8 808C6668 8D2CFFF8 */ lw $t4, -0x0008($t1) ## 808CA50C /* 054DC 808C666C AD6CFFF8 */ sw $t4, -0x0008($t3) ## FFFFFF10 /* 054E0 808C6670 8D2FFFFC */ lw $t7, -0x0004($t1) ## 808CA510 -/* 054E4 808C6674 1538FFF8 */ bne $t1, $t8, .L808C6658 +/* 054E4 808C6674 1538FFF8 */ bne $t1, $t8, .L808C6658 /* 054E8 808C6678 AD6FFFFC */ sw $t7, -0x0004($t3) ## FFFFFF14 /* 054EC 808C667C 3C19808D */ lui $t9, %hi(D_808CA538) ## $t9 = 808D0000 /* 054F0 808C6680 2739A538 */ addiu $t9, $t9, %lo(D_808CA538) ## $t9 = 808CA538 @@ -1201,179 +1201,179 @@ glabel L808C5FE4 /* 0550C 808C669C 8F2EFFF8 */ lw $t6, -0x0008($t9) ## 808CA53C /* 05510 808C66A0 AD4EFFF8 */ sw $t6, -0x0008($t2) ## FFFFFEE0 /* 05514 808C66A4 8F28FFFC */ lw $t0, -0x0004($t9) ## 808CA540 -/* 05518 808C66A8 172DFFF8 */ bne $t9, $t5, .L808C668C +/* 05518 808C66A8 172DFFF8 */ bne $t9, $t5, .L808C668C /* 0551C 808C66AC AD48FFFC */ sw $t0, -0x0004($t2) ## FFFFFEE4 /* 05520 808C66B0 861801A2 */ lh $t8, 0x01A2($s0) ## 000001A2 -/* 05524 808C66B4 57000008 */ bnel $t8, $zero, .L808C66D8 +/* 05524 808C66B4 57000008 */ bnel $t8, $zero, .L808C66D8 /* 05528 808C66B8 860C01A0 */ lh $t4, 0x01A0($s0) ## 000001A0 /* 0552C 808C66BC 860901A0 */ lh $t1, 0x01A0($s0) ## 000001A0 -/* 05530 808C66C0 00095880 */ sll $t3, $t1, 2 -/* 05534 808C66C4 01695823 */ subu $t3, $t3, $t1 -/* 05538 808C66C8 000B5880 */ sll $t3, $t3, 2 -/* 0553C 808C66CC 10000006 */ beq $zero, $zero, .L808C66E8 -/* 05540 808C66D0 006B1021 */ addu $v0, $v1, $t3 +/* 05530 808C66C0 00095880 */ sll $t3, $t1, 2 +/* 05534 808C66C4 01695823 */ subu $t3, $t3, $t1 +/* 05538 808C66C8 000B5880 */ sll $t3, $t3, 2 +/* 0553C 808C66CC 10000006 */ beq $zero, $zero, .L808C66E8 +/* 05540 808C66D0 006B1021 */ addu $v0, $v1, $t3 /* 05544 808C66D4 860C01A0 */ lh $t4, 0x01A0($s0) ## 000001A0 .L808C66D8: -/* 05548 808C66D8 000C7880 */ sll $t7, $t4, 2 -/* 0554C 808C66DC 01EC7823 */ subu $t7, $t7, $t4 -/* 05550 808C66E0 000F7880 */ sll $t7, $t7, 2 -/* 05554 808C66E4 008F1021 */ addu $v0, $a0, $t7 +/* 05548 808C66D8 000C7880 */ sll $t7, $t4, 2 +/* 0554C 808C66DC 01EC7823 */ subu $t7, $t7, $t4 +/* 05550 808C66E0 000F7880 */ sll $t7, $t7, 2 +/* 05554 808C66E4 008F1021 */ addu $v0, $a0, $t7 .L808C66E8: /* 05558 808C66E8 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 /* 0555C 808C66EC 44812000 */ mtc1 $at, $f4 ## $f4 = 20.00 /* 05560 808C66F0 C6120204 */ lwc1 $f18, 0x0204($s0) ## 00000204 /* 05564 808C66F4 44804000 */ mtc1 $zero, $f8 ## $f8 = 0.00 /* 05568 808C66F8 8C450000 */ lw $a1, 0x0000($v0) ## 00000000 -/* 0556C 808C66FC 46049182 */ mul.s $f6, $f18, $f4 +/* 0556C 808C66FC 46049182 */ mul.s $f6, $f18, $f4 /* 05570 808C6700 26040428 */ addiu $a0, $s0, 0x0428 ## $a0 = 00000428 /* 05574 808C6704 3C063E4C */ lui $a2, 0x3E4C ## $a2 = 3E4C0000 /* 05578 808C6708 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3E4CCCCD -/* 0557C 808C670C AFA4004C */ sw $a0, 0x004C($sp) -/* 05580 808C6710 AFA20078 */ sw $v0, 0x0078($sp) -/* 05584 808C6714 E7A80010 */ swc1 $f8, 0x0010($sp) -/* 05588 808C6718 44073000 */ mfc1 $a3, $f6 +/* 0557C 808C670C AFA4004C */ sw $a0, 0x004C($sp) +/* 05580 808C6710 AFA20078 */ sw $v0, 0x0078($sp) +/* 05584 808C6714 E7A80010 */ swc1 $f8, 0x0010($sp) +/* 05588 808C6718 44073000 */ mfc1 $a3, $f6 /* 0558C 808C671C 0C01E0C4 */ jal Math_SmoothScaleMaxMinF - + /* 05590 808C6720 00000000 */ nop -/* 05594 808C6724 8FAD0160 */ lw $t5, 0x0160($sp) +/* 05594 808C6724 8FAD0160 */ lw $t5, 0x0160($sp) /* 05598 808C6728 3C0141F0 */ lui $at, 0x41F0 ## $at = 41F00000 /* 0559C 808C672C 44819000 */ mtc1 $at, $f18 ## $f18 = 30.00 /* 055A0 808C6730 C5AA0028 */ lwc1 $f10, 0x0028($t5) ## 00000028 /* 055A4 808C6734 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 /* 055A8 808C6738 44814000 */ mtc1 $at, $f8 ## $f8 = 20.00 /* 055AC 808C673C C6060204 */ lwc1 $f6, 0x0204($s0) ## 00000204 -/* 055B0 808C6740 46125100 */ add.s $f4, $f10, $f18 +/* 055B0 808C6740 46125100 */ add.s $f4, $f10, $f18 /* 055B4 808C6744 44809000 */ mtc1 $zero, $f18 ## $f18 = 0.00 -/* 055B8 808C6748 46083282 */ mul.s $f10, $f6, $f8 +/* 055B8 808C6748 46083282 */ mul.s $f10, $f6, $f8 /* 055BC 808C674C 3C063DCC */ lui $a2, 0x3DCC ## $a2 = 3DCC0000 -/* 055C0 808C6750 44052000 */ mfc1 $a1, $f4 +/* 055C0 808C6750 44052000 */ mfc1 $a1, $f4 /* 055C4 808C6754 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3DCCCCCD /* 055C8 808C6758 2604042C */ addiu $a0, $s0, 0x042C ## $a0 = 0000042C -/* 055CC 808C675C E7B20010 */ swc1 $f18, 0x0010($sp) -/* 055D0 808C6760 44075000 */ mfc1 $a3, $f10 +/* 055CC 808C675C E7B20010 */ swc1 $f18, 0x0010($sp) +/* 055D0 808C6760 44075000 */ mfc1 $a3, $f10 /* 055D4 808C6764 0C01E0C4 */ jal Math_SmoothScaleMaxMinF - + /* 055D8 808C6768 00000000 */ nop /* 055DC 808C676C 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 /* 055E0 808C6770 44813000 */ mtc1 $at, $f6 ## $f6 = 20.00 /* 055E4 808C6774 C6040204 */ lwc1 $f4, 0x0204($s0) ## 00000204 -/* 055E8 808C6778 8FA20078 */ lw $v0, 0x0078($sp) +/* 055E8 808C6778 8FA20078 */ lw $v0, 0x0078($sp) /* 055EC 808C677C 44805000 */ mtc1 $zero, $f10 ## $f10 = 0.00 -/* 055F0 808C6780 46062202 */ mul.s $f8, $f4, $f6 +/* 055F0 808C6780 46062202 */ mul.s $f8, $f4, $f6 /* 055F4 808C6784 3C063DCC */ lui $a2, 0x3DCC ## $a2 = 3DCC0000 /* 055F8 808C6788 8C450008 */ lw $a1, 0x0008($v0) ## 00000008 /* 055FC 808C678C 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3DCCCCCD /* 05600 808C6790 26040430 */ addiu $a0, $s0, 0x0430 ## $a0 = 00000430 -/* 05604 808C6794 E7AA0010 */ swc1 $f10, 0x0010($sp) -/* 05608 808C6798 44074000 */ mfc1 $a3, $f8 +/* 05604 808C6794 E7AA0010 */ swc1 $f10, 0x0010($sp) +/* 05608 808C6798 44074000 */ mfc1 $a3, $f8 /* 0560C 808C679C 0C01E0C4 */ jal Math_SmoothScaleMaxMinF - + /* 05610 808C67A0 00000000 */ nop /* 05614 808C67A4 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 /* 05618 808C67A8 44811000 */ mtc1 $at, $f2 ## $f2 = 1.00 /* 0561C 808C67AC 44809000 */ mtc1 $zero, $f18 ## $f18 = 0.00 /* 05620 808C67B0 3C073CA3 */ lui $a3, 0x3CA3 ## $a3 = 3CA30000 -/* 05624 808C67B4 44051000 */ mfc1 $a1, $f2 -/* 05628 808C67B8 44061000 */ mfc1 $a2, $f2 +/* 05624 808C67B4 44051000 */ mfc1 $a1, $f2 +/* 05628 808C67B8 44061000 */ mfc1 $a2, $f2 /* 0562C 808C67BC 34E7D70A */ ori $a3, $a3, 0xD70A ## $a3 = 3CA3D70A /* 05630 808C67C0 26040204 */ addiu $a0, $s0, 0x0204 ## $a0 = 00000204 /* 05634 808C67C4 0C01E0C4 */ jal Math_SmoothScaleMaxMinF - -/* 05638 808C67C8 E7B20010 */ swc1 $f18, 0x0010($sp) -/* 0563C 808C67CC 1000008C */ beq $zero, $zero, .L808C6A00 + +/* 05638 808C67C8 E7B20010 */ swc1 $f18, 0x0010($sp) +/* 0563C 808C67CC 1000008C */ beq $zero, $zero, .L808C6A00 /* 05640 808C67D0 860301DA */ lh $v1, 0x01DA($s0) ## 000001DA .L808C67D4: /* 05644 808C67D4 861901A2 */ lh $t9, 0x01A2($s0) ## 000001A2 /* 05648 808C67D8 3C01808D */ lui $at, %hi(D_808CA7B8) ## $at = 808D0000 -/* 0564C 808C67DC 57200008 */ bnel $t9, $zero, .L808C6800 +/* 0564C 808C67DC 57200008 */ bnel $t9, $zero, .L808C6800 /* 05650 808C67E0 C60A0230 */ lwc1 $f10, 0x0230($s0) ## 00000230 /* 05654 808C67E4 3C01808D */ lui $at, %hi(D_808CA7B4) ## $at = 808D0000 -/* 05658 808C67E8 C426A7B4 */ lwc1 $f6, %lo(D_808CA7B4)($at) +/* 05658 808C67E8 C426A7B4 */ lwc1 $f6, %lo(D_808CA7B4)($at) /* 0565C 808C67EC C6040230 */ lwc1 $f4, 0x0230($s0) ## 00000230 -/* 05660 808C67F0 46062200 */ add.s $f8, $f4, $f6 -/* 05664 808C67F4 10000005 */ beq $zero, $zero, .L808C680C +/* 05660 808C67F0 46062200 */ add.s $f8, $f4, $f6 +/* 05664 808C67F4 10000005 */ beq $zero, $zero, .L808C680C /* 05668 808C67F8 E6080230 */ swc1 $f8, 0x0230($s0) ## 00000230 /* 0566C 808C67FC C60A0230 */ lwc1 $f10, 0x0230($s0) ## 00000230 .L808C6800: -/* 05670 808C6800 C432A7B8 */ lwc1 $f18, %lo(D_808CA7B8)($at) -/* 05674 808C6804 46125101 */ sub.s $f4, $f10, $f18 +/* 05670 808C6800 C432A7B8 */ lwc1 $f18, %lo(D_808CA7B8)($at) +/* 05674 808C6804 46125101 */ sub.s $f4, $f10, $f18 /* 05678 808C6808 E6040230 */ swc1 $f4, 0x0230($s0) ## 00000230 .L808C680C: /* 0567C 808C680C 3C01808D */ lui $at, %hi(D_808CA7BC) ## $at = 808D0000 -/* 05680 808C6810 C420A7BC */ lwc1 $f0, %lo(D_808CA7BC)($at) +/* 05680 808C6810 C420A7BC */ lwc1 $f0, %lo(D_808CA7BC)($at) /* 05684 808C6814 3C05435C */ lui $a1, 0x435C ## $a1 = 435C0000 /* 05688 808C6818 3C0740A0 */ lui $a3, 0x40A0 ## $a3 = 40A00000 -/* 0568C 808C681C 44060000 */ mfc1 $a2, $f0 +/* 0568C 808C681C 44060000 */ mfc1 $a2, $f0 /* 05690 808C6820 0C01E0C4 */ jal Math_SmoothScaleMaxMinF - -/* 05694 808C6824 E7A00010 */ swc1 $f0, 0x0010($sp) + +/* 05694 808C6824 E7A00010 */ swc1 $f0, 0x0010($sp) /* 05698 808C6828 0C0400A4 */ jal sinf - + /* 0569C 808C682C C60C0230 */ lwc1 $f12, 0x0230($s0) ## 00000230 /* 056A0 808C6830 C606022C */ lwc1 $f6, 0x022C($s0) ## 0000022C -/* 056A4 808C6834 46003202 */ mul.s $f8, $f6, $f0 -/* 056A8 808C6838 E7A80180 */ swc1 $f8, 0x0180($sp) +/* 056A4 808C6834 46003202 */ mul.s $f8, $f6, $f0 +/* 056A8 808C6838 E7A80180 */ swc1 $f8, 0x0180($sp) /* 056AC 808C683C 0C041184 */ jal cosf - + /* 056B0 808C6840 C60C0230 */ lwc1 $f12, 0x0230($s0) ## 00000230 /* 056B4 808C6844 C60A022C */ lwc1 $f10, 0x022C($s0) ## 0000022C -/* 056B8 808C6848 C7AC0180 */ lwc1 $f12, 0x0180($sp) +/* 056B8 808C6848 C7AC0180 */ lwc1 $f12, 0x0180($sp) /* 056BC 808C684C C6120024 */ lwc1 $f18, 0x0024($s0) ## 00000024 -/* 056C0 808C6850 46005382 */ mul.s $f14, $f10, $f0 +/* 056C0 808C6850 46005382 */ mul.s $f14, $f10, $f0 /* 056C4 808C6854 44803000 */ mtc1 $zero, $f6 ## $f6 = 0.00 -/* 056C8 808C6858 460C9100 */ add.s $f4, $f18, $f12 +/* 056C8 808C6858 460C9100 */ add.s $f4, $f18, $f12 /* 056CC 808C685C 26040428 */ addiu $a0, $s0, 0x0428 ## $a0 = 00000428 /* 056D0 808C6860 3C063E4C */ lui $a2, 0x3E4C ## $a2 = 3E4C0000 /* 056D4 808C6864 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3E4CCCCD -/* 056D8 808C6868 44052000 */ mfc1 $a1, $f4 -/* 056DC 808C686C AFA4004C */ sw $a0, 0x004C($sp) -/* 056E0 808C6870 E7AE017C */ swc1 $f14, 0x017C($sp) +/* 056D8 808C6868 44052000 */ mfc1 $a1, $f4 +/* 056DC 808C686C AFA4004C */ sw $a0, 0x004C($sp) +/* 056E0 808C6870 E7AE017C */ swc1 $f14, 0x017C($sp) /* 056E4 808C6874 3C074248 */ lui $a3, 0x4248 ## $a3 = 42480000 /* 056E8 808C6878 0C01E0C4 */ jal Math_SmoothScaleMaxMinF - -/* 056EC 808C687C E7A60010 */ swc1 $f6, 0x0010($sp) + +/* 056EC 808C687C E7A60010 */ swc1 $f6, 0x0010($sp) /* 056F0 808C6880 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 /* 056F4 808C6884 44815000 */ mtc1 $at, $f10 ## $f10 = 20.00 /* 056F8 808C6888 C6080028 */ lwc1 $f8, 0x0028($s0) ## 00000028 /* 056FC 808C688C 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 /* 05700 808C6890 3C063E4C */ lui $a2, 0x3E4C ## $a2 = 3E4C0000 -/* 05704 808C6894 460A4480 */ add.s $f18, $f8, $f10 +/* 05704 808C6894 460A4480 */ add.s $f18, $f8, $f10 /* 05708 808C6898 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3E4CCCCD /* 0570C 808C689C 2604042C */ addiu $a0, $s0, 0x042C ## $a0 = 0000042C /* 05710 808C68A0 3C074248 */ lui $a3, 0x4248 ## $a3 = 42480000 -/* 05714 808C68A4 44059000 */ mfc1 $a1, $f18 +/* 05714 808C68A4 44059000 */ mfc1 $a1, $f18 /* 05718 808C68A8 0C01E0C4 */ jal Math_SmoothScaleMaxMinF - -/* 0571C 808C68AC E7A40010 */ swc1 $f4, 0x0010($sp) -/* 05720 808C68B0 C7AE017C */ lwc1 $f14, 0x017C($sp) + +/* 0571C 808C68AC E7A40010 */ swc1 $f4, 0x0010($sp) +/* 05720 808C68B0 C7AE017C */ lwc1 $f14, 0x017C($sp) /* 05724 808C68B4 C606002C */ lwc1 $f6, 0x002C($s0) ## 0000002C /* 05728 808C68B8 44805000 */ mtc1 $zero, $f10 ## $f10 = 0.00 /* 0572C 808C68BC 3C063E4C */ lui $a2, 0x3E4C ## $a2 = 3E4C0000 -/* 05730 808C68C0 460E3200 */ add.s $f8, $f6, $f14 +/* 05730 808C68C0 460E3200 */ add.s $f8, $f6, $f14 /* 05734 808C68C4 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3E4CCCCD /* 05738 808C68C8 26040430 */ addiu $a0, $s0, 0x0430 ## $a0 = 00000430 /* 0573C 808C68CC 3C074248 */ lui $a3, 0x4248 ## $a3 = 42480000 -/* 05740 808C68D0 44054000 */ mfc1 $a1, $f8 +/* 05740 808C68D0 44054000 */ mfc1 $a1, $f8 /* 05744 808C68D4 0C01E0C4 */ jal Math_SmoothScaleMaxMinF - -/* 05748 808C68D8 E7AA0010 */ swc1 $f10, 0x0010($sp) + +/* 05748 808C68D8 E7AA0010 */ swc1 $f10, 0x0010($sp) /* 0574C 808C68DC 44801000 */ mtc1 $zero, $f2 ## $f2 = 0.00 /* 05750 808C68E0 3C063E4C */ lui $a2, 0x3E4C ## $a2 = 3E4C0000 /* 05754 808C68E4 3C073C23 */ lui $a3, 0x3C23 ## $a3 = 3C230000 -/* 05758 808C68E8 44051000 */ mfc1 $a1, $f2 +/* 05758 808C68E8 44051000 */ mfc1 $a1, $f2 /* 0575C 808C68EC 34E7D70A */ ori $a3, $a3, 0xD70A ## $a3 = 3C23D70A /* 05760 808C68F0 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3E4CCCCD /* 05764 808C68F4 2604023C */ addiu $a0, $s0, 0x023C ## $a0 = 0000023C /* 05768 808C68F8 0C01E0C4 */ jal Math_SmoothScaleMaxMinF - -/* 0576C 808C68FC E7A20010 */ swc1 $f2, 0x0010($sp) -/* 05770 808C6900 1000003F */ beq $zero, $zero, .L808C6A00 + +/* 0576C 808C68FC E7A20010 */ swc1 $f2, 0x0010($sp) +/* 05770 808C6900 1000003F */ beq $zero, $zero, .L808C6A00 /* 05774 808C6904 860301DA */ lh $v1, 0x01DA($s0) ## 000001DA /* 05778 808C6908 860A01A2 */ lh $t2, 0x01A2($s0) ## 000001A2 .L808C690C: /* 0577C 808C690C 2604023C */ addiu $a0, $s0, 0x023C ## $a0 = 0000023C /* 05780 808C6910 3C053F00 */ lui $a1, 0x3F00 ## $a1 = 3F000000 -/* 05784 808C6914 1540000C */ bne $t2, $zero, .L808C6948 +/* 05784 808C6914 1540000C */ bne $t2, $zero, .L808C6948 /* 05788 808C6918 3C063E4C */ lui $a2, 0x3E4C ## $a2 = 3E4C0000 /* 0578C 808C691C 44809000 */ mtc1 $zero, $f18 ## $f18 = 0.00 /* 05790 808C6920 3C063E4C */ lui $a2, 0x3E4C ## $a2 = 3E4C0000 @@ -1383,9 +1383,9 @@ glabel L808C5FE4 /* 057A0 808C6930 2604023C */ addiu $a0, $s0, 0x023C ## $a0 = 0000023C /* 057A4 808C6934 3C05BF00 */ lui $a1, 0xBF00 ## $a1 = BF000000 /* 057A8 808C6938 0C01E0C4 */ jal Math_SmoothScaleMaxMinF - -/* 057AC 808C693C E7B20010 */ swc1 $f18, 0x0010($sp) -/* 057B0 808C6940 10000007 */ beq $zero, $zero, .L808C6960 + +/* 057AC 808C693C E7B20010 */ swc1 $f18, 0x0010($sp) +/* 057B0 808C6940 10000007 */ beq $zero, $zero, .L808C6960 /* 057B4 808C6944 00000000 */ nop .L808C6948: /* 057B8 808C6948 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 @@ -1393,98 +1393,98 @@ glabel L808C5FE4 /* 057C0 808C6950 34E7CCCD */ ori $a3, $a3, 0xCCCD ## $a3 = 3D4CCCCD /* 057C4 808C6954 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 0000CCCD /* 057C8 808C6958 0C01E0C4 */ jal Math_SmoothScaleMaxMinF - -/* 057CC 808C695C E7A40010 */ swc1 $f4, 0x0010($sp) + +/* 057CC 808C695C E7A40010 */ swc1 $f4, 0x0010($sp) .L808C6960: /* 057D0 808C6960 3C01808D */ lui $at, %hi(D_808CA7C0) ## $at = 808D0000 -/* 057D4 808C6964 C420A7C0 */ lwc1 $f0, %lo(D_808CA7C0)($at) +/* 057D4 808C6964 C420A7C0 */ lwc1 $f0, %lo(D_808CA7C0)($at) /* 057D8 808C6968 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 /* 057DC 808C696C 44814000 */ mtc1 $at, $f8 ## $f8 = 5.00 /* 057E0 808C6970 C6060204 */ lwc1 $f6, 0x0204($s0) ## 00000204 /* 057E4 808C6974 26040428 */ addiu $a0, $s0, 0x0428 ## $a0 = 00000428 /* 057E8 808C6978 3C05C45E */ lui $a1, 0xC45E ## $a1 = C45E0000 -/* 057EC 808C697C 46083282 */ mul.s $f10, $f6, $f8 -/* 057F0 808C6980 44060000 */ mfc1 $a2, $f0 +/* 057EC 808C697C 46083282 */ mul.s $f10, $f6, $f8 +/* 057F0 808C6980 44060000 */ mfc1 $a2, $f0 /* 057F4 808C6984 34A58000 */ ori $a1, $a1, 0x8000 ## $a1 = C45E8000 -/* 057F8 808C6988 AFA4004C */ sw $a0, 0x004C($sp) -/* 057FC 808C698C E7A00010 */ swc1 $f0, 0x0010($sp) -/* 05800 808C6990 44075000 */ mfc1 $a3, $f10 +/* 057F8 808C6988 AFA4004C */ sw $a0, 0x004C($sp) +/* 057FC 808C698C E7A00010 */ swc1 $f0, 0x0010($sp) +/* 05800 808C6990 44075000 */ mfc1 $a3, $f10 /* 05804 808C6994 0C01E0C4 */ jal Math_SmoothScaleMaxMinF - + /* 05808 808C6998 00000000 */ nop /* 0580C 808C699C 3C01808D */ lui $at, %hi(D_808CA7C4) ## $at = 808D0000 -/* 05810 808C69A0 C422A7C4 */ lwc1 $f2, %lo(D_808CA7C4)($at) +/* 05810 808C69A0 C422A7C4 */ lwc1 $f2, %lo(D_808CA7C4)($at) /* 05814 808C69A4 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 /* 05818 808C69A8 44812000 */ mtc1 $at, $f4 ## $f4 = 5.00 /* 0581C 808C69AC C6120204 */ lwc1 $f18, 0x0204($s0) ## 00000204 /* 05820 808C69B0 3C05C54E */ lui $a1, 0xC54E ## $a1 = C54E0000 -/* 05824 808C69B4 44061000 */ mfc1 $a2, $f2 -/* 05828 808C69B8 46049182 */ mul.s $f6, $f18, $f4 +/* 05824 808C69B4 44061000 */ mfc1 $a2, $f2 +/* 05828 808C69B8 46049182 */ mul.s $f6, $f18, $f4 /* 0582C 808C69BC 34A58000 */ ori $a1, $a1, 0x8000 ## $a1 = C54E8000 /* 05830 808C69C0 26040430 */ addiu $a0, $s0, 0x0430 ## $a0 = 00000430 -/* 05834 808C69C4 E7A20010 */ swc1 $f2, 0x0010($sp) -/* 05838 808C69C8 44073000 */ mfc1 $a3, $f6 +/* 05834 808C69C4 E7A20010 */ swc1 $f2, 0x0010($sp) +/* 05838 808C69C8 44073000 */ mfc1 $a3, $f6 /* 0583C 808C69CC 0C01E0C4 */ jal Math_SmoothScaleMaxMinF - + /* 05840 808C69D0 00000000 */ nop /* 05844 808C69D4 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 /* 05848 808C69D8 44811000 */ mtc1 $at, $f2 ## $f2 = 1.00 /* 0584C 808C69DC 44804000 */ mtc1 $zero, $f8 ## $f8 = 0.00 /* 05850 808C69E0 3C073D4C */ lui $a3, 0x3D4C ## $a3 = 3D4C0000 -/* 05854 808C69E4 44051000 */ mfc1 $a1, $f2 -/* 05858 808C69E8 44061000 */ mfc1 $a2, $f2 +/* 05854 808C69E4 44051000 */ mfc1 $a1, $f2 +/* 05858 808C69E8 44061000 */ mfc1 $a2, $f2 /* 0585C 808C69EC 34E7CCCD */ ori $a3, $a3, 0xCCCD ## $a3 = 3D4CCCCD /* 05860 808C69F0 26040204 */ addiu $a0, $s0, 0x0204 ## $a0 = 00000204 /* 05864 808C69F4 0C01E0C4 */ jal Math_SmoothScaleMaxMinF - -/* 05868 808C69F8 E7A80010 */ swc1 $f8, 0x0010($sp) + +/* 05868 808C69F8 E7A80010 */ swc1 $f8, 0x0010($sp) /* 0586C 808C69FC 860301DA */ lh $v1, 0x01DA($s0) ## 000001DA .L808C6A00: /* 05870 808C6A00 24010334 */ addiu $at, $zero, 0x0334 ## $at = 00000334 -/* 05874 808C6A04 5461001F */ bnel $v1, $at, .L808C6A84 +/* 05874 808C6A04 5461001F */ bnel $v1, $at, .L808C6A84 /* 05878 808C6A08 24010258 */ addiu $at, $zero, 0x0258 ## $at = 00000258 /* 0587C 808C6A0C 0C03E803 */ jal Audio_SetBGM - + /* 05880 808C6A10 24040021 */ addiu $a0, $zero, 0x0021 ## $a0 = 00000021 /* 05884 808C6A14 0C01DE1C */ jal Math_Sins ## sins? /* 05888 808C6A18 860400B6 */ lh $a0, 0x00B6($s0) ## 000000B6 -/* 0588C 808C6A1C E7A00050 */ swc1 $f0, 0x0050($sp) +/* 0588C 808C6A1C E7A00050 */ swc1 $f0, 0x0050($sp) /* 05890 808C6A20 0C01DE0D */ jal Math_Coss ## coss? /* 05894 808C6A24 860400B6 */ lh $a0, 0x00B6($s0) ## 000000B6 /* 05898 808C6A28 3C01C248 */ lui $at, 0xC248 ## $at = C2480000 /* 0589C 808C6A2C 44816000 */ mtc1 $at, $f12 ## $f12 = -50.00 -/* 058A0 808C6A30 C7AA0050 */ lwc1 $f10, 0x0050($sp) +/* 058A0 808C6A30 C7AA0050 */ lwc1 $f10, 0x0050($sp) /* 058A4 808C6A34 C6040024 */ lwc1 $f4, 0x0024($s0) ## 00000024 /* 058A8 808C6A38 C6080028 */ lwc1 $f8, 0x0028($s0) ## 00000028 -/* 058AC 808C6A3C 460C5482 */ mul.s $f18, $f10, $f12 -/* 058B0 808C6A40 8FA501A4 */ lw $a1, 0x01A4($sp) -/* 058B4 808C6A44 E7A80010 */ swc1 $f8, 0x0010($sp) -/* 058B8 808C6A48 460C0282 */ mul.s $f10, $f0, $f12 +/* 058AC 808C6A3C 460C5482 */ mul.s $f18, $f10, $f12 +/* 058B0 808C6A40 8FA501A4 */ lw $a1, 0x01A4($sp) +/* 058B4 808C6A44 E7A80010 */ swc1 $f8, 0x0010($sp) +/* 058B8 808C6A48 460C0282 */ mul.s $f10, $f0, $f12 /* 058BC 808C6A4C 2406005F */ addiu $a2, $zero, 0x005F ## $a2 = 0000005F /* 058C0 808C6A50 24A41C24 */ addiu $a0, $a1, 0x1C24 ## $a0 = 00001C24 -/* 058C4 808C6A54 46049180 */ add.s $f6, $f18, $f4 +/* 058C4 808C6A54 46049180 */ add.s $f6, $f18, $f4 /* 058C8 808C6A58 C612002C */ lwc1 $f18, 0x002C($s0) ## 0000002C -/* 058CC 808C6A5C AFA00024 */ sw $zero, 0x0024($sp) -/* 058D0 808C6A60 AFA00020 */ sw $zero, 0x0020($sp) -/* 058D4 808C6A64 46125100 */ add.s $f4, $f10, $f18 -/* 058D8 808C6A68 44073000 */ mfc1 $a3, $f6 -/* 058DC 808C6A6C AFA0001C */ sw $zero, 0x001C($sp) -/* 058E0 808C6A70 AFA00018 */ sw $zero, 0x0018($sp) +/* 058CC 808C6A5C AFA00024 */ sw $zero, 0x0024($sp) +/* 058D0 808C6A60 AFA00020 */ sw $zero, 0x0020($sp) +/* 058D4 808C6A64 46125100 */ add.s $f4, $f10, $f18 +/* 058D8 808C6A68 44073000 */ mfc1 $a3, $f6 +/* 058DC 808C6A6C AFA0001C */ sw $zero, 0x001C($sp) +/* 058E0 808C6A70 AFA00018 */ sw $zero, 0x0018($sp) /* 058E4 808C6A74 0C00C7D4 */ jal Actor_Spawn ## ActorSpawn -/* 058E8 808C6A78 E7A40014 */ swc1 $f4, 0x0014($sp) +/* 058E8 808C6A78 E7A40014 */ swc1 $f4, 0x0014($sp) /* 058EC 808C6A7C 860301DA */ lh $v1, 0x01DA($s0) ## 000001DA /* 058F0 808C6A80 24010258 */ addiu $at, $zero, 0x0258 ## $at = 00000258 .L808C6A84: -/* 058F4 808C6A84 14610046 */ bne $v1, $at, .L808C6BA0 -/* 058F8 808C6A88 8FA401A4 */ lw $a0, 0x01A4($sp) +/* 058F4 808C6A84 14610046 */ bne $v1, $at, .L808C6BA0 +/* 058F8 808C6A88 8FA401A4 */ lw $a0, 0x01A4($sp) /* 058FC 808C6A8C 248E1C24 */ addiu $t6, $a0, 0x1C24 ## $t6 = 00001C24 -/* 05900 808C6A90 AFAE0044 */ sw $t6, 0x0044($sp) -/* 05904 808C6A94 0C030129 */ jal func_800C04A4 +/* 05900 808C6A90 AFAE0044 */ sw $t6, 0x0044($sp) +/* 05904 808C6A94 0C030129 */ jal func_800C04A4 /* 05908 808C6A98 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 0590C 808C6A9C 8FA8004C */ lw $t0, 0x004C($sp) +/* 0590C 808C6A9C 8FA8004C */ lw $t0, 0x004C($sp) /* 05910 808C6AA0 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 /* 05914 808C6AA4 8D090000 */ lw $t1, 0x0000($t0) ## 00000000 /* 05918 808C6AA8 AC49005C */ sw $t1, 0x005C($v0) ## 0000005C @@ -1492,14 +1492,14 @@ glabel L808C5FE4 /* 05920 808C6AB0 AC580060 */ sw $t8, 0x0060($v0) ## 00000060 /* 05924 808C6AB4 8D090008 */ lw $t1, 0x0008($t0) ## 00000008 /* 05928 808C6AB8 AC490064 */ sw $t1, 0x0064($v0) ## 00000064 -/* 0592C 808C6ABC 8FAB004C */ lw $t3, 0x004C($sp) +/* 0592C 808C6ABC 8FAB004C */ lw $t3, 0x004C($sp) /* 05930 808C6AC0 8D6F0000 */ lw $t7, 0x0000($t3) ## 00000000 /* 05934 808C6AC4 AC4F0074 */ sw $t7, 0x0074($v0) ## 00000074 /* 05938 808C6AC8 8D6C0004 */ lw $t4, 0x0004($t3) ## 00000004 /* 0593C 808C6ACC AC4C0078 */ sw $t4, 0x0078($v0) ## 00000078 /* 05940 808C6AD0 8D6F0008 */ lw $t7, 0x0008($t3) ## 00000008 /* 05944 808C6AD4 AC4F007C */ sw $t7, 0x007C($v0) ## 0000007C -/* 05948 808C6AD8 8FAD0048 */ lw $t5, 0x0048($sp) +/* 05948 808C6AD8 8FAD0048 */ lw $t5, 0x0048($sp) /* 0594C 808C6ADC 8DAA0000 */ lw $t2, 0x0000($t5) ## 00000000 /* 05950 808C6AE0 AC4A0050 */ sw $t2, 0x0050($v0) ## 00000050 /* 05954 808C6AE4 8DB90004 */ lw $t9, 0x0004($t5) ## 00000004 @@ -1507,55 +1507,55 @@ glabel L808C5FE4 /* 0595C 808C6AEC 8DAA0008 */ lw $t2, 0x0008($t5) ## 00000008 /* 05960 808C6AF0 AC4A0058 */ sw $t2, 0x0058($v0) ## 00000058 /* 05964 808C6AF4 860501B4 */ lh $a1, 0x01B4($s0) ## 000001B4 -/* 05968 808C6AF8 0C03022B */ jal func_800C08AC -/* 0596C 808C6AFC 8FA401A4 */ lw $a0, 0x01A4($sp) +/* 05968 808C6AF8 0C03022B */ jal func_800C08AC +/* 0596C 808C6AFC 8FA401A4 */ lw $a0, 0x01A4($sp) /* 05970 808C6B00 240E0064 */ addiu $t6, $zero, 0x0064 ## $t6 = 00000064 /* 05974 808C6B04 A60001BC */ sh $zero, 0x01BC($s0) ## 000001BC /* 05978 808C6B08 A60001B4 */ sh $zero, 0x01B4($s0) ## 000001B4 /* 0597C 808C6B0C A60E019C */ sh $t6, 0x019C($s0) ## 0000019C -/* 05980 808C6B10 8FA401A4 */ lw $a0, 0x01A4($sp) +/* 05980 808C6B10 8FA401A4 */ lw $a0, 0x01A4($sp) /* 05984 808C6B14 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 05988 808C6B18 0C0300C5 */ jal func_800C0314 +/* 05988 808C6B18 0C0300C5 */ jal func_800C0314 /* 0598C 808C6B1C 24060007 */ addiu $a2, $zero, 0x0007 ## $a2 = 00000007 -/* 05990 808C6B20 8FA401A4 */ lw $a0, 0x01A4($sp) -/* 05994 808C6B24 0C01914D */ jal func_80064534 +/* 05990 808C6B20 8FA401A4 */ lw $a0, 0x01A4($sp) +/* 05994 808C6B24 0C01914D */ jal func_80064534 /* 05998 808C6B28 24851D64 */ addiu $a1, $a0, 0x1D64 ## $a1 = 00001D64 -/* 0599C 808C6B2C 8FA401A4 */ lw $a0, 0x01A4($sp) +/* 0599C 808C6B2C 8FA401A4 */ lw $a0, 0x01A4($sp) /* 059A0 808C6B30 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 059A4 808C6B34 0C00B7D5 */ jal func_8002DF54 +/* 059A4 808C6B34 0C00B7D5 */ jal func_8002DF54 /* 059A8 808C6B38 24060007 */ addiu $a2, $zero, 0x0007 ## $a2 = 00000007 /* 059AC 808C6B3C 3C01808D */ lui $at, %hi(D_808CA7C8) ## $at = 808D0000 -/* 059B0 808C6B40 C426A7C8 */ lwc1 $f6, %lo(D_808CA7C8)($at) +/* 059B0 808C6B40 C426A7C8 */ lwc1 $f6, %lo(D_808CA7C8)($at) /* 059B4 808C6B44 3C01808D */ lui $at, %hi(D_808CA7CC) ## $at = 808D0000 -/* 059B8 808C6B48 C428A7CC */ lwc1 $f8, %lo(D_808CA7CC)($at) +/* 059B8 808C6B48 C428A7CC */ lwc1 $f8, %lo(D_808CA7CC)($at) /* 059BC 808C6B4C 3C01808D */ lui $at, %hi(D_808CA7D0) ## $at = 808D0000 -/* 059C0 808C6B50 C42AA7D0 */ lwc1 $f10, %lo(D_808CA7D0)($at) -/* 059C4 808C6B54 8FA40044 */ lw $a0, 0x0044($sp) +/* 059C0 808C6B50 C42AA7D0 */ lwc1 $f10, %lo(D_808CA7D0)($at) +/* 059C4 808C6B54 8FA40044 */ lw $a0, 0x0044($sp) /* 059C8 808C6B58 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 059CC 808C6B5C 8FA601A4 */ lw $a2, 0x01A4($sp) +/* 059CC 808C6B5C 8FA601A4 */ lw $a2, 0x01A4($sp) /* 059D0 808C6B60 2407005D */ addiu $a3, $zero, 0x005D ## $a3 = 0000005D -/* 059D4 808C6B64 AFA0001C */ sw $zero, 0x001C($sp) -/* 059D8 808C6B68 AFA00020 */ sw $zero, 0x0020($sp) -/* 059DC 808C6B6C AFA00024 */ sw $zero, 0x0024($sp) -/* 059E0 808C6B70 AFA00028 */ sw $zero, 0x0028($sp) -/* 059E4 808C6B74 E7A60010 */ swc1 $f6, 0x0010($sp) -/* 059E8 808C6B78 E7A80014 */ swc1 $f8, 0x0014($sp) +/* 059D4 808C6B64 AFA0001C */ sw $zero, 0x001C($sp) +/* 059D8 808C6B68 AFA00020 */ sw $zero, 0x0020($sp) +/* 059DC 808C6B6C AFA00024 */ sw $zero, 0x0024($sp) +/* 059E0 808C6B70 AFA00028 */ sw $zero, 0x0028($sp) +/* 059E4 808C6B74 E7A60010 */ swc1 $f6, 0x0010($sp) +/* 059E8 808C6B78 E7A80014 */ swc1 $f8, 0x0014($sp) /* 059EC 808C6B7C 0C00C916 */ jal Actor_SpawnAttached - -/* 059F0 808C6B80 E7AA0018 */ swc1 $f10, 0x0018($sp) -/* 059F4 808C6B84 8FA401A4 */ lw $a0, 0x01A4($sp) + +/* 059F0 808C6B80 E7AA0018 */ swc1 $f10, 0x0018($sp) +/* 059F4 808C6B84 8FA401A4 */ lw $a0, 0x01A4($sp) /* 059F8 808C6B88 44809000 */ mtc1 $zero, $f18 ## $f18 = 0.00 /* 059FC 808C6B8C 3C050001 */ lui $a1, 0x0001 ## $a1 = 00010000 -/* 05A00 808C6B90 00A42821 */ addu $a1, $a1, $a0 +/* 05A00 808C6B90 00A42821 */ addu $a1, $a1, $a0 /* 05A04 808C6B94 E6120168 */ swc1 $f18, 0x0168($s0) ## 00000168 /* 05A08 808C6B98 0C00B33C */ jal Flags_SetClear - + /* 05A0C 808C6B9C 80A51CBC */ lb $a1, 0x1CBC($a1) ## 00011CBC .L808C6BA0: /* 05A10 808C6BA0 860801DA */ lh $t0, 0x01DA($s0) ## 000001DA .L808C6BA4: -/* 05A14 808C6BA4 290102C6 */ slti $at, $t0, 0x02C6 -/* 05A18 808C6BA8 50200037 */ beql $at, $zero, .L808C6C88 +/* 05A14 808C6BA4 290102C6 */ slti $at, $t0, 0x02C6 +/* 05A18 808C6BA8 50200037 */ beql $at, $zero, .L808C6C88 /* 05A1C 808C6BAC 860501B4 */ lh $a1, 0x01B4($s0) ## 000001B4 /* 05A20 808C6BB0 0C03F66B */ jal Math_Rand_ZeroOne ## Rand.Next() float @@ -1564,72 +1564,72 @@ glabel L808C5FE4 /* 05A2C 808C6BBC 44812000 */ mtc1 $at, $f4 ## $f4 = 0.50 /* 05A30 808C6BC0 3C18808D */ lui $t8, %hi(D_808CA568) ## $t8 = 808D0000 /* 05A34 808C6BC4 3C09808D */ lui $t1, %hi(D_808CA56C) ## $t1 = 808D0000 -/* 05A38 808C6BC8 4604003C */ c.lt.s $f0, $f4 +/* 05A38 808C6BC8 4604003C */ c.lt.s $f0, $f4 /* 05A3C 808C6BCC 3C014270 */ lui $at, 0x4270 ## $at = 42700000 -/* 05A40 808C6BD0 4502002D */ bc1fl .L808C6C88 +/* 05A40 808C6BD0 4502002D */ bc1fl .L808C6C88 /* 05A44 808C6BD4 860501B4 */ lh $a1, 0x01B4($s0) ## 000001B4 -/* 05A48 808C6BD8 8F18A568 */ lw $t8, %lo(D_808CA568)($t8) -/* 05A4C 808C6BDC 8D29A56C */ lw $t1, %lo(D_808CA56C)($t1) +/* 05A48 808C6BD8 8F18A568 */ lw $t8, %lo(D_808CA568)($t8) +/* 05A4C 808C6BDC 8D29A56C */ lw $t1, %lo(D_808CA56C)($t1) /* 05A50 808C6BE0 44816000 */ mtc1 $at, $f12 ## $f12 = 60.00 -/* 05A54 808C6BE4 AFB80064 */ sw $t8, 0x0064($sp) +/* 05A54 808C6BE4 AFB80064 */ sw $t8, 0x0064($sp) /* 05A58 808C6BE8 0C00CFC8 */ jal Math_Rand_CenteredFloat - -/* 05A5C 808C6BEC AFA90060 */ sw $t1, 0x0060($sp) + +/* 05A5C 808C6BEC AFA90060 */ sw $t1, 0x0060($sp) /* 05A60 808C6BF0 C6060038 */ lwc1 $f6, 0x0038($s0) ## 00000038 -/* 05A64 808C6BF4 46060200 */ add.s $f8, $f0, $f6 +/* 05A64 808C6BF4 46060200 */ add.s $f8, $f0, $f6 /* 05A68 808C6BF8 0C03F66B */ jal Math_Rand_ZeroOne ## Rand.Next() float -/* 05A6C 808C6BFC E7A80068 */ swc1 $f8, 0x0068($sp) +/* 05A6C 808C6BFC E7A80068 */ swc1 $f8, 0x0068($sp) /* 05A70 808C6C00 3C014248 */ lui $at, 0x4248 ## $at = 42480000 /* 05A74 808C6C04 44815000 */ mtc1 $at, $f10 ## $f10 = 50.00 /* 05A78 808C6C08 3C01808D */ lui $at, %hi(D_808CA7D4) ## $at = 808D0000 -/* 05A7C 808C6C0C C424A7D4 */ lwc1 $f4, %lo(D_808CA7D4)($at) -/* 05A80 808C6C10 460A0482 */ mul.s $f18, $f0, $f10 +/* 05A7C 808C6C0C C424A7D4 */ lwc1 $f4, %lo(D_808CA7D4)($at) +/* 05A80 808C6C10 460A0482 */ mul.s $f18, $f0, $f10 /* 05A84 808C6C14 3C014270 */ lui $at, 0x4270 ## $at = 42700000 /* 05A88 808C6C18 44816000 */ mtc1 $at, $f12 ## $f12 = 60.00 -/* 05A8C 808C6C1C 46049180 */ add.s $f6, $f18, $f4 +/* 05A8C 808C6C1C 46049180 */ add.s $f6, $f18, $f4 /* 05A90 808C6C20 0C00CFC8 */ jal Math_Rand_CenteredFloat - -/* 05A94 808C6C24 E7A6006C */ swc1 $f6, 0x006C($sp) + +/* 05A94 808C6C24 E7A6006C */ swc1 $f6, 0x006C($sp) /* 05A98 808C6C28 C6080040 */ lwc1 $f8, 0x0040($s0) ## 00000040 -/* 05A9C 808C6C2C 46080280 */ add.s $f10, $f0, $f8 +/* 05A9C 808C6C2C 46080280 */ add.s $f10, $f0, $f8 /* 05AA0 808C6C30 0C03F66B */ jal Math_Rand_ZeroOne ## Rand.Next() float -/* 05AA4 808C6C34 E7AA0070 */ swc1 $f10, 0x0070($sp) +/* 05AA4 808C6C34 E7AA0070 */ swc1 $f10, 0x0070($sp) /* 05AA8 808C6C38 3C014248 */ lui $at, 0x4248 ## $at = 42480000 /* 05AAC 808C6C3C 44819000 */ mtc1 $at, $f18 ## $f18 = 50.00 /* 05AB0 808C6C40 240B0005 */ addiu $t3, $zero, 0x0005 ## $t3 = 00000005 /* 05AB4 808C6C44 240C0001 */ addiu $t4, $zero, 0x0001 ## $t4 = 00000001 -/* 05AB8 808C6C48 46120102 */ mul.s $f4, $f0, $f18 -/* 05ABC 808C6C4C AFAC0014 */ sw $t4, 0x0014($sp) -/* 05AC0 808C6C50 AFAB0010 */ sw $t3, 0x0010($sp) -/* 05AC4 808C6C54 8FA401A4 */ lw $a0, 0x01A4($sp) +/* 05AB8 808C6C48 46120102 */ mul.s $f4, $f0, $f18 +/* 05ABC 808C6C4C AFAC0014 */ sw $t4, 0x0014($sp) +/* 05AC0 808C6C50 AFAB0010 */ sw $t3, 0x0010($sp) +/* 05AC4 808C6C54 8FA401A4 */ lw $a0, 0x01A4($sp) /* 05AC8 808C6C58 27A50068 */ addiu $a1, $sp, 0x0068 ## $a1 = FFFFFEC8 /* 05ACC 808C6C5C 27A60064 */ addiu $a2, $sp, 0x0064 ## $a2 = FFFFFEC4 /* 05AD0 808C6C60 27A70060 */ addiu $a3, $sp, 0x0060 ## $a3 = FFFFFEC0 -/* 05AD4 808C6C64 4600218D */ trunc.w.s $f6, $f4 -/* 05AD8 808C6C68 440D3000 */ mfc1 $t5, $f6 +/* 05AD4 808C6C64 4600218D */ trunc.w.s $f6, $f4 +/* 05AD8 808C6C68 440D3000 */ mfc1 $t5, $f6 /* 05ADC 808C6C6C 00000000 */ nop -/* 05AE0 808C6C70 000DCC00 */ sll $t9, $t5, 16 -/* 05AE4 808C6C74 00195403 */ sra $t2, $t9, 16 +/* 05AE0 808C6C70 000DCC00 */ sll $t9, $t5, 16 +/* 05AE4 808C6C74 00195403 */ sra $t2, $t9, 16 /* 05AE8 808C6C78 254E0032 */ addiu $t6, $t2, 0x0032 ## $t6 = 00000032 -/* 05AEC 808C6C7C 0C00A6E4 */ jal func_80029B90 -/* 05AF0 808C6C80 AFAE0018 */ sw $t6, 0x0018($sp) +/* 05AEC 808C6C7C 0C00A6E4 */ jal func_80029B90 +/* 05AF0 808C6C80 AFAE0018 */ sw $t6, 0x0018($sp) glabel L808C6C84 .L808C6C84: /* 05AF4 808C6C84 860501B4 */ lh $a1, 0x01B4($s0) ## 000001B4 .L808C6C88: -/* 05AF8 808C6C88 8FA401A4 */ lw $a0, 0x01A4($sp) +/* 05AF8 808C6C88 8FA401A4 */ lw $a0, 0x01A4($sp) /* 05AFC 808C6C8C 26060434 */ addiu $a2, $s0, 0x0434 ## $a2 = 00000434 -/* 05B00 808C6C90 50A00004 */ beql $a1, $zero, .L808C6CA4 -/* 05B04 808C6C94 8FBF003C */ lw $ra, 0x003C($sp) -/* 05B08 808C6C98 0C030136 */ jal func_800C04D8 +/* 05B00 808C6C90 50A00004 */ beql $a1, $zero, .L808C6CA4 +/* 05B04 808C6C94 8FBF003C */ lw $ra, 0x003C($sp) +/* 05B08 808C6C98 0C030136 */ jal func_800C04D8 /* 05B0C 808C6C9C 26070428 */ addiu $a3, $s0, 0x0428 ## $a3 = 00000428 -/* 05B10 808C6CA0 8FBF003C */ lw $ra, 0x003C($sp) +/* 05B10 808C6CA0 8FBF003C */ lw $ra, 0x003C($sp) .L808C6CA4: -/* 05B14 808C6CA4 8FB00038 */ lw $s0, 0x0038($sp) +/* 05B14 808C6CA4 8FB00038 */ lw $s0, 0x0038($sp) /* 05B18 808C6CA8 27BD01A0 */ addiu $sp, $sp, 0x01A0 ## $sp = 00000000 -/* 05B1C 808C6CAC 03E00008 */ jr $ra +/* 05B1C 808C6CAC 03E00008 */ jr $ra /* 05B20 808C6CB0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/func_808C6DE8.s b/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/func_808C6DE8.s index f660aa1f6c..40b4ec6064 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/func_808C6DE8.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Dodongo/func_808C6DE8.s @@ -21,7 +21,7 @@ glabel func_808C6DE8 /* 05CA4 808C6E34 24C6A604 */ addiu $a2, $a2, %lo(D_808CA604) ## $a2 = 808CA604 /* 05CA8 808C6E38 27A4006C */ addiu $a0, $sp, 0x006C ## $a0 = FFFFFFDC /* 05CAC 808C6E3C 2407146C */ addiu $a3, $zero, 0x146C ## $a3 = 0000146C -/* 05CB0 808C6E40 0C031AB1 */ jal func_800C6AC4 +/* 05CB0 808C6E40 0C031AB1 */ jal Graph_OpenDisps /* 05CB4 808C6E44 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 /* 05CB8 808C6E48 0C024F61 */ jal func_80093D84 /* 05CBC 808C6E4C 8EE40000 */ lw $a0, 0x0000($s7) ## 00000000 @@ -113,7 +113,7 @@ glabel func_808C6DE8 /* 05E08 808C6F98 24C6A62C */ addiu $a2, $a2, %lo(D_808CA62C) ## $a2 = 808CA62C /* 05E0C 808C6F9C 27A4006C */ addiu $a0, $sp, 0x006C ## $a0 = FFFFFFDC /* 05E10 808C6FA0 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 05E14 808C6FA4 0C031AD5 */ jal func_800C6B54 +/* 05E14 808C6FA4 0C031AD5 */ jal Graph_CloseDisps /* 05E18 808C6FA8 2407148A */ addiu $a3, $zero, 0x148A ## $a3 = 0000148A /* 05E1C 808C6FAC 8FBF0044 */ lw $ra, 0x0044($sp) /* 05E20 808C6FB0 D7B40018 */ ldc1 $f20, 0x0018($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Fd/BossFd_Destroy.s b/asm/non_matchings/overlays/actors/ovl_Boss_Fd/BossFd_Destroy.s index fcb2e29e74..8e78cb8f09 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Fd/BossFd_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Fd/BossFd_Destroy.s @@ -1,25 +1,25 @@ glabel BossFd_Destroy /* 00864 808CB624 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00868 808CB628 AFBF0014 */ sw $ra, 0x0014($sp) -/* 0086C 808CB62C AFA40018 */ sw $a0, 0x0018($sp) -/* 00870 808CB630 AFA5001C */ sw $a1, 0x001C($sp) -/* 00874 808CB634 0C0295BC */ jal func_800A56F0 +/* 00868 808CB628 AFBF0014 */ sw $ra, 0x0014($sp) +/* 0086C 808CB62C AFA40018 */ sw $a0, 0x0018($sp) +/* 00870 808CB630 AFA5001C */ sw $a1, 0x001C($sp) +/* 00874 808CB634 0C0295BC */ jal SkelAnime_Free /* 00878 808CB638 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 0087C 808CB63C 8FA40018 */ lw $a0, 0x0018($sp) -/* 00880 808CB640 8FA5001C */ lw $a1, 0x001C($sp) -/* 00884 808CB644 0C0295BC */ jal func_800A56F0 +/* 0087C 808CB63C 8FA40018 */ lw $a0, 0x0018($sp) +/* 00880 808CB640 8FA5001C */ lw $a1, 0x001C($sp) +/* 00884 808CB644 0C0295BC */ jal SkelAnime_Free /* 00888 808CB648 24840190 */ addiu $a0, $a0, 0x0190 ## $a0 = 00000190 -/* 0088C 808CB64C 8FA40018 */ lw $a0, 0x0018($sp) -/* 00890 808CB650 8FA5001C */ lw $a1, 0x001C($sp) -/* 00894 808CB654 0C0295BC */ jal func_800A56F0 +/* 0088C 808CB64C 8FA40018 */ lw $a0, 0x0018($sp) +/* 00890 808CB650 8FA5001C */ lw $a1, 0x001C($sp) +/* 00894 808CB654 0C0295BC */ jal SkelAnime_Free /* 00898 808CB658 248401D4 */ addiu $a0, $a0, 0x01D4 ## $a0 = 000001D4 -/* 0089C 808CB65C 8FA50018 */ lw $a1, 0x0018($sp) -/* 008A0 808CB660 8FA4001C */ lw $a0, 0x001C($sp) -/* 008A4 808CB664 0C016F32 */ jal func_8005BCC8 +/* 0089C 808CB65C 8FA50018 */ lw $a1, 0x0018($sp) +/* 008A0 808CB660 8FA4001C */ lw $a0, 0x001C($sp) +/* 008A4 808CB664 0C016F32 */ jal func_8005BCC8 /* 008A8 808CB668 24A51490 */ addiu $a1, $a1, 0x1490 ## $a1 = 00001490 -/* 008AC 808CB66C 8FBF0014 */ lw $ra, 0x0014($sp) +/* 008AC 808CB66C 8FBF0014 */ lw $ra, 0x0014($sp) /* 008B0 808CB670 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 008B4 808CB674 03E00008 */ jr $ra +/* 008B4 808CB674 03E00008 */ jr $ra /* 008B8 808CB678 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Fd/BossFd_Draw.s b/asm/non_matchings/overlays/actors/ovl_Boss_Fd/BossFd_Draw.s index edc0534313..15607b0328 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Fd/BossFd_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Fd/BossFd_Draw.s @@ -19,7 +19,7 @@ glabel BossFd_Draw /* 0521C 808CFFDC 27A40034 */ addiu $a0, $sp, 0x0034 ## $a0 = FFFFFFE4 /* 05220 808CFFE0 8E250000 */ lw $a1, 0x0000($s1) ## 00000000 /* 05224 808CFFE4 24071079 */ addiu $a3, $zero, 0x1079 ## $a3 = 00001079 -/* 05228 808CFFE8 0C031AB1 */ jal func_800C6AC4 +/* 05228 808CFFE8 0C031AB1 */ jal Graph_OpenDisps /* 0522C 808CFFEC 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 /* 05230 808CFFF0 0C024F46 */ jal func_80093D18 /* 05234 808CFFF4 8E240000 */ lw $a0, 0x0000($s1) ## 00000000 @@ -35,7 +35,7 @@ glabel BossFd_Draw /* 0525C 808D001C 8E0402C0 */ lw $a0, 0x02C0($s0) ## 000002C0 /* 05260 808D0020 AFAB0018 */ sw $t3, 0x0018($sp) /* 05264 808D0024 AFAA0014 */ sw $t2, 0x0014($sp) -/* 05268 808D0028 0C024CDC */ jal func_80093370 +/* 05268 808D0028 0C024CDC */ jal Gfx_SetFog /* 0526C 808D002C AFA00010 */ sw $zero, 0x0010($sp) /* 05270 808D0030 AE0202C0 */ sw $v0, 0x02C0($s0) ## 000002C0 .L808D0034: @@ -50,7 +50,7 @@ glabel BossFd_Draw /* 05294 808D0054 24C61D7C */ addiu $a2, $a2, %lo(D_808D1D7C) ## $a2 = 808D1D7C /* 05298 808D0058 8E250000 */ lw $a1, 0x0000($s1) ## 00000000 /* 0529C 808D005C 27A40034 */ addiu $a0, $sp, 0x0034 ## $a0 = FFFFFFE4 -/* 052A0 808D0060 0C031AD5 */ jal func_800C6B54 +/* 052A0 808D0060 0C031AD5 */ jal Graph_CloseDisps /* 052A4 808D0064 24071093 */ addiu $a3, $zero, 0x1093 ## $a3 = 00001093 .L808D0068: /* 052A8 808D0068 3C04808D */ lui $a0, %hi(D_808D1D8C) ## $a0 = 808D0000 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Fd/func_808CB6A8.s b/asm/non_matchings/overlays/actors/ovl_Boss_Fd/func_808CB6A8.s index 3aad83ad2f..48ab2a5926 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Fd/func_808CB6A8.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Fd/func_808CB6A8.s @@ -1,20 +1,20 @@ glabel func_808CB6A8 /* 008E8 808CB6A8 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 008EC 808CB6AC AFB00018 */ sw $s0, 0x0018($sp) -/* 008F0 808CB6B0 AFA50024 */ sw $a1, 0x0024($sp) +/* 008EC 808CB6AC AFB00018 */ sw $s0, 0x0018($sp) +/* 008F0 808CB6B0 AFA50024 */ sw $a1, 0x0024($sp) /* 008F4 808CB6B4 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 008F8 808CB6B8 AFBF001C */ sw $ra, 0x001C($sp) +/* 008F8 808CB6B8 AFBF001C */ sw $ra, 0x001C($sp) /* 008FC 808CB6BC 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 /* 00900 808CB6C0 24A515E4 */ addiu $a1, $a1, 0x15E4 ## $a1 = 060115E4 -/* 00904 808CB6C4 0C02947A */ jal func_800A51E8 +/* 00904 808CB6C4 0C02947A */ jal SkelAnime_ChangeAnimDefaultStop /* 00908 808CB6C8 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C /* 0090C 808CB6CC 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 /* 00910 808CB6D0 24A51524 */ addiu $a1, $a1, 0x1524 ## $a1 = 06011524 -/* 00914 808CB6D4 0C02947A */ jal func_800A51E8 +/* 00914 808CB6D4 0C02947A */ jal SkelAnime_ChangeAnimDefaultStop /* 00918 808CB6D8 26040190 */ addiu $a0, $s0, 0x0190 ## $a0 = 00000190 /* 0091C 808CB6DC 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 /* 00920 808CB6E0 24A51464 */ addiu $a1, $a1, 0x1464 ## $a1 = 06011464 -/* 00924 808CB6E4 0C02947A */ jal func_800A51E8 +/* 00924 808CB6E4 0C02947A */ jal SkelAnime_ChangeAnimDefaultStop /* 00928 808CB6E8 260401D4 */ addiu $a0, $s0, 0x01D4 ## $a0 = 000001D4 /* 0092C 808CB6EC 3C01447A */ lui $at, 0x447A ## $at = 447A0000 /* 00930 808CB6F0 44812000 */ mtc1 $at, $f4 ## $f4 = 1000.00 @@ -22,10 +22,10 @@ glabel func_808CB6A8 /* 00938 808CB6F8 25CEB718 */ addiu $t6, $t6, %lo(func_808CB718) ## $t6 = 808CB718 /* 0093C 808CB6FC AE0E0218 */ sw $t6, 0x0218($s0) ## 00000218 /* 00940 808CB700 E60402AC */ swc1 $f4, 0x02AC($s0) ## 000002AC -/* 00944 808CB704 8FBF001C */ lw $ra, 0x001C($sp) -/* 00948 808CB708 8FB00018 */ lw $s0, 0x0018($sp) +/* 00944 808CB704 8FBF001C */ lw $ra, 0x001C($sp) +/* 00948 808CB708 8FB00018 */ lw $s0, 0x0018($sp) /* 0094C 808CB70C 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 00950 808CB710 03E00008 */ jr $ra +/* 00950 808CB710 03E00008 */ jr $ra /* 00954 808CB714 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Fd/func_808CB718.s b/asm/non_matchings/overlays/actors/ovl_Boss_Fd/func_808CB718.s index 1f9bbef366..9b3a1dce84 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Fd/func_808CB718.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Fd/func_808CB718.s @@ -95,7 +95,7 @@ glabel func_808CB718 /* 00AB4 808CB874 4600A306 */ mov.s $f12, $f20 /* 00AB8 808CB878 460A0202 */ mul.s $f8, $f0, $f10 /* 00ABC 808CB87C 4608B580 */ add.s $f22, $f22, $f8 -/* 00AC0 808CB880 0C03F494 */ jal func_800FD250 +/* 00AC0 808CB880 0C03F494 */ jal Math_atan2f /* 00AC4 808CB884 4600B386 */ mov.s $f14, $f22 /* 00AC8 808CB888 3C01808D */ lui $at, %hi(D_808D1E4C) ## $at = 808D0000 /* 00ACC 808CB88C C4381E4C */ lwc1 $f24, %lo(D_808D1E4C)($at) @@ -117,7 +117,7 @@ glabel func_808CB718 /* 00B0C 808CB8CC 00000000 */ nop /* 00B10 808CB8D0 46805220 */ cvt.s.w $f8, $f10 /* 00B14 808CB8D4 E7AE0090 */ swc1 $f14, 0x0090($sp) -/* 00B18 808CB8D8 0C03F494 */ jal func_800FD250 +/* 00B18 808CB8D8 0C03F494 */ jal Math_atan2f /* 00B1C 808CB8DC E7A801B4 */ swc1 $f8, 0x01B4($sp) /* 00B20 808CB8E0 46180102 */ mul.s $f4, $f0, $f24 /* 00B24 808CB8E4 3C04808D */ lui $a0, %hi(D_808D1C30) ## $a0 = 808D0000 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Fd/func_808CF898.s b/asm/non_matchings/overlays/actors/ovl_Boss_Fd/func_808CF898.s index ac9629ae23..e440bdc92a 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Fd/func_808CF898.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Fd/func_808CF898.s @@ -20,7 +20,7 @@ glabel func_808CF898 /* 04B20 808CF8E0 24C61CEC */ addiu $a2, $a2, %lo(D_808D1CEC) ## $a2 = 808D1CEC /* 04B24 808CF8E4 27A400B4 */ addiu $a0, $sp, 0x00B4 ## $a0 = FFFFFFDC /* 04B28 808CF8E8 24070FB7 */ addiu $a3, $zero, 0x0FB7 ## $a3 = 00000FB7 -/* 04B2C 808CF8EC 0C031AB1 */ jal func_800C6AC4 +/* 04B2C 808CF8EC 0C031AB1 */ jal Graph_OpenDisps /* 04B30 808CF8F0 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 04B34 808CF8F4 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 /* 04B38 808CF8F8 4481A000 */ mtc1 $at, $f20 ## $f20 = 1.00 @@ -186,7 +186,7 @@ glabel func_808CF898 /* 04D9C 808CFB5C 3C120601 */ lui $s2, 0x0601 ## $s2 = 06010000 /* 04DA0 808CFB60 2652B3A8 */ addiu $s2, $s2, 0xB3A8 ## $s2 = 0600B3A8 /* 04DA4 808CFB64 8E0402D0 */ lw $a0, 0x02D0($s0) ## 000002D0 -/* 04DA8 808CFB68 0C024DDD */ jal func_80093774 +/* 04DA8 808CFB68 0C024DDD */ jal Gfx_CallSetupDL /* 04DAC 808CFB6C 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 04DB0 808CFB70 AE0202D0 */ sw $v0, 0x02D0($s0) ## 000002D0 /* 04DB4 808CFB74 244B0008 */ addiu $t3, $v0, 0x0008 ## $t3 = 00000008 @@ -289,7 +289,7 @@ glabel func_808CF898 /* 04F2C 808CFCEC 3C120601 */ lui $s2, 0x0601 ## $s2 = 06010000 /* 04F30 808CFCF0 2652B3A8 */ addiu $s2, $s2, 0xB3A8 ## $s2 = 0600B3A8 /* 04F34 808CFCF4 8E0402D0 */ lw $a0, 0x02D0($s0) ## 000002D0 -/* 04F38 808CFCF8 0C024DDD */ jal func_80093774 +/* 04F38 808CFCF8 0C024DDD */ jal Gfx_CallSetupDL /* 04F3C 808CFCFC 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 04F40 808CFD00 AE0202D0 */ sw $v0, 0x02D0($s0) ## 000002D0 /* 04F44 808CFD04 24580008 */ addiu $t8, $v0, 0x0008 ## $t8 = 00000008 @@ -448,7 +448,7 @@ glabel func_808CF898 /* 05194 808CFF54 24C61D4C */ addiu $a2, $a2, %lo(D_808D1D4C) ## $a2 = 808D1D4C /* 05198 808CFF58 27A400B4 */ addiu $a0, $sp, 0x00B4 ## $a0 = FFFFFFDC /* 0519C 808CFF5C 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 051A0 808CFF60 0C031AD5 */ jal func_800C6B54 +/* 051A0 808CFF60 0C031AD5 */ jal Graph_CloseDisps /* 051A4 808CFF64 24071066 */ addiu $a3, $zero, 0x1066 ## $a3 = 00001066 /* 051A8 808CFF68 8FBF0044 */ lw $ra, 0x0044($sp) /* 051AC 808CFF6C D7B40018 */ ldc1 $f20, 0x0018($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Fd/func_808D02DC.s b/asm/non_matchings/overlays/actors/ovl_Boss_Fd/func_808D02DC.s index 6fb5bb6549..64113fe0fb 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Fd/func_808D02DC.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Fd/func_808D02DC.s @@ -92,7 +92,7 @@ glabel func_808D02DC /* 05674 808D0434 27A4008C */ addiu $a0, $sp, 0x008C ## $a0 = FFFFFF24 /* 05678 808D0438 24071143 */ addiu $a3, $zero, 0x1143 ## $a3 = 00001143 /* 0567C 808D043C 8F050000 */ lw $a1, 0x0000($t8) ## 808D1B74 -/* 05680 808D0440 0C031AB1 */ jal func_800C6AC4 +/* 05680 808D0440 0C031AB1 */ jal Graph_OpenDisps /* 05684 808D0444 00A0A825 */ or $s5, $a1, $zero ## $s5 = 00000000 /* 05688 808D0448 866E021E */ lh $t6, 0x021E($s3) ## 0000021E /* 0568C 808D044C 3C0C0601 */ lui $t4, 0x0601 ## $t4 = 06010000 @@ -295,7 +295,7 @@ glabel func_808D02DC /* 05988 808D0748 24C61DCC */ addiu $a2, $a2, %lo(D_808D1DCC) ## $a2 = 808D1DCC /* 0598C 808D074C 27A4008C */ addiu $a0, $sp, 0x008C ## $a0 = FFFFFF24 /* 05990 808D0750 24071183 */ addiu $a3, $zero, 0x1183 ## $a3 = 00001183 -/* 05994 808D0754 0C031AD5 */ jal func_800C6B54 +/* 05994 808D0754 0C031AD5 */ jal Graph_CloseDisps /* 05998 808D0758 8F050000 */ lw $a1, 0x0000($t8) ## 00000000 /* 0599C 808D075C 8FBF006C */ lw $ra, 0x006C($sp) /* 059A0 808D0760 D7B40018 */ ldc1 $f20, 0x0018($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Fd/func_808D08F8.s b/asm/non_matchings/overlays/actors/ovl_Boss_Fd/func_808D08F8.s index 939364abda..42c3d625e5 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Fd/func_808D08F8.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Fd/func_808D08F8.s @@ -24,7 +24,7 @@ glabel func_808D08F8 /* 05B8C 808D094C 24C61DDC */ addiu $a2, $a2, %lo(D_808D1DDC) ## $a2 = 808D1DDC /* 05B90 808D0950 27A40158 */ addiu $a0, $sp, 0x0158 ## $a0 = FFFFFFE0 /* 05B94 808D0954 240711ED */ addiu $a3, $zero, 0x11ED ## $a3 = 000011ED -/* 05B98 808D0958 0C031AB1 */ jal func_800C6AC4 +/* 05B98 808D0958 0C031AB1 */ jal Graph_OpenDisps /* 05B9C 808D095C 00A0A025 */ or $s4, $a1, $zero ## $s4 = 00000000 /* 05BA0 808D0960 866E021E */ lh $t6, 0x021E($s3) ## 0000021E /* 05BA4 808D0964 51C0001A */ beql $t6, $zero, .L808D09D0 @@ -94,7 +94,7 @@ glabel func_808D08F8 /* 05CA0 808D0A60 00000000 */ nop /* 05CA4 808D0A64 00085400 */ sll $t2, $t0, 16 /* 05CA8 808D0A68 000A5C03 */ sra $t3, $t2, 16 -/* 05CAC 808D0A6C 0C0253D0 */ jal Draw_TwoTexScroll +/* 05CAC 808D0A6C 0C0253D0 */ jal Gfx_TwoTexScroll /* 05CB0 808D0A70 AFAB0020 */ sw $t3, 0x0020($sp) /* 05CB4 808D0A74 AE020004 */ sw $v0, 0x0004($s0) ## 00000004 /* 05CB8 808D0A78 8E8202C0 */ lw $v0, 0x02C0($s4) ## 000002C0 @@ -865,7 +865,7 @@ glabel func_808D08F8 /* 06834 808D15F4 24C61E38 */ addiu $a2, $a2, %lo(D_808D1E38) ## $a2 = 808D1E38 /* 06838 808D15F8 27A40158 */ addiu $a0, $sp, 0x0158 ## $a0 = FFFFFFE0 /* 0683C 808D15FC 8EC50000 */ lw $a1, 0x0000($s6) ## 00000000 -/* 06840 808D1600 0C031AD5 */ jal func_800C6B54 +/* 06840 808D1600 0C031AD5 */ jal Graph_CloseDisps /* 06844 808D1604 2407137B */ addiu $a3, $zero, 0x137B ## $a3 = 0000137B /* 06848 808D1608 8FBF0074 */ lw $ra, 0x0074($sp) /* 0684C 808D160C D7B40038 */ ldc1 $f20, 0x0038($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Fd2/BossFd2_Destroy.s b/asm/non_matchings/overlays/actors/ovl_Boss_Fd2/BossFd2_Destroy.s index 8dc0a871ba..35b2b85b7d 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Fd2/BossFd2_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Fd2/BossFd2_Destroy.s @@ -1,17 +1,17 @@ glabel BossFd2_Destroy /* 00528 808D2B98 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 0052C 808D2B9C AFBF0014 */ sw $ra, 0x0014($sp) -/* 00530 808D2BA0 AFA40018 */ sw $a0, 0x0018($sp) -/* 00534 808D2BA4 AFA5001C */ sw $a1, 0x001C($sp) -/* 00538 808D2BA8 0C0295BC */ jal func_800A56F0 +/* 0052C 808D2B9C AFBF0014 */ sw $ra, 0x0014($sp) +/* 00530 808D2BA0 AFA40018 */ sw $a0, 0x0018($sp) +/* 00534 808D2BA4 AFA5001C */ sw $a1, 0x001C($sp) +/* 00538 808D2BA8 0C0295BC */ jal SkelAnime_Free /* 0053C 808D2BAC 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 00540 808D2BB0 8FA50018 */ lw $a1, 0x0018($sp) -/* 00544 808D2BB4 8FA4001C */ lw $a0, 0x001C($sp) -/* 00548 808D2BB8 0C016F32 */ jal func_8005BCC8 +/* 00540 808D2BB0 8FA50018 */ lw $a1, 0x0018($sp) +/* 00544 808D2BB4 8FA4001C */ lw $a0, 0x001C($sp) +/* 00548 808D2BB8 0C016F32 */ jal func_8005BCC8 /* 0054C 808D2BBC 24A5141C */ addiu $a1, $a1, 0x141C ## $a1 = 0000141C -/* 00550 808D2BC0 8FBF0014 */ lw $ra, 0x0014($sp) +/* 00550 808D2BC0 8FBF0014 */ lw $ra, 0x0014($sp) /* 00554 808D2BC4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00558 808D2BC8 03E00008 */ jr $ra +/* 00558 808D2BC8 03E00008 */ jr $ra /* 0055C 808D2BCC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Fd2/BossFd2_Draw.s b/asm/non_matchings/overlays/actors/ovl_Boss_Fd2/BossFd2_Draw.s index dad64f368e..9c8ad887fa 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Fd2/BossFd2_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Fd2/BossFd2_Draw.s @@ -1,42 +1,42 @@ glabel BossFd2_Draw /* 036E0 808D5D50 27BDFF88 */ addiu $sp, $sp, 0xFF88 ## $sp = FFFFFF88 -/* 036E4 808D5D54 AFB20040 */ sw $s2, 0x0040($sp) +/* 036E4 808D5D54 AFB20040 */ sw $s2, 0x0040($sp) /* 036E8 808D5D58 00A09025 */ or $s2, $a1, $zero ## $s2 = 00000000 -/* 036EC 808D5D5C AFBF0044 */ sw $ra, 0x0044($sp) -/* 036F0 808D5D60 AFB1003C */ sw $s1, 0x003C($sp) -/* 036F4 808D5D64 AFB00038 */ sw $s0, 0x0038($sp) +/* 036EC 808D5D5C AFBF0044 */ sw $ra, 0x0044($sp) +/* 036F0 808D5D60 AFB1003C */ sw $s1, 0x003C($sp) +/* 036F4 808D5D64 AFB00038 */ sw $s0, 0x0038($sp) /* 036F8 808D5D68 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 /* 036FC 808D5D6C 00808825 */ or $s1, $a0, $zero ## $s1 = 00000000 /* 03700 808D5D70 3C06808D */ lui $a2, %hi(D_808D6444) ## $a2 = 808D0000 /* 03704 808D5D74 24C66444 */ addiu $a2, $a2, %lo(D_808D6444) ## $a2 = 808D6444 /* 03708 808D5D78 27A4005C */ addiu $a0, $sp, 0x005C ## $a0 = FFFFFFE4 /* 0370C 808D5D7C 24070A39 */ addiu $a3, $zero, 0x0A39 ## $a3 = 00000A39 -/* 03710 808D5D80 0C031AB1 */ jal func_800C6AC4 +/* 03710 808D5D80 0C031AB1 */ jal Graph_OpenDisps /* 03714 808D5D84 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 /* 03718 808D5D88 3C04808D */ lui $a0, %hi(D_808D6454) ## $a0 = 808D0000 /* 0371C 808D5D8C 0C00084C */ jal osSyncPrintf - + /* 03720 808D5D90 24846454 */ addiu $a0, $a0, %lo(D_808D6454) ## $a0 = 808D6454 /* 03724 808D5D94 8E2F0190 */ lw $t7, 0x0190($s1) ## 00000190 /* 03728 808D5D98 3C0E808D */ lui $t6, %hi(func_808D4748) ## $t6 = 808D0000 /* 0372C 808D5D9C 25CE4748 */ addiu $t6, $t6, %lo(func_808D4748) ## $t6 = 808D4748 -/* 03730 808D5DA0 11CF0075 */ beq $t6, $t7, .L808D5F78 +/* 03730 808D5DA0 11CF0075 */ beq $t6, $t7, .L808D5F78 /* 03734 808D5DA4 00000000 */ nop -/* 03738 808D5DA8 0C024F46 */ jal func_80093D18 +/* 03738 808D5DA8 0C024F46 */ jal func_80093D18 /* 0373C 808D5DAC 8E440000 */ lw $a0, 0x0000($s2) ## 00000000 /* 03740 808D5DB0 863801A6 */ lh $t8, 0x01A6($s1) ## 000001A6 /* 03744 808D5DB4 240500FF */ addiu $a1, $zero, 0x00FF ## $a1 = 000000FF /* 03748 808D5DB8 240600FF */ addiu $a2, $zero, 0x00FF ## $a2 = 000000FF /* 0374C 808D5DBC 33190002 */ andi $t9, $t8, 0x0002 ## $t9 = 00000000 -/* 03750 808D5DC0 13200009 */ beq $t9, $zero, .L808D5DE8 +/* 03750 808D5DC0 13200009 */ beq $t9, $zero, .L808D5DE8 /* 03754 808D5DC4 240700FF */ addiu $a3, $zero, 0x00FF ## $a3 = 000000FF /* 03758 808D5DC8 8E0402C0 */ lw $a0, 0x02C0($s0) ## 000002C0 /* 0375C 808D5DCC 24080384 */ addiu $t0, $zero, 0x0384 ## $t0 = 00000384 /* 03760 808D5DD0 2409044B */ addiu $t1, $zero, 0x044B ## $t1 = 0000044B -/* 03764 808D5DD4 AFA90018 */ sw $t1, 0x0018($sp) -/* 03768 808D5DD8 AFA80014 */ sw $t0, 0x0014($sp) -/* 0376C 808D5DDC 0C024CDC */ jal func_80093370 -/* 03770 808D5DE0 AFA00010 */ sw $zero, 0x0010($sp) +/* 03764 808D5DD4 AFA90018 */ sw $t1, 0x0018($sp) +/* 03768 808D5DD8 AFA80014 */ sw $t0, 0x0014($sp) +/* 0376C 808D5DDC 0C024CDC */ jal Gfx_SetFog +/* 03770 808D5DE0 AFA00010 */ sw $zero, 0x0010($sp) /* 03774 808D5DE4 AE0202C0 */ sw $v0, 0x02C0($s0) ## 000002C0 .L808D5DE8: /* 03778 808D5DE8 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 @@ -48,20 +48,20 @@ glabel BossFd2_Draw /* 03790 808D5E00 922C0223 */ lbu $t4, 0x0223($s1) ## 00000223 /* 03794 808D5E04 3C04808D */ lui $a0, %hi(D_808D62C0) ## $a0 = 808D0000 /* 03798 808D5E08 3C088016 */ lui $t0, 0x8016 ## $t0 = 80160000 -/* 0379C 808D5E0C 000C6880 */ sll $t5, $t4, 2 -/* 037A0 808D5E10 008D2021 */ addu $a0, $a0, $t5 -/* 037A4 808D5E14 8C8462C0 */ lw $a0, %lo(D_808D62C0)($a0) +/* 0379C 808D5E0C 000C6880 */ sll $t5, $t4, 2 +/* 037A0 808D5E10 008D2021 */ addu $a0, $a0, $t5 +/* 037A4 808D5E14 8C8462C0 */ lw $a0, %lo(D_808D62C0)($a0) /* 037A8 808D5E18 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 /* 037AC 808D5E1C 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF -/* 037B0 808D5E20 00047900 */ sll $t7, $a0, 4 -/* 037B4 808D5E24 000FC702 */ srl $t8, $t7, 28 -/* 037B8 808D5E28 0018C880 */ sll $t9, $t8, 2 -/* 037BC 808D5E2C 01194021 */ addu $t0, $t0, $t9 +/* 037B0 808D5E20 00047900 */ sll $t7, $a0, 4 +/* 037B4 808D5E24 000FC702 */ srl $t8, $t7, 28 +/* 037B8 808D5E28 0018C880 */ sll $t9, $t8, 2 +/* 037BC 808D5E2C 01194021 */ addu $t0, $t0, $t9 /* 037C0 808D5E30 8D086FA8 */ lw $t0, 0x6FA8($t0) ## 80166FA8 -/* 037C4 808D5E34 00817024 */ and $t6, $a0, $at +/* 037C4 808D5E34 00817024 */ and $t6, $a0, $at /* 037C8 808D5E38 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 037CC 808D5E3C 01C84821 */ addu $t1, $t6, $t0 -/* 037D0 808D5E40 01215021 */ addu $t2, $t1, $at +/* 037CC 808D5E3C 01C84821 */ addu $t1, $t6, $t0 +/* 037D0 808D5E40 01215021 */ addu $t2, $t1, $at /* 037D4 808D5E44 AC4A0004 */ sw $t2, 0x0004($v0) ## 00000004 /* 037D8 808D5E48 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 /* 037DC 808D5E4C 3C0CDB06 */ lui $t4, 0xDB06 ## $t4 = DB060000 @@ -75,36 +75,36 @@ glabel BossFd2_Draw /* 037FC 808D5E6C 240E0001 */ addiu $t6, $zero, 0x0001 ## $t6 = 00000001 /* 03800 808D5E70 24190020 */ addiu $t9, $zero, 0x0020 ## $t9 = 00000020 /* 03804 808D5E74 24180020 */ addiu $t8, $zero, 0x0020 ## $t8 = 00000020 -/* 03808 808D5E78 AFB80010 */ sw $t8, 0x0010($sp) -/* 0380C 808D5E7C AFB90014 */ sw $t9, 0x0014($sp) -/* 03810 808D5E80 AFAE0018 */ sw $t6, 0x0018($sp) +/* 03808 808D5E78 AFB80010 */ sw $t8, 0x0010($sp) +/* 0380C 808D5E7C AFB90014 */ sw $t9, 0x0014($sp) +/* 03810 808D5E80 AFAE0018 */ sw $t6, 0x0018($sp) /* 03814 808D5E84 C63001D0 */ lwc1 $f16, 0x01D0($s1) ## 000001D0 -/* 03818 808D5E88 4600218D */ trunc.w.s $f6, $f4 +/* 03818 808D5E88 4600218D */ trunc.w.s $f6, $f4 /* 0381C 808D5E8C 240E0020 */ addiu $t6, $zero, 0x0020 ## $t6 = 00000020 /* 03820 808D5E90 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 03824 808D5E94 4600848D */ trunc.w.s $f18, $f16 -/* 03828 808D5E98 44063000 */ mfc1 $a2, $f6 -/* 0382C 808D5E9C 4600428D */ trunc.w.s $f10, $f8 -/* 03830 808D5EA0 44099000 */ mfc1 $t1, $f18 -/* 03834 808D5EA4 00063400 */ sll $a2, $a2, 16 -/* 03838 808D5EA8 00063403 */ sra $a2, $a2, 16 -/* 0383C 808D5EAC 00095400 */ sll $t2, $t1, 16 -/* 03840 808D5EB0 000A5C03 */ sra $t3, $t2, 16 -/* 03844 808D5EB4 AFAB001C */ sw $t3, 0x001C($sp) +/* 03824 808D5E94 4600848D */ trunc.w.s $f18, $f16 +/* 03828 808D5E98 44063000 */ mfc1 $a2, $f6 +/* 0382C 808D5E9C 4600428D */ trunc.w.s $f10, $f8 +/* 03830 808D5EA0 44099000 */ mfc1 $t1, $f18 +/* 03834 808D5EA4 00063400 */ sll $a2, $a2, 16 +/* 03838 808D5EA8 00063403 */ sra $a2, $a2, 16 +/* 0383C 808D5EAC 00095400 */ sll $t2, $t1, 16 +/* 03840 808D5EB0 000A5C03 */ sra $t3, $t2, 16 +/* 03844 808D5EB4 AFAB001C */ sw $t3, 0x001C($sp) /* 03848 808D5EB8 C62401D4 */ lwc1 $f4, 0x01D4($s1) ## 000001D4 -/* 0384C 808D5EBC 44075000 */ mfc1 $a3, $f10 -/* 03850 808D5EC0 AFAE0028 */ sw $t6, 0x0028($sp) -/* 03854 808D5EC4 4600218D */ trunc.w.s $f6, $f4 -/* 03858 808D5EC8 00073C00 */ sll $a3, $a3, 16 -/* 0385C 808D5ECC 00073C03 */ sra $a3, $a3, 16 -/* 03860 808D5ED0 AFB90024 */ sw $t9, 0x0024($sp) -/* 03864 808D5ED4 440D3000 */ mfc1 $t5, $f6 -/* 03868 808D5ED8 AFA20054 */ sw $v0, 0x0054($sp) -/* 0386C 808D5EDC 000D7C00 */ sll $t7, $t5, 16 -/* 03870 808D5EE0 000FC403 */ sra $t8, $t7, 16 -/* 03874 808D5EE4 0C0253D0 */ jal Draw_TwoTexScroll -/* 03878 808D5EE8 AFB80020 */ sw $t8, 0x0020($sp) -/* 0387C 808D5EEC 8FA30054 */ lw $v1, 0x0054($sp) +/* 0384C 808D5EBC 44075000 */ mfc1 $a3, $f10 +/* 03850 808D5EC0 AFAE0028 */ sw $t6, 0x0028($sp) +/* 03854 808D5EC4 4600218D */ trunc.w.s $f6, $f4 +/* 03858 808D5EC8 00073C00 */ sll $a3, $a3, 16 +/* 0385C 808D5ECC 00073C03 */ sra $a3, $a3, 16 +/* 03860 808D5ED0 AFB90024 */ sw $t9, 0x0024($sp) +/* 03864 808D5ED4 440D3000 */ mfc1 $t5, $f6 +/* 03868 808D5ED8 AFA20054 */ sw $v0, 0x0054($sp) +/* 0386C 808D5EDC 000D7C00 */ sll $t7, $t5, 16 +/* 03870 808D5EE0 000FC403 */ sra $t8, $t7, 16 +/* 03874 808D5EE4 0C0253D0 */ jal Gfx_TwoTexScroll +/* 03878 808D5EE8 AFB80020 */ sw $t8, 0x0020($sp) +/* 0387C 808D5EEC 8FA30054 */ lw $v1, 0x0054($sp) /* 03880 808D5EF0 3C09FA00 */ lui $t1, 0xFA00 ## $t1 = FA000000 /* 03884 808D5EF4 240AFFFF */ addiu $t2, $zero, 0xFFFF ## $t2 = FFFFFFFF /* 03888 808D5EF8 AC620004 */ sw $v0, 0x0004($v1) ## 00000004 @@ -127,16 +127,16 @@ glabel BossFd2_Draw /* 038CC 808D5F3C 8E250150 */ lw $a1, 0x0150($s1) ## 00000150 /* 038D0 808D5F40 27185228 */ addiu $t8, $t8, %lo(func_808D5228) ## $t8 = 808D5228 /* 038D4 808D5F44 25EF4F94 */ addiu $t7, $t7, %lo(func_808D4F94) ## $t7 = 808D4F94 -/* 038D8 808D5F48 AFAF0010 */ sw $t7, 0x0010($sp) -/* 038DC 808D5F4C AFB80014 */ sw $t8, 0x0014($sp) -/* 038E0 808D5F50 AFB10018 */ sw $s1, 0x0018($sp) -/* 038E4 808D5F54 0C0286B2 */ jal func_800A1AC8 +/* 038D8 808D5F48 AFAF0010 */ sw $t7, 0x0010($sp) +/* 038DC 808D5F4C AFB80014 */ sw $t8, 0x0014($sp) +/* 038E0 808D5F50 AFB10018 */ sw $s1, 0x0018($sp) +/* 038E4 808D5F54 0C0286B2 */ jal SkelAnime_DrawSV /* 038E8 808D5F58 02402025 */ or $a0, $s2, $zero ## $a0 = 00000000 /* 038EC 808D5F5C 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 038F0 808D5F60 0C235638 */ jal func_808D58E0 +/* 038F0 808D5F60 0C235638 */ jal func_808D58E0 /* 038F4 808D5F64 02402825 */ or $a1, $s2, $zero ## $a1 = 00000000 /* 038F8 808D5F68 02402025 */ or $a0, $s2, $zero ## $a0 = 00000000 -/* 038FC 808D5F6C 0C02F228 */ jal func_800BC8A0 +/* 038FC 808D5F6C 0C02F228 */ jal func_800BC8A0 /* 03900 808D5F70 8E0502C0 */ lw $a1, 0x02C0($s0) ## 000002C0 /* 03904 808D5F74 AE0202C0 */ sw $v0, 0x02C0($s0) ## 000002C0 .L808D5F78: @@ -144,13 +144,13 @@ glabel BossFd2_Draw /* 0390C 808D5F7C 24C66468 */ addiu $a2, $a2, %lo(D_808D6468) ## $a2 = 808D6468 /* 03910 808D5F80 27A4005C */ addiu $a0, $sp, 0x005C ## $a0 = FFFFFFE4 /* 03914 808D5F84 8E450000 */ lw $a1, 0x0000($s2) ## 00000000 -/* 03918 808D5F88 0C031AD5 */ jal func_800C6B54 +/* 03918 808D5F88 0C031AD5 */ jal Graph_CloseDisps /* 0391C 808D5F8C 24070A80 */ addiu $a3, $zero, 0x0A80 ## $a3 = 00000A80 -/* 03920 808D5F90 8FBF0044 */ lw $ra, 0x0044($sp) -/* 03924 808D5F94 8FB00038 */ lw $s0, 0x0038($sp) -/* 03928 808D5F98 8FB1003C */ lw $s1, 0x003C($sp) -/* 0392C 808D5F9C 8FB20040 */ lw $s2, 0x0040($sp) -/* 03930 808D5FA0 03E00008 */ jr $ra +/* 03920 808D5F90 8FBF0044 */ lw $ra, 0x0044($sp) +/* 03924 808D5F94 8FB00038 */ lw $s0, 0x0038($sp) +/* 03928 808D5F98 8FB1003C */ lw $s1, 0x003C($sp) +/* 0392C 808D5F9C 8FB20040 */ lw $s2, 0x0040($sp) +/* 03930 808D5FA0 03E00008 */ jr $ra /* 03934 808D5FA4 27BD0078 */ addiu $sp, $sp, 0x0078 ## $sp = 00000000 /* 03938 808D5FA8 00000000 */ nop /* 0393C 808D5FAC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Fd2/BossFd2_Init.s b/asm/non_matchings/overlays/actors/ovl_Boss_Fd2/BossFd2_Init.s index c183699e3a..b4bd2d0086 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Fd2/BossFd2_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Fd2/BossFd2_Init.s @@ -1,70 +1,70 @@ glabel BossFd2_Init /* 00430 808D2AA0 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 -/* 00434 808D2AA4 AFA50044 */ sw $a1, 0x0044($sp) -/* 00438 808D2AA8 AFBF002C */ sw $ra, 0x002C($sp) -/* 0043C 808D2AAC AFB00028 */ sw $s0, 0x0028($sp) +/* 00434 808D2AA4 AFA50044 */ sw $a1, 0x0044($sp) +/* 00438 808D2AA8 AFBF002C */ sw $ra, 0x002C($sp) +/* 0043C 808D2AAC AFB00028 */ sw $s0, 0x0028($sp) /* 00440 808D2AB0 3C05808D */ lui $a1, %hi(D_808D6190) ## $a1 = 808D0000 /* 00444 808D2AB4 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 00448 808D2AB8 0C01E037 */ jal Actor_ProcessInitChain - + /* 0044C 808D2ABC 24A56190 */ addiu $a1, $a1, %lo(D_808D6190) ## $a1 = 808D6190 /* 00450 808D2AC0 3C053BE5 */ lui $a1, 0x3BE5 ## $a1 = 3BE50000 /* 00454 808D2AC4 34A56040 */ ori $a1, $a1, 0x6040 ## $a1 = 3BE56040 /* 00458 808D2AC8 0C00B58B */ jal Actor_SetScale - + /* 0045C 808D2ACC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 00460 808D2AD0 3C01808D */ lui $at, %hi(D_808D6478) ## $at = 808D0000 -/* 00464 808D2AD4 C4246478 */ lwc1 $f4, %lo(D_808D6478)($at) +/* 00464 808D2AD4 C4246478 */ lwc1 $f4, %lo(D_808D6478)($at) /* 00468 808D2AD8 3C01C411 */ lui $at, 0xC411 ## $at = C4110000 /* 0046C 808D2ADC 44813000 */ mtc1 $at, $f6 ## $f6 = -580.00 /* 00470 808D2AE0 C6080054 */ lwc1 $f8, 0x0054($s0) ## 00000054 /* 00474 808D2AE4 260400B4 */ addiu $a0, $s0, 0x00B4 ## $a0 = 000000B4 /* 00478 808D2AE8 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 0047C 808D2AEC 46083283 */ div.s $f10, $f6, $f8 +/* 0047C 808D2AEC 46083283 */ div.s $f10, $f6, $f8 /* 00480 808D2AF0 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 /* 00484 808D2AF4 E6040028 */ swc1 $f4, 0x0028($s0) ## 00000028 -/* 00488 808D2AF8 44055000 */ mfc1 $a1, $f10 +/* 00488 808D2AF8 44055000 */ mfc1 $a1, $f10 /* 0048C 808D2AFC 0C00AC78 */ jal ActorShape_Init - + /* 00490 808D2B00 00000000 */ nop /* 00494 808D2B04 3C060601 */ lui $a2, 0x0601 ## $a2 = 06010000 /* 00498 808D2B08 3C070601 */ lui $a3, 0x0601 ## $a3 = 06010000 /* 0049C 808D2B0C 24E7C8EC */ addiu $a3, $a3, 0xC8EC ## $a3 = 0600C8EC /* 004A0 808D2B10 24C61A78 */ addiu $a2, $a2, 0x1A78 ## $a2 = 06011A78 -/* 004A4 808D2B14 8FA40044 */ lw $a0, 0x0044($sp) +/* 004A4 808D2B14 8FA40044 */ lw $a0, 0x0044($sp) /* 004A8 808D2B18 2605014C */ addiu $a1, $s0, 0x014C ## $a1 = 0000014C -/* 004AC 808D2B1C AFA00010 */ sw $zero, 0x0010($sp) -/* 004B0 808D2B20 AFA00014 */ sw $zero, 0x0014($sp) -/* 004B4 808D2B24 0C0291BE */ jal func_800A46F8 -/* 004B8 808D2B28 AFA00018 */ sw $zero, 0x0018($sp) +/* 004AC 808D2B1C AFA00010 */ sw $zero, 0x0010($sp) +/* 004B0 808D2B20 AFA00014 */ sw $zero, 0x0014($sp) +/* 004B4 808D2B24 0C0291BE */ jal SkelAnime_InitSV +/* 004B8 808D2B28 AFA00018 */ sw $zero, 0x0018($sp) /* 004BC 808D2B2C 860E001C */ lh $t6, 0x001C($s0) ## 0000001C /* 004C0 808D2B30 3C0F808D */ lui $t7, %hi(func_808D4748) ## $t7 = 808D0000 /* 004C4 808D2B34 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 004C8 808D2B38 15C00005 */ bne $t6, $zero, .L808D2B50 +/* 004C8 808D2B38 15C00005 */ bne $t6, $zero, .L808D2B50 /* 004CC 808D2B3C 25EF4748 */ addiu $t7, $t7, %lo(func_808D4748) ## $t7 = 808D4748 -/* 004D0 808D2B40 0C234AF4 */ jal func_808D2BD0 -/* 004D4 808D2B44 8FA50044 */ lw $a1, 0x0044($sp) -/* 004D8 808D2B48 10000003 */ beq $zero, $zero, .L808D2B58 +/* 004D0 808D2B40 0C234AF4 */ jal func_808D2BD0 +/* 004D4 808D2B44 8FA50044 */ lw $a1, 0x0044($sp) +/* 004D8 808D2B48 10000003 */ beq $zero, $zero, .L808D2B58 /* 004DC 808D2B4C 2605141C */ addiu $a1, $s0, 0x141C ## $a1 = 0000141C .L808D2B50: /* 004E0 808D2B50 AE0F0190 */ sw $t7, 0x0190($s0) ## 00000190 /* 004E4 808D2B54 2605141C */ addiu $a1, $s0, 0x141C ## $a1 = 0000141C .L808D2B58: -/* 004E8 808D2B58 AFA50034 */ sw $a1, 0x0034($sp) -/* 004EC 808D2B5C 0C016EFE */ jal func_8005BBF8 -/* 004F0 808D2B60 8FA40044 */ lw $a0, 0x0044($sp) +/* 004E8 808D2B58 AFA50034 */ sw $a1, 0x0034($sp) +/* 004EC 808D2B5C 0C016EFE */ jal func_8005BBF8 +/* 004F0 808D2B60 8FA40044 */ lw $a0, 0x0044($sp) /* 004F4 808D2B64 3C07808D */ lui $a3, %hi(D_808D6114) ## $a3 = 808D0000 /* 004F8 808D2B68 2618143C */ addiu $t8, $s0, 0x143C ## $t8 = 0000143C -/* 004FC 808D2B6C 8FA50034 */ lw $a1, 0x0034($sp) -/* 00500 808D2B70 AFB80010 */ sw $t8, 0x0010($sp) +/* 004FC 808D2B6C 8FA50034 */ lw $a1, 0x0034($sp) +/* 00500 808D2B70 AFB80010 */ sw $t8, 0x0010($sp) /* 00504 808D2B74 24E76114 */ addiu $a3, $a3, %lo(D_808D6114) ## $a3 = 808D6114 -/* 00508 808D2B78 8FA40044 */ lw $a0, 0x0044($sp) -/* 0050C 808D2B7C 0C017014 */ jal func_8005C050 +/* 00508 808D2B78 8FA40044 */ lw $a0, 0x0044($sp) +/* 0050C 808D2B7C 0C017014 */ jal func_8005C050 /* 00510 808D2B80 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 -/* 00514 808D2B84 8FBF002C */ lw $ra, 0x002C($sp) -/* 00518 808D2B88 8FB00028 */ lw $s0, 0x0028($sp) +/* 00514 808D2B84 8FBF002C */ lw $ra, 0x002C($sp) +/* 00518 808D2B88 8FB00028 */ lw $s0, 0x0028($sp) /* 0051C 808D2B8C 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 -/* 00520 808D2B90 03E00008 */ jr $ra +/* 00520 808D2B90 03E00008 */ jr $ra /* 00524 808D2B94 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Fd2/func_808D2BD0.s b/asm/non_matchings/overlays/actors/ovl_Boss_Fd2/func_808D2BD0.s index 4eff467928..2e66ae40f5 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Fd2/func_808D2BD0.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Fd2/func_808D2BD0.s @@ -1,18 +1,18 @@ glabel func_808D2BD0 /* 00560 808D2BD0 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 00564 808D2BD4 AFBF001C */ sw $ra, 0x001C($sp) -/* 00568 808D2BD8 AFB00018 */ sw $s0, 0x0018($sp) -/* 0056C 808D2BDC AFA5002C */ sw $a1, 0x002C($sp) +/* 00564 808D2BD4 AFBF001C */ sw $ra, 0x001C($sp) +/* 00568 808D2BD8 AFB00018 */ sw $s0, 0x0018($sp) +/* 0056C 808D2BDC AFA5002C */ sw $a1, 0x002C($sp) /* 00570 808D2BE0 8C8E0118 */ lw $t6, 0x0118($a0) ## 00000118 /* 00574 808D2BE4 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 00578 808D2BE8 3C04808D */ lui $a0, %hi(D_808D62D0) ## $a0 = 808D0000 /* 0057C 808D2BEC 248462D0 */ addiu $a0, $a0, %lo(D_808D62D0) ## $a0 = 808D62D0 /* 00580 808D2BF0 0C00084C */ jal osSyncPrintf - -/* 00584 808D2BF4 AFAE0024 */ sw $t6, 0x0024($sp) + +/* 00584 808D2BF4 AFAE0024 */ sw $t6, 0x0024($sp) /* 00588 808D2BF8 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 /* 0058C 808D2BFC 24A5C1D0 */ addiu $a1, $a1, 0xC1D0 ## $a1 = 0600C1D0 -/* 00590 808D2C00 0C02947A */ jal func_800A51E8 +/* 00590 808D2C00 0C02947A */ jal SkelAnime_ChangeAnimDefaultStop /* 00594 808D2C04 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C /* 00598 808D2C08 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 /* 0059C 808D2C0C 3C0F808D */ lui $t7, %hi(func_808D2CE0) ## $t7 = 808D0000 @@ -21,59 +21,59 @@ glabel func_808D2BD0 /* 005A8 808D2C18 3C01808D */ lui $at, %hi(D_808D647C) ## $at = 808D0000 /* 005AC 808D2C1C E6040168 */ swc1 $f4, 0x0168($s0) ## 00000168 /* 005B0 808D2C20 0C00CFBE */ jal Math_Rand_ZeroFloat - -/* 005B4 808D2C24 C42C647C */ lwc1 $f12, %lo(D_808D647C)($at) -/* 005B8 808D2C28 4600018D */ trunc.w.s $f6, $f0 + +/* 005B4 808D2C24 C42C647C */ lwc1 $f12, %lo(D_808D647C)($at) +/* 005B8 808D2C28 4600018D */ trunc.w.s $f6, $f0 /* 005BC 808D2C2C 3C0B808D */ lui $t3, %hi(D_808D6124) ## $t3 = 808D0000 /* 005C0 808D2C30 256B6124 */ addiu $t3, $t3, %lo(D_808D6124) ## $t3 = 808D6124 /* 005C4 808D2C34 3C04808D */ lui $a0, %hi(D_808D62DC) ## $a0 = 808D0000 -/* 005C8 808D2C38 44193000 */ mfc1 $t9, $f6 +/* 005C8 808D2C38 44193000 */ mfc1 $t9, $f6 /* 005CC 808D2C3C 248462DC */ addiu $a0, $a0, %lo(D_808D62DC) ## $a0 = 808D62DC -/* 005D0 808D2C40 00194400 */ sll $t0, $t9, 16 -/* 005D4 808D2C44 00084C03 */ sra $t1, $t0, 16 -/* 005D8 808D2C48 00095080 */ sll $t2, $t1, 2 -/* 005DC 808D2C4C 01495023 */ subu $t2, $t2, $t1 -/* 005E0 808D2C50 000A5080 */ sll $t2, $t2, 2 -/* 005E4 808D2C54 014B1021 */ addu $v0, $t2, $t3 +/* 005D0 808D2C40 00194400 */ sll $t0, $t9, 16 +/* 005D4 808D2C44 00084C03 */ sra $t1, $t0, 16 +/* 005D8 808D2C48 00095080 */ sll $t2, $t1, 2 +/* 005DC 808D2C4C 01495023 */ subu $t2, $t2, $t1 +/* 005E0 808D2C50 000A5080 */ sll $t2, $t2, 2 +/* 005E4 808D2C54 014B1021 */ addu $v0, $t2, $t3 /* 005E8 808D2C58 C4480000 */ lwc1 $f8, 0x0000($v0) ## 00000000 /* 005EC 808D2C5C E6080024 */ swc1 $f8, 0x0024($s0) ## 00000024 /* 005F0 808D2C60 C44A0008 */ lwc1 $f10, 0x0008($v0) ## 00000008 /* 005F4 808D2C64 A6000198 */ sh $zero, 0x0198($s0) ## 00000198 /* 005F8 808D2C68 0C00084C */ jal osSyncPrintf - + /* 005FC 808D2C6C E60A002C */ swc1 $f10, 0x002C($s0) ## 0000002C -/* 00600 808D2C70 8FA30024 */ lw $v1, 0x0024($sp) +/* 00600 808D2C70 8FA30024 */ lw $v1, 0x0024($sp) /* 00604 808D2C74 240C000A */ addiu $t4, $zero, 0x000A ## $t4 = 0000000A /* 00608 808D2C78 A60C01BC */ sh $t4, 0x01BC($s0) ## 000001BC -/* 0060C 808D2C7C 50600014 */ beql $v1, $zero, .L808D2CD0 -/* 00610 808D2C80 8FBF001C */ lw $ra, 0x001C($sp) +/* 0060C 808D2C7C 50600014 */ beql $v1, $zero, .L808D2CD0 +/* 00610 808D2C80 8FBF001C */ lw $ra, 0x001C($sp) /* 00614 808D2C84 806200AF */ lb $v0, 0x00AF($v1) ## 000000AF -/* 00618 808D2C88 28410012 */ slti $at, $v0, 0x0012 -/* 0061C 808D2C8C 54200004 */ bnel $at, $zero, .L808D2CA0 -/* 00620 808D2C90 2841000C */ slti $at, $v0, 0x000C -/* 00624 808D2C94 1000000D */ beq $zero, $zero, .L808D2CCC +/* 00618 808D2C88 28410012 */ slti $at, $v0, 0x0012 +/* 0061C 808D2C8C 54200004 */ bnel $at, $zero, .L808D2CA0 +/* 00620 808D2C90 2841000C */ slti $at, $v0, 0x000C +/* 00624 808D2C94 1000000D */ beq $zero, $zero, .L808D2CCC /* 00628 808D2C98 A60001AC */ sh $zero, 0x01AC($s0) ## 000001AC -/* 0062C 808D2C9C 2841000C */ slti $at, $v0, 0x000C +/* 0062C 808D2C9C 2841000C */ slti $at, $v0, 0x000C .L808D2CA0: -/* 00630 808D2CA0 14200003 */ bne $at, $zero, .L808D2CB0 +/* 00630 808D2CA0 14200003 */ bne $at, $zero, .L808D2CB0 /* 00634 808D2CA4 240D0001 */ addiu $t5, $zero, 0x0001 ## $t5 = 00000001 -/* 00638 808D2CA8 10000008 */ beq $zero, $zero, .L808D2CCC +/* 00638 808D2CA8 10000008 */ beq $zero, $zero, .L808D2CCC /* 0063C 808D2CAC A60D01AC */ sh $t5, 0x01AC($s0) ## 000001AC .L808D2CB0: -/* 00640 808D2CB0 28410006 */ slti $at, $v0, 0x0006 -/* 00644 808D2CB4 14200004 */ bne $at, $zero, .L808D2CC8 +/* 00640 808D2CB0 28410006 */ slti $at, $v0, 0x0006 +/* 00644 808D2CB4 14200004 */ bne $at, $zero, .L808D2CC8 /* 00648 808D2CB8 240F0003 */ addiu $t7, $zero, 0x0003 ## $t7 = 00000003 /* 0064C 808D2CBC 240E0002 */ addiu $t6, $zero, 0x0002 ## $t6 = 00000002 -/* 00650 808D2CC0 10000002 */ beq $zero, $zero, .L808D2CCC +/* 00650 808D2CC0 10000002 */ beq $zero, $zero, .L808D2CCC /* 00654 808D2CC4 A60E01AC */ sh $t6, 0x01AC($s0) ## 000001AC .L808D2CC8: /* 00658 808D2CC8 A60F01AC */ sh $t7, 0x01AC($s0) ## 000001AC .L808D2CCC: -/* 0065C 808D2CCC 8FBF001C */ lw $ra, 0x001C($sp) +/* 0065C 808D2CCC 8FBF001C */ lw $ra, 0x001C($sp) .L808D2CD0: -/* 00660 808D2CD0 8FB00018 */ lw $s0, 0x0018($sp) +/* 00660 808D2CD0 8FB00018 */ lw $s0, 0x0018($sp) /* 00664 808D2CD4 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 00668 808D2CD8 03E00008 */ jr $ra +/* 00668 808D2CD8 03E00008 */ jr $ra /* 0066C 808D2CDC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Fd2/func_808D308C.s b/asm/non_matchings/overlays/actors/ovl_Boss_Fd2/func_808D308C.s index d457f47e68..4921ec154e 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Fd2/func_808D308C.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Fd2/func_808D308C.s @@ -1,53 +1,53 @@ glabel func_808D308C /* 00A1C 808D308C 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 00A20 808D3090 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00A24 808D3094 AFA40020 */ sw $a0, 0x0020($sp) -/* 00A28 808D3098 AFA50024 */ sw $a1, 0x0024($sp) +/* 00A20 808D3090 AFBF0014 */ sw $ra, 0x0014($sp) +/* 00A24 808D3094 AFA40020 */ sw $a0, 0x0020($sp) +/* 00A28 808D3098 AFA50024 */ sw $a1, 0x0024($sp) /* 00A2C 808D309C 8C8F0118 */ lw $t7, 0x0118($a0) ## 00000118 /* 00A30 808D30A0 3C04808D */ lui $a0, %hi(D_808D6358) ## $a0 = 808D0000 /* 00A34 808D30A4 24846358 */ addiu $a0, $a0, %lo(D_808D6358) ## $a0 = 808D6358 /* 00A38 808D30A8 0C00084C */ jal osSyncPrintf - -/* 00A3C 808D30AC AFAF001C */ sw $t7, 0x001C($sp) -/* 00A40 808D30B0 8FA40020 */ lw $a0, 0x0020($sp) + +/* 00A3C 808D30AC AFAF001C */ sw $t7, 0x001C($sp) +/* 00A40 808D30B0 8FA40020 */ lw $a0, 0x0020($sp) /* 00A44 808D30B4 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 /* 00A48 808D30B8 24A5AE90 */ addiu $a1, $a1, 0xAE90 ## $a1 = 0600AE90 -/* 00A4C 808D30BC 0C0294BE */ jal func_800A52F8 +/* 00A4C 808D30BC 0C0294BE */ jal SkelAnime_ChangeAnimDefaultRepeat /* 00A50 808D30C0 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 00A54 808D30C4 8FA30020 */ lw $v1, 0x0020($sp) +/* 00A54 808D30C4 8FA30020 */ lw $v1, 0x0020($sp) /* 00A58 808D30C8 3C18808D */ lui $t8, %hi(func_808D3140) ## $t8 = 808D0000 /* 00A5C 808D30CC 27183140 */ addiu $t8, $t8, %lo(func_808D3140) ## $t8 = 808D3140 /* 00A60 808D30D0 AC780190 */ sw $t8, 0x0190($v1) ## 00000190 -/* 00A64 808D30D4 8FB9001C */ lw $t9, 0x001C($sp) +/* 00A64 808D30D4 8FB9001C */ lw $t9, 0x001C($sp) /* 00A68 808D30D8 24010018 */ addiu $at, $zero, 0x0018 ## $at = 00000018 /* 00A6C 808D30DC 832200AF */ lb $v0, 0x00AF($t9) ## 000000AF -/* 00A70 808D30E0 54410004 */ bnel $v0, $at, .L808D30F4 -/* 00A74 808D30E4 28410012 */ slti $at, $v0, 0x0012 -/* 00A78 808D30E8 10000010 */ beq $zero, $zero, .L808D312C +/* 00A70 808D30E0 54410004 */ bnel $v0, $at, .L808D30F4 +/* 00A74 808D30E4 28410012 */ slti $at, $v0, 0x0012 +/* 00A78 808D30E8 10000010 */ beq $zero, $zero, .L808D312C /* 00A7C 808D30EC 24020032 */ addiu $v0, $zero, 0x0032 ## $v0 = 00000032 -/* 00A80 808D30F0 28410012 */ slti $at, $v0, 0x0012 +/* 00A80 808D30F0 28410012 */ slti $at, $v0, 0x0012 .L808D30F4: -/* 00A84 808D30F4 54200004 */ bnel $at, $zero, .L808D3108 -/* 00A88 808D30F8 2841000C */ slti $at, $v0, 0x000C -/* 00A8C 808D30FC 1000000B */ beq $zero, $zero, .L808D312C +/* 00A84 808D30F4 54200004 */ bnel $at, $zero, .L808D3108 +/* 00A88 808D30F8 2841000C */ slti $at, $v0, 0x000C +/* 00A8C 808D30FC 1000000B */ beq $zero, $zero, .L808D312C /* 00A90 808D3100 24020028 */ addiu $v0, $zero, 0x0028 ## $v0 = 00000028 -/* 00A94 808D3104 2841000C */ slti $at, $v0, 0x000C +/* 00A94 808D3104 2841000C */ slti $at, $v0, 0x000C .L808D3108: -/* 00A98 808D3108 54200004 */ bnel $at, $zero, .L808D311C -/* 00A9C 808D310C 28410006 */ slti $at, $v0, 0x0006 -/* 00AA0 808D3110 10000006 */ beq $zero, $zero, .L808D312C +/* 00A98 808D3108 54200004 */ bnel $at, $zero, .L808D311C +/* 00A9C 808D310C 28410006 */ slti $at, $v0, 0x0006 +/* 00AA0 808D3110 10000006 */ beq $zero, $zero, .L808D312C /* 00AA4 808D3114 24020028 */ addiu $v0, $zero, 0x0028 ## $v0 = 00000028 -/* 00AA8 808D3118 28410006 */ slti $at, $v0, 0x0006 +/* 00AA8 808D3118 28410006 */ slti $at, $v0, 0x0006 .L808D311C: -/* 00AAC 808D311C 14200003 */ bne $at, $zero, .L808D312C +/* 00AAC 808D311C 14200003 */ bne $at, $zero, .L808D312C /* 00AB0 808D3120 24020014 */ addiu $v0, $zero, 0x0014 ## $v0 = 00000014 -/* 00AB4 808D3124 10000001 */ beq $zero, $zero, .L808D312C +/* 00AB4 808D3124 10000001 */ beq $zero, $zero, .L808D312C /* 00AB8 808D3128 2402001E */ addiu $v0, $zero, 0x001E ## $v0 = 0000001E .L808D312C: /* 00ABC 808D312C A46201BC */ sh $v0, 0x01BC($v1) ## 000001BC -/* 00AC0 808D3130 8FBF0014 */ lw $ra, 0x0014($sp) +/* 00AC0 808D3130 8FBF0014 */ lw $ra, 0x0014($sp) /* 00AC4 808D3134 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 00AC8 808D3138 03E00008 */ jr $ra +/* 00AC8 808D3138 03E00008 */ jr $ra /* 00ACC 808D313C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Fd2/func_808D3140.s b/asm/non_matchings/overlays/actors/ovl_Boss_Fd2/func_808D3140.s index 350a0d9284..147dfd239e 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Fd2/func_808D3140.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Fd2/func_808D3140.s @@ -1,104 +1,104 @@ glabel func_808D3140 /* 00AD0 808D3140 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 00AD4 808D3144 AFB00020 */ sw $s0, 0x0020($sp) +/* 00AD4 808D3144 AFB00020 */ sw $s0, 0x0020($sp) /* 00AD8 808D3148 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00ADC 808D314C AFBF0024 */ sw $ra, 0x0024($sp) +/* 00ADC 808D314C AFBF0024 */ sw $ra, 0x0024($sp) /* 00AE0 808D3150 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 00AE4 808D3154 AFA5003C */ sw $a1, 0x003C($sp) +/* 00AE4 808D3154 AFA5003C */ sw $a1, 0x003C($sp) /* 00AE8 808D3158 0C02927F */ jal SkelAnime_FrameUpdateMatrix - -/* 00AEC 808D315C AFA40030 */ sw $a0, 0x0030($sp) + +/* 00AEC 808D315C AFA40030 */ sw $a0, 0x0030($sp) /* 00AF0 808D3160 860E0196 */ lh $t6, 0x0196($s0) ## 00000196 /* 00AF4 808D3164 260400B6 */ addiu $a0, $s0, 0x00B6 ## $a0 = 000000B6 /* 00AF8 808D3168 24060003 */ addiu $a2, $zero, 0x0003 ## $a2 = 00000003 -/* 00AFC 808D316C A7AE0036 */ sh $t6, 0x0036($sp) +/* 00AFC 808D316C A7AE0036 */ sh $t6, 0x0036($sp) /* 00B00 808D3170 8605008A */ lh $a1, 0x008A($s0) ## 0000008A -/* 00B04 808D3174 AFA00010 */ sw $zero, 0x0010($sp) +/* 00B04 808D3174 AFA00010 */ sw $zero, 0x0010($sp) /* 00B08 808D3178 0C01E1A7 */ jal Math_SmoothScaleMaxMinS - + /* 00B0C 808D317C 240707D0 */ addiu $a3, $zero, 0x07D0 ## $a3 = 000007D0 /* 00B10 808D3180 A6020196 */ sh $v0, 0x0196($s0) ## 00000196 /* 00B14 808D3184 3C04808D */ lui $a0, %hi(D_808D6364) ## $a0 = 808D0000 /* 00B18 808D3188 24846364 */ addiu $a0, $a0, %lo(D_808D6364) ## $a0 = 808D6364 /* 00B1C 808D318C 0C00084C */ jal osSyncPrintf - -/* 00B20 808D3190 87A50036 */ lh $a1, 0x0036($sp) + +/* 00B20 808D3190 87A50036 */ lh $a1, 0x0036($sp) /* 00B24 808D3194 3C04808D */ lui $a0, %hi(D_808D6370) ## $a0 = 808D0000 /* 00B28 808D3198 24846370 */ addiu $a0, $a0, %lo(D_808D6370) ## $a0 = 808D6370 /* 00B2C 808D319C 0C00084C */ jal osSyncPrintf - + /* 00B30 808D31A0 86050196 */ lh $a1, 0x0196($s0) ## 00000196 -/* 00B34 808D31A4 87AF0036 */ lh $t7, 0x0036($sp) +/* 00B34 808D31A4 87AF0036 */ lh $t7, 0x0036($sp) /* 00B38 808D31A8 3C01447A */ lui $at, 0x447A ## $at = 447A0000 /* 00B3C 808D31AC 44816000 */ mtc1 $at, $f12 ## $f12 = 1000.00 /* 00B40 808D31B0 448F2000 */ mtc1 $t7, $f4 ## $f4 = 0.00 /* 00B44 808D31B4 00000000 */ nop -/* 00B48 808D31B8 468020A0 */ cvt.s.w $f2, $f4 -/* 00B4C 808D31BC 46001085 */ abs.s $f2, $f2 -/* 00B50 808D31C0 460C103E */ c.le.s $f2, $f12 +/* 00B48 808D31B8 468020A0 */ cvt.s.w $f2, $f4 +/* 00B4C 808D31BC 46001085 */ abs.s $f2, $f2 +/* 00B50 808D31C0 460C103E */ c.le.s $f2, $f12 /* 00B54 808D31C4 00000000 */ nop -/* 00B58 808D31C8 45020013 */ bc1fl .L808D3218 -/* 00B5C 808D31CC 4602603C */ c.lt.s $f12, $f2 +/* 00B58 808D31C8 45020013 */ bc1fl .L808D3218 +/* 00B5C 808D31CC 4602603C */ c.lt.s $f12, $f2 /* 00B60 808D31D0 86180196 */ lh $t8, 0x0196($s0) ## 00000196 /* 00B64 808D31D4 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 /* 00B68 808D31D8 24A5AE90 */ addiu $a1, $a1, 0xAE90 ## $a1 = 0600AE90 /* 00B6C 808D31DC 44983000 */ mtc1 $t8, $f6 ## $f6 = 0.00 -/* 00B70 808D31E0 8FA40030 */ lw $a0, 0x0030($sp) +/* 00B70 808D31E0 8FA40030 */ lw $a0, 0x0030($sp) /* 00B74 808D31E4 3C06C0A0 */ lui $a2, 0xC0A0 ## $a2 = C0A00000 -/* 00B78 808D31E8 46803020 */ cvt.s.w $f0, $f6 -/* 00B7C 808D31EC 46000005 */ abs.s $f0, $f0 -/* 00B80 808D31F0 4600603C */ c.lt.s $f12, $f0 +/* 00B78 808D31E8 46803020 */ cvt.s.w $f0, $f6 +/* 00B7C 808D31EC 46000005 */ abs.s $f0, $f0 +/* 00B80 808D31F0 4600603C */ c.lt.s $f12, $f0 /* 00B84 808D31F4 00000000 */ nop -/* 00B88 808D31F8 45020007 */ bc1fl .L808D3218 -/* 00B8C 808D31FC 4602603C */ c.lt.s $f12, $f2 -/* 00B90 808D3200 0C0294D3 */ jal func_800A534C -/* 00B94 808D3204 E7A2002C */ swc1 $f2, 0x002C($sp) +/* 00B88 808D31F8 45020007 */ bc1fl .L808D3218 +/* 00B8C 808D31FC 4602603C */ c.lt.s $f12, $f2 +/* 00B90 808D3200 0C0294D3 */ jal SkelAnime_ChangeAnimTransitionRepeat +/* 00B94 808D3204 E7A2002C */ swc1 $f2, 0x002C($sp) /* 00B98 808D3208 3C01447A */ lui $at, 0x447A ## $at = 447A0000 /* 00B9C 808D320C 44816000 */ mtc1 $at, $f12 ## $f12 = 1000.00 -/* 00BA0 808D3210 C7A2002C */ lwc1 $f2, 0x002C($sp) -/* 00BA4 808D3214 4602603C */ c.lt.s $f12, $f2 +/* 00BA0 808D3210 C7A2002C */ lwc1 $f2, 0x002C($sp) +/* 00BA4 808D3214 4602603C */ c.lt.s $f12, $f2 .L808D3218: /* 00BA8 808D3218 00000000 */ nop -/* 00BAC 808D321C 4502000F */ bc1fl .L808D325C +/* 00BAC 808D321C 4502000F */ bc1fl .L808D325C /* 00BB0 808D3220 860801BC */ lh $t0, 0x01BC($s0) ## 000001BC /* 00BB4 808D3224 86190196 */ lh $t9, 0x0196($s0) ## 00000196 /* 00BB8 808D3228 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 /* 00BBC 808D322C 24A5C8EC */ addiu $a1, $a1, 0xC8EC ## $a1 = 0600C8EC /* 00BC0 808D3230 44994000 */ mtc1 $t9, $f8 ## $f8 = 0.00 -/* 00BC4 808D3234 8FA40030 */ lw $a0, 0x0030($sp) -/* 00BC8 808D3238 46804020 */ cvt.s.w $f0, $f8 -/* 00BCC 808D323C 46000005 */ abs.s $f0, $f0 -/* 00BD0 808D3240 460C003E */ c.le.s $f0, $f12 +/* 00BC4 808D3234 8FA40030 */ lw $a0, 0x0030($sp) +/* 00BC8 808D3238 46804020 */ cvt.s.w $f0, $f8 +/* 00BCC 808D323C 46000005 */ abs.s $f0, $f0 +/* 00BD0 808D3240 460C003E */ c.le.s $f0, $f12 /* 00BD4 808D3244 00000000 */ nop -/* 00BD8 808D3248 45020004 */ bc1fl .L808D325C +/* 00BD8 808D3248 45020004 */ bc1fl .L808D325C /* 00BDC 808D324C 860801BC */ lh $t0, 0x01BC($s0) ## 000001BC -/* 00BE0 808D3250 0C0294D3 */ jal func_800A534C +/* 00BE0 808D3250 0C0294D3 */ jal SkelAnime_ChangeAnimTransitionRepeat /* 00BE4 808D3254 3C06C0A0 */ lui $a2, 0xC0A0 ## $a2 = C0A00000 /* 00BE8 808D3258 860801BC */ lh $t0, 0x01BC($s0) ## 000001BC .L808D325C: /* 00BEC 808D325C 3C014348 */ lui $at, 0x4348 ## $at = 43480000 -/* 00BF0 808D3260 55000010 */ bnel $t0, $zero, .L808D32A4 -/* 00BF4 808D3264 8FBF0024 */ lw $ra, 0x0024($sp) +/* 00BF0 808D3260 55000010 */ bnel $t0, $zero, .L808D32A4 +/* 00BF4 808D3264 8FBF0024 */ lw $ra, 0x0024($sp) /* 00BF8 808D3268 C60A0090 */ lwc1 $f10, 0x0090($s0) ## 00000090 /* 00BFC 808D326C 44818000 */ mtc1 $at, $f16 ## $f16 = 200.00 -/* 00C00 808D3270 8FA5003C */ lw $a1, 0x003C($sp) +/* 00C00 808D3270 8FA5003C */ lw $a1, 0x003C($sp) /* 00C04 808D3274 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00C08 808D3278 4610503C */ c.lt.s $f10, $f16 +/* 00C08 808D3278 4610503C */ c.lt.s $f10, $f16 /* 00C0C 808D327C 00000000 */ nop -/* 00C10 808D3280 45000005 */ bc1f .L808D3298 +/* 00C10 808D3280 45000005 */ bc1f .L808D3298 /* 00C14 808D3284 00000000 */ nop -/* 00C18 808D3288 0C234E6A */ jal func_808D39A8 +/* 00C18 808D3288 0C234E6A */ jal func_808D39A8 /* 00C1C 808D328C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00C20 808D3290 10000004 */ beq $zero, $zero, .L808D32A4 -/* 00C24 808D3294 8FBF0024 */ lw $ra, 0x0024($sp) +/* 00C20 808D3290 10000004 */ beq $zero, $zero, .L808D32A4 +/* 00C24 808D3294 8FBF0024 */ lw $ra, 0x0024($sp) .L808D3298: -/* 00C28 808D3298 0C234D00 */ jal func_808D3400 -/* 00C2C 808D329C 8FA5003C */ lw $a1, 0x003C($sp) -/* 00C30 808D32A0 8FBF0024 */ lw $ra, 0x0024($sp) +/* 00C28 808D3298 0C234D00 */ jal func_808D3400 +/* 00C2C 808D329C 8FA5003C */ lw $a1, 0x003C($sp) +/* 00C30 808D32A0 8FBF0024 */ lw $ra, 0x0024($sp) .L808D32A4: -/* 00C34 808D32A4 8FB00020 */ lw $s0, 0x0020($sp) +/* 00C34 808D32A4 8FB00020 */ lw $s0, 0x0020($sp) /* 00C38 808D32A8 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 -/* 00C3C 808D32AC 03E00008 */ jr $ra +/* 00C3C 808D32AC 03E00008 */ jr $ra /* 00C40 808D32B0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Fd2/func_808D32B4.s b/asm/non_matchings/overlays/actors/ovl_Boss_Fd2/func_808D32B4.s index 2c2602eb1e..05609320d4 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Fd2/func_808D32B4.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Fd2/func_808D32B4.s @@ -1,35 +1,35 @@ glabel func_808D32B4 /* 00C44 808D32B4 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 00C48 808D32B8 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00C4C 808D32BC AFA50024 */ sw $a1, 0x0024($sp) +/* 00C48 808D32B8 AFBF0014 */ sw $ra, 0x0014($sp) +/* 00C4C 808D32BC AFA50024 */ sw $a1, 0x0024($sp) /* 00C50 808D32C0 8C8E0118 */ lw $t6, 0x0118($a0) ## 00000118 /* 00C54 808D32C4 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 /* 00C58 808D32C8 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 /* 00C5C 808D32CC 24A59194 */ addiu $a1, $a1, 0x9194 ## $a1 = 06009194 -/* 00C60 808D32D0 AFA70020 */ sw $a3, 0x0020($sp) +/* 00C60 808D32D0 AFA70020 */ sw $a3, 0x0020($sp) /* 00C64 808D32D4 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C /* 00C68 808D32D8 3C06C0A0 */ lui $a2, 0xC0A0 ## $a2 = C0A00000 -/* 00C6C 808D32DC 0C029490 */ jal func_800A5240 -/* 00C70 808D32E0 AFAE001C */ sw $t6, 0x001C($sp) -/* 00C74 808D32E4 8FA70020 */ lw $a3, 0x0020($sp) +/* 00C6C 808D32DC 0C029490 */ jal SkelAnime_ChangeAnimTransitionStop +/* 00C70 808D32E0 AFAE001C */ sw $t6, 0x001C($sp) +/* 00C74 808D32E4 8FA70020 */ lw $a3, 0x0020($sp) /* 00C78 808D32E8 3C0F808D */ lui $t7, %hi(func_808D3330) ## $t7 = 808D0000 /* 00C7C 808D32EC 25EF3330 */ addiu $t7, $t7, %lo(func_808D3330) ## $t7 = 808D3330 /* 00C80 808D32F0 3C040601 */ lui $a0, 0x0601 ## $a0 = 06010000 /* 00C84 808D32F4 24849194 */ addiu $a0, $a0, 0x9194 ## $a0 = 06009194 /* 00C88 808D32F8 0C028800 */ jal SkelAnime_GetFrameCount - + /* 00C8C 808D32FC ACEF0190 */ sw $t7, 0x0190($a3) ## 00000190 /* 00C90 808D3300 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 -/* 00C94 808D3304 8FA70020 */ lw $a3, 0x0020($sp) +/* 00C94 808D3304 8FA70020 */ lw $a3, 0x0020($sp) /* 00C98 808D3308 2418001E */ addiu $t8, $zero, 0x001E ## $t8 = 0000001E -/* 00C9C 808D330C 468021A0 */ cvt.s.w $f6, $f4 +/* 00C9C 808D330C 468021A0 */ cvt.s.w $f6, $f4 /* 00CA0 808D3310 E4E601F0 */ swc1 $f6, 0x01F0($a3) ## 000001F0 -/* 00CA4 808D3314 8FB9001C */ lw $t9, 0x001C($sp) +/* 00CA4 808D3314 8FB9001C */ lw $t9, 0x001C($sp) /* 00CA8 808D3318 A7380250 */ sh $t8, 0x0250($t9) ## 00000250 /* 00CAC 808D331C A4E00198 */ sh $zero, 0x0198($a3) ## 00000198 -/* 00CB0 808D3320 8FBF0014 */ lw $ra, 0x0014($sp) +/* 00CB0 808D3320 8FBF0014 */ lw $ra, 0x0014($sp) /* 00CB4 808D3324 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 00CB8 808D3328 03E00008 */ jr $ra +/* 00CB8 808D3328 03E00008 */ jr $ra /* 00CBC 808D332C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Fd2/func_808D3400.s b/asm/non_matchings/overlays/actors/ovl_Boss_Fd2/func_808D3400.s index 2f4dbe75da..58ad35e596 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Fd2/func_808D3400.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Fd2/func_808D3400.s @@ -1,29 +1,29 @@ glabel func_808D3400 /* 00D90 808D3400 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00D94 808D3404 AFA5001C */ sw $a1, 0x001C($sp) -/* 00D98 808D3408 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00D9C 808D340C AFA40018 */ sw $a0, 0x0018($sp) +/* 00D94 808D3404 AFA5001C */ sw $a1, 0x001C($sp) +/* 00D98 808D3408 AFBF0014 */ sw $ra, 0x0014($sp) +/* 00D9C 808D340C AFA40018 */ sw $a0, 0x0018($sp) /* 00DA0 808D3410 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 00DA4 808D3414 24A573CC */ addiu $a1, $a1, 0x73CC ## $a1 = 060073CC /* 00DA8 808D3418 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 00DAC 808D341C 0C029490 */ jal func_800A5240 +/* 00DAC 808D341C 0C029490 */ jal SkelAnime_ChangeAnimTransitionStop /* 00DB0 808D3420 3C06C0A0 */ lui $a2, 0xC0A0 ## $a2 = C0A00000 -/* 00DB4 808D3424 8FAF0018 */ lw $t7, 0x0018($sp) +/* 00DB4 808D3424 8FAF0018 */ lw $t7, 0x0018($sp) /* 00DB8 808D3428 3C0E808D */ lui $t6, %hi(func_808D3464) ## $t6 = 808D0000 /* 00DBC 808D342C 25CE3464 */ addiu $t6, $t6, %lo(func_808D3464) ## $t6 = 808D3464 /* 00DC0 808D3430 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 /* 00DC4 808D3434 248473CC */ addiu $a0, $a0, 0x73CC ## $a0 = 060073CC /* 00DC8 808D3438 0C028800 */ jal SkelAnime_GetFrameCount - + /* 00DCC 808D343C ADEE0190 */ sw $t6, 0x0190($t7) ## 00000190 /* 00DD0 808D3440 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 -/* 00DD4 808D3444 8FA30018 */ lw $v1, 0x0018($sp) -/* 00DD8 808D3448 468021A0 */ cvt.s.w $f6, $f4 +/* 00DD4 808D3444 8FA30018 */ lw $v1, 0x0018($sp) +/* 00DD8 808D3448 468021A0 */ cvt.s.w $f6, $f4 /* 00DDC 808D344C A4600198 */ sh $zero, 0x0198($v1) ## 00000198 /* 00DE0 808D3450 E46601F0 */ swc1 $f6, 0x01F0($v1) ## 000001F0 -/* 00DE4 808D3454 8FBF0014 */ lw $ra, 0x0014($sp) +/* 00DE4 808D3454 8FBF0014 */ lw $ra, 0x0014($sp) /* 00DE8 808D3458 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00DEC 808D345C 03E00008 */ jr $ra +/* 00DEC 808D345C 03E00008 */ jr $ra /* 00DF0 808D3460 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Fd2/func_808D39A8.s b/asm/non_matchings/overlays/actors/ovl_Boss_Fd2/func_808D39A8.s index 742018fa46..96bafc2c96 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Fd2/func_808D39A8.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Fd2/func_808D39A8.s @@ -1,28 +1,28 @@ glabel func_808D39A8 /* 01338 808D39A8 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 0133C 808D39AC AFA5001C */ sw $a1, 0x001C($sp) -/* 01340 808D39B0 AFBF0014 */ sw $ra, 0x0014($sp) -/* 01344 808D39B4 AFA40018 */ sw $a0, 0x0018($sp) +/* 0133C 808D39AC AFA5001C */ sw $a1, 0x001C($sp) +/* 01340 808D39B0 AFBF0014 */ sw $ra, 0x0014($sp) +/* 01344 808D39B4 AFA40018 */ sw $a0, 0x0018($sp) /* 01348 808D39B8 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 /* 0134C 808D39BC 24A5B7A4 */ addiu $a1, $a1, 0xB7A4 ## $a1 = 0600B7A4 /* 01350 808D39C0 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 01354 808D39C4 0C029490 */ jal func_800A5240 +/* 01354 808D39C4 0C029490 */ jal SkelAnime_ChangeAnimTransitionStop /* 01358 808D39C8 3C06C0A0 */ lui $a2, 0xC0A0 ## $a2 = C0A00000 -/* 0135C 808D39CC 8FAF0018 */ lw $t7, 0x0018($sp) +/* 0135C 808D39CC 8FAF0018 */ lw $t7, 0x0018($sp) /* 01360 808D39D0 3C0E808D */ lui $t6, %hi(func_808D3A08) ## $t6 = 808D0000 /* 01364 808D39D4 25CE3A08 */ addiu $t6, $t6, %lo(func_808D3A08) ## $t6 = 808D3A08 /* 01368 808D39D8 3C040601 */ lui $a0, 0x0601 ## $a0 = 06010000 /* 0136C 808D39DC 2484B7A4 */ addiu $a0, $a0, 0xB7A4 ## $a0 = 0600B7A4 /* 01370 808D39E0 0C028800 */ jal SkelAnime_GetFrameCount - + /* 01374 808D39E4 ADEE0190 */ sw $t6, 0x0190($t7) ## 00000190 /* 01378 808D39E8 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 -/* 0137C 808D39EC 8FB80018 */ lw $t8, 0x0018($sp) -/* 01380 808D39F0 468021A0 */ cvt.s.w $f6, $f4 +/* 0137C 808D39EC 8FB80018 */ lw $t8, 0x0018($sp) +/* 01380 808D39F0 468021A0 */ cvt.s.w $f6, $f4 /* 01384 808D39F4 E70601F0 */ swc1 $f6, 0x01F0($t8) ## 000001F0 -/* 01388 808D39F8 8FBF0014 */ lw $ra, 0x0014($sp) +/* 01388 808D39F8 8FBF0014 */ lw $ra, 0x0014($sp) /* 0138C 808D39FC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 01390 808D3A00 03E00008 */ jr $ra +/* 01390 808D3A00 03E00008 */ jr $ra /* 01394 808D3A04 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Fd2/func_808D3A80.s b/asm/non_matchings/overlays/actors/ovl_Boss_Fd2/func_808D3A80.s index 9ab26081e2..d83ed585e6 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Fd2/func_808D3A80.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Fd2/func_808D3A80.s @@ -1,28 +1,28 @@ glabel func_808D3A80 /* 01410 808D3A80 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 01414 808D3A84 AFA5001C */ sw $a1, 0x001C($sp) -/* 01418 808D3A88 AFBF0014 */ sw $ra, 0x0014($sp) +/* 01414 808D3A84 AFA5001C */ sw $a1, 0x001C($sp) +/* 01418 808D3A88 AFBF0014 */ sw $ra, 0x0014($sp) /* 0141C 808D3A8C 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 /* 01420 808D3A90 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 /* 01424 808D3A94 24A5A31C */ addiu $a1, $a1, 0xA31C ## $a1 = 0600A31C -/* 01428 808D3A98 AFA60018 */ sw $a2, 0x0018($sp) -/* 0142C 808D3A9C 0C02947A */ jal func_800A51E8 +/* 01428 808D3A98 AFA60018 */ sw $a2, 0x0018($sp) +/* 0142C 808D3A9C 0C02947A */ jal SkelAnime_ChangeAnimDefaultStop /* 01430 808D3AA0 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C /* 01434 808D3AA4 3C040601 */ lui $a0, 0x0601 ## $a0 = 06010000 /* 01438 808D3AA8 0C028800 */ jal SkelAnime_GetFrameCount - + /* 0143C 808D3AAC 2484A31C */ addiu $a0, $a0, 0xA31C ## $a0 = 0600A31C /* 01440 808D3AB0 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 -/* 01444 808D3AB4 8FA60018 */ lw $a2, 0x0018($sp) +/* 01444 808D3AB4 8FA60018 */ lw $a2, 0x0018($sp) /* 01448 808D3AB8 3C0E808D */ lui $t6, %hi(func_808D3AE0) ## $t6 = 808D0000 -/* 0144C 808D3ABC 468021A0 */ cvt.s.w $f6, $f4 +/* 0144C 808D3ABC 468021A0 */ cvt.s.w $f6, $f4 /* 01450 808D3AC0 25CE3AE0 */ addiu $t6, $t6, %lo(func_808D3AE0) ## $t6 = 808D3AE0 /* 01454 808D3AC4 ACCE0190 */ sw $t6, 0x0190($a2) ## 00000190 /* 01458 808D3AC8 A4C00198 */ sh $zero, 0x0198($a2) ## 00000198 /* 0145C 808D3ACC E4C601F0 */ swc1 $f6, 0x01F0($a2) ## 000001F0 -/* 01460 808D3AD0 8FBF0014 */ lw $ra, 0x0014($sp) +/* 01460 808D3AD0 8FBF0014 */ lw $ra, 0x0014($sp) /* 01464 808D3AD4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 01468 808D3AD8 03E00008 */ jr $ra +/* 01468 808D3AD8 03E00008 */ jr $ra /* 0146C 808D3ADC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Fd2/func_808D3AE0.s b/asm/non_matchings/overlays/actors/ovl_Boss_Fd2/func_808D3AE0.s index a647531bb0..ad105808f3 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Fd2/func_808D3AE0.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Fd2/func_808D3AE0.s @@ -1,15 +1,15 @@ glabel func_808D3AE0 /* 01470 808D3AE0 27BDFF68 */ addiu $sp, $sp, 0xFF68 ## $sp = FFFFFF68 -/* 01474 808D3AE4 AFBF0054 */ sw $ra, 0x0054($sp) -/* 01478 808D3AE8 AFB40050 */ sw $s4, 0x0050($sp) -/* 0147C 808D3AEC AFB3004C */ sw $s3, 0x004C($sp) -/* 01480 808D3AF0 AFB20048 */ sw $s2, 0x0048($sp) -/* 01484 808D3AF4 AFB10044 */ sw $s1, 0x0044($sp) -/* 01488 808D3AF8 AFB00040 */ sw $s0, 0x0040($sp) -/* 0148C 808D3AFC F7BA0038 */ sdc1 $f26, 0x0038($sp) -/* 01490 808D3B00 F7B80030 */ sdc1 $f24, 0x0030($sp) -/* 01494 808D3B04 F7B60028 */ sdc1 $f22, 0x0028($sp) -/* 01498 808D3B08 F7B40020 */ sdc1 $f20, 0x0020($sp) +/* 01474 808D3AE4 AFBF0054 */ sw $ra, 0x0054($sp) +/* 01478 808D3AE8 AFB40050 */ sw $s4, 0x0050($sp) +/* 0147C 808D3AEC AFB3004C */ sw $s3, 0x004C($sp) +/* 01480 808D3AF0 AFB20048 */ sw $s2, 0x0048($sp) +/* 01484 808D3AF4 AFB10044 */ sw $s1, 0x0044($sp) +/* 01488 808D3AF8 AFB00040 */ sw $s0, 0x0040($sp) +/* 0148C 808D3AFC F7BA0038 */ sdc1 $f26, 0x0038($sp) +/* 01490 808D3B00 F7B80030 */ sdc1 $f24, 0x0030($sp) +/* 01494 808D3B04 F7B60028 */ sdc1 $f22, 0x0028($sp) +/* 01498 808D3B08 F7B40020 */ sdc1 $f20, 0x0020($sp) /* 0149C 808D3B0C 8C8F0004 */ lw $t7, 0x0004($a0) ## 00000004 /* 014A0 808D3B10 00809025 */ or $s2, $a0, $zero ## $s2 = 00000000 /* 014A4 808D3B14 240E0001 */ addiu $t6, $zero, 0x0001 ## $t6 = 00000001 @@ -20,35 +20,35 @@ glabel func_808D3AE0 /* 014B8 808D3B28 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C /* 014BC 808D3B2C 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 /* 014C0 808D3B30 0C02927F */ jal SkelAnime_FrameUpdateMatrix - -/* 014C4 808D3B34 AFA40060 */ sw $a0, 0x0060($sp) + +/* 014C4 808D3B34 AFA40060 */ sw $a0, 0x0060($sp) /* 014C8 808D3B38 86430198 */ lh $v1, 0x0198($s2) ## 00000198 /* 014CC 808D3B3C 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 014D0 808D3B40 8FA40060 */ lw $a0, 0x0060($sp) -/* 014D4 808D3B44 10600005 */ beq $v1, $zero, .L808D3B5C +/* 014D0 808D3B40 8FA40060 */ lw $a0, 0x0060($sp) +/* 014D4 808D3B44 10600005 */ beq $v1, $zero, .L808D3B5C /* 014D8 808D3B48 00000000 */ nop -/* 014DC 808D3B4C 50610061 */ beql $v1, $at, .L808D3CD4 +/* 014DC 808D3B4C 50610061 */ beql $v1, $at, .L808D3CD4 /* 014E0 808D3B50 864B019C */ lh $t3, 0x019C($s2) ## 0000019C -/* 014E4 808D3B54 1000006D */ beq $zero, $zero, .L808D3D0C -/* 014E8 808D3B58 8FBF0054 */ lw $ra, 0x0054($sp) +/* 014E4 808D3B54 1000006D */ beq $zero, $zero, .L808D3D0C +/* 014E8 808D3B58 8FBF0054 */ lw $ra, 0x0054($sp) .L808D3B5C: -/* 014EC 808D3B5C 0C0295B2 */ jal func_800A56C8 +/* 014EC 808D3B5C 0C0295B2 */ jal func_800A56C8 /* 014F0 808D3B60 3C054150 */ lui $a1, 0x4150 ## $a1 = 41500000 -/* 014F4 808D3B64 10400003 */ beq $v0, $zero, .L808D3B74 +/* 014F4 808D3B64 10400003 */ beq $v0, $zero, .L808D3B74 /* 014F8 808D3B68 02402025 */ or $a0, $s2, $zero ## $a0 = 00000000 /* 014FC 808D3B6C 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 01500 808D3B70 240538D3 */ addiu $a1, $zero, 0x38D3 ## $a1 = 000038D3 .L808D3B74: /* 01504 808D3B74 3C014040 */ lui $at, 0x4040 ## $at = 40400000 /* 01508 808D3B78 44813000 */ mtc1 $at, $f6 ## $f6 = 3.00 /* 0150C 808D3B7C C64401F0 */ lwc1 $f4, 0x01F0($s2) ## 000001F0 -/* 01510 808D3B80 8FA40060 */ lw $a0, 0x0060($sp) -/* 01514 808D3B84 46062201 */ sub.s $f8, $f4, $f6 -/* 01518 808D3B88 44054000 */ mfc1 $a1, $f8 -/* 0151C 808D3B8C 0C0295B2 */ jal func_800A56C8 +/* 01510 808D3B80 8FA40060 */ lw $a0, 0x0060($sp) +/* 01514 808D3B84 46062201 */ sub.s $f8, $f4, $f6 +/* 01518 808D3B88 44054000 */ mfc1 $a1, $f8 +/* 0151C 808D3B8C 0C0295B2 */ jal func_800A56C8 /* 01520 808D3B90 00000000 */ nop -/* 01524 808D3B94 10400040 */ beq $v0, $zero, .L808D3C98 +/* 01524 808D3B94 10400040 */ beq $v0, $zero, .L808D3C98 /* 01528 808D3B98 00008025 */ or $s0, $zero, $zero ## $s0 = 00000000 /* 0152C 808D3B9C 3C014396 */ lui $at, 0x4396 ## $at = 43960000 /* 01530 808D3BA0 4481D000 */ mtc1 $at, $f26 ## $f26 = 300.00 @@ -65,108 +65,108 @@ glabel func_808D3AE0 /* 0155C 808D3BCC 8E680000 */ lw $t0, 0x0000($s3) ## 808D61C4 .L808D3BD0: /* 01560 808D3BD0 8E790004 */ lw $t9, 0x0004($s3) ## 808D61C8 -/* 01564 808D3BD4 4600B306 */ mov.s $f12, $f22 +/* 01564 808D3BD4 4600B306 */ mov.s $f12, $f22 /* 01568 808D3BD8 AE280000 */ sw $t0, 0x0000($s1) ## FFFFFFE0 /* 0156C 808D3BDC 8E680008 */ lw $t0, 0x0008($s3) ## 808D61CC /* 01570 808D3BE0 AE390004 */ sw $t9, 0x0004($s1) ## FFFFFFE4 /* 01574 808D3BE4 0C00CFC8 */ jal Math_Rand_CenteredFloat - + /* 01578 808D3BE8 AE280008 */ sw $t0, 0x0008($s1) ## FFFFFFE8 /* 0157C 808D3BEC 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 /* 01580 808D3BF0 44816000 */ mtc1 $at, $f12 ## $f12 = 1.00 /* 01584 808D3BF4 0C00CFBE */ jal Math_Rand_ZeroFloat - -/* 01588 808D3BF8 E7A00084 */ swc1 $f0, 0x0084($sp) -/* 0158C 808D3BFC E7A00088 */ swc1 $f0, 0x0088($sp) + +/* 01588 808D3BF8 E7A00084 */ swc1 $f0, 0x0084($sp) +/* 0158C 808D3BFC E7A00088 */ swc1 $f0, 0x0088($sp) /* 01590 808D3C00 0C00CFC8 */ jal Math_Rand_CenteredFloat - -/* 01594 808D3C04 4600B306 */ mov.s $f12, $f22 -/* 01598 808D3C08 E7A0008C */ swc1 $f0, 0x008C($sp) -/* 0159C 808D3C0C E7B8007C */ swc1 $f24, 0x007C($sp) + +/* 01594 808D3C04 4600B306 */ mov.s $f12, $f22 +/* 01598 808D3C08 E7A0008C */ swc1 $f0, 0x008C($sp) +/* 0159C 808D3C0C E7B8007C */ swc1 $f24, 0x007C($sp) /* 015A0 808D3C10 0C00CFC8 */ jal Math_Rand_CenteredFloat - -/* 015A4 808D3C14 4600A306 */ mov.s $f12, $f20 + +/* 015A4 808D3C14 4600A306 */ mov.s $f12, $f20 /* 015A8 808D3C18 C64A0038 */ lwc1 $f10, 0x0038($s2) ## 00000038 -/* 015AC 808D3C1C 4600A306 */ mov.s $f12, $f20 -/* 015B0 808D3C20 460A0400 */ add.s $f16, $f0, $f10 +/* 015AC 808D3C1C 4600A306 */ mov.s $f12, $f20 +/* 015B0 808D3C20 460A0400 */ add.s $f16, $f0, $f10 /* 015B4 808D3C24 0C00CFC8 */ jal Math_Rand_CenteredFloat - -/* 015B8 808D3C28 E7B0006C */ swc1 $f16, 0x006C($sp) + +/* 015B8 808D3C28 E7B0006C */ swc1 $f16, 0x006C($sp) /* 015BC 808D3C2C C652003C */ lwc1 $f18, 0x003C($s2) ## 0000003C -/* 015C0 808D3C30 4600A306 */ mov.s $f12, $f20 -/* 015C4 808D3C34 46120100 */ add.s $f4, $f0, $f18 +/* 015C0 808D3C30 4600A306 */ mov.s $f12, $f20 +/* 015C4 808D3C34 46120100 */ add.s $f4, $f0, $f18 /* 015C8 808D3C38 0C00CFC8 */ jal Math_Rand_CenteredFloat - -/* 015CC 808D3C3C E7A40070 */ swc1 $f4, 0x0070($sp) + +/* 015CC 808D3C3C E7A40070 */ swc1 $f4, 0x0070($sp) /* 015D0 808D3C40 C6460040 */ lwc1 $f6, 0x0040($s2) ## 00000040 /* 015D4 808D3C44 3C0142C8 */ lui $at, 0x42C8 ## $at = 42C80000 /* 015D8 808D3C48 44816000 */ mtc1 $at, $f12 ## $f12 = 100.00 -/* 015DC 808D3C4C 46060200 */ add.s $f8, $f0, $f6 +/* 015DC 808D3C4C 46060200 */ add.s $f8, $f0, $f6 /* 015E0 808D3C50 0C00CFBE */ jal Math_Rand_ZeroFloat - -/* 015E4 808D3C54 E7A80074 */ swc1 $f8, 0x0074($sp) -/* 015E8 808D3C58 461A0280 */ add.s $f10, $f0, $f26 + +/* 015E4 808D3C54 E7A80074 */ swc1 $f8, 0x0074($sp) +/* 015E8 808D3C58 461A0280 */ add.s $f10, $f0, $f26 /* 015EC 808D3C5C 02802025 */ or $a0, $s4, $zero ## $a0 = 00001970 /* 015F0 808D3C60 27A5006C */ addiu $a1, $sp, 0x006C ## $a1 = FFFFFFD4 /* 015F4 808D3C64 27A60084 */ addiu $a2, $sp, 0x0084 ## $a2 = FFFFFFEC -/* 015F8 808D3C68 E7AA0010 */ swc1 $f10, 0x0010($sp) -/* 015FC 808D3C6C 0C234A82 */ jal func_808D2A08 +/* 015F8 808D3C68 E7AA0010 */ swc1 $f10, 0x0010($sp) +/* 015FC 808D3C6C 0C234A82 */ jal func_808D2A08 /* 01600 808D3C70 02203825 */ or $a3, $s1, $zero ## $a3 = FFFFFFE0 /* 01604 808D3C74 26100001 */ addiu $s0, $s0, 0x0001 ## $s0 = 00000001 -/* 01608 808D3C78 00108400 */ sll $s0, $s0, 16 -/* 0160C 808D3C7C 00108403 */ sra $s0, $s0, 16 -/* 01610 808D3C80 2A010019 */ slti $at, $s0, 0x0019 -/* 01614 808D3C84 5420FFD2 */ bnel $at, $zero, .L808D3BD0 +/* 01608 808D3C78 00108400 */ sll $s0, $s0, 16 +/* 0160C 808D3C7C 00108403 */ sra $s0, $s0, 16 +/* 01610 808D3C80 2A010019 */ slti $at, $s0, 0x0019 +/* 01614 808D3C84 5420FFD2 */ bnel $at, $zero, .L808D3BD0 /* 01618 808D3C88 8E680000 */ lw $t0, 0x0000($s3) ## 808D61C4 /* 0161C 808D3C8C 02402025 */ or $a0, $s2, $zero ## $a0 = 00000000 /* 01620 808D3C90 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 01624 808D3C94 24053927 */ addiu $a1, $zero, 0x3927 ## $a1 = 00003927 .L808D3C98: -/* 01628 808D3C98 8FA40060 */ lw $a0, 0x0060($sp) -/* 0162C 808D3C9C 0C0295B2 */ jal func_800A56C8 +/* 01628 808D3C98 8FA40060 */ lw $a0, 0x0060($sp) +/* 0162C 808D3C9C 0C0295B2 */ jal func_800A56C8 /* 01630 808D3CA0 8E4501F0 */ lw $a1, 0x01F0($s2) ## 000001F0 -/* 01634 808D3CA4 10400018 */ beq $v0, $zero, .L808D3D08 -/* 01638 808D3CA8 8FA40060 */ lw $a0, 0x0060($sp) +/* 01634 808D3CA4 10400018 */ beq $v0, $zero, .L808D3D08 +/* 01638 808D3CA8 8FA40060 */ lw $a0, 0x0060($sp) /* 0163C 808D3CAC 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 /* 01640 808D3CB0 24A5A86C */ addiu $a1, $a1, 0xA86C ## $a1 = 0600A86C -/* 01644 808D3CB4 0C0294D3 */ jal func_800A534C +/* 01644 808D3CB4 0C0294D3 */ jal SkelAnime_ChangeAnimTransitionRepeat /* 01648 808D3CB8 3C06C0A0 */ lui $a2, 0xC0A0 ## $a2 = C0A00000 /* 0164C 808D3CBC 24090001 */ addiu $t1, $zero, 0x0001 ## $t1 = 00000001 /* 01650 808D3CC0 240A003C */ addiu $t2, $zero, 0x003C ## $t2 = 0000003C /* 01654 808D3CC4 A6490198 */ sh $t1, 0x0198($s2) ## 00000198 -/* 01658 808D3CC8 1000000F */ beq $zero, $zero, .L808D3D08 +/* 01658 808D3CC8 1000000F */ beq $zero, $zero, .L808D3D08 /* 0165C 808D3CCC A64A01BC */ sh $t2, 0x01BC($s2) ## 000001BC /* 01660 808D3CD0 864B019C */ lh $t3, 0x019C($s2) ## 0000019C .L808D3CD4: /* 01664 808D3CD4 2401000F */ addiu $at, $zero, 0x000F ## $at = 0000000F /* 01668 808D3CD8 02402025 */ or $a0, $s2, $zero ## $a0 = 00000000 /* 0166C 808D3CDC 316C000F */ andi $t4, $t3, 0x000F ## $t4 = 00000000 -/* 01670 808D3CE0 55810004 */ bnel $t4, $at, .L808D3CF4 +/* 01670 808D3CE0 55810004 */ bnel $t4, $at, .L808D3CF4 /* 01674 808D3CE4 864D01BC */ lh $t5, 0x01BC($s2) ## 000001BC /* 01678 808D3CE8 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 0167C 808D3CEC 240538D4 */ addiu $a1, $zero, 0x38D4 ## $a1 = 000038D4 /* 01680 808D3CF0 864D01BC */ lh $t5, 0x01BC($s2) ## 000001BC .L808D3CF4: /* 01684 808D3CF4 02402025 */ or $a0, $s2, $zero ## $a0 = 00000000 -/* 01688 808D3CF8 55A00004 */ bnel $t5, $zero, .L808D3D0C -/* 0168C 808D3CFC 8FBF0054 */ lw $ra, 0x0054($sp) -/* 01690 808D3D00 0C234CAD */ jal func_808D32B4 +/* 01688 808D3CF8 55A00004 */ bnel $t5, $zero, .L808D3D0C +/* 0168C 808D3CFC 8FBF0054 */ lw $ra, 0x0054($sp) +/* 01690 808D3D00 0C234CAD */ jal func_808D32B4 /* 01694 808D3D04 02002825 */ or $a1, $s0, $zero ## $a1 = 00000001 .L808D3D08: -/* 01698 808D3D08 8FBF0054 */ lw $ra, 0x0054($sp) +/* 01698 808D3D08 8FBF0054 */ lw $ra, 0x0054($sp) .L808D3D0C: -/* 0169C 808D3D0C D7B40020 */ ldc1 $f20, 0x0020($sp) -/* 016A0 808D3D10 D7B60028 */ ldc1 $f22, 0x0028($sp) -/* 016A4 808D3D14 D7B80030 */ ldc1 $f24, 0x0030($sp) -/* 016A8 808D3D18 D7BA0038 */ ldc1 $f26, 0x0038($sp) -/* 016AC 808D3D1C 8FB00040 */ lw $s0, 0x0040($sp) -/* 016B0 808D3D20 8FB10044 */ lw $s1, 0x0044($sp) -/* 016B4 808D3D24 8FB20048 */ lw $s2, 0x0048($sp) -/* 016B8 808D3D28 8FB3004C */ lw $s3, 0x004C($sp) -/* 016BC 808D3D2C 8FB40050 */ lw $s4, 0x0050($sp) -/* 016C0 808D3D30 03E00008 */ jr $ra +/* 0169C 808D3D0C D7B40020 */ ldc1 $f20, 0x0020($sp) +/* 016A0 808D3D10 D7B60028 */ ldc1 $f22, 0x0028($sp) +/* 016A4 808D3D14 D7B80030 */ ldc1 $f24, 0x0030($sp) +/* 016A8 808D3D18 D7BA0038 */ ldc1 $f26, 0x0038($sp) +/* 016AC 808D3D1C 8FB00040 */ lw $s0, 0x0040($sp) +/* 016B0 808D3D20 8FB10044 */ lw $s1, 0x0044($sp) +/* 016B4 808D3D24 8FB20048 */ lw $s2, 0x0048($sp) +/* 016B8 808D3D28 8FB3004C */ lw $s3, 0x004C($sp) +/* 016BC 808D3D2C 8FB40050 */ lw $s4, 0x0050($sp) +/* 016C0 808D3D30 03E00008 */ jr $ra /* 016C4 808D3D34 27BD0098 */ addiu $sp, $sp, 0x0098 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Fd2/func_808D3D38.s b/asm/non_matchings/overlays/actors/ovl_Boss_Fd2/func_808D3D38.s index 840af8f064..7dd90e5678 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Fd2/func_808D3D38.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Fd2/func_808D3D38.s @@ -1,28 +1,28 @@ glabel func_808D3D38 /* 016C8 808D3D38 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 016CC 808D3D3C AFA5001C */ sw $a1, 0x001C($sp) -/* 016D0 808D3D40 AFBF0014 */ sw $ra, 0x0014($sp) +/* 016CC 808D3D3C AFA5001C */ sw $a1, 0x001C($sp) +/* 016D0 808D3D40 AFBF0014 */ sw $ra, 0x0014($sp) /* 016D4 808D3D44 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 /* 016D8 808D3D48 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 016DC 808D3D4C 24A57850 */ addiu $a1, $a1, 0x7850 ## $a1 = 06007850 -/* 016E0 808D3D50 AFA60018 */ sw $a2, 0x0018($sp) -/* 016E4 808D3D54 0C02947A */ jal func_800A51E8 +/* 016E0 808D3D50 AFA60018 */ sw $a2, 0x0018($sp) +/* 016E4 808D3D54 0C02947A */ jal SkelAnime_ChangeAnimDefaultStop /* 016E8 808D3D58 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C /* 016EC 808D3D5C 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 /* 016F0 808D3D60 0C028800 */ jal SkelAnime_GetFrameCount - + /* 016F4 808D3D64 24847850 */ addiu $a0, $a0, 0x7850 ## $a0 = 06007850 /* 016F8 808D3D68 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 -/* 016FC 808D3D6C 8FA60018 */ lw $a2, 0x0018($sp) +/* 016FC 808D3D6C 8FA60018 */ lw $a2, 0x0018($sp) /* 01700 808D3D70 3C0E808D */ lui $t6, %hi(func_808D3D98) ## $t6 = 808D0000 -/* 01704 808D3D74 468021A0 */ cvt.s.w $f6, $f4 +/* 01704 808D3D74 468021A0 */ cvt.s.w $f6, $f4 /* 01708 808D3D78 25CE3D98 */ addiu $t6, $t6, %lo(func_808D3D98) ## $t6 = 808D3D98 /* 0170C 808D3D7C ACCE0190 */ sw $t6, 0x0190($a2) ## 00000190 /* 01710 808D3D80 A4C00198 */ sh $zero, 0x0198($a2) ## 00000198 /* 01714 808D3D84 E4C601F0 */ swc1 $f6, 0x01F0($a2) ## 000001F0 -/* 01718 808D3D88 8FBF0014 */ lw $ra, 0x0014($sp) +/* 01718 808D3D88 8FBF0014 */ lw $ra, 0x0014($sp) /* 0171C 808D3D8C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 01720 808D3D90 03E00008 */ jr $ra +/* 01720 808D3D90 03E00008 */ jr $ra /* 01724 808D3D94 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Fd2/func_808D3D98.s b/asm/non_matchings/overlays/actors/ovl_Boss_Fd2/func_808D3D98.s index 2286f57e48..169fa3af28 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Fd2/func_808D3D98.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Fd2/func_808D3D98.s @@ -1,89 +1,89 @@ glabel func_808D3D98 /* 01728 808D3D98 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 0172C 808D3D9C AFBF001C */ sw $ra, 0x001C($sp) -/* 01730 808D3DA0 AFB10018 */ sw $s1, 0x0018($sp) -/* 01734 808D3DA4 AFB00014 */ sw $s0, 0x0014($sp) -/* 01738 808D3DA8 AFA5002C */ sw $a1, 0x002C($sp) +/* 0172C 808D3D9C AFBF001C */ sw $ra, 0x001C($sp) +/* 01730 808D3DA0 AFB10018 */ sw $s1, 0x0018($sp) +/* 01734 808D3DA4 AFB00014 */ sw $s0, 0x0014($sp) +/* 01738 808D3DA8 AFA5002C */ sw $a1, 0x002C($sp) /* 0173C 808D3DAC 8C8E0118 */ lw $t6, 0x0118($a0) ## 00000118 /* 01740 808D3DB0 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 01744 808D3DB4 2491014C */ addiu $s1, $a0, 0x014C ## $s1 = 0000014C /* 01748 808D3DB8 02202025 */ or $a0, $s1, $zero ## $a0 = 0000014C /* 0174C 808D3DBC 0C02927F */ jal SkelAnime_FrameUpdateMatrix - -/* 01750 808D3DC0 AFAE0024 */ sw $t6, 0x0024($sp) + +/* 01750 808D3DC0 AFAE0024 */ sw $t6, 0x0024($sp) /* 01754 808D3DC4 86030198 */ lh $v1, 0x0198($s0) ## 00000198 /* 01758 808D3DC8 240F0001 */ addiu $t7, $zero, 0x0001 ## $t7 = 00000001 /* 0175C 808D3DCC A20F0194 */ sb $t7, 0x0194($s0) ## 00000194 -/* 01760 808D3DD0 14600012 */ bne $v1, $zero, .L808D3E1C +/* 01760 808D3DD0 14600012 */ bne $v1, $zero, .L808D3E1C /* 01764 808D3DD4 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 /* 01768 808D3DD8 02202025 */ or $a0, $s1, $zero ## $a0 = 0000014C -/* 0176C 808D3DDC 0C0295B2 */ jal func_800A56C8 +/* 0176C 808D3DDC 0C0295B2 */ jal func_800A56C8 /* 01770 808D3DE0 8E0501F0 */ lw $a1, 0x01F0($s0) ## 000001F0 -/* 01774 808D3DE4 10400033 */ beq $v0, $zero, .L808D3EB4 +/* 01774 808D3DE4 10400033 */ beq $v0, $zero, .L808D3EB4 /* 01778 808D3DE8 02202025 */ or $a0, $s1, $zero ## $a0 = 0000014C /* 0177C 808D3DEC 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 -/* 01780 808D3DF0 0C02947A */ jal func_800A51E8 +/* 01780 808D3DF0 0C02947A */ jal SkelAnime_ChangeAnimDefaultStop /* 01784 808D3DF4 24A589DC */ addiu $a1, $a1, 0x89DC ## $a1 = 060089DC /* 01788 808D3DF8 3C040601 */ lui $a0, 0x0601 ## $a0 = 06010000 /* 0178C 808D3DFC 0C028800 */ jal SkelAnime_GetFrameCount - + /* 01790 808D3E00 248489DC */ addiu $a0, $a0, 0x89DC ## $a0 = 060089DC /* 01794 808D3E04 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 01798 808D3E08 24180001 */ addiu $t8, $zero, 0x0001 ## $t8 = 00000001 /* 0179C 808D3E0C A6180198 */ sh $t8, 0x0198($s0) ## 00000198 -/* 017A0 808D3E10 468021A0 */ cvt.s.w $f6, $f4 -/* 017A4 808D3E14 10000027 */ beq $zero, $zero, .L808D3EB4 +/* 017A0 808D3E10 468021A0 */ cvt.s.w $f6, $f4 +/* 017A4 808D3E14 10000027 */ beq $zero, $zero, .L808D3EB4 /* 017A8 808D3E18 E60601F0 */ swc1 $f6, 0x01F0($s0) ## 000001F0 .L808D3E1C: -/* 017AC 808D3E1C 14610018 */ bne $v1, $at, .L808D3E80 +/* 017AC 808D3E1C 14610018 */ bne $v1, $at, .L808D3E80 /* 017B0 808D3E20 26040028 */ addiu $a0, $s0, 0x0028 ## $a0 = 00000028 /* 017B4 808D3E24 02202025 */ or $a0, $s1, $zero ## $a0 = 0000014C -/* 017B8 808D3E28 0C0295B2 */ jal func_800A56C8 +/* 017B8 808D3E28 0C0295B2 */ jal func_800A56C8 /* 017BC 808D3E2C 3C0540C0 */ lui $a1, 0x40C0 ## $a1 = 40C00000 -/* 017C0 808D3E30 10400003 */ beq $v0, $zero, .L808D3E40 +/* 017C0 808D3E30 10400003 */ beq $v0, $zero, .L808D3E40 /* 017C4 808D3E34 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 017C8 808D3E38 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 017CC 808D3E3C 240538D6 */ addiu $a1, $zero, 0x38D6 ## $a1 = 000038D6 .L808D3E40: /* 017D0 808D3E40 02202025 */ or $a0, $s1, $zero ## $a0 = 0000014C -/* 017D4 808D3E44 0C0295B2 */ jal func_800A56C8 +/* 017D4 808D3E44 0C0295B2 */ jal func_800A56C8 /* 017D8 808D3E48 3C0541A0 */ lui $a1, 0x41A0 ## $a1 = 41A00000 -/* 017DC 808D3E4C 10400004 */ beq $v0, $zero, .L808D3E60 +/* 017DC 808D3E4C 10400004 */ beq $v0, $zero, .L808D3E60 /* 017E0 808D3E50 02202025 */ or $a0, $s1, $zero ## $a0 = 0000014C -/* 017E4 808D3E54 8FA80024 */ lw $t0, 0x0024($sp) +/* 017E4 808D3E54 8FA80024 */ lw $t0, 0x0024($sp) /* 017E8 808D3E58 2419001E */ addiu $t9, $zero, 0x001E ## $t9 = 0000001E /* 017EC 808D3E5C A5190250 */ sh $t9, 0x0250($t0) ## 00000250 .L808D3E60: -/* 017F0 808D3E60 0C0295B2 */ jal func_800A56C8 +/* 017F0 808D3E60 0C0295B2 */ jal func_800A56C8 /* 017F4 808D3E64 8E0501F0 */ lw $a1, 0x01F0($s0) ## 000001F0 -/* 017F8 808D3E68 10400012 */ beq $v0, $zero, .L808D3EB4 +/* 017F8 808D3E68 10400012 */ beq $v0, $zero, .L808D3EB4 /* 017FC 808D3E6C 24090002 */ addiu $t1, $zero, 0x0002 ## $t1 = 00000002 /* 01800 808D3E70 240A0019 */ addiu $t2, $zero, 0x0019 ## $t2 = 00000019 /* 01804 808D3E74 A6090198 */ sh $t1, 0x0198($s0) ## 00000198 -/* 01808 808D3E78 1000000E */ beq $zero, $zero, .L808D3EB4 +/* 01808 808D3E78 1000000E */ beq $zero, $zero, .L808D3EB4 /* 0180C 808D3E7C A60A01BC */ sh $t2, 0x01BC($s0) ## 000001BC .L808D3E80: /* 01810 808D3E80 3C05C2C8 */ lui $a1, 0xC2C8 ## $a1 = C2C80000 /* 01814 808D3E84 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 01818 808D3E88 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 0181C 808D3E8C 3C074120 */ lui $a3, 0x4120 ## $a3 = 41200000 /* 01820 808D3E90 860B01BC */ lh $t3, 0x01BC($s0) ## 000001BC /* 01824 808D3E94 3C0C808D */ lui $t4, %hi(func_808D4748) ## $t4 = 808D0000 /* 01828 808D3E98 258C4748 */ addiu $t4, $t4, %lo(func_808D4748) ## $t4 = 808D4748 -/* 0182C 808D3E9C 55600006 */ bnel $t3, $zero, .L808D3EB8 -/* 01830 808D3EA0 8FBF001C */ lw $ra, 0x001C($sp) +/* 0182C 808D3E9C 55600006 */ bnel $t3, $zero, .L808D3EB8 +/* 01830 808D3EA0 8FBF001C */ lw $ra, 0x001C($sp) /* 01834 808D3EA4 AE0C0190 */ sw $t4, 0x0190($s0) ## 00000190 -/* 01838 808D3EA8 8FAE0024 */ lw $t6, 0x0024($sp) +/* 01838 808D3EA8 8FAE0024 */ lw $t6, 0x0024($sp) /* 0183C 808D3EAC 240D0001 */ addiu $t5, $zero, 0x0001 ## $t5 = 00000001 /* 01840 808D3EB0 A1CD02D8 */ sb $t5, 0x02D8($t6) ## 000002D8 .L808D3EB4: -/* 01844 808D3EB4 8FBF001C */ lw $ra, 0x001C($sp) +/* 01844 808D3EB4 8FBF001C */ lw $ra, 0x001C($sp) .L808D3EB8: -/* 01848 808D3EB8 8FB00014 */ lw $s0, 0x0014($sp) -/* 0184C 808D3EBC 8FB10018 */ lw $s1, 0x0018($sp) -/* 01850 808D3EC0 03E00008 */ jr $ra +/* 01848 808D3EB8 8FB00014 */ lw $s0, 0x0014($sp) +/* 0184C 808D3EBC 8FB10018 */ lw $s1, 0x0018($sp) +/* 01850 808D3EC0 03E00008 */ jr $ra /* 01854 808D3EC4 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Fd2/func_808D3EC8.s b/asm/non_matchings/overlays/actors/ovl_Boss_Fd2/func_808D3EC8.s index 6936803eec..cd700ccfe7 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Fd2/func_808D3EC8.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Fd2/func_808D3EC8.s @@ -1,41 +1,41 @@ glabel func_808D3EC8 /* 01858 808D3EC8 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 0185C 808D3ECC AFB00028 */ sw $s0, 0x0028($sp) +/* 0185C 808D3ECC AFB00028 */ sw $s0, 0x0028($sp) /* 01860 808D3ED0 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 01864 808D3ED4 AFBF002C */ sw $ra, 0x002C($sp) +/* 01864 808D3ED4 AFBF002C */ sw $ra, 0x002C($sp) /* 01868 808D3ED8 3C040601 */ lui $a0, 0x0601 ## $a0 = 06010000 -/* 0186C 808D3EDC AFA50034 */ sw $a1, 0x0034($sp) +/* 0186C 808D3EDC AFA50034 */ sw $a1, 0x0034($sp) /* 01870 808D3EE0 0C028800 */ jal SkelAnime_GetFrameCount - + /* 01874 808D3EE4 248489DC */ addiu $a0, $a0, 0x89DC ## $a0 = 060089DC /* 01878 808D3EE8 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 0187C 808D3EEC 3C01C040 */ lui $at, 0xC040 ## $at = C0400000 /* 01880 808D3EF0 44813000 */ mtc1 $at, $f6 ## $f6 = -3.00 -/* 01884 808D3EF4 46802020 */ cvt.s.w $f0, $f4 +/* 01884 808D3EF4 46802020 */ cvt.s.w $f0, $f4 /* 01888 808D3EF8 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 /* 0188C 808D3EFC 240E0003 */ addiu $t6, $zero, 0x0003 ## $t6 = 00000003 /* 01890 808D3F00 24A589DC */ addiu $a1, $a1, 0x89DC ## $a1 = 060089DC /* 01894 808D3F04 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C /* 01898 808D3F08 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 0189C 808D3F0C E60001F0 */ swc1 $f0, 0x01F0($s0) ## 000001F0 -/* 018A0 808D3F10 AFAE0014 */ sw $t6, 0x0014($sp) -/* 018A4 808D3F14 E7A00010 */ swc1 $f0, 0x0010($sp) +/* 018A0 808D3F10 AFAE0014 */ sw $t6, 0x0014($sp) +/* 018A4 808D3F14 E7A00010 */ swc1 $f0, 0x0010($sp) /* 018A8 808D3F18 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 018AC 808D3F1C 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 018B0 808D3F20 E7A60018 */ swc1 $f6, 0x0018($sp) +/* 018AC 808D3F1C 0C029468 */ jal SkelAnime_ChangeAnim + +/* 018B0 808D3F20 E7A60018 */ swc1 $f6, 0x0018($sp) /* 018B4 808D3F24 8E180004 */ lw $t8, 0x0004($s0) ## 00000004 /* 018B8 808D3F28 3C0F808D */ lui $t7, %hi(func_808D40C8) ## $t7 = 808D0000 /* 018BC 808D3F2C 2401FFFE */ addiu $at, $zero, 0xFFFE ## $at = FFFFFFFE /* 018C0 808D3F30 25EF40C8 */ addiu $t7, $t7, %lo(func_808D40C8) ## $t7 = 808D40C8 -/* 018C4 808D3F34 0301C824 */ and $t9, $t8, $at +/* 018C4 808D3F34 0301C824 */ and $t9, $t8, $at /* 018C8 808D3F38 AE0F0190 */ sw $t7, 0x0190($s0) ## 00000190 /* 018CC 808D3F3C AE190004 */ sw $t9, 0x0004($s0) ## 00000004 /* 018D0 808D3F40 A6001390 */ sh $zero, 0x1390($s0) ## 00001390 -/* 018D4 808D3F44 8FBF002C */ lw $ra, 0x002C($sp) -/* 018D8 808D3F48 8FB00028 */ lw $s0, 0x0028($sp) +/* 018D4 808D3F44 8FBF002C */ lw $ra, 0x002C($sp) +/* 018D8 808D3F48 8FB00028 */ lw $s0, 0x0028($sp) /* 018DC 808D3F4C 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 018E0 808D3F50 03E00008 */ jr $ra +/* 018E0 808D3F50 03E00008 */ jr $ra /* 018E4 808D3F54 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Fd2/func_808D40C8.s b/asm/non_matchings/overlays/actors/ovl_Boss_Fd2/func_808D40C8.s index cb99e16f98..d4f4bef3cc 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Fd2/func_808D40C8.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Fd2/func_808D40C8.s @@ -1,52 +1,52 @@ glabel func_808D40C8 /* 01A58 808D40C8 27BDFF80 */ addiu $sp, $sp, 0xFF80 ## $sp = FFFFFF80 -/* 01A5C 808D40CC AFBF003C */ sw $ra, 0x003C($sp) -/* 01A60 808D40D0 AFB00038 */ sw $s0, 0x0038($sp) -/* 01A64 808D40D4 AFA50084 */ sw $a1, 0x0084($sp) +/* 01A5C 808D40CC AFBF003C */ sw $ra, 0x003C($sp) +/* 01A60 808D40D0 AFB00038 */ sw $s0, 0x0038($sp) +/* 01A64 808D40D4 AFA50084 */ sw $a1, 0x0084($sp) /* 01A68 808D40D8 8C8E0118 */ lw $t6, 0x0118($a0) ## 00000118 /* 01A6C 808D40DC 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 01A70 808D40E0 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 /* 01A74 808D40E4 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 01A78 808D40E8 0C030129 */ jal func_800C04A4 -/* 01A7C 808D40EC AFAE0060 */ sw $t6, 0x0060($sp) +/* 01A78 808D40E8 0C030129 */ jal func_800C04A4 +/* 01A7C 808D40EC AFAE0060 */ sw $t6, 0x0060($sp) /* 01A80 808D40F0 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C -/* 01A84 808D40F4 AFA2005C */ sw $v0, 0x005C($sp) +/* 01A84 808D40F4 AFA2005C */ sw $v0, 0x005C($sp) /* 01A88 808D40F8 0C02927F */ jal SkelAnime_FrameUpdateMatrix - -/* 01A8C 808D40FC AFA40044 */ sw $a0, 0x0044($sp) + +/* 01A8C 808D40FC AFA40044 */ sw $a0, 0x0044($sp) /* 01A90 808D4100 960F1390 */ lhu $t7, 0x1390($s0) ## 00001390 -/* 01A94 808D4104 2DE10006 */ sltiu $at, $t7, 0x0006 -/* 01A98 808D4108 10200187 */ beq $at, $zero, .L808D4728 -/* 01A9C 808D410C 000F7880 */ sll $t7, $t7, 2 +/* 01A94 808D4104 2DE10006 */ sltiu $at, $t7, 0x0006 +/* 01A98 808D4108 10200187 */ beq $at, $zero, .L808D4728 +/* 01A9C 808D410C 000F7880 */ sll $t7, $t7, 2 /* 01AA0 808D4110 3C01808D */ lui $at, %hi(jtbl_808D648C) ## $at = 808D0000 -/* 01AA4 808D4114 002F0821 */ addu $at, $at, $t7 -/* 01AA8 808D4118 8C2F648C */ lw $t7, %lo(jtbl_808D648C)($at) -/* 01AAC 808D411C 01E00008 */ jr $t7 +/* 01AA4 808D4114 002F0821 */ addu $at, $at, $t7 +/* 01AA8 808D4118 8C2F648C */ lw $t7, %lo(jtbl_808D648C)($at) +/* 01AAC 808D411C 01E00008 */ jr $t7 /* 01AB0 808D4120 00000000 */ nop glabel L808D4124 -/* 01AB4 808D4124 8FA40084 */ lw $a0, 0x0084($sp) +/* 01AB4 808D4124 8FA40084 */ lw $a0, 0x0084($sp) /* 01AB8 808D4128 24180001 */ addiu $t8, $zero, 0x0001 ## $t8 = 00000001 /* 01ABC 808D412C A6181390 */ sh $t8, 0x1390($s0) ## 00001390 -/* 01AC0 808D4130 0C019148 */ jal func_80064520 +/* 01AC0 808D4130 0C019148 */ jal func_80064520 /* 01AC4 808D4134 24851D64 */ addiu $a1, $a0, 0x1D64 ## $a1 = 00001D64 -/* 01AC8 808D4138 8FA40084 */ lw $a0, 0x0084($sp) +/* 01AC8 808D4138 8FA40084 */ lw $a0, 0x0084($sp) /* 01ACC 808D413C 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 01AD0 808D4140 0C00B7D5 */ jal func_8002DF54 +/* 01AD0 808D4140 0C00B7D5 */ jal func_8002DF54 /* 01AD4 808D4144 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 -/* 01AD8 808D4148 0C03008C */ jal func_800C0230 -/* 01ADC 808D414C 8FA40084 */ lw $a0, 0x0084($sp) +/* 01AD8 808D4148 0C03008C */ jal func_800C0230 +/* 01ADC 808D414C 8FA40084 */ lw $a0, 0x0084($sp) /* 01AE0 808D4150 A6021392 */ sh $v0, 0x1392($s0) ## 00001392 -/* 01AE4 808D4154 8FA40084 */ lw $a0, 0x0084($sp) +/* 01AE4 808D4154 8FA40084 */ lw $a0, 0x0084($sp) /* 01AE8 808D4158 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 01AEC 808D415C 0C0300C5 */ jal func_800C0314 +/* 01AEC 808D415C 0C0300C5 */ jal func_800C0314 /* 01AF0 808D4160 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 -/* 01AF4 808D4164 8FA40084 */ lw $a0, 0x0084($sp) +/* 01AF4 808D4164 8FA40084 */ lw $a0, 0x0084($sp) /* 01AF8 808D4168 86051392 */ lh $a1, 0x1392($s0) ## 00001392 -/* 01AFC 808D416C 0C0300C5 */ jal func_800C0314 +/* 01AFC 808D416C 0C0300C5 */ jal func_800C0314 /* 01B00 808D4170 24060007 */ addiu $a2, $zero, 0x0007 ## $a2 = 00000007 -/* 01B04 808D4174 8FA3005C */ lw $v1, 0x005C($sp) +/* 01B04 808D4174 8FA3005C */ lw $v1, 0x005C($sp) /* 01B08 808D4178 3C01808D */ lui $at, %hi(D_808D64A4) ## $at = 808D0000 -/* 01B0C 808D417C C42064A4 */ lwc1 $f0, %lo(D_808D64A4)($at) +/* 01B0C 808D417C C42064A4 */ lwc1 $f0, %lo(D_808D64A4)($at) /* 01B10 808D4180 8C68005C */ lw $t0, 0x005C($v1) ## 0000005C /* 01B14 808D4184 3C0142C8 */ lui $at, 0x42C8 ## $at = 42C80000 /* 01B18 808D4188 44811000 */ mtc1 $at, $f2 ## $f2 = 100.00 @@ -68,7 +68,7 @@ glabel L808D4124 /* 01B58 808D41C8 E60213D4 */ swc1 $f2, 0x13D4($s0) ## 000013D4 /* 01B5C 808D41CC E60213D8 */ swc1 $f2, 0x13D8($s0) ## 000013D8 /* 01B60 808D41D0 AE0A13A8 */ sw $t2, 0x13A8($s0) ## 000013A8 -/* 01B64 808D41D4 C42464A8 */ lwc1 $f4, %lo(D_808D64A8)($at) +/* 01B64 808D41D4 C42464A8 */ lwc1 $f4, %lo(D_808D64A8)($at) /* 01B68 808D41D8 A60001BC */ sh $zero, 0x01BC($s0) ## 000001BC /* 01B6C 808D41DC A60001A8 */ sh $zero, 0x01A8($s0) ## 000001A8 /* 01B70 808D41E0 E60013E8 */ swc1 $f0, 0x13E8($s0) ## 000013E8 @@ -84,18 +84,18 @@ glabel L808D41FC /* 01B94 808D4204 256C0001 */ addiu $t4, $t3, 0x0001 ## $t4 = 00000001 /* 01B98 808D4208 A60C01A8 */ sh $t4, 0x01A8($s0) ## 000001A8 /* 01B9C 808D420C 860201A8 */ lh $v0, 0x01A8($s0) ## 000001A8 -/* 01BA0 808D4210 2841000F */ slti $at, $v0, 0x000F -/* 01BA4 808D4214 10200004 */ beq $at, $zero, .L808D4228 +/* 01BA0 808D4210 2841000F */ slti $at, $v0, 0x000F +/* 01BA4 808D4214 10200004 */ beq $at, $zero, .L808D4228 /* 01BA8 808D4218 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 /* 01BAC 808D421C 44810000 */ mtc1 $at, $f0 ## $f0 = 1.00 -/* 01BB0 808D4220 1000000B */ beq $zero, $zero, .L808D4250 +/* 01BB0 808D4220 1000000B */ beq $zero, $zero, .L808D4250 /* 01BB4 808D4224 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 .L808D4228: -/* 01BB8 808D4228 28410014 */ slti $at, $v0, 0x0014 -/* 01BBC 808D422C 10200004 */ beq $at, $zero, .L808D4240 +/* 01BB8 808D4228 28410014 */ slti $at, $v0, 0x0014 +/* 01BBC 808D422C 10200004 */ beq $at, $zero, .L808D4240 /* 01BC0 808D4230 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 /* 01BC4 808D4234 44810000 */ mtc1 $at, $f0 ## $f0 = 0.50 -/* 01BC8 808D4238 10000005 */ beq $zero, $zero, .L808D4250 +/* 01BC8 808D4238 10000005 */ beq $zero, $zero, .L808D4250 /* 01BCC 808D423C 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 .L808D4240: /* 01BD0 808D4240 3C013E80 */ lui $at, 0x3E80 ## $at = 3E800000 @@ -103,71 +103,71 @@ glabel L808D41FC /* 01BD8 808D4248 00000000 */ nop /* 01BDC 808D424C 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 .L808D4250: -/* 01BE0 808D4250 10410002 */ beq $v0, $at, .L808D425C +/* 01BE0 808D4250 10410002 */ beq $v0, $at, .L808D425C /* 01BE4 808D4254 24010028 */ addiu $at, $zero, 0x0028 ## $at = 00000028 -/* 01BE8 808D4258 1441000C */ bne $v0, $at, .L808D428C +/* 01BE8 808D4258 1441000C */ bne $v0, $at, .L808D428C .L808D425C: /* 01BEC 808D425C 24010028 */ addiu $at, $zero, 0x0028 ## $at = 00000028 -/* 01BF0 808D4260 14410005 */ bne $v0, $at, .L808D4278 +/* 01BF0 808D4260 14410005 */ bne $v0, $at, .L808D4278 /* 01BF4 808D4264 A60D01A4 */ sh $t5, 0x01A4($s0) ## 000001A4 /* 01BF8 808D4268 240438D9 */ addiu $a0, $zero, 0x38D9 ## $a0 = 000038D9 -/* 01BFC 808D426C 0C03E341 */ jal func_800F8D04 -/* 01C00 808D4270 E7A0007C */ swc1 $f0, 0x007C($sp) -/* 01C04 808D4274 C7A0007C */ lwc1 $f0, 0x007C($sp) +/* 01BFC 808D426C 0C03E341 */ jal func_800F8D04 +/* 01C00 808D4270 E7A0007C */ swc1 $f0, 0x007C($sp) +/* 01C04 808D4274 C7A0007C */ lwc1 $f0, 0x007C($sp) .L808D4278: /* 01C08 808D4278 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 01C0C 808D427C 240538D6 */ addiu $a1, $zero, 0x38D6 ## $a1 = 000038D6 /* 01C10 808D4280 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 01C14 808D4284 E7A0007C */ swc1 $f0, 0x007C($sp) -/* 01C18 808D4288 C7A0007C */ lwc1 $f0, 0x007C($sp) + +/* 01C14 808D4284 E7A0007C */ swc1 $f0, 0x007C($sp) +/* 01C18 808D4288 C7A0007C */ lwc1 $f0, 0x007C($sp) .L808D428C: -/* 01C1C 808D428C 44050000 */ mfc1 $a1, $f0 +/* 01C1C 808D428C 44050000 */ mfc1 $a1, $f0 /* 01C20 808D4290 26040168 */ addiu $a0, $s0, 0x0168 ## $a0 = 00000168 /* 01C24 808D4294 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 01C28 808D4298 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 01C2C 808D429C 3C073F80 */ lui $a3, 0x3F80 ## $a3 = 3F800000 /* 01C30 808D42A0 860E008A */ lh $t6, 0x008A($s0) ## 0000008A /* 01C34 808D42A4 3C014700 */ lui $at, 0x4700 ## $at = 47000000 /* 01C38 808D42A8 44815000 */ mtc1 $at, $f10 ## $f10 = 32768.00 /* 01C3C 808D42AC 448E3000 */ mtc1 $t6, $f6 ## $f6 = 0.00 /* 01C40 808D42B0 3C01808D */ lui $at, %hi(D_808D64AC) ## $at = 808D0000 -/* 01C44 808D42B4 C43264AC */ lwc1 $f18, %lo(D_808D64AC)($at) -/* 01C48 808D42B8 46803220 */ cvt.s.w $f8, $f6 +/* 01C44 808D42B4 C43264AC */ lwc1 $f18, %lo(D_808D64AC)($at) +/* 01C48 808D42B8 46803220 */ cvt.s.w $f8, $f6 /* 01C4C 808D42BC 3C01808D */ lui $at, %hi(D_808D64B0) ## $at = 808D0000 -/* 01C50 808D42C0 C42664B0 */ lwc1 $f6, %lo(D_808D64B0)($at) +/* 01C50 808D42C0 C42664B0 */ lwc1 $f6, %lo(D_808D64B0)($at) /* 01C54 808D42C4 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 01C58 808D42C8 460A4403 */ div.s $f16, $f8, $f10 -/* 01C5C 808D42CC 46128102 */ mul.s $f4, $f16, $f18 -/* 01C60 808D42D0 0C034348 */ jal Matrix_RotateY -/* 01C64 808D42D4 46062300 */ add.s $f12, $f4, $f6 +/* 01C58 808D42C8 460A4403 */ div.s $f16, $f8, $f10 +/* 01C5C 808D42CC 46128102 */ mul.s $f4, $f16, $f18 +/* 01C60 808D42D0 0C034348 */ jal Matrix_RotateY +/* 01C64 808D42D4 46062300 */ add.s $f12, $f4, $f6 /* 01C68 808D42D8 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 /* 01C6C 808D42DC 3C01437A */ lui $at, 0x437A ## $at = 437A0000 /* 01C70 808D42E0 44814000 */ mtc1 $at, $f8 ## $f8 = 250.00 /* 01C74 808D42E4 27A40070 */ addiu $a0, $sp, 0x0070 ## $a0 = FFFFFFF0 /* 01C78 808D42E8 27A50064 */ addiu $a1, $sp, 0x0064 ## $a1 = FFFFFFE4 -/* 01C7C 808D42EC E7A00070 */ swc1 $f0, 0x0070($sp) -/* 01C80 808D42F0 E7A00074 */ swc1 $f0, 0x0074($sp) -/* 01C84 808D42F4 0C0346BD */ jal Matrix_MultVec3f -/* 01C88 808D42F8 E7A80078 */ swc1 $f8, 0x0078($sp) +/* 01C7C 808D42EC E7A00070 */ swc1 $f0, 0x0070($sp) +/* 01C80 808D42F0 E7A00074 */ swc1 $f0, 0x0074($sp) +/* 01C84 808D42F4 0C0346BD */ jal Matrix_MultVec3f +/* 01C88 808D42F8 E7A80078 */ swc1 $f8, 0x0078($sp) /* 01C8C 808D42FC C60A0024 */ lwc1 $f10, 0x0024($s0) ## 00000024 -/* 01C90 808D4300 C7B00064 */ lwc1 $f16, 0x0064($sp) +/* 01C90 808D4300 C7B00064 */ lwc1 $f16, 0x0064($sp) /* 01C94 808D4304 3C01430C */ lui $at, 0x430C ## $at = 430C0000 /* 01C98 808D4308 44812000 */ mtc1 $at, $f4 ## $f4 = 140.00 -/* 01C9C 808D430C 46105480 */ add.s $f18, $f10, $f16 +/* 01C9C 808D430C 46105480 */ add.s $f18, $f10, $f16 /* 01CA0 808D4310 3C0142B4 */ lui $at, 0x42B4 ## $at = 42B40000 /* 01CA4 808D4314 44818000 */ mtc1 $at, $f16 ## $f16 = 90.00 /* 01CA8 808D4318 C600003C */ lwc1 $f0, 0x003C($s0) ## 0000003C /* 01CAC 808D431C E61213DC */ swc1 $f18, 0x13DC($s0) ## 000013DC /* 01CB0 808D4320 E60413E0 */ swc1 $f4, 0x13E0($s0) ## 000013E0 -/* 01CB4 808D4324 C7A8006C */ lwc1 $f8, 0x006C($sp) +/* 01CB4 808D4324 C7A8006C */ lwc1 $f8, 0x006C($sp) /* 01CB8 808D4328 C606002C */ lwc1 $f6, 0x002C($s0) ## 0000002C -/* 01CBC 808D432C 4600803E */ c.le.s $f16, $f0 +/* 01CBC 808D432C 4600803E */ c.le.s $f16, $f0 /* 01CC0 808D4330 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 -/* 01CC4 808D4334 46083280 */ add.s $f10, $f6, $f8 +/* 01CC4 808D4334 46083280 */ add.s $f10, $f6, $f8 /* 01CC8 808D4338 3C054170 */ lui $a1, 0x4170 ## $a1 = 41700000 -/* 01CCC 808D433C 45000006 */ bc1f .L808D4358 +/* 01CCC 808D433C 45000006 */ bc1f .L808D4358 /* 01CD0 808D4340 E60A13E4 */ swc1 $f10, 0x13E4($s0) ## 000013E4 /* 01CD4 808D4344 C6120038 */ lwc1 $f18, 0x0038($s0) ## 00000038 /* 01CD8 808D4348 C6040040 */ lwc1 $f4, 0x0040($s0) ## 00000040 @@ -176,74 +176,74 @@ glabel L808D41FC /* 01CE4 808D4354 E60413FC */ swc1 $f4, 0x13FC($s0) ## 000013FC .L808D4358: /* 01CE8 808D4358 860F01BC */ lh $t7, 0x01BC($s0) ## 000001BC -/* 01CEC 808D435C 15E00013 */ bne $t7, $zero, .L808D43AC +/* 01CEC 808D435C 15E00013 */ bne $t7, $zero, .L808D43AC /* 01CF0 808D4360 00000000 */ nop /* 01CF4 808D4364 44811000 */ mtc1 $at, $f2 ## $f2 = 20.00 -/* 01CF8 808D4368 8FA40044 */ lw $a0, 0x0044($sp) -/* 01CFC 808D436C 44051000 */ mfc1 $a1, $f2 -/* 01D00 808D4370 0C0295B2 */ jal func_800A56C8 +/* 01CF8 808D4368 8FA40044 */ lw $a0, 0x0044($sp) +/* 01CFC 808D436C 44051000 */ mfc1 $a1, $f2 +/* 01D00 808D4370 0C0295B2 */ jal func_800A56C8 /* 01D04 808D4374 00000000 */ nop -/* 01D08 808D4378 10400003 */ beq $v0, $zero, .L808D4388 -/* 01D0C 808D437C 8FB90060 */ lw $t9, 0x0060($sp) +/* 01D08 808D4378 10400003 */ beq $v0, $zero, .L808D4388 +/* 01D0C 808D437C 8FB90060 */ lw $t9, 0x0060($sp) /* 01D10 808D4380 2418003C */ addiu $t8, $zero, 0x003C ## $t8 = 0000003C /* 01D14 808D4384 A7380250 */ sh $t8, 0x0250($t9) ## 00000250 .L808D4388: /* 01D18 808D4388 860801A8 */ lh $t0, 0x01A8($s0) ## 000001A8 /* 01D1C 808D438C 24090002 */ addiu $t1, $zero, 0x0002 ## $t1 = 00000002 /* 01D20 808D4390 240A0032 */ addiu $t2, $zero, 0x0032 ## $t2 = 00000032 -/* 01D24 808D4394 29010064 */ slti $at, $t0, 0x0064 -/* 01D28 808D4398 542000E4 */ bnel $at, $zero, .L808D472C +/* 01D24 808D4394 29010064 */ slti $at, $t0, 0x0064 +/* 01D28 808D4398 542000E4 */ bnel $at, $zero, .L808D472C /* 01D2C 808D439C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 01D30 808D43A0 A6091390 */ sh $t1, 0x1390($s0) ## 00001390 -/* 01D34 808D43A4 100000E0 */ beq $zero, $zero, .L808D4728 +/* 01D34 808D43A4 100000E0 */ beq $zero, $zero, .L808D4728 /* 01D38 808D43A8 A60A01BC */ sh $t2, 0x01BC($s0) ## 000001BC .L808D43AC: -/* 01D3C 808D43AC 0C0295B2 */ jal func_800A56C8 -/* 01D40 808D43B0 8FA40044 */ lw $a0, 0x0044($sp) -/* 01D44 808D43B4 104000DC */ beq $v0, $zero, .L808D4728 -/* 01D48 808D43B8 8FA40044 */ lw $a0, 0x0044($sp) +/* 01D3C 808D43AC 0C0295B2 */ jal func_800A56C8 +/* 01D40 808D43B0 8FA40044 */ lw $a0, 0x0044($sp) +/* 01D44 808D43B4 104000DC */ beq $v0, $zero, .L808D4728 +/* 01D48 808D43B8 8FA40044 */ lw $a0, 0x0044($sp) /* 01D4C 808D43BC 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 /* 01D50 808D43C0 24A589DC */ addiu $a1, $a1, 0x89DC ## $a1 = 060089DC -/* 01D54 808D43C4 0C029490 */ jal func_800A5240 +/* 01D54 808D43C4 0C029490 */ jal SkelAnime_ChangeAnimTransitionStop /* 01D58 808D43C8 3C06C120 */ lui $a2, 0xC120 ## $a2 = C1200000 -/* 01D5C 808D43CC 100000D7 */ beq $zero, $zero, .L808D472C +/* 01D5C 808D43CC 100000D7 */ beq $zero, $zero, .L808D472C /* 01D60 808D43D0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 glabel L808D43D4 /* 01D64 808D43D4 860B01BC */ lh $t3, 0x01BC($s0) ## 000001BC /* 01D68 808D43D8 26040028 */ addiu $a0, $s0, 0x0028 ## $a0 = 00000028 /* 01D6C 808D43DC 3C05C2C8 */ lui $a1, 0xC2C8 ## $a1 = C2C80000 -/* 01D70 808D43E0 1560000B */ bne $t3, $zero, .L808D4410 +/* 01D70 808D43E0 1560000B */ bne $t3, $zero, .L808D4410 /* 01D74 808D43E4 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 01D78 808D43E8 240C0003 */ addiu $t4, $zero, 0x0003 ## $t4 = 00000003 /* 01D7C 808D43EC AE000134 */ sw $zero, 0x0134($s0) ## 00000134 /* 01D80 808D43F0 A60C1390 */ sh $t4, 0x1390($s0) ## 00001390 -/* 01D84 808D43F4 8FAE0060 */ lw $t6, 0x0060($sp) +/* 01D84 808D43F4 8FAE0060 */ lw $t6, 0x0060($sp) /* 01D88 808D43F8 44803000 */ mtc1 $zero, $f6 ## $f6 = 0.00 /* 01D8C 808D43FC 240D0002 */ addiu $t5, $zero, 0x0002 ## $t5 = 00000002 /* 01D90 808D4400 A1CD02D8 */ sb $t5, 0x02D8($t6) ## 000002D8 /* 01D94 808D4404 A6000198 */ sh $zero, 0x0198($s0) ## 00000198 -/* 01D98 808D4408 100000C7 */ beq $zero, $zero, .L808D4728 +/* 01D98 808D4408 100000C7 */ beq $zero, $zero, .L808D4728 /* 01D9C 808D440C E606140C */ swc1 $f6, 0x140C($s0) ## 0000140C .L808D4410: /* 01DA0 808D4410 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 01DA4 808D4414 3C0740A0 */ lui $a3, 0x40A0 ## $a3 = 40A00000 -/* 01DA8 808D4418 100000C4 */ beq $zero, $zero, .L808D472C +/* 01DA8 808D4418 100000C4 */ beq $zero, $zero, .L808D472C /* 01DAC 808D441C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 glabel L808D4420 -/* 01DB0 808D4420 8FA20060 */ lw $v0, 0x0060($sp) +/* 01DB0 808D4420 8FA20060 */ lw $v0, 0x0060($sp) /* 01DB4 808D4424 3C0142A0 */ lui $at, 0x42A0 ## $at = 42A00000 /* 01DB8 808D4428 44810000 */ mtc1 $at, $f0 ## $f0 = 80.00 /* 01DBC 808D442C C4480028 */ lwc1 $f8, 0x0028($v0) ## 00000028 /* 01DC0 808D4430 260413E0 */ addiu $a0, $s0, 0x13E0 ## $a0 = 000013E0 -/* 01DC4 808D4434 4600403C */ c.lt.s $f8, $f0 +/* 01DC4 808D4434 4600403C */ c.lt.s $f8, $f0 /* 01DC8 808D4438 00000000 */ nop -/* 01DCC 808D443C 45020018 */ bc1fl .L808D44A0 +/* 01DCC 808D443C 45020018 */ bc1fl .L808D44A0 /* 01DD0 808D4440 8C490024 */ lw $t1, 0x0024($v0) ## 00000024 /* 01DD4 808D4444 844F0030 */ lh $t7, 0x0030($v0) ## 00000030 -/* 01DD8 808D4448 29E13001 */ slti $at, $t7, 0x3001 -/* 01DDC 808D444C 54200038 */ bnel $at, $zero, .L808D4530 -/* 01DE0 808D4450 8FA20060 */ lw $v0, 0x0060($sp) +/* 01DD8 808D4448 29E13001 */ slti $at, $t7, 0x3001 +/* 01DDC 808D444C 54200038 */ bnel $at, $zero, .L808D4530 +/* 01DE0 808D4450 8FA20060 */ lw $v0, 0x0060($sp) /* 01DE4 808D4454 8C590024 */ lw $t9, 0x0024($v0) ## 00000024 /* 01DE8 808D4458 3C014316 */ lui $at, 0x4316 ## $at = 43160000 /* 01DEC 808D445C 44818000 */ mtc1 $at, $f16 ## $f16 = 150.00 @@ -259,8 +259,8 @@ glabel L808D4420 /* 01E14 808D4484 E61013E0 */ swc1 $f16, 0x13E0($s0) ## 000013E0 /* 01E18 808D4488 E60A13DC */ swc1 $f10, 0x13DC($s0) ## 000013DC /* 01E1C 808D448C C452002C */ lwc1 $f18, 0x002C($v0) ## 0000002C -/* 01E20 808D4490 46049180 */ add.s $f6, $f18, $f4 -/* 01E24 808D4494 10000025 */ beq $zero, $zero, .L808D452C +/* 01E20 808D4490 46049180 */ add.s $f6, $f18, $f4 +/* 01E24 808D4494 10000025 */ beq $zero, $zero, .L808D452C /* 01E28 808D4498 E60613E4 */ swc1 $f6, 0x13E4($s0) ## 000013E4 /* 01E2C 808D449C 8C490024 */ lw $t1, 0x0024($v0) ## 00000024 .L808D44A0: @@ -274,50 +274,50 @@ glabel L808D4420 /* 01E4C 808D44BC 8C49002C */ lw $t1, 0x002C($v0) ## 0000002C /* 01E50 808D44C0 E60813DC */ swc1 $f8, 0x13DC($s0) ## 000013DC /* 01E54 808D44C4 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 01E58 808D44C8 AE0913FC */ sw $t1, 0x13FC($s0) ## 000013FC -/* 01E5C 808D44CC 8FAA0060 */ lw $t2, 0x0060($sp) +/* 01E5C 808D44CC 8FAA0060 */ lw $t2, 0x0060($sp) /* 01E60 808D44D0 3C014348 */ lui $at, 0x4348 ## $at = 43480000 /* 01E64 808D44D4 44818000 */ mtc1 $at, $f16 ## $f16 = 200.00 /* 01E68 808D44D8 C54A002C */ lwc1 $f10, 0x002C($t2) ## 0000002C /* 01E6C 808D44DC 260413E4 */ addiu $a0, $s0, 0x13E4 ## $a0 = 000013E4 /* 01E70 808D44E0 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 01E74 808D44E4 46105480 */ add.s $f18, $f10, $f16 +/* 01E74 808D44E4 46105480 */ add.s $f18, $f10, $f16 /* 01E78 808D44E8 3C074040 */ lui $a3, 0x4040 ## $a3 = 40400000 -/* 01E7C 808D44EC 44059000 */ mfc1 $a1, $f18 +/* 01E7C 808D44EC 44059000 */ mfc1 $a1, $f18 /* 01E80 808D44F0 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 01E84 808D44F4 00000000 */ nop /* 01E88 808D44F8 86020198 */ lh $v0, 0x0198($s0) ## 00000198 -/* 01E8C 808D44FC 1440000B */ bne $v0, $zero, .L808D452C +/* 01E8C 808D44FC 1440000B */ bne $v0, $zero, .L808D452C /* 01E90 808D4500 244B0001 */ addiu $t3, $v0, 0x0001 ## $t3 = 00000001 /* 01E94 808D4504 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 /* 01E98 808D4508 A60B0198 */ sh $t3, 0x0198($s0) ## 00000198 /* 01E9C 808D450C 3C01808D */ lui $at, %hi(D_808D64B4) ## $at = 808D0000 /* 01EA0 808D4510 E604140C */ swc1 $f4, 0x140C($s0) ## 0000140C -/* 01EA4 808D4514 C42664B4 */ lwc1 $f6, %lo(D_808D64B4)($at) +/* 01EA4 808D4514 C42664B4 */ lwc1 $f6, %lo(D_808D64B4)($at) /* 01EA8 808D4518 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 /* 01EAC 808D451C E6061410 */ swc1 $f6, 0x1410($s0) ## 00001410 -/* 01EB0 808D4520 8FA50060 */ lw $a1, 0x0060($sp) -/* 01EB4 808D4524 0C00B7D5 */ jal func_8002DF54 -/* 01EB8 808D4528 8FA40084 */ lw $a0, 0x0084($sp) +/* 01EB0 808D4520 8FA50060 */ lw $a1, 0x0060($sp) +/* 01EB4 808D4524 0C00B7D5 */ jal func_8002DF54 +/* 01EB8 808D4528 8FA40084 */ lw $a0, 0x0084($sp) .L808D452C: -/* 01EBC 808D452C 8FA20060 */ lw $v0, 0x0060($sp) +/* 01EBC 808D452C 8FA20060 */ lw $v0, 0x0060($sp) .L808D4530: /* 01EC0 808D4530 240100CA */ addiu $at, $zero, 0x00CA ## $at = 000000CA /* 01EC4 808D4534 844C0222 */ lh $t4, 0x0222($v0) ## 00000222 -/* 01EC8 808D4538 5581007C */ bnel $t4, $at, .L808D472C +/* 01EC8 808D4538 5581007C */ bnel $t4, $at, .L808D472C /* 01ECC 808D453C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 01ED0 808D4540 844D0248 */ lh $t5, 0x0248($v0) ## 00000248 /* 01ED4 808D4544 24010005 */ addiu $at, $zero, 0x0005 ## $at = 00000005 /* 01ED8 808D4548 240E0004 */ addiu $t6, $zero, 0x0004 ## $t6 = 00000004 -/* 01EDC 808D454C 55A10077 */ bnel $t5, $at, .L808D472C +/* 01EDC 808D454C 55A10077 */ bnel $t5, $at, .L808D472C /* 01EE0 808D4550 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 01EE4 808D4554 44804000 */ mtc1 $zero, $f8 ## $f8 = 0.00 /* 01EE8 808D4558 A60E1390 */ sh $t6, 0x1390($s0) ## 00001390 /* 01EEC 808D455C 3C01808D */ lui $at, %hi(D_808D64B8) ## $at = 808D0000 /* 01EF0 808D4560 E608140C */ swc1 $f8, 0x140C($s0) ## 0000140C -/* 01EF4 808D4564 C42A64B8 */ lwc1 $f10, %lo(D_808D64B8)($at) +/* 01EF4 808D4564 C42A64B8 */ lwc1 $f10, %lo(D_808D64B8)($at) /* 01EF8 808D4568 3C014316 */ lui $at, 0x4316 ## $at = 43160000 /* 01EFC 808D456C 44818000 */ mtc1 $at, $f16 ## $f16 = 150.00 /* 01F00 808D4570 3C014396 */ lui $at, 0x4396 ## $at = 43960000 @@ -326,15 +326,15 @@ glabel L808D4420 /* 01F0C 808D457C C452002C */ lwc1 $f18, 0x002C($v0) ## 0000002C /* 01F10 808D4580 44812000 */ mtc1 $at, $f4 ## $f4 = 300.00 /* 01F14 808D4584 00000000 */ nop -/* 01F18 808D4588 46049180 */ add.s $f6, $f18, $f4 -/* 01F1C 808D458C 10000066 */ beq $zero, $zero, .L808D4728 +/* 01F18 808D4588 46049180 */ add.s $f6, $f18, $f4 +/* 01F1C 808D458C 10000066 */ beq $zero, $zero, .L808D4728 /* 01F20 808D4590 E60613E4 */ swc1 $f6, 0x13E4($s0) ## 000013E4 glabel L808D4594 /* 01F24 808D4594 260413F8 */ addiu $a0, $s0, 0x13F8 ## $a0 = 000013F8 /* 01F28 808D4598 3C0542C8 */ lui $a1, 0x42C8 ## $a1 = 42C80000 /* 01F2C 808D459C 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 01F30 808D45A0 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 01F34 808D45A4 3C0742C8 */ lui $a3, 0x42C8 ## $a3 = 42C80000 /* 01F38 808D45A8 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 /* 01F3C 808D45AC 3C01430C */ lui $at, 0x430C ## $at = 430C0000 @@ -348,12 +348,12 @@ glabel L808D4594 /* 01F5C 808D45CC E60013FC */ swc1 $f0, 0x13FC($s0) ## 000013FC /* 01F60 808D45D0 E60013DC */ swc1 $f0, 0x13DC($s0) ## 000013DC /* 01F64 808D45D4 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 01F68 808D45D8 E60813E0 */ swc1 $f8, 0x13E0($s0) ## 000013E0 -/* 01F6C 808D45DC 8FA30060 */ lw $v1, 0x0060($sp) +/* 01F6C 808D45DC 8FA30060 */ lw $v1, 0x0060($sp) /* 01F70 808D45E0 24080005 */ addiu $t0, $zero, 0x0005 ## $t0 = 00000005 /* 01F74 808D45E4 84620242 */ lh $v0, 0x0242($v1) ## 00000242 -/* 01F78 808D45E8 10400016 */ beq $v0, $zero, .L808D4644 +/* 01F78 808D45E8 10400016 */ beq $v0, $zero, .L808D4644 /* 01F7C 808D45EC 244FFFFF */ addiu $t7, $v0, 0xFFFF ## $t7 = FFFFFFFF /* 01F80 808D45F0 A46F0242 */ sh $t7, 0x0242($v1) ## 00000242 /* 01F84 808D45F4 84620242 */ lh $v0, 0x0242($v1) ## 00000242 @@ -362,27 +362,27 @@ glabel L808D4594 /* 01F90 808D4600 44825000 */ mtc1 $v0, $f10 ## $f10 = 0.00 /* 01F94 808D4604 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 /* 01F98 808D4608 44819000 */ mtc1 $at, $f18 ## $f18 = 0.50 -/* 01F9C 808D460C 46805420 */ cvt.s.w $f16, $f10 +/* 01F9C 808D460C 46805420 */ cvt.s.w $f16, $f10 /* 01FA0 808D4610 30580001 */ andi $t8, $v0, 0x0001 ## $t8 = 00000000 -/* 01FA4 808D4614 46128003 */ div.s $f0, $f16, $f18 -/* 01FA8 808D4618 4600103E */ c.le.s $f2, $f0 +/* 01FA4 808D4614 46128003 */ div.s $f0, $f16, $f18 +/* 01FA8 808D4618 4600103E */ c.le.s $f2, $f0 /* 01FAC 808D461C 00000000 */ nop -/* 01FB0 808D4620 45000002 */ bc1f .L808D462C +/* 01FB0 808D4620 45000002 */ bc1f .L808D462C /* 01FB4 808D4624 00000000 */ nop -/* 01FB8 808D4628 46001006 */ mov.s $f0, $f2 +/* 01FB8 808D4628 46001006 */ mov.s $f0, $f2 .L808D462C: -/* 01FBC 808D462C 53000004 */ beql $t8, $zero, .L808D4640 -/* 01FC0 808D4630 46000107 */ neg.s $f4, $f0 -/* 01FC4 808D4634 10000003 */ beq $zero, $zero, .L808D4644 +/* 01FBC 808D462C 53000004 */ beql $t8, $zero, .L808D4640 +/* 01FC0 808D4630 46000107 */ neg.s $f4, $f0 +/* 01FC4 808D4634 10000003 */ beq $zero, $zero, .L808D4644 /* 01FC8 808D4638 E6001414 */ swc1 $f0, 0x1414($s0) ## 00001414 -/* 01FCC 808D463C 46000107 */ neg.s $f4, $f0 +/* 01FCC 808D463C 46000107 */ neg.s $f4, $f0 .L808D4640: /* 01FD0 808D4640 E6041414 */ swc1 $f4, 0x1414($s0) ## 00001414 .L808D4644: /* 01FD4 808D4644 84790222 */ lh $t9, 0x0222($v1) ## 00000222 /* 01FD8 808D4648 240100CD */ addiu $at, $zero, 0x00CD ## $at = 000000CD -/* 01FDC 808D464C 8FA3005C */ lw $v1, 0x005C($sp) -/* 01FE0 808D4650 17210035 */ bne $t9, $at, .L808D4728 +/* 01FDC 808D464C 8FA3005C */ lw $v1, 0x005C($sp) +/* 01FE0 808D4650 17210035 */ bne $t9, $at, .L808D4728 /* 01FE4 808D4654 26021394 */ addiu $v0, $s0, 0x1394 ## $v0 = 00001394 /* 01FE8 808D4658 A6081390 */ sh $t0, 0x1390($s0) ## 00001390 /* 01FEC 808D465C 8C4A0000 */ lw $t2, 0x0000($v0) ## 00001394 @@ -405,49 +405,49 @@ glabel L808D4594 /* 02030 808D46A0 8E0E13A8 */ lw $t6, 0x13A8($s0) ## 000013A8 /* 02034 808D46A4 AC6E0058 */ sw $t6, 0x0058($v1) ## 00000058 /* 02038 808D46A8 86051392 */ lh $a1, 0x1392($s0) ## 00001392 -/* 0203C 808D46AC 0C03022B */ jal func_800C08AC -/* 02040 808D46B0 8FA40084 */ lw $a0, 0x0084($sp) -/* 02044 808D46B4 8FA40084 */ lw $a0, 0x0084($sp) +/* 0203C 808D46AC 0C03022B */ jal func_800C08AC +/* 02040 808D46B0 8FA40084 */ lw $a0, 0x0084($sp) +/* 02044 808D46B4 8FA40084 */ lw $a0, 0x0084($sp) /* 02048 808D46B8 A6001392 */ sh $zero, 0x1392($s0) ## 00001392 -/* 0204C 808D46BC 0C01914D */ jal func_80064534 +/* 0204C 808D46BC 0C01914D */ jal func_80064534 /* 02050 808D46C0 24851D64 */ addiu $a1, $a0, 0x1D64 ## $a1 = 00001D64 -/* 02054 808D46C4 8FA40084 */ lw $a0, 0x0084($sp) +/* 02054 808D46C4 8FA40084 */ lw $a0, 0x0084($sp) /* 02058 808D46C8 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 0205C 808D46CC 0C00B7D5 */ jal func_8002DF54 +/* 0205C 808D46CC 0C00B7D5 */ jal func_8002DF54 /* 02060 808D46D0 24060007 */ addiu $a2, $zero, 0x0007 ## $a2 = 00000007 /* 02064 808D46D4 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 /* 02068 808D46D8 3C0142C8 */ lui $at, 0x42C8 ## $at = 42C80000 -/* 0206C 808D46DC 8FA60084 */ lw $a2, 0x0084($sp) +/* 0206C 808D46DC 8FA60084 */ lw $a2, 0x0084($sp) /* 02070 808D46E0 44813000 */ mtc1 $at, $f6 ## $f6 = 100.00 /* 02074 808D46E4 240FFFFF */ addiu $t7, $zero, 0xFFFF ## $t7 = FFFFFFFF -/* 02078 808D46E8 AFAF0028 */ sw $t7, 0x0028($sp) +/* 02078 808D46E8 AFAF0028 */ sw $t7, 0x0028($sp) /* 0207C 808D46EC 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 02080 808D46F0 2407005D */ addiu $a3, $zero, 0x005D ## $a3 = 0000005D -/* 02084 808D46F4 AFA0001C */ sw $zero, 0x001C($sp) -/* 02088 808D46F8 AFA00020 */ sw $zero, 0x0020($sp) -/* 0208C 808D46FC AFA00024 */ sw $zero, 0x0024($sp) -/* 02090 808D4700 E7A00010 */ swc1 $f0, 0x0010($sp) -/* 02094 808D4704 E7A00018 */ swc1 $f0, 0x0018($sp) +/* 02084 808D46F4 AFA0001C */ sw $zero, 0x001C($sp) +/* 02088 808D46F8 AFA00020 */ sw $zero, 0x0020($sp) +/* 0208C 808D46FC AFA00024 */ sw $zero, 0x0024($sp) +/* 02090 808D4700 E7A00010 */ swc1 $f0, 0x0010($sp) +/* 02094 808D4704 E7A00018 */ swc1 $f0, 0x0018($sp) /* 02098 808D4708 24C41C24 */ addiu $a0, $a2, 0x1C24 ## $a0 = 00001C24 /* 0209C 808D470C 0C00C916 */ jal Actor_SpawnAttached - -/* 020A0 808D4710 E7A60014 */ swc1 $f6, 0x0014($sp) -/* 020A4 808D4714 8FA40084 */ lw $a0, 0x0084($sp) + +/* 020A0 808D4710 E7A60014 */ swc1 $f6, 0x0014($sp) +/* 020A4 808D4714 8FA40084 */ lw $a0, 0x0084($sp) /* 020A8 808D4718 3C050001 */ lui $a1, 0x0001 ## $a1 = 00010000 -/* 020AC 808D471C 00A42821 */ addu $a1, $a1, $a0 +/* 020AC 808D471C 00A42821 */ addu $a1, $a1, $a0 /* 020B0 808D4720 0C00B33C */ jal Flags_SetClear - + /* 020B4 808D4724 80A51CBC */ lb $a1, 0x1CBC($a1) ## 00011CBC glabel L808D4728 .L808D4728: /* 020B8 808D4728 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 .L808D472C: -/* 020BC 808D472C 0C234FD6 */ jal func_808D3F58 -/* 020C0 808D4730 8FA50084 */ lw $a1, 0x0084($sp) -/* 020C4 808D4734 8FBF003C */ lw $ra, 0x003C($sp) -/* 020C8 808D4738 8FB00038 */ lw $s0, 0x0038($sp) +/* 020BC 808D472C 0C234FD6 */ jal func_808D3F58 +/* 020C0 808D4730 8FA50084 */ lw $a1, 0x0084($sp) +/* 020C4 808D4734 8FBF003C */ lw $ra, 0x003C($sp) +/* 020C8 808D4738 8FB00038 */ lw $s0, 0x0038($sp) /* 020CC 808D473C 27BD0080 */ addiu $sp, $sp, 0x0080 ## $sp = 00000000 -/* 020D0 808D4740 03E00008 */ jr $ra +/* 020D0 808D4740 03E00008 */ jr $ra /* 020D4 808D4744 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Fd2/func_808D4F94.s b/asm/non_matchings/overlays/actors/ovl_Boss_Fd2/func_808D4F94.s index 7197e513d3..13ebc3800d 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Fd2/func_808D4F94.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Fd2/func_808D4F94.s @@ -93,7 +93,7 @@ glabel func_808D4F94 /* 02A74 808D50E4 AFA90060 */ sw $t1, 0x0060($sp) /* 02A78 808D50E8 27A4004C */ addiu $a0, $sp, 0x004C ## $a0 = FFFFFFE4 /* 02A7C 808D50EC 24070875 */ addiu $a3, $zero, 0x0875 ## $a3 = 00000875 -/* 02A80 808D50F0 0C031AB1 */ jal func_800C6AC4 +/* 02A80 808D50F0 0C031AB1 */ jal Graph_OpenDisps /* 02A84 808D50F4 AFA5005C */ sw $a1, 0x005C($sp) /* 02A88 808D50F8 8FA8005C */ lw $t0, 0x005C($sp) /* 02A8C 808D50FC 8FA90060 */ lw $t1, 0x0060($sp) @@ -121,7 +121,7 @@ glabel func_808D4F94 /* 02AE4 808D5154 0301C825 */ or $t9, $t8, $at ## $t9 = FFFFFF00 /* 02AE8 808D5158 AC790004 */ sw $t9, 0x0004($v1) ## 00000004 /* 02AEC 808D515C 8FAA0068 */ lw $t2, 0x0068($sp) -/* 02AF0 808D5160 0C031AD5 */ jal func_800C6B54 +/* 02AF0 808D5160 0C031AD5 */ jal Graph_CloseDisps /* 02AF4 808D5164 8D450000 */ lw $a1, 0x0000($t2) ## 00000008 /* 02AF8 808D5168 10000025 */ beq $zero, $zero, .L808D5200 /* 02AFC 808D516C 00000000 */ nop @@ -132,7 +132,7 @@ glabel func_808D4F94 /* 02B0C 808D517C AFA90060 */ sw $t1, 0x0060($sp) /* 02B10 808D5180 27A40030 */ addiu $a0, $sp, 0x0030 ## $a0 = FFFFFFC8 /* 02B14 808D5184 2407087E */ addiu $a3, $zero, 0x087E ## $a3 = 0000087E -/* 02B18 808D5188 0C031AB1 */ jal func_800C6AC4 +/* 02B18 808D5188 0C031AB1 */ jal Graph_OpenDisps /* 02B1C 808D518C AFA50040 */ sw $a1, 0x0040($sp) /* 02B20 808D5190 8FA80040 */ lw $t0, 0x0040($sp) /* 02B24 808D5194 8FA90060 */ lw $t1, 0x0060($sp) @@ -160,7 +160,7 @@ glabel func_808D4F94 /* 02B7C 808D51EC 01816825 */ or $t5, $t4, $at ## $t5 = FFFFFF00 /* 02B80 808D51F0 AC6D0004 */ sw $t5, 0x0004($v1) ## 00000004 /* 02B84 808D51F4 8FAE0068 */ lw $t6, 0x0068($sp) -/* 02B88 808D51F8 0C031AD5 */ jal func_800C6B54 +/* 02B88 808D51F8 0C031AD5 */ jal Graph_CloseDisps /* 02B8C 808D51FC 8DC50000 */ lw $a1, 0x0000($t6) ## 00000008 .L808D5200: /* 02B90 808D5200 1A000004 */ blez $s0, .L808D5214 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Fd2/func_808D52CC.s b/asm/non_matchings/overlays/actors/ovl_Boss_Fd2/func_808D52CC.s index 6abeeab293..20b4fa5f35 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Fd2/func_808D52CC.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Fd2/func_808D52CC.s @@ -74,7 +74,7 @@ glabel func_808D52CC /* 02D70 808D53E0 27A40098 */ addiu $a0, $sp, 0x0098 ## $a0 = FFFFFF38 /* 02D74 808D53E4 24070955 */ addiu $a3, $zero, 0x0955 ## $a3 = 00000955 /* 02D78 808D53E8 8DA50000 */ lw $a1, 0x0000($t5) ## 808D6294 -/* 02D7C 808D53EC 0C031AB1 */ jal func_800C6AC4 +/* 02D7C 808D53EC 0C031AB1 */ jal Graph_OpenDisps /* 02D80 808D53F0 00A0F025 */ or $s8, $a1, $zero ## $s8 = 00000000 /* 02D84 808D53F4 0C034213 */ jal Matrix_Push /* 02D88 808D53F8 00000000 */ nop @@ -389,7 +389,7 @@ glabel func_808D52CC /* 03214 808D5884 24C66414 */ addiu $a2, $a2, %lo(D_808D6414) ## $a2 = 808D6414 /* 03218 808D5888 27A40098 */ addiu $a0, $sp, 0x0098 ## $a0 = FFFFFF38 /* 0321C 808D588C 240709C7 */ addiu $a3, $zero, 0x09C7 ## $a3 = 000009C7 -/* 03220 808D5890 0C031AD5 */ jal func_800C6B54 +/* 03220 808D5890 0C031AD5 */ jal Graph_CloseDisps /* 03224 808D5894 8DA50000 */ lw $a1, 0x0000($t5) ## 00000000 /* 03228 808D5898 8FBF006C */ lw $ra, 0x006C($sp) /* 0322C 808D589C D7B40018 */ ldc1 $f20, 0x0018($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Fd2/func_808D58E0.s b/asm/non_matchings/overlays/actors/ovl_Boss_Fd2/func_808D58E0.s index c156a1a8ed..da2de4df23 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Fd2/func_808D58E0.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Fd2/func_808D58E0.s @@ -21,7 +21,7 @@ glabel func_808D58E0 /* 032BC 808D592C 24C66424 */ addiu $a2, $a2, %lo(D_808D6424) ## $a2 = 808D6424 /* 032C0 808D5930 27A40088 */ addiu $a0, $sp, 0x0088 ## $a0 = FFFFFFE0 /* 032C4 808D5934 240709D3 */ addiu $a3, $zero, 0x09D3 ## $a3 = 000009D3 -/* 032C8 808D5938 0C031AB1 */ jal func_800C6AC4 +/* 032C8 808D5938 0C031AB1 */ jal Graph_OpenDisps /* 032CC 808D593C 00A0A025 */ or $s4, $a1, $zero ## $s4 = 00000000 /* 032D0 808D5940 3C0145B2 */ lui $at, 0x45B2 ## $at = 45B20000 /* 032D4 808D5944 4481F000 */ mtc1 $at, $f30 ## $f30 = 5696.00 @@ -280,7 +280,7 @@ glabel func_808D58E0 /* 03694 808D5D04 24C66434 */ addiu $a2, $a2, %lo(D_808D6434) ## $a2 = 808D6434 /* 03698 808D5D08 27A40088 */ addiu $a0, $sp, 0x0088 ## $a0 = FFFFFFE0 /* 0369C 808D5D0C 24070A29 */ addiu $a3, $zero, 0x0A29 ## $a3 = 00000A29 -/* 036A0 808D5D10 0C031AD5 */ jal func_800C6B54 +/* 036A0 808D5D10 0C031AD5 */ jal Graph_CloseDisps /* 036A4 808D5D14 8D650000 */ lw $a1, 0x0000($t3) ## 00000000 /* 036A8 808D5D18 8FBF006C */ lw $ra, 0x006C($sp) /* 036AC 808D5D1C D7B40028 */ ldc1 $f20, 0x0028($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/BossGanon_Destroy.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/BossGanon_Destroy.s index 3a61ba5dd8..739df79b51 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/BossGanon_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/BossGanon_Destroy.s @@ -1,32 +1,32 @@ glabel BossGanon_Destroy /* 00EC8 808D7738 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00ECC 808D773C AFBF0014 */ sw $ra, 0x0014($sp) -/* 00ED0 808D7740 AFA5001C */ sw $a1, 0x001C($sp) +/* 00ECC 808D773C AFBF0014 */ sw $ra, 0x0014($sp) +/* 00ED0 808D7740 AFA5001C */ sw $a1, 0x001C($sp) /* 00ED4 808D7744 8482001C */ lh $v0, 0x001C($a0) ## 0000001C /* 00ED8 808D7748 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 /* 00EDC 808D774C 24C50610 */ addiu $a1, $a2, 0x0610 ## $a1 = 00000610 -/* 00EE0 808D7750 284100C8 */ slti $at, $v0, 0x00C8 -/* 00EE4 808D7754 14200004 */ bne $at, $zero, .L808D7768 -/* 00EE8 808D7758 8FA4001C */ lw $a0, 0x001C($sp) -/* 00EEC 808D775C 28410104 */ slti $at, $v0, 0x0104 -/* 00EF0 808D7760 54200006 */ bnel $at, $zero, .L808D777C -/* 00EF4 808D7764 28410064 */ slti $at, $v0, 0x0064 +/* 00EE0 808D7750 284100C8 */ slti $at, $v0, 0x00C8 +/* 00EE4 808D7754 14200004 */ bne $at, $zero, .L808D7768 +/* 00EE8 808D7758 8FA4001C */ lw $a0, 0x001C($sp) +/* 00EEC 808D775C 28410104 */ slti $at, $v0, 0x0104 +/* 00EF0 808D7760 54200006 */ bnel $at, $zero, .L808D777C +/* 00EF4 808D7764 28410064 */ slti $at, $v0, 0x0064 .L808D7768: /* 00EF8 808D7768 0C0170EB */ jal ActorCollider_FreeCylinder - -/* 00EFC 808D776C AFA60018 */ sw $a2, 0x0018($sp) -/* 00F00 808D7770 8FA60018 */ lw $a2, 0x0018($sp) + +/* 00EFC 808D776C AFA60018 */ sw $a2, 0x0018($sp) +/* 00F00 808D7770 8FA60018 */ lw $a2, 0x0018($sp) /* 00F04 808D7774 84C2001C */ lh $v0, 0x001C($a2) ## 0000001C -/* 00F08 808D7778 28410064 */ slti $at, $v0, 0x0064 +/* 00F08 808D7778 28410064 */ slti $at, $v0, 0x0064 .L808D777C: -/* 00F0C 808D777C 10200003 */ beq $at, $zero, .L808D778C +/* 00F0C 808D777C 10200003 */ beq $at, $zero, .L808D778C /* 00F10 808D7780 24C40150 */ addiu $a0, $a2, 0x0150 ## $a0 = 00000150 -/* 00F14 808D7784 0C0295BC */ jal func_800A56F0 -/* 00F18 808D7788 8FA5001C */ lw $a1, 0x001C($sp) +/* 00F14 808D7784 0C0295BC */ jal SkelAnime_Free +/* 00F18 808D7788 8FA5001C */ lw $a1, 0x001C($sp) .L808D778C: -/* 00F1C 808D778C 8FBF0014 */ lw $ra, 0x0014($sp) +/* 00F1C 808D778C 8FBF0014 */ lw $ra, 0x0014($sp) /* 00F20 808D7790 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00F24 808D7794 03E00008 */ jr $ra +/* 00F24 808D7794 03E00008 */ jr $ra /* 00F28 808D7798 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/BossGanon_Draw.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/BossGanon_Draw.s index e886d368b6..96f21eaf50 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/BossGanon_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/BossGanon_Draw.s @@ -1,63 +1,63 @@ glabel BossGanon_Draw /* 0A468 808E0CD8 27BDFFA0 */ addiu $sp, $sp, 0xFFA0 ## $sp = FFFFFFA0 -/* 0A46C 808E0CDC AFB1002C */ sw $s1, 0x002C($sp) -/* 0A470 808E0CE0 AFB00028 */ sw $s0, 0x0028($sp) +/* 0A46C 808E0CDC AFB1002C */ sw $s1, 0x002C($sp) +/* 0A470 808E0CE0 AFB00028 */ sw $s0, 0x0028($sp) /* 0A474 808E0CE4 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 0A478 808E0CE8 AFBF0034 */ sw $ra, 0x0034($sp) -/* 0A47C 808E0CEC AFB20030 */ sw $s2, 0x0030($sp) +/* 0A478 808E0CE8 AFBF0034 */ sw $ra, 0x0034($sp) +/* 0A47C 808E0CEC AFB20030 */ sw $s2, 0x0030($sp) /* 0A480 808E0CF0 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 /* 0A484 808E0CF4 8CA40000 */ lw $a0, 0x0000($a1) ## 00000000 /* 0A488 808E0CF8 0C031A73 */ jal Graph_Alloc - + /* 0A48C 808E0CFC 24051000 */ addiu $a1, $zero, 0x1000 ## $a1 = 00001000 -/* 0A490 808E0D00 AFA20054 */ sw $v0, 0x0054($sp) +/* 0A490 808E0D00 AFA20054 */ sw $v0, 0x0054($sp) /* 0A494 808E0D04 8E250000 */ lw $a1, 0x0000($s1) ## 00000000 /* 0A498 808E0D08 3C06808F */ lui $a2, %hi(D_808F7C58) ## $a2 = 808F0000 /* 0A49C 808E0D0C 24C67C58 */ addiu $a2, $a2, %lo(D_808F7C58) ## $a2 = 808F7C58 /* 0A4A0 808E0D10 27A40040 */ addiu $a0, $sp, 0x0040 ## $a0 = FFFFFFE0 /* 0A4A4 808E0D14 240723B2 */ addiu $a3, $zero, 0x23B2 ## $a3 = 000023B2 -/* 0A4A8 808E0D18 0C031AB1 */ jal func_800C6AC4 +/* 0A4A8 808E0D18 0C031AB1 */ jal Graph_OpenDisps /* 0A4AC 808E0D1C 00A09025 */ or $s2, $a1, $zero ## $s2 = 00000000 -/* 0A4B0 808E0D20 0C024F46 */ jal func_80093D18 +/* 0A4B0 808E0D20 0C024F46 */ jal func_80093D18 /* 0A4B4 808E0D24 8E240000 */ lw $a0, 0x0000($s1) ## 00000000 -/* 0A4B8 808E0D28 0C024F61 */ jal func_80093D84 +/* 0A4B8 808E0D28 0C024F61 */ jal func_80093D84 /* 0A4BC 808E0D2C 8E240000 */ lw $a0, 0x0000($s1) ## 00000000 /* 0A4C0 808E0D30 860E01A6 */ lh $t6, 0x01A6($s0) ## 000001A6 /* 0A4C4 808E0D34 31CF0002 */ andi $t7, $t6, 0x0002 ## $t7 = 00000000 -/* 0A4C8 808E0D38 51E0000D */ beql $t7, $zero, .L808E0D70 +/* 0A4C8 808E0D38 51E0000D */ beql $t7, $zero, .L808E0D70 /* 0A4CC 808E0D3C 8E4302D0 */ lw $v1, 0x02D0($s2) ## 000002D0 /* 0A4D0 808E0D40 8E4402C0 */ lw $a0, 0x02C0($s2) ## 000002C0 /* 0A4D4 808E0D44 24180384 */ addiu $t8, $zero, 0x0384 ## $t8 = 00000384 /* 0A4D8 808E0D48 2419044B */ addiu $t9, $zero, 0x044B ## $t9 = 0000044B -/* 0A4DC 808E0D4C AFB90018 */ sw $t9, 0x0018($sp) -/* 0A4E0 808E0D50 AFB80014 */ sw $t8, 0x0014($sp) -/* 0A4E4 808E0D54 AFA00010 */ sw $zero, 0x0010($sp) +/* 0A4DC 808E0D4C AFB90018 */ sw $t9, 0x0018($sp) +/* 0A4E0 808E0D50 AFB80014 */ sw $t8, 0x0014($sp) +/* 0A4E4 808E0D54 AFA00010 */ sw $zero, 0x0010($sp) /* 0A4E8 808E0D58 240500FF */ addiu $a1, $zero, 0x00FF ## $a1 = 000000FF /* 0A4EC 808E0D5C 24060032 */ addiu $a2, $zero, 0x0032 ## $a2 = 00000032 -/* 0A4F0 808E0D60 0C024CDC */ jal func_80093370 +/* 0A4F0 808E0D60 0C024CDC */ jal Gfx_SetFog /* 0A4F4 808E0D64 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 /* 0A4F8 808E0D68 AE4202C0 */ sw $v0, 0x02C0($s2) ## 000002C0 /* 0A4FC 808E0D6C 8E4302D0 */ lw $v1, 0x02D0($s2) ## 000002D0 .L808E0D70: /* 0A500 808E0D70 3C040601 */ lui $a0, 0x0601 ## $a0 = 06010000 /* 0A504 808E0D74 24849A20 */ addiu $a0, $a0, 0x9A20 ## $a0 = 06009A20 -/* 0A508 808E0D78 00045100 */ sll $t2, $a0, 4 -/* 0A50C 808E0D7C 000A5F02 */ srl $t3, $t2, 28 +/* 0A508 808E0D78 00045100 */ sll $t2, $a0, 4 +/* 0A50C 808E0D7C 000A5F02 */ srl $t3, $t2, 28 /* 0A510 808E0D80 3C09DB06 */ lui $t1, 0xDB06 ## $t1 = DB060000 /* 0A514 808E0D84 24680008 */ addiu $t0, $v1, 0x0008 ## $t0 = 00000008 /* 0A518 808E0D88 AE4802D0 */ sw $t0, 0x02D0($s2) ## 000002D0 /* 0A51C 808E0D8C 35290020 */ ori $t1, $t1, 0x0020 ## $t1 = DB060020 -/* 0A520 808E0D90 000B6080 */ sll $t4, $t3, 2 +/* 0A520 808E0D90 000B6080 */ sll $t4, $t3, 2 /* 0A524 808E0D94 3C0D8016 */ lui $t5, 0x8016 ## $t5 = 80160000 -/* 0A528 808E0D98 01AC6821 */ addu $t5, $t5, $t4 +/* 0A528 808E0D98 01AC6821 */ addu $t5, $t5, $t4 /* 0A52C 808E0D9C 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 /* 0A530 808E0DA0 AC690000 */ sw $t1, 0x0000($v1) ## 00000000 /* 0A534 808E0DA4 8DAD6FA8 */ lw $t5, 0x6FA8($t5) ## 80166FA8 /* 0A538 808E0DA8 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF -/* 0A53C 808E0DAC 00817024 */ and $t6, $a0, $at +/* 0A53C 808E0DAC 00817024 */ and $t6, $a0, $at /* 0A540 808E0DB0 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 0A544 808E0DB4 01AE7821 */ addu $t7, $t5, $t6 -/* 0A548 808E0DB8 01E1C021 */ addu $t8, $t7, $at +/* 0A544 808E0DB4 01AE7821 */ addu $t7, $t5, $t6 +/* 0A548 808E0DB8 01E1C021 */ addu $t8, $t7, $at /* 0A54C 808E0DBC AC780004 */ sw $t8, 0x0004($v1) ## 00000004 /* 0A550 808E0DC0 92070152 */ lbu $a3, 0x0152($s0) ## 00000152 /* 0A554 808E0DC4 8E060170 */ lw $a2, 0x0170($s0) ## 00000170 @@ -66,25 +66,25 @@ glabel BossGanon_Draw /* 0A560 808E0DD0 3C19808E */ lui $t9, %hi(func_808DE734) ## $t9 = 808E0000 /* 0A564 808E0DD4 2739E734 */ addiu $t9, $t9, %lo(func_808DE734) ## $t9 = 808DE734 /* 0A568 808E0DD8 2508E988 */ addiu $t0, $t0, %lo(func_808DE988) ## $t0 = 808DE988 -/* 0A56C 808E0DDC AFA80014 */ sw $t0, 0x0014($sp) -/* 0A570 808E0DE0 AFB90010 */ sw $t9, 0x0010($sp) -/* 0A574 808E0DE4 AFB00018 */ sw $s0, 0x0018($sp) -/* 0A578 808E0DE8 0C0286B2 */ jal func_800A1AC8 +/* 0A56C 808E0DDC AFA80014 */ sw $t0, 0x0014($sp) +/* 0A570 808E0DE0 AFB90010 */ sw $t9, 0x0010($sp) +/* 0A574 808E0DE4 AFB00018 */ sw $s0, 0x0018($sp) +/* 0A578 808E0DE8 0C0286B2 */ jal SkelAnime_DrawSV /* 0A57C 808E0DEC 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 0A580 808E0DF0 3C0141F0 */ lui $at, 0x41F0 ## $at = 41F00000 /* 0A584 808E0DF4 44814000 */ mtc1 $at, $f8 ## $f8 = 30.00 /* 0A588 808E0DF8 C60602FC */ lwc1 $f6, 0x02FC($s0) ## 000002FC /* 0A58C 808E0DFC C60402F8 */ lwc1 $f4, 0x02F8($s0) ## 000002F8 /* 0A590 808E0E00 C6100300 */ lwc1 $f16, 0x0300($s0) ## 00000300 -/* 0A594 808E0E04 46083280 */ add.s $f10, $f6, $f8 +/* 0A594 808E0E04 46083280 */ add.s $f10, $f6, $f8 /* 0A598 808E0E08 E60402EC */ swc1 $f4, 0x02EC($s0) ## 000002EC /* 0A59C 808E0E0C E61002F4 */ swc1 $f16, 0x02F4($s0) ## 000002F4 /* 0A5A0 808E0E10 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 0A5A4 808E0E14 E60A02F0 */ swc1 $f10, 0x02F0($s0) ## 000002F0 -/* 0A5A8 808E0E18 0C02F228 */ jal func_800BC8A0 +/* 0A5A8 808E0E18 0C02F228 */ jal func_800BC8A0 /* 0A5AC 808E0E1C 8E4502C0 */ lw $a1, 0x02C0($s2) ## 000002C0 /* 0A5B0 808E0E20 AE4202C0 */ sw $v0, 0x02C0($s2) ## 000002C0 -/* 0A5B4 808E0E24 0C238F61 */ jal func_808E3D84 +/* 0A5B4 808E0E24 0C238F61 */ jal func_808E3D84 /* 0A5B8 808E0E28 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 0A5BC 808E0E2C 3C028090 */ lui $v0, %hi(D_808F93C0) ## $v0 = 80900000 /* 0A5C0 808E0E30 244293C0 */ addiu $v0, $v0, %lo(D_808F93C0) ## $v0 = 808F93C0 @@ -124,39 +124,39 @@ glabel BossGanon_Draw /* 0A648 808E0EB8 8E0C023C */ lw $t4, 0x023C($s0) ## 0000023C /* 0A64C 808E0EBC AD6C16FC */ sw $t4, 0x16FC($t3) ## 000016FC /* 0A650 808E0EC0 8E0D0240 */ lw $t5, 0x0240($s0) ## 00000240 -/* 0A654 808E0EC4 0C237B9C */ jal func_808DEE70 +/* 0A654 808E0EC4 0C237B9C */ jal func_808DEE70 /* 0A658 808E0EC8 AD6D1700 */ sw $t5, 0x1700($t3) ## 00001700 /* 0A65C 808E0ECC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0A660 808E0ED0 0C237C97 */ jal func_808DF25C +/* 0A660 808E0ED0 0C237C97 */ jal func_808DF25C /* 0A664 808E0ED4 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 /* 0A668 808E0ED8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0A66C 808E0EDC 0C237D3C */ jal func_808DF4F0 +/* 0A66C 808E0EDC 0C237D3C */ jal func_808DF4F0 /* 0A670 808E0EE0 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 /* 0A674 808E0EE4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0A678 808E0EE8 0C237EF4 */ jal func_808DFBD0 +/* 0A678 808E0EE8 0C237EF4 */ jal func_808DFBD0 /* 0A67C 808E0EEC 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 /* 0A680 808E0EF0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0A684 808E0EF4 0C237FF2 */ jal func_808DFFC8 +/* 0A684 808E0EF4 0C237FF2 */ jal func_808DFFC8 /* 0A688 808E0EF8 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 0A68C 808E0EFC 8FA40054 */ lw $a0, 0x0054($sp) +/* 0A68C 808E0EFC 8FA40054 */ lw $a0, 0x0054($sp) /* 0A690 808E0F00 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 0A694 808E0F04 0C2381BF */ jal func_808E06FC +/* 0A694 808E0F04 0C2381BF */ jal func_808E06FC /* 0A698 808E0F08 02203025 */ or $a2, $s1, $zero ## $a2 = 00000000 -/* 0A69C 808E0F0C 8FA40054 */ lw $a0, 0x0054($sp) +/* 0A69C 808E0F0C 8FA40054 */ lw $a0, 0x0054($sp) /* 0A6A0 808E0F10 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 0A6A4 808E0F14 0C23828F */ jal func_808E0A3C +/* 0A6A4 808E0F14 0C23828F */ jal func_808E0A3C /* 0A6A8 808E0F18 02203025 */ or $a2, $s1, $zero ## $a2 = 00000000 /* 0A6AC 808E0F1C 3C06808F */ lui $a2, %hi(D_808F7C6C) ## $a2 = 808F0000 /* 0A6B0 808E0F20 24C67C6C */ addiu $a2, $a2, %lo(D_808F7C6C) ## $a2 = 808F7C6C /* 0A6B4 808E0F24 27A40040 */ addiu $a0, $sp, 0x0040 ## $a0 = FFFFFFE0 /* 0A6B8 808E0F28 8E250000 */ lw $a1, 0x0000($s1) ## 00000000 -/* 0A6BC 808E0F2C 0C031AD5 */ jal func_800C6B54 +/* 0A6BC 808E0F2C 0C031AD5 */ jal Graph_CloseDisps /* 0A6C0 808E0F30 240724B1 */ addiu $a3, $zero, 0x24B1 ## $a3 = 000024B1 -/* 0A6C4 808E0F34 8FBF0034 */ lw $ra, 0x0034($sp) -/* 0A6C8 808E0F38 8FB00028 */ lw $s0, 0x0028($sp) -/* 0A6CC 808E0F3C 8FB1002C */ lw $s1, 0x002C($sp) -/* 0A6D0 808E0F40 8FB20030 */ lw $s2, 0x0030($sp) -/* 0A6D4 808E0F44 03E00008 */ jr $ra +/* 0A6C4 808E0F34 8FBF0034 */ lw $ra, 0x0034($sp) +/* 0A6C8 808E0F38 8FB00028 */ lw $s0, 0x0028($sp) +/* 0A6CC 808E0F3C 8FB1002C */ lw $s1, 0x002C($sp) +/* 0A6D0 808E0F40 8FB20030 */ lw $s2, 0x0030($sp) +/* 0A6D4 808E0F44 03E00008 */ jr $ra /* 0A6D8 808E0F48 27BD0060 */ addiu $sp, $sp, 0x0060 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/BossGanon_Init.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/BossGanon_Init.s index 6b05272ca0..c8bcc801a4 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/BossGanon_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/BossGanon_Init.s @@ -1,166 +1,166 @@ glabel BossGanon_Init /* 00928 808D7198 27BDFF90 */ addiu $sp, $sp, 0xFF90 ## $sp = FFFFFF90 -/* 0092C 808D719C AFBF003C */ sw $ra, 0x003C($sp) -/* 00930 808D71A0 AFB10038 */ sw $s1, 0x0038($sp) -/* 00934 808D71A4 AFB00034 */ sw $s0, 0x0034($sp) +/* 0092C 808D719C AFBF003C */ sw $ra, 0x003C($sp) +/* 00930 808D71A0 AFB10038 */ sw $s1, 0x0038($sp) +/* 00934 808D71A4 AFB00034 */ sw $s0, 0x0034($sp) /* 00938 808D71A8 848E001C */ lh $t6, 0x001C($a0) ## 0000001C /* 0093C 808D71AC 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 00940 808D71B0 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 -/* 00944 808D71B4 29C10064 */ slti $at, $t6, 0x0064 -/* 00948 808D71B8 1020007C */ beq $at, $zero, .L808D73AC +/* 00944 808D71B4 29C10064 */ slti $at, $t6, 0x0064 +/* 00948 808D71B8 1020007C */ beq $at, $zero, .L808D73AC /* 0094C 808D71BC 8CA31C44 */ lw $v1, 0x1C44($a1) ## 00001C44 /* 00950 808D71C0 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 /* 00954 808D71C4 0C00B2DD */ jal Flags_SetSwitch - + /* 00958 808D71C8 24050014 */ addiu $a1, $zero, 0x0014 ## $a1 = 00000014 /* 0095C 808D71CC 3C048090 */ lui $a0, %hi(D_808F93D8) ## $a0 = 80900000 /* 00960 808D71D0 3C010001 */ lui $at, 0x0001 ## $at = 00010000 /* 00964 808D71D4 248493D8 */ addiu $a0, $a0, %lo(D_808F93D8) ## $a0 = 808F93D8 -/* 00968 808D71D8 00310821 */ addu $at, $at, $s1 +/* 00968 808D71D8 00310821 */ addu $at, $at, $s1 /* 0096C 808D71DC AC241E10 */ sw $a0, 0x1E10($at) ## 00011E10 /* 00970 808D71E0 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 /* 00974 808D71E4 2403004C */ addiu $v1, $zero, 0x004C ## $v1 = 0000004C .L808D71E8: -/* 00978 808D71E8 00430019 */ multu $v0, $v1 +/* 00978 808D71E8 00430019 */ multu $v0, $v1 /* 0097C 808D71EC 24420001 */ addiu $v0, $v0, 0x0001 ## $v0 = 00000001 -/* 00980 808D71F0 00021400 */ sll $v0, $v0, 16 -/* 00984 808D71F4 00021403 */ sra $v0, $v0, 16 -/* 00988 808D71F8 284100C8 */ slti $at, $v0, 0x00C8 -/* 0098C 808D71FC 00007812 */ mflo $t7 -/* 00990 808D7200 008FC021 */ addu $t8, $a0, $t7 -/* 00994 808D7204 1420FFF8 */ bne $at, $zero, .L808D71E8 +/* 00980 808D71F0 00021400 */ sll $v0, $v0, 16 +/* 00984 808D71F4 00021403 */ sra $v0, $v0, 16 +/* 00988 808D71F8 284100C8 */ slti $at, $v0, 0x00C8 +/* 0098C 808D71FC 00007812 */ mflo $t7 +/* 00990 808D7200 008FC021 */ addu $t8, $a0, $t7 +/* 00994 808D7204 1420FFF8 */ bne $at, $zero, .L808D71E8 /* 00998 808D7208 A3000000 */ sb $zero, 0x0000($t8) ## 00000000 /* 0099C 808D720C 3C018090 */ lui $at, %hi(D_808F93D0) ## $at = 80900000 -/* 009A0 808D7210 AC3093D0 */ sw $s0, %lo(D_808F93D0)($at) +/* 009A0 808D7210 AC3093D0 */ sw $s0, %lo(D_808F93D0)($at) /* 009A4 808D7214 24190028 */ addiu $t9, $zero, 0x0028 ## $t9 = 00000028 /* 009A8 808D7218 3C05808E */ lui $a1, %hi(D_808E4C84) ## $a1 = 808E0000 /* 009AC 808D721C A21900AF */ sb $t9, 0x00AF($s0) ## 000000AF /* 009B0 808D7220 24A54C84 */ addiu $a1, $a1, %lo(D_808E4C84) ## $a1 = 808E4C84 /* 009B4 808D7224 0C01E037 */ jal Actor_ProcessInitChain - + /* 009B8 808D7228 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 009BC 808D722C 44801000 */ mtc1 $zero, $f2 ## $f2 = 0.00 /* 009C0 808D7230 260400B4 */ addiu $a0, $s0, 0x00B4 ## $a0 = 000000B4 /* 009C4 808D7234 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 009C8 808D7238 44051000 */ mfc1 $a1, $f2 -/* 009CC 808D723C 44071000 */ mfc1 $a3, $f2 +/* 009C8 808D7238 44051000 */ mfc1 $a1, $f2 +/* 009CC 808D723C 44071000 */ mfc1 $a3, $f2 /* 009D0 808D7240 0C00AC78 */ jal ActorShape_Init - + /* 009D4 808D7244 00000000 */ nop /* 009D8 808D7248 3C053C23 */ lui $a1, 0x3C23 ## $a1 = 3C230000 /* 009DC 808D724C 34A5D70A */ ori $a1, $a1, 0xD70A ## $a1 = 3C23D70A /* 009E0 808D7250 0C00B58B */ jal Actor_SetScale - + /* 009E4 808D7254 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 009E8 808D7258 3C060601 */ lui $a2, 0x0601 ## $a2 = 06010000 /* 009EC 808D725C 24C614E8 */ addiu $a2, $a2, 0x14E8 ## $a2 = 060114E8 /* 009F0 808D7260 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 009F4 808D7264 26050150 */ addiu $a1, $s0, 0x0150 ## $a1 = 00000150 /* 009F8 808D7268 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 009FC 808D726C AFA00010 */ sw $zero, 0x0010($sp) -/* 00A00 808D7270 AFA00014 */ sw $zero, 0x0014($sp) -/* 00A04 808D7274 0C0291BE */ jal func_800A46F8 -/* 00A08 808D7278 AFA00018 */ sw $zero, 0x0018($sp) +/* 009FC 808D726C AFA00010 */ sw $zero, 0x0010($sp) +/* 00A00 808D7270 AFA00014 */ sw $zero, 0x0014($sp) +/* 00A04 808D7274 0C0291BE */ jal SkelAnime_InitSV +/* 00A08 808D7278 AFA00018 */ sw $zero, 0x0018($sp) /* 00A0C 808D727C 26050610 */ addiu $a1, $s0, 0x0610 ## $a1 = 00000610 -/* 00A10 808D7280 AFA50044 */ sw $a1, 0x0044($sp) +/* 00A10 808D7280 AFA50044 */ sw $a1, 0x0044($sp) /* 00A14 808D7284 0C0170D9 */ jal ActorCollider_AllocCylinder - + /* 00A18 808D7288 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 00A1C 808D728C 3C07808E */ lui $a3, %hi(D_808E4C00) ## $a3 = 808E0000 -/* 00A20 808D7290 8FA50044 */ lw $a1, 0x0044($sp) +/* 00A20 808D7290 8FA50044 */ lw $a1, 0x0044($sp) /* 00A24 808D7294 24E74C00 */ addiu $a3, $a3, %lo(D_808E4C00) ## $a3 = 808E4C00 /* 00A28 808D7298 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 00A2C 808D729C 0C01712B */ jal ActorCollider_InitCylinder - + /* 00A30 808D72A0 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 00A34 808D72A4 8608001C */ lh $t0, 0x001C($s0) ## 0000001C /* 00A38 808D72A8 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 /* 00A3C 808D72AC 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 00A40 808D72B0 11010006 */ beq $t0, $at, .L808D72CC +/* 00A40 808D72B0 11010006 */ beq $t0, $at, .L808D72CC /* 00A44 808D72B4 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 00A48 808D72B8 0C235DE7 */ jal func_808D779C +/* 00A48 808D72B8 0C235DE7 */ jal func_808D779C /* 00A4C 808D72BC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 00A50 808D72C0 240900FF */ addiu $t1, $zero, 0x00FF ## $t1 = 000000FF -/* 00A54 808D72C4 10000021 */ beq $zero, $zero, .L808D734C +/* 00A54 808D72C4 10000021 */ beq $zero, $zero, .L808D734C /* 00A58 808D72C8 A6090718 */ sh $t1, 0x0718($s0) ## 00000718 .L808D72CC: /* 00A5C 808D72CC 0C00B2D0 */ jal Flags_GetSwitch - + /* 00A60 808D72D0 24050037 */ addiu $a1, $zero, 0x0037 ## $a1 = 00000037 -/* 00A64 808D72D4 0002182B */ sltu $v1, $zero, $v0 -/* 00A68 808D72D8 10600010 */ beq $v1, $zero, .L808D731C +/* 00A64 808D72D4 0002182B */ sltu $v1, $zero, $v0 +/* 00A68 808D72D8 10600010 */ beq $v1, $zero, .L808D731C /* 00A6C 808D72DC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 00A70 808D72E0 862200A4 */ lh $v0, 0x00A4($s1) ## 000000A4 /* 00A74 808D72E4 3843004F */ xori $v1, $v0, 0x004F ## $v1 = 0000004F -/* 00A78 808D72E8 2C630001 */ sltiu $v1, $v1, 0x0001 -/* 00A7C 808D72EC 1460000B */ bne $v1, $zero, .L808D731C +/* 00A78 808D72E8 2C630001 */ sltiu $v1, $v1, 0x0001 +/* 00A7C 808D72EC 1460000B */ bne $v1, $zero, .L808D731C /* 00A80 808D72F0 00000000 */ nop /* 00A84 808D72F4 3843001A */ xori $v1, $v0, 0x001A ## $v1 = 0000001A -/* 00A88 808D72F8 2C630001 */ sltiu $v1, $v1, 0x0001 -/* 00A8C 808D72FC 14600007 */ bne $v1, $zero, .L808D731C +/* 00A88 808D72F8 2C630001 */ sltiu $v1, $v1, 0x0001 +/* 00A8C 808D72FC 14600007 */ bne $v1, $zero, .L808D731C /* 00A90 808D7300 00000000 */ nop /* 00A94 808D7304 3843000E */ xori $v1, $v0, 0x000E ## $v1 = 0000000E -/* 00A98 808D7308 2C630001 */ sltiu $v1, $v1, 0x0001 -/* 00A9C 808D730C 14600003 */ bne $v1, $zero, .L808D731C +/* 00A98 808D7308 2C630001 */ sltiu $v1, $v1, 0x0001 +/* 00A9C 808D730C 14600003 */ bne $v1, $zero, .L808D731C /* 00AA0 808D7310 00000000 */ nop /* 00AA4 808D7314 3843000F */ xori $v1, $v0, 0x000F ## $v1 = 0000000F -/* 00AA8 808D7318 2C630001 */ sltiu $v1, $v1, 0x0001 +/* 00AA8 808D7318 2C630001 */ sltiu $v1, $v1, 0x0001 .L808D731C: -/* 00AAC 808D731C 14600005 */ bne $v1, $zero, .L808D7334 +/* 00AAC 808D731C 14600005 */ bne $v1, $zero, .L808D7334 /* 00AB0 808D7320 00000000 */ nop -/* 00AB4 808D7324 0C23643E */ jal func_808D90F8 +/* 00AB4 808D7324 0C23643E */ jal func_808D90F8 /* 00AB8 808D7328 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 00ABC 808D732C 10000005 */ beq $zero, $zero, .L808D7344 +/* 00ABC 808D732C 10000005 */ beq $zero, $zero, .L808D7344 /* 00AC0 808D7330 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 .L808D7334: /* 00AC4 808D7334 0C00B55C */ jal Actor_Kill - + /* 00AC8 808D7338 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00ACC 808D733C 100000FA */ beq $zero, $zero, .L808D7728 -/* 00AD0 808D7340 8FBF003C */ lw $ra, 0x003C($sp) +/* 00ACC 808D733C 100000FA */ beq $zero, $zero, .L808D7728 +/* 00AD0 808D7340 8FBF003C */ lw $ra, 0x003C($sp) .L808D7344: -/* 00AD4 808D7344 0C23643E */ jal func_808D90F8 +/* 00AD4 808D7344 0C23643E */ jal func_808D90F8 /* 00AD8 808D7348 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 .L808D734C: /* 00ADC 808D734C 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 /* 00AE0 808D7350 26241C24 */ addiu $a0, $s1, 0x1C24 ## $a0 = 00001C24 /* 00AE4 808D7354 240A0001 */ addiu $t2, $zero, 0x0001 ## $t2 = 00000001 -/* 00AE8 808D7358 AFAA0028 */ sw $t2, 0x0028($sp) -/* 00AEC 808D735C AFA40044 */ sw $a0, 0x0044($sp) +/* 00AE8 808D7358 AFAA0028 */ sw $t2, 0x0028($sp) +/* 00AEC 808D735C AFA40044 */ sw $a0, 0x0044($sp) /* 00AF0 808D7360 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 00AF4 808D7364 02203025 */ or $a2, $s1, $zero ## $a2 = 00000000 /* 00AF8 808D7368 2407016F */ addiu $a3, $zero, 0x016F ## $a3 = 0000016F -/* 00AFC 808D736C AFA0001C */ sw $zero, 0x001C($sp) -/* 00B00 808D7370 AFA00020 */ sw $zero, 0x0020($sp) -/* 00B04 808D7374 AFA00024 */ sw $zero, 0x0024($sp) -/* 00B08 808D7378 E7A00010 */ swc1 $f0, 0x0010($sp) -/* 00B0C 808D737C E7A00014 */ swc1 $f0, 0x0014($sp) +/* 00AFC 808D736C AFA0001C */ sw $zero, 0x001C($sp) +/* 00B00 808D7370 AFA00020 */ sw $zero, 0x0020($sp) +/* 00B04 808D7374 AFA00024 */ sw $zero, 0x0024($sp) +/* 00B08 808D7378 E7A00010 */ swc1 $f0, 0x0010($sp) +/* 00B0C 808D737C E7A00014 */ swc1 $f0, 0x0014($sp) /* 00B10 808D7380 0C00C916 */ jal Actor_SpawnAttached - -/* 00B14 808D7384 E7A00018 */ swc1 $f0, 0x0018($sp) + +/* 00B14 808D7384 E7A00018 */ swc1 $f0, 0x0018($sp) /* 00B18 808D7388 3C018090 */ lui $at, %hi(D_808F93C0) ## $at = 80900000 -/* 00B1C 808D738C AC2293C0 */ sw $v0, %lo(D_808F93C0)($at) +/* 00B1C 808D738C AC2293C0 */ sw $v0, %lo(D_808F93C0)($at) /* 00B20 808D7390 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 00B24 808D7394 8FA50044 */ lw $a1, 0x0044($sp) +/* 00B24 808D7394 8FA50044 */ lw $a1, 0x0044($sp) /* 00B28 808D7398 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 00B2C 808D739C 0C00CDD2 */ jal Actor_ChangeType - + /* 00B30 808D73A0 24070009 */ addiu $a3, $zero, 0x0009 ## $a3 = 00000009 -/* 00B34 808D73A4 100000E0 */ beq $zero, $zero, .L808D7728 -/* 00B38 808D73A8 8FBF003C */ lw $ra, 0x003C($sp) +/* 00B34 808D73A4 100000E0 */ beq $zero, $zero, .L808D7728 +/* 00B38 808D73A8 8FBF003C */ lw $ra, 0x003C($sp) .L808D73AC: /* 00B3C 808D73AC 8E0B0004 */ lw $t3, 0x0004($s0) ## 00000004 /* 00B40 808D73B0 2401FFFE */ addiu $at, $zero, 0xFFFE ## $at = FFFFFFFE /* 00B44 808D73B4 8602001C */ lh $v0, 0x001C($s0) ## 0000001C -/* 00B48 808D73B8 01616024 */ and $t4, $t3, $at +/* 00B48 808D73B8 01616024 */ and $t4, $t3, $at /* 00B4C 808D73BC 3C01437F */ lui $at, 0x437F ## $at = 437F0000 /* 00B50 808D73C0 44812000 */ mtc1 $at, $f4 ## $f4 = 255.00 -/* 00B54 808D73C4 284100C8 */ slti $at, $v0, 0x00C8 +/* 00B54 808D73C4 284100C8 */ slti $at, $v0, 0x00C8 /* 00B58 808D73C8 AE0C0004 */ sw $t4, 0x0004($s0) ## 00000004 -/* 00B5C 808D73CC 1420008E */ bne $at, $zero, .L808D7608 +/* 00B5C 808D73CC 1420008E */ bne $at, $zero, .L808D7608 /* 00B60 808D73D0 E60401CC */ swc1 $f4, 0x01CC($s0) ## 000001CC /* 00B64 808D73D4 2401012C */ addiu $at, $zero, 0x012C ## $at = 0000012C -/* 00B68 808D73D8 14410009 */ bne $v0, $at, .L808D7400 +/* 00B68 808D73D8 14410009 */ bne $v0, $at, .L808D7400 /* 00B6C 808D73DC 3C0D808E */ lui $t5, %hi(func_808E1034) ## $t5 = 808E0000 /* 00B70 808D73E0 3C0E808E */ lui $t6, %hi(func_808E1B54) ## $t6 = 808E0000 /* 00B74 808D73E4 25AD1034 */ addiu $t5, $t5, %lo(func_808E1034) ## $t5 = 808E1034 @@ -168,11 +168,11 @@ glabel BossGanon_Init /* 00B7C 808D73EC 240F0002 */ addiu $t7, $zero, 0x0002 ## $t7 = 00000002 /* 00B80 808D73F0 AE0D0130 */ sw $t5, 0x0130($s0) ## 00000130 /* 00B84 808D73F4 AE0E0134 */ sw $t6, 0x0134($s0) ## 00000134 -/* 00B88 808D73F8 100000CA */ beq $zero, $zero, .L808D7724 +/* 00B88 808D73F8 100000CA */ beq $zero, $zero, .L808D7724 /* 00B8C 808D73FC A60F01A8 */ sh $t7, 0x01A8($s0) ## 000001A8 .L808D7400: /* 00B90 808D7400 24010190 */ addiu $at, $zero, 0x0190 ## $at = 00000190 -/* 00B94 808D7404 14410009 */ bne $v0, $at, .L808D742C +/* 00B94 808D7404 14410009 */ bne $v0, $at, .L808D742C /* 00B98 808D7408 3C18808E */ lui $t8, %hi(func_808E1034) ## $t8 = 808E0000 /* 00B9C 808D740C 3C19808E */ lui $t9, %hi(func_808E1B54) ## $t9 = 808E0000 /* 00BA0 808D7410 27181034 */ addiu $t8, $t8, %lo(func_808E1034) ## $t8 = 808E1034 @@ -180,17 +180,17 @@ glabel BossGanon_Init /* 00BA8 808D7418 24080001 */ addiu $t0, $zero, 0x0001 ## $t0 = 00000001 /* 00BAC 808D741C AE180130 */ sw $t8, 0x0130($s0) ## 00000130 /* 00BB0 808D7420 AE190134 */ sw $t9, 0x0134($s0) ## 00000134 -/* 00BB4 808D7424 100000BF */ beq $zero, $zero, .L808D7724 +/* 00BB4 808D7424 100000BF */ beq $zero, $zero, .L808D7724 /* 00BB8 808D7428 A60801A8 */ sh $t0, 0x01A8($s0) ## 000001A8 .L808D742C: -/* 00BBC 808D742C 28410104 */ slti $at, $v0, 0x0104 -/* 00BC0 808D7430 1420002C */ bne $at, $zero, .L808D74E4 +/* 00BBC 808D742C 28410104 */ slti $at, $v0, 0x0104 +/* 00BC0 808D7430 1420002C */ bne $at, $zero, .L808D74E4 /* 00BC4 808D7434 3C09808E */ lui $t1, %hi(func_808E2544) ## $t1 = 808E0000 /* 00BC8 808D7438 860C001C */ lh $t4, 0x001C($s0) ## 0000001C /* 00BCC 808D743C 3C0A808E */ lui $t2, %hi(func_808E324C) ## $t2 = 808E0000 /* 00BD0 808D7440 25292544 */ addiu $t1, $t1, %lo(func_808E2544) ## $t1 = 808E2544 -/* 00BD4 808D7444 000C6823 */ subu $t5, $zero, $t4 -/* 00BD8 808D7448 000D7040 */ sll $t6, $t5, 1 +/* 00BD4 808D7444 000C6823 */ subu $t5, $zero, $t4 +/* 00BD8 808D7448 000D7040 */ sll $t6, $t5, 1 /* 00BDC 808D744C 254A324C */ addiu $t2, $t2, %lo(func_808E324C) ## $t2 = 808E324C /* 00BE0 808D7450 240B000A */ addiu $t3, $zero, 0x000A ## $t3 = 0000000A /* 00BE4 808D7454 25CF0208 */ addiu $t7, $t6, 0x0208 ## $t7 = 808E1D5C @@ -202,39 +202,39 @@ glabel BossGanon_Init /* 00BFC 808D746C 26040024 */ addiu $a0, $s0, 0x0024 ## $a0 = 00000024 /* 00C00 808D7470 2403000C */ addiu $v1, $zero, 0x000C ## $v1 = 0000000C .L808D7474: -/* 00C04 808D7474 00430019 */ multu $v0, $v1 +/* 00C04 808D7474 00430019 */ multu $v0, $v1 /* 00C08 808D7478 8C890000 */ lw $t1, 0x0000($a0) ## 00000024 /* 00C0C 808D747C 24420001 */ addiu $v0, $v0, 0x0001 ## $v0 = 00000001 -/* 00C10 808D7480 00021400 */ sll $v0, $v0, 16 -/* 00C14 808D7484 00021403 */ sra $v0, $v0, 16 -/* 00C18 808D7488 2841000F */ slti $at, $v0, 0x000F -/* 00C1C 808D748C 0000C012 */ mflo $t8 -/* 00C20 808D7490 0218C821 */ addu $t9, $s0, $t8 +/* 00C10 808D7480 00021400 */ sll $v0, $v0, 16 +/* 00C14 808D7484 00021403 */ sra $v0, $v0, 16 +/* 00C18 808D7488 2841000F */ slti $at, $v0, 0x000F +/* 00C1C 808D748C 0000C012 */ mflo $t8 +/* 00C20 808D7490 0218C821 */ addu $t9, $s0, $t8 /* 00C24 808D7494 AF2902EC */ sw $t1, 0x02EC($t9) ## 808E1E40 /* 00C28 808D7498 8C880004 */ lw $t0, 0x0004($a0) ## 00000028 /* 00C2C 808D749C AF2802F0 */ sw $t0, 0x02F0($t9) ## 808E1E44 /* 00C30 808D74A0 8C890008 */ lw $t1, 0x0008($a0) ## 0000002C -/* 00C34 808D74A4 1420FFF3 */ bne $at, $zero, .L808D7474 +/* 00C34 808D74A4 1420FFF3 */ bne $at, $zero, .L808D7474 /* 00C38 808D74A8 AF2902F4 */ sw $t1, 0x02F4($t9) ## 808E1E48 /* 00C3C 808D74AC 240A0003 */ addiu $t2, $zero, 0x0003 ## $t2 = 00000003 /* 00C40 808D74B0 A60A01B8 */ sh $t2, 0x01B8($s0) ## 000001B8 /* 00C44 808D74B4 26050610 */ addiu $a1, $s0, 0x0610 ## $a1 = 00000610 -/* 00C48 808D74B8 AFA50044 */ sw $a1, 0x0044($sp) +/* 00C48 808D74B8 AFA50044 */ sw $a1, 0x0044($sp) /* 00C4C 808D74BC 0C0170D9 */ jal ActorCollider_AllocCylinder - + /* 00C50 808D74C0 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 00C54 808D74C4 3C07808E */ lui $a3, %hi(D_808E4C2C) ## $a3 = 808E0000 -/* 00C58 808D74C8 8FA50044 */ lw $a1, 0x0044($sp) +/* 00C58 808D74C8 8FA50044 */ lw $a1, 0x0044($sp) /* 00C5C 808D74CC 24E74C2C */ addiu $a3, $a3, %lo(D_808E4C2C) ## $a3 = 808E4C2C /* 00C60 808D74D0 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 00C64 808D74D4 0C01712B */ jal ActorCollider_InitCylinder - + /* 00C68 808D74D8 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 -/* 00C6C 808D74DC 10000092 */ beq $zero, $zero, .L808D7728 -/* 00C70 808D74E0 8FBF003C */ lw $ra, 0x003C($sp) +/* 00C6C 808D74DC 10000092 */ beq $zero, $zero, .L808D7728 +/* 00C70 808D74E0 8FBF003C */ lw $ra, 0x003C($sp) .L808D74E4: -/* 00C74 808D74E4 284100FA */ slti $at, $v0, 0x00FA -/* 00C78 808D74E8 14200021 */ bne $at, $zero, .L808D7570 +/* 00C74 808D74E4 284100FA */ slti $at, $v0, 0x00FA +/* 00C78 808D74E8 14200021 */ bne $at, $zero, .L808D7570 /* 00C7C 808D74EC 3C09808E */ lui $t1, %hi(func_808E1EB4) ## $t1 = 808E0000 /* 00C80 808D74F0 3C0B808E */ lui $t3, %hi(func_808E2544) ## $t3 = 808E0000 /* 00C84 808D74F4 3C0C808E */ lui $t4, %hi(func_808E324C) ## $t4 = 808E0000 @@ -244,31 +244,31 @@ glabel BossGanon_Init /* 00C94 808D7504 AE0C0134 */ sw $t4, 0x0134($s0) ## 00000134 /* 00C98 808D7508 3C01808F */ lui $at, %hi(D_808F7E5C) ## $at = 808F0000 /* 00C9C 808D750C 0C00CFBE */ jal Math_Rand_ZeroFloat - -/* 00CA0 808D7510 C42C7E5C */ lwc1 $f12, %lo(D_808F7E5C)($at) -/* 00CA4 808D7514 4600018D */ trunc.w.s $f6, $f0 + +/* 00CA0 808D7510 C42C7E5C */ lwc1 $f12, %lo(D_808F7E5C)($at) +/* 00CA4 808D7514 4600018D */ trunc.w.s $f6, $f0 /* 00CA8 808D7518 44801000 */ mtc1 $zero, $f2 ## $f2 = 0.00 /* 00CAC 808D751C 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 /* 00CB0 808D7520 26040024 */ addiu $a0, $s0, 0x0024 ## $a0 = 00000024 -/* 00CB4 808D7524 440E3000 */ mfc1 $t6, $f6 +/* 00CB4 808D7524 440E3000 */ mfc1 $t6, $f6 /* 00CB8 808D7528 2403000C */ addiu $v1, $zero, 0x000C ## $v1 = 0000000C /* 00CBC 808D752C A60E01A2 */ sh $t6, 0x01A2($s0) ## 000001A2 .L808D7530: -/* 00CC0 808D7530 00430019 */ multu $v0, $v1 +/* 00CC0 808D7530 00430019 */ multu $v0, $v1 /* 00CC4 808D7534 8C880000 */ lw $t0, 0x0000($a0) ## 00000024 /* 00CC8 808D7538 24420001 */ addiu $v0, $v0, 0x0001 ## $v0 = 00000001 -/* 00CCC 808D753C 00021400 */ sll $v0, $v0, 16 -/* 00CD0 808D7540 00021403 */ sra $v0, $v0, 16 -/* 00CD4 808D7544 2841000F */ slti $at, $v0, 0x000F -/* 00CD8 808D7548 00007812 */ mflo $t7 -/* 00CDC 808D754C 020FC021 */ addu $t8, $s0, $t7 +/* 00CCC 808D753C 00021400 */ sll $v0, $v0, 16 +/* 00CD0 808D7540 00021403 */ sra $v0, $v0, 16 +/* 00CD4 808D7544 2841000F */ slti $at, $v0, 0x000F +/* 00CD8 808D7548 00007812 */ mflo $t7 +/* 00CDC 808D754C 020FC021 */ addu $t8, $s0, $t7 /* 00CE0 808D7550 AF0802EC */ sw $t0, 0x02EC($t8) ## 000002EC /* 00CE4 808D7554 8C990004 */ lw $t9, 0x0004($a0) ## 00000028 /* 00CE8 808D7558 AF1902F0 */ sw $t9, 0x02F0($t8) ## 000002F0 /* 00CEC 808D755C 8C880008 */ lw $t0, 0x0008($a0) ## 0000002C -/* 00CF0 808D7560 1420FFF3 */ bne $at, $zero, .L808D7530 +/* 00CF0 808D7560 1420FFF3 */ bne $at, $zero, .L808D7530 /* 00CF4 808D7564 AF0802F4 */ sw $t0, 0x02F4($t8) ## 000002F4 -/* 00CF8 808D7568 1000006E */ beq $zero, $zero, .L808D7724 +/* 00CF8 808D7568 1000006E */ beq $zero, $zero, .L808D7724 /* 00CFC 808D756C E60201CC */ swc1 $f2, 0x01CC($s0) ## 000001CC .L808D7570: /* 00D00 808D7570 3C014130 */ lui $at, 0x4130 ## $at = 41300000 @@ -280,39 +280,39 @@ glabel BossGanon_Init /* 00D18 808D7588 240100C8 */ addiu $at, $zero, 0x00C8 ## $at = 000000C8 /* 00D1C 808D758C AE090130 */ sw $t1, 0x0130($s0) ## 00000130 /* 00D20 808D7590 AE0A0134 */ sw $t2, 0x0134($s0) ## 00000134 -/* 00D24 808D7594 15610004 */ bne $t3, $at, .L808D75A8 +/* 00D24 808D7594 15610004 */ bne $t3, $at, .L808D75A8 /* 00D28 808D7598 E6080068 */ swc1 $f8, 0x0068($s0) ## 00000068 /* 00D2C 808D759C 240C0007 */ addiu $t4, $zero, 0x0007 ## $t4 = 00000007 -/* 00D30 808D75A0 1000000A */ beq $zero, $zero, .L808D75CC +/* 00D30 808D75A0 1000000A */ beq $zero, $zero, .L808D75CC /* 00D34 808D75A4 A60C01B6 */ sh $t4, 0x01B6($s0) ## 000001B6 .L808D75A8: /* 00D38 808D75A8 3C014040 */ lui $at, 0x4040 ## $at = 40400000 /* 00D3C 808D75AC 44816000 */ mtc1 $at, $f12 ## $f12 = 3.00 /* 00D40 808D75B0 0C00CFBE */ jal Math_Rand_ZeroFloat - + /* 00D44 808D75B4 00000000 */ nop -/* 00D48 808D75B8 4600028D */ trunc.w.s $f10, $f0 -/* 00D4C 808D75BC 44185000 */ mfc1 $t8, $f10 +/* 00D48 808D75B8 4600028D */ trunc.w.s $f10, $f0 +/* 00D4C 808D75BC 44185000 */ mfc1 $t8, $f10 /* 00D50 808D75C0 00000000 */ nop /* 00D54 808D75C4 27190003 */ addiu $t9, $t8, 0x0003 ## $t9 = 00000003 /* 00D58 808D75C8 A61901B6 */ sh $t9, 0x01B6($s0) ## 000001B6 .L808D75CC: /* 00D5C 808D75CC 3C01808F */ lui $at, %hi(D_808F7E60) ## $at = 808F0000 -/* 00D60 808D75D0 C42C7E60 */ lwc1 $f12, %lo(D_808F7E60)($at) +/* 00D60 808D75D0 C42C7E60 */ lwc1 $f12, %lo(D_808F7E60)($at) /* 00D64 808D75D4 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 /* 00D68 808D75D8 2403000C */ addiu $v1, $zero, 0x000C ## $v1 = 0000000C .L808D75DC: -/* 00D6C 808D75DC 00430019 */ multu $v0, $v1 +/* 00D6C 808D75DC 00430019 */ multu $v0, $v1 /* 00D70 808D75E0 24420001 */ addiu $v0, $v0, 0x0001 ## $v0 = 00000001 -/* 00D74 808D75E4 00021400 */ sll $v0, $v0, 16 -/* 00D78 808D75E8 00021403 */ sra $v0, $v0, 16 -/* 00D7C 808D75EC 2841000F */ slti $at, $v0, 0x000F -/* 00D80 808D75F0 00004012 */ mflo $t0 -/* 00D84 808D75F4 02084821 */ addu $t1, $s0, $t0 -/* 00D88 808D75F8 1420FFF8 */ bne $at, $zero, .L808D75DC +/* 00D74 808D75E4 00021400 */ sll $v0, $v0, 16 +/* 00D78 808D75E8 00021403 */ sra $v0, $v0, 16 +/* 00D7C 808D75EC 2841000F */ slti $at, $v0, 0x000F +/* 00D80 808D75F0 00004012 */ mflo $t0 +/* 00D84 808D75F4 02084821 */ addu $t1, $s0, $t0 +/* 00D88 808D75F8 1420FFF8 */ bne $at, $zero, .L808D75DC /* 00D8C 808D75FC E52C02F0 */ swc1 $f12, 0x02F0($t1) ## 000002F0 -/* 00D90 808D7600 10000049 */ beq $zero, $zero, .L808D7728 -/* 00D94 808D7604 8FBF003C */ lw $ra, 0x003C($sp) +/* 00D90 808D7600 10000049 */ beq $zero, $zero, .L808D7728 +/* 00D94 808D7604 8FBF003C */ lw $ra, 0x003C($sp) .L808D7608: /* 00D98 808D7608 3C014140 */ lui $at, 0x4140 ## $at = 41400000 /* 00D9C 808D760C 44819000 */ mtc1 $at, $f18 ## $f18 = 12.00 @@ -328,77 +328,77 @@ glabel BossGanon_Init /* 00DC4 808D7634 C6060024 */ lwc1 $f6, 0x0024($s0) ## 00000024 /* 00DC8 808D7638 44815000 */ mtc1 $at, $f10 ## $f10 = 30.00 /* 00DCC 808D763C C4680028 */ lwc1 $f8, 0x0028($v1) ## 00000034 -/* 00DD0 808D7640 46062381 */ sub.s $f14, $f4, $f6 +/* 00DD0 808D7640 46062381 */ sub.s $f14, $f4, $f6 /* 00DD4 808D7644 C6040028 */ lwc1 $f4, 0x0028($s0) ## 00000028 -/* 00DD8 808D7648 460A4480 */ add.s $f18, $f8, $f10 -/* 00DDC 808D764C 46049181 */ sub.s $f6, $f18, $f4 -/* 00DE0 808D7650 E7A60058 */ swc1 $f6, 0x0058($sp) +/* 00DD8 808D7648 460A4480 */ add.s $f18, $f8, $f10 +/* 00DDC 808D764C 46049181 */ sub.s $f6, $f18, $f4 +/* 00DE0 808D7650 E7A60058 */ swc1 $f6, 0x0058($sp) /* 00DE4 808D7654 C60A002C */ lwc1 $f10, 0x002C($s0) ## 0000002C /* 00DE8 808D7658 C468002C */ lwc1 $f8, 0x002C($v1) ## 00000038 -/* 00DEC 808D765C E7AE005C */ swc1 $f14, 0x005C($sp) -/* 00DF0 808D7660 460A4301 */ sub.s $f12, $f8, $f10 +/* 00DEC 808D765C E7AE005C */ swc1 $f14, 0x005C($sp) +/* 00DF0 808D7660 460A4301 */ sub.s $f12, $f8, $f10 /* 00DF4 808D7664 0C034199 */ jal atan2s - -/* 00DF8 808D7668 E7AC0054 */ swc1 $f12, 0x0054($sp) -/* 00DFC 808D766C C7A2005C */ lwc1 $f2, 0x005C($sp) -/* 00E00 808D7670 C7B00054 */ lwc1 $f16, 0x0054($sp) + +/* 00DF8 808D7668 E7AC0054 */ swc1 $f12, 0x0054($sp) +/* 00DFC 808D766C C7A2005C */ lwc1 $f2, 0x005C($sp) +/* 00E00 808D7670 C7B00054 */ lwc1 $f16, 0x0054($sp) /* 00E04 808D7674 A6020032 */ sh $v0, 0x0032($s0) ## 00000032 -/* 00E08 808D7678 46021482 */ mul.s $f18, $f2, $f2 -/* 00E0C 808D767C C7AE0058 */ lwc1 $f14, 0x0058($sp) -/* 00E10 808D7680 46108102 */ mul.s $f4, $f16, $f16 -/* 00E14 808D7684 46049000 */ add.s $f0, $f18, $f4 +/* 00E08 808D7678 46021482 */ mul.s $f18, $f2, $f2 +/* 00E0C 808D767C C7AE0058 */ lwc1 $f14, 0x0058($sp) +/* 00E10 808D7680 46108102 */ mul.s $f4, $f16, $f16 +/* 00E14 808D7684 46049000 */ add.s $f0, $f18, $f4 /* 00E18 808D7688 0C034199 */ jal atan2s - -/* 00E1C 808D768C 46000304 */ sqrt.s $f12, $f0 + +/* 00E1C 808D768C 46000304 */ sqrt.s $f12, $f0 /* 00E20 808D7690 0C03F66B */ jal Math_Rand_ZeroOne ## Rand.Next() float /* 00E24 808D7694 A6020030 */ sh $v0, 0x0030($s0) ## 00000030 /* 00E28 808D7698 44801000 */ mtc1 $zero, $f2 ## $f2 = 0.00 /* 00E2C 808D769C 3C01808F */ lui $at, %hi(D_808F7E64) ## $at = 808F0000 -/* 00E30 808D76A0 4602003C */ c.lt.s $f0, $f2 +/* 00E30 808D76A0 4602003C */ c.lt.s $f0, $f2 /* 00E34 808D76A4 00000000 */ nop -/* 00E38 808D76A8 45020013 */ bc1fl .L808D76F8 +/* 00E38 808D76A8 45020013 */ bc1fl .L808D76F8 /* 00E3C 808D76AC 240F0003 */ addiu $t7, $zero, 0x0003 ## $t7 = 00000003 /* 00E40 808D76B0 0C00CFC8 */ jal Math_Rand_CenteredFloat - -/* 00E44 808D76B4 C42C7E64 */ lwc1 $f12, %lo(D_808F7E64)($at) -/* 00E48 808D76B8 4600018D */ trunc.w.s $f6, $f0 + +/* 00E44 808D76B4 C42C7E64 */ lwc1 $f12, %lo(D_808F7E64)($at) +/* 00E48 808D76B8 4600018D */ trunc.w.s $f6, $f0 /* 00E4C 808D76BC 860C0032 */ lh $t4, 0x0032($s0) ## 00000032 /* 00E50 808D76C0 3C01808F */ lui $at, %hi(D_808F7E68) ## $at = 808F0000 -/* 00E54 808D76C4 C42C7E68 */ lwc1 $f12, %lo(D_808F7E68)($at) -/* 00E58 808D76C8 44183000 */ mfc1 $t8, $f6 +/* 00E54 808D76C4 C42C7E68 */ lwc1 $f12, %lo(D_808F7E68)($at) +/* 00E58 808D76C8 44183000 */ mfc1 $t8, $f6 /* 00E5C 808D76CC 00000000 */ nop -/* 00E60 808D76D0 0198C821 */ addu $t9, $t4, $t8 +/* 00E60 808D76D0 0198C821 */ addu $t9, $t4, $t8 /* 00E64 808D76D4 0C00CFC8 */ jal Math_Rand_CenteredFloat - + /* 00E68 808D76D8 A6190032 */ sh $t9, 0x0032($s0) ## 00000032 -/* 00E6C 808D76DC 4600020D */ trunc.w.s $f8, $f0 +/* 00E6C 808D76DC 4600020D */ trunc.w.s $f8, $f0 /* 00E70 808D76E0 86080030 */ lh $t0, 0x0030($s0) ## 00000030 -/* 00E74 808D76E4 440D4000 */ mfc1 $t5, $f8 +/* 00E74 808D76E4 440D4000 */ mfc1 $t5, $f8 /* 00E78 808D76E8 00000000 */ nop -/* 00E7C 808D76EC 010D7021 */ addu $t6, $t0, $t5 +/* 00E7C 808D76EC 010D7021 */ addu $t6, $t0, $t5 /* 00E80 808D76F0 A60E0030 */ sh $t6, 0x0030($s0) ## 00000030 /* 00E84 808D76F4 240F0003 */ addiu $t7, $zero, 0x0003 ## $t7 = 00000003 .L808D76F8: /* 00E88 808D76F8 A60F01B8 */ sh $t7, 0x01B8($s0) ## 000001B8 /* 00E8C 808D76FC 26050610 */ addiu $a1, $s0, 0x0610 ## $a1 = 00000610 -/* 00E90 808D7700 AFA50044 */ sw $a1, 0x0044($sp) +/* 00E90 808D7700 AFA50044 */ sw $a1, 0x0044($sp) /* 00E94 808D7704 0C0170D9 */ jal ActorCollider_AllocCylinder - + /* 00E98 808D7708 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 00E9C 808D770C 3C07808E */ lui $a3, %hi(D_808E4C2C) ## $a3 = 808E0000 -/* 00EA0 808D7710 8FA50044 */ lw $a1, 0x0044($sp) +/* 00EA0 808D7710 8FA50044 */ lw $a1, 0x0044($sp) /* 00EA4 808D7714 24E74C2C */ addiu $a3, $a3, %lo(D_808E4C2C) ## $a3 = 808E4C2C /* 00EA8 808D7718 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 00EAC 808D771C 0C01712B */ jal ActorCollider_InitCylinder - + /* 00EB0 808D7720 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 .L808D7724: -/* 00EB4 808D7724 8FBF003C */ lw $ra, 0x003C($sp) +/* 00EB4 808D7724 8FBF003C */ lw $ra, 0x003C($sp) .L808D7728: -/* 00EB8 808D7728 8FB00034 */ lw $s0, 0x0034($sp) -/* 00EBC 808D772C 8FB10038 */ lw $s1, 0x0038($sp) -/* 00EC0 808D7730 03E00008 */ jr $ra +/* 00EB8 808D7728 8FB00034 */ lw $s0, 0x0034($sp) +/* 00EBC 808D772C 8FB10038 */ lw $s1, 0x0038($sp) +/* 00EC0 808D7730 03E00008 */ jr $ra /* 00EC4 808D7734 27BD0070 */ addiu $sp, $sp, 0x0070 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808D779C.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808D779C.s index 00450f515d..915f8cd867 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808D779C.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808D779C.s @@ -1,65 +1,65 @@ glabel func_808D779C /* 00F2C 808D779C 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 00F30 808D77A0 AFB00018 */ sw $s0, 0x0018($sp) +/* 00F30 808D77A0 AFB00018 */ sw $s0, 0x0018($sp) /* 00F34 808D77A4 3C010001 */ lui $at, 0x0001 ## $at = 00010000 /* 00F38 808D77A8 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 00F3C 808D77AC 342117A4 */ ori $at, $at, 0x17A4 ## $at = 000117A4 -/* 00F40 808D77B0 AFBF001C */ sw $ra, 0x001C($sp) -/* 00F44 808D77B4 AFA50034 */ sw $a1, 0x0034($sp) -/* 00F48 808D77B8 00A12021 */ addu $a0, $a1, $at -/* 00F4C 808D77BC AFA40024 */ sw $a0, 0x0024($sp) +/* 00F40 808D77B0 AFBF001C */ sw $ra, 0x001C($sp) +/* 00F44 808D77B4 AFA50034 */ sw $a1, 0x0034($sp) +/* 00F48 808D77B8 00A12021 */ addu $a0, $a1, $at +/* 00F4C 808D77BC AFA40024 */ sw $a0, 0x0024($sp) /* 00F50 808D77C0 0C02604B */ jal Object_GetIndex ## ObjectIndex /* 00F54 808D77C4 2405017D */ addiu $a1, $zero, 0x017D ## $a1 = 0000017D -/* 00F58 808D77C8 8FA40024 */ lw $a0, 0x0024($sp) -/* 00F5C 808D77CC 04410005 */ bgez $v0, .L808D77E4 +/* 00F58 808D77C8 8FA40024 */ lw $a0, 0x0024($sp) +/* 00F5C 808D77CC 04410005 */ bgez $v0, .L808D77E4 /* 00F60 808D77D0 00403825 */ or $a3, $v0, $zero ## $a3 = 00000000 /* 00F64 808D77D4 0C00B55C */ jal Actor_Kill - + /* 00F68 808D77D8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00F6C 808D77DC 10000023 */ beq $zero, $zero, .L808D786C -/* 00F70 808D77E0 8FBF001C */ lw $ra, 0x001C($sp) +/* 00F6C 808D77DC 10000023 */ beq $zero, $zero, .L808D786C +/* 00F70 808D77E0 8FBF001C */ lw $ra, 0x001C($sp) .L808D77E4: /* 00F74 808D77E4 00E02825 */ or $a1, $a3, $zero ## $a1 = 00000000 /* 00F78 808D77E8 0C026062 */ jal Object_IsLoaded - -/* 00F7C 808D77EC AFA70028 */ sw $a3, 0x0028($sp) -/* 00F80 808D77F0 1040001A */ beq $v0, $zero, .L808D785C -/* 00F84 808D77F4 8FA70028 */ lw $a3, 0x0028($sp) + +/* 00F7C 808D77EC AFA70028 */ sw $a3, 0x0028($sp) +/* 00F80 808D77F0 1040001A */ beq $v0, $zero, .L808D785C +/* 00F84 808D77F4 8FA70028 */ lw $a3, 0x0028($sp) /* 00F88 808D77F8 3C0E808D */ lui $t6, %hi(func_808D7918) ## $t6 = 808D0000 /* 00F8C 808D77FC 25CE7918 */ addiu $t6, $t6, %lo(func_808D7918) ## $t6 = 808D7918 /* 00F90 808D7800 240F0001 */ addiu $t7, $zero, 0x0001 ## $t7 = 00000001 /* 00F94 808D7804 AE0E0194 */ sw $t6, 0x0194($s0) ## 00000194 /* 00F98 808D7808 A20F0198 */ sb $t7, 0x0198($s0) ## 00000198 /* 00F9C 808D780C AE07014C */ sw $a3, 0x014C($s0) ## 0000014C -/* 00FA0 808D7810 8FB80034 */ lw $t8, 0x0034($sp) -/* 00FA4 808D7814 0007C900 */ sll $t9, $a3, 4 -/* 00FA8 808D7818 0327C821 */ addu $t9, $t9, $a3 -/* 00FAC 808D781C 0019C880 */ sll $t9, $t9, 2 +/* 00FA0 808D7810 8FB80034 */ lw $t8, 0x0034($sp) +/* 00FA4 808D7814 0007C900 */ sll $t9, $a3, 4 +/* 00FA8 808D7818 0327C821 */ addu $t9, $t9, $a3 +/* 00FAC 808D781C 0019C880 */ sll $t9, $t9, 2 /* 00FB0 808D7820 3C090001 */ lui $t1, 0x0001 ## $t1 = 00010000 -/* 00FB4 808D7824 03194021 */ addu $t0, $t8, $t9 -/* 00FB8 808D7828 01284821 */ addu $t1, $t1, $t0 +/* 00FB4 808D7824 03194021 */ addu $t0, $t8, $t9 +/* 00FB8 808D7828 01284821 */ addu $t1, $t1, $t0 /* 00FBC 808D782C 8D2917B4 */ lw $t1, 0x17B4($t1) ## 000117B4 /* 00FC0 808D7830 3C018000 */ lui $at, 0x8000 ## $at = 80000000 /* 00FC4 808D7834 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 00FC8 808D7838 01215021 */ addu $t2, $t1, $at +/* 00FC8 808D7838 01215021 */ addu $t2, $t1, $at /* 00FCC 808D783C 3C018016 */ lui $at, 0x8016 ## $at = 80160000 /* 00FD0 808D7840 AC2A6FC0 */ sw $t2, 0x6FC0($at) ## 80166FC0 /* 00FD4 808D7844 24A55FFC */ addiu $a1, $a1, 0x5FFC ## $a1 = 06005FFC /* 00FD8 808D7848 26040150 */ addiu $a0, $s0, 0x0150 ## $a0 = 00000150 -/* 00FDC 808D784C 0C0294D3 */ jal func_800A534C +/* 00FDC 808D784C 0C0294D3 */ jal SkelAnime_ChangeAnimTransitionRepeat /* 00FE0 808D7850 24060000 */ addiu $a2, $zero, 0x0000 ## $a2 = 00000000 -/* 00FE4 808D7854 10000005 */ beq $zero, $zero, .L808D786C -/* 00FE8 808D7858 8FBF001C */ lw $ra, 0x001C($sp) +/* 00FE4 808D7854 10000005 */ beq $zero, $zero, .L808D786C +/* 00FE8 808D7858 8FBF001C */ lw $ra, 0x001C($sp) .L808D785C: /* 00FEC 808D785C 3C0B808D */ lui $t3, %hi(func_808D779C) ## $t3 = 808D0000 /* 00FF0 808D7860 256B779C */ addiu $t3, $t3, %lo(func_808D779C) ## $t3 = 808D779C /* 00FF4 808D7864 AE0B0194 */ sw $t3, 0x0194($s0) ## 00000194 -/* 00FF8 808D7868 8FBF001C */ lw $ra, 0x001C($sp) +/* 00FF8 808D7868 8FBF001C */ lw $ra, 0x001C($sp) .L808D786C: -/* 00FFC 808D786C 8FB00018 */ lw $s0, 0x0018($sp) +/* 00FFC 808D786C 8FB00018 */ lw $s0, 0x0018($sp) /* 01000 808D7870 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 01004 808D7874 03E00008 */ jr $ra +/* 01004 808D7874 03E00008 */ jr $ra /* 01008 808D7878 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808D7918.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808D7918.s index eea25eb140..d99de3e7ab 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808D7918.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808D7918.s @@ -1,24 +1,24 @@ glabel func_808D7918 /* 010A8 808D7918 27BDFF90 */ addiu $sp, $sp, 0xFF90 ## $sp = FFFFFF90 -/* 010AC 808D791C AFBF003C */ sw $ra, 0x003C($sp) -/* 010B0 808D7920 AFB00038 */ sw $s0, 0x0038($sp) -/* 010B4 808D7924 A3A0006F */ sb $zero, 0x006F($sp) +/* 010AC 808D791C AFBF003C */ sw $ra, 0x003C($sp) +/* 010B0 808D7920 AFB00038 */ sw $s0, 0x0038($sp) +/* 010B4 808D7924 A3A0006F */ sb $zero, 0x006F($sp) /* 010B8 808D7928 8CAE1C44 */ lw $t6, 0x1C44($a1) ## 00001C44 /* 010BC 808D792C 3C080001 */ lui $t0, 0x0001 ## $t0 = 00010000 /* 010C0 808D7930 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 010C4 808D7934 AFAE0068 */ sw $t6, 0x0068($sp) +/* 010C4 808D7934 AFAE0068 */ sw $t6, 0x0068($sp) /* 010C8 808D7938 8C8F014C */ lw $t7, 0x014C($a0) ## 0000014C /* 010CC 808D793C 3C028090 */ lui $v0, %hi(D_808F93C0) ## $v0 = 80900000 /* 010D0 808D7940 244293C0 */ addiu $v0, $v0, %lo(D_808F93C0) ## $v0 = 808F93C0 -/* 010D4 808D7944 000FC100 */ sll $t8, $t7, 4 -/* 010D8 808D7948 030FC021 */ addu $t8, $t8, $t7 -/* 010DC 808D794C 0018C080 */ sll $t8, $t8, 2 -/* 010E0 808D7950 00B8C821 */ addu $t9, $a1, $t8 -/* 010E4 808D7954 01194021 */ addu $t0, $t0, $t9 +/* 010D4 808D7944 000FC100 */ sll $t8, $t7, 4 +/* 010D8 808D7948 030FC021 */ addu $t8, $t8, $t7 +/* 010DC 808D794C 0018C080 */ sll $t8, $t8, 2 +/* 010E0 808D7950 00B8C821 */ addu $t9, $a1, $t8 +/* 010E4 808D7954 01194021 */ addu $t0, $t0, $t9 /* 010E8 808D7958 8D0817B4 */ lw $t0, 0x17B4($t0) ## 000117B4 /* 010EC 808D795C 44805000 */ mtc1 $zero, $f10 ## $f10 = 0.00 /* 010F0 808D7960 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 010F4 808D7964 01014821 */ addu $t1, $t0, $at +/* 010F4 808D7964 01014821 */ addu $t1, $t0, $at /* 010F8 808D7968 3C018016 */ lui $at, 0x8016 ## $at = 80160000 /* 010FC 808D796C AC296FC0 */ sw $t1, 0x6FC0($at) ## 80166FC0 /* 01100 808D7970 3C01C000 */ lui $at, 0xC000 ## $at = C0000000 @@ -39,25 +39,25 @@ glabel func_808D7918 /* 0113C 808D79AC 8C8E0524 */ lw $t6, 0x0524($a0) ## 00000674 /* 01140 808D79B0 25CF0001 */ addiu $t7, $t6, 0x0001 ## $t7 = 00000001 /* 01144 808D79B4 AC8F0524 */ sw $t7, 0x0524($a0) ## 00000674 -/* 01148 808D79B8 AFA50074 */ sw $a1, 0x0074($sp) +/* 01148 808D79B8 AFA50074 */ sw $a1, 0x0074($sp) /* 0114C 808D79BC 0C02927F */ jal SkelAnime_FrameUpdateMatrix - -/* 01150 808D79C0 AFA4004C */ sw $a0, 0x004C($sp) + +/* 01150 808D79C0 AFA4004C */ sw $a0, 0x004C($sp) /* 01154 808D79C4 96180678 */ lhu $t8, 0x0678($s0) ## 00000678 -/* 01158 808D79C8 2F010017 */ sltiu $at, $t8, 0x0017 -/* 0115C 808D79CC 10200541 */ beq $at, $zero, .L808D8ED4 -/* 01160 808D79D0 0018C080 */ sll $t8, $t8, 2 +/* 01158 808D79C8 2F010017 */ sltiu $at, $t8, 0x0017 +/* 0115C 808D79CC 10200541 */ beq $at, $zero, .L808D8ED4 +/* 01160 808D79D0 0018C080 */ sll $t8, $t8, 2 /* 01164 808D79D4 3C01808F */ lui $at, %hi(jtbl_808F7E6C) ## $at = 808F0000 -/* 01168 808D79D8 00380821 */ addu $at, $at, $t8 -/* 0116C 808D79DC 8C387E6C */ lw $t8, %lo(jtbl_808F7E6C)($at) -/* 01170 808D79E0 03000008 */ jr $t8 +/* 01168 808D79D8 00380821 */ addu $at, $at, $t8 +/* 0116C 808D79DC 8C387E6C */ lw $t8, %lo(jtbl_808F7E6C)($at) +/* 01170 808D79E0 03000008 */ jr $t8 /* 01174 808D79E4 00000000 */ nop glabel L808D79E8 -/* 01178 808D79E8 8FA20068 */ lw $v0, 0x0068($sp) +/* 01178 808D79E8 8FA20068 */ lw $v0, 0x0068($sp) /* 0117C 808D79EC 3C0143D7 */ lui $at, 0x43D7 ## $at = 43D70000 /* 01180 808D79F0 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 /* 01184 808D79F4 44818000 */ mtc1 $at, $f16 ## $f16 = 430.00 -/* 01188 808D79F8 8FA40074 */ lw $a0, 0x0074($sp) +/* 01188 808D79F8 8FA40074 */ lw $a0, 0x0074($sp) /* 0118C 808D79FC 3C0142E0 */ lui $at, 0x42E0 ## $at = 42E00000 /* 01190 808D7A00 44819000 */ mtc1 $at, $f18 ## $f18 = 112.00 /* 01194 808D7A04 E4400024 */ swc1 $f0, 0x0024($v0) ## 00000024 @@ -66,28 +66,28 @@ glabel L808D79E8 /* 011A0 808D7A10 3C01808F */ lui $at, %hi(D_808F7EC8) ## $at = 808F0000 /* 011A4 808D7A14 E6000024 */ swc1 $f0, 0x0024($s0) ## 00000024 /* 011A8 808D7A18 E6120028 */ swc1 $f18, 0x0028($s0) ## 00000028 -/* 011AC 808D7A1C C4247EC8 */ lwc1 $f4, %lo(D_808F7EC8)($at) +/* 011AC 808D7A1C C4247EC8 */ lwc1 $f4, %lo(D_808F7EC8)($at) /* 011B0 808D7A20 3C01808F */ lui $at, %hi(D_808F7ECC) ## $at = 808F0000 /* 011B4 808D7A24 24851D64 */ addiu $a1, $a0, 0x1D64 ## $a1 = 00001D64 /* 011B8 808D7A28 E604002C */ swc1 $f4, 0x002C($s0) ## 0000002C -/* 011BC 808D7A2C C4267ECC */ lwc1 $f6, %lo(D_808F7ECC)($at) +/* 011BC 808D7A2C C4267ECC */ lwc1 $f6, %lo(D_808F7ECC)($at) /* 011C0 808D7A30 A60000B6 */ sh $zero, 0x00B6($s0) ## 000000B6 -/* 011C4 808D7A34 0C019148 */ jal func_80064520 +/* 011C4 808D7A34 0C019148 */ jal func_80064520 /* 011C8 808D7A38 E60600BC */ swc1 $f6, 0x00BC($s0) ## 000000BC -/* 011CC 808D7A3C 8FA40074 */ lw $a0, 0x0074($sp) +/* 011CC 808D7A3C 8FA40074 */ lw $a0, 0x0074($sp) /* 011D0 808D7A40 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 011D4 808D7A44 0C00B7D5 */ jal func_8002DF54 +/* 011D4 808D7A44 0C00B7D5 */ jal func_8002DF54 /* 011D8 808D7A48 24060008 */ addiu $a2, $zero, 0x0008 ## $a2 = 00000008 -/* 011DC 808D7A4C 0C03008C */ jal func_800C0230 -/* 011E0 808D7A50 8FA40074 */ lw $a0, 0x0074($sp) +/* 011DC 808D7A4C 0C03008C */ jal func_800C0230 +/* 011E0 808D7A50 8FA40074 */ lw $a0, 0x0074($sp) /* 011E4 808D7A54 A602067A */ sh $v0, 0x067A($s0) ## 0000067A -/* 011E8 808D7A58 8FA40074 */ lw $a0, 0x0074($sp) +/* 011E8 808D7A58 8FA40074 */ lw $a0, 0x0074($sp) /* 011EC 808D7A5C 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 011F0 808D7A60 0C0300C5 */ jal func_800C0314 +/* 011F0 808D7A60 0C0300C5 */ jal func_800C0314 /* 011F4 808D7A64 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 -/* 011F8 808D7A68 8FA40074 */ lw $a0, 0x0074($sp) +/* 011F8 808D7A68 8FA40074 */ lw $a0, 0x0074($sp) /* 011FC 808D7A6C 8605067A */ lh $a1, 0x067A($s0) ## 0000067A -/* 01200 808D7A70 0C0300C5 */ jal func_800C0314 +/* 01200 808D7A70 0C0300C5 */ jal func_800C0314 /* 01204 808D7A74 24060007 */ addiu $a2, $zero, 0x0007 ## $a2 = 00000007 /* 01208 808D7A78 3C014270 */ lui $at, 0x4270 ## $at = 42700000 /* 0120C 808D7A7C 44814000 */ mtc1 $at, $f8 ## $f8 = 60.00 @@ -98,25 +98,25 @@ glabel L808D79E8 /* 01220 808D7A90 240D0001 */ addiu $t5, $zero, 0x0001 ## $t5 = 00000001 /* 01224 808D7A94 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 01228 808D7A98 33280100 */ andi $t0, $t9, 0x0100 ## $t0 = 00000000 -/* 0122C 808D7A9C 11000020 */ beq $t0, $zero, .L808D7B20 +/* 0122C 808D7A9C 11000020 */ beq $t0, $zero, .L808D7B20 /* 01230 808D7AA0 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 01234 808D7AA4 A6090678 */ sh $t1, 0x0678($s0) ## 00000678 /* 01238 808D7AA8 AE000674 */ sw $zero, 0x0674($s0) ## 00000674 /* 0123C 808D7AAC 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 /* 01240 808D7AB0 44815000 */ mtc1 $at, $f10 ## $f10 = 20.00 -/* 01244 808D7AB4 8FAA0068 */ lw $t2, 0x0068($sp) +/* 01244 808D7AB4 8FAA0068 */ lw $t2, 0x0068($sp) /* 01248 808D7AB8 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 /* 0124C 808D7ABC 24A589F8 */ addiu $a1, $a1, 0x89F8 ## $a1 = 060089F8 /* 01250 808D7AC0 E54A002C */ swc1 $f10, 0x002C($t2) ## 0000002C /* 01254 808D7AC4 A200071A */ sb $zero, 0x071A($s0) ## 0000071A -/* 01258 808D7AC8 8FA4004C */ lw $a0, 0x004C($sp) -/* 0125C 808D7ACC 0C0294D3 */ jal func_800A534C +/* 01258 808D7AC8 8FA4004C */ lw $a0, 0x004C($sp) +/* 0125C 808D7ACC 0C0294D3 */ jal SkelAnime_ChangeAnimTransitionRepeat /* 01260 808D7AD0 3C06C0A0 */ lui $a2, 0xC0A0 ## $a2 = C0A00000 /* 01264 808D7AD4 3C01447A */ lui $at, 0x447A ## $at = 447A0000 /* 01268 808D7AD8 44818000 */ mtc1 $at, $f16 ## $f16 = 1000.00 /* 0126C 808D7ADC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 01270 808D7AE0 2405000B */ addiu $a1, $zero, 0x000B ## $a1 = 0000000B -/* 01274 808D7AE4 0C235E1F */ jal func_808D787C +/* 01274 808D7AE4 0C235E1F */ jal func_808D787C /* 01278 808D7AE8 E61001CC */ swc1 $f16, 0x01CC($s0) ## 000001CC /* 0127C 808D7AEC 24020002 */ addiu $v0, $zero, 0x0002 ## $v0 = 00000002 /* 01280 808D7AF0 240B006E */ addiu $t3, $zero, 0x006E ## $t3 = 0000006E @@ -127,15 +127,15 @@ glabel L808D79E8 /* 01294 808D7B04 3C041000 */ lui $a0, 0x1000 ## $a0 = 10000000 /* 01298 808D7B08 A42CFA84 */ sh $t4, -0x057C($at) ## 8015FA84 /* 0129C 808D7B0C 0C03E803 */ jal Audio_SetBGM - + /* 012A0 808D7B10 348400FF */ ori $a0, $a0, 0x00FF ## $a0 = 100000FF -/* 012A4 808D7B14 8FA40074 */ lw $a0, 0x0074($sp) -/* 012A8 808D7B18 1000001B */ beq $zero, $zero, .L808D7B88 +/* 012A4 808D7B14 8FA40074 */ lw $a0, 0x0074($sp) +/* 012A8 808D7B18 1000001B */ beq $zero, $zero, .L808D7B88 /* 012AC 808D7B1C 24841C24 */ addiu $a0, $a0, 0x1C24 ## $a0 = 00001C24 .L808D7B20: -/* 012B0 808D7B20 0C235E1F */ jal func_808D787C +/* 012B0 808D7B20 0C235E1F */ jal func_808D787C /* 012B4 808D7B24 A20D071A */ sb $t5, 0x071A($s0) ## 0000071A -/* 012B8 808D7B28 8FA60074 */ lw $a2, 0x0074($sp) +/* 012B8 808D7B28 8FA60074 */ lw $a2, 0x0074($sp) /* 012BC 808D7B2C 240E0001 */ addiu $t6, $zero, 0x0001 ## $t6 = 00000001 /* 012C0 808D7B30 A60E0678 */ sh $t6, 0x0678($s0) ## 00000678 /* 012C4 808D7B34 3C01435C */ lui $at, 0x435C ## $at = 435C0000 @@ -145,39 +145,39 @@ glabel L808D79E8 /* 012D4 808D7B44 44809000 */ mtc1 $zero, $f18 ## $f18 = 0.00 /* 012D8 808D7B48 240F2000 */ addiu $t7, $zero, 0x2000 ## $t7 = 00002000 /* 012DC 808D7B4C 24C41C24 */ addiu $a0, $a2, 0x1C24 ## $a0 = 00001C24 -/* 012E0 808D7B50 AFA40050 */ sw $a0, 0x0050($sp) -/* 012E4 808D7B54 AFAF0028 */ sw $t7, 0x0028($sp) -/* 012E8 808D7B58 AFA00024 */ sw $zero, 0x0024($sp) -/* 012EC 808D7B5C AFA00020 */ sw $zero, 0x0020($sp) -/* 012F0 808D7B60 AFA0001C */ sw $zero, 0x001C($sp) +/* 012E0 808D7B50 AFA40050 */ sw $a0, 0x0050($sp) +/* 012E4 808D7B54 AFAF0028 */ sw $t7, 0x0028($sp) +/* 012E8 808D7B58 AFA00024 */ sw $zero, 0x0024($sp) +/* 012EC 808D7B5C AFA00020 */ sw $zero, 0x0020($sp) +/* 012F0 808D7B60 AFA0001C */ sw $zero, 0x001C($sp) /* 012F4 808D7B64 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 012F8 808D7B68 24070179 */ addiu $a3, $zero, 0x0179 ## $a3 = 00000179 -/* 012FC 808D7B6C E7A40014 */ swc1 $f4, 0x0014($sp) -/* 01300 808D7B70 E7A60018 */ swc1 $f6, 0x0018($sp) +/* 012FC 808D7B6C E7A40014 */ swc1 $f4, 0x0014($sp) +/* 01300 808D7B70 E7A60018 */ swc1 $f6, 0x0018($sp) /* 01304 808D7B74 0C00C916 */ jal Actor_SpawnAttached - -/* 01308 808D7B78 E7B20010 */ swc1 $f18, 0x0010($sp) + +/* 01308 808D7B78 E7B20010 */ swc1 $f18, 0x0010($sp) /* 0130C 808D7B7C 3C018090 */ lui $at, %hi(D_808F93D4) ## $at = 80900000 -/* 01310 808D7B80 AC2293D4 */ sw $v0, %lo(D_808F93D4)($at) -/* 01314 808D7B84 8FA40050 */ lw $a0, 0x0050($sp) +/* 01310 808D7B80 AC2293D4 */ sw $v0, %lo(D_808F93D4)($at) +/* 01314 808D7B84 8FA40050 */ lw $a0, 0x0050($sp) .L808D7B88: /* 01318 808D7B88 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 /* 0131C 808D7B8C 24180001 */ addiu $t8, $zero, 0x0001 ## $t8 = 00000001 -/* 01320 808D7B90 AFB80028 */ sw $t8, 0x0028($sp) +/* 01320 808D7B90 AFB80028 */ sw $t8, 0x0028($sp) /* 01324 808D7B94 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 01328 808D7B98 8FA60074 */ lw $a2, 0x0074($sp) +/* 01328 808D7B98 8FA60074 */ lw $a2, 0x0074($sp) /* 0132C 808D7B9C 2407015E */ addiu $a3, $zero, 0x015E ## $a3 = 0000015E -/* 01330 808D7BA0 AFA0001C */ sw $zero, 0x001C($sp) -/* 01334 808D7BA4 AFA00020 */ sw $zero, 0x0020($sp) -/* 01338 808D7BA8 AFA00024 */ sw $zero, 0x0024($sp) -/* 0133C 808D7BAC E7A00010 */ swc1 $f0, 0x0010($sp) -/* 01340 808D7BB0 E7A00014 */ swc1 $f0, 0x0014($sp) +/* 01330 808D7BA0 AFA0001C */ sw $zero, 0x001C($sp) +/* 01334 808D7BA4 AFA00020 */ sw $zero, 0x0020($sp) +/* 01338 808D7BA8 AFA00024 */ sw $zero, 0x0024($sp) +/* 0133C 808D7BAC E7A00010 */ swc1 $f0, 0x0010($sp) +/* 01340 808D7BB0 E7A00014 */ swc1 $f0, 0x0014($sp) /* 01344 808D7BB4 0C00C916 */ jal Actor_SpawnAttached - -/* 01348 808D7BB8 E7A00018 */ swc1 $f0, 0x0018($sp) + +/* 01348 808D7BB8 E7A00018 */ swc1 $f0, 0x0018($sp) /* 0134C 808D7BBC 3C014264 */ lui $at, 0x4264 ## $at = 42640000 /* 01350 808D7BC0 3C198090 */ lui $t9, %hi(D_808F93C0) ## $t9 = 80900000 -/* 01354 808D7BC4 8F3993C0 */ lw $t9, %lo(D_808F93C0)($t9) +/* 01354 808D7BC4 8F3993C0 */ lw $t9, %lo(D_808F93C0)($t9) /* 01358 808D7BC8 44814000 */ mtc1 $at, $f8 ## $f8 = 57.00 /* 0135C 808D7BCC 00000000 */ nop /* 01360 808D7BD0 E72816AC */ swc1 $f8, 0x16AC($t9) ## 809016AC @@ -185,37 +185,37 @@ glabel L808D7BD4 /* 01364 808D7BD4 8E090674 */ lw $t1, 0x0674($s0) ## 00000674 /* 01368 808D7BD8 24080003 */ addiu $t0, $zero, 0x0003 ## $t0 = 00000003 /* 0136C 808D7BDC 24010046 */ addiu $at, $zero, 0x0046 ## $at = 00000046 -/* 01370 808D7BE0 152104BC */ bne $t1, $at, .L808D8ED4 +/* 01370 808D7BE0 152104BC */ bne $t1, $at, .L808D8ED4 /* 01374 808D7BE4 A20801A0 */ sb $t0, 0x01A0($s0) ## 000001A0 /* 01378 808D7BE8 240A0002 */ addiu $t2, $zero, 0x0002 ## $t2 = 00000002 /* 0137C 808D7BEC A60A0678 */ sh $t2, 0x0678($s0) ## 00000678 -/* 01380 808D7BF0 100004B8 */ beq $zero, $zero, .L808D8ED4 +/* 01380 808D7BF0 100004B8 */ beq $zero, $zero, .L808D8ED4 /* 01384 808D7BF4 AE000674 */ sw $zero, 0x0674($s0) ## 00000674 glabel L808D7BF8 /* 01388 808D7BF8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0138C 808D7BFC 0C235E1F */ jal func_808D787C +/* 0138C 808D7BFC 0C235E1F */ jal func_808D787C /* 01390 808D7C00 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 /* 01394 808D7C04 8E030674 */ lw $v1, 0x0674($s0) ## 00000674 /* 01398 808D7C08 2401000A */ addiu $at, $zero, 0x000A ## $at = 0000000A -/* 0139C 808D7C0C 8FA40074 */ lw $a0, 0x0074($sp) -/* 013A0 808D7C10 14610004 */ bne $v1, $at, .L808D7C24 +/* 0139C 808D7C0C 8FA40074 */ lw $a0, 0x0074($sp) +/* 013A0 808D7C10 14610004 */ bne $v1, $at, .L808D7C24 /* 013A4 808D7C14 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 013A8 808D7C18 0C00B7D5 */ jal func_8002DF54 +/* 013A8 808D7C18 0C00B7D5 */ jal func_8002DF54 /* 013AC 808D7C1C 24060005 */ addiu $a2, $zero, 0x0005 ## $a2 = 00000005 /* 013B0 808D7C20 8E030674 */ lw $v1, 0x0674($s0) ## 00000674 .L808D7C24: /* 013B4 808D7C24 2401000D */ addiu $at, $zero, 0x000D ## $at = 0000000D -/* 013B8 808D7C28 14610007 */ bne $v1, $at, .L808D7C48 -/* 013BC 808D7C2C 8FA40068 */ lw $a0, 0x0068($sp) +/* 013B8 808D7C28 14610007 */ bne $v1, $at, .L808D7C48 +/* 013BC 808D7C2C 8FA40068 */ lw $a0, 0x0068($sp) /* 013C0 808D7C30 8C8C0678 */ lw $t4, 0x0678($a0) ## 00000678 /* 013C4 808D7C34 95850092 */ lhu $a1, 0x0092($t4) ## 00000092 /* 013C8 808D7C38 24A56816 */ addiu $a1, $a1, 0x6816 ## $a1 = 00006816 -/* 013CC 808D7C3C 0C00BDF7 */ jal func_8002F7DC +/* 013CC 808D7C3C 0C00BDF7 */ jal func_8002F7DC /* 013D0 808D7C40 30A5FFFF */ andi $a1, $a1, 0xFFFF ## $a1 = 00006816 /* 013D4 808D7C44 8E030674 */ lw $v1, 0x0674($s0) ## 00000674 .L808D7C48: /* 013D8 808D7C48 24010023 */ addiu $at, $zero, 0x0023 ## $at = 00000023 -/* 013DC 808D7C4C 146104A1 */ bne $v1, $at, .L808D8ED4 +/* 013DC 808D7C4C 146104A1 */ bne $v1, $at, .L808D8ED4 /* 013E0 808D7C50 240D0003 */ addiu $t5, $zero, 0x0003 ## $t5 = 00000003 /* 013E4 808D7C54 3C014270 */ lui $at, 0x4270 ## $at = 42700000 /* 013E8 808D7C58 44818000 */ mtc1 $at, $f16 ## $f16 = 60.00 @@ -230,39 +230,39 @@ glabel L808D7BF8 /* 0140C 808D7C7C E60A0680 */ swc1 $f10, 0x0680($s0) ## 00000680 /* 01410 808D7C80 E6120688 */ swc1 $f18, 0x0688($s0) ## 00000688 /* 01414 808D7C84 E604068C */ swc1 $f4, 0x068C($s0) ## 0000068C -/* 01418 808D7C88 C4267ED0 */ lwc1 $f6, %lo(D_808F7ED0)($at) +/* 01418 808D7C88 C4267ED0 */ lwc1 $f6, %lo(D_808F7ED0)($at) /* 0141C 808D7C8C E6060704 */ swc1 $f6, 0x0704($s0) ## 00000704 glabel L808D7C90 /* 01420 808D7C90 A20001A0 */ sb $zero, 0x01A0($s0) ## 000001A0 -/* 01424 808D7C94 8FAE0074 */ lw $t6, 0x0074($sp) +/* 01424 808D7C94 8FAE0074 */ lw $t6, 0x0074($sp) /* 01428 808D7C98 44804000 */ mtc1 $zero, $f8 ## $f8 = 0.00 /* 0142C 808D7C9C 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 01430 808D7CA0 002E0821 */ addu $at, $at, $t6 +/* 01430 808D7CA0 002E0821 */ addu $at, $at, $t6 /* 01434 808D7CA4 E4280AFC */ swc1 $f8, 0x0AFC($at) ## 00010AFC /* 01438 808D7CA8 0C0400A4 */ jal sinf - + /* 0143C 808D7CAC C60C0704 */ lwc1 $f12, 0x0704($s0) ## 00000704 /* 01440 808D7CB0 3C014396 */ lui $at, 0x4396 ## $at = 43960000 /* 01444 808D7CB4 44815000 */ mtc1 $at, $f10 ## $f10 = 300.00 /* 01448 808D7CB8 C6120684 */ lwc1 $f18, 0x0684($s0) ## 00000684 /* 0144C 808D7CBC C60C0704 */ lwc1 $f12, 0x0704($s0) ## 00000704 -/* 01450 808D7CC0 460A0402 */ mul.s $f16, $f0, $f10 -/* 01454 808D7CC4 46128100 */ add.s $f4, $f16, $f18 +/* 01450 808D7CC0 460A0402 */ mul.s $f16, $f0, $f10 +/* 01454 808D7CC4 46128100 */ add.s $f4, $f16, $f18 /* 01458 808D7CC8 0C041184 */ jal cosf - + /* 0145C 808D7CCC E6040690 */ swc1 $f4, 0x0690($s0) ## 00000690 /* 01460 808D7CD0 3C01C396 */ lui $at, 0xC396 ## $at = C3960000 /* 01464 808D7CD4 44813000 */ mtc1 $at, $f6 ## $f6 = -300.00 /* 01468 808D7CD8 C60A0688 */ lwc1 $f10, 0x0688($s0) ## 00000688 /* 0146C 808D7CDC 3C063D4C */ lui $a2, 0x3D4C ## $a2 = 3D4C0000 -/* 01470 808D7CE0 46060202 */ mul.s $f8, $f0, $f6 +/* 01470 808D7CE0 46060202 */ mul.s $f8, $f0, $f6 /* 01474 808D7CE4 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3D4CCCCD /* 01478 808D7CE8 26040704 */ addiu $a0, $s0, 0x0704 ## $a0 = 00000704 /* 0147C 808D7CEC 3C053E80 */ lui $a1, 0x3E80 ## $a1 = 3E800000 /* 01480 808D7CF0 8E0706B4 */ lw $a3, 0x06B4($s0) ## 000006B4 -/* 01484 808D7CF4 460A4400 */ add.s $f16, $f8, $f10 +/* 01484 808D7CF4 460A4400 */ add.s $f16, $f8, $f10 /* 01488 808D7CF8 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 0148C 808D7CFC E6100694 */ swc1 $f16, 0x0694($s0) ## 00000694 /* 01490 808D7D00 3C053C23 */ lui $a1, 0x3C23 ## $a1 = 3C230000 /* 01494 808D7D04 3C0738D1 */ lui $a3, 0x38D1 ## $a3 = 38D10000 @@ -270,30 +270,30 @@ glabel L808D7C90 /* 0149C 808D7D0C 34A5D70A */ ori $a1, $a1, 0xD70A ## $a1 = 3C23D70A /* 014A0 808D7D10 260406B4 */ addiu $a0, $s0, 0x06B4 ## $a0 = 000006B4 /* 014A4 808D7D14 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 014A8 808D7D18 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 014AC 808D7D1C 8E0F0674 */ lw $t7, 0x0674($s0) ## 00000674 /* 014B0 808D7D20 240100C8 */ addiu $at, $zero, 0x00C8 ## $at = 000000C8 -/* 014B4 808D7D24 8FA40074 */ lw $a0, 0x0074($sp) -/* 014B8 808D7D28 15E1046A */ bne $t7, $at, .L808D8ED4 +/* 014B4 808D7D24 8FA40074 */ lw $a0, 0x0074($sp) +/* 014B8 808D7D28 15E1046A */ bne $t7, $at, .L808D8ED4 /* 014BC 808D7D2C 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 014C0 808D7D30 0C00B7D5 */ jal func_8002DF54 +/* 014C0 808D7D30 0C00B7D5 */ jal func_8002DF54 /* 014C4 808D7D34 24060008 */ addiu $a2, $zero, 0x0008 ## $a2 = 00000008 /* 014C8 808D7D38 24180004 */ addiu $t8, $zero, 0x0004 ## $t8 = 00000004 /* 014CC 808D7D3C A6180678 */ sh $t8, 0x0678($s0) ## 00000678 /* 014D0 808D7D40 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 014D4 808D7D44 0C235E1F */ jal func_808D787C +/* 014D4 808D7D44 0C235E1F */ jal func_808D787C /* 014D8 808D7D48 24050002 */ addiu $a1, $zero, 0x0002 ## $a1 = 00000002 /* 014DC 808D7D4C AE000674 */ sw $zero, 0x0674($s0) ## 00000674 glabel L808D7D50 /* 014E0 808D7D50 8E030674 */ lw $v1, 0x0674($s0) ## 00000674 /* 014E4 808D7D54 2401000A */ addiu $at, $zero, 0x000A ## $at = 0000000A /* 014E8 808D7D58 24190004 */ addiu $t9, $zero, 0x0004 ## $t9 = 00000004 -/* 014EC 808D7D5C 10600004 */ beq $v1, $zero, .L808D7D70 +/* 014EC 808D7D5C 10600004 */ beq $v1, $zero, .L808D7D70 /* 014F0 808D7D60 24080023 */ addiu $t0, $zero, 0x0023 ## $t0 = 00000023 -/* 014F4 808D7D64 10610002 */ beq $v1, $at, .L808D7D70 +/* 014F4 808D7D64 10610002 */ beq $v1, $at, .L808D7D70 /* 014F8 808D7D68 24010014 */ addiu $at, $zero, 0x0014 ## $at = 00000014 -/* 014FC 808D7D6C 1461000B */ bne $v1, $at, .L808D7D9C +/* 014FC 808D7D6C 1461000B */ bne $v1, $at, .L808D7D9C .L808D7D70: /* 01500 808D7D70 3C014288 */ lui $at, 0x4288 ## $at = 42880000 /* 01504 808D7D74 44812000 */ mtc1 $at, $f4 ## $f4 = 68.00 @@ -301,74 +301,74 @@ glabel L808D7D50 /* 0150C 808D7D7C C6120684 */ lwc1 $f18, 0x0684($s0) ## 00000684 /* 01510 808D7D80 44815000 */ mtc1 $at, $f10 ## $f10 = 142.00 /* 01514 808D7D84 C6080688 */ lwc1 $f8, 0x0688($s0) ## 00000688 -/* 01518 808D7D88 46049180 */ add.s $f6, $f18, $f4 +/* 01518 808D7D88 46049180 */ add.s $f6, $f18, $f4 /* 0151C 808D7D8C 8E030674 */ lw $v1, 0x0674($s0) ## 00000674 -/* 01520 808D7D90 460A4401 */ sub.s $f16, $f8, $f10 +/* 01520 808D7D90 460A4401 */ sub.s $f16, $f8, $f10 /* 01524 808D7D94 E6060684 */ swc1 $f6, 0x0684($s0) ## 00000684 /* 01528 808D7D98 E6100688 */ swc1 $f16, 0x0688($s0) ## 00000688 .L808D7D9C: -/* 0152C 808D7D9C 2C610014 */ sltiu $at, $v1, 0x0014 -/* 01530 808D7DA0 14200003 */ bne $at, $zero, .L808D7DB0 +/* 0152C 808D7D9C 2C610014 */ sltiu $at, $v1, 0x0014 +/* 01530 808D7DA0 14200003 */ bne $at, $zero, .L808D7DB0 /* 01534 808D7DA4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01538 808D7DA8 10000002 */ beq $zero, $zero, .L808D7DB4 +/* 01538 808D7DA8 10000002 */ beq $zero, $zero, .L808D7DB4 /* 0153C 808D7DAC A21901A0 */ sb $t9, 0x01A0($s0) ## 000001A0 .L808D7DB0: /* 01540 808D7DB0 A20801A0 */ sb $t0, 0x01A0($s0) ## 000001A0 .L808D7DB4: /* 01544 808D7DB4 8E090674 */ lw $t1, 0x0674($s0) ## 00000674 /* 01548 808D7DB8 2401003C */ addiu $at, $zero, 0x003C ## $at = 0000003C -/* 0154C 808D7DBC 55210446 */ bnel $t1, $at, .L808D8ED8 +/* 0154C 808D7DBC 55210446 */ bnel $t1, $at, .L808D8ED8 /* 01550 808D7DC0 8605067A */ lh $a1, 0x067A($s0) ## 0000067A -/* 01554 808D7DC4 0C235E1F */ jal func_808D787C +/* 01554 808D7DC4 0C235E1F */ jal func_808D787C /* 01558 808D7DC8 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 /* 0155C 808D7DCC 240A0005 */ addiu $t2, $zero, 0x0005 ## $t2 = 00000005 /* 01560 808D7DD0 A60A0678 */ sh $t2, 0x0678($s0) ## 00000678 -/* 01564 808D7DD4 1000043F */ beq $zero, $zero, .L808D8ED4 +/* 01564 808D7DD4 1000043F */ beq $zero, $zero, .L808D8ED4 /* 01568 808D7DD8 AE000674 */ sw $zero, 0x0674($s0) ## 00000674 glabel L808D7DDC /* 0156C 808D7DDC 8E030674 */ lw $v1, 0x0674($s0) ## 00000674 /* 01570 808D7DE0 240B0005 */ addiu $t3, $zero, 0x0005 ## $t3 = 00000005 /* 01574 808D7DE4 A20B01A0 */ sb $t3, 0x01A0($s0) ## 000001A0 -/* 01578 808D7DE8 2C610032 */ sltiu $at, $v1, 0x0032 -/* 0157C 808D7DEC 10200007 */ beq $at, $zero, .L808D7E0C -/* 01580 808D7DF0 8FAC0074 */ lw $t4, 0x0074($sp) +/* 01578 808D7DE8 2C610032 */ sltiu $at, $v1, 0x0032 +/* 0157C 808D7DEC 10200007 */ beq $at, $zero, .L808D7E0C +/* 01580 808D7DF0 8FAC0074 */ lw $t4, 0x0074($sp) /* 01584 808D7DF4 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 /* 01588 808D7DF8 44819000 */ mtc1 $at, $f18 ## $f18 = 1.00 /* 0158C 808D7DFC 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 01590 808D7E00 002C0821 */ addu $at, $at, $t4 +/* 01590 808D7E00 002C0821 */ addu $at, $at, $t4 /* 01594 808D7E04 E4320AFC */ swc1 $f18, 0x0AFC($at) ## 00010AFC /* 01598 808D7E08 8E030674 */ lw $v1, 0x0674($s0) ## 00000674 .L808D7E0C: /* 0159C 808D7E0C 2401000A */ addiu $at, $zero, 0x000A ## $at = 0000000A -/* 015A0 808D7E10 14610005 */ bne $v1, $at, .L808D7E28 -/* 015A4 808D7E14 8FA40074 */ lw $a0, 0x0074($sp) +/* 015A0 808D7E10 14610005 */ bne $v1, $at, .L808D7E28 +/* 015A4 808D7E14 8FA40074 */ lw $a0, 0x0074($sp) /* 015A8 808D7E18 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 015AC 808D7E1C 0C00B7D5 */ jal func_8002DF54 +/* 015AC 808D7E1C 0C00B7D5 */ jal func_8002DF54 /* 015B0 808D7E20 2406004B */ addiu $a2, $zero, 0x004B ## $a2 = 0000004B /* 015B4 808D7E24 8E030674 */ lw $v1, 0x0674($s0) ## 00000674 .L808D7E28: /* 015B8 808D7E28 24010046 */ addiu $at, $zero, 0x0046 ## $at = 00000046 -/* 015BC 808D7E2C 14610429 */ bne $v1, $at, .L808D8ED4 +/* 015BC 808D7E2C 14610429 */ bne $v1, $at, .L808D8ED4 /* 015C0 808D7E30 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 015C4 808D7E34 0C235E1F */ jal func_808D787C +/* 015C4 808D7E34 0C235E1F */ jal func_808D787C /* 015C8 808D7E38 24050003 */ addiu $a1, $zero, 0x0003 ## $a1 = 00000003 /* 015CC 808D7E3C 240D0006 */ addiu $t5, $zero, 0x0006 ## $t5 = 00000006 /* 015D0 808D7E40 240E0003 */ addiu $t6, $zero, 0x0003 ## $t6 = 00000003 /* 015D4 808D7E44 A60D0678 */ sh $t5, 0x0678($s0) ## 00000678 /* 015D8 808D7E48 AE000674 */ sw $zero, 0x0674($s0) ## 00000674 -/* 015DC 808D7E4C 10000421 */ beq $zero, $zero, .L808D8ED4 +/* 015DC 808D7E4C 10000421 */ beq $zero, $zero, .L808D8ED4 /* 015E0 808D7E50 A20E01A0 */ sb $t6, 0x01A0($s0) ## 000001A0 glabel L808D7E54 /* 015E4 808D7E54 8E180674 */ lw $t8, 0x0674($s0) ## 00000674 /* 015E8 808D7E58 240F0003 */ addiu $t7, $zero, 0x0003 ## $t7 = 00000003 /* 015EC 808D7E5C 2401001E */ addiu $at, $zero, 0x001E ## $at = 0000001E -/* 015F0 808D7E60 1701041C */ bne $t8, $at, .L808D8ED4 +/* 015F0 808D7E60 1701041C */ bne $t8, $at, .L808D8ED4 /* 015F4 808D7E64 A20F01A0 */ sb $t7, 0x01A0($s0) ## 000001A0 /* 015F8 808D7E68 24190007 */ addiu $t9, $zero, 0x0007 ## $t9 = 00000007 /* 015FC 808D7E6C A6190678 */ sh $t9, 0x0678($s0) ## 00000678 /* 01600 808D7E70 AE000674 */ sw $zero, 0x0674($s0) ## 00000674 /* 01604 808D7E74 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01608 808D7E78 0C235E1F */ jal func_808D787C +/* 01608 808D7E78 0C235E1F */ jal func_808D787C /* 0160C 808D7E7C 24050004 */ addiu $a1, $zero, 0x0004 ## $a1 = 00000004 /* 01610 808D7E80 3C014120 */ lui $at, 0x4120 ## $at = 41200000 /* 01614 808D7E84 44812000 */ mtc1 $at, $f4 ## $f4 = 10.00 @@ -382,12 +382,12 @@ glabel L808D7E54 /* 01634 808D7EA4 E60401E0 */ swc1 $f4, 0x01E0($s0) ## 000001E0 /* 01638 808D7EA8 E60801D4 */ swc1 $f8, 0x01D4($s0) ## 000001D4 /* 0163C 808D7EAC E60601D8 */ swc1 $f6, 0x01D8($s0) ## 000001D8 -/* 01640 808D7EB0 0C01E221 */ jal func_80078884 +/* 01640 808D7EB0 0C01E221 */ jal func_80078884 /* 01644 808D7EB4 E60A01DC */ swc1 $f10, 0x01DC($s0) ## 000001DC -/* 01648 808D7EB8 8FA80074 */ lw $t0, 0x0074($sp) +/* 01648 808D7EB8 8FA80074 */ lw $t0, 0x0074($sp) /* 0164C 808D7EBC 44808000 */ mtc1 $zero, $f16 ## $f16 = 0.00 /* 01650 808D7EC0 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 01654 808D7EC4 00280821 */ addu $at, $at, $t0 +/* 01654 808D7EC4 00280821 */ addu $at, $at, $t0 /* 01658 808D7EC8 E4300AFC */ swc1 $f16, 0x0AFC($at) ## 00010AFC glabel L808D7ECC /* 0165C 808D7ECC 24090006 */ addiu $t1, $zero, 0x0006 ## $t1 = 00000006 @@ -396,7 +396,7 @@ glabel L808D7ECC /* 01668 808D7ED8 3C05437F */ lui $a1, 0x437F ## $a1 = 437F0000 /* 0166C 808D7EDC 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 01670 808D7EE0 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 01674 808D7EE4 3C074120 */ lui $a3, 0x4120 ## $a3 = 41200000 /* 01678 808D7EE8 3C053ECC */ lui $a1, 0x3ECC ## $a1 = 3ECC0000 /* 0167C 808D7EEC 3C073E99 */ lui $a3, 0x3E99 ## $a3 = 3E990000 @@ -404,81 +404,81 @@ glabel L808D7ECC /* 01684 808D7EF4 34A5CCCD */ ori $a1, $a1, 0xCCCD ## $a1 = 3ECCCCCD /* 01688 808D7EF8 260401E0 */ addiu $a0, $s0, 0x01E0 ## $a0 = 000001E0 /* 0168C 808D7EFC 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 01690 808D7F00 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 01694 808D7F04 3C074023 */ lui $a3, 0x4023 ## $a3 = 40230000 /* 01698 808D7F08 34E73333 */ ori $a3, $a3, 0x3333 ## $a3 = 40233333 /* 0169C 808D7F0C 260401D4 */ addiu $a0, $s0, 0x01D4 ## $a0 = 000001D4 /* 016A0 808D7F10 3C05432A */ lui $a1, 0x432A ## $a1 = 432A0000 /* 016A4 808D7F14 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 016A8 808D7F18 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 016AC 808D7F1C 260401DC */ addiu $a0, $s0, 0x01DC ## $a0 = 000001DC /* 016B0 808D7F20 3C054348 */ lui $a1, 0x4348 ## $a1 = 43480000 /* 016B4 808D7F24 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 016B8 808D7F28 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 016BC 808D7F2C 3C074040 */ lui $a3, 0x4040 ## $a3 = 40400000 /* 016C0 808D7F30 8E030674 */ lw $v1, 0x0674($s0) ## 00000674 /* 016C4 808D7F34 240A0041 */ addiu $t2, $zero, 0x0041 ## $t2 = 00000041 /* 016C8 808D7F38 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 016CC 808D7F3C 2C61001E */ sltiu $at, $v1, 0x001E -/* 016D0 808D7F40 54200004 */ bnel $at, $zero, .L808D7F54 +/* 016CC 808D7F3C 2C61001E */ sltiu $at, $v1, 0x001E +/* 016D0 808D7F40 54200004 */ bnel $at, $zero, .L808D7F54 /* 016D4 808D7F44 2401001E */ addiu $at, $zero, 0x001E ## $at = 0000001E /* 016D8 808D7F48 A20A01A0 */ sb $t2, 0x01A0($s0) ## 000001A0 /* 016DC 808D7F4C 8E030674 */ lw $v1, 0x0674($s0) ## 00000674 /* 016E0 808D7F50 2401001E */ addiu $at, $zero, 0x001E ## $at = 0000001E .L808D7F54: -/* 016E4 808D7F54 14610006 */ bne $v1, $at, .L808D7F70 -/* 016E8 808D7F58 8FAB0074 */ lw $t3, 0x0074($sp) +/* 016E4 808D7F54 14610006 */ bne $v1, $at, .L808D7F70 +/* 016E8 808D7F58 8FAB0074 */ lw $t3, 0x0074($sp) /* 016EC 808D7F5C 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 /* 016F0 808D7F60 44819000 */ mtc1 $at, $f18 ## $f18 = 1.00 /* 016F4 808D7F64 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 016F8 808D7F68 002B0821 */ addu $at, $at, $t3 +/* 016F8 808D7F68 002B0821 */ addu $at, $at, $t3 /* 016FC 808D7F6C E4320AFC */ swc1 $f18, 0x0AFC($at) ## 00010AFC .L808D7F70: -/* 01700 808D7F70 0C235E1F */ jal func_808D787C +/* 01700 808D7F70 0C235E1F */ jal func_808D787C /* 01704 808D7F74 24050004 */ addiu $a1, $zero, 0x0004 ## $a1 = 00000004 /* 01708 808D7F78 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 /* 0170C 808D7F7C 44813000 */ mtc1 $at, $f6 ## $f6 = 5.00 /* 01710 808D7F80 C6040680 */ lwc1 $f4, 0x0680($s0) ## 00000680 /* 01714 808D7F84 3C01C120 */ lui $at, 0xC120 ## $at = C1200000 /* 01718 808D7F88 44818000 */ mtc1 $at, $f16 ## $f16 = -10.00 -/* 0171C 808D7F8C 46062200 */ add.s $f8, $f4, $f6 +/* 0171C 808D7F8C 46062200 */ add.s $f8, $f4, $f6 /* 01720 808D7F90 3C014190 */ lui $at, 0x4190 ## $at = 41900000 /* 01724 808D7F94 C60A0688 */ lwc1 $f10, 0x0688($s0) ## 00000688 /* 01728 808D7F98 44813000 */ mtc1 $at, $f6 ## $f6 = 18.00 /* 0172C 808D7F9C C604068C */ lwc1 $f4, 0x068C($s0) ## 0000068C /* 01730 808D7FA0 E6080680 */ swc1 $f8, 0x0680($s0) ## 00000680 -/* 01734 808D7FA4 46105480 */ add.s $f18, $f10, $f16 +/* 01734 808D7FA4 46105480 */ add.s $f18, $f10, $f16 /* 01738 808D7FA8 8E0C0674 */ lw $t4, 0x0674($s0) ## 00000674 /* 0173C 808D7FAC 2401003C */ addiu $at, $zero, 0x003C ## $at = 0000003C -/* 01740 808D7FB0 46062200 */ add.s $f8, $f4, $f6 +/* 01740 808D7FB0 46062200 */ add.s $f8, $f4, $f6 /* 01744 808D7FB4 E6120688 */ swc1 $f18, 0x0688($s0) ## 00000688 /* 01748 808D7FB8 240D0008 */ addiu $t5, $zero, 0x0008 ## $t5 = 00000008 -/* 0174C 808D7FBC 158103C5 */ bne $t4, $at, .L808D8ED4 +/* 0174C 808D7FBC 158103C5 */ bne $t4, $at, .L808D8ED4 /* 01750 808D7FC0 E608068C */ swc1 $f8, 0x068C($s0) ## 0000068C /* 01754 808D7FC4 A60D0678 */ sh $t5, 0x0678($s0) ## 00000678 -/* 01758 808D7FC8 100003C2 */ beq $zero, $zero, .L808D8ED4 +/* 01758 808D7FC8 100003C2 */ beq $zero, $zero, .L808D8ED4 /* 0175C 808D7FCC AE000674 */ sw $zero, 0x0674($s0) ## 00000674 glabel L808D7FD0 /* 01760 808D7FD0 240E0003 */ addiu $t6, $zero, 0x0003 ## $t6 = 00000003 /* 01764 808D7FD4 A20E01A0 */ sb $t6, 0x01A0($s0) ## 000001A0 /* 01768 808D7FD8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0176C 808D7FDC 0C235E1F */ jal func_808D787C +/* 0176C 808D7FDC 0C235E1F */ jal func_808D787C /* 01770 808D7FE0 24050005 */ addiu $a1, $zero, 0x0005 ## $a1 = 00000005 /* 01774 808D7FE4 8E0F0674 */ lw $t7, 0x0674($s0) ## 00000674 /* 01778 808D7FE8 2401001E */ addiu $at, $zero, 0x001E ## $at = 0000001E /* 0177C 808D7FEC 24180009 */ addiu $t8, $zero, 0x0009 ## $t8 = 00000009 -/* 01780 808D7FF0 15E103B8 */ bne $t7, $at, .L808D8ED4 +/* 01780 808D7FF0 15E103B8 */ bne $t7, $at, .L808D8ED4 /* 01784 808D7FF4 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 01788 808D7FF8 A6180678 */ sh $t8, 0x0678($s0) ## 00000678 /* 0178C 808D7FFC AE000674 */ sw $zero, 0x0674($s0) ## 00000674 -/* 01790 808D8000 8FA40074 */ lw $a0, 0x0074($sp) -/* 01794 808D8004 0C00B7D5 */ jal func_8002DF54 +/* 01790 808D8000 8FA40074 */ lw $a0, 0x0074($sp) +/* 01794 808D8004 0C00B7D5 */ jal func_8002DF54 /* 01798 808D8008 24060008 */ addiu $a2, $zero, 0x0008 ## $a2 = 00000008 /* 0179C 808D800C 3C198090 */ lui $t9, %hi(D_808F93D4) ## $t9 = 80900000 -/* 017A0 808D8010 8F3993D4 */ lw $t9, %lo(D_808F93D4)($t9) +/* 017A0 808D8010 8F3993D4 */ lw $t9, %lo(D_808F93D4)($t9) /* 017A4 808D8014 3C014120 */ lui $at, 0x4120 ## $at = 41200000 /* 017A8 808D8018 44815000 */ mtc1 $at, $f10 ## $f10 = 10.00 /* 017AC 808D801C 3C01437F */ lui $at, 0x437F ## $at = 437F0000 @@ -493,24 +493,24 @@ glabel L808D7FD0 /* 017D0 808D8040 E60A01E0 */ swc1 $f10, 0x01E0($s0) ## 000001E0 /* 017D4 808D8044 E61201D4 */ swc1 $f18, 0x01D4($s0) ## 000001D4 /* 017D8 808D8048 E61001D8 */ swc1 $f16, 0x01D8($s0) ## 000001D8 -/* 017DC 808D804C 0C01E221 */ jal func_80078884 +/* 017DC 808D804C 0C01E221 */ jal func_80078884 /* 017E0 808D8050 E60401DC */ swc1 $f4, 0x01DC($s0) ## 000001DC -/* 017E4 808D8054 8FA90074 */ lw $t1, 0x0074($sp) +/* 017E4 808D8054 8FA90074 */ lw $t1, 0x0074($sp) /* 017E8 808D8058 44803000 */ mtc1 $zero, $f6 ## $f6 = 0.00 /* 017EC 808D805C 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 017F0 808D8060 00290821 */ addu $at, $at, $t1 +/* 017F0 808D8060 00290821 */ addu $at, $at, $t1 /* 017F4 808D8064 E4260AFC */ swc1 $f6, 0x0AFC($at) ## 00010AFC glabel L808D8068 /* 017F8 808D8068 240A0007 */ addiu $t2, $zero, 0x0007 ## $t2 = 00000007 /* 017FC 808D806C A20A01A0 */ sb $t2, 0x01A0($s0) ## 000001A0 /* 01800 808D8070 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01804 808D8074 0C235E1F */ jal func_808D787C +/* 01804 808D8074 0C235E1F */ jal func_808D787C /* 01808 808D8078 24050006 */ addiu $a1, $zero, 0x0006 ## $a1 = 00000006 /* 0180C 808D807C 260401D8 */ addiu $a0, $s0, 0x01D8 ## $a0 = 000001D8 /* 01810 808D8080 3C05437F */ lui $a1, 0x437F ## $a1 = 437F0000 /* 01814 808D8084 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 01818 808D8088 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 0181C 808D808C 3C074120 */ lui $a3, 0x4120 ## $a3 = 41200000 /* 01820 808D8090 3C053ECC */ lui $a1, 0x3ECC ## $a1 = 3ECC0000 /* 01824 808D8094 3C073E99 */ lui $a3, 0x3E99 ## $a3 = 3E990000 @@ -518,149 +518,149 @@ glabel L808D8068 /* 0182C 808D809C 34A5CCCD */ ori $a1, $a1, 0xCCCD ## $a1 = 3ECCCCCD /* 01830 808D80A0 260401E0 */ addiu $a0, $s0, 0x01E0 ## $a0 = 000001E0 /* 01834 808D80A4 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 01838 808D80A8 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 0183C 808D80AC 3C074023 */ lui $a3, 0x4023 ## $a3 = 40230000 /* 01840 808D80B0 34E73333 */ ori $a3, $a3, 0x3333 ## $a3 = 40233333 /* 01844 808D80B4 260401D4 */ addiu $a0, $s0, 0x01D4 ## $a0 = 000001D4 /* 01848 808D80B8 3C05432A */ lui $a1, 0x432A ## $a1 = 432A0000 /* 0184C 808D80BC 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 01850 808D80C0 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 01854 808D80C4 260401DC */ addiu $a0, $s0, 0x01DC ## $a0 = 000001DC /* 01858 808D80C8 3C054348 */ lui $a1, 0x4348 ## $a1 = 43480000 /* 0185C 808D80CC 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 01860 808D80D0 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 01864 808D80D4 3C074040 */ lui $a3, 0x4040 ## $a3 = 40400000 /* 01868 808D80D8 8E030674 */ lw $v1, 0x0674($s0) ## 00000674 /* 0186C 808D80DC 2401001E */ addiu $at, $zero, 0x001E ## $at = 0000001E /* 01870 808D80E0 3C0C8090 */ lui $t4, %hi(D_808F93D4) ## $t4 = 80900000 -/* 01874 808D80E4 14610005 */ bne $v1, $at, .L808D80FC +/* 01874 808D80E4 14610005 */ bne $v1, $at, .L808D80FC /* 01878 808D80E8 240D004B */ addiu $t5, $zero, 0x004B ## $t5 = 0000004B -/* 0187C 808D80EC 8D8C93D4 */ lw $t4, %lo(D_808F93D4)($t4) +/* 0187C 808D80EC 8D8C93D4 */ lw $t4, %lo(D_808F93D4)($t4) /* 01880 808D80F0 240B0001 */ addiu $t3, $zero, 0x0001 ## $t3 = 00000001 /* 01884 808D80F4 A18B03C8 */ sb $t3, 0x03C8($t4) ## 809003C8 /* 01888 808D80F8 8E030674 */ lw $v1, 0x0674($s0) ## 00000674 .L808D80FC: -/* 0188C 808D80FC 2C610020 */ sltiu $at, $v1, 0x0020 -/* 01890 808D8100 14200003 */ bne $at, $zero, .L808D8110 +/* 0188C 808D80FC 2C610020 */ sltiu $at, $v1, 0x0020 +/* 01890 808D8100 14200003 */ bne $at, $zero, .L808D8110 /* 01894 808D8104 240F000A */ addiu $t7, $zero, 0x000A ## $t7 = 0000000A /* 01898 808D8108 A20D01A0 */ sb $t5, 0x01A0($s0) ## 000001A0 /* 0189C 808D810C 8E030674 */ lw $v1, 0x0674($s0) ## 00000674 .L808D8110: /* 018A0 808D8110 24010020 */ addiu $at, $zero, 0x0020 ## $at = 00000020 -/* 018A4 808D8114 14610007 */ bne $v1, $at, .L808D8134 -/* 018A8 808D8118 8FAE0074 */ lw $t6, 0x0074($sp) +/* 018A4 808D8114 14610007 */ bne $v1, $at, .L808D8134 +/* 018A8 808D8118 8FAE0074 */ lw $t6, 0x0074($sp) /* 018AC 808D811C 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 /* 018B0 808D8120 44814000 */ mtc1 $at, $f8 ## $f8 = 1.00 /* 018B4 808D8124 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 018B8 808D8128 002E0821 */ addu $at, $at, $t6 +/* 018B8 808D8128 002E0821 */ addu $at, $at, $t6 /* 018BC 808D812C E4280AFC */ swc1 $f8, 0x0AFC($at) ## 00010AFC /* 018C0 808D8130 8E030674 */ lw $v1, 0x0674($s0) ## 00000674 .L808D8134: /* 018C4 808D8134 24010032 */ addiu $at, $zero, 0x0032 ## $at = 00000032 -/* 018C8 808D8138 54610367 */ bnel $v1, $at, .L808D8ED8 +/* 018C8 808D8138 54610367 */ bnel $v1, $at, .L808D8ED8 /* 018CC 808D813C 8605067A */ lh $a1, 0x067A($s0) ## 0000067A /* 018D0 808D8140 A60F0678 */ sh $t7, 0x0678($s0) ## 00000678 -/* 018D4 808D8144 10000363 */ beq $zero, $zero, .L808D8ED4 +/* 018D4 808D8144 10000363 */ beq $zero, $zero, .L808D8ED4 /* 018D8 808D8148 AE000674 */ sw $zero, 0x0674($s0) ## 00000674 glabel L808D814C /* 018DC 808D814C 24180003 */ addiu $t8, $zero, 0x0003 ## $t8 = 00000003 /* 018E0 808D8150 A21801A0 */ sb $t8, 0x01A0($s0) ## 000001A0 /* 018E4 808D8154 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 018E8 808D8158 0C235E1F */ jal func_808D787C +/* 018E8 808D8158 0C235E1F */ jal func_808D787C /* 018EC 808D815C 24050007 */ addiu $a1, $zero, 0x0007 ## $a1 = 00000007 /* 018F0 808D8160 8E190674 */ lw $t9, 0x0674($s0) ## 00000674 /* 018F4 808D8164 24010028 */ addiu $at, $zero, 0x0028 ## $at = 00000028 /* 018F8 808D8168 2408000B */ addiu $t0, $zero, 0x000B ## $t0 = 0000000B -/* 018FC 808D816C 5721035A */ bnel $t9, $at, .L808D8ED8 +/* 018FC 808D816C 5721035A */ bnel $t9, $at, .L808D8ED8 /* 01900 808D8170 8605067A */ lh $a1, 0x067A($s0) ## 0000067A /* 01904 808D8174 44805000 */ mtc1 $zero, $f10 ## $f10 = 0.00 /* 01908 808D8178 A6080678 */ sh $t0, 0x0678($s0) ## 00000678 /* 0190C 808D817C AE000674 */ sw $zero, 0x0674($s0) ## 00000674 -/* 01910 808D8180 10000354 */ beq $zero, $zero, .L808D8ED4 +/* 01910 808D8180 10000354 */ beq $zero, $zero, .L808D8ED4 /* 01914 808D8184 E60A01D8 */ swc1 $f10, 0x01D8($s0) ## 000001D8 glabel L808D8188 /* 01918 808D8188 24090003 */ addiu $t1, $zero, 0x0003 ## $t1 = 00000003 /* 0191C 808D818C A20901A0 */ sb $t1, 0x01A0($s0) ## 000001A0 /* 01920 808D8190 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01924 808D8194 0C235E1F */ jal func_808D787C +/* 01924 808D8194 0C235E1F */ jal func_808D787C /* 01928 808D8198 24050008 */ addiu $a1, $zero, 0x0008 ## $a1 = 00000008 /* 0192C 808D819C 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 /* 01930 808D81A0 44818000 */ mtc1 $at, $f16 ## $f16 = 20.00 -/* 01934 808D81A4 8FAA0068 */ lw $t2, 0x0068($sp) +/* 01934 808D81A4 8FAA0068 */ lw $t2, 0x0068($sp) /* 01938 808D81A8 24010014 */ addiu $at, $zero, 0x0014 ## $at = 00000014 /* 0193C 808D81AC 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 01940 808D81B0 E550002C */ swc1 $f16, 0x002C($t2) ## 0000002C /* 01944 808D81B4 8E030674 */ lw $v1, 0x0674($s0) ## 00000674 -/* 01948 808D81B8 8FA40074 */ lw $a0, 0x0074($sp) -/* 0194C 808D81BC 54610007 */ bnel $v1, $at, .L808D81DC +/* 01948 808D81B8 8FA40074 */ lw $a0, 0x0074($sp) +/* 0194C 808D81BC 54610007 */ bnel $v1, $at, .L808D81DC /* 01950 808D81C0 24010019 */ addiu $at, $zero, 0x0019 ## $at = 00000019 -/* 01954 808D81C4 0C00B7D5 */ jal func_8002DF54 +/* 01954 808D81C4 0C00B7D5 */ jal func_8002DF54 /* 01958 808D81C8 24060017 */ addiu $a2, $zero, 0x0017 ## $a2 = 00000017 -/* 0195C 808D81CC 0C020978 */ jal Interface_ChangeAlpha +/* 0195C 808D81CC 0C020978 */ jal Interface_ChangeAlpha /* 01960 808D81D0 2404000B */ addiu $a0, $zero, 0x000B ## $a0 = 0000000B /* 01964 808D81D4 8E030674 */ lw $v1, 0x0674($s0) ## 00000674 /* 01968 808D81D8 24010019 */ addiu $at, $zero, 0x0019 ## $at = 00000019 .L808D81DC: -/* 0196C 808D81DC 14610004 */ bne $v1, $at, .L808D81F0 +/* 0196C 808D81DC 14610004 */ bne $v1, $at, .L808D81F0 /* 01970 808D81E0 240B0140 */ addiu $t3, $zero, 0x0140 ## $t3 = 00000140 /* 01974 808D81E4 3C018016 */ lui $at, 0x8016 ## $at = 80160000 /* 01978 808D81E8 A42BFA84 */ sh $t3, -0x057C($at) ## 8015FA84 /* 0197C 808D81EC 8E030674 */ lw $v1, 0x0674($s0) ## 00000674 .L808D81F0: /* 01980 808D81F0 24010064 */ addiu $at, $zero, 0x0064 ## $at = 00000064 -/* 01984 808D81F4 54610005 */ bnel $v1, $at, .L808D820C +/* 01984 808D81F4 54610005 */ bnel $v1, $at, .L808D820C /* 01988 808D81F8 24010078 */ addiu $at, $zero, 0x0078 ## $at = 00000078 -/* 0198C 808D81FC 0C020978 */ jal Interface_ChangeAlpha +/* 0198C 808D81FC 0C020978 */ jal Interface_ChangeAlpha /* 01990 808D8200 24040001 */ addiu $a0, $zero, 0x0001 ## $a0 = 00000001 /* 01994 808D8204 8E030674 */ lw $v1, 0x0674($s0) ## 00000674 /* 01998 808D8208 24010078 */ addiu $at, $zero, 0x0078 ## $at = 00000078 .L808D820C: -/* 0199C 808D820C 14610331 */ bne $v1, $at, .L808D8ED4 +/* 0199C 808D820C 14610331 */ bne $v1, $at, .L808D8ED4 /* 019A0 808D8210 240C000C */ addiu $t4, $zero, 0x000C ## $t4 = 0000000C /* 019A4 808D8214 A60C0678 */ sh $t4, 0x0678($s0) ## 00000678 -/* 019A8 808D8218 1000032E */ beq $zero, $zero, .L808D8ED4 +/* 019A8 808D8218 1000032E */ beq $zero, $zero, .L808D8ED4 /* 019AC 808D821C AE000674 */ sw $zero, 0x0674($s0) ## 00000674 glabel L808D8220 /* 019B0 808D8220 240D0003 */ addiu $t5, $zero, 0x0003 ## $t5 = 00000003 /* 019B4 808D8224 A20D01A0 */ sb $t5, 0x01A0($s0) ## 000001A0 /* 019B8 808D8228 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 019BC 808D822C 0C235E1F */ jal func_808D787C +/* 019BC 808D822C 0C235E1F */ jal func_808D787C /* 019C0 808D8230 24050009 */ addiu $a1, $zero, 0x0009 ## $a1 = 00000009 /* 019C4 808D8234 8E030674 */ lw $v1, 0x0674($s0) ## 00000674 /* 019C8 808D8238 2401001E */ addiu $at, $zero, 0x001E ## $at = 0000001E /* 019CC 808D823C 3C041001 */ lui $a0, 0x1001 ## $a0 = 10010000 -/* 019D0 808D8240 54610010 */ bnel $v1, $at, .L808D8284 -/* 019D4 808D8244 2C61001F */ sltiu $at, $v1, 0x001F +/* 019D0 808D8240 54610010 */ bnel $v1, $at, .L808D8284 +/* 019D4 808D8244 2C61001F */ sltiu $at, $v1, 0x001F /* 019D8 808D8248 0C03E803 */ jal Audio_SetBGM - + /* 019DC 808D824C 348400FF */ ori $a0, $a0, 0x00FF ## $a0 = 100100FF /* 019E0 808D8250 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 /* 019E4 808D8254 0C028800 */ jal SkelAnime_GetFrameCount - + /* 019E8 808D8258 24844F64 */ addiu $a0, $a0, 0x4F64 ## $a0 = 06004F64 /* 019EC 808D825C 44829000 */ mtc1 $v0, $f18 ## $f18 = 0.00 /* 019F0 808D8260 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 019F4 808D8264 24A54F64 */ addiu $a1, $a1, 0x4F64 ## $a1 = 06004F64 -/* 019F8 808D8268 46809120 */ cvt.s.w $f4, $f18 +/* 019F8 808D8268 46809120 */ cvt.s.w $f4, $f18 /* 019FC 808D826C 3C06C0A0 */ lui $a2, 0xC0A0 ## $a2 = C0A00000 /* 01A00 808D8270 E60401CC */ swc1 $f4, 0x01CC($s0) ## 000001CC -/* 01A04 808D8274 0C029490 */ jal func_800A5240 -/* 01A08 808D8278 8FA4004C */ lw $a0, 0x004C($sp) +/* 01A04 808D8274 0C029490 */ jal SkelAnime_ChangeAnimTransitionStop +/* 01A08 808D8278 8FA4004C */ lw $a0, 0x004C($sp) /* 01A0C 808D827C 8E030674 */ lw $v1, 0x0674($s0) ## 00000674 -/* 01A10 808D8280 2C61001F */ sltiu $at, $v1, 0x001F +/* 01A10 808D8280 2C61001F */ sltiu $at, $v1, 0x001F .L808D8284: -/* 01A14 808D8284 1420000D */ bne $at, $zero, .L808D82BC -/* 01A18 808D8288 8FA4004C */ lw $a0, 0x004C($sp) -/* 01A1C 808D828C 0C0295B2 */ jal func_800A56C8 +/* 01A14 808D8284 1420000D */ bne $at, $zero, .L808D82BC +/* 01A18 808D8288 8FA4004C */ lw $a0, 0x004C($sp) +/* 01A1C 808D828C 0C0295B2 */ jal func_800A56C8 /* 01A20 808D8290 8E0501CC */ lw $a1, 0x01CC($s0) ## 000001CC -/* 01A24 808D8294 10400009 */ beq $v0, $zero, .L808D82BC -/* 01A28 808D8298 8FA4004C */ lw $a0, 0x004C($sp) +/* 01A24 808D8294 10400009 */ beq $v0, $zero, .L808D82BC +/* 01A28 808D8298 8FA4004C */ lw $a0, 0x004C($sp) /* 01A2C 808D829C 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 01A30 808D82A0 24A56AF4 */ addiu $a1, $a1, 0x6AF4 ## $a1 = 06006AF4 -/* 01A34 808D82A4 0C0294D3 */ jal func_800A534C +/* 01A34 808D82A4 0C0294D3 */ jal SkelAnime_ChangeAnimTransitionRepeat /* 01A38 808D82A8 24060000 */ addiu $a2, $zero, 0x0000 ## $a2 = 00000000 /* 01A3C 808D82AC 3C01447A */ lui $at, 0x447A ## $at = 447A0000 /* 01A40 808D82B0 44813000 */ mtc1 $at, $f6 ## $f6 = 1000.00 @@ -669,100 +669,100 @@ glabel L808D8220 .L808D82BC: /* 01A4C 808D82BC 8E030674 */ lw $v1, 0x0674($s0) ## 00000674 /* 01A50 808D82C0 24010050 */ addiu $at, $zero, 0x0050 ## $at = 00000050 -/* 01A54 808D82C4 8FA40074 */ lw $a0, 0x0074($sp) -/* 01A58 808D82C8 14610004 */ bne $v1, $at, .L808D82DC +/* 01A54 808D82C4 8FA40074 */ lw $a0, 0x0074($sp) +/* 01A58 808D82C8 14610004 */ bne $v1, $at, .L808D82DC /* 01A5C 808D82CC 240570C8 */ addiu $a1, $zero, 0x70C8 ## $a1 = 000070C8 -/* 01A60 808D82D0 0C042DA0 */ jal func_8010B680 +/* 01A60 808D82D0 0C042DA0 */ jal func_8010B680 /* 01A64 808D82D4 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 /* 01A68 808D82D8 8E030674 */ lw $v1, 0x0674($s0) ## 00000674 .L808D82DC: -/* 01A6C 808D82DC 2C6100B5 */ sltiu $at, $v1, 0x00B5 -/* 01A70 808D82E0 142002FC */ bne $at, $zero, .L808D8ED4 -/* 01A74 808D82E4 8FA40074 */ lw $a0, 0x0074($sp) -/* 01A78 808D82E8 0C042F6F */ jal func_8010BDBC +/* 01A6C 808D82DC 2C6100B5 */ sltiu $at, $v1, 0x00B5 +/* 01A70 808D82E0 142002FC */ bne $at, $zero, .L808D8ED4 +/* 01A74 808D82E4 8FA40074 */ lw $a0, 0x0074($sp) +/* 01A78 808D82E8 0C042F6F */ jal func_8010BDBC /* 01A7C 808D82EC 248420D8 */ addiu $a0, $a0, 0x20D8 ## $a0 = 000020D8 -/* 01A80 808D82F0 144002F8 */ bne $v0, $zero, .L808D8ED4 +/* 01A80 808D82F0 144002F8 */ bne $v0, $zero, .L808D8ED4 /* 01A84 808D82F4 240E000F */ addiu $t6, $zero, 0x000F ## $t6 = 0000000F /* 01A88 808D82F8 A60E0678 */ sh $t6, 0x0678($s0) ## 00000678 /* 01A8C 808D82FC AE000674 */ sw $zero, 0x0674($s0) ## 00000674 -/* 01A90 808D8300 100002F4 */ beq $zero, $zero, .L808D8ED4 +/* 01A90 808D8300 100002F4 */ beq $zero, $zero, .L808D8ED4 /* 01A94 808D8304 A200071A */ sb $zero, 0x071A($s0) ## 0000071A glabel L808D8308 /* 01A98 808D8308 A20001A0 */ sb $zero, 0x01A0($s0) ## 000001A0 -/* 01A9C 808D830C 8FAF0074 */ lw $t7, 0x0074($sp) +/* 01A9C 808D830C 8FAF0074 */ lw $t7, 0x0074($sp) /* 01AA0 808D8310 44804000 */ mtc1 $zero, $f8 ## $f8 = 0.00 /* 01AA4 808D8314 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 01AA8 808D8318 002F0821 */ addu $at, $at, $t7 +/* 01AA8 808D8318 002F0821 */ addu $at, $at, $t7 /* 01AAC 808D831C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 01AB0 808D8320 2405000A */ addiu $a1, $zero, 0x000A ## $a1 = 0000000A -/* 01AB4 808D8324 0C235E1F */ jal func_808D787C +/* 01AB4 808D8324 0C235E1F */ jal func_808D787C /* 01AB8 808D8328 E4280AFC */ swc1 $f8, 0x0AFC($at) ## 00010AFC /* 01ABC 808D832C 8E030674 */ lw $v1, 0x0674($s0) ## 00000674 /* 01AC0 808D8330 2401001E */ addiu $at, $zero, 0x001E ## $at = 0000001E -/* 01AC4 808D8334 8FA40074 */ lw $a0, 0x0074($sp) -/* 01AC8 808D8338 14610004 */ bne $v1, $at, .L808D834C +/* 01AC4 808D8334 8FA40074 */ lw $a0, 0x0074($sp) +/* 01AC8 808D8338 14610004 */ bne $v1, $at, .L808D834C /* 01ACC 808D833C 240570C9 */ addiu $a1, $zero, 0x70C9 ## $a1 = 000070C9 -/* 01AD0 808D8340 0C042DA0 */ jal func_8010B680 +/* 01AD0 808D8340 0C042DA0 */ jal func_8010B680 /* 01AD4 808D8344 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 /* 01AD8 808D8348 8E030674 */ lw $v1, 0x0674($s0) ## 00000674 .L808D834C: -/* 01ADC 808D834C 2C610065 */ sltiu $at, $v1, 0x0065 -/* 01AE0 808D8350 142002E0 */ bne $at, $zero, .L808D8ED4 -/* 01AE4 808D8354 8FA40074 */ lw $a0, 0x0074($sp) -/* 01AE8 808D8358 0C042F6F */ jal func_8010BDBC +/* 01ADC 808D834C 2C610065 */ sltiu $at, $v1, 0x0065 +/* 01AE0 808D8350 142002E0 */ bne $at, $zero, .L808D8ED4 +/* 01AE4 808D8354 8FA40074 */ lw $a0, 0x0074($sp) +/* 01AE8 808D8358 0C042F6F */ jal func_8010BDBC /* 01AEC 808D835C 248420D8 */ addiu $a0, $a0, 0x20D8 ## $a0 = 000020D8 -/* 01AF0 808D8360 144002DC */ bne $v0, $zero, .L808D8ED4 +/* 01AF0 808D8360 144002DC */ bne $v0, $zero, .L808D8ED4 /* 01AF4 808D8364 24180010 */ addiu $t8, $zero, 0x0010 ## $t8 = 00000010 /* 01AF8 808D8368 A6180678 */ sh $t8, 0x0678($s0) ## 00000678 /* 01AFC 808D836C AE000674 */ sw $zero, 0x0674($s0) ## 00000674 /* 01B00 808D8370 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01B04 808D8374 0C235E1F */ jal func_808D787C +/* 01B04 808D8374 0C235E1F */ jal func_808D787C /* 01B08 808D8378 2405000B */ addiu $a1, $zero, 0x000B ## $a1 = 0000000B /* 01B0C 808D837C 24020002 */ addiu $v0, $zero, 0x0002 ## $v0 = 00000002 /* 01B10 808D8380 A2020198 */ sb $v0, 0x0198($s0) ## 00000198 /* 01B14 808D8384 3C198090 */ lui $t9, %hi(D_808F93D4) ## $t9 = 80900000 -/* 01B18 808D8388 8F3993D4 */ lw $t9, %lo(D_808F93D4)($t9) +/* 01B18 808D8388 8F3993D4 */ lw $t9, %lo(D_808F93D4)($t9) /* 01B1C 808D838C 2408006E */ addiu $t0, $zero, 0x006E ## $t0 = 0000006E /* 01B20 808D8390 24090003 */ addiu $t1, $zero, 0x0003 ## $t1 = 00000003 /* 01B24 808D8394 A32203C8 */ sb $v0, 0x03C8($t9) ## 809003C8 /* 01B28 808D8398 A60801BA */ sh $t0, 0x01BA($s0) ## 000001BA -/* 01B2C 808D839C 100002CD */ beq $zero, $zero, .L808D8ED4 +/* 01B2C 808D839C 100002CD */ beq $zero, $zero, .L808D8ED4 /* 01B30 808D83A0 A20901A0 */ sb $t1, 0x01A0($s0) ## 000001A0 glabel L808D83A4 /* 01B34 808D83A4 8E030674 */ lw $v1, 0x0674($s0) ## 00000674 /* 01B38 808D83A8 240A0003 */ addiu $t2, $zero, 0x0003 ## $t2 = 00000003 /* 01B3C 808D83AC A20A01A0 */ sb $t2, 0x01A0($s0) ## 000001A0 -/* 01B40 808D83B0 2C610015 */ sltiu $at, $v1, 0x0015 -/* 01B44 808D83B4 10200010 */ beq $at, $zero, .L808D83F8 -/* 01B48 808D83B8 8FA4004C */ lw $a0, 0x004C($sp) +/* 01B40 808D83B0 2C610015 */ sltiu $at, $v1, 0x0015 +/* 01B44 808D83B4 10200010 */ beq $at, $zero, .L808D83F8 +/* 01B48 808D83B8 8FA4004C */ lw $a0, 0x004C($sp) /* 01B4C 808D83BC 24010014 */ addiu $at, $zero, 0x0014 ## $at = 00000014 -/* 01B50 808D83C0 1461001D */ bne $v1, $at, .L808D8438 -/* 01B54 808D83C4 8FA4004C */ lw $a0, 0x004C($sp) +/* 01B50 808D83C0 1461001D */ bne $v1, $at, .L808D8438 +/* 01B54 808D83C4 8FA4004C */ lw $a0, 0x004C($sp) /* 01B58 808D83C8 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 01B5C 808D83CC 24A54304 */ addiu $a1, $a1, 0x4304 ## $a1 = 06004304 -/* 01B60 808D83D0 0C029490 */ jal func_800A5240 +/* 01B60 808D83D0 0C029490 */ jal SkelAnime_ChangeAnimTransitionStop /* 01B64 808D83D4 3C06C0A0 */ lui $a2, 0xC0A0 ## $a2 = C0A00000 /* 01B68 808D83D8 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 /* 01B6C 808D83DC 0C028800 */ jal SkelAnime_GetFrameCount - + /* 01B70 808D83E0 24844304 */ addiu $a0, $a0, 0x4304 ## $a0 = 06004304 /* 01B74 808D83E4 44825000 */ mtc1 $v0, $f10 ## $f10 = 0.00 /* 01B78 808D83E8 00000000 */ nop -/* 01B7C 808D83EC 46805420 */ cvt.s.w $f16, $f10 -/* 01B80 808D83F0 10000011 */ beq $zero, $zero, .L808D8438 +/* 01B7C 808D83EC 46805420 */ cvt.s.w $f16, $f10 +/* 01B80 808D83F0 10000011 */ beq $zero, $zero, .L808D8438 /* 01B84 808D83F4 E61001CC */ swc1 $f16, 0x01CC($s0) ## 000001CC .L808D83F8: -/* 01B88 808D83F8 0C0295B2 */ jal func_800A56C8 +/* 01B88 808D83F8 0C0295B2 */ jal func_800A56C8 /* 01B8C 808D83FC 8E0501CC */ lw $a1, 0x01CC($s0) ## 000001CC -/* 01B90 808D8400 1040000D */ beq $v0, $zero, .L808D8438 -/* 01B94 808D8404 8FA40074 */ lw $a0, 0x0074($sp) +/* 01B90 808D8400 1040000D */ beq $v0, $zero, .L808D8438 +/* 01B94 808D8404 8FA40074 */ lw $a0, 0x0074($sp) /* 01B98 808D8408 240570CA */ addiu $a1, $zero, 0x70CA ## $a1 = 000070CA -/* 01B9C 808D840C 0C042DA0 */ jal func_8010B680 +/* 01B9C 808D840C 0C042DA0 */ jal func_8010B680 /* 01BA0 808D8410 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 /* 01BA4 808D8414 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 /* 01BA8 808D8418 24A589F8 */ addiu $a1, $a1, 0x89F8 ## $a1 = 060089F8 -/* 01BAC 808D841C 8FA4004C */ lw $a0, 0x004C($sp) -/* 01BB0 808D8420 0C0294D3 */ jal func_800A534C +/* 01BAC 808D841C 8FA4004C */ lw $a0, 0x004C($sp) +/* 01BB0 808D8420 0C0294D3 */ jal SkelAnime_ChangeAnimTransitionRepeat /* 01BB4 808D8424 3C06C0A0 */ lui $a2, 0xC0A0 ## $a2 = C0A00000 /* 01BB8 808D8428 3C01447A */ lui $at, 0x447A ## $at = 447A0000 /* 01BBC 808D842C 44819000 */ mtc1 $at, $f18 ## $f18 = 1000.00 @@ -770,131 +770,131 @@ glabel L808D83A4 /* 01BC4 808D8434 E61201CC */ swc1 $f18, 0x01CC($s0) ## 000001CC .L808D8438: /* 01BC8 808D8438 8E0B0674 */ lw $t3, 0x0674($s0) ## 00000674 -/* 01BCC 808D843C 8FA40074 */ lw $a0, 0x0074($sp) -/* 01BD0 808D8440 2D610065 */ sltiu $at, $t3, 0x0065 -/* 01BD4 808D8444 542002A4 */ bnel $at, $zero, .L808D8ED8 +/* 01BCC 808D843C 8FA40074 */ lw $a0, 0x0074($sp) +/* 01BD0 808D8440 2D610065 */ sltiu $at, $t3, 0x0065 +/* 01BD4 808D8444 542002A4 */ bnel $at, $zero, .L808D8ED8 /* 01BD8 808D8448 8605067A */ lh $a1, 0x067A($s0) ## 0000067A -/* 01BDC 808D844C 0C042F6F */ jal func_8010BDBC +/* 01BDC 808D844C 0C042F6F */ jal func_8010BDBC /* 01BE0 808D8450 248420D8 */ addiu $a0, $a0, 0x20D8 ## $a0 = 000020D8 -/* 01BE4 808D8454 1440029F */ bne $v0, $zero, .L808D8ED4 +/* 01BE4 808D8454 1440029F */ bne $v0, $zero, .L808D8ED4 /* 01BE8 808D8458 240C0011 */ addiu $t4, $zero, 0x0011 ## $t4 = 00000011 /* 01BEC 808D845C A60C0678 */ sh $t4, 0x0678($s0) ## 00000678 -/* 01BF0 808D8460 1000029C */ beq $zero, $zero, .L808D8ED4 +/* 01BF0 808D8460 1000029C */ beq $zero, $zero, .L808D8ED4 /* 01BF4 808D8464 AE000674 */ sw $zero, 0x0674($s0) ## 00000674 glabel L808D8468 /* 01BF8 808D8468 8E030674 */ lw $v1, 0x0674($s0) ## 00000674 /* 01BFC 808D846C 240D0003 */ addiu $t5, $zero, 0x0003 ## $t5 = 00000003 /* 01C00 808D8470 24010014 */ addiu $at, $zero, 0x0014 ## $at = 00000014 -/* 01C04 808D8474 1461000D */ bne $v1, $at, .L808D84AC +/* 01C04 808D8474 1461000D */ bne $v1, $at, .L808D84AC /* 01C08 808D8478 A20D01A0 */ sb $t5, 0x01A0($s0) ## 000001A0 /* 01C0C 808D847C 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 01C10 808D8480 24A51F58 */ addiu $a1, $a1, 0x1F58 ## $a1 = 06001F58 -/* 01C14 808D8484 8FA4004C */ lw $a0, 0x004C($sp) -/* 01C18 808D8488 0C029490 */ jal func_800A5240 +/* 01C14 808D8484 8FA4004C */ lw $a0, 0x004C($sp) +/* 01C18 808D8488 0C029490 */ jal SkelAnime_ChangeAnimTransitionStop /* 01C1C 808D848C 3C06C0A0 */ lui $a2, 0xC0A0 ## $a2 = C0A00000 /* 01C20 808D8490 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 /* 01C24 808D8494 0C028800 */ jal SkelAnime_GetFrameCount - + /* 01C28 808D8498 24841F58 */ addiu $a0, $a0, 0x1F58 ## $a0 = 06001F58 /* 01C2C 808D849C 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 01C30 808D84A0 8E030674 */ lw $v1, 0x0674($s0) ## 00000674 -/* 01C34 808D84A4 468021A0 */ cvt.s.w $f6, $f4 +/* 01C34 808D84A4 468021A0 */ cvt.s.w $f6, $f4 /* 01C38 808D84A8 E60601CC */ swc1 $f6, 0x01CC($s0) ## 000001CC .L808D84AC: -/* 01C3C 808D84AC 2C61000B */ sltiu $at, $v1, 0x000B -/* 01C40 808D84B0 14200288 */ bne $at, $zero, .L808D8ED4 +/* 01C3C 808D84AC 2C61000B */ sltiu $at, $v1, 0x000B +/* 01C40 808D84B0 14200288 */ bne $at, $zero, .L808D8ED4 /* 01C44 808D84B4 2401003E */ addiu $at, $zero, 0x003E ## $at = 0000003E -/* 01C48 808D84B8 14610006 */ bne $v1, $at, .L808D84D4 +/* 01C48 808D84B8 14610006 */ bne $v1, $at, .L808D84D4 /* 01C4C 808D84BC 3C0E8090 */ lui $t6, %hi(D_808F93C0) ## $t6 = 80900000 /* 01C50 808D84C0 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 /* 01C54 808D84C4 44814000 */ mtc1 $at, $f8 ## $f8 = 20.00 -/* 01C58 808D84C8 8DCE93C0 */ lw $t6, %lo(D_808F93C0)($t6) +/* 01C58 808D84C8 8DCE93C0 */ lw $t6, %lo(D_808F93C0)($t6) /* 01C5C 808D84CC E5C816BC */ swc1 $f8, 0x16BC($t6) ## 809016BC /* 01C60 808D84D0 8E030674 */ lw $v1, 0x0674($s0) ## 00000674 .L808D84D4: /* 01C64 808D84D4 24010039 */ addiu $at, $zero, 0x0039 ## $at = 00000039 -/* 01C68 808D84D8 14610003 */ bne $v1, $at, .L808D84E8 +/* 01C68 808D84D8 14610003 */ bne $v1, $at, .L808D84E8 /* 01C6C 808D84DC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 01C70 808D84E0 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 01C74 808D84E4 240528C7 */ addiu $a1, $zero, 0x28C7 ## $a1 = 000028C7 .L808D84E8: /* 01C78 808D84E8 C60006EC */ lwc1 $f0, 0x06EC($s0) ## 000006EC /* 01C7C 808D84EC 3C063DCC */ lui $a2, 0x3DCC ## $a2 = 3DCC0000 /* 01C80 808D84F0 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3DCCCCCD -/* 01C84 808D84F4 46000280 */ add.s $f10, $f0, $f0 +/* 01C84 808D84F4 46000280 */ add.s $f10, $f0, $f0 /* 01C88 808D84F8 260406F4 */ addiu $a0, $s0, 0x06F4 ## $a0 = 000006F4 /* 01C8C 808D84FC 3C0542DC */ lui $a1, 0x42DC ## $a1 = 42DC0000 -/* 01C90 808D8500 44075000 */ mfc1 $a3, $f10 +/* 01C90 808D8500 44075000 */ mfc1 $a3, $f10 /* 01C94 808D8504 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 01C98 808D8508 00000000 */ nop /* 01C9C 808D850C 3C01808F */ lui $at, %hi(D_808F7ED4) ## $at = 808F0000 -/* 01CA0 808D8510 C4327ED4 */ lwc1 $f18, %lo(D_808F7ED4)($at) +/* 01CA0 808D8510 C4327ED4 */ lwc1 $f18, %lo(D_808F7ED4)($at) /* 01CA4 808D8514 C61006EC */ lwc1 $f16, 0x06EC($s0) ## 000006EC /* 01CA8 808D8518 3C063DCC */ lui $a2, 0x3DCC ## $a2 = 3DCC0000 /* 01CAC 808D851C 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3DCCCCCD -/* 01CB0 808D8520 46128102 */ mul.s $f4, $f16, $f18 +/* 01CB0 808D8520 46128102 */ mul.s $f4, $f16, $f18 /* 01CB4 808D8524 26040688 */ addiu $a0, $s0, 0x0688 ## $a0 = 00000688 /* 01CB8 808D8528 3C05C391 */ lui $a1, 0xC391 ## $a1 = C3910000 -/* 01CBC 808D852C 44072000 */ mfc1 $a3, $f4 +/* 01CBC 808D852C 44072000 */ mfc1 $a3, $f4 /* 01CC0 808D8530 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 01CC4 808D8534 00000000 */ nop /* 01CC8 808D8538 3C073D4C */ lui $a3, 0x3D4C ## $a3 = 3D4C0000 /* 01CCC 808D853C 34E7CCCD */ ori $a3, $a3, 0xCCCD ## $a3 = 3D4CCCCD /* 01CD0 808D8540 260406EC */ addiu $a0, $s0, 0x06EC ## $a0 = 000006EC /* 01CD4 808D8544 3C053F40 */ lui $a1, 0x3F40 ## $a1 = 3F400000 /* 01CD8 808D8548 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 01CDC 808D854C 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 01CE0 808D8550 8E0F0674 */ lw $t7, 0x0674($s0) ## 00000674 /* 01CE4 808D8554 24010046 */ addiu $at, $zero, 0x0046 ## $at = 00000046 /* 01CE8 808D8558 24180012 */ addiu $t8, $zero, 0x0012 ## $t8 = 00000012 -/* 01CEC 808D855C 15E1025D */ bne $t7, $at, .L808D8ED4 +/* 01CEC 808D855C 15E1025D */ bne $t7, $at, .L808D8ED4 /* 01CF0 808D8560 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 01CF4 808D8564 3C014270 */ lui $at, 0x4270 ## $at = 42700000 /* 01CF8 808D8568 44813000 */ mtc1 $at, $f6 ## $f6 = 60.00 /* 01CFC 808D856C A6180678 */ sh $t8, 0x0678($s0) ## 00000678 /* 01D00 808D8570 AE000674 */ sw $zero, 0x0674($s0) ## 00000674 /* 01D04 808D8574 2405000C */ addiu $a1, $zero, 0x000C ## $a1 = 0000000C -/* 01D08 808D8578 0C235E1F */ jal func_808D787C +/* 01D08 808D8578 0C235E1F */ jal func_808D787C /* 01D0C 808D857C E60606F4 */ swc1 $f6, 0x06F4($s0) ## 000006F4 -/* 01D10 808D8580 8FA40074 */ lw $a0, 0x0074($sp) +/* 01D10 808D8580 8FA40074 */ lw $a0, 0x0074($sp) /* 01D14 808D8584 240570CB */ addiu $a1, $zero, 0x70CB ## $a1 = 000070CB -/* 01D18 808D8588 0C042DA0 */ jal func_8010B680 +/* 01D18 808D8588 0C042DA0 */ jal func_8010B680 /* 01D1C 808D858C 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 01D20 808D8590 10000251 */ beq $zero, $zero, .L808D8ED8 +/* 01D20 808D8590 10000251 */ beq $zero, $zero, .L808D8ED8 /* 01D24 808D8594 8605067A */ lh $a1, 0x067A($s0) ## 0000067A glabel L808D8598 /* 01D28 808D8598 24190003 */ addiu $t9, $zero, 0x0003 ## $t9 = 00000003 /* 01D2C 808D859C A21901A0 */ sb $t9, 0x01A0($s0) ## 000001A0 /* 01D30 808D85A0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01D34 808D85A4 0C235E1F */ jal func_808D787C +/* 01D34 808D85A4 0C235E1F */ jal func_808D787C /* 01D38 808D85A8 2405000C */ addiu $a1, $zero, 0x000C ## $a1 = 0000000C /* 01D3C 808D85AC 3C01C0C0 */ lui $at, 0xC0C0 ## $at = C0C00000 /* 01D40 808D85B0 44815000 */ mtc1 $at, $f10 ## $f10 = -6.00 /* 01D44 808D85B4 C6080684 */ lwc1 $f8, 0x0684($s0) ## 00000684 /* 01D48 808D85B8 3C0140C0 */ lui $at, 0x40C0 ## $at = 40C00000 /* 01D4C 808D85BC 44812000 */ mtc1 $at, $f4 ## $f4 = 6.00 -/* 01D50 808D85C0 460A4400 */ add.s $f16, $f8, $f10 +/* 01D50 808D85C0 460A4400 */ add.s $f16, $f8, $f10 /* 01D54 808D85C4 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 /* 01D58 808D85C8 C6120688 */ lwc1 $f18, 0x0688($s0) ## 00000688 /* 01D5C 808D85CC 44815000 */ mtc1 $at, $f10 ## $f10 = 5.00 /* 01D60 808D85D0 C60801CC */ lwc1 $f8, 0x01CC($s0) ## 000001CC /* 01D64 808D85D4 E6100684 */ swc1 $f16, 0x0684($s0) ## 00000684 -/* 01D68 808D85D8 46049180 */ add.s $f6, $f18, $f4 -/* 01D6C 808D85DC 460A4401 */ sub.s $f16, $f8, $f10 +/* 01D68 808D85D8 46049180 */ add.s $f6, $f18, $f4 +/* 01D6C 808D85DC 460A4401 */ sub.s $f16, $f8, $f10 /* 01D70 808D85E0 E6060688 */ swc1 $f6, 0x0688($s0) ## 00000688 -/* 01D74 808D85E4 8FA4004C */ lw $a0, 0x004C($sp) -/* 01D78 808D85E8 44058000 */ mfc1 $a1, $f16 -/* 01D7C 808D85EC 0C0295B2 */ jal func_800A56C8 +/* 01D74 808D85E4 8FA4004C */ lw $a0, 0x004C($sp) +/* 01D78 808D85E8 44058000 */ mfc1 $a1, $f16 +/* 01D7C 808D85EC 0C0295B2 */ jal func_800A56C8 /* 01D80 808D85F0 00000000 */ nop -/* 01D84 808D85F4 10400009 */ beq $v0, $zero, .L808D861C -/* 01D88 808D85F8 8FA4004C */ lw $a0, 0x004C($sp) +/* 01D84 808D85F4 10400009 */ beq $v0, $zero, .L808D861C +/* 01D88 808D85F8 8FA4004C */ lw $a0, 0x004C($sp) /* 01D8C 808D85FC 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 01D90 808D8600 24A53018 */ addiu $a1, $a1, 0x3018 ## $a1 = 06003018 -/* 01D94 808D8604 0C0294D3 */ jal func_800A534C +/* 01D94 808D8604 0C0294D3 */ jal SkelAnime_ChangeAnimTransitionRepeat /* 01D98 808D8608 3C06C0A0 */ lui $a2, 0xC0A0 ## $a2 = C0A00000 /* 01D9C 808D860C 3C01447A */ lui $at, 0x447A ## $at = 447A0000 /* 01DA0 808D8610 44819000 */ mtc1 $at, $f18 ## $f18 = 1000.00 @@ -902,24 +902,24 @@ glabel L808D8598 /* 01DA8 808D8618 E61201CC */ swc1 $f18, 0x01CC($s0) ## 000001CC .L808D861C: /* 01DAC 808D861C 8E080674 */ lw $t0, 0x0674($s0) ## 00000674 -/* 01DB0 808D8620 8FA40074 */ lw $a0, 0x0074($sp) -/* 01DB4 808D8624 2D010033 */ sltiu $at, $t0, 0x0033 -/* 01DB8 808D8628 5420022B */ bnel $at, $zero, .L808D8ED8 +/* 01DB0 808D8620 8FA40074 */ lw $a0, 0x0074($sp) +/* 01DB4 808D8624 2D010033 */ sltiu $at, $t0, 0x0033 +/* 01DB8 808D8628 5420022B */ bnel $at, $zero, .L808D8ED8 /* 01DBC 808D862C 8605067A */ lh $a1, 0x067A($s0) ## 0000067A -/* 01DC0 808D8630 0C042F6F */ jal func_8010BDBC +/* 01DC0 808D8630 0C042F6F */ jal func_8010BDBC /* 01DC4 808D8634 248420D8 */ addiu $a0, $a0, 0x20D8 ## $a0 = 000020D8 -/* 01DC8 808D8638 14400226 */ bne $v0, $zero, .L808D8ED4 +/* 01DC8 808D8638 14400226 */ bne $v0, $zero, .L808D8ED4 /* 01DCC 808D863C 24090013 */ addiu $t1, $zero, 0x0013 ## $t1 = 00000013 /* 01DD0 808D8640 A6090678 */ sh $t1, 0x0678($s0) ## 00000678 /* 01DD4 808D8644 AE000674 */ sw $zero, 0x0674($s0) ## 00000674 -/* 01DD8 808D8648 8FA40074 */ lw $a0, 0x0074($sp) +/* 01DD8 808D8648 8FA40074 */ lw $a0, 0x0074($sp) /* 01DDC 808D864C 240570CC */ addiu $a1, $zero, 0x70CC ## $a1 = 000070CC -/* 01DE0 808D8650 0C042DA0 */ jal func_8010B680 +/* 01DE0 808D8650 0C042DA0 */ jal func_8010B680 /* 01DE4 808D8654 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 /* 01DE8 808D8658 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 01DEC 808D865C 24A57268 */ addiu $a1, $a1, 0x7268 ## $a1 = 06007268 -/* 01DF0 808D8660 8FA4004C */ lw $a0, 0x004C($sp) -/* 01DF4 808D8664 0C029490 */ jal func_800A5240 +/* 01DF0 808D8660 8FA4004C */ lw $a0, 0x004C($sp) +/* 01DF4 808D8664 0C029490 */ jal SkelAnime_ChangeAnimTransitionStop /* 01DF8 808D8668 3C06C0A0 */ lui $a2, 0xC0A0 ## $a2 = C0A00000 /* 01DFC 808D866C 3C014120 */ lui $at, 0x4120 ## $at = 41200000 /* 01E00 808D8670 44812000 */ mtc1 $at, $f4 ## $f4 = 10.00 @@ -934,30 +934,30 @@ glabel L808D8598 /* 01E24 808D8694 E60801D4 */ swc1 $f8, 0x01D4($s0) ## 000001D4 /* 01E28 808D8698 E60601D8 */ swc1 $f6, 0x01D8($s0) ## 000001D8 /* 01E2C 808D869C E60A01DC */ swc1 $f10, 0x01DC($s0) ## 000001DC -/* 01E30 808D86A0 8FAB0074 */ lw $t3, 0x0074($sp) +/* 01E30 808D86A0 8FAB0074 */ lw $t3, 0x0074($sp) /* 01E34 808D86A4 44808000 */ mtc1 $zero, $f16 ## $f16 = 0.00 /* 01E38 808D86A8 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 01E3C 808D86AC 002B0821 */ addu $at, $at, $t3 +/* 01E3C 808D86AC 002B0821 */ addu $at, $at, $t3 /* 01E40 808D86B0 E4300AFC */ swc1 $f16, 0x0AFC($at) ## 00010AFC glabel L808D86B4 /* 01E44 808D86B4 8E030674 */ lw $v1, 0x0674($s0) ## 00000674 /* 01E48 808D86B8 240C0008 */ addiu $t4, $zero, 0x0008 ## $t4 = 00000008 /* 01E4C 808D86BC A20C01A0 */ sb $t4, 0x01A0($s0) ## 000001A0 -/* 01E50 808D86C0 2C61003C */ sltiu $at, $v1, 0x003C -/* 01E54 808D86C4 1420000B */ bne $at, $zero, .L808D86F4 +/* 01E50 808D86C0 2C61003C */ sltiu $at, $v1, 0x003C +/* 01E54 808D86C4 1420000B */ bne $at, $zero, .L808D86F4 /* 01E58 808D86C8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 01E5C 808D86CC 240D0009 */ addiu $t5, $zero, 0x0009 ## $t5 = 00000009 /* 01E60 808D86D0 2401003C */ addiu $at, $zero, 0x003C ## $at = 0000003C -/* 01E64 808D86D4 14610007 */ bne $v1, $at, .L808D86F4 +/* 01E64 808D86D4 14610007 */ bne $v1, $at, .L808D86F4 /* 01E68 808D86D8 A20D01A0 */ sb $t5, 0x01A0($s0) ## 000001A0 /* 01E6C 808D86DC 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 /* 01E70 808D86E0 44819000 */ mtc1 $at, $f18 ## $f18 = 1.00 -/* 01E74 808D86E4 8FAE0074 */ lw $t6, 0x0074($sp) +/* 01E74 808D86E4 8FAE0074 */ lw $t6, 0x0074($sp) /* 01E78 808D86E8 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 01E7C 808D86EC 002E0821 */ addu $at, $at, $t6 +/* 01E7C 808D86EC 002E0821 */ addu $at, $at, $t6 /* 01E80 808D86F0 E4320AFC */ swc1 $f18, 0x0AFC($at) ## 00010AFC .L808D86F4: -/* 01E84 808D86F4 0C235E1F */ jal func_808D787C +/* 01E84 808D86F4 0C235E1F */ jal func_808D787C /* 01E88 808D86F8 2405000C */ addiu $a1, $zero, 0x000C ## $a1 = 0000000C /* 01E8C 808D86FC 3C01C0C0 */ lui $at, 0xC0C0 ## $at = C0C00000 /* 01E90 808D8700 44813000 */ mtc1 $at, $f6 ## $f6 = -6.00 @@ -966,23 +966,23 @@ glabel L808D86B4 /* 01E9C 808D870C 44818000 */ mtc1 $at, $f16 ## $f16 = 6.00 /* 01EA0 808D8710 C60A0688 */ lwc1 $f10, 0x0688($s0) ## 00000688 /* 01EA4 808D8714 8E030674 */ lw $v1, 0x0674($s0) ## 00000674 -/* 01EA8 808D8718 46062200 */ add.s $f8, $f4, $f6 -/* 01EAC 808D871C 2C61001E */ sltiu $at, $v1, 0x001E -/* 01EB0 808D8720 46105480 */ add.s $f18, $f10, $f16 +/* 01EA8 808D8718 46062200 */ add.s $f8, $f4, $f6 +/* 01EAC 808D871C 2C61001E */ sltiu $at, $v1, 0x001E +/* 01EB0 808D8720 46105480 */ add.s $f18, $f10, $f16 /* 01EB4 808D8724 E6080684 */ swc1 $f8, 0x0684($s0) ## 00000684 -/* 01EB8 808D8728 1420001E */ bne $at, $zero, .L808D87A4 +/* 01EB8 808D8728 1420001E */ bne $at, $zero, .L808D87A4 /* 01EBC 808D872C E6120688 */ swc1 $f18, 0x0688($s0) ## 00000688 /* 01EC0 808D8730 2401001E */ addiu $at, $zero, 0x001E ## $at = 0000001E -/* 01EC4 808D8734 54610004 */ bnel $v1, $at, .L808D8748 +/* 01EC4 808D8734 54610004 */ bnel $v1, $at, .L808D8748 /* 01EC8 808D8738 260401D8 */ addiu $a0, $s0, 0x01D8 ## $a0 = 000001D8 -/* 01ECC 808D873C 0C01E221 */ jal func_80078884 +/* 01ECC 808D873C 0C01E221 */ jal func_80078884 /* 01ED0 808D8740 240428C1 */ addiu $a0, $zero, 0x28C1 ## $a0 = 000028C1 /* 01ED4 808D8744 260401D8 */ addiu $a0, $s0, 0x01D8 ## $a0 = 000001D8 .L808D8748: /* 01ED8 808D8748 3C05437F */ lui $a1, 0x437F ## $a1 = 437F0000 /* 01EDC 808D874C 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 01EE0 808D8750 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 01EE4 808D8754 3C074120 */ lui $a3, 0x4120 ## $a3 = 41200000 /* 01EE8 808D8758 3C053F19 */ lui $a1, 0x3F19 ## $a1 = 3F190000 /* 01EEC 808D875C 3C073E99 */ lui $a3, 0x3E99 ## $a3 = 3E990000 @@ -990,38 +990,38 @@ glabel L808D86B4 /* 01EF4 808D8764 34A5999A */ ori $a1, $a1, 0x999A ## $a1 = 3F19999A /* 01EF8 808D8768 260401E0 */ addiu $a0, $s0, 0x01E0 ## $a0 = 000001E0 /* 01EFC 808D876C 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 01F00 808D8770 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 01F04 808D8774 3C074023 */ lui $a3, 0x4023 ## $a3 = 40230000 /* 01F08 808D8778 34E73333 */ ori $a3, $a3, 0x3333 ## $a3 = 40233333 /* 01F0C 808D877C 260401D4 */ addiu $a0, $s0, 0x01D4 ## $a0 = 000001D4 /* 01F10 808D8780 3C05432A */ lui $a1, 0x432A ## $a1 = 432A0000 /* 01F14 808D8784 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 01F18 808D8788 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 01F1C 808D878C 260401DC */ addiu $a0, $s0, 0x01DC ## $a0 = 000001DC /* 01F20 808D8790 3C054348 */ lui $a1, 0x4348 ## $a1 = 43480000 /* 01F24 808D8794 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 01F28 808D8798 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 01F2C 808D879C 3C074040 */ lui $a3, 0x4040 ## $a3 = 40400000 /* 01F30 808D87A0 8E030674 */ lw $v1, 0x0674($s0) ## 00000674 .L808D87A4: /* 01F34 808D87A4 24010011 */ addiu $at, $zero, 0x0011 ## $at = 00000011 -/* 01F38 808D87A8 14610006 */ bne $v1, $at, .L808D87C4 -/* 01F3C 808D87AC 8FA4004C */ lw $a0, 0x004C($sp) +/* 01F38 808D87A8 14610006 */ bne $v1, $at, .L808D87C4 +/* 01F3C 808D87AC 8FA4004C */ lw $a0, 0x004C($sp) /* 01F40 808D87B0 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 01F44 808D87B4 24A57A64 */ addiu $a1, $a1, 0x7A64 ## $a1 = 06007A64 -/* 01F48 808D87B8 0C0294D3 */ jal func_800A534C +/* 01F48 808D87B8 0C0294D3 */ jal SkelAnime_ChangeAnimTransitionRepeat /* 01F4C 808D87BC 3C06C0A0 */ lui $a2, 0xC0A0 ## $a2 = C0A00000 /* 01F50 808D87C0 8E030674 */ lw $v1, 0x0674($s0) ## 00000674 .L808D87C4: -/* 01F54 808D87C4 2C610051 */ sltiu $at, $v1, 0x0051 -/* 01F58 808D87C8 142001C2 */ bne $at, $zero, .L808D8ED4 -/* 01F5C 808D87CC 8FA40074 */ lw $a0, 0x0074($sp) -/* 01F60 808D87D0 0C042F6F */ jal func_8010BDBC +/* 01F54 808D87C4 2C610051 */ sltiu $at, $v1, 0x0051 +/* 01F58 808D87C8 142001C2 */ bne $at, $zero, .L808D8ED4 +/* 01F5C 808D87CC 8FA40074 */ lw $a0, 0x0074($sp) +/* 01F60 808D87D0 0C042F6F */ jal func_8010BDBC /* 01F64 808D87D4 248420D8 */ addiu $a0, $a0, 0x20D8 ## $a0 = 000020D8 -/* 01F68 808D87D8 144001BE */ bne $v0, $zero, .L808D8ED4 +/* 01F68 808D87D8 144001BE */ bne $v0, $zero, .L808D8ED4 /* 01F6C 808D87DC 3C0143C8 */ lui $at, 0x43C8 ## $at = 43C80000 /* 01F70 808D87E0 44810000 */ mtc1 $at, $f0 ## $f0 = 400.00 /* 01F74 808D87E4 3C0142C8 */ lui $at, 0x42C8 ## $at = 42C80000 @@ -1031,16 +1031,16 @@ glabel L808D86B4 /* 01F84 808D87F4 C6040680 */ lwc1 $f4, 0x0680($s0) ## 00000680 /* 01F88 808D87F8 C6080684 */ lwc1 $f8, 0x0684($s0) ## 00000684 /* 01F8C 808D87FC C6100688 */ lwc1 $f16, 0x0688($s0) ## 00000688 -/* 01F90 808D8800 460E2181 */ sub.s $f6, $f4, $f14 +/* 01F90 808D8800 460E2181 */ sub.s $f6, $f4, $f14 /* 01F94 808D8804 C604068C */ lwc1 $f4, 0x068C($s0) ## 0000068C /* 01F98 808D8808 44801000 */ mtc1 $zero, $f2 ## $f2 = 0.00 -/* 01F9C 808D880C 460C4281 */ sub.s $f10, $f8, $f12 +/* 01F9C 808D880C 460C4281 */ sub.s $f10, $f8, $f12 /* 01FA0 808D8810 E60606BC */ swc1 $f6, 0x06BC($s0) ## 000006BC /* 01FA4 808D8814 C6080690 */ lwc1 $f8, 0x0690($s0) ## 00000690 -/* 01FA8 808D8818 46008480 */ add.s $f18, $f16, $f0 +/* 01FA8 808D8818 46008480 */ add.s $f18, $f16, $f0 /* 01FAC 808D881C E60A06C0 */ swc1 $f10, 0x06C0($s0) ## 000006C0 /* 01FB0 808D8820 C60A0694 */ lwc1 $f10, 0x0694($s0) ## 00000694 -/* 01FB4 808D8824 46002180 */ add.s $f6, $f4, $f0 +/* 01FB4 808D8824 46002180 */ add.s $f6, $f4, $f0 /* 01FB8 808D8828 240F0014 */ addiu $t7, $zero, 0x0014 ## $t7 = 00000014 /* 01FBC 808D882C A60F0678 */ sh $t7, 0x0678($s0) ## 00000678 /* 01FC0 808D8830 AE000674 */ sw $zero, 0x0674($s0) ## 00000674 @@ -1054,17 +1054,17 @@ glabel L808D86B4 /* 01FE0 808D8850 E60206EC */ swc1 $f2, 0x06EC($s0) ## 000006EC /* 01FE4 808D8854 E60806D8 */ swc1 $f8, 0x06D8($s0) ## 000006D8 /* 01FE8 808D8858 E60A06DC */ swc1 $f10, 0x06DC($s0) ## 000006DC -/* 01FEC 808D885C C4307ED8 */ lwc1 $f16, %lo(D_808F7ED8)($at) +/* 01FEC 808D885C C4307ED8 */ lwc1 $f16, %lo(D_808F7ED8)($at) /* 01FF0 808D8860 3C01808F */ lui $at, %hi(D_808F7EDC) ## $at = 808F0000 /* 01FF4 808D8864 E60201E4 */ swc1 $f2, 0x01E4($s0) ## 000001E4 /* 01FF8 808D8868 E61006F0 */ swc1 $f16, 0x06F0($s0) ## 000006F0 -/* 01FFC 808D886C C4327EDC */ lwc1 $f18, %lo(D_808F7EDC)($at) +/* 01FFC 808D886C C4327EDC */ lwc1 $f18, %lo(D_808F7EDC)($at) /* 02000 808D8870 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 02004 808D8874 240539D5 */ addiu $a1, $zero, 0x39D5 ## $a1 = 000039D5 /* 02008 808D8878 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 0200C 808D887C E61201E8 */ swc1 $f18, 0x01E8($s0) ## 000001E8 -/* 02010 808D8880 10000195 */ beq $zero, $zero, .L808D8ED8 +/* 02010 808D8880 10000195 */ beq $zero, $zero, .L808D8ED8 /* 02014 808D8884 8605067A */ lh $a1, 0x067A($s0) ## 0000067A glabel L808D8888 /* 02018 808D8888 2418000A */ addiu $t8, $zero, 0x000A ## $t8 = 0000000A @@ -1072,21 +1072,21 @@ glabel L808D8888 /* 02020 808D8890 24190001 */ addiu $t9, $zero, 0x0001 ## $t9 = 00000001 /* 02024 808D8894 3C053E19 */ lui $a1, 0x3E19 ## $a1 = 3E190000 /* 02028 808D8898 3C073C75 */ lui $a3, 0x3C75 ## $a3 = 3C750000 -/* 0202C 808D889C A3B9006F */ sb $t9, 0x006F($sp) +/* 0202C 808D889C A3B9006F */ sb $t9, 0x006F($sp) /* 02030 808D88A0 34E7C28F */ ori $a3, $a3, 0xC28F ## $a3 = 3C75C28F /* 02034 808D88A4 34A5999A */ ori $a1, $a1, 0x999A ## $a1 = 3E19999A /* 02038 808D88A8 260406EC */ addiu $a0, $s0, 0x06EC ## $a0 = 000006EC /* 0203C 808D88AC 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 02040 808D88B0 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 02044 808D88B4 8E030674 */ lw $v1, 0x0674($s0) ## 00000674 /* 02048 808D88B8 260401E4 */ addiu $a0, $s0, 0x01E4 ## $a0 = 000001E4 /* 0204C 808D88BC 3C05437F */ lui $a1, 0x437F ## $a1 = 437F0000 -/* 02050 808D88C0 2C610029 */ sltiu $at, $v1, 0x0029 -/* 02054 808D88C4 1020000B */ beq $at, $zero, .L808D88F4 +/* 02050 808D88C0 2C610029 */ sltiu $at, $v1, 0x0029 +/* 02054 808D88C4 1020000B */ beq $at, $zero, .L808D88F4 /* 02058 808D88C8 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 0205C 808D88CC 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 02060 808D88D0 3C0740D0 */ lui $a3, 0x40D0 ## $a3 = 40D00000 /* 02064 808D88D4 3C053E4C */ lui $a1, 0x3E4C ## $a1 = 3E4C0000 /* 02068 808D88D8 3C073CCC */ lui $a3, 0x3CCC ## $a3 = 3CCC0000 @@ -1094,63 +1094,63 @@ glabel L808D8888 /* 02070 808D88E0 34A5CCCD */ ori $a1, $a1, 0xCCCD ## $a1 = 3E4CCCCD /* 02074 808D88E4 260401E8 */ addiu $a0, $s0, 0x01E8 ## $a0 = 000001E8 /* 02078 808D88E8 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 0207C 808D88EC 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 02080 808D88F0 8E030674 */ lw $v1, 0x0674($s0) ## 00000674 .L808D88F4: -/* 02084 808D88F4 2C610015 */ sltiu $at, $v1, 0x0015 -/* 02088 808D88F8 14200004 */ bne $at, $zero, .L808D890C +/* 02084 808D88F4 2C610015 */ sltiu $at, $v1, 0x0015 +/* 02088 808D88F8 14200004 */ bne $at, $zero, .L808D890C /* 0208C 808D88FC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 02090 808D8900 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 02094 808D8904 24053057 */ addiu $a1, $zero, 0x3057 ## $a1 = 00003057 /* 02098 808D8908 8E030674 */ lw $v1, 0x0674($s0) ## 00000674 .L808D890C: -/* 0209C 808D890C 2C610015 */ sltiu $at, $v1, 0x0015 -/* 020A0 808D8910 14200009 */ bne $at, $zero, .L808D8938 -/* 020A4 808D8914 8FA40074 */ lw $a0, 0x0074($sp) +/* 0209C 808D890C 2C610015 */ sltiu $at, $v1, 0x0015 +/* 020A0 808D8910 14200009 */ bne $at, $zero, .L808D8938 +/* 020A4 808D8914 8FA40074 */ lw $a0, 0x0074($sp) /* 020A8 808D8918 3C05442F */ lui $a1, 0x442F ## $a1 = 442F0000 -/* 020AC 808D891C 0C235AFC */ jal func_808D6BF0 +/* 020AC 808D891C 0C235AFC */ jal func_808D6BF0 /* 020B0 808D8920 24060002 */ addiu $a2, $zero, 0x0002 ## $a2 = 00000002 -/* 020B4 808D8924 8FA40074 */ lw $a0, 0x0074($sp) +/* 020B4 808D8924 8FA40074 */ lw $a0, 0x0074($sp) /* 020B8 808D8928 3C05442F */ lui $a1, 0x442F ## $a1 = 442F0000 -/* 020BC 808D892C 0C235AFC */ jal func_808D6BF0 +/* 020BC 808D892C 0C235AFC */ jal func_808D6BF0 /* 020C0 808D8930 24060002 */ addiu $a2, $zero, 0x0002 ## $a2 = 00000002 /* 020C4 808D8934 8E030674 */ lw $v1, 0x0674($s0) ## 00000674 .L808D8938: /* 020C8 808D8938 2401001E */ addiu $at, $zero, 0x001E ## $at = 0000001E -/* 020CC 808D893C 14610005 */ bne $v1, $at, .L808D8954 -/* 020D0 808D8940 8FA40074 */ lw $a0, 0x0074($sp) +/* 020CC 808D893C 14610005 */ bne $v1, $at, .L808D8954 +/* 020D0 808D8940 8FA40074 */ lw $a0, 0x0074($sp) /* 020D4 808D8944 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 020D8 808D8948 0C00B7D5 */ jal func_8002DF54 +/* 020D8 808D8948 0C00B7D5 */ jal func_8002DF54 /* 020DC 808D894C 2406004A */ addiu $a2, $zero, 0x004A ## $a2 = 0000004A /* 020E0 808D8950 8E030674 */ lw $v1, 0x0674($s0) ## 00000674 .L808D8954: -/* 020E4 808D8954 2C610033 */ sltiu $at, $v1, 0x0033 -/* 020E8 808D8958 1420015E */ bne $at, $zero, .L808D8ED4 +/* 020E4 808D8954 2C610033 */ sltiu $at, $v1, 0x0033 +/* 020E8 808D8958 1420015E */ bne $at, $zero, .L808D8ED4 /* 020EC 808D895C 24080015 */ addiu $t0, $zero, 0x0015 ## $t0 = 00000015 /* 020F0 808D8960 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 /* 020F4 808D8964 A6080678 */ sh $t0, 0x0678($s0) ## 00000678 /* 020F8 808D8968 AE000674 */ sw $zero, 0x0674($s0) ## 00000674 /* 020FC 808D896C 3C01808F */ lui $at, %hi(D_808F7EE0) ## $at = 808F0000 /* 02100 808D8970 E60401D8 */ swc1 $f4, 0x01D8($s0) ## 000001D8 -/* 02104 808D8974 C4267EE0 */ lwc1 $f6, %lo(D_808F7EE0)($at) -/* 02108 808D8978 1000000E */ beq $zero, $zero, .L808D89B4 +/* 02104 808D8974 C4267EE0 */ lwc1 $f6, %lo(D_808F7EE0)($at) +/* 02108 808D8978 1000000E */ beq $zero, $zero, .L808D89B4 /* 0210C 808D897C E60601E8 */ swc1 $f6, 0x01E8($s0) ## 000001E8 glabel L808D8980 /* 02110 808D8980 2409000B */ addiu $t1, $zero, 0x000B ## $t1 = 0000000B /* 02114 808D8984 A20901A0 */ sb $t1, 0x01A0($s0) ## 000001A0 /* 02118 808D8988 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 0211C 808D898C 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 02120 808D8990 24053057 */ addiu $a1, $zero, 0x3057 ## $a1 = 00003057 -/* 02124 808D8994 8FA40074 */ lw $a0, 0x0074($sp) +/* 02124 808D8994 8FA40074 */ lw $a0, 0x0074($sp) /* 02128 808D8998 3C05442F */ lui $a1, 0x442F ## $a1 = 442F0000 -/* 0212C 808D899C 0C235AFC */ jal func_808D6BF0 +/* 0212C 808D899C 0C235AFC */ jal func_808D6BF0 /* 02130 808D89A0 24060002 */ addiu $a2, $zero, 0x0002 ## $a2 = 00000002 -/* 02134 808D89A4 8FA40074 */ lw $a0, 0x0074($sp) +/* 02134 808D89A4 8FA40074 */ lw $a0, 0x0074($sp) /* 02138 808D89A8 3C05442F */ lui $a1, 0x442F ## $a1 = 442F0000 -/* 0213C 808D89AC 0C235AFC */ jal func_808D6BF0 +/* 0213C 808D89AC 0C235AFC */ jal func_808D6BF0 /* 02140 808D89B0 24060002 */ addiu $a2, $zero, 0x0002 ## $a2 = 00000002 .L808D89B4: /* 02144 808D89B4 3C01C1F0 */ lui $at, 0xC1F0 ## $at = C1F00000 @@ -1171,21 +1171,21 @@ glabel L808D8980 /* 02180 808D89F0 E6100688 */ swc1 $f16, 0x0688($s0) ## 00000688 /* 02184 808D89F4 E612068C */ swc1 $f18, 0x068C($s0) ## 0000068C /* 02188 808D89F8 E6040690 */ swc1 $f4, 0x0690($s0) ## 00000690 -/* 0218C 808D89FC 14610006 */ bne $v1, $at, .L808D8A18 +/* 0218C 808D89FC 14610006 */ bne $v1, $at, .L808D8A18 /* 02190 808D8A00 E6060694 */ swc1 $f6, 0x0694($s0) ## 00000694 -/* 02194 808D8A04 8FA40074 */ lw $a0, 0x0074($sp) +/* 02194 808D8A04 8FA40074 */ lw $a0, 0x0074($sp) /* 02198 808D8A08 240570CD */ addiu $a1, $zero, 0x70CD ## $a1 = 000070CD -/* 0219C 808D8A0C 0C042DA0 */ jal func_8010B680 +/* 0219C 808D8A0C 0C042DA0 */ jal func_8010B680 /* 021A0 808D8A10 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 /* 021A4 808D8A14 8E030674 */ lw $v1, 0x0674($s0) ## 00000674 .L808D8A18: -/* 021A8 808D8A18 2C610079 */ sltiu $at, $v1, 0x0079 -/* 021AC 808D8A1C 5420012E */ bnel $at, $zero, .L808D8ED8 +/* 021A8 808D8A18 2C610079 */ sltiu $at, $v1, 0x0079 +/* 021AC 808D8A1C 5420012E */ bnel $at, $zero, .L808D8ED8 /* 021B0 808D8A20 8605067A */ lh $a1, 0x067A($s0) ## 0000067A -/* 021B4 808D8A24 8FA40074 */ lw $a0, 0x0074($sp) -/* 021B8 808D8A28 0C042F6F */ jal func_8010BDBC +/* 021B4 808D8A24 8FA40074 */ lw $a0, 0x0074($sp) +/* 021B8 808D8A28 0C042F6F */ jal func_8010BDBC /* 021BC 808D8A2C 248420D8 */ addiu $a0, $a0, 0x20D8 ## $a0 = 000020D8 -/* 021C0 808D8A30 14400128 */ bne $v0, $zero, .L808D8ED4 +/* 021C0 808D8A30 14400128 */ bne $v0, $zero, .L808D8ED4 /* 021C4 808D8A34 240A0016 */ addiu $t2, $zero, 0x0016 ## $t2 = 00000016 /* 021C8 808D8A38 3C014120 */ lui $at, 0x4120 ## $at = 41200000 /* 021CC 808D8A3C 44815000 */ mtc1 $at, $f10 ## $f10 = 10.00 @@ -1193,10 +1193,10 @@ glabel L808D8980 /* 021D4 808D8A44 3C0141F0 */ lui $at, 0x41F0 ## $at = 41F00000 /* 021D8 808D8A48 44812000 */ mtc1 $at, $f4 ## $f4 = 30.00 /* 021DC 808D8A4C C6120200 */ lwc1 $f18, 0x0200($s0) ## 00000200 -/* 021E0 808D8A50 460A4401 */ sub.s $f16, $f8, $f10 +/* 021E0 808D8A50 460A4401 */ sub.s $f16, $f8, $f10 /* 021E4 808D8A54 3C01437F */ lui $at, 0x437F ## $at = 437F0000 /* 021E8 808D8A58 C6080204 */ lwc1 $f8, 0x0204($s0) ## 00000204 -/* 021EC 808D8A5C 46049180 */ add.s $f6, $f18, $f4 +/* 021EC 808D8A5C 46049180 */ add.s $f6, $f18, $f4 /* 021F0 808D8A60 44815000 */ mtc1 $at, $f10 ## $f10 = 255.00 /* 021F4 808D8A64 240B001E */ addiu $t3, $zero, 0x001E ## $t3 = 0000001E /* 021F8 808D8A68 240C00FE */ addiu $t4, $zero, 0x00FE ## $t4 = 000000FE @@ -1209,22 +1209,22 @@ glabel L808D8980 /* 02214 808D8A84 3C01808F */ lui $at, %hi(D_808F7EE4) ## $at = 808F0000 /* 02218 808D8A88 E6080694 */ swc1 $f8, 0x0694($s0) ## 00000694 /* 0221C 808D8A8C E60A01E4 */ swc1 $f10, 0x01E4($s0) ## 000001E4 -/* 02220 808D8A90 C4307EE4 */ lwc1 $f16, %lo(D_808F7EE4)($at) +/* 02220 808D8A90 C4307EE4 */ lwc1 $f16, %lo(D_808F7EE4)($at) /* 02224 808D8A94 E61001E8 */ swc1 $f16, 0x01E8($s0) ## 000001E8 glabel L808D8A98 /* 02228 808D8A98 8E0D0674 */ lw $t5, 0x0674($s0) ## 00000674 /* 0222C 808D8A9C 260401E4 */ addiu $a0, $s0, 0x01E4 ## $a0 = 000001E4 /* 02230 808D8AA0 240E000C */ addiu $t6, $zero, 0x000C ## $t6 = 0000000C -/* 02234 808D8AA4 2DA1001F */ sltiu $at, $t5, 0x001F -/* 02238 808D8AA8 14200003 */ bne $at, $zero, .L808D8AB8 +/* 02234 808D8AA4 2DA1001F */ sltiu $at, $t5, 0x001F +/* 02238 808D8AA8 14200003 */ bne $at, $zero, .L808D8AB8 /* 0223C 808D8AAC 3C053F80 */ lui $a1, 0x3F80 ## $a1 = 3F800000 -/* 02240 808D8AB0 10000002 */ beq $zero, $zero, .L808D8ABC +/* 02240 808D8AB0 10000002 */ beq $zero, $zero, .L808D8ABC /* 02244 808D8AB4 A20001A0 */ sb $zero, 0x01A0($s0) ## 000001A0 .L808D8AB8: /* 02248 808D8AB8 A20E01A0 */ sb $t6, 0x01A0($s0) ## 000001A0 .L808D8ABC: /* 0224C 808D8ABC 0C01E123 */ jal Math_SmoothDownscaleMaxF - + /* 02250 808D8AC0 3C064120 */ lui $a2, 0x4120 ## $a2 = 41200000 /* 02254 808D8AC4 3C01C1F0 */ lui $at, 0xC1F0 ## $at = C1F00000 /* 02258 808D8AC8 44819000 */ mtc1 $at, $f18 ## $f18 = -30.00 @@ -1237,109 +1237,109 @@ glabel L808D8A98 /* 02274 808D8AE4 C6080200 */ lwc1 $f8, 0x0200($s0) ## 00000200 /* 02278 808D8AE8 3C063DCC */ lui $a2, 0x3DCC ## $a2 = 3DCC0000 /* 0227C 808D8AEC 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3DCCCCCD -/* 02280 808D8AF0 460A4400 */ add.s $f16, $f8, $f10 +/* 02280 808D8AF0 460A4400 */ add.s $f16, $f8, $f10 /* 02284 808D8AF4 26040690 */ addiu $a0, $s0, 0x0690 ## $a0 = 00000690 /* 02288 808D8AF8 3C0741A0 */ lui $a3, 0x41A0 ## $a3 = 41A00000 /* 0228C 808D8AFC E6120680 */ swc1 $f18, 0x0680($s0) ## 00000680 -/* 02290 808D8B00 44058000 */ mfc1 $a1, $f16 +/* 02290 808D8B00 44058000 */ mfc1 $a1, $f16 /* 02294 808D8B04 E6040684 */ swc1 $f4, 0x0684($s0) ## 00000684 /* 02298 808D8B08 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 0229C 808D8B0C E6060688 */ swc1 $f6, 0x0688($s0) ## 00000688 /* 022A0 808D8B10 3C014120 */ lui $at, 0x4120 ## $at = 41200000 /* 022A4 808D8B14 44812000 */ mtc1 $at, $f4 ## $f4 = 10.00 /* 022A8 808D8B18 C61201FC */ lwc1 $f18, 0x01FC($s0) ## 000001FC /* 022AC 808D8B1C 2604068C */ addiu $a0, $s0, 0x068C ## $a0 = 0000068C /* 022B0 808D8B20 3C063DCC */ lui $a2, 0x3DCC ## $a2 = 3DCC0000 -/* 022B4 808D8B24 46049181 */ sub.s $f6, $f18, $f4 +/* 022B4 808D8B24 46049181 */ sub.s $f6, $f18, $f4 /* 022B8 808D8B28 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3DCCCCCD -/* 022BC 808D8B2C AFA40048 */ sw $a0, 0x0048($sp) +/* 022BC 808D8B2C AFA40048 */ sw $a0, 0x0048($sp) /* 022C0 808D8B30 3C0740A0 */ lui $a3, 0x40A0 ## $a3 = 40A00000 -/* 022C4 808D8B34 44053000 */ mfc1 $a1, $f6 +/* 022C4 808D8B34 44053000 */ mfc1 $a1, $f6 /* 022C8 808D8B38 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 022CC 808D8B3C 00000000 */ nop /* 022D0 808D8B40 8E030674 */ lw $v1, 0x0674($s0) ## 00000674 /* 022D4 808D8B44 24010014 */ addiu $at, $zero, 0x0014 ## $at = 00000014 /* 022D8 808D8B48 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 022DC 808D8B4C 14610018 */ bne $v1, $at, .L808D8BB0 -/* 022E0 808D8B50 8FA50074 */ lw $a1, 0x0074($sp) -/* 022E4 808D8B54 0C235C4B */ jal func_808D712C +/* 022DC 808D8B4C 14610018 */ bne $v1, $at, .L808D8BB0 +/* 022E0 808D8B50 8FA50074 */ lw $a1, 0x0074($sp) +/* 022E4 808D8B54 0C235C4B */ jal func_808D712C /* 022E8 808D8B58 2406017C */ addiu $a2, $zero, 0x017C ## $a2 = 0000017C /* 022EC 808D8B5C 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 /* 022F0 808D8B60 24A58A88 */ addiu $a1, $a1, 0x8A88 ## $a1 = 06008A88 -/* 022F4 808D8B64 8FA4004C */ lw $a0, 0x004C($sp) -/* 022F8 808D8B68 0C029490 */ jal func_800A5240 +/* 022F4 808D8B64 8FA4004C */ lw $a0, 0x004C($sp) +/* 022F8 808D8B68 0C029490 */ jal SkelAnime_ChangeAnimTransitionStop /* 022FC 808D8B6C 24060000 */ addiu $a2, $zero, 0x0000 ## $a2 = 00000000 /* 02300 808D8B70 0C02927F */ jal SkelAnime_FrameUpdateMatrix - -/* 02304 808D8B74 8FA4004C */ lw $a0, 0x004C($sp) + +/* 02304 808D8B74 8FA4004C */ lw $a0, 0x004C($sp) /* 02308 808D8B78 44804000 */ mtc1 $zero, $f8 ## $f8 = 0.00 /* 0230C 808D8B7C 3C014190 */ lui $at, 0x4190 ## $at = 41900000 /* 02310 808D8B80 3C0F8090 */ lui $t7, %hi(D_808F93C0) ## $t7 = 80900000 /* 02314 808D8B84 E60800BC */ swc1 $f8, 0x00BC($s0) ## 000000BC -/* 02318 808D8B88 8DEF93C0 */ lw $t7, %lo(D_808F93C0)($t7) +/* 02318 808D8B88 8DEF93C0 */ lw $t7, %lo(D_808F93C0)($t7) /* 0231C 808D8B8C 44815000 */ mtc1 $at, $f10 ## $f10 = 18.00 /* 02320 808D8B90 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 02324 808D8B94 240528C7 */ addiu $a1, $zero, 0x28C7 ## $a1 = 000028C7 /* 02328 808D8B98 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 0232C 808D8B9C E5EA16C4 */ swc1 $f10, 0x16C4($t7) ## 809016C4 /* 02330 808D8BA0 A2000198 */ sb $zero, 0x0198($s0) ## 00000198 /* 02334 808D8BA4 0C03E803 */ jal Audio_SetBGM - + /* 02338 808D8BA8 24040064 */ addiu $a0, $zero, 0x0064 ## $a0 = 00000064 /* 0233C 808D8BAC 8E030674 */ lw $v1, 0x0674($s0) ## 00000674 .L808D8BB0: /* 02340 808D8BB0 24010032 */ addiu $at, $zero, 0x0032 ## $at = 00000032 -/* 02344 808D8BB4 14610034 */ bne $v1, $at, .L808D8C88 -/* 02348 808D8BB8 8FA40074 */ lw $a0, 0x0074($sp) +/* 02344 808D8BB4 14610034 */ bne $v1, $at, .L808D8C88 +/* 02348 808D8BB8 8FA40074 */ lw $a0, 0x0074($sp) /* 0234C 808D8BBC 3C010001 */ lui $at, 0x0001 ## $at = 00010000 /* 02350 808D8BC0 342117A4 */ ori $at, $at, 0x17A4 ## $at = 000117A4 -/* 02354 808D8BC4 00812021 */ addu $a0, $a0, $at +/* 02354 808D8BC4 00812021 */ addu $a0, $a0, $at /* 02358 808D8BC8 0C02604B */ jal Object_GetIndex ## ObjectIndex /* 0235C 808D8BCC 240500E1 */ addiu $a1, $zero, 0x00E1 ## $a1 = 000000E1 -/* 02360 808D8BD0 8FB80074 */ lw $t8, 0x0074($sp) -/* 02364 808D8BD4 0002C900 */ sll $t9, $v0, 4 -/* 02368 808D8BD8 0322C821 */ addu $t9, $t9, $v0 -/* 0236C 808D8BDC 0019C880 */ sll $t9, $t9, 2 +/* 02360 808D8BD0 8FB80074 */ lw $t8, 0x0074($sp) +/* 02364 808D8BD4 0002C900 */ sll $t9, $v0, 4 +/* 02368 808D8BD8 0322C821 */ addu $t9, $t9, $v0 +/* 0236C 808D8BDC 0019C880 */ sll $t9, $t9, 2 /* 02370 808D8BE0 3C090001 */ lui $t1, 0x0001 ## $t1 = 00010000 -/* 02374 808D8BE4 03194021 */ addu $t0, $t8, $t9 -/* 02378 808D8BE8 01284821 */ addu $t1, $t1, $t0 +/* 02374 808D8BE4 03194021 */ addu $t0, $t8, $t9 +/* 02378 808D8BE8 01284821 */ addu $t1, $t1, $t0 /* 0237C 808D8BEC 8D2917B4 */ lw $t1, 0x17B4($t1) ## 000117B4 /* 02380 808D8BF0 3C038016 */ lui $v1, 0x8016 ## $v1 = 80160000 /* 02384 808D8BF4 3C018000 */ lui $at, 0x8000 ## $at = 80000000 /* 02388 808D8BF8 24636FA8 */ addiu $v1, $v1, 0x6FA8 ## $v1 = 80166FA8 -/* 0238C 808D8BFC 01215021 */ addu $t2, $t1, $at +/* 0238C 808D8BFC 01215021 */ addu $t2, $t1, $at /* 02390 808D8C00 AC6A0018 */ sw $t2, 0x0018($v1) ## 80166FC0 /* 02394 808D8C04 3C048016 */ lui $a0, 0x8016 ## $a0 = 80160000 /* 02398 808D8C08 9484F542 */ lhu $a0, -0x0ABE($a0) ## 8015F542 /* 0239C 808D8C0C 3C020601 */ lui $v0, 0x0601 ## $v0 = 06010000 /* 023A0 808D8C10 2442CF00 */ addiu $v0, $v0, 0xCF00 ## $v0 = 0600CF00 /* 023A4 808D8C14 308B0100 */ andi $t3, $a0, 0x0100 ## $t3 = 00000000 -/* 023A8 808D8C18 15600017 */ bne $t3, $zero, .L808D8C78 -/* 023AC 808D8C1C 00026900 */ sll $t5, $v0, 4 -/* 023B0 808D8C20 000D7702 */ srl $t6, $t5, 28 -/* 023B4 808D8C24 000E7880 */ sll $t7, $t6, 2 -/* 023B8 808D8C28 006FC021 */ addu $t8, $v1, $t7 +/* 023A8 808D8C18 15600017 */ bne $t3, $zero, .L808D8C78 +/* 023AC 808D8C1C 00026900 */ sll $t5, $v0, 4 +/* 023B0 808D8C20 000D7702 */ srl $t6, $t5, 28 +/* 023B4 808D8C24 000E7880 */ sll $t7, $t6, 2 +/* 023B8 808D8C28 006FC021 */ addu $t8, $v1, $t7 /* 023BC 808D8C2C 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 /* 023C0 808D8C30 8F190000 */ lw $t9, 0x0000($t8) ## 00000000 /* 023C4 808D8C34 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF -/* 023C8 808D8C38 00414024 */ and $t0, $v0, $at -/* 023CC 808D8C3C 8FA40074 */ lw $a0, 0x0074($sp) +/* 023C8 808D8C38 00414024 */ and $t0, $v0, $at +/* 023CC 808D8C3C 8FA40074 */ lw $a0, 0x0074($sp) /* 023D0 808D8C40 3C018000 */ lui $at, 0x8000 ## $at = 80000000 /* 023D4 808D8C44 240900B4 */ addiu $t1, $zero, 0x00B4 ## $t1 = 000000B4 /* 023D8 808D8C48 240A0080 */ addiu $t2, $zero, 0x0080 ## $t2 = 00000080 /* 023DC 808D8C4C 240B0028 */ addiu $t3, $zero, 0x0028 ## $t3 = 00000028 -/* 023E0 808D8C50 03283021 */ addu $a2, $t9, $t0 -/* 023E4 808D8C54 00C13021 */ addu $a2, $a2, $at -/* 023E8 808D8C58 AFAB0018 */ sw $t3, 0x0018($sp) -/* 023EC 808D8C5C AFAA0014 */ sw $t2, 0x0014($sp) -/* 023F0 808D8C60 AFA90010 */ sw $t1, 0x0010($sp) +/* 023E0 808D8C50 03283021 */ addu $a2, $t9, $t0 +/* 023E4 808D8C54 00C13021 */ addu $a2, $a2, $at +/* 023E8 808D8C58 AFAB0018 */ sw $t3, 0x0018($sp) +/* 023EC 808D8C5C AFAA0014 */ sw $t2, 0x0014($sp) +/* 023F0 808D8C60 AFA90010 */ sw $t1, 0x0010($sp) /* 023F4 808D8C64 240700A0 */ addiu $a3, $zero, 0x00A0 ## $a3 = 000000A0 /* 023F8 808D8C68 0C00B380 */ jal TitleCard_InitBossName - + /* 023FC 808D8C6C 24851D4C */ addiu $a1, $a0, 0x1D4C ## $a1 = 80161D4C /* 02400 808D8C70 3C048016 */ lui $a0, 0x8016 ## $a0 = 80160000 /* 02404 808D8C74 9484F542 */ lhu $a0, -0x0ABE($a0) ## 8015F542 @@ -1349,27 +1349,27 @@ glabel L808D8A98 /* 02410 808D8C80 A42CF542 */ sh $t4, -0x0ABE($at) ## 8015F542 /* 02414 808D8C84 8E030674 */ lw $v1, 0x0674($s0) ## 00000674 .L808D8C88: -/* 02418 808D8C88 2C610014 */ sltiu $at, $v1, 0x0014 -/* 0241C 808D8C8C 1420004F */ bne $at, $zero, .L808D8DCC +/* 02418 808D8C88 2C610014 */ sltiu $at, $v1, 0x0014 +/* 0241C 808D8C8C 1420004F */ bne $at, $zero, .L808D8DCC /* 02420 808D8C90 240D0001 */ addiu $t5, $zero, 0x0001 ## $t5 = 00000001 /* 02424 808D8C94 A20D0199 */ sb $t5, 0x0199($s0) ## 00000199 /* 02428 808D8C98 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 0242C 808D8C9C 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 02430 808D8CA0 24053056 */ addiu $a1, $zero, 0x3056 ## $a1 = 00003056 /* 02434 808D8CA4 3C063D4C */ lui $a2, 0x3D4C ## $a2 = 3D4C0000 /* 02438 808D8CA8 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3D4CCCCD /* 0243C 808D8CAC 26040028 */ addiu $a0, $s0, 0x0028 ## $a0 = 00000028 /* 02440 808D8CB0 3C054364 */ lui $a1, 0x4364 ## $a1 = 43640000 /* 02444 808D8CB4 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 02448 808D8CB8 3C074000 */ lui $a3, 0x4000 ## $a3 = 40000000 /* 0244C 808D8CBC 3C063D4C */ lui $a2, 0x3D4C ## $a2 = 3D4C0000 /* 02450 808D8CC0 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3D4CCCCD /* 02454 808D8CC4 2604002C */ addiu $a0, $s0, 0x002C ## $a0 = 0000002C /* 02458 808D8CC8 3C05C366 */ lui $a1, 0xC366 ## $a1 = C3660000 /* 0245C 808D8CCC 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 02460 808D8CD0 3C074080 */ lui $a3, 0x4080 ## $a3 = 40800000 /* 02464 808D8CD4 3C028090 */ lui $v0, %hi(D_808F93C0) ## $v0 = 80900000 /* 02468 808D8CD8 244293C0 */ addiu $v0, $v0, %lo(D_808F93C0) ## $v0 = 808F93C0 @@ -1384,34 +1384,34 @@ glabel L808D8A98 /* 0248C 808D8CFC 8C580000 */ lw $t8, 0x0000($v0) ## 808F93C0 /* 02490 808D8D00 E70016B8 */ swc1 $f0, 0x16B8($t8) ## 000016B8 /* 02494 808D8D04 8E040674 */ lw $a0, 0x0674($s0) ## 00000674 -/* 02498 808D8D08 00800821 */ addu $at, $a0, $zero -/* 0249C 808D8D0C 00042080 */ sll $a0, $a0, 2 -/* 024A0 808D8D10 00812023 */ subu $a0, $a0, $at -/* 024A4 808D8D14 00042100 */ sll $a0, $a0, 4 -/* 024A8 808D8D18 00812023 */ subu $a0, $a0, $at -/* 024AC 808D8D1C 000420C0 */ sll $a0, $a0, 3 -/* 024B0 808D8D20 00812023 */ subu $a0, $a0, $at -/* 024B4 808D8D24 00042080 */ sll $a0, $a0, 2 -/* 024B8 808D8D28 00042400 */ sll $a0, $a0, 16 +/* 02498 808D8D08 00800821 */ addu $at, $a0, $zero +/* 0249C 808D8D0C 00042080 */ sll $a0, $a0, 2 +/* 024A0 808D8D10 00812023 */ subu $a0, $a0, $at +/* 024A4 808D8D14 00042100 */ sll $a0, $a0, 4 +/* 024A8 808D8D18 00812023 */ subu $a0, $a0, $at +/* 024AC 808D8D1C 000420C0 */ sll $a0, $a0, 3 +/* 024B0 808D8D20 00812023 */ subu $a0, $a0, $at +/* 024B4 808D8D24 00042080 */ sll $a0, $a0, 2 +/* 024B8 808D8D28 00042400 */ sll $a0, $a0, 16 /* 024BC 808D8D2C 0C01DE1C */ jal Math_Sins ## sins? -/* 024C0 808D8D30 00042403 */ sra $a0, $a0, 16 +/* 024C0 808D8D30 00042403 */ sra $a0, $a0, 16 /* 024C4 808D8D34 C61201C8 */ lwc1 $f18, 0x01C8($s0) ## 000001C8 /* 024C8 808D8D38 3C01808F */ lui $at, %hi(D_808F7EE8) ## $at = 808F0000 -/* 024CC 808D8D3C C4267EE8 */ lwc1 $f6, %lo(D_808F7EE8)($at) -/* 024D0 808D8D40 46009102 */ mul.s $f4, $f18, $f0 +/* 024CC 808D8D3C C4267EE8 */ lwc1 $f6, %lo(D_808F7EE8)($at) +/* 024D0 808D8D40 46009102 */ mul.s $f4, $f18, $f0 /* 024D4 808D8D44 8E040674 */ lw $a0, 0x0674($s0) ## 00000674 /* 024D8 808D8D48 C6080028 */ lwc1 $f8, 0x0028($s0) ## 00000028 -/* 024DC 808D8D4C 00800821 */ addu $at, $a0, $zero -/* 024E0 808D8D50 000420C0 */ sll $a0, $a0, 3 -/* 024E4 808D8D54 00812023 */ subu $a0, $a0, $at -/* 024E8 808D8D58 46062082 */ mul.s $f2, $f4, $f6 -/* 024EC 808D8D5C 00042140 */ sll $a0, $a0, 5 -/* 024F0 808D8D60 00812021 */ addu $a0, $a0, $at -/* 024F4 808D8D64 000420C0 */ sll $a0, $a0, 3 -/* 024F8 808D8D68 00042400 */ sll $a0, $a0, 16 -/* 024FC 808D8D6C 00042403 */ sra $a0, $a0, 16 -/* 02500 808D8D70 46024280 */ add.s $f10, $f8, $f2 +/* 024DC 808D8D4C 00800821 */ addu $at, $a0, $zero +/* 024E0 808D8D50 000420C0 */ sll $a0, $a0, 3 +/* 024E4 808D8D54 00812023 */ subu $a0, $a0, $at +/* 024E8 808D8D58 46062082 */ mul.s $f2, $f4, $f6 +/* 024EC 808D8D5C 00042140 */ sll $a0, $a0, 5 +/* 024F0 808D8D60 00812021 */ addu $a0, $a0, $at +/* 024F4 808D8D64 000420C0 */ sll $a0, $a0, 3 +/* 024F8 808D8D68 00042400 */ sll $a0, $a0, 16 +/* 024FC 808D8D6C 00042403 */ sra $a0, $a0, 16 +/* 02500 808D8D70 46024280 */ add.s $f10, $f8, $f2 /* 02504 808D8D74 E6020060 */ swc1 $f2, 0x0060($s0) ## 00000060 /* 02508 808D8D78 0C01DE0D */ jal Math_Coss ## coss? @@ -1419,42 +1419,42 @@ glabel L808D8A98 /* 02510 808D8D80 C61001C8 */ lwc1 $f16, 0x01C8($s0) ## 000001C8 /* 02514 808D8D84 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 /* 02518 808D8D88 44816000 */ mtc1 $at, $f12 ## $f12 = 1.00 -/* 0251C 808D8D8C 46008482 */ mul.s $f18, $f16, $f0 +/* 0251C 808D8D8C 46008482 */ mul.s $f18, $f16, $f0 /* 02520 808D8D90 3C014248 */ lui $at, 0x4248 ## $at = 42480000 /* 02524 808D8D94 44817000 */ mtc1 $at, $f14 ## $f14 = 50.00 /* 02528 808D8D98 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 /* 0252C 808D8D9C 44812000 */ mtc1 $at, $f4 ## $f4 = 0.50 /* 02530 808D8DA0 C6060100 */ lwc1 $f6, 0x0100($s0) ## 00000100 -/* 02534 808D8DA4 44066000 */ mfc1 $a2, $f12 -/* 02538 808D8DA8 46049082 */ mul.s $f2, $f18, $f4 -/* 0253C 808D8DAC 44076000 */ mfc1 $a3, $f12 -/* 02540 808D8DB0 44057000 */ mfc1 $a1, $f14 +/* 02534 808D8DA4 44066000 */ mfc1 $a2, $f12 +/* 02538 808D8DA8 46049082 */ mul.s $f2, $f18, $f4 +/* 0253C 808D8DAC 44076000 */ mfc1 $a3, $f12 +/* 02540 808D8DB0 44057000 */ mfc1 $a1, $f14 /* 02544 808D8DB4 260401C8 */ addiu $a0, $s0, 0x01C8 ## $a0 = 000001C8 -/* 02548 808D8DB8 46061201 */ sub.s $f8, $f2, $f6 +/* 02548 808D8DB8 46061201 */ sub.s $f8, $f2, $f6 /* 0254C 808D8DBC E6020024 */ swc1 $f2, 0x0024($s0) ## 00000024 /* 02550 808D8DC0 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 02554 808D8DC4 E608005C */ swc1 $f8, 0x005C($s0) ## 0000005C /* 02558 808D8DC8 8E030674 */ lw $v1, 0x0674($s0) ## 00000674 .L808D8DCC: -/* 0255C 808D8DCC 2C61001F */ sltiu $at, $v1, 0x001F -/* 02560 808D8DD0 14200008 */ bne $at, $zero, .L808D8DF4 +/* 0255C 808D8DCC 2C61001F */ sltiu $at, $v1, 0x001F +/* 02560 808D8DD0 14200008 */ bne $at, $zero, .L808D8DF4 /* 02564 808D8DD4 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 02568 808D8DD8 86190718 */ lh $t9, 0x0718($s0) ## 00000718 /* 0256C 808D8DDC 2728FFFB */ addiu $t0, $t9, 0xFFFB ## $t0 = FFFFFFFB /* 02570 808D8DE0 A6080718 */ sh $t0, 0x0718($s0) ## 00000718 /* 02574 808D8DE4 86090718 */ lh $t1, 0x0718($s0) ## 00000718 -/* 02578 808D8DE8 05230003 */ bgezl $t1, .L808D8DF8 +/* 02578 808D8DE8 05230003 */ bgezl $t1, .L808D8DF8 /* 0257C 808D8DEC 8E0A0674 */ lw $t2, 0x0674($s0) ## 00000674 /* 02580 808D8DF0 A6000718 */ sh $zero, 0x0718($s0) ## 00000718 .L808D8DF4: /* 02584 808D8DF4 8E0A0674 */ lw $t2, 0x0674($s0) ## 00000674 .L808D8DF8: /* 02588 808D8DF8 24010078 */ addiu $at, $zero, 0x0078 ## $at = 00000078 -/* 0258C 808D8DFC 15410028 */ bne $t2, $at, .L808D8EA0 +/* 0258C 808D8DFC 15410028 */ bne $t2, $at, .L808D8EA0 /* 02590 808D8E00 00000000 */ nop -/* 02594 808D8E04 0C030129 */ jal func_800C04A4 -/* 02598 808D8E08 8FA40074 */ lw $a0, 0x0074($sp) +/* 02594 808D8E04 0C030129 */ jal func_800C04A4 +/* 02598 808D8E08 8FA40074 */ lw $a0, 0x0074($sp) /* 0259C 808D8E0C 26030680 */ addiu $v1, $s0, 0x0680 ## $v1 = 00000680 /* 025A0 808D8E10 8C6C0000 */ lw $t4, 0x0000($v1) ## 00000680 /* 025A4 808D8E14 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 @@ -1469,7 +1469,7 @@ glabel L808D8A98 /* 025C8 808D8E38 AC4D0078 */ sw $t5, 0x0078($v0) ## 00000078 /* 025CC 808D8E3C 8C6E0008 */ lw $t6, 0x0008($v1) ## 00000688 /* 025D0 808D8E40 AC4E007C */ sw $t6, 0x007C($v0) ## 0000007C -/* 025D4 808D8E44 8FAF0048 */ lw $t7, 0x0048($sp) +/* 025D4 808D8E44 8FAF0048 */ lw $t7, 0x0048($sp) /* 025D8 808D8E48 8DF90000 */ lw $t9, 0x0000($t7) ## 00000000 /* 025DC 808D8E4C AC590050 */ sw $t9, 0x0050($v0) ## 00000050 /* 025E0 808D8E50 8DF80004 */ lw $t8, 0x0004($t7) ## 00000004 @@ -1477,26 +1477,26 @@ glabel L808D8A98 /* 025E8 808D8E58 8DF90008 */ lw $t9, 0x0008($t7) ## 00000008 /* 025EC 808D8E5C AC590058 */ sw $t9, 0x0058($v0) ## 00000058 /* 025F0 808D8E60 8605067A */ lh $a1, 0x067A($s0) ## 0000067A -/* 025F4 808D8E64 0C03022B */ jal func_800C08AC -/* 025F8 808D8E68 8FA40074 */ lw $a0, 0x0074($sp) -/* 025FC 808D8E6C 8FA40074 */ lw $a0, 0x0074($sp) +/* 025F4 808D8E64 0C03022B */ jal func_800C08AC +/* 025F8 808D8E68 8FA40074 */ lw $a0, 0x0074($sp) +/* 025FC 808D8E6C 8FA40074 */ lw $a0, 0x0074($sp) /* 02600 808D8E70 A600067A */ sh $zero, 0x067A($s0) ## 0000067A /* 02604 808D8E74 8608067A */ lh $t0, 0x067A($s0) ## 0000067A /* 02608 808D8E78 24851D64 */ addiu $a1, $a0, 0x1D64 ## $a1 = 00001D64 -/* 0260C 808D8E7C 0C01914D */ jal func_80064534 +/* 0260C 808D8E7C 0C01914D */ jal func_80064534 /* 02610 808D8E80 A6080678 */ sh $t0, 0x0678($s0) ## 00000678 -/* 02614 808D8E84 8FA40074 */ lw $a0, 0x0074($sp) +/* 02614 808D8E84 8FA40074 */ lw $a0, 0x0074($sp) /* 02618 808D8E88 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 0261C 808D8E8C 0C00B7D5 */ jal func_8002DF54 +/* 0261C 808D8E8C 0C00B7D5 */ jal func_8002DF54 /* 02620 808D8E90 24060007 */ addiu $a2, $zero, 0x0007 ## $a2 = 00000007 /* 02624 808D8E94 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02628 808D8E98 0C236EBC */ jal func_808DBAF0 -/* 0262C 808D8E9C 8FA50074 */ lw $a1, 0x0074($sp) +/* 02628 808D8E98 0C236EBC */ jal func_808DBAF0 +/* 0262C 808D8E9C 8FA50074 */ lw $a1, 0x0074($sp) .L808D8EA0: /* 02630 808D8EA0 3C038090 */ lui $v1, %hi(D_808F93D4) ## $v1 = 80900000 /* 02634 808D8EA4 246393D4 */ addiu $v1, $v1, %lo(D_808F93D4) ## $v1 = 808F93D4 /* 02638 808D8EA8 8C620000 */ lw $v0, 0x0000($v1) ## 808F93D4 -/* 0263C 808D8EAC 5040000A */ beql $v0, $zero, .L808D8ED8 +/* 0263C 808D8EAC 5040000A */ beql $v0, $zero, .L808D8ED8 /* 02640 808D8EB0 8605067A */ lh $a1, 0x067A($s0) ## 0000067A /* 02644 808D8EB4 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 /* 02648 808D8EB8 3C0143AF */ lui $at, 0x43AF ## $at = 43AF0000 @@ -1511,92 +1511,92 @@ glabel L808D8ED4 /* 02664 808D8ED4 8605067A */ lh $a1, 0x067A($s0) ## 0000067A .L808D8ED8: /* 02668 808D8ED8 260B068C */ addiu $t3, $s0, 0x068C ## $t3 = 0000068C -/* 0266C 808D8EDC 50A0004A */ beql $a1, $zero, .L808D9008 -/* 02670 808D8EE0 8FBF003C */ lw $ra, 0x003C($sp) -/* 02674 808D8EE4 93AD006F */ lbu $t5, 0x006F($sp) +/* 0266C 808D8EDC 50A0004A */ beql $a1, $zero, .L808D9008 +/* 02670 808D8EE0 8FBF003C */ lw $ra, 0x003C($sp) +/* 02674 808D8EE4 93AD006F */ lbu $t5, 0x006F($sp) /* 02678 808D8EE8 260C0680 */ addiu $t4, $s0, 0x0680 ## $t4 = 00000680 -/* 0267C 808D8EEC AFAC0044 */ sw $t4, 0x0044($sp) -/* 02680 808D8EF0 11A0003C */ beq $t5, $zero, .L808D8FE4 -/* 02684 808D8EF4 AFAB0048 */ sw $t3, 0x0048($sp) +/* 0267C 808D8EEC AFAC0044 */ sw $t4, 0x0044($sp) +/* 02680 808D8EF0 11A0003C */ beq $t5, $zero, .L808D8FE4 +/* 02684 808D8EF4 AFAB0048 */ sw $t3, 0x0048($sp) /* 02688 808D8EF8 C61006A4 */ lwc1 $f16, 0x06A4($s0) ## 000006A4 /* 0268C 808D8EFC C61206EC */ lwc1 $f18, 0x06EC($s0) ## 000006EC /* 02690 808D8F00 8E0506BC */ lw $a1, 0x06BC($s0) ## 000006BC /* 02694 808D8F04 8E0606F0 */ lw $a2, 0x06F0($s0) ## 000006F0 -/* 02698 808D8F08 46128102 */ mul.s $f4, $f16, $f18 +/* 02698 808D8F08 46128102 */ mul.s $f4, $f16, $f18 /* 0269C 808D8F0C 260E0688 */ addiu $t6, $s0, 0x0688 ## $t6 = 00000688 /* 026A0 808D8F10 260F0690 */ addiu $t7, $s0, 0x0690 ## $t7 = 00000690 -/* 026A4 808D8F14 AFAF004C */ sw $t7, 0x004C($sp) -/* 026A8 808D8F18 AFAE0050 */ sw $t6, 0x0050($sp) +/* 026A4 808D8F14 AFAF004C */ sw $t7, 0x004C($sp) +/* 026A8 808D8F18 AFAE0050 */ sw $t6, 0x0050($sp) /* 026AC 808D8F1C 01802025 */ or $a0, $t4, $zero ## $a0 = 00000680 -/* 026B0 808D8F20 44072000 */ mfc1 $a3, $f4 +/* 026B0 808D8F20 44072000 */ mfc1 $a3, $f4 /* 026B4 808D8F24 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 026B8 808D8F28 00000000 */ nop /* 026BC 808D8F2C C60606A8 */ lwc1 $f6, 0x06A8($s0) ## 000006A8 /* 026C0 808D8F30 C60806EC */ lwc1 $f8, 0x06EC($s0) ## 000006EC /* 026C4 808D8F34 26040684 */ addiu $a0, $s0, 0x0684 ## $a0 = 00000684 /* 026C8 808D8F38 8E0506C0 */ lw $a1, 0x06C0($s0) ## 000006C0 -/* 026CC 808D8F3C 46083282 */ mul.s $f10, $f6, $f8 +/* 026CC 808D8F3C 46083282 */ mul.s $f10, $f6, $f8 /* 026D0 808D8F40 8E0606F0 */ lw $a2, 0x06F0($s0) ## 000006F0 -/* 026D4 808D8F44 44075000 */ mfc1 $a3, $f10 +/* 026D4 808D8F44 44075000 */ mfc1 $a3, $f10 /* 026D8 808D8F48 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 026DC 808D8F4C 00000000 */ nop /* 026E0 808D8F50 C61006AC */ lwc1 $f16, 0x06AC($s0) ## 000006AC /* 026E4 808D8F54 C61206EC */ lwc1 $f18, 0x06EC($s0) ## 000006EC -/* 026E8 808D8F58 8FA40050 */ lw $a0, 0x0050($sp) +/* 026E8 808D8F58 8FA40050 */ lw $a0, 0x0050($sp) /* 026EC 808D8F5C 8E0506C4 */ lw $a1, 0x06C4($s0) ## 000006C4 -/* 026F0 808D8F60 46128102 */ mul.s $f4, $f16, $f18 +/* 026F0 808D8F60 46128102 */ mul.s $f4, $f16, $f18 /* 026F4 808D8F64 8E0606F0 */ lw $a2, 0x06F0($s0) ## 000006F0 -/* 026F8 808D8F68 44072000 */ mfc1 $a3, $f4 +/* 026F8 808D8F68 44072000 */ mfc1 $a3, $f4 /* 026FC 808D8F6C 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 02700 808D8F70 00000000 */ nop /* 02704 808D8F74 C60606B0 */ lwc1 $f6, 0x06B0($s0) ## 000006B0 /* 02708 808D8F78 C60806EC */ lwc1 $f8, 0x06EC($s0) ## 000006EC -/* 0270C 808D8F7C 8FA40048 */ lw $a0, 0x0048($sp) +/* 0270C 808D8F7C 8FA40048 */ lw $a0, 0x0048($sp) /* 02710 808D8F80 8E0506D4 */ lw $a1, 0x06D4($s0) ## 000006D4 -/* 02714 808D8F84 46083282 */ mul.s $f10, $f6, $f8 +/* 02714 808D8F84 46083282 */ mul.s $f10, $f6, $f8 /* 02718 808D8F88 8E0606F0 */ lw $a2, 0x06F0($s0) ## 000006F0 -/* 0271C 808D8F8C 44075000 */ mfc1 $a3, $f10 +/* 0271C 808D8F8C 44075000 */ mfc1 $a3, $f10 /* 02720 808D8F90 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 02724 808D8F94 00000000 */ nop /* 02728 808D8F98 C61006B4 */ lwc1 $f16, 0x06B4($s0) ## 000006B4 /* 0272C 808D8F9C C61206EC */ lwc1 $f18, 0x06EC($s0) ## 000006EC -/* 02730 808D8FA0 8FA4004C */ lw $a0, 0x004C($sp) +/* 02730 808D8FA0 8FA4004C */ lw $a0, 0x004C($sp) /* 02734 808D8FA4 8E0506D8 */ lw $a1, 0x06D8($s0) ## 000006D8 -/* 02738 808D8FA8 46128102 */ mul.s $f4, $f16, $f18 +/* 02738 808D8FA8 46128102 */ mul.s $f4, $f16, $f18 /* 0273C 808D8FAC 8E0606F0 */ lw $a2, 0x06F0($s0) ## 000006F0 -/* 02740 808D8FB0 44072000 */ mfc1 $a3, $f4 +/* 02740 808D8FB0 44072000 */ mfc1 $a3, $f4 /* 02744 808D8FB4 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 02748 808D8FB8 00000000 */ nop /* 0274C 808D8FBC C60606B8 */ lwc1 $f6, 0x06B8($s0) ## 000006B8 /* 02750 808D8FC0 C60806EC */ lwc1 $f8, 0x06EC($s0) ## 000006EC /* 02754 808D8FC4 26040694 */ addiu $a0, $s0, 0x0694 ## $a0 = 00000694 /* 02758 808D8FC8 8E0506DC */ lw $a1, 0x06DC($s0) ## 000006DC -/* 0275C 808D8FCC 46083282 */ mul.s $f10, $f6, $f8 +/* 0275C 808D8FCC 46083282 */ mul.s $f10, $f6, $f8 /* 02760 808D8FD0 8E0606F0 */ lw $a2, 0x06F0($s0) ## 000006F0 -/* 02764 808D8FD4 44075000 */ mfc1 $a3, $f10 +/* 02764 808D8FD4 44075000 */ mfc1 $a3, $f10 /* 02768 808D8FD8 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 0276C 808D8FDC 00000000 */ nop /* 02770 808D8FE0 8605067A */ lh $a1, 0x067A($s0) ## 0000067A .L808D8FE4: -/* 02774 808D8FE4 8FA40074 */ lw $a0, 0x0074($sp) -/* 02778 808D8FE8 8FA60048 */ lw $a2, 0x0048($sp) -/* 0277C 808D8FEC 0C030136 */ jal func_800C04D8 -/* 02780 808D8FF0 8FA70044 */ lw $a3, 0x0044($sp) -/* 02784 808D8FF4 8FA40074 */ lw $a0, 0x0074($sp) +/* 02774 808D8FE4 8FA40074 */ lw $a0, 0x0074($sp) +/* 02778 808D8FE8 8FA60048 */ lw $a2, 0x0048($sp) +/* 0277C 808D8FEC 0C030136 */ jal func_800C04D8 +/* 02780 808D8FF0 8FA70044 */ lw $a3, 0x0044($sp) +/* 02784 808D8FF4 8FA40074 */ lw $a0, 0x0074($sp) /* 02788 808D8FF8 8605067A */ lh $a1, 0x067A($s0) ## 0000067A -/* 0278C 808D8FFC 0C0301C1 */ jal func_800C0704 +/* 0278C 808D8FFC 0C0301C1 */ jal func_800C0704 /* 02790 808D9000 8E0606F4 */ lw $a2, 0x06F4($s0) ## 000006F4 -/* 02794 808D9004 8FBF003C */ lw $ra, 0x003C($sp) +/* 02794 808D9004 8FBF003C */ lw $ra, 0x003C($sp) .L808D9008: -/* 02798 808D9008 8FB00038 */ lw $s0, 0x0038($sp) +/* 02798 808D9008 8FB00038 */ lw $s0, 0x0038($sp) /* 0279C 808D900C 27BD0070 */ addiu $sp, $sp, 0x0070 ## $sp = 00000000 -/* 027A0 808D9010 03E00008 */ jr $ra +/* 027A0 808D9010 03E00008 */ jr $ra /* 027A4 808D9014 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808D9018.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808D9018.s index 021d818092..52637c2ccb 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808D9018.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808D9018.s @@ -1,23 +1,23 @@ glabel func_808D9018 /* 027A8 808D9018 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 027AC 808D901C AFB00018 */ sw $s0, 0x0018($sp) +/* 027AC 808D901C AFB00018 */ sw $s0, 0x0018($sp) /* 027B0 808D9020 3C010001 */ lui $at, 0x0001 ## $at = 00010000 /* 027B4 808D9024 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 027B8 808D9028 342117A4 */ ori $at, $at, 0x17A4 ## $at = 000117A4 -/* 027BC 808D902C AFBF001C */ sw $ra, 0x001C($sp) -/* 027C0 808D9030 AFA50034 */ sw $a1, 0x0034($sp) -/* 027C4 808D9034 00A12021 */ addu $a0, $a1, $at -/* 027C8 808D9038 AFA40024 */ sw $a0, 0x0024($sp) +/* 027BC 808D902C AFBF001C */ sw $ra, 0x001C($sp) +/* 027C0 808D9030 AFA50034 */ sw $a1, 0x0034($sp) +/* 027C4 808D9034 00A12021 */ addu $a0, $a1, $at +/* 027C8 808D9038 AFA40024 */ sw $a0, 0x0024($sp) /* 027CC 808D903C 0C02604B */ jal Object_GetIndex ## ObjectIndex /* 027D0 808D9040 2405017D */ addiu $a1, $zero, 0x017D ## $a1 = 0000017D -/* 027D4 808D9044 8FA40024 */ lw $a0, 0x0024($sp) +/* 027D4 808D9044 8FA40024 */ lw $a0, 0x0024($sp) /* 027D8 808D9048 00402825 */ or $a1, $v0, $zero ## $a1 = 00000000 /* 027DC 808D904C 0C026062 */ jal Object_IsLoaded - -/* 027E0 808D9050 AFA20028 */ sw $v0, 0x0028($sp) -/* 027E4 808D9054 10400023 */ beq $v0, $zero, .L808D90E4 -/* 027E8 808D9058 8FA30028 */ lw $v1, 0x0028($sp) + +/* 027E0 808D9050 AFA20028 */ sw $v0, 0x0028($sp) +/* 027E4 808D9054 10400023 */ beq $v0, $zero, .L808D90E4 +/* 027E8 808D9058 8FA30028 */ lw $v1, 0x0028($sp) /* 027EC 808D905C A6000678 */ sh $zero, 0x0678($s0) ## 00000678 /* 027F0 808D9060 860F0678 */ lh $t7, 0x0678($s0) ## 00000678 /* 027F4 808D9064 3C0E808E */ lui $t6, %hi(func_808D933C) ## $t6 = 808E0000 @@ -27,37 +27,37 @@ glabel func_808D9018 /* 02804 808D9074 A2180198 */ sb $t8, 0x0198($s0) ## 00000198 /* 02808 808D9078 AE03014C */ sw $v1, 0x014C($s0) ## 0000014C /* 0280C 808D907C AE0F0674 */ sw $t7, 0x0674($s0) ## 00000674 -/* 02810 808D9080 8FB90034 */ lw $t9, 0x0034($sp) -/* 02814 808D9084 00034100 */ sll $t0, $v1, 4 -/* 02818 808D9088 01034021 */ addu $t0, $t0, $v1 -/* 0281C 808D908C 00084080 */ sll $t0, $t0, 2 +/* 02810 808D9080 8FB90034 */ lw $t9, 0x0034($sp) +/* 02814 808D9084 00034100 */ sll $t0, $v1, 4 +/* 02818 808D9088 01034021 */ addu $t0, $t0, $v1 +/* 0281C 808D908C 00084080 */ sll $t0, $t0, 2 /* 02820 808D9090 3C0A0001 */ lui $t2, 0x0001 ## $t2 = 00010000 -/* 02824 808D9094 03284821 */ addu $t1, $t9, $t0 -/* 02828 808D9098 01495021 */ addu $t2, $t2, $t1 +/* 02824 808D9094 03284821 */ addu $t1, $t9, $t0 +/* 02828 808D9098 01495021 */ addu $t2, $t2, $t1 /* 0282C 808D909C 8D4A17B4 */ lw $t2, 0x17B4($t2) ## 000117B4 /* 02830 808D90A0 3C018000 */ lui $at, 0x8000 ## $at = 80000000 /* 02834 808D90A4 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 -/* 02838 808D90A8 01415821 */ addu $t3, $t2, $at +/* 02838 808D90A8 01415821 */ addu $t3, $t2, $at /* 0283C 808D90AC 3C018016 */ lui $at, 0x8016 ## $at = 80160000 /* 02840 808D90B0 AC2B6FC0 */ sw $t3, 0x6FC0($at) ## 80166FC0 /* 02844 808D90B4 24A5EA00 */ addiu $a1, $a1, 0xEA00 ## $a1 = 0600EA00 /* 02848 808D90B8 26040150 */ addiu $a0, $s0, 0x0150 ## $a0 = 00000150 -/* 0284C 808D90BC 0C029490 */ jal func_800A5240 +/* 0284C 808D90BC 0C029490 */ jal SkelAnime_ChangeAnimTransitionStop /* 02850 808D90C0 24060000 */ addiu $a2, $zero, 0x0000 ## $a2 = 00000000 /* 02854 808D90C4 3C040601 */ lui $a0, 0x0601 ## $a0 = 06010000 /* 02858 808D90C8 0C028800 */ jal SkelAnime_GetFrameCount - + /* 0285C 808D90CC 2484EA00 */ addiu $a0, $a0, 0xEA00 ## $a0 = 0600EA00 /* 02860 808D90D0 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 02864 808D90D4 44804000 */ mtc1 $zero, $f8 ## $f8 = 0.00 -/* 02868 808D90D8 468021A0 */ cvt.s.w $f6, $f4 +/* 02868 808D90D8 468021A0 */ cvt.s.w $f6, $f4 /* 0286C 808D90DC E6080508 */ swc1 $f8, 0x0508($s0) ## 00000508 /* 02870 808D90E0 E60601CC */ swc1 $f6, 0x01CC($s0) ## 000001CC .L808D90E4: -/* 02874 808D90E4 8FBF001C */ lw $ra, 0x001C($sp) -/* 02878 808D90E8 8FB00018 */ lw $s0, 0x0018($sp) +/* 02874 808D90E4 8FBF001C */ lw $ra, 0x001C($sp) +/* 02878 808D90E8 8FB00018 */ lw $s0, 0x0018($sp) /* 0287C 808D90EC 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 02880 808D90F0 03E00008 */ jr $ra +/* 02880 808D90F0 03E00008 */ jr $ra /* 02884 808D90F4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808D90F8.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808D90F8.s index 0678e68e92..a347559ee5 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808D90F8.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808D90F8.s @@ -1,49 +1,49 @@ glabel func_808D90F8 /* 02888 808D90F8 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 0288C 808D90FC AFB00018 */ sw $s0, 0x0018($sp) +/* 0288C 808D90FC AFB00018 */ sw $s0, 0x0018($sp) /* 02890 808D9100 3C010001 */ lui $at, 0x0001 ## $at = 00010000 /* 02894 808D9104 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 02898 808D9108 342117A4 */ ori $at, $at, 0x17A4 ## $at = 000117A4 -/* 0289C 808D910C AFBF001C */ sw $ra, 0x001C($sp) -/* 028A0 808D9110 AFA50034 */ sw $a1, 0x0034($sp) -/* 028A4 808D9114 00A12021 */ addu $a0, $a1, $at -/* 028A8 808D9118 AFA40024 */ sw $a0, 0x0024($sp) +/* 0289C 808D910C AFBF001C */ sw $ra, 0x001C($sp) +/* 028A0 808D9110 AFA50034 */ sw $a1, 0x0034($sp) +/* 028A4 808D9114 00A12021 */ addu $a0, $a1, $at +/* 028A8 808D9118 AFA40024 */ sw $a0, 0x0024($sp) /* 028AC 808D911C 0C02604B */ jal Object_GetIndex ## ObjectIndex /* 028B0 808D9120 2405017D */ addiu $a1, $zero, 0x017D ## $a1 = 0000017D -/* 028B4 808D9124 8FA40024 */ lw $a0, 0x0024($sp) +/* 028B4 808D9124 8FA40024 */ lw $a0, 0x0024($sp) /* 028B8 808D9128 00402825 */ or $a1, $v0, $zero ## $a1 = 00000000 /* 028BC 808D912C 0C026062 */ jal Object_IsLoaded - -/* 028C0 808D9130 AFA20028 */ sw $v0, 0x0028($sp) -/* 028C4 808D9134 10400028 */ beq $v0, $zero, .L808D91D8 -/* 028C8 808D9138 8FA30028 */ lw $v1, 0x0028($sp) + +/* 028C0 808D9130 AFA20028 */ sw $v0, 0x0028($sp) +/* 028C4 808D9134 10400028 */ beq $v0, $zero, .L808D91D8 +/* 028C8 808D9138 8FA30028 */ lw $v1, 0x0028($sp) /* 028CC 808D913C AE03014C */ sw $v1, 0x014C($s0) ## 0000014C -/* 028D0 808D9140 8FAE0034 */ lw $t6, 0x0034($sp) -/* 028D4 808D9144 00037900 */ sll $t7, $v1, 4 -/* 028D8 808D9148 01E37821 */ addu $t7, $t7, $v1 -/* 028DC 808D914C 000F7880 */ sll $t7, $t7, 2 +/* 028D0 808D9140 8FAE0034 */ lw $t6, 0x0034($sp) +/* 028D4 808D9144 00037900 */ sll $t7, $v1, 4 +/* 028D8 808D9148 01E37821 */ addu $t7, $t7, $v1 +/* 028DC 808D914C 000F7880 */ sll $t7, $t7, 2 /* 028E0 808D9150 3C190001 */ lui $t9, 0x0001 ## $t9 = 00010000 -/* 028E4 808D9154 01CFC021 */ addu $t8, $t6, $t7 -/* 028E8 808D9158 0338C821 */ addu $t9, $t9, $t8 +/* 028E4 808D9154 01CFC021 */ addu $t8, $t6, $t7 +/* 028E8 808D9158 0338C821 */ addu $t9, $t9, $t8 /* 028EC 808D915C 8F3917B4 */ lw $t9, 0x17B4($t9) ## 000117B4 /* 028F0 808D9160 3C018000 */ lui $at, 0x8000 ## $at = 80000000 /* 028F4 808D9164 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 -/* 028F8 808D9168 03214021 */ addu $t0, $t9, $at +/* 028F8 808D9168 03214021 */ addu $t0, $t9, $at /* 028FC 808D916C 3C018016 */ lui $at, 0x8016 ## $at = 80160000 /* 02900 808D9170 AC286FC0 */ sw $t0, 0x6FC0($at) ## 80166FC0 /* 02904 808D9174 24A5EA00 */ addiu $a1, $a1, 0xEA00 ## $a1 = 0600EA00 /* 02908 808D9178 26040150 */ addiu $a0, $s0, 0x0150 ## $a0 = 00000150 -/* 0290C 808D917C 0C029490 */ jal func_800A5240 +/* 0290C 808D917C 0C029490 */ jal SkelAnime_ChangeAnimTransitionStop /* 02910 808D9180 24060000 */ addiu $a2, $zero, 0x0000 ## $a2 = 00000000 /* 02914 808D9184 3C040601 */ lui $a0, 0x0601 ## $a0 = 06010000 /* 02918 808D9188 0C028800 */ jal SkelAnime_GetFrameCount - + /* 0291C 808D918C 2484EA00 */ addiu $a0, $a0, 0xEA00 ## $a0 = 0600EA00 /* 02920 808D9190 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 02924 808D9194 3C09808E */ lui $t1, %hi(func_808D933C) ## $t1 = 808E0000 /* 02928 808D9198 3C038016 */ lui $v1, 0x8016 ## $v1 = 80160000 -/* 0292C 808D919C 468021A0 */ cvt.s.w $f6, $f4 +/* 0292C 808D919C 468021A0 */ cvt.s.w $f6, $f4 /* 02930 808D91A0 2529933C */ addiu $t1, $t1, %lo(func_808D933C) ## $t1 = 808D933C /* 02934 808D91A4 240A0064 */ addiu $t2, $zero, 0x0064 ## $t2 = 00000064 /* 02938 808D91A8 240B0001 */ addiu $t3, $zero, 0x0001 ## $t3 = 00000001 @@ -56,17 +56,17 @@ glabel func_808D90F8 /* 02954 808D91C4 846C13F4 */ lh $t4, 0x13F4($v1) ## 8015FA54 /* 02958 808D91C8 846D002E */ lh $t5, 0x002E($v1) ## 8015E68E /* 0295C 808D91CC A06C0033 */ sb $t4, 0x0033($v1) ## 8015E693 -/* 02960 808D91D0 10000004 */ beq $zero, $zero, .L808D91E4 +/* 02960 808D91D0 10000004 */ beq $zero, $zero, .L808D91E4 /* 02964 808D91D4 A46D0030 */ sh $t5, 0x0030($v1) ## 8015E690 .L808D91D8: /* 02968 808D91D8 3C0E808E */ lui $t6, %hi(func_808D90F8) ## $t6 = 808E0000 /* 0296C 808D91DC 25CE90F8 */ addiu $t6, $t6, %lo(func_808D90F8) ## $t6 = 808D90F8 /* 02970 808D91E0 AE0E0194 */ sw $t6, 0x0194($s0) ## 00000194 .L808D91E4: -/* 02974 808D91E4 8FBF001C */ lw $ra, 0x001C($sp) -/* 02978 808D91E8 8FB00018 */ lw $s0, 0x0018($sp) +/* 02974 808D91E4 8FBF001C */ lw $ra, 0x001C($sp) +/* 02978 808D91E8 8FB00018 */ lw $s0, 0x0018($sp) /* 0297C 808D91EC 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 02980 808D91F0 03E00008 */ jr $ra +/* 02980 808D91F0 03E00008 */ jr $ra /* 02984 808D91F4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808D933C.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808D933C.s index 0b0879e844..047dcfbe28 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808D933C.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808D933C.s @@ -1,89 +1,89 @@ glabel func_808D933C /* 02ACC 808D933C 27BDFF50 */ addiu $sp, $sp, 0xFF50 ## $sp = FFFFFF50 -/* 02AD0 808D9340 AFBF003C */ sw $ra, 0x003C($sp) -/* 02AD4 808D9344 AFB00038 */ sw $s0, 0x0038($sp) -/* 02AD8 808D9348 A3A000AD */ sb $zero, 0x00AD($sp) +/* 02AD0 808D9340 AFBF003C */ sw $ra, 0x003C($sp) +/* 02AD4 808D9344 AFB00038 */ sw $s0, 0x0038($sp) +/* 02AD8 808D9348 A3A000AD */ sb $zero, 0x00AD($sp) /* 02ADC 808D934C 8CAE1C44 */ lw $t6, 0x1C44($a1) ## 00001C44 /* 02AE0 808D9350 3C090001 */ lui $t1, 0x0001 ## $t1 = 00010000 /* 02AE4 808D9354 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 02AE8 808D9358 AFAE00A8 */ sw $t6, 0x00A8($sp) +/* 02AE8 808D9358 AFAE00A8 */ sw $t6, 0x00A8($sp) /* 02AEC 808D935C 8C8F014C */ lw $t7, 0x014C($a0) ## 0000014C /* 02AF0 808D9360 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 02AF4 808D9364 24840150 */ addiu $a0, $a0, 0x0150 ## $a0 = 00000150 -/* 02AF8 808D9368 000FC100 */ sll $t8, $t7, 4 -/* 02AFC 808D936C 030FC021 */ addu $t8, $t8, $t7 -/* 02B00 808D9370 0018C080 */ sll $t8, $t8, 2 -/* 02B04 808D9374 00B8C821 */ addu $t9, $a1, $t8 -/* 02B08 808D9378 01394821 */ addu $t1, $t1, $t9 +/* 02AF8 808D9368 000FC100 */ sll $t8, $t7, 4 +/* 02AFC 808D936C 030FC021 */ addu $t8, $t8, $t7 +/* 02B00 808D9370 0018C080 */ sll $t8, $t8, 2 +/* 02B04 808D9374 00B8C821 */ addu $t9, $a1, $t8 +/* 02B08 808D9378 01394821 */ addu $t1, $t1, $t9 /* 02B0C 808D937C 8D2917B4 */ lw $t1, 0x17B4($t1) ## 000117B4 -/* 02B10 808D9380 01215021 */ addu $t2, $t1, $at +/* 02B10 808D9380 01215021 */ addu $t2, $t1, $at /* 02B14 808D9384 3C018016 */ lui $at, 0x8016 ## $at = 80160000 /* 02B18 808D9388 AC2A6FC0 */ sw $t2, 0x6FC0($at) ## 80166FC0 /* 02B1C 808D938C 8C8B0524 */ lw $t3, 0x0524($a0) ## 00000674 /* 02B20 808D9390 256C0001 */ addiu $t4, $t3, 0x0001 ## $t4 = 00000001 /* 02B24 808D9394 AC8C0524 */ sw $t4, 0x0524($a0) ## 00000674 -/* 02B28 808D9398 AFA500B4 */ sw $a1, 0x00B4($sp) +/* 02B28 808D9398 AFA500B4 */ sw $a1, 0x00B4($sp) /* 02B2C 808D939C 0C02927F */ jal SkelAnime_FrameUpdateMatrix - -/* 02B30 808D93A0 AFA40054 */ sw $a0, 0x0054($sp) + +/* 02B30 808D93A0 AFA40054 */ sw $a0, 0x0054($sp) /* 02B34 808D93A4 86040678 */ lh $a0, 0x0678($s0) ## 00000678 -/* 02B38 808D93A8 28810420 */ slti $at, $a0, 0x0420 -/* 02B3C 808D93AC 14200008 */ bne $at, $zero, .L808D93D0 +/* 02B38 808D93A8 28810420 */ slti $at, $a0, 0x0420 +/* 02B3C 808D93AC 14200008 */ bne $at, $zero, .L808D93D0 /* 02B40 808D93B0 00801825 */ or $v1, $a0, $zero ## $v1 = 00000000 /* 02B44 808D93B4 24010420 */ addiu $at, $zero, 0x0420 ## $at = 00000420 -/* 02B48 808D93B8 1061047C */ beq $v1, $at, .L808DA5AC +/* 02B48 808D93B8 1061047C */ beq $v1, $at, .L808DA5AC /* 02B4C 808D93BC 24010421 */ addiu $at, $zero, 0x0421 ## $at = 00000421 -/* 02B50 808D93C0 506104A7 */ beql $v1, $at, .L808DA660 +/* 02B50 808D93C0 506104A7 */ beql $v1, $at, .L808DA660 /* 02B54 808D93C4 8E040674 */ lw $a0, 0x0674($s0) ## 00000674 -/* 02B58 808D93C8 100005E9 */ beq $zero, $zero, .L808DAB70 -/* 02B5C 808D93CC 28810064 */ slti $at, $a0, 0x0064 +/* 02B58 808D93C8 100005E9 */ beq $zero, $zero, .L808DAB70 +/* 02B5C 808D93CC 28810064 */ slti $at, $a0, 0x0064 .L808D93D0: -/* 02B60 808D93D0 2861006E */ slti $at, $v1, 0x006E -/* 02B64 808D93D4 14200006 */ bne $at, $zero, .L808D93F0 +/* 02B60 808D93D0 2861006E */ slti $at, $v1, 0x006E +/* 02B64 808D93D4 14200006 */ bne $at, $zero, .L808D93F0 /* 02B68 808D93D8 246DFF9C */ addiu $t5, $v1, 0xFF9C ## $t5 = FFFFFF9C /* 02B6C 808D93DC 2401041F */ addiu $at, $zero, 0x041F ## $at = 0000041F -/* 02B70 808D93E0 5061044D */ beql $v1, $at, .L808DA518 +/* 02B70 808D93E0 5061044D */ beql $v1, $at, .L808DA518 /* 02B74 808D93E4 8E040674 */ lw $a0, 0x0674($s0) ## 00000674 -/* 02B78 808D93E8 100005E1 */ beq $zero, $zero, .L808DAB70 -/* 02B7C 808D93EC 28810064 */ slti $at, $a0, 0x0064 +/* 02B78 808D93E8 100005E1 */ beq $zero, $zero, .L808DAB70 +/* 02B7C 808D93EC 28810064 */ slti $at, $a0, 0x0064 .L808D93F0: -/* 02B80 808D93F0 2861000A */ slti $at, $v1, 0x000A -/* 02B84 808D93F4 14200009 */ bne $at, $zero, .L808D941C -/* 02B88 808D93F8 00037080 */ sll $t6, $v1, 2 -/* 02B8C 808D93FC 2DA1000A */ sltiu $at, $t5, 0x000A -/* 02B90 808D9400 102005DA */ beq $at, $zero, .L808DAB6C -/* 02B94 808D9404 000D6880 */ sll $t5, $t5, 2 +/* 02B80 808D93F0 2861000A */ slti $at, $v1, 0x000A +/* 02B84 808D93F4 14200009 */ bne $at, $zero, .L808D941C +/* 02B88 808D93F8 00037080 */ sll $t6, $v1, 2 +/* 02B8C 808D93FC 2DA1000A */ sltiu $at, $t5, 0x000A +/* 02B90 808D9400 102005DA */ beq $at, $zero, .L808DAB6C +/* 02B94 808D9404 000D6880 */ sll $t5, $t5, 2 /* 02B98 808D9408 3C01808F */ lui $at, %hi(jtbl_808F7EF0) ## $at = 808F0000 -/* 02B9C 808D940C 002D0821 */ addu $at, $at, $t5 -/* 02BA0 808D9410 8C2D7EF0 */ lw $t5, %lo(jtbl_808F7EF0)($at) -/* 02BA4 808D9414 01A00008 */ jr $t5 +/* 02B9C 808D940C 002D0821 */ addu $at, $at, $t5 +/* 02BA0 808D9410 8C2D7EF0 */ lw $t5, %lo(jtbl_808F7EF0)($at) +/* 02BA4 808D9414 01A00008 */ jr $t5 /* 02BA8 808D9418 00000000 */ nop .L808D941C: -/* 02BAC 808D941C 2C61000A */ sltiu $at, $v1, 0x000A -/* 02BB0 808D9420 102005D2 */ beq $at, $zero, .L808DAB6C +/* 02BAC 808D941C 2C61000A */ sltiu $at, $v1, 0x000A +/* 02BB0 808D9420 102005D2 */ beq $at, $zero, .L808DAB6C /* 02BB4 808D9424 3C01808F */ lui $at, %hi(jtbl_808F7F18) ## $at = 808F0000 -/* 02BB8 808D9428 002E0821 */ addu $at, $at, $t6 -/* 02BBC 808D942C 8C2E7F18 */ lw $t6, %lo(jtbl_808F7F18)($at) -/* 02BC0 808D9430 01C00008 */ jr $t6 +/* 02BB8 808D9428 002E0821 */ addu $at, $at, $t6 +/* 02BBC 808D942C 8C2E7F18 */ lw $t6, %lo(jtbl_808F7F18)($at) +/* 02BC0 808D9430 01C00008 */ jr $t6 /* 02BC4 808D9434 00000000 */ nop glabel L808D9438 -/* 02BC8 808D9438 8FA400B4 */ lw $a0, 0x00B4($sp) -/* 02BCC 808D943C 0C019148 */ jal func_80064520 +/* 02BC8 808D9438 8FA400B4 */ lw $a0, 0x00B4($sp) +/* 02BCC 808D943C 0C019148 */ jal func_80064520 /* 02BD0 808D9440 24851D64 */ addiu $a1, $a0, 0x1D64 ## $a1 = 00001D64 -/* 02BD4 808D9444 8FA400B4 */ lw $a0, 0x00B4($sp) +/* 02BD4 808D9444 8FA400B4 */ lw $a0, 0x00B4($sp) /* 02BD8 808D9448 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 02BDC 808D944C 0C00B7D5 */ jal func_8002DF54 +/* 02BDC 808D944C 0C00B7D5 */ jal func_8002DF54 /* 02BE0 808D9450 24060008 */ addiu $a2, $zero, 0x0008 ## $a2 = 00000008 -/* 02BE4 808D9454 0C03008C */ jal func_800C0230 -/* 02BE8 808D9458 8FA400B4 */ lw $a0, 0x00B4($sp) +/* 02BE4 808D9454 0C03008C */ jal func_800C0230 +/* 02BE8 808D9458 8FA400B4 */ lw $a0, 0x00B4($sp) /* 02BEC 808D945C A602067A */ sh $v0, 0x067A($s0) ## 0000067A -/* 02BF0 808D9460 8FA400B4 */ lw $a0, 0x00B4($sp) +/* 02BF0 808D9460 8FA400B4 */ lw $a0, 0x00B4($sp) /* 02BF4 808D9464 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 02BF8 808D9468 0C0300C5 */ jal func_800C0314 +/* 02BF8 808D9468 0C0300C5 */ jal func_800C0314 /* 02BFC 808D946C 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 -/* 02C00 808D9470 8FA400B4 */ lw $a0, 0x00B4($sp) +/* 02C00 808D9470 8FA400B4 */ lw $a0, 0x00B4($sp) /* 02C04 808D9474 8605067A */ lh $a1, 0x067A($s0) ## 0000067A -/* 02C08 808D9478 0C0300C5 */ jal func_800C0314 +/* 02C08 808D9478 0C0300C5 */ jal func_800C0314 /* 02C0C 808D947C 24060007 */ addiu $a2, $zero, 0x0007 ## $a2 = 00000007 /* 02C10 808D9480 3C01428C */ lui $at, 0x428C ## $at = 428C0000 /* 02C14 808D9484 44812000 */ mtc1 $at, $f4 ## $f4 = 70.00 @@ -94,7 +94,7 @@ glabel L808D9438 /* 02C28 808D9498 E6040028 */ swc1 $f4, 0x0028($s0) ## 00000028 /* 02C2C 808D949C E6020024 */ swc1 $f2, 0x0024($s0) ## 00000024 /* 02C30 808D94A0 E606002C */ swc1 $f6, 0x002C($s0) ## 0000002C -/* 02C34 808D94A4 C4287F40 */ lwc1 $f8, %lo(D_808F7F40)($at) +/* 02C34 808D94A4 C4287F40 */ lwc1 $f8, %lo(D_808F7F40)($at) /* 02C38 808D94A8 240F0001 */ addiu $t7, $zero, 0x0001 ## $t7 = 00000001 /* 02C3C 808D94AC 24180001 */ addiu $t8, $zero, 0x0001 ## $t8 = 00000001 /* 02C40 808D94B0 A60000B6 */ sh $zero, 0x00B6($s0) ## 000000B6 @@ -103,7 +103,7 @@ glabel L808D9438 /* 02C4C 808D94BC A218071A */ sb $t8, 0x071A($s0) ## 0000071A /* 02C50 808D94C0 E60800BC */ swc1 $f8, 0x00BC($s0) ## 000000BC glabel L808D94C4 -/* 02C54 808D94C4 8FA200A8 */ lw $v0, 0x00A8($sp) +/* 02C54 808D94C4 8FA200A8 */ lw $v0, 0x00A8($sp) /* 02C58 808D94C8 3C01C120 */ lui $at, 0xC120 ## $at = C1200000 /* 02C5C 808D94CC 44815000 */ mtc1 $at, $f10 ## $f10 = -10.00 /* 02C60 808D94D0 3C0142E6 */ lui $at, 0x42E6 ## $at = 42E60000 @@ -117,19 +117,19 @@ glabel L808D94C4 /* 02C80 808D94F0 8E030674 */ lw $v1, 0x0674($s0) ## 00000674 /* 02C84 808D94F4 2409000D */ addiu $t1, $zero, 0x000D ## $t1 = 0000000D /* 02C88 808D94F8 A20901A0 */ sb $t1, 0x01A0($s0) ## 000001A0 -/* 02C8C 808D94FC 2C61001E */ sltiu $at, $v1, 0x001E -/* 02C90 808D9500 10200005 */ beq $at, $zero, .L808D9518 -/* 02C94 808D9504 8FAA00B4 */ lw $t2, 0x00B4($sp) +/* 02C8C 808D94FC 2C61001E */ sltiu $at, $v1, 0x001E +/* 02C90 808D9500 10200005 */ beq $at, $zero, .L808D9518 +/* 02C94 808D9504 8FAA00B4 */ lw $t2, 0x00B4($sp) /* 02C98 808D9508 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 02C9C 808D950C 002A0821 */ addu $at, $at, $t2 +/* 02C9C 808D950C 002A0821 */ addu $at, $at, $t2 /* 02CA0 808D9510 E4220AFC */ swc1 $f2, 0x0AFC($at) ## 00010AFC /* 02CA4 808D9514 8E030674 */ lw $v1, 0x0674($s0) ## 00000674 .L808D9518: -/* 02CA8 808D9518 2C610002 */ sltiu $at, $v1, 0x0002 -/* 02CAC 808D951C 14200004 */ bne $at, $zero, .L808D9530 -/* 02CB0 808D9520 8FAB00B4 */ lw $t3, 0x00B4($sp) +/* 02CA8 808D9518 2C610002 */ sltiu $at, $v1, 0x0002 +/* 02CAC 808D951C 14200004 */ bne $at, $zero, .L808D9530 +/* 02CB0 808D9520 8FAB00B4 */ lw $t3, 0x00B4($sp) /* 02CB4 808D9524 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 02CB8 808D9528 002B0821 */ addu $at, $at, $t3 +/* 02CB8 808D9528 002B0821 */ addu $at, $at, $t3 /* 02CBC 808D952C A0200B05 */ sb $zero, 0x0B05($at) ## 00010B05 .L808D9530: /* 02CC0 808D9530 3C01C248 */ lui $at, 0xC248 ## $at = C2480000 @@ -141,27 +141,27 @@ glabel L808D94C4 /* 02CD8 808D9548 C6060200 */ lwc1 $f6, 0x0200($s0) ## 00000200 /* 02CDC 808D954C C60401FC */ lwc1 $f4, 0x01FC($s0) ## 000001FC /* 02CE0 808D9550 C6100204 */ lwc1 $f16, 0x0204($s0) ## 00000204 -/* 02CE4 808D9554 46083280 */ add.s $f10, $f6, $f8 +/* 02CE4 808D9554 46083280 */ add.s $f10, $f6, $f8 /* 02CE8 808D9558 E6000680 */ swc1 $f0, 0x0680($s0) ## 00000680 /* 02CEC 808D955C E6000688 */ swc1 $f0, 0x0688($s0) ## 00000688 /* 02CF0 808D9560 E6120684 */ swc1 $f18, 0x0684($s0) ## 00000684 /* 02CF4 808D9564 E60A0690 */ swc1 $f10, 0x0690($s0) ## 00000690 /* 02CF8 808D9568 E604068C */ swc1 $f4, 0x068C($s0) ## 0000068C /* 02CFC 808D956C E6100694 */ swc1 $f16, 0x0694($s0) ## 00000694 -/* 02D00 808D9570 8FA40054 */ lw $a0, 0x0054($sp) -/* 02D04 808D9574 0C0295B2 */ jal func_800A56C8 +/* 02D00 808D9570 8FA40054 */ lw $a0, 0x0054($sp) +/* 02D04 808D9574 0C0295B2 */ jal func_800A56C8 /* 02D08 808D9578 8E0501CC */ lw $a1, 0x01CC($s0) ## 000001CC -/* 02D0C 808D957C 10400008 */ beq $v0, $zero, .L808D95A0 -/* 02D10 808D9580 8FA40054 */ lw $a0, 0x0054($sp) +/* 02D0C 808D957C 10400008 */ beq $v0, $zero, .L808D95A0 +/* 02D10 808D9580 8FA40054 */ lw $a0, 0x0054($sp) /* 02D14 808D9584 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 /* 02D18 808D9588 24A5F19C */ addiu $a1, $a1, 0xF19C ## $a1 = 0600F19C -/* 02D1C 808D958C 0C0294D3 */ jal func_800A534C +/* 02D1C 808D958C 0C0294D3 */ jal SkelAnime_ChangeAnimTransitionRepeat /* 02D20 808D9590 24060000 */ addiu $a2, $zero, 0x0000 ## $a2 = 00000000 /* 02D24 808D9594 240C0002 */ addiu $t4, $zero, 0x0002 ## $t4 = 00000002 /* 02D28 808D9598 A60C0678 */ sh $t4, 0x0678($s0) ## 00000678 /* 02D2C 808D959C AE000674 */ sw $zero, 0x0674($s0) ## 00000674 .L808D95A0: -/* 02D30 808D95A0 10000572 */ beq $zero, $zero, .L808DAB6C +/* 02D30 808D95A0 10000572 */ beq $zero, $zero, .L808DAB6C /* 02D34 808D95A4 86040678 */ lh $a0, 0x0678($s0) ## 00000678 glabel L808D95A8 /* 02D38 808D95A8 3C01C2C8 */ lui $at, 0xC2C8 ## $at = C2C80000 @@ -176,23 +176,23 @@ glabel L808D95A8 /* 02D5C 808D95CC C6100204 */ lwc1 $f16, 0x0204($s0) ## 00000204 /* 02D60 808D95D0 8E0E0674 */ lw $t6, 0x0674($s0) ## 00000674 /* 02D64 808D95D4 E6040684 */ swc1 $f4, 0x0684($s0) ## 00000684 -/* 02D68 808D95D8 46128100 */ add.s $f4, $f16, $f18 +/* 02D68 808D95D8 46128100 */ add.s $f4, $f16, $f18 /* 02D6C 808D95DC C60801FC */ lwc1 $f8, 0x01FC($s0) ## 000001FC /* 02D70 808D95E0 C60A0200 */ lwc1 $f10, 0x0200($s0) ## 00000200 /* 02D74 808D95E4 240D000D */ addiu $t5, $zero, 0x000D ## $t5 = 0000000D -/* 02D78 808D95E8 2DC1001E */ sltiu $at, $t6, 0x001E +/* 02D78 808D95E8 2DC1001E */ sltiu $at, $t6, 0x001E /* 02D7C 808D95EC A20D01A0 */ sb $t5, 0x01A0($s0) ## 000001A0 /* 02D80 808D95F0 E6040694 */ swc1 $f4, 0x0694($s0) ## 00000694 /* 02D84 808D95F4 E6060688 */ swc1 $f6, 0x0688($s0) ## 00000688 /* 02D88 808D95F8 E608068C */ swc1 $f8, 0x068C($s0) ## 0000068C -/* 02D8C 808D95FC 1420000C */ bne $at, $zero, .L808D9630 +/* 02D8C 808D95FC 1420000C */ bne $at, $zero, .L808D9630 /* 02D90 808D9600 E60A0690 */ swc1 $f10, 0x0690($s0) ## 00000690 /* 02D94 808D9604 240F0003 */ addiu $t7, $zero, 0x0003 ## $t7 = 00000003 /* 02D98 808D9608 A60F0678 */ sh $t7, 0x0678($s0) ## 00000678 /* 02D9C 808D960C AE000674 */ sw $zero, 0x0674($s0) ## 00000674 -/* 02DA0 808D9610 8FA400B4 */ lw $a0, 0x00B4($sp) +/* 02DA0 808D9610 8FA400B4 */ lw $a0, 0x00B4($sp) /* 02DA4 808D9614 240570CE */ addiu $a1, $zero, 0x70CE ## $a1 = 000070CE -/* 02DA8 808D9618 0C042DA0 */ jal func_8010B680 +/* 02DA8 808D9618 0C042DA0 */ jal func_8010B680 /* 02DAC 808D961C 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 /* 02DB0 808D9620 3C01447A */ lui $at, 0x447A ## $at = 447A0000 /* 02DB4 808D9624 44813000 */ mtc1 $at, $f6 ## $f6 = 1000.00 @@ -202,13 +202,13 @@ glabel L808D95A8 /* 02DC0 808D9630 861801A2 */ lh $t8, 0x01A2($s0) ## 000001A2 /* 02DC4 808D9634 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 02DC8 808D9638 3319001F */ andi $t9, $t8, 0x001F ## $t9 = 00000000 -/* 02DCC 808D963C 17200003 */ bne $t9, $zero, .L808D964C +/* 02DCC 808D963C 17200003 */ bne $t9, $zero, .L808D964C /* 02DD0 808D9640 00000000 */ nop /* 02DD4 808D9644 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 02DD8 808D9648 240539D1 */ addiu $a1, $zero, 0x39D1 ## $a1 = 000039D1 .L808D964C: -/* 02DDC 808D964C 10000547 */ beq $zero, $zero, .L808DAB6C +/* 02DDC 808D964C 10000547 */ beq $zero, $zero, .L808DAB6C /* 02DE0 808D9650 86040678 */ lh $a0, 0x0678($s0) ## 00000678 glabel L808D9654 /* 02DE4 808D9654 3C0142C8 */ lui $at, 0x42C8 ## $at = 42C80000 @@ -216,17 +216,17 @@ glabel L808D9654 /* 02DEC 808D965C C60001CC */ lwc1 $f0, 0x01CC($s0) ## 000001CC /* 02DF0 808D9660 2409000E */ addiu $t1, $zero, 0x000E ## $t1 = 0000000E /* 02DF4 808D9664 A20901A0 */ sb $t1, 0x01A0($s0) ## 000001A0 -/* 02DF8 808D9668 4600403C */ c.lt.s $f8, $f0 +/* 02DF8 808D9668 4600403C */ c.lt.s $f8, $f0 /* 02DFC 808D966C 00000000 */ nop -/* 02E00 808D9670 4502000A */ bc1fl .L808D969C +/* 02E00 808D9670 4502000A */ bc1fl .L808D969C /* 02E04 808D9674 C6120200 */ lwc1 $f18, 0x0200($s0) ## 00000200 /* 02E08 808D9678 860A01A2 */ lh $t2, 0x01A2($s0) ## 000001A2 /* 02E0C 808D967C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 02E10 808D9680 314B001F */ andi $t3, $t2, 0x001F ## $t3 = 00000000 -/* 02E14 808D9684 55600005 */ bnel $t3, $zero, .L808D969C +/* 02E14 808D9684 55600005 */ bnel $t3, $zero, .L808D969C /* 02E18 808D9688 C6120200 */ lwc1 $f18, 0x0200($s0) ## 00000200 /* 02E1C 808D968C 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 02E20 808D9690 240539D1 */ addiu $a1, $zero, 0x39D1 ## $a1 = 000039D1 /* 02E24 808D9694 C60001CC */ lwc1 $f0, 0x01CC($s0) ## 000001CC /* 02E28 808D9698 C6120200 */ lwc1 $f18, 0x0200($s0) ## 00000200 @@ -242,187 +242,187 @@ glabel L808D9654 /* 02E4C 808D96BC 44814000 */ mtc1 $at, $f8 ## $f8 = 5.00 /* 02E50 808D96C0 3C0141F0 */ lui $at, 0x41F0 ## $at = 41F00000 /* 02E54 808D96C4 44813000 */ mtc1 $at, $f6 ## $f6 = 30.00 -/* 02E58 808D96C8 46088201 */ sub.s $f8, $f16, $f8 +/* 02E58 808D96C8 46088201 */ sub.s $f8, $f16, $f8 /* 02E5C 808D96CC C6100204 */ lwc1 $f16, 0x0204($s0) ## 00000204 /* 02E60 808D96D0 3C014120 */ lui $at, 0x4120 ## $at = 41200000 -/* 02E64 808D96D4 46069180 */ add.s $f6, $f18, $f6 +/* 02E64 808D96D4 46069180 */ add.s $f6, $f18, $f6 /* 02E68 808D96D8 44819000 */ mtc1 $at, $f18 ## $f18 = 10.00 /* 02E6C 808D96DC 3C0142C8 */ lui $at, 0x42C8 ## $at = 42C80000 /* 02E70 808D96E0 44812000 */ mtc1 $at, $f4 ## $f4 = 100.00 -/* 02E74 808D96E4 46123481 */ sub.s $f18, $f6, $f18 +/* 02E74 808D96E4 46123481 */ sub.s $f18, $f6, $f18 /* 02E78 808D96E8 E60E0680 */ swc1 $f14, 0x0680($s0) ## 00000680 /* 02E7C 808D96EC E60C0684 */ swc1 $f12, 0x0684($s0) ## 00000684 -/* 02E80 808D96F0 4600203C */ c.lt.s $f4, $f0 +/* 02E80 808D96F0 4600203C */ c.lt.s $f4, $f0 /* 02E84 808D96F4 E60A0688 */ swc1 $f10, 0x0688($s0) ## 00000688 /* 02E88 808D96F8 E608068C */ swc1 $f8, 0x068C($s0) ## 0000068C /* 02E8C 808D96FC E6120690 */ swc1 $f18, 0x0690($s0) ## 00000690 -/* 02E90 808D9700 45000019 */ bc1f .L808D9768 +/* 02E90 808D9700 45000019 */ bc1f .L808D9768 /* 02E94 808D9704 E6100694 */ swc1 $f16, 0x0694($s0) ## 00000694 /* 02E98 808D9708 8E0C0674 */ lw $t4, 0x0674($s0) ## 00000674 -/* 02E9C 808D970C 8FA400B4 */ lw $a0, 0x00B4($sp) -/* 02EA0 808D9710 2D810065 */ sltiu $at, $t4, 0x0065 -/* 02EA4 808D9714 54200015 */ bnel $at, $zero, .L808D976C +/* 02E9C 808D970C 8FA400B4 */ lw $a0, 0x00B4($sp) +/* 02EA0 808D9710 2D810065 */ sltiu $at, $t4, 0x0065 +/* 02EA4 808D9714 54200015 */ bnel $at, $zero, .L808D976C /* 02EA8 808D9718 3C014180 */ lui $at, 0x4180 ## $at = 41800000 -/* 02EAC 808D971C 0C042F6F */ jal func_8010BDBC +/* 02EAC 808D971C 0C042F6F */ jal func_8010BDBC /* 02EB0 808D9720 248420D8 */ addiu $a0, $a0, 0x20D8 ## $a0 = 000020D8 -/* 02EB4 808D9724 14400010 */ bne $v0, $zero, .L808D9768 -/* 02EB8 808D9728 8FA40054 */ lw $a0, 0x0054($sp) +/* 02EB4 808D9724 14400010 */ bne $v0, $zero, .L808D9768 +/* 02EB8 808D9728 8FA40054 */ lw $a0, 0x0054($sp) /* 02EBC 808D972C 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 /* 02EC0 808D9730 24A5B668 */ addiu $a1, $a1, 0xB668 ## $a1 = 0600B668 -/* 02EC4 808D9734 0C029490 */ jal func_800A5240 +/* 02EC4 808D9734 0C029490 */ jal SkelAnime_ChangeAnimTransitionStop /* 02EC8 808D9738 24060000 */ addiu $a2, $zero, 0x0000 ## $a2 = 00000000 /* 02ECC 808D973C 3C040601 */ lui $a0, 0x0601 ## $a0 = 06010000 /* 02ED0 808D9740 0C028800 */ jal SkelAnime_GetFrameCount - + /* 02ED4 808D9744 2484B668 */ addiu $a0, $a0, 0xB668 ## $a0 = 0600B668 /* 02ED8 808D9748 44825000 */ mtc1 $v0, $f10 ## $f10 = 0.00 /* 02EDC 808D974C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 02EE0 808D9750 240539D2 */ addiu $a1, $zero, 0x39D2 ## $a1 = 000039D2 -/* 02EE4 808D9754 46805420 */ cvt.s.w $f16, $f10 +/* 02EE4 808D9754 46805420 */ cvt.s.w $f16, $f10 /* 02EE8 808D9758 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 02EEC 808D975C E61001CC */ swc1 $f16, 0x01CC($s0) ## 000001CC -/* 02EF0 808D9760 10000057 */ beq $zero, $zero, .L808D98C0 +/* 02EF0 808D9760 10000057 */ beq $zero, $zero, .L808D98C0 /* 02EF4 808D9764 00000000 */ nop .L808D9768: /* 02EF8 808D9768 3C014180 */ lui $at, 0x4180 ## $at = 41800000 .L808D976C: /* 02EFC 808D976C 44812000 */ mtc1 $at, $f4 ## $f4 = 16.00 /* 02F00 808D9770 C61201CC */ lwc1 $f18, 0x01CC($s0) ## 000001CC -/* 02F04 808D9774 8FA40054 */ lw $a0, 0x0054($sp) -/* 02F08 808D9778 46049181 */ sub.s $f6, $f18, $f4 -/* 02F0C 808D977C 44053000 */ mfc1 $a1, $f6 -/* 02F10 808D9780 0C0295B2 */ jal func_800A56C8 +/* 02F04 808D9774 8FA40054 */ lw $a0, 0x0054($sp) +/* 02F08 808D9778 46049181 */ sub.s $f6, $f18, $f4 +/* 02F0C 808D977C 44053000 */ mfc1 $a1, $f6 +/* 02F10 808D9780 0C0295B2 */ jal func_800A56C8 /* 02F14 808D9784 00000000 */ nop -/* 02F18 808D9788 10400041 */ beq $v0, $zero, .L808D9890 +/* 02F18 808D9788 10400041 */ beq $v0, $zero, .L808D9890 /* 02F1C 808D978C 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 /* 02F20 808D9790 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 .L808D9794: /* 02F24 808D9794 44816000 */ mtc1 $at, $f12 ## $f12 = 5.00 /* 02F28 808D9798 0C00CFC8 */ jal Math_Rand_CenteredFloat - -/* 02F2C 808D979C A7A200AE */ sh $v0, 0x00AE($sp) + +/* 02F2C 808D979C A7A200AE */ sh $v0, 0x00AE($sp) /* 02F30 808D97A0 3C013FC0 */ lui $at, 0x3FC0 ## $at = 3FC00000 /* 02F34 808D97A4 44816000 */ mtc1 $at, $f12 ## $f12 = 1.50 /* 02F38 808D97A8 0C00CFC8 */ jal Math_Rand_CenteredFloat - -/* 02F3C 808D97AC E7A00098 */ swc1 $f0, 0x0098($sp) + +/* 02F3C 808D97AC E7A00098 */ swc1 $f0, 0x0098($sp) /* 02F40 808D97B0 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 /* 02F44 808D97B4 44814000 */ mtc1 $at, $f8 ## $f8 = 1.00 /* 02F48 808D97B8 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 /* 02F4C 808D97BC 44816000 */ mtc1 $at, $f12 ## $f12 = 5.00 -/* 02F50 808D97C0 46080280 */ add.s $f10, $f0, $f8 +/* 02F50 808D97C0 46080280 */ add.s $f10, $f0, $f8 /* 02F54 808D97C4 0C00CFBE */ jal Math_Rand_ZeroFloat - -/* 02F58 808D97C8 E7AA009C */ swc1 $f10, 0x009C($sp) + +/* 02F58 808D97C8 E7AA009C */ swc1 $f10, 0x009C($sp) /* 02F5C 808D97CC 3C014000 */ lui $at, 0x4000 ## $at = 40000000 /* 02F60 808D97D0 44818000 */ mtc1 $at, $f16 ## $f16 = 2.00 /* 02F64 808D97D4 44801000 */ mtc1 $zero, $f2 ## $f2 = 0.00 /* 02F68 808D97D8 3C01BF80 */ lui $at, 0xBF80 ## $at = BF800000 -/* 02F6C 808D97DC 46100480 */ add.s $f18, $f0, $f16 +/* 02F6C 808D97DC 46100480 */ add.s $f18, $f0, $f16 /* 02F70 808D97E0 44812000 */ mtc1 $at, $f4 ## $f4 = -1.00 -/* 02F74 808D97E4 E7A2008C */ swc1 $f2, 0x008C($sp) -/* 02F78 808D97E8 E7A20094 */ swc1 $f2, 0x0094($sp) -/* 02F7C 808D97EC E7B200A0 */ swc1 $f18, 0x00A0($sp) -/* 02F80 808D97F0 E7A40090 */ swc1 $f4, 0x0090($sp) +/* 02F74 808D97E4 E7A2008C */ swc1 $f2, 0x008C($sp) +/* 02F78 808D97E8 E7A20094 */ swc1 $f2, 0x0094($sp) +/* 02F7C 808D97EC E7B200A0 */ swc1 $f18, 0x00A0($sp) +/* 02F80 808D97F0 E7A40090 */ swc1 $f4, 0x0090($sp) /* 02F84 808D97F4 C6060208 */ lwc1 $f6, 0x0208($s0) ## 00000208 /* 02F88 808D97F8 3C014120 */ lui $at, 0x4120 ## $at = 41200000 /* 02F8C 808D97FC 44815000 */ mtc1 $at, $f10 ## $f10 = 10.00 -/* 02F90 808D9800 E7A60080 */ swc1 $f6, 0x0080($sp) +/* 02F90 808D9800 E7A60080 */ swc1 $f6, 0x0080($sp) /* 02F94 808D9804 C608020C */ lwc1 $f8, 0x020C($s0) ## 0000020C /* 02F98 808D9808 3C014248 */ lui $at, 0x4248 ## $at = 42480000 /* 02F9C 808D980C 44816000 */ mtc1 $at, $f12 ## $f12 = 50.00 -/* 02FA0 808D9810 460A4401 */ sub.s $f16, $f8, $f10 -/* 02FA4 808D9814 E7B00084 */ swc1 $f16, 0x0084($sp) +/* 02FA0 808D9810 460A4401 */ sub.s $f16, $f8, $f10 +/* 02FA4 808D9814 E7B00084 */ swc1 $f16, 0x0084($sp) /* 02FA8 808D9818 C6120210 */ lwc1 $f18, 0x0210($s0) ## 00000210 /* 02FAC 808D981C 0C00CFBE */ jal Math_Rand_ZeroFloat - -/* 02FB0 808D9820 E7B20088 */ swc1 $f18, 0x0088($sp) -/* 02FB4 808D9824 4600010D */ trunc.w.s $f4, $f0 + +/* 02FB0 808D9820 E7B20088 */ swc1 $f18, 0x0088($sp) +/* 02FB4 808D9824 4600010D */ trunc.w.s $f4, $f0 /* 02FB8 808D9828 3C0D808E */ lui $t5, %hi(D_808E4D30) ## $t5 = 808E0000 /* 02FBC 808D982C 3C0E808E */ lui $t6, %hi(D_808E4D34) ## $t6 = 808E0000 /* 02FC0 808D9830 25CE4D34 */ addiu $t6, $t6, %lo(D_808E4D34) ## $t6 = 808E4D34 -/* 02FC4 808D9834 44182000 */ mfc1 $t8, $f4 +/* 02FC4 808D9834 44182000 */ mfc1 $t8, $f4 /* 02FC8 808D9838 25AD4D30 */ addiu $t5, $t5, %lo(D_808E4D30) ## $t5 = 808E4D30 /* 02FCC 808D983C 240B0011 */ addiu $t3, $zero, 0x0011 ## $t3 = 00000011 -/* 02FD0 808D9840 0018CC00 */ sll $t9, $t8, 16 -/* 02FD4 808D9844 00194C03 */ sra $t1, $t9, 16 +/* 02FD0 808D9840 0018CC00 */ sll $t9, $t8, 16 +/* 02FD4 808D9844 00194C03 */ sra $t1, $t9, 16 /* 02FD8 808D9848 252A0032 */ addiu $t2, $t1, 0x0032 ## $t2 = 00000032 -/* 02FDC 808D984C AFAA0018 */ sw $t2, 0x0018($sp) -/* 02FE0 808D9850 AFAB0020 */ sw $t3, 0x0020($sp) -/* 02FE4 808D9854 AFAD0010 */ sw $t5, 0x0010($sp) -/* 02FE8 808D9858 AFAE0014 */ sw $t6, 0x0014($sp) -/* 02FEC 808D985C 8FA400B4 */ lw $a0, 0x00B4($sp) +/* 02FDC 808D984C AFAA0018 */ sw $t2, 0x0018($sp) +/* 02FE0 808D9850 AFAB0020 */ sw $t3, 0x0020($sp) +/* 02FE4 808D9854 AFAD0010 */ sw $t5, 0x0010($sp) +/* 02FE8 808D9858 AFAE0014 */ sw $t6, 0x0014($sp) +/* 02FEC 808D985C 8FA400B4 */ lw $a0, 0x00B4($sp) /* 02FF0 808D9860 27A50080 */ addiu $a1, $sp, 0x0080 ## $a1 = FFFFFFD0 /* 02FF4 808D9864 27A60098 */ addiu $a2, $sp, 0x0098 ## $a2 = FFFFFFE8 /* 02FF8 808D9868 27A7008C */ addiu $a3, $sp, 0x008C ## $a3 = FFFFFFDC -/* 02FFC 808D986C 0C00A0DB */ jal func_8002836C -/* 03000 808D9870 AFA0001C */ sw $zero, 0x001C($sp) -/* 03004 808D9874 87A200AE */ lh $v0, 0x00AE($sp) +/* 02FFC 808D986C 0C00A0DB */ jal func_8002836C +/* 03000 808D9870 AFA0001C */ sw $zero, 0x001C($sp) +/* 03004 808D9874 87A200AE */ lh $v0, 0x00AE($sp) /* 03008 808D9878 24420001 */ addiu $v0, $v0, 0x0001 ## $v0 = 00000001 -/* 0300C 808D987C 00021400 */ sll $v0, $v0, 16 -/* 03010 808D9880 00021403 */ sra $v0, $v0, 16 -/* 03014 808D9884 28410028 */ slti $at, $v0, 0x0028 -/* 03018 808D9888 5420FFC2 */ bnel $at, $zero, .L808D9794 +/* 0300C 808D987C 00021400 */ sll $v0, $v0, 16 +/* 03010 808D9880 00021403 */ sra $v0, $v0, 16 +/* 03014 808D9884 28410028 */ slti $at, $v0, 0x0028 +/* 03018 808D9888 5420FFC2 */ bnel $at, $zero, .L808D9794 /* 0301C 808D988C 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 .L808D9890: -/* 03020 808D9890 8FA40054 */ lw $a0, 0x0054($sp) -/* 03024 808D9894 0C0295B2 */ jal func_800A56C8 +/* 03020 808D9890 8FA40054 */ lw $a0, 0x0054($sp) +/* 03024 808D9894 0C0295B2 */ jal func_800A56C8 /* 03028 808D9898 8E0501CC */ lw $a1, 0x01CC($s0) ## 000001CC -/* 0302C 808D989C 10400008 */ beq $v0, $zero, .L808D98C0 -/* 03030 808D98A0 8FA40054 */ lw $a0, 0x0054($sp) +/* 0302C 808D989C 10400008 */ beq $v0, $zero, .L808D98C0 +/* 03030 808D98A0 8FA40054 */ lw $a0, 0x0054($sp) /* 03034 808D98A4 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 /* 03038 808D98A8 24A5BE38 */ addiu $a1, $a1, 0xBE38 ## $a1 = 0600BE38 -/* 0303C 808D98AC 0C0294D3 */ jal func_800A534C +/* 0303C 808D98AC 0C0294D3 */ jal SkelAnime_ChangeAnimTransitionRepeat /* 03040 808D98B0 24060000 */ addiu $a2, $zero, 0x0000 ## $a2 = 00000000 /* 03044 808D98B4 240C0004 */ addiu $t4, $zero, 0x0004 ## $t4 = 00000004 /* 03048 808D98B8 A60C0678 */ sh $t4, 0x0678($s0) ## 00000678 /* 0304C 808D98BC AE000674 */ sw $zero, 0x0674($s0) ## 00000674 .L808D98C0: -/* 03050 808D98C0 100004AA */ beq $zero, $zero, .L808DAB6C +/* 03050 808D98C0 100004AA */ beq $zero, $zero, .L808DAB6C /* 03054 808D98C4 86040678 */ lh $a0, 0x0678($s0) ## 00000678 glabel L808D98C8 /* 03058 808D98C8 8E0E0674 */ lw $t6, 0x0674($s0) ## 00000674 /* 0305C 808D98CC 240D000E */ addiu $t5, $zero, 0x000E ## $t5 = 0000000E /* 03060 808D98D0 2401001E */ addiu $at, $zero, 0x001E ## $at = 0000001E -/* 03064 808D98D4 15C10008 */ bne $t6, $at, .L808D98F8 +/* 03064 808D98D4 15C10008 */ bne $t6, $at, .L808D98F8 /* 03068 808D98D8 A20D01A0 */ sb $t5, 0x01A0($s0) ## 000001A0 -/* 0306C 808D98DC 8FA400B4 */ lw $a0, 0x00B4($sp) +/* 0306C 808D98DC 8FA400B4 */ lw $a0, 0x00B4($sp) /* 03070 808D98E0 240570CF */ addiu $a1, $zero, 0x70CF ## $a1 = 000070CF -/* 03074 808D98E4 0C042DA0 */ jal func_8010B680 +/* 03074 808D98E4 0C042DA0 */ jal func_8010B680 /* 03078 808D98E8 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 /* 0307C 808D98EC 240F0005 */ addiu $t7, $zero, 0x0005 ## $t7 = 00000005 /* 03080 808D98F0 A60F0678 */ sh $t7, 0x0678($s0) ## 00000678 /* 03084 808D98F4 AE000674 */ sw $zero, 0x0674($s0) ## 00000674 .L808D98F8: -/* 03088 808D98F8 1000049C */ beq $zero, $zero, .L808DAB6C +/* 03088 808D98F8 1000049C */ beq $zero, $zero, .L808DAB6C /* 0308C 808D98FC 86040678 */ lh $a0, 0x0678($s0) ## 00000678 glabel L808D9900 /* 03090 808D9900 8E190674 */ lw $t9, 0x0674($s0) ## 00000674 /* 03094 808D9904 2418000E */ addiu $t8, $zero, 0x000E ## $t8 = 0000000E /* 03098 808D9908 A21801A0 */ sb $t8, 0x01A0($s0) ## 000001A0 -/* 0309C 808D990C 2F210047 */ sltiu $at, $t9, 0x0047 -/* 030A0 808D9910 1420004E */ bne $at, $zero, .L808D9A4C -/* 030A4 808D9914 8FA400B4 */ lw $a0, 0x00B4($sp) -/* 030A8 808D9918 0C042F6F */ jal func_8010BDBC +/* 0309C 808D990C 2F210047 */ sltiu $at, $t9, 0x0047 +/* 030A0 808D9910 1420004E */ bne $at, $zero, .L808D9A4C +/* 030A4 808D9914 8FA400B4 */ lw $a0, 0x00B4($sp) +/* 030A8 808D9918 0C042F6F */ jal func_8010BDBC /* 030AC 808D991C 248420D8 */ addiu $a0, $a0, 0x20D8 ## $a0 = 000020D8 -/* 030B0 808D9920 1440004A */ bne $v0, $zero, .L808D9A4C +/* 030B0 808D9920 1440004A */ bne $v0, $zero, .L808D9A4C /* 030B4 808D9924 24090006 */ addiu $t1, $zero, 0x0006 ## $t1 = 00000006 /* 030B8 808D9928 A6090678 */ sh $t1, 0x0678($s0) ## 00000678 /* 030BC 808D992C AE000674 */ sw $zero, 0x0674($s0) ## 00000674 /* 030C0 808D9930 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 /* 030C4 808D9934 24A50298 */ addiu $a1, $a1, 0x0298 ## $a1 = 06010298 -/* 030C8 808D9938 8FA40054 */ lw $a0, 0x0054($sp) -/* 030CC 808D993C 0C029490 */ jal func_800A5240 +/* 030C8 808D9938 8FA40054 */ lw $a0, 0x0054($sp) +/* 030CC 808D993C 0C029490 */ jal SkelAnime_ChangeAnimTransitionStop /* 030D0 808D9940 24060000 */ addiu $a2, $zero, 0x0000 ## $a2 = 00000000 /* 030D4 808D9944 3C040601 */ lui $a0, 0x0601 ## $a0 = 06010000 /* 030D8 808D9948 0C028800 */ jal SkelAnime_GetFrameCount - + /* 030DC 808D994C 24840298 */ addiu $a0, $a0, 0x0298 ## $a0 = 06010298 /* 030E0 808D9950 44829000 */ mtc1 $v0, $f18 ## $f18 = 0.00 /* 030E4 808D9954 C61001FC */ lwc1 $f16, 0x01FC($s0) ## 000001FC /* 030E8 808D9958 C60E0200 */ lwc1 $f14, 0x0200($s0) ## 00000200 -/* 030EC 808D995C 468094A0 */ cvt.s.w $f18, $f18 +/* 030EC 808D995C 468094A0 */ cvt.s.w $f18, $f18 /* 030F0 808D9960 C60C0680 */ lwc1 $f12, 0x0680($s0) ## 00000680 /* 030F4 808D9964 3C014140 */ lui $at, 0x4140 ## $at = 41400000 /* 030F8 808D9968 44815000 */ mtc1 $at, $f10 ## $f10 = 12.00 @@ -431,60 +431,60 @@ glabel L808D9900 /* 03104 808D9974 44813000 */ mtc1 $at, $f6 ## $f6 = 7.00 /* 03108 808D9978 E61201CC */ swc1 $f18, 0x01CC($s0) ## 000001CC /* 0310C 808D997C 3C01808F */ lui $at, %hi(D_808F7F44) ## $at = 808F0000 -/* 03110 808D9980 46066301 */ sub.s $f12, $f12, $f6 -/* 03114 808D9984 C4327F44 */ lwc1 $f18, %lo(D_808F7F44)($at) +/* 03110 808D9980 46066301 */ sub.s $f12, $f12, $f6 +/* 03114 808D9984 C4327F44 */ lwc1 $f18, %lo(D_808F7F44)($at) /* 03118 808D9988 C6040688 */ lwc1 $f4, 0x0688($s0) ## 00000688 /* 0311C 808D998C 3C01428C */ lui $at, 0x428C ## $at = 428C0000 /* 03120 808D9990 44811000 */ mtc1 $at, $f2 ## $f2 = 70.00 -/* 03124 808D9994 46006305 */ abs.s $f12, $f12 -/* 03128 808D9998 460A4201 */ sub.s $f8, $f8, $f10 +/* 03124 808D9994 46006305 */ abs.s $f12, $f12 +/* 03128 808D9998 460A4201 */ sub.s $f8, $f8, $f10 /* 0312C 808D999C E60206C4 */ swc1 $f2, 0x06C4($s0) ## 000006C4 /* 03130 808D99A0 C60206C4 */ lwc1 $f2, 0x06C4($s0) ## 000006C4 /* 03134 808D99A4 C6000204 */ lwc1 $f0, 0x0204($s0) ## 00000204 /* 03138 808D99A8 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 -/* 0313C 808D99AC 46004205 */ abs.s $f8, $f8 -/* 03140 808D99B0 46022081 */ sub.s $f2, $f4, $f2 +/* 0313C 808D99AC 46004205 */ abs.s $f8, $f8 +/* 03140 808D99B0 46022081 */ sub.s $f2, $f4, $f2 /* 03144 808D99B4 44812000 */ mtc1 $at, $f4 ## $f4 = 5.00 /* 03148 808D99B8 3C0141F0 */ lui $at, 0x41F0 ## $at = 41F00000 /* 0314C 808D99BC E60006DC */ swc1 $f0, 0x06DC($s0) ## 000006DC -/* 03150 808D99C0 46048101 */ sub.s $f4, $f16, $f4 +/* 03150 808D99C0 46048101 */ sub.s $f4, $f16, $f4 /* 03154 808D99C4 44818000 */ mtc1 $at, $f16 ## $f16 = 30.00 /* 03158 808D99C8 C600068C */ lwc1 $f0, 0x068C($s0) ## 0000068C /* 0315C 808D99CC 3C014120 */ lui $at, 0x4120 ## $at = 41200000 -/* 03160 808D99D0 46107400 */ add.s $f16, $f14, $f16 +/* 03160 808D99D0 46107400 */ add.s $f16, $f14, $f16 /* 03164 808D99D4 44817000 */ mtc1 $at, $f14 ## $f14 = 10.00 /* 03168 808D99D8 E60406D4 */ swc1 $f4, 0x06D4($s0) ## 000006D4 /* 0316C 808D99DC C60406D4 */ lwc1 $f4, 0x06D4($s0) ## 000006D4 -/* 03170 808D99E0 460E8381 */ sub.s $f14, $f16, $f14 +/* 03170 808D99E0 460E8381 */ sub.s $f14, $f16, $f14 /* 03174 808D99E4 44808000 */ mtc1 $zero, $f16 ## $f16 = 0.00 /* 03178 808D99E8 E61206F0 */ swc1 $f18, 0x06F0($s0) ## 000006F0 /* 0317C 808D99EC C6120690 */ lwc1 $f18, 0x0690($s0) ## 00000690 -/* 03180 808D99F0 46001085 */ abs.s $f2, $f2 -/* 03184 808D99F4 46040101 */ sub.s $f4, $f0, $f4 +/* 03180 808D99F0 46001085 */ abs.s $f2, $f2 +/* 03184 808D99F4 46040101 */ sub.s $f4, $f0, $f4 /* 03188 808D99F8 E60E06D8 */ swc1 $f14, 0x06D8($s0) ## 000006D8 /* 0318C 808D99FC C60E06D8 */ lwc1 $f14, 0x06D8($s0) ## 000006D8 /* 03190 808D9A00 C6000694 */ lwc1 $f0, 0x0694($s0) ## 00000694 -/* 03194 808D9A04 46002105 */ abs.s $f4, $f4 -/* 03198 808D9A08 460E9381 */ sub.s $f14, $f18, $f14 +/* 03194 808D9A04 46002105 */ abs.s $f4, $f4 +/* 03198 808D9A08 460E9381 */ sub.s $f14, $f18, $f14 /* 0319C 808D9A0C C61206DC */ lwc1 $f18, 0x06DC($s0) ## 000006DC /* 031A0 808D9A10 E61006EC */ swc1 $f16, 0x06EC($s0) ## 000006EC /* 031A4 808D9A14 E60606BC */ swc1 $f6, 0x06BC($s0) ## 000006BC -/* 031A8 808D9A18 46007385 */ abs.s $f14, $f14 -/* 031AC 808D9A1C 46120481 */ sub.s $f18, $f0, $f18 +/* 031A8 808D9A18 46007385 */ abs.s $f14, $f14 +/* 031AC 808D9A1C 46120481 */ sub.s $f18, $f0, $f18 /* 031B0 808D9A20 E60A06C0 */ swc1 $f10, 0x06C0($s0) ## 000006C0 /* 031B4 808D9A24 E60C06A4 */ swc1 $f12, 0x06A4($s0) ## 000006A4 /* 031B8 808D9A28 E60806A8 */ swc1 $f8, 0x06A8($s0) ## 000006A8 -/* 031BC 808D9A2C 46009485 */ abs.s $f18, $f18 +/* 031BC 808D9A2C 46009485 */ abs.s $f18, $f18 /* 031C0 808D9A30 E60206AC */ swc1 $f2, 0x06AC($s0) ## 000006AC /* 031C4 808D9A34 E60406B0 */ swc1 $f4, 0x06B0($s0) ## 000006B0 /* 031C8 808D9A38 E60E06B4 */ swc1 $f14, 0x06B4($s0) ## 000006B4 /* 031CC 808D9A3C E61206B8 */ swc1 $f18, 0x06B8($s0) ## 000006B8 /* 031D0 808D9A40 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 031D4 808D9A44 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 031D8 808D9A48 240539D3 */ addiu $a1, $zero, 0x39D3 ## $a1 = 000039D3 .L808D9A4C: -/* 031DC 808D9A4C 10000447 */ beq $zero, $zero, .L808DAB6C +/* 031DC 808D9A4C 10000447 */ beq $zero, $zero, .L808DAB6C /* 031E0 808D9A50 86040678 */ lh $a0, 0x0678($s0) ## 00000678 glabel L808D9A54 /* 031E4 808D9A54 240A000E */ addiu $t2, $zero, 0x000E ## $t2 = 0000000E @@ -492,21 +492,21 @@ glabel L808D9A54 /* 031EC 808D9A5C 240B0001 */ addiu $t3, $zero, 0x0001 ## $t3 = 00000001 /* 031F0 808D9A60 3C053E4C */ lui $a1, 0x3E4C ## $a1 = 3E4C0000 /* 031F4 808D9A64 3C073C23 */ lui $a3, 0x3C23 ## $a3 = 3C230000 -/* 031F8 808D9A68 A3AB00AD */ sb $t3, 0x00AD($sp) +/* 031F8 808D9A68 A3AB00AD */ sb $t3, 0x00AD($sp) /* 031FC 808D9A6C 34E7D70A */ ori $a3, $a3, 0xD70A ## $a3 = 3C23D70A /* 03200 808D9A70 34A5CCCD */ ori $a1, $a1, 0xCCCD ## $a1 = 3E4CCCCD /* 03204 808D9A74 260406EC */ addiu $a0, $s0, 0x06EC ## $a0 = 000006EC /* 03208 808D9A78 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 0320C 808D9A7C 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 03210 808D9A80 8FA40054 */ lw $a0, 0x0054($sp) -/* 03214 808D9A84 0C0295B2 */ jal func_800A56C8 +/* 03210 808D9A80 8FA40054 */ lw $a0, 0x0054($sp) +/* 03214 808D9A84 0C0295B2 */ jal func_800A56C8 /* 03218 808D9A88 8E0501CC */ lw $a1, 0x01CC($s0) ## 000001CC -/* 0321C 808D9A8C 10400014 */ beq $v0, $zero, .L808D9AE0 -/* 03220 808D9A90 8FA40054 */ lw $a0, 0x0054($sp) +/* 0321C 808D9A8C 10400014 */ beq $v0, $zero, .L808D9AE0 +/* 03220 808D9A90 8FA40054 */ lw $a0, 0x0054($sp) /* 03224 808D9A94 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 /* 03228 808D9A98 24A50514 */ addiu $a1, $a1, 0x0514 ## $a1 = 06010514 -/* 0322C 808D9A9C 0C0294D3 */ jal func_800A534C +/* 0322C 808D9A9C 0C0294D3 */ jal SkelAnime_ChangeAnimTransitionRepeat /* 03230 808D9AA0 24060000 */ addiu $a2, $zero, 0x0000 ## $a2 = 00000000 /* 03234 808D9AA4 3C01447A */ lui $at, 0x447A ## $at = 447A0000 /* 03238 808D9AA8 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 @@ -519,33 +519,33 @@ glabel L808D9A54 /* 03254 808D9AC4 A20D01A0 */ sb $t5, 0x01A0($s0) ## 000001A0 /* 03258 808D9AC8 E6000508 */ swc1 $f0, 0x0508($s0) ## 00000508 /* 0325C 808D9ACC E60601CC */ swc1 $f6, 0x01CC($s0) ## 000001CC -/* 03260 808D9AD0 8FAE00B4 */ lw $t6, 0x00B4($sp) +/* 03260 808D9AD0 8FAE00B4 */ lw $t6, 0x00B4($sp) /* 03264 808D9AD4 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 03268 808D9AD8 002E0821 */ addu $at, $at, $t6 +/* 03268 808D9AD8 002E0821 */ addu $at, $at, $t6 /* 0326C 808D9ADC E4200AFC */ swc1 $f0, 0x0AFC($at) ## 00010AFC .L808D9AE0: -/* 03270 808D9AE0 10000422 */ beq $zero, $zero, .L808DAB6C +/* 03270 808D9AE0 10000422 */ beq $zero, $zero, .L808DAB6C /* 03274 808D9AE4 86040678 */ lh $a0, 0x0678($s0) ## 00000678 glabel L808D9AE8 /* 03278 808D9AE8 8E030674 */ lw $v1, 0x0674($s0) ## 00000674 -/* 0327C 808D9AEC 8FAF00B4 */ lw $t7, 0x00B4($sp) +/* 0327C 808D9AEC 8FAF00B4 */ lw $t7, 0x00B4($sp) /* 03280 808D9AF0 24180008 */ addiu $t8, $zero, 0x0008 ## $t8 = 00000008 -/* 03284 808D9AF4 2C61000A */ sltiu $at, $v1, 0x000A -/* 03288 808D9AF8 50200007 */ beql $at, $zero, .L808D9B18 +/* 03284 808D9AF4 2C61000A */ sltiu $at, $v1, 0x000A +/* 03288 808D9AF8 50200007 */ beql $at, $zero, .L808D9B18 /* 0328C 808D9AFC 2401001E */ addiu $at, $zero, 0x001E ## $at = 0000001E /* 03290 808D9B00 44804000 */ mtc1 $zero, $f8 ## $f8 = 0.00 /* 03294 808D9B04 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 03298 808D9B08 002F0821 */ addu $at, $at, $t7 +/* 03298 808D9B08 002F0821 */ addu $at, $at, $t7 /* 0329C 808D9B0C E4280AFC */ swc1 $f8, 0x0AFC($at) ## 00010AFC /* 032A0 808D9B10 8E030674 */ lw $v1, 0x0674($s0) ## 00000674 /* 032A4 808D9B14 2401001E */ addiu $at, $zero, 0x001E ## $at = 0000001E .L808D9B18: -/* 032A8 808D9B18 54610028 */ bnel $v1, $at, .L808D9BBC +/* 032A8 808D9B18 54610028 */ bnel $v1, $at, .L808D9BBC /* 032AC 808D9B1C 2419000F */ addiu $t9, $zero, 0x000F ## $t9 = 0000000F /* 032B0 808D9B20 44805000 */ mtc1 $zero, $f10 ## $f10 = 0.00 /* 032B4 808D9B24 A6180678 */ sh $t8, 0x0678($s0) ## 00000678 /* 032B8 808D9B28 AE000674 */ sw $zero, 0x0674($s0) ## 00000674 -/* 032BC 808D9B2C 10000022 */ beq $zero, $zero, .L808D9BB8 +/* 032BC 808D9B2C 10000022 */ beq $zero, $zero, .L808D9BB8 /* 032C0 808D9B30 E60A070C */ swc1 $f10, 0x070C($s0) ## 0000070C glabel L808D9B34 /* 032C4 808D9B34 3C01C270 */ lui $at, 0xC270 ## $at = C2700000 @@ -557,17 +557,17 @@ glabel L808D9B34 /* 032DC 808D9B4C 8E040674 */ lw $a0, 0x0674($s0) ## 00000674 /* 032E0 808D9B50 3C01428C */ lui $at, 0x428C ## $at = 428C0000 /* 032E4 808D9B54 44813000 */ mtc1 $at, $f6 ## $f6 = 70.00 -/* 032E8 808D9B58 00800821 */ addu $at, $a0, $zero -/* 032EC 808D9B5C 00042080 */ sll $a0, $a0, 2 -/* 032F0 808D9B60 00812023 */ subu $a0, $a0, $at -/* 032F4 808D9B64 000420C0 */ sll $a0, $a0, 3 -/* 032F8 808D9B68 00812021 */ addu $a0, $a0, $at -/* 032FC 808D9B6C 00042080 */ sll $a0, $a0, 2 +/* 032E8 808D9B58 00800821 */ addu $at, $a0, $zero +/* 032EC 808D9B5C 00042080 */ sll $a0, $a0, 2 +/* 032F0 808D9B60 00812023 */ subu $a0, $a0, $at +/* 032F4 808D9B64 000420C0 */ sll $a0, $a0, 3 +/* 032F8 808D9B68 00812021 */ addu $a0, $a0, $at +/* 032FC 808D9B6C 00042080 */ sll $a0, $a0, 2 /* 03300 808D9B70 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 03304 808D9B74 00812023 */ subu $a0, $a0, $at -/* 03308 808D9B78 00042200 */ sll $a0, $a0, 8 -/* 0330C 808D9B7C 00042400 */ sll $a0, $a0, 16 -/* 03310 808D9B80 00042403 */ sra $a0, $a0, 16 +/* 03304 808D9B74 00812023 */ subu $a0, $a0, $at +/* 03308 808D9B78 00042200 */ sll $a0, $a0, 8 +/* 0330C 808D9B7C 00042400 */ sll $a0, $a0, 16 +/* 03310 808D9B80 00042403 */ sra $a0, $a0, 16 /* 03314 808D9B84 E6100680 */ swc1 $f16, 0x0680($s0) ## 00000680 /* 03318 808D9B88 E6120684 */ swc1 $f18, 0x0684($s0) ## 00000684 /* 0331C 808D9B8C E6040688 */ swc1 $f4, 0x0688($s0) ## 00000688 @@ -577,10 +577,10 @@ glabel L808D9B34 ## sins? /* 0332C 808D9B9C E6000690 */ swc1 $f0, 0x0690($s0) ## 00000690 /* 03330 808D9BA0 3C01808F */ lui $at, %hi(D_808F7F48) ## $at = 808F0000 -/* 03334 808D9BA4 C4287F48 */ lwc1 $f8, %lo(D_808F7F48)($at) +/* 03334 808D9BA4 C4287F48 */ lwc1 $f8, %lo(D_808F7F48)($at) /* 03338 808D9BA8 24042098 */ addiu $a0, $zero, 0x2098 ## $a0 = 00002098 -/* 0333C 808D9BAC 46080282 */ mul.s $f10, $f0, $f8 -/* 03340 808D9BB0 0C01E221 */ jal func_80078884 +/* 0333C 808D9BAC 46080282 */ mul.s $f10, $f0, $f8 +/* 03340 808D9BB0 0C01E221 */ jal func_80078884 /* 03344 808D9BB4 E60A070C */ swc1 $f10, 0x070C($s0) ## 0000070C .L808D9BB8: /* 03348 808D9BB8 2419000F */ addiu $t9, $zero, 0x000F ## $t9 = 0000000F @@ -588,18 +588,18 @@ glabel L808D9B34 /* 0334C 808D9BBC A21901A0 */ sb $t9, 0x01A0($s0) ## 000001A0 /* 03350 808D9BC0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 03354 808D9BC4 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 03358 808D9BC8 24053163 */ addiu $a1, $zero, 0x3163 ## $a1 = 00003163 /* 0335C 808D9BCC 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 /* 03360 808D9BD0 2403000A */ addiu $v1, $zero, 0x000A ## $v1 = 0000000A .L808D9BD4: -/* 03364 808D9BD4 00024840 */ sll $t1, $v0, 1 +/* 03364 808D9BD4 00024840 */ sll $t1, $v0, 1 /* 03368 808D9BD8 24420001 */ addiu $v0, $v0, 0x0001 ## $v0 = 00000002 -/* 0336C 808D9BDC 00021400 */ sll $v0, $v0, 16 -/* 03370 808D9BE0 00021403 */ sra $v0, $v0, 16 -/* 03374 808D9BE4 2841000F */ slti $at, $v0, 0x000F -/* 03378 808D9BE8 02095021 */ addu $t2, $s0, $t1 -/* 0337C 808D9BEC 1420FFF9 */ bne $at, $zero, .L808D9BD4 +/* 0336C 808D9BDC 00021400 */ sll $v0, $v0, 16 +/* 03370 808D9BE0 00021403 */ sra $v0, $v0, 16 +/* 03374 808D9BE4 2841000F */ slti $at, $v0, 0x000F +/* 03378 808D9BE8 02095021 */ addu $t2, $s0, $t1 +/* 0337C 808D9BEC 1420FFF9 */ bne $at, $zero, .L808D9BD4 /* 03380 808D9BF0 A54304E4 */ sh $v1, 0x04E4($t2) ## 000004E4 /* 03384 808D9BF4 240B4E20 */ addiu $t3, $zero, 0x4E20 ## $t3 = 00004E20 /* 03388 808D9BF8 3C063D4C */ lui $a2, 0x3D4C ## $a2 = 3D4C0000 @@ -609,12 +609,12 @@ glabel L808D9B34 /* 03398 808D9C08 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3D4CCCCD /* 0339C 808D9C0C 26040508 */ addiu $a0, $s0, 0x0508 ## $a0 = 00000508 /* 033A0 808D9C10 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 033A4 808D9C14 3C0540A0 */ lui $a1, 0x40A0 ## $a1 = 40A00000 /* 033A8 808D9C18 8E0C0674 */ lw $t4, 0x0674($s0) ## 00000674 /* 033AC 808D9C1C 2401001E */ addiu $at, $zero, 0x001E ## $at = 0000001E /* 033B0 808D9C20 240D0009 */ addiu $t5, $zero, 0x0009 ## $t5 = 00000009 -/* 033B4 808D9C24 15810019 */ bne $t4, $at, .L808D9C8C +/* 033B4 808D9C24 15810019 */ bne $t4, $at, .L808D9C8C /* 033B8 808D9C28 3C01C1F0 */ lui $at, 0xC1F0 ## $at = C1F00000 /* 033BC 808D9C2C 44818000 */ mtc1 $at, $f16 ## $f16 = -30.00 /* 033C0 808D9C30 3C014220 */ lui $at, 0x4220 ## $at = 42200000 @@ -641,114 +641,114 @@ glabel L808D9B34 /* 03414 808D9C84 E61006EC */ swc1 $f16, 0x06EC($s0) ## 000006EC /* 03418 808D9C88 E6120710 */ swc1 $f18, 0x0710($s0) ## 00000710 .L808D9C8C: -/* 0341C 808D9C8C 100003B7 */ beq $zero, $zero, .L808DAB6C +/* 0341C 808D9C8C 100003B7 */ beq $zero, $zero, .L808DAB6C /* 03420 808D9C90 86040678 */ lh $a0, 0x0678($s0) ## 00000678 glabel L808D9C94 /* 03424 808D9C94 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 03428 808D9C98 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 0342C 808D9C9C 24053163 */ addiu $a1, $zero, 0x3163 ## $a1 = 00003163 /* 03430 808D9CA0 8E030674 */ lw $v1, 0x0674($s0) ## 00000674 /* 03434 808D9CA4 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 03438 808D9CA8 8FA400B4 */ lw $a0, 0x00B4($sp) -/* 0343C 808D9CAC 14610004 */ bne $v1, $at, .L808D9CC0 +/* 03438 808D9CA8 8FA400B4 */ lw $a0, 0x00B4($sp) +/* 0343C 808D9CAC 14610004 */ bne $v1, $at, .L808D9CC0 /* 03440 808D9CB0 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 03444 808D9CB4 0C00B7D5 */ jal func_8002DF54 +/* 03444 808D9CB4 0C00B7D5 */ jal func_8002DF54 /* 03448 808D9CB8 24060039 */ addiu $a2, $zero, 0x0039 ## $a2 = 00000039 /* 0344C 808D9CBC 8E030674 */ lw $v1, 0x0674($s0) ## 00000674 .L808D9CC0: -/* 03450 808D9CC0 2C610033 */ sltiu $at, $v1, 0x0033 -/* 03454 808D9CC4 1420003A */ bne $at, $zero, .L808D9DB0 +/* 03450 808D9CC0 2C610033 */ sltiu $at, $v1, 0x0033 +/* 03454 808D9CC4 1420003A */ bne $at, $zero, .L808D9DB0 /* 03458 808D9CC8 26040710 */ addiu $a0, $s0, 0x0710 ## $a0 = 00000710 /* 0345C 808D9CCC 3C063E4C */ lui $a2, 0x3E4C ## $a2 = 3E4C0000 /* 03460 808D9CD0 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3E4CCCCD /* 03464 808D9CD4 0C01E123 */ jal Math_SmoothDownscaleMaxF - + /* 03468 808D9CD8 3C053F80 */ lui $a1, 0x3F80 ## $a1 = 3F800000 /* 0346C 808D9CDC 3C0141F0 */ lui $at, 0x41F0 ## $at = 41F00000 /* 03470 808D9CE0 44813000 */ mtc1 $at, $f6 ## $f6 = 30.00 /* 03474 808D9CE4 C60406EC */ lwc1 $f4, 0x06EC($s0) ## 000006EC /* 03478 808D9CE8 3C063D4C */ lui $a2, 0x3D4C ## $a2 = 3D4C0000 /* 0347C 808D9CEC 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3D4CCCCD -/* 03480 808D9CF0 46062202 */ mul.s $f8, $f4, $f6 +/* 03480 808D9CF0 46062202 */ mul.s $f8, $f4, $f6 /* 03484 808D9CF4 26040680 */ addiu $a0, $s0, 0x0680 ## $a0 = 00000680 /* 03488 808D9CF8 3C054387 */ lui $a1, 0x4387 ## $a1 = 43870000 -/* 0348C 808D9CFC 44074000 */ mfc1 $a3, $f8 +/* 0348C 808D9CFC 44074000 */ mfc1 $a3, $f8 /* 03490 808D9D00 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 03494 808D9D04 00000000 */ nop /* 03498 808D9D08 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 /* 0349C 808D9D0C 44818000 */ mtc1 $at, $f16 ## $f16 = 20.00 /* 034A0 808D9D10 C60A06EC */ lwc1 $f10, 0x06EC($s0) ## 000006EC /* 034A4 808D9D14 3C063D4C */ lui $a2, 0x3D4C ## $a2 = 3D4C0000 /* 034A8 808D9D18 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3D4CCCCD -/* 034AC 808D9D1C 46105482 */ mul.s $f18, $f10, $f16 +/* 034AC 808D9D1C 46105482 */ mul.s $f18, $f10, $f16 /* 034B0 808D9D20 26040688 */ addiu $a0, $s0, 0x0688 ## $a0 = 00000688 /* 034B4 808D9D24 3C054382 */ lui $a1, 0x4382 ## $a1 = 43820000 -/* 034B8 808D9D28 44079000 */ mfc1 $a3, $f18 +/* 034B8 808D9D28 44079000 */ mfc1 $a3, $f18 /* 034BC 808D9D2C 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 034C0 808D9D30 00000000 */ nop /* 034C4 808D9D34 3C0140C0 */ lui $at, 0x40C0 ## $at = 40C00000 /* 034C8 808D9D38 44813000 */ mtc1 $at, $f6 ## $f6 = 6.00 /* 034CC 808D9D3C C60406EC */ lwc1 $f4, 0x06EC($s0) ## 000006EC /* 034D0 808D9D40 3C063D4C */ lui $a2, 0x3D4C ## $a2 = 3D4C0000 /* 034D4 808D9D44 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3D4CCCCD -/* 034D8 808D9D48 46062202 */ mul.s $f8, $f4, $f6 +/* 034D8 808D9D48 46062202 */ mul.s $f8, $f4, $f6 /* 034DC 808D9D4C 26040690 */ addiu $a0, $s0, 0x0690 ## $a0 = 00000690 /* 034E0 808D9D50 3C0542CE */ lui $a1, 0x42CE ## $a1 = 42CE0000 -/* 034E4 808D9D54 44074000 */ mfc1 $a3, $f8 +/* 034E4 808D9D54 44074000 */ mfc1 $a3, $f8 /* 034E8 808D9D58 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 034EC 808D9D5C 00000000 */ nop /* 034F0 808D9D60 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 /* 034F4 808D9D64 44818000 */ mtc1 $at, $f16 ## $f16 = 20.00 /* 034F8 808D9D68 C60A06EC */ lwc1 $f10, 0x06EC($s0) ## 000006EC /* 034FC 808D9D6C 3C063D4C */ lui $a2, 0x3D4C ## $a2 = 3D4C0000 /* 03500 808D9D70 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3D4CCCCD -/* 03504 808D9D74 46105482 */ mul.s $f18, $f10, $f16 +/* 03504 808D9D74 46105482 */ mul.s $f18, $f10, $f16 /* 03508 808D9D78 26040694 */ addiu $a0, $s0, 0x0694 ## $a0 = 00000694 /* 0350C 808D9D7C 3C05438C */ lui $a1, 0x438C ## $a1 = 438C0000 -/* 03510 808D9D80 44079000 */ mfc1 $a3, $f18 +/* 03510 808D9D80 44079000 */ mfc1 $a3, $f18 /* 03514 808D9D84 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 03518 808D9D88 00000000 */ nop /* 0351C 808D9D8C 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 /* 03520 808D9D90 44810000 */ mtc1 $at, $f0 ## $f0 = 1.00 /* 03524 808D9D94 3C073C23 */ lui $a3, 0x3C23 ## $a3 = 3C230000 /* 03528 808D9D98 34E7D70A */ ori $a3, $a3, 0xD70A ## $a3 = 3C23D70A -/* 0352C 808D9D9C 44050000 */ mfc1 $a1, $f0 -/* 03530 808D9DA0 44060000 */ mfc1 $a2, $f0 +/* 0352C 808D9D9C 44050000 */ mfc1 $a1, $f0 +/* 03530 808D9DA0 44060000 */ mfc1 $a2, $f0 /* 03534 808D9DA4 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 03538 808D9DA8 260406EC */ addiu $a0, $s0, 0x06EC ## $a0 = 000006EC /* 0353C 808D9DAC 8E030674 */ lw $v1, 0x0674($s0) ## 00000674 .L808D9DB0: -/* 03540 808D9DB0 00032080 */ sll $a0, $v1, 2 -/* 03544 808D9DB4 00832023 */ subu $a0, $a0, $v1 -/* 03548 808D9DB8 000420C0 */ sll $a0, $a0, 3 -/* 0354C 808D9DBC 00832021 */ addu $a0, $a0, $v1 -/* 03550 808D9DC0 00042080 */ sll $a0, $a0, 2 -/* 03554 808D9DC4 00832023 */ subu $a0, $a0, $v1 -/* 03558 808D9DC8 00042200 */ sll $a0, $a0, 8 -/* 0355C 808D9DCC 00042400 */ sll $a0, $a0, 16 +/* 03540 808D9DB0 00032080 */ sll $a0, $v1, 2 +/* 03544 808D9DB4 00832023 */ subu $a0, $a0, $v1 +/* 03548 808D9DB8 000420C0 */ sll $a0, $a0, 3 +/* 0354C 808D9DBC 00832021 */ addu $a0, $a0, $v1 +/* 03550 808D9DC0 00042080 */ sll $a0, $a0, 2 +/* 03554 808D9DC4 00832023 */ subu $a0, $a0, $v1 +/* 03558 808D9DC8 00042200 */ sll $a0, $a0, 8 +/* 0355C 808D9DCC 00042400 */ sll $a0, $a0, 16 /* 03560 808D9DD0 0C01DE1C */ jal Math_Sins ## sins? -/* 03564 808D9DD4 00042403 */ sra $a0, $a0, 16 +/* 03564 808D9DD4 00042403 */ sra $a0, $a0, 16 /* 03568 808D9DD8 C6040710 */ lwc1 $f4, 0x0710($s0) ## 00000710 /* 0356C 808D9DDC 24042098 */ addiu $a0, $zero, 0x2098 ## $a0 = 00002098 -/* 03570 808D9DE0 46040182 */ mul.s $f6, $f0, $f4 -/* 03574 808D9DE4 0C01E221 */ jal func_80078884 +/* 03570 808D9DE0 46040182 */ mul.s $f6, $f0, $f4 +/* 03574 808D9DE4 0C01E221 */ jal func_80078884 /* 03578 808D9DE8 E606070C */ swc1 $f6, 0x070C($s0) ## 0000070C /* 0357C 808D9DEC 8E0E0674 */ lw $t6, 0x0674($s0) ## 00000674 /* 03580 808D9DF0 240F0001 */ addiu $t7, $zero, 0x0001 ## $t7 = 00000001 /* 03584 808D9DF4 24190010 */ addiu $t9, $zero, 0x0010 ## $t9 = 00000010 -/* 03588 808D9DF8 2DC10064 */ sltiu $at, $t6, 0x0064 -/* 0358C 808D9DFC 10200005 */ beq $at, $zero, .L808D9E14 +/* 03588 808D9DF8 2DC10064 */ sltiu $at, $t6, 0x0064 +/* 0358C 808D9DFC 10200005 */ beq $at, $zero, .L808D9E14 /* 03590 808D9E00 24090002 */ addiu $t1, $zero, 0x0002 ## $t1 = 00000002 /* 03594 808D9E04 2418000F */ addiu $t8, $zero, 0x000F ## $t8 = 0000000F /* 03598 808D9E08 A20F071B */ sb $t7, 0x071B($s0) ## 0000071B -/* 0359C 808D9E0C 10000003 */ beq $zero, $zero, .L808D9E1C +/* 0359C 808D9E0C 10000003 */ beq $zero, $zero, .L808D9E1C /* 035A0 808D9E10 A21801A0 */ sb $t8, 0x01A0($s0) ## 000001A0 .L808D9E14: /* 035A4 808D9E14 A21901A0 */ sb $t9, 0x01A0($s0) ## 000001A0 @@ -757,96 +757,96 @@ glabel L808D9C94 /* 035AC 808D9E1C 8E030674 */ lw $v1, 0x0674($s0) ## 00000674 /* 035B0 808D9E20 26040714 */ addiu $a0, $s0, 0x0714 ## $a0 = 00000714 /* 035B4 808D9E24 3C05437F */ lui $a1, 0x437F ## $a1 = 437F0000 -/* 035B8 808D9E28 2C610082 */ sltiu $at, $v1, 0x0082 -/* 035BC 808D9E2C 14200004 */ bne $at, $zero, .L808D9E40 +/* 035B8 808D9E28 2C610082 */ sltiu $at, $v1, 0x0082 +/* 035BC 808D9E2C 14200004 */ bne $at, $zero, .L808D9E40 /* 035C0 808D9E30 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 035C4 808D9E34 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 035C8 808D9E38 3C0740A0 */ lui $a3, 0x40A0 ## $a3 = 40A00000 /* 035CC 808D9E3C 8E030674 */ lw $v1, 0x0674($s0) ## 00000674 .L808D9E40: /* 035D0 808D9E40 240100B4 */ addiu $at, $zero, 0x00B4 ## $at = 000000B4 -/* 035D4 808D9E44 1461000F */ bne $v1, $at, .L808D9E84 -/* 035D8 808D9E48 8FAB00B4 */ lw $t3, 0x00B4($sp) +/* 035D4 808D9E44 1461000F */ bne $v1, $at, .L808D9E84 +/* 035D8 808D9E48 8FAB00B4 */ lw $t3, 0x00B4($sp) /* 035DC 808D9E4C 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 035E0 808D9E50 002B0821 */ addu $at, $at, $t3 +/* 035E0 808D9E50 002B0821 */ addu $at, $at, $t3 /* 035E4 808D9E54 240A0014 */ addiu $t2, $zero, 0x0014 ## $t2 = 00000014 /* 035E8 808D9E58 A02A1E15 */ sb $t2, 0x1E15($at) ## 00011E15 -/* 035EC 808D9E5C 8FAD00B4 */ lw $t5, 0x00B4($sp) +/* 035EC 808D9E5C 8FAD00B4 */ lw $t5, 0x00B4($sp) /* 035F0 808D9E60 3C010001 */ lui $at, 0x0001 ## $at = 00010000 /* 035F4 808D9E64 240C043F */ addiu $t4, $zero, 0x043F ## $t4 = 0000043F -/* 035F8 808D9E68 002D0821 */ addu $at, $at, $t5 +/* 035F8 808D9E68 002D0821 */ addu $at, $at, $t5 /* 035FC 808D9E6C A42C1E1A */ sh $t4, 0x1E1A($at) ## 00011E1A -/* 03600 808D9E70 8FAF00B4 */ lw $t7, 0x00B4($sp) +/* 03600 808D9E70 8FAF00B4 */ lw $t7, 0x00B4($sp) /* 03604 808D9E74 3C010001 */ lui $at, 0x0001 ## $at = 00010000 /* 03608 808D9E78 240E0005 */ addiu $t6, $zero, 0x0005 ## $t6 = 00000005 -/* 0360C 808D9E7C 002F0821 */ addu $at, $at, $t7 +/* 0360C 808D9E7C 002F0821 */ addu $at, $at, $t7 /* 03610 808D9E80 A02E1E5E */ sb $t6, 0x1E5E($at) ## 00011E5E .L808D9E84: -/* 03614 808D9E84 10000339 */ beq $zero, $zero, .L808DAB6C +/* 03614 808D9E84 10000339 */ beq $zero, $zero, .L808DAB6C /* 03618 808D9E88 86040678 */ lh $a0, 0x0678($s0) ## 00000678 glabel L808D9E8C -/* 0361C 808D9E8C 8FA400B4 */ lw $a0, 0x00B4($sp) -/* 03620 808D9E90 0C019148 */ jal func_80064520 +/* 0361C 808D9E8C 8FA400B4 */ lw $a0, 0x00B4($sp) +/* 03620 808D9E90 0C019148 */ jal func_80064520 /* 03624 808D9E94 24851D64 */ addiu $a1, $a0, 0x1D64 ## $a1 = 00001D64 -/* 03628 808D9E98 8FA400B4 */ lw $a0, 0x00B4($sp) +/* 03628 808D9E98 8FA400B4 */ lw $a0, 0x00B4($sp) /* 0362C 808D9E9C 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 03630 808D9EA0 0C00B7D5 */ jal func_8002DF54 +/* 03630 808D9EA0 0C00B7D5 */ jal func_8002DF54 /* 03634 808D9EA4 24060008 */ addiu $a2, $zero, 0x0008 ## $a2 = 00000008 -/* 03638 808D9EA8 0C03008C */ jal func_800C0230 -/* 0363C 808D9EAC 8FA400B4 */ lw $a0, 0x00B4($sp) +/* 03638 808D9EA8 0C03008C */ jal func_800C0230 +/* 0363C 808D9EAC 8FA400B4 */ lw $a0, 0x00B4($sp) /* 03640 808D9EB0 A602067A */ sh $v0, 0x067A($s0) ## 0000067A -/* 03644 808D9EB4 8FA400B4 */ lw $a0, 0x00B4($sp) +/* 03644 808D9EB4 8FA400B4 */ lw $a0, 0x00B4($sp) /* 03648 808D9EB8 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 0364C 808D9EBC 0C0300C5 */ jal func_800C0314 +/* 0364C 808D9EBC 0C0300C5 */ jal func_800C0314 /* 03650 808D9EC0 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 -/* 03654 808D9EC4 8FA400B4 */ lw $a0, 0x00B4($sp) +/* 03654 808D9EC4 8FA400B4 */ lw $a0, 0x00B4($sp) /* 03658 808D9EC8 8605067A */ lh $a1, 0x067A($s0) ## 0000067A -/* 0365C 808D9ECC 0C0300C5 */ jal func_800C0314 +/* 0365C 808D9ECC 0C0300C5 */ jal func_800C0314 /* 03660 808D9ED0 24060007 */ addiu $a2, $zero, 0x0007 ## $a2 = 00000007 /* 03664 808D9ED4 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 /* 03668 808D9ED8 24A5ADDC */ addiu $a1, $a1, 0xADDC ## $a1 = 0600ADDC -/* 0366C 808D9EDC 8FA40054 */ lw $a0, 0x0054($sp) -/* 03670 808D9EE0 0C029490 */ jal func_800A5240 +/* 0366C 808D9EDC 8FA40054 */ lw $a0, 0x0054($sp) +/* 03670 808D9EE0 0C029490 */ jal SkelAnime_ChangeAnimTransitionStop /* 03674 808D9EE4 24060000 */ addiu $a2, $zero, 0x0000 ## $a2 = 00000000 /* 03678 808D9EE8 3C040601 */ lui $a0, 0x0601 ## $a0 = 06010000 /* 0367C 808D9EEC 0C028800 */ jal SkelAnime_GetFrameCount - + /* 03680 808D9EF0 2484EA00 */ addiu $a0, $a0, 0xEA00 ## $a0 = 0600EA00 /* 03684 808D9EF4 44824000 */ mtc1 $v0, $f8 ## $f8 = 0.00 -/* 03688 808D9EF8 8FA600B4 */ lw $a2, 0x00B4($sp) +/* 03688 808D9EF8 8FA600B4 */ lw $a2, 0x00B4($sp) /* 0368C 808D9EFC 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 03690 808D9F00 468042A0 */ cvt.s.w $f10, $f8 +/* 03690 808D9F00 468042A0 */ cvt.s.w $f10, $f8 /* 03694 808D9F04 24180065 */ addiu $t8, $zero, 0x0065 ## $t8 = 00000065 /* 03698 808D9F08 A6180678 */ sh $t8, 0x0678($s0) ## 00000678 /* 0369C 808D9F0C E600016C */ swc1 $f0, 0x016C($s0) ## 0000016C /* 036A0 808D9F10 3C01808F */ lui $at, %hi(D_808F7F4C) ## $at = 808F0000 /* 036A4 808D9F14 24192000 */ addiu $t9, $zero, 0x2000 ## $t9 = 00002000 /* 036A8 808D9F18 E60A01CC */ swc1 $f10, 0x01CC($s0) ## 000001CC -/* 036AC 808D9F1C C4307F4C */ lwc1 $f16, %lo(D_808F7F4C)($at) -/* 036B0 808D9F20 AFB90028 */ sw $t9, 0x0028($sp) -/* 036B4 808D9F24 AFA00024 */ sw $zero, 0x0024($sp) -/* 036B8 808D9F28 AFA00020 */ sw $zero, 0x0020($sp) -/* 036BC 808D9F2C AFA0001C */ sw $zero, 0x001C($sp) +/* 036AC 808D9F1C C4307F4C */ lwc1 $f16, %lo(D_808F7F4C)($at) +/* 036B0 808D9F20 AFB90028 */ sw $t9, 0x0028($sp) +/* 036B4 808D9F24 AFA00024 */ sw $zero, 0x0024($sp) +/* 036B8 808D9F28 AFA00020 */ sw $zero, 0x0020($sp) +/* 036BC 808D9F2C AFA0001C */ sw $zero, 0x001C($sp) /* 036C0 808D9F30 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 036C4 808D9F34 24070179 */ addiu $a3, $zero, 0x0179 ## $a3 = 00000179 /* 036C8 808D9F38 24C41C24 */ addiu $a0, $a2, 0x1C24 ## $a0 = 00001C24 -/* 036CC 808D9F3C E7A00018 */ swc1 $f0, 0x0018($sp) -/* 036D0 808D9F40 E7A00010 */ swc1 $f0, 0x0010($sp) +/* 036CC 808D9F3C E7A00018 */ swc1 $f0, 0x0018($sp) +/* 036D0 808D9F40 E7A00010 */ swc1 $f0, 0x0010($sp) /* 036D4 808D9F44 0C00C916 */ jal Actor_SpawnAttached - -/* 036D8 808D9F48 E7B00014 */ swc1 $f16, 0x0014($sp) + +/* 036D8 808D9F48 E7B00014 */ swc1 $f16, 0x0014($sp) /* 036DC 808D9F4C 3C01C3EC */ lui $at, 0xC3EC ## $at = C3EC0000 /* 036E0 808D9F50 44810000 */ mtc1 $at, $f0 ## $f0 = -472.00 /* 036E4 808D9F54 3C01808F */ lui $at, %hi(D_808F7F50) ## $at = 808F0000 -/* 036E8 808D9F58 C4227F50 */ lwc1 $f2, %lo(D_808F7F50)($at) -/* 036EC 808D9F5C 8FA400A8 */ lw $a0, 0x00A8($sp) +/* 036E8 808D9F58 C4227F50 */ lwc1 $f2, %lo(D_808F7F50)($at) +/* 036EC 808D9F5C 8FA400A8 */ lw $a0, 0x00A8($sp) /* 036F0 808D9F60 3C088090 */ lui $t0, %hi(D_808F93D4) ## $t0 = 80900000 /* 036F4 808D9F64 250893D4 */ addiu $t0, $t0, %lo(D_808F93D4) ## $t0 = 808F93D4 /* 036F8 808D9F68 AD020000 */ sw $v0, 0x0000($t0) ## 808F93D4 /* 036FC 808D9F6C 3C01808F */ lui $at, %hi(D_808F7F54) ## $at = 808F0000 /* 03700 808D9F70 E4800024 */ swc1 $f0, 0x0024($a0) ## 00000024 -/* 03704 808D9F74 C4327F54 */ lwc1 $f18, %lo(D_808F7F54)($at) +/* 03704 808D9F74 C4327F54 */ lwc1 $f18, %lo(D_808F7F54)($at) /* 03708 808D9F78 3C01C302 */ lui $at, 0xC302 ## $at = C3020000 /* 0370C 808D9F7C 44812000 */ mtc1 $at, $f4 ## $f4 = -130.00 /* 03710 808D9F80 24098000 */ addiu $t1, $zero, 0x8000 ## $t1 = FFFF8000 @@ -855,13 +855,13 @@ glabel L808D9E8C /* 0371C 808D9F8C E484002C */ swc1 $f4, 0x002C($a0) ## 0000002C /* 03720 808D9F90 3C01808F */ lui $at, %hi(D_808F7F58) ## $at = 808F0000 /* 03724 808D9F94 E6000024 */ swc1 $f0, 0x0024($s0) ## 00000024 -/* 03728 808D9F98 C4267F58 */ lwc1 $f6, %lo(D_808F7F58)($at) +/* 03728 808D9F98 C4267F58 */ lwc1 $f6, %lo(D_808F7F58)($at) /* 0372C 808D9F9C 3C01C3C8 */ lui $at, 0xC3C8 ## $at = C3C80000 /* 03730 808D9FA0 44814000 */ mtc1 $at, $f8 ## $f8 = -400.00 /* 03734 808D9FA4 3C01808F */ lui $at, %hi(D_808F7F5C) ## $at = 808F0000 /* 03738 808D9FA8 E6060028 */ swc1 $f6, 0x0028($s0) ## 00000028 /* 0373C 808D9FAC E608002C */ swc1 $f8, 0x002C($s0) ## 0000002C -/* 03740 808D9FB0 C42A7F5C */ lwc1 $f10, %lo(D_808F7F5C)($at) +/* 03740 808D9FB0 C42A7F5C */ lwc1 $f10, %lo(D_808F7F5C)($at) /* 03744 808D9FB4 3C01C320 */ lui $at, 0xC320 ## $at = C3200000 /* 03748 808D9FB8 44818000 */ mtc1 $at, $f16 ## $f16 = -160.00 /* 0374C 808D9FBC 3C01C2C8 */ lui $at, 0xC2C8 ## $at = C2C80000 @@ -894,7 +894,7 @@ glabel L808D9E8C /* 037B8 808DA028 240F0014 */ addiu $t7, $zero, 0x0014 ## $t7 = 00000014 /* 037BC 808DA02C E5AA16D0 */ swc1 $f10, 0x16D0($t5) ## 000016D0 /* 037C0 808DA030 8C6E0000 */ lw $t6, 0x0000($v1) ## 808F93C0 -/* 037C4 808DA034 C4307F60 */ lwc1 $f16, %lo(D_808F7F60)($at) +/* 037C4 808DA034 C4307F60 */ lwc1 $f16, %lo(D_808F7F60)($at) /* 037C8 808DA038 3C01437F */ lui $at, 0x437F ## $at = 437F0000 /* 037CC 808DA03C 44819000 */ mtc1 $at, $f18 ## $f18 = 255.00 /* 037D0 808DA040 E5D016AC */ swc1 $f16, 0x16AC($t6) ## 000016AC @@ -903,72 +903,72 @@ glabel L808D9E8C /* 037DC 808DA04C 44812000 */ mtc1 $at, $f4 ## $f4 = 1.00 /* 037E0 808DA050 A30F1704 */ sb $t7, 0x1704($t8) ## 00001704 /* 037E4 808DA054 E6120714 */ swc1 $f18, 0x0714($s0) ## 00000714 -/* 037E8 808DA058 8FB900B4 */ lw $t9, 0x00B4($sp) +/* 037E8 808DA058 8FB900B4 */ lw $t9, 0x00B4($sp) /* 037EC 808DA05C 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 037F0 808DA060 00390821 */ addu $at, $at, $t9 +/* 037F0 808DA060 00390821 */ addu $at, $at, $t9 /* 037F4 808DA064 E4240AFC */ swc1 $f4, 0x0AFC($at) ## 00010AFC glabel L808DA068 /* 037F8 808DA068 3C01808F */ lui $at, %hi(D_808F7F64) ## $at = 808F0000 -/* 037FC 808DA06C C4267F64 */ lwc1 $f6, %lo(D_808F7F64)($at) -/* 03800 808DA070 8FA900A8 */ lw $t1, 0x00A8($sp) +/* 037FC 808DA06C C4267F64 */ lwc1 $f6, %lo(D_808F7F64)($at) +/* 03800 808DA070 8FA900A8 */ lw $t1, 0x00A8($sp) /* 03804 808DA074 26040714 */ addiu $a0, $s0, 0x0714 ## $a0 = 00000714 /* 03808 808DA078 3C053F80 */ lui $a1, 0x3F80 ## $a1 = 3F800000 /* 0380C 808DA07C 3C0640A0 */ lui $a2, 0x40A0 ## $a2 = 40A00000 /* 03810 808DA080 0C01E123 */ jal Math_SmoothDownscaleMaxF - + /* 03814 808DA084 E5260028 */ swc1 $f6, 0x0028($t1) ## FFFF8028 /* 03818 808DA088 8E0A0674 */ lw $t2, 0x0674($s0) ## 00000674 /* 0381C 808DA08C 26040688 */ addiu $a0, $s0, 0x0688 ## $a0 = 00000688 /* 03820 808DA090 3C05C402 */ lui $a1, 0xC402 ## $a1 = C4020000 -/* 03824 808DA094 2D410029 */ sltiu $at, $t2, 0x0029 -/* 03828 808DA098 1420003D */ bne $at, $zero, .L808DA190 +/* 03824 808DA094 2D410029 */ sltiu $at, $t2, 0x0029 +/* 03828 808DA098 1420003D */ bne $at, $zero, .L808DA190 /* 0382C 808DA09C 3C063DCC */ lui $a2, 0x3DCC ## $a2 = 3DCC0000 /* 03830 808DA0A0 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3DCCCCCD /* 03834 808DA0A4 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 03838 808DA0A8 8E0706EC */ lw $a3, 0x06EC($s0) ## 000006EC /* 0383C 808DA0AC 3C073DCC */ lui $a3, 0x3DCC ## $a3 = 3DCC0000 /* 03840 808DA0B0 34E7CCCD */ ori $a3, $a3, 0xCCCD ## $a3 = 3DCCCCCD /* 03844 808DA0B4 260406EC */ addiu $a0, $s0, 0x06EC ## $a0 = 000006EC /* 03848 808DA0B8 3C0540A0 */ lui $a1, 0x40A0 ## $a1 = 40A00000 /* 0384C 808DA0BC 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 03850 808DA0C0 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 03854 808DA0C4 8E030674 */ lw $v1, 0x0674($s0) ## 00000674 /* 03858 808DA0C8 24010096 */ addiu $at, $zero, 0x0096 ## $at = 00000096 /* 0385C 808DA0CC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 03860 808DA0D0 14610004 */ bne $v1, $at, .L808DA0E4 +/* 03860 808DA0D0 14610004 */ bne $v1, $at, .L808DA0E4 /* 03864 808DA0D4 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 /* 03868 808DA0D8 44814000 */ mtc1 $at, $f8 ## $f8 = 1.00 /* 0386C 808DA0DC 8E030674 */ lw $v1, 0x0674($s0) ## 00000674 /* 03870 808DA0E0 E608016C */ swc1 $f8, 0x016C($s0) ## 0000016C .L808DA0E4: /* 03874 808DA0E4 240100A0 */ addiu $at, $zero, 0x00A0 ## $at = 000000A0 -/* 03878 808DA0E8 54610005 */ bnel $v1, $at, .L808DA100 +/* 03878 808DA0E8 54610005 */ bnel $v1, $at, .L808DA100 /* 0387C 808DA0EC 240100BB */ addiu $at, $zero, 0x00BB ## $at = 000000BB /* 03880 808DA0F0 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 03884 808DA0F4 240508C5 */ addiu $a1, $zero, 0x08C5 ## $a1 = 000008C5 /* 03888 808DA0F8 8E030674 */ lw $v1, 0x0674($s0) ## 00000674 /* 0388C 808DA0FC 240100BB */ addiu $at, $zero, 0x00BB ## $at = 000000BB .L808DA100: -/* 03890 808DA100 14610004 */ bne $v1, $at, .L808DA114 +/* 03890 808DA100 14610004 */ bne $v1, $at, .L808DA114 /* 03894 808DA104 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 03898 808DA108 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 0389C 808DA10C 2405083E */ addiu $a1, $zero, 0x083E ## $a1 = 0000083E /* 038A0 808DA110 8E030674 */ lw $v1, 0x0674($s0) ## 00000674 .L808DA114: /* 038A4 808DA114 240100B4 */ addiu $at, $zero, 0x00B4 ## $at = 000000B4 -/* 038A8 808DA118 14610004 */ bne $v1, $at, .L808DA12C +/* 038A8 808DA118 14610004 */ bne $v1, $at, .L808DA12C /* 038AC 808DA11C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 038B0 808DA120 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 038B4 808DA124 240528C7 */ addiu $a1, $zero, 0x28C7 ## $a1 = 000028C7 /* 038B8 808DA128 8E030674 */ lw $v1, 0x0674($s0) ## 00000674 .L808DA12C: /* 038BC 808DA12C 240100BE */ addiu $at, $zero, 0x00BE ## $at = 000000BE -/* 038C0 808DA130 54610013 */ bnel $v1, $at, .L808DA180 +/* 038C0 808DA130 54610013 */ bnel $v1, $at, .L808DA180 /* 038C4 808DA134 240100E6 */ addiu $at, $zero, 0x00E6 ## $at = 000000E6 /* 038C8 808DA138 8E0C0024 */ lw $t4, 0x0024($s0) ## 00000024 /* 038CC 808DA13C 27A50074 */ addiu $a1, $sp, 0x0074 ## $a1 = FFFFFFC4 @@ -982,30 +982,30 @@ glabel L808DA068 /* 038EC 808DA15C 34E73333 */ ori $a3, $a3, 0x3333 ## $a3 = 3F333333 /* 038F0 808DA160 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3E4CCCCD /* 038F4 808DA164 ACAC0008 */ sw $t4, 0x0008($a1) ## FFFFFFCC -/* 038F8 808DA168 C42A7F68 */ lwc1 $f10, %lo(D_808F7F68)($at) -/* 038FC 808DA16C 8FA400B4 */ lw $a0, 0x00B4($sp) -/* 03900 808DA170 0C235B58 */ jal func_808D6D60 -/* 03904 808DA174 E7AA0078 */ swc1 $f10, 0x0078($sp) +/* 038F8 808DA168 C42A7F68 */ lwc1 $f10, %lo(D_808F7F68)($at) +/* 038FC 808DA16C 8FA400B4 */ lw $a0, 0x00B4($sp) +/* 03900 808DA170 0C235B58 */ jal func_808D6D60 +/* 03904 808DA174 E7AA0078 */ swc1 $f10, 0x0078($sp) /* 03908 808DA178 8E030674 */ lw $v1, 0x0674($s0) ## 00000674 /* 0390C 808DA17C 240100E6 */ addiu $at, $zero, 0x00E6 ## $at = 000000E6 .L808DA180: -/* 03910 808DA180 14610003 */ bne $v1, $at, .L808DA190 +/* 03910 808DA180 14610003 */ bne $v1, $at, .L808DA190 /* 03914 808DA184 240D0066 */ addiu $t5, $zero, 0x0066 ## $t5 = 00000066 /* 03918 808DA188 A60D0678 */ sh $t5, 0x0678($s0) ## 00000678 /* 0391C 808DA18C AE000674 */ sw $zero, 0x0674($s0) ## 00000674 .L808DA190: -/* 03920 808DA190 10000276 */ beq $zero, $zero, .L808DAB6C +/* 03920 808DA190 10000276 */ beq $zero, $zero, .L808DAB6C /* 03924 808DA194 86040678 */ lh $a0, 0x0678($s0) ## 00000678 glabel L808DA198 /* 03928 808DA198 3C01C3EC */ lui $at, 0xC3EC ## $at = C3EC0000 /* 0392C 808DA19C 44810000 */ mtc1 $at, $f0 ## $f0 = -472.00 /* 03930 808DA1A0 3C01808F */ lui $at, %hi(D_808F7F6C) ## $at = 808F0000 -/* 03934 808DA1A4 C4227F6C */ lwc1 $f2, %lo(D_808F7F6C)($at) +/* 03934 808DA1A4 C4227F6C */ lwc1 $f2, %lo(D_808F7F6C)($at) /* 03938 808DA1A8 3C01C307 */ lui $at, 0xC307 ## $at = C3070000 /* 0393C 808DA1AC 44816000 */ mtc1 $at, $f12 ## $f12 = -135.00 /* 03940 808DA1B0 3C01808F */ lui $at, %hi(D_808F7F70) ## $at = 808F0000 -/* 03944 808DA1B4 C4307F70 */ lwc1 $f16, %lo(D_808F7F70)($at) -/* 03948 808DA1B8 8FAE00A8 */ lw $t6, 0x00A8($sp) +/* 03944 808DA1B4 C4307F70 */ lwc1 $f16, %lo(D_808F7F70)($at) +/* 03948 808DA1B8 8FAE00A8 */ lw $t6, 0x00A8($sp) /* 0394C 808DA1BC 3C01C3DD */ lui $at, 0xC3DD ## $at = C3DD0000 /* 03950 808DA1C0 44819000 */ mtc1 $at, $f18 ## $f18 = -442.00 /* 03954 808DA1C4 E5D00028 */ swc1 $f16, 0x0028($t6) ## 00000028 @@ -1016,28 +1016,28 @@ glabel L808DA198 /* 03968 808DA1D8 E6020690 */ swc1 $f2, 0x0690($s0) ## 00000690 /* 0396C 808DA1DC E60C0688 */ swc1 $f12, 0x0688($s0) ## 00000688 /* 03970 808DA1E0 E60C0694 */ swc1 $f12, 0x0694($s0) ## 00000694 -/* 03974 808DA1E4 14610008 */ bne $v1, $at, .L808DA208 +/* 03974 808DA1E4 14610008 */ bne $v1, $at, .L808DA208 /* 03978 808DA1E8 E6120680 */ swc1 $f18, 0x0680($s0) ## 00000680 -/* 0397C 808DA1EC 8FA400B4 */ lw $a0, 0x00B4($sp) +/* 0397C 808DA1EC 8FA400B4 */ lw $a0, 0x00B4($sp) /* 03980 808DA1F0 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 03984 808DA1F4 0C00B7D5 */ jal func_8002DF54 +/* 03984 808DA1F4 0C00B7D5 */ jal func_8002DF54 /* 03988 808DA1F8 2406004C */ addiu $a2, $zero, 0x004C ## $a2 = 0000004C /* 0398C 808DA1FC 3C01C3EC */ lui $at, 0xC3EC ## $at = C3EC0000 /* 03990 808DA200 44810000 */ mtc1 $at, $f0 ## $f0 = -472.00 /* 03994 808DA204 8E030674 */ lw $v1, 0x0674($s0) ## 00000674 .L808DA208: /* 03998 808DA208 24010046 */ addiu $at, $zero, 0x0046 ## $at = 00000046 -/* 0399C 808DA20C 14610007 */ bne $v1, $at, .L808DA22C -/* 039A0 808DA210 8FA400B4 */ lw $a0, 0x00B4($sp) +/* 0399C 808DA20C 14610007 */ bne $v1, $at, .L808DA22C +/* 039A0 808DA210 8FA400B4 */ lw $a0, 0x00B4($sp) /* 039A4 808DA214 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 039A8 808DA218 0C00B7D5 */ jal func_8002DF54 +/* 039A8 808DA218 0C00B7D5 */ jal func_8002DF54 /* 039AC 808DA21C 2406004D */ addiu $a2, $zero, 0x004D ## $a2 = 0000004D /* 039B0 808DA220 3C01C3EC */ lui $at, 0xC3EC ## $at = C3EC0000 /* 039B4 808DA224 44810000 */ mtc1 $at, $f0 ## $f0 = -472.00 /* 039B8 808DA228 8E030674 */ lw $v1, 0x0674($s0) ## 00000674 .L808DA22C: /* 039BC 808DA22C 2401005A */ addiu $at, $zero, 0x005A ## $at = 0000005A -/* 039C0 808DA230 14610012 */ bne $v1, $at, .L808DA27C +/* 039C0 808DA230 14610012 */ bne $v1, $at, .L808DA27C /* 039C4 808DA234 3C088090 */ lui $t0, %hi(D_808F93D4) ## $t0 = 80900000 /* 039C8 808DA238 240F0067 */ addiu $t7, $zero, 0x0067 ## $t7 = 00000067 /* 039CC 808DA23C 250893D4 */ addiu $t0, $t0, %lo(D_808F93D4) ## $t0 = 808F93D4 @@ -1057,14 +1057,14 @@ glabel L808DA198 /* 03A04 808DA274 8D0B0000 */ lw $t3, 0x0000($t0) ## 808F93D4 /* 03A08 808DA278 A16A03C8 */ sb $t2, 0x03C8($t3) ## 000003C8 .L808DA27C: -/* 03A0C 808DA27C 1000023B */ beq $zero, $zero, .L808DAB6C +/* 03A0C 808DA27C 1000023B */ beq $zero, $zero, .L808DAB6C /* 03A10 808DA280 86040678 */ lh $a0, 0x0678($s0) ## 00000678 glabel L808DA284 /* 03A14 808DA284 3C088090 */ lui $t0, %hi(D_808F93D4) ## $t0 = 80900000 /* 03A18 808DA288 250893D4 */ addiu $t0, $t0, %lo(D_808F93D4) ## $t0 = 808F93D4 /* 03A1C 808DA28C 8D040000 */ lw $a0, 0x0000($t0) ## 808F93D4 /* 03A20 808DA290 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 03A24 808DA294 240520D5 */ addiu $a1, $zero, 0x20D5 ## $a1 = 000020D5 /* 03A28 808DA298 3C088090 */ lui $t0, %hi(D_808F93D4) ## $t0 = 80900000 /* 03A2C 808DA29C 250893D4 */ addiu $t0, $t0, %lo(D_808F93D4) ## $t0 = 808F93D4 @@ -1075,14 +1075,14 @@ glabel L808DA284 /* 03A40 808DA2B0 34A53000 */ ori $a1, $a1, 0x3000 ## $a1 = 45803000 /* 03A44 808DA2B4 3C073FC0 */ lui $a3, 0x3FC0 ## $a3 = 3FC00000 /* 03A48 808DA2B8 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 03A4C 808DA2BC 24840028 */ addiu $a0, $a0, 0x0028 ## $a0 = 00000028 /* 03A50 808DA2C0 3C01C372 */ lui $at, 0xC372 ## $at = C3720000 /* 03A54 808DA2C4 44814000 */ mtc1 $at, $f8 ## $f8 = -242.00 /* 03A58 808DA2C8 3C01808F */ lui $at, %hi(D_808F7F74) ## $at = 808F0000 /* 03A5C 808DA2CC 3C088090 */ lui $t0, %hi(D_808F93D4) ## $t0 = 80900000 /* 03A60 808DA2D0 E6080680 */ swc1 $f8, 0x0680($s0) ## 00000680 -/* 03A64 808DA2D4 C42A7F74 */ lwc1 $f10, %lo(D_808F7F74)($at) +/* 03A64 808DA2D4 C42A7F74 */ lwc1 $f10, %lo(D_808F7F74)($at) /* 03A68 808DA2D8 3C01C33E */ lui $at, 0xC33E ## $at = C33E0000 /* 03A6C 808DA2DC 44818000 */ mtc1 $at, $f16 ## $f16 = -190.00 /* 03A70 808DA2E0 250893D4 */ addiu $t0, $t0, %lo(D_808F93D4) ## $t0 = 808F93D4 @@ -1099,23 +1099,23 @@ glabel L808DA284 /* 03A9C 808DA30C 8E0F0674 */ lw $t7, 0x0674($s0) ## 00000674 /* 03AA0 808DA310 240100C8 */ addiu $at, $zero, 0x00C8 ## $at = 000000C8 /* 03AA4 808DA314 C5A40028 */ lwc1 $f4, 0x0028($t5) ## 00000028 -/* 03AA8 808DA318 46062200 */ add.s $f8, $f4, $f6 -/* 03AAC 808DA31C 460A4400 */ add.s $f16, $f8, $f10 +/* 03AA8 808DA318 46062200 */ add.s $f8, $f4, $f6 +/* 03AAC 808DA31C 460A4400 */ add.s $f16, $f8, $f10 /* 03AB0 808DA320 E6100690 */ swc1 $f16, 0x0690($s0) ## 00000690 /* 03AB4 808DA324 8D0E0000 */ lw $t6, 0x0000($t0) ## 808F93D4 /* 03AB8 808DA328 C5D2002C */ lwc1 $f18, 0x002C($t6) ## 0000002C -/* 03ABC 808DA32C 15E10009 */ bne $t7, $at, .L808DA354 +/* 03ABC 808DA32C 15E10009 */ bne $t7, $at, .L808DA354 /* 03AC0 808DA330 E6120694 */ swc1 $f18, 0x0694($s0) ## 00000694 /* 03AC4 808DA334 3C01808F */ lui $at, %hi(D_808F7F78) ## $at = 808F0000 -/* 03AC8 808DA338 C4247F78 */ lwc1 $f4, %lo(D_808F7F78)($at) +/* 03AC8 808DA338 C4247F78 */ lwc1 $f4, %lo(D_808F7F78)($at) /* 03ACC 808DA33C 8D180000 */ lw $t8, 0x0000($t0) ## 808F93D4 /* 03AD0 808DA340 24190068 */ addiu $t9, $zero, 0x0068 ## $t9 = 00000068 /* 03AD4 808DA344 E7040028 */ swc1 $f4, 0x0028($t8) ## 00000028 /* 03AD8 808DA348 A6190678 */ sh $t9, 0x0678($s0) ## 00000678 -/* 03ADC 808DA34C 10000003 */ beq $zero, $zero, .L808DA35C +/* 03ADC 808DA34C 10000003 */ beq $zero, $zero, .L808DA35C /* 03AE0 808DA350 AE000674 */ sw $zero, 0x0674($s0) ## 00000674 .L808DA354: -/* 03AE4 808DA354 10000205 */ beq $zero, $zero, .L808DAB6C +/* 03AE4 808DA354 10000205 */ beq $zero, $zero, .L808DAB6C /* 03AE8 808DA358 86040678 */ lh $a0, 0x0678($s0) ## 00000678 glabel L808DA35C .L808DA35C: @@ -1124,7 +1124,7 @@ glabel L808DA35C /* 03AF4 808DA364 3C01808F */ lui $at, %hi(D_808F7F7C) ## $at = 808F0000 /* 03AF8 808DA368 3C088090 */ lui $t0, %hi(D_808F93D4) ## $t0 = 80900000 /* 03AFC 808DA36C E6060680 */ swc1 $f6, 0x0680($s0) ## 00000680 -/* 03B00 808DA370 C4287F7C */ lwc1 $f8, %lo(D_808F7F7C)($at) +/* 03B00 808DA370 C4287F7C */ lwc1 $f8, %lo(D_808F7F7C)($at) /* 03B04 808DA374 3C01C348 */ lui $at, 0xC348 ## $at = C3480000 /* 03B08 808DA378 44815000 */ mtc1 $at, $f10 ## $f10 = -200.00 /* 03B0C 808DA37C 250893D4 */ addiu $t0, $t0, %lo(D_808F93D4) ## $t0 = 808F93D4 @@ -1141,28 +1141,28 @@ glabel L808DA35C /* 03B38 808DA3A8 8E030674 */ lw $v1, 0x0674($s0) ## 00000674 /* 03B3C 808DA3AC 3C063D4C */ lui $a2, 0x3D4C ## $a2 = 3D4C0000 /* 03B40 808DA3B0 C5520028 */ lwc1 $f18, 0x0028($t2) ## 00000028 -/* 03B44 808DA3B4 2C61000A */ sltiu $at, $v1, 0x000A +/* 03B44 808DA3B4 2C61000A */ sltiu $at, $v1, 0x000A /* 03B48 808DA3B8 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3D4CCCCD -/* 03B4C 808DA3BC 46049180 */ add.s $f6, $f18, $f4 +/* 03B4C 808DA3BC 46049180 */ add.s $f6, $f18, $f4 /* 03B50 808DA3C0 3C053F80 */ lui $a1, 0x3F80 ## $a1 = 3F800000 -/* 03B54 808DA3C4 46083280 */ add.s $f10, $f6, $f8 +/* 03B54 808DA3C4 46083280 */ add.s $f10, $f6, $f8 /* 03B58 808DA3C8 E60A0690 */ swc1 $f10, 0x0690($s0) ## 00000690 /* 03B5C 808DA3CC 8D0B0000 */ lw $t3, 0x0000($t0) ## 808F93D4 /* 03B60 808DA3D0 C570002C */ lwc1 $f16, 0x002C($t3) ## 0000002C -/* 03B64 808DA3D4 14200009 */ bne $at, $zero, .L808DA3FC +/* 03B64 808DA3D4 14200009 */ bne $at, $zero, .L808DA3FC /* 03B68 808DA3D8 E6100694 */ swc1 $f16, 0x0694($s0) ## 00000694 -/* 03B6C 808DA3DC 8FA400B4 */ lw $a0, 0x00B4($sp) +/* 03B6C 808DA3DC 8FA400B4 */ lw $a0, 0x00B4($sp) /* 03B70 808DA3E0 3C010001 */ lui $at, 0x0001 ## $at = 00010000 /* 03B74 808DA3E4 34210AFC */ ori $at, $at, 0x0AFC ## $at = 00010AFC /* 03B78 808DA3E8 0C01E123 */ jal Math_SmoothDownscaleMaxF - -/* 03B7C 808DA3EC 00812021 */ addu $a0, $a0, $at + +/* 03B7C 808DA3EC 00812021 */ addu $a0, $a0, $at /* 03B80 808DA3F0 3C088090 */ lui $t0, %hi(D_808F93D4) ## $t0 = 80900000 /* 03B84 808DA3F4 250893D4 */ addiu $t0, $t0, %lo(D_808F93D4) ## $t0 = 808F93D4 /* 03B88 808DA3F8 8E030674 */ lw $v1, 0x0674($s0) ## 00000674 .L808DA3FC: /* 03B8C 808DA3FC 2401000A */ addiu $at, $zero, 0x000A ## $at = 0000000A -/* 03B90 808DA400 14610005 */ bne $v1, $at, .L808DA418 +/* 03B90 808DA400 14610005 */ bne $v1, $at, .L808DA418 /* 03B94 808DA404 24180069 */ addiu $t8, $zero, 0x0069 ## $t8 = 00000069 /* 03B98 808DA408 8D0D0000 */ lw $t5, 0x0000($t0) ## 808F93D4 /* 03B9C 808DA40C 240C0008 */ addiu $t4, $zero, 0x0008 ## $t4 = 00000008 @@ -1170,7 +1170,7 @@ glabel L808DA35C /* 03BA4 808DA414 8E030674 */ lw $v1, 0x0674($s0) ## 00000674 .L808DA418: /* 03BA8 808DA418 24010032 */ addiu $at, $zero, 0x0032 ## $at = 00000032 -/* 03BAC 808DA41C 54610006 */ bnel $v1, $at, .L808DA438 +/* 03BAC 808DA41C 54610006 */ bnel $v1, $at, .L808DA438 /* 03BB0 808DA420 24010064 */ addiu $at, $zero, 0x0064 ## $at = 00000064 /* 03BB4 808DA424 8D0F0000 */ lw $t7, 0x0000($t0) ## 808F93D4 /* 03BB8 808DA428 240E0004 */ addiu $t6, $zero, 0x0004 ## $t6 = 00000004 @@ -1178,12 +1178,12 @@ glabel L808DA35C /* 03BC0 808DA430 8E030674 */ lw $v1, 0x0674($s0) ## 00000674 /* 03BC4 808DA434 24010064 */ addiu $at, $zero, 0x0064 ## $at = 00000064 .L808DA438: -/* 03BC8 808DA438 14610003 */ bne $v1, $at, .L808DA448 +/* 03BC8 808DA438 14610003 */ bne $v1, $at, .L808DA448 /* 03BCC 808DA43C 00000000 */ nop /* 03BD0 808DA440 A6180678 */ sh $t8, 0x0678($s0) ## 00000678 /* 03BD4 808DA444 AE000674 */ sw $zero, 0x0674($s0) ## 00000674 .L808DA448: -/* 03BD8 808DA448 100001C8 */ beq $zero, $zero, .L808DAB6C +/* 03BD8 808DA448 100001C8 */ beq $zero, $zero, .L808DAB6C /* 03BDC 808DA44C 86040678 */ lh $a0, 0x0678($s0) ## 00000678 glabel L808DA450 /* 03BE0 808DA450 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 @@ -1193,7 +1193,7 @@ glabel L808DA450 /* 03BF0 808DA460 3C01808F */ lui $at, %hi(D_808F7F80) ## $at = 808F0000 /* 03BF4 808DA464 3C088090 */ lui $t0, %hi(D_808F93D4) ## $t0 = 80900000 /* 03BF8 808DA468 E6120680 */ swc1 $f18, 0x0680($s0) ## 00000680 -/* 03BFC 808DA46C C4247F80 */ lwc1 $f4, %lo(D_808F7F80)($at) +/* 03BFC 808DA46C C4247F80 */ lwc1 $f4, %lo(D_808F7F80)($at) /* 03C00 808DA470 3C01C336 */ lui $at, 0xC336 ## $at = C3360000 /* 03C04 808DA474 44813000 */ mtc1 $at, $f6 ## $f6 = -182.00 /* 03C08 808DA478 250893D4 */ addiu $t0, $t0, %lo(D_808F93D4) ## $t0 = 808F93D4 @@ -1205,7 +1205,7 @@ glabel L808DA450 /* 03C20 808DA490 C7280024 */ lwc1 $f8, 0x0024($t9) ## 00000024 /* 03C24 808DA494 3C0141C8 */ lui $at, 0x41C8 ## $at = 41C80000 /* 03C28 808DA498 8E030674 */ lw $v1, 0x0674($s0) ## 00000674 -/* 03C2C 808DA49C 46004281 */ sub.s $f10, $f8, $f0 +/* 03C2C 808DA49C 46004281 */ sub.s $f10, $f8, $f0 /* 03C30 808DA4A0 240570D0 */ addiu $a1, $zero, 0x70D0 ## $a1 = 000070D0 /* 03C34 808DA4A4 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 /* 03C38 808DA4A8 E60A068C */ swc1 $f10, 0x068C($s0) ## 0000068C @@ -1213,94 +1213,94 @@ glabel L808DA450 /* 03C40 808DA4B0 44815000 */ mtc1 $at, $f10 ## $f10 = 25.00 /* 03C44 808DA4B4 2401000A */ addiu $at, $zero, 0x000A ## $at = 0000000A /* 03C48 808DA4B8 C5300028 */ lwc1 $f16, 0x0028($t1) ## 00000028 -/* 03C4C 808DA4BC 46128100 */ add.s $f4, $f16, $f18 -/* 03C50 808DA4C0 46002180 */ add.s $f6, $f4, $f0 +/* 03C4C 808DA4BC 46128100 */ add.s $f4, $f16, $f18 +/* 03C50 808DA4C0 46002180 */ add.s $f6, $f4, $f0 /* 03C54 808DA4C4 E6060690 */ swc1 $f6, 0x0690($s0) ## 00000690 /* 03C58 808DA4C8 8D0A0000 */ lw $t2, 0x0000($t0) ## 808F93D4 /* 03C5C 808DA4CC C548002C */ lwc1 $f8, 0x002C($t2) ## 0000002C -/* 03C60 808DA4D0 460A4401 */ sub.s $f16, $f8, $f10 -/* 03C64 808DA4D4 14610004 */ bne $v1, $at, .L808DA4E8 +/* 03C60 808DA4D0 460A4401 */ sub.s $f16, $f8, $f10 +/* 03C64 808DA4D4 14610004 */ bne $v1, $at, .L808DA4E8 /* 03C68 808DA4D8 E6100694 */ swc1 $f16, 0x0694($s0) ## 00000694 -/* 03C6C 808DA4DC 0C042DA0 */ jal func_8010B680 -/* 03C70 808DA4E0 8FA400B4 */ lw $a0, 0x00B4($sp) +/* 03C6C 808DA4DC 0C042DA0 */ jal func_8010B680 +/* 03C70 808DA4E0 8FA400B4 */ lw $a0, 0x00B4($sp) /* 03C74 808DA4E4 8E030674 */ lw $v1, 0x0674($s0) ## 00000674 .L808DA4E8: -/* 03C78 808DA4E8 2C610065 */ sltiu $at, $v1, 0x0065 -/* 03C7C 808DA4EC 14200007 */ bne $at, $zero, .L808DA50C -/* 03C80 808DA4F0 8FA400B4 */ lw $a0, 0x00B4($sp) -/* 03C84 808DA4F4 0C042F6F */ jal func_8010BDBC +/* 03C78 808DA4E8 2C610065 */ sltiu $at, $v1, 0x0065 +/* 03C7C 808DA4EC 14200007 */ bne $at, $zero, .L808DA50C +/* 03C80 808DA4F0 8FA400B4 */ lw $a0, 0x00B4($sp) +/* 03C84 808DA4F4 0C042F6F */ jal func_8010BDBC /* 03C88 808DA4F8 248420D8 */ addiu $a0, $a0, 0x20D8 ## $a0 = 000020D8 -/* 03C8C 808DA4FC 14400003 */ bne $v0, $zero, .L808DA50C +/* 03C8C 808DA4FC 14400003 */ bne $v0, $zero, .L808DA50C /* 03C90 808DA500 240B041F */ addiu $t3, $zero, 0x041F ## $t3 = 0000041F /* 03C94 808DA504 A60B0678 */ sh $t3, 0x0678($s0) ## 00000678 /* 03C98 808DA508 AE000674 */ sw $zero, 0x0674($s0) ## 00000674 .L808DA50C: -/* 03C9C 808DA50C 10000197 */ beq $zero, $zero, .L808DAB6C +/* 03C9C 808DA50C 10000197 */ beq $zero, $zero, .L808DAB6C /* 03CA0 808DA510 86040678 */ lh $a0, 0x0678($s0) ## 00000678 /* 03CA4 808DA514 8E040674 */ lw $a0, 0x0674($s0) ## 00000674 .L808DA518: -/* 03CA8 808DA518 00800821 */ addu $at, $a0, $zero -/* 03CAC 808DA51C 00042080 */ sll $a0, $a0, 2 -/* 03CB0 808DA520 00812023 */ subu $a0, $a0, $at -/* 03CB4 808DA524 000420C0 */ sll $a0, $a0, 3 -/* 03CB8 808DA528 00812021 */ addu $a0, $a0, $at -/* 03CBC 808DA52C 00042080 */ sll $a0, $a0, 2 -/* 03CC0 808DA530 00812023 */ subu $a0, $a0, $at -/* 03CC4 808DA534 00042200 */ sll $a0, $a0, 8 -/* 03CC8 808DA538 00042400 */ sll $a0, $a0, 16 +/* 03CA8 808DA518 00800821 */ addu $at, $a0, $zero +/* 03CAC 808DA51C 00042080 */ sll $a0, $a0, 2 +/* 03CB0 808DA520 00812023 */ subu $a0, $a0, $at +/* 03CB4 808DA524 000420C0 */ sll $a0, $a0, 3 +/* 03CB8 808DA528 00812021 */ addu $a0, $a0, $at +/* 03CBC 808DA52C 00042080 */ sll $a0, $a0, 2 +/* 03CC0 808DA530 00812023 */ subu $a0, $a0, $at +/* 03CC4 808DA534 00042200 */ sll $a0, $a0, 8 +/* 03CC8 808DA538 00042400 */ sll $a0, $a0, 16 /* 03CCC 808DA53C 0C01DE1C */ jal Math_Sins ## sins? -/* 03CD0 808DA540 00042403 */ sra $a0, $a0, 16 +/* 03CD0 808DA540 00042403 */ sra $a0, $a0, 16 /* 03CD4 808DA544 3C01808F */ lui $at, %hi(D_808F7F84) ## $at = 808F0000 -/* 03CD8 808DA548 C4327F84 */ lwc1 $f18, %lo(D_808F7F84)($at) +/* 03CD8 808DA548 C4327F84 */ lwc1 $f18, %lo(D_808F7F84)($at) /* 03CDC 808DA54C 24042098 */ addiu $a0, $zero, 0x2098 ## $a0 = 00002098 -/* 03CE0 808DA550 46120102 */ mul.s $f4, $f0, $f18 -/* 03CE4 808DA554 0C01E221 */ jal func_80078884 +/* 03CE0 808DA550 46120102 */ mul.s $f4, $f0, $f18 +/* 03CE4 808DA554 0C01E221 */ jal func_80078884 /* 03CE8 808DA558 E604070C */ swc1 $f4, 0x070C($s0) ## 0000070C /* 03CEC 808DA55C 8E030674 */ lw $v1, 0x0674($s0) ## 00000674 /* 03CF0 808DA560 24010014 */ addiu $at, $zero, 0x0014 ## $at = 00000014 /* 03CF4 808DA564 3C088090 */ lui $t0, %hi(D_808F93D4) ## $t0 = 80900000 -/* 03CF8 808DA568 14610009 */ bne $v1, $at, .L808DA590 +/* 03CF8 808DA568 14610009 */ bne $v1, $at, .L808DA590 /* 03CFC 808DA56C 250893D4 */ addiu $t0, $t0, %lo(D_808F93D4) ## $t0 = 808F93D4 /* 03D00 808DA570 8D0D0000 */ lw $t5, 0x0000($t0) ## 808F93D4 /* 03D04 808DA574 240C0005 */ addiu $t4, $zero, 0x0005 ## $t4 = 00000005 /* 03D08 808DA578 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 03D0C 808DA57C A1AC03C8 */ sb $t4, 0x03C8($t5) ## 000003C8 -/* 03D10 808DA580 8FA400B4 */ lw $a0, 0x00B4($sp) -/* 03D14 808DA584 0C00B7D5 */ jal func_8002DF54 +/* 03D10 808DA580 8FA400B4 */ lw $a0, 0x00B4($sp) +/* 03D14 808DA584 0C00B7D5 */ jal func_8002DF54 /* 03D18 808DA588 24060039 */ addiu $a2, $zero, 0x0039 ## $a2 = 00000039 /* 03D1C 808DA58C 8E030674 */ lw $v1, 0x0674($s0) ## 00000674 .L808DA590: /* 03D20 808DA590 24010028 */ addiu $at, $zero, 0x0028 ## $at = 00000028 -/* 03D24 808DA594 14610003 */ bne $v1, $at, .L808DA5A4 +/* 03D24 808DA594 14610003 */ bne $v1, $at, .L808DA5A4 /* 03D28 808DA598 240E0420 */ addiu $t6, $zero, 0x0420 ## $t6 = 00000420 /* 03D2C 808DA59C A60E0678 */ sh $t6, 0x0678($s0) ## 00000678 /* 03D30 808DA5A0 AE000674 */ sw $zero, 0x0674($s0) ## 00000674 .L808DA5A4: -/* 03D34 808DA5A4 10000171 */ beq $zero, $zero, .L808DAB6C +/* 03D34 808DA5A4 10000171 */ beq $zero, $zero, .L808DAB6C /* 03D38 808DA5A8 86040678 */ lh $a0, 0x0678($s0) ## 00000678 .L808DA5AC: /* 03D3C 808DA5AC 8E040674 */ lw $a0, 0x0674($s0) ## 00000674 -/* 03D40 808DA5B0 00800821 */ addu $at, $a0, $zero -/* 03D44 808DA5B4 00042080 */ sll $a0, $a0, 2 -/* 03D48 808DA5B8 00812023 */ subu $a0, $a0, $at -/* 03D4C 808DA5BC 000420C0 */ sll $a0, $a0, 3 -/* 03D50 808DA5C0 00812021 */ addu $a0, $a0, $at -/* 03D54 808DA5C4 00042080 */ sll $a0, $a0, 2 -/* 03D58 808DA5C8 00812023 */ subu $a0, $a0, $at -/* 03D5C 808DA5CC 00042200 */ sll $a0, $a0, 8 -/* 03D60 808DA5D0 00042400 */ sll $a0, $a0, 16 +/* 03D40 808DA5B0 00800821 */ addu $at, $a0, $zero +/* 03D44 808DA5B4 00042080 */ sll $a0, $a0, 2 +/* 03D48 808DA5B8 00812023 */ subu $a0, $a0, $at +/* 03D4C 808DA5BC 000420C0 */ sll $a0, $a0, 3 +/* 03D50 808DA5C0 00812021 */ addu $a0, $a0, $at +/* 03D54 808DA5C4 00042080 */ sll $a0, $a0, 2 +/* 03D58 808DA5C8 00812023 */ subu $a0, $a0, $at +/* 03D5C 808DA5CC 00042200 */ sll $a0, $a0, 8 +/* 03D60 808DA5D0 00042400 */ sll $a0, $a0, 16 /* 03D64 808DA5D4 0C01DE1C */ jal Math_Sins ## sins? -/* 03D68 808DA5D8 00042403 */ sra $a0, $a0, 16 +/* 03D68 808DA5D8 00042403 */ sra $a0, $a0, 16 /* 03D6C 808DA5DC 3C01808F */ lui $at, %hi(D_808F7F88) ## $at = 808F0000 -/* 03D70 808DA5E0 C4267F88 */ lwc1 $f6, %lo(D_808F7F88)($at) +/* 03D70 808DA5E0 C4267F88 */ lwc1 $f6, %lo(D_808F7F88)($at) /* 03D74 808DA5E4 24042098 */ addiu $a0, $zero, 0x2098 ## $a0 = 00002098 -/* 03D78 808DA5E8 46060202 */ mul.s $f8, $f0, $f6 -/* 03D7C 808DA5EC 0C01E221 */ jal func_80078884 +/* 03D78 808DA5E8 46060202 */ mul.s $f8, $f0, $f6 +/* 03D7C 808DA5EC 0C01E221 */ jal func_80078884 /* 03D80 808DA5F0 E608070C */ swc1 $f8, 0x070C($s0) ## 0000070C /* 03D84 808DA5F4 3C01808F */ lui $at, %hi(D_808F7F8C) ## $at = 808F0000 -/* 03D88 808DA5F8 C42A7F8C */ lwc1 $f10, %lo(D_808F7F8C)($at) +/* 03D88 808DA5F8 C42A7F8C */ lwc1 $f10, %lo(D_808F7F8C)($at) /* 03D8C 808DA5FC 3C014581 */ lui $at, 0x4581 ## $at = 45810000 /* 03D90 808DA600 44818000 */ mtc1 $at, $f16 ## $f16 = 4128.00 /* 03D94 808DA604 3C01C322 */ lui $at, 0xC322 ## $at = C3220000 @@ -1312,79 +1312,79 @@ glabel L808DA450 /* 03DAC 808DA61C E6100684 */ swc1 $f16, 0x0684($s0) ## 00000684 /* 03DB0 808DA620 E6120688 */ swc1 $f18, 0x0688($s0) ## 00000688 /* 03DB4 808DA624 E604068C */ swc1 $f4, 0x068C($s0) ## 0000068C -/* 03DB8 808DA628 C4267F90 */ lwc1 $f6, %lo(D_808F7F90)($at) +/* 03DB8 808DA628 C4267F90 */ lwc1 $f6, %lo(D_808F7F90)($at) /* 03DBC 808DA62C 8E0F0674 */ lw $t7, 0x0674($s0) ## 00000674 /* 03DC0 808DA630 3C01C296 */ lui $at, 0xC296 ## $at = C2960000 /* 03DC4 808DA634 44814000 */ mtc1 $at, $f8 ## $f8 = -75.00 -/* 03DC8 808DA638 2DE10029 */ sltiu $at, $t7, 0x0029 +/* 03DC8 808DA638 2DE10029 */ sltiu $at, $t7, 0x0029 /* 03DCC 808DA63C E6060690 */ swc1 $f6, 0x0690($s0) ## 00000690 -/* 03DD0 808DA640 14200004 */ bne $at, $zero, .L808DA654 +/* 03DD0 808DA640 14200004 */ bne $at, $zero, .L808DA654 /* 03DD4 808DA644 E6080694 */ swc1 $f8, 0x0694($s0) ## 00000694 /* 03DD8 808DA648 24180421 */ addiu $t8, $zero, 0x0421 ## $t8 = 00000421 /* 03DDC 808DA64C A6180678 */ sh $t8, 0x0678($s0) ## 00000678 /* 03DE0 808DA650 AE000674 */ sw $zero, 0x0674($s0) ## 00000674 .L808DA654: -/* 03DE4 808DA654 10000145 */ beq $zero, $zero, .L808DAB6C +/* 03DE4 808DA654 10000145 */ beq $zero, $zero, .L808DAB6C /* 03DE8 808DA658 86040678 */ lh $a0, 0x0678($s0) ## 00000678 /* 03DEC 808DA65C 8E040674 */ lw $a0, 0x0674($s0) ## 00000674 .L808DA660: -/* 03DF0 808DA660 00800821 */ addu $at, $a0, $zero -/* 03DF4 808DA664 00042080 */ sll $a0, $a0, 2 -/* 03DF8 808DA668 00812023 */ subu $a0, $a0, $at -/* 03DFC 808DA66C 000420C0 */ sll $a0, $a0, 3 -/* 03E00 808DA670 00812021 */ addu $a0, $a0, $at -/* 03E04 808DA674 00042080 */ sll $a0, $a0, 2 -/* 03E08 808DA678 00812023 */ subu $a0, $a0, $at -/* 03E0C 808DA67C 00042200 */ sll $a0, $a0, 8 -/* 03E10 808DA680 00042400 */ sll $a0, $a0, 16 +/* 03DF0 808DA660 00800821 */ addu $at, $a0, $zero +/* 03DF4 808DA664 00042080 */ sll $a0, $a0, 2 +/* 03DF8 808DA668 00812023 */ subu $a0, $a0, $at +/* 03DFC 808DA66C 000420C0 */ sll $a0, $a0, 3 +/* 03E00 808DA670 00812021 */ addu $a0, $a0, $at +/* 03E04 808DA674 00042080 */ sll $a0, $a0, 2 +/* 03E08 808DA678 00812023 */ subu $a0, $a0, $at +/* 03E0C 808DA67C 00042200 */ sll $a0, $a0, 8 +/* 03E10 808DA680 00042400 */ sll $a0, $a0, 16 /* 03E14 808DA684 0C01DE1C */ jal Math_Sins ## sins? -/* 03E18 808DA688 00042403 */ sra $a0, $a0, 16 +/* 03E18 808DA688 00042403 */ sra $a0, $a0, 16 /* 03E1C 808DA68C 3C014248 */ lui $at, 0x4248 ## $at = 42480000 /* 03E20 808DA690 44815000 */ mtc1 $at, $f10 ## $f10 = 50.00 /* 03E24 808DA694 C61006F0 */ lwc1 $f16, 0x06F0($s0) ## 000006F0 /* 03E28 808DA698 24042098 */ addiu $a0, $zero, 0x2098 ## $a0 = 00002098 -/* 03E2C 808DA69C 46105482 */ mul.s $f18, $f10, $f16 +/* 03E2C 808DA69C 46105482 */ mul.s $f18, $f10, $f16 /* 03E30 808DA6A0 00000000 */ nop -/* 03E34 808DA6A4 46120102 */ mul.s $f4, $f0, $f18 -/* 03E38 808DA6A8 0C01E221 */ jal func_80078884 +/* 03E34 808DA6A4 46120102 */ mul.s $f4, $f0, $f18 +/* 03E38 808DA6A8 0C01E221 */ jal func_80078884 /* 03E3C 808DA6AC E604070C */ swc1 $f4, 0x070C($s0) ## 0000070C /* 03E40 808DA6B0 3C01808F */ lui $at, %hi(D_808F7F94) ## $at = 808F0000 -/* 03E44 808DA6B4 C4287F94 */ lwc1 $f8, %lo(D_808F7F94)($at) +/* 03E44 808DA6B4 C4287F94 */ lwc1 $f8, %lo(D_808F7F94)($at) /* 03E48 808DA6B8 C60606F0 */ lwc1 $f6, 0x06F0($s0) ## 000006F0 /* 03E4C 808DA6BC 3C063DCC */ lui $a2, 0x3DCC ## $a2 = 3DCC0000 /* 03E50 808DA6C0 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3DCCCCCD -/* 03E54 808DA6C4 46083282 */ mul.s $f10, $f6, $f8 +/* 03E54 808DA6C4 46083282 */ mul.s $f10, $f6, $f8 /* 03E58 808DA6C8 26040680 */ addiu $a0, $s0, 0x0680 ## $a0 = 00000680 /* 03E5C 808DA6CC 3C05C496 */ lui $a1, 0xC496 ## $a1 = C4960000 -/* 03E60 808DA6D0 44075000 */ mfc1 $a3, $f10 +/* 03E60 808DA6D0 44075000 */ mfc1 $a3, $f10 /* 03E64 808DA6D4 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 03E68 808DA6D8 00000000 */ nop /* 03E6C 808DA6DC 3C0142E2 */ lui $at, 0x42E2 ## $at = 42E20000 /* 03E70 808DA6E0 44819000 */ mtc1 $at, $f18 ## $f18 = 113.00 /* 03E74 808DA6E4 C61006F0 */ lwc1 $f16, 0x06F0($s0) ## 000006F0 /* 03E78 808DA6E8 3C054584 */ lui $a1, 0x4584 ## $a1 = 45840000 /* 03E7C 808DA6EC 3C063DCC */ lui $a2, 0x3DCC ## $a2 = 3DCC0000 -/* 03E80 808DA6F0 46128102 */ mul.s $f4, $f16, $f18 +/* 03E80 808DA6F0 46128102 */ mul.s $f4, $f16, $f18 /* 03E84 808DA6F4 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3DCCCCCD /* 03E88 808DA6F8 34A58800 */ ori $a1, $a1, 0x8800 ## $a1 = 45848800 /* 03E8C 808DA6FC 26040684 */ addiu $a0, $s0, 0x0684 ## $a0 = 00000684 -/* 03E90 808DA700 44072000 */ mfc1 $a3, $f4 +/* 03E90 808DA700 44072000 */ mfc1 $a3, $f4 /* 03E94 808DA704 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 03E98 808DA708 00000000 */ nop /* 03E9C 808DA70C 3C01808F */ lui $at, %hi(D_808F7F98) ## $at = 808F0000 -/* 03EA0 808DA710 C4287F98 */ lwc1 $f8, %lo(D_808F7F98)($at) +/* 03EA0 808DA710 C4287F98 */ lwc1 $f8, %lo(D_808F7F98)($at) /* 03EA4 808DA714 C60606F0 */ lwc1 $f6, 0x06F0($s0) ## 000006F0 /* 03EA8 808DA718 3C063DCC */ lui $a2, 0x3DCC ## $a2 = 3DCC0000 /* 03EAC 808DA71C 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3DCCCCCD -/* 03EB0 808DA720 46083282 */ mul.s $f10, $f6, $f8 +/* 03EB0 808DA720 46083282 */ mul.s $f10, $f6, $f8 /* 03EB4 808DA724 26040688 */ addiu $a0, $s0, 0x0688 ## $a0 = 00000688 /* 03EB8 808DA728 3C05C483 */ lui $a1, 0xC483 ## $a1 = C4830000 -/* 03EBC 808DA72C 44075000 */ mfc1 $a3, $f10 +/* 03EBC 808DA72C 44075000 */ mfc1 $a3, $f10 /* 03EC0 808DA730 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 03EC4 808DA734 00000000 */ nop /* 03EC8 808DA738 3C053D4C */ lui $a1, 0x3D4C ## $a1 = 3D4C0000 /* 03ECC 808DA73C 3C073A83 */ lui $a3, 0x3A83 ## $a3 = 3A830000 @@ -1392,18 +1392,18 @@ glabel L808DA450 /* 03ED4 808DA744 34A5CCCD */ ori $a1, $a1, 0xCCCD ## $a1 = 3D4CCCCD /* 03ED8 808DA748 260406F0 */ addiu $a0, $s0, 0x06F0 ## $a0 = 000006F0 /* 03EDC 808DA74C 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 03EE0 808DA750 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 03EE4 808DA754 8E190674 */ lw $t9, 0x0674($s0) ## 00000674 /* 03EE8 808DA758 2409006A */ addiu $t1, $zero, 0x006A ## $t1 = 0000006A /* 03EEC 808DA75C 240A003C */ addiu $t2, $zero, 0x003C ## $t2 = 0000003C -/* 03EF0 808DA760 2F210051 */ sltiu $at, $t9, 0x0051 -/* 03EF4 808DA764 14200003 */ bne $at, $zero, .L808DA774 +/* 03EF0 808DA760 2F210051 */ sltiu $at, $t9, 0x0051 +/* 03EF4 808DA764 14200003 */ bne $at, $zero, .L808DA774 /* 03EF8 808DA768 00000000 */ nop /* 03EFC 808DA76C A6090678 */ sh $t1, 0x0678($s0) ## 00000678 /* 03F00 808DA770 AE0A0674 */ sw $t2, 0x0674($s0) ## 00000674 .L808DA774: -/* 03F04 808DA774 100000FD */ beq $zero, $zero, .L808DAB6C +/* 03F04 808DA774 100000FD */ beq $zero, $zero, .L808DAB6C /* 03F08 808DA778 86040678 */ lh $a0, 0x0678($s0) ## 00000678 glabel L808DA77C /* 03F0C 808DA77C 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 @@ -1413,7 +1413,7 @@ glabel L808DA77C /* 03F1C 808DA78C 3C01808F */ lui $at, %hi(D_808F7F9C) ## $at = 808F0000 /* 03F20 808DA790 3C088090 */ lui $t0, %hi(D_808F93D4) ## $t0 = 80900000 /* 03F24 808DA794 E6100680 */ swc1 $f16, 0x0680($s0) ## 00000680 -/* 03F28 808DA798 C4327F9C */ lwc1 $f18, %lo(D_808F7F9C)($at) +/* 03F28 808DA798 C4327F9C */ lwc1 $f18, %lo(D_808F7F9C)($at) /* 03F2C 808DA79C 3C01C336 */ lui $at, 0xC336 ## $at = C3360000 /* 03F30 808DA7A0 44812000 */ mtc1 $at, $f4 ## $f4 = -182.00 /* 03F34 808DA7A4 250893D4 */ addiu $t0, $t0, %lo(D_808F93D4) ## $t0 = 808F93D4 @@ -1425,40 +1425,40 @@ glabel L808DA77C /* 03F4C 808DA7BC C5660024 */ lwc1 $f6, 0x0024($t3) ## 00000024 /* 03F50 808DA7C0 8E040674 */ lw $a0, 0x0674($s0) ## 00000674 /* 03F54 808DA7C4 3C0141C8 */ lui $at, 0x41C8 ## $at = 41C80000 -/* 03F58 808DA7C8 46003201 */ sub.s $f8, $f6, $f0 +/* 03F58 808DA7C8 46003201 */ sub.s $f8, $f6, $f0 /* 03F5C 808DA7CC E608068C */ swc1 $f8, 0x068C($s0) ## 0000068C /* 03F60 808DA7D0 8D0C0000 */ lw $t4, 0x0000($t0) ## 808F93D4 /* 03F64 808DA7D4 44814000 */ mtc1 $at, $f8 ## $f8 = 25.00 -/* 03F68 808DA7D8 00800821 */ addu $at, $a0, $zero +/* 03F68 808DA7D8 00800821 */ addu $at, $a0, $zero /* 03F6C 808DA7DC C58A0028 */ lwc1 $f10, 0x0028($t4) ## 00000028 -/* 03F70 808DA7E0 00042080 */ sll $a0, $a0, 2 -/* 03F74 808DA7E4 00812023 */ subu $a0, $a0, $at -/* 03F78 808DA7E8 46105480 */ add.s $f18, $f10, $f16 -/* 03F7C 808DA7EC 000420C0 */ sll $a0, $a0, 3 -/* 03F80 808DA7F0 00812021 */ addu $a0, $a0, $at -/* 03F84 808DA7F4 00042080 */ sll $a0, $a0, 2 -/* 03F88 808DA7F8 46009100 */ add.s $f4, $f18, $f0 -/* 03F8C 808DA7FC 00812023 */ subu $a0, $a0, $at -/* 03F90 808DA800 00042200 */ sll $a0, $a0, 8 -/* 03F94 808DA804 00042400 */ sll $a0, $a0, 16 +/* 03F70 808DA7E0 00042080 */ sll $a0, $a0, 2 +/* 03F74 808DA7E4 00812023 */ subu $a0, $a0, $at +/* 03F78 808DA7E8 46105480 */ add.s $f18, $f10, $f16 +/* 03F7C 808DA7EC 000420C0 */ sll $a0, $a0, 3 +/* 03F80 808DA7F0 00812021 */ addu $a0, $a0, $at +/* 03F84 808DA7F4 00042080 */ sll $a0, $a0, 2 +/* 03F88 808DA7F8 46009100 */ add.s $f4, $f18, $f0 +/* 03F8C 808DA7FC 00812023 */ subu $a0, $a0, $at +/* 03F90 808DA800 00042200 */ sll $a0, $a0, 8 +/* 03F94 808DA804 00042400 */ sll $a0, $a0, 16 /* 03F98 808DA808 E6040690 */ swc1 $f4, 0x0690($s0) ## 00000690 /* 03F9C 808DA80C 8D0D0000 */ lw $t5, 0x0000($t0) ## 808F93D4 -/* 03FA0 808DA810 00042403 */ sra $a0, $a0, 16 +/* 03FA0 808DA810 00042403 */ sra $a0, $a0, 16 /* 03FA4 808DA814 C5A6002C */ lwc1 $f6, 0x002C($t5) ## 0000002C -/* 03FA8 808DA818 46083281 */ sub.s $f10, $f6, $f8 +/* 03FA8 808DA818 46083281 */ sub.s $f10, $f6, $f8 /* 03FAC 808DA81C 0C01DE1C */ jal Math_Sins ## sins? /* 03FB0 808DA820 E60A0694 */ swc1 $f10, 0x0694($s0) ## 00000694 /* 03FB4 808DA824 3C01808F */ lui $at, %hi(D_808F7FA0) ## $at = 808F0000 -/* 03FB8 808DA828 C4307FA0 */ lwc1 $f16, %lo(D_808F7FA0)($at) +/* 03FB8 808DA828 C4307FA0 */ lwc1 $f16, %lo(D_808F7FA0)($at) /* 03FBC 808DA82C 24042098 */ addiu $a0, $zero, 0x2098 ## $a0 = 00002098 -/* 03FC0 808DA830 46100482 */ mul.s $f18, $f0, $f16 -/* 03FC4 808DA834 0C01E221 */ jal func_80078884 +/* 03FC0 808DA830 46100482 */ mul.s $f18, $f0, $f16 +/* 03FC4 808DA834 0C01E221 */ jal func_80078884 /* 03FC8 808DA838 E612070C */ swc1 $f18, 0x070C($s0) ## 0000070C /* 03FCC 808DA83C 8E030674 */ lw $v1, 0x0674($s0) ## 00000674 /* 03FD0 808DA840 3C088090 */ lui $t0, %hi(D_808F93D4) ## $t0 = 80900000 /* 03FD4 808DA844 24010046 */ addiu $at, $zero, 0x0046 ## $at = 00000046 -/* 03FD8 808DA848 14610005 */ bne $v1, $at, .L808DA860 +/* 03FD8 808DA848 14610005 */ bne $v1, $at, .L808DA860 /* 03FDC 808DA84C 250893D4 */ addiu $t0, $t0, %lo(D_808F93D4) ## $t0 = 808F93D4 /* 03FE0 808DA850 8D0F0000 */ lw $t7, 0x0000($t0) ## 808F93D4 /* 03FE4 808DA854 240E0006 */ addiu $t6, $zero, 0x0006 ## $t6 = 00000006 @@ -1466,52 +1466,52 @@ glabel L808DA77C /* 03FEC 808DA85C 8E030674 */ lw $v1, 0x0674($s0) ## 00000674 .L808DA860: /* 03FF0 808DA860 2401005A */ addiu $at, $zero, 0x005A ## $at = 0000005A -/* 03FF4 808DA864 14610005 */ bne $v1, $at, .L808DA87C -/* 03FF8 808DA868 8FA400B4 */ lw $a0, 0x00B4($sp) +/* 03FF4 808DA864 14610005 */ bne $v1, $at, .L808DA87C +/* 03FF8 808DA868 8FA400B4 */ lw $a0, 0x00B4($sp) /* 03FFC 808DA86C 240570D1 */ addiu $a1, $zero, 0x70D1 ## $a1 = 000070D1 -/* 04000 808DA870 0C042DA0 */ jal func_8010B680 +/* 04000 808DA870 0C042DA0 */ jal func_8010B680 /* 04004 808DA874 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 /* 04008 808DA878 8E030674 */ lw $v1, 0x0674($s0) ## 00000674 .L808DA87C: -/* 0400C 808DA87C 2C610097 */ sltiu $at, $v1, 0x0097 -/* 04010 808DA880 1420000F */ bne $at, $zero, .L808DA8C0 -/* 04014 808DA884 8FA400B4 */ lw $a0, 0x00B4($sp) -/* 04018 808DA888 0C042F6F */ jal func_8010BDBC +/* 0400C 808DA87C 2C610097 */ sltiu $at, $v1, 0x0097 +/* 04010 808DA880 1420000F */ bne $at, $zero, .L808DA8C0 +/* 04014 808DA884 8FA400B4 */ lw $a0, 0x00B4($sp) +/* 04018 808DA888 0C042F6F */ jal func_8010BDBC /* 0401C 808DA88C 248420D8 */ addiu $a0, $a0, 0x20D8 ## $a0 = 000020D8 -/* 04020 808DA890 1440000B */ bne $v0, $zero, .L808DA8C0 +/* 04020 808DA890 1440000B */ bne $v0, $zero, .L808DA8C0 /* 04024 808DA894 2418006B */ addiu $t8, $zero, 0x006B ## $t8 = 0000006B /* 04028 808DA898 A6180678 */ sh $t8, 0x0678($s0) ## 00000678 /* 0402C 808DA89C AE000674 */ sw $zero, 0x0674($s0) ## 00000674 -/* 04030 808DA8A0 8FA400B4 */ lw $a0, 0x00B4($sp) +/* 04030 808DA8A0 8FA400B4 */ lw $a0, 0x00B4($sp) /* 04034 808DA8A4 240570D2 */ addiu $a1, $zero, 0x70D2 ## $a1 = 000070D2 -/* 04038 808DA8A8 0C042DA0 */ jal func_8010B680 +/* 04038 808DA8A8 0C042DA0 */ jal func_8010B680 /* 0403C 808DA8AC 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 04040 808DA8B0 8FA400B4 */ lw $a0, 0x00B4($sp) +/* 04040 808DA8B0 8FA400B4 */ lw $a0, 0x00B4($sp) /* 04044 808DA8B4 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 04048 808DA8B8 0C00B7D5 */ jal func_8002DF54 +/* 04048 808DA8B8 0C00B7D5 */ jal func_8002DF54 /* 0404C 808DA8BC 24060039 */ addiu $a2, $zero, 0x0039 ## $a2 = 00000039 .L808DA8C0: -/* 04050 808DA8C0 100000AA */ beq $zero, $zero, .L808DAB6C +/* 04050 808DA8C0 100000AA */ beq $zero, $zero, .L808DAB6C /* 04054 808DA8C4 86040678 */ lh $a0, 0x0678($s0) ## 00000678 glabel L808DA8C8 /* 04058 808DA8C8 8E040674 */ lw $a0, 0x0674($s0) ## 00000674 -/* 0405C 808DA8CC 00800821 */ addu $at, $a0, $zero -/* 04060 808DA8D0 00042080 */ sll $a0, $a0, 2 -/* 04064 808DA8D4 00812023 */ subu $a0, $a0, $at -/* 04068 808DA8D8 000420C0 */ sll $a0, $a0, 3 -/* 0406C 808DA8DC 00812021 */ addu $a0, $a0, $at -/* 04070 808DA8E0 00042080 */ sll $a0, $a0, 2 -/* 04074 808DA8E4 00812023 */ subu $a0, $a0, $at -/* 04078 808DA8E8 00042200 */ sll $a0, $a0, 8 -/* 0407C 808DA8EC 00042400 */ sll $a0, $a0, 16 +/* 0405C 808DA8CC 00800821 */ addu $at, $a0, $zero +/* 04060 808DA8D0 00042080 */ sll $a0, $a0, 2 +/* 04064 808DA8D4 00812023 */ subu $a0, $a0, $at +/* 04068 808DA8D8 000420C0 */ sll $a0, $a0, 3 +/* 0406C 808DA8DC 00812021 */ addu $a0, $a0, $at +/* 04070 808DA8E0 00042080 */ sll $a0, $a0, 2 +/* 04074 808DA8E4 00812023 */ subu $a0, $a0, $at +/* 04078 808DA8E8 00042200 */ sll $a0, $a0, 8 +/* 0407C 808DA8EC 00042400 */ sll $a0, $a0, 16 /* 04080 808DA8F0 0C01DE1C */ jal Math_Sins ## sins? -/* 04084 808DA8F4 00042403 */ sra $a0, $a0, 16 +/* 04084 808DA8F4 00042403 */ sra $a0, $a0, 16 /* 04088 808DA8F8 3C01808F */ lui $at, %hi(D_808F7FA4) ## $at = 808F0000 -/* 0408C 808DA8FC C4247FA4 */ lwc1 $f4, %lo(D_808F7FA4)($at) +/* 0408C 808DA8FC C4247FA4 */ lwc1 $f4, %lo(D_808F7FA4)($at) /* 04090 808DA900 24042098 */ addiu $a0, $zero, 0x2098 ## $a0 = 00002098 -/* 04094 808DA904 46040182 */ mul.s $f6, $f0, $f4 -/* 04098 808DA908 0C01E221 */ jal func_80078884 +/* 04094 808DA904 46040182 */ mul.s $f6, $f0, $f4 +/* 04098 808DA908 0C01E221 */ jal func_80078884 /* 0409C 808DA90C E606070C */ swc1 $f6, 0x070C($s0) ## 0000070C /* 040A0 808DA910 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 /* 040A4 808DA914 44810000 */ mtc1 $at, $f0 ## $f0 = 5.00 @@ -1520,7 +1520,7 @@ glabel L808DA8C8 /* 040B0 808DA920 3C01808F */ lui $at, %hi(D_808F7FA8) ## $at = 808F0000 /* 040B4 808DA924 3C088090 */ lui $t0, %hi(D_808F93D4) ## $t0 = 80900000 /* 040B8 808DA928 E6080680 */ swc1 $f8, 0x0680($s0) ## 00000680 -/* 040BC 808DA92C C42A7FA8 */ lwc1 $f10, %lo(D_808F7FA8)($at) +/* 040BC 808DA92C C42A7FA8 */ lwc1 $f10, %lo(D_808F7FA8)($at) /* 040C0 808DA930 3C01C372 */ lui $at, 0xC372 ## $at = C3720000 /* 040C4 808DA934 44818000 */ mtc1 $at, $f16 ## $f16 = -242.00 /* 040C8 808DA938 250893D4 */ addiu $t0, $t0, %lo(D_808F93D4) ## $t0 = 808F93D4 @@ -1532,34 +1532,34 @@ glabel L808DA8C8 /* 040E0 808DA950 C7320024 */ lwc1 $f18, 0x0024($t9) ## 00000024 /* 040E4 808DA954 3C014220 */ lui $at, 0x4220 ## $at = 42200000 /* 040E8 808DA958 44818000 */ mtc1 $at, $f16 ## $f16 = 40.00 -/* 040EC 808DA95C 46009101 */ sub.s $f4, $f18, $f0 +/* 040EC 808DA95C 46009101 */ sub.s $f4, $f18, $f0 /* 040F0 808DA960 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 /* 040F4 808DA964 8E0B0674 */ lw $t3, 0x0674($s0) ## 00000674 -/* 040F8 808DA968 46062201 */ sub.s $f8, $f4, $f6 +/* 040F8 808DA968 46062201 */ sub.s $f8, $f4, $f6 /* 040FC 808DA96C 44813000 */ mtc1 $at, $f6 ## $f6 = 20.00 /* 04100 808DA970 3C0141C8 */ lui $at, 0x41C8 ## $at = 41C80000 /* 04104 808DA974 E608068C */ swc1 $f8, 0x068C($s0) ## 0000068C /* 04108 808DA978 8D090000 */ lw $t1, 0x0000($t0) ## 808F93D4 /* 0410C 808DA97C C52A0028 */ lwc1 $f10, 0x0028($t1) ## 00000028 -/* 04110 808DA980 46105480 */ add.s $f18, $f10, $f16 +/* 04110 808DA980 46105480 */ add.s $f18, $f10, $f16 /* 04114 808DA984 44818000 */ mtc1 $at, $f16 ## $f16 = 25.00 /* 04118 808DA988 3C0142A0 */ lui $at, 0x42A0 ## $at = 42A00000 -/* 0411C 808DA98C 46009100 */ add.s $f4, $f18, $f0 -/* 04120 808DA990 46062201 */ sub.s $f8, $f4, $f6 +/* 0411C 808DA98C 46009100 */ add.s $f4, $f18, $f0 +/* 04120 808DA990 46062201 */ sub.s $f8, $f4, $f6 /* 04124 808DA994 44812000 */ mtc1 $at, $f4 ## $f4 = 80.00 -/* 04128 808DA998 2D610033 */ sltiu $at, $t3, 0x0033 +/* 04128 808DA998 2D610033 */ sltiu $at, $t3, 0x0033 /* 0412C 808DA99C E6080690 */ swc1 $f8, 0x0690($s0) ## 00000690 /* 04130 808DA9A0 8D0A0000 */ lw $t2, 0x0000($t0) ## 808F93D4 /* 04134 808DA9A4 C54A002C */ lwc1 $f10, 0x002C($t2) ## 0000002C -/* 04138 808DA9A8 46105481 */ sub.s $f18, $f10, $f16 -/* 0413C 808DA9AC 46049180 */ add.s $f6, $f18, $f4 -/* 04140 808DA9B0 1420000D */ bne $at, $zero, .L808DA9E8 +/* 04138 808DA9A8 46105481 */ sub.s $f18, $f10, $f16 +/* 0413C 808DA9AC 46049180 */ add.s $f6, $f18, $f4 +/* 04140 808DA9B0 1420000D */ bne $at, $zero, .L808DA9E8 /* 04144 808DA9B4 E6060694 */ swc1 $f6, 0x0694($s0) ## 00000694 -/* 04148 808DA9B8 8FA400B4 */ lw $a0, 0x00B4($sp) -/* 0414C 808DA9BC 0C042F6F */ jal func_8010BDBC +/* 04148 808DA9B8 8FA400B4 */ lw $a0, 0x00B4($sp) +/* 0414C 808DA9BC 0C042F6F */ jal func_8010BDBC /* 04150 808DA9C0 248420D8 */ addiu $a0, $a0, 0x20D8 ## $a0 = 000020D8 /* 04154 808DA9C4 3C088090 */ lui $t0, %hi(D_808F93D4) ## $t0 = 80900000 -/* 04158 808DA9C8 14400007 */ bne $v0, $zero, .L808DA9E8 +/* 04158 808DA9C8 14400007 */ bne $v0, $zero, .L808DA9E8 /* 0415C 808DA9CC 250893D4 */ addiu $t0, $t0, %lo(D_808F93D4) ## $t0 = 808F93D4 /* 04160 808DA9D0 8D0D0000 */ lw $t5, 0x0000($t0) ## 808F93D4 /* 04164 808DA9D4 240C0007 */ addiu $t4, $zero, 0x0007 ## $t4 = 00000007 @@ -1568,27 +1568,27 @@ glabel L808DA8C8 /* 04170 808DA9E0 A60E0678 */ sh $t6, 0x0678($s0) ## 00000678 /* 04174 808DA9E4 AE000674 */ sw $zero, 0x0674($s0) ## 00000674 .L808DA9E8: -/* 04178 808DA9E8 10000060 */ beq $zero, $zero, .L808DAB6C +/* 04178 808DA9E8 10000060 */ beq $zero, $zero, .L808DAB6C /* 0417C 808DA9EC 86040678 */ lh $a0, 0x0678($s0) ## 00000678 glabel L808DA9F0 /* 04180 808DA9F0 8E040674 */ lw $a0, 0x0674($s0) ## 00000674 -/* 04184 808DA9F4 00800821 */ addu $at, $a0, $zero -/* 04188 808DA9F8 00042080 */ sll $a0, $a0, 2 -/* 0418C 808DA9FC 00812023 */ subu $a0, $a0, $at -/* 04190 808DAA00 000420C0 */ sll $a0, $a0, 3 -/* 04194 808DAA04 00812021 */ addu $a0, $a0, $at -/* 04198 808DAA08 00042080 */ sll $a0, $a0, 2 -/* 0419C 808DAA0C 00812023 */ subu $a0, $a0, $at -/* 041A0 808DAA10 00042200 */ sll $a0, $a0, 8 -/* 041A4 808DAA14 00042400 */ sll $a0, $a0, 16 +/* 04184 808DA9F4 00800821 */ addu $at, $a0, $zero +/* 04188 808DA9F8 00042080 */ sll $a0, $a0, 2 +/* 0418C 808DA9FC 00812023 */ subu $a0, $a0, $at +/* 04190 808DAA00 000420C0 */ sll $a0, $a0, 3 +/* 04194 808DAA04 00812021 */ addu $a0, $a0, $at +/* 04198 808DAA08 00042080 */ sll $a0, $a0, 2 +/* 0419C 808DAA0C 00812023 */ subu $a0, $a0, $at +/* 041A0 808DAA10 00042200 */ sll $a0, $a0, 8 +/* 041A4 808DAA14 00042400 */ sll $a0, $a0, 16 /* 041A8 808DAA18 0C01DE1C */ jal Math_Sins ## sins? -/* 041AC 808DAA1C 00042403 */ sra $a0, $a0, 16 +/* 041AC 808DAA1C 00042403 */ sra $a0, $a0, 16 /* 041B0 808DAA20 3C01808F */ lui $at, %hi(D_808F7FAC) ## $at = 808F0000 -/* 041B4 808DAA24 C4287FAC */ lwc1 $f8, %lo(D_808F7FAC)($at) +/* 041B4 808DAA24 C4287FAC */ lwc1 $f8, %lo(D_808F7FAC)($at) /* 041B8 808DAA28 24042098 */ addiu $a0, $zero, 0x2098 ## $a0 = 00002098 -/* 041BC 808DAA2C 46080282 */ mul.s $f10, $f0, $f8 -/* 041C0 808DAA30 0C01E221 */ jal func_80078884 +/* 041BC 808DAA2C 46080282 */ mul.s $f10, $f0, $f8 +/* 041C0 808DAA30 0C01E221 */ jal func_80078884 /* 041C4 808DAA34 E60A070C */ swc1 $f10, 0x070C($s0) ## 0000070C /* 041C8 808DAA38 3C088090 */ lui $t0, %hi(D_808F93D4) ## $t0 = 80900000 /* 041CC 808DAA3C 250893D4 */ addiu $t0, $t0, %lo(D_808F93D4) ## $t0 = 808F93D4 @@ -1598,11 +1598,11 @@ glabel L808DA9F0 /* 041DC 808DAA4C C5F00024 */ lwc1 $f16, 0x0024($t7) ## 00000024 /* 041E0 808DAA50 3C0141F0 */ lui $at, 0x41F0 ## $at = 41F00000 /* 041E4 808DAA54 44812000 */ mtc1 $at, $f4 ## $f4 = 30.00 -/* 041E8 808DAA58 46008481 */ sub.s $f18, $f16, $f0 +/* 041E8 808DAA58 46008481 */ sub.s $f18, $f16, $f0 /* 041EC 808DAA5C 3C014220 */ lui $at, 0x4220 ## $at = 42200000 /* 041F0 808DAA60 44815000 */ mtc1 $at, $f10 ## $f10 = 40.00 /* 041F4 808DAA64 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 -/* 041F8 808DAA68 46049181 */ sub.s $f6, $f18, $f4 +/* 041F8 808DAA68 46049181 */ sub.s $f6, $f18, $f4 /* 041FC 808DAA6C 44812000 */ mtc1 $at, $f4 ## $f4 = 20.00 /* 04200 808DAA70 3C0141C8 */ lui $at, 0x41C8 ## $at = 41C80000 /* 04204 808DAA74 8E090674 */ lw $t1, 0x0674($s0) ## 00000674 @@ -1610,22 +1610,22 @@ glabel L808DA9F0 /* 0420C 808DAA7C 8D180000 */ lw $t8, 0x0000($t0) ## 808F93D4 /* 04210 808DAA80 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 04214 808DAA84 C7080028 */ lwc1 $f8, 0x0028($t8) ## 00000028 -/* 04218 808DAA88 460A4400 */ add.s $f16, $f8, $f10 +/* 04218 808DAA88 460A4400 */ add.s $f16, $f8, $f10 /* 0421C 808DAA8C 44815000 */ mtc1 $at, $f10 ## $f10 = 25.00 /* 04220 808DAA90 3C0142A0 */ lui $at, 0x42A0 ## $at = 42A00000 -/* 04224 808DAA94 46008480 */ add.s $f18, $f16, $f0 -/* 04228 808DAA98 46049181 */ sub.s $f6, $f18, $f4 +/* 04224 808DAA94 46008480 */ add.s $f18, $f16, $f0 +/* 04228 808DAA98 46049181 */ sub.s $f6, $f18, $f4 /* 0422C 808DAA9C 44819000 */ mtc1 $at, $f18 ## $f18 = 80.00 -/* 04230 808DAAA0 2D210033 */ sltiu $at, $t1, 0x0033 +/* 04230 808DAAA0 2D210033 */ sltiu $at, $t1, 0x0033 /* 04234 808DAAA4 E6060690 */ swc1 $f6, 0x0690($s0) ## 00000690 /* 04238 808DAAA8 8D190000 */ lw $t9, 0x0000($t0) ## 808F93D4 /* 0423C 808DAAAC C728002C */ lwc1 $f8, 0x002C($t9) ## 0000002C -/* 04240 808DAAB0 460A4401 */ sub.s $f16, $f8, $f10 -/* 04244 808DAAB4 46128100 */ add.s $f4, $f16, $f18 -/* 04248 808DAAB8 14200027 */ bne $at, $zero, .L808DAB58 +/* 04240 808DAAB0 460A4401 */ sub.s $f16, $f8, $f10 +/* 04244 808DAAB4 46128100 */ add.s $f4, $f16, $f18 +/* 04248 808DAAB8 14200027 */ bne $at, $zero, .L808DAB58 /* 0424C 808DAABC E6040694 */ swc1 $f4, 0x0694($s0) ## 00000694 -/* 04250 808DAAC0 0C030129 */ jal func_800C04A4 -/* 04254 808DAAC4 8FA400B4 */ lw $a0, 0x00B4($sp) +/* 04250 808DAAC0 0C030129 */ jal func_800C04A4 +/* 04254 808DAAC4 8FA400B4 */ lw $a0, 0x00B4($sp) /* 04258 808DAAC8 26030680 */ addiu $v1, $s0, 0x0680 ## $v1 = 00000680 /* 0425C 808DAACC 8C6B0000 */ lw $t3, 0x0000($v1) ## 00000680 /* 04260 808DAAD0 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 @@ -1647,114 +1647,114 @@ glabel L808DA9F0 /* 042A0 808DAB10 8E0F0694 */ lw $t7, 0x0694($s0) ## 00000694 /* 042A4 808DAB14 AC4F0058 */ sw $t7, 0x0058($v0) ## 00000058 /* 042A8 808DAB18 8605067A */ lh $a1, 0x067A($s0) ## 0000067A -/* 042AC 808DAB1C 0C03022B */ jal func_800C08AC -/* 042B0 808DAB20 8FA400B4 */ lw $a0, 0x00B4($sp) -/* 042B4 808DAB24 8FA400B4 */ lw $a0, 0x00B4($sp) +/* 042AC 808DAB1C 0C03022B */ jal func_800C08AC +/* 042B0 808DAB20 8FA400B4 */ lw $a0, 0x00B4($sp) +/* 042B4 808DAB24 8FA400B4 */ lw $a0, 0x00B4($sp) /* 042B8 808DAB28 2418006D */ addiu $t8, $zero, 0x006D ## $t8 = 0000006D /* 042BC 808DAB2C A6180678 */ sh $t8, 0x0678($s0) ## 00000678 /* 042C0 808DAB30 A600067A */ sh $zero, 0x067A($s0) ## 0000067A -/* 042C4 808DAB34 0C01914D */ jal func_80064534 +/* 042C4 808DAB34 0C01914D */ jal func_80064534 /* 042C8 808DAB38 24851D64 */ addiu $a1, $a0, 0x1D64 ## $a1 = 00001D64 -/* 042CC 808DAB3C 8FA400B4 */ lw $a0, 0x00B4($sp) +/* 042CC 808DAB3C 8FA400B4 */ lw $a0, 0x00B4($sp) /* 042D0 808DAB40 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 042D4 808DAB44 0C00B7D5 */ jal func_8002DF54 +/* 042D4 808DAB44 0C00B7D5 */ jal func_8002DF54 /* 042D8 808DAB48 24060007 */ addiu $a2, $zero, 0x0007 ## $a2 = 00000007 -/* 042DC 808DAB4C 8FA400B4 */ lw $a0, 0x00B4($sp) +/* 042DC 808DAB4C 8FA400B4 */ lw $a0, 0x00B4($sp) /* 042E0 808DAB50 0C00B2DD */ jal Flags_SetSwitch - + /* 042E4 808DAB54 24050037 */ addiu $a1, $zero, 0x0037 ## $a1 = 00000037 .L808DAB58: -/* 042E8 808DAB58 10000004 */ beq $zero, $zero, .L808DAB6C +/* 042E8 808DAB58 10000004 */ beq $zero, $zero, .L808DAB6C /* 042EC 808DAB5C 86040678 */ lh $a0, 0x0678($s0) ## 00000678 glabel L808DAB60 -/* 042F0 808DAB60 0C01E221 */ jal func_80078884 +/* 042F0 808DAB60 0C01E221 */ jal func_80078884 /* 042F4 808DAB64 24042098 */ addiu $a0, $zero, 0x2098 ## $a0 = 00002098 /* 042F8 808DAB68 86040678 */ lh $a0, 0x0678($s0) ## 00000678 .L808DAB6C: -/* 042FC 808DAB6C 28810064 */ slti $at, $a0, 0x0064 +/* 042FC 808DAB6C 28810064 */ slti $at, $a0, 0x0064 .L808DAB70: -/* 04300 808DAB70 14200002 */ bne $at, $zero, .L808DAB7C +/* 04300 808DAB70 14200002 */ bne $at, $zero, .L808DAB7C /* 04304 808DAB74 24190014 */ addiu $t9, $zero, 0x0014 ## $t9 = 00000014 /* 04308 808DAB78 A21901A0 */ sb $t9, 0x01A0($s0) ## 000001A0 .L808DAB7C: /* 0430C 808DAB7C 8609067A */ lh $t1, 0x067A($s0) ## 0000067A /* 04310 808DAB80 260A0680 */ addiu $t2, $s0, 0x0680 ## $t2 = 00000680 -/* 04314 808DAB84 51200054 */ beql $t1, $zero, .L808DACD8 -/* 04318 808DAB88 8FBF003C */ lw $ra, 0x003C($sp) -/* 0431C 808DAB8C 93AC00AD */ lbu $t4, 0x00AD($sp) +/* 04314 808DAB84 51200054 */ beql $t1, $zero, .L808DACD8 +/* 04318 808DAB88 8FBF003C */ lw $ra, 0x003C($sp) +/* 0431C 808DAB8C 93AC00AD */ lbu $t4, 0x00AD($sp) /* 04320 808DAB90 260B068C */ addiu $t3, $s0, 0x068C ## $t3 = 0000068C -/* 04324 808DAB94 AFAB0044 */ sw $t3, 0x0044($sp) -/* 04328 808DAB98 1180003E */ beq $t4, $zero, .L808DAC94 -/* 0432C 808DAB9C AFAA0058 */ sw $t2, 0x0058($sp) +/* 04324 808DAB94 AFAB0044 */ sw $t3, 0x0044($sp) +/* 04328 808DAB98 1180003E */ beq $t4, $zero, .L808DAC94 +/* 0432C 808DAB9C AFAA0058 */ sw $t2, 0x0058($sp) /* 04330 808DABA0 C60606A4 */ lwc1 $f6, 0x06A4($s0) ## 000006A4 /* 04334 808DABA4 C60806EC */ lwc1 $f8, 0x06EC($s0) ## 000006EC /* 04338 808DABA8 8E0506BC */ lw $a1, 0x06BC($s0) ## 000006BC /* 0433C 808DABAC 8E0606F0 */ lw $a2, 0x06F0($s0) ## 000006F0 -/* 04340 808DABB0 46083282 */ mul.s $f10, $f6, $f8 +/* 04340 808DABB0 46083282 */ mul.s $f10, $f6, $f8 /* 04344 808DABB4 260D0688 */ addiu $t5, $s0, 0x0688 ## $t5 = 00000688 /* 04348 808DABB8 260E0690 */ addiu $t6, $s0, 0x0690 ## $t6 = 00000690 /* 0434C 808DABBC 260F0694 */ addiu $t7, $s0, 0x0694 ## $t7 = 00000694 /* 04350 808DABC0 26180684 */ addiu $t8, $s0, 0x0684 ## $t8 = 00000684 -/* 04354 808DABC4 AFB80048 */ sw $t8, 0x0048($sp) -/* 04358 808DABC8 AFAF004C */ sw $t7, 0x004C($sp) -/* 0435C 808DABCC 44075000 */ mfc1 $a3, $f10 -/* 04360 808DABD0 AFAE0050 */ sw $t6, 0x0050($sp) -/* 04364 808DABD4 AFAD0054 */ sw $t5, 0x0054($sp) +/* 04354 808DABC4 AFB80048 */ sw $t8, 0x0048($sp) +/* 04358 808DABC8 AFAF004C */ sw $t7, 0x004C($sp) +/* 0435C 808DABCC 44075000 */ mfc1 $a3, $f10 +/* 04360 808DABD0 AFAE0050 */ sw $t6, 0x0050($sp) +/* 04364 808DABD4 AFAD0054 */ sw $t5, 0x0054($sp) /* 04368 808DABD8 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 0436C 808DABDC 01402025 */ or $a0, $t2, $zero ## $a0 = 00000680 /* 04370 808DABE0 C61006A8 */ lwc1 $f16, 0x06A8($s0) ## 000006A8 /* 04374 808DABE4 C61206EC */ lwc1 $f18, 0x06EC($s0) ## 000006EC -/* 04378 808DABE8 8FA40048 */ lw $a0, 0x0048($sp) +/* 04378 808DABE8 8FA40048 */ lw $a0, 0x0048($sp) /* 0437C 808DABEC 8E0506C0 */ lw $a1, 0x06C0($s0) ## 000006C0 -/* 04380 808DABF0 46128102 */ mul.s $f4, $f16, $f18 +/* 04380 808DABF0 46128102 */ mul.s $f4, $f16, $f18 /* 04384 808DABF4 8E0606F0 */ lw $a2, 0x06F0($s0) ## 000006F0 -/* 04388 808DABF8 44072000 */ mfc1 $a3, $f4 +/* 04388 808DABF8 44072000 */ mfc1 $a3, $f4 /* 0438C 808DABFC 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 04390 808DAC00 00000000 */ nop /* 04394 808DAC04 C60606AC */ lwc1 $f6, 0x06AC($s0) ## 000006AC /* 04398 808DAC08 C60806EC */ lwc1 $f8, 0x06EC($s0) ## 000006EC -/* 0439C 808DAC0C 8FA40054 */ lw $a0, 0x0054($sp) +/* 0439C 808DAC0C 8FA40054 */ lw $a0, 0x0054($sp) /* 043A0 808DAC10 8E0506C4 */ lw $a1, 0x06C4($s0) ## 000006C4 -/* 043A4 808DAC14 46083282 */ mul.s $f10, $f6, $f8 +/* 043A4 808DAC14 46083282 */ mul.s $f10, $f6, $f8 /* 043A8 808DAC18 8E0606F0 */ lw $a2, 0x06F0($s0) ## 000006F0 -/* 043AC 808DAC1C 44075000 */ mfc1 $a3, $f10 +/* 043AC 808DAC1C 44075000 */ mfc1 $a3, $f10 /* 043B0 808DAC20 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 043B4 808DAC24 00000000 */ nop /* 043B8 808DAC28 C61006B0 */ lwc1 $f16, 0x06B0($s0) ## 000006B0 /* 043BC 808DAC2C C61206EC */ lwc1 $f18, 0x06EC($s0) ## 000006EC -/* 043C0 808DAC30 8FA40044 */ lw $a0, 0x0044($sp) +/* 043C0 808DAC30 8FA40044 */ lw $a0, 0x0044($sp) /* 043C4 808DAC34 8E0506D4 */ lw $a1, 0x06D4($s0) ## 000006D4 -/* 043C8 808DAC38 46128102 */ mul.s $f4, $f16, $f18 +/* 043C8 808DAC38 46128102 */ mul.s $f4, $f16, $f18 /* 043CC 808DAC3C 8E0606F0 */ lw $a2, 0x06F0($s0) ## 000006F0 -/* 043D0 808DAC40 44072000 */ mfc1 $a3, $f4 +/* 043D0 808DAC40 44072000 */ mfc1 $a3, $f4 /* 043D4 808DAC44 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 043D8 808DAC48 00000000 */ nop /* 043DC 808DAC4C C60606B4 */ lwc1 $f6, 0x06B4($s0) ## 000006B4 /* 043E0 808DAC50 C60806EC */ lwc1 $f8, 0x06EC($s0) ## 000006EC -/* 043E4 808DAC54 8FA40050 */ lw $a0, 0x0050($sp) +/* 043E4 808DAC54 8FA40050 */ lw $a0, 0x0050($sp) /* 043E8 808DAC58 8E0506D8 */ lw $a1, 0x06D8($s0) ## 000006D8 -/* 043EC 808DAC5C 46083282 */ mul.s $f10, $f6, $f8 +/* 043EC 808DAC5C 46083282 */ mul.s $f10, $f6, $f8 /* 043F0 808DAC60 8E0606F0 */ lw $a2, 0x06F0($s0) ## 000006F0 -/* 043F4 808DAC64 44075000 */ mfc1 $a3, $f10 +/* 043F4 808DAC64 44075000 */ mfc1 $a3, $f10 /* 043F8 808DAC68 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 043FC 808DAC6C 00000000 */ nop /* 04400 808DAC70 C61006B8 */ lwc1 $f16, 0x06B8($s0) ## 000006B8 /* 04404 808DAC74 C61206EC */ lwc1 $f18, 0x06EC($s0) ## 000006EC -/* 04408 808DAC78 8FA4004C */ lw $a0, 0x004C($sp) +/* 04408 808DAC78 8FA4004C */ lw $a0, 0x004C($sp) /* 0440C 808DAC7C 8E0506DC */ lw $a1, 0x06DC($s0) ## 000006DC -/* 04410 808DAC80 46128102 */ mul.s $f4, $f16, $f18 +/* 04410 808DAC80 46128102 */ mul.s $f4, $f16, $f18 /* 04414 808DAC84 8E0606F0 */ lw $a2, 0x06F0($s0) ## 000006F0 -/* 04418 808DAC88 44072000 */ mfc1 $a3, $f4 +/* 04418 808DAC88 44072000 */ mfc1 $a3, $f4 /* 0441C 808DAC8C 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 04420 808DAC90 00000000 */ nop .L808DAC94: -/* 04424 808DAC94 8FB90044 */ lw $t9, 0x0044($sp) +/* 04424 808DAC94 8FB90044 */ lw $t9, 0x0044($sp) /* 04428 808DAC98 27A60064 */ addiu $a2, $sp, 0x0064 ## $a2 = FFFFFFB4 /* 0442C 808DAC9C 8F2A0000 */ lw $t2, 0x0000($t9) ## 00000000 /* 04430 808DACA0 ACCA0000 */ sw $t2, 0x0000($a2) ## FFFFFFB4 @@ -1762,19 +1762,19 @@ glabel L808DAB60 /* 04438 808DACA8 ACC90004 */ sw $t1, 0x0004($a2) ## FFFFFFB8 /* 0443C 808DACAC 8F2A0008 */ lw $t2, 0x0008($t9) ## 00000008 /* 04440 808DACB0 ACCA0008 */ sw $t2, 0x0008($a2) ## FFFFFFBC -/* 04444 808DACB4 C7A60068 */ lwc1 $f6, 0x0068($sp) +/* 04444 808DACB4 C7A60068 */ lwc1 $f6, 0x0068($sp) /* 04448 808DACB8 C608070C */ lwc1 $f8, 0x070C($s0) ## 0000070C -/* 0444C 808DACBC 8FA70058 */ lw $a3, 0x0058($sp) -/* 04450 808DACC0 8FA400B4 */ lw $a0, 0x00B4($sp) -/* 04454 808DACC4 46083280 */ add.s $f10, $f6, $f8 -/* 04458 808DACC8 E7AA0068 */ swc1 $f10, 0x0068($sp) -/* 0445C 808DACCC 0C030136 */ jal func_800C04D8 +/* 0444C 808DACBC 8FA70058 */ lw $a3, 0x0058($sp) +/* 04450 808DACC0 8FA400B4 */ lw $a0, 0x00B4($sp) +/* 04454 808DACC4 46083280 */ add.s $f10, $f6, $f8 +/* 04458 808DACC8 E7AA0068 */ swc1 $f10, 0x0068($sp) +/* 0445C 808DACCC 0C030136 */ jal func_800C04D8 /* 04460 808DACD0 8605067A */ lh $a1, 0x067A($s0) ## 0000067A -/* 04464 808DACD4 8FBF003C */ lw $ra, 0x003C($sp) +/* 04464 808DACD4 8FBF003C */ lw $ra, 0x003C($sp) .L808DACD8: -/* 04468 808DACD8 8FB00038 */ lw $s0, 0x0038($sp) +/* 04468 808DACD8 8FB00038 */ lw $s0, 0x0038($sp) /* 0446C 808DACDC 27BD00B0 */ addiu $sp, $sp, 0x00B0 ## $sp = 00000000 -/* 04470 808DACE0 03E00008 */ jr $ra +/* 04470 808DACE0 03E00008 */ jr $ra /* 04474 808DACE4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DAD20.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DAD20.s index 207a20f749..3183ffd158 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DAD20.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DAD20.s @@ -1,152 +1,152 @@ glabel func_808DAD20 /* 044B0 808DAD20 27BDFF78 */ addiu $sp, $sp, 0xFF78 ## $sp = FFFFFF78 -/* 044B4 808DAD24 AFB10030 */ sw $s1, 0x0030($sp) -/* 044B8 808DAD28 AFB0002C */ sw $s0, 0x002C($sp) +/* 044B4 808DAD24 AFB10030 */ sw $s1, 0x0030($sp) +/* 044B8 808DAD28 AFB0002C */ sw $s0, 0x002C($sp) /* 044BC 808DAD2C 00808825 */ or $s1, $a0, $zero ## $s1 = 00000000 -/* 044C0 808DAD30 AFBF0034 */ sw $ra, 0x0034($sp) +/* 044C0 808DAD30 AFBF0034 */ sw $ra, 0x0034($sp) /* 044C4 808DAD34 24900150 */ addiu $s0, $a0, 0x0150 ## $s0 = 00000150 -/* 044C8 808DAD38 F7B40020 */ sdc1 $f20, 0x0020($sp) -/* 044CC 808DAD3C AFA5008C */ sw $a1, 0x008C($sp) +/* 044C8 808DAD38 F7B40020 */ sdc1 $f20, 0x0020($sp) +/* 044CC 808DAD3C AFA5008C */ sw $a1, 0x008C($sp) /* 044D0 808DAD40 0C02927F */ jal SkelAnime_FrameUpdateMatrix - + /* 044D4 808DAD44 02002025 */ or $a0, $s0, $zero ## $a0 = 00000150 /* 044D8 808DAD48 962E01C2 */ lhu $t6, 0x01C2($s1) ## 000001C2 -/* 044DC 808DAD4C 2DC10005 */ sltiu $at, $t6, 0x0005 -/* 044E0 808DAD50 1020011A */ beq $at, $zero, .L808DB1BC -/* 044E4 808DAD54 000E7080 */ sll $t6, $t6, 2 +/* 044DC 808DAD4C 2DC10005 */ sltiu $at, $t6, 0x0005 +/* 044E0 808DAD50 1020011A */ beq $at, $zero, .L808DB1BC +/* 044E4 808DAD54 000E7080 */ sll $t6, $t6, 2 /* 044E8 808DAD58 3C01808F */ lui $at, %hi(jtbl_808F7FB0) ## $at = 808F0000 -/* 044EC 808DAD5C 002E0821 */ addu $at, $at, $t6 -/* 044F0 808DAD60 8C2E7FB0 */ lw $t6, %lo(jtbl_808F7FB0)($at) -/* 044F4 808DAD64 01C00008 */ jr $t6 +/* 044EC 808DAD5C 002E0821 */ addu $at, $at, $t6 +/* 044F0 808DAD60 8C2E7FB0 */ lw $t6, %lo(jtbl_808F7FB0)($at) +/* 044F4 808DAD64 01C00008 */ jr $t6 /* 044F8 808DAD68 00000000 */ nop glabel L808DAD6C /* 044FC 808DAD6C 862401A2 */ lh $a0, 0x01A2($s1) ## 000001A2 -/* 04500 808DAD70 00800821 */ addu $at, $a0, $zero -/* 04504 808DAD74 00042080 */ sll $a0, $a0, 2 -/* 04508 808DAD78 00812021 */ addu $a0, $a0, $at -/* 0450C 808DAD7C 00042200 */ sll $a0, $a0, 8 -/* 04510 808DAD80 00042400 */ sll $a0, $a0, 16 +/* 04500 808DAD70 00800821 */ addu $at, $a0, $zero +/* 04504 808DAD74 00042080 */ sll $a0, $a0, 2 +/* 04508 808DAD78 00812021 */ addu $a0, $a0, $at +/* 0450C 808DAD7C 00042200 */ sll $a0, $a0, 8 +/* 04510 808DAD80 00042400 */ sll $a0, $a0, 16 /* 04514 808DAD84 0C01DE1C */ jal Math_Sins ## sins? -/* 04518 808DAD88 00042403 */ sra $a0, $a0, 16 +/* 04518 808DAD88 00042403 */ sra $a0, $a0, 16 /* 0451C 808DAD8C 862401A2 */ lh $a0, 0x01A2($s1) ## 000001A2 /* 04520 808DAD90 C62401D0 */ lwc1 $f4, 0x01D0($s1) ## 000001D0 -/* 04524 808DAD94 00800821 */ addu $at, $a0, $zero -/* 04528 808DAD98 000420C0 */ sll $a0, $a0, 3 -/* 0452C 808DAD9C 00812023 */ subu $a0, $a0, $at -/* 04530 808DADA0 00042200 */ sll $a0, $a0, 8 -/* 04534 808DADA4 00042400 */ sll $a0, $a0, 16 -/* 04538 808DADA8 46002502 */ mul.s $f20, $f4, $f0 +/* 04524 808DAD94 00800821 */ addu $at, $a0, $zero +/* 04528 808DAD98 000420C0 */ sll $a0, $a0, 3 +/* 0452C 808DAD9C 00812023 */ subu $a0, $a0, $at +/* 04530 808DADA0 00042200 */ sll $a0, $a0, 8 +/* 04534 808DADA4 00042400 */ sll $a0, $a0, 16 +/* 04538 808DADA8 46002502 */ mul.s $f20, $f4, $f0 /* 0453C 808DADAC 0C01DE0D */ jal Math_Coss ## coss? -/* 04540 808DADB0 00042403 */ sra $a0, $a0, 16 +/* 04540 808DADB0 00042403 */ sra $a0, $a0, 16 /* 04544 808DADB4 C62601D0 */ lwc1 $f6, 0x01D0($s1) ## 000001D0 -/* 04548 808DADB8 4405A000 */ mfc1 $a1, $f20 +/* 04548 808DADB8 4405A000 */ mfc1 $a1, $f20 /* 0454C 808DADBC 3C063D4C */ lui $a2, 0x3D4C ## $a2 = 3D4C0000 -/* 04550 808DADC0 46003202 */ mul.s $f8, $f6, $f0 +/* 04550 808DADC0 46003202 */ mul.s $f8, $f6, $f0 /* 04554 808DADC4 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3D4CCCCD /* 04558 808DADC8 26240024 */ addiu $a0, $s1, 0x0024 ## $a0 = 00000024 -/* 0455C 808DADCC E7A80078 */ swc1 $f8, 0x0078($sp) +/* 0455C 808DADCC E7A80078 */ swc1 $f8, 0x0078($sp) /* 04560 808DADD0 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 04564 808DADD4 8E2701C8 */ lw $a3, 0x01C8($s1) ## 000001C8 /* 04568 808DADD8 3C063D4C */ lui $a2, 0x3D4C ## $a2 = 3D4C0000 /* 0456C 808DADDC 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3D4CCCCD /* 04570 808DADE0 2624002C */ addiu $a0, $s1, 0x002C ## $a0 = 0000002C -/* 04574 808DADE4 8FA50078 */ lw $a1, 0x0078($sp) +/* 04574 808DADE4 8FA50078 */ lw $a1, 0x0078($sp) /* 04578 808DADE8 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 0457C 808DADEC 8E2701C8 */ lw $a3, 0x01C8($s1) ## 000001C8 /* 04580 808DADF0 262401D0 */ addiu $a0, $s1, 0x01D0 ## $a0 = 000001D0 /* 04584 808DADF4 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 /* 04588 808DADF8 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 0458C 808DADFC 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 04590 808DAE00 3C073FC0 */ lui $a3, 0x3FC0 ## $a3 = 3FC00000 /* 04594 808DAE04 862201B6 */ lh $v0, 0x01B6($s1) ## 000001B6 /* 04598 808DAE08 24010005 */ addiu $at, $zero, 0x0005 ## $at = 00000005 /* 0459C 808DAE0C 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 045A0 808DAE10 54410005 */ bnel $v0, $at, .L808DAE28 -/* 045A4 808DAE14 2841000E */ slti $at, $v0, 0x000E +/* 045A0 808DAE10 54410005 */ bnel $v0, $at, .L808DAE28 +/* 045A4 808DAE14 2841000E */ slti $at, $v0, 0x000E /* 045A8 808DAE18 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 045AC 808DAE1C 240539CB */ addiu $a1, $zero, 0x39CB ## $a1 = 000039CB /* 045B0 808DAE20 862201B6 */ lh $v0, 0x01B6($s1) ## 000001B6 -/* 045B4 808DAE24 2841000E */ slti $at, $v0, 0x000E +/* 045B4 808DAE24 2841000E */ slti $at, $v0, 0x000E .L808DAE28: -/* 045B8 808DAE28 10200013 */ beq $at, $zero, .L808DAE78 +/* 045B8 808DAE28 10200013 */ beq $at, $zero, .L808DAE78 /* 045BC 808DAE2C 3C01437A */ lui $at, 0x437A ## $at = 437A0000 /* 045C0 808DAE30 4481A000 */ mtc1 $at, $f20 ## $f20 = 250.00 /* 045C4 808DAE34 3C01808F */ lui $at, %hi(D_808F7FC4) ## $at = 808F0000 /* 045C8 808DAE38 0C00CFBE */ jal Math_Rand_ZeroFloat - -/* 045CC 808DAE3C C42C7FC4 */ lwc1 $f12, %lo(D_808F7FC4)($at) + +/* 045CC 808DAE3C C42C7FC4 */ lwc1 $f12, %lo(D_808F7FC4)($at) /* 045D0 808DAE40 3C01808F */ lui $at, %hi(D_808F7FC8) ## $at = 808F0000 -/* 045D4 808DAE44 C4307FC8 */ lwc1 $f16, %lo(D_808F7FC8)($at) +/* 045D4 808DAE44 C4307FC8 */ lwc1 $f16, %lo(D_808F7FC8)($at) /* 045D8 808DAE48 C62A0258 */ lwc1 $f10, 0x0258($s1) ## 00000258 /* 045DC 808DAE4C 26240254 */ addiu $a0, $s1, 0x0254 ## $a0 = 00000254 -/* 045E0 808DAE50 46100480 */ add.s $f18, $f0, $f16 +/* 045E0 808DAE50 46100480 */ add.s $f18, $f0, $f16 /* 045E4 808DAE54 3C0540E0 */ lui $a1, 0x40E0 ## $a1 = 40E00000 /* 045E8 808DAE58 3C063F00 */ lui $a2, 0x3F00 ## $a2 = 3F000000 /* 045EC 808DAE5C 3C073F80 */ lui $a3, 0x3F80 ## $a3 = 3F800000 -/* 045F0 808DAE60 46125100 */ add.s $f4, $f10, $f18 +/* 045F0 808DAE60 46125100 */ add.s $f4, $f10, $f18 /* 045F4 808DAE64 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 045F8 808DAE68 E6240258 */ swc1 $f4, 0x0258($s1) ## 00000258 /* 045FC 808DAE6C 240F0001 */ addiu $t7, $zero, 0x0001 ## $t7 = 00000001 -/* 04600 808DAE70 10000004 */ beq $zero, $zero, .L808DAE84 +/* 04600 808DAE70 10000004 */ beq $zero, $zero, .L808DAE84 /* 04604 808DAE74 A22F01A0 */ sb $t7, 0x01A0($s1) ## 000001A0 .L808DAE78: /* 04608 808DAE78 3C014348 */ lui $at, 0x4348 ## $at = 43480000 /* 0460C 808DAE7C 4481A000 */ mtc1 $at, $f20 ## $f20 = 200.00 /* 04610 808DAE80 00000000 */ nop .L808DAE84: -/* 04614 808DAE84 4405A000 */ mfc1 $a1, $f20 +/* 04614 808DAE84 4405A000 */ mfc1 $a1, $f20 /* 04618 808DAE88 3C063DCC */ lui $a2, 0x3DCC ## $a2 = 3DCC0000 /* 0461C 808DAE8C 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3DCCCCCD /* 04620 808DAE90 26240028 */ addiu $a0, $s1, 0x0028 ## $a0 = 00000028 /* 04624 808DAE94 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 04628 808DAE98 8E270060 */ lw $a3, 0x0060($s1) ## 00000060 /* 0462C 808DAE9C 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 /* 04630 808DAEA0 44810000 */ mtc1 $at, $f0 ## $f0 = 1.00 /* 04634 808DAEA4 26240060 */ addiu $a0, $s1, 0x0060 ## $a0 = 00000060 /* 04638 808DAEA8 3C0541A0 */ lui $a1, 0x41A0 ## $a1 = 41A00000 -/* 0463C 808DAEAC 44060000 */ mfc1 $a2, $f0 -/* 04640 808DAEB0 44070000 */ mfc1 $a3, $f0 +/* 0463C 808DAEAC 44060000 */ mfc1 $a2, $f0 +/* 04640 808DAEB0 44070000 */ mfc1 $a3, $f0 /* 04644 808DAEB4 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 04648 808DAEB8 00000000 */ nop /* 0464C 808DAEBC 862201B6 */ lh $v0, 0x01B6($s1) ## 000001B6 /* 04650 808DAEC0 2401000E */ addiu $at, $zero, 0x000E ## $at = 0000000E /* 04654 808DAEC4 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 -/* 04658 808DAEC8 1441000E */ bne $v0, $at, .L808DAF04 +/* 04658 808DAEC8 1441000E */ bne $v0, $at, .L808DAF04 /* 0465C 808DAECC 00000000 */ nop /* 04660 808DAED0 0C028800 */ jal SkelAnime_GetFrameCount - + /* 04664 808DAED4 24842D2C */ addiu $a0, $a0, 0x2D2C ## $a0 = 06002D2C /* 04668 808DAED8 44823000 */ mtc1 $v0, $f6 ## $f6 = 0.00 /* 0466C 808DAEDC 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 04670 808DAEE0 24A52D2C */ addiu $a1, $a1, 0x2D2C ## $a1 = 06002D2C -/* 04674 808DAEE4 46803220 */ cvt.s.w $f8, $f6 +/* 04674 808DAEE4 46803220 */ cvt.s.w $f8, $f6 /* 04678 808DAEE8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000150 /* 0467C 808DAEEC 24060000 */ addiu $a2, $zero, 0x0000 ## $a2 = 00000000 -/* 04680 808DAEF0 0C029490 */ jal func_800A5240 +/* 04680 808DAEF0 0C029490 */ jal SkelAnime_ChangeAnimTransitionStop /* 04684 808DAEF4 E62801CC */ swc1 $f8, 0x01CC($s1) ## 000001CC /* 04688 808DAEF8 44808000 */ mtc1 $zero, $f16 ## $f16 = 0.00 /* 0468C 808DAEFC 862201B6 */ lh $v0, 0x01B6($s1) ## 000001B6 /* 04690 808DAF00 E6300060 */ swc1 $f16, 0x0060($s1) ## 00000060 .L808DAF04: -/* 04694 808DAF04 144000AD */ bne $v0, $zero, .L808DB1BC +/* 04694 808DAF04 144000AD */ bne $v0, $zero, .L808DB1BC /* 04698 808DAF08 24180001 */ addiu $t8, $zero, 0x0001 ## $t8 = 00000001 /* 0469C 808DAF0C 44805000 */ mtc1 $zero, $f10 ## $f10 = 0.00 /* 046A0 808DAF10 A63801C2 */ sh $t8, 0x01C2($s1) ## 000001C2 -/* 046A4 808DAF14 100000A9 */ beq $zero, $zero, .L808DB1BC +/* 046A4 808DAF14 100000A9 */ beq $zero, $zero, .L808DB1BC /* 046A8 808DAF18 E62A0060 */ swc1 $f10, 0x0060($s1) ## 00000060 glabel L808DAF1C /* 046AC 808DAF1C 3C01BF80 */ lui $at, 0xBF80 ## $at = BF800000 /* 046B0 808DAF20 3C198090 */ lui $t9, %hi(D_808F93C0) ## $t9 = 80900000 -/* 046B4 808DAF24 8F3993C0 */ lw $t9, %lo(D_808F93C0)($t9) +/* 046B4 808DAF24 8F3993C0 */ lw $t9, %lo(D_808F93C0)($t9) /* 046B8 808DAF28 44819000 */ mtc1 $at, $f18 ## $f18 = -1.00 /* 046BC 808DAF2C 24080001 */ addiu $t0, $zero, 0x0001 ## $t0 = 00000001 /* 046C0 808DAF30 26240060 */ addiu $a0, $s1, 0x0060 ## $a0 = 00000060 @@ -155,13 +155,13 @@ glabel L808DAF1C /* 046CC 808DAF3C 3C05C248 */ lui $a1, 0xC248 ## $a1 = C2480000 /* 046D0 808DAF40 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 046D4 808DAF44 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 046D8 808DAF48 3C074120 */ lui $a3, 0x4120 ## $a3 = 41200000 /* 046DC 808DAF4C C6240028 */ lwc1 $f4, 0x0028($s1) ## 00000028 /* 046E0 808DAF50 C6260060 */ lwc1 $f6, 0x0060($s1) ## 00000060 /* 046E4 808DAF54 3C014270 */ lui $at, 0x4270 ## $at = 42700000 /* 046E8 808DAF58 44810000 */ mtc1 $at, $f0 ## $f0 = 60.00 -/* 046EC 808DAF5C 46062200 */ add.s $f8, $f4, $f6 +/* 046EC 808DAF5C 46062200 */ add.s $f8, $f4, $f6 /* 046F0 808DAF60 24090002 */ addiu $t1, $zero, 0x0002 ## $t1 = 00000002 /* 046F4 808DAF64 240A000A */ addiu $t2, $zero, 0x000A ## $t2 = 0000000A /* 046F8 808DAF68 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 @@ -169,21 +169,21 @@ glabel L808DAF1C /* 04700 808DAF70 C6300028 */ lwc1 $f16, 0x0028($s1) ## 00000028 /* 04704 808DAF74 2406000A */ addiu $a2, $zero, 0x000A ## $a2 = 0000000A /* 04708 808DAF78 24070014 */ addiu $a3, $zero, 0x0014 ## $a3 = 00000014 -/* 0470C 808DAF7C 4600803C */ c.lt.s $f16, $f0 +/* 0470C 808DAF7C 4600803C */ c.lt.s $f16, $f0 /* 04710 808DAF80 00000000 */ nop -/* 04714 808DAF84 4502008E */ bc1fl .L808DB1C0 +/* 04714 808DAF84 4502008E */ bc1fl .L808DB1C0 /* 04718 808DAF88 8622019C */ lh $v0, 0x019C($s1) ## 0000019C /* 0471C 808DAF8C E6200028 */ swc1 $f0, 0x0028($s1) ## 00000028 /* 04720 808DAF90 A62901C2 */ sh $t1, 0x01C2($s1) ## 000001C2 /* 04724 808DAF94 A62A01B6 */ sh $t2, 0x01B6($s1) ## 000001B6 -/* 04728 808DAF98 0C00CFA2 */ jal func_80033E88 -/* 0472C 808DAF9C 8FA5008C */ lw $a1, 0x008C($sp) +/* 04728 808DAF98 0C00CFA2 */ jal func_80033E88 +/* 0472C 808DAF9C 8FA5008C */ lw $a1, 0x008C($sp) /* 04730 808DAFA0 240B0023 */ addiu $t3, $zero, 0x0023 ## $t3 = 00000023 /* 04734 808DAFA4 A62B019C */ sh $t3, 0x019C($s1) ## 0000019C /* 04738 808DAFA8 A220019E */ sb $zero, 0x019E($s1) ## 0000019E /* 0473C 808DAFAC 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 04740 808DAFB0 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 04744 808DAFB4 24053915 */ addiu $a1, $zero, 0x3915 ## $a1 = 00003915 /* 04748 808DAFB8 44805000 */ mtc1 $zero, $f10 ## $f10 = 0.00 /* 0474C 808DAFBC 8E2E0260 */ lw $t6, 0x0260($s1) ## 00000260 @@ -198,71 +198,71 @@ glabel L808DAF1C /* 04770 808DAFE0 4481A000 */ mtc1 $at, $f20 ## $f20 = 25.00 /* 04774 808DAFE4 00008025 */ or $s0, $zero, $zero ## $s0 = 00000000 /* 04778 808DAFE8 AD8E0008 */ sw $t6, 0x0008($t4) ## FFFFFFE0 -/* 0477C 808DAFEC E7B20064 */ swc1 $f18, 0x0064($sp) +/* 0477C 808DAFEC E7B20064 */ swc1 $f18, 0x0064($sp) .L808DAFF0: /* 04780 808DAFF0 0C00CFC8 */ jal Math_Rand_CenteredFloat - -/* 04784 808DAFF4 4600A306 */ mov.s $f12, $f20 + +/* 04784 808DAFF4 4600A306 */ mov.s $f12, $f20 /* 04788 808DAFF8 3C014188 */ lui $at, 0x4188 ## $at = 41880000 /* 0478C 808DAFFC 44816000 */ mtc1 $at, $f12 ## $f12 = 17.00 /* 04790 808DB000 0C00CFBE */ jal Math_Rand_ZeroFloat - -/* 04794 808DB004 E7A0006C */ swc1 $f0, 0x006C($sp) -/* 04798 808DB008 E7A00070 */ swc1 $f0, 0x0070($sp) + +/* 04794 808DB004 E7A0006C */ swc1 $f0, 0x006C($sp) +/* 04798 808DB008 E7A00070 */ swc1 $f0, 0x0070($sp) /* 0479C 808DB00C 0C00CFC8 */ jal Math_Rand_CenteredFloat - -/* 047A0 808DB010 4600A306 */ mov.s $f12, $f20 + +/* 047A0 808DB010 4600A306 */ mov.s $f12, $f20 /* 047A4 808DB014 3C014396 */ lui $at, 0x4396 ## $at = 43960000 /* 047A8 808DB018 44816000 */ mtc1 $at, $f12 ## $f12 = 300.00 /* 047AC 808DB01C 0C00CFBE */ jal Math_Rand_ZeroFloat - -/* 047B0 808DB020 E7A00074 */ swc1 $f0, 0x0074($sp) + +/* 047B0 808DB020 E7A00074 */ swc1 $f0, 0x0074($sp) /* 047B4 808DB024 3C0143FA */ lui $at, 0x43FA ## $at = 43FA0000 /* 047B8 808DB028 44812000 */ mtc1 $at, $f4 ## $f4 = 500.00 /* 047BC 808DB02C 3C014150 */ lui $at, 0x4150 ## $at = 41500000 /* 047C0 808DB030 44814000 */ mtc1 $at, $f8 ## $f8 = 13.00 -/* 047C4 808DB034 46040180 */ add.s $f6, $f0, $f4 +/* 047C4 808DB034 46040180 */ add.s $f6, $f0, $f4 /* 047C8 808DB038 3C07808E */ lui $a3, %hi(D_808E4C6C) ## $a3 = 808E0000 /* 047CC 808DB03C 240F001E */ addiu $t7, $zero, 0x001E ## $t7 = 0000001E -/* 047D0 808DB040 AFAF0018 */ sw $t7, 0x0018($sp) +/* 047D0 808DB040 AFAF0018 */ sw $t7, 0x0018($sp) /* 047D4 808DB044 24E74C6C */ addiu $a3, $a3, %lo(D_808E4C6C) ## $a3 = 808E4C6C -/* 047D8 808DB048 E7A60010 */ swc1 $f6, 0x0010($sp) -/* 047DC 808DB04C 8FA4008C */ lw $a0, 0x008C($sp) +/* 047D8 808DB048 E7A60010 */ swc1 $f6, 0x0010($sp) +/* 047DC 808DB04C 8FA4008C */ lw $a0, 0x008C($sp) /* 047E0 808DB050 27A50060 */ addiu $a1, $sp, 0x0060 ## $a1 = FFFFFFD8 /* 047E4 808DB054 27A6006C */ addiu $a2, $sp, 0x006C ## $a2 = FFFFFFE4 -/* 047E8 808DB058 0C235AAB */ jal func_808D6AAC -/* 047EC 808DB05C E7A80014 */ swc1 $f8, 0x0014($sp) +/* 047E8 808DB058 0C235AAB */ jal func_808D6AAC +/* 047EC 808DB05C E7A80014 */ swc1 $f8, 0x0014($sp) /* 047F0 808DB060 26100001 */ addiu $s0, $s0, 0x0001 ## $s0 = 00000001 -/* 047F4 808DB064 00108400 */ sll $s0, $s0, 16 -/* 047F8 808DB068 00108403 */ sra $s0, $s0, 16 -/* 047FC 808DB06C 2A010050 */ slti $at, $s0, 0x0050 -/* 04800 808DB070 1420FFDF */ bne $at, $zero, .L808DAFF0 +/* 047F4 808DB064 00108400 */ sll $s0, $s0, 16 +/* 047F8 808DB068 00108403 */ sra $s0, $s0, 16 +/* 047FC 808DB06C 2A010050 */ slti $at, $s0, 0x0050 +/* 04800 808DB070 1420FFDF */ bne $at, $zero, .L808DAFF0 /* 04804 808DB074 00000000 */ nop -/* 04808 808DB078 10000051 */ beq $zero, $zero, .L808DB1C0 +/* 04808 808DB078 10000051 */ beq $zero, $zero, .L808DB1C0 /* 0480C 808DB07C 8622019C */ lh $v0, 0x019C($s1) ## 0000019C glabel L808DB080 /* 04810 808DB080 863901B6 */ lh $t9, 0x01B6($s1) ## 000001B6 /* 04814 808DB084 24180001 */ addiu $t8, $zero, 0x0001 ## $t8 = 00000001 /* 04818 808DB088 A23801A0 */ sb $t8, 0x01A0($s1) ## 000001A0 -/* 0481C 808DB08C 1720004B */ bne $t9, $zero, .L808DB1BC +/* 0481C 808DB08C 1720004B */ bne $t9, $zero, .L808DB1BC /* 04820 808DB090 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 /* 04824 808DB094 0C028800 */ jal SkelAnime_GetFrameCount - + /* 04828 808DB098 2484343C */ addiu $a0, $a0, 0x343C ## $a0 = 0600343C /* 0482C 808DB09C 44828000 */ mtc1 $v0, $f16 ## $f16 = 0.00 /* 04830 808DB0A0 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 04834 808DB0A4 24A5343C */ addiu $a1, $a1, 0x343C ## $a1 = 0600343C -/* 04838 808DB0A8 468082A0 */ cvt.s.w $f10, $f16 +/* 04838 808DB0A8 468082A0 */ cvt.s.w $f10, $f16 /* 0483C 808DB0AC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000001 /* 04840 808DB0B0 24060000 */ addiu $a2, $zero, 0x0000 ## $a2 = 00000000 -/* 04844 808DB0B4 0C029490 */ jal func_800A5240 +/* 04844 808DB0B4 0C029490 */ jal SkelAnime_ChangeAnimTransitionStop /* 04848 808DB0B8 E62A01CC */ swc1 $f10, 0x01CC($s1) ## 000001CC /* 0484C 808DB0BC 44809000 */ mtc1 $zero, $f18 ## $f18 = 0.00 /* 04850 808DB0C0 24080003 */ addiu $t0, $zero, 0x0003 ## $t0 = 00000003 /* 04854 808DB0C4 24090001 */ addiu $t1, $zero, 0x0001 ## $t1 = 00000001 /* 04858 808DB0C8 A62801C2 */ sh $t0, 0x01C2($s1) ## 000001C2 /* 0485C 808DB0CC A229019F */ sb $t1, 0x019F($s1) ## 0000019F -/* 04860 808DB0D0 1000003A */ beq $zero, $zero, .L808DB1BC +/* 04860 808DB0D0 1000003A */ beq $zero, $zero, .L808DB1BC /* 04864 808DB0D4 E6320060 */ swc1 $f18, 0x0060($s1) ## 00000060 glabel L808DB0D8 /* 04868 808DB0D8 3C063DCC */ lui $a2, 0x3DCC ## $a2 = 3DCC0000 @@ -270,44 +270,44 @@ glabel L808DB0D8 /* 04870 808DB0E0 26240028 */ addiu $a0, $s1, 0x0028 ## $a0 = 00000028 /* 04874 808DB0E4 3C054316 */ lui $a1, 0x4316 ## $a1 = 43160000 /* 04878 808DB0E8 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 0487C 808DB0EC 8E270060 */ lw $a3, 0x0060($s1) ## 00000060 /* 04880 808DB0F0 26240060 */ addiu $a0, $s1, 0x0060 ## $a0 = 00000060 /* 04884 808DB0F4 3C0541A0 */ lui $a1, 0x41A0 ## $a1 = 41A00000 /* 04888 808DB0F8 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 0488C 808DB0FC 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 04890 808DB100 3C073F80 */ lui $a3, 0x3F80 ## $a3 = 3F800000 /* 04894 808DB104 02002025 */ or $a0, $s0, $zero ## $a0 = 00000001 -/* 04898 808DB108 0C0295B2 */ jal func_800A56C8 +/* 04898 808DB108 0C0295B2 */ jal func_800A56C8 /* 0489C 808DB10C 8E2501CC */ lw $a1, 0x01CC($s1) ## 000001CC -/* 048A0 808DB110 1040002A */ beq $v0, $zero, .L808DB1BC +/* 048A0 808DB110 1040002A */ beq $v0, $zero, .L808DB1BC /* 048A4 808DB114 3C040601 */ lui $a0, 0x0601 ## $a0 = 06010000 /* 048A8 808DB118 0C028800 */ jal SkelAnime_GetFrameCount - + /* 048AC 808DB11C 24848A88 */ addiu $a0, $a0, 0x8A88 ## $a0 = 06008A88 /* 048B0 808DB120 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 048B4 808DB124 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 /* 048B8 808DB128 24A58A88 */ addiu $a1, $a1, 0x8A88 ## $a1 = 06008A88 -/* 048BC 808DB12C 468021A0 */ cvt.s.w $f6, $f4 +/* 048BC 808DB12C 468021A0 */ cvt.s.w $f6, $f4 /* 048C0 808DB130 02002025 */ or $a0, $s0, $zero ## $a0 = 00000001 /* 048C4 808DB134 24060000 */ addiu $a2, $zero, 0x0000 ## $a2 = 00000000 -/* 048C8 808DB138 0C029490 */ jal func_800A5240 +/* 048C8 808DB138 0C029490 */ jal SkelAnime_ChangeAnimTransitionStop /* 048CC 808DB13C E62601CC */ swc1 $f6, 0x01CC($s1) ## 000001CC /* 048D0 808DB140 0C02927F */ jal SkelAnime_FrameUpdateMatrix - + /* 048D4 808DB144 02002025 */ or $a0, $s0, $zero ## $a0 = 00000001 /* 048D8 808DB148 3C014190 */ lui $at, 0x4190 ## $at = 41900000 /* 048DC 808DB14C 3C0A8090 */ lui $t2, %hi(D_808F93C0) ## $t2 = 80900000 -/* 048E0 808DB150 8D4A93C0 */ lw $t2, %lo(D_808F93C0)($t2) +/* 048E0 808DB150 8D4A93C0 */ lw $t2, %lo(D_808F93C0)($t2) /* 048E4 808DB154 44814000 */ mtc1 $at, $f8 ## $f8 = 18.00 /* 048E8 808DB158 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 048EC 808DB15C 240528C7 */ addiu $a1, $zero, 0x28C7 ## $a1 = 000028C7 /* 048F0 808DB160 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 048F4 808DB164 E54816C4 */ swc1 $f8, 0x16C4($t2) ## 809016C4 /* 048F8 808DB168 240B0004 */ addiu $t3, $zero, 0x0004 ## $t3 = 00000004 -/* 048FC 808DB16C 10000013 */ beq $zero, $zero, .L808DB1BC +/* 048FC 808DB16C 10000013 */ beq $zero, $zero, .L808DB1BC /* 04900 808DB170 A62B01C2 */ sh $t3, 0x01C2($s1) ## 000001C2 glabel L808DB174 /* 04904 808DB174 3C063DCC */ lui $a2, 0x3DCC ## $a2 = 3DCC0000 @@ -315,30 +315,30 @@ glabel L808DB174 /* 0490C 808DB17C 26240028 */ addiu $a0, $s1, 0x0028 ## $a0 = 00000028 /* 04910 808DB180 3C054316 */ lui $a1, 0x4316 ## $a1 = 43160000 /* 04914 808DB184 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 04918 808DB188 8E270060 */ lw $a3, 0x0060($s1) ## 00000060 /* 0491C 808DB18C 26240060 */ addiu $a0, $s1, 0x0060 ## $a0 = 00000060 /* 04920 808DB190 3C0541A0 */ lui $a1, 0x41A0 ## $a1 = 41A00000 /* 04924 808DB194 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 04928 808DB198 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 0492C 808DB19C 3C073F80 */ lui $a3, 0x3F80 ## $a3 = 3F800000 /* 04930 808DB1A0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000001 -/* 04934 808DB1A4 0C0295B2 */ jal func_800A56C8 +/* 04934 808DB1A4 0C0295B2 */ jal func_800A56C8 /* 04938 808DB1A8 8E2501CC */ lw $a1, 0x01CC($s1) ## 000001CC -/* 0493C 808DB1AC 10400003 */ beq $v0, $zero, .L808DB1BC +/* 0493C 808DB1AC 10400003 */ beq $v0, $zero, .L808DB1BC /* 04940 808DB1B0 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 04944 808DB1B4 0C236EBC */ jal func_808DBAF0 -/* 04948 808DB1B8 8FA5008C */ lw $a1, 0x008C($sp) +/* 04944 808DB1B4 0C236EBC */ jal func_808DBAF0 +/* 04948 808DB1B8 8FA5008C */ lw $a1, 0x008C($sp) .L808DB1BC: /* 0494C 808DB1BC 8622019C */ lh $v0, 0x019C($s1) ## 0000019C .L808DB1C0: /* 04950 808DB1C0 24010023 */ addiu $at, $zero, 0x0023 ## $at = 00000023 -/* 04954 808DB1C4 10410005 */ beq $v0, $at, .L808DB1DC +/* 04954 808DB1C4 10410005 */ beq $v0, $at, .L808DB1DC /* 04958 808DB1C8 2401001E */ addiu $at, $zero, 0x001E ## $at = 0000001E -/* 0495C 808DB1CC 10410003 */ beq $v0, $at, .L808DB1DC +/* 0495C 808DB1CC 10410003 */ beq $v0, $at, .L808DB1DC /* 04960 808DB1D0 24010019 */ addiu $at, $zero, 0x0019 ## $at = 00000019 -/* 04964 808DB1D4 54410013 */ bnel $v0, $at, .L808DB224 +/* 04964 808DB1D4 54410013 */ bnel $v0, $at, .L808DB224 /* 04968 808DB1D8 24010023 */ addiu $at, $zero, 0x0023 ## $at = 00000023 .L808DB1DC: /* 0496C 808DB1DC 8E2D0024 */ lw $t5, 0x0024($s1) ## 00000024 @@ -351,17 +351,17 @@ glabel L808DB174 /* 04988 808DB1F8 ACAC0004 */ sw $t4, 0x0004($a1) ## FFFFFFD0 /* 0498C 808DB1FC 8E2D002C */ lw $t5, 0x002C($s1) ## 0000002C /* 04990 808DB200 ACAD0008 */ sw $t5, 0x0008($a1) ## FFFFFFD4 -/* 04994 808DB204 E7B00058 */ swc1 $f16, 0x0058($sp) +/* 04994 808DB204 E7B00058 */ swc1 $f16, 0x0058($sp) /* 04998 808DB208 862E019C */ lh $t6, 0x019C($s1) ## 0000019C -/* 0499C 808DB20C 8FA4008C */ lw $a0, 0x008C($sp) +/* 0499C 808DB20C 8FA4008C */ lw $a0, 0x008C($sp) /* 049A0 808DB210 25CFFFE7 */ addiu $t7, $t6, 0xFFE7 ## $t7 = FFFFFFE7 -/* 049A4 808DB214 0C235B95 */ jal func_808D6E54 -/* 049A8 808DB218 AFAF0010 */ sw $t7, 0x0010($sp) +/* 049A4 808DB214 0C235B95 */ jal func_808D6E54 +/* 049A8 808DB218 AFAF0010 */ sw $t7, 0x0010($sp) /* 049AC 808DB21C 8622019C */ lh $v0, 0x019C($s1) ## 0000019C /* 049B0 808DB220 24010023 */ addiu $at, $zero, 0x0023 ## $at = 00000023 .L808DB224: -/* 049B4 808DB224 5441000F */ bnel $v0, $at, .L808DB264 -/* 049B8 808DB228 8FBF0034 */ lw $ra, 0x0034($sp) +/* 049B4 808DB224 5441000F */ bnel $v0, $at, .L808DB264 +/* 049B8 808DB228 8FBF0034 */ lw $ra, 0x0034($sp) /* 049BC 808DB22C 8E390024 */ lw $t9, 0x0024($s1) ## 00000024 /* 049C0 808DB230 27A50048 */ addiu $a1, $sp, 0x0048 ## $a1 = FFFFFFC0 /* 049C4 808DB234 44805000 */ mtc1 $zero, $f10 ## $f10 = 0.00 @@ -372,15 +372,15 @@ glabel L808DB174 /* 049D8 808DB248 ACB80004 */ sw $t8, 0x0004($a1) ## FFFFFFC4 /* 049DC 808DB24C 8E39002C */ lw $t9, 0x002C($s1) ## 0000002C /* 049E0 808DB250 ACB90008 */ sw $t9, 0x0008($a1) ## FFFFFFC8 -/* 049E4 808DB254 8FA4008C */ lw $a0, 0x008C($sp) -/* 049E8 808DB258 0C235BCF */ jal func_808D6F3C -/* 049EC 808DB25C E7AA004C */ swc1 $f10, 0x004C($sp) -/* 049F0 808DB260 8FBF0034 */ lw $ra, 0x0034($sp) +/* 049E4 808DB254 8FA4008C */ lw $a0, 0x008C($sp) +/* 049E8 808DB258 0C235BCF */ jal func_808D6F3C +/* 049EC 808DB25C E7AA004C */ swc1 $f10, 0x004C($sp) +/* 049F0 808DB260 8FBF0034 */ lw $ra, 0x0034($sp) .L808DB264: -/* 049F4 808DB264 D7B40020 */ ldc1 $f20, 0x0020($sp) -/* 049F8 808DB268 8FB0002C */ lw $s0, 0x002C($sp) -/* 049FC 808DB26C 8FB10030 */ lw $s1, 0x0030($sp) -/* 04A00 808DB270 03E00008 */ jr $ra +/* 049F4 808DB264 D7B40020 */ ldc1 $f20, 0x0020($sp) +/* 049F8 808DB268 8FB0002C */ lw $s0, 0x002C($sp) +/* 049FC 808DB26C 8FB10030 */ lw $s1, 0x0030($sp) +/* 04A00 808DB270 03E00008 */ jr $ra /* 04A04 808DB274 27BD0088 */ addiu $sp, $sp, 0x0088 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DB2E8.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DB2E8.s index 736ea9bf45..0c04578b7c 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DB2E8.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DB2E8.s @@ -1,160 +1,160 @@ glabel func_808DB2E8 /* 04A78 808DB2E8 27BDFF68 */ addiu $sp, $sp, 0xFF68 ## $sp = FFFFFF68 -/* 04A7C 808DB2EC AFB10048 */ sw $s1, 0x0048($sp) +/* 04A7C 808DB2EC AFB10048 */ sw $s1, 0x0048($sp) /* 04A80 808DB2F0 00808825 */ or $s1, $a0, $zero ## $s1 = 00000000 -/* 04A84 808DB2F4 AFBF004C */ sw $ra, 0x004C($sp) +/* 04A84 808DB2F4 AFBF004C */ sw $ra, 0x004C($sp) /* 04A88 808DB2F8 24840150 */ addiu $a0, $a0, 0x0150 ## $a0 = 00000150 -/* 04A8C 808DB2FC AFB00044 */ sw $s0, 0x0044($sp) -/* 04A90 808DB300 F7B60038 */ sdc1 $f22, 0x0038($sp) -/* 04A94 808DB304 F7B40030 */ sdc1 $f20, 0x0030($sp) -/* 04A98 808DB308 AFA5009C */ sw $a1, 0x009C($sp) +/* 04A8C 808DB2FC AFB00044 */ sw $s0, 0x0044($sp) +/* 04A90 808DB300 F7B60038 */ sdc1 $f22, 0x0038($sp) +/* 04A94 808DB304 F7B40030 */ sdc1 $f20, 0x0030($sp) +/* 04A98 808DB308 AFA5009C */ sw $a1, 0x009C($sp) /* 04A9C 808DB30C 0C02927F */ jal SkelAnime_FrameUpdateMatrix - -/* 04AA0 808DB310 AFA4005C */ sw $a0, 0x005C($sp) + +/* 04AA0 808DB310 AFA4005C */ sw $a0, 0x005C($sp) /* 04AA4 808DB314 862401A2 */ lh $a0, 0x01A2($s1) ## 000001A2 -/* 04AA8 808DB318 00800821 */ addu $at, $a0, $zero -/* 04AAC 808DB31C 00042080 */ sll $a0, $a0, 2 -/* 04AB0 808DB320 00812021 */ addu $a0, $a0, $at -/* 04AB4 808DB324 00042200 */ sll $a0, $a0, 8 -/* 04AB8 808DB328 00042400 */ sll $a0, $a0, 16 +/* 04AA8 808DB318 00800821 */ addu $at, $a0, $zero +/* 04AAC 808DB31C 00042080 */ sll $a0, $a0, 2 +/* 04AB0 808DB320 00812021 */ addu $a0, $a0, $at +/* 04AB4 808DB324 00042200 */ sll $a0, $a0, 8 +/* 04AB8 808DB328 00042400 */ sll $a0, $a0, 16 /* 04ABC 808DB32C 0C01DE1C */ jal Math_Sins ## sins? -/* 04AC0 808DB330 00042403 */ sra $a0, $a0, 16 +/* 04AC0 808DB330 00042403 */ sra $a0, $a0, 16 /* 04AC4 808DB334 862401A2 */ lh $a0, 0x01A2($s1) ## 000001A2 /* 04AC8 808DB338 C62401D0 */ lwc1 $f4, 0x01D0($s1) ## 000001D0 -/* 04ACC 808DB33C 00800821 */ addu $at, $a0, $zero -/* 04AD0 808DB340 000420C0 */ sll $a0, $a0, 3 -/* 04AD4 808DB344 00812023 */ subu $a0, $a0, $at -/* 04AD8 808DB348 00042200 */ sll $a0, $a0, 8 -/* 04ADC 808DB34C 00042400 */ sll $a0, $a0, 16 -/* 04AE0 808DB350 46002502 */ mul.s $f20, $f4, $f0 +/* 04ACC 808DB33C 00800821 */ addu $at, $a0, $zero +/* 04AD0 808DB340 000420C0 */ sll $a0, $a0, 3 +/* 04AD4 808DB344 00812023 */ subu $a0, $a0, $at +/* 04AD8 808DB348 00042200 */ sll $a0, $a0, 8 +/* 04ADC 808DB34C 00042400 */ sll $a0, $a0, 16 +/* 04AE0 808DB350 46002502 */ mul.s $f20, $f4, $f0 /* 04AE4 808DB354 0C01DE0D */ jal Math_Coss ## coss? -/* 04AE8 808DB358 00042403 */ sra $a0, $a0, 16 +/* 04AE8 808DB358 00042403 */ sra $a0, $a0, 16 /* 04AEC 808DB35C C62601D0 */ lwc1 $f6, 0x01D0($s1) ## 000001D0 -/* 04AF0 808DB360 4405A000 */ mfc1 $a1, $f20 +/* 04AF0 808DB360 4405A000 */ mfc1 $a1, $f20 /* 04AF4 808DB364 3C063D4C */ lui $a2, 0x3D4C ## $a2 = 3D4C0000 -/* 04AF8 808DB368 46003582 */ mul.s $f22, $f6, $f0 +/* 04AF8 808DB368 46003582 */ mul.s $f22, $f6, $f0 /* 04AFC 808DB36C 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3D4CCCCD /* 04B00 808DB370 26240024 */ addiu $a0, $s1, 0x0024 ## $a0 = 00000024 /* 04B04 808DB374 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 04B08 808DB378 8E2701C8 */ lw $a3, 0x01C8($s1) ## 000001C8 -/* 04B0C 808DB37C 4405B000 */ mfc1 $a1, $f22 +/* 04B0C 808DB37C 4405B000 */ mfc1 $a1, $f22 /* 04B10 808DB380 3C063D4C */ lui $a2, 0x3D4C ## $a2 = 3D4C0000 /* 04B14 808DB384 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3D4CCCCD /* 04B18 808DB388 2624002C */ addiu $a0, $s1, 0x002C ## $a0 = 0000002C /* 04B1C 808DB38C 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 04B20 808DB390 8E2701C8 */ lw $a3, 0x01C8($s1) ## 000001C8 /* 04B24 808DB394 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 /* 04B28 808DB398 4481A000 */ mtc1 $at, $f20 ## $f20 = 1.00 /* 04B2C 808DB39C 4480B000 */ mtc1 $zero, $f22 ## $f22 = 0.00 /* 04B30 808DB3A0 262401D0 */ addiu $a0, $s1, 0x01D0 ## $a0 = 000001D0 -/* 04B34 808DB3A4 4406A000 */ mfc1 $a2, $f20 -/* 04B38 808DB3A8 4405B000 */ mfc1 $a1, $f22 +/* 04B34 808DB3A4 4406A000 */ mfc1 $a2, $f20 +/* 04B38 808DB3A8 4405B000 */ mfc1 $a1, $f22 /* 04B3C 808DB3AC 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 04B40 808DB3B0 3C073FC0 */ lui $a3, 0x3FC0 ## $a3 = 3FC00000 /* 04B44 808DB3B4 3C063D4C */ lui $a2, 0x3D4C ## $a2 = 3D4C0000 /* 04B48 808DB3B8 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3D4CCCCD /* 04B4C 808DB3BC 26240028 */ addiu $a0, $s1, 0x0028 ## $a0 = 00000028 /* 04B50 808DB3C0 3C054348 */ lui $a1, 0x4348 ## $a1 = 43480000 /* 04B54 808DB3C4 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 04B58 808DB3C8 8E270060 */ lw $a3, 0x0060($s1) ## 00000060 -/* 04B5C 808DB3CC 4406A000 */ mfc1 $a2, $f20 -/* 04B60 808DB3D0 4407A000 */ mfc1 $a3, $f20 +/* 04B5C 808DB3CC 4406A000 */ mfc1 $a2, $f20 +/* 04B60 808DB3D0 4407A000 */ mfc1 $a3, $f20 /* 04B64 808DB3D4 26240060 */ addiu $a0, $s1, 0x0060 ## $a0 = 00000060 /* 04B68 808DB3D8 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 04B6C 808DB3DC 3C0541A0 */ lui $a1, 0x41A0 ## $a1 = 41A00000 /* 04B70 808DB3E0 962E01C2 */ lhu $t6, 0x01C2($s1) ## 000001C2 -/* 04B74 808DB3E4 2DC10006 */ sltiu $at, $t6, 0x0006 -/* 04B78 808DB3E8 102001BA */ beq $at, $zero, .L808DBAD4 -/* 04B7C 808DB3EC 000E7080 */ sll $t6, $t6, 2 +/* 04B74 808DB3E4 2DC10006 */ sltiu $at, $t6, 0x0006 +/* 04B78 808DB3E8 102001BA */ beq $at, $zero, .L808DBAD4 +/* 04B7C 808DB3EC 000E7080 */ sll $t6, $t6, 2 /* 04B80 808DB3F0 3C01808F */ lui $at, %hi(jtbl_808F7FD0) ## $at = 808F0000 -/* 04B84 808DB3F4 002E0821 */ addu $at, $at, $t6 -/* 04B88 808DB3F8 8C2E7FD0 */ lw $t6, %lo(jtbl_808F7FD0)($at) -/* 04B8C 808DB3FC 01C00008 */ jr $t6 +/* 04B84 808DB3F4 002E0821 */ addu $at, $at, $t6 +/* 04B88 808DB3F8 8C2E7FD0 */ lw $t6, %lo(jtbl_808F7FD0)($at) +/* 04B8C 808DB3FC 01C00008 */ jr $t6 /* 04B90 808DB400 00000000 */ nop glabel L808DB404 /* 04B94 808DB404 862F01B6 */ lh $t7, 0x01B6($s1) ## 000001B6 /* 04B98 808DB408 3C100600 */ lui $s0, 0x0600 ## $s0 = 06000000 /* 04B9C 808DB40C 26101B0C */ addiu $s0, $s0, 0x1B0C ## $s0 = 06001B0C -/* 04BA0 808DB410 55E001B1 */ bnel $t7, $zero, .L808DBAD8 -/* 04BA4 808DB414 8FBF004C */ lw $ra, 0x004C($sp) +/* 04BA0 808DB410 55E001B1 */ bnel $t7, $zero, .L808DBAD8 +/* 04BA4 808DB414 8FBF004C */ lw $ra, 0x004C($sp) /* 04BA8 808DB418 0C028800 */ jal SkelAnime_GetFrameCount - + /* 04BAC 808DB41C 02002025 */ or $a0, $s0, $zero ## $a0 = 06001B0C /* 04BB0 808DB420 44824000 */ mtc1 $v0, $f8 ## $f8 = 0.00 -/* 04BB4 808DB424 4406B000 */ mfc1 $a2, $f22 +/* 04BB4 808DB424 4406B000 */ mfc1 $a2, $f22 /* 04BB8 808DB428 02002825 */ or $a1, $s0, $zero ## $a1 = 06001B0C -/* 04BBC 808DB42C 468042A0 */ cvt.s.w $f10, $f8 +/* 04BBC 808DB42C 468042A0 */ cvt.s.w $f10, $f8 /* 04BC0 808DB430 E62A01CC */ swc1 $f10, 0x01CC($s1) ## 000001CC -/* 04BC4 808DB434 0C029490 */ jal func_800A5240 -/* 04BC8 808DB438 8FA4005C */ lw $a0, 0x005C($sp) +/* 04BC4 808DB434 0C029490 */ jal SkelAnime_ChangeAnimTransitionStop +/* 04BC8 808DB438 8FA4005C */ lw $a0, 0x005C($sp) /* 04BCC 808DB43C 24180001 */ addiu $t8, $zero, 0x0001 ## $t8 = 00000001 -/* 04BD0 808DB440 100001A4 */ beq $zero, $zero, .L808DBAD4 +/* 04BD0 808DB440 100001A4 */ beq $zero, $zero, .L808DBAD4 /* 04BD4 808DB444 A63801C2 */ sh $t8, 0x01C2($s1) ## 000001C2 glabel L808DB448 -/* 04BD8 808DB448 8FA4005C */ lw $a0, 0x005C($sp) -/* 04BDC 808DB44C 0C0295B2 */ jal func_800A56C8 +/* 04BD8 808DB448 8FA4005C */ lw $a0, 0x005C($sp) +/* 04BDC 808DB44C 0C0295B2 */ jal func_800A56C8 /* 04BE0 808DB450 8E2501CC */ lw $a1, 0x01CC($s1) ## 000001CC -/* 04BE4 808DB454 1040019F */ beq $v0, $zero, .L808DBAD4 +/* 04BE4 808DB454 1040019F */ beq $v0, $zero, .L808DBAD4 /* 04BE8 808DB458 3C100600 */ lui $s0, 0x0600 ## $s0 = 06000000 /* 04BEC 808DB45C 26101FF8 */ addiu $s0, $s0, 0x1FF8 ## $s0 = 06001FF8 /* 04BF0 808DB460 0C028800 */ jal SkelAnime_GetFrameCount - + /* 04BF4 808DB464 02002025 */ or $a0, $s0, $zero ## $a0 = 06001FF8 /* 04BF8 808DB468 44828000 */ mtc1 $v0, $f16 ## $f16 = 0.00 -/* 04BFC 808DB46C 4406B000 */ mfc1 $a2, $f22 +/* 04BFC 808DB46C 4406B000 */ mfc1 $a2, $f22 /* 04C00 808DB470 02002825 */ or $a1, $s0, $zero ## $a1 = 06001FF8 -/* 04C04 808DB474 468084A0 */ cvt.s.w $f18, $f16 +/* 04C04 808DB474 468084A0 */ cvt.s.w $f18, $f16 /* 04C08 808DB478 E63201CC */ swc1 $f18, 0x01CC($s1) ## 000001CC -/* 04C0C 808DB47C 0C0294D3 */ jal func_800A534C -/* 04C10 808DB480 8FA4005C */ lw $a0, 0x005C($sp) +/* 04C0C 808DB47C 0C0294D3 */ jal SkelAnime_ChangeAnimTransitionRepeat +/* 04C10 808DB480 8FA4005C */ lw $a0, 0x005C($sp) /* 04C14 808DB484 24190002 */ addiu $t9, $zero, 0x0002 ## $t9 = 00000002 /* 04C18 808DB488 24080064 */ addiu $t0, $zero, 0x0064 ## $t0 = 00000064 /* 04C1C 808DB48C A63901C2 */ sh $t9, 0x01C2($s1) ## 000001C2 -/* 04C20 808DB490 10000190 */ beq $zero, $zero, .L808DBAD4 +/* 04C20 808DB490 10000190 */ beq $zero, $zero, .L808DBAD4 /* 04C24 808DB494 A62801B6 */ sh $t0, 0x01B6($s1) ## 000001B6 glabel L808DB498 /* 04C28 808DB498 24090002 */ addiu $t1, $zero, 0x0002 ## $t1 = 00000002 /* 04C2C 808DB49C A22901A0 */ sb $t1, 0x01A0($s1) ## 000001A0 /* 04C30 808DB4A0 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 04C34 808DB4A4 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 04C38 808DB4A8 2405316C */ addiu $a1, $zero, 0x316C ## $a1 = 0000316C /* 04C3C 808DB4AC 3C014248 */ lui $at, 0x4248 ## $at = 42480000 /* 04C40 808DB4B0 44814000 */ mtc1 $at, $f8 ## $f8 = 50.00 /* 04C44 808DB4B4 C62602F0 */ lwc1 $f6, 0x02F0($s1) ## 000002F0 /* 04C48 808DB4B8 3C0141F0 */ lui $at, 0x41F0 ## $at = 41F00000 /* 04C4C 808DB4BC C62402EC */ lwc1 $f4, 0x02EC($s1) ## 000002EC -/* 04C50 808DB4C0 46083280 */ add.s $f10, $f6, $f8 +/* 04C50 808DB4C0 46083280 */ add.s $f10, $f6, $f8 /* 04C54 808DB4C4 44818000 */ mtc1 $at, $f16 ## $f16 = 30.00 /* 04C58 808DB4C8 E6240278 */ swc1 $f4, 0x0278($s1) ## 00000278 /* 04C5C 808DB4CC C62402F4 */ lwc1 $f4, 0x02F4($s1) ## 000002F4 -/* 04C60 808DB4D0 46105480 */ add.s $f18, $f10, $f16 +/* 04C60 808DB4D0 46105480 */ add.s $f18, $f10, $f16 /* 04C64 808DB4D4 26240284 */ addiu $a0, $s1, 0x0284 ## $a0 = 00000284 /* 04C68 808DB4D8 3C063DCC */ lui $a2, 0x3DCC ## $a2 = 3DCC0000 /* 04C6C 808DB4DC 3C073BC4 */ lui $a3, 0x3BC4 ## $a3 = 3BC40000 /* 04C70 808DB4E0 E632027C */ swc1 $f18, 0x027C($s1) ## 0000027C /* 04C74 808DB4E4 E6240280 */ swc1 $f4, 0x0280($s1) ## 00000280 -/* 04C78 808DB4E8 AFA40054 */ sw $a0, 0x0054($sp) +/* 04C78 808DB4E8 AFA40054 */ sw $a0, 0x0054($sp) /* 04C7C 808DB4EC 34E79BA6 */ ori $a3, $a3, 0x9BA6 ## $a3 = 3BC49BA6 /* 04C80 808DB4F0 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3DCCCCCD /* 04C84 808DB4F4 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 04C88 808DB4F8 3C053E80 */ lui $a1, 0x3E80 ## $a1 = 3E800000 /* 04C8C 808DB4FC 3C01437F */ lui $at, 0x437F ## $at = 437F0000 /* 04C90 808DB500 44810000 */ mtc1 $at, $f0 ## $f0 = 255.00 -/* 04C94 808DB504 4406A000 */ mfc1 $a2, $f20 +/* 04C94 808DB504 4406A000 */ mfc1 $a2, $f20 /* 04C98 808DB508 26240288 */ addiu $a0, $s1, 0x0288 ## $a0 = 00000288 -/* 04C9C 808DB50C 44050000 */ mfc1 $a1, $f0 -/* 04CA0 808DB510 44070000 */ mfc1 $a3, $f0 +/* 04C9C 808DB50C 44050000 */ mfc1 $a1, $f0 +/* 04CA0 808DB510 44070000 */ mfc1 $a3, $f0 /* 04CA4 808DB514 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 04CA8 808DB518 00000000 */ nop /* 04CAC 808DB51C 3C063DCC */ lui $a2, 0x3DCC ## $a2 = 3DCC0000 /* 04CB0 808DB520 3C073BC4 */ lui $a3, 0x3BC4 ## $a3 = 3BC40000 @@ -162,35 +162,35 @@ glabel L808DB498 /* 04CB8 808DB528 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3DCCCCCD /* 04CBC 808DB52C 2624028C */ addiu $a0, $s1, 0x028C ## $a0 = 0000028C /* 04CC0 808DB530 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 04CC4 808DB534 3C053E80 */ lui $a1, 0x3E80 ## $a1 = 3E800000 /* 04CC8 808DB538 862201B6 */ lh $v0, 0x01B6($s1) ## 000001B6 -/* 04CCC 808DB53C 28410015 */ slti $at, $v0, 0x0015 -/* 04CD0 808DB540 14200008 */ bne $at, $zero, .L808DB564 -/* 04CD4 808DB544 2841003C */ slti $at, $v0, 0x003C -/* 04CD8 808DB548 10200006 */ beq $at, $zero, .L808DB564 +/* 04CCC 808DB53C 28410015 */ slti $at, $v0, 0x0015 +/* 04CD0 808DB540 14200008 */ bne $at, $zero, .L808DB564 +/* 04CD4 808DB544 2841003C */ slti $at, $v0, 0x003C +/* 04CD8 808DB548 10200006 */ beq $at, $zero, .L808DB564 /* 04CDC 808DB54C 26240290 */ addiu $a0, $s1, 0x0290 ## $a0 = 00000290 -/* 04CE0 808DB550 4406A000 */ mfc1 $a2, $f20 +/* 04CE0 808DB550 4406A000 */ mfc1 $a2, $f20 /* 04CE4 808DB554 3C05437F */ lui $a1, 0x437F ## $a1 = 437F0000 /* 04CE8 808DB558 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 04CEC 808DB55C 3C074170 */ lui $a3, 0x4170 ## $a3 = 41700000 /* 04CF0 808DB560 862201B6 */ lh $v0, 0x01B6($s1) ## 000001B6 .L808DB564: -/* 04CF4 808DB564 14400017 */ bne $v0, $zero, .L808DB5C4 +/* 04CF4 808DB564 14400017 */ bne $v0, $zero, .L808DB5C4 /* 04CF8 808DB568 262400B6 */ addiu $a0, $s1, 0x00B6 ## $a0 = 000000B6 /* 04CFC 808DB56C 3C100600 */ lui $s0, 0x0600 ## $s0 = 06000000 /* 04D00 808DB570 26100540 */ addiu $s0, $s0, 0x0540 ## $s0 = 06000540 /* 04D04 808DB574 0C028800 */ jal SkelAnime_GetFrameCount - + /* 04D08 808DB578 02002025 */ or $a0, $s0, $zero ## $a0 = 06000540 /* 04D0C 808DB57C 44823000 */ mtc1 $v0, $f6 ## $f6 = 0.00 -/* 04D10 808DB580 4406B000 */ mfc1 $a2, $f22 +/* 04D10 808DB580 4406B000 */ mfc1 $a2, $f22 /* 04D14 808DB584 02002825 */ or $a1, $s0, $zero ## $a1 = 06000540 -/* 04D18 808DB588 46803220 */ cvt.s.w $f8, $f6 +/* 04D18 808DB588 46803220 */ cvt.s.w $f8, $f6 /* 04D1C 808DB58C E62801CC */ swc1 $f8, 0x01CC($s1) ## 000001CC -/* 04D20 808DB590 0C029490 */ jal func_800A5240 -/* 04D24 808DB594 8FA4005C */ lw $a0, 0x005C($sp) +/* 04D20 808DB590 0C029490 */ jal SkelAnime_ChangeAnimTransitionStop +/* 04D24 808DB594 8FA4005C */ lw $a0, 0x005C($sp) /* 04D28 808DB598 240A0003 */ addiu $t2, $zero, 0x0003 ## $t2 = 00000003 /* 04D2C 808DB59C 240B0006 */ addiu $t3, $zero, 0x0006 ## $t3 = 00000006 /* 04D30 808DB5A0 240C000F */ addiu $t4, $zero, 0x000F ## $t4 = 0000000F @@ -199,95 +199,95 @@ glabel L808DB498 /* 04D3C 808DB5AC A62C01B8 */ sh $t4, 0x01B8($s1) ## 000001B8 /* 04D40 808DB5B0 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 04D44 808DB5B4 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 04D48 808DB5B8 240539D5 */ addiu $a1, $zero, 0x39D5 ## $a1 = 000039D5 -/* 04D4C 808DB5BC 10000146 */ beq $zero, $zero, .L808DBAD8 -/* 04D50 808DB5C0 8FBF004C */ lw $ra, 0x004C($sp) +/* 04D4C 808DB5BC 10000146 */ beq $zero, $zero, .L808DBAD8 +/* 04D50 808DB5C0 8FBF004C */ lw $ra, 0x004C($sp) .L808DB5C4: /* 04D54 808DB5C4 8625008A */ lh $a1, 0x008A($s1) ## 0000008A /* 04D58 808DB5C8 24060005 */ addiu $a2, $zero, 0x0005 ## $a2 = 00000005 /* 04D5C 808DB5CC 0C01E1EF */ jal Math_SmoothScaleMaxS - + /* 04D60 808DB5D0 240703E8 */ addiu $a3, $zero, 0x03E8 ## $a3 = 000003E8 /* 04D64 808DB5D4 862201B6 */ lh $v0, 0x01B6($s1) ## 000001B6 /* 04D68 808DB5D8 00008025 */ or $s0, $zero, $zero ## $s0 = 00000000 -/* 04D6C 808DB5DC 2841FFFC */ slti $at, $v0, 0xFFFC -/* 04D70 808DB5E0 1020000F */ beq $at, $zero, .L808DB620 -/* 04D74 808DB5E4 00106880 */ sll $t5, $s0, 2 +/* 04D6C 808DB5DC 2841FFFC */ slti $at, $v0, 0xFFFC +/* 04D70 808DB5E0 1020000F */ beq $at, $zero, .L808DB620 +/* 04D74 808DB5E4 00106880 */ sll $t5, $s0, 2 .L808DB5E8: -/* 04D78 808DB5E8 022D2021 */ addu $a0, $s1, $t5 -/* 04D7C 808DB5EC 4405B000 */ mfc1 $a1, $f22 -/* 04D80 808DB5F0 4406A000 */ mfc1 $a2, $f20 +/* 04D78 808DB5E8 022D2021 */ addu $a0, $s1, $t5 +/* 04D7C 808DB5EC 4405B000 */ mfc1 $a1, $f22 +/* 04D80 808DB5F0 4406A000 */ mfc1 $a2, $f20 /* 04D84 808DB5F4 24840294 */ addiu $a0, $a0, 0x0294 ## $a0 = 00000294 /* 04D88 808DB5F8 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 04D8C 808DB5FC 3C074220 */ lui $a3, 0x4220 ## $a3 = 42200000 /* 04D90 808DB600 26100001 */ addiu $s0, $s0, 0x0001 ## $s0 = 00000001 -/* 04D94 808DB604 00108400 */ sll $s0, $s0, 16 -/* 04D98 808DB608 00108403 */ sra $s0, $s0, 16 -/* 04D9C 808DB60C 2A01000F */ slti $at, $s0, 0x000F -/* 04DA0 808DB610 5420FFF5 */ bnel $at, $zero, .L808DB5E8 -/* 04DA4 808DB614 00106880 */ sll $t5, $s0, 2 -/* 04DA8 808DB618 1000001D */ beq $zero, $zero, .L808DB690 +/* 04D94 808DB604 00108400 */ sll $s0, $s0, 16 +/* 04D98 808DB608 00108403 */ sra $s0, $s0, 16 +/* 04D9C 808DB60C 2A01000F */ slti $at, $s0, 0x000F +/* 04DA0 808DB610 5420FFF5 */ bnel $at, $zero, .L808DB5E8 +/* 04DA4 808DB614 00106880 */ sll $t5, $s0, 2 +/* 04DA8 808DB618 1000001D */ beq $zero, $zero, .L808DB690 /* 04DAC 808DB61C 862201B6 */ lh $v0, 0x01B6($s1) ## 000001B6 .L808DB620: -/* 04DB0 808DB620 28410007 */ slti $at, $v0, 0x0007 -/* 04DB4 808DB624 14200019 */ bne $at, $zero, .L808DB68C -/* 04DB8 808DB628 2841001A */ slti $at, $v0, 0x001A -/* 04DBC 808DB62C 50200018 */ beql $at, $zero, .L808DB690 +/* 04DB0 808DB620 28410007 */ slti $at, $v0, 0x0007 +/* 04DB4 808DB624 14200019 */ bne $at, $zero, .L808DB68C +/* 04DB8 808DB628 2841001A */ slti $at, $v0, 0x001A +/* 04DBC 808DB62C 50200018 */ beql $at, $zero, .L808DB690 /* 04DC0 808DB630 862201B6 */ lh $v0, 0x01B6($s1) ## 000001B6 /* 04DC4 808DB634 862201AC */ lh $v0, 0x01AC($s1) ## 000001AC -/* 04DC8 808DB638 2841000F */ slti $at, $v0, 0x000F -/* 04DCC 808DB63C 10200003 */ beq $at, $zero, .L808DB64C +/* 04DC8 808DB638 2841000F */ slti $at, $v0, 0x000F +/* 04DCC 808DB63C 10200003 */ beq $at, $zero, .L808DB64C /* 04DD0 808DB640 244E0001 */ addiu $t6, $v0, 0x0001 ## $t6 = 00000001 /* 04DD4 808DB644 A62E01AC */ sh $t6, 0x01AC($s1) ## 000001AC /* 04DD8 808DB648 862201AC */ lh $v0, 0x01AC($s1) ## 000001AC .L808DB64C: -/* 04DDC 808DB64C 1840000F */ blez $v0, .L808DB68C +/* 04DDC 808DB64C 1840000F */ blez $v0, .L808DB68C /* 04DE0 808DB650 00008025 */ or $s0, $zero, $zero ## $s0 = 00000000 -/* 04DE4 808DB654 00107880 */ sll $t7, $s0, 2 +/* 04DE4 808DB654 00107880 */ sll $t7, $s0, 2 .L808DB658: -/* 04DE8 808DB658 022F2021 */ addu $a0, $s1, $t7 -/* 04DEC 808DB65C 4406A000 */ mfc1 $a2, $f20 +/* 04DE8 808DB658 022F2021 */ addu $a0, $s1, $t7 +/* 04DEC 808DB65C 4406A000 */ mfc1 $a2, $f20 /* 04DF0 808DB660 24840294 */ addiu $a0, $a0, 0x0294 ## $a0 = 00000294 /* 04DF4 808DB664 3C054348 */ lui $a1, 0x4348 ## $a1 = 43480000 /* 04DF8 808DB668 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 04DFC 808DB66C 3C074220 */ lui $a3, 0x4220 ## $a3 = 42200000 /* 04E00 808DB670 863801AC */ lh $t8, 0x01AC($s1) ## 000001AC /* 04E04 808DB674 26100001 */ addiu $s0, $s0, 0x0001 ## $s0 = 00000001 -/* 04E08 808DB678 00108400 */ sll $s0, $s0, 16 -/* 04E0C 808DB67C 00108403 */ sra $s0, $s0, 16 -/* 04E10 808DB680 0218082A */ slt $at, $s0, $t8 -/* 04E14 808DB684 5420FFF4 */ bnel $at, $zero, .L808DB658 -/* 04E18 808DB688 00107880 */ sll $t7, $s0, 2 +/* 04E08 808DB678 00108400 */ sll $s0, $s0, 16 +/* 04E0C 808DB67C 00108403 */ sra $s0, $s0, 16 +/* 04E10 808DB680 0218082A */ slt $at, $s0, $t8 +/* 04E14 808DB684 5420FFF4 */ bnel $at, $zero, .L808DB658 +/* 04E18 808DB688 00107880 */ sll $t7, $s0, 2 .L808DB68C: /* 04E1C 808DB68C 862201B6 */ lh $v0, 0x01B6($s1) ## 000001B6 .L808DB690: -/* 04E20 808DB690 8FA40054 */ lw $a0, 0x0054($sp) +/* 04E20 808DB690 8FA40054 */ lw $a0, 0x0054($sp) /* 04E24 808DB694 3C053ECC */ lui $a1, 0x3ECC ## $a1 = 3ECC0000 -/* 04E28 808DB698 2841001F */ slti $at, $v0, 0x001F -/* 04E2C 808DB69C 1020000A */ beq $at, $zero, .L808DB6C8 +/* 04E28 808DB698 2841001F */ slti $at, $v0, 0x001F +/* 04E2C 808DB69C 1020000A */ beq $at, $zero, .L808DB6C8 /* 04E30 808DB6A0 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 /* 04E34 808DB6A4 4481A000 */ mtc1 $at, $f20 ## $f20 = 0.50 /* 04E38 808DB6A8 3C073C8B */ lui $a3, 0x3C8B ## $a3 = 3C8B0000 /* 04E3C 808DB6AC 34E74396 */ ori $a3, $a3, 0x4396 ## $a3 = 3C8B4396 -/* 04E40 808DB6B0 4406A000 */ mfc1 $a2, $f20 +/* 04E40 808DB6B0 4406A000 */ mfc1 $a2, $f20 /* 04E44 808DB6B4 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 04E48 808DB6B8 34A5CCCD */ ori $a1, $a1, 0xCCCD ## $a1 = 3ECCCCCD /* 04E4C 808DB6BC C62A0284 */ lwc1 $f10, 0x0284($s1) ## 00000284 /* 04E50 808DB6C0 862201B6 */ lh $v0, 0x01B6($s1) ## 000001B6 /* 04E54 808DB6C4 E62A028C */ swc1 $f10, 0x028C($s1) ## 0000028C .L808DB6C8: -/* 04E58 808DB6C8 2841001F */ slti $at, $v0, 0x001F -/* 04E5C 808DB6CC 10200013 */ beq $at, $zero, .L808DB71C +/* 04E58 808DB6C8 2841001F */ slti $at, $v0, 0x001F +/* 04E5C 808DB6CC 10200013 */ beq $at, $zero, .L808DB71C /* 04E60 808DB6D0 262402D0 */ addiu $a0, $s1, 0x02D0 ## $a0 = 000002D0 /* 04E64 808DB6D4 3C063DCC */ lui $a2, 0x3DCC ## $a2 = 3DCC0000 /* 04E68 808DB6D8 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3DCCCCCD /* 04E6C 808DB6DC 3C054234 */ lui $a1, 0x4234 ## $a1 = 42340000 /* 04E70 808DB6E0 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 04E74 808DB6E4 3C074120 */ lui $a3, 0x4120 ## $a3 = 41200000 /* 04E78 808DB6E8 8E2B0278 */ lw $t3, 0x0278($s1) ## 00000278 /* 04E7C 808DB6EC 24190001 */ addiu $t9, $zero, 0x0001 ## $t9 = 00000001 @@ -304,281 +304,281 @@ glabel L808DB498 /* 04EA8 808DB718 862201B6 */ lh $v0, 0x01B6($s1) ## 000001B6 .L808DB71C: /* 04EAC 808DB71C 2401002F */ addiu $at, $zero, 0x002F ## $at = 0000002F -/* 04EB0 808DB720 14410003 */ bne $v0, $at, .L808DB730 +/* 04EB0 808DB720 14410003 */ bne $v0, $at, .L808DB730 /* 04EB4 808DB724 240C0001 */ addiu $t4, $zero, 0x0001 ## $t4 = 00000001 /* 04EB8 808DB728 A22C0274 */ sb $t4, 0x0274($s1) ## 00000274 /* 04EBC 808DB72C 862201B6 */ lh $v0, 0x01B6($s1) ## 000001B6 .L808DB730: /* 04EC0 808DB730 2401002E */ addiu $at, $zero, 0x002E ## $at = 0000002E -/* 04EC4 808DB734 14410003 */ bne $v0, $at, .L808DB744 +/* 04EC4 808DB734 14410003 */ bne $v0, $at, .L808DB744 /* 04EC8 808DB738 240D0002 */ addiu $t5, $zero, 0x0002 ## $t5 = 00000002 /* 04ECC 808DB73C A22D0274 */ sb $t5, 0x0274($s1) ## 00000274 /* 04ED0 808DB740 862201B6 */ lh $v0, 0x01B6($s1) ## 000001B6 .L808DB744: /* 04ED4 808DB744 2401002D */ addiu $at, $zero, 0x002D ## $at = 0000002D -/* 04ED8 808DB748 14410003 */ bne $v0, $at, .L808DB758 +/* 04ED8 808DB748 14410003 */ bne $v0, $at, .L808DB758 /* 04EDC 808DB74C 240E0003 */ addiu $t6, $zero, 0x0003 ## $t6 = 00000003 /* 04EE0 808DB750 A22E0274 */ sb $t6, 0x0274($s1) ## 00000274 /* 04EE4 808DB754 862201B6 */ lh $v0, 0x01B6($s1) ## 000001B6 .L808DB758: /* 04EE8 808DB758 2401002C */ addiu $at, $zero, 0x002C ## $at = 0000002C -/* 04EEC 808DB75C 14410003 */ bne $v0, $at, .L808DB76C +/* 04EEC 808DB75C 14410003 */ bne $v0, $at, .L808DB76C /* 04EF0 808DB760 240F0004 */ addiu $t7, $zero, 0x0004 ## $t7 = 00000004 /* 04EF4 808DB764 A22F0274 */ sb $t7, 0x0274($s1) ## 00000274 /* 04EF8 808DB768 862201B6 */ lh $v0, 0x01B6($s1) ## 000001B6 .L808DB76C: /* 04EFC 808DB76C 2401002B */ addiu $at, $zero, 0x002B ## $at = 0000002B -/* 04F00 808DB770 14410003 */ bne $v0, $at, .L808DB780 +/* 04F00 808DB770 14410003 */ bne $v0, $at, .L808DB780 /* 04F04 808DB774 24180005 */ addiu $t8, $zero, 0x0005 ## $t8 = 00000005 /* 04F08 808DB778 A2380274 */ sb $t8, 0x0274($s1) ## 00000274 /* 04F0C 808DB77C 862201B6 */ lh $v0, 0x01B6($s1) ## 000001B6 .L808DB780: /* 04F10 808DB780 2401002A */ addiu $at, $zero, 0x002A ## $at = 0000002A -/* 04F14 808DB784 14410003 */ bne $v0, $at, .L808DB794 +/* 04F14 808DB784 14410003 */ bne $v0, $at, .L808DB794 /* 04F18 808DB788 24190006 */ addiu $t9, $zero, 0x0006 ## $t9 = 00000006 /* 04F1C 808DB78C A2390274 */ sb $t9, 0x0274($s1) ## 00000274 /* 04F20 808DB790 862201B6 */ lh $v0, 0x01B6($s1) ## 000001B6 .L808DB794: -/* 04F24 808DB794 2841001F */ slti $at, $v0, 0x001F -/* 04F28 808DB798 142000CE */ bne $at, $zero, .L808DBAD4 +/* 04F24 808DB794 2841001F */ slti $at, $v0, 0x001F +/* 04F28 808DB798 142000CE */ bne $at, $zero, .L808DBAD4 /* 04F2C 808DB79C 3C014120 */ lui $at, 0x4120 ## $at = 41200000 /* 04F30 808DB7A0 44816000 */ mtc1 $at, $f12 ## $f12 = 10.00 /* 04F34 808DB7A4 0C00CFBE */ jal Math_Rand_ZeroFloat - -/* 04F38 808DB7A8 E7B60074 */ swc1 $f22, 0x0074($sp) + +/* 04F38 808DB7A8 E7B60074 */ swc1 $f22, 0x0074($sp) /* 04F3C 808DB7AC 3C014316 */ lui $at, 0x4316 ## $at = 43160000 /* 04F40 808DB7B0 44818000 */ mtc1 $at, $f16 ## $f16 = 150.00 -/* 04F44 808DB7B4 E7B6007C */ swc1 $f22, 0x007C($sp) +/* 04F44 808DB7B4 E7B6007C */ swc1 $f22, 0x007C($sp) /* 04F48 808DB7B8 3C014700 */ lui $at, 0x4700 ## $at = 47000000 -/* 04F4C 808DB7BC 46100480 */ add.s $f18, $f0, $f16 +/* 04F4C 808DB7BC 46100480 */ add.s $f18, $f0, $f16 /* 04F50 808DB7C0 44814000 */ mtc1 $at, $f8 ## $f8 = 32768.00 /* 04F54 808DB7C4 3C01808F */ lui $at, %hi(D_808F7FE8) ## $at = 808F0000 -/* 04F58 808DB7C8 C4307FE8 */ lwc1 $f16, %lo(D_808F7FE8)($at) -/* 04F5C 808DB7CC E7B20078 */ swc1 $f18, 0x0078($sp) +/* 04F58 808DB7C8 C4307FE8 */ lwc1 $f16, %lo(D_808F7FE8)($at) +/* 04F5C 808DB7CC E7B20078 */ swc1 $f18, 0x0078($sp) /* 04F60 808DB7D0 8628008A */ lh $t0, 0x008A($s1) ## 0000008A /* 04F64 808DB7D4 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 04F68 808DB7D8 44882000 */ mtc1 $t0, $f4 ## $f4 = 0.00 /* 04F6C 808DB7DC 00000000 */ nop -/* 04F70 808DB7E0 468021A0 */ cvt.s.w $f6, $f4 -/* 04F74 808DB7E4 46083283 */ div.s $f10, $f6, $f8 -/* 04F78 808DB7E8 46105302 */ mul.s $f12, $f10, $f16 -/* 04F7C 808DB7EC 0C034348 */ jal Matrix_RotateY +/* 04F70 808DB7E0 468021A0 */ cvt.s.w $f6, $f4 +/* 04F74 808DB7E4 46083283 */ div.s $f10, $f6, $f8 +/* 04F78 808DB7E8 46105302 */ mul.s $f12, $f10, $f16 +/* 04F7C 808DB7EC 0C034348 */ jal Matrix_RotateY /* 04F80 808DB7F0 00000000 */ nop /* 04F84 808DB7F4 3C014780 */ lui $at, 0x4780 ## $at = 47800000 /* 04F88 808DB7F8 44816000 */ mtc1 $at, $f12 ## $f12 = 65536.00 /* 04F8C 808DB7FC 0C00CFBE */ jal Math_Rand_ZeroFloat - + /* 04F90 808DB800 00000000 */ nop -/* 04F94 808DB804 46000306 */ mov.s $f12, $f0 -/* 04F98 808DB808 0C0343B5 */ jal Matrix_RotateZ +/* 04F94 808DB804 46000306 */ mov.s $f12, $f0 +/* 04F98 808DB808 0C0343B5 */ jal Matrix_RotateZ /* 04F9C 808DB80C 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 /* 04FA0 808DB810 27A40074 */ addiu $a0, $sp, 0x0074 ## $a0 = FFFFFFDC -/* 04FA4 808DB814 0C0346BD */ jal Matrix_MultVec3f +/* 04FA4 808DB814 0C0346BD */ jal Matrix_MultVec3f /* 04FA8 808DB818 27A50068 */ addiu $a1, $sp, 0x0068 ## $a1 = FFFFFFD0 /* 04FAC 808DB81C C6320278 */ lwc1 $f18, 0x0278($s1) ## 00000278 -/* 04FB0 808DB820 C7A40068 */ lwc1 $f4, 0x0068($sp) -/* 04FB4 808DB824 C7AA006C */ lwc1 $f10, 0x006C($sp) -/* 04FB8 808DB828 8FA4009C */ lw $a0, 0x009C($sp) -/* 04FBC 808DB82C 46049180 */ add.s $f6, $f18, $f4 -/* 04FC0 808DB830 C7A40070 */ lwc1 $f4, 0x0070($sp) +/* 04FB0 808DB820 C7A40068 */ lwc1 $f4, 0x0068($sp) +/* 04FB4 808DB824 C7AA006C */ lwc1 $f10, 0x006C($sp) +/* 04FB8 808DB828 8FA4009C */ lw $a0, 0x009C($sp) +/* 04FBC 808DB82C 46049180 */ add.s $f6, $f18, $f4 +/* 04FC0 808DB830 C7A40070 */ lwc1 $f4, 0x0070($sp) /* 04FC4 808DB834 27A50080 */ addiu $a1, $sp, 0x0080 ## $a1 = FFFFFFE8 /* 04FC8 808DB838 3C0641A0 */ lui $a2, 0x41A0 ## $a2 = 41A00000 -/* 04FCC 808DB83C E7A60080 */ swc1 $f6, 0x0080($sp) +/* 04FCC 808DB83C E7A60080 */ swc1 $f6, 0x0080($sp) /* 04FD0 808DB840 C628027C */ lwc1 $f8, 0x027C($s1) ## 0000027C -/* 04FD4 808DB844 460A4400 */ add.s $f16, $f8, $f10 -/* 04FD8 808DB848 E7B00084 */ swc1 $f16, 0x0084($sp) +/* 04FD4 808DB844 460A4400 */ add.s $f16, $f8, $f10 +/* 04FD8 808DB848 E7B00084 */ swc1 $f16, 0x0084($sp) /* 04FDC 808DB84C C6320280 */ lwc1 $f18, 0x0280($s1) ## 00000280 -/* 04FE0 808DB850 46049180 */ add.s $f6, $f18, $f4 -/* 04FE4 808DB854 0C235C0D */ jal func_808D7034 -/* 04FE8 808DB858 E7A60088 */ swc1 $f6, 0x0088($sp) -/* 04FEC 808DB85C 1000009E */ beq $zero, $zero, .L808DBAD8 -/* 04FF0 808DB860 8FBF004C */ lw $ra, 0x004C($sp) +/* 04FE0 808DB850 46049180 */ add.s $f6, $f18, $f4 +/* 04FE4 808DB854 0C235C0D */ jal func_808D7034 +/* 04FE8 808DB858 E7A60088 */ swc1 $f6, 0x0088($sp) +/* 04FEC 808DB85C 1000009E */ beq $zero, $zero, .L808DBAD8 +/* 04FF0 808DB860 8FBF004C */ lw $ra, 0x004C($sp) glabel L808DB864 /* 04FF4 808DB864 24090002 */ addiu $t1, $zero, 0x0002 ## $t1 = 00000002 /* 04FF8 808DB868 A22901A0 */ sb $t1, 0x01A0($s1) ## 000001A0 /* 04FFC 808DB86C 00008025 */ or $s0, $zero, $zero ## $s0 = 00000000 -/* 05000 808DB870 00105080 */ sll $t2, $s0, 2 +/* 05000 808DB870 00105080 */ sll $t2, $s0, 2 .L808DB874: -/* 05004 808DB874 022A2021 */ addu $a0, $s1, $t2 -/* 05008 808DB878 4405B000 */ mfc1 $a1, $f22 -/* 0500C 808DB87C 4406A000 */ mfc1 $a2, $f20 +/* 05004 808DB874 022A2021 */ addu $a0, $s1, $t2 +/* 05008 808DB878 4405B000 */ mfc1 $a1, $f22 +/* 0500C 808DB87C 4406A000 */ mfc1 $a2, $f20 /* 05010 808DB880 24840294 */ addiu $a0, $a0, 0x0294 ## $a0 = 00000294 /* 05014 808DB884 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 05018 808DB888 3C074220 */ lui $a3, 0x4220 ## $a3 = 42200000 /* 0501C 808DB88C 26100001 */ addiu $s0, $s0, 0x0001 ## $s0 = 00000001 -/* 05020 808DB890 00108400 */ sll $s0, $s0, 16 -/* 05024 808DB894 00108403 */ sra $s0, $s0, 16 -/* 05028 808DB898 2A01000F */ slti $at, $s0, 0x000F -/* 0502C 808DB89C 5420FFF5 */ bnel $at, $zero, .L808DB874 -/* 05030 808DB8A0 00105080 */ sll $t2, $s0, 2 +/* 05020 808DB890 00108400 */ sll $s0, $s0, 16 +/* 05024 808DB894 00108403 */ sra $s0, $s0, 16 +/* 05028 808DB898 2A01000F */ slti $at, $s0, 0x000F +/* 0502C 808DB89C 5420FFF5 */ bnel $at, $zero, .L808DB874 +/* 05030 808DB8A0 00105080 */ sll $t2, $s0, 2 /* 05034 808DB8A4 862201B6 */ lh $v0, 0x01B6($s1) ## 000001B6 /* 05038 808DB8A8 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 /* 0503C 808DB8AC 3C0B8090 */ lui $t3, %hi(D_808F93C0) ## $t3 = 80900000 -/* 05040 808DB8B0 14410008 */ bne $v0, $at, .L808DB8D4 +/* 05040 808DB8B0 14410008 */ bne $v0, $at, .L808DB8D4 /* 05044 808DB8B4 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 05048 808DB8B8 3C014170 */ lui $at, 0x4170 ## $at = 41700000 /* 0504C 808DB8BC 44814000 */ mtc1 $at, $f8 ## $f8 = 15.00 -/* 05050 808DB8C0 8D6B93C0 */ lw $t3, %lo(D_808F93C0)($t3) +/* 05050 808DB8C0 8D6B93C0 */ lw $t3, %lo(D_808F93C0)($t3) /* 05054 808DB8C4 240528C7 */ addiu $a1, $zero, 0x28C7 ## $a1 = 000028C7 /* 05058 808DB8C8 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 0505C 808DB8CC E56816C0 */ swc1 $f8, 0x16C0($t3) ## 809016C0 /* 05060 808DB8D0 862201B6 */ lh $v0, 0x01B6($s1) ## 000001B6 .L808DB8D4: -/* 05064 808DB8D4 1440001C */ bne $v0, $zero, .L808DB948 +/* 05064 808DB8D4 1440001C */ bne $v0, $zero, .L808DB948 /* 05068 808DB8D8 26240284 */ addiu $a0, $s1, 0x0284 ## $a0 = 00000284 -/* 0506C 808DB8DC 4405A000 */ mfc1 $a1, $f20 +/* 0506C 808DB8DC 4405A000 */ mfc1 $a1, $f20 /* 05070 808DB8E0 3C063DA3 */ lui $a2, 0x3DA3 ## $a2 = 3DA30000 /* 05074 808DB8E4 0C01E123 */ jal Math_SmoothDownscaleMaxF - + /* 05078 808DB8E8 34C6D70A */ ori $a2, $a2, 0xD70A ## $a2 = 3DA3D70A /* 0507C 808DB8EC C62A0284 */ lwc1 $f10, 0x0284($s1) ## 00000284 -/* 05080 808DB8F0 4405A000 */ mfc1 $a1, $f20 +/* 05080 808DB8F0 4405A000 */ mfc1 $a1, $f20 /* 05084 808DB8F4 262402D0 */ addiu $a0, $s1, 0x02D0 ## $a0 = 000002D0 /* 05088 808DB8F8 3C064120 */ lui $a2, 0x4120 ## $a2 = 41200000 /* 0508C 808DB8FC 0C01E123 */ jal Math_SmoothDownscaleMaxF - + /* 05090 808DB900 E62A028C */ swc1 $f10, 0x028C($s1) ## 0000028C /* 05094 808DB904 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 /* 05098 808DB908 4481A000 */ mtc1 $at, $f20 ## $f20 = 0.50 /* 0509C 808DB90C 26240278 */ addiu $a0, $s1, 0x0278 ## $a0 = 00000278 /* 050A0 808DB910 8E2501FC */ lw $a1, 0x01FC($s1) ## 000001FC -/* 050A4 808DB914 4406A000 */ mfc1 $a2, $f20 +/* 050A4 808DB914 4406A000 */ mfc1 $a2, $f20 /* 050A8 808DB918 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 050AC 808DB91C 3C0741F0 */ lui $a3, 0x41F0 ## $a3 = 41F00000 -/* 050B0 808DB920 4406A000 */ mfc1 $a2, $f20 +/* 050B0 808DB920 4406A000 */ mfc1 $a2, $f20 /* 050B4 808DB924 2624027C */ addiu $a0, $s1, 0x027C ## $a0 = 0000027C /* 050B8 808DB928 8E250200 */ lw $a1, 0x0200($s1) ## 00000200 /* 050BC 808DB92C 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 050C0 808DB930 3C0741F0 */ lui $a3, 0x41F0 ## $a3 = 41F00000 -/* 050C4 808DB934 4406A000 */ mfc1 $a2, $f20 +/* 050C4 808DB934 4406A000 */ mfc1 $a2, $f20 /* 050C8 808DB938 26240280 */ addiu $a0, $s1, 0x0280 ## $a0 = 00000280 /* 050CC 808DB93C 8E250204 */ lw $a1, 0x0204($s1) ## 00000204 /* 050D0 808DB940 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 050D4 808DB944 3C0741F0 */ lui $a3, 0x41F0 ## $a3 = 41F00000 .L808DB948: /* 050D8 808DB948 862C01B8 */ lh $t4, 0x01B8($s1) ## 000001B8 /* 050DC 808DB94C 3C100600 */ lui $s0, 0x0600 ## $s0 = 06000000 /* 050E0 808DB950 26100FE8 */ addiu $s0, $s0, 0x0FE8 ## $s0 = 06000FE8 -/* 050E4 808DB954 55800060 */ bnel $t4, $zero, .L808DBAD8 -/* 050E8 808DB958 8FBF004C */ lw $ra, 0x004C($sp) +/* 050E4 808DB954 55800060 */ bnel $t4, $zero, .L808DBAD8 +/* 050E8 808DB958 8FBF004C */ lw $ra, 0x004C($sp) /* 050EC 808DB95C 0C028800 */ jal SkelAnime_GetFrameCount - + /* 050F0 808DB960 02002025 */ or $a0, $s0, $zero ## $a0 = 06000FE8 /* 050F4 808DB964 44828000 */ mtc1 $v0, $f16 ## $f16 = 0.00 -/* 050F8 808DB968 4406B000 */ mfc1 $a2, $f22 +/* 050F8 808DB968 4406B000 */ mfc1 $a2, $f22 /* 050FC 808DB96C 02002825 */ or $a1, $s0, $zero ## $a1 = 06000FE8 -/* 05100 808DB970 468084A0 */ cvt.s.w $f18, $f16 +/* 05100 808DB970 468084A0 */ cvt.s.w $f18, $f16 /* 05104 808DB974 E63201CC */ swc1 $f18, 0x01CC($s1) ## 000001CC -/* 05108 808DB978 0C0294D3 */ jal func_800A534C -/* 0510C 808DB97C 8FA4005C */ lw $a0, 0x005C($sp) +/* 05108 808DB978 0C0294D3 */ jal SkelAnime_ChangeAnimTransitionRepeat +/* 0510C 808DB97C 8FA4005C */ lw $a0, 0x005C($sp) /* 05110 808DB980 240D0004 */ addiu $t5, $zero, 0x0004 ## $t5 = 00000004 /* 05114 808DB984 A62D01C2 */ sh $t5, 0x01C2($s1) ## 000001C2 /* 05118 808DB988 E6360288 */ swc1 $f22, 0x0288($s1) ## 00000288 /* 0511C 808DB98C E6360290 */ swc1 $f22, 0x0290($s1) ## 00000290 /* 05120 808DB990 E6360284 */ swc1 $f22, 0x0284($s1) ## 00000284 -/* 05124 808DB994 1000004F */ beq $zero, $zero, .L808DBAD4 +/* 05124 808DB994 1000004F */ beq $zero, $zero, .L808DBAD4 /* 05128 808DB998 E636028C */ swc1 $f22, 0x028C($s1) ## 0000028C glabel L808DB99C /* 0512C 808DB99C 240E0002 */ addiu $t6, $zero, 0x0002 ## $t6 = 00000002 /* 05130 808DB9A0 A22E01A0 */ sb $t6, 0x01A0($s1) ## 000001A0 -/* 05134 808DB9A4 8FA4005C */ lw $a0, 0x005C($sp) -/* 05138 808DB9A8 0C0295B2 */ jal func_800A56C8 +/* 05134 808DB9A4 8FA4005C */ lw $a0, 0x005C($sp) +/* 05138 808DB9A8 0C0295B2 */ jal func_800A56C8 /* 0513C 808DB9AC 3C0540A0 */ lui $a1, 0x40A0 ## $a1 = 40A00000 -/* 05140 808DB9B0 10400021 */ beq $v0, $zero, .L808DBA38 -/* 05144 808DB9B4 8FA6009C */ lw $a2, 0x009C($sp) +/* 05140 808DB9B0 10400021 */ beq $v0, $zero, .L808DBA38 +/* 05144 808DB9B4 8FA6009C */ lw $a2, 0x009C($sp) /* 05148 808DB9B8 24C41C24 */ addiu $a0, $a2, 0x1C24 ## $a0 = 00001C24 -/* 0514C 808DB9BC AFA40058 */ sw $a0, 0x0058($sp) +/* 0514C 808DB9BC AFA40058 */ sw $a0, 0x0058($sp) /* 05150 808DB9C0 00008025 */ or $s0, $zero, $zero ## $s0 = 00000000 /* 05154 808DB9C4 C62401FC */ lwc1 $f4, 0x01FC($s1) ## 000001FC .L808DB9C8: /* 05158 808DB9C8 26180104 */ addiu $t8, $s0, 0x0104 ## $t8 = 00000104 -/* 0515C 808DB9CC 8FA40058 */ lw $a0, 0x0058($sp) -/* 05160 808DB9D0 E7A40010 */ swc1 $f4, 0x0010($sp) +/* 0515C 808DB9CC 8FA40058 */ lw $a0, 0x0058($sp) +/* 05160 808DB9D0 E7A40010 */ swc1 $f4, 0x0010($sp) /* 05164 808DB9D4 C6260200 */ lwc1 $f6, 0x0200($s1) ## 00000200 -/* 05168 808DB9D8 8FA6009C */ lw $a2, 0x009C($sp) +/* 05168 808DB9D8 8FA6009C */ lw $a2, 0x009C($sp) /* 0516C 808DB9DC 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 05170 808DB9E0 E7A60014 */ swc1 $f6, 0x0014($sp) +/* 05170 808DB9E0 E7A60014 */ swc1 $f6, 0x0014($sp) /* 05174 808DB9E4 C6280204 */ lwc1 $f8, 0x0204($s1) ## 00000204 -/* 05178 808DB9E8 AFA0001C */ sw $zero, 0x001C($sp) +/* 05178 808DB9E8 AFA0001C */ sw $zero, 0x001C($sp) /* 0517C 808DB9EC 240700E8 */ addiu $a3, $zero, 0x00E8 ## $a3 = 000000E8 -/* 05180 808DB9F0 E7A80018 */ swc1 $f8, 0x0018($sp) +/* 05180 808DB9F0 E7A80018 */ swc1 $f8, 0x0018($sp) /* 05184 808DB9F4 862F008A */ lh $t7, 0x008A($s1) ## 0000008A -/* 05188 808DB9F8 AFB80028 */ sw $t8, 0x0028($sp) -/* 0518C 808DB9FC AFA00024 */ sw $zero, 0x0024($sp) +/* 05188 808DB9F8 AFB80028 */ sw $t8, 0x0028($sp) +/* 0518C 808DB9FC AFA00024 */ sw $zero, 0x0024($sp) /* 05190 808DBA00 0C00C916 */ jal Actor_SpawnAttached - -/* 05194 808DBA04 AFAF0020 */ sw $t7, 0x0020($sp) + +/* 05194 808DBA04 AFAF0020 */ sw $t7, 0x0020($sp) /* 05198 808DBA08 26100001 */ addiu $s0, $s0, 0x0001 ## $s0 = 00000001 -/* 0519C 808DBA0C 00108400 */ sll $s0, $s0, 16 -/* 051A0 808DBA10 00108403 */ sra $s0, $s0, 16 -/* 051A4 808DBA14 2A010005 */ slti $at, $s0, 0x0005 -/* 051A8 808DBA18 5420FFEB */ bnel $at, $zero, .L808DB9C8 +/* 0519C 808DBA0C 00108400 */ sll $s0, $s0, 16 +/* 051A0 808DBA10 00108403 */ sra $s0, $s0, 16 +/* 051A4 808DBA14 2A010005 */ slti $at, $s0, 0x0005 +/* 051A8 808DBA18 5420FFEB */ bnel $at, $zero, .L808DB9C8 /* 051AC 808DBA1C C62401FC */ lwc1 $f4, 0x01FC($s1) ## 000001FC /* 051B0 808DBA20 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 051B4 808DBA24 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 051B8 808DBA28 240539D4 */ addiu $a1, $zero, 0x39D4 ## $a1 = 000039D4 /* 051BC 808DBA2C 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 051C0 808DBA30 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 051C4 808DBA34 2405396D */ addiu $a1, $zero, 0x396D ## $a1 = 0000396D .L808DBA38: -/* 051C8 808DBA38 8FA4005C */ lw $a0, 0x005C($sp) -/* 051CC 808DBA3C 0C0295B2 */ jal func_800A56C8 +/* 051C8 808DBA38 8FA4005C */ lw $a0, 0x005C($sp) +/* 051CC 808DBA3C 0C0295B2 */ jal func_800A56C8 /* 051D0 808DBA40 3C054040 */ lui $a1, 0x4040 ## $a1 = 40400000 -/* 051D4 808DBA44 10400008 */ beq $v0, $zero, .L808DBA68 +/* 051D4 808DBA44 10400008 */ beq $v0, $zero, .L808DBA68 /* 051D8 808DBA48 3C0141D0 */ lui $at, 0x41D0 ## $at = 41D00000 /* 051DC 808DBA4C 3C198090 */ lui $t9, %hi(D_808F93C0) ## $t9 = 80900000 -/* 051E0 808DBA50 8F3993C0 */ lw $t9, %lo(D_808F93C0)($t9) +/* 051E0 808DBA50 8F3993C0 */ lw $t9, %lo(D_808F93C0)($t9) /* 051E4 808DBA54 44815000 */ mtc1 $at, $f10 ## $f10 = 26.00 /* 051E8 808DBA58 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 051EC 808DBA5C 240528C7 */ addiu $a1, $zero, 0x28C7 ## $a1 = 000028C7 /* 051F0 808DBA60 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 051F4 808DBA64 E72A16C4 */ swc1 $f10, 0x16C4($t9) ## 809016C4 .L808DBA68: -/* 051F8 808DBA68 8FA4005C */ lw $a0, 0x005C($sp) -/* 051FC 808DBA6C 0C0295B2 */ jal func_800A56C8 +/* 051F8 808DBA68 8FA4005C */ lw $a0, 0x005C($sp) +/* 051FC 808DBA6C 0C0295B2 */ jal func_800A56C8 /* 05200 808DBA70 8E2501CC */ lw $a1, 0x01CC($s1) ## 000001CC -/* 05204 808DBA74 10400017 */ beq $v0, $zero, .L808DBAD4 +/* 05204 808DBA74 10400017 */ beq $v0, $zero, .L808DBAD4 /* 05208 808DBA78 3C100600 */ lui $s0, 0x0600 ## $s0 = 06000000 /* 0520C 808DBA7C 26101440 */ addiu $s0, $s0, 0x1440 ## $s0 = 06001440 /* 05210 808DBA80 0C028800 */ jal SkelAnime_GetFrameCount - + /* 05214 808DBA84 02002025 */ or $a0, $s0, $zero ## $a0 = 06001440 /* 05218 808DBA88 44828000 */ mtc1 $v0, $f16 ## $f16 = 0.00 -/* 0521C 808DBA8C 4406B000 */ mfc1 $a2, $f22 +/* 0521C 808DBA8C 4406B000 */ mfc1 $a2, $f22 /* 05220 808DBA90 02002825 */ or $a1, $s0, $zero ## $a1 = 06001440 -/* 05224 808DBA94 468084A0 */ cvt.s.w $f18, $f16 +/* 05224 808DBA94 468084A0 */ cvt.s.w $f18, $f16 /* 05228 808DBA98 E63201CC */ swc1 $f18, 0x01CC($s1) ## 000001CC -/* 0522C 808DBA9C 0C0294D3 */ jal func_800A534C -/* 05230 808DBAA0 8FA4005C */ lw $a0, 0x005C($sp) +/* 0522C 808DBA9C 0C0294D3 */ jal SkelAnime_ChangeAnimTransitionRepeat +/* 05230 808DBAA0 8FA4005C */ lw $a0, 0x005C($sp) /* 05234 808DBAA4 24080005 */ addiu $t0, $zero, 0x0005 ## $t0 = 00000005 -/* 05238 808DBAA8 1000000A */ beq $zero, $zero, .L808DBAD4 +/* 05238 808DBAA8 1000000A */ beq $zero, $zero, .L808DBAD4 /* 0523C 808DBAAC A62801C2 */ sh $t0, 0x01C2($s1) ## 000001C2 glabel L808DBAB0 /* 05240 808DBAB0 24090002 */ addiu $t1, $zero, 0x0002 ## $t1 = 00000002 /* 05244 808DBAB4 A22901A0 */ sb $t1, 0x01A0($s1) ## 000001A0 -/* 05248 808DBAB8 8FA4005C */ lw $a0, 0x005C($sp) -/* 0524C 808DBABC 0C0295B2 */ jal func_800A56C8 +/* 05248 808DBAB8 8FA4005C */ lw $a0, 0x005C($sp) +/* 0524C 808DBABC 0C0295B2 */ jal func_800A56C8 /* 05250 808DBAC0 8E2501CC */ lw $a1, 0x01CC($s1) ## 000001CC -/* 05254 808DBAC4 10400003 */ beq $v0, $zero, .L808DBAD4 +/* 05254 808DBAC4 10400003 */ beq $v0, $zero, .L808DBAD4 /* 05258 808DBAC8 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 0525C 808DBACC 0C236EBC */ jal func_808DBAF0 -/* 05260 808DBAD0 8FA5009C */ lw $a1, 0x009C($sp) +/* 0525C 808DBACC 0C236EBC */ jal func_808DBAF0 +/* 05260 808DBAD0 8FA5009C */ lw $a1, 0x009C($sp) .L808DBAD4: -/* 05264 808DBAD4 8FBF004C */ lw $ra, 0x004C($sp) +/* 05264 808DBAD4 8FBF004C */ lw $ra, 0x004C($sp) .L808DBAD8: -/* 05268 808DBAD8 D7B40030 */ ldc1 $f20, 0x0030($sp) -/* 0526C 808DBADC D7B60038 */ ldc1 $f22, 0x0038($sp) -/* 05270 808DBAE0 8FB00044 */ lw $s0, 0x0044($sp) -/* 05274 808DBAE4 8FB10048 */ lw $s1, 0x0048($sp) -/* 05278 808DBAE8 03E00008 */ jr $ra +/* 05268 808DBAD8 D7B40030 */ ldc1 $f20, 0x0030($sp) +/* 0526C 808DBADC D7B60038 */ ldc1 $f22, 0x0038($sp) +/* 05270 808DBAE0 8FB00044 */ lw $s0, 0x0044($sp) +/* 05274 808DBAE4 8FB10048 */ lw $s1, 0x0048($sp) +/* 05278 808DBAE8 03E00008 */ jr $ra /* 0527C 808DBAEC 27BD0098 */ addiu $sp, $sp, 0x0098 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DBAF0.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DBAF0.s index 0b3a9da7db..bbeadcfd8a 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DBAF0.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DBAF0.s @@ -1,14 +1,14 @@ glabel func_808DBAF0 /* 05280 808DBAF0 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 05284 808DBAF4 AFBF001C */ sw $ra, 0x001C($sp) -/* 05288 808DBAF8 AFB00018 */ sw $s0, 0x0018($sp) +/* 05284 808DBAF4 AFBF001C */ sw $ra, 0x001C($sp) +/* 05288 808DBAF8 AFB00018 */ sw $s0, 0x0018($sp) /* 0528C 808DBAFC 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 05290 808DBB00 0C235C4B */ jal func_808D712C +/* 05290 808DBB00 0C235C4B */ jal func_808D712C /* 05294 808DBB04 2406017C */ addiu $a2, $zero, 0x017C ## $a2 = 0000017C /* 05298 808DBB08 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 /* 0529C 808DBB0C 24A59A14 */ addiu $a1, $a1, 0x9A14 ## $a1 = 06009A14 /* 052A0 808DBB10 26040150 */ addiu $a0, $s0, 0x0150 ## $a0 = 00000150 -/* 052A4 808DBB14 0C0294D3 */ jal func_800A534C +/* 052A4 808DBB14 0C0294D3 */ jal SkelAnime_ChangeAnimTransitionRepeat /* 052A8 808DBB18 3C06C120 */ lui $a2, 0xC120 ## $a2 = C1200000 /* 052AC 808DBB1C 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 /* 052B0 808DBB20 3C0E808E */ lui $t6, %hi(func_808DBB78) ## $t6 = 808E0000 @@ -17,22 +17,22 @@ glabel func_808DBAF0 /* 052BC 808DBB2C 44816000 */ mtc1 $at, $f12 ## $f12 = 64.00 /* 052C0 808DBB30 AE0E0194 */ sw $t6, 0x0194($s0) ## 00000194 /* 052C4 808DBB34 0C00CFBE */ jal Math_Rand_ZeroFloat - + /* 052C8 808DBB38 E60401C8 */ swc1 $f4, 0x01C8($s0) ## 000001C8 -/* 052CC 808DBB3C 4600018D */ trunc.w.s $f6, $f0 +/* 052CC 808DBB3C 4600018D */ trunc.w.s $f6, $f0 /* 052D0 808DBB40 A60001C2 */ sh $zero, 0x01C2($s0) ## 000001C2 /* 052D4 808DBB44 3C014000 */ lui $at, 0x4000 ## $at = 40000000 /* 052D8 808DBB48 3C0A8090 */ lui $t2, %hi(D_808F93C0) ## $t2 = 80900000 -/* 052DC 808DBB4C 44083000 */ mfc1 $t0, $f6 +/* 052DC 808DBB4C 44083000 */ mfc1 $t0, $f6 /* 052E0 808DBB50 44814000 */ mtc1 $at, $f8 ## $f8 = 2.00 /* 052E4 808DBB54 2509001E */ addiu $t1, $t0, 0x001E ## $t1 = 0000001E /* 052E8 808DBB58 A60901B6 */ sh $t1, 0x01B6($s0) ## 000001B6 -/* 052EC 808DBB5C 8D4A93C0 */ lw $t2, %lo(D_808F93C0)($t2) +/* 052EC 808DBB5C 8D4A93C0 */ lw $t2, %lo(D_808F93C0)($t2) /* 052F0 808DBB60 E54816AC */ swc1 $f8, 0x16AC($t2) ## 809016AC -/* 052F4 808DBB64 8FBF001C */ lw $ra, 0x001C($sp) -/* 052F8 808DBB68 8FB00018 */ lw $s0, 0x0018($sp) +/* 052F4 808DBB64 8FBF001C */ lw $ra, 0x001C($sp) +/* 052F8 808DBB68 8FB00018 */ lw $s0, 0x0018($sp) /* 052FC 808DBB6C 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 05300 808DBB70 03E00008 */ jr $ra +/* 05300 808DBB70 03E00008 */ jr $ra /* 05304 808DBB74 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DBEC4.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DBEC4.s index 6b6396a92c..f0108d593b 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DBEC4.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DBEC4.s @@ -1,31 +1,31 @@ glabel func_808DBEC4 /* 05654 808DBEC4 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 05658 808DBEC8 AFBF001C */ sw $ra, 0x001C($sp) -/* 0565C 808DBECC AFB00018 */ sw $s0, 0x0018($sp) +/* 05658 808DBEC8 AFBF001C */ sw $ra, 0x001C($sp) +/* 0565C 808DBECC AFB00018 */ sw $s0, 0x0018($sp) /* 05660 808DBED0 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 05664 808DBED4 0C235C4B */ jal func_808D712C +/* 05664 808DBED4 0C235C4B */ jal func_808D712C /* 05668 808DBED8 2406017C */ addiu $a2, $zero, 0x017C ## $a2 = 0000017C /* 0566C 808DBEDC 3C040601 */ lui $a0, 0x0601 ## $a0 = 06010000 /* 05670 808DBEE0 0C028800 */ jal SkelAnime_GetFrameCount - + /* 05674 808DBEE4 2484AA24 */ addiu $a0, $a0, 0xAA24 ## $a0 = 0600AA24 /* 05678 808DBEE8 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 0567C 808DBEEC 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 /* 05680 808DBEF0 24A5AA24 */ addiu $a1, $a1, 0xAA24 ## $a1 = 0600AA24 -/* 05684 808DBEF4 468021A0 */ cvt.s.w $f6, $f4 +/* 05684 808DBEF4 468021A0 */ cvt.s.w $f6, $f4 /* 05688 808DBEF8 26040150 */ addiu $a0, $s0, 0x0150 ## $a0 = 00000150 /* 0568C 808DBEFC 3C06C040 */ lui $a2, 0xC040 ## $a2 = C0400000 -/* 05690 808DBF00 0C029490 */ jal func_800A5240 +/* 05690 808DBF00 0C029490 */ jal SkelAnime_ChangeAnimTransitionStop /* 05694 808DBF04 E60601CC */ swc1 $f6, 0x01CC($s0) ## 000001CC /* 05698 808DBF08 3C0E808E */ lui $t6, %hi(func_808DBF30) ## $t6 = 808E0000 /* 0569C 808DBF0C 25CEBF30 */ addiu $t6, $t6, %lo(func_808DBF30) ## $t6 = 808DBF30 /* 056A0 808DBF10 240F0019 */ addiu $t7, $zero, 0x0019 ## $t7 = 00000019 /* 056A4 808DBF14 AE0E0194 */ sw $t6, 0x0194($s0) ## 00000194 /* 056A8 808DBF18 A60F01B6 */ sh $t7, 0x01B6($s0) ## 000001B6 -/* 056AC 808DBF1C 8FBF001C */ lw $ra, 0x001C($sp) -/* 056B0 808DBF20 8FB00018 */ lw $s0, 0x0018($sp) +/* 056AC 808DBF1C 8FBF001C */ lw $ra, 0x001C($sp) +/* 056B0 808DBF20 8FB00018 */ lw $s0, 0x0018($sp) /* 056B4 808DBF24 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 056B8 808DBF28 03E00008 */ jr $ra +/* 056B8 808DBF28 03E00008 */ jr $ra /* 056BC 808DBF2C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DC0E8.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DC0E8.s index f847d7622c..2022eea94a 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DC0E8.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DC0E8.s @@ -1,29 +1,29 @@ glabel func_808DC0E8 /* 05878 808DC0E8 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 0587C 808DC0EC AFBF0014 */ sw $ra, 0x0014($sp) -/* 05880 808DC0F0 AFA40018 */ sw $a0, 0x0018($sp) -/* 05884 808DC0F4 0C235C4B */ jal func_808D712C +/* 0587C 808DC0EC AFBF0014 */ sw $ra, 0x0014($sp) +/* 05880 808DC0F0 AFA40018 */ sw $a0, 0x0018($sp) +/* 05884 808DC0F4 0C235C4B */ jal func_808D712C /* 05888 808DC0F8 2406017C */ addiu $a2, $zero, 0x017C ## $a2 = 0000017C /* 0588C 808DC0FC 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 /* 05890 808DC100 0C028800 */ jal SkelAnime_GetFrameCount - + /* 05894 808DC104 2484738C */ addiu $a0, $a0, 0x738C ## $a0 = 0600738C /* 05898 808DC108 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 -/* 0589C 808DC10C 8FA30018 */ lw $v1, 0x0018($sp) +/* 0589C 808DC10C 8FA30018 */ lw $v1, 0x0018($sp) /* 058A0 808DC110 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 058A4 808DC114 468021A0 */ cvt.s.w $f6, $f4 +/* 058A4 808DC114 468021A0 */ cvt.s.w $f6, $f4 /* 058A8 808DC118 24A5738C */ addiu $a1, $a1, 0x738C ## $a1 = 0600738C /* 058AC 808DC11C 24060000 */ addiu $a2, $zero, 0x0000 ## $a2 = 00000000 /* 058B0 808DC120 24640150 */ addiu $a0, $v1, 0x0150 ## $a0 = 00000150 -/* 058B4 808DC124 0C029490 */ jal func_800A5240 +/* 058B4 808DC124 0C029490 */ jal SkelAnime_ChangeAnimTransitionStop /* 058B8 808DC128 E46601CC */ swc1 $f6, 0x01CC($v1) ## 000001CC -/* 058BC 808DC12C 8FAF0018 */ lw $t7, 0x0018($sp) +/* 058BC 808DC12C 8FAF0018 */ lw $t7, 0x0018($sp) /* 058C0 808DC130 3C0E808E */ lui $t6, %hi(func_808DC14C) ## $t6 = 808E0000 /* 058C4 808DC134 25CEC14C */ addiu $t6, $t6, %lo(func_808DC14C) ## $t6 = 808DC14C /* 058C8 808DC138 ADEE0194 */ sw $t6, 0x0194($t7) ## 00000194 -/* 058CC 808DC13C 8FBF0014 */ lw $ra, 0x0014($sp) +/* 058CC 808DC13C 8FBF0014 */ lw $ra, 0x0014($sp) /* 058D0 808DC140 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 058D4 808DC144 03E00008 */ jr $ra +/* 058D4 808DC144 03E00008 */ jr $ra /* 058D8 808DC148 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DC14C.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DC14C.s index e035292597..08e29cc52e 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DC14C.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DC14C.s @@ -1,51 +1,51 @@ glabel func_808DC14C /* 058DC 808DC14C 27BDFFB0 */ addiu $sp, $sp, 0xFFB0 ## $sp = FFFFFFB0 -/* 058E0 808DC150 AFB00038 */ sw $s0, 0x0038($sp) +/* 058E0 808DC150 AFB00038 */ sw $s0, 0x0038($sp) /* 058E4 808DC154 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 058E8 808DC158 AFBF003C */ sw $ra, 0x003C($sp) +/* 058E8 808DC158 AFBF003C */ sw $ra, 0x003C($sp) /* 058EC 808DC15C 24840150 */ addiu $a0, $a0, 0x0150 ## $a0 = 00000150 -/* 058F0 808DC160 AFA50054 */ sw $a1, 0x0054($sp) +/* 058F0 808DC160 AFA50054 */ sw $a1, 0x0054($sp) /* 058F4 808DC164 0C02927F */ jal SkelAnime_FrameUpdateMatrix - -/* 058F8 808DC168 AFA40044 */ sw $a0, 0x0044($sp) + +/* 058F8 808DC168 AFA40044 */ sw $a0, 0x0044($sp) /* 058FC 808DC16C 3C063E4C */ lui $a2, 0x3E4C ## $a2 = 3E4C0000 /* 05900 808DC170 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3E4CCCCD /* 05904 808DC174 26040254 */ addiu $a0, $s0, 0x0254 ## $a0 = 00000254 /* 05908 808DC178 0C01E123 */ jal Math_SmoothDownscaleMaxF - + /* 0590C 808DC17C 3C053F80 */ lui $a1, 0x3F80 ## $a1 = 3F800000 /* 05910 808DC180 860201C2 */ lh $v0, 0x01C2($s0) ## 000001C2 /* 05914 808DC184 240E0001 */ addiu $t6, $zero, 0x0001 ## $t6 = 00000001 -/* 05918 808DC188 10400005 */ beq $v0, $zero, .L808DC1A0 +/* 05918 808DC188 10400005 */ beq $v0, $zero, .L808DC1A0 /* 0591C 808DC18C 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 05920 808DC190 50410047 */ beql $v0, $at, .L808DC2B0 +/* 05920 808DC190 50410047 */ beql $v0, $at, .L808DC2B0 /* 05924 808DC194 920D01C0 */ lbu $t5, 0x01C0($s0) ## 000001C0 -/* 05928 808DC198 10000071 */ beq $zero, $zero, .L808DC360 +/* 05928 808DC198 10000071 */ beq $zero, $zero, .L808DC360 /* 0592C 808DC19C 260400B6 */ addiu $a0, $s0, 0x00B6 ## $a0 = 000000B6 .L808DC1A0: /* 05930 808DC1A0 A20E01A0 */ sb $t6, 0x01A0($s0) ## 000001A0 -/* 05934 808DC1A4 8FA40044 */ lw $a0, 0x0044($sp) -/* 05938 808DC1A8 0C0295B2 */ jal func_800A56C8 +/* 05934 808DC1A4 8FA40044 */ lw $a0, 0x0044($sp) +/* 05938 808DC1A8 0C0295B2 */ jal func_800A56C8 /* 0593C 808DC1AC 8E0501CC */ lw $a1, 0x01CC($s0) ## 000001CC -/* 05940 808DC1B0 10400007 */ beq $v0, $zero, .L808DC1D0 +/* 05940 808DC1B0 10400007 */ beq $v0, $zero, .L808DC1D0 /* 05944 808DC1B4 240F0001 */ addiu $t7, $zero, 0x0001 ## $t7 = 00000001 /* 05948 808DC1B8 A60F01C2 */ sh $t7, 0x01C2($s0) ## 000001C2 /* 0594C 808DC1BC 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 /* 05950 808DC1C0 24A59A14 */ addiu $a1, $a1, 0x9A14 ## $a1 = 06009A14 -/* 05954 808DC1C4 8FA40044 */ lw $a0, 0x0044($sp) -/* 05958 808DC1C8 0C0294D3 */ jal func_800A534C +/* 05954 808DC1C4 8FA40044 */ lw $a0, 0x0044($sp) +/* 05958 808DC1C8 0C0294D3 */ jal SkelAnime_ChangeAnimTransitionRepeat /* 0595C 808DC1CC 24060000 */ addiu $a2, $zero, 0x0000 ## $a2 = 00000000 .L808DC1D0: /* 05960 808DC1D0 3C014140 */ lui $at, 0x4140 ## $at = 41400000 /* 05964 808DC1D4 44810000 */ mtc1 $at, $f0 ## $f0 = 12.00 /* 05968 808DC1D8 C6040168 */ lwc1 $f4, 0x0168($s0) ## 00000168 /* 0596C 808DC1DC 3C088016 */ lui $t0, 0x8016 ## $t0 = 80160000 -/* 05970 808DC1E0 44050000 */ mfc1 $a1, $f0 -/* 05974 808DC1E4 4600203E */ c.le.s $f4, $f0 +/* 05970 808DC1E0 44050000 */ mfc1 $a1, $f0 +/* 05974 808DC1E4 4600203E */ c.le.s $f4, $f0 /* 05978 808DC1E8 24180002 */ addiu $t8, $zero, 0x0002 ## $t8 = 00000002 /* 0597C 808DC1EC 24190002 */ addiu $t9, $zero, 0x0002 ## $t9 = 00000002 /* 05980 808DC1F0 2508FCF8 */ addiu $t0, $t0, 0xFCF8 ## $t0 = 8015FCF8 -/* 05984 808DC1F4 45000009 */ bc1f .L808DC21C +/* 05984 808DC1F4 45000009 */ bc1f .L808DC21C /* 05988 808DC1F8 00000000 */ nop /* 0598C 808DC1FC 8E0A0260 */ lw $t2, 0x0260($s0) ## 00000260 /* 05990 808DC200 A618066E */ sh $t8, 0x066E($s0) ## 0000066E @@ -56,92 +56,92 @@ glabel func_808DC14C /* 059A4 808DC214 8E0A0268 */ lw $t2, 0x0268($s0) ## 00000268 /* 059A8 808DC218 AD0A0008 */ sw $t2, 0x0008($t0) ## 8015FD00 .L808DC21C: -/* 059AC 808DC21C 0C0295B2 */ jal func_800A56C8 -/* 059B0 808DC220 8FA40044 */ lw $a0, 0x0044($sp) -/* 059B4 808DC224 10400004 */ beq $v0, $zero, .L808DC238 +/* 059AC 808DC21C 0C0295B2 */ jal func_800A56C8 +/* 059B0 808DC220 8FA40044 */ lw $a0, 0x0044($sp) +/* 059B4 808DC224 10400004 */ beq $v0, $zero, .L808DC238 /* 059B8 808DC228 3C054130 */ lui $a1, 0x4130 ## $a1 = 41300000 /* 059BC 808DC22C 44803000 */ mtc1 $zero, $f6 ## $f6 = 0.00 /* 059C0 808DC230 00000000 */ nop /* 059C4 808DC234 E6060254 */ swc1 $f6, 0x0254($s0) ## 00000254 .L808DC238: -/* 059C8 808DC238 0C0295B2 */ jal func_800A56C8 -/* 059CC 808DC23C 8FA40044 */ lw $a0, 0x0044($sp) -/* 059D0 808DC240 10400046 */ beq $v0, $zero, .L808DC35C +/* 059C8 808DC238 0C0295B2 */ jal func_800A56C8 +/* 059CC 808DC23C 8FA40044 */ lw $a0, 0x0044($sp) +/* 059D0 808DC240 10400046 */ beq $v0, $zero, .L808DC35C /* 059D4 808DC244 240B0001 */ addiu $t3, $zero, 0x0001 ## $t3 = 00000001 /* 059D8 808DC248 A20B025C */ sb $t3, 0x025C($s0) ## 0000025C /* 059DC 808DC24C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 059E0 808DC250 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 059E4 808DC254 240539C9 */ addiu $a1, $zero, 0x39C9 ## $a1 = 000039C9 /* 059E8 808DC258 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 059EC 808DC25C 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 059F0 808DC260 24053825 */ addiu $a1, $zero, 0x3825 ## $a1 = 00003825 /* 059F4 808DC264 C6080260 */ lwc1 $f8, 0x0260($s0) ## 00000260 -/* 059F8 808DC268 8FA60054 */ lw $a2, 0x0054($sp) +/* 059F8 808DC268 8FA60054 */ lw $a2, 0x0054($sp) /* 059FC 808DC26C 240C0064 */ addiu $t4, $zero, 0x0064 ## $t4 = 00000064 -/* 05A00 808DC270 E7A80010 */ swc1 $f8, 0x0010($sp) +/* 05A00 808DC270 E7A80010 */ swc1 $f8, 0x0010($sp) /* 05A04 808DC274 C60A0264 */ lwc1 $f10, 0x0264($s0) ## 00000264 /* 05A08 808DC278 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 05A0C 808DC27C 240700E8 */ addiu $a3, $zero, 0x00E8 ## $a3 = 000000E8 -/* 05A10 808DC280 E7AA0014 */ swc1 $f10, 0x0014($sp) +/* 05A10 808DC280 E7AA0014 */ swc1 $f10, 0x0014($sp) /* 05A14 808DC284 C6100268 */ lwc1 $f16, 0x0268($s0) ## 00000268 -/* 05A18 808DC288 AFAC0028 */ sw $t4, 0x0028($sp) -/* 05A1C 808DC28C AFA00024 */ sw $zero, 0x0024($sp) -/* 05A20 808DC290 AFA00020 */ sw $zero, 0x0020($sp) -/* 05A24 808DC294 AFA0001C */ sw $zero, 0x001C($sp) +/* 05A18 808DC288 AFAC0028 */ sw $t4, 0x0028($sp) +/* 05A1C 808DC28C AFA00024 */ sw $zero, 0x0024($sp) +/* 05A20 808DC290 AFA00020 */ sw $zero, 0x0020($sp) +/* 05A24 808DC294 AFA0001C */ sw $zero, 0x001C($sp) /* 05A28 808DC298 24C41C24 */ addiu $a0, $a2, 0x1C24 ## $a0 = 00001C24 /* 05A2C 808DC29C 0C00C916 */ jal Actor_SpawnAttached - -/* 05A30 808DC2A0 E7B00018 */ swc1 $f16, 0x0018($sp) -/* 05A34 808DC2A4 1000002E */ beq $zero, $zero, .L808DC360 + +/* 05A30 808DC2A0 E7B00018 */ swc1 $f16, 0x0018($sp) +/* 05A34 808DC2A4 1000002E */ beq $zero, $zero, .L808DC360 /* 05A38 808DC2A8 260400B6 */ addiu $a0, $s0, 0x00B6 ## $a0 = 000000B6 /* 05A3C 808DC2AC 920D01C0 */ lbu $t5, 0x01C0($s0) ## 000001C0 .L808DC2B0: -/* 05A40 808DC2B0 51A0002B */ beql $t5, $zero, .L808DC360 +/* 05A40 808DC2B0 51A0002B */ beql $t5, $zero, .L808DC360 /* 05A44 808DC2B4 260400B6 */ addiu $a0, $s0, 0x00B6 ## $a0 = 000000B6 /* 05A48 808DC2B8 0C03F66B */ jal Math_Rand_ZeroOne ## Rand.Next() float /* 05A4C 808DC2BC 00000000 */ nop /* 05A50 808DC2C0 3C018090 */ lui $at, %hi(D_808F8000) ## $at = 80900000 -/* 05A54 808DC2C4 C4328000 */ lwc1 $f18, %lo(D_808F8000)($at) +/* 05A54 808DC2C4 C4328000 */ lwc1 $f18, %lo(D_808F8000)($at) /* 05A58 808DC2C8 3C04808E */ lui $a0, %hi(D_808E4D38) ## $a0 = 808E0000 -/* 05A5C 808DC2CC 46120102 */ mul.s $f4, $f0, $f18 -/* 05A60 808DC2D0 4600218D */ trunc.w.s $f6, $f4 -/* 05A64 808DC2D4 44023000 */ mfc1 $v0, $f6 +/* 05A5C 808DC2CC 46120102 */ mul.s $f4, $f0, $f18 +/* 05A60 808DC2D0 4600218D */ trunc.w.s $f6, $f4 +/* 05A64 808DC2D4 44023000 */ mfc1 $v0, $f6 /* 05A68 808DC2D8 00000000 */ nop -/* 05A6C 808DC2DC 00027C00 */ sll $t7, $v0, 16 -/* 05A70 808DC2E0 000FC403 */ sra $t8, $t7, 16 -/* 05A74 808DC2E4 0018C880 */ sll $t9, $t8, 2 -/* 05A78 808DC2E8 00992021 */ addu $a0, $a0, $t9 -/* 05A7C 808DC2EC 8C844D38 */ lw $a0, %lo(D_808E4D38)($a0) +/* 05A6C 808DC2DC 00027C00 */ sll $t7, $v0, 16 +/* 05A70 808DC2E0 000FC403 */ sra $t8, $t7, 16 +/* 05A74 808DC2E4 0018C880 */ sll $t9, $t8, 2 +/* 05A78 808DC2E8 00992021 */ addu $a0, $a0, $t9 +/* 05A7C 808DC2EC 8C844D38 */ lw $a0, %lo(D_808E4D38)($a0) /* 05A80 808DC2F0 0C028800 */ jal SkelAnime_GetFrameCount - -/* 05A84 808DC2F4 A7A2004E */ sh $v0, 0x004E($sp) + +/* 05A84 808DC2F4 A7A2004E */ sh $v0, 0x004E($sp) /* 05A88 808DC2F8 44824000 */ mtc1 $v0, $f8 ## $f8 = 0.00 /* 05A8C 808DC2FC 3C05808E */ lui $a1, %hi(D_808E4D38) ## $a1 = 808E0000 /* 05A90 808DC300 24060000 */ addiu $a2, $zero, 0x0000 ## $a2 = 00000000 -/* 05A94 808DC304 468042A0 */ cvt.s.w $f10, $f8 +/* 05A94 808DC304 468042A0 */ cvt.s.w $f10, $f8 /* 05A98 808DC308 E60A01CC */ swc1 $f10, 0x01CC($s0) ## 000001CC -/* 05A9C 808DC30C 87A8004E */ lh $t0, 0x004E($sp) -/* 05AA0 808DC310 8FA40044 */ lw $a0, 0x0044($sp) -/* 05AA4 808DC314 00084880 */ sll $t1, $t0, 2 -/* 05AA8 808DC318 00A92821 */ addu $a1, $a1, $t1 -/* 05AAC 808DC31C 0C029490 */ jal func_800A5240 -/* 05AB0 808DC320 8CA54D38 */ lw $a1, %lo(D_808E4D38)($a1) -/* 05AB4 808DC324 87AA004E */ lh $t2, 0x004E($sp) +/* 05A9C 808DC30C 87A8004E */ lh $t0, 0x004E($sp) +/* 05AA0 808DC310 8FA40044 */ lw $a0, 0x0044($sp) +/* 05AA4 808DC314 00084880 */ sll $t1, $t0, 2 +/* 05AA8 808DC318 00A92821 */ addu $a1, $a1, $t1 +/* 05AAC 808DC31C 0C029490 */ jal SkelAnime_ChangeAnimTransitionStop +/* 05AB0 808DC320 8CA54D38 */ lw $a1, %lo(D_808E4D38)($a1) +/* 05AB4 808DC324 87AA004E */ lh $t2, 0x004E($sp) /* 05AB8 808DC328 3C0C808E */ lui $t4, %hi(D_808E4D40) ## $t4 = 808E0000 /* 05ABC 808DC32C 3C0D8090 */ lui $t5, %hi(D_808F93C0) ## $t5 = 80900000 -/* 05AC0 808DC330 000A5840 */ sll $t3, $t2, 1 -/* 05AC4 808DC334 018B6021 */ addu $t4, $t4, $t3 -/* 05AC8 808DC338 858C4D40 */ lh $t4, %lo(D_808E4D40)($t4) -/* 05ACC 808DC33C 8DAD93C0 */ lw $t5, %lo(D_808F93C0)($t5) +/* 05AC0 808DC330 000A5840 */ sll $t3, $t2, 1 +/* 05AC4 808DC334 018B6021 */ addu $t4, $t4, $t3 +/* 05AC8 808DC338 858C4D40 */ lh $t4, %lo(D_808E4D40)($t4) +/* 05ACC 808DC33C 8DAD93C0 */ lw $t5, %lo(D_808F93C0)($t5) /* 05AD0 808DC340 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 05AD4 808DC344 448C8000 */ mtc1 $t4, $f16 ## $f16 = -0.00 /* 05AD8 808DC348 240528C7 */ addiu $a1, $zero, 0x28C7 ## $a1 = 000028C7 -/* 05ADC 808DC34C 468084A0 */ cvt.s.w $f18, $f16 +/* 05ADC 808DC34C 468084A0 */ cvt.s.w $f18, $f16 /* 05AE0 808DC350 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 05AE4 808DC354 E5B216BC */ swc1 $f18, 0x16BC($t5) ## 809016BC /* 05AE8 808DC358 A20001C0 */ sb $zero, 0x01C0($s0) ## 000001C0 .L808DC35C: @@ -150,54 +150,54 @@ glabel func_808DC14C /* 05AF0 808DC360 8605008A */ lh $a1, 0x008A($s0) ## 0000008A /* 05AF4 808DC364 24060005 */ addiu $a2, $zero, 0x0005 ## $a2 = 00000005 /* 05AF8 808DC368 0C01E1EF */ jal Math_SmoothScaleMaxS - + /* 05AFC 808DC36C 240707D0 */ addiu $a3, $zero, 0x07D0 ## $a3 = 000007D0 /* 05B00 808DC370 C6040024 */ lwc1 $f4, 0x0024($s0) ## 00000024 /* 05B04 808DC374 C606005C */ lwc1 $f6, 0x005C($s0) ## 0000005C /* 05B08 808DC378 C60A002C */ lwc1 $f10, 0x002C($s0) ## 0000002C /* 05B0C 808DC37C C6100064 */ lwc1 $f16, 0x0064($s0) ## 00000064 -/* 05B10 808DC380 46062200 */ add.s $f8, $f4, $f6 +/* 05B10 808DC380 46062200 */ add.s $f8, $f4, $f6 /* 05B14 808DC384 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 /* 05B18 808DC388 2604005C */ addiu $a0, $s0, 0x005C ## $a0 = 0000005C -/* 05B1C 808DC38C 46105480 */ add.s $f18, $f10, $f16 +/* 05B1C 808DC38C 46105480 */ add.s $f18, $f10, $f16 /* 05B20 808DC390 E6080024 */ swc1 $f8, 0x0024($s0) ## 00000024 -/* 05B24 808DC394 44050000 */ mfc1 $a1, $f0 +/* 05B24 808DC394 44050000 */ mfc1 $a1, $f0 /* 05B28 808DC398 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 05B2C 808DC39C E612002C */ swc1 $f18, 0x002C($s0) ## 0000002C /* 05B30 808DC3A0 3C073F00 */ lui $a3, 0x3F00 ## $a3 = 3F000000 /* 05B34 808DC3A4 0C01E0C4 */ jal Math_SmoothScaleMaxMinF - -/* 05B38 808DC3A8 E7A00010 */ swc1 $f0, 0x0010($sp) + +/* 05B38 808DC3A8 E7A00010 */ swc1 $f0, 0x0010($sp) /* 05B3C 808DC3AC 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 /* 05B40 808DC3B0 26040064 */ addiu $a0, $s0, 0x0064 ## $a0 = 00000064 /* 05B44 808DC3B4 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 /* 05B48 808DC3B8 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 05B4C 808DC3BC 3C073F00 */ lui $a3, 0x3F00 ## $a3 = 3F000000 /* 05B50 808DC3C0 0C01E0C4 */ jal Math_SmoothScaleMaxMinF - -/* 05B54 808DC3C4 E7A40010 */ swc1 $f4, 0x0010($sp) + +/* 05B54 808DC3C4 E7A40010 */ swc1 $f4, 0x0010($sp) /* 05B58 808DC3C8 860401A2 */ lh $a0, 0x01A2($s0) ## 000001A2 -/* 05B5C 808DC3CC 00800821 */ addu $at, $a0, $zero -/* 05B60 808DC3D0 00042080 */ sll $a0, $a0, 2 -/* 05B64 808DC3D4 00812023 */ subu $a0, $a0, $at -/* 05B68 808DC3D8 00042100 */ sll $a0, $a0, 4 -/* 05B6C 808DC3DC 00812023 */ subu $a0, $a0, $at -/* 05B70 808DC3E0 000420C0 */ sll $a0, $a0, 3 -/* 05B74 808DC3E4 00812023 */ subu $a0, $a0, $at -/* 05B78 808DC3E8 00042080 */ sll $a0, $a0, 2 -/* 05B7C 808DC3EC 00042400 */ sll $a0, $a0, 16 +/* 05B5C 808DC3CC 00800821 */ addu $at, $a0, $zero +/* 05B60 808DC3D0 00042080 */ sll $a0, $a0, 2 +/* 05B64 808DC3D4 00812023 */ subu $a0, $a0, $at +/* 05B68 808DC3D8 00042100 */ sll $a0, $a0, 4 +/* 05B6C 808DC3DC 00812023 */ subu $a0, $a0, $at +/* 05B70 808DC3E0 000420C0 */ sll $a0, $a0, 3 +/* 05B74 808DC3E4 00812023 */ subu $a0, $a0, $at +/* 05B78 808DC3E8 00042080 */ sll $a0, $a0, 2 +/* 05B7C 808DC3EC 00042400 */ sll $a0, $a0, 16 /* 05B80 808DC3F0 0C01DE1C */ jal Math_Sins ## sins? -/* 05B84 808DC3F4 00042403 */ sra $a0, $a0, 16 -/* 05B88 808DC3F8 46000080 */ add.s $f2, $f0, $f0 +/* 05B84 808DC3F4 00042403 */ sra $a0, $a0, 16 +/* 05B88 808DC3F8 46000080 */ add.s $f2, $f0, $f0 /* 05B8C 808DC3FC C6060028 */ lwc1 $f6, 0x0028($s0) ## 00000028 -/* 05B90 808DC400 46023200 */ add.s $f8, $f6, $f2 +/* 05B90 808DC400 46023200 */ add.s $f8, $f6, $f2 /* 05B94 808DC404 E6020060 */ swc1 $f2, 0x0060($s0) ## 00000060 /* 05B98 808DC408 E6080028 */ swc1 $f8, 0x0028($s0) ## 00000028 -/* 05B9C 808DC40C 8FBF003C */ lw $ra, 0x003C($sp) -/* 05BA0 808DC410 8FB00038 */ lw $s0, 0x0038($sp) +/* 05B9C 808DC40C 8FBF003C */ lw $ra, 0x003C($sp) +/* 05BA0 808DC410 8FB00038 */ lw $s0, 0x0038($sp) /* 05BA4 808DC414 27BD0050 */ addiu $sp, $sp, 0x0050 ## $sp = 00000000 -/* 05BA8 808DC418 03E00008 */ jr $ra +/* 05BA8 808DC418 03E00008 */ jr $ra /* 05BAC 808DC41C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DC420.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DC420.s index ec71e30a61..5de3bc3fe7 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DC420.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DC420.s @@ -1,32 +1,32 @@ glabel func_808DC420 /* 05BB0 808DC420 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 05BB4 808DC424 AFBF001C */ sw $ra, 0x001C($sp) -/* 05BB8 808DC428 AFB00018 */ sw $s0, 0x0018($sp) +/* 05BB4 808DC424 AFBF001C */ sw $ra, 0x001C($sp) +/* 05BB8 808DC428 AFB00018 */ sw $s0, 0x0018($sp) /* 05BBC 808DC42C 8C8E0194 */ lw $t6, 0x0194($a0) ## 00000194 /* 05BC0 808DC430 3C02808E */ lui $v0, %hi(func_808DC4DC) ## $v0 = 808E0000 /* 05BC4 808DC434 2442C4DC */ addiu $v0, $v0, %lo(func_808DC4DC) ## $v0 = 808DC4DC -/* 05BC8 808DC438 144E0003 */ bne $v0, $t6, .L808DC448 +/* 05BC8 808DC438 144E0003 */ bne $v0, $t6, .L808DC448 /* 05BCC 808DC43C 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 05BD0 808DC440 848F01C2 */ lh $t7, 0x01C2($a0) ## 000001C2 -/* 05BD4 808DC444 11E00011 */ beq $t7, $zero, .L808DC48C +/* 05BD4 808DC444 11E00011 */ beq $t7, $zero, .L808DC48C .L808DC448: /* 05BD8 808DC448 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 05BDC 808DC44C 2406017C */ addiu $a2, $zero, 0x017C ## $a2 = 0000017C -/* 05BE0 808DC450 0C235C4B */ jal func_808D712C -/* 05BE4 808DC454 AFA20024 */ sw $v0, 0x0024($sp) +/* 05BE0 808DC450 0C235C4B */ jal func_808D712C +/* 05BE4 808DC454 AFA20024 */ sw $v0, 0x0024($sp) /* 05BE8 808DC458 3C040601 */ lui $a0, 0x0601 ## $a0 = 06010000 /* 05BEC 808DC45C 0C028800 */ jal SkelAnime_GetFrameCount - + /* 05BF0 808DC460 24849D5C */ addiu $a0, $a0, 0x9D5C ## $a0 = 06009D5C /* 05BF4 808DC464 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 05BF8 808DC468 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 /* 05BFC 808DC46C 24A59D5C */ addiu $a1, $a1, 0x9D5C ## $a1 = 06009D5C -/* 05C00 808DC470 468021A0 */ cvt.s.w $f6, $f4 +/* 05C00 808DC470 468021A0 */ cvt.s.w $f6, $f4 /* 05C04 808DC474 26040150 */ addiu $a0, $s0, 0x0150 ## $a0 = 00000150 /* 05C08 808DC478 24060000 */ addiu $a2, $zero, 0x0000 ## $a2 = 00000000 -/* 05C0C 808DC47C 0C029490 */ jal func_800A5240 +/* 05C0C 808DC47C 0C029490 */ jal SkelAnime_ChangeAnimTransitionStop /* 05C10 808DC480 E60601CC */ swc1 $f6, 0x01CC($s0) ## 000001CC -/* 05C14 808DC484 8FB80024 */ lw $t8, 0x0024($sp) +/* 05C14 808DC484 8FB80024 */ lw $t8, 0x0024($sp) /* 05C18 808DC488 AE180194 */ sw $t8, 0x0194($s0) ## 00000194 .L808DC48C: /* 05C1C 808DC48C 2419000A */ addiu $t9, $zero, 0x000A ## $t9 = 0000000A @@ -35,20 +35,20 @@ glabel func_808DC420 /* 05C28 808DC498 A60001C2 */ sh $zero, 0x01C2($s0) ## 000001C2 /* 05C2C 808DC49C 3C098090 */ lui $t1, %hi(D_808F93C0) ## $t1 = 80900000 /* 05C30 808DC4A0 44884000 */ mtc1 $t0, $f8 ## $f8 = 0.00 -/* 05C34 808DC4A4 8D2993C0 */ lw $t1, %lo(D_808F93C0)($t1) +/* 05C34 808DC4A4 8D2993C0 */ lw $t1, %lo(D_808F93C0)($t1) /* 05C38 808DC4A8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 05C3C 808DC4AC 468042A0 */ cvt.s.w $f10, $f8 +/* 05C3C 808DC4AC 468042A0 */ cvt.s.w $f10, $f8 /* 05C40 808DC4B0 240528C7 */ addiu $a1, $zero, 0x28C7 ## $a1 = 000028C7 /* 05C44 808DC4B4 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 05C48 808DC4B8 E52A16C0 */ swc1 $f10, 0x16C0($t1) ## 809016C0 /* 05C4C 808DC4BC 44808000 */ mtc1 $zero, $f16 ## $f16 = 0.00 /* 05C50 808DC4C0 00000000 */ nop /* 05C54 808DC4C4 E6100254 */ swc1 $f16, 0x0254($s0) ## 00000254 -/* 05C58 808DC4C8 8FBF001C */ lw $ra, 0x001C($sp) -/* 05C5C 808DC4CC 8FB00018 */ lw $s0, 0x0018($sp) +/* 05C58 808DC4C8 8FBF001C */ lw $ra, 0x001C($sp) +/* 05C5C 808DC4CC 8FB00018 */ lw $s0, 0x0018($sp) /* 05C60 808DC4D0 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 05C64 808DC4D4 03E00008 */ jr $ra +/* 05C64 808DC4D4 03E00008 */ jr $ra /* 05C68 808DC4D8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DC4DC.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DC4DC.s index 57a233c261..266955dded 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DC4DC.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DC4DC.s @@ -1,15 +1,15 @@ glabel func_808DC4DC /* 05C6C 808DC4DC 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 05C70 808DC4E0 AFB10018 */ sw $s1, 0x0018($sp) -/* 05C74 808DC4E4 AFB00014 */ sw $s0, 0x0014($sp) -/* 05C78 808DC4E8 AFBF001C */ sw $ra, 0x001C($sp) -/* 05C7C 808DC4EC AFA50024 */ sw $a1, 0x0024($sp) +/* 05C70 808DC4E0 AFB10018 */ sw $s1, 0x0018($sp) +/* 05C74 808DC4E4 AFB00014 */ sw $s0, 0x0014($sp) +/* 05C78 808DC4E8 AFBF001C */ sw $ra, 0x001C($sp) +/* 05C7C 808DC4EC AFA50024 */ sw $a1, 0x0024($sp) /* 05C80 808DC4F0 240E0009 */ addiu $t6, $zero, 0x0009 ## $t6 = 00000009 /* 05C84 808DC4F4 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 05C88 808DC4F8 A08E0624 */ sb $t6, 0x0624($a0) ## 00000624 /* 05C8C 808DC4FC 24910150 */ addiu $s1, $a0, 0x0150 ## $s1 = 00000150 /* 05C90 808DC500 0C02927F */ jal SkelAnime_FrameUpdateMatrix - + /* 05C94 808DC504 02202025 */ or $a0, $s1, $zero ## $a0 = 00000150 /* 05C98 808DC508 3C038090 */ lui $v1, %hi(D_808F93C0) ## $v1 = 80900000 /* 05C9C 808DC50C 246393C0 */ addiu $v1, $v1, %lo(D_808F93C0) ## $v1 = 808F93C0 @@ -31,26 +31,26 @@ glabel func_808DC4DC /* 05CDC 808DC54C 3C01C150 */ lui $at, 0xC150 ## $at = C1500000 /* 05CE0 808DC550 E50A16D0 */ swc1 $f10, 0x16D0($t0) ## 000016D0 /* 05CE4 808DC554 860901C2 */ lh $t1, 0x01C2($s0) ## 000001C2 -/* 05CE8 808DC558 5520001E */ bnel $t1, $zero, .L808DC5D4 +/* 05CE8 808DC558 5520001E */ bnel $t1, $zero, .L808DC5D4 /* 05CEC 808DC55C 44813000 */ mtc1 $at, $f6 ## $f6 = -13.00 /* 05CF0 808DC560 860A01B6 */ lh $t2, 0x01B6($s0) ## 000001B6 /* 05CF4 808DC564 240B0001 */ addiu $t3, $zero, 0x0001 ## $t3 = 00000001 /* 05CF8 808DC568 02202025 */ or $a0, $s1, $zero ## $a0 = 00000150 -/* 05CFC 808DC56C 15400022 */ bne $t2, $zero, .L808DC5F8 +/* 05CFC 808DC56C 15400022 */ bne $t2, $zero, .L808DC5F8 /* 05D00 808DC570 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 /* 05D04 808DC574 A60B01C2 */ sh $t3, 0x01C2($s0) ## 000001C2 /* 05D08 808DC578 24A5A598 */ addiu $a1, $a1, 0xA598 ## $a1 = 0600A598 -/* 05D0C 808DC57C 0C029490 */ jal func_800A5240 +/* 05D0C 808DC57C 0C029490 */ jal SkelAnime_ChangeAnimTransitionStop /* 05D10 808DC580 24060000 */ addiu $a2, $zero, 0x0000 ## $a2 = 00000000 /* 05D14 808DC584 3C040601 */ lui $a0, 0x0601 ## $a0 = 06010000 /* 05D18 808DC588 0C028800 */ jal SkelAnime_GetFrameCount - + /* 05D1C 808DC58C 2484A598 */ addiu $a0, $a0, 0xA598 ## $a0 = 0600A598 /* 05D20 808DC590 44828000 */ mtc1 $v0, $f16 ## $f16 = 0.00 /* 05D24 808DC594 02202025 */ or $a0, $s1, $zero ## $a0 = 00000150 -/* 05D28 808DC598 468084A0 */ cvt.s.w $f18, $f16 +/* 05D28 808DC598 468084A0 */ cvt.s.w $f18, $f16 /* 05D2C 808DC59C 0C02927F */ jal SkelAnime_FrameUpdateMatrix - + /* 05D30 808DC5A0 E61201CC */ swc1 $f18, 0x01CC($s0) ## 000001CC /* 05D34 808DC5A4 3C038090 */ lui $v1, %hi(D_808F93C0) ## $v1 = 80900000 /* 05D38 808DC5A8 246393C0 */ addiu $v1, $v1, %lo(D_808F93C0) ## $v1 = 808F93C0 @@ -60,54 +60,54 @@ glabel func_808DC4DC /* 05D48 808DC5B8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 05D4C 808DC5BC 240528C7 */ addiu $a1, $zero, 0x28C7 ## $a1 = 000028C7 /* 05D50 808DC5C0 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 05D54 808DC5C4 E58416C4 */ swc1 $f4, 0x16C4($t4) ## 000016C4 -/* 05D58 808DC5C8 1000000C */ beq $zero, $zero, .L808DC5FC +/* 05D58 808DC5C8 1000000C */ beq $zero, $zero, .L808DC5FC /* 05D5C 808DC5CC C6080024 */ lwc1 $f8, 0x0024($s0) ## 00000024 /* 05D60 808DC5D0 44813000 */ mtc1 $at, $f6 ## $f6 = 0.00 .L808DC5D4: /* 05D64 808DC5D4 8C6D0000 */ lw $t5, 0x0000($v1) ## 00000000 /* 05D68 808DC5D8 02202025 */ or $a0, $s1, $zero ## $a0 = 00000150 /* 05D6C 808DC5DC E5A616B8 */ swc1 $f6, 0x16B8($t5) ## 000016B8 -/* 05D70 808DC5E0 0C0295B2 */ jal func_800A56C8 +/* 05D70 808DC5E0 0C0295B2 */ jal func_800A56C8 /* 05D74 808DC5E4 8E0501CC */ lw $a1, 0x01CC($s0) ## 000001CC -/* 05D78 808DC5E8 10400003 */ beq $v0, $zero, .L808DC5F8 +/* 05D78 808DC5E8 10400003 */ beq $v0, $zero, .L808DC5F8 /* 05D7C 808DC5EC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 05D80 808DC5F0 0C236EBC */ jal func_808DBAF0 -/* 05D84 808DC5F4 8FA50024 */ lw $a1, 0x0024($sp) +/* 05D80 808DC5F0 0C236EBC */ jal func_808DBAF0 +/* 05D84 808DC5F4 8FA50024 */ lw $a1, 0x0024($sp) .L808DC5F8: /* 05D88 808DC5F8 C6080024 */ lwc1 $f8, 0x0024($s0) ## 00000024 .L808DC5FC: /* 05D8C 808DC5FC C60A005C */ lwc1 $f10, 0x005C($s0) ## 0000005C /* 05D90 808DC600 C6120028 */ lwc1 $f18, 0x0028($s0) ## 00000028 /* 05D94 808DC604 C6040060 */ lwc1 $f4, 0x0060($s0) ## 00000060 -/* 05D98 808DC608 460A4400 */ add.s $f16, $f8, $f10 +/* 05D98 808DC608 460A4400 */ add.s $f16, $f8, $f10 /* 05D9C 808DC60C C60A0064 */ lwc1 $f10, 0x0064($s0) ## 00000064 /* 05DA0 808DC610 C608002C */ lwc1 $f8, 0x002C($s0) ## 0000002C -/* 05DA4 808DC614 46049180 */ add.s $f6, $f18, $f4 +/* 05DA4 808DC614 46049180 */ add.s $f6, $f18, $f4 /* 05DA8 808DC618 E6100024 */ swc1 $f16, 0x0024($s0) ## 00000024 /* 05DAC 808DC61C 2604005C */ addiu $a0, $s0, 0x005C ## $a0 = 0000005C -/* 05DB0 808DC620 460A4400 */ add.s $f16, $f8, $f10 +/* 05DB0 808DC620 460A4400 */ add.s $f16, $f8, $f10 /* 05DB4 808DC624 E6060028 */ swc1 $f6, 0x0028($s0) ## 00000028 /* 05DB8 808DC628 3C053F80 */ lui $a1, 0x3F80 ## $a1 = 3F800000 /* 05DBC 808DC62C 3C063F00 */ lui $a2, 0x3F00 ## $a2 = 3F000000 /* 05DC0 808DC630 0C01E123 */ jal Math_SmoothDownscaleMaxF - + /* 05DC4 808DC634 E610002C */ swc1 $f16, 0x002C($s0) ## 0000002C /* 05DC8 808DC638 26040060 */ addiu $a0, $s0, 0x0060 ## $a0 = 00000060 /* 05DCC 808DC63C 3C053F80 */ lui $a1, 0x3F80 ## $a1 = 3F800000 /* 05DD0 808DC640 0C01E123 */ jal Math_SmoothDownscaleMaxF - + /* 05DD4 808DC644 3C063F00 */ lui $a2, 0x3F00 ## $a2 = 3F000000 /* 05DD8 808DC648 26040064 */ addiu $a0, $s0, 0x0064 ## $a0 = 00000064 /* 05DDC 808DC64C 3C053F80 */ lui $a1, 0x3F80 ## $a1 = 3F800000 /* 05DE0 808DC650 0C01E123 */ jal Math_SmoothDownscaleMaxF - + /* 05DE4 808DC654 3C063F00 */ lui $a2, 0x3F00 ## $a2 = 3F000000 -/* 05DE8 808DC658 8FBF001C */ lw $ra, 0x001C($sp) -/* 05DEC 808DC65C 8FB00014 */ lw $s0, 0x0014($sp) -/* 05DF0 808DC660 8FB10018 */ lw $s1, 0x0018($sp) -/* 05DF4 808DC664 03E00008 */ jr $ra +/* 05DE8 808DC658 8FBF001C */ lw $ra, 0x001C($sp) +/* 05DEC 808DC65C 8FB00014 */ lw $s0, 0x0014($sp) +/* 05DF0 808DC660 8FB10018 */ lw $s1, 0x0018($sp) +/* 05DF4 808DC664 03E00008 */ jr $ra /* 05DF8 808DC668 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DC66C.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DC66C.s index 400804050d..d4e21ae8a2 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DC66C.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DC66C.s @@ -1,21 +1,21 @@ glabel func_808DC66C /* 05DFC 808DC66C 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 05E00 808DC670 AFBF001C */ sw $ra, 0x001C($sp) -/* 05E04 808DC674 AFB00018 */ sw $s0, 0x0018($sp) +/* 05E00 808DC670 AFBF001C */ sw $ra, 0x001C($sp) +/* 05E04 808DC674 AFB00018 */ sw $s0, 0x0018($sp) /* 05E08 808DC678 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 05E0C 808DC67C 0C235C4B */ jal func_808D712C +/* 05E0C 808DC67C 0C235C4B */ jal func_808D712C /* 05E10 808DC680 2406017C */ addiu $a2, $zero, 0x017C ## $a2 = 0000017C /* 05E14 808DC684 3C040601 */ lui $a0, 0x0601 ## $a0 = 06010000 /* 05E18 808DC688 0C028800 */ jal SkelAnime_GetFrameCount - + /* 05E1C 808DC68C 24848128 */ addiu $a0, $a0, 0x8128 ## $a0 = 06008128 /* 05E20 808DC690 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 05E24 808DC694 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 /* 05E28 808DC698 24A58128 */ addiu $a1, $a1, 0x8128 ## $a1 = 06008128 -/* 05E2C 808DC69C 468021A0 */ cvt.s.w $f6, $f4 +/* 05E2C 808DC69C 468021A0 */ cvt.s.w $f6, $f4 /* 05E30 808DC6A0 26040150 */ addiu $a0, $s0, 0x0150 ## $a0 = 00000150 /* 05E34 808DC6A4 24060000 */ addiu $a2, $zero, 0x0000 ## $a2 = 00000000 -/* 05E38 808DC6A8 0C029490 */ jal func_800A5240 +/* 05E38 808DC6A8 0C029490 */ jal SkelAnime_ChangeAnimTransitionStop /* 05E3C 808DC6AC E60601CC */ swc1 $f6, 0x01CC($s0) ## 000001CC /* 05E40 808DC6B0 3C048090 */ lui $a0, %hi(D_808F93C0) ## $a0 = 80900000 /* 05E44 808DC6B4 240E0046 */ addiu $t6, $zero, 0x0046 ## $t6 = 00000046 @@ -36,15 +36,15 @@ glabel func_808DC66C /* 05E80 808DC6F0 3C03808E */ lui $v1, %hi(D_808E4C58) ## $v1 = 808E0000 /* 05E84 808DC6F4 24634C58 */ addiu $v1, $v1, %lo(D_808E4C58) ## $v1 = 808E4C58 .L808DC6F8: -/* 05E88 808DC6F8 0062C021 */ addu $t8, $v1, $v0 -/* 05E8C 808DC6FC 00024040 */ sll $t0, $v0, 1 +/* 05E88 808DC6F8 0062C021 */ addu $t8, $v1, $v0 +/* 05E8C 808DC6FC 00024040 */ sll $t0, $v0, 1 /* 05E90 808DC700 24420001 */ addiu $v0, $v0, 0x0001 ## $v0 = 00000002 -/* 05E94 808DC704 00021400 */ sll $v0, $v0, 16 +/* 05E94 808DC704 00021400 */ sll $v0, $v0, 16 /* 05E98 808DC708 93190000 */ lbu $t9, 0x0000($t8) ## 00000000 -/* 05E9C 808DC70C 00021403 */ sra $v0, $v0, 16 -/* 05EA0 808DC710 2841000F */ slti $at, $v0, 0x000F -/* 05EA4 808DC714 02084821 */ addu $t1, $s0, $t0 -/* 05EA8 808DC718 1420FFF7 */ bne $at, $zero, .L808DC6F8 +/* 05E9C 808DC70C 00021403 */ sra $v0, $v0, 16 +/* 05EA0 808DC710 2841000F */ slti $at, $v0, 0x000F +/* 05EA4 808DC714 02084821 */ addu $t1, $s0, $t0 +/* 05EA8 808DC718 1420FFF7 */ bne $at, $zero, .L808DC6F8 /* 05EAC 808DC71C A53904E4 */ sh $t9, 0x04E4($t1) ## 000004E4 /* 05EB0 808DC720 3C0140C0 */ lui $at, 0x40C0 ## $at = 40C00000 /* 05EB4 808DC724 44818000 */ mtc1 $at, $f16 ## $f16 = 6.00 @@ -56,10 +56,10 @@ glabel func_808DC66C /* 05ECC 808DC73C A60001C2 */ sh $zero, 0x01C2($s0) ## 000001C2 /* 05ED0 808DC740 A60C01A6 */ sh $t4, 0x01A6($s0) ## 000001A6 /* 05ED4 808DC744 E6100508 */ swc1 $f16, 0x0508($s0) ## 00000508 -/* 05ED8 808DC748 8FBF001C */ lw $ra, 0x001C($sp) -/* 05EDC 808DC74C 8FB00018 */ lw $s0, 0x0018($sp) +/* 05ED8 808DC748 8FBF001C */ lw $ra, 0x001C($sp) +/* 05EDC 808DC74C 8FB00018 */ lw $s0, 0x0018($sp) /* 05EE0 808DC750 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 05EE4 808DC754 03E00008 */ jr $ra +/* 05EE4 808DC754 03E00008 */ jr $ra /* 05EE8 808DC758 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DC75C.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DC75C.s index 0866907f1c..4dfc482274 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DC75C.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DC75C.s @@ -1,92 +1,92 @@ glabel func_808DC75C /* 05EEC 808DC75C 27BDFFA0 */ addiu $sp, $sp, 0xFFA0 ## $sp = FFFFFFA0 -/* 05EF0 808DC760 AFB30038 */ sw $s3, 0x0038($sp) +/* 05EF0 808DC760 AFB30038 */ sw $s3, 0x0038($sp) /* 05EF4 808DC764 00809825 */ or $s3, $a0, $zero ## $s3 = 00000000 -/* 05EF8 808DC768 AFBF003C */ sw $ra, 0x003C($sp) -/* 05EFC 808DC76C AFB20034 */ sw $s2, 0x0034($sp) +/* 05EF8 808DC768 AFBF003C */ sw $ra, 0x003C($sp) +/* 05EFC 808DC76C AFB20034 */ sw $s2, 0x0034($sp) /* 05F00 808DC770 24840150 */ addiu $a0, $a0, 0x0150 ## $a0 = 00000150 /* 05F04 808DC774 00A09025 */ or $s2, $a1, $zero ## $s2 = 00000000 -/* 05F08 808DC778 AFB10030 */ sw $s1, 0x0030($sp) -/* 05F0C 808DC77C AFB0002C */ sw $s0, 0x002C($sp) -/* 05F10 808DC780 F7B60020 */ sdc1 $f22, 0x0020($sp) -/* 05F14 808DC784 F7B40018 */ sdc1 $f20, 0x0018($sp) +/* 05F08 808DC778 AFB10030 */ sw $s1, 0x0030($sp) +/* 05F0C 808DC77C AFB0002C */ sw $s0, 0x002C($sp) +/* 05F10 808DC780 F7B60020 */ sdc1 $f22, 0x0020($sp) +/* 05F14 808DC784 F7B40018 */ sdc1 $f20, 0x0018($sp) /* 05F18 808DC788 0C02927F */ jal SkelAnime_FrameUpdateMatrix - -/* 05F1C 808DC78C AFA40048 */ sw $a0, 0x0048($sp) + +/* 05F1C 808DC78C AFA40048 */ sw $a0, 0x0048($sp) /* 05F20 808DC790 866301C2 */ lh $v1, 0x01C2($s3) ## 000001C2 /* 05F24 808DC794 02402025 */ or $a0, $s2, $zero ## $a0 = 00000000 /* 05F28 808DC798 3C0544BB */ lui $a1, 0x44BB ## $a1 = 44BB0000 -/* 05F2C 808DC79C 14600016 */ bne $v1, $zero, .L808DC7F8 +/* 05F2C 808DC79C 14600016 */ bne $v1, $zero, .L808DC7F8 /* 05F30 808DC7A0 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 /* 05F34 808DC7A4 34A58000 */ ori $a1, $a1, 0x8000 ## $a1 = 44BB8000 -/* 05F38 808DC7A8 0C235AFC */ jal func_808D6BF0 +/* 05F38 808DC7A8 0C235AFC */ jal func_808D6BF0 /* 05F3C 808DC7AC 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 05F40 808DC7B0 8FA40048 */ lw $a0, 0x0048($sp) -/* 05F44 808DC7B4 0C0295B2 */ jal func_800A56C8 +/* 05F40 808DC7B0 8FA40048 */ lw $a0, 0x0048($sp) +/* 05F44 808DC7B4 0C0295B2 */ jal func_800A56C8 /* 05F48 808DC7B8 8E6501CC */ lw $a1, 0x01CC($s3) ## 000001CC -/* 05F4C 808DC7BC 10400063 */ beq $v0, $zero, .L808DC94C +/* 05F4C 808DC7BC 10400063 */ beq $v0, $zero, .L808DC94C /* 05F50 808DC7C0 3C100601 */ lui $s0, 0x0601 ## $s0 = 06010000 /* 05F54 808DC7C4 26108F44 */ addiu $s0, $s0, 0x8F44 ## $s0 = 06008F44 /* 05F58 808DC7C8 0C028800 */ jal SkelAnime_GetFrameCount - + /* 05F5C 808DC7CC 02002025 */ or $a0, $s0, $zero ## $a0 = 06008F44 /* 05F60 808DC7D0 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 05F64 808DC7D4 02002825 */ or $a1, $s0, $zero ## $a1 = 06008F44 /* 05F68 808DC7D8 24060000 */ addiu $a2, $zero, 0x0000 ## $a2 = 00000000 -/* 05F6C 808DC7DC 468021A0 */ cvt.s.w $f6, $f4 +/* 05F6C 808DC7DC 468021A0 */ cvt.s.w $f6, $f4 /* 05F70 808DC7E0 E66601CC */ swc1 $f6, 0x01CC($s3) ## 000001CC -/* 05F74 808DC7E4 0C0294D3 */ jal func_800A534C -/* 05F78 808DC7E8 8FA40048 */ lw $a0, 0x0048($sp) +/* 05F74 808DC7E4 0C0294D3 */ jal SkelAnime_ChangeAnimTransitionRepeat +/* 05F78 808DC7E8 8FA40048 */ lw $a0, 0x0048($sp) /* 05F7C 808DC7EC 240E0001 */ addiu $t6, $zero, 0x0001 ## $t6 = 00000001 -/* 05F80 808DC7F0 10000056 */ beq $zero, $zero, .L808DC94C +/* 05F80 808DC7F0 10000056 */ beq $zero, $zero, .L808DC94C /* 05F84 808DC7F4 A66E01C2 */ sh $t6, 0x01C2($s3) ## 000001C2 .L808DC7F8: -/* 05F88 808DC7F8 14610025 */ bne $v1, $at, .L808DC890 -/* 05F8C 808DC7FC 8FA40048 */ lw $a0, 0x0048($sp) +/* 05F88 808DC7F8 14610025 */ bne $v1, $at, .L808DC890 +/* 05F8C 808DC7FC 8FA40048 */ lw $a0, 0x0048($sp) /* 05F90 808DC800 02402025 */ or $a0, $s2, $zero ## $a0 = 00000000 /* 05F94 808DC804 3C05447A */ lui $a1, 0x447A ## $a1 = 447A0000 -/* 05F98 808DC808 0C235AFC */ jal func_808D6BF0 +/* 05F98 808DC808 0C235AFC */ jal func_808D6BF0 /* 05F9C 808DC80C 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 /* 05FA0 808DC810 866F01B6 */ lh $t7, 0x01B6($s3) ## 000001B6 /* 05FA4 808DC814 3C100601 */ lui $s0, 0x0601 ## $s0 = 06010000 /* 05FA8 808DC818 26108A88 */ addiu $s0, $s0, 0x8A88 ## $s0 = 06008A88 -/* 05FAC 808DC81C 55E0004C */ bnel $t7, $zero, .L808DC950 +/* 05FAC 808DC81C 55E0004C */ bnel $t7, $zero, .L808DC950 /* 05FB0 808DC820 866401A2 */ lh $a0, 0x01A2($s3) ## 000001A2 /* 05FB4 808DC824 0C028800 */ jal SkelAnime_GetFrameCount - + /* 05FB8 808DC828 02002025 */ or $a0, $s0, $zero ## $a0 = 06008A88 /* 05FBC 808DC82C 44824000 */ mtc1 $v0, $f8 ## $f8 = 0.00 /* 05FC0 808DC830 02002825 */ or $a1, $s0, $zero ## $a1 = 06008A88 /* 05FC4 808DC834 24060000 */ addiu $a2, $zero, 0x0000 ## $a2 = 00000000 -/* 05FC8 808DC838 468042A0 */ cvt.s.w $f10, $f8 +/* 05FC8 808DC838 468042A0 */ cvt.s.w $f10, $f8 /* 05FCC 808DC83C E66A01CC */ swc1 $f10, 0x01CC($s3) ## 000001CC -/* 05FD0 808DC840 0C029490 */ jal func_800A5240 -/* 05FD4 808DC844 8FA40048 */ lw $a0, 0x0048($sp) +/* 05FD0 808DC840 0C029490 */ jal SkelAnime_ChangeAnimTransitionStop +/* 05FD4 808DC844 8FA40048 */ lw $a0, 0x0048($sp) /* 05FD8 808DC848 24180002 */ addiu $t8, $zero, 0x0002 ## $t8 = 00000002 /* 05FDC 808DC84C A67801C2 */ sh $t8, 0x01C2($s3) ## 000001C2 /* 05FE0 808DC850 0C02927F */ jal SkelAnime_FrameUpdateMatrix - -/* 05FE4 808DC854 8FA40048 */ lw $a0, 0x0048($sp) + +/* 05FE4 808DC854 8FA40048 */ lw $a0, 0x0048($sp) /* 05FE8 808DC858 3C014190 */ lui $at, 0x4190 ## $at = 41900000 /* 05FEC 808DC85C 3C198090 */ lui $t9, %hi(D_808F93C0) ## $t9 = 80900000 -/* 05FF0 808DC860 8F3993C0 */ lw $t9, %lo(D_808F93C0)($t9) +/* 05FF0 808DC860 8F3993C0 */ lw $t9, %lo(D_808F93C0)($t9) /* 05FF4 808DC864 44818000 */ mtc1 $at, $f16 ## $f16 = 18.00 /* 05FF8 808DC868 02602025 */ or $a0, $s3, $zero ## $a0 = 00000000 /* 05FFC 808DC86C 240528C7 */ addiu $a1, $zero, 0x28C7 ## $a1 = 000028C7 /* 06000 808DC870 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 06004 808DC874 E73016C4 */ swc1 $f16, 0x16C4($t9) ## 809016C4 /* 06008 808DC878 02602025 */ or $a0, $s3, $zero ## $a0 = 00000000 /* 0600C 808DC87C 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 06010 808DC880 240539CF */ addiu $a1, $zero, 0x39CF ## $a1 = 000039CF /* 06014 808DC884 24080082 */ addiu $t0, $zero, 0x0082 ## $t0 = 00000082 -/* 06018 808DC888 10000030 */ beq $zero, $zero, .L808DC94C +/* 06018 808DC888 10000030 */ beq $zero, $zero, .L808DC94C /* 0601C 808DC88C A66801BA */ sh $t0, 0x01BA($s3) ## 000001BA .L808DC890: -/* 06020 808DC890 0C0295B2 */ jal func_800A56C8 +/* 06020 808DC890 0C0295B2 */ jal func_800A56C8 /* 06024 808DC894 3C0540E0 */ lui $a1, 0x40E0 ## $a1 = 40E00000 -/* 06028 808DC898 10400025 */ beq $v0, $zero, .L808DC930 +/* 06028 808DC898 10400025 */ beq $v0, $zero, .L808DC930 /* 0602C 808DC89C 00008025 */ or $s0, $zero, $zero ## $s0 = 00000000 /* 06030 808DC8A0 3C0143FA */ lui $at, 0x43FA ## $at = 43FA0000 /* 06034 808DC8A4 4481B000 */ mtc1 $at, $f22 ## $f22 = 500.00 @@ -95,77 +95,77 @@ glabel func_808DC75C /* 06040 808DC8B0 267101FC */ addiu $s1, $s3, 0x01FC ## $s1 = 000001FC .L808DC8B4: /* 06044 808DC8B4 0C00CFC8 */ jal Math_Rand_CenteredFloat - -/* 06048 808DC8B8 4600A306 */ mov.s $f12, $f20 -/* 0604C 808DC8BC E7A00050 */ swc1 $f0, 0x0050($sp) + +/* 06048 808DC8B8 4600A306 */ mov.s $f12, $f20 +/* 0604C 808DC8BC E7A00050 */ swc1 $f0, 0x0050($sp) /* 06050 808DC8C0 0C00CFC8 */ jal Math_Rand_CenteredFloat - -/* 06054 808DC8C4 4600A306 */ mov.s $f12, $f20 -/* 06058 808DC8C8 E7A00054 */ swc1 $f0, 0x0054($sp) + +/* 06054 808DC8C4 4600A306 */ mov.s $f12, $f20 +/* 06058 808DC8C8 E7A00054 */ swc1 $f0, 0x0054($sp) /* 0605C 808DC8CC 0C00CFC8 */ jal Math_Rand_CenteredFloat - -/* 06060 808DC8D0 4600A306 */ mov.s $f12, $f20 + +/* 06060 808DC8D0 4600A306 */ mov.s $f12, $f20 /* 06064 808DC8D4 3C014348 */ lui $at, 0x4348 ## $at = 43480000 /* 06068 808DC8D8 44816000 */ mtc1 $at, $f12 ## $f12 = 200.00 /* 0606C 808DC8DC 0C00CFBE */ jal Math_Rand_ZeroFloat - -/* 06070 808DC8E0 E7A00058 */ swc1 $f0, 0x0058($sp) -/* 06074 808DC8E4 46160480 */ add.s $f18, $f0, $f22 + +/* 06070 808DC8E0 E7A00058 */ swc1 $f0, 0x0058($sp) +/* 06074 808DC8E4 46160480 */ add.s $f18, $f0, $f22 /* 06078 808DC8E8 3C07808E */ lui $a3, %hi(D_808E4C6C) ## $a3 = 808E0000 /* 0607C 808DC8EC 24090014 */ addiu $t1, $zero, 0x0014 ## $t1 = 00000014 -/* 06080 808DC8F0 AFA90014 */ sw $t1, 0x0014($sp) +/* 06080 808DC8F0 AFA90014 */ sw $t1, 0x0014($sp) /* 06084 808DC8F4 24E74C6C */ addiu $a3, $a3, %lo(D_808E4C6C) ## $a3 = 808E4C6C -/* 06088 808DC8F8 E7B20010 */ swc1 $f18, 0x0010($sp) +/* 06088 808DC8F8 E7B20010 */ swc1 $f18, 0x0010($sp) /* 0608C 808DC8FC 02402025 */ or $a0, $s2, $zero ## $a0 = 00000000 /* 06090 808DC900 02202825 */ or $a1, $s1, $zero ## $a1 = 000001FC -/* 06094 808DC904 0C235A6C */ jal func_808D69B0 +/* 06094 808DC904 0C235A6C */ jal func_808D69B0 /* 06098 808DC908 27A60050 */ addiu $a2, $sp, 0x0050 ## $a2 = FFFFFFF0 /* 0609C 808DC90C 26100001 */ addiu $s0, $s0, 0x0001 ## $s0 = 00000001 -/* 060A0 808DC910 00108400 */ sll $s0, $s0, 16 -/* 060A4 808DC914 00108403 */ sra $s0, $s0, 16 -/* 060A8 808DC918 2A010064 */ slti $at, $s0, 0x0064 -/* 060AC 808DC91C 1420FFE5 */ bne $at, $zero, .L808DC8B4 +/* 060A0 808DC910 00108400 */ sll $s0, $s0, 16 +/* 060A4 808DC914 00108403 */ sra $s0, $s0, 16 +/* 060A8 808DC918 2A010064 */ slti $at, $s0, 0x0064 +/* 060AC 808DC91C 1420FFE5 */ bne $at, $zero, .L808DC8B4 /* 060B0 808DC920 00000000 */ nop /* 060B4 808DC924 02602025 */ or $a0, $s3, $zero ## $a0 = 00000000 /* 060B8 808DC928 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 060BC 808DC92C 24050806 */ addiu $a1, $zero, 0x0806 ## $a1 = 00000806 .L808DC930: -/* 060C0 808DC930 8FA40048 */ lw $a0, 0x0048($sp) -/* 060C4 808DC934 0C0295B2 */ jal func_800A56C8 +/* 060C0 808DC930 8FA40048 */ lw $a0, 0x0048($sp) +/* 060C4 808DC934 0C0295B2 */ jal func_800A56C8 /* 060C8 808DC938 8E6501CC */ lw $a1, 0x01CC($s3) ## 000001CC -/* 060CC 808DC93C 10400003 */ beq $v0, $zero, .L808DC94C +/* 060CC 808DC93C 10400003 */ beq $v0, $zero, .L808DC94C /* 060D0 808DC940 02602025 */ or $a0, $s3, $zero ## $a0 = 00000000 -/* 060D4 808DC944 0C236EBC */ jal func_808DBAF0 +/* 060D4 808DC944 0C236EBC */ jal func_808DBAF0 /* 060D8 808DC948 02402825 */ or $a1, $s2, $zero ## $a1 = 00000000 .L808DC94C: /* 060DC 808DC94C 866401A2 */ lh $a0, 0x01A2($s3) ## 000001A2 .L808DC950: -/* 060E0 808DC950 00800821 */ addu $at, $a0, $zero -/* 060E4 808DC954 00042080 */ sll $a0, $a0, 2 -/* 060E8 808DC958 00812023 */ subu $a0, $a0, $at -/* 060EC 808DC95C 00042100 */ sll $a0, $a0, 4 -/* 060F0 808DC960 00812023 */ subu $a0, $a0, $at -/* 060F4 808DC964 000420C0 */ sll $a0, $a0, 3 -/* 060F8 808DC968 00812023 */ subu $a0, $a0, $at -/* 060FC 808DC96C 00042080 */ sll $a0, $a0, 2 -/* 06100 808DC970 00042400 */ sll $a0, $a0, 16 +/* 060E0 808DC950 00800821 */ addu $at, $a0, $zero +/* 060E4 808DC954 00042080 */ sll $a0, $a0, 2 +/* 060E8 808DC958 00812023 */ subu $a0, $a0, $at +/* 060EC 808DC95C 00042100 */ sll $a0, $a0, 4 +/* 060F0 808DC960 00812023 */ subu $a0, $a0, $at +/* 060F4 808DC964 000420C0 */ sll $a0, $a0, 3 +/* 060F8 808DC968 00812023 */ subu $a0, $a0, $at +/* 060FC 808DC96C 00042080 */ sll $a0, $a0, 2 +/* 06100 808DC970 00042400 */ sll $a0, $a0, 16 /* 06104 808DC974 0C01DE1C */ jal Math_Sins ## sins? -/* 06108 808DC978 00042403 */ sra $a0, $a0, 16 -/* 0610C 808DC97C 46000080 */ add.s $f2, $f0, $f0 +/* 06108 808DC978 00042403 */ sra $a0, $a0, 16 +/* 0610C 808DC97C 46000080 */ add.s $f2, $f0, $f0 /* 06110 808DC980 C6640028 */ lwc1 $f4, 0x0028($s3) ## 00000028 -/* 06114 808DC984 46022180 */ add.s $f6, $f4, $f2 +/* 06114 808DC984 46022180 */ add.s $f6, $f4, $f2 /* 06118 808DC988 E6620060 */ swc1 $f2, 0x0060($s3) ## 00000060 /* 0611C 808DC98C E6660028 */ swc1 $f6, 0x0028($s3) ## 00000028 -/* 06120 808DC990 8FBF003C */ lw $ra, 0x003C($sp) -/* 06124 808DC994 8FB30038 */ lw $s3, 0x0038($sp) -/* 06128 808DC998 8FB20034 */ lw $s2, 0x0034($sp) -/* 0612C 808DC99C 8FB10030 */ lw $s1, 0x0030($sp) -/* 06130 808DC9A0 8FB0002C */ lw $s0, 0x002C($sp) -/* 06134 808DC9A4 D7B60020 */ ldc1 $f22, 0x0020($sp) -/* 06138 808DC9A8 D7B40018 */ ldc1 $f20, 0x0018($sp) -/* 0613C 808DC9AC 03E00008 */ jr $ra +/* 06120 808DC990 8FBF003C */ lw $ra, 0x003C($sp) +/* 06124 808DC994 8FB30038 */ lw $s3, 0x0038($sp) +/* 06128 808DC998 8FB20034 */ lw $s2, 0x0034($sp) +/* 0612C 808DC99C 8FB10030 */ lw $s1, 0x0030($sp) +/* 06130 808DC9A0 8FB0002C */ lw $s0, 0x002C($sp) +/* 06134 808DC9A4 D7B60020 */ ldc1 $f22, 0x0020($sp) +/* 06138 808DC9A8 D7B40018 */ ldc1 $f20, 0x0018($sp) +/* 0613C 808DC9AC 03E00008 */ jr $ra /* 06140 808DC9B0 27BD0060 */ addiu $sp, $sp, 0x0060 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DC9B4.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DC9B4.s index 51fcc1e00e..246f9cea09 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DC9B4.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DC9B4.s @@ -1,34 +1,34 @@ glabel func_808DC9B4 /* 06144 808DC9B4 27BDFF90 */ addiu $sp, $sp, 0xFF90 ## $sp = FFFFFF90 -/* 06148 808DC9B8 AFBF005C */ sw $ra, 0x005C($sp) -/* 0614C 808DC9BC AFB30058 */ sw $s3, 0x0058($sp) -/* 06150 808DC9C0 AFB20054 */ sw $s2, 0x0054($sp) -/* 06154 808DC9C4 AFB10050 */ sw $s1, 0x0050($sp) -/* 06158 808DC9C8 AFB0004C */ sw $s0, 0x004C($sp) -/* 0615C 808DC9CC F7B80040 */ sdc1 $f24, 0x0040($sp) -/* 06160 808DC9D0 F7B60038 */ sdc1 $f22, 0x0038($sp) -/* 06164 808DC9D4 F7B40030 */ sdc1 $f20, 0x0030($sp) +/* 06148 808DC9B8 AFBF005C */ sw $ra, 0x005C($sp) +/* 0614C 808DC9BC AFB30058 */ sw $s3, 0x0058($sp) +/* 06150 808DC9C0 AFB20054 */ sw $s2, 0x0054($sp) +/* 06154 808DC9C4 AFB10050 */ sw $s1, 0x0050($sp) +/* 06158 808DC9C8 AFB0004C */ sw $s0, 0x004C($sp) +/* 0615C 808DC9CC F7B80040 */ sdc1 $f24, 0x0040($sp) +/* 06160 808DC9D0 F7B60038 */ sdc1 $f22, 0x0038($sp) +/* 06164 808DC9D4 F7B40030 */ sdc1 $f20, 0x0030($sp) /* 06168 808DC9D8 8C8E0194 */ lw $t6, 0x0194($a0) ## 00000194 /* 0616C 808DC9DC 3C02808E */ lui $v0, %hi(func_808DCB7C) ## $v0 = 808E0000 /* 06170 808DC9E0 2442CB7C */ addiu $v0, $v0, %lo(func_808DCB7C) ## $v0 = 808DCB7C /* 06174 808DC9E4 00808825 */ or $s1, $a0, $zero ## $s1 = 00000000 -/* 06178 808DC9E8 104E005A */ beq $v0, $t6, .L808DCB54 +/* 06178 808DC9E8 104E005A */ beq $v0, $t6, .L808DCB54 /* 0617C 808DC9EC 00A09825 */ or $s3, $a1, $zero ## $s3 = 00000000 /* 06180 808DC9F0 2406017C */ addiu $a2, $zero, 0x017C ## $a2 = 0000017C -/* 06184 808DC9F4 0C235C4B */ jal func_808D712C -/* 06188 808DC9F8 AFA20060 */ sw $v0, 0x0060($sp) +/* 06184 808DC9F4 0C235C4B */ jal func_808D712C +/* 06188 808DC9F8 AFA20060 */ sw $v0, 0x0060($sp) /* 0618C 808DC9FC 3C100600 */ lui $s0, 0x0600 ## $s0 = 06000000 /* 06190 808DCA00 26104884 */ addiu $s0, $s0, 0x4884 ## $s0 = 06004884 /* 06194 808DCA04 0C028800 */ jal SkelAnime_GetFrameCount - + /* 06198 808DCA08 02002025 */ or $a0, $s0, $zero ## $a0 = 06004884 /* 0619C 808DCA0C 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 061A0 808DCA10 4480C000 */ mtc1 $zero, $f24 ## $f24 = 0.00 /* 061A4 808DCA14 26240150 */ addiu $a0, $s1, 0x0150 ## $a0 = 00000150 -/* 061A8 808DCA18 468021A0 */ cvt.s.w $f6, $f4 -/* 061AC 808DCA1C 4406C000 */ mfc1 $a2, $f24 +/* 061A8 808DCA18 468021A0 */ cvt.s.w $f6, $f4 +/* 061AC 808DCA1C 4406C000 */ mfc1 $a2, $f24 /* 061B0 808DCA20 02002825 */ or $a1, $s0, $zero ## $a1 = 06004884 -/* 061B4 808DCA24 0C029490 */ jal func_800A5240 +/* 061B4 808DCA24 0C029490 */ jal SkelAnime_ChangeAnimTransitionStop /* 061B8 808DCA28 E62601CC */ swc1 $f6, 0x01CC($s1) ## 000001CC /* 061BC 808DCA2C 3C028090 */ lui $v0, %hi(D_808F93C0) ## $v0 = 80900000 /* 061C0 808DCA30 244293C0 */ addiu $v0, $v0, %lo(D_808F93C0) ## $v0 = 808F93C0 @@ -44,7 +44,7 @@ glabel func_808DC9B4 /* 061E8 808DCA58 3C01C040 */ lui $at, 0xC040 ## $at = C0400000 /* 061EC 808DCA5C 44812000 */ mtc1 $at, $f4 ## $f4 = -3.00 /* 061F0 808DCA60 E46A16BC */ swc1 $f10, 0x16BC($v1) ## 000016BC -/* 061F4 808DCA64 8FB80060 */ lw $t8, 0x0060($sp) +/* 061F4 808DCA64 8FB80060 */ lw $t8, 0x0060($sp) /* 061F8 808DCA68 E638005C */ swc1 $f24, 0x005C($s1) ## 0000005C /* 061FC 808DCA6C E6380060 */ swc1 $f24, 0x0060($s1) ## 00000060 /* 06200 808DCA70 E6380064 */ swc1 $f24, 0x0064($s1) ## 00000064 @@ -66,42 +66,42 @@ glabel func_808DC9B4 /* 06240 808DCAB0 E54616D0 */ swc1 $f6, 0x16D0($t2) ## 000016D0 .L808DCAB4: /* 06244 808DCAB4 0C00CFC8 */ jal Math_Rand_CenteredFloat - -/* 06248 808DCAB8 4600B306 */ mov.s $f12, $f22 -/* 0624C 808DCABC 46000506 */ mov.s $f20, $f0 + +/* 06248 808DCAB8 4600B306 */ mov.s $f12, $f22 +/* 0624C 808DCABC 46000506 */ mov.s $f20, $f0 /* 06250 808DCAC0 0C00CFC8 */ jal Math_Rand_CenteredFloat - -/* 06254 808DCAC4 4600B306 */ mov.s $f12, $f22 + +/* 06254 808DCAC4 4600B306 */ mov.s $f12, $f22 /* 06258 808DCAC8 C62801FC */ lwc1 $f8, 0x01FC($s1) ## 000001FC -/* 0625C 808DCACC 4600A48D */ trunc.w.s $f18, $f20 +/* 0625C 808DCACC 4600A48D */ trunc.w.s $f18, $f20 /* 06260 808DCAD0 260900C8 */ addiu $t1, $s0, 0x00C8 ## $t1 = 000000C8 -/* 06264 808DCAD4 E7A80010 */ swc1 $f8, 0x0010($sp) +/* 06264 808DCAD4 E7A80010 */ swc1 $f8, 0x0010($sp) /* 06268 808DCAD8 C62A0200 */ lwc1 $f10, 0x0200($s1) ## 00000200 -/* 0626C 808DCADC 4600010D */ trunc.w.s $f4, $f0 -/* 06270 808DCAE0 440C9000 */ mfc1 $t4, $f18 -/* 06274 808DCAE4 E7AA0014 */ swc1 $f10, 0x0014($sp) +/* 0626C 808DCADC 4600010D */ trunc.w.s $f4, $f0 +/* 06270 808DCAE0 440C9000 */ mfc1 $t4, $f18 +/* 06274 808DCAE4 E7AA0014 */ swc1 $f10, 0x0014($sp) /* 06278 808DCAE8 C6300204 */ lwc1 $f16, 0x0204($s1) ## 00000204 -/* 0627C 808DCAEC 440E2000 */ mfc1 $t6, $f4 -/* 06280 808DCAF0 AFAC001C */ sw $t4, 0x001C($sp) -/* 06284 808DCAF4 E7B00018 */ swc1 $f16, 0x0018($sp) +/* 0627C 808DCAEC 440E2000 */ mfc1 $t6, $f4 +/* 06280 808DCAF0 AFAC001C */ sw $t4, 0x001C($sp) +/* 06284 808DCAF4 E7B00018 */ swc1 $f16, 0x0018($sp) /* 06288 808DCAF8 8639008A */ lh $t9, 0x008A($s1) ## 0000008A -/* 0628C 808DCAFC 000E7C00 */ sll $t7, $t6, 16 -/* 06290 808DCB00 000FC403 */ sra $t8, $t7, 16 -/* 06294 808DCB04 03194021 */ addu $t0, $t8, $t9 -/* 06298 808DCB08 AFA80020 */ sw $t0, 0x0020($sp) -/* 0629C 808DCB0C AFA90028 */ sw $t1, 0x0028($sp) -/* 062A0 808DCB10 AFA00024 */ sw $zero, 0x0024($sp) +/* 0628C 808DCAFC 000E7C00 */ sll $t7, $t6, 16 +/* 06290 808DCB00 000FC403 */ sra $t8, $t7, 16 +/* 06294 808DCB04 03194021 */ addu $t0, $t8, $t9 +/* 06298 808DCB08 AFA80020 */ sw $t0, 0x0020($sp) +/* 0629C 808DCB0C AFA90028 */ sw $t1, 0x0028($sp) +/* 062A0 808DCB10 AFA00024 */ sw $zero, 0x0024($sp) /* 062A4 808DCB14 02402025 */ or $a0, $s2, $zero ## $a0 = 00001C24 /* 062A8 808DCB18 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 /* 062AC 808DCB1C 02603025 */ or $a2, $s3, $zero ## $a2 = 00000000 /* 062B0 808DCB20 0C00C916 */ jal Actor_SpawnAttached - + /* 062B4 808DCB24 240700E8 */ addiu $a3, $zero, 0x00E8 ## $a3 = 000000E8 /* 062B8 808DCB28 26100001 */ addiu $s0, $s0, 0x0001 ## $s0 = 00000001 -/* 062BC 808DCB2C 00108400 */ sll $s0, $s0, 16 -/* 062C0 808DCB30 00108403 */ sra $s0, $s0, 16 -/* 062C4 808DCB34 2A01000A */ slti $at, $s0, 0x000A -/* 062C8 808DCB38 1420FFDE */ bne $at, $zero, .L808DCAB4 +/* 062BC 808DCB2C 00108400 */ sll $s0, $s0, 16 +/* 062C0 808DCB30 00108403 */ sra $s0, $s0, 16 +/* 062C4 808DCB34 2A01000A */ slti $at, $s0, 0x000A +/* 062C8 808DCB38 1420FFDE */ bne $at, $zero, .L808DCAB4 /* 062CC 808DCB3C 00000000 */ nop /* 062D0 808DCB40 A62001A4 */ sh $zero, 0x01A4($s1) ## 000001A4 /* 062D4 808DCB44 E6380288 */ swc1 $f24, 0x0288($s1) ## 00000288 @@ -109,15 +109,15 @@ glabel func_808DC9B4 /* 062DC 808DCB4C E6380284 */ swc1 $f24, 0x0284($s1) ## 00000284 /* 062E0 808DCB50 E638028C */ swc1 $f24, 0x028C($s1) ## 0000028C .L808DCB54: -/* 062E4 808DCB54 8FBF005C */ lw $ra, 0x005C($sp) -/* 062E8 808DCB58 D7B40030 */ ldc1 $f20, 0x0030($sp) -/* 062EC 808DCB5C D7B60038 */ ldc1 $f22, 0x0038($sp) -/* 062F0 808DCB60 D7B80040 */ ldc1 $f24, 0x0040($sp) -/* 062F4 808DCB64 8FB0004C */ lw $s0, 0x004C($sp) -/* 062F8 808DCB68 8FB10050 */ lw $s1, 0x0050($sp) -/* 062FC 808DCB6C 8FB20054 */ lw $s2, 0x0054($sp) -/* 06300 808DCB70 8FB30058 */ lw $s3, 0x0058($sp) -/* 06304 808DCB74 03E00008 */ jr $ra +/* 062E4 808DCB54 8FBF005C */ lw $ra, 0x005C($sp) +/* 062E8 808DCB58 D7B40030 */ ldc1 $f20, 0x0030($sp) +/* 062EC 808DCB5C D7B60038 */ ldc1 $f22, 0x0038($sp) +/* 062F0 808DCB60 D7B80040 */ ldc1 $f24, 0x0040($sp) +/* 062F4 808DCB64 8FB0004C */ lw $s0, 0x004C($sp) +/* 062F8 808DCB68 8FB10050 */ lw $s1, 0x0050($sp) +/* 062FC 808DCB6C 8FB20054 */ lw $s2, 0x0054($sp) +/* 06300 808DCB70 8FB30058 */ lw $s3, 0x0058($sp) +/* 06304 808DCB74 03E00008 */ jr $ra /* 06308 808DCB78 27BD0070 */ addiu $sp, $sp, 0x0070 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DCB7C.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DCB7C.s index 54c6c979db..19d4f5cd15 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DCB7C.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DCB7C.s @@ -1,13 +1,13 @@ glabel func_808DCB7C /* 0630C 808DCB7C 27BDFFB0 */ addiu $sp, $sp, 0xFFB0 ## $sp = FFFFFFB0 -/* 06310 808DCB80 AFBF002C */ sw $ra, 0x002C($sp) -/* 06314 808DCB84 AFB10028 */ sw $s1, 0x0028($sp) -/* 06318 808DCB88 AFB00024 */ sw $s0, 0x0024($sp) -/* 0631C 808DCB8C F7B40018 */ sdc1 $f20, 0x0018($sp) -/* 06320 808DCB90 AFA50054 */ sw $a1, 0x0054($sp) +/* 06310 808DCB80 AFBF002C */ sw $ra, 0x002C($sp) +/* 06314 808DCB84 AFB10028 */ sw $s1, 0x0028($sp) +/* 06318 808DCB88 AFB00024 */ sw $s0, 0x0024($sp) +/* 0631C 808DCB8C F7B40018 */ sdc1 $f20, 0x0018($sp) +/* 06320 808DCB90 AFA50054 */ sw $a1, 0x0054($sp) /* 06324 808DCB94 848E01BC */ lh $t6, 0x01BC($a0) ## 000001BC /* 06328 808DCB98 00808825 */ or $s1, $a0, $zero ## $s1 = 00000000 -/* 0632C 808DCB9C 55C00005 */ bnel $t6, $zero, .L808DCBB4 +/* 0632C 808DCB9C 55C00005 */ bnel $t6, $zero, .L808DCBB4 /* 06330 808DCBA0 26240150 */ addiu $a0, $s1, 0x0150 ## $a0 = 00000150 /* 06334 808DCBA4 8C8F0004 */ lw $t7, 0x0004($a0) ## 00000154 /* 06338 808DCBA8 35F80001 */ ori $t8, $t7, 0x0001 ## $t8 = 00000001 @@ -15,111 +15,111 @@ glabel func_808DCB7C /* 06340 808DCBB0 26240150 */ addiu $a0, $s1, 0x0150 ## $a0 = 00000150 .L808DCBB4: /* 06344 808DCBB4 0C02927F */ jal SkelAnime_FrameUpdateMatrix - -/* 06348 808DCBB8 AFA40038 */ sw $a0, 0x0038($sp) + +/* 06348 808DCBB8 AFA40038 */ sw $a0, 0x0038($sp) /* 0634C 808DCBBC C6240028 */ lwc1 $f4, 0x0028($s1) ## 00000028 /* 06350 808DCBC0 C6260060 */ lwc1 $f6, 0x0060($s1) ## 00000060 /* 06354 808DCBC4 862301A4 */ lh $v1, 0x01A4($s1) ## 000001A4 /* 06358 808DCBC8 24190001 */ addiu $t9, $zero, 0x0001 ## $t9 = 00000001 -/* 0635C 808DCBCC 46062200 */ add.s $f8, $f4, $f6 -/* 06360 808DCBD0 28610028 */ slti $at, $v1, 0x0028 +/* 0635C 808DCBCC 46062200 */ add.s $f8, $f4, $f6 +/* 06360 808DCBD0 28610028 */ slti $at, $v1, 0x0028 /* 06364 808DCBD4 A23901A0 */ sb $t9, 0x01A0($s1) ## 000001A0 -/* 06368 808DCBD8 1020000A */ beq $at, $zero, .L808DCC04 +/* 06368 808DCBD8 1020000A */ beq $at, $zero, .L808DCC04 /* 0636C 808DCBDC E6280028 */ swc1 $f8, 0x0028($s1) ## 00000028 /* 06370 808DCBE0 3C018090 */ lui $at, %hi(D_808F8004) ## $at = 80900000 -/* 06374 808DCBE4 C4208004 */ lwc1 $f0, %lo(D_808F8004)($at) +/* 06374 808DCBE4 C4208004 */ lwc1 $f0, %lo(D_808F8004)($at) /* 06378 808DCBE8 26240508 */ addiu $a0, $s1, 0x0508 ## $a0 = 00000508 /* 0637C 808DCBEC 3C054080 */ lui $a1, 0x4080 ## $a1 = 40800000 -/* 06380 808DCBF0 44060000 */ mfc1 $a2, $f0 -/* 06384 808DCBF4 44070000 */ mfc1 $a3, $f0 +/* 06380 808DCBF0 44060000 */ mfc1 $a2, $f0 +/* 06384 808DCBF4 44070000 */ mfc1 $a3, $f0 /* 06388 808DCBF8 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 0638C 808DCBFC 00000000 */ nop /* 06390 808DCC00 862301A4 */ lh $v1, 0x01A4($s1) ## 000001A4 .L808DCC04: -/* 06394 808DCC04 28610028 */ slti $at, $v1, 0x0028 -/* 06398 808DCC08 1420000A */ bne $at, $zero, .L808DCC34 -/* 0639C 808DCC0C 28610037 */ slti $at, $v1, 0x0037 -/* 063A0 808DCC10 50200009 */ beql $at, $zero, .L808DCC38 +/* 06394 808DCC04 28610028 */ slti $at, $v1, 0x0028 +/* 06398 808DCC08 1420000A */ bne $at, $zero, .L808DCC34 +/* 0639C 808DCC0C 28610037 */ slti $at, $v1, 0x0037 +/* 063A0 808DCC10 50200009 */ beql $at, $zero, .L808DCC38 /* 063A4 808DCC14 4480A000 */ mtc1 $zero, $f20 ## $f20 = 0.00 /* 063A8 808DCC18 4480A000 */ mtc1 $zero, $f20 ## $f20 = 0.00 /* 063AC 808DCC1C 26240508 */ addiu $a0, $s1, 0x0508 ## $a0 = 00000508 /* 063B0 808DCC20 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 063B4 808DCC24 4405A000 */ mfc1 $a1, $f20 +/* 063B4 808DCC24 4405A000 */ mfc1 $a1, $f20 /* 063B8 808DCC28 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 063BC 808DCC2C 3C073F00 */ lui $a3, 0x3F00 ## $a3 = 3F000000 /* 063C0 808DCC30 862301A4 */ lh $v1, 0x01A4($s1) ## 000001A4 .L808DCC34: /* 063C4 808DCC34 4480A000 */ mtc1 $zero, $f20 ## $f20 = 0.00 .L808DCC38: -/* 063C8 808DCC38 28610037 */ slti $at, $v1, 0x0037 -/* 063CC 808DCC3C 14200009 */ bne $at, $zero, .L808DCC64 +/* 063C8 808DCC38 28610037 */ slti $at, $v1, 0x0037 +/* 063CC 808DCC3C 14200009 */ bne $at, $zero, .L808DCC64 /* 063D0 808DCC40 3C063DCC */ lui $a2, 0x3DCC ## $a2 = 3DCC0000 /* 063D4 808DCC44 3C073E19 */ lui $a3, 0x3E19 ## $a3 = 3E190000 /* 063D8 808DCC48 34E7999A */ ori $a3, $a3, 0x999A ## $a3 = 3E19999A /* 063DC 808DCC4C 26240508 */ addiu $a0, $s1, 0x0508 ## $a0 = 00000508 /* 063E0 808DCC50 3C0540A0 */ lui $a1, 0x40A0 ## $a1 = 40A00000 /* 063E4 808DCC54 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 063E8 808DCC58 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3DCCCCCD /* 063EC 808DCC5C 24080001 */ addiu $t0, $zero, 0x0001 ## $t0 = 00000001 /* 063F0 808DCC60 A22802E4 */ sb $t0, 0x02E4($s1) ## 000002E4 .L808DCC64: /* 063F4 808DCC64 962901C2 */ lhu $t1, 0x01C2($s1) ## 000001C2 -/* 063F8 808DCC68 2D210009 */ sltiu $at, $t1, 0x0009 -/* 063FC 808DCC6C 10200118 */ beq $at, $zero, .L808DD0D0 -/* 06400 808DCC70 00094880 */ sll $t1, $t1, 2 +/* 063F8 808DCC68 2D210009 */ sltiu $at, $t1, 0x0009 +/* 063FC 808DCC6C 10200118 */ beq $at, $zero, .L808DD0D0 +/* 06400 808DCC70 00094880 */ sll $t1, $t1, 2 /* 06404 808DCC74 3C018090 */ lui $at, %hi(jtbl_808F8008) ## $at = 80900000 -/* 06408 808DCC78 00290821 */ addu $at, $at, $t1 -/* 0640C 808DCC7C 8C298008 */ lw $t1, %lo(jtbl_808F8008)($at) -/* 06410 808DCC80 01200008 */ jr $t1 +/* 06408 808DCC78 00290821 */ addu $at, $at, $t1 +/* 0640C 808DCC7C 8C298008 */ lw $t1, %lo(jtbl_808F8008)($at) +/* 06410 808DCC80 01200008 */ jr $t1 /* 06414 808DCC84 00000000 */ nop glabel L808DCC88 -/* 06418 808DCC88 8FA40038 */ lw $a0, 0x0038($sp) -/* 0641C 808DCC8C 0C0295B2 */ jal func_800A56C8 +/* 06418 808DCC88 8FA40038 */ lw $a0, 0x0038($sp) +/* 0641C 808DCC8C 0C0295B2 */ jal func_800A56C8 /* 06420 808DCC90 8E2501CC */ lw $a1, 0x01CC($s1) ## 000001CC -/* 06424 808DCC94 1040010E */ beq $v0, $zero, .L808DD0D0 +/* 06424 808DCC94 1040010E */ beq $v0, $zero, .L808DD0D0 /* 06428 808DCC98 3C100600 */ lui $s0, 0x0600 ## $s0 = 06000000 /* 0642C 808DCC9C 26104DA8 */ addiu $s0, $s0, 0x4DA8 ## $s0 = 06004DA8 /* 06430 808DCCA0 240A0001 */ addiu $t2, $zero, 0x0001 ## $t2 = 00000001 /* 06434 808DCCA4 A62A01C2 */ sh $t2, 0x01C2($s1) ## 000001C2 /* 06438 808DCCA8 0C028800 */ jal SkelAnime_GetFrameCount - + /* 0643C 808DCCAC 02002025 */ or $a0, $s0, $zero ## $a0 = 06004DA8 /* 06440 808DCCB0 44825000 */ mtc1 $v0, $f10 ## $f10 = 0.00 -/* 06444 808DCCB4 4406A000 */ mfc1 $a2, $f20 +/* 06444 808DCCB4 4406A000 */ mfc1 $a2, $f20 /* 06448 808DCCB8 02002825 */ or $a1, $s0, $zero ## $a1 = 06004DA8 -/* 0644C 808DCCBC 46805420 */ cvt.s.w $f16, $f10 +/* 0644C 808DCCBC 46805420 */ cvt.s.w $f16, $f10 /* 06450 808DCCC0 E63001CC */ swc1 $f16, 0x01CC($s1) ## 000001CC -/* 06454 808DCCC4 0C029490 */ jal func_800A5240 -/* 06458 808DCCC8 8FA40038 */ lw $a0, 0x0038($sp) -/* 0645C 808DCCCC 10000101 */ beq $zero, $zero, .L808DD0D4 -/* 06460 808DCCD0 8FBF002C */ lw $ra, 0x002C($sp) +/* 06454 808DCCC4 0C029490 */ jal SkelAnime_ChangeAnimTransitionStop +/* 06458 808DCCC8 8FA40038 */ lw $a0, 0x0038($sp) +/* 0645C 808DCCCC 10000101 */ beq $zero, $zero, .L808DD0D4 +/* 06460 808DCCD0 8FBF002C */ lw $ra, 0x002C($sp) glabel L808DCCD4 -/* 06464 808DCCD4 8FA40038 */ lw $a0, 0x0038($sp) -/* 06468 808DCCD8 0C0295B2 */ jal func_800A56C8 +/* 06464 808DCCD4 8FA40038 */ lw $a0, 0x0038($sp) +/* 06468 808DCCD8 0C0295B2 */ jal func_800A56C8 /* 0646C 808DCCDC 8E2501CC */ lw $a1, 0x01CC($s1) ## 000001CC -/* 06470 808DCCE0 104000FB */ beq $v0, $zero, .L808DD0D0 +/* 06470 808DCCE0 104000FB */ beq $v0, $zero, .L808DD0D0 /* 06474 808DCCE4 3C100600 */ lui $s0, 0x0600 ## $s0 = 06000000 /* 06478 808DCCE8 26103D40 */ addiu $s0, $s0, 0x3D40 ## $s0 = 06003D40 /* 0647C 808DCCEC 240B0002 */ addiu $t3, $zero, 0x0002 ## $t3 = 00000002 /* 06480 808DCCF0 A62B01C2 */ sh $t3, 0x01C2($s1) ## 000001C2 /* 06484 808DCCF4 0C028800 */ jal SkelAnime_GetFrameCount - + /* 06488 808DCCF8 02002025 */ or $a0, $s0, $zero ## $a0 = 06003D40 /* 0648C 808DCCFC 44829000 */ mtc1 $v0, $f18 ## $f18 = 0.00 -/* 06490 808DCD00 4406A000 */ mfc1 $a2, $f20 +/* 06490 808DCD00 4406A000 */ mfc1 $a2, $f20 /* 06494 808DCD04 02002825 */ or $a1, $s0, $zero ## $a1 = 06003D40 -/* 06498 808DCD08 46809120 */ cvt.s.w $f4, $f18 +/* 06498 808DCD08 46809120 */ cvt.s.w $f4, $f18 /* 0649C 808DCD0C E62401CC */ swc1 $f4, 0x01CC($s1) ## 000001CC -/* 064A0 808DCD10 0C029490 */ jal func_800A5240 -/* 064A4 808DCD14 8FA40038 */ lw $a0, 0x0038($sp) -/* 064A8 808DCD18 100000EE */ beq $zero, $zero, .L808DD0D4 -/* 064AC 808DCD1C 8FBF002C */ lw $ra, 0x002C($sp) +/* 064A0 808DCD10 0C029490 */ jal SkelAnime_ChangeAnimTransitionStop +/* 064A4 808DCD14 8FA40038 */ lw $a0, 0x0038($sp) +/* 064A8 808DCD18 100000EE */ beq $zero, $zero, .L808DD0D4 +/* 064AC 808DCD1C 8FBF002C */ lw $ra, 0x002C($sp) glabel L808DCD20 /* 064B0 808DCD20 3C0C8090 */ lui $t4, %hi(D_808F93C0) ## $t4 = 80900000 -/* 064B4 808DCD24 8D8C93C0 */ lw $t4, %lo(D_808F93C0)($t4) +/* 064B4 808DCD24 8D8C93C0 */ lw $t4, %lo(D_808F93C0)($t4) /* 064B8 808DCD28 3C014220 */ lui $at, 0x4220 ## $at = 42200000 /* 064BC 808DCD2C 44810000 */ mtc1 $at, $f0 ## $f0 = 40.00 /* 064C0 808DCD30 E59416D0 */ swc1 $f20, 0x16D0($t4) ## 809016D0 @@ -127,86 +127,86 @@ glabel L808DCD20 /* 064C8 808DCD38 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 /* 064CC 808DCD3C 44814000 */ mtc1 $at, $f8 ## $f8 = 0.50 /* 064D0 808DCD40 C6260060 */ lwc1 $f6, 0x0060($s1) ## 00000060 -/* 064D4 808DCD44 4600803C */ c.lt.s $f16, $f0 +/* 064D4 808DCD44 4600803C */ c.lt.s $f16, $f0 /* 064D8 808DCD48 3C100600 */ lui $s0, 0x0600 ## $s0 = 06000000 -/* 064DC 808DCD4C 46083281 */ sub.s $f10, $f6, $f8 +/* 064DC 808DCD4C 46083281 */ sub.s $f10, $f6, $f8 /* 064E0 808DCD50 261063CC */ addiu $s0, $s0, 0x63CC ## $s0 = 060063CC /* 064E4 808DCD54 240D0003 */ addiu $t5, $zero, 0x0003 ## $t5 = 00000003 -/* 064E8 808DCD58 450000DD */ bc1f .L808DD0D0 +/* 064E8 808DCD58 450000DD */ bc1f .L808DD0D0 /* 064EC 808DCD5C E62A0060 */ swc1 $f10, 0x0060($s1) ## 00000060 /* 064F0 808DCD60 E6200028 */ swc1 $f0, 0x0028($s1) ## 00000028 /* 064F4 808DCD64 E6340060 */ swc1 $f20, 0x0060($s1) ## 00000060 /* 064F8 808DCD68 A62D01C2 */ sh $t5, 0x01C2($s1) ## 000001C2 /* 064FC 808DCD6C 0C028800 */ jal SkelAnime_GetFrameCount - + /* 06500 808DCD70 02002025 */ or $a0, $s0, $zero ## $a0 = 060063CC /* 06504 808DCD74 44829000 */ mtc1 $v0, $f18 ## $f18 = 0.00 -/* 06508 808DCD78 4406A000 */ mfc1 $a2, $f20 +/* 06508 808DCD78 4406A000 */ mfc1 $a2, $f20 /* 0650C 808DCD7C 02002825 */ or $a1, $s0, $zero ## $a1 = 060063CC -/* 06510 808DCD80 46809120 */ cvt.s.w $f4, $f18 +/* 06510 808DCD80 46809120 */ cvt.s.w $f4, $f18 /* 06514 808DCD84 E62401CC */ swc1 $f4, 0x01CC($s1) ## 000001CC -/* 06518 808DCD88 0C029490 */ jal func_800A5240 -/* 0651C 808DCD8C 8FA40038 */ lw $a0, 0x0038($sp) +/* 06518 808DCD88 0C029490 */ jal SkelAnime_ChangeAnimTransitionStop +/* 0651C 808DCD8C 8FA40038 */ lw $a0, 0x0038($sp) /* 06520 808DCD90 8E2F0004 */ lw $t7, 0x0004($s1) ## 00000004 /* 06524 808DCD94 240E0046 */ addiu $t6, $zero, 0x0046 ## $t6 = 00000046 /* 06528 808DCD98 A62E01B6 */ sh $t6, 0x01B6($s1) ## 000001B6 /* 0652C 808DCD9C 35F80400 */ ori $t8, $t7, 0x0400 ## $t8 = 00000400 -/* 06530 808DCDA0 100000CB */ beq $zero, $zero, .L808DD0D0 +/* 06530 808DCDA0 100000CB */ beq $zero, $zero, .L808DD0D0 /* 06534 808DCDA4 AE380004 */ sw $t8, 0x0004($s1) ## 00000004 glabel L808DCDA8 /* 06538 808DCDA8 863901B6 */ lh $t9, 0x01B6($s1) ## 000001B6 /* 0653C 808DCDAC 24010044 */ addiu $at, $zero, 0x0044 ## $at = 00000044 /* 06540 808DCDB0 24080001 */ addiu $t0, $zero, 0x0001 ## $t0 = 00000001 -/* 06544 808DCDB4 57210003 */ bnel $t9, $at, .L808DCDC4 -/* 06548 808DCDB8 8FA40038 */ lw $a0, 0x0038($sp) +/* 06544 808DCDB4 57210003 */ bnel $t9, $at, .L808DCDC4 +/* 06548 808DCDB8 8FA40038 */ lw $a0, 0x0038($sp) /* 0654C 808DCDBC A228019F */ sb $t0, 0x019F($s1) ## 0000019F -/* 06550 808DCDC0 8FA40038 */ lw $a0, 0x0038($sp) +/* 06550 808DCDC0 8FA40038 */ lw $a0, 0x0038($sp) .L808DCDC4: -/* 06554 808DCDC4 0C0295B2 */ jal func_800A56C8 +/* 06554 808DCDC4 0C0295B2 */ jal func_800A56C8 /* 06558 808DCDC8 8E2501CC */ lw $a1, 0x01CC($s1) ## 000001CC -/* 0655C 808DCDCC 104000C0 */ beq $v0, $zero, .L808DD0D0 +/* 0655C 808DCDCC 104000C0 */ beq $v0, $zero, .L808DD0D0 /* 06560 808DCDD0 3C100600 */ lui $s0, 0x0600 ## $s0 = 06000000 /* 06564 808DCDD4 261069A0 */ addiu $s0, $s0, 0x69A0 ## $s0 = 060069A0 /* 06568 808DCDD8 24090004 */ addiu $t1, $zero, 0x0004 ## $t1 = 00000004 /* 0656C 808DCDDC A62901C2 */ sh $t1, 0x01C2($s1) ## 000001C2 /* 06570 808DCDE0 0C028800 */ jal SkelAnime_GetFrameCount - + /* 06574 808DCDE4 02002025 */ or $a0, $s0, $zero ## $a0 = 060069A0 /* 06578 808DCDE8 44823000 */ mtc1 $v0, $f6 ## $f6 = 0.00 -/* 0657C 808DCDEC 4406A000 */ mfc1 $a2, $f20 +/* 0657C 808DCDEC 4406A000 */ mfc1 $a2, $f20 /* 06580 808DCDF0 02002825 */ or $a1, $s0, $zero ## $a1 = 060069A0 -/* 06584 808DCDF4 46803220 */ cvt.s.w $f8, $f6 +/* 06584 808DCDF4 46803220 */ cvt.s.w $f8, $f6 /* 06588 808DCDF8 E62801CC */ swc1 $f8, 0x01CC($s1) ## 000001CC -/* 0658C 808DCDFC 0C0294D3 */ jal func_800A534C -/* 06590 808DCE00 8FA40038 */ lw $a0, 0x0038($sp) -/* 06594 808DCE04 100000B3 */ beq $zero, $zero, .L808DD0D4 -/* 06598 808DCE08 8FBF002C */ lw $ra, 0x002C($sp) +/* 0658C 808DCDFC 0C0294D3 */ jal SkelAnime_ChangeAnimTransitionRepeat +/* 06590 808DCE00 8FA40038 */ lw $a0, 0x0038($sp) +/* 06594 808DCE04 100000B3 */ beq $zero, $zero, .L808DD0D4 +/* 06598 808DCE08 8FBF002C */ lw $ra, 0x002C($sp) glabel L808DCE0C -/* 0659C 808DCE0C 8FA40038 */ lw $a0, 0x0038($sp) -/* 065A0 808DCE10 0C0295B2 */ jal func_800A56C8 +/* 0659C 808DCE0C 8FA40038 */ lw $a0, 0x0038($sp) +/* 065A0 808DCE10 0C0295B2 */ jal func_800A56C8 /* 065A4 808DCE14 3C0540A0 */ lui $a1, 0x40A0 ## $a1 = 40A00000 -/* 065A8 808DCE18 10400003 */ beq $v0, $zero, .L808DCE28 +/* 065A8 808DCE18 10400003 */ beq $v0, $zero, .L808DCE28 /* 065AC 808DCE1C 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 065B0 808DCE20 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 065B4 808DCE24 240539CE */ addiu $a1, $zero, 0x39CE ## $a1 = 000039CE .L808DCE28: /* 065B8 808DCE28 862A01B6 */ lh $t2, 0x01B6($s1) ## 000001B6 /* 065BC 808DCE2C 3C100600 */ lui $s0, 0x0600 ## $s0 = 06000000 /* 065C0 808DCE30 261058C4 */ addiu $s0, $s0, 0x58C4 ## $s0 = 060058C4 -/* 065C4 808DCE34 154000A6 */ bne $t2, $zero, .L808DD0D0 +/* 065C4 808DCE34 154000A6 */ bne $t2, $zero, .L808DD0D0 /* 065C8 808DCE38 240B0005 */ addiu $t3, $zero, 0x0005 ## $t3 = 00000005 /* 065CC 808DCE3C A62B01C2 */ sh $t3, 0x01C2($s1) ## 000001C2 /* 065D0 808DCE40 0C028800 */ jal SkelAnime_GetFrameCount - + /* 065D4 808DCE44 02002025 */ or $a0, $s0, $zero ## $a0 = 060058C4 /* 065D8 808DCE48 44825000 */ mtc1 $v0, $f10 ## $f10 = 0.00 -/* 065DC 808DCE4C 4406A000 */ mfc1 $a2, $f20 +/* 065DC 808DCE4C 4406A000 */ mfc1 $a2, $f20 /* 065E0 808DCE50 02002825 */ or $a1, $s0, $zero ## $a1 = 060058C4 -/* 065E4 808DCE54 46805420 */ cvt.s.w $f16, $f10 +/* 065E4 808DCE54 46805420 */ cvt.s.w $f16, $f10 /* 065E8 808DCE58 E63001CC */ swc1 $f16, 0x01CC($s1) ## 000001CC -/* 065EC 808DCE5C 0C029490 */ jal func_800A5240 -/* 065F0 808DCE60 8FA40038 */ lw $a0, 0x0038($sp) +/* 065EC 808DCE5C 0C029490 */ jal SkelAnime_ChangeAnimTransitionStop +/* 065F0 808DCE60 8FA40038 */ lw $a0, 0x0038($sp) /* 065F4 808DCE64 3C014120 */ lui $at, 0x4120 ## $at = 41200000 /* 065F8 808DCE68 240C0050 */ addiu $t4, $zero, 0x0050 ## $t4 = 00000050 /* 065FC 808DCE6C 4481A000 */ mtc1 $at, $f20 ## $f20 = 10.00 @@ -214,56 +214,56 @@ glabel L808DCE0C /* 06604 808DCE74 24100001 */ addiu $s0, $zero, 0x0001 ## $s0 = 00000001 .L808DCE78: /* 06608 808DCE78 0C00CFBE */ jal Math_Rand_ZeroFloat - -/* 0660C 808DCE7C 4600A306 */ mov.s $f12, $f20 -/* 06610 808DCE80 4600048D */ trunc.w.s $f18, $f0 -/* 06614 808DCE84 00107840 */ sll $t7, $s0, 1 + +/* 0660C 808DCE7C 4600A306 */ mov.s $f12, $f20 +/* 06610 808DCE80 4600048D */ trunc.w.s $f18, $f0 +/* 06614 808DCE84 00107840 */ sll $t7, $s0, 1 /* 06618 808DCE88 26100001 */ addiu $s0, $s0, 0x0001 ## $s0 = 00000002 -/* 0661C 808DCE8C 00108400 */ sll $s0, $s0, 16 -/* 06620 808DCE90 440E9000 */ mfc1 $t6, $f18 -/* 06624 808DCE94 00108403 */ sra $s0, $s0, 16 -/* 06628 808DCE98 2A01000F */ slti $at, $s0, 0x000F -/* 0662C 808DCE9C 022FC021 */ addu $t8, $s1, $t7 -/* 06630 808DCEA0 1420FFF5 */ bne $at, $zero, .L808DCE78 +/* 0661C 808DCE8C 00108400 */ sll $s0, $s0, 16 +/* 06620 808DCE90 440E9000 */ mfc1 $t6, $f18 +/* 06624 808DCE94 00108403 */ sra $s0, $s0, 16 +/* 06628 808DCE98 2A01000F */ slti $at, $s0, 0x000F +/* 0662C 808DCE9C 022FC021 */ addu $t8, $s1, $t7 +/* 06630 808DCEA0 1420FFF5 */ bne $at, $zero, .L808DCE78 /* 06634 808DCEA4 A70E04E4 */ sh $t6, 0x04E4($t8) ## 000004E4 /* 06638 808DCEA8 8E280004 */ lw $t0, 0x0004($s1) ## 00000004 /* 0663C 808DCEAC 2401FBFF */ addiu $at, $zero, 0xFBFF ## $at = FFFFFBFF /* 06640 808DCEB0 24190050 */ addiu $t9, $zero, 0x0050 ## $t9 = 00000050 -/* 06644 808DCEB4 01014824 */ and $t1, $t0, $at +/* 06644 808DCEB4 01014824 */ and $t1, $t0, $at /* 06648 808DCEB8 A63902E6 */ sh $t9, 0x02E6($s1) ## 000002E6 /* 0664C 808DCEBC A62002E8 */ sh $zero, 0x02E8($s1) ## 000002E8 -/* 06650 808DCEC0 10000083 */ beq $zero, $zero, .L808DD0D0 +/* 06650 808DCEC0 10000083 */ beq $zero, $zero, .L808DD0D0 /* 06654 808DCEC4 AE290004 */ sw $t1, 0x0004($s1) ## 00000004 glabel L808DCEC8 -/* 06658 808DCEC8 8FA40054 */ lw $a0, 0x0054($sp) +/* 06658 808DCEC8 8FA40054 */ lw $a0, 0x0054($sp) /* 0665C 808DCECC 3C05447A */ lui $a1, 0x447A ## $a1 = 447A0000 -/* 06660 808DCED0 0C235AFC */ jal func_808D6BF0 +/* 06660 808DCED0 0C235AFC */ jal func_808D6BF0 /* 06664 808DCED4 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 06668 808DCED8 8FA40038 */ lw $a0, 0x0038($sp) -/* 0666C 808DCEDC 0C0295B2 */ jal func_800A56C8 +/* 06668 808DCED8 8FA40038 */ lw $a0, 0x0038($sp) +/* 0666C 808DCEDC 0C0295B2 */ jal func_800A56C8 /* 06670 808DCEE0 8E2501CC */ lw $a1, 0x01CC($s1) ## 000001CC -/* 06674 808DCEE4 1040007A */ beq $v0, $zero, .L808DD0D0 +/* 06674 808DCEE4 1040007A */ beq $v0, $zero, .L808DD0D0 /* 06678 808DCEE8 3C100600 */ lui $s0, 0x0600 ## $s0 = 06000000 /* 0667C 808DCEEC 26106028 */ addiu $s0, $s0, 0x6028 ## $s0 = 06006028 /* 06680 808DCEF0 240A0006 */ addiu $t2, $zero, 0x0006 ## $t2 = 00000006 /* 06684 808DCEF4 A62A01C2 */ sh $t2, 0x01C2($s1) ## 000001C2 /* 06688 808DCEF8 0C028800 */ jal SkelAnime_GetFrameCount - + /* 0668C 808DCEFC 02002025 */ or $a0, $s0, $zero ## $a0 = 06006028 /* 06690 808DCF00 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 -/* 06694 808DCF04 4406A000 */ mfc1 $a2, $f20 +/* 06694 808DCF04 4406A000 */ mfc1 $a2, $f20 /* 06698 808DCF08 02002825 */ or $a1, $s0, $zero ## $a1 = 06006028 -/* 0669C 808DCF0C 468021A0 */ cvt.s.w $f6, $f4 +/* 0669C 808DCF0C 468021A0 */ cvt.s.w $f6, $f4 /* 066A0 808DCF10 E62601CC */ swc1 $f6, 0x01CC($s1) ## 000001CC -/* 066A4 808DCF14 0C029490 */ jal func_800A5240 -/* 066A8 808DCF18 8FA40038 */ lw $a0, 0x0038($sp) +/* 066A4 808DCF14 0C029490 */ jal SkelAnime_ChangeAnimTransitionStop +/* 066A8 808DCF18 8FA40038 */ lw $a0, 0x0038($sp) /* 066AC 808DCF1C 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 /* 066B0 808DCF20 3C0B8090 */ lui $t3, %hi(D_808F93C0) ## $t3 = 80900000 -/* 066B4 808DCF24 8D6B93C0 */ lw $t3, %lo(D_808F93C0)($t3) +/* 066B4 808DCF24 8D6B93C0 */ lw $t3, %lo(D_808F93C0)($t3) /* 066B8 808DCF28 44814000 */ mtc1 $at, $f8 ## $f8 = 20.00 /* 066BC 808DCF2C 240C0001 */ addiu $t4, $zero, 0x0001 ## $t4 = 00000001 /* 066C0 808DCF30 E56816D0 */ swc1 $f8, 0x16D0($t3) ## 809016D0 -/* 066C4 808DCF34 10000066 */ beq $zero, $zero, .L808DD0D0 +/* 066C4 808DCF34 10000066 */ beq $zero, $zero, .L808DD0D0 /* 066C8 808DCF38 A22C019F */ sb $t4, 0x019F($s1) ## 0000019F glabel L808DCF3C /* 066CC 808DCF3C 3C063DCC */ lui $a2, 0x3DCC ## $a2 = 3DCC0000 @@ -272,14 +272,14 @@ glabel L808DCF3C /* 066D8 808DCF48 26240028 */ addiu $a0, $s1, 0x0028 ## $a0 = 00000028 /* 066DC 808DCF4C 3C054348 */ lui $a1, 0x4348 ## $a1 = 43480000 /* 066E0 808DCF50 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 066E4 808DCF54 3C07447A */ lui $a3, 0x447A ## $a3 = 447A0000 -/* 066E8 808DCF58 8FA40038 */ lw $a0, 0x0038($sp) -/* 066EC 808DCF5C 0C0295B2 */ jal func_800A56C8 +/* 066E8 808DCF58 8FA40038 */ lw $a0, 0x0038($sp) +/* 066EC 808DCF5C 0C0295B2 */ jal func_800A56C8 /* 066F0 808DCF60 8E2501CC */ lw $a1, 0x01CC($s1) ## 000001CC -/* 066F4 808DCF64 1040005A */ beq $v0, $zero, .L808DD0D0 +/* 066F4 808DCF64 1040005A */ beq $v0, $zero, .L808DD0D0 /* 066F8 808DCF68 240D0007 */ addiu $t5, $zero, 0x0007 ## $t5 = 00000007 -/* 066FC 808DCF6C 10000058 */ beq $zero, $zero, .L808DD0D0 +/* 066FC 808DCF6C 10000058 */ beq $zero, $zero, .L808DD0D0 /* 06700 808DCF70 A62D01C2 */ sh $t5, 0x01C2($s1) ## 000001C2 glabel L808DCF74 /* 06704 808DCF74 3C063D4C */ lui $a2, 0x3D4C ## $a2 = 3D4C0000 @@ -288,107 +288,107 @@ glabel L808DCF74 /* 06710 808DCF80 26240028 */ addiu $a0, $s1, 0x0028 ## $a0 = 00000028 /* 06714 808DCF84 3C054316 */ lui $a1, 0x4316 ## $a1 = 43160000 /* 06718 808DCF88 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 0671C 808DCF8C 3C0741F0 */ lui $a3, 0x41F0 ## $a3 = 41F00000 /* 06720 808DCF90 3C100601 */ lui $s0, 0x0601 ## $s0 = 06010000 /* 06724 808DCF94 26108A88 */ addiu $s0, $s0, 0x8A88 ## $s0 = 06008A88 /* 06728 808DCF98 0C028800 */ jal SkelAnime_GetFrameCount - + /* 0672C 808DCF9C 02002025 */ or $a0, $s0, $zero ## $a0 = 06008A88 /* 06730 808DCFA0 44825000 */ mtc1 $v0, $f10 ## $f10 = 0.00 -/* 06734 808DCFA4 4406A000 */ mfc1 $a2, $f20 +/* 06734 808DCFA4 4406A000 */ mfc1 $a2, $f20 /* 06738 808DCFA8 02002825 */ or $a1, $s0, $zero ## $a1 = 06008A88 -/* 0673C 808DCFAC 46805420 */ cvt.s.w $f16, $f10 +/* 0673C 808DCFAC 46805420 */ cvt.s.w $f16, $f10 /* 06740 808DCFB0 E63001CC */ swc1 $f16, 0x01CC($s1) ## 000001CC -/* 06744 808DCFB4 0C029490 */ jal func_800A5240 -/* 06748 808DCFB8 8FA40038 */ lw $a0, 0x0038($sp) +/* 06744 808DCFB4 0C029490 */ jal SkelAnime_ChangeAnimTransitionStop +/* 06748 808DCFB8 8FA40038 */ lw $a0, 0x0038($sp) /* 0674C 808DCFBC 240F0008 */ addiu $t7, $zero, 0x0008 ## $t7 = 00000008 /* 06750 808DCFC0 A62F01C2 */ sh $t7, 0x01C2($s1) ## 000001C2 /* 06754 808DCFC4 0C02927F */ jal SkelAnime_FrameUpdateMatrix - -/* 06758 808DCFC8 8FA40038 */ lw $a0, 0x0038($sp) + +/* 06758 808DCFC8 8FA40038 */ lw $a0, 0x0038($sp) /* 0675C 808DCFCC 3C014190 */ lui $at, 0x4190 ## $at = 41900000 /* 06760 808DCFD0 3C0E8090 */ lui $t6, %hi(D_808F93C0) ## $t6 = 80900000 -/* 06764 808DCFD4 8DCE93C0 */ lw $t6, %lo(D_808F93C0)($t6) +/* 06764 808DCFD4 8DCE93C0 */ lw $t6, %lo(D_808F93C0)($t6) /* 06768 808DCFD8 44819000 */ mtc1 $at, $f18 ## $f18 = 18.00 /* 0676C 808DCFDC 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 06770 808DCFE0 240528C7 */ addiu $a1, $zero, 0x28C7 ## $a1 = 000028C7 /* 06774 808DCFE4 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 06778 808DCFE8 E5D216C4 */ swc1 $f18, 0x16C4($t6) ## 809016C4 /* 0677C 808DCFEC 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 06780 808DCFF0 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 06784 808DCFF4 240539CF */ addiu $a1, $zero, 0x39CF ## $a1 = 000039CF -/* 06788 808DCFF8 10000036 */ beq $zero, $zero, .L808DD0D4 -/* 0678C 808DCFFC 8FBF002C */ lw $ra, 0x002C($sp) +/* 06788 808DCFF8 10000036 */ beq $zero, $zero, .L808DD0D4 +/* 0678C 808DCFFC 8FBF002C */ lw $ra, 0x002C($sp) glabel L808DD000 /* 06790 808DD000 A22001A0 */ sb $zero, 0x01A0($s1) ## 000001A0 -/* 06794 808DD004 8FA40038 */ lw $a0, 0x0038($sp) -/* 06798 808DD008 0C0295B2 */ jal func_800A56C8 +/* 06794 808DD004 8FA40038 */ lw $a0, 0x0038($sp) +/* 06798 808DD008 0C0295B2 */ jal func_800A56C8 /* 0679C 808DD00C 3C0540E0 */ lui $a1, 0x40E0 ## $a1 = 40E00000 -/* 067A0 808DD010 10400028 */ beq $v0, $zero, .L808DD0B4 +/* 067A0 808DD010 10400028 */ beq $v0, $zero, .L808DD0B4 /* 067A4 808DD014 00008025 */ or $s0, $zero, $zero ## $s0 = 00000000 /* 067A8 808DD018 3C0141C8 */ lui $at, 0x41C8 ## $at = 41C80000 /* 067AC 808DD01C 263801FC */ addiu $t8, $s1, 0x01FC ## $t8 = 000001FC /* 067B0 808DD020 4481A000 */ mtc1 $at, $f20 ## $f20 = 25.00 -/* 067B4 808DD024 AFB80034 */ sw $t8, 0x0034($sp) +/* 067B4 808DD024 AFB80034 */ sw $t8, 0x0034($sp) .L808DD028: /* 067B8 808DD028 0C00CFC8 */ jal Math_Rand_CenteredFloat - -/* 067BC 808DD02C 4600A306 */ mov.s $f12, $f20 -/* 067C0 808DD030 E7A00040 */ swc1 $f0, 0x0040($sp) + +/* 067BC 808DD02C 4600A306 */ mov.s $f12, $f20 +/* 067C0 808DD030 E7A00040 */ swc1 $f0, 0x0040($sp) /* 067C4 808DD034 0C00CFC8 */ jal Math_Rand_CenteredFloat - -/* 067C8 808DD038 4600A306 */ mov.s $f12, $f20 -/* 067CC 808DD03C E7A00044 */ swc1 $f0, 0x0044($sp) + +/* 067C8 808DD038 4600A306 */ mov.s $f12, $f20 +/* 067CC 808DD03C E7A00044 */ swc1 $f0, 0x0044($sp) /* 067D0 808DD040 0C00CFC8 */ jal Math_Rand_CenteredFloat - -/* 067D4 808DD044 4600A306 */ mov.s $f12, $f20 + +/* 067D4 808DD044 4600A306 */ mov.s $f12, $f20 /* 067D8 808DD048 3C014348 */ lui $at, 0x4348 ## $at = 43480000 /* 067DC 808DD04C 44816000 */ mtc1 $at, $f12 ## $f12 = 200.00 /* 067E0 808DD050 0C00CFBE */ jal Math_Rand_ZeroFloat - -/* 067E4 808DD054 E7A00048 */ swc1 $f0, 0x0048($sp) + +/* 067E4 808DD054 E7A00048 */ swc1 $f0, 0x0048($sp) /* 067E8 808DD058 3C0143FA */ lui $at, 0x43FA ## $at = 43FA0000 /* 067EC 808DD05C 44812000 */ mtc1 $at, $f4 ## $f4 = 500.00 /* 067F0 808DD060 3C07808E */ lui $a3, %hi(D_808E4C6C) ## $a3 = 808E0000 /* 067F4 808DD064 24190014 */ addiu $t9, $zero, 0x0014 ## $t9 = 00000014 -/* 067F8 808DD068 46040180 */ add.s $f6, $f0, $f4 -/* 067FC 808DD06C AFB90014 */ sw $t9, 0x0014($sp) +/* 067F8 808DD068 46040180 */ add.s $f6, $f0, $f4 +/* 067FC 808DD06C AFB90014 */ sw $t9, 0x0014($sp) /* 06800 808DD070 24E74C6C */ addiu $a3, $a3, %lo(D_808E4C6C) ## $a3 = 808E4C6C -/* 06804 808DD074 8FA40054 */ lw $a0, 0x0054($sp) -/* 06808 808DD078 E7A60010 */ swc1 $f6, 0x0010($sp) -/* 0680C 808DD07C 8FA50034 */ lw $a1, 0x0034($sp) -/* 06810 808DD080 0C235A6C */ jal func_808D69B0 +/* 06804 808DD074 8FA40054 */ lw $a0, 0x0054($sp) +/* 06808 808DD078 E7A60010 */ swc1 $f6, 0x0010($sp) +/* 0680C 808DD07C 8FA50034 */ lw $a1, 0x0034($sp) +/* 06810 808DD080 0C235A6C */ jal func_808D69B0 /* 06814 808DD084 27A60040 */ addiu $a2, $sp, 0x0040 ## $a2 = FFFFFFF0 /* 06818 808DD088 26100001 */ addiu $s0, $s0, 0x0001 ## $s0 = 00000001 -/* 0681C 808DD08C 00108400 */ sll $s0, $s0, 16 -/* 06820 808DD090 00108403 */ sra $s0, $s0, 16 -/* 06824 808DD094 2A010064 */ slti $at, $s0, 0x0064 -/* 06828 808DD098 1420FFE3 */ bne $at, $zero, .L808DD028 +/* 0681C 808DD08C 00108400 */ sll $s0, $s0, 16 +/* 06820 808DD090 00108403 */ sra $s0, $s0, 16 +/* 06824 808DD094 2A010064 */ slti $at, $s0, 0x0064 +/* 06828 808DD098 1420FFE3 */ bne $at, $zero, .L808DD028 /* 0682C 808DD09C 00000000 */ nop /* 06830 808DD0A0 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 06834 808DD0A4 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 06838 808DD0A8 24050806 */ addiu $a1, $zero, 0x0806 ## $a1 = 00000806 /* 0683C 808DD0AC 24080032 */ addiu $t0, $zero, 0x0032 ## $t0 = 00000032 /* 06840 808DD0B0 A62801BC */ sh $t0, 0x01BC($s1) ## 000001BC .L808DD0B4: -/* 06844 808DD0B4 8FA40038 */ lw $a0, 0x0038($sp) -/* 06848 808DD0B8 0C0295B2 */ jal func_800A56C8 +/* 06844 808DD0B4 8FA40038 */ lw $a0, 0x0038($sp) +/* 06848 808DD0B8 0C0295B2 */ jal func_800A56C8 /* 0684C 808DD0BC 8E2501CC */ lw $a1, 0x01CC($s1) ## 000001CC -/* 06850 808DD0C0 10400003 */ beq $v0, $zero, .L808DD0D0 +/* 06850 808DD0C0 10400003 */ beq $v0, $zero, .L808DD0D0 /* 06854 808DD0C4 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 06858 808DD0C8 0C236EBC */ jal func_808DBAF0 -/* 0685C 808DD0CC 8FA50054 */ lw $a1, 0x0054($sp) +/* 06858 808DD0C8 0C236EBC */ jal func_808DBAF0 +/* 0685C 808DD0CC 8FA50054 */ lw $a1, 0x0054($sp) .L808DD0D0: -/* 06860 808DD0D0 8FBF002C */ lw $ra, 0x002C($sp) +/* 06860 808DD0D0 8FBF002C */ lw $ra, 0x002C($sp) .L808DD0D4: -/* 06864 808DD0D4 D7B40018 */ ldc1 $f20, 0x0018($sp) -/* 06868 808DD0D8 8FB00024 */ lw $s0, 0x0024($sp) -/* 0686C 808DD0DC 8FB10028 */ lw $s1, 0x0028($sp) -/* 06870 808DD0E0 03E00008 */ jr $ra +/* 06864 808DD0D4 D7B40018 */ ldc1 $f20, 0x0018($sp) +/* 06868 808DD0D8 8FB00024 */ lw $s0, 0x0024($sp) +/* 0686C 808DD0DC 8FB10028 */ lw $s1, 0x0028($sp) +/* 06870 808DD0E0 03E00008 */ jr $ra /* 06874 808DD0E4 27BD0050 */ addiu $sp, $sp, 0x0050 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DD0E8.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DD0E8.s index 49f070958f..d037791d9e 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DD0E8.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DD0E8.s @@ -1,29 +1,29 @@ glabel func_808DD0E8 /* 06878 808DD0E8 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 0687C 808DD0EC AFBF0014 */ sw $ra, 0x0014($sp) -/* 06880 808DD0F0 AFA40018 */ sw $a0, 0x0018($sp) -/* 06884 808DD0F4 0C235C4B */ jal func_808D712C +/* 0687C 808DD0EC AFBF0014 */ sw $ra, 0x0014($sp) +/* 06880 808DD0F0 AFA40018 */ sw $a0, 0x0018($sp) +/* 06884 808DD0F4 0C235C4B */ jal func_808D712C /* 06888 808DD0F8 2406017C */ addiu $a2, $zero, 0x017C ## $a2 = 0000017C /* 0688C 808DD0FC 3C040601 */ lui $a0, 0x0601 ## $a0 = 06010000 /* 06890 808DD100 0C028800 */ jal SkelAnime_GetFrameCount - + /* 06894 808DD104 248496B0 */ addiu $a0, $a0, 0x96B0 ## $a0 = 060096B0 /* 06898 808DD108 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 -/* 0689C 808DD10C 8FA30018 */ lw $v1, 0x0018($sp) +/* 0689C 808DD10C 8FA30018 */ lw $v1, 0x0018($sp) /* 068A0 808DD110 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 -/* 068A4 808DD114 468021A0 */ cvt.s.w $f6, $f4 +/* 068A4 808DD114 468021A0 */ cvt.s.w $f6, $f4 /* 068A8 808DD118 24A596B0 */ addiu $a1, $a1, 0x96B0 ## $a1 = 060096B0 /* 068AC 808DD11C 24060000 */ addiu $a2, $zero, 0x0000 ## $a2 = 00000000 /* 068B0 808DD120 24640150 */ addiu $a0, $v1, 0x0150 ## $a0 = 00000150 -/* 068B4 808DD124 0C029490 */ jal func_800A5240 +/* 068B4 808DD124 0C029490 */ jal SkelAnime_ChangeAnimTransitionStop /* 068B8 808DD128 E46601CC */ swc1 $f6, 0x01CC($v1) ## 000001CC -/* 068BC 808DD12C 8FAF0018 */ lw $t7, 0x0018($sp) +/* 068BC 808DD12C 8FAF0018 */ lw $t7, 0x0018($sp) /* 068C0 808DD130 3C0E808E */ lui $t6, %hi(func_808DD14C) ## $t6 = 808E0000 /* 068C4 808DD134 25CED14C */ addiu $t6, $t6, %lo(func_808DD14C) ## $t6 = 808DD14C /* 068C8 808DD138 ADEE0194 */ sw $t6, 0x0194($t7) ## 00000194 -/* 068CC 808DD13C 8FBF0014 */ lw $ra, 0x0014($sp) +/* 068CC 808DD13C 8FBF0014 */ lw $ra, 0x0014($sp) /* 068D0 808DD140 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 068D4 808DD144 03E00008 */ jr $ra +/* 068D4 808DD144 03E00008 */ jr $ra /* 068D8 808DD148 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DD14C.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DD14C.s index baafa30858..bc176a09a9 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DD14C.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DD14C.s @@ -1,34 +1,34 @@ glabel func_808DD14C /* 068DC 808DD14C 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 068E0 808DD150 AFBF001C */ sw $ra, 0x001C($sp) -/* 068E4 808DD154 AFB00018 */ sw $s0, 0x0018($sp) -/* 068E8 808DD158 AFA5002C */ sw $a1, 0x002C($sp) +/* 068E0 808DD150 AFBF001C */ sw $ra, 0x001C($sp) +/* 068E4 808DD154 AFB00018 */ sw $s0, 0x0018($sp) +/* 068E8 808DD158 AFA5002C */ sw $a1, 0x002C($sp) /* 068EC 808DD15C 8C8E0004 */ lw $t6, 0x0004($a0) ## 00000004 /* 068F0 808DD160 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 068F4 808DD164 24840150 */ addiu $a0, $a0, 0x0150 ## $a0 = 00000150 /* 068F8 808DD168 35CF0001 */ ori $t7, $t6, 0x0001 ## $t7 = 00000001 /* 068FC 808DD16C AC8FFEB4 */ sw $t7, -0x014C($a0) ## 00000004 /* 06900 808DD170 0C02927F */ jal SkelAnime_FrameUpdateMatrix - -/* 06904 808DD174 AFA40024 */ sw $a0, 0x0024($sp) + +/* 06904 808DD174 AFA40024 */ sw $a0, 0x0024($sp) /* 06908 808DD178 861801A4 */ lh $t8, 0x01A4($s0) ## 000001A4 /* 0690C 808DD17C 26040508 */ addiu $a0, $s0, 0x0508 ## $a0 = 00000508 /* 06910 808DD180 3C0540A0 */ lui $a1, 0x40A0 ## $a1 = 40A00000 -/* 06914 808DD184 2B010037 */ slti $at, $t8, 0x0037 -/* 06918 808DD188 14200007 */ bne $at, $zero, .L808DD1A8 +/* 06914 808DD184 2B010037 */ slti $at, $t8, 0x0037 +/* 06918 808DD188 14200007 */ bne $at, $zero, .L808DD1A8 /* 0691C 808DD18C 3C063DCC */ lui $a2, 0x3DCC ## $a2 = 3DCC0000 /* 06920 808DD190 3C073E19 */ lui $a3, 0x3E19 ## $a3 = 3E190000 /* 06924 808DD194 34E7999A */ ori $a3, $a3, 0x999A ## $a3 = 3E19999A /* 06928 808DD198 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 0692C 808DD19C 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3DCCCCCD /* 06930 808DD1A0 24190001 */ addiu $t9, $zero, 0x0001 ## $t9 = 00000001 /* 06934 808DD1A4 A21902E4 */ sb $t9, 0x02E4($s0) ## 000002E4 .L808DD1A8: -/* 06938 808DD1A8 8FA40024 */ lw $a0, 0x0024($sp) -/* 0693C 808DD1AC 0C0295B2 */ jal func_800A56C8 +/* 06938 808DD1A8 8FA40024 */ lw $a0, 0x0024($sp) +/* 0693C 808DD1AC 0C0295B2 */ jal func_800A56C8 /* 06940 808DD1B0 8E0501CC */ lw $a1, 0x01CC($s0) ## 000001CC -/* 06944 808DD1B4 10400010 */ beq $v0, $zero, .L808DD1F8 +/* 06944 808DD1B4 10400010 */ beq $v0, $zero, .L808DD1F8 /* 06948 808DD1B8 3C08808E */ lui $t0, %hi(func_808DCB7C) ## $t0 = 808E0000 /* 0694C 808DD1BC 2508CB7C */ addiu $t0, $t0, %lo(func_808DCB7C) ## $t0 = 808DCB7C /* 06950 808DD1C0 24090004 */ addiu $t1, $zero, 0x0004 ## $t1 = 00000004 @@ -36,21 +36,21 @@ glabel func_808DD14C /* 06958 808DD1C8 AE080194 */ sw $t0, 0x0194($s0) ## 00000194 /* 0695C 808DD1CC A60901C2 */ sh $t1, 0x01C2($s0) ## 000001C2 /* 06960 808DD1D0 0C028800 */ jal SkelAnime_GetFrameCount - + /* 06964 808DD1D4 248469A0 */ addiu $a0, $a0, 0x69A0 ## $a0 = 060069A0 /* 06968 808DD1D8 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 0696C 808DD1DC 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 06970 808DD1E0 24A569A0 */ addiu $a1, $a1, 0x69A0 ## $a1 = 060069A0 -/* 06974 808DD1E4 468021A0 */ cvt.s.w $f6, $f4 +/* 06974 808DD1E4 468021A0 */ cvt.s.w $f6, $f4 /* 06978 808DD1E8 24060000 */ addiu $a2, $zero, 0x0000 ## $a2 = 00000000 /* 0697C 808DD1EC E60601CC */ swc1 $f6, 0x01CC($s0) ## 000001CC -/* 06980 808DD1F0 0C0294D3 */ jal func_800A534C -/* 06984 808DD1F4 8FA40024 */ lw $a0, 0x0024($sp) +/* 06980 808DD1F0 0C0294D3 */ jal SkelAnime_ChangeAnimTransitionRepeat +/* 06984 808DD1F4 8FA40024 */ lw $a0, 0x0024($sp) .L808DD1F8: -/* 06988 808DD1F8 8FBF001C */ lw $ra, 0x001C($sp) -/* 0698C 808DD1FC 8FB00018 */ lw $s0, 0x0018($sp) +/* 06988 808DD1F8 8FBF001C */ lw $ra, 0x001C($sp) +/* 0698C 808DD1FC 8FB00018 */ lw $s0, 0x0018($sp) /* 06990 808DD200 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 06994 808DD204 03E00008 */ jr $ra +/* 06994 808DD204 03E00008 */ jr $ra /* 06998 808DD208 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DE988.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DE988.s index e9c02e796d..e9c31b3702 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DE988.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DE988.s @@ -52,7 +52,7 @@ glabel func_808DE988 /* 081D4 808DEA44 8D250000 */ lw $a1, 0x0000($t1) ## 00000000 /* 081D8 808DEA48 27A4003C */ addiu $a0, $sp, 0x003C ## $a0 = FFFFFFE4 /* 081DC 808DEA4C 24071C17 */ addiu $a3, $zero, 0x1C17 ## $a3 = 00001C17 -/* 081E0 808DEA50 0C031AB1 */ jal func_800C6AC4 +/* 081E0 808DEA50 0C031AB1 */ jal Graph_OpenDisps /* 081E4 808DEA54 AFA5004C */ sw $a1, 0x004C($sp) /* 081E8 808DEA58 8FA30068 */ lw $v1, 0x0068($sp) /* 081EC 808DEA5C 3C04808E */ lui $a0, %hi(D_808E4DB8) ## $a0 = 808E0000 @@ -101,7 +101,7 @@ glabel func_808DE988 /* 08298 808DEB08 24C67A78 */ addiu $a2, $a2, %lo(D_808F7A78) ## $a2 = 808F7A78 /* 0829C 808DEB0C 27A4003C */ addiu $a0, $sp, 0x003C ## $a0 = FFFFFFE4 /* 082A0 808DEB10 24071C1E */ addiu $a3, $zero, 0x1C1E ## $a3 = 00001C1E -/* 082A4 808DEB14 0C031AD5 */ jal func_800C6B54 +/* 082A4 808DEB14 0C031AD5 */ jal Graph_CloseDisps /* 082A8 808DEB18 8DC50000 */ lw $a1, 0x0000($t6) ## 00000008 /* 082AC 808DEB1C 10000081 */ beq $zero, $zero, .L808DED24 /* 082B0 808DEB20 8FBF0014 */ lw $ra, 0x0014($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DEE70.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DEE70.s index 24a19fcec6..a3bc70a9d6 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DEE70.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DEE70.s @@ -18,7 +18,7 @@ glabel func_808DEE70 /* 08640 808DEEB0 24C67A8C */ addiu $a2, $a2, %lo(D_808F7A8C) ## $a2 = 808F7A8C /* 08644 808DEEB4 27A400A8 */ addiu $a0, $sp, 0x00A8 ## $a0 = FFFFFFE0 /* 08648 808DEEB8 24071CB6 */ addiu $a3, $zero, 0x1CB6 ## $a3 = 00001CB6 -/* 0864C 808DEEBC 0C031AB1 */ jal func_800C6AC4 +/* 0864C 808DEEBC 0C031AB1 */ jal Graph_OpenDisps /* 08650 808DEEC0 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 /* 08654 808DEEC4 868F02E8 */ lh $t7, 0x02E8($s4) ## 000002E8 /* 08658 808DEEC8 8FB900CC */ lw $t9, 0x00CC($sp) @@ -199,7 +199,7 @@ glabel func_808DEE70 /* 088F8 808DF168 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 088FC 808DF16C 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 /* 08900 808DF170 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 08904 808DF174 0C0253D0 */ jal Draw_TwoTexScroll +/* 08904 808DF174 0C0253D0 */ jal Gfx_TwoTexScroll /* 08908 808DF178 00408025 */ or $s0, $v0, $zero ## $s0 = 00000000 /* 0890C 808DF17C 8FA8006C */ lw $t0, 0x006C($sp) /* 08910 808DF180 AE020004 */ sw $v0, 0x0004($s0) ## 00000004 @@ -245,7 +245,7 @@ glabel func_808DEE70 /* 089A4 808DF214 24C67AC8 */ addiu $a2, $a2, %lo(D_808F7AC8) ## $a2 = 808F7AC8 /* 089A8 808DF218 27A400A8 */ addiu $a0, $sp, 0x00A8 ## $a0 = FFFFFFE0 /* 089AC 808DF21C 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 089B0 808DF220 0C031AD5 */ jal func_800C6B54 +/* 089B0 808DF220 0C031AD5 */ jal Graph_CloseDisps /* 089B4 808DF224 24071D29 */ addiu $a3, $zero, 0x1D29 ## $a3 = 00001D29 /* 089B8 808DF228 8FBF0064 */ lw $ra, 0x0064($sp) /* 089BC 808DF22C D7B40038 */ ldc1 $f20, 0x0038($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DF25C.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DF25C.s index 472ac366ce..44fd0c7093 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DF25C.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DF25C.s @@ -10,7 +10,7 @@ glabel func_808DF25C /* 08A0C 808DF27C 24C67ADC */ addiu $a2, $a2, %lo(D_808F7ADC) ## $a2 = 808F7ADC /* 08A10 808DF280 27A40050 */ addiu $a0, $sp, 0x0050 ## $a0 = FFFFFFE0 /* 08A14 808DF284 24071D34 */ addiu $a3, $zero, 0x1D34 ## $a3 = 00001D34 -/* 08A18 808DF288 0C031AB1 */ jal func_800C6AC4 +/* 08A18 808DF288 0C031AB1 */ jal Graph_OpenDisps /* 08A1C 808DF28C 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 08A20 808DF290 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 /* 08A24 808DF294 C6260254 */ lwc1 $f6, 0x0254($s1) ## 00000254 @@ -160,7 +160,7 @@ glabel func_808DF25C /* 08C58 808DF4C8 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 08C5C 808DF4CC 24071D6E */ addiu $a3, $zero, 0x1D6E ## $a3 = 00001D6E /* 08C60 808DF4D0 AC480004 */ sw $t0, 0x0004($v0) ## 00000004 -/* 08C64 808DF4D4 0C031AD5 */ jal func_800C6B54 +/* 08C64 808DF4D4 0C031AD5 */ jal Graph_CloseDisps /* 08C68 808DF4D8 AC590000 */ sw $t9, 0x0000($v0) ## 00000000 /* 08C6C 808DF4DC 8FBF001C */ lw $ra, 0x001C($sp) .L808DF4E0: diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DF4F0.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DF4F0.s index e2c479c07d..2912038371 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DF4F0.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DF4F0.s @@ -12,7 +12,7 @@ glabel func_808DF4F0 /* 08CA8 808DF518 24C67B2C */ addiu $a2, $a2, %lo(D_808F7B2C) ## $a2 = 808F7B2C /* 08CAC 808DF51C 27A400B4 */ addiu $a0, $sp, 0x00B4 ## $a0 = FFFFFFDC /* 08CB0 808DF520 24071D7C */ addiu $a3, $zero, 0x1D7C ## $a3 = 00001D7C -/* 08CB4 808DF524 0C031AB1 */ jal func_800C6AC4 +/* 08CB4 808DF524 0C031AB1 */ jal Graph_OpenDisps /* 08CB8 808DF528 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 /* 08CBC 808DF52C 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 /* 08CC0 808DF530 C6460284 */ lwc1 $f6, 0x0284($s2) ## 00000284 @@ -70,7 +70,7 @@ glabel func_808DF4F0 /* 08D90 808DF600 AFA0001C */ sw $zero, 0x001C($sp) /* 08D94 808DF604 AFAC0018 */ sw $t4, 0x0018($sp) /* 08D98 808DF608 AFAB0014 */ sw $t3, 0x0014($sp) -/* 08D9C 808DF60C 0C0253D0 */ jal Draw_TwoTexScroll +/* 08D9C 808DF60C 0C0253D0 */ jal Gfx_TwoTexScroll /* 08DA0 808DF610 AFAA0010 */ sw $t2, 0x0010($sp) /* 08DA4 808DF614 AE020004 */ sw $v0, 0x0004($s0) ## 00000004 /* 08DA8 808DF618 8E460280 */ lw $a2, 0x0280($s2) ## 00000280 @@ -171,7 +171,7 @@ glabel func_808DF4F0 /* 08F24 808DF794 AFA90024 */ sw $t1, 0x0024($sp) /* 08F28 808DF798 00190823 */ subu $at, $zero, $t9 /* 08F2C 808DF79C 00014080 */ sll $t0, $at, 2 -/* 08F30 808DF7A0 0C0253D0 */ jal Draw_TwoTexScroll +/* 08F30 808DF7A0 0C0253D0 */ jal Gfx_TwoTexScroll /* 08F34 808DF7A4 AFA80020 */ sw $t0, 0x0020($sp) /* 08F38 808DF7A8 AE020004 */ sw $v0, 0x0004($s0) ## 00000004 /* 08F3C 808DF7AC 8E2302D0 */ lw $v1, 0x02D0($s1) ## 000002D0 @@ -222,7 +222,7 @@ glabel func_808DF4F0 /* 08FF0 808DF860 00094880 */ sll $t1, $t1, 2 /* 08FF4 808DF864 00024040 */ sll $t0, $v0, 1 /* 08FF8 808DF868 AFA8001C */ sw $t0, 0x001C($sp) -/* 08FFC 808DF86C 0C0253D0 */ jal Draw_TwoTexScroll +/* 08FFC 808DF86C 0C0253D0 */ jal Gfx_TwoTexScroll /* 09000 808DF870 AFA90020 */ sw $t1, 0x0020($sp) /* 09004 808DF874 AE020004 */ sw $v0, 0x0004($s0) ## 00000004 /* 09008 808DF878 8E2302D0 */ lw $v1, 0x02D0($s1) ## 000002D0 @@ -432,7 +432,7 @@ glabel func_808DF4F0 /* 09330 808DFBA0 24C67B90 */ addiu $a2, $a2, %lo(D_808F7B90) ## $a2 = 808F7B90 /* 09334 808DFBA4 27A400B4 */ addiu $a0, $sp, 0x00B4 ## $a0 = FFFFFFDC /* 09338 808DFBA8 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 0933C 808DFBAC 0C031AD5 */ jal func_800C6B54 +/* 0933C 808DFBAC 0C031AD5 */ jal Graph_CloseDisps /* 09340 808DFBB0 24071E29 */ addiu $a3, $zero, 0x1E29 ## $a3 = 00001E29 /* 09344 808DFBB4 8FBF004C */ lw $ra, 0x004C($sp) .L808DFBB8: diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DFBD0.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DFBD0.s index 71f2a0db8b..c06fc2a8a8 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DFBD0.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DFBD0.s @@ -15,7 +15,7 @@ glabel func_808DFBD0 /* 09394 808DFC04 8FBF001C */ lw $ra, 0x001C($sp) /* 09398 808DFC08 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 /* 0939C 808DFC0C 24071E34 */ addiu $a3, $zero, 0x1E34 ## $a3 = 00001E34 -/* 093A0 808DFC10 0C031AB1 */ jal func_800C6AC4 +/* 093A0 808DFC10 0C031AB1 */ jal Graph_OpenDisps /* 093A4 808DFC14 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 /* 093A8 808DFC18 0C034213 */ jal Matrix_Push /* 093AC 808DFC1C 00000000 */ nop @@ -257,7 +257,7 @@ glabel func_808DFBD0 /* 09730 808DFFA0 24C67BCC */ addiu $a2, $a2, %lo(D_808F7BCC) ## $a2 = 808F7BCC /* 09734 808DFFA4 27A40040 */ addiu $a0, $sp, 0x0040 ## $a0 = FFFFFFE8 /* 09738 808DFFA8 24071E66 */ addiu $a3, $zero, 0x1E66 ## $a3 = 00001E66 -/* 0973C 808DFFAC 0C031AD5 */ jal func_800C6B54 +/* 0973C 808DFFAC 0C031AD5 */ jal Graph_CloseDisps /* 09740 808DFFB0 8DC50000 */ lw $a1, 0x0000($t6) ## 00000000 /* 09744 808DFFB4 8FBF001C */ lw $ra, 0x001C($sp) .L808DFFB8: diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DFFC8.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DFFC8.s index 98e9be3bc1..5b3e5194a2 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DFFC8.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808DFFC8.s @@ -14,7 +14,7 @@ glabel func_808DFFC8 /* 09788 808DFFF8 8FBF003C */ lw $ra, 0x003C($sp) /* 0978C 808DFFFC 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 /* 09790 808E0000 24071E70 */ addiu $a3, $zero, 0x1E70 ## $a3 = 00001E70 -/* 09794 808E0004 0C031AB1 */ jal func_800C6AC4 +/* 09794 808E0004 0C031AB1 */ jal Graph_OpenDisps /* 09798 808E0008 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 /* 0979C 808E000C 0C034213 */ jal Matrix_Push /* 097A0 808E0010 00000000 */ nop @@ -51,7 +51,7 @@ glabel func_808DFFC8 /* 0981C 808E008C AFB90024 */ sw $t9, 0x0024($sp) /* 09820 808E0090 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 09824 808E0094 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 09828 808E0098 0C0253D0 */ jal Draw_TwoTexScroll +/* 09828 808E0098 0C0253D0 */ jal Gfx_TwoTexScroll /* 0982C 808E009C AFA20058 */ sw $v0, 0x0058($sp) /* 09830 808E00A0 8FA80058 */ lw $t0, 0x0058($sp) /* 09834 808E00A4 3C0BFA00 */ lui $t3, 0xFA00 ## $t3 = FA000000 @@ -157,7 +157,7 @@ glabel func_808DFFC8 /* 099BC 808E022C 24C67C08 */ addiu $a2, $a2, %lo(D_808F7C08) ## $a2 = 808F7C08 /* 099C0 808E0230 27A40060 */ addiu $a0, $sp, 0x0060 ## $a0 = FFFFFFE8 /* 099C4 808E0234 24071EA4 */ addiu $a3, $zero, 0x1EA4 ## $a3 = 00001EA4 -/* 099C8 808E0238 0C031AD5 */ jal func_800C6B54 +/* 099C8 808E0238 0C031AD5 */ jal Graph_CloseDisps /* 099CC 808E023C 8F250000 */ lw $a1, 0x0000($t9) ## 00000000 /* 099D0 808E0240 8FBF003C */ lw $ra, 0x003C($sp) .L808E0244: diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808E0A3C.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808E0A3C.s index bcb933af10..5b17e9dd90 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808E0A3C.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808E0A3C.s @@ -10,7 +10,7 @@ glabel func_808E0A3C /* 0A1EC 808E0A5C 24C67C1C */ addiu $a2, $a2, %lo(D_808F7C1C) ## $a2 = 808F7C1C /* 0A1F0 808E0A60 27A40058 */ addiu $a0, $sp, 0x0058 ## $a0 = FFFFFFE0 /* 0A1F4 808E0A64 240720B4 */ addiu $a3, $zero, 0x20B4 ## $a3 = 000020B4 -/* 0A1F8 808E0A68 0C031AB1 */ jal func_800C6AC4 +/* 0A1F8 808E0A68 0C031AB1 */ jal Graph_OpenDisps /* 0A1FC 808E0A6C 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 0A200 808E0A70 8FAF0080 */ lw $t7, 0x0080($sp) /* 0A204 808E0A74 0C024F46 */ jal func_80093D18 @@ -161,7 +161,7 @@ glabel func_808E0A3C /* 0A440 808E0CB0 24C67C44 */ addiu $a2, $a2, %lo(D_808F7C44) ## $a2 = 808F7C44 /* 0A444 808E0CB4 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 0A448 808E0CB8 240720EA */ addiu $a3, $zero, 0x20EA ## $a3 = 000020EA -/* 0A44C 808E0CBC 0C031AD5 */ jal func_800C6B54 +/* 0A44C 808E0CBC 0C031AD5 */ jal Graph_CloseDisps /* 0A450 808E0CC0 AC590004 */ sw $t9, 0x0004($v0) ## 00000004 /* 0A454 808E0CC4 8FBF001C */ lw $ra, 0x001C($sp) /* 0A458 808E0CC8 8FB00018 */ lw $s0, 0x0018($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808E1B54.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808E1B54.s index 7807f1ffea..d04950cb9b 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808E1B54.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808E1B54.s @@ -13,7 +13,7 @@ glabel func_808E1B54 /* 0B310 808E1B80 24C67C80 */ addiu $a2, $a2, %lo(D_808F7C80) ## $a2 = 808F7C80 /* 0B314 808E1B84 27A40064 */ addiu $a0, $sp, 0x0064 ## $a0 = FFFFFFDC /* 0B318 808E1B88 24072679 */ addiu $a3, $zero, 0x2679 ## $a3 = 00002679 -/* 0B31C 808E1B8C 0C031AB1 */ jal func_800C6AC4 +/* 0B31C 808E1B8C 0C031AB1 */ jal Graph_OpenDisps /* 0B320 808E1B90 00A09025 */ or $s2, $a1, $zero ## $s2 = 00000000 /* 0B324 808E1B94 0C024F61 */ jal func_80093D84 /* 0B328 808E1B98 8E840000 */ lw $a0, 0x0000($s4) ## 00000000 @@ -210,7 +210,7 @@ glabel func_808E1B54 /* 0B610 808E1E80 24C67CD0 */ addiu $a2, $a2, %lo(D_808F7CD0) ## $a2 = 808F7CD0 /* 0B614 808E1E84 27A40064 */ addiu $a0, $sp, 0x0064 ## $a0 = FFFFFFDC /* 0B618 808E1E88 8E850000 */ lw $a1, 0x0000($s4) ## 00000000 -/* 0B61C 808E1E8C 0C031AD5 */ jal func_800C6B54 +/* 0B61C 808E1E8C 0C031AD5 */ jal Graph_CloseDisps /* 0B620 808E1E90 240726B7 */ addiu $a3, $zero, 0x26B7 ## $a3 = 000026B7 /* 0B624 808E1E94 8FBF002C */ lw $ra, 0x002C($sp) /* 0B628 808E1E98 8FB00018 */ lw $s0, 0x0018($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808E1EB4.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808E1EB4.s index c758e0835d..e463507a8d 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808E1EB4.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808E1EB4.s @@ -92,7 +92,7 @@ glabel func_808E1EB4 /* 0B794 808E2004 460A4381 */ sub.s $f14, $f8, $f10 /* 0B798 808E2008 4600A306 */ mov.s $f12, $f20 /* 0B79C 808E200C 46062581 */ sub.s $f22, $f4, $f6 -/* 0B7A0 808E2010 0C03F494 */ jal func_800FD250 +/* 0B7A0 808E2010 0C03F494 */ jal Math_atan2f /* 0B7A4 808E2014 E7AE0084 */ swc1 $f14, 0x0084($sp) /* 0B7A8 808E2018 3C018090 */ lui $at, %hi(D_808F81C4) ## $at = 80900000 /* 0B7AC 808E201C C43281C4 */ lwc1 $f18, %lo(D_808F81C4)($at) @@ -110,7 +110,7 @@ glabel func_808E1EB4 /* 0B7DC 808E204C 00108400 */ sll $s0, $s0, 16 /* 0B7E0 808E2050 00108403 */ sra $s0, $s0, 16 /* 0B7E4 808E2054 46001384 */ sqrt.s $f14, $f2 -/* 0B7E8 808E2058 0C03F494 */ jal func_800FD250 +/* 0B7E8 808E2058 0C03F494 */ jal Math_atan2f /* 0B7EC 808E205C E7A2005C */ swc1 $f2, 0x005C($sp) /* 0B7F0 808E2060 3C018090 */ lui $at, %hi(D_808F81C8) ## $at = 80900000 /* 0B7F4 808E2064 C43281C8 */ lwc1 $f18, %lo(D_808F81C8)($at) diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808E229C.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808E229C.s index 7043e1e591..50f4bc78b2 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808E229C.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808E229C.s @@ -23,7 +23,7 @@ glabel func_808E229C /* 0BA80 808E22F0 24C67CE4 */ addiu $a2, $a2, %lo(D_808F7CE4) ## $a2 = 808F7CE4 /* 0BA84 808E22F4 27A40094 */ addiu $a0, $sp, 0x0094 ## $a0 = FFFFFFDC /* 0BA88 808E22F8 24072761 */ addiu $a3, $zero, 0x2761 ## $a3 = 00002761 -/* 0BA8C 808E22FC 0C031AB1 */ jal func_800C6AC4 +/* 0BA8C 808E22FC 0C031AB1 */ jal Graph_OpenDisps /* 0BA90 808E2300 00A09825 */ or $s3, $a1, $zero ## $s3 = 00000000 /* 0BA94 808E2304 0C024F61 */ jal func_80093D84 /* 0BA98 808E2308 8E840000 */ lw $a0, 0x0000($s4) ## 00000000 @@ -152,7 +152,7 @@ glabel func_808E229C /* 0BC78 808E24E8 24C67D0C */ addiu $a2, $a2, %lo(D_808F7D0C) ## $a2 = 808F7D0C /* 0BC7C 808E24EC 27A40094 */ addiu $a0, $sp, 0x0094 ## $a0 = FFFFFFDC /* 0BC80 808E24F0 8E850000 */ lw $a1, 0x0000($s4) ## 00000000 -/* 0BC84 808E24F4 0C031AD5 */ jal func_800C6B54 +/* 0BC84 808E24F4 0C031AD5 */ jal Graph_CloseDisps /* 0BC88 808E24F8 24072781 */ addiu $a3, $zero, 0x2781 ## $a3 = 00002781 /* 0BC8C 808E24FC 8FBF006C */ lw $ra, 0x006C($sp) /* 0BC90 808E2500 D7B40018 */ ldc1 $f20, 0x0018($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808E2544.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808E2544.s index ae370ad8c6..96be55e2cf 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808E2544.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808E2544.s @@ -114,7 +114,7 @@ glabel L808E26AC /* 0BE7C 808E26EC C6460280 */ lwc1 $f6, 0x0280($s2) ## 00000280 /* 0BE80 808E26F0 E7AC0098 */ swc1 $f12, 0x0098($sp) /* 0BE84 808E26F4 46083381 */ sub.s $f14, $f6, $f8 -/* 0BE88 808E26F8 0C03F494 */ jal func_800FD250 +/* 0BE88 808E26F8 0C03F494 */ jal Math_atan2f /* 0BE8C 808E26FC E7AE0090 */ swc1 $f14, 0x0090($sp) /* 0BE90 808E2700 3C018090 */ lui $at, %hi(D_808F8214) ## $at = 80900000 /* 0BE94 808E2704 C42A8214 */ lwc1 $f10, %lo(D_808F8214)($at) @@ -131,7 +131,7 @@ glabel L808E26AC /* 0BEC0 808E2730 46002384 */ sqrt.s $f14, $f4 /* 0BEC4 808E2734 E7A40058 */ swc1 $f4, 0x0058($sp) /* 0BEC8 808E2738 A7A80080 */ sh $t0, 0x0080($sp) -/* 0BECC 808E273C 0C03F494 */ jal func_800FD250 +/* 0BECC 808E273C 0C03F494 */ jal Math_atan2f /* 0BED0 808E2740 E7AE008C */ swc1 $f14, 0x008C($sp) /* 0BED4 808E2744 3C0145C0 */ lui $at, 0x45C0 ## $at = 45C00000 /* 0BED8 808E2748 44816000 */ mtc1 $at, $f12 ## $f12 = 6144.00 @@ -282,7 +282,7 @@ glabel L808E28FC /* 0C0F0 808E2960 46044301 */ sub.s $f12, $f8, $f4 /* 0C0F4 808E2964 AE2D01F8 */ sw $t5, 0x01F8($s1) ## 000001F8 /* 0C0F8 808E2968 C62601F8 */ lwc1 $f6, 0x01F8($s1) ## 000001F8 -/* 0C0FC 808E296C 0C03F494 */ jal func_800FD250 +/* 0C0FC 808E296C 0C03F494 */ jal Math_atan2f /* 0C100 808E2970 460A3381 */ sub.s $f14, $f6, $f10 /* 0C104 808E2974 3C018090 */ lui $at, %hi(D_808F821C) ## $at = 80900000 /* 0C108 808E2978 C428821C */ lwc1 $f8, %lo(D_808F821C)($at) @@ -322,7 +322,7 @@ glabel L808E29A8 /* 0C18C 808E29FC C62601F8 */ lwc1 $f6, 0x01F8($s1) ## 000001F8 /* 0C190 808E2A00 E7AC0098 */ swc1 $f12, 0x0098($sp) /* 0C194 808E2A04 460A3381 */ sub.s $f14, $f6, $f10 -/* 0C198 808E2A08 0C03F494 */ jal func_800FD250 +/* 0C198 808E2A08 0C03F494 */ jal Math_atan2f /* 0C19C 808E2A0C E7AE0090 */ swc1 $f14, 0x0090($sp) /* 0C1A0 808E2A10 3C018090 */ lui $at, %hi(D_808F8220) ## $at = 80900000 /* 0C1A4 808E2A14 C4288220 */ lwc1 $f8, %lo(D_808F8220)($at) @@ -337,7 +337,7 @@ glabel L808E29A8 /* 0C1C8 808E2A38 46085000 */ add.s $f0, $f10, $f8 /* 0C1CC 808E2A3C 44083000 */ mfc1 $t0, $f6 /* 0C1D0 808E2A40 46000384 */ sqrt.s $f14, $f0 -/* 0C1D4 808E2A44 0C03F494 */ jal func_800FD250 +/* 0C1D4 808E2A44 0C03F494 */ jal Math_atan2f /* 0C1D8 808E2A48 A7A80080 */ sh $t0, 0x0080($sp) /* 0C1DC 808E2A4C 3C018090 */ lui $at, %hi(D_808F8224) ## $at = 80900000 /* 0C1E0 808E2A50 C4248224 */ lwc1 $f4, %lo(D_808F8224)($at) @@ -638,7 +638,7 @@ glabel L808E2E70 /* 0C62C 808E2E9C C62A01F8 */ lwc1 $f10, 0x01F8($s1) ## 000001F8 /* 0C630 808E2EA0 E7AC0098 */ swc1 $f12, 0x0098($sp) /* 0C634 808E2EA4 46065381 */ sub.s $f14, $f10, $f6 -/* 0C638 808E2EA8 0C03F494 */ jal func_800FD250 +/* 0C638 808E2EA8 0C03F494 */ jal Math_atan2f /* 0C63C 808E2EAC E7AE0090 */ swc1 $f14, 0x0090($sp) /* 0C640 808E2EB0 3C018090 */ lui $at, %hi(D_808F822C) ## $at = 80900000 /* 0C644 808E2EB4 C428822C */ lwc1 $f8, %lo(D_808F822C)($at) @@ -654,7 +654,7 @@ glabel L808E2E70 /* 0C66C 808E2EDC 440E5000 */ mfc1 $t6, $f10 /* 0C670 808E2EE0 46000384 */ sqrt.s $f14, $f0 /* 0C674 808E2EE4 A7AE0080 */ sh $t6, 0x0080($sp) -/* 0C678 808E2EE8 0C03F494 */ jal func_800FD250 +/* 0C678 808E2EE8 0C03F494 */ jal Math_atan2f /* 0C67C 808E2EEC E7AE008C */ swc1 $f14, 0x008C($sp) /* 0C680 808E2EF0 3C0145C0 */ lui $at, 0x45C0 ## $at = 45C00000 /* 0C684 808E2EF4 44816000 */ mtc1 $at, $f12 ## $f12 = 6144.00 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808E324C.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808E324C.s index f453bda179..f8eae7febf 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808E324C.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808E324C.s @@ -23,7 +23,7 @@ glabel func_808E324C /* 0CA2C 808E329C 24C67D20 */ addiu $a2, $a2, %lo(D_808F7D20) ## $a2 = 808F7D20 /* 0CA30 808E32A0 27A4006C */ addiu $a0, $sp, 0x006C ## $a0 = FFFFFFDC /* 0CA34 808E32A4 240728F9 */ addiu $a3, $zero, 0x28F9 ## $a3 = 000028F9 -/* 0CA38 808E32A8 0C031AB1 */ jal func_800C6AC4 +/* 0CA38 808E32A8 0C031AB1 */ jal Graph_OpenDisps /* 0CA3C 808E32AC 00A0A025 */ or $s4, $a1, $zero ## $s4 = 00000000 /* 0CA40 808E32B0 8FB80094 */ lw $t8, 0x0094($sp) /* 0CA44 808E32B4 0C024F61 */ jal func_80093D84 @@ -188,7 +188,7 @@ glabel func_808E324C /* 0CCB0 808E3520 24C67D5C */ addiu $a2, $a2, %lo(D_808F7D5C) ## $a2 = 808F7D5C /* 0CCB4 808E3524 27A4006C */ addiu $a0, $sp, 0x006C ## $a0 = FFFFFFDC /* 0CCB8 808E3528 2407292D */ addiu $a3, $zero, 0x292D ## $a3 = 0000292D -/* 0CCBC 808E352C 0C031AD5 */ jal func_800C6B54 +/* 0CCBC 808E352C 0C031AD5 */ jal Graph_CloseDisps /* 0CCC0 808E3530 8D050000 */ lw $a1, 0x0000($t0) ## 00000000 /* 0CCC4 808E3534 8FBF003C */ lw $ra, 0x003C($sp) /* 0CCC8 808E3538 8FB00018 */ lw $s0, 0x0018($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808E3564.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808E3564.s index d35c2da4e7..d3919b09a4 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808E3564.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808E3564.s @@ -123,14 +123,14 @@ glabel func_808E3564 /* 0CEC4 808E3734 46128581 */ sub.s $f22, $f16, $f18 /* 0CEC8 808E3738 4600A306 */ mov.s $f12, $f20 /* 0CECC 808E373C 46085601 */ sub.s $f24, $f10, $f8 -/* 0CED0 808E3740 0C03F494 */ jal func_800FD250 +/* 0CED0 808E3740 0C03F494 */ jal Math_atan2f /* 0CED4 808E3744 4600B386 */ mov.s $f14, $f22 /* 0CED8 808E3748 4614A682 */ mul.s $f26, $f20, $f20 /* 0CEDC 808E374C E7A000B0 */ swc1 $f0, 0x00B0($sp) /* 0CEE0 808E3750 4600C306 */ mov.s $f12, $f24 /* 0CEE4 808E3754 4616B702 */ mul.s $f28, $f22, $f22 /* 0CEE8 808E3758 461CD000 */ add.s $f0, $f26, $f28 -/* 0CEEC 808E375C 0C03F494 */ jal func_800FD250 +/* 0CEEC 808E375C 0C03F494 */ jal Math_atan2f /* 0CEF0 808E3760 46000384 */ sqrt.s $f14, $f0 /* 0CEF4 808E3764 C6040038 */ lwc1 $f4, 0x0038($s0) ## 00010038 /* 0CEF8 808E3768 46000507 */ neg.s $f20, $f0 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808E3D84.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808E3D84.s index 60c21de69b..c8ea4c6d7d 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808E3D84.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808E3D84.s @@ -22,7 +22,7 @@ glabel func_808E3D84 /* 0D564 808E3DD4 27A40150 */ addiu $a0, $sp, 0x0150 ## $a0 = FFFFFFD8 /* 0D568 808E3DD8 24072A71 */ addiu $a3, $zero, 0x2A71 ## $a3 = 00002A71 /* 0D56C 808E3DDC 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 0D570 808E3DE0 0C031AB1 */ jal func_800C6AC4 +/* 0D570 808E3DE0 0C031AB1 */ jal Graph_OpenDisps /* 0D574 808E3DE4 AFB10164 */ sw $s1, 0x0164($sp) /* 0D578 808E3DE8 8FAE0178 */ lw $t6, 0x0178($sp) /* 0D57C 808E3DEC 0C024F61 */ jal func_80093D84 @@ -577,7 +577,7 @@ glabel func_808E3D84 /* 0DDC8 808E4638 AFB80014 */ sw $t8, 0x0014($sp) /* 0DDCC 808E463C AFA90010 */ sw $t1, 0x0010($sp) /* 0DDD0 808E4640 AFA200C4 */ sw $v0, 0x00C4($sp) -/* 0DDD4 808E4644 0C0253D0 */ jal Draw_TwoTexScroll +/* 0DDD4 808E4644 0C0253D0 */ jal Gfx_TwoTexScroll /* 0DDD8 808E4648 00033080 */ sll $a2, $v1, 2 /* 0DDDC 808E464C 8FA800C4 */ lw $t0, 0x00C4($sp) /* 0DDE0 808E4650 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 @@ -675,7 +675,7 @@ glabel func_808E3D84 /* 0DF48 808E47B8 AFAD0010 */ sw $t5, 0x0010($sp) /* 0DF4C 808E47BC 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 /* 0DF50 808E47C0 AFA200AC */ sw $v0, 0x00AC($sp) -/* 0DF54 808E47C4 0C0253D0 */ jal Draw_TwoTexScroll +/* 0DF54 808E47C4 0C0253D0 */ jal Gfx_TwoTexScroll /* 0DF58 808E47C8 00033080 */ sll $a2, $v1, 2 /* 0DF5C 808E47CC 8FA800AC */ lw $t0, 0x00AC($sp) /* 0DF60 808E47D0 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 @@ -773,7 +773,7 @@ glabel func_808E3D84 /* 0E0C8 808E4938 AFAB0014 */ sw $t3, 0x0014($sp) /* 0E0CC 808E493C AFAF0010 */ sw $t7, 0x0010($sp) /* 0E0D0 808E4940 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 0E0D4 808E4944 0C0253D0 */ jal Draw_TwoTexScroll +/* 0E0D4 808E4944 0C0253D0 */ jal Gfx_TwoTexScroll /* 0E0D8 808E4948 AFA20094 */ sw $v0, 0x0094($sp) /* 0E0DC 808E494C 8FA30094 */ lw $v1, 0x0094($sp) /* 0E0E0 808E4950 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 @@ -882,7 +882,7 @@ glabel func_808E3D84 /* 0E274 808E4AE4 AFA9001C */ sw $t1, 0x001C($sp) /* 0E278 808E4AE8 AFB80020 */ sw $t8, 0x0020($sp) /* 0E27C 808E4AEC 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 0E280 808E4AF0 0C0253D0 */ jal Draw_TwoTexScroll +/* 0E280 808E4AF0 0C0253D0 */ jal Gfx_TwoTexScroll /* 0E284 808E4AF4 AFA2007C */ sw $v0, 0x007C($sp) /* 0E288 808E4AF8 8FA8007C */ lw $t0, 0x007C($sp) /* 0E28C 808E4AFC 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 @@ -926,7 +926,7 @@ glabel func_808E3D84 /* 0E320 808E4B90 24C67E38 */ addiu $a2, $a2, %lo(D_808F7E38) ## $a2 = 808F7E38 /* 0E324 808E4B94 27A40150 */ addiu $a0, $sp, 0x0150 ## $a0 = FFFFFFD8 /* 0E328 808E4B98 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 0E32C 808E4B9C 0C031AD5 */ jal func_800C6B54 +/* 0E32C 808E4B9C 0C031AD5 */ jal Graph_CloseDisps /* 0E330 808E4BA0 24072BF7 */ addiu $a3, $zero, 0x2BF7 ## $a3 = 00002BF7 /* 0E334 808E4BA4 8FBF005C */ lw $ra, 0x005C($sp) /* 0E338 808E4BA8 8FB00038 */ lw $s0, 0x0038($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/BossGanon2_Destroy.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/BossGanon2_Destroy.s index 9b8f828b2f..74dfbdbc02 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/BossGanon2_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/BossGanon2_Destroy.s @@ -1,21 +1,21 @@ glabel BossGanon2_Destroy /* 0054C 808FD48C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00550 808FD490 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00554 808FD494 AFA40018 */ sw $a0, 0x0018($sp) -/* 00558 808FD498 AFA5001C */ sw $a1, 0x001C($sp) -/* 0055C 808FD49C 0C0295BC */ jal func_800A56F0 +/* 00550 808FD490 AFBF0014 */ sw $ra, 0x0014($sp) +/* 00554 808FD494 AFA40018 */ sw $a0, 0x0018($sp) +/* 00558 808FD498 AFA5001C */ sw $a1, 0x001C($sp) +/* 0055C 808FD49C 0C0295BC */ jal SkelAnime_Free /* 00560 808FD4A0 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 00564 808FD4A4 8FA50018 */ lw $a1, 0x0018($sp) -/* 00568 808FD4A8 8FA4001C */ lw $a0, 0x001C($sp) -/* 0056C 808FD4AC 0C016F32 */ jal func_8005BCC8 +/* 00564 808FD4A4 8FA50018 */ lw $a1, 0x0018($sp) +/* 00568 808FD4A8 8FA4001C */ lw $a0, 0x001C($sp) +/* 0056C 808FD4AC 0C016F32 */ jal func_8005BCC8 /* 00570 808FD4B0 24A50424 */ addiu $a1, $a1, 0x0424 ## $a1 = 00000424 -/* 00574 808FD4B4 8FA50018 */ lw $a1, 0x0018($sp) -/* 00578 808FD4B8 8FA4001C */ lw $a0, 0x001C($sp) -/* 0057C 808FD4BC 0C016F32 */ jal func_8005BCC8 +/* 00574 808FD4B4 8FA50018 */ lw $a1, 0x0018($sp) +/* 00578 808FD4B8 8FA4001C */ lw $a0, 0x001C($sp) +/* 0057C 808FD4BC 0C016F32 */ jal func_8005BCC8 /* 00580 808FD4C0 24A50444 */ addiu $a1, $a1, 0x0444 ## $a1 = 00000444 -/* 00584 808FD4C4 8FBF0014 */ lw $ra, 0x0014($sp) +/* 00584 808FD4C4 8FBF0014 */ lw $ra, 0x0014($sp) /* 00588 808FD4C8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 0058C 808FD4CC 03E00008 */ jr $ra +/* 0058C 808FD4CC 03E00008 */ jr $ra /* 00590 808FD4D0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/BossGanon2_Draw.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/BossGanon2_Draw.s index 3251141a3f..fbf184a367 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/BossGanon2_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/BossGanon2_Draw.s @@ -1,66 +1,66 @@ glabel BossGanon2_Draw /* 089B0 809058F0 27BDFF88 */ addiu $sp, $sp, 0xFF88 ## $sp = FFFFFF88 -/* 089B4 809058F4 AFB10028 */ sw $s1, 0x0028($sp) -/* 089B8 809058F8 AFB00024 */ sw $s0, 0x0024($sp) +/* 089B4 809058F4 AFB10028 */ sw $s1, 0x0028($sp) +/* 089B8 809058F8 AFB00024 */ sw $s0, 0x0024($sp) /* 089BC 809058FC 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 089C0 80905900 AFBF002C */ sw $ra, 0x002C($sp) +/* 089C0 80905900 AFBF002C */ sw $ra, 0x002C($sp) /* 089C4 80905904 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 /* 089C8 80905908 8CA40000 */ lw $a0, 0x0000($a1) ## 00000000 /* 089CC 8090590C 0C031A73 */ jal Graph_Alloc - + /* 089D0 80905910 24051000 */ addiu $a1, $zero, 0x1000 ## $a1 = 00001000 -/* 089D4 80905914 AFA20074 */ sw $v0, 0x0074($sp) +/* 089D4 80905914 AFA20074 */ sw $v0, 0x0074($sp) /* 089D8 80905918 8E250000 */ lw $a1, 0x0000($s1) ## 00000000 /* 089DC 8090591C 3C068091 */ lui $a2, %hi(D_8090D9BC) ## $a2 = 80910000 /* 089E0 80905920 24C6D9BC */ addiu $a2, $a2, %lo(D_8090D9BC) ## $a2 = 8090D9BC /* 089E4 80905924 27A40058 */ addiu $a0, $sp, 0x0058 ## $a0 = FFFFFFE0 /* 089E8 80905928 240716D0 */ addiu $a3, $zero, 0x16D0 ## $a3 = 000016D0 -/* 089EC 8090592C 0C031AB1 */ jal func_800C6AC4 -/* 089F0 80905930 AFA50068 */ sw $a1, 0x0068($sp) -/* 089F4 80905934 0C024F46 */ jal func_80093D18 +/* 089EC 8090592C 0C031AB1 */ jal Graph_OpenDisps +/* 089F0 80905930 AFA50068 */ sw $a1, 0x0068($sp) +/* 089F4 80905934 0C024F46 */ jal func_80093D18 /* 089F8 80905938 8E240000 */ lw $a0, 0x0000($s1) ## 00000000 -/* 089FC 8090593C 0C024F61 */ jal func_80093D84 +/* 089FC 8090593C 0C024F61 */ jal func_80093D84 /* 08A00 80905940 8E240000 */ lw $a0, 0x0000($s1) ## 00000000 /* 08A04 80905944 92020337 */ lbu $v0, 0x0337($s0) ## 00000337 /* 08A08 80905948 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 08A0C 8090594C 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 08A10 80905950 10400009 */ beq $v0, $zero, .L80905978 +/* 08A10 80905950 10400009 */ beq $v0, $zero, .L80905978 /* 08A14 80905954 240600E1 */ addiu $a2, $zero, 0x00E1 ## $a2 = 000000E1 /* 08A18 80905958 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 08A1C 8090595C 10410036 */ beq $v0, $at, .L80905A38 +/* 08A1C 8090595C 10410036 */ beq $v0, $at, .L80905A38 /* 08A20 80905960 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 08A24 80905964 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 08A28 80905968 50410034 */ beql $v0, $at, .L80905A3C +/* 08A28 80905968 50410034 */ beql $v0, $at, .L80905A3C /* 08A2C 8090596C 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 08A30 80905970 100000AB */ beq $zero, $zero, .L80905C20 +/* 08A30 80905970 100000AB */ beq $zero, $zero, .L80905C20 /* 08A34 80905974 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 .L80905978: -/* 08A38 80905978 0C23F442 */ jal func_808FD108 +/* 08A38 80905978 0C23F442 */ jal func_808FD108 /* 08A3C 8090597C 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 08A40 80905980 8FAE0068 */ lw $t6, 0x0068($sp) +/* 08A40 80905980 8FAE0068 */ lw $t6, 0x0068($sp) /* 08A44 80905984 3C040601 */ lui $a0, 0x0601 ## $a0 = 06010000 /* 08A48 80905988 2484A8E0 */ addiu $a0, $a0, 0xA8E0 ## $a0 = 0600A8E0 /* 08A4C 8090598C 8DC302D0 */ lw $v1, 0x02D0($t6) ## 000002D0 -/* 08A50 80905990 0004C900 */ sll $t9, $a0, 4 -/* 08A54 80905994 00194F02 */ srl $t1, $t9, 28 +/* 08A50 80905990 0004C900 */ sll $t9, $a0, 4 +/* 08A54 80905994 00194F02 */ srl $t1, $t9, 28 /* 08A58 80905998 3C18DB06 */ lui $t8, 0xDB06 ## $t8 = DB060000 /* 08A5C 8090599C 3C0B8016 */ lui $t3, 0x8016 ## $t3 = 80160000 /* 08A60 809059A0 246F0008 */ addiu $t7, $v1, 0x0008 ## $t7 = 00000008 /* 08A64 809059A4 256B6FA8 */ addiu $t3, $t3, 0x6FA8 ## $t3 = 80166FA8 /* 08A68 809059A8 37180020 */ ori $t8, $t8, 0x0020 ## $t8 = DB060020 -/* 08A6C 809059AC 00095080 */ sll $t2, $t1, 2 +/* 08A6C 809059AC 00095080 */ sll $t2, $t1, 2 /* 08A70 809059B0 ADCF02D0 */ sw $t7, 0x02D0($t6) ## 000002D0 -/* 08A74 809059B4 014B2821 */ addu $a1, $t2, $t3 +/* 08A74 809059B4 014B2821 */ addu $a1, $t2, $t3 /* 08A78 809059B8 AC780000 */ sw $t8, 0x0000($v1) ## 00000000 /* 08A7C 809059BC 8CAC0000 */ lw $t4, 0x0000($a1) ## 00000000 /* 08A80 809059C0 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 /* 08A84 809059C4 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF -/* 08A88 809059C8 00813024 */ and $a2, $a0, $at +/* 08A88 809059C8 00813024 */ and $a2, $a0, $at /* 08A8C 809059CC 3C078000 */ lui $a3, 0x8000 ## $a3 = 80000000 -/* 08A90 809059D0 01866821 */ addu $t5, $t4, $a2 -/* 08A94 809059D4 01A77821 */ addu $t7, $t5, $a3 +/* 08A90 809059D0 01866821 */ addu $t5, $t4, $a2 +/* 08A94 809059D4 01A77821 */ addu $t7, $t5, $a3 /* 08A98 809059D8 AC6F0004 */ sw $t7, 0x0004($v1) ## 00000004 -/* 08A9C 809059DC 8FAE0068 */ lw $t6, 0x0068($sp) +/* 08A9C 809059DC 8FAE0068 */ lw $t6, 0x0068($sp) /* 08AA0 809059E0 3C19DB06 */ lui $t9, 0xDB06 ## $t9 = DB060000 /* 08AA4 809059E4 37390024 */ ori $t9, $t9, 0x0024 ## $t9 = DB060024 /* 08AA8 809059E8 8DC302D0 */ lw $v1, 0x02D0($t6) ## 000002D0 @@ -71,25 +71,25 @@ glabel BossGanon2_Draw /* 08ABC 809059FC AC790000 */ sw $t9, 0x0000($v1) ## 00000000 /* 08AC0 80905A00 8CA90000 */ lw $t1, 0x0000($a1) ## 00000000 /* 08AC4 80905A04 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 08AC8 80905A08 01265021 */ addu $t2, $t1, $a2 -/* 08ACC 80905A0C 01475821 */ addu $t3, $t2, $a3 +/* 08AC8 80905A08 01265021 */ addu $t2, $t1, $a2 +/* 08ACC 80905A0C 01475821 */ addu $t3, $t2, $a3 /* 08AD0 80905A10 AC6B0004 */ sw $t3, 0x0004($v1) ## 00000004 /* 08AD4 80905A14 9207014E */ lbu $a3, 0x014E($s0) ## 0000014E /* 08AD8 80905A18 8E06016C */ lw $a2, 0x016C($s0) ## 0000016C /* 08ADC 80905A1C 8E050150 */ lw $a1, 0x0150($s0) ## 00000150 -/* 08AE0 80905A20 AFB00018 */ sw $s0, 0x0018($sp) -/* 08AE4 80905A24 AFAC0014 */ sw $t4, 0x0014($sp) -/* 08AE8 80905A28 0C0286B2 */ jal func_800A1AC8 -/* 08AEC 80905A2C AFA00010 */ sw $zero, 0x0010($sp) -/* 08AF0 80905A30 1000007B */ beq $zero, $zero, .L80905C20 +/* 08AE0 80905A20 AFB00018 */ sw $s0, 0x0018($sp) +/* 08AE4 80905A24 AFAC0014 */ sw $t4, 0x0014($sp) +/* 08AE8 80905A28 0C0286B2 */ jal SkelAnime_DrawSV +/* 08AEC 80905A2C AFA00010 */ sw $zero, 0x0010($sp) +/* 08AF0 80905A30 1000007B */ beq $zero, $zero, .L80905C20 /* 08AF4 80905A34 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 .L80905A38: /* 08AF8 80905A38 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 .L80905A3C: /* 08AFC 80905A3C 24060153 */ addiu $a2, $zero, 0x0153 ## $a2 = 00000153 -/* 08B00 80905A40 0C23F442 */ jal func_808FD108 +/* 08B00 80905A40 0C23F442 */ jal func_808FD108 /* 08B04 80905A44 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 08B08 80905A48 8FA80068 */ lw $t0, 0x0068($sp) +/* 08B08 80905A48 8FA80068 */ lw $t0, 0x0068($sp) /* 08B0C 80905A4C 3C0FDB06 */ lui $t7, 0xDB06 ## $t7 = DB060000 /* 08B10 80905A50 35EF0020 */ ori $t7, $t7, 0x0020 ## $t7 = DB060020 /* 08B14 80905A54 8D0302C0 */ lw $v1, 0x02C0($t0) ## 000002C0 @@ -101,29 +101,29 @@ glabel BossGanon2_Draw /* 08B2C 80905A6C 92180310 */ lbu $t8, 0x0310($s0) ## 00000310 /* 08B30 80905A70 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 /* 08B34 80905A74 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF -/* 08B38 80905A78 00187080 */ sll $t6, $t8, 2 -/* 08B3C 80905A7C 008E2021 */ addu $a0, $a0, $t6 -/* 08B40 80905A80 8C847170 */ lw $a0, %lo(D_80907170)($a0) +/* 08B38 80905A78 00187080 */ sll $t6, $t8, 2 +/* 08B3C 80905A7C 008E2021 */ addu $a0, $a0, $t6 +/* 08B40 80905A80 8C847170 */ lw $a0, %lo(D_80907170)($a0) /* 08B44 80905A84 3C078000 */ lui $a3, 0x8000 ## $a3 = 80000000 /* 08B48 80905A88 26050444 */ addiu $a1, $s0, 0x0444 ## $a1 = 00000444 -/* 08B4C 80905A8C 00044900 */ sll $t1, $a0, 4 -/* 08B50 80905A90 00095702 */ srl $t2, $t1, 28 -/* 08B54 80905A94 000A5880 */ sll $t3, $t2, 2 -/* 08B58 80905A98 018B6021 */ addu $t4, $t4, $t3 +/* 08B4C 80905A8C 00044900 */ sll $t1, $a0, 4 +/* 08B50 80905A90 00095702 */ srl $t2, $t1, 28 +/* 08B54 80905A94 000A5880 */ sll $t3, $t2, 2 +/* 08B58 80905A98 018B6021 */ addu $t4, $t4, $t3 /* 08B5C 80905A9C 8D8C6FA8 */ lw $t4, 0x6FA8($t4) ## 80166FA8 -/* 08B60 80905AA0 0081C824 */ and $t9, $a0, $at +/* 08B60 80905AA0 0081C824 */ and $t9, $a0, $at /* 08B64 80905AA4 3C068090 */ lui $a2, %hi(D_8090717C) ## $a2 = 80900000 -/* 08B68 80905AA8 032C6821 */ addu $t5, $t9, $t4 -/* 08B6C 80905AAC 01A77821 */ addu $t7, $t5, $a3 +/* 08B68 80905AA8 032C6821 */ addu $t5, $t9, $t4 +/* 08B6C 80905AAC 01A77821 */ addu $t7, $t5, $a3 /* 08B70 80905AB0 AC6F0004 */ sw $t7, 0x0004($v1) ## 00000004 -/* 08B74 80905AB4 AFA5003C */ sw $a1, 0x003C($sp) +/* 08B74 80905AB4 AFA5003C */ sw $a1, 0x003C($sp) /* 08B78 80905AB8 24C6717C */ addiu $a2, $a2, %lo(D_8090717C) ## $a2 = 8090717C -/* 08B7C 80905ABC 0C23F420 */ jal func_808FD080 +/* 08B7C 80905ABC 0C23F420 */ jal func_808FD080 /* 08B80 80905AC0 00002025 */ or $a0, $zero, $zero ## $a0 = 00000000 /* 08B84 80905AC4 3C068090 */ lui $a2, %hi(D_8090717C) ## $a2 = 80900000 -/* 08B88 80905AC8 8FA5003C */ lw $a1, 0x003C($sp) +/* 08B88 80905AC8 8FA5003C */ lw $a1, 0x003C($sp) /* 08B8C 80905ACC 24C6717C */ addiu $a2, $a2, %lo(D_8090717C) ## $a2 = 8090717C -/* 08B90 80905AD0 0C23F420 */ jal func_808FD080 +/* 08B90 80905AD0 0C23F420 */ jal func_808FD080 /* 08B94 80905AD4 24040001 */ addiu $a0, $zero, 0x0001 ## $a0 = 00000001 /* 08B98 80905AD8 3C188090 */ lui $t8, %hi(D_8090717C) ## $t8 = 80900000 /* 08B9C 80905ADC 2718717C */ addiu $t8, $t8, %lo(D_8090717C) ## $t8 = 8090717C @@ -137,36 +137,36 @@ glabel BossGanon2_Draw /* 08BBC 80905AFC AE0E021C */ sw $t6, 0x021C($s0) ## 0000021C /* 08BC0 80905B00 8F090008 */ lw $t1, 0x0008($t8) ## 80907184 /* 08BC4 80905B04 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 08BC8 80905B08 1160000C */ beq $t3, $zero, .L80905B3C +/* 08BC8 80905B08 1160000C */ beq $t3, $zero, .L80905B3C /* 08BCC 80905B0C AE090220 */ sw $t1, 0x0220($s0) ## 00000220 -/* 08BD0 80905B10 8FB90068 */ lw $t9, 0x0068($sp) +/* 08BD0 80905B10 8FB90068 */ lw $t9, 0x0068($sp) /* 08BD4 80905B14 240C00FF */ addiu $t4, $zero, 0x00FF ## $t4 = 000000FF /* 08BD8 80905B18 240D0384 */ addiu $t5, $zero, 0x0384 ## $t5 = 00000384 /* 08BDC 80905B1C 8F2402C0 */ lw $a0, 0x02C0($t9) ## 000002C0 /* 08BE0 80905B20 240F044B */ addiu $t7, $zero, 0x044B ## $t7 = 0000044B -/* 08BE4 80905B24 AFAF0018 */ sw $t7, 0x0018($sp) -/* 08BE8 80905B28 AFAD0014 */ sw $t5, 0x0014($sp) -/* 08BEC 80905B2C 0C024CDC */ jal func_80093370 -/* 08BF0 80905B30 AFAC0010 */ sw $t4, 0x0010($sp) -/* 08BF4 80905B34 8FB80068 */ lw $t8, 0x0068($sp) +/* 08BE4 80905B24 AFAF0018 */ sw $t7, 0x0018($sp) +/* 08BE8 80905B28 AFAD0014 */ sw $t5, 0x0014($sp) +/* 08BEC 80905B2C 0C024CDC */ jal Gfx_SetFog +/* 08BF0 80905B30 AFAC0010 */ sw $t4, 0x0010($sp) +/* 08BF4 80905B34 8FB80068 */ lw $t8, 0x0068($sp) /* 08BF8 80905B38 AF0202C0 */ sw $v0, 0x02C0($t8) ## 000002C0 .L80905B3C: /* 08BFC 80905B3C 3C01C57A */ lui $at, 0xC57A ## $at = C57A0000 /* 08C00 80905B40 44817000 */ mtc1 $at, $f14 ## $f14 = -4000.00 /* 08C04 80905B44 44806000 */ mtc1 $zero, $f12 ## $f12 = 0.00 /* 08C08 80905B48 3C06457A */ lui $a2, 0x457A ## $a2 = 457A0000 -/* 08C0C 80905B4C 0C034261 */ jal Matrix_Translate +/* 08C0C 80905B4C 0C034261 */ jal Matrix_Translate /* 08C10 80905B50 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 /* 08C14 80905B54 C60C0394 */ lwc1 $f12, 0x0394($s0) ## 00000394 -/* 08C18 80905B58 0C0342DC */ jal Matrix_RotateX +/* 08C18 80905B58 0C0342DC */ jal Matrix_RotateX /* 08C1C 80905B5C 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 /* 08C20 80905B60 3C01457A */ lui $at, 0x457A ## $at = 457A0000 /* 08C24 80905B64 44817000 */ mtc1 $at, $f14 ## $f14 = 4000.00 /* 08C28 80905B68 44806000 */ mtc1 $zero, $f12 ## $f12 = 0.00 /* 08C2C 80905B6C 3C06C57A */ lui $a2, 0xC57A ## $a2 = C57A0000 -/* 08C30 80905B70 0C034261 */ jal Matrix_Translate +/* 08C30 80905B70 0C034261 */ jal Matrix_Translate /* 08C34 80905B74 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 08C38 80905B78 8FA20068 */ lw $v0, 0x0068($sp) +/* 08C38 80905B78 8FA20068 */ lw $v0, 0x0068($sp) /* 08C3C 80905B7C 3C09DA38 */ lui $t1, 0xDA38 ## $t1 = DA380000 /* 08C40 80905B80 35290003 */ ori $t1, $t1, 0x0003 ## $t1 = DA380003 /* 08C44 80905B84 8C4302C0 */ lw $v1, 0x02C0($v0) ## 000002C0 @@ -177,9 +177,9 @@ glabel BossGanon2_Draw /* 08C58 80905B98 AC690000 */ sw $t1, 0x0000($v1) ## 00000000 /* 08C5C 80905B9C 8E240000 */ lw $a0, 0x0000($s1) ## 00000000 /* 08C60 80905BA0 24061716 */ addiu $a2, $zero, 0x1716 ## $a2 = 00001716 -/* 08C64 80905BA4 0C0346A2 */ jal Matrix_NewMtx -/* 08C68 80905BA8 AFA30048 */ sw $v1, 0x0048($sp) -/* 08C6C 80905BAC 8FA70048 */ lw $a3, 0x0048($sp) +/* 08C64 80905BA4 0C0346A2 */ jal Matrix_NewMtx +/* 08C68 80905BA8 AFA30048 */ sw $v1, 0x0048($sp) +/* 08C6C 80905BAC 8FA70048 */ lw $a3, 0x0048($sp) /* 08C70 80905BB0 3C0A8090 */ lui $t2, %hi(func_80904818) ## $t2 = 80900000 /* 08C74 80905BB4 3C0B8090 */ lui $t3, %hi(func_809049A0) ## $t3 = 80900000 /* 08C78 80905BB8 ACE20004 */ sw $v0, 0x0004($a3) ## 00000004 @@ -188,73 +188,73 @@ glabel BossGanon2_Draw /* 08C84 80905BC4 8E050150 */ lw $a1, 0x0150($s0) ## 00000150 /* 08C88 80905BC8 256B49A0 */ addiu $t3, $t3, %lo(func_809049A0) ## $t3 = 809049A0 /* 08C8C 80905BCC 254A4818 */ addiu $t2, $t2, %lo(func_80904818) ## $t2 = 80904818 -/* 08C90 80905BD0 AFAA0010 */ sw $t2, 0x0010($sp) -/* 08C94 80905BD4 AFAB0014 */ sw $t3, 0x0014($sp) -/* 08C98 80905BD8 AFB00018 */ sw $s0, 0x0018($sp) -/* 08C9C 80905BDC 0C0286B2 */ jal func_800A1AC8 +/* 08C90 80905BD0 AFAA0010 */ sw $t2, 0x0010($sp) +/* 08C94 80905BD4 AFAB0014 */ sw $t3, 0x0014($sp) +/* 08C98 80905BD8 AFB00018 */ sw $s0, 0x0018($sp) +/* 08C9C 80905BDC 0C0286B2 */ jal SkelAnime_DrawSV /* 08CA0 80905BE0 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 08CA4 80905BE4 8FB90068 */ lw $t9, 0x0068($sp) +/* 08CA4 80905BE4 8FB90068 */ lw $t9, 0x0068($sp) /* 08CA8 80905BE8 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 08CAC 80905BEC 0C02F228 */ jal func_800BC8A0 +/* 08CAC 80905BEC 0C02F228 */ jal func_800BC8A0 /* 08CB0 80905BF0 8F2502C0 */ lw $a1, 0x02C0($t9) ## 000002C0 -/* 08CB4 80905BF4 8FAC0068 */ lw $t4, 0x0068($sp) +/* 08CB4 80905BF4 8FAC0068 */ lw $t4, 0x0068($sp) /* 08CB8 80905BF8 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 08CBC 80905BFC 02203025 */ or $a2, $s1, $zero ## $a2 = 00000000 /* 08CC0 80905C00 AD8202C0 */ sw $v0, 0x02C0($t4) ## 000002C0 -/* 08CC4 80905C04 0C241A7E */ jal func_809069F8 -/* 08CC8 80905C08 8FA40074 */ lw $a0, 0x0074($sp) -/* 08CCC 80905C0C 8FA40074 */ lw $a0, 0x0074($sp) +/* 08CC4 80905C04 0C241A7E */ jal func_809069F8 +/* 08CC8 80905C08 8FA40074 */ lw $a0, 0x0074($sp) +/* 08CCC 80905C0C 8FA40074 */ lw $a0, 0x0074($sp) /* 08CD0 80905C10 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 08CD4 80905C14 0C241AAC */ jal func_80906AB0 +/* 08CD4 80905C14 0C241AAC */ jal func_80906AB0 /* 08CD8 80905C18 02203025 */ or $a2, $s1, $zero ## $a2 = 00000000 /* 08CDC 80905C1C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 .L80905C20: /* 08CE0 80905C20 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 /* 08CE4 80905C24 24060153 */ addiu $a2, $zero, 0x0153 ## $a2 = 00000153 -/* 08CE8 80905C28 0C23F442 */ jal func_808FD108 +/* 08CE8 80905C28 0C23F442 */ jal func_808FD108 /* 08CEC 80905C2C 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 /* 08CF0 80905C30 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 08CF4 80905C34 0C2410D0 */ jal func_80904340 +/* 08CF4 80905C34 0C2410D0 */ jal func_80904340 /* 08CF8 80905C38 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 /* 08CFC 80905C3C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 08D00 80905C40 0C241042 */ jal func_80904108 +/* 08D00 80905C40 0C241042 */ jal func_80904108 /* 08D04 80905C44 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 /* 08D08 80905C48 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 08D0C 80905C4C 0C241362 */ jal func_80904D88 +/* 08D0C 80905C4C 0C241362 */ jal func_80904D88 /* 08D10 80905C50 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 /* 08D14 80905C54 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 08D18 80905C58 0C241193 */ jal func_8090464C +/* 08D18 80905C58 0C241193 */ jal func_8090464C /* 08D1C 80905C5C 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 /* 08D20 80905C60 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 08D24 80905C64 0C24159D */ jal func_80905674 +/* 08D24 80905C64 0C24159D */ jal func_80905674 /* 08D28 80905C68 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 /* 08D2C 80905C6C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 08D30 80905C70 0C2413F2 */ jal func_80904FC8 +/* 08D30 80905C70 0C2413F2 */ jal func_80904FC8 /* 08D34 80905C74 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 /* 08D38 80905C78 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 08D3C 80905C7C 0C24148F */ jal func_8090523C +/* 08D3C 80905C7C 0C24148F */ jal func_8090523C /* 08D40 80905C80 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 /* 08D44 80905C84 920D0312 */ lbu $t5, 0x0312($s0) ## 00000312 /* 08D48 80905C88 3C028090 */ lui $v0, %hi(D_80907080) ## $v0 = 80900000 /* 08D4C 80905C8C 24427080 */ addiu $v0, $v0, %lo(D_80907080) ## $v0 = 80907080 -/* 08D50 80905C90 15A00004 */ bne $t5, $zero, .L80905CA4 +/* 08D50 80905C90 15A00004 */ bne $t5, $zero, .L80905CA4 /* 08D54 80905C94 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 08D58 80905C98 844F0000 */ lh $t7, 0x0000($v0) ## 80907080 -/* 08D5C 80905C9C 11E00015 */ beq $t7, $zero, .L80905CF4 +/* 08D5C 80905C9C 11E00015 */ beq $t7, $zero, .L80905CF4 /* 08D60 80905CA0 00000000 */ nop .L80905CA4: -/* 08D64 80905CA4 0C240FCE */ jal func_80903F38 +/* 08D64 80905CA4 0C240FCE */ jal func_80903F38 /* 08D68 80905CA8 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 /* 08D6C 80905CAC 92180312 */ lbu $t8, 0x0312($s0) ## 00000312 /* 08D70 80905CB0 3C028090 */ lui $v0, %hi(D_80907080) ## $v0 = 80900000 /* 08D74 80905CB4 24427080 */ addiu $v0, $v0, %lo(D_80907080) ## $v0 = 80907080 -/* 08D78 80905CB8 17000008 */ bne $t8, $zero, .L80905CDC +/* 08D78 80905CB8 17000008 */ bne $t8, $zero, .L80905CDC /* 08D7C 80905CBC 00000000 */ nop /* 08D80 80905CC0 844E0000 */ lh $t6, 0x0000($v0) ## 80907080 /* 08D84 80905CC4 25C9FFD8 */ addiu $t1, $t6, 0xFFD8 ## $t1 = FFFFFFD8 /* 08D88 80905CC8 A4490000 */ sh $t1, 0x0000($v0) ## 80907080 /* 08D8C 80905CCC 844A0000 */ lh $t2, 0x0000($v0) ## 80907080 -/* 08D90 80905CD0 1D400002 */ bgtz $t2, .L80905CDC +/* 08D90 80905CD0 1D400002 */ bgtz $t2, .L80905CDC /* 08D94 80905CD4 00000000 */ nop /* 08D98 80905CD8 A4400000 */ sh $zero, 0x0000($v0) ## 80907080 .L80905CDC: @@ -262,7 +262,7 @@ glabel BossGanon2_Draw /* 08DA0 80905CE0 24420638 */ addiu $v0, $v0, %lo(D_80910638) ## $v0 = 80910638 /* 08DA4 80905CE4 804B0000 */ lb $t3, 0x0000($v0) ## 80910638 /* 08DA8 80905CE8 25790001 */ addiu $t9, $t3, 0x0001 ## $t9 = 00000001 -/* 08DAC 80905CEC 10000021 */ beq $zero, $zero, .L80905D74 +/* 08DAC 80905CEC 10000021 */ beq $zero, $zero, .L80905D74 /* 08DB0 80905CF0 A0590000 */ sb $t9, 0x0000($v0) ## 80910638 .L80905CF4: /* 08DB4 80905CF4 3C068091 */ lui $a2, %hi(D_80910608) ## $a2 = 80910000 @@ -274,17 +274,17 @@ glabel BossGanon2_Draw /* 08DCC 80905D0C 2608020C */ addiu $t0, $s0, 0x020C ## $t0 = 0000020C /* 08DD0 80905D10 2405000C */ addiu $a1, $zero, 0x000C ## $a1 = 0000000C .L80905D14: -/* 08DD4 80905D14 00650019 */ multu $v1, $a1 +/* 08DD4 80905D14 00650019 */ multu $v1, $a1 /* 08DD8 80905D18 8CEF0000 */ lw $t7, 0x0000($a3) ## 00000200 /* 08DDC 80905D1C 24630001 */ addiu $v1, $v1, 0x0001 ## $v1 = 00000001 -/* 08DE0 80905D20 00031C00 */ sll $v1, $v1, 16 -/* 08DE4 80905D24 00031C03 */ sra $v1, $v1, 16 -/* 08DE8 80905D28 28610003 */ slti $at, $v1, 0x0003 -/* 08DEC 80905D2C 00001012 */ mflo $v0 -/* 08DF0 80905D30 00826021 */ addu $t4, $a0, $v0 +/* 08DE0 80905D20 00031C00 */ sll $v1, $v1, 16 +/* 08DE4 80905D24 00031C03 */ sra $v1, $v1, 16 +/* 08DE8 80905D28 28610003 */ slti $at, $v1, 0x0003 +/* 08DEC 80905D2C 00001012 */ mflo $v0 +/* 08DF0 80905D30 00826021 */ addu $t4, $a0, $v0 /* 08DF4 80905D34 AD8F0000 */ sw $t7, 0x0000($t4) ## 00000000 /* 08DF8 80905D38 8CED0004 */ lw $t5, 0x0004($a3) ## 00000204 -/* 08DFC 80905D3C 00C2C021 */ addu $t8, $a2, $v0 +/* 08DFC 80905D3C 00C2C021 */ addu $t8, $a2, $v0 /* 08E00 80905D40 AD8D0004 */ sw $t5, 0x0004($t4) ## 00000004 /* 08E04 80905D44 8CEF0008 */ lw $t7, 0x0008($a3) ## 00000208 /* 08E08 80905D48 AD8F0008 */ sw $t7, 0x0008($t4) ## 00000008 @@ -293,7 +293,7 @@ glabel BossGanon2_Draw /* 08E14 80905D54 8D0E0004 */ lw $t6, 0x0004($t0) ## 00000210 /* 08E18 80905D58 AF0E0004 */ sw $t6, 0x0004($t8) ## 00000004 /* 08E1C 80905D5C 8D090008 */ lw $t1, 0x0008($t0) ## 00000214 -/* 08E20 80905D60 1420FFEC */ bne $at, $zero, .L80905D14 +/* 08E20 80905D60 1420FFEC */ bne $at, $zero, .L80905D14 /* 08E24 80905D64 AF090008 */ sw $t1, 0x0008($t8) ## 00000008 /* 08E28 80905D68 3C028091 */ lui $v0, %hi(D_80910638) ## $v0 = 80910000 /* 08E2C 80905D6C 24420638 */ addiu $v0, $v0, %lo(D_80910638) ## $v0 = 80910638 @@ -303,14 +303,14 @@ glabel BossGanon2_Draw /* 08E38 80905D78 24C6D9E4 */ addiu $a2, $a2, %lo(D_8090D9E4) ## $a2 = 8090D9E4 /* 08E3C 80905D7C 27A40058 */ addiu $a0, $sp, 0x0058 ## $a0 = FFFFFFE0 /* 08E40 80905D80 8E250000 */ lw $a1, 0x0000($s1) ## 00000000 -/* 08E44 80905D84 0C031AD5 */ jal func_800C6B54 +/* 08E44 80905D84 0C031AD5 */ jal Graph_CloseDisps /* 08E48 80905D88 2407175F */ addiu $a3, $zero, 0x175F ## $a3 = 0000175F -/* 08E4C 80905D8C 0C24183A */ jal func_809060E8 +/* 08E4C 80905D8C 0C24183A */ jal func_809060E8 /* 08E50 80905D90 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 08E54 80905D94 8FBF002C */ lw $ra, 0x002C($sp) -/* 08E58 80905D98 8FB00024 */ lw $s0, 0x0024($sp) -/* 08E5C 80905D9C 8FB10028 */ lw $s1, 0x0028($sp) -/* 08E60 80905DA0 03E00008 */ jr $ra +/* 08E54 80905D94 8FBF002C */ lw $ra, 0x002C($sp) +/* 08E58 80905D98 8FB00024 */ lw $s0, 0x0024($sp) +/* 08E5C 80905D9C 8FB10028 */ lw $s1, 0x0028($sp) +/* 08E60 80905DA0 03E00008 */ jr $ra /* 08E64 80905DA4 27BD0078 */ addiu $sp, $sp, 0x0078 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/BossGanon2_Init.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/BossGanon2_Init.s index e40abd44e2..74f3e48605 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/BossGanon2_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/BossGanon2_Init.s @@ -1,80 +1,80 @@ glabel BossGanon2_Init /* 0041C 808FD35C 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 -/* 00420 808FD360 AFB10028 */ sw $s1, 0x0028($sp) -/* 00424 808FD364 AFB00024 */ sw $s0, 0x0024($sp) +/* 00420 808FD360 AFB10028 */ sw $s1, 0x0028($sp) +/* 00424 808FD364 AFB00024 */ sw $s0, 0x0024($sp) /* 00428 808FD368 3C068091 */ lui $a2, %hi(D_8090EB38) ## $a2 = 80910000 /* 0042C 808FD36C 3C010001 */ lui $at, 0x0001 ## $at = 00010000 /* 00430 808FD370 24C6EB38 */ addiu $a2, $a2, %lo(D_8090EB38) ## $a2 = 8090EB38 -/* 00434 808FD374 AFBF002C */ sw $ra, 0x002C($sp) -/* 00438 808FD378 00250821 */ addu $at, $at, $a1 +/* 00434 808FD374 AFBF002C */ sw $ra, 0x002C($sp) +/* 00438 808FD378 00250821 */ addu $at, $at, $a1 /* 0043C 808FD37C 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 00440 808FD380 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 /* 00444 808FD384 AC261E10 */ sw $a2, 0x1E10($at) ## 00011E10 /* 00448 808FD388 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 /* 0044C 808FD38C 24030044 */ addiu $v1, $zero, 0x0044 ## $v1 = 00000044 .L808FD390: -/* 00450 808FD390 00430019 */ multu $v0, $v1 +/* 00450 808FD390 00430019 */ multu $v0, $v1 /* 00454 808FD394 24420001 */ addiu $v0, $v0, 0x0001 ## $v0 = 00000001 -/* 00458 808FD398 00021400 */ sll $v0, $v0, 16 -/* 0045C 808FD39C 00021403 */ sra $v0, $v0, 16 -/* 00460 808FD3A0 28410064 */ slti $at, $v0, 0x0064 -/* 00464 808FD3A4 00007012 */ mflo $t6 -/* 00468 808FD3A8 00CE7821 */ addu $t7, $a2, $t6 -/* 0046C 808FD3AC 1420FFF8 */ bne $at, $zero, .L808FD390 +/* 00458 808FD398 00021400 */ sll $v0, $v0, 16 +/* 0045C 808FD39C 00021403 */ sra $v0, $v0, 16 +/* 00460 808FD3A0 28410064 */ slti $at, $v0, 0x0064 +/* 00464 808FD3A4 00007012 */ mflo $t6 +/* 00468 808FD3A8 00CE7821 */ addu $t7, $a2, $t6 +/* 0046C 808FD3AC 1420FFF8 */ bne $at, $zero, .L808FD390 /* 00470 808FD3B0 A1E00000 */ sb $zero, 0x0000($t7) ## 00000000 /* 00474 808FD3B4 241800FF */ addiu $t8, $zero, 0x00FF ## $t8 = 000000FF /* 00478 808FD3B8 2419001E */ addiu $t9, $zero, 0x001E ## $t9 = 0000001E /* 0047C 808FD3BC A21800AE */ sb $t8, 0x00AE($s0) ## 000000AE /* 00480 808FD3C0 A21900AF */ sb $t9, 0x00AF($s0) ## 000000AF /* 00484 808FD3C4 26050424 */ addiu $a1, $s0, 0x0424 ## $a1 = 00000424 -/* 00488 808FD3C8 AFA50030 */ sw $a1, 0x0030($sp) -/* 0048C 808FD3CC 0C016EFE */ jal func_8005BBF8 +/* 00488 808FD3C8 AFA50030 */ sw $a1, 0x0030($sp) +/* 0048C 808FD3CC 0C016EFE */ jal func_8005BBF8 /* 00490 808FD3D0 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 00494 808FD3D4 3C078090 */ lui $a3, %hi(D_80906FBC) ## $a3 = 80900000 /* 00498 808FD3D8 26080464 */ addiu $t0, $s0, 0x0464 ## $t0 = 00000464 -/* 0049C 808FD3DC 8FA50030 */ lw $a1, 0x0030($sp) -/* 004A0 808FD3E0 AFA80010 */ sw $t0, 0x0010($sp) +/* 0049C 808FD3DC 8FA50030 */ lw $a1, 0x0030($sp) +/* 004A0 808FD3E0 AFA80010 */ sw $t0, 0x0010($sp) /* 004A4 808FD3E4 24E76FBC */ addiu $a3, $a3, %lo(D_80906FBC) ## $a3 = 80906FBC /* 004A8 808FD3E8 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 004AC 808FD3EC 0C017014 */ jal func_8005C050 +/* 004AC 808FD3EC 0C017014 */ jal func_8005C050 /* 004B0 808FD3F0 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 004B4 808FD3F4 26050444 */ addiu $a1, $s0, 0x0444 ## $a1 = 00000444 -/* 004B8 808FD3F8 AFA50030 */ sw $a1, 0x0030($sp) -/* 004BC 808FD3FC 0C016EFE */ jal func_8005BBF8 +/* 004B8 808FD3F8 AFA50030 */ sw $a1, 0x0030($sp) +/* 004BC 808FD3FC 0C016EFE */ jal func_8005BBF8 /* 004C0 808FD400 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 004C4 808FD404 3C078090 */ lui $a3, %hi(D_80907014) ## $a3 = 80900000 /* 004C8 808FD408 26090864 */ addiu $t1, $s0, 0x0864 ## $t1 = 00000864 -/* 004CC 808FD40C 8FA50030 */ lw $a1, 0x0030($sp) -/* 004D0 808FD410 AFA90010 */ sw $t1, 0x0010($sp) +/* 004CC 808FD40C 8FA50030 */ lw $a1, 0x0030($sp) +/* 004D0 808FD410 AFA90010 */ sw $t1, 0x0010($sp) /* 004D4 808FD414 24E77014 */ addiu $a3, $a3, %lo(D_80907014) ## $a3 = 80907014 /* 004D8 808FD418 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 004DC 808FD41C 0C017014 */ jal func_8005C050 +/* 004DC 808FD41C 0C017014 */ jal func_8005C050 /* 004E0 808FD420 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 004E4 808FD424 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 004E8 808FD428 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 /* 004EC 808FD42C 240600E1 */ addiu $a2, $zero, 0x00E1 ## $a2 = 000000E1 -/* 004F0 808FD430 0C23F442 */ jal func_808FD108 +/* 004F0 808FD430 0C23F442 */ jal func_808FD108 /* 004F4 808FD434 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 /* 004F8 808FD438 3C060601 */ lui $a2, 0x0601 ## $a2 = 06010000 /* 004FC 808FD43C 24C614E8 */ addiu $a2, $a2, 0x14E8 ## $a2 = 060114E8 /* 00500 808FD440 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 00504 808FD444 2605014C */ addiu $a1, $s0, 0x014C ## $a1 = 0000014C /* 00508 808FD448 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 0050C 808FD44C AFA00010 */ sw $zero, 0x0010($sp) -/* 00510 808FD450 AFA00014 */ sw $zero, 0x0014($sp) -/* 00514 808FD454 0C0291BE */ jal func_800A46F8 -/* 00518 808FD458 AFA00018 */ sw $zero, 0x0018($sp) +/* 0050C 808FD44C AFA00010 */ sw $zero, 0x0010($sp) +/* 00510 808FD450 AFA00014 */ sw $zero, 0x0014($sp) +/* 00514 808FD454 0C0291BE */ jal SkelAnime_InitSV +/* 00518 808FD458 AFA00018 */ sw $zero, 0x0018($sp) /* 0051C 808FD45C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00520 808FD460 0C23F571 */ jal func_808FD5C4 +/* 00520 808FD460 0C23F571 */ jal func_808FD5C4 /* 00524 808FD464 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 /* 00528 808FD468 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 /* 0052C 808FD46C 240A003E */ addiu $t2, $zero, 0x003E ## $t2 = 0000003E /* 00530 808FD470 A20A0117 */ sb $t2, 0x0117($s0) ## 00000117 /* 00534 808FD474 E604006C */ swc1 $f4, 0x006C($s0) ## 0000006C -/* 00538 808FD478 8FBF002C */ lw $ra, 0x002C($sp) -/* 0053C 808FD47C 8FB10028 */ lw $s1, 0x0028($sp) -/* 00540 808FD480 8FB00024 */ lw $s0, 0x0024($sp) -/* 00544 808FD484 03E00008 */ jr $ra +/* 00538 808FD478 8FBF002C */ lw $ra, 0x002C($sp) +/* 0053C 808FD47C 8FB10028 */ lw $s1, 0x0028($sp) +/* 00540 808FD480 8FB00024 */ lw $s0, 0x0024($sp) +/* 00544 808FD484 03E00008 */ jr $ra /* 00548 808FD488 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_808FD108.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_808FD108.s index 5e43b032f2..7ff4a59b2f 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_808FD108.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_808FD108.s @@ -31,7 +31,7 @@ glabel func_808FD108 /* 00238 808FD178 AFA20048 */ sw $v0, 0x0048($sp) /* 0023C 808FD17C 27A40034 */ addiu $a0, $sp, 0x0034 ## $a0 = FFFFFFE4 /* 00240 808FD180 24070316 */ addiu $a3, $zero, 0x0316 ## $a3 = 00000316 -/* 00244 808FD184 0C031AB1 */ jal func_800C6AC4 +/* 00244 808FD184 0C031AB1 */ jal Graph_OpenDisps /* 00248 808FD188 AFA50044 */ sw $a1, 0x0044($sp) /* 0024C 808FD18C 8FA80044 */ lw $t0, 0x0044($sp) /* 00250 808FD190 8FA90048 */ lw $t1, 0x0048($sp) @@ -59,7 +59,7 @@ glabel func_808FD108 /* 002A8 808FD1E8 8C8F17B4 */ lw $t7, 0x17B4($a0) ## 000017B4 /* 002AC 808FD1EC 27A40034 */ addiu $a0, $sp, 0x0034 ## $a0 = FFFFFFE4 /* 002B0 808FD1F0 AC6F0004 */ sw $t7, 0x0004($v1) ## 00000004 -/* 002B4 808FD1F4 0C031AD5 */ jal func_800C6B54 +/* 002B4 808FD1F4 0C031AD5 */ jal Graph_CloseDisps /* 002B8 808FD1F8 8E050000 */ lw $a1, 0x0000($s0) ## 00000000 .L808FD1FC: /* 002BC 808FD1FC 8FBF001C */ lw $ra, 0x001C($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_808FD5F4.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_808FD5F4.s index 1c6d3e9306..8a6097dddb 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_808FD5F4.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_808FD5F4.s @@ -1,104 +1,104 @@ glabel func_808FD5F4 /* 006B4 808FD5F4 27BDFF70 */ addiu $sp, $sp, 0xFF70 ## $sp = FFFFFF70 -/* 006B8 808FD5F8 AFBF003C */ sw $ra, 0x003C($sp) -/* 006BC 808FD5FC AFB10038 */ sw $s1, 0x0038($sp) -/* 006C0 808FD600 AFB00034 */ sw $s0, 0x0034($sp) -/* 006C4 808FD604 A3A0008D */ sb $zero, 0x008D($sp) +/* 006B8 808FD5F8 AFBF003C */ sw $ra, 0x003C($sp) +/* 006BC 808FD5FC AFB10038 */ sw $s1, 0x0038($sp) +/* 006C0 808FD600 AFB00034 */ sw $s0, 0x0034($sp) +/* 006C4 808FD604 A3A0008D */ sb $zero, 0x008D($sp) /* 006C8 808FD608 8C8E0398 */ lw $t6, 0x0398($a0) ## 00000398 /* 006CC 808FD60C 9498039C */ lhu $t8, 0x039C($a0) ## 0000039C /* 006D0 808FD610 8CA91C44 */ lw $t1, 0x1C44($a1) ## 00001C44 /* 006D4 808FD614 25CF0001 */ addiu $t7, $t6, 0x0001 ## $t7 = 00000001 -/* 006D8 808FD618 2F01001E */ sltiu $at, $t8, 0x001E +/* 006D8 808FD618 2F01001E */ sltiu $at, $t8, 0x001E /* 006DC 808FD61C 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 006E0 808FD620 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 -/* 006E4 808FD624 1020087A */ beq $at, $zero, .L808FF810 +/* 006E4 808FD624 1020087A */ beq $at, $zero, .L808FF810 /* 006E8 808FD628 AC8F0398 */ sw $t7, 0x0398($a0) ## 00000398 -/* 006EC 808FD62C 0018C080 */ sll $t8, $t8, 2 +/* 006EC 808FD62C 0018C080 */ sll $t8, $t8, 2 /* 006F0 808FD630 3C018091 */ lui $at, %hi(jtbl_8090DAB4) ## $at = 80910000 -/* 006F4 808FD634 00380821 */ addu $at, $at, $t8 -/* 006F8 808FD638 8C38DAB4 */ lw $t8, %lo(jtbl_8090DAB4)($at) -/* 006FC 808FD63C 03000008 */ jr $t8 +/* 006F4 808FD634 00380821 */ addu $at, $at, $t8 +/* 006F8 808FD638 8C38DAB4 */ lw $t8, %lo(jtbl_8090DAB4)($at) +/* 006FC 808FD63C 03000008 */ jr $t8 /* 00700 808FD640 00000000 */ nop glabel L808FD644 /* 00704 808FD644 3C010001 */ lui $at, 0x0001 ## $at = 00010000 /* 00708 808FD648 342117A4 */ ori $at, $at, 0x17A4 ## $at = 000117A4 -/* 0070C 808FD64C 02212021 */ addu $a0, $s1, $at -/* 00710 808FD650 AFA40054 */ sw $a0, 0x0054($sp) +/* 0070C 808FD64C 02212021 */ addu $a0, $s1, $at +/* 00710 808FD650 AFA40054 */ sw $a0, 0x0054($sp) /* 00714 808FD654 2405017E */ addiu $a1, $zero, 0x017E ## $a1 = 0000017E /* 00718 808FD658 0C02604B */ jal Object_GetIndex ## ObjectIndex -/* 0071C 808FD65C AFA90088 */ sw $t1, 0x0088($sp) -/* 00720 808FD660 8FA40054 */ lw $a0, 0x0054($sp) +/* 0071C 808FD65C AFA90088 */ sw $t1, 0x0088($sp) +/* 00720 808FD660 8FA40054 */ lw $a0, 0x0054($sp) /* 00724 808FD664 0C026062 */ jal Object_IsLoaded - + /* 00728 808FD668 00402825 */ or $a1, $v0, $zero ## $a1 = 00000000 -/* 0072C 808FD66C 10400868 */ beq $v0, $zero, .L808FF810 -/* 00730 808FD670 8FA90088 */ lw $t1, 0x0088($sp) +/* 0072C 808FD66C 10400868 */ beq $v0, $zero, .L808FF810 +/* 00730 808FD670 8FA90088 */ lw $t1, 0x0088($sp) /* 00734 808FD674 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 00738 808FD678 26251D64 */ addiu $a1, $s1, 0x1D64 ## $a1 = 00001D64 -/* 0073C 808FD67C 0C019148 */ jal func_80064520 -/* 00740 808FD680 AFA90088 */ sw $t1, 0x0088($sp) +/* 0073C 808FD67C 0C019148 */ jal func_80064520 +/* 00740 808FD680 AFA90088 */ sw $t1, 0x0088($sp) /* 00744 808FD684 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 00748 808FD688 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 0074C 808FD68C 0C00B7D5 */ jal func_8002DF54 +/* 0074C 808FD68C 0C00B7D5 */ jal func_8002DF54 /* 00750 808FD690 24060008 */ addiu $a2, $zero, 0x0008 ## $a2 = 00000008 -/* 00754 808FD694 0C03008C */ jal func_800C0230 +/* 00754 808FD694 0C03008C */ jal func_800C0230 /* 00758 808FD698 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 0075C 808FD69C A602039E */ sh $v0, 0x039E($s0) ## 0000039E /* 00760 808FD6A0 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 00764 808FD6A4 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 00768 808FD6A8 0C0300C5 */ jal func_800C0314 +/* 00768 808FD6A8 0C0300C5 */ jal func_800C0314 /* 0076C 808FD6AC 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 /* 00770 808FD6B0 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 00774 808FD6B4 8605039E */ lh $a1, 0x039E($s0) ## 0000039E -/* 00778 808FD6B8 0C0300C5 */ jal func_800C0314 +/* 00778 808FD6B8 0C0300C5 */ jal func_800C0314 /* 0077C 808FD6BC 24060007 */ addiu $a2, $zero, 0x0007 ## $a2 = 00000007 /* 00780 808FD6C0 24190001 */ addiu $t9, $zero, 0x0001 ## $t9 = 00000001 /* 00784 808FD6C4 A619039C */ sh $t9, 0x039C($s0) ## 0000039C /* 00788 808FD6C8 3C018091 */ lui $at, %hi(D_8090DB2C) ## $at = 80910000 -/* 0078C 808FD6CC C424DB2C */ lwc1 $f4, %lo(D_8090DB2C)($at) +/* 0078C 808FD6CC C424DB2C */ lwc1 $f4, %lo(D_8090DB2C)($at) /* 00790 808FD6D0 3C018091 */ lui $at, %hi(D_8090DB30) ## $at = 80910000 -/* 00794 808FD6D4 C426DB30 */ lwc1 $f6, %lo(D_8090DB30)($at) +/* 00794 808FD6D4 C426DB30 */ lwc1 $f6, %lo(D_8090DB30)($at) /* 00798 808FD6D8 3C01C348 */ lui $at, 0xC348 ## $at = C3480000 /* 0079C 808FD6DC 44814000 */ mtc1 $at, $f8 ## $f8 = -200.00 /* 007A0 808FD6E0 240B0001 */ addiu $t3, $zero, 0x0001 ## $t3 = 00000001 -/* 007A4 808FD6E4 AFAB0028 */ sw $t3, 0x0028($sp) -/* 007A8 808FD6E8 AFA00024 */ sw $zero, 0x0024($sp) -/* 007AC 808FD6EC AFA00020 */ sw $zero, 0x0020($sp) -/* 007B0 808FD6F0 AFA0001C */ sw $zero, 0x001C($sp) +/* 007A4 808FD6E4 AFAB0028 */ sw $t3, 0x0028($sp) +/* 007A8 808FD6E8 AFA00024 */ sw $zero, 0x0024($sp) +/* 007AC 808FD6EC AFA00020 */ sw $zero, 0x0020($sp) +/* 007B0 808FD6F0 AFA0001C */ sw $zero, 0x001C($sp) /* 007B4 808FD6F4 26241C24 */ addiu $a0, $s1, 0x1C24 ## $a0 = 00001C24 /* 007B8 808FD6F8 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 007BC 808FD6FC 02203025 */ or $a2, $s1, $zero ## $a2 = 00000000 /* 007C0 808FD700 24070179 */ addiu $a3, $zero, 0x0179 ## $a3 = 00000179 -/* 007C4 808FD704 E7A40010 */ swc1 $f4, 0x0010($sp) -/* 007C8 808FD708 E7A60014 */ swc1 $f6, 0x0014($sp) +/* 007C4 808FD704 E7A40010 */ swc1 $f4, 0x0010($sp) +/* 007C8 808FD708 E7A60014 */ swc1 $f6, 0x0014($sp) /* 007CC 808FD70C 0C00C916 */ jal Actor_SpawnAttached - -/* 007D0 808FD710 E7A80018 */ swc1 $f8, 0x0018($sp) + +/* 007D0 808FD710 E7A80018 */ swc1 $f8, 0x0018($sp) /* 007D4 808FD714 3C018091 */ lui $at, %hi(D_8090EB2C) ## $at = 80910000 -/* 007D8 808FD718 AC22EB2C */ sw $v0, %lo(D_8090EB2C)($at) +/* 007D8 808FD718 AC22EB2C */ sw $v0, %lo(D_8090EB2C)($at) /* 007DC 808FD71C 3C0C8091 */ lui $t4, %hi(D_8090EB2C) ## $t4 = 80910000 -/* 007E0 808FD720 8D8CEB2C */ lw $t4, %lo(D_8090EB2C)($t4) -/* 007E4 808FD724 8FA90088 */ lw $t1, 0x0088($sp) +/* 007E0 808FD720 8D8CEB2C */ lw $t4, %lo(D_8090EB2C)($t4) +/* 007E4 808FD724 8FA90088 */ lw $t1, 0x0088($sp) /* 007E8 808FD728 3C018091 */ lui $at, %hi(D_8090DB34) ## $at = 80910000 /* 007EC 808FD72C A18003C8 */ sb $zero, 0x03C8($t4) ## 809103C8 /* 007F0 808FD730 3C0D8091 */ lui $t5, %hi(D_8090EB2C) ## $t5 = 80910000 -/* 007F4 808FD734 8DADEB2C */ lw $t5, %lo(D_8090EB2C)($t5) -/* 007F8 808FD738 C42ADB34 */ lwc1 $f10, %lo(D_8090DB34)($at) +/* 007F4 808FD734 8DADEB2C */ lw $t5, %lo(D_8090EB2C)($t5) +/* 007F8 808FD738 C42ADB34 */ lwc1 $f10, %lo(D_8090DB34)($at) /* 007FC 808FD73C 3C018091 */ lui $at, %hi(D_8090DB38) ## $at = 80910000 /* 00800 808FD740 3C0E8091 */ lui $t6, %hi(D_8090EB2C) ## $t6 = 80910000 /* 00804 808FD744 E5AA0024 */ swc1 $f10, 0x0024($t5) ## 80910024 -/* 00808 808FD748 8DCEEB2C */ lw $t6, %lo(D_8090EB2C)($t6) -/* 0080C 808FD74C C424DB38 */ lwc1 $f4, %lo(D_8090DB38)($at) +/* 00808 808FD748 8DCEEB2C */ lw $t6, %lo(D_8090EB2C)($t6) +/* 0080C 808FD74C C424DB38 */ lwc1 $f4, %lo(D_8090DB38)($at) /* 00810 808FD750 3C01C356 */ lui $at, 0xC356 ## $at = C3560000 /* 00814 808FD754 3C0F8091 */ lui $t7, %hi(D_8090EB2C) ## $t7 = 80910000 /* 00818 808FD758 E5C40028 */ swc1 $f4, 0x0028($t6) ## 80910028 -/* 0081C 808FD75C 8DEFEB2C */ lw $t7, %lo(D_8090EB2C)($t7) +/* 0081C 808FD75C 8DEFEB2C */ lw $t7, %lo(D_8090EB2C)($t7) /* 00820 808FD760 44813000 */ mtc1 $at, $f6 ## $f6 = -214.00 /* 00824 808FD764 3C198091 */ lui $t9, %hi(D_8090EB2C) ## $t9 = 80910000 /* 00828 808FD768 44804000 */ mtc1 $zero, $f8 ## $f8 = 0.00 /* 0082C 808FD76C E5E6002C */ swc1 $f6, 0x002C($t7) ## 8091002C -/* 00830 808FD770 8F39EB2C */ lw $t9, %lo(D_8090EB2C)($t9) +/* 00830 808FD770 8F39EB2C */ lw $t9, %lo(D_8090EB2C)($t9) /* 00834 808FD774 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 /* 00838 808FD778 44815000 */ mtc1 $at, $f10 ## $f10 = 1.00 /* 0083C 808FD77C 24189000 */ addiu $t8, $zero, 0x9000 ## $t8 = FFFF9000 @@ -117,11 +117,11 @@ glabel L808FD644 /* 00870 808FD7B0 E60403C4 */ swc1 $f4, 0x03C4($s0) ## 000003C4 /* 00874 808FD7B4 E60603A4 */ swc1 $f6, 0x03A4($s0) ## 000003A4 /* 00878 808FD7B8 E60A03AC */ swc1 $f10, 0x03AC($s0) ## 000003AC -/* 0087C 808FD7BC C424DB3C */ lwc1 $f4, %lo(D_8090DB3C)($at) +/* 0087C 808FD7BC C424DB3C */ lwc1 $f4, %lo(D_8090DB3C)($at) /* 00880 808FD7C0 3C018091 */ lui $at, %hi(D_8090DB40) ## $at = 80910000 /* 00884 808FD7C4 240BB000 */ addiu $t3, $zero, 0xB000 ## $t3 = FFFFB000 /* 00888 808FD7C8 E5240024 */ swc1 $f4, 0x0024($t1) ## 00000024 -/* 0088C 808FD7CC C426DB40 */ lwc1 $f6, %lo(D_8090DB40)($at) +/* 0088C 808FD7CC C426DB40 */ lwc1 $f6, %lo(D_8090DB40)($at) /* 00890 808FD7D0 3C01C33A */ lui $at, 0xC33A ## $at = C33A0000 /* 00894 808FD7D4 44814000 */ mtc1 $at, $f8 ## $f8 = -186.00 /* 00898 808FD7D8 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 @@ -130,49 +130,49 @@ glabel L808FD644 /* 008A4 808FD7E4 24060000 */ addiu $a2, $zero, 0x0000 ## $a2 = 00000000 /* 008A8 808FD7E8 A52B00B6 */ sh $t3, 0x00B6($t1) ## 000000B6 /* 008AC 808FD7EC E5260028 */ swc1 $f6, 0x0028($t1) ## 00000028 -/* 008B0 808FD7F0 0C0294D3 */ jal func_800A534C +/* 008B0 808FD7F0 0C0294D3 */ jal SkelAnime_ChangeAnimTransitionRepeat /* 008B4 808FD7F4 E528002C */ swc1 $f8, 0x002C($t1) ## 0000002C /* 008B8 808FD7F8 44805000 */ mtc1 $zero, $f10 ## $f10 = 0.00 /* 008BC 808FD7FC 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 008C0 808FD800 8FA90088 */ lw $t1, 0x0088($sp) -/* 008C4 808FD804 00310821 */ addu $at, $at, $s1 +/* 008C0 808FD800 8FA90088 */ lw $t1, 0x0088($sp) +/* 008C4 808FD804 00310821 */ addu $at, $at, $s1 /* 008C8 808FD808 E42A0AFC */ swc1 $f10, 0x0AFC($at) ## 00010AFC glabel L808FD80C /* 008CC 808FD80C 8E0C0398 */ lw $t4, 0x0398($s0) ## 00000398 -/* 008D0 808FD810 2D810046 */ sltiu $at, $t4, 0x0046 -/* 008D4 808FD814 10200005 */ beq $at, $zero, .L808FD82C +/* 008D0 808FD810 2D810046 */ sltiu $at, $t4, 0x0046 +/* 008D4 808FD814 10200005 */ beq $at, $zero, .L808FD82C /* 008D8 808FD818 00000000 */ nop /* 008DC 808FD81C 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 /* 008E0 808FD820 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 008E4 808FD824 00310821 */ addu $at, $at, $s1 +/* 008E4 808FD824 00310821 */ addu $at, $at, $s1 /* 008E8 808FD828 E4240AFC */ swc1 $f4, 0x0AFC($at) ## 00010AFC .L808FD82C: /* 008EC 808FD82C 3C018091 */ lui $at, %hi(D_8090DB44) ## $at = 80910000 -/* 008F0 808FD830 C420DB44 */ lwc1 $f0, %lo(D_8090DB44)($at) +/* 008F0 808FD830 C420DB44 */ lwc1 $f0, %lo(D_8090DB44)($at) /* 008F4 808FD834 C6060410 */ lwc1 $f6, 0x0410($s0) ## 00000410 /* 008F8 808FD838 240D0003 */ addiu $t5, $zero, 0x0003 ## $t5 = 00000003 /* 008FC 808FD83C A20D0339 */ sb $t5, 0x0339($s0) ## 00000339 -/* 00900 808FD840 46003202 */ mul.s $f8, $f6, $f0 +/* 00900 808FD840 46003202 */ mul.s $f8, $f6, $f0 /* 00904 808FD844 3C063DCC */ lui $a2, 0x3DCC ## $a2 = 3DCC0000 -/* 00908 808FD848 44050000 */ mfc1 $a1, $f0 +/* 00908 808FD848 44050000 */ mfc1 $a1, $f0 /* 0090C 808FD84C 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3DCCCCCD -/* 00910 808FD850 AFA90088 */ sw $t1, 0x0088($sp) +/* 00910 808FD850 AFA90088 */ sw $t1, 0x0088($sp) /* 00914 808FD854 260403A4 */ addiu $a0, $s0, 0x03A4 ## $a0 = 000003A4 -/* 00918 808FD858 44074000 */ mfc1 $a3, $f8 +/* 00918 808FD858 44074000 */ mfc1 $a3, $f8 /* 0091C 808FD85C 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 00920 808FD860 00000000 */ nop /* 00924 808FD864 3C0144DC */ lui $at, 0x44DC ## $at = 44DC0000 /* 00928 808FD868 44812000 */ mtc1 $at, $f4 ## $f4 = 1760.00 /* 0092C 808FD86C C60A0410 */ lwc1 $f10, 0x0410($s0) ## 00000410 /* 00930 808FD870 3C063DCC */ lui $a2, 0x3DCC ## $a2 = 3DCC0000 /* 00934 808FD874 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3DCCCCCD -/* 00938 808FD878 46045182 */ mul.s $f6, $f10, $f4 +/* 00938 808FD878 46045182 */ mul.s $f6, $f10, $f4 /* 0093C 808FD87C 260403AC */ addiu $a0, $s0, 0x03AC ## $a0 = 000003AC /* 00940 808FD880 3C05C320 */ lui $a1, 0xC320 ## $a1 = C3200000 -/* 00944 808FD884 44073000 */ mfc1 $a3, $f6 +/* 00944 808FD884 44073000 */ mfc1 $a3, $f6 /* 00948 808FD888 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 0094C 808FD88C 00000000 */ nop /* 00950 808FD890 3C053BF5 */ lui $a1, 0x3BF5 ## $a1 = 3BF50000 /* 00954 808FD894 3C0738D1 */ lui $a3, 0x38D1 ## $a3 = 38D10000 @@ -180,36 +180,36 @@ glabel L808FD80C /* 0095C 808FD89C 34A5C28F */ ori $a1, $a1, 0xC28F ## $a1 = 3BF5C28F /* 00960 808FD8A0 26040410 */ addiu $a0, $s0, 0x0410 ## $a0 = 00000410 /* 00964 808FD8A4 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 00968 808FD8A8 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 0096C 808FD8AC 3C01C348 */ lui $at, 0xC348 ## $at = C3480000 /* 00970 808FD8B0 44814000 */ mtc1 $at, $f8 ## $f8 = -200.00 -/* 00974 808FD8B4 8FA90088 */ lw $t1, 0x0088($sp) +/* 00974 808FD8B4 8FA90088 */ lw $t1, 0x0088($sp) /* 00978 808FD8B8 3C018091 */ lui $at, %hi(D_8090DB48) ## $at = 80910000 /* 0097C 808FD8BC E60803B0 */ swc1 $f8, 0x03B0($s0) ## 000003B0 -/* 00980 808FD8C0 C42ADB48 */ lwc1 $f10, %lo(D_8090DB48)($at) +/* 00980 808FD8C0 C42ADB48 */ lwc1 $f10, %lo(D_8090DB48)($at) /* 00984 808FD8C4 3C01C348 */ lui $at, 0xC348 ## $at = C3480000 /* 00988 808FD8C8 44812000 */ mtc1 $at, $f4 ## $f4 = -200.00 /* 0098C 808FD8CC 8E030398 */ lw $v1, 0x0398($s0) ## 00000398 /* 00990 808FD8D0 24010096 */ addiu $at, $zero, 0x0096 ## $at = 00000096 /* 00994 808FD8D4 E60A03B4 */ swc1 $f10, 0x03B4($s0) ## 000003B4 -/* 00998 808FD8D8 14610008 */ bne $v1, $at, .L808FD8FC +/* 00998 808FD8D8 14610008 */ bne $v1, $at, .L808FD8FC /* 0099C 808FD8DC E60403B8 */ swc1 $f4, 0x03B8($s0) ## 000003B8 /* 009A0 808FD8E0 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 009A4 808FD8E4 240570D3 */ addiu $a1, $zero, 0x70D3 ## $a1 = 000070D3 /* 009A8 808FD8E8 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 009AC 808FD8EC 0C042DA0 */ jal func_8010B680 -/* 009B0 808FD8F0 AFA90088 */ sw $t1, 0x0088($sp) -/* 009B4 808FD8F4 8FA90088 */ lw $t1, 0x0088($sp) +/* 009AC 808FD8EC 0C042DA0 */ jal func_8010B680 +/* 009B0 808FD8F0 AFA90088 */ sw $t1, 0x0088($sp) +/* 009B4 808FD8F4 8FA90088 */ lw $t1, 0x0088($sp) /* 009B8 808FD8F8 8E030398 */ lw $v1, 0x0398($s0) ## 00000398 .L808FD8FC: -/* 009BC 808FD8FC 2C6100FB */ sltiu $at, $v1, 0x00FB -/* 009C0 808FD900 142007C3 */ bne $at, $zero, .L808FF810 +/* 009BC 808FD8FC 2C6100FB */ sltiu $at, $v1, 0x00FB +/* 009C0 808FD900 142007C3 */ bne $at, $zero, .L808FF810 /* 009C4 808FD904 262420D8 */ addiu $a0, $s1, 0x20D8 ## $a0 = 000020D8 -/* 009C8 808FD908 0C042F6F */ jal func_8010BDBC -/* 009CC 808FD90C AFA90088 */ sw $t1, 0x0088($sp) -/* 009D0 808FD910 144007BF */ bne $v0, $zero, .L808FF810 -/* 009D4 808FD914 8FA90088 */ lw $t1, 0x0088($sp) +/* 009C8 808FD908 0C042F6F */ jal func_8010BDBC +/* 009CC 808FD90C AFA90088 */ sw $t1, 0x0088($sp) +/* 009D0 808FD910 144007BF */ bne $v0, $zero, .L808FF810 +/* 009D4 808FD914 8FA90088 */ lw $t1, 0x0088($sp) /* 009D8 808FD918 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 /* 009DC 808FD91C 44803000 */ mtc1 $zero, $f6 ## $f6 = 0.00 /* 009E0 808FD920 44814000 */ mtc1 $at, $f8 ## $f8 = 1.00 @@ -217,88 +217,88 @@ glabel L808FD80C /* 009E8 808FD928 3C010001 */ lui $at, 0x0001 ## $at = 00010000 /* 009EC 808FD92C A60E039C */ sh $t6, 0x039C($s0) ## 0000039C /* 009F0 808FD930 AE000398 */ sw $zero, 0x0398($s0) ## 00000398 -/* 009F4 808FD934 00310821 */ addu $at, $at, $s1 +/* 009F4 808FD934 00310821 */ addu $at, $at, $s1 /* 009F8 808FD938 E6060410 */ swc1 $f6, 0x0410($s0) ## 00000410 /* 009FC 808FD93C E4280AFC */ swc1 $f8, 0x0AFC($at) ## 00010AFC glabel L808FD940 /* 00A00 808FD940 240F0004 */ addiu $t7, $zero, 0x0004 ## $t7 = 00000004 /* 00A04 808FD944 A20F0339 */ sb $t7, 0x0339($s0) ## 00000339 /* 00A08 808FD948 3C018091 */ lui $at, %hi(D_8090DB4C) ## $at = 80910000 -/* 00A0C 808FD94C C42ADB4C */ lwc1 $f10, %lo(D_8090DB4C)($at) +/* 00A0C 808FD94C C42ADB4C */ lwc1 $f10, %lo(D_8090DB4C)($at) /* 00A10 808FD950 3C018091 */ lui $at, %hi(D_8090DB50) ## $at = 80910000 /* 00A14 808FD954 3C188091 */ lui $t8, %hi(D_8090EB2C) ## $t8 = 80910000 /* 00A18 808FD958 E52A0024 */ swc1 $f10, 0x0024($t1) ## 00000024 -/* 00A1C 808FD95C C424DB50 */ lwc1 $f4, %lo(D_8090DB50)($at) +/* 00A1C 808FD95C C424DB50 */ lwc1 $f4, %lo(D_8090DB50)($at) /* 00A20 808FD960 3C01C326 */ lui $at, 0xC326 ## $at = C3260000 /* 00A24 808FD964 44813000 */ mtc1 $at, $f6 ## $f6 = -166.00 /* 00A28 808FD968 E5240028 */ swc1 $f4, 0x0028($t1) ## 00000028 /* 00A2C 808FD96C 3C018091 */ lui $at, %hi(D_8090DB54) ## $at = 80910000 /* 00A30 808FD970 E526002C */ swc1 $f6, 0x002C($t1) ## 0000002C -/* 00A34 808FD974 8F18EB2C */ lw $t8, %lo(D_8090EB2C)($t8) -/* 00A38 808FD978 C428DB54 */ lwc1 $f8, %lo(D_8090DB54)($at) +/* 00A34 808FD974 8F18EB2C */ lw $t8, %lo(D_8090EB2C)($t8) +/* 00A38 808FD978 C428DB54 */ lwc1 $f8, %lo(D_8090DB54)($at) /* 00A3C 808FD97C 3C018091 */ lui $at, %hi(D_8090DB58) ## $at = 80910000 /* 00A40 808FD980 3C198091 */ lui $t9, %hi(D_8090EB2C) ## $t9 = 80910000 /* 00A44 808FD984 E7080024 */ swc1 $f8, 0x0024($t8) ## 80910024 -/* 00A48 808FD988 8F39EB2C */ lw $t9, %lo(D_8090EB2C)($t9) -/* 00A4C 808FD98C C42ADB58 */ lwc1 $f10, %lo(D_8090DB58)($at) +/* 00A48 808FD988 8F39EB2C */ lw $t9, %lo(D_8090EB2C)($t9) +/* 00A4C 808FD98C C42ADB58 */ lwc1 $f10, %lo(D_8090DB58)($at) /* 00A50 808FD990 3C01C33A */ lui $at, 0xC33A ## $at = C33A0000 /* 00A54 808FD994 3C0B8091 */ lui $t3, %hi(D_8090EB2C) ## $t3 = 80910000 /* 00A58 808FD998 E72A0028 */ swc1 $f10, 0x0028($t9) ## 80910028 -/* 00A5C 808FD99C 8D6BEB2C */ lw $t3, %lo(D_8090EB2C)($t3) +/* 00A5C 808FD99C 8D6BEB2C */ lw $t3, %lo(D_8090EB2C)($t3) /* 00A60 808FD9A0 44812000 */ mtc1 $at, $f4 ## $f4 = -186.00 /* 00A64 808FD9A4 240CB000 */ addiu $t4, $zero, 0xB000 ## $t4 = FFFFB000 /* 00A68 808FD9A8 3C0E8091 */ lui $t6, %hi(D_8090EB2C) ## $t6 = 80910000 /* 00A6C 808FD9AC E564002C */ swc1 $f4, 0x002C($t3) ## 8091002C /* 00A70 808FD9B0 A52C00B6 */ sh $t4, 0x00B6($t1) ## 000000B6 -/* 00A74 808FD9B4 8DCEEB2C */ lw $t6, %lo(D_8090EB2C)($t6) +/* 00A74 808FD9B4 8DCEEB2C */ lw $t6, %lo(D_8090EB2C)($t6) /* 00A78 808FD9B8 240DB000 */ addiu $t5, $zero, 0xB000 ## $t5 = FFFFB000 /* 00A7C 808FD9BC 2401003C */ addiu $at, $zero, 0x003C ## $at = 0000003C /* 00A80 808FD9C0 A5CD00B6 */ sh $t5, 0x00B6($t6) ## 809100B6 /* 00A84 808FD9C4 8E030398 */ lw $v1, 0x0398($s0) ## 00000398 /* 00A88 808FD9C8 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 00A8C 808FD9CC 240570D4 */ addiu $a1, $zero, 0x70D4 ## $a1 = 000070D4 -/* 00A90 808FD9D0 14610005 */ bne $v1, $at, .L808FD9E8 +/* 00A90 808FD9D0 14610005 */ bne $v1, $at, .L808FD9E8 /* 00A94 808FD9D4 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 00A98 808FD9D8 0C042DA0 */ jal func_8010B680 -/* 00A9C 808FD9DC AFA90088 */ sw $t1, 0x0088($sp) -/* 00AA0 808FD9E0 8FA90088 */ lw $t1, 0x0088($sp) +/* 00A98 808FD9D8 0C042DA0 */ jal func_8010B680 +/* 00A9C 808FD9DC AFA90088 */ sw $t1, 0x0088($sp) +/* 00AA0 808FD9E0 8FA90088 */ lw $t1, 0x0088($sp) /* 00AA4 808FD9E4 8E030398 */ lw $v1, 0x0398($s0) ## 00000398 .L808FD9E8: /* 00AA8 808FD9E8 24010028 */ addiu $at, $zero, 0x0028 ## $at = 00000028 -/* 00AAC 808FD9EC 1461000B */ bne $v1, $at, .L808FDA1C +/* 00AAC 808FD9EC 1461000B */ bne $v1, $at, .L808FDA1C /* 00AB0 808FD9F0 240A0001 */ addiu $t2, $zero, 0x0001 ## $t2 = 00000001 /* 00AB4 808FD9F4 3C0F8091 */ lui $t7, %hi(D_8090EB2C) ## $t7 = 80910000 -/* 00AB8 808FD9F8 8DEFEB2C */ lw $t7, %lo(D_8090EB2C)($t7) +/* 00AB8 808FD9F8 8DEFEB2C */ lw $t7, %lo(D_8090EB2C)($t7) /* 00ABC 808FD9FC 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 00AC0 808FDA00 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 00AC4 808FDA04 A1EA03C8 */ sb $t2, 0x03C8($t7) ## 809103C8 -/* 00AC8 808FDA08 AFA90088 */ sw $t1, 0x0088($sp) -/* 00ACC 808FDA0C 0C00B7D5 */ jal func_8002DF54 +/* 00AC8 808FDA08 AFA90088 */ sw $t1, 0x0088($sp) +/* 00ACC 808FDA0C 0C00B7D5 */ jal func_8002DF54 /* 00AD0 808FDA10 2406004E */ addiu $a2, $zero, 0x004E ## $a2 = 0000004E -/* 00AD4 808FDA14 8FA90088 */ lw $t1, 0x0088($sp) +/* 00AD4 808FDA14 8FA90088 */ lw $t1, 0x0088($sp) /* 00AD8 808FDA18 8E030398 */ lw $v1, 0x0398($s0) ## 00000398 .L808FDA1C: /* 00ADC 808FDA1C 24010055 */ addiu $at, $zero, 0x0055 ## $at = 00000055 -/* 00AE0 808FDA20 1461000B */ bne $v1, $at, .L808FDA50 +/* 00AE0 808FDA20 1461000B */ bne $v1, $at, .L808FDA50 /* 00AE4 808FDA24 24180002 */ addiu $t8, $zero, 0x0002 ## $t8 = 00000002 /* 00AE8 808FDA28 3C198091 */ lui $t9, %hi(D_8090EB2C) ## $t9 = 80910000 -/* 00AEC 808FDA2C 8F39EB2C */ lw $t9, %lo(D_8090EB2C)($t9) +/* 00AEC 808FDA2C 8F39EB2C */ lw $t9, %lo(D_8090EB2C)($t9) /* 00AF0 808FDA30 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 00AF4 808FDA34 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 00AF8 808FDA38 A33803C8 */ sb $t8, 0x03C8($t9) ## 809103C8 -/* 00AFC 808FDA3C AFA90088 */ sw $t1, 0x0088($sp) -/* 00B00 808FDA40 0C00B7D5 */ jal func_8002DF54 +/* 00AFC 808FDA3C AFA90088 */ sw $t1, 0x0088($sp) +/* 00B00 808FDA40 0C00B7D5 */ jal func_8002DF54 /* 00B04 808FDA44 2406004F */ addiu $a2, $zero, 0x004F ## $a2 = 0000004F -/* 00B08 808FDA48 8FA90088 */ lw $t1, 0x0088($sp) +/* 00B08 808FDA48 8FA90088 */ lw $t1, 0x0088($sp) /* 00B0C 808FDA4C 8E030398 */ lw $v1, 0x0398($s0) ## 00000398 .L808FDA50: /* 00B10 808FDA50 3C014170 */ lui $at, 0x4170 ## $at = 41700000 /* 00B14 808FDA54 44817000 */ mtc1 $at, $f14 ## $f14 = 15.00 /* 00B18 808FDA58 3C018091 */ lui $at, %hi(D_8090DB5C) ## $at = 80910000 -/* 00B1C 808FDA5C C426DB5C */ lwc1 $f6, %lo(D_8090DB5C)($at) +/* 00B1C 808FDA5C C426DB5C */ lwc1 $f6, %lo(D_8090DB5C)($at) /* 00B20 808FDA60 3C018091 */ lui $at, %hi(D_8090DB60) ## $at = 80910000 /* 00B24 808FDA64 E60603A4 */ swc1 $f6, 0x03A4($s0) ## 000003A4 -/* 00B28 808FDA68 C428DB60 */ lwc1 $f8, %lo(D_8090DB60)($at) +/* 00B28 808FDA68 C428DB60 */ lwc1 $f8, %lo(D_8090DB60)($at) /* 00B2C 808FDA6C 3C01C335 */ lui $at, 0xC335 ## $at = C3350000 /* 00B30 808FDA70 44815000 */ mtc1 $at, $f10 ## $f10 = -181.00 /* 00B34 808FDA74 E60803A8 */ swc1 $f8, 0x03A8($s0) ## 000003A8 @@ -306,41 +306,41 @@ glabel L808FD940 /* 00B3C 808FDA7C E60A03AC */ swc1 $f10, 0x03AC($s0) ## 000003AC /* 00B40 808FDA80 C5240024 */ lwc1 $f4, 0x0024($t1) ## 00000024 /* 00B44 808FDA84 44815000 */ mtc1 $at, $f10 ## $f10 = 5.00 -/* 00B48 808FDA88 2C610069 */ sltiu $at, $v1, 0x0069 +/* 00B48 808FDA88 2C610069 */ sltiu $at, $v1, 0x0069 /* 00B4C 808FDA8C E60403B0 */ swc1 $f4, 0x03B0($s0) ## 000003B0 /* 00B50 808FDA90 C526002C */ lwc1 $f6, 0x002C($t1) ## 0000002C -/* 00B54 808FDA94 460E3201 */ sub.s $f8, $f6, $f14 -/* 00B58 808FDA98 460A4100 */ add.s $f4, $f8, $f10 -/* 00B5C 808FDA9C 1420001C */ bne $at, $zero, .L808FDB10 +/* 00B54 808FDA94 460E3201 */ sub.s $f8, $f6, $f14 +/* 00B58 808FDA98 460A4100 */ add.s $f4, $f8, $f10 +/* 00B5C 808FDA9C 1420001C */ bne $at, $zero, .L808FDB10 /* 00B60 808FDAA0 E60403B8 */ swc1 $f4, 0x03B8($s0) ## 000003B8 /* 00B64 808FDAA4 3C01423C */ lui $at, 0x423C ## $at = 423C0000 /* 00B68 808FDAA8 44814000 */ mtc1 $at, $f8 ## $f8 = 47.00 /* 00B6C 808FDAAC C5260028 */ lwc1 $f6, 0x0028($t1) ## 00000028 /* 00B70 808FDAB0 3C0140E0 */ lui $at, 0x40E0 ## $at = 40E00000 /* 00B74 808FDAB4 44812000 */ mtc1 $at, $f4 ## $f4 = 7.00 -/* 00B78 808FDAB8 46083280 */ add.s $f10, $f6, $f8 +/* 00B78 808FDAB8 46083280 */ add.s $f10, $f6, $f8 /* 00B7C 808FDABC 3C063DCC */ lui $a2, 0x3DCC ## $a2 = 3DCC0000 /* 00B80 808FDAC0 8E070410 */ lw $a3, 0x0410($s0) ## 00000410 /* 00B84 808FDAC4 260B0410 */ addiu $t3, $s0, 0x0410 ## $t3 = 00000410 -/* 00B88 808FDAC8 46045180 */ add.s $f6, $f10, $f4 -/* 00B8C 808FDACC AFAB0054 */ sw $t3, 0x0054($sp) +/* 00B88 808FDAC8 46045180 */ add.s $f6, $f10, $f4 +/* 00B8C 808FDACC AFAB0054 */ sw $t3, 0x0054($sp) /* 00B90 808FDAD0 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3DCCCCCD /* 00B94 808FDAD4 260403B4 */ addiu $a0, $s0, 0x03B4 ## $a0 = 000003B4 -/* 00B98 808FDAD8 460E3200 */ add.s $f8, $f6, $f14 -/* 00B9C 808FDADC 44054000 */ mfc1 $a1, $f8 +/* 00B98 808FDAD8 460E3200 */ add.s $f8, $f6, $f14 +/* 00B9C 808FDADC 44054000 */ mfc1 $a1, $f8 /* 00BA0 808FDAE0 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 00BA4 808FDAE4 00000000 */ nop /* 00BA8 808FDAE8 3C014000 */ lui $at, 0x4000 ## $at = 40000000 /* 00BAC 808FDAEC 44810000 */ mtc1 $at, $f0 ## $f0 = 2.00 /* 00BB0 808FDAF0 3C073DCC */ lui $a3, 0x3DCC ## $a3 = 3DCC0000 /* 00BB4 808FDAF4 34E7CCCD */ ori $a3, $a3, 0xCCCD ## $a3 = 3DCCCCCD -/* 00BB8 808FDAF8 44050000 */ mfc1 $a1, $f0 -/* 00BBC 808FDAFC 8FA40054 */ lw $a0, 0x0054($sp) +/* 00BB8 808FDAF8 44050000 */ mfc1 $a1, $f0 +/* 00BBC 808FDAFC 8FA40054 */ lw $a0, 0x0054($sp) /* 00BC0 808FDB00 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 00BC4 808FDB04 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 00BC8 808FDB08 1000000A */ beq $zero, $zero, .L808FDB34 +/* 00BC8 808FDB08 1000000A */ beq $zero, $zero, .L808FDB34 /* 00BCC 808FDB0C 8E0C0398 */ lw $t4, 0x0398($s0) ## 00000398 .L808FDB10: /* 00BD0 808FDB10 3C01423C */ lui $at, 0x423C ## $at = 423C0000 @@ -348,22 +348,22 @@ glabel L808FD940 /* 00BD8 808FDB18 C52A0028 */ lwc1 $f10, 0x0028($t1) ## 00000028 /* 00BDC 808FDB1C 3C0140E0 */ lui $at, 0x40E0 ## $at = 40E00000 /* 00BE0 808FDB20 44814000 */ mtc1 $at, $f8 ## $f8 = 7.00 -/* 00BE4 808FDB24 46045180 */ add.s $f6, $f10, $f4 -/* 00BE8 808FDB28 46083280 */ add.s $f10, $f6, $f8 +/* 00BE4 808FDB24 46045180 */ add.s $f6, $f10, $f4 +/* 00BE8 808FDB28 46083280 */ add.s $f10, $f6, $f8 /* 00BEC 808FDB2C E60A03B4 */ swc1 $f10, 0x03B4($s0) ## 000003B4 /* 00BF0 808FDB30 8E0C0398 */ lw $t4, 0x0398($s0) ## 00000398 .L808FDB34: -/* 00BF4 808FDB34 2D8100AB */ sltiu $at, $t4, 0x00AB -/* 00BF8 808FDB38 54200736 */ bnel $at, $zero, .L808FF814 +/* 00BF4 808FDB34 2D8100AB */ sltiu $at, $t4, 0x00AB +/* 00BF8 808FDB38 54200736 */ bnel $at, $zero, .L808FF814 /* 00BFC 808FDB3C 3C014080 */ lui $at, 0x4080 ## $at = 40800000 -/* 00C00 808FDB40 0C042F6F */ jal func_8010BDBC +/* 00C00 808FDB40 0C042F6F */ jal func_8010BDBC /* 00C04 808FDB44 262420D8 */ addiu $a0, $s1, 0x20D8 ## $a0 = 000020D8 -/* 00C08 808FDB48 14400731 */ bne $v0, $zero, .L808FF810 +/* 00C08 808FDB48 14400731 */ bne $v0, $zero, .L808FF810 /* 00C0C 808FDB4C 240D0003 */ addiu $t5, $zero, 0x0003 ## $t5 = 00000003 /* 00C10 808FDB50 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 /* 00C14 808FDB54 A60D039C */ sh $t5, 0x039C($s0) ## 0000039C /* 00C18 808FDB58 AE000398 */ sw $zero, 0x0398($s0) ## 00000398 -/* 00C1C 808FDB5C 1000072C */ beq $zero, $zero, .L808FF810 +/* 00C1C 808FDB5C 1000072C */ beq $zero, $zero, .L808FF810 /* 00C20 808FDB60 E6040410 */ swc1 $f4, 0x0410($s0) ## 00000410 glabel L808FDB64 /* 00C24 808FDB64 3C014000 */ lui $at, 0x4000 ## $at = 40000000 @@ -373,87 +373,87 @@ glabel L808FDB64 /* 00C34 808FDB74 C5260028 */ lwc1 $f6, 0x0028($t1) ## 00000028 /* 00C38 808FDB78 3C0140E0 */ lui $at, 0x40E0 ## $at = 40E00000 /* 00C3C 808FDB7C 44812000 */ mtc1 $at, $f4 ## $f4 = 7.00 -/* 00C40 808FDB80 46083280 */ add.s $f10, $f6, $f8 +/* 00C40 808FDB80 46083280 */ add.s $f10, $f6, $f8 /* 00C44 808FDB84 3C063DCC */ lui $a2, 0x3DCC ## $a2 = 3DCC0000 -/* 00C48 808FDB88 44070000 */ mfc1 $a3, $f0 +/* 00C48 808FDB88 44070000 */ mfc1 $a3, $f0 /* 00C4C 808FDB8C 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3DCCCCCD -/* 00C50 808FDB90 46045180 */ add.s $f6, $f10, $f4 +/* 00C50 808FDB90 46045180 */ add.s $f6, $f10, $f4 /* 00C54 808FDB94 260403B4 */ addiu $a0, $s0, 0x03B4 ## $a0 = 000003B4 -/* 00C58 808FDB98 44053000 */ mfc1 $a1, $f6 +/* 00C58 808FDB98 44053000 */ mfc1 $a1, $f6 /* 00C5C 808FDB9C 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 00C60 808FDBA0 00000000 */ nop /* 00C64 808FDBA4 8E030398 */ lw $v1, 0x0398($s0) ## 00000398 /* 00C68 808FDBA8 240E0004 */ addiu $t6, $zero, 0x0004 ## $t6 = 00000004 /* 00C6C 808FDBAC 2401000A */ addiu $at, $zero, 0x000A ## $at = 0000000A -/* 00C70 808FDBB0 14610009 */ bne $v1, $at, .L808FDBD8 +/* 00C70 808FDBB0 14610009 */ bne $v1, $at, .L808FDBD8 /* 00C74 808FDBB4 A20E0339 */ sb $t6, 0x0339($s0) ## 00000339 /* 00C78 808FDBB8 3C048090 */ lui $a0, %hi(D_80906D6C) ## $a0 = 80900000 /* 00C7C 808FDBBC 24846D6C */ addiu $a0, $a0, %lo(D_80906D6C) ## $a0 = 80906D6C -/* 00C80 808FDBC0 0C01E245 */ jal func_80078914 +/* 00C80 808FDBC0 0C01E245 */ jal func_80078914 /* 00C84 808FDBC4 2405281D */ addiu $a1, $zero, 0x281D ## $a1 = 0000281D /* 00C88 808FDBC8 3C041000 */ lui $a0, 0x1000 ## $a0 = 10000000 /* 00C8C 808FDBCC 0C03E803 */ jal Audio_SetBGM - + /* 00C90 808FDBD0 348400FF */ ori $a0, $a0, 0x00FF ## $a0 = 100000FF /* 00C94 808FDBD4 8E030398 */ lw $v1, 0x0398($s0) ## 00000398 .L808FDBD8: /* 00C98 808FDBD8 24010014 */ addiu $at, $zero, 0x0014 ## $at = 00000014 -/* 00C9C 808FDBDC 14610009 */ bne $v1, $at, .L808FDC04 +/* 00C9C 808FDBDC 14610009 */ bne $v1, $at, .L808FDC04 /* 00CA0 808FDBE0 240F0003 */ addiu $t7, $zero, 0x0003 ## $t7 = 00000003 /* 00CA4 808FDBE4 3C188091 */ lui $t8, %hi(D_8090EB2C) ## $t8 = 80910000 -/* 00CA8 808FDBE8 8F18EB2C */ lw $t8, %lo(D_8090EB2C)($t8) +/* 00CA8 808FDBE8 8F18EB2C */ lw $t8, %lo(D_8090EB2C)($t8) /* 00CAC 808FDBEC 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 00CB0 808FDBF0 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 00CB4 808FDBF4 24060050 */ addiu $a2, $zero, 0x0050 ## $a2 = 00000050 -/* 00CB8 808FDBF8 0C00B7D5 */ jal func_8002DF54 +/* 00CB8 808FDBF8 0C00B7D5 */ jal func_8002DF54 /* 00CBC 808FDBFC A30F03C8 */ sb $t7, 0x03C8($t8) ## 809103C8 /* 00CC0 808FDC00 8E030398 */ lw $v1, 0x0398($s0) ## 00000398 .L808FDC04: /* 00CC4 808FDC04 24010037 */ addiu $at, $zero, 0x0037 ## $at = 00000037 -/* 00CC8 808FDC08 14610701 */ bne $v1, $at, .L808FF810 +/* 00CC8 808FDC08 14610701 */ bne $v1, $at, .L808FF810 /* 00CCC 808FDC0C 24190004 */ addiu $t9, $zero, 0x0004 ## $t9 = 00000004 /* 00CD0 808FDC10 44804000 */ mtc1 $zero, $f8 ## $f8 = 0.00 /* 00CD4 808FDC14 A619039C */ sh $t9, 0x039C($s0) ## 0000039C /* 00CD8 808FDC18 AE000398 */ sw $zero, 0x0398($s0) ## 00000398 /* 00CDC 808FDC1C 3C0C8091 */ lui $t4, %hi(D_8090EB2C) ## $t4 = 80910000 /* 00CE0 808FDC20 E6080410 */ swc1 $f8, 0x0410($s0) ## 00000410 -/* 00CE4 808FDC24 8D8CEB2C */ lw $t4, %lo(D_8090EB2C)($t4) +/* 00CE4 808FDC24 8D8CEB2C */ lw $t4, %lo(D_8090EB2C)($t4) /* 00CE8 808FDC28 240B0004 */ addiu $t3, $zero, 0x0004 ## $t3 = 00000004 /* 00CEC 808FDC2C 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 00CF0 808FDC30 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 00CF4 808FDC34 24060050 */ addiu $a2, $zero, 0x0050 ## $a2 = 00000050 -/* 00CF8 808FDC38 0C00B7D5 */ jal func_8002DF54 +/* 00CF8 808FDC38 0C00B7D5 */ jal func_8002DF54 /* 00CFC 808FDC3C A18B03C8 */ sb $t3, 0x03C8($t4) ## 809103C8 -/* 00D00 808FDC40 100006F4 */ beq $zero, $zero, .L808FF814 +/* 00D00 808FDC40 100006F4 */ beq $zero, $zero, .L808FF814 /* 00D04 808FDC44 3C014080 */ lui $at, 0x4080 ## $at = 40800000 glabel L808FDC48 /* 00D08 808FDC48 240D0004 */ addiu $t5, $zero, 0x0004 ## $t5 = 00000004 /* 00D0C 808FDC4C A20D0339 */ sb $t5, 0x0339($s0) ## 00000339 /* 00D10 808FDC50 3C018091 */ lui $at, %hi(D_8090DB64) ## $at = 80910000 -/* 00D14 808FDC54 C424DB64 */ lwc1 $f4, %lo(D_8090DB64)($at) +/* 00D14 808FDC54 C424DB64 */ lwc1 $f4, %lo(D_8090DB64)($at) /* 00D18 808FDC58 C60A0410 */ lwc1 $f10, 0x0410($s0) ## 00000410 /* 00D1C 808FDC5C 260403A4 */ addiu $a0, $s0, 0x03A4 ## $a0 = 000003A4 /* 00D20 808FDC60 3C063DCC */ lui $a2, 0x3DCC ## $a2 = 3DCC0000 -/* 00D24 808FDC64 46045182 */ mul.s $f6, $f10, $f4 +/* 00D24 808FDC64 46045182 */ mul.s $f6, $f10, $f4 /* 00D28 808FDC68 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3DCCCCCD -/* 00D2C 808FDC6C AFA4004C */ sw $a0, 0x004C($sp) +/* 00D2C 808FDC6C AFA4004C */ sw $a0, 0x004C($sp) /* 00D30 808FDC70 3C05C3B4 */ lui $a1, 0xC3B4 ## $a1 = C3B40000 -/* 00D34 808FDC74 44073000 */ mfc1 $a3, $f6 +/* 00D34 808FDC74 44073000 */ mfc1 $a3, $f6 /* 00D38 808FDC78 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 00D3C 808FDC7C 00000000 */ nop /* 00D40 808FDC80 3C01432A */ lui $at, 0x432A ## $at = 432A0000 /* 00D44 808FDC84 44815000 */ mtc1 $at, $f10 ## $f10 = 170.00 /* 00D48 808FDC88 C6080410 */ lwc1 $f8, 0x0410($s0) ## 00000410 /* 00D4C 808FDC8C 3C063DCC */ lui $a2, 0x3DCC ## $a2 = 3DCC0000 /* 00D50 808FDC90 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3DCCCCCD -/* 00D54 808FDC94 460A4102 */ mul.s $f4, $f8, $f10 +/* 00D54 808FDC94 460A4102 */ mul.s $f4, $f8, $f10 /* 00D58 808FDC98 260403AC */ addiu $a0, $s0, 0x03AC ## $a0 = 000003AC /* 00D5C 808FDC9C 3C05C1A0 */ lui $a1, 0xC1A0 ## $a1 = C1A00000 -/* 00D60 808FDCA0 44072000 */ mfc1 $a3, $f4 +/* 00D60 808FDCA0 44072000 */ mfc1 $a3, $f4 /* 00D64 808FDCA4 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 00D68 808FDCA8 00000000 */ nop /* 00D6C 808FDCAC 3C053D23 */ lui $a1, 0x3D23 ## $a1 = 3D230000 /* 00D70 808FDCB0 3C073A03 */ lui $a3, 0x3A03 ## $a3 = 3A030000 @@ -461,16 +461,16 @@ glabel L808FDC48 /* 00D78 808FDCB8 34A5D70A */ ori $a1, $a1, 0xD70A ## $a1 = 3D23D70A /* 00D7C 808FDCBC 26040410 */ addiu $a0, $s0, 0x0410 ## $a0 = 00000410 /* 00D80 808FDCC0 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 00D84 808FDCC4 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 00D88 808FDCC8 8E0E0398 */ lw $t6, 0x0398($s0) ## 00000398 /* 00D8C 808FDCCC 24010064 */ addiu $at, $zero, 0x0064 ## $at = 00000064 /* 00D90 808FDCD0 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 00D94 808FDCD4 55C106CF */ bnel $t6, $at, .L808FF814 +/* 00D94 808FDCD4 55C106CF */ bnel $t6, $at, .L808FF814 /* 00D98 808FDCD8 3C014080 */ lui $at, 0x4080 ## $at = 40800000 -/* 00D9C 808FDCDC 0C030129 */ jal func_800C04A4 +/* 00D9C 808FDCDC 0C030129 */ jal func_800C04A4 /* 00DA0 808FDCE0 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 00DA4 808FDCE4 8FAF004C */ lw $t7, 0x004C($sp) +/* 00DA4 808FDCE4 8FAF004C */ lw $t7, 0x004C($sp) /* 00DA8 808FDCE8 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 00DAC 808FDCEC 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 /* 00DB0 808FDCF0 8DF90000 */ lw $t9, 0x0000($t7) ## 00000000 @@ -479,7 +479,7 @@ glabel L808FDC48 /* 00DBC 808FDCFC AC580060 */ sw $t8, 0x0060($v0) ## 00000060 /* 00DC0 808FDD00 8DF90008 */ lw $t9, 0x0008($t7) ## 00000008 /* 00DC4 808FDD04 AC590064 */ sw $t9, 0x0064($v0) ## 00000064 -/* 00DC8 808FDD08 8FAB004C */ lw $t3, 0x004C($sp) +/* 00DC8 808FDD08 8FAB004C */ lw $t3, 0x004C($sp) /* 00DCC 808FDD0C 8D6D0000 */ lw $t5, 0x0000($t3) ## 00000000 /* 00DD0 808FDD10 AC4D0074 */ sw $t5, 0x0074($v0) ## 00000074 /* 00DD4 808FDD14 8D6C0004 */ lw $t4, 0x0004($t3) ## 00000004 @@ -492,19 +492,19 @@ glabel L808FDC48 /* 00DF0 808FDD30 AC4E0054 */ sw $t6, 0x0054($v0) ## 00000054 /* 00DF4 808FDD34 8E0F03B8 */ lw $t7, 0x03B8($s0) ## 000003B8 /* 00DF8 808FDD38 AC4F0058 */ sw $t7, 0x0058($v0) ## 00000058 -/* 00DFC 808FDD3C 0C03022B */ jal func_800C08AC +/* 00DFC 808FDD3C 0C03022B */ jal func_800C08AC /* 00E00 808FDD40 8605039E */ lh $a1, 0x039E($s0) ## 0000039E /* 00E04 808FDD44 A600039E */ sh $zero, 0x039E($s0) ## 0000039E /* 00E08 808FDD48 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 00E0C 808FDD4C 0C01914D */ jal func_80064534 +/* 00E0C 808FDD4C 0C01914D */ jal func_80064534 /* 00E10 808FDD50 26251D64 */ addiu $a1, $s1, 0x1D64 ## $a1 = 00001D64 /* 00E14 808FDD54 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 00E18 808FDD58 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 00E1C 808FDD5C 0C00B7D5 */ jal func_8002DF54 +/* 00E1C 808FDD5C 0C00B7D5 */ jal func_8002DF54 /* 00E20 808FDD60 24060007 */ addiu $a2, $zero, 0x0007 ## $a2 = 00000007 /* 00E24 808FDD64 24180005 */ addiu $t8, $zero, 0x0005 ## $t8 = 00000005 /* 00E28 808FDD68 A618039C */ sh $t8, 0x039C($s0) ## 0000039C -/* 00E2C 808FDD6C 100006A8 */ beq $zero, $zero, .L808FF810 +/* 00E2C 808FDD6C 100006A8 */ beq $zero, $zero, .L808FF810 /* 00E30 808FDD70 AE000398 */ sw $zero, 0x0398($s0) ## 00000398 glabel L808FDD74 /* 00E34 808FDD74 3C0143FA */ lui $at, 0x43FA ## $at = 43FA0000 @@ -512,30 +512,30 @@ glabel L808FDD74 /* 00E3C 808FDD7C C6060090 */ lwc1 $f6, 0x0090($s0) ## 00000090 /* 00E40 808FDD80 24190004 */ addiu $t9, $zero, 0x0004 ## $t9 = 00000004 /* 00E44 808FDD84 A2190339 */ sb $t9, 0x0339($s0) ## 00000339 -/* 00E48 808FDD88 4608303C */ c.lt.s $f6, $f8 +/* 00E48 808FDD88 4608303C */ c.lt.s $f6, $f8 /* 00E4C 808FDD8C 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 00E50 808FDD90 450206A0 */ bc1fl .L808FF814 +/* 00E50 808FDD90 450206A0 */ bc1fl .L808FF814 /* 00E54 808FDD94 3C014080 */ lui $at, 0x4080 ## $at = 40800000 -/* 00E58 808FDD98 0C041B33 */ jal func_80106CCC -/* 00E5C 808FDD9C AFA90088 */ sw $t1, 0x0088($sp) +/* 00E58 808FDD98 0C041B33 */ jal func_80106CCC +/* 00E5C 808FDD9C AFA90088 */ sw $t1, 0x0088($sp) /* 00E60 808FDDA0 240B000A */ addiu $t3, $zero, 0x000A ## $t3 = 0000000A /* 00E64 808FDDA4 A60B039C */ sh $t3, 0x039C($s0) ## 0000039C /* 00E68 808FDDA8 AE000398 */ sw $zero, 0x0398($s0) ## 00000398 /* 00E6C 808FDDAC 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 00E70 808FDDB0 0C019148 */ jal func_80064520 +/* 00E70 808FDDB0 0C019148 */ jal func_80064520 /* 00E74 808FDDB4 26251D64 */ addiu $a1, $s1, 0x1D64 ## $a1 = 00001D64 -/* 00E78 808FDDB8 0C03008C */ jal func_800C0230 +/* 00E78 808FDDB8 0C03008C */ jal func_800C0230 /* 00E7C 808FDDBC 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 00E80 808FDDC0 A602039E */ sh $v0, 0x039E($s0) ## 0000039E /* 00E84 808FDDC4 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 00E88 808FDDC8 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 00E8C 808FDDCC 0C0300C5 */ jal func_800C0314 +/* 00E8C 808FDDCC 0C0300C5 */ jal func_800C0314 /* 00E90 808FDDD0 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 /* 00E94 808FDDD4 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 00E98 808FDDD8 8605039E */ lh $a1, 0x039E($s0) ## 0000039E -/* 00E9C 808FDDDC 0C0300C5 */ jal func_800C0314 +/* 00E9C 808FDDDC 0C0300C5 */ jal func_800C0314 /* 00EA0 808FDDE0 24060007 */ addiu $a2, $zero, 0x0007 ## $a2 = 00000007 -/* 00EA4 808FDDE4 8FA90088 */ lw $t1, 0x0088($sp) +/* 00EA4 808FDDE4 8FA90088 */ lw $t1, 0x0088($sp) glabel L808FDDE8 /* 00EA8 808FDDE8 3C014120 */ lui $at, 0x4120 ## $at = 41200000 /* 00EAC 808FDDEC 44817000 */ mtc1 $at, $f14 ## $f14 = 10.00 @@ -544,7 +544,7 @@ glabel L808FDDE8 /* 00EB8 808FDDF8 3C018091 */ lui $at, %hi(D_8090DB68) ## $at = 80910000 /* 00EBC 808FDDFC 3C028091 */ lui $v0, %hi(D_8090EB2C) ## $v0 = 80910000 /* 00EC0 808FDE00 E52A0024 */ swc1 $f10, 0x0024($t1) ## 00000024 -/* 00EC4 808FDE04 C424DB68 */ lwc1 $f4, %lo(D_8090DB68)($at) +/* 00EC4 808FDE04 C424DB68 */ lwc1 $f4, %lo(D_8090DB68)($at) /* 00EC8 808FDE08 3C01C326 */ lui $at, 0xC326 ## $at = C3260000 /* 00ECC 808FDE0C 44813000 */ mtc1 $at, $f6 ## $f6 = -166.00 /* 00ED0 808FDE10 2442EB2C */ addiu $v0, $v0, %lo(D_8090EB2C) ## $v0 = 8090EB2C @@ -557,7 +557,7 @@ glabel L808FDDE8 /* 00EEC 808FDE2C 240FC000 */ addiu $t7, $zero, 0xC000 ## $t7 = FFFFC000 /* 00EF0 808FDE30 E5880024 */ swc1 $f8, 0x0024($t4) ## 00000024 /* 00EF4 808FDE34 8C4D0000 */ lw $t5, 0x0000($v0) ## 8090EB2C -/* 00EF8 808FDE38 C42ADB6C */ lwc1 $f10, %lo(D_8090DB6C)($at) +/* 00EF8 808FDE38 C42ADB6C */ lwc1 $f10, %lo(D_8090DB6C)($at) /* 00EFC 808FDE3C 3C01C33A */ lui $at, 0xC33A ## $at = C33A0000 /* 00F00 808FDE40 44812000 */ mtc1 $at, $f4 ## $f4 = -186.00 /* 00F04 808FDE44 E5AA0028 */ swc1 $f10, 0x0028($t5) ## 00000028 @@ -579,113 +579,113 @@ glabel L808FDDE8 /* 00F44 808FDE84 C5240024 */ lwc1 $f4, 0x0024($t1) ## 00000024 /* 00F48 808FDE88 3C014348 */ lui $at, 0x4348 ## $at = 43480000 /* 00F4C 808FDE8C 44815000 */ mtc1 $at, $f10 ## $f10 = 200.00 -/* 00F50 808FDE90 460E2180 */ add.s $f6, $f4, $f14 +/* 00F50 808FDE90 460E2180 */ add.s $f6, $f4, $f14 /* 00F54 808FDE94 3C014320 */ lui $at, 0x4320 ## $at = 43200000 /* 00F58 808FDE98 8E0B0398 */ lw $t3, 0x0398($s0) ## 00000398 /* 00F5C 808FDE9C 240D0004 */ addiu $t5, $zero, 0x0004 ## $t5 = 00000004 /* 00F60 808FDEA0 E60603B0 */ swc1 $f6, 0x03B0($s0) ## 000003B0 /* 00F64 808FDEA4 C5280028 */ lwc1 $f8, 0x0028($t1) ## 00000028 /* 00F68 808FDEA8 44813000 */ mtc1 $at, $f6 ## $f6 = 160.00 -/* 00F6C 808FDEAC 2D610014 */ sltiu $at, $t3, 0x0014 -/* 00F70 808FDEB0 460A4100 */ add.s $f4, $f8, $f10 -/* 00F74 808FDEB4 46062201 */ sub.s $f8, $f4, $f6 +/* 00F6C 808FDEAC 2D610014 */ sltiu $at, $t3, 0x0014 +/* 00F70 808FDEB0 460A4100 */ add.s $f4, $f8, $f10 +/* 00F74 808FDEB4 46062201 */ sub.s $f8, $f4, $f6 /* 00F78 808FDEB8 E60803B4 */ swc1 $f8, 0x03B4($s0) ## 000003B4 /* 00F7C 808FDEBC C52A002C */ lwc1 $f10, 0x002C($t1) ## 0000002C -/* 00F80 808FDEC0 14200019 */ bne $at, $zero, .L808FDF28 +/* 00F80 808FDEC0 14200019 */ bne $at, $zero, .L808FDF28 /* 00F84 808FDEC4 E60A03B8 */ swc1 $f10, 0x03B8($s0) ## 000003B8 -/* 00F88 808FDEC8 0C01E221 */ jal func_80078884 +/* 00F88 808FDEC8 0C01E221 */ jal func_80078884 /* 00F8C 808FDECC 2404301C */ addiu $a0, $zero, 0x301C ## $a0 = 0000301C /* 00F90 808FDED0 3C014120 */ lui $at, 0x4120 ## $at = 41200000 /* 00F94 808FDED4 44817000 */ mtc1 $at, $f14 ## $f14 = 10.00 /* 00F98 808FDED8 26040324 */ addiu $a0, $s0, 0x0324 ## $a0 = 00000324 /* 00F9C 808FDEDC 3C05437F */ lui $a1, 0x437F ## $a1 = 437F0000 -/* 00FA0 808FDEE0 44077000 */ mfc1 $a3, $f14 +/* 00FA0 808FDEE0 44077000 */ mfc1 $a3, $f14 /* 00FA4 808FDEE4 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 00FA8 808FDEE8 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 00FAC 808FDEEC 8E030398 */ lw $v1, 0x0398($s0) ## 00000398 /* 00FB0 808FDEF0 240C0005 */ addiu $t4, $zero, 0x0005 ## $t4 = 00000005 /* 00FB4 808FDEF4 24010014 */ addiu $at, $zero, 0x0014 ## $at = 00000014 -/* 00FB8 808FDEF8 14610008 */ bne $v1, $at, .L808FDF1C +/* 00FB8 808FDEF8 14610008 */ bne $v1, $at, .L808FDF1C /* 00FBC 808FDEFC A20C0339 */ sb $t4, 0x0339($s0) ## 00000339 /* 00FC0 808FDF00 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 /* 00FC4 808FDF04 44803000 */ mtc1 $zero, $f6 ## $f6 = 0.00 /* 00FC8 808FDF08 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 00FCC 808FDF0C 00310821 */ addu $at, $at, $s1 +/* 00FCC 808FDF0C 00310821 */ addu $at, $at, $s1 /* 00FD0 808FDF10 E604033C */ swc1 $f4, 0x033C($s0) ## 0000033C /* 00FD4 808FDF14 E4260AFC */ swc1 $f6, 0x0AFC($at) ## 00010AFC /* 00FD8 808FDF18 8E030398 */ lw $v1, 0x0398($s0) ## 00000398 .L808FDF1C: /* 00FDC 808FDF1C 3C028091 */ lui $v0, %hi(D_8090EB2C) ## $v0 = 80910000 -/* 00FE0 808FDF20 10000003 */ beq $zero, $zero, .L808FDF30 +/* 00FE0 808FDF20 10000003 */ beq $zero, $zero, .L808FDF30 /* 00FE4 808FDF24 2442EB2C */ addiu $v0, $v0, %lo(D_8090EB2C) ## $v0 = 8090EB2C .L808FDF28: /* 00FE8 808FDF28 A20D0339 */ sb $t5, 0x0339($s0) ## 00000339 /* 00FEC 808FDF2C 8E030398 */ lw $v1, 0x0398($s0) ## 00000398 .L808FDF30: /* 00FF0 808FDF30 2401001E */ addiu $at, $zero, 0x001E ## $at = 0000001E -/* 00FF4 808FDF34 14610008 */ bne $v1, $at, .L808FDF58 +/* 00FF4 808FDF34 14610008 */ bne $v1, $at, .L808FDF58 /* 00FF8 808FDF38 240E0005 */ addiu $t6, $zero, 0x0005 ## $t6 = 00000005 /* 00FFC 808FDF3C 8C4F0000 */ lw $t7, 0x0000($v0) ## 8090EB2C /* 01000 808FDF40 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 01004 808FDF44 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 01008 808FDF48 24060051 */ addiu $a2, $zero, 0x0051 ## $a2 = 00000051 -/* 0100C 808FDF4C 0C00B7D5 */ jal func_8002DF54 +/* 0100C 808FDF4C 0C00B7D5 */ jal func_8002DF54 /* 01010 808FDF50 A1EE03C8 */ sb $t6, 0x03C8($t7) ## 000003C8 /* 01014 808FDF54 8E030398 */ lw $v1, 0x0398($s0) ## 00000398 .L808FDF58: /* 01018 808FDF58 24010032 */ addiu $at, $zero, 0x0032 ## $at = 00000032 -/* 0101C 808FDF5C 1461062C */ bne $v1, $at, .L808FF810 +/* 0101C 808FDF5C 1461062C */ bne $v1, $at, .L808FF810 /* 01020 808FDF60 2418000B */ addiu $t8, $zero, 0x000B ## $t8 = 0000000B /* 01024 808FDF64 AE000398 */ sw $zero, 0x0398($s0) ## 00000398 -/* 01028 808FDF68 10000629 */ beq $zero, $zero, .L808FF810 +/* 01028 808FDF68 10000629 */ beq $zero, $zero, .L808FF810 /* 0102C 808FDF6C A618039C */ sh $t8, 0x039C($s0) ## 0000039C glabel L808FDF70 /* 01030 808FDF70 24190005 */ addiu $t9, $zero, 0x0005 ## $t9 = 00000005 /* 01034 808FDF74 A2190339 */ sb $t9, 0x0339($s0) ## 00000339 -/* 01038 808FDF78 AFA90088 */ sw $t1, 0x0088($sp) -/* 0103C 808FDF7C 0C01E221 */ jal func_80078884 +/* 01038 808FDF78 AFA90088 */ sw $t1, 0x0088($sp) +/* 0103C 808FDF7C 0C01E221 */ jal func_80078884 /* 01040 808FDF80 2404301C */ addiu $a0, $zero, 0x301C ## $a0 = 0000301C /* 01044 808FDF84 3C014000 */ lui $at, 0x4000 ## $at = 40000000 /* 01048 808FDF88 44810000 */ mtc1 $at, $f0 ## $f0 = 2.00 /* 0104C 808FDF8C 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 /* 01050 808FDF90 44811000 */ mtc1 $at, $f2 ## $f2 = 20.00 /* 01054 808FDF94 3C0143F5 */ lui $at, 0x43F5 ## $at = 43F50000 -/* 01058 808FDF98 8FA90088 */ lw $t1, 0x0088($sp) +/* 01058 808FDF98 8FA90088 */ lw $t1, 0x0088($sp) /* 0105C 808FDF9C 44814000 */ mtc1 $at, $f8 ## $f8 = 490.00 /* 01060 808FDFA0 3C018091 */ lui $at, %hi(D_8090DB70) ## $at = 80910000 /* 01064 808FDFA4 3C0B8091 */ lui $t3, %hi(D_8090EB2C) ## $t3 = 80910000 /* 01068 808FDFA8 E5280024 */ swc1 $f8, 0x0024($t1) ## 00000024 -/* 0106C 808FDFAC C42ADB70 */ lwc1 $f10, %lo(D_8090DB70)($at) +/* 0106C 808FDFAC C42ADB70 */ lwc1 $f10, %lo(D_8090DB70)($at) /* 01070 808FDFB0 3C01C326 */ lui $at, 0xC326 ## $at = C3260000 /* 01074 808FDFB4 44812000 */ mtc1 $at, $f4 ## $f4 = -166.00 /* 01078 808FDFB8 3C014435 */ lui $at, 0x4435 ## $at = 44350000 /* 0107C 808FDFBC E52A0028 */ swc1 $f10, 0x0028($t1) ## 00000028 /* 01080 808FDFC0 E524002C */ swc1 $f4, 0x002C($t1) ## 0000002C -/* 01084 808FDFC4 8D6BEB2C */ lw $t3, %lo(D_8090EB2C)($t3) +/* 01084 808FDFC4 8D6BEB2C */ lw $t3, %lo(D_8090EB2C)($t3) /* 01088 808FDFC8 44813000 */ mtc1 $at, $f6 ## $f6 = 724.00 /* 0108C 808FDFCC 3C018091 */ lui $at, %hi(D_8090DB74) ## $at = 80910000 /* 01090 808FDFD0 3C0C8091 */ lui $t4, %hi(D_8090EB2C) ## $t4 = 80910000 /* 01094 808FDFD4 E5660024 */ swc1 $f6, 0x0024($t3) ## 80910024 -/* 01098 808FDFD8 8D8CEB2C */ lw $t4, %lo(D_8090EB2C)($t4) -/* 0109C 808FDFDC C428DB74 */ lwc1 $f8, %lo(D_8090DB74)($at) +/* 01098 808FDFD8 8D8CEB2C */ lw $t4, %lo(D_8090EB2C)($t4) +/* 0109C 808FDFDC C428DB74 */ lwc1 $f8, %lo(D_8090DB74)($at) /* 010A0 808FDFE0 3C01C33A */ lui $at, 0xC33A ## $at = C33A0000 /* 010A4 808FDFE4 3C0D8091 */ lui $t5, %hi(D_8090EB2C) ## $t5 = 80910000 /* 010A8 808FDFE8 E5880028 */ swc1 $f8, 0x0028($t4) ## 80910028 -/* 010AC 808FDFEC 8DADEB2C */ lw $t5, %lo(D_8090EB2C)($t5) +/* 010AC 808FDFEC 8DADEB2C */ lw $t5, %lo(D_8090EB2C)($t5) /* 010B0 808FDFF0 44815000 */ mtc1 $at, $f10 ## $f10 = -186.00 /* 010B4 808FDFF4 240EC000 */ addiu $t6, $zero, 0xC000 ## $t6 = FFFFC000 /* 010B8 808FDFF8 3C188091 */ lui $t8, %hi(D_8090EB2C) ## $t8 = 80910000 /* 010BC 808FDFFC E5AA002C */ swc1 $f10, 0x002C($t5) ## 8091002C /* 010C0 808FE000 A52E00B6 */ sh $t6, 0x00B6($t1) ## 000000B6 -/* 010C4 808FE004 8F18EB2C */ lw $t8, %lo(D_8090EB2C)($t8) +/* 010C4 808FE004 8F18EB2C */ lw $t8, %lo(D_8090EB2C)($t8) /* 010C8 808FE008 3C0143E1 */ lui $at, 0x43E1 ## $at = 43E10000 /* 010CC 808FE00C 44812000 */ mtc1 $at, $f4 ## $f4 = 450.00 /* 010D0 808FE010 240FB000 */ addiu $t7, $zero, 0xB000 ## $t7 = FFFFB000 /* 010D4 808FE014 A70F00B6 */ sh $t7, 0x00B6($t8) ## 809100B6 /* 010D8 808FE018 3C018091 */ lui $at, %hi(D_8090DB78) ## $at = 80910000 /* 010DC 808FE01C E60403A4 */ swc1 $f4, 0x03A4($s0) ## 000003A4 -/* 010E0 808FE020 C426DB78 */ lwc1 $f6, %lo(D_8090DB78)($at) +/* 010E0 808FE020 C426DB78 */ lwc1 $f6, %lo(D_8090DB78)($at) /* 010E4 808FE024 3C01C31E */ lui $at, 0xC31E ## $at = C31E0000 /* 010E8 808FE028 44814000 */ mtc1 $at, $f8 ## $f8 = -158.00 /* 010EC 808FE02C E60603A8 */ swc1 $f6, 0x03A8($s0) ## 000003A8 @@ -694,75 +694,75 @@ glabel L808FDF70 /* 010F8 808FE038 C52A0024 */ lwc1 $f10, 0x0024($t1) ## 00000024 /* 010FC 808FE03C 8E030398 */ lw $v1, 0x0398($s0) ## 00000398 /* 01100 808FE040 3C048090 */ lui $a0, %hi(D_80906D6C) ## $a0 = 80900000 -/* 01104 808FE044 46025101 */ sub.s $f4, $f10, $f2 +/* 01104 808FE044 46025101 */ sub.s $f4, $f10, $f2 /* 01108 808FE048 44815000 */ mtc1 $at, $f10 ## $f10 = 200.00 /* 0110C 808FE04C 3C014317 */ lui $at, 0x4317 ## $at = 43170000 /* 01110 808FE050 24846D6C */ addiu $a0, $a0, %lo(D_80906D6C) ## $a0 = 80906D6C -/* 01114 808FE054 46002180 */ add.s $f6, $f4, $f0 +/* 01114 808FE054 46002180 */ add.s $f6, $f4, $f0 /* 01118 808FE058 2405281D */ addiu $a1, $zero, 0x281D ## $a1 = 0000281D /* 0111C 808FE05C E60603B0 */ swc1 $f6, 0x03B0($s0) ## 000003B0 /* 01120 808FE060 C5280028 */ lwc1 $f8, 0x0028($t1) ## 00000028 /* 01124 808FE064 44813000 */ mtc1 $at, $f6 ## $f6 = 151.00 /* 01128 808FE068 2401000A */ addiu $at, $zero, 0x000A ## $at = 0000000A -/* 0112C 808FE06C 460A4100 */ add.s $f4, $f8, $f10 -/* 01130 808FE070 46062201 */ sub.s $f8, $f4, $f6 -/* 01134 808FE074 46004281 */ sub.s $f10, $f8, $f0 +/* 0112C 808FE06C 460A4100 */ add.s $f4, $f8, $f10 +/* 01130 808FE070 46062201 */ sub.s $f8, $f4, $f6 +/* 01134 808FE074 46004281 */ sub.s $f10, $f8, $f0 /* 01138 808FE078 E60A03B4 */ swc1 $f10, 0x03B4($s0) ## 000003B4 /* 0113C 808FE07C C524002C */ lwc1 $f4, 0x002C($t1) ## 0000002C -/* 01140 808FE080 46002180 */ add.s $f6, $f4, $f0 -/* 01144 808FE084 14610005 */ bne $v1, $at, .L808FE09C +/* 01140 808FE080 46002180 */ add.s $f6, $f4, $f0 +/* 01144 808FE084 14610005 */ bne $v1, $at, .L808FE09C /* 01148 808FE088 E60603B8 */ swc1 $f6, 0x03B8($s0) ## 000003B8 -/* 0114C 808FE08C 0C01E245 */ jal func_80078914 -/* 01150 808FE090 AFA90088 */ sw $t1, 0x0088($sp) -/* 01154 808FE094 8FA90088 */ lw $t1, 0x0088($sp) +/* 0114C 808FE08C 0C01E245 */ jal func_80078914 +/* 01150 808FE090 AFA90088 */ sw $t1, 0x0088($sp) +/* 01154 808FE094 8FA90088 */ lw $t1, 0x0088($sp) /* 01158 808FE098 8E030398 */ lw $v1, 0x0398($s0) ## 00000398 .L808FE09C: /* 0115C 808FE09C 24010014 */ addiu $at, $zero, 0x0014 ## $at = 00000014 -/* 01160 808FE0A0 14610005 */ bne $v1, $at, .L808FE0B8 +/* 01160 808FE0A0 14610005 */ bne $v1, $at, .L808FE0B8 /* 01164 808FE0A4 2404281D */ addiu $a0, $zero, 0x281D ## $a0 = 0000281D -/* 01168 808FE0A8 0C01E221 */ jal func_80078884 -/* 0116C 808FE0AC AFA90088 */ sw $t1, 0x0088($sp) -/* 01170 808FE0B0 8FA90088 */ lw $t1, 0x0088($sp) +/* 01168 808FE0A8 0C01E221 */ jal func_80078884 +/* 0116C 808FE0AC AFA90088 */ sw $t1, 0x0088($sp) +/* 01170 808FE0B0 8FA90088 */ lw $t1, 0x0088($sp) /* 01174 808FE0B4 8E030398 */ lw $v1, 0x0398($s0) ## 00000398 .L808FE0B8: /* 01178 808FE0B8 2401001E */ addiu $at, $zero, 0x001E ## $at = 0000001E -/* 0117C 808FE0BC 14610007 */ bne $v1, $at, .L808FE0DC +/* 0117C 808FE0BC 14610007 */ bne $v1, $at, .L808FE0DC /* 01180 808FE0C0 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 01184 808FE0C4 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 01188 808FE0C8 24060052 */ addiu $a2, $zero, 0x0052 ## $a2 = 00000052 -/* 0118C 808FE0CC 0C00B7D5 */ jal func_8002DF54 -/* 01190 808FE0D0 AFA90088 */ sw $t1, 0x0088($sp) -/* 01194 808FE0D4 8FA90088 */ lw $t1, 0x0088($sp) +/* 0118C 808FE0CC 0C00B7D5 */ jal func_8002DF54 +/* 01190 808FE0D0 AFA90088 */ sw $t1, 0x0088($sp) +/* 01194 808FE0D4 8FA90088 */ lw $t1, 0x0088($sp) /* 01198 808FE0D8 8E030398 */ lw $v1, 0x0398($s0) ## 00000398 .L808FE0DC: /* 0119C 808FE0DC 24010032 */ addiu $at, $zero, 0x0032 ## $at = 00000032 -/* 011A0 808FE0E0 146105CB */ bne $v1, $at, .L808FF810 +/* 011A0 808FE0E0 146105CB */ bne $v1, $at, .L808FF810 /* 011A4 808FE0E4 2419000C */ addiu $t9, $zero, 0x000C ## $t9 = 0000000C /* 011A8 808FE0E8 AE000398 */ sw $zero, 0x0398($s0) ## 00000398 /* 011AC 808FE0EC A619039C */ sh $t9, 0x039C($s0) ## 0000039C /* 011B0 808FE0F0 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 011B4 808FE0F4 24A52168 */ addiu $a1, $a1, 0x2168 ## $a1 = 06002168 -/* 011B8 808FE0F8 AFA90088 */ sw $t1, 0x0088($sp) +/* 011B8 808FE0F8 AFA90088 */ sw $t1, 0x0088($sp) /* 011BC 808FE0FC 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C -/* 011C0 808FE100 0C029490 */ jal func_800A5240 +/* 011C0 808FE100 0C029490 */ jal SkelAnime_ChangeAnimTransitionStop /* 011C4 808FE104 24060000 */ addiu $a2, $zero, 0x0000 ## $a2 = 00000000 /* 011C8 808FE108 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 /* 011CC 808FE10C 0C028800 */ jal SkelAnime_GetFrameCount - + /* 011D0 808FE110 24842168 */ addiu $a0, $a0, 0x2168 ## $a0 = 06002168 /* 011D4 808FE114 44824000 */ mtc1 $v0, $f8 ## $f8 = 0.00 /* 011D8 808FE118 3C018091 */ lui $at, %hi(D_8090DB7C) ## $at = 80910000 -/* 011DC 808FE11C C420DB7C */ lwc1 $f0, %lo(D_8090DB7C)($at) -/* 011E0 808FE120 468042A0 */ cvt.s.w $f10, $f8 +/* 011DC 808FE11C C420DB7C */ lwc1 $f0, %lo(D_8090DB7C)($at) +/* 011E0 808FE120 468042A0 */ cvt.s.w $f10, $f8 /* 011E4 808FE124 3C01C348 */ lui $at, 0xC348 ## $at = C3480000 /* 011E8 808FE128 44811000 */ mtc1 $at, $f2 ## $f2 = -200.00 -/* 011EC 808FE12C 8FA90088 */ lw $t1, 0x0088($sp) +/* 011EC 808FE12C 8FA90088 */ lw $t1, 0x0088($sp) /* 011F0 808FE130 3C018091 */ lui $at, %hi(D_8090DB80) ## $at = 80910000 /* 011F4 808FE134 E6000028 */ swc1 $f0, 0x0028($s0) ## 00000028 /* 011F8 808FE138 E60A0194 */ swc1 $f10, 0x0194($s0) ## 00000194 /* 011FC 808FE13C E6020024 */ swc1 $f2, 0x0024($s0) ## 00000024 /* 01200 808FE140 E602002C */ swc1 $f2, 0x002C($s0) ## 0000002C -/* 01204 808FE144 C424DB80 */ lwc1 $f4, %lo(D_8090DB80)($at) +/* 01204 808FE144 C424DB80 */ lwc1 $f4, %lo(D_8090DB80)($at) /* 01208 808FE148 3C01C270 */ lui $at, 0xC270 ## $at = C2700000 /* 0120C 808FE14C 44813000 */ mtc1 $at, $f6 ## $f6 = -60.00 /* 01210 808FE150 240B5000 */ addiu $t3, $zero, 0x5000 ## $t3 = 00005000 @@ -770,13 +770,13 @@ glabel L808FDF70 /* 01218 808FE158 3C018091 */ lui $at, %hi(D_8090DB84) ## $at = 80910000 /* 0121C 808FE15C E60400BC */ swc1 $f4, 0x00BC($s0) ## 000000BC /* 01220 808FE160 E60603A4 */ swc1 $f6, 0x03A4($s0) ## 000003A4 -/* 01224 808FE164 C428DB84 */ lwc1 $f8, %lo(D_8090DB84)($at) +/* 01224 808FE164 C428DB84 */ lwc1 $f8, %lo(D_8090DB84)($at) /* 01228 808FE168 3C01428C */ lui $at, 0x428C ## $at = 428C0000 /* 0122C 808FE16C 44815000 */ mtc1 $at, $f10 ## $f10 = 70.00 /* 01230 808FE170 44803000 */ mtc1 $zero, $f6 ## $f6 = 0.00 /* 01234 808FE174 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 01238 808FE178 460A0100 */ add.s $f4, $f0, $f10 -/* 0123C 808FE17C 00310821 */ addu $at, $at, $s1 +/* 01238 808FE178 460A0100 */ add.s $f4, $f0, $f10 +/* 0123C 808FE17C 00310821 */ addu $at, $at, $s1 /* 01240 808FE180 E60203AC */ swc1 $f2, 0x03AC($s0) ## 000003AC /* 01244 808FE184 E60203B0 */ swc1 $f2, 0x03B0($s0) ## 000003B0 /* 01248 808FE188 E60403B4 */ swc1 $f4, 0x03B4($s0) ## 000003B4 @@ -784,78 +784,78 @@ glabel L808FDF70 /* 01250 808FE190 E60803A8 */ swc1 $f8, 0x03A8($s0) ## 000003A8 /* 01254 808FE194 E4260AFC */ swc1 $f6, 0x0AFC($at) ## 00010AFC /* 01258 808FE198 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 0125C 808FE19C 00310821 */ addu $at, $at, $s1 +/* 0125C 808FE19C 00310821 */ addu $at, $at, $s1 /* 01260 808FE1A0 3C0C0001 */ lui $t4, 0x0001 ## $t4 = 00010000 -/* 01264 808FE1A4 01916021 */ addu $t4, $t4, $s1 +/* 01264 808FE1A4 01916021 */ addu $t4, $t4, $s1 /* 01268 808FE1A8 A0200AE1 */ sb $zero, 0x0AE1($at) ## 00010AE1 /* 0126C 808FE1AC 918C0AE1 */ lbu $t4, 0x0AE1($t4) ## 00010AE1 /* 01270 808FE1B0 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 01274 808FE1B4 00310821 */ addu $at, $at, $s1 +/* 01274 808FE1B4 00310821 */ addu $at, $at, $s1 /* 01278 808FE1B8 A02C0AE2 */ sb $t4, 0x0AE2($at) ## 00010AE2 /* 0127C 808FE1BC A2000339 */ sb $zero, 0x0339($s0) ## 00000339 glabel L808FE1C0 /* 01280 808FE1C0 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C -/* 01284 808FE1C4 AFA40050 */ sw $a0, 0x0050($sp) +/* 01284 808FE1C4 AFA40050 */ sw $a0, 0x0050($sp) /* 01288 808FE1C8 0C02927F */ jal SkelAnime_FrameUpdateMatrix - -/* 0128C 808FE1CC AFA90088 */ sw $t1, 0x0088($sp) + +/* 0128C 808FE1CC AFA90088 */ sw $t1, 0x0088($sp) /* 01290 808FE1D0 8E030398 */ lw $v1, 0x0398($s0) ## 00000398 /* 01294 808FE1D4 2401001E */ addiu $at, $zero, 0x001E ## $at = 0000001E -/* 01298 808FE1D8 8FA90088 */ lw $t1, 0x0088($sp) -/* 0129C 808FE1DC 1461000C */ bne $v1, $at, .L808FE210 +/* 01298 808FE1D8 8FA90088 */ lw $t1, 0x0088($sp) +/* 0129C 808FE1DC 1461000C */ bne $v1, $at, .L808FE210 /* 012A0 808FE1E0 240A0001 */ addiu $t2, $zero, 0x0001 ## $t2 = 00000001 /* 012A4 808FE1E4 3C018090 */ lui $at, %hi(D_80906D78) ## $at = 80900000 -/* 012A8 808FE1E8 A02A6D78 */ sb $t2, %lo(D_80906D78)($at) +/* 012A8 808FE1E8 A02A6D78 */ sb $t2, %lo(D_80906D78)($at) /* 012AC 808FE1EC A20A0314 */ sb $t2, 0x0314($s0) ## 00000314 /* 012B0 808FE1F0 44806000 */ mtc1 $zero, $f12 ## $f12 = 0.00 -/* 012B4 808FE1F4 AFA90088 */ sw $t1, 0x0088($sp) +/* 012B4 808FE1F4 AFA90088 */ sw $t1, 0x0088($sp) /* 012B8 808FE1F8 240500C8 */ addiu $a1, $zero, 0x00C8 ## $a1 = 000000C8 /* 012BC 808FE1FC 24060014 */ addiu $a2, $zero, 0x0014 ## $a2 = 00000014 -/* 012C0 808FE200 0C02A7DB */ jal func_800A9F6C +/* 012C0 808FE200 0C02A7DB */ jal func_800A9F6C /* 012C4 808FE204 24070014 */ addiu $a3, $zero, 0x0014 ## $a3 = 00000014 -/* 012C8 808FE208 8FA90088 */ lw $t1, 0x0088($sp) +/* 012C8 808FE208 8FA90088 */ lw $t1, 0x0088($sp) /* 012CC 808FE20C 8E030398 */ lw $v1, 0x0398($s0) ## 00000398 .L808FE210: /* 012D0 808FE210 2401001E */ addiu $at, $zero, 0x001E ## $at = 0000001E -/* 012D4 808FE214 14610005 */ bne $v1, $at, .L808FE22C +/* 012D4 808FE214 14610005 */ bne $v1, $at, .L808FE22C /* 012D8 808FE218 240428C2 */ addiu $a0, $zero, 0x28C2 ## $a0 = 000028C2 -/* 012DC 808FE21C 0C01E221 */ jal func_80078884 -/* 012E0 808FE220 AFA90088 */ sw $t1, 0x0088($sp) -/* 012E4 808FE224 8FA90088 */ lw $t1, 0x0088($sp) +/* 012DC 808FE21C 0C01E221 */ jal func_80078884 +/* 012E0 808FE220 AFA90088 */ sw $t1, 0x0088($sp) +/* 012E4 808FE224 8FA90088 */ lw $t1, 0x0088($sp) /* 012E8 808FE228 8E030398 */ lw $v1, 0x0398($s0) ## 00000398 .L808FE22C: -/* 012EC 808FE22C 2C61001E */ sltiu $at, $v1, 0x001E -/* 012F0 808FE230 14200010 */ bne $at, $zero, .L808FE274 +/* 012EC 808FE22C 2C61001E */ sltiu $at, $v1, 0x001E +/* 012F0 808FE230 14200010 */ bne $at, $zero, .L808FE274 /* 012F4 808FE234 26040028 */ addiu $a0, $s0, 0x0028 ## $a0 = 00000028 /* 012F8 808FE238 3C014120 */ lui $at, 0x4120 ## $at = 41200000 /* 012FC 808FE23C 44817000 */ mtc1 $at, $f14 ## $f14 = 10.00 /* 01300 808FE240 3C0544A1 */ lui $a1, 0x44A1 ## $a1 = 44A10000 /* 01304 808FE244 3C063DCC */ lui $a2, 0x3DCC ## $a2 = 3DCC0000 -/* 01308 808FE248 44077000 */ mfc1 $a3, $f14 +/* 01308 808FE248 44077000 */ mfc1 $a3, $f14 /* 0130C 808FE24C 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3DCCCCCD /* 01310 808FE250 34A52000 */ ori $a1, $a1, 0x2000 ## $a1 = 44A12000 /* 01314 808FE254 0C01E107 */ jal Math_SmoothScaleMaxF - -/* 01318 808FE258 AFA90088 */ sw $t1, 0x0088($sp) + +/* 01318 808FE258 AFA90088 */ sw $t1, 0x0088($sp) /* 0131C 808FE25C 3C01428C */ lui $at, 0x428C ## $at = 428C0000 /* 01320 808FE260 44815000 */ mtc1 $at, $f10 ## $f10 = 70.00 /* 01324 808FE264 C6080028 */ lwc1 $f8, 0x0028($s0) ## 00000028 -/* 01328 808FE268 8FA90088 */ lw $t1, 0x0088($sp) -/* 0132C 808FE26C 460A4100 */ add.s $f4, $f8, $f10 +/* 01328 808FE268 8FA90088 */ lw $t1, 0x0088($sp) +/* 0132C 808FE26C 460A4100 */ add.s $f4, $f8, $f10 /* 01330 808FE270 E60403B4 */ swc1 $f4, 0x03B4($s0) ## 000003B4 .L808FE274: /* 01334 808FE274 8E050194 */ lw $a1, 0x0194($s0) ## 00000194 -/* 01338 808FE278 AFA90088 */ sw $t1, 0x0088($sp) -/* 0133C 808FE27C 0C0295B2 */ jal func_800A56C8 -/* 01340 808FE280 8FA40050 */ lw $a0, 0x0050($sp) -/* 01344 808FE284 10400562 */ beq $v0, $zero, .L808FF810 -/* 01348 808FE288 8FA90088 */ lw $t1, 0x0088($sp) +/* 01338 808FE278 AFA90088 */ sw $t1, 0x0088($sp) +/* 0133C 808FE27C 0C0295B2 */ jal func_800A56C8 +/* 01340 808FE280 8FA40050 */ lw $a0, 0x0050($sp) +/* 01344 808FE284 10400562 */ beq $v0, $zero, .L808FF810 +/* 01348 808FE288 8FA90088 */ lw $t1, 0x0088($sp) /* 0134C 808FE28C 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 01350 808FE290 24A52E6C */ addiu $a1, $a1, 0x2E6C ## $a1 = 06002E6C -/* 01354 808FE294 8FA40050 */ lw $a0, 0x0050($sp) +/* 01354 808FE294 8FA40050 */ lw $a0, 0x0050($sp) /* 01358 808FE298 24060000 */ addiu $a2, $zero, 0x0000 ## $a2 = 00000000 -/* 0135C 808FE29C 0C0294D3 */ jal func_800A534C -/* 01360 808FE2A0 AFA90088 */ sw $t1, 0x0088($sp) +/* 0135C 808FE29C 0C0294D3 */ jal SkelAnime_ChangeAnimTransitionRepeat +/* 01360 808FE2A0 AFA90088 */ sw $t1, 0x0088($sp) /* 01364 808FE2A4 3C01C348 */ lui $at, 0xC348 ## $at = C3480000 /* 01368 808FE2A8 44810000 */ mtc1 $at, $f0 ## $f0 = -200.00 /* 0136C 808FE2AC 3C0141F0 */ lui $at, 0x41F0 ## $at = 41F00000 @@ -863,41 +863,41 @@ glabel L808FE1C0 /* 01374 808FE2B4 C6060028 */ lwc1 $f6, 0x0028($s0) ## 00000028 /* 01378 808FE2B8 240D000E */ addiu $t5, $zero, 0x000E ## $t5 = 0000000E /* 0137C 808FE2BC A60D039C */ sh $t5, 0x039C($s0) ## 0000039C -/* 01380 808FE2C0 46103201 */ sub.s $f8, $f6, $f16 +/* 01380 808FE2C0 46103201 */ sub.s $f8, $f6, $f16 /* 01384 808FE2C4 AE000398 */ sw $zero, 0x0398($s0) ## 00000398 /* 01388 808FE2C8 24040023 */ addiu $a0, $zero, 0x0023 ## $a0 = 00000023 /* 0138C 808FE2CC E6000024 */ swc1 $f0, 0x0024($s0) ## 00000024 /* 01390 808FE2D0 E6080028 */ swc1 $f8, 0x0028($s0) ## 00000028 /* 01394 808FE2D4 0C03E803 */ jal Audio_SetBGM - + /* 01398 808FE2D8 E600002C */ swc1 $f0, 0x002C($s0) ## 0000002C -/* 0139C 808FE2DC 8FA90088 */ lw $t1, 0x0088($sp) +/* 0139C 808FE2DC 8FA90088 */ lw $t1, 0x0088($sp) glabel L808FE2E0 /* 013A0 808FE2E0 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 013A4 808FE2E4 02214021 */ addu $t0, $s1, $at +/* 013A4 808FE2E4 02214021 */ addu $t0, $s1, $at /* 013A8 808FE2E8 260E0028 */ addiu $t6, $s0, 0x0028 ## $t6 = 00000028 -/* 013AC 808FE2EC AFAE0054 */ sw $t6, 0x0054($sp) -/* 013B0 808FE2F0 AFA80050 */ sw $t0, 0x0050($sp) +/* 013AC 808FE2EC AFAE0054 */ sw $t6, 0x0054($sp) +/* 013B0 808FE2F0 AFA80050 */ sw $t0, 0x0050($sp) /* 013B4 808FE2F4 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C /* 013B8 808FE2F8 0C02927F */ jal SkelAnime_FrameUpdateMatrix - -/* 013BC 808FE2FC AFA90088 */ sw $t1, 0x0088($sp) + +/* 013BC 808FE2FC AFA90088 */ sw $t1, 0x0088($sp) /* 013C0 808FE300 3C0544A1 */ lui $a1, 0x44A1 ## $a1 = 44A10000 /* 013C4 808FE304 3C063D4C */ lui $a2, 0x3D4C ## $a2 = 3D4C0000 /* 013C8 808FE308 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3D4CCCCD /* 013CC 808FE30C 34A52000 */ ori $a1, $a1, 0x2000 ## $a1 = 44A12000 -/* 013D0 808FE310 8FA40054 */ lw $a0, 0x0054($sp) +/* 013D0 808FE310 8FA40054 */ lw $a0, 0x0054($sp) /* 013D4 808FE314 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 013D8 808FE318 3C073F80 */ lui $a3, 0x3F80 ## $a3 = 3F800000 /* 013DC 808FE31C 3C018091 */ lui $at, %hi(D_8090DB88) ## $at = 80910000 -/* 013E0 808FE320 C420DB88 */ lwc1 $f0, %lo(D_8090DB88)($at) +/* 013E0 808FE320 C420DB88 */ lwc1 $f0, %lo(D_8090DB88)($at) /* 013E4 808FE324 3C014248 */ lui $at, 0x4248 ## $at = 42480000 /* 013E8 808FE328 44818000 */ mtc1 $at, $f16 ## $f16 = 50.00 -/* 013EC 808FE32C 8FA90088 */ lw $t1, 0x0088($sp) +/* 013EC 808FE32C 8FA90088 */ lw $t1, 0x0088($sp) /* 013F0 808FE330 3C01437A */ lui $at, 0x437A ## $at = 437A0000 /* 013F4 808FE334 44819000 */ mtc1 $at, $f18 ## $f18 = 250.00 -/* 013F8 808FE338 8FA80050 */ lw $t0, 0x0050($sp) +/* 013F8 808FE338 8FA80050 */ lw $t0, 0x0050($sp) /* 013FC 808FE33C 3C01C385 */ lui $at, 0xC385 ## $at = C3850000 /* 01400 808FE340 44815000 */ mtc1 $at, $f10 ## $f10 = -266.00 /* 01404 808FE344 3C028091 */ lui $v0, %hi(D_8090EB2C) ## $v0 = 80910000 @@ -924,15 +924,15 @@ glabel L808FE2E0 /* 01458 808FE398 C6080024 */ lwc1 $f8, 0x0024($s0) ## 00000024 /* 0145C 808FE39C C6060028 */ lwc1 $f6, 0x0028($s0) ## 00000028 /* 01460 808FE3A0 8E030398 */ lw $v1, 0x0398($s0) ## 00000398 -/* 01464 808FE3A4 460A4100 */ add.s $f4, $f8, $f10 +/* 01464 808FE3A4 460A4100 */ add.s $f4, $f8, $f10 /* 01468 808FE3A8 44814000 */ mtc1 $at, $f8 ## $f8 = 80.00 /* 0146C 808FE3AC 3C014348 */ lui $at, 0x4348 ## $at = 43480000 /* 01470 808FE3B0 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 01474 808FE3B4 E60403A4 */ swc1 $f4, 0x03A4($s0) ## 000003A4 /* 01478 808FE3B8 C604002C */ lwc1 $f4, 0x002C($s0) ## 0000002C -/* 0147C 808FE3BC 46083280 */ add.s $f10, $f6, $f8 +/* 0147C 808FE3BC 46083280 */ add.s $f10, $f6, $f8 /* 01480 808FE3C0 2406001E */ addiu $a2, $zero, 0x001E ## $a2 = 0000001E -/* 01484 808FE3C4 46102180 */ add.s $f6, $f4, $f16 +/* 01484 808FE3C4 46102180 */ add.s $f6, $f4, $f16 /* 01488 808FE3C8 E60A03A8 */ swc1 $f10, 0x03A8($s0) ## 000003A8 /* 0148C 808FE3CC E60603AC */ swc1 $f6, 0x03AC($s0) ## 000003AC /* 01490 808FE3D0 C5280024 */ lwc1 $f8, 0x0024($t1) ## 00000024 @@ -942,16 +942,16 @@ glabel L808FE2E0 /* 014A0 808FE3E0 C52A0028 */ lwc1 $f10, 0x0028($t1) ## 00000028 /* 014A4 808FE3E4 E60A03B4 */ swc1 $f10, 0x03B4($s0) ## 000003B4 /* 014A8 808FE3E8 C524002C */ lwc1 $f4, 0x002C($t1) ## 0000002C -/* 014AC 808FE3EC 46062201 */ sub.s $f8, $f4, $f6 -/* 014B0 808FE3F0 14610005 */ bne $v1, $at, .L808FE408 +/* 014AC 808FE3EC 46062201 */ sub.s $f8, $f4, $f6 +/* 014B0 808FE3F0 14610005 */ bne $v1, $at, .L808FE408 /* 014B4 808FE3F4 E60803B8 */ swc1 $f8, 0x03B8($s0) ## 000003B8 -/* 014B8 808FE3F8 0C00B7D5 */ jal func_8002DF54 -/* 014BC 808FE3FC AFA80050 */ sw $t0, 0x0050($sp) -/* 014C0 808FE400 8FA80050 */ lw $t0, 0x0050($sp) +/* 014B8 808FE3F8 0C00B7D5 */ jal func_8002DF54 +/* 014BC 808FE3FC AFA80050 */ sw $t0, 0x0050($sp) +/* 014C0 808FE400 8FA80050 */ lw $t0, 0x0050($sp) /* 014C4 808FE404 8E030398 */ lw $v1, 0x0398($s0) ## 00000398 .L808FE408: /* 014C8 808FE408 2401003C */ addiu $at, $zero, 0x003C ## $at = 0000003C -/* 014CC 808FE40C 14610023 */ bne $v1, $at, .L808FE49C +/* 014CC 808FE40C 14610023 */ bne $v1, $at, .L808FE49C /* 014D0 808FE410 240C000F */ addiu $t4, $zero, 0x000F ## $t4 = 0000000F /* 014D4 808FE414 3C014170 */ lui $at, 0x4170 ## $at = 41700000 /* 014D8 808FE418 44817000 */ mtc1 $at, $f14 ## $f14 = 15.00 @@ -960,28 +960,28 @@ glabel L808FE2E0 /* 014E4 808FE424 C6000024 */ lwc1 $f0, 0x0024($s0) ## 00000024 /* 014E8 808FE428 3C01431A */ lui $at, 0x431A ## $at = 431A0000 /* 014EC 808FE42C 44813000 */ mtc1 $at, $f6 ## $f6 = 154.00 -/* 014F0 808FE430 460A0100 */ add.s $f4, $f0, $f10 +/* 014F0 808FE430 460A0100 */ add.s $f4, $f0, $f10 /* 014F4 808FE434 3C014270 */ lui $at, 0x4270 ## $at = 42700000 /* 014F8 808FE438 44815000 */ mtc1 $at, $f10 ## $f10 = 60.00 /* 014FC 808FE43C C60C0028 */ lwc1 $f12, 0x0028($s0) ## 00000028 -/* 01500 808FE440 46062201 */ sub.s $f8, $f4, $f6 +/* 01500 808FE440 46062201 */ sub.s $f8, $f4, $f6 /* 01504 808FE444 C602002C */ lwc1 $f2, 0x002C($s0) ## 0000002C /* 01508 808FE448 3C01429A */ lui $at, 0x429A ## $at = 429A0000 -/* 0150C 808FE44C 460A6100 */ add.s $f4, $f12, $f10 +/* 0150C 808FE44C 460A6100 */ add.s $f4, $f12, $f10 /* 01510 808FE450 E60803A4 */ swc1 $f8, 0x03A4($s0) ## 000003A4 /* 01514 808FE454 44814000 */ mtc1 $at, $f8 ## $f8 = 77.00 -/* 01518 808FE458 460E1181 */ sub.s $f6, $f2, $f14 +/* 01518 808FE458 460E1181 */ sub.s $f6, $f2, $f14 /* 0151C 808FE45C E60403A8 */ swc1 $f4, 0x03A8($s0) ## 000003A8 /* 01520 808FE460 3C0142C8 */ lui $at, 0x42C8 ## $at = 42C80000 -/* 01524 808FE464 46086280 */ add.s $f10, $f12, $f8 +/* 01524 808FE464 46086280 */ add.s $f10, $f12, $f8 /* 01528 808FE468 44812000 */ mtc1 $at, $f4 ## $f4 = 100.00 /* 0152C 808FE46C 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 /* 01530 808FE470 44814000 */ mtc1 $at, $f8 ## $f8 = 5.00 /* 01534 808FE474 E60603AC */ swc1 $f6, 0x03AC($s0) ## 000003AC -/* 01538 808FE478 46045180 */ add.s $f6, $f10, $f4 +/* 01538 808FE478 46045180 */ add.s $f6, $f10, $f4 /* 0153C 808FE47C 240D0002 */ addiu $t5, $zero, 0x0002 ## $t5 = 00000002 /* 01540 808FE480 A60C039C */ sh $t4, 0x039C($s0) ## 0000039C -/* 01544 808FE484 46081280 */ add.s $f10, $f2, $f8 +/* 01544 808FE484 46081280 */ add.s $f10, $f2, $f8 /* 01548 808FE488 AE000398 */ sw $zero, 0x0398($s0) ## 00000398 /* 0154C 808FE48C E60603B4 */ swc1 $f6, 0x03B4($s0) ## 000003B4 /* 01550 808FE490 A20D0314 */ sb $t5, 0x0314($s0) ## 00000314 @@ -991,73 +991,73 @@ glabel L808FE2E0 /* 0155C 808FE49C 8D0E1DE4 */ lw $t6, 0x1DE4($t0) ## 00001DE4 /* 01560 808FE4A0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 01564 808FE4A4 31CF001F */ andi $t7, $t6, 0x001F ## $t7 = 00000000 -/* 01568 808FE4A8 55E004DA */ bnel $t7, $zero, .L808FF814 +/* 01568 808FE4A8 55E004DA */ bnel $t7, $zero, .L808FF814 /* 0156C 808FE4AC 3C014080 */ lui $at, 0x4080 ## $at = 40800000 /* 01570 808FE4B0 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 01574 808FE4B4 240539D1 */ addiu $a1, $zero, 0x39D1 ## $a1 = 000039D1 -/* 01578 808FE4B8 100004D6 */ beq $zero, $zero, .L808FF814 +/* 01578 808FE4B8 100004D6 */ beq $zero, $zero, .L808FF814 /* 0157C 808FE4BC 3C014080 */ lui $at, 0x4080 ## $at = 40800000 glabel L808FE4C0 /* 01580 808FE4C0 3C180001 */ lui $t8, 0x0001 ## $t8 = 00010000 -/* 01584 808FE4C4 0311C021 */ addu $t8, $t8, $s1 +/* 01584 808FE4C4 0311C021 */ addu $t8, $t8, $s1 /* 01588 808FE4C8 8F181DE4 */ lw $t8, 0x1DE4($t8) ## 00011DE4 /* 0158C 808FE4CC 3319001F */ andi $t9, $t8, 0x001F ## $t9 = 00000000 -/* 01590 808FE4D0 57200009 */ bnel $t9, $zero, .L808FE4F8 +/* 01590 808FE4D0 57200009 */ bnel $t9, $zero, .L808FE4F8 /* 01594 808FE4D4 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C /* 01598 808FE4D8 8E0B0398 */ lw $t3, 0x0398($s0) ## 00000398 /* 0159C 808FE4DC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 015A0 808FE4E0 2D610064 */ sltiu $at, $t3, 0x0064 -/* 015A4 808FE4E4 50200004 */ beql $at, $zero, .L808FE4F8 +/* 015A0 808FE4E0 2D610064 */ sltiu $at, $t3, 0x0064 +/* 015A4 808FE4E4 50200004 */ beql $at, $zero, .L808FE4F8 /* 015A8 808FE4E8 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C /* 015AC 808FE4EC 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 015B0 808FE4F0 240539D1 */ addiu $a1, $zero, 0x39D1 ## $a1 = 000039D1 /* 015B4 808FE4F4 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C .L808FE4F8: /* 015B8 808FE4F8 0C02927F */ jal SkelAnime_FrameUpdateMatrix - -/* 015BC 808FE4FC AFA40050 */ sw $a0, 0x0050($sp) + +/* 015BC 808FE4FC AFA40050 */ sw $a0, 0x0050($sp) /* 015C0 808FE500 3C01429A */ lui $at, 0x429A ## $at = 429A0000 /* 015C4 808FE504 44813000 */ mtc1 $at, $f6 ## $f6 = 77.00 /* 015C8 808FE508 C6040028 */ lwc1 $f4, 0x0028($s0) ## 00000028 /* 015CC 808FE50C 3C063D4C */ lui $a2, 0x3D4C ## $a2 = 3D4C0000 /* 015D0 808FE510 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3D4CCCCD -/* 015D4 808FE514 46062200 */ add.s $f8, $f4, $f6 +/* 015D4 808FE514 46062200 */ add.s $f8, $f4, $f6 /* 015D8 808FE518 260403B4 */ addiu $a0, $s0, 0x03B4 ## $a0 = 000003B4 /* 015DC 808FE51C 3C0740A0 */ lui $a3, 0x40A0 ## $a3 = 40A00000 -/* 015E0 808FE520 44054000 */ mfc1 $a1, $f8 +/* 015E0 808FE520 44054000 */ mfc1 $a1, $f8 /* 015E4 808FE524 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 015E8 808FE528 00000000 */ nop /* 015EC 808FE52C 8E030398 */ lw $v1, 0x0398($s0) ## 00000398 -/* 015F0 808FE530 2C610032 */ sltiu $at, $v1, 0x0032 -/* 015F4 808FE534 1420001C */ bne $at, $zero, .L808FE5A8 +/* 015F0 808FE530 2C610032 */ sltiu $at, $v1, 0x0032 +/* 015F4 808FE534 1420001C */ bne $at, $zero, .L808FE5A8 /* 015F8 808FE538 24010032 */ addiu $at, $zero, 0x0032 ## $at = 00000032 -/* 015FC 808FE53C 1461000D */ bne $v1, $at, .L808FE574 -/* 01600 808FE540 8FA40050 */ lw $a0, 0x0050($sp) +/* 015FC 808FE53C 1461000D */ bne $v1, $at, .L808FE574 +/* 01600 808FE540 8FA40050 */ lw $a0, 0x0050($sp) /* 01604 808FE544 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 01608 808FE548 24A50BFC */ addiu $a1, $a1, 0x0BFC ## $a1 = 06000BFC -/* 0160C 808FE54C 0C029490 */ jal func_800A5240 +/* 0160C 808FE54C 0C029490 */ jal SkelAnime_ChangeAnimTransitionStop /* 01610 808FE550 24060000 */ addiu $a2, $zero, 0x0000 ## $a2 = 00000000 /* 01614 808FE554 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 /* 01618 808FE558 0C028800 */ jal SkelAnime_GetFrameCount - + /* 0161C 808FE55C 24840BFC */ addiu $a0, $a0, 0x0BFC ## $a0 = 06000BFC /* 01620 808FE560 44825000 */ mtc1 $v0, $f10 ## $f10 = 0.00 /* 01624 808FE564 240C0003 */ addiu $t4, $zero, 0x0003 ## $t4 = 00000003 /* 01628 808FE568 A20C0314 */ sb $t4, 0x0314($s0) ## 00000314 -/* 0162C 808FE56C 46805120 */ cvt.s.w $f4, $f10 +/* 0162C 808FE56C 46805120 */ cvt.s.w $f4, $f10 /* 01630 808FE570 E6040194 */ swc1 $f4, 0x0194($s0) ## 00000194 .L808FE574: -/* 01634 808FE574 8FA40050 */ lw $a0, 0x0050($sp) -/* 01638 808FE578 0C0295B2 */ jal func_800A56C8 +/* 01634 808FE574 8FA40050 */ lw $a0, 0x0050($sp) +/* 01638 808FE578 0C0295B2 */ jal func_800A56C8 /* 0163C 808FE57C 8E050194 */ lw $a1, 0x0194($s0) ## 00000194 -/* 01640 808FE580 10400009 */ beq $v0, $zero, .L808FE5A8 -/* 01644 808FE584 8FA40050 */ lw $a0, 0x0050($sp) +/* 01640 808FE580 10400009 */ beq $v0, $zero, .L808FE5A8 +/* 01644 808FE584 8FA40050 */ lw $a0, 0x0050($sp) /* 01648 808FE588 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 0164C 808FE58C 24A53F38 */ addiu $a1, $a1, 0x3F38 ## $a1 = 06003F38 -/* 01650 808FE590 0C0294D3 */ jal func_800A534C +/* 01650 808FE590 0C0294D3 */ jal SkelAnime_ChangeAnimTransitionRepeat /* 01654 808FE594 24060000 */ addiu $a2, $zero, 0x0000 ## $a2 = 00000000 /* 01658 808FE598 3C01447A */ lui $at, 0x447A ## $at = 447A0000 /* 0165C 808FE59C 44813000 */ mtc1 $at, $f6 ## $f6 = 1000.00 @@ -1065,57 +1065,57 @@ glabel L808FE4C0 /* 01664 808FE5A4 E6060194 */ swc1 $f6, 0x0194($s0) ## 00000194 .L808FE5A8: /* 01668 808FE5A8 8E030398 */ lw $v1, 0x0398($s0) ## 00000398 -/* 0166C 808FE5AC 2C610047 */ sltiu $at, $v1, 0x0047 -/* 01670 808FE5B0 14200008 */ bne $at, $zero, .L808FE5D4 +/* 0166C 808FE5AC 2C610047 */ sltiu $at, $v1, 0x0047 +/* 01670 808FE5B0 14200008 */ bne $at, $zero, .L808FE5D4 /* 01674 808FE5B4 3C014120 */ lui $at, 0x4120 ## $at = 41200000 /* 01678 808FE5B8 44817000 */ mtc1 $at, $f14 ## $f14 = 10.00 /* 0167C 808FE5BC 260401B4 */ addiu $a0, $s0, 0x01B4 ## $a0 = 000001B4 /* 01680 808FE5C0 3C05437F */ lui $a1, 0x437F ## $a1 = 437F0000 -/* 01684 808FE5C4 44077000 */ mfc1 $a3, $f14 +/* 01684 808FE5C4 44077000 */ mfc1 $a3, $f14 /* 01688 808FE5C8 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 0168C 808FE5CC 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 01690 808FE5D0 8E030398 */ lw $v1, 0x0398($s0) ## 00000398 .L808FE5D4: /* 01694 808FE5D4 2401008C */ addiu $at, $zero, 0x008C ## $at = 0000008C -/* 01698 808FE5D8 1461048D */ bne $v1, $at, .L808FF810 +/* 01698 808FE5D8 1461048D */ bne $v1, $at, .L808FF810 /* 0169C 808FE5DC 240D0010 */ addiu $t5, $zero, 0x0010 ## $t5 = 00000010 /* 016A0 808FE5E0 A60D039C */ sh $t5, 0x039C($s0) ## 0000039C /* 016A4 808FE5E4 AE000398 */ sw $zero, 0x0398($s0) ## 00000398 /* 016A8 808FE5E8 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 016AC 808FE5EC 24A53754 */ addiu $a1, $a1, 0x3754 ## $a1 = 06003754 -/* 016B0 808FE5F0 8FA40050 */ lw $a0, 0x0050($sp) -/* 016B4 808FE5F4 0C029490 */ jal func_800A5240 +/* 016B0 808FE5F0 8FA40050 */ lw $a0, 0x0050($sp) +/* 016B4 808FE5F4 0C029490 */ jal SkelAnime_ChangeAnimTransitionStop /* 016B8 808FE5F8 24060000 */ addiu $a2, $zero, 0x0000 ## $a2 = 00000000 /* 016BC 808FE5FC 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 /* 016C0 808FE600 0C028800 */ jal SkelAnime_GetFrameCount - + /* 016C4 808FE604 24843754 */ addiu $a0, $a0, 0x3754 ## $a0 = 06003754 /* 016C8 808FE608 44824000 */ mtc1 $v0, $f8 ## $f8 = 0.00 /* 016CC 808FE60C 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 /* 016D0 808FE610 44812000 */ mtc1 $at, $f4 ## $f4 = 1.00 -/* 016D4 808FE614 468042A0 */ cvt.s.w $f10, $f8 +/* 016D4 808FE614 468042A0 */ cvt.s.w $f10, $f8 /* 016D8 808FE618 240E0037 */ addiu $t6, $zero, 0x0037 ## $t6 = 00000037 /* 016DC 808FE61C 3C010001 */ lui $at, 0x0001 ## $at = 00010000 /* 016E0 808FE620 A20E0339 */ sb $t6, 0x0339($s0) ## 00000339 -/* 016E4 808FE624 00310821 */ addu $at, $at, $s1 +/* 016E4 808FE624 00310821 */ addu $at, $at, $s1 /* 016E8 808FE628 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 016EC 808FE62C E60A0194 */ swc1 $f10, 0x0194($s0) ## 00000194 /* 016F0 808FE630 240539D3 */ addiu $a1, $zero, 0x39D3 ## $a1 = 000039D3 /* 016F4 808FE634 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 016F8 808FE638 E4240AFC */ swc1 $f4, 0x0AFC($at) ## 00010AFC glabel L808FE63C /* 016FC 808FE63C 260F014C */ addiu $t7, $s0, 0x014C ## $t7 = 0000014C /* 01700 808FE640 261803B4 */ addiu $t8, $s0, 0x03B4 ## $t8 = 000003B4 -/* 01704 808FE644 AFB80048 */ sw $t8, 0x0048($sp) -/* 01708 808FE648 AFAF0050 */ sw $t7, 0x0050($sp) +/* 01704 808FE644 AFB80048 */ sw $t8, 0x0048($sp) +/* 01708 808FE648 AFAF0050 */ sw $t7, 0x0050($sp) /* 0170C 808FE64C 8E190398 */ lw $t9, 0x0398($s0) ## 00000398 /* 01710 808FE650 240B0037 */ addiu $t3, $zero, 0x0037 ## $t3 = 00000037 -/* 01714 808FE654 2F210019 */ sltiu $at, $t9, 0x0019 -/* 01718 808FE658 50200004 */ beql $at, $zero, .L808FE66C +/* 01714 808FE654 2F210019 */ sltiu $at, $t9, 0x0019 +/* 01718 808FE658 50200004 */ beql $at, $zero, .L808FE66C /* 0171C 808FE65C 3C0142C8 */ lui $at, 0x42C8 ## $at = 42C80000 -/* 01720 808FE660 10000019 */ beq $zero, $zero, .L808FE6C8 +/* 01720 808FE660 10000019 */ beq $zero, $zero, .L808FE6C8 /* 01724 808FE664 A20B0339 */ sb $t3, 0x0339($s0) ## 00000339 /* 01728 808FE668 3C0142C8 */ lui $at, 0x42C8 ## $at = 42C80000 .L808FE66C: @@ -1123,27 +1123,27 @@ glabel L808FE63C /* 01730 808FE670 C6080194 */ lwc1 $f8, 0x0194($s0) ## 00000194 /* 01734 808FE674 240C0006 */ addiu $t4, $zero, 0x0006 ## $t4 = 00000006 /* 01738 808FE678 A20C0339 */ sb $t4, 0x0339($s0) ## 00000339 -/* 0173C 808FE67C 4608303C */ c.lt.s $f6, $f8 +/* 0173C 808FE67C 4608303C */ c.lt.s $f6, $f8 /* 01740 808FE680 2604030C */ addiu $a0, $s0, 0x030C ## $a0 = 0000030C /* 01744 808FE684 3C0540E0 */ lui $a1, 0x40E0 ## $a1 = 40E00000 /* 01748 808FE688 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 0174C 808FE68C 4500000C */ bc1f .L808FE6C0 +/* 0174C 808FE68C 4500000C */ bc1f .L808FE6C0 /* 01750 808FE690 3C073E4C */ lui $a3, 0x3E4C ## $a3 = 3E4C0000 /* 01754 808FE694 3C014000 */ lui $at, 0x4000 ## $at = 40000000 /* 01758 808FE698 44810000 */ mtc1 $at, $f0 ## $f0 = 2.00 /* 0175C 808FE69C 3C014170 */ lui $at, 0x4170 ## $at = 41700000 /* 01760 808FE6A0 44817000 */ mtc1 $at, $f14 ## $f14 = 15.00 -/* 01764 808FE6A4 44070000 */ mfc1 $a3, $f0 +/* 01764 808FE6A4 44070000 */ mfc1 $a3, $f0 /* 01768 808FE6A8 2604030C */ addiu $a0, $s0, 0x030C ## $a0 = 0000030C -/* 0176C 808FE6AC 44057000 */ mfc1 $a1, $f14 +/* 0176C 808FE6AC 44057000 */ mfc1 $a1, $f14 /* 01770 808FE6B0 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 01774 808FE6B4 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 01778 808FE6B8 10000004 */ beq $zero, $zero, .L808FE6CC +/* 01778 808FE6B8 10000004 */ beq $zero, $zero, .L808FE6CC /* 0177C 808FE6BC 44805000 */ mtc1 $zero, $f10 ## $f10 = 0.00 .L808FE6C0: /* 01780 808FE6C0 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 01784 808FE6C4 34E7CCCD */ ori $a3, $a3, 0xCCCD ## $a3 = 0000CCCD .L808FE6C8: /* 01788 808FE6C8 44805000 */ mtc1 $zero, $f10 ## $f10 = 0.00 @@ -1151,16 +1151,16 @@ glabel L808FE63C /* 0178C 808FE6CC 00000000 */ nop /* 01790 808FE6D0 E60A01B4 */ swc1 $f10, 0x01B4($s0) ## 000001B4 /* 01794 808FE6D4 0C02927F */ jal SkelAnime_FrameUpdateMatrix - -/* 01798 808FE6D8 8FA40050 */ lw $a0, 0x0050($sp) -/* 0179C 808FE6DC 8FA40050 */ lw $a0, 0x0050($sp) -/* 017A0 808FE6E0 0C0295B2 */ jal func_800A56C8 + +/* 01798 808FE6D8 8FA40050 */ lw $a0, 0x0050($sp) +/* 0179C 808FE6DC 8FA40050 */ lw $a0, 0x0050($sp) +/* 017A0 808FE6E0 0C0295B2 */ jal func_800A56C8 /* 017A4 808FE6E4 8E050194 */ lw $a1, 0x0194($s0) ## 00000194 -/* 017A8 808FE6E8 10400009 */ beq $v0, $zero, .L808FE710 -/* 017AC 808FE6EC 8FA40050 */ lw $a0, 0x0050($sp) +/* 017A8 808FE6E8 10400009 */ beq $v0, $zero, .L808FE710 +/* 017AC 808FE6EC 8FA40050 */ lw $a0, 0x0050($sp) /* 017B0 808FE6F0 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 017B4 808FE6F4 24A528A8 */ addiu $a1, $a1, 0x28A8 ## $a1 = 060028A8 -/* 017B8 808FE6F8 0C029490 */ jal func_800A5240 +/* 017B8 808FE6F8 0C029490 */ jal SkelAnime_ChangeAnimTransitionStop /* 017BC 808FE6FC 24060000 */ addiu $a2, $zero, 0x0000 ## $a2 = 00000000 /* 017C0 808FE700 3C01447A */ lui $at, 0x447A ## $at = 447A0000 /* 017C4 808FE704 44812000 */ mtc1 $at, $f4 ## $f4 = 1000.00 @@ -1172,73 +1172,73 @@ glabel L808FE63C /* 017D8 808FE718 C6060024 */ lwc1 $f6, 0x0024($s0) ## 00000024 /* 017DC 808FE71C 3C0142B4 */ lui $at, 0x42B4 ## $at = 42B40000 /* 017E0 808FE720 44812000 */ mtc1 $at, $f4 ## $f4 = 90.00 -/* 017E4 808FE724 46083280 */ add.s $f10, $f6, $f8 +/* 017E4 808FE724 46083280 */ add.s $f10, $f6, $f8 /* 017E8 808FE728 260403A4 */ addiu $a0, $s0, 0x03A4 ## $a0 = 000003A4 /* 017EC 808FE72C 3C063DCC */ lui $a2, 0x3DCC ## $a2 = 3DCC0000 /* 017F0 808FE730 3C0740CC */ lui $a3, 0x40CC ## $a3 = 40CC0000 -/* 017F4 808FE734 46045181 */ sub.s $f6, $f10, $f4 +/* 017F4 808FE734 46045181 */ sub.s $f6, $f10, $f4 /* 017F8 808FE738 34E7CCCC */ ori $a3, $a3, 0xCCCC ## $a3 = 40CCCCCC /* 017FC 808FE73C 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3DCCCCCD -/* 01800 808FE740 AFA4004C */ sw $a0, 0x004C($sp) -/* 01804 808FE744 44053000 */ mfc1 $a1, $f6 +/* 01800 808FE740 AFA4004C */ sw $a0, 0x004C($sp) +/* 01804 808FE744 44053000 */ mfc1 $a1, $f6 /* 01808 808FE748 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 0180C 808FE74C 00000000 */ nop /* 01810 808FE750 3C014270 */ lui $at, 0x4270 ## $at = 42700000 /* 01814 808FE754 44815000 */ mtc1 $at, $f10 ## $f10 = 60.00 /* 01818 808FE758 C6080028 */ lwc1 $f8, 0x0028($s0) ## 00000028 /* 0181C 808FE75C 44813000 */ mtc1 $at, $f6 ## $f6 = 60.00 /* 01820 808FE760 3C01428C */ lui $at, 0x428C ## $at = 428C0000 -/* 01824 808FE764 460A4100 */ add.s $f4, $f8, $f10 +/* 01824 808FE764 460A4100 */ add.s $f4, $f8, $f10 /* 01828 808FE768 44815000 */ mtc1 $at, $f10 ## $f10 = 70.00 /* 0182C 808FE76C 3C063DCC */ lui $a2, 0x3DCC ## $a2 = 3DCC0000 /* 01830 808FE770 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3DCCCCCD -/* 01834 808FE774 46062201 */ sub.s $f8, $f4, $f6 +/* 01834 808FE774 46062201 */ sub.s $f8, $f4, $f6 /* 01838 808FE778 260403A8 */ addiu $a0, $s0, 0x03A8 ## $a0 = 000003A8 /* 0183C 808FE77C 3C074150 */ lui $a3, 0x4150 ## $a3 = 41500000 -/* 01840 808FE780 460A4101 */ sub.s $f4, $f8, $f10 -/* 01844 808FE784 44052000 */ mfc1 $a1, $f4 +/* 01840 808FE780 460A4101 */ sub.s $f4, $f8, $f10 +/* 01844 808FE784 44052000 */ mfc1 $a1, $f4 /* 01848 808FE788 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 0184C 808FE78C 00000000 */ nop /* 01850 808FE790 3C014220 */ lui $at, 0x4220 ## $at = 42200000 /* 01854 808FE794 44816000 */ mtc1 $at, $f12 ## $f12 = 40.00 /* 01858 808FE798 C6060028 */ lwc1 $f6, 0x0028($s0) ## 00000028 /* 0185C 808FE79C 3C063DCC */ lui $a2, 0x3DCC ## $a2 = 3DCC0000 /* 01860 808FE7A0 3C07406C */ lui $a3, 0x406C ## $a3 = 406C0000 -/* 01864 808FE7A4 460C3200 */ add.s $f8, $f6, $f12 +/* 01864 808FE7A4 460C3200 */ add.s $f8, $f6, $f12 /* 01868 808FE7A8 34E7CCCC */ ori $a3, $a3, 0xCCCC ## $a3 = 406CCCCC /* 0186C 808FE7AC 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3DCCCCCD -/* 01870 808FE7B0 8FA40048 */ lw $a0, 0x0048($sp) -/* 01874 808FE7B4 44054000 */ mfc1 $a1, $f8 +/* 01870 808FE7B0 8FA40048 */ lw $a0, 0x0048($sp) +/* 01874 808FE7B4 44054000 */ mfc1 $a1, $f8 /* 01878 808FE7B8 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 0187C 808FE7BC 00000000 */ nop /* 01880 808FE7C0 8E030398 */ lw $v1, 0x0398($s0) ## 00000398 /* 01884 808FE7C4 2401001E */ addiu $at, $zero, 0x001E ## $at = 0000001E /* 01888 808FE7C8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0188C 808FE7CC 54610008 */ bnel $v1, $at, .L808FE7F0 -/* 01890 808FE7D0 2C610033 */ sltiu $at, $v1, 0x0033 +/* 0188C 808FE7CC 54610008 */ bnel $v1, $at, .L808FE7F0 +/* 01890 808FE7D0 2C610033 */ sltiu $at, $v1, 0x0033 /* 01894 808FE7D4 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 01898 808FE7D8 240539D4 */ addiu $a1, $zero, 0x39D4 ## $a1 = 000039D4 /* 0189C 808FE7DC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 018A0 808FE7E0 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 018A4 808FE7E4 2405396D */ addiu $a1, $zero, 0x396D ## $a1 = 0000396D /* 018A8 808FE7E8 8E030398 */ lw $v1, 0x0398($s0) ## 00000398 -/* 018AC 808FE7EC 2C610033 */ sltiu $at, $v1, 0x0033 +/* 018AC 808FE7EC 2C610033 */ sltiu $at, $v1, 0x0033 .L808FE7F0: -/* 018B0 808FE7F0 10200002 */ beq $at, $zero, .L808FE7FC +/* 018B0 808FE7F0 10200002 */ beq $at, $zero, .L808FE7FC /* 018B4 808FE7F4 240D0001 */ addiu $t5, $zero, 0x0001 ## $t5 = 00000001 -/* 018B8 808FE7F8 A3AD008D */ sb $t5, 0x008D($sp) +/* 018B8 808FE7F8 A3AD008D */ sb $t5, 0x008D($sp) .L808FE7FC: -/* 018BC 808FE7FC 2C61003C */ sltiu $at, $v1, 0x003C -/* 018C0 808FE800 14200403 */ bne $at, $zero, .L808FF810 +/* 018BC 808FE7FC 2C61003C */ sltiu $at, $v1, 0x003C +/* 018C0 808FE800 14200403 */ bne $at, $zero, .L808FF810 /* 018C4 808FE804 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 018C8 808FE808 0C030129 */ jal func_800C04A4 +/* 018C8 808FE808 0C030129 */ jal func_800C04A4 /* 018CC 808FE80C 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 018D0 808FE810 8FA3004C */ lw $v1, 0x004C($sp) +/* 018D0 808FE810 8FA3004C */ lw $v1, 0x004C($sp) /* 018D4 808FE814 240D0011 */ addiu $t5, $zero, 0x0011 ## $t5 = 00000011 /* 018D8 808FE818 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 018DC 808FE81C 8C6F0000 */ lw $t7, 0x0000($v1) ## 00000000 @@ -1265,41 +1265,41 @@ glabel L808FE63C /* 01930 808FE870 AC4C0058 */ sw $t4, 0x0058($v0) ## 00000058 /* 01934 808FE874 A60D039C */ sh $t5, 0x039C($s0) ## 0000039C /* 01938 808FE878 AE000398 */ sw $zero, 0x0398($s0) ## 00000398 -/* 0193C 808FE87C 0C23F442 */ jal func_808FD108 +/* 0193C 808FE87C 0C23F442 */ jal func_808FD108 /* 01940 808FE880 A20E0337 */ sb $t6, 0x0337($s0) ## 00000337 -/* 01944 808FE884 8FA40050 */ lw $a0, 0x0050($sp) -/* 01948 808FE888 0C0295BC */ jal func_800A56F0 +/* 01944 808FE884 8FA40050 */ lw $a0, 0x0050($sp) +/* 01948 808FE888 0C0295BC */ jal SkelAnime_Free /* 0194C 808FE88C 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 /* 01950 808FE890 3C060602 */ lui $a2, 0x0602 ## $a2 = 06020000 /* 01954 808FE894 24C65970 */ addiu $a2, $a2, 0x5970 ## $a2 = 06025970 /* 01958 808FE898 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 0195C 808FE89C 8FA50050 */ lw $a1, 0x0050($sp) +/* 0195C 808FE89C 8FA50050 */ lw $a1, 0x0050($sp) /* 01960 808FE8A0 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 01964 808FE8A4 AFA00010 */ sw $zero, 0x0010($sp) -/* 01968 808FE8A8 AFA00014 */ sw $zero, 0x0014($sp) -/* 0196C 808FE8AC 0C0291BE */ jal func_800A46F8 -/* 01970 808FE8B0 AFA00018 */ sw $zero, 0x0018($sp) +/* 01964 808FE8A4 AFA00010 */ sw $zero, 0x0010($sp) +/* 01968 808FE8A8 AFA00014 */ sw $zero, 0x0014($sp) +/* 0196C 808FE8AC 0C0291BE */ jal SkelAnime_InitSV +/* 01970 808FE8B0 AFA00018 */ sw $zero, 0x0018($sp) /* 01974 808FE8B4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 01978 808FE8B8 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 /* 0197C 808FE8BC 2406017E */ addiu $a2, $zero, 0x017E ## $a2 = 0000017E -/* 01980 808FE8C0 0C23F442 */ jal func_808FD108 +/* 01980 808FE8C0 0C23F442 */ jal func_808FD108 /* 01984 808FE8C4 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 /* 01988 808FE8C8 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 0198C 808FE8CC 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 01990 808FE8D0 0C00B7D5 */ jal func_8002DF54 +/* 01990 808FE8D0 0C00B7D5 */ jal func_8002DF54 /* 01994 808FE8D4 24060054 */ addiu $a2, $zero, 0x0054 ## $a2 = 00000054 /* 01998 808FE8D8 240F0003 */ addiu $t7, $zero, 0x0003 ## $t7 = 00000003 -/* 0199C 808FE8DC 100003CC */ beq $zero, $zero, .L808FF810 +/* 0199C 808FE8DC 100003CC */ beq $zero, $zero, .L808FF810 /* 019A0 808FE8E0 A20F0314 */ sb $t7, 0x0314($s0) ## 00000314 glabel L808FE8E4 /* 019A4 808FE8E4 24180006 */ addiu $t8, $zero, 0x0006 ## $t8 = 00000006 /* 019A8 808FE8E8 A2180339 */ sb $t8, 0x0339($s0) ## 00000339 /* 019AC 808FE8EC 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C -/* 019B0 808FE8F0 AFA40050 */ sw $a0, 0x0050($sp) +/* 019B0 808FE8F0 AFA40050 */ sw $a0, 0x0050($sp) /* 019B4 808FE8F4 0C02927F */ jal SkelAnime_FrameUpdateMatrix - -/* 019B8 808FE8F8 AFA90088 */ sw $t1, 0x0088($sp) -/* 019BC 808FE8FC 8FA90088 */ lw $t1, 0x0088($sp) + +/* 019B8 808FE8F8 AFA90088 */ sw $t1, 0x0088($sp) +/* 019BC 808FE8FC 8FA90088 */ lw $t1, 0x0088($sp) /* 019C0 808FE900 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 /* 019C4 808FE904 44811000 */ mtc1 $at, $f2 ## $f2 = 20.00 /* 019C8 808FE908 3C014220 */ lui $at, 0x4220 ## $at = 42200000 @@ -1307,7 +1307,7 @@ glabel L808FE8E4 /* 019D0 808FE910 C52A0024 */ lwc1 $f10, 0x0024($t1) ## 00000024 /* 019D4 808FE914 3C014120 */ lui $at, 0x4120 ## $at = 41200000 /* 019D8 808FE918 44817000 */ mtc1 $at, $f14 ## $f14 = 10.00 -/* 019DC 808FE91C 460C5101 */ sub.s $f4, $f10, $f12 +/* 019DC 808FE91C 460C5101 */ sub.s $f4, $f10, $f12 /* 019E0 808FE920 3C0141F0 */ lui $at, 0x41F0 ## $at = 41F00000 /* 019E4 808FE924 44818000 */ mtc1 $at, $f16 ## $f16 = 30.00 /* 019E8 808FE928 3C014270 */ lui $at, 0x4270 ## $at = 42700000 @@ -1315,30 +1315,30 @@ glabel L808FE8E4 /* 019F0 808FE930 C5260028 */ lwc1 $f6, 0x0028($t1) ## 00000028 /* 019F4 808FE934 8E190398 */ lw $t9, 0x0398($s0) ## 00000398 /* 019F8 808FE938 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 -/* 019FC 808FE93C 460C3200 */ add.s $f8, $f6, $f12 +/* 019FC 808FE93C 460C3200 */ add.s $f8, $f6, $f12 /* 01A00 808FE940 240B0012 */ addiu $t3, $zero, 0x0012 ## $t3 = 00000012 /* 01A04 808FE944 24A50380 */ addiu $a1, $a1, 0x0380 ## $a1 = 06010380 /* 01A08 808FE948 24060000 */ addiu $a2, $zero, 0x0000 ## $a2 = 00000000 /* 01A0C 808FE94C E60803A8 */ swc1 $f8, 0x03A8($s0) ## 000003A8 /* 01A10 808FE950 C52A002C */ lwc1 $f10, 0x002C($t1) ## 0000002C -/* 01A14 808FE954 46025100 */ add.s $f4, $f10, $f2 +/* 01A14 808FE954 46025100 */ add.s $f4, $f10, $f2 /* 01A18 808FE958 E60403AC */ swc1 $f4, 0x03AC($s0) ## 000003AC /* 01A1C 808FE95C C5260024 */ lwc1 $f6, 0x0024($t1) ## 00000024 /* 01A20 808FE960 44812000 */ mtc1 $at, $f4 ## $f4 = 60.00 /* 01A24 808FE964 24010019 */ addiu $at, $zero, 0x0019 ## $at = 00000019 /* 01A28 808FE968 E60603B0 */ swc1 $f6, 0x03B0($s0) ## 000003B0 /* 01A2C 808FE96C C5280028 */ lwc1 $f8, 0x0028($t1) ## 00000028 -/* 01A30 808FE970 460E4280 */ add.s $f10, $f8, $f14 -/* 01A34 808FE974 46045180 */ add.s $f6, $f10, $f4 -/* 01A38 808FE978 46103201 */ sub.s $f8, $f6, $f16 +/* 01A30 808FE970 460E4280 */ add.s $f10, $f8, $f14 +/* 01A34 808FE974 46045180 */ add.s $f6, $f10, $f4 +/* 01A38 808FE978 46103201 */ sub.s $f8, $f6, $f16 /* 01A3C 808FE97C E60803B4 */ swc1 $f8, 0x03B4($s0) ## 000003B4 /* 01A40 808FE980 C52A002C */ lwc1 $f10, 0x002C($t1) ## 0000002C -/* 01A44 808FE984 172103A2 */ bne $t9, $at, .L808FF810 +/* 01A44 808FE984 172103A2 */ bne $t9, $at, .L808FF810 /* 01A48 808FE988 E60A03B8 */ swc1 $f10, 0x03B8($s0) ## 000003B8 /* 01A4C 808FE98C A60B039C */ sh $t3, 0x039C($s0) ## 0000039C /* 01A50 808FE990 AE000398 */ sw $zero, 0x0398($s0) ## 00000398 -/* 01A54 808FE994 0C029490 */ jal func_800A5240 -/* 01A58 808FE998 8FA40050 */ lw $a0, 0x0050($sp) +/* 01A54 808FE994 0C029490 */ jal SkelAnime_ChangeAnimTransitionStop +/* 01A58 808FE998 8FA40050 */ lw $a0, 0x0050($sp) /* 01A5C 808FE99C 3C014248 */ lui $at, 0x4248 ## $at = 42480000 /* 01A60 808FE9A0 44818000 */ mtc1 $at, $f16 ## $f16 = 50.00 /* 01A64 808FE9A4 3C0143FA */ lui $at, 0x43FA ## $at = 43FA0000 @@ -1346,34 +1346,34 @@ glabel L808FE8E4 /* 01A6C 808FE9AC C6000024 */ lwc1 $f0, 0x0024($s0) ## 00000024 /* 01A70 808FE9B0 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 /* 01A74 808FE9B4 3C0143AF */ lui $at, 0x43AF ## $at = 43AF0000 -/* 01A78 808FE9B8 46060200 */ add.s $f8, $f0, $f6 +/* 01A78 808FE9B8 46060200 */ add.s $f8, $f0, $f6 /* 01A7C 808FE9BC 44815000 */ mtc1 $at, $f10 ## $f10 = 350.00 /* 01A80 808FE9C0 E6040168 */ swc1 $f4, 0x0168($s0) ## 00000168 /* 01A84 808FE9C4 3C014270 */ lui $at, 0x4270 ## $at = 42700000 -/* 01A88 808FE9C8 460A4101 */ sub.s $f4, $f8, $f10 +/* 01A88 808FE9C8 460A4101 */ sub.s $f4, $f8, $f10 /* 01A8C 808FE9CC C60C0028 */ lwc1 $f12, 0x0028($s0) ## 00000028 /* 01A90 808FE9D0 44815000 */ mtc1 $at, $f10 ## $f10 = 60.00 -/* 01A94 808FE9D4 46100200 */ add.s $f8, $f0, $f16 +/* 01A94 808FE9D4 46100200 */ add.s $f8, $f0, $f16 /* 01A98 808FE9D8 C602002C */ lwc1 $f2, 0x002C($s0) ## 0000002C /* 01A9C 808FE9DC 240C4000 */ addiu $t4, $zero, 0x4000 ## $t4 = 00004000 -/* 01AA0 808FE9E0 46102181 */ sub.s $f6, $f4, $f16 +/* 01AA0 808FE9E0 46102181 */ sub.s $f6, $f4, $f16 /* 01AA4 808FE9E4 E60803B0 */ swc1 $f8, 0x03B0($s0) ## 000003B0 /* 01AA8 808FE9E8 A60C0032 */ sh $t4, 0x0032($s0) ## 00000032 -/* 01AAC 808FE9EC 460A6100 */ add.s $f4, $f12, $f10 +/* 01AAC 808FE9EC 460A6100 */ add.s $f4, $f12, $f10 /* 01AB0 808FE9F0 E60603A4 */ swc1 $f6, 0x03A4($s0) ## 000003A4 /* 01AB4 808FE9F4 E60C03A8 */ swc1 $f12, 0x03A8($s0) ## 000003A8 /* 01AB8 808FE9F8 E60203AC */ swc1 $f2, 0x03AC($s0) ## 000003AC /* 01ABC 808FE9FC E60403B4 */ swc1 $f4, 0x03B4($s0) ## 000003B4 -/* 01AC0 808FEA00 10000383 */ beq $zero, $zero, .L808FF810 +/* 01AC0 808FEA00 10000383 */ beq $zero, $zero, .L808FF810 /* 01AC4 808FEA04 E60203B8 */ swc1 $f2, 0x03B8($s0) ## 000003B8 glabel L808FEA08 /* 01AC8 808FEA08 8E0E0398 */ lw $t6, 0x0398($s0) ## 00000398 /* 01ACC 808FEA0C 240D0006 */ addiu $t5, $zero, 0x0006 ## $t5 = 00000006 /* 01AD0 808FEA10 2401001E */ addiu $at, $zero, 0x001E ## $at = 0000001E -/* 01AD4 808FEA14 15C10003 */ bne $t6, $at, .L808FEA24 +/* 01AD4 808FEA14 15C10003 */ bne $t6, $at, .L808FEA24 /* 01AD8 808FEA18 A20D0339 */ sb $t5, 0x0339($s0) ## 00000339 /* 01ADC 808FEA1C 0C03E803 */ jal Audio_SetBGM - + /* 01AE0 808FEA20 24040065 */ addiu $a0, $zero, 0x0065 ## $a0 = 00000065 .L808FEA24: /* 01AE4 808FEA24 3C073DCC */ lui $a3, 0x3DCC ## $a3 = 3DCC0000 @@ -1381,29 +1381,29 @@ glabel L808FEA08 /* 01AEC 808FEA2C 2604030C */ addiu $a0, $s0, 0x030C ## $a0 = 0000030C /* 01AF0 808FEA30 3C0540E0 */ lui $a1, 0x40E0 ## $a1 = 40E00000 /* 01AF4 808FEA34 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 01AF8 808FEA38 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 01AFC 808FEA3C 3C0143FA */ lui $at, 0x43FA ## $at = 43FA0000 /* 01B00 808FEA40 44814000 */ mtc1 $at, $f8 ## $f8 = 500.00 /* 01B04 808FEA44 C6060024 */ lwc1 $f6, 0x0024($s0) ## 00000024 /* 01B08 808FEA48 3C0143AF */ lui $at, 0x43AF ## $at = 43AF0000 /* 01B0C 808FEA4C 44812000 */ mtc1 $at, $f4 ## $f4 = 350.00 -/* 01B10 808FEA50 46083280 */ add.s $f10, $f6, $f8 +/* 01B10 808FEA50 46083280 */ add.s $f10, $f6, $f8 /* 01B14 808FEA54 3C063DCC */ lui $a2, 0x3DCC ## $a2 = 3DCC0000 /* 01B18 808FEA58 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3DCCCCCD /* 01B1C 808FEA5C 260403A4 */ addiu $a0, $s0, 0x03A4 ## $a0 = 000003A4 -/* 01B20 808FEA60 46045181 */ sub.s $f6, $f10, $f4 +/* 01B20 808FEA60 46045181 */ sub.s $f6, $f10, $f4 /* 01B24 808FEA64 3C073F80 */ lui $a3, 0x3F80 ## $a3 = 3F800000 -/* 01B28 808FEA68 44053000 */ mfc1 $a1, $f6 +/* 01B28 808FEA68 44053000 */ mfc1 $a1, $f6 /* 01B2C 808FEA6C 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 01B30 808FEA70 00000000 */ nop /* 01B34 808FEA74 3C063DCC */ lui $a2, 0x3DCC ## $a2 = 3DCC0000 /* 01B38 808FEA78 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3DCCCCCD /* 01B3C 808FEA7C 260403B0 */ addiu $a0, $s0, 0x03B0 ## $a0 = 000003B0 /* 01B40 808FEA80 8E050024 */ lw $a1, 0x0024($s0) ## 00000024 /* 01B44 808FEA84 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 01B48 808FEA88 3C073F80 */ lui $a3, 0x3F80 ## $a3 = 3F800000 /* 01B4C 808FEA8C 3C063DCC */ lui $a2, 0x3DCC ## $a2 = 3DCC0000 /* 01B50 808FEA90 3C073CA3 */ lui $a3, 0x3CA3 ## $a3 = 3CA30000 @@ -1411,15 +1411,15 @@ glabel L808FEA08 /* 01B58 808FEA98 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3DCCCCCD /* 01B5C 808FEA9C 26040228 */ addiu $a0, $s0, 0x0228 ## $a0 = 00000228 /* 01B60 808FEAA0 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 01B64 808FEAA4 3C053F80 */ lui $a1, 0x3F80 ## $a1 = 3F800000 /* 01B68 808FEAA8 8E0F0398 */ lw $t7, 0x0398($s0) ## 00000398 /* 01B6C 808FEAAC 24010041 */ addiu $at, $zero, 0x0041 ## $at = 00000041 /* 01B70 808FEAB0 24180013 */ addiu $t8, $zero, 0x0013 ## $t8 = 00000013 -/* 01B74 808FEAB4 55E10357 */ bnel $t7, $at, .L808FF814 +/* 01B74 808FEAB4 55E10357 */ bnel $t7, $at, .L808FF814 /* 01B78 808FEAB8 3C014080 */ lui $at, 0x4080 ## $at = 40800000 /* 01B7C 808FEABC A618039C */ sh $t8, 0x039C($s0) ## 0000039C -/* 01B80 808FEAC0 10000353 */ beq $zero, $zero, .L808FF810 +/* 01B80 808FEAC0 10000353 */ beq $zero, $zero, .L808FF810 /* 01B84 808FEAC4 AE000398 */ sw $zero, 0x0398($s0) ## 00000398 glabel L808FEAC8 /* 01B88 808FEAC8 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 @@ -1427,51 +1427,51 @@ glabel L808FEAC8 /* 01B90 808FEAD0 C6080394 */ lwc1 $f8, 0x0394($s0) ## 00000394 /* 01B94 808FEAD4 C6000060 */ lwc1 $f0, 0x0060($s0) ## 00000060 /* 01B98 808FEAD8 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 01B9C 808FEADC 460A4100 */ add.s $f4, $f8, $f10 +/* 01B9C 808FEADC 460A4100 */ add.s $f4, $f8, $f10 /* 01BA0 808FEAE0 C6060028 */ lwc1 $f6, 0x0028($s0) ## 00000028 /* 01BA4 808FEAE4 44815000 */ mtc1 $at, $f10 ## $f10 = 1.00 /* 01BA8 808FEAE8 8E0B0398 */ lw $t3, 0x0398($s0) ## 00000398 /* 01BAC 808FEAEC E6040394 */ swc1 $f4, 0x0394($s0) ## 00000394 -/* 01BB0 808FEAF0 46003200 */ add.s $f8, $f6, $f0 +/* 01BB0 808FEAF0 46003200 */ add.s $f8, $f6, $f0 /* 01BB4 808FEAF4 24190006 */ addiu $t9, $zero, 0x0006 ## $t9 = 00000006 /* 01BB8 808FEAF8 2401000A */ addiu $at, $zero, 0x000A ## $at = 0000000A -/* 01BBC 808FEAFC 460A0101 */ sub.s $f4, $f0, $f10 +/* 01BBC 808FEAFC 460A0101 */ sub.s $f4, $f0, $f10 /* 01BC0 808FEB00 A2190339 */ sb $t9, 0x0339($s0) ## 00000339 /* 01BC4 808FEB04 E6080028 */ swc1 $f8, 0x0028($s0) ## 00000028 -/* 01BC8 808FEB08 15610341 */ bne $t3, $at, .L808FF810 +/* 01BC8 808FEB08 15610341 */ bne $t3, $at, .L808FF810 /* 01BCC 808FEB0C E6040060 */ swc1 $f4, 0x0060($s0) ## 00000060 /* 01BD0 808FEB10 3C01437A */ lui $at, 0x437A ## $at = 437A0000 /* 01BD4 808FEB14 44814000 */ mtc1 $at, $f8 ## $f8 = 250.00 /* 01BD8 808FEB18 C6060024 */ lwc1 $f6, 0x0024($s0) ## 00000024 /* 01BDC 808FEB1C 240C0014 */ addiu $t4, $zero, 0x0014 ## $t4 = 00000014 /* 01BE0 808FEB20 A60C039C */ sh $t4, 0x039C($s0) ## 0000039C -/* 01BE4 808FEB24 46083280 */ add.s $f10, $f6, $f8 +/* 01BE4 808FEB24 46083280 */ add.s $f10, $f6, $f8 /* 01BE8 808FEB28 AE000398 */ sw $zero, 0x0398($s0) ## 00000398 /* 01BEC 808FEB2C 3C018091 */ lui $at, %hi(D_8090DB8C) ## $at = 80910000 /* 01BF0 808FEB30 44803000 */ mtc1 $zero, $f6 ## $f6 = 0.00 /* 01BF4 808FEB34 E60A0024 */ swc1 $f10, 0x0024($s0) ## 00000024 -/* 01BF8 808FEB38 C424DB8C */ lwc1 $f4, %lo(D_8090DB8C)($at) +/* 01BF8 808FEB38 C424DB8C */ lwc1 $f4, %lo(D_8090DB8C)($at) /* 01BFC 808FEB3C 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 01C00 808FEB40 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 01C04 808FEB44 24060053 */ addiu $a2, $zero, 0x0053 ## $a2 = 00000053 /* 01C08 808FEB48 E6060394 */ swc1 $f6, 0x0394($s0) ## 00000394 -/* 01C0C 808FEB4C 0C00B7D5 */ jal func_8002DF54 +/* 01C0C 808FEB4C 0C00B7D5 */ jal func_8002DF54 /* 01C10 808FEB50 E6040028 */ swc1 $f4, 0x0028($s0) ## 00000028 /* 01C14 808FEB54 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 /* 01C18 808FEB58 44814000 */ mtc1 $at, $f8 ## $f8 = 5.00 /* 01C1C 808FEB5C 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 /* 01C20 808FEB60 44815000 */ mtc1 $at, $f10 ## $f10 = 1.00 /* 01C24 808FEB64 E608030C */ swc1 $f8, 0x030C($s0) ## 0000030C -/* 01C28 808FEB68 10000329 */ beq $zero, $zero, .L808FF810 +/* 01C28 808FEB68 10000329 */ beq $zero, $zero, .L808FF810 /* 01C2C 808FEB6C E60A0228 */ swc1 $f10, 0x0228($s0) ## 00000228 glabel L808FEB70 /* 01C30 808FEB70 240D0006 */ addiu $t5, $zero, 0x0006 ## $t5 = 00000006 /* 01C34 808FEB74 A20D0339 */ sb $t5, 0x0339($s0) ## 00000339 /* 01C38 808FEB78 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C -/* 01C3C 808FEB7C AFA40050 */ sw $a0, 0x0050($sp) +/* 01C3C 808FEB7C AFA40050 */ sw $a0, 0x0050($sp) /* 01C40 808FEB80 0C02927F */ jal SkelAnime_FrameUpdateMatrix - -/* 01C44 808FEB84 AFA90088 */ sw $t1, 0x0088($sp) + +/* 01C44 808FEB84 AFA90088 */ sw $t1, 0x0088($sp) /* 01C48 808FEB88 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 /* 01C4C 808FEB8C 44811000 */ mtc1 $at, $f2 ## $f2 = 20.00 /* 01C50 808FEB90 3C014220 */ lui $at, 0x4220 ## $at = 42200000 @@ -1486,58 +1486,58 @@ glabel L808FEB70 /* 01C74 808FEBB4 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 /* 01C78 808FEBB8 C6040028 */ lwc1 $f4, 0x0028($s0) ## 00000028 /* 01C7C 808FEBBC 44814000 */ mtc1 $at, $f8 ## $f8 = 1.00 -/* 01C80 808FEBC0 8FA90088 */ lw $t1, 0x0088($sp) -/* 01C84 808FEBC4 46002180 */ add.s $f6, $f4, $f0 +/* 01C80 808FEBC0 8FA90088 */ lw $t1, 0x0088($sp) +/* 01C84 808FEBC4 46002180 */ add.s $f6, $f4, $f0 /* 01C88 808FEBC8 3C018091 */ lui $at, %hi(D_8090DB90) ## $at = 80910000 /* 01C8C 808FEBCC 240EC000 */ addiu $t6, $zero, 0xC000 ## $t6 = FFFFC000 -/* 01C90 808FEBD0 46080281 */ sub.s $f10, $f0, $f8 +/* 01C90 808FEBD0 46080281 */ sub.s $f10, $f0, $f8 /* 01C94 808FEBD4 E6060028 */ swc1 $f6, 0x0028($s0) ## 00000028 /* 01C98 808FEBD8 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 -/* 01C9C 808FEBDC 460C9201 */ sub.s $f8, $f18, $f12 +/* 01C9C 808FEBDC 460C9201 */ sub.s $f8, $f18, $f12 /* 01CA0 808FEBE0 E60A0060 */ swc1 $f10, 0x0060($s0) ## 00000060 /* 01CA4 808FEBE4 E5320024 */ swc1 $f18, 0x0024($t1) ## 00000024 -/* 01CA8 808FEBE8 C424DB90 */ lwc1 $f4, %lo(D_8090DB90)($at) +/* 01CA8 808FEBE8 C424DB90 */ lwc1 $f4, %lo(D_8090DB90)($at) /* 01CAC 808FEBEC 3C01C385 */ lui $at, 0xC385 ## $at = C3850000 /* 01CB0 808FEBF0 44813000 */ mtc1 $at, $f6 ## $f6 = -266.00 /* 01CB4 808FEBF4 3C014348 */ lui $at, 0x4348 ## $at = 43480000 /* 01CB8 808FEBF8 44815000 */ mtc1 $at, $f10 ## $f10 = 200.00 /* 01CBC 808FEBFC E5240028 */ swc1 $f4, 0x0028($t1) ## 00000028 /* 01CC0 808FEC00 A52E00B6 */ sh $t6, 0x00B6($t1) ## 000000B6 -/* 01CC4 808FEC04 460A4101 */ sub.s $f4, $f8, $f10 +/* 01CC4 808FEC04 460A4101 */ sub.s $f4, $f8, $f10 /* 01CC8 808FEC08 E526002C */ swc1 $f6, 0x002C($t1) ## 0000002C /* 01CCC 808FEC0C 3C0142C8 */ lui $at, 0x42C8 ## $at = 42C80000 /* 01CD0 808FEC10 240F0015 */ addiu $t7, $zero, 0x0015 ## $t7 = 00000015 /* 01CD4 808FEC14 E60403A4 */ swc1 $f4, 0x03A4($s0) ## 000003A4 /* 01CD8 808FEC18 C5260028 */ lwc1 $f6, 0x0028($t1) ## 00000028 /* 01CDC 808FEC1C 24A50380 */ addiu $a1, $a1, 0x0380 ## $a1 = 06010380 -/* 01CE0 808FEC20 460C3200 */ add.s $f8, $f6, $f12 -/* 01CE4 808FEC24 46104281 */ sub.s $f10, $f8, $f16 +/* 01CE0 808FEC20 460C3200 */ add.s $f8, $f6, $f12 +/* 01CE4 808FEC24 46104281 */ sub.s $f10, $f8, $f16 /* 01CE8 808FEC28 44814000 */ mtc1 $at, $f8 ## $f8 = 100.00 /* 01CEC 808FEC2C 3C014270 */ lui $at, 0x4270 ## $at = 42700000 /* 01CF0 808FEC30 E60A03A8 */ swc1 $f10, 0x03A8($s0) ## 000003A8 /* 01CF4 808FEC34 C524002C */ lwc1 $f4, 0x002C($t1) ## 0000002C -/* 01CF8 808FEC38 46022181 */ sub.s $f6, $f4, $f2 -/* 01CFC 808FEC3C 46083280 */ add.s $f10, $f6, $f8 +/* 01CF8 808FEC38 46022181 */ sub.s $f6, $f4, $f2 +/* 01CFC 808FEC3C 46083280 */ add.s $f10, $f6, $f8 /* 01D00 808FEC40 E60A03AC */ swc1 $f10, 0x03AC($s0) ## 000003AC /* 01D04 808FEC44 C5240024 */ lwc1 $f4, 0x0024($t1) ## 00000024 /* 01D08 808FEC48 44815000 */ mtc1 $at, $f10 ## $f10 = 60.00 /* 01D0C 808FEC4C 3C018091 */ lui $at, %hi(D_8090DB94) ## $at = 80910000 /* 01D10 808FEC50 E60403B0 */ swc1 $f4, 0x03B0($s0) ## 000003B0 /* 01D14 808FEC54 C5260028 */ lwc1 $f6, 0x0028($t1) ## 00000028 -/* 01D18 808FEC58 460E3200 */ add.s $f8, $f6, $f14 -/* 01D1C 808FEC5C 460A4100 */ add.s $f4, $f8, $f10 -/* 01D20 808FEC60 46022181 */ sub.s $f6, $f4, $f2 -/* 01D24 808FEC64 46103200 */ add.s $f8, $f6, $f16 +/* 01D18 808FEC58 460E3200 */ add.s $f8, $f6, $f14 +/* 01D1C 808FEC5C 460A4100 */ add.s $f4, $f8, $f10 +/* 01D20 808FEC60 46022181 */ sub.s $f6, $f4, $f2 +/* 01D24 808FEC64 46103200 */ add.s $f8, $f6, $f16 /* 01D28 808FEC68 C6060028 */ lwc1 $f6, 0x0028($s0) ## 00000028 /* 01D2C 808FEC6C E60803B4 */ swc1 $f8, 0x03B4($s0) ## 000003B4 /* 01D30 808FEC70 C52A002C */ lwc1 $f10, 0x002C($t1) ## 0000002C /* 01D34 808FEC74 E60A03B8 */ swc1 $f10, 0x03B8($s0) ## 000003B8 -/* 01D38 808FEC78 C420DB94 */ lwc1 $f0, %lo(D_8090DB94)($at) +/* 01D38 808FEC78 C420DB94 */ lwc1 $f0, %lo(D_8090DB94)($at) /* 01D3C 808FEC7C 3C018091 */ lui $at, %hi(D_8090DB98) ## $at = 80910000 -/* 01D40 808FEC80 C424DB98 */ lwc1 $f4, %lo(D_8090DB98)($at) -/* 01D44 808FEC84 4600303E */ c.le.s $f6, $f0 +/* 01D40 808FEC80 C424DB98 */ lwc1 $f4, %lo(D_8090DB98)($at) +/* 01D44 808FEC84 4600303E */ c.le.s $f6, $f0 /* 01D48 808FEC88 E60403BC */ swc1 $f4, 0x03BC($s0) ## 000003BC -/* 01D4C 808FEC8C 450202E1 */ bc1fl .L808FF814 +/* 01D4C 808FEC8C 450202E1 */ bc1fl .L808FF814 /* 01D50 808FEC90 3C014080 */ lui $at, 0x4080 ## $at = 40800000 /* 01D54 808FEC94 44801000 */ mtc1 $zero, $f2 ## $f2 = 0.00 /* 01D58 808FEC98 E6000028 */ swc1 $f0, 0x0028($s0) ## 00000028 @@ -1545,46 +1545,46 @@ glabel L808FEB70 /* 01D60 808FECA0 AE000398 */ sw $zero, 0x0398($s0) ## 00000398 /* 01D64 808FECA4 E60E0420 */ swc1 $f14, 0x0420($s0) ## 00000420 /* 01D68 808FECA8 E6020060 */ swc1 $f2, 0x0060($s0) ## 00000060 -/* 01D6C 808FECAC 44061000 */ mfc1 $a2, $f2 -/* 01D70 808FECB0 0C029490 */ jal func_800A5240 -/* 01D74 808FECB4 8FA40050 */ lw $a0, 0x0050($sp) +/* 01D6C 808FECAC 44061000 */ mfc1 $a2, $f2 +/* 01D70 808FECB0 0C029490 */ jal SkelAnime_ChangeAnimTransitionStop +/* 01D74 808FECB4 8FA40050 */ lw $a0, 0x0050($sp) /* 01D78 808FECB8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 01D7C 808FECBC 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 /* 01D80 808FECC0 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 01D84 808FECC4 0C23F535 */ jal func_808FD4D4 +/* 01D84 808FECC4 0C23F535 */ jal func_808FD4D4 /* 01D88 808FECC8 24070003 */ addiu $a3, $zero, 0x0003 ## $a3 = 00000003 /* 01D8C 808FECCC 44806000 */ mtc1 $zero, $f12 ## $f12 = 0.00 /* 01D90 808FECD0 240500C8 */ addiu $a1, $zero, 0x00C8 ## $a1 = 000000C8 /* 01D94 808FECD4 24060014 */ addiu $a2, $zero, 0x0014 ## $a2 = 00000014 -/* 01D98 808FECD8 0C02A7DB */ jal func_800A9F6C +/* 01D98 808FECD8 0C02A7DB */ jal func_800A9F6C /* 01D9C 808FECDC 24070014 */ addiu $a3, $zero, 0x0014 ## $a3 = 00000014 -/* 01DA0 808FECE0 100002CC */ beq $zero, $zero, .L808FF814 +/* 01DA0 808FECE0 100002CC */ beq $zero, $zero, .L808FF814 /* 01DA4 808FECE4 3C014080 */ lui $at, 0x4080 ## $at = 40800000 glabel L808FECE8 /* 01DA8 808FECE8 24180006 */ addiu $t8, $zero, 0x0006 ## $t8 = 00000006 /* 01DAC 808FECEC A2180339 */ sb $t8, 0x0339($s0) ## 00000339 /* 01DB0 808FECF0 0C02927F */ jal SkelAnime_FrameUpdateMatrix - + /* 01DB4 808FECF4 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C /* 01DB8 808FECF8 3C040001 */ lui $a0, 0x0001 ## $a0 = 00010000 -/* 01DBC 808FECFC 00912021 */ addu $a0, $a0, $s1 +/* 01DBC 808FECFC 00912021 */ addu $a0, $a0, $s1 /* 01DC0 808FED00 8C841DE4 */ lw $a0, 0x1DE4($a0) ## 00011DE4 -/* 01DC4 808FED04 000423C0 */ sll $a0, $a0, 15 -/* 01DC8 808FED08 00042400 */ sll $a0, $a0, 16 +/* 01DC4 808FED04 000423C0 */ sll $a0, $a0, 15 +/* 01DC8 808FED08 00042400 */ sll $a0, $a0, 16 /* 01DCC 808FED0C 0C01DE0D */ jal Math_Coss ## coss? -/* 01DD0 808FED10 00042403 */ sra $a0, $a0, 16 +/* 01DD0 808FED10 00042403 */ sra $a0, $a0, 16 /* 01DD4 808FED14 C6080420 */ lwc1 $f8, 0x0420($s0) ## 00000420 /* 01DD8 808FED18 26040420 */ addiu $a0, $s0, 0x0420 ## $a0 = 00000420 /* 01DDC 808FED1C 3C053F80 */ lui $a1, 0x3F80 ## $a1 = 3F800000 -/* 01DE0 808FED20 46080282 */ mul.s $f10, $f0, $f8 +/* 01DE0 808FED20 46080282 */ mul.s $f10, $f0, $f8 /* 01DE4 808FED24 3C063F40 */ lui $a2, 0x3F40 ## $a2 = 3F400000 /* 01DE8 808FED28 0C01E123 */ jal Math_SmoothDownscaleMaxF - + /* 01DEC 808FED2C E60A041C */ swc1 $f10, 0x041C($s0) ## 0000041C /* 01DF0 808FED30 8E190398 */ lw $t9, 0x0398($s0) ## 00000398 /* 01DF4 808FED34 2401001E */ addiu $at, $zero, 0x001E ## $at = 0000001E -/* 01DF8 808FED38 172102B5 */ bne $t9, $at, .L808FF810 +/* 01DF8 808FED38 172102B5 */ bne $t9, $at, .L808FF810 /* 01DFC 808FED3C 3C014120 */ lui $at, 0x4120 ## $at = 41200000 /* 01E00 808FED40 44817000 */ mtc1 $at, $f14 ## $f14 = 10.00 /* 01E04 808FED44 240B0016 */ addiu $t3, $zero, 0x0016 ## $t3 = 00000016 @@ -1594,75 +1594,75 @@ glabel L808FED50 /* 01E10 808FED50 8E0C0398 */ lw $t4, 0x0398($s0) ## 00000398 /* 01E14 808FED54 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C /* 01E18 808FED58 240D0007 */ addiu $t5, $zero, 0x0007 ## $t5 = 00000007 -/* 01E1C 808FED5C 2D81003C */ sltiu $at, $t4, 0x003C -/* 01E20 808FED60 50200003 */ beql $at, $zero, .L808FED70 +/* 01E1C 808FED5C 2D81003C */ sltiu $at, $t4, 0x003C +/* 01E20 808FED60 50200003 */ beql $at, $zero, .L808FED70 /* 01E24 808FED64 44809000 */ mtc1 $zero, $f18 ## $f18 = 0.00 /* 01E28 808FED68 A20D0339 */ sb $t5, 0x0339($s0) ## 00000339 /* 01E2C 808FED6C 44809000 */ mtc1 $zero, $f18 ## $f18 = 0.00 .L808FED70: /* 01E30 808FED70 3C018091 */ lui $at, %hi(D_8090DB9C) ## $at = 80910000 -/* 01E34 808FED74 C430DB9C */ lwc1 $f16, %lo(D_8090DB9C)($at) +/* 01E34 808FED74 C430DB9C */ lwc1 $f16, %lo(D_8090DB9C)($at) /* 01E38 808FED78 E61203BC */ swc1 $f18, 0x03BC($s0) ## 000003BC /* 01E3C 808FED7C 0C02927F */ jal SkelAnime_FrameUpdateMatrix - + /* 01E40 808FED80 E6100028 */ swc1 $f16, 0x0028($s0) ## 00000028 /* 01E44 808FED84 3C063DCC */ lui $a2, 0x3DCC ## $a2 = 3DCC0000 /* 01E48 808FED88 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3DCCCCCD /* 01E4C 808FED8C 2604030C */ addiu $a0, $s0, 0x030C ## $a0 = 0000030C /* 01E50 808FED90 0C01E123 */ jal Math_SmoothDownscaleMaxF - + /* 01E54 808FED94 3C053F80 */ lui $a1, 0x3F80 ## $a1 = 3F800000 /* 01E58 808FED98 8E030398 */ lw $v1, 0x0398($s0) ## 00000398 -/* 01E5C 808FED9C 2C610033 */ sltiu $at, $v1, 0x0033 -/* 01E60 808FEDA0 14200009 */ bne $at, $zero, .L808FEDC8 +/* 01E5C 808FED9C 2C610033 */ sltiu $at, $v1, 0x0033 +/* 01E60 808FEDA0 14200009 */ bne $at, $zero, .L808FEDC8 /* 01E64 808FEDA4 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 /* 01E68 808FEDA8 44810000 */ mtc1 $at, $f0 ## $f0 = 1.00 /* 01E6C 808FEDAC 3C073CCC */ lui $a3, 0x3CCC ## $a3 = 3CCC0000 /* 01E70 808FEDB0 34E7CCCD */ ori $a3, $a3, 0xCCCD ## $a3 = 3CCCCCCD -/* 01E74 808FEDB4 44050000 */ mfc1 $a1, $f0 -/* 01E78 808FEDB8 44060000 */ mfc1 $a2, $f0 +/* 01E74 808FEDB4 44050000 */ mfc1 $a1, $f0 +/* 01E78 808FEDB8 44060000 */ mfc1 $a2, $f0 /* 01E7C 808FEDBC 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 01E80 808FEDC0 26040224 */ addiu $a0, $s0, 0x0224 ## $a0 = 00000224 /* 01E84 808FEDC4 8E030398 */ lw $v1, 0x0398($s0) ## 00000398 .L808FEDC8: /* 01E88 808FEDC8 2401003C */ addiu $at, $zero, 0x003C ## $at = 0000003C -/* 01E8C 808FEDCC 14610003 */ bne $v1, $at, .L808FEDDC +/* 01E8C 808FEDCC 14610003 */ bne $v1, $at, .L808FEDDC /* 01E90 808FEDD0 240E0002 */ addiu $t6, $zero, 0x0002 ## $t6 = 00000002 /* 01E94 808FEDD4 A20E0336 */ sb $t6, 0x0336($s0) ## 00000336 /* 01E98 808FEDD8 8E030398 */ lw $v1, 0x0398($s0) ## 00000398 .L808FEDDC: /* 01E9C 808FEDDC 24010050 */ addiu $at, $zero, 0x0050 ## $at = 00000050 -/* 01EA0 808FEDE0 1461001E */ bne $v1, $at, .L808FEE5C +/* 01EA0 808FEDE0 1461001E */ bne $v1, $at, .L808FEE5C /* 01EA4 808FEDE4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 01EA8 808FEDE8 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 /* 01EAC 808FEDEC 24060153 */ addiu $a2, $zero, 0x0153 ## $a2 = 00000153 -/* 01EB0 808FEDF0 0C23F442 */ jal func_808FD108 +/* 01EB0 808FEDF0 0C23F442 */ jal func_808FD108 /* 01EB4 808FEDF4 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 /* 01EB8 808FEDF8 3C020602 */ lui $v0, 0x0602 ## $v0 = 06020000 /* 01EBC 808FEDFC 24421A90 */ addiu $v0, $v0, 0x1A90 ## $v0 = 06021A90 -/* 01EC0 808FEE00 00027900 */ sll $t7, $v0, 4 -/* 01EC4 808FEE04 000FC702 */ srl $t8, $t7, 28 -/* 01EC8 808FEE08 0018C880 */ sll $t9, $t8, 2 +/* 01EC0 808FEE00 00027900 */ sll $t7, $v0, 4 +/* 01EC4 808FEE04 000FC702 */ srl $t8, $t7, 28 +/* 01EC8 808FEE08 0018C880 */ sll $t9, $t8, 2 /* 01ECC 808FEE0C 3C0B8016 */ lui $t3, 0x8016 ## $t3 = 80160000 -/* 01ED0 808FEE10 01795821 */ addu $t3, $t3, $t9 +/* 01ED0 808FEE10 01795821 */ addu $t3, $t3, $t9 /* 01ED4 808FEE14 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 /* 01ED8 808FEE18 8D6B6FA8 */ lw $t3, 0x6FA8($t3) ## 80166FA8 /* 01EDC 808FEE1C 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF -/* 01EE0 808FEE20 00416024 */ and $t4, $v0, $at +/* 01EE0 808FEE20 00416024 */ and $t4, $v0, $at /* 01EE4 808FEE24 3C018000 */ lui $at, 0x8000 ## $at = 80000000 /* 01EE8 808FEE28 240F0028 */ addiu $t7, $zero, 0x0028 ## $t7 = 00000028 /* 01EEC 808FEE2C 240D00B4 */ addiu $t5, $zero, 0x00B4 ## $t5 = 000000B4 /* 01EF0 808FEE30 240E0080 */ addiu $t6, $zero, 0x0080 ## $t6 = 00000080 -/* 01EF4 808FEE34 016C3021 */ addu $a2, $t3, $t4 -/* 01EF8 808FEE38 00C13021 */ addu $a2, $a2, $at -/* 01EFC 808FEE3C AFAE0014 */ sw $t6, 0x0014($sp) -/* 01F00 808FEE40 AFAD0010 */ sw $t5, 0x0010($sp) -/* 01F04 808FEE44 AFAF0018 */ sw $t7, 0x0018($sp) +/* 01EF4 808FEE34 016C3021 */ addu $a2, $t3, $t4 +/* 01EF8 808FEE38 00C13021 */ addu $a2, $a2, $at +/* 01EFC 808FEE3C AFAE0014 */ sw $t6, 0x0014($sp) +/* 01F00 808FEE40 AFAD0010 */ sw $t5, 0x0010($sp) +/* 01F04 808FEE44 AFAF0018 */ sw $t7, 0x0018($sp) /* 01F08 808FEE48 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 01F0C 808FEE4C 26251D4C */ addiu $a1, $s1, 0x1D4C ## $a1 = 00001D4C /* 01F10 808FEE50 0C00B380 */ jal TitleCard_InitBossName - + /* 01F14 808FEE54 240700A0 */ addiu $a3, $zero, 0x00A0 ## $a3 = 000000A0 /* 01F18 808FEE58 8E030398 */ lw $v1, 0x0398($s0) ## 00000398 .L808FEE5C: @@ -1673,98 +1673,98 @@ glabel L808FED50 /* 01F2C 808FEE6C C6000024 */ lwc1 $f0, 0x0024($s0) ## 00000024 /* 01F30 808FEE70 3C0143AF */ lui $at, 0x43AF ## $at = 43AF0000 /* 01F34 808FEE74 44815000 */ mtc1 $at, $f10 ## $f10 = 350.00 -/* 01F38 808FEE78 46060200 */ add.s $f8, $f0, $f6 +/* 01F38 808FEE78 46060200 */ add.s $f8, $f0, $f6 /* 01F3C 808FEE7C 3C0142C8 */ lui $at, 0x42C8 ## $at = 42C80000 /* 01F40 808FEE80 44813000 */ mtc1 $at, $f6 ## $f6 = 100.00 /* 01F44 808FEE84 3C014270 */ lui $at, 0x4270 ## $at = 42700000 -/* 01F48 808FEE88 460A4101 */ sub.s $f4, $f8, $f10 +/* 01F48 808FEE88 460A4101 */ sub.s $f4, $f8, $f10 /* 01F4C 808FEE8C C60A0028 */ lwc1 $f10, 0x0028($s0) ## 00000028 /* 01F50 808FEE90 C602002C */ lwc1 $f2, 0x002C($s0) ## 0000002C /* 01F54 808FEE94 E60003B0 */ swc1 $f0, 0x03B0($s0) ## 000003B0 -/* 01F58 808FEE98 46062200 */ add.s $f8, $f4, $f6 +/* 01F58 808FEE98 46062200 */ add.s $f8, $f4, $f6 /* 01F5C 808FEE9C 44813000 */ mtc1 $at, $f6 ## $f6 = 60.00 /* 01F60 808FEEA0 C60401BC */ lwc1 $f4, 0x01BC($s0) ## 000001BC /* 01F64 808FEEA4 E60A03A8 */ swc1 $f10, 0x03A8($s0) ## 000003A8 /* 01F68 808FEEA8 E60803A4 */ swc1 $f8, 0x03A4($s0) ## 000003A4 -/* 01F6C 808FEEAC 46062200 */ add.s $f8, $f4, $f6 -/* 01F70 808FEEB0 2C6100A7 */ sltiu $at, $v1, 0x00A7 +/* 01F6C 808FEEAC 46062200 */ add.s $f8, $f4, $f6 +/* 01F70 808FEEB0 2C6100A7 */ sltiu $at, $v1, 0x00A7 /* 01F74 808FEEB4 E60203AC */ swc1 $f2, 0x03AC($s0) ## 000003AC /* 01F78 808FEEB8 E60203B8 */ swc1 $f2, 0x03B8($s0) ## 000003B8 -/* 01F7C 808FEEBC 460C4281 */ sub.s $f10, $f8, $f12 -/* 01F80 808FEEC0 14200006 */ bne $at, $zero, .L808FEEDC +/* 01F7C 808FEEBC 460C4281 */ sub.s $f10, $f8, $f12 +/* 01F80 808FEEC0 14200006 */ bne $at, $zero, .L808FEEDC /* 01F84 808FEEC4 E60A03B4 */ swc1 $f10, 0x03B4($s0) ## 000003B4 -/* 01F88 808FEEC8 2C6100AD */ sltiu $at, $v1, 0x00AD -/* 01F8C 808FEECC 10200003 */ beq $at, $zero, .L808FEEDC +/* 01F88 808FEEC8 2C6100AD */ sltiu $at, $v1, 0x00AD +/* 01F8C 808FEECC 10200003 */ beq $at, $zero, .L808FEEDC /* 01F90 808FEED0 24180002 */ addiu $t8, $zero, 0x0002 ## $t8 = 00000002 /* 01F94 808FEED4 A2180312 */ sb $t8, 0x0312($s0) ## 00000312 /* 01F98 808FEED8 8E030398 */ lw $v1, 0x0398($s0) ## 00000398 .L808FEEDC: -/* 01F9C 808FEEDC 2C6100BB */ sltiu $at, $v1, 0x00BB -/* 01FA0 808FEEE0 14200005 */ bne $at, $zero, .L808FEEF8 -/* 01FA4 808FEEE4 2C6100C4 */ sltiu $at, $v1, 0x00C4 -/* 01FA8 808FEEE8 10200003 */ beq $at, $zero, .L808FEEF8 +/* 01F9C 808FEEDC 2C6100BB */ sltiu $at, $v1, 0x00BB +/* 01FA0 808FEEE0 14200005 */ bne $at, $zero, .L808FEEF8 +/* 01FA4 808FEEE4 2C6100C4 */ sltiu $at, $v1, 0x00C4 +/* 01FA8 808FEEE8 10200003 */ beq $at, $zero, .L808FEEF8 /* 01FAC 808FEEEC 240A0001 */ addiu $t2, $zero, 0x0001 ## $t2 = 00000001 /* 01FB0 808FEEF0 A20A0312 */ sb $t2, 0x0312($s0) ## 00000312 /* 01FB4 808FEEF4 8E030398 */ lw $v1, 0x0398($s0) ## 00000398 .L808FEEF8: -/* 01FB8 808FEEF8 2C6100CB */ sltiu $at, $v1, 0x00CB -/* 01FBC 808FEEFC 14200005 */ bne $at, $zero, .L808FEF14 -/* 01FC0 808FEF00 2C6100D2 */ sltiu $at, $v1, 0x00D2 -/* 01FC4 808FEF04 10200003 */ beq $at, $zero, .L808FEF14 +/* 01FB8 808FEEF8 2C6100CB */ sltiu $at, $v1, 0x00CB +/* 01FBC 808FEEFC 14200005 */ bne $at, $zero, .L808FEF14 +/* 01FC0 808FEF00 2C6100D2 */ sltiu $at, $v1, 0x00D2 +/* 01FC4 808FEF04 10200003 */ beq $at, $zero, .L808FEF14 /* 01FC8 808FEF08 24190002 */ addiu $t9, $zero, 0x0002 ## $t9 = 00000002 /* 01FCC 808FEF0C A2190312 */ sb $t9, 0x0312($s0) ## 00000312 /* 01FD0 808FEF10 8E030398 */ lw $v1, 0x0398($s0) ## 00000398 .L808FEF14: /* 01FD4 808FEF14 240100A6 */ addiu $at, $zero, 0x00A6 ## $at = 000000A6 -/* 01FD8 808FEF18 10610005 */ beq $v1, $at, .L808FEF30 +/* 01FD8 808FEF18 10610005 */ beq $v1, $at, .L808FEF30 /* 01FDC 808FEF1C 240100B9 */ addiu $at, $zero, 0x00B9 ## $at = 000000B9 -/* 01FE0 808FEF20 10610003 */ beq $v1, $at, .L808FEF30 +/* 01FE0 808FEF20 10610003 */ beq $v1, $at, .L808FEF30 /* 01FE4 808FEF24 240100C8 */ addiu $at, $zero, 0x00C8 ## $at = 000000C8 -/* 01FE8 808FEF28 54610007 */ bnel $v1, $at, .L808FEF48 +/* 01FE8 808FEF28 54610007 */ bnel $v1, $at, .L808FEF48 /* 01FEC 808FEF2C 240100D7 */ addiu $at, $zero, 0x00D7 ## $at = 000000D7 .L808FEF30: -/* 01FF0 808FEF30 0C01E221 */ jal func_80078884 +/* 01FF0 808FEF30 0C01E221 */ jal func_80078884 /* 01FF4 808FEF34 24043997 */ addiu $a0, $zero, 0x3997 ## $a0 = 00003997 -/* 01FF8 808FEF38 0C01E221 */ jal func_80078884 +/* 01FF8 808FEF38 0C01E221 */ jal func_80078884 /* 01FFC 808FEF3C 2404398F */ addiu $a0, $zero, 0x398F ## $a0 = 0000398F /* 02000 808FEF40 8E030398 */ lw $v1, 0x0398($s0) ## 00000398 /* 02004 808FEF44 240100D7 */ addiu $at, $zero, 0x00D7 ## $at = 000000D7 .L808FEF48: -/* 02008 808FEF48 14610231 */ bne $v1, $at, .L808FF810 +/* 02008 808FEF48 14610231 */ bne $v1, $at, .L808FF810 /* 0200C 808FEF4C 240B0017 */ addiu $t3, $zero, 0x0017 ## $t3 = 00000017 /* 02010 808FEF50 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 /* 02014 808FEF54 A60B039C */ sh $t3, 0x039C($s0) ## 0000039C /* 02018 808FEF58 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 0201C 808FEF5C 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 02020 808FEF60 24060055 */ addiu $a2, $zero, 0x0055 ## $a2 = 00000055 -/* 02024 808FEF64 0C00B7D5 */ jal func_8002DF54 +/* 02024 808FEF64 0C00B7D5 */ jal func_8002DF54 /* 02028 808FEF68 E6040224 */ swc1 $f4, 0x0224($s0) ## 00000224 -/* 0202C 808FEF6C 10000229 */ beq $zero, $zero, .L808FF814 +/* 0202C 808FEF6C 10000229 */ beq $zero, $zero, .L808FF814 /* 02030 808FEF70 3C014080 */ lui $at, 0x4080 ## $at = 40800000 glabel L808FEF74 /* 02034 808FEF74 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C /* 02038 808FEF78 0C02927F */ jal SkelAnime_FrameUpdateMatrix - -/* 0203C 808FEF7C AFA90088 */ sw $t1, 0x0088($sp) + +/* 0203C 808FEF7C AFA90088 */ sw $t1, 0x0088($sp) /* 02040 808FEF80 8E030398 */ lw $v1, 0x0398($s0) ## 00000398 -/* 02044 808FEF84 8FA90088 */ lw $t1, 0x0088($sp) +/* 02044 808FEF84 8FA90088 */ lw $t1, 0x0088($sp) /* 02048 808FEF88 24043997 */ addiu $a0, $zero, 0x3997 ## $a0 = 00003997 -/* 0204C 808FEF8C 2C6100DF */ sltiu $at, $v1, 0x00DF -/* 02050 808FEF90 14200005 */ bne $at, $zero, .L808FEFA8 -/* 02054 808FEF94 2C6100E8 */ sltiu $at, $v1, 0x00E8 -/* 02058 808FEF98 10200003 */ beq $at, $zero, .L808FEFA8 +/* 0204C 808FEF8C 2C6100DF */ sltiu $at, $v1, 0x00DF +/* 02050 808FEF90 14200005 */ bne $at, $zero, .L808FEFA8 +/* 02054 808FEF94 2C6100E8 */ sltiu $at, $v1, 0x00E8 +/* 02058 808FEF98 10200003 */ beq $at, $zero, .L808FEFA8 /* 0205C 808FEF9C 240C0002 */ addiu $t4, $zero, 0x0002 ## $t4 = 00000002 /* 02060 808FEFA0 A20C0312 */ sb $t4, 0x0312($s0) ## 00000312 /* 02064 808FEFA4 8E030398 */ lw $v1, 0x0398($s0) ## 00000398 .L808FEFA8: /* 02068 808FEFA8 240100DE */ addiu $at, $zero, 0x00DE ## $at = 000000DE -/* 0206C 808FEFAC 54610008 */ bnel $v1, $at, .L808FEFD0 +/* 0206C 808FEFAC 54610008 */ bnel $v1, $at, .L808FEFD0 /* 02070 808FEFB0 3C014000 */ lui $at, 0x4000 ## $at = 40000000 -/* 02074 808FEFB4 0C01E221 */ jal func_80078884 -/* 02078 808FEFB8 AFA90088 */ sw $t1, 0x0088($sp) -/* 0207C 808FEFBC 0C01E221 */ jal func_80078884 +/* 02074 808FEFB4 0C01E221 */ jal func_80078884 +/* 02078 808FEFB8 AFA90088 */ sw $t1, 0x0088($sp) +/* 0207C 808FEFBC 0C01E221 */ jal func_80078884 /* 02080 808FEFC0 2404398F */ addiu $a0, $zero, 0x398F ## $a0 = 0000398F -/* 02084 808FEFC4 8FA90088 */ lw $t1, 0x0088($sp) +/* 02084 808FEFC4 8FA90088 */ lw $t1, 0x0088($sp) /* 02088 808FEFC8 8E030398 */ lw $v1, 0x0398($s0) ## 00000398 /* 0208C 808FEFCC 3C014000 */ lui $at, 0x4000 ## $at = 40000000 .L808FEFD0: @@ -1776,57 +1776,57 @@ glabel L808FEF74 /* 020A4 808FEFE4 C5260024 */ lwc1 $f6, 0x0024($t1) ## 00000024 /* 020A8 808FEFE8 3C014120 */ lui $at, 0x4120 ## $at = 41200000 /* 020AC 808FEFEC 44817000 */ mtc1 $at, $f14 ## $f14 = 10.00 -/* 020B0 808FEFF0 460C3201 */ sub.s $f8, $f6, $f12 +/* 020B0 808FEFF0 460C3201 */ sub.s $f8, $f6, $f12 /* 020B4 808FEFF4 3C0140C0 */ lui $at, 0x40C0 ## $at = 40C00000 /* 020B8 808FEFF8 44815000 */ mtc1 $at, $f10 ## $f10 = 6.00 /* 020BC 808FEFFC 3C0140E0 */ lui $at, 0x40E0 ## $at = 40E00000 /* 020C0 808FF000 24041808 */ addiu $a0, $zero, 0x1808 ## $a0 = 00001808 -/* 020C4 808FF004 460A4100 */ add.s $f4, $f8, $f10 +/* 020C4 808FF004 460A4100 */ add.s $f4, $f8, $f10 /* 020C8 808FF008 E60403A4 */ swc1 $f4, 0x03A4($s0) ## 000003A4 /* 020CC 808FF00C C5260028 */ lwc1 $f6, 0x0028($t1) ## 00000028 -/* 020D0 808FF010 460C3200 */ add.s $f8, $f6, $f12 +/* 020D0 808FF010 460C3200 */ add.s $f8, $f6, $f12 /* 020D4 808FF014 44813000 */ mtc1 $at, $f6 ## $f6 = 7.00 /* 020D8 808FF018 3C014270 */ lui $at, 0x4270 ## $at = 42700000 /* 020DC 808FF01C E60803A8 */ swc1 $f8, 0x03A8($s0) ## 000003A8 /* 020E0 808FF020 C52A002C */ lwc1 $f10, 0x002C($t1) ## 0000002C -/* 020E4 808FF024 46025100 */ add.s $f4, $f10, $f2 -/* 020E8 808FF028 46062201 */ sub.s $f8, $f4, $f6 +/* 020E4 808FF024 46025100 */ add.s $f4, $f10, $f2 +/* 020E8 808FF028 46062201 */ sub.s $f8, $f4, $f6 /* 020EC 808FF02C E60803AC */ swc1 $f8, 0x03AC($s0) ## 000003AC /* 020F0 808FF030 C52A0024 */ lwc1 $f10, 0x0024($t1) ## 00000024 /* 020F4 808FF034 44814000 */ mtc1 $at, $f8 ## $f8 = 60.00 /* 020F8 808FF038 240100E4 */ addiu $at, $zero, 0x00E4 ## $at = 000000E4 /* 020FC 808FF03C E60A03B0 */ swc1 $f10, 0x03B0($s0) ## 000003B0 /* 02100 808FF040 C5240028 */ lwc1 $f4, 0x0028($t1) ## 00000028 -/* 02104 808FF044 460E2180 */ add.s $f6, $f4, $f14 -/* 02108 808FF048 46083280 */ add.s $f10, $f6, $f8 -/* 0210C 808FF04C 46025101 */ sub.s $f4, $f10, $f2 -/* 02110 808FF050 46002181 */ sub.s $f6, $f4, $f0 +/* 02104 808FF044 460E2180 */ add.s $f6, $f4, $f14 +/* 02108 808FF048 46083280 */ add.s $f10, $f6, $f8 +/* 0210C 808FF04C 46025101 */ sub.s $f4, $f10, $f2 +/* 02110 808FF050 46002181 */ sub.s $f6, $f4, $f0 /* 02114 808FF054 E60603B4 */ swc1 $f6, 0x03B4($s0) ## 000003B4 /* 02118 808FF058 C528002C */ lwc1 $f8, 0x002C($t1) ## 0000002C -/* 0211C 808FF05C 1461000E */ bne $v1, $at, .L808FF098 +/* 0211C 808FF05C 1461000E */ bne $v1, $at, .L808FF098 /* 02120 808FF060 E60803B8 */ swc1 $f8, 0x03B8($s0) ## 000003B8 -/* 02124 808FF064 0C01E221 */ jal func_80078884 -/* 02128 808FF068 AFA90088 */ sw $t1, 0x0088($sp) +/* 02124 808FF064 0C01E221 */ jal func_80078884 +/* 02128 808FF068 AFA90088 */ sw $t1, 0x0088($sp) /* 0212C 808FF06C 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 02130 808FF070 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 02134 808FF074 0C00B7D5 */ jal func_8002DF54 +/* 02134 808FF074 0C00B7D5 */ jal func_8002DF54 /* 02138 808FF078 24060056 */ addiu $a2, $zero, 0x0056 ## $a2 = 00000056 /* 0213C 808FF07C 44806000 */ mtc1 $zero, $f12 ## $f12 = 0.00 /* 02140 808FF080 240500FF */ addiu $a1, $zero, 0x00FF ## $a1 = 000000FF /* 02144 808FF084 2406000A */ addiu $a2, $zero, 0x000A ## $a2 = 0000000A -/* 02148 808FF088 0C02A7DB */ jal func_800A9F6C +/* 02148 808FF088 0C02A7DB */ jal func_800A9F6C /* 0214C 808FF08C 24070032 */ addiu $a3, $zero, 0x0032 ## $a3 = 00000032 -/* 02150 808FF090 8FA90088 */ lw $t1, 0x0088($sp) +/* 02150 808FF090 8FA90088 */ lw $t1, 0x0088($sp) /* 02154 808FF094 8E030398 */ lw $v1, 0x0398($s0) ## 00000398 .L808FF098: -/* 02158 808FF098 2C6100E5 */ sltiu $at, $v1, 0x00E5 -/* 0215C 808FF09C 142001DC */ bne $at, $zero, .L808FF810 +/* 02158 808FF098 2C6100E5 */ sltiu $at, $v1, 0x00E5 +/* 0215C 808FF09C 142001DC */ bne $at, $zero, .L808FF810 /* 02160 808FF0A0 240A0001 */ addiu $t2, $zero, 0x0001 ## $t2 = 00000001 /* 02164 808FF0A4 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 02168 808FF0A8 00310821 */ addu $at, $at, $s1 +/* 02168 808FF0A8 00310821 */ addu $at, $at, $s1 /* 0216C 808FF0AC A02A0B05 */ sb $t2, 0x0B05($at) ## 00010B05 /* 02170 808FF0B0 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 02174 808FF0B4 02214021 */ addu $t0, $s1, $at +/* 02174 808FF0B4 02214021 */ addu $t0, $s1, $at /* 02178 808FF0B8 240200FF */ addiu $v0, $zero, 0x00FF ## $v0 = 000000FF /* 0217C 808FF0BC 240E0064 */ addiu $t6, $zero, 0x0064 ## $t6 = 00000064 /* 02180 808FF0C0 A1020B08 */ sb $v0, 0x0B08($t0) ## 00000B08 @@ -1836,9 +1836,9 @@ glabel L808FEF74 /* 02190 808FF0D0 8E0F0398 */ lw $t7, 0x0398($s0) ## 00000398 /* 02194 808FF0D4 240100EA */ addiu $at, $zero, 0x00EA ## $at = 000000EA /* 02198 808FF0D8 24060018 */ addiu $a2, $zero, 0x0018 ## $a2 = 00000018 -/* 0219C 808FF0DC 15E101CC */ bne $t7, $at, .L808FF810 +/* 0219C 808FF0DC 15E101CC */ bne $t7, $at, .L808FF810 /* 021A0 808FF0E0 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 021A4 808FF0E4 00310821 */ addu $at, $at, $s1 +/* 021A4 808FF0E4 00310821 */ addu $at, $at, $s1 /* 021A8 808FF0E8 A0200B05 */ sb $zero, 0x0B05($at) ## 00010B05 /* 021AC 808FF0EC A606039C */ sh $a2, 0x039C($s0) ## 0000039C /* 021B0 808FF0F0 AE000398 */ sw $zero, 0x0398($s0) ## 00000398 @@ -1852,25 +1852,25 @@ glabel L808FEF74 /* 021D0 808FF110 ACB80004 */ sw $t8, 0x0004($a1) ## FFFFFFDC /* 021D4 808FF114 8D39002C */ lw $t9, 0x002C($t1) ## 0000002C /* 021D8 808FF118 ACB90008 */ sw $t9, 0x0008($a1) ## FFFFFFE0 -/* 021DC 808FF11C C7AA006C */ lwc1 $f10, 0x006C($sp) -/* 021E0 808FF120 46045180 */ add.s $f6, $f10, $f4 -/* 021E4 808FF124 0C23F484 */ jal func_808FD210 -/* 021E8 808FF128 E7A6006C */ swc1 $f6, 0x006C($sp) +/* 021DC 808FF11C C7AA006C */ lwc1 $f10, 0x006C($sp) +/* 021E0 808FF120 46045180 */ add.s $f6, $f10, $f4 +/* 021E4 808FF124 0C23F484 */ jal func_808FD210 +/* 021E8 808FF128 E7A6006C */ swc1 $f6, 0x006C($sp) /* 021EC 808FF12C 44804000 */ mtc1 $zero, $f8 ## $f8 = 0.00 /* 021F0 808FF130 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 021F4 808FF134 00310821 */ addu $at, $at, $s1 +/* 021F4 808FF134 00310821 */ addu $at, $at, $s1 /* 021F8 808FF138 E4280AFC */ swc1 $f8, 0x0AFC($at) ## 00010AFC /* 021FC 808FF13C 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 02200 808FF140 00310821 */ addu $at, $at, $s1 +/* 02200 808FF140 00310821 */ addu $at, $at, $s1 /* 02204 808FF144 A0200AE2 */ sb $zero, 0x0AE2($at) ## 00010AE2 -/* 02208 808FF148 100001B1 */ beq $zero, $zero, .L808FF810 +/* 02208 808FF148 100001B1 */ beq $zero, $zero, .L808FF810 /* 0220C 808FF14C A2000339 */ sb $zero, 0x0339($s0) ## 00000339 glabel L808FF150 /* 02210 808FF150 0C02927F */ jal SkelAnime_FrameUpdateMatrix - + /* 02214 808FF154 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C /* 02218 808FF158 3C020001 */ lui $v0, 0x0001 ## $v0 = 00010000 -/* 0221C 808FF15C 00511021 */ addu $v0, $v0, $s1 +/* 0221C 808FF15C 00511021 */ addu $v0, $v0, $s1 /* 02220 808FF160 8C421E10 */ lw $v0, 0x1E10($v0) ## 00011E10 /* 02224 808FF164 3C0141F0 */ lui $at, 0x41F0 ## $at = 41F00000 /* 02228 808FF168 44818000 */ mtc1 $at, $f16 ## $f16 = 30.00 @@ -1885,78 +1885,78 @@ glabel L808FF150 /* 0224C 808FF18C 306D0003 */ andi $t5, $v1, 0x0003 ## $t5 = 00000000 /* 02250 808FF190 AE0C03B8 */ sw $t4, 0x03B8($s0) ## 000003B8 /* 02254 808FF194 C44A0004 */ lwc1 $f10, 0x0004($v0) ## 00010004 -/* 02258 808FF198 46045180 */ add.s $f6, $f10, $f4 +/* 02258 808FF198 46045180 */ add.s $f6, $f10, $f4 /* 0225C 808FF19C E60603A4 */ swc1 $f6, 0x03A4($s0) ## 000003A4 /* 02260 808FF1A0 C4480008 */ lwc1 $f8, 0x0008($v0) ## 00010008 /* 02264 808FF1A4 44813000 */ mtc1 $at, $f6 ## $f6 = 70.00 -/* 02268 808FF1A8 46104281 */ sub.s $f10, $f8, $f16 +/* 02268 808FF1A8 46104281 */ sub.s $f10, $f8, $f16 /* 0226C 808FF1AC E60A03A8 */ swc1 $f10, 0x03A8($s0) ## 000003A8 /* 02270 808FF1B0 C444000C */ lwc1 $f4, 0x000C($v0) ## 0001000C -/* 02274 808FF1B4 46062200 */ add.s $f8, $f4, $f6 -/* 02278 808FF1B8 15A00004 */ bne $t5, $zero, .L808FF1CC +/* 02274 808FF1B4 46062200 */ add.s $f8, $f4, $f6 +/* 02278 808FF1B8 15A00004 */ bne $t5, $zero, .L808FF1CC /* 0227C 808FF1BC E60803AC */ swc1 $f8, 0x03AC($s0) ## 000003AC -/* 02280 808FF1C0 0C01E221 */ jal func_80078884 +/* 02280 808FF1C0 0C01E221 */ jal func_80078884 /* 02284 808FF1C4 24041801 */ addiu $a0, $zero, 0x1801 ## $a0 = 00001801 /* 02288 808FF1C8 8E030398 */ lw $v1, 0x0398($s0) ## 00000398 .L808FF1CC: /* 0228C 808FF1CC 24010019 */ addiu $at, $zero, 0x0019 ## $at = 00000019 -/* 02290 808FF1D0 1461018F */ bne $v1, $at, .L808FF810 +/* 02290 808FF1D0 1461018F */ bne $v1, $at, .L808FF810 /* 02294 808FF1D4 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 02298 808FF1D8 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 0229C 808FF1DC 0C00B7D5 */ jal func_8002DF54 +/* 0229C 808FF1DC 0C00B7D5 */ jal func_8002DF54 /* 022A0 808FF1E0 24060057 */ addiu $a2, $zero, 0x0057 ## $a2 = 00000057 /* 022A4 808FF1E4 240E0019 */ addiu $t6, $zero, 0x0019 ## $t6 = 00000019 /* 022A8 808FF1E8 A60E039C */ sh $t6, 0x039C($s0) ## 0000039C -/* 022AC 808FF1EC 10000188 */ beq $zero, $zero, .L808FF810 +/* 022AC 808FF1EC 10000188 */ beq $zero, $zero, .L808FF810 /* 022B0 808FF1F0 AE000398 */ sw $zero, 0x0398($s0) ## 00000398 glabel L808FF1F4 /* 022B4 808FF1F4 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C /* 022B8 808FF1F8 0C02927F */ jal SkelAnime_FrameUpdateMatrix - -/* 022BC 808FF1FC AFA90088 */ sw $t1, 0x0088($sp) + +/* 022BC 808FF1FC AFA90088 */ sw $t1, 0x0088($sp) /* 022C0 808FF200 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 /* 022C4 808FF204 44811000 */ mtc1 $at, $f2 ## $f2 = 20.00 -/* 022C8 808FF208 8FA90088 */ lw $t1, 0x0088($sp) +/* 022C8 808FF208 8FA90088 */ lw $t1, 0x0088($sp) /* 022CC 808FF20C 3C014220 */ lui $at, 0x4220 ## $at = 42200000 /* 022D0 808FF210 44816000 */ mtc1 $at, $f12 ## $f12 = 40.00 /* 022D4 808FF214 C52A0024 */ lwc1 $f10, 0x0024($t1) ## 00000024 /* 022D8 808FF218 3C014120 */ lui $at, 0x4120 ## $at = 41200000 /* 022DC 808FF21C 44817000 */ mtc1 $at, $f14 ## $f14 = 10.00 -/* 022E0 808FF220 460C5101 */ sub.s $f4, $f10, $f12 +/* 022E0 808FF220 460C5101 */ sub.s $f4, $f10, $f12 /* 022E4 808FF224 3C0142A0 */ lui $at, 0x42A0 ## $at = 42A00000 /* 022E8 808FF228 44813000 */ mtc1 $at, $f6 ## $f6 = 80.00 /* 022EC 808FF22C 3C014270 */ lui $at, 0x4270 ## $at = 42700000 /* 022F0 808FF230 8E0F0398 */ lw $t7, 0x0398($s0) ## 00000398 -/* 022F4 808FF234 46062200 */ add.s $f8, $f4, $f6 +/* 022F4 808FF234 46062200 */ add.s $f8, $f4, $f6 /* 022F8 808FF238 3C020001 */ lui $v0, 0x0001 ## $v0 = 00010000 /* 022FC 808FF23C 3C038091 */ lui $v1, %hi(D_8090EB2C) ## $v1 = 80910000 -/* 02300 808FF240 00511021 */ addu $v0, $v0, $s1 +/* 02300 808FF240 00511021 */ addu $v0, $v0, $s1 /* 02304 808FF244 E60803A4 */ swc1 $f8, 0x03A4($s0) ## 000003A4 /* 02308 808FF248 C52A0028 */ lwc1 $f10, 0x0028($t1) ## 00000028 -/* 0230C 808FF24C 460C5100 */ add.s $f4, $f10, $f12 -/* 02310 808FF250 460E2180 */ add.s $f6, $f4, $f14 +/* 0230C 808FF24C 460C5100 */ add.s $f4, $f10, $f12 +/* 02310 808FF250 460E2180 */ add.s $f6, $f4, $f14 /* 02314 808FF254 E60603A8 */ swc1 $f6, 0x03A8($s0) ## 000003A8 /* 02318 808FF258 C528002C */ lwc1 $f8, 0x002C($t1) ## 0000002C -/* 0231C 808FF25C 46024280 */ add.s $f10, $f8, $f2 -/* 02320 808FF260 460E5100 */ add.s $f4, $f10, $f14 +/* 0231C 808FF25C 46024280 */ add.s $f10, $f8, $f2 +/* 02320 808FF260 460E5100 */ add.s $f4, $f10, $f14 /* 02324 808FF264 E60403AC */ swc1 $f4, 0x03AC($s0) ## 000003AC /* 02328 808FF268 C5260024 */ lwc1 $f6, 0x0024($t1) ## 00000024 -/* 0232C 808FF26C 46023201 */ sub.s $f8, $f6, $f2 +/* 0232C 808FF26C 46023201 */ sub.s $f8, $f6, $f2 /* 02330 808FF270 44813000 */ mtc1 $at, $f6 ## $f6 = 60.00 /* 02334 808FF274 3C014040 */ lui $at, 0x4040 ## $at = 40400000 /* 02338 808FF278 E60803B0 */ swc1 $f8, 0x03B0($s0) ## 000003B0 /* 0233C 808FF27C C52A0028 */ lwc1 $f10, 0x0028($t1) ## 00000028 -/* 02340 808FF280 460E5100 */ add.s $f4, $f10, $f14 -/* 02344 808FF284 46062200 */ add.s $f8, $f4, $f6 +/* 02340 808FF280 460E5100 */ add.s $f4, $f10, $f14 +/* 02344 808FF284 46062200 */ add.s $f8, $f4, $f6 /* 02348 808FF288 44812000 */ mtc1 $at, $f4 ## $f4 = 3.00 /* 0234C 808FF28C 2401000A */ addiu $at, $zero, 0x000A ## $at = 0000000A -/* 02350 808FF290 46024281 */ sub.s $f10, $f8, $f2 -/* 02354 808FF294 46045181 */ sub.s $f6, $f10, $f4 +/* 02350 808FF290 46024281 */ sub.s $f10, $f8, $f2 +/* 02354 808FF294 46045181 */ sub.s $f6, $f10, $f4 /* 02358 808FF298 E60603B4 */ swc1 $f6, 0x03B4($s0) ## 000003B4 /* 0235C 808FF29C C528002C */ lwc1 $f8, 0x002C($t1) ## 0000002C -/* 02360 808FF2A0 460C4281 */ sub.s $f10, $f8, $f12 -/* 02364 808FF2A4 460E5101 */ sub.s $f4, $f10, $f14 -/* 02368 808FF2A8 15E10159 */ bne $t7, $at, .L808FF810 +/* 02360 808FF2A0 460C4281 */ sub.s $f10, $f8, $f12 +/* 02364 808FF2A4 460E5101 */ sub.s $f4, $f10, $f14 +/* 02368 808FF2A8 15E10159 */ bne $t7, $at, .L808FF810 /* 0236C 808FF2AC E60403B8 */ swc1 $f4, 0x03B8($s0) ## 000003B8 /* 02370 808FF2B0 8C421E10 */ lw $v0, 0x1E10($v0) ## 00011E10 /* 02374 808FF2B4 24180001 */ addiu $t8, $zero, 0x0001 ## $t8 = 00000001 @@ -1968,15 +1968,15 @@ glabel L808FF1F4 /* 0238C 808FF2CC C7260024 */ lwc1 $f6, 0x0024($t9) ## 00000024 /* 02390 808FF2D0 3C0143AF */ lui $at, 0x43AF ## $at = 43AF0000 /* 02394 808FF2D4 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 02398 808FF2D8 46103200 */ add.s $f8, $f6, $f16 +/* 02398 808FF2D8 46103200 */ add.s $f8, $f6, $f16 /* 0239C 808FF2DC 44813000 */ mtc1 $at, $f6 ## $f6 = 350.00 /* 023A0 808FF2E0 3C0141C8 */ lui $at, 0x41C8 ## $at = 41C80000 /* 023A4 808FF2E4 240D001A */ addiu $t5, $zero, 0x001A ## $t5 = 0000001A -/* 023A8 808FF2E8 460E4280 */ add.s $f10, $f8, $f14 +/* 023A8 808FF2E8 460E4280 */ add.s $f10, $f8, $f14 /* 023AC 808FF2EC E44A0004 */ swc1 $f10, 0x0004($v0) ## 00010004 /* 023B0 808FF2F0 8C6B0000 */ lw $t3, 0x0000($v1) ## 8090EB2C /* 023B4 808FF2F4 C5640028 */ lwc1 $f4, 0x0028($t3) ## 00000028 -/* 023B8 808FF2F8 46062200 */ add.s $f8, $f4, $f6 +/* 023B8 808FF2F8 46062200 */ add.s $f8, $f4, $f6 /* 023BC 808FF2FC 44812000 */ mtc1 $at, $f4 ## $f4 = 25.00 /* 023C0 808FF300 3C01C1F0 */ lui $at, 0xC1F0 ## $at = C1F00000 /* 023C4 808FF304 E4480008 */ swc1 $f8, 0x0008($v0) ## 00010008 @@ -1985,7 +1985,7 @@ glabel L808FF1F4 /* 023D0 808FF310 C58A002C */ lwc1 $f10, 0x002C($t4) ## 0000002C /* 023D4 808FF314 E4400010 */ swc1 $f0, 0x0010($v0) ## 00010010 /* 023D8 808FF318 E4400018 */ swc1 $f0, 0x0018($v0) ## 00010018 -/* 023DC 808FF31C 46045181 */ sub.s $f6, $f10, $f4 +/* 023DC 808FF31C 46045181 */ sub.s $f6, $f10, $f4 /* 023E0 808FF320 E4480014 */ swc1 $f8, 0x0014($v0) ## 00010014 /* 023E4 808FF324 E446000C */ swc1 $f6, 0x000C($v0) ## 0001000C /* 023E8 808FF328 A60D039C */ sh $t5, 0x039C($s0) ## 0000039C @@ -2005,34 +2005,34 @@ glabel L808FF330 /* 0241C 808FF35C C5CA0024 */ lwc1 $f10, 0x0024($t6) ## 00000024 /* 02420 808FF360 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 /* 02424 808FF364 8E030398 */ lw $v1, 0x0398($s0) ## 00000398 -/* 02428 808FF368 46045180 */ add.s $f6, $f10, $f4 -/* 0242C 808FF36C 46103200 */ add.s $f8, $f6, $f16 +/* 02428 808FF368 46045180 */ add.s $f6, $f10, $f4 +/* 0242C 808FF36C 46103200 */ add.s $f8, $f6, $f16 /* 02430 808FF370 E60803A4 */ swc1 $f8, 0x03A4($s0) ## 000003A4 /* 02434 808FF374 8C4F0000 */ lw $t7, 0x0000($v0) ## 8090EB2C /* 02438 808FF378 44814000 */ mtc1 $at, $f8 ## $f8 = 5.00 /* 0243C 808FF37C 3C01BF00 */ lui $at, 0xBF00 ## $at = BF000000 /* 02440 808FF380 C5EA0028 */ lwc1 $f10, 0x0028($t7) ## 00000028 /* 02444 808FF384 240F001B */ addiu $t7, $zero, 0x001B ## $t7 = 0000001B -/* 02448 808FF388 460E5100 */ add.s $f4, $f10, $f14 +/* 02448 808FF388 460E5100 */ add.s $f4, $f10, $f14 /* 0244C 808FF38C E60403A8 */ swc1 $f4, 0x03A8($s0) ## 000003A8 /* 02450 808FF390 8C580000 */ lw $t8, 0x0000($v0) ## 8090EB2C /* 02454 808FF394 C706002C */ lwc1 $f6, 0x002C($t8) ## 0000002D -/* 02458 808FF398 46083280 */ add.s $f10, $f6, $f8 +/* 02458 808FF398 46083280 */ add.s $f10, $f6, $f8 /* 0245C 808FF39C E60A03AC */ swc1 $f10, 0x03AC($s0) ## 000003AC /* 02460 808FF3A0 8C590000 */ lw $t9, 0x0000($v0) ## 8090EB2C /* 02464 808FF3A4 C7240024 */ lwc1 $f4, 0x0024($t9) ## 00000024 /* 02468 808FF3A8 E60403B0 */ swc1 $f4, 0x03B0($s0) ## 000003B0 /* 0246C 808FF3AC 8C4B0000 */ lw $t3, 0x0000($v0) ## 8090EB2C /* 02470 808FF3B0 C5660028 */ lwc1 $f6, 0x0028($t3) ## 00000028 -/* 02474 808FF3B4 46103200 */ add.s $f8, $f6, $f16 +/* 02474 808FF3B4 46103200 */ add.s $f8, $f6, $f16 /* 02478 808FF3B8 44813000 */ mtc1 $at, $f6 ## $f6 = -0.50 /* 0247C 808FF3BC 2401000D */ addiu $at, $zero, 0x000D ## $at = 0000000D /* 02480 808FF3C0 E60803B4 */ swc1 $f8, 0x03B4($s0) ## 000003B4 /* 02484 808FF3C4 8C4C0000 */ lw $t4, 0x0000($v0) ## 8090EB2C /* 02488 808FF3C8 C58A002C */ lwc1 $f10, 0x002C($t4) ## 0000002C /* 0248C 808FF3CC E60603C4 */ swc1 $f6, 0x03C4($s0) ## 000003C4 -/* 02490 808FF3D0 46025101 */ sub.s $f4, $f10, $f2 -/* 02494 808FF3D4 14610005 */ bne $v1, $at, .L808FF3EC +/* 02490 808FF3D0 46025101 */ sub.s $f4, $f10, $f2 +/* 02494 808FF3D4 14610005 */ bne $v1, $at, .L808FF3EC /* 02498 808FF3D8 E60403B8 */ swc1 $f4, 0x03B8($s0) ## 000003B8 /* 0249C 808FF3DC 8C4E0000 */ lw $t6, 0x0000($v0) ## 8090EB2C /* 024A0 808FF3E0 240D0006 */ addiu $t5, $zero, 0x0006 ## $t5 = 00000006 @@ -2040,23 +2040,23 @@ glabel L808FF330 /* 024A8 808FF3E8 8E030398 */ lw $v1, 0x0398($s0) ## 00000398 .L808FF3EC: /* 024AC 808FF3EC 24010032 */ addiu $at, $zero, 0x0032 ## $at = 00000032 -/* 024B0 808FF3F0 54610108 */ bnel $v1, $at, .L808FF814 +/* 024B0 808FF3F0 54610108 */ bnel $v1, $at, .L808FF814 /* 024B4 808FF3F4 3C014080 */ lui $at, 0x4080 ## $at = 40800000 /* 024B8 808FF3F8 A60F039C */ sh $t7, 0x039C($s0) ## 0000039C -/* 024BC 808FF3FC 10000104 */ beq $zero, $zero, .L808FF810 +/* 024BC 808FF3FC 10000104 */ beq $zero, $zero, .L808FF810 /* 024C0 808FF400 AE000398 */ sw $zero, 0x0398($s0) ## 00000398 glabel L808FF404 /* 024C4 808FF404 8E030398 */ lw $v1, 0x0398($s0) ## 00000398 /* 024C8 808FF408 44804000 */ mtc1 $zero, $f8 ## $f8 = 0.00 /* 024CC 808FF40C 24010004 */ addiu $at, $zero, 0x0004 ## $at = 00000004 -/* 024D0 808FF410 14610008 */ bne $v1, $at, .L808FF434 +/* 024D0 808FF410 14610008 */ bne $v1, $at, .L808FF434 /* 024D4 808FF414 E60803C4 */ swc1 $f8, 0x03C4($s0) ## 000003C4 /* 024D8 808FF418 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 024DC 808FF41C 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 024E0 808FF420 24060058 */ addiu $a2, $zero, 0x0058 ## $a2 = 00000058 -/* 024E4 808FF424 0C00B7D5 */ jal func_8002DF54 -/* 024E8 808FF428 AFA90088 */ sw $t1, 0x0088($sp) -/* 024EC 808FF42C 8FA90088 */ lw $t1, 0x0088($sp) +/* 024E4 808FF424 0C00B7D5 */ jal func_8002DF54 +/* 024E8 808FF428 AFA90088 */ sw $t1, 0x0088($sp) +/* 024EC 808FF42C 8FA90088 */ lw $t1, 0x0088($sp) /* 024F0 808FF430 8E030398 */ lw $v1, 0x0398($s0) ## 00000398 .L808FF434: /* 024F4 808FF434 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 @@ -2064,35 +2064,35 @@ glabel L808FF404 /* 024FC 808FF43C C52A0024 */ lwc1 $f10, 0x0024($t1) ## 00000024 /* 02500 808FF440 3C014248 */ lui $at, 0x4248 ## $at = 42480000 /* 02504 808FF444 44818000 */ mtc1 $at, $f16 ## $f16 = 50.00 -/* 02508 808FF448 46025101 */ sub.s $f4, $f10, $f2 +/* 02508 808FF448 46025101 */ sub.s $f4, $f10, $f2 /* 0250C 808FF44C 2401001A */ addiu $at, $zero, 0x001A ## $at = 0000001A /* 02510 808FF450 E60403A4 */ swc1 $f4, 0x03A4($s0) ## 000003A4 /* 02514 808FF454 C5260028 */ lwc1 $f6, 0x0028($t1) ## 00000028 -/* 02518 808FF458 46103200 */ add.s $f8, $f6, $f16 +/* 02518 808FF458 46103200 */ add.s $f8, $f6, $f16 /* 0251C 808FF45C E60803A8 */ swc1 $f8, 0x03A8($s0) ## 000003A8 /* 02520 808FF460 C52A002C */ lwc1 $f10, 0x002C($t1) ## 0000002C /* 02524 808FF464 E60A03AC */ swc1 $f10, 0x03AC($s0) ## 000003AC /* 02528 808FF468 C5240024 */ lwc1 $f4, 0x0024($t1) ## 00000024 /* 0252C 808FF46C E60403B0 */ swc1 $f4, 0x03B0($s0) ## 000003B0 /* 02530 808FF470 C5260028 */ lwc1 $f6, 0x0028($t1) ## 00000028 -/* 02534 808FF474 46103200 */ add.s $f8, $f6, $f16 +/* 02534 808FF474 46103200 */ add.s $f8, $f6, $f16 /* 02538 808FF478 E60803B4 */ swc1 $f8, 0x03B4($s0) ## 000003B4 /* 0253C 808FF47C C52A002C */ lwc1 $f10, 0x002C($t1) ## 0000002C -/* 02540 808FF480 146100E3 */ bne $v1, $at, .L808FF810 +/* 02540 808FF480 146100E3 */ bne $v1, $at, .L808FF810 /* 02544 808FF484 E60A03B8 */ swc1 $f10, 0x03B8($s0) ## 000003B8 /* 02548 808FF488 8E221C6C */ lw $v0, 0x1C6C($s1) ## 00001C6C /* 0254C 808FF48C 3C038091 */ lui $v1, %hi(D_8090EB30) ## $v1 = 80910000 /* 02550 808FF490 2463EB30 */ addiu $v1, $v1, %lo(D_8090EB30) ## $v1 = 8090EB30 -/* 02554 808FF494 1040001D */ beq $v0, $zero, .L808FF50C +/* 02554 808FF494 1040001D */ beq $v0, $zero, .L808FF50C /* 02558 808FF498 AC620000 */ sw $v0, 0x0000($v1) ## 8090EB30 /* 0255C 808FF49C 24060018 */ addiu $a2, $zero, 0x0018 ## $a2 = 00000018 .L808FF4A0: /* 02560 808FF4A0 84590000 */ lh $t9, 0x0000($v0) ## 00000000 -/* 02564 808FF4A4 14D90015 */ bne $a2, $t9, .L808FF4FC +/* 02564 808FF4A4 14D90015 */ bne $a2, $t9, .L808FF4FC /* 02568 808FF4A8 3C0141F0 */ lui $at, 0x41F0 ## $at = 41F00000 /* 0256C 808FF4AC 44818000 */ mtc1 $at, $f16 ## $f16 = 30.00 /* 02570 808FF4B0 C4440024 */ lwc1 $f4, 0x0024($v0) ## 00000024 -/* 02574 808FF4B4 46102181 */ sub.s $f6, $f4, $f16 +/* 02574 808FF4B4 46102181 */ sub.s $f6, $f4, $f16 /* 02578 808FF4B8 E60603A4 */ swc1 $f6, 0x03A4($s0) ## 000003A4 /* 0257C 808FF4BC 8C6B0000 */ lw $t3, 0x0000($v1) ## 8090EB30 /* 02580 808FF4C0 C5680028 */ lwc1 $f8, 0x0028($t3) ## 00000028 @@ -2108,38 +2108,38 @@ glabel L808FF404 /* 025A8 808FF4E8 E60603B4 */ swc1 $f6, 0x03B4($s0) ## 000003B4 /* 025AC 808FF4EC 8C6F0000 */ lw $t7, 0x0000($v1) ## 8090EB30 /* 025B0 808FF4F0 C5E8002C */ lwc1 $f8, 0x002C($t7) ## 0000002C -/* 025B4 808FF4F4 10000005 */ beq $zero, $zero, .L808FF50C +/* 025B4 808FF4F4 10000005 */ beq $zero, $zero, .L808FF50C /* 025B8 808FF4F8 E60803B8 */ swc1 $f8, 0x03B8($s0) ## 000003B8 .L808FF4FC: /* 025BC 808FF4FC 8C580124 */ lw $t8, 0x0124($v0) ## 00000124 /* 025C0 808FF500 03001025 */ or $v0, $t8, $zero ## $v0 = 00000000 -/* 025C4 808FF504 1700FFE6 */ bne $t8, $zero, .L808FF4A0 +/* 025C4 808FF504 1700FFE6 */ bne $t8, $zero, .L808FF4A0 /* 025C8 808FF508 AC780000 */ sw $t8, 0x0000($v1) ## 8090EB30 .L808FF50C: /* 025CC 808FF50C 2419001C */ addiu $t9, $zero, 0x001C ## $t9 = 0000001C /* 025D0 808FF510 A619039C */ sh $t9, 0x039C($s0) ## 0000039C -/* 025D4 808FF514 100000BE */ beq $zero, $zero, .L808FF810 +/* 025D4 808FF514 100000BE */ beq $zero, $zero, .L808FF810 /* 025D8 808FF518 AE000398 */ sw $zero, 0x0398($s0) ## 00000398 glabel L808FF51C /* 025DC 808FF51C 8E0B0398 */ lw $t3, 0x0398($s0) ## 00000398 /* 025E0 808FF520 24010005 */ addiu $at, $zero, 0x0005 ## $at = 00000005 /* 025E4 808FF524 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 025E8 808FF528 15610003 */ bne $t3, $at, .L808FF538 +/* 025E8 808FF528 15610003 */ bne $t3, $at, .L808FF538 /* 025EC 808FF52C 240570D6 */ addiu $a1, $zero, 0x70D6 ## $a1 = 000070D6 -/* 025F0 808FF530 0C042DA0 */ jal func_8010B680 +/* 025F0 808FF530 0C042DA0 */ jal func_8010B680 /* 025F4 808FF534 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 .L808FF538: /* 025F8 808FF538 3C038091 */ lui $v1, %hi(D_8090EB30) ## $v1 = 80910000 /* 025FC 808FF53C 2463EB30 */ addiu $v1, $v1, %lo(D_8090EB30) ## $v1 = 8090EB30 /* 02600 808FF540 8C620000 */ lw $v0, 0x0000($v1) ## 8090EB30 /* 02604 808FF544 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 -/* 02608 808FF548 504000B2 */ beql $v0, $zero, .L808FF814 +/* 02608 808FF548 504000B2 */ beql $v0, $zero, .L808FF814 /* 0260C 808FF54C 3C014080 */ lui $at, 0x4080 ## $at = 40800000 /* 02610 808FF550 44811000 */ mtc1 $at, $f2 ## $f2 = 4.00 /* 02614 808FF554 C44A0024 */ lwc1 $f10, 0x0024($v0) ## 00000024 /* 02618 808FF558 3C063E4C */ lui $a2, 0x3E4C ## $a2 = 3E4C0000 /* 0261C 808FF55C 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3E4CCCCD -/* 02620 808FF560 46025101 */ sub.s $f4, $f10, $f2 +/* 02620 808FF560 46025101 */ sub.s $f4, $f10, $f2 /* 02624 808FF564 260403B0 */ addiu $a0, $s0, 0x03B0 ## $a0 = 000003B0 /* 02628 808FF568 3C074248 */ lui $a3, 0x4248 ## $a3 = 42480000 /* 0262C 808FF56C E60403A4 */ swc1 $f4, 0x03A4($s0) ## 000003A4 @@ -2151,7 +2151,7 @@ glabel L808FF51C /* 02644 808FF584 E60803AC */ swc1 $f8, 0x03AC($s0) ## 000003AC /* 02648 808FF588 8C6E0000 */ lw $t6, 0x0000($v1) ## 8090EB30 /* 0264C 808FF58C 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 02650 808FF590 8DC50024 */ lw $a1, 0x0024($t6) ## 00000024 /* 02654 808FF594 3C014248 */ lui $at, 0x4248 ## $at = 42480000 /* 02658 808FF598 44818000 */ mtc1 $at, $f16 ## $f16 = 50.00 @@ -2159,11 +2159,11 @@ glabel L808FF51C /* 02660 808FF5A0 2463EB30 */ addiu $v1, $v1, %lo(D_8090EB30) ## $v1 = 8090EB30 /* 02664 808FF5A4 8C6F0000 */ lw $t7, 0x0000($v1) ## 8090EB30 /* 02668 808FF5A8 3C063E4C */ lui $a2, 0x3E4C ## $a2 = 3E4C0000 -/* 0266C 808FF5AC 44078000 */ mfc1 $a3, $f16 +/* 0266C 808FF5AC 44078000 */ mfc1 $a3, $f16 /* 02670 808FF5B0 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3E4CCCCD /* 02674 808FF5B4 260403B4 */ addiu $a0, $s0, 0x03B4 ## $a0 = 000003B4 /* 02678 808FF5B8 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 0267C 808FF5BC 8DE50028 */ lw $a1, 0x0028($t7) ## 00000028 /* 02680 808FF5C0 3C014248 */ lui $at, 0x4248 ## $at = 42480000 /* 02684 808FF5C4 44818000 */ mtc1 $at, $f16 ## $f16 = 50.00 @@ -2171,39 +2171,39 @@ glabel L808FF51C /* 0268C 808FF5CC 2463EB30 */ addiu $v1, $v1, %lo(D_8090EB30) ## $v1 = 8090EB30 /* 02690 808FF5D0 8C780000 */ lw $t8, 0x0000($v1) ## 8090EB30 /* 02694 808FF5D4 3C063E4C */ lui $a2, 0x3E4C ## $a2 = 3E4C0000 -/* 02698 808FF5D8 44078000 */ mfc1 $a3, $f16 +/* 02698 808FF5D8 44078000 */ mfc1 $a3, $f16 /* 0269C 808FF5DC 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3E4CCCCD /* 026A0 808FF5E0 260403B8 */ addiu $a0, $s0, 0x03B8 ## $a0 = 000003B8 /* 026A4 808FF5E4 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 026A8 808FF5E8 8F05002C */ lw $a1, 0x002C($t8) ## 0000002C /* 026AC 808FF5EC 8E190398 */ lw $t9, 0x0398($s0) ## 00000398 -/* 026B0 808FF5F0 2F210029 */ sltiu $at, $t9, 0x0029 -/* 026B4 808FF5F4 54200087 */ bnel $at, $zero, .L808FF814 +/* 026B0 808FF5F0 2F210029 */ sltiu $at, $t9, 0x0029 +/* 026B4 808FF5F4 54200087 */ bnel $at, $zero, .L808FF814 /* 026B8 808FF5F8 3C014080 */ lui $at, 0x4080 ## $at = 40800000 -/* 026BC 808FF5FC 0C042F6F */ jal func_8010BDBC +/* 026BC 808FF5FC 0C042F6F */ jal func_8010BDBC /* 026C0 808FF600 262420D8 */ addiu $a0, $s1, 0x20D8 ## $a0 = 000020D8 -/* 026C4 808FF604 14400082 */ bne $v0, $zero, .L808FF810 +/* 026C4 808FF604 14400082 */ bne $v0, $zero, .L808FF810 /* 026C8 808FF608 240B001D */ addiu $t3, $zero, 0x001D ## $t3 = 0000001D /* 026CC 808FF60C 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 /* 026D0 808FF610 A60B039C */ sh $t3, 0x039C($s0) ## 0000039C /* 026D4 808FF614 AE000398 */ sw $zero, 0x0398($s0) ## 00000398 /* 026D8 808FF618 24A547E0 */ addiu $a1, $a1, 0x47E0 ## $a1 = 060147E0 /* 026DC 808FF61C 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C -/* 026E0 808FF620 0C029490 */ jal func_800A5240 +/* 026E0 808FF620 0C029490 */ jal SkelAnime_ChangeAnimTransitionStop /* 026E4 808FF624 24060000 */ addiu $a2, $zero, 0x0000 ## $a2 = 00000000 /* 026E8 808FF628 3C040601 */ lui $a0, 0x0601 ## $a0 = 06010000 /* 026EC 808FF62C 0C028800 */ jal SkelAnime_GetFrameCount - + /* 026F0 808FF630 248447E0 */ addiu $a0, $a0, 0x47E0 ## $a0 = 060147E0 /* 026F4 808FF634 44825000 */ mtc1 $v0, $f10 ## $f10 = 0.00 /* 026F8 808FF638 44803000 */ mtc1 $zero, $f6 ## $f6 = 0.00 /* 026FC 808FF63C 3C018091 */ lui $at, %hi(D_8090DBA0) ## $at = 80910000 -/* 02700 808FF640 46805120 */ cvt.s.w $f4, $f10 +/* 02700 808FF640 46805120 */ cvt.s.w $f4, $f10 /* 02704 808FF644 E60600BC */ swc1 $f6, 0x00BC($s0) ## 000000BC /* 02708 808FF648 240A0001 */ addiu $t2, $zero, 0x0001 ## $t2 = 00000001 /* 0270C 808FF64C E6040194 */ swc1 $f4, 0x0194($s0) ## 00000194 -/* 02710 808FF650 C428DBA0 */ lwc1 $f8, %lo(D_8090DBA0)($at) +/* 02710 808FF650 C428DBA0 */ lwc1 $f8, %lo(D_8090DBA0)($at) /* 02714 808FF654 3C01BF80 */ lui $at, 0xBF80 ## $at = BF800000 /* 02718 808FF658 44815000 */ mtc1 $at, $f10 ## $f10 = -1.00 /* 0271C 808FF65C 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 @@ -2211,14 +2211,14 @@ glabel L808FF51C /* 02724 808FF664 A20A0335 */ sb $t2, 0x0335($s0) ## 00000335 /* 02728 808FF668 E6080028 */ swc1 $f8, 0x0028($s0) ## 00000028 /* 0272C 808FF66C E60A006C */ swc1 $f10, 0x006C($s0) ## 0000006C -/* 02730 808FF670 10000067 */ beq $zero, $zero, .L808FF810 +/* 02730 808FF670 10000067 */ beq $zero, $zero, .L808FF810 /* 02734 808FF674 E6040224 */ swc1 $f4, 0x0224($s0) ## 00000224 glabel L808FF678 /* 02738 808FF678 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C -/* 0273C 808FF67C AFA40050 */ sw $a0, 0x0050($sp) +/* 0273C 808FF67C AFA40050 */ sw $a0, 0x0050($sp) /* 02740 808FF680 0C02927F */ jal SkelAnime_FrameUpdateMatrix - -/* 02744 808FF684 AFA90088 */ sw $t1, 0x0088($sp) + +/* 02744 808FF684 AFA90088 */ sw $t1, 0x0088($sp) /* 02748 808FF688 3C014220 */ lui $at, 0x4220 ## $at = 42200000 /* 0274C 808FF68C 44816000 */ mtc1 $at, $f12 ## $f12 = 40.00 /* 02750 808FF690 3C014120 */ lui $at, 0x4120 ## $at = 41200000 @@ -2230,48 +2230,48 @@ glabel L808FF678 /* 02768 808FF6A8 C6000024 */ lwc1 $f0, 0x0024($s0) ## 00000024 /* 0276C 808FF6AC 3C0143AF */ lui $at, 0x43AF ## $at = 43AF0000 /* 02770 808FF6B0 44815000 */ mtc1 $at, $f10 ## $f10 = 350.00 -/* 02774 808FF6B4 46060200 */ add.s $f8, $f0, $f6 +/* 02774 808FF6B4 46060200 */ add.s $f8, $f0, $f6 /* 02778 808FF6B8 3C0142C8 */ lui $at, 0x42C8 ## $at = 42C80000 /* 0277C 808FF6BC 44813000 */ mtc1 $at, $f6 ## $f6 = 100.00 -/* 02780 808FF6C0 8FA90088 */ lw $t1, 0x0088($sp) -/* 02784 808FF6C4 460A4101 */ sub.s $f4, $f8, $f10 +/* 02780 808FF6C0 8FA90088 */ lw $t1, 0x0088($sp) +/* 02784 808FF6C4 460A4101 */ sub.s $f4, $f8, $f10 /* 02788 808FF6C8 C602002C */ lwc1 $f2, 0x002C($s0) ## 0000002C /* 0278C 808FF6CC 3C01430C */ lui $at, 0x430C ## $at = 430C0000 /* 02790 808FF6D0 E60003B0 */ swc1 $f0, 0x03B0($s0) ## 000003B0 -/* 02794 808FF6D4 46062200 */ add.s $f8, $f4, $f6 +/* 02794 808FF6D4 46062200 */ add.s $f8, $f4, $f6 /* 02798 808FF6D8 C6040028 */ lwc1 $f4, 0x0028($s0) ## 00000028 /* 0279C 808FF6DC E60203B8 */ swc1 $f2, 0x03B8($s0) ## 000003B8 -/* 027A0 808FF6E0 460E1180 */ add.s $f6, $f2, $f14 +/* 027A0 808FF6E0 460E1180 */ add.s $f6, $f2, $f14 /* 027A4 808FF6E4 E60403A8 */ swc1 $f4, 0x03A8($s0) ## 000003A8 /* 027A8 808FF6E8 240CC000 */ addiu $t4, $zero, 0xC000 ## $t4 = FFFFC000 -/* 027AC 808FF6EC 46104281 */ sub.s $f10, $f8, $f16 +/* 027AC 808FF6EC 46104281 */ sub.s $f10, $f8, $f16 /* 027B0 808FF6F0 C60801BC */ lwc1 $f8, 0x01BC($s0) ## 000001BC /* 027B4 808FF6F4 E60603AC */ swc1 $f6, 0x03AC($s0) ## 000003AC /* 027B8 808FF6F8 44813000 */ mtc1 $at, $f6 ## $f6 = 140.00 /* 027BC 808FF6FC E60A03A4 */ swc1 $f10, 0x03A4($s0) ## 000003A4 -/* 027C0 808FF700 46104280 */ add.s $f10, $f8, $f16 +/* 027C0 808FF700 46104280 */ add.s $f10, $f8, $f16 /* 027C4 808FF704 3C01C344 */ lui $at, 0xC344 ## $at = C3440000 /* 027C8 808FF708 44814000 */ mtc1 $at, $f8 ## $f8 = -196.00 /* 027CC 808FF70C 24010032 */ addiu $at, $zero, 0x0032 ## $at = 00000032 -/* 027D0 808FF710 460C5101 */ sub.s $f4, $f10, $f12 +/* 027D0 808FF710 460C5101 */ sub.s $f4, $f10, $f12 /* 027D4 808FF714 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 027D8 808FF718 E60403B4 */ swc1 $f4, 0x03B4($s0) ## 000003B4 /* 027DC 808FF71C A52C00B6 */ sh $t4, 0x00B6($t1) ## 000000B6 /* 027E0 808FF720 E5260024 */ swc1 $f6, 0x0024($t1) ## 00000024 /* 027E4 808FF724 E528002C */ swc1 $f8, 0x002C($t1) ## 0000002C /* 027E8 808FF728 8E0D0398 */ lw $t5, 0x0398($s0) ## 00000398 -/* 027EC 808FF72C 55A10004 */ bnel $t5, $at, .L808FF740 -/* 027F0 808FF730 8FA40050 */ lw $a0, 0x0050($sp) +/* 027EC 808FF72C 55A10004 */ bnel $t5, $at, .L808FF740 +/* 027F0 808FF730 8FA40050 */ lw $a0, 0x0050($sp) /* 027F4 808FF734 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 027F8 808FF738 2405398F */ addiu $a1, $zero, 0x398F ## $a1 = 0000398F -/* 027FC 808FF73C 8FA40050 */ lw $a0, 0x0050($sp) +/* 027FC 808FF73C 8FA40050 */ lw $a0, 0x0050($sp) .L808FF740: -/* 02800 808FF740 0C0295B2 */ jal func_800A56C8 +/* 02800 808FF740 0C0295B2 */ jal func_800A56C8 /* 02804 808FF744 8E050194 */ lw $a1, 0x0194($s0) ## 00000194 -/* 02808 808FF748 10400031 */ beq $v0, $zero, .L808FF810 +/* 02808 808FF748 10400031 */ beq $v0, $zero, .L808FF810 /* 0280C 808FF74C 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 02810 808FF750 0C030129 */ jal func_800C04A4 +/* 02810 808FF750 0C030129 */ jal func_800C04A4 /* 02814 808FF754 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 02818 808FF758 260303A4 */ addiu $v1, $s0, 0x03A4 ## $v1 = 000003A4 /* 0281C 808FF75C 8C6F0000 */ lw $t7, 0x0000($v1) ## 000003A4 @@ -2294,21 +2294,21 @@ glabel L808FF678 /* 02860 808FF7A0 AC4B0054 */ sw $t3, 0x0054($v0) ## 00000054 /* 02864 808FF7A4 8E0C03B8 */ lw $t4, 0x03B8($s0) ## 000003B8 /* 02868 808FF7A8 AC4C0058 */ sw $t4, 0x0058($v0) ## 00000058 -/* 0286C 808FF7AC 0C03022B */ jal func_800C08AC +/* 0286C 808FF7AC 0C03022B */ jal func_800C08AC /* 02870 808FF7B0 8605039E */ lh $a1, 0x039E($s0) ## 0000039E /* 02874 808FF7B4 A600039E */ sh $zero, 0x039E($s0) ## 0000039E /* 02878 808FF7B8 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 0287C 808FF7BC 0C01914D */ jal func_80064534 +/* 0287C 808FF7BC 0C01914D */ jal func_80064534 /* 02880 808FF7C0 26251D64 */ addiu $a1, $s1, 0x1D64 ## $a1 = 00001D64 /* 02884 808FF7C4 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 02888 808FF7C8 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 0288C 808FF7CC 0C00B7D5 */ jal func_8002DF54 +/* 0288C 808FF7CC 0C00B7D5 */ jal func_8002DF54 /* 02890 808FF7D0 24060007 */ addiu $a2, $zero, 0x0007 ## $a2 = 00000007 /* 02894 808FF7D4 240A0001 */ addiu $t2, $zero, 0x0001 ## $t2 = 00000001 /* 02898 808FF7D8 A600039C */ sh $zero, 0x039C($s0) ## 0000039C /* 0289C 808FF7DC A20A0337 */ sb $t2, 0x0337($s0) ## 00000337 /* 028A0 808FF7E0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 028A4 808FF7E4 0C23FF6C */ jal func_808FFDB0 +/* 028A4 808FF7E4 0C23FF6C */ jal func_808FFDB0 /* 028A8 808FF7E8 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 /* 028AC 808FF7EC 8E0E0004 */ lw $t6, 0x0004($s0) ## 00000004 /* 028B0 808FF7F0 240D0032 */ addiu $t5, $zero, 0x0032 ## $t5 = 00000032 @@ -2316,7 +2316,7 @@ glabel L808FF678 /* 028B8 808FF7F8 35CF0001 */ ori $t7, $t6, 0x0001 ## $t7 = 00000001 /* 028BC 808FF7FC AE0F0004 */ sw $t7, 0x0004($s0) ## 00000004 /* 028C0 808FF800 3C198091 */ lui $t9, %hi(D_8090EB2C) ## $t9 = 80910000 -/* 028C4 808FF804 8F39EB2C */ lw $t9, %lo(D_8090EB2C)($t9) +/* 028C4 808FF804 8F39EB2C */ lw $t9, %lo(D_8090EB2C)($t9) /* 028C8 808FF808 24180007 */ addiu $t8, $zero, 0x0007 ## $t8 = 00000007 /* 028CC 808FF80C A33803C8 */ sb $t8, 0x03C8($t9) ## 809103C8 glabel L808FF810 @@ -2325,40 +2325,40 @@ glabel L808FF810 .L808FF814: /* 028D4 808FF814 44815000 */ mtc1 $at, $f10 ## $f10 = 4.00 /* 028D8 808FF818 C604030C */ lwc1 $f4, 0x030C($s0) ## 0000030C -/* 028DC 808FF81C 93AB008D */ lbu $t3, 0x008D($sp) -/* 028E0 808FF820 4604503C */ c.lt.s $f10, $f4 +/* 028DC 808FF81C 93AB008D */ lbu $t3, 0x008D($sp) +/* 028E0 808FF820 4604503C */ c.lt.s $f10, $f4 /* 028E4 808FF824 00000000 */ nop -/* 028E8 808FF828 45020006 */ bc1fl .L808FF844 +/* 028E8 808FF828 45020006 */ bc1fl .L808FF844 /* 028EC 808FF82C 8605039E */ lh $a1, 0x039E($s0) ## 0000039E -/* 028F0 808FF830 15600003 */ bne $t3, $zero, .L808FF840 +/* 028F0 808FF830 15600003 */ bne $t3, $zero, .L808FF840 /* 028F4 808FF834 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 028F8 808FF838 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 028FC 808FF83C 24053163 */ addiu $a1, $zero, 0x3163 ## $a1 = 00003163 .L808FF840: /* 02900 808FF840 8605039E */ lh $a1, 0x039E($s0) ## 0000039E .L808FF844: /* 02904 808FF844 260C03A4 */ addiu $t4, $s0, 0x03A4 ## $t4 = 000003A4 /* 02908 808FF848 260D03B0 */ addiu $t5, $s0, 0x03B0 ## $t5 = 000003B0 -/* 0290C 808FF84C 50A0000E */ beql $a1, $zero, .L808FF888 -/* 02910 808FF850 8FBF003C */ lw $ra, 0x003C($sp) -/* 02914 808FF854 AFAC004C */ sw $t4, 0x004C($sp) -/* 02918 808FF858 AFAD0050 */ sw $t5, 0x0050($sp) +/* 0290C 808FF84C 50A0000E */ beql $a1, $zero, .L808FF888 +/* 02910 808FF850 8FBF003C */ lw $ra, 0x003C($sp) +/* 02914 808FF854 AFAC004C */ sw $t4, 0x004C($sp) +/* 02918 808FF858 AFAD0050 */ sw $t5, 0x0050($sp) /* 0291C 808FF85C C60603B4 */ lwc1 $f6, 0x03B4($s0) ## 000003B4 /* 02920 808FF860 C608041C */ lwc1 $f8, 0x041C($s0) ## 0000041C /* 02924 808FF864 260E03BC */ addiu $t6, $s0, 0x03BC ## $t6 = 000003BC /* 02928 808FF868 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 0292C 808FF86C 46083280 */ add.s $f10, $f6, $f8 +/* 0292C 808FF86C 46083280 */ add.s $f10, $f6, $f8 /* 02930 808FF870 E60A03B4 */ swc1 $f10, 0x03B4($s0) ## 000003B4 -/* 02934 808FF874 AFAE0010 */ sw $t6, 0x0010($sp) -/* 02938 808FF878 8FA7004C */ lw $a3, 0x004C($sp) -/* 0293C 808FF87C 0C030179 */ jal func_800C05E4 -/* 02940 808FF880 8FA60050 */ lw $a2, 0x0050($sp) -/* 02944 808FF884 8FBF003C */ lw $ra, 0x003C($sp) +/* 02934 808FF874 AFAE0010 */ sw $t6, 0x0010($sp) +/* 02938 808FF878 8FA7004C */ lw $a3, 0x004C($sp) +/* 0293C 808FF87C 0C030179 */ jal func_800C05E4 +/* 02940 808FF880 8FA60050 */ lw $a2, 0x0050($sp) +/* 02944 808FF884 8FBF003C */ lw $ra, 0x003C($sp) .L808FF888: -/* 02948 808FF888 8FB00034 */ lw $s0, 0x0034($sp) -/* 0294C 808FF88C 8FB10038 */ lw $s1, 0x0038($sp) -/* 02950 808FF890 03E00008 */ jr $ra +/* 02948 808FF888 8FB00034 */ lw $s0, 0x0034($sp) +/* 0294C 808FF88C 8FB10038 */ lw $s1, 0x0038($sp) +/* 02950 808FF890 03E00008 */ jr $ra /* 02954 808FF894 27BD0090 */ addiu $sp, $sp, 0x0090 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_808FFDB0.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_808FFDB0.s index 8d7d7552c4..bd0c575188 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_808FFDB0.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_808FFDB0.s @@ -1,54 +1,54 @@ glabel func_808FFDB0 /* 02E70 808FFDB0 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 02E74 808FFDB4 AFB00018 */ sw $s0, 0x0018($sp) +/* 02E74 808FFDB4 AFB00018 */ sw $s0, 0x0018($sp) /* 02E78 808FFDB8 3C010001 */ lui $at, 0x0001 ## $at = 00010000 /* 02E7C 808FFDBC 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 02E80 808FFDC0 342117A4 */ ori $at, $at, 0x17A4 ## $at = 000117A4 -/* 02E84 808FFDC4 AFBF001C */ sw $ra, 0x001C($sp) -/* 02E88 808FFDC8 AFA50034 */ sw $a1, 0x0034($sp) -/* 02E8C 808FFDCC 00A12021 */ addu $a0, $a1, $at -/* 02E90 808FFDD0 AFA40024 */ sw $a0, 0x0024($sp) +/* 02E84 808FFDC4 AFBF001C */ sw $ra, 0x001C($sp) +/* 02E88 808FFDC8 AFA50034 */ sw $a1, 0x0034($sp) +/* 02E8C 808FFDCC 00A12021 */ addu $a0, $a1, $at +/* 02E90 808FFDD0 AFA40024 */ sw $a0, 0x0024($sp) /* 02E94 808FFDD4 0C02604B */ jal Object_GetIndex ## ObjectIndex /* 02E98 808FFDD8 24050153 */ addiu $a1, $zero, 0x0153 ## $a1 = 00000153 -/* 02E9C 808FFDDC 8FA40024 */ lw $a0, 0x0024($sp) -/* 02EA0 808FFDE0 AFA20028 */ sw $v0, 0x0028($sp) +/* 02E9C 808FFDDC 8FA40024 */ lw $a0, 0x0024($sp) +/* 02EA0 808FFDE0 AFA20028 */ sw $v0, 0x0028($sp) /* 02EA4 808FFDE4 0C026062 */ jal Object_IsLoaded - + /* 02EA8 808FFDE8 00402825 */ or $a1, $v0, $zero ## $a1 = 00000000 -/* 02EAC 808FFDEC 1040002C */ beq $v0, $zero, .L808FFEA0 +/* 02EAC 808FFDEC 1040002C */ beq $v0, $zero, .L808FFEA0 /* 02EB0 808FFDF0 3C088090 */ lui $t0, %hi(func_808FFDB0) ## $t0 = 80900000 -/* 02EB4 808FFDF4 8FAF0028 */ lw $t7, 0x0028($sp) -/* 02EB8 808FFDF8 8FAE0034 */ lw $t6, 0x0034($sp) +/* 02EB4 808FFDF4 8FAF0028 */ lw $t7, 0x0028($sp) +/* 02EB8 808FFDF8 8FAE0034 */ lw $t6, 0x0034($sp) /* 02EBC 808FFDFC 3C080001 */ lui $t0, 0x0001 ## $t0 = 00010000 -/* 02EC0 808FFE00 000FC100 */ sll $t8, $t7, 4 -/* 02EC4 808FFE04 030FC021 */ addu $t8, $t8, $t7 -/* 02EC8 808FFE08 0018C080 */ sll $t8, $t8, 2 -/* 02ECC 808FFE0C 01D8C821 */ addu $t9, $t6, $t8 -/* 02ED0 808FFE10 01194021 */ addu $t0, $t0, $t9 +/* 02EC0 808FFE00 000FC100 */ sll $t8, $t7, 4 +/* 02EC4 808FFE04 030FC021 */ addu $t8, $t8, $t7 +/* 02EC8 808FFE08 0018C080 */ sll $t8, $t8, 2 +/* 02ECC 808FFE0C 01D8C821 */ addu $t9, $t6, $t8 +/* 02ED0 808FFE10 01194021 */ addu $t0, $t0, $t9 /* 02ED4 808FFE14 8D0817B4 */ lw $t0, 0x17B4($t0) ## 000117B4 /* 02ED8 808FFE18 3C018000 */ lui $at, 0x8000 ## $at = 80000000 /* 02EDC 808FFE1C 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 -/* 02EE0 808FFE20 01014821 */ addu $t1, $t0, $at +/* 02EE0 808FFE20 01014821 */ addu $t1, $t0, $at /* 02EE4 808FFE24 3C018016 */ lui $at, 0x8016 ## $at = 80160000 /* 02EE8 808FFE28 AC296FC0 */ sw $t1, 0x6FC0($at) ## 80166FC0 /* 02EEC 808FFE2C 24A5FFE4 */ addiu $a1, $a1, 0xFFE4 ## $a1 = 0600FFE4 /* 02EF0 808FFE30 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C -/* 02EF4 808FFE34 0C0294D3 */ jal func_800A534C +/* 02EF4 808FFE34 0C0294D3 */ jal SkelAnime_ChangeAnimTransitionRepeat /* 02EF8 808FFE38 3C06C120 */ lui $a2, 0xC120 ## $a2 = C1200000 /* 02EFC 808FFE3C 920B0334 */ lbu $t3, 0x0334($s0) ## 00000334 /* 02F00 808FFE40 3C0A8090 */ lui $t2, %hi(func_808FFEBC) ## $t2 = 80900000 /* 02F04 808FFE44 254AFEBC */ addiu $t2, $t2, %lo(func_808FFEBC) ## $t2 = 808FFEBC -/* 02F08 808FFE48 11600009 */ beq $t3, $zero, .L808FFE70 +/* 02F08 808FFE48 11600009 */ beq $t3, $zero, .L808FFE70 /* 02F0C 808FFE4C AE0A0190 */ sw $t2, 0x0190($s0) ## 00000190 /* 02F10 808FFE50 3C0141F0 */ lui $at, 0x41F0 ## $at = 41F00000 /* 02F14 808FFE54 44816000 */ mtc1 $at, $f12 ## $f12 = 30.00 /* 02F18 808FFE58 0C00CFBE */ jal Math_Rand_ZeroFloat - + /* 02F1C 808FFE5C 00000000 */ nop -/* 02F20 808FFE60 4600010D */ trunc.w.s $f4, $f0 -/* 02F24 808FFE64 440D2000 */ mfc1 $t5, $f4 -/* 02F28 808FFE68 10000003 */ beq $zero, $zero, .L808FFE78 +/* 02F20 808FFE60 4600010D */ trunc.w.s $f4, $f0 +/* 02F24 808FFE64 440D2000 */ mfc1 $t5, $f4 +/* 02F28 808FFE68 10000003 */ beq $zero, $zero, .L808FFE78 /* 02F2C 808FFE6C A60D01A2 */ sh $t5, 0x01A2($s0) ## 000001A2 .L808FFE70: /* 02F30 808FFE70 240F0028 */ addiu $t7, $zero, 0x0028 ## $t7 = 00000028 @@ -62,16 +62,16 @@ glabel func_808FFDB0 /* 02F4C 808FFE8C A20E0336 */ sb $t6, 0x0336($s0) ## 00000336 /* 02F50 808FFE90 AE190004 */ sw $t9, 0x0004($s0) ## 00000004 /* 02F54 808FFE94 E6000228 */ swc1 $f0, 0x0228($s0) ## 00000228 -/* 02F58 808FFE98 10000003 */ beq $zero, $zero, .L808FFEA8 +/* 02F58 808FFE98 10000003 */ beq $zero, $zero, .L808FFEA8 /* 02F5C 808FFE9C E6000224 */ swc1 $f0, 0x0224($s0) ## 00000224 .L808FFEA0: /* 02F60 808FFEA0 2508FDB0 */ addiu $t0, $t0, %lo(func_808FFDB0) ## $t0 = FFFFFDB0 /* 02F64 808FFEA4 AE080190 */ sw $t0, 0x0190($s0) ## 00000190 .L808FFEA8: -/* 02F68 808FFEA8 8FBF001C */ lw $ra, 0x001C($sp) -/* 02F6C 808FFEAC 8FB00018 */ lw $s0, 0x0018($sp) +/* 02F68 808FFEA8 8FBF001C */ lw $ra, 0x001C($sp) +/* 02F6C 808FFEAC 8FB00018 */ lw $s0, 0x0018($sp) /* 02F70 808FFEB0 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 02F74 808FFEB4 03E00008 */ jr $ra +/* 02F74 808FFEB4 03E00008 */ jr $ra /* 02F78 808FFEB8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_808FFF90.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_808FFF90.s index df6e9e7a03..fed228249d 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_808FFF90.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_808FFF90.s @@ -1,23 +1,23 @@ glabel func_808FFF90 /* 03050 808FFF90 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 03054 808FFF94 AFA5001C */ sw $a1, 0x001C($sp) -/* 03058 808FFF98 AFBF0014 */ sw $ra, 0x0014($sp) +/* 03054 808FFF94 AFA5001C */ sw $a1, 0x001C($sp) +/* 03058 808FFF98 AFBF0014 */ sw $ra, 0x0014($sp) /* 0305C 808FFF9C 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 /* 03060 808FFFA0 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 /* 03064 808FFFA4 24A5FFE4 */ addiu $a1, $a1, 0xFFE4 ## $a1 = 0600FFE4 -/* 03068 808FFFA8 AFA70018 */ sw $a3, 0x0018($sp) +/* 03068 808FFFA8 AFA70018 */ sw $a3, 0x0018($sp) /* 0306C 808FFFAC 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 03070 808FFFB0 0C0294D3 */ jal func_800A534C +/* 03070 808FFFB0 0C0294D3 */ jal SkelAnime_ChangeAnimTransitionRepeat /* 03074 808FFFB4 3C06C120 */ lui $a2, 0xC120 ## $a2 = C1200000 -/* 03078 808FFFB8 8FA70018 */ lw $a3, 0x0018($sp) +/* 03078 808FFFB8 8FA70018 */ lw $a3, 0x0018($sp) /* 0307C 808FFFBC 3C0E8090 */ lui $t6, %hi(func_808FFFE0) ## $t6 = 80900000 /* 03080 808FFFC0 25CEFFE0 */ addiu $t6, $t6, %lo(func_808FFFE0) ## $t6 = 808FFFE0 /* 03084 808FFFC4 240F0028 */ addiu $t7, $zero, 0x0028 ## $t7 = 00000028 /* 03088 808FFFC8 ACEE0190 */ sw $t6, 0x0190($a3) ## 00000190 /* 0308C 808FFFCC A4EF01A2 */ sh $t7, 0x01A2($a3) ## 000001A2 -/* 03090 808FFFD0 8FBF0014 */ lw $ra, 0x0014($sp) +/* 03090 808FFFD0 8FBF0014 */ lw $ra, 0x0014($sp) /* 03094 808FFFD4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 03098 808FFFD8 03E00008 */ jr $ra +/* 03098 808FFFD8 03E00008 */ jr $ra /* 0309C 808FFFDC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_809000A0.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_809000A0.s index ecf5768477..3794921734 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_809000A0.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_809000A0.s @@ -1,29 +1,29 @@ glabel func_809000A0 /* 03160 809000A0 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 03164 809000A4 AFA5001C */ sw $a1, 0x001C($sp) -/* 03168 809000A8 AFBF0014 */ sw $ra, 0x0014($sp) +/* 03164 809000A4 AFA5001C */ sw $a1, 0x001C($sp) +/* 03168 809000A8 AFBF0014 */ sw $ra, 0x0014($sp) /* 0316C 809000AC 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 /* 03170 809000B0 3C050602 */ lui $a1, 0x0602 ## $a1 = 06020000 /* 03174 809000B4 24A56510 */ addiu $a1, $a1, 0x6510 ## $a1 = 06026510 -/* 03178 809000B8 AFA70018 */ sw $a3, 0x0018($sp) +/* 03178 809000B8 AFA70018 */ sw $a3, 0x0018($sp) /* 0317C 809000BC 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 03180 809000C0 0C0294D3 */ jal func_800A534C +/* 03180 809000C0 0C0294D3 */ jal SkelAnime_ChangeAnimTransitionRepeat /* 03184 809000C4 3C06C000 */ lui $a2, 0xC000 ## $a2 = C0000000 /* 03188 809000C8 3C040602 */ lui $a0, 0x0602 ## $a0 = 06020000 /* 0318C 809000CC 0C028800 */ jal SkelAnime_GetFrameCount - + /* 03190 809000D0 24846510 */ addiu $a0, $a0, 0x6510 ## $a0 = 06026510 /* 03194 809000D4 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 -/* 03198 809000D8 8FA70018 */ lw $a3, 0x0018($sp) +/* 03198 809000D8 8FA70018 */ lw $a3, 0x0018($sp) /* 0319C 809000DC 3C0E8090 */ lui $t6, %hi(func_80900104) ## $t6 = 80900000 -/* 031A0 809000E0 468021A0 */ cvt.s.w $f6, $f4 +/* 031A0 809000E0 468021A0 */ cvt.s.w $f6, $f4 /* 031A4 809000E4 25CE0104 */ addiu $t6, $t6, %lo(func_80900104) ## $t6 = 80900104 /* 031A8 809000E8 A4E001AC */ sh $zero, 0x01AC($a3) ## 000001AC /* 031AC 809000EC ACEE0190 */ sw $t6, 0x0190($a3) ## 00000190 /* 031B0 809000F0 E4E60194 */ swc1 $f6, 0x0194($a3) ## 00000194 -/* 031B4 809000F4 8FBF0014 */ lw $ra, 0x0014($sp) +/* 031B4 809000F4 8FBF0014 */ lw $ra, 0x0014($sp) /* 031B8 809000F8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 031BC 809000FC 03E00008 */ jr $ra +/* 031BC 809000FC 03E00008 */ jr $ra /* 031C0 80900100 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_80900104.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_80900104.s index 78c0466b13..04d3033a7c 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_80900104.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_80900104.s @@ -1,78 +1,78 @@ glabel func_80900104 /* 031C4 80900104 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 031C8 80900108 AFB00018 */ sw $s0, 0x0018($sp) +/* 031C8 80900108 AFB00018 */ sw $s0, 0x0018($sp) /* 031CC 8090010C 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 031D0 80900110 AFBF001C */ sw $ra, 0x001C($sp) +/* 031D0 80900110 AFBF001C */ sw $ra, 0x001C($sp) /* 031D4 80900114 2487014C */ addiu $a3, $a0, 0x014C ## $a3 = 0000014C -/* 031D8 80900118 AFA5002C */ sw $a1, 0x002C($sp) +/* 031D8 80900118 AFA5002C */ sw $a1, 0x002C($sp) /* 031DC 8090011C 00E02025 */ or $a0, $a3, $zero ## $a0 = 0000014C /* 031E0 80900120 0C02927F */ jal SkelAnime_FrameUpdateMatrix - -/* 031E4 80900124 AFA70020 */ sw $a3, 0x0020($sp) + +/* 031E4 80900124 AFA70020 */ sw $a3, 0x0020($sp) /* 031E8 80900128 26040068 */ addiu $a0, $s0, 0x0068 ## $a0 = 00000068 /* 031EC 8090012C 3C053F00 */ lui $a1, 0x3F00 ## $a1 = 3F000000 /* 031F0 80900130 0C01E123 */ jal Math_SmoothDownscaleMaxF - + /* 031F4 80900134 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 031F8 80900138 860201AC */ lh $v0, 0x01AC($s0) ## 000001AC -/* 031FC 8090013C 8FA70020 */ lw $a3, 0x0020($sp) +/* 031FC 8090013C 8FA70020 */ lw $a3, 0x0020($sp) /* 03200 80900140 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 03204 80900144 10400007 */ beq $v0, $zero, .L80900164 +/* 03204 80900144 10400007 */ beq $v0, $zero, .L80900164 /* 03208 80900148 00E02025 */ or $a0, $a3, $zero ## $a0 = 00000000 -/* 0320C 8090014C 10410014 */ beq $v0, $at, .L809001A0 +/* 0320C 8090014C 10410014 */ beq $v0, $at, .L809001A0 /* 03210 80900150 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 03214 80900154 10410023 */ beq $v0, $at, .L809001E4 +/* 03214 80900154 10410023 */ beq $v0, $at, .L809001E4 /* 03218 80900158 00E02025 */ or $a0, $a3, $zero ## $a0 = 00000000 -/* 0321C 8090015C 10000028 */ beq $zero, $zero, .L80900200 -/* 03220 80900160 8FBF001C */ lw $ra, 0x001C($sp) +/* 0321C 8090015C 10000028 */ beq $zero, $zero, .L80900200 +/* 03220 80900160 8FBF001C */ lw $ra, 0x001C($sp) .L80900164: /* 03224 80900164 8E050194 */ lw $a1, 0x0194($s0) ## 00000194 -/* 03228 80900168 0C0295B2 */ jal func_800A56C8 -/* 0322C 8090016C AFA70020 */ sw $a3, 0x0020($sp) -/* 03230 80900170 10400022 */ beq $v0, $zero, .L809001FC -/* 03234 80900174 8FA70020 */ lw $a3, 0x0020($sp) +/* 03228 80900168 0C0295B2 */ jal func_800A56C8 +/* 0322C 8090016C AFA70020 */ sw $a3, 0x0020($sp) +/* 03230 80900170 10400022 */ beq $v0, $zero, .L809001FC +/* 03234 80900174 8FA70020 */ lw $a3, 0x0020($sp) /* 03238 80900178 240E0001 */ addiu $t6, $zero, 0x0001 ## $t6 = 00000001 /* 0323C 8090017C 3C050602 */ lui $a1, 0x0602 ## $a1 = 06020000 /* 03240 80900180 A60E01AC */ sh $t6, 0x01AC($s0) ## 000001AC /* 03244 80900184 24A56AF4 */ addiu $a1, $a1, 0x6AF4 ## $a1 = 06026AF4 /* 03248 80900188 00E02025 */ or $a0, $a3, $zero ## $a0 = 00000000 -/* 0324C 8090018C 0C0294D3 */ jal func_800A534C +/* 0324C 8090018C 0C0294D3 */ jal SkelAnime_ChangeAnimTransitionRepeat /* 03250 80900190 24060000 */ addiu $a2, $zero, 0x0000 ## $a2 = 00000000 /* 03254 80900194 240F0050 */ addiu $t7, $zero, 0x0050 ## $t7 = 00000050 -/* 03258 80900198 10000018 */ beq $zero, $zero, .L809001FC +/* 03258 80900198 10000018 */ beq $zero, $zero, .L809001FC /* 0325C 8090019C A60F01A2 */ sh $t7, 0x01A2($s0) ## 000001A2 .L809001A0: /* 03260 809001A0 861801A2 */ lh $t8, 0x01A2($s0) ## 000001A2 /* 03264 809001A4 24190002 */ addiu $t9, $zero, 0x0002 ## $t9 = 00000002 /* 03268 809001A8 00E02025 */ or $a0, $a3, $zero ## $a0 = 00000000 -/* 0326C 809001AC 17000013 */ bne $t8, $zero, .L809001FC +/* 0326C 809001AC 17000013 */ bne $t8, $zero, .L809001FC /* 03270 809001B0 3C050602 */ lui $a1, 0x0602 ## $a1 = 06020000 /* 03274 809001B4 A61901AC */ sh $t9, 0x01AC($s0) ## 000001AC /* 03278 809001B8 24A57824 */ addiu $a1, $a1, 0x7824 ## $a1 = 06027824 -/* 0327C 809001BC 0C0294D3 */ jal func_800A534C +/* 0327C 809001BC 0C0294D3 */ jal SkelAnime_ChangeAnimTransitionRepeat /* 03280 809001C0 3C06C0A0 */ lui $a2, 0xC0A0 ## $a2 = C0A00000 /* 03284 809001C4 3C040602 */ lui $a0, 0x0602 ## $a0 = 06020000 /* 03288 809001C8 0C028800 */ jal SkelAnime_GetFrameCount - + /* 0328C 809001CC 24847824 */ addiu $a0, $a0, 0x7824 ## $a0 = 06027824 /* 03290 809001D0 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 03294 809001D4 00000000 */ nop -/* 03298 809001D8 468021A0 */ cvt.s.w $f6, $f4 -/* 0329C 809001DC 10000007 */ beq $zero, $zero, .L809001FC +/* 03298 809001D8 468021A0 */ cvt.s.w $f6, $f4 +/* 0329C 809001DC 10000007 */ beq $zero, $zero, .L809001FC /* 032A0 809001E0 E6060194 */ swc1 $f6, 0x0194($s0) ## 00000194 .L809001E4: -/* 032A4 809001E4 0C0295B2 */ jal func_800A56C8 +/* 032A4 809001E4 0C0295B2 */ jal func_800A56C8 /* 032A8 809001E8 8E050194 */ lw $a1, 0x0194($s0) ## 00000194 -/* 032AC 809001EC 10400003 */ beq $v0, $zero, .L809001FC +/* 032AC 809001EC 10400003 */ beq $v0, $zero, .L809001FC /* 032B0 809001F0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 032B4 809001F4 0C2400B3 */ jal func_809002CC -/* 032B8 809001F8 8FA5002C */ lw $a1, 0x002C($sp) +/* 032B4 809001F4 0C2400B3 */ jal func_809002CC +/* 032B8 809001F8 8FA5002C */ lw $a1, 0x002C($sp) .L809001FC: -/* 032BC 809001FC 8FBF001C */ lw $ra, 0x001C($sp) +/* 032BC 809001FC 8FBF001C */ lw $ra, 0x001C($sp) .L80900200: -/* 032C0 80900200 8FB00018 */ lw $s0, 0x0018($sp) +/* 032C0 80900200 8FB00018 */ lw $s0, 0x0018($sp) /* 032C4 80900204 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 032C8 80900208 03E00008 */ jr $ra +/* 032C8 80900208 03E00008 */ jr $ra /* 032CC 8090020C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_80900210.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_80900210.s index 58201c94e0..cf7ccabbba 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_80900210.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_80900210.s @@ -1,27 +1,27 @@ glabel func_80900210 /* 032D0 80900210 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 032D4 80900214 AFA5001C */ sw $a1, 0x001C($sp) -/* 032D8 80900218 AFBF0014 */ sw $ra, 0x0014($sp) -/* 032DC 8090021C AFA40018 */ sw $a0, 0x0018($sp) +/* 032D4 80900214 AFA5001C */ sw $a1, 0x001C($sp) +/* 032D8 80900218 AFBF0014 */ sw $ra, 0x0014($sp) +/* 032DC 8090021C AFA40018 */ sw $a0, 0x0018($sp) /* 032E0 80900220 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 /* 032E4 80900224 24A5DFF0 */ addiu $a1, $a1, 0xDFF0 ## $a1 = 0600DFF0 /* 032E8 80900228 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 032EC 8090022C 0C029490 */ jal func_800A5240 +/* 032EC 8090022C 0C029490 */ jal SkelAnime_ChangeAnimTransitionStop /* 032F0 80900230 3C06C040 */ lui $a2, 0xC040 ## $a2 = C0400000 /* 032F4 80900234 3C040601 */ lui $a0, 0x0601 ## $a0 = 06010000 /* 032F8 80900238 0C028800 */ jal SkelAnime_GetFrameCount - + /* 032FC 8090023C 2484DFF0 */ addiu $a0, $a0, 0xDFF0 ## $a0 = 0600DFF0 /* 03300 80900240 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 -/* 03304 80900244 8FA30018 */ lw $v1, 0x0018($sp) +/* 03304 80900244 8FA30018 */ lw $v1, 0x0018($sp) /* 03308 80900248 3C0E8090 */ lui $t6, %hi(func_8090026C) ## $t6 = 80900000 -/* 0330C 8090024C 468021A0 */ cvt.s.w $f6, $f4 +/* 0330C 8090024C 468021A0 */ cvt.s.w $f6, $f4 /* 03310 80900250 25CE026C */ addiu $t6, $t6, %lo(func_8090026C) ## $t6 = 8090026C /* 03314 80900254 AC6E0190 */ sw $t6, 0x0190($v1) ## 00000190 /* 03318 80900258 E4660194 */ swc1 $f6, 0x0194($v1) ## 00000194 -/* 0331C 8090025C 8FBF0014 */ lw $ra, 0x0014($sp) +/* 0331C 8090025C 8FBF0014 */ lw $ra, 0x0014($sp) /* 03320 80900260 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 03324 80900264 03E00008 */ jr $ra +/* 03324 80900264 03E00008 */ jr $ra /* 03328 80900268 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_809002CC.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_809002CC.s index d0606c1dcf..740ad9d529 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_809002CC.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_809002CC.s @@ -1,15 +1,15 @@ glabel func_809002CC /* 0338C 809002CC 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 03390 809002D0 AFA5001C */ sw $a1, 0x001C($sp) -/* 03394 809002D4 AFBF0014 */ sw $ra, 0x0014($sp) +/* 03390 809002D0 AFA5001C */ sw $a1, 0x001C($sp) +/* 03394 809002D4 AFBF0014 */ sw $ra, 0x0014($sp) /* 03398 809002D8 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 /* 0339C 809002DC 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 /* 033A0 809002E0 24A5E8EC */ addiu $a1, $a1, 0xE8EC ## $a1 = 0600E8EC -/* 033A4 809002E4 AFA70018 */ sw $a3, 0x0018($sp) +/* 033A4 809002E4 AFA70018 */ sw $a3, 0x0018($sp) /* 033A8 809002E8 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 033AC 809002EC 0C0294D3 */ jal func_800A534C +/* 033AC 809002EC 0C0294D3 */ jal SkelAnime_ChangeAnimTransitionRepeat /* 033B0 809002F0 3C06C120 */ lui $a2, 0xC120 ## $a2 = C1200000 -/* 033B4 809002F4 8FA70018 */ lw $a3, 0x0018($sp) +/* 033B4 809002F4 8FA70018 */ lw $a3, 0x0018($sp) /* 033B8 809002F8 3C0E8090 */ lui $t6, %hi(func_80900344) ## $t6 = 80900000 /* 033BC 809002FC 3C014248 */ lui $at, 0x4248 ## $at = 42480000 /* 033C0 80900300 25CE0344 */ addiu $t6, $t6, %lo(func_80900344) ## $t6 = 80900344 @@ -18,17 +18,17 @@ glabel func_809002CC /* 033CC 8090030C ACEE0190 */ sw $t6, 0x0190($a3) ## 00000190 /* 033D0 80900310 A0E00338 */ sb $zero, 0x0338($a3) ## 00000338 /* 033D4 80900314 0C00CFBE */ jal Math_Rand_ZeroFloat - + /* 033D8 80900318 A4EF01A2 */ sh $t7, 0x01A2($a3) ## 000001A2 -/* 033DC 8090031C 4600010D */ trunc.w.s $f4, $f0 -/* 033E0 80900320 8FA70018 */ lw $a3, 0x0018($sp) -/* 033E4 80900324 44092000 */ mfc1 $t1, $f4 +/* 033DC 8090031C 4600010D */ trunc.w.s $f4, $f0 +/* 033E0 80900320 8FA70018 */ lw $a3, 0x0018($sp) +/* 033E4 80900324 44092000 */ mfc1 $t1, $f4 /* 033E8 80900328 00000000 */ nop /* 033EC 8090032C 252A0032 */ addiu $t2, $t1, 0x0032 ## $t2 = 00000032 /* 033F0 80900330 A4EA0390 */ sh $t2, 0x0390($a3) ## 00000390 -/* 033F4 80900334 8FBF0014 */ lw $ra, 0x0014($sp) +/* 033F4 80900334 8FBF0014 */ lw $ra, 0x0014($sp) /* 033F8 80900338 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 033FC 8090033C 03E00008 */ jr $ra +/* 033FC 8090033C 03E00008 */ jr $ra /* 03400 80900340 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_80900344.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_80900344.s index 503ca54bf2..b2ec4cd1f4 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_80900344.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_80900344.s @@ -1,57 +1,57 @@ glabel func_80900344 /* 03404 80900344 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 03408 80900348 AFBF001C */ sw $ra, 0x001C($sp) -/* 0340C 8090034C AFB00018 */ sw $s0, 0x0018($sp) -/* 03410 80900350 AFA5002C */ sw $a1, 0x002C($sp) +/* 03408 80900348 AFBF001C */ sw $ra, 0x001C($sp) +/* 0340C 8090034C AFB00018 */ sw $s0, 0x0018($sp) +/* 03410 80900350 AFA5002C */ sw $a1, 0x002C($sp) /* 03414 80900354 848E0390 */ lh $t6, 0x0390($a0) ## 00000390 /* 03418 80900358 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 0341C 8090035C 3C014248 */ lui $at, 0x4248 ## $at = 42480000 -/* 03420 80900360 55C0000D */ bnel $t6, $zero, .L80900398 +/* 03420 80900360 55C0000D */ bnel $t6, $zero, .L80900398 /* 03424 80900364 26040324 */ addiu $a0, $s0, 0x0324 ## $a0 = 00000324 /* 03428 80900368 44816000 */ mtc1 $at, $f12 ## $f12 = 50.00 /* 0342C 8090036C 0C00CFBE */ jal Math_Rand_ZeroFloat - + /* 03430 80900370 00000000 */ nop -/* 03434 80900374 4600010D */ trunc.w.s $f4, $f0 +/* 03434 80900374 4600010D */ trunc.w.s $f4, $f0 /* 03438 80900378 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 0343C 8090037C 240539D9 */ addiu $a1, $zero, 0x39D9 ## $a1 = 000039D9 -/* 03440 80900380 44082000 */ mfc1 $t0, $f4 +/* 03440 80900380 44082000 */ mfc1 $t0, $f4 /* 03444 80900384 00000000 */ nop /* 03448 80900388 2509001E */ addiu $t1, $t0, 0x001E ## $t1 = 0000001E /* 0344C 8090038C 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 03450 80900390 A6090390 */ sh $t1, 0x0390($s0) ## 00000390 /* 03454 80900394 26040324 */ addiu $a0, $s0, 0x0324 ## $a0 = 00000324 .L80900398: /* 03458 80900398 3C05437F */ lui $a1, 0x437F ## $a1 = 437F0000 /* 0345C 8090039C 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 03460 809003A0 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 03464 809003A4 3C074120 */ lui $a3, 0x4120 ## $a3 = 41200000 /* 03468 809003A8 920A0338 */ lbu $t2, 0x0338($s0) ## 00000338 /* 0346C 809003AC 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C /* 03470 809003B0 3C054150 */ lui $a1, 0x4150 ## $a1 = 41500000 -/* 03474 809003B4 11400041 */ beq $t2, $zero, .L809004BC +/* 03474 809003B4 11400041 */ beq $t2, $zero, .L809004BC /* 03478 809003B8 3C014000 */ lui $at, 0x4000 ## $at = 40000000 -/* 0347C 809003BC 0C0295B2 */ jal func_800A56C8 -/* 03480 809003C0 AFA40020 */ sw $a0, 0x0020($sp) -/* 03484 809003C4 10400008 */ beq $v0, $zero, .L809003E8 -/* 03488 809003C8 8FA40020 */ lw $a0, 0x0020($sp) +/* 0347C 809003BC 0C0295B2 */ jal func_800A56C8 +/* 03480 809003C0 AFA40020 */ sw $a0, 0x0020($sp) +/* 03484 809003C4 10400008 */ beq $v0, $zero, .L809003E8 +/* 03488 809003C8 8FA40020 */ lw $a0, 0x0020($sp) /* 0348C 809003CC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 03490 809003D0 8FA5002C */ lw $a1, 0x002C($sp) +/* 03490 809003D0 8FA5002C */ lw $a1, 0x002C($sp) /* 03494 809003D4 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 -/* 03498 809003D8 0C23F535 */ jal func_808FD4D4 +/* 03498 809003D8 0C23F535 */ jal func_808FD4D4 /* 0349C 809003DC 24070003 */ addiu $a3, $zero, 0x0003 ## $a3 = 00000003 -/* 034A0 809003E0 1000000A */ beq $zero, $zero, .L8090040C +/* 034A0 809003E0 1000000A */ beq $zero, $zero, .L8090040C /* 034A4 809003E4 3C014348 */ lui $at, 0x4348 ## $at = 43480000 .L809003E8: -/* 034A8 809003E8 0C0295B2 */ jal func_800A56C8 +/* 034A8 809003E8 0C0295B2 */ jal func_800A56C8 /* 034AC 809003EC 3C0541E0 */ lui $a1, 0x41E0 ## $a1 = 41E00000 -/* 034B0 809003F0 10400005 */ beq $v0, $zero, .L80900408 +/* 034B0 809003F0 10400005 */ beq $v0, $zero, .L80900408 /* 034B4 809003F4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 034B8 809003F8 8FA5002C */ lw $a1, 0x002C($sp) +/* 034B8 809003F8 8FA5002C */ lw $a1, 0x002C($sp) /* 034BC 809003FC 24060002 */ addiu $a2, $zero, 0x0002 ## $a2 = 00000002 -/* 034C0 80900400 0C23F535 */ jal func_808FD4D4 +/* 034C0 80900400 0C23F535 */ jal func_808FD4D4 /* 034C4 80900404 24070003 */ addiu $a3, $zero, 0x0003 ## $a3 = 00000003 .L80900408: /* 034C8 80900408 3C014348 */ lui $at, 0x4348 ## $at = 43480000 @@ -60,48 +60,48 @@ glabel func_80900344 /* 034D0 80900410 C6020090 */ lwc1 $f2, 0x0090($s0) ## 00000090 /* 034D4 80900414 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 /* 034D8 80900418 24A5E8EC */ addiu $a1, $a1, 0xE8EC ## $a1 = 0600E8EC -/* 034DC 8090041C 4606103C */ c.lt.s $f2, $f6 +/* 034DC 8090041C 4606103C */ c.lt.s $f2, $f6 /* 034E0 80900420 3C014000 */ lui $at, 0x4000 ## $at = 40000000 /* 034E4 80900424 3C06C120 */ lui $a2, 0xC120 ## $a2 = C1200000 -/* 034E8 80900428 45020007 */ bc1fl .L80900448 +/* 034E8 80900428 45020007 */ bc1fl .L80900448 /* 034EC 8090042C 44816000 */ mtc1 $at, $f12 ## $f12 = 2.00 /* 034F0 80900430 A2000338 */ sb $zero, 0x0338($s0) ## 00000338 -/* 034F4 80900434 0C0294D3 */ jal func_800A534C -/* 034F8 80900438 8FA40020 */ lw $a0, 0x0020($sp) -/* 034FC 8090043C 1000001A */ beq $zero, $zero, .L809004A8 +/* 034F4 80900434 0C0294D3 */ jal SkelAnime_ChangeAnimTransitionRepeat +/* 034F8 80900438 8FA40020 */ lw $a0, 0x0020($sp) +/* 034FC 8090043C 1000001A */ beq $zero, $zero, .L809004A8 /* 03500 80900440 3C014040 */ lui $at, 0x4040 ## $at = 40400000 /* 03504 80900444 44816000 */ mtc1 $at, $f12 ## $f12 = 3.00 .L80900448: /* 03508 80900448 3C014396 */ lui $at, 0x4396 ## $at = 43960000 /* 0350C 8090044C 44814000 */ mtc1 $at, $f8 ## $f8 = 300.00 /* 03510 80900450 3C018091 */ lui $at, %hi(D_8090DBB8) ## $at = 80910000 -/* 03514 80900454 C430DBB8 */ lwc1 $f16, %lo(D_8090DBB8)($at) -/* 03518 80900458 46081281 */ sub.s $f10, $f2, $f8 +/* 03514 80900454 C430DBB8 */ lwc1 $f16, %lo(D_8090DBB8)($at) +/* 03518 80900458 46081281 */ sub.s $f10, $f2, $f8 /* 0351C 8090045C 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 /* 03520 80900460 44812000 */ mtc1 $at, $f4 ## $f4 = 1.00 /* 03524 80900464 3C013FC0 */ lui $at, 0x3FC0 ## $at = 3FC00000 -/* 03528 80900468 46105482 */ mul.s $f18, $f10, $f16 -/* 0352C 8090046C 46049000 */ add.s $f0, $f18, $f4 -/* 03530 80900470 4600603C */ c.lt.s $f12, $f0 +/* 03528 80900468 46105482 */ mul.s $f18, $f10, $f16 +/* 0352C 8090046C 46049000 */ add.s $f0, $f18, $f4 +/* 03530 80900470 4600603C */ c.lt.s $f12, $f0 /* 03534 80900474 E6000168 */ swc1 $f0, 0x0168($s0) ## 00000168 -/* 03538 80900478 45020003 */ bc1fl .L80900488 +/* 03538 80900478 45020003 */ bc1fl .L80900488 /* 0353C 8090047C 920B0334 */ lbu $t3, 0x0334($s0) ## 00000334 /* 03540 80900480 E60C0168 */ swc1 $f12, 0x0168($s0) ## 00000168 /* 03544 80900484 920B0334 */ lbu $t3, 0x0334($s0) ## 00000334 .L80900488: -/* 03548 80900488 51600007 */ beql $t3, $zero, .L809004A8 +/* 03548 80900488 51600007 */ beql $t3, $zero, .L809004A8 /* 0354C 8090048C 3C014040 */ lui $at, 0x4040 ## $at = 40400000 /* 03550 80900490 C6060168 */ lwc1 $f6, 0x0168($s0) ## 00000168 /* 03554 80900494 44814000 */ mtc1 $at, $f8 ## $f8 = 3.00 /* 03558 80900498 00000000 */ nop -/* 0355C 8090049C 46083282 */ mul.s $f10, $f6, $f8 +/* 0355C 8090049C 46083282 */ mul.s $f10, $f6, $f8 /* 03560 809004A0 E60A0168 */ swc1 $f10, 0x0168($s0) ## 00000168 /* 03564 809004A4 3C014040 */ lui $at, 0x4040 ## $at = 40400000 .L809004A8: /* 03568 809004A8 44819000 */ mtc1 $at, $f18 ## $f18 = 3.00 /* 0356C 809004AC C6100168 */ lwc1 $f16, 0x0168($s0) ## 00000168 -/* 03570 809004B0 46128002 */ mul.s $f0, $f16, $f18 -/* 03574 809004B4 10000012 */ beq $zero, $zero, .L80900500 +/* 03570 809004B0 46128002 */ mul.s $f0, $f16, $f18 +/* 03574 809004B4 10000012 */ beq $zero, $zero, .L80900500 /* 03578 809004B8 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C .L809004BC: /* 0357C 809004BC 44810000 */ mtc1 $at, $f0 ## $f0 = 3.00 @@ -110,53 +110,53 @@ glabel func_80900344 /* 03588 809004C8 C6040090 */ lwc1 $f4, 0x0090($s0) ## 00000090 /* 0358C 809004CC 3C050603 */ lui $a1, 0x0603 ## $a1 = 06030000 /* 03590 809004D0 240C0001 */ addiu $t4, $zero, 0x0001 ## $t4 = 00000001 -/* 03594 809004D4 4604303E */ c.le.s $f6, $f4 +/* 03594 809004D4 4604303E */ c.le.s $f6, $f4 /* 03598 809004D8 24A553C0 */ addiu $a1, $a1, 0x53C0 ## $a1 = 060353C0 /* 0359C 809004DC 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C /* 035A0 809004E0 3C06C120 */ lui $a2, 0xC120 ## $a2 = C1200000 -/* 035A4 809004E4 45020006 */ bc1fl .L80900500 +/* 035A4 809004E4 45020006 */ bc1fl .L80900500 /* 035A8 809004E8 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C /* 035AC 809004EC A20C0338 */ sb $t4, 0x0338($s0) ## 00000338 -/* 035B0 809004F0 0C0294D3 */ jal func_800A534C -/* 035B4 809004F4 E7A00024 */ swc1 $f0, 0x0024($sp) -/* 035B8 809004F8 C7A00024 */ lwc1 $f0, 0x0024($sp) +/* 035B0 809004F0 0C0294D3 */ jal SkelAnime_ChangeAnimTransitionRepeat +/* 035B4 809004F4 E7A00024 */ swc1 $f0, 0x0024($sp) +/* 035B8 809004F8 C7A00024 */ lwc1 $f0, 0x0024($sp) /* 035BC 809004FC 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C .L80900500: /* 035C0 80900500 0C02927F */ jal SkelAnime_FrameUpdateMatrix - -/* 035C4 80900504 E7A00024 */ swc1 $f0, 0x0024($sp) -/* 035C8 80900508 C7A00024 */ lwc1 $f0, 0x0024($sp) + +/* 035C4 80900504 E7A00024 */ swc1 $f0, 0x0024($sp) +/* 035C8 80900508 C7A00024 */ lwc1 $f0, 0x0024($sp) /* 035CC 8090050C 26040068 */ addiu $a0, $s0, 0x0068 ## $a0 = 00000068 /* 035D0 80900510 3C063F00 */ lui $a2, 0x3F00 ## $a2 = 3F000000 -/* 035D4 80900514 44050000 */ mfc1 $a1, $f0 +/* 035D4 80900514 44050000 */ mfc1 $a1, $f0 /* 035D8 80900518 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 035DC 8090051C 3C073F80 */ lui $a3, 0x3F80 ## $a3 = 3F800000 /* 035E0 80900520 860D01A2 */ lh $t5, 0x01A2($s0) ## 000001A2 -/* 035E4 80900524 8FA5002C */ lw $a1, 0x002C($sp) +/* 035E4 80900524 8FA5002C */ lw $a1, 0x002C($sp) /* 035E8 80900528 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 035EC 8090052C 15A00005 */ bne $t5, $zero, .L80900544 +/* 035EC 8090052C 15A00005 */ bne $t5, $zero, .L80900544 /* 035F0 80900530 00000000 */ nop -/* 035F4 80900534 0C23FF6C */ jal func_808FFDB0 +/* 035F4 80900534 0C23FF6C */ jal func_808FFDB0 /* 035F8 80900538 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 035FC 8090053C 10000004 */ beq $zero, $zero, .L80900550 +/* 035FC 8090053C 10000004 */ beq $zero, $zero, .L80900550 /* 03600 80900540 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 .L80900544: -/* 03604 80900544 0C23FF3F */ jal func_808FFCFC -/* 03608 80900548 8FA5002C */ lw $a1, 0x002C($sp) +/* 03604 80900544 0C23FF3F */ jal func_808FFCFC +/* 03608 80900548 8FA5002C */ lw $a1, 0x002C($sp) /* 0360C 8090054C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 .L80900550: -/* 03610 80900550 8FA5002C */ lw $a1, 0x002C($sp) -/* 03614 80900554 0C23FEB2 */ jal func_808FFAC8 +/* 03610 80900550 8FA5002C */ lw $a1, 0x002C($sp) +/* 03614 80900554 0C23FEB2 */ jal func_808FFAC8 /* 03618 80900558 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 /* 0361C 8090055C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 03620 80900560 8FA5002C */ lw $a1, 0x002C($sp) -/* 03624 80900564 0C23FEEF */ jal func_808FFBBC +/* 03620 80900560 8FA5002C */ lw $a1, 0x002C($sp) +/* 03624 80900564 0C23FEEF */ jal func_808FFBBC /* 03628 80900568 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 -/* 0362C 8090056C 8FBF001C */ lw $ra, 0x001C($sp) -/* 03630 80900570 8FB00018 */ lw $s0, 0x0018($sp) +/* 0362C 8090056C 8FBF001C */ lw $ra, 0x001C($sp) +/* 03630 80900570 8FB00018 */ lw $s0, 0x0018($sp) /* 03634 80900574 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 03638 80900578 03E00008 */ jr $ra +/* 03638 80900578 03E00008 */ jr $ra /* 0363C 8090057C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_80900580.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_80900580.s index fff7022f2d..c15710cab7 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_80900580.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_80900580.s @@ -1,59 +1,59 @@ glabel func_80900580 /* 03640 80900580 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 03644 80900584 AFBF001C */ sw $ra, 0x001C($sp) -/* 03648 80900588 AFB00018 */ sw $s0, 0x0018($sp) -/* 0364C 8090058C AFA50024 */ sw $a1, 0x0024($sp) +/* 03644 80900584 AFBF001C */ sw $ra, 0x001C($sp) +/* 03648 80900588 AFB00018 */ sw $s0, 0x0018($sp) +/* 0364C 8090058C AFA50024 */ sw $a1, 0x0024($sp) /* 03650 80900590 908E0311 */ lbu $t6, 0x0311($a0) ## 00000311 /* 03654 80900594 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 /* 03658 80900598 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 0365C 8090059C 15C00014 */ bne $t6, $zero, .L809005F0 +/* 0365C 8090059C 15C00014 */ bne $t6, $zero, .L809005F0 /* 03660 809005A0 24A5CAF8 */ addiu $a1, $a1, 0xCAF8 ## $a1 = 0600CAF8 /* 03664 809005A4 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 /* 03668 809005A8 24A5ADD0 */ addiu $a1, $a1, 0xADD0 ## $a1 = 0600ADD0 /* 0366C 809005AC 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 03670 809005B0 0C029490 */ jal func_800A5240 +/* 03670 809005B0 0C029490 */ jal SkelAnime_ChangeAnimTransitionStop /* 03674 809005B4 3C06C0A0 */ lui $a2, 0xC0A0 ## $a2 = C0A00000 /* 03678 809005B8 3C040601 */ lui $a0, 0x0601 ## $a0 = 06010000 /* 0367C 809005BC 0C028800 */ jal SkelAnime_GetFrameCount - + /* 03680 809005C0 2484ADD0 */ addiu $a0, $a0, 0xADD0 ## $a0 = 0600ADD0 /* 03684 809005C4 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 03688 809005C8 3C014170 */ lui $at, 0x4170 ## $at = 41700000 /* 0368C 809005CC 44813000 */ mtc1 $at, $f6 ## $f6 = 15.00 -/* 03690 809005D0 46802020 */ cvt.s.w $f0, $f4 +/* 03690 809005D0 46802020 */ cvt.s.w $f0, $f4 /* 03694 809005D4 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 /* 03698 809005D8 44815000 */ mtc1 $at, $f10 ## $f10 = 5.00 -/* 0369C 809005DC 46060201 */ sub.s $f8, $f0, $f6 +/* 0369C 809005DC 46060201 */ sub.s $f8, $f0, $f6 /* 036A0 809005E0 E6000194 */ swc1 $f0, 0x0194($s0) ## 00000194 -/* 036A4 809005E4 460A4401 */ sub.s $f16, $f8, $f10 -/* 036A8 809005E8 10000011 */ beq $zero, $zero, .L80900630 +/* 036A4 809005E4 460A4401 */ sub.s $f16, $f8, $f10 +/* 036A8 809005E8 10000011 */ beq $zero, $zero, .L80900630 /* 036AC 809005EC E6100198 */ swc1 $f16, 0x0198($s0) ## 00000198 .L809005F0: /* 036B0 809005F0 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C -/* 036B4 809005F4 0C029490 */ jal func_800A5240 +/* 036B4 809005F4 0C029490 */ jal SkelAnime_ChangeAnimTransitionStop /* 036B8 809005F8 3C06C0A0 */ lui $a2, 0xC0A0 ## $a2 = C0A00000 /* 036BC 809005FC 3C040601 */ lui $a0, 0x0601 ## $a0 = 06010000 /* 036C0 80900600 0C028800 */ jal SkelAnime_GetFrameCount - + /* 036C4 80900604 2484CAF8 */ addiu $a0, $a0, 0xCAF8 ## $a0 = 0600CAF8 /* 036C8 80900608 44829000 */ mtc1 $v0, $f18 ## $f18 = 0.00 /* 036CC 8090060C 3C014170 */ lui $at, 0x4170 ## $at = 41700000 /* 036D0 80900610 44812000 */ mtc1 $at, $f4 ## $f4 = 15.00 -/* 036D4 80900614 46809020 */ cvt.s.w $f0, $f18 +/* 036D4 80900614 46809020 */ cvt.s.w $f0, $f18 /* 036D8 80900618 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 /* 036DC 8090061C 44814000 */ mtc1 $at, $f8 ## $f8 = 5.00 -/* 036E0 80900620 46040181 */ sub.s $f6, $f0, $f4 +/* 036E0 80900620 46040181 */ sub.s $f6, $f0, $f4 /* 036E4 80900624 E6000194 */ swc1 $f0, 0x0194($s0) ## 00000194 -/* 036E8 80900628 46083281 */ sub.s $f10, $f6, $f8 +/* 036E8 80900628 46083281 */ sub.s $f10, $f6, $f8 /* 036EC 8090062C E60A0198 */ swc1 $f10, 0x0198($s0) ## 00000198 .L80900630: /* 036F0 80900630 3C0F8090 */ lui $t7, %hi(func_80900650) ## $t7 = 80900000 /* 036F4 80900634 25EF0650 */ addiu $t7, $t7, %lo(func_80900650) ## $t7 = 80900650 /* 036F8 80900638 AE0F0190 */ sw $t7, 0x0190($s0) ## 00000190 -/* 036FC 8090063C 8FBF001C */ lw $ra, 0x001C($sp) -/* 03700 80900640 8FB00018 */ lw $s0, 0x0018($sp) +/* 036FC 8090063C 8FBF001C */ lw $ra, 0x001C($sp) +/* 03700 80900640 8FB00018 */ lw $s0, 0x0018($sp) /* 03704 80900644 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 03708 80900648 03E00008 */ jr $ra +/* 03708 80900648 03E00008 */ jr $ra /* 0370C 8090064C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_80900818.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_80900818.s index 3c0710b207..58635e5e2d 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_80900818.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_80900818.s @@ -1,35 +1,35 @@ glabel func_80900818 /* 038D8 80900818 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 038DC 8090081C AFB00018 */ sw $s0, 0x0018($sp) -/* 038E0 80900820 AFA50024 */ sw $a1, 0x0024($sp) +/* 038DC 8090081C AFB00018 */ sw $s0, 0x0018($sp) +/* 038E0 80900820 AFA50024 */ sw $a1, 0x0024($sp) /* 038E4 80900824 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 038E8 80900828 AFBF001C */ sw $ra, 0x001C($sp) +/* 038E8 80900828 AFBF001C */ sw $ra, 0x001C($sp) /* 038EC 8090082C 3C050603 */ lui $a1, 0x0603 ## $a1 = 06030000 /* 038F0 80900830 24A5A848 */ addiu $a1, $a1, 0xA848 ## $a1 = 0602A848 /* 038F4 80900834 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 038F8 80900838 0C029490 */ jal func_800A5240 +/* 038F8 80900838 0C029490 */ jal SkelAnime_ChangeAnimTransitionStop /* 038FC 8090083C 3C06C0A0 */ lui $a2, 0xC0A0 ## $a2 = C0A00000 /* 03900 80900840 3C040603 */ lui $a0, 0x0603 ## $a0 = 06030000 /* 03904 80900844 0C028800 */ jal SkelAnime_GetFrameCount - + /* 03908 80900848 2484A848 */ addiu $a0, $a0, 0xA848 ## $a0 = 0602A848 /* 0390C 8090084C 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 03910 80900850 3C0E8090 */ lui $t6, %hi(func_80900890) ## $t6 = 80900000 /* 03914 80900854 25CE0890 */ addiu $t6, $t6, %lo(func_80900890) ## $t6 = 80900890 -/* 03918 80900858 468021A0 */ cvt.s.w $f6, $f4 +/* 03918 80900858 468021A0 */ cvt.s.w $f6, $f4 /* 0391C 8090085C AE0E0190 */ sw $t6, 0x0190($s0) ## 00000190 /* 03920 80900860 A60001AC */ sh $zero, 0x01AC($s0) ## 000001AC /* 03924 80900864 A600039C */ sh $zero, 0x039C($s0) ## 0000039C /* 03928 80900868 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 0392C 8090086C 2405399E */ addiu $a1, $zero, 0x399E ## $a1 = 0000399E /* 03930 80900870 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 03934 80900874 E6060194 */ swc1 $f6, 0x0194($s0) ## 00000194 /* 03938 80900878 A2000336 */ sb $zero, 0x0336($s0) ## 00000336 -/* 0393C 8090087C 8FBF001C */ lw $ra, 0x001C($sp) -/* 03940 80900880 8FB00018 */ lw $s0, 0x0018($sp) +/* 0393C 8090087C 8FBF001C */ lw $ra, 0x001C($sp) +/* 03940 80900880 8FB00018 */ lw $s0, 0x0018($sp) /* 03944 80900884 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 03948 80900888 03E00008 */ jr $ra +/* 03948 80900888 03E00008 */ jr $ra /* 0394C 8090088C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_80900890.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_80900890.s index b3b05f7430..820a26fc9f 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_80900890.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_80900890.s @@ -1,54 +1,54 @@ glabel func_80900890 /* 03950 80900890 27BDFF98 */ addiu $sp, $sp, 0xFF98 ## $sp = FFFFFF98 -/* 03954 80900894 AFB00014 */ sw $s0, 0x0014($sp) +/* 03954 80900894 AFB00014 */ sw $s0, 0x0014($sp) /* 03958 80900898 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 0395C 8090089C AFB10018 */ sw $s1, 0x0018($sp) +/* 0395C 8090089C AFB10018 */ sw $s1, 0x0018($sp) /* 03960 809008A0 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 -/* 03964 809008A4 AFBF001C */ sw $ra, 0x001C($sp) +/* 03964 809008A4 AFBF001C */ sw $ra, 0x001C($sp) /* 03968 809008A8 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 0396C 809008AC 0C030129 */ jal func_800C04A4 +/* 0396C 809008AC 0C030129 */ jal func_800C04A4 /* 03970 809008B0 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 03974 809008B4 AFA2004C */ sw $v0, 0x004C($sp) +/* 03974 809008B4 AFA2004C */ sw $v0, 0x004C($sp) /* 03978 809008B8 8E2E1C44 */ lw $t6, 0x1C44($s1) ## 00001C44 /* 0397C 809008BC 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C -/* 03980 809008C0 AFA4002C */ sw $a0, 0x002C($sp) +/* 03980 809008C0 AFA4002C */ sw $a0, 0x002C($sp) /* 03984 809008C4 0C02927F */ jal SkelAnime_FrameUpdateMatrix - -/* 03988 809008C8 AFAE0048 */ sw $t6, 0x0048($sp) + +/* 03988 809008C8 AFAE0048 */ sw $t6, 0x0048($sp) /* 0398C 809008CC 8E0F0398 */ lw $t7, 0x0398($s0) ## 00000398 /* 03990 809008D0 9608039C */ lhu $t0, 0x039C($s0) ## 0000039C /* 03994 809008D4 24190014 */ addiu $t9, $zero, 0x0014 ## $t9 = 00000014 /* 03998 809008D8 25F80001 */ addiu $t8, $t7, 0x0001 ## $t8 = 00000001 -/* 0399C 809008DC 2D01000C */ sltiu $at, $t0, 0x000C +/* 0399C 809008DC 2D01000C */ sltiu $at, $t0, 0x000C /* 039A0 809008E0 AE180398 */ sw $t8, 0x0398($s0) ## 00000398 -/* 039A4 809008E4 10200159 */ beq $at, $zero, .L80900E4C +/* 039A4 809008E4 10200159 */ beq $at, $zero, .L80900E4C /* 039A8 809008E8 A2190339 */ sb $t9, 0x0339($s0) ## 00000339 -/* 039AC 809008EC 00084080 */ sll $t0, $t0, 2 +/* 039AC 809008EC 00084080 */ sll $t0, $t0, 2 /* 039B0 809008F0 3C018091 */ lui $at, %hi(jtbl_8090DBBC) ## $at = 80910000 -/* 039B4 809008F4 00280821 */ addu $at, $at, $t0 -/* 039B8 809008F8 8C28DBBC */ lw $t0, %lo(jtbl_8090DBBC)($at) -/* 039BC 809008FC 01000008 */ jr $t0 +/* 039B4 809008F4 00280821 */ addu $at, $at, $t0 +/* 039B8 809008F8 8C28DBBC */ lw $t0, %lo(jtbl_8090DBBC)($at) +/* 039BC 809008FC 01000008 */ jr $t0 /* 039C0 80900900 00000000 */ nop glabel L80900904 /* 039C4 80900904 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 039C8 80900908 0C019148 */ jal func_80064520 +/* 039C8 80900908 0C019148 */ jal func_80064520 /* 039CC 8090090C 26251D64 */ addiu $a1, $s1, 0x1D64 ## $a1 = 00001D64 -/* 039D0 80900910 0C03008C */ jal func_800C0230 +/* 039D0 80900910 0C03008C */ jal func_800C0230 /* 039D4 80900914 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 039D8 80900918 A602039E */ sh $v0, 0x039E($s0) ## 0000039E /* 039DC 8090091C 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 039E0 80900920 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 039E4 80900924 0C0300C5 */ jal func_800C0314 +/* 039E4 80900924 0C0300C5 */ jal func_800C0314 /* 039E8 80900928 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 /* 039EC 8090092C 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 039F0 80900930 8605039E */ lh $a1, 0x039E($s0) ## 0000039E -/* 039F4 80900934 0C0300C5 */ jal func_800C0314 +/* 039F4 80900934 0C0300C5 */ jal func_800C0314 /* 039F8 80900938 24060007 */ addiu $a2, $zero, 0x0007 ## $a2 = 00000007 /* 039FC 8090093C 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 03A00 80900940 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 03A04 80900944 0C00B7D5 */ jal func_8002DF54 +/* 03A04 80900944 0C00B7D5 */ jal func_8002DF54 /* 03A08 80900948 24060008 */ addiu $a2, $zero, 0x0008 ## $a2 = 00000008 -/* 03A0C 8090094C 8FA3004C */ lw $v1, 0x004C($sp) +/* 03A0C 8090094C 8FA3004C */ lw $v1, 0x004C($sp) /* 03A10 80900950 24090001 */ addiu $t1, $zero, 0x0001 ## $t1 = 00000001 /* 03A14 80900954 A609039C */ sh $t1, 0x039C($s0) ## 0000039C /* 03A18 80900958 8C6B005C */ lw $t3, 0x005C($v1) ## 0000005C @@ -60,7 +60,7 @@ glabel L80900904 /* 03A30 80900970 3C010001 */ lui $at, 0x0001 ## $at = 00010000 /* 03A34 80900974 AE0A03A8 */ sw $t2, 0x03A8($s0) ## 000003A8 /* 03A38 80900978 8C6B0064 */ lw $t3, 0x0064($v1) ## 00000064 -/* 03A3C 8090097C 00310821 */ addu $at, $at, $s1 +/* 03A3C 8090097C 00310821 */ addu $at, $at, $s1 /* 03A40 80900980 AE0B03AC */ sw $t3, 0x03AC($s0) ## 000003AC /* 03A44 80900984 8C6D0050 */ lw $t5, 0x0050($v1) ## 00000050 /* 03A48 80900988 AE0D03B0 */ sw $t5, 0x03B0($s0) ## 000003B0 @@ -74,13 +74,13 @@ glabel L80900904 glabel L809009A8 /* 03A68 809009A8 261803A4 */ addiu $t8, $s0, 0x03A4 ## $t8 = 000003A4 /* 03A6C 809009AC 261903B0 */ addiu $t9, $s0, 0x03B0 ## $t9 = 000003B0 -/* 03A70 809009B0 AFB90024 */ sw $t9, 0x0024($sp) -/* 03A74 809009B4 AFB80028 */ sw $t8, 0x0028($sp) +/* 03A70 809009B0 AFB90024 */ sw $t9, 0x0024($sp) +/* 03A74 809009B4 AFB80028 */ sw $t8, 0x0028($sp) /* 03A78 809009B8 860801A4 */ lh $t0, 0x01A4($s0) ## 000001A4 /* 03A7C 809009BC 24010032 */ addiu $at, $zero, 0x0032 ## $at = 00000032 -/* 03A80 809009C0 55010004 */ bnel $t0, $at, .L809009D4 +/* 03A80 809009C0 55010004 */ bnel $t0, $at, .L809009D4 /* 03A84 809009C4 860900B6 */ lh $t1, 0x00B6($s0) ## 000000B6 -/* 03A88 809009C8 0C01E221 */ jal func_80078884 +/* 03A88 809009C8 0C01E221 */ jal func_80078884 /* 03A8C 809009CC 240439D7 */ addiu $a0, $zero, 0x39D7 ## $a0 = 000039D7 /* 03A90 809009D0 860900B6 */ lh $t1, 0x00B6($s0) ## 000000B6 .L809009D4: @@ -88,81 +88,81 @@ glabel L809009A8 /* 03A98 809009D8 44815000 */ mtc1 $at, $f10 ## $f10 = 32768.00 /* 03A9C 809009DC 44893000 */ mtc1 $t1, $f6 ## $f6 = 0.00 /* 03AA0 809009E0 3C018091 */ lui $at, %hi(D_8090DBEC) ## $at = 80910000 -/* 03AA4 809009E4 C432DBEC */ lwc1 $f18, %lo(D_8090DBEC)($at) -/* 03AA8 809009E8 46803220 */ cvt.s.w $f8, $f6 +/* 03AA4 809009E4 C432DBEC */ lwc1 $f18, %lo(D_8090DBEC)($at) +/* 03AA8 809009E8 46803220 */ cvt.s.w $f8, $f6 /* 03AAC 809009EC 3C018091 */ lui $at, %hi(D_8090DBF0) ## $at = 80910000 -/* 03AB0 809009F0 C426DBF0 */ lwc1 $f6, %lo(D_8090DBF0)($at) +/* 03AB0 809009F0 C426DBF0 */ lwc1 $f6, %lo(D_8090DBF0)($at) /* 03AB4 809009F4 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 03AB8 809009F8 460A4403 */ div.s $f16, $f8, $f10 -/* 03ABC 809009FC 46128102 */ mul.s $f4, $f16, $f18 -/* 03AC0 80900A00 0C034348 */ jal Matrix_RotateY -/* 03AC4 80900A04 46062300 */ add.s $f12, $f4, $f6 +/* 03AB8 809009F8 460A4403 */ div.s $f16, $f8, $f10 +/* 03ABC 809009FC 46128102 */ mul.s $f4, $f16, $f18 +/* 03AC0 80900A00 0C034348 */ jal Matrix_RotateY +/* 03AC4 80900A04 46062300 */ add.s $f12, $f4, $f6 /* 03AC8 80900A08 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 /* 03ACC 80900A0C 3C01437A */ lui $at, 0x437A ## $at = 437A0000 /* 03AD0 80900A10 44814000 */ mtc1 $at, $f8 ## $f8 = 250.00 /* 03AD4 80900A14 27A4005C */ addiu $a0, $sp, 0x005C ## $a0 = FFFFFFF4 /* 03AD8 80900A18 27A50050 */ addiu $a1, $sp, 0x0050 ## $a1 = FFFFFFE8 -/* 03ADC 80900A1C E7A0005C */ swc1 $f0, 0x005C($sp) -/* 03AE0 80900A20 E7A00060 */ swc1 $f0, 0x0060($sp) -/* 03AE4 80900A24 0C0346BD */ jal Matrix_MultVec3f -/* 03AE8 80900A28 E7A80064 */ swc1 $f8, 0x0064($sp) +/* 03ADC 80900A1C E7A0005C */ swc1 $f0, 0x005C($sp) +/* 03AE0 80900A20 E7A00060 */ swc1 $f0, 0x0060($sp) +/* 03AE4 80900A24 0C0346BD */ jal Matrix_MultVec3f +/* 03AE8 80900A28 E7A80064 */ swc1 $f8, 0x0064($sp) /* 03AEC 80900A2C C60A0024 */ lwc1 $f10, 0x0024($s0) ## 00000024 -/* 03AF0 80900A30 C7B00050 */ lwc1 $f16, 0x0050($sp) +/* 03AF0 80900A30 C7B00050 */ lwc1 $f16, 0x0050($sp) /* 03AF4 80900A34 3C063E4C */ lui $a2, 0x3E4C ## $a2 = 3E4C0000 /* 03AF8 80900A38 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3E4CCCCD -/* 03AFC 80900A3C 46105480 */ add.s $f18, $f10, $f16 -/* 03B00 80900A40 8FA40028 */ lw $a0, 0x0028($sp) +/* 03AFC 80900A3C 46105480 */ add.s $f18, $f10, $f16 +/* 03B00 80900A40 8FA40028 */ lw $a0, 0x0028($sp) /* 03B04 80900A44 3C0742C8 */ lui $a3, 0x42C8 ## $a3 = 42C80000 -/* 03B08 80900A48 44059000 */ mfc1 $a1, $f18 +/* 03B08 80900A48 44059000 */ mfc1 $a1, $f18 /* 03B0C 80900A4C 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 03B10 80900A50 00000000 */ nop /* 03B14 80900A54 3C063E4C */ lui $a2, 0x3E4C ## $a2 = 3E4C0000 /* 03B18 80900A58 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3E4CCCCD /* 03B1C 80900A5C 260403A8 */ addiu $a0, $s0, 0x03A8 ## $a0 = 000003A8 /* 03B20 80900A60 3C05448E */ lui $a1, 0x448E ## $a1 = 448E0000 /* 03B24 80900A64 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 03B28 80900A68 3C0742C8 */ lui $a3, 0x42C8 ## $a3 = 42C80000 /* 03B2C 80900A6C C604002C */ lwc1 $f4, 0x002C($s0) ## 0000002C -/* 03B30 80900A70 C7A60058 */ lwc1 $f6, 0x0058($sp) +/* 03B30 80900A70 C7A60058 */ lwc1 $f6, 0x0058($sp) /* 03B34 80900A74 3C063E4C */ lui $a2, 0x3E4C ## $a2 = 3E4C0000 /* 03B38 80900A78 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3E4CCCCD -/* 03B3C 80900A7C 46062200 */ add.s $f8, $f4, $f6 +/* 03B3C 80900A7C 46062200 */ add.s $f8, $f4, $f6 /* 03B40 80900A80 260403AC */ addiu $a0, $s0, 0x03AC ## $a0 = 000003AC /* 03B44 80900A84 3C0742C8 */ lui $a3, 0x42C8 ## $a3 = 42C80000 -/* 03B48 80900A88 44054000 */ mfc1 $a1, $f8 +/* 03B48 80900A88 44054000 */ mfc1 $a1, $f8 /* 03B4C 80900A8C 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 03B50 80900A90 00000000 */ nop /* 03B54 80900A94 3C063E4C */ lui $a2, 0x3E4C ## $a2 = 3E4C0000 /* 03B58 80900A98 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3E4CCCCD -/* 03B5C 80900A9C 8FA40024 */ lw $a0, 0x0024($sp) +/* 03B5C 80900A9C 8FA40024 */ lw $a0, 0x0024($sp) /* 03B60 80900AA0 8E0501B8 */ lw $a1, 0x01B8($s0) ## 000001B8 /* 03B64 80900AA4 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 03B68 80900AA8 3C0742C8 */ lui $a3, 0x42C8 ## $a3 = 42C80000 /* 03B6C 80900AAC 3C063E4C */ lui $a2, 0x3E4C ## $a2 = 3E4C0000 /* 03B70 80900AB0 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3E4CCCCD /* 03B74 80900AB4 260403B4 */ addiu $a0, $s0, 0x03B4 ## $a0 = 000003B4 /* 03B78 80900AB8 8E0501BC */ lw $a1, 0x01BC($s0) ## 000001BC /* 03B7C 80900ABC 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 03B80 80900AC0 3C0742C8 */ lui $a3, 0x42C8 ## $a3 = 42C80000 /* 03B84 80900AC4 3C063E4C */ lui $a2, 0x3E4C ## $a2 = 3E4C0000 /* 03B88 80900AC8 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3E4CCCCD /* 03B8C 80900ACC 260403B8 */ addiu $a0, $s0, 0x03B8 ## $a0 = 000003B8 /* 03B90 80900AD0 8E0501C0 */ lw $a1, 0x01C0($s0) ## 000001C0 /* 03B94 80900AD4 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 03B98 80900AD8 3C0742C8 */ lui $a3, 0x42C8 ## $a3 = 42C80000 /* 03B9C 80900ADC 860A01A4 */ lh $t2, 0x01A4($s0) ## 000001A4 /* 03BA0 80900AE0 240B0002 */ addiu $t3, $zero, 0x0002 ## $t3 = 00000002 /* 03BA4 80900AE4 240C005A */ addiu $t4, $zero, 0x005A ## $t4 = 0000005A -/* 03BA8 80900AE8 554000D9 */ bnel $t2, $zero, .L80900E50 +/* 03BA8 80900AE8 554000D9 */ bnel $t2, $zero, .L80900E50 /* 03BAC 80900AEC 8605039E */ lh $a1, 0x039E($s0) ## 0000039E /* 03BB0 80900AF0 A60B039C */ sh $t3, 0x039C($s0) ## 0000039C -/* 03BB4 80900AF4 100000D5 */ beq $zero, $zero, .L80900E4C +/* 03BB4 80900AF4 100000D5 */ beq $zero, $zero, .L80900E4C /* 03BB8 80900AF8 A60C01A4 */ sh $t4, 0x01A4($s0) ## 000001A4 glabel L80900AFC /* 03BBC 80900AFC 3C028091 */ lui $v0, %hi(D_8090EB2C) ## $v0 = 80910000 @@ -179,18 +179,18 @@ glabel L80900AFC /* 03BE8 80900B28 C5CA0024 */ lwc1 $f10, 0x0024($t6) ## 00000024 /* 03BEC 80900B2C 3C014120 */ lui $at, 0x4120 ## $at = 41200000 /* 03BF0 80900B30 26040324 */ addiu $a0, $s0, 0x0324 ## $a0 = 00000324 -/* 03BF4 80900B34 46105481 */ sub.s $f18, $f10, $f16 +/* 03BF4 80900B34 46105481 */ sub.s $f18, $f10, $f16 /* 03BF8 80900B38 3C053F80 */ lui $a1, 0x3F80 ## $a1 = 3F800000 /* 03BFC 80900B3C 3C0640A0 */ lui $a2, 0x40A0 ## $a2 = 40A00000 /* 03C00 80900B40 E61203A4 */ swc1 $f18, 0x03A4($s0) ## 000003A4 /* 03C04 80900B44 8C4F0000 */ lw $t7, 0x0000($v0) ## 8090EB2C /* 03C08 80900B48 C5E40028 */ lwc1 $f4, 0x0028($t7) ## 00000028 -/* 03C0C 80900B4C 46002180 */ add.s $f6, $f4, $f0 +/* 03C0C 80900B4C 46002180 */ add.s $f6, $f4, $f0 /* 03C10 80900B50 E60603A8 */ swc1 $f6, 0x03A8($s0) ## 000003A8 /* 03C14 80900B54 8C580000 */ lw $t8, 0x0000($v0) ## 8090EB2C /* 03C18 80900B58 C708002C */ lwc1 $f8, 0x002C($t8) ## 0000002C -/* 03C1C 80900B5C 46004280 */ add.s $f10, $f8, $f0 -/* 03C20 80900B60 46025401 */ sub.s $f16, $f10, $f2 +/* 03C1C 80900B5C 46004280 */ add.s $f10, $f8, $f0 +/* 03C20 80900B60 46025401 */ sub.s $f16, $f10, $f2 /* 03C24 80900B64 44815000 */ mtc1 $at, $f10 ## $f10 = 10.00 /* 03C28 80900B68 E61003AC */ swc1 $f16, 0x03AC($s0) ## 000003AC /* 03C2C 80900B6C 8C590000 */ lw $t9, 0x0000($v0) ## 8090EB2C @@ -198,40 +198,40 @@ glabel L80900AFC /* 03C34 80900B74 E61203B0 */ swc1 $f18, 0x03B0($s0) ## 000003B0 /* 03C38 80900B78 8C480000 */ lw $t0, 0x0000($v0) ## 8090EB2C /* 03C3C 80900B7C C5040028 */ lwc1 $f4, 0x0028($t0) ## 00000028 -/* 03C40 80900B80 46002180 */ add.s $f6, $f4, $f0 +/* 03C40 80900B80 46002180 */ add.s $f6, $f4, $f0 /* 03C44 80900B84 E60603B4 */ swc1 $f6, 0x03B4($s0) ## 000003B4 /* 03C48 80900B88 8C490000 */ lw $t1, 0x0000($v0) ## 8090EB2C /* 03C4C 80900B8C C528002C */ lwc1 $f8, 0x002C($t1) ## 0000002C -/* 03C50 80900B90 460A4401 */ sub.s $f16, $f8, $f10 +/* 03C50 80900B90 460A4401 */ sub.s $f16, $f8, $f10 /* 03C54 80900B94 0C01E123 */ jal Math_SmoothDownscaleMaxF - + /* 03C58 80900B98 E61003B8 */ swc1 $f16, 0x03B8($s0) ## 000003B8 /* 03C5C 80900B9C 3C010001 */ lui $at, 0x0001 ## $at = 00010000 /* 03C60 80900BA0 34210AFC */ ori $at, $at, 0x0AFC ## $at = 00010AFC /* 03C64 80900BA4 3C073CA0 */ lui $a3, 0x3CA0 ## $a3 = 3CA00000 /* 03C68 80900BA8 34E7A0A1 */ ori $a3, $a3, 0xA0A1 ## $a3 = 3CA0A0A1 -/* 03C6C 80900BAC 02212021 */ addu $a0, $s1, $at +/* 03C6C 80900BAC 02212021 */ addu $a0, $s1, $at /* 03C70 80900BB0 3C053F80 */ lui $a1, 0x3F80 ## $a1 = 3F800000 /* 03C74 80900BB4 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 03C78 80900BB8 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 03C7C 80900BBC 860201A4 */ lh $v0, 0x01A4($s0) ## 000001A4 /* 03C80 80900BC0 24010050 */ addiu $at, $zero, 0x0050 ## $at = 00000050 /* 03C84 80900BC4 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 03C88 80900BC8 14410004 */ bne $v0, $at, .L80900BDC +/* 03C88 80900BC8 14410004 */ bne $v0, $at, .L80900BDC /* 03C8C 80900BCC 240570D7 */ addiu $a1, $zero, 0x70D7 ## $a1 = 000070D7 -/* 03C90 80900BD0 0C042DA0 */ jal func_8010B680 +/* 03C90 80900BD0 0C042DA0 */ jal func_8010B680 /* 03C94 80900BD4 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 /* 03C98 80900BD8 860201A4 */ lh $v0, 0x01A4($s0) ## 000001A4 .L80900BDC: -/* 03C9C 80900BDC 2841001E */ slti $at, $v0, 0x001E -/* 03CA0 80900BE0 5020009B */ beql $at, $zero, .L80900E50 +/* 03C9C 80900BDC 2841001E */ slti $at, $v0, 0x001E +/* 03CA0 80900BE0 5020009B */ beql $at, $zero, .L80900E50 /* 03CA4 80900BE4 8605039E */ lh $a1, 0x039E($s0) ## 0000039E -/* 03CA8 80900BE8 0C042F6F */ jal func_8010BDBC +/* 03CA8 80900BE8 0C042F6F */ jal func_8010BDBC /* 03CAC 80900BEC 262420D8 */ addiu $a0, $s1, 0x20D8 ## $a0 = 000020D8 -/* 03CB0 80900BF0 14400096 */ bne $v0, $zero, .L80900E4C +/* 03CB0 80900BF0 14400096 */ bne $v0, $zero, .L80900E4C /* 03CB4 80900BF4 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 03CB8 80900BF8 0C030129 */ jal func_800C04A4 +/* 03CB8 80900BF8 0C030129 */ jal func_800C04A4 /* 03CBC 80900BFC 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 03CC0 80900C00 260303A4 */ addiu $v1, $s0, 0x03A4 ## $v1 = 000003A4 /* 03CC4 80900C04 8C6B0000 */ lw $t3, 0x0000($v1) ## 000003A4 @@ -254,33 +254,33 @@ glabel L80900AFC /* 03D08 80900C48 AC4E0054 */ sw $t6, 0x0054($v0) ## 00000054 /* 03D0C 80900C4C 8E0F03B8 */ lw $t7, 0x03B8($s0) ## 000003B8 /* 03D10 80900C50 AC4F0058 */ sw $t7, 0x0058($v0) ## 00000058 -/* 03D14 80900C54 0C03022B */ jal func_800C08AC +/* 03D14 80900C54 0C03022B */ jal func_800C08AC /* 03D18 80900C58 8605039E */ lh $a1, 0x039E($s0) ## 0000039E /* 03D1C 80900C5C A600039E */ sh $zero, 0x039E($s0) ## 0000039E /* 03D20 80900C60 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 03D24 80900C64 0C01914D */ jal func_80064534 +/* 03D24 80900C64 0C01914D */ jal func_80064534 /* 03D28 80900C68 26251D64 */ addiu $a1, $s1, 0x1D64 ## $a1 = 00001D64 /* 03D2C 80900C6C 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 03D30 80900C70 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 03D34 80900C74 0C00B7D5 */ jal func_8002DF54 +/* 03D34 80900C74 0C00B7D5 */ jal func_8002DF54 /* 03D38 80900C78 24060007 */ addiu $a2, $zero, 0x0007 ## $a2 = 00000007 /* 03D3C 80900C7C 24180003 */ addiu $t8, $zero, 0x0003 ## $t8 = 00000003 -/* 03D40 80900C80 10000072 */ beq $zero, $zero, .L80900E4C +/* 03D40 80900C80 10000072 */ beq $zero, $zero, .L80900E4C /* 03D44 80900C84 A618039C */ sh $t8, 0x039C($s0) ## 0000039C glabel L80900C88 /* 03D48 80900C88 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 03D4C 80900C8C 0C019148 */ jal func_80064520 +/* 03D4C 80900C8C 0C019148 */ jal func_80064520 /* 03D50 80900C90 26251D64 */ addiu $a1, $s1, 0x1D64 ## $a1 = 00001D64 -/* 03D54 80900C94 0C03008C */ jal func_800C0230 +/* 03D54 80900C94 0C03008C */ jal func_800C0230 /* 03D58 80900C98 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 03D5C 80900C9C A602039E */ sh $v0, 0x039E($s0) ## 0000039E /* 03D60 80900CA0 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 03D64 80900CA4 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 03D68 80900CA8 0C0300C5 */ jal func_800C0314 +/* 03D68 80900CA8 0C0300C5 */ jal func_800C0314 /* 03D6C 80900CAC 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 /* 03D70 80900CB0 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 03D74 80900CB4 8605039E */ lh $a1, 0x039E($s0) ## 0000039E -/* 03D78 80900CB8 0C0300C5 */ jal func_800C0314 +/* 03D78 80900CB8 0C0300C5 */ jal func_800C0314 /* 03D7C 80900CBC 24060007 */ addiu $a2, $zero, 0x0007 ## $a2 = 00000007 /* 03D80 80900CC0 2419000B */ addiu $t9, $zero, 0x000B ## $t9 = 0000000B /* 03D84 80900CC4 24080001 */ addiu $t0, $zero, 0x0001 ## $t0 = 00000001 @@ -288,7 +288,7 @@ glabel L80900C88 /* 03D8C 80900CCC A2080334 */ sb $t0, 0x0334($s0) ## 00000334 /* 03D90 80900CD0 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 03D94 80900CD4 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 03D98 80900CD8 0C00B7D5 */ jal func_8002DF54 +/* 03D98 80900CD8 0C00B7D5 */ jal func_8002DF54 /* 03D9C 80900CDC 24060060 */ addiu $a2, $zero, 0x0060 ## $a2 = 00000060 /* 03DA0 80900CE0 AE000398 */ sw $zero, 0x0398($s0) ## 00000398 glabel L80900CE4 @@ -304,11 +304,11 @@ glabel L80900CE4 /* 03DC8 80900D08 C5320024 */ lwc1 $f18, 0x0024($t1) ## 00000024 /* 03DCC 80900D0C 3C014120 */ lui $at, 0x4120 ## $at = 41200000 /* 03DD0 80900D10 44814000 */ mtc1 $at, $f8 ## $f8 = 10.00 -/* 03DD4 80900D14 46049180 */ add.s $f6, $f18, $f4 -/* 03DD8 80900D18 8FA30048 */ lw $v1, 0x0048($sp) +/* 03DD4 80900D14 46049180 */ add.s $f6, $f18, $f4 +/* 03DD8 80900D18 8FA30048 */ lw $v1, 0x0048($sp) /* 03DDC 80900D1C 3C0142C8 */ lui $at, 0x42C8 ## $at = 42C80000 /* 03DE0 80900D20 240B8000 */ addiu $t3, $zero, 0x8000 ## $t3 = FFFF8000 -/* 03DE4 80900D24 46083280 */ add.s $f10, $f6, $f8 +/* 03DE4 80900D24 46083280 */ add.s $f10, $f6, $f8 /* 03DE8 80900D28 44813000 */ mtc1 $at, $f6 ## $f6 = 100.00 /* 03DEC 80900D2C 3C0142A0 */ lui $at, 0x42A0 ## $at = 42A00000 /* 03DF0 80900D30 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 @@ -317,13 +317,13 @@ glabel L80900CE4 /* 03DFC 80900D3C C4640024 */ lwc1 $f4, 0x0024($v1) ## 00000024 /* 03E00 80900D40 44815000 */ mtc1 $at, $f10 ## $f10 = 80.00 /* 03E04 80900D44 C550002C */ lwc1 $f16, 0x002C($t2) ## 0000002C -/* 03E08 80900D48 46062200 */ add.s $f8, $f4, $f6 +/* 03E08 80900D48 46062200 */ add.s $f8, $f4, $f6 /* 03E0C 80900D4C A46B00B6 */ sh $t3, 0x00B6($v1) ## 000000B6 /* 03E10 80900D50 3C014220 */ lui $at, 0x4220 ## $at = 42200000 -/* 03E14 80900D54 46008481 */ sub.s $f18, $f16, $f0 +/* 03E14 80900D54 46008481 */ sub.s $f18, $f16, $f0 /* 03E18 80900D58 44813000 */ mtc1 $at, $f6 ## $f6 = 40.00 /* 03E1C 80900D5C 3C0142DC */ lui $at, 0x42DC ## $at = 42DC0000 -/* 03E20 80900D60 460A4401 */ sub.s $f16, $f8, $f10 +/* 03E20 80900D60 460A4401 */ sub.s $f16, $f8, $f10 /* 03E24 80900D64 E472002C */ swc1 $f18, 0x002C($v1) ## 0000002C /* 03E28 80900D68 8E0C0398 */ lw $t4, 0x0398($s0) ## 00000398 /* 03E2C 80900D6C 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 @@ -331,24 +331,24 @@ glabel L80900CE4 /* 03E34 80900D74 C4720028 */ lwc1 $f18, 0x0028($v1) ## 00000028 /* 03E38 80900D78 44818000 */ mtc1 $at, $f16 ## $f16 = 110.00 /* 03E3C 80900D7C 24010050 */ addiu $at, $zero, 0x0050 ## $at = 00000050 -/* 03E40 80900D80 46029100 */ add.s $f4, $f18, $f2 +/* 03E40 80900D80 46029100 */ add.s $f4, $f18, $f2 /* 03E44 80900D84 262D1D64 */ addiu $t5, $s1, 0x1D64 ## $t5 = 00001D64 -/* 03E48 80900D88 46062201 */ sub.s $f8, $f4, $f6 +/* 03E48 80900D88 46062201 */ sub.s $f8, $f4, $f6 /* 03E4C 80900D8C E60803A8 */ swc1 $f8, 0x03A8($s0) ## 000003A8 /* 03E50 80900D90 C46A002C */ lwc1 $f10, 0x002C($v1) ## 0000002C -/* 03E54 80900D94 46105481 */ sub.s $f18, $f10, $f16 +/* 03E54 80900D94 46105481 */ sub.s $f18, $f10, $f16 /* 03E58 80900D98 E61203AC */ swc1 $f18, 0x03AC($s0) ## 000003AC /* 03E5C 80900D9C C4640024 */ lwc1 $f4, 0x0024($v1) ## 00000024 /* 03E60 80900DA0 E60403B0 */ swc1 $f4, 0x03B0($s0) ## 000003B0 /* 03E64 80900DA4 C4660028 */ lwc1 $f6, 0x0028($v1) ## 00000028 -/* 03E68 80900DA8 46023200 */ add.s $f8, $f6, $f2 -/* 03E6C 80900DAC 46004281 */ sub.s $f10, $f8, $f0 +/* 03E68 80900DA8 46023200 */ add.s $f8, $f6, $f2 +/* 03E6C 80900DAC 46004281 */ sub.s $f10, $f8, $f0 /* 03E70 80900DB0 E60A03B4 */ swc1 $f10, 0x03B4($s0) ## 000003B4 /* 03E74 80900DB4 C470002C */ lwc1 $f16, 0x002C($v1) ## 0000002C -/* 03E78 80900DB8 15810024 */ bne $t4, $at, .L80900E4C +/* 03E78 80900DB8 15810024 */ bne $t4, $at, .L80900E4C /* 03E7C 80900DBC E61003B8 */ swc1 $f16, 0x03B8($s0) ## 000003B8 -/* 03E80 80900DC0 0C030129 */ jal func_800C04A4 -/* 03E84 80900DC4 AFAD0028 */ sw $t5, 0x0028($sp) +/* 03E80 80900DC0 0C030129 */ jal func_800C04A4 +/* 03E84 80900DC4 AFAD0028 */ sw $t5, 0x0028($sp) /* 03E88 80900DC8 260303A4 */ addiu $v1, $s0, 0x03A4 ## $v1 = 000003A4 /* 03E8C 80900DCC 8C6F0000 */ lw $t7, 0x0000($v1) ## 000003A4 /* 03E90 80900DD0 240A0003 */ addiu $t2, $zero, 0x0003 ## $t2 = 00000003 @@ -372,15 +372,15 @@ glabel L80900CE4 /* 03ED8 80900E18 8E0903B8 */ lw $t1, 0x03B8($s0) ## 000003B8 /* 03EDC 80900E1C AC490058 */ sw $t1, 0x0058($v0) ## 00000058 /* 03EE0 80900E20 A60A039C */ sh $t2, 0x039C($s0) ## 0000039C -/* 03EE4 80900E24 0C03022B */ jal func_800C08AC +/* 03EE4 80900E24 0C03022B */ jal func_800C08AC /* 03EE8 80900E28 8605039E */ lh $a1, 0x039E($s0) ## 0000039E /* 03EEC 80900E2C A600039E */ sh $zero, 0x039E($s0) ## 0000039E -/* 03EF0 80900E30 8FA50028 */ lw $a1, 0x0028($sp) -/* 03EF4 80900E34 0C01914D */ jal func_80064534 +/* 03EF0 80900E30 8FA50028 */ lw $a1, 0x0028($sp) +/* 03EF4 80900E34 0C01914D */ jal func_80064534 /* 03EF8 80900E38 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 03EFC 80900E3C 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 03F00 80900E40 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 03F04 80900E44 0C00B7D5 */ jal func_8002DF54 +/* 03F04 80900E44 0C00B7D5 */ jal func_8002DF54 /* 03F08 80900E48 24060007 */ addiu $a2, $zero, 0x0007 ## $a2 = 00000007 glabel L80900E4C .L80900E4C: @@ -388,119 +388,119 @@ glabel L80900E4C .L80900E50: /* 03F10 80900E50 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 03F14 80900E54 260603B0 */ addiu $a2, $s0, 0x03B0 ## $a2 = 000003B0 -/* 03F18 80900E58 50A00004 */ beql $a1, $zero, .L80900E6C +/* 03F18 80900E58 50A00004 */ beql $a1, $zero, .L80900E6C /* 03F1C 80900E5C 860201AC */ lh $v0, 0x01AC($s0) ## 000001AC -/* 03F20 80900E60 0C030136 */ jal func_800C04D8 +/* 03F20 80900E60 0C030136 */ jal func_800C04D8 /* 03F24 80900E64 260703A4 */ addiu $a3, $s0, 0x03A4 ## $a3 = 000003A4 /* 03F28 80900E68 860201AC */ lh $v0, 0x01AC($s0) ## 000001AC .L80900E6C: /* 03F2C 80900E6C 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 03F30 80900E70 8FA4002C */ lw $a0, 0x002C($sp) -/* 03F34 80900E74 10400008 */ beq $v0, $zero, .L80900E98 +/* 03F30 80900E70 8FA4002C */ lw $a0, 0x002C($sp) +/* 03F34 80900E74 10400008 */ beq $v0, $zero, .L80900E98 /* 03F38 80900E78 00000000 */ nop -/* 03F3C 80900E7C 10410011 */ beq $v0, $at, .L80900EC4 +/* 03F3C 80900E7C 10410011 */ beq $v0, $at, .L80900EC4 /* 03F40 80900E80 3C0C0001 */ lui $t4, 0x0001 ## $t4 = 00010000 /* 03F44 80900E84 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 03F48 80900E88 10410041 */ beq $v0, $at, .L80900F90 +/* 03F48 80900E88 10410041 */ beq $v0, $at, .L80900F90 /* 03F4C 80900E8C 26040324 */ addiu $a0, $s0, 0x0324 ## $a0 = 00000324 -/* 03F50 80900E90 1000005B */ beq $zero, $zero, .L80901000 +/* 03F50 80900E90 1000005B */ beq $zero, $zero, .L80901000 /* 03F54 80900E94 26040068 */ addiu $a0, $s0, 0x0068 ## $a0 = 00000068 .L80900E98: -/* 03F58 80900E98 0C0295B2 */ jal func_800A56C8 +/* 03F58 80900E98 0C0295B2 */ jal func_800A56C8 /* 03F5C 80900E9C 8E050194 */ lw $a1, 0x0194($s0) ## 00000194 -/* 03F60 80900EA0 10400056 */ beq $v0, $zero, .L80900FFC -/* 03F64 80900EA4 8FA4002C */ lw $a0, 0x002C($sp) +/* 03F60 80900EA0 10400056 */ beq $v0, $zero, .L80900FFC +/* 03F64 80900EA4 8FA4002C */ lw $a0, 0x002C($sp) /* 03F68 80900EA8 3C050603 */ lui $a1, 0x0603 ## $a1 = 06030000 /* 03F6C 80900EAC 24A54278 */ addiu $a1, $a1, 0x4278 ## $a1 = 06034278 -/* 03F70 80900EB0 0C0294D3 */ jal func_800A534C +/* 03F70 80900EB0 0C0294D3 */ jal SkelAnime_ChangeAnimTransitionRepeat /* 03F74 80900EB4 24060000 */ addiu $a2, $zero, 0x0000 ## $a2 = 00000000 /* 03F78 80900EB8 240B0001 */ addiu $t3, $zero, 0x0001 ## $t3 = 00000001 -/* 03F7C 80900EBC 1000004F */ beq $zero, $zero, .L80900FFC +/* 03F7C 80900EBC 1000004F */ beq $zero, $zero, .L80900FFC /* 03F80 80900EC0 A60B01AC */ sh $t3, 0x01AC($s0) ## 000001AC .L80900EC4: -/* 03F84 80900EC4 01916021 */ addu $t4, $t4, $s1 +/* 03F84 80900EC4 01916021 */ addu $t4, $t4, $s1 /* 03F88 80900EC8 8D8C1DE4 */ lw $t4, 0x1DE4($t4) ## 00001DE4 /* 03F8C 80900ECC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 03F90 80900ED0 318D001F */ andi $t5, $t4, 0x001F ## $t5 = 00000000 -/* 03F94 80900ED4 55A00004 */ bnel $t5, $zero, .L80900EE8 +/* 03F94 80900ED4 55A00004 */ bnel $t5, $zero, .L80900EE8 /* 03F98 80900ED8 860E01A2 */ lh $t6, 0x01A2($s0) ## 000001A2 /* 03F9C 80900EDC 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 03FA0 80900EE0 240539AF */ addiu $a1, $zero, 0x39AF ## $a1 = 000039AF /* 03FA4 80900EE4 860E01A2 */ lh $t6, 0x01A2($s0) ## 000001A2 .L80900EE8: -/* 03FA8 80900EE8 8FA20048 */ lw $v0, 0x0048($sp) +/* 03FA8 80900EE8 8FA20048 */ lw $v0, 0x0048($sp) /* 03FAC 80900EEC 3C01C348 */ lui $at, 0xC348 ## $at = C3480000 -/* 03FB0 80900EF0 51C00005 */ beql $t6, $zero, .L80900F08 +/* 03FB0 80900EF0 51C00005 */ beql $t6, $zero, .L80900F08 /* 03FB4 80900EF4 44817000 */ mtc1 $at, $f14 ## $f14 = -200.00 /* 03FB8 80900EF8 920F0334 */ lbu $t7, 0x0334($s0) ## 00000334 -/* 03FBC 80900EFC 51E00040 */ beql $t7, $zero, .L80901000 +/* 03FBC 80900EFC 51E00040 */ beql $t7, $zero, .L80901000 /* 03FC0 80900F00 26040068 */ addiu $a0, $s0, 0x0068 ## $a0 = 00000068 /* 03FC4 80900F04 44817000 */ mtc1 $at, $f14 ## $f14 = -200.00 .L80900F08: /* 03FC8 80900F08 C4520024 */ lwc1 $f18, 0x0024($v0) ## 00000024 /* 03FCC 80900F0C C444002C */ lwc1 $f4, 0x002C($v0) ## 0000002C /* 03FD0 80900F10 3C014444 */ lui $at, 0x4444 ## $at = 44440000 -/* 03FD4 80900F14 46127081 */ sub.s $f2, $f14, $f18 +/* 03FD4 80900F14 46127081 */ sub.s $f2, $f14, $f18 /* 03FD8 80900F18 44815000 */ mtc1 $at, $f10 ## $f10 = 784.00 /* 03FDC 80900F1C 3C110603 */ lui $s1, 0x0603 ## $s1 = 06030000 -/* 03FE0 80900F20 46047301 */ sub.s $f12, $f14, $f4 -/* 03FE4 80900F24 46021182 */ mul.s $f6, $f2, $f2 +/* 03FE0 80900F20 46047301 */ sub.s $f12, $f14, $f4 +/* 03FE4 80900F24 46021182 */ mul.s $f6, $f2, $f2 /* 03FE8 80900F28 263134F8 */ addiu $s1, $s1, 0x34F8 ## $s1 = 060334F8 /* 03FEC 80900F2C 02202825 */ or $a1, $s1, $zero ## $a1 = 060334F8 -/* 03FF0 80900F30 460C6202 */ mul.s $f8, $f12, $f12 -/* 03FF4 80900F34 8FA4002C */ lw $a0, 0x002C($sp) -/* 03FF8 80900F38 46083000 */ add.s $f0, $f6, $f8 -/* 03FFC 80900F3C 46000004 */ sqrt.s $f0, $f0 -/* 04000 80900F40 460A003E */ c.le.s $f0, $f10 +/* 03FF0 80900F30 460C6202 */ mul.s $f8, $f12, $f12 +/* 03FF4 80900F34 8FA4002C */ lw $a0, 0x002C($sp) +/* 03FF8 80900F38 46083000 */ add.s $f0, $f6, $f8 +/* 03FFC 80900F3C 46000004 */ sqrt.s $f0, $f0 +/* 04000 80900F40 460A003E */ c.le.s $f0, $f10 /* 04004 80900F44 00000000 */ nop -/* 04008 80900F48 4502002D */ bc1fl .L80901000 +/* 04008 80900F48 4502002D */ bc1fl .L80901000 /* 0400C 80900F4C 26040068 */ addiu $a0, $s0, 0x0068 ## $a0 = 00000068 -/* 04010 80900F50 0C029490 */ jal func_800A5240 +/* 04010 80900F50 0C029490 */ jal SkelAnime_ChangeAnimTransitionStop /* 04014 80900F54 24060000 */ addiu $a2, $zero, 0x0000 ## $a2 = 00000000 /* 04018 80900F58 0C028800 */ jal SkelAnime_GetFrameCount - + /* 0401C 80900F5C 02202025 */ or $a0, $s1, $zero ## $a0 = 060334F8 /* 04020 80900F60 44828000 */ mtc1 $v0, $f16 ## $f16 = 0.00 /* 04024 80900F64 24180002 */ addiu $t8, $zero, 0x0002 ## $t8 = 00000002 /* 04028 80900F68 24190028 */ addiu $t9, $zero, 0x0028 ## $t9 = 00000028 -/* 0402C 80900F6C 468084A0 */ cvt.s.w $f18, $f16 +/* 0402C 80900F6C 468084A0 */ cvt.s.w $f18, $f16 /* 04030 80900F70 A61801AC */ sh $t8, 0x01AC($s0) ## 000001AC /* 04034 80900F74 A61901A2 */ sh $t9, 0x01A2($s0) ## 000001A2 /* 04038 80900F78 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 0403C 80900F7C 2405398F */ addiu $a1, $zero, 0x398F ## $a1 = 0000398F /* 04040 80900F80 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 04044 80900F84 E6120194 */ swc1 $f18, 0x0194($s0) ## 00000194 -/* 04048 80900F88 1000001D */ beq $zero, $zero, .L80901000 +/* 04048 80900F88 1000001D */ beq $zero, $zero, .L80901000 /* 0404C 80900F8C 26040068 */ addiu $a0, $s0, 0x0068 ## $a0 = 00000068 .L80900F90: /* 04050 80900F90 3C010001 */ lui $at, 0x0001 ## $at = 00010000 /* 04054 80900F94 34210AFC */ ori $at, $at, 0x0AFC ## $at = 00010AFC -/* 04058 80900F98 02214021 */ addu $t0, $s1, $at -/* 0405C 80900F9C AFA80028 */ sw $t0, 0x0028($sp) +/* 04058 80900F98 02214021 */ addu $t0, $s1, $at +/* 0405C 80900F9C AFA80028 */ sw $t0, 0x0028($sp) /* 04060 80900FA0 3C05437F */ lui $a1, 0x437F ## $a1 = 437F0000 /* 04064 80900FA4 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 04068 80900FA8 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 0406C 80900FAC 3C074120 */ lui $a3, 0x4120 ## $a3 = 41200000 /* 04070 80900FB0 3C063D20 */ lui $a2, 0x3D20 ## $a2 = 3D200000 /* 04074 80900FB4 34C6A0A1 */ ori $a2, $a2, 0xA0A1 ## $a2 = 3D20A0A1 -/* 04078 80900FB8 8FA40028 */ lw $a0, 0x0028($sp) +/* 04078 80900FB8 8FA40028 */ lw $a0, 0x0028($sp) /* 0407C 80900FBC 0C01E123 */ jal Math_SmoothDownscaleMaxF - + /* 04080 80900FC0 3C053F80 */ lui $a1, 0x3F80 ## $a1 = 3F800000 -/* 04084 80900FC4 8FA4002C */ lw $a0, 0x002C($sp) -/* 04088 80900FC8 0C0295B2 */ jal func_800A56C8 +/* 04084 80900FC4 8FA4002C */ lw $a0, 0x002C($sp) +/* 04088 80900FC8 0C0295B2 */ jal func_800A56C8 /* 0408C 80900FCC 8E050194 */ lw $a1, 0x0194($s0) ## 00000194 -/* 04090 80900FD0 1040000A */ beq $v0, $zero, .L80900FFC +/* 04090 80900FD0 1040000A */ beq $v0, $zero, .L80900FFC /* 04094 80900FD4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 04098 80900FD8 0C23FF6C */ jal func_808FFDB0 +/* 04098 80900FD8 0C23FF6C */ jal func_808FFDB0 /* 0409C 80900FDC 02202825 */ or $a1, $s1, $zero ## $a1 = 060334F8 /* 040A0 80900FE0 92090334 */ lbu $t1, 0x0334($s0) ## 00000334 /* 040A4 80900FE4 240A0019 */ addiu $t2, $zero, 0x0019 ## $t2 = 00000019 /* 040A8 80900FE8 240B0001 */ addiu $t3, $zero, 0x0001 ## $t3 = 00000001 -/* 040AC 80900FEC 55200003 */ bnel $t1, $zero, .L80900FFC +/* 040AC 80900FEC 55200003 */ bnel $t1, $zero, .L80900FFC /* 040B0 80900FF0 A20B0336 */ sb $t3, 0x0336($s0) ## 00000336 /* 040B4 80900FF4 A20A00AF */ sb $t2, 0x00AF($s0) ## 000000AF /* 040B8 80900FF8 A20B0336 */ sb $t3, 0x0336($s0) ## 00000336 @@ -509,12 +509,12 @@ glabel L80900E4C .L80901000: /* 040C0 80901000 3C053F00 */ lui $a1, 0x3F00 ## $a1 = 3F000000 /* 040C4 80901004 0C01E123 */ jal Math_SmoothDownscaleMaxF - + /* 040C8 80901008 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 040CC 8090100C 8FBF001C */ lw $ra, 0x001C($sp) -/* 040D0 80901010 8FB00014 */ lw $s0, 0x0014($sp) -/* 040D4 80901014 8FB10018 */ lw $s1, 0x0018($sp) -/* 040D8 80901018 03E00008 */ jr $ra +/* 040CC 8090100C 8FBF001C */ lw $ra, 0x001C($sp) +/* 040D0 80901010 8FB00014 */ lw $s0, 0x0014($sp) +/* 040D4 80901014 8FB10018 */ lw $s1, 0x0018($sp) +/* 040D8 80901018 03E00008 */ jr $ra /* 040DC 8090101C 27BD0068 */ addiu $sp, $sp, 0x0068 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_80901020.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_80901020.s index 5c19414c42..174ee12b9d 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_80901020.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_80901020.s @@ -1,36 +1,36 @@ glabel func_80901020 /* 040E0 80901020 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 040E4 80901024 AFB00018 */ sw $s0, 0x0018($sp) -/* 040E8 80901028 AFA50024 */ sw $a1, 0x0024($sp) +/* 040E4 80901024 AFB00018 */ sw $s0, 0x0018($sp) +/* 040E8 80901028 AFA50024 */ sw $a1, 0x0024($sp) /* 040EC 8090102C 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 040F0 80901030 AFBF001C */ sw $ra, 0x001C($sp) +/* 040F0 80901030 AFBF001C */ sw $ra, 0x001C($sp) /* 040F4 80901034 3C050603 */ lui $a1, 0x0603 ## $a1 = 06030000 /* 040F8 80901038 24A5A848 */ addiu $a1, $a1, 0xA848 ## $a1 = 0602A848 /* 040FC 8090103C 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 04100 80901040 0C029490 */ jal func_800A5240 +/* 04100 80901040 0C029490 */ jal SkelAnime_ChangeAnimTransitionStop /* 04104 80901044 3C06C0A0 */ lui $a2, 0xC0A0 ## $a2 = C0A00000 /* 04108 80901048 3C040603 */ lui $a0, 0x0603 ## $a0 = 06030000 /* 0410C 8090104C 0C028800 */ jal SkelAnime_GetFrameCount - + /* 04110 80901050 2484A848 */ addiu $a0, $a0, 0xA848 ## $a0 = 0602A848 /* 04114 80901054 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 04118 80901058 3C0E8090 */ lui $t6, %hi(func_8090120C) ## $t6 = 80900000 /* 0411C 8090105C 25CE120C */ addiu $t6, $t6, %lo(func_8090120C) ## $t6 = 8090120C -/* 04120 80901060 468021A0 */ cvt.s.w $f6, $f4 +/* 04120 80901060 468021A0 */ cvt.s.w $f6, $f4 /* 04124 80901064 AE0E0190 */ sw $t6, 0x0190($s0) ## 00000190 /* 04128 80901068 A60001AC */ sh $zero, 0x01AC($s0) ## 000001AC /* 0412C 8090106C A600039C */ sh $zero, 0x039C($s0) ## 0000039C /* 04130 80901070 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 04134 80901074 2405399E */ addiu $a1, $zero, 0x399E ## $a1 = 0000399E /* 04138 80901078 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 0413C 8090107C E6060194 */ swc1 $f6, 0x0194($s0) ## 00000194 /* 04140 80901080 240F0004 */ addiu $t7, $zero, 0x0004 ## $t7 = 00000004 /* 04144 80901084 A20F0314 */ sb $t7, 0x0314($s0) ## 00000314 -/* 04148 80901088 8FBF001C */ lw $ra, 0x001C($sp) -/* 0414C 8090108C 8FB00018 */ lw $s0, 0x0018($sp) +/* 04148 80901088 8FBF001C */ lw $ra, 0x001C($sp) +/* 0414C 8090108C 8FB00018 */ lw $s0, 0x0018($sp) /* 04150 80901090 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 04154 80901094 03E00008 */ jr $ra +/* 04154 80901094 03E00008 */ jr $ra /* 04158 80901098 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_8090120C.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_8090120C.s index ddfb9a15de..e85365f4c7 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_8090120C.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_8090120C.s @@ -1,66 +1,66 @@ glabel func_8090120C /* 042CC 8090120C 27BDFFB0 */ addiu $sp, $sp, 0xFFB0 ## $sp = FFFFFFB0 -/* 042D0 80901210 AFBF0024 */ sw $ra, 0x0024($sp) -/* 042D4 80901214 AFB00020 */ sw $s0, 0x0020($sp) -/* 042D8 80901218 AFA50054 */ sw $a1, 0x0054($sp) +/* 042D0 80901210 AFBF0024 */ sw $ra, 0x0024($sp) +/* 042D4 80901214 AFB00020 */ sw $s0, 0x0020($sp) +/* 042D8 80901218 AFA50054 */ sw $a1, 0x0054($sp) /* 042DC 8090121C 8CAF1C44 */ lw $t7, 0x1C44($a1) ## 00001C44 /* 042E0 80901220 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 042E4 80901224 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 042E8 80901228 AFAF004C */ sw $t7, 0x004C($sp) +/* 042E8 80901228 AFAF004C */ sw $t7, 0x004C($sp) /* 042EC 8090122C 8C98024C */ lw $t8, 0x024C($a0) ## 00000398 /* 042F0 80901230 27190001 */ addiu $t9, $t8, 0x0001 ## $t9 = 00000001 /* 042F4 80901234 AC99024C */ sw $t9, 0x024C($a0) ## 00000398 /* 042F8 80901238 0C02927F */ jal SkelAnime_FrameUpdateMatrix - -/* 042FC 8090123C AFA40028 */ sw $a0, 0x0028($sp) + +/* 042FC 8090123C AFA40028 */ sw $a0, 0x0028($sp) /* 04300 80901240 8603039C */ lh $v1, 0x039C($s0) ## 0000039C /* 04304 80901244 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 /* 04308 80901248 44810000 */ mtc1 $at, $f0 ## $f0 = 1.00 /* 0430C 8090124C 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 /* 04310 80901250 44803000 */ mtc1 $zero, $f6 ## $f6 = 0.00 -/* 04314 80901254 28610015 */ slti $at, $v1, 0x0015 +/* 04314 80901254 28610015 */ slti $at, $v1, 0x0015 /* 04318 80901258 E60003C0 */ swc1 $f0, 0x03C0($s0) ## 000003C0 /* 0431C 8090125C E60403BC */ swc1 $f4, 0x03BC($s0) ## 000003BC -/* 04320 80901260 14200006 */ bne $at, $zero, .L8090127C +/* 04320 80901260 14200006 */ bne $at, $zero, .L8090127C /* 04324 80901264 E60603C4 */ swc1 $f6, 0x03C4($s0) ## 000003C4 /* 04328 80901268 2401004B */ addiu $at, $zero, 0x004B ## $at = 0000004B -/* 0432C 8090126C 506102CC */ beql $v1, $at, .L80901DA0 +/* 0432C 8090126C 506102CC */ beql $v1, $at, .L80901DA0 /* 04330 80901270 8E190398 */ lw $t9, 0x0398($s0) ## 00000398 -/* 04334 80901274 10000407 */ beq $zero, $zero, .L80902294 +/* 04334 80901274 10000407 */ beq $zero, $zero, .L80902294 /* 04338 80901278 8605039E */ lh $a1, 0x039E($s0) ## 0000039E .L8090127C: -/* 0433C 8090127C 2C610015 */ sltiu $at, $v1, 0x0015 -/* 04340 80901280 10200403 */ beq $at, $zero, .L80902290 -/* 04344 80901284 00034080 */ sll $t0, $v1, 2 +/* 0433C 8090127C 2C610015 */ sltiu $at, $v1, 0x0015 +/* 04340 80901280 10200403 */ beq $at, $zero, .L80902290 +/* 04344 80901284 00034080 */ sll $t0, $v1, 2 /* 04348 80901288 3C018091 */ lui $at, %hi(jtbl_8090DBF4) ## $at = 80910000 -/* 0434C 8090128C 00280821 */ addu $at, $at, $t0 -/* 04350 80901290 8C28DBF4 */ lw $t0, %lo(jtbl_8090DBF4)($at) -/* 04354 80901294 01000008 */ jr $t0 +/* 0434C 8090128C 00280821 */ addu $at, $at, $t0 +/* 04350 80901290 8C28DBF4 */ lw $t0, %lo(jtbl_8090DBF4)($at) +/* 04354 80901294 01000008 */ jr $t0 /* 04358 80901298 00000000 */ nop glabel L8090129C -/* 0435C 8090129C 8FA40054 */ lw $a0, 0x0054($sp) -/* 04360 809012A0 0C019148 */ jal func_80064520 +/* 0435C 8090129C 8FA40054 */ lw $a0, 0x0054($sp) +/* 04360 809012A0 0C019148 */ jal func_80064520 /* 04364 809012A4 24851D64 */ addiu $a1, $a0, 0x1D64 ## $a1 = 00001D64 -/* 04368 809012A8 0C03008C */ jal func_800C0230 -/* 0436C 809012AC 8FA40054 */ lw $a0, 0x0054($sp) +/* 04368 809012A8 0C03008C */ jal func_800C0230 +/* 0436C 809012AC 8FA40054 */ lw $a0, 0x0054($sp) /* 04370 809012B0 A602039E */ sh $v0, 0x039E($s0) ## 0000039E -/* 04374 809012B4 8FA40054 */ lw $a0, 0x0054($sp) +/* 04374 809012B4 8FA40054 */ lw $a0, 0x0054($sp) /* 04378 809012B8 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 0437C 809012BC 0C0300C5 */ jal func_800C0314 +/* 0437C 809012BC 0C0300C5 */ jal func_800C0314 /* 04380 809012C0 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 -/* 04384 809012C4 8FA40054 */ lw $a0, 0x0054($sp) +/* 04384 809012C4 8FA40054 */ lw $a0, 0x0054($sp) /* 04388 809012C8 8605039E */ lh $a1, 0x039E($s0) ## 0000039E -/* 0438C 809012CC 0C0300C5 */ jal func_800C0314 +/* 0438C 809012CC 0C0300C5 */ jal func_800C0314 /* 04390 809012D0 24060007 */ addiu $a2, $zero, 0x0007 ## $a2 = 00000007 -/* 04394 809012D4 8FA40054 */ lw $a0, 0x0054($sp) +/* 04394 809012D4 8FA40054 */ lw $a0, 0x0054($sp) /* 04398 809012D8 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 0439C 809012DC 0C00B7D5 */ jal func_8002DF54 +/* 0439C 809012DC 0C00B7D5 */ jal func_8002DF54 /* 043A0 809012E0 24060008 */ addiu $a2, $zero, 0x0008 ## $a2 = 00000008 /* 043A4 809012E4 24090001 */ addiu $t1, $zero, 0x0001 ## $t1 = 00000001 /* 043A8 809012E8 A609039C */ sh $t1, 0x039C($s0) ## 0000039C /* 043AC 809012EC AE000398 */ sw $zero, 0x0398($s0) ## 00000398 /* 043B0 809012F0 3C0B8091 */ lui $t3, %hi(D_8090EB2C) ## $t3 = 80910000 -/* 043B4 809012F4 8D6BEB2C */ lw $t3, %lo(D_8090EB2C)($t3) +/* 043B4 809012F4 8D6BEB2C */ lw $t3, %lo(D_8090EB2C)($t3) /* 043B8 809012F8 240A0009 */ addiu $t2, $zero, 0x0009 ## $t2 = 00000009 /* 043BC 809012FC 44804000 */ mtc1 $zero, $f8 ## $f8 = 0.00 /* 043C0 80901300 A16A03C8 */ sb $t2, 0x03C8($t3) ## 809103C8 @@ -72,10 +72,10 @@ glabel L8090129C /* 043D8 80901318 E6080324 */ swc1 $f8, 0x0324($s0) ## 00000324 /* 043DC 8090131C E60A0068 */ swc1 $f10, 0x0068($s0) ## 00000068 /* 043E0 80901320 A60C031A */ sh $t4, 0x031A($s0) ## 0000031A -/* 043E4 80901324 8FAD0054 */ lw $t5, 0x0054($sp) +/* 043E4 80901324 8FAD0054 */ lw $t5, 0x0054($sp) /* 043E8 80901328 44808000 */ mtc1 $zero, $f16 ## $f16 = 0.00 /* 043EC 8090132C 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 043F0 80901330 002D0821 */ addu $at, $at, $t5 +/* 043F0 80901330 002D0821 */ addu $at, $at, $t5 /* 043F4 80901334 E4300AFC */ swc1 $f16, 0x0AFC($at) ## 00010AFC /* 043F8 80901338 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 /* 043FC 8090133C 44810000 */ mtc1 $at, $f0 ## $f0 = 1.00 @@ -84,76 +84,76 @@ glabel L80901344 /* 04404 80901344 8E030398 */ lw $v1, 0x0398($s0) ## 00000398 /* 04408 80901348 3C073DCC */ lui $a3, 0x3DCC ## $a3 = 3DCC0000 /* 0440C 8090134C 240E0014 */ addiu $t6, $zero, 0x0014 ## $t6 = 00000014 -/* 04410 80901350 2C61005A */ sltiu $at, $v1, 0x005A -/* 04414 80901354 1020000D */ beq $at, $zero, .L8090138C +/* 04410 80901350 2C61005A */ sltiu $at, $v1, 0x005A +/* 04414 80901354 1020000D */ beq $at, $zero, .L8090138C /* 04418 80901358 34E7CCCD */ ori $a3, $a3, 0xCCCD ## $a3 = 3DCCCCCD /* 0441C 8090135C A20E0339 */ sb $t6, 0x0339($s0) ## 00000339 -/* 04420 80901360 8FA40054 */ lw $a0, 0x0054($sp) +/* 04420 80901360 8FA40054 */ lw $a0, 0x0054($sp) /* 04424 80901364 3C010001 */ lui $at, 0x0001 ## $at = 00010000 /* 04428 80901368 34210AFC */ ori $at, $at, 0x0AFC ## $at = 00010AFC -/* 0442C 8090136C 44050000 */ mfc1 $a1, $f0 -/* 04430 80901370 44060000 */ mfc1 $a2, $f0 +/* 0442C 8090136C 44050000 */ mfc1 $a1, $f0 +/* 04430 80901370 44060000 */ mfc1 $a2, $f0 /* 04434 80901374 0C01E107 */ jal Math_SmoothScaleMaxF - -/* 04438 80901378 00812021 */ addu $a0, $a0, $at + +/* 04438 80901378 00812021 */ addu $a0, $a0, $at /* 0443C 8090137C 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 /* 04440 80901380 44810000 */ mtc1 $at, $f0 ## $f0 = 1.00 -/* 04444 80901384 10000010 */ beq $zero, $zero, .L809013C8 +/* 04444 80901384 10000010 */ beq $zero, $zero, .L809013C8 /* 04448 80901388 8E030398 */ lw $v1, 0x0398($s0) ## 00000398 .L8090138C: -/* 0444C 8090138C 2C61005A */ sltiu $at, $v1, 0x005A -/* 04450 80901390 1420000D */ bne $at, $zero, .L809013C8 +/* 0444C 8090138C 2C61005A */ sltiu $at, $v1, 0x005A +/* 04450 80901390 1420000D */ bne $at, $zero, .L809013C8 /* 04454 80901394 240F0015 */ addiu $t7, $zero, 0x0015 ## $t7 = 00000015 /* 04458 80901398 A20F0339 */ sb $t7, 0x0339($s0) ## 00000339 -/* 0445C 8090139C 8FA40054 */ lw $a0, 0x0054($sp) +/* 0445C 8090139C 8FA40054 */ lw $a0, 0x0054($sp) /* 04460 809013A0 3C010001 */ lui $at, 0x0001 ## $at = 00010000 /* 04464 809013A4 34210AFC */ ori $at, $at, 0x0AFC ## $at = 00010AFC -/* 04468 809013A8 44050000 */ mfc1 $a1, $f0 +/* 04468 809013A8 44050000 */ mfc1 $a1, $f0 /* 0446C 809013AC 3C063DA3 */ lui $a2, 0x3DA3 ## $a2 = 3DA30000 /* 04470 809013B0 34C6D70A */ ori $a2, $a2, 0xD70A ## $a2 = 3DA3D70A /* 04474 809013B4 0C01E123 */ jal Math_SmoothDownscaleMaxF - -/* 04478 809013B8 00812021 */ addu $a0, $a0, $at + +/* 04478 809013B8 00812021 */ addu $a0, $a0, $at /* 0447C 809013BC 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 /* 04480 809013C0 44810000 */ mtc1 $at, $f0 ## $f0 = 1.00 /* 04484 809013C4 8E030398 */ lw $v1, 0x0398($s0) ## 00000398 .L809013C8: /* 04488 809013C8 24010032 */ addiu $at, $zero, 0x0032 ## $at = 00000032 -/* 0448C 809013CC 54610007 */ bnel $v1, $at, .L809013EC -/* 04490 809013D0 2C61005B */ sltiu $at, $v1, 0x005B -/* 04494 809013D4 0C01E221 */ jal func_80078884 +/* 0448C 809013CC 54610007 */ bnel $v1, $at, .L809013EC +/* 04490 809013D0 2C61005B */ sltiu $at, $v1, 0x005B +/* 04494 809013D4 0C01E221 */ jal func_80078884 /* 04498 809013D8 240439D7 */ addiu $a0, $zero, 0x39D7 ## $a0 = 000039D7 /* 0449C 809013DC 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 /* 044A0 809013E0 44810000 */ mtc1 $at, $f0 ## $f0 = 1.00 /* 044A4 809013E4 8E030398 */ lw $v1, 0x0398($s0) ## 00000398 -/* 044A8 809013E8 2C61005B */ sltiu $at, $v1, 0x005B +/* 044A8 809013E8 2C61005B */ sltiu $at, $v1, 0x005B .L809013EC: -/* 044AC 809013EC 1420000C */ bne $at, $zero, .L80901420 +/* 044AC 809013EC 1420000C */ bne $at, $zero, .L80901420 /* 044B0 809013F0 26040380 */ addiu $a0, $s0, 0x0380 ## $a0 = 00000380 -/* 044B4 809013F4 44060000 */ mfc1 $a2, $f0 +/* 044B4 809013F4 44060000 */ mfc1 $a2, $f0 /* 044B8 809013F8 3C073C4C */ lui $a3, 0x3C4C ## $a3 = 3C4C0000 /* 044BC 809013FC 34E7CCCD */ ori $a3, $a3, 0xCCCD ## $a3 = 3C4CCCCD /* 044C0 80901400 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 044C4 80901404 3C053E80 */ lui $a1, 0x3E80 ## $a1 = 3E800000 /* 044C8 80901408 3C014348 */ lui $at, 0x4348 ## $at = 43480000 /* 044CC 8090140C 44819000 */ mtc1 $at, $f18 ## $f18 = 200.00 /* 044D0 80901410 2404209D */ addiu $a0, $zero, 0x209D ## $a0 = 0000209D -/* 044D4 80901414 0C01E221 */ jal func_80078884 +/* 044D4 80901414 0C01E221 */ jal func_80078884 /* 044D8 80901418 E612037C */ swc1 $f18, 0x037C($s0) ## 0000037C /* 044DC 8090141C 8E030398 */ lw $v1, 0x0398($s0) ## 00000398 .L80901420: -/* 044E0 80901420 2C61006E */ sltiu $at, $v1, 0x006E -/* 044E4 80901424 14200012 */ bne $at, $zero, .L80901470 +/* 044E0 80901420 2C61006E */ sltiu $at, $v1, 0x006E +/* 044E4 80901424 14200012 */ bne $at, $zero, .L80901470 /* 044E8 80901428 2401006E */ addiu $at, $zero, 0x006E ## $at = 0000006E -/* 044EC 8090142C 14610006 */ bne $v1, $at, .L80901448 +/* 044EC 8090142C 14610006 */ bne $v1, $at, .L80901448 /* 044F0 80901430 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 044F4 80901434 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 044F8 80901438 2405390B */ addiu $a1, $zero, 0x390B ## $a1 = 0000390B /* 044FC 8090143C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 04500 80901440 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 04504 80901444 2405399B */ addiu $a1, $zero, 0x399B ## $a1 = 0000399B .L80901448: /* 04508 80901448 3C063E4C */ lui $a2, 0x3E4C ## $a2 = 3E4C0000 @@ -161,7 +161,7 @@ glabel L80901344 /* 04510 80901450 2604030C */ addiu $a0, $s0, 0x030C ## $a0 = 0000030C /* 04514 80901454 3C054120 */ lui $a1, 0x4120 ## $a1 = 41200000 /* 04518 80901458 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 0451C 8090145C 3C0740A0 */ lui $a3, 0x40A0 ## $a3 = 40A00000 /* 04520 80901460 3C014040 */ lui $at, 0x4040 ## $at = 40400000 /* 04524 80901464 44812000 */ mtc1 $at, $f4 ## $f4 = 3.00 @@ -169,13 +169,13 @@ glabel L80901344 /* 0452C 8090146C E6040168 */ swc1 $f4, 0x0168($s0) ## 00000168 .L80901470: /* 04530 80901470 24010078 */ addiu $at, $zero, 0x0078 ## $at = 00000078 -/* 04534 80901474 14610004 */ bne $v1, $at, .L80901488 -/* 04538 80901478 8FA40054 */ lw $a0, 0x0054($sp) +/* 04534 80901474 14610004 */ bne $v1, $at, .L80901488 +/* 04538 80901478 8FA40054 */ lw $a0, 0x0054($sp) /* 0453C 8090147C 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 04540 80901480 0C00B7D5 */ jal func_8002DF54 +/* 04540 80901480 0C00B7D5 */ jal func_8002DF54 /* 04544 80901484 24060063 */ addiu $a2, $zero, 0x0063 ## $a2 = 00000063 .L80901488: -/* 04548 80901488 8FA3004C */ lw $v1, 0x004C($sp) +/* 04548 80901488 8FA3004C */ lw $v1, 0x004C($sp) /* 0454C 8090148C 44803000 */ mtc1 $zero, $f6 ## $f6 = 0.00 /* 04550 80901490 44804000 */ mtc1 $zero, $f8 ## $f8 = 0.00 /* 04554 80901494 3C014348 */ lui $at, 0x4348 ## $at = 43480000 @@ -192,21 +192,21 @@ glabel L80901344 /* 04580 809014C0 A47900B6 */ sh $t9, 0x00B6($v1) ## 000000B6 /* 04584 809014C4 E46A0024 */ swc1 $f10, 0x0024($v1) ## 00000024 /* 04588 809014C8 E470002C */ swc1 $f16, 0x002C($v1) ## 0000002C -/* 0458C 809014CC 8D08EB2C */ lw $t0, %lo(D_8090EB2C)($t0) +/* 0458C 809014CC 8D08EB2C */ lw $t0, %lo(D_8090EB2C)($t0) /* 04590 809014D0 44819000 */ mtc1 $at, $f18 ## $f18 = 340.00 /* 04594 809014D4 3C01C37A */ lui $at, 0xC37A ## $at = C37A0000 /* 04598 809014D8 3C098091 */ lui $t1, %hi(D_8090EB2C) ## $t1 = 80910000 /* 0459C 809014DC E5120024 */ swc1 $f18, 0x0024($t0) ## 80910024 -/* 045A0 809014E0 8D29EB2C */ lw $t1, %lo(D_8090EB2C)($t1) +/* 045A0 809014E0 8D29EB2C */ lw $t1, %lo(D_8090EB2C)($t1) /* 045A4 809014E4 44812000 */ mtc1 $at, $f4 ## $f4 = -250.00 /* 045A8 809014E8 3C0B8091 */ lui $t3, %hi(D_8090EB2C) ## $t3 = 80910000 /* 045AC 809014EC 240AE000 */ addiu $t2, $zero, 0xE000 ## $t2 = FFFFE000 /* 045B0 809014F0 E524002C */ swc1 $f4, 0x002C($t1) ## 8091002C -/* 045B4 809014F4 8D6BEB2C */ lw $t3, %lo(D_8090EB2C)($t3) +/* 045B4 809014F4 8D6BEB2C */ lw $t3, %lo(D_8090EB2C)($t3) /* 045B8 809014F8 3C028091 */ lui $v0, %hi(D_8090EB2C) ## $v0 = 80910000 /* 045BC 809014FC 3C01437A */ lui $at, 0x437A ## $at = 437A0000 /* 045C0 80901500 A56A00B6 */ sh $t2, 0x00B6($t3) ## 809100B6 -/* 045C4 80901504 8C42EB2C */ lw $v0, %lo(D_8090EB2C)($v0) +/* 045C4 80901504 8C42EB2C */ lw $v0, %lo(D_8090EB2C)($v0) /* 045C8 80901508 44813000 */ mtc1 $at, $f6 ## $f6 = 250.00 /* 045CC 8090150C 3C018091 */ lui $at, %hi(D_8090DC48) ## $at = 80910000 /* 045D0 80901510 844C00B6 */ lh $t4, 0x00B6($v0) ## 809100B6 @@ -214,88 +214,88 @@ glabel L80901344 /* 045D8 80901518 240E0002 */ addiu $t6, $zero, 0x0002 ## $t6 = 00000002 /* 045DC 8090151C A44C0032 */ sh $t4, 0x0032($v0) ## 80910032 /* 045E0 80901520 E60603A4 */ swc1 $f6, 0x03A4($s0) ## 000003A4 -/* 045E4 80901524 C428DC48 */ lwc1 $f8, %lo(D_8090DC48)($at) +/* 045E4 80901524 C428DC48 */ lwc1 $f8, %lo(D_8090DC48)($at) /* 045E8 80901528 8E0D0398 */ lw $t5, 0x0398($s0) ## 00000398 /* 045EC 8090152C C61001B8 */ lwc1 $f16, 0x01B8($s0) ## 000001B8 /* 045F0 80901530 C61201BC */ lwc1 $f18, 0x01BC($s0) ## 000001BC /* 045F4 80901534 C60401C0 */ lwc1 $f4, 0x01C0($s0) ## 000001C0 -/* 045F8 80901538 2DA10088 */ sltiu $at, $t5, 0x0088 +/* 045F8 80901538 2DA10088 */ sltiu $at, $t5, 0x0088 /* 045FC 8090153C E60A03AC */ swc1 $f10, 0x03AC($s0) ## 000003AC /* 04600 80901540 E60803A8 */ swc1 $f8, 0x03A8($s0) ## 000003A8 /* 04604 80901544 E61003B0 */ swc1 $f16, 0x03B0($s0) ## 000003B0 /* 04608 80901548 E61203B4 */ swc1 $f18, 0x03B4($s0) ## 000003B4 -/* 0460C 8090154C 14200350 */ bne $at, $zero, .L80902290 +/* 0460C 8090154C 14200350 */ bne $at, $zero, .L80902290 /* 04610 80901550 E60403B8 */ swc1 $f4, 0x03B8($s0) ## 000003B8 /* 04614 80901554 A60E039C */ sh $t6, 0x039C($s0) ## 0000039C -/* 04618 80901558 1000034D */ beq $zero, $zero, .L80902290 +/* 04618 80901558 1000034D */ beq $zero, $zero, .L80902290 /* 0461C 8090155C AE000398 */ sw $zero, 0x0398($s0) ## 00000398 glabel L80901560 /* 04620 80901560 240F0016 */ addiu $t7, $zero, 0x0016 ## $t7 = 00000016 /* 04624 80901564 A20F0339 */ sb $t7, 0x0339($s0) ## 00000339 -/* 04628 80901568 8FA40054 */ lw $a0, 0x0054($sp) +/* 04628 80901568 8FA40054 */ lw $a0, 0x0054($sp) /* 0462C 8090156C 3C010001 */ lui $at, 0x0001 ## $at = 00010000 /* 04630 80901570 34210AFC */ ori $at, $at, 0x0AFC ## $at = 00010AFC -/* 04634 80901574 44050000 */ mfc1 $a1, $f0 -/* 04638 80901578 44060000 */ mfc1 $a2, $f0 +/* 04634 80901574 44050000 */ mfc1 $a1, $f0 +/* 04638 80901578 44060000 */ mfc1 $a2, $f0 /* 0463C 8090157C 3C073DCC */ lui $a3, 0x3DCC ## $a3 = 3DCC0000 /* 04640 80901580 34E7CCCD */ ori $a3, $a3, 0xCCCD ## $a3 = 3DCCCCCD /* 04644 80901584 0C01E107 */ jal Math_SmoothScaleMaxF - -/* 04648 80901588 00812021 */ addu $a0, $a0, $at -/* 0464C 8090158C 0C01E221 */ jal func_80078884 + +/* 04648 80901588 00812021 */ addu $a0, $a0, $at +/* 0464C 8090158C 0C01E221 */ jal func_80078884 /* 04650 80901590 2404209D */ addiu $a0, $zero, 0x209D ## $a0 = 0000209D /* 04654 80901594 3C01437A */ lui $at, 0x437A ## $at = 437A0000 /* 04658 80901598 44813000 */ mtc1 $at, $f6 ## $f6 = 250.00 /* 0465C 8090159C 3C018091 */ lui $at, %hi(D_8090DC4C) ## $at = 80910000 /* 04660 809015A0 44805000 */ mtc1 $zero, $f10 ## $f10 = 0.00 /* 04664 809015A4 E60603A4 */ swc1 $f6, 0x03A4($s0) ## 000003A4 -/* 04668 809015A8 C428DC4C */ lwc1 $f8, %lo(D_8090DC4C)($at) +/* 04668 809015A8 C428DC4C */ lwc1 $f8, %lo(D_8090DC4C)($at) /* 0466C 809015AC 3C188091 */ lui $t8, %hi(D_8090EB2C) ## $t8 = 80910000 /* 04670 809015B0 E60A03AC */ swc1 $f10, 0x03AC($s0) ## 000003AC /* 04674 809015B4 E60803A8 */ swc1 $f8, 0x03A8($s0) ## 000003A8 -/* 04678 809015B8 8F18EB2C */ lw $t8, %lo(D_8090EB2C)($t8) +/* 04678 809015B8 8F18EB2C */ lw $t8, %lo(D_8090EB2C)($t8) /* 0467C 809015BC 3C063E4C */ lui $a2, 0x3E4C ## $a2 = 3E4C0000 /* 04680 809015C0 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3E4CCCCD /* 04684 809015C4 260403B0 */ addiu $a0, $s0, 0x03B0 ## $a0 = 000003B0 /* 04688 809015C8 3C0741A0 */ lui $a3, 0x41A0 ## $a3 = 41A00000 /* 0468C 809015CC 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 04690 809015D0 8F050024 */ lw $a1, 0x0024($t8) ## 80910024 /* 04694 809015D4 3C198091 */ lui $t9, %hi(D_8090EB2C) ## $t9 = 80910000 -/* 04698 809015D8 8F39EB2C */ lw $t9, %lo(D_8090EB2C)($t9) +/* 04698 809015D8 8F39EB2C */ lw $t9, %lo(D_8090EB2C)($t9) /* 0469C 809015DC 3C014248 */ lui $at, 0x4248 ## $at = 42480000 /* 046A0 809015E0 44810000 */ mtc1 $at, $f0 ## $f0 = 50.00 /* 046A4 809015E4 C7300028 */ lwc1 $f16, 0x0028($t9) ## 80910028 /* 046A8 809015E8 3C063E4C */ lui $a2, 0x3E4C ## $a2 = 3E4C0000 /* 046AC 809015EC 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3E4CCCCD -/* 046B0 809015F0 46008480 */ add.s $f18, $f16, $f0 +/* 046B0 809015F0 46008480 */ add.s $f18, $f16, $f0 /* 046B4 809015F4 260403B4 */ addiu $a0, $s0, 0x03B4 ## $a0 = 000003B4 /* 046B8 809015F8 3C074120 */ lui $a3, 0x4120 ## $a3 = 41200000 -/* 046BC 809015FC 44059000 */ mfc1 $a1, $f18 +/* 046BC 809015FC 44059000 */ mfc1 $a1, $f18 /* 046C0 80901600 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 046C4 80901604 00000000 */ nop /* 046C8 80901608 3C088091 */ lui $t0, %hi(D_8090EB2C) ## $t0 = 80910000 -/* 046CC 8090160C 8D08EB2C */ lw $t0, %lo(D_8090EB2C)($t0) +/* 046CC 8090160C 8D08EB2C */ lw $t0, %lo(D_8090EB2C)($t0) /* 046D0 80901610 3C063E4C */ lui $a2, 0x3E4C ## $a2 = 3E4C0000 /* 046D4 80901614 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3E4CCCCD /* 046D8 80901618 260403B8 */ addiu $a0, $s0, 0x03B8 ## $a0 = 000003B8 /* 046DC 8090161C 3C0741A0 */ lui $a3, 0x41A0 ## $a3 = 41A00000 /* 046E0 80901620 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 046E4 80901624 8D05002C */ lw $a1, 0x002C($t0) ## 8091002C /* 046E8 80901628 8E090398 */ lw $t1, 0x0398($s0) ## 00000398 /* 046EC 8090162C 24010032 */ addiu $at, $zero, 0x0032 ## $at = 00000032 /* 046F0 80901630 240A0003 */ addiu $t2, $zero, 0x0003 ## $t2 = 00000003 -/* 046F4 80901634 55210317 */ bnel $t1, $at, .L80902294 +/* 046F4 80901634 55210317 */ bnel $t1, $at, .L80902294 /* 046F8 80901638 8605039E */ lh $a1, 0x039E($s0) ## 0000039E /* 046FC 8090163C A60A039C */ sh $t2, 0x039C($s0) ## 0000039C -/* 04700 80901640 10000313 */ beq $zero, $zero, .L80902290 +/* 04700 80901640 10000313 */ beq $zero, $zero, .L80902290 /* 04704 80901644 AE000398 */ sw $zero, 0x0398($s0) ## 00000398 glabel L80901648 /* 04708 80901648 240B0016 */ addiu $t3, $zero, 0x0016 ## $t3 = 00000016 /* 0470C 8090164C A20B0339 */ sb $t3, 0x0339($s0) ## 00000339 -/* 04710 80901650 0C01E221 */ jal func_80078884 +/* 04710 80901650 0C01E221 */ jal func_80078884 /* 04714 80901654 2404209D */ addiu $a0, $zero, 0x209D ## $a0 = 0000209D /* 04718 80901658 3C014220 */ lui $at, 0x4220 ## $at = 42200000 /* 0471C 8090165C 44811000 */ mtc1 $at, $f2 ## $f2 = 40.00 @@ -309,70 +309,70 @@ glabel L80901648 /* 0473C 8090167C E60403A4 */ swc1 $f4, 0x03A4($s0) ## 000003A4 /* 04740 80901680 E60603A8 */ swc1 $f6, 0x03A8($s0) ## 000003A8 /* 04744 80901684 E60803AC */ swc1 $f8, 0x03AC($s0) ## 000003AC -/* 04748 80901688 8D8CEB2C */ lw $t4, %lo(D_8090EB2C)($t4) +/* 04748 80901688 8D8CEB2C */ lw $t4, %lo(D_8090EB2C)($t4) /* 0474C 8090168C 3C0D8091 */ lui $t5, %hi(D_8090EB2C) ## $t5 = 80910000 /* 04750 80901690 3C0E8091 */ lui $t6, %hi(D_8090EB2C) ## $t6 = 80910000 /* 04754 80901694 C58A0024 */ lwc1 $f10, 0x0024($t4) ## 80910024 /* 04758 80901698 8E030398 */ lw $v1, 0x0398($s0) ## 00000398 /* 0475C 8090169C 2401000A */ addiu $at, $zero, 0x000A ## $at = 0000000A /* 04760 809016A0 E60A03B0 */ swc1 $f10, 0x03B0($s0) ## 000003B0 -/* 04764 809016A4 8DADEB2C */ lw $t5, %lo(D_8090EB2C)($t5) +/* 04764 809016A4 8DADEB2C */ lw $t5, %lo(D_8090EB2C)($t5) /* 04768 809016A8 240570D8 */ addiu $a1, $zero, 0x70D8 ## $a1 = 000070D8 /* 0476C 809016AC 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 /* 04770 809016B0 C5B00028 */ lwc1 $f16, 0x0028($t5) ## 80910028 -/* 04774 809016B4 46028480 */ add.s $f18, $f16, $f2 +/* 04774 809016B4 46028480 */ add.s $f18, $f16, $f2 /* 04778 809016B8 E61203B4 */ swc1 $f18, 0x03B4($s0) ## 000003B4 -/* 0477C 809016BC 8DCEEB2C */ lw $t6, %lo(D_8090EB2C)($t6) +/* 0477C 809016BC 8DCEEB2C */ lw $t6, %lo(D_8090EB2C)($t6) /* 04780 809016C0 C5C4002C */ lwc1 $f4, 0x002C($t6) ## 8091002C -/* 04784 809016C4 14610004 */ bne $v1, $at, .L809016D8 +/* 04784 809016C4 14610004 */ bne $v1, $at, .L809016D8 /* 04788 809016C8 E60403B8 */ swc1 $f4, 0x03B8($s0) ## 000003B8 -/* 0478C 809016CC 0C042DA0 */ jal func_8010B680 -/* 04790 809016D0 8FA40054 */ lw $a0, 0x0054($sp) +/* 0478C 809016CC 0C042DA0 */ jal func_8010B680 +/* 04790 809016D0 8FA40054 */ lw $a0, 0x0054($sp) /* 04794 809016D4 8E030398 */ lw $v1, 0x0398($s0) ## 00000398 .L809016D8: -/* 04798 809016D8 2C610051 */ sltiu $at, $v1, 0x0051 -/* 0479C 809016DC 142002EC */ bne $at, $zero, .L80902290 -/* 047A0 809016E0 8FA40054 */ lw $a0, 0x0054($sp) -/* 047A4 809016E4 0C042F6F */ jal func_8010BDBC +/* 04798 809016D8 2C610051 */ sltiu $at, $v1, 0x0051 +/* 0479C 809016DC 142002EC */ bne $at, $zero, .L80902290 +/* 047A0 809016E0 8FA40054 */ lw $a0, 0x0054($sp) +/* 047A4 809016E4 0C042F6F */ jal func_8010BDBC /* 047A8 809016E8 248420D8 */ addiu $a0, $a0, 0x20D8 ## $a0 = 000020D8 -/* 047AC 809016EC 144002E8 */ bne $v0, $zero, .L80902290 +/* 047AC 809016EC 144002E8 */ bne $v0, $zero, .L80902290 /* 047B0 809016F0 240F0004 */ addiu $t7, $zero, 0x0004 ## $t7 = 00000004 /* 047B4 809016F4 A60F039C */ sh $t7, 0x039C($s0) ## 0000039C -/* 047B8 809016F8 100002E5 */ beq $zero, $zero, .L80902290 +/* 047B8 809016F8 100002E5 */ beq $zero, $zero, .L80902290 /* 047BC 809016FC AE000398 */ sw $zero, 0x0398($s0) ## 00000398 glabel L80901700 /* 047C0 80901700 8E180398 */ lw $t8, 0x0398($s0) ## 00000398 /* 047C4 80901704 2604037C */ addiu $a0, $s0, 0x037C ## $a0 = 0000037C /* 047C8 80901708 240B0016 */ addiu $t3, $zero, 0x0016 ## $t3 = 00000016 -/* 047CC 8090170C 2F01000B */ sltiu $at, $t8, 0x000B -/* 047D0 80901710 5420001A */ bnel $at, $zero, .L8090177C +/* 047CC 8090170C 2F01000B */ sltiu $at, $t8, 0x000B +/* 047D0 80901710 5420001A */ bnel $at, $zero, .L8090177C /* 047D4 80901714 A20B0339 */ sb $t3, 0x0339($s0) ## 00000339 -/* 047D8 80901718 44050000 */ mfc1 $a1, $f0 +/* 047D8 80901718 44050000 */ mfc1 $a1, $f0 /* 047DC 8090171C 0C01E123 */ jal Math_SmoothDownscaleMaxF - + /* 047E0 80901720 3C064120 */ lui $a2, 0x4120 ## $a2 = 41200000 /* 047E4 80901724 8E190398 */ lw $t9, 0x0398($s0) ## 00000398 /* 047E8 80901728 2401001E */ addiu $at, $zero, 0x001E ## $at = 0000001E /* 047EC 8090172C 240A0017 */ addiu $t2, $zero, 0x0017 ## $t2 = 00000017 -/* 047F0 80901730 17210005 */ bne $t9, $at, .L80901748 +/* 047F0 80901730 17210005 */ bne $t9, $at, .L80901748 /* 047F4 80901734 3C053F80 */ lui $a1, 0x3F80 ## $a1 = 3F800000 /* 047F8 80901738 3C098091 */ lui $t1, %hi(D_8090EB2C) ## $t1 = 80910000 -/* 047FC 8090173C 8D29EB2C */ lw $t1, %lo(D_8090EB2C)($t1) +/* 047FC 8090173C 8D29EB2C */ lw $t1, %lo(D_8090EB2C)($t1) /* 04800 80901740 2408000A */ addiu $t0, $zero, 0x000A ## $t0 = 0000000A /* 04804 80901744 A12803C8 */ sb $t0, 0x03C8($t1) ## 809103C8 .L80901748: /* 04808 80901748 A20A0339 */ sb $t2, 0x0339($s0) ## 00000339 -/* 0480C 8090174C 8FA40054 */ lw $a0, 0x0054($sp) +/* 0480C 8090174C 8FA40054 */ lw $a0, 0x0054($sp) /* 04810 80901750 3C010001 */ lui $at, 0x0001 ## $at = 00010000 /* 04814 80901754 34210AFC */ ori $at, $at, 0x0AFC ## $at = 00010AFC /* 04818 80901758 3C063D4C */ lui $a2, 0x3D4C ## $a2 = 3D4C0000 /* 0481C 8090175C 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3D4CCCCD /* 04820 80901760 0C01E123 */ jal Math_SmoothDownscaleMaxF - -/* 04824 80901764 00812021 */ addu $a0, $a0, $at + +/* 04824 80901764 00812021 */ addu $a0, $a0, $at /* 04828 80901768 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 /* 0482C 8090176C 44810000 */ mtc1 $at, $f0 ## $f0 = 1.00 -/* 04830 80901770 10000003 */ beq $zero, $zero, .L80901780 +/* 04830 80901770 10000003 */ beq $zero, $zero, .L80901780 /* 04834 80901774 8E0C0398 */ lw $t4, 0x0398($s0) ## 00000398 /* 04838 80901778 A20B0339 */ sb $t3, 0x0339($s0) ## 00000339 .L8090177C: @@ -380,63 +380,63 @@ glabel L80901700 .L80901780: /* 04840 80901780 24010064 */ addiu $at, $zero, 0x0064 ## $at = 00000064 /* 04844 80901784 240D0005 */ addiu $t5, $zero, 0x0005 ## $t5 = 00000005 -/* 04848 80901788 158102C1 */ bne $t4, $at, .L80902290 +/* 04848 80901788 158102C1 */ bne $t4, $at, .L80902290 /* 0484C 8090178C 240E0028 */ addiu $t6, $zero, 0x0028 ## $t6 = 00000028 /* 04850 80901790 A60D039C */ sh $t5, 0x039C($s0) ## 0000039C /* 04854 80901794 AE0E0398 */ sw $t6, 0x0398($s0) ## 00000398 /* 04858 80901798 E6000168 */ swc1 $f0, 0x0168($s0) ## 00000168 -/* 0485C 8090179C 8FA40054 */ lw $a0, 0x0054($sp) +/* 0485C 8090179C 8FA40054 */ lw $a0, 0x0054($sp) /* 04860 809017A0 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 04864 809017A4 0C00B7D5 */ jal func_8002DF54 +/* 04864 809017A4 0C00B7D5 */ jal func_8002DF54 /* 04868 809017A8 24060064 */ addiu $a2, $zero, 0x0064 ## $a2 = 00000064 -/* 0486C 809017AC 100002B9 */ beq $zero, $zero, .L80902294 +/* 0486C 809017AC 100002B9 */ beq $zero, $zero, .L80902294 /* 04870 809017B0 8605039E */ lh $a1, 0x039E($s0) ## 0000039E glabel L809017B4 /* 04874 809017B4 8E030398 */ lw $v1, 0x0398($s0) ## 00000398 /* 04878 809017B8 240F0017 */ addiu $t7, $zero, 0x0017 ## $t7 = 00000017 /* 0487C 809017BC A20F0339 */ sb $t7, 0x0339($s0) ## 00000339 -/* 04880 809017C0 2C61003C */ sltiu $at, $v1, 0x003C -/* 04884 809017C4 14200012 */ bne $at, $zero, .L80901810 +/* 04880 809017C0 2C61003C */ sltiu $at, $v1, 0x003C +/* 04884 809017C4 14200012 */ bne $at, $zero, .L80901810 /* 04888 809017C8 2604038C */ addiu $a0, $s0, 0x038C ## $a0 = 0000038C -/* 0488C 809017CC 2C61005B */ sltiu $at, $v1, 0x005B -/* 04890 809017D0 1020000F */ beq $at, $zero, .L80901810 +/* 0488C 809017CC 2C61005B */ sltiu $at, $v1, 0x005B +/* 04890 809017D0 1020000F */ beq $at, $zero, .L80901810 /* 04894 809017D4 2401003E */ addiu $at, $zero, 0x003E ## $at = 0000003E -/* 04898 809017D8 54610007 */ bnel $v1, $at, .L809017F8 -/* 0489C 809017DC 44060000 */ mfc1 $a2, $f0 -/* 048A0 809017E0 0C01E221 */ jal func_80078884 +/* 04898 809017D8 54610007 */ bnel $v1, $at, .L809017F8 +/* 0489C 809017DC 44060000 */ mfc1 $a2, $f0 +/* 048A0 809017E0 0C01E221 */ jal func_80078884 /* 048A4 809017E4 2404286F */ addiu $a0, $zero, 0x286F ## $a0 = 0000286F /* 048A8 809017E8 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 /* 048AC 809017EC 44810000 */ mtc1 $at, $f0 ## $f0 = 1.00 /* 048B0 809017F0 00000000 */ nop -/* 048B4 809017F4 44060000 */ mfc1 $a2, $f0 +/* 048B4 809017F4 44060000 */ mfc1 $a2, $f0 .L809017F8: /* 048B8 809017F8 2604038C */ addiu $a0, $s0, 0x038C ## $a0 = 0000038C /* 048BC 809017FC 3C054348 */ lui $a1, 0x4348 ## $a1 = 43480000 /* 048C0 80901800 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 048C4 80901804 3C074100 */ lui $a3, 0x4100 ## $a3 = 41000000 -/* 048C8 80901808 10000005 */ beq $zero, $zero, .L80901820 +/* 048C8 80901808 10000005 */ beq $zero, $zero, .L80901820 /* 048CC 8090180C 8E030398 */ lw $v1, 0x0398($s0) ## 00000398 .L80901810: -/* 048D0 80901810 44050000 */ mfc1 $a1, $f0 +/* 048D0 80901810 44050000 */ mfc1 $a1, $f0 /* 048D4 80901814 0C01E123 */ jal Math_SmoothDownscaleMaxF - + /* 048D8 80901818 3C064100 */ lui $a2, 0x4100 ## $a2 = 41000000 /* 048DC 8090181C 8E030398 */ lw $v1, 0x0398($s0) ## 00000398 .L80901820: /* 048E0 80901820 24010046 */ addiu $at, $zero, 0x0046 ## $at = 00000046 -/* 048E4 80901824 8FA40054 */ lw $a0, 0x0054($sp) -/* 048E8 80901828 14610004 */ bne $v1, $at, .L8090183C +/* 048E4 80901824 8FA40054 */ lw $a0, 0x0054($sp) +/* 048E8 80901828 14610004 */ bne $v1, $at, .L8090183C /* 048EC 8090182C 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 048F0 80901830 0C00B7D5 */ jal func_8002DF54 +/* 048F0 80901830 0C00B7D5 */ jal func_8002DF54 /* 048F4 80901834 24060065 */ addiu $a2, $zero, 0x0065 ## $a2 = 00000065 /* 048F8 80901838 8E030398 */ lw $v1, 0x0398($s0) ## 00000398 .L8090183C: /* 048FC 8090183C 24010096 */ addiu $at, $zero, 0x0096 ## $at = 00000096 -/* 04900 80901840 14610004 */ bne $v1, $at, .L80901854 -/* 04904 80901844 8FA40054 */ lw $a0, 0x0054($sp) +/* 04900 80901840 14610004 */ bne $v1, $at, .L80901854 +/* 04904 80901844 8FA40054 */ lw $a0, 0x0054($sp) /* 04908 80901848 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 0490C 8090184C 0C00B7D5 */ jal func_8002DF54 +/* 0490C 8090184C 0C00B7D5 */ jal func_8002DF54 /* 04910 80901850 24060066 */ addiu $a2, $zero, 0x0066 ## $a2 = 00000066 .L80901854: /* 04914 80901854 3C014248 */ lui $at, 0x4248 ## $at = 42480000 @@ -447,9 +447,9 @@ glabel L809017B4 /* 04928 80901868 44816000 */ mtc1 $at, $f12 ## $f12 = 250.00 /* 0492C 8090186C 3C014120 */ lui $at, 0x4120 ## $at = 41200000 /* 04930 80901870 44813000 */ mtc1 $at, $f6 ## $f6 = 10.00 -/* 04934 80901874 8FA2004C */ lw $v0, 0x004C($sp) +/* 04934 80901874 8FA2004C */ lw $v0, 0x004C($sp) /* 04938 80901878 3C0141F0 */ lui $at, 0x41F0 ## $at = 41F00000 -/* 0493C 8090187C 46006281 */ sub.s $f10, $f12, $f0 +/* 0493C 8090187C 46006281 */ sub.s $f10, $f12, $f0 /* 04940 80901880 44814000 */ mtc1 $at, $f8 ## $f8 = 30.00 /* 04944 80901884 E606030C */ swc1 $f6, 0x030C($s0) ## 0000030C /* 04948 80901888 E44C0024 */ swc1 $f12, 0x0024($v0) ## 00000024 @@ -458,22 +458,22 @@ glabel L809017B4 /* 04954 80901894 C4500028 */ lwc1 $f16, 0x0028($v0) ## 00000028 /* 04958 80901898 8E180398 */ lw $t8, 0x0398($s0) ## 00000398 /* 0495C 8090189C 240100A6 */ addiu $at, $zero, 0x00A6 ## $at = 000000A6 -/* 04960 809018A0 46008480 */ add.s $f18, $f16, $f0 +/* 04960 809018A0 46008480 */ add.s $f18, $f16, $f0 /* 04964 809018A4 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 04968 809018A8 E61203A8 */ swc1 $f18, 0x03A8($s0) ## 000003A8 /* 0496C 809018AC C444002C */ lwc1 $f4, 0x002C($v0) ## 0000002C -/* 04970 809018B0 46022180 */ add.s $f6, $f4, $f2 +/* 04970 809018B0 46022180 */ add.s $f6, $f4, $f2 /* 04974 809018B4 E60603AC */ swc1 $f6, 0x03AC($s0) ## 000003AC /* 04978 809018B8 C4480024 */ lwc1 $f8, 0x0024($v0) ## 00000024 /* 0497C 809018BC E60803B0 */ swc1 $f8, 0x03B0($s0) ## 000003B0 /* 04980 809018C0 C44A0028 */ lwc1 $f10, 0x0028($v0) ## 00000028 -/* 04984 809018C4 46025400 */ add.s $f16, $f10, $f2 +/* 04984 809018C4 46025400 */ add.s $f16, $f10, $f2 /* 04988 809018C8 E61003B4 */ swc1 $f16, 0x03B4($s0) ## 000003B4 /* 0498C 809018CC C452002C */ lwc1 $f18, 0x002C($v0) ## 0000002C -/* 04990 809018D0 1701026F */ bne $t8, $at, .L80902290 +/* 04990 809018D0 1701026F */ bne $t8, $at, .L80902290 /* 04994 809018D4 E61203B8 */ swc1 $f18, 0x03B8($s0) ## 000003B8 -/* 04998 809018D8 0C030129 */ jal func_800C04A4 -/* 0499C 809018DC 8FA40054 */ lw $a0, 0x0054($sp) +/* 04998 809018D8 0C030129 */ jal func_800C04A4 +/* 0499C 809018DC 8FA40054 */ lw $a0, 0x0054($sp) /* 049A0 809018E0 260303A4 */ addiu $v1, $s0, 0x03A4 ## $v1 = 000003A4 /* 049A4 809018E4 8C680000 */ lw $t0, 0x0000($v1) ## 000003A4 /* 049A8 809018E8 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 @@ -495,101 +495,101 @@ glabel L809017B4 /* 049E8 80901928 8E0C03B8 */ lw $t4, 0x03B8($s0) ## 000003B8 /* 049EC 8090192C AC4C0058 */ sw $t4, 0x0058($v0) ## 00000058 /* 049F0 80901930 8605039E */ lh $a1, 0x039E($s0) ## 0000039E -/* 049F4 80901934 0C03022B */ jal func_800C08AC -/* 049F8 80901938 8FA40054 */ lw $a0, 0x0054($sp) +/* 049F4 80901934 0C03022B */ jal func_800C08AC +/* 049F8 80901938 8FA40054 */ lw $a0, 0x0054($sp) /* 049FC 8090193C A600039E */ sh $zero, 0x039E($s0) ## 0000039E -/* 04A00 80901940 8FA40054 */ lw $a0, 0x0054($sp) -/* 04A04 80901944 0C01914D */ jal func_80064534 +/* 04A00 80901940 8FA40054 */ lw $a0, 0x0054($sp) +/* 04A04 80901944 0C01914D */ jal func_80064534 /* 04A08 80901948 24851D64 */ addiu $a1, $a0, 0x1D64 ## $a1 = 00001D64 -/* 04A0C 8090194C 8FA40054 */ lw $a0, 0x0054($sp) +/* 04A0C 8090194C 8FA40054 */ lw $a0, 0x0054($sp) /* 04A10 80901950 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 04A14 80901954 0C00B7D5 */ jal func_8002DF54 +/* 04A14 80901954 0C00B7D5 */ jal func_8002DF54 /* 04A18 80901958 24060007 */ addiu $a2, $zero, 0x0007 ## $a2 = 00000007 /* 04A1C 8090195C 240E0006 */ addiu $t6, $zero, 0x0006 ## $t6 = 00000006 -/* 04A20 80901960 1000024B */ beq $zero, $zero, .L80902290 +/* 04A20 80901960 1000024B */ beq $zero, $zero, .L80902290 /* 04A24 80901964 A60E039C */ sh $t6, 0x039C($s0) ## 0000039C glabel L80901968 -/* 04A28 80901968 8FA2004C */ lw $v0, 0x004C($sp) +/* 04A28 80901968 8FA2004C */ lw $v0, 0x004C($sp) /* 04A2C 8090196C 240F0017 */ addiu $t7, $zero, 0x0017 ## $t7 = 00000017 /* 04A30 80901970 A20F0339 */ sb $t7, 0x0339($s0) ## 00000339 /* 04A34 80901974 C60401B8 */ lwc1 $f4, 0x01B8($s0) ## 000001B8 /* 04A38 80901978 C60801C0 */ lwc1 $f8, 0x01C0($s0) ## 000001C0 /* 04A3C 8090197C C4460024 */ lwc1 $f6, 0x0024($v0) ## 00000024 /* 04A40 80901980 C44A002C */ lwc1 $f10, 0x002C($v0) ## 0000002C -/* 04A44 80901984 46062381 */ sub.s $f14, $f4, $f6 -/* 04A48 80901988 460A4301 */ sub.s $f12, $f8, $f10 -/* 04A4C 8090198C E7AE0048 */ swc1 $f14, 0x0048($sp) +/* 04A44 80901984 46062381 */ sub.s $f14, $f4, $f6 +/* 04A48 80901988 460A4301 */ sub.s $f12, $f8, $f10 +/* 04A4C 8090198C E7AE0048 */ swc1 $f14, 0x0048($sp) /* 04A50 80901990 0C034199 */ jal atan2s - -/* 04A54 80901994 E7AC0044 */ swc1 $f12, 0x0044($sp) -/* 04A58 80901998 8FA6004C */ lw $a2, 0x004C($sp) -/* 04A5C 8090199C C7AC0044 */ lwc1 $f12, 0x0044($sp) -/* 04A60 809019A0 C7AE0048 */ lwc1 $f14, 0x0048($sp) + +/* 04A54 80901994 E7AC0044 */ swc1 $f12, 0x0044($sp) +/* 04A58 80901998 8FA6004C */ lw $a2, 0x004C($sp) +/* 04A5C 8090199C C7AC0044 */ lwc1 $f12, 0x0044($sp) +/* 04A60 809019A0 C7AE0048 */ lwc1 $f14, 0x0048($sp) /* 04A64 809019A4 84D800B6 */ lh $t8, 0x00B6($a2) ## 000000B6 -/* 04A68 809019A8 00582023 */ subu $a0, $v0, $t8 -/* 04A6C 809019AC 00042400 */ sll $a0, $a0, 16 -/* 04A70 809019B0 00042403 */ sra $a0, $a0, 16 -/* 04A74 809019B4 04800003 */ bltz $a0, .L809019C4 -/* 04A78 809019B8 00041823 */ subu $v1, $zero, $a0 -/* 04A7C 809019BC 10000001 */ beq $zero, $zero, .L809019C4 +/* 04A68 809019A8 00582023 */ subu $a0, $v0, $t8 +/* 04A6C 809019AC 00042400 */ sll $a0, $a0, 16 +/* 04A70 809019B0 00042403 */ sra $a0, $a0, 16 +/* 04A74 809019B4 04800003 */ bltz $a0, .L809019C4 +/* 04A78 809019B8 00041823 */ subu $v1, $zero, $a0 +/* 04A7C 809019BC 10000001 */ beq $zero, $zero, .L809019C4 /* 04A80 809019C0 00801825 */ or $v1, $a0, $zero ## $v1 = 00000000 .L809019C4: -/* 04A84 809019C4 28612000 */ slti $at, $v1, 0x2000 -/* 04A88 809019C8 50200232 */ beql $at, $zero, .L80902294 +/* 04A84 809019C4 28612000 */ slti $at, $v1, 0x2000 +/* 04A88 809019C8 50200232 */ beql $at, $zero, .L80902294 /* 04A8C 809019CC 8605039E */ lh $a1, 0x039E($s0) ## 0000039E -/* 04A90 809019D0 460E7402 */ mul.s $f16, $f14, $f14 +/* 04A90 809019D0 460E7402 */ mul.s $f16, $f14, $f14 /* 04A94 809019D4 3C01428C */ lui $at, 0x428C ## $at = 428C0000 /* 04A98 809019D8 44812000 */ mtc1 $at, $f4 ## $f4 = 70.00 -/* 04A9C 809019DC 460C6482 */ mul.s $f18, $f12, $f12 -/* 04AA0 809019E0 46128000 */ add.s $f0, $f16, $f18 -/* 04AA4 809019E4 46000004 */ sqrt.s $f0, $f0 -/* 04AA8 809019E8 4604003C */ c.lt.s $f0, $f4 +/* 04A9C 809019DC 460C6482 */ mul.s $f18, $f12, $f12 +/* 04AA0 809019E0 46128000 */ add.s $f0, $f16, $f18 +/* 04AA4 809019E4 46000004 */ sqrt.s $f0, $f0 +/* 04AA8 809019E8 4604003C */ c.lt.s $f0, $f4 /* 04AAC 809019EC 00000000 */ nop -/* 04AB0 809019F0 45020228 */ bc1fl .L80902294 +/* 04AB0 809019F0 45020228 */ bc1fl .L80902294 /* 04AB4 809019F4 8605039E */ lh $a1, 0x039E($s0) ## 0000039E /* 04AB8 809019F8 80D90843 */ lb $t9, 0x0843($a2) ## 00000843 -/* 04ABC 809019FC 53200225 */ beql $t9, $zero, .L80902294 +/* 04ABC 809019FC 53200225 */ beql $t9, $zero, .L80902294 /* 04AC0 80901A00 8605039E */ lh $a1, 0x039E($s0) ## 0000039E /* 04AC4 80901A04 80C80151 */ lb $t0, 0x0151($a2) ## 00000151 /* 04AC8 80901A08 24010003 */ addiu $at, $zero, 0x0003 ## $at = 00000003 -/* 04ACC 80901A0C 8FA40054 */ lw $a0, 0x0054($sp) -/* 04AD0 80901A10 55010220 */ bnel $t0, $at, .L80902294 +/* 04ACC 80901A0C 8FA40054 */ lw $a0, 0x0054($sp) +/* 04AD0 80901A10 55010220 */ bnel $t0, $at, .L80902294 /* 04AD4 80901A14 8605039E */ lh $a1, 0x039E($s0) ## 0000039E -/* 04AD8 80901A18 0C019148 */ jal func_80064520 +/* 04AD8 80901A18 0C019148 */ jal func_80064520 /* 04ADC 80901A1C 24851D64 */ addiu $a1, $a0, 0x1D64 ## $a1 = 00001D64 -/* 04AE0 80901A20 0C03008C */ jal func_800C0230 -/* 04AE4 80901A24 8FA40054 */ lw $a0, 0x0054($sp) +/* 04AE0 80901A20 0C03008C */ jal func_800C0230 +/* 04AE4 80901A24 8FA40054 */ lw $a0, 0x0054($sp) /* 04AE8 80901A28 A602039E */ sh $v0, 0x039E($s0) ## 0000039E -/* 04AEC 80901A2C 8FA40054 */ lw $a0, 0x0054($sp) +/* 04AEC 80901A2C 8FA40054 */ lw $a0, 0x0054($sp) /* 04AF0 80901A30 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 04AF4 80901A34 0C0300C5 */ jal func_800C0314 +/* 04AF4 80901A34 0C0300C5 */ jal func_800C0314 /* 04AF8 80901A38 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 -/* 04AFC 80901A3C 8FA40054 */ lw $a0, 0x0054($sp) +/* 04AFC 80901A3C 8FA40054 */ lw $a0, 0x0054($sp) /* 04B00 80901A40 8605039E */ lh $a1, 0x039E($s0) ## 0000039E -/* 04B04 80901A44 0C0300C5 */ jal func_800C0314 +/* 04B04 80901A44 0C0300C5 */ jal func_800C0314 /* 04B08 80901A48 24060007 */ addiu $a2, $zero, 0x0007 ## $a2 = 00000007 /* 04B0C 80901A4C 24090007 */ addiu $t1, $zero, 0x0007 ## $t1 = 00000007 /* 04B10 80901A50 A609039C */ sh $t1, 0x039C($s0) ## 0000039C /* 04B14 80901A54 AE000398 */ sw $zero, 0x0398($s0) ## 00000398 /* 04B18 80901A58 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 04B1C 80901A5C 24A53B1C */ addiu $a1, $a1, 0x3B1C ## $a1 = 06003B1C -/* 04B20 80901A60 8FA40028 */ lw $a0, 0x0028($sp) -/* 04B24 80901A64 0C029490 */ jal func_800A5240 +/* 04B20 80901A60 8FA40028 */ lw $a0, 0x0028($sp) +/* 04B24 80901A64 0C029490 */ jal SkelAnime_ChangeAnimTransitionStop /* 04B28 80901A68 24060000 */ addiu $a2, $zero, 0x0000 ## $a2 = 00000000 /* 04B2C 80901A6C 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 /* 04B30 80901A70 0C028800 */ jal SkelAnime_GetFrameCount - + /* 04B34 80901A74 24843B1C */ addiu $a0, $a0, 0x3B1C ## $a0 = 06003B1C /* 04B38 80901A78 44823000 */ mtc1 $v0, $f6 ## $f6 = 0.00 /* 04B3C 80901A7C 3C190001 */ lui $t9, 0x0001 ## $t9 = 00010000 /* 04B40 80901A80 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 04B44 80901A84 46803220 */ cvt.s.w $f8, $f6 +/* 04B44 80901A84 46803220 */ cvt.s.w $f8, $f6 /* 04B48 80901A88 24060061 */ addiu $a2, $zero, 0x0061 ## $a2 = 00000061 /* 04B4C 80901A8C E6080194 */ swc1 $f8, 0x0194($s0) ## 00000194 -/* 04B50 80901A90 8FA40054 */ lw $a0, 0x0054($sp) -/* 04B54 80901A94 0324C821 */ addu $t9, $t9, $a0 +/* 04B50 80901A90 8FA40054 */ lw $a0, 0x0054($sp) +/* 04B54 80901A94 0324C821 */ addu $t9, $t9, $a0 /* 04B58 80901A98 8F391D50 */ lw $t9, 0x1D50($t9) ## 00011D50 -/* 04B5C 80901A9C 0320F809 */ jalr $ra, $t9 +/* 04B5C 80901A9C 0320F809 */ jalr $ra, $t9 /* 04B60 80901AA0 00000000 */ nop /* 04B64 80901AA4 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 /* 04B68 80901AA8 44810000 */ mtc1 $at, $f0 ## $f0 = 1.00 @@ -597,18 +597,18 @@ glabel L80901968 glabel L80901AB0 /* 04B70 80901AB0 240B0017 */ addiu $t3, $zero, 0x0017 ## $t3 = 00000017 /* 04B74 80901AB4 A20B0339 */ sb $t3, 0x0339($s0) ## 00000339 -/* 04B78 80901AB8 8FA40054 */ lw $a0, 0x0054($sp) +/* 04B78 80901AB8 8FA40054 */ lw $a0, 0x0054($sp) /* 04B7C 80901ABC 3C010001 */ lui $at, 0x0001 ## $at = 00010000 /* 04B80 80901AC0 34210AFC */ ori $at, $at, 0x0AFC ## $at = 00010AFC -/* 04B84 80901AC4 44050000 */ mfc1 $a1, $f0 +/* 04B84 80901AC4 44050000 */ mfc1 $a1, $f0 /* 04B88 80901AC8 3C063E4C */ lui $a2, 0x3E4C ## $a2 = 3E4C0000 /* 04B8C 80901ACC 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3E4CCCCD /* 04B90 80901AD0 0C01E123 */ jal Math_SmoothDownscaleMaxF - -/* 04B94 80901AD4 00812021 */ addu $a0, $a0, $at + +/* 04B94 80901AD4 00812021 */ addu $a0, $a0, $at /* 04B98 80901AD8 3C01437A */ lui $at, 0x437A ## $at = 437A0000 /* 04B9C 80901ADC 44816000 */ mtc1 $at, $f12 ## $f12 = 250.00 -/* 04BA0 80901AE0 8FA6004C */ lw $a2, 0x004C($sp) +/* 04BA0 80901AE0 8FA6004C */ lw $a2, 0x004C($sp) /* 04BA4 80901AE4 3C0141F0 */ lui $at, 0x41F0 ## $at = 41F00000 /* 04BA8 80901AE8 44815000 */ mtc1 $at, $f10 ## $f10 = 30.00 /* 04BAC 80901AEC 240CC000 */ addiu $t4, $zero, 0xC000 ## $t4 = FFFFC000 @@ -617,68 +617,68 @@ glabel L80901AB0 /* 04BB8 80901AF8 E4CA002C */ swc1 $f10, 0x002C($a2) ## 0000002C /* 04BBC 80901AFC 8E030398 */ lw $v1, 0x0398($s0) ## 00000398 /* 04BC0 80901B00 24010014 */ addiu $at, $zero, 0x0014 ## $at = 00000014 -/* 04BC4 80901B04 10610007 */ beq $v1, $at, .L80901B24 +/* 04BC4 80901B04 10610007 */ beq $v1, $at, .L80901B24 /* 04BC8 80901B08 2401001E */ addiu $at, $zero, 0x001E ## $at = 0000001E -/* 04BCC 80901B0C 10610005 */ beq $v1, $at, .L80901B24 +/* 04BCC 80901B0C 10610005 */ beq $v1, $at, .L80901B24 /* 04BD0 80901B10 24010041 */ addiu $at, $zero, 0x0041 ## $at = 00000041 -/* 04BD4 80901B14 10610003 */ beq $v1, $at, .L80901B24 +/* 04BD4 80901B14 10610003 */ beq $v1, $at, .L80901B24 /* 04BD8 80901B18 24010028 */ addiu $at, $zero, 0x0028 ## $at = 00000028 -/* 04BDC 80901B1C 54610008 */ bnel $v1, $at, .L80901B40 +/* 04BDC 80901B1C 54610008 */ bnel $v1, $at, .L80901B40 /* 04BE0 80901B20 24010016 */ addiu $at, $zero, 0x0016 ## $at = 00000016 .L80901B24: -/* 04BE4 80901B24 0C01E221 */ jal func_80078884 +/* 04BE4 80901B24 0C01E221 */ jal func_80078884 /* 04BE8 80901B28 24046800 */ addiu $a0, $zero, 0x6800 ## $a0 = 00006800 -/* 04BEC 80901B2C 0C01E221 */ jal func_80078884 +/* 04BEC 80901B2C 0C01E221 */ jal func_80078884 /* 04BF0 80901B30 24041818 */ addiu $a0, $zero, 0x1818 ## $a0 = 00001818 /* 04BF4 80901B34 8E030398 */ lw $v1, 0x0398($s0) ## 00000398 -/* 04BF8 80901B38 8FA6004C */ lw $a2, 0x004C($sp) +/* 04BF8 80901B38 8FA6004C */ lw $a2, 0x004C($sp) /* 04BFC 80901B3C 24010016 */ addiu $at, $zero, 0x0016 ## $at = 00000016 .L80901B40: -/* 04C00 80901B40 10610007 */ beq $v1, $at, .L80901B60 +/* 04C00 80901B40 10610007 */ beq $v1, $at, .L80901B60 /* 04C04 80901B44 24010023 */ addiu $at, $zero, 0x0023 ## $at = 00000023 -/* 04C08 80901B48 10610005 */ beq $v1, $at, .L80901B60 +/* 04C08 80901B48 10610005 */ beq $v1, $at, .L80901B60 /* 04C0C 80901B4C 24010048 */ addiu $at, $zero, 0x0048 ## $at = 00000048 -/* 04C10 80901B50 10610003 */ beq $v1, $at, .L80901B60 +/* 04C10 80901B50 10610003 */ beq $v1, $at, .L80901B60 /* 04C14 80901B54 2401002D */ addiu $at, $zero, 0x002D ## $at = 0000002D -/* 04C18 80901B58 5461000E */ bnel $v1, $at, .L80901B94 +/* 04C18 80901B58 5461000E */ bnel $v1, $at, .L80901B94 /* 04C1C 80901B5C 24010016 */ addiu $at, $zero, 0x0016 ## $at = 00000016 .L80901B60: -/* 04C20 80901B60 0C01E221 */ jal func_80078884 +/* 04C20 80901B60 0C01E221 */ jal func_80078884 /* 04C24 80901B64 2404399B */ addiu $a0, $zero, 0x399B ## $a0 = 0000399B -/* 04C28 80901B68 0C01E221 */ jal func_80078884 +/* 04C28 80901B68 0C01E221 */ jal func_80078884 /* 04C2C 80901B6C 24041806 */ addiu $a0, $zero, 0x1806 ## $a0 = 00001806 /* 04C30 80901B70 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 /* 04C34 80901B74 44818000 */ mtc1 $at, $f16 ## $f16 = 1.00 -/* 04C38 80901B78 8FAD0054 */ lw $t5, 0x0054($sp) +/* 04C38 80901B78 8FAD0054 */ lw $t5, 0x0054($sp) /* 04C3C 80901B7C 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 04C40 80901B80 002D0821 */ addu $at, $at, $t5 +/* 04C40 80901B80 002D0821 */ addu $at, $at, $t5 /* 04C44 80901B84 E4300AFC */ swc1 $f16, 0x0AFC($at) ## 00010AFC -/* 04C48 80901B88 8FA6004C */ lw $a2, 0x004C($sp) +/* 04C48 80901B88 8FA6004C */ lw $a2, 0x004C($sp) /* 04C4C 80901B8C 8E030398 */ lw $v1, 0x0398($s0) ## 00000398 /* 04C50 80901B90 24010016 */ addiu $at, $zero, 0x0016 ## $at = 00000016 .L80901B94: -/* 04C54 80901B94 10610008 */ beq $v1, $at, .L80901BB8 +/* 04C54 80901B94 10610008 */ beq $v1, $at, .L80901BB8 /* 04C58 80901B98 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 04C5C 80901B9C 24010023 */ addiu $at, $zero, 0x0023 ## $at = 00000023 -/* 04C60 80901BA0 10610005 */ beq $v1, $at, .L80901BB8 +/* 04C60 80901BA0 10610005 */ beq $v1, $at, .L80901BB8 /* 04C64 80901BA4 24010048 */ addiu $at, $zero, 0x0048 ## $at = 00000048 -/* 04C68 80901BA8 10610003 */ beq $v1, $at, .L80901BB8 +/* 04C68 80901BA8 10610003 */ beq $v1, $at, .L80901BB8 /* 04C6C 80901BAC 2401002D */ addiu $at, $zero, 0x002D ## $at = 0000002D -/* 04C70 80901BB0 54610006 */ bnel $v1, $at, .L80901BCC -/* 04C74 80901BB4 2C610022 */ sltiu $at, $v1, 0x0022 +/* 04C70 80901BB0 54610006 */ bnel $v1, $at, .L80901BCC +/* 04C74 80901BB4 2C610022 */ sltiu $at, $v1, 0x0022 .L80901BB8: -/* 04C78 80901BB8 0C240427 */ jal func_8090109C -/* 04C7C 80901BBC 8FA50054 */ lw $a1, 0x0054($sp) +/* 04C78 80901BB8 0C240427 */ jal func_8090109C +/* 04C7C 80901BBC 8FA50054 */ lw $a1, 0x0054($sp) /* 04C80 80901BC0 8E030398 */ lw $v1, 0x0398($s0) ## 00000398 -/* 04C84 80901BC4 8FA6004C */ lw $a2, 0x004C($sp) -/* 04C88 80901BC8 2C610022 */ sltiu $at, $v1, 0x0022 +/* 04C84 80901BC4 8FA6004C */ lw $a2, 0x004C($sp) +/* 04C88 80901BC8 2C610022 */ sltiu $at, $v1, 0x0022 .L80901BCC: -/* 04C8C 80901BCC 14200016 */ bne $at, $zero, .L80901C28 +/* 04C8C 80901BCC 14200016 */ bne $at, $zero, .L80901C28 /* 04C90 80901BD0 3C0E8090 */ lui $t6, %hi(D_8090702C) ## $t6 = 80900000 -/* 04C94 80901BD4 2C610028 */ sltiu $at, $v1, 0x0028 -/* 04C98 80901BD8 10200013 */ beq $at, $zero, .L80901C28 +/* 04C94 80901BD4 2C610028 */ sltiu $at, $v1, 0x0028 +/* 04C98 80901BD8 10200013 */ beq $at, $zero, .L80901C28 /* 04C9C 80901BDC 3C018091 */ lui $at, %hi(D_8090DC50) ## $at = 80910000 -/* 04CA0 80901BE0 C432DC50 */ lwc1 $f18, %lo(D_8090DC50)($at) +/* 04CA0 80901BE0 C432DC50 */ lwc1 $f18, %lo(D_8090DC50)($at) /* 04CA4 80901BE4 3C01448B */ lui $at, 0x448B ## $at = 448B0000 /* 04CA8 80901BE8 44812000 */ mtc1 $at, $f4 ## $f4 = 1112.00 /* 04CAC 80901BEC 3C01C1E0 */ lui $at, 0xC1E0 ## $at = C1E00000 @@ -690,27 +690,27 @@ glabel L80901AB0 /* 04CC4 80901C04 E60403A8 */ swc1 $f4, 0x03A8($s0) ## 000003A8 /* 04CC8 80901C08 E60603AC */ swc1 $f6, 0x03AC($s0) ## 000003AC /* 04CCC 80901C0C E60803B0 */ swc1 $f8, 0x03B0($s0) ## 000003B0 -/* 04CD0 80901C10 C42ADC54 */ lwc1 $f10, %lo(D_8090DC54)($at) +/* 04CD0 80901C10 C42ADC54 */ lwc1 $f10, %lo(D_8090DC54)($at) /* 04CD4 80901C14 3C01C130 */ lui $at, 0xC130 ## $at = C1300000 /* 04CD8 80901C18 44818000 */ mtc1 $at, $f16 ## $f16 = -11.00 /* 04CDC 80901C1C E60A03B4 */ swc1 $f10, 0x03B4($s0) ## 000003B4 -/* 04CE0 80901C20 1000003B */ beq $zero, $zero, .L80901D10 +/* 04CE0 80901C20 1000003B */ beq $zero, $zero, .L80901D10 /* 04CE4 80901C24 E61003B8 */ swc1 $f16, 0x03B8($s0) ## 000003B8 .L80901C28: -/* 04CE8 80901C28 2C61001E */ sltiu $at, $v1, 0x001E -/* 04CEC 80901C2C 10200003 */ beq $at, $zero, .L80901C3C +/* 04CE8 80901C28 2C61001E */ sltiu $at, $v1, 0x001E +/* 04CEC 80901C2C 10200003 */ beq $at, $zero, .L80901C3C /* 04CF0 80901C30 25CE702C */ addiu $t6, $t6, %lo(D_8090702C) ## $t6 = 8090702C -/* 04CF4 80901C34 1000000F */ beq $zero, $zero, .L80901C74 +/* 04CF4 80901C34 1000000F */ beq $zero, $zero, .L80901C74 /* 04CF8 80901C38 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 .L80901C3C: -/* 04CFC 80901C3C 2C61002B */ sltiu $at, $v1, 0x002B -/* 04D00 80901C40 10200003 */ beq $at, $zero, .L80901C50 +/* 04CFC 80901C3C 2C61002B */ sltiu $at, $v1, 0x002B +/* 04D00 80901C40 10200003 */ beq $at, $zero, .L80901C50 /* 04D04 80901C44 24050002 */ addiu $a1, $zero, 0x0002 ## $a1 = 00000002 -/* 04D08 80901C48 1000000A */ beq $zero, $zero, .L80901C74 +/* 04D08 80901C48 1000000A */ beq $zero, $zero, .L80901C74 /* 04D0C 80901C4C 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 .L80901C50: /* 04D10 80901C50 3C018091 */ lui $at, %hi(D_8090DC58) ## $at = 80910000 -/* 04D14 80901C54 C432DC58 */ lwc1 $f18, %lo(D_8090DC58)($at) +/* 04D14 80901C54 C432DC58 */ lwc1 $f18, %lo(D_8090DC58)($at) /* 04D18 80901C58 3C014348 */ lui $at, 0x4348 ## $at = 43480000 /* 04D1C 80901C5C 44812000 */ mtc1 $at, $f4 ## $f4 = 200.00 /* 04D20 80901C60 3C014120 */ lui $at, 0x4120 ## $at = 41200000 @@ -722,50 +722,50 @@ glabel L80901AB0 /* 04D34 80901C74 3C014248 */ lui $at, 0x4248 ## $at = 42480000 /* 04D38 80901C78 44810000 */ mtc1 $at, $f0 ## $f0 = 50.00 /* 04D3C 80901C7C C4CA0024 */ lwc1 $f10, 0x0024($a2) ## 00000024 -/* 04D40 80901C80 00052080 */ sll $a0, $a1, 2 -/* 04D44 80901C84 00852023 */ subu $a0, $a0, $a1 -/* 04D48 80901C88 00042080 */ sll $a0, $a0, 2 -/* 04D4C 80901C8C 46005401 */ sub.s $f16, $f10, $f0 -/* 04D50 80901C90 008E1021 */ addu $v0, $a0, $t6 +/* 04D40 80901C80 00052080 */ sll $a0, $a1, 2 +/* 04D44 80901C84 00852023 */ subu $a0, $a0, $a1 +/* 04D48 80901C88 00042080 */ sll $a0, $a0, 2 +/* 04D4C 80901C8C 46005401 */ sub.s $f16, $f10, $f0 +/* 04D50 80901C90 008E1021 */ addu $v0, $a0, $t6 /* 04D54 80901C94 C4480000 */ lwc1 $f8, 0x0000($v0) ## 00000000 /* 04D58 80901C98 3C014220 */ lui $at, 0x4220 ## $at = 42200000 /* 04D5C 80901C9C 44811000 */ mtc1 $at, $f2 ## $f2 = 40.00 -/* 04D60 80901CA0 46104480 */ add.s $f18, $f8, $f16 +/* 04D60 80901CA0 46104480 */ add.s $f18, $f8, $f16 /* 04D64 80901CA4 3C0F8090 */ lui $t7, %hi(D_80907050) ## $t7 = 80900000 /* 04D68 80901CA8 25EF7050 */ addiu $t7, $t7, %lo(D_80907050) ## $t7 = 80907050 -/* 04D6C 80901CAC 008F1821 */ addu $v1, $a0, $t7 +/* 04D6C 80901CAC 008F1821 */ addu $v1, $a0, $t7 /* 04D70 80901CB0 E61203A4 */ swc1 $f18, 0x03A4($s0) ## 000003A4 /* 04D74 80901CB4 C4C60028 */ lwc1 $f6, 0x0028($a2) ## 00000028 /* 04D78 80901CB8 C4440004 */ lwc1 $f4, 0x0004($v0) ## 00000004 -/* 04D7C 80901CBC 46003280 */ add.s $f10, $f6, $f0 -/* 04D80 80901CC0 460A2200 */ add.s $f8, $f4, $f10 +/* 04D7C 80901CBC 46003280 */ add.s $f10, $f6, $f0 +/* 04D80 80901CC0 460A2200 */ add.s $f8, $f4, $f10 /* 04D84 80901CC4 E60803A8 */ swc1 $f8, 0x03A8($s0) ## 000003A8 /* 04D88 80901CC8 C4D2002C */ lwc1 $f18, 0x002C($a2) ## 0000002C /* 04D8C 80901CCC C4500008 */ lwc1 $f16, 0x0008($v0) ## 00000008 -/* 04D90 80901CD0 46029180 */ add.s $f6, $f18, $f2 -/* 04D94 80901CD4 46068100 */ add.s $f4, $f16, $f6 +/* 04D90 80901CD0 46029180 */ add.s $f6, $f18, $f2 +/* 04D94 80901CD4 46068100 */ add.s $f4, $f16, $f6 /* 04D98 80901CD8 E60403AC */ swc1 $f4, 0x03AC($s0) ## 000003AC /* 04D9C 80901CDC C4C80024 */ lwc1 $f8, 0x0024($a2) ## 00000024 /* 04DA0 80901CE0 C46A0000 */ lwc1 $f10, 0x0000($v1) ## 00000000 -/* 04DA4 80901CE4 46085480 */ add.s $f18, $f10, $f8 +/* 04DA4 80901CE4 46085480 */ add.s $f18, $f10, $f8 /* 04DA8 80901CE8 E61203B0 */ swc1 $f18, 0x03B0($s0) ## 000003B0 /* 04DAC 80901CEC C4C60028 */ lwc1 $f6, 0x0028($a2) ## 00000028 /* 04DB0 80901CF0 C4700004 */ lwc1 $f16, 0x0004($v1) ## 00000004 -/* 04DB4 80901CF4 46023100 */ add.s $f4, $f6, $f2 -/* 04DB8 80901CF8 46048280 */ add.s $f10, $f16, $f4 +/* 04DB4 80901CF4 46023100 */ add.s $f4, $f6, $f2 +/* 04DB8 80901CF8 46048280 */ add.s $f10, $f16, $f4 /* 04DBC 80901CFC E60A03B4 */ swc1 $f10, 0x03B4($s0) ## 000003B4 /* 04DC0 80901D00 C4D2002C */ lwc1 $f18, 0x002C($a2) ## 0000002C /* 04DC4 80901D04 C4680008 */ lwc1 $f8, 0x0008($v1) ## 00000008 -/* 04DC8 80901D08 46124180 */ add.s $f6, $f8, $f18 +/* 04DC8 80901D08 46124180 */ add.s $f6, $f8, $f18 /* 04DCC 80901D0C E60603B8 */ swc1 $f6, 0x03B8($s0) ## 000003B8 .L80901D10: /* 04DD0 80901D10 8E180398 */ lw $t8, 0x0398($s0) ## 00000398 /* 04DD4 80901D14 3C041001 */ lui $a0, 0x1001 ## $a0 = 10010000 -/* 04DD8 80901D18 2F010051 */ sltiu $at, $t8, 0x0051 -/* 04DDC 80901D1C 5420015D */ bnel $at, $zero, .L80902294 +/* 04DD8 80901D18 2F010051 */ sltiu $at, $t8, 0x0051 +/* 04DDC 80901D1C 5420015D */ bnel $at, $zero, .L80902294 /* 04DE0 80901D20 8605039E */ lh $a1, 0x039E($s0) ## 0000039E /* 04DE4 80901D24 0C03E803 */ jal Audio_SetBGM - + /* 04DE8 80901D28 348400FF */ ori $a0, $a0, 0x00FF ## $a0 = 100100FF /* 04DEC 80901D2C 3C0142E0 */ lui $at, 0x42E0 ## $at = 42E00000 /* 04DF0 80901D30 44818000 */ mtc1 $at, $f16 ## $f16 = 112.00 @@ -774,7 +774,7 @@ glabel L80901AB0 /* 04DFC 80901D3C AE000398 */ sw $zero, 0x0398($s0) ## 00000398 /* 04E00 80901D40 3C018091 */ lui $at, %hi(D_8090DC5C) ## $at = 80910000 /* 04E04 80901D44 E61003A4 */ swc1 $f16, 0x03A4($s0) ## 000003A4 -/* 04E08 80901D48 C424DC5C */ lwc1 $f4, %lo(D_8090DC5C)($at) +/* 04E08 80901D48 C424DC5C */ lwc1 $f4, %lo(D_8090DC5C)($at) /* 04E0C 80901D4C 3C01434A */ lui $at, 0x434A ## $at = 434A0000 /* 04E10 80901D50 44815000 */ mtc1 $at, $f10 ## $f10 = 202.00 /* 04E14 80901D54 3C0142DC */ lui $at, 0x42DC ## $at = 42DC0000 @@ -789,96 +789,96 @@ glabel L80901AB0 /* 04E38 80901D78 E60803B0 */ swc1 $f8, 0x03B0($s0) ## 000003B0 /* 04E3C 80901D7C E61203B4 */ swc1 $f18, 0x03B4($s0) ## 000003B4 /* 04E40 80901D80 E60603B8 */ swc1 $f6, 0x03B8($s0) ## 000003B8 -/* 04E44 80901D84 8FA9004C */ lw $t1, 0x004C($sp) +/* 04E44 80901D84 8FA9004C */ lw $t1, 0x004C($sp) /* 04E48 80901D88 44818000 */ mtc1 $at, $f16 ## $f16 = 200.00 /* 04E4C 80901D8C 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 /* 04E50 80901D90 E5300024 */ swc1 $f16, 0x0024($t1) ## 00000024 -/* 04E54 80901D94 1000013E */ beq $zero, $zero, .L80902290 +/* 04E54 80901D94 1000013E */ beq $zero, $zero, .L80902290 /* 04E58 80901D98 E60403C4 */ swc1 $f4, 0x03C4($s0) ## 000003C4 /* 04E5C 80901D9C 8E190398 */ lw $t9, 0x0398($s0) ## 00000398 .L80901DA0: /* 04E60 80901DA0 240A0017 */ addiu $t2, $zero, 0x0017 ## $t2 = 00000017 /* 04E64 80901DA4 24010037 */ addiu $at, $zero, 0x0037 ## $at = 00000037 -/* 04E68 80901DA8 17210139 */ bne $t9, $at, .L80902290 +/* 04E68 80901DA8 17210139 */ bne $t9, $at, .L80902290 /* 04E6C 80901DAC A20A0339 */ sb $t2, 0x0339($s0) ## 00000339 /* 04E70 80901DB0 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 04E74 80901DB4 24A57288 */ addiu $a1, $a1, 0x7288 ## $a1 = 06007288 -/* 04E78 80901DB8 8FA40028 */ lw $a0, 0x0028($sp) -/* 04E7C 80901DBC 0C029490 */ jal func_800A5240 +/* 04E78 80901DB8 8FA40028 */ lw $a0, 0x0028($sp) +/* 04E7C 80901DBC 0C029490 */ jal SkelAnime_ChangeAnimTransitionStop /* 04E80 80901DC0 24060000 */ addiu $a2, $zero, 0x0000 ## $a2 = 00000000 /* 04E84 80901DC4 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 /* 04E88 80901DC8 0C028800 */ jal SkelAnime_GetFrameCount - + /* 04E8C 80901DCC 24847288 */ addiu $a0, $a0, 0x7288 ## $a0 = 06007288 /* 04E90 80901DD0 44825000 */ mtc1 $v0, $f10 ## $f10 = 0.00 /* 04E94 80901DD4 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 04E98 80901DD8 24060062 */ addiu $a2, $zero, 0x0062 ## $a2 = 00000062 -/* 04E9C 80901DDC 46805220 */ cvt.s.w $f8, $f10 +/* 04E9C 80901DDC 46805220 */ cvt.s.w $f8, $f10 /* 04EA0 80901DE0 E6080194 */ swc1 $f8, 0x0194($s0) ## 00000194 -/* 04EA4 80901DE4 0C00B7D5 */ jal func_8002DF54 -/* 04EA8 80901DE8 8FA40054 */ lw $a0, 0x0054($sp) +/* 04EA4 80901DE4 0C00B7D5 */ jal func_8002DF54 +/* 04EA8 80901DE8 8FA40054 */ lw $a0, 0x0054($sp) /* 04EAC 80901DEC 240B0008 */ addiu $t3, $zero, 0x0008 ## $t3 = 00000008 /* 04EB0 80901DF0 240C03E8 */ addiu $t4, $zero, 0x03E8 ## $t4 = 000003E8 /* 04EB4 80901DF4 A60B039C */ sh $t3, 0x039C($s0) ## 0000039C -/* 04EB8 80901DF8 10000125 */ beq $zero, $zero, .L80902290 +/* 04EB8 80901DF8 10000125 */ beq $zero, $zero, .L80902290 /* 04EBC 80901DFC AE0C0398 */ sw $t4, 0x0398($s0) ## 00000398 glabel L80901E00 /* 04EC0 80901E00 8E030398 */ lw $v1, 0x0398($s0) ## 00000398 /* 04EC4 80901E04 24010401 */ addiu $at, $zero, 0x0401 ## $at = 00000401 /* 04EC8 80901E08 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 04ECC 80901E0C 54610007 */ bnel $v1, $at, .L80901E2C -/* 04ED0 80901E10 2C6103E8 */ sltiu $at, $v1, 0x03E8 +/* 04ECC 80901E0C 54610007 */ bnel $v1, $at, .L80901E2C +/* 04ED0 80901E10 2C6103E8 */ sltiu $at, $v1, 0x03E8 /* 04ED4 80901E14 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 04ED8 80901E18 240539D8 */ addiu $a1, $zero, 0x39D8 ## $a1 = 000039D8 /* 04EDC 80901E1C 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 /* 04EE0 80901E20 44810000 */ mtc1 $at, $f0 ## $f0 = 1.00 /* 04EE4 80901E24 8E030398 */ lw $v1, 0x0398($s0) ## 00000398 -/* 04EE8 80901E28 2C6103E8 */ sltiu $at, $v1, 0x03E8 +/* 04EE8 80901E28 2C6103E8 */ sltiu $at, $v1, 0x03E8 .L80901E2C: -/* 04EEC 80901E2C 1420000D */ bne $at, $zero, .L80901E64 -/* 04EF0 80901E30 2C610410 */ sltiu $at, $v1, 0x0410 -/* 04EF4 80901E34 1020000B */ beq $at, $zero, .L80901E64 +/* 04EEC 80901E2C 1420000D */ bne $at, $zero, .L80901E64 +/* 04EF0 80901E30 2C610410 */ sltiu $at, $v1, 0x0410 +/* 04EF4 80901E34 1020000B */ beq $at, $zero, .L80901E64 /* 04EF8 80901E38 240D0017 */ addiu $t5, $zero, 0x0017 ## $t5 = 00000017 /* 04EFC 80901E3C A20D0339 */ sb $t5, 0x0339($s0) ## 00000339 -/* 04F00 80901E40 8FA40054 */ lw $a0, 0x0054($sp) +/* 04F00 80901E40 8FA40054 */ lw $a0, 0x0054($sp) /* 04F04 80901E44 3C010001 */ lui $at, 0x0001 ## $at = 00010000 /* 04F08 80901E48 34210AFC */ ori $at, $at, 0x0AFC ## $at = 00010AFC -/* 04F0C 80901E4C 44050000 */ mfc1 $a1, $f0 +/* 04F0C 80901E4C 44050000 */ mfc1 $a1, $f0 /* 04F10 80901E50 3C063E4C */ lui $a2, 0x3E4C ## $a2 = 3E4C0000 /* 04F14 80901E54 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3E4CCCCD /* 04F18 80901E58 0C01E123 */ jal Math_SmoothDownscaleMaxF - -/* 04F1C 80901E5C 00812021 */ addu $a0, $a0, $at + +/* 04F1C 80901E5C 00812021 */ addu $a0, $a0, $at /* 04F20 80901E60 8E030398 */ lw $v1, 0x0398($s0) ## 00000398 .L80901E64: /* 04F24 80901E64 24010410 */ addiu $at, $zero, 0x0410 ## $at = 00000410 -/* 04F28 80901E68 1461000F */ bne $v1, $at, .L80901EA8 +/* 04F28 80901E68 1461000F */ bne $v1, $at, .L80901EA8 /* 04F2C 80901E6C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 04F30 80901E70 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 04F34 80901E74 240539A1 */ addiu $a1, $zero, 0x39A1 ## $a1 = 000039A1 /* 04F38 80901E78 240E0002 */ addiu $t6, $zero, 0x0002 ## $t6 = 00000002 /* 04F3C 80901E7C A20E0336 */ sb $t6, 0x0336($s0) ## 00000336 /* 04F40 80901E80 A2000339 */ sb $zero, 0x0339($s0) ## 00000339 -/* 04F44 80901E84 8FAF0054 */ lw $t7, 0x0054($sp) +/* 04F44 80901E84 8FAF0054 */ lw $t7, 0x0054($sp) /* 04F48 80901E88 3C010001 */ lui $at, 0x0001 ## $at = 00010000 /* 04F4C 80901E8C 44809000 */ mtc1 $zero, $f18 ## $f18 = 0.00 -/* 04F50 80901E90 002F0821 */ addu $at, $at, $t7 +/* 04F50 80901E90 002F0821 */ addu $at, $at, $t7 /* 04F54 80901E94 A0200AE2 */ sb $zero, 0x0AE2($at) ## 00010AE2 -/* 04F58 80901E98 8FB80054 */ lw $t8, 0x0054($sp) +/* 04F58 80901E98 8FB80054 */ lw $t8, 0x0054($sp) /* 04F5C 80901E9C 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 04F60 80901EA0 00380821 */ addu $at, $at, $t8 +/* 04F60 80901EA0 00380821 */ addu $at, $at, $t8 /* 04F64 80901EA4 E4320AFC */ swc1 $f18, 0x0AFC($at) ## 00010AFC .L80901EA8: -/* 04F68 80901EA8 8FA40028 */ lw $a0, 0x0028($sp) -/* 04F6C 80901EAC 0C0295B2 */ jal func_800A56C8 +/* 04F68 80901EA8 8FA40028 */ lw $a0, 0x0028($sp) +/* 04F6C 80901EAC 0C0295B2 */ jal func_800A56C8 /* 04F70 80901EB0 8E050194 */ lw $a1, 0x0194($s0) ## 00000194 -/* 04F74 80901EB4 10400009 */ beq $v0, $zero, .L80901EDC -/* 04F78 80901EB8 8FA40028 */ lw $a0, 0x0028($sp) +/* 04F74 80901EB4 10400009 */ beq $v0, $zero, .L80901EDC +/* 04F78 80901EB8 8FA40028 */ lw $a0, 0x0028($sp) /* 04F7C 80901EBC 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 /* 04F80 80901EC0 24A58EB8 */ addiu $a1, $a1, 0x8EB8 ## $a1 = 06008EB8 -/* 04F84 80901EC4 0C029490 */ jal func_800A5240 +/* 04F84 80901EC4 0C029490 */ jal SkelAnime_ChangeAnimTransitionStop /* 04F88 80901EC8 24060000 */ addiu $a2, $zero, 0x0000 ## $a2 = 00000000 /* 04F8C 80901ECC 3C01447A */ lui $at, 0x447A ## $at = 447A0000 /* 04F90 80901ED0 44813000 */ mtc1 $at, $f6 ## $f6 = 1000.00 @@ -890,45 +890,45 @@ glabel L80901E00 /* 04FA4 80901EE4 3C018091 */ lui $at, %hi(D_8090DC60) ## $at = 80910000 /* 04FA8 80901EE8 8E030398 */ lw $v1, 0x0398($s0) ## 00000398 /* 04FAC 80901EEC E61003A4 */ swc1 $f16, 0x03A4($s0) ## 000003A4 -/* 04FB0 80901EF0 C424DC60 */ lwc1 $f4, %lo(D_8090DC60)($at) +/* 04FB0 80901EF0 C424DC60 */ lwc1 $f4, %lo(D_8090DC60)($at) /* 04FB4 80901EF4 44805000 */ mtc1 $zero, $f10 ## $f10 = 0.00 /* 04FB8 80901EF8 C60801B8 */ lwc1 $f8, 0x01B8($s0) ## 000001B8 /* 04FBC 80901EFC C61201BC */ lwc1 $f18, 0x01BC($s0) ## 000001BC /* 04FC0 80901F00 C60601C0 */ lwc1 $f6, 0x01C0($s0) ## 000001C0 -/* 04FC4 80901F04 2C6103E8 */ sltiu $at, $v1, 0x03E8 +/* 04FC4 80901F04 2C6103E8 */ sltiu $at, $v1, 0x03E8 /* 04FC8 80901F08 E60403A8 */ swc1 $f4, 0x03A8($s0) ## 000003A8 /* 04FCC 80901F0C E60A03AC */ swc1 $f10, 0x03AC($s0) ## 000003AC /* 04FD0 80901F10 E60803B0 */ swc1 $f8, 0x03B0($s0) ## 000003B0 /* 04FD4 80901F14 E61203B4 */ swc1 $f18, 0x03B4($s0) ## 000003B4 -/* 04FD8 80901F18 10200007 */ beq $at, $zero, .L80901F38 +/* 04FD8 80901F18 10200007 */ beq $at, $zero, .L80901F38 /* 04FDC 80901F1C E60603B8 */ swc1 $f6, 0x03B8($s0) ## 000003B8 /* 04FE0 80901F20 3068000F */ andi $t0, $v1, 0x000F ## $t0 = 00000000 -/* 04FE4 80901F24 15000004 */ bne $t0, $zero, .L80901F38 +/* 04FE4 80901F24 15000004 */ bne $t0, $zero, .L80901F38 /* 04FE8 80901F28 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 04FEC 80901F2C 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 04FF0 80901F30 24053997 */ addiu $a1, $zero, 0x3997 ## $a1 = 00003997 /* 04FF4 80901F34 8E030398 */ lw $v1, 0x0398($s0) ## 00000398 .L80901F38: /* 04FF8 80901F38 24010028 */ addiu $at, $zero, 0x0028 ## $at = 00000028 -/* 04FFC 80901F3C 146100D4 */ bne $v1, $at, .L80902290 +/* 04FFC 80901F3C 146100D4 */ bne $v1, $at, .L80902290 /* 05000 80901F40 24090009 */ addiu $t1, $zero, 0x0009 ## $t1 = 00000009 /* 05004 80901F44 A609039C */ sh $t1, 0x039C($s0) ## 0000039C /* 05008 80901F48 AE000398 */ sw $zero, 0x0398($s0) ## 00000398 /* 0500C 80901F4C 3C198091 */ lui $t9, %hi(D_8090EB2C) ## $t9 = 80910000 -/* 05010 80901F50 8F39EB2C */ lw $t9, %lo(D_8090EB2C)($t9) +/* 05010 80901F50 8F39EB2C */ lw $t9, %lo(D_8090EB2C)($t9) /* 05014 80901F54 240A000B */ addiu $t2, $zero, 0x000B ## $t2 = 0000000B /* 05018 80901F58 240570D9 */ addiu $a1, $zero, 0x70D9 ## $a1 = 000070D9 /* 0501C 80901F5C A32A03C8 */ sb $t2, 0x03C8($t9) ## 809103C8 -/* 05020 80901F60 8FA40054 */ lw $a0, 0x0054($sp) -/* 05024 80901F64 0C042DA0 */ jal func_8010B680 +/* 05020 80901F60 8FA40054 */ lw $a0, 0x0054($sp) +/* 05024 80901F64 0C042DA0 */ jal func_8010B680 /* 05028 80901F68 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 /* 0502C 80901F6C A2000336 */ sb $zero, 0x0336($s0) ## 00000336 -/* 05030 80901F70 8FAB0054 */ lw $t3, 0x0054($sp) +/* 05030 80901F70 8FAB0054 */ lw $t3, 0x0054($sp) /* 05034 80901F74 44808000 */ mtc1 $zero, $f16 ## $f16 = 0.00 /* 05038 80901F78 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 0503C 80901F7C 002B0821 */ addu $at, $at, $t3 -/* 05040 80901F80 100000C3 */ beq $zero, $zero, .L80902290 +/* 0503C 80901F7C 002B0821 */ addu $at, $at, $t3 +/* 05040 80901F80 100000C3 */ beq $zero, $zero, .L80902290 /* 05044 80901F84 E4300AFC */ swc1 $f16, 0x0AFC($at) ## 00010AFC glabel L80901F88 /* 05048 80901F88 3C014220 */ lui $at, 0x4220 ## $at = 42200000 @@ -945,26 +945,26 @@ glabel L80901F88 /* 05074 80901FB4 E60403A4 */ swc1 $f4, 0x03A4($s0) ## 000003A4 /* 05078 80901FB8 E60A03A8 */ swc1 $f10, 0x03A8($s0) ## 000003A8 /* 0507C 80901FBC E60803AC */ swc1 $f8, 0x03AC($s0) ## 000003AC -/* 05080 80901FC0 8DADEB2C */ lw $t5, %lo(D_8090EB2C)($t5) +/* 05080 80901FC0 8DADEB2C */ lw $t5, %lo(D_8090EB2C)($t5) /* 05084 80901FC4 3C0E8091 */ lui $t6, %hi(D_8090EB2C) ## $t6 = 80910000 /* 05088 80901FC8 3C0F8091 */ lui $t7, %hi(D_8090EB2C) ## $t7 = 80910000 /* 0508C 80901FCC C5B20024 */ lwc1 $f18, 0x0024($t5) ## 80910024 /* 05090 80901FD0 8E180398 */ lw $t8, 0x0398($s0) ## 00000398 /* 05094 80901FD4 2408000A */ addiu $t0, $zero, 0x000A ## $t0 = 0000000A /* 05098 80901FD8 E61203B0 */ swc1 $f18, 0x03B0($s0) ## 000003B0 -/* 0509C 80901FDC 8DCEEB2C */ lw $t6, %lo(D_8090EB2C)($t6) -/* 050A0 80901FE0 2F01003D */ sltiu $at, $t8, 0x003D +/* 0509C 80901FDC 8DCEEB2C */ lw $t6, %lo(D_8090EB2C)($t6) +/* 050A0 80901FE0 2F01003D */ sltiu $at, $t8, 0x003D /* 050A4 80901FE4 C5C60028 */ lwc1 $f6, 0x0028($t6) ## 80910028 -/* 050A8 80901FE8 46023400 */ add.s $f16, $f6, $f2 +/* 050A8 80901FE8 46023400 */ add.s $f16, $f6, $f2 /* 050AC 80901FEC E61003B4 */ swc1 $f16, 0x03B4($s0) ## 000003B4 -/* 050B0 80901FF0 8DEFEB2C */ lw $t7, %lo(D_8090EB2C)($t7) +/* 050B0 80901FF0 8DEFEB2C */ lw $t7, %lo(D_8090EB2C)($t7) /* 050B4 80901FF4 C5E4002C */ lwc1 $f4, 0x002C($t7) ## 8091002C -/* 050B8 80901FF8 142000A5 */ bne $at, $zero, .L80902290 +/* 050B8 80901FF8 142000A5 */ bne $at, $zero, .L80902290 /* 050BC 80901FFC E60403B8 */ swc1 $f4, 0x03B8($s0) ## 000003B8 /* 050C0 80902000 44805000 */ mtc1 $zero, $f10 ## $f10 = 0.00 /* 050C4 80902004 A608039C */ sh $t0, 0x039C($s0) ## 0000039C /* 050C8 80902008 AE000398 */ sw $zero, 0x0398($s0) ## 00000398 -/* 050CC 8090200C 100000A0 */ beq $zero, $zero, .L80902290 +/* 050CC 8090200C 100000A0 */ beq $zero, $zero, .L80902290 /* 050D0 80902010 E60A0410 */ swc1 $f10, 0x0410($s0) ## 00000410 glabel L80902014 /* 050D4 80902014 24090018 */ addiu $t1, $zero, 0x0018 ## $t1 = 00000018 @@ -974,100 +974,100 @@ glabel L80902014 /* 050E4 80902024 260403A4 */ addiu $a0, $s0, 0x03A4 ## $a0 = 000003A4 /* 050E8 80902028 3C054391 */ lui $a1, 0x4391 ## $a1 = 43910000 /* 050EC 8090202C 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 050F0 80902030 8E070410 */ lw $a3, 0x0410($s0) ## 00000410 /* 050F4 80902034 3C013E80 */ lui $at, 0x3E80 ## $at = 3E800000 /* 050F8 80902038 44819000 */ mtc1 $at, $f18 ## $f18 = 0.25 /* 050FC 8090203C C6080410 */ lwc1 $f8, 0x0410($s0) ## 00000410 /* 05100 80902040 3C05448D */ lui $a1, 0x448D ## $a1 = 448D0000 /* 05104 80902044 3C063D4C */ lui $a2, 0x3D4C ## $a2 = 3D4C0000 -/* 05108 80902048 46124182 */ mul.s $f6, $f8, $f18 +/* 05108 80902048 46124182 */ mul.s $f6, $f8, $f18 /* 0510C 8090204C 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3D4CCCCD /* 05110 80902050 34A54000 */ ori $a1, $a1, 0x4000 ## $a1 = 448D4000 /* 05114 80902054 260403A8 */ addiu $a0, $s0, 0x03A8 ## $a0 = 000003A8 -/* 05118 80902058 44073000 */ mfc1 $a3, $f6 +/* 05118 80902058 44073000 */ mfc1 $a3, $f6 /* 0511C 8090205C 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 05120 80902060 00000000 */ nop /* 05124 80902064 3C013FA0 */ lui $at, 0x3FA0 ## $at = 3FA00000 /* 05128 80902068 44812000 */ mtc1 $at, $f4 ## $f4 = 1.25 /* 0512C 8090206C C6100410 */ lwc1 $f16, 0x0410($s0) ## 00000410 /* 05130 80902070 3C063D4C */ lui $a2, 0x3D4C ## $a2 = 3D4C0000 /* 05134 80902074 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3D4CCCCD -/* 05138 80902078 46048282 */ mul.s $f10, $f16, $f4 +/* 05138 80902078 46048282 */ mul.s $f10, $f16, $f4 /* 0513C 8090207C 260403AC */ addiu $a0, $s0, 0x03AC ## $a0 = 000003AC /* 05140 80902080 3C05C382 */ lui $a1, 0xC382 ## $a1 = C3820000 -/* 05144 80902084 44075000 */ mfc1 $a3, $f10 +/* 05144 80902084 44075000 */ mfc1 $a3, $f10 /* 05148 80902088 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 0514C 8090208C 00000000 */ nop /* 05150 80902090 8E030398 */ lw $v1, 0x0398($s0) ## 00000398 /* 05154 80902094 26040384 */ addiu $a0, $s0, 0x0384 ## $a0 = 00000384 /* 05158 80902098 3C053F80 */ lui $a1, 0x3F80 ## $a1 = 3F800000 -/* 0515C 8090209C 2C610028 */ sltiu $at, $v1, 0x0028 -/* 05160 809020A0 14200019 */ bne $at, $zero, .L80902108 +/* 0515C 8090209C 2C610028 */ sltiu $at, $v1, 0x0028 +/* 05160 809020A0 14200019 */ bne $at, $zero, .L80902108 /* 05164 809020A4 3C063E4C */ lui $a2, 0x3E4C ## $a2 = 3E4C0000 -/* 05168 809020A8 2C61006F */ sltiu $at, $v1, 0x006F -/* 0516C 809020AC 10200016 */ beq $at, $zero, .L80902108 +/* 05168 809020A8 2C61006F */ sltiu $at, $v1, 0x006F +/* 0516C 809020AC 10200016 */ beq $at, $zero, .L80902108 /* 05170 809020B0 3C073CA3 */ lui $a3, 0x3CA3 ## $a3 = 3CA30000 -/* 05174 809020B4 8FA40054 */ lw $a0, 0x0054($sp) +/* 05174 809020B4 8FA40054 */ lw $a0, 0x0054($sp) /* 05178 809020B8 3C010001 */ lui $at, 0x0001 ## $at = 00010000 /* 0517C 809020BC 34210AFC */ ori $at, $at, 0x0AFC ## $at = 00010AFC /* 05180 809020C0 3C053F80 */ lui $a1, 0x3F80 ## $a1 = 3F800000 /* 05184 809020C4 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 05188 809020C8 34E7D70A */ ori $a3, $a3, 0xD70A ## $a3 = 3CA3D70A /* 0518C 809020CC 0C01E107 */ jal Math_SmoothScaleMaxF - -/* 05190 809020D0 00812021 */ addu $a0, $a0, $at + +/* 05190 809020D0 00812021 */ addu $a0, $a0, $at /* 05194 809020D4 3C063DCC */ lui $a2, 0x3DCC ## $a2 = 3DCC0000 /* 05198 809020D8 3C073E4C */ lui $a3, 0x3E4C ## $a3 = 3E4C0000 /* 0519C 809020DC 34E7CCCD */ ori $a3, $a3, 0xCCCD ## $a3 = 3E4CCCCD /* 051A0 809020E0 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3DCCCCCD /* 051A4 809020E4 26040384 */ addiu $a0, $s0, 0x0384 ## $a0 = 00000384 /* 051A8 809020E8 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 051AC 809020EC 3C054120 */ lui $a1, 0x4120 ## $a1 = 41200000 /* 051B0 809020F0 3C048091 */ lui $a0, %hi(D_8090EB2C) ## $a0 = 80910000 -/* 051B4 809020F4 8C84EB2C */ lw $a0, %lo(D_8090EB2C)($a0) +/* 051B4 809020F4 8C84EB2C */ lw $a0, %lo(D_8090EB2C)($a0) /* 051B8 809020F8 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 051BC 809020FC 2405209A */ addiu $a1, $zero, 0x209A ## $a1 = 0000209A -/* 051C0 80902100 10000004 */ beq $zero, $zero, .L80902114 +/* 051C0 80902100 10000004 */ beq $zero, $zero, .L80902114 /* 051C4 80902104 8E0A0398 */ lw $t2, 0x0398($s0) ## 00000398 .L80902108: /* 051C8 80902108 0C01E123 */ jal Math_SmoothDownscaleMaxF - + /* 051CC 8090210C 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 0000CCCD /* 051D0 80902110 8E0A0398 */ lw $t2, 0x0398($s0) ## 00000398 .L80902114: /* 051D4 80902114 3C198091 */ lui $t9, %hi(D_8090EB2C) ## $t9 = 80910000 /* 051D8 80902118 3C0B8091 */ lui $t3, %hi(D_8090EB2C) ## $t3 = 80910000 -/* 051DC 8090211C 2D410083 */ sltiu $at, $t2, 0x0083 -/* 051E0 80902120 14200015 */ bne $at, $zero, .L80902178 +/* 051DC 8090211C 2D410083 */ sltiu $at, $t2, 0x0083 +/* 051E0 80902120 14200015 */ bne $at, $zero, .L80902178 /* 051E4 80902124 00000000 */ nop -/* 051E8 80902128 8F39EB2C */ lw $t9, %lo(D_8090EB2C)($t9) +/* 051E8 80902128 8F39EB2C */ lw $t9, %lo(D_8090EB2C)($t9) /* 051EC 8090212C 3C014220 */ lui $at, 0x4220 ## $at = 42200000 /* 051F0 80902130 44811000 */ mtc1 $at, $f2 ## $f2 = 40.00 /* 051F4 80902134 C7280028 */ lwc1 $f8, 0x0028($t9) ## 80910028 /* 051F8 80902138 3C014120 */ lui $at, 0x4120 ## $at = 41200000 /* 051FC 8090213C 44813000 */ mtc1 $at, $f6 ## $f6 = 10.00 -/* 05200 80902140 46024480 */ add.s $f18, $f8, $f2 +/* 05200 80902140 46024480 */ add.s $f18, $f8, $f2 /* 05204 80902144 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 /* 05208 80902148 44812000 */ mtc1 $at, $f4 ## $f4 = 20.00 /* 0520C 8090214C 3C063DCC */ lui $a2, 0x3DCC ## $a2 = 3DCC0000 -/* 05210 80902150 46069400 */ add.s $f16, $f18, $f6 +/* 05210 80902150 46069400 */ add.s $f16, $f18, $f6 /* 05214 80902154 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3DCCCCCD /* 05218 80902158 260403B4 */ addiu $a0, $s0, 0x03B4 ## $a0 = 000003B4 /* 0521C 8090215C 8E070410 */ lw $a3, 0x0410($s0) ## 00000410 -/* 05220 80902160 46048281 */ sub.s $f10, $f16, $f4 -/* 05224 80902164 44055000 */ mfc1 $a1, $f10 +/* 05220 80902160 46048281 */ sub.s $f10, $f16, $f4 +/* 05224 80902164 44055000 */ mfc1 $a1, $f10 /* 05228 80902168 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 0522C 8090216C 00000000 */ nop -/* 05230 80902170 10000015 */ beq $zero, $zero, .L809021C8 +/* 05230 80902170 10000015 */ beq $zero, $zero, .L809021C8 /* 05234 80902174 3C073C23 */ lui $a3, 0x3C23 ## $a3 = 3C230000 .L80902178: -/* 05238 80902178 8D6BEB2C */ lw $t3, %lo(D_8090EB2C)($t3) +/* 05238 80902178 8D6BEB2C */ lw $t3, %lo(D_8090EB2C)($t3) /* 0523C 8090217C 3C014220 */ lui $at, 0x4220 ## $at = 42200000 /* 05240 80902180 44811000 */ mtc1 $at, $f2 ## $f2 = 40.00 /* 05244 80902184 3C014120 */ lui $at, 0x4120 ## $at = 41200000 @@ -1076,16 +1076,16 @@ glabel L80902014 /* 05250 80902190 3C013E80 */ lui $at, 0x3E80 ## $at = 3E800000 /* 05254 80902194 44815000 */ mtc1 $at, $f10 ## $f10 = 0.25 /* 05258 80902198 C6040410 */ lwc1 $f4, 0x0410($s0) ## 00000410 -/* 0525C 8090219C 46024480 */ add.s $f18, $f8, $f2 +/* 0525C 8090219C 46024480 */ add.s $f18, $f8, $f2 /* 05260 809021A0 3C063D4C */ lui $a2, 0x3D4C ## $a2 = 3D4C0000 -/* 05264 809021A4 460A2202 */ mul.s $f8, $f4, $f10 +/* 05264 809021A4 460A2202 */ mul.s $f8, $f4, $f10 /* 05268 809021A8 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3D4CCCCD -/* 0526C 809021AC 46069400 */ add.s $f16, $f18, $f6 +/* 0526C 809021AC 46069400 */ add.s $f16, $f18, $f6 /* 05270 809021B0 260403B4 */ addiu $a0, $s0, 0x03B4 ## $a0 = 000003B4 -/* 05274 809021B4 44058000 */ mfc1 $a1, $f16 -/* 05278 809021B8 44074000 */ mfc1 $a3, $f8 +/* 05274 809021B4 44058000 */ mfc1 $a1, $f16 +/* 05278 809021B8 44074000 */ mfc1 $a3, $f8 /* 0527C 809021BC 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 05280 809021C0 00000000 */ nop /* 05284 809021C4 3C073C23 */ lui $a3, 0x3C23 ## $a3 = 3C230000 .L809021C8: @@ -1093,112 +1093,112 @@ glabel L80902014 /* 0528C 809021CC 26040410 */ addiu $a0, $s0, 0x0410 ## $a0 = 00000410 /* 05290 809021D0 3C053F80 */ lui $a1, 0x3F80 ## $a1 = 3F800000 /* 05294 809021D4 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 05298 809021D8 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 0529C 809021DC 8E030398 */ lw $v1, 0x0398($s0) ## 00000398 /* 052A0 809021E0 2401000A */ addiu $at, $zero, 0x000A ## $at = 0000000A /* 052A4 809021E4 3C0D8091 */ lui $t5, %hi(D_8090EB2C) ## $t5 = 80910000 -/* 052A8 809021E8 14610005 */ bne $v1, $at, .L80902200 +/* 052A8 809021E8 14610005 */ bne $v1, $at, .L80902200 /* 052AC 809021EC 3C0F8091 */ lui $t7, %hi(D_8090EB2C) ## $t7 = 80910000 -/* 052B0 809021F0 8DADEB2C */ lw $t5, %lo(D_8090EB2C)($t5) +/* 052B0 809021F0 8DADEB2C */ lw $t5, %lo(D_8090EB2C)($t5) /* 052B4 809021F4 240C000C */ addiu $t4, $zero, 0x000C ## $t4 = 0000000C /* 052B8 809021F8 A1AC03C8 */ sb $t4, 0x03C8($t5) ## 809103C8 /* 052BC 809021FC 8E030398 */ lw $v1, 0x0398($s0) ## 00000398 .L80902200: /* 052C0 80902200 2401006E */ addiu $at, $zero, 0x006E ## $at = 0000006E -/* 052C4 80902204 14610005 */ bne $v1, $at, .L8090221C +/* 052C4 80902204 14610005 */ bne $v1, $at, .L8090221C /* 052C8 80902208 3C048091 */ lui $a0, %hi(D_8090EB2C) ## $a0 = 80910000 -/* 052CC 8090220C 8DEFEB2C */ lw $t7, %lo(D_8090EB2C)($t7) +/* 052CC 8090220C 8DEFEB2C */ lw $t7, %lo(D_8090EB2C)($t7) /* 052D0 80902210 240E000D */ addiu $t6, $zero, 0x000D ## $t6 = 0000000D /* 052D4 80902214 A1EE03C8 */ sb $t6, 0x03C8($t7) ## 809103C8 /* 052D8 80902218 8E030398 */ lw $v1, 0x0398($s0) ## 00000398 .L8090221C: /* 052DC 8090221C 2401008C */ addiu $at, $zero, 0x008C ## $at = 0000008C -/* 052E0 80902220 14610004 */ bne $v1, $at, .L80902234 +/* 052E0 80902220 14610004 */ bne $v1, $at, .L80902234 /* 052E4 80902224 24052896 */ addiu $a1, $zero, 0x2896 ## $a1 = 00002896 /* 052E8 80902228 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 052EC 8090222C 8C84EB2C */ lw $a0, %lo(D_8090EB2C)($a0) + +/* 052EC 8090222C 8C84EB2C */ lw $a0, %lo(D_8090EB2C)($a0) /* 052F0 80902230 8E030398 */ lw $v1, 0x0398($s0) ## 00000398 .L80902234: -/* 052F4 80902234 2C6100A0 */ sltiu $at, $v1, 0x00A0 -/* 052F8 80902238 54200016 */ bnel $at, $zero, .L80902294 +/* 052F4 80902234 2C6100A0 */ sltiu $at, $v1, 0x00A0 +/* 052F8 80902238 54200016 */ bnel $at, $zero, .L80902294 /* 052FC 8090223C 8605039E */ lh $a1, 0x039E($s0) ## 0000039E glabel L80902240 -/* 05300 80902240 8FA20054 */ lw $v0, 0x0054($sp) +/* 05300 80902240 8FA20054 */ lw $v0, 0x0054($sp) /* 05304 80902244 3C010001 */ lui $at, 0x0001 ## $at = 00010000 /* 05308 80902248 2418006B */ addiu $t8, $zero, 0x006B ## $t8 = 0000006B -/* 0530C 8090224C 00220821 */ addu $at, $at, $v0 +/* 0530C 8090224C 00220821 */ addu $at, $at, $v0 /* 05310 80902250 A4381E1A */ sh $t8, 0x1E1A($at) ## 00011E1A /* 05314 80902254 3C018016 */ lui $at, 0x8016 ## $at = 80160000 /* 05318 80902258 3408FFF2 */ ori $t0, $zero, 0xFFF2 ## $t0 = 0000FFF2 /* 0531C 8090225C A428FA72 */ sh $t0, -0x058E($at) ## 8015FA72 /* 05320 80902260 3C010001 */ lui $at, 0x0001 ## $at = 00010000 /* 05324 80902264 24090014 */ addiu $t1, $zero, 0x0014 ## $t1 = 00000014 -/* 05328 80902268 00220821 */ addu $at, $at, $v0 +/* 05328 80902268 00220821 */ addu $at, $at, $v0 /* 0532C 8090226C A0291E15 */ sb $t1, 0x1E15($at) ## 00011E15 /* 05330 80902270 3C010001 */ lui $at, 0x0001 ## $at = 00010000 /* 05334 80902274 240A0003 */ addiu $t2, $zero, 0x0003 ## $t2 = 00000003 -/* 05338 80902278 00220821 */ addu $at, $at, $v0 +/* 05338 80902278 00220821 */ addu $at, $at, $v0 /* 0533C 8090227C A02A1E5E */ sb $t2, 0x1E5E($at) ## 00011E5E /* 05340 80902280 3C010001 */ lui $at, 0x0001 ## $at = 00010000 /* 05344 80902284 24190001 */ addiu $t9, $zero, 0x0001 ## $t9 = 00000001 -/* 05348 80902288 00220821 */ addu $at, $at, $v0 +/* 05348 80902288 00220821 */ addu $at, $at, $v0 /* 0534C 8090228C A0391DE8 */ sb $t9, 0x1DE8($at) ## 00011DE8 glabel L80902290 .L80902290: /* 05350 80902290 8605039E */ lh $a1, 0x039E($s0) ## 0000039E .L80902294: -/* 05354 80902294 8FA40054 */ lw $a0, 0x0054($sp) +/* 05354 80902294 8FA40054 */ lw $a0, 0x0054($sp) /* 05358 80902298 260603B0 */ addiu $a2, $s0, 0x03B0 ## $a2 = 000003B0 -/* 0535C 8090229C 10A00004 */ beq $a1, $zero, .L809022B0 +/* 0535C 8090229C 10A00004 */ beq $a1, $zero, .L809022B0 /* 05360 809022A0 260703A4 */ addiu $a3, $s0, 0x03A4 ## $a3 = 000003A4 /* 05364 809022A4 260B03BC */ addiu $t3, $s0, 0x03BC ## $t3 = 000003BC -/* 05368 809022A8 0C030179 */ jal func_800C05E4 -/* 0536C 809022AC AFAB0010 */ sw $t3, 0x0010($sp) +/* 05368 809022A8 0C030179 */ jal func_800C05E4 +/* 0536C 809022AC AFAB0010 */ sw $t3, 0x0010($sp) .L809022B0: /* 05370 809022B0 860301AC */ lh $v1, 0x01AC($s0) ## 000001AC /* 05374 809022B4 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 05378 809022B8 8FA40028 */ lw $a0, 0x0028($sp) -/* 0537C 809022BC 10600005 */ beq $v1, $zero, .L809022D4 +/* 05378 809022B8 8FA40028 */ lw $a0, 0x0028($sp) +/* 0537C 809022BC 10600005 */ beq $v1, $zero, .L809022D4 /* 05380 809022C0 00000000 */ nop -/* 05384 809022C4 5061000F */ beql $v1, $at, .L80902304 +/* 05384 809022C4 5061000F */ beql $v1, $at, .L80902304 /* 05388 809022C8 860D039C */ lh $t5, 0x039C($s0) ## 0000039C -/* 0538C 809022CC 1000001A */ beq $zero, $zero, .L80902338 -/* 05390 809022D0 8FBF0024 */ lw $ra, 0x0024($sp) +/* 0538C 809022CC 1000001A */ beq $zero, $zero, .L80902338 +/* 05390 809022D0 8FBF0024 */ lw $ra, 0x0024($sp) .L809022D4: -/* 05394 809022D4 0C0295B2 */ jal func_800A56C8 +/* 05394 809022D4 0C0295B2 */ jal func_800A56C8 /* 05398 809022D8 8E050194 */ lw $a1, 0x0194($s0) ## 00000194 -/* 0539C 809022DC 10400015 */ beq $v0, $zero, .L80902334 -/* 053A0 809022E0 8FA40028 */ lw $a0, 0x0028($sp) +/* 0539C 809022DC 10400015 */ beq $v0, $zero, .L80902334 +/* 053A0 809022E0 8FA40028 */ lw $a0, 0x0028($sp) /* 053A4 809022E4 3C050603 */ lui $a1, 0x0603 ## $a1 = 06030000 /* 053A8 809022E8 24A54278 */ addiu $a1, $a1, 0x4278 ## $a1 = 06034278 -/* 053AC 809022EC 0C0294D3 */ jal func_800A534C +/* 053AC 809022EC 0C0294D3 */ jal SkelAnime_ChangeAnimTransitionRepeat /* 053B0 809022F0 24060000 */ addiu $a2, $zero, 0x0000 ## $a2 = 00000000 /* 053B4 809022F4 240C0001 */ addiu $t4, $zero, 0x0001 ## $t4 = 00000001 -/* 053B8 809022F8 1000000E */ beq $zero, $zero, .L80902334 +/* 053B8 809022F8 1000000E */ beq $zero, $zero, .L80902334 /* 053BC 809022FC A60C01AC */ sh $t4, 0x01AC($s0) ## 000001AC /* 053C0 80902300 860D039C */ lh $t5, 0x039C($s0) ## 0000039C .L80902304: -/* 053C4 80902304 8FAE0054 */ lw $t6, 0x0054($sp) +/* 053C4 80902304 8FAE0054 */ lw $t6, 0x0054($sp) /* 053C8 80902308 3C0F0001 */ lui $t7, 0x0001 ## $t7 = 00010000 -/* 053CC 8090230C 29A10007 */ slti $at, $t5, 0x0007 -/* 053D0 80902310 10200008 */ beq $at, $zero, .L80902334 -/* 053D4 80902314 01EE7821 */ addu $t7, $t7, $t6 +/* 053CC 8090230C 29A10007 */ slti $at, $t5, 0x0007 +/* 053D0 80902310 10200008 */ beq $at, $zero, .L80902334 +/* 053D4 80902314 01EE7821 */ addu $t7, $t7, $t6 /* 053D8 80902318 8DEF1DE4 */ lw $t7, 0x1DE4($t7) ## 00011DE4 /* 053DC 8090231C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 053E0 80902320 31F8001F */ andi $t8, $t7, 0x001F ## $t8 = 00000000 -/* 053E4 80902324 57000004 */ bnel $t8, $zero, .L80902338 -/* 053E8 80902328 8FBF0024 */ lw $ra, 0x0024($sp) +/* 053E4 80902324 57000004 */ bnel $t8, $zero, .L80902338 +/* 053E8 80902328 8FBF0024 */ lw $ra, 0x0024($sp) /* 053EC 8090232C 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 053F0 80902330 240539AF */ addiu $a1, $zero, 0x39AF ## $a1 = 000039AF .L80902334: -/* 053F4 80902334 8FBF0024 */ lw $ra, 0x0024($sp) +/* 053F4 80902334 8FBF0024 */ lw $ra, 0x0024($sp) .L80902338: -/* 053F8 80902338 8FB00020 */ lw $s0, 0x0020($sp) +/* 053F8 80902338 8FB00020 */ lw $s0, 0x0020($sp) /* 053FC 8090233C 27BD0050 */ addiu $sp, $sp, 0x0050 ## $sp = 00000000 -/* 05400 80902340 03E00008 */ jr $ra +/* 05400 80902340 03E00008 */ jr $ra /* 05404 80902344 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_80903F38.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_80903F38.s index 78a50513aa..742f49832e 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_80903F38.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_80903F38.s @@ -9,7 +9,7 @@ glabel func_80903F38 /* 07014 80903F54 24C6D714 */ addiu $a2, $a2, %lo(D_8090D714) ## $a2 = 8090D714 /* 07018 80903F58 27A4005C */ addiu $a0, $sp, 0x005C ## $a0 = FFFFFFEC /* 0701C 80903F5C 240713DB */ addiu $a3, $zero, 0x13DB ## $a3 = 000013DB -/* 07020 80903F60 0C031AB1 */ jal func_800C6AC4 +/* 07020 80903F60 0C031AB1 */ jal Graph_OpenDisps /* 07024 80903F64 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 /* 07028 80903F68 8FA20070 */ lw $v0, 0x0070($sp) /* 0702C 80903F6C 904F0312 */ lbu $t7, 0x0312($v0) ## 00000312 @@ -55,7 +55,7 @@ glabel func_80903F38 /* 070C8 80904008 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 070CC 8090400C 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 /* 070D0 80904010 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 070D4 80904014 0C0253D0 */ jal Draw_TwoTexScroll +/* 070D4 80904014 0C0253D0 */ jal Gfx_TwoTexScroll /* 070D8 80904018 AFA20058 */ sw $v0, 0x0058($sp) /* 070DC 8090401C 8FA30058 */ lw $v1, 0x0058($sp) /* 070E0 80904020 3C0AE700 */ lui $t2, 0xE700 ## $t2 = E7000000 @@ -110,7 +110,7 @@ glabel func_80903F38 /* 071A0 809040E0 24C6D73C */ addiu $a2, $a2, %lo(D_8090D73C) ## $a2 = 8090D73C /* 071A4 809040E4 27A4005C */ addiu $a0, $sp, 0x005C ## $a0 = FFFFFFEC /* 071A8 809040E8 24071402 */ addiu $a3, $zero, 0x1402 ## $a3 = 00001402 -/* 071AC 809040EC 0C031AD5 */ jal func_800C6B54 +/* 071AC 809040EC 0C031AD5 */ jal Graph_CloseDisps /* 071B0 809040F0 8DA50000 */ lw $a1, 0x0000($t5) ## 00000000 /* 071B4 809040F4 8FBF003C */ lw $ra, 0x003C($sp) /* 071B8 809040F8 8FB00038 */ lw $s0, 0x0038($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_80904108.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_80904108.s index 9db24bdcff..c25a5198b7 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_80904108.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_80904108.s @@ -14,7 +14,7 @@ glabel func_80904108 /* 071F8 80904138 8FBF003C */ lw $ra, 0x003C($sp) /* 071FC 8090413C 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 /* 07200 80904140 2407140B */ addiu $a3, $zero, 0x140B ## $a3 = 0000140B -/* 07204 80904144 0C031AB1 */ jal func_800C6AC4 +/* 07204 80904144 0C031AB1 */ jal Graph_OpenDisps /* 07208 80904148 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 /* 0720C 8090414C 0C034213 */ jal Matrix_Push /* 07210 80904150 00000000 */ nop @@ -53,7 +53,7 @@ glabel func_80904108 /* 07294 809041D4 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 07298 809041D8 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 /* 0729C 809041DC AFA20058 */ sw $v0, 0x0058($sp) -/* 072A0 809041E0 0C0253D0 */ jal Draw_TwoTexScroll +/* 072A0 809041E0 0C0253D0 */ jal Gfx_TwoTexScroll /* 072A4 809041E4 00603025 */ or $a2, $v1, $zero ## $a2 = 00010000 /* 072A8 809041E8 8FA90058 */ lw $t1, 0x0058($sp) /* 072AC 809041EC 3C0EFA00 */ lui $t6, 0xFA00 ## $t6 = FA000000 @@ -134,7 +134,7 @@ glabel func_80904108 /* 073D8 80904318 24C6D778 */ addiu $a2, $a2, %lo(D_8090D778) ## $a2 = 8090D778 /* 073DC 8090431C 27A40060 */ addiu $a0, $sp, 0x0060 ## $a0 = FFFFFFE8 /* 073E0 80904320 24071442 */ addiu $a3, $zero, 0x1442 ## $a3 = 00001442 -/* 073E4 80904324 0C031AD5 */ jal func_800C6B54 +/* 073E4 80904324 0C031AD5 */ jal Graph_CloseDisps /* 073E8 80904328 8F050000 */ lw $a1, 0x0000($t8) ## 00000000 /* 073EC 8090432C 8FBF003C */ lw $ra, 0x003C($sp) .L80904330: diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_80904340.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_80904340.s index 26b9098f22..a1969f30de 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_80904340.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_80904340.s @@ -21,7 +21,7 @@ glabel func_80904340 /* 0744C 8090438C 24C6D78C */ addiu $a2, $a2, %lo(D_8090D78C) ## $a2 = 8090D78C /* 07450 80904390 27A40090 */ addiu $a0, $sp, 0x0090 ## $a0 = FFFFFFD8 /* 07454 80904394 2407144C */ addiu $a3, $zero, 0x144C ## $a3 = 0000144C -/* 07458 80904398 0C031AB1 */ jal func_800C6AC4 +/* 07458 80904398 0C031AB1 */ jal Graph_OpenDisps /* 0745C 8090439C 00A09025 */ or $s2, $a1, $zero ## $s2 = 00000000 /* 07460 809043A0 0C034213 */ jal Matrix_Push /* 07464 809043A4 00000000 */ nop @@ -186,7 +186,7 @@ glabel func_80904340 /* 076B8 809045F8 24C6D7B4 */ addiu $a2, $a2, %lo(D_8090D7B4) ## $a2 = 8090D7B4 /* 076BC 809045FC 27A40090 */ addiu $a0, $sp, 0x0090 ## $a0 = FFFFFFD8 /* 076C0 80904600 8EC50000 */ lw $a1, 0x0000($s6) ## 00000000 -/* 076C4 80904604 0C031AD5 */ jal func_800C6B54 +/* 076C4 80904604 0C031AD5 */ jal Graph_CloseDisps /* 076C8 80904608 24071487 */ addiu $a3, $zero, 0x1487 ## $a3 = 00001487 /* 076CC 8090460C 8FBF0064 */ lw $ra, 0x0064($sp) /* 076D0 80904610 D7B40018 */ ldc1 $f20, 0x0018($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_8090464C.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_8090464C.s index 317ec13234..0ed0e2b061 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_8090464C.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_8090464C.s @@ -14,7 +14,7 @@ glabel func_8090464C /* 0773C 8090467C 8FBF001C */ lw $ra, 0x001C($sp) /* 07740 80904680 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 /* 07744 80904684 24071490 */ addiu $a3, $zero, 0x1490 ## $a3 = 00001490 -/* 07748 80904688 0C031AB1 */ jal func_800C6AC4 +/* 07748 80904688 0C031AB1 */ jal Graph_OpenDisps /* 0774C 8090468C 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 /* 07750 80904690 0C034213 */ jal Matrix_Push /* 07754 80904694 00000000 */ nop @@ -107,7 +107,7 @@ glabel func_8090464C /* 078B0 809047F0 24C6D7F0 */ addiu $a2, $a2, %lo(D_8090D7F0) ## $a2 = 8090D7F0 /* 078B4 809047F4 27A40038 */ addiu $a0, $sp, 0x0038 ## $a0 = FFFFFFE8 /* 078B8 809047F8 240714AD */ addiu $a3, $zero, 0x14AD ## $a3 = 000014AD -/* 078BC 809047FC 0C031AD5 */ jal func_800C6B54 +/* 078BC 809047FC 0C031AD5 */ jal Graph_CloseDisps /* 078C0 80904800 8D650000 */ lw $a1, 0x0000($t3) ## 00000000 /* 078C4 80904804 8FBF001C */ lw $ra, 0x001C($sp) .L80904808: diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_80904818.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_80904818.s index daa140f9c2..434a2c1967 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_80904818.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_80904818.s @@ -11,7 +11,7 @@ glabel func_80904818 /* 078FC 8090483C 24C6D804 */ addiu $a2, $a2, %lo(D_8090D804) ## $a2 = 8090D804 /* 07900 80904840 27A4002C */ addiu $a0, $sp, 0x002C ## $a0 = FFFFFFE4 /* 07904 80904844 240714EB */ addiu $a3, $zero, 0x14EB ## $a3 = 000014EB -/* 07908 80904848 0C031AB1 */ jal func_800C6AC4 +/* 07908 80904848 0C031AB1 */ jal Graph_OpenDisps /* 0790C 8090484C AFA5003C */ sw $a1, 0x003C($sp) /* 07910 80904850 2401000F */ addiu $at, $zero, 0x000F ## $at = 0000000F /* 07914 80904854 1601000B */ bne $s0, $at, .L80904884 @@ -95,7 +95,7 @@ glabel func_80904818 /* 07A38 80904978 3C068091 */ lui $a2, %hi(D_8090D818) ## $a2 = 80910000 /* 07A3C 8090497C 24C6D818 */ addiu $a2, $a2, %lo(D_8090D818) ## $a2 = 8090D818 /* 07A40 80904980 24071537 */ addiu $a3, $zero, 0x1537 ## $a3 = 00001537 -/* 07A44 80904984 0C031AD5 */ jal func_800C6B54 +/* 07A44 80904984 0C031AD5 */ jal Graph_CloseDisps /* 07A48 80904988 8D250000 */ lw $a1, 0x0000($t1) ## FB000000 /* 07A4C 8090498C 8FBF001C */ lw $ra, 0x001C($sp) /* 07A50 80904990 8FB00018 */ lw $s0, 0x0018($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_809049A0.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_809049A0.s index e075ceb016..e0351a6340 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_809049A0.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_809049A0.s @@ -11,7 +11,7 @@ glabel func_809049A0 /* 07A84 809049C4 24C6D82C */ addiu $a2, $a2, %lo(D_8090D82C) ## $a2 = 8090D82C /* 07A88 809049C8 27A40038 */ addiu $a0, $sp, 0x0038 ## $a0 = FFFFFFD8 /* 07A8C 809049CC 24071553 */ addiu $a3, $zero, 0x1553 ## $a3 = 00001553 -/* 07A90 809049D0 0C031AB1 */ jal func_800C6AC4 +/* 07A90 809049D0 0C031AB1 */ jal Graph_OpenDisps /* 07A94 809049D4 AFA50048 */ sw $a1, 0x0048($sp) /* 07A98 809049D8 3C018091 */ lui $at, %hi(D_8090DD3C) ## $at = 80910000 /* 07A9C 809049DC C424DD3C */ lwc1 $f4, %lo(D_8090DD3C)($at) @@ -258,7 +258,7 @@ glabel func_809049A0 /* 07E20 80904D60 24C6D868 */ addiu $a2, $a2, %lo(D_8090D868) ## $a2 = 8090D868 /* 07E24 80904D64 27A40038 */ addiu $a0, $sp, 0x0038 ## $a0 = FFFFFFD8 /* 07E28 80904D68 240715BE */ addiu $a3, $zero, 0x15BE ## $a3 = 000015BE -/* 07E2C 80904D6C 0C031AD5 */ jal func_800C6B54 +/* 07E2C 80904D6C 0C031AD5 */ jal Graph_CloseDisps /* 07E30 80904D70 8D650000 */ lw $a1, 0x0000($t3) ## 00000000 /* 07E34 80904D74 8FBF001C */ lw $ra, 0x001C($sp) /* 07E38 80904D78 8FB00018 */ lw $s0, 0x0018($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_80904D88.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_80904D88.s index 9c9d67ade5..d2d6b0bc5d 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_80904D88.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_80904D88.s @@ -18,7 +18,7 @@ glabel func_80904D88 /* 07E88 80904DC8 24C6D87C */ addiu $a2, $a2, %lo(D_8090D87C) ## $a2 = 8090D87C /* 07E8C 80904DCC 27A40074 */ addiu $a0, $sp, 0x0074 ## $a0 = FFFFFFE4 /* 07E90 80904DD0 240715C7 */ addiu $a3, $zero, 0x15C7 ## $a3 = 000015C7 -/* 07E94 80904DD4 0C031AB1 */ jal func_800C6AC4 +/* 07E94 80904DD4 0C031AB1 */ jal Graph_OpenDisps /* 07E98 80904DD8 00A09025 */ or $s2, $a1, $zero ## $s2 = 00000000 /* 07E9C 80904DDC 4480A000 */ mtc1 $zero, $f20 ## $f20 = 0.00 /* 07EA0 80904DE0 C664030C */ lwc1 $f4, 0x030C($s3) ## 0000030C @@ -133,7 +133,7 @@ glabel func_80904D88 /* 08040 80904F80 24C6D8A4 */ addiu $a2, $a2, %lo(D_8090D8A4) ## $a2 = 8090D8A4 /* 08044 80904F84 27A40074 */ addiu $a0, $sp, 0x0074 ## $a0 = FFFFFFE4 /* 08048 80904F88 240715F6 */ addiu $a3, $zero, 0x15F6 ## $a3 = 000015F6 -/* 0804C 80904F8C 0C031AD5 */ jal func_800C6B54 +/* 0804C 80904F8C 0C031AD5 */ jal Graph_CloseDisps /* 08050 80904F90 8DC50000 */ lw $a1, 0x0000($t6) ## 00000000 /* 08054 80904F94 8FBF0044 */ lw $ra, 0x0044($sp) /* 08058 80904F98 D7B40018 */ ldc1 $f20, 0x0018($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_80904FC8.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_80904FC8.s index 3b567fc25c..b1f5817577 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_80904FC8.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_80904FC8.s @@ -9,7 +9,7 @@ glabel func_80904FC8 /* 080A4 80904FE4 24C6D8B8 */ addiu $a2, $a2, %lo(D_8090D8B8) ## $a2 = 8090D8B8 /* 080A8 80904FE8 27A40048 */ addiu $a0, $sp, 0x0048 ## $a0 = FFFFFFE8 /* 080AC 80904FEC 24071600 */ addiu $a3, $zero, 0x1600 ## $a3 = 00001600 -/* 080B0 80904FF0 0C031AB1 */ jal func_800C6AC4 +/* 080B0 80904FF0 0C031AB1 */ jal Graph_OpenDisps /* 080B4 80904FF4 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 /* 080B8 80904FF8 8FAF0060 */ lw $t7, 0x0060($sp) /* 080BC 80904FFC 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 @@ -150,7 +150,7 @@ glabel func_80904FC8 /* 082D4 80905214 24C6D8F4 */ addiu $a2, $a2, %lo(D_8090D8F4) ## $a2 = 8090D8F4 /* 082D8 80905218 27A40048 */ addiu $a0, $sp, 0x0048 ## $a0 = FFFFFFE8 /* 082DC 8090521C 24071623 */ addiu $a3, $zero, 0x1623 ## $a3 = 00001623 -/* 082E0 80905220 0C031AD5 */ jal func_800C6B54 +/* 082E0 80905220 0C031AD5 */ jal Graph_CloseDisps /* 082E4 80905224 8DA50000 */ lw $a1, 0x0000($t5) ## 00000000 /* 082E8 80905228 8FBF001C */ lw $ra, 0x001C($sp) /* 082EC 8090522C 8FB00018 */ lw $s0, 0x0018($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_8090523C.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_8090523C.s index 2268184614..82082babe5 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_8090523C.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_8090523C.s @@ -23,7 +23,7 @@ glabel func_8090523C /* 08350 80905290 24C6D908 */ addiu $a2, $a2, %lo(D_8090D908) ## $a2 = 8090D908 /* 08354 80905294 27A400A4 */ addiu $a0, $sp, 0x00A4 ## $a0 = FFFFFFE4 /* 08358 80905298 2407162B */ addiu $a3, $zero, 0x162B ## $a3 = 0000162B -/* 0835C 8090529C 0C031AB1 */ jal func_800C6AC4 +/* 0835C 8090529C 0C031AB1 */ jal Graph_OpenDisps /* 08360 809052A0 00A09025 */ or $s2, $a1, $zero ## $s2 = 00000000 /* 08364 809052A4 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 /* 08368 809052A8 C606038C */ lwc1 $f6, 0x038C($s0) ## 0000038C @@ -163,7 +163,7 @@ glabel func_8090523C /* 0856C 809054AC 24C6D930 */ addiu $a2, $a2, %lo(D_8090D930) ## $a2 = 8090D930 /* 08570 809054B0 27A400A4 */ addiu $a0, $sp, 0x00A4 ## $a0 = FFFFFFE4 /* 08574 809054B4 2407165D */ addiu $a3, $zero, 0x165D ## $a3 = 0000165D -/* 08578 809054B8 0C031AD5 */ jal func_800C6B54 +/* 08578 809054B8 0C031AD5 */ jal Graph_CloseDisps /* 0857C 809054BC 8D250000 */ lw $a1, 0x0000($t1) ## 00000000 /* 08580 809054C0 8FBF006C */ lw $ra, 0x006C($sp) /* 08584 809054C4 D7B40018 */ ldc1 $f20, 0x0018($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_80905508.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_80905508.s index 0a3fcd49bf..eaee23c690 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_80905508.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_80905508.s @@ -31,7 +31,7 @@ glabel func_80905508 /* 08638 80905578 8D250000 */ lw $a1, 0x0000($t1) ## 00000000 /* 0863C 8090557C 27A40024 */ addiu $a0, $sp, 0x0024 ## $a0 = FFFFFFE4 /* 08640 80905580 24071675 */ addiu $a3, $zero, 0x1675 ## $a3 = 00001675 -/* 08644 80905584 0C031AB1 */ jal func_800C6AC4 +/* 08644 80905584 0C031AB1 */ jal Graph_OpenDisps /* 08648 80905588 AFA50034 */ sw $a1, 0x0034($sp) /* 0864C 8090558C 8FA80034 */ lw $t0, 0x0034($sp) /* 08650 80905590 3C0BDA38 */ lui $t3, 0xDA38 ## $t3 = DA380000 @@ -76,7 +76,7 @@ glabel func_80905508 /* 086EC 8090562C 24C6D96C */ addiu $a2, $a2, %lo(D_8090D96C) ## $a2 = 8090D96C /* 086F0 80905630 27A40024 */ addiu $a0, $sp, 0x0024 ## $a0 = FFFFFFE4 /* 086F4 80905634 2407167A */ addiu $a3, $zero, 0x167A ## $a3 = 0000167A -/* 086F8 80905638 0C031AD5 */ jal func_800C6B54 +/* 086F8 80905638 0C031AD5 */ jal Graph_CloseDisps /* 086FC 8090563C 8DA50000 */ lw $a1, 0x0000($t5) ## 00000008 /* 08700 80905640 10000009 */ beq $zero, $zero, .L80905668 /* 08704 80905644 8FBF0014 */ lw $ra, 0x0014($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_80905674.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_80905674.s index aaf448c567..f80a078189 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_80905674.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_80905674.s @@ -14,7 +14,7 @@ glabel func_80905674 /* 08764 809056A4 8FBF003C */ lw $ra, 0x003C($sp) /* 08768 809056A8 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 /* 0876C 809056AC 2407168C */ addiu $a3, $zero, 0x168C ## $a3 = 0000168C -/* 08770 809056B0 0C031AB1 */ jal func_800C6AC4 +/* 08770 809056B0 0C031AB1 */ jal Graph_OpenDisps /* 08774 809056B4 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 /* 08778 809056B8 0C034213 */ jal Matrix_Push /* 0877C 809056BC 00000000 */ nop @@ -51,7 +51,7 @@ glabel func_80905674 /* 087F8 80905738 AFB90024 */ sw $t9, 0x0024($sp) /* 087FC 8090573C 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 08800 80905740 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 08804 80905744 0C0253D0 */ jal Draw_TwoTexScroll +/* 08804 80905744 0C0253D0 */ jal Gfx_TwoTexScroll /* 08808 80905748 AFA20058 */ sw $v0, 0x0058($sp) /* 0880C 8090574C 8FA80058 */ lw $t0, 0x0058($sp) /* 08810 80905750 3C0BFA00 */ lui $t3, 0xFA00 ## $t3 = FA000000 @@ -151,7 +151,7 @@ glabel func_80905674 /* 08988 809058C8 24C6D9A8 */ addiu $a2, $a2, %lo(D_8090D9A8) ## $a2 = 8090D9A8 /* 0898C 809058CC 27A40060 */ addiu $a0, $sp, 0x0060 ## $a0 = FFFFFFE8 /* 08990 809058D0 240716B9 */ addiu $a3, $zero, 0x16B9 ## $a3 = 000016B9 -/* 08994 809058D4 0C031AD5 */ jal func_800C6B54 +/* 08994 809058D4 0C031AD5 */ jal Graph_CloseDisps /* 08998 809058D8 8F250000 */ lw $a1, 0x0000($t9) ## 00000000 /* 0899C 809058DC 8FBF003C */ lw $ra, 0x003C($sp) .L809058E0: diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_809060E8.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_809060E8.s index ef2c94d314..6eb73bc2c9 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_809060E8.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_809060E8.s @@ -24,7 +24,7 @@ glabel func_809060E8 /* 09200 80906140 27A400AC */ addiu $a0, $sp, 0x00AC ## $a0 = FFFFFFDC /* 09204 80906144 24C6D9F8 */ addiu $a2, $a2, %lo(D_8090D9F8) ## $a2 = 8090D9F8 /* 09208 80906148 240717C6 */ addiu $a3, $zero, 0x17C6 ## $a3 = 000017C6 -/* 0920C 8090614C 0C031AB1 */ jal func_800C6AC4 +/* 0920C 8090614C 0C031AB1 */ jal Graph_OpenDisps /* 09210 80906150 00A09025 */ or $s2, $a1, $zero ## $s2 = 00000000 /* 09214 80906154 0C024F46 */ jal func_80093D18 /* 09218 80906158 8EA40000 */ lw $a0, 0x0000($s5) ## 00000000 @@ -107,7 +107,7 @@ glabel func_809060E8 /* 09348 80906288 AFAC0010 */ sw $t4, 0x0010($sp) /* 0934C 8090628C 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 09350 80906290 24070020 */ addiu $a3, $zero, 0x0020 ## $a3 = 00000020 -/* 09354 80906294 0C0253A7 */ jal Draw_TexScroll +/* 09354 80906294 0C0253A7 */ jal Gfx_TexScroll /* 09358 80906298 00408025 */ or $s0, $v0, $zero ## $s0 = 00000000 /* 0935C 8090629C AE020004 */ sw $v0, 0x0004($s0) ## 00000004 /* 09360 809062A0 8E4202C0 */ lw $v0, 0x02C0($s2) ## 000002C0 @@ -266,7 +266,7 @@ glabel func_809060E8 /* 095A8 809064E8 24C6DA48 */ addiu $a2, $a2, %lo(D_8090DA48) ## $a2 = 8090DA48 /* 095AC 809064EC 27A400AC */ addiu $a0, $sp, 0x00AC ## $a0 = FFFFFFDC /* 095B0 809064F0 8EA50000 */ lw $a1, 0x0000($s5) ## 00000000 -/* 095B4 809064F4 0C031AD5 */ jal func_800C6B54 +/* 095B4 809064F4 0C031AD5 */ jal Graph_CloseDisps /* 095B8 809064F8 24071829 */ addiu $a3, $zero, 0x1829 ## $a3 = 00001829 /* 095BC 809064FC 8FBF005C */ lw $ra, 0x005C($sp) /* 095C0 80906500 D7B40020 */ ldc1 $f20, 0x0020($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_80906AB0.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_80906AB0.s index cfa5a826b5..e2c83e08a3 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_80906AB0.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_80906AB0.s @@ -10,7 +10,7 @@ glabel func_80906AB0 /* 09B90 80906AD0 24C6DA5C */ addiu $a2, $a2, %lo(D_8090DA5C) ## $a2 = 8090DA5C /* 09B94 80906AD4 27A40058 */ addiu $a0, $sp, 0x0058 ## $a0 = FFFFFFE0 /* 09B98 80906AD8 2407191E */ addiu $a3, $zero, 0x191E ## $a3 = 0000191E -/* 09B9C 80906ADC 0C031AB1 */ jal func_800C6AC4 +/* 09B9C 80906ADC 0C031AB1 */ jal Graph_OpenDisps /* 09BA0 80906AE0 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 09BA4 80906AE4 8FAF0080 */ lw $t7, 0x0080($sp) /* 09BA8 80906AE8 0C024F46 */ jal func_80093D18 @@ -156,7 +156,7 @@ glabel func_80906AB0 /* 09DD0 80906D10 24C6DA84 */ addiu $a2, $a2, %lo(D_8090DA84) ## $a2 = 8090DA84 /* 09DD4 80906D14 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 09DD8 80906D18 2407194F */ addiu $a3, $zero, 0x194F ## $a3 = 0000194F -/* 09DDC 80906D1C 0C031AD5 */ jal func_800C6B54 +/* 09DDC 80906D1C 0C031AD5 */ jal Graph_CloseDisps /* 09DE0 80906D20 AC590004 */ sw $t9, 0x0004($v0) ## 00000004 /* 09DE4 80906D24 8FBF001C */ lw $ra, 0x001C($sp) /* 09DE8 80906D28 8FB00018 */ lw $s0, 0x0018($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/BossGanondrof_Destroy.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/BossGanondrof_Destroy.s index 8a3b395b48..f47300fd79 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/BossGanondrof_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/BossGanondrof_Destroy.s @@ -1,42 +1,42 @@ glabel BossGanondrof_Destroy /* 006BC 80910CFC 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 006C0 80910D00 AFB00014 */ sw $s0, 0x0014($sp) +/* 006C0 80910D00 AFB00014 */ sw $s0, 0x0014($sp) /* 006C4 80910D04 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 006C8 80910D08 AFBF001C */ sw $ra, 0x001C($sp) -/* 006CC 80910D0C AFB10018 */ sw $s1, 0x0018($sp) +/* 006C8 80910D08 AFBF001C */ sw $ra, 0x001C($sp) +/* 006CC 80910D0C AFB10018 */ sw $s1, 0x0018($sp) /* 006D0 80910D10 3C048091 */ lui $a0, %hi(D_80915140) ## $a0 = 80910000 /* 006D4 80910D14 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 /* 006D8 80910D18 0C00084C */ jal osSyncPrintf - + /* 006DC 80910D1C 24845140 */ addiu $a0, $a0, %lo(D_80915140) ## $a0 = 80915140 /* 006E0 80910D20 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C -/* 006E4 80910D24 0C0295BC */ jal func_800A56F0 +/* 006E4 80910D24 0C0295BC */ jal SkelAnime_Free /* 006E8 80910D28 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 /* 006EC 80910D2C 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 006F0 80910D30 0C0170EB */ jal ActorCollider_FreeCylinder - + /* 006F4 80910D34 260504E0 */ addiu $a1, $s0, 0x04E0 ## $a1 = 000004E0 /* 006F8 80910D38 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 006FC 80910D3C 0C0170EB */ jal ActorCollider_FreeCylinder - + /* 00700 80910D40 2605052C */ addiu $a1, $s0, 0x052C ## $a1 = 0000052C /* 00704 80910D44 860E001C */ lh $t6, 0x001C($s0) ## 0000001C /* 00708 80910D48 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 /* 0070C 80910D4C 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 00710 80910D50 15C10003 */ bne $t6, $at, .L80910D60 +/* 00710 80910D50 15C10003 */ bne $t6, $at, .L80910D60 /* 00714 80910D54 262507A8 */ addiu $a1, $s1, 0x07A8 ## $a1 = 000007A8 /* 00718 80910D58 0C01E9F1 */ jal Lights_Remove - + /* 0071C 80910D5C 8E0604CC */ lw $a2, 0x04CC($s0) ## 000004CC .L80910D60: /* 00720 80910D60 3C048091 */ lui $a0, %hi(D_80915148) ## $a0 = 80910000 /* 00724 80910D64 0C00084C */ jal osSyncPrintf - + /* 00728 80910D68 24845148 */ addiu $a0, $a0, %lo(D_80915148) ## $a0 = 80915148 -/* 0072C 80910D6C 8FBF001C */ lw $ra, 0x001C($sp) -/* 00730 80910D70 8FB00014 */ lw $s0, 0x0014($sp) -/* 00734 80910D74 8FB10018 */ lw $s1, 0x0018($sp) -/* 00738 80910D78 03E00008 */ jr $ra +/* 0072C 80910D6C 8FBF001C */ lw $ra, 0x001C($sp) +/* 00730 80910D70 8FB00014 */ lw $s0, 0x0014($sp) +/* 00734 80910D74 8FB10018 */ lw $s1, 0x0018($sp) +/* 00738 80910D78 03E00008 */ jr $ra /* 0073C 80910D7C 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/BossGanondrof_Draw.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/BossGanondrof_Draw.s index 14059ec16a..be43b821a1 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/BossGanondrof_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/BossGanondrof_Draw.s @@ -10,7 +10,7 @@ glabel BossGanondrof_Draw /* 04224 80914864 24C65370 */ addiu $a2, $a2, %lo(D_80915370) ## $a2 = 80915370 /* 04228 80914868 27A40040 */ addiu $a0, $sp, 0x0040 ## $a0 = FFFFFFE0 /* 0422C 8091486C 24070E84 */ addiu $a3, $zero, 0x0E84 ## $a3 = 00000E84 -/* 04230 80914870 0C031AB1 */ jal func_800C6AC4 +/* 04230 80914870 0C031AB1 */ jal Graph_OpenDisps /* 04234 80914874 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 /* 04238 80914878 3C048091 */ lui $a0, %hi(D_80915388) ## $a0 = 80910000 /* 0423C 8091487C 24845388 */ addiu $a0, $a0, %lo(D_80915388) ## $a0 = 80915388 @@ -67,7 +67,7 @@ glabel BossGanondrof_Draw /* 042F8 80914938 AFA00010 */ sw $zero, 0x0010($sp) /* 042FC 8091493C 240500FF */ addiu $a1, $zero, 0x00FF ## $a1 = 000000FF /* 04300 80914940 24060032 */ addiu $a2, $zero, 0x0032 ## $a2 = 00000032 -/* 04304 80914944 0C024CDC */ jal func_80093370 +/* 04304 80914944 0C024CDC */ jal Gfx_SetFog /* 04308 80914948 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 /* 0430C 8091494C 10000076 */ beq $zero, $zero, .L80914B28 /* 04310 80914950 AE0202C0 */ sw $v0, 0x02C0($s0) ## 000002C0 @@ -195,7 +195,7 @@ glabel BossGanondrof_Draw /* 044D0 80914B10 44098000 */ mfc1 $t1, $f16 /* 044D4 80914B14 00000000 */ nop /* 044D8 80914B18 252A03E8 */ addiu $t2, $t1, 0x03E8 ## $t2 = 000003E8 -/* 044DC 80914B1C 0C024CDC */ jal func_80093370 +/* 044DC 80914B1C 0C024CDC */ jal Gfx_SetFog /* 044E0 80914B20 AFAA0018 */ sw $t2, 0x0018($sp) /* 044E4 80914B24 AE0202C0 */ sw $v0, 0x02C0($s0) ## 000002C0 .L80914B28: @@ -289,7 +289,7 @@ glabel BossGanondrof_Draw /* 0462C 80914C6C 24C653E4 */ addiu $a2, $a2, %lo(D_809153E4) ## $a2 = 809153E4 /* 04630 80914C70 27A40040 */ addiu $a0, $sp, 0x0040 ## $a0 = FFFFFFE0 /* 04634 80914C74 24070EE6 */ addiu $a3, $zero, 0x0EE6 ## $a3 = 00000EE6 -/* 04638 80914C78 0C031AD5 */ jal func_800C6B54 +/* 04638 80914C78 0C031AD5 */ jal Graph_CloseDisps /* 0463C 80914C7C 8DC50000 */ lw $a1, 0x0000($t6) ## 00000000 /* 04640 80914C80 3C048091 */ lui $a0, %hi(D_809153FC) ## $a0 = 80910000 /* 04644 80914C84 248453FC */ addiu $a0, $a0, %lo(D_809153FC) ## $a0 = 809153FC diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_80910D80.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_80910D80.s index 2db1562113..2ae6006723 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_80910D80.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_80910D80.s @@ -1,22 +1,22 @@ glabel func_80910D80 /* 00740 80910D80 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00744 80910D84 AFA5001C */ sw $a1, 0x001C($sp) -/* 00748 80910D88 AFBF0014 */ sw $ra, 0x0014($sp) +/* 00744 80910D84 AFA5001C */ sw $a1, 0x001C($sp) +/* 00748 80910D88 AFBF0014 */ sw $ra, 0x0014($sp) /* 0074C 80910D8C 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 /* 00750 80910D90 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 00754 80910D94 24A519A4 */ addiu $a1, $a1, 0x19A4 ## $a1 = 060019A4 -/* 00758 80910D98 AFA60018 */ sw $a2, 0x0018($sp) -/* 0075C 80910D9C 0C0294BE */ jal func_800A52F8 +/* 00758 80910D98 AFA60018 */ sw $a2, 0x0018($sp) +/* 0075C 80910D9C 0C0294BE */ jal SkelAnime_ChangeAnimDefaultRepeat /* 00760 80910DA0 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 00764 80910DA4 8FA60018 */ lw $a2, 0x0018($sp) +/* 00764 80910DA4 8FA60018 */ lw $a2, 0x0018($sp) /* 00768 80910DA8 3C0E8091 */ lui $t6, %hi(func_80910DCC) ## $t6 = 80910000 /* 0076C 80910DAC 25CE0DCC */ addiu $t6, $t6, %lo(func_80910DCC) ## $t6 = 80910DCC /* 00770 80910DB0 240F0001 */ addiu $t7, $zero, 0x0001 ## $t7 = 00000001 /* 00774 80910DB4 ACCE0190 */ sw $t6, 0x0190($a2) ## 00000190 /* 00778 80910DB8 A4CF01A8 */ sh $t7, 0x01A8($a2) ## 000001A8 -/* 0077C 80910DBC 8FBF0014 */ lw $ra, 0x0014($sp) +/* 0077C 80910DBC 8FBF0014 */ lw $ra, 0x0014($sp) /* 00780 80910DC0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00784 80910DC4 03E00008 */ jr $ra +/* 00784 80910DC4 03E00008 */ jr $ra /* 00788 80910DC8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_80910DCC.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_80910DCC.s index 1197a0e779..8814e33196 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_80910DCC.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_80910DCC.s @@ -1,21 +1,21 @@ glabel func_80910DCC /* 0078C 80910DCC 27BDFF60 */ addiu $sp, $sp, 0xFF60 ## $sp = FFFFFF60 -/* 00790 80910DD0 AFBF0054 */ sw $ra, 0x0054($sp) -/* 00794 80910DD4 AFB30050 */ sw $s3, 0x0050($sp) -/* 00798 80910DD8 AFB2004C */ sw $s2, 0x004C($sp) -/* 0079C 80910DDC AFB10048 */ sw $s1, 0x0048($sp) -/* 007A0 80910DE0 AFB00044 */ sw $s0, 0x0044($sp) -/* 007A4 80910DE4 F7B60038 */ sdc1 $f22, 0x0038($sp) -/* 007A8 80910DE8 F7B40030 */ sdc1 $f20, 0x0030($sp) -/* 007AC 80910DEC AFA500A4 */ sw $a1, 0x00A4($sp) +/* 00790 80910DD0 AFBF0054 */ sw $ra, 0x0054($sp) +/* 00794 80910DD4 AFB30050 */ sw $s3, 0x0050($sp) +/* 00798 80910DD8 AFB2004C */ sw $s2, 0x004C($sp) +/* 0079C 80910DDC AFB10048 */ sw $s1, 0x0048($sp) +/* 007A0 80910DE0 AFB00044 */ sw $s0, 0x0044($sp) +/* 007A4 80910DE4 F7B60038 */ sdc1 $f22, 0x0038($sp) +/* 007A8 80910DE8 F7B40030 */ sdc1 $f20, 0x0030($sp) +/* 007AC 80910DEC AFA500A4 */ sw $a1, 0x00A4($sp) /* 007B0 80910DF0 8C8E011C */ lw $t6, 0x011C($a0) ## 0000011C /* 007B4 80910DF4 00809825 */ or $s3, $a0, $zero ## $s3 = 00000000 /* 007B8 80910DF8 2491014C */ addiu $s1, $a0, 0x014C ## $s1 = 0000014C /* 007BC 80910DFC 02202025 */ or $a0, $s1, $zero ## $a0 = 0000014C /* 007C0 80910E00 0C02927F */ jal SkelAnime_FrameUpdateMatrix - -/* 007C4 80910E04 AFAE0094 */ sw $t6, 0x0094($sp) -/* 007C8 80910E08 8FA60094 */ lw $a2, 0x0094($sp) + +/* 007C4 80910E04 AFAE0094 */ sw $t6, 0x0094($sp) +/* 007C8 80910E08 8FA60094 */ lw $a2, 0x0094($sp) /* 007CC 80910E0C 3C048091 */ lui $a0, %hi(D_80915150) ## $a0 = 80910000 /* 007D0 80910E10 24845150 */ addiu $a0, $a0, %lo(D_80915150) ## $a0 = 80915150 /* 007D4 80910E14 8CD80024 */ lw $t8, 0x0024($a2) ## 00000024 @@ -28,12 +28,12 @@ glabel func_80910DCC /* 007F0 80910E30 A6630032 */ sh $v1, 0x0032($s3) ## 00000032 /* 007F4 80910E34 A66300B6 */ sh $v1, 0x00B6($s3) ## 000000B6 /* 007F8 80910E38 0C00084C */ jal osSyncPrintf - + /* 007FC 80910E3C 90C5014C */ lbu $a1, 0x014C($a2) ## 0000014C /* 00800 80910E40 866201BE */ lh $v0, 0x01BE($s3) ## 000001BE -/* 00804 80910E44 1040003B */ beq $v0, $zero, .L80910F34 -/* 00808 80910E48 28410019 */ slti $at, $v0, 0x0019 -/* 0080C 80910E4C 10200039 */ beq $at, $zero, .L80910F34 +/* 00804 80910E44 1040003B */ beq $v0, $zero, .L80910F34 +/* 00808 80910E48 28410019 */ slti $at, $v0, 0x0019 +/* 0080C 80910E4C 10200039 */ beq $at, $zero, .L80910F34 /* 00810 80910E50 3C198091 */ lui $t9, %hi(D_809150A0) ## $t9 = 80910000 /* 00814 80910E54 273950A0 */ addiu $t9, $t9, %lo(D_809150A0) ## $t9 = 809150A0 /* 00818 80910E58 8F290000 */ lw $t1, 0x0000($t9) ## 809150A0 @@ -49,160 +49,160 @@ glabel func_80910DCC /* 00840 80910E80 4481A000 */ mtc1 $at, $f20 ## $f20 = 10.00 /* 00844 80910E84 AE090008 */ sw $t1, 0x0008($s0) ## FFFFFFE4 /* 00848 80910E88 8D4C0000 */ lw $t4, 0x0000($t2) ## 809150AC -/* 0084C 80910E8C 4600A306 */ mov.s $f12, $f20 +/* 0084C 80910E8C 4600A306 */ mov.s $f12, $f20 /* 00850 80910E90 AE4C0000 */ sw $t4, 0x0000($s2) ## FFFFFFD0 /* 00854 80910E94 8D4B0004 */ lw $t3, 0x0004($t2) ## 809150B0 /* 00858 80910E98 AE4B0004 */ sw $t3, 0x0004($s2) ## FFFFFFD4 /* 0085C 80910E9C 8D4C0008 */ lw $t4, 0x0008($t2) ## 809150B4 /* 00860 80910EA0 0C00CFC8 */ jal Math_Rand_CenteredFloat - + /* 00864 80910EA4 AE4C0008 */ sw $t4, 0x0008($s2) ## FFFFFFD8 /* 00868 80910EA8 C66402C0 */ lwc1 $f4, 0x02C0($s3) ## 000002C0 /* 0086C 80910EAC 3C01C0A0 */ lui $at, 0xC0A0 ## $at = C0A00000 /* 00870 80910EB0 44816000 */ mtc1 $at, $f12 ## $f12 = -5.00 -/* 00874 80910EB4 46040180 */ add.s $f6, $f0, $f4 +/* 00874 80910EB4 46040180 */ add.s $f6, $f0, $f4 /* 00878 80910EB8 0C00CFBE */ jal Math_Rand_ZeroFloat - -/* 0087C 80910EBC E7A60088 */ swc1 $f6, 0x0088($sp) + +/* 0087C 80910EBC E7A60088 */ swc1 $f6, 0x0088($sp) /* 00880 80910EC0 C66802C4 */ lwc1 $f8, 0x02C4($s3) ## 000002C4 -/* 00884 80910EC4 4600A306 */ mov.s $f12, $f20 -/* 00888 80910EC8 46080280 */ add.s $f10, $f0, $f8 +/* 00884 80910EC4 4600A306 */ mov.s $f12, $f20 +/* 00888 80910EC8 46080280 */ add.s $f10, $f0, $f8 /* 0088C 80910ECC 0C00CFC8 */ jal Math_Rand_CenteredFloat - -/* 00890 80910ED0 E7AA008C */ swc1 $f10, 0x008C($sp) + +/* 00890 80910ED0 E7AA008C */ swc1 $f10, 0x008C($sp) /* 00894 80910ED4 C67002C8 */ lwc1 $f16, 0x02C8($s3) ## 000002C8 /* 00898 80910ED8 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 /* 0089C 80910EDC 44812000 */ mtc1 $at, $f4 ## $f4 = 5.00 -/* 008A0 80910EE0 46100480 */ add.s $f18, $f0, $f16 +/* 008A0 80910EE0 46100480 */ add.s $f18, $f0, $f16 /* 008A4 80910EE4 3C018091 */ lui $at, %hi(D_80915414) ## $at = 80910000 -/* 008A8 80910EE8 C4285414 */ lwc1 $f8, %lo(D_80915414)($at) -/* 008AC 80910EEC 4600A306 */ mov.s $f12, $f20 -/* 008B0 80910EF0 46049180 */ add.s $f6, $f18, $f4 -/* 008B4 80910EF4 E7A80074 */ swc1 $f8, 0x0074($sp) +/* 008A8 80910EE8 C4285414 */ lwc1 $f8, %lo(D_80915414)($at) +/* 008AC 80910EEC 4600A306 */ mov.s $f12, $f20 +/* 008B0 80910EF0 46049180 */ add.s $f6, $f18, $f4 +/* 008B4 80910EF4 E7A80074 */ swc1 $f8, 0x0074($sp) /* 008B8 80910EF8 0C00CFBE */ jal Math_Rand_ZeroFloat - -/* 008BC 80910EFC E7A60090 */ swc1 $f6, 0x0090($sp) -/* 008C0 80910F00 4600028D */ trunc.w.s $f10, $f0 -/* 008C4 80910F04 8FA400A4 */ lw $a0, 0x00A4($sp) + +/* 008BC 80910EFC E7A60090 */ swc1 $f6, 0x0090($sp) +/* 008C0 80910F00 4600028D */ trunc.w.s $f10, $f0 +/* 008C4 80910F04 8FA400A4 */ lw $a0, 0x00A4($sp) /* 008C8 80910F08 27A50088 */ addiu $a1, $sp, 0x0088 ## $a1 = FFFFFFE8 /* 008CC 80910F0C 02003025 */ or $a2, $s0, $zero ## $a2 = FFFFFFDC -/* 008D0 80910F10 440E5000 */ mfc1 $t6, $f10 +/* 008D0 80910F10 440E5000 */ mfc1 $t6, $f10 /* 008D4 80910F14 02403825 */ or $a3, $s2, $zero ## $a3 = FFFFFFD0 -/* 008D8 80910F18 AFA00014 */ sw $zero, 0x0014($sp) -/* 008DC 80910F1C 000E7C00 */ sll $t7, $t6, 16 -/* 008E0 80910F20 000FC403 */ sra $t8, $t7, 16 +/* 008D8 80910F18 AFA00014 */ sw $zero, 0x0014($sp) +/* 008DC 80910F1C 000E7C00 */ sll $t7, $t6, 16 +/* 008E0 80910F20 000FC403 */ sra $t8, $t7, 16 /* 008E4 80910F24 27190005 */ addiu $t9, $t8, 0x0005 ## $t9 = 00000005 -/* 008E8 80910F28 0C00A76F */ jal func_80029DBC -/* 008EC 80910F2C AFB90010 */ sw $t9, 0x0010($sp) +/* 008E8 80910F28 0C00A76F */ jal func_80029DBC +/* 008EC 80910F2C AFB90010 */ sw $t9, 0x0010($sp) /* 008F0 80910F30 866201BE */ lh $v0, 0x01BE($s3) ## 000001BE .L80910F34: /* 008F4 80910F34 24010014 */ addiu $at, $zero, 0x0014 ## $at = 00000014 -/* 008F8 80910F38 54410004 */ bnel $v0, $at, .L80910F4C +/* 008F8 80910F38 54410004 */ bnel $v0, $at, .L80910F4C /* 008FC 80910F3C 2401001E */ addiu $at, $zero, 0x001E ## $at = 0000001E /* 00900 80910F40 A66001A8 */ sh $zero, 0x01A8($s3) ## 000001A8 /* 00904 80910F44 866201BE */ lh $v0, 0x01BE($s3) ## 000001BE /* 00908 80910F48 2401001E */ addiu $at, $zero, 0x001E ## $at = 0000001E .L80910F4C: -/* 0090C 80910F4C 14410004 */ bne $v0, $at, .L80910F60 +/* 0090C 80910F4C 14410004 */ bne $v0, $at, .L80910F60 /* 00910 80910F50 3C048091 */ lui $a0, %hi(D_80915094) ## $a0 = 80910000 /* 00914 80910F54 24845094 */ addiu $a0, $a0, %lo(D_80915094) ## $a0 = 80915094 -/* 00918 80910F58 0C01E245 */ jal func_80078914 +/* 00918 80910F58 0C01E245 */ jal func_80078914 /* 0091C 80910F5C 240538A1 */ addiu $a1, $zero, 0x38A1 ## $a1 = 000038A1 .L80910F60: -/* 00920 80910F60 8FA80094 */ lw $t0, 0x0094($sp) +/* 00920 80910F60 8FA80094 */ lw $t0, 0x0094($sp) /* 00924 80910F64 24010003 */ addiu $at, $zero, 0x0003 ## $at = 00000003 /* 00928 80910F68 3C100600 */ lui $s0, 0x0600 ## $s0 = 06000000 /* 0092C 80910F6C 9103014C */ lbu $v1, 0x014C($t0) ## 0000014C /* 00930 80910F70 26101144 */ addiu $s0, $s0, 0x1144 ## $s0 = 06001144 -/* 00934 80910F74 54610014 */ bnel $v1, $at, .L80910FC8 +/* 00934 80910F74 54610014 */ bnel $v1, $at, .L80910FC8 /* 00938 80910F78 24120002 */ addiu $s2, $zero, 0x0002 ## $s2 = 00000002 /* 0093C 80910F7C 0C028800 */ jal SkelAnime_GetFrameCount - + /* 00940 80910F80 02002025 */ or $a0, $s0, $zero ## $a0 = 06001144 /* 00944 80910F84 44828000 */ mtc1 $v0, $f16 ## $f16 = 0.00 /* 00948 80910F88 4480B000 */ mtc1 $zero, $f22 ## $f22 = 0.00 /* 0094C 80910F8C 24090003 */ addiu $t1, $zero, 0x0003 ## $t1 = 00000003 -/* 00950 80910F90 468084A0 */ cvt.s.w $f18, $f16 -/* 00954 80910F94 4407B000 */ mfc1 $a3, $f22 -/* 00958 80910F98 AFA90014 */ sw $t1, 0x0014($sp) +/* 00950 80910F90 468084A0 */ cvt.s.w $f18, $f16 +/* 00954 80910F94 4407B000 */ mfc1 $a3, $f22 +/* 00958 80910F98 AFA90014 */ sw $t1, 0x0014($sp) /* 0095C 80910F9C 02202025 */ or $a0, $s1, $zero ## $a0 = 0000014C /* 00960 80910FA0 02002825 */ or $a1, $s0, $zero ## $a1 = 06001144 /* 00964 80910FA4 3C063F00 */ lui $a2, 0x3F00 ## $a2 = 3F000000 -/* 00968 80910FA8 E7B20010 */ swc1 $f18, 0x0010($sp) -/* 0096C 80910FAC 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 00970 80910FB0 E7B60018 */ swc1 $f22, 0x0018($sp) +/* 00968 80910FA8 E7B20010 */ swc1 $f18, 0x0010($sp) +/* 0096C 80910FAC 0C029468 */ jal SkelAnime_ChangeAnim + +/* 00970 80910FB0 E7B60018 */ swc1 $f22, 0x0018($sp) /* 00974 80910FB4 240A0028 */ addiu $t2, $zero, 0x0028 ## $t2 = 00000028 /* 00978 80910FB8 A66A01BE */ sh $t2, 0x01BE($s3) ## 000001BE -/* 0097C 80910FBC 8FAB0094 */ lw $t3, 0x0094($sp) +/* 0097C 80910FBC 8FAB0094 */ lw $t3, 0x0094($sp) /* 00980 80910FC0 9163014C */ lbu $v1, 0x014C($t3) ## 0000014C /* 00984 80910FC4 24120002 */ addiu $s2, $zero, 0x0002 ## $s2 = 00000002 .L80910FC8: /* 00988 80910FC8 4480B000 */ mtc1 $zero, $f22 ## $f22 = 0.00 -/* 0098C 80910FCC 16430007 */ bne $s2, $v1, .L80910FEC +/* 0098C 80910FCC 16430007 */ bne $s2, $v1, .L80910FEC /* 00990 80910FD0 02202025 */ or $a0, $s1, $zero ## $a0 = 0000014C /* 00994 80910FD4 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 00998 80910FD8 24A52684 */ addiu $a1, $a1, 0x2684 ## $a1 = 06002684 -/* 0099C 80910FDC 0C029490 */ jal func_800A5240 +/* 0099C 80910FDC 0C029490 */ jal SkelAnime_ChangeAnimTransitionStop /* 009A0 80910FE0 3C06C040 */ lui $a2, 0xC040 ## $a2 = C0400000 -/* 009A4 80910FE4 8FAC0094 */ lw $t4, 0x0094($sp) +/* 009A4 80910FE4 8FAC0094 */ lw $t4, 0x0094($sp) /* 009A8 80910FE8 9183014C */ lbu $v1, 0x014C($t4) ## 0000014C .L80910FEC: /* 009AC 80910FEC 24010005 */ addiu $at, $zero, 0x0005 ## $at = 00000005 -/* 009B0 80910FF0 14610007 */ bne $v1, $at, .L80911010 +/* 009B0 80910FF0 14610007 */ bne $v1, $at, .L80911010 /* 009B4 80910FF4 02202025 */ or $a0, $s1, $zero ## $a0 = 0000014C /* 009B8 80910FF8 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 009BC 80910FFC 24A519A4 */ addiu $a1, $a1, 0x19A4 ## $a1 = 060019A4 -/* 009C0 80911000 0C0294D3 */ jal func_800A534C +/* 009C0 80911000 0C0294D3 */ jal SkelAnime_ChangeAnimTransitionRepeat /* 009C4 80911004 3C06C150 */ lui $a2, 0xC150 ## $a2 = C1500000 -/* 009C8 80911008 8FAD0094 */ lw $t5, 0x0094($sp) +/* 009C8 80911008 8FAD0094 */ lw $t5, 0x0094($sp) /* 009CC 8091100C 91A3014C */ lbu $v1, 0x014C($t5) ## 0000014C .L80911010: /* 009D0 80911010 2401000A */ addiu $at, $zero, 0x000A ## $at = 0000000A -/* 009D4 80911014 1461001A */ bne $v1, $at, .L80911080 +/* 009D4 80911014 1461001A */ bne $v1, $at, .L80911080 /* 009D8 80911018 02202025 */ or $a0, $s1, $zero ## $a0 = 0000014C /* 009DC 8091101C 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 /* 009E0 80911020 24A5D99C */ addiu $a1, $a1, 0xD99C ## $a1 = 0600D99C -/* 009E4 80911024 0C029490 */ jal func_800A5240 +/* 009E4 80911024 0C029490 */ jal SkelAnime_ChangeAnimTransitionStop /* 009E8 80911028 3C06C0E0 */ lui $a2, 0xC0E0 ## $a2 = C0E00000 /* 009EC 8091102C C6640200 */ lwc1 $f4, 0x0200($s3) ## 00000200 /* 009F0 80911030 8E70011C */ lw $s0, 0x011C($s3) ## 0000011C -/* 009F4 80911034 8FA600A4 */ lw $a2, 0x00A4($sp) -/* 009F8 80911038 E7A40010 */ swc1 $f4, 0x0010($sp) +/* 009F4 80911034 8FA600A4 */ lw $a2, 0x00A4($sp) +/* 009F8 80911038 E7A40010 */ swc1 $f4, 0x0010($sp) /* 009FC 8091103C C6660204 */ lwc1 $f6, 0x0204($s3) ## 00000204 /* 00A00 80911040 240F0032 */ addiu $t7, $zero, 0x0032 ## $t7 = 00000032 /* 00A04 80911044 24180026 */ addiu $t8, $zero, 0x0026 ## $t8 = 00000026 -/* 00A08 80911048 E7A60014 */ swc1 $f6, 0x0014($sp) +/* 00A08 80911048 E7A60014 */ swc1 $f6, 0x0014($sp) /* 00A0C 8091104C C6680208 */ lwc1 $f8, 0x0208($s3) ## 00000208 -/* 00A10 80911050 AFB80028 */ sw $t8, 0x0028($sp) -/* 00A14 80911054 AFA00024 */ sw $zero, 0x0024($sp) -/* 00A18 80911058 AFA00020 */ sw $zero, 0x0020($sp) -/* 00A1C 8091105C AFAF001C */ sw $t7, 0x001C($sp) +/* 00A10 80911050 AFB80028 */ sw $t8, 0x0028($sp) +/* 00A14 80911054 AFA00024 */ sw $zero, 0x0024($sp) +/* 00A18 80911058 AFA00020 */ sw $zero, 0x0020($sp) +/* 00A1C 8091105C AFAF001C */ sw $t7, 0x001C($sp) /* 00A20 80911060 02602825 */ or $a1, $s3, $zero ## $a1 = 00000000 /* 00A24 80911064 2407006D */ addiu $a3, $zero, 0x006D ## $a3 = 0000006D /* 00A28 80911068 24C41C24 */ addiu $a0, $a2, 0x1C24 ## $a0 = 00001C24 /* 00A2C 8091106C 0C00C916 */ jal Actor_SpawnAttached - -/* 00A30 80911070 E7A80018 */ swc1 $f8, 0x0018($sp) + +/* 00A30 80911070 E7A80018 */ swc1 $f8, 0x0018($sp) /* 00A34 80911074 AE70011C */ sw $s0, 0x011C($s3) ## 0000011C -/* 00A38 80911078 8FB90094 */ lw $t9, 0x0094($sp) +/* 00A38 80911078 8FB90094 */ lw $t9, 0x0094($sp) /* 00A3C 8091107C 9323014C */ lbu $v1, 0x014C($t9) ## 0000014C .L80911080: /* 00A40 80911080 2401000B */ addiu $at, $zero, 0x000B ## $at = 0000000B -/* 00A44 80911084 14610005 */ bne $v1, $at, .L8091109C +/* 00A44 80911084 14610005 */ bne $v1, $at, .L8091109C /* 00A48 80911088 02202025 */ or $a0, $s1, $zero ## $a0 = 0000014C /* 00A4C 8091108C 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 /* 00A50 80911090 24A5DF80 */ addiu $a1, $a1, 0xDF80 ## $a1 = 0600DF80 -/* 00A54 80911094 0C029490 */ jal func_800A5240 +/* 00A54 80911094 0C029490 */ jal SkelAnime_ChangeAnimTransitionStop /* 00A58 80911098 3C06C0A0 */ lui $a2, 0xC0A0 ## $a2 = C0A00000 .L8091109C: /* 00A5C 8091109C 866201AA */ lh $v0, 0x01AA($s3) ## 000001AA /* 00A60 809110A0 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 00A64 809110A4 50410006 */ beql $v0, $at, .L809110C0 +/* 00A64 809110A4 50410006 */ beql $v0, $at, .L809110C0 /* 00A68 809110A8 3C01437F */ lui $at, 0x437F ## $at = 437F0000 -/* 00A6C 809110AC 10520011 */ beq $v0, $s2, .L809110F4 +/* 00A6C 809110AC 10520011 */ beq $v0, $s2, .L809110F4 /* 00A70 809110B0 3C01437F */ lui $at, 0x437F ## $at = 437F0000 -/* 00A74 809110B4 1000001C */ beq $zero, $zero, .L80911128 +/* 00A74 809110B4 1000001C */ beq $zero, $zero, .L80911128 /* 00A78 809110B8 86640194 */ lh $a0, 0x0194($s3) ## 00000194 /* 00A7C 809110BC 3C01437F */ lui $at, 0x437F ## $at = 437F0000 .L809110C0: @@ -210,128 +210,128 @@ glabel func_80910DCC /* 00A84 809110C4 3C014220 */ lui $at, 0x4220 ## $at = 42200000 /* 00A88 809110C8 44818000 */ mtc1 $at, $f16 ## $f16 = 40.00 /* 00A8C 809110CC C66A01E0 */ lwc1 $f10, 0x01E0($s3) ## 000001E0 -/* 00A90 809110D0 46105480 */ add.s $f18, $f10, $f16 +/* 00A90 809110D0 46105480 */ add.s $f18, $f10, $f16 /* 00A94 809110D4 E67201E0 */ swc1 $f18, 0x01E0($s3) ## 000001E0 /* 00A98 809110D8 C66401E0 */ lwc1 $f4, 0x01E0($s3) ## 000001E0 -/* 00A9C 809110DC 4604003E */ c.le.s $f0, $f4 +/* 00A9C 809110DC 4604003E */ c.le.s $f0, $f4 /* 00AA0 809110E0 00000000 */ nop -/* 00AA4 809110E4 45020010 */ bc1fl .L80911128 +/* 00AA4 809110E4 45020010 */ bc1fl .L80911128 /* 00AA8 809110E8 86640194 */ lh $a0, 0x0194($s3) ## 00000194 -/* 00AAC 809110EC 1000000D */ beq $zero, $zero, .L80911124 +/* 00AAC 809110EC 1000000D */ beq $zero, $zero, .L80911124 /* 00AB0 809110F0 E66001E0 */ swc1 $f0, 0x01E0($s3) ## 000001E0 .L809110F4: /* 00AB4 809110F4 44810000 */ mtc1 $at, $f0 ## $f0 = 40.00 /* 00AB8 809110F8 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 /* 00ABC 809110FC 44814000 */ mtc1 $at, $f8 ## $f8 = 20.00 /* 00AC0 80911100 C66601D4 */ lwc1 $f6, 0x01D4($s3) ## 000001D4 -/* 00AC4 80911104 46083280 */ add.s $f10, $f6, $f8 +/* 00AC4 80911104 46083280 */ add.s $f10, $f6, $f8 /* 00AC8 80911108 E66A01D4 */ swc1 $f10, 0x01D4($s3) ## 000001D4 /* 00ACC 8091110C C67001D4 */ lwc1 $f16, 0x01D4($s3) ## 000001D4 -/* 00AD0 80911110 4610003C */ c.lt.s $f0, $f16 +/* 00AD0 80911110 4610003C */ c.lt.s $f0, $f16 /* 00AD4 80911114 00000000 */ nop -/* 00AD8 80911118 45020003 */ bc1fl .L80911128 +/* 00AD8 80911118 45020003 */ bc1fl .L80911128 /* 00ADC 8091111C 86640194 */ lh $a0, 0x0194($s3) ## 00000194 /* 00AE0 80911120 E66001D4 */ swc1 $f0, 0x01D4($s3) ## 000001D4 .L80911124: /* 00AE4 80911124 86640194 */ lh $a0, 0x0194($s3) ## 00000194 .L80911128: -/* 00AE8 80911128 00800821 */ addu $at, $a0, $zero -/* 00AEC 8091112C 000420C0 */ sll $a0, $a0, 3 -/* 00AF0 80911130 00812023 */ subu $a0, $a0, $at -/* 00AF4 80911134 000420C0 */ sll $a0, $a0, 3 -/* 00AF8 80911138 00812023 */ subu $a0, $a0, $at -/* 00AFC 8091113C 00042080 */ sll $a0, $a0, 2 -/* 00B00 80911140 00812021 */ addu $a0, $a0, $at -/* 00B04 80911144 000420C0 */ sll $a0, $a0, 3 -/* 00B08 80911148 00042400 */ sll $a0, $a0, 16 +/* 00AE8 80911128 00800821 */ addu $at, $a0, $zero +/* 00AEC 8091112C 000420C0 */ sll $a0, $a0, 3 +/* 00AF0 80911130 00812023 */ subu $a0, $a0, $at +/* 00AF4 80911134 000420C0 */ sll $a0, $a0, 3 +/* 00AF8 80911138 00812023 */ subu $a0, $a0, $at +/* 00AFC 8091113C 00042080 */ sll $a0, $a0, 2 +/* 00B00 80911140 00812021 */ addu $a0, $a0, $at +/* 00B04 80911144 000420C0 */ sll $a0, $a0, 3 +/* 00B08 80911148 00042400 */ sll $a0, $a0, 16 /* 00B0C 8091114C 0C01DE1C */ jal Math_Sins ## sins? -/* 00B10 80911150 00042403 */ sra $a0, $a0, 16 +/* 00B10 80911150 00042403 */ sra $a0, $a0, 16 /* 00B14 80911154 86640194 */ lh $a0, 0x0194($s3) ## 00000194 /* 00B18 80911158 44809000 */ mtc1 $zero, $f18 ## $f18 = 0.00 -/* 00B1C 8091115C 00800821 */ addu $at, $a0, $zero -/* 00B20 80911160 000420C0 */ sll $a0, $a0, 3 -/* 00B24 80911164 00812021 */ addu $a0, $a0, $at -/* 00B28 80911168 46120102 */ mul.s $f4, $f0, $f18 -/* 00B2C 8091116C 000420C0 */ sll $a0, $a0, 3 -/* 00B30 80911170 00812023 */ subu $a0, $a0, $at -/* 00B34 80911174 000420C0 */ sll $a0, $a0, 3 -/* 00B38 80911178 00812023 */ subu $a0, $a0, $at -/* 00B3C 8091117C 00042080 */ sll $a0, $a0, 2 -/* 00B40 80911180 00042400 */ sll $a0, $a0, 16 +/* 00B1C 8091115C 00800821 */ addu $at, $a0, $zero +/* 00B20 80911160 000420C0 */ sll $a0, $a0, 3 +/* 00B24 80911164 00812021 */ addu $a0, $a0, $at +/* 00B28 80911168 46120102 */ mul.s $f4, $f0, $f18 +/* 00B2C 8091116C 000420C0 */ sll $a0, $a0, 3 +/* 00B30 80911170 00812023 */ subu $a0, $a0, $at +/* 00B34 80911174 000420C0 */ sll $a0, $a0, 3 +/* 00B38 80911178 00812023 */ subu $a0, $a0, $at +/* 00B3C 8091117C 00042080 */ sll $a0, $a0, 2 +/* 00B40 80911180 00042400 */ sll $a0, $a0, 16 /* 00B44 80911184 E66403D4 */ swc1 $f4, 0x03D4($s3) ## 000003D4 /* 00B48 80911188 0C01DE0D */ jal Math_Coss ## coss? -/* 00B4C 8091118C 00042403 */ sra $a0, $a0, 16 +/* 00B4C 8091118C 00042403 */ sra $a0, $a0, 16 /* 00B50 80911190 3C014396 */ lui $at, 0x4396 ## $at = 43960000 /* 00B54 80911194 44813000 */ mtc1 $at, $f6 ## $f6 = 300.00 /* 00B58 80911198 3C0142C8 */ lui $at, 0x42C8 ## $at = 42C80000 /* 00B5C 8091119C 4481A000 */ mtc1 $at, $f20 ## $f20 = 100.00 -/* 00B60 809111A0 46060202 */ mul.s $f8, $f0, $f6 +/* 00B60 809111A0 46060202 */ mul.s $f8, $f0, $f6 /* 00B64 809111A4 00008025 */ or $s0, $zero, $zero ## $s0 = 00000000 /* 00B68 809111A8 E66803D8 */ swc1 $f8, 0x03D8($s3) ## 000003D8 .L809111AC: -/* 00B6C 809111AC 00109080 */ sll $s2, $s0, 2 -/* 00B70 809111B0 02509023 */ subu $s2, $s2, $s0 -/* 00B74 809111B4 001290C0 */ sll $s2, $s2, 3 +/* 00B6C 809111AC 00109080 */ sll $s2, $s0, 2 +/* 00B70 809111B0 02509023 */ subu $s2, $s2, $s0 +/* 00B74 809111B4 001290C0 */ sll $s2, $s2, 3 /* 00B78 809111B8 86680194 */ lh $t0, 0x0194($s3) ## 00000194 -/* 00B7C 809111BC 02509021 */ addu $s2, $s2, $s0 -/* 00B80 809111C0 00129040 */ sll $s2, $s2, 1 +/* 00B7C 809111BC 02509021 */ addu $s2, $s2, $s0 +/* 00B80 809111C0 00129040 */ sll $s2, $s2, 1 /* 00B84 809111C4 264907B0 */ addiu $t1, $s2, 0x07B0 ## $t1 = 000007B2 -/* 00B88 809111C8 01090019 */ multu $t0, $t1 -/* 00B8C 809111CC 00002012 */ mflo $a0 -/* 00B90 809111D0 00042400 */ sll $a0, $a0, 16 +/* 00B88 809111C8 01090019 */ multu $t0, $t1 +/* 00B8C 809111CC 00002012 */ mflo $a0 +/* 00B90 809111D0 00042400 */ sll $a0, $a0, 16 /* 00B94 809111D4 0C01DE1C */ jal Math_Sins ## sins? -/* 00B98 809111D8 00042403 */ sra $a0, $a0, 16 -/* 00B9C 809111DC 46140282 */ mul.s $f10, $f0, $f20 -/* 00BA0 809111E0 00105080 */ sll $t2, $s0, 2 -/* 00BA4 809111E4 026A8821 */ addu $s1, $s3, $t2 +/* 00B98 809111D8 00042403 */ sra $a0, $a0, 16 +/* 00B9C 809111DC 46140282 */ mul.s $f10, $f0, $f20 +/* 00BA0 809111E0 00105080 */ sll $t2, $s0, 2 +/* 00BA4 809111E4 026A8821 */ addu $s1, $s3, $t2 /* 00BA8 809111E8 264C08DC */ addiu $t4, $s2, 0x08DC ## $t4 = 000008DE /* 00BAC 809111EC E62A0454 */ swc1 $f10, 0x0454($s1) ## 000005A0 /* 00BB0 809111F0 866B0194 */ lh $t3, 0x0194($s3) ## 00000194 -/* 00BB4 809111F4 016C0019 */ multu $t3, $t4 -/* 00BB8 809111F8 00002012 */ mflo $a0 -/* 00BBC 809111FC 00042400 */ sll $a0, $a0, 16 +/* 00BB4 809111F4 016C0019 */ multu $t3, $t4 +/* 00BB8 809111F8 00002012 */ mflo $a0 +/* 00BBC 809111FC 00042400 */ sll $a0, $a0, 16 /* 00BC0 80911200 0C01DE0D */ jal Math_Coss ## coss? -/* 00BC4 80911204 00042403 */ sra $a0, $a0, 16 -/* 00BC8 80911208 46140402 */ mul.s $f16, $f0, $f20 +/* 00BC4 80911204 00042403 */ sra $a0, $a0, 16 +/* 00BC8 80911208 46140402 */ mul.s $f16, $f0, $f20 /* 00BCC 8091120C 26100001 */ addiu $s0, $s0, 0x0001 ## $s0 = 00000001 -/* 00BD0 80911210 00108400 */ sll $s0, $s0, 16 -/* 00BD4 80911214 00108403 */ sra $s0, $s0, 16 -/* 00BD8 80911218 2A01001E */ slti $at, $s0, 0x001E -/* 00BDC 8091121C 1420FFE3 */ bne $at, $zero, .L809111AC +/* 00BD0 80911210 00108400 */ sll $s0, $s0, 16 +/* 00BD4 80911214 00108403 */ sra $s0, $s0, 16 +/* 00BD8 80911218 2A01001E */ slti $at, $s0, 0x001E +/* 00BDC 8091121C 1420FFE3 */ bne $at, $zero, .L809111AC /* 00BE0 80911220 E63003DC */ swc1 $f16, 0x03DC($s1) ## 00000528 -/* 00BE4 80911224 8FAD0094 */ lw $t5, 0x0094($sp) +/* 00BE4 80911224 8FAD0094 */ lw $t5, 0x0094($sp) /* 00BE8 80911228 240100FF */ addiu $at, $zero, 0x00FF ## $at = 000000FF /* 00BEC 8091122C 91AE014C */ lbu $t6, 0x014C($t5) ## 0000014C -/* 00BF0 80911230 55C1000E */ bnel $t6, $at, .L8091126C -/* 00BF4 80911234 8FB80094 */ lw $t8, 0x0094($sp) -/* 00BF8 80911238 0C2444A5 */ jal func_80911294 +/* 00BF0 80911230 55C1000E */ bnel $t6, $at, .L8091126C +/* 00BF4 80911234 8FB80094 */ lw $t8, 0x0094($sp) +/* 00BF8 80911238 0C2444A5 */ jal func_80911294 /* 00BFC 8091123C 02602025 */ or $a0, $s3, $zero ## $a0 = 00000000 /* 00C00 80911240 00008025 */ or $s0, $zero, $zero ## $s0 = 00000000 .L80911244: -/* 00C04 80911244 00107880 */ sll $t7, $s0, 2 +/* 00C04 80911244 00107880 */ sll $t7, $s0, 2 /* 00C08 80911248 26100001 */ addiu $s0, $s0, 0x0001 ## $s0 = 00000001 -/* 00C0C 8091124C 00108400 */ sll $s0, $s0, 16 -/* 00C10 80911250 00108403 */ sra $s0, $s0, 16 -/* 00C14 80911254 2A01001E */ slti $at, $s0, 0x001E -/* 00C18 80911258 026F8821 */ addu $s1, $s3, $t7 +/* 00C0C 8091124C 00108400 */ sll $s0, $s0, 16 +/* 00C10 80911250 00108403 */ sra $s0, $s0, 16 +/* 00C14 80911254 2A01001E */ slti $at, $s0, 0x001E +/* 00C18 80911258 026F8821 */ addu $s1, $s3, $t7 /* 00C1C 8091125C E63603DC */ swc1 $f22, 0x03DC($s1) ## 00000528 -/* 00C20 80911260 1420FFF8 */ bne $at, $zero, .L80911244 +/* 00C20 80911260 1420FFF8 */ bne $at, $zero, .L80911244 /* 00C24 80911264 E6360454 */ swc1 $f22, 0x0454($s1) ## 000005A0 -/* 00C28 80911268 8FB80094 */ lw $t8, 0x0094($sp) +/* 00C28 80911268 8FB80094 */ lw $t8, 0x0094($sp) .L8091126C: /* 00C2C 8091126C A300014C */ sb $zero, 0x014C($t8) ## 0000014C -/* 00C30 80911270 8FBF0054 */ lw $ra, 0x0054($sp) -/* 00C34 80911274 8FB30050 */ lw $s3, 0x0050($sp) -/* 00C38 80911278 8FB2004C */ lw $s2, 0x004C($sp) -/* 00C3C 8091127C 8FB10048 */ lw $s1, 0x0048($sp) -/* 00C40 80911280 8FB00044 */ lw $s0, 0x0044($sp) -/* 00C44 80911284 D7B60038 */ ldc1 $f22, 0x0038($sp) -/* 00C48 80911288 D7B40030 */ ldc1 $f20, 0x0030($sp) -/* 00C4C 8091128C 03E00008 */ jr $ra +/* 00C30 80911270 8FBF0054 */ lw $ra, 0x0054($sp) +/* 00C34 80911274 8FB30050 */ lw $s3, 0x0050($sp) +/* 00C38 80911278 8FB2004C */ lw $s2, 0x004C($sp) +/* 00C3C 8091127C 8FB10048 */ lw $s1, 0x0048($sp) +/* 00C40 80911280 8FB00044 */ lw $s0, 0x0044($sp) +/* 00C44 80911284 D7B60038 */ ldc1 $f22, 0x0038($sp) +/* 00C48 80911288 D7B40030 */ ldc1 $f20, 0x0030($sp) +/* 00C4C 8091128C 03E00008 */ jr $ra /* 00C50 80911290 27BD00A0 */ addiu $sp, $sp, 0x00A0 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_80911294.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_80911294.s index a6bbb2bd60..082cf3b466 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_80911294.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_80911294.s @@ -1,19 +1,19 @@ glabel func_80911294 /* 00C54 80911294 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00C58 80911298 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00C5C 8091129C AFA40018 */ sw $a0, 0x0018($sp) +/* 00C58 80911298 AFBF0014 */ sw $ra, 0x0014($sp) +/* 00C5C 8091129C AFA40018 */ sw $a0, 0x0018($sp) /* 00C60 809112A0 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 00C64 809112A4 24A53CA4 */ addiu $a1, $a1, 0x3CA4 ## $a1 = 06003CA4 /* 00C68 809112A8 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 00C6C 809112AC 0C0294D3 */ jal func_800A534C +/* 00C6C 809112AC 0C0294D3 */ jal SkelAnime_ChangeAnimTransitionRepeat /* 00C70 809112B0 3C06C0A0 */ lui $a2, 0xC0A0 ## $a2 = C0A00000 -/* 00C74 809112B4 8FAF0018 */ lw $t7, 0x0018($sp) +/* 00C74 809112B4 8FAF0018 */ lw $t7, 0x0018($sp) /* 00C78 809112B8 3C0E8091 */ lui $t6, %hi(func_809112D4) ## $t6 = 80910000 /* 00C7C 809112BC 25CE12D4 */ addiu $t6, $t6, %lo(func_809112D4) ## $t6 = 809112D4 /* 00C80 809112C0 ADEE0190 */ sw $t6, 0x0190($t7) ## 00000190 -/* 00C84 809112C4 8FBF0014 */ lw $ra, 0x0014($sp) +/* 00C84 809112C4 8FBF0014 */ lw $ra, 0x0014($sp) /* 00C88 809112C8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00C8C 809112CC 03E00008 */ jr $ra +/* 00C8C 809112CC 03E00008 */ jr $ra /* 00C90 809112D0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_809112D4.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_809112D4.s index 3e5da44255..2b6496fc04 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_809112D4.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_809112D4.s @@ -1,95 +1,95 @@ glabel func_809112D4 /* 00C94 809112D4 27BDFFB0 */ addiu $sp, $sp, 0xFFB0 ## $sp = FFFFFFB0 -/* 00C98 809112D8 AFB00034 */ sw $s0, 0x0034($sp) -/* 00C9C 809112DC AFBF003C */ sw $ra, 0x003C($sp) -/* 00CA0 809112E0 AFB10038 */ sw $s1, 0x0038($sp) -/* 00CA4 809112E4 AFA50054 */ sw $a1, 0x0054($sp) +/* 00C98 809112D8 AFB00034 */ sw $s0, 0x0034($sp) +/* 00C9C 809112DC AFBF003C */ sw $ra, 0x003C($sp) +/* 00CA0 809112E0 AFB10038 */ sw $s1, 0x0038($sp) +/* 00CA4 809112E4 AFA50054 */ sw $a1, 0x0054($sp) /* 00CA8 809112E8 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 00CAC 809112EC 8C91011C */ lw $s1, 0x011C($a0) ## 0000011C /* 00CB0 809112F0 3C048091 */ lui $a0, %hi(D_80915188) ## $a0 = 80910000 /* 00CB4 809112F4 0C00084C */ jal osSyncPrintf - + /* 00CB8 809112F8 24845188 */ addiu $a0, $a0, %lo(D_80915188) ## $a0 = 80915188 /* 00CBC 809112FC 2607014C */ addiu $a3, $s0, 0x014C ## $a3 = 0000014C /* 00CC0 80911300 00E02025 */ or $a0, $a3, $zero ## $a0 = 0000014C /* 00CC4 80911304 0C02927F */ jal SkelAnime_FrameUpdateMatrix - -/* 00CC8 80911308 AFA70040 */ sw $a3, 0x0040($sp) + +/* 00CC8 80911308 AFA70040 */ sw $a3, 0x0040($sp) /* 00CCC 8091130C 3C048091 */ lui $a0, %hi(D_80915190) ## $a0 = 80910000 /* 00CD0 80911310 0C00084C */ jal osSyncPrintf - + /* 00CD4 80911314 24845190 */ addiu $a0, $a0, %lo(D_80915190) ## $a0 = 80915190 /* 00CD8 80911318 9222014C */ lbu $v0, 0x014C($s1) ## 0000014C -/* 00CDC 8091131C 8FA70040 */ lw $a3, 0x0040($sp) +/* 00CDC 8091131C 8FA70040 */ lw $a3, 0x0040($sp) /* 00CE0 80911320 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 00CE4 80911324 1441001E */ bne $v0, $at, .L809113A0 +/* 00CE4 80911324 1441001E */ bne $v0, $at, .L809113A0 /* 00CE8 80911328 00E02025 */ or $a0, $a3, $zero ## $a0 = 00000000 /* 00CEC 8091132C 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 /* 00CF0 80911330 24A5D99C */ addiu $a1, $a1, 0xD99C ## $a1 = 0600D99C -/* 00CF4 80911334 0C029490 */ jal func_800A5240 +/* 00CF4 80911334 0C029490 */ jal SkelAnime_ChangeAnimTransitionStop /* 00CF8 80911338 3C06C000 */ lui $a2, 0xC000 ## $a2 = C0000000 /* 00CFC 8091133C 8E0E0004 */ lw $t6, 0x0004($s0) ## 00000004 /* 00D00 80911340 8E18011C */ lw $t8, 0x011C($s0) ## 0000011C -/* 00D04 80911344 8FA60054 */ lw $a2, 0x0054($sp) +/* 00D04 80911344 8FA60054 */ lw $a2, 0x0054($sp) /* 00D08 80911348 35CF0001 */ ori $t7, $t6, 0x0001 ## $t7 = 00000001 /* 00D0C 8091134C AE0F0004 */ sw $t7, 0x0004($s0) ## 00000004 -/* 00D10 80911350 AFB80048 */ sw $t8, 0x0048($sp) +/* 00D10 80911350 AFB80048 */ sw $t8, 0x0048($sp) /* 00D14 80911354 C6040200 */ lwc1 $f4, 0x0200($s0) ## 00000200 /* 00D18 80911358 2419001E */ addiu $t9, $zero, 0x001E ## $t9 = 0000001E /* 00D1C 8091135C 24080026 */ addiu $t0, $zero, 0x0026 ## $t0 = 00000026 -/* 00D20 80911360 E7A40010 */ swc1 $f4, 0x0010($sp) +/* 00D20 80911360 E7A40010 */ swc1 $f4, 0x0010($sp) /* 00D24 80911364 C6060204 */ lwc1 $f6, 0x0204($s0) ## 00000204 /* 00D28 80911368 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 00D2C 8091136C 2407006D */ addiu $a3, $zero, 0x006D ## $a3 = 0000006D -/* 00D30 80911370 E7A60014 */ swc1 $f6, 0x0014($sp) +/* 00D30 80911370 E7A60014 */ swc1 $f6, 0x0014($sp) /* 00D34 80911374 C6080208 */ lwc1 $f8, 0x0208($s0) ## 00000208 -/* 00D38 80911378 AFA80028 */ sw $t0, 0x0028($sp) -/* 00D3C 8091137C AFA00024 */ sw $zero, 0x0024($sp) -/* 00D40 80911380 AFA00020 */ sw $zero, 0x0020($sp) -/* 00D44 80911384 AFB9001C */ sw $t9, 0x001C($sp) +/* 00D38 80911378 AFA80028 */ sw $t0, 0x0028($sp) +/* 00D3C 8091137C AFA00024 */ sw $zero, 0x0024($sp) +/* 00D40 80911380 AFA00020 */ sw $zero, 0x0020($sp) +/* 00D44 80911384 AFB9001C */ sw $t9, 0x001C($sp) /* 00D48 80911388 24C41C24 */ addiu $a0, $a2, 0x1C24 ## $a0 = 00001C24 /* 00D4C 8091138C 0C00C916 */ jal Actor_SpawnAttached - -/* 00D50 80911390 E7A80018 */ swc1 $f8, 0x0018($sp) -/* 00D54 80911394 8FA90048 */ lw $t1, 0x0048($sp) -/* 00D58 80911398 1000001E */ beq $zero, $zero, .L80911414 + +/* 00D50 80911390 E7A80018 */ swc1 $f8, 0x0018($sp) +/* 00D54 80911394 8FA90048 */ lw $t1, 0x0048($sp) +/* 00D58 80911398 1000001E */ beq $zero, $zero, .L80911414 /* 00D5C 8091139C AE09011C */ sw $t1, 0x011C($s0) ## 0000011C .L809113A0: /* 00D60 809113A0 24010003 */ addiu $at, $zero, 0x0003 ## $at = 00000003 -/* 00D64 809113A4 14410007 */ bne $v0, $at, .L809113C4 +/* 00D64 809113A4 14410007 */ bne $v0, $at, .L809113C4 /* 00D68 809113A8 00E02025 */ or $a0, $a3, $zero ## $a0 = 00000000 /* 00D6C 809113AC 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 00D70 809113B0 24A53080 */ addiu $a1, $a1, 0x3080 ## $a1 = 06003080 -/* 00D74 809113B4 0C029490 */ jal func_800A5240 +/* 00D74 809113B4 0C029490 */ jal SkelAnime_ChangeAnimTransitionStop /* 00D78 809113B8 3C06C000 */ lui $a2, 0xC000 ## $a2 = C0000000 -/* 00D7C 809113BC 10000015 */ beq $zero, $zero, .L80911414 +/* 00D7C 809113BC 10000015 */ beq $zero, $zero, .L80911414 /* 00D80 809113C0 00000000 */ nop .L809113C4: /* 00D84 809113C4 24010004 */ addiu $at, $zero, 0x0004 ## $at = 00000004 -/* 00D88 809113C8 14410007 */ bne $v0, $at, .L809113E8 +/* 00D88 809113C8 14410007 */ bne $v0, $at, .L809113E8 /* 00D8C 809113CC 00E02025 */ or $a0, $a3, $zero ## $a0 = 00000000 /* 00D90 809113D0 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 /* 00D94 809113D4 24A5DF80 */ addiu $a1, $a1, 0xDF80 ## $a1 = 0600DF80 -/* 00D98 809113D8 0C029490 */ jal func_800A5240 +/* 00D98 809113D8 0C029490 */ jal SkelAnime_ChangeAnimTransitionStop /* 00D9C 809113DC 3C06C000 */ lui $a2, 0xC000 ## $a2 = C0000000 -/* 00DA0 809113E0 1000000C */ beq $zero, $zero, .L80911414 +/* 00DA0 809113E0 1000000C */ beq $zero, $zero, .L80911414 /* 00DA4 809113E4 00000000 */ nop .L809113E8: /* 00DA8 809113E8 24010005 */ addiu $at, $zero, 0x0005 ## $at = 00000005 -/* 00DAC 809113EC 14410009 */ bne $v0, $at, .L80911414 +/* 00DAC 809113EC 14410009 */ bne $v0, $at, .L80911414 /* 00DB0 809113F0 00E02025 */ or $a0, $a3, $zero ## $a0 = 00000000 /* 00DB4 809113F4 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 00DB8 809113F8 24A53CA4 */ addiu $a1, $a1, 0x3CA4 ## $a1 = 06003CA4 -/* 00DBC 809113FC 0C0294D3 */ jal func_800A534C +/* 00DBC 809113FC 0C0294D3 */ jal SkelAnime_ChangeAnimTransitionRepeat /* 00DC0 80911400 3C06C000 */ lui $a2, 0xC000 ## $a2 = C0000000 /* 00DC4 80911404 8E0A0004 */ lw $t2, 0x0004($s0) ## 00000004 /* 00DC8 80911408 2401FFFE */ addiu $at, $zero, 0xFFFE ## $at = FFFFFFFE -/* 00DCC 8091140C 01415824 */ and $t3, $t2, $at +/* 00DCC 8091140C 01415824 */ and $t3, $t2, $at /* 00DD0 80911410 AE0B0004 */ sw $t3, 0x0004($s0) ## 00000004 .L80911414: /* 00DD4 80911414 3C048091 */ lui $a0, %hi(D_80915198) ## $a0 = 80910000 /* 00DD8 80911418 0C00084C */ jal osSyncPrintf - + /* 00DDC 8091141C 24845198 */ addiu $a0, $a0, %lo(D_80915198) ## $a0 = 80915198 /* 00DE0 80911420 8E2D0024 */ lw $t5, 0x0024($s1) ## 00000024 /* 00DE4 80911424 920E01C9 */ lbu $t6, 0x01C9($s0) ## 000001C9 @@ -104,9 +104,9 @@ glabel func_809112D4 /* 00E08 80911448 E60A0028 */ swc1 $f10, 0x0028($s0) ## 00000028 /* 00E0C 8091144C 86220032 */ lh $v0, 0x0032($s1) ## 00000032 /* 00E10 80911450 A6020032 */ sh $v0, 0x0032($s0) ## 00000032 -/* 00E14 80911454 11C00011 */ beq $t6, $zero, .L8091149C +/* 00E14 80911454 11C00011 */ beq $t6, $zero, .L8091149C /* 00E18 80911458 A60200B6 */ sh $v0, 0x00B6($s0) ## 000000B6 -/* 00E1C 8091145C 0C24453A */ jal func_809114E8 +/* 00E1C 8091145C 0C24453A */ jal func_809114E8 /* 00E20 80911460 3C05C1A0 */ lui $a1, 0xC1A0 ## $a1 = C1A00000 /* 00E24 80911464 240F0064 */ addiu $t7, $zero, 0x0064 ## $t7 = 00000064 /* 00E28 80911468 24180014 */ addiu $t8, $zero, 0x0014 ## $t8 = 00000014 @@ -118,32 +118,32 @@ glabel func_809112D4 /* 00E40 80911480 A6080524 */ sh $t0, 0x0524($s0) ## 00000524 /* 00E44 80911484 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 00E48 80911488 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 00E4C 8091148C 240538B0 */ addiu $a1, $zero, 0x38B0 ## $a1 = 000038B0 /* 00E50 80911490 2409001A */ addiu $t1, $zero, 0x001A ## $t1 = 0000001A -/* 00E54 80911494 1000000F */ beq $zero, $zero, .L809114D4 +/* 00E54 80911494 1000000F */ beq $zero, $zero, .L809114D4 /* 00E58 80911498 A2090117 */ sb $t1, 0x0117($s0) ## 00000117 .L8091149C: -/* 00E5C 8091149C C4205418 */ lwc1 $f0, %lo(D_80915418)($at) +/* 00E5C 8091149C C4205418 */ lwc1 $f0, %lo(D_80915418)($at) /* 00E60 809114A0 C6300050 */ lwc1 $f16, 0x0050($s1) ## 00000050 /* 00E64 809114A4 A220014C */ sb $zero, 0x014C($s1) ## 0000014C /* 00E68 809114A8 3C048091 */ lui $a0, %hi(D_809151A0) ## $a0 = 80910000 -/* 00E6C 809114AC 46008483 */ div.s $f18, $f16, $f0 +/* 00E6C 809114AC 46008483 */ div.s $f18, $f16, $f0 /* 00E70 809114B0 248451A0 */ addiu $a0, $a0, %lo(D_809151A0) ## $a0 = 809151A0 /* 00E74 809114B4 E6120050 */ swc1 $f18, 0x0050($s0) ## 00000050 /* 00E78 809114B8 C6240054 */ lwc1 $f4, 0x0054($s1) ## 00000054 -/* 00E7C 809114BC 46002183 */ div.s $f6, $f4, $f0 +/* 00E7C 809114BC 46002183 */ div.s $f6, $f4, $f0 /* 00E80 809114C0 E6060054 */ swc1 $f6, 0x0054($s0) ## 00000054 /* 00E84 809114C4 C6280058 */ lwc1 $f8, 0x0058($s1) ## 00000058 -/* 00E88 809114C8 46004283 */ div.s $f10, $f8, $f0 +/* 00E88 809114C8 46004283 */ div.s $f10, $f8, $f0 /* 00E8C 809114CC 0C00084C */ jal osSyncPrintf - + /* 00E90 809114D0 E60A0058 */ swc1 $f10, 0x0058($s0) ## 00000058 .L809114D4: -/* 00E94 809114D4 8FBF003C */ lw $ra, 0x003C($sp) -/* 00E98 809114D8 8FB00034 */ lw $s0, 0x0034($sp) -/* 00E9C 809114DC 8FB10038 */ lw $s1, 0x0038($sp) -/* 00EA0 809114E0 03E00008 */ jr $ra +/* 00E94 809114D4 8FBF003C */ lw $ra, 0x003C($sp) +/* 00E98 809114D8 8FB00034 */ lw $s0, 0x0034($sp) +/* 00E9C 809114DC 8FB10038 */ lw $s1, 0x0038($sp) +/* 00EA0 809114E0 03E00008 */ jr $ra /* 00EA4 809114E4 27BD0050 */ addiu $sp, $sp, 0x0050 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_809114E8.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_809114E8.s index d7f2c6ae50..dc357e05d7 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_809114E8.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_809114E8.s @@ -1,15 +1,15 @@ glabel func_809114E8 /* 00EA8 809114E8 44856000 */ mtc1 $a1, $f12 ## $f12 = 0.00 /* 00EAC 809114EC 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00EB0 809114F0 AFBF0014 */ sw $ra, 0x0014($sp) +/* 00EB0 809114F0 AFBF0014 */ sw $ra, 0x0014($sp) /* 00EB4 809114F4 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 /* 00EB8 809114F8 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 -/* 00EBC 809114FC 44066000 */ mfc1 $a2, $f12 +/* 00EBC 809114FC 44066000 */ mfc1 $a2, $f12 /* 00EC0 80911500 24A50060 */ addiu $a1, $a1, 0x0060 ## $a1 = 06010060 -/* 00EC4 80911504 AFA70018 */ sw $a3, 0x0018($sp) -/* 00EC8 80911508 0C0294D3 */ jal func_800A534C +/* 00EC4 80911504 AFA70018 */ sw $a3, 0x0018($sp) +/* 00EC8 80911508 0C0294D3 */ jal SkelAnime_ChangeAnimTransitionRepeat /* 00ECC 8091150C 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 00ED0 80911510 8FA70018 */ lw $a3, 0x0018($sp) +/* 00ED0 80911510 8FA70018 */ lw $a3, 0x0018($sp) /* 00ED4 80911514 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 /* 00ED8 80911518 3C0E8091 */ lui $t6, %hi(func_8091156C) ## $t6 = 80910000 /* 00EDC 8091151C 8CEF0004 */ lw $t7, 0x0004($a3) ## 00000004 @@ -22,16 +22,16 @@ glabel func_809114E8 /* 00EF4 80911534 E4E401CC */ swc1 $f4, 0x01CC($a3) ## 000001CC /* 00EF8 80911538 3C014280 */ lui $at, 0x4280 ## $at = 42800000 /* 00EFC 8091153C 44813000 */ mtc1 $at, $f6 ## $f6 = 64.00 -/* 00F00 80911540 8FA70018 */ lw $a3, 0x0018($sp) -/* 00F04 80911544 46060202 */ mul.s $f8, $f0, $f6 -/* 00F08 80911548 4600428D */ trunc.w.s $f10, $f8 -/* 00F0C 8091154C 440A5000 */ mfc1 $t2, $f10 +/* 00F00 80911540 8FA70018 */ lw $a3, 0x0018($sp) +/* 00F04 80911544 46060202 */ mul.s $f8, $f0, $f6 +/* 00F08 80911548 4600428D */ trunc.w.s $f10, $f8 +/* 00F0C 8091154C 440A5000 */ mfc1 $t2, $f10 /* 00F10 80911550 00000000 */ nop /* 00F14 80911554 254B001E */ addiu $t3, $t2, 0x001E ## $t3 = 0000001E /* 00F18 80911558 A4EB01BC */ sh $t3, 0x01BC($a3) ## 000001BC -/* 00F1C 8091155C 8FBF0014 */ lw $ra, 0x0014($sp) +/* 00F1C 8091155C 8FBF0014 */ lw $ra, 0x0014($sp) /* 00F20 80911560 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00F24 80911564 03E00008 */ jr $ra +/* 00F24 80911564 03E00008 */ jr $ra /* 00F28 80911568 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_80911CB0.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_80911CB0.s index 2aedae2b22..8d3790dba5 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_80911CB0.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_80911CB0.s @@ -1,20 +1,20 @@ glabel func_80911CB0 /* 01670 80911CB0 27BDFFB8 */ addiu $sp, $sp, 0xFFB8 ## $sp = FFFFFFB8 -/* 01674 80911CB4 AFB00038 */ sw $s0, 0x0038($sp) +/* 01674 80911CB4 AFB00038 */ sw $s0, 0x0038($sp) /* 01678 80911CB8 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 0167C 80911CBC AFBF003C */ sw $ra, 0x003C($sp) +/* 0167C 80911CBC AFBF003C */ sw $ra, 0x003C($sp) /* 01680 80911CC0 3C040601 */ lui $a0, 0x0601 ## $a0 = 06010000 -/* 01684 80911CC4 AFA5004C */ sw $a1, 0x004C($sp) +/* 01684 80911CC4 AFA5004C */ sw $a1, 0x004C($sp) /* 01688 80911CC8 0C028800 */ jal SkelAnime_GetFrameCount - + /* 0168C 80911CCC 2484EC94 */ addiu $a0, $a0, 0xEC94 ## $a0 = 0600EC94 /* 01690 80911CD0 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 01694 80911CD4 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 /* 01698 80911CD8 24A5EC94 */ addiu $a1, $a1, 0xEC94 ## $a1 = 0600EC94 -/* 0169C 80911CDC 468021A0 */ cvt.s.w $f6, $f4 +/* 0169C 80911CDC 468021A0 */ cvt.s.w $f6, $f4 /* 016A0 80911CE0 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C /* 016A4 80911CE4 3C06C0A0 */ lui $a2, 0xC0A0 ## $a2 = C0A00000 -/* 016A8 80911CE8 0C029490 */ jal func_800A5240 +/* 016A8 80911CE8 0C029490 */ jal SkelAnime_ChangeAnimTransitionStop /* 016AC 80911CEC E60601D0 */ swc1 $f6, 0x01D0($s0) ## 000001D0 /* 016B0 80911CF0 3C0E8091 */ lui $t6, %hi(func_80911DD8) ## $t6 = 80910000 /* 016B4 80911CF4 25CE1DD8 */ addiu $t6, $t6, %lo(func_80911DD8) ## $t6 = 80911DD8 @@ -22,62 +22,62 @@ glabel func_80911CB0 ## Rand.Next() float /* 016BC 80911CFC AE0E0190 */ sw $t6, 0x0190($s0) ## 00000190 /* 016C0 80911D00 3C018091 */ lui $at, %hi(D_80915438) ## $at = 80910000 -/* 016C4 80911D04 C4285438 */ lwc1 $f8, %lo(D_80915438)($at) +/* 016C4 80911D04 C4285438 */ lwc1 $f8, %lo(D_80915438)($at) /* 016C8 80911D08 24080019 */ addiu $t0, $zero, 0x0019 ## $t0 = 00000019 /* 016CC 80911D0C 24020019 */ addiu $v0, $zero, 0x0019 ## $v0 = 00000019 -/* 016D0 80911D10 4608003E */ c.le.s $f0, $f8 +/* 016D0 80911D10 4608003E */ c.le.s $f0, $f8 /* 016D4 80911D14 00000000 */ nop -/* 016D8 80911D18 4502000F */ bc1fl .L80911D58 +/* 016D8 80911D18 4502000F */ bc1fl .L80911D58 /* 016DC 80911D1C A60001A2 */ sh $zero, 0x01A2($s0) ## 000001A2 /* 016E0 80911D20 860F01A6 */ lh $t7, 0x01A6($s0) ## 000001A6 -/* 016E4 80911D24 29E1000A */ slti $at, $t7, 0x000A -/* 016E8 80911D28 5420000B */ bnel $at, $zero, .L80911D58 +/* 016E4 80911D24 29E1000A */ slti $at, $t7, 0x000A +/* 016E8 80911D28 5420000B */ bnel $at, $zero, .L80911D58 /* 016EC 80911D2C A60001A2 */ sh $zero, 0x01A2($s0) ## 000001A2 /* 016F0 80911D30 921801C9 */ lbu $t8, 0x01C9($s0) ## 000001C9 /* 016F4 80911D34 24030001 */ addiu $v1, $zero, 0x0001 ## $v1 = 00000001 /* 016F8 80911D38 241903E8 */ addiu $t9, $zero, 0x03E8 ## $t9 = 000003E8 -/* 016FC 80911D3C 54780006 */ bnel $v1, $t8, .L80911D58 +/* 016FC 80911D3C 54780006 */ bnel $v1, $t8, .L80911D58 /* 01700 80911D40 A60001A2 */ sh $zero, 0x01A2($s0) ## 000001A2 /* 01704 80911D44 A60301A2 */ sh $v1, 0x01A2($s0) ## 000001A2 /* 01708 80911D48 A61901A4 */ sh $t9, 0x01A4($s0) ## 000001A4 -/* 0170C 80911D4C 10000003 */ beq $zero, $zero, .L80911D5C +/* 0170C 80911D4C 10000003 */ beq $zero, $zero, .L80911D5C /* 01710 80911D50 24020020 */ addiu $v0, $zero, 0x0020 ## $v0 = 00000020 /* 01714 80911D54 A60001A2 */ sh $zero, 0x01A2($s0) ## 000001A2 .L80911D58: /* 01718 80911D58 A60801A4 */ sh $t0, 0x01A4($s0) ## 000001A4 .L80911D5C: /* 0171C 80911D5C 8E09011C */ lw $t1, 0x011C($s0) ## 0000011C -/* 01720 80911D60 8FA6004C */ lw $a2, 0x004C($sp) +/* 01720 80911D60 8FA6004C */ lw $a2, 0x004C($sp) /* 01724 80911D64 240A0026 */ addiu $t2, $zero, 0x0026 ## $t2 = 00000026 -/* 01728 80911D68 AFA90044 */ sw $t1, 0x0044($sp) +/* 01728 80911D68 AFA90044 */ sw $t1, 0x0044($sp) /* 0172C 80911D6C C60A0200 */ lwc1 $f10, 0x0200($s0) ## 00000200 /* 01730 80911D70 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 01734 80911D74 2407006D */ addiu $a3, $zero, 0x006D ## $a3 = 0000006D -/* 01738 80911D78 E7AA0010 */ swc1 $f10, 0x0010($sp) +/* 01738 80911D78 E7AA0010 */ swc1 $f10, 0x0010($sp) /* 0173C 80911D7C C6100204 */ lwc1 $f16, 0x0204($s0) ## 00000204 /* 01740 80911D80 24C41C24 */ addiu $a0, $a2, 0x1C24 ## $a0 = 00001C24 -/* 01744 80911D84 E7B00014 */ swc1 $f16, 0x0014($sp) +/* 01744 80911D84 E7B00014 */ swc1 $f16, 0x0014($sp) /* 01748 80911D88 C6120208 */ lwc1 $f18, 0x0208($s0) ## 00000208 -/* 0174C 80911D8C AFAA0028 */ sw $t2, 0x0028($sp) -/* 01750 80911D90 AFA00024 */ sw $zero, 0x0024($sp) -/* 01754 80911D94 AFA00020 */ sw $zero, 0x0020($sp) -/* 01758 80911D98 AFA2001C */ sw $v0, 0x001C($sp) +/* 0174C 80911D8C AFAA0028 */ sw $t2, 0x0028($sp) +/* 01750 80911D90 AFA00024 */ sw $zero, 0x0024($sp) +/* 01754 80911D94 AFA00020 */ sw $zero, 0x0020($sp) +/* 01758 80911D98 AFA2001C */ sw $v0, 0x001C($sp) /* 0175C 80911D9C 0C00C916 */ jal Actor_SpawnAttached - -/* 01760 80911DA0 E7B20018 */ swc1 $f18, 0x0018($sp) + +/* 01760 80911DA0 E7B20018 */ swc1 $f18, 0x0018($sp) /* 01764 80911DA4 860C01A6 */ lh $t4, 0x01A6($s0) ## 000001A6 -/* 01768 80911DA8 8FAB0044 */ lw $t3, 0x0044($sp) +/* 01768 80911DA8 8FAB0044 */ lw $t3, 0x0044($sp) /* 0176C 80911DAC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 01770 80911DB0 258D0001 */ addiu $t5, $t4, 0x0001 ## $t5 = 00000001 /* 01774 80911DB4 A60D01A6 */ sh $t5, 0x01A6($s0) ## 000001A6 /* 01778 80911DB8 240538AA */ addiu $a1, $zero, 0x38AA ## $a1 = 000038AA /* 0177C 80911DBC 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 01780 80911DC0 AE0B011C */ sw $t3, 0x011C($s0) ## 0000011C -/* 01784 80911DC4 8FBF003C */ lw $ra, 0x003C($sp) -/* 01788 80911DC8 8FB00038 */ lw $s0, 0x0038($sp) +/* 01784 80911DC4 8FBF003C */ lw $ra, 0x003C($sp) +/* 01788 80911DC8 8FB00038 */ lw $s0, 0x0038($sp) /* 0178C 80911DCC 27BD0048 */ addiu $sp, $sp, 0x0048 ## $sp = 00000000 -/* 01790 80911DD0 03E00008 */ jr $ra +/* 01790 80911DD0 03E00008 */ jr $ra /* 01794 80911DD4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_80911DD8.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_80911DD8.s index e75e5ac3c1..0152d104b3 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_80911DD8.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_80911DD8.s @@ -1,168 +1,168 @@ glabel func_80911DD8 /* 01798 80911DD8 27BDFFB0 */ addiu $sp, $sp, 0xFFB0 ## $sp = FFFFFFB0 -/* 0179C 80911DDC AFB00038 */ sw $s0, 0x0038($sp) +/* 0179C 80911DDC AFB00038 */ sw $s0, 0x0038($sp) /* 017A0 80911DE0 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 017A4 80911DE4 AFBF003C */ sw $ra, 0x003C($sp) +/* 017A4 80911DE4 AFBF003C */ sw $ra, 0x003C($sp) /* 017A8 80911DE8 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 017AC 80911DEC AFA50054 */ sw $a1, 0x0054($sp) +/* 017AC 80911DEC AFA50054 */ sw $a1, 0x0054($sp) /* 017B0 80911DF0 0C02927F */ jal SkelAnime_FrameUpdateMatrix - -/* 017B4 80911DF4 AFA40044 */ sw $a0, 0x0044($sp) + +/* 017B4 80911DF4 AFA40044 */ sw $a0, 0x0044($sp) /* 017B8 80911DF8 C60401D0 */ lwc1 $f4, 0x01D0($s0) ## 000001D0 /* 017BC 80911DFC 3C048091 */ lui $a0, %hi(D_809151A8) ## $a0 = 80910000 /* 017C0 80911E00 248451A8 */ addiu $a0, $a0, %lo(D_809151A8) ## $a0 = 809151A8 -/* 017C4 80911E04 4600218D */ trunc.w.s $f6, $f4 -/* 017C8 80911E08 44053000 */ mfc1 $a1, $f6 +/* 017C4 80911E04 4600218D */ trunc.w.s $f6, $f4 +/* 017C8 80911E08 44053000 */ mfc1 $a1, $f6 /* 017CC 80911E0C 00000000 */ nop -/* 017D0 80911E10 00052C00 */ sll $a1, $a1, 16 +/* 017D0 80911E10 00052C00 */ sll $a1, $a1, 16 /* 017D4 80911E14 0C00084C */ jal osSyncPrintf - -/* 017D8 80911E18 00052C03 */ sra $a1, $a1, 16 + +/* 017D8 80911E18 00052C03 */ sra $a1, $a1, 16 /* 017DC 80911E1C 3C048091 */ lui $a0, %hi(D_809151CC) ## $a0 = 80910000 /* 017E0 80911E20 248451CC */ addiu $a0, $a0, %lo(D_809151CC) ## $a0 = 809151CC /* 017E4 80911E24 0C00084C */ jal osSyncPrintf - + /* 017E8 80911E28 860501A4 */ lh $a1, 0x01A4($s0) ## 000001A4 -/* 017EC 80911E2C 8FA40044 */ lw $a0, 0x0044($sp) -/* 017F0 80911E30 0C0295B2 */ jal func_800A56C8 +/* 017EC 80911E2C 8FA40044 */ lw $a0, 0x0044($sp) +/* 017F0 80911E30 0C0295B2 */ jal func_800A56C8 /* 017F4 80911E34 8E0501D0 */ lw $a1, 0x01D0($s0) ## 000001D0 -/* 017F8 80911E38 10400003 */ beq $v0, $zero, .L80911E48 +/* 017F8 80911E38 10400003 */ beq $v0, $zero, .L80911E48 /* 017FC 80911E3C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01800 80911E40 0C24453A */ jal func_809114E8 +/* 01800 80911E40 0C24453A */ jal func_809114E8 /* 01804 80911E44 3C05C0C0 */ lui $a1, 0xC0C0 ## $a1 = C0C00000 .L80911E48: /* 01808 80911E48 860F01A2 */ lh $t7, 0x01A2($s0) ## 000001A2 -/* 0180C 80911E4C 8FA40044 */ lw $a0, 0x0044($sp) -/* 01810 80911E50 51E00012 */ beql $t7, $zero, .L80911E9C +/* 0180C 80911E4C 8FA40044 */ lw $a0, 0x0044($sp) +/* 01810 80911E50 51E00012 */ beql $t7, $zero, .L80911E9C /* 01814 80911E54 861901A4 */ lh $t9, 0x01A4($s0) ## 000001A4 -/* 01818 80911E58 0C0295B2 */ jal func_800A56C8 +/* 01818 80911E58 0C0295B2 */ jal func_800A56C8 /* 0181C 80911E5C 3C0541A8 */ lui $a1, 0x41A8 ## $a1 = 41A80000 -/* 01820 80911E60 1040000D */ beq $v0, $zero, .L80911E98 +/* 01820 80911E60 1040000D */ beq $v0, $zero, .L80911E98 /* 01824 80911E64 3C040601 */ lui $a0, 0x0601 ## $a0 = 06010000 /* 01828 80911E68 0C028800 */ jal SkelAnime_GetFrameCount - + /* 0182C 80911E6C 2484F48C */ addiu $a0, $a0, 0xF48C ## $a0 = 0600F48C /* 01830 80911E70 44824000 */ mtc1 $v0, $f8 ## $f8 = 0.00 /* 01834 80911E74 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 /* 01838 80911E78 24A5F48C */ addiu $a1, $a1, 0xF48C ## $a1 = 0600F48C -/* 0183C 80911E7C 468042A0 */ cvt.s.w $f10, $f8 +/* 0183C 80911E7C 468042A0 */ cvt.s.w $f10, $f8 /* 01840 80911E80 24060000 */ addiu $a2, $zero, 0x0000 ## $a2 = 00000000 /* 01844 80911E84 E60A01D0 */ swc1 $f10, 0x01D0($s0) ## 000001D0 -/* 01848 80911E88 0C029490 */ jal func_800A5240 -/* 0184C 80911E8C 8FA40044 */ lw $a0, 0x0044($sp) +/* 01848 80911E88 0C029490 */ jal SkelAnime_ChangeAnimTransitionStop +/* 0184C 80911E8C 8FA40044 */ lw $a0, 0x0044($sp) /* 01850 80911E90 2418000A */ addiu $t8, $zero, 0x000A ## $t8 = 0000000A /* 01854 80911E94 A61801A4 */ sh $t8, 0x01A4($s0) ## 000001A4 .L80911E98: /* 01858 80911E98 861901A4 */ lh $t9, 0x01A4($s0) ## 000001A4 .L80911E9C: -/* 0185C 80911E9C 8FA40044 */ lw $a0, 0x0044($sp) +/* 0185C 80911E9C 8FA40044 */ lw $a0, 0x0044($sp) /* 01860 80911EA0 44998000 */ mtc1 $t9, $f16 ## $f16 = 0.00 /* 01864 80911EA4 00000000 */ nop -/* 01868 80911EA8 46808420 */ cvt.s.w $f16, $f16 -/* 0186C 80911EAC 44058000 */ mfc1 $a1, $f16 -/* 01870 80911EB0 0C0295B2 */ jal func_800A56C8 +/* 01868 80911EA8 46808420 */ cvt.s.w $f16, $f16 +/* 0186C 80911EAC 44058000 */ mfc1 $a1, $f16 +/* 01870 80911EB0 0C0295B2 */ jal func_800A56C8 /* 01874 80911EB4 00000000 */ nop -/* 01878 80911EB8 50400011 */ beql $v0, $zero, .L80911F00 +/* 01878 80911EB8 50400011 */ beql $v0, $zero, .L80911F00 /* 0187C 80911EBC 860901A4 */ lh $t1, 0x01A4($s0) ## 000001A4 /* 01880 80911EC0 920801C9 */ lbu $t0, 0x01C9($s0) ## 000001C9 /* 01884 80911EC4 240538A6 */ addiu $a1, $zero, 0x38A6 ## $a1 = 000038A6 /* 01888 80911EC8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0188C 80911ECC 29010002 */ slti $at, $t0, 0x0002 -/* 01890 80911ED0 10200005 */ beq $at, $zero, .L80911EE8 +/* 0188C 80911ECC 29010002 */ slti $at, $t0, 0x0002 +/* 01890 80911ED0 10200005 */ beq $at, $zero, .L80911EE8 /* 01894 80911ED4 00000000 */ nop /* 01898 80911ED8 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 0189C 80911EDC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 018A0 80911EE0 10000004 */ beq $zero, $zero, .L80911EF4 +/* 018A0 80911EE0 10000004 */ beq $zero, $zero, .L80911EF4 /* 018A4 80911EE4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 .L80911EE8: /* 018A8 80911EE8 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 018AC 80911EEC 240538A5 */ addiu $a1, $zero, 0x38A5 ## $a1 = 000038A5 /* 018B0 80911EF0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 .L80911EF4: /* 018B4 80911EF4 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 018B8 80911EF8 240538B2 */ addiu $a1, $zero, 0x38B2 ## $a1 = 000038B2 /* 018BC 80911EFC 860901A4 */ lh $t1, 0x01A4($s0) ## 000001A4 .L80911F00: -/* 018C0 80911F00 8FA40044 */ lw $a0, 0x0044($sp) +/* 018C0 80911F00 8FA40044 */ lw $a0, 0x0044($sp) /* 018C4 80911F04 44899000 */ mtc1 $t1, $f18 ## $f18 = 0.00 /* 018C8 80911F08 00000000 */ nop -/* 018CC 80911F0C 468094A0 */ cvt.s.w $f18, $f18 -/* 018D0 80911F10 44059000 */ mfc1 $a1, $f18 -/* 018D4 80911F14 0C0295B2 */ jal func_800A56C8 +/* 018CC 80911F0C 468094A0 */ cvt.s.w $f18, $f18 +/* 018D0 80911F10 44059000 */ mfc1 $a1, $f18 +/* 018D4 80911F14 0C0295B2 */ jal func_800A56C8 /* 018D8 80911F18 00000000 */ nop -/* 018DC 80911F1C 50400017 */ beql $v0, $zero, .L80911F7C +/* 018DC 80911F1C 50400017 */ beql $v0, $zero, .L80911F7C /* 018E0 80911F20 260400B6 */ addiu $a0, $s0, 0x00B6 ## $a0 = 000000B6 /* 018E4 80911F24 8E0A011C */ lw $t2, 0x011C($s0) ## 0000011C -/* 018E8 80911F28 8FA60054 */ lw $a2, 0x0054($sp) +/* 018E8 80911F28 8FA60054 */ lw $a2, 0x0054($sp) /* 018EC 80911F2C 240C0032 */ addiu $t4, $zero, 0x0032 ## $t4 = 00000032 -/* 018F0 80911F30 AFAA004C */ sw $t2, 0x004C($sp) +/* 018F0 80911F30 AFAA004C */ sw $t2, 0x004C($sp) /* 018F4 80911F34 C6040200 */ lwc1 $f4, 0x0200($s0) ## 00000200 /* 018F8 80911F38 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 018FC 80911F3C 2407006D */ addiu $a3, $zero, 0x006D ## $a3 = 0000006D -/* 01900 80911F40 E7A40010 */ swc1 $f4, 0x0010($sp) +/* 01900 80911F40 E7A40010 */ swc1 $f4, 0x0010($sp) /* 01904 80911F44 C6060204 */ lwc1 $f6, 0x0204($s0) ## 00000204 /* 01908 80911F48 24C41C24 */ addiu $a0, $a2, 0x1C24 ## $a0 = 00001C24 -/* 0190C 80911F4C E7A60014 */ swc1 $f6, 0x0014($sp) +/* 0190C 80911F4C E7A60014 */ swc1 $f6, 0x0014($sp) /* 01910 80911F50 C6080208 */ lwc1 $f8, 0x0208($s0) ## 00000208 -/* 01914 80911F54 E7A80018 */ swc1 $f8, 0x0018($sp) +/* 01914 80911F54 E7A80018 */ swc1 $f8, 0x0018($sp) /* 01918 80911F58 860B01A2 */ lh $t3, 0x01A2($s0) ## 000001A2 -/* 0191C 80911F5C AFAC0028 */ sw $t4, 0x0028($sp) -/* 01920 80911F60 AFA00024 */ sw $zero, 0x0024($sp) -/* 01924 80911F64 AFA00020 */ sw $zero, 0x0020($sp) +/* 0191C 80911F5C AFAC0028 */ sw $t4, 0x0028($sp) +/* 01920 80911F60 AFA00024 */ sw $zero, 0x0024($sp) +/* 01924 80911F64 AFA00020 */ sw $zero, 0x0020($sp) /* 01928 80911F68 0C00C916 */ jal Actor_SpawnAttached - -/* 0192C 80911F6C AFAB001C */ sw $t3, 0x001C($sp) -/* 01930 80911F70 8FAD004C */ lw $t5, 0x004C($sp) + +/* 0192C 80911F6C AFAB001C */ sw $t3, 0x001C($sp) +/* 01930 80911F70 8FAD004C */ lw $t5, 0x004C($sp) /* 01934 80911F74 AE0D011C */ sw $t5, 0x011C($s0) ## 0000011C /* 01938 80911F78 260400B6 */ addiu $a0, $s0, 0x00B6 ## $a0 = 000000B6 .L80911F7C: /* 0193C 80911F7C 8605008A */ lh $a1, 0x008A($s0) ## 0000008A /* 01940 80911F80 24060005 */ addiu $a2, $zero, 0x0005 ## $a2 = 00000005 /* 01944 80911F84 0C01E1EF */ jal Math_SmoothScaleMaxS - + /* 01948 80911F88 240707D0 */ addiu $a3, $zero, 0x07D0 ## $a3 = 000007D0 /* 0194C 80911F8C C60A0024 */ lwc1 $f10, 0x0024($s0) ## 00000024 /* 01950 80911F90 C610005C */ lwc1 $f16, 0x005C($s0) ## 0000005C /* 01954 80911F94 C604002C */ lwc1 $f4, 0x002C($s0) ## 0000002C /* 01958 80911F98 C6060064 */ lwc1 $f6, 0x0064($s0) ## 00000064 -/* 0195C 80911F9C 46105480 */ add.s $f18, $f10, $f16 +/* 0195C 80911F9C 46105480 */ add.s $f18, $f10, $f16 /* 01960 80911FA0 2604005C */ addiu $a0, $s0, 0x005C ## $a0 = 0000005C /* 01964 80911FA4 3C053F80 */ lui $a1, 0x3F80 ## $a1 = 3F800000 -/* 01968 80911FA8 46062200 */ add.s $f8, $f4, $f6 +/* 01968 80911FA8 46062200 */ add.s $f8, $f4, $f6 /* 0196C 80911FAC E6120024 */ swc1 $f18, 0x0024($s0) ## 00000024 /* 01970 80911FB0 3C063F00 */ lui $a2, 0x3F00 ## $a2 = 3F000000 /* 01974 80911FB4 0C01E123 */ jal Math_SmoothDownscaleMaxF - + /* 01978 80911FB8 E608002C */ swc1 $f8, 0x002C($s0) ## 0000002C /* 0197C 80911FBC 26040064 */ addiu $a0, $s0, 0x0064 ## $a0 = 00000064 /* 01980 80911FC0 3C053F80 */ lui $a1, 0x3F80 ## $a1 = 3F800000 /* 01984 80911FC4 0C01E123 */ jal Math_SmoothDownscaleMaxF - + /* 01988 80911FC8 3C063F00 */ lui $a2, 0x3F00 ## $a2 = 3F000000 /* 0198C 80911FCC 86040194 */ lh $a0, 0x0194($s0) ## 00000194 -/* 01990 80911FD0 00800821 */ addu $at, $a0, $zero -/* 01994 80911FD4 00042080 */ sll $a0, $a0, 2 -/* 01998 80911FD8 00812023 */ subu $a0, $a0, $at -/* 0199C 80911FDC 00042100 */ sll $a0, $a0, 4 -/* 019A0 80911FE0 00812023 */ subu $a0, $a0, $at -/* 019A4 80911FE4 000420C0 */ sll $a0, $a0, 3 -/* 019A8 80911FE8 00812023 */ subu $a0, $a0, $at -/* 019AC 80911FEC 00042080 */ sll $a0, $a0, 2 -/* 019B0 80911FF0 00042400 */ sll $a0, $a0, 16 +/* 01990 80911FD0 00800821 */ addu $at, $a0, $zero +/* 01994 80911FD4 00042080 */ sll $a0, $a0, 2 +/* 01998 80911FD8 00812023 */ subu $a0, $a0, $at +/* 0199C 80911FDC 00042100 */ sll $a0, $a0, 4 +/* 019A0 80911FE0 00812023 */ subu $a0, $a0, $at +/* 019A4 80911FE4 000420C0 */ sll $a0, $a0, 3 +/* 019A8 80911FE8 00812023 */ subu $a0, $a0, $at +/* 019AC 80911FEC 00042080 */ sll $a0, $a0, 2 +/* 019B0 80911FF0 00042400 */ sll $a0, $a0, 16 /* 019B4 80911FF4 0C01DE1C */ jal Math_Sins ## sins? -/* 019B8 80911FF8 00042403 */ sra $a0, $a0, 16 -/* 019BC 80911FFC 46000400 */ add.s $f16, $f0, $f0 +/* 019B8 80911FF8 00042403 */ sra $a0, $a0, 16 +/* 019BC 80911FFC 46000400 */ add.s $f16, $f0, $f0 /* 019C0 80912000 C60A0028 */ lwc1 $f10, 0x0028($s0) ## 00000028 -/* 019C4 80912004 46105480 */ add.s $f18, $f10, $f16 +/* 019C4 80912004 46105480 */ add.s $f18, $f10, $f16 /* 019C8 80912008 E6120028 */ swc1 $f18, 0x0028($s0) ## 00000028 -/* 019CC 8091200C 8FBF003C */ lw $ra, 0x003C($sp) -/* 019D0 80912010 8FB00038 */ lw $s0, 0x0038($sp) +/* 019CC 8091200C 8FBF003C */ lw $ra, 0x003C($sp) +/* 019D0 80912010 8FB00038 */ lw $s0, 0x0038($sp) /* 019D4 80912014 27BD0050 */ addiu $sp, $sp, 0x0050 ## $sp = 00000000 -/* 019D8 80912018 03E00008 */ jr $ra +/* 019D8 80912018 03E00008 */ jr $ra /* 019DC 8091201C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_80912020.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_80912020.s index ad45446347..0e7cde88a4 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_80912020.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_80912020.s @@ -1,44 +1,44 @@ glabel func_80912020 /* 019E0 80912020 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 019E4 80912024 AFBF0014 */ sw $ra, 0x0014($sp) -/* 019E8 80912028 AFA40020 */ sw $a0, 0x0020($sp) +/* 019E4 80912024 AFBF0014 */ sw $ra, 0x0014($sp) +/* 019E8 80912028 AFA40020 */ sw $a0, 0x0020($sp) /* 019EC 8091202C 0C03F66B */ jal Math_Rand_ZeroOne ## Rand.Next() float -/* 019F0 80912030 AFA50024 */ sw $a1, 0x0024($sp) +/* 019F0 80912030 AFA50024 */ sw $a1, 0x0024($sp) /* 019F4 80912034 3C018091 */ lui $at, %hi(D_8091543C) ## $at = 80910000 -/* 019F8 80912038 C424543C */ lwc1 $f4, %lo(D_8091543C)($at) +/* 019F8 80912038 C424543C */ lwc1 $f4, %lo(D_8091543C)($at) /* 019FC 8091203C 3C048091 */ lui $a0, %hi(D_809150D0) ## $a0 = 80910000 -/* 01A00 80912040 46040182 */ mul.s $f6, $f0, $f4 -/* 01A04 80912044 4600320D */ trunc.w.s $f8, $f6 -/* 01A08 80912048 44024000 */ mfc1 $v0, $f8 +/* 01A00 80912040 46040182 */ mul.s $f6, $f0, $f4 +/* 01A04 80912044 4600320D */ trunc.w.s $f8, $f6 +/* 01A08 80912048 44024000 */ mfc1 $v0, $f8 /* 01A0C 8091204C 00000000 */ nop -/* 01A10 80912050 00027C00 */ sll $t7, $v0, 16 -/* 01A14 80912054 000FC403 */ sra $t8, $t7, 16 -/* 01A18 80912058 0018C880 */ sll $t9, $t8, 2 -/* 01A1C 8091205C 00992021 */ addu $a0, $a0, $t9 -/* 01A20 80912060 8C8450D0 */ lw $a0, %lo(D_809150D0)($a0) +/* 01A10 80912050 00027C00 */ sll $t7, $v0, 16 +/* 01A14 80912054 000FC403 */ sra $t8, $t7, 16 +/* 01A18 80912058 0018C880 */ sll $t9, $t8, 2 +/* 01A1C 8091205C 00992021 */ addu $a0, $a0, $t9 +/* 01A20 80912060 8C8450D0 */ lw $a0, %lo(D_809150D0)($a0) /* 01A24 80912064 0C028800 */ jal SkelAnime_GetFrameCount - -/* 01A28 80912068 A7A2001E */ sh $v0, 0x001E($sp) + +/* 01A28 80912068 A7A2001E */ sh $v0, 0x001E($sp) /* 01A2C 8091206C 44825000 */ mtc1 $v0, $f10 ## $f10 = 0.00 -/* 01A30 80912070 8FA30020 */ lw $v1, 0x0020($sp) +/* 01A30 80912070 8FA30020 */ lw $v1, 0x0020($sp) /* 01A34 80912074 3C058091 */ lui $a1, %hi(D_809150D0) ## $a1 = 80910000 -/* 01A38 80912078 46805420 */ cvt.s.w $f16, $f10 +/* 01A38 80912078 46805420 */ cvt.s.w $f16, $f10 /* 01A3C 8091207C 24060000 */ addiu $a2, $zero, 0x0000 ## $a2 = 00000000 /* 01A40 80912080 2464014C */ addiu $a0, $v1, 0x014C ## $a0 = 0000014C /* 01A44 80912084 E47001D0 */ swc1 $f16, 0x01D0($v1) ## 000001D0 -/* 01A48 80912088 87A8001E */ lh $t0, 0x001E($sp) -/* 01A4C 8091208C 00084880 */ sll $t1, $t0, 2 -/* 01A50 80912090 00A92821 */ addu $a1, $a1, $t1 -/* 01A54 80912094 0C029490 */ jal func_800A5240 -/* 01A58 80912098 8CA550D0 */ lw $a1, %lo(D_809150D0)($a1) -/* 01A5C 8091209C 8FAB0020 */ lw $t3, 0x0020($sp) +/* 01A48 80912088 87A8001E */ lh $t0, 0x001E($sp) +/* 01A4C 8091208C 00084880 */ sll $t1, $t0, 2 +/* 01A50 80912090 00A92821 */ addu $a1, $a1, $t1 +/* 01A54 80912094 0C029490 */ jal SkelAnime_ChangeAnimTransitionStop +/* 01A58 80912098 8CA550D0 */ lw $a1, %lo(D_809150D0)($a1) +/* 01A5C 8091209C 8FAB0020 */ lw $t3, 0x0020($sp) /* 01A60 809120A0 3C0A8091 */ lui $t2, %hi(func_809120BC) ## $t2 = 80910000 /* 01A64 809120A4 254A20BC */ addiu $t2, $t2, %lo(func_809120BC) ## $t2 = 809120BC /* 01A68 809120A8 AD6A0190 */ sw $t2, 0x0190($t3) ## 00000190 -/* 01A6C 809120AC 8FBF0014 */ lw $ra, 0x0014($sp) +/* 01A6C 809120AC 8FBF0014 */ lw $ra, 0x0014($sp) /* 01A70 809120B0 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 01A74 809120B4 03E00008 */ jr $ra +/* 01A74 809120B4 03E00008 */ jr $ra /* 01A78 809120B8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_809121E0.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_809121E0.s index 374f17d6d0..eb875a2c61 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_809121E0.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_809121E0.s @@ -2,55 +2,55 @@ glabel func_809121E0 /* 01BA0 809121E0 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 /* 01BA4 809121E4 3C0E8091 */ lui $t6, %hi(func_809122A4) ## $t6 = 80910000 /* 01BA8 809121E8 25CE22A4 */ addiu $t6, $t6, %lo(func_809122A4) ## $t6 = 809122A4 -/* 01BAC 809121EC AFBF001C */ sw $ra, 0x001C($sp) -/* 01BB0 809121F0 AFB00018 */ sw $s0, 0x0018($sp) -/* 01BB4 809121F4 AFA5002C */ sw $a1, 0x002C($sp) -/* 01BB8 809121F8 AFAE0024 */ sw $t6, 0x0024($sp) +/* 01BAC 809121EC AFBF001C */ sw $ra, 0x001C($sp) +/* 01BB0 809121F0 AFB00018 */ sw $s0, 0x0018($sp) +/* 01BB4 809121F4 AFA5002C */ sw $a1, 0x002C($sp) +/* 01BB8 809121F8 AFAE0024 */ sw $t6, 0x0024($sp) /* 01BBC 809121FC 8C8F0190 */ lw $t7, 0x0190($a0) ## 00000190 /* 01BC0 80912200 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 01BC4 80912204 3C040601 */ lui $a0, 0x0601 ## $a0 = 06010000 -/* 01BC8 80912208 11CF0011 */ beq $t6, $t7, .L80912250 +/* 01BC8 80912208 11CF0011 */ beq $t6, $t7, .L80912250 /* 01BCC 8091220C 00000000 */ nop /* 01BD0 80912210 3C040601 */ lui $a0, 0x0601 ## $a0 = 06010000 /* 01BD4 80912214 0C028800 */ jal SkelAnime_GetFrameCount - + /* 01BD8 80912218 248408D8 */ addiu $a0, $a0, 0x08D8 ## $a0 = 060108D8 /* 01BDC 8091221C 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 01BE0 80912220 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 /* 01BE4 80912224 24A508D8 */ addiu $a1, $a1, 0x08D8 ## $a1 = 060108D8 -/* 01BE8 80912228 468021A0 */ cvt.s.w $f6, $f4 +/* 01BE8 80912228 468021A0 */ cvt.s.w $f6, $f4 /* 01BEC 8091222C 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C /* 01BF0 80912230 24060000 */ addiu $a2, $zero, 0x0000 ## $a2 = 00000000 -/* 01BF4 80912234 0C0294D3 */ jal func_800A534C +/* 01BF4 80912234 0C0294D3 */ jal SkelAnime_ChangeAnimTransitionRepeat /* 01BF8 80912238 E60601D0 */ swc1 $f6, 0x01D0($s0) ## 000001D0 /* 01BFC 8091223C 24180032 */ addiu $t8, $zero, 0x0032 ## $t8 = 00000032 /* 01C00 80912240 2419003C */ addiu $t9, $zero, 0x003C ## $t9 = 0000003C /* 01C04 80912244 A61801BC */ sh $t8, 0x01BC($s0) ## 000001BC -/* 01C08 80912248 1000000B */ beq $zero, $zero, .L80912278 +/* 01C08 80912248 1000000B */ beq $zero, $zero, .L80912278 /* 01C0C 8091224C A21901C8 */ sb $t9, 0x01C8($s0) ## 000001C8 .L80912250: /* 01C10 80912250 0C028800 */ jal SkelAnime_GetFrameCount - + /* 01C14 80912254 2484FAC8 */ addiu $a0, $a0, 0xFAC8 ## $a0 = FFFFFAC8 /* 01C18 80912258 44824000 */ mtc1 $v0, $f8 ## $f8 = 0.00 /* 01C1C 8091225C 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 /* 01C20 80912260 24A5FAC8 */ addiu $a1, $a1, 0xFAC8 ## $a1 = 0600FAC8 -/* 01C24 80912264 468042A0 */ cvt.s.w $f10, $f8 +/* 01C24 80912264 468042A0 */ cvt.s.w $f10, $f8 /* 01C28 80912268 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C /* 01C2C 8091226C 24060000 */ addiu $a2, $zero, 0x0000 ## $a2 = 00000000 -/* 01C30 80912270 0C0294D3 */ jal func_800A534C +/* 01C30 80912270 0C0294D3 */ jal SkelAnime_ChangeAnimTransitionRepeat /* 01C34 80912274 E60A01D0 */ swc1 $f10, 0x01D0($s0) ## 000001D0 .L80912278: /* 01C38 80912278 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 01C3C 8091227C 8FA80024 */ lw $t0, 0x0024($sp) +/* 01C3C 8091227C 8FA80024 */ lw $t0, 0x0024($sp) /* 01C40 80912280 A60001A2 */ sh $zero, 0x01A2($s0) ## 000001A2 /* 01C44 80912284 E600005C */ swc1 $f0, 0x005C($s0) ## 0000005C /* 01C48 80912288 AE080190 */ sw $t0, 0x0190($s0) ## 00000190 /* 01C4C 8091228C E6000064 */ swc1 $f0, 0x0064($s0) ## 00000064 -/* 01C50 80912290 8FBF001C */ lw $ra, 0x001C($sp) -/* 01C54 80912294 8FB00018 */ lw $s0, 0x0018($sp) +/* 01C50 80912290 8FBF001C */ lw $ra, 0x001C($sp) +/* 01C54 80912294 8FB00018 */ lw $s0, 0x0018($sp) /* 01C58 80912298 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 01C5C 8091229C 03E00008 */ jr $ra +/* 01C5C 8091229C 03E00008 */ jr $ra /* 01C60 809122A0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_809122A4.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_809122A4.s index 3b6dcb9947..109747fa04 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_809122A4.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_809122A4.s @@ -1,42 +1,42 @@ glabel func_809122A4 /* 01C64 809122A4 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 01C68 809122A8 AFB00018 */ sw $s0, 0x0018($sp) +/* 01C68 809122A8 AFB00018 */ sw $s0, 0x0018($sp) /* 01C6C 809122AC 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 01C70 809122B0 AFBF001C */ sw $ra, 0x001C($sp) +/* 01C70 809122B0 AFBF001C */ sw $ra, 0x001C($sp) /* 01C74 809122B4 3C048091 */ lui $a0, %hi(D_80915268) ## $a0 = 80910000 -/* 01C78 809122B8 AFA5002C */ sw $a1, 0x002C($sp) +/* 01C78 809122B8 AFA5002C */ sw $a1, 0x002C($sp) /* 01C7C 809122BC 0C00084C */ jal osSyncPrintf - + /* 01C80 809122C0 24845268 */ addiu $a0, $a0, %lo(D_80915268) ## $a0 = 80915268 /* 01C84 809122C4 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C /* 01C88 809122C8 0C02927F */ jal SkelAnime_FrameUpdateMatrix - -/* 01C8C 809122CC AFA40024 */ sw $a0, 0x0024($sp) + +/* 01C8C 809122CC AFA40024 */ sw $a0, 0x0024($sp) /* 01C90 809122D0 3C018091 */ lui $at, %hi(D_80915440) ## $at = 80910000 -/* 01C94 809122D4 C4245440 */ lwc1 $f4, %lo(D_80915440)($at) +/* 01C94 809122D4 C4245440 */ lwc1 $f4, %lo(D_80915440)($at) /* 01C98 809122D8 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 /* 01C9C 809122DC 44813000 */ mtc1 $at, $f6 ## $f6 = 5.00 /* 01CA0 809122E0 C6080028 */ lwc1 $f8, 0x0028($s0) ## 00000028 /* 01CA4 809122E4 E604006C */ swc1 $f4, 0x006C($s0) ## 0000006C -/* 01CA8 809122E8 4606403E */ c.le.s $f8, $f6 +/* 01CA8 809122E8 4606403E */ c.le.s $f8, $f6 /* 01CAC 809122EC 00000000 */ nop -/* 01CB0 809122F0 4500001E */ bc1f .L8091236C +/* 01CB0 809122F0 4500001E */ bc1f .L8091236C /* 01CB4 809122F4 00000000 */ nop /* 01CB8 809122F8 860E01A2 */ lh $t6, 0x01A2($s0) ## 000001A2 /* 01CBC 809122FC 3C040601 */ lui $a0, 0x0601 ## $a0 = 06010000 -/* 01CC0 80912300 55C0000E */ bnel $t6, $zero, .L8091233C +/* 01CC0 80912300 55C0000E */ bnel $t6, $zero, .L8091233C /* 01CC4 80912304 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 /* 01CC8 80912308 0C028800 */ jal SkelAnime_GetFrameCount - + /* 01CCC 8091230C 24841BCC */ addiu $a0, $a0, 0x1BCC ## $a0 = 06011BCC /* 01CD0 80912310 44825000 */ mtc1 $v0, $f10 ## $f10 = 0.00 /* 01CD4 80912314 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 /* 01CD8 80912318 24A51BCC */ addiu $a1, $a1, 0x1BCC ## $a1 = 06011BCC -/* 01CDC 8091231C 46805420 */ cvt.s.w $f16, $f10 +/* 01CDC 8091231C 46805420 */ cvt.s.w $f16, $f10 /* 01CE0 80912320 3C06C120 */ lui $a2, 0xC120 ## $a2 = C1200000 /* 01CE4 80912324 E61001D0 */ swc1 $f16, 0x01D0($s0) ## 000001D0 -/* 01CE8 80912328 0C0294D3 */ jal func_800A534C -/* 01CEC 8091232C 8FA40024 */ lw $a0, 0x0024($sp) +/* 01CE8 80912328 0C0294D3 */ jal SkelAnime_ChangeAnimTransitionRepeat +/* 01CEC 8091232C 8FA40024 */ lw $a0, 0x0024($sp) /* 01CF0 80912330 240F0001 */ addiu $t7, $zero, 0x0001 ## $t7 = 00000001 /* 01CF4 80912334 A60F01A2 */ sh $t7, 0x01A2($s0) ## 000001A2 /* 01CF8 80912338 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 @@ -44,12 +44,12 @@ glabel func_809122A4 /* 01CFC 8091233C 8E0501D0 */ lw $a1, 0x01D0($s0) ## 000001D0 /* 01D00 80912340 E6000060 */ swc1 $f0, 0x0060($s0) ## 00000060 /* 01D04 80912344 E600006C */ swc1 $f0, 0x006C($s0) ## 0000006C -/* 01D08 80912348 0C0295B2 */ jal func_800A56C8 -/* 01D0C 8091234C 8FA40024 */ lw $a0, 0x0024($sp) -/* 01D10 80912350 10400003 */ beq $v0, $zero, .L80912360 +/* 01D08 80912348 0C0295B2 */ jal func_800A56C8 +/* 01D0C 8091234C 8FA40024 */ lw $a0, 0x0024($sp) +/* 01D10 80912350 10400003 */ beq $v0, $zero, .L80912360 /* 01D14 80912354 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 01D18 80912358 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 01D1C 8091235C 240538B1 */ addiu $a1, $zero, 0x38B1 ## $a1 = 000038B1 .L80912360: /* 01D20 80912360 8E180004 */ lw $t8, 0x0004($s0) ## 00000004 @@ -59,13 +59,13 @@ glabel func_809122A4 /* 01D2C 8091236C 3C048091 */ lui $a0, %hi(D_80915294) ## $a0 = 80910000 /* 01D30 80912370 24845294 */ addiu $a0, $a0, %lo(D_80915294) ## $a0 = 80915294 /* 01D34 80912374 0C00084C */ jal osSyncPrintf - + /* 01D38 80912378 860501BC */ lh $a1, 0x01BC($s0) ## 000001BC /* 01D3C 8091237C 860801BC */ lh $t0, 0x01BC($s0) ## 000001BC /* 01D40 80912380 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01D44 80912384 1500000C */ bne $t0, $zero, .L809123B8 +/* 01D44 80912384 1500000C */ bne $t0, $zero, .L809123B8 /* 01D48 80912388 00000000 */ nop -/* 01D4C 8091238C 0C24453A */ jal func_809114E8 +/* 01D4C 8091238C 0C24453A */ jal func_809114E8 /* 01D50 80912390 3C05C0A0 */ lui $a1, 0xC0A0 ## $a1 = C0A00000 /* 01D54 80912394 44809000 */ mtc1 $zero, $f18 ## $f18 = 0.00 /* 01D58 80912398 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 @@ -78,12 +78,12 @@ glabel func_809122A4 /* 01D74 809123B4 E604006C */ swc1 $f4, 0x006C($s0) ## 0000006C .L809123B8: /* 01D78 809123B8 0C00B638 */ jal Actor_MoveForward - + /* 01D7C 809123BC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01D80 809123C0 8FBF001C */ lw $ra, 0x001C($sp) -/* 01D84 809123C4 8FB00018 */ lw $s0, 0x0018($sp) +/* 01D80 809123C0 8FBF001C */ lw $ra, 0x001C($sp) +/* 01D84 809123C4 8FB00018 */ lw $s0, 0x0018($sp) /* 01D88 809123C8 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 01D8C 809123CC 03E00008 */ jr $ra +/* 01D8C 809123CC 03E00008 */ jr $ra /* 01D90 809123D0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_809123D4.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_809123D4.s index 6923e600ae..7ade13a92b 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_809123D4.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_809123D4.s @@ -1,34 +1,34 @@ glabel func_809123D4 /* 01D94 809123D4 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 01D98 809123D8 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 -/* 01D9C 809123DC AFBF0014 */ sw $ra, 0x0014($sp) +/* 01D9C 809123DC AFBF0014 */ sw $ra, 0x0014($sp) /* 01DA0 809123E0 3C040601 */ lui $a0, 0x0601 ## $a0 = 06010000 -/* 01DA4 809123E4 AFA5001C */ sw $a1, 0x001C($sp) +/* 01DA4 809123E4 AFA5001C */ sw $a1, 0x001C($sp) /* 01DA8 809123E8 24840344 */ addiu $a0, $a0, 0x0344 ## $a0 = 06010344 /* 01DAC 809123EC 0C028800 */ jal SkelAnime_GetFrameCount - -/* 01DB0 809123F0 AFA70018 */ sw $a3, 0x0018($sp) + +/* 01DB0 809123F0 AFA70018 */ sw $a3, 0x0018($sp) /* 01DB4 809123F4 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 -/* 01DB8 809123F8 8FA70018 */ lw $a3, 0x0018($sp) +/* 01DB8 809123F8 8FA70018 */ lw $a3, 0x0018($sp) /* 01DBC 809123FC 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 -/* 01DC0 80912400 468021A0 */ cvt.s.w $f6, $f4 +/* 01DC0 80912400 468021A0 */ cvt.s.w $f6, $f4 /* 01DC4 80912404 24A50344 */ addiu $a1, $a1, 0x0344 ## $a1 = 06010344 /* 01DC8 80912408 3C06C040 */ lui $a2, 0xC040 ## $a2 = C0400000 /* 01DCC 8091240C 24E4014C */ addiu $a0, $a3, 0x014C ## $a0 = 0000014C -/* 01DD0 80912410 0C0294D3 */ jal func_800A534C +/* 01DD0 80912410 0C0294D3 */ jal SkelAnime_ChangeAnimTransitionRepeat /* 01DD4 80912414 E4E601D0 */ swc1 $f6, 0x01D0($a3) ## 000001D0 -/* 01DD8 80912418 8FA40018 */ lw $a0, 0x0018($sp) +/* 01DD8 80912418 8FA40018 */ lw $a0, 0x0018($sp) /* 01DDC 8091241C 3C0E8091 */ lui $t6, %hi(func_80912448) ## $t6 = 80910000 /* 01DE0 80912420 25CE2448 */ addiu $t6, $t6, %lo(func_80912448) ## $t6 = 80912448 /* 01DE4 80912424 240F000A */ addiu $t7, $zero, 0x000A ## $t7 = 0000000A /* 01DE8 80912428 240538AA */ addiu $a1, $zero, 0x38AA ## $a1 = 000038AA /* 01DEC 8091242C AC8E0190 */ sw $t6, 0x0190($a0) ## 00000190 /* 01DF0 80912430 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 01DF4 80912434 A48F01BC */ sh $t7, 0x01BC($a0) ## 000001BC -/* 01DF8 80912438 8FBF0014 */ lw $ra, 0x0014($sp) +/* 01DF8 80912438 8FBF0014 */ lw $ra, 0x0014($sp) /* 01DFC 8091243C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 01E00 80912440 03E00008 */ jr $ra +/* 01E00 80912440 03E00008 */ jr $ra /* 01E04 80912444 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_80912524.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_80912524.s index 8611500f68..e2ec7dfea9 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_80912524.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_80912524.s @@ -1,32 +1,32 @@ glabel func_80912524 /* 01EE4 80912524 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 01EE8 80912528 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 -/* 01EEC 8091252C AFBF0014 */ sw $ra, 0x0014($sp) +/* 01EEC 8091252C AFBF0014 */ sw $ra, 0x0014($sp) /* 01EF0 80912530 3C040601 */ lui $a0, 0x0601 ## $a0 = 06010000 -/* 01EF4 80912534 AFA5001C */ sw $a1, 0x001C($sp) +/* 01EF4 80912534 AFA5001C */ sw $a1, 0x001C($sp) /* 01EF8 80912538 248429E0 */ addiu $a0, $a0, 0x29E0 ## $a0 = 060129E0 /* 01EFC 8091253C 0C028800 */ jal SkelAnime_GetFrameCount - -/* 01F00 80912540 AFA70018 */ sw $a3, 0x0018($sp) + +/* 01F00 80912540 AFA70018 */ sw $a3, 0x0018($sp) /* 01F04 80912544 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 -/* 01F08 80912548 8FA70018 */ lw $a3, 0x0018($sp) +/* 01F08 80912548 8FA70018 */ lw $a3, 0x0018($sp) /* 01F0C 8091254C 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 -/* 01F10 80912550 468021A0 */ cvt.s.w $f6, $f4 +/* 01F10 80912550 468021A0 */ cvt.s.w $f6, $f4 /* 01F14 80912554 24A529E0 */ addiu $a1, $a1, 0x29E0 ## $a1 = 060129E0 /* 01F18 80912558 3C06C040 */ lui $a2, 0xC040 ## $a2 = C0400000 /* 01F1C 8091255C 24E4014C */ addiu $a0, $a3, 0x014C ## $a0 = 0000014C -/* 01F20 80912560 0C0294D3 */ jal func_800A534C +/* 01F20 80912560 0C0294D3 */ jal SkelAnime_ChangeAnimTransitionRepeat /* 01F24 80912564 E4E601D0 */ swc1 $f6, 0x01D0($a3) ## 000001D0 -/* 01F28 80912568 8FA70018 */ lw $a3, 0x0018($sp) +/* 01F28 80912568 8FA70018 */ lw $a3, 0x0018($sp) /* 01F2C 8091256C 3C0E8091 */ lui $t6, %hi(func_80912594) ## $t6 = 80910000 /* 01F30 80912570 25CE2594 */ addiu $t6, $t6, %lo(func_80912594) ## $t6 = 80912594 /* 01F34 80912574 240F0014 */ addiu $t7, $zero, 0x0014 ## $t7 = 00000014 /* 01F38 80912578 ACEE0190 */ sw $t6, 0x0190($a3) ## 00000190 /* 01F3C 8091257C A4EF01BC */ sh $t7, 0x01BC($a3) ## 000001BC /* 01F40 80912580 A4E001A2 */ sh $zero, 0x01A2($a3) ## 000001A2 -/* 01F44 80912584 8FBF0014 */ lw $ra, 0x0014($sp) +/* 01F44 80912584 8FBF0014 */ lw $ra, 0x0014($sp) /* 01F48 80912588 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 01F4C 8091258C 03E00008 */ jr $ra +/* 01F4C 8091258C 03E00008 */ jr $ra /* 01F50 80912590 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_80912594.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_80912594.s index b6bde6a57c..49584e1895 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_80912594.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_80912594.s @@ -1,58 +1,58 @@ glabel func_80912594 /* 01F54 80912594 27BDFF20 */ addiu $sp, $sp, 0xFF20 ## $sp = FFFFFF20 -/* 01F58 80912598 AFB10060 */ sw $s1, 0x0060($sp) -/* 01F5C 8091259C AFBF0064 */ sw $ra, 0x0064($sp) -/* 01F60 809125A0 AFB0005C */ sw $s0, 0x005C($sp) -/* 01F64 809125A4 F7BC0050 */ sdc1 $f28, 0x0050($sp) -/* 01F68 809125A8 F7BA0048 */ sdc1 $f26, 0x0048($sp) -/* 01F6C 809125AC F7B80040 */ sdc1 $f24, 0x0040($sp) -/* 01F70 809125B0 F7B60038 */ sdc1 $f22, 0x0038($sp) -/* 01F74 809125B4 F7B40030 */ sdc1 $f20, 0x0030($sp) +/* 01F58 80912598 AFB10060 */ sw $s1, 0x0060($sp) +/* 01F5C 8091259C AFBF0064 */ sw $ra, 0x0064($sp) +/* 01F60 809125A0 AFB0005C */ sw $s0, 0x005C($sp) +/* 01F64 809125A4 F7BC0050 */ sdc1 $f28, 0x0050($sp) +/* 01F68 809125A8 F7BA0048 */ sdc1 $f26, 0x0048($sp) +/* 01F6C 809125AC F7B80040 */ sdc1 $f24, 0x0040($sp) +/* 01F70 809125B0 F7B60038 */ sdc1 $f22, 0x0038($sp) +/* 01F74 809125B4 F7B40030 */ sdc1 $f20, 0x0030($sp) /* 01F78 809125B8 3C014160 */ lui $at, 0x4160 ## $at = 41600000 /* 01F7C 809125BC 44819000 */ mtc1 $at, $f18 ## $f18 = 14.00 -/* 01F80 809125C0 AFA500E4 */ sw $a1, 0x00E4($sp) +/* 01F80 809125C0 AFA500E4 */ sw $a1, 0x00E4($sp) /* 01F84 809125C4 C4900024 */ lwc1 $f16, 0x0024($a0) ## 00000024 /* 01F88 809125C8 C48E002C */ lwc1 $f14, 0x002C($a0) ## 0000002C /* 01F8C 809125CC 3C018091 */ lui $at, %hi(D_80915444) ## $at = 80910000 -/* 01F90 809125D0 C42C5444 */ lwc1 $f12, %lo(D_80915444)($at) -/* 01F94 809125D4 46128501 */ sub.s $f20, $f16, $f18 +/* 01F90 809125D0 C42C5444 */ lwc1 $f12, %lo(D_80915444)($at) +/* 01F94 809125D4 46128501 */ sub.s $f20, $f16, $f18 /* 01F98 809125D8 00808825 */ or $s1, $a0, $zero ## $s1 = 00000000 /* 01F9C 809125DC 8CB01C44 */ lw $s0, 0x1C44($a1) ## 00001C44 -/* 01FA0 809125E0 460C7581 */ sub.s $f22, $f14, $f12 +/* 01FA0 809125E0 460C7581 */ sub.s $f22, $f14, $f12 /* 01FA4 809125E4 240F0009 */ addiu $t7, $zero, 0x0009 ## $t7 = 00000009 /* 01FA8 809125E8 A08F04F4 */ sb $t7, 0x04F4($a0) ## 000004F4 /* 01FAC 809125EC 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C /* 01FB0 809125F0 0C02927F */ jal SkelAnime_FrameUpdateMatrix - -/* 01FB4 809125F4 AFA40070 */ sw $a0, 0x0070($sp) + +/* 01FB4 809125F4 AFA40070 */ sw $a0, 0x0070($sp) /* 01FB8 809125F8 862301A2 */ lh $v1, 0x01A2($s1) ## 000001A2 -/* 01FBC 809125FC 1060000A */ beq $v1, $zero, .L80912628 +/* 01FBC 809125FC 1060000A */ beq $v1, $zero, .L80912628 /* 01FC0 80912600 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 01FC4 80912604 10610043 */ beq $v1, $at, .L80912714 -/* 01FC8 80912608 8FA40070 */ lw $a0, 0x0070($sp) +/* 01FC4 80912604 10610043 */ beq $v1, $at, .L80912714 +/* 01FC8 80912608 8FA40070 */ lw $a0, 0x0070($sp) /* 01FCC 8091260C 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 01FD0 80912610 10610051 */ beq $v1, $at, .L80912758 +/* 01FD0 80912610 10610051 */ beq $v1, $at, .L80912758 /* 01FD4 80912614 24010003 */ addiu $at, $zero, 0x0003 ## $at = 00000003 -/* 01FD8 80912618 10610094 */ beq $v1, $at, .L8091286C +/* 01FD8 80912618 10610094 */ beq $v1, $at, .L8091286C /* 01FDC 8091261C 00000000 */ nop -/* 01FE0 80912620 100000E7 */ beq $zero, $zero, .L809129C0 +/* 01FE0 80912620 100000E7 */ beq $zero, $zero, .L809129C0 /* 01FE4 80912624 C6200028 */ lwc1 $f0, 0x0028($s1) ## 00000028 .L80912628: /* 01FE8 80912628 862201BC */ lh $v0, 0x01BC($s1) ## 000001BC /* 01FEC 8091262C 240100DA */ addiu $at, $zero, 0x00DA ## $at = 000000DA /* 01FF0 80912630 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 01FF4 80912634 54410005 */ bnel $v0, $at, .L8091264C +/* 01FF4 80912634 54410005 */ bnel $v0, $at, .L8091264C /* 01FF8 80912638 24010013 */ addiu $at, $zero, 0x0013 ## $at = 00000013 /* 01FFC 8091263C 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 02000 80912640 240538AA */ addiu $a1, $zero, 0x38AA ## $a1 = 000038AA /* 02004 80912644 862201BC */ lh $v0, 0x01BC($s1) ## 000001BC /* 02008 80912648 24010013 */ addiu $at, $zero, 0x0013 ## $at = 00000013 .L8091264C: -/* 0200C 8091264C 14410003 */ bne $v0, $at, .L8091265C +/* 0200C 8091264C 14410003 */ bne $v0, $at, .L8091265C /* 02010 80912650 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 02014 80912654 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 02018 80912658 240538A9 */ addiu $a1, $zero, 0x38A9 ## $a1 = 000038A9 .L8091265C: /* 0201C 8091265C C6320024 */ lwc1 $f18, 0x0024($s1) ## 00000024 @@ -62,25 +62,25 @@ glabel func_80912594 /* 0202C 8091266C C628002C */ lwc1 $f8, 0x002C($s1) ## 0000002C /* 02030 80912670 C62A0064 */ lwc1 $f10, 0x0064($s1) ## 00000064 /* 02034 80912674 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 -/* 02038 80912678 46049180 */ add.s $f6, $f18, $f4 +/* 02038 80912678 46049180 */ add.s $f6, $f18, $f4 /* 0203C 8091267C 4481D000 */ mtc1 $at, $f26 ## $f26 = 0.50 -/* 02040 80912680 4405C000 */ mfc1 $a1, $f24 -/* 02044 80912684 460A4480 */ add.s $f18, $f8, $f10 -/* 02048 80912688 4406D000 */ mfc1 $a2, $f26 +/* 02040 80912680 4405C000 */ mfc1 $a1, $f24 +/* 02044 80912684 460A4480 */ add.s $f18, $f8, $f10 +/* 02048 80912688 4406D000 */ mfc1 $a2, $f26 /* 0204C 8091268C E6260024 */ swc1 $f6, 0x0024($s1) ## 00000024 /* 02050 80912690 2624005C */ addiu $a0, $s1, 0x005C ## $a0 = 0000005C /* 02054 80912694 0C01E123 */ jal Math_SmoothDownscaleMaxF - + /* 02058 80912698 E632002C */ swc1 $f18, 0x002C($s1) ## 0000002C -/* 0205C 8091269C 4405C000 */ mfc1 $a1, $f24 -/* 02060 809126A0 4406D000 */ mfc1 $a2, $f26 +/* 0205C 8091269C 4405C000 */ mfc1 $a1, $f24 +/* 02060 809126A0 4406D000 */ mfc1 $a2, $f26 /* 02064 809126A4 0C01E123 */ jal Math_SmoothDownscaleMaxF - + /* 02068 809126A8 26240064 */ addiu $a0, $s1, 0x0064 ## $a0 = 00000064 /* 0206C 809126AC 863801BC */ lh $t8, 0x01BC($s1) ## 000001BC /* 02070 809126B0 3C100601 */ lui $s0, 0x0601 ## $s0 = 06010000 /* 02074 809126B4 26101F44 */ addiu $s0, $s0, 0x1F44 ## $s0 = 06011F44 -/* 02078 809126B8 1700000F */ bne $t8, $zero, .L809126F8 +/* 02078 809126B8 1700000F */ bne $t8, $zero, .L809126F8 /* 0207C 809126BC 24190001 */ addiu $t9, $zero, 0x0001 ## $t9 = 00000001 /* 02080 809126C0 4480C000 */ mtc1 $zero, $f24 ## $f24 = 0.00 /* 02084 809126C4 2408000A */ addiu $t0, $zero, 0x000A ## $t0 = 0000000A @@ -88,163 +88,163 @@ glabel func_80912594 /* 0208C 809126CC A62801BC */ sh $t0, 0x01BC($s1) ## 000001BC /* 02090 809126D0 02002025 */ or $a0, $s0, $zero ## $a0 = 06011F44 /* 02094 809126D4 0C028800 */ jal SkelAnime_GetFrameCount - + /* 02098 809126D8 E6380068 */ swc1 $f24, 0x0068($s1) ## 00000068 /* 0209C 809126DC 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 -/* 020A0 809126E0 4406C000 */ mfc1 $a2, $f24 +/* 020A0 809126E0 4406C000 */ mfc1 $a2, $f24 /* 020A4 809126E4 02002825 */ or $a1, $s0, $zero ## $a1 = 06011F44 -/* 020A8 809126E8 468021A0 */ cvt.s.w $f6, $f4 +/* 020A8 809126E8 468021A0 */ cvt.s.w $f6, $f4 /* 020AC 809126EC E62601D0 */ swc1 $f6, 0x01D0($s1) ## 000001D0 -/* 020B0 809126F0 0C029490 */ jal func_800A5240 -/* 020B4 809126F4 8FA40070 */ lw $a0, 0x0070($sp) +/* 020B0 809126F0 0C029490 */ jal SkelAnime_ChangeAnimTransitionStop +/* 020B4 809126F4 8FA40070 */ lw $a0, 0x0070($sp) .L809126F8: /* 020B8 809126F8 262400B6 */ addiu $a0, $s1, 0x00B6 ## $a0 = 000000B6 /* 020BC 809126FC 8625008A */ lh $a1, 0x008A($s1) ## 0000008A /* 020C0 80912700 24060005 */ addiu $a2, $zero, 0x0005 ## $a2 = 00000005 /* 020C4 80912704 0C01E1EF */ jal Math_SmoothScaleMaxS - + /* 020C8 80912708 240707D0 */ addiu $a3, $zero, 0x07D0 ## $a3 = 000007D0 -/* 020CC 8091270C 100000AC */ beq $zero, $zero, .L809129C0 +/* 020CC 8091270C 100000AC */ beq $zero, $zero, .L809129C0 /* 020D0 80912710 C6200028 */ lwc1 $f0, 0x0028($s1) ## 00000028 .L80912714: -/* 020D4 80912714 0C0295B2 */ jal func_800A56C8 +/* 020D4 80912714 0C0295B2 */ jal func_800A56C8 /* 020D8 80912718 8E2501D0 */ lw $a1, 0x01D0($s1) ## 000001D0 -/* 020DC 8091271C 1040000E */ beq $v0, $zero, .L80912758 +/* 020DC 8091271C 1040000E */ beq $v0, $zero, .L80912758 /* 020E0 80912720 3C040601 */ lui $a0, 0x0601 ## $a0 = 06010000 /* 020E4 80912724 0C028800 */ jal SkelAnime_GetFrameCount - + /* 020E8 80912728 2484267C */ addiu $a0, $a0, 0x267C ## $a0 = 0601267C /* 020EC 8091272C 44824000 */ mtc1 $v0, $f8 ## $f8 = 0.00 /* 020F0 80912730 4480C000 */ mtc1 $zero, $f24 ## $f24 = 0.00 /* 020F4 80912734 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 -/* 020F8 80912738 468042A0 */ cvt.s.w $f10, $f8 -/* 020FC 8091273C 4406C000 */ mfc1 $a2, $f24 +/* 020F8 80912738 468042A0 */ cvt.s.w $f10, $f8 +/* 020FC 8091273C 4406C000 */ mfc1 $a2, $f24 /* 02100 80912740 24A5267C */ addiu $a1, $a1, 0x267C ## $a1 = 0601267C /* 02104 80912744 E62A01D0 */ swc1 $f10, 0x01D0($s1) ## 000001D0 -/* 02108 80912748 0C0294D3 */ jal func_800A534C -/* 0210C 8091274C 8FA40070 */ lw $a0, 0x0070($sp) +/* 02108 80912748 0C0294D3 */ jal SkelAnime_ChangeAnimTransitionRepeat +/* 0210C 8091274C 8FA40070 */ lw $a0, 0x0070($sp) /* 02110 80912750 24090002 */ addiu $t1, $zero, 0x0002 ## $t1 = 00000002 /* 02114 80912754 A62901A2 */ sh $t1, 0x01A2($s1) ## 000001A2 .L80912758: /* 02118 80912758 862A01BC */ lh $t2, 0x01BC($s1) ## 000001BC /* 0211C 8091275C 262400B6 */ addiu $a0, $s1, 0x00B6 ## $a0 = 000000B6 /* 02120 80912760 24060005 */ addiu $a2, $zero, 0x0005 ## $a2 = 00000005 -/* 02124 80912764 1140001D */ beq $t2, $zero, .L809127DC +/* 02124 80912764 1140001D */ beq $t2, $zero, .L809127DC /* 02128 80912768 240707D0 */ addiu $a3, $zero, 0x07D0 ## $a3 = 000007D0 /* 0212C 8091276C 0C01E1EF */ jal Math_SmoothScaleMaxS - + /* 02130 80912770 8625008A */ lh $a1, 0x008A($s1) ## 0000008A /* 02134 80912774 3C014220 */ lui $at, 0x4220 ## $at = 42200000 /* 02138 80912778 C6120024 */ lwc1 $f18, 0x0024($s0) ## 06011F68 /* 0213C 8091277C C6240024 */ lwc1 $f4, 0x0024($s1) ## 00000024 /* 02140 80912780 44814000 */ mtc1 $at, $f8 ## $f8 = 40.00 /* 02144 80912784 C6060028 */ lwc1 $f6, 0x0028($s0) ## 06011F6C -/* 02148 80912788 46049081 */ sub.s $f2, $f18, $f4 +/* 02148 80912788 46049081 */ sub.s $f2, $f18, $f4 /* 0214C 8091278C C604002C */ lwc1 $f4, 0x002C($s0) ## 06011F70 /* 02150 80912790 C6320028 */ lwc1 $f18, 0x0028($s1) ## 00000028 -/* 02154 80912794 46083280 */ add.s $f10, $f6, $f8 +/* 02154 80912794 46083280 */ add.s $f10, $f6, $f8 /* 02158 80912798 C626002C */ lwc1 $f6, 0x002C($s1) ## 0000002C -/* 0215C 8091279C 46021202 */ mul.s $f8, $f2, $f2 +/* 0215C 8091279C 46021202 */ mul.s $f8, $f2, $f2 /* 02160 809127A0 862B00B6 */ lh $t3, 0x00B6($s1) ## 000000B6 -/* 02164 809127A4 46062401 */ sub.s $f16, $f4, $f6 +/* 02164 809127A4 46062401 */ sub.s $f16, $f4, $f6 /* 02168 809127A8 A62B0032 */ sh $t3, 0x0032($s1) ## 00000032 -/* 0216C 809127AC 46125301 */ sub.s $f12, $f10, $f18 -/* 02170 809127B0 46108282 */ mul.s $f10, $f16, $f16 -/* 02174 809127B4 460A4000 */ add.s $f0, $f8, $f10 -/* 02178 809127B8 0C03F494 */ jal func_800FD250 -/* 0217C 809127BC 46000384 */ sqrt.s $f14, $f0 +/* 0216C 809127AC 46125301 */ sub.s $f12, $f10, $f18 +/* 02170 809127B0 46108282 */ mul.s $f10, $f16, $f16 +/* 02174 809127B4 460A4000 */ add.s $f0, $f8, $f10 +/* 02178 809127B8 0C03F494 */ jal Math_atan2f +/* 0217C 809127BC 46000384 */ sqrt.s $f14, $f0 /* 02180 809127C0 3C018091 */ lui $at, %hi(D_80915448) ## $at = 80910000 -/* 02184 809127C4 C4325448 */ lwc1 $f18, %lo(D_80915448)($at) -/* 02188 809127C8 46120102 */ mul.s $f4, $f0, $f18 -/* 0218C 809127CC 4600218D */ trunc.w.s $f6, $f4 -/* 02190 809127D0 440D3000 */ mfc1 $t5, $f6 +/* 02184 809127C4 C4325448 */ lwc1 $f18, %lo(D_80915448)($at) +/* 02188 809127C8 46120102 */ mul.s $f4, $f0, $f18 +/* 0218C 809127CC 4600218D */ trunc.w.s $f6, $f4 +/* 02190 809127D0 440D3000 */ mfc1 $t5, $f6 /* 02194 809127D4 00000000 */ nop /* 02198 809127D8 A62D0030 */ sh $t5, 0x0030($s1) ## 00000030 .L809127DC: -/* 0219C 809127DC 0C00B642 */ jal func_8002D908 +/* 0219C 809127DC 0C00B642 */ jal func_8002D908 /* 021A0 809127E0 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 021A4 809127E4 0C00B5FB */ jal func_8002D7EC +/* 021A4 809127E4 0C00B5FB */ jal func_8002D7EC /* 021A8 809127E8 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 021AC 809127EC 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 /* 021B0 809127F0 4481C000 */ mtc1 $at, $f24 ## $f24 = 1.00 /* 021B4 809127F4 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 /* 021B8 809127F8 4481D000 */ mtc1 $at, $f26 ## $f26 = 0.50 -/* 021BC 809127FC 4406C000 */ mfc1 $a2, $f24 +/* 021BC 809127FC 4406C000 */ mfc1 $a2, $f24 /* 021C0 80912800 26240068 */ addiu $a0, $s1, 0x0068 ## $a0 = 00000068 -/* 021C4 80912804 4407D000 */ mfc1 $a3, $f26 +/* 021C4 80912804 4407D000 */ mfc1 $a3, $f26 /* 021C8 80912808 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 021CC 8091280C 3C054120 */ lui $a1, 0x4120 ## $a1 = 41200000 -/* 021D0 80912810 4614A202 */ mul.s $f8, $f20, $f20 +/* 021D0 80912810 4614A202 */ mul.s $f8, $f20, $f20 /* 021D4 80912814 3C01438C */ lui $at, 0x438C ## $at = 438C0000 /* 021D8 80912818 44819000 */ mtc1 $at, $f18 ## $f18 = 280.00 -/* 021DC 8091281C 4616B282 */ mul.s $f10, $f22, $f22 +/* 021DC 8091281C 4616B282 */ mul.s $f10, $f22, $f22 /* 021E0 80912820 3C018091 */ lui $at, %hi(D_8091544C) ## $at = 80910000 /* 021E4 80912824 240E0003 */ addiu $t6, $zero, 0x0003 ## $t6 = 00000003 /* 021E8 80912828 240F0014 */ addiu $t7, $zero, 0x0014 ## $t7 = 00000014 -/* 021EC 8091282C 460A4000 */ add.s $f0, $f8, $f10 -/* 021F0 80912830 46000004 */ sqrt.s $f0, $f0 -/* 021F4 80912834 4600903C */ c.lt.s $f18, $f0 +/* 021EC 8091282C 460A4000 */ add.s $f0, $f8, $f10 +/* 021F0 80912830 46000004 */ sqrt.s $f0, $f0 +/* 021F4 80912834 4600903C */ c.lt.s $f18, $f0 /* 021F8 80912838 00000000 */ nop -/* 021FC 8091283C 45030008 */ bc1tl .L80912860 +/* 021FC 8091283C 45030008 */ bc1tl .L80912860 /* 02200 80912840 A62E01A2 */ sh $t6, 0x01A2($s1) ## 000001A2 /* 02204 80912844 C624008C */ lwc1 $f4, 0x008C($s1) ## 0000008C -/* 02208 80912848 C426544C */ lwc1 $f6, %lo(D_8091544C)($at) -/* 0220C 8091284C 4606203C */ c.lt.s $f4, $f6 +/* 02208 80912848 C426544C */ lwc1 $f6, %lo(D_8091544C)($at) +/* 0220C 8091284C 4606203C */ c.lt.s $f4, $f6 /* 02210 80912850 00000000 */ nop -/* 02214 80912854 45000003 */ bc1f .L80912864 +/* 02214 80912854 45000003 */ bc1f .L80912864 /* 02218 80912858 00000000 */ nop /* 0221C 8091285C A62E01A2 */ sh $t6, 0x01A2($s1) ## 000001A2 .L80912860: /* 02220 80912860 A62F01BC */ sh $t7, 0x01BC($s1) ## 000001BC .L80912864: -/* 02224 80912864 10000056 */ beq $zero, $zero, .L809129C0 +/* 02224 80912864 10000056 */ beq $zero, $zero, .L809129C0 /* 02228 80912868 C6200028 */ lwc1 $f0, 0x0028($s1) ## 00000028 .L8091286C: /* 0222C 8091286C 3C018091 */ lui $at, %hi(D_80915450) ## $at = 80910000 -/* 02230 80912870 C4285450 */ lwc1 $f8, %lo(D_80915450)($at) +/* 02230 80912870 C4285450 */ lwc1 $f8, %lo(D_80915450)($at) /* 02234 80912874 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 02238 80912878 0C00B638 */ jal Actor_MoveForward - + /* 0223C 8091287C E628006C */ swc1 $f8, 0x006C($s1) ## 0000006C /* 02240 80912880 C62A0028 */ lwc1 $f10, 0x0028($s1) ## 00000028 /* 02244 80912884 3C048091 */ lui $a0, %hi(D_809152CC) ## $a0 = 80910000 /* 02248 80912888 248452CC */ addiu $a0, $a0, %lo(D_809152CC) ## $a0 = 809152CC -/* 0224C 8091288C 460054A1 */ cvt.d.s $f18, $f10 -/* 02250 80912890 44079000 */ mfc1 $a3, $f18 -/* 02254 80912894 44069800 */ mfc1 $a2, $f19 +/* 0224C 8091288C 460054A1 */ cvt.d.s $f18, $f10 +/* 02250 80912890 44079000 */ mfc1 $a3, $f18 +/* 02254 80912894 44069800 */ mfc1 $a2, $f19 /* 02258 80912898 0C00084C */ jal osSyncPrintf - + /* 0225C 8091289C 00000000 */ nop /* 02260 809128A0 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 /* 02264 809128A4 44810000 */ mtc1 $at, $f0 ## $f0 = 5.00 /* 02268 809128A8 C6240028 */ lwc1 $f4, 0x0028($s1) ## 00000028 -/* 0226C 809128AC 4614A182 */ mul.s $f6, $f20, $f20 -/* 02270 809128B0 4600203C */ c.lt.s $f4, $f0 -/* 02274 809128B4 4616B202 */ mul.s $f8, $f22, $f22 -/* 02278 809128B8 45020005 */ bc1fl .L809128D0 -/* 0227C 809128BC 46083000 */ add.s $f0, $f6, $f8 +/* 0226C 809128AC 4614A182 */ mul.s $f6, $f20, $f20 +/* 02270 809128B0 4600203C */ c.lt.s $f4, $f0 +/* 02274 809128B4 4616B202 */ mul.s $f8, $f22, $f22 +/* 02278 809128B8 45020005 */ bc1fl .L809128D0 +/* 0227C 809128BC 46083000 */ add.s $f0, $f6, $f8 /* 02280 809128C0 4480C000 */ mtc1 $zero, $f24 ## $f24 = 0.00 /* 02284 809128C4 E6200028 */ swc1 $f0, 0x0028($s1) ## 00000028 /* 02288 809128C8 E6380060 */ swc1 $f24, 0x0060($s1) ## 00000060 -/* 0228C 809128CC 46083000 */ add.s $f0, $f6, $f8 +/* 0228C 809128CC 46083000 */ add.s $f0, $f6, $f8 .L809128D0: /* 02290 809128D0 3C01438C */ lui $at, 0x438C ## $at = 438C0000 /* 02294 809128D4 44815000 */ mtc1 $at, $f10 ## $f10 = 280.00 /* 02298 809128D8 3C014000 */ lui $at, 0x4000 ## $at = 40000000 -/* 0229C 809128DC 46000004 */ sqrt.s $f0, $f0 -/* 022A0 809128E0 4600503C */ c.lt.s $f10, $f0 +/* 0229C 809128DC 46000004 */ sqrt.s $f0, $f0 +/* 022A0 809128E0 4600503C */ c.lt.s $f10, $f0 /* 022A4 809128E4 00000000 */ nop -/* 022A8 809128E8 4502000B */ bc1fl .L80912918 +/* 022A8 809128E8 4502000B */ bc1fl .L80912918 /* 022AC 809128EC 3C014000 */ lui $at, 0x4000 ## $at = 40000000 /* 022B0 809128F0 4481A000 */ mtc1 $at, $f20 ## $f20 = 2.00 /* 022B4 809128F4 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 /* 022B8 809128F8 4481C000 */ mtc1 $at, $f24 ## $f24 = 1.00 -/* 022BC 809128FC 4406A000 */ mfc1 $a2, $f20 +/* 022BC 809128FC 4406A000 */ mfc1 $a2, $f20 /* 022C0 80912900 26240068 */ addiu $a0, $s1, 0x0068 ## $a0 = 00000068 -/* 022C4 80912904 4405C000 */ mfc1 $a1, $f24 +/* 022C4 80912904 4405C000 */ mfc1 $a1, $f24 /* 022C8 80912908 0C01E123 */ jal Math_SmoothDownscaleMaxF - + /* 022CC 8091290C 00000000 */ nop /* 022D0 80912910 A62001BC */ sh $zero, 0x01BC($s1) ## 000001BC /* 022D4 80912914 3C014000 */ lui $at, 0x4000 ## $at = 40000000 @@ -253,41 +253,41 @@ glabel func_80912594 /* 022DC 8091291C 4481A000 */ mtc1 $at, $f20 ## $f20 = 2.00 /* 022E0 80912920 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 /* 022E4 80912924 4481C000 */ mtc1 $at, $f24 ## $f24 = 1.00 -/* 022E8 80912928 57000025 */ bnel $t8, $zero, .L809129C0 +/* 022E8 80912928 57000025 */ bnel $t8, $zero, .L809129C0 /* 022EC 8091292C C6200028 */ lwc1 $f0, 0x0028($s1) ## 00000028 -/* 022F0 80912930 4405C000 */ mfc1 $a1, $f24 -/* 022F4 80912934 4406A000 */ mfc1 $a2, $f20 +/* 022F0 80912930 4405C000 */ mfc1 $a1, $f24 +/* 022F4 80912934 4406A000 */ mfc1 $a2, $f20 /* 022F8 80912938 0C01E123 */ jal Math_SmoothDownscaleMaxF - + /* 022FC 8091293C 26240068 */ addiu $a0, $s1, 0x0068 ## $a0 = 00000068 -/* 02300 80912940 4405C000 */ mfc1 $a1, $f24 -/* 02304 80912944 4406A000 */ mfc1 $a2, $f20 +/* 02300 80912940 4405C000 */ mfc1 $a1, $f24 +/* 02304 80912944 4406A000 */ mfc1 $a2, $f20 /* 02308 80912948 0C01E123 */ jal Math_SmoothDownscaleMaxF - + /* 0230C 8091294C 26240060 */ addiu $a0, $s1, 0x0060 ## $a0 = 00000060 /* 02310 80912950 262400B6 */ addiu $a0, $s1, 0x00B6 ## $a0 = 000000B6 /* 02314 80912954 8625008A */ lh $a1, 0x008A($s1) ## 0000008A /* 02318 80912958 24060005 */ addiu $a2, $zero, 0x0005 ## $a2 = 00000005 /* 0231C 8091295C 0C01E1EF */ jal Math_SmoothScaleMaxS - + /* 02320 80912960 240707D0 */ addiu $a3, $zero, 0x07D0 ## $a3 = 000007D0 /* 02324 80912964 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 /* 02328 80912968 4481D000 */ mtc1 $at, $f26 ## $f26 = 0.50 /* 0232C 8091296C C6320068 */ lwc1 $f18, 0x0068($s1) ## 00000068 -/* 02330 80912970 461A903E */ c.le.s $f18, $f26 +/* 02330 80912970 461A903E */ c.le.s $f18, $f26 /* 02334 80912974 00000000 */ nop -/* 02338 80912978 45020011 */ bc1fl .L809129C0 +/* 02338 80912978 45020011 */ bc1fl .L809129C0 /* 0233C 8091297C C6200028 */ lwc1 $f0, 0x0028($s1) ## 00000028 /* 02340 80912980 C6200060 */ lwc1 $f0, 0x0060($s1) ## 00000060 /* 02344 80912984 3C018091 */ lui $at, %hi(D_80915454) ## $at = 80910000 -/* 02348 80912988 C4245454 */ lwc1 $f4, %lo(D_80915454)($at) -/* 0234C 8091298C 46000005 */ abs.s $f0, $f0 +/* 02348 80912988 C4245454 */ lwc1 $f4, %lo(D_80915454)($at) +/* 0234C 8091298C 46000005 */ abs.s $f0, $f0 /* 02350 80912990 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 02354 80912994 4604003E */ c.le.s $f0, $f4 +/* 02354 80912994 4604003E */ c.le.s $f0, $f4 /* 02358 80912998 00000000 */ nop -/* 0235C 8091299C 45020008 */ bc1fl .L809129C0 +/* 0235C 8091299C 45020008 */ bc1fl .L809129C0 /* 02360 809129A0 C6200028 */ lwc1 $f0, 0x0028($s1) ## 00000028 -/* 02364 809129A4 0C24453A */ jal func_809114E8 +/* 02364 809129A4 0C24453A */ jal func_809114E8 /* 02368 809129A8 3C05C120 */ lui $a1, 0xC120 ## $a1 = C1200000 /* 0236C 809129AC 2419001E */ addiu $t9, $zero, 0x001E ## $t9 = 0000001E /* 02370 809129B0 24080001 */ addiu $t0, $zero, 0x0001 ## $t0 = 00000001 @@ -298,26 +298,26 @@ glabel func_80912594 /* 02380 809129C0 3C014248 */ lui $at, 0x4248 ## $at = 42480000 /* 02384 809129C4 44813000 */ mtc1 $at, $f6 ## $f6 = 50.00 /* 02388 809129C8 00000000 */ nop -/* 0238C 809129CC 4600303C */ c.lt.s $f6, $f0 +/* 0238C 809129CC 4600303C */ c.lt.s $f6, $f0 /* 02390 809129D0 00000000 */ nop -/* 02394 809129D4 45000011 */ bc1f .L80912A1C +/* 02394 809129D4 45000011 */ bc1f .L80912A1C /* 02398 809129D8 00000000 */ nop /* 0239C 809129DC 86240194 */ lh $a0, 0x0194($s1) ## 00000194 -/* 023A0 809129E0 00800821 */ addu $at, $a0, $zero -/* 023A4 809129E4 00042080 */ sll $a0, $a0, 2 -/* 023A8 809129E8 00812023 */ subu $a0, $a0, $at -/* 023AC 809129EC 00042100 */ sll $a0, $a0, 4 -/* 023B0 809129F0 00812023 */ subu $a0, $a0, $at -/* 023B4 809129F4 000420C0 */ sll $a0, $a0, 3 -/* 023B8 809129F8 00812023 */ subu $a0, $a0, $at -/* 023BC 809129FC 00042080 */ sll $a0, $a0, 2 -/* 023C0 80912A00 00042400 */ sll $a0, $a0, 16 +/* 023A0 809129E0 00800821 */ addu $at, $a0, $zero +/* 023A4 809129E4 00042080 */ sll $a0, $a0, 2 +/* 023A8 809129E8 00812023 */ subu $a0, $a0, $at +/* 023AC 809129EC 00042100 */ sll $a0, $a0, 4 +/* 023B0 809129F0 00812023 */ subu $a0, $a0, $at +/* 023B4 809129F4 000420C0 */ sll $a0, $a0, 3 +/* 023B8 809129F8 00812023 */ subu $a0, $a0, $at +/* 023BC 809129FC 00042080 */ sll $a0, $a0, 2 +/* 023C0 80912A00 00042400 */ sll $a0, $a0, 16 /* 023C4 80912A04 0C01DE1C */ jal Math_Sins ## sins? -/* 023C8 80912A08 00042403 */ sra $a0, $a0, 16 -/* 023CC 80912A0C 46000280 */ add.s $f10, $f0, $f0 +/* 023C8 80912A08 00042403 */ sra $a0, $a0, 16 +/* 023CC 80912A0C 46000280 */ add.s $f10, $f0, $f0 /* 023D0 80912A10 C6280028 */ lwc1 $f8, 0x0028($s1) ## 00000028 -/* 023D4 80912A14 460A4480 */ add.s $f18, $f8, $f10 +/* 023D4 80912A14 460A4480 */ add.s $f18, $f8, $f10 /* 023D8 80912A18 E6320028 */ swc1 $f18, 0x0028($s1) ## 00000028 .L80912A1C: /* 023DC 80912A1C 3C0A8091 */ lui $t2, %hi(D_809150D8) ## $t2 = 80910000 @@ -354,132 +354,132 @@ glabel func_80912594 /* 02458 80912A98 3C018091 */ lui $at, %hi(D_80915458) ## $at = 80910000 /* 0245C 80912A9C AF2A0008 */ sw $t2, 0x0008($t9) ## FFFFFFB4 /* 02460 80912AA0 AF290004 */ sw $t1, 0x0004($t9) ## FFFFFFB0 -/* 02464 80912AA4 C4385458 */ lwc1 $f24, %lo(D_80915458)($at) +/* 02464 80912AA4 C4385458 */ lwc1 $f24, %lo(D_80915458)($at) /* 02468 80912AA8 3C014700 */ lui $at, 0x4700 ## $at = 47000000 /* 0246C 80912AAC 4481B000 */ mtc1 $at, $f22 ## $f22 = 32768.00 /* 02470 80912AB0 3C01447A */ lui $at, 0x447A ## $at = 447A0000 /* 02474 80912AB4 4481A000 */ mtc1 $at, $f20 ## $f20 = 1000.00 /* 02478 80912AB8 00008025 */ or $s0, $zero, $zero ## $s0 = 00000000 -/* 0247C 80912ABC E7A40090 */ swc1 $f4, 0x0090($sp) +/* 0247C 80912ABC E7A40090 */ swc1 $f4, 0x0090($sp) .L80912AC0: -/* 02480 80912AC0 0C034213 */ jal Matrix_Push +/* 02480 80912AC0 0C034213 */ jal Matrix_Push /* 02484 80912AC4 00000000 */ nop /* 02488 80912AC8 862B00B6 */ lh $t3, 0x00B6($s1) ## 000000B6 /* 0248C 80912ACC 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 02490 80912AD0 448B3000 */ mtc1 $t3, $f6 ## $f6 = 0.00 /* 02494 80912AD4 00000000 */ nop -/* 02498 80912AD8 46803220 */ cvt.s.w $f8, $f6 -/* 0249C 80912ADC 46164283 */ div.s $f10, $f8, $f22 -/* 024A0 80912AE0 46185302 */ mul.s $f12, $f10, $f24 -/* 024A4 80912AE4 0C034348 */ jal Matrix_RotateY +/* 02498 80912AD8 46803220 */ cvt.s.w $f8, $f6 +/* 0249C 80912ADC 46164283 */ div.s $f10, $f8, $f22 +/* 024A0 80912AE0 46185302 */ mul.s $f12, $f10, $f24 +/* 024A4 80912AE4 0C034348 */ jal Matrix_RotateY /* 024A8 80912AE8 00000000 */ nop /* 024AC 80912AEC 862C00B4 */ lh $t4, 0x00B4($s1) ## 000000B4 /* 024B0 80912AF0 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 /* 024B4 80912AF4 448C9000 */ mtc1 $t4, $f18 ## $f18 = 0.00 /* 024B8 80912AF8 00000000 */ nop -/* 024BC 80912AFC 46809120 */ cvt.s.w $f4, $f18 -/* 024C0 80912B00 46162183 */ div.s $f6, $f4, $f22 -/* 024C4 80912B04 46183302 */ mul.s $f12, $f6, $f24 -/* 024C8 80912B08 0C0342DC */ jal Matrix_RotateX +/* 024BC 80912AFC 46809120 */ cvt.s.w $f4, $f18 +/* 024C0 80912B00 46162183 */ div.s $f6, $f4, $f22 +/* 024C4 80912B04 46183302 */ mul.s $f12, $f6, $f24 +/* 024C8 80912B08 0C0342DC */ jal Matrix_RotateX /* 024CC 80912B0C 00000000 */ nop /* 024D0 80912B10 862D01AC */ lh $t5, 0x01AC($s1) ## 000001AC /* 024D4 80912B14 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 /* 024D8 80912B18 448D4000 */ mtc1 $t5, $f8 ## $f8 = 0.00 /* 024DC 80912B1C 00000000 */ nop -/* 024E0 80912B20 468042A0 */ cvt.s.w $f10, $f8 -/* 024E4 80912B24 46165483 */ div.s $f18, $f10, $f22 -/* 024E8 80912B28 46189302 */ mul.s $f12, $f18, $f24 -/* 024EC 80912B2C 0C0343B5 */ jal Matrix_RotateZ +/* 024E0 80912B20 468042A0 */ cvt.s.w $f10, $f8 +/* 024E4 80912B24 46165483 */ div.s $f18, $f10, $f22 +/* 024E8 80912B28 46189302 */ mul.s $f12, $f18, $f24 +/* 024EC 80912B2C 0C0343B5 */ jal Matrix_RotateZ /* 024F0 80912B30 00000000 */ nop /* 024F4 80912B34 27A4008C */ addiu $a0, $sp, 0x008C ## $a0 = FFFFFFAC -/* 024F8 80912B38 0C0346BD */ jal Matrix_MultVec3f +/* 024F8 80912B38 0C0346BD */ jal Matrix_MultVec3f /* 024FC 80912B3C 27A50080 */ addiu $a1, $sp, 0x0080 ## $a1 = FFFFFFA0 -/* 02500 80912B40 0C034221 */ jal Matrix_Pull +/* 02500 80912B40 0C034221 */ jal Matrix_Pull /* 02504 80912B44 00000000 */ nop /* 02508 80912B48 C6240200 */ lwc1 $f4, 0x0200($s1) ## 00000200 -/* 0250C 80912B4C C7A60080 */ lwc1 $f6, 0x0080($sp) -/* 02510 80912B50 C7B20084 */ lwc1 $f18, 0x0084($sp) +/* 0250C 80912B4C C7A60080 */ lwc1 $f6, 0x0080($sp) +/* 02510 80912B50 C7B20084 */ lwc1 $f18, 0x0084($sp) /* 02514 80912B54 24010007 */ addiu $at, $zero, 0x0007 ## $at = 00000007 -/* 02518 80912B58 46062200 */ add.s $f8, $f4, $f6 -/* 0251C 80912B5C 0201001A */ div $zero, $s0, $at -/* 02520 80912B60 E7A800B0 */ swc1 $f8, 0x00B0($sp) +/* 02518 80912B58 46062200 */ add.s $f8, $f4, $f6 +/* 0251C 80912B5C 0201001A */ div $zero, $s0, $at +/* 02520 80912B60 E7A800B0 */ swc1 $f8, 0x00B0($sp) /* 02524 80912B64 C62A0204 */ lwc1 $f10, 0x0204($s1) ## 00000204 -/* 02528 80912B68 00007810 */ mfhi $t7 +/* 02528 80912B68 00007810 */ mfhi $t7 /* 0252C 80912B6C 240E0096 */ addiu $t6, $zero, 0x0096 ## $t6 = 00000096 -/* 02530 80912B70 46125100 */ add.s $f4, $f10, $f18 -/* 02534 80912B74 C7AA0088 */ lwc1 $f10, 0x0088($sp) -/* 02538 80912B78 8FA400E4 */ lw $a0, 0x00E4($sp) +/* 02530 80912B70 46125100 */ add.s $f4, $f10, $f18 +/* 02534 80912B74 C7AA0088 */ lwc1 $f10, 0x0088($sp) +/* 02538 80912B78 8FA400E4 */ lw $a0, 0x00E4($sp) /* 0253C 80912B7C 27A500B0 */ addiu $a1, $sp, 0x00B0 ## $a1 = FFFFFFD0 -/* 02540 80912B80 E7A400B4 */ swc1 $f4, 0x00B4($sp) +/* 02540 80912B80 E7A400B4 */ swc1 $f4, 0x00B4($sp) /* 02544 80912B84 C6280208 */ lwc1 $f8, 0x0208($s1) ## 00000208 -/* 02548 80912B88 AFAF0014 */ sw $t7, 0x0014($sp) -/* 0254C 80912B8C AFAE0010 */ sw $t6, 0x0010($sp) -/* 02550 80912B90 460A4100 */ add.s $f4, $f8, $f10 -/* 02554 80912B94 461A3202 */ mul.s $f8, $f6, $f26 +/* 02548 80912B88 AFAF0014 */ sw $t7, 0x0014($sp) +/* 0254C 80912B8C AFAE0010 */ sw $t6, 0x0010($sp) +/* 02550 80912B90 460A4100 */ add.s $f4, $f8, $f10 +/* 02554 80912B94 461A3202 */ mul.s $f8, $f6, $f26 /* 02558 80912B98 27A600A4 */ addiu $a2, $sp, 0x00A4 ## $a2 = FFFFFFC4 /* 0255C 80912B9C 27A70098 */ addiu $a3, $sp, 0x0098 ## $a3 = FFFFFFB8 -/* 02560 80912BA0 E7A400B8 */ swc1 $f4, 0x00B8($sp) -/* 02564 80912BA4 46144103 */ div.s $f4, $f8, $f20 -/* 02568 80912BA8 461A9202 */ mul.s $f8, $f18, $f26 -/* 0256C 80912BAC E7A400A4 */ swc1 $f4, 0x00A4($sp) -/* 02570 80912BB0 46144103 */ div.s $f4, $f8, $f20 -/* 02574 80912BB4 461A5202 */ mul.s $f8, $f10, $f26 -/* 02578 80912BB8 E7A400A8 */ swc1 $f4, 0x00A8($sp) -/* 0257C 80912BBC 46144103 */ div.s $f4, $f8, $f20 -/* 02580 80912BC0 461C3202 */ mul.s $f8, $f6, $f28 +/* 02560 80912BA0 E7A400B8 */ swc1 $f4, 0x00B8($sp) +/* 02564 80912BA4 46144103 */ div.s $f4, $f8, $f20 +/* 02568 80912BA8 461A9202 */ mul.s $f8, $f18, $f26 +/* 0256C 80912BAC E7A400A4 */ swc1 $f4, 0x00A4($sp) +/* 02570 80912BB0 46144103 */ div.s $f4, $f8, $f20 +/* 02574 80912BB4 461A5202 */ mul.s $f8, $f10, $f26 +/* 02578 80912BB8 E7A400A8 */ swc1 $f4, 0x00A8($sp) +/* 0257C 80912BBC 46144103 */ div.s $f4, $f8, $f20 +/* 02580 80912BC0 461C3202 */ mul.s $f8, $f6, $f28 /* 02584 80912BC4 00000000 */ nop -/* 02588 80912BC8 461C9182 */ mul.s $f6, $f18, $f28 -/* 0258C 80912BCC E7A400AC */ swc1 $f4, 0x00AC($sp) -/* 02590 80912BD0 46144103 */ div.s $f4, $f8, $f20 -/* 02594 80912BD4 46143203 */ div.s $f8, $f6, $f20 -/* 02598 80912BD8 E7A40098 */ swc1 $f4, 0x0098($sp) -/* 0259C 80912BDC 461C5102 */ mul.s $f4, $f10, $f28 -/* 025A0 80912BE0 46142483 */ div.s $f18, $f4, $f20 -/* 025A4 80912BE4 E7A8009C */ swc1 $f8, 0x009C($sp) -/* 025A8 80912BE8 0C00A73C */ jal func_80029CF0 -/* 025AC 80912BEC E7B200A0 */ swc1 $f18, 0x00A0($sp) +/* 02588 80912BC8 461C9182 */ mul.s $f6, $f18, $f28 +/* 0258C 80912BCC E7A400AC */ swc1 $f4, 0x00AC($sp) +/* 02590 80912BD0 46144103 */ div.s $f4, $f8, $f20 +/* 02594 80912BD4 46143203 */ div.s $f8, $f6, $f20 +/* 02598 80912BD8 E7A40098 */ swc1 $f4, 0x0098($sp) +/* 0259C 80912BDC 461C5102 */ mul.s $f4, $f10, $f28 +/* 025A0 80912BE0 46142483 */ div.s $f18, $f4, $f20 +/* 025A4 80912BE4 E7A8009C */ swc1 $f8, 0x009C($sp) +/* 025A8 80912BE8 0C00A73C */ jal func_80029CF0 +/* 025AC 80912BEC E7B200A0 */ swc1 $f18, 0x00A0($sp) /* 025B0 80912BF0 863801AC */ lh $t8, 0x01AC($s1) ## 000001AC /* 025B4 80912BF4 26100001 */ addiu $s0, $s0, 0x0001 ## $s0 = 00000001 -/* 025B8 80912BF8 00108400 */ sll $s0, $s0, 16 -/* 025BC 80912BFC 00108403 */ sra $s0, $s0, 16 -/* 025C0 80912C00 2A01000A */ slti $at, $s0, 0x000A +/* 025B8 80912BF8 00108400 */ sll $s0, $s0, 16 +/* 025BC 80912BFC 00108403 */ sra $s0, $s0, 16 +/* 025C0 80912C00 2A01000A */ slti $at, $s0, 0x000A /* 025C4 80912C04 27191A5C */ addiu $t9, $t8, 0x1A5C ## $t9 = 00001A5C -/* 025C8 80912C08 1420FFAD */ bne $at, $zero, .L80912AC0 +/* 025C8 80912C08 1420FFAD */ bne $at, $zero, .L80912AC0 /* 025CC 80912C0C A63901AC */ sh $t9, 0x01AC($s1) ## 000001AC /* 025D0 80912C10 86280194 */ lh $t0, 0x0194($s1) ## 00000194 -/* 025D4 80912C14 8FA600E4 */ lw $a2, 0x00E4($sp) +/* 025D4 80912C14 8FA600E4 */ lw $a2, 0x00E4($sp) /* 025D8 80912C18 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 /* 025DC 80912C1C 31090007 */ andi $t1, $t0, 0x0007 ## $t1 = 00000000 -/* 025E0 80912C20 15200012 */ bne $t1, $zero, .L80912C6C +/* 025E0 80912C20 15200012 */ bne $t1, $zero, .L80912C6C /* 025E4 80912C24 24C41C24 */ addiu $a0, $a2, 0x1C24 ## $a0 = 00001C24 /* 025E8 80912C28 C6260200 */ lwc1 $f6, 0x0200($s1) ## 00000200 /* 025EC 80912C2C 8E30011C */ lw $s0, 0x011C($s1) ## 0000011C /* 025F0 80912C30 240B0008 */ addiu $t3, $zero, 0x0008 ## $t3 = 00000008 -/* 025F4 80912C34 E7A60010 */ swc1 $f6, 0x0010($sp) +/* 025F4 80912C34 E7A60010 */ swc1 $f6, 0x0010($sp) /* 025F8 80912C38 C6280204 */ lwc1 $f8, 0x0204($s1) ## 00000204 /* 025FC 80912C3C 240C0001 */ addiu $t4, $zero, 0x0001 ## $t4 = 00000001 /* 02600 80912C40 240D0026 */ addiu $t5, $zero, 0x0026 ## $t5 = 00000026 -/* 02604 80912C44 E7A80014 */ swc1 $f8, 0x0014($sp) +/* 02604 80912C44 E7A80014 */ swc1 $f8, 0x0014($sp) /* 02608 80912C48 C62A0208 */ lwc1 $f10, 0x0208($s1) ## 00000208 -/* 0260C 80912C4C AFAD0028 */ sw $t5, 0x0028($sp) -/* 02610 80912C50 AFA00024 */ sw $zero, 0x0024($sp) -/* 02614 80912C54 AFAC0020 */ sw $t4, 0x0020($sp) -/* 02618 80912C58 AFAB001C */ sw $t3, 0x001C($sp) +/* 0260C 80912C4C AFAD0028 */ sw $t5, 0x0028($sp) +/* 02610 80912C50 AFA00024 */ sw $zero, 0x0024($sp) +/* 02614 80912C54 AFAC0020 */ sw $t4, 0x0020($sp) +/* 02618 80912C58 AFAB001C */ sw $t3, 0x001C($sp) /* 0261C 80912C5C 2407006D */ addiu $a3, $zero, 0x006D ## $a3 = 0000006D /* 02620 80912C60 0C00C916 */ jal Actor_SpawnAttached - -/* 02624 80912C64 E7AA0018 */ swc1 $f10, 0x0018($sp) + +/* 02624 80912C64 E7AA0018 */ swc1 $f10, 0x0018($sp) /* 02628 80912C68 AE30011C */ sw $s0, 0x011C($s1) ## 0000011C .L80912C6C: -/* 0262C 80912C6C 8FBF0064 */ lw $ra, 0x0064($sp) -/* 02630 80912C70 D7B40030 */ ldc1 $f20, 0x0030($sp) -/* 02634 80912C74 D7B60038 */ ldc1 $f22, 0x0038($sp) -/* 02638 80912C78 D7B80040 */ ldc1 $f24, 0x0040($sp) -/* 0263C 80912C7C D7BA0048 */ ldc1 $f26, 0x0048($sp) -/* 02640 80912C80 D7BC0050 */ ldc1 $f28, 0x0050($sp) -/* 02644 80912C84 8FB0005C */ lw $s0, 0x005C($sp) -/* 02648 80912C88 8FB10060 */ lw $s1, 0x0060($sp) -/* 0264C 80912C8C 03E00008 */ jr $ra +/* 0262C 80912C6C 8FBF0064 */ lw $ra, 0x0064($sp) +/* 02630 80912C70 D7B40030 */ ldc1 $f20, 0x0030($sp) +/* 02634 80912C74 D7B60038 */ ldc1 $f22, 0x0038($sp) +/* 02638 80912C78 D7B80040 */ ldc1 $f24, 0x0040($sp) +/* 0263C 80912C7C D7BA0048 */ ldc1 $f26, 0x0048($sp) +/* 02640 80912C80 D7BC0050 */ ldc1 $f28, 0x0050($sp) +/* 02644 80912C84 8FB0005C */ lw $s0, 0x005C($sp) +/* 02648 80912C88 8FB10060 */ lw $s1, 0x0060($sp) +/* 0264C 80912C8C 03E00008 */ jr $ra /* 02650 80912C90 27BD00E0 */ addiu $sp, $sp, 0x00E0 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_80912C94.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_80912C94.s index 494d2e8915..5d8e08a8a4 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_80912C94.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_80912C94.s @@ -1,44 +1,44 @@ glabel func_80912C94 /* 02654 80912C94 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 02658 80912C98 AFB00018 */ sw $s0, 0x0018($sp) -/* 0265C 80912C9C AFA50024 */ sw $a1, 0x0024($sp) +/* 02658 80912C98 AFB00018 */ sw $s0, 0x0018($sp) +/* 0265C 80912C9C AFA50024 */ sw $a1, 0x0024($sp) /* 02660 80912CA0 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 02664 80912CA4 AFBF001C */ sw $ra, 0x001C($sp) +/* 02664 80912CA4 AFBF001C */ sw $ra, 0x001C($sp) /* 02668 80912CA8 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 0266C 80912CAC 24A5090C */ addiu $a1, $a1, 0x090C ## $a1 = 0600090C -/* 02670 80912CB0 0C02947A */ jal func_800A51E8 +/* 02670 80912CB0 0C02947A */ jal SkelAnime_ChangeAnimDefaultStop /* 02674 80912CB4 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C /* 02678 80912CB8 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 /* 0267C 80912CBC 0C028800 */ jal SkelAnime_GetFrameCount - + /* 02680 80912CC0 2484090C */ addiu $a0, $a0, 0x090C ## $a0 = 0600090C /* 02684 80912CC4 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 02688 80912CC8 3C0E8091 */ lui $t6, %hi(func_80912D2C) ## $t6 = 80910000 /* 0268C 80912CCC 25CE2D2C */ addiu $t6, $t6, %lo(func_80912D2C) ## $t6 = 80912D2C -/* 02690 80912CD0 468021A0 */ cvt.s.w $f6, $f4 +/* 02690 80912CD0 468021A0 */ cvt.s.w $f6, $f4 /* 02694 80912CD4 3C041001 */ lui $a0, 0x1001 ## $a0 = 10010000 /* 02698 80912CD8 AE0E0190 */ sw $t6, 0x0190($s0) ## 00000190 /* 0269C 80912CDC 348400FF */ ori $a0, $a0, 0x00FF ## $a0 = 100100FF /* 026A0 80912CE0 0C03E803 */ jal Audio_SetBGM - + /* 026A4 80912CE4 E60601D0 */ swc1 $f6, 0x01D0($s0) ## 000001D0 /* 026A8 80912CE8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 026AC 80912CEC 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 026B0 80912CF0 240538AF */ addiu $a1, $zero, 0x38AF ## $a1 = 000038AF /* 026B4 80912CF4 8E180004 */ lw $t8, 0x0004($s0) ## 00000004 /* 026B8 80912CF8 2401FFFE */ addiu $at, $zero, 0xFFFE ## $at = FFFFFFFE /* 026BC 80912CFC 240F0001 */ addiu $t7, $zero, 0x0001 ## $t7 = 00000001 /* 026C0 80912D00 24080032 */ addiu $t0, $zero, 0x0032 ## $t0 = 00000032 -/* 026C4 80912D04 0301C824 */ and $t9, $t8, $at +/* 026C4 80912D04 0301C824 */ and $t9, $t8, $at /* 026C8 80912D08 A60F035E */ sh $t7, 0x035E($s0) ## 0000035E /* 026CC 80912D0C AE190004 */ sw $t9, 0x0004($s0) ## 00000004 /* 026D0 80912D10 A6000194 */ sh $zero, 0x0194($s0) ## 00000194 /* 026D4 80912D14 A20801C8 */ sb $t0, 0x01C8($s0) ## 000001C8 -/* 026D8 80912D18 8FBF001C */ lw $ra, 0x001C($sp) -/* 026DC 80912D1C 8FB00018 */ lw $s0, 0x0018($sp) +/* 026D8 80912D18 8FBF001C */ lw $ra, 0x001C($sp) +/* 026DC 80912D1C 8FB00018 */ lw $s0, 0x0018($sp) /* 026E0 80912D20 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 026E4 80912D24 03E00008 */ jr $ra +/* 026E4 80912D24 03E00008 */ jr $ra /* 026E8 80912D28 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_80912D2C.s b/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_80912D2C.s index b36cb20224..ad684a5a70 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_80912D2C.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Ganondrof/func_80912D2C.s @@ -1,90 +1,90 @@ glabel func_80912D2C /* 026EC 80912D2C 27BDFF40 */ addiu $sp, $sp, 0xFF40 ## $sp = FFFFFF40 -/* 026F0 80912D30 AFB40048 */ sw $s4, 0x0048($sp) -/* 026F4 80912D34 AFB20040 */ sw $s2, 0x0040($sp) +/* 026F0 80912D30 AFB40048 */ sw $s4, 0x0048($sp) +/* 026F4 80912D34 AFB20040 */ sw $s2, 0x0040($sp) /* 026F8 80912D38 00809025 */ or $s2, $a0, $zero ## $s2 = 00000000 -/* 026FC 80912D3C AFBF004C */ sw $ra, 0x004C($sp) -/* 02700 80912D40 AFB30044 */ sw $s3, 0x0044($sp) -/* 02704 80912D44 AFB1003C */ sw $s1, 0x003C($sp) -/* 02708 80912D48 AFB00038 */ sw $s0, 0x0038($sp) -/* 0270C 80912D4C A3A000BF */ sb $zero, 0x00BF($sp) -/* 02710 80912D50 A3A000BE */ sb $zero, 0x00BE($sp) +/* 026FC 80912D3C AFBF004C */ sw $ra, 0x004C($sp) +/* 02700 80912D40 AFB30044 */ sw $s3, 0x0044($sp) +/* 02704 80912D44 AFB1003C */ sw $s1, 0x003C($sp) +/* 02708 80912D48 AFB00038 */ sw $s0, 0x0038($sp) +/* 0270C 80912D4C A3A000BF */ sb $zero, 0x00BF($sp) +/* 02710 80912D50 A3A000BE */ sb $zero, 0x00BE($sp) /* 02714 80912D54 00A0A025 */ or $s4, $a1, $zero ## $s4 = 00000000 /* 02718 80912D58 8CB31C44 */ lw $s3, 0x1C44($a1) ## 00001C44 /* 0271C 80912D5C 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 02720 80912D60 0C030129 */ jal func_800C04A4 +/* 02720 80912D60 0C030129 */ jal func_800C04A4 /* 02724 80912D64 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 02728 80912D68 C6640080 */ lwc1 $f4, 0x0080($s3) ## 00000080 /* 0272C 80912D6C 3C048091 */ lui $a0, %hi(D_809152F8) ## $a0 = 80910000 /* 02730 80912D70 00408025 */ or $s0, $v0, $zero ## $s0 = 00000000 -/* 02734 80912D74 460021A1 */ cvt.d.s $f6, $f4 +/* 02734 80912D74 460021A1 */ cvt.d.s $f6, $f4 /* 02738 80912D78 248452F8 */ addiu $a0, $a0, %lo(D_809152F8) ## $a0 = 809152F8 -/* 0273C 80912D7C 44073000 */ mfc1 $a3, $f6 -/* 02740 80912D80 44063800 */ mfc1 $a2, $f7 +/* 0273C 80912D7C 44073000 */ mfc1 $a3, $f6 +/* 02740 80912D80 44063800 */ mfc1 $a2, $f7 /* 02744 80912D84 0C00084C */ jal osSyncPrintf - + /* 02748 80912D88 00000000 */ nop /* 0274C 80912D8C 2651014C */ addiu $s1, $s2, 0x014C ## $s1 = 0000014C /* 02750 80912D90 0C02927F */ jal SkelAnime_FrameUpdateMatrix - + /* 02754 80912D94 02202025 */ or $a0, $s1, $zero ## $a0 = 0000014C /* 02758 80912D98 864E01B6 */ lh $t6, 0x01B6($s2) ## 000001B6 /* 0275C 80912D9C 25CF0001 */ addiu $t7, $t6, 0x0001 ## $t7 = 00000001 /* 02760 80912DA0 A64F01B6 */ sh $t7, 0x01B6($s2) ## 000001B6 /* 02764 80912DA4 864301B6 */ lh $v1, 0x01B6($s2) ## 000001B6 -/* 02768 80912DA8 2861003D */ slti $at, $v1, 0x003D -/* 0276C 80912DAC 14200002 */ bne $at, $zero, .L80912DB8 -/* 02770 80912DB0 286101F4 */ slti $at, $v1, 0x01F4 -/* 02774 80912DB4 14200005 */ bne $at, $zero, .L80912DCC +/* 02768 80912DA8 2861003D */ slti $at, $v1, 0x003D +/* 0276C 80912DAC 14200002 */ bne $at, $zero, .L80912DB8 +/* 02770 80912DB0 286101F4 */ slti $at, $v1, 0x01F4 +/* 02774 80912DB4 14200005 */ bne $at, $zero, .L80912DCC .L80912DB8: -/* 02778 80912DB8 286101F6 */ slti $at, $v1, 0x01F6 -/* 0277C 80912DBC 14200006 */ bne $at, $zero, .L80912DD8 -/* 02780 80912DC0 2861026C */ slti $at, $v1, 0x026C -/* 02784 80912DC4 50200005 */ beql $at, $zero, .L80912DDC +/* 02778 80912DB8 286101F6 */ slti $at, $v1, 0x01F6 +/* 0277C 80912DBC 14200006 */ bne $at, $zero, .L80912DD8 +/* 02780 80912DC0 2861026C */ slti $at, $v1, 0x026C +/* 02784 80912DC4 50200005 */ beql $at, $zero, .L80912DDC /* 02788 80912DC8 8658035E */ lh $t8, 0x035E($s2) ## 0000035E .L80912DCC: /* 0278C 80912DCC 02402025 */ or $a0, $s2, $zero ## $a0 = 00000000 /* 02790 80912DD0 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 02794 80912DD4 2405301C */ addiu $a1, $zero, 0x301C ## $a1 = 0000301C .L80912DD8: /* 02798 80912DD8 8658035E */ lh $t8, 0x035E($s2) ## 0000035E .L80912DDC: /* 0279C 80912DDC 2719FFFF */ addiu $t9, $t8, 0xFFFF ## $t9 = FFFFFFFF -/* 027A0 80912DE0 2F210006 */ sltiu $at, $t9, 0x0006 -/* 027A4 80912DE4 1020023D */ beq $at, $zero, .L809136DC -/* 027A8 80912DE8 0019C880 */ sll $t9, $t9, 2 +/* 027A0 80912DE0 2F210006 */ sltiu $at, $t9, 0x0006 +/* 027A4 80912DE4 1020023D */ beq $at, $zero, .L809136DC +/* 027A8 80912DE8 0019C880 */ sll $t9, $t9, 2 /* 027AC 80912DEC 3C018091 */ lui $at, %hi(jtbl_8091545C) ## $at = 80910000 -/* 027B0 80912DF0 00390821 */ addu $at, $at, $t9 -/* 027B4 80912DF4 8C39545C */ lw $t9, %lo(jtbl_8091545C)($at) -/* 027B8 80912DF8 03200008 */ jr $t9 +/* 027B0 80912DF0 00390821 */ addu $at, $at, $t9 +/* 027B4 80912DF4 8C39545C */ lw $t9, %lo(jtbl_8091545C)($at) +/* 027B8 80912DF8 03200008 */ jr $t9 /* 027BC 80912DFC 00000000 */ nop glabel L80912E00 /* 027C0 80912E00 02802025 */ or $a0, $s4, $zero ## $a0 = 00000000 -/* 027C4 80912E04 0C019148 */ jal func_80064520 +/* 027C4 80912E04 0C019148 */ jal func_80064520 /* 027C8 80912E08 26851D64 */ addiu $a1, $s4, 0x1D64 ## $a1 = 00001D64 /* 027CC 80912E0C 02802025 */ or $a0, $s4, $zero ## $a0 = 00000000 /* 027D0 80912E10 02402825 */ or $a1, $s2, $zero ## $a1 = 00000000 -/* 027D4 80912E14 0C00B7D5 */ jal func_8002DF54 +/* 027D4 80912E14 0C00B7D5 */ jal func_8002DF54 /* 027D8 80912E18 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 -/* 027DC 80912E1C 0C03008C */ jal func_800C0230 +/* 027DC 80912E1C 0C03008C */ jal func_800C0230 /* 027E0 80912E20 02802025 */ or $a0, $s4, $zero ## $a0 = 00000000 /* 027E4 80912E24 A642035C */ sh $v0, 0x035C($s2) ## 0000035C /* 027E8 80912E28 02802025 */ or $a0, $s4, $zero ## $a0 = 00000000 /* 027EC 80912E2C 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 027F0 80912E30 0C0300C5 */ jal func_800C0314 +/* 027F0 80912E30 0C0300C5 */ jal func_800C0314 /* 027F4 80912E34 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 /* 027F8 80912E38 3C048091 */ lui $a0, %hi(D_80915300) ## $a0 = 80910000 /* 027FC 80912E3C 0C00084C */ jal osSyncPrintf - + /* 02800 80912E40 24845300 */ addiu $a0, $a0, %lo(D_80915300) ## $a0 = 80915300 /* 02804 80912E44 02802025 */ or $a0, $s4, $zero ## $a0 = 00000000 /* 02808 80912E48 8645035C */ lh $a1, 0x035C($s2) ## 0000035C -/* 0280C 80912E4C 0C0300C5 */ jal func_800C0314 +/* 0280C 80912E4C 0C0300C5 */ jal func_800C0314 /* 02810 80912E50 24060007 */ addiu $a2, $zero, 0x0007 ## $a2 = 00000007 /* 02814 80912E54 3C048091 */ lui $a0, %hi(D_80915304) ## $a0 = 80910000 /* 02818 80912E58 0C00084C */ jal osSyncPrintf - + /* 0281C 80912E5C 24845304 */ addiu $a0, $a0, %lo(D_80915304) ## $a0 = 80915304 /* 02820 80912E60 44804000 */ mtc1 $zero, $f8 ## $f8 = 0.00 /* 02824 80912E64 24080002 */ addiu $t0, $zero, 0x0002 ## $t0 = 00000002 @@ -105,15 +105,15 @@ glabel L80912E00 /* 02860 80912EA0 3C014120 */ lui $at, 0x4120 ## $at = 41200000 /* 02864 80912EA4 AE4B0368 */ sw $t3, 0x0368($s2) ## 00000368 /* 02868 80912EA8 8E0D0050 */ lw $t5, 0x0050($s0) ## 00000050 -/* 0286C 80912EAC 460A6400 */ add.s $f16, $f12, $f10 +/* 0286C 80912EAC 460A6400 */ add.s $f16, $f12, $f10 /* 02870 80912EB0 44813000 */ mtc1 $at, $f6 ## $f6 = 10.00 /* 02874 80912EB4 AE4D036C */ sw $t5, 0x036C($s2) ## 0000036C /* 02878 80912EB8 8E0C0054 */ lw $t4, 0x0054($s0) ## 00000054 /* 0287C 80912EBC C6440210 */ lwc1 $f4, 0x0210($s2) ## 00000210 -/* 02880 80912EC0 460E8480 */ add.s $f18, $f16, $f14 +/* 02880 80912EC0 460E8480 */ add.s $f18, $f16, $f14 /* 02884 80912EC4 AE4C0370 */ sw $t4, 0x0370($s2) ## 00000370 /* 02888 80912EC8 8E0D0058 */ lw $t5, 0x0058($s0) ## 00000058 -/* 0288C 80912ECC 46062201 */ sub.s $f8, $f4, $f6 +/* 0288C 80912ECC 46062201 */ sub.s $f8, $f4, $f6 /* 02890 80912ED0 C642020C */ lwc1 $f2, 0x020C($s2) ## 0000020C /* 02894 80912ED4 E6520398 */ swc1 $f18, 0x0398($s2) ## 00000398 /* 02898 80912ED8 E64E0394 */ swc1 $f14, 0x0394($s2) ## 00000394 @@ -125,46 +125,46 @@ glabel L80912E00 /* 028B0 80912EF0 C60A005C */ lwc1 $f10, 0x005C($s0) ## 0000005C /* 028B4 80912EF4 C6520394 */ lwc1 $f18, 0x0394($s2) ## 00000394 /* 028B8 80912EF8 C6460398 */ lwc1 $f6, 0x0398($s2) ## 00000398 -/* 028BC 80912EFC 46025001 */ sub.s $f0, $f10, $f2 +/* 028BC 80912EFC 46025001 */ sub.s $f0, $f10, $f2 /* 028C0 80912F00 C64A03A8 */ lwc1 $f10, 0x03A8($s2) ## 000003A8 /* 028C4 80912F04 3C018091 */ lui $at, %hi(D_80915474) ## $at = 80910000 /* 028C8 80912F08 240E0096 */ addiu $t6, $zero, 0x0096 ## $t6 = 00000096 -/* 028CC 80912F0C 46000005 */ abs.s $f0, $f0 +/* 028CC 80912F0C 46000005 */ abs.s $f0, $f0 /* 028D0 80912F10 E6400378 */ swc1 $f0, 0x0378($s2) ## 00000378 /* 028D4 80912F14 C6100060 */ lwc1 $f16, 0x0060($s0) ## 00000060 -/* 028D8 80912F18 46128001 */ sub.s $f0, $f16, $f18 +/* 028D8 80912F18 46128001 */ sub.s $f0, $f16, $f18 /* 028DC 80912F1C C65203AC */ lwc1 $f18, 0x03AC($s2) ## 000003AC -/* 028E0 80912F20 46000005 */ abs.s $f0, $f0 +/* 028E0 80912F20 46000005 */ abs.s $f0, $f0 /* 028E4 80912F24 E640037C */ swc1 $f0, 0x037C($s2) ## 0000037C /* 028E8 80912F28 C6040064 */ lwc1 $f4, 0x0064($s0) ## 00000064 -/* 028EC 80912F2C 46062001 */ sub.s $f0, $f4, $f6 +/* 028EC 80912F2C 46062001 */ sub.s $f0, $f4, $f6 /* 028F0 80912F30 C64603B0 */ lwc1 $f6, 0x03B0($s2) ## 000003B0 -/* 028F4 80912F34 46000005 */ abs.s $f0, $f0 +/* 028F4 80912F34 46000005 */ abs.s $f0, $f0 /* 028F8 80912F38 E6400380 */ swc1 $f0, 0x0380($s2) ## 00000380 /* 028FC 80912F3C C6080050 */ lwc1 $f8, 0x0050($s0) ## 00000050 -/* 02900 80912F40 460A4001 */ sub.s $f0, $f8, $f10 -/* 02904 80912F44 46000005 */ abs.s $f0, $f0 +/* 02900 80912F40 460A4001 */ sub.s $f0, $f8, $f10 +/* 02904 80912F44 46000005 */ abs.s $f0, $f0 /* 02908 80912F48 E6400384 */ swc1 $f0, 0x0384($s2) ## 00000384 /* 0290C 80912F4C C6100054 */ lwc1 $f16, 0x0054($s0) ## 00000054 -/* 02910 80912F50 46128001 */ sub.s $f0, $f16, $f18 -/* 02914 80912F54 46000005 */ abs.s $f0, $f0 +/* 02910 80912F50 46128001 */ sub.s $f0, $f16, $f18 +/* 02914 80912F54 46000005 */ abs.s $f0, $f0 /* 02918 80912F58 E6400388 */ swc1 $f0, 0x0388($s2) ## 00000388 /* 0291C 80912F5C C6040058 */ lwc1 $f4, 0x0058($s0) ## 00000058 -/* 02920 80912F60 C4225474 */ lwc1 $f2, %lo(D_80915474)($at) +/* 02920 80912F60 C4225474 */ lwc1 $f2, %lo(D_80915474)($at) /* 02924 80912F64 3C018091 */ lui $at, %hi(D_80915478) ## $at = 80910000 -/* 02928 80912F68 46062001 */ sub.s $f0, $f4, $f6 -/* 0292C 80912F6C 46000005 */ abs.s $f0, $f0 +/* 02928 80912F68 46062001 */ sub.s $f0, $f4, $f6 +/* 0292C 80912F6C 46000005 */ abs.s $f0, $f0 /* 02930 80912F70 E640038C */ swc1 $f0, 0x038C($s2) ## 0000038C -/* 02934 80912F74 C4285478 */ lwc1 $f8, %lo(D_80915478)($at) +/* 02934 80912F74 C4285478 */ lwc1 $f8, %lo(D_80915478)($at) /* 02938 80912F78 3C018091 */ lui $at, %hi(D_8091547C) ## $at = 80910000 /* 0293C 80912F7C E64803C4 */ swc1 $f8, 0x03C4($s2) ## 000003C4 -/* 02940 80912F80 C42A547C */ lwc1 $f10, %lo(D_8091547C)($at) +/* 02940 80912F80 C42A547C */ lwc1 $f10, %lo(D_8091547C)($at) /* 02944 80912F84 3C018091 */ lui $at, %hi(D_80915480) ## $at = 80910000 /* 02948 80912F88 E64A03A4 */ swc1 $f10, 0x03A4($s2) ## 000003A4 -/* 0294C 80912F8C C4305480 */ lwc1 $f16, %lo(D_80915480)($at) +/* 0294C 80912F8C C4305480 */ lwc1 $f16, %lo(D_80915480)($at) /* 02950 80912F90 3C018091 */ lui $at, %hi(D_80915484) ## $at = 80910000 /* 02954 80912F94 E65003A0 */ swc1 $f16, 0x03A0($s2) ## 000003A0 -/* 02958 80912F98 C4325484 */ lwc1 $f18, %lo(D_80915484)($at) +/* 02958 80912F98 C4325484 */ lwc1 $f18, %lo(D_80915484)($at) /* 0295C 80912F9C A64001A2 */ sh $zero, 0x01A2($s2) ## 000001A2 /* 02960 80912FA0 A64E01BC */ sh $t6, 0x01BC($s2) ## 000001BC /* 02964 80912FA4 E64203B4 */ swc1 $f2, 0x03B4($s2) ## 000003B4 @@ -175,124 +175,124 @@ glabel L80912FB4 /* 02974 80912FB4 864201A2 */ lh $v0, 0x01A2($s2) ## 000001A2 /* 02978 80912FB8 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 /* 0297C 80912FBC 02202025 */ or $a0, $s1, $zero ## $a0 = 0000014C -/* 02980 80912FC0 10400008 */ beq $v0, $zero, .L80912FE4 +/* 02980 80912FC0 10400008 */ beq $v0, $zero, .L80912FE4 /* 02984 80912FC4 00000000 */ nop -/* 02988 80912FC8 1041001D */ beq $v0, $at, .L80913040 +/* 02988 80912FC8 1041001D */ beq $v0, $at, .L80913040 /* 0298C 80912FCC 02202025 */ or $a0, $s1, $zero ## $a0 = 0000014C /* 02990 80912FD0 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 02994 80912FD4 5041002B */ beql $v0, $at, .L80913084 +/* 02994 80912FD4 5041002B */ beql $v0, $at, .L80913084 /* 02998 80912FD8 24080001 */ addiu $t0, $zero, 0x0001 ## $t0 = 00000001 -/* 0299C 80912FDC 1000002B */ beq $zero, $zero, .L8091308C +/* 0299C 80912FDC 1000002B */ beq $zero, $zero, .L8091308C /* 029A0 80912FE0 86450194 */ lh $a1, 0x0194($s2) ## 00000194 .L80912FE4: -/* 029A4 80912FE4 0C0295B2 */ jal func_800A56C8 +/* 029A4 80912FE4 0C0295B2 */ jal func_800A56C8 /* 029A8 80912FE8 8E4501D0 */ lw $a1, 0x01D0($s2) ## 000001D0 -/* 029AC 80912FEC 10400026 */ beq $v0, $zero, .L80913088 +/* 029AC 80912FEC 10400026 */ beq $v0, $zero, .L80913088 /* 029B0 80912FF0 3C100601 */ lui $s0, 0x0601 ## $s0 = 06010000 /* 029B4 80912FF4 261008D8 */ addiu $s0, $s0, 0x08D8 ## $s0 = 060108D8 /* 029B8 80912FF8 0C028800 */ jal SkelAnime_GetFrameCount - + /* 029BC 80912FFC 02002025 */ or $a0, $s0, $zero ## $a0 = 060108D8 /* 029C0 80913000 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 029C4 80913004 44803000 */ mtc1 $zero, $f6 ## $f6 = 0.00 /* 029C8 80913008 240F0003 */ addiu $t7, $zero, 0x0003 ## $t7 = 00000003 -/* 029CC 8091300C 46802020 */ cvt.s.w $f0, $f4 +/* 029CC 8091300C 46802020 */ cvt.s.w $f0, $f4 /* 029D0 80913010 02202025 */ or $a0, $s1, $zero ## $a0 = 0000014C /* 029D4 80913014 02002825 */ or $a1, $s0, $zero ## $a1 = 060108D8 /* 029D8 80913018 3C063F00 */ lui $a2, 0x3F00 ## $a2 = 3F000000 /* 029DC 8091301C 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 /* 029E0 80913020 E64001D0 */ swc1 $f0, 0x01D0($s2) ## 000001D0 -/* 029E4 80913024 AFAF0014 */ sw $t7, 0x0014($sp) -/* 029E8 80913028 E7A00010 */ swc1 $f0, 0x0010($sp) -/* 029EC 8091302C 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 029F0 80913030 E7A60018 */ swc1 $f6, 0x0018($sp) +/* 029E4 80913024 AFAF0014 */ sw $t7, 0x0014($sp) +/* 029E8 80913028 E7A00010 */ swc1 $f0, 0x0010($sp) +/* 029EC 8091302C 0C029468 */ jal SkelAnime_ChangeAnim + +/* 029F0 80913030 E7A60018 */ swc1 $f6, 0x0018($sp) /* 029F4 80913034 24180001 */ addiu $t8, $zero, 0x0001 ## $t8 = 00000001 -/* 029F8 80913038 10000013 */ beq $zero, $zero, .L80913088 +/* 029F8 80913038 10000013 */ beq $zero, $zero, .L80913088 /* 029FC 8091303C A65801A2 */ sh $t8, 0x01A2($s2) ## 000001A2 .L80913040: -/* 02A00 80913040 0C0295B2 */ jal func_800A56C8 +/* 02A00 80913040 0C0295B2 */ jal func_800A56C8 /* 02A04 80913044 8E4501D0 */ lw $a1, 0x01D0($s2) ## 000001D0 -/* 02A08 80913048 1040000D */ beq $v0, $zero, .L80913080 +/* 02A08 80913048 1040000D */ beq $v0, $zero, .L80913080 /* 02A0C 8091304C 3C100600 */ lui $s0, 0x0600 ## $s0 = 06000000 /* 02A10 80913050 26100D84 */ addiu $s0, $s0, 0x0D84 ## $s0 = 06000D84 /* 02A14 80913054 0C028800 */ jal SkelAnime_GetFrameCount - + /* 02A18 80913058 02002025 */ or $a0, $s0, $zero ## $a0 = 06000D84 /* 02A1C 8091305C 44824000 */ mtc1 $v0, $f8 ## $f8 = 0.00 /* 02A20 80913060 02202025 */ or $a0, $s1, $zero ## $a0 = 0000014C /* 02A24 80913064 02002825 */ or $a1, $s0, $zero ## $a1 = 06000D84 -/* 02A28 80913068 468042A0 */ cvt.s.w $f10, $f8 +/* 02A28 80913068 468042A0 */ cvt.s.w $f10, $f8 /* 02A2C 8091306C 3C06C1A0 */ lui $a2, 0xC1A0 ## $a2 = C1A00000 -/* 02A30 80913070 0C0294D3 */ jal func_800A534C +/* 02A30 80913070 0C0294D3 */ jal SkelAnime_ChangeAnimTransitionRepeat /* 02A34 80913074 E64A01D0 */ swc1 $f10, 0x01D0($s2) ## 000001D0 /* 02A38 80913078 24190002 */ addiu $t9, $zero, 0x0002 ## $t9 = 00000002 /* 02A3C 8091307C A65901A2 */ sh $t9, 0x01A2($s2) ## 000001A2 .L80913080: /* 02A40 80913080 24080001 */ addiu $t0, $zero, 0x0001 ## $t0 = 00000001 .L80913084: -/* 02A44 80913084 A3A800BE */ sb $t0, 0x00BE($sp) +/* 02A44 80913084 A3A800BE */ sb $t0, 0x00BE($sp) .L80913088: /* 02A48 80913088 86450194 */ lh $a1, 0x0194($s2) ## 00000194 .L8091308C: /* 02A4C 8091308C 264400B6 */ addiu $a0, $s2, 0x00B6 ## $a0 = 000000B6 /* 02A50 80913090 24060005 */ addiu $a2, $zero, 0x0005 ## $a2 = 00000005 -/* 02A54 80913094 00050823 */ subu $at, $zero, $a1 -/* 02A58 80913098 00012880 */ sll $a1, $at, 2 -/* 02A5C 8091309C 00A12823 */ subu $a1, $a1, $at -/* 02A60 809130A0 000528C0 */ sll $a1, $a1, 3 -/* 02A64 809130A4 00A12821 */ addu $a1, $a1, $at -/* 02A68 809130A8 00052880 */ sll $a1, $a1, 2 -/* 02A6C 809130AC 00052C00 */ sll $a1, $a1, 16 -/* 02A70 809130B0 00052C03 */ sra $a1, $a1, 16 +/* 02A54 80913094 00050823 */ subu $at, $zero, $a1 +/* 02A58 80913098 00012880 */ sll $a1, $at, 2 +/* 02A5C 8091309C 00A12823 */ subu $a1, $a1, $at +/* 02A60 809130A0 000528C0 */ sll $a1, $a1, 3 +/* 02A64 809130A4 00A12821 */ addu $a1, $a1, $at +/* 02A68 809130A8 00052880 */ sll $a1, $a1, 2 +/* 02A6C 809130AC 00052C00 */ sll $a1, $a1, 16 +/* 02A70 809130B0 00052C03 */ sra $a1, $a1, 16 /* 02A74 809130B4 0C01E1EF */ jal Math_SmoothScaleMaxS - + /* 02A78 809130B8 24070BB8 */ addiu $a3, $zero, 0x0BB8 ## $a3 = 00000BB8 /* 02A7C 809130BC 3C014270 */ lui $at, 0x4270 ## $at = 42700000 /* 02A80 809130C0 44819000 */ mtc1 $at, $f18 ## $f18 = 60.00 /* 02A84 809130C4 C6500214 */ lwc1 $f16, 0x0214($s2) ## 00000214 /* 02A88 809130C8 3C063CA3 */ lui $a2, 0x3CA3 ## $a2 = 3CA30000 /* 02A8C 809130CC 34C6D70A */ ori $a2, $a2, 0xD70A ## $a2 = 3CA3D70A -/* 02A90 809130D0 46128100 */ add.s $f4, $f16, $f18 +/* 02A90 809130D0 46128100 */ add.s $f4, $f16, $f18 /* 02A94 809130D4 26440398 */ addiu $a0, $s2, 0x0398 ## $a0 = 00000398 /* 02A98 809130D8 3C073F00 */ lui $a3, 0x3F00 ## $a3 = 3F000000 -/* 02A9C 809130DC 44052000 */ mfc1 $a1, $f4 +/* 02A9C 809130DC 44052000 */ mfc1 $a1, $f4 /* 02AA0 809130E0 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 02AA4 809130E4 00000000 */ nop /* 02AA8 809130E8 3C063D4C */ lui $a2, 0x3D4C ## $a2 = 3D4C0000 /* 02AAC 809130EC 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3D4CCCCD /* 02AB0 809130F0 26440028 */ addiu $a0, $s2, 0x0028 ## $a0 = 00000028 /* 02AB4 809130F4 3C0542C8 */ lui $a1, 0x42C8 ## $a1 = 42C80000 /* 02AB8 809130F8 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 02ABC 809130FC 3C0742C8 */ lui $a3, 0x42C8 ## $a3 = 42C80000 /* 02AC0 80913100 86440194 */ lh $a0, 0x0194($s2) ## 00000194 -/* 02AC4 80913104 00800821 */ addu $at, $a0, $zero -/* 02AC8 80913108 00042080 */ sll $a0, $a0, 2 -/* 02ACC 8091310C 00812023 */ subu $a0, $a0, $at -/* 02AD0 80913110 00042100 */ sll $a0, $a0, 4 -/* 02AD4 80913114 00812023 */ subu $a0, $a0, $at -/* 02AD8 80913118 000420C0 */ sll $a0, $a0, 3 -/* 02ADC 8091311C 00812023 */ subu $a0, $a0, $at -/* 02AE0 80913120 00042080 */ sll $a0, $a0, 2 -/* 02AE4 80913124 00042400 */ sll $a0, $a0, 16 +/* 02AC4 80913104 00800821 */ addu $at, $a0, $zero +/* 02AC8 80913108 00042080 */ sll $a0, $a0, 2 +/* 02ACC 8091310C 00812023 */ subu $a0, $a0, $at +/* 02AD0 80913110 00042100 */ sll $a0, $a0, 4 +/* 02AD4 80913114 00812023 */ subu $a0, $a0, $at +/* 02AD8 80913118 000420C0 */ sll $a0, $a0, 3 +/* 02ADC 8091311C 00812023 */ subu $a0, $a0, $at +/* 02AE0 80913120 00042080 */ sll $a0, $a0, 2 +/* 02AE4 80913124 00042400 */ sll $a0, $a0, 16 /* 02AE8 80913128 0C01DE1C */ jal Math_Sins ## sins? -/* 02AEC 8091312C 00042403 */ sra $a0, $a0, 16 +/* 02AEC 8091312C 00042403 */ sra $a0, $a0, 16 /* 02AF0 80913130 C6460028 */ lwc1 $f6, 0x0028($s2) ## 00000028 /* 02AF4 80913134 3C014120 */ lui $at, 0x4120 ## $at = 41200000 /* 02AF8 80913138 44819000 */ mtc1 $at, $f18 ## $f18 = 10.00 /* 02AFC 8091313C C6500210 */ lwc1 $f16, 0x0210($s2) ## 00000210 -/* 02B00 80913140 46003200 */ add.s $f8, $f6, $f0 +/* 02B00 80913140 46003200 */ add.s $f8, $f6, $f0 /* 02B04 80913144 864901BC */ lh $t1, 0x01BC($s2) ## 000001BC /* 02B08 80913148 C64A020C */ lwc1 $f10, 0x020C($s2) ## 0000020C -/* 02B0C 8091314C 46128101 */ sub.s $f4, $f16, $f18 +/* 02B0C 8091314C 46128101 */ sub.s $f4, $f16, $f18 /* 02B10 80913150 C6460214 */ lwc1 $f6, 0x0214($s2) ## 00000214 /* 02B14 80913154 E6480028 */ swc1 $f8, 0x0028($s2) ## 00000028 /* 02B18 80913158 E64A03A8 */ swc1 $f10, 0x03A8($s2) ## 000003A8 /* 02B1C 8091315C E64403AC */ swc1 $f4, 0x03AC($s2) ## 000003AC -/* 02B20 80913160 1520015E */ bne $t1, $zero, .L809136DC +/* 02B20 80913160 1520015E */ bne $t1, $zero, .L809136DC /* 02B24 80913164 E64603B0 */ swc1 $f6, 0x03B0($s2) ## 000003B0 /* 02B28 80913168 3C014396 */ lui $at, 0x4396 ## $at = 43960000 /* 02B2C 8091316C 44814000 */ mtc1 $at, $f8 ## $f8 = 300.00 @@ -310,18 +310,18 @@ glabel L80912FB4 /* 02B5C 8091319C E64A0394 */ swc1 $f10, 0x0394($s2) ## 00000394 /* 02B60 809131A0 3C018091 */ lui $at, %hi(D_80915488) ## $at = 80910000 /* 02B64 809131A4 E6700024 */ swc1 $f16, 0x0024($s3) ## 00000024 -/* 02B68 809131A8 C4325488 */ lwc1 $f18, %lo(D_80915488)($at) +/* 02B68 809131A8 C4325488 */ lwc1 $f18, %lo(D_80915488)($at) /* 02B6C 809131AC 240D0001 */ addiu $t5, $zero, 0x0001 ## $t5 = 00000001 /* 02B70 809131B0 240E0001 */ addiu $t6, $zero, 0x0001 ## $t6 = 00000001 /* 02B74 809131B4 E672002C */ swc1 $f18, 0x002C($s3) ## 0000002C -/* 02B78 809131B8 A3AD00BF */ sb $t5, 0x00BF($sp) -/* 02B7C 809131BC 10000147 */ beq $zero, $zero, .L809136DC -/* 02B80 809131C0 A3AE00BE */ sb $t6, 0x00BE($sp) +/* 02B78 809131B8 A3AD00BF */ sb $t5, 0x00BF($sp) +/* 02B7C 809131BC 10000147 */ beq $zero, $zero, .L809136DC +/* 02B80 809131C0 A3AE00BE */ sb $t6, 0x00BE($sp) glabel L809131C4 /* 02B84 809131C4 864F01BE */ lh $t7, 0x01BE($s2) ## 000001BE /* 02B88 809131C8 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 /* 02B8C 809131CC 26841C24 */ addiu $a0, $s4, 0x1C24 ## $a0 = 00001C24 -/* 02B90 809131D0 15E10019 */ bne $t7, $at, .L80913238 +/* 02B90 809131D0 15E10019 */ bne $t7, $at, .L80913238 /* 02B94 809131D4 02402825 */ or $a1, $s2, $zero ## $a1 = 00000000 /* 02B98 809131D8 3C014160 */ lui $at, 0x4160 ## $at = 41600000 /* 02B9C 809131DC 44812000 */ mtc1 $at, $f4 ## $f4 = 14.00 @@ -329,118 +329,118 @@ glabel L809131C4 /* 02BA4 809131E4 3C01C1F0 */ lui $at, 0xC1F0 ## $at = C1F00000 /* 02BA8 809131E8 44813000 */ mtc1 $at, $f6 ## $f6 = -30.00 /* 02BAC 809131EC 3C018091 */ lui $at, %hi(D_8091548C) ## $at = 80910000 -/* 02BB0 809131F0 C428548C */ lwc1 $f8, %lo(D_8091548C)($at) +/* 02BB0 809131F0 C428548C */ lwc1 $f8, %lo(D_8091548C)($at) /* 02BB4 809131F4 24184000 */ addiu $t8, $zero, 0x4000 ## $t8 = 00004000 /* 02BB8 809131F8 24190029 */ addiu $t9, $zero, 0x0029 ## $t9 = 00000029 -/* 02BBC 809131FC AFB90028 */ sw $t9, 0x0028($sp) -/* 02BC0 80913200 AFB8001C */ sw $t8, 0x001C($sp) -/* 02BC4 80913204 AFA00024 */ sw $zero, 0x0024($sp) -/* 02BC8 80913208 AFA00020 */ sw $zero, 0x0020($sp) +/* 02BBC 809131FC AFB90028 */ sw $t9, 0x0028($sp) +/* 02BC0 80913200 AFB8001C */ sw $t8, 0x001C($sp) +/* 02BC4 80913204 AFA00024 */ sw $zero, 0x0024($sp) +/* 02BC8 80913208 AFA00020 */ sw $zero, 0x0020($sp) /* 02BCC 8091320C 02803025 */ or $a2, $s4, $zero ## $a2 = 00000000 /* 02BD0 80913210 2407006D */ addiu $a3, $zero, 0x006D ## $a3 = 0000006D -/* 02BD4 80913214 E7A40010 */ swc1 $f4, 0x0010($sp) -/* 02BD8 80913218 E7A60014 */ swc1 $f6, 0x0014($sp) +/* 02BD4 80913214 E7A40010 */ swc1 $f4, 0x0010($sp) +/* 02BD8 80913218 E7A60014 */ swc1 $f6, 0x0014($sp) /* 02BDC 8091321C 0C00C916 */ jal Actor_SpawnAttached - -/* 02BE0 80913220 E7A80018 */ swc1 $f8, 0x0018($sp) + +/* 02BE0 80913220 E7A80018 */ swc1 $f8, 0x0018($sp) /* 02BE4 80913224 AE50011C */ sw $s0, 0x011C($s2) ## 0000011C /* 02BE8 80913228 02802025 */ or $a0, $s4, $zero ## $a0 = 00000000 /* 02BEC 8091322C 2405108E */ addiu $a1, $zero, 0x108E ## $a1 = 0000108E -/* 02BF0 80913230 0C042DA0 */ jal func_8010B680 +/* 02BF0 80913230 0C042DA0 */ jal func_8010B680 /* 02BF4 80913234 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 .L80913238: /* 02BF8 80913238 86440194 */ lh $a0, 0x0194($s2) ## 00000194 /* 02BFC 8091323C 864800B6 */ lh $t0, 0x00B6($s2) ## 000000B6 -/* 02C00 80913240 00800821 */ addu $at, $a0, $zero -/* 02C04 80913244 00042080 */ sll $a0, $a0, 2 -/* 02C08 80913248 00812023 */ subu $a0, $a0, $at -/* 02C0C 8091324C 00042100 */ sll $a0, $a0, 4 -/* 02C10 80913250 00812023 */ subu $a0, $a0, $at -/* 02C14 80913254 000420C0 */ sll $a0, $a0, 3 -/* 02C18 80913258 00812023 */ subu $a0, $a0, $at -/* 02C1C 8091325C 00042080 */ sll $a0, $a0, 2 -/* 02C20 80913260 00042400 */ sll $a0, $a0, 16 +/* 02C00 80913240 00800821 */ addu $at, $a0, $zero +/* 02C04 80913244 00042080 */ sll $a0, $a0, 2 +/* 02C08 80913248 00812023 */ subu $a0, $a0, $at +/* 02C0C 8091324C 00042100 */ sll $a0, $a0, 4 +/* 02C10 80913250 00812023 */ subu $a0, $a0, $at +/* 02C14 80913254 000420C0 */ sll $a0, $a0, 3 +/* 02C18 80913258 00812023 */ subu $a0, $a0, $at +/* 02C1C 8091325C 00042080 */ sll $a0, $a0, 2 +/* 02C20 80913260 00042400 */ sll $a0, $a0, 16 /* 02C24 80913264 2509FF38 */ addiu $t1, $t0, 0xFF38 ## $t1 = FFFFFF38 /* 02C28 80913268 A64900B6 */ sh $t1, 0x00B6($s2) ## 000000B6 /* 02C2C 8091326C 0C01DE1C */ jal Math_Sins ## sins? -/* 02C30 80913270 00042403 */ sra $a0, $a0, 16 +/* 02C30 80913270 00042403 */ sra $a0, $a0, 16 /* 02C34 80913274 3C0142F0 */ lui $at, 0x42F0 ## $at = 42F00000 /* 02C38 80913278 44812000 */ mtc1 $at, $f4 ## $f4 = 120.00 /* 02C3C 8091327C C65201DC */ lwc1 $f18, 0x01DC($s2) ## 000001DC /* 02C40 80913280 C64A0028 */ lwc1 $f10, 0x0028($s2) ## 00000028 -/* 02C44 80913284 46049180 */ add.s $f6, $f18, $f4 -/* 02C48 80913288 46005400 */ add.s $f16, $f10, $f0 +/* 02C44 80913284 46049180 */ add.s $f6, $f18, $f4 +/* 02C48 80913288 46005400 */ add.s $f16, $f10, $f0 /* 02C4C 8091328C E64601DC */ swc1 $f6, 0x01DC($s2) ## 000001DC /* 02C50 80913290 C64801DC */ lwc1 $f8, 0x01DC($s2) ## 000001DC /* 02C54 80913294 E6500028 */ swc1 $f16, 0x0028($s2) ## 00000028 -/* 02C58 80913298 4600428D */ trunc.w.s $f10, $f8 -/* 02C5C 8091329C 44045000 */ mfc1 $a0, $f10 +/* 02C58 80913298 4600428D */ trunc.w.s $f10, $f8 +/* 02C5C 8091329C 44045000 */ mfc1 $a0, $f10 /* 02C60 809132A0 00000000 */ nop -/* 02C64 809132A4 00042400 */ sll $a0, $a0, 16 +/* 02C64 809132A4 00042400 */ sll $a0, $a0, 16 /* 02C68 809132A8 0C01DE1C */ jal Math_Sins ## sins? -/* 02C6C 809132AC 00042403 */ sra $a0, $a0, 16 +/* 02C6C 809132AC 00042403 */ sra $a0, $a0, 16 /* 02C70 809132B0 C65001D8 */ lwc1 $f16, 0x01D8($s2) ## 000001D8 -/* 02C74 809132B4 46008482 */ mul.s $f18, $f16, $f0 -/* 02C78 809132B8 E7B200B8 */ swc1 $f18, 0x00B8($sp) +/* 02C74 809132B4 46008482 */ mul.s $f18, $f16, $f0 +/* 02C78 809132B8 E7B200B8 */ swc1 $f18, 0x00B8($sp) /* 02C7C 809132BC C64401DC */ lwc1 $f4, 0x01DC($s2) ## 000001DC -/* 02C80 809132C0 4600218D */ trunc.w.s $f6, $f4 -/* 02C84 809132C4 44043000 */ mfc1 $a0, $f6 +/* 02C80 809132C0 4600218D */ trunc.w.s $f6, $f4 +/* 02C84 809132C4 44043000 */ mfc1 $a0, $f6 /* 02C88 809132C8 00000000 */ nop -/* 02C8C 809132CC 00042400 */ sll $a0, $a0, 16 +/* 02C8C 809132CC 00042400 */ sll $a0, $a0, 16 /* 02C90 809132D0 0C01DE0D */ jal Math_Coss ## coss? -/* 02C94 809132D4 00042403 */ sra $a0, $a0, 16 +/* 02C94 809132D4 00042403 */ sra $a0, $a0, 16 /* 02C98 809132D8 3C014160 */ lui $at, 0x4160 ## $at = 41600000 /* 02C9C 809132DC 44815000 */ mtc1 $at, $f10 ## $f10 = 14.00 -/* 02CA0 809132E0 C7B000B8 */ lwc1 $f16, 0x00B8($sp) +/* 02CA0 809132E0 C7B000B8 */ lwc1 $f16, 0x00B8($sp) /* 02CA4 809132E4 C64801D8 */ lwc1 $f8, 0x01D8($s2) ## 000001D8 /* 02CA8 809132E8 C6440394 */ lwc1 $f4, 0x0394($s2) ## 00000394 -/* 02CAC 809132EC 46105480 */ add.s $f18, $f10, $f16 -/* 02CB0 809132F0 46004082 */ mul.s $f2, $f8, $f0 +/* 02CAC 809132EC 46105480 */ add.s $f18, $f10, $f16 +/* 02CB0 809132F0 46004082 */ mul.s $f2, $f8, $f0 /* 02CB4 809132F4 3C018091 */ lui $at, %hi(D_80915490) ## $at = 80910000 /* 02CB8 809132F8 E6440364 */ swc1 $f4, 0x0364($s2) ## 00000364 /* 02CBC 809132FC E6520360 */ swc1 $f18, 0x0360($s2) ## 00000360 -/* 02CC0 80913300 C4265490 */ lwc1 $f6, %lo(D_80915490)($at) +/* 02CC0 80913300 C4265490 */ lwc1 $f6, %lo(D_80915490)($at) /* 02CC4 80913304 3C014160 */ lui $at, 0x4160 ## $at = 41600000 /* 02CC8 80913308 44815000 */ mtc1 $at, $f10 ## $f10 = 14.00 -/* 02CCC 8091330C 46023200 */ add.s $f8, $f6, $f2 +/* 02CCC 8091330C 46023200 */ add.s $f8, $f6, $f2 /* 02CD0 80913310 3C01C120 */ lui $at, 0xC120 ## $at = C1200000 /* 02CD4 80913314 44818000 */ mtc1 $at, $f16 ## $f16 = -10.00 /* 02CD8 80913318 3C018091 */ lui $at, %hi(D_80915494) ## $at = 80910000 /* 02CDC 8091331C E6480368 */ swc1 $f8, 0x0368($s2) ## 00000368 /* 02CE0 80913320 E64A036C */ swc1 $f10, 0x036C($s2) ## 0000036C /* 02CE4 80913324 E6500370 */ swc1 $f16, 0x0370($s2) ## 00000370 -/* 02CE8 80913328 C4325494 */ lwc1 $f18, %lo(D_80915494)($at) +/* 02CE8 80913328 C4325494 */ lwc1 $f18, %lo(D_80915494)($at) /* 02CEC 8091332C 3C063D4C */ lui $a2, 0x3D4C ## $a2 = 3D4C0000 /* 02CF0 80913330 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3D4CCCCD /* 02CF4 80913334 26440394 */ addiu $a0, $s2, 0x0394 ## $a0 = 00000394 /* 02CF8 80913338 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 /* 02CFC 8091333C 3C073F00 */ lui $a3, 0x3F00 ## $a3 = 3F000000 /* 02D00 80913340 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 02D04 80913344 E6520374 */ swc1 $f18, 0x0374($s2) ## 00000374 /* 02D08 80913348 3C063D4C */ lui $a2, 0x3D4C ## $a2 = 3D4C0000 /* 02D0C 8091334C 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3D4CCCCD /* 02D10 80913350 264401D8 */ addiu $a0, $s2, 0x01D8 ## $a0 = 000001D8 /* 02D14 80913354 3C05432A */ lui $a1, 0x432A ## $a1 = 432A0000 /* 02D18 80913358 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 02D1C 8091335C 3C073F80 */ lui $a3, 0x3F80 ## $a3 = 3F800000 /* 02D20 80913360 3C063D4C */ lui $a2, 0x3D4C ## $a2 = 3D4C0000 /* 02D24 80913364 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3D4CCCCD /* 02D28 80913368 26440024 */ addiu $a0, $s2, 0x0024 ## $a0 = 00000024 /* 02D2C 8091336C 3C054160 */ lui $a1, 0x4160 ## $a1 = 41600000 /* 02D30 80913370 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 02D34 80913374 3C073FC0 */ lui $a3, 0x3FC0 ## $a3 = 3FC00000 /* 02D38 80913378 3C063D4C */ lui $a2, 0x3D4C ## $a2 = 3D4C0000 /* 02D3C 8091337C 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3D4CCCCD /* 02D40 80913380 26440028 */ addiu $a0, $s2, 0x0028 ## $a0 = 00000028 /* 02D44 80913384 3C054248 */ lui $a1, 0x4248 ## $a1 = 42480000 /* 02D48 80913388 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 02D4C 8091338C 3C073F80 */ lui $a3, 0x3F80 ## $a3 = 3F800000 /* 02D50 80913390 3C05C54F */ lui $a1, 0xC54F ## $a1 = C54F0000 /* 02D54 80913394 3C063D4C */ lui $a2, 0x3D4C ## $a2 = 3D4C0000 @@ -448,18 +448,18 @@ glabel L809131C4 /* 02D5C 8091339C 34A53000 */ ori $a1, $a1, 0x3000 ## $a1 = C54F3000 /* 02D60 809133A0 2644002C */ addiu $a0, $s2, 0x002C ## $a0 = 0000002C /* 02D64 809133A4 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 02D68 809133A8 3C073FC0 */ lui $a3, 0x3FC0 ## $a3 = 3FC00000 /* 02D6C 809133AC 864C01BC */ lh $t4, 0x01BC($s2) ## 000001BC /* 02D70 809133B0 240D0004 */ addiu $t5, $zero, 0x0004 ## $t5 = 00000004 /* 02D74 809133B4 240E0032 */ addiu $t6, $zero, 0x0032 ## $t6 = 00000032 -/* 02D78 809133B8 15800015 */ bne $t4, $zero, .L80913410 +/* 02D78 809133B8 15800015 */ bne $t4, $zero, .L80913410 /* 02D7C 809133BC 02202025 */ or $a0, $s1, $zero ## $a0 = 0000014C /* 02D80 809133C0 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 02D84 809133C4 A64D035E */ sh $t5, 0x035E($s2) ## 0000035E /* 02D88 809133C8 A64E01BC */ sh $t6, 0x01BC($s2) ## 000001BC /* 02D8C 809133CC 24A5189C */ addiu $a1, $a1, 0x189C ## $a1 = 0600189C -/* 02D90 809133D0 0C0294D3 */ jal func_800A534C +/* 02D90 809133D0 0C0294D3 */ jal SkelAnime_ChangeAnimTransitionRepeat /* 02D94 809133D4 3C06C120 */ lui $a2, 0xC120 ## $a2 = C1200000 /* 02D98 809133D8 3C014160 */ lui $at, 0x4160 ## $at = 41600000 /* 02D9C 809133DC 44812000 */ mtc1 $at, $f4 ## $f4 = 14.00 @@ -468,20 +468,20 @@ glabel L809131C4 /* 02DA8 809133E8 3C018091 */ lui $at, %hi(D_80915498) ## $at = 80910000 /* 02DAC 809133EC E6440024 */ swc1 $f4, 0x0024($s2) ## 00000024 /* 02DB0 809133F0 E6460028 */ swc1 $f6, 0x0028($s2) ## 00000028 -/* 02DB4 809133F4 C4285498 */ lwc1 $f8, %lo(D_80915498)($at) +/* 02DB4 809133F4 C4285498 */ lwc1 $f8, %lo(D_80915498)($at) /* 02DB8 809133F8 A64000B6 */ sh $zero, 0x00B6($s2) ## 000000B6 /* 02DBC 809133FC A64001AE */ sh $zero, 0x01AE($s2) ## 000001AE /* 02DC0 80913400 02402025 */ or $a0, $s2, $zero ## $a0 = 00000000 /* 02DC4 80913404 240538AC */ addiu $a1, $zero, 0x38AC ## $a1 = 000038AC /* 02DC8 80913408 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 02DCC 8091340C E648002C */ swc1 $f8, 0x002C($s2) ## 0000002C .L80913410: /* 02DD0 80913410 240F0001 */ addiu $t7, $zero, 0x0001 ## $t7 = 00000001 /* 02DD4 80913414 24180001 */ addiu $t8, $zero, 0x0001 ## $t8 = 00000001 -/* 02DD8 80913418 A3AF00BF */ sb $t7, 0x00BF($sp) -/* 02DDC 8091341C 100000AF */ beq $zero, $zero, .L809136DC -/* 02DE0 80913420 A3B800BE */ sb $t8, 0x00BE($sp) +/* 02DD8 80913418 A3AF00BF */ sb $t7, 0x00BF($sp) +/* 02DDC 8091341C 100000AF */ beq $zero, $zero, .L809136DC +/* 02DE0 80913420 A3B800BE */ sb $t8, 0x00BE($sp) glabel L80913424 /* 02DE4 80913424 3C014248 */ lui $at, 0x4248 ## $at = 42480000 /* 02DE8 80913428 44810000 */ mtc1 $at, $f0 ## $f0 = 50.00 @@ -489,13 +489,13 @@ glabel L80913424 /* 02DF0 80913430 24080002 */ addiu $t0, $zero, 0x0002 ## $t0 = 00000002 /* 02DF4 80913434 3C014160 */ lui $at, 0x4160 ## $at = 41600000 /* 02DF8 80913438 44815000 */ mtc1 $at, $f10 ## $f10 = 14.00 -/* 02DFC 8091343C A3B900BF */ sb $t9, 0x00BF($sp) -/* 02E00 80913440 A3A800BE */ sb $t0, 0x00BE($sp) +/* 02DFC 8091343C A3B900BF */ sb $t9, 0x00BF($sp) +/* 02E00 80913440 A3A800BE */ sb $t0, 0x00BE($sp) /* 02E04 80913444 3C018091 */ lui $at, %hi(D_8091549C) ## $at = 80910000 /* 02E08 80913448 E6400028 */ swc1 $f0, 0x0028($s2) ## 00000028 /* 02E0C 8091344C E6400364 */ swc1 $f0, 0x0364($s2) ## 00000364 /* 02E10 80913450 E64A0360 */ swc1 $f10, 0x0360($s2) ## 00000360 -/* 02E14 80913454 C430549C */ lwc1 $f16, %lo(D_8091549C)($at) +/* 02E14 80913454 C430549C */ lwc1 $f16, %lo(D_8091549C)($at) /* 02E18 80913458 3C014160 */ lui $at, 0x4160 ## $at = 41600000 /* 02E1C 8091345C 44819000 */ mtc1 $at, $f18 ## $f18 = 14.00 /* 02E20 80913460 3C01428C */ lui $at, 0x428C ## $at = 428C0000 @@ -505,30 +505,30 @@ glabel L80913424 /* 02E30 80913470 E6500368 */ swc1 $f16, 0x0368($s2) ## 00000368 /* 02E34 80913474 E652036C */ swc1 $f18, 0x036C($s2) ## 0000036C /* 02E38 80913478 E6440370 */ swc1 $f4, 0x0370($s2) ## 00000370 -/* 02E3C 8091347C C42654A0 */ lwc1 $f6, %lo(D_809154A0)($at) +/* 02E3C 8091347C C42654A0 */ lwc1 $f6, %lo(D_809154A0)($at) /* 02E40 80913480 240A0005 */ addiu $t2, $zero, 0x0005 ## $t2 = 00000005 -/* 02E44 80913484 15200095 */ bne $t1, $zero, .L809136DC +/* 02E44 80913484 15200095 */ bne $t1, $zero, .L809136DC /* 02E48 80913488 E6460374 */ swc1 $f6, 0x0374($s2) ## 00000374 /* 02E4C 8091348C 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 02E50 80913490 A64A035E */ sh $t2, 0x035E($s2) ## 0000035E /* 02E54 80913494 24A51AB0 */ addiu $a1, $a1, 0x1AB0 ## $a1 = 06001AB0 /* 02E58 80913498 02202025 */ or $a0, $s1, $zero ## $a0 = 0000014C -/* 02E5C 8091349C 0C029490 */ jal func_800A5240 +/* 02E5C 8091349C 0C029490 */ jal SkelAnime_ChangeAnimTransitionStop /* 02E60 809134A0 3C06C120 */ lui $a2, 0xC120 ## $a2 = C1200000 /* 02E64 809134A4 240B0028 */ addiu $t3, $zero, 0x0028 ## $t3 = 00000028 /* 02E68 809134A8 A64001AE */ sh $zero, 0x01AE($s2) ## 000001AE -/* 02E6C 809134AC 1000008B */ beq $zero, $zero, .L809136DC +/* 02E6C 809134AC 1000008B */ beq $zero, $zero, .L809136DC /* 02E70 809134B0 A64B01BC */ sh $t3, 0x01BC($s2) ## 000001BC glabel L809134B4 /* 02E74 809134B4 240C0001 */ addiu $t4, $zero, 0x0001 ## $t4 = 00000001 /* 02E78 809134B8 240D0003 */ addiu $t5, $zero, 0x0003 ## $t5 = 00000003 /* 02E7C 809134BC 3C053D4C */ lui $a1, 0x3D4C ## $a1 = 3D4C0000 -/* 02E80 809134C0 A3AC00BF */ sb $t4, 0x00BF($sp) -/* 02E84 809134C4 A3AD00BE */ sb $t5, 0x00BE($sp) +/* 02E80 809134C0 A3AC00BF */ sb $t4, 0x00BF($sp) +/* 02E84 809134C4 A3AD00BE */ sb $t5, 0x00BE($sp) /* 02E88 809134C8 34A5CCCD */ ori $a1, $a1, 0xCCCD ## $a1 = 3D4CCCCD /* 02E8C 809134CC 26440364 */ addiu $a0, $s2, 0x0364 ## $a0 = 00000364 /* 02E90 809134D0 0C01E123 */ jal Math_SmoothDownscaleMaxF - + /* 02E94 809134D4 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 02E98 809134D8 3C05C544 */ lui $a1, 0xC544 ## $a1 = C5440000 /* 02E9C 809134DC 3C063D4C */ lui $a2, 0x3D4C ## $a2 = 3D4C0000 @@ -536,58 +536,58 @@ glabel L809134B4 /* 02EA4 809134E4 34A59000 */ ori $a1, $a1, 0x9000 ## $a1 = C5449000 /* 02EA8 809134E8 26440368 */ addiu $a0, $s2, 0x0368 ## $a0 = 00000368 /* 02EAC 809134EC 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 02EB0 809134F0 3C074000 */ lui $a3, 0x4000 ## $a3 = 40000000 /* 02EB4 809134F4 3C063D4C */ lui $a2, 0x3D4C ## $a2 = 3D4C0000 /* 02EB8 809134F8 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3D4CCCCD /* 02EBC 809134FC 26440370 */ addiu $a0, $s2, 0x0370 ## $a0 = 00000370 /* 02EC0 80913500 3C0541A0 */ lui $a1, 0x41A0 ## $a1 = 41A00000 /* 02EC4 80913504 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 02EC8 80913508 3C073F80 */ lui $a3, 0x3F80 ## $a3 = 3F800000 /* 02ECC 8091350C 864E01BC */ lh $t6, 0x01BC($s2) ## 000001BC /* 02ED0 80913510 240F00FA */ addiu $t7, $zero, 0x00FA ## $t7 = 000000FA /* 02ED4 80913514 24180006 */ addiu $t8, $zero, 0x0006 ## $t8 = 00000006 -/* 02ED8 80913518 55C00071 */ bnel $t6, $zero, .L809136E0 -/* 02EDC 8091351C 93A900BE */ lbu $t1, 0x00BE($sp) +/* 02ED8 80913518 55C00071 */ bnel $t6, $zero, .L809136E0 +/* 02EDC 8091351C 93A900BE */ lbu $t1, 0x00BE($sp) /* 02EE0 80913520 A64F01BC */ sh $t7, 0x01BC($s2) ## 000001BC -/* 02EE4 80913524 1000006D */ beq $zero, $zero, .L809136DC +/* 02EE4 80913524 1000006D */ beq $zero, $zero, .L809136DC /* 02EE8 80913528 A658035E */ sh $t8, 0x035E($s2) ## 0000035E glabel L8091352C /* 02EEC 8091352C 24190001 */ addiu $t9, $zero, 0x0001 ## $t9 = 00000001 /* 02EF0 80913530 2408000A */ addiu $t0, $zero, 0x000A ## $t0 = 0000000A -/* 02EF4 80913534 A3B900BF */ sb $t9, 0x00BF($sp) -/* 02EF8 80913538 A3A800BE */ sb $t0, 0x00BE($sp) +/* 02EF4 80913534 A3B900BF */ sb $t9, 0x00BF($sp) +/* 02EF8 80913538 A3A800BE */ sb $t0, 0x00BE($sp) /* 02EFC 8091353C 864901BC */ lh $t1, 0x01BC($s2) ## 000001BC /* 02F00 80913540 24010096 */ addiu $at, $zero, 0x0096 ## $at = 00000096 -/* 02F04 80913544 55210014 */ bnel $t1, $at, .L80913598 +/* 02F04 80913544 55210014 */ bnel $t1, $at, .L80913598 /* 02F08 80913548 3C053D4C */ lui $a1, 0x3D4C ## $a1 = 3D4C0000 /* 02F0C 8091354C 0C03E803 */ jal Audio_SetBGM - + /* 02F10 80913550 24040021 */ addiu $a0, $zero, 0x0021 ## $a0 = 00000021 /* 02F14 80913554 3C01C204 */ lui $at, 0xC204 ## $at = C2040000 /* 02F18 80913558 44814000 */ mtc1 $at, $f8 ## $f8 = -33.00 /* 02F1C 8091355C 3C018091 */ lui $at, %hi(D_809154A4) ## $at = 80910000 -/* 02F20 80913560 C42A54A4 */ lwc1 $f10, %lo(D_809154A4)($at) +/* 02F20 80913560 C42A54A4 */ lwc1 $f10, %lo(D_809154A4)($at) /* 02F24 80913564 240AFFFF */ addiu $t2, $zero, 0xFFFF ## $t2 = FFFFFFFF -/* 02F28 80913568 AFAA0024 */ sw $t2, 0x0024($sp) +/* 02F28 80913568 AFAA0024 */ sw $t2, 0x0024($sp) /* 02F2C 8091356C 26841C24 */ addiu $a0, $s4, 0x1C24 ## $a0 = 00001C24 /* 02F30 80913570 02802825 */ or $a1, $s4, $zero ## $a1 = 00000000 /* 02F34 80913574 2406005D */ addiu $a2, $zero, 0x005D ## $a2 = 0000005D /* 02F38 80913578 3C074160 */ lui $a3, 0x4160 ## $a3 = 41600000 -/* 02F3C 8091357C AFA00018 */ sw $zero, 0x0018($sp) -/* 02F40 80913580 AFA0001C */ sw $zero, 0x001C($sp) -/* 02F44 80913584 AFA00020 */ sw $zero, 0x0020($sp) -/* 02F48 80913588 E7A80010 */ swc1 $f8, 0x0010($sp) +/* 02F3C 8091357C AFA00018 */ sw $zero, 0x0018($sp) +/* 02F40 80913580 AFA0001C */ sw $zero, 0x001C($sp) +/* 02F44 80913584 AFA00020 */ sw $zero, 0x0020($sp) +/* 02F48 80913588 E7A80010 */ swc1 $f8, 0x0010($sp) /* 02F4C 8091358C 0C00C7D4 */ jal Actor_Spawn ## ActorSpawn -/* 02F50 80913590 E7AA0014 */ swc1 $f10, 0x0014($sp) +/* 02F50 80913590 E7AA0014 */ swc1 $f10, 0x0014($sp) /* 02F54 80913594 3C053D4C */ lui $a1, 0x3D4C ## $a1 = 3D4C0000 .L80913598: /* 02F58 80913598 34A5CCCD */ ori $a1, $a1, 0xCCCD ## $a1 = 3D4CCCCD /* 02F5C 8091359C 26440364 */ addiu $a0, $s2, 0x0364 ## $a0 = 00000364 /* 02F60 809135A0 0C01E123 */ jal Math_SmoothDownscaleMaxF - + /* 02F64 809135A4 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 02F68 809135A8 3C05C544 */ lui $a1, 0xC544 ## $a1 = C5440000 /* 02F6C 809135AC 3C063D4C */ lui $a2, 0x3D4C ## $a2 = 3D4C0000 @@ -595,19 +595,19 @@ glabel L8091352C /* 02F74 809135B4 34A59000 */ ori $a1, $a1, 0x9000 ## $a1 = C5449000 /* 02F78 809135B8 26440368 */ addiu $a0, $s2, 0x0368 ## $a0 = 00000368 /* 02F7C 809135BC 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 02F80 809135C0 3C074000 */ lui $a3, 0x4000 ## $a3 = 40000000 /* 02F84 809135C4 3C063D4C */ lui $a2, 0x3D4C ## $a2 = 3D4C0000 /* 02F88 809135C8 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3D4CCCCD /* 02F8C 809135CC 26440370 */ addiu $a0, $s2, 0x0370 ## $a0 = 00000370 /* 02F90 809135D0 3C0541A0 */ lui $a1, 0x41A0 ## $a1 = 41A00000 /* 02F94 809135D4 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 02F98 809135D8 3C073F80 */ lui $a3, 0x3F80 ## $a3 = 3F800000 /* 02F9C 809135DC 864B01BC */ lh $t3, 0x01BC($s2) ## 000001BC /* 02FA0 809135E0 26510360 */ addiu $s1, $s2, 0x0360 ## $s1 = 00000360 -/* 02FA4 809135E4 5560003E */ bnel $t3, $zero, .L809136E0 -/* 02FA8 809135E8 93A900BE */ lbu $t1, 0x00BE($sp) +/* 02FA4 809135E4 5560003E */ bnel $t3, $zero, .L809136E0 +/* 02FA8 809135E8 93A900BE */ lbu $t1, 0x00BE($sp) /* 02FAC 809135EC 8E2D0000 */ lw $t5, 0x0000($s1) ## 00000360 /* 02FB0 809135F0 8E53011C */ lw $s3, 0x011C($s2) ## 0000011C /* 02FB4 809135F4 26881C24 */ addiu $t0, $s4, 0x1C24 ## $t0 = 00001C24 @@ -631,52 +631,52 @@ glabel L8091352C /* 02FFC 8091363C 8E590374 */ lw $t9, 0x0374($s2) ## 00000374 /* 03000 80913640 AE190058 */ sw $t9, 0x0058($s0) ## 06000DDC /* 03004 80913644 8645035C */ lh $a1, 0x035C($s2) ## 0000035C -/* 03008 80913648 0C03022B */ jal func_800C08AC -/* 0300C 8091364C AFA80060 */ sw $t0, 0x0060($sp) +/* 03008 80913648 0C03022B */ jal func_800C08AC +/* 0300C 8091364C AFA80060 */ sw $t0, 0x0060($sp) /* 03010 80913650 A640035C */ sh $zero, 0x035C($s2) ## 0000035C /* 03014 80913654 02802025 */ or $a0, $s4, $zero ## $a0 = 00000000 -/* 03018 80913658 0C01914D */ jal func_80064534 +/* 03018 80913658 0C01914D */ jal func_80064534 /* 0301C 8091365C 26851D64 */ addiu $a1, $s4, 0x1D64 ## $a1 = 00001D64 /* 03020 80913660 02802025 */ or $a0, $s4, $zero ## $a0 = 00000000 /* 03024 80913664 02402825 */ or $a1, $s2, $zero ## $a1 = 00000000 -/* 03028 80913668 0C00B7D5 */ jal func_8002DF54 +/* 03028 80913668 0C00B7D5 */ jal func_8002DF54 /* 0302C 8091366C 24060007 */ addiu $a2, $zero, 0x0007 ## $a2 = 00000007 /* 03030 80913670 3C01C204 */ lui $at, 0xC204 ## $at = C2040000 /* 03034 80913674 44818000 */ mtc1 $at, $f16 ## $f16 = -33.00 /* 03038 80913678 3C018091 */ lui $at, %hi(D_809154A8) ## $at = 80910000 -/* 0303C 8091367C C43254A8 */ lwc1 $f18, %lo(D_809154A8)($at) -/* 03040 80913680 8FA40060 */ lw $a0, 0x0060($sp) +/* 0303C 8091367C C43254A8 */ lwc1 $f18, %lo(D_809154A8)($at) +/* 03040 80913680 8FA40060 */ lw $a0, 0x0060($sp) /* 03044 80913684 02802825 */ or $a1, $s4, $zero ## $a1 = 00000000 /* 03048 80913688 2406005F */ addiu $a2, $zero, 0x005F ## $a2 = 0000005F /* 0304C 8091368C 3C074160 */ lui $a3, 0x4160 ## $a3 = 41600000 -/* 03050 80913690 AFA00018 */ sw $zero, 0x0018($sp) -/* 03054 80913694 AFA0001C */ sw $zero, 0x001C($sp) -/* 03058 80913698 AFA00020 */ sw $zero, 0x0020($sp) -/* 0305C 8091369C AFA00024 */ sw $zero, 0x0024($sp) -/* 03060 809136A0 E7B00010 */ swc1 $f16, 0x0010($sp) +/* 03050 80913690 AFA00018 */ sw $zero, 0x0018($sp) +/* 03054 80913694 AFA0001C */ sw $zero, 0x001C($sp) +/* 03058 80913698 AFA00020 */ sw $zero, 0x0020($sp) +/* 0305C 8091369C AFA00024 */ sw $zero, 0x0024($sp) +/* 03060 809136A0 E7B00010 */ swc1 $f16, 0x0010($sp) /* 03064 809136A4 0C00C7D4 */ jal Actor_Spawn ## ActorSpawn -/* 03068 809136A8 E7B20014 */ swc1 $f18, 0x0014($sp) +/* 03068 809136A8 E7B20014 */ swc1 $f18, 0x0014($sp) /* 0306C 809136AC 24030001 */ addiu $v1, $zero, 0x0001 ## $v1 = 00000001 /* 03070 809136B0 AE53011C */ sw $s3, 0x011C($s2) ## 0000011C /* 03074 809136B4 A24301C6 */ sb $v1, 0x01C6($s2) ## 000001C6 /* 03078 809136B8 3C050001 */ lui $a1, 0x0001 ## $a1 = 00010000 /* 0307C 809136BC A263014E */ sb $v1, 0x014E($s3) ## 0000014E -/* 03080 809136C0 00B42821 */ addu $a1, $a1, $s4 +/* 03080 809136C0 00B42821 */ addu $a1, $a1, $s4 /* 03084 809136C4 80A51CBC */ lb $a1, 0x1CBC($a1) ## 00011CBC /* 03088 809136C8 0C00B33C */ jal Flags_SetClear - + /* 0308C 809136CC 02802025 */ or $a0, $s4, $zero ## $a0 = 00000000 /* 03090 809136D0 02802025 */ or $a0, $s4, $zero ## $a0 = 00000000 /* 03094 809136D4 0C00B2DD */ jal Flags_SetSwitch - + /* 03098 809136D8 24050022 */ addiu $a1, $zero, 0x0022 ## $a1 = 00000022 .L809136DC: -/* 0309C 809136DC 93A900BE */ lbu $t1, 0x00BE($sp) +/* 0309C 809136DC 93A900BE */ lbu $t1, 0x00BE($sp) .L809136E0: /* 030A0 809136E0 3C0B8091 */ lui $t3, %hi(D_809150FC) ## $t3 = 80910000 /* 030A4 809136E4 256B50FC */ addiu $t3, $t3, %lo(D_809150FC) ## $t3 = 809150FC -/* 030A8 809136E8 11200103 */ beq $t1, $zero, .L80913AF8 +/* 030A8 809136E8 11200103 */ beq $t1, $zero, .L80913AF8 /* 030AC 809136EC 27AA0088 */ addiu $t2, $sp, 0x0088 ## $t2 = FFFFFFC8 /* 030B0 809136F0 8D6D0000 */ lw $t5, 0x0000($t3) ## 809150FC /* 030B4 809136F4 8D6C0004 */ lw $t4, 0x0004($t3) ## 80915100 @@ -705,77 +705,77 @@ glabel L8091352C /* 03110 80913750 AD0B0008 */ sw $t3, 0x0008($t0) ## FFFFFFB8 /* 03114 80913754 C6460100 */ lwc1 $f6, 0x0100($s2) ## 00000100 /* 03118 80913758 C6440024 */ lwc1 $f4, 0x0024($s2) ## 00000024 -/* 0311C 8091375C 93B300BE */ lbu $s3, 0x00BE($sp) -/* 03120 80913760 46062201 */ sub.s $f8, $f4, $f6 -/* 03124 80913764 2A61000A */ slti $at, $s3, 0x000A -/* 03128 80913768 E7A80088 */ swc1 $f8, 0x0088($sp) +/* 0311C 8091375C 93B300BE */ lbu $s3, 0x00BE($sp) +/* 03120 80913760 46062201 */ sub.s $f8, $f4, $f6 +/* 03124 80913764 2A61000A */ slti $at, $s3, 0x000A +/* 03128 80913768 E7A80088 */ swc1 $f8, 0x0088($sp) /* 0312C 8091376C C6500108 */ lwc1 $f16, 0x0108($s2) ## 00000108 /* 03130 80913770 C64A002C */ lwc1 $f10, 0x002C($s2) ## 0000002C -/* 03134 80913774 46105481 */ sub.s $f18, $f10, $f16 -/* 03138 80913778 102000B8 */ beq $at, $zero, .L80913A5C -/* 0313C 8091377C E7B20090 */ swc1 $f18, 0x0090($sp) +/* 03134 80913774 46105481 */ sub.s $f18, $f10, $f16 +/* 03138 80913778 102000B8 */ beq $at, $zero, .L80913A5C +/* 0313C 8091377C E7B20090 */ swc1 $f18, 0x0090($sp) /* 03140 80913780 864201B4 */ lh $v0, 0x01B4($s2) ## 000001B4 /* 03144 80913784 3C0C0001 */ lui $t4, 0x0001 ## $t4 = 00010000 -/* 03148 80913788 01946021 */ addu $t4, $t4, $s4 -/* 0314C 8091378C 14400038 */ bne $v0, $zero, .L80913870 +/* 03148 80913788 01946021 */ addu $t4, $t4, $s4 +/* 0314C 8091378C 14400038 */ bne $v0, $zero, .L80913870 /* 03150 80913790 2448FFFF */ addiu $t0, $v0, 0xFFFF ## $t0 = FFFFFFFF /* 03154 80913794 918C0AE3 */ lbu $t4, 0x0AE3($t4) ## 00010AE3 /* 03158 80913798 3C010001 */ lui $at, 0x0001 ## $at = 00010000 /* 0315C 8091379C 240D0003 */ addiu $t5, $zero, 0x0003 ## $t5 = 00000003 -/* 03160 809137A0 1580001B */ bne $t4, $zero, .L80913810 -/* 03164 809137A4 00340821 */ addu $at, $at, $s4 +/* 03160 809137A0 1580001B */ bne $t4, $zero, .L80913810 +/* 03164 809137A4 00340821 */ addu $at, $at, $s4 /* 03168 809137A8 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 0316C 809137AC 00340821 */ addu $at, $at, $s4 +/* 0316C 809137AC 00340821 */ addu $at, $at, $s4 /* 03170 809137B0 A02D0AE3 */ sb $t5, 0x0AE3($at) ## 00010AE3 /* 03174 809137B4 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 /* 03178 809137B8 44816000 */ mtc1 $at, $f12 ## $f12 = 5.00 /* 0317C 809137BC 0C00CFBE */ jal Math_Rand_ZeroFloat - + /* 03180 809137C0 00000000 */ nop -/* 03184 809137C4 4600010D */ trunc.w.s $f4, $f0 +/* 03184 809137C4 4600010D */ trunc.w.s $f4, $f0 /* 03188 809137C8 3C014080 */ lui $at, 0x4080 ## $at = 40800000 /* 0318C 809137CC 44815000 */ mtc1 $at, $f10 ## $f10 = 4.00 /* 03190 809137D0 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 03194 809137D4 440F2000 */ mfc1 $t7, $f4 -/* 03198 809137D8 00340821 */ addu $at, $at, $s4 +/* 03194 809137D4 440F2000 */ mfc1 $t7, $f4 +/* 03198 809137D8 00340821 */ addu $at, $at, $s4 /* 0319C 809137DC 240A0028 */ addiu $t2, $zero, 0x0028 ## $t2 = 00000028 -/* 031A0 809137E0 000FC400 */ sll $t8, $t7, 16 -/* 031A4 809137E4 0018CC03 */ sra $t9, $t8, 16 +/* 031A0 809137E0 000FC400 */ sll $t8, $t7, 16 +/* 031A4 809137E4 0018CC03 */ sra $t9, $t8, 16 /* 031A8 809137E8 44993000 */ mtc1 $t9, $f6 ## $f6 = 0.00 /* 031AC 809137EC 00000000 */ nop -/* 031B0 809137F0 46803220 */ cvt.s.w $f8, $f6 -/* 031B4 809137F4 460A4400 */ add.s $f16, $f8, $f10 -/* 031B8 809137F8 4600848D */ trunc.w.s $f18, $f16 -/* 031BC 809137FC 44099000 */ mfc1 $t1, $f18 +/* 031B0 809137F0 46803220 */ cvt.s.w $f8, $f6 +/* 031B4 809137F4 460A4400 */ add.s $f16, $f8, $f10 +/* 031B8 809137F8 4600848D */ trunc.w.s $f18, $f16 +/* 031BC 809137FC 44099000 */ mfc1 $t1, $f18 /* 031C0 80913800 00000000 */ nop /* 031C4 80913804 A64901B4 */ sh $t1, 0x01B4($s2) ## 000001B4 -/* 031C8 80913808 1000001A */ beq $zero, $zero, .L80913874 +/* 031C8 80913808 1000001A */ beq $zero, $zero, .L80913874 /* 031CC 8091380C A42A0AFA */ sh $t2, 0x0AFA($at) ## 00010AFA .L80913810: /* 031D0 80913810 A0200AE3 */ sb $zero, 0x0AE3($at) ## 00010AE3 /* 031D4 80913814 3C014000 */ lui $at, 0x4000 ## $at = 40000000 /* 031D8 80913818 44816000 */ mtc1 $at, $f12 ## $f12 = 2.00 /* 031DC 8091381C 0C00CFBE */ jal Math_Rand_ZeroFloat - + /* 031E0 80913820 00000000 */ nop -/* 031E4 80913824 4600010D */ trunc.w.s $f4, $f0 +/* 031E4 80913824 4600010D */ trunc.w.s $f4, $f0 /* 031E8 80913828 3C014000 */ lui $at, 0x4000 ## $at = 40000000 /* 031EC 8091382C 44815000 */ mtc1 $at, $f10 ## $f10 = 2.00 /* 031F0 80913830 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 031F4 80913834 440C2000 */ mfc1 $t4, $f4 -/* 031F8 80913838 00340821 */ addu $at, $at, $s4 +/* 031F4 80913834 440C2000 */ mfc1 $t4, $f4 +/* 031F8 80913838 00340821 */ addu $at, $at, $s4 /* 031FC 8091383C 24190014 */ addiu $t9, $zero, 0x0014 ## $t9 = 00000014 -/* 03200 80913840 000C6C00 */ sll $t5, $t4, 16 -/* 03204 80913844 000D7403 */ sra $t6, $t5, 16 +/* 03200 80913840 000C6C00 */ sll $t5, $t4, 16 +/* 03204 80913844 000D7403 */ sra $t6, $t5, 16 /* 03208 80913848 448E3000 */ mtc1 $t6, $f6 ## $f6 = 0.00 /* 0320C 8091384C 00000000 */ nop -/* 03210 80913850 46803220 */ cvt.s.w $f8, $f6 -/* 03214 80913854 460A4400 */ add.s $f16, $f8, $f10 -/* 03218 80913858 4600848D */ trunc.w.s $f18, $f16 -/* 0321C 8091385C 44189000 */ mfc1 $t8, $f18 +/* 03210 80913850 46803220 */ cvt.s.w $f8, $f6 +/* 03214 80913854 460A4400 */ add.s $f16, $f8, $f10 +/* 03218 80913858 4600848D */ trunc.w.s $f18, $f16 +/* 0321C 8091385C 44189000 */ mfc1 $t8, $f18 /* 03220 80913860 00000000 */ nop /* 03224 80913864 A65801B4 */ sh $t8, 0x01B4($s2) ## 000001B4 -/* 03228 80913868 10000002 */ beq $zero, $zero, .L80913874 +/* 03228 80913868 10000002 */ beq $zero, $zero, .L80913874 /* 0322C 8091386C A4390AFA */ sh $t9, 0x0AFA($at) ## 00010AFA .L80913870: /* 03230 80913870 A64801B4 */ sh $t0, 0x01B4($s2) ## 000001B4 @@ -784,140 +784,140 @@ glabel L8091352C /* 03238 80913878 864201B2 */ lh $v0, 0x01B2($s2) ## 000001B2 .L8091387C: /* 0323C 8091387C 24010019 */ addiu $at, $zero, 0x0019 ## $at = 00000019 -/* 03240 80913880 A7A2006E */ sh $v0, 0x006E($sp) +/* 03240 80913880 A7A2006E */ sh $v0, 0x006E($sp) /* 03244 80913884 24490001 */ addiu $t1, $v0, 0x0001 ## $t1 = 00000001 /* 03248 80913888 A64901B2 */ sh $t1, 0x01B2($s2) ## 000001B2 /* 0324C 8091388C 864A01B2 */ lh $t2, 0x01B2($s2) ## 000001B2 -/* 03250 80913890 0141001A */ div $zero, $t2, $at +/* 03250 80913890 0141001A */ div $zero, $t2, $at /* 03254 80913894 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 -/* 03258 80913898 00005810 */ mfhi $t3 +/* 03258 80913898 00005810 */ mfhi $t3 /* 0325C 8091389C 44816000 */ mtc1 $at, $f12 ## $f12 = 5.00 /* 03260 809138A0 0C00CFC8 */ jal Math_Rand_CenteredFloat - + /* 03264 809138A4 A64B01B2 */ sh $t3, 0x01B2($s2) ## 000001B2 -/* 03268 809138A8 87AC006E */ lh $t4, 0x006E($sp) +/* 03268 809138A8 87AC006E */ lh $t4, 0x006E($sp) /* 0326C 809138AC 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 /* 03270 809138B0 44816000 */ mtc1 $at, $f12 ## $f12 = 5.00 -/* 03274 809138B4 000C6880 */ sll $t5, $t4, 2 -/* 03278 809138B8 01AC6823 */ subu $t5, $t5, $t4 -/* 0327C 809138BC 000D6880 */ sll $t5, $t5, 2 -/* 03280 809138C0 024D8021 */ addu $s0, $s2, $t5 +/* 03274 809138B4 000C6880 */ sll $t5, $t4, 2 +/* 03278 809138B8 01AC6823 */ subu $t5, $t5, $t4 +/* 0327C 809138BC 000D6880 */ sll $t5, $t5, 2 +/* 03280 809138C0 024D8021 */ addu $s0, $s2, $t5 /* 03284 809138C4 C6040218 */ lwc1 $f4, 0x0218($s0) ## 06000F9C -/* 03288 809138C8 46040180 */ add.s $f6, $f0, $f4 +/* 03288 809138C8 46040180 */ add.s $f6, $f0, $f4 /* 0328C 809138CC 0C00CFC8 */ jal Math_Rand_CenteredFloat - -/* 03290 809138D0 E7A60094 */ swc1 $f6, 0x0094($sp) + +/* 03290 809138D0 E7A60094 */ swc1 $f6, 0x0094($sp) /* 03294 809138D4 C608021C */ lwc1 $f8, 0x021C($s0) ## 06000FA0 /* 03298 809138D8 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 /* 0329C 809138DC 44816000 */ mtc1 $at, $f12 ## $f12 = 5.00 -/* 032A0 809138E0 46080280 */ add.s $f10, $f0, $f8 +/* 032A0 809138E0 46080280 */ add.s $f10, $f0, $f8 /* 032A4 809138E4 0C00CFC8 */ jal Math_Rand_CenteredFloat - -/* 032A8 809138E8 E7AA0098 */ swc1 $f10, 0x0098($sp) + +/* 032A8 809138E8 E7AA0098 */ swc1 $f10, 0x0098($sp) /* 032AC 809138EC C6100220 */ lwc1 $f16, 0x0220($s0) ## 06000FA4 /* 032B0 809138F0 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 /* 032B4 809138F4 24010003 */ addiu $at, $zero, 0x0003 ## $at = 00000003 -/* 032B8 809138F8 46100480 */ add.s $f18, $f0, $f16 -/* 032BC 809138FC E7A40080 */ swc1 $f4, 0x0080($sp) -/* 032C0 80913900 1661001F */ bne $s3, $at, .L80913980 -/* 032C4 80913904 E7B2009C */ swc1 $f18, 0x009C($sp) +/* 032B8 809138F8 46100480 */ add.s $f18, $f0, $f16 +/* 032BC 809138FC E7A40080 */ swc1 $f4, 0x0080($sp) +/* 032C0 80913900 1661001F */ bne $s3, $at, .L80913980 +/* 032C4 80913904 E7B2009C */ swc1 $f18, 0x009C($sp) /* 032C8 80913908 3C018091 */ lui $at, %hi(D_809154AC) ## $at = 80910000 -/* 032CC 8091390C C42654AC */ lwc1 $f6, %lo(D_809154AC)($at) +/* 032CC 8091390C C42654AC */ lwc1 $f6, %lo(D_809154AC)($at) /* 032D0 80913910 3C014160 */ lui $at, 0x4160 ## $at = 41600000 /* 032D4 80913914 44814000 */ mtc1 $at, $f8 ## $f8 = 14.00 -/* 032D8 80913918 C7AA0094 */ lwc1 $f10, 0x0094($sp) +/* 032D8 80913918 C7AA0094 */ lwc1 $f10, 0x0094($sp) /* 032DC 8091391C 3C018091 */ lui $at, %hi(D_809154B0) ## $at = 80910000 -/* 032E0 80913920 C43054B0 */ lwc1 $f16, %lo(D_809154B0)($at) -/* 032E4 80913924 460A4001 */ sub.s $f0, $f8, $f10 +/* 032E0 80913920 C43054B0 */ lwc1 $f16, %lo(D_809154B0)($at) +/* 032E4 80913924 460A4001 */ sub.s $f0, $f8, $f10 /* 032E8 80913928 3C018091 */ lui $at, %hi(D_809154B4) ## $at = 80910000 -/* 032EC 8091392C E7A60080 */ swc1 $f6, 0x0080($sp) -/* 032F0 80913930 C7A6009C */ lwc1 $f6, 0x009C($sp) -/* 032F4 80913934 C42454B4 */ lwc1 $f4, %lo(D_809154B4)($at) -/* 032F8 80913938 46100482 */ mul.s $f18, $f0, $f16 +/* 032EC 8091392C E7A60080 */ swc1 $f6, 0x0080($sp) +/* 032F0 80913930 C7A6009C */ lwc1 $f6, 0x009C($sp) +/* 032F4 80913934 C42454B4 */ lwc1 $f4, %lo(D_809154B4)($at) +/* 032F8 80913938 46100482 */ mul.s $f18, $f0, $f16 /* 032FC 8091393C 3C018091 */ lui $at, %hi(D_809154B8) ## $at = 80910000 -/* 03300 80913940 46062081 */ sub.s $f2, $f4, $f6 -/* 03304 80913944 C42854B8 */ lwc1 $f8, %lo(D_809154B8)($at) +/* 03300 80913940 46062081 */ sub.s $f2, $f4, $f6 +/* 03304 80913944 C42854B8 */ lwc1 $f8, %lo(D_809154B8)($at) /* 03308 80913948 3C018091 */ lui $at, %hi(D_809154BC) ## $at = 80910000 -/* 0330C 8091394C C43054BC */ lwc1 $f16, %lo(D_809154BC)($at) -/* 03310 80913950 46081282 */ mul.s $f10, $f2, $f8 +/* 0330C 8091394C C43054BC */ lwc1 $f16, %lo(D_809154BC)($at) +/* 03310 80913950 46081282 */ mul.s $f10, $f2, $f8 /* 03314 80913954 3C01BF80 */ lui $at, 0xBF80 ## $at = BF800000 /* 03318 80913958 44812000 */ mtc1 $at, $f4 ## $f4 = -1.00 -/* 0331C 8091395C E7B2007C */ swc1 $f18, 0x007C($sp) +/* 0331C 8091395C E7B2007C */ swc1 $f18, 0x007C($sp) /* 03320 80913960 3C018091 */ lui $at, %hi(D_809154C0) ## $at = 80910000 -/* 03324 80913964 46100482 */ mul.s $f18, $f0, $f16 -/* 03328 80913968 C42654C0 */ lwc1 $f6, %lo(D_809154C0)($at) -/* 0332C 8091396C E7AA0084 */ swc1 $f10, 0x0084($sp) -/* 03330 80913970 E7A40074 */ swc1 $f4, 0x0074($sp) -/* 03334 80913974 46061202 */ mul.s $f8, $f2, $f6 -/* 03338 80913978 E7B20070 */ swc1 $f18, 0x0070($sp) -/* 0333C 8091397C E7A80078 */ swc1 $f8, 0x0078($sp) +/* 03324 80913964 46100482 */ mul.s $f18, $f0, $f16 +/* 03328 80913968 C42654C0 */ lwc1 $f6, %lo(D_809154C0)($at) +/* 0332C 8091396C E7AA0084 */ swc1 $f10, 0x0084($sp) +/* 03330 80913970 E7A40074 */ swc1 $f4, 0x0074($sp) +/* 03334 80913974 46061202 */ mul.s $f8, $f2, $f6 +/* 03338 80913978 E7B20070 */ swc1 $f18, 0x0070($sp) +/* 0333C 8091397C E7A80078 */ swc1 $f8, 0x0078($sp) .L80913980: /* 03340 80913980 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 /* 03344 80913984 44816000 */ mtc1 $at, $f12 ## $f12 = 20.00 /* 03348 80913988 0C00CFBE */ jal Math_Rand_ZeroFloat - + /* 0334C 8091398C 00000000 */ nop -/* 03350 80913990 4600028D */ trunc.w.s $f10, $f0 -/* 03354 80913994 93A900BE */ lbu $t1, 0x00BE($sp) +/* 03350 80913990 4600028D */ trunc.w.s $f10, $f0 +/* 03354 80913994 93A900BE */ lbu $t1, 0x00BE($sp) /* 03358 80913998 02802025 */ or $a0, $s4, $zero ## $a0 = 00000000 /* 0335C 8091399C 27A50094 */ addiu $a1, $sp, 0x0094 ## $a1 = FFFFFFD4 -/* 03360 809139A0 440F5000 */ mfc1 $t7, $f10 +/* 03360 809139A0 440F5000 */ mfc1 $t7, $f10 /* 03364 809139A4 27A60088 */ addiu $a2, $sp, 0x0088 ## $a2 = FFFFFFC8 /* 03368 809139A8 27A7007C */ addiu $a3, $sp, 0x007C ## $a3 = FFFFFFBC -/* 0336C 809139AC 000FC400 */ sll $t8, $t7, 16 -/* 03370 809139B0 0018CC03 */ sra $t9, $t8, 16 +/* 0336C 809139AC 000FC400 */ sll $t8, $t7, 16 +/* 03370 809139B0 0018CC03 */ sra $t9, $t8, 16 /* 03374 809139B4 2728000F */ addiu $t0, $t9, 0x000F ## $t0 = 0000000F -/* 03378 809139B8 AFA80010 */ sw $t0, 0x0010($sp) -/* 0337C 809139BC 0C00A76F */ jal func_80029DBC -/* 03380 809139C0 AFA90014 */ sw $t1, 0x0014($sp) +/* 03378 809139B8 AFA80010 */ sw $t0, 0x0010($sp) +/* 0337C 809139BC 0C00A76F */ jal func_80029DBC +/* 03380 809139C0 AFA90014 */ sw $t1, 0x0014($sp) /* 03384 809139C4 0C03F66B */ jal Math_Rand_ZeroOne ## Rand.Next() float /* 03388 809139C8 00000000 */ nop /* 0338C 809139CC 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 /* 03390 809139D0 44818000 */ mtc1 $at, $f16 ## $f16 = 0.50 /* 03394 809139D4 24010003 */ addiu $at, $zero, 0x0003 ## $at = 00000003 -/* 03398 809139D8 4610003C */ c.lt.s $f0, $f16 +/* 03398 809139D8 4610003C */ c.lt.s $f0, $f16 /* 0339C 809139DC 00000000 */ nop -/* 033A0 809139E0 45030003 */ bc1tl .L809139F0 +/* 033A0 809139E0 45030003 */ bc1tl .L809139F0 /* 033A4 809139E4 3C014080 */ lui $at, 0x4080 ## $at = 40800000 -/* 033A8 809139E8 16610015 */ bne $s3, $at, .L80913A40 +/* 033A8 809139E8 16610015 */ bne $s3, $at, .L80913A40 /* 033AC 809139EC 3C014080 */ lui $at, 0x4080 ## $at = 40800000 .L809139F0: /* 033B0 809139F0 44816000 */ mtc1 $at, $f12 ## $f12 = 4.00 /* 033B4 809139F4 0C00CFBE */ jal Math_Rand_ZeroFloat - + /* 033B8 809139F8 00000000 */ nop -/* 033BC 809139FC 4600048D */ trunc.w.s $f18, $f0 +/* 033BC 809139FC 4600048D */ trunc.w.s $f18, $f0 /* 033C0 80913A00 240FFFFF */ addiu $t7, $zero, 0xFFFF ## $t7 = FFFFFFFF /* 033C4 80913A04 2418000A */ addiu $t8, $zero, 0x000A ## $t8 = 0000000A -/* 033C8 80913A08 AFB8001C */ sw $t8, 0x001C($sp) -/* 033CC 80913A0C 440B9000 */ mfc1 $t3, $f18 -/* 033D0 80913A10 AFAF0018 */ sw $t7, 0x0018($sp) +/* 033C8 80913A08 AFB8001C */ sw $t8, 0x001C($sp) +/* 033CC 80913A0C 440B9000 */ mfc1 $t3, $f18 +/* 033D0 80913A10 AFAF0018 */ sw $t7, 0x0018($sp) /* 033D4 80913A14 02802025 */ or $a0, $s4, $zero ## $a0 = 00000000 -/* 033D8 80913A18 000B6400 */ sll $t4, $t3, 16 -/* 033DC 80913A1C 000C6C03 */ sra $t5, $t4, 16 +/* 033D8 80913A18 000B6400 */ sll $t4, $t3, 16 +/* 033DC 80913A1C 000C6C03 */ sra $t5, $t4, 16 /* 033E0 80913A20 25AE0007 */ addiu $t6, $t5, 0x0007 ## $t6 = 00000007 -/* 033E4 80913A24 AFAE0014 */ sw $t6, 0x0014($sp) +/* 033E4 80913A24 AFAE0014 */ sw $t6, 0x0014($sp) /* 033E8 80913A28 27A50094 */ addiu $a1, $sp, 0x0094 ## $a1 = FFFFFFD4 /* 033EC 80913A2C 27A60088 */ addiu $a2, $sp, 0x0088 ## $a2 = FFFFFFC8 /* 033F0 80913A30 27A70070 */ addiu $a3, $sp, 0x0070 ## $a3 = FFFFFFB0 -/* 033F4 80913A34 AFA00010 */ sw $zero, 0x0010($sp) -/* 033F8 80913A38 0C00A5C9 */ jal func_80029724 -/* 033FC 80913A3C AFA00020 */ sw $zero, 0x0020($sp) +/* 033F4 80913A34 AFA00010 */ sw $zero, 0x0010($sp) +/* 033F8 80913A38 0C00A5C9 */ jal func_80029724 +/* 033FC 80913A3C AFA00020 */ sw $zero, 0x0020($sp) .L80913A40: /* 03400 80913A40 26310001 */ addiu $s1, $s1, 0x0001 ## $s1 = 00000001 -/* 03404 80913A44 00118C00 */ sll $s1, $s1, 16 -/* 03408 80913A48 00118C03 */ sra $s1, $s1, 16 -/* 0340C 80913A4C 5A20FF8B */ blezl $s1, .L8091387C +/* 03404 80913A44 00118C00 */ sll $s1, $s1, 16 +/* 03408 80913A48 00118C03 */ sra $s1, $s1, 16 +/* 0340C 80913A4C 5A20FF8B */ blezl $s1, .L8091387C /* 03410 80913A50 864201B2 */ lh $v0, 0x01B2($s2) ## 000001B2 -/* 03414 80913A54 10000008 */ beq $zero, $zero, .L80913A78 +/* 03414 80913A54 10000008 */ beq $zero, $zero, .L80913A78 /* 03418 80913A58 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 .L80913A5C: /* 0341C 80913A5C 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 03420 80913A60 00340821 */ addu $at, $at, $s4 +/* 03420 80913A60 00340821 */ addu $at, $at, $s4 /* 03424 80913A64 A0200AE3 */ sb $zero, 0x0AE3($at) ## 00010AE3 /* 03428 80913A68 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 0342C 80913A6C 00340821 */ addu $at, $at, $s4 +/* 0342C 80913A6C 00340821 */ addu $at, $at, $s4 /* 03430 80913A70 A4390AFA */ sh $t9, 0x0AFA($at) ## 00010AFA /* 03434 80913A74 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 .L80913A78: @@ -927,133 +927,133 @@ glabel L8091352C /* 03444 80913A84 00008825 */ or $s1, $zero, $zero ## $s1 = 00000000 /* 03448 80913A88 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 .L80913A8C: -/* 0344C 80913A8C 14530005 */ bne $v0, $s3, .L80913AA4 +/* 0344C 80913A8C 14530005 */ bne $v0, $s3, .L80913AA4 /* 03450 80913A90 864501AE */ lh $a1, 0x01AE($s2) ## 000001AE -/* 03454 80913A94 0C2441E1 */ jal func_80910784 +/* 03454 80913A94 0C2441E1 */ jal func_80910784 /* 03458 80913A98 02002025 */ or $a0, $s0, $zero ## $a0 = 80914E28 -/* 0345C 80913A9C 1000000C */ beq $zero, $zero, .L80913AD0 +/* 0345C 80913A9C 1000000C */ beq $zero, $zero, .L80913AD0 /* 03460 80913AA0 864501AE */ lh $a1, 0x01AE($s2) ## 000001AE .L80913AA4: /* 03464 80913AA4 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 03468 80913AA8 16610006 */ bne $s3, $at, .L80913AC4 +/* 03468 80913AA8 16610006 */ bne $s3, $at, .L80913AC4 /* 0346C 80913AAC 3C048091 */ lui $a0, %hi(D_80914F28) ## $a0 = 80910000 /* 03470 80913AB0 3C048091 */ lui $a0, %hi(D_80914D28) ## $a0 = 80910000 -/* 03474 80913AB4 0C2441E1 */ jal func_80910784 +/* 03474 80913AB4 0C2441E1 */ jal func_80910784 /* 03478 80913AB8 24844D28 */ addiu $a0, $a0, %lo(D_80914D28) ## $a0 = 80914D28 -/* 0347C 80913ABC 10000004 */ beq $zero, $zero, .L80913AD0 +/* 0347C 80913ABC 10000004 */ beq $zero, $zero, .L80913AD0 /* 03480 80913AC0 864501AE */ lh $a1, 0x01AE($s2) ## 000001AE .L80913AC4: -/* 03484 80913AC4 0C2441E1 */ jal func_80910784 +/* 03484 80913AC4 0C2441E1 */ jal func_80910784 /* 03488 80913AC8 24844F28 */ addiu $a0, $a0, %lo(D_80914F28) ## $a0 = 00004F28 /* 0348C 80913ACC 864501AE */ lh $a1, 0x01AE($s2) ## 000001AE .L80913AD0: /* 03490 80913AD0 26310001 */ addiu $s1, $s1, 0x0001 ## $s1 = 00000001 -/* 03494 80913AD4 00118C00 */ sll $s1, $s1, 16 -/* 03498 80913AD8 28A10100 */ slti $at, $a1, 0x0100 -/* 0349C 80913ADC 10200003 */ beq $at, $zero, .L80913AEC -/* 034A0 80913AE0 00118C03 */ sra $s1, $s1, 16 +/* 03494 80913AD4 00118C00 */ sll $s1, $s1, 16 +/* 03498 80913AD8 28A10100 */ slti $at, $a1, 0x0100 +/* 0349C 80913ADC 10200003 */ beq $at, $zero, .L80913AEC +/* 034A0 80913AE0 00118C03 */ sra $s1, $s1, 16 /* 034A4 80913AE4 24A80001 */ addiu $t0, $a1, 0x0001 ## $t0 = 00000001 /* 034A8 80913AE8 A64801AE */ sh $t0, 0x01AE($s2) ## 000001AE .L80913AEC: -/* 034AC 80913AEC 2A210005 */ slti $at, $s1, 0x0005 -/* 034B0 80913AF0 5420FFE6 */ bnel $at, $zero, .L80913A8C +/* 034AC 80913AEC 2A210005 */ slti $at, $s1, 0x0005 +/* 034B0 80913AF0 5420FFE6 */ bnel $at, $zero, .L80913A8C /* 034B4 80913AF4 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 .L80913AF8: /* 034B8 80913AF8 8645035C */ lh $a1, 0x035C($s2) ## 0000035C -/* 034BC 80913AFC 50A0004E */ beql $a1, $zero, .L80913C38 -/* 034C0 80913B00 8FBF004C */ lw $ra, 0x004C($sp) -/* 034C4 80913B04 93AA00BF */ lbu $t2, 0x00BF($sp) +/* 034BC 80913AFC 50A0004E */ beql $a1, $zero, .L80913C38 +/* 034C0 80913B00 8FBF004C */ lw $ra, 0x004C($sp) +/* 034C4 80913B04 93AA00BF */ lbu $t2, 0x00BF($sp) /* 034C8 80913B08 2649036C */ addiu $t1, $s2, 0x036C ## $t1 = 0000036C -/* 034CC 80913B0C AFA90058 */ sw $t1, 0x0058($sp) -/* 034D0 80913B10 15400044 */ bne $t2, $zero, .L80913C24 +/* 034CC 80913B0C AFA90058 */ sw $t1, 0x0058($sp) +/* 034D0 80913B10 15400044 */ bne $t2, $zero, .L80913C24 /* 034D4 80913B14 26510360 */ addiu $s1, $s2, 0x0360 ## $s1 = 00000360 /* 034D8 80913B18 C6440378 */ lwc1 $f4, 0x0378($s2) ## 00000378 /* 034DC 80913B1C C64603C0 */ lwc1 $f6, 0x03C0($s2) ## 000003C0 /* 034E0 80913B20 8E450390 */ lw $a1, 0x0390($s2) ## 00000390 /* 034E4 80913B24 8E46039C */ lw $a2, 0x039C($s2) ## 0000039C -/* 034E8 80913B28 46062202 */ mul.s $f8, $f4, $f6 +/* 034E8 80913B28 46062202 */ mul.s $f8, $f4, $f6 /* 034EC 80913B2C 264B0370 */ addiu $t3, $s2, 0x0370 ## $t3 = 00000370 -/* 034F0 80913B30 AFAB0050 */ sw $t3, 0x0050($sp) +/* 034F0 80913B30 AFAB0050 */ sw $t3, 0x0050($sp) /* 034F4 80913B34 02202025 */ or $a0, $s1, $zero ## $a0 = 00000360 /* 034F8 80913B38 26500364 */ addiu $s0, $s2, 0x0364 ## $s0 = 00000364 /* 034FC 80913B3C 26530368 */ addiu $s3, $s2, 0x0368 ## $s3 = 00000368 -/* 03500 80913B40 44074000 */ mfc1 $a3, $f8 +/* 03500 80913B40 44074000 */ mfc1 $a3, $f8 /* 03504 80913B44 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 03508 80913B48 00000000 */ nop /* 0350C 80913B4C C64A037C */ lwc1 $f10, 0x037C($s2) ## 0000037C /* 03510 80913B50 C65003C0 */ lwc1 $f16, 0x03C0($s2) ## 000003C0 /* 03514 80913B54 02002025 */ or $a0, $s0, $zero ## $a0 = 00000364 /* 03518 80913B58 8E450394 */ lw $a1, 0x0394($s2) ## 00000394 -/* 0351C 80913B5C 46105482 */ mul.s $f18, $f10, $f16 +/* 0351C 80913B5C 46105482 */ mul.s $f18, $f10, $f16 /* 03520 80913B60 8E4603A0 */ lw $a2, 0x03A0($s2) ## 000003A0 -/* 03524 80913B64 44079000 */ mfc1 $a3, $f18 +/* 03524 80913B64 44079000 */ mfc1 $a3, $f18 /* 03528 80913B68 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 0352C 80913B6C 00000000 */ nop /* 03530 80913B70 C6440380 */ lwc1 $f4, 0x0380($s2) ## 00000380 /* 03534 80913B74 C64603C0 */ lwc1 $f6, 0x03C0($s2) ## 000003C0 /* 03538 80913B78 02602025 */ or $a0, $s3, $zero ## $a0 = 00000368 /* 0353C 80913B7C 8E450398 */ lw $a1, 0x0398($s2) ## 00000398 -/* 03540 80913B80 46062202 */ mul.s $f8, $f4, $f6 +/* 03540 80913B80 46062202 */ mul.s $f8, $f4, $f6 /* 03544 80913B84 8E4603A4 */ lw $a2, 0x03A4($s2) ## 000003A4 -/* 03548 80913B88 44074000 */ mfc1 $a3, $f8 +/* 03548 80913B88 44074000 */ mfc1 $a3, $f8 /* 0354C 80913B8C 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 03550 80913B90 00000000 */ nop /* 03554 80913B94 C64A0384 */ lwc1 $f10, 0x0384($s2) ## 00000384 /* 03558 80913B98 C65003C0 */ lwc1 $f16, 0x03C0($s2) ## 000003C0 -/* 0355C 80913B9C 8FA40058 */ lw $a0, 0x0058($sp) +/* 0355C 80913B9C 8FA40058 */ lw $a0, 0x0058($sp) /* 03560 80913BA0 8E4503A8 */ lw $a1, 0x03A8($s2) ## 000003A8 -/* 03564 80913BA4 46105482 */ mul.s $f18, $f10, $f16 +/* 03564 80913BA4 46105482 */ mul.s $f18, $f10, $f16 /* 03568 80913BA8 8E4603B4 */ lw $a2, 0x03B4($s2) ## 000003B4 -/* 0356C 80913BAC 44079000 */ mfc1 $a3, $f18 +/* 0356C 80913BAC 44079000 */ mfc1 $a3, $f18 /* 03570 80913BB0 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 03574 80913BB4 00000000 */ nop /* 03578 80913BB8 C6440388 */ lwc1 $f4, 0x0388($s2) ## 00000388 /* 0357C 80913BBC C64603C0 */ lwc1 $f6, 0x03C0($s2) ## 000003C0 -/* 03580 80913BC0 8FA40050 */ lw $a0, 0x0050($sp) +/* 03580 80913BC0 8FA40050 */ lw $a0, 0x0050($sp) /* 03584 80913BC4 8E4503AC */ lw $a1, 0x03AC($s2) ## 000003AC -/* 03588 80913BC8 46062202 */ mul.s $f8, $f4, $f6 +/* 03588 80913BC8 46062202 */ mul.s $f8, $f4, $f6 /* 0358C 80913BCC 8E4603B8 */ lw $a2, 0x03B8($s2) ## 000003B8 -/* 03590 80913BD0 44074000 */ mfc1 $a3, $f8 +/* 03590 80913BD0 44074000 */ mfc1 $a3, $f8 /* 03594 80913BD4 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 03598 80913BD8 00000000 */ nop /* 0359C 80913BDC C64A038C */ lwc1 $f10, 0x038C($s2) ## 0000038C /* 035A0 80913BE0 C65003C0 */ lwc1 $f16, 0x03C0($s2) ## 000003C0 /* 035A4 80913BE4 26440374 */ addiu $a0, $s2, 0x0374 ## $a0 = 00000374 /* 035A8 80913BE8 8E4503B0 */ lw $a1, 0x03B0($s2) ## 000003B0 -/* 035AC 80913BEC 46105482 */ mul.s $f18, $f10, $f16 +/* 035AC 80913BEC 46105482 */ mul.s $f18, $f10, $f16 /* 035B0 80913BF0 8E4603BC */ lw $a2, 0x03BC($s2) ## 000003BC -/* 035B4 80913BF4 44079000 */ mfc1 $a3, $f18 +/* 035B4 80913BF4 44079000 */ mfc1 $a3, $f18 /* 035B8 80913BF8 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 035BC 80913BFC 00000000 */ nop /* 035C0 80913C00 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 /* 035C4 80913C04 44810000 */ mtc1 $at, $f0 ## $f0 = 1.00 /* 035C8 80913C08 264403C0 */ addiu $a0, $s2, 0x03C0 ## $a0 = 000003C0 /* 035CC 80913C0C 8E4703C4 */ lw $a3, 0x03C4($s2) ## 000003C4 -/* 035D0 80913C10 44050000 */ mfc1 $a1, $f0 -/* 035D4 80913C14 44060000 */ mfc1 $a2, $f0 +/* 035D0 80913C10 44050000 */ mfc1 $a1, $f0 +/* 035D4 80913C14 44060000 */ mfc1 $a2, $f0 /* 035D8 80913C18 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 035DC 80913C1C 00000000 */ nop /* 035E0 80913C20 8645035C */ lh $a1, 0x035C($s2) ## 0000035C .L80913C24: /* 035E4 80913C24 02802025 */ or $a0, $s4, $zero ## $a0 = 00000000 -/* 035E8 80913C28 8FA60058 */ lw $a2, 0x0058($sp) -/* 035EC 80913C2C 0C030136 */ jal func_800C04D8 +/* 035E8 80913C28 8FA60058 */ lw $a2, 0x0058($sp) +/* 035EC 80913C2C 0C030136 */ jal func_800C04D8 /* 035F0 80913C30 02203825 */ or $a3, $s1, $zero ## $a3 = 00000360 -/* 035F4 80913C34 8FBF004C */ lw $ra, 0x004C($sp) +/* 035F4 80913C34 8FBF004C */ lw $ra, 0x004C($sp) .L80913C38: -/* 035F8 80913C38 8FB00038 */ lw $s0, 0x0038($sp) -/* 035FC 80913C3C 8FB1003C */ lw $s1, 0x003C($sp) -/* 03600 80913C40 8FB20040 */ lw $s2, 0x0040($sp) -/* 03604 80913C44 8FB30044 */ lw $s3, 0x0044($sp) -/* 03608 80913C48 8FB40048 */ lw $s4, 0x0048($sp) -/* 0360C 80913C4C 03E00008 */ jr $ra +/* 035F8 80913C38 8FB00038 */ lw $s0, 0x0038($sp) +/* 035FC 80913C3C 8FB1003C */ lw $s1, 0x003C($sp) +/* 03600 80913C40 8FB20040 */ lw $s2, 0x0040($sp) +/* 03604 80913C44 8FB30044 */ lw $s3, 0x0044($sp) +/* 03608 80913C48 8FB40048 */ lw $s4, 0x0048($sp) +/* 0360C 80913C4C 03E00008 */ jr $ra /* 03610 80913C50 27BD00C0 */ addiu $sp, $sp, 0x00C0 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Goma/BossGoma_Destroy.s b/asm/non_matchings/overlays/actors/ovl_Boss_Goma/BossGoma_Destroy.s index 2227f5be38..e445454646 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Goma/BossGoma_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Goma/BossGoma_Destroy.s @@ -1,17 +1,17 @@ glabel BossGoma_Destroy /* 004F0 80915F00 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 004F4 80915F04 AFBF0014 */ sw $ra, 0x0014($sp) -/* 004F8 80915F08 AFA40018 */ sw $a0, 0x0018($sp) -/* 004FC 80915F0C AFA5001C */ sw $a1, 0x001C($sp) -/* 00500 80915F10 0C0295BC */ jal func_800A56F0 +/* 004F4 80915F04 AFBF0014 */ sw $ra, 0x0014($sp) +/* 004F8 80915F08 AFA40018 */ sw $a0, 0x0018($sp) +/* 004FC 80915F0C AFA5001C */ sw $a1, 0x001C($sp) +/* 00500 80915F10 0C0295BC */ jal SkelAnime_Free /* 00504 80915F14 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 00508 80915F18 8FA50018 */ lw $a1, 0x0018($sp) -/* 0050C 80915F1C 8FA4001C */ lw $a0, 0x001C($sp) -/* 00510 80915F20 0C016F32 */ jal func_8005BCC8 +/* 00508 80915F18 8FA50018 */ lw $a1, 0x0018($sp) +/* 0050C 80915F1C 8FA4001C */ lw $a0, 0x001C($sp) +/* 00510 80915F20 0C016F32 */ jal func_8005BCC8 /* 00514 80915F24 24A507BC */ addiu $a1, $a1, 0x07BC ## $a1 = 000007BC -/* 00518 80915F28 8FBF0014 */ lw $ra, 0x0014($sp) +/* 00518 80915F28 8FBF0014 */ lw $ra, 0x0014($sp) /* 0051C 80915F2C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00520 80915F30 03E00008 */ jr $ra +/* 00520 80915F30 03E00008 */ jr $ra /* 00524 80915F34 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Goma/BossGoma_Draw.s b/asm/non_matchings/overlays/actors/ovl_Boss_Goma/BossGoma_Draw.s index 485dd89450..e297e61886 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Goma/BossGoma_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Goma/BossGoma_Draw.s @@ -9,7 +9,7 @@ glabel BossGoma_Draw /* 0529C 8091ACAC 24C6B4B4 */ addiu $a2, $a2, %lo(D_8091B4B4) ## $a2 = 8091B4B4 /* 052A0 8091ACB0 27A40038 */ addiu $a0, $sp, 0x0038 ## $a0 = FFFFFFE8 /* 052A4 8091ACB4 2407137F */ addiu $a3, $zero, 0x137F ## $a3 = 0000137F -/* 052A8 8091ACB8 0C031AB1 */ jal func_800C6AC4 +/* 052A8 8091ACB8 0C031AB1 */ jal Graph_OpenDisps /* 052AC 8091ACBC AFA50048 */ sw $a1, 0x0048($sp) /* 052B0 8091ACC0 0C024F46 */ jal func_80093D18 /* 052B4 8091ACC4 8E040000 */ lw $a0, 0x0000($s0) ## 00000000 @@ -65,7 +65,7 @@ glabel BossGoma_Draw /* 05370 8091AD80 24C6B4C8 */ addiu $a2, $a2, %lo(D_8091B4C8) ## $a2 = 8091B4C8 /* 05374 8091AD84 27A40038 */ addiu $a0, $sp, 0x0038 ## $a0 = FFFFFFE8 /* 05378 8091AD88 8E050000 */ lw $a1, 0x0000($s0) ## 00000000 -/* 0537C 8091AD8C 0C031AD5 */ jal func_800C6B54 +/* 0537C 8091AD8C 0C031AD5 */ jal Graph_CloseDisps /* 05380 8091AD90 24071394 */ addiu $a3, $zero, 0x1394 ## $a3 = 00001394 /* 05384 8091AD94 8FBF0024 */ lw $ra, 0x0024($sp) /* 05388 8091AD98 8FB00020 */ lw $s0, 0x0020($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Goma/BossGoma_Init.s b/asm/non_matchings/overlays/actors/ovl_Boss_Goma/BossGoma_Init.s index 07ec2bbfd7..6e70f8a2d3 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Goma/BossGoma_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Goma/BossGoma_Init.s @@ -1,37 +1,37 @@ glabel BossGoma_Init /* 00234 80915C44 27BDFFB0 */ addiu $sp, $sp, 0xFFB0 ## $sp = FFFFFFB0 -/* 00238 80915C48 AFB10038 */ sw $s1, 0x0038($sp) +/* 00238 80915C48 AFB10038 */ sw $s1, 0x0038($sp) /* 0023C 80915C4C 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 -/* 00240 80915C50 AFBF003C */ sw $ra, 0x003C($sp) -/* 00244 80915C54 AFB00034 */ sw $s0, 0x0034($sp) +/* 00240 80915C50 AFBF003C */ sw $ra, 0x003C($sp) +/* 00244 80915C54 AFB00034 */ sw $s0, 0x0034($sp) /* 00248 80915C58 3C058092 */ lui $a1, %hi(D_8091B2A8) ## $a1 = 80920000 /* 0024C 80915C5C 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 00250 80915C60 0C01E037 */ jal Actor_ProcessInitChain - + /* 00254 80915C64 24A5B2A8 */ addiu $a1, $a1, %lo(D_8091B2A8) ## $a1 = 8091B2A8 /* 00258 80915C68 3C068003 */ lui $a2, 0x8003 ## $a2 = 80030000 /* 0025C 80915C6C 24C6B5EC */ addiu $a2, $a2, 0xB5EC ## $a2 = 8002B5EC /* 00260 80915C70 260400B4 */ addiu $a0, $s0, 0x00B4 ## $a0 = 000000B4 /* 00264 80915C74 3C05457A */ lui $a1, 0x457A ## $a1 = 457A0000 /* 00268 80915C78 0C00AC78 */ jal ActorShape_Init - + /* 0026C 80915C7C 3C074316 */ lui $a3, 0x4316 ## $a3 = 43160000 /* 00270 80915C80 2605014C */ addiu $a1, $s0, 0x014C ## $a1 = 0000014C /* 00274 80915C84 3C060602 */ lui $a2, 0x0602 ## $a2 = 06020000 /* 00278 80915C88 3C070601 */ lui $a3, 0x0601 ## $a3 = 06010000 /* 0027C 80915C8C 24E72678 */ addiu $a3, $a3, 0x2678 ## $a3 = 06012678 /* 00280 80915C90 24C6DCF8 */ addiu $a2, $a2, 0xDCF8 ## $a2 = 0601DCF8 -/* 00284 80915C94 AFA50044 */ sw $a1, 0x0044($sp) +/* 00284 80915C94 AFA50044 */ sw $a1, 0x0044($sp) /* 00288 80915C98 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 0028C 80915C9C AFA00010 */ sw $zero, 0x0010($sp) -/* 00290 80915CA0 AFA00014 */ sw $zero, 0x0014($sp) +/* 0028C 80915C9C AFA00010 */ sw $zero, 0x0010($sp) +/* 00290 80915CA0 AFA00014 */ sw $zero, 0x0014($sp) /* 00294 80915CA4 0C02915F */ jal SkelAnime_Init - -/* 00298 80915CA8 AFA00018 */ sw $zero, 0x0018($sp) + +/* 00298 80915CA8 AFA00018 */ sw $zero, 0x0018($sp) /* 0029C 80915CAC 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 /* 002A0 80915CB0 24A52678 */ addiu $a1, $a1, 0x2678 ## $a1 = 06012678 -/* 002A4 80915CB4 0C0294BE */ jal func_800A52F8 -/* 002A8 80915CB8 8FA40044 */ lw $a0, 0x0044($sp) +/* 002A4 80915CB4 0C0294BE */ jal SkelAnime_ChangeAnimDefaultRepeat +/* 002A8 80915CB8 8FA40044 */ lw $a0, 0x0044($sp) /* 002AC 80915CBC 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 /* 002B0 80915CC0 44810000 */ mtc1 $at, $f0 ## $f0 = 1.00 /* 002B4 80915CC4 3C01C396 */ lui $at, 0xC396 ## $at = C3960000 @@ -48,73 +48,73 @@ glabel BossGoma_Init /* 002E0 80915CF0 E60401FC */ swc1 $f4, 0x01FC($s0) ## 000001FC /* 002E4 80915CF4 E6060200 */ swc1 $f6, 0x0200($s0) ## 00000200 /* 002E8 80915CF8 E6080028 */ swc1 $f8, 0x0028($s0) ## 00000028 -/* 002EC 80915CFC 0C245800 */ jal func_80916000 +/* 002EC 80915CFC 0C245800 */ jal func_80916000 /* 002F0 80915D00 E60A006C */ swc1 $f10, 0x006C($s0) ## 0000006C /* 002F4 80915D04 240F000A */ addiu $t7, $zero, 0x000A ## $t7 = 0000000A /* 002F8 80915D08 241800FF */ addiu $t8, $zero, 0x00FF ## $t8 = 000000FF /* 002FC 80915D0C A20F00AF */ sb $t7, 0x00AF($s0) ## 000000AF /* 00300 80915D10 A21800AE */ sb $t8, 0x00AE($s0) ## 000000AE /* 00304 80915D14 260507BC */ addiu $a1, $s0, 0x07BC ## $a1 = 000007BC -/* 00308 80915D18 AFA50044 */ sw $a1, 0x0044($sp) -/* 0030C 80915D1C 0C016EFE */ jal func_8005BBF8 +/* 00308 80915D18 AFA50044 */ sw $a1, 0x0044($sp) +/* 0030C 80915D1C 0C016EFE */ jal func_8005BBF8 /* 00310 80915D20 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 00314 80915D24 3C078092 */ lui $a3, %hi(D_8091B034) ## $a3 = 80920000 /* 00318 80915D28 261907DC */ addiu $t9, $s0, 0x07DC ## $t9 = 000007DC -/* 0031C 80915D2C 8FA50044 */ lw $a1, 0x0044($sp) -/* 00320 80915D30 AFB90010 */ sw $t9, 0x0010($sp) +/* 0031C 80915D2C 8FA50044 */ lw $a1, 0x0044($sp) +/* 00320 80915D30 AFB90010 */ sw $t9, 0x0010($sp) /* 00324 80915D34 24E7B034 */ addiu $a3, $a3, %lo(D_8091B034) ## $a3 = 8091B034 /* 00328 80915D38 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 0032C 80915D3C 0C017014 */ jal func_8005C050 +/* 0032C 80915D3C 0C017014 */ jal func_8005C050 /* 00330 80915D40 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 00334 80915D44 3C050001 */ lui $a1, 0x0001 ## $a1 = 00010000 -/* 00338 80915D48 00B12821 */ addu $a1, $a1, $s1 +/* 00338 80915D48 00B12821 */ addu $a1, $a1, $s1 /* 0033C 80915D4C 80A51CBC */ lb $a1, 0x1CBC($a1) ## 00011CBC /* 00340 80915D50 0C00B337 */ jal Flags_GetClear - + /* 00344 80915D54 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 00348 80915D58 50400023 */ beql $v0, $zero, .L80915DE8 -/* 0034C 80915D5C 8FBF003C */ lw $ra, 0x003C($sp) +/* 00348 80915D58 50400023 */ beql $v0, $zero, .L80915DE8 +/* 0034C 80915D5C 8FBF003C */ lw $ra, 0x003C($sp) /* 00350 80915D60 0C00B55C */ jal Actor_Kill - + /* 00354 80915D64 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 00358 80915D68 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 /* 0035C 80915D6C 3C01C420 */ lui $at, 0xC420 ## $at = C4200000 /* 00360 80915D70 44818000 */ mtc1 $at, $f16 ## $f16 = -640.00 /* 00364 80915D74 26241C24 */ addiu $a0, $s1, 0x1C24 ## $a0 = 00001C24 -/* 00368 80915D78 AFA40044 */ sw $a0, 0x0044($sp) +/* 00368 80915D78 AFA40044 */ sw $a0, 0x0044($sp) /* 0036C 80915D7C 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 00370 80915D80 02203025 */ or $a2, $s1, $zero ## $a2 = 00000000 /* 00374 80915D84 2407005D */ addiu $a3, $zero, 0x005D ## $a3 = 0000005D -/* 00378 80915D88 AFA0001C */ sw $zero, 0x001C($sp) -/* 0037C 80915D8C AFA00020 */ sw $zero, 0x0020($sp) -/* 00380 80915D90 AFA00024 */ sw $zero, 0x0024($sp) -/* 00384 80915D94 AFA00028 */ sw $zero, 0x0028($sp) -/* 00388 80915D98 E7A00010 */ swc1 $f0, 0x0010($sp) -/* 0038C 80915D9C E7A00018 */ swc1 $f0, 0x0018($sp) +/* 00378 80915D88 AFA0001C */ sw $zero, 0x001C($sp) +/* 0037C 80915D8C AFA00020 */ sw $zero, 0x0020($sp) +/* 00380 80915D90 AFA00024 */ sw $zero, 0x0024($sp) +/* 00384 80915D94 AFA00028 */ sw $zero, 0x0028($sp) +/* 00388 80915D98 E7A00010 */ swc1 $f0, 0x0010($sp) +/* 0038C 80915D9C E7A00018 */ swc1 $f0, 0x0018($sp) /* 00390 80915DA0 0C00C916 */ jal Actor_SpawnAttached - -/* 00394 80915DA4 E7B00014 */ swc1 $f16, 0x0014($sp) + +/* 00394 80915DA4 E7B00014 */ swc1 $f16, 0x0014($sp) /* 00398 80915DA8 3C01C420 */ lui $at, 0xC420 ## $at = C4200000 /* 0039C 80915DAC 44819000 */ mtc1 $at, $f18 ## $f18 = -640.00 /* 003A0 80915DB0 3C01C2A8 */ lui $at, 0xC2A8 ## $at = C2A80000 /* 003A4 80915DB4 44812000 */ mtc1 $at, $f4 ## $f4 = -84.00 -/* 003A8 80915DB8 8FA40044 */ lw $a0, 0x0044($sp) +/* 003A8 80915DB8 8FA40044 */ lw $a0, 0x0044($sp) /* 003AC 80915DBC 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 /* 003B0 80915DC0 2406005F */ addiu $a2, $zero, 0x005F ## $a2 = 0000005F /* 003B4 80915DC4 3C07430D */ lui $a3, 0x430D ## $a3 = 430D0000 -/* 003B8 80915DC8 AFA00018 */ sw $zero, 0x0018($sp) -/* 003BC 80915DCC AFA0001C */ sw $zero, 0x001C($sp) -/* 003C0 80915DD0 AFA00020 */ sw $zero, 0x0020($sp) -/* 003C4 80915DD4 AFA00024 */ sw $zero, 0x0024($sp) -/* 003C8 80915DD8 E7B20010 */ swc1 $f18, 0x0010($sp) +/* 003B8 80915DC8 AFA00018 */ sw $zero, 0x0018($sp) +/* 003BC 80915DCC AFA0001C */ sw $zero, 0x001C($sp) +/* 003C0 80915DD0 AFA00020 */ sw $zero, 0x0020($sp) +/* 003C4 80915DD4 AFA00024 */ sw $zero, 0x0024($sp) +/* 003C8 80915DD8 E7B20010 */ swc1 $f18, 0x0010($sp) /* 003CC 80915DDC 0C00C7D4 */ jal Actor_Spawn ## ActorSpawn -/* 003D0 80915DE0 E7A40014 */ swc1 $f4, 0x0014($sp) -/* 003D4 80915DE4 8FBF003C */ lw $ra, 0x003C($sp) +/* 003D0 80915DE0 E7A40014 */ swc1 $f4, 0x0014($sp) +/* 003D4 80915DE4 8FBF003C */ lw $ra, 0x003C($sp) .L80915DE8: -/* 003D8 80915DE8 8FB00034 */ lw $s0, 0x0034($sp) -/* 003DC 80915DEC 8FB10038 */ lw $s1, 0x0038($sp) -/* 003E0 80915DF0 03E00008 */ jr $ra +/* 003D8 80915DE8 8FB00034 */ lw $s0, 0x0034($sp) +/* 003DC 80915DEC 8FB10038 */ lw $s1, 0x0038($sp) +/* 003E0 80915DF0 03E00008 */ jr $ra /* 003E4 80915DF4 27BD0050 */ addiu $sp, $sp, 0x0050 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_80915F38.s b/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_80915F38.s index ee098306c1..dc181666c6 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_80915F38.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_80915F38.s @@ -1,28 +1,28 @@ glabel func_80915F38 /* 00528 80915F38 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 0052C 80915F3C AFB00028 */ sw $s0, 0x0028($sp) +/* 0052C 80915F3C AFB00028 */ sw $s0, 0x0028($sp) /* 00530 80915F40 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00534 80915F44 AFBF002C */ sw $ra, 0x002C($sp) +/* 00534 80915F44 AFBF002C */ sw $ra, 0x002C($sp) /* 00538 80915F48 3C040601 */ lui $a0, 0x0601 ## $a0 = 06010000 -/* 0053C 80915F4C AFA50034 */ sw $a1, 0x0034($sp) +/* 0053C 80915F4C AFA50034 */ sw $a1, 0x0034($sp) /* 00540 80915F50 0C028800 */ jal SkelAnime_GetFrameCount - + /* 00544 80915F54 2484B2FC */ addiu $a0, $a0, 0xB2FC ## $a0 = 0600B2FC /* 00548 80915F58 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 0054C 80915F5C 3C01C000 */ lui $at, 0xC000 ## $at = C0000000 /* 00550 80915F60 44814000 */ mtc1 $at, $f8 ## $f8 = -2.00 -/* 00554 80915F64 468021A0 */ cvt.s.w $f6, $f4 +/* 00554 80915F64 468021A0 */ cvt.s.w $f6, $f4 /* 00558 80915F68 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 /* 0055C 80915F6C 240E0002 */ addiu $t6, $zero, 0x0002 ## $t6 = 00000002 -/* 00560 80915F70 AFAE0014 */ sw $t6, 0x0014($sp) +/* 00560 80915F70 AFAE0014 */ sw $t6, 0x0014($sp) /* 00564 80915F74 24A5B2FC */ addiu $a1, $a1, 0xB2FC ## $a1 = 0600B2FC /* 00568 80915F78 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C -/* 0056C 80915F7C E7A60010 */ swc1 $f6, 0x0010($sp) +/* 0056C 80915F7C E7A60010 */ swc1 $f6, 0x0010($sp) /* 00570 80915F80 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 00574 80915F84 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 00578 80915F88 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 0057C 80915F8C E7A80018 */ swc1 $f8, 0x0018($sp) +/* 00578 80915F88 0C029468 */ jal SkelAnime_ChangeAnim + +/* 0057C 80915F8C E7A80018 */ swc1 $f8, 0x0018($sp) /* 00580 80915F90 8E080004 */ lw $t0, 0x0004($s0) ## 00000004 /* 00584 80915F94 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 /* 00588 80915F98 3C0F8091 */ lui $t7, %hi(func_80917D98) ## $t7 = 80910000 @@ -31,7 +31,7 @@ glabel func_80915F38 /* 00594 80915FA4 24180001 */ addiu $t8, $zero, 0x0001 ## $t8 = 00000001 /* 00598 80915FA8 241904B0 */ addiu $t9, $zero, 0x04B0 ## $t9 = 000004B0 /* 0059C 80915FAC 3C041001 */ lui $a0, 0x1001 ## $a0 = 10010000 -/* 005A0 80915FB0 01014824 */ and $t1, $t0, $at +/* 005A0 80915FB0 01014824 */ and $t1, $t0, $at /* 005A4 80915FB4 AE0F0190 */ sw $t7, 0x0190($s0) ## 00000190 /* 005A8 80915FB8 A61801BE */ sh $t8, 0x01BE($s0) ## 000001BE /* 005AC 80915FBC A60001C0 */ sh $zero, 0x01C0($s0) ## 000001C0 @@ -42,16 +42,16 @@ glabel func_80915F38 /* 005C0 80915FD0 348400FF */ ori $a0, $a0, 0x00FF ## $a0 = 100100FF /* 005C4 80915FD4 E6000068 */ swc1 $f0, 0x0068($s0) ## 00000068 /* 005C8 80915FD8 0C03E803 */ jal Audio_SetBGM - + /* 005CC 80915FDC E60000C4 */ swc1 $f0, 0x00C4($s0) ## 000000C4 /* 005D0 80915FE0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 005D4 80915FE4 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 005D8 80915FE8 24053812 */ addiu $a1, $zero, 0x3812 ## $a1 = 00003812 -/* 005DC 80915FEC 8FBF002C */ lw $ra, 0x002C($sp) -/* 005E0 80915FF0 8FB00028 */ lw $s0, 0x0028($sp) +/* 005DC 80915FEC 8FBF002C */ lw $ra, 0x002C($sp) +/* 005E0 80915FF0 8FB00028 */ lw $s0, 0x0028($sp) /* 005E4 80915FF4 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 005E8 80915FF8 03E00008 */ jr $ra +/* 005E8 80915FF8 03E00008 */ jr $ra /* 005EC 80915FFC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_80916000.s b/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_80916000.s index 7dfbcf8b10..fcfa25c4e0 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_80916000.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_80916000.s @@ -1,46 +1,46 @@ glabel func_80916000 /* 005F0 80916000 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 005F4 80916004 AFA40028 */ sw $a0, 0x0028($sp) -/* 005F8 80916008 AFBF0024 */ sw $ra, 0x0024($sp) +/* 005F4 80916004 AFA40028 */ sw $a0, 0x0028($sp) +/* 005F8 80916008 AFBF0024 */ sw $ra, 0x0024($sp) /* 005FC 8091600C 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 -/* 00600 80916010 AFA5002C */ sw $a1, 0x002C($sp) +/* 00600 80916010 AFA5002C */ sw $a1, 0x002C($sp) /* 00604 80916014 0C028800 */ jal SkelAnime_GetFrameCount - + /* 00608 80916018 24842360 */ addiu $a0, $a0, 0x2360 ## $a0 = 06002360 /* 0060C 8091601C 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 00610 80916020 3C01C170 */ lui $at, 0xC170 ## $at = C1700000 -/* 00614 80916024 8FA30028 */ lw $v1, 0x0028($sp) -/* 00618 80916028 468021A0 */ cvt.s.w $f6, $f4 +/* 00614 80916024 8FA30028 */ lw $v1, 0x0028($sp) +/* 00618 80916028 468021A0 */ cvt.s.w $f6, $f4 /* 0061C 8091602C 44814000 */ mtc1 $at, $f8 ## $f8 = -15.00 /* 00620 80916030 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 00624 80916034 24A52360 */ addiu $a1, $a1, 0x2360 ## $a1 = 06002360 /* 00628 80916038 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 0062C 8091603C 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 00630 80916040 E7A60010 */ swc1 $f6, 0x0010($sp) -/* 00634 80916044 AFA00014 */ sw $zero, 0x0014($sp) +/* 00630 80916040 E7A60010 */ swc1 $f6, 0x0010($sp) +/* 00634 80916044 AFA00014 */ sw $zero, 0x0014($sp) /* 00638 80916048 2464014C */ addiu $a0, $v1, 0x014C ## $a0 = 0000014C -/* 0063C 8091604C 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 00640 80916050 E7A80018 */ swc1 $f8, 0x0018($sp) -/* 00644 80916054 8FA2002C */ lw $v0, 0x002C($sp) -/* 00648 80916058 8FA30028 */ lw $v1, 0x0028($sp) +/* 0063C 8091604C 0C029468 */ jal SkelAnime_ChangeAnim + +/* 00640 80916050 E7A80018 */ swc1 $f8, 0x0018($sp) +/* 00644 80916054 8FA2002C */ lw $v0, 0x002C($sp) +/* 00648 80916058 8FA30028 */ lw $v1, 0x0028($sp) /* 0064C 8091605C 3C0E8091 */ lui $t6, %hi(func_80916C9C) ## $t6 = 80910000 /* 00650 80916060 25CE6C9C */ addiu $t6, $t6, %lo(func_80916C9C) ## $t6 = 80916C9C /* 00654 80916064 240F0001 */ addiu $t7, $zero, 0x0001 ## $t7 = 00000001 /* 00658 80916068 3C010001 */ lui $at, 0x0001 ## $at = 00010000 /* 0065C 8091606C 24180004 */ addiu $t8, $zero, 0x0004 ## $t8 = 00000004 -/* 00660 80916070 00220821 */ addu $at, $at, $v0 +/* 00660 80916070 00220821 */ addu $at, $at, $v0 /* 00664 80916074 AC6E0190 */ sw $t6, 0x0190($v1) ## 00000190 /* 00668 80916078 A46001D0 */ sh $zero, 0x01D0($v1) ## 000001D0 /* 0066C 8091607C A46F01BE */ sh $t7, 0x01BE($v1) ## 000001BE /* 00670 80916080 A0380AE3 */ sb $t8, 0x0AE3($at) ## 00010AE3 /* 00674 80916084 3C010001 */ lui $at, 0x0001 ## $at = 00010000 /* 00678 80916088 241900FF */ addiu $t9, $zero, 0x00FF ## $t9 = 000000FF -/* 0067C 8091608C 00220821 */ addu $at, $at, $v0 +/* 0067C 8091608C 00220821 */ addu $at, $at, $v0 /* 00680 80916090 A4390AFA */ sh $t9, 0x0AFA($at) ## 00010AFA -/* 00684 80916094 8FBF0024 */ lw $ra, 0x0024($sp) +/* 00684 80916094 8FBF0024 */ lw $ra, 0x0024($sp) /* 00688 80916098 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 0068C 8091609C 03E00008 */ jr $ra +/* 0068C 8091609C 03E00008 */ jr $ra /* 00690 809160A0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_809160A4.s b/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_809160A4.s index 5131eaed6f..bf0583ae7f 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_809160A4.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_809160A4.s @@ -1,40 +1,40 @@ glabel func_809160A4 /* 00694 809160A4 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 00698 809160A8 AFA40030 */ sw $a0, 0x0030($sp) -/* 0069C 809160AC AFBF0024 */ sw $ra, 0x0024($sp) +/* 00698 809160A8 AFA40030 */ sw $a0, 0x0030($sp) +/* 0069C 809160AC AFBF0024 */ sw $ra, 0x0024($sp) /* 006A0 809160B0 3C040601 */ lui $a0, 0x0601 ## $a0 = 06010000 /* 006A4 809160B4 0C028800 */ jal SkelAnime_GetFrameCount - + /* 006A8 809160B8 24842678 */ addiu $a0, $a0, 0x2678 ## $a0 = 06012678 /* 006AC 809160BC 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 006B0 809160C0 24040014 */ addiu $a0, $zero, 0x0014 ## $a0 = 00000014 /* 006B4 809160C4 2405001E */ addiu $a1, $zero, 0x001E ## $a1 = 0000001E -/* 006B8 809160C8 468021A0 */ cvt.s.w $f6, $f4 +/* 006B8 809160C8 468021A0 */ cvt.s.w $f6, $f4 /* 006BC 809160CC 0C01DF64 */ jal Math_Rand_S16Offset - -/* 006C0 809160D0 E7A6002C */ swc1 $f6, 0x002C($sp) -/* 006C4 809160D4 8FA30030 */ lw $v1, 0x0030($sp) + +/* 006C0 809160D0 E7A6002C */ swc1 $f6, 0x002C($sp) +/* 006C4 809160D4 8FA30030 */ lw $v1, 0x0030($sp) /* 006C8 809160D8 3C01C0A0 */ lui $at, 0xC0A0 ## $at = C0A00000 /* 006CC 809160DC 44815000 */ mtc1 $at, $f10 ## $f10 = -5.00 /* 006D0 809160E0 A46201D2 */ sh $v0, 0x01D2($v1) ## 000001D2 -/* 006D4 809160E4 C7A8002C */ lwc1 $f8, 0x002C($sp) +/* 006D4 809160E4 C7A8002C */ lwc1 $f8, 0x002C($sp) /* 006D8 809160E8 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 /* 006DC 809160EC 24A52678 */ addiu $a1, $a1, 0x2678 ## $a1 = 06012678 -/* 006E0 809160F0 AFA00014 */ sw $zero, 0x0014($sp) +/* 006E0 809160F0 AFA00014 */ sw $zero, 0x0014($sp) /* 006E4 809160F4 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 006E8 809160F8 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 /* 006EC 809160FC 2464014C */ addiu $a0, $v1, 0x014C ## $a0 = 0000014C -/* 006F0 80916100 E7AA0018 */ swc1 $f10, 0x0018($sp) -/* 006F4 80916104 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 006F8 80916108 E7A80010 */ swc1 $f8, 0x0010($sp) -/* 006FC 8091610C 8FAF0030 */ lw $t7, 0x0030($sp) +/* 006F0 80916100 E7AA0018 */ swc1 $f10, 0x0018($sp) +/* 006F4 80916104 0C029468 */ jal SkelAnime_ChangeAnim + +/* 006F8 80916108 E7A80010 */ swc1 $f8, 0x0010($sp) +/* 006FC 8091610C 8FAF0030 */ lw $t7, 0x0030($sp) /* 00700 80916110 3C0E8092 */ lui $t6, %hi(func_809195A4) ## $t6 = 80920000 /* 00704 80916114 25CE95A4 */ addiu $t6, $t6, %lo(func_809195A4) ## $t6 = 809195A4 /* 00708 80916118 ADEE0190 */ sw $t6, 0x0190($t7) ## 00000190 -/* 0070C 8091611C 8FBF0024 */ lw $ra, 0x0024($sp) +/* 0070C 8091611C 8FBF0024 */ lw $ra, 0x0024($sp) /* 00710 80916120 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 00714 80916124 03E00008 */ jr $ra +/* 00714 80916124 03E00008 */ jr $ra /* 00718 80916128 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_8091612C.s b/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_8091612C.s index d6fedd4a8c..05b9d6fc1b 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_8091612C.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_8091612C.s @@ -1,39 +1,39 @@ glabel func_8091612C /* 0071C 8091612C 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 00720 80916130 AFBF0024 */ sw $ra, 0x0024($sp) -/* 00724 80916134 AFA40028 */ sw $a0, 0x0028($sp) +/* 00720 80916130 AFBF0024 */ sw $ra, 0x0024($sp) +/* 00724 80916134 AFA40028 */ sw $a0, 0x0028($sp) /* 00728 80916138 24040014 */ addiu $a0, $zero, 0x0014 ## $a0 = 00000014 /* 0072C 8091613C 0C01DF64 */ jal Math_Rand_S16Offset - + /* 00730 80916140 2405001E */ addiu $a1, $zero, 0x001E ## $a1 = 0000001E -/* 00734 80916144 8FAE0028 */ lw $t6, 0x0028($sp) +/* 00734 80916144 8FAE0028 */ lw $t6, 0x0028($sp) /* 00738 80916148 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 /* 0073C 8091614C 2484193C */ addiu $a0, $a0, 0x193C ## $a0 = 0600193C /* 00740 80916150 0C028800 */ jal SkelAnime_GetFrameCount - + /* 00744 80916154 A5C201D2 */ sh $v0, 0x01D2($t6) ## 000001D2 /* 00748 80916158 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 0074C 8091615C 3C01C0A0 */ lui $at, 0xC0A0 ## $at = C0A00000 /* 00750 80916160 44814000 */ mtc1 $at, $f8 ## $f8 = -5.00 -/* 00754 80916164 468021A0 */ cvt.s.w $f6, $f4 -/* 00758 80916168 8FA40028 */ lw $a0, 0x0028($sp) +/* 00754 80916164 468021A0 */ cvt.s.w $f6, $f4 +/* 00758 80916168 8FA40028 */ lw $a0, 0x0028($sp) /* 0075C 8091616C 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 00760 80916170 24A5193C */ addiu $a1, $a1, 0x193C ## $a1 = 0600193C /* 00764 80916174 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 00768 80916178 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 0076C 8091617C E7A60010 */ swc1 $f6, 0x0010($sp) -/* 00770 80916180 AFA00014 */ sw $zero, 0x0014($sp) -/* 00774 80916184 E7A80018 */ swc1 $f8, 0x0018($sp) -/* 00778 80916188 0C029468 */ jal SkelAnime_ChangeAnimation - +/* 0076C 8091617C E7A60010 */ swc1 $f6, 0x0010($sp) +/* 00770 80916180 AFA00014 */ sw $zero, 0x0014($sp) +/* 00774 80916184 E7A80018 */ swc1 $f8, 0x0018($sp) +/* 00778 80916188 0C029468 */ jal SkelAnime_ChangeAnim + /* 0077C 8091618C 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 00780 80916190 8FB80028 */ lw $t8, 0x0028($sp) +/* 00780 80916190 8FB80028 */ lw $t8, 0x0028($sp) /* 00784 80916194 3C0F8092 */ lui $t7, %hi(func_8091960C) ## $t7 = 80920000 /* 00788 80916198 25EF960C */ addiu $t7, $t7, %lo(func_8091960C) ## $t7 = 8091960C /* 0078C 8091619C AF0F0190 */ sw $t7, 0x0190($t8) ## 00000190 -/* 00790 809161A0 8FBF0024 */ lw $ra, 0x0024($sp) +/* 00790 809161A0 8FBF0024 */ lw $ra, 0x0024($sp) /* 00794 809161A4 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 00798 809161A8 03E00008 */ jr $ra +/* 00798 809161A8 03E00008 */ jr $ra /* 0079C 809161AC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_809161B0.s b/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_809161B0.s index 7b7bd32f10..5cd7c3b3c4 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_809161B0.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_809161B0.s @@ -3,20 +3,20 @@ glabel func_809161B0 /* 007A4 809161B4 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 /* 007A8 809161B8 3C01C0A0 */ lui $at, 0xC0A0 ## $at = C0A00000 /* 007AC 809161BC 44812000 */ mtc1 $at, $f4 ## $f4 = -5.00 -/* 007B0 809161C0 AFB00028 */ sw $s0, 0x0028($sp) +/* 007B0 809161C0 AFB00028 */ sw $s0, 0x0028($sp) /* 007B4 809161C4 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 007B8 809161C8 AFBF002C */ sw $ra, 0x002C($sp) +/* 007B8 809161C8 AFBF002C */ sw $ra, 0x002C($sp) /* 007BC 809161CC 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 007C0 809161D0 240E0002 */ addiu $t6, $zero, 0x0002 ## $t6 = 00000002 -/* 007C4 809161D4 44070000 */ mfc1 $a3, $f0 -/* 007C8 809161D8 AFAE0014 */ sw $t6, 0x0014($sp) +/* 007C4 809161D4 44070000 */ mfc1 $a3, $f0 +/* 007C8 809161D8 AFAE0014 */ sw $t6, 0x0014($sp) /* 007CC 809161DC 24A55F28 */ addiu $a1, $a1, 0x5F28 ## $a1 = 06005F28 /* 007D0 809161E0 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C /* 007D4 809161E4 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 007D8 809161E8 E7A00010 */ swc1 $f0, 0x0010($sp) -/* 007DC 809161EC 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 007E0 809161F0 E7A40018 */ swc1 $f4, 0x0018($sp) +/* 007D8 809161E8 E7A00010 */ swc1 $f0, 0x0010($sp) +/* 007DC 809161EC 0C029468 */ jal SkelAnime_ChangeAnim + +/* 007E0 809161F0 E7A40018 */ swc1 $f4, 0x0018($sp) /* 007E4 809161F4 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 /* 007E8 809161F8 3C01C000 */ lui $at, 0xC000 ## $at = C0000000 /* 007EC 809161FC 44813000 */ mtc1 $at, $f6 ## $f6 = -2.00 @@ -26,10 +26,10 @@ glabel func_809161B0 /* 007FC 8091620C E6000068 */ swc1 $f0, 0x0068($s0) ## 00000068 /* 00800 80916210 E6000060 */ swc1 $f0, 0x0060($s0) ## 00000060 /* 00804 80916214 E606006C */ swc1 $f6, 0x006C($s0) ## 0000006C -/* 00808 80916218 8FBF002C */ lw $ra, 0x002C($sp) -/* 0080C 8091621C 8FB00028 */ lw $s0, 0x0028($sp) +/* 00808 80916218 8FBF002C */ lw $ra, 0x002C($sp) +/* 0080C 8091621C 8FB00028 */ lw $s0, 0x0028($sp) /* 00810 80916220 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 00814 80916224 03E00008 */ jr $ra +/* 00814 80916224 03E00008 */ jr $ra /* 00818 80916228 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_8091622C.s b/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_8091622C.s index b41df8e791..90e9065758 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_8091622C.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_8091622C.s @@ -3,20 +3,20 @@ glabel func_8091622C /* 00820 80916230 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 /* 00824 80916234 3C01C0A0 */ lui $at, 0xC0A0 ## $at = C0A00000 /* 00828 80916238 44812000 */ mtc1 $at, $f4 ## $f4 = -5.00 -/* 0082C 8091623C AFB00028 */ sw $s0, 0x0028($sp) +/* 0082C 8091623C AFB00028 */ sw $s0, 0x0028($sp) /* 00830 80916240 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00834 80916244 AFBF002C */ sw $ra, 0x002C($sp) +/* 00834 80916244 AFBF002C */ sw $ra, 0x002C($sp) /* 00838 80916248 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 0083C 8091624C 240E0002 */ addiu $t6, $zero, 0x0002 ## $t6 = 00000002 -/* 00840 80916250 44070000 */ mfc1 $a3, $f0 -/* 00844 80916254 AFAE0014 */ sw $t6, 0x0014($sp) +/* 00840 80916250 44070000 */ mfc1 $a3, $f0 +/* 00844 80916254 AFAE0014 */ sw $t6, 0x0014($sp) /* 00848 80916258 24A558C0 */ addiu $a1, $a1, 0x58C0 ## $a1 = 060058C0 /* 0084C 8091625C 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C /* 00850 80916260 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 00854 80916264 E7A00010 */ swc1 $f0, 0x0010($sp) -/* 00858 80916268 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 0085C 8091626C E7A40018 */ swc1 $f4, 0x0018($sp) +/* 00854 80916264 E7A00010 */ swc1 $f0, 0x0010($sp) +/* 00858 80916268 0C029468 */ jal SkelAnime_ChangeAnim + +/* 0085C 8091626C E7A40018 */ swc1 $f4, 0x0018($sp) /* 00860 80916270 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 /* 00864 80916274 3C01C000 */ lui $at, 0xC000 ## $at = C0000000 /* 00868 80916278 44813000 */ mtc1 $at, $f6 ## $f6 = -2.00 @@ -26,10 +26,10 @@ glabel func_8091622C /* 00878 80916288 E6000068 */ swc1 $f0, 0x0068($s0) ## 00000068 /* 0087C 8091628C E6000060 */ swc1 $f0, 0x0060($s0) ## 00000060 /* 00880 80916290 E606006C */ swc1 $f6, 0x006C($s0) ## 0000006C -/* 00884 80916294 8FBF002C */ lw $ra, 0x002C($sp) -/* 00888 80916298 8FB00028 */ lw $s0, 0x0028($sp) +/* 00884 80916294 8FBF002C */ lw $ra, 0x002C($sp) +/* 00888 80916298 8FB00028 */ lw $s0, 0x0028($sp) /* 0088C 8091629C 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 00890 809162A0 03E00008 */ jr $ra +/* 00890 809162A0 03E00008 */ jr $ra /* 00894 809162A4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_809162A8.s b/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_809162A8.s index be4ce3d4c9..ed5c877575 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_809162A8.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_809162A8.s @@ -1,34 +1,34 @@ glabel func_809162A8 /* 00898 809162A8 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 0089C 809162AC AFA40028 */ sw $a0, 0x0028($sp) -/* 008A0 809162B0 AFBF0024 */ sw $ra, 0x0024($sp) +/* 0089C 809162AC AFA40028 */ sw $a0, 0x0028($sp) +/* 008A0 809162B0 AFBF0024 */ sw $ra, 0x0024($sp) /* 008A4 809162B4 3C040601 */ lui $a0, 0x0601 ## $a0 = 06010000 /* 008A8 809162B8 0C028800 */ jal SkelAnime_GetFrameCount - + /* 008AC 809162BC 248413BC */ addiu $a0, $a0, 0x13BC ## $a0 = 060113BC /* 008B0 809162C0 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 008B4 809162C4 3C01C170 */ lui $at, 0xC170 ## $at = C1700000 /* 008B8 809162C8 44814000 */ mtc1 $at, $f8 ## $f8 = -15.00 -/* 008BC 809162CC 468021A0 */ cvt.s.w $f6, $f4 -/* 008C0 809162D0 8FA40028 */ lw $a0, 0x0028($sp) +/* 008BC 809162CC 468021A0 */ cvt.s.w $f6, $f4 +/* 008C0 809162D0 8FA40028 */ lw $a0, 0x0028($sp) /* 008C4 809162D4 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 /* 008C8 809162D8 24A513BC */ addiu $a1, $a1, 0x13BC ## $a1 = 060113BC /* 008CC 809162DC 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 008D0 809162E0 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 008D4 809162E4 E7A60010 */ swc1 $f6, 0x0010($sp) -/* 008D8 809162E8 AFA00014 */ sw $zero, 0x0014($sp) -/* 008DC 809162EC E7A80018 */ swc1 $f8, 0x0018($sp) -/* 008E0 809162F0 0C029468 */ jal SkelAnime_ChangeAnimation - +/* 008D4 809162E4 E7A60010 */ swc1 $f6, 0x0010($sp) +/* 008D8 809162E8 AFA00014 */ sw $zero, 0x0014($sp) +/* 008DC 809162EC E7A80018 */ swc1 $f8, 0x0018($sp) +/* 008E0 809162F0 0C029468 */ jal SkelAnime_ChangeAnim + /* 008E4 809162F4 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 008E8 809162F8 8FA20028 */ lw $v0, 0x0028($sp) +/* 008E8 809162F8 8FA20028 */ lw $v0, 0x0028($sp) /* 008EC 809162FC 3C0E8092 */ lui $t6, %hi(func_809193EC) ## $t6 = 80920000 /* 008F0 80916300 25CE93EC */ addiu $t6, $t6, %lo(func_809193EC) ## $t6 = 809193EC /* 008F4 80916304 AC4E0190 */ sw $t6, 0x0190($v0) ## 00000190 /* 008F8 80916308 A44001B2 */ sh $zero, 0x01B2($v0) ## 000001B2 -/* 008FC 8091630C 8FBF0024 */ lw $ra, 0x0024($sp) +/* 008FC 8091630C 8FBF0024 */ lw $ra, 0x0024($sp) /* 00900 80916310 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 00904 80916314 03E00008 */ jr $ra +/* 00904 80916314 03E00008 */ jr $ra /* 00908 80916318 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_8091631C.s b/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_8091631C.s index 38b7a86fc1..be5e1287b8 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_8091631C.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_8091631C.s @@ -1,35 +1,35 @@ glabel func_8091631C /* 0090C 8091631C 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 00910 80916320 AFA40028 */ sw $a0, 0x0028($sp) -/* 00914 80916324 AFBF0024 */ sw $ra, 0x0024($sp) +/* 00910 80916320 AFA40028 */ sw $a0, 0x0028($sp) +/* 00914 80916324 AFBF0024 */ sw $ra, 0x0024($sp) /* 00918 80916328 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 /* 0091C 8091632C 0C028800 */ jal SkelAnime_GetFrameCount - + /* 00920 80916330 248429F0 */ addiu $a0, $a0, 0x29F0 ## $a0 = 060029F0 /* 00924 80916334 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 00928 80916338 3C01C120 */ lui $at, 0xC120 ## $at = C1200000 /* 0092C 8091633C 44814000 */ mtc1 $at, $f8 ## $f8 = -10.00 -/* 00930 80916340 468021A0 */ cvt.s.w $f6, $f4 -/* 00934 80916344 8FA40028 */ lw $a0, 0x0028($sp) +/* 00930 80916340 468021A0 */ cvt.s.w $f6, $f4 +/* 00934 80916344 8FA40028 */ lw $a0, 0x0028($sp) /* 00938 80916348 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 0093C 8091634C 24A529F0 */ addiu $a1, $a1, 0x29F0 ## $a1 = 060029F0 /* 00940 80916350 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 00944 80916354 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 00948 80916358 E7A60010 */ swc1 $f6, 0x0010($sp) -/* 0094C 8091635C AFA00014 */ sw $zero, 0x0014($sp) -/* 00950 80916360 E7A80018 */ swc1 $f8, 0x0018($sp) -/* 00954 80916364 0C029468 */ jal SkelAnime_ChangeAnimation - +/* 00948 80916358 E7A60010 */ swc1 $f6, 0x0010($sp) +/* 0094C 8091635C AFA00014 */ sw $zero, 0x0014($sp) +/* 00950 80916360 E7A80018 */ swc1 $f8, 0x0018($sp) +/* 00954 80916364 0C029468 */ jal SkelAnime_ChangeAnim + /* 00958 80916368 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 0095C 8091636C 8FA20028 */ lw $v0, 0x0028($sp) +/* 0095C 8091636C 8FA20028 */ lw $v0, 0x0028($sp) /* 00960 80916370 3C0E8092 */ lui $t6, %hi(func_80919548) ## $t6 = 80920000 /* 00964 80916374 25CE9548 */ addiu $t6, $t6, %lo(func_80919548) ## $t6 = 80919548 /* 00968 80916378 240F0046 */ addiu $t7, $zero, 0x0046 ## $t7 = 00000046 /* 0096C 8091637C AC4E0190 */ sw $t6, 0x0190($v0) ## 00000190 /* 00970 80916380 A44F01D2 */ sh $t7, 0x01D2($v0) ## 000001D2 -/* 00974 80916384 8FBF0024 */ lw $ra, 0x0024($sp) +/* 00974 80916384 8FBF0024 */ lw $ra, 0x0024($sp) /* 00978 80916388 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 0097C 8091638C 03E00008 */ jr $ra +/* 0097C 8091638C 03E00008 */ jr $ra /* 00980 80916390 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_80916394.s b/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_80916394.s index 0dbfc83bcb..b2e5655f53 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_80916394.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_80916394.s @@ -1,27 +1,27 @@ glabel func_80916394 /* 00984 80916394 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 00988 80916398 AFB00028 */ sw $s0, 0x0028($sp) +/* 00988 80916398 AFB00028 */ sw $s0, 0x0028($sp) /* 0098C 8091639C 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00990 809163A0 AFBF002C */ sw $ra, 0x002C($sp) +/* 00990 809163A0 AFBF002C */ sw $ra, 0x002C($sp) /* 00994 809163A4 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 /* 00998 809163A8 0C028800 */ jal SkelAnime_GetFrameCount - + /* 0099C 809163AC 248466DC */ addiu $a0, $a0, 0x66DC ## $a0 = 060066DC /* 009A0 809163B0 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 009A4 809163B4 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 /* 009A8 809163B8 3C01C120 */ lui $at, 0xC120 ## $at = C1200000 -/* 009AC 809163BC 468021A0 */ cvt.s.w $f6, $f4 +/* 009AC 809163BC 468021A0 */ cvt.s.w $f6, $f4 /* 009B0 809163C0 44814000 */ mtc1 $at, $f8 ## $f8 = -10.00 /* 009B4 809163C4 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 009B8 809163C8 44070000 */ mfc1 $a3, $f0 +/* 009B8 809163C8 44070000 */ mfc1 $a3, $f0 /* 009BC 809163CC 24A566DC */ addiu $a1, $a1, 0x66DC ## $a1 = 060066DC /* 009C0 809163D0 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C -/* 009C4 809163D4 E7A60010 */ swc1 $f6, 0x0010($sp) +/* 009C4 809163D4 E7A60010 */ swc1 $f6, 0x0010($sp) /* 009C8 809163D8 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 009CC 809163DC AFA00014 */ sw $zero, 0x0014($sp) -/* 009D0 809163E0 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 009D4 809163E4 E7A80018 */ swc1 $f8, 0x0018($sp) +/* 009CC 809163DC AFA00014 */ sw $zero, 0x0014($sp) +/* 009D0 809163E0 0C029468 */ jal SkelAnime_ChangeAnim + +/* 009D4 809163E4 E7A80018 */ swc1 $f8, 0x0018($sp) /* 009D8 809163E8 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 /* 009DC 809163EC 3C0E8092 */ lui $t6, %hi(func_80919974) ## $t6 = 80920000 /* 009E0 809163F0 25CE9974 */ addiu $t6, $t6, %lo(func_80919974) ## $t6 = 80919974 @@ -29,10 +29,10 @@ glabel func_80916394 /* 009E8 809163F8 E6000068 */ swc1 $f0, 0x0068($s0) ## 00000068 /* 009EC 809163FC E6000060 */ swc1 $f0, 0x0060($s0) ## 00000060 /* 009F0 80916400 E600006C */ swc1 $f0, 0x006C($s0) ## 0000006C -/* 009F4 80916404 8FBF002C */ lw $ra, 0x002C($sp) -/* 009F8 80916408 8FB00028 */ lw $s0, 0x0028($sp) +/* 009F4 80916404 8FBF002C */ lw $ra, 0x002C($sp) +/* 009F8 80916408 8FB00028 */ lw $s0, 0x0028($sp) /* 009FC 8091640C 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 00A00 80916410 03E00008 */ jr $ra +/* 00A00 80916410 03E00008 */ jr $ra /* 00A04 80916414 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_80916418.s b/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_80916418.s index 5b00136dcd..5011342b79 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_80916418.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_80916418.s @@ -1,27 +1,27 @@ glabel func_80916418 /* 00A08 80916418 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 00A0C 8091641C AFB00028 */ sw $s0, 0x0028($sp) +/* 00A0C 8091641C AFB00028 */ sw $s0, 0x0028($sp) /* 00A10 80916420 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00A14 80916424 AFBF002C */ sw $ra, 0x002C($sp) +/* 00A14 80916424 AFBF002C */ sw $ra, 0x002C($sp) /* 00A18 80916428 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 /* 00A1C 8091642C 0C028800 */ jal SkelAnime_GetFrameCount - + /* 00A20 80916430 24842360 */ addiu $a0, $a0, 0x2360 ## $a0 = 06002360 /* 00A24 80916434 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 00A28 80916438 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 /* 00A2C 8091643C 3C01C0A0 */ lui $at, 0xC0A0 ## $at = C0A00000 -/* 00A30 80916440 468021A0 */ cvt.s.w $f6, $f4 +/* 00A30 80916440 468021A0 */ cvt.s.w $f6, $f4 /* 00A34 80916444 44814000 */ mtc1 $at, $f8 ## $f8 = -5.00 /* 00A38 80916448 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 00A3C 8091644C 44070000 */ mfc1 $a3, $f0 +/* 00A3C 8091644C 44070000 */ mfc1 $a3, $f0 /* 00A40 80916450 24A52360 */ addiu $a1, $a1, 0x2360 ## $a1 = 06002360 /* 00A44 80916454 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C -/* 00A48 80916458 E7A60010 */ swc1 $f6, 0x0010($sp) +/* 00A48 80916458 E7A60010 */ swc1 $f6, 0x0010($sp) /* 00A4C 8091645C 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 00A50 80916460 AFA00014 */ sw $zero, 0x0014($sp) -/* 00A54 80916464 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 00A58 80916468 E7A80018 */ swc1 $f8, 0x0018($sp) +/* 00A50 80916460 AFA00014 */ sw $zero, 0x0014($sp) +/* 00A54 80916464 0C029468 */ jal SkelAnime_ChangeAnim + +/* 00A58 80916468 E7A80018 */ swc1 $f8, 0x0018($sp) /* 00A5C 8091646C 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 /* 00A60 80916470 3C0E8092 */ lui $t6, %hi(func_80919A40) ## $t6 = 80920000 /* 00A64 80916474 25CE9A40 */ addiu $t6, $t6, %lo(func_80919A40) ## $t6 = 80919A40 @@ -31,13 +31,13 @@ glabel func_80916418 /* 00A74 80916484 E6000068 */ swc1 $f0, 0x0068($s0) ## 00000068 /* 00A78 80916488 E6000060 */ swc1 $f0, 0x0060($s0) ## 00000060 /* 00A7C 8091648C 0C01DF64 */ jal Math_Rand_S16Offset - + /* 00A80 80916490 E600006C */ swc1 $f0, 0x006C($s0) ## 0000006C /* 00A84 80916494 A60201D2 */ sh $v0, 0x01D2($s0) ## 000001D2 -/* 00A88 80916498 8FBF002C */ lw $ra, 0x002C($sp) -/* 00A8C 8091649C 8FB00028 */ lw $s0, 0x0028($sp) +/* 00A88 80916498 8FBF002C */ lw $ra, 0x002C($sp) +/* 00A8C 8091649C 8FB00028 */ lw $s0, 0x0028($sp) /* 00A90 809164A0 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 00A94 809164A4 03E00008 */ jr $ra +/* 00A94 809164A4 03E00008 */ jr $ra /* 00A98 809164A8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_809164AC.s b/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_809164AC.s index 7afb0c5b67..b503d4427d 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_809164AC.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_809164AC.s @@ -1,39 +1,39 @@ glabel func_809164AC /* 00A9C 809164AC 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 00AA0 809164B0 AFA40028 */ sw $a0, 0x0028($sp) -/* 00AA4 809164B4 AFBF0024 */ sw $ra, 0x0024($sp) +/* 00AA0 809164B0 AFA40028 */ sw $a0, 0x0028($sp) +/* 00AA4 809164B4 AFBF0024 */ sw $ra, 0x0024($sp) /* 00AA8 809164B8 3C040602 */ lui $a0, 0x0602 ## $a0 = 06020000 /* 00AAC 809164BC 0C028800 */ jal SkelAnime_GetFrameCount - + /* 00AB0 809164C0 2484EB4C */ addiu $a0, $a0, 0xEB4C ## $a0 = 0601EB4C /* 00AB4 809164C4 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 00AB8 809164C8 3C01C0A0 */ lui $at, 0xC0A0 ## $at = C0A00000 /* 00ABC 809164CC 44814000 */ mtc1 $at, $f8 ## $f8 = -5.00 -/* 00AC0 809164D0 468021A0 */ cvt.s.w $f6, $f4 -/* 00AC4 809164D4 8FA40028 */ lw $a0, 0x0028($sp) +/* 00AC0 809164D0 468021A0 */ cvt.s.w $f6, $f4 +/* 00AC4 809164D4 8FA40028 */ lw $a0, 0x0028($sp) /* 00AC8 809164D8 3C050602 */ lui $a1, 0x0602 ## $a1 = 06020000 /* 00ACC 809164DC 24A5EB4C */ addiu $a1, $a1, 0xEB4C ## $a1 = 0601EB4C /* 00AD0 809164E0 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 00AD4 809164E4 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 00AD8 809164E8 E7A60010 */ swc1 $f6, 0x0010($sp) -/* 00ADC 809164EC AFA00014 */ sw $zero, 0x0014($sp) -/* 00AE0 809164F0 E7A80018 */ swc1 $f8, 0x0018($sp) -/* 00AE4 809164F4 0C029468 */ jal SkelAnime_ChangeAnimation - +/* 00AD8 809164E8 E7A60010 */ swc1 $f6, 0x0010($sp) +/* 00ADC 809164EC AFA00014 */ sw $zero, 0x0014($sp) +/* 00AE0 809164F0 E7A80018 */ swc1 $f8, 0x0018($sp) +/* 00AE4 809164F4 0C029468 */ jal SkelAnime_ChangeAnim + /* 00AE8 809164F8 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 00AEC 809164FC 8FAF0028 */ lw $t7, 0x0028($sp) +/* 00AEC 809164FC 8FAF0028 */ lw $t7, 0x0028($sp) /* 00AF0 80916500 3C0E8092 */ lui $t6, %hi(func_80919704) ## $t6 = 80920000 /* 00AF4 80916504 25CE9704 */ addiu $t6, $t6, %lo(func_80919704) ## $t6 = 80919704 /* 00AF8 80916508 24040046 */ addiu $a0, $zero, 0x0046 ## $a0 = 00000046 /* 00AFC 8091650C 2405006E */ addiu $a1, $zero, 0x006E ## $a1 = 0000006E /* 00B00 80916510 0C01DF64 */ jal Math_Rand_S16Offset - + /* 00B04 80916514 ADEE0190 */ sw $t6, 0x0190($t7) ## 00000190 -/* 00B08 80916518 8FB80028 */ lw $t8, 0x0028($sp) +/* 00B08 80916518 8FB80028 */ lw $t8, 0x0028($sp) /* 00B0C 8091651C A70201D2 */ sh $v0, 0x01D2($t8) ## 000001D2 -/* 00B10 80916520 8FBF0024 */ lw $ra, 0x0024($sp) +/* 00B10 80916520 8FBF0024 */ lw $ra, 0x0024($sp) /* 00B14 80916524 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 00B18 80916528 03E00008 */ jr $ra +/* 00B18 80916528 03E00008 */ jr $ra /* 00B1C 8091652C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_80916530.s b/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_80916530.s index ebcc6a9d51..4af64dedb4 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_80916530.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_80916530.s @@ -1,42 +1,42 @@ glabel func_80916530 /* 00B20 80916530 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 00B24 80916534 AFA40028 */ sw $a0, 0x0028($sp) -/* 00B28 80916538 AFBF0024 */ sw $ra, 0x0024($sp) +/* 00B24 80916534 AFA40028 */ sw $a0, 0x0028($sp) +/* 00B28 80916538 AFBF0024 */ sw $ra, 0x0024($sp) /* 00B2C 8091653C 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 /* 00B30 80916540 0C028800 */ jal SkelAnime_GetFrameCount - + /* 00B34 80916544 24845F28 */ addiu $a0, $a0, 0x5F28 ## $a0 = 06005F28 /* 00B38 80916548 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 00B3C 8091654C 3C01C000 */ lui $at, 0xC000 ## $at = C0000000 /* 00B40 80916550 44814000 */ mtc1 $at, $f8 ## $f8 = -2.00 -/* 00B44 80916554 468021A0 */ cvt.s.w $f6, $f4 -/* 00B48 80916558 8FA40028 */ lw $a0, 0x0028($sp) +/* 00B44 80916554 468021A0 */ cvt.s.w $f6, $f4 +/* 00B48 80916558 8FA40028 */ lw $a0, 0x0028($sp) /* 00B4C 8091655C 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 00B50 80916560 240E0002 */ addiu $t6, $zero, 0x0002 ## $t6 = 00000002 -/* 00B54 80916564 AFAE0014 */ sw $t6, 0x0014($sp) +/* 00B54 80916564 AFAE0014 */ sw $t6, 0x0014($sp) /* 00B58 80916568 24A55F28 */ addiu $a1, $a1, 0x5F28 ## $a1 = 06005F28 -/* 00B5C 8091656C E7A60010 */ swc1 $f6, 0x0010($sp) +/* 00B5C 8091656C E7A60010 */ swc1 $f6, 0x0010($sp) /* 00B60 80916570 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 00B64 80916574 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 00B68 80916578 E7A80018 */ swc1 $f8, 0x0018($sp) -/* 00B6C 8091657C 0C029468 */ jal SkelAnime_ChangeAnimation - +/* 00B68 80916578 E7A80018 */ swc1 $f8, 0x0018($sp) +/* 00B6C 8091657C 0C029468 */ jal SkelAnime_ChangeAnim + /* 00B70 80916580 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 00B74 80916584 8FB80028 */ lw $t8, 0x0028($sp) +/* 00B74 80916584 8FB80028 */ lw $t8, 0x0028($sp) /* 00B78 80916588 3C0F8092 */ lui $t7, %hi(func_809190F8) ## $t7 = 80920000 /* 00B7C 8091658C 25EF90F8 */ addiu $t7, $t7, %lo(func_809190F8) ## $t7 = 809190F8 /* 00B80 80916590 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 /* 00B84 80916594 24845F28 */ addiu $a0, $a0, 0x5F28 ## $a0 = 06005F28 /* 00B88 80916598 0C028800 */ jal SkelAnime_GetFrameCount - + /* 00B8C 8091659C AF0F0190 */ sw $t7, 0x0190($t8) ## 00000190 /* 00B90 809165A0 44825000 */ mtc1 $v0, $f10 ## $f10 = 0.00 -/* 00B94 809165A4 8FB90028 */ lw $t9, 0x0028($sp) -/* 00B98 809165A8 46805420 */ cvt.s.w $f16, $f10 +/* 00B94 809165A4 8FB90028 */ lw $t9, 0x0028($sp) +/* 00B98 809165A8 46805420 */ cvt.s.w $f16, $f10 /* 00B9C 809165AC E730021C */ swc1 $f16, 0x021C($t9) ## 0000021C -/* 00BA0 809165B0 8FBF0024 */ lw $ra, 0x0024($sp) +/* 00BA0 809165B0 8FBF0024 */ lw $ra, 0x0024($sp) /* 00BA4 809165B4 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 00BA8 809165B8 03E00008 */ jr $ra +/* 00BA8 809165B8 03E00008 */ jr $ra /* 00BAC 809165BC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_809165C0.s b/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_809165C0.s index 831fcf703c..d23b5c762a 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_809165C0.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_809165C0.s @@ -1,49 +1,49 @@ glabel func_809165C0 /* 00BB0 809165C0 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 00BB4 809165C4 AFA40028 */ sw $a0, 0x0028($sp) -/* 00BB8 809165C8 AFBF0024 */ sw $ra, 0x0024($sp) +/* 00BB4 809165C4 AFA40028 */ sw $a0, 0x0028($sp) +/* 00BB8 809165C8 AFBF0024 */ sw $ra, 0x0024($sp) /* 00BBC 809165CC 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 /* 00BC0 809165D0 0C028800 */ jal SkelAnime_GetFrameCount - + /* 00BC4 809165D4 248458C0 */ addiu $a0, $a0, 0x58C0 ## $a0 = 060058C0 /* 00BC8 809165D8 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 00BCC 809165DC 3C01C000 */ lui $at, 0xC000 ## $at = C0000000 /* 00BD0 809165E0 44814000 */ mtc1 $at, $f8 ## $f8 = -2.00 -/* 00BD4 809165E4 468021A0 */ cvt.s.w $f6, $f4 -/* 00BD8 809165E8 8FA40028 */ lw $a0, 0x0028($sp) +/* 00BD4 809165E4 468021A0 */ cvt.s.w $f6, $f4 +/* 00BD8 809165E8 8FA40028 */ lw $a0, 0x0028($sp) /* 00BDC 809165EC 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 00BE0 809165F0 240E0002 */ addiu $t6, $zero, 0x0002 ## $t6 = 00000002 -/* 00BE4 809165F4 AFAE0014 */ sw $t6, 0x0014($sp) +/* 00BE4 809165F4 AFAE0014 */ sw $t6, 0x0014($sp) /* 00BE8 809165F8 24A558C0 */ addiu $a1, $a1, 0x58C0 ## $a1 = 060058C0 -/* 00BEC 809165FC E7A60010 */ swc1 $f6, 0x0010($sp) +/* 00BEC 809165FC E7A60010 */ swc1 $f6, 0x0010($sp) /* 00BF0 80916600 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 00BF4 80916604 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 00BF8 80916608 E7A80018 */ swc1 $f8, 0x0018($sp) -/* 00BFC 8091660C 0C029468 */ jal SkelAnime_ChangeAnimation - +/* 00BF8 80916608 E7A80018 */ swc1 $f8, 0x0018($sp) +/* 00BFC 8091660C 0C029468 */ jal SkelAnime_ChangeAnim + /* 00C00 80916610 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C /* 00C04 80916614 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 /* 00C08 80916618 0C028800 */ jal SkelAnime_GetFrameCount - + /* 00C0C 8091661C 248458C0 */ addiu $a0, $a0, 0x58C0 ## $a0 = 060058C0 /* 00C10 80916620 44825000 */ mtc1 $v0, $f10 ## $f10 = 0.00 -/* 00C14 80916624 8FA30028 */ lw $v1, 0x0028($sp) +/* 00C14 80916624 8FA30028 */ lw $v1, 0x0028($sp) /* 00C18 80916628 3C0F8092 */ lui $t7, %hi(func_80919054) ## $t7 = 80920000 -/* 00C1C 8091662C 46805420 */ cvt.s.w $f16, $f10 +/* 00C1C 8091662C 46805420 */ cvt.s.w $f16, $f10 /* 00C20 80916630 25EF9054 */ addiu $t7, $t7, %lo(func_80919054) ## $t7 = 80919054 /* 00C24 80916634 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 /* 00C28 80916638 248458C0 */ addiu $a0, $a0, 0x58C0 ## $a0 = 060058C0 /* 00C2C 8091663C AC6F0190 */ sw $t7, 0x0190($v1) ## 00000190 /* 00C30 80916640 0C028800 */ jal SkelAnime_GetFrameCount - + /* 00C34 80916644 E470021C */ swc1 $f16, 0x021C($v1) ## 0000021C /* 00C38 80916648 44829000 */ mtc1 $v0, $f18 ## $f18 = 0.00 -/* 00C3C 8091664C 8FB80028 */ lw $t8, 0x0028($sp) -/* 00C40 80916650 46809120 */ cvt.s.w $f4, $f18 +/* 00C3C 8091664C 8FB80028 */ lw $t8, 0x0028($sp) +/* 00C40 80916650 46809120 */ cvt.s.w $f4, $f18 /* 00C44 80916654 E704021C */ swc1 $f4, 0x021C($t8) ## 0000021C -/* 00C48 80916658 8FBF0024 */ lw $ra, 0x0024($sp) +/* 00C48 80916658 8FBF0024 */ lw $ra, 0x0024($sp) /* 00C4C 8091665C 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 00C50 80916660 03E00008 */ jr $ra +/* 00C50 80916660 03E00008 */ jr $ra /* 00C54 80916664 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_80916668.s b/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_80916668.s index 3ed3556306..5296a0e75e 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_80916668.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_80916668.s @@ -1,33 +1,33 @@ glabel func_80916668 /* 00C58 80916668 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 00C5C 8091666C AFA40028 */ sw $a0, 0x0028($sp) -/* 00C60 80916670 AFBF0024 */ sw $ra, 0x0024($sp) +/* 00C5C 8091666C AFA40028 */ sw $a0, 0x0028($sp) +/* 00C60 80916670 AFBF0024 */ sw $ra, 0x0024($sp) /* 00C64 80916674 3C040601 */ lui $a0, 0x0601 ## $a0 = 06010000 /* 00C68 80916678 0C028800 */ jal SkelAnime_GetFrameCount - + /* 00C6C 8091667C 2484CCD8 */ addiu $a0, $a0, 0xCCD8 ## $a0 = 0600CCD8 /* 00C70 80916680 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 00C74 80916684 3C01C000 */ lui $at, 0xC000 ## $at = C0000000 /* 00C78 80916688 44814000 */ mtc1 $at, $f8 ## $f8 = -2.00 -/* 00C7C 8091668C 468021A0 */ cvt.s.w $f6, $f4 -/* 00C80 80916690 8FA40028 */ lw $a0, 0x0028($sp) +/* 00C7C 8091668C 468021A0 */ cvt.s.w $f6, $f4 +/* 00C80 80916690 8FA40028 */ lw $a0, 0x0028($sp) /* 00C84 80916694 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 /* 00C88 80916698 24A5CCD8 */ addiu $a1, $a1, 0xCCD8 ## $a1 = 0600CCD8 /* 00C8C 8091669C 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 00C90 809166A0 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 00C94 809166A4 E7A60010 */ swc1 $f6, 0x0010($sp) -/* 00C98 809166A8 AFA00014 */ sw $zero, 0x0014($sp) -/* 00C9C 809166AC E7A80018 */ swc1 $f8, 0x0018($sp) -/* 00CA0 809166B0 0C029468 */ jal SkelAnime_ChangeAnimation - +/* 00C94 809166A4 E7A60010 */ swc1 $f6, 0x0010($sp) +/* 00C98 809166A8 AFA00014 */ sw $zero, 0x0014($sp) +/* 00C9C 809166AC E7A80018 */ swc1 $f8, 0x0018($sp) +/* 00CA0 809166B0 0C029468 */ jal SkelAnime_ChangeAnim + /* 00CA4 809166B4 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 00CA8 809166B8 8FAF0028 */ lw $t7, 0x0028($sp) +/* 00CA8 809166B8 8FAF0028 */ lw $t7, 0x0028($sp) /* 00CAC 809166BC 3C0E8092 */ lui $t6, %hi(func_80919150) ## $t6 = 80920000 /* 00CB0 809166C0 25CE9150 */ addiu $t6, $t6, %lo(func_80919150) ## $t6 = 80919150 /* 00CB4 809166C4 ADEE0190 */ sw $t6, 0x0190($t7) ## 00000190 -/* 00CB8 809166C8 8FBF0024 */ lw $ra, 0x0024($sp) +/* 00CB8 809166C8 8FBF0024 */ lw $ra, 0x0024($sp) /* 00CBC 809166CC 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 00CC0 809166D0 03E00008 */ jr $ra +/* 00CC0 809166D0 03E00008 */ jr $ra /* 00CC4 809166D4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_809166D8.s b/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_809166D8.s index 332446f1ce..e6ca41755f 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_809166D8.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_809166D8.s @@ -1,34 +1,34 @@ glabel func_809166D8 /* 00CC8 809166D8 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 00CCC 809166DC AFA40028 */ sw $a0, 0x0028($sp) -/* 00CD0 809166E0 AFBF0024 */ sw $ra, 0x0024($sp) +/* 00CCC 809166DC AFA40028 */ sw $a0, 0x0028($sp) +/* 00CD0 809166E0 AFBF0024 */ sw $ra, 0x0024($sp) /* 00CD4 809166E4 3C040601 */ lui $a0, 0x0601 ## $a0 = 06010000 /* 00CD8 809166E8 0C028800 */ jal SkelAnime_GetFrameCount - + /* 00CDC 809166EC 2484C468 */ addiu $a0, $a0, 0xC468 ## $a0 = 0600C468 /* 00CE0 809166F0 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 00CE4 809166F4 3C01C120 */ lui $at, 0xC120 ## $at = C1200000 /* 00CE8 809166F8 44814000 */ mtc1 $at, $f8 ## $f8 = -10.00 -/* 00CEC 809166FC 468021A0 */ cvt.s.w $f6, $f4 -/* 00CF0 80916700 8FA40028 */ lw $a0, 0x0028($sp) +/* 00CEC 809166FC 468021A0 */ cvt.s.w $f6, $f4 +/* 00CF0 80916700 8FA40028 */ lw $a0, 0x0028($sp) /* 00CF4 80916704 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 /* 00CF8 80916708 240E0002 */ addiu $t6, $zero, 0x0002 ## $t6 = 00000002 -/* 00CFC 8091670C AFAE0014 */ sw $t6, 0x0014($sp) +/* 00CFC 8091670C AFAE0014 */ sw $t6, 0x0014($sp) /* 00D00 80916710 24A5C468 */ addiu $a1, $a1, 0xC468 ## $a1 = 0600C468 -/* 00D04 80916714 E7A60010 */ swc1 $f6, 0x0010($sp) +/* 00D04 80916714 E7A60010 */ swc1 $f6, 0x0010($sp) /* 00D08 80916718 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 00D0C 8091671C 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 00D10 80916720 E7A80018 */ swc1 $f8, 0x0018($sp) -/* 00D14 80916724 0C029468 */ jal SkelAnime_ChangeAnimation - +/* 00D10 80916720 E7A80018 */ swc1 $f8, 0x0018($sp) +/* 00D14 80916724 0C029468 */ jal SkelAnime_ChangeAnim + /* 00D18 80916728 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 00D1C 8091672C 8FB80028 */ lw $t8, 0x0028($sp) +/* 00D1C 8091672C 8FB80028 */ lw $t8, 0x0028($sp) /* 00D20 80916730 3C0F8092 */ lui $t7, %hi(func_80918C08) ## $t7 = 80920000 /* 00D24 80916734 25EF8C08 */ addiu $t7, $t7, %lo(func_80918C08) ## $t7 = 80918C08 /* 00D28 80916738 AF0F0190 */ sw $t7, 0x0190($t8) ## 00000190 -/* 00D2C 8091673C 8FBF0024 */ lw $ra, 0x0024($sp) +/* 00D2C 8091673C 8FBF0024 */ lw $ra, 0x0024($sp) /* 00D30 80916740 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 00D34 80916744 03E00008 */ jr $ra +/* 00D34 80916744 03E00008 */ jr $ra /* 00D38 80916748 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_8091674C.s b/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_8091674C.s index 3c20010824..2ab7695dd4 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_8091674C.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_8091674C.s @@ -1,34 +1,34 @@ glabel func_8091674C /* 00D3C 8091674C 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 00D40 80916750 AFA40028 */ sw $a0, 0x0028($sp) -/* 00D44 80916754 AFBF0024 */ sw $ra, 0x0024($sp) +/* 00D40 80916750 AFA40028 */ sw $a0, 0x0028($sp) +/* 00D44 80916754 AFBF0024 */ sw $ra, 0x0024($sp) /* 00D48 80916758 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 /* 00D4C 8091675C 0C028800 */ jal SkelAnime_GetFrameCount - + /* 00D50 80916760 24840AE8 */ addiu $a0, $a0, 0x0AE8 ## $a0 = 06000AE8 /* 00D54 80916764 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 00D58 80916768 3C01C120 */ lui $at, 0xC120 ## $at = C1200000 /* 00D5C 8091676C 44814000 */ mtc1 $at, $f8 ## $f8 = -10.00 -/* 00D60 80916770 468021A0 */ cvt.s.w $f6, $f4 -/* 00D64 80916774 8FA40028 */ lw $a0, 0x0028($sp) +/* 00D60 80916770 468021A0 */ cvt.s.w $f6, $f4 +/* 00D64 80916774 8FA40028 */ lw $a0, 0x0028($sp) /* 00D68 80916778 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 00D6C 8091677C 24A50AE8 */ addiu $a1, $a1, 0x0AE8 ## $a1 = 06000AE8 /* 00D70 80916780 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 00D74 80916784 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 00D78 80916788 E7A60010 */ swc1 $f6, 0x0010($sp) -/* 00D7C 8091678C AFA00014 */ sw $zero, 0x0014($sp) -/* 00D80 80916790 E7A80018 */ swc1 $f8, 0x0018($sp) -/* 00D84 80916794 0C029468 */ jal SkelAnime_ChangeAnimation - +/* 00D78 80916788 E7A60010 */ swc1 $f6, 0x0010($sp) +/* 00D7C 8091678C AFA00014 */ sw $zero, 0x0014($sp) +/* 00D80 80916790 E7A80018 */ swc1 $f8, 0x0018($sp) +/* 00D84 80916794 0C029468 */ jal SkelAnime_ChangeAnim + /* 00D88 80916798 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 00D8C 8091679C 8FA20028 */ lw $v0, 0x0028($sp) +/* 00D8C 8091679C 8FA20028 */ lw $v0, 0x0028($sp) /* 00D90 809167A0 3C0E8092 */ lui $t6, %hi(func_80918D10) ## $t6 = 80920000 /* 00D94 809167A4 25CE8D10 */ addiu $t6, $t6, %lo(func_80918D10) ## $t6 = 80918D10 /* 00D98 809167A8 AC4E0190 */ sw $t6, 0x0190($v0) ## 00000190 /* 00D9C 809167AC A44001D2 */ sh $zero, 0x01D2($v0) ## 000001D2 -/* 00DA0 809167B0 8FBF0024 */ lw $ra, 0x0024($sp) +/* 00DA0 809167B0 8FBF0024 */ lw $ra, 0x0024($sp) /* 00DA4 809167B4 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 00DA8 809167B8 03E00008 */ jr $ra +/* 00DA8 809167B8 03E00008 */ jr $ra /* 00DAC 809167BC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_809167C0.s b/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_809167C0.s index fb829612ae..1e400d0cfc 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_809167C0.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_809167C0.s @@ -1,36 +1,36 @@ glabel func_809167C0 /* 00DB0 809167C0 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 00DB4 809167C4 AFA40028 */ sw $a0, 0x0028($sp) -/* 00DB8 809167C8 AFBF0024 */ sw $ra, 0x0024($sp) +/* 00DB4 809167C4 AFA40028 */ sw $a0, 0x0028($sp) +/* 00DB8 809167C8 AFBF0024 */ sw $ra, 0x0024($sp) /* 00DBC 809167CC 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 /* 00DC0 809167D0 0C028800 */ jal SkelAnime_GetFrameCount - + /* 00DC4 809167D4 24844318 */ addiu $a0, $a0, 0x4318 ## $a0 = 06004318 /* 00DC8 809167D8 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 00DCC 809167DC 3C01C120 */ lui $at, 0xC120 ## $at = C1200000 /* 00DD0 809167E0 44814000 */ mtc1 $at, $f8 ## $f8 = -10.00 -/* 00DD4 809167E4 468021A0 */ cvt.s.w $f6, $f4 -/* 00DD8 809167E8 8FA30028 */ lw $v1, 0x0028($sp) +/* 00DD4 809167E4 468021A0 */ cvt.s.w $f6, $f4 +/* 00DD8 809167E8 8FA30028 */ lw $v1, 0x0028($sp) /* 00DDC 809167EC 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 00DE0 809167F0 240E0002 */ addiu $t6, $zero, 0x0002 ## $t6 = 00000002 -/* 00DE4 809167F4 AFAE0014 */ sw $t6, 0x0014($sp) +/* 00DE4 809167F4 AFAE0014 */ sw $t6, 0x0014($sp) /* 00DE8 809167F8 24A54318 */ addiu $a1, $a1, 0x4318 ## $a1 = 06004318 -/* 00DEC 809167FC E7A60010 */ swc1 $f6, 0x0010($sp) +/* 00DEC 809167FC E7A60010 */ swc1 $f6, 0x0010($sp) /* 00DF0 80916800 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 00DF4 80916804 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 00DF8 80916808 E7A80018 */ swc1 $f8, 0x0018($sp) -/* 00DFC 8091680C 0C029468 */ jal SkelAnime_ChangeAnimation - +/* 00DF8 80916808 E7A80018 */ swc1 $f8, 0x0018($sp) +/* 00DFC 8091680C 0C029468 */ jal SkelAnime_ChangeAnim + /* 00E00 80916810 2464014C */ addiu $a0, $v1, 0x014C ## $a0 = 0000014C -/* 00E04 80916814 8FA30028 */ lw $v1, 0x0028($sp) +/* 00E04 80916814 8FA30028 */ lw $v1, 0x0028($sp) /* 00E08 80916818 3C0F8092 */ lui $t7, %hi(func_80918D6C) ## $t7 = 80920000 /* 00E0C 8091681C 25EF8D6C */ addiu $t7, $t7, %lo(func_80918D6C) ## $t7 = 80918D6C /* 00E10 80916820 AC6F0190 */ sw $t7, 0x0190($v1) ## 00000190 /* 00E14 80916824 A46001D0 */ sh $zero, 0x01D0($v1) ## 000001D0 /* 00E18 80916828 A46001D2 */ sh $zero, 0x01D2($v1) ## 000001D2 -/* 00E1C 8091682C 8FBF0024 */ lw $ra, 0x0024($sp) +/* 00E1C 8091682C 8FBF0024 */ lw $ra, 0x0024($sp) /* 00E20 80916830 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 00E24 80916834 03E00008 */ jr $ra +/* 00E24 80916834 03E00008 */ jr $ra /* 00E28 80916838 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_8091683C.s b/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_8091683C.s index 75ebac6264..03c8585820 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_8091683C.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_8091683C.s @@ -1,34 +1,34 @@ glabel func_8091683C /* 00E2C 8091683C 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 00E30 80916840 AFA40028 */ sw $a0, 0x0028($sp) -/* 00E34 80916844 AFBF0024 */ sw $ra, 0x0024($sp) +/* 00E30 80916840 AFA40028 */ sw $a0, 0x0028($sp) +/* 00E34 80916844 AFBF0024 */ sw $ra, 0x0024($sp) /* 00E38 80916848 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 /* 00E3C 8091684C 0C028800 */ jal SkelAnime_GetFrameCount - + /* 00E40 80916850 24846E60 */ addiu $a0, $a0, 0x6E60 ## $a0 = 06006E60 /* 00E44 80916854 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 00E48 80916858 3C01C000 */ lui $at, 0xC000 ## $at = C0000000 /* 00E4C 8091685C 44814000 */ mtc1 $at, $f8 ## $f8 = -2.00 -/* 00E50 80916860 468021A0 */ cvt.s.w $f6, $f4 -/* 00E54 80916864 8FA40028 */ lw $a0, 0x0028($sp) +/* 00E50 80916860 468021A0 */ cvt.s.w $f6, $f4 +/* 00E54 80916864 8FA40028 */ lw $a0, 0x0028($sp) /* 00E58 80916868 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 00E5C 8091686C 240E0002 */ addiu $t6, $zero, 0x0002 ## $t6 = 00000002 -/* 00E60 80916870 AFAE0014 */ sw $t6, 0x0014($sp) +/* 00E60 80916870 AFAE0014 */ sw $t6, 0x0014($sp) /* 00E64 80916874 24A56E60 */ addiu $a1, $a1, 0x6E60 ## $a1 = 06006E60 -/* 00E68 80916878 E7A60010 */ swc1 $f6, 0x0010($sp) +/* 00E68 80916878 E7A60010 */ swc1 $f6, 0x0010($sp) /* 00E6C 8091687C 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 00E70 80916880 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 00E74 80916884 E7A80018 */ swc1 $f8, 0x0018($sp) -/* 00E78 80916888 0C029468 */ jal SkelAnime_ChangeAnimation - +/* 00E74 80916884 E7A80018 */ swc1 $f8, 0x0018($sp) +/* 00E78 80916888 0C029468 */ jal SkelAnime_ChangeAnim + /* 00E7C 8091688C 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 00E80 80916890 8FB80028 */ lw $t8, 0x0028($sp) +/* 00E80 80916890 8FB80028 */ lw $t8, 0x0028($sp) /* 00E84 80916894 3C0F8092 */ lui $t7, %hi(func_80918FBC) ## $t7 = 80920000 /* 00E88 80916898 25EF8FBC */ addiu $t7, $t7, %lo(func_80918FBC) ## $t7 = 80918FBC /* 00E8C 8091689C AF0F0190 */ sw $t7, 0x0190($t8) ## 00000190 -/* 00E90 809168A0 8FBF0024 */ lw $ra, 0x0024($sp) +/* 00E90 809168A0 8FBF0024 */ lw $ra, 0x0024($sp) /* 00E94 809168A4 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 00E98 809168A8 03E00008 */ jr $ra +/* 00E98 809168A8 03E00008 */ jr $ra /* 00E9C 809168AC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_80916AEC.s b/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_80916AEC.s index 72e62f437c..a9b4950572 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_80916AEC.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_80916AEC.s @@ -1,15 +1,15 @@ glabel func_80916AEC /* 010DC 80916AEC 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 -/* 010E0 80916AF0 AFB00028 */ sw $s0, 0x0028($sp) +/* 010E0 80916AF0 AFB00028 */ sw $s0, 0x0028($sp) /* 010E4 80916AF4 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 010E8 80916AF8 AFB1002C */ sw $s1, 0x002C($sp) +/* 010E8 80916AF8 AFB1002C */ sw $s1, 0x002C($sp) /* 010EC 80916AFC 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 -/* 010F0 80916B00 AFBF0034 */ sw $ra, 0x0034($sp) +/* 010F0 80916B00 AFBF0034 */ sw $ra, 0x0034($sp) /* 010F4 80916B04 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 010F8 80916B08 AFB20030 */ sw $s2, 0x0030($sp) -/* 010FC 80916B0C 0C030129 */ jal func_800C04A4 +/* 010F8 80916B08 AFB20030 */ sw $s2, 0x0030($sp) +/* 010FC 80916B0C 0C030129 */ jal func_800C04A4 /* 01100 80916B10 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 01104 80916B14 AFA20038 */ sw $v0, 0x0038($sp) +/* 01104 80916B14 AFA20038 */ sw $v0, 0x0038($sp) /* 01108 80916B18 8E0F0004 */ lw $t7, 0x0004($s0) ## 00000004 /* 0110C 80916B1C 8E321C44 */ lw $s2, 0x1C44($s1) ## 00001C44 /* 01110 80916B20 240E0004 */ addiu $t6, $zero, 0x0004 ## $t6 = 00000004 @@ -17,49 +17,49 @@ glabel func_80916AEC /* 01118 80916B28 A60E01D0 */ sh $t6, 0x01D0($s0) ## 000001D0 /* 0111C 80916B2C AE180004 */ sw $t8, 0x0004($s0) ## 00000004 /* 01120 80916B30 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 01124 80916B34 0C019148 */ jal func_80064520 +/* 01124 80916B34 0C019148 */ jal func_80064520 /* 01128 80916B38 26251D64 */ addiu $a1, $s1, 0x1D64 ## $a1 = 00001D64 /* 0112C 80916B3C 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 01130 80916B40 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 01134 80916B44 0C00B7D5 */ jal func_8002DF54 +/* 01134 80916B44 0C00B7D5 */ jal func_8002DF54 /* 01138 80916B48 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 -/* 0113C 80916B4C 0C03008C */ jal func_800C0230 +/* 0113C 80916B4C 0C03008C */ jal func_800C0230 /* 01140 80916B50 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 01144 80916B54 A60201BC */ sh $v0, 0x01BC($s0) ## 000001BC /* 01148 80916B58 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 0114C 80916B5C 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 01150 80916B60 0C0300C5 */ jal func_800C0314 +/* 01150 80916B60 0C0300C5 */ jal func_800C0314 /* 01154 80916B64 24060003 */ addiu $a2, $zero, 0x0003 ## $a2 = 00000003 /* 01158 80916B68 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 0115C 80916B6C 860501BC */ lh $a1, 0x01BC($s0) ## 000001BC -/* 01160 80916B70 0C0300C5 */ jal func_800C0314 +/* 01160 80916B70 0C0300C5 */ jal func_800C0314 /* 01164 80916B74 24060007 */ addiu $a2, $zero, 0x0007 ## $a2 = 00000007 /* 01168 80916B78 3C040601 */ lui $a0, 0x0601 ## $a0 = 06010000 /* 0116C 80916B7C 0C028800 */ jal SkelAnime_GetFrameCount - + /* 01170 80916B80 24840918 */ addiu $a0, $a0, 0x0918 ## $a0 = 06010918 /* 01174 80916B84 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 01178 80916B88 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 /* 0117C 80916B8C 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 -/* 01180 80916B90 468021A0 */ cvt.s.w $f6, $f4 +/* 01180 80916B90 468021A0 */ cvt.s.w $f6, $f4 /* 01184 80916B94 24190002 */ addiu $t9, $zero, 0x0002 ## $t9 = 00000002 -/* 01188 80916B98 44070000 */ mfc1 $a3, $f0 -/* 0118C 80916B9C AFB90014 */ sw $t9, 0x0014($sp) +/* 01188 80916B98 44070000 */ mfc1 $a3, $f0 +/* 0118C 80916B9C AFB90014 */ sw $t9, 0x0014($sp) /* 01190 80916BA0 24A50918 */ addiu $a1, $a1, 0x0918 ## $a1 = 06010918 /* 01194 80916BA4 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C -/* 01198 80916BA8 E7A60010 */ swc1 $f6, 0x0010($sp) +/* 01198 80916BA8 E7A60010 */ swc1 $f6, 0x0010($sp) /* 0119C 80916BAC 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 011A0 80916BB0 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 011A4 80916BB4 E7A00018 */ swc1 $f0, 0x0018($sp) +/* 011A0 80916BB0 0C029468 */ jal SkelAnime_ChangeAnim + +/* 011A4 80916BB4 E7A00018 */ swc1 $f0, 0x0018($sp) /* 011A8 80916BB8 3C040601 */ lui $a0, 0x0601 ## $a0 = 06010000 /* 011AC 80916BBC 0C028800 */ jal SkelAnime_GetFrameCount - + /* 011B0 80916BC0 24840918 */ addiu $a0, $a0, 0x0918 ## $a0 = 06010918 /* 011B4 80916BC4 44824000 */ mtc1 $v0, $f8 ## $f8 = 0.00 /* 011B8 80916BC8 3C01C316 */ lui $at, 0xC316 ## $at = C3160000 /* 011BC 80916BCC 44818000 */ mtc1 $at, $f16 ## $f16 = -150.00 -/* 011C0 80916BD0 468042A0 */ cvt.s.w $f10, $f8 +/* 011C0 80916BD0 468042A0 */ cvt.s.w $f10, $f8 /* 011C4 80916BD4 3C01C3AF */ lui $at, 0xC3AF ## $at = C3AF0000 /* 011C8 80916BD8 44819000 */ mtc1 $at, $f18 ## $f18 = -350.00 /* 011CC 80916BDC 3C014316 */ lui $at, 0x4316 ## $at = 43160000 @@ -76,10 +76,10 @@ glabel func_80916AEC /* 011F8 80916C08 E646002C */ swc1 $f6, 0x002C($s2) ## 0000002C /* 011FC 80916C0C A6490032 */ sh $t1, 0x0032($s2) ## 00000032 /* 01200 80916C10 8E251C44 */ lw $a1, 0x1C44($s1) ## 00001C44 -/* 01204 80916C14 0C00B69E */ jal func_8002DA78 +/* 01204 80916C14 0C00B69E */ jal func_8002DA78 /* 01208 80916C18 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 0120C 80916C1C 34018000 */ ori $at, $zero, 0x8000 ## $at = 00008000 -/* 01210 80916C20 00415021 */ addu $t2, $v0, $at +/* 01210 80916C20 00415021 */ addu $t2, $v0, $at /* 01214 80916C24 3C0142B4 */ lui $at, 0x42B4 ## $at = 42B40000 /* 01218 80916C28 44814000 */ mtc1 $at, $f8 ## $f8 = 90.00 /* 0121C 80916C2C 3C01432A */ lui $at, 0x432A ## $at = 432A0000 @@ -87,13 +87,13 @@ glabel func_80916AEC /* 01224 80916C34 A60A0032 */ sh $t2, 0x0032($s0) ## 00000032 /* 01228 80916C38 E6080290 */ swc1 $f8, 0x0290($s0) ## 00000290 /* 0122C 80916C3C E60A0298 */ swc1 $f10, 0x0298($s0) ## 00000298 -/* 01230 80916C40 8FAB0038 */ lw $t3, 0x0038($sp) +/* 01230 80916C40 8FAB0038 */ lw $t3, 0x0038($sp) /* 01234 80916C44 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 /* 01238 80916C48 44819000 */ mtc1 $at, $f18 ## $f18 = 20.00 /* 0123C 80916C4C C5700060 */ lwc1 $f16, 0x0060($t3) ## 00000060 /* 01240 80916C50 C6060024 */ lwc1 $f6, 0x0024($s0) ## 00000024 /* 01244 80916C54 C6080028 */ lwc1 $f8, 0x0028($s0) ## 00000028 -/* 01248 80916C58 46128100 */ add.s $f4, $f16, $f18 +/* 01248 80916C58 46128100 */ add.s $f4, $f16, $f18 /* 0124C 80916C5C C60A002C */ lwc1 $f10, 0x002C($s0) ## 0000002C /* 01250 80916C60 240C0032 */ addiu $t4, $zero, 0x0032 ## $t4 = 00000032 /* 01254 80916C64 3C041001 */ lui $a0, 0x1001 ## $a0 = 10010000 @@ -103,13 +103,13 @@ glabel func_80916AEC /* 01264 80916C74 E606029C */ swc1 $f6, 0x029C($s0) ## 0000029C /* 01268 80916C78 E60802A0 */ swc1 $f8, 0x02A0($s0) ## 000002A0 /* 0126C 80916C7C 0C03E803 */ jal Audio_SetBGM - + /* 01270 80916C80 E60A02A4 */ swc1 $f10, 0x02A4($s0) ## 000002A4 -/* 01274 80916C84 8FBF0034 */ lw $ra, 0x0034($sp) -/* 01278 80916C88 8FB00028 */ lw $s0, 0x0028($sp) -/* 0127C 80916C8C 8FB1002C */ lw $s1, 0x002C($sp) -/* 01280 80916C90 8FB20030 */ lw $s2, 0x0030($sp) -/* 01284 80916C94 03E00008 */ jr $ra +/* 01274 80916C84 8FBF0034 */ lw $ra, 0x0034($sp) +/* 01278 80916C88 8FB00028 */ lw $s0, 0x0028($sp) +/* 0127C 80916C8C 8FB1002C */ lw $s1, 0x002C($sp) +/* 01280 80916C90 8FB20030 */ lw $s2, 0x0030($sp) +/* 01284 80916C94 03E00008 */ jr $ra /* 01288 80916C98 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_80916C9C.s b/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_80916C9C.s index ca0c53e700..2e8214e308 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_80916C9C.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_80916C9C.s @@ -1,129 +1,129 @@ glabel func_80916C9C /* 0128C 80916C9C 27BDFF98 */ addiu $sp, $sp, 0xFF98 ## $sp = FFFFFF98 -/* 01290 80916CA0 AFB00038 */ sw $s0, 0x0038($sp) -/* 01294 80916CA4 AFBF003C */ sw $ra, 0x003C($sp) -/* 01298 80916CA8 AFA5006C */ sw $a1, 0x006C($sp) +/* 01290 80916CA0 AFB00038 */ sw $s0, 0x0038($sp) +/* 01294 80916CA4 AFBF003C */ sw $ra, 0x003C($sp) +/* 01298 80916CA8 AFA5006C */ sw $a1, 0x006C($sp) /* 0129C 80916CAC 8CAF1C44 */ lw $t7, 0x1C44($a1) ## 00001C44 /* 012A0 80916CB0 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 012A4 80916CB4 24840068 */ addiu $a0, $a0, 0x0068 ## $a0 = 00000068 -/* 012A8 80916CB8 AFA40048 */ sw $a0, 0x0048($sp) +/* 012A8 80916CB8 AFA40048 */ sw $a0, 0x0048($sp) /* 012AC 80916CBC 3C053F00 */ lui $a1, 0x3F00 ## $a1 = 3F000000 /* 012B0 80916CC0 3C064000 */ lui $a2, 0x4000 ## $a2 = 40000000 /* 012B4 80916CC4 0C01E123 */ jal Math_SmoothDownscaleMaxF - -/* 012B8 80916CC8 AFAF0060 */ sw $t7, 0x0060($sp) + +/* 012B8 80916CC8 AFAF0060 */ sw $t7, 0x0060($sp) /* 012BC 80916CCC 860201D0 */ lh $v0, 0x01D0($s0) ## 000001D0 -/* 012C0 80916CD0 28410083 */ slti $at, $v0, 0x0083 -/* 012C4 80916CD4 14200008 */ bne $at, $zero, .L80916CF8 -/* 012C8 80916CD8 0002C080 */ sll $t8, $v0, 2 +/* 012C0 80916CD0 28410083 */ slti $at, $v0, 0x0083 +/* 012C4 80916CD4 14200008 */ bne $at, $zero, .L80916CF8 +/* 012C8 80916CD8 0002C080 */ sll $t8, $v0, 2 /* 012CC 80916CDC 2401008C */ addiu $at, $zero, 0x008C ## $at = 0000008C -/* 012D0 80916CE0 104103B9 */ beq $v0, $at, .L80917BC8 +/* 012D0 80916CE0 104103B9 */ beq $v0, $at, .L80917BC8 /* 012D4 80916CE4 24010096 */ addiu $at, $zero, 0x0096 ## $at = 00000096 -/* 012D8 80916CE8 104103CB */ beq $v0, $at, .L80917C18 +/* 012D8 80916CE8 104103CB */ beq $v0, $at, .L80917C18 /* 012DC 80916CEC 00000000 */ nop -/* 012E0 80916CF0 1000041E */ beq $zero, $zero, .L80917D6C +/* 012E0 80916CF0 1000041E */ beq $zero, $zero, .L80917D6C /* 012E4 80916CF4 860501BC */ lh $a1, 0x01BC($s0) ## 000001BC .L80916CF8: -/* 012E8 80916CF8 2841000A */ slti $at, $v0, 0x000A -/* 012EC 80916CFC 14200005 */ bne $at, $zero, .L80916D14 +/* 012E8 80916CF8 2841000A */ slti $at, $v0, 0x000A +/* 012EC 80916CFC 14200005 */ bne $at, $zero, .L80916D14 /* 012F0 80916D00 24010082 */ addiu $at, $zero, 0x0082 ## $at = 00000082 -/* 012F4 80916D04 50410305 */ beql $v0, $at, .L8091791C +/* 012F4 80916D04 50410305 */ beql $v0, $at, .L8091791C /* 012F8 80916D08 3C014100 */ lui $at, 0x4100 ## $at = 41000000 -/* 012FC 80916D0C 10000417 */ beq $zero, $zero, .L80917D6C +/* 012FC 80916D0C 10000417 */ beq $zero, $zero, .L80917D6C /* 01300 80916D10 860501BC */ lh $a1, 0x01BC($s0) ## 000001BC .L80916D14: -/* 01304 80916D14 2C41000A */ sltiu $at, $v0, 0x000A -/* 01308 80916D18 10200413 */ beq $at, $zero, .L80917D68 +/* 01304 80916D14 2C41000A */ sltiu $at, $v0, 0x000A +/* 01308 80916D18 10200413 */ beq $at, $zero, .L80917D68 /* 0130C 80916D1C 3C018092 */ lui $at, %hi(jtbl_8091B4DC) ## $at = 80920000 -/* 01310 80916D20 00380821 */ addu $at, $at, $t8 -/* 01314 80916D24 8C38B4DC */ lw $t8, %lo(jtbl_8091B4DC)($at) -/* 01318 80916D28 03000008 */ jr $t8 +/* 01310 80916D20 00380821 */ addu $at, $at, $t8 +/* 01314 80916D24 8C38B4DC */ lw $t8, %lo(jtbl_8091B4DC)($at) +/* 01318 80916D28 03000008 */ jr $t8 /* 0131C 80916D2C 00000000 */ nop glabel L80916D30 -/* 01320 80916D30 8FA20060 */ lw $v0, 0x0060($sp) +/* 01320 80916D30 8FA20060 */ lw $v0, 0x0060($sp) /* 01324 80916D34 3C014270 */ lui $at, 0x4270 ## $at = 42700000 /* 01328 80916D38 44811000 */ mtc1 $at, $f2 ## $f2 = 60.00 /* 0132C 80916D3C 3C014316 */ lui $at, 0x4316 ## $at = 43160000 /* 01330 80916D40 44813000 */ mtc1 $at, $f6 ## $f6 = 150.00 /* 01334 80916D44 C4440024 */ lwc1 $f4, 0x0024($v0) ## 00000024 /* 01338 80916D48 3C0143AF */ lui $at, 0x43AF ## $at = 43AF0000 -/* 0133C 80916D4C 46062001 */ sub.s $f0, $f4, $f6 -/* 01340 80916D50 46000005 */ abs.s $f0, $f0 -/* 01344 80916D54 4602003C */ c.lt.s $f0, $f2 +/* 0133C 80916D4C 46062001 */ sub.s $f0, $f4, $f6 +/* 01340 80916D50 46000005 */ abs.s $f0, $f0 +/* 01344 80916D54 4602003C */ c.lt.s $f0, $f2 /* 01348 80916D58 00000000 */ nop -/* 0134C 80916D5C 45020403 */ bc1fl .L80917D6C +/* 0134C 80916D5C 45020403 */ bc1fl .L80917D6C /* 01350 80916D60 860501BC */ lh $a1, 0x01BC($s0) ## 000001BC /* 01354 80916D64 C448002C */ lwc1 $f8, 0x002C($v0) ## 0000002C /* 01358 80916D68 44815000 */ mtc1 $at, $f10 ## $f10 = 350.00 /* 0135C 80916D6C 3C198016 */ lui $t9, 0x8016 ## $t9 = 80160000 -/* 01360 80916D70 460A4001 */ sub.s $f0, $f8, $f10 -/* 01364 80916D74 46000005 */ abs.s $f0, $f0 -/* 01368 80916D78 4602003C */ c.lt.s $f0, $f2 +/* 01360 80916D70 460A4001 */ sub.s $f0, $f8, $f10 +/* 01364 80916D74 46000005 */ abs.s $f0, $f0 +/* 01368 80916D78 4602003C */ c.lt.s $f0, $f2 /* 0136C 80916D7C 00000000 */ nop -/* 01370 80916D80 450203FA */ bc1fl .L80917D6C +/* 01370 80916D80 450203FA */ bc1fl .L80917D6C /* 01374 80916D84 860501BC */ lh $a1, 0x01BC($s0) ## 000001BC /* 01378 80916D88 9739F542 */ lhu $t9, -0x0ABE($t9) ## 8015F542 -/* 0137C 80916D8C 8FA4006C */ lw $a0, 0x006C($sp) +/* 0137C 80916D8C 8FA4006C */ lw $a0, 0x006C($sp) /* 01380 80916D90 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 01384 80916D94 33280001 */ andi $t0, $t9, 0x0001 ## $t0 = 00000000 -/* 01388 80916D98 1100001A */ beq $t0, $zero, .L80916E04 +/* 01388 80916D98 1100001A */ beq $t0, $zero, .L80916E04 /* 0138C 80916D9C 00000000 */ nop /* 01390 80916DA0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01394 80916DA4 0C245ABB */ jal func_80916AEC -/* 01398 80916DA8 8FA5006C */ lw $a1, 0x006C($sp) +/* 01394 80916DA4 0C245ABB */ jal func_80916AEC +/* 01398 80916DA8 8FA5006C */ lw $a1, 0x006C($sp) /* 0139C 80916DAC 3C018092 */ lui $at, %hi(D_8091B504) ## $at = 80920000 -/* 013A0 80916DB0 C430B504 */ lwc1 $f16, %lo(D_8091B504)($at) +/* 013A0 80916DB0 C430B504 */ lwc1 $f16, %lo(D_8091B504)($at) /* 013A4 80916DB4 3C01C3F0 */ lui $at, 0xC3F0 ## $at = C3F00000 /* 013A8 80916DB8 44819000 */ mtc1 $at, $f18 ## $f18 = -480.00 /* 013AC 80916DBC 3C018092 */ lui $at, %hi(D_8091B508) ## $at = 80920000 -/* 013B0 80916DC0 8FA6006C */ lw $a2, 0x006C($sp) -/* 013B4 80916DC4 C424B508 */ lwc1 $f4, %lo(D_8091B508)($at) +/* 013B0 80916DC0 8FA6006C */ lw $a2, 0x006C($sp) +/* 013B4 80916DC4 C424B508 */ lwc1 $f4, %lo(D_8091B508)($at) /* 013B8 80916DC8 24098FA4 */ addiu $t1, $zero, 0x8FA4 ## $t1 = FFFF8FA4 /* 013BC 80916DCC 240A0180 */ addiu $t2, $zero, 0x0180 ## $t2 = 00000180 -/* 013C0 80916DD0 AFAA0028 */ sw $t2, 0x0028($sp) -/* 013C4 80916DD4 AFA90020 */ sw $t1, 0x0020($sp) +/* 013C0 80916DD0 AFAA0028 */ sw $t2, 0x0028($sp) +/* 013C4 80916DD4 AFA90020 */ sw $t1, 0x0020($sp) /* 013C8 80916DD8 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 013CC 80916DDC 2407002E */ addiu $a3, $zero, 0x002E ## $a3 = 0000002E -/* 013D0 80916DE0 AFA0001C */ sw $zero, 0x001C($sp) -/* 013D4 80916DE4 AFA00024 */ sw $zero, 0x0024($sp) -/* 013D8 80916DE8 E7B00010 */ swc1 $f16, 0x0010($sp) -/* 013DC 80916DEC E7B20014 */ swc1 $f18, 0x0014($sp) +/* 013D0 80916DE0 AFA0001C */ sw $zero, 0x001C($sp) +/* 013D4 80916DE4 AFA00024 */ sw $zero, 0x0024($sp) +/* 013D8 80916DE8 E7B00010 */ swc1 $f16, 0x0010($sp) +/* 013DC 80916DEC E7B20014 */ swc1 $f18, 0x0014($sp) /* 013E0 80916DF0 24C41C24 */ addiu $a0, $a2, 0x1C24 ## $a0 = 00001C24 /* 013E4 80916DF4 0C00C916 */ jal Actor_SpawnAttached - -/* 013E8 80916DF8 E7A40018 */ swc1 $f4, 0x0018($sp) -/* 013EC 80916DFC 100003DB */ beq $zero, $zero, .L80917D6C + +/* 013E8 80916DF8 E7A40018 */ swc1 $f4, 0x0018($sp) +/* 013EC 80916DFC 100003DB */ beq $zero, $zero, .L80917D6C /* 013F0 80916E00 860501BC */ lh $a1, 0x01BC($s0) ## 000001BC .L80916E04: -/* 013F4 80916E04 0C00B7D5 */ jal func_8002DF54 +/* 013F4 80916E04 0C00B7D5 */ jal func_8002DF54 /* 013F8 80916E08 24060008 */ addiu $a2, $zero, 0x0008 ## $a2 = 00000008 /* 013FC 80916E0C 240B0001 */ addiu $t3, $zero, 0x0001 ## $t3 = 00000001 -/* 01400 80916E10 100003D5 */ beq $zero, $zero, .L80917D68 +/* 01400 80916E10 100003D5 */ beq $zero, $zero, .L80917D68 /* 01404 80916E14 A60B01D0 */ sh $t3, 0x01D0($s0) ## 000001D0 glabel L80916E18 -/* 01408 80916E18 8FA4006C */ lw $a0, 0x006C($sp) -/* 0140C 80916E1C 0C019148 */ jal func_80064520 +/* 01408 80916E18 8FA4006C */ lw $a0, 0x006C($sp) +/* 0140C 80916E1C 0C019148 */ jal func_80064520 /* 01410 80916E20 24851D64 */ addiu $a1, $a0, 0x1D64 ## $a1 = 00001D64 -/* 01414 80916E24 0C03008C */ jal func_800C0230 -/* 01418 80916E28 8FA4006C */ lw $a0, 0x006C($sp) +/* 01414 80916E24 0C03008C */ jal func_800C0230 +/* 01418 80916E28 8FA4006C */ lw $a0, 0x006C($sp) /* 0141C 80916E2C 3C048092 */ lui $a0, %hi(D_8091B430) ## $a0 = 80920000 /* 01420 80916E30 A60201BC */ sh $v0, 0x01BC($s0) ## 000001BC /* 01424 80916E34 0C00084C */ jal osSyncPrintf - + /* 01428 80916E38 2484B430 */ addiu $a0, $a0, %lo(D_8091B430) ## $a0 = 8091B430 -/* 0142C 80916E3C 8FA4006C */ lw $a0, 0x006C($sp) +/* 0142C 80916E3C 8FA4006C */ lw $a0, 0x006C($sp) /* 01430 80916E40 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 01434 80916E44 0C0300C5 */ jal func_800C0314 +/* 01434 80916E44 0C0300C5 */ jal func_800C0314 /* 01438 80916E48 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 -/* 0143C 80916E4C 8FA4006C */ lw $a0, 0x006C($sp) +/* 0143C 80916E4C 8FA4006C */ lw $a0, 0x006C($sp) /* 01440 80916E50 860501BC */ lh $a1, 0x01BC($s0) ## 000001BC -/* 01444 80916E54 0C0300C5 */ jal func_800C0314 +/* 01444 80916E54 0C0300C5 */ jal func_800C0314 /* 01448 80916E58 24060007 */ addiu $a2, $zero, 0x0007 ## $a2 = 00000007 /* 0144C 80916E5C 3C01C3AF */ lui $at, 0xC3AF ## $at = C3AF0000 /* 01450 80916E60 44810000 */ mtc1 $at, $f0 ## $f0 = -350.00 /* 01454 80916E64 3C01C316 */ lui $at, 0xC316 ## $at = C3160000 /* 01458 80916E68 44813000 */ mtc1 $at, $f6 ## $f6 = -150.00 -/* 0145C 80916E6C 8FA30060 */ lw $v1, 0x0060($sp) +/* 0145C 80916E6C 8FA30060 */ lw $v1, 0x0060($sp) /* 01460 80916E70 3C01C3A0 */ lui $at, 0xC3A0 ## $at = C3A00000 /* 01464 80916E74 44814000 */ mtc1 $at, $f8 ## $f8 = -320.00 /* 01468 80916E78 3C014316 */ lui $at, 0x4316 ## $at = 43160000 @@ -149,13 +149,13 @@ glabel L80916E18 /* 014B8 80916EC8 C4660028 */ lwc1 $f6, 0x0028($v1) ## 00000028 /* 014BC 80916ECC 3C0141C8 */ lui $at, 0x41C8 ## $at = 41C80000 /* 014C0 80916ED0 44818000 */ mtc1 $at, $f16 ## $f16 = 25.00 -/* 014C4 80916ED4 46083281 */ sub.s $f10, $f6, $f8 +/* 014C4 80916ED4 46083281 */ sub.s $f10, $f6, $f8 /* 014C8 80916ED8 8E180004 */ lw $t8, 0x0004($s0) ## 00000004 /* 014CC 80916EDC 2401FFFE */ addiu $at, $zero, 0xFFFE ## $at = FFFFFFFE /* 014D0 80916EE0 240E0032 */ addiu $t6, $zero, 0x0032 ## $t6 = 00000032 -/* 014D4 80916EE4 46105480 */ add.s $f18, $f10, $f16 +/* 014D4 80916EE4 46105480 */ add.s $f18, $f10, $f16 /* 014D8 80916EE8 240F0050 */ addiu $t7, $zero, 0x0050 ## $t7 = 00000050 -/* 014DC 80916EEC 0301C824 */ and $t9, $t8, $at +/* 014DC 80916EEC 0301C824 */ and $t9, $t8, $at /* 014E0 80916EF0 E61202A0 */ swc1 $f18, 0x02A0($s0) ## 000002A0 /* 014E4 80916EF4 C464002C */ lwc1 $f4, 0x002C($v1) ## 0000002C /* 014E8 80916EF8 A60E01D2 */ sh $t6, 0x01D2($s0) ## 000001D2 @@ -164,7 +164,7 @@ glabel L80916E18 /* 014F4 80916F04 AE190004 */ sw $t9, 0x0004($s0) ## 00000004 /* 014F8 80916F08 E60402A4 */ swc1 $f4, 0x02A4($s0) ## 000002A4 glabel L80916F0C -/* 014FC 80916F0C 8FA20060 */ lw $v0, 0x0060($sp) +/* 014FC 80916F0C 8FA20060 */ lw $v0, 0x0060($sp) /* 01500 80916F10 3C014316 */ lui $at, 0x4316 ## $at = 43160000 /* 01504 80916F14 44813000 */ mtc1 $at, $f6 ## $f6 = 150.00 /* 01508 80916F18 24088FA4 */ addiu $t0, $zero, 0x8FA4 ## $t0 = FFFF8FA4 @@ -179,7 +179,7 @@ glabel L80916F0C /* 0152C 80916F3C E44A0068 */ swc1 $f10, 0x0068($v0) ## 00000068 /* 01530 80916F40 860A01D2 */ lh $t2, 0x01D2($s0) ## 000001D2 /* 01534 80916F44 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 -/* 01538 80916F48 5540004F */ bnel $t2, $zero, .L80917088 +/* 01538 80916F48 5540004F */ bnel $t2, $zero, .L80917088 /* 0153C 80916F4C 2606029C */ addiu $a2, $s0, 0x029C ## $a2 = 0000029C /* 01540 80916F50 44819000 */ mtc1 $at, $f18 ## $f18 = 20.00 /* 01544 80916F54 3C014248 */ lui $at, 0x4248 ## $at = 42480000 @@ -187,48 +187,48 @@ glabel L80916F0C /* 0154C 80916F5C C6060220 */ lwc1 $f6, 0x0220($s0) ## 00000220 /* 01550 80916F60 C4500024 */ lwc1 $f16, 0x0024($v0) ## 00000024 /* 01554 80916F64 3C063D4C */ lui $a2, 0x3D4C ## $a2 = 3D4C0000 -/* 01558 80916F68 46083282 */ mul.s $f10, $f6, $f8 -/* 0155C 80916F6C 46128101 */ sub.s $f4, $f16, $f18 +/* 01558 80916F68 46083282 */ mul.s $f10, $f6, $f8 +/* 0155C 80916F6C 46128101 */ sub.s $f4, $f16, $f18 /* 01560 80916F70 34C6CCCC */ ori $a2, $a2, 0xCCCC ## $a2 = 3D4CCCCC /* 01564 80916F74 26040290 */ addiu $a0, $s0, 0x0290 ## $a0 = 00000290 -/* 01568 80916F78 44052000 */ mfc1 $a1, $f4 -/* 0156C 80916F7C 44075000 */ mfc1 $a3, $f10 +/* 01568 80916F78 44052000 */ mfc1 $a1, $f4 +/* 0156C 80916F7C 44075000 */ mfc1 $a3, $f10 /* 01570 80916F80 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 01574 80916F84 00000000 */ nop /* 01578 80916F88 3C0141C8 */ lui $at, 0x41C8 ## $at = 41C80000 /* 0157C 80916F8C 44819000 */ mtc1 $at, $f18 ## $f18 = 25.00 /* 01580 80916F90 3C014302 */ lui $at, 0x4302 ## $at = 43020000 /* 01584 80916F94 44814000 */ mtc1 $at, $f8 ## $f8 = 130.00 -/* 01588 80916F98 8FAB0060 */ lw $t3, 0x0060($sp) +/* 01588 80916F98 8FAB0060 */ lw $t3, 0x0060($sp) /* 0158C 80916F9C C6060220 */ lwc1 $f6, 0x0220($s0) ## 00000220 /* 01590 80916FA0 3C063DCC */ lui $a2, 0x3DCC ## $a2 = 3DCC0000 /* 01594 80916FA4 C5700028 */ lwc1 $f16, 0x0028($t3) ## 00000028 -/* 01598 80916FA8 46083282 */ mul.s $f10, $f6, $f8 +/* 01598 80916FA8 46083282 */ mul.s $f10, $f6, $f8 /* 0159C 80916FAC 34C6CCCC */ ori $a2, $a2, 0xCCCC ## $a2 = 3DCCCCCC -/* 015A0 80916FB0 46128100 */ add.s $f4, $f16, $f18 +/* 015A0 80916FB0 46128100 */ add.s $f4, $f16, $f18 /* 015A4 80916FB4 26040294 */ addiu $a0, $s0, 0x0294 ## $a0 = 00000294 -/* 015A8 80916FB8 44052000 */ mfc1 $a1, $f4 -/* 015AC 80916FBC 44075000 */ mfc1 $a3, $f10 +/* 015A8 80916FB8 44052000 */ mfc1 $a1, $f4 +/* 015AC 80916FBC 44075000 */ mfc1 $a3, $f10 /* 015B0 80916FC0 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 015B4 80916FC4 00000000 */ nop /* 015B8 80916FC8 3C014282 */ lui $at, 0x4282 ## $at = 42820000 /* 015BC 80916FCC 44819000 */ mtc1 $at, $f18 ## $f18 = 65.00 /* 015C0 80916FD0 3C0141F0 */ lui $at, 0x41F0 ## $at = 41F00000 /* 015C4 80916FD4 44814000 */ mtc1 $at, $f8 ## $f8 = 30.00 -/* 015C8 80916FD8 8FAC0060 */ lw $t4, 0x0060($sp) +/* 015C8 80916FD8 8FAC0060 */ lw $t4, 0x0060($sp) /* 015CC 80916FDC C6060220 */ lwc1 $f6, 0x0220($s0) ## 00000220 /* 015D0 80916FE0 3C063D4C */ lui $a2, 0x3D4C ## $a2 = 3D4C0000 /* 015D4 80916FE4 C590002C */ lwc1 $f16, 0x002C($t4) ## 0000002C -/* 015D8 80916FE8 46083282 */ mul.s $f10, $f6, $f8 +/* 015D8 80916FE8 46083282 */ mul.s $f10, $f6, $f8 /* 015DC 80916FEC 34C6CCCC */ ori $a2, $a2, 0xCCCC ## $a2 = 3D4CCCCC -/* 015E0 80916FF0 46128101 */ sub.s $f4, $f16, $f18 +/* 015E0 80916FF0 46128101 */ sub.s $f4, $f16, $f18 /* 015E4 80916FF4 26040298 */ addiu $a0, $s0, 0x0298 ## $a0 = 00000298 -/* 015E8 80916FF8 44052000 */ mfc1 $a1, $f4 -/* 015EC 80916FFC 44075000 */ mfc1 $a3, $f10 +/* 015E8 80916FF8 44052000 */ mfc1 $a1, $f4 +/* 015EC 80916FFC 44075000 */ mfc1 $a3, $f10 /* 015F0 80917000 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 015F4 80917004 00000000 */ nop /* 015F8 80917008 3C053E99 */ lui $a1, 0x3E99 ## $a1 = 3E990000 /* 015FC 8091700C 3C073BA3 */ lui $a3, 0x3BA3 ## $a3 = 3BA30000 @@ -236,29 +236,29 @@ glabel L80916F0C /* 01604 80917014 34A59999 */ ori $a1, $a1, 0x9999 ## $a1 = 3E999999 /* 01608 80917018 26040220 */ addiu $a0, $s0, 0x0220 ## $a0 = 00000220 /* 0160C 8091701C 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 01610 80917020 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 01614 80917024 860D01D4 */ lh $t5, 0x01D4($s0) ## 000001D4 -/* 01618 80917028 8FAE0060 */ lw $t6, 0x0060($sp) +/* 01618 80917028 8FAE0060 */ lw $t6, 0x0060($sp) /* 0161C 8091702C 3C01420C */ lui $at, 0x420C ## $at = 420C0000 -/* 01620 80917030 55A00010 */ bnel $t5, $zero, .L80917074 -/* 01624 80917034 8FA20060 */ lw $v0, 0x0060($sp) +/* 01620 80917030 55A00010 */ bnel $t5, $zero, .L80917074 +/* 01624 80917034 8FA20060 */ lw $v0, 0x0060($sp) /* 01628 80917038 44819000 */ mtc1 $at, $f18 ## $f18 = 35.00 /* 0162C 8091703C 3C0141F0 */ lui $at, 0x41F0 ## $at = 41F00000 /* 01630 80917040 44814000 */ mtc1 $at, $f8 ## $f8 = 30.00 /* 01634 80917044 C6060220 */ lwc1 $f6, 0x0220($s0) ## 00000220 /* 01638 80917048 C5D00028 */ lwc1 $f16, 0x0028($t6) ## 00000028 /* 0163C 8091704C 3C063DCC */ lui $a2, 0x3DCC ## $a2 = 3DCC0000 -/* 01640 80917050 46083282 */ mul.s $f10, $f6, $f8 -/* 01644 80917054 46128100 */ add.s $f4, $f16, $f18 +/* 01640 80917050 46083282 */ mul.s $f10, $f6, $f8 +/* 01644 80917054 46128100 */ add.s $f4, $f16, $f18 /* 01648 80917058 34C6CCCC */ ori $a2, $a2, 0xCCCC ## $a2 = 3DCCCCCC /* 0164C 8091705C 260402A0 */ addiu $a0, $s0, 0x02A0 ## $a0 = 000002A0 -/* 01650 80917060 44052000 */ mfc1 $a1, $f4 -/* 01654 80917064 44075000 */ mfc1 $a3, $f10 +/* 01650 80917060 44052000 */ mfc1 $a1, $f4 +/* 01654 80917064 44075000 */ mfc1 $a3, $f10 /* 01658 80917068 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 0165C 8091706C 00000000 */ nop -/* 01660 80917070 8FA20060 */ lw $v0, 0x0060($sp) +/* 01660 80917070 8FA20060 */ lw $v0, 0x0060($sp) .L80917074: /* 01664 80917074 C4500024 */ lwc1 $f16, 0x0024($v0) ## 00000024 /* 01668 80917078 E610029C */ swc1 $f16, 0x029C($s0) ## 0000029C @@ -267,67 +267,67 @@ glabel L80916F0C /* 01674 80917084 2606029C */ addiu $a2, $s0, 0x029C ## $a2 = 0000029C .L80917088: /* 01678 80917088 26070290 */ addiu $a3, $s0, 0x0290 ## $a3 = 00000290 -/* 0167C 8091708C AFA70044 */ sw $a3, 0x0044($sp) -/* 01680 80917090 AFA60040 */ sw $a2, 0x0040($sp) -/* 01684 80917094 8FA4006C */ lw $a0, 0x006C($sp) -/* 01688 80917098 0C030136 */ jal func_800C04D8 +/* 0167C 8091708C AFA70044 */ sw $a3, 0x0044($sp) +/* 01680 80917090 AFA60040 */ sw $a2, 0x0040($sp) +/* 01684 80917094 8FA4006C */ lw $a0, 0x006C($sp) +/* 01688 80917098 0C030136 */ jal func_800C04D8 /* 0168C 8091709C 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 01690 809170A0 86030194 */ lh $v1, 0x0194($s0) ## 00000194 -/* 01694 809170A4 8FA6006C */ lw $a2, 0x006C($sp) +/* 01694 809170A4 8FA6006C */ lw $a2, 0x006C($sp) /* 01698 809170A8 240100B0 */ addiu $at, $zero, 0x00B0 ## $at = 000000B0 -/* 0169C 809170AC 14610014 */ bne $v1, $at, .L80917100 +/* 0169C 809170AC 14610014 */ bne $v1, $at, .L80917100 /* 016A0 809170B0 24C41C24 */ addiu $a0, $a2, 0x1C24 ## $a0 = 00001C24 /* 016A4 809170B4 3C018092 */ lui $at, %hi(D_8091B50C) ## $at = 80920000 -/* 016A8 809170B8 C424B50C */ lwc1 $f4, %lo(D_8091B50C)($at) +/* 016A8 809170B8 C424B50C */ lwc1 $f4, %lo(D_8091B50C)($at) /* 016AC 809170BC 3C01C3F0 */ lui $at, 0xC3F0 ## $at = C3F00000 /* 016B0 809170C0 44813000 */ mtc1 $at, $f6 ## $f6 = -480.00 /* 016B4 809170C4 3C018092 */ lui $at, %hi(D_8091B510) ## $at = 80920000 -/* 016B8 809170C8 C428B510 */ lwc1 $f8, %lo(D_8091B510)($at) +/* 016B8 809170C8 C428B510 */ lwc1 $f8, %lo(D_8091B510)($at) /* 016BC 809170CC 24188FA4 */ addiu $t8, $zero, 0x8FA4 ## $t8 = FFFF8FA4 /* 016C0 809170D0 24190180 */ addiu $t9, $zero, 0x0180 ## $t9 = 00000180 -/* 016C4 809170D4 AFB90028 */ sw $t9, 0x0028($sp) -/* 016C8 809170D8 AFB80020 */ sw $t8, 0x0020($sp) +/* 016C4 809170D4 AFB90028 */ sw $t9, 0x0028($sp) +/* 016C8 809170D8 AFB80020 */ sw $t8, 0x0020($sp) /* 016CC 809170DC 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 016D0 809170E0 2407002E */ addiu $a3, $zero, 0x002E ## $a3 = 0000002E -/* 016D4 809170E4 AFA0001C */ sw $zero, 0x001C($sp) -/* 016D8 809170E8 AFA00024 */ sw $zero, 0x0024($sp) -/* 016DC 809170EC E7A40010 */ swc1 $f4, 0x0010($sp) -/* 016E0 809170F0 E7A60014 */ swc1 $f6, 0x0014($sp) +/* 016D4 809170E4 AFA0001C */ sw $zero, 0x001C($sp) +/* 016D8 809170E8 AFA00024 */ sw $zero, 0x0024($sp) +/* 016DC 809170EC E7A40010 */ swc1 $f4, 0x0010($sp) +/* 016E0 809170F0 E7A60014 */ swc1 $f6, 0x0014($sp) /* 016E4 809170F4 0C00C916 */ jal Actor_SpawnAttached - -/* 016E8 809170F8 E7A80018 */ swc1 $f8, 0x0018($sp) + +/* 016E8 809170F8 E7A80018 */ swc1 $f8, 0x0018($sp) /* 016EC 809170FC 86030194 */ lh $v1, 0x0194($s0) ## 00000194 .L80917100: /* 016F0 80917100 240100B0 */ addiu $at, $zero, 0x00B0 ## $at = 000000B0 -/* 016F4 80917104 1461000B */ bne $v1, $at, .L80917134 -/* 016F8 80917108 8FA9006C */ lw $t1, 0x006C($sp) +/* 016F4 80917104 1461000B */ bne $v1, $at, .L80917134 +/* 016F8 80917108 8FA9006C */ lw $t1, 0x006C($sp) /* 016FC 8091710C 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 01700 80917110 00290821 */ addu $at, $at, $t1 +/* 01700 80917110 00290821 */ addu $at, $at, $t1 /* 01704 80917114 24080003 */ addiu $t0, $zero, 0x0003 ## $t0 = 00000003 /* 01708 80917118 A0280AE3 */ sb $t0, 0x0AE3($at) ## 00010AE3 -/* 0170C 8091711C 8FAB006C */ lw $t3, 0x006C($sp) +/* 0170C 8091711C 8FAB006C */ lw $t3, 0x006C($sp) /* 01710 80917120 3C010001 */ lui $at, 0x0001 ## $at = 00010000 /* 01714 80917124 340AFFFF */ ori $t2, $zero, 0xFFFF ## $t2 = 0000FFFF -/* 01718 80917128 002B0821 */ addu $at, $at, $t3 +/* 01718 80917128 002B0821 */ addu $at, $at, $t3 /* 0171C 8091712C A42A0AFA */ sh $t2, 0x0AFA($at) ## 00010AFA /* 01720 80917130 86030194 */ lh $v1, 0x0194($s0) ## 00000194 .L80917134: /* 01724 80917134 240100BE */ addiu $at, $zero, 0x00BE ## $at = 000000BE -/* 01728 80917138 14610005 */ bne $v1, $at, .L80917150 -/* 0172C 8091713C 8FA4006C */ lw $a0, 0x006C($sp) +/* 01728 80917138 14610005 */ bne $v1, $at, .L80917150 +/* 0172C 8091713C 8FA4006C */ lw $a0, 0x006C($sp) /* 01730 80917140 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 01734 80917144 0C00B7D5 */ jal func_8002DF54 +/* 01734 80917144 0C00B7D5 */ jal func_8002DF54 /* 01738 80917148 24060002 */ addiu $a2, $zero, 0x0002 ## $a2 = 00000002 /* 0173C 8091714C 86030194 */ lh $v1, 0x0194($s0) ## 00000194 .L80917150: -/* 01740 80917150 286100E4 */ slti $at, $v1, 0x00E4 -/* 01744 80917154 14200304 */ bne $at, $zero, .L80917D68 -/* 01748 80917158 8FA4006C */ lw $a0, 0x006C($sp) +/* 01740 80917150 286100E4 */ slti $at, $v1, 0x00E4 +/* 01744 80917154 14200304 */ bne $at, $zero, .L80917D68 +/* 01748 80917158 8FA4006C */ lw $a0, 0x006C($sp) /* 0174C 8091715C 248D1D64 */ addiu $t5, $a0, 0x1D64 ## $t5 = 00001D64 -/* 01750 80917160 AFAD0048 */ sw $t5, 0x0048($sp) -/* 01754 80917164 0C030129 */ jal func_800C04A4 +/* 01750 80917160 AFAD0048 */ sw $t5, 0x0048($sp) +/* 01754 80917164 0C030129 */ jal func_800C04A4 /* 01758 80917168 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 0175C 8091716C 8FAE0044 */ lw $t6, 0x0044($sp) +/* 0175C 8091716C 8FAE0044 */ lw $t6, 0x0044($sp) /* 01760 80917170 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 /* 01764 80917174 8DD80000 */ lw $t8, 0x0000($t6) ## 00000000 /* 01768 80917178 AC58005C */ sw $t8, 0x005C($v0) ## 0000005C @@ -335,14 +335,14 @@ glabel L80916F0C /* 01770 80917180 AC4F0060 */ sw $t7, 0x0060($v0) ## 00000060 /* 01774 80917184 8DD80008 */ lw $t8, 0x0008($t6) ## 00000008 /* 01778 80917188 AC580064 */ sw $t8, 0x0064($v0) ## 00000064 -/* 0177C 8091718C 8FB90044 */ lw $t9, 0x0044($sp) +/* 0177C 8091718C 8FB90044 */ lw $t9, 0x0044($sp) /* 01780 80917190 8F290000 */ lw $t1, 0x0000($t9) ## 00000000 /* 01784 80917194 AC490074 */ sw $t1, 0x0074($v0) ## 00000074 /* 01788 80917198 8F280004 */ lw $t0, 0x0004($t9) ## 00000004 /* 0178C 8091719C AC480078 */ sw $t0, 0x0078($v0) ## 00000078 /* 01790 809171A0 8F290008 */ lw $t1, 0x0008($t9) ## 00000008 /* 01794 809171A4 AC49007C */ sw $t1, 0x007C($v0) ## 0000007C -/* 01798 809171A8 8FAA0040 */ lw $t2, 0x0040($sp) +/* 01798 809171A8 8FAA0040 */ lw $t2, 0x0040($sp) /* 0179C 809171AC 8D4C0000 */ lw $t4, 0x0000($t2) ## 00000000 /* 017A0 809171B0 AC4C0050 */ sw $t4, 0x0050($v0) ## 00000050 /* 017A4 809171B4 8D4B0004 */ lw $t3, 0x0004($t2) ## 00000004 @@ -350,52 +350,52 @@ glabel L80916F0C /* 017AC 809171BC 8D4C0008 */ lw $t4, 0x0008($t2) ## 00000008 /* 017B0 809171C0 AC4C0058 */ sw $t4, 0x0058($v0) ## 00000058 /* 017B4 809171C4 860501BC */ lh $a1, 0x01BC($s0) ## 000001BC -/* 017B8 809171C8 0C03022B */ jal func_800C08AC -/* 017BC 809171CC 8FA4006C */ lw $a0, 0x006C($sp) +/* 017B8 809171C8 0C03022B */ jal func_800C08AC +/* 017BC 809171CC 8FA4006C */ lw $a0, 0x006C($sp) /* 017C0 809171D0 A60001BC */ sh $zero, 0x01BC($s0) ## 000001BC -/* 017C4 809171D4 8FA50048 */ lw $a1, 0x0048($sp) -/* 017C8 809171D8 0C01914D */ jal func_80064534 -/* 017CC 809171DC 8FA4006C */ lw $a0, 0x006C($sp) -/* 017D0 809171E0 8FA4006C */ lw $a0, 0x006C($sp) +/* 017C4 809171D4 8FA50048 */ lw $a1, 0x0048($sp) +/* 017C8 809171D8 0C01914D */ jal func_80064534 +/* 017CC 809171DC 8FA4006C */ lw $a0, 0x006C($sp) +/* 017D0 809171E0 8FA4006C */ lw $a0, 0x006C($sp) /* 017D4 809171E4 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 017D8 809171E8 0C00B7D5 */ jal func_8002DF54 +/* 017D8 809171E8 0C00B7D5 */ jal func_8002DF54 /* 017DC 809171EC 24060007 */ addiu $a2, $zero, 0x0007 ## $a2 = 00000007 /* 017E0 809171F0 240D0003 */ addiu $t5, $zero, 0x0003 ## $t5 = 00000003 -/* 017E4 809171F4 100002DC */ beq $zero, $zero, .L80917D68 +/* 017E4 809171F4 100002DC */ beq $zero, $zero, .L80917D68 /* 017E8 809171F8 A60D01D0 */ sh $t5, 0x01D0($s0) ## 000001D0 glabel L809171FC /* 017EC 809171FC C60000E4 */ lwc1 $f0, 0x00E4($s0) ## 000000E4 /* 017F0 80917200 3C014316 */ lui $at, 0x4316 ## $at = 43160000 /* 017F4 80917204 44815000 */ mtc1 $at, $f10 ## $f10 = 150.00 -/* 017F8 80917208 46000005 */ abs.s $f0, $f0 +/* 017F8 80917208 46000005 */ abs.s $f0, $f0 /* 017FC 8091720C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01800 80917210 460A003C */ c.lt.s $f0, $f10 +/* 01800 80917210 460A003C */ c.lt.s $f0, $f10 /* 01804 80917214 24060000 */ addiu $a2, $zero, 0x0000 ## $a2 = 00000000 /* 01808 80917218 3C07C0A0 */ lui $a3, 0xC0A0 ## $a3 = C0A00000 /* 0180C 8091721C 24190001 */ addiu $t9, $zero, 0x0001 ## $t9 = 00000001 -/* 01810 80917220 45020031 */ bc1fl .L809172E8 +/* 01810 80917220 45020031 */ bc1fl .L809172E8 /* 01814 80917224 A60001C6 */ sh $zero, 0x01C6($s0) ## 000001C6 /* 01818 80917228 C60000E8 */ lwc1 $f0, 0x00E8($s0) ## 000000E8 /* 0181C 8091722C 3C01437A */ lui $at, 0x437A ## $at = 437A0000 /* 01820 80917230 44818000 */ mtc1 $at, $f16 ## $f16 = 250.00 -/* 01824 80917234 46000005 */ abs.s $f0, $f0 +/* 01824 80917234 46000005 */ abs.s $f0, $f0 /* 01828 80917238 3C014448 */ lui $at, 0x4448 ## $at = 44480000 -/* 0182C 8091723C 4610003C */ c.lt.s $f0, $f16 +/* 0182C 8091723C 4610003C */ c.lt.s $f0, $f16 /* 01830 80917240 00000000 */ nop -/* 01834 80917244 45020028 */ bc1fl .L809172E8 +/* 01834 80917244 45020028 */ bc1fl .L809172E8 /* 01838 80917248 A60001C6 */ sh $zero, 0x01C6($s0) ## 000001C6 /* 0183C 8091724C C60000EC */ lwc1 $f0, 0x00EC($s0) ## 000000EC /* 01840 80917250 44819000 */ mtc1 $at, $f18 ## $f18 = 800.00 /* 01844 80917254 00000000 */ nop -/* 01848 80917258 4612003C */ c.lt.s $f0, $f18 +/* 01848 80917258 4612003C */ c.lt.s $f0, $f18 /* 0184C 8091725C 00000000 */ nop -/* 01850 80917260 45020021 */ bc1fl .L809172E8 +/* 01850 80917260 45020021 */ bc1fl .L809172E8 /* 01854 80917264 A60001C6 */ sh $zero, 0x01C6($s0) ## 000001C6 /* 01858 80917268 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 /* 0185C 8091726C 00000000 */ nop -/* 01860 80917270 4600203C */ c.lt.s $f4, $f0 +/* 01860 80917270 4600203C */ c.lt.s $f4, $f0 /* 01864 80917274 00000000 */ nop -/* 01868 80917278 4502001B */ bc1fl .L809172E8 +/* 01868 80917278 4502001B */ bc1fl .L809172E8 /* 0186C 8091727C A60001C6 */ sh $zero, 0x01C6($s0) ## 000001C6 /* 01870 80917280 860E01C6 */ lh $t6, 0x01C6($s0) ## 000001C6 /* 01874 80917284 3C053F00 */ lui $a1, 0x3F00 ## $a1 = 3F000000 @@ -403,141 +403,141 @@ glabel L809171FC /* 0187C 8091728C 25CF0001 */ addiu $t7, $t6, 0x0001 ## $t7 = 00000001 /* 01880 80917290 A60F01C6 */ sh $t7, 0x01C6($s0) ## 000001C6 /* 01884 80917294 0C01E123 */ jal Math_SmoothDownscaleMaxF - -/* 01888 80917298 8FA40048 */ lw $a0, 0x0048($sp) -/* 0188C 8091729C 8FB8006C */ lw $t8, 0x006C($sp) + +/* 01888 80917298 8FA40048 */ lw $a0, 0x0048($sp) +/* 0188C 8091729C 8FB8006C */ lw $t8, 0x006C($sp) /* 01890 809172A0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01894 809172A4 0C00B69E */ jal func_8002DA78 +/* 01894 809172A4 0C00B69E */ jal func_8002DA78 /* 01898 809172A8 8F051C44 */ lw $a1, 0x1C44($t8) ## 00001C44 /* 0189C 809172AC 34018000 */ ori $at, $zero, 0x8000 ## $at = 00008000 -/* 018A0 809172B0 00412821 */ addu $a1, $v0, $at -/* 018A4 809172B4 00052C00 */ sll $a1, $a1, 16 -/* 018A8 809172B8 00052C03 */ sra $a1, $a1, 16 +/* 018A0 809172B0 00412821 */ addu $a1, $v0, $at +/* 018A4 809172B4 00052C00 */ sll $a1, $a1, 16 +/* 018A8 809172B8 00052C03 */ sra $a1, $a1, 16 /* 018AC 809172BC 26040032 */ addiu $a0, $s0, 0x0032 ## $a0 = 00000032 /* 018B0 809172C0 24060002 */ addiu $a2, $zero, 0x0002 ## $a2 = 00000002 /* 018B4 809172C4 0C01E1EF */ jal Math_SmoothScaleMaxS - + /* 018B8 809172C8 24070BB8 */ addiu $a3, $zero, 0x0BB8 ## $a3 = 00000BB8 /* 018BC 809172CC A60001A0 */ sh $zero, 0x01A0($s0) ## 000001A0 /* 018C0 809172D0 860201A0 */ lh $v0, 0x01A0($s0) ## 000001A0 /* 018C4 809172D4 A602019E */ sh $v0, 0x019E($s0) ## 0000019E /* 018C8 809172D8 A602019A */ sh $v0, 0x019A($s0) ## 0000019A -/* 018CC 809172DC 10000005 */ beq $zero, $zero, .L809172F4 +/* 018CC 809172DC 10000005 */ beq $zero, $zero, .L809172F4 /* 018D0 809172E0 A6020198 */ sh $v0, 0x0198($s0) ## 00000198 /* 018D4 809172E4 A60001C6 */ sh $zero, 0x01C6($s0) ## 000001C6 .L809172E8: -/* 018D8 809172E8 AFB90010 */ sw $t9, 0x0010($sp) -/* 018DC 809172EC 0C245A2C */ jal func_809168B0 -/* 018E0 809172F0 8FA5006C */ lw $a1, 0x006C($sp) +/* 018D8 809172E8 AFB90010 */ sw $t9, 0x0010($sp) +/* 018DC 809172EC 0C245A2C */ jal func_809168B0 +/* 018E0 809172F0 8FA5006C */ lw $a1, 0x006C($sp) .L809172F4: /* 018E4 809172F4 860801C6 */ lh $t0, 0x01C6($s0) ## 000001C6 /* 018E8 809172F8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 018EC 809172FC 29010010 */ slti $at, $t0, 0x0010 -/* 018F0 80917300 5420029A */ bnel $at, $zero, .L80917D6C +/* 018EC 809172FC 29010010 */ slti $at, $t0, 0x0010 +/* 018F0 80917300 5420029A */ bnel $at, $zero, .L80917D6C /* 018F4 80917304 860501BC */ lh $a1, 0x01BC($s0) ## 000001BC -/* 018F8 80917308 0C245ABB */ jal func_80916AEC -/* 018FC 8091730C 8FA5006C */ lw $a1, 0x006C($sp) -/* 01900 80917310 10000296 */ beq $zero, $zero, .L80917D6C +/* 018F8 80917308 0C245ABB */ jal func_80916AEC +/* 018FC 8091730C 8FA5006C */ lw $a1, 0x006C($sp) +/* 01900 80917310 10000296 */ beq $zero, $zero, .L80917D6C /* 01904 80917314 860501BC */ lh $a1, 0x01BC($s0) ## 000001BC glabel L80917318 /* 01908 80917318 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C -/* 0190C 8091731C AFA40044 */ sw $a0, 0x0044($sp) -/* 01910 80917320 0C0295B2 */ jal func_800A56C8 +/* 0190C 8091731C AFA40044 */ sw $a0, 0x0044($sp) +/* 01910 80917320 0C0295B2 */ jal func_800A56C8 /* 01914 80917324 3C054170 */ lui $a1, 0x4170 ## $a1 = 41700000 -/* 01918 80917328 10400003 */ beq $v0, $zero, .L80917338 +/* 01918 80917328 10400003 */ beq $v0, $zero, .L80917338 /* 0191C 8091732C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 01920 80917330 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 01924 80917334 2405381B */ addiu $a1, $zero, 0x381B ## $a1 = 0000381B .L80917338: /* 01928 80917338 860901D2 */ lh $t1, 0x01D2($s0) ## 000001D2 -/* 0192C 8091733C 29210029 */ slti $at, $t1, 0x0029 -/* 01930 80917340 10200289 */ beq $at, $zero, .L80917D68 +/* 0192C 8091733C 29210029 */ slti $at, $t1, 0x0029 +/* 01930 80917340 10200289 */ beq $at, $zero, .L80917D68 /* 01934 80917344 3C0141B0 */ lui $at, 0x41B0 ## $at = 41B00000 /* 01938 80917348 44814000 */ mtc1 $at, $f8 ## $f8 = 22.00 /* 0193C 8091734C C6060024 */ lwc1 $f6, 0x0024($s0) ## 00000024 /* 01940 80917350 3C063E4C */ lui $a2, 0x3E4C ## $a2 = 3E4C0000 /* 01944 80917354 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3E4CCCCD -/* 01948 80917358 46083280 */ add.s $f10, $f6, $f8 +/* 01948 80917358 46083280 */ add.s $f10, $f6, $f8 /* 0194C 8091735C 26040290 */ addiu $a0, $s0, 0x0290 ## $a0 = 00000290 /* 01950 80917360 3C0742C8 */ lui $a3, 0x42C8 ## $a3 = 42C80000 -/* 01954 80917364 44055000 */ mfc1 $a1, $f10 +/* 01954 80917364 44055000 */ mfc1 $a1, $f10 /* 01958 80917368 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 0195C 8091736C 00000000 */ nop /* 01960 80917370 3C0141C8 */ lui $at, 0x41C8 ## $at = 41C80000 /* 01964 80917374 44819000 */ mtc1 $at, $f18 ## $f18 = 25.00 /* 01968 80917378 C6100028 */ lwc1 $f16, 0x0028($s0) ## 00000028 /* 0196C 8091737C 3C063E4C */ lui $a2, 0x3E4C ## $a2 = 3E4C0000 /* 01970 80917380 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3E4CCCCD -/* 01974 80917384 46128101 */ sub.s $f4, $f16, $f18 +/* 01974 80917384 46128101 */ sub.s $f4, $f16, $f18 /* 01978 80917388 26040294 */ addiu $a0, $s0, 0x0294 ## $a0 = 00000294 /* 0197C 8091738C 3C0742C8 */ lui $a3, 0x42C8 ## $a3 = 42C80000 -/* 01980 80917390 44052000 */ mfc1 $a1, $f4 +/* 01980 80917390 44052000 */ mfc1 $a1, $f4 /* 01984 80917394 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 01988 80917398 00000000 */ nop /* 0198C 8091739C 3C014234 */ lui $at, 0x4234 ## $at = 42340000 /* 01990 809173A0 44814000 */ mtc1 $at, $f8 ## $f8 = 45.00 /* 01994 809173A4 C606002C */ lwc1 $f6, 0x002C($s0) ## 0000002C /* 01998 809173A8 3C063E4C */ lui $a2, 0x3E4C ## $a2 = 3E4C0000 /* 0199C 809173AC 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3E4CCCCD -/* 019A0 809173B0 46083280 */ add.s $f10, $f6, $f8 +/* 019A0 809173B0 46083280 */ add.s $f10, $f6, $f8 /* 019A4 809173B4 26040298 */ addiu $a0, $s0, 0x0298 ## $a0 = 00000298 /* 019A8 809173B8 3C0742C8 */ lui $a3, 0x42C8 ## $a3 = 42C80000 -/* 019AC 809173BC 44055000 */ mfc1 $a1, $f10 +/* 019AC 809173BC 44055000 */ mfc1 $a1, $f10 /* 019B0 809173C0 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 019B4 809173C4 00000000 */ nop /* 019B8 809173C8 3C063E4C */ lui $a2, 0x3E4C ## $a2 = 3E4C0000 /* 019BC 809173CC 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3E4CCCCD /* 019C0 809173D0 2604029C */ addiu $a0, $s0, 0x029C ## $a0 = 0000029C /* 019C4 809173D4 8E050024 */ lw $a1, 0x0024($s0) ## 00000024 /* 019C8 809173D8 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 019CC 809173DC 3C0742C8 */ lui $a3, 0x42C8 ## $a3 = 42C80000 /* 019D0 809173E0 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 /* 019D4 809173E4 44819000 */ mtc1 $at, $f18 ## $f18 = 5.00 /* 019D8 809173E8 C6100028 */ lwc1 $f16, 0x0028($s0) ## 00000028 /* 019DC 809173EC 3C063E4C */ lui $a2, 0x3E4C ## $a2 = 3E4C0000 /* 019E0 809173F0 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3E4CCCCD -/* 019E4 809173F4 46128100 */ add.s $f4, $f16, $f18 +/* 019E4 809173F4 46128100 */ add.s $f4, $f16, $f18 /* 019E8 809173F8 260402A0 */ addiu $a0, $s0, 0x02A0 ## $a0 = 000002A0 /* 019EC 809173FC 3C0742C8 */ lui $a3, 0x42C8 ## $a3 = 42C80000 -/* 019F0 80917400 44052000 */ mfc1 $a1, $f4 +/* 019F0 80917400 44052000 */ mfc1 $a1, $f4 /* 019F4 80917404 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 019F8 80917408 00000000 */ nop /* 019FC 8091740C 3C063E4C */ lui $a2, 0x3E4C ## $a2 = 3E4C0000 /* 01A00 80917410 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3E4CCCCD /* 01A04 80917414 260402A4 */ addiu $a0, $s0, 0x02A4 ## $a0 = 000002A4 /* 01A08 80917418 8E05002C */ lw $a1, 0x002C($s0) ## 0000002C /* 01A0C 8091741C 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 01A10 80917420 3C0742C8 */ lui $a3, 0x42C8 ## $a3 = 42C80000 /* 01A14 80917424 860301D2 */ lh $v1, 0x01D2($s0) ## 000001D2 /* 01A18 80917428 2401001E */ addiu $at, $zero, 0x001E ## $at = 0000001E -/* 01A1C 8091742C 8FAB006C */ lw $t3, 0x006C($sp) -/* 01A20 80917430 14610005 */ bne $v1, $at, .L80917448 +/* 01A1C 8091742C 8FAB006C */ lw $t3, 0x006C($sp) +/* 01A20 80917430 14610005 */ bne $v1, $at, .L80917448 /* 01A24 80917434 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 01A28 80917438 002B0821 */ addu $at, $at, $t3 +/* 01A28 80917438 002B0821 */ addu $at, $at, $t3 /* 01A2C 8091743C 240A0004 */ addiu $t2, $zero, 0x0004 ## $t2 = 00000004 /* 01A30 80917440 A02A0AE3 */ sb $t2, 0x0AE3($at) ## 00010AE3 /* 01A34 80917444 860301D2 */ lh $v1, 0x01D2($s0) ## 000001D2 .L80917448: -/* 01A38 80917448 28610014 */ slti $at, $v1, 0x0014 -/* 01A3C 8091744C 50200247 */ beql $at, $zero, .L80917D6C +/* 01A38 80917448 28610014 */ slti $at, $v1, 0x0014 +/* 01A3C 8091744C 50200247 */ beql $at, $zero, .L80917D6C /* 01A40 80917450 860501BC */ lh $a1, 0x01BC($s0) ## 000001BC /* 01A44 80917454 0C02927F */ jal SkelAnime_FrameUpdateMatrix - -/* 01A48 80917458 8FA40044 */ lw $a0, 0x0044($sp) + +/* 01A48 80917458 8FA40044 */ lw $a0, 0x0044($sp) /* 01A4C 8091745C 3C063F4C */ lui $a2, 0x3F4C ## $a2 = 3F4C0000 /* 01A50 80917460 3C073ECC */ lui $a3, 0x3ECC ## $a3 = 3ECC0000 /* 01A54 80917464 34E7CCCD */ ori $a3, $a3, 0xCCCD ## $a3 = 3ECCCCCD /* 01A58 80917468 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3F4CCCCD /* 01A5C 8091746C 260401F8 */ addiu $a0, $s0, 0x01F8 ## $a0 = 000001F8 /* 01A60 80917470 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 01A64 80917474 3C053F80 */ lui $a1, 0x3F80 ## $a1 = 3F800000 /* 01A68 80917478 3C063F4C */ lui $a2, 0x3F4C ## $a2 = 3F4C0000 /* 01A6C 8091747C 3C073ECC */ lui $a3, 0x3ECC ## $a3 = 3ECC0000 @@ -545,45 +545,45 @@ glabel L80917318 /* 01A74 80917484 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3F4CCCCD /* 01A78 80917488 26040224 */ addiu $a0, $s0, 0x0224 ## $a0 = 00000224 /* 01A7C 8091748C 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 01A80 80917490 3C053F80 */ lui $a1, 0x3F80 ## $a1 = 3F800000 -/* 01A84 80917494 8FA40044 */ lw $a0, 0x0044($sp) -/* 01A88 80917498 0C0295B2 */ jal func_800A56C8 +/* 01A84 80917494 8FA40044 */ lw $a0, 0x0044($sp) +/* 01A88 80917498 0C0295B2 */ jal func_800A56C8 /* 01A8C 8091749C 3C054210 */ lui $a1, 0x4210 ## $a1 = 42100000 -/* 01A90 809174A0 10400004 */ beq $v0, $zero, .L809174B4 +/* 01A90 809174A0 10400004 */ beq $v0, $zero, .L809174B4 /* 01A94 809174A4 3C018092 */ lui $at, %hi(D_8091B514) ## $at = 80920000 -/* 01A98 809174A8 C420B514 */ lwc1 $f0, %lo(D_8091B514)($at) +/* 01A98 809174A8 C420B514 */ lwc1 $f0, %lo(D_8091B514)($at) /* 01A9C 809174AC E60001F8 */ swc1 $f0, 0x01F8($s0) ## 000001F8 /* 01AA0 809174B0 E6000224 */ swc1 $f0, 0x0224($s0) ## 00000224 .L809174B4: -/* 01AA4 809174B4 8FA40044 */ lw $a0, 0x0044($sp) -/* 01AA8 809174B8 0C0295B2 */ jal func_800A56C8 +/* 01AA4 809174B4 8FA40044 */ lw $a0, 0x0044($sp) +/* 01AA8 809174B8 0C0295B2 */ jal func_800A56C8 /* 01AAC 809174BC 8E05021C */ lw $a1, 0x021C($s0) ## 0000021C -/* 01AB0 809174C0 10400229 */ beq $v0, $zero, .L80917D68 +/* 01AB0 809174C0 10400229 */ beq $v0, $zero, .L80917D68 /* 01AB4 809174C4 240C0005 */ addiu $t4, $zero, 0x0005 ## $t4 = 00000005 /* 01AB8 809174C8 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 /* 01ABC 809174CC A60C01D0 */ sh $t4, 0x01D0($s0) ## 000001D0 /* 01AC0 809174D0 0C028800 */ jal SkelAnime_GetFrameCount - + /* 01AC4 809174D4 24842360 */ addiu $a0, $a0, 0x2360 ## $a0 = 06002360 /* 01AC8 809174D8 44823000 */ mtc1 $v0, $f6 ## $f6 = 0.00 /* 01ACC 809174DC 3C01C0A0 */ lui $at, 0xC0A0 ## $at = C0A00000 /* 01AD0 809174E0 44815000 */ mtc1 $at, $f10 ## $f10 = -5.00 -/* 01AD4 809174E4 46803220 */ cvt.s.w $f8, $f6 +/* 01AD4 809174E4 46803220 */ cvt.s.w $f8, $f6 /* 01AD8 809174E8 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 01ADC 809174EC 24A52360 */ addiu $a1, $a1, 0x2360 ## $a1 = 06002360 -/* 01AE0 809174F0 8FA40044 */ lw $a0, 0x0044($sp) +/* 01AE0 809174F0 8FA40044 */ lw $a0, 0x0044($sp) /* 01AE4 809174F4 3C064000 */ lui $a2, 0x4000 ## $a2 = 40000000 /* 01AE8 809174F8 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 01AEC 809174FC E7A80010 */ swc1 $f8, 0x0010($sp) -/* 01AF0 80917500 AFA00014 */ sw $zero, 0x0014($sp) -/* 01AF4 80917504 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 01AF8 80917508 E7AA0018 */ swc1 $f10, 0x0018($sp) +/* 01AEC 809174FC E7A80010 */ swc1 $f8, 0x0010($sp) +/* 01AF0 80917500 AFA00014 */ sw $zero, 0x0014($sp) +/* 01AF4 80917504 0C029468 */ jal SkelAnime_ChangeAnim + +/* 01AF8 80917508 E7AA0018 */ swc1 $f10, 0x0018($sp) /* 01AFC 8091750C 44808000 */ mtc1 $zero, $f16 ## $f16 = 0.00 /* 01B00 80917510 240D001E */ addiu $t5, $zero, 0x001E ## $t5 = 0000001E /* 01B04 80917514 A60D01D2 */ sh $t5, 0x01D2($s0) ## 000001D2 -/* 01B08 80917518 10000213 */ beq $zero, $zero, .L80917D68 +/* 01B08 80917518 10000213 */ beq $zero, $zero, .L80917D68 /* 01B0C 8091751C E6100220 */ swc1 $f16, 0x0220($s0) ## 00000220 glabel L80917520 /* 01B10 80917520 3C014100 */ lui $at, 0x4100 ## $at = 41000000 @@ -591,60 +591,60 @@ glabel L80917520 /* 01B18 80917528 C6120024 */ lwc1 $f18, 0x0024($s0) ## 00000024 /* 01B1C 8091752C 3C0142B4 */ lui $at, 0x42B4 ## $at = 42B40000 /* 01B20 80917530 44814000 */ mtc1 $at, $f8 ## $f8 = 90.00 -/* 01B24 80917534 46049180 */ add.s $f6, $f18, $f4 +/* 01B24 80917534 46049180 */ add.s $f6, $f18, $f4 /* 01B28 80917538 3C0141F0 */ lui $at, 0x41F0 ## $at = 41F00000 /* 01B2C 8091753C 44819000 */ mtc1 $at, $f18 ## $f18 = 30.00 /* 01B30 80917540 C6100220 */ lwc1 $f16, 0x0220($s0) ## 00000220 -/* 01B34 80917544 46083280 */ add.s $f10, $f6, $f8 +/* 01B34 80917544 46083280 */ add.s $f10, $f6, $f8 /* 01B38 80917548 3C063DCC */ lui $a2, 0x3DCC ## $a2 = 3DCC0000 -/* 01B3C 8091754C 46128102 */ mul.s $f4, $f16, $f18 +/* 01B3C 8091754C 46128102 */ mul.s $f4, $f16, $f18 /* 01B40 80917550 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3DCCCCCD -/* 01B44 80917554 44055000 */ mfc1 $a1, $f10 +/* 01B44 80917554 44055000 */ mfc1 $a1, $f10 /* 01B48 80917558 26040290 */ addiu $a0, $s0, 0x0290 ## $a0 = 00000290 -/* 01B4C 8091755C 44072000 */ mfc1 $a3, $f4 +/* 01B4C 8091755C 44072000 */ mfc1 $a3, $f4 /* 01B50 80917560 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 01B54 80917564 00000000 */ nop /* 01B58 80917568 3C0141F0 */ lui $at, 0x41F0 ## $at = 41F00000 /* 01B5C 8091756C 44814000 */ mtc1 $at, $f8 ## $f8 = 30.00 /* 01B60 80917570 C6060220 */ lwc1 $f6, 0x0220($s0) ## 00000220 -/* 01B64 80917574 8FAE0060 */ lw $t6, 0x0060($sp) +/* 01B64 80917574 8FAE0060 */ lw $t6, 0x0060($sp) /* 01B68 80917578 3C063DCC */ lui $a2, 0x3DCC ## $a2 = 3DCC0000 -/* 01B6C 8091757C 46083282 */ mul.s $f10, $f6, $f8 +/* 01B6C 8091757C 46083282 */ mul.s $f10, $f6, $f8 /* 01B70 80917580 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3DCCCCCD /* 01B74 80917584 26040294 */ addiu $a0, $s0, 0x0294 ## $a0 = 00000294 /* 01B78 80917588 8DC50028 */ lw $a1, 0x0028($t6) ## 00000028 -/* 01B7C 8091758C 44075000 */ mfc1 $a3, $f10 +/* 01B7C 8091758C 44075000 */ mfc1 $a3, $f10 /* 01B80 80917590 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 01B84 80917594 00000000 */ nop /* 01B88 80917598 3C014234 */ lui $at, 0x4234 ## $at = 42340000 /* 01B8C 8091759C 44819000 */ mtc1 $at, $f18 ## $f18 = 45.00 /* 01B90 809175A0 C610002C */ lwc1 $f16, 0x002C($s0) ## 0000002C /* 01B94 809175A4 3C014220 */ lui $at, 0x4220 ## $at = 42200000 /* 01B98 809175A8 44813000 */ mtc1 $at, $f6 ## $f6 = 40.00 -/* 01B9C 809175AC 46128100 */ add.s $f4, $f16, $f18 +/* 01B9C 809175AC 46128100 */ add.s $f4, $f16, $f18 /* 01BA0 809175B0 3C0141F0 */ lui $at, 0x41F0 ## $at = 41F00000 /* 01BA4 809175B4 44818000 */ mtc1 $at, $f16 ## $f16 = 30.00 /* 01BA8 809175B8 C60A0220 */ lwc1 $f10, 0x0220($s0) ## 00000220 -/* 01BAC 809175BC 46062200 */ add.s $f8, $f4, $f6 +/* 01BAC 809175BC 46062200 */ add.s $f8, $f4, $f6 /* 01BB0 809175C0 3C063DCC */ lui $a2, 0x3DCC ## $a2 = 3DCC0000 -/* 01BB4 809175C4 46105482 */ mul.s $f18, $f10, $f16 +/* 01BB4 809175C4 46105482 */ mul.s $f18, $f10, $f16 /* 01BB8 809175C8 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3DCCCCCD -/* 01BBC 809175CC 44054000 */ mfc1 $a1, $f8 +/* 01BBC 809175CC 44054000 */ mfc1 $a1, $f8 /* 01BC0 809175D0 26040298 */ addiu $a0, $s0, 0x0298 ## $a0 = 00000298 -/* 01BC4 809175D4 44079000 */ mfc1 $a3, $f18 +/* 01BC4 809175D4 44079000 */ mfc1 $a3, $f18 /* 01BC8 809175D8 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 01BCC 809175DC 00000000 */ nop /* 01BD0 809175E0 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 /* 01BD4 809175E4 44810000 */ mtc1 $at, $f0 ## $f0 = 1.00 /* 01BD8 809175E8 3C073D4C */ lui $a3, 0x3D4C ## $a3 = 3D4C0000 /* 01BDC 809175EC 34E7CCCD */ ori $a3, $a3, 0xCCCD ## $a3 = 3D4CCCCD -/* 01BE0 809175F0 44050000 */ mfc1 $a1, $f0 -/* 01BE4 809175F4 44060000 */ mfc1 $a2, $f0 +/* 01BE0 809175F0 44050000 */ mfc1 $a1, $f0 +/* 01BE4 809175F4 44060000 */ mfc1 $a2, $f0 /* 01BE8 809175F8 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 01BEC 809175FC 26040220 */ addiu $a0, $s0, 0x0220 ## $a0 = 00000220 /* 01BF0 80917600 860F01D2 */ lh $t7, 0x01D2($s0) ## 000001D2 /* 01BF4 80917604 C6040024 */ lwc1 $f4, 0x0024($s0) ## 00000024 @@ -652,51 +652,51 @@ glabel L80917520 /* 01BFC 8091760C C608002C */ lwc1 $f8, 0x002C($s0) ## 0000002C /* 01C00 80917610 E604029C */ swc1 $f4, 0x029C($s0) ## 0000029C /* 01C04 80917614 E60602A0 */ swc1 $f6, 0x02A0($s0) ## 000002A0 -/* 01C08 80917618 05E10009 */ bgez $t7, .L80917640 +/* 01C08 80917618 05E10009 */ bgez $t7, .L80917640 /* 01C0C 8091761C E60802A4 */ swc1 $f8, 0x02A4($s0) ## 000002A4 /* 01C10 80917620 0C02927F */ jal SkelAnime_FrameUpdateMatrix - + /* 01C14 80917624 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C -/* 01C18 80917628 8FA40048 */ lw $a0, 0x0048($sp) +/* 01C18 80917628 8FA40048 */ lw $a0, 0x0048($sp) /* 01C1C 8091762C 3C053F80 */ lui $a1, 0x3F80 ## $a1 = 3F800000 /* 01C20 80917630 0C01E123 */ jal Math_SmoothDownscaleMaxF - + /* 01C24 80917634 3C064000 */ lui $a2, 0x4000 ## $a2 = 40000000 -/* 01C28 80917638 10000008 */ beq $zero, $zero, .L8091765C +/* 01C28 80917638 10000008 */ beq $zero, $zero, .L8091765C /* 01C2C 8091763C 860301D2 */ lh $v1, 0x01D2($s0) ## 000001D2 .L80917640: /* 01C30 80917640 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01C34 80917644 8FA5006C */ lw $a1, 0x006C($sp) +/* 01C34 80917644 8FA5006C */ lw $a1, 0x006C($sp) /* 01C38 80917648 24060000 */ addiu $a2, $zero, 0x0000 ## $a2 = 00000000 /* 01C3C 8091764C 3C07C0F0 */ lui $a3, 0xC0F0 ## $a3 = C0F00000 -/* 01C40 80917650 0C245A2C */ jal func_809168B0 -/* 01C44 80917654 AFA00010 */ sw $zero, 0x0010($sp) +/* 01C40 80917650 0C245A2C */ jal func_809168B0 +/* 01C44 80917654 AFA00010 */ sw $zero, 0x0010($sp) /* 01C48 80917658 860301D2 */ lh $v1, 0x01D2($s0) ## 000001D2 .L8091765C: /* 01C4C 8091765C 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 /* 01C50 80917660 2484193C */ addiu $a0, $a0, 0x193C ## $a0 = 0600193C -/* 01C54 80917664 14600011 */ bne $v1, $zero, .L809176AC +/* 01C54 80917664 14600011 */ bne $v1, $zero, .L809176AC /* 01C58 80917668 2618014C */ addiu $t8, $s0, 0x014C ## $t8 = 0000014C /* 01C5C 8091766C 0C028800 */ jal SkelAnime_GetFrameCount - -/* 01C60 80917670 AFB80044 */ sw $t8, 0x0044($sp) + +/* 01C60 80917670 AFB80044 */ sw $t8, 0x0044($sp) /* 01C64 80917674 44825000 */ mtc1 $v0, $f10 ## $f10 = 0.00 /* 01C68 80917678 3C01C0A0 */ lui $at, 0xC0A0 ## $at = C0A00000 /* 01C6C 8091767C 44819000 */ mtc1 $at, $f18 ## $f18 = -5.00 -/* 01C70 80917680 46805420 */ cvt.s.w $f16, $f10 +/* 01C70 80917680 46805420 */ cvt.s.w $f16, $f10 /* 01C74 80917684 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 01C78 80917688 24A5193C */ addiu $a1, $a1, 0x193C ## $a1 = 0600193C -/* 01C7C 8091768C 8FA40044 */ lw $a0, 0x0044($sp) +/* 01C7C 8091768C 8FA40044 */ lw $a0, 0x0044($sp) /* 01C80 80917690 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 01C84 80917694 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 01C88 80917698 E7B00010 */ swc1 $f16, 0x0010($sp) -/* 01C8C 8091769C AFA00014 */ sw $zero, 0x0014($sp) -/* 01C90 809176A0 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 01C94 809176A4 E7B20018 */ swc1 $f18, 0x0018($sp) +/* 01C88 80917698 E7B00010 */ swc1 $f16, 0x0010($sp) +/* 01C8C 8091769C AFA00014 */ sw $zero, 0x0014($sp) +/* 01C90 809176A0 0C029468 */ jal SkelAnime_ChangeAnim + +/* 01C94 809176A4 E7B20018 */ swc1 $f18, 0x0018($sp) /* 01C98 809176A8 860301D2 */ lh $v1, 0x01D2($s0) ## 000001D2 .L809176AC: -/* 01C9C 809176AC 146001AE */ bne $v1, $zero, .L80917D68 +/* 01C9C 809176AC 146001AE */ bne $v1, $zero, .L80917D68 /* 01CA0 809176B0 24190009 */ addiu $t9, $zero, 0x0009 ## $t9 = 00000009 /* 01CA4 809176B4 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 /* 01CA8 809176B8 3C01C000 */ lui $at, 0xC000 ## $at = C0000000 @@ -707,31 +707,31 @@ glabel L80917520 /* 01CBC 809176CC E6000068 */ swc1 $f0, 0x0068($s0) ## 00000068 /* 01CC0 809176D0 E6000060 */ swc1 $f0, 0x0060($s0) ## 00000060 /* 01CC4 809176D4 E604006C */ swc1 $f4, 0x006C($s0) ## 0000006C -/* 01CC8 809176D8 AFA80044 */ sw $t0, 0x0044($sp) +/* 01CC8 809176D8 AFA80044 */ sw $t0, 0x0044($sp) /* 01CCC 809176DC 0C028800 */ jal SkelAnime_GetFrameCount - + /* 01CD0 809176E0 2484F70C */ addiu $a0, $a0, 0xF70C ## $a0 = 0600F70C /* 01CD4 809176E4 44823000 */ mtc1 $v0, $f6 ## $f6 = 0.00 /* 01CD8 809176E8 3C01C0A0 */ lui $at, 0xC0A0 ## $at = C0A00000 /* 01CDC 809176EC 44815000 */ mtc1 $at, $f10 ## $f10 = -5.00 -/* 01CE0 809176F0 46803220 */ cvt.s.w $f8, $f6 +/* 01CE0 809176F0 46803220 */ cvt.s.w $f8, $f6 /* 01CE4 809176F4 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 /* 01CE8 809176F8 24090002 */ addiu $t1, $zero, 0x0002 ## $t1 = 00000002 -/* 01CEC 809176FC AFA90014 */ sw $t1, 0x0014($sp) +/* 01CEC 809176FC AFA90014 */ sw $t1, 0x0014($sp) /* 01CF0 80917700 24A5F70C */ addiu $a1, $a1, 0xF70C ## $a1 = 0600F70C -/* 01CF4 80917704 8FA40044 */ lw $a0, 0x0044($sp) -/* 01CF8 80917708 E7A80010 */ swc1 $f8, 0x0010($sp) +/* 01CF4 80917704 8FA40044 */ lw $a0, 0x0044($sp) +/* 01CF8 80917708 E7A80010 */ swc1 $f8, 0x0010($sp) /* 01CFC 8091770C 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 01D00 80917710 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 01D04 80917714 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 01D08 80917718 E7AA0018 */ swc1 $f10, 0x0018($sp) -/* 01D0C 8091771C 8FA20060 */ lw $v0, 0x0060($sp) +/* 01D04 80917714 0C029468 */ jal SkelAnime_ChangeAnim + +/* 01D08 80917718 E7AA0018 */ swc1 $f10, 0x0018($sp) +/* 01D0C 8091771C 8FA20060 */ lw $v0, 0x0060($sp) /* 01D10 80917720 44809000 */ mtc1 $zero, $f18 ## $f18 = 0.00 /* 01D14 80917724 3C01C1F0 */ lui $at, 0xC1F0 ## $at = C1F00000 /* 01D18 80917728 44818000 */ mtc1 $at, $f16 ## $f16 = -30.00 /* 01D1C 8091772C E4520024 */ swc1 $f18, 0x0024($v0) ## 00000024 -/* 01D20 80917730 1000018D */ beq $zero, $zero, .L80917D68 +/* 01D20 80917730 1000018D */ beq $zero, $zero, .L80917D68 /* 01D24 80917734 E450002C */ swc1 $f16, 0x002C($v0) ## 0000002C glabel L80917738 /* 01D28 80917738 3C014100 */ lui $at, 0x4100 ## $at = 41000000 @@ -739,55 +739,55 @@ glabel L80917738 /* 01D30 80917740 C6040024 */ lwc1 $f4, 0x0024($s0) ## 00000024 /* 01D34 80917744 3C0142B4 */ lui $at, 0x42B4 ## $at = 42B40000 /* 01D38 80917748 44815000 */ mtc1 $at, $f10 ## $f10 = 90.00 -/* 01D3C 8091774C 46062200 */ add.s $f8, $f4, $f6 +/* 01D3C 8091774C 46062200 */ add.s $f8, $f4, $f6 /* 01D40 80917750 3C0141F0 */ lui $at, 0x41F0 ## $at = 41F00000 /* 01D44 80917754 44812000 */ mtc1 $at, $f4 ## $f4 = 30.00 /* 01D48 80917758 C6120220 */ lwc1 $f18, 0x0220($s0) ## 00000220 -/* 01D4C 8091775C 460A4400 */ add.s $f16, $f8, $f10 +/* 01D4C 8091775C 460A4400 */ add.s $f16, $f8, $f10 /* 01D50 80917760 3C063DCC */ lui $a2, 0x3DCC ## $a2 = 3DCC0000 -/* 01D54 80917764 46049182 */ mul.s $f6, $f18, $f4 +/* 01D54 80917764 46049182 */ mul.s $f6, $f18, $f4 /* 01D58 80917768 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3DCCCCCD -/* 01D5C 8091776C 44058000 */ mfc1 $a1, $f16 +/* 01D5C 8091776C 44058000 */ mfc1 $a1, $f16 /* 01D60 80917770 26040290 */ addiu $a0, $s0, 0x0290 ## $a0 = 00000290 -/* 01D64 80917774 44073000 */ mfc1 $a3, $f6 +/* 01D64 80917774 44073000 */ mfc1 $a3, $f6 /* 01D68 80917778 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 01D6C 8091777C 00000000 */ nop /* 01D70 80917780 3C014120 */ lui $at, 0x4120 ## $at = 41200000 /* 01D74 80917784 44815000 */ mtc1 $at, $f10 ## $f10 = 10.00 /* 01D78 80917788 3C0141F0 */ lui $at, 0x41F0 ## $at = 41F00000 /* 01D7C 8091778C 44812000 */ mtc1 $at, $f4 ## $f4 = 30.00 -/* 01D80 80917790 8FAA0060 */ lw $t2, 0x0060($sp) +/* 01D80 80917790 8FAA0060 */ lw $t2, 0x0060($sp) /* 01D84 80917794 C6120220 */ lwc1 $f18, 0x0220($s0) ## 00000220 /* 01D88 80917798 3C063DCC */ lui $a2, 0x3DCC ## $a2 = 3DCC0000 /* 01D8C 8091779C C5480028 */ lwc1 $f8, 0x0028($t2) ## 00000028 -/* 01D90 809177A0 46049182 */ mul.s $f6, $f18, $f4 +/* 01D90 809177A0 46049182 */ mul.s $f6, $f18, $f4 /* 01D94 809177A4 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3DCCCCCD -/* 01D98 809177A8 460A4400 */ add.s $f16, $f8, $f10 +/* 01D98 809177A8 460A4400 */ add.s $f16, $f8, $f10 /* 01D9C 809177AC 26040294 */ addiu $a0, $s0, 0x0294 ## $a0 = 00000294 -/* 01DA0 809177B0 44058000 */ mfc1 $a1, $f16 -/* 01DA4 809177B4 44073000 */ mfc1 $a3, $f6 +/* 01DA0 809177B0 44058000 */ mfc1 $a1, $f16 +/* 01DA4 809177B4 44073000 */ mfc1 $a3, $f6 /* 01DA8 809177B8 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 01DAC 809177BC 00000000 */ nop /* 01DB0 809177C0 3C014234 */ lui $at, 0x4234 ## $at = 42340000 /* 01DB4 809177C4 44815000 */ mtc1 $at, $f10 ## $f10 = 45.00 /* 01DB8 809177C8 C608002C */ lwc1 $f8, 0x002C($s0) ## 0000002C /* 01DBC 809177CC 3C014220 */ lui $at, 0x4220 ## $at = 42200000 /* 01DC0 809177D0 44819000 */ mtc1 $at, $f18 ## $f18 = 40.00 -/* 01DC4 809177D4 460A4400 */ add.s $f16, $f8, $f10 +/* 01DC4 809177D4 460A4400 */ add.s $f16, $f8, $f10 /* 01DC8 809177D8 3C0141F0 */ lui $at, 0x41F0 ## $at = 41F00000 /* 01DCC 809177DC 44814000 */ mtc1 $at, $f8 ## $f8 = 30.00 /* 01DD0 809177E0 C6060220 */ lwc1 $f6, 0x0220($s0) ## 00000220 -/* 01DD4 809177E4 46128100 */ add.s $f4, $f16, $f18 +/* 01DD4 809177E4 46128100 */ add.s $f4, $f16, $f18 /* 01DD8 809177E8 3C063DCC */ lui $a2, 0x3DCC ## $a2 = 3DCC0000 -/* 01DDC 809177EC 46083282 */ mul.s $f10, $f6, $f8 +/* 01DDC 809177EC 46083282 */ mul.s $f10, $f6, $f8 /* 01DE0 809177F0 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3DCCCCCD -/* 01DE4 809177F4 44052000 */ mfc1 $a1, $f4 +/* 01DE4 809177F4 44052000 */ mfc1 $a1, $f4 /* 01DE8 809177F8 26040298 */ addiu $a0, $s0, 0x0298 ## $a0 = 00000298 -/* 01DEC 809177FC 44075000 */ mfc1 $a3, $f10 +/* 01DEC 809177FC 44075000 */ mfc1 $a3, $f10 /* 01DF0 80917800 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 01DF4 80917804 00000000 */ nop /* 01DF8 80917808 C6100024 */ lwc1 $f16, 0x0024($s0) ## 00000024 /* 01DFC 8091780C C6120028 */ lwc1 $f18, 0x0028($s0) ## 00000028 @@ -797,71 +797,71 @@ glabel L80917738 /* 01E0C 8091781C E61202A0 */ swc1 $f18, 0x02A0($s0) ## 000002A0 /* 01E10 80917820 E60402A4 */ swc1 $f4, 0x02A4($s0) ## 000002A4 /* 01E14 80917824 0C02927F */ jal SkelAnime_FrameUpdateMatrix - -/* 01E18 80917828 AFA40044 */ sw $a0, 0x0044($sp) + +/* 01E18 80917828 AFA40044 */ sw $a0, 0x0044($sp) /* 01E1C 8091782C 260400B4 */ addiu $a0, $s0, 0x00B4 ## $a0 = 000000B4 /* 01E20 80917830 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 01E24 80917834 24060002 */ addiu $a2, $zero, 0x0002 ## $a2 = 00000002 /* 01E28 80917838 0C01E1EF */ jal Math_SmoothScaleMaxS - + /* 01E2C 8091783C 24070BB8 */ addiu $a3, $zero, 0x0BB8 ## $a3 = 00000BB8 -/* 01E30 80917840 8FAB006C */ lw $t3, 0x006C($sp) +/* 01E30 80917840 8FAB006C */ lw $t3, 0x006C($sp) /* 01E34 80917844 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01E38 80917848 0C00B69E */ jal func_8002DA78 +/* 01E38 80917848 0C00B69E */ jal func_8002DA78 /* 01E3C 8091784C 8D651C44 */ lw $a1, 0x1C44($t3) ## 00001C44 -/* 01E40 80917850 00022C00 */ sll $a1, $v0, 16 -/* 01E44 80917854 00052C03 */ sra $a1, $a1, 16 +/* 01E40 80917850 00022C00 */ sll $a1, $v0, 16 +/* 01E44 80917854 00052C03 */ sra $a1, $a1, 16 /* 01E48 80917858 26040032 */ addiu $a0, $s0, 0x0032 ## $a0 = 00000032 /* 01E4C 8091785C 24060002 */ addiu $a2, $zero, 0x0002 ## $a2 = 00000002 /* 01E50 80917860 0C01E1EF */ jal Math_SmoothScaleMaxS - + /* 01E54 80917864 240707D0 */ addiu $a3, $zero, 0x07D0 ## $a3 = 000007D0 /* 01E58 80917868 960C0088 */ lhu $t4, 0x0088($s0) ## 00000088 /* 01E5C 8091786C 3C040601 */ lui $a0, 0x0601 ## $a0 = 06010000 /* 01E60 80917870 240E0082 */ addiu $t6, $zero, 0x0082 ## $t6 = 00000082 /* 01E64 80917874 318D0001 */ andi $t5, $t4, 0x0001 ## $t5 = 00000000 -/* 01E68 80917878 11A0013B */ beq $t5, $zero, .L80917D68 +/* 01E68 80917878 11A0013B */ beq $t5, $zero, .L80917D68 /* 01E6C 8091787C 2484F70C */ addiu $a0, $a0, 0xF70C ## $a0 = 0600F70C /* 01E70 80917880 44803000 */ mtc1 $zero, $f6 ## $f6 = 0.00 /* 01E74 80917884 A60E01D0 */ sh $t6, 0x01D0($s0) ## 000001D0 /* 01E78 80917888 0C028800 */ jal SkelAnime_GetFrameCount - + /* 01E7C 8091788C E6060060 */ swc1 $f6, 0x0060($s0) ## 00000060 /* 01E80 80917890 44824000 */ mtc1 $v0, $f8 ## $f8 = 0.00 /* 01E84 80917894 3C01C000 */ lui $at, 0xC000 ## $at = C0000000 /* 01E88 80917898 44818000 */ mtc1 $at, $f16 ## $f16 = -2.00 -/* 01E8C 8091789C 468042A0 */ cvt.s.w $f10, $f8 +/* 01E8C 8091789C 468042A0 */ cvt.s.w $f10, $f8 /* 01E90 809178A0 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 /* 01E94 809178A4 240F0002 */ addiu $t7, $zero, 0x0002 ## $t7 = 00000002 -/* 01E98 809178A8 AFAF0014 */ sw $t7, 0x0014($sp) +/* 01E98 809178A8 AFAF0014 */ sw $t7, 0x0014($sp) /* 01E9C 809178AC 24A5F70C */ addiu $a1, $a1, 0xF70C ## $a1 = 0600F70C -/* 01EA0 809178B0 8FA40044 */ lw $a0, 0x0044($sp) -/* 01EA4 809178B4 E7AA0010 */ swc1 $f10, 0x0010($sp) +/* 01EA0 809178B0 8FA40044 */ lw $a0, 0x0044($sp) +/* 01EA4 809178B4 E7AA0010 */ swc1 $f10, 0x0010($sp) /* 01EA8 809178B8 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 01EAC 809178BC 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 01EB0 809178C0 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 01EB4 809178C4 E7B00018 */ swc1 $f16, 0x0018($sp) +/* 01EB0 809178C0 0C029468 */ jal SkelAnime_ChangeAnim + +/* 01EB4 809178C4 E7B00018 */ swc1 $f16, 0x0018($sp) /* 01EB8 809178C8 3C040601 */ lui $a0, 0x0601 ## $a0 = 06010000 /* 01EBC 809178CC 0C028800 */ jal SkelAnime_GetFrameCount - + /* 01EC0 809178D0 2484F70C */ addiu $a0, $a0, 0xF70C ## $a0 = 0600F70C /* 01EC4 809178D4 44829000 */ mtc1 $v0, $f18 ## $f18 = 0.00 /* 01EC8 809178D8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 01ECC 809178DC 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 01ED0 809178E0 46809120 */ cvt.s.w $f4, $f18 +/* 01ED0 809178E0 46809120 */ cvt.s.w $f4, $f18 /* 01ED4 809178E4 24070005 */ addiu $a3, $zero, 0x0005 ## $a3 = 00000005 /* 01ED8 809178E8 E604021C */ swc1 $f4, 0x021C($s0) ## 0000021C -/* 01EDC 809178EC 0C24577E */ jal func_80915DF8 -/* 01EE0 809178F0 8FA5006C */ lw $a1, 0x006C($sp) +/* 01EDC 809178EC 0C24577E */ jal func_80915DF8 +/* 01EE0 809178F0 8FA5006C */ lw $a1, 0x006C($sp) /* 01EE4 809178F4 2418000F */ addiu $t8, $zero, 0x000F ## $t8 = 0000000F /* 01EE8 809178F8 44806000 */ mtc1 $zero, $f12 ## $f12 = 0.00 /* 01EEC 809178FC A61801D2 */ sh $t8, 0x01D2($s0) ## 000001D2 /* 01EF0 80917900 240500C8 */ addiu $a1, $zero, 0x00C8 ## $a1 = 000000C8 /* 01EF4 80917904 24060014 */ addiu $a2, $zero, 0x0014 ## $a2 = 00000014 -/* 01EF8 80917908 0C02A7DB */ jal func_800A9F6C +/* 01EF8 80917908 0C02A7DB */ jal func_800A9F6C /* 01EFC 8091790C 24070014 */ addiu $a3, $zero, 0x0014 ## $a3 = 00000014 -/* 01F00 80917910 10000116 */ beq $zero, $zero, .L80917D6C +/* 01F00 80917910 10000116 */ beq $zero, $zero, .L80917D6C /* 01F04 80917914 860501BC */ lh $a1, 0x01BC($s0) ## 000001BC /* 01F08 80917918 3C014100 */ lui $at, 0x4100 ## $at = 41000000 .L8091791C: @@ -869,156 +869,156 @@ glabel L80917738 /* 01F10 80917920 C6060024 */ lwc1 $f6, 0x0024($s0) ## 00000024 /* 01F14 80917924 3C0142B4 */ lui $at, 0x42B4 ## $at = 42B40000 /* 01F18 80917928 44818000 */ mtc1 $at, $f16 ## $f16 = 90.00 -/* 01F1C 8091792C 46083280 */ add.s $f10, $f6, $f8 +/* 01F1C 8091792C 46083280 */ add.s $f10, $f6, $f8 /* 01F20 80917930 3C0141F0 */ lui $at, 0x41F0 ## $at = 41F00000 /* 01F24 80917934 44813000 */ mtc1 $at, $f6 ## $f6 = 30.00 /* 01F28 80917938 C6040220 */ lwc1 $f4, 0x0220($s0) ## 00000220 -/* 01F2C 8091793C 46105480 */ add.s $f18, $f10, $f16 +/* 01F2C 8091793C 46105480 */ add.s $f18, $f10, $f16 /* 01F30 80917940 3C063DCC */ lui $a2, 0x3DCC ## $a2 = 3DCC0000 -/* 01F34 80917944 46062202 */ mul.s $f8, $f4, $f6 +/* 01F34 80917944 46062202 */ mul.s $f8, $f4, $f6 /* 01F38 80917948 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3DCCCCCD -/* 01F3C 8091794C 44059000 */ mfc1 $a1, $f18 +/* 01F3C 8091794C 44059000 */ mfc1 $a1, $f18 /* 01F40 80917950 26040290 */ addiu $a0, $s0, 0x0290 ## $a0 = 00000290 -/* 01F44 80917954 44074000 */ mfc1 $a3, $f8 +/* 01F44 80917954 44074000 */ mfc1 $a3, $f8 /* 01F48 80917958 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 01F4C 8091795C 00000000 */ nop /* 01F50 80917960 3C014120 */ lui $at, 0x4120 ## $at = 41200000 /* 01F54 80917964 44818000 */ mtc1 $at, $f16 ## $f16 = 10.00 /* 01F58 80917968 3C0141F0 */ lui $at, 0x41F0 ## $at = 41F00000 /* 01F5C 8091796C 44813000 */ mtc1 $at, $f6 ## $f6 = 30.00 -/* 01F60 80917970 8FB90060 */ lw $t9, 0x0060($sp) +/* 01F60 80917970 8FB90060 */ lw $t9, 0x0060($sp) /* 01F64 80917974 C6040220 */ lwc1 $f4, 0x0220($s0) ## 00000220 /* 01F68 80917978 3C063DCC */ lui $a2, 0x3DCC ## $a2 = 3DCC0000 /* 01F6C 8091797C C72A0028 */ lwc1 $f10, 0x0028($t9) ## 00000028 -/* 01F70 80917980 46062202 */ mul.s $f8, $f4, $f6 +/* 01F70 80917980 46062202 */ mul.s $f8, $f4, $f6 /* 01F74 80917984 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3DCCCCCD -/* 01F78 80917988 46105480 */ add.s $f18, $f10, $f16 +/* 01F78 80917988 46105480 */ add.s $f18, $f10, $f16 /* 01F7C 8091798C 26040294 */ addiu $a0, $s0, 0x0294 ## $a0 = 00000294 -/* 01F80 80917990 44059000 */ mfc1 $a1, $f18 -/* 01F84 80917994 44074000 */ mfc1 $a3, $f8 +/* 01F80 80917990 44059000 */ mfc1 $a1, $f18 +/* 01F84 80917994 44074000 */ mfc1 $a3, $f8 /* 01F88 80917998 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 01F8C 8091799C 00000000 */ nop /* 01F90 809179A0 3C014234 */ lui $at, 0x4234 ## $at = 42340000 /* 01F94 809179A4 44818000 */ mtc1 $at, $f16 ## $f16 = 45.00 /* 01F98 809179A8 C60A002C */ lwc1 $f10, 0x002C($s0) ## 0000002C /* 01F9C 809179AC 3C014220 */ lui $at, 0x4220 ## $at = 42200000 /* 01FA0 809179B0 44812000 */ mtc1 $at, $f4 ## $f4 = 40.00 -/* 01FA4 809179B4 46105480 */ add.s $f18, $f10, $f16 +/* 01FA4 809179B4 46105480 */ add.s $f18, $f10, $f16 /* 01FA8 809179B8 3C0141F0 */ lui $at, 0x41F0 ## $at = 41F00000 /* 01FAC 809179BC 44815000 */ mtc1 $at, $f10 ## $f10 = 30.00 /* 01FB0 809179C0 C6080220 */ lwc1 $f8, 0x0220($s0) ## 00000220 -/* 01FB4 809179C4 46049180 */ add.s $f6, $f18, $f4 +/* 01FB4 809179C4 46049180 */ add.s $f6, $f18, $f4 /* 01FB8 809179C8 3C063DCC */ lui $a2, 0x3DCC ## $a2 = 3DCC0000 -/* 01FBC 809179CC 460A4402 */ mul.s $f16, $f8, $f10 +/* 01FBC 809179CC 460A4402 */ mul.s $f16, $f8, $f10 /* 01FC0 809179D0 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3DCCCCCD -/* 01FC4 809179D4 44053000 */ mfc1 $a1, $f6 +/* 01FC4 809179D4 44053000 */ mfc1 $a1, $f6 /* 01FC8 809179D8 26040298 */ addiu $a0, $s0, 0x0298 ## $a0 = 00000298 -/* 01FCC 809179DC 44078000 */ mfc1 $a3, $f16 +/* 01FCC 809179DC 44078000 */ mfc1 $a3, $f16 /* 01FD0 809179E0 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 01FD4 809179E4 00000000 */ nop /* 01FD8 809179E8 260400B4 */ addiu $a0, $s0, 0x00B4 ## $a0 = 000000B4 /* 01FDC 809179EC 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 01FE0 809179F0 24060002 */ addiu $a2, $zero, 0x0002 ## $a2 = 00000002 /* 01FE4 809179F4 0C01E1EF */ jal Math_SmoothScaleMaxS - + /* 01FE8 809179F8 24070BB8 */ addiu $a3, $zero, 0x0BB8 ## $a3 = 00000BB8 -/* 01FEC 809179FC 8FA8006C */ lw $t0, 0x006C($sp) +/* 01FEC 809179FC 8FA8006C */ lw $t0, 0x006C($sp) /* 01FF0 80917A00 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01FF4 80917A04 0C00B69E */ jal func_8002DA78 +/* 01FF4 80917A04 0C00B69E */ jal func_8002DA78 /* 01FF8 80917A08 8D051C44 */ lw $a1, 0x1C44($t0) ## 00001C44 -/* 01FFC 80917A0C 00022C00 */ sll $a1, $v0, 16 -/* 02000 80917A10 00052C03 */ sra $a1, $a1, 16 +/* 01FFC 80917A0C 00022C00 */ sll $a1, $v0, 16 +/* 02000 80917A10 00052C03 */ sra $a1, $a1, 16 /* 02004 80917A14 26040032 */ addiu $a0, $s0, 0x0032 ## $a0 = 00000032 /* 02008 80917A18 24060002 */ addiu $a2, $zero, 0x0002 ## $a2 = 00000002 /* 0200C 80917A1C 0C01E1EF */ jal Math_SmoothScaleMaxS - + /* 02010 80917A20 240707D0 */ addiu $a3, $zero, 0x07D0 ## $a3 = 000007D0 /* 02014 80917A24 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C /* 02018 80917A28 0C02927F */ jal SkelAnime_FrameUpdateMatrix - -/* 0201C 80917A2C AFA40044 */ sw $a0, 0x0044($sp) + +/* 0201C 80917A2C AFA40044 */ sw $a0, 0x0044($sp) /* 02020 80917A30 860301D2 */ lh $v1, 0x01D2($s0) ## 000001D2 /* 02024 80917A34 C6120024 */ lwc1 $f18, 0x0024($s0) ## 00000024 /* 02028 80917A38 C604002C */ lwc1 $f4, 0x002C($s0) ## 0000002C /* 0202C 80917A3C 260402A0 */ addiu $a0, $s0, 0x02A0 ## $a0 = 000002A0 /* 02030 80917A40 E612029C */ swc1 $f18, 0x029C($s0) ## 0000029C -/* 02034 80917A44 10600018 */ beq $v1, $zero, .L80917AA8 +/* 02034 80917A44 10600018 */ beq $v1, $zero, .L80917AA8 /* 02038 80917A48 E60402A4 */ swc1 $f4, 0x02A4($s0) ## 000002A4 /* 0203C 80917A4C 44833000 */ mtc1 $v1, $f6 ## $f6 = 0.00 /* 02040 80917A50 3C018092 */ lui $at, %hi(D_8091B518) ## $at = 80920000 -/* 02044 80917A54 C42AB518 */ lwc1 $f10, %lo(D_8091B518)($at) -/* 02048 80917A58 46803220 */ cvt.s.w $f8, $f6 +/* 02044 80917A54 C42AB518 */ lwc1 $f10, %lo(D_8091B518)($at) +/* 02048 80917A58 46803220 */ cvt.s.w $f8, $f6 /* 0204C 80917A5C 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 /* 02050 80917A60 44819000 */ mtc1 $at, $f18 ## $f18 = 0.50 -/* 02054 80917A64 460A4402 */ mul.s $f16, $f8, $f10 +/* 02054 80917A64 460A4402 */ mul.s $f16, $f8, $f10 /* 02058 80917A68 00000000 */ nop -/* 0205C 80917A6C 46128302 */ mul.s $f12, $f16, $f18 +/* 0205C 80917A6C 46128302 */ mul.s $f12, $f16, $f18 /* 02060 80917A70 0C0400A4 */ jal sinf - + /* 02064 80917A74 00000000 */ nop /* 02068 80917A78 860901D2 */ lh $t1, 0x01D2($s0) ## 000001D2 /* 0206C 80917A7C 3C018092 */ lui $at, %hi(D_8091B51C) ## $at = 80920000 -/* 02070 80917A80 C42AB51C */ lwc1 $f10, %lo(D_8091B51C)($at) +/* 02070 80917A80 C42AB51C */ lwc1 $f10, %lo(D_8091B51C)($at) /* 02074 80917A84 44892000 */ mtc1 $t1, $f4 ## $f4 = 0.00 /* 02078 80917A88 C6120028 */ lwc1 $f18, 0x0028($s0) ## 00000028 -/* 0207C 80917A8C 468021A0 */ cvt.s.w $f6, $f4 -/* 02080 80917A90 46003202 */ mul.s $f8, $f6, $f0 +/* 0207C 80917A8C 468021A0 */ cvt.s.w $f6, $f4 +/* 02080 80917A90 46003202 */ mul.s $f8, $f6, $f0 /* 02084 80917A94 00000000 */ nop -/* 02088 80917A98 460A4402 */ mul.s $f16, $f8, $f10 -/* 0208C 80917A9C 46128100 */ add.s $f4, $f16, $f18 -/* 02090 80917AA0 10000006 */ beq $zero, $zero, .L80917ABC +/* 02088 80917A98 460A4402 */ mul.s $f16, $f8, $f10 +/* 0208C 80917A9C 46128100 */ add.s $f4, $f16, $f18 +/* 02090 80917AA0 10000006 */ beq $zero, $zero, .L80917ABC /* 02094 80917AA4 E60402A0 */ swc1 $f4, 0x02A0($s0) ## 000002A0 .L80917AA8: /* 02098 80917AA8 3C063DCC */ lui $a2, 0x3DCC ## $a2 = 3DCC0000 /* 0209C 80917AAC 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3DCCCCCD /* 020A0 80917AB0 8E05003C */ lw $a1, 0x003C($s0) ## 0000003C /* 020A4 80917AB4 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 020A8 80917AB8 3C074120 */ lui $a3, 0x4120 ## $a3 = 41200000 .L80917ABC: -/* 020AC 80917ABC 8FA40044 */ lw $a0, 0x0044($sp) -/* 020B0 80917AC0 0C0295B2 */ jal func_800A56C8 +/* 020AC 80917ABC 8FA40044 */ lw $a0, 0x0044($sp) +/* 020B0 80917AC0 0C0295B2 */ jal func_800A56C8 /* 020B4 80917AC4 3C054220 */ lui $a1, 0x4220 ## $a1 = 42200000 -/* 020B8 80917AC8 10400026 */ beq $v0, $zero, .L80917B64 +/* 020B8 80917AC8 10400026 */ beq $v0, $zero, .L80917B64 /* 020BC 80917ACC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 020C0 80917AD0 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 020C4 80917AD4 2405380E */ addiu $a1, $zero, 0x380E ## $a1 = 0000380E /* 020C8 80917AD8 3C0A8016 */ lui $t2, 0x8016 ## $t2 = 80160000 /* 020CC 80917ADC 954AF542 */ lhu $t2, -0x0ABE($t2) ## 8015F542 -/* 020D0 80917AE0 8FA4006C */ lw $a0, 0x006C($sp) +/* 020D0 80917AE0 8FA4006C */ lw $a0, 0x006C($sp) /* 020D4 80917AE4 3C020602 */ lui $v0, 0x0602 ## $v0 = 06020000 /* 020D8 80917AE8 314B0001 */ andi $t3, $t2, 0x0001 ## $t3 = 00000000 -/* 020DC 80917AEC 15600016 */ bne $t3, $zero, .L80917B48 +/* 020DC 80917AEC 15600016 */ bne $t3, $zero, .L80917B48 /* 020E0 80917AF0 24851D4C */ addiu $a1, $a0, 0x1D4C ## $a1 = 00001D4C /* 020E4 80917AF4 24429BA8 */ addiu $v0, $v0, 0x9BA8 ## $v0 = 06019BA8 -/* 020E8 80917AF8 00026100 */ sll $t4, $v0, 4 -/* 020EC 80917AFC 000C6F02 */ srl $t5, $t4, 28 -/* 020F0 80917B00 000D7080 */ sll $t6, $t5, 2 +/* 020E8 80917AF8 00026100 */ sll $t4, $v0, 4 +/* 020EC 80917AFC 000C6F02 */ srl $t5, $t4, 28 +/* 020F0 80917B00 000D7080 */ sll $t6, $t5, 2 /* 020F4 80917B04 3C0F8016 */ lui $t7, 0x8016 ## $t7 = 80160000 -/* 020F8 80917B08 01EE7821 */ addu $t7, $t7, $t6 +/* 020F8 80917B08 01EE7821 */ addu $t7, $t7, $t6 /* 020FC 80917B0C 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 /* 02100 80917B10 8DEF6FA8 */ lw $t7, 0x6FA8($t7) ## 80166FA8 /* 02104 80917B14 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF -/* 02108 80917B18 0041C024 */ and $t8, $v0, $at +/* 02108 80917B18 0041C024 */ and $t8, $v0, $at /* 0210C 80917B1C 3C018000 */ lui $at, 0x8000 ## $at = 80000000 /* 02110 80917B20 241900B4 */ addiu $t9, $zero, 0x00B4 ## $t9 = 000000B4 /* 02114 80917B24 24080080 */ addiu $t0, $zero, 0x0080 ## $t0 = 00000080 /* 02118 80917B28 24090028 */ addiu $t1, $zero, 0x0028 ## $t1 = 00000028 -/* 0211C 80917B2C 01F83021 */ addu $a2, $t7, $t8 -/* 02120 80917B30 00C13021 */ addu $a2, $a2, $at -/* 02124 80917B34 AFA90018 */ sw $t1, 0x0018($sp) -/* 02128 80917B38 AFA80014 */ sw $t0, 0x0014($sp) -/* 0212C 80917B3C AFB90010 */ sw $t9, 0x0010($sp) +/* 0211C 80917B2C 01F83021 */ addu $a2, $t7, $t8 +/* 02120 80917B30 00C13021 */ addu $a2, $a2, $at +/* 02124 80917B34 AFA90018 */ sw $t1, 0x0018($sp) +/* 02128 80917B38 AFA80014 */ sw $t0, 0x0014($sp) +/* 0212C 80917B3C AFB90010 */ sw $t9, 0x0010($sp) /* 02130 80917B40 0C00B380 */ jal TitleCard_InitBossName - + /* 02134 80917B44 240700A0 */ addiu $a3, $zero, 0x00A0 ## $a3 = 000000A0 .L80917B48: /* 02138 80917B48 0C03E803 */ jal Audio_SetBGM - + /* 0213C 80917B4C 2404001B */ addiu $a0, $zero, 0x001B ## $a0 = 0000001B /* 02140 80917B50 3C0A8016 */ lui $t2, 0x8016 ## $t2 = 80160000 /* 02144 80917B54 954AF542 */ lhu $t2, -0x0ABE($t2) ## 8015F542 @@ -1026,110 +1026,110 @@ glabel L80917738 /* 0214C 80917B5C 354B0001 */ ori $t3, $t2, 0x0001 ## $t3 = 80160001 /* 02150 80917B60 A42BF542 */ sh $t3, -0x0ABE($at) ## 8015F542 .L80917B64: -/* 02154 80917B64 8FA40044 */ lw $a0, 0x0044($sp) -/* 02158 80917B68 0C0295B2 */ jal func_800A56C8 +/* 02154 80917B64 8FA40044 */ lw $a0, 0x0044($sp) +/* 02158 80917B68 0C0295B2 */ jal func_800A56C8 /* 0215C 80917B6C 8E05021C */ lw $a1, 0x021C($s0) ## 0000021C -/* 02160 80917B70 1040007D */ beq $v0, $zero, .L80917D68 +/* 02160 80917B70 1040007D */ beq $v0, $zero, .L80917D68 /* 02164 80917B74 240C008C */ addiu $t4, $zero, 0x008C ## $t4 = 0000008C /* 02168 80917B78 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 /* 0216C 80917B7C A60C01D0 */ sh $t4, 0x01D0($s0) ## 000001D0 /* 02170 80917B80 0C028800 */ jal SkelAnime_GetFrameCount - + /* 02174 80917B84 24840AE8 */ addiu $a0, $a0, 0x0AE8 ## $a0 = 06000AE8 /* 02178 80917B88 44823000 */ mtc1 $v0, $f6 ## $f6 = 0.00 /* 0217C 80917B8C 3C01C120 */ lui $at, 0xC120 ## $at = C1200000 /* 02180 80917B90 44815000 */ mtc1 $at, $f10 ## $f10 = -10.00 -/* 02184 80917B94 46803220 */ cvt.s.w $f8, $f6 +/* 02184 80917B94 46803220 */ cvt.s.w $f8, $f6 /* 02188 80917B98 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 0218C 80917B9C 24A50AE8 */ addiu $a1, $a1, 0x0AE8 ## $a1 = 06000AE8 -/* 02190 80917BA0 8FA40044 */ lw $a0, 0x0044($sp) +/* 02190 80917BA0 8FA40044 */ lw $a0, 0x0044($sp) /* 02194 80917BA4 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 02198 80917BA8 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 0219C 80917BAC E7A80010 */ swc1 $f8, 0x0010($sp) -/* 021A0 80917BB0 AFA00014 */ sw $zero, 0x0014($sp) -/* 021A4 80917BB4 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 021A8 80917BB8 E7AA0018 */ swc1 $f10, 0x0018($sp) +/* 0219C 80917BAC E7A80010 */ swc1 $f8, 0x0010($sp) +/* 021A0 80917BB0 AFA00014 */ sw $zero, 0x0014($sp) +/* 021A4 80917BB4 0C029468 */ jal SkelAnime_ChangeAnim + +/* 021A8 80917BB8 E7AA0018 */ swc1 $f10, 0x0018($sp) /* 021AC 80917BBC 240D0014 */ addiu $t5, $zero, 0x0014 ## $t5 = 00000014 -/* 021B0 80917BC0 10000069 */ beq $zero, $zero, .L80917D68 +/* 021B0 80917BC0 10000069 */ beq $zero, $zero, .L80917D68 /* 021B4 80917BC4 A60D01D2 */ sh $t5, 0x01D2($s0) ## 000001D2 .L80917BC8: /* 021B8 80917BC8 0C02927F */ jal SkelAnime_FrameUpdateMatrix - + /* 021BC 80917BCC 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C /* 021C0 80917BD0 3C063DCC */ lui $a2, 0x3DCC ## $a2 = 3DCC0000 /* 021C4 80917BD4 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3DCCCCCD /* 021C8 80917BD8 260402A0 */ addiu $a0, $s0, 0x02A0 ## $a0 = 000002A0 /* 021CC 80917BDC 8E05003C */ lw $a1, 0x003C($s0) ## 0000003C /* 021D0 80917BE0 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 021D4 80917BE4 3C074120 */ lui $a3, 0x4120 ## $a3 = 41200000 /* 021D8 80917BE8 860E01D2 */ lh $t6, 0x01D2($s0) ## 000001D2 /* 021DC 80917BEC 240F001E */ addiu $t7, $zero, 0x001E ## $t7 = 0000001E /* 021E0 80917BF0 24180096 */ addiu $t8, $zero, 0x0096 ## $t8 = 00000096 -/* 021E4 80917BF4 15C0005C */ bne $t6, $zero, .L80917D68 +/* 021E4 80917BF4 15C0005C */ bne $t6, $zero, .L80917D68 /* 021E8 80917BF8 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 021EC 80917BFC A60F01D2 */ sh $t7, 0x01D2($s0) ## 000001D2 /* 021F0 80917C00 A61801D0 */ sh $t8, 0x01D0($s0) ## 000001D0 -/* 021F4 80917C04 8FA4006C */ lw $a0, 0x006C($sp) -/* 021F8 80917C08 0C0300C5 */ jal func_800C0314 +/* 021F4 80917C04 8FA4006C */ lw $a0, 0x006C($sp) +/* 021F8 80917C08 0C0300C5 */ jal func_800C0314 /* 021FC 80917C0C 24060003 */ addiu $a2, $zero, 0x0003 ## $a2 = 00000003 -/* 02200 80917C10 10000056 */ beq $zero, $zero, .L80917D6C +/* 02200 80917C10 10000056 */ beq $zero, $zero, .L80917D6C /* 02204 80917C14 860501BC */ lh $a1, 0x01BC($s0) ## 000001BC .L80917C18: /* 02208 80917C18 0C02927F */ jal SkelAnime_FrameUpdateMatrix - + /* 0220C 80917C1C 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C /* 02210 80917C20 3C014316 */ lui $at, 0x4316 ## $at = 43160000 /* 02214 80917C24 44819000 */ mtc1 $at, $f18 ## $f18 = 150.00 /* 02218 80917C28 C6100024 */ lwc1 $f16, 0x0024($s0) ## 00000024 /* 0221C 80917C2C 3C018092 */ lui $at, %hi(D_8091B520) ## $at = 80920000 -/* 02220 80917C30 C426B520 */ lwc1 $f6, %lo(D_8091B520)($at) -/* 02224 80917C34 46128100 */ add.s $f4, $f16, $f18 +/* 02220 80917C30 C426B520 */ lwc1 $f6, %lo(D_8091B520)($at) +/* 02224 80917C34 46128100 */ add.s $f4, $f16, $f18 /* 02228 80917C38 26040290 */ addiu $a0, $s0, 0x0290 ## $a0 = 00000290 /* 0222C 80917C3C 3C063E4C */ lui $a2, 0x3E4C ## $a2 = 3E4C0000 /* 02230 80917C40 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3E4CCCCD -/* 02234 80917C44 44052000 */ mfc1 $a1, $f4 -/* 02238 80917C48 AFA40044 */ sw $a0, 0x0044($sp) +/* 02234 80917C44 44052000 */ mfc1 $a1, $f4 +/* 02238 80917C48 AFA40044 */ sw $a0, 0x0044($sp) /* 0223C 80917C4C 3C0742C8 */ lui $a3, 0x42C8 ## $a3 = 42C80000 /* 02240 80917C50 0C01E0C4 */ jal Math_SmoothScaleMaxMinF - -/* 02244 80917C54 E7A60010 */ swc1 $f6, 0x0010($sp) + +/* 02244 80917C54 E7A60010 */ swc1 $f6, 0x0010($sp) /* 02248 80917C58 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 /* 0224C 80917C5C 44815000 */ mtc1 $at, $f10 ## $f10 = 20.00 /* 02250 80917C60 C6080028 */ lwc1 $f8, 0x0028($s0) ## 00000028 /* 02254 80917C64 3C018092 */ lui $at, %hi(D_8091B524) ## $at = 80920000 -/* 02258 80917C68 C432B524 */ lwc1 $f18, %lo(D_8091B524)($at) -/* 0225C 80917C6C 460A4400 */ add.s $f16, $f8, $f10 +/* 02258 80917C68 C432B524 */ lwc1 $f18, %lo(D_8091B524)($at) +/* 0225C 80917C6C 460A4400 */ add.s $f16, $f8, $f10 /* 02260 80917C70 3C063E4C */ lui $a2, 0x3E4C ## $a2 = 3E4C0000 /* 02264 80917C74 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3E4CCCCD /* 02268 80917C78 26040294 */ addiu $a0, $s0, 0x0294 ## $a0 = 00000294 -/* 0226C 80917C7C 44058000 */ mfc1 $a1, $f16 +/* 0226C 80917C7C 44058000 */ mfc1 $a1, $f16 /* 02270 80917C80 3C0742C8 */ lui $a3, 0x42C8 ## $a3 = 42C80000 /* 02274 80917C84 0C01E0C4 */ jal Math_SmoothScaleMaxMinF - -/* 02278 80917C88 E7B20010 */ swc1 $f18, 0x0010($sp) + +/* 02278 80917C88 E7B20010 */ swc1 $f18, 0x0010($sp) /* 0227C 80917C8C 3C01435C */ lui $at, 0x435C ## $at = 435C0000 /* 02280 80917C90 44813000 */ mtc1 $at, $f6 ## $f6 = 220.00 /* 02284 80917C94 C604002C */ lwc1 $f4, 0x002C($s0) ## 0000002C /* 02288 80917C98 3C018092 */ lui $at, %hi(D_8091B528) ## $at = 80920000 -/* 0228C 80917C9C C42AB528 */ lwc1 $f10, %lo(D_8091B528)($at) -/* 02290 80917CA0 46062200 */ add.s $f8, $f4, $f6 +/* 0228C 80917C9C C42AB528 */ lwc1 $f10, %lo(D_8091B528)($at) +/* 02290 80917CA0 46062200 */ add.s $f8, $f4, $f6 /* 02294 80917CA4 3C063E4C */ lui $a2, 0x3E4C ## $a2 = 3E4C0000 /* 02298 80917CA8 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3E4CCCCD /* 0229C 80917CAC 26040298 */ addiu $a0, $s0, 0x0298 ## $a0 = 00000298 -/* 022A0 80917CB0 44054000 */ mfc1 $a1, $f8 +/* 022A0 80917CB0 44054000 */ mfc1 $a1, $f8 /* 022A4 80917CB4 3C0742C8 */ lui $a3, 0x42C8 ## $a3 = 42C80000 /* 022A8 80917CB8 0C01E0C4 */ jal Math_SmoothScaleMaxMinF - -/* 022AC 80917CBC E7AA0010 */ swc1 $f10, 0x0010($sp) + +/* 022AC 80917CBC E7AA0010 */ swc1 $f10, 0x0010($sp) /* 022B0 80917CC0 861901D2 */ lh $t9, 0x01D2($s0) ## 000001D2 -/* 022B4 80917CC4 8FA4006C */ lw $a0, 0x006C($sp) -/* 022B8 80917CC8 57200028 */ bnel $t9, $zero, .L80917D6C +/* 022B4 80917CC4 8FA4006C */ lw $a0, 0x006C($sp) +/* 022B8 80917CC8 57200028 */ bnel $t9, $zero, .L80917D6C /* 022BC 80917CCC 860501BC */ lh $a1, 0x01BC($s0) ## 000001BC -/* 022C0 80917CD0 0C030129 */ jal func_800C04A4 +/* 022C0 80917CD0 0C030129 */ jal func_800C04A4 /* 022C4 80917CD4 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 022C8 80917CD8 8FA30044 */ lw $v1, 0x0044($sp) +/* 022C8 80917CD8 8FA30044 */ lw $v1, 0x0044($sp) /* 022CC 80917CDC 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 /* 022D0 80917CE0 8C690000 */ lw $t1, 0x0000($v1) ## 00000000 /* 022D4 80917CE4 AC49005C */ sw $t1, 0x005C($v0) ## 0000005C @@ -1150,36 +1150,36 @@ glabel L80917738 /* 02310 80917D20 8E0D02A4 */ lw $t5, 0x02A4($s0) ## 000002A4 /* 02314 80917D24 AC4D0058 */ sw $t5, 0x0058($v0) ## 00000058 /* 02318 80917D28 860501BC */ lh $a1, 0x01BC($s0) ## 000001BC -/* 0231C 80917D2C 0C03022B */ jal func_800C08AC -/* 02320 80917D30 8FA4006C */ lw $a0, 0x006C($sp) +/* 0231C 80917D2C 0C03022B */ jal func_800C08AC +/* 02320 80917D30 8FA4006C */ lw $a0, 0x006C($sp) /* 02324 80917D34 A60001BC */ sh $zero, 0x01BC($s0) ## 000001BC -/* 02328 80917D38 0C24592B */ jal func_809164AC +/* 02328 80917D38 0C24592B */ jal func_809164AC /* 0232C 80917D3C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02330 80917D40 8FA4006C */ lw $a0, 0x006C($sp) +/* 02330 80917D40 8FA4006C */ lw $a0, 0x006C($sp) /* 02334 80917D44 240E00C8 */ addiu $t6, $zero, 0x00C8 ## $t6 = 000000C8 /* 02338 80917D48 A60001BE */ sh $zero, 0x01BE($s0) ## 000001BE /* 0233C 80917D4C A60E0196 */ sh $t6, 0x0196($s0) ## 00000196 -/* 02340 80917D50 0C01914D */ jal func_80064534 +/* 02340 80917D50 0C01914D */ jal func_80064534 /* 02344 80917D54 24851D64 */ addiu $a1, $a0, 0x1D64 ## $a1 = 00001D64 -/* 02348 80917D58 8FA4006C */ lw $a0, 0x006C($sp) +/* 02348 80917D58 8FA4006C */ lw $a0, 0x006C($sp) /* 0234C 80917D5C 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 02350 80917D60 0C00B7D5 */ jal func_8002DF54 +/* 02350 80917D60 0C00B7D5 */ jal func_8002DF54 /* 02354 80917D64 24060007 */ addiu $a2, $zero, 0x0007 ## $a2 = 00000007 glabel L80917D68 .L80917D68: /* 02358 80917D68 860501BC */ lh $a1, 0x01BC($s0) ## 000001BC .L80917D6C: -/* 0235C 80917D6C 8FA4006C */ lw $a0, 0x006C($sp) +/* 0235C 80917D6C 8FA4006C */ lw $a0, 0x006C($sp) /* 02360 80917D70 2606029C */ addiu $a2, $s0, 0x029C ## $a2 = 0000029C -/* 02364 80917D74 50A00004 */ beql $a1, $zero, .L80917D88 -/* 02368 80917D78 8FBF003C */ lw $ra, 0x003C($sp) -/* 0236C 80917D7C 0C030136 */ jal func_800C04D8 +/* 02364 80917D74 50A00004 */ beql $a1, $zero, .L80917D88 +/* 02368 80917D78 8FBF003C */ lw $ra, 0x003C($sp) +/* 0236C 80917D7C 0C030136 */ jal func_800C04D8 /* 02370 80917D80 26070290 */ addiu $a3, $s0, 0x0290 ## $a3 = 00000290 -/* 02374 80917D84 8FBF003C */ lw $ra, 0x003C($sp) +/* 02374 80917D84 8FBF003C */ lw $ra, 0x003C($sp) .L80917D88: -/* 02378 80917D88 8FB00038 */ lw $s0, 0x0038($sp) +/* 02378 80917D88 8FB00038 */ lw $s0, 0x0038($sp) /* 0237C 80917D8C 27BD0068 */ addiu $sp, $sp, 0x0068 ## $sp = 00000000 -/* 02380 80917D90 03E00008 */ jr $ra +/* 02380 80917D90 03E00008 */ jr $ra /* 02384 80917D94 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_80917D98.s b/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_80917D98.s index 3f07a8c727..4869ec2a3c 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_80917D98.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_80917D98.s @@ -346,7 +346,7 @@ glabel func_80917D98 /* 02884 80918294 460E7102 */ mul.s $f4, $f14, $f14 /* 02888 80918298 46049000 */ add.s $f0, $f18, $f4 /* 0288C 8091829C 46000004 */ sqrt.s $f0, $f0 -/* 02890 809182A0 0C03F494 */ jal func_800FD250 +/* 02890 809182A0 0C03F494 */ jal Math_atan2f /* 02894 809182A4 E6400228 */ swc1 $f0, 0x0228($s2) ## 00000228 /* 02898 809182A8 240F010E */ addiu $t7, $zero, 0x010E ## $t7 = 0000010E /* 0289C 809182AC 3C010001 */ lui $at, 0x0001 ## $at = 00010000 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_80918D6C.s b/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_80918D6C.s index e25cdb87ac..32d04288b8 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_80918D6C.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_80918D6C.s @@ -1,8 +1,8 @@ glabel func_80918D6C /* 0335C 80918D6C 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 -/* 03360 80918D70 AFBF002C */ sw $ra, 0x002C($sp) -/* 03364 80918D74 AFB00028 */ sw $s0, 0x0028($sp) -/* 03368 80918D78 AFA50044 */ sw $a1, 0x0044($sp) +/* 03360 80918D70 AFBF002C */ sw $ra, 0x002C($sp) +/* 03364 80918D74 AFB00028 */ sw $s0, 0x0028($sp) +/* 03368 80918D78 AFA50044 */ sw $a1, 0x0044($sp) /* 0336C 80918D7C 8C8E0004 */ lw $t6, 0x0004($a0) ## 00000004 /* 03370 80918D80 3C010100 */ lui $at, 0x0100 ## $at = 01000000 /* 03374 80918D84 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 @@ -10,90 +10,90 @@ glabel func_80918D6C /* 0337C 80918D8C AC8F0004 */ sw $t7, 0x0004($a0) ## 00000004 /* 03380 80918D90 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C /* 03384 80918D94 0C02927F */ jal SkelAnime_FrameUpdateMatrix - -/* 03388 80918D98 AFA40030 */ sw $a0, 0x0030($sp) + +/* 03388 80918D98 AFA40030 */ sw $a0, 0x0030($sp) /* 0338C 80918D9C 860301D0 */ lh $v1, 0x01D0($s0) ## 000001D0 /* 03390 80918DA0 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 /* 03394 80918DA4 3C054120 */ lui $a1, 0x4120 ## $a1 = 41200000 -/* 03398 80918DA8 50600009 */ beql $v1, $zero, .L80918DD0 +/* 03398 80918DA8 50600009 */ beql $v1, $zero, .L80918DD0 /* 0339C 80918DAC 8E0307D4 */ lw $v1, 0x07D4($s0) ## 000007D4 -/* 033A0 80918DB0 10610051 */ beq $v1, $at, .L80918EF8 -/* 033A4 80918DB4 8FA40030 */ lw $a0, 0x0030($sp) +/* 033A0 80918DB0 10610051 */ beq $v1, $at, .L80918EF8 +/* 033A4 80918DB4 8FA40030 */ lw $a0, 0x0030($sp) /* 033A8 80918DB8 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 033AC 80918DBC 1061006B */ beq $v1, $at, .L80918F6C +/* 033AC 80918DBC 1061006B */ beq $v1, $at, .L80918F6C /* 033B0 80918DC0 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 -/* 033B4 80918DC4 10000076 */ beq $zero, $zero, .L80918FA0 +/* 033B4 80918DC4 10000076 */ beq $zero, $zero, .L80918FA0 /* 033B8 80918DC8 240B0002 */ addiu $t3, $zero, 0x0002 ## $t3 = 00000002 /* 033BC 80918DCC 8E0307D4 */ lw $v1, 0x07D4($s0) ## 000007D4 .L80918DD0: /* 033C0 80918DD0 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 /* 033C4 80918DD4 240A000A */ addiu $t2, $zero, 0x000A ## $t2 = 0000000A -/* 033C8 80918DD8 1860000F */ blez $v1, .L80918E18 +/* 033C8 80918DD8 1860000F */ blez $v1, .L80918E18 /* 033CC 80918DDC 00000000 */ nop /* 033D0 80918DE0 8E0407D8 */ lw $a0, 0x07D8($s0) ## 000007D8 -/* 033D4 80918DE4 0002C180 */ sll $t8, $v0, 6 +/* 033D4 80918DE4 0002C180 */ sll $t8, $v0, 6 .L80918DE8: -/* 033D8 80918DE8 0098C821 */ addu $t9, $a0, $t8 +/* 033D8 80918DE8 0098C821 */ addu $t9, $a0, $t8 /* 033DC 80918DEC 93280015 */ lbu $t0, 0x0015($t9) ## 00000015 /* 033E0 80918DF0 24420001 */ addiu $v0, $v0, 0x0001 ## $v0 = 00000001 -/* 033E4 80918DF4 00021400 */ sll $v0, $v0, 16 +/* 033E4 80918DF4 00021400 */ sll $v0, $v0, 16 /* 033E8 80918DF8 31090002 */ andi $t1, $t0, 0x0002 ## $t1 = 00000000 -/* 033EC 80918DFC 11200003 */ beq $t1, $zero, .L80918E0C -/* 033F0 80918E00 00021403 */ sra $v0, $v0, 16 -/* 033F4 80918E04 10000004 */ beq $zero, $zero, .L80918E18 +/* 033EC 80918DFC 11200003 */ beq $t1, $zero, .L80918E0C +/* 033F0 80918E00 00021403 */ sra $v0, $v0, 16 +/* 033F4 80918E04 10000004 */ beq $zero, $zero, .L80918E18 /* 033F8 80918E08 A60A01D2 */ sh $t2, 0x01D2($s0) ## 000001D2 .L80918E0C: -/* 033FC 80918E0C 0043082A */ slt $at, $v0, $v1 -/* 03400 80918E10 5420FFF5 */ bnel $at, $zero, .L80918DE8 -/* 03404 80918E14 0002C180 */ sll $t8, $v0, 6 +/* 033FC 80918E0C 0043082A */ slt $at, $v0, $v1 +/* 03400 80918E10 5420FFF5 */ bnel $at, $zero, .L80918DE8 +/* 03404 80918E14 0002C180 */ sll $t8, $v0, 6 .L80918E18: -/* 03408 80918E18 0C0295B2 */ jal func_800A56C8 -/* 0340C 80918E1C 8FA40030 */ lw $a0, 0x0030($sp) -/* 03410 80918E20 1040000A */ beq $v0, $zero, .L80918E4C +/* 03408 80918E18 0C0295B2 */ jal func_800A56C8 +/* 0340C 80918E1C 8FA40030 */ lw $a0, 0x0030($sp) +/* 03410 80918E20 1040000A */ beq $v0, $zero, .L80918E4C /* 03414 80918E24 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 03418 80918E28 8FA50044 */ lw $a1, 0x0044($sp) +/* 03418 80918E28 8FA50044 */ lw $a1, 0x0044($sp) /* 0341C 80918E2C 24060003 */ addiu $a2, $zero, 0x0003 ## $a2 = 00000003 -/* 03420 80918E30 0C24577E */ jal func_80915DF8 +/* 03420 80918E30 0C24577E */ jal func_80915DF8 /* 03424 80918E34 24070005 */ addiu $a3, $zero, 0x0005 ## $a3 = 00000005 /* 03428 80918E38 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0342C 80918E3C 8FA50044 */ lw $a1, 0x0044($sp) +/* 0342C 80918E3C 8FA50044 */ lw $a1, 0x0044($sp) /* 03430 80918E40 24060005 */ addiu $a2, $zero, 0x0005 ## $a2 = 00000005 -/* 03434 80918E44 0C00CFA2 */ jal func_80033E88 +/* 03434 80918E44 0C00CFA2 */ jal func_80033E88 /* 03438 80918E48 2407000F */ addiu $a3, $zero, 0x000F ## $a3 = 0000000F .L80918E4C: /* 0343C 80918E4C 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 /* 03440 80918E50 0C028800 */ jal SkelAnime_GetFrameCount - + /* 03444 80918E54 24844318 */ addiu $a0, $a0, 0x4318 ## $a0 = 06004318 /* 03448 80918E58 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 -/* 0344C 80918E5C 8FA40030 */ lw $a0, 0x0030($sp) -/* 03450 80918E60 46802120 */ cvt.s.w $f4, $f4 -/* 03454 80918E64 44052000 */ mfc1 $a1, $f4 -/* 03458 80918E68 0C0295B2 */ jal func_800A56C8 +/* 0344C 80918E5C 8FA40030 */ lw $a0, 0x0030($sp) +/* 03450 80918E60 46802120 */ cvt.s.w $f4, $f4 +/* 03454 80918E64 44052000 */ mfc1 $a1, $f4 +/* 03458 80918E68 0C0295B2 */ jal func_800A56C8 /* 0345C 80918E6C 00000000 */ nop -/* 03460 80918E70 1040004A */ beq $v0, $zero, .L80918F9C +/* 03460 80918E70 1040004A */ beq $v0, $zero, .L80918F9C /* 03464 80918E74 240B0001 */ addiu $t3, $zero, 0x0001 ## $t3 = 00000001 /* 03468 80918E78 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 /* 0346C 80918E7C A60B01D0 */ sh $t3, 0x01D0($s0) ## 000001D0 /* 03470 80918E80 0C028800 */ jal SkelAnime_GetFrameCount - + /* 03474 80918E84 24844A20 */ addiu $a0, $a0, 0x4A20 ## $a0 = 06004A20 /* 03478 80918E88 44823000 */ mtc1 $v0, $f6 ## $f6 = 0.00 /* 0347C 80918E8C 3C01BF80 */ lui $at, 0xBF80 ## $at = BF800000 /* 03480 80918E90 44815000 */ mtc1 $at, $f10 ## $f10 = -1.00 -/* 03484 80918E94 46803220 */ cvt.s.w $f8, $f6 +/* 03484 80918E94 46803220 */ cvt.s.w $f8, $f6 /* 03488 80918E98 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 0348C 80918E9C 24A54A20 */ addiu $a1, $a1, 0x4A20 ## $a1 = 06004A20 -/* 03490 80918EA0 8FA40030 */ lw $a0, 0x0030($sp) +/* 03490 80918EA0 8FA40030 */ lw $a0, 0x0030($sp) /* 03494 80918EA4 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 03498 80918EA8 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 0349C 80918EAC E7A80010 */ swc1 $f8, 0x0010($sp) -/* 034A0 80918EB0 AFA00014 */ sw $zero, 0x0014($sp) -/* 034A4 80918EB4 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 034A8 80918EB8 E7AA0018 */ swc1 $f10, 0x0018($sp) +/* 0349C 80918EAC E7A80010 */ swc1 $f8, 0x0010($sp) +/* 034A0 80918EB0 AFA00014 */ sw $zero, 0x0014($sp) +/* 034A4 80918EB4 0C029468 */ jal SkelAnime_ChangeAnim + +/* 034A8 80918EB8 E7AA0018 */ swc1 $f10, 0x0018($sp) /* 034AC 80918EBC 860C01D2 */ lh $t4, 0x01D2($s0) ## 000001D2 -/* 034B0 80918EC0 55800037 */ bnel $t4, $zero, .L80918FA0 +/* 034B0 80918EC0 55800037 */ bnel $t4, $zero, .L80918FA0 /* 034B4 80918EC4 240B0002 */ addiu $t3, $zero, 0x0002 ## $t3 = 00000002 /* 034B8 80918EC8 0C03F66B */ jal Math_Rand_ZeroOne ## Rand.Next() float @@ -101,70 +101,70 @@ glabel func_80918D6C /* 034C0 80918ED0 3C0141F0 */ lui $at, 0x41F0 ## $at = 41F00000 /* 034C4 80918ED4 44818000 */ mtc1 $at, $f16 ## $f16 = 30.00 /* 034C8 80918ED8 00000000 */ nop -/* 034CC 80918EDC 46100482 */ mul.s $f18, $f0, $f16 -/* 034D0 80918EE0 4600910D */ trunc.w.s $f4, $f18 -/* 034D4 80918EE4 44182000 */ mfc1 $t8, $f4 +/* 034CC 80918EDC 46100482 */ mul.s $f18, $f0, $f16 +/* 034D0 80918EE0 4600910D */ trunc.w.s $f4, $f18 +/* 034D4 80918EE4 44182000 */ mfc1 $t8, $f4 /* 034D8 80918EE8 00000000 */ nop /* 034DC 80918EEC 2719001E */ addiu $t9, $t8, 0x001E ## $t9 = 0000001E -/* 034E0 80918EF0 1000002A */ beq $zero, $zero, .L80918F9C +/* 034E0 80918EF0 1000002A */ beq $zero, $zero, .L80918F9C /* 034E4 80918EF4 A61901D4 */ sh $t9, 0x01D4($s0) ## 000001D4 .L80918EF8: -/* 034E8 80918EF8 0C0295B2 */ jal func_800A56C8 +/* 034E8 80918EF8 0C0295B2 */ jal func_800A56C8 /* 034EC 80918EFC 3C054040 */ lui $a1, 0x4040 ## $a1 = 40400000 -/* 034F0 80918F00 10400003 */ beq $v0, $zero, .L80918F10 +/* 034F0 80918F00 10400003 */ beq $v0, $zero, .L80918F10 /* 034F4 80918F04 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 034F8 80918F08 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 034FC 80918F0C 2405381D */ addiu $a1, $zero, 0x381D ## $a1 = 0000381D .L80918F10: /* 03500 80918F10 860801D4 */ lh $t0, 0x01D4($s0) ## 000001D4 /* 03504 80918F14 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 /* 03508 80918F18 24090002 */ addiu $t1, $zero, 0x0002 ## $t1 = 00000002 -/* 0350C 80918F1C 1500001F */ bne $t0, $zero, .L80918F9C +/* 0350C 80918F1C 1500001F */ bne $t0, $zero, .L80918F9C /* 03510 80918F20 24845330 */ addiu $a0, $a0, 0x5330 ## $a0 = 06005330 /* 03514 80918F24 0C028800 */ jal SkelAnime_GetFrameCount - + /* 03518 80918F28 A60901D0 */ sh $t1, 0x01D0($s0) ## 000001D0 /* 0351C 80918F2C 44823000 */ mtc1 $v0, $f6 ## $f6 = 0.00 /* 03520 80918F30 3C01C0A0 */ lui $at, 0xC0A0 ## $at = C0A00000 /* 03524 80918F34 44815000 */ mtc1 $at, $f10 ## $f10 = -5.00 -/* 03528 80918F38 46803220 */ cvt.s.w $f8, $f6 +/* 03528 80918F38 46803220 */ cvt.s.w $f8, $f6 /* 0352C 80918F3C 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 03530 80918F40 240A0002 */ addiu $t2, $zero, 0x0002 ## $t2 = 00000002 -/* 03534 80918F44 AFAA0014 */ sw $t2, 0x0014($sp) +/* 03534 80918F44 AFAA0014 */ sw $t2, 0x0014($sp) /* 03538 80918F48 24A55330 */ addiu $a1, $a1, 0x5330 ## $a1 = 06005330 -/* 0353C 80918F4C 8FA40030 */ lw $a0, 0x0030($sp) -/* 03540 80918F50 E7A80010 */ swc1 $f8, 0x0010($sp) +/* 0353C 80918F4C 8FA40030 */ lw $a0, 0x0030($sp) +/* 03540 80918F50 E7A80010 */ swc1 $f8, 0x0010($sp) /* 03544 80918F54 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 03548 80918F58 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 0354C 80918F5C 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 03550 80918F60 E7AA0018 */ swc1 $f10, 0x0018($sp) -/* 03554 80918F64 1000000E */ beq $zero, $zero, .L80918FA0 +/* 0354C 80918F5C 0C029468 */ jal SkelAnime_ChangeAnim + +/* 03550 80918F60 E7AA0018 */ swc1 $f10, 0x0018($sp) +/* 03554 80918F64 1000000E */ beq $zero, $zero, .L80918FA0 /* 03558 80918F68 240B0002 */ addiu $t3, $zero, 0x0002 ## $t3 = 00000002 .L80918F6C: /* 0355C 80918F6C 0C028800 */ jal SkelAnime_GetFrameCount - + /* 03560 80918F70 24845330 */ addiu $a0, $a0, 0x5330 ## $a0 = 00005330 /* 03564 80918F74 44828000 */ mtc1 $v0, $f16 ## $f16 = 0.00 -/* 03568 80918F78 8FA40030 */ lw $a0, 0x0030($sp) -/* 0356C 80918F7C 46808420 */ cvt.s.w $f16, $f16 -/* 03570 80918F80 44058000 */ mfc1 $a1, $f16 -/* 03574 80918F84 0C0295B2 */ jal func_800A56C8 +/* 03568 80918F78 8FA40030 */ lw $a0, 0x0030($sp) +/* 0356C 80918F7C 46808420 */ cvt.s.w $f16, $f16 +/* 03570 80918F80 44058000 */ mfc1 $a1, $f16 +/* 03574 80918F84 0C0295B2 */ jal func_800A56C8 /* 03578 80918F88 00000000 */ nop -/* 0357C 80918F8C 50400004 */ beql $v0, $zero, .L80918FA0 +/* 0357C 80918F8C 50400004 */ beql $v0, $zero, .L80918FA0 /* 03580 80918F90 240B0002 */ addiu $t3, $zero, 0x0002 ## $t3 = 00000002 -/* 03584 80918F94 0C245829 */ jal func_809160A4 +/* 03584 80918F94 0C245829 */ jal func_809160A4 /* 03588 80918F98 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 .L80918F9C: /* 0358C 80918F9C 240B0002 */ addiu $t3, $zero, 0x0002 ## $t3 = 00000002 .L80918FA0: /* 03590 80918FA0 A60B01B4 */ sh $t3, 0x01B4($s0) ## 000001B4 /* 03594 80918FA4 A60001B8 */ sh $zero, 0x01B8($s0) ## 000001B8 -/* 03598 80918FA8 8FBF002C */ lw $ra, 0x002C($sp) -/* 0359C 80918FAC 8FB00028 */ lw $s0, 0x0028($sp) +/* 03598 80918FA8 8FBF002C */ lw $ra, 0x002C($sp) +/* 0359C 80918FAC 8FB00028 */ lw $s0, 0x0028($sp) /* 035A0 80918FB0 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 -/* 035A4 80918FB4 03E00008 */ jr $ra +/* 035A4 80918FB4 03E00008 */ jr $ra /* 035A8 80918FB8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_8091A560.s b/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_8091A560.s index 22b1040e9c..644dc19f4b 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_8091A560.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Goma/func_8091A560.s @@ -1,20 +1,20 @@ glabel func_8091A560 /* 04B50 8091A560 27BDFF98 */ addiu $sp, $sp, 0xFF98 ## $sp = FFFFFF98 -/* 04B54 8091A564 AFBF0014 */ sw $ra, 0x0014($sp) -/* 04B58 8091A568 AFA40068 */ sw $a0, 0x0068($sp) -/* 04B5C 8091A56C AFA5006C */ sw $a1, 0x006C($sp) -/* 04B60 8091A570 AFA60070 */ sw $a2, 0x0070($sp) -/* 04B64 8091A574 AFA70074 */ sw $a3, 0x0074($sp) -/* 04B68 8091A578 AFA00060 */ sw $zero, 0x0060($sp) +/* 04B54 8091A564 AFBF0014 */ sw $ra, 0x0014($sp) +/* 04B58 8091A568 AFA40068 */ sw $a0, 0x0068($sp) +/* 04B5C 8091A56C AFA5006C */ sw $a1, 0x006C($sp) +/* 04B60 8091A570 AFA60070 */ sw $a2, 0x0070($sp) +/* 04B64 8091A574 AFA70074 */ sw $a3, 0x0074($sp) +/* 04B68 8091A578 AFA00060 */ sw $zero, 0x0060($sp) /* 04B6C 8091A57C 8C850000 */ lw $a1, 0x0000($a0) ## 00000000 /* 04B70 8091A580 3C068092 */ lui $a2, %hi(D_8091B464) ## $a2 = 80920000 /* 04B74 8091A584 24C6B464 */ addiu $a2, $a2, %lo(D_8091B464) ## $a2 = 8091B464 /* 04B78 8091A588 27A4004C */ addiu $a0, $sp, 0x004C ## $a0 = FFFFFFE4 /* 04B7C 8091A58C 2407124D */ addiu $a3, $zero, 0x124D ## $a3 = 0000124D -/* 04B80 8091A590 0C031AB1 */ jal func_800C6AC4 -/* 04B84 8091A594 AFA5005C */ sw $a1, 0x005C($sp) -/* 04B88 8091A598 8FA9005C */ lw $t1, 0x005C($sp) -/* 04B8C 8091A59C 8FA70074 */ lw $a3, 0x0074($sp) +/* 04B80 8091A590 0C031AB1 */ jal Graph_OpenDisps +/* 04B84 8091A594 AFA5005C */ sw $a1, 0x005C($sp) +/* 04B88 8091A598 8FA9005C */ lw $t1, 0x005C($sp) +/* 04B8C 8091A59C 8FA70074 */ lw $a3, 0x0074($sp) /* 04B90 8091A5A0 3C18E700 */ lui $t8, 0xE700 ## $t8 = E7000000 /* 04B94 8091A5A4 8D2202C0 */ lw $v0, 0x02C0($t1) ## 000002C0 /* 04B98 8091A5A8 3C04FB00 */ lui $a0, 0xFB00 ## $a0 = FB000000 @@ -23,60 +23,60 @@ glabel func_8091A560 /* 04BA4 8091A5B4 AC400004 */ sw $zero, 0x0004($v0) ## 00000004 /* 04BA8 8091A5B8 AC580000 */ sw $t8, 0x0000($v0) ## 00000000 /* 04BAC 8091A5BC 8D2202C0 */ lw $v0, 0x02C0($t1) ## 000002C0 -/* 04BB0 8091A5C0 8FA8007C */ lw $t0, 0x007C($sp) +/* 04BB0 8091A5C0 8FA8007C */ lw $t0, 0x007C($sp) /* 04BB4 8091A5C4 24590008 */ addiu $t9, $v0, 0x0008 ## $t9 = 00000008 /* 04BB8 8091A5C8 AD3902C0 */ sw $t9, 0x02C0($t1) ## 000002C0 /* 04BBC 8091A5CC AC440000 */ sw $a0, 0x0000($v0) ## 00000000 /* 04BC0 8091A5D0 C504020C */ lwc1 $f4, 0x020C($t0) ## 0000020C /* 04BC4 8091A5D4 C5080204 */ lwc1 $f8, 0x0204($t0) ## 00000204 /* 04BC8 8091A5D8 C5100208 */ lwc1 $f16, 0x0208($t0) ## 00000208 -/* 04BCC 8091A5DC 4600218D */ trunc.w.s $f6, $f4 -/* 04BD0 8091A5E0 4600428D */ trunc.w.s $f10, $f8 -/* 04BD4 8091A5E4 440D3000 */ mfc1 $t5, $f6 -/* 04BD8 8091A5E8 4600848D */ trunc.w.s $f18, $f16 -/* 04BDC 8091A5EC 440C5000 */ mfc1 $t4, $f10 +/* 04BCC 8091A5DC 4600218D */ trunc.w.s $f6, $f4 +/* 04BD0 8091A5E0 4600428D */ trunc.w.s $f10, $f8 +/* 04BD4 8091A5E4 440D3000 */ mfc1 $t5, $f6 +/* 04BD8 8091A5E8 4600848D */ trunc.w.s $f18, $f16 +/* 04BDC 8091A5EC 440C5000 */ mfc1 $t4, $f10 /* 04BE0 8091A5F0 31AE00FF */ andi $t6, $t5, 0x00FF ## $t6 = 00000000 -/* 04BE4 8091A5F4 000E7A00 */ sll $t7, $t6, 8 -/* 04BE8 8091A5F8 440B9000 */ mfc1 $t3, $f18 -/* 04BEC 8091A5FC 000C6E00 */ sll $t5, $t4, 24 +/* 04BE4 8091A5F4 000E7A00 */ sll $t7, $t6, 8 +/* 04BE8 8091A5F8 440B9000 */ mfc1 $t3, $f18 +/* 04BEC 8091A5FC 000C6E00 */ sll $t5, $t4, 24 /* 04BF0 8091A600 01ED7025 */ or $t6, $t7, $t5 ## $t6 = 00000008 /* 04BF4 8091A604 316C00FF */ andi $t4, $t3, 0x00FF ## $t4 = 00000000 -/* 04BF8 8091A608 000C7C00 */ sll $t7, $t4, 16 +/* 04BF8 8091A608 000C7C00 */ sll $t7, $t4, 16 /* 04BFC 8091A60C 01CF6825 */ or $t5, $t6, $t7 ## $t5 = 00000008 /* 04C00 8091A610 35B800FF */ ori $t8, $t5, 0x00FF ## $t8 = 000000FF /* 04C04 8091A614 AC580004 */ sw $t8, 0x0004($v0) ## 00000004 -/* 04C08 8091A618 8FA2006C */ lw $v0, 0x006C($sp) -/* 04C0C 8091A61C 8FA60070 */ lw $a2, 0x0070($sp) -/* 04C10 8091A620 0102C821 */ addu $t9, $t0, $v0 +/* 04C08 8091A618 8FA2006C */ lw $v0, 0x006C($sp) +/* 04C0C 8091A61C 8FA60070 */ lw $a2, 0x0070($sp) +/* 04C10 8091A620 0102C821 */ addu $t9, $t0, $v0 /* 04C14 8091A624 932A0758 */ lbu $t2, 0x0758($t9) ## 00000760 /* 04C18 8091A628 244BFFFB */ addiu $t3, $v0, 0xFFFB ## $t3 = FFFFFFFB -/* 04C1C 8091A62C 29410002 */ slti $at, $t2, 0x0002 -/* 04C20 8091A630 54200003 */ bnel $at, $zero, .L8091A640 -/* 04C24 8091A634 2D610023 */ sltiu $at, $t3, 0x0023 +/* 04C1C 8091A62C 29410002 */ slti $at, $t2, 0x0002 +/* 04C20 8091A630 54200003 */ bnel $at, $zero, .L8091A640 +/* 04C24 8091A634 2D610023 */ sltiu $at, $t3, 0x0023 /* 04C28 8091A638 ACC00000 */ sw $zero, 0x0000($a2) ## 00000000 -/* 04C2C 8091A63C 2D610023 */ sltiu $at, $t3, 0x0023 +/* 04C2C 8091A63C 2D610023 */ sltiu $at, $t3, 0x0023 .L8091A640: -/* 04C30 8091A640 102000DD */ beq $at, $zero, .L8091A9B8 -/* 04C34 8091A644 8FA60070 */ lw $a2, 0x0070($sp) -/* 04C38 8091A648 000B5880 */ sll $t3, $t3, 2 +/* 04C30 8091A640 102000DD */ beq $at, $zero, .L8091A9B8 +/* 04C34 8091A644 8FA60070 */ lw $a2, 0x0070($sp) +/* 04C38 8091A648 000B5880 */ sll $t3, $t3, 2 /* 04C3C 8091A64C 3C018092 */ lui $at, %hi(jtbl_8091B57C) ## $at = 80920000 -/* 04C40 8091A650 002B0821 */ addu $at, $at, $t3 -/* 04C44 8091A654 8C2BB57C */ lw $t3, %lo(jtbl_8091B57C)($at) -/* 04C48 8091A658 01600008 */ jr $t3 +/* 04C40 8091A650 002B0821 */ addu $at, $at, $t3 +/* 04C44 8091A654 8C2BB57C */ lw $t3, %lo(jtbl_8091B57C)($at) +/* 04C48 8091A658 01600008 */ jr $t3 /* 04C4C 8091A65C 00000000 */ nop glabel L8091A660 /* 04C50 8091A660 850C01B4 */ lh $t4, 0x01B4($t0) ## 000001B4 -/* 04C54 8091A664 55800008 */ bnel $t4, $zero, .L8091A688 +/* 04C54 8091A664 55800008 */ bnel $t4, $zero, .L8091A688 /* 04C58 8091A668 850F01BA */ lh $t7, 0x01BA($t0) ## 000001BA /* 04C5C 8091A66C 850E0198 */ lh $t6, 0x0198($t0) ## 00000198 -/* 04C60 8091A670 29C1F574 */ slti $at, $t6, 0xF574 -/* 04C64 8091A674 50200004 */ beql $at, $zero, .L8091A688 +/* 04C60 8091A670 29C1F574 */ slti $at, $t6, 0xF574 +/* 04C64 8091A674 50200004 */ beql $at, $zero, .L8091A688 /* 04C68 8091A678 850F01BA */ lh $t7, 0x01BA($t0) ## 000001BA -/* 04C6C 8091A67C 100000CE */ beq $zero, $zero, .L8091A9B8 +/* 04C6C 8091A67C 100000CE */ beq $zero, $zero, .L8091A9B8 /* 04C70 8091A680 ACC00000 */ sw $zero, 0x0000($a2) ## 00000000 /* 04C74 8091A684 850F01BA */ lh $t7, 0x01BA($t0) ## 000001BA .L8091A688: -/* 04C78 8091A688 51E00024 */ beql $t7, $zero, .L8091A71C +/* 04C78 8091A688 51E00024 */ beql $t7, $zero, .L8091A71C /* 04C7C 8091A68C 8D2202C0 */ lw $v0, 0x02C0($t1) ## 000002C0 /* 04C80 8091A690 8D2202C0 */ lw $v0, 0x02C0($t1) ## 000002C0 /* 04C84 8091A694 244D0008 */ addiu $t5, $v0, 0x0008 ## $t5 = 00000008 @@ -84,36 +84,36 @@ glabel L8091A660 /* 04C8C 8091A69C AC440000 */ sw $a0, 0x0000($v0) ## 00000000 /* 04C90 8091A6A0 0C03F66B */ jal Math_Rand_ZeroOne ## Rand.Next() float -/* 04C94 8091A6A4 AFA20040 */ sw $v0, 0x0040($sp) +/* 04C94 8091A6A4 AFA20040 */ sw $v0, 0x0040($sp) /* 04C98 8091A6A8 0C03F66B */ jal Math_Rand_ZeroOne ## Rand.Next() float -/* 04C9C 8091A6AC E7A0001C */ swc1 $f0, 0x001C($sp) +/* 04C9C 8091A6AC E7A0001C */ swc1 $f0, 0x001C($sp) /* 04CA0 8091A6B0 0C03F66B */ jal Math_Rand_ZeroOne ## Rand.Next() float -/* 04CA4 8091A6B4 E7A00020 */ swc1 $f0, 0x0020($sp) +/* 04CA4 8091A6B4 E7A00020 */ swc1 $f0, 0x0020($sp) /* 04CA8 8091A6B8 3C01437F */ lui $at, 0x437F ## $at = 437F0000 /* 04CAC 8091A6BC 44811000 */ mtc1 $at, $f2 ## $f2 = 255.00 -/* 04CB0 8091A6C0 C7A80020 */ lwc1 $f8, 0x0020($sp) -/* 04CB4 8091A6C4 C7B2001C */ lwc1 $f18, 0x001C($sp) -/* 04CB8 8091A6C8 46020102 */ mul.s $f4, $f0, $f2 -/* 04CBC 8091A6CC 8FAD0040 */ lw $t5, 0x0040($sp) -/* 04CC0 8091A6D0 46024282 */ mul.s $f10, $f8, $f2 -/* 04CC4 8091A6D4 4600218D */ trunc.w.s $f6, $f4 -/* 04CC8 8091A6D8 46029102 */ mul.s $f4, $f18, $f2 -/* 04CCC 8091A6DC 440B3000 */ mfc1 $t3, $f6 -/* 04CD0 8091A6E0 4600540D */ trunc.w.s $f16, $f10 +/* 04CB0 8091A6C0 C7A80020 */ lwc1 $f8, 0x0020($sp) +/* 04CB4 8091A6C4 C7B2001C */ lwc1 $f18, 0x001C($sp) +/* 04CB8 8091A6C8 46020102 */ mul.s $f4, $f0, $f2 +/* 04CBC 8091A6CC 8FAD0040 */ lw $t5, 0x0040($sp) +/* 04CC0 8091A6D0 46024282 */ mul.s $f10, $f8, $f2 +/* 04CC4 8091A6D4 4600218D */ trunc.w.s $f6, $f4 +/* 04CC8 8091A6D8 46029102 */ mul.s $f4, $f18, $f2 +/* 04CCC 8091A6DC 440B3000 */ mfc1 $t3, $f6 +/* 04CD0 8091A6E0 4600540D */ trunc.w.s $f16, $f10 /* 04CD4 8091A6E4 316C00FF */ andi $t4, $t3, 0x00FF ## $t4 = 00000000 -/* 04CD8 8091A6E8 000C7200 */ sll $t6, $t4, 8 -/* 04CDC 8091A6EC 4600218D */ trunc.w.s $f6, $f4 -/* 04CE0 8091A6F0 440A8000 */ mfc1 $t2, $f16 -/* 04CE4 8091A6F4 44193000 */ mfc1 $t9, $f6 -/* 04CE8 8091A6F8 000A5E00 */ sll $t3, $t2, 24 +/* 04CD8 8091A6E8 000C7200 */ sll $t6, $t4, 8 +/* 04CDC 8091A6EC 4600218D */ trunc.w.s $f6, $f4 +/* 04CE0 8091A6F0 440A8000 */ mfc1 $t2, $f16 +/* 04CE4 8091A6F4 44193000 */ mfc1 $t9, $f6 +/* 04CE8 8091A6F8 000A5E00 */ sll $t3, $t2, 24 /* 04CEC 8091A6FC 01CB6025 */ or $t4, $t6, $t3 ## $t4 = 00000000 /* 04CF0 8091A700 332A00FF */ andi $t2, $t9, 0x00FF ## $t2 = 00000000 -/* 04CF4 8091A704 000A7400 */ sll $t6, $t2, 16 +/* 04CF4 8091A704 000A7400 */ sll $t6, $t2, 16 /* 04CF8 8091A708 018E5825 */ or $t3, $t4, $t6 ## $t3 = 00000000 /* 04CFC 8091A70C 356F003F */ ori $t7, $t3, 0x003F ## $t7 = 0000003F -/* 04D00 8091A710 100000A9 */ beq $zero, $zero, .L8091A9B8 +/* 04D00 8091A710 100000A9 */ beq $zero, $zero, .L8091A9B8 /* 04D04 8091A714 ADAF0004 */ sw $t7, 0x0004($t5) ## 00000004 /* 04D08 8091A718 8D2202C0 */ lw $v0, 0x02C0($t1) ## 000002C0 .L8091A71C: @@ -123,61 +123,61 @@ glabel L8091A660 /* 04D18 8091A728 C5080218 */ lwc1 $f8, 0x0218($t0) ## 00000218 /* 04D1C 8091A72C C5100210 */ lwc1 $f16, 0x0210($t0) ## 00000210 /* 04D20 8091A730 C5040214 */ lwc1 $f4, 0x0214($t0) ## 00000214 -/* 04D24 8091A734 4600428D */ trunc.w.s $f10, $f8 -/* 04D28 8091A738 4600848D */ trunc.w.s $f18, $f16 -/* 04D2C 8091A73C 440E5000 */ mfc1 $t6, $f10 -/* 04D30 8091A740 4600218D */ trunc.w.s $f6, $f4 -/* 04D34 8091A744 440C9000 */ mfc1 $t4, $f18 +/* 04D24 8091A734 4600428D */ trunc.w.s $f10, $f8 +/* 04D28 8091A738 4600848D */ trunc.w.s $f18, $f16 +/* 04D2C 8091A73C 440E5000 */ mfc1 $t6, $f10 +/* 04D30 8091A740 4600218D */ trunc.w.s $f6, $f4 +/* 04D34 8091A744 440C9000 */ mfc1 $t4, $f18 /* 04D38 8091A748 31CB00FF */ andi $t3, $t6, 0x00FF ## $t3 = 00000000 -/* 04D3C 8091A74C 000B7A00 */ sll $t7, $t3, 8 -/* 04D40 8091A750 440A3000 */ mfc1 $t2, $f6 -/* 04D44 8091A754 000C7600 */ sll $t6, $t4, 24 +/* 04D3C 8091A74C 000B7A00 */ sll $t7, $t3, 8 +/* 04D40 8091A750 440A3000 */ mfc1 $t2, $f6 +/* 04D44 8091A754 000C7600 */ sll $t6, $t4, 24 /* 04D48 8091A758 01EE5825 */ or $t3, $t7, $t6 ## $t3 = 0000003F /* 04D4C 8091A75C 314C00FF */ andi $t4, $t2, 0x00FF ## $t4 = 00000000 -/* 04D50 8091A760 000C7C00 */ sll $t7, $t4, 16 +/* 04D50 8091A760 000C7C00 */ sll $t7, $t4, 16 /* 04D54 8091A764 016F7025 */ or $t6, $t3, $t7 ## $t6 = 0000003F /* 04D58 8091A768 35CD003F */ ori $t5, $t6, 0x003F ## $t5 = 0000003F -/* 04D5C 8091A76C 10000092 */ beq $zero, $zero, .L8091A9B8 +/* 04D5C 8091A76C 10000092 */ beq $zero, $zero, .L8091A9B8 /* 04D60 8091A770 AC4D0004 */ sw $t5, 0x0004($v0) ## 00000004 glabel L8091A774 -/* 04D64 8091A774 8FA50078 */ lw $a1, 0x0078($sp) +/* 04D64 8091A774 8FA50078 */ lw $a1, 0x0078($sp) /* 04D68 8091A778 85190198 */ lh $t9, 0x0198($t0) ## 00000198 /* 04D6C 8091A77C 84B80000 */ lh $t8, 0x0000($a1) ## 00000000 -/* 04D70 8091A780 03195021 */ addu $t2, $t8, $t9 -/* 04D74 8091A784 1000008C */ beq $zero, $zero, .L8091A9B8 +/* 04D70 8091A780 03195021 */ addu $t2, $t8, $t9 +/* 04D74 8091A784 1000008C */ beq $zero, $zero, .L8091A9B8 /* 04D78 8091A788 A4AA0000 */ sh $t2, 0x0000($a1) ## 00000000 glabel L8091A78C -/* 04D7C 8091A78C 8FA50078 */ lw $a1, 0x0078($sp) +/* 04D7C 8091A78C 8FA50078 */ lw $a1, 0x0078($sp) /* 04D80 8091A790 850B019A */ lh $t3, 0x019A($t0) ## 0000019A /* 04D84 8091A794 84AC0000 */ lh $t4, 0x0000($a1) ## 00000000 -/* 04D88 8091A798 018B7821 */ addu $t7, $t4, $t3 -/* 04D8C 8091A79C 10000086 */ beq $zero, $zero, .L8091A9B8 +/* 04D88 8091A798 018B7821 */ addu $t7, $t4, $t3 +/* 04D8C 8091A79C 10000086 */ beq $zero, $zero, .L8091A9B8 /* 04D90 8091A7A0 A4AF0000 */ sh $t7, 0x0000($a1) ## 00000000 glabel L8091A7A4 -/* 04D94 8091A7A4 8FA50078 */ lw $a1, 0x0078($sp) +/* 04D94 8091A7A4 8FA50078 */ lw $a1, 0x0078($sp) /* 04D98 8091A7A8 850D019E */ lh $t5, 0x019E($t0) ## 0000019E /* 04D9C 8091A7AC 84AE0000 */ lh $t6, 0x0000($a1) ## 00000000 /* 04DA0 8091A7B0 84B90002 */ lh $t9, 0x0002($a1) ## 00000002 -/* 04DA4 8091A7B4 01CDC021 */ addu $t8, $t6, $t5 +/* 04DA4 8091A7B4 01CDC021 */ addu $t8, $t6, $t5 /* 04DA8 8091A7B8 A4B80000 */ sh $t8, 0x0000($a1) ## 00000000 /* 04DAC 8091A7BC 850A01A0 */ lh $t2, 0x01A0($t0) ## 000001A0 -/* 04DB0 8091A7C0 032A6021 */ addu $t4, $t9, $t2 -/* 04DB4 8091A7C4 1000007C */ beq $zero, $zero, .L8091A9B8 +/* 04DB0 8091A7C0 032A6021 */ addu $t4, $t9, $t2 +/* 04DB4 8091A7C4 1000007C */ beq $zero, $zero, .L8091A9B8 /* 04DB8 8091A7C8 A4AC0002 */ sh $t4, 0x0002($a1) ## 00000002 glabel L8091A7CC /* 04DBC 8091A7CC 850B01B4 */ lh $t3, 0x01B4($t0) ## 000001B4 -/* 04DC0 8091A7D0 55600008 */ bnel $t3, $zero, .L8091A7F4 +/* 04DC0 8091A7D0 55600008 */ bnel $t3, $zero, .L8091A7F4 /* 04DC4 8091A7D4 850E01B8 */ lh $t6, 0x01B8($t0) ## 000001B8 /* 04DC8 8091A7D8 850F0198 */ lh $t7, 0x0198($t0) ## 00000198 -/* 04DCC 8091A7DC 29E1F574 */ slti $at, $t7, 0xF574 -/* 04DD0 8091A7E0 50200004 */ beql $at, $zero, .L8091A7F4 +/* 04DCC 8091A7DC 29E1F574 */ slti $at, $t7, 0xF574 +/* 04DD0 8091A7E0 50200004 */ beql $at, $zero, .L8091A7F4 /* 04DD4 8091A7E4 850E01B8 */ lh $t6, 0x01B8($t0) ## 000001B8 -/* 04DD8 8091A7E8 10000073 */ beq $zero, $zero, .L8091A9B8 +/* 04DD8 8091A7E8 10000073 */ beq $zero, $zero, .L8091A9B8 /* 04DDC 8091A7EC ACC00000 */ sw $zero, 0x0000($a2) ## 00000000 /* 04DE0 8091A7F0 850E01B8 */ lh $t6, 0x01B8($t0) ## 000001B8 .L8091A7F4: /* 04DE4 8091A7F4 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 04DE8 8091A7F8 55C1000A */ bnel $t6, $at, .L8091A824 +/* 04DE8 8091A7F8 55C1000A */ bnel $t6, $at, .L8091A824 /* 04DEC 8091A7FC 8D2202C0 */ lw $v0, 0x02C0($t1) ## 000002C0 /* 04DF0 8091A800 8D2202C0 */ lw $v0, 0x02C0($t1) ## 000002C0 /* 04DF4 8091A804 3C183232 */ lui $t8, 0x3232 ## $t8 = 32320000 @@ -185,7 +185,7 @@ glabel L8091A7CC /* 04DFC 8091A80C 244D0008 */ addiu $t5, $v0, 0x0008 ## $t5 = 00000008 /* 04E00 8091A810 AD2D02C0 */ sw $t5, 0x02C0($t1) ## 000002C0 /* 04E04 8091A814 AC580004 */ sw $t8, 0x0004($v0) ## 00000004 -/* 04E08 8091A818 10000007 */ beq $zero, $zero, .L8091A838 +/* 04E08 8091A818 10000007 */ beq $zero, $zero, .L8091A838 /* 04E0C 8091A81C AC440000 */ sw $a0, 0x0000($v0) ## 00000000 /* 04E10 8091A820 8D2202C0 */ lw $v0, 0x02C0($t1) ## 000002C0 .L8091A824: @@ -195,24 +195,24 @@ glabel L8091A7CC /* 04E20 8091A830 AC4A0004 */ sw $t2, 0x0004($v0) ## 00000004 /* 04E24 8091A834 AC440000 */ sw $a0, 0x0000($v0) ## 00000000 .L8091A838: -/* 04E28 8091A838 8FA50078 */ lw $a1, 0x0078($sp) +/* 04E28 8091A838 8FA50078 */ lw $a1, 0x0078($sp) /* 04E2C 8091A83C 00E02025 */ or $a0, $a3, $zero ## $a0 = 00000000 -/* 04E30 8091A840 0C0344D0 */ jal func_800D1340 -/* 04E34 8091A844 AFA9005C */ sw $t1, 0x005C($sp) -/* 04E38 8091A848 8FAC0070 */ lw $t4, 0x0070($sp) -/* 04E3C 8091A84C 8FA9005C */ lw $t1, 0x005C($sp) +/* 04E30 8091A840 0C0344D0 */ jal Matrix_TranslateThenRotateZYX +/* 04E34 8091A844 AFA9005C */ sw $t1, 0x005C($sp) +/* 04E38 8091A848 8FAC0070 */ lw $t4, 0x0070($sp) +/* 04E3C 8091A84C 8FA9005C */ lw $t1, 0x005C($sp) /* 04E40 8091A850 8D8B0000 */ lw $t3, 0x0000($t4) ## 00000000 -/* 04E44 8091A854 51600025 */ beql $t3, $zero, .L8091A8EC +/* 04E44 8091A854 51600025 */ beql $t3, $zero, .L8091A8EC /* 04E48 8091A858 240B0001 */ addiu $t3, $zero, 0x0001 ## $t3 = 00000001 -/* 04E4C 8091A85C 0C034213 */ jal Matrix_Push -/* 04E50 8091A860 AFA9005C */ sw $t1, 0x005C($sp) -/* 04E54 8091A864 8FA8007C */ lw $t0, 0x007C($sp) +/* 04E4C 8091A85C 0C034213 */ jal Matrix_Push +/* 04E50 8091A860 AFA9005C */ sw $t1, 0x005C($sp) +/* 04E54 8091A864 8FA8007C */ lw $t0, 0x007C($sp) /* 04E58 8091A868 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 04E5C 8091A86C 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 /* 04E60 8091A870 C50C01F8 */ lwc1 $f12, 0x01F8($t0) ## 000001F8 -/* 04E64 8091A874 0C0342A3 */ jal Matrix_Scale +/* 04E64 8091A874 0C0342A3 */ jal Matrix_Scale /* 04E68 8091A878 C50E0224 */ lwc1 $f14, 0x0224($t0) ## 00000224 -/* 04E6C 8091A87C 8FA9005C */ lw $t1, 0x005C($sp) +/* 04E6C 8091A87C 8FA9005C */ lw $t1, 0x005C($sp) /* 04E70 8091A880 3C0EDA38 */ lui $t6, 0xDA38 ## $t6 = DA380000 /* 04E74 8091A884 35CE0003 */ ori $t6, $t6, 0x0003 ## $t6 = DA380003 /* 04E78 8091A888 8D2202C0 */ lw $v0, 0x02C0($t1) ## 000002C0 @@ -221,50 +221,50 @@ glabel L8091A7CC /* 04E84 8091A894 244F0008 */ addiu $t7, $v0, 0x0008 ## $t7 = 00000008 /* 04E88 8091A898 AD2F02C0 */ sw $t7, 0x02C0($t1) ## 000002C0 /* 04E8C 8091A89C AC4E0000 */ sw $t6, 0x0000($v0) ## 00000000 -/* 04E90 8091A8A0 8FAD0068 */ lw $t5, 0x0068($sp) +/* 04E90 8091A8A0 8FAD0068 */ lw $t5, 0x0068($sp) /* 04E94 8091A8A4 240612CF */ addiu $a2, $zero, 0x12CF ## $a2 = 000012CF /* 04E98 8091A8A8 8DA40000 */ lw $a0, 0x0000($t5) ## 00000000 -/* 04E9C 8091A8AC AFA9005C */ sw $t1, 0x005C($sp) -/* 04EA0 8091A8B0 0C0346A2 */ jal Matrix_NewMtx -/* 04EA4 8091A8B4 AFA20030 */ sw $v0, 0x0030($sp) -/* 04EA8 8091A8B8 8FA30030 */ lw $v1, 0x0030($sp) -/* 04EAC 8091A8BC 8FA9005C */ lw $t1, 0x005C($sp) +/* 04E9C 8091A8AC AFA9005C */ sw $t1, 0x005C($sp) +/* 04EA0 8091A8B0 0C0346A2 */ jal Matrix_NewMtx +/* 04EA4 8091A8B4 AFA20030 */ sw $v0, 0x0030($sp) +/* 04EA8 8091A8B8 8FA30030 */ lw $v1, 0x0030($sp) +/* 04EAC 8091A8BC 8FA9005C */ lw $t1, 0x005C($sp) /* 04EB0 8091A8C0 3C19DE00 */ lui $t9, 0xDE00 ## $t9 = DE000000 /* 04EB4 8091A8C4 AC620004 */ sw $v0, 0x0004($v1) ## 00000004 /* 04EB8 8091A8C8 8D2202C0 */ lw $v0, 0x02C0($t1) ## 000002C0 /* 04EBC 8091A8CC 24580008 */ addiu $t8, $v0, 0x0008 ## $t8 = 00000008 /* 04EC0 8091A8D0 AD3802C0 */ sw $t8, 0x02C0($t1) ## 000002C0 /* 04EC4 8091A8D4 AC590000 */ sw $t9, 0x0000($v0) ## 00000000 -/* 04EC8 8091A8D8 8FAA0070 */ lw $t2, 0x0070($sp) +/* 04EC8 8091A8D8 8FAA0070 */ lw $t2, 0x0070($sp) /* 04ECC 8091A8DC 8D4C0000 */ lw $t4, 0x0000($t2) ## 00000000 -/* 04ED0 8091A8E0 0C034221 */ jal Matrix_Pull +/* 04ED0 8091A8E0 0C034221 */ jal Matrix_Pull /* 04ED4 8091A8E4 AC4C0004 */ sw $t4, 0x0004($v0) ## 00000004 /* 04ED8 8091A8E8 240B0001 */ addiu $t3, $zero, 0x0001 ## $t3 = 00000001 .L8091A8EC: -/* 04EDC 8091A8EC 10000032 */ beq $zero, $zero, .L8091A9B8 -/* 04EE0 8091A8F0 AFAB0060 */ sw $t3, 0x0060($sp) +/* 04EDC 8091A8EC 10000032 */ beq $zero, $zero, .L8091A9B8 +/* 04EE0 8091A8F0 AFAB0060 */ sw $t3, 0x0060($sp) glabel L8091A8F4 -/* 04EE4 8091A8F4 8FA50078 */ lw $a1, 0x0078($sp) +/* 04EE4 8091A8F4 8FA50078 */ lw $a1, 0x0078($sp) /* 04EE8 8091A8F8 00E02025 */ or $a0, $a3, $zero ## $a0 = 00000000 -/* 04EEC 8091A8FC 0C0344D0 */ jal func_800D1340 -/* 04EF0 8091A900 AFA9005C */ sw $t1, 0x005C($sp) -/* 04EF4 8091A904 8FAF0070 */ lw $t7, 0x0070($sp) -/* 04EF8 8091A908 8FA9005C */ lw $t1, 0x005C($sp) +/* 04EEC 8091A8FC 0C0344D0 */ jal Matrix_TranslateThenRotateZYX +/* 04EF0 8091A900 AFA9005C */ sw $t1, 0x005C($sp) +/* 04EF4 8091A904 8FAF0070 */ lw $t7, 0x0070($sp) +/* 04EF8 8091A908 8FA9005C */ lw $t1, 0x005C($sp) /* 04EFC 8091A90C 8DEE0000 */ lw $t6, 0x0000($t7) ## 00000000 -/* 04F00 8091A910 51C00028 */ beql $t6, $zero, .L8091A9B4 +/* 04F00 8091A910 51C00028 */ beql $t6, $zero, .L8091A9B4 /* 04F04 8091A914 24190001 */ addiu $t9, $zero, 0x0001 ## $t9 = 00000001 -/* 04F08 8091A918 0C034213 */ jal Matrix_Push -/* 04F0C 8091A91C AFA9005C */ sw $t1, 0x005C($sp) -/* 04F10 8091A920 8FAD006C */ lw $t5, 0x006C($sp) -/* 04F14 8091A924 8FA8007C */ lw $t0, 0x007C($sp) +/* 04F08 8091A918 0C034213 */ jal Matrix_Push +/* 04F0C 8091A91C AFA9005C */ sw $t1, 0x005C($sp) +/* 04F10 8091A920 8FAD006C */ lw $t5, 0x006C($sp) +/* 04F14 8091A924 8FA8007C */ lw $t0, 0x007C($sp) /* 04F18 8091A928 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 04F1C 8091A92C 000DC080 */ sll $t8, $t5, 2 -/* 04F20 8091A930 0118C821 */ addu $t9, $t0, $t8 +/* 04F1C 8091A92C 000DC080 */ sll $t8, $t5, 2 +/* 04F20 8091A930 0118C821 */ addu $t9, $t0, $t8 /* 04F24 8091A934 C72C01BC */ lwc1 $f12, 0x01BC($t9) ## 000001BC -/* 04F28 8091A938 44066000 */ mfc1 $a2, $f12 -/* 04F2C 8091A93C 0C0342A3 */ jal Matrix_Scale -/* 04F30 8091A940 46006386 */ mov.s $f14, $f12 -/* 04F34 8091A944 8FA9005C */ lw $t1, 0x005C($sp) +/* 04F28 8091A938 44066000 */ mfc1 $a2, $f12 +/* 04F2C 8091A93C 0C0342A3 */ jal Matrix_Scale +/* 04F30 8091A940 46006386 */ mov.s $f14, $f12 +/* 04F34 8091A944 8FA9005C */ lw $t1, 0x005C($sp) /* 04F38 8091A948 3C0CDA38 */ lui $t4, 0xDA38 ## $t4 = DA380000 /* 04F3C 8091A94C 358C0003 */ ori $t4, $t4, 0x0003 ## $t4 = DA380003 /* 04F40 8091A950 8D2202C0 */ lw $v0, 0x02C0($t1) ## 000002C0 @@ -273,40 +273,40 @@ glabel L8091A8F4 /* 04F4C 8091A95C 244A0008 */ addiu $t2, $v0, 0x0008 ## $t2 = 00000008 /* 04F50 8091A960 AD2A02C0 */ sw $t2, 0x02C0($t1) ## 000002C0 /* 04F54 8091A964 AC4C0000 */ sw $t4, 0x0000($v0) ## 00000000 -/* 04F58 8091A968 8FAB0068 */ lw $t3, 0x0068($sp) +/* 04F58 8091A968 8FAB0068 */ lw $t3, 0x0068($sp) /* 04F5C 8091A96C 240612E4 */ addiu $a2, $zero, 0x12E4 ## $a2 = 000012E4 /* 04F60 8091A970 8D640000 */ lw $a0, 0x0000($t3) ## 00000000 -/* 04F64 8091A974 AFA9005C */ sw $t1, 0x005C($sp) -/* 04F68 8091A978 0C0346A2 */ jal Matrix_NewMtx -/* 04F6C 8091A97C AFA20028 */ sw $v0, 0x0028($sp) -/* 04F70 8091A980 8FA30028 */ lw $v1, 0x0028($sp) -/* 04F74 8091A984 8FA9005C */ lw $t1, 0x005C($sp) +/* 04F64 8091A974 AFA9005C */ sw $t1, 0x005C($sp) +/* 04F68 8091A978 0C0346A2 */ jal Matrix_NewMtx +/* 04F6C 8091A97C AFA20028 */ sw $v0, 0x0028($sp) +/* 04F70 8091A980 8FA30028 */ lw $v1, 0x0028($sp) +/* 04F74 8091A984 8FA9005C */ lw $t1, 0x005C($sp) /* 04F78 8091A988 3C0EDE00 */ lui $t6, 0xDE00 ## $t6 = DE000000 /* 04F7C 8091A98C AC620004 */ sw $v0, 0x0004($v1) ## 00000004 /* 04F80 8091A990 8D2202C0 */ lw $v0, 0x02C0($t1) ## 000002C0 /* 04F84 8091A994 244F0008 */ addiu $t7, $v0, 0x0008 ## $t7 = 00000008 /* 04F88 8091A998 AD2F02C0 */ sw $t7, 0x02C0($t1) ## 000002C0 /* 04F8C 8091A99C AC4E0000 */ sw $t6, 0x0000($v0) ## 00000000 -/* 04F90 8091A9A0 8FAD0070 */ lw $t5, 0x0070($sp) +/* 04F90 8091A9A0 8FAD0070 */ lw $t5, 0x0070($sp) /* 04F94 8091A9A4 8DB80000 */ lw $t8, 0x0000($t5) ## 00000000 -/* 04F98 8091A9A8 0C034221 */ jal Matrix_Pull +/* 04F98 8091A9A8 0C034221 */ jal Matrix_Pull /* 04F9C 8091A9AC AC580004 */ sw $t8, 0x0004($v0) ## 00000004 /* 04FA0 8091A9B0 24190001 */ addiu $t9, $zero, 0x0001 ## $t9 = 00000001 .L8091A9B4: -/* 04FA4 8091A9B4 AFB90060 */ sw $t9, 0x0060($sp) +/* 04FA4 8091A9B4 AFB90060 */ sw $t9, 0x0060($sp) glabel L8091A9B8 .L8091A9B8: -/* 04FA8 8091A9B8 8FAA0068 */ lw $t2, 0x0068($sp) +/* 04FA8 8091A9B8 8FAA0068 */ lw $t2, 0x0068($sp) /* 04FAC 8091A9BC 3C068092 */ lui $a2, %hi(D_8091B4A0) ## $a2 = 80920000 /* 04FB0 8091A9C0 24C6B4A0 */ addiu $a2, $a2, %lo(D_8091B4A0) ## $a2 = 8091B4A0 /* 04FB4 8091A9C4 27A4004C */ addiu $a0, $sp, 0x004C ## $a0 = FFFFFFE4 /* 04FB8 8091A9C8 240712FA */ addiu $a3, $zero, 0x12FA ## $a3 = 000012FA -/* 04FBC 8091A9CC 0C031AD5 */ jal func_800C6B54 +/* 04FBC 8091A9CC 0C031AD5 */ jal Graph_CloseDisps /* 04FC0 8091A9D0 8D450000 */ lw $a1, 0x0000($t2) ## 00000000 -/* 04FC4 8091A9D4 8FBF0014 */ lw $ra, 0x0014($sp) -/* 04FC8 8091A9D8 8FA20060 */ lw $v0, 0x0060($sp) +/* 04FC4 8091A9D4 8FBF0014 */ lw $ra, 0x0014($sp) +/* 04FC8 8091A9D8 8FA20060 */ lw $v0, 0x0060($sp) /* 04FCC 8091A9DC 27BD0068 */ addiu $sp, $sp, 0x0068 ## $sp = 00000000 -/* 04FD0 8091A9E0 03E00008 */ jr $ra +/* 04FD0 8091A9E0 03E00008 */ jr $ra /* 04FD4 8091A9E4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Mo/BossMo_Draw.s b/asm/non_matchings/overlays/actors/ovl_Boss_Mo/BossMo_Draw.s index e984097fc3..036d200e2e 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Mo/BossMo_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Mo/BossMo_Draw.s @@ -10,7 +10,7 @@ glabel BossMo_Draw /* 09028 80924B28 24C66AD0 */ addiu $a2, $a2, %lo(D_80926AD0) ## $a2 = 80926AD0 /* 0902C 80924B2C 27A40060 */ addiu $a0, $sp, 0x0060 ## $a0 = FFFFFFE0 /* 09030 80924B30 24071B2E */ addiu $a3, $zero, 0x1B2E ## $a3 = 00001B2E -/* 09034 80924B34 0C031AB1 */ jal func_800C6AC4 +/* 09034 80924B34 0C031AB1 */ jal Graph_OpenDisps /* 09038 80924B38 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 /* 0903C 80924B3C 8FAF0084 */ lw $t7, 0x0084($sp) /* 09040 80924B40 0C024F46 */ jal func_80093D18 @@ -67,7 +67,7 @@ glabel BossMo_Draw /* 0910C 80924C0C AFB80024 */ sw $t8, 0x0024($sp) /* 09110 80924C10 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 09114 80924C14 AFA20054 */ sw $v0, 0x0054($sp) -/* 09118 80924C18 0C0253D0 */ jal Draw_TwoTexScroll +/* 09118 80924C18 0C0253D0 */ jal Gfx_TwoTexScroll /* 0911C 80924C1C AFAF0020 */ sw $t7, 0x0020($sp) /* 09120 80924C20 8FA30054 */ lw $v1, 0x0054($sp) /* 09124 80924C24 3C09FA00 */ lui $t1, 0xFA00 ## $t1 = FA000000 @@ -148,7 +148,7 @@ glabel BossMo_Draw /* 09248 80924D48 24C66AE0 */ addiu $a2, $a2, %lo(D_80926AE0) ## $a2 = 80926AE0 /* 0924C 80924D4C 27A40060 */ addiu $a0, $sp, 0x0060 ## $a0 = FFFFFFE0 /* 09250 80924D50 24071B6F */ addiu $a3, $zero, 0x1B6F ## $a3 = 00001B6F -/* 09254 80924D54 0C031AD5 */ jal func_800C6B54 +/* 09254 80924D54 0C031AD5 */ jal Graph_CloseDisps /* 09258 80924D58 8D450000 */ lw $a1, 0x0000($t2) ## 00000000 /* 0925C 80924D5C 8FBF003C */ lw $ra, 0x003C($sp) /* 09260 80924D60 8FB00034 */ lw $s0, 0x0034($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Mo/func_8091C538.s b/asm/non_matchings/overlays/actors/ovl_Boss_Mo/func_8091C538.s index dbeb7cf17f..6e91dc824a 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Mo/func_8091C538.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Mo/func_8091C538.s @@ -1377,7 +1377,7 @@ glabel L8091D430 /* 01DF0 8091D8F0 46109381 */ sub.s $f14, $f18, $f16 /* 01DF4 8091D8F4 AE480F78 */ sw $t0, 0x0F78($s2) ## 00000F78 /* 01DF8 8091D8F8 8E090058 */ lw $t1, 0x0058($s0) ## 00000058 -/* 01DFC 8091D8FC 0C03F494 */ jal func_800FD250 +/* 01DFC 8091D8FC 0C03F494 */ jal Math_atan2f /* 01E00 8091D900 AE490F7C */ sw $t1, 0x0F7C($s2) ## 00000F7C /* 01E04 8091D904 E6401004 */ swc1 $f0, 0x1004($s2) ## 00001004 /* 01E08 8091D908 10000003 */ beq $zero, $zero, .L8091D918 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Mo/func_8091F5A8.s b/asm/non_matchings/overlays/actors/ovl_Boss_Mo/func_8091F5A8.s index cc06a33e48..69cc01760e 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Mo/func_8091F5A8.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Mo/func_8091F5A8.s @@ -292,7 +292,7 @@ glabel L8091F8F8 /* 03EE4 8091F9E4 C60401DC */ lwc1 $f4, 0x01DC($s0) ## 000001DC /* 03EE8 8091F9E8 E7AC0098 */ swc1 $f12, 0x0098($sp) /* 03EEC 8091F9EC 46062381 */ sub.s $f14, $f4, $f6 -/* 03EF0 8091F9F0 0C03F494 */ jal func_800FD250 +/* 03EF0 8091F9F0 0C03F494 */ jal Math_atan2f /* 03EF4 8091F9F4 E7AE0090 */ swc1 $f14, 0x0090($sp) /* 03EF8 8091F9F8 C7B00098 */ lwc1 $f16, 0x0098($sp) /* 03EFC 8091F9FC C7B20090 */ lwc1 $f18, 0x0090($sp) @@ -302,7 +302,7 @@ glabel L8091F8F8 /* 03F0C 8091FA0C 46129282 */ mul.s $f10, $f18, $f18 /* 03F10 8091FA10 460A4100 */ add.s $f4, $f8, $f10 /* 03F14 8091FA14 E7A4003C */ swc1 $f4, 0x003C($sp) -/* 03F18 8091FA18 0C03F494 */ jal func_800FD250 +/* 03F18 8091FA18 0C03F494 */ jal Math_atan2f /* 03F1C 8091FA1C 46002384 */ sqrt.s $f14, $f4 /* 03F20 8091FA20 3C018092 */ lui $at, %hi(D_80926D08) ## $at = 80920000 /* 03F24 8091FA24 C7A20088 */ lwc1 $f2, 0x0088($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Mo/func_809206C4.s b/asm/non_matchings/overlays/actors/ovl_Boss_Mo/func_809206C4.s index d4d8297883..a5503439b6 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Mo/func_809206C4.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Mo/func_809206C4.s @@ -65,7 +65,7 @@ glabel L80920734 /* 04CB8 809207B8 C62A0F70 */ lwc1 $f10, 0x0F70($s1) ## 00000F70 /* 04CBC 809207BC E7AC0088 */ swc1 $f12, 0x0088($sp) /* 04CC0 809207C0 460A4381 */ sub.s $f14, $f8, $f10 -/* 04CC4 809207C4 0C03F494 */ jal func_800FD250 +/* 04CC4 809207C4 0C03F494 */ jal Math_atan2f /* 04CC8 809207C8 E7AE0084 */ swc1 $f14, 0x0084($sp) /* 04CCC 809207CC C7AC0088 */ lwc1 $f12, 0x0088($sp) /* 04CD0 809207D0 C7AE0084 */ lwc1 $f14, 0x0084($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Mo/func_809216D0.s b/asm/non_matchings/overlays/actors/ovl_Boss_Mo/func_809216D0.s index d620ebfcfa..03bf62d6e3 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Mo/func_809216D0.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Mo/func_809216D0.s @@ -1121,7 +1121,7 @@ glabel L80921B08 /* 06BD4 809226D4 C62601DC */ lwc1 $f6, 0x01DC($s1) ## 000001DC /* 06BD8 809226D8 E7AC00DC */ swc1 $f12, 0x00DC($sp) /* 06BDC 809226DC 46123381 */ sub.s $f14, $f6, $f18 -/* 06BE0 809226E0 0C03F494 */ jal func_800FD250 +/* 06BE0 809226E0 0C03F494 */ jal Math_atan2f /* 06BE4 809226E4 E7AE00D4 */ swc1 $f14, 0x00D4($sp) /* 06BE8 809226E8 3C018092 */ lui $at, %hi(D_80926E28) ## $at = 80920000 /* 06BEC 809226EC C4286E28 */ lwc1 $f8, %lo(D_80926E28)($at) @@ -1140,7 +1140,7 @@ glabel L80921B08 /* 06C20 80922720 46044000 */ add.s $f0, $f8, $f4 /* 06C24 80922724 468034A0 */ cvt.s.w $f18, $f6 /* 06C28 80922728 46000384 */ sqrt.s $f14, $f0 -/* 06C2C 8092272C 0C03F494 */ jal func_800FD250 +/* 06C2C 8092272C 0C03F494 */ jal Math_atan2f /* 06C30 80922730 E7B200CC */ swc1 $f18, 0x00CC($sp) /* 06C34 80922734 3C018092 */ lui $at, %hi(D_80926E2C) ## $at = 80920000 /* 06C38 80922738 C42A6E2C */ lwc1 $f10, %lo(D_80926E2C)($at) diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Mo/func_80923870.s b/asm/non_matchings/overlays/actors/ovl_Boss_Mo/func_80923870.s index ea0a67fec5..8f89495df0 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Mo/func_80923870.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Mo/func_80923870.s @@ -26,7 +26,7 @@ glabel func_80923870 /* 07DCC 809238CC 24C66A10 */ addiu $a2, $a2, %lo(D_80926A10) ## $a2 = 80926A10 /* 07DD0 809238D0 27A400FC */ addiu $a0, $sp, 0x00FC ## $a0 = FFFFFFCC /* 07DD4 809238D4 240718DE */ addiu $a3, $zero, 0x18DE ## $a3 = 000018DE -/* 07DD8 809238D8 0C031AB1 */ jal func_800C6AC4 +/* 07DD8 809238D8 0C031AB1 */ jal Graph_OpenDisps /* 07DDC 809238DC 00A09825 */ or $s3, $a1, $zero ## $s3 = 00000000 /* 07DE0 809238E0 3C010001 */ lui $at, 0x0001 ## $at = 00010000 /* 07DE4 809238E4 02C11021 */ addu $v0, $s6, $at @@ -475,7 +475,7 @@ glabel func_80923870 /* 08488 80923F88 24C66A40 */ addiu $a2, $a2, %lo(D_80926A40) ## $a2 = 80926A40 /* 0848C 80923F8C 27A400FC */ addiu $a0, $sp, 0x00FC ## $a0 = FFFFFFCC /* 08490 80923F90 8EC50000 */ lw $a1, 0x0000($s6) ## 00000000 -/* 08494 80923F94 0C031AD5 */ jal func_800C6B54 +/* 08494 80923F94 0C031AD5 */ jal Graph_CloseDisps /* 08498 80923F98 240719AB */ addiu $a3, $zero, 0x19AB ## $a3 = 000019AB /* 0849C 80923F9C 8FBF005C */ lw $ra, 0x005C($sp) /* 084A0 80923FA0 D7B40018 */ ldc1 $f20, 0x0018($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Mo/func_80923FDC.s b/asm/non_matchings/overlays/actors/ovl_Boss_Mo/func_80923FDC.s index cfea2f3c1b..119b9153a7 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Mo/func_80923FDC.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Mo/func_80923FDC.s @@ -9,7 +9,7 @@ glabel func_80923FDC /* 084F8 80923FF8 24C66A50 */ addiu $a2, $a2, %lo(D_80926A50) ## $a2 = 80926A50 /* 084FC 80923FFC 27A40060 */ addiu $a0, $sp, 0x0060 ## $a0 = FFFFFFE8 /* 08500 80924000 240719B6 */ addiu $a3, $zero, 0x19B6 ## $a3 = 000019B6 -/* 08504 80924004 0C031AB1 */ jal func_800C6AC4 +/* 08504 80924004 0C031AB1 */ jal Graph_OpenDisps /* 08508 80924008 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 /* 0850C 8092400C 0C034213 */ jal Matrix_Push /* 08510 80924010 00000000 */ nop @@ -68,7 +68,7 @@ glabel func_80923FDC /* 085E4 809240E4 AFA2005C */ sw $v0, 0x005C($sp) /* 085E8 809240E8 000FC400 */ sll $t8, $t7, 16 /* 085EC 809240EC 0018CC03 */ sra $t9, $t8, 16 -/* 085F0 809240F0 0C0253D0 */ jal Draw_TwoTexScroll +/* 085F0 809240F0 0C0253D0 */ jal Gfx_TwoTexScroll /* 085F4 809240F4 AFB90020 */ sw $t9, 0x0020($sp) /* 085F8 809240F8 8FA3005C */ lw $v1, 0x005C($sp) /* 085FC 809240FC 3C0CE700 */ lui $t4, 0xE700 ## $t4 = E7000000 @@ -139,7 +139,7 @@ glabel func_80923FDC /* 08700 80924200 24C66A70 */ addiu $a2, $a2, %lo(D_80926A70) ## $a2 = 80926A70 /* 08704 80924204 27A40060 */ addiu $a0, $sp, 0x0060 ## $a0 = FFFFFFE8 /* 08708 80924208 24071A18 */ addiu $a3, $zero, 0x1A18 ## $a3 = 00001A18 -/* 0870C 8092420C 0C031AD5 */ jal func_800C6B54 +/* 0870C 8092420C 0C031AD5 */ jal Graph_CloseDisps /* 08710 80924210 8DA50000 */ lw $a1, 0x0000($t5) ## 00000000 /* 08714 80924214 8FBF003C */ lw $ra, 0x003C($sp) /* 08718 80924218 8FB00038 */ lw $s0, 0x0038($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Mo/func_80924228.s b/asm/non_matchings/overlays/actors/ovl_Boss_Mo/func_80924228.s index d05706e6fd..10126ebb9c 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Mo/func_80924228.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Mo/func_80924228.s @@ -10,7 +10,7 @@ glabel func_80924228 /* 08748 80924248 24C66A80 */ addiu $a2, $a2, %lo(D_80926A80) ## $a2 = 80926A80 /* 0874C 8092424C 27A400CC */ addiu $a0, $sp, 0x00CC ## $a0 = FFFFFFE4 /* 08750 80924250 24071A20 */ addiu $a3, $zero, 0x1A20 ## $a3 = 00001A20 -/* 08754 80924254 0C031AB1 */ jal func_800C6AC4 +/* 08754 80924254 0C031AB1 */ jal Graph_OpenDisps /* 08758 80924258 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 /* 0875C 8092425C 8FAF00EC */ lw $t7, 0x00EC($sp) /* 08760 80924260 C6280028 */ lwc1 $f8, 0x0028($s1) ## 00000028 @@ -64,7 +64,7 @@ glabel func_80924228 /* 0881C 8092431C AFAA0010 */ sw $t2, 0x0010($sp) /* 08820 80924320 AFAD0028 */ sw $t5, 0x0028($sp) /* 08824 80924324 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 08828 80924328 0C0253D0 */ jal Draw_TwoTexScroll +/* 08828 80924328 0C0253D0 */ jal Gfx_TwoTexScroll /* 0882C 8092432C AFA200C8 */ sw $v0, 0x00C8($sp) /* 08830 80924330 8FA900C8 */ lw $t1, 0x00C8($sp) /* 08834 80924334 3C18DB06 */ lui $t8, 0xDB06 ## $t8 = DB060000 @@ -99,7 +99,7 @@ glabel func_80924228 /* 088A8 809243A8 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 088AC 809243AC 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 /* 088B0 809243B0 AFA200C4 */ sw $v0, 0x00C4($sp) -/* 088B4 809243B4 0C0253D0 */ jal Draw_TwoTexScroll +/* 088B4 809243B4 0C0253D0 */ jal Gfx_TwoTexScroll /* 088B8 809243B8 00C33021 */ addu $a2, $a2, $v1 /* 088BC 809243BC 8FA800C4 */ lw $t0, 0x00C4($sp) /* 088C0 809243C0 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 @@ -429,7 +429,7 @@ glabel func_80924228 /* 08DB0 809248B0 AFA20054 */ sw $v0, 0x0054($sp) /* 08DB4 809248B4 00195400 */ sll $t2, $t9, 16 /* 08DB8 809248B8 000A7C03 */ sra $t7, $t2, 16 -/* 08DBC 809248BC 0C0253D0 */ jal Draw_TwoTexScroll +/* 08DBC 809248BC 0C0253D0 */ jal Gfx_TwoTexScroll /* 08DC0 809248C0 AFAF0020 */ sw $t7, 0x0020($sp) /* 08DC4 809248C4 8FA80054 */ lw $t0, 0x0054($sp) /* 08DC8 809248C8 AD020004 */ sw $v0, 0x0004($t0) ## 00000004 @@ -444,7 +444,7 @@ glabel func_80924228 /* 08DEC 809248EC C6280F7C */ lwc1 $f8, 0x0F7C($s1) ## 00000F7C /* 08DF0 809248F0 E7AC008C */ swc1 $f12, 0x008C($sp) /* 08DF4 809248F4 46064381 */ sub.s $f14, $f8, $f6 -/* 08DF8 809248F8 0C03F494 */ jal func_800FD250 +/* 08DF8 809248F8 0C03F494 */ jal Math_atan2f /* 08DFC 809248FC E7AE0084 */ swc1 $f14, 0x0084($sp) /* 08E00 80924900 C7B0008C */ lwc1 $f16, 0x008C($sp) /* 08E04 80924904 C7A20084 */ lwc1 $f2, 0x0084($sp) @@ -453,7 +453,7 @@ glabel func_80924228 /* 08E10 80924910 C7AC0088 */ lwc1 $f12, 0x0088($sp) /* 08E14 80924914 46021482 */ mul.s $f18, $f2, $f2 /* 08E18 80924918 46125000 */ add.s $f0, $f10, $f18 -/* 08E1C 8092491C 0C03F494 */ jal func_800FD250 +/* 08E1C 8092491C 0C03F494 */ jal Math_atan2f /* 08E20 80924920 46000384 */ sqrt.s $f14, $f0 /* 08E24 80924924 3C014120 */ lui $at, 0x4120 ## $at = 41200000 /* 08E28 80924928 44804000 */ mtc1 $zero, $f8 ## $f8 = 0.00 @@ -565,7 +565,7 @@ glabel func_80924228 /* 08FCC 80924ACC 24C66AC0 */ addiu $a2, $a2, %lo(D_80926AC0) ## $a2 = 80926AC0 /* 08FD0 80924AD0 27A400CC */ addiu $a0, $sp, 0x00CC ## $a0 = FFFFFFE4 /* 08FD4 80924AD4 24071B21 */ addiu $a3, $zero, 0x1B21 ## $a3 = 00001B21 -/* 08FD8 80924AD8 0C031AD5 */ jal func_800C6B54 +/* 08FD8 80924AD8 0C031AD5 */ jal Graph_CloseDisps /* 08FDC 80924ADC 8F050000 */ lw $a1, 0x0000($t8) ## 00000000 /* 08FE0 80924AE0 8FA500EC */ lw $a1, 0x00EC($sp) /* 08FE4 80924AE4 3C040001 */ lui $a0, 0x0001 ## $a0 = 00010000 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Mo/func_80924D70.s b/asm/non_matchings/overlays/actors/ovl_Boss_Mo/func_80924D70.s index 80b5a085ce..41725f13de 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Mo/func_80924D70.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Mo/func_80924D70.s @@ -178,7 +178,7 @@ glabel func_80924D70 /* 09508 80925008 C6060034 */ lwc1 $f6, 0x0034($s0) ## 00000034 /* 0950C 8092500C 460A8301 */ sub.s $f12, $f16, $f10 /* 09510 80925010 E7A600A8 */ swc1 $f6, 0x00A8($sp) -/* 09514 80925014 0C03F494 */ jal func_800FD250 +/* 09514 80925014 0C03F494 */ jal Math_atan2f /* 09518 80925018 46049381 */ sub.s $f14, $f18, $f4 /* 0951C 8092501C 46000306 */ mov.s $f12, $f0 /* 09520 80925020 0C034348 */ jal Matrix_RotateY diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Mo/func_80925480.s b/asm/non_matchings/overlays/actors/ovl_Boss_Mo/func_80925480.s index ba68ec3a76..44d9005292 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Mo/func_80925480.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Mo/func_80925480.s @@ -21,7 +21,7 @@ glabel func_80925480 /* 099CC 809254CC 24C66AF0 */ addiu $a2, $a2, %lo(D_80926AF0) ## $a2 = 80926AF0 /* 099D0 809254D0 27A400CC */ addiu $a0, $sp, 0x00CC ## $a0 = FFFFFFDC /* 099D4 809254D4 24071C60 */ addiu $a3, $zero, 0x1C60 ## $a3 = 00001C60 -/* 099D8 809254D8 0C031AB1 */ jal func_800C6AC4 +/* 099D8 809254D8 0C031AB1 */ jal Graph_OpenDisps /* 099DC 809254DC 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 099E0 809254E0 0C034213 */ jal Matrix_Push /* 099E4 809254E4 00000000 */ nop @@ -203,7 +203,7 @@ glabel func_80925480 /* 09C84 80925784 016C9021 */ addu $s2, $t3, $t4 /* 09C88 80925788 00419824 */ and $s3, $v0, $at /* 09C8C 8092578C 8E0402D0 */ lw $a0, 0x02D0($s0) ## 000002D0 -/* 09C90 80925790 0C024DDD */ jal func_80093774 +/* 09C90 80925790 0C024DDD */ jal Gfx_CallSetupDL /* 09C94 80925794 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 09C98 80925798 AE0202D0 */ sw $v0, 0x02D0($s0) ## 000002D0 /* 09C9C 8092579C 244D0008 */ addiu $t5, $v0, 0x0008 ## $t5 = 00000008 @@ -485,7 +485,7 @@ glabel func_80925480 /* 0A0CC 80925BCC 24C66B50 */ addiu $a2, $a2, %lo(D_80926B50) ## $a2 = 80926B50 /* 0A0D0 80925BD0 27A400CC */ addiu $a0, $sp, 0x00CC ## $a0 = FFFFFFDC /* 0A0D4 80925BD4 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 0A0D8 80925BD8 0C031AD5 */ jal func_800C6B54 +/* 0A0D8 80925BD8 0C031AD5 */ jal Graph_CloseDisps /* 0A0DC 80925BDC 24071D3A */ addiu $a3, $zero, 0x1D3A ## $a3 = 00001D3A /* 0A0E0 80925BE0 8FBF004C */ lw $ra, 0x004C($sp) /* 0A0E4 80925BE4 D7B40018 */ ldc1 $f20, 0x0018($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/BossSst_Draw.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/BossSst_Draw.s index 667417cd42..d954b537c2 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/BossSst_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/BossSst_Draw.s @@ -1,28 +1,28 @@ glabel BossSst_Draw /* 08098 80934668 27BDFF38 */ addiu $sp, $sp, 0xFF38 ## $sp = FFFFFF38 -/* 0809C 8093466C AFBF005C */ sw $ra, 0x005C($sp) -/* 080A0 80934670 AFBE0058 */ sw $s8, 0x0058($sp) -/* 080A4 80934674 AFB70054 */ sw $s7, 0x0054($sp) -/* 080A8 80934678 AFB60050 */ sw $s6, 0x0050($sp) -/* 080AC 8093467C AFB5004C */ sw $s5, 0x004C($sp) -/* 080B0 80934680 AFB40048 */ sw $s4, 0x0048($sp) -/* 080B4 80934684 AFB30044 */ sw $s3, 0x0044($sp) -/* 080B8 80934688 AFB20040 */ sw $s2, 0x0040($sp) -/* 080BC 8093468C AFB1003C */ sw $s1, 0x003C($sp) -/* 080C0 80934690 AFB00038 */ sw $s0, 0x0038($sp) -/* 080C4 80934694 F7B60030 */ sdc1 $f22, 0x0030($sp) -/* 080C8 80934698 F7B40028 */ sdc1 $f20, 0x0028($sp) -/* 080CC 8093469C AFA500CC */ sw $a1, 0x00CC($sp) +/* 0809C 8093466C AFBF005C */ sw $ra, 0x005C($sp) +/* 080A0 80934670 AFBE0058 */ sw $s8, 0x0058($sp) +/* 080A4 80934674 AFB70054 */ sw $s7, 0x0054($sp) +/* 080A8 80934678 AFB60050 */ sw $s6, 0x0050($sp) +/* 080AC 8093467C AFB5004C */ sw $s5, 0x004C($sp) +/* 080B0 80934680 AFB40048 */ sw $s4, 0x0048($sp) +/* 080B4 80934684 AFB30044 */ sw $s3, 0x0044($sp) +/* 080B8 80934688 AFB20040 */ sw $s2, 0x0040($sp) +/* 080BC 8093468C AFB1003C */ sw $s1, 0x003C($sp) +/* 080C0 80934690 AFB00038 */ sw $s0, 0x0038($sp) +/* 080C4 80934694 F7B60030 */ sdc1 $f22, 0x0030($sp) +/* 080C8 80934698 F7B40028 */ sdc1 $f20, 0x0028($sp) +/* 080CC 8093469C AFA500CC */ sw $a1, 0x00CC($sp) /* 080D0 809346A0 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 /* 080D4 809346A4 00809825 */ or $s3, $a0, $zero ## $s3 = 00000000 /* 080D8 809346A8 3C068093 */ lui $a2, %hi(D_809378F0) ## $a2 = 80930000 /* 080DC 809346AC 24C678F0 */ addiu $a2, $a2, %lo(D_809378F0) ## $a2 = 809378F0 /* 080E0 809346B0 27A400B0 */ addiu $a0, $sp, 0x00B0 ## $a0 = FFFFFFE8 /* 080E4 809346B4 240719A3 */ addiu $a3, $zero, 0x19A3 ## $a3 = 000019A3 -/* 080E8 809346B8 0C031AB1 */ jal func_800C6AC4 +/* 080E8 809346B8 0C031AB1 */ jal Graph_OpenDisps /* 080EC 809346BC 00A0A025 */ or $s4, $a1, $zero ## $s4 = 00000000 -/* 080F0 809346C0 8FAF00CC */ lw $t7, 0x00CC($sp) -/* 080F4 809346C4 0C024F46 */ jal func_80093D18 +/* 080F0 809346C0 8FAF00CC */ lw $t7, 0x00CC($sp) +/* 080F4 809346C4 0C024F46 */ jal func_80093D18 /* 080F8 809346C8 8DE40000 */ lw $a0, 0x0000($t7) ## 00000000 /* 080FC 809346CC 8E8202C0 */ lw $v0, 0x02C0($s4) ## 000002C0 /* 08100 809346D0 3C19FA00 */ lui $t9, 0xFA00 ## $t9 = FA000000 @@ -35,18 +35,18 @@ glabel BossSst_Draw /* 0811C 809346EC 908C0001 */ lbu $t4, 0x0001($a0) ## 80937465 /* 08120 809346F0 90890000 */ lbu $t1, 0x0000($a0) ## 80937464 /* 08124 809346F4 90980002 */ lbu $t8, 0x0002($a0) ## 80937466 -/* 08128 809346F8 000C6C00 */ sll $t5, $t4, 16 -/* 0812C 809346FC 00095600 */ sll $t2, $t1, 24 +/* 08128 809346F8 000C6C00 */ sll $t5, $t4, 16 +/* 0812C 809346FC 00095600 */ sll $t2, $t1, 24 /* 08130 80934700 014D7025 */ or $t6, $t2, $t5 ## $t6 = 00000000 -/* 08134 80934704 0018CA00 */ sll $t9, $t8, 8 +/* 08134 80934704 0018CA00 */ sll $t9, $t8, 8 /* 08138 80934708 01D94025 */ or $t0, $t6, $t9 ## $t0 = FA000080 /* 0813C 8093470C 350900FF */ ori $t1, $t0, 0x00FF ## $t1 = FA0000FF /* 08140 80934710 3C0B8093 */ lui $t3, %hi(D_80937448) ## $t3 = 80930000 /* 08144 80934714 AC490004 */ sw $t1, 0x0004($v0) ## 00000004 -/* 08148 80934718 8D6B7448 */ lw $t3, %lo(D_80937448)($t3) +/* 08148 80934718 8D6B7448 */ lw $t3, %lo(D_80937448)($t3) /* 0814C 8093471C 3C048093 */ lui $a0, %hi(D_80937468) ## $a0 = 80930000 /* 08150 80934720 24847468 */ addiu $a0, $a0, %lo(D_80937468) ## $a0 = 80937468 -/* 08154 80934724 1560000B */ bne $t3, $zero, .L80934754 +/* 08154 80934724 1560000B */ bne $t3, $zero, .L80934754 /* 08158 80934728 3C18FB00 */ lui $t8, 0xFB00 ## $t8 = FB000000 /* 0815C 8093472C 8E8202C0 */ lw $v0, 0x02C0($s4) ## 000002C0 /* 08160 80934730 3C0ADB06 */ lui $t2, 0xDB06 ## $t2 = DB060000 @@ -56,7 +56,7 @@ glabel BossSst_Draw /* 08170 80934740 25AD6290 */ addiu $t5, $t5, 0x6290 ## $t5 = 80116290 /* 08174 80934744 354A0020 */ ori $t2, $t2, 0x0020 ## $t2 = DB060020 /* 08178 80934748 AC4A0000 */ sw $t2, 0x0000($v0) ## 00000000 -/* 0817C 8093474C 10000017 */ beq $zero, $zero, .L809347AC +/* 0817C 8093474C 10000017 */ beq $zero, $zero, .L809347AC /* 08180 80934750 AC4D0004 */ sw $t5, 0x0004($v0) ## 00000004 .L80934754: /* 08184 80934754 8E8202C0 */ lw $v0, 0x02C0($s4) ## 000002C0 @@ -68,10 +68,10 @@ glabel BossSst_Draw /* 0819C 8093476C 908B0001 */ lbu $t3, 0x0001($a0) ## 80937469 /* 081A0 80934770 90990000 */ lbu $t9, 0x0000($a0) ## 80937468 /* 081A4 80934774 908F0002 */ lbu $t7, 0x0002($a0) ## 8093746A -/* 081A8 80934778 000B6400 */ sll $t4, $t3, 16 -/* 081AC 8093477C 00194600 */ sll $t0, $t9, 24 +/* 081A8 80934778 000B6400 */ sll $t4, $t3, 16 +/* 081AC 8093477C 00194600 */ sll $t0, $t9, 24 /* 081B0 80934780 010C5025 */ or $t2, $t0, $t4 ## $t2 = FA000088 -/* 081B4 80934784 000FC200 */ sll $t8, $t7, 8 +/* 081B4 80934784 000FC200 */ sll $t8, $t7, 8 /* 081B8 80934788 01587025 */ or $t6, $t2, $t8 ## $t6 = FB000088 /* 081BC 8093478C AC4E0004 */ sw $t6, 0x0004($v0) ## 00000004 /* 081C0 80934790 8E8202C0 */ lw $v0, 0x02C0($s4) ## 000002C0 @@ -89,100 +89,100 @@ glabel BossSst_Draw /* 081EC 809347BC 3C0C8093 */ lui $t4, %hi(func_809345F0) ## $t4 = 80930000 /* 081F0 809347C0 258C45F0 */ addiu $t4, $t4, %lo(func_809345F0) ## $t4 = 809345F0 /* 081F4 809347C4 250845A4 */ addiu $t0, $t0, %lo(func_809345A4) ## $t0 = 809345A4 -/* 081F8 809347C8 AFA80010 */ sw $t0, 0x0010($sp) -/* 081FC 809347CC AFAC0014 */ sw $t4, 0x0014($sp) -/* 08200 809347D0 AFB30018 */ sw $s3, 0x0018($sp) -/* 08204 809347D4 0C0286B2 */ jal func_800A1AC8 -/* 08208 809347D8 8FA400CC */ lw $a0, 0x00CC($sp) +/* 081F8 809347C8 AFA80010 */ sw $t0, 0x0010($sp) +/* 081FC 809347CC AFAC0014 */ sw $t4, 0x0014($sp) +/* 08200 809347D0 AFB30018 */ sw $s3, 0x0018($sp) +/* 08204 809347D4 0C0286B2 */ jal SkelAnime_DrawSV +/* 08208 809347D8 8FA400CC */ lw $a0, 0x00CC($sp) /* 0820C 809347DC 866D09D2 */ lh $t5, 0x09D2($s3) ## 000009D2 -/* 08210 809347E0 8FAF00CC */ lw $t7, 0x00CC($sp) -/* 08214 809347E4 29A10002 */ slti $at, $t5, 0x0002 -/* 08218 809347E8 5420007F */ bnel $at, $zero, .L809349E8 -/* 0821C 809347EC 8FA900CC */ lw $t1, 0x00CC($sp) -/* 08220 809347F0 0C024F61 */ jal func_80093D84 +/* 08210 809347E0 8FAF00CC */ lw $t7, 0x00CC($sp) +/* 08214 809347E4 29A10002 */ slti $at, $t5, 0x0002 +/* 08218 809347E8 5420007F */ bnel $at, $zero, .L809349E8 +/* 0821C 809347EC 8FA900CC */ lw $t1, 0x00CC($sp) +/* 08220 809347F0 0C024F61 */ jal func_80093D84 /* 08224 809347F4 8DE40000 */ lw $a0, 0x0000($t7) ## 00000000 /* 08228 809347F8 866A09D0 */ lh $t2, 0x09D0($s3) ## 000009D0 /* 0822C 809347FC 24030007 */ addiu $v1, $zero, 0x0007 ## $v1 = 00000007 /* 08230 80934800 2406001C */ addiu $a2, $zero, 0x001C ## $a2 = 0000001C /* 08234 80934804 25580004 */ addiu $t8, $t2, 0x0004 ## $t8 = 00000004 -/* 08238 80934808 0303001A */ div $zero, $t8, $v1 -/* 0823C 8093480C 0000A810 */ mfhi $s5 +/* 08238 80934808 0303001A */ div $zero, $t8, $v1 +/* 0823C 8093480C 0000A810 */ mfhi $s5 /* 08240 80934810 26B90002 */ addiu $t9, $s5, 0x0002 ## $t9 = 00000002 /* 08244 80934814 866209D2 */ lh $v0, 0x09D2($s3) ## 000009D2 -/* 08248 80934818 02A60019 */ multu $s5, $a2 +/* 08248 80934818 02A60019 */ multu $s5, $a2 /* 0824C 8093481C 00008825 */ or $s1, $zero, $zero ## $s1 = 00000000 -/* 08250 80934820 00021043 */ sra $v0, $v0, 1 -/* 08254 80934824 14600002 */ bne $v1, $zero, .L80934830 +/* 08250 80934820 00021043 */ sra $v0, $v0, 1 +/* 08254 80934824 14600002 */ bne $v1, $zero, .L80934830 /* 08258 80934828 00000000 */ nop /* 0825C 8093482C 0007000D */ break 7 .L80934830: /* 08260 80934830 2401FFFF */ addiu $at, $zero, 0xFFFF ## $at = FFFFFFFF -/* 08264 80934834 14610004 */ bne $v1, $at, .L80934848 +/* 08264 80934834 14610004 */ bne $v1, $at, .L80934848 /* 08268 80934838 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 0826C 8093483C 17010002 */ bne $t8, $at, .L80934848 +/* 0826C 8093483C 17010002 */ bne $t8, $at, .L80934848 /* 08270 80934840 00000000 */ nop /* 08274 80934844 0006000D */ break 6 .L80934848: -/* 08278 80934848 00007012 */ mflo $t6 -/* 0827C 8093484C 026E8021 */ addu $s0, $s3, $t6 +/* 08278 80934848 00007012 */ mflo $t6 +/* 0827C 8093484C 026E8021 */ addu $s0, $s3, $t6 /* 08280 80934850 261009D4 */ addiu $s0, $s0, 0x09D4 ## $s0 = 000009D4 -/* 08284 80934854 0323001A */ div $zero, $t9, $v1 -/* 08288 80934858 00004810 */ mfhi $t1 -/* 0828C 8093485C AFB0009C */ sw $s0, 0x009C($sp) -/* 08290 80934860 14600002 */ bne $v1, $zero, .L8093486C +/* 08284 80934854 0323001A */ div $zero, $t9, $v1 +/* 08288 80934858 00004810 */ mfhi $t1 +/* 0828C 8093485C AFB0009C */ sw $s0, 0x009C($sp) +/* 08290 80934860 14600002 */ bne $v1, $zero, .L8093486C /* 08294 80934864 00000000 */ nop /* 08298 80934868 0007000D */ break 7 .L8093486C: /* 0829C 8093486C 2401FFFF */ addiu $at, $zero, 0xFFFF ## $at = FFFFFFFF -/* 082A0 80934870 14610004 */ bne $v1, $at, .L80934884 +/* 082A0 80934870 14610004 */ bne $v1, $at, .L80934884 /* 082A4 80934874 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 082A8 80934878 17210002 */ bne $t9, $at, .L80934884 +/* 082A8 80934878 17210002 */ bne $t9, $at, .L80934884 /* 082AC 8093487C 00000000 */ nop /* 082B0 80934880 0006000D */ break 6 .L80934884: -/* 082B4 80934884 01260019 */ multu $t1, $a2 +/* 082B4 80934884 01260019 */ multu $t1, $a2 /* 082B8 80934888 3C014461 */ lui $at, 0x4461 ## $at = 44610000 -/* 082BC 8093488C 00005812 */ mflo $t3 -/* 082C0 80934890 026B2021 */ addu $a0, $s3, $t3 -/* 082C4 80934894 18400053 */ blez $v0, .L809349E4 +/* 082BC 8093488C 00005812 */ mflo $t3 +/* 082C0 80934890 026B2021 */ addu $a0, $s3, $t3 +/* 082C4 80934894 18400053 */ blez $v0, .L809349E4 /* 082C8 80934898 248409D4 */ addiu $a0, $a0, 0x09D4 ## $a0 = 000009D4 /* 082CC 8093489C 4481B000 */ mtc1 $at, $f22 ## $f22 = 900.00 /* 082D0 809348A0 3C018093 */ lui $at, %hi(D_80937A18) ## $at = 80930000 -/* 082D4 809348A4 C4347A18 */ lwc1 $f20, %lo(D_80937A18)($at) -/* 082D8 809348A8 AFA2008C */ sw $v0, 0x008C($sp) +/* 082D4 809348A4 C4347A18 */ lwc1 $f20, %lo(D_80937A18)($at) +/* 082D8 809348A8 AFA2008C */ sw $v0, 0x008C($sp) .L809348AC: -/* 082DC 809348AC 0C032D94 */ jal func_800CB650 +/* 082DC 809348AC 0C032D94 */ jal func_800CB650 /* 082E0 809348B0 02002825 */ or $a1, $s0, $zero ## $a1 = 000009D4 -/* 082E4 809348B4 4600B03C */ c.lt.s $f22, $f0 +/* 082E4 809348B4 4600B03C */ c.lt.s $f22, $f0 /* 082E8 809348B8 3C128093 */ lui $s2, %hi(D_809369A8) ## $s2 = 80930000 /* 082EC 809348BC 265269A8 */ addiu $s2, $s2, %lo(D_809369A8) ## $s2 = 809369A8 /* 082F0 809348C0 2607000C */ addiu $a3, $s0, 0x000C ## $a3 = 000009E0 -/* 082F4 809348C4 45000039 */ bc1f .L809349AC +/* 082F4 809348C4 45000039 */ bc1f .L809349AC /* 082F8 809348C8 24080003 */ addiu $t0, $zero, 0x0003 ## $t0 = 00000003 -/* 082FC 809348CC 01111023 */ subu $v0, $t0, $s1 -/* 08300 809348D0 0002B080 */ sll $s6, $v0, 2 -/* 08304 809348D4 0002B880 */ sll $s7, $v0, 2 -/* 08308 809348D8 0002F100 */ sll $s8, $v0, 4 -/* 0830C 809348DC 03C2F023 */ subu $s8, $s8, $v0 -/* 08310 809348E0 02E2B821 */ addu $s7, $s7, $v0 -/* 08314 809348E4 02C2B021 */ addu $s6, $s6, $v0 +/* 082FC 809348CC 01111023 */ subu $v0, $t0, $s1 +/* 08300 809348D0 0002B080 */ sll $s6, $v0, 2 +/* 08304 809348D4 0002B880 */ sll $s7, $v0, 2 +/* 08308 809348D8 0002F100 */ sll $s8, $v0, 4 +/* 0830C 809348DC 03C2F023 */ subu $s8, $s8, $v0 +/* 08310 809348E0 02E2B821 */ addu $s7, $s7, $v0 +/* 08314 809348E4 02C2B021 */ addu $s6, $s6, $v0 /* 08318 809348E8 3C0C8093 */ lui $t4, %hi(func_80934628) ## $t4 = 80930000 /* 0831C 809348EC 258C4628 */ addiu $t4, $t4, %lo(func_80934628) ## $t4 = 80934628 -/* 08320 809348F0 0016B040 */ sll $s6, $s6, 1 -/* 08324 809348F4 0017B880 */ sll $s7, $s7, 2 -/* 08328 809348F8 001EF040 */ sll $s8, $s8, 1 +/* 08320 809348F0 0016B040 */ sll $s6, $s6, 1 +/* 08324 809348F4 0017B880 */ sll $s7, $s7, 2 +/* 08328 809348F8 001EF040 */ sll $s8, $s8, 1 /* 0832C 809348FC C60C0000 */ lwc1 $f12, 0x0000($s0) ## 000009D4 /* 08330 80934900 C60E0004 */ lwc1 $f14, 0x0004($s0) ## 000009D8 /* 08334 80934904 8E060008 */ lw $a2, 0x0008($s0) ## 000009DC -/* 08338 80934908 AFAC0068 */ sw $t4, 0x0068($sp) +/* 08338 80934908 AFAC0068 */ sw $t4, 0x0068($sp) /* 0833C 8093490C 27DE0046 */ addiu $s8, $s8, 0x0046 ## $s8 = 00000046 /* 08340 80934910 26F70032 */ addiu $s7, $s7, 0x0032 ## $s7 = 00000032 -/* 08344 80934914 0C0345A5 */ jal func_800D1694 +/* 08344 80934914 0C0345A5 */ jal func_800D1694 /* 08348 80934918 26D60014 */ addiu $s6, $s6, 0x0014 ## $s6 = 00000014 -/* 0834C 8093491C 4406A000 */ mfc1 $a2, $f20 -/* 08350 80934920 4600A306 */ mov.s $f12, $f20 -/* 08354 80934924 4600A386 */ mov.s $f14, $f20 -/* 08358 80934928 0C0342A3 */ jal Matrix_Scale +/* 0834C 8093491C 4406A000 */ mfc1 $a2, $f20 +/* 08350 80934920 4600A306 */ mov.s $f12, $f20 +/* 08354 80934924 4600A386 */ mov.s $f14, $f20 +/* 08358 80934928 0C0342A3 */ jal Matrix_Scale /* 0835C 8093492C 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 /* 08360 80934930 8E8302D0 */ lw $v1, 0x02D0($s4) ## 000002D0 /* 08364 80934934 3C0FDB06 */ lui $t7, 0xDB06 ## $t7 = DB060000 @@ -193,8 +193,8 @@ glabel BossSst_Draw /* 08378 80934948 AC6F0000 */ sw $t7, 0x0000($v1) ## 00000000 /* 0837C 8093494C 8E8302D0 */ lw $v1, 0x02D0($s4) ## 000002D0 /* 08380 80934950 32E900FF */ andi $t1, $s7, 0x00FF ## $t1 = 00000032 -/* 08384 80934954 00095A00 */ sll $t3, $t1, 8 -/* 08388 80934958 0016CE00 */ sll $t9, $s6, 24 +/* 08384 80934954 00095A00 */ sll $t3, $t1, 8 +/* 08388 80934958 0016CE00 */ sll $t9, $s6, 24 /* 0838C 8093495C 246A0008 */ addiu $t2, $v1, 0x0008 ## $t2 = 00000008 /* 08390 80934960 AE8A02D0 */ sw $t2, 0x02D0($s4) ## 000002D0 /* 08394 80934964 032B4025 */ or $t0, $t9, $t3 ## $t0 = 00000000 @@ -203,58 +203,58 @@ glabel BossSst_Draw /* 083A0 80934970 3C18FA00 */ lui $t8, 0xFA00 ## $t8 = FA000000 /* 083A4 80934974 AC780000 */ sw $t8, 0x0000($v1) ## 00000000 /* 083A8 80934978 AC6D0004 */ sw $t5, 0x0004($v1) ## 00000004 -/* 083AC 8093497C 8FAF0068 */ lw $t7, 0x0068($sp) +/* 083AC 8093497C 8FAF0068 */ lw $t7, 0x0068($sp) /* 083B0 80934980 9267014E */ lbu $a3, 0x014E($s3) ## 0000014E /* 083B4 80934984 8E66016C */ lw $a2, 0x016C($s3) ## 0000016C /* 083B8 80934988 8E650150 */ lw $a1, 0x0150($s3) ## 00000150 -/* 083BC 8093498C AFB00018 */ sw $s0, 0x0018($sp) -/* 083C0 80934990 AFA00014 */ sw $zero, 0x0014($sp) -/* 083C4 80934994 AFAF0010 */ sw $t7, 0x0010($sp) +/* 083BC 8093498C AFB00018 */ sw $s0, 0x0018($sp) +/* 083C0 80934990 AFA00014 */ sw $zero, 0x0014($sp) +/* 083C4 80934994 AFAF0010 */ sw $t7, 0x0010($sp) /* 083C8 80934998 8E8A02D0 */ lw $t2, 0x02D0($s4) ## 000002D0 -/* 083CC 8093499C 8FA400CC */ lw $a0, 0x00CC($sp) -/* 083D0 809349A0 0C0289CF */ jal func_800A273C -/* 083D4 809349A4 AFAA001C */ sw $t2, 0x001C($sp) +/* 083CC 8093499C 8FA400CC */ lw $a0, 0x00CC($sp) +/* 083D0 809349A0 0C0289CF */ jal SkelAnime_DrawSV2 +/* 083D4 809349A4 AFAA001C */ sw $t2, 0x001C($sp) /* 083D8 809349A8 AE8202D0 */ sw $v0, 0x02D0($s4) ## 000002D0 .L809349AC: /* 083DC 809349AC 26B50005 */ addiu $s5, $s5, 0x0005 ## $s5 = 00000005 /* 083E0 809349B0 24010007 */ addiu $at, $zero, 0x0007 ## $at = 00000007 -/* 083E4 809349B4 02A1001A */ div $zero, $s5, $at -/* 083E8 809349B8 0000A810 */ mfhi $s5 -/* 083EC 809349BC 0015C0C0 */ sll $t8, $s5, 3 -/* 083F0 809349C0 0315C023 */ subu $t8, $t8, $s5 -/* 083F4 809349C4 8FAE008C */ lw $t6, 0x008C($sp) -/* 083F8 809349C8 0018C080 */ sll $t8, $t8, 2 -/* 083FC 809349CC 02788021 */ addu $s0, $s3, $t8 +/* 083E4 809349B4 02A1001A */ div $zero, $s5, $at +/* 083E8 809349B8 0000A810 */ mfhi $s5 +/* 083EC 809349BC 0015C0C0 */ sll $t8, $s5, 3 +/* 083F0 809349C0 0315C023 */ subu $t8, $t8, $s5 +/* 083F4 809349C4 8FAE008C */ lw $t6, 0x008C($sp) +/* 083F8 809349C8 0018C080 */ sll $t8, $t8, 2 +/* 083FC 809349CC 02788021 */ addu $s0, $s3, $t8 /* 08400 809349D0 26310001 */ addiu $s1, $s1, 0x0001 ## $s1 = 00000001 -/* 08404 809349D4 8FA4009C */ lw $a0, 0x009C($sp) +/* 08404 809349D4 8FA4009C */ lw $a0, 0x009C($sp) /* 08408 809349D8 261009D4 */ addiu $s0, $s0, 0x09D4 ## $s0 = 000013A8 -/* 0840C 809349DC 162EFFB3 */ bne $s1, $t6, .L809348AC -/* 08410 809349E0 AFB0009C */ sw $s0, 0x009C($sp) +/* 0840C 809349DC 162EFFB3 */ bne $s1, $t6, .L809348AC +/* 08410 809349E0 AFB0009C */ sw $s0, 0x009C($sp) .L809349E4: -/* 08414 809349E4 8FA900CC */ lw $t1, 0x00CC($sp) +/* 08414 809349E4 8FA900CC */ lw $t1, 0x00CC($sp) .L809349E8: /* 08418 809349E8 3C068093 */ lui $a2, %hi(D_80937900) ## $a2 = 80930000 /* 0841C 809349EC 24C67900 */ addiu $a2, $a2, %lo(D_80937900) ## $a2 = 80937900 /* 08420 809349F0 27A400B0 */ addiu $a0, $sp, 0x00B0 ## $a0 = FFFFFFE8 /* 08424 809349F4 240719FE */ addiu $a3, $zero, 0x19FE ## $a3 = 000019FE -/* 08428 809349F8 0C031AD5 */ jal func_800C6B54 +/* 08428 809349F8 0C031AD5 */ jal Graph_CloseDisps /* 0842C 809349FC 8D250000 */ lw $a1, 0x0000($t1) ## 00000000 /* 08430 80934A00 02602025 */ or $a0, $s3, $zero ## $a0 = 00000000 -/* 08434 80934A04 0C24D8E7 */ jal func_8093639C -/* 08438 80934A08 8FA500CC */ lw $a1, 0x00CC($sp) -/* 0843C 80934A0C 8FBF005C */ lw $ra, 0x005C($sp) -/* 08440 80934A10 D7B40028 */ ldc1 $f20, 0x0028($sp) -/* 08444 80934A14 D7B60030 */ ldc1 $f22, 0x0030($sp) -/* 08448 80934A18 8FB00038 */ lw $s0, 0x0038($sp) -/* 0844C 80934A1C 8FB1003C */ lw $s1, 0x003C($sp) -/* 08450 80934A20 8FB20040 */ lw $s2, 0x0040($sp) -/* 08454 80934A24 8FB30044 */ lw $s3, 0x0044($sp) -/* 08458 80934A28 8FB40048 */ lw $s4, 0x0048($sp) -/* 0845C 80934A2C 8FB5004C */ lw $s5, 0x004C($sp) -/* 08460 80934A30 8FB60050 */ lw $s6, 0x0050($sp) -/* 08464 80934A34 8FB70054 */ lw $s7, 0x0054($sp) -/* 08468 80934A38 8FBE0058 */ lw $s8, 0x0058($sp) -/* 0846C 80934A3C 03E00008 */ jr $ra +/* 08434 80934A04 0C24D8E7 */ jal func_8093639C +/* 08438 80934A08 8FA500CC */ lw $a1, 0x00CC($sp) +/* 0843C 80934A0C 8FBF005C */ lw $ra, 0x005C($sp) +/* 08440 80934A10 D7B40028 */ ldc1 $f20, 0x0028($sp) +/* 08444 80934A14 D7B60030 */ ldc1 $f22, 0x0030($sp) +/* 08448 80934A18 8FB00038 */ lw $s0, 0x0038($sp) +/* 0844C 80934A1C 8FB1003C */ lw $s1, 0x003C($sp) +/* 08450 80934A20 8FB20040 */ lw $s2, 0x0040($sp) +/* 08454 80934A24 8FB30044 */ lw $s3, 0x0044($sp) +/* 08458 80934A28 8FB40048 */ lw $s4, 0x0048($sp) +/* 0845C 80934A2C 8FB5004C */ lw $s5, 0x004C($sp) +/* 08460 80934A30 8FB60050 */ lw $s6, 0x0050($sp) +/* 08464 80934A34 8FB70054 */ lw $s7, 0x0054($sp) +/* 08468 80934A38 8FBE0058 */ lw $s8, 0x0058($sp) +/* 0846C 80934A3C 03E00008 */ jr $ra /* 08470 80934A40 27BD00C8 */ addiu $sp, $sp, 0x00C8 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/BossSst_Init.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/BossSst_Init.s index 17d9f2f02b..b51e4aec56 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/BossSst_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/BossSst_Init.s @@ -1,69 +1,69 @@ glabel BossSst_Init /* 00000 8092C5D0 27BDFFB0 */ addiu $sp, $sp, 0xFFB0 ## $sp = FFFFFFB0 -/* 00004 8092C5D4 AFB10030 */ sw $s1, 0x0030($sp) +/* 00004 8092C5D4 AFB10030 */ sw $s1, 0x0030($sp) /* 00008 8092C5D8 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 -/* 0000C 8092C5DC AFBF0034 */ sw $ra, 0x0034($sp) -/* 00010 8092C5E0 AFB0002C */ sw $s0, 0x002C($sp) +/* 0000C 8092C5DC AFBF0034 */ sw $ra, 0x0034($sp) +/* 00010 8092C5E0 AFB0002C */ sw $s0, 0x002C($sp) /* 00014 8092C5E4 3C058093 */ lui $a1, %hi(D_8093788C) ## $a1 = 80930000 /* 00018 8092C5E8 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 0001C 8092C5EC 0C01E037 */ jal Actor_ProcessInitChain - + /* 00020 8092C5F0 24A5788C */ addiu $a1, $a1, %lo(D_8093788C) ## $a1 = 8093788C /* 00024 8092C5F4 260506B4 */ addiu $a1, $s0, 0x06B4 ## $a1 = 000006B4 -/* 00028 8092C5F8 AFA50044 */ sw $a1, 0x0044($sp) +/* 00028 8092C5F8 AFA50044 */ sw $a1, 0x0044($sp) /* 0002C 8092C5FC 0C0170D9 */ jal ActorCollider_AllocCylinder - + /* 00030 8092C600 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 00034 8092C604 260503D4 */ addiu $a1, $s0, 0x03D4 ## $a1 = 000003D4 -/* 00038 8092C608 AFA50040 */ sw $a1, 0x0040($sp) -/* 0003C 8092C60C 0C016EFE */ jal func_8005BBF8 +/* 00038 8092C608 AFA50040 */ sw $a1, 0x0040($sp) +/* 0003C 8092C60C 0C016EFE */ jal func_8005BBF8 /* 00040 8092C610 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 00044 8092C614 3C058093 */ lui $a1, %hi(D_8093782C) ## $a1 = 80930000 /* 00048 8092C618 3C068093 */ lui $a2, %hi(D_80937824) ## $a2 = 80930000 /* 0004C 8092C61C 24C67824 */ addiu $a2, $a2, %lo(D_80937824) ## $a2 = 80937824 /* 00050 8092C620 24A5782C */ addiu $a1, $a1, %lo(D_8093782C) ## $a1 = 8093782C -/* 00054 8092C624 0C0187B5 */ jal func_80061ED4 +/* 00054 8092C624 0C0187B5 */ jal func_80061ED4 /* 00058 8092C628 26040098 */ addiu $a0, $s0, 0x0098 ## $a0 = 00000098 /* 0005C 8092C62C 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 00060 8092C630 0C00B2DD */ jal Flags_SetSwitch - + /* 00064 8092C634 24050014 */ addiu $a1, $zero, 0x0014 ## $a1 = 00000014 /* 00068 8092C638 860E001C */ lh $t6, 0x001C($s0) ## 0000001C /* 0006C 8092C63C 2401FFFF */ addiu $at, $zero, 0xFFFF ## $at = FFFFFFFF /* 00070 8092C640 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 00074 8092C644 15C100BA */ bne $t6, $at, .L8092C930 -/* 00078 8092C648 8FA50040 */ lw $a1, 0x0040($sp) +/* 00074 8092C644 15C100BA */ bne $t6, $at, .L8092C930 +/* 00078 8092C648 8FA50040 */ lw $a1, 0x0040($sp) /* 0007C 8092C64C 3C028093 */ lui $v0, %hi(D_80937340) ## $v0 = 80930000 /* 00080 8092C650 24427340 */ addiu $v0, $v0, %lo(D_80937340) ## $v0 = 80937340 /* 00084 8092C654 C4440004 */ lwc1 $f4, 0x0004($v0) ## 80937344 /* 00088 8092C658 C4460008 */ lwc1 $f6, 0x0008($v0) ## 80937348 /* 0008C 8092C65C 26241C24 */ addiu $a0, $s1, 0x1C24 ## $a0 = 00001C24 -/* 00090 8092C660 AFA4003C */ sw $a0, 0x003C($sp) +/* 00090 8092C660 AFA4003C */ sw $a0, 0x003C($sp) /* 00094 8092C664 8C470000 */ lw $a3, 0x0000($v0) ## 80937340 /* 00098 8092C668 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 /* 0009C 8092C66C 24060166 */ addiu $a2, $zero, 0x0166 ## $a2 = 00000166 -/* 000A0 8092C670 AFA00018 */ sw $zero, 0x0018($sp) -/* 000A4 8092C674 AFA0001C */ sw $zero, 0x001C($sp) -/* 000A8 8092C678 AFA00020 */ sw $zero, 0x0020($sp) -/* 000AC 8092C67C AFA00024 */ sw $zero, 0x0024($sp) -/* 000B0 8092C680 E7A40010 */ swc1 $f4, 0x0010($sp) +/* 000A0 8092C670 AFA00018 */ sw $zero, 0x0018($sp) +/* 000A4 8092C674 AFA0001C */ sw $zero, 0x001C($sp) +/* 000A8 8092C678 AFA00020 */ sw $zero, 0x0020($sp) +/* 000AC 8092C67C AFA00024 */ sw $zero, 0x0024($sp) +/* 000B0 8092C680 E7A40010 */ swc1 $f4, 0x0010($sp) /* 000B4 8092C684 0C00C7D4 */ jal Actor_Spawn ## ActorSpawn -/* 000B8 8092C688 E7A60014 */ swc1 $f6, 0x0014($sp) +/* 000B8 8092C688 E7A60014 */ swc1 $f6, 0x0014($sp) /* 000BC 8092C68C 3C018094 */ lui $at, %hi(D_80938CA0) ## $at = 80940000 /* 000C0 8092C690 3C060601 */ lui $a2, 0x0601 ## $a2 = 06010000 /* 000C4 8092C694 3C070601 */ lui $a3, 0x0601 ## $a3 = 06010000 /* 000C8 8092C698 260F01A8 */ addiu $t7, $s0, 0x01A8 ## $t7 = 000001A8 /* 000CC 8092C69C 261802B6 */ addiu $t8, $s0, 0x02B6 ## $t8 = 000002B6 /* 000D0 8092C6A0 2419002D */ addiu $t9, $zero, 0x002D ## $t9 = 0000002D -/* 000D4 8092C6A4 AC228CA0 */ sw $v0, %lo(D_80938CA0)($at) -/* 000D8 8092C6A8 AFB90018 */ sw $t9, 0x0018($sp) -/* 000DC 8092C6AC AFB80014 */ sw $t8, 0x0014($sp) -/* 000E0 8092C6B0 AFAF0010 */ sw $t7, 0x0010($sp) +/* 000D4 8092C6A4 AC228CA0 */ sw $v0, %lo(D_80938CA0)($at) +/* 000D8 8092C6A8 AFB90018 */ sw $t9, 0x0018($sp) +/* 000DC 8092C6AC AFB80014 */ sw $t8, 0x0014($sp) +/* 000E0 8092C6B0 AFAF0010 */ sw $t7, 0x0010($sp) /* 000E4 8092C6B4 24E7E7B8 */ addiu $a3, $a3, 0xE7B8 ## $a3 = 0600E7B8 /* 000E8 8092C6B8 24C67C40 */ addiu $a2, $a2, 0x7C40 ## $a2 = 06017C40 /* 000EC 8092C6BC 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 000F0 8092C6C0 0C0291BE */ jal func_800A46F8 +/* 000F0 8092C6C0 0C0291BE */ jal SkelAnime_InitSV /* 000F4 8092C6C4 2605014C */ addiu $a1, $s0, 0x014C ## $a1 = 0000014C /* 000F8 8092C6C8 3C054788 */ lui $a1, 0x4788 ## $a1 = 47880000 /* 000FC 8092C6CC 3C068003 */ lui $a2, 0x8003 ## $a2 = 80030000 @@ -71,30 +71,30 @@ glabel BossSst_Init /* 00104 8092C6D4 34A5B800 */ ori $a1, $a1, 0xB800 ## $a1 = 4788B800 /* 00108 8092C6D8 260400B4 */ addiu $a0, $s0, 0x00B4 ## $a0 = 000000B4 /* 0010C 8092C6DC 0C00AC78 */ jal ActorShape_Init - + /* 00110 8092C6E0 3C0742BE */ lui $a3, 0x42BE ## $a3 = 42BE0000 /* 00114 8092C6E4 3C078093 */ lui $a3, %hi(D_809377BC) ## $a3 = 80930000 /* 00118 8092C6E8 260803F4 */ addiu $t0, $s0, 0x03F4 ## $t0 = 000003F4 -/* 0011C 8092C6EC AFA80010 */ sw $t0, 0x0010($sp) +/* 0011C 8092C6EC AFA80010 */ sw $t0, 0x0010($sp) /* 00120 8092C6F0 24E777BC */ addiu $a3, $a3, %lo(D_809377BC) ## $a3 = 809377BC /* 00124 8092C6F4 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 00128 8092C6F8 8FA50040 */ lw $a1, 0x0040($sp) -/* 0012C 8092C6FC 0C017014 */ jal func_8005C050 +/* 00128 8092C6F8 8FA50040 */ lw $a1, 0x0040($sp) +/* 0012C 8092C6FC 0C017014 */ jal func_8005C050 /* 00130 8092C700 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 00134 8092C704 3C078093 */ lui $a3, %hi(D_809377CC) ## $a3 = 80930000 /* 00138 8092C708 24E777CC */ addiu $a3, $a3, %lo(D_809377CC) ## $a3 = 809377CC /* 0013C 8092C70C 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 00140 8092C710 8FA50044 */ lw $a1, 0x0044($sp) +/* 00140 8092C710 8FA50044 */ lw $a1, 0x0044($sp) /* 00144 8092C714 0C01712B */ jal ActorCollider_InitCylinder - + /* 00148 8092C718 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 0014C 8092C71C 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 /* 00150 8092C720 3C018094 */ lui $at, %hi(D_80938C90) ## $at = 80940000 -/* 00154 8092C724 AC308C90 */ sw $s0, %lo(D_80938C90)($at) +/* 00154 8092C724 AC308C90 */ sw $s0, %lo(D_80938C90)($at) /* 00158 8092C728 E6000024 */ swc1 $f0, 0x0024($s0) ## 00000024 /* 0015C 8092C72C 3C018093 */ lui $at, %hi(D_80937990) ## $at = 80930000 /* 00160 8092C730 E6000028 */ swc1 $f0, 0x0028($s0) ## 00000028 -/* 00164 8092C734 C4287990 */ lwc1 $f8, %lo(D_80937990)($at) +/* 00164 8092C734 C4287990 */ lwc1 $f8, %lo(D_80937990)($at) /* 00168 8092C738 8E0A0024 */ lw $t2, 0x0024($s0) ## 00000024 /* 0016C 8092C73C 8E090028 */ lw $t1, 0x0028($s0) ## 00000028 /* 00170 8092C740 E608002C */ swc1 $f8, 0x002C($s0) ## 0000002C @@ -102,73 +102,73 @@ glabel BossSst_Init /* 00178 8092C748 8E0A002C */ lw $t2, 0x002C($s0) ## 0000002C /* 0017C 8092C74C 3C050001 */ lui $a1, 0x0001 ## $a1 = 00010000 /* 00180 8092C750 A60000B6 */ sh $zero, 0x00B6($s0) ## 000000B6 -/* 00184 8092C754 00B12821 */ addu $a1, $a1, $s1 +/* 00184 8092C754 00B12821 */ addu $a1, $a1, $s1 /* 00188 8092C758 AE09000C */ sw $t1, 0x000C($s0) ## 0000000C /* 0018C 8092C75C AE0A0010 */ sw $t2, 0x0010($s0) ## 00000010 /* 00190 8092C760 80A51CBC */ lb $a1, 0x1CBC($a1) ## 00011CBC /* 00194 8092C764 0C00B337 */ jal Flags_GetClear - + /* 00198 8092C768 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 0019C 8092C76C 10400022 */ beq $v0, $zero, .L8092C7F8 +/* 0019C 8092C76C 10400022 */ beq $v0, $zero, .L8092C7F8 /* 001A0 8092C770 3C014348 */ lui $at, 0x4348 ## $at = 43480000 /* 001A4 8092C774 3C0143C8 */ lui $at, 0x43C8 ## $at = 43C80000 /* 001A8 8092C778 44818000 */ mtc1 $at, $f16 ## $f16 = 400.00 /* 001AC 8092C77C 44805000 */ mtc1 $zero, $f10 ## $f10 = 0.00 /* 001B0 8092C780 240BFFFF */ addiu $t3, $zero, 0xFFFF ## $t3 = FFFFFFFF -/* 001B4 8092C784 AFAB0024 */ sw $t3, 0x0024($sp) -/* 001B8 8092C788 8FA4003C */ lw $a0, 0x003C($sp) +/* 001B4 8092C784 AFAB0024 */ sw $t3, 0x0024($sp) +/* 001B8 8092C788 8FA4003C */ lw $a0, 0x003C($sp) /* 001BC 8092C78C 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 /* 001C0 8092C790 2406005D */ addiu $a2, $zero, 0x005D ## $a2 = 0000005D /* 001C4 8092C794 3C07C248 */ lui $a3, 0xC248 ## $a3 = C2480000 -/* 001C8 8092C798 AFA00018 */ sw $zero, 0x0018($sp) -/* 001CC 8092C79C AFA0001C */ sw $zero, 0x001C($sp) -/* 001D0 8092C7A0 AFA00020 */ sw $zero, 0x0020($sp) -/* 001D4 8092C7A4 E7B00014 */ swc1 $f16, 0x0014($sp) +/* 001C8 8092C798 AFA00018 */ sw $zero, 0x0018($sp) +/* 001CC 8092C79C AFA0001C */ sw $zero, 0x001C($sp) +/* 001D0 8092C7A0 AFA00020 */ sw $zero, 0x0020($sp) +/* 001D4 8092C7A4 E7B00014 */ swc1 $f16, 0x0014($sp) /* 001D8 8092C7A8 0C00C7D4 */ jal Actor_Spawn ## ActorSpawn -/* 001DC 8092C7AC E7AA0010 */ swc1 $f10, 0x0010($sp) +/* 001DC 8092C7AC E7AA0010 */ swc1 $f10, 0x0010($sp) /* 001E0 8092C7B0 3C01C348 */ lui $at, 0xC348 ## $at = C3480000 /* 001E4 8092C7B4 44812000 */ mtc1 $at, $f4 ## $f4 = -200.00 /* 001E8 8092C7B8 44809000 */ mtc1 $zero, $f18 ## $f18 = 0.00 -/* 001EC 8092C7BC 8FA4003C */ lw $a0, 0x003C($sp) +/* 001EC 8092C7BC 8FA4003C */ lw $a0, 0x003C($sp) /* 001F0 8092C7C0 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 /* 001F4 8092C7C4 2406005F */ addiu $a2, $zero, 0x005F ## $a2 = 0000005F /* 001F8 8092C7C8 3C07C248 */ lui $a3, 0xC248 ## $a3 = C2480000 -/* 001FC 8092C7CC AFA00018 */ sw $zero, 0x0018($sp) -/* 00200 8092C7D0 AFA0001C */ sw $zero, 0x001C($sp) -/* 00204 8092C7D4 AFA00020 */ sw $zero, 0x0020($sp) -/* 00208 8092C7D8 AFA00024 */ sw $zero, 0x0024($sp) -/* 0020C 8092C7DC E7A40014 */ swc1 $f4, 0x0014($sp) +/* 001FC 8092C7CC AFA00018 */ sw $zero, 0x0018($sp) +/* 00200 8092C7D0 AFA0001C */ sw $zero, 0x001C($sp) +/* 00204 8092C7D4 AFA00020 */ sw $zero, 0x0020($sp) +/* 00208 8092C7D8 AFA00024 */ sw $zero, 0x0024($sp) +/* 0020C 8092C7DC E7A40014 */ swc1 $f4, 0x0014($sp) /* 00210 8092C7E0 0C00C7D4 */ jal Actor_Spawn ## ActorSpawn -/* 00214 8092C7E4 E7B20010 */ swc1 $f18, 0x0010($sp) +/* 00214 8092C7E4 E7B20010 */ swc1 $f18, 0x0010($sp) /* 00218 8092C7E8 0C00B55C */ jal Actor_Kill - + /* 0021C 8092C7EC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00220 8092C7F0 10000094 */ beq $zero, $zero, .L8092CA44 -/* 00224 8092C7F4 8FBF0034 */ lw $ra, 0x0034($sp) +/* 00220 8092C7F0 10000094 */ beq $zero, $zero, .L8092CA44 +/* 00224 8092C7F4 8FBF0034 */ lw $ra, 0x0034($sp) .L8092C7F8: /* 00228 8092C7F8 C6100028 */ lwc1 $f16, 0x0028($s0) ## 00000028 /* 0022C 8092C7FC C6060024 */ lwc1 $f6, 0x0024($s0) ## 00000024 /* 00230 8092C800 44814000 */ mtc1 $at, $f8 ## $f8 = 0.00 /* 00234 8092C804 3C0143C8 */ lui $at, 0x43C8 ## $at = 43C80000 -/* 00238 8092C808 E7B00010 */ swc1 $f16, 0x0010($sp) +/* 00238 8092C808 E7B00010 */ swc1 $f16, 0x0010($sp) /* 0023C 8092C80C C612002C */ lwc1 $f18, 0x002C($s0) ## 0000002C /* 00240 8092C810 44812000 */ mtc1 $at, $f4 ## $f4 = 400.00 -/* 00244 8092C814 46083280 */ add.s $f10, $f6, $f8 -/* 00248 8092C818 AFA00018 */ sw $zero, 0x0018($sp) -/* 0024C 8092C81C 8FA4003C */ lw $a0, 0x003C($sp) -/* 00250 8092C820 46049180 */ add.s $f6, $f18, $f4 -/* 00254 8092C824 44075000 */ mfc1 $a3, $f10 +/* 00244 8092C814 46083280 */ add.s $f10, $f6, $f8 +/* 00248 8092C818 AFA00018 */ sw $zero, 0x0018($sp) +/* 0024C 8092C81C 8FA4003C */ lw $a0, 0x003C($sp) +/* 00250 8092C820 46049180 */ add.s $f6, $f18, $f4 +/* 00254 8092C824 44075000 */ mfc1 $a3, $f10 /* 00258 8092C828 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 /* 0025C 8092C82C 240600E9 */ addiu $a2, $zero, 0x00E9 ## $a2 = 000000E9 -/* 00260 8092C830 E7A60014 */ swc1 $f6, 0x0014($sp) +/* 00260 8092C830 E7A60014 */ swc1 $f6, 0x0014($sp) /* 00264 8092C834 860C00B6 */ lh $t4, 0x00B6($s0) ## 000000B6 -/* 00268 8092C838 AFA00024 */ sw $zero, 0x0024($sp) -/* 0026C 8092C83C AFA00020 */ sw $zero, 0x0020($sp) +/* 00268 8092C838 AFA00024 */ sw $zero, 0x0024($sp) +/* 0026C 8092C83C AFA00020 */ sw $zero, 0x0020($sp) /* 00270 8092C840 0C00C7D4 */ jal Actor_Spawn ## ActorSpawn -/* 00274 8092C844 AFAC001C */ sw $t4, 0x001C($sp) +/* 00274 8092C844 AFAC001C */ sw $t4, 0x001C($sp) /* 00278 8092C848 3C038094 */ lui $v1, %hi(D_80938C98) ## $v1 = 80940000 /* 0027C 8092C84C 24638C98 */ addiu $v1, $v1, %lo(D_80938C98) ## $v1 = 80938C98 /* 00280 8092C850 AC620000 */ sw $v0, 0x0000($v1) ## 80938C98 @@ -177,24 +177,24 @@ glabel BossSst_Init /* 0028C 8092C85C 44815000 */ mtc1 $at, $f10 ## $f10 = -200.00 /* 00290 8092C860 C6080024 */ lwc1 $f8, 0x0024($s0) ## 00000024 /* 00294 8092C864 3C0143C8 */ lui $at, 0x43C8 ## $at = 43C80000 -/* 00298 8092C868 E7B20010 */ swc1 $f18, 0x0010($sp) +/* 00298 8092C868 E7B20010 */ swc1 $f18, 0x0010($sp) /* 0029C 8092C86C C604002C */ lwc1 $f4, 0x002C($s0) ## 0000002C /* 002A0 8092C870 44813000 */ mtc1 $at, $f6 ## $f6 = 400.00 -/* 002A4 8092C874 460A4400 */ add.s $f16, $f8, $f10 -/* 002A8 8092C878 AFA00018 */ sw $zero, 0x0018($sp) +/* 002A4 8092C874 460A4400 */ add.s $f16, $f8, $f10 +/* 002A8 8092C878 AFA00018 */ sw $zero, 0x0018($sp) /* 002AC 8092C87C 240E0001 */ addiu $t6, $zero, 0x0001 ## $t6 = 00000001 -/* 002B0 8092C880 46062200 */ add.s $f8, $f4, $f6 -/* 002B4 8092C884 44078000 */ mfc1 $a3, $f16 -/* 002B8 8092C888 8FA4003C */ lw $a0, 0x003C($sp) +/* 002B0 8092C880 46062200 */ add.s $f8, $f4, $f6 +/* 002B4 8092C884 44078000 */ mfc1 $a3, $f16 +/* 002B8 8092C888 8FA4003C */ lw $a0, 0x003C($sp) /* 002BC 8092C88C 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 002C0 8092C890 E7A80014 */ swc1 $f8, 0x0014($sp) +/* 002C0 8092C890 E7A80014 */ swc1 $f8, 0x0014($sp) /* 002C4 8092C894 860D00B6 */ lh $t5, 0x00B6($s0) ## 000000B6 -/* 002C8 8092C898 AFAE0024 */ sw $t6, 0x0024($sp) -/* 002CC 8092C89C AFA00020 */ sw $zero, 0x0020($sp) +/* 002C8 8092C898 AFAE0024 */ sw $t6, 0x0024($sp) +/* 002CC 8092C89C AFA00020 */ sw $zero, 0x0020($sp) /* 002D0 8092C8A0 240600E9 */ addiu $a2, $zero, 0x00E9 ## $a2 = 000000E9 /* 002D4 8092C8A4 0C00C7D4 */ jal Actor_Spawn ## ActorSpawn -/* 002D8 8092C8A8 AFAD001C */ sw $t5, 0x001C($sp) +/* 002D8 8092C8A8 AFAD001C */ sw $t5, 0x001C($sp) /* 002DC 8092C8AC 3C038094 */ lui $v1, %hi(D_80938C98) ## $v1 = 80940000 /* 002E0 8092C8B0 24638C98 */ addiu $v1, $v1, %lo(D_80938C98) ## $v1 = 80938C98 /* 002E4 8092C8B4 8C780000 */ lw $t8, 0x0000($v1) ## 80938C98 @@ -209,77 +209,77 @@ glabel BossSst_Init /* 00308 8092C8D8 8E090004 */ lw $t1, 0x0004($s0) ## 00000004 /* 0030C 8092C8DC 256B4338 */ addiu $t3, $t3, %lo(func_80934338) ## $t3 = 80934338 /* 00310 8092C8E0 258C52DC */ addiu $t4, $t4, %lo(func_809352DC) ## $t4 = 809352DC -/* 00314 8092C8E4 01215024 */ and $t2, $t1, $at +/* 00314 8092C8E4 01215024 */ and $t2, $t1, $at /* 00318 8092C8E8 AE0A0004 */ sw $t2, 0x0004($s0) ## 00000004 /* 0031C 8092C8EC AE0B0130 */ sw $t3, 0x0130($s0) ## 00000130 /* 00320 8092C8F0 AE0C0134 */ sw $t4, 0x0134($s0) ## 00000134 /* 00324 8092C8F4 3C018093 */ lui $at, %hi(D_80937994) ## $at = 80930000 -/* 00328 8092C8F8 C42A7994 */ lwc1 $f10, %lo(D_80937994)($at) +/* 00328 8092C8F8 C42A7994 */ lwc1 $f10, %lo(D_80937994)($at) /* 0032C 8092C8FC 3C01457A */ lui $at, 0x457A ## $at = 457A0000 /* 00330 8092C900 44818000 */ mtc1 $at, $f16 ## $f16 = 4000.00 /* 00334 8092C904 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 00338 8092C908 E60A03C4 */ swc1 $f10, 0x03C4($s0) ## 000003C4 -/* 0033C 8092C90C 0C24B2A8 */ jal func_8092CAA0 +/* 0033C 8092C90C 0C24B2A8 */ jal func_8092CAA0 /* 00340 8092C910 E610004C */ swc1 $f16, 0x004C($s0) ## 0000004C /* 00344 8092C914 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 00348 8092C918 8FA5003C */ lw $a1, 0x003C($sp) +/* 00348 8092C918 8FA5003C */ lw $a1, 0x003C($sp) /* 0034C 8092C91C 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 00350 8092C920 0C00CDD2 */ jal Actor_ChangeType - + /* 00354 8092C924 24070009 */ addiu $a3, $zero, 0x0009 ## $a3 = 00000009 -/* 00358 8092C928 10000046 */ beq $zero, $zero, .L8092CA44 -/* 0035C 8092C92C 8FBF0034 */ lw $ra, 0x0034($sp) +/* 00358 8092C928 10000046 */ beq $zero, $zero, .L8092CA44 +/* 0035C 8092C92C 8FBF0034 */ lw $ra, 0x0034($sp) .L8092C930: /* 00360 8092C930 3C078093 */ lui $a3, %hi(D_80937620) ## $a3 = 80930000 /* 00364 8092C934 260D03F4 */ addiu $t5, $s0, 0x03F4 ## $t5 = 000003F4 -/* 00368 8092C938 AFAD0010 */ sw $t5, 0x0010($sp) +/* 00368 8092C938 AFAD0010 */ sw $t5, 0x0010($sp) /* 0036C 8092C93C 24E77620 */ addiu $a3, $a3, %lo(D_80937620) ## $a3 = 80937620 -/* 00370 8092C940 0C017014 */ jal func_8005C050 +/* 00370 8092C940 0C017014 */ jal func_8005C050 /* 00374 8092C944 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 00378 8092C948 3C078093 */ lui $a3, %hi(D_809377F8) ## $a3 = 80930000 /* 0037C 8092C94C 24E777F8 */ addiu $a3, $a3, %lo(D_809377F8) ## $a3 = 809377F8 /* 00380 8092C950 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 00384 8092C954 8FA50044 */ lw $a1, 0x0044($sp) +/* 00384 8092C954 8FA50044 */ lw $a1, 0x0044($sp) /* 00388 8092C958 0C01712B */ jal ActorCollider_InitCylinder - + /* 0038C 8092C95C 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 00390 8092C960 860E001C */ lh $t6, 0x001C($s0) ## 0000001C /* 00394 8092C964 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 00398 8092C968 2605014C */ addiu $a1, $s0, 0x014C ## $a1 = 0000014C -/* 0039C 8092C96C 15C00017 */ bne $t6, $zero, .L8092C9CC +/* 0039C 8092C96C 15C00017 */ bne $t6, $zero, .L8092C9CC /* 003A0 8092C970 3C060601 */ lui $a2, 0x0601 ## $a2 = 06010000 /* 003A4 8092C974 3C060600 */ lui $a2, 0x0600 ## $a2 = 06000000 /* 003A8 8092C978 3C070600 */ lui $a3, 0x0600 ## $a3 = 06000000 /* 003AC 8092C97C 260F01A8 */ addiu $t7, $s0, 0x01A8 ## $t7 = 000001A8 /* 003B0 8092C980 261802B6 */ addiu $t8, $s0, 0x02B6 ## $t8 = 000002B6 /* 003B4 8092C984 2419001B */ addiu $t9, $zero, 0x001B ## $t9 = 0000001B -/* 003B8 8092C988 AFB90018 */ sw $t9, 0x0018($sp) -/* 003BC 8092C98C AFB80014 */ sw $t8, 0x0014($sp) -/* 003C0 8092C990 AFAF0010 */ sw $t7, 0x0010($sp) +/* 003B8 8092C988 AFB90018 */ sw $t9, 0x0018($sp) +/* 003BC 8092C98C AFB80014 */ sw $t8, 0x0014($sp) +/* 003C0 8092C990 AFAF0010 */ sw $t7, 0x0010($sp) /* 003C4 8092C994 24E702E8 */ addiu $a3, $a3, 0x02E8 ## $a3 = 060002E8 /* 003C8 8092C998 24C64DE0 */ addiu $a2, $a2, 0x4DE0 ## $a2 = 06004DE0 /* 003CC 8092C99C 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 003D0 8092C9A0 0C0291BE */ jal func_800A46F8 +/* 003D0 8092C9A0 0C0291BE */ jal SkelAnime_InitSV /* 003D4 8092C9A4 2605014C */ addiu $a1, $s0, 0x014C ## $a1 = 0000014C /* 003D8 8092C9A8 8E0303F0 */ lw $v1, 0x03F0($s0) ## 000003F0 /* 003DC 8092C9AC 2404FFFF */ addiu $a0, $zero, 0xFFFF ## $a0 = FFFFFFFF /* 003E0 8092C9B0 A2040194 */ sb $a0, 0x0194($s0) ## 00000194 /* 003E4 8092C9B4 8468002C */ lh $t0, 0x002C($v1) ## 0000002C -/* 003E8 8092C9B8 01040019 */ multu $t0, $a0 -/* 003EC 8092C9BC 00004812 */ mflo $t1 +/* 003E8 8092C9B8 01040019 */ multu $t0, $a0 +/* 003EC 8092C9BC 00004812 */ mflo $t1 /* 003F0 8092C9C0 A469002C */ sh $t1, 0x002C($v1) ## 0000002C -/* 003F4 8092C9C4 1000000D */ beq $zero, $zero, .L8092C9FC +/* 003F4 8092C9C4 1000000D */ beq $zero, $zero, .L8092C9FC /* 003F8 8092C9C8 00000000 */ nop .L8092C9CC: /* 003FC 8092C9CC 3C070600 */ lui $a3, 0x0600 ## $a3 = 06000000 /* 00400 8092C9D0 260A01A8 */ addiu $t2, $s0, 0x01A8 ## $t2 = 000001A8 /* 00404 8092C9D4 260B02B6 */ addiu $t3, $s0, 0x02B6 ## $t3 = 000002B6 /* 00408 8092C9D8 240C001B */ addiu $t4, $zero, 0x001B ## $t4 = 0000001B -/* 0040C 8092C9DC AFAC0018 */ sw $t4, 0x0018($sp) -/* 00410 8092C9E0 AFAB0014 */ sw $t3, 0x0014($sp) -/* 00414 8092C9E4 AFAA0010 */ sw $t2, 0x0010($sp) +/* 0040C 8092C9DC AFAC0018 */ sw $t4, 0x0018($sp) +/* 00410 8092C9E0 AFAB0014 */ sw $t3, 0x0014($sp) +/* 00414 8092C9E4 AFAA0010 */ sw $t2, 0x0010($sp) /* 00418 8092C9E8 24E75860 */ addiu $a3, $a3, 0x5860 ## $a3 = 06005860 -/* 0041C 8092C9EC 0C0291BE */ jal func_800A46F8 +/* 0041C 8092C9EC 0C0291BE */ jal SkelAnime_InitSV /* 00420 8092C9F0 24C6A350 */ addiu $a2, $a2, 0xA350 ## $a2 = FFFFA350 /* 00424 8092C9F4 240D0001 */ addiu $t5, $zero, 0x0001 ## $t5 = 00000001 /* 00428 8092C9F8 A20D0194 */ sb $t5, 0x0194($s0) ## 00000194 @@ -289,24 +289,24 @@ glabel BossSst_Init /* 00434 8092CA04 260400B4 */ addiu $a0, $s0, 0x00B4 ## $a0 = 000000B4 /* 00438 8092CA08 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 /* 0043C 8092CA0C 0C00AC78 */ jal ActorShape_Init - + /* 00440 8092CA10 3C0742BE */ lui $a3, 0x42BE ## $a3 = 42BE0000 /* 00444 8092CA14 240EF254 */ addiu $t6, $zero, 0xF254 ## $t6 = FFFFF254 /* 00448 8092CA18 8E0F0004 */ lw $t7, 0x0004($s0) ## 00000004 /* 0044C 8092CA1C A60E019E */ sh $t6, 0x019E($s0) ## 0000019E /* 00450 8092CA20 3C018093 */ lui $at, %hi(D_80937998) ## $at = 80930000 -/* 00454 8092CA24 C4327998 */ lwc1 $f18, %lo(D_80937998)($at) +/* 00454 8092CA24 C4327998 */ lwc1 $f18, %lo(D_80937998)($at) /* 00458 8092CA28 2401FFFE */ addiu $at, $zero, 0xFFFE ## $at = FFFFFFFE -/* 0045C 8092CA2C 01E1C024 */ and $t8, $t7, $at +/* 0045C 8092CA2C 01E1C024 */ and $t8, $t7, $at /* 00460 8092CA30 AE180004 */ sw $t8, 0x0004($s0) ## 00000004 /* 00464 8092CA34 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00468 8092CA38 0C24BEF9 */ jal func_8092FBE4 +/* 00468 8092CA38 0C24BEF9 */ jal func_8092FBE4 /* 0046C 8092CA3C E612004C */ swc1 $f18, 0x004C($s0) ## 0000004C -/* 00470 8092CA40 8FBF0034 */ lw $ra, 0x0034($sp) +/* 00470 8092CA40 8FBF0034 */ lw $ra, 0x0034($sp) .L8092CA44: -/* 00474 8092CA44 8FB0002C */ lw $s0, 0x002C($sp) -/* 00478 8092CA48 8FB10030 */ lw $s1, 0x0030($sp) -/* 0047C 8092CA4C 03E00008 */ jr $ra +/* 00474 8092CA44 8FB0002C */ lw $s0, 0x002C($sp) +/* 00478 8092CA48 8FB10030 */ lw $s1, 0x0030($sp) +/* 0047C 8092CA4C 03E00008 */ jr $ra /* 00480 8092CA50 27BD0050 */ addiu $sp, $sp, 0x0050 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092CC58.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092CC58.s index ba4f520565..b44869cff7 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092CC58.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092CC58.s @@ -1,39 +1,39 @@ glabel func_8092CC58 /* 00688 8092CC58 27BDFFB0 */ addiu $sp, $sp, 0xFFB0 ## $sp = FFFFFFB0 -/* 0068C 8092CC5C AFBF0034 */ sw $ra, 0x0034($sp) -/* 00690 8092CC60 AFB20030 */ sw $s2, 0x0030($sp) -/* 00694 8092CC64 AFB1002C */ sw $s1, 0x002C($sp) -/* 00698 8092CC68 AFB00028 */ sw $s0, 0x0028($sp) -/* 0069C 8092CC6C AFA50054 */ sw $a1, 0x0054($sp) +/* 0068C 8092CC5C AFBF0034 */ sw $ra, 0x0034($sp) +/* 00690 8092CC60 AFB20030 */ sw $s2, 0x0030($sp) +/* 00694 8092CC64 AFB1002C */ sw $s1, 0x002C($sp) +/* 00698 8092CC68 AFB00028 */ sw $s0, 0x0028($sp) +/* 0069C 8092CC6C AFA50054 */ sw $a1, 0x0054($sp) /* 006A0 8092CC70 84860198 */ lh $a2, 0x0198($a0) ## 00000198 /* 006A4 8092CC74 00809025 */ or $s2, $a0, $zero ## $s2 = 00000000 /* 006A8 8092CC78 8CA71C44 */ lw $a3, 0x1C44($a1) ## 00001C44 -/* 006AC 8092CC7C 10C00002 */ beq $a2, $zero, .L8092CC88 +/* 006AC 8092CC7C 10C00002 */ beq $a2, $zero, .L8092CC88 /* 006B0 8092CC80 24CFFFFF */ addiu $t7, $a2, 0xFFFF ## $t7 = FFFFFFFF /* 006B4 8092CC84 A48F0198 */ sh $t7, 0x0198($a0) ## 00000198 .L8092CC88: /* 006B8 8092CC88 2644014C */ addiu $a0, $s2, 0x014C ## $a0 = 0000014C -/* 006BC 8092CC8C AFA40038 */ sw $a0, 0x0038($sp) +/* 006BC 8092CC8C AFA40038 */ sw $a0, 0x0038($sp) /* 006C0 8092CC90 0C02927F */ jal SkelAnime_FrameUpdateMatrix - -/* 006C4 8092CC94 AFA7004C */ sw $a3, 0x004C($sp) -/* 006C8 8092CC98 10400008 */ beq $v0, $zero, .L8092CCBC -/* 006CC 8092CC9C 8FA7004C */ lw $a3, 0x004C($sp) + +/* 006C4 8092CC94 AFA7004C */ sw $a3, 0x004C($sp) +/* 006C8 8092CC98 10400008 */ beq $v0, $zero, .L8092CCBC +/* 006CC 8092CC9C 8FA7004C */ lw $a3, 0x004C($sp) /* 006D0 8092CCA0 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 /* 006D4 8092CCA4 24A5DC2C */ addiu $a1, $a1, 0xDC2C ## $a1 = 0600DC2C -/* 006D8 8092CCA8 8FA40038 */ lw $a0, 0x0038($sp) +/* 006D8 8092CCA8 8FA40038 */ lw $a0, 0x0038($sp) /* 006DC 8092CCAC 3C06C040 */ lui $a2, 0xC040 ## $a2 = C0400000 -/* 006E0 8092CCB0 0C0294D3 */ jal func_800A534C -/* 006E4 8092CCB4 AFA7004C */ sw $a3, 0x004C($sp) -/* 006E8 8092CCB8 8FA7004C */ lw $a3, 0x004C($sp) +/* 006E0 8092CCB0 0C0294D3 */ jal SkelAnime_ChangeAnimTransitionRepeat +/* 006E4 8092CCB4 AFA7004C */ sw $a3, 0x004C($sp) +/* 006E8 8092CCB8 8FA7004C */ lw $a3, 0x004C($sp) .L8092CCBC: /* 006EC 8092CCBC 86460198 */ lh $a2, 0x0198($s2) ## 00000198 -/* 006F0 8092CCC0 54C00054 */ bnel $a2, $zero, .L8092CE14 -/* 006F4 8092CCC4 28C10222 */ slti $at, $a2, 0x0222 +/* 006F0 8092CCC0 54C00054 */ bnel $a2, $zero, .L8092CE14 +/* 006F4 8092CCC4 28C10222 */ slti $at, $a2, 0x0222 /* 006F8 8092CCC8 3C068094 */ lui $a2, %hi(D_80938C98) ## $a2 = 80940000 /* 006FC 8092CCCC 24C68C98 */ addiu $a2, $a2, %lo(D_80938C98) ## $a2 = 80938C98 /* 00700 8092CCD0 8CC20004 */ lw $v0, 0x0004($a2) ## 80938C9C -/* 00704 8092CCD4 8FA40054 */ lw $a0, 0x0054($sp) +/* 00704 8092CCD4 8FA40054 */ lw $a0, 0x0054($sp) /* 00708 8092CCD8 2401FFDF */ addiu $at, $zero, 0xFFDF ## $at = FFFFFFDF /* 0070C 8092CCDC 8C580004 */ lw $t8, 0x0004($v0) ## 00000004 /* 00710 8092CCE0 24851D64 */ addiu $a1, $a0, 0x1D64 ## $a1 = 00001D64 @@ -44,12 +44,12 @@ glabel func_8092CC58 /* 00724 8092CCF4 354B0001 */ ori $t3, $t2, 0x0001 ## $t3 = 00000001 /* 00728 8092CCF8 AC6B0004 */ sw $t3, 0x0004($v1) ## 00000004 /* 0072C 8092CCFC 8CEC067C */ lw $t4, 0x067C($a3) ## 0000067C -/* 00730 8092CD00 01816824 */ and $t5, $t4, $at -/* 00734 8092CD04 0C01914D */ jal func_80064534 +/* 00730 8092CD00 01816824 */ and $t5, $t4, $at +/* 00734 8092CD04 0C01914D */ jal func_80064534 /* 00738 8092CD08 ACED067C */ sw $t5, 0x067C($a3) ## 0000067C -/* 0073C 8092CD0C 8FA40054 */ lw $a0, 0x0054($sp) +/* 0073C 8092CD0C 8FA40054 */ lw $a0, 0x0054($sp) /* 00740 8092CD10 02402825 */ or $a1, $s2, $zero ## $a1 = 00000000 -/* 00744 8092CD14 0C00B7D5 */ jal func_8002DF54 +/* 00744 8092CD14 0C00B7D5 */ jal func_8002DF54 /* 00748 8092CD18 24060007 */ addiu $a2, $zero, 0x0007 ## $a2 = 00000007 /* 0074C 8092CD1C 3C118093 */ lui $s1, %hi(D_8093734C) ## $s1 = 80930000 /* 00750 8092CD20 3C0141F0 */ lui $at, 0x41F0 ## $at = 41F00000 @@ -59,42 +59,42 @@ glabel func_8092CC58 /* 00760 8092CD30 C6240004 */ lwc1 $f4, 0x0004($s1) ## 80937350 /* 00764 8092CD34 44818000 */ mtc1 $at, $f16 ## $f16 = 300.00 /* 00768 8092CD38 C62A0008 */ lwc1 $f10, 0x0008($s1) ## 80937354 -/* 0076C 8092CD3C 46062200 */ add.s $f8, $f4, $f6 +/* 0076C 8092CD3C 46062200 */ add.s $f8, $f4, $f6 /* 00770 8092CD40 3C108093 */ lui $s0, %hi(D_80937358) ## $s0 = 80930000 /* 00774 8092CD44 26107358 */ addiu $s0, $s0, %lo(D_80937358) ## $s0 = 80937358 -/* 00778 8092CD48 46105480 */ add.s $f18, $f10, $f16 +/* 00778 8092CD48 46105480 */ add.s $f18, $f10, $f16 /* 0077C 8092CD4C E6280004 */ swc1 $f8, 0x0004($s1) ## 80937350 /* 00780 8092CD50 3C058094 */ lui $a1, %hi(D_80938CC4) ## $a1 = 80940000 /* 00784 8092CD54 02003825 */ or $a3, $s0, $zero ## $a3 = 80937358 /* 00788 8092CD58 E6320008 */ swc1 $f18, 0x0008($s1) ## 80937354 -/* 0078C 8092CD5C 84A58CC4 */ lh $a1, %lo(D_80938CC4)($a1) +/* 0078C 8092CD5C 84A58CC4 */ lh $a1, %lo(D_80938CC4)($a1) /* 00790 8092CD60 02203025 */ or $a2, $s1, $zero ## $a2 = 8093734C -/* 00794 8092CD64 0C030136 */ jal func_800C04D8 -/* 00798 8092CD68 8FA40054 */ lw $a0, 0x0054($sp) +/* 00794 8092CD64 0C030136 */ jal func_800C04D8 +/* 00798 8092CD68 8FA40054 */ lw $a0, 0x0054($sp) /* 0079C 8092CD6C 3C068094 */ lui $a2, %hi(D_80938CC4) ## $a2 = 80940000 -/* 007A0 8092CD70 84C68CC4 */ lh $a2, %lo(D_80938CC4)($a2) -/* 007A4 8092CD74 8FA40054 */ lw $a0, 0x0054($sp) -/* 007A8 8092CD78 0C0301E3 */ jal func_800C078C +/* 007A0 8092CD70 84C68CC4 */ lh $a2, %lo(D_80938CC4)($a2) +/* 007A4 8092CD74 8FA40054 */ lw $a0, 0x0054($sp) +/* 007A8 8092CD78 0C0301E3 */ jal func_800C078C /* 007AC 8092CD7C 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 007B0 8092CD80 3C058094 */ lui $a1, %hi(D_80938CC4) ## $a1 = 80940000 -/* 007B4 8092CD84 84A58CC4 */ lh $a1, %lo(D_80938CC4)($a1) -/* 007B8 8092CD88 8FA40054 */ lw $a0, 0x0054($sp) -/* 007BC 8092CD8C 0C0300C5 */ jal func_800C0314 +/* 007B4 8092CD84 84A58CC4 */ lh $a1, %lo(D_80938CC4)($a1) +/* 007B8 8092CD88 8FA40054 */ lw $a0, 0x0054($sp) +/* 007BC 8092CD8C 0C0300C5 */ jal func_800C0314 /* 007C0 8092CD90 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 -/* 007C4 8092CD94 8FA40054 */ lw $a0, 0x0054($sp) +/* 007C4 8092CD94 8FA40054 */ lw $a0, 0x0054($sp) /* 007C8 8092CD98 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 007CC 8092CD9C 0C0300C5 */ jal func_800C0314 +/* 007CC 8092CD9C 0C0300C5 */ jal func_800C0314 /* 007D0 8092CDA0 24060007 */ addiu $a2, $zero, 0x0007 ## $a2 = 00000007 /* 007D4 8092CDA4 3C058094 */ lui $a1, %hi(D_80938CC4) ## $a1 = 80940000 -/* 007D8 8092CDA8 84A58CC4 */ lh $a1, %lo(D_80938CC4)($a1) -/* 007DC 8092CDAC 0C0300E1 */ jal func_800C0384 -/* 007E0 8092CDB0 8FA40054 */ lw $a0, 0x0054($sp) +/* 007D8 8092CDA8 84A58CC4 */ lh $a1, %lo(D_80938CC4)($a1) +/* 007DC 8092CDAC 0C0300E1 */ jal func_800C0384 +/* 007E0 8092CDB0 8FA40054 */ lw $a0, 0x0054($sp) /* 007E4 8092CDB4 3C058016 */ lui $a1, 0x8016 ## $a1 = 80160000 /* 007E8 8092CDB8 24A5E660 */ addiu $a1, $a1, 0xE660 ## $a1 = 8015E660 /* 007EC 8092CDBC 94AE0EE2 */ lhu $t6, 0x0EE2($a1) ## 8015F542 /* 007F0 8092CDC0 02402025 */ or $a0, $s2, $zero ## $a0 = 00000000 /* 007F4 8092CDC4 35CF0080 */ ori $t7, $t6, 0x0080 ## $t7 = 00000080 -/* 007F8 8092CDC8 0C24B6CC */ jal func_8092DB30 +/* 007F8 8092CDC8 0C24B6CC */ jal func_8092DB30 /* 007FC 8092CDCC A4AF0EE2 */ sh $t7, 0x0EE2($a1) ## 8015F542 /* 00800 8092CDD0 925803E6 */ lbu $t8, 0x03E6($s2) ## 000003E6 /* 00804 8092CDD4 3C048094 */ lui $a0, %hi(D_80938C98) ## $a0 = 80940000 @@ -110,21 +110,21 @@ glabel func_8092CC58 /* 0082C 8092CDFC 904C03E6 */ lbu $t4, 0x03E6($v0) ## 000003E6 /* 00830 8092CE00 358D0001 */ ori $t5, $t4, 0x0001 ## $t5 = 00000001 /* 00834 8092CE04 A04D03E6 */ sb $t5, 0x03E6($v0) ## 000003E6 -/* 00838 8092CE08 10000308 */ beq $zero, $zero, .L8092DA2C +/* 00838 8092CE08 10000308 */ beq $zero, $zero, .L8092DA2C /* 0083C 8092CE0C A64E0198 */ sh $t6, 0x0198($s2) ## 00000198 -/* 00840 8092CE10 28C10222 */ slti $at, $a2, 0x0222 +/* 00840 8092CE10 28C10222 */ slti $at, $a2, 0x0222 .L8092CE14: -/* 00844 8092CE14 1420004F */ bne $at, $zero, .L8092CF54 +/* 00844 8092CE14 1420004F */ bne $at, $zero, .L8092CF54 /* 00848 8092CE18 3C0142C8 */ lui $at, 0x42C8 ## $at = 42C80000 /* 0084C 8092CE1C 44812000 */ mtc1 $at, $f4 ## $f4 = 100.00 /* 00850 8092CE20 C4E60028 */ lwc1 $f6, 0x0028($a3) ## 00000028 /* 00854 8092CE24 3C118093 */ lui $s1, %hi(D_8093734C) ## $s1 = 80930000 /* 00858 8092CE28 3C038093 */ lui $v1, %hi(D_80937340) ## $v1 = 80930000 -/* 0085C 8092CE2C 4606203C */ c.lt.s $f4, $f6 +/* 0085C 8092CE2C 4606203C */ c.lt.s $f4, $f6 /* 00860 8092CE30 2631734C */ addiu $s1, $s1, %lo(D_8093734C) ## $s1 = 8093734C /* 00864 8092CE34 24637340 */ addiu $v1, $v1, %lo(D_80937340) ## $v1 = 80937340 /* 00868 8092CE38 02202025 */ or $a0, $s1, $zero ## $a0 = 8093734C -/* 0086C 8092CE3C 4500000B */ bc1f .L8092CE6C +/* 0086C 8092CE3C 4500000B */ bc1f .L8092CE6C /* 00870 8092CE40 24E50024 */ addiu $a1, $a3, 0x0024 ## $a1 = 00000024 /* 00874 8092CE44 C4680000 */ lwc1 $f8, 0x0000($v1) ## 80937340 /* 00878 8092CE48 44808000 */ mtc1 $zero, $f16 ## $f16 = 0.00 @@ -139,18 +139,18 @@ glabel func_8092CC58 .L8092CE6C: /* 0089C 8092CE6C 0C01DF90 */ jal Math_Vec3f_Copy ## Vec3f_Copy -/* 008A0 8092CE70 AFA7004C */ sw $a3, 0x004C($sp) -/* 008A4 8092CE74 8FA7004C */ lw $a3, 0x004C($sp) +/* 008A0 8092CE70 AFA7004C */ sw $a3, 0x004C($sp) +/* 008A4 8092CE74 8FA7004C */ lw $a3, 0x004C($sp) /* 008A8 8092CE78 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 /* 008AC 8092CE7C 3C108093 */ lui $s0, %hi(D_80937358) ## $s0 = 80930000 /* 008B0 8092CE80 94EF0088 */ lhu $t7, 0x0088($a3) ## 00000088 /* 008B4 8092CE84 31F80002 */ andi $t8, $t7, 0x0002 ## $t8 = 00000000 -/* 008B8 8092CE88 13000030 */ beq $t8, $zero, .L8092CF4C +/* 008B8 8092CE88 13000030 */ beq $t8, $zero, .L8092CF4C /* 008BC 8092CE8C 00000000 */ nop /* 008C0 8092CE90 82590195 */ lb $t9, 0x0195($s2) ## 00000195 /* 008C4 8092CE94 3C058016 */ lui $a1, 0x8016 ## $a1 = 80160000 /* 008C8 8092CE98 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -/* 008CC 8092CE9C 17200011 */ bne $t9, $zero, .L8092CEE4 +/* 008CC 8092CE9C 17200011 */ bne $t9, $zero, .L8092CEE4 /* 008D0 8092CEA0 24A5E660 */ addiu $a1, $a1, 0xE660 ## $a1 = 8015E660 /* 008D4 8092CEA4 3C108094 */ lui $s0, %hi(D_80938CA0) ## $s0 = 80940000 /* 008D8 8092CEA8 26108CA0 */ addiu $s0, $s0, %lo(D_80938CA0) ## $s0 = 80938CA0 @@ -160,28 +160,28 @@ glabel func_8092CC58 /* 008E8 8092CEB8 A542001C */ sh $v0, 0x001C($t2) ## 0000001C /* 008EC 8092CEBC A2420195 */ sb $v0, 0x0195($s2) ## 00000195 /* 008F0 8092CEC0 C64C008C */ lwc1 $f12, 0x008C($s2) ## 0000008C -/* 008F4 8092CEC4 0C02A800 */ jal func_800AA000 +/* 008F4 8092CEC4 0C02A800 */ jal func_800AA000 /* 008F8 8092CEC8 24070096 */ addiu $a3, $zero, 0x0096 ## $a3 = 00000096 /* 008FC 8092CECC 8E040000 */ lw $a0, 0x0000($s0) ## 80938CA0 /* 00900 8092CED0 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 00904 8092CED4 24053951 */ addiu $a1, $zero, 0x3951 ## $a1 = 00003951 /* 00908 8092CED8 3C108093 */ lui $s0, %hi(D_80937358) ## $s0 = 80930000 -/* 0090C 8092CEDC 100002D3 */ beq $zero, $zero, .L8092DA2C +/* 0090C 8092CEDC 100002D3 */ beq $zero, $zero, .L8092DA2C /* 00910 8092CEE0 26107358 */ addiu $s0, $s0, %lo(D_80937358) ## $s0 = 80937358 .L8092CEE4: /* 00914 8092CEE4 94AB0EE2 */ lhu $t3, 0x0EE2($a1) ## 00000EE2 /* 00918 8092CEE8 3C028093 */ lui $v0, %hi(BossSst_Draw) ## $v0 = 80930000 /* 0091C 8092CEEC 24424668 */ addiu $v0, $v0, %lo(BossSst_Draw) ## $v0 = 80934668 /* 00920 8092CEF0 316C0080 */ andi $t4, $t3, 0x0080 ## $t4 = 00000000 -/* 00924 8092CEF4 11800014 */ beq $t4, $zero, .L8092CF48 +/* 00924 8092CEF4 11800014 */ beq $t4, $zero, .L8092CF48 /* 00928 8092CEF8 24190222 */ addiu $t9, $zero, 0x0222 ## $t9 = 00000222 /* 0092C 8092CEFC 3C0D8094 */ lui $t5, %hi(D_80938C9C) ## $t5 = 80940000 -/* 00930 8092CF00 8DAD8C9C */ lw $t5, %lo(D_80938C9C)($t5) +/* 00930 8092CF00 8DAD8C9C */ lw $t5, %lo(D_80938C9C)($t5) /* 00934 8092CF04 3C0E8094 */ lui $t6, %hi(D_80938C98) ## $t6 = 80940000 /* 00938 8092CF08 3C0F8093 */ lui $t7, %hi(func_809352DC) ## $t7 = 80930000 /* 0093C 8092CF0C ADA20134 */ sw $v0, 0x0134($t5) ## 80940134 -/* 00940 8092CF10 8DCE8C98 */ lw $t6, %lo(D_80938C98)($t6) +/* 00940 8092CF10 8DCE8C98 */ lw $t6, %lo(D_80938C98)($t6) /* 00944 8092CF14 25EF52DC */ addiu $t7, $t7, %lo(func_809352DC) ## $t7 = 809352DC /* 00948 8092CF18 241800B2 */ addiu $t8, $zero, 0x00B2 ## $t8 = 000000B2 /* 0094C 8092CF1C ADC20134 */ sw $v0, 0x0134($t6) ## 80940134 @@ -193,16 +193,16 @@ glabel func_8092CC58 /* 00964 8092CF34 E6200004 */ swc1 $f0, 0x0004($s1) ## 80937350 /* 00968 8092CF38 E6200008 */ swc1 $f0, 0x0008($s1) ## 80937354 /* 0096C 8092CF3C 26107358 */ addiu $s0, $s0, %lo(D_80937358) ## $s0 = 80937358 -/* 00970 8092CF40 100002BA */ beq $zero, $zero, .L8092DA2C +/* 00970 8092CF40 100002BA */ beq $zero, $zero, .L8092DA2C /* 00974 8092CF44 E6320000 */ swc1 $f18, 0x0000($s1) ## 8093734C .L8092CF48: /* 00978 8092CF48 A6590198 */ sh $t9, 0x0198($s2) ## 00000198 .L8092CF4C: -/* 0097C 8092CF4C 100002B7 */ beq $zero, $zero, .L8092DA2C +/* 0097C 8092CF4C 100002B7 */ beq $zero, $zero, .L8092DA2C /* 00980 8092CF50 26107358 */ addiu $s0, $s0, %lo(D_80937358) ## $s0 = 8093E6B0 .L8092CF54: -/* 00984 8092CF54 28C101DE */ slti $at, $a2, 0x01DE -/* 00988 8092CF58 14200010 */ bne $at, $zero, .L8092CF9C +/* 00984 8092CF54 28C101DE */ slti $at, $a2, 0x01DE +/* 00988 8092CF58 14200010 */ bne $at, $zero, .L8092CF9C /* 0098C 8092CF5C 3C108093 */ lui $s0, %hi(D_80937358) ## $s0 = 80930000 /* 00990 8092CF60 26107358 */ addiu $s0, $s0, %lo(D_80937358) ## $s0 = 80937358 /* 00994 8092CF64 3C014120 */ lui $at, 0x4120 ## $at = 41200000 @@ -210,28 +210,28 @@ glabel func_8092CC58 /* 0099C 8092CF6C C6040000 */ lwc1 $f4, 0x0000($s0) ## 80937358 /* 009A0 8092CF70 C6080004 */ lwc1 $f8, 0x0004($s0) ## 8093735C /* 009A4 8092CF74 C6100008 */ lwc1 $f16, 0x0008($s0) ## 80937360 -/* 009A8 8092CF78 46002180 */ add.s $f6, $f4, $f0 +/* 009A8 8092CF78 46002180 */ add.s $f6, $f4, $f0 /* 009AC 8092CF7C 3C118093 */ lui $s1, %hi(D_8093734C) ## $s1 = 80930000 /* 009B0 8092CF80 2631734C */ addiu $s1, $s1, %lo(D_8093734C) ## $s1 = 8093734C -/* 009B4 8092CF84 46004280 */ add.s $f10, $f8, $f0 +/* 009B4 8092CF84 46004280 */ add.s $f10, $f8, $f0 /* 009B8 8092CF88 E6060000 */ swc1 $f6, 0x0000($s0) ## 80937358 -/* 009BC 8092CF8C 46008481 */ sub.s $f18, $f16, $f0 +/* 009BC 8092CF8C 46008481 */ sub.s $f18, $f16, $f0 /* 009C0 8092CF90 E60A0004 */ swc1 $f10, 0x0004($s0) ## 8093735C -/* 009C4 8092CF94 100002A5 */ beq $zero, $zero, .L8092DA2C +/* 009C4 8092CF94 100002A5 */ beq $zero, $zero, .L8092DA2C /* 009C8 8092CF98 E6120008 */ swc1 $f18, 0x0008($s0) ## 80937360 .L8092CF9C: -/* 009CC 8092CF9C 28C101C0 */ slti $at, $a2, 0x01C0 -/* 009D0 8092CFA0 14200051 */ bne $at, $zero, .L8092D0E8 +/* 009CC 8092CF9C 28C101C0 */ slti $at, $a2, 0x01C0 +/* 009D0 8092CFA0 14200051 */ bne $at, $zero, .L8092D0E8 /* 009D4 8092CFA4 241001CC */ addiu $s0, $zero, 0x01CC ## $s0 = 000001CC -/* 009D8 8092CFA8 16060015 */ bne $s0, $a2, .L8092D000 +/* 009D8 8092CFA8 16060015 */ bne $s0, $a2, .L8092D000 /* 009DC 8092CFAC 3C038093 */ lui $v1, %hi(D_80937340) ## $v1 = 80930000 /* 009E0 8092CFB0 3C0A8094 */ lui $t2, %hi(D_80938C9C) ## $t2 = 80940000 -/* 009E4 8092CFB4 8D4A8C9C */ lw $t2, %lo(D_80938C9C)($t2) +/* 009E4 8092CFB4 8D4A8C9C */ lw $t2, %lo(D_80938C9C)($t2) /* 009E8 8092CFB8 3C028093 */ lui $v0, %hi(BossSst_Draw) ## $v0 = 80930000 /* 009EC 8092CFBC 24424668 */ addiu $v0, $v0, %lo(BossSst_Draw) ## $v0 = 80934668 /* 009F0 8092CFC0 3C0B8094 */ lui $t3, %hi(D_80938C98) ## $t3 = 80940000 /* 009F4 8092CFC4 AD420134 */ sw $v0, 0x0134($t2) ## 80940134 -/* 009F8 8092CFC8 8D6B8C98 */ lw $t3, %lo(D_80938C98)($t3) +/* 009F8 8092CFC8 8D6B8C98 */ lw $t3, %lo(D_80938C98)($t3) /* 009FC 8092CFCC 3C0C8093 */ lui $t4, %hi(func_809352DC) ## $t4 = 80930000 /* 00A00 8092CFD0 258C52DC */ addiu $t4, $t4, %lo(func_809352DC) ## $t4 = 809352DC /* 00A04 8092CFD4 AD620134 */ sw $v0, 0x0134($t3) ## 80940134 @@ -242,12 +242,12 @@ glabel func_8092CC58 /* 00A18 8092CFE8 E4E40024 */ swc1 $f4, 0x0024($a3) ## 00000024 /* 00A1C 8092CFEC C4660008 */ lwc1 $f6, 0x0008($v1) ## 80937348 /* 00A20 8092CFF0 E4E6002C */ swc1 $f6, 0x002C($a3) ## 0000002C -/* 00A24 8092CFF4 0C24BF74 */ jal func_8092FDD0 -/* 00A28 8092CFF8 8C848C9C */ lw $a0, %lo(D_80938C9C)($a0) +/* 00A24 8092CFF4 0C24BF74 */ jal func_8092FDD0 +/* 00A28 8092CFF8 8C848C9C */ lw $a0, %lo(D_80938C9C)($a0) /* 00A2C 8092CFFC 86460198 */ lh $a2, 0x0198($s2) ## 00000198 .L8092D000: -/* 00A30 8092D000 28C101CD */ slti $at, $a2, 0x01CD -/* 00A34 8092D004 14200011 */ bne $at, $zero, .L8092D04C +/* 00A30 8092D000 28C101CD */ slti $at, $a2, 0x01CD +/* 00A34 8092D004 14200011 */ bne $at, $zero, .L8092D04C /* 00A38 8092D008 00000000 */ nop /* 00A3C 8092D00C 3C108093 */ lui $s0, %hi(D_80937358) ## $s0 = 80930000 /* 00A40 8092D010 26107358 */ addiu $s0, $s0, %lo(D_80937358) ## $s0 = 80937358 @@ -258,17 +258,17 @@ glabel func_8092CC58 /* 00A54 8092D024 C6100004 */ lwc1 $f16, 0x0004($s0) ## 8093735C /* 00A58 8092D028 44813000 */ mtc1 $at, $f6 ## $f6 = 20.00 /* 00A5C 8092D02C C6040008 */ lwc1 $f4, 0x0008($s0) ## 80937360 -/* 00A60 8092D030 46024281 */ sub.s $f10, $f8, $f2 -/* 00A64 8092D034 46028481 */ sub.s $f18, $f16, $f2 +/* 00A60 8092D030 46024281 */ sub.s $f10, $f8, $f2 +/* 00A64 8092D034 46028481 */ sub.s $f18, $f16, $f2 /* 00A68 8092D038 E60A0000 */ swc1 $f10, 0x0000($s0) ## 80937358 -/* 00A6C 8092D03C 46062200 */ add.s $f8, $f4, $f6 +/* 00A6C 8092D03C 46062200 */ add.s $f8, $f4, $f6 /* 00A70 8092D040 E6120004 */ swc1 $f18, 0x0004($s0) ## 8093735C -/* 00A74 8092D044 10000023 */ beq $zero, $zero, .L8092D0D4 +/* 00A74 8092D044 10000023 */ beq $zero, $zero, .L8092D0D4 /* 00A78 8092D048 E6080008 */ swc1 $f8, 0x0008($s0) ## 80937360 .L8092D04C: -/* 00A7C 8092D04C 16060021 */ bne $s0, $a2, .L8092D0D4 +/* 00A7C 8092D04C 16060021 */ bne $s0, $a2, .L8092D0D4 /* 00A80 8092D050 3C028094 */ lui $v0, %hi(D_80938C9C) ## $v0 = 80940000 -/* 00A84 8092D054 8C428C9C */ lw $v0, %lo(D_80938C9C)($v0) +/* 00A84 8092D054 8C428C9C */ lw $v0, %lo(D_80938C9C)($v0) /* 00A88 8092D058 3C118093 */ lui $s1, %hi(D_8093734C) ## $s1 = 80930000 /* 00A8C 8092D05C 3C014120 */ lui $at, 0x4120 ## $at = 41200000 /* 00A90 8092D060 C44A0008 */ lwc1 $f10, 0x0008($v0) ## 80940008 @@ -280,38 +280,38 @@ glabel func_8092CC58 /* 00AA8 8092D078 C450000C */ lwc1 $f16, 0x000C($v0) ## 8094000C /* 00AAC 8092D07C 3C014316 */ lui $at, 0x4316 ## $at = 43160000 /* 00AB0 8092D080 3C108093 */ lui $s0, %hi(D_80937358) ## $s0 = 80930000 -/* 00AB4 8092D084 46128101 */ sub.s $f4, $f16, $f18 +/* 00AB4 8092D084 46128101 */ sub.s $f4, $f16, $f18 /* 00AB8 8092D088 44818000 */ mtc1 $at, $f16 ## $f16 = 150.00 /* 00ABC 8092D08C 26107358 */ addiu $s0, $s0, %lo(D_80937358) ## $s0 = 80937358 /* 00AC0 8092D090 3C0142C8 */ lui $at, 0x42C8 ## $at = 42C80000 /* 00AC4 8092D094 E6240004 */ swc1 $f4, 0x0004($s1) ## 80937350 /* 00AC8 8092D098 C4460010 */ lwc1 $f6, 0x0010($v0) ## 80940010 -/* 00ACC 8092D09C 46003200 */ add.s $f8, $f6, $f0 +/* 00ACC 8092D09C 46003200 */ add.s $f8, $f6, $f0 /* 00AD0 8092D0A0 44813000 */ mtc1 $at, $f6 ## $f6 = 100.00 /* 00AD4 8092D0A4 3C0142A0 */ lui $at, 0x42A0 ## $at = 42A00000 /* 00AD8 8092D0A8 E6280008 */ swc1 $f8, 0x0008($s1) ## 80937354 /* 00ADC 8092D0AC C44A0008 */ lwc1 $f10, 0x0008($v0) ## 80940008 -/* 00AE0 8092D0B0 46105480 */ add.s $f18, $f10, $f16 +/* 00AE0 8092D0B0 46105480 */ add.s $f18, $f10, $f16 /* 00AE4 8092D0B4 44818000 */ mtc1 $at, $f16 ## $f16 = 80.00 /* 00AE8 8092D0B8 E6120000 */ swc1 $f18, 0x0000($s0) ## 80937358 /* 00AEC 8092D0BC C444000C */ lwc1 $f4, 0x000C($v0) ## 8094000C -/* 00AF0 8092D0C0 46062200 */ add.s $f8, $f4, $f6 +/* 00AF0 8092D0C0 46062200 */ add.s $f8, $f4, $f6 /* 00AF4 8092D0C4 E6080004 */ swc1 $f8, 0x0004($s0) ## 8093735C /* 00AF8 8092D0C8 C44A0010 */ lwc1 $f10, 0x0010($v0) ## 80940010 -/* 00AFC 8092D0CC 46105480 */ add.s $f18, $f10, $f16 +/* 00AFC 8092D0CC 46105480 */ add.s $f18, $f10, $f16 /* 00B00 8092D0D0 E6120008 */ swc1 $f18, 0x0008($s0) ## 80937360 .L8092D0D4: /* 00B04 8092D0D4 3C108093 */ lui $s0, %hi(D_80937358) ## $s0 = 80930000 /* 00B08 8092D0D8 3C118093 */ lui $s1, %hi(D_8093734C) ## $s1 = 80930000 /* 00B0C 8092D0DC 2631734C */ addiu $s1, $s1, %lo(D_8093734C) ## $s1 = 8093734C -/* 00B10 8092D0E0 10000252 */ beq $zero, $zero, .L8092DA2C +/* 00B10 8092D0E0 10000252 */ beq $zero, $zero, .L8092DA2C /* 00B14 8092D0E4 26107358 */ addiu $s0, $s0, %lo(D_80937358) ## $s0 = 80937358 .L8092D0E8: -/* 00B18 8092D0E8 28C10174 */ slti $at, $a2, 0x0174 -/* 00B1C 8092D0EC 14200068 */ bne $at, $zero, .L8092D290 +/* 00B18 8092D0E8 28C10174 */ slti $at, $a2, 0x0174 +/* 00B1C 8092D0EC 14200068 */ bne $at, $zero, .L8092D290 /* 00B20 8092D0F0 240101BF */ addiu $at, $zero, 0x01BF ## $at = 000001BF /* 00B24 8092D0F4 24C8FE8C */ addiu $t0, $a2, 0xFE8C ## $t0 = FFFFFE8C -/* 00B28 8092D0F8 14C10016 */ bne $a2, $at, .L8092D154 +/* 00B28 8092D0F8 14C10016 */ bne $a2, $at, .L8092D154 /* 00B2C 8092D0FC 24090006 */ addiu $t1, $zero, 0x0006 ## $t1 = 00000006 /* 00B30 8092D100 8CEE0024 */ lw $t6, 0x0024($a3) ## 00000024 /* 00B34 8092D104 3C118093 */ lui $s1, %hi(D_8093734C) ## $s1 = 80930000 @@ -332,13 +332,13 @@ glabel func_8092CC58 /* 00B70 8092D140 E6060004 */ swc1 $f6, 0x0004($s0) ## 8093735C /* 00B74 8092D144 AE2E0008 */ sw $t6, 0x0008($s1) ## 80937354 /* 00B78 8092D148 E6080008 */ swc1 $f8, 0x0008($s0) ## 80937360 -/* 00B7C 8092D14C 1000004B */ beq $zero, $zero, .L8092D27C +/* 00B7C 8092D14C 1000004B */ beq $zero, $zero, .L8092D27C /* 00B80 8092D150 86460198 */ lh $a2, 0x0198($s2) ## 00000198 .L8092D154: /* 00B84 8092D154 2401000B */ addiu $at, $zero, 0x000B ## $at = 0000000B -/* 00B88 8092D158 15010023 */ bne $t0, $at, .L8092D1E8 +/* 00B88 8092D158 15010023 */ bne $t0, $at, .L8092D1E8 /* 00B8C 8092D15C 3C028094 */ lui $v0, %hi(D_80938C9C) ## $v0 = 80940000 -/* 00B90 8092D160 8C428C9C */ lw $v0, %lo(D_80938C9C)($v0) +/* 00B90 8092D160 8C428C9C */ lw $v0, %lo(D_80938C9C)($v0) /* 00B94 8092D164 3C014120 */ lui $at, 0x4120 ## $at = 41200000 /* 00B98 8092D168 44810000 */ mtc1 $at, $f0 ## $f0 = 10.00 /* 00B9C 8092D16C 3C0141F0 */ lui $at, 0x41F0 ## $at = 41F00000 @@ -346,7 +346,7 @@ glabel func_8092CC58 /* 00BA4 8092D174 C44A0008 */ lwc1 $f10, 0x0008($v0) ## 80940008 /* 00BA8 8092D178 3C118093 */ lui $s1, %hi(D_8093734C) ## $s1 = 80930000 /* 00BAC 8092D17C 2631734C */ addiu $s1, $s1, %lo(D_8093734C) ## $s1 = 8093734C -/* 00BB0 8092D180 46105480 */ add.s $f18, $f10, $f16 +/* 00BB0 8092D180 46105480 */ add.s $f18, $f10, $f16 /* 00BB4 8092D184 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 /* 00BB8 8092D188 44814000 */ mtc1 $at, $f8 ## $f8 = 20.00 /* 00BBC 8092D18C 3C0142C8 */ lui $at, 0x42C8 ## $at = 42C80000 @@ -358,26 +358,26 @@ glabel func_8092CC58 /* 00BD4 8092D1A4 C4460010 */ lwc1 $f6, 0x0010($v0) ## 80940010 /* 00BD8 8092D1A8 26107358 */ addiu $s0, $s0, %lo(D_80937358) ## $s0 = 80937358 /* 00BDC 8092D1AC 3C014352 */ lui $at, 0x4352 ## $at = 43520000 -/* 00BE0 8092D1B0 46083280 */ add.s $f10, $f6, $f8 +/* 00BE0 8092D1B0 46083280 */ add.s $f10, $f6, $f8 /* 00BE4 8092D1B4 E62A0008 */ swc1 $f10, 0x0008($s1) ## 80937354 /* 00BE8 8092D1B8 C4500008 */ lwc1 $f16, 0x0008($v0) ## 80940008 -/* 00BEC 8092D1BC 46128100 */ add.s $f4, $f16, $f18 +/* 00BEC 8092D1BC 46128100 */ add.s $f4, $f16, $f18 /* 00BF0 8092D1C0 44818000 */ mtc1 $at, $f16 ## $f16 = 210.00 /* 00BF4 8092D1C4 E6040000 */ swc1 $f4, 0x0000($s0) ## 80937358 /* 00BF8 8092D1C8 C446000C */ lwc1 $f6, 0x000C($v0) ## 8094000C -/* 00BFC 8092D1CC 46003200 */ add.s $f8, $f6, $f0 +/* 00BFC 8092D1CC 46003200 */ add.s $f8, $f6, $f0 /* 00C00 8092D1D0 E6080004 */ swc1 $f8, 0x0004($s0) ## 8093735C /* 00C04 8092D1D4 C44A0010 */ lwc1 $f10, 0x0010($v0) ## 80940010 -/* 00C08 8092D1D8 46105481 */ sub.s $f18, $f10, $f16 +/* 00C08 8092D1D8 46105481 */ sub.s $f18, $f10, $f16 /* 00C0C 8092D1DC E6120008 */ swc1 $f18, 0x0008($s0) ## 80937360 -/* 00C10 8092D1E0 10000026 */ beq $zero, $zero, .L8092D27C +/* 00C10 8092D1E0 10000026 */ beq $zero, $zero, .L8092D27C /* 00C14 8092D1E4 86460198 */ lh $a2, 0x0198($s2) ## 00000198 .L8092D1E8: /* 00C18 8092D1E8 2401003E */ addiu $at, $zero, 0x003E ## $at = 0000003E -/* 00C1C 8092D1EC 15010023 */ bne $t0, $at, .L8092D27C +/* 00C1C 8092D1EC 15010023 */ bne $t0, $at, .L8092D27C /* 00C20 8092D1F0 00000000 */ nop /* 00C24 8092D1F4 3C038094 */ lui $v1, %hi(D_80938C98) ## $v1 = 80940000 -/* 00C28 8092D1F8 8C638C98 */ lw $v1, %lo(D_80938C98)($v1) +/* 00C28 8092D1F8 8C638C98 */ lw $v1, %lo(D_80938C98)($v1) /* 00C2C 8092D1FC 3C118093 */ lui $s1, %hi(D_8093734C) ## $s1 = 80930000 /* 00C30 8092D200 2631734C */ addiu $s1, $s1, %lo(D_8093734C) ## $s1 = 8093734C /* 00C34 8092D204 C4640008 */ lwc1 $f4, 0x0008($v1) ## 80940008 @@ -387,7 +387,7 @@ glabel func_8092CC58 /* 00C44 8092D214 C466000C */ lwc1 $f6, 0x000C($v1) ## 8094000C /* 00C48 8092D218 3C0142C8 */ lui $at, 0x42C8 ## $at = 42C80000 /* 00C4C 8092D21C 44819000 */ mtc1 $at, $f18 ## $f18 = 100.00 -/* 00C50 8092D220 46083280 */ add.s $f10, $f6, $f8 +/* 00C50 8092D220 46083280 */ add.s $f10, $f6, $f8 /* 00C54 8092D224 3C0142DC */ lui $at, 0x42DC ## $at = 42DC0000 /* 00C58 8092D228 44814000 */ mtc1 $at, $f8 ## $f8 = 110.00 /* 00C5C 8092D22C 3C108093 */ lui $s0, %hi(D_80937358) ## $s0 = 80930000 @@ -395,42 +395,42 @@ glabel func_8092CC58 /* 00C64 8092D234 C4700010 */ lwc1 $f16, 0x0010($v1) ## 80940010 /* 00C68 8092D238 26107358 */ addiu $s0, $s0, %lo(D_80937358) ## $s0 = 80937358 /* 00C6C 8092D23C 3C014334 */ lui $at, 0x4334 ## $at = 43340000 -/* 00C70 8092D240 46128100 */ add.s $f4, $f16, $f18 +/* 00C70 8092D240 46128100 */ add.s $f4, $f16, $f18 /* 00C74 8092D244 44819000 */ mtc1 $at, $f18 ## $f18 = 180.00 /* 00C78 8092D248 3C01428C */ lui $at, 0x428C ## $at = 428C0000 /* 00C7C 8092D24C E6240008 */ swc1 $f4, 0x0008($s1) ## 80937354 /* 00C80 8092D250 C4660008 */ lwc1 $f6, 0x0008($v1) ## 80940008 -/* 00C84 8092D254 46083280 */ add.s $f10, $f6, $f8 +/* 00C84 8092D254 46083280 */ add.s $f10, $f6, $f8 /* 00C88 8092D258 44814000 */ mtc1 $at, $f8 ## $f8 = 70.00 /* 00C8C 8092D25C E60A0000 */ swc1 $f10, 0x0000($s0) ## 80937358 /* 00C90 8092D260 C470000C */ lwc1 $f16, 0x000C($v1) ## 8094000C -/* 00C94 8092D264 46128100 */ add.s $f4, $f16, $f18 +/* 00C94 8092D264 46128100 */ add.s $f4, $f16, $f18 /* 00C98 8092D268 E6040004 */ swc1 $f4, 0x0004($s0) ## 8093735C /* 00C9C 8092D26C C4660010 */ lwc1 $f6, 0x0010($v1) ## 80940010 -/* 00CA0 8092D270 46083281 */ sub.s $f10, $f6, $f8 +/* 00CA0 8092D270 46083281 */ sub.s $f10, $f6, $f8 /* 00CA4 8092D274 E60A0008 */ swc1 $f10, 0x0008($s0) ## 80937360 /* 00CA8 8092D278 86460198 */ lh $a2, 0x0198($s2) ## 00000198 .L8092D27C: /* 00CAC 8092D27C 3C108093 */ lui $s0, %hi(D_80937358) ## $s0 = 80930000 /* 00CB0 8092D280 3C118093 */ lui $s1, %hi(D_8093734C) ## $s1 = 80930000 /* 00CB4 8092D284 2631734C */ addiu $s1, $s1, %lo(D_8093734C) ## $s1 = 8093734C -/* 00CB8 8092D288 10000116 */ beq $zero, $zero, .L8092D6E4 +/* 00CB8 8092D288 10000116 */ beq $zero, $zero, .L8092D6E4 /* 00CBC 8092D28C 26107358 */ addiu $s0, $s0, %lo(D_80937358) ## $s0 = 80937358 .L8092D290: -/* 00CC0 8092D290 28C10130 */ slti $at, $a2, 0x0130 -/* 00CC4 8092D294 1420004F */ bne $at, $zero, .L8092D3D4 +/* 00CC0 8092D290 28C10130 */ slti $at, $a2, 0x0130 +/* 00CC4 8092D294 1420004F */ bne $at, $zero, .L8092D3D4 /* 00CC8 8092D298 24C8FED0 */ addiu $t0, $a2, 0xFED0 ## $t0 = FFFFFED0 /* 00CCC 8092D29C 2401000B */ addiu $at, $zero, 0x000B ## $at = 0000000B -/* 00CD0 8092D2A0 15010025 */ bne $t0, $at, .L8092D338 +/* 00CD0 8092D2A0 15010025 */ bne $t0, $at, .L8092D338 /* 00CD4 8092D2A4 24090005 */ addiu $t1, $zero, 0x0005 ## $t1 = 00000005 /* 00CD8 8092D2A8 3C028094 */ lui $v0, %hi(D_80938C9C) ## $v0 = 80940000 -/* 00CDC 8092D2AC 8C428C9C */ lw $v0, %lo(D_80938C9C)($v0) +/* 00CDC 8092D2AC 8C428C9C */ lw $v0, %lo(D_80938C9C)($v0) /* 00CE0 8092D2B0 3C014220 */ lui $at, 0x4220 ## $at = 42200000 /* 00CE4 8092D2B4 44811000 */ mtc1 $at, $f2 ## $f2 = 40.00 /* 00CE8 8092D2B8 C4500008 */ lwc1 $f16, 0x0008($v0) ## 80940008 /* 00CEC 8092D2BC 3C118093 */ lui $s1, %hi(D_8093734C) ## $s1 = 80930000 /* 00CF0 8092D2C0 2631734C */ addiu $s1, $s1, %lo(D_8093734C) ## $s1 = 8093734C -/* 00CF4 8092D2C4 46028480 */ add.s $f18, $f16, $f2 +/* 00CF4 8092D2C4 46028480 */ add.s $f18, $f16, $f2 /* 00CF8 8092D2C8 3C0142B4 */ lui $at, 0x42B4 ## $at = 42B40000 /* 00CFC 8092D2CC 44813000 */ mtc1 $at, $f6 ## $f6 = 90.00 /* 00D00 8092D2D0 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 @@ -438,39 +438,39 @@ glabel func_8092CC58 /* 00D08 8092D2D8 C444000C */ lwc1 $f4, 0x000C($v0) ## 8094000C /* 00D0C 8092D2DC 3C108093 */ lui $s0, %hi(D_80937358) ## $s0 = 80930000 /* 00D10 8092D2E0 26107358 */ addiu $s0, $s0, %lo(D_80937358) ## $s0 = 80937358 -/* 00D14 8092D2E4 46062201 */ sub.s $f8, $f4, $f6 +/* 00D14 8092D2E4 46062201 */ sub.s $f8, $f4, $f6 /* 00D18 8092D2E8 44812000 */ mtc1 $at, $f4 ## $f4 = 20.00 /* 00D1C 8092D2EC 3C014352 */ lui $at, 0x4352 ## $at = 43520000 /* 00D20 8092D2F0 E6280004 */ swc1 $f8, 0x0004($s1) ## 80937350 /* 00D24 8092D2F4 C44A0010 */ lwc1 $f10, 0x0010($v0) ## 80940010 -/* 00D28 8092D2F8 46025401 */ sub.s $f16, $f10, $f2 +/* 00D28 8092D2F8 46025401 */ sub.s $f16, $f10, $f2 /* 00D2C 8092D2FC 44815000 */ mtc1 $at, $f10 ## $f10 = 210.00 /* 00D30 8092D300 3C01432A */ lui $at, 0x432A ## $at = 432A0000 /* 00D34 8092D304 E6300008 */ swc1 $f16, 0x0008($s1) ## 80937354 /* 00D38 8092D308 C4520008 */ lwc1 $f18, 0x0008($v0) ## 80940008 -/* 00D3C 8092D30C 46049181 */ sub.s $f6, $f18, $f4 +/* 00D3C 8092D30C 46049181 */ sub.s $f6, $f18, $f4 /* 00D40 8092D310 44812000 */ mtc1 $at, $f4 ## $f4 = 170.00 /* 00D44 8092D314 E6060000 */ swc1 $f6, 0x0000($s0) ## 80937358 /* 00D48 8092D318 C448000C */ lwc1 $f8, 0x000C($v0) ## 8094000C -/* 00D4C 8092D31C 460A4400 */ add.s $f16, $f8, $f10 +/* 00D4C 8092D31C 460A4400 */ add.s $f16, $f8, $f10 /* 00D50 8092D320 E6100004 */ swc1 $f16, 0x0004($s0) ## 8093735C /* 00D54 8092D324 C4520010 */ lwc1 $f18, 0x0010($v0) ## 80940010 -/* 00D58 8092D328 46049180 */ add.s $f6, $f18, $f4 +/* 00D58 8092D328 46049180 */ add.s $f6, $f18, $f4 /* 00D5C 8092D32C E6060008 */ swc1 $f6, 0x0008($s0) ## 80937360 -/* 00D60 8092D330 10000023 */ beq $zero, $zero, .L8092D3C0 +/* 00D60 8092D330 10000023 */ beq $zero, $zero, .L8092D3C0 /* 00D64 8092D334 86460198 */ lh $a2, 0x0198($s2) ## 00000198 .L8092D338: /* 00D68 8092D338 24010170 */ addiu $at, $zero, 0x0170 ## $at = 00000170 -/* 00D6C 8092D33C 14C10020 */ bne $a2, $at, .L8092D3C0 +/* 00D6C 8092D33C 14C10020 */ bne $a2, $at, .L8092D3C0 /* 00D70 8092D340 00000000 */ nop /* 00D74 8092D344 3C038094 */ lui $v1, %hi(D_80938C98) ## $v1 = 80940000 -/* 00D78 8092D348 8C638C98 */ lw $v1, %lo(D_80938C98)($v1) +/* 00D78 8092D348 8C638C98 */ lw $v1, %lo(D_80938C98)($v1) /* 00D7C 8092D34C 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 /* 00D80 8092D350 44815000 */ mtc1 $at, $f10 ## $f10 = 20.00 /* 00D84 8092D354 C4680008 */ lwc1 $f8, 0x0008($v1) ## 80940008 /* 00D88 8092D358 3C118093 */ lui $s1, %hi(D_8093734C) ## $s1 = 80930000 /* 00D8C 8092D35C 2631734C */ addiu $s1, $s1, %lo(D_8093734C) ## $s1 = 8093734C -/* 00D90 8092D360 460A4401 */ sub.s $f16, $f8, $f10 +/* 00D90 8092D360 460A4401 */ sub.s $f16, $f8, $f10 /* 00D94 8092D364 3C01428C */ lui $at, 0x428C ## $at = 428C0000 /* 00D98 8092D368 44814000 */ mtc1 $at, $f8 ## $f8 = 70.00 /* 00D9C 8092D36C 3C108093 */ lui $s0, %hi(D_80937358) ## $s0 = 80930000 @@ -484,33 +484,33 @@ glabel func_8092CC58 /* 00DBC 8092D38C 3C014316 */ lui $at, 0x4316 ## $at = 43160000 /* 00DC0 8092D390 E6240008 */ swc1 $f4, 0x0008($s1) ## 80937354 /* 00DC4 8092D394 C4660008 */ lwc1 $f6, 0x0008($v1) ## 80940008 -/* 00DC8 8092D398 46083281 */ sub.s $f10, $f6, $f8 +/* 00DC8 8092D398 46083281 */ sub.s $f10, $f6, $f8 /* 00DCC 8092D39C 44814000 */ mtc1 $at, $f8 ## $f8 = 150.00 /* 00DD0 8092D3A0 E60A0000 */ swc1 $f10, 0x0000($s0) ## 80937358 /* 00DD4 8092D3A4 C470000C */ lwc1 $f16, 0x000C($v1) ## 8094000C -/* 00DD8 8092D3A8 46128100 */ add.s $f4, $f16, $f18 +/* 00DD8 8092D3A8 46128100 */ add.s $f4, $f16, $f18 /* 00DDC 8092D3AC E6040004 */ swc1 $f4, 0x0004($s0) ## 8093735C /* 00DE0 8092D3B0 C4660010 */ lwc1 $f6, 0x0010($v1) ## 80940010 -/* 00DE4 8092D3B4 46083280 */ add.s $f10, $f6, $f8 +/* 00DE4 8092D3B4 46083280 */ add.s $f10, $f6, $f8 /* 00DE8 8092D3B8 E60A0008 */ swc1 $f10, 0x0008($s0) ## 80937360 /* 00DEC 8092D3BC 86460198 */ lh $a2, 0x0198($s2) ## 00000198 .L8092D3C0: /* 00DF0 8092D3C0 3C108093 */ lui $s0, %hi(D_80937358) ## $s0 = 80930000 /* 00DF4 8092D3C4 3C118093 */ lui $s1, %hi(D_8093734C) ## $s1 = 80930000 /* 00DF8 8092D3C8 2631734C */ addiu $s1, $s1, %lo(D_8093734C) ## $s1 = 8093734C -/* 00DFC 8092D3CC 100000C5 */ beq $zero, $zero, .L8092D6E4 +/* 00DFC 8092D3CC 100000C5 */ beq $zero, $zero, .L8092D6E4 /* 00E00 8092D3D0 26107358 */ addiu $s0, $s0, %lo(D_80937358) ## $s0 = 80937358 .L8092D3D4: -/* 00E04 8092D3D4 28C100F4 */ slti $at, $a2, 0x00F4 -/* 00E08 8092D3D8 14200055 */ bne $at, $zero, .L8092D530 +/* 00E04 8092D3D4 28C100F4 */ slti $at, $a2, 0x00F4 +/* 00E08 8092D3D8 14200055 */ bne $at, $zero, .L8092D530 /* 00E0C 8092D3DC 24C8FF0C */ addiu $t0, $a2, 0xFF0C ## $t0 = FFFFFF0C /* 00E10 8092D3E0 2401000B */ addiu $at, $zero, 0x000B ## $at = 0000000B -/* 00E14 8092D3E4 15010027 */ bne $t0, $at, .L8092D484 +/* 00E14 8092D3E4 15010027 */ bne $t0, $at, .L8092D484 /* 00E18 8092D3E8 24090004 */ addiu $t1, $zero, 0x0004 ## $t1 = 00000004 /* 00E1C 8092D3EC 3C014120 */ lui $at, 0x4120 ## $at = 41200000 /* 00E20 8092D3F0 44810000 */ mtc1 $at, $f0 ## $f0 = 10.00 /* 00E24 8092D3F4 3C028094 */ lui $v0, %hi(D_80938C9C) ## $v0 = 80940000 -/* 00E28 8092D3F8 8C428C9C */ lw $v0, %lo(D_80938C9C)($v0) +/* 00E28 8092D3F8 8C428C9C */ lw $v0, %lo(D_80938C9C)($v0) /* 00E2C 8092D3FC 3C014220 */ lui $at, 0x4220 ## $at = 42200000 /* 00E30 8092D400 44811000 */ mtc1 $at, $f2 ## $f2 = 40.00 /* 00E34 8092D404 3C0141F0 */ lui $at, 0x41F0 ## $at = 41F00000 @@ -518,7 +518,7 @@ glabel func_8092CC58 /* 00E3C 8092D40C C4500008 */ lwc1 $f16, 0x0008($v0) ## 80940008 /* 00E40 8092D410 3C118093 */ lui $s1, %hi(D_8093734C) ## $s1 = 80930000 /* 00E44 8092D414 2631734C */ addiu $s1, $s1, %lo(D_8093734C) ## $s1 = 8093734C -/* 00E48 8092D418 46128100 */ add.s $f4, $f16, $f18 +/* 00E48 8092D418 46128100 */ add.s $f4, $f16, $f18 /* 00E4C 8092D41C 3C01428C */ lui $at, 0x428C ## $at = 428C0000 /* 00E50 8092D420 44814000 */ mtc1 $at, $f8 ## $f8 = 70.00 /* 00E54 8092D424 3C0142DC */ lui $at, 0x42DC ## $at = 42DC0000 @@ -526,31 +526,31 @@ glabel func_8092CC58 /* 00E5C 8092D42C C446000C */ lwc1 $f6, 0x000C($v0) ## 8094000C /* 00E60 8092D430 3C108093 */ lui $s0, %hi(D_80937358) ## $s0 = 80930000 /* 00E64 8092D434 26107358 */ addiu $s0, $s0, %lo(D_80937358) ## $s0 = 80937358 -/* 00E68 8092D438 46083280 */ add.s $f10, $f6, $f8 +/* 00E68 8092D438 46083280 */ add.s $f10, $f6, $f8 /* 00E6C 8092D43C 44813000 */ mtc1 $at, $f6 ## $f6 = 110.00 /* 00E70 8092D440 3C01430C */ lui $at, 0x430C ## $at = 430C0000 /* 00E74 8092D444 E62A0004 */ swc1 $f10, 0x0004($s1) ## 80937350 /* 00E78 8092D448 C4500010 */ lwc1 $f16, 0x0010($v0) ## 80940010 -/* 00E7C 8092D44C 46028480 */ add.s $f18, $f16, $f2 +/* 00E7C 8092D44C 46028480 */ add.s $f18, $f16, $f2 /* 00E80 8092D450 44818000 */ mtc1 $at, $f16 ## $f16 = 140.00 /* 00E84 8092D454 E6320008 */ swc1 $f18, 0x0008($s1) ## 80937354 /* 00E88 8092D458 C4440008 */ lwc1 $f4, 0x0008($v0) ## 80940008 -/* 00E8C 8092D45C 46062200 */ add.s $f8, $f4, $f6 +/* 00E8C 8092D45C 46062200 */ add.s $f8, $f4, $f6 /* 00E90 8092D460 E6080000 */ swc1 $f8, 0x0000($s0) ## 80937358 /* 00E94 8092D464 C44A000C */ lwc1 $f10, 0x000C($v0) ## 8094000C -/* 00E98 8092D468 46105481 */ sub.s $f18, $f10, $f16 +/* 00E98 8092D468 46105481 */ sub.s $f18, $f10, $f16 /* 00E9C 8092D46C E6120004 */ swc1 $f18, 0x0004($s0) ## 8093735C /* 00EA0 8092D470 C4440010 */ lwc1 $f4, 0x0010($v0) ## 80940010 -/* 00EA4 8092D474 46002181 */ sub.s $f6, $f4, $f0 +/* 00EA4 8092D474 46002181 */ sub.s $f6, $f4, $f0 /* 00EA8 8092D478 E6060008 */ swc1 $f6, 0x0008($s0) ## 80937360 -/* 00EAC 8092D47C 10000027 */ beq $zero, $zero, .L8092D51C +/* 00EAC 8092D47C 10000027 */ beq $zero, $zero, .L8092D51C /* 00EB0 8092D480 86460198 */ lh $a2, 0x0198($s2) ## 00000198 .L8092D484: /* 00EB4 8092D484 2401012C */ addiu $at, $zero, 0x012C ## $at = 0000012C -/* 00EB8 8092D488 14C10024 */ bne $a2, $at, .L8092D51C +/* 00EB8 8092D488 14C10024 */ bne $a2, $at, .L8092D51C /* 00EBC 8092D48C 00000000 */ nop /* 00EC0 8092D490 3C038094 */ lui $v1, %hi(D_80938C98) ## $v1 = 80940000 -/* 00EC4 8092D494 8C638C98 */ lw $v1, %lo(D_80938C98)($v1) +/* 00EC4 8092D494 8C638C98 */ lw $v1, %lo(D_80938C98)($v1) /* 00EC8 8092D498 3C014302 */ lui $at, 0x4302 ## $at = 43020000 /* 00ECC 8092D49C 44810000 */ mtc1 $at, $f0 ## $f0 = 130.00 /* 00ED0 8092D4A0 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 @@ -558,7 +558,7 @@ glabel func_8092CC58 /* 00ED8 8092D4A8 C4680008 */ lwc1 $f8, 0x0008($v1) ## 80940008 /* 00EDC 8092D4AC 3C118093 */ lui $s1, %hi(D_8093734C) ## $s1 = 80930000 /* 00EE0 8092D4B0 2631734C */ addiu $s1, $s1, %lo(D_8093734C) ## $s1 = 8093734C -/* 00EE4 8092D4B4 460A4401 */ sub.s $f16, $f8, $f10 +/* 00EE4 8092D4B4 460A4401 */ sub.s $f16, $f8, $f10 /* 00EE8 8092D4B8 3C0142A0 */ lui $at, 0x42A0 ## $at = 42A00000 /* 00EEC 8092D4BC 44812000 */ mtc1 $at, $f4 ## $f4 = 80.00 /* 00EF0 8092D4C0 3C0143A0 */ lui $at, 0x43A0 ## $at = 43A00000 @@ -566,41 +566,41 @@ glabel func_8092CC58 /* 00EF8 8092D4C8 C472000C */ lwc1 $f18, 0x000C($v1) ## 8094000C /* 00EFC 8092D4CC 44815000 */ mtc1 $at, $f10 ## $f10 = 320.00 /* 00F00 8092D4D0 3C108093 */ lui $s0, %hi(D_80937358) ## $s0 = 80930000 -/* 00F04 8092D4D4 46049181 */ sub.s $f6, $f18, $f4 +/* 00F04 8092D4D4 46049181 */ sub.s $f6, $f18, $f4 /* 00F08 8092D4D8 26107358 */ addiu $s0, $s0, %lo(D_80937358) ## $s0 = 80937358 /* 00F0C 8092D4DC 3C014316 */ lui $at, 0x4316 ## $at = 43160000 /* 00F10 8092D4E0 E6260004 */ swc1 $f6, 0x0004($s1) ## 80937350 /* 00F14 8092D4E4 C4680010 */ lwc1 $f8, 0x0010($v1) ## 80940010 -/* 00F18 8092D4E8 460A4400 */ add.s $f16, $f8, $f10 +/* 00F18 8092D4E8 460A4400 */ add.s $f16, $f8, $f10 /* 00F1C 8092D4EC E6300008 */ swc1 $f16, 0x0008($s1) ## 80937354 /* 00F20 8092D4F0 C4720008 */ lwc1 $f18, 0x0008($v1) ## 80940008 /* 00F24 8092D4F4 44818000 */ mtc1 $at, $f16 ## $f16 = 150.00 -/* 00F28 8092D4F8 46009101 */ sub.s $f4, $f18, $f0 +/* 00F28 8092D4F8 46009101 */ sub.s $f4, $f18, $f0 /* 00F2C 8092D4FC E6040000 */ swc1 $f4, 0x0000($s0) ## 80937358 /* 00F30 8092D500 C466000C */ lwc1 $f6, 0x000C($v1) ## 8094000C -/* 00F34 8092D504 46003200 */ add.s $f8, $f6, $f0 +/* 00F34 8092D504 46003200 */ add.s $f8, $f6, $f0 /* 00F38 8092D508 E6080004 */ swc1 $f8, 0x0004($s0) ## 8093735C /* 00F3C 8092D50C C46A0010 */ lwc1 $f10, 0x0010($v1) ## 80940010 -/* 00F40 8092D510 46105481 */ sub.s $f18, $f10, $f16 +/* 00F40 8092D510 46105481 */ sub.s $f18, $f10, $f16 /* 00F44 8092D514 E6120008 */ swc1 $f18, 0x0008($s0) ## 80937360 /* 00F48 8092D518 86460198 */ lh $a2, 0x0198($s2) ## 00000198 .L8092D51C: /* 00F4C 8092D51C 3C108093 */ lui $s0, %hi(D_80937358) ## $s0 = 80930000 /* 00F50 8092D520 3C118093 */ lui $s1, %hi(D_8093734C) ## $s1 = 80930000 /* 00F54 8092D524 2631734C */ addiu $s1, $s1, %lo(D_8093734C) ## $s1 = 8093734C -/* 00F58 8092D528 1000006E */ beq $zero, $zero, .L8092D6E4 +/* 00F58 8092D528 1000006E */ beq $zero, $zero, .L8092D6E4 /* 00F5C 8092D52C 26107358 */ addiu $s0, $s0, %lo(D_80937358) ## $s0 = 80937358 .L8092D530: -/* 00F60 8092D530 28C100C0 */ slti $at, $a2, 0x00C0 -/* 00F64 8092D534 14200051 */ bne $at, $zero, .L8092D67C +/* 00F60 8092D530 28C100C0 */ slti $at, $a2, 0x00C0 +/* 00F64 8092D534 14200051 */ bne $at, $zero, .L8092D67C /* 00F68 8092D538 240100F0 */ addiu $at, $zero, 0x00F0 ## $at = 000000F0 /* 00F6C 8092D53C 24C8FF40 */ addiu $t0, $a2, 0xFF40 ## $t0 = FFFFFF40 -/* 00F70 8092D540 14C10027 */ bne $a2, $at, .L8092D5E0 +/* 00F70 8092D540 14C10027 */ bne $a2, $at, .L8092D5E0 /* 00F74 8092D544 24090003 */ addiu $t1, $zero, 0x0003 ## $t1 = 00000003 /* 00F78 8092D548 3C014302 */ lui $at, 0x4302 ## $at = 43020000 /* 00F7C 8092D54C 44810000 */ mtc1 $at, $f0 ## $f0 = 130.00 /* 00F80 8092D550 3C038094 */ lui $v1, %hi(D_80938C98) ## $v1 = 80940000 -/* 00F84 8092D554 8C638C98 */ lw $v1, %lo(D_80938C98)($v1) +/* 00F84 8092D554 8C638C98 */ lw $v1, %lo(D_80938C98)($v1) /* 00F88 8092D558 3C014220 */ lui $at, 0x4220 ## $at = 42200000 /* 00F8C 8092D55C 44811000 */ mtc1 $at, $f2 ## $f2 = 40.00 /* 00F90 8092D560 3C01433E */ lui $at, 0x433E ## $at = 433E0000 @@ -608,7 +608,7 @@ glabel func_8092CC58 /* 00F98 8092D568 C4640008 */ lwc1 $f4, 0x0008($v1) ## 80940008 /* 00F9C 8092D56C 3C118093 */ lui $s1, %hi(D_8093734C) ## $s1 = 80930000 /* 00FA0 8092D570 2631734C */ addiu $s1, $s1, %lo(D_8093734C) ## $s1 = 8093734C -/* 00FA4 8092D574 46062201 */ sub.s $f8, $f4, $f6 +/* 00FA4 8092D574 46062201 */ sub.s $f8, $f4, $f6 /* 00FA8 8092D578 3C0142DC */ lui $at, 0x42DC ## $at = 42DC0000 /* 00FAC 8092D57C 44818000 */ mtc1 $at, $f16 ## $f16 = 110.00 /* 00FB0 8092D580 3C0142F0 */ lui $at, 0x42F0 ## $at = 42F00000 @@ -616,28 +616,28 @@ glabel func_8092CC58 /* 00FB8 8092D588 C46A000C */ lwc1 $f10, 0x000C($v1) ## 8094000C /* 00FBC 8092D58C 3C108093 */ lui $s0, %hi(D_80937358) ## $s0 = 80930000 /* 00FC0 8092D590 26107358 */ addiu $s0, $s0, %lo(D_80937358) ## $s0 = 80937358 -/* 00FC4 8092D594 46105481 */ sub.s $f18, $f10, $f16 +/* 00FC4 8092D594 46105481 */ sub.s $f18, $f10, $f16 /* 00FC8 8092D598 44815000 */ mtc1 $at, $f10 ## $f10 = 120.00 /* 00FCC 8092D59C 3C014248 */ lui $at, 0x4248 ## $at = 42480000 /* 00FD0 8092D5A0 E6320004 */ swc1 $f18, 0x0004($s1) ## 80937350 /* 00FD4 8092D5A4 C4640010 */ lwc1 $f4, 0x0010($v1) ## 80940010 -/* 00FD8 8092D5A8 46022180 */ add.s $f6, $f4, $f2 +/* 00FD8 8092D5A8 46022180 */ add.s $f6, $f4, $f2 /* 00FDC 8092D5AC E6260008 */ swc1 $f6, 0x0008($s1) ## 80937354 /* 00FE0 8092D5B0 C4680008 */ lwc1 $f8, 0x0008($v1) ## 80940008 -/* 00FE4 8092D5B4 460A4400 */ add.s $f16, $f8, $f10 +/* 00FE4 8092D5B4 460A4400 */ add.s $f16, $f8, $f10 /* 00FE8 8092D5B8 44814000 */ mtc1 $at, $f8 ## $f8 = 50.00 /* 00FEC 8092D5BC E6100000 */ swc1 $f16, 0x0000($s0) ## 80937358 /* 00FF0 8092D5C0 C472000C */ lwc1 $f18, 0x000C($v1) ## 8094000C -/* 00FF4 8092D5C4 46009100 */ add.s $f4, $f18, $f0 +/* 00FF4 8092D5C4 46009100 */ add.s $f4, $f18, $f0 /* 00FF8 8092D5C8 E6040004 */ swc1 $f4, 0x0004($s0) ## 8093735C /* 00FFC 8092D5CC C4660010 */ lwc1 $f6, 0x0010($v1) ## 80940010 -/* 01000 8092D5D0 46083280 */ add.s $f10, $f6, $f8 +/* 01000 8092D5D0 46083280 */ add.s $f10, $f6, $f8 /* 01004 8092D5D4 E60A0008 */ swc1 $f10, 0x0008($s0) ## 80937360 -/* 01008 8092D5D8 10000023 */ beq $zero, $zero, .L8092D668 +/* 01008 8092D5D8 10000023 */ beq $zero, $zero, .L8092D668 /* 0100C 8092D5DC 86460198 */ lh $a2, 0x0198($s2) ## 00000198 .L8092D5E0: /* 01010 8092D5E0 2401000C */ addiu $at, $zero, 0x000C ## $at = 0000000C -/* 01014 8092D5E4 15010020 */ bne $t0, $at, .L8092D668 +/* 01014 8092D5E4 15010020 */ bne $t0, $at, .L8092D668 /* 01018 8092D5E8 00000000 */ nop /* 0101C 8092D5EC 3C038093 */ lui $v1, %hi(D_80937340) ## $v1 = 80930000 /* 01020 8092D5F0 24637340 */ addiu $v1, $v1, %lo(D_80937340) ## $v1 = 80937340 @@ -648,23 +648,23 @@ glabel func_8092CC58 /* 01034 8092D604 44819000 */ mtc1 $at, $f18 ## $f18 = 50.00 /* 01038 8092D608 3C0142B4 */ lui $at, 0x42B4 ## $at = 42B40000 /* 0103C 8092D60C 44812000 */ mtc1 $at, $f4 ## $f4 = 90.00 -/* 01040 8092D610 46128080 */ add.s $f2, $f16, $f18 +/* 01040 8092D610 46128080 */ add.s $f2, $f16, $f18 /* 01044 8092D614 3C014348 */ lui $at, 0x4348 ## $at = 43480000 /* 01048 8092D618 44814000 */ mtc1 $at, $f8 ## $f8 = 200.00 -/* 0104C 8092D61C 46046181 */ sub.s $f6, $f12, $f4 +/* 0104C 8092D61C 46046181 */ sub.s $f6, $f12, $f4 /* 01050 8092D620 3C118093 */ lui $s1, %hi(D_8093734C) ## $s1 = 80930000 /* 01054 8092D624 2631734C */ addiu $s1, $s1, %lo(D_8093734C) ## $s1 = 8093734C -/* 01058 8092D628 46080281 */ sub.s $f10, $f0, $f8 +/* 01058 8092D628 46080281 */ sub.s $f10, $f0, $f8 /* 0105C 8092D62C 3C0143AF */ lui $at, 0x43AF ## $at = 43AF0000 /* 01060 8092D630 44818000 */ mtc1 $at, $f16 ## $f16 = 350.00 /* 01064 8092D634 3C108093 */ lui $s0, %hi(D_80937358) ## $s0 = 80930000 /* 01068 8092D638 26107358 */ addiu $s0, $s0, %lo(D_80937358) ## $s0 = 80937358 -/* 0106C 8092D63C 46106480 */ add.s $f18, $f12, $f16 +/* 0106C 8092D63C 46106480 */ add.s $f18, $f12, $f16 /* 01070 8092D640 3C014316 */ lui $at, 0x4316 ## $at = 43160000 /* 01074 8092D644 44812000 */ mtc1 $at, $f4 ## $f4 = 150.00 /* 01078 8092D648 E6260004 */ swc1 $f6, 0x0004($s1) ## 80937350 /* 0107C 8092D64C E6220000 */ swc1 $f2, 0x0000($s1) ## 8093734C -/* 01080 8092D650 46040180 */ add.s $f6, $f0, $f4 +/* 01080 8092D650 46040180 */ add.s $f6, $f0, $f4 /* 01084 8092D654 E62A0008 */ swc1 $f10, 0x0008($s1) ## 80937354 /* 01088 8092D658 E6020000 */ swc1 $f2, 0x0000($s0) ## 80937358 /* 0108C 8092D65C E6120004 */ swc1 $f18, 0x0004($s0) ## 8093735C @@ -674,278 +674,278 @@ glabel func_8092CC58 /* 01098 8092D668 3C108093 */ lui $s0, %hi(D_80937358) ## $s0 = 80930000 /* 0109C 8092D66C 3C118093 */ lui $s1, %hi(D_8093734C) ## $s1 = 80930000 /* 010A0 8092D670 2631734C */ addiu $s1, $s1, %lo(D_8093734C) ## $s1 = 8093734C -/* 010A4 8092D674 1000001B */ beq $zero, $zero, .L8092D6E4 +/* 010A4 8092D674 1000001B */ beq $zero, $zero, .L8092D6E4 /* 010A8 8092D678 26107358 */ addiu $s0, $s0, %lo(D_80937358) ## $s0 = 80937358 .L8092D67C: -/* 010AC 8092D67C 28C10094 */ slti $at, $a2, 0x0094 -/* 010B0 8092D680 14200007 */ bne $at, $zero, .L8092D6A0 +/* 010AC 8092D67C 28C10094 */ slti $at, $a2, 0x0094 +/* 010B0 8092D680 14200007 */ bne $at, $zero, .L8092D6A0 /* 010B4 8092D684 3C118093 */ lui $s1, %hi(D_8093734C) ## $s1 = 80930000 /* 010B8 8092D688 3C108093 */ lui $s0, %hi(D_80937358) ## $s0 = 80930000 /* 010BC 8092D68C 24C8FF6C */ addiu $t0, $a2, 0xFF6C ## $t0 = FFFFFF6C /* 010C0 8092D690 26107358 */ addiu $s0, $s0, %lo(D_80937358) ## $s0 = 80937358 /* 010C4 8092D694 2631734C */ addiu $s1, $s1, %lo(D_8093734C) ## $s1 = 8093734C -/* 010C8 8092D698 10000012 */ beq $zero, $zero, .L8092D6E4 +/* 010C8 8092D698 10000012 */ beq $zero, $zero, .L8092D6E4 /* 010CC 8092D69C 24090002 */ addiu $t1, $zero, 0x0002 ## $t1 = 00000002 .L8092D6A0: -/* 010D0 8092D6A0 28C10070 */ slti $at, $a2, 0x0070 -/* 010D4 8092D6A4 14200008 */ bne $at, $zero, .L8092D6C8 +/* 010D0 8092D6A0 28C10070 */ slti $at, $a2, 0x0070 +/* 010D4 8092D6A4 14200008 */ bne $at, $zero, .L8092D6C8 /* 010D8 8092D6A8 00004825 */ or $t1, $zero, $zero ## $t1 = 00000000 /* 010DC 8092D6AC 3C118093 */ lui $s1, %hi(D_8093734C) ## $s1 = 80930000 /* 010E0 8092D6B0 3C108093 */ lui $s0, %hi(D_80937358) ## $s0 = 80930000 /* 010E4 8092D6B4 24C8FF90 */ addiu $t0, $a2, 0xFF90 ## $t0 = FFFFFF90 /* 010E8 8092D6B8 26107358 */ addiu $s0, $s0, %lo(D_80937358) ## $s0 = 80937358 /* 010EC 8092D6BC 2631734C */ addiu $s1, $s1, %lo(D_8093734C) ## $s1 = 8093734C -/* 010F0 8092D6C0 10000008 */ beq $zero, $zero, .L8092D6E4 +/* 010F0 8092D6C0 10000008 */ beq $zero, $zero, .L8092D6E4 /* 010F4 8092D6C4 24090001 */ addiu $t1, $zero, 0x0001 ## $t1 = 00000001 .L8092D6C8: /* 010F8 8092D6C8 2401001C */ addiu $at, $zero, 0x001C ## $at = 0000001C -/* 010FC 8092D6CC 00C1001A */ div $zero, $a2, $at -/* 01100 8092D6D0 00004010 */ mfhi $t0 +/* 010FC 8092D6CC 00C1001A */ div $zero, $a2, $at +/* 01100 8092D6D0 00004010 */ mfhi $t0 /* 01104 8092D6D4 3C118093 */ lui $s1, %hi(D_8093734C) ## $s1 = 80930000 /* 01108 8092D6D8 3C108093 */ lui $s0, %hi(D_80937358) ## $s0 = 80930000 /* 0110C 8092D6DC 26107358 */ addiu $s0, $s0, %lo(D_80937358) ## $s0 = 80937358 /* 01110 8092D6E0 2631734C */ addiu $s1, $s1, %lo(D_8093734C) ## $s1 = 8093734C .L8092D6E4: -/* 01114 8092D6E4 28C100C7 */ slti $at, $a2, 0x00C7 -/* 01118 8092D6E8 502000B3 */ beql $at, $zero, .L8092D9B8 +/* 01114 8092D6E4 28C100C7 */ slti $at, $a2, 0x00C7 +/* 01118 8092D6E8 502000B3 */ beql $at, $zero, .L8092D9B8 /* 0111C 8092D6EC 2401000C */ addiu $at, $zero, 0x000C ## $at = 0000000C /* 01120 8092D6F0 3C058016 */ lui $a1, 0x8016 ## $a1 = 80160000 /* 01124 8092D6F4 24A5E660 */ addiu $a1, $a1, 0xE660 ## $a1 = 8015E660 /* 01128 8092D6F8 94A30EE2 */ lhu $v1, 0x0EE2($a1) ## 8015F542 /* 0112C 8092D6FC 240F00C6 */ addiu $t7, $zero, 0x00C6 ## $t7 = 000000C6 -/* 01130 8092D700 01E61023 */ subu $v0, $t7, $a2 +/* 01130 8092D700 01E61023 */ subu $v0, $t7, $a2 /* 01134 8092D704 30630080 */ andi $v1, $v1, 0x0080 ## $v1 = 00000000 -/* 01138 8092D708 1060001C */ beq $v1, $zero, .L8092D77C -/* 0113C 8092D70C 2841002D */ slti $at, $v0, 0x002D -/* 01140 8092D710 1020001A */ beq $at, $zero, .L8092D77C +/* 01138 8092D708 1060001C */ beq $v1, $zero, .L8092D77C +/* 0113C 8092D70C 2841002D */ slti $at, $v0, 0x002D +/* 01140 8092D710 1020001A */ beq $at, $zero, .L8092D77C /* 01144 8092D714 3C018093 */ lui $at, %hi(D_8093799C) ## $at = 80930000 -/* 01148 8092D718 C42A799C */ lwc1 $f10, %lo(D_8093799C)($at) +/* 01148 8092D718 C42A799C */ lwc1 $f10, %lo(D_8093799C)($at) /* 0114C 8092D71C 3C014000 */ lui $at, 0x4000 ## $at = 40000000 /* 01150 8092D720 C6280000 */ lwc1 $f8, 0x0000($s1) ## 8093734C /* 01154 8092D724 44812000 */ mtc1 $at, $f4 ## $f4 = 2.00 /* 01158 8092D728 C6320004 */ lwc1 $f18, 0x0004($s1) ## 80937350 -/* 0115C 8092D72C 460A4400 */ add.s $f16, $f8, $f10 +/* 0115C 8092D72C 460A4400 */ add.s $f16, $f8, $f10 /* 01160 8092D730 3C018093 */ lui $at, %hi(D_809379A0) ## $at = 80930000 /* 01164 8092D734 C6080000 */ lwc1 $f8, 0x0000($s0) ## 80937358 -/* 01168 8092D738 46049180 */ add.s $f6, $f18, $f4 +/* 01168 8092D738 46049180 */ add.s $f6, $f18, $f4 /* 0116C 8092D73C E6300000 */ swc1 $f16, 0x0000($s1) ## 8093734C /* 01170 8092D740 C6120004 */ lwc1 $f18, 0x0004($s0) ## 8093735C /* 01174 8092D744 E6260004 */ swc1 $f6, 0x0004($s1) ## 80937350 -/* 01178 8092D748 C42A79A0 */ lwc1 $f10, %lo(D_809379A0)($at) +/* 01178 8092D748 C42A79A0 */ lwc1 $f10, %lo(D_809379A0)($at) /* 0117C 8092D74C 3C018093 */ lui $at, %hi(D_809379A4) ## $at = 80930000 -/* 01180 8092D750 460A4401 */ sub.s $f16, $f8, $f10 +/* 01180 8092D750 460A4401 */ sub.s $f16, $f8, $f10 /* 01184 8092D754 C6080008 */ lwc1 $f8, 0x0008($s0) ## 80937360 /* 01188 8092D758 E6100000 */ swc1 $f16, 0x0000($s0) ## 80937358 -/* 0118C 8092D75C C42479A4 */ lwc1 $f4, %lo(D_809379A4)($at) +/* 0118C 8092D75C C42479A4 */ lwc1 $f4, %lo(D_809379A4)($at) /* 01190 8092D760 3C014120 */ lui $at, 0x4120 ## $at = 41200000 /* 01194 8092D764 44815000 */ mtc1 $at, $f10 ## $f10 = 10.00 -/* 01198 8092D768 46049181 */ sub.s $f6, $f18, $f4 -/* 0119C 8092D76C 460A4400 */ add.s $f16, $f8, $f10 +/* 01198 8092D768 46049181 */ sub.s $f6, $f18, $f4 +/* 0119C 8092D76C 460A4400 */ add.s $f16, $f8, $f10 /* 011A0 8092D770 E6060004 */ swc1 $f6, 0x0004($s0) ## 8093735C -/* 011A4 8092D774 1000008F */ beq $zero, $zero, .L8092D9B4 +/* 011A4 8092D774 1000008F */ beq $zero, $zero, .L8092D9B4 /* 011A8 8092D778 E6100008 */ swc1 $f16, 0x0008($s0) ## 80937360 .L8092D77C: -/* 011AC 8092D77C 28C10015 */ slti $at, $a2, 0x0015 -/* 011B0 8092D780 1020001F */ beq $at, $zero, .L8092D800 +/* 011AC 8092D77C 28C10015 */ slti $at, $a2, 0x0015 +/* 011B0 8092D780 1020001F */ beq $at, $zero, .L8092D800 /* 011B4 8092D784 3C0140E0 */ lui $at, 0x40E0 ## $at = 40E00000 /* 011B8 8092D788 44812000 */ mtc1 $at, $f4 ## $f4 = 7.00 /* 011BC 8092D78C C6320004 */ lwc1 $f18, 0x0004($s1) ## 80937350 /* 011C0 8092D790 3C014110 */ lui $at, 0x4110 ## $at = 41100000 /* 011C4 8092D794 44815000 */ mtc1 $at, $f10 ## $f10 = 9.00 -/* 011C8 8092D798 46049181 */ sub.s $f6, $f18, $f4 +/* 011C8 8092D798 46049181 */ sub.s $f6, $f18, $f4 /* 011CC 8092D79C 3C0140D0 */ lui $at, 0x40D0 ## $at = 40D00000 /* 011D0 8092D7A0 C6280008 */ lwc1 $f8, 0x0008($s1) ## 80937354 /* 011D4 8092D7A4 44812000 */ mtc1 $at, $f4 ## $f4 = 6.50 /* 011D8 8092D7A8 C6120000 */ lwc1 $f18, 0x0000($s0) ## 80937358 /* 011DC 8092D7AC E6260004 */ swc1 $f6, 0x0004($s1) ## 80937350 -/* 011E0 8092D7B0 460A4400 */ add.s $f16, $f8, $f10 +/* 011E0 8092D7B0 460A4400 */ add.s $f16, $f8, $f10 /* 011E4 8092D7B4 3C014080 */ lui $at, 0x4080 ## $at = 40800000 /* 011E8 8092D7B8 44815000 */ mtc1 $at, $f10 ## $f10 = 4.00 -/* 011EC 8092D7BC 46049180 */ add.s $f6, $f18, $f4 +/* 011EC 8092D7BC 46049180 */ add.s $f6, $f18, $f4 /* 011F0 8092D7C0 3C014178 */ lui $at, 0x4178 ## $at = 41780000 /* 011F4 8092D7C4 C6080004 */ lwc1 $f8, 0x0004($s0) ## 8093735C /* 011F8 8092D7C8 44812000 */ mtc1 $at, $f4 ## $f4 = 15.50 /* 011FC 8092D7CC C6120008 */ lwc1 $f18, 0x0008($s0) ## 80937360 /* 01200 8092D7D0 E6300008 */ swc1 $f16, 0x0008($s1) ## 80937354 /* 01204 8092D7D4 E6060000 */ swc1 $f6, 0x0000($s0) ## 80937358 -/* 01208 8092D7D8 460A4400 */ add.s $f16, $f8, $f10 +/* 01208 8092D7D8 460A4400 */ add.s $f16, $f8, $f10 /* 0120C 8092D7DC 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -/* 01210 8092D7E0 46049180 */ add.s $f6, $f18, $f4 +/* 01210 8092D7E0 46049180 */ add.s $f6, $f18, $f4 /* 01214 8092D7E4 E6100004 */ swc1 $f16, 0x0004($s0) ## 8093735C /* 01218 8092D7E8 E6060008 */ swc1 $f6, 0x0008($s0) ## 80937360 /* 0121C 8092D7EC 8E580004 */ lw $t8, 0x0004($s2) ## 00000004 /* 01220 8092D7F0 A2420194 */ sb $v0, 0x0194($s2) ## 00000194 /* 01224 8092D7F4 37190080 */ ori $t9, $t8, 0x0080 ## $t9 = 00000080 -/* 01228 8092D7F8 1000006E */ beq $zero, $zero, .L8092D9B4 +/* 01228 8092D7F8 1000006E */ beq $zero, $zero, .L8092D9B4 /* 0122C 8092D7FC AE590004 */ sw $t9, 0x0004($s2) ## 00000004 .L8092D800: -/* 01230 8092D800 28410028 */ slti $at, $v0, 0x0028 -/* 01234 8092D804 1020001A */ beq $at, $zero, .L8092D870 +/* 01230 8092D800 28410028 */ slti $at, $v0, 0x0028 +/* 01234 8092D804 1020001A */ beq $at, $zero, .L8092D870 /* 01238 8092D808 3C013FA0 */ lui $at, 0x3FA0 ## $at = 3FA00000 /* 0123C 8092D80C 44815000 */ mtc1 $at, $f10 ## $f10 = 1.25 /* 01240 8092D810 C6280000 */ lwc1 $f8, 0x0000($s1) ## 8093734C /* 01244 8092D814 3C014060 */ lui $at, 0x4060 ## $at = 40600000 /* 01248 8092D818 44812000 */ mtc1 $at, $f4 ## $f4 = 3.50 -/* 0124C 8092D81C 460A4400 */ add.s $f16, $f8, $f10 +/* 0124C 8092D81C 460A4400 */ add.s $f16, $f8, $f10 /* 01250 8092D820 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 /* 01254 8092D824 C6320004 */ lwc1 $f18, 0x0004($s1) ## 80937350 /* 01258 8092D828 44815000 */ mtc1 $at, $f10 ## $f10 = 5.00 /* 0125C 8092D82C C6280008 */ lwc1 $f8, 0x0008($s1) ## 80937354 /* 01260 8092D830 E6300000 */ swc1 $f16, 0x0000($s1) ## 8093734C -/* 01264 8092D834 46049180 */ add.s $f6, $f18, $f4 +/* 01264 8092D834 46049180 */ add.s $f6, $f18, $f4 /* 01268 8092D838 3C014000 */ lui $at, 0x4000 ## $at = 40000000 /* 0126C 8092D83C 44812000 */ mtc1 $at, $f4 ## $f4 = 2.00 -/* 01270 8092D840 460A4400 */ add.s $f16, $f8, $f10 +/* 01270 8092D840 460A4400 */ add.s $f16, $f8, $f10 /* 01274 8092D844 3C014108 */ lui $at, 0x4108 ## $at = 41080000 /* 01278 8092D848 C6120000 */ lwc1 $f18, 0x0000($s0) ## 80937358 /* 0127C 8092D84C 44815000 */ mtc1 $at, $f10 ## $f10 = 8.50 /* 01280 8092D850 C6080004 */ lwc1 $f8, 0x0004($s0) ## 8093735C /* 01284 8092D854 E6260004 */ swc1 $f6, 0x0004($s1) ## 80937350 /* 01288 8092D858 E6300008 */ swc1 $f16, 0x0008($s1) ## 80937354 -/* 0128C 8092D85C 46049180 */ add.s $f6, $f18, $f4 -/* 01290 8092D860 460A4401 */ sub.s $f16, $f8, $f10 +/* 0128C 8092D85C 46049180 */ add.s $f6, $f18, $f4 +/* 01290 8092D860 460A4401 */ sub.s $f16, $f8, $f10 /* 01294 8092D864 E6060000 */ swc1 $f6, 0x0000($s0) ## 80937358 -/* 01298 8092D868 10000052 */ beq $zero, $zero, .L8092D9B4 +/* 01298 8092D868 10000052 */ beq $zero, $zero, .L8092D9B4 /* 0129C 8092D86C E6100004 */ swc1 $f16, 0x0004($s0) ## 8093735C .L8092D870: -/* 012A0 8092D870 2841002D */ slti $at, $v0, 0x002D -/* 012A4 8092D874 1420004F */ bne $at, $zero, .L8092D9B4 -/* 012A8 8092D878 28410055 */ slti $at, $v0, 0x0055 -/* 012AC 8092D87C 1020001F */ beq $at, $zero, .L8092D8FC +/* 012A0 8092D870 2841002D */ slti $at, $v0, 0x002D +/* 012A4 8092D874 1420004F */ bne $at, $zero, .L8092D9B4 +/* 012A8 8092D878 28410055 */ slti $at, $v0, 0x0055 +/* 012AC 8092D87C 1020001F */ beq $at, $zero, .L8092D8FC /* 012B0 8092D880 3C014020 */ lui $at, 0x4020 ## $at = 40200000 /* 012B4 8092D884 44812000 */ mtc1 $at, $f4 ## $f4 = 2.50 /* 012B8 8092D888 3C014088 */ lui $at, 0x4088 ## $at = 40880000 /* 012BC 8092D88C C6320000 */ lwc1 $f18, 0x0000($s1) ## 8093734C /* 012C0 8092D890 44815000 */ mtc1 $at, $f10 ## $f10 = 4.25 /* 012C4 8092D894 C6280004 */ lwc1 $f8, 0x0004($s1) ## 80937350 -/* 012C8 8092D898 46049181 */ sub.s $f6, $f18, $f4 +/* 012C8 8092D898 46049181 */ sub.s $f6, $f18, $f4 /* 012CC 8092D89C 3C014140 */ lui $at, 0x4140 ## $at = 41400000 /* 012D0 8092D8A0 44812000 */ mtc1 $at, $f4 ## $f4 = 12.00 -/* 012D4 8092D8A4 460A4400 */ add.s $f16, $f8, $f10 +/* 012D4 8092D8A4 460A4400 */ add.s $f16, $f8, $f10 /* 012D8 8092D8A8 3C0140D0 */ lui $at, 0x40D0 ## $at = 40D00000 /* 012DC 8092D8AC C6320008 */ lwc1 $f18, 0x0008($s1) ## 80937354 /* 012E0 8092D8B0 44815000 */ mtc1 $at, $f10 ## $f10 = 6.50 /* 012E4 8092D8B4 C6080000 */ lwc1 $f8, 0x0000($s0) ## 80937358 /* 012E8 8092D8B8 E6260000 */ swc1 $f6, 0x0000($s1) ## 8093734C /* 012EC 8092D8BC E6300004 */ swc1 $f16, 0x0004($s1) ## 80937350 -/* 012F0 8092D8C0 46049181 */ sub.s $f6, $f18, $f4 +/* 012F0 8092D8C0 46049181 */ sub.s $f6, $f18, $f4 /* 012F4 8092D8C4 3C013FA0 */ lui $at, 0x3FA0 ## $at = 3FA00000 /* 012F8 8092D8C8 44812000 */ mtc1 $at, $f4 ## $f4 = 1.25 -/* 012FC 8092D8CC 460A4401 */ sub.s $f16, $f8, $f10 +/* 012FC 8092D8CC 460A4401 */ sub.s $f16, $f8, $f10 /* 01300 8092D8D0 3C014060 */ lui $at, 0x4060 ## $at = 40600000 /* 01304 8092D8D4 C6120004 */ lwc1 $f18, 0x0004($s0) ## 8093735C /* 01308 8092D8D8 44815000 */ mtc1 $at, $f10 ## $f10 = 3.50 /* 0130C 8092D8DC C6080008 */ lwc1 $f8, 0x0008($s0) ## 80937360 /* 01310 8092D8E0 E6260008 */ swc1 $f6, 0x0008($s1) ## 80937354 /* 01314 8092D8E4 E6100000 */ swc1 $f16, 0x0000($s0) ## 80937358 -/* 01318 8092D8E8 46049180 */ add.s $f6, $f18, $f4 -/* 0131C 8092D8EC 460A4401 */ sub.s $f16, $f8, $f10 +/* 01318 8092D8E8 46049180 */ add.s $f6, $f18, $f4 +/* 0131C 8092D8EC 460A4401 */ sub.s $f16, $f8, $f10 /* 01320 8092D8F0 E6060004 */ swc1 $f6, 0x0004($s0) ## 8093735C -/* 01324 8092D8F4 1000002F */ beq $zero, $zero, .L8092D9B4 +/* 01324 8092D8F4 1000002F */ beq $zero, $zero, .L8092D9B4 /* 01328 8092D8F8 E6100008 */ swc1 $f16, 0x0008($s0) ## 80937360 .L8092D8FC: /* 0132C 8092D8FC 24010055 */ addiu $at, $zero, 0x0055 ## $at = 00000055 -/* 01330 8092D900 5441002D */ bnel $v0, $at, .L8092D9B8 +/* 01330 8092D900 5441002D */ bnel $v0, $at, .L8092D9B8 /* 01334 8092D904 2401000C */ addiu $at, $zero, 0x000C ## $at = 0000000C -/* 01338 8092D908 1460001C */ bne $v1, $zero, .L8092D97C -/* 0133C 8092D90C 8FA40054 */ lw $a0, 0x0054($sp) +/* 01338 8092D908 1460001C */ bne $v1, $zero, .L8092D97C +/* 0133C 8092D90C 8FA40054 */ lw $a0, 0x0054($sp) /* 01340 8092D910 3C020601 */ lui $v0, 0x0601 ## $v0 = 06010000 /* 01344 8092D914 24423D80 */ addiu $v0, $v0, 0x3D80 ## $v0 = 06013D80 -/* 01348 8092D918 00025900 */ sll $t3, $v0, 4 -/* 0134C 8092D91C 000B6702 */ srl $t4, $t3, 28 -/* 01350 8092D920 000C6880 */ sll $t5, $t4, 2 +/* 01348 8092D918 00025900 */ sll $t3, $v0, 4 +/* 0134C 8092D91C 000B6702 */ srl $t4, $t3, 28 +/* 01350 8092D920 000C6880 */ sll $t5, $t4, 2 /* 01354 8092D924 3C0E8016 */ lui $t6, 0x8016 ## $t6 = 80160000 -/* 01358 8092D928 01CD7021 */ addu $t6, $t6, $t5 +/* 01358 8092D928 01CD7021 */ addu $t6, $t6, $t5 /* 0135C 8092D92C 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 /* 01360 8092D930 8DCE6FA8 */ lw $t6, 0x6FA8($t6) ## 80166FA8 /* 01364 8092D934 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF -/* 01368 8092D938 00417824 */ and $t7, $v0, $at +/* 01368 8092D938 00417824 */ and $t7, $v0, $at /* 0136C 8092D93C 3C018000 */ lui $at, 0x8000 ## $at = 80000000 /* 01370 8092D940 241800B4 */ addiu $t8, $zero, 0x00B4 ## $t8 = 000000B4 /* 01374 8092D944 24190080 */ addiu $t9, $zero, 0x0080 ## $t9 = 00000080 /* 01378 8092D948 240A0028 */ addiu $t2, $zero, 0x0028 ## $t2 = 00000028 -/* 0137C 8092D94C 01CF3021 */ addu $a2, $t6, $t7 -/* 01380 8092D950 00C13021 */ addu $a2, $a2, $at -/* 01384 8092D954 AFAA0018 */ sw $t2, 0x0018($sp) -/* 01388 8092D958 AFB90014 */ sw $t9, 0x0014($sp) -/* 0138C 8092D95C AFB80010 */ sw $t8, 0x0010($sp) +/* 0137C 8092D94C 01CF3021 */ addu $a2, $t6, $t7 +/* 01380 8092D950 00C13021 */ addu $a2, $a2, $at +/* 01384 8092D954 AFAA0018 */ sw $t2, 0x0018($sp) +/* 01388 8092D958 AFB90014 */ sw $t9, 0x0014($sp) +/* 0138C 8092D95C AFB80010 */ sw $t8, 0x0010($sp) /* 01390 8092D960 24851D4C */ addiu $a1, $a0, 0x1D4C ## $a1 = 00001D4C /* 01394 8092D964 240700A0 */ addiu $a3, $zero, 0x00A0 ## $a3 = 000000A0 -/* 01398 8092D968 AFA80044 */ sw $t0, 0x0044($sp) +/* 01398 8092D968 AFA80044 */ sw $t0, 0x0044($sp) /* 0139C 8092D96C 0C00B380 */ jal TitleCard_InitBossName - -/* 013A0 8092D970 AFA90048 */ sw $t1, 0x0048($sp) -/* 013A4 8092D974 8FA80044 */ lw $t0, 0x0044($sp) -/* 013A8 8092D978 8FA90048 */ lw $t1, 0x0048($sp) + +/* 013A0 8092D970 AFA90048 */ sw $t1, 0x0048($sp) +/* 013A4 8092D974 8FA80044 */ lw $t0, 0x0044($sp) +/* 013A8 8092D978 8FA90048 */ lw $t1, 0x0048($sp) .L8092D97C: /* 013AC 8092D97C 2404001B */ addiu $a0, $zero, 0x001B ## $a0 = 0000001B -/* 013B0 8092D980 AFA80044 */ sw $t0, 0x0044($sp) +/* 013B0 8092D980 AFA80044 */ sw $t0, 0x0044($sp) /* 013B4 8092D984 0C03E803 */ jal Audio_SetBGM - -/* 013B8 8092D988 AFA90048 */ sw $t1, 0x0048($sp) + +/* 013B8 8092D988 AFA90048 */ sw $t1, 0x0048($sp) /* 013BC 8092D98C 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 /* 013C0 8092D990 24A5C288 */ addiu $a1, $a1, 0xC288 ## $a1 = 0600C288 -/* 013C4 8092D994 8FA40038 */ lw $a0, 0x0038($sp) -/* 013C8 8092D998 0C029490 */ jal func_800A5240 +/* 013C4 8092D994 8FA40038 */ lw $a0, 0x0038($sp) +/* 013C8 8092D998 0C029490 */ jal SkelAnime_ChangeAnimTransitionStop /* 013CC 8092D99C 3C06C0A0 */ lui $a2, 0xC0A0 ## $a2 = C0A00000 /* 013D0 8092D9A0 02402025 */ or $a0, $s2, $zero ## $a0 = 00000000 -/* 013D4 8092D9A4 0C24CF4B */ jal func_80933D2C +/* 013D4 8092D9A4 0C24CF4B */ jal func_80933D2C /* 013D8 8092D9A8 2405396B */ addiu $a1, $zero, 0x396B ## $a1 = 0000396B -/* 013DC 8092D9AC 8FA80044 */ lw $t0, 0x0044($sp) -/* 013E0 8092D9B0 8FA90048 */ lw $t1, 0x0048($sp) +/* 013DC 8092D9AC 8FA80044 */ lw $t0, 0x0044($sp) +/* 013E0 8092D9B0 8FA90048 */ lw $t1, 0x0048($sp) .L8092D9B4: /* 013E4 8092D9B4 2401000C */ addiu $at, $zero, 0x000C ## $at = 0000000C .L8092D9B8: -/* 013E8 8092D9B8 55010009 */ bnel $t0, $at, .L8092D9E0 +/* 013E8 8092D9B8 55010009 */ bnel $t0, $at, .L8092D9E0 /* 013EC 8092D9BC 24020005 */ addiu $v0, $zero, 0x0005 ## $v0 = 00000005 /* 013F0 8092D9C0 3C048094 */ lui $a0, %hi(D_80938C9C) ## $a0 = 80940000 -/* 013F4 8092D9C4 8C848C9C */ lw $a0, %lo(D_80938C9C)($a0) -/* 013F8 8092D9C8 AFA80044 */ sw $t0, 0x0044($sp) -/* 013FC 8092D9CC 0C24BF74 */ jal func_8092FDD0 -/* 01400 8092D9D0 AFA90048 */ sw $t1, 0x0048($sp) -/* 01404 8092D9D4 8FA80044 */ lw $t0, 0x0044($sp) -/* 01408 8092D9D8 8FA90048 */ lw $t1, 0x0048($sp) +/* 013F4 8092D9C4 8C848C9C */ lw $a0, %lo(D_80938C9C)($a0) +/* 013F8 8092D9C8 AFA80044 */ sw $t0, 0x0044($sp) +/* 013FC 8092D9CC 0C24BF74 */ jal func_8092FDD0 +/* 01400 8092D9D0 AFA90048 */ sw $t1, 0x0048($sp) +/* 01404 8092D9D4 8FA80044 */ lw $t0, 0x0044($sp) +/* 01408 8092D9D8 8FA90048 */ lw $t1, 0x0048($sp) /* 0140C 8092D9DC 24020005 */ addiu $v0, $zero, 0x0005 ## $v0 = 00000005 .L8092D9E0: -/* 01410 8092D9E0 11020012 */ beq $t0, $v0, .L8092DA2C -/* 01414 8092D9E4 00095840 */ sll $t3, $t1, 1 +/* 01410 8092D9E0 11020012 */ beq $t0, $v0, .L8092DA2C +/* 01414 8092D9E4 00095840 */ sll $t3, $t1, 1 /* 01418 8092D9E8 256C0007 */ addiu $t4, $t3, 0x0007 ## $t4 = 00000007 -/* 0141C 8092D9EC 010C001A */ div $zero, $t0, $t4 -/* 01420 8092D9F0 00006810 */ mfhi $t5 +/* 0141C 8092D9EC 010C001A */ div $zero, $t0, $t4 +/* 01420 8092D9F0 00006810 */ mfhi $t5 /* 01424 8092D9F4 3C048094 */ lui $a0, %hi(D_80938C98) ## $a0 = 80940000 -/* 01428 8092D9F8 15800002 */ bne $t4, $zero, .L8092DA04 +/* 01428 8092D9F8 15800002 */ bne $t4, $zero, .L8092DA04 /* 0142C 8092D9FC 00000000 */ nop /* 01430 8092DA00 0007000D */ break 7 .L8092DA04: /* 01434 8092DA04 2401FFFF */ addiu $at, $zero, 0xFFFF ## $at = FFFFFFFF -/* 01438 8092DA08 15810004 */ bne $t4, $at, .L8092DA1C +/* 01438 8092DA08 15810004 */ bne $t4, $at, .L8092DA1C /* 0143C 8092DA0C 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 01440 8092DA10 15010002 */ bne $t0, $at, .L8092DA1C +/* 01440 8092DA10 15010002 */ bne $t0, $at, .L8092DA1C /* 01444 8092DA14 00000000 */ nop /* 01448 8092DA18 0006000D */ break 6 .L8092DA1C: -/* 0144C 8092DA1C 544D0004 */ bnel $v0, $t5, .L8092DA30 +/* 0144C 8092DA1C 544D0004 */ bnel $v0, $t5, .L8092DA30 /* 01450 8092DA20 8E4F0190 */ lw $t7, 0x0190($s2) ## 00000190 -/* 01454 8092DA24 0C24C039 */ jal func_809300E4 -/* 01458 8092DA28 8C848C98 */ lw $a0, %lo(D_80938C98)($a0) +/* 01454 8092DA24 0C24C039 */ jal func_809300E4 +/* 01458 8092DA28 8C848C98 */ lw $a0, %lo(D_80938C98)($a0) .L8092DA2C: /* 0145C 8092DA2C 8E4F0190 */ lw $t7, 0x0190($s2) ## 00000190 .L8092DA30: /* 01460 8092DA30 3C0E8093 */ lui $t6, %hi(func_8092DB4C) ## $t6 = 80930000 /* 01464 8092DA34 25CEDB4C */ addiu $t6, $t6, %lo(func_8092DB4C) ## $t6 = 8092DB4C -/* 01468 8092DA38 11CF0006 */ beq $t6, $t7, .L8092DA54 +/* 01468 8092DA38 11CF0006 */ beq $t6, $t7, .L8092DA54 /* 0146C 8092DA3C 3C058094 */ lui $a1, %hi(D_80938CC4) ## $a1 = 80940000 -/* 01470 8092DA40 84A58CC4 */ lh $a1, %lo(D_80938CC4)($a1) -/* 01474 8092DA44 8FA40054 */ lw $a0, 0x0054($sp) +/* 01470 8092DA40 84A58CC4 */ lh $a1, %lo(D_80938CC4)($a1) +/* 01474 8092DA44 8FA40054 */ lw $a0, 0x0054($sp) /* 01478 8092DA48 02203025 */ or $a2, $s1, $zero ## $a2 = 8093734C -/* 0147C 8092DA4C 0C030136 */ jal func_800C04D8 +/* 0147C 8092DA4C 0C030136 */ jal func_800C04D8 /* 01480 8092DA50 02003825 */ or $a3, $s0, $zero ## $a3 = 80937358 .L8092DA54: -/* 01484 8092DA54 8FBF0034 */ lw $ra, 0x0034($sp) -/* 01488 8092DA58 8FB00028 */ lw $s0, 0x0028($sp) -/* 0148C 8092DA5C 8FB1002C */ lw $s1, 0x002C($sp) -/* 01490 8092DA60 8FB20030 */ lw $s2, 0x0030($sp) -/* 01494 8092DA64 03E00008 */ jr $ra +/* 01484 8092DA54 8FBF0034 */ lw $ra, 0x0034($sp) +/* 01488 8092DA58 8FB00028 */ lw $s0, 0x0028($sp) +/* 0148C 8092DA5C 8FB1002C */ lw $s1, 0x002C($sp) +/* 01490 8092DA60 8FB20030 */ lw $s2, 0x0030($sp) +/* 01494 8092DA64 03E00008 */ jr $ra /* 01498 8092DA68 27BD0050 */ addiu $sp, $sp, 0x0050 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092DA6C.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092DA6C.s index 47bd19a5ac..eebdeca366 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092DA6C.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092DA6C.s @@ -1,23 +1,23 @@ glabel func_8092DA6C /* 0149C 8092DA6C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 014A0 8092DA70 AFBF0014 */ sw $ra, 0x0014($sp) +/* 014A0 8092DA70 AFBF0014 */ sw $ra, 0x0014($sp) /* 014A4 8092DA74 8C8E0154 */ lw $t6, 0x0154($a0) ## 00000154 /* 014A8 8092DA78 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 /* 014AC 8092DA7C 24A5DC2C */ addiu $a1, $a1, 0xDC2C ## $a1 = 0600DC2C -/* 014B0 8092DA80 10AE0006 */ beq $a1, $t6, .L8092DA9C +/* 014B0 8092DA80 10AE0006 */ beq $a1, $t6, .L8092DA9C /* 014B4 8092DA84 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 /* 014B8 8092DA88 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C /* 014BC 8092DA8C 3C06C0A0 */ lui $a2, 0xC0A0 ## $a2 = C0A00000 -/* 014C0 8092DA90 0C0294D3 */ jal func_800A534C -/* 014C4 8092DA94 AFA70018 */ sw $a3, 0x0018($sp) -/* 014C8 8092DA98 8FA70018 */ lw $a3, 0x0018($sp) +/* 014C0 8092DA90 0C0294D3 */ jal SkelAnime_ChangeAnimTransitionRepeat +/* 014C4 8092DA94 AFA70018 */ sw $a3, 0x0018($sp) +/* 014C8 8092DA98 8FA70018 */ lw $a3, 0x0018($sp) .L8092DA9C: /* 014CC 8092DA9C 3C0F8093 */ lui $t7, %hi(func_8092DAB8) ## $t7 = 80930000 /* 014D0 8092DAA0 25EFDAB8 */ addiu $t7, $t7, %lo(func_8092DAB8) ## $t7 = 8092DAB8 /* 014D4 8092DAA4 ACEF0190 */ sw $t7, 0x0190($a3) ## 00000190 -/* 014D8 8092DAA8 8FBF0014 */ lw $ra, 0x0014($sp) +/* 014D8 8092DAA8 8FBF0014 */ lw $ra, 0x0014($sp) /* 014DC 8092DAAC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 014E0 8092DAB0 03E00008 */ jr $ra +/* 014E0 8092DAB0 03E00008 */ jr $ra /* 014E4 8092DAB4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092DCEC.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092DCEC.s index 4a9e914a5d..8900cc2b18 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092DCEC.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092DCEC.s @@ -1,30 +1,30 @@ glabel func_8092DCEC /* 0171C 8092DCEC 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 01720 8092DCF0 AFBF0014 */ sw $ra, 0x0014($sp) -/* 01724 8092DCF4 10A00008 */ beq $a1, $zero, .L8092DD18 -/* 01728 8092DCF8 AFA40018 */ sw $a0, 0x0018($sp) +/* 01720 8092DCF0 AFBF0014 */ sw $ra, 0x0014($sp) +/* 01724 8092DCF4 10A00008 */ beq $a1, $zero, .L8092DD18 +/* 01728 8092DCF8 AFA40018 */ sw $a0, 0x0018($sp) /* 0172C 8092DCFC 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 /* 01730 8092DD00 24A5C9BC */ addiu $a1, $a1, 0xC9BC ## $a1 = 0600C9BC /* 01734 8092DD04 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 01738 8092DD08 0C029490 */ jal func_800A5240 +/* 01738 8092DD08 0C029490 */ jal SkelAnime_ChangeAnimTransitionStop /* 0173C 8092DD0C 3C06C0A0 */ lui $a2, 0xC0A0 ## $a2 = C0A00000 -/* 01740 8092DD10 10000008 */ beq $zero, $zero, .L8092DD34 -/* 01744 8092DD14 8FAF0018 */ lw $t7, 0x0018($sp) +/* 01740 8092DD10 10000008 */ beq $zero, $zero, .L8092DD34 +/* 01744 8092DD14 8FAF0018 */ lw $t7, 0x0018($sp) .L8092DD18: -/* 01748 8092DD18 8FA40018 */ lw $a0, 0x0018($sp) +/* 01748 8092DD18 8FA40018 */ lw $a0, 0x0018($sp) /* 0174C 8092DD1C 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 /* 01750 8092DD20 24A5C5B0 */ addiu $a1, $a1, 0xC5B0 ## $a1 = 0600C5B0 /* 01754 8092DD24 3C06C0A0 */ lui $a2, 0xC0A0 ## $a2 = C0A00000 -/* 01758 8092DD28 0C029490 */ jal func_800A5240 +/* 01758 8092DD28 0C029490 */ jal SkelAnime_ChangeAnimTransitionStop /* 0175C 8092DD2C 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 01760 8092DD30 8FAF0018 */ lw $t7, 0x0018($sp) +/* 01760 8092DD30 8FAF0018 */ lw $t7, 0x0018($sp) .L8092DD34: /* 01764 8092DD34 3C0E8093 */ lui $t6, %hi(func_8092DD50) ## $t6 = 80930000 /* 01768 8092DD38 25CEDD50 */ addiu $t6, $t6, %lo(func_8092DD50) ## $t6 = 8092DD50 /* 0176C 8092DD3C ADEE0190 */ sw $t6, 0x0190($t7) ## 00000190 -/* 01770 8092DD40 8FBF0014 */ lw $ra, 0x0014($sp) +/* 01770 8092DD40 8FBF0014 */ lw $ra, 0x0014($sp) /* 01774 8092DD44 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 01778 8092DD48 03E00008 */ jr $ra +/* 01778 8092DD48 03E00008 */ jr $ra /* 0177C 8092DD4C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092DE48.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092DE48.s index 94c5b44412..02aca61935 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092DE48.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092DE48.s @@ -1,14 +1,14 @@ glabel func_8092DE48 /* 01878 8092DE48 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 0187C 8092DE4C AFBF0014 */ sw $ra, 0x0014($sp) +/* 0187C 8092DE4C AFBF0014 */ sw $ra, 0x0014($sp) /* 01880 8092DE50 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 /* 01884 8092DE54 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 /* 01888 8092DE58 24A5E7B8 */ addiu $a1, $a1, 0xE7B8 ## $a1 = 0600E7B8 -/* 0188C 8092DE5C AFA70018 */ sw $a3, 0x0018($sp) +/* 0188C 8092DE5C AFA70018 */ sw $a3, 0x0018($sp) /* 01890 8092DE60 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 01894 8092DE64 0C0294D3 */ jal func_800A534C +/* 01894 8092DE64 0C0294D3 */ jal SkelAnime_ChangeAnimTransitionRepeat /* 01898 8092DE68 3C06C0A0 */ lui $a2, 0xC0A0 ## $a2 = C0A00000 -/* 0189C 8092DE6C 8FA70018 */ lw $a3, 0x0018($sp) +/* 0189C 8092DE6C 8FA70018 */ lw $a3, 0x0018($sp) /* 018A0 8092DE70 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 /* 018A4 8092DE74 3C188093 */ lui $t8, %hi(func_8092DEA0) ## $t8 = 80930000 /* 018A8 8092DE78 90EE06C5 */ lbu $t6, 0x06C5($a3) ## 000006C5 @@ -17,9 +17,9 @@ glabel func_8092DE48 /* 018B4 8092DE84 35CF0001 */ ori $t7, $t6, 0x0001 ## $t7 = 00000001 /* 018B8 8092DE88 A0EF06C5 */ sb $t7, 0x06C5($a3) ## 000006C5 /* 018BC 8092DE8C E4E40068 */ swc1 $f4, 0x0068($a3) ## 00000068 -/* 018C0 8092DE90 8FBF0014 */ lw $ra, 0x0014($sp) +/* 018C0 8092DE90 8FBF0014 */ lw $ra, 0x0014($sp) /* 018C4 8092DE94 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 018C8 8092DE98 03E00008 */ jr $ra +/* 018C8 8092DE98 03E00008 */ jr $ra /* 018CC 8092DE9C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092DF40.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092DF40.s index df8fc04908..c446cbb198 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092DF40.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092DF40.s @@ -1,34 +1,34 @@ glabel func_8092DF40 /* 01970 8092DF40 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 01974 8092DF44 AFB00028 */ sw $s0, 0x0028($sp) +/* 01974 8092DF44 AFB00028 */ sw $s0, 0x0028($sp) /* 01978 8092DF48 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 0197C 8092DF4C AFBF002C */ sw $ra, 0x002C($sp) +/* 0197C 8092DF4C AFBF002C */ sw $ra, 0x002C($sp) /* 01980 8092DF50 3C040601 */ lui $a0, 0x0601 ## $a0 = 06010000 /* 01984 8092DF54 0C028800 */ jal SkelAnime_GetFrameCount - + /* 01988 8092DF58 2484B0D8 */ addiu $a0, $a0, 0xB0D8 ## $a0 = 0600B0D8 /* 0198C 8092DF5C 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 01990 8092DF60 3C01C0A0 */ lui $at, 0xC0A0 ## $at = C0A00000 /* 01994 8092DF64 44814000 */ mtc1 $at, $f8 ## $f8 = -5.00 -/* 01998 8092DF68 468021A0 */ cvt.s.w $f6, $f4 +/* 01998 8092DF68 468021A0 */ cvt.s.w $f6, $f4 /* 0199C 8092DF6C 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 /* 019A0 8092DF70 240E0003 */ addiu $t6, $zero, 0x0003 ## $t6 = 00000003 -/* 019A4 8092DF74 AFAE0014 */ sw $t6, 0x0014($sp) +/* 019A4 8092DF74 AFAE0014 */ sw $t6, 0x0014($sp) /* 019A8 8092DF78 24A5B0D8 */ addiu $a1, $a1, 0xB0D8 ## $a1 = 0600B0D8 /* 019AC 8092DF7C 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C -/* 019B0 8092DF80 E7A60010 */ swc1 $f6, 0x0010($sp) +/* 019B0 8092DF80 E7A60010 */ swc1 $f6, 0x0010($sp) /* 019B4 8092DF84 3C063F00 */ lui $a2, 0x3F00 ## $a2 = 3F000000 /* 019B8 8092DF88 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 019BC 8092DF8C 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 019C0 8092DF90 E7A80018 */ swc1 $f8, 0x0018($sp) +/* 019BC 8092DF8C 0C029468 */ jal SkelAnime_ChangeAnim + +/* 019C0 8092DF90 E7A80018 */ swc1 $f8, 0x0018($sp) /* 019C4 8092DF94 3C048094 */ lui $a0, %hi(D_80938C98) ## $a0 = 80940000 -/* 019C8 8092DF98 8C848C98 */ lw $a0, %lo(D_80938C98)($a0) -/* 019CC 8092DF9C 0C24CF20 */ jal func_80933C80 +/* 019C8 8092DF98 8C848C98 */ lw $a0, %lo(D_80938C98)($a0) +/* 019CC 8092DF9C 0C24CF20 */ jal func_80933C80 /* 019D0 8092DFA0 24050020 */ addiu $a1, $zero, 0x0020 ## $a1 = 00000020 /* 019D4 8092DFA4 3C048094 */ lui $a0, %hi(D_80938C9C) ## $a0 = 80940000 -/* 019D8 8092DFA8 8C848C9C */ lw $a0, %lo(D_80938C9C)($a0) -/* 019DC 8092DFAC 0C24CF20 */ jal func_80933C80 +/* 019D8 8092DFA8 8C848C9C */ lw $a0, %lo(D_80938C9C)($a0) +/* 019DC 8092DFAC 0C24CF20 */ jal func_80933C80 /* 019E0 8092DFB0 24050020 */ addiu $a1, $zero, 0x0020 ## $a1 = 00000020 /* 019E4 8092DFB4 920F03E4 */ lbu $t7, 0x03E4($s0) ## 000003E4 /* 019E8 8092DFB8 3C014040 */ lui $at, 0x4040 ## $at = 40400000 @@ -37,16 +37,16 @@ glabel func_8092DF40 /* 019F4 8092DFC4 A21803E4 */ sb $t8, 0x03E4($s0) ## 000003E4 /* 019F8 8092DFC8 3C018093 */ lui $at, %hi(D_809379A8) ## $at = 80930000 /* 019FC 8092DFCC E60A0068 */ swc1 $f10, 0x0068($s0) ## 00000068 -/* 01A00 8092DFD0 C43079A8 */ lwc1 $f16, %lo(D_809379A8)($at) +/* 01A00 8092DFD0 C43079A8 */ lwc1 $f16, %lo(D_809379A8)($at) /* 01A04 8092DFD4 3C198093 */ lui $t9, %hi(func_8092DFFC) ## $t9 = 80930000 /* 01A08 8092DFD8 2739DFFC */ addiu $t9, $t9, %lo(func_8092DFFC) ## $t9 = 8092DFFC /* 01A0C 8092DFDC A2000195 */ sb $zero, 0x0195($s0) ## 00000195 /* 01A10 8092DFE0 AE190190 */ sw $t9, 0x0190($s0) ## 00000190 /* 01A14 8092DFE4 E61003C4 */ swc1 $f16, 0x03C4($s0) ## 000003C4 -/* 01A18 8092DFE8 8FBF002C */ lw $ra, 0x002C($sp) -/* 01A1C 8092DFEC 8FB00028 */ lw $s0, 0x0028($sp) +/* 01A18 8092DFE8 8FBF002C */ lw $ra, 0x002C($sp) +/* 01A1C 8092DFEC 8FB00028 */ lw $s0, 0x0028($sp) /* 01A20 8092DFF0 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 01A24 8092DFF4 03E00008 */ jr $ra +/* 01A24 8092DFF4 03E00008 */ jr $ra /* 01A28 8092DFF8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092E25C.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092E25C.s index 449b1ac262..553b166b42 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092E25C.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092E25C.s @@ -1,24 +1,24 @@ glabel func_8092E25C /* 01C8C 8092E25C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 01C90 8092E260 AFBF0014 */ sw $ra, 0x0014($sp) +/* 01C90 8092E260 AFBF0014 */ sw $ra, 0x0014($sp) /* 01C94 8092E264 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 /* 01C98 8092E268 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 /* 01C9C 8092E26C 24A5DC2C */ addiu $a1, $a1, 0xDC2C ## $a1 = 0600DC2C -/* 01CA0 8092E270 AFA70018 */ sw $a3, 0x0018($sp) +/* 01CA0 8092E270 AFA70018 */ sw $a3, 0x0018($sp) /* 01CA4 8092E274 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 01CA8 8092E278 0C0294D3 */ jal func_800A534C +/* 01CA8 8092E278 0C0294D3 */ jal SkelAnime_ChangeAnimTransitionRepeat /* 01CAC 8092E27C 3C06C1A0 */ lui $a2, 0xC1A0 ## $a2 = C1A00000 /* 01CB0 8092E280 3C058093 */ lui $a1, %hi(D_80937340) ## $a1 = 80930000 -/* 01CB4 8092E284 8FA40018 */ lw $a0, 0x0018($sp) -/* 01CB8 8092E288 0C00B6B0 */ jal func_8002DAC0 +/* 01CB4 8092E284 8FA40018 */ lw $a0, 0x0018($sp) +/* 01CB8 8092E288 0C00B6B0 */ jal func_8002DAC0 /* 01CBC 8092E28C 24A57340 */ addiu $a1, $a1, %lo(D_80937340) ## $a1 = 80937340 -/* 01CC0 8092E290 8FA70018 */ lw $a3, 0x0018($sp) +/* 01CC0 8092E290 8FA70018 */ lw $a3, 0x0018($sp) /* 01CC4 8092E294 3C01BF80 */ lui $at, 0xBF80 ## $at = BF800000 /* 01CC8 8092E298 44813000 */ mtc1 $at, $f6 ## $f6 = -1.00 /* 01CCC 8092E29C C4E403C4 */ lwc1 $f4, 0x03C4($a3) ## 000003C4 /* 01CD0 8092E2A0 90EE03E4 */ lbu $t6, 0x03E4($a3) ## 000003E4 /* 01CD4 8092E2A4 90F806C5 */ lbu $t8, 0x06C5($a3) ## 000006C5 -/* 01CD8 8092E2A8 46062202 */ mul.s $f8, $f4, $f6 +/* 01CD8 8092E2A8 46062202 */ mul.s $f8, $f4, $f6 /* 01CDC 8092E2AC 3C088093 */ lui $t0, %hi(func_8092E2E0) ## $t0 = 80930000 /* 01CE0 8092E2B0 2508E2E0 */ addiu $t0, $t0, %lo(func_8092E2E0) ## $t0 = 8092E2E0 /* 01CE4 8092E2B4 31CFFFFC */ andi $t7, $t6, 0xFFFC ## $t7 = 00000000 @@ -28,9 +28,9 @@ glabel func_8092E25C /* 01CF4 8092E2C4 A0F906C5 */ sb $t9, 0x06C5($a3) ## 000006C5 /* 01CF8 8092E2C8 E4E803C4 */ swc1 $f8, 0x03C4($a3) ## 000003C4 /* 01CFC 8092E2CC ACE80190 */ sw $t0, 0x0190($a3) ## 00000190 -/* 01D00 8092E2D0 8FBF0014 */ lw $ra, 0x0014($sp) +/* 01D00 8092E2D0 8FBF0014 */ lw $ra, 0x0014($sp) /* 01D04 8092E2D4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 01D08 8092E2D8 03E00008 */ jr $ra +/* 01D08 8092E2D8 03E00008 */ jr $ra /* 01D0C 8092E2DC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092E34C.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092E34C.s index 32348069c7..62443e7f98 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092E34C.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092E34C.s @@ -1,14 +1,14 @@ glabel func_8092E34C /* 01D7C 8092E34C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 01D80 8092E350 AFBF0014 */ sw $ra, 0x0014($sp) +/* 01D80 8092E350 AFBF0014 */ sw $ra, 0x0014($sp) /* 01D84 8092E354 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 /* 01D88 8092E358 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 /* 01D8C 8092E35C 24A5E7B8 */ addiu $a1, $a1, 0xE7B8 ## $a1 = 0600E7B8 -/* 01D90 8092E360 AFA70018 */ sw $a3, 0x0018($sp) +/* 01D90 8092E360 AFA70018 */ sw $a3, 0x0018($sp) /* 01D94 8092E364 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 01D98 8092E368 0C0294D3 */ jal func_800A534C +/* 01D98 8092E368 0C0294D3 */ jal SkelAnime_ChangeAnimTransitionRepeat /* 01D9C 8092E36C 3C06C0A0 */ lui $a2, 0xC0A0 ## $a2 = C0A00000 -/* 01DA0 8092E370 8FA70018 */ lw $a3, 0x0018($sp) +/* 01DA0 8092E370 8FA70018 */ lw $a3, 0x0018($sp) /* 01DA4 8092E374 3C188093 */ lui $t8, %hi(func_8092E3A0) ## $t8 = 80930000 /* 01DA8 8092E378 2718E3A0 */ addiu $t8, $t8, %lo(func_8092E3A0) ## $t8 = 8092E3A0 /* 01DAC 8092E37C 90EE06C5 */ lbu $t6, 0x06C5($a3) ## 000006C5 @@ -16,9 +16,9 @@ glabel func_8092E34C /* 01DB4 8092E384 ACF80190 */ sw $t8, 0x0190($a3) ## 00000190 /* 01DB8 8092E388 35CF0001 */ ori $t7, $t6, 0x0001 ## $t7 = 00000001 /* 01DBC 8092E38C A0EF06C5 */ sb $t7, 0x06C5($a3) ## 000006C5 -/* 01DC0 8092E390 8FBF0014 */ lw $ra, 0x0014($sp) +/* 01DC0 8092E390 8FBF0014 */ lw $ra, 0x0014($sp) /* 01DC4 8092E394 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 01DC8 8092E398 03E00008 */ jr $ra +/* 01DC8 8092E398 03E00008 */ jr $ra /* 01DCC 8092E39C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092E3E8.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092E3E8.s index 41ce8d54bc..c8cecc8db0 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092E3E8.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092E3E8.s @@ -1,23 +1,23 @@ glabel func_8092E3E8 /* 01E18 8092E3E8 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 01E1C 8092E3EC AFBF0014 */ sw $ra, 0x0014($sp) +/* 01E1C 8092E3EC AFBF0014 */ sw $ra, 0x0014($sp) /* 01E20 8092E3F0 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 /* 01E24 8092E3F4 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 /* 01E28 8092E3F8 24A5C288 */ addiu $a1, $a1, 0xC288 ## $a1 = 0600C288 -/* 01E2C 8092E3FC AFA70018 */ sw $a3, 0x0018($sp) +/* 01E2C 8092E3FC AFA70018 */ sw $a3, 0x0018($sp) /* 01E30 8092E400 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 01E34 8092E404 0C029490 */ jal func_800A5240 +/* 01E34 8092E404 0C029490 */ jal SkelAnime_ChangeAnimTransitionStop /* 01E38 8092E408 3C06C0A0 */ lui $a2, 0xC0A0 ## $a2 = C0A00000 -/* 01E3C 8092E40C 8FA70018 */ lw $a3, 0x0018($sp) +/* 01E3C 8092E40C 8FA70018 */ lw $a3, 0x0018($sp) /* 01E40 8092E410 3C188093 */ lui $t8, %hi(func_8092E438) ## $t8 = 80930000 /* 01E44 8092E414 2718E438 */ addiu $t8, $t8, %lo(func_8092E438) ## $t8 = 8092E438 /* 01E48 8092E418 90EE06C5 */ lbu $t6, 0x06C5($a3) ## 000006C5 /* 01E4C 8092E41C ACF80190 */ sw $t8, 0x0190($a3) ## 00000190 /* 01E50 8092E420 31CFFFFE */ andi $t7, $t6, 0xFFFE ## $t7 = 00000000 /* 01E54 8092E424 A0EF06C5 */ sb $t7, 0x06C5($a3) ## 000006C5 -/* 01E58 8092E428 8FBF0014 */ lw $ra, 0x0014($sp) +/* 01E58 8092E428 8FBF0014 */ lw $ra, 0x0014($sp) /* 01E5C 8092E42C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 01E60 8092E430 03E00008 */ jr $ra +/* 01E60 8092E430 03E00008 */ jr $ra /* 01E64 8092E434 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092E470.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092E470.s index 4c7af98ec0..803bdfb9f4 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092E470.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092E470.s @@ -1,44 +1,44 @@ glabel func_8092E470 /* 01EA0 8092E470 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 01EA4 8092E474 AFB00020 */ sw $s0, 0x0020($sp) +/* 01EA4 8092E474 AFB00020 */ sw $s0, 0x0020($sp) /* 01EA8 8092E478 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 01EAC 8092E47C AFBF0024 */ sw $ra, 0x0024($sp) +/* 01EAC 8092E47C AFBF0024 */ sw $ra, 0x0024($sp) /* 01EB0 8092E480 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 /* 01EB4 8092E484 24A5B6FC */ addiu $a1, $a1, 0xB6FC ## $a1 = 0600B6FC /* 01EB8 8092E488 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 01EBC 8092E48C 0C029490 */ jal func_800A5240 +/* 01EBC 8092E48C 0C029490 */ jal SkelAnime_ChangeAnimTransitionStop /* 01EC0 8092E490 3C06C0A0 */ lui $a2, 0xC0A0 ## $a2 = C0A00000 /* 01EC4 8092E494 3C040601 */ lui $a0, 0x0601 ## $a0 = 06010000 /* 01EC8 8092E498 0C028800 */ jal SkelAnime_GetFrameCount - + /* 01ECC 8092E49C 2484B6FC */ addiu $a0, $a0, 0xB6FC ## $a0 = 0600B6FC /* 01ED0 8092E4A0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 01ED4 8092E4A4 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 01ED8 8092E4A8 240600FF */ addiu $a2, $zero, 0x00FF ## $a2 = 000000FF /* 01EDC 8092E4AC 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 01EE0 8092E4B0 0C00D09B */ jal func_8003426C -/* 01EE4 8092E4B4 AFA20010 */ sw $v0, 0x0010($sp) +/* 01EE0 8092E4B0 0C00D09B */ jal func_8003426C +/* 01EE4 8092E4B4 AFA20010 */ sw $v0, 0x0010($sp) /* 01EE8 8092E4B8 920E03E4 */ lbu $t6, 0x03E4($s0) ## 000003E4 /* 01EEC 8092E4BC 921806C5 */ lbu $t8, 0x06C5($s0) ## 000006C5 /* 01EF0 8092E4C0 8E080004 */ lw $t0, 0x0004($s0) ## 00000004 /* 01EF4 8092E4C4 2401FF7F */ addiu $at, $zero, 0xFF7F ## $at = FFFFFF7F /* 01EF8 8092E4C8 31CFFFFC */ andi $t7, $t6, 0xFFFC ## $t7 = 00000000 /* 01EFC 8092E4CC 3319FFFE */ andi $t9, $t8, 0xFFFE ## $t9 = 00000000 -/* 01F00 8092E4D0 01014824 */ and $t1, $t0, $at +/* 01F00 8092E4D0 01014824 */ and $t1, $t0, $at /* 01F04 8092E4D4 A20F03E4 */ sb $t7, 0x03E4($s0) ## 000003E4 /* 01F08 8092E4D8 A21906C5 */ sb $t9, 0x06C5($s0) ## 000006C5 /* 01F0C 8092E4DC A2000194 */ sb $zero, 0x0194($s0) ## 00000194 /* 01F10 8092E4E0 AE090004 */ sw $t1, 0x0004($s0) ## 00000004 /* 01F14 8092E4E4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01F18 8092E4E8 0C24CF4B */ jal func_80933D2C +/* 01F18 8092E4E8 0C24CF4B */ jal func_80933D2C /* 01F1C 8092E4EC 2405396E */ addiu $a1, $zero, 0x396E ## $a1 = 0000396E /* 01F20 8092E4F0 3C0A8093 */ lui $t2, %hi(func_8092E510) ## $t2 = 80930000 /* 01F24 8092E4F4 254AE510 */ addiu $t2, $t2, %lo(func_8092E510) ## $t2 = 8092E510 /* 01F28 8092E4F8 AE0A0190 */ sw $t2, 0x0190($s0) ## 00000190 -/* 01F2C 8092E4FC 8FBF0024 */ lw $ra, 0x0024($sp) -/* 01F30 8092E500 8FB00020 */ lw $s0, 0x0020($sp) +/* 01F2C 8092E4FC 8FBF0024 */ lw $ra, 0x0024($sp) +/* 01F30 8092E500 8FB00020 */ lw $s0, 0x0020($sp) /* 01F34 8092E504 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 01F38 8092E508 03E00008 */ jr $ra +/* 01F38 8092E508 03E00008 */ jr $ra /* 01F3C 8092E50C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092E790.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092E790.s index 7753217776..a4831ac0f6 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092E790.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092E790.s @@ -1,14 +1,14 @@ glabel func_8092E790 /* 021C0 8092E790 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 021C4 8092E794 AFBF0014 */ sw $ra, 0x0014($sp) +/* 021C4 8092E794 AFBF0014 */ sw $ra, 0x0014($sp) /* 021C8 8092E798 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 /* 021CC 8092E79C 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 /* 021D0 8092E7A0 24A5ACD4 */ addiu $a1, $a1, 0xACD4 ## $a1 = 0600ACD4 -/* 021D4 8092E7A4 AFA70018 */ sw $a3, 0x0018($sp) +/* 021D4 8092E7A4 AFA70018 */ sw $a3, 0x0018($sp) /* 021D8 8092E7A8 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 021DC 8092E7AC 0C0294D3 */ jal func_800A534C +/* 021DC 8092E7AC 0C0294D3 */ jal SkelAnime_ChangeAnimTransitionRepeat /* 021E0 8092E7B0 3C06C0A0 */ lui $a2, 0xC0A0 ## $a2 = C0A00000 -/* 021E4 8092E7B4 8FA70018 */ lw $a3, 0x0018($sp) +/* 021E4 8092E7B4 8FA70018 */ lw $a3, 0x0018($sp) /* 021E8 8092E7B8 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 /* 021EC 8092E7BC 3C180FC0 */ lui $t8, 0x0FC0 ## $t8 = 0FC00000 /* 021F0 8092E7C0 90EE06C5 */ lbu $t6, 0x06C5($a3) ## 000006C5 @@ -31,14 +31,14 @@ glabel func_8092E790 /* 02234 8092E804 312AFFFE */ andi $t2, $t1, 0xFFFE ## $t2 = 00000000 /* 02238 8092E808 A04A0016 */ sb $t2, 0x0016($v0) ## 00000016 /* 0223C 8092E80C 8CEC0190 */ lw $t4, 0x0190($a3) ## 00000190 -/* 02240 8092E810 516C0003 */ beql $t3, $t4, .L8092E820 +/* 02240 8092E810 516C0003 */ beql $t3, $t4, .L8092E820 /* 02244 8092E814 ACEE0190 */ sw $t6, 0x0190($a3) ## 00000190 /* 02248 8092E818 A4ED0198 */ sh $t5, 0x0198($a3) ## 00000198 /* 0224C 8092E81C ACEE0190 */ sw $t6, 0x0190($a3) ## 00000190 .L8092E820: -/* 02250 8092E820 8FBF0014 */ lw $ra, 0x0014($sp) +/* 02250 8092E820 8FBF0014 */ lw $ra, 0x0014($sp) /* 02254 8092E824 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 02258 8092E828 03E00008 */ jr $ra +/* 02258 8092E828 03E00008 */ jr $ra /* 0225C 8092E82C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092E930.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092E930.s index 017bd6cd71..11a719cccf 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092E930.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092E930.s @@ -1,58 +1,58 @@ glabel func_8092E930 /* 02360 8092E930 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 02364 8092E934 AFB00020 */ sw $s0, 0x0020($sp) +/* 02364 8092E934 AFB00020 */ sw $s0, 0x0020($sp) /* 02368 8092E938 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 0236C 8092E93C AFBF0024 */ sw $ra, 0x0024($sp) +/* 0236C 8092E93C AFBF0024 */ sw $ra, 0x0024($sp) /* 02370 8092E940 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 /* 02374 8092E944 24A5CC6C */ addiu $a1, $a1, 0xCC6C ## $a1 = 0600CC6C /* 02378 8092E948 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 0237C 8092E94C 0C029490 */ jal func_800A5240 +/* 0237C 8092E94C 0C029490 */ jal SkelAnime_ChangeAnimTransitionStop /* 02380 8092E950 3C06C040 */ lui $a2, 0xC040 ## $a2 = C0400000 /* 02384 8092E954 3C040601 */ lui $a0, 0x0601 ## $a0 = 06010000 /* 02388 8092E958 0C028800 */ jal SkelAnime_GetFrameCount - + /* 0238C 8092E95C 2484CC6C */ addiu $a0, $a0, 0xCC6C ## $a0 = 0600CC6C /* 02390 8092E960 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 02394 8092E964 24054000 */ addiu $a1, $zero, 0x4000 ## $a1 = 00004000 /* 02398 8092E968 240600FF */ addiu $a2, $zero, 0x00FF ## $a2 = 000000FF /* 0239C 8092E96C 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 023A0 8092E970 0C00D09B */ jal func_8003426C -/* 023A4 8092E974 AFA20010 */ sw $v0, 0x0010($sp) +/* 023A0 8092E970 0C00D09B */ jal func_8003426C +/* 023A4 8092E974 AFA20010 */ sw $v0, 0x0010($sp) /* 023A8 8092E978 3C040601 */ lui $a0, 0x0601 ## $a0 = 06010000 /* 023AC 8092E97C 0C028800 */ jal SkelAnime_GetFrameCount - + /* 023B0 8092E980 2484CC6C */ addiu $a0, $a0, 0xCC6C ## $a0 = 0600CC6C /* 023B4 8092E984 3C048094 */ lui $a0, %hi(D_80938C98) ## $a0 = 80940000 -/* 023B8 8092E988 8C848C98 */ lw $a0, %lo(D_80938C98)($a0) +/* 023B8 8092E988 8C848C98 */ lw $a0, %lo(D_80938C98)($a0) /* 023BC 8092E98C 24054000 */ addiu $a1, $zero, 0x4000 ## $a1 = 00004000 /* 023C0 8092E990 240600FF */ addiu $a2, $zero, 0x00FF ## $a2 = 000000FF /* 023C4 8092E994 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 023C8 8092E998 0C00D09B */ jal func_8003426C -/* 023CC 8092E99C AFA20010 */ sw $v0, 0x0010($sp) +/* 023C8 8092E998 0C00D09B */ jal func_8003426C +/* 023CC 8092E99C AFA20010 */ sw $v0, 0x0010($sp) /* 023D0 8092E9A0 3C040601 */ lui $a0, 0x0601 ## $a0 = 06010000 /* 023D4 8092E9A4 0C028800 */ jal SkelAnime_GetFrameCount - + /* 023D8 8092E9A8 2484CC6C */ addiu $a0, $a0, 0xCC6C ## $a0 = 0600CC6C /* 023DC 8092E9AC 3C048094 */ lui $a0, %hi(D_80938C9C) ## $a0 = 80940000 -/* 023E0 8092E9B0 8C848C9C */ lw $a0, %lo(D_80938C9C)($a0) +/* 023E0 8092E9B0 8C848C9C */ lw $a0, %lo(D_80938C9C)($a0) /* 023E4 8092E9B4 24054000 */ addiu $a1, $zero, 0x4000 ## $a1 = 00004000 /* 023E8 8092E9B8 240600FF */ addiu $a2, $zero, 0x00FF ## $a2 = 000000FF /* 023EC 8092E9BC 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 023F0 8092E9C0 0C00D09B */ jal func_8003426C -/* 023F4 8092E9C4 AFA20010 */ sw $v0, 0x0010($sp) +/* 023F0 8092E9C0 0C00D09B */ jal func_8003426C +/* 023F4 8092E9C4 AFA20010 */ sw $v0, 0x0010($sp) /* 023F8 8092E9C8 920E06C5 */ lbu $t6, 0x06C5($s0) ## 000006C5 /* 023FC 8092E9CC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 02400 8092E9D0 24053969 */ addiu $a1, $zero, 0x3969 ## $a1 = 00003969 /* 02404 8092E9D4 31CFFFFE */ andi $t7, $t6, 0xFFFE ## $t7 = 00000000 -/* 02408 8092E9D8 0C24CF4B */ jal func_80933D2C +/* 02408 8092E9D8 0C24CF4B */ jal func_80933D2C /* 0240C 8092E9DC A20F06C5 */ sb $t7, 0x06C5($s0) ## 000006C5 /* 02410 8092E9E0 3C188093 */ lui $t8, %hi(func_8092EA00) ## $t8 = 80930000 /* 02414 8092E9E4 2718EA00 */ addiu $t8, $t8, %lo(func_8092EA00) ## $t8 = 8092EA00 /* 02418 8092E9E8 AE180190 */ sw $t8, 0x0190($s0) ## 00000190 -/* 0241C 8092E9EC 8FBF0024 */ lw $ra, 0x0024($sp) -/* 02420 8092E9F0 8FB00020 */ lw $s0, 0x0020($sp) +/* 0241C 8092E9EC 8FBF0024 */ lw $ra, 0x0024($sp) +/* 02420 8092E9F0 8FB00020 */ lw $s0, 0x0020($sp) /* 02424 8092E9F4 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 02428 8092E9F8 03E00008 */ jr $ra +/* 02428 8092E9F8 03E00008 */ jr $ra /* 0242C 8092E9FC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092EA50.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092EA50.s index 6053dc75fb..b3886b545a 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092EA50.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092EA50.s @@ -1,14 +1,14 @@ glabel func_8092EA50 /* 02480 8092EA50 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 02484 8092EA54 AFBF0014 */ sw $ra, 0x0014($sp) +/* 02484 8092EA54 AFBF0014 */ sw $ra, 0x0014($sp) /* 02488 8092EA58 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 /* 0248C 8092EA5C 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 /* 02490 8092EA60 24A5D458 */ addiu $a1, $a1, 0xD458 ## $a1 = 0600D458 -/* 02494 8092EA64 AFA70018 */ sw $a3, 0x0018($sp) +/* 02494 8092EA64 AFA70018 */ sw $a3, 0x0018($sp) /* 02498 8092EA68 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 0249C 8092EA6C 0C029490 */ jal func_800A5240 +/* 0249C 8092EA6C 0C029490 */ jal SkelAnime_ChangeAnimTransitionStop /* 024A0 8092EA70 3C06C0A0 */ lui $a2, 0xC0A0 ## $a2 = C0A00000 -/* 024A4 8092EA74 8FA70018 */ lw $a3, 0x0018($sp) +/* 024A4 8092EA74 8FA70018 */ lw $a3, 0x0018($sp) /* 024A8 8092EA78 3C18FFCF */ lui $t8, 0xFFCF ## $t8 = FFCF0000 /* 024AC 8092EA7C 3718FFFF */ ori $t8, $t8, 0xFFFF ## $t8 = FFCFFFFF /* 024B0 8092EA80 90EE06C5 */ lbu $t6, 0x06C5($a3) ## 000006C5 @@ -31,9 +31,9 @@ glabel func_8092EA50 /* 024F4 8092EAC4 A0EB0194 */ sb $t3, 0x0194($a3) ## 00000194 /* 024F8 8092EAC8 ACEC0190 */ sw $t4, 0x0190($a3) ## 00000190 /* 024FC 8092EACC E4E40068 */ swc1 $f4, 0x0068($a3) ## 00000068 -/* 02500 8092EAD0 8FBF0014 */ lw $ra, 0x0014($sp) +/* 02500 8092EAD0 8FBF0014 */ lw $ra, 0x0014($sp) /* 02504 8092EAD4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 02508 8092EAD8 03E00008 */ jr $ra +/* 02508 8092EAD8 03E00008 */ jr $ra /* 0250C 8092EADC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092EF28.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092EF28.s index a1ee4f1917..fcb38d1cb5 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092EF28.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092EF28.s @@ -1,8 +1,8 @@ glabel func_8092EF28 /* 02958 8092EF28 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 0295C 8092EF2C AFBF0024 */ sw $ra, 0x0024($sp) -/* 02960 8092EF30 AFB10020 */ sw $s1, 0x0020($sp) -/* 02964 8092EF34 AFB0001C */ sw $s0, 0x001C($sp) +/* 0295C 8092EF2C AFBF0024 */ sw $ra, 0x0024($sp) +/* 02960 8092EF30 AFB10020 */ sw $s1, 0x0020($sp) +/* 02964 8092EF34 AFB0001C */ sw $s0, 0x001C($sp) /* 02968 8092EF38 8CAE1C44 */ lw $t6, 0x1C44($a1) ## 00001C44 /* 0296C 8092EF3C 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 /* 02970 8092EF40 00808825 */ or $s1, $a0, $zero ## $s1 = 00000000 @@ -10,33 +10,33 @@ glabel func_8092EF28 /* 02978 8092EF48 24A5E7B8 */ addiu $a1, $a1, 0xE7B8 ## $a1 = 0600E7B8 /* 0297C 8092EF4C 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C /* 02980 8092EF50 3C06C0A0 */ lui $a2, 0xC0A0 ## $a2 = C0A00000 -/* 02984 8092EF54 0C0294D3 */ jal func_800A534C -/* 02988 8092EF58 AFAE002C */ sw $t6, 0x002C($sp) +/* 02984 8092EF54 0C0294D3 */ jal SkelAnime_ChangeAnimTransitionRepeat +/* 02988 8092EF58 AFAE002C */ sw $t6, 0x002C($sp) /* 0298C 8092EF5C 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 02990 8092EF60 0C24CF4B */ jal func_80933D2C +/* 02990 8092EF60 0C24CF4B */ jal func_80933D2C /* 02994 8092EF64 2405396F */ addiu $a1, $zero, 0x396F ## $a1 = 0000396F /* 02998 8092EF68 240F003C */ addiu $t7, $zero, 0x003C ## $t7 = 0000003C -/* 0299C 8092EF6C AFAF0010 */ sw $t7, 0x0010($sp) +/* 0299C 8092EF6C AFAF0010 */ sw $t7, 0x0010($sp) /* 029A0 8092EF70 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 029A4 8092EF74 24054000 */ addiu $a1, $zero, 0x4000 ## $a1 = 00004000 /* 029A8 8092EF78 240600FF */ addiu $a2, $zero, 0x00FF ## $a2 = 000000FF -/* 029AC 8092EF7C 0C00D09B */ jal func_8003426C +/* 029AC 8092EF7C 0C00D09B */ jal func_8003426C /* 029B0 8092EF80 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 /* 029B4 8092EF84 3C048094 */ lui $a0, %hi(D_80938C98) ## $a0 = 80940000 /* 029B8 8092EF88 2418003C */ addiu $t8, $zero, 0x003C ## $t8 = 0000003C -/* 029BC 8092EF8C AFB80010 */ sw $t8, 0x0010($sp) -/* 029C0 8092EF90 8C848C98 */ lw $a0, %lo(D_80938C98)($a0) +/* 029BC 8092EF8C AFB80010 */ sw $t8, 0x0010($sp) +/* 029C0 8092EF90 8C848C98 */ lw $a0, %lo(D_80938C98)($a0) /* 029C4 8092EF94 24054000 */ addiu $a1, $zero, 0x4000 ## $a1 = 00004000 /* 029C8 8092EF98 240600FF */ addiu $a2, $zero, 0x00FF ## $a2 = 000000FF -/* 029CC 8092EF9C 0C00D09B */ jal func_8003426C +/* 029CC 8092EF9C 0C00D09B */ jal func_8003426C /* 029D0 8092EFA0 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 /* 029D4 8092EFA4 3C048094 */ lui $a0, %hi(D_80938C9C) ## $a0 = 80940000 /* 029D8 8092EFA8 2419003C */ addiu $t9, $zero, 0x003C ## $t9 = 0000003C -/* 029DC 8092EFAC AFB90010 */ sw $t9, 0x0010($sp) -/* 029E0 8092EFB0 8C848C9C */ lw $a0, %lo(D_80938C9C)($a0) +/* 029DC 8092EFAC AFB90010 */ sw $t9, 0x0010($sp) +/* 029E0 8092EFB0 8C848C9C */ lw $a0, %lo(D_80938C9C)($a0) /* 029E4 8092EFB4 24054000 */ addiu $a1, $zero, 0x4000 ## $a1 = 00004000 /* 029E8 8092EFB8 240600FF */ addiu $a2, $zero, 0x00FF ## $a2 = 000000FF -/* 029EC 8092EFBC 0C00D09B */ jal func_8003426C +/* 029EC 8092EFBC 0C00D09B */ jal func_8003426C /* 029F0 8092EFC0 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 /* 029F4 8092EFC4 922906C5 */ lbu $t1, 0x06C5($s1) ## 000006C5 /* 029F8 8092EFC8 922B03E6 */ lbu $t3, 0x03E6($s1) ## 000003E6 @@ -58,38 +58,38 @@ glabel func_8092EF28 /* 02A38 8092F008 906F03E6 */ lbu $t7, 0x03E6($v1) ## 000003E6 /* 02A3C 8092F00C 31F8FFFE */ andi $t8, $t7, 0xFFFE ## $t8 = 00000000 /* 02A40 8092F010 0C03E803 */ jal Audio_SetBGM - + /* 02A44 8092F014 A07803E6 */ sb $t8, 0x03E6($v1) ## 000003E6 -/* 02A48 8092F018 0C03008C */ jal func_800C0230 +/* 02A48 8092F018 0C03008C */ jal func_800C0230 /* 02A4C 8092F01C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 02A50 8092F020 3C018094 */ lui $at, %hi(D_80938CC4) ## $at = 80940000 -/* 02A54 8092F024 A4228CC4 */ sh $v0, %lo(D_80938CC4)($at) +/* 02A54 8092F024 A4228CC4 */ sh $v0, %lo(D_80938CC4)($at) /* 02A58 8092F028 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 02A5C 8092F02C 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 02A60 8092F030 0C0300C5 */ jal func_800C0314 +/* 02A60 8092F030 0C0300C5 */ jal func_800C0314 /* 02A64 8092F034 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 /* 02A68 8092F038 3C058094 */ lui $a1, %hi(D_80938CC4) ## $a1 = 80940000 -/* 02A6C 8092F03C 84A58CC4 */ lh $a1, %lo(D_80938CC4)($a1) +/* 02A6C 8092F03C 84A58CC4 */ lh $a1, %lo(D_80938CC4)($a1) /* 02A70 8092F040 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02A74 8092F044 0C0300C5 */ jal func_800C0314 +/* 02A74 8092F044 0C0300C5 */ jal func_800C0314 /* 02A78 8092F048 24060007 */ addiu $a2, $zero, 0x0007 ## $a2 = 00000007 /* 02A7C 8092F04C 3C058094 */ lui $a1, %hi(D_80938CC4) ## $a1 = 80940000 -/* 02A80 8092F050 84A58CC4 */ lh $a1, %lo(D_80938CC4)($a1) +/* 02A80 8092F050 84A58CC4 */ lh $a1, %lo(D_80938CC4)($a1) /* 02A84 8092F054 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02A88 8092F058 0C0301E3 */ jal func_800C078C +/* 02A88 8092F058 0C0301E3 */ jal func_800C078C /* 02A8C 8092F05C 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 /* 02A90 8092F060 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02A94 8092F064 8FA5002C */ lw $a1, 0x002C($sp) -/* 02A98 8092F068 0C00B7D5 */ jal func_8002DF54 +/* 02A94 8092F064 8FA5002C */ lw $a1, 0x002C($sp) +/* 02A98 8092F068 0C00B7D5 */ jal func_8002DF54 /* 02A9C 8092F06C 24060008 */ addiu $a2, $zero, 0x0008 ## $a2 = 00000008 /* 02AA0 8092F070 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02AA4 8092F074 0C019148 */ jal func_80064520 +/* 02AA4 8092F074 0C019148 */ jal func_80064520 /* 02AA8 8092F078 26051D64 */ addiu $a1, $s0, 0x1D64 ## $a1 = 00001D64 /* 02AAC 8092F07C 861907A0 */ lh $t9, 0x07A0($s0) ## 000007A0 /* 02AB0 8092F080 3C048093 */ lui $a0, %hi(D_80937358) ## $a0 = 80930000 /* 02AB4 8092F084 24847358 */ addiu $a0, $a0, %lo(D_80937358) ## $a0 = 80937358 -/* 02AB8 8092F088 00194080 */ sll $t0, $t9, 2 -/* 02ABC 8092F08C 02084821 */ addu $t1, $s0, $t0 +/* 02AB8 8092F088 00194080 */ sll $t0, $t9, 2 +/* 02ABC 8092F08C 02084821 */ addu $t1, $s0, $t0 /* 02AC0 8092F090 8D250790 */ lw $a1, 0x0790($t1) ## 00000790 /* 02AC4 8092F094 0C01DF90 */ jal Math_Vec3f_Copy ## Vec3f_Copy @@ -97,10 +97,10 @@ glabel func_8092EF28 /* 02ACC 8092F09C 3C0A8093 */ lui $t2, %hi(func_8092F0BC) ## $t2 = 80930000 /* 02AD0 8092F0A0 254AF0BC */ addiu $t2, $t2, %lo(func_8092F0BC) ## $t2 = 8092F0BC /* 02AD4 8092F0A4 AE2A0190 */ sw $t2, 0x0190($s1) ## 00000190 -/* 02AD8 8092F0A8 8FBF0024 */ lw $ra, 0x0024($sp) -/* 02ADC 8092F0AC 8FB10020 */ lw $s1, 0x0020($sp) -/* 02AE0 8092F0B0 8FB0001C */ lw $s0, 0x001C($sp) -/* 02AE4 8092F0B4 03E00008 */ jr $ra +/* 02AD8 8092F0A8 8FBF0024 */ lw $ra, 0x0024($sp) +/* 02ADC 8092F0AC 8FB10020 */ lw $s1, 0x0020($sp) +/* 02AE0 8092F0B0 8FB0001C */ lw $s0, 0x001C($sp) +/* 02AE4 8092F0B4 03E00008 */ jr $ra /* 02AE8 8092F0B8 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092F30C.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092F30C.s index 4f5bc5ebfb..186b344d9b 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092F30C.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092F30C.s @@ -1,29 +1,29 @@ glabel func_8092F30C /* 02D3C 8092F30C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 02D40 8092F310 AFBF0014 */ sw $ra, 0x0014($sp) +/* 02D40 8092F310 AFBF0014 */ sw $ra, 0x0014($sp) /* 02D44 8092F314 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 /* 02D48 8092F318 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 /* 02D4C 8092F31C 24A5E7B8 */ addiu $a1, $a1, 0xE7B8 ## $a1 = 0600E7B8 -/* 02D50 8092F320 AFA70018 */ sw $a3, 0x0018($sp) +/* 02D50 8092F320 AFA70018 */ sw $a3, 0x0018($sp) /* 02D54 8092F324 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 02D58 8092F328 0C029490 */ jal func_800A5240 +/* 02D58 8092F328 0C029490 */ jal SkelAnime_ChangeAnimTransitionStop /* 02D5C 8092F32C 3C06C0A0 */ lui $a2, 0xC0A0 ## $a2 = C0A00000 -/* 02D60 8092F330 8FA70018 */ lw $a3, 0x0018($sp) +/* 02D60 8092F330 8FA70018 */ lw $a3, 0x0018($sp) /* 02D64 8092F334 240E00A0 */ addiu $t6, $zero, 0x00A0 ## $t6 = 000000A0 /* 02D68 8092F338 3C018093 */ lui $at, %hi(D_809379C8) ## $at = 80930000 /* 02D6C 8092F33C 84EF00B6 */ lh $t7, 0x00B6($a3) ## 000000B6 /* 02D70 8092F340 A4EE0198 */ sh $t6, 0x0198($a3) ## 00000198 /* 02D74 8092F344 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 /* 02D78 8092F348 A4EF01A4 */ sh $t7, 0x01A4($a3) ## 000001A4 -/* 02D7C 8092F34C 0C24BB1D */ jal func_8092EC74 -/* 02D80 8092F350 C42C79C8 */ lwc1 $f12, %lo(D_809379C8)($at) -/* 02D84 8092F354 8FA70018 */ lw $a3, 0x0018($sp) +/* 02D7C 8092F34C 0C24BB1D */ jal func_8092EC74 +/* 02D80 8092F350 C42C79C8 */ lwc1 $f12, %lo(D_809379C8)($at) +/* 02D84 8092F354 8FA70018 */ lw $a3, 0x0018($sp) /* 02D88 8092F358 3C188093 */ lui $t8, %hi(func_8092F374) ## $t8 = 80930000 /* 02D8C 8092F35C 2718F374 */ addiu $t8, $t8, %lo(func_8092F374) ## $t8 = 8092F374 /* 02D90 8092F360 ACF80190 */ sw $t8, 0x0190($a3) ## 00000190 -/* 02D94 8092F364 8FBF0014 */ lw $ra, 0x0014($sp) +/* 02D94 8092F364 8FBF0014 */ lw $ra, 0x0014($sp) /* 02D98 8092F368 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 02D9C 8092F36C 03E00008 */ jr $ra +/* 02D9C 8092F36C 03E00008 */ jr $ra /* 02DA0 8092F370 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092FBE4.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092FBE4.s index 6b8e7d9243..9ec3dca08e 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092FBE4.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092FBE4.s @@ -1,34 +1,34 @@ glabel func_8092FBE4 /* 03614 8092FBE4 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 03618 8092FBE8 AFBF0014 */ sw $ra, 0x0014($sp) +/* 03618 8092FBE8 AFBF0014 */ sw $ra, 0x0014($sp) /* 0361C 8092FBEC 848E001C */ lh $t6, 0x001C($a0) ## 0000001C /* 03620 8092FBF0 3C018093 */ lui $at, %hi(D_8093746C) ## $at = 80930000 /* 03624 8092FBF4 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 -/* 03628 8092FBF8 000E7880 */ sll $t7, $t6, 2 -/* 0362C 8092FBFC 002F0821 */ addu $at, $at, $t7 -/* 03630 8092FC00 AC20746C */ sw $zero, %lo(D_8093746C)($at) +/* 03628 8092FBF8 000E7880 */ sll $t7, $t6, 2 +/* 0362C 8092FBFC 002F0821 */ addu $at, $at, $t7 +/* 03630 8092FC00 AC20746C */ sw $zero, %lo(D_8093746C)($at) /* 03634 8092FC04 909803E4 */ lbu $t8, 0x03E4($a0) ## 000003E4 /* 03638 8092FC08 3C058093 */ lui $a1, %hi(D_8093784C) ## $a1 = 80930000 /* 0363C 8092FC0C 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C /* 03640 8092FC10 3319FFFC */ andi $t9, $t8, 0xFFFC ## $t9 = 00000000 /* 03644 8092FC14 A0990298 */ sb $t9, 0x0298($a0) ## 000003E4 /* 03648 8092FC18 84E8001C */ lh $t0, 0x001C($a3) ## 0000001C -/* 0364C 8092FC1C AFA70018 */ sw $a3, 0x0018($sp) +/* 0364C 8092FC1C AFA70018 */ sw $a3, 0x0018($sp) /* 03650 8092FC20 3C0640A0 */ lui $a2, 0x40A0 ## $a2 = 40A00000 -/* 03654 8092FC24 00084880 */ sll $t1, $t0, 2 -/* 03658 8092FC28 00A92821 */ addu $a1, $a1, $t1 -/* 0365C 8092FC2C 0C0294D3 */ jal func_800A534C -/* 03660 8092FC30 8CA5784C */ lw $a1, %lo(D_8093784C)($a1) -/* 03664 8092FC34 8FA70018 */ lw $a3, 0x0018($sp) +/* 03654 8092FC24 00084880 */ sll $t1, $t0, 2 +/* 03658 8092FC28 00A92821 */ addu $a1, $a1, $t1 +/* 0365C 8092FC2C 0C0294D3 */ jal SkelAnime_ChangeAnimTransitionRepeat +/* 03660 8092FC30 8CA5784C */ lw $a1, %lo(D_8093784C)($a1) +/* 03664 8092FC34 8FA70018 */ lw $a3, 0x0018($sp) /* 03668 8092FC38 3C0B8093 */ lui $t3, %hi(func_8092FC60) ## $t3 = 80930000 /* 0366C 8092FC3C 240A0014 */ addiu $t2, $zero, 0x0014 ## $t2 = 00000014 /* 03670 8092FC40 256BFC60 */ addiu $t3, $t3, %lo(func_8092FC60) ## $t3 = 8092FC60 /* 03674 8092FC44 A0E00195 */ sb $zero, 0x0195($a3) ## 00000195 /* 03678 8092FC48 A4EA0198 */ sh $t2, 0x0198($a3) ## 00000198 /* 0367C 8092FC4C ACEB0190 */ sw $t3, 0x0190($a3) ## 00000190 -/* 03680 8092FC50 8FBF0014 */ lw $ra, 0x0014($sp) +/* 03680 8092FC50 8FBF0014 */ lw $ra, 0x0014($sp) /* 03684 8092FC54 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 03688 8092FC58 03E00008 */ jr $ra +/* 03688 8092FC58 03E00008 */ jr $ra /* 0368C 8092FC5C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092FDD0.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092FDD0.s index 4e969cbeb5..9ae0ae8efe 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092FDD0.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092FDD0.s @@ -1,32 +1,32 @@ glabel func_8092FDD0 /* 03800 8092FDD0 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 03804 8092FDD4 AFBF0014 */ sw $ra, 0x0014($sp) +/* 03804 8092FDD4 AFBF0014 */ sw $ra, 0x0014($sp) /* 03808 8092FDD8 848F001C */ lh $t7, 0x001C($a0) ## 0000001C /* 0380C 8092FDDC 3C018093 */ lui $at, %hi(D_8093746C) ## $at = 80930000 /* 03810 8092FDE0 240E0001 */ addiu $t6, $zero, 0x0001 ## $t6 = 00000001 -/* 03814 8092FDE4 000FC080 */ sll $t8, $t7, 2 -/* 03818 8092FDE8 00380821 */ addu $at, $at, $t8 +/* 03814 8092FDE4 000FC080 */ sll $t8, $t7, 2 +/* 03818 8092FDE8 00380821 */ addu $at, $at, $t8 /* 0381C 8092FDEC 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 -/* 03820 8092FDF0 AC2E746C */ sw $t6, %lo(D_8093746C)($at) +/* 03820 8092FDF0 AC2E746C */ sw $t6, %lo(D_8093746C)($at) /* 03824 8092FDF4 84F9001C */ lh $t9, 0x001C($a3) ## 0000001C /* 03828 8092FDF8 3C058093 */ lui $a1, %hi(D_8093785C) ## $a1 = 80930000 -/* 0382C 8092FDFC AFA70018 */ sw $a3, 0x0018($sp) -/* 03830 8092FE00 00194080 */ sll $t0, $t9, 2 -/* 03834 8092FE04 00A82821 */ addu $a1, $a1, $t0 -/* 03838 8092FE08 8CA5785C */ lw $a1, %lo(D_8093785C)($a1) +/* 0382C 8092FDFC AFA70018 */ sw $a3, 0x0018($sp) +/* 03830 8092FE00 00194080 */ sll $t0, $t9, 2 +/* 03834 8092FE04 00A82821 */ addu $a1, $a1, $t0 +/* 03838 8092FE08 8CA5785C */ lw $a1, %lo(D_8093785C)($a1) /* 0383C 8092FE0C 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 03840 8092FE10 0C029490 */ jal func_800A5240 +/* 03840 8092FE10 0C029490 */ jal SkelAnime_ChangeAnimTransitionStop /* 03844 8092FE14 3C0640A0 */ lui $a2, 0x40A0 ## $a2 = 40A00000 -/* 03848 8092FE18 8FA70018 */ lw $a3, 0x0018($sp) +/* 03848 8092FE18 8FA70018 */ lw $a3, 0x0018($sp) /* 0384C 8092FE1C 3C0A8093 */ lui $t2, %hi(func_8092FE44) ## $t2 = 80930000 /* 03850 8092FE20 2409000C */ addiu $t1, $zero, 0x000C ## $t1 = 0000000C /* 03854 8092FE24 254AFE44 */ addiu $t2, $t2, %lo(func_8092FE44) ## $t2 = 8092FE44 /* 03858 8092FE28 A4E000B4 */ sh $zero, 0x00B4($a3) ## 000000B4 /* 0385C 8092FE2C A4E90198 */ sh $t1, 0x0198($a3) ## 00000198 /* 03860 8092FE30 ACEA0190 */ sw $t2, 0x0190($a3) ## 00000190 -/* 03864 8092FE34 8FBF0014 */ lw $ra, 0x0014($sp) +/* 03864 8092FE34 8FBF0014 */ lw $ra, 0x0014($sp) /* 03868 8092FE38 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 0386C 8092FE3C 03E00008 */ jr $ra +/* 0386C 8092FE3C 03E00008 */ jr $ra /* 03870 8092FE40 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092FF94.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092FF94.s index cb4cc67eac..e8e0d13c54 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092FF94.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8092FF94.s @@ -1,26 +1,26 @@ glabel func_8092FF94 /* 039C4 8092FF94 3C0F8094 */ lui $t7, %hi(D_80938CA0) ## $t7 = 80940000 -/* 039C8 8092FF98 8DEF8CA0 */ lw $t7, %lo(D_80938CA0)($t7) +/* 039C8 8092FF98 8DEF8CA0 */ lw $t7, %lo(D_80938CA0)($t7) /* 039CC 8092FF9C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 039D0 8092FFA0 AFBF0014 */ sw $ra, 0x0014($sp) +/* 039D0 8092FFA0 AFBF0014 */ sw $ra, 0x0014($sp) /* 039D4 8092FFA4 240E0001 */ addiu $t6, $zero, 0x0001 ## $t6 = 00000001 /* 039D8 8092FFA8 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 /* 039DC 8092FFAC A5EE001C */ sh $t6, 0x001C($t7) ## 8094001C /* 039E0 8092FFB0 84D8001C */ lh $t8, 0x001C($a2) ## 0000001C /* 039E4 8092FFB4 3C058093 */ lui $a1, %hi(D_80937854) ## $a1 = 80930000 -/* 039E8 8092FFB8 AFA60018 */ sw $a2, 0x0018($sp) -/* 039EC 8092FFBC 0018C880 */ sll $t9, $t8, 2 -/* 039F0 8092FFC0 00B92821 */ addu $a1, $a1, $t9 -/* 039F4 8092FFC4 8CA57854 */ lw $a1, %lo(D_80937854)($a1) -/* 039F8 8092FFC8 0C02947A */ jal func_800A51E8 +/* 039E8 8092FFB8 AFA60018 */ sw $a2, 0x0018($sp) +/* 039EC 8092FFBC 0018C880 */ sll $t9, $t8, 2 +/* 039F0 8092FFC0 00B92821 */ addu $a1, $a1, $t9 +/* 039F4 8092FFC4 8CA57854 */ lw $a1, %lo(D_80937854)($a1) +/* 039F8 8092FFC8 0C02947A */ jal SkelAnime_ChangeAnimDefaultStop /* 039FC 8092FFCC 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 03A00 8092FFD0 8FA60018 */ lw $a2, 0x0018($sp) +/* 03A00 8092FFD0 8FA60018 */ lw $a2, 0x0018($sp) /* 03A04 8092FFD4 3C088093 */ lui $t0, %hi(func_8092FFF0) ## $t0 = 80930000 /* 03A08 8092FFD8 2508FFF0 */ addiu $t0, $t0, %lo(func_8092FFF0) ## $t0 = 8092FFF0 /* 03A0C 8092FFDC ACC80190 */ sw $t0, 0x0190($a2) ## 00000190 -/* 03A10 8092FFE0 8FBF0014 */ lw $ra, 0x0014($sp) +/* 03A10 8092FFE0 8FBF0014 */ lw $ra, 0x0014($sp) /* 03A14 8092FFE4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 03A18 8092FFE8 03E00008 */ jr $ra +/* 03A18 8092FFE8 03E00008 */ jr $ra /* 03A1C 8092FFEC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_809300E4.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_809300E4.s index 78c8a50c85..7ef9ea796d 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_809300E4.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_809300E4.s @@ -1,32 +1,32 @@ glabel func_809300E4 /* 03B14 809300E4 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 03B18 809300E8 AFBF0014 */ sw $ra, 0x0014($sp) +/* 03B18 809300E8 AFBF0014 */ sw $ra, 0x0014($sp) /* 03B1C 809300EC 848F001C */ lh $t7, 0x001C($a0) ## 0000001C /* 03B20 809300F0 3C018093 */ lui $at, %hi(D_8093746C) ## $at = 80930000 /* 03B24 809300F4 240E0001 */ addiu $t6, $zero, 0x0001 ## $t6 = 00000001 -/* 03B28 809300F8 000FC080 */ sll $t8, $t7, 2 -/* 03B2C 809300FC 00380821 */ addu $at, $at, $t8 +/* 03B28 809300F8 000FC080 */ sll $t8, $t7, 2 +/* 03B2C 809300FC 00380821 */ addu $at, $at, $t8 /* 03B30 80930100 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 -/* 03B34 80930104 AC2E746C */ sw $t6, %lo(D_8093746C)($at) +/* 03B34 80930104 AC2E746C */ sw $t6, %lo(D_8093746C)($at) /* 03B38 80930108 84F9001C */ lh $t9, 0x001C($a3) ## 0000001C /* 03B3C 8093010C 3C058093 */ lui $a1, %hi(D_8093785C) ## $a1 = 80930000 -/* 03B40 80930110 AFA70018 */ sw $a3, 0x0018($sp) -/* 03B44 80930114 00194080 */ sll $t0, $t9, 2 -/* 03B48 80930118 00A82821 */ addu $a1, $a1, $t0 -/* 03B4C 8093011C 8CA5785C */ lw $a1, %lo(D_8093785C)($a1) +/* 03B40 80930110 AFA70018 */ sw $a3, 0x0018($sp) +/* 03B44 80930114 00194080 */ sll $t0, $t9, 2 +/* 03B48 80930118 00A82821 */ addu $a1, $a1, $t0 +/* 03B4C 8093011C 8CA5785C */ lw $a1, %lo(D_8093785C)($a1) /* 03B50 80930120 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 03B54 80930124 0C029490 */ jal func_800A5240 +/* 03B54 80930124 0C029490 */ jal SkelAnime_ChangeAnimTransitionStop /* 03B58 80930128 3C0640A0 */ lui $a2, 0x40A0 ## $a2 = 40A00000 -/* 03B5C 8093012C 8FA70018 */ lw $a3, 0x0018($sp) +/* 03B5C 8093012C 8FA70018 */ lw $a3, 0x0018($sp) /* 03B60 80930130 3C0A8093 */ lui $t2, %hi(func_80930158) ## $t2 = 80930000 /* 03B64 80930134 24090005 */ addiu $t1, $zero, 0x0005 ## $t1 = 00000005 /* 03B68 80930138 254A0158 */ addiu $t2, $t2, %lo(func_80930158) ## $t2 = 80930158 /* 03B6C 8093013C A4E000B4 */ sh $zero, 0x00B4($a3) ## 000000B4 /* 03B70 80930140 A4E90198 */ sh $t1, 0x0198($a3) ## 00000198 /* 03B74 80930144 ACEA0190 */ sw $t2, 0x0190($a3) ## 00000190 -/* 03B78 80930148 8FBF0014 */ lw $ra, 0x0014($sp) +/* 03B78 80930148 8FBF0014 */ lw $ra, 0x0014($sp) /* 03B7C 8093014C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 03B80 80930150 03E00008 */ jr $ra +/* 03B80 80930150 03E00008 */ jr $ra /* 03B84 80930154 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80930238.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80930238.s index dcfb1d0dd7..49fe50d09f 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80930238.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80930238.s @@ -1,22 +1,22 @@ glabel func_80930238 /* 03C68 80930238 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 03C6C 8093023C AFBF0014 */ sw $ra, 0x0014($sp) +/* 03C6C 8093023C AFBF0014 */ sw $ra, 0x0014($sp) /* 03C70 80930240 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 /* 03C74 80930244 84CE001C */ lh $t6, 0x001C($a2) ## 0000001C /* 03C78 80930248 3C058093 */ lui $a1, %hi(D_80937854) ## $a1 = 80930000 -/* 03C7C 8093024C AFA60018 */ sw $a2, 0x0018($sp) -/* 03C80 80930250 000E7880 */ sll $t7, $t6, 2 -/* 03C84 80930254 00AF2821 */ addu $a1, $a1, $t7 -/* 03C88 80930258 8CA57854 */ lw $a1, %lo(D_80937854)($a1) -/* 03C8C 8093025C 0C02947A */ jal func_800A51E8 +/* 03C7C 8093024C AFA60018 */ sw $a2, 0x0018($sp) +/* 03C80 80930250 000E7880 */ sll $t7, $t6, 2 +/* 03C84 80930254 00AF2821 */ addu $a1, $a1, $t7 +/* 03C88 80930258 8CA57854 */ lw $a1, %lo(D_80937854)($a1) +/* 03C8C 8093025C 0C02947A */ jal SkelAnime_ChangeAnimDefaultStop /* 03C90 80930260 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 03C94 80930264 8FA60018 */ lw $a2, 0x0018($sp) +/* 03C94 80930264 8FA60018 */ lw $a2, 0x0018($sp) /* 03C98 80930268 3C188093 */ lui $t8, %hi(func_80930284) ## $t8 = 80930000 /* 03C9C 8093026C 27180284 */ addiu $t8, $t8, %lo(func_80930284) ## $t8 = 80930284 /* 03CA0 80930270 ACD80190 */ sw $t8, 0x0190($a2) ## 00000190 -/* 03CA4 80930274 8FBF0014 */ lw $ra, 0x0014($sp) +/* 03CA4 80930274 8FBF0014 */ lw $ra, 0x0014($sp) /* 03CA8 80930278 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 03CAC 8093027C 03E00008 */ jr $ra +/* 03CAC 8093027C 03E00008 */ jr $ra /* 03CB0 80930280 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_809303C8.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_809303C8.s index 4626cb4e93..fd9c50e84c 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_809303C8.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_809303C8.s @@ -1,32 +1,32 @@ glabel func_809303C8 /* 03DF8 809303C8 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 03DFC 809303CC AFBF0014 */ sw $ra, 0x0014($sp) +/* 03DFC 809303CC AFBF0014 */ sw $ra, 0x0014($sp) /* 03E00 809303D0 848F001C */ lh $t7, 0x001C($a0) ## 0000001C /* 03E04 809303D4 3C018093 */ lui $at, %hi(D_8093746C) ## $at = 80930000 /* 03E08 809303D8 240E0002 */ addiu $t6, $zero, 0x0002 ## $t6 = 00000002 -/* 03E0C 809303DC 000FC080 */ sll $t8, $t7, 2 -/* 03E10 809303E0 00380821 */ addu $at, $at, $t8 -/* 03E14 809303E4 AC2E746C */ sw $t6, %lo(D_8093746C)($at) +/* 03E0C 809303DC 000FC080 */ sll $t8, $t7, 2 +/* 03E10 809303E0 00380821 */ addu $at, $at, $t8 +/* 03E14 809303E4 AC2E746C */ sw $t6, %lo(D_8093746C)($at) /* 03E18 809303E8 909903E4 */ lbu $t9, 0x03E4($a0) ## 000003E4 /* 03E1C 809303EC 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 /* 03E20 809303F0 3C058093 */ lui $a1, %hi(D_8093787C) ## $a1 = 80930000 /* 03E24 809303F4 3328FFFC */ andi $t0, $t9, 0xFFFC ## $t0 = 00000000 /* 03E28 809303F8 A08803E4 */ sb $t0, 0x03E4($a0) ## 000003E4 /* 03E2C 809303FC 84E9001C */ lh $t1, 0x001C($a3) ## 0000001C -/* 03E30 80930400 AFA70018 */ sw $a3, 0x0018($sp) +/* 03E30 80930400 AFA70018 */ sw $a3, 0x0018($sp) /* 03E34 80930404 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 03E38 80930408 00095080 */ sll $t2, $t1, 2 -/* 03E3C 8093040C 00AA2821 */ addu $a1, $a1, $t2 -/* 03E40 80930410 8CA5787C */ lw $a1, %lo(D_8093787C)($a1) -/* 03E44 80930414 0C029490 */ jal func_800A5240 +/* 03E38 80930408 00095080 */ sll $t2, $t1, 2 +/* 03E3C 8093040C 00AA2821 */ addu $a1, $a1, $t2 +/* 03E40 80930410 8CA5787C */ lw $a1, %lo(D_8093787C)($a1) +/* 03E44 80930414 0C029490 */ jal SkelAnime_ChangeAnimTransitionStop /* 03E48 80930418 3C0640C0 */ lui $a2, 0x40C0 ## $a2 = 40C00000 -/* 03E4C 8093041C 8FA70018 */ lw $a3, 0x0018($sp) +/* 03E4C 8093041C 8FA70018 */ lw $a3, 0x0018($sp) /* 03E50 80930420 3C0B8093 */ lui $t3, %hi(func_8093043C) ## $t3 = 80930000 /* 03E54 80930424 256B043C */ addiu $t3, $t3, %lo(func_8093043C) ## $t3 = 8093043C /* 03E58 80930428 ACEB0190 */ sw $t3, 0x0190($a3) ## 00000190 -/* 03E5C 8093042C 8FBF0014 */ lw $ra, 0x0014($sp) +/* 03E5C 8093042C 8FBF0014 */ lw $ra, 0x0014($sp) /* 03E60 80930430 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 03E64 80930434 03E00008 */ jr $ra +/* 03E64 80930434 03E00008 */ jr $ra /* 03E68 80930438 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80930474.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80930474.s index 85129e0869..b527c5957f 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80930474.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80930474.s @@ -1,23 +1,23 @@ glabel func_80930474 /* 03EA4 80930474 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 03EA8 80930478 AFBF0014 */ sw $ra, 0x0014($sp) +/* 03EA8 80930478 AFBF0014 */ sw $ra, 0x0014($sp) /* 03EAC 8093047C 848F001C */ lh $t7, 0x001C($a0) ## 0000001C /* 03EB0 80930480 3C018093 */ lui $at, %hi(D_8093746C) ## $at = 80930000 /* 03EB4 80930484 240E0002 */ addiu $t6, $zero, 0x0002 ## $t6 = 00000002 -/* 03EB8 80930488 000FC080 */ sll $t8, $t7, 2 -/* 03EBC 8093048C 00380821 */ addu $at, $at, $t8 +/* 03EB8 80930488 000FC080 */ sll $t8, $t7, 2 +/* 03EBC 8093048C 00380821 */ addu $at, $at, $t8 /* 03EC0 80930490 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 -/* 03EC4 80930494 AC2E746C */ sw $t6, %lo(D_8093746C)($at) +/* 03EC4 80930494 AC2E746C */ sw $t6, %lo(D_8093746C)($at) /* 03EC8 80930498 84F9001C */ lh $t9, 0x001C($a3) ## 0000001C /* 03ECC 8093049C 3C058093 */ lui $a1, %hi(D_80937884) ## $a1 = 80930000 -/* 03ED0 809304A0 AFA70018 */ sw $a3, 0x0018($sp) -/* 03ED4 809304A4 00194080 */ sll $t0, $t9, 2 -/* 03ED8 809304A8 00A82821 */ addu $a1, $a1, $t0 -/* 03EDC 809304AC 8CA57884 */ lw $a1, %lo(D_80937884)($a1) +/* 03ED0 809304A0 AFA70018 */ sw $a3, 0x0018($sp) +/* 03ED4 809304A4 00194080 */ sll $t0, $t9, 2 +/* 03ED8 809304A8 00A82821 */ addu $a1, $a1, $t0 +/* 03EDC 809304AC 8CA57884 */ lw $a1, %lo(D_80937884)($a1) /* 03EE0 809304B0 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 03EE4 809304B4 0C029490 */ jal func_800A5240 +/* 03EE4 809304B4 0C029490 */ jal SkelAnime_ChangeAnimTransitionStop /* 03EE8 809304B8 3C064120 */ lui $a2, 0x4120 ## $a2 = 41200000 -/* 03EEC 809304BC 8FA40018 */ lw $a0, 0x0018($sp) +/* 03EEC 809304BC 8FA40018 */ lw $a0, 0x0018($sp) /* 03EF0 809304C0 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 03EF4 809304C4 908903E4 */ lbu $t1, 0x03E4($a0) ## 000003E4 /* 03EF8 809304C8 908B03E5 */ lbu $t3, 0x03E5($a0) ## 000003E5 @@ -27,9 +27,9 @@ glabel func_80930474 /* 03F08 809304D8 35AF0001 */ ori $t7, $t5, 0x0001 ## $t7 = 00000001 /* 03F0C 809304DC A08A03E4 */ sb $t2, 0x03E4($a0) ## 000003E4 /* 03F10 809304E0 A08C03E5 */ sb $t4, 0x03E5($a0) ## 000003E5 -/* 03F14 809304E4 0C24CF3B */ jal func_80933CEC +/* 03F14 809304E4 0C24CF3B */ jal func_80933CEC /* 03F18 809304E8 AC8F0004 */ sw $t7, 0x0004($a0) ## 00000004 -/* 03F1C 809304EC 8FA70018 */ lw $a3, 0x0018($sp) +/* 03F1C 809304EC 8FA70018 */ lw $a3, 0x0018($sp) /* 03F20 809304F0 3C014040 */ lui $at, 0x4040 ## $at = 40400000 /* 03F24 809304F4 44812000 */ mtc1 $at, $f4 ## $f4 = 3.00 /* 03F28 809304F8 3C0E8093 */ lui $t6, %hi(func_8093051C) ## $t6 = 80930000 @@ -37,9 +37,9 @@ glabel func_80930474 /* 03F30 80930500 A4E00198 */ sh $zero, 0x0198($a3) ## 00000198 /* 03F34 80930504 ACEE0190 */ sw $t6, 0x0190($a3) ## 00000190 /* 03F38 80930508 E4E40068 */ swc1 $f4, 0x0068($a3) ## 00000068 -/* 03F3C 8093050C 8FBF0014 */ lw $ra, 0x0014($sp) +/* 03F3C 8093050C 8FBF0014 */ lw $ra, 0x0014($sp) /* 03F40 80930510 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 03F44 80930514 03E00008 */ jr $ra +/* 03F44 80930514 03E00008 */ jr $ra /* 03F48 80930518 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8093051C.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8093051C.s index 5dd30304b1..1256b8ff54 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8093051C.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8093051C.s @@ -1,40 +1,40 @@ glabel func_8093051C /* 03F4C 8093051C 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 -/* 03F50 80930520 AFB00020 */ sw $s0, 0x0020($sp) +/* 03F50 80930520 AFB00020 */ sw $s0, 0x0020($sp) /* 03F54 80930524 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 03F58 80930528 AFBF0024 */ sw $ra, 0x0024($sp) +/* 03F58 80930528 AFBF0024 */ sw $ra, 0x0024($sp) /* 03F5C 8093052C 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 03F60 80930530 AFA50044 */ sw $a1, 0x0044($sp) +/* 03F60 80930530 AFA50044 */ sw $a1, 0x0044($sp) /* 03F64 80930534 0C02927F */ jal SkelAnime_FrameUpdateMatrix - -/* 03F68 80930538 AFA4002C */ sw $a0, 0x002C($sp) + +/* 03F68 80930538 AFA4002C */ sw $a0, 0x002C($sp) /* 03F6C 8093053C 3C014248 */ lui $at, 0x4248 ## $at = 42480000 /* 03F70 80930540 44811000 */ mtc1 $at, $f2 ## $f2 = 50.00 /* 03F74 80930544 3C018093 */ lui $at, %hi(D_809379E8) ## $at = 80930000 -/* 03F78 80930548 C42679E8 */ lwc1 $f6, %lo(D_809379E8)($at) +/* 03F78 80930548 C42679E8 */ lwc1 $f6, %lo(D_809379E8)($at) /* 03F7C 8093054C C6040068 */ lwc1 $f4, 0x0068($s0) ## 00000068 /* 03F80 80930550 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 /* 03F84 80930554 44815000 */ mtc1 $at, $f10 ## $f10 = 1.00 -/* 03F88 80930558 46062202 */ mul.s $f8, $f4, $f6 +/* 03F88 80930558 46062202 */ mul.s $f8, $f4, $f6 /* 03F8C 8093055C 3C063E99 */ lui $a2, 0x3E99 ## $a2 = 3E990000 /* 03F90 80930560 34C6999A */ ori $a2, $a2, 0x999A ## $a2 = 3E99999A /* 03F94 80930564 26040024 */ addiu $a0, $s0, 0x0024 ## $a0 = 00000024 /* 03F98 80930568 E6080068 */ swc1 $f8, 0x0068($s0) ## 00000068 /* 03F9C 8093056C C6000068 */ lwc1 $f0, 0x0068($s0) ## 00000068 -/* 03FA0 80930570 4600103C */ c.lt.s $f2, $f0 +/* 03FA0 80930570 4600103C */ c.lt.s $f2, $f0 /* 03FA4 80930574 00000000 */ nop -/* 03FA8 80930578 45020004 */ bc1fl .L8093058C +/* 03FA8 80930578 45020004 */ bc1fl .L8093058C /* 03FAC 8093057C E6000068 */ swc1 $f0, 0x0068($s0) ## 00000068 -/* 03FB0 80930580 10000002 */ beq $zero, $zero, .L8093058C +/* 03FB0 80930580 10000002 */ beq $zero, $zero, .L8093058C /* 03FB4 80930584 E6020068 */ swc1 $f2, 0x0068($s0) ## 00000068 /* 03FB8 80930588 E6000068 */ swc1 $f0, 0x0068($s0) ## 00000068 .L8093058C: /* 03FBC 8093058C 8E050008 */ lw $a1, 0x0008($s0) ## 00000008 /* 03FC0 80930590 8E070068 */ lw $a3, 0x0068($s0) ## 00000068 /* 03FC4 80930594 0C01E0C4 */ jal Math_SmoothScaleMaxMinF - -/* 03FC8 80930598 E7AA0010 */ swc1 $f10, 0x0010($sp) -/* 03FCC 8093059C E7A0003C */ swc1 $f0, 0x003C($sp) + +/* 03FC8 80930598 E7AA0010 */ swc1 $f10, 0x0010($sp) +/* 03FCC 8093059C E7A0003C */ swc1 $f0, 0x003C($sp) /* 03FD0 809305A0 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 /* 03FD4 809305A4 44818000 */ mtc1 $at, $f16 ## $f16 = 1.00 /* 03FD8 809305A8 8E070068 */ lw $a3, 0x0068($s0) ## 00000068 @@ -43,82 +43,82 @@ glabel func_8093051C /* 03FE4 809305B4 34C6999A */ ori $a2, $a2, 0x999A ## $a2 = 3E99999A /* 03FE8 809305B8 2604002C */ addiu $a0, $s0, 0x002C ## $a0 = 0000002C /* 03FEC 809305BC 0C01E0C4 */ jal Math_SmoothScaleMaxMinF - -/* 03FF0 809305C0 E7B00010 */ swc1 $f16, 0x0010($sp) -/* 03FF4 809305C4 C7B2003C */ lwc1 $f18, 0x003C($sp) + +/* 03FF0 809305C0 E7B00010 */ swc1 $f16, 0x0010($sp) +/* 03FF4 809305C4 C7B2003C */ lwc1 $f18, 0x003C($sp) /* 03FF8 809305C8 260400B6 */ addiu $a0, $s0, 0x00B6 ## $a0 = 000000B6 /* 03FFC 809305CC 24060200 */ addiu $a2, $zero, 0x0200 ## $a2 = 00000200 -/* 04000 809305D0 46009100 */ add.s $f4, $f18, $f0 -/* 04004 809305D4 E7A4003C */ swc1 $f4, 0x003C($sp) +/* 04000 809305D0 46009100 */ add.s $f4, $f18, $f0 +/* 04004 809305D4 E7A4003C */ swc1 $f4, 0x003C($sp) /* 04008 809305D8 86020198 */ lh $v0, 0x0198($s0) ## 00000198 -/* 0400C 809305DC 10400028 */ beq $v0, $zero, .L80930680 +/* 0400C 809305DC 10400028 */ beq $v0, $zero, .L80930680 /* 04010 809305E0 00000000 */ nop -/* 04014 809305E4 10400003 */ beq $v0, $zero, .L809305F4 +/* 04014 809305E4 10400003 */ beq $v0, $zero, .L809305F4 /* 04018 809305E8 244EFFFF */ addiu $t6, $v0, 0xFFFF ## $t6 = FFFFFFFF /* 0401C 809305EC A60E0198 */ sh $t6, 0x0198($s0) ## 00000198 /* 04020 809305F0 86020198 */ lh $v0, 0x0198($s0) ## 00000198 .L809305F4: /* 04024 809305F4 44823000 */ mtc1 $v0, $f6 ## $f6 = 0.00 /* 04028 809305F8 3C018093 */ lui $at, %hi(D_809379EC) ## $at = 80930000 -/* 0402C 809305FC C42A79EC */ lwc1 $f10, %lo(D_809379EC)($at) -/* 04030 80930600 46803220 */ cvt.s.w $f8, $f6 +/* 0402C 809305FC C42A79EC */ lwc1 $f10, %lo(D_809379EC)($at) +/* 04030 80930600 46803220 */ cvt.s.w $f8, $f6 /* 04034 80930604 3C013D80 */ lui $at, 0x3D80 ## $at = 3D800000 /* 04038 80930608 44819000 */ mtc1 $at, $f18 ## $f18 = 0.06 -/* 0403C 8093060C 460A4402 */ mul.s $f16, $f8, $f10 +/* 0403C 8093060C 460A4402 */ mul.s $f16, $f8, $f10 /* 04040 80930610 00000000 */ nop -/* 04044 80930614 46128302 */ mul.s $f12, $f16, $f18 +/* 04044 80930614 46128302 */ mul.s $f12, $f16, $f18 /* 04048 80930618 0C0400A4 */ jal sinf - + /* 0404C 8093061C 00000000 */ nop /* 04050 80930620 3C01437A */ lui $at, 0x437A ## $at = 437A0000 /* 04054 80930624 44812000 */ mtc1 $at, $f4 ## $f4 = 250.00 /* 04058 80930628 C608000C */ lwc1 $f8, 0x000C($s0) ## 0000000C /* 0405C 8093062C 86020198 */ lh $v0, 0x0198($s0) ## 00000198 -/* 04060 80930630 46040182 */ mul.s $f6, $f0, $f4 +/* 04060 80930630 46040182 */ mul.s $f6, $f0, $f4 /* 04064 80930634 24010004 */ addiu $at, $zero, 0x0004 ## $at = 00000004 -/* 04068 80930638 46083280 */ add.s $f10, $f6, $f8 -/* 0406C 8093063C 14400005 */ bne $v0, $zero, .L80930654 +/* 04068 80930638 46083280 */ add.s $f10, $f6, $f8 +/* 0406C 8093063C 14400005 */ bne $v0, $zero, .L80930654 /* 04070 80930640 E60A0028 */ swc1 $f10, 0x0028($s0) ## 00000028 -/* 04074 80930644 0C24BEF9 */ jal func_8092FBE4 +/* 04074 80930644 0C24BEF9 */ jal func_8092FBE4 /* 04078 80930648 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0407C 8093064C 1000003A */ beq $zero, $zero, .L80930738 -/* 04080 80930650 8FBF0024 */ lw $ra, 0x0024($sp) +/* 0407C 8093064C 1000003A */ beq $zero, $zero, .L80930738 +/* 04080 80930650 8FBF0024 */ lw $ra, 0x0024($sp) .L80930654: -/* 04084 80930654 14410037 */ bne $v0, $at, .L80930734 -/* 04088 80930658 8FA4002C */ lw $a0, 0x002C($sp) +/* 04084 80930654 14410037 */ bne $v0, $at, .L80930734 +/* 04088 80930658 8FA4002C */ lw $a0, 0x002C($sp) /* 0408C 8093065C 860F001C */ lh $t7, 0x001C($s0) ## 0000001C /* 04090 80930660 3C058093 */ lui $a1, %hi(D_8093784C) ## $a1 = 80930000 /* 04094 80930664 3C064080 */ lui $a2, 0x4080 ## $a2 = 40800000 -/* 04098 80930668 000FC080 */ sll $t8, $t7, 2 -/* 0409C 8093066C 00B82821 */ addu $a1, $a1, $t8 -/* 040A0 80930670 0C0294D3 */ jal func_800A534C -/* 040A4 80930674 8CA5784C */ lw $a1, %lo(D_8093784C)($a1) -/* 040A8 80930678 1000002F */ beq $zero, $zero, .L80930738 -/* 040AC 8093067C 8FBF0024 */ lw $ra, 0x0024($sp) +/* 04098 80930668 000FC080 */ sll $t8, $t7, 2 +/* 0409C 8093066C 00B82821 */ addu $a1, $a1, $t8 +/* 040A0 80930670 0C0294D3 */ jal SkelAnime_ChangeAnimTransitionRepeat +/* 040A4 80930674 8CA5784C */ lw $a1, %lo(D_8093784C)($a1) +/* 040A8 80930678 1000002F */ beq $zero, $zero, .L80930738 +/* 040AC 8093067C 8FBF0024 */ lw $ra, 0x0024($sp) .L80930680: /* 040B0 80930680 0C01DE2B */ jal Math_ApproxUpdateScaledS - + /* 040B4 80930684 86050016 */ lh $a1, 0x0016($s0) ## 00000016 -/* 040B8 80930688 AFA20038 */ sw $v0, 0x0038($sp) +/* 040B8 80930688 AFA20038 */ sw $v0, 0x0038($sp) /* 040BC 8093068C 86050018 */ lh $a1, 0x0018($s0) ## 00000018 /* 040C0 80930690 260400B8 */ addiu $a0, $s0, 0x00B8 ## $a0 = 000000B8 /* 040C4 80930694 0C01DE2B */ jal Math_ApproxUpdateScaledS - + /* 040C8 80930698 24060200 */ addiu $a2, $zero, 0x0200 ## $a2 = 00000200 -/* 040CC 8093069C 8FB90038 */ lw $t9, 0x0038($sp) +/* 040CC 8093069C 8FB90038 */ lw $t9, 0x0038($sp) /* 040D0 809306A0 260401A0 */ addiu $a0, $s0, 0x01A0 ## $a0 = 000001A0 /* 040D4 809306A4 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 040D8 809306A8 03224024 */ and $t0, $t9, $v0 -/* 040DC 809306AC AFA80038 */ sw $t0, 0x0038($sp) +/* 040D8 809306A8 03224024 */ and $t0, $t9, $v0 +/* 040DC 809306AC AFA80038 */ sw $t0, 0x0038($sp) /* 040E0 809306B0 0C01DE2B */ jal Math_ApproxUpdateScaledS - + /* 040E4 809306B4 24060800 */ addiu $a2, $zero, 0x0800 ## $a2 = 00000800 -/* 040E8 809306B8 8FA90038 */ lw $t1, 0x0038($sp) +/* 040E8 809306B8 8FA90038 */ lw $t1, 0x0038($sp) /* 040EC 809306BC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 040F0 809306C0 24053167 */ addiu $a1, $zero, 0x3167 ## $a1 = 00003167 -/* 040F4 809306C4 01225024 */ and $t2, $t1, $v0 -/* 040F8 809306C8 0C00BE5D */ jal func_8002F974 -/* 040FC 809306CC AFAA0038 */ sw $t2, 0x0038($sp) +/* 040F4 809306C4 01225024 */ and $t2, $t1, $v0 +/* 040F8 809306C8 0C00BE5D */ jal func_8002F974 +/* 040FC 809306CC AFAA0038 */ sw $t2, 0x0038($sp) /* 04100 809306D0 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 /* 04104 809306D4 44818000 */ mtc1 $at, $f16 ## $f16 = 5.00 /* 04108 809306D8 26040028 */ addiu $a0, $s0, 0x0028 ## $a0 = 00000028 @@ -126,31 +126,31 @@ glabel func_8093051C /* 04110 809306E0 3C063F00 */ lui $a2, 0x3F00 ## $a2 = 3F000000 /* 04114 809306E4 3C07428C */ lui $a3, 0x428C ## $a3 = 428C0000 /* 04118 809306E8 0C01E0C4 */ jal Math_SmoothScaleMaxMinF - -/* 0411C 809306EC E7B00010 */ swc1 $f16, 0x0010($sp) + +/* 0411C 809306EC E7B00010 */ swc1 $f16, 0x0010($sp) /* 04120 809306F0 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 /* 04124 809306F4 44819000 */ mtc1 $at, $f18 ## $f18 = 1.00 -/* 04128 809306F8 8FAB0038 */ lw $t3, 0x0038($sp) -/* 0412C 809306FC 4612003C */ c.lt.s $f0, $f18 +/* 04128 809306F8 8FAB0038 */ lw $t3, 0x0038($sp) +/* 0412C 809306FC 4612003C */ c.lt.s $f0, $f18 /* 04130 80930700 00000000 */ nop -/* 04134 80930704 4502000C */ bc1fl .L80930738 -/* 04138 80930708 8FBF0024 */ lw $ra, 0x0024($sp) -/* 0413C 8093070C 11600009 */ beq $t3, $zero, .L80930734 -/* 04140 80930710 C7A4003C */ lwc1 $f4, 0x003C($sp) +/* 04134 80930704 4502000C */ bc1fl .L80930738 +/* 04138 80930708 8FBF0024 */ lw $ra, 0x0024($sp) +/* 0413C 8093070C 11600009 */ beq $t3, $zero, .L80930734 +/* 04140 80930710 C7A4003C */ lwc1 $f4, 0x003C($sp) /* 04144 80930714 3C014120 */ lui $at, 0x4120 ## $at = 41200000 /* 04148 80930718 44813000 */ mtc1 $at, $f6 ## $f6 = 10.00 /* 0414C 8093071C 240C0008 */ addiu $t4, $zero, 0x0008 ## $t4 = 00000008 -/* 04150 80930720 4606203C */ c.lt.s $f4, $f6 +/* 04150 80930720 4606203C */ c.lt.s $f4, $f6 /* 04154 80930724 00000000 */ nop -/* 04158 80930728 45020003 */ bc1fl .L80930738 -/* 0415C 8093072C 8FBF0024 */ lw $ra, 0x0024($sp) +/* 04158 80930728 45020003 */ bc1fl .L80930738 +/* 0415C 8093072C 8FBF0024 */ lw $ra, 0x0024($sp) /* 04160 80930730 A60C0198 */ sh $t4, 0x0198($s0) ## 00000198 .L80930734: -/* 04164 80930734 8FBF0024 */ lw $ra, 0x0024($sp) +/* 04164 80930734 8FBF0024 */ lw $ra, 0x0024($sp) .L80930738: -/* 04168 80930738 8FB00020 */ lw $s0, 0x0020($sp) +/* 04168 80930738 8FB00020 */ lw $s0, 0x0020($sp) /* 0416C 8093073C 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 -/* 04170 80930740 03E00008 */ jr $ra +/* 04170 80930740 03E00008 */ jr $ra /* 04174 80930744 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80930748.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80930748.s index 0754560b33..119fefa5d0 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80930748.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80930748.s @@ -1,30 +1,30 @@ glabel func_80930748 /* 04178 80930748 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 0417C 8093074C AFBF0014 */ sw $ra, 0x0014($sp) +/* 0417C 8093074C AFBF0014 */ sw $ra, 0x0014($sp) /* 04180 80930750 848F001C */ lh $t7, 0x001C($a0) ## 0000001C /* 04184 80930754 3C018093 */ lui $at, %hi(D_8093746C) ## $at = 80930000 /* 04188 80930758 240E0003 */ addiu $t6, $zero, 0x0003 ## $t6 = 00000003 -/* 0418C 8093075C 000FC080 */ sll $t8, $t7, 2 -/* 04190 80930760 00380821 */ addu $at, $at, $t8 -/* 04194 80930764 AC2E746C */ sw $t6, %lo(D_8093746C)($at) +/* 0418C 8093075C 000FC080 */ sll $t8, $t7, 2 +/* 04190 80930760 00380821 */ addu $at, $at, $t8 +/* 04194 80930764 AC2E746C */ sw $t6, %lo(D_8093746C)($at) /* 04198 80930768 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 /* 0419C 8093076C A4800198 */ sh $zero, 0x0198($a0) ## 00000198 /* 041A0 80930770 84F9001C */ lh $t9, 0x001C($a3) ## 0000001C /* 041A4 80930774 3C058093 */ lui $a1, %hi(D_8093785C) ## $a1 = 80930000 -/* 041A8 80930778 AFA70018 */ sw $a3, 0x0018($sp) -/* 041AC 8093077C 00194080 */ sll $t0, $t9, 2 -/* 041B0 80930780 00A82821 */ addu $a1, $a1, $t0 -/* 041B4 80930784 8CA5785C */ lw $a1, %lo(D_8093785C)($a1) +/* 041A8 80930778 AFA70018 */ sw $a3, 0x0018($sp) +/* 041AC 8093077C 00194080 */ sll $t0, $t9, 2 +/* 041B0 80930780 00A82821 */ addu $a1, $a1, $t0 +/* 041B4 80930784 8CA5785C */ lw $a1, %lo(D_8093785C)($a1) /* 041B8 80930788 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 041BC 8093078C 0C029490 */ jal func_800A5240 +/* 041BC 8093078C 0C029490 */ jal SkelAnime_ChangeAnimTransitionStop /* 041C0 80930790 3C064120 */ lui $a2, 0x4120 ## $a2 = 41200000 -/* 041C4 80930794 8FA70018 */ lw $a3, 0x0018($sp) +/* 041C4 80930794 8FA70018 */ lw $a3, 0x0018($sp) /* 041C8 80930798 3C098093 */ lui $t1, %hi(func_809307B4) ## $t1 = 80930000 /* 041CC 8093079C 252907B4 */ addiu $t1, $t1, %lo(func_809307B4) ## $t1 = 809307B4 /* 041D0 809307A0 ACE90190 */ sw $t1, 0x0190($a3) ## 00000190 -/* 041D4 809307A4 8FBF0014 */ lw $ra, 0x0014($sp) +/* 041D4 809307A4 8FBF0014 */ lw $ra, 0x0014($sp) /* 041D8 809307A8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 041DC 809307AC 03E00008 */ jr $ra +/* 041DC 809307AC 03E00008 */ jr $ra /* 041E0 809307B0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_809308A4.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_809308A4.s index c36e5d3c5f..404b380c08 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_809308A4.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_809308A4.s @@ -1,13 +1,13 @@ glabel func_809308A4 /* 042D4 809308A4 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 042D8 809308A8 AFBF001C */ sw $ra, 0x001C($sp) -/* 042DC 809308AC AFB00018 */ sw $s0, 0x0018($sp) +/* 042D8 809308A8 AFBF001C */ sw $ra, 0x001C($sp) +/* 042DC 809308AC AFB00018 */ sw $s0, 0x0018($sp) /* 042E0 809308B0 848F001C */ lh $t7, 0x001C($a0) ## 0000001C /* 042E4 809308B4 3C018093 */ lui $at, %hi(D_8093746C) ## $at = 80930000 /* 042E8 809308B8 240E0003 */ addiu $t6, $zero, 0x0003 ## $t6 = 00000003 -/* 042EC 809308BC 000FC080 */ sll $t8, $t7, 2 -/* 042F0 809308C0 00380821 */ addu $at, $at, $t8 -/* 042F4 809308C4 AC2E746C */ sw $t6, %lo(D_8093746C)($at) +/* 042EC 809308BC 000FC080 */ sll $t8, $t7, 2 +/* 042F0 809308C0 00380821 */ addu $at, $at, $t8 +/* 042F4 809308C4 AC2E746C */ sw $t6, %lo(D_8093746C)($at) /* 042F8 809308C8 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 /* 042FC 809308CC 44812000 */ mtc1 $at, $f4 ## $f4 = 1.00 /* 04300 809308D0 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 @@ -16,25 +16,25 @@ glabel func_809308A4 /* 0430C 809308DC 8619001C */ lh $t9, 0x001C($s0) ## 0000001C /* 04310 809308E0 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C /* 04314 809308E4 3C064120 */ lui $a2, 0x4120 ## $a2 = 41200000 -/* 04318 809308E8 00194080 */ sll $t0, $t9, 2 -/* 0431C 809308EC 00A82821 */ addu $a1, $a1, $t0 -/* 04320 809308F0 0C029490 */ jal func_800A5240 -/* 04324 809308F4 8CA57854 */ lw $a1, %lo(D_80937854)($a1) +/* 04318 809308E8 00194080 */ sll $t0, $t9, 2 +/* 0431C 809308EC 00A82821 */ addu $a1, $a1, $t0 +/* 04320 809308F0 0C029490 */ jal SkelAnime_ChangeAnimTransitionStop +/* 04324 809308F4 8CA57854 */ lw $a1, %lo(D_80937854)($a1) /* 04328 809308F8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0432C 809308FC 0C24CF20 */ jal func_80933C80 +/* 0432C 809308FC 0C24CF20 */ jal func_80933C80 /* 04330 80930900 24050020 */ addiu $a1, $zero, 0x0020 ## $a1 = 00000020 /* 04334 80930904 A2000195 */ sb $zero, 0x0195($s0) ## 00000195 /* 04338 80930908 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 0433C 8093090C 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 04340 80930910 24053953 */ addiu $a1, $zero, 0x3953 ## $a1 = 00003953 /* 04344 80930914 3C098093 */ lui $t1, %hi(func_80930934) ## $t1 = 80930000 /* 04348 80930918 25290934 */ addiu $t1, $t1, %lo(func_80930934) ## $t1 = 80930934 /* 0434C 8093091C AE090190 */ sw $t1, 0x0190($s0) ## 00000190 -/* 04350 80930920 8FBF001C */ lw $ra, 0x001C($sp) -/* 04354 80930924 8FB00018 */ lw $s0, 0x0018($sp) +/* 04350 80930920 8FBF001C */ lw $ra, 0x001C($sp) +/* 04354 80930924 8FB00018 */ lw $s0, 0x0018($sp) /* 04358 80930928 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 0435C 8093092C 03E00008 */ jr $ra +/* 0435C 8093092C 03E00008 */ jr $ra /* 04360 80930930 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80930B18.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80930B18.s index f95b9d514c..45be66e899 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80930B18.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80930B18.s @@ -1,45 +1,45 @@ glabel func_80930B18 /* 04548 80930B18 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 0454C 80930B1C AFBF001C */ sw $ra, 0x001C($sp) -/* 04550 80930B20 AFB00018 */ sw $s0, 0x0018($sp) +/* 0454C 80930B1C AFBF001C */ sw $ra, 0x001C($sp) +/* 04550 80930B20 AFB00018 */ sw $s0, 0x0018($sp) /* 04554 80930B24 848F001C */ lh $t7, 0x001C($a0) ## 0000001C /* 04558 80930B28 3C018093 */ lui $at, %hi(D_8093746C) ## $at = 80930000 /* 0455C 80930B2C 240E0004 */ addiu $t6, $zero, 0x0004 ## $t6 = 00000004 -/* 04560 80930B30 000FC080 */ sll $t8, $t7, 2 -/* 04564 80930B34 00380821 */ addu $at, $at, $t8 +/* 04560 80930B30 000FC080 */ sll $t8, $t7, 2 +/* 04564 80930B34 00380821 */ addu $at, $at, $t8 /* 04568 80930B38 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 0456C 80930B3C AC2E746C */ sw $t6, %lo(D_8093746C)($at) +/* 0456C 80930B3C AC2E746C */ sw $t6, %lo(D_8093746C)($at) /* 04570 80930B40 8619001C */ lh $t9, 0x001C($s0) ## 0000001C /* 04574 80930B44 3C058093 */ lui $a1, %hi(D_8093785C) ## $a1 = 80930000 /* 04578 80930B48 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 0457C 80930B4C 00194080 */ sll $t0, $t9, 2 -/* 04580 80930B50 00A82821 */ addu $a1, $a1, $t0 -/* 04584 80930B54 8CA5785C */ lw $a1, %lo(D_8093785C)($a1) -/* 04588 80930B58 0C029490 */ jal func_800A5240 +/* 0457C 80930B4C 00194080 */ sll $t0, $t9, 2 +/* 04580 80930B50 00A82821 */ addu $a1, $a1, $t0 +/* 04584 80930B54 8CA5785C */ lw $a1, %lo(D_8093785C)($a1) +/* 04588 80930B58 0C029490 */ jal SkelAnime_ChangeAnimTransitionStop /* 0458C 80930B5C 3C064120 */ lui $a2, 0x4120 ## $a2 = 41200000 /* 04590 80930B60 3C058094 */ lui $a1, %hi(D_80938C90) ## $a1 = 80940000 -/* 04594 80930B64 8CA58C90 */ lw $a1, %lo(D_80938C90)($a1) +/* 04594 80930B64 8CA58C90 */ lw $a1, %lo(D_80938C90)($a1) /* 04598 80930B68 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0459C 80930B6C 0C00B6EC */ jal func_8002DBB0 +/* 0459C 80930B6C 0C00B6EC */ jal func_8002DBB0 /* 045A0 80930B70 24A50024 */ addiu $a1, $a1, 0x0024 ## $a1 = 80940024 /* 045A4 80930B74 E60003C4 */ swc1 $f0, 0x03C4($s0) ## 000003C4 /* 045A8 80930B78 3C048094 */ lui $a0, %hi(D_80938C90) ## $a0 = 80940000 -/* 045AC 80930B7C 8C848C90 */ lw $a0, %lo(D_80938C90)($a0) -/* 045B0 80930B80 0C00B6B0 */ jal func_8002DAC0 +/* 045AC 80930B7C 8C848C90 */ lw $a0, %lo(D_80938C90)($a0) +/* 045B0 80930B80 0C00B6B0 */ jal func_8002DAC0 /* 045B4 80930B84 26050024 */ addiu $a1, $s0, 0x0024 ## $a1 = 00000024 /* 045B8 80930B88 820A0194 */ lb $t2, 0x0194($s0) ## 00000194 /* 045BC 80930B8C 86090016 */ lh $t1, 0x0016($s0) ## 00000016 /* 045C0 80930B90 3C0D8093 */ lui $t5, %hi(func_80930BC0) ## $t5 = 80930000 -/* 045C4 80930B94 000A5B40 */ sll $t3, $t2, 13 +/* 045C4 80930B94 000A5B40 */ sll $t3, $t2, 13 /* 045C8 80930B98 25AD0BC0 */ addiu $t5, $t5, %lo(func_80930BC0) ## $t5 = 80930BC0 -/* 045CC 80930B9C 012B6021 */ addu $t4, $t1, $t3 +/* 045CC 80930B9C 012B6021 */ addu $t4, $t1, $t3 /* 045D0 80930BA0 A6020032 */ sh $v0, 0x0032($s0) ## 00000032 /* 045D4 80930BA4 A60C01A4 */ sh $t4, 0x01A4($s0) ## 000001A4 /* 045D8 80930BA8 AE0D0190 */ sw $t5, 0x0190($s0) ## 00000190 -/* 045DC 80930BAC 8FBF001C */ lw $ra, 0x001C($sp) -/* 045E0 80930BB0 8FB00018 */ lw $s0, 0x0018($sp) +/* 045DC 80930BAC 8FBF001C */ lw $ra, 0x001C($sp) +/* 045E0 80930BB0 8FB00018 */ lw $s0, 0x0018($sp) /* 045E4 80930BB4 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 045E8 80930BB8 03E00008 */ jr $ra +/* 045E8 80930BB8 03E00008 */ jr $ra /* 045EC 80930BBC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80930CE4.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80930CE4.s index c05986db63..40bc94c6dd 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80930CE4.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80930CE4.s @@ -1,39 +1,39 @@ glabel func_80930CE4 /* 04714 80930CE4 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 04718 80930CE8 AFB00018 */ sw $s0, 0x0018($sp) +/* 04718 80930CE8 AFB00018 */ sw $s0, 0x0018($sp) /* 0471C 80930CEC 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 04720 80930CF0 AFBF001C */ sw $ra, 0x001C($sp) +/* 04720 80930CF0 AFBF001C */ sw $ra, 0x001C($sp) /* 04724 80930CF4 860E001C */ lh $t6, 0x001C($s0) ## 0000001C /* 04728 80930CF8 3C058093 */ lui $a1, %hi(D_80937854) ## $a1 = 80930000 /* 0472C 80930CFC 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 04730 80930D00 000E7880 */ sll $t7, $t6, 2 -/* 04734 80930D04 00AF2821 */ addu $a1, $a1, $t7 -/* 04738 80930D08 8CA57854 */ lw $a1, %lo(D_80937854)($a1) -/* 0473C 80930D0C 0C029490 */ jal func_800A5240 +/* 04730 80930D00 000E7880 */ sll $t7, $t6, 2 +/* 04734 80930D04 00AF2821 */ addu $a1, $a1, $t7 +/* 04738 80930D08 8CA57854 */ lw $a1, %lo(D_80937854)($a1) +/* 0473C 80930D0C 0C029490 */ jal SkelAnime_ChangeAnimTransitionStop /* 04740 80930D10 3C0640A0 */ lui $a2, 0x40A0 ## $a2 = 40A00000 /* 04744 80930D14 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 04748 80930D18 0C24CF20 */ jal func_80933C80 +/* 04748 80930D18 0C24CF20 */ jal func_80933C80 /* 0474C 80930D1C 24050010 */ addiu $a1, $zero, 0x0010 ## $a1 = 00000010 /* 04750 80930D20 82190194 */ lb $t9, 0x0194($s0) ## 00000194 /* 04754 80930D24 86180016 */ lh $t8, 0x0016($s0) ## 00000016 /* 04758 80930D28 240A0300 */ addiu $t2, $zero, 0x0300 ## $t2 = 00000300 -/* 0475C 80930D2C 00194340 */ sll $t0, $t9, 13 -/* 04760 80930D30 03084823 */ subu $t1, $t8, $t0 +/* 0475C 80930D2C 00194340 */ sll $t0, $t9, 13 +/* 04760 80930D30 03084823 */ subu $t1, $t8, $t0 /* 04764 80930D34 A60901A4 */ sh $t1, 0x01A4($s0) ## 000001A4 /* 04768 80930D38 A60A019C */ sh $t2, 0x019C($s0) ## 0000019C /* 0476C 80930D3C A600019A */ sh $zero, 0x019A($s0) ## 0000019A /* 04770 80930D40 A2000195 */ sb $zero, 0x0195($s0) ## 00000195 /* 04774 80930D44 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 04778 80930D48 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 0477C 80930D4C 24053953 */ addiu $a1, $zero, 0x3953 ## $a1 = 00003953 /* 04780 80930D50 3C0B8093 */ lui $t3, %hi(func_80930D70) ## $t3 = 80930000 /* 04784 80930D54 256B0D70 */ addiu $t3, $t3, %lo(func_80930D70) ## $t3 = 80930D70 /* 04788 80930D58 AE0B0190 */ sw $t3, 0x0190($s0) ## 00000190 -/* 0478C 80930D5C 8FBF001C */ lw $ra, 0x001C($sp) -/* 04790 80930D60 8FB00018 */ lw $s0, 0x0018($sp) +/* 0478C 80930D5C 8FBF001C */ lw $ra, 0x001C($sp) +/* 04790 80930D60 8FB00018 */ lw $s0, 0x0018($sp) /* 04794 80930D64 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 04798 80930D68 03E00008 */ jr $ra +/* 04798 80930D68 03E00008 */ jr $ra /* 0479C 80930D6C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80930F80.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80930F80.s index 1eb46259c0..0dc0fbd571 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80930F80.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80930F80.s @@ -1,29 +1,29 @@ glabel func_80930F80 /* 049B0 80930F80 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 049B4 80930F84 AFBF0014 */ sw $ra, 0x0014($sp) +/* 049B4 80930F84 AFBF0014 */ sw $ra, 0x0014($sp) /* 049B8 80930F88 848F001C */ lh $t7, 0x001C($a0) ## 0000001C /* 049BC 80930F8C 3C018093 */ lui $at, %hi(D_8093746C) ## $at = 80930000 /* 049C0 80930F90 240E0005 */ addiu $t6, $zero, 0x0005 ## $t6 = 00000005 -/* 049C4 80930F94 000FC080 */ sll $t8, $t7, 2 -/* 049C8 80930F98 00380821 */ addu $at, $at, $t8 +/* 049C4 80930F94 000FC080 */ sll $t8, $t7, 2 +/* 049C8 80930F98 00380821 */ addu $at, $at, $t8 /* 049CC 80930F9C 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 -/* 049D0 80930FA0 AC2E746C */ sw $t6, %lo(D_8093746C)($at) +/* 049D0 80930FA0 AC2E746C */ sw $t6, %lo(D_8093746C)($at) /* 049D4 80930FA4 84F9001C */ lh $t9, 0x001C($a3) ## 0000001C /* 049D8 80930FA8 3C058093 */ lui $a1, %hi(D_8093787C) ## $a1 = 80930000 -/* 049DC 80930FAC AFA70018 */ sw $a3, 0x0018($sp) -/* 049E0 80930FB0 00194080 */ sll $t0, $t9, 2 -/* 049E4 80930FB4 00A82821 */ addu $a1, $a1, $t0 -/* 049E8 80930FB8 8CA5787C */ lw $a1, %lo(D_8093787C)($a1) +/* 049DC 80930FAC AFA70018 */ sw $a3, 0x0018($sp) +/* 049E0 80930FB0 00194080 */ sll $t0, $t9, 2 +/* 049E4 80930FB4 00A82821 */ addu $a1, $a1, $t0 +/* 049E8 80930FB8 8CA5787C */ lw $a1, %lo(D_8093787C)($a1) /* 049EC 80930FBC 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 049F0 80930FC0 0C029490 */ jal func_800A5240 +/* 049F0 80930FC0 0C029490 */ jal SkelAnime_ChangeAnimTransitionStop /* 049F4 80930FC4 3C064120 */ lui $a2, 0x4120 ## $a2 = 41200000 -/* 049F8 80930FC8 8FA70018 */ lw $a3, 0x0018($sp) +/* 049F8 80930FC8 8FA70018 */ lw $a3, 0x0018($sp) /* 049FC 80930FCC 3C098093 */ lui $t1, %hi(func_80930FE8) ## $t1 = 80930000 /* 04A00 80930FD0 25290FE8 */ addiu $t1, $t1, %lo(func_80930FE8) ## $t1 = 80930FE8 /* 04A04 80930FD4 ACE90190 */ sw $t1, 0x0190($a3) ## 00000190 -/* 04A08 80930FD8 8FBF0014 */ lw $ra, 0x0014($sp) +/* 04A08 80930FD8 8FBF0014 */ lw $ra, 0x0014($sp) /* 04A0C 80930FDC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 04A10 80930FE0 03E00008 */ jr $ra +/* 04A10 80930FE0 03E00008 */ jr $ra /* 04A14 80930FE4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80931044.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80931044.s index 6120f286fa..b83c933b95 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80931044.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80931044.s @@ -2,36 +2,36 @@ glabel func_80931044 /* 04A74 80931044 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 /* 04A78 80931048 44812000 */ mtc1 $at, $f4 ## $f4 = 0.50 /* 04A7C 8093104C 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 04A80 80931050 AFB00018 */ sw $s0, 0x0018($sp) -/* 04A84 80931054 AFBF001C */ sw $ra, 0x001C($sp) +/* 04A80 80931050 AFB00018 */ sw $s0, 0x0018($sp) +/* 04A84 80931054 AFBF001C */ sw $ra, 0x001C($sp) /* 04A88 80931058 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 04A8C 8093105C E4840068 */ swc1 $f4, 0x0068($a0) ## 00000068 /* 04A90 80931060 860E001C */ lh $t6, 0x001C($s0) ## 0000001C /* 04A94 80931064 3C058093 */ lui $a1, %hi(D_80937864) ## $a1 = 80930000 /* 04A98 80931068 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 04A9C 8093106C 000E7880 */ sll $t7, $t6, 2 -/* 04AA0 80931070 00AF2821 */ addu $a1, $a1, $t7 -/* 04AA4 80931074 8CA57864 */ lw $a1, %lo(D_80937864)($a1) -/* 04AA8 80931078 0C029490 */ jal func_800A5240 +/* 04A9C 8093106C 000E7880 */ sll $t7, $t6, 2 +/* 04AA0 80931070 00AF2821 */ addu $a1, $a1, $t7 +/* 04AA4 80931074 8CA57864 */ lw $a1, %lo(D_80937864)($a1) +/* 04AA8 80931078 0C029490 */ jal SkelAnime_ChangeAnimTransitionStop /* 04AAC 8093107C 3C0640A0 */ lui $a2, 0x40A0 ## $a2 = 40A00000 /* 04AB0 80931080 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 04AB4 80931084 0C24CF3B */ jal func_80933CEC +/* 04AB4 80931084 0C24CF3B */ jal func_80933CEC /* 04AB8 80931088 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 /* 04ABC 8093108C 82180194 */ lb $t8, 0x0194($s0) ## 00000194 /* 04AC0 80931090 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 04AC4 80931094 24050010 */ addiu $a1, $zero, 0x0010 ## $a1 = 00000010 -/* 04AC8 80931098 0018C980 */ sll $t9, $t8, 6 -/* 04ACC 8093109C 0338C823 */ subu $t9, $t9, $t8 -/* 04AD0 809310A0 0019CA00 */ sll $t9, $t9, 8 -/* 04AD4 809310A4 0C24CF20 */ jal func_80933C80 +/* 04AC8 80931098 0018C980 */ sll $t9, $t8, 6 +/* 04ACC 8093109C 0338C823 */ subu $t9, $t9, $t8 +/* 04AD0 809310A0 0019CA00 */ sll $t9, $t9, 8 +/* 04AD4 809310A4 0C24CF20 */ jal func_80933C80 /* 04AD8 809310A8 A61901A6 */ sh $t9, 0x01A6($s0) ## 000001A6 /* 04ADC 809310AC 3C088093 */ lui $t0, %hi(func_809310CC) ## $t0 = 80930000 /* 04AE0 809310B0 250810CC */ addiu $t0, $t0, %lo(func_809310CC) ## $t0 = 809310CC /* 04AE4 809310B4 AE080190 */ sw $t0, 0x0190($s0) ## 00000190 -/* 04AE8 809310B8 8FBF001C */ lw $ra, 0x001C($sp) -/* 04AEC 809310BC 8FB00018 */ lw $s0, 0x0018($sp) +/* 04AE8 809310B8 8FBF001C */ lw $ra, 0x001C($sp) +/* 04AEC 809310BC 8FB00018 */ lw $s0, 0x0018($sp) /* 04AF0 809310C0 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 04AF4 809310C4 03E00008 */ jr $ra +/* 04AF4 809310C4 03E00008 */ jr $ra /* 04AF8 809310C8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80931210.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80931210.s index 87ce4ce57b..371dd5978b 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80931210.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80931210.s @@ -1,51 +1,51 @@ glabel func_80931210 /* 04C40 80931210 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 04C44 80931214 AFBF001C */ sw $ra, 0x001C($sp) -/* 04C48 80931218 AFB00018 */ sw $s0, 0x0018($sp) +/* 04C44 80931214 AFBF001C */ sw $ra, 0x001C($sp) +/* 04C48 80931218 AFB00018 */ sw $s0, 0x0018($sp) /* 04C4C 8093121C 848E001C */ lh $t6, 0x001C($a0) ## 0000001C /* 04C50 80931220 3C028093 */ lui $v0, %hi(D_8093746C) ## $v0 = 80930000 /* 04C54 80931224 2442746C */ addiu $v0, $v0, %lo(D_8093746C) ## $v0 = 8093746C -/* 04C58 80931228 000E7880 */ sll $t7, $t6, 2 +/* 04C58 80931228 000E7880 */ sll $t7, $t6, 2 /* 04C5C 8093122C 24030006 */ addiu $v1, $zero, 0x0006 ## $v1 = 00000006 -/* 04C60 80931230 004FC021 */ addu $t8, $v0, $t7 +/* 04C60 80931230 004FC021 */ addu $t8, $v0, $t7 /* 04C64 80931234 AF030000 */ sw $v1, 0x0000($t8) ## 00000000 /* 04C68 80931238 8C85011C */ lw $a1, 0x011C($a0) ## 0000011C /* 04C6C 8093123C 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 04C70 80931240 84B9001C */ lh $t9, 0x001C($a1) ## 0000001C -/* 04C74 80931244 00194080 */ sll $t0, $t9, 2 -/* 04C78 80931248 00484821 */ addu $t1, $v0, $t0 +/* 04C74 80931244 00194080 */ sll $t0, $t9, 2 +/* 04C78 80931248 00484821 */ addu $t1, $v0, $t0 /* 04C7C 8093124C 8D2A0000 */ lw $t2, 0x0000($t1) ## 00000000 -/* 04C80 80931250 506A0004 */ beql $v1, $t2, .L80931264 +/* 04C80 80931250 506A0004 */ beql $v1, $t2, .L80931264 /* 04C84 80931254 860B001C */ lh $t3, 0x001C($s0) ## 0000001C -/* 04C88 80931258 0C24C484 */ jal func_80931210 +/* 04C88 80931258 0C24C484 */ jal func_80931210 /* 04C8C 8093125C 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 /* 04C90 80931260 860B001C */ lh $t3, 0x001C($s0) ## 0000001C .L80931264: /* 04C94 80931264 3C058093 */ lui $a1, %hi(D_8093785C) ## $a1 = 80930000 /* 04C98 80931268 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C -/* 04C9C 8093126C 000B6080 */ sll $t4, $t3, 2 -/* 04CA0 80931270 00AC2821 */ addu $a1, $a1, $t4 -/* 04CA4 80931274 8CA5785C */ lw $a1, %lo(D_8093785C)($a1) -/* 04CA8 80931278 0C029490 */ jal func_800A5240 +/* 04C9C 8093126C 000B6080 */ sll $t4, $t3, 2 +/* 04CA0 80931270 00AC2821 */ addu $a1, $a1, $t4 +/* 04CA4 80931274 8CA5785C */ lw $a1, %lo(D_8093785C)($a1) +/* 04CA8 80931278 0C029490 */ jal SkelAnime_ChangeAnimTransitionStop /* 04CAC 8093127C 3C064120 */ lui $a2, 0x4120 ## $a2 = 41200000 /* 04CB0 80931280 3C058094 */ lui $a1, %hi(D_80938C90) ## $a1 = 80940000 -/* 04CB4 80931284 8CA58C90 */ lw $a1, %lo(D_80938C90)($a1) +/* 04CB4 80931284 8CA58C90 */ lw $a1, %lo(D_80938C90)($a1) /* 04CB8 80931288 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 04CBC 8093128C 0C00B6EC */ jal func_8002DBB0 +/* 04CBC 8093128C 0C00B6EC */ jal func_8002DBB0 /* 04CC0 80931290 24A50024 */ addiu $a1, $a1, 0x0024 ## $a1 = 80940024 /* 04CC4 80931294 E60003C4 */ swc1 $f0, 0x03C4($s0) ## 000003C4 /* 04CC8 80931298 3C048094 */ lui $a0, %hi(D_80938C90) ## $a0 = 80940000 -/* 04CCC 8093129C 8C848C90 */ lw $a0, %lo(D_80938C90)($a0) -/* 04CD0 809312A0 0C00B6B0 */ jal func_8002DAC0 +/* 04CCC 8093129C 8C848C90 */ lw $a0, %lo(D_80938C90)($a0) +/* 04CD0 809312A0 0C00B6B0 */ jal func_8002DAC0 /* 04CD4 809312A4 26050024 */ addiu $a1, $s0, 0x0024 ## $a1 = 00000024 /* 04CD8 809312A8 82030194 */ lb $v1, 0x0194($s0) ## 00000194 /* 04CDC 809312AC 860D0016 */ lh $t5, 0x0016($s0) ## 00000016 /* 04CE0 809312B0 8E19011C */ lw $t9, 0x011C($s0) ## 0000011C -/* 04CE4 809312B4 00037080 */ sll $t6, $v1, 2 -/* 04CE8 809312B8 01C37023 */ subu $t6, $t6, $v1 -/* 04CEC 809312BC 000E72C0 */ sll $t6, $t6, 11 -/* 04CF0 809312C0 0003C380 */ sll $t8, $v1, 14 -/* 04CF4 809312C4 01AE7823 */ subu $t7, $t5, $t6 +/* 04CE4 809312B4 00037080 */ sll $t6, $v1, 2 +/* 04CE8 809312B8 01C37023 */ subu $t6, $t6, $v1 +/* 04CEC 809312BC 000E72C0 */ sll $t6, $t6, 11 +/* 04CF0 809312C0 0003C380 */ sll $t8, $v1, 14 +/* 04CF4 809312C4 01AE7823 */ subu $t7, $t5, $t6 /* 04CF8 809312C8 A6020032 */ sh $v0, 0x0032($s0) ## 00000032 /* 04CFC 809312CC A60F01A4 */ sh $t7, 0x01A4($s0) ## 000001A4 /* 04D00 809312D0 A61801A6 */ sh $t8, 0x01A6($s0) ## 000001A6 @@ -55,10 +55,10 @@ glabel func_80931210 /* 04D10 809312E0 25081300 */ addiu $t0, $t0, %lo(func_80931300) ## $t0 = 80931300 /* 04D14 809312E4 A3200195 */ sb $zero, 0x0195($t9) ## 00000195 /* 04D18 809312E8 AE080190 */ sw $t0, 0x0190($s0) ## 00000190 -/* 04D1C 809312EC 8FBF001C */ lw $ra, 0x001C($sp) -/* 04D20 809312F0 8FB00018 */ lw $s0, 0x0018($sp) +/* 04D1C 809312EC 8FBF001C */ lw $ra, 0x001C($sp) +/* 04D20 809312F0 8FB00018 */ lw $s0, 0x0018($sp) /* 04D24 809312F4 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 04D28 809312F8 03E00008 */ jr $ra +/* 04D28 809312F8 03E00008 */ jr $ra /* 04D2C 809312FC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_809314F0.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_809314F0.s index ef2e7421f3..f942fdf8ad 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_809314F0.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_809314F0.s @@ -1,31 +1,31 @@ glabel func_809314F0 /* 04F20 809314F0 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 04F24 809314F4 AFBF0014 */ sw $ra, 0x0014($sp) +/* 04F24 809314F4 AFBF0014 */ sw $ra, 0x0014($sp) /* 04F28 809314F8 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 /* 04F2C 809314FC 84EE001C */ lh $t6, 0x001C($a3) ## 0000001C /* 04F30 80931500 3C058093 */ lui $a1, %hi(D_80937854) ## $a1 = 80930000 -/* 04F34 80931504 AFA70018 */ sw $a3, 0x0018($sp) -/* 04F38 80931508 000E7880 */ sll $t7, $t6, 2 -/* 04F3C 8093150C 00AF2821 */ addu $a1, $a1, $t7 -/* 04F40 80931510 8CA57854 */ lw $a1, %lo(D_80937854)($a1) +/* 04F34 80931504 AFA70018 */ sw $a3, 0x0018($sp) +/* 04F38 80931508 000E7880 */ sll $t7, $t6, 2 +/* 04F3C 8093150C 00AF2821 */ addu $a1, $a1, $t7 +/* 04F40 80931510 8CA57854 */ lw $a1, %lo(D_80937854)($a1) /* 04F44 80931514 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 04F48 80931518 0C029490 */ jal func_800A5240 +/* 04F48 80931518 0C029490 */ jal SkelAnime_ChangeAnimTransitionStop /* 04F4C 8093151C 3C064040 */ lui $a2, 0x4040 ## $a2 = 40400000 -/* 04F50 80931520 8FA40018 */ lw $a0, 0x0018($sp) +/* 04F50 80931520 8FA40018 */ lw $a0, 0x0018($sp) /* 04F54 80931524 24180240 */ addiu $t8, $zero, 0x0240 ## $t8 = 00000240 /* 04F58 80931528 24050020 */ addiu $a1, $zero, 0x0020 ## $a1 = 00000020 /* 04F5C 8093152C A4800198 */ sh $zero, 0x0198($a0) ## 00000198 /* 04F60 80931530 A498019C */ sh $t8, 0x019C($a0) ## 0000019C /* 04F64 80931534 A480019A */ sh $zero, 0x019A($a0) ## 0000019A -/* 04F68 80931538 0C24CF20 */ jal func_80933C80 +/* 04F68 80931538 0C24CF20 */ jal func_80933C80 /* 04F6C 8093153C A0800195 */ sb $zero, 0x0195($a0) ## 00000195 -/* 04F70 80931540 8FA70018 */ lw $a3, 0x0018($sp) +/* 04F70 80931540 8FA70018 */ lw $a3, 0x0018($sp) /* 04F74 80931544 3C198093 */ lui $t9, %hi(func_80931560) ## $t9 = 80930000 /* 04F78 80931548 27391560 */ addiu $t9, $t9, %lo(func_80931560) ## $t9 = 80931560 /* 04F7C 8093154C ACF90190 */ sw $t9, 0x0190($a3) ## 00000190 -/* 04F80 80931550 8FBF0014 */ lw $ra, 0x0014($sp) +/* 04F80 80931550 8FBF0014 */ lw $ra, 0x0014($sp) /* 04F84 80931554 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 04F88 80931558 03E00008 */ jr $ra +/* 04F88 80931558 03E00008 */ jr $ra /* 04F8C 8093155C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80931788.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80931788.s index d0eb272758..9e59aa8c50 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80931788.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80931788.s @@ -1,31 +1,31 @@ glabel func_80931788 /* 051B8 80931788 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 051BC 8093178C AFBF0014 */ sw $ra, 0x0014($sp) +/* 051BC 8093178C AFBF0014 */ sw $ra, 0x0014($sp) /* 051C0 80931790 808F0194 */ lb $t7, 0x0194($a0) ## 00000194 /* 051C4 80931794 848E0016 */ lh $t6, 0x0016($a0) ## 00000016 /* 051C8 80931798 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 -/* 051CC 8093179C 000FC300 */ sll $t8, $t7, 12 -/* 051D0 809317A0 01D8C823 */ subu $t9, $t6, $t8 +/* 051CC 8093179C 000FC300 */ sll $t8, $t7, 12 +/* 051D0 809317A0 01D8C823 */ subu $t9, $t6, $t8 /* 051D4 809317A4 A49901A4 */ sh $t9, 0x01A4($a0) ## 000001A4 /* 051D8 809317A8 84E8001C */ lh $t0, 0x001C($a3) ## 0000001C /* 051DC 809317AC 3C058093 */ lui $a1, %hi(D_8093785C) ## $a1 = 80930000 -/* 051E0 809317B0 AFA70018 */ sw $a3, 0x0018($sp) -/* 051E4 809317B4 00084880 */ sll $t1, $t0, 2 -/* 051E8 809317B8 00A92821 */ addu $a1, $a1, $t1 -/* 051EC 809317BC 8CA5785C */ lw $a1, %lo(D_8093785C)($a1) +/* 051E0 809317B0 AFA70018 */ sw $a3, 0x0018($sp) +/* 051E4 809317B4 00084880 */ sll $t1, $t0, 2 +/* 051E8 809317B8 00A92821 */ addu $a1, $a1, $t1 +/* 051EC 809317BC 8CA5785C */ lw $a1, %lo(D_8093785C)($a1) /* 051F0 809317C0 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 051F4 809317C4 0C029490 */ jal func_800A5240 +/* 051F4 809317C4 0C029490 */ jal SkelAnime_ChangeAnimTransitionStop /* 051F8 809317C8 3C064120 */ lui $a2, 0x4120 ## $a2 = 41200000 -/* 051FC 809317CC 8FA70018 */ lw $a3, 0x0018($sp) +/* 051FC 809317CC 8FA70018 */ lw $a3, 0x0018($sp) /* 05200 809317D0 3C0C8093 */ lui $t4, %hi(func_809317F8) ## $t4 = 80930000 /* 05204 809317D4 258C17F8 */ addiu $t4, $t4, %lo(func_809317F8) ## $t4 = 809317F8 /* 05208 809317D8 90EA03E4 */ lbu $t2, 0x03E4($a3) ## 000003E4 /* 0520C 809317DC ACEC0190 */ sw $t4, 0x0190($a3) ## 00000190 /* 05210 809317E0 314BFFFC */ andi $t3, $t2, 0xFFFC ## $t3 = 00000000 /* 05214 809317E4 A0EB03E4 */ sb $t3, 0x03E4($a3) ## 000003E4 -/* 05218 809317E8 8FBF0014 */ lw $ra, 0x0014($sp) +/* 05218 809317E8 8FBF0014 */ lw $ra, 0x0014($sp) /* 0521C 809317EC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 05220 809317F0 03E00008 */ jr $ra +/* 05220 809317F0 03E00008 */ jr $ra /* 05224 809317F4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_809318A0.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_809318A0.s index 8000f11181..34c27d47b9 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_809318A0.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_809318A0.s @@ -1,37 +1,37 @@ glabel func_809318A0 /* 052D0 809318A0 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 052D4 809318A4 AFBF0014 */ sw $ra, 0x0014($sp) +/* 052D4 809318A4 AFBF0014 */ sw $ra, 0x0014($sp) /* 052D8 809318A8 848F001C */ lh $t7, 0x001C($a0) ## 0000001C /* 052DC 809318AC 3C018093 */ lui $at, %hi(D_8093746C) ## $at = 80930000 /* 052E0 809318B0 240E0007 */ addiu $t6, $zero, 0x0007 ## $t6 = 00000007 -/* 052E4 809318B4 000FC080 */ sll $t8, $t7, 2 -/* 052E8 809318B8 00380821 */ addu $at, $at, $t8 +/* 052E4 809318B4 000FC080 */ sll $t8, $t7, 2 +/* 052E8 809318B8 00380821 */ addu $at, $at, $t8 /* 052EC 809318BC 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 -/* 052F0 809318C0 AC2E746C */ sw $t6, %lo(D_8093746C)($at) +/* 052F0 809318C0 AC2E746C */ sw $t6, %lo(D_8093746C)($at) /* 052F4 809318C4 84F9001C */ lh $t9, 0x001C($a3) ## 0000001C /* 052F8 809318C8 3C058093 */ lui $a1, %hi(D_8093785C) ## $a1 = 80930000 -/* 052FC 809318CC AFA70018 */ sw $a3, 0x0018($sp) -/* 05300 809318D0 00194080 */ sll $t0, $t9, 2 -/* 05304 809318D4 00A82821 */ addu $a1, $a1, $t0 -/* 05308 809318D8 8CA5785C */ lw $a1, %lo(D_8093785C)($a1) +/* 052FC 809318CC AFA70018 */ sw $a3, 0x0018($sp) +/* 05300 809318D0 00194080 */ sll $t0, $t9, 2 +/* 05304 809318D4 00A82821 */ addu $a1, $a1, $t0 +/* 05308 809318D8 8CA5785C */ lw $a1, %lo(D_8093785C)($a1) /* 0530C 809318DC 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 05310 809318E0 0C029490 */ jal func_800A5240 +/* 05310 809318E0 0C029490 */ jal SkelAnime_ChangeAnimTransitionStop /* 05314 809318E4 3C064120 */ lui $a2, 0x4120 ## $a2 = 41200000 -/* 05318 809318E8 8FA70018 */ lw $a3, 0x0018($sp) +/* 05318 809318E8 8FA70018 */ lw $a3, 0x0018($sp) /* 0531C 809318EC 3C0B8093 */ lui $t3, %hi(func_80931928) ## $t3 = 80930000 /* 05320 809318F0 256B1928 */ addiu $t3, $t3, %lo(func_80931928) ## $t3 = 80931928 /* 05324 809318F4 80E20194 */ lb $v0, 0x0194($a3) ## 00000194 /* 05328 809318F8 ACEB0190 */ sw $t3, 0x0190($a3) ## 00000190 -/* 0532C 809318FC 00020823 */ subu $at, $zero, $v0 -/* 05330 80931900 00014880 */ sll $t1, $at, 2 -/* 05334 80931904 01214821 */ addu $t1, $t1, $at -/* 05338 80931908 00094B00 */ sll $t1, $t1, 12 -/* 0533C 8093190C 00025380 */ sll $t2, $v0, 14 +/* 0532C 809318FC 00020823 */ subu $at, $zero, $v0 +/* 05330 80931900 00014880 */ sll $t1, $at, 2 +/* 05334 80931904 01214821 */ addu $t1, $t1, $at +/* 05338 80931908 00094B00 */ sll $t1, $t1, 12 +/* 0533C 8093190C 00025380 */ sll $t2, $v0, 14 /* 05340 80931910 A4E901A4 */ sh $t1, 0x01A4($a3) ## 000001A4 /* 05344 80931914 A4EA01A6 */ sh $t2, 0x01A6($a3) ## 000001A6 -/* 05348 80931918 8FBF0014 */ lw $ra, 0x0014($sp) +/* 05348 80931918 8FBF0014 */ lw $ra, 0x0014($sp) /* 0534C 8093191C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 05350 80931920 03E00008 */ jr $ra +/* 05350 80931920 03E00008 */ jr $ra /* 05354 80931924 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_809319D0.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_809319D0.s index efc0cd4891..51fff4f9f8 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_809319D0.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_809319D0.s @@ -1,38 +1,38 @@ glabel func_809319D0 /* 05400 809319D0 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 05404 809319D4 AFBF0014 */ sw $ra, 0x0014($sp) +/* 05404 809319D4 AFBF0014 */ sw $ra, 0x0014($sp) /* 05408 809319D8 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 /* 0540C 809319DC 84EE001C */ lh $t6, 0x001C($a3) ## 0000001C /* 05410 809319E0 3C058093 */ lui $a1, %hi(D_80937864) ## $a1 = 80930000 -/* 05414 809319E4 AFA70018 */ sw $a3, 0x0018($sp) -/* 05418 809319E8 000E7880 */ sll $t7, $t6, 2 -/* 0541C 809319EC 00AF2821 */ addu $a1, $a1, $t7 -/* 05420 809319F0 8CA57864 */ lw $a1, %lo(D_80937864)($a1) +/* 05414 809319E4 AFA70018 */ sw $a3, 0x0018($sp) +/* 05418 809319E8 000E7880 */ sll $t7, $t6, 2 +/* 0541C 809319EC 00AF2821 */ addu $a1, $a1, $t7 +/* 05420 809319F0 8CA57864 */ lw $a1, %lo(D_80937864)($a1) /* 05424 809319F4 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 05428 809319F8 0C029490 */ jal func_800A5240 +/* 05428 809319F8 0C029490 */ jal SkelAnime_ChangeAnimTransitionStop /* 0542C 809319FC 3C0640A0 */ lui $a2, 0x40A0 ## $a2 = 40A00000 -/* 05430 80931A00 8FA40018 */ lw $a0, 0x0018($sp) +/* 05430 80931A00 8FA40018 */ lw $a0, 0x0018($sp) /* 05434 80931A04 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 /* 05438 80931A08 44812000 */ mtc1 $at, $f4 ## $f4 = 0.50 /* 0543C 80931A0C 80990194 */ lb $t9, 0x0194($a0) ## 00000194 /* 05440 80931A10 849800B6 */ lh $t8, 0x00B6($a0) ## 000000B6 /* 05444 80931A14 240B001E */ addiu $t3, $zero, 0x001E ## $t3 = 0000001E -/* 05448 80931A18 00194380 */ sll $t0, $t9, 14 -/* 0544C 80931A1C 03084821 */ addu $t1, $t8, $t0 +/* 05448 80931A18 00194380 */ sll $t0, $t9, 14 +/* 0544C 80931A1C 03084821 */ addu $t1, $t8, $t0 /* 05450 80931A20 A4890032 */ sh $t1, 0x0032($a0) ## 00000032 /* 05454 80931A24 848A0032 */ lh $t2, 0x0032($a0) ## 00000032 /* 05458 80931A28 24050020 */ addiu $a1, $zero, 0x0020 ## $a1 = 00000020 /* 0545C 80931A2C A48B0198 */ sh $t3, 0x0198($a0) ## 00000198 /* 05460 80931A30 E4840068 */ swc1 $f4, 0x0068($a0) ## 00000068 -/* 05464 80931A34 0C24CF20 */ jal func_80933C80 +/* 05464 80931A34 0C24CF20 */ jal func_80933C80 /* 05468 80931A38 A48A01A4 */ sh $t2, 0x01A4($a0) ## 000001A4 -/* 0546C 80931A3C 8FA70018 */ lw $a3, 0x0018($sp) +/* 0546C 80931A3C 8FA70018 */ lw $a3, 0x0018($sp) /* 05470 80931A40 3C0C8093 */ lui $t4, %hi(func_80931A5C) ## $t4 = 80930000 /* 05474 80931A44 258C1A5C */ addiu $t4, $t4, %lo(func_80931A5C) ## $t4 = 80931A5C /* 05478 80931A48 ACEC0190 */ sw $t4, 0x0190($a3) ## 00000190 -/* 0547C 80931A4C 8FBF0014 */ lw $ra, 0x0014($sp) +/* 0547C 80931A4C 8FBF0014 */ lw $ra, 0x0014($sp) /* 05480 80931A50 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 05484 80931A54 03E00008 */ jr $ra +/* 05484 80931A54 03E00008 */ jr $ra /* 05488 80931A58 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80931D04.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80931D04.s index e9bfb17e41..5b64a0a658 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80931D04.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80931D04.s @@ -1,25 +1,25 @@ glabel func_80931D04 /* 05734 80931D04 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 05738 80931D08 AFBF0014 */ sw $ra, 0x0014($sp) +/* 05738 80931D08 AFBF0014 */ sw $ra, 0x0014($sp) /* 0573C 80931D0C 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 /* 05740 80931D10 84EE001C */ lh $t6, 0x001C($a3) ## 0000001C /* 05744 80931D14 3C058093 */ lui $a1, %hi(D_8093786C) ## $a1 = 80930000 -/* 05748 80931D18 AFA70018 */ sw $a3, 0x0018($sp) -/* 0574C 80931D1C 000E7880 */ sll $t7, $t6, 2 -/* 05750 80931D20 00AF2821 */ addu $a1, $a1, $t7 -/* 05754 80931D24 8CA5786C */ lw $a1, %lo(D_8093786C)($a1) +/* 05748 80931D18 AFA70018 */ sw $a3, 0x0018($sp) +/* 0574C 80931D1C 000E7880 */ sll $t7, $t6, 2 +/* 05750 80931D20 00AF2821 */ addu $a1, $a1, $t7 +/* 05754 80931D24 8CA5786C */ lw $a1, %lo(D_8093786C)($a1) /* 05758 80931D28 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 0575C 80931D2C 0C0294D3 */ jal func_800A534C +/* 0575C 80931D2C 0C0294D3 */ jal SkelAnime_ChangeAnimTransitionRepeat /* 05760 80931D30 3C06C120 */ lui $a2, 0xC120 ## $a2 = C1200000 -/* 05764 80931D34 8FA70018 */ lw $a3, 0x0018($sp) +/* 05764 80931D34 8FA70018 */ lw $a3, 0x0018($sp) /* 05768 80931D38 3C198093 */ lui $t9, %hi(func_80931D5C) ## $t9 = 80930000 /* 0576C 80931D3C 24180014 */ addiu $t8, $zero, 0x0014 ## $t8 = 00000014 /* 05770 80931D40 27391D5C */ addiu $t9, $t9, %lo(func_80931D5C) ## $t9 = 80931D5C /* 05774 80931D44 A4F80198 */ sh $t8, 0x0198($a3) ## 00000198 /* 05778 80931D48 ACF90190 */ sw $t9, 0x0190($a3) ## 00000190 -/* 0577C 80931D4C 8FBF0014 */ lw $ra, 0x0014($sp) +/* 0577C 80931D4C 8FBF0014 */ lw $ra, 0x0014($sp) /* 05780 80931D50 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 05784 80931D54 03E00008 */ jr $ra +/* 05784 80931D54 03E00008 */ jr $ra /* 05788 80931D58 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80931E70.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80931E70.s index 38c076a640..765f3eecc8 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80931E70.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80931E70.s @@ -1,23 +1,23 @@ glabel func_80931E70 /* 058A0 80931E70 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 058A4 80931E74 AFBF0014 */ sw $ra, 0x0014($sp) +/* 058A4 80931E74 AFBF0014 */ sw $ra, 0x0014($sp) /* 058A8 80931E78 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 /* 058AC 80931E7C 84EE001C */ lh $t6, 0x001C($a3) ## 0000001C /* 058B0 80931E80 3C058093 */ lui $a1, %hi(D_80937854) ## $a1 = 80930000 -/* 058B4 80931E84 AFA70018 */ sw $a3, 0x0018($sp) -/* 058B8 80931E88 000E7880 */ sll $t7, $t6, 2 -/* 058BC 80931E8C 00AF2821 */ addu $a1, $a1, $t7 -/* 058C0 80931E90 8CA57854 */ lw $a1, %lo(D_80937854)($a1) +/* 058B4 80931E84 AFA70018 */ sw $a3, 0x0018($sp) +/* 058B8 80931E88 000E7880 */ sll $t7, $t6, 2 +/* 058BC 80931E8C 00AF2821 */ addu $a1, $a1, $t7 +/* 058C0 80931E90 8CA57854 */ lw $a1, %lo(D_80937854)($a1) /* 058C4 80931E94 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 058C8 80931E98 0C029490 */ jal func_800A5240 +/* 058C8 80931E98 0C029490 */ jal SkelAnime_ChangeAnimTransitionStop /* 058CC 80931E9C 3C064120 */ lui $a2, 0x4120 ## $a2 = 41200000 -/* 058D0 80931EA0 8FA70018 */ lw $a3, 0x0018($sp) +/* 058D0 80931EA0 8FA70018 */ lw $a3, 0x0018($sp) /* 058D4 80931EA4 3C188093 */ lui $t8, %hi(func_80931EC0) ## $t8 = 80930000 /* 058D8 80931EA8 27181EC0 */ addiu $t8, $t8, %lo(func_80931EC0) ## $t8 = 80931EC0 /* 058DC 80931EAC ACF80190 */ sw $t8, 0x0190($a3) ## 00000190 -/* 058E0 80931EB0 8FBF0014 */ lw $ra, 0x0014($sp) +/* 058E0 80931EB0 8FBF0014 */ lw $ra, 0x0014($sp) /* 058E4 80931EB4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 058E8 80931EB8 03E00008 */ jr $ra +/* 058E8 80931EB8 03E00008 */ jr $ra /* 058EC 80931EBC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80931F84.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80931F84.s index 10feba0df1..821ac7e063 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80931F84.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80931F84.s @@ -1,61 +1,61 @@ glabel func_80931F84 /* 059B4 80931F84 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 059B8 80931F88 AFB0001C */ sw $s0, 0x001C($sp) +/* 059B8 80931F88 AFB0001C */ sw $s0, 0x001C($sp) /* 059BC 80931F8C 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 059C0 80931F90 AFBF0024 */ sw $ra, 0x0024($sp) -/* 059C4 80931F94 AFB10020 */ sw $s1, 0x0020($sp) -/* 059C8 80931F98 AFA50034 */ sw $a1, 0x0034($sp) +/* 059C0 80931F90 AFBF0024 */ sw $ra, 0x0024($sp) +/* 059C4 80931F94 AFB10020 */ sw $s1, 0x0020($sp) +/* 059C8 80931F98 AFA50034 */ sw $a1, 0x0034($sp) /* 059CC 80931F9C 86060198 */ lh $a2, 0x0198($s0) ## 00000198 /* 059D0 80931FA0 8CB11C44 */ lw $s1, 0x1C44($a1) ## 00001C44 /* 059D4 80931FA4 860501A2 */ lh $a1, 0x01A2($s0) ## 000001A2 -/* 059D8 80931FA8 00C00821 */ addu $at, $a2, $zero -/* 059DC 80931FAC 000630C0 */ sll $a2, $a2, 3 -/* 059E0 80931FB0 00C13023 */ subu $a2, $a2, $at -/* 059E4 80931FB4 000630C0 */ sll $a2, $a2, 3 -/* 059E8 80931FB8 00C13021 */ addu $a2, $a2, $at -/* 059EC 80931FBC 00063080 */ sll $a2, $a2, 2 +/* 059D8 80931FA8 00C00821 */ addu $at, $a2, $zero +/* 059DC 80931FAC 000630C0 */ sll $a2, $a2, 3 +/* 059E0 80931FB0 00C13023 */ subu $a2, $a2, $at +/* 059E4 80931FB4 000630C0 */ sll $a2, $a2, 3 +/* 059E8 80931FB8 00C13021 */ addu $a2, $a2, $at +/* 059EC 80931FBC 00063080 */ sll $a2, $a2, 2 /* 059F0 80931FC0 24C601C8 */ addiu $a2, $a2, 0x01C8 ## $a2 = 000001C8 -/* 059F4 80931FC4 00063400 */ sll $a2, $a2, 16 -/* 059F8 80931FC8 00063403 */ sra $a2, $a2, 16 +/* 059F4 80931FC4 00063400 */ sll $a2, $a2, 16 +/* 059F8 80931FC8 00063403 */ sra $a2, $a2, 16 /* 059FC 80931FCC 0C01DE2B */ jal Math_ApproxUpdateScaledS - + /* 05A00 80931FD0 248400B4 */ addiu $a0, $a0, 0x00B4 ## $a0 = 000000B4 -/* 05A04 80931FD4 50400027 */ beql $v0, $zero, .L80932074 +/* 05A04 80931FD4 50400027 */ beql $v0, $zero, .L80932074 /* 05A08 80931FD8 860400B4 */ lh $a0, 0x00B4($s0) ## 000000B4 /* 05A0C 80931FDC 860F01A2 */ lh $t7, 0x01A2($s0) ## 000001A2 -/* 05A10 80931FE0 51E00010 */ beql $t7, $zero, .L80932024 +/* 05A10 80931FE0 51E00010 */ beql $t7, $zero, .L80932024 /* 05A14 80931FE4 86020198 */ lh $v0, 0x0198($s0) ## 00000198 /* 05A18 80931FE8 86180198 */ lh $t8, 0x0198($s0) ## 00000198 /* 05A1C 80931FEC 24010004 */ addiu $at, $zero, 0x0004 ## $at = 00000004 /* 05A20 80931FF0 A60001A2 */ sh $zero, 0x01A2($s0) ## 000001A2 -/* 05A24 80931FF4 1701001E */ bne $t8, $at, .L80932070 +/* 05A24 80931FF4 1701001E */ bne $t8, $at, .L80932070 /* 05A28 80931FF8 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C /* 05A2C 80931FFC 8619001C */ lh $t9, 0x001C($s0) ## 0000001C /* 05A30 80932000 3C058093 */ lui $a1, %hi(D_80937854) ## $a1 = 80930000 /* 05A34 80932004 3C064080 */ lui $a2, 0x4080 ## $a2 = 40800000 -/* 05A38 80932008 00194080 */ sll $t0, $t9, 2 -/* 05A3C 8093200C 00A82821 */ addu $a1, $a1, $t0 -/* 05A40 80932010 0C029490 */ jal func_800A5240 -/* 05A44 80932014 8CA57854 */ lw $a1, %lo(D_80937854)($a1) -/* 05A48 80932018 10000016 */ beq $zero, $zero, .L80932074 +/* 05A38 80932008 00194080 */ sll $t0, $t9, 2 +/* 05A3C 8093200C 00A82821 */ addu $a1, $a1, $t0 +/* 05A40 80932010 0C029490 */ jal SkelAnime_ChangeAnimTransitionStop +/* 05A44 80932014 8CA57854 */ lw $a1, %lo(D_80937854)($a1) +/* 05A48 80932018 10000016 */ beq $zero, $zero, .L80932074 /* 05A4C 8093201C 860400B4 */ lh $a0, 0x00B4($s0) ## 000000B4 /* 05A50 80932020 86020198 */ lh $v0, 0x0198($s0) ## 00000198 .L80932024: /* 05A54 80932024 24010004 */ addiu $at, $zero, 0x0004 ## $at = 00000004 /* 05A58 80932028 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 05A5C 8093202C 54410007 */ bnel $v0, $at, .L8093204C +/* 05A5C 8093202C 54410007 */ bnel $v0, $at, .L8093204C /* 05A60 80932030 24010003 */ addiu $at, $zero, 0x0003 ## $at = 00000003 /* 05A64 80932034 A62000B4 */ sh $zero, 0x00B4($s1) ## 000000B4 -/* 05A68 80932038 0C24C11D */ jal func_80930474 +/* 05A68 80932038 0C24C11D */ jal func_80930474 /* 05A6C 8093203C A62000B8 */ sh $zero, 0x00B8($s1) ## 000000B8 -/* 05A70 80932040 10000098 */ beq $zero, $zero, .L809322A4 -/* 05A74 80932044 8FBF0024 */ lw $ra, 0x0024($sp) +/* 05A70 80932040 10000098 */ beq $zero, $zero, .L809322A4 +/* 05A74 80932044 8FBF0024 */ lw $ra, 0x0024($sp) /* 05A78 80932048 24010003 */ addiu $at, $zero, 0x0003 ## $at = 00000003 .L8093204C: -/* 05A7C 8093204C 14410004 */ bne $v0, $at, .L80932060 +/* 05A7C 8093204C 14410004 */ bne $v0, $at, .L80932060 /* 05A80 80932050 240AC000 */ addiu $t2, $zero, 0xC000 ## $t2 = FFFFC000 /* 05A84 80932054 2409A000 */ addiu $t1, $zero, 0xA000 ## $t1 = FFFFA000 -/* 05A88 80932058 10000002 */ beq $zero, $zero, .L80932064 +/* 05A88 80932058 10000002 */ beq $zero, $zero, .L80932064 /* 05A8C 8093205C A60901A2 */ sh $t1, 0x01A2($s0) ## 000001A2 .L80932060: /* 05A90 80932060 A60A01A2 */ sh $t2, 0x01A2($s0) ## 000001A2 @@ -67,66 +67,66 @@ glabel func_80931F84 /* 05AA0 80932070 860400B4 */ lh $a0, 0x00B4($s0) ## 000000B4 .L80932074: /* 05AA4 80932074 24844000 */ addiu $a0, $a0, 0x4000 ## $a0 = 00004000 -/* 05AA8 80932078 00042400 */ sll $a0, $a0, 16 +/* 05AA8 80932078 00042400 */ sll $a0, $a0, 16 /* 05AAC 8093207C 0C01DE0D */ jal Math_Coss ## coss? -/* 05AB0 80932080 00042403 */ sra $a0, $a0, 16 +/* 05AB0 80932080 00042403 */ sra $a0, $a0, 16 /* 05AB4 80932084 3C014348 */ lui $at, 0x4348 ## $at = 43480000 /* 05AB8 80932088 44812000 */ mtc1 $at, $f4 ## $f4 = 200.00 /* 05ABC 8093208C C60803CC */ lwc1 $f8, 0x03CC($s0) ## 000003CC /* 05AC0 80932090 860400B4 */ lh $a0, 0x00B4($s0) ## 000000B4 -/* 05AC4 80932094 46040182 */ mul.s $f6, $f0, $f4 +/* 05AC4 80932094 46040182 */ mul.s $f6, $f0, $f4 /* 05AC8 80932098 24844000 */ addiu $a0, $a0, 0x4000 ## $a0 = 00004000 -/* 05ACC 8093209C 00042400 */ sll $a0, $a0, 16 -/* 05AD0 809320A0 00042403 */ sra $a0, $a0, 16 -/* 05AD4 809320A4 46083280 */ add.s $f10, $f6, $f8 +/* 05ACC 8093209C 00042400 */ sll $a0, $a0, 16 +/* 05AD0 809320A0 00042403 */ sra $a0, $a0, 16 +/* 05AD4 809320A4 46083280 */ add.s $f10, $f6, $f8 /* 05AD8 809320A8 0C01DE1C */ jal Math_Sins ## sins? /* 05ADC 809320AC E60A0028 */ swc1 $f10, 0x0028($s0) ## 00000028 /* 05AE0 809320B0 3C014348 */ lui $at, 0x4348 ## $at = 43480000 /* 05AE4 809320B4 44818000 */ mtc1 $at, $f16 ## $f16 = 200.00 /* 05AE8 809320B8 00000000 */ nop -/* 05AEC 809320BC 46100482 */ mul.s $f18, $f0, $f16 -/* 05AF0 809320C0 E7B20028 */ swc1 $f18, 0x0028($sp) +/* 05AEC 809320BC 46100482 */ mul.s $f18, $f0, $f16 +/* 05AF0 809320C0 E7B20028 */ swc1 $f18, 0x0028($sp) /* 05AF4 809320C4 0C01DE1C */ jal Math_Sins ## sins? /* 05AF8 809320C8 860400B6 */ lh $a0, 0x00B6($s0) ## 000000B6 -/* 05AFC 809320CC C7A40028 */ lwc1 $f4, 0x0028($sp) +/* 05AFC 809320CC C7A40028 */ lwc1 $f4, 0x0028($sp) /* 05B00 809320D0 C60803C8 */ lwc1 $f8, 0x03C8($s0) ## 000003C8 /* 05B04 809320D4 860400B6 */ lh $a0, 0x00B6($s0) ## 000000B6 -/* 05B08 809320D8 46040182 */ mul.s $f6, $f0, $f4 -/* 05B0C 809320DC 46083280 */ add.s $f10, $f6, $f8 +/* 05B08 809320D8 46040182 */ mul.s $f6, $f0, $f4 +/* 05B0C 809320DC 46083280 */ add.s $f10, $f6, $f8 /* 05B10 809320E0 0C01DE0D */ jal Math_Coss ## coss? /* 05B14 809320E4 E60A0024 */ swc1 $f10, 0x0024($s0) ## 00000024 -/* 05B18 809320E8 C7B00028 */ lwc1 $f16, 0x0028($sp) +/* 05B18 809320E8 C7B00028 */ lwc1 $f16, 0x0028($sp) /* 05B1C 809320EC C60403D0 */ lwc1 $f4, 0x03D0($s0) ## 000003D0 /* 05B20 809320F0 860D0198 */ lh $t5, 0x0198($s0) ## 00000198 -/* 05B24 809320F4 46100482 */ mul.s $f18, $f0, $f16 +/* 05B24 809320F4 46100482 */ mul.s $f18, $f0, $f16 /* 05B28 809320F8 24010004 */ addiu $at, $zero, 0x0004 ## $at = 00000004 /* 05B2C 809320FC 260400B8 */ addiu $a0, $s0, 0x00B8 ## $a0 = 000000B8 /* 05B30 80932100 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 05B34 80932104 46049180 */ add.s $f6, $f18, $f4 -/* 05B38 80932108 11A10009 */ beq $t5, $at, .L80932130 +/* 05B34 80932104 46049180 */ add.s $f6, $f18, $f4 +/* 05B38 80932108 11A10009 */ beq $t5, $at, .L80932130 /* 05B3C 8093210C E606002C */ swc1 $f6, 0x002C($s0) ## 0000002C /* 05B40 80932110 860E00B4 */ lh $t6, 0x00B4($s0) ## 000000B4 /* 05B44 80932114 82180194 */ lb $t8, 0x0194($s0) ## 00000194 /* 05B48 80932118 25CF4000 */ addiu $t7, $t6, 0x4000 ## $t7 = 00004000 -/* 05B4C 8093211C 01F80019 */ multu $t7, $t8 -/* 05B50 80932120 0000C812 */ mflo $t9 +/* 05B4C 8093211C 01F80019 */ multu $t7, $t8 +/* 05B50 80932120 0000C812 */ mflo $t9 /* 05B54 80932124 A61900B8 */ sh $t9, 0x00B8($s0) ## 000000B8 -/* 05B58 80932128 10000004 */ beq $zero, $zero, .L8093213C +/* 05B58 80932128 10000004 */ beq $zero, $zero, .L8093213C /* 05B5C 8093212C 8E280680 */ lw $t0, 0x0680($s1) ## 00000680 .L80932130: /* 05B60 80932130 0C01DE2B */ jal Math_ApproxUpdateScaledS - + /* 05B64 80932134 24060800 */ addiu $a2, $zero, 0x0800 ## $a2 = 00000800 /* 05B68 80932138 8E280680 */ lw $t0, 0x0680($s1) ## 00000680 .L8093213C: /* 05B6C 8093213C 262400B4 */ addiu $a0, $s1, 0x00B4 ## $a0 = 000000B4 /* 05B70 80932140 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 05B74 80932144 31090080 */ andi $t1, $t0, 0x0080 ## $t1 = 00000000 -/* 05B78 80932148 1120000E */ beq $t1, $zero, .L80932184 +/* 05B78 80932148 1120000E */ beq $t1, $zero, .L80932184 /* 05B7C 8093214C 00000000 */ nop /* 05B80 80932150 A6200850 */ sh $zero, 0x0850($s1) ## 00000850 /* 05B84 80932154 26240024 */ addiu $a0, $s1, 0x0024 ## $a0 = 00000024 @@ -137,19 +137,19 @@ glabel func_80931F84 /* 05B94 80932164 A62A00B4 */ sh $t2, 0x00B4($s1) ## 000000B4 /* 05B98 80932168 820B0194 */ lb $t3, 0x0194($s0) ## 00000194 /* 05B9C 8093216C 860D00B8 */ lh $t5, 0x00B8($s0) ## 000000B8 -/* 05BA0 80932170 000B0823 */ subu $at, $zero, $t3 -/* 05BA4 80932174 00016380 */ sll $t4, $at, 14 -/* 05BA8 80932178 018D7021 */ addu $t6, $t4, $t5 -/* 05BAC 8093217C 10000017 */ beq $zero, $zero, .L809321DC +/* 05BA0 80932170 000B0823 */ subu $at, $zero, $t3 +/* 05BA4 80932174 00016380 */ sll $t4, $at, 14 +/* 05BA8 80932178 018D7021 */ addu $t6, $t4, $t5 +/* 05BAC 8093217C 10000017 */ beq $zero, $zero, .L809321DC /* 05BB0 80932180 A62E00B8 */ sh $t6, 0x00B8($s1) ## 000000B8 .L80932184: /* 05BB4 80932184 0C01DE2B */ jal Math_ApproxUpdateScaledS - + /* 05BB8 80932188 24060600 */ addiu $a2, $zero, 0x0600 ## $a2 = 00000600 /* 05BBC 8093218C 262400B8 */ addiu $a0, $s1, 0x00B8 ## $a0 = 000000B8 /* 05BC0 80932190 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 05BC4 80932194 0C01DE2B */ jal Math_ApproxUpdateScaledS - + /* 05BC8 80932198 24060600 */ addiu $a2, $zero, 0x0600 ## $a2 = 00000600 /* 05BCC 8093219C 0C01DE1C */ jal Math_Sins ## sins? @@ -157,8 +157,8 @@ glabel func_80931F84 /* 05BD4 809321A4 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 /* 05BD8 809321A8 44815000 */ mtc1 $at, $f10 ## $f10 = 20.00 /* 05BDC 809321AC C6280024 */ lwc1 $f8, 0x0024($s1) ## 00000024 -/* 05BE0 809321B0 46005402 */ mul.s $f16, $f10, $f0 -/* 05BE4 809321B4 46104480 */ add.s $f18, $f8, $f16 +/* 05BE0 809321B0 46005402 */ mul.s $f16, $f10, $f0 +/* 05BE4 809321B4 46104480 */ add.s $f18, $f8, $f16 /* 05BE8 809321B8 E6320024 */ swc1 $f18, 0x0024($s1) ## 00000024 /* 05BEC 809321BC 0C01DE0D */ jal Math_Coss ## coss? @@ -166,29 +166,29 @@ glabel func_80931F84 /* 05BF4 809321C4 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 /* 05BF8 809321C8 44813000 */ mtc1 $at, $f6 ## $f6 = 20.00 /* 05BFC 809321CC C624002C */ lwc1 $f4, 0x002C($s1) ## 0000002C -/* 05C00 809321D0 46003282 */ mul.s $f10, $f6, $f0 -/* 05C04 809321D4 460A2200 */ add.s $f8, $f4, $f10 +/* 05C00 809321D0 46003282 */ mul.s $f10, $f6, $f0 +/* 05C04 809321D4 460A2200 */ add.s $f8, $f4, $f10 /* 05C08 809321D8 E628002C */ swc1 $f8, 0x002C($s1) ## 0000002C .L809321DC: /* 05C0C 809321DC 860F0198 */ lh $t7, 0x0198($s0) ## 00000198 /* 05C10 809321E0 24010004 */ addiu $at, $zero, 0x0004 ## $at = 00000004 -/* 05C14 809321E4 55E1002C */ bnel $t7, $at, .L80932298 +/* 05C14 809321E4 55E1002C */ bnel $t7, $at, .L80932298 /* 05C18 809321E8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 05C1C 809321EC 861801A2 */ lh $t8, 0x01A2($s0) ## 000001A2 -/* 05C20 809321F0 57000029 */ bnel $t8, $zero, .L80932298 +/* 05C20 809321F0 57000029 */ bnel $t8, $zero, .L80932298 /* 05C24 809321F4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 05C28 809321F8 0C02927F */ jal SkelAnime_FrameUpdateMatrix - + /* 05C2C 809321FC 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C -/* 05C30 80932200 50400025 */ beql $v0, $zero, .L80932298 +/* 05C30 80932200 50400025 */ beql $v0, $zero, .L80932298 /* 05C34 80932204 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 05C38 80932208 8E390680 */ lw $t9, 0x0680($s1) ## 00000680 /* 05C3C 8093220C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 05C40 80932210 8FA50034 */ lw $a1, 0x0034($sp) +/* 05C40 80932210 8FA50034 */ lw $a1, 0x0034($sp) /* 05C44 80932214 33280080 */ andi $t0, $t9, 0x0080 ## $t0 = 00000000 -/* 05C48 80932218 5100001F */ beql $t0, $zero, .L80932298 +/* 05C48 80932218 5100001F */ beql $t0, $zero, .L80932298 /* 05C4C 8093221C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 05C50 80932220 0C24CE5E */ jal func_80933978 +/* 05C50 80932220 0C24CE5E */ jal func_80933978 /* 05C54 80932224 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 /* 05C58 80932228 0C01DE1C */ jal Math_Sins ## sins? @@ -196,8 +196,8 @@ glabel func_80931F84 /* 05C60 80932230 3C01428C */ lui $at, 0x428C ## $at = 428C0000 /* 05C64 80932234 44819000 */ mtc1 $at, $f18 ## $f18 = 70.00 /* 05C68 80932238 C6300024 */ lwc1 $f16, 0x0024($s1) ## 00000024 -/* 05C6C 8093223C 46009182 */ mul.s $f6, $f18, $f0 -/* 05C70 80932240 46068100 */ add.s $f4, $f16, $f6 +/* 05C6C 8093223C 46009182 */ mul.s $f6, $f18, $f0 +/* 05C70 80932240 46068100 */ add.s $f4, $f16, $f6 /* 05C74 80932244 E6240024 */ swc1 $f4, 0x0024($s1) ## 00000024 /* 05C78 80932248 0C01DE0D */ jal Math_Coss ## coss? @@ -206,28 +206,28 @@ glabel func_80931F84 /* 05C84 80932254 44814000 */ mtc1 $at, $f8 ## $f8 = 70.00 /* 05C88 80932258 C62A002C */ lwc1 $f10, 0x002C($s1) ## 0000002C /* 05C8C 8093225C 3C014000 */ lui $at, 0x4000 ## $at = 40000000 -/* 05C90 80932260 46004482 */ mul.s $f18, $f8, $f0 +/* 05C90 80932260 46004482 */ mul.s $f18, $f8, $f0 /* 05C94 80932264 44813000 */ mtc1 $at, $f6 ## $f6 = 2.00 /* 05C98 80932268 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 05C9C 8093226C 3C064170 */ lui $a2, 0x4170 ## $a2 = 41700000 -/* 05CA0 80932270 46125400 */ add.s $f16, $f10, $f18 +/* 05CA0 80932270 46125400 */ add.s $f16, $f10, $f18 /* 05CA4 80932274 E630002C */ swc1 $f16, 0x002C($s1) ## 0000002C /* 05CA8 80932278 860700B6 */ lh $a3, 0x00B6($s0) ## 000000B6 -/* 05CAC 8093227C 8FA40034 */ lw $a0, 0x0034($sp) -/* 05CB0 80932280 0C00BDC7 */ jal func_8002F71C -/* 05CB4 80932284 E7A60010 */ swc1 $f6, 0x0010($sp) +/* 05CAC 8093227C 8FA40034 */ lw $a0, 0x0034($sp) +/* 05CB0 80932280 0C00BDC7 */ jal func_8002F71C +/* 05CB4 80932284 E7A60010 */ swc1 $f6, 0x0010($sp) /* 05CB8 80932288 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 05CBC 8093228C 0C00BDF7 */ jal func_8002F7DC +/* 05CBC 8093228C 0C00BDF7 */ jal func_8002F7DC /* 05CC0 80932290 2405083E */ addiu $a1, $zero, 0x083E ## $a1 = 0000083E /* 05CC4 80932294 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 .L80932298: -/* 05CC8 80932298 0C00BE5D */ jal func_8002F974 +/* 05CC8 80932298 0C00BE5D */ jal func_8002F974 /* 05CCC 8093229C 24053167 */ addiu $a1, $zero, 0x3167 ## $a1 = 00003167 -/* 05CD0 809322A0 8FBF0024 */ lw $ra, 0x0024($sp) +/* 05CD0 809322A0 8FBF0024 */ lw $ra, 0x0024($sp) .L809322A4: -/* 05CD4 809322A4 8FB0001C */ lw $s0, 0x001C($sp) -/* 05CD8 809322A8 8FB10020 */ lw $s1, 0x0020($sp) -/* 05CDC 809322AC 03E00008 */ jr $ra +/* 05CD4 809322A4 8FB0001C */ lw $s0, 0x001C($sp) +/* 05CD8 809322A8 8FB10020 */ lw $s1, 0x0020($sp) +/* 05CDC 809322AC 03E00008 */ jr $ra /* 05CE0 809322B0 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_809322B4.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_809322B4.s index eedaae67a3..710cb2fc70 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_809322B4.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_809322B4.s @@ -1,21 +1,21 @@ glabel func_809322B4 /* 05CE4 809322B4 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 05CE8 809322B8 AFBF0024 */ sw $ra, 0x0024($sp) -/* 05CEC 809322BC AFB00020 */ sw $s0, 0x0020($sp) +/* 05CE8 809322B8 AFBF0024 */ sw $ra, 0x0024($sp) +/* 05CEC 809322BC AFB00020 */ sw $s0, 0x0020($sp) /* 05CF0 809322C0 848F001C */ lh $t7, 0x001C($a0) ## 0000001C /* 05CF4 809322C4 3C018093 */ lui $at, %hi(D_8093746C) ## $at = 80930000 /* 05CF8 809322C8 240E0008 */ addiu $t6, $zero, 0x0008 ## $t6 = 00000008 -/* 05CFC 809322CC 000FC080 */ sll $t8, $t7, 2 -/* 05D00 809322D0 00380821 */ addu $at, $at, $t8 +/* 05CFC 809322CC 000FC080 */ sll $t8, $t7, 2 +/* 05D00 809322D0 00380821 */ addu $at, $at, $t8 /* 05D04 809322D4 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 05D08 809322D8 AC2E746C */ sw $t6, %lo(D_8093746C)($at) +/* 05D08 809322D8 AC2E746C */ sw $t6, %lo(D_8093746C)($at) /* 05D0C 809322DC 8619001C */ lh $t9, 0x001C($s0) ## 0000001C /* 05D10 809322E0 3C058093 */ lui $a1, %hi(D_80937854) ## $a1 = 80930000 /* 05D14 809322E4 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 05D18 809322E8 00194080 */ sll $t0, $t9, 2 -/* 05D1C 809322EC 00A82821 */ addu $a1, $a1, $t0 -/* 05D20 809322F0 8CA57854 */ lw $a1, %lo(D_80937854)($a1) -/* 05D24 809322F4 0C029490 */ jal func_800A5240 +/* 05D18 809322E8 00194080 */ sll $t0, $t9, 2 +/* 05D1C 809322EC 00A82821 */ addu $a1, $a1, $t0 +/* 05D20 809322F0 8CA57854 */ lw $a1, %lo(D_80937854)($a1) +/* 05D24 809322F4 0C029490 */ jal SkelAnime_ChangeAnimTransitionStop /* 05D28 809322F8 3C064080 */ lui $a2, 0x4080 ## $a2 = 40800000 /* 05D2C 809322FC 24090024 */ addiu $t1, $zero, 0x0024 ## $t1 = 00000024 /* 05D30 80932300 A6090198 */ sh $t1, 0x0198($s0) ## 00000198 @@ -24,19 +24,19 @@ glabel func_809322B4 ## Vec3f_Copy /* 05D3C 8093230C 26050024 */ addiu $a1, $s0, 0x0024 ## $a1 = 00000024 /* 05D40 80932310 240A00C8 */ addiu $t2, $zero, 0x00C8 ## $t2 = 000000C8 -/* 05D44 80932314 AFAA0010 */ sw $t2, 0x0010($sp) +/* 05D44 80932314 AFAA0010 */ sw $t2, 0x0010($sp) /* 05D48 80932318 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 05D4C 8093231C 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 05D50 80932320 240600FF */ addiu $a2, $zero, 0x00FF ## $a2 = 000000FF -/* 05D54 80932324 0C00D09B */ jal func_8003426C +/* 05D54 80932324 0C00D09B */ jal func_8003426C /* 05D58 80932328 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 /* 05D5C 8093232C 3C0B8093 */ lui $t3, %hi(func_8093234C) ## $t3 = 80930000 /* 05D60 80932330 256B234C */ addiu $t3, $t3, %lo(func_8093234C) ## $t3 = 8093234C /* 05D64 80932334 AE0B0190 */ sw $t3, 0x0190($s0) ## 00000190 -/* 05D68 80932338 8FBF0024 */ lw $ra, 0x0024($sp) -/* 05D6C 8093233C 8FB00020 */ lw $s0, 0x0020($sp) +/* 05D68 80932338 8FBF0024 */ lw $ra, 0x0024($sp) +/* 05D6C 8093233C 8FB00020 */ lw $s0, 0x0020($sp) /* 05D70 80932340 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 05D74 80932344 03E00008 */ jr $ra +/* 05D74 80932344 03E00008 */ jr $ra /* 05D78 80932348 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8093234C.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8093234C.s index f21a58f5aa..db2aeea66c 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8093234C.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8093234C.s @@ -1,101 +1,101 @@ glabel func_8093234C /* 05D7C 8093234C 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 05D80 80932350 AFB00018 */ sw $s0, 0x0018($sp) +/* 05D80 80932350 AFB00018 */ sw $s0, 0x0018($sp) /* 05D84 80932354 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 05D88 80932358 AFBF001C */ sw $ra, 0x001C($sp) +/* 05D88 80932358 AFBF001C */ sw $ra, 0x001C($sp) /* 05D8C 8093235C 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 05D90 80932360 AFA5002C */ sw $a1, 0x002C($sp) +/* 05D90 80932360 AFA5002C */ sw $a1, 0x002C($sp) /* 05D94 80932364 0C02927F */ jal SkelAnime_FrameUpdateMatrix - -/* 05D98 80932368 AFA40020 */ sw $a0, 0x0020($sp) + +/* 05D98 80932368 AFA40020 */ sw $a0, 0x0020($sp) /* 05D9C 8093236C 86020198 */ lh $v0, 0x0198($s0) ## 00000198 -/* 05DA0 80932370 8FA40020 */ lw $a0, 0x0020($sp) -/* 05DA4 80932374 10400003 */ beq $v0, $zero, .L80932384 +/* 05DA0 80932370 8FA40020 */ lw $a0, 0x0020($sp) +/* 05DA4 80932374 10400003 */ beq $v0, $zero, .L80932384 /* 05DA8 80932378 244EFFFF */ addiu $t6, $v0, 0xFFFF ## $t6 = FFFFFFFF /* 05DAC 8093237C A60E0198 */ sh $t6, 0x0198($s0) ## 00000198 /* 05DB0 80932380 86020198 */ lh $v0, 0x0198($s0) ## 00000198 .L80932384: -/* 05DB4 80932384 04410004 */ bgez $v0, .L80932398 +/* 05DB4 80932384 04410004 */ bgez $v0, .L80932398 /* 05DB8 80932388 304F0003 */ andi $t7, $v0, 0x0003 ## $t7 = 00000000 -/* 05DBC 8093238C 11E00002 */ beq $t7, $zero, .L80932398 +/* 05DBC 8093238C 11E00002 */ beq $t7, $zero, .L80932398 /* 05DC0 80932390 00000000 */ nop /* 05DC4 80932394 25EFFFFC */ addiu $t7, $t7, 0xFFFC ## $t7 = FFFFFFFC .L80932398: -/* 05DC8 80932398 55E00019 */ bnel $t7, $zero, .L80932400 +/* 05DC8 80932398 55E00019 */ bnel $t7, $zero, .L80932400 /* 05DCC 8093239C 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 -/* 05DD0 809323A0 04410004 */ bgez $v0, .L809323B4 +/* 05DD0 809323A0 04410004 */ bgez $v0, .L809323B4 /* 05DD4 809323A4 30580007 */ andi $t8, $v0, 0x0007 ## $t8 = 00000000 -/* 05DD8 809323A8 13000002 */ beq $t8, $zero, .L809323B4 +/* 05DD8 809323A8 13000002 */ beq $t8, $zero, .L809323B4 /* 05DDC 809323AC 00000000 */ nop /* 05DE0 809323B0 2718FFF8 */ addiu $t8, $t8, 0xFFF8 ## $t8 = FFFFFFF8 .L809323B4: -/* 05DE4 809323B4 5300000B */ beql $t8, $zero, .L809323E4 +/* 05DE4 809323B4 5300000B */ beql $t8, $zero, .L809323E4 /* 05DE8 809323B8 8609001C */ lh $t1, 0x001C($s0) ## 0000001C /* 05DEC 809323BC 8619001C */ lh $t9, 0x001C($s0) ## 0000001C /* 05DF0 809323C0 3C058093 */ lui $a1, %hi(D_80937854) ## $a1 = 80930000 /* 05DF4 809323C4 3C064080 */ lui $a2, 0x4080 ## $a2 = 40800000 -/* 05DF8 809323C8 00194080 */ sll $t0, $t9, 2 -/* 05DFC 809323CC 00A82821 */ addu $a1, $a1, $t0 -/* 05E00 809323D0 0C029490 */ jal func_800A5240 -/* 05E04 809323D4 8CA57854 */ lw $a1, %lo(D_80937854)($a1) -/* 05E08 809323D8 10000009 */ beq $zero, $zero, .L80932400 +/* 05DF8 809323C8 00194080 */ sll $t0, $t9, 2 +/* 05DFC 809323CC 00A82821 */ addu $a1, $a1, $t0 +/* 05E00 809323D0 0C029490 */ jal SkelAnime_ChangeAnimTransitionStop +/* 05E04 809323D4 8CA57854 */ lw $a1, %lo(D_80937854)($a1) +/* 05E08 809323D8 10000009 */ beq $zero, $zero, .L80932400 /* 05E0C 809323DC 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 /* 05E10 809323E0 8609001C */ lh $t1, 0x001C($s0) ## 0000001C .L809323E4: /* 05E14 809323E4 3C058093 */ lui $a1, %hi(D_80937864) ## $a1 = 80930000 /* 05E18 809323E8 3C0640C0 */ lui $a2, 0x40C0 ## $a2 = 40C00000 -/* 05E1C 809323EC 00095080 */ sll $t2, $t1, 2 -/* 05E20 809323F0 00AA2821 */ addu $a1, $a1, $t2 -/* 05E24 809323F4 0C029490 */ jal func_800A5240 -/* 05E28 809323F8 8CA57864 */ lw $a1, %lo(D_80937864)($a1) +/* 05E1C 809323EC 00095080 */ sll $t2, $t1, 2 +/* 05E20 809323F0 00AA2821 */ addu $a1, $a1, $t2 +/* 05E24 809323F4 0C029490 */ jal SkelAnime_ChangeAnimTransitionStop +/* 05E28 809323F8 8CA57864 */ lw $a1, %lo(D_80937864)($a1) /* 05E2C 809323FC 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 .L80932400: /* 05E30 80932400 240B00C8 */ addiu $t3, $zero, 0x00C8 ## $t3 = 000000C8 /* 05E34 80932404 44816000 */ mtc1 $at, $f12 ## $f12 = 20.00 /* 05E38 80932408 0C00CFC8 */ jal Math_Rand_CenteredFloat - + /* 05E3C 8093240C A20B0114 */ sb $t3, 0x0114($s0) ## 00000114 /* 05E40 80932410 C6040024 */ lwc1 $f4, 0x0024($s0) ## 00000024 /* 05E44 80932414 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 /* 05E48 80932418 44816000 */ mtc1 $at, $f12 ## $f12 = 20.00 -/* 05E4C 8093241C 46002180 */ add.s $f6, $f4, $f0 +/* 05E4C 8093241C 46002180 */ add.s $f6, $f4, $f0 /* 05E50 80932420 0C00CFC8 */ jal Math_Rand_CenteredFloat - + /* 05E54 80932424 E6060024 */ swc1 $f6, 0x0024($s0) ## 00000024 /* 05E58 80932428 C6080028 */ lwc1 $f8, 0x0028($s0) ## 00000028 /* 05E5C 8093242C 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 /* 05E60 80932430 44816000 */ mtc1 $at, $f12 ## $f12 = 20.00 -/* 05E64 80932434 46004280 */ add.s $f10, $f8, $f0 +/* 05E64 80932434 46004280 */ add.s $f10, $f8, $f0 /* 05E68 80932438 0C00CFC8 */ jal Math_Rand_CenteredFloat - + /* 05E6C 8093243C E60A0028 */ swc1 $f10, 0x0028($s0) ## 00000028 /* 05E70 80932440 3C0142C8 */ lui $at, 0x42C8 ## $at = 42C80000 /* 05E74 80932444 44813000 */ mtc1 $at, $f6 ## $f6 = 100.00 /* 05E78 80932448 C6040080 */ lwc1 $f4, 0x0080($s0) ## 00000080 /* 05E7C 8093244C C6080028 */ lwc1 $f8, 0x0028($s0) ## 00000028 /* 05E80 80932450 C610002C */ lwc1 $f16, 0x002C($s0) ## 0000002C -/* 05E84 80932454 46062080 */ add.s $f2, $f4, $f6 +/* 05E84 80932454 46062080 */ add.s $f2, $f4, $f6 /* 05E88 80932458 26040028 */ addiu $a0, $s0, 0x0028 ## $a0 = 00000028 -/* 05E8C 8093245C 46008480 */ add.s $f18, $f16, $f0 -/* 05E90 80932460 4602403C */ c.lt.s $f8, $f2 +/* 05E8C 8093245C 46008480 */ add.s $f18, $f16, $f0 +/* 05E90 80932460 4602403C */ c.lt.s $f8, $f2 /* 05E94 80932464 E612002C */ swc1 $f18, 0x002C($s0) ## 0000002C -/* 05E98 80932468 45020005 */ bc1fl .L80932480 +/* 05E98 80932468 45020005 */ bc1fl .L80932480 /* 05E9C 8093246C 860C0198 */ lh $t4, 0x0198($s0) ## 00000198 -/* 05EA0 80932470 44051000 */ mfc1 $a1, $f2 +/* 05EA0 80932470 44051000 */ mfc1 $a1, $f2 /* 05EA4 80932474 0C01DE80 */ jal Math_ApproxF - + /* 05EA8 80932478 3C0641A0 */ lui $a2, 0x41A0 ## $a2 = 41A00000 /* 05EAC 8093247C 860C0198 */ lh $t4, 0x0198($s0) ## 00000198 .L80932480: -/* 05EB0 80932480 55800004 */ bnel $t4, $zero, .L80932494 -/* 05EB4 80932484 8FBF001C */ lw $ra, 0x001C($sp) -/* 05EB8 80932488 0C24C929 */ jal func_809324A4 +/* 05EB0 80932480 55800004 */ bnel $t4, $zero, .L80932494 +/* 05EB4 80932484 8FBF001C */ lw $ra, 0x001C($sp) +/* 05EB8 80932488 0C24C929 */ jal func_809324A4 /* 05EBC 8093248C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 05EC0 80932490 8FBF001C */ lw $ra, 0x001C($sp) +/* 05EC0 80932490 8FBF001C */ lw $ra, 0x001C($sp) .L80932494: -/* 05EC4 80932494 8FB00018 */ lw $s0, 0x0018($sp) +/* 05EC4 80932494 8FB00018 */ lw $s0, 0x0018($sp) /* 05EC8 80932498 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 05ECC 8093249C 03E00008 */ jr $ra +/* 05ECC 8093249C 03E00008 */ jr $ra /* 05ED0 809324A0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_809324A4.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_809324A4.s index 9596a90e5e..54fd8bc6c2 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_809324A4.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_809324A4.s @@ -1,23 +1,23 @@ glabel func_809324A4 /* 05ED4 809324A4 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 05ED8 809324A8 AFBF0014 */ sw $ra, 0x0014($sp) +/* 05ED8 809324A8 AFBF0014 */ sw $ra, 0x0014($sp) /* 05EDC 809324AC 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 /* 05EE0 809324B0 84EE001C */ lh $t6, 0x001C($a3) ## 0000001C /* 05EE4 809324B4 3C058093 */ lui $a1, %hi(D_80937874) ## $a1 = 80930000 -/* 05EE8 809324B8 AFA70018 */ sw $a3, 0x0018($sp) -/* 05EEC 809324BC 000E7880 */ sll $t7, $t6, 2 -/* 05EF0 809324C0 00AF2821 */ addu $a1, $a1, $t7 -/* 05EF4 809324C4 8CA57874 */ lw $a1, %lo(D_80937874)($a1) +/* 05EE8 809324B8 AFA70018 */ sw $a3, 0x0018($sp) +/* 05EEC 809324BC 000E7880 */ sll $t7, $t6, 2 +/* 05EF0 809324C0 00AF2821 */ addu $a1, $a1, $t7 +/* 05EF4 809324C4 8CA57874 */ lw $a1, %lo(D_80937874)($a1) /* 05EF8 809324C8 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 05EFC 809324CC 0C029490 */ jal func_800A5240 +/* 05EFC 809324CC 0C029490 */ jal SkelAnime_ChangeAnimTransitionStop /* 05F00 809324D0 3C064100 */ lui $a2, 0x4100 ## $a2 = 41000000 -/* 05F04 809324D4 8FA70018 */ lw $a3, 0x0018($sp) +/* 05F04 809324D4 8FA70018 */ lw $a3, 0x0018($sp) /* 05F08 809324D8 3C188093 */ lui $t8, %hi(func_809324F4) ## $t8 = 80930000 /* 05F0C 809324DC 271824F4 */ addiu $t8, $t8, %lo(func_809324F4) ## $t8 = 809324F4 /* 05F10 809324E0 ACF80190 */ sw $t8, 0x0190($a3) ## 00000190 -/* 05F14 809324E4 8FBF0014 */ lw $ra, 0x0014($sp) +/* 05F14 809324E4 8FBF0014 */ lw $ra, 0x0014($sp) /* 05F18 809324E8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 05F1C 809324EC 03E00008 */ jr $ra +/* 05F1C 809324EC 03E00008 */ jr $ra /* 05F20 809324F0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80932808.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80932808.s index d00e4b9059..635129f717 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80932808.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80932808.s @@ -1,24 +1,24 @@ glabel func_80932808 /* 06238 80932808 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 0623C 8093280C AFBF0014 */ sw $ra, 0x0014($sp) +/* 0623C 8093280C AFBF0014 */ sw $ra, 0x0014($sp) /* 06240 80932810 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 /* 06244 80932814 84EE001C */ lh $t6, 0x001C($a3) ## 0000001C /* 06248 80932818 3C058093 */ lui $a1, %hi(D_80937864) ## $a1 = 80930000 -/* 0624C 8093281C AFA70018 */ sw $a3, 0x0018($sp) -/* 06250 80932820 000E7880 */ sll $t7, $t6, 2 -/* 06254 80932824 00AF2821 */ addu $a1, $a1, $t7 -/* 06258 80932828 8CA57864 */ lw $a1, %lo(D_80937864)($a1) +/* 0624C 8093281C AFA70018 */ sw $a3, 0x0018($sp) +/* 06250 80932820 000E7880 */ sll $t7, $t6, 2 +/* 06254 80932824 00AF2821 */ addu $a1, $a1, $t7 +/* 06258 80932828 8CA57864 */ lw $a1, %lo(D_80937864)($a1) /* 0625C 8093282C 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 06260 80932830 0C029490 */ jal func_800A5240 +/* 06260 80932830 0C029490 */ jal SkelAnime_ChangeAnimTransitionStop /* 06264 80932834 3C064120 */ lui $a2, 0x4120 ## $a2 = 41200000 -/* 06268 80932838 8FA70018 */ lw $a3, 0x0018($sp) +/* 06268 80932838 8FA70018 */ lw $a3, 0x0018($sp) /* 0626C 8093283C 3C188093 */ lui $t8, %hi(func_8093285C) ## $t8 = 80930000 /* 06270 80932840 2718285C */ addiu $t8, $t8, %lo(func_8093285C) ## $t8 = 8093285C /* 06274 80932844 A0E00195 */ sb $zero, 0x0195($a3) ## 00000195 /* 06278 80932848 ACF80190 */ sw $t8, 0x0190($a3) ## 00000190 -/* 0627C 8093284C 8FBF0014 */ lw $ra, 0x0014($sp) +/* 0627C 8093284C 8FBF0014 */ lw $ra, 0x0014($sp) /* 06280 80932850 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 06284 80932854 03E00008 */ jr $ra +/* 06284 80932854 03E00008 */ jr $ra /* 06288 80932858 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_809329D4.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_809329D4.s index 1d60302f63..1953018522 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_809329D4.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_809329D4.s @@ -1,20 +1,20 @@ glabel func_809329D4 /* 06404 809329D4 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 06408 809329D8 AFB00020 */ sw $s0, 0x0020($sp) +/* 06408 809329D8 AFB00020 */ sw $s0, 0x0020($sp) /* 0640C 809329DC 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 06410 809329E0 AFBF0024 */ sw $ra, 0x0024($sp) +/* 06410 809329E0 AFBF0024 */ sw $ra, 0x0024($sp) /* 06414 809329E4 860E001C */ lh $t6, 0x001C($s0) ## 0000001C /* 06418 809329E8 3C058093 */ lui $a1, %hi(D_8093784C) ## $a1 = 80930000 /* 0641C 809329EC 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 06420 809329F0 000E7880 */ sll $t7, $t6, 2 -/* 06424 809329F4 00AF2821 */ addu $a1, $a1, $t7 -/* 06428 809329F8 8CA5784C */ lw $a1, %lo(D_8093784C)($a1) -/* 0642C 809329FC 0C029490 */ jal func_800A5240 +/* 06420 809329F0 000E7880 */ sll $t7, $t6, 2 +/* 06424 809329F4 00AF2821 */ addu $a1, $a1, $t7 +/* 06428 809329F8 8CA5784C */ lw $a1, %lo(D_8093784C)($a1) +/* 0642C 809329FC 0C029490 */ jal SkelAnime_ChangeAnimTransitionStop /* 06430 80932A00 3C064120 */ lui $a2, 0x4120 ## $a2 = 41200000 /* 06434 80932A04 8E190190 */ lw $t9, 0x0190($s0) ## 00000190 /* 06438 80932A08 3C188093 */ lui $t8, %hi(func_80932C38) ## $t8 = 80930000 /* 0643C 80932A0C 27182C38 */ addiu $t8, $t8, %lo(func_80932C38) ## $t8 = 80932C38 -/* 06440 80932A10 13190002 */ beq $t8, $t9, .L80932A1C +/* 06440 80932A10 13190002 */ beq $t8, $t9, .L80932A1C /* 06444 80932A14 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 06448 80932A18 A2000195 */ sb $zero, 0x0195($s0) ## 00000195 .L80932A1C: @@ -24,25 +24,25 @@ glabel func_809329D4 /* 06458 80932A28 3109FFFC */ andi $t1, $t0, 0xFFFC ## $t1 = 00000000 /* 0645C 80932A2C 354B0001 */ ori $t3, $t2, 0x0001 ## $t3 = 00000001 /* 06460 80932A30 A20903E4 */ sb $t1, 0x03E4($s0) ## 000003E4 -/* 06464 80932A34 0C24CF3B */ jal func_80933CEC +/* 06464 80932A34 0C24CF3B */ jal func_80933CEC /* 06468 80932A38 A20B03E5 */ sb $t3, 0x03E5($s0) ## 000003E5 /* 0646C 80932A3C 3C040601 */ lui $a0, 0x0601 ## $a0 = 06010000 /* 06470 80932A40 0C028800 */ jal SkelAnime_GetFrameCount - + /* 06474 80932A44 2484B6FC */ addiu $a0, $a0, 0xB6FC ## $a0 = 0600B6FC /* 06478 80932A48 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 0647C 80932A4C 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 06480 80932A50 240600FF */ addiu $a2, $zero, 0x00FF ## $a2 = 000000FF /* 06484 80932A54 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 06488 80932A58 0C00D09B */ jal func_8003426C -/* 0648C 80932A5C AFA20010 */ sw $v0, 0x0010($sp) +/* 06488 80932A58 0C00D09B */ jal func_8003426C +/* 0648C 80932A5C AFA20010 */ sw $v0, 0x0010($sp) /* 06490 80932A60 3C0C8093 */ lui $t4, %hi(func_80932A80) ## $t4 = 80930000 /* 06494 80932A64 258C2A80 */ addiu $t4, $t4, %lo(func_80932A80) ## $t4 = 80932A80 /* 06498 80932A68 AE0C0190 */ sw $t4, 0x0190($s0) ## 00000190 -/* 0649C 80932A6C 8FBF0024 */ lw $ra, 0x0024($sp) -/* 064A0 80932A70 8FB00020 */ lw $s0, 0x0020($sp) +/* 0649C 80932A6C 8FBF0024 */ lw $ra, 0x0024($sp) +/* 064A0 80932A70 8FB00020 */ lw $s0, 0x0020($sp) /* 064A4 80932A74 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 064A8 80932A78 03E00008 */ jr $ra +/* 064A8 80932A78 03E00008 */ jr $ra /* 064AC 80932A7C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80932A80.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80932A80.s index f23748489b..1d6cfac144 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80932A80.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80932A80.s @@ -1,15 +1,15 @@ glabel func_80932A80 /* 064B0 80932A80 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 064B4 80932A84 AFB00018 */ sw $s0, 0x0018($sp) +/* 064B4 80932A84 AFB00018 */ sw $s0, 0x0018($sp) /* 064B8 80932A88 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 064BC 80932A8C AFBF001C */ sw $ra, 0x001C($sp) +/* 064BC 80932A8C AFBF001C */ sw $ra, 0x001C($sp) /* 064C0 80932A90 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 064C4 80932A94 AFA5002C */ sw $a1, 0x002C($sp) +/* 064C4 80932A94 AFA5002C */ sw $a1, 0x002C($sp) /* 064C8 80932A98 0C02927F */ jal SkelAnime_FrameUpdateMatrix - -/* 064CC 80932A9C AFA40020 */ sw $a0, 0x0020($sp) + +/* 064CC 80932A9C AFA40020 */ sw $a0, 0x0020($sp) /* 064D0 80932AA0 3C0E8094 */ lui $t6, %hi(D_80938C90) ## $t6 = 80940000 -/* 064D4 80932AA4 8DCE8C90 */ lw $t6, %lo(D_80938C90)($t6) +/* 064D4 80932AA4 8DCE8C90 */ lw $t6, %lo(D_80938C90)($t6) /* 064D8 80932AA8 0C01DE0D */ jal Math_Coss ## coss? /* 064DC 80932AAC 85C400B6 */ lh $a0, 0x00B6($t6) ## 809400B6 @@ -17,16 +17,16 @@ glabel func_80932A80 /* 064E4 80932AB4 44812000 */ mtc1 $at, $f4 ## $f4 = 200.00 /* 064E8 80932AB8 C6080010 */ lwc1 $f8, 0x0010($s0) ## 00000010 /* 064EC 80932ABC 2604002C */ addiu $a0, $s0, 0x002C ## $a0 = 0000002C -/* 064F0 80932AC0 46040182 */ mul.s $f6, $f0, $f4 +/* 064F0 80932AC0 46040182 */ mul.s $f6, $f0, $f4 /* 064F4 80932AC4 3C063F00 */ lui $a2, 0x3F00 ## $a2 = 3F000000 /* 064F8 80932AC8 3C0741C8 */ lui $a3, 0x41C8 ## $a3 = 41C80000 -/* 064FC 80932ACC 46083280 */ add.s $f10, $f6, $f8 -/* 06500 80932AD0 44055000 */ mfc1 $a1, $f10 +/* 064FC 80932ACC 46083280 */ add.s $f10, $f6, $f8 +/* 06500 80932AD0 44055000 */ mfc1 $a1, $f10 /* 06504 80932AD4 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 06508 80932AD8 00000000 */ nop /* 0650C 80932ADC 3C0F8094 */ lui $t7, %hi(D_80938C90) ## $t7 = 80940000 -/* 06510 80932AE0 8DEF8C90 */ lw $t7, %lo(D_80938C90)($t7) +/* 06510 80932AE0 8DEF8C90 */ lw $t7, %lo(D_80938C90)($t7) /* 06514 80932AE4 0C01DE1C */ jal Math_Sins ## sins? /* 06518 80932AE8 85E400B6 */ lh $a0, 0x00B6($t7) ## 809400B6 @@ -34,71 +34,71 @@ glabel func_80932A80 /* 06520 80932AF0 44818000 */ mtc1 $at, $f16 ## $f16 = 200.00 /* 06524 80932AF4 C6040008 */ lwc1 $f4, 0x0008($s0) ## 00000008 /* 06528 80932AF8 26040024 */ addiu $a0, $s0, 0x0024 ## $a0 = 00000024 -/* 0652C 80932AFC 46100482 */ mul.s $f18, $f0, $f16 +/* 0652C 80932AFC 46100482 */ mul.s $f18, $f0, $f16 /* 06530 80932B00 3C063F00 */ lui $a2, 0x3F00 ## $a2 = 3F000000 /* 06534 80932B04 3C0741C8 */ lui $a3, 0x41C8 ## $a3 = 41C80000 -/* 06538 80932B08 46049180 */ add.s $f6, $f18, $f4 -/* 0653C 80932B0C 44053000 */ mfc1 $a1, $f6 +/* 06538 80932B08 46049180 */ add.s $f6, $f18, $f4 +/* 0653C 80932B0C 44053000 */ mfc1 $a1, $f6 /* 06540 80932B10 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 06544 80932B14 00000000 */ nop /* 06548 80932B18 82180195 */ lb $t8, 0x0195($s0) ## 00000195 /* 0654C 80932B1C 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 06550 80932B20 26040028 */ addiu $a0, $s0, 0x0028 ## $a0 = 00000028 -/* 06554 80932B24 17000026 */ bne $t8, $zero, .L80932BC0 +/* 06554 80932B24 17000026 */ bne $t8, $zero, .L80932BC0 /* 06558 80932B28 3C0641F0 */ lui $a2, 0x41F0 ## $a2 = 41F00000 /* 0655C 80932B2C 260401A0 */ addiu $a0, $s0, 0x01A0 ## $a0 = 000001A0 /* 06560 80932B30 0C01DE2B */ jal Math_ApproxUpdateScaledS - + /* 06564 80932B34 24060800 */ addiu $a2, $zero, 0x0800 ## $a2 = 00000800 /* 06568 80932B38 2604019E */ addiu $a0, $s0, 0x019E ## $a0 = 0000019E /* 0656C 80932B3C 2405F254 */ addiu $a1, $zero, 0xF254 ## $a1 = FFFFF254 /* 06570 80932B40 0C01DE5F */ jal Math_ApproxS - + /* 06574 80932B44 240601F4 */ addiu $a2, $zero, 0x01F4 ## $a2 = 000001F4 /* 06578 80932B48 260400B4 */ addiu $a0, $s0, 0x00B4 ## $a0 = 000000B4 /* 0657C 80932B4C 86050014 */ lh $a1, 0x0014($s0) ## 00000014 /* 06580 80932B50 0C01DE2B */ jal Math_ApproxUpdateScaledS - + /* 06584 80932B54 24060800 */ addiu $a2, $zero, 0x0800 ## $a2 = 00000800 /* 06588 80932B58 260400B8 */ addiu $a0, $s0, 0x00B8 ## $a0 = 000000B8 /* 0658C 80932B5C 86050018 */ lh $a1, 0x0018($s0) ## 00000018 /* 06590 80932B60 0C01DE2B */ jal Math_ApproxUpdateScaledS - + /* 06594 80932B64 24060800 */ addiu $a2, $zero, 0x0800 ## $a2 = 00000800 /* 06598 80932B68 260400B6 */ addiu $a0, $s0, 0x00B6 ## $a0 = 000000B6 /* 0659C 80932B6C 86050016 */ lh $a1, 0x0016($s0) ## 00000016 /* 065A0 80932B70 0C01DE2B */ jal Math_ApproxUpdateScaledS - + /* 065A4 80932B74 24060800 */ addiu $a2, $zero, 0x0800 ## $a2 = 00000800 /* 065A8 80932B78 3C088094 */ lui $t0, %hi(D_80938C90) ## $t0 = 80940000 -/* 065AC 80932B7C 8D088C90 */ lw $t0, %lo(D_80938C90)($t0) +/* 065AC 80932B7C 8D088C90 */ lw $t0, %lo(D_80938C90)($t0) /* 065B0 80932B80 3C198093 */ lui $t9, %hi(func_8092E830) ## $t9 = 80930000 /* 065B4 80932B84 2739E830 */ addiu $t9, $t9, %lo(func_8092E830) ## $t9 = 8092E830 /* 065B8 80932B88 8D090190 */ lw $t1, 0x0190($t0) ## 80940190 /* 065BC 80932B8C 240A0001 */ addiu $t2, $zero, 0x0001 ## $t2 = 00000001 /* 065C0 80932B90 3C058093 */ lui $a1, %hi(D_80937874) ## $a1 = 80930000 -/* 065C4 80932B94 1729000C */ bne $t9, $t1, .L80932BC8 +/* 065C4 80932B94 1729000C */ bne $t9, $t1, .L80932BC8 /* 065C8 80932B98 3C064120 */ lui $a2, 0x4120 ## $a2 = 41200000 /* 065CC 80932B9C 860B001C */ lh $t3, 0x001C($s0) ## 0000001C /* 065D0 80932BA0 A20A0195 */ sb $t2, 0x0195($s0) ## 00000195 -/* 065D4 80932BA4 8FA40020 */ lw $a0, 0x0020($sp) -/* 065D8 80932BA8 000B6080 */ sll $t4, $t3, 2 -/* 065DC 80932BAC 00AC2821 */ addu $a1, $a1, $t4 -/* 065E0 80932BB0 0C029490 */ jal func_800A5240 -/* 065E4 80932BB4 8CA57874 */ lw $a1, %lo(D_80937874)($a1) -/* 065E8 80932BB8 10000004 */ beq $zero, $zero, .L80932BCC -/* 065EC 80932BBC 8FBF001C */ lw $ra, 0x001C($sp) +/* 065D4 80932BA4 8FA40020 */ lw $a0, 0x0020($sp) +/* 065D8 80932BA8 000B6080 */ sll $t4, $t3, 2 +/* 065DC 80932BAC 00AC2821 */ addu $a1, $a1, $t4 +/* 065E0 80932BB0 0C029490 */ jal SkelAnime_ChangeAnimTransitionStop +/* 065E4 80932BB4 8CA57874 */ lw $a1, %lo(D_80937874)($a1) +/* 065E8 80932BB8 10000004 */ beq $zero, $zero, .L80932BCC +/* 065EC 80932BBC 8FBF001C */ lw $ra, 0x001C($sp) .L80932BC0: /* 065F0 80932BC0 0C01DE80 */ jal Math_ApproxF - + /* 065F4 80932BC4 8E050080 */ lw $a1, 0x0080($s0) ## 00000080 .L80932BC8: -/* 065F8 80932BC8 8FBF001C */ lw $ra, 0x001C($sp) +/* 065F8 80932BC8 8FBF001C */ lw $ra, 0x001C($sp) .L80932BCC: -/* 065FC 80932BCC 8FB00018 */ lw $s0, 0x0018($sp) +/* 065FC 80932BCC 8FB00018 */ lw $s0, 0x0018($sp) /* 06600 80932BD0 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 06604 80932BD4 03E00008 */ jr $ra +/* 06604 80932BD4 03E00008 */ jr $ra /* 06608 80932BD8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80932BDC.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80932BDC.s index ffc87c2a53..f7f8ea8ac0 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80932BDC.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80932BDC.s @@ -1,26 +1,26 @@ glabel func_80932BDC /* 0660C 80932BDC 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 06610 80932BE0 AFBF0014 */ sw $ra, 0x0014($sp) +/* 06610 80932BE0 AFBF0014 */ sw $ra, 0x0014($sp) /* 06614 80932BE4 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 /* 06618 80932BE8 A48000B4 */ sh $zero, 0x00B4($a0) ## 000000B4 /* 0661C 80932BEC 84EE001C */ lh $t6, 0x001C($a3) ## 0000001C /* 06620 80932BF0 3C058093 */ lui $a1, %hi(D_8093785C) ## $a1 = 80930000 -/* 06624 80932BF4 AFA70018 */ sw $a3, 0x0018($sp) -/* 06628 80932BF8 000E7880 */ sll $t7, $t6, 2 -/* 0662C 80932BFC 00AF2821 */ addu $a1, $a1, $t7 -/* 06630 80932C00 8CA5785C */ lw $a1, %lo(D_8093785C)($a1) +/* 06624 80932BF4 AFA70018 */ sw $a3, 0x0018($sp) +/* 06628 80932BF8 000E7880 */ sll $t7, $t6, 2 +/* 0662C 80932BFC 00AF2821 */ addu $a1, $a1, $t7 +/* 06630 80932C00 8CA5785C */ lw $a1, %lo(D_8093785C)($a1) /* 06634 80932C04 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 06638 80932C08 0C029490 */ jal func_800A5240 +/* 06638 80932C08 0C029490 */ jal SkelAnime_ChangeAnimTransitionStop /* 0663C 80932C0C 3C064040 */ lui $a2, 0x4040 ## $a2 = 40400000 -/* 06640 80932C10 8FA70018 */ lw $a3, 0x0018($sp) +/* 06640 80932C10 8FA70018 */ lw $a3, 0x0018($sp) /* 06644 80932C14 3C198093 */ lui $t9, %hi(func_80932C38) ## $t9 = 80930000 /* 06648 80932C18 24180006 */ addiu $t8, $zero, 0x0006 ## $t8 = 00000006 /* 0664C 80932C1C 27392C38 */ addiu $t9, $t9, %lo(func_80932C38) ## $t9 = 80932C38 /* 06650 80932C20 A4F80198 */ sh $t8, 0x0198($a3) ## 00000198 /* 06654 80932C24 ACF90190 */ sw $t9, 0x0190($a3) ## 00000190 -/* 06658 80932C28 8FBF0014 */ lw $ra, 0x0014($sp) +/* 06658 80932C28 8FBF0014 */ lw $ra, 0x0014($sp) /* 0665C 80932C2C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 06660 80932C30 03E00008 */ jr $ra +/* 06660 80932C30 03E00008 */ jr $ra /* 06664 80932C34 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80932D10.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80932D10.s index f5c3ab7872..8411ff7cf0 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80932D10.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80932D10.s @@ -1,32 +1,32 @@ glabel func_80932D10 /* 06740 80932D10 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 06744 80932D14 AFBF0014 */ sw $ra, 0x0014($sp) +/* 06744 80932D14 AFBF0014 */ sw $ra, 0x0014($sp) /* 06748 80932D18 848F001C */ lh $t7, 0x001C($a0) ## 0000001C /* 0674C 80932D1C 3C018093 */ lui $at, %hi(D_8093746C) ## $at = 80930000 /* 06750 80932D20 240E000B */ addiu $t6, $zero, 0x000B ## $t6 = 0000000B -/* 06754 80932D24 000FC080 */ sll $t8, $t7, 2 -/* 06758 80932D28 00380821 */ addu $at, $at, $t8 +/* 06754 80932D24 000FC080 */ sll $t8, $t7, 2 +/* 06758 80932D28 00380821 */ addu $at, $at, $t8 /* 0675C 80932D2C 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 -/* 06760 80932D30 AC2E746C */ sw $t6, %lo(D_8093746C)($at) +/* 06760 80932D30 AC2E746C */ sw $t6, %lo(D_8093746C)($at) /* 06764 80932D34 84F9001C */ lh $t9, 0x001C($a3) ## 0000001C /* 06768 80932D38 3C058093 */ lui $a1, %hi(D_8093785C) ## $a1 = 80930000 -/* 0676C 80932D3C AFA70018 */ sw $a3, 0x0018($sp) -/* 06770 80932D40 00194080 */ sll $t0, $t9, 2 -/* 06774 80932D44 00A82821 */ addu $a1, $a1, $t0 -/* 06778 80932D48 8CA5785C */ lw $a1, %lo(D_8093785C)($a1) +/* 0676C 80932D3C AFA70018 */ sw $a3, 0x0018($sp) +/* 06770 80932D40 00194080 */ sll $t0, $t9, 2 +/* 06774 80932D44 00A82821 */ addu $a1, $a1, $t0 +/* 06778 80932D48 8CA5785C */ lw $a1, %lo(D_8093785C)($a1) /* 0677C 80932D4C 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 06780 80932D50 0C029490 */ jal func_800A5240 +/* 06780 80932D50 0C029490 */ jal SkelAnime_ChangeAnimTransitionStop /* 06784 80932D54 3C064000 */ lui $a2, 0x4000 ## $a2 = 40000000 -/* 06788 80932D58 8FA70018 */ lw $a3, 0x0018($sp) +/* 06788 80932D58 8FA70018 */ lw $a3, 0x0018($sp) /* 0678C 80932D5C 240900A0 */ addiu $t1, $zero, 0x00A0 ## $t1 = 000000A0 /* 06790 80932D60 240D0180 */ addiu $t5, $zero, 0x0180 ## $t5 = 00000180 /* 06794 80932D64 84EA001C */ lh $t2, 0x001C($a3) ## 0000001C /* 06798 80932D68 3C0F8093 */ lui $t7, %hi(func_80932DAC) ## $t7 = 80930000 /* 0679C 80932D6C A4E000B4 */ sh $zero, 0x00B4($a3) ## 000000B4 -/* 067A0 80932D70 15400004 */ bne $t2, $zero, .L80932D84 +/* 067A0 80932D70 15400004 */ bne $t2, $zero, .L80932D84 /* 067A4 80932D74 A4E90198 */ sh $t1, 0x0198($a3) ## 00000198 /* 067A8 80932D78 240BF800 */ addiu $t3, $zero, 0xF800 ## $t3 = FFFFF800 -/* 067AC 80932D7C 10000004 */ beq $zero, $zero, .L80932D90 +/* 067AC 80932D7C 10000004 */ beq $zero, $zero, .L80932D90 /* 067B0 80932D80 A4EB01A2 */ sh $t3, 0x01A2($a3) ## 000001A2 .L80932D84: /* 067B4 80932D84 240CF800 */ addiu $t4, $zero, 0xF800 ## $t4 = FFFFF800 @@ -36,9 +36,9 @@ glabel func_80932D10 /* 067C0 80932D90 25EF2DAC */ addiu $t7, $t7, %lo(func_80932DAC) ## $t7 = 80932DAC /* 067C4 80932D94 A4ED019A */ sh $t5, 0x019A($a3) ## 0000019A /* 067C8 80932D98 ACEF0190 */ sw $t7, 0x0190($a3) ## 00000190 -/* 067CC 80932D9C 8FBF0014 */ lw $ra, 0x0014($sp) +/* 067CC 80932D9C 8FBF0014 */ lw $ra, 0x0014($sp) /* 067D0 80932DA0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 067D4 80932DA4 03E00008 */ jr $ra +/* 067D4 80932DA4 03E00008 */ jr $ra /* 067D8 80932DA8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80932DAC.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80932DAC.s index b89380efac..9b75d74072 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80932DAC.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80932DAC.s @@ -1,20 +1,20 @@ glabel func_80932DAC /* 067DC 80932DAC 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 067E0 80932DB0 AFBF001C */ sw $ra, 0x001C($sp) -/* 067E4 80932DB4 AFB00018 */ sw $s0, 0x0018($sp) -/* 067E8 80932DB8 AFA5002C */ sw $a1, 0x002C($sp) +/* 067E0 80932DB0 AFBF001C */ sw $ra, 0x001C($sp) +/* 067E4 80932DB4 AFB00018 */ sw $s0, 0x0018($sp) +/* 067E8 80932DB8 AFA5002C */ sw $a1, 0x002C($sp) /* 067EC 80932DBC 84820198 */ lh $v0, 0x0198($a0) ## 00000198 /* 067F0 80932DC0 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 067F4 80932DC4 10400002 */ beq $v0, $zero, .L80932DD0 +/* 067F4 80932DC4 10400002 */ beq $v0, $zero, .L80932DD0 /* 067F8 80932DC8 244EFFFF */ addiu $t6, $v0, 0xFFFF ## $t6 = FFFFFFFF /* 067FC 80932DCC A48E0198 */ sh $t6, 0x0198($a0) ## 00000198 .L80932DD0: /* 06800 80932DD0 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C /* 06804 80932DD4 0C02927F */ jal SkelAnime_FrameUpdateMatrix - -/* 06808 80932DD8 AFA40020 */ sw $a0, 0x0020($sp) + +/* 06808 80932DD8 AFA40020 */ sw $a0, 0x0020($sp) /* 0680C 80932DDC 3C0F8094 */ lui $t7, %hi(D_80938C90) ## $t7 = 80940000 -/* 06810 80932DE0 8DEF8C90 */ lw $t7, %lo(D_80938C90)($t7) +/* 06810 80932DE0 8DEF8C90 */ lw $t7, %lo(D_80938C90)($t7) /* 06814 80932DE4 0C01DE0D */ jal Math_Coss ## coss? /* 06818 80932DE8 85E400B6 */ lh $a0, 0x00B6($t7) ## 809400B6 @@ -22,16 +22,16 @@ glabel func_80932DAC /* 06820 80932DF0 44812000 */ mtc1 $at, $f4 ## $f4 = 200.00 /* 06824 80932DF4 C6080010 */ lwc1 $f8, 0x0010($s0) ## 00000010 /* 06828 80932DF8 2604002C */ addiu $a0, $s0, 0x002C ## $a0 = 0000002C -/* 0682C 80932DFC 46040182 */ mul.s $f6, $f0, $f4 +/* 0682C 80932DFC 46040182 */ mul.s $f6, $f0, $f4 /* 06830 80932E00 3C063F00 */ lui $a2, 0x3F00 ## $a2 = 3F000000 /* 06834 80932E04 3C0741C8 */ lui $a3, 0x41C8 ## $a3 = 41C80000 -/* 06838 80932E08 46083280 */ add.s $f10, $f6, $f8 -/* 0683C 80932E0C 44055000 */ mfc1 $a1, $f10 +/* 06838 80932E08 46083280 */ add.s $f10, $f6, $f8 +/* 0683C 80932E0C 44055000 */ mfc1 $a1, $f10 /* 06840 80932E10 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 06844 80932E14 00000000 */ nop /* 06848 80932E18 3C188094 */ lui $t8, %hi(D_80938C90) ## $t8 = 80940000 -/* 0684C 80932E1C 8F188C90 */ lw $t8, %lo(D_80938C90)($t8) +/* 0684C 80932E1C 8F188C90 */ lw $t8, %lo(D_80938C90)($t8) /* 06850 80932E20 0C01DE1C */ jal Math_Sins ## sins? /* 06854 80932E24 870400B6 */ lh $a0, 0x00B6($t8) ## 809400B6 @@ -39,48 +39,48 @@ glabel func_80932DAC /* 0685C 80932E2C 44818000 */ mtc1 $at, $f16 ## $f16 = 200.00 /* 06860 80932E30 C6040008 */ lwc1 $f4, 0x0008($s0) ## 00000008 /* 06864 80932E34 26040024 */ addiu $a0, $s0, 0x0024 ## $a0 = 00000024 -/* 06868 80932E38 46100482 */ mul.s $f18, $f0, $f16 +/* 06868 80932E38 46100482 */ mul.s $f18, $f0, $f16 /* 0686C 80932E3C 3C063F00 */ lui $a2, 0x3F00 ## $a2 = 3F000000 /* 06870 80932E40 3C0741C8 */ lui $a3, 0x41C8 ## $a3 = 41C80000 -/* 06874 80932E44 46049180 */ add.s $f6, $f18, $f4 -/* 06878 80932E48 44053000 */ mfc1 $a1, $f6 +/* 06874 80932E44 46049180 */ add.s $f6, $f18, $f4 +/* 06878 80932E48 44053000 */ mfc1 $a1, $f6 /* 0687C 80932E4C 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 06880 80932E50 00000000 */ nop /* 06884 80932E54 260400B4 */ addiu $a0, $s0, 0x00B4 ## $a0 = 000000B4 /* 06888 80932E58 860501A2 */ lh $a1, 0x01A2($s0) ## 000001A2 /* 0688C 80932E5C 0C01DE2B */ jal Math_ApproxUpdateScaledS - + /* 06890 80932E60 8606019A */ lh $a2, 0x019A($s0) ## 0000019A -/* 06894 80932E64 50400031 */ beql $v0, $zero, .L80932F2C +/* 06894 80932E64 50400031 */ beql $v0, $zero, .L80932F2C /* 06898 80932E68 8619019A */ lh $t9, 0x019A($s0) ## 0000019A /* 0689C 80932E6C 861901A2 */ lh $t9, 0x01A2($s0) ## 000001A2 /* 068A0 80932E70 3C058093 */ lui $a1, %hi(D_80937854) ## $a1 = 80930000 /* 068A4 80932E74 3C0640A0 */ lui $a2, 0x40A0 ## $a2 = 40A00000 -/* 068A8 80932E78 1320000A */ beq $t9, $zero, .L80932EA4 +/* 068A8 80932E78 1320000A */ beq $t9, $zero, .L80932EA4 /* 068AC 80932E7C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 068B0 80932E80 8608001C */ lh $t0, 0x001C($s0) ## 0000001C /* 068B4 80932E84 A60001A2 */ sh $zero, 0x01A2($s0) ## 000001A2 -/* 068B8 80932E88 8FA40020 */ lw $a0, 0x0020($sp) -/* 068BC 80932E8C 00084880 */ sll $t1, $t0, 2 -/* 068C0 80932E90 00A92821 */ addu $a1, $a1, $t1 -/* 068C4 80932E94 0C029490 */ jal func_800A5240 -/* 068C8 80932E98 8CA57854 */ lw $a1, %lo(D_80937854)($a1) -/* 068CC 80932E9C 1000000E */ beq $zero, $zero, .L80932ED8 +/* 068B8 80932E88 8FA40020 */ lw $a0, 0x0020($sp) +/* 068BC 80932E8C 00084880 */ sll $t1, $t0, 2 +/* 068C0 80932E90 00A92821 */ addu $a1, $a1, $t1 +/* 068C4 80932E94 0C029490 */ jal SkelAnime_ChangeAnimTransitionStop +/* 068C8 80932E98 8CA57854 */ lw $a1, %lo(D_80937854)($a1) +/* 068CC 80932E9C 1000000E */ beq $zero, $zero, .L80932ED8 /* 068D0 80932EA0 860D0198 */ lh $t5, 0x0198($s0) ## 00000198 .L80932EA4: /* 068D4 80932EA4 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 068D8 80932EA8 24053951 */ addiu $a1, $zero, 0x3951 ## $a1 = 00003951 /* 068DC 80932EAC 860B001C */ lh $t3, 0x001C($s0) ## 0000001C /* 068E0 80932EB0 240AF800 */ addiu $t2, $zero, 0xF800 ## $t2 = FFFFF800 /* 068E4 80932EB4 3C058093 */ lui $a1, %hi(D_8093785C) ## $a1 = 80930000 -/* 068E8 80932EB8 000B6080 */ sll $t4, $t3, 2 +/* 068E8 80932EB8 000B6080 */ sll $t4, $t3, 2 /* 068EC 80932EBC A60A01A2 */ sh $t2, 0x01A2($s0) ## 000001A2 -/* 068F0 80932EC0 00AC2821 */ addu $a1, $a1, $t4 -/* 068F4 80932EC4 8CA5785C */ lw $a1, %lo(D_8093785C)($a1) -/* 068F8 80932EC8 8FA40020 */ lw $a0, 0x0020($sp) -/* 068FC 80932ECC 0C029490 */ jal func_800A5240 +/* 068F0 80932EC0 00AC2821 */ addu $a1, $a1, $t4 +/* 068F4 80932EC4 8CA5785C */ lw $a1, %lo(D_8093785C)($a1) +/* 068F8 80932EC8 8FA40020 */ lw $a0, 0x0020($sp) +/* 068FC 80932ECC 0C029490 */ jal SkelAnime_ChangeAnimTransitionStop /* 06900 80932ED0 3C0640A0 */ lui $a2, 0x40A0 ## $a2 = 40A00000 /* 06904 80932ED4 860D0198 */ lh $t5, 0x0198($s0) ## 00000198 .L80932ED8: @@ -88,20 +88,20 @@ glabel func_80932DAC /* 0690C 80932EDC 44818000 */ mtc1 $at, $f16 ## $f16 = 80.00 /* 06910 80932EE0 448D4000 */ mtc1 $t5, $f8 ## $f8 = 0.00 /* 06914 80932EE4 00000000 */ nop -/* 06918 80932EE8 468042A0 */ cvt.s.w $f10, $f8 -/* 0691C 80932EEC 4610503C */ c.lt.s $f10, $f16 +/* 06918 80932EE8 468042A0 */ cvt.s.w $f10, $f8 +/* 0691C 80932EEC 4610503C */ c.lt.s $f10, $f16 /* 06920 80932EF0 00000000 */ nop -/* 06924 80932EF4 4502000D */ bc1fl .L80932F2C +/* 06924 80932EF4 4502000D */ bc1fl .L80932F2C /* 06928 80932EF8 8619019A */ lh $t9, 0x019A($s0) ## 0000019A /* 0692C 80932EFC 860E019A */ lh $t6, 0x019A($s0) ## 0000019A /* 06930 80932F00 24180040 */ addiu $t8, $zero, 0x0040 ## $t8 = 00000040 /* 06934 80932F04 25CFFFC0 */ addiu $t7, $t6, 0xFFC0 ## $t7 = FFFFFFC0 /* 06938 80932F08 A60F019A */ sh $t7, 0x019A($s0) ## 0000019A /* 0693C 80932F0C 8602019A */ lh $v0, 0x019A($s0) ## 0000019A -/* 06940 80932F10 28410040 */ slti $at, $v0, 0x0040 -/* 06944 80932F14 50200004 */ beql $at, $zero, .L80932F28 +/* 06940 80932F10 28410040 */ slti $at, $v0, 0x0040 +/* 06944 80932F14 50200004 */ beql $at, $zero, .L80932F28 /* 06948 80932F18 A602019A */ sh $v0, 0x019A($s0) ## 0000019A -/* 0694C 80932F1C 10000002 */ beq $zero, $zero, .L80932F28 +/* 0694C 80932F1C 10000002 */ beq $zero, $zero, .L80932F28 /* 06950 80932F20 A618019A */ sh $t8, 0x019A($s0) ## 0000019A /* 06954 80932F24 A602019A */ sh $v0, 0x019A($s0) ## 0000019A .L80932F28: @@ -112,30 +112,30 @@ glabel func_80932DAC /* 06964 80932F34 44999000 */ mtc1 $t9, $f18 ## $f18 = 0.00 /* 06968 80932F38 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 /* 0696C 80932F3C 44815000 */ mtc1 $at, $f10 ## $f10 = 0.50 -/* 06970 80932F40 46809120 */ cvt.s.w $f4, $f18 +/* 06970 80932F40 46809120 */ cvt.s.w $f4, $f18 /* 06974 80932F44 3C014316 */ lui $at, 0x4316 ## $at = 43160000 /* 06978 80932F48 44819000 */ mtc1 $at, $f18 ## $f18 = 150.00 /* 0697C 80932F4C 860800B4 */ lh $t0, 0x00B4($s0) ## 000000B4 /* 06980 80932F50 3C01BA00 */ lui $at, 0xBA00 ## $at = BA000000 /* 06984 80932F54 86090198 */ lh $t1, 0x0198($s0) ## 00000198 -/* 06988 80932F58 46062202 */ mul.s $f8, $f4, $f6 +/* 06988 80932F58 46062202 */ mul.s $f8, $f4, $f6 /* 0698C 80932F5C 44813000 */ mtc1 $at, $f6 ## $f6 = -0.00 -/* 06990 80932F60 460A4400 */ add.s $f16, $f8, $f10 +/* 06990 80932F60 460A4400 */ add.s $f16, $f8, $f10 /* 06994 80932F64 44885000 */ mtc1 $t0, $f10 ## $f10 = 0.00 -/* 06998 80932F68 46128102 */ mul.s $f4, $f16, $f18 -/* 0699C 80932F6C 46805420 */ cvt.s.w $f16, $f10 -/* 069A0 80932F70 46062202 */ mul.s $f8, $f4, $f6 +/* 06998 80932F68 46128102 */ mul.s $f4, $f16, $f18 +/* 0699C 80932F6C 46805420 */ cvt.s.w $f16, $f10 +/* 069A0 80932F70 46062202 */ mul.s $f8, $f4, $f6 /* 069A4 80932F74 00000000 */ nop -/* 069A8 80932F78 46104482 */ mul.s $f18, $f8, $f16 -/* 069AC 80932F7C 15200003 */ bne $t1, $zero, .L80932F8C +/* 069A8 80932F78 46104482 */ mul.s $f18, $f8, $f16 +/* 069AC 80932F7C 15200003 */ bne $t1, $zero, .L80932F8C /* 069B0 80932F80 E6120028 */ swc1 $f18, 0x0028($s0) ## 00000028 -/* 069B4 80932F84 0C24CBE8 */ jal func_80932FA0 +/* 069B4 80932F84 0C24CBE8 */ jal func_80932FA0 /* 069B8 80932F88 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 .L80932F8C: -/* 069BC 80932F8C 8FBF001C */ lw $ra, 0x001C($sp) -/* 069C0 80932F90 8FB00018 */ lw $s0, 0x0018($sp) +/* 069BC 80932F8C 8FBF001C */ lw $ra, 0x001C($sp) +/* 069C0 80932F90 8FB00018 */ lw $s0, 0x0018($sp) /* 069C4 80932F94 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 069C8 80932F98 03E00008 */ jr $ra +/* 069C8 80932F98 03E00008 */ jr $ra /* 069CC 80932F9C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80932FA0.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80932FA0.s index 232d2a9bdd..be37612692 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80932FA0.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80932FA0.s @@ -1,23 +1,23 @@ glabel func_80932FA0 /* 069D0 80932FA0 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 069D4 80932FA4 AFBF0014 */ sw $ra, 0x0014($sp) +/* 069D4 80932FA4 AFBF0014 */ sw $ra, 0x0014($sp) /* 069D8 80932FA8 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 /* 069DC 80932FAC 84EE001C */ lh $t6, 0x001C($a3) ## 0000001C /* 069E0 80932FB0 3C058093 */ lui $a1, %hi(D_80937854) ## $a1 = 80930000 -/* 069E4 80932FB4 AFA70018 */ sw $a3, 0x0018($sp) -/* 069E8 80932FB8 000E7880 */ sll $t7, $t6, 2 -/* 069EC 80932FBC 00AF2821 */ addu $a1, $a1, $t7 -/* 069F0 80932FC0 8CA57854 */ lw $a1, %lo(D_80937854)($a1) +/* 069E4 80932FB4 AFA70018 */ sw $a3, 0x0018($sp) +/* 069E8 80932FB8 000E7880 */ sll $t7, $t6, 2 +/* 069EC 80932FBC 00AF2821 */ addu $a1, $a1, $t7 +/* 069F0 80932FC0 8CA57854 */ lw $a1, %lo(D_80937854)($a1) /* 069F4 80932FC4 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 069F8 80932FC8 0C029490 */ jal func_800A5240 +/* 069F8 80932FC8 0C029490 */ jal SkelAnime_ChangeAnimTransitionStop /* 069FC 80932FCC 3C0640A0 */ lui $a2, 0x40A0 ## $a2 = 40A00000 -/* 06A00 80932FD0 8FA70018 */ lw $a3, 0x0018($sp) +/* 06A00 80932FD0 8FA70018 */ lw $a3, 0x0018($sp) /* 06A04 80932FD4 3C188093 */ lui $t8, %hi(func_80932FF0) ## $t8 = 80930000 /* 06A08 80932FD8 27182FF0 */ addiu $t8, $t8, %lo(func_80932FF0) ## $t8 = 80932FF0 /* 06A0C 80932FDC ACF80190 */ sw $t8, 0x0190($a3) ## 00000190 -/* 06A10 80932FE0 8FBF0014 */ lw $ra, 0x0014($sp) +/* 06A10 80932FE0 8FBF0014 */ lw $ra, 0x0014($sp) /* 06A14 80932FE4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 06A18 80932FE8 03E00008 */ jr $ra +/* 06A18 80932FE8 03E00008 */ jr $ra /* 06A1C 80932FEC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80933064.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80933064.s index ae31436017..a2d3b4ef6c 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80933064.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80933064.s @@ -1,23 +1,23 @@ glabel func_80933064 /* 06A94 80933064 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 06A98 80933068 AFBF0014 */ sw $ra, 0x0014($sp) +/* 06A98 80933068 AFBF0014 */ sw $ra, 0x0014($sp) /* 06A9C 8093306C 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 /* 06AA0 80933070 84EE001C */ lh $t6, 0x001C($a3) ## 0000001C /* 06AA4 80933074 3C058093 */ lui $a1, %hi(D_80937854) ## $a1 = 80930000 -/* 06AA8 80933078 AFA70018 */ sw $a3, 0x0018($sp) -/* 06AAC 8093307C 000E7880 */ sll $t7, $t6, 2 -/* 06AB0 80933080 00AF2821 */ addu $a1, $a1, $t7 -/* 06AB4 80933084 8CA57854 */ lw $a1, %lo(D_80937854)($a1) +/* 06AA8 80933078 AFA70018 */ sw $a3, 0x0018($sp) +/* 06AAC 8093307C 000E7880 */ sll $t7, $t6, 2 +/* 06AB0 80933080 00AF2821 */ addu $a1, $a1, $t7 +/* 06AB4 80933084 8CA57854 */ lw $a1, %lo(D_80937854)($a1) /* 06AB8 80933088 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 06ABC 8093308C 0C029490 */ jal func_800A5240 +/* 06ABC 8093308C 0C029490 */ jal SkelAnime_ChangeAnimTransitionStop /* 06AC0 80933090 3C064040 */ lui $a2, 0x4040 ## $a2 = 40400000 -/* 06AC4 80933094 8FA70018 */ lw $a3, 0x0018($sp) +/* 06AC4 80933094 8FA70018 */ lw $a3, 0x0018($sp) /* 06AC8 80933098 3C188093 */ lui $t8, %hi(func_809330B4) ## $t8 = 80930000 /* 06ACC 8093309C 271830B4 */ addiu $t8, $t8, %lo(func_809330B4) ## $t8 = 809330B4 /* 06AD0 809330A0 ACF80190 */ sw $t8, 0x0190($a3) ## 00000190 -/* 06AD4 809330A4 8FBF0014 */ lw $ra, 0x0014($sp) +/* 06AD4 809330A4 8FBF0014 */ lw $ra, 0x0014($sp) /* 06AD8 809330A8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 06ADC 809330AC 03E00008 */ jr $ra +/* 06ADC 809330AC 03E00008 */ jr $ra /* 06AE0 809330B0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8093323C.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8093323C.s index 4c9ba4cc09..87b9aa8fdf 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8093323C.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8093323C.s @@ -1,24 +1,24 @@ glabel func_8093323C /* 06C6C 8093323C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 06C70 80933240 AFBF0014 */ sw $ra, 0x0014($sp) +/* 06C70 80933240 AFBF0014 */ sw $ra, 0x0014($sp) /* 06C74 80933244 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 /* 06C78 80933248 84EE001C */ lh $t6, 0x001C($a3) ## 0000001C /* 06C7C 8093324C 3C058093 */ lui $a1, %hi(D_8093787C) ## $a1 = 80930000 -/* 06C80 80933250 AFA70018 */ sw $a3, 0x0018($sp) -/* 06C84 80933254 000E7880 */ sll $t7, $t6, 2 -/* 06C88 80933258 00AF2821 */ addu $a1, $a1, $t7 -/* 06C8C 8093325C 8CA5787C */ lw $a1, %lo(D_8093787C)($a1) +/* 06C80 80933250 AFA70018 */ sw $a3, 0x0018($sp) +/* 06C84 80933254 000E7880 */ sll $t7, $t6, 2 +/* 06C88 80933258 00AF2821 */ addu $a1, $a1, $t7 +/* 06C8C 8093325C 8CA5787C */ lw $a1, %lo(D_8093787C)($a1) /* 06C90 80933260 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 06C94 80933264 0C029490 */ jal func_800A5240 +/* 06C94 80933264 0C029490 */ jal SkelAnime_ChangeAnimTransitionStop /* 06C98 80933268 3C064120 */ lui $a2, 0x4120 ## $a2 = 41200000 -/* 06C9C 8093326C 8FA70018 */ lw $a3, 0x0018($sp) +/* 06C9C 8093326C 8FA70018 */ lw $a3, 0x0018($sp) /* 06CA0 80933270 3C188093 */ lui $t8, %hi(func_80933290) ## $t8 = 80930000 /* 06CA4 80933274 27183290 */ addiu $t8, $t8, %lo(func_80933290) ## $t8 = 80933290 /* 06CA8 80933278 A0E00195 */ sb $zero, 0x0195($a3) ## 00000195 /* 06CAC 8093327C ACF80190 */ sw $t8, 0x0190($a3) ## 00000190 -/* 06CB0 80933280 8FBF0014 */ lw $ra, 0x0014($sp) +/* 06CB0 80933280 8FBF0014 */ lw $ra, 0x0014($sp) /* 06CB4 80933284 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 06CB8 80933288 03E00008 */ jr $ra +/* 06CB8 80933288 03E00008 */ jr $ra /* 06CBC 8093328C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80933290.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80933290.s index 73389e5246..d5adbcc839 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80933290.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80933290.s @@ -2,44 +2,44 @@ glabel func_80933290 /* 06CC0 80933290 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 /* 06CC4 80933294 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 /* 06CC8 80933298 44812000 */ mtc1 $at, $f4 ## $f4 = 5.00 -/* 06CCC 8093329C AFB00020 */ sw $s0, 0x0020($sp) +/* 06CCC 8093329C AFB00020 */ sw $s0, 0x0020($sp) /* 06CD0 809332A0 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 06CD4 809332A4 AFBF0024 */ sw $ra, 0x0024($sp) -/* 06CD8 809332A8 AFA50034 */ sw $a1, 0x0034($sp) +/* 06CD4 809332A4 AFBF0024 */ sw $ra, 0x0024($sp) +/* 06CD8 809332A8 AFA50034 */ sw $a1, 0x0034($sp) /* 06CDC 809332AC 3C05437A */ lui $a1, 0x437A ## $a1 = 437A0000 /* 06CE0 809332B0 24840028 */ addiu $a0, $a0, 0x0028 ## $a0 = 00000028 /* 06CE4 809332B4 3C063F00 */ lui $a2, 0x3F00 ## $a2 = 3F000000 /* 06CE8 809332B8 3C07428C */ lui $a3, 0x428C ## $a3 = 428C0000 /* 06CEC 809332BC 0C01E0C4 */ jal Math_SmoothScaleMaxMinF - -/* 06CF0 809332C0 E7A40010 */ swc1 $f4, 0x0010($sp) + +/* 06CF0 809332C0 E7A40010 */ swc1 $f4, 0x0010($sp) /* 06CF4 809332C4 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C /* 06CF8 809332C8 0C02927F */ jal SkelAnime_FrameUpdateMatrix - -/* 06CFC 809332CC AFA4002C */ sw $a0, 0x002C($sp) -/* 06D00 809332D0 1040000D */ beq $v0, $zero, .L80933308 -/* 06D04 809332D4 8FA4002C */ lw $a0, 0x002C($sp) + +/* 06CFC 809332CC AFA4002C */ sw $a0, 0x002C($sp) +/* 06D00 809332D0 1040000D */ beq $v0, $zero, .L80933308 +/* 06D04 809332D4 8FA4002C */ lw $a0, 0x002C($sp) /* 06D08 809332D8 820E0195 */ lb $t6, 0x0195($s0) ## 00000195 -/* 06D0C 809332DC 55C0000B */ bnel $t6, $zero, .L8093330C +/* 06D0C 809332DC 55C0000B */ bnel $t6, $zero, .L8093330C /* 06D10 809332E0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 06D14 809332E4 860F001C */ lh $t7, 0x001C($s0) ## 0000001C /* 06D18 809332E8 3C058093 */ lui $a1, %hi(D_80937884) ## $a1 = 80930000 /* 06D1C 809332EC 3C064120 */ lui $a2, 0x4120 ## $a2 = 41200000 -/* 06D20 809332F0 000FC080 */ sll $t8, $t7, 2 -/* 06D24 809332F4 00B82821 */ addu $a1, $a1, $t8 -/* 06D28 809332F8 0C029490 */ jal func_800A5240 -/* 06D2C 809332FC 8CA57884 */ lw $a1, %lo(D_80937884)($a1) +/* 06D20 809332F0 000FC080 */ sll $t8, $t7, 2 +/* 06D24 809332F4 00B82821 */ addu $a1, $a1, $t8 +/* 06D28 809332F8 0C029490 */ jal SkelAnime_ChangeAnimTransitionStop +/* 06D2C 809332FC 8CA57884 */ lw $a1, %lo(D_80937884)($a1) /* 06D30 80933300 24190001 */ addiu $t9, $zero, 0x0001 ## $t9 = 00000001 /* 06D34 80933304 A2190195 */ sb $t9, 0x0195($s0) ## 00000195 .L80933308: /* 06D38 80933308 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 .L8093330C: -/* 06D3C 8093330C 0C00BE5D */ jal func_8002F974 +/* 06D3C 8093330C 0C00BE5D */ jal func_8002F974 /* 06D40 80933310 24053167 */ addiu $a1, $zero, 0x3167 ## $a1 = 00003167 -/* 06D44 80933314 8FBF0024 */ lw $ra, 0x0024($sp) -/* 06D48 80933318 8FB00020 */ lw $s0, 0x0020($sp) +/* 06D44 80933314 8FBF0024 */ lw $ra, 0x0024($sp) +/* 06D48 80933318 8FB00020 */ lw $s0, 0x0020($sp) /* 06D4C 8093331C 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 06D50 80933320 03E00008 */ jr $ra +/* 06D50 80933320 03E00008 */ jr $ra /* 06D54 80933324 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80933554.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80933554.s index d867928f44..e0f18395d9 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80933554.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_80933554.s @@ -1,49 +1,49 @@ glabel func_80933554 /* 06F84 80933554 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 06F88 80933558 AFBF001C */ sw $ra, 0x001C($sp) -/* 06F8C 8093355C AFB00018 */ sw $s0, 0x0018($sp) +/* 06F88 80933558 AFBF001C */ sw $ra, 0x001C($sp) +/* 06F8C 8093355C AFB00018 */ sw $s0, 0x0018($sp) /* 06F90 80933560 848F001C */ lh $t7, 0x001C($a0) ## 0000001C /* 06F94 80933564 3C018093 */ lui $at, %hi(D_8093746C) ## $at = 80930000 /* 06F98 80933568 240E000A */ addiu $t6, $zero, 0x000A ## $t6 = 0000000A -/* 06F9C 8093356C 000FC080 */ sll $t8, $t7, 2 -/* 06FA0 80933570 00380821 */ addu $at, $at, $t8 +/* 06F9C 8093356C 000FC080 */ sll $t8, $t7, 2 +/* 06FA0 80933570 00380821 */ addu $at, $at, $t8 /* 06FA4 80933574 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 06FA8 80933578 AC2E746C */ sw $t6, %lo(D_8093746C)($at) +/* 06FA8 80933578 AC2E746C */ sw $t6, %lo(D_8093746C)($at) /* 06FAC 8093357C 8619001C */ lh $t9, 0x001C($s0) ## 0000001C /* 06FB0 80933580 3C058093 */ lui $a1, %hi(D_80937864) ## $a1 = 80930000 /* 06FB4 80933584 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 06FB8 80933588 00194080 */ sll $t0, $t9, 2 -/* 06FBC 8093358C 00A82821 */ addu $a1, $a1, $t0 -/* 06FC0 80933590 8CA57864 */ lw $a1, %lo(D_80937864)($a1) -/* 06FC4 80933594 0C029490 */ jal func_800A5240 +/* 06FB8 80933588 00194080 */ sll $t0, $t9, 2 +/* 06FBC 8093358C 00A82821 */ addu $a1, $a1, $t0 +/* 06FC0 80933590 8CA57864 */ lw $a1, %lo(D_80937864)($a1) +/* 06FC4 80933594 0C029490 */ jal SkelAnime_ChangeAnimTransitionStop /* 06FC8 80933598 3C0640A0 */ lui $a2, 0x40A0 ## $a2 = 40A00000 /* 06FCC 8093359C 92090196 */ lbu $t1, 0x0196($s0) ## 00000196 /* 06FD0 809335A0 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 /* 06FD4 809335A4 A2000195 */ sb $zero, 0x0195($s0) ## 00000195 -/* 06FD8 809335A8 15210002 */ bne $t1, $at, .L809335B4 +/* 06FD8 809335A8 15210002 */ bne $t1, $at, .L809335B4 /* 06FDC 809335AC A2000114 */ sb $zero, 0x0114($s0) ## 00000114 /* 06FE0 809335B0 A2000196 */ sb $zero, 0x0196($s0) ## 00000196 .L809335B4: /* 06FE4 809335B4 8E05011C */ lw $a1, 0x011C($s0) ## 0000011C /* 06FE8 809335B8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 06FEC 809335BC 0C00B6EC */ jal func_8002DBB0 +/* 06FEC 809335BC 0C00B6EC */ jal func_8002DBB0 /* 06FF0 809335C0 24A503C8 */ addiu $a1, $a1, 0x03C8 ## $a1 = 000003C8 /* 06FF4 809335C4 8E05011C */ lw $a1, 0x011C($s0) ## 0000011C /* 06FF8 809335C8 E60003C4 */ swc1 $f0, 0x03C4($s0) ## 000003C4 /* 06FFC 809335CC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 07000 809335D0 0C00B6B0 */ jal func_8002DAC0 +/* 07000 809335D0 0C00B6B0 */ jal func_8002DAC0 /* 07004 809335D4 24A503C8 */ addiu $a1, $a1, 0x03C8 ## $a1 = 000003C8 /* 07008 809335D8 A60201A4 */ sh $v0, 0x01A4($s0) ## 000001A4 /* 0700C 809335DC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 07010 809335E0 0C24CF3B */ jal func_80933CEC +/* 07010 809335E0 0C24CF3B */ jal func_80933CEC /* 07014 809335E4 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 /* 07018 809335E8 3C0A8093 */ lui $t2, %hi(func_80933608) ## $t2 = 80930000 /* 0701C 809335EC 254A3608 */ addiu $t2, $t2, %lo(func_80933608) ## $t2 = 80933608 /* 07020 809335F0 AE0A0190 */ sw $t2, 0x0190($s0) ## 00000190 -/* 07024 809335F4 8FBF001C */ lw $ra, 0x001C($sp) -/* 07028 809335F8 8FB00018 */ lw $s0, 0x0018($sp) +/* 07024 809335F4 8FBF001C */ lw $ra, 0x001C($sp) +/* 07028 809335F8 8FB00018 */ lw $s0, 0x0018($sp) /* 0702C 809335FC 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 07030 80933600 03E00008 */ jr $ra +/* 07030 80933600 03E00008 */ jr $ra /* 07034 80933604 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_809352DC.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_809352DC.s index b627c6c2eb..a9dd67376f 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_809352DC.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_809352DC.s @@ -1,24 +1,24 @@ glabel func_809352DC /* 08D0C 809352DC 27BDFF60 */ addiu $sp, $sp, 0xFF60 ## $sp = FFFFFF60 -/* 08D10 809352E0 AFBF002C */ sw $ra, 0x002C($sp) -/* 08D14 809352E4 AFB10028 */ sw $s1, 0x0028($sp) -/* 08D18 809352E8 AFB00024 */ sw $s0, 0x0024($sp) -/* 08D1C 809352EC AFA500A4 */ sw $a1, 0x00A4($sp) +/* 08D10 809352E0 AFBF002C */ sw $ra, 0x002C($sp) +/* 08D14 809352E4 AFB10028 */ sw $s1, 0x0028($sp) +/* 08D18 809352E8 AFB00024 */ sw $s0, 0x0024($sp) +/* 08D1C 809352EC AFA500A4 */ sw $a1, 0x00A4($sp) /* 08D20 809352F0 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 /* 08D24 809352F4 00808825 */ or $s1, $a0, $zero ## $s1 = 00000000 /* 08D28 809352F8 3C068093 */ lui $a2, %hi(D_80937910) ## $a2 = 80930000 /* 08D2C 809352FC 24C67910 */ addiu $a2, $a2, %lo(D_80937910) ## $a2 = 80937910 /* 08D30 80935300 27A40084 */ addiu $a0, $sp, 0x0084 ## $a0 = FFFFFFE4 /* 08D34 80935304 24071A9A */ addiu $a3, $zero, 0x1A9A ## $a3 = 00001A9A -/* 08D38 80935308 0C031AB1 */ jal func_800C6AC4 +/* 08D38 80935308 0C031AB1 */ jal Graph_OpenDisps /* 08D3C 8093530C 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 /* 08D40 80935310 8E2F0004 */ lw $t7, 0x0004($s1) ## 00000004 /* 08D44 80935314 24010080 */ addiu $at, $zero, 0x0080 ## $at = 00000080 -/* 08D48 80935318 8FB900A4 */ lw $t9, 0x00A4($sp) +/* 08D48 80935318 8FB900A4 */ lw $t9, 0x00A4($sp) /* 08D4C 8093531C 31F80080 */ andi $t8, $t7, 0x0080 ## $t8 = 00000000 -/* 08D50 80935320 1301003C */ beq $t8, $at, .L80935414 -/* 08D54 80935324 8FAA00A4 */ lw $t2, 0x00A4($sp) -/* 08D58 80935328 0C024F46 */ jal func_80093D18 +/* 08D50 80935320 1301003C */ beq $t8, $at, .L80935414 +/* 08D54 80935324 8FAA00A4 */ lw $t2, 0x00A4($sp) +/* 08D58 80935328 0C024F46 */ jal func_80093D18 /* 08D5C 8093532C 8F240000 */ lw $a0, 0x0000($t9) ## 00000000 /* 08D60 80935330 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 /* 08D64 80935334 3C09FA00 */ lui $t1, 0xFA00 ## $t1 = FA000000 @@ -31,18 +31,18 @@ glabel func_809352DC /* 08D80 80935350 908E0001 */ lbu $t6, 0x0001($a0) ## 80937465 /* 08D84 80935354 908B0000 */ lbu $t3, 0x0000($a0) ## 80937464 /* 08D88 80935358 90880002 */ lbu $t0, 0x0002($a0) ## 80937466 -/* 08D8C 8093535C 000E7C00 */ sll $t7, $t6, 16 -/* 08D90 80935360 000B6600 */ sll $t4, $t3, 24 +/* 08D8C 8093535C 000E7C00 */ sll $t7, $t6, 16 +/* 08D90 80935360 000B6600 */ sll $t4, $t3, 24 /* 08D94 80935364 018FC025 */ or $t8, $t4, $t7 ## $t8 = 00000000 -/* 08D98 80935368 00084A00 */ sll $t1, $t0, 8 +/* 08D98 80935368 00084A00 */ sll $t1, $t0, 8 /* 08D9C 8093536C 03095025 */ or $t2, $t8, $t1 ## $t2 = FA000080 /* 08DA0 80935370 354B00FF */ ori $t3, $t2, 0x00FF ## $t3 = FA0000FF /* 08DA4 80935374 3C0D8093 */ lui $t5, %hi(D_80937448) ## $t5 = 80930000 /* 08DA8 80935378 AC4B0004 */ sw $t3, 0x0004($v0) ## 00000004 -/* 08DAC 8093537C 8DAD7448 */ lw $t5, %lo(D_80937448)($t5) +/* 08DAC 8093537C 8DAD7448 */ lw $t5, %lo(D_80937448)($t5) /* 08DB0 80935380 3C048093 */ lui $a0, %hi(D_80937468) ## $a0 = 80930000 /* 08DB4 80935384 24847468 */ addiu $a0, $a0, %lo(D_80937468) ## $a0 = 80937468 -/* 08DB8 80935388 15A0000B */ bne $t5, $zero, .L809353B8 +/* 08DB8 80935388 15A0000B */ bne $t5, $zero, .L809353B8 /* 08DBC 8093538C 3C08FB00 */ lui $t0, 0xFB00 ## $t0 = FB000000 /* 08DC0 80935390 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 /* 08DC4 80935394 3C0CDB06 */ lui $t4, 0xDB06 ## $t4 = DB060000 @@ -52,7 +52,7 @@ glabel func_809352DC /* 08DD4 809353A4 25EF6290 */ addiu $t7, $t7, 0x6290 ## $t7 = 80116290 /* 08DD8 809353A8 358C0020 */ ori $t4, $t4, 0x0020 ## $t4 = DB060020 /* 08DDC 809353AC AC4C0000 */ sw $t4, 0x0000($v0) ## 00000000 -/* 08DE0 809353B0 1000002B */ beq $zero, $zero, .L80935460 +/* 08DE0 809353B0 1000002B */ beq $zero, $zero, .L80935460 /* 08DE4 809353B4 AC4F0004 */ sw $t7, 0x0004($v0) ## 00000004 .L809353B8: /* 08DE8 809353B8 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 @@ -64,10 +64,10 @@ glabel func_809352DC /* 08E00 809353D0 908D0001 */ lbu $t5, 0x0001($a0) ## 80937469 /* 08E04 809353D4 90890000 */ lbu $t1, 0x0000($a0) ## 80937468 /* 08E08 809353D8 90990002 */ lbu $t9, 0x0002($a0) ## 8093746A -/* 08E0C 809353DC 000D7400 */ sll $t6, $t5, 16 -/* 08E10 809353E0 00095600 */ sll $t2, $t1, 24 +/* 08E0C 809353DC 000D7400 */ sll $t6, $t5, 16 +/* 08E10 809353E0 00095600 */ sll $t2, $t1, 24 /* 08E14 809353E4 014E6025 */ or $t4, $t2, $t6 ## $t4 = FA000088 -/* 08E18 809353E8 00194200 */ sll $t0, $t9, 8 +/* 08E18 809353E8 00194200 */ sll $t0, $t9, 8 /* 08E1C 809353EC 0188C025 */ or $t8, $t4, $t0 ## $t8 = FB000088 /* 08E20 809353F0 AC580004 */ sw $t8, 0x0004($v0) ## 00000004 /* 08E24 809353F4 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 @@ -76,10 +76,10 @@ glabel func_809352DC /* 08E30 80935400 24490008 */ addiu $t1, $v0, 0x0008 ## $t1 = 00000008 /* 08E34 80935404 AE0902C0 */ sw $t1, 0x02C0($s0) ## 000002C0 /* 08E38 80935408 AC4D0004 */ sw $t5, 0x0004($v0) ## 00000004 -/* 08E3C 8093540C 10000014 */ beq $zero, $zero, .L80935460 +/* 08E3C 8093540C 10000014 */ beq $zero, $zero, .L80935460 /* 08E40 80935410 AC4B0000 */ sw $t3, 0x0000($v0) ## 00000000 .L80935414: -/* 08E44 80935414 0C024F61 */ jal func_80093D84 +/* 08E44 80935414 0C024F61 */ jal func_80093D84 /* 08E48 80935418 8D440000 */ lw $a0, 0x0000($t2) ## FA000080 /* 08E4C 8093541C 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 /* 08E50 80935420 3C0FFA00 */ lui $t7, 0xFA00 ## $t7 = FA000000 @@ -102,56 +102,56 @@ glabel func_809352DC /* 08E90 80935460 8E2B0190 */ lw $t3, 0x0190($s1) ## 00000190 /* 08E94 80935464 3C098093 */ lui $t1, %hi(func_8092F374) ## $t1 = 80930000 /* 08E98 80935468 2529F374 */ addiu $t1, $t1, %lo(func_8092F374) ## $t1 = 8092F374 -/* 08E9C 8093546C 552B002A */ bnel $t1, $t3, .L80935518 +/* 08E9C 8093546C 552B002A */ bnel $t1, $t3, .L80935518 /* 08EA0 80935470 8E2A0004 */ lw $t2, 0x0004($s1) ## 00000004 /* 08EA4 80935474 0C03F66B */ jal Math_Rand_ZeroOne ## Rand.Next() float /* 08EA8 80935478 00000000 */ nop /* 08EAC 8093547C 3C018093 */ lui $at, %hi(D_80937A4C) ## $at = 80930000 -/* 08EB0 80935480 C4247A4C */ lwc1 $f4, %lo(D_80937A4C)($at) -/* 08EB4 80935484 46040182 */ mul.s $f6, $f0, $f4 +/* 08EB0 80935480 C4247A4C */ lwc1 $f4, %lo(D_80937A4C)($at) +/* 08EB4 80935484 46040182 */ mul.s $f6, $f0, $f4 /* 08EB8 80935488 0C03F66B */ jal Math_Rand_ZeroOne ## Rand.Next() float -/* 08EBC 8093548C E7A60068 */ swc1 $f6, 0x0068($sp) +/* 08EBC 8093548C E7A60068 */ swc1 $f6, 0x0068($sp) /* 08EC0 80935490 3C018093 */ lui $at, %hi(D_80937A50) ## $at = 80930000 -/* 08EC4 80935494 C4287A50 */ lwc1 $f8, %lo(D_80937A50)($at) +/* 08EC4 80935494 C4287A50 */ lwc1 $f8, %lo(D_80937A50)($at) /* 08EC8 80935498 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 -/* 08ECC 8093549C 46080302 */ mul.s $f12, $f0, $f8 -/* 08ED0 809354A0 0C034348 */ jal Matrix_RotateY -/* 08ED4 809354A4 E7AC0064 */ swc1 $f12, 0x0064($sp) -/* 08ED8 809354A8 C7AC0068 */ lwc1 $f12, 0x0068($sp) -/* 08EDC 809354AC 0C0342DC */ jal Matrix_RotateX +/* 08ECC 8093549C 46080302 */ mul.s $f12, $f0, $f8 +/* 08ED0 809354A0 0C034348 */ jal Matrix_RotateY +/* 08ED4 809354A4 E7AC0064 */ swc1 $f12, 0x0064($sp) +/* 08ED8 809354A8 C7AC0068 */ lwc1 $f12, 0x0068($sp) +/* 08EDC 809354AC 0C0342DC */ jal Matrix_RotateX /* 08EE0 809354B0 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 /* 08EE4 809354B4 862D0198 */ lh $t5, 0x0198($s1) ## 00000198 /* 08EE8 809354B8 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 /* 08EEC 809354BC 44811000 */ mtc1 $at, $f2 ## $f2 = 1.00 /* 08EF0 809354C0 448D5000 */ mtc1 $t5, $f10 ## $f10 = 0.00 /* 08EF4 809354C4 3C018093 */ lui $at, %hi(D_80937A54) ## $at = 80930000 -/* 08EF8 809354C8 C4307A54 */ lwc1 $f16, %lo(D_80937A54)($at) -/* 08EFC 809354CC 46805020 */ cvt.s.w $f0, $f10 +/* 08EF8 809354C8 C4307A54 */ lwc1 $f16, %lo(D_80937A54)($at) +/* 08EFC 809354CC 46805020 */ cvt.s.w $f0, $f10 /* 08F00 809354D0 3C018093 */ lui $at, %hi(D_80937A58) ## $at = 80930000 -/* 08F04 809354D4 C4247A58 */ lwc1 $f4, %lo(D_80937A58)($at) +/* 08F04 809354D4 C4247A58 */ lwc1 $f4, %lo(D_80937A58)($at) /* 08F08 809354D8 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 08F0C 809354DC 46100482 */ mul.s $f18, $f0, $f16 -/* 08F10 809354E0 46029300 */ add.s $f12, $f18, $f2 -/* 08F14 809354E4 46040182 */ mul.s $f6, $f0, $f4 -/* 08F18 809354E8 44066000 */ mfc1 $a2, $f12 -/* 08F1C 809354EC 0C0342A3 */ jal Matrix_Scale -/* 08F20 809354F0 46061381 */ sub.s $f14, $f2, $f6 -/* 08F24 809354F4 C7AC0068 */ lwc1 $f12, 0x0068($sp) +/* 08F0C 809354DC 46100482 */ mul.s $f18, $f0, $f16 +/* 08F10 809354E0 46029300 */ add.s $f12, $f18, $f2 +/* 08F14 809354E4 46040182 */ mul.s $f6, $f0, $f4 +/* 08F18 809354E8 44066000 */ mfc1 $a2, $f12 +/* 08F1C 809354EC 0C0342A3 */ jal Matrix_Scale +/* 08F20 809354F0 46061381 */ sub.s $f14, $f2, $f6 +/* 08F24 809354F4 C7AC0068 */ lwc1 $f12, 0x0068($sp) /* 08F28 809354F8 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 -/* 08F2C 809354FC 0C0342DC */ jal Matrix_RotateX -/* 08F30 80935500 46006307 */ neg.s $f12, $f12 -/* 08F34 80935504 C7AC0064 */ lwc1 $f12, 0x0064($sp) +/* 08F2C 809354FC 0C0342DC */ jal Matrix_RotateX +/* 08F30 80935500 46006307 */ neg.s $f12, $f12 +/* 08F34 80935504 C7AC0064 */ lwc1 $f12, 0x0064($sp) /* 08F38 80935508 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 -/* 08F3C 8093550C 0C034348 */ jal Matrix_RotateY -/* 08F40 80935510 46006307 */ neg.s $f12, $f12 +/* 08F3C 8093550C 0C034348 */ jal Matrix_RotateY +/* 08F40 80935510 46006307 */ neg.s $f12, $f12 /* 08F44 80935514 8E2A0004 */ lw $t2, 0x0004($s1) ## 00000004 .L80935518: /* 08F48 80935518 24010080 */ addiu $at, $zero, 0x0080 ## $at = 00000080 /* 08F4C 8093551C 3C088093 */ lui $t0, %hi(func_80934A44) ## $t0 = 80930000 /* 08F50 80935520 314E0080 */ andi $t6, $t2, 0x0080 ## $t6 = 00000000 -/* 08F54 80935524 11C10011 */ beq $t6, $at, .L8093556C +/* 08F54 80935524 11C10011 */ beq $t6, $at, .L8093556C /* 08F58 80935528 25084A44 */ addiu $t0, $t0, %lo(func_80934A44) ## $t0 = 80934A44 /* 08F5C 8093552C 8E250150 */ lw $a1, 0x0150($s1) ## 00000150 /* 08F60 80935530 8E26016C */ lw $a2, 0x016C($s1) ## 0000016C @@ -160,14 +160,14 @@ glabel func_809352DC /* 08F6C 8093553C 3C198093 */ lui $t9, %hi(func_80935238) ## $t9 = 80930000 /* 08F70 80935540 27395238 */ addiu $t9, $t9, %lo(func_80935238) ## $t9 = 80935238 /* 08F74 80935544 25EF4A44 */ addiu $t7, $t7, %lo(func_80934A44) ## $t7 = 80934A44 -/* 08F78 80935548 AFAF0010 */ sw $t7, 0x0010($sp) -/* 08F7C 8093554C AFB90014 */ sw $t9, 0x0014($sp) -/* 08F80 80935550 AFB10018 */ sw $s1, 0x0018($sp) +/* 08F78 80935548 AFAF0010 */ sw $t7, 0x0010($sp) +/* 08F7C 8093554C AFB90014 */ sw $t9, 0x0014($sp) +/* 08F80 80935550 AFB10018 */ sw $s1, 0x0018($sp) /* 08F84 80935554 8E0C02C0 */ lw $t4, 0x02C0($s0) ## 000002C0 -/* 08F88 80935558 8FA400A4 */ lw $a0, 0x00A4($sp) -/* 08F8C 8093555C 0C0289CF */ jal func_800A273C -/* 08F90 80935560 AFAC001C */ sw $t4, 0x001C($sp) -/* 08F94 80935564 1000000E */ beq $zero, $zero, .L809355A0 +/* 08F88 80935558 8FA400A4 */ lw $a0, 0x00A4($sp) +/* 08F8C 8093555C 0C0289CF */ jal SkelAnime_DrawSV2 +/* 08F90 80935560 AFAC001C */ sw $t4, 0x001C($sp) +/* 08F94 80935564 1000000E */ beq $zero, $zero, .L809355A0 /* 08F98 80935568 AE0202C0 */ sw $v0, 0x02C0($s0) ## 000002C0 .L8093556C: /* 08F9C 8093556C 8E250150 */ lw $a1, 0x0150($s1) ## 00000150 @@ -175,27 +175,27 @@ glabel func_809352DC /* 08FA4 80935574 9227014E */ lbu $a3, 0x014E($s1) ## 0000014E /* 08FA8 80935578 3C188093 */ lui $t8, %hi(func_80935238) ## $t8 = 80930000 /* 08FAC 8093557C 27185238 */ addiu $t8, $t8, %lo(func_80935238) ## $t8 = 80935238 -/* 08FB0 80935580 AFB80014 */ sw $t8, 0x0014($sp) -/* 08FB4 80935584 AFB10018 */ sw $s1, 0x0018($sp) -/* 08FB8 80935588 AFA80010 */ sw $t0, 0x0010($sp) +/* 08FB0 80935580 AFB80014 */ sw $t8, 0x0014($sp) +/* 08FB4 80935584 AFB10018 */ sw $s1, 0x0018($sp) +/* 08FB8 80935588 AFA80010 */ sw $t0, 0x0010($sp) /* 08FBC 8093558C 8E0902D0 */ lw $t1, 0x02D0($s0) ## 000002D0 -/* 08FC0 80935590 8FA400A4 */ lw $a0, 0x00A4($sp) -/* 08FC4 80935594 0C0289CF */ jal func_800A273C -/* 08FC8 80935598 AFA9001C */ sw $t1, 0x001C($sp) +/* 08FC0 80935590 8FA400A4 */ lw $a0, 0x00A4($sp) +/* 08FC4 80935594 0C0289CF */ jal SkelAnime_DrawSV2 +/* 08FC8 80935598 AFA9001C */ sw $t1, 0x001C($sp) /* 08FCC 8093559C AE0202D0 */ sw $v0, 0x02D0($s0) ## 000002D0 .L809355A0: /* 08FD0 809355A0 8E2D0190 */ lw $t5, 0x0190($s1) ## 00000190 /* 08FD4 809355A4 3C0B8093 */ lui $t3, %hi(func_8092CC58) ## $t3 = 80930000 /* 08FD8 809355A8 256BCC58 */ addiu $t3, $t3, %lo(func_8092CC58) ## $t3 = 8092CC58 -/* 08FDC 809355AC 556D0058 */ bnel $t3, $t5, .L80935710 -/* 08FE0 809355B0 8FB900A4 */ lw $t9, 0x00A4($sp) +/* 08FDC 809355AC 556D0058 */ bnel $t3, $t5, .L80935710 +/* 08FE0 809355B0 8FB900A4 */ lw $t9, 0x00A4($sp) /* 08FE4 809355B4 86220198 */ lh $v0, 0x0198($s1) ## 00000198 -/* 08FE8 809355B8 28410072 */ slti $at, $v0, 0x0072 -/* 08FEC 809355BC 10200053 */ beq $at, $zero, .L8093570C -/* 08FF0 809355C0 28410015 */ slti $at, $v0, 0x0015 -/* 08FF4 809355C4 14200051 */ bne $at, $zero, .L8093570C -/* 08FF8 809355C8 8FAA00A4 */ lw $t2, 0x00A4($sp) -/* 08FFC 809355CC 0C024F61 */ jal func_80093D84 +/* 08FE8 809355B8 28410072 */ slti $at, $v0, 0x0072 +/* 08FEC 809355BC 10200053 */ beq $at, $zero, .L8093570C +/* 08FF0 809355C0 28410015 */ slti $at, $v0, 0x0015 +/* 08FF4 809355C4 14200051 */ bne $at, $zero, .L8093570C +/* 08FF8 809355C8 8FAA00A4 */ lw $t2, 0x00A4($sp) +/* 08FFC 809355CC 0C024F61 */ jal func_80093D84 /* 09000 809355D0 8D440000 */ lw $a0, 0x0000($t2) ## 00000000 /* 09004 809355D4 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 /* 09008 809355D8 3C0FFA00 */ lui $t7, 0xFA00 ## $t7 = FA000000 @@ -207,66 +207,66 @@ glabel func_809352DC /* 09020 809355F0 862C0198 */ lh $t4, 0x0198($s1) ## 00000198 /* 09024 809355F4 24180388 */ addiu $t8, $zero, 0x0388 ## $t8 = 00000388 /* 09028 809355F8 3C0143E1 */ lui $at, 0x43E1 ## $at = 43E10000 -/* 0902C 809355FC 000C40C0 */ sll $t0, $t4, 3 -/* 09030 80935600 03081023 */ subu $v0, $t8, $t0 +/* 0902C 809355FC 000C40C0 */ sll $t0, $t4, 3 +/* 09030 80935600 03081023 */ subu $v0, $t8, $t0 /* 09034 80935604 44825000 */ mtc1 $v0, $f10 ## $f10 = 0.00 /* 09038 80935608 44810000 */ mtc1 $at, $f0 ## $f0 = 450.00 /* 0903C 8093560C 3C01420C */ lui $at, 0x420C ## $at = 420C0000 -/* 09040 80935610 46805420 */ cvt.s.w $f16, $f10 +/* 09040 80935610 46805420 */ cvt.s.w $f16, $f10 /* 09044 80935614 44814000 */ mtc1 $at, $f8 ## $f8 = 35.00 /* 09048 80935618 3C01C37A */ lui $at, 0xC37A ## $at = C37A0000 /* 0904C 8093561C 44819000 */ mtc1 $at, $f18 ## $f18 = -250.00 /* 09050 80935620 3C01433E */ lui $at, 0x433E ## $at = 433E0000 /* 09054 80935624 44813000 */ mtc1 $at, $f6 ## $f6 = 190.00 -/* 09058 80935628 46128100 */ add.s $f4, $f16, $f18 +/* 09058 80935628 46128100 */ add.s $f4, $f16, $f18 /* 0905C 8093562C 3C010001 */ lui $at, 0x0001 ## $at = 00010000 /* 09060 80935630 27A40054 */ addiu $a0, $sp, 0x0054 ## $a0 = FFFFFFB4 /* 09064 80935634 27A50048 */ addiu $a1, $sp, 0x0048 ## $a1 = FFFFFFA8 -/* 09068 80935638 4604003C */ c.lt.s $f0, $f4 -/* 0906C 8093563C E7A40058 */ swc1 $f4, 0x0058($sp) -/* 09070 80935640 E7A80054 */ swc1 $f8, 0x0054($sp) -/* 09074 80935644 E7A6005C */ swc1 $f6, 0x005C($sp) -/* 09078 80935648 45020003 */ bc1fl .L80935658 -/* 0907C 8093564C 8FA600A4 */ lw $a2, 0x00A4($sp) -/* 09080 80935650 E7A00058 */ swc1 $f0, 0x0058($sp) -/* 09084 80935654 8FA600A4 */ lw $a2, 0x00A4($sp) +/* 09068 80935638 4604003C */ c.lt.s $f0, $f4 +/* 0906C 8093563C E7A40058 */ swc1 $f4, 0x0058($sp) +/* 09070 80935640 E7A80054 */ swc1 $f8, 0x0054($sp) +/* 09074 80935644 E7A6005C */ swc1 $f6, 0x005C($sp) +/* 09078 80935648 45020003 */ bc1fl .L80935658 +/* 0907C 8093564C 8FA600A4 */ lw $a2, 0x00A4($sp) +/* 09080 80935650 E7A00058 */ swc1 $f0, 0x0058($sp) +/* 09084 80935654 8FA600A4 */ lw $a2, 0x00A4($sp) .L80935658: /* 09088 80935658 34211DA0 */ ori $at, $at, 0x1DA0 ## $at = 00011DA0 -/* 0908C 8093565C 0C0347BD */ jal Matrix_MultVec3fExt -/* 09090 80935660 00C13021 */ addu $a2, $a2, $at +/* 0908C 8093565C 0C0347BD */ jal Matrix_MultVec3fExt +/* 09090 80935660 00C13021 */ addu $a2, $a2, $at /* 09094 80935664 C6280024 */ lwc1 $f8, 0x0024($s1) ## 00000024 -/* 09098 80935668 C7AA0048 */ lwc1 $f10, 0x0048($sp) +/* 09098 80935668 C7AA0048 */ lwc1 $f10, 0x0048($sp) /* 0909C 8093566C C626002C */ lwc1 $f6, 0x002C($s1) ## 0000002C -/* 090A0 80935670 C7A40050 */ lwc1 $f4, 0x0050($sp) -/* 090A4 80935674 460A4300 */ add.s $f12, $f8, $f10 +/* 090A0 80935670 C7A40050 */ lwc1 $f4, 0x0050($sp) +/* 090A4 80935674 460A4300 */ add.s $f12, $f8, $f10 /* 090A8 80935678 C6300028 */ lwc1 $f16, 0x0028($s1) ## 00000028 -/* 090AC 8093567C C7B2004C */ lwc1 $f18, 0x004C($sp) -/* 090B0 80935680 46043200 */ add.s $f8, $f6, $f4 +/* 090AC 8093567C C7B2004C */ lwc1 $f18, 0x004C($sp) +/* 090B0 80935680 46043200 */ add.s $f8, $f6, $f4 /* 090B4 80935684 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 090B8 80935688 46128380 */ add.s $f14, $f16, $f18 -/* 090BC 8093568C 44064000 */ mfc1 $a2, $f8 -/* 090C0 80935690 0C034261 */ jal Matrix_Translate +/* 090B8 80935688 46128380 */ add.s $f14, $f16, $f18 +/* 090BC 8093568C 44064000 */ mfc1 $a2, $f8 +/* 090C0 80935690 0C034261 */ jal Matrix_Translate /* 090C4 80935694 00000000 */ nop /* 090C8 80935698 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 /* 090CC 8093569C 44816000 */ mtc1 $at, $f12 ## $f12 = 1.00 /* 090D0 809356A0 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 090D4 809356A4 44066000 */ mfc1 $a2, $f12 -/* 090D8 809356A8 0C0342A3 */ jal Matrix_Scale -/* 090DC 809356AC 46006386 */ mov.s $f14, $f12 +/* 090D4 809356A4 44066000 */ mfc1 $a2, $f12 +/* 090D8 809356A8 0C0342A3 */ jal Matrix_Scale +/* 090DC 809356AC 46006386 */ mov.s $f14, $f12 /* 090E0 809356B0 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 /* 090E4 809356B4 3C0BDA38 */ lui $t3, 0xDA38 ## $t3 = DA380000 /* 090E8 809356B8 356B0003 */ ori $t3, $t3, 0x0003 ## $t3 = DA380003 /* 090EC 809356BC 24490008 */ addiu $t1, $v0, 0x0008 ## $t1 = 00000008 /* 090F0 809356C0 AE0902D0 */ sw $t1, 0x02D0($s0) ## 000002D0 /* 090F4 809356C4 AC4B0000 */ sw $t3, 0x0000($v0) ## 00000000 -/* 090F8 809356C8 8FAD00A4 */ lw $t5, 0x00A4($sp) +/* 090F8 809356C8 8FAD00A4 */ lw $t5, 0x00A4($sp) /* 090FC 809356CC 3C058093 */ lui $a1, %hi(D_80937920) ## $a1 = 80930000 /* 09100 809356D0 24A57920 */ addiu $a1, $a1, %lo(D_80937920) ## $a1 = 80937920 /* 09104 809356D4 8DA40000 */ lw $a0, 0x0000($t5) ## 00000000 /* 09108 809356D8 24061B16 */ addiu $a2, $zero, 0x1B16 ## $a2 = 00001B16 -/* 0910C 809356DC 0C0346A2 */ jal Matrix_NewMtx -/* 09110 809356E0 AFA20040 */ sw $v0, 0x0040($sp) -/* 09114 809356E4 8FA30040 */ lw $v1, 0x0040($sp) +/* 0910C 809356DC 0C0346A2 */ jal Matrix_NewMtx +/* 09110 809356E0 AFA20040 */ sw $v0, 0x0040($sp) +/* 09114 809356E4 8FA30040 */ lw $v1, 0x0040($sp) /* 09118 809356E8 3C0F8093 */ lui $t7, %hi(D_80936E08) ## $t7 = 80930000 /* 0911C 809356EC 25EF6E08 */ addiu $t7, $t7, %lo(D_80936E08) ## $t7 = 80936E08 /* 09120 809356F0 AC620004 */ sw $v0, 0x0004($v1) ## 00000004 @@ -277,28 +277,28 @@ glabel func_809352DC /* 09134 80935704 AC4F0004 */ sw $t7, 0x0004($v0) ## 00000004 /* 09138 80935708 AC4E0000 */ sw $t6, 0x0000($v0) ## 00000000 .L8093570C: -/* 0913C 8093570C 8FB900A4 */ lw $t9, 0x00A4($sp) +/* 0913C 8093570C 8FB900A4 */ lw $t9, 0x00A4($sp) .L80935710: /* 09140 80935710 3C068093 */ lui $a2, %hi(D_80937930) ## $a2 = 80930000 /* 09144 80935714 24C67930 */ addiu $a2, $a2, %lo(D_80937930) ## $a2 = 80937930 /* 09148 80935718 27A40084 */ addiu $a0, $sp, 0x0084 ## $a0 = FFFFFFE4 /* 0914C 8093571C 24071B1D */ addiu $a3, $zero, 0x1B1D ## $a3 = 00001B1D -/* 09150 80935720 0C031AD5 */ jal func_800C6B54 +/* 09150 80935720 0C031AD5 */ jal Graph_CloseDisps /* 09154 80935724 8F250000 */ lw $a1, 0x0000($t9) ## 00000000 -/* 09158 80935728 8FA400A4 */ lw $a0, 0x00A4($sp) +/* 09158 80935728 8FA400A4 */ lw $a0, 0x00A4($sp) /* 0915C 8093572C 3C010001 */ lui $at, 0x0001 ## $at = 00010000 /* 09160 80935730 34211D60 */ ori $at, $at, 0x1D60 ## $at = 00011D60 /* 09164 80935734 26250038 */ addiu $a1, $s1, 0x0038 ## $a1 = 00000038 /* 09168 80935738 262603C8 */ addiu $a2, $s1, 0x03C8 ## $a2 = 000003C8 -/* 0916C 8093573C 0C029BBD */ jal func_800A6EF4 -/* 09170 80935740 00812021 */ addu $a0, $a0, $at +/* 0916C 8093573C 0C029BBD */ jal func_800A6EF4 +/* 09170 80935740 00812021 */ addu $a0, $a0, $at /* 09174 80935744 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 09178 80935748 0C24D8E7 */ jal func_8093639C -/* 0917C 8093574C 8FA500A4 */ lw $a1, 0x00A4($sp) -/* 09180 80935750 8FBF002C */ lw $ra, 0x002C($sp) -/* 09184 80935754 8FB00024 */ lw $s0, 0x0024($sp) -/* 09188 80935758 8FB10028 */ lw $s1, 0x0028($sp) -/* 0918C 8093575C 03E00008 */ jr $ra +/* 09178 80935748 0C24D8E7 */ jal func_8093639C +/* 0917C 8093574C 8FA500A4 */ lw $a1, 0x00A4($sp) +/* 09180 80935750 8FBF002C */ lw $ra, 0x002C($sp) +/* 09184 80935754 8FB00024 */ lw $s0, 0x0024($sp) +/* 09188 80935758 8FB10028 */ lw $s1, 0x0028($sp) +/* 0918C 8093575C 03E00008 */ jr $ra /* 09190 80935760 27BD00A0 */ addiu $sp, $sp, 0x00A0 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8093639C.s b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8093639C.s index c819fbecef..5c4e0be50f 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8093639C.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8093639C.s @@ -1,63 +1,63 @@ glabel func_8093639C /* 09DCC 8093639C 27BDFF10 */ addiu $sp, $sp, 0xFF10 ## $sp = FFFFFF10 -/* 09DD0 809363A0 AFBF006C */ sw $ra, 0x006C($sp) -/* 09DD4 809363A4 AFBE0068 */ sw $s8, 0x0068($sp) -/* 09DD8 809363A8 AFB70064 */ sw $s7, 0x0064($sp) -/* 09DDC 809363AC AFB60060 */ sw $s6, 0x0060($sp) -/* 09DE0 809363B0 AFB5005C */ sw $s5, 0x005C($sp) -/* 09DE4 809363B4 AFB40058 */ sw $s4, 0x0058($sp) -/* 09DE8 809363B8 AFB30054 */ sw $s3, 0x0054($sp) -/* 09DEC 809363BC AFB20050 */ sw $s2, 0x0050($sp) -/* 09DF0 809363C0 AFB1004C */ sw $s1, 0x004C($sp) -/* 09DF4 809363C4 AFB00048 */ sw $s0, 0x0048($sp) -/* 09DF8 809363C8 F7B60040 */ sdc1 $f22, 0x0040($sp) -/* 09DFC 809363CC F7B40038 */ sdc1 $f20, 0x0038($sp) -/* 09E00 809363D0 AFA500F4 */ sw $a1, 0x00F4($sp) +/* 09DD0 809363A0 AFBF006C */ sw $ra, 0x006C($sp) +/* 09DD4 809363A4 AFBE0068 */ sw $s8, 0x0068($sp) +/* 09DD8 809363A8 AFB70064 */ sw $s7, 0x0064($sp) +/* 09DDC 809363AC AFB60060 */ sw $s6, 0x0060($sp) +/* 09DE0 809363B0 AFB5005C */ sw $s5, 0x005C($sp) +/* 09DE4 809363B4 AFB40058 */ sw $s4, 0x0058($sp) +/* 09DE8 809363B8 AFB30054 */ sw $s3, 0x0054($sp) +/* 09DEC 809363BC AFB20050 */ sw $s2, 0x0050($sp) +/* 09DF0 809363C0 AFB1004C */ sw $s1, 0x004C($sp) +/* 09DF4 809363C4 AFB00048 */ sw $s0, 0x0048($sp) +/* 09DF8 809363C8 F7B60040 */ sdc1 $f22, 0x0040($sp) +/* 09DFC 809363CC F7B40038 */ sdc1 $f20, 0x0038($sp) +/* 09E00 809363D0 AFA500F4 */ sw $a1, 0x00F4($sp) /* 09E04 809363D4 908E0196 */ lbu $t6, 0x0196($a0) ## 00000196 /* 09E08 809363D8 00808825 */ or $s1, $a0, $zero ## $s1 = 00000000 /* 09E0C 809363DC 27A400CC */ addiu $a0, $sp, 0x00CC ## $a0 = FFFFFFDC -/* 09E10 809363E0 11C0015B */ beq $t6, $zero, .L80936950 +/* 09E10 809363E0 11C0015B */ beq $t6, $zero, .L80936950 /* 09E14 809363E4 3C068093 */ lui $a2, %hi(D_80937940) ## $a2 = 80930000 /* 09E18 809363E8 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 /* 09E1C 809363EC 24C67940 */ addiu $a2, $a2, %lo(D_80937940) ## $a2 = 80937940 /* 09E20 809363F0 24071C86 */ addiu $a3, $zero, 0x1C86 ## $a3 = 00001C86 -/* 09E24 809363F4 0C031AB1 */ jal func_800C6AC4 +/* 09E24 809363F4 0C031AB1 */ jal Graph_OpenDisps /* 09E28 809363F8 00A09025 */ or $s2, $a1, $zero ## $s2 = 00000000 -/* 09E2C 809363FC 8FB800F4 */ lw $t8, 0x00F4($sp) -/* 09E30 80936400 0C024F61 */ jal func_80093D84 +/* 09E2C 809363FC 8FB800F4 */ lw $t8, 0x00F4($sp) +/* 09E30 80936400 0C024F61 */ jal func_80093D84 /* 09E34 80936404 8F040000 */ lw $a0, 0x0000($t8) ## 00000000 /* 09E38 80936408 92220196 */ lbu $v0, 0x0196($s1) ## 00000196 /* 09E3C 8093640C 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 09E40 80936410 8FA800F4 */ lw $t0, 0x00F4($sp) -/* 09E44 80936414 1441007F */ bne $v0, $at, .L80936614 +/* 09E40 80936410 8FA800F4 */ lw $t0, 0x00F4($sp) +/* 09E44 80936414 1441007F */ bne $v0, $at, .L80936614 /* 09E48 80936418 3C09DB06 */ lui $t1, 0xDB06 ## $t1 = DB060000 /* 09E4C 8093641C 8E4202D0 */ lw $v0, 0x02D0($s2) ## 000002D0 /* 09E50 80936420 35290020 */ ori $t1, $t1, 0x0020 ## $t1 = DB060020 /* 09E54 80936424 3C030001 */ lui $v1, 0x0001 ## $v1 = 00010000 /* 09E58 80936428 24590008 */ addiu $t9, $v0, 0x0008 ## $t9 = 00000008 /* 09E5C 8093642C AE5902D0 */ sw $t9, 0x02D0($s2) ## 000002D0 -/* 09E60 80936430 00681821 */ addu $v1, $v1, $t0 +/* 09E60 80936430 00681821 */ addu $v1, $v1, $t0 /* 09E64 80936434 AC490000 */ sw $t1, 0x0000($v0) ## 00000000 /* 09E68 80936438 8C631DE4 */ lw $v1, 0x1DE4($v1) ## 00011DE4 /* 09E6C 8093643C 8D040000 */ lw $a0, 0x0000($t0) ## 00000000 /* 09E70 80936440 240A0020 */ addiu $t2, $zero, 0x0020 ## $t2 = 00000020 -/* 09E74 80936444 00036840 */ sll $t5, $v1, 1 +/* 09E74 80936444 00036840 */ sll $t5, $v1, 1 /* 09E78 80936448 31AE00FF */ andi $t6, $t5, 0x00FF ## $t6 = 00000000 /* 09E7C 8093644C 240B0010 */ addiu $t3, $zero, 0x0010 ## $t3 = 00000010 /* 09E80 80936450 240C0001 */ addiu $t4, $zero, 0x0001 ## $t4 = 00000001 /* 09E84 80936454 240F0040 */ addiu $t7, $zero, 0x0040 ## $t7 = 00000040 /* 09E88 80936458 24180020 */ addiu $t8, $zero, 0x0020 ## $t8 = 00000020 -/* 09E8C 8093645C AFB80028 */ sw $t8, 0x0028($sp) -/* 09E90 80936460 AFAF0024 */ sw $t7, 0x0024($sp) -/* 09E94 80936464 AFAC0018 */ sw $t4, 0x0018($sp) -/* 09E98 80936468 AFAB0014 */ sw $t3, 0x0014($sp) -/* 09E9C 8093646C AFAE0020 */ sw $t6, 0x0020($sp) -/* 09EA0 80936470 AFAA0010 */ sw $t2, 0x0010($sp) -/* 09EA4 80936474 AFA0001C */ sw $zero, 0x001C($sp) +/* 09E8C 8093645C AFB80028 */ sw $t8, 0x0028($sp) +/* 09E90 80936460 AFAF0024 */ sw $t7, 0x0024($sp) +/* 09E94 80936464 AFAC0018 */ sw $t4, 0x0018($sp) +/* 09E98 80936468 AFAB0014 */ sw $t3, 0x0014($sp) +/* 09E9C 8093646C AFAE0020 */ sw $t6, 0x0020($sp) +/* 09EA0 80936470 AFAA0010 */ sw $t2, 0x0010($sp) +/* 09EA4 80936474 AFA0001C */ sw $zero, 0x001C($sp) /* 09EA8 80936478 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 09EAC 8093647C 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 /* 09EB0 80936480 00408025 */ or $s0, $v0, $zero ## $s0 = 00000000 -/* 09EB4 80936484 0C0253D0 */ jal Draw_TwoTexScroll +/* 09EB4 80936484 0C0253D0 */ jal Gfx_TwoTexScroll /* 09EB8 80936488 306700FF */ andi $a3, $v1, 0x00FF ## $a3 = 00000000 /* 09EBC 8093648C AE020004 */ sw $v0, 0x0004($s0) ## 00000004 /* 09EC0 80936490 8E4202D0 */ lw $v0, 0x02D0($s2) ## 000002D0 @@ -81,7 +81,7 @@ glabel func_8093639C /* 09F08 809364D8 3C168093 */ lui $s6, %hi(D_80937950) ## $s6 = 80930000 /* 09F0C 809364DC AC4E0004 */ sw $t6, 0x0004($v0) ## 00000004 /* 09F10 809364E0 AC570000 */ sw $s7, 0x0000($v0) ## 00000000 -/* 09F14 809364E4 C4367A6C */ lwc1 $f22, %lo(D_80937A6C)($at) +/* 09F14 809364E4 C4367A6C */ lwc1 $f22, %lo(D_80937A6C)($at) /* 09F18 809364E8 26D67950 */ addiu $s6, $s6, %lo(D_80937950) ## $s6 = 80937950 /* 09F1C 809364EC 37DE0003 */ ori $s8, $s8, 0x0003 ## $s8 = DA380003 /* 09F20 809364F0 0000A025 */ or $s4, $zero, $zero ## $s4 = 00000000 @@ -90,64 +90,64 @@ glabel func_8093639C /* 09F28 809364F8 866F0720 */ lh $t7, 0x0720($s3) ## 00000720 /* 09F2C 809364FC 26700700 */ addiu $s0, $s3, 0x0700 ## $s0 = 00000700 /* 09F30 80936500 02002025 */ or $a0, $s0, $zero ## $a0 = 00000700 -/* 09F34 80936504 11E0003D */ beq $t7, $zero, .L809365FC -/* 09F38 80936508 8FA500F4 */ lw $a1, 0x00F4($sp) +/* 09F34 80936504 11E0003D */ beq $t7, $zero, .L809365FC +/* 09F38 80936508 8FA500F4 */ lw $a1, 0x00F4($sp) /* 09F3C 8093650C 3C150601 */ lui $s5, 0x0601 ## $s5 = 06010000 -/* 09F40 80936510 0C00D0D7 */ jal func_8003435C +/* 09F40 80936510 0C00D0D7 */ jal func_8003435C /* 09F44 80936514 26B57F80 */ addiu $s5, $s5, 0x7F80 ## $s5 = 06017F80 /* 09F48 80936518 86380722 */ lh $t8, 0x0722($s1) ## 00000722 /* 09F4C 8093651C 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 09F50 80936520 53000008 */ beql $t8, $zero, .L80936544 +/* 09F50 80936520 53000008 */ beql $t8, $zero, .L80936544 /* 09F54 80936524 C6040000 */ lwc1 $f4, 0x0000($s0) ## 00000700 /* 09F58 80936528 C60C0000 */ lwc1 $f12, 0x0000($s0) ## 00000700 /* 09F5C 8093652C C60E0004 */ lwc1 $f14, 0x0004($s0) ## 00000704 -/* 09F60 80936530 0C034261 */ jal Matrix_Translate +/* 09F60 80936530 0C034261 */ jal Matrix_Translate /* 09F64 80936534 8E060008 */ lw $a2, 0x0008($s0) ## 00000708 -/* 09F68 80936538 1000000F */ beq $zero, $zero, .L80936578 +/* 09F68 80936538 1000000F */ beq $zero, $zero, .L80936578 /* 09F6C 8093653C 86040018 */ lh $a0, 0x0018($s0) ## 00000718 /* 09F70 80936540 C6040000 */ lwc1 $f4, 0x0000($s0) ## 00000700 .L80936544: /* 09F74 80936544 C6260024 */ lwc1 $f6, 0x0024($s1) ## 00000024 /* 09F78 80936548 C6100008 */ lwc1 $f16, 0x0008($s0) ## 00000708 /* 09F7C 8093654C C632002C */ lwc1 $f18, 0x002C($s1) ## 0000002C -/* 09F80 80936550 46062300 */ add.s $f12, $f4, $f6 +/* 09F80 80936550 46062300 */ add.s $f12, $f4, $f6 /* 09F84 80936554 C6080004 */ lwc1 $f8, 0x0004($s0) ## 00000704 /* 09F88 80936558 C62A0028 */ lwc1 $f10, 0x0028($s1) ## 00000028 -/* 09F8C 8093655C 46128100 */ add.s $f4, $f16, $f18 +/* 09F8C 8093655C 46128100 */ add.s $f4, $f16, $f18 /* 09F90 80936560 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 09F94 80936564 460A4380 */ add.s $f14, $f8, $f10 -/* 09F98 80936568 44062000 */ mfc1 $a2, $f4 -/* 09F9C 8093656C 0C034261 */ jal Matrix_Translate +/* 09F94 80936564 460A4380 */ add.s $f14, $f8, $f10 +/* 09F98 80936568 44062000 */ mfc1 $a2, $f4 +/* 09F9C 8093656C 0C034261 */ jal Matrix_Translate /* 09FA0 80936570 00000000 */ nop /* 09FA4 80936574 86040018 */ lh $a0, 0x0018($s0) ## 00000718 .L80936578: /* 09FA8 80936578 8605001A */ lh $a1, 0x001A($s0) ## 0000071A /* 09FAC 8093657C 8606001C */ lh $a2, 0x001C($s0) ## 0000071C -/* 09FB0 80936580 0C034421 */ jal Matrix_RotateXYZ +/* 09FB0 80936580 0C034421 */ jal Matrix_RotateZYX /* 09FB4 80936584 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 /* 09FB8 80936588 9619001E */ lhu $t9, 0x001E($s0) ## 0000071E /* 09FBC 8093658C 3C014F80 */ lui $at, 0x4F80 ## $at = 4F800000 /* 09FC0 80936590 44993000 */ mtc1 $t9, $f6 ## $f6 = 0.00 -/* 09FC4 80936594 07210004 */ bgez $t9, .L809365A8 -/* 09FC8 80936598 46803220 */ cvt.s.w $f8, $f6 +/* 09FC4 80936594 07210004 */ bgez $t9, .L809365A8 +/* 09FC8 80936598 46803220 */ cvt.s.w $f8, $f6 /* 09FCC 8093659C 44815000 */ mtc1 $at, $f10 ## $f10 = 4294967296.00 /* 09FD0 809365A0 00000000 */ nop -/* 09FD4 809365A4 460A4200 */ add.s $f8, $f8, $f10 +/* 09FD4 809365A4 460A4200 */ add.s $f8, $f8, $f10 .L809365A8: -/* 09FD8 809365A8 46164302 */ mul.s $f12, $f8, $f22 +/* 09FD8 809365A8 46164302 */ mul.s $f12, $f8, $f22 /* 09FDC 809365AC 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 09FE0 809365B0 44066000 */ mfc1 $a2, $f12 -/* 09FE4 809365B4 0C0342A3 */ jal Matrix_Scale -/* 09FE8 809365B8 46006386 */ mov.s $f14, $f12 +/* 09FE0 809365B0 44066000 */ mfc1 $a2, $f12 +/* 09FE4 809365B4 0C0342A3 */ jal Matrix_Scale +/* 09FE8 809365B8 46006386 */ mov.s $f14, $f12 /* 09FEC 809365BC 8E4202D0 */ lw $v0, 0x02D0($s2) ## 000002D0 /* 09FF0 809365C0 02C02825 */ or $a1, $s6, $zero ## $a1 = 80937950 /* 09FF4 809365C4 24061CB6 */ addiu $a2, $zero, 0x1CB6 ## $a2 = 00001CB6 /* 09FF8 809365C8 24490008 */ addiu $t1, $v0, 0x0008 ## $t1 = 00000008 /* 09FFC 809365CC AE4902D0 */ sw $t1, 0x02D0($s2) ## 000002D0 /* 0A000 809365D0 AC5E0000 */ sw $s8, 0x0000($v0) ## 00000000 -/* 0A004 809365D4 8FAA00F4 */ lw $t2, 0x00F4($sp) +/* 0A004 809365D4 8FAA00F4 */ lw $t2, 0x00F4($sp) /* 0A008 809365D8 00408025 */ or $s0, $v0, $zero ## $s0 = 00000000 -/* 0A00C 809365DC 0C0346A2 */ jal Matrix_NewMtx +/* 0A00C 809365DC 0C0346A2 */ jal Matrix_NewMtx /* 0A010 809365E0 8D440000 */ lw $a0, 0x0000($t2) ## 00000000 /* 0A014 809365E4 AE020004 */ sw $v0, 0x0004($s0) ## 00000004 /* 0A018 809365E8 8E4202D0 */ lw $v0, 0x02D0($s2) ## 000002D0 @@ -158,17 +158,17 @@ glabel func_8093639C .L809365FC: /* 0A02C 809365FC 26940028 */ addiu $s4, $s4, 0x0028 ## $s4 = 00000028 /* 0A030 80936600 240102D0 */ addiu $at, $zero, 0x02D0 ## $at = 000002D0 -/* 0A034 80936604 1681FFBC */ bne $s4, $at, .L809364F8 +/* 0A034 80936604 1681FFBC */ bne $s4, $at, .L809364F8 /* 0A038 80936608 26730028 */ addiu $s3, $s3, 0x0028 ## $s3 = 00000028 -/* 0A03C 8093660C 100000CA */ beq $zero, $zero, .L80936938 -/* 0A040 80936610 8FA900F4 */ lw $t1, 0x00F4($sp) +/* 0A03C 8093660C 100000CA */ beq $zero, $zero, .L80936938 +/* 0A040 80936610 8FA900F4 */ lw $t1, 0x00F4($sp) .L80936614: /* 0A044 80936614 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 0A048 80936618 1441007B */ bne $v0, $at, .L80936808 +/* 0A048 80936618 1441007B */ bne $v0, $at, .L80936808 /* 0A04C 8093661C 3C0DE700 */ lui $t5, 0xE700 ## $t5 = E7000000 /* 0A050 80936620 8E4202D0 */ lw $v0, 0x02D0($s2) ## 000002D0 /* 0A054 80936624 3C018093 */ lui $at, %hi(D_80937A70) ## $at = 80930000 -/* 0A058 80936628 C4347A70 */ lwc1 $f20, %lo(D_80937A70)($at) +/* 0A058 80936628 C4347A70 */ lwc1 $f20, %lo(D_80937A70)($at) /* 0A05C 8093662C 244C0008 */ addiu $t4, $v0, 0x0008 ## $t4 = 00000008 /* 0A060 80936630 AE4C02D0 */ sw $t4, 0x02D0($s2) ## 000002D0 /* 0A064 80936634 AC4D0000 */ sw $t5, 0x0000($v0) ## 00000000 @@ -179,31 +179,31 @@ glabel func_8093639C /* 0A078 80936648 244E0008 */ addiu $t6, $v0, 0x0008 ## $t6 = 00000008 /* 0A07C 8093664C AE4E02D0 */ sw $t6, 0x02D0($s2) ## 000002D0 /* 0A080 80936650 AC4F0000 */ sw $t7, 0x0000($v0) ## 00000000 -/* 0A084 80936654 8FB800F4 */ lw $t8, 0x00F4($sp) +/* 0A084 80936654 8FB800F4 */ lw $t8, 0x00F4($sp) /* 0A088 80936658 3C030001 */ lui $v1, 0x0001 ## $v1 = 00010000 /* 0A08C 8093665C 240E0040 */ addiu $t6, $zero, 0x0040 ## $t6 = 00000040 -/* 0A090 80936660 00781821 */ addu $v1, $v1, $t8 +/* 0A090 80936660 00781821 */ addu $v1, $v1, $t8 /* 0A094 80936664 8C631DE4 */ lw $v1, 0x1DE4($v1) ## 00011DE4 /* 0A098 80936668 8F040000 */ lw $a0, 0x0000($t8) ## 00000000 /* 0A09C 8093666C 240D0020 */ addiu $t5, $zero, 0x0020 ## $t5 = 00000020 -/* 0A0A0 80936670 00030823 */ subu $at, $zero, $v1 -/* 0A0A4 80936674 00015900 */ sll $t3, $at, 4 -/* 0A0A8 80936678 01615823 */ subu $t3, $t3, $at +/* 0A0A0 80936670 00030823 */ subu $at, $zero, $v1 +/* 0A0A4 80936674 00015900 */ sll $t3, $at, 4 +/* 0A0A8 80936678 01615823 */ subu $t3, $t3, $at /* 0A0AC 8093667C 316C00FF */ andi $t4, $t3, 0x00FF ## $t4 = 00000008 /* 0A0B0 80936680 24190020 */ addiu $t9, $zero, 0x0020 ## $t9 = 00000020 /* 0A0B4 80936684 24090040 */ addiu $t1, $zero, 0x0040 ## $t1 = 00000040 /* 0A0B8 80936688 240A0001 */ addiu $t2, $zero, 0x0001 ## $t2 = 00000001 -/* 0A0BC 8093668C AFAA0018 */ sw $t2, 0x0018($sp) -/* 0A0C0 80936690 AFA90014 */ sw $t1, 0x0014($sp) -/* 0A0C4 80936694 AFB90010 */ sw $t9, 0x0010($sp) -/* 0A0C8 80936698 AFAC0020 */ sw $t4, 0x0020($sp) -/* 0A0CC 8093669C AFAD0024 */ sw $t5, 0x0024($sp) -/* 0A0D0 809366A0 AFAE0028 */ sw $t6, 0x0028($sp) -/* 0A0D4 809366A4 AFA0001C */ sw $zero, 0x001C($sp) +/* 0A0BC 8093668C AFAA0018 */ sw $t2, 0x0018($sp) +/* 0A0C0 80936690 AFA90014 */ sw $t1, 0x0014($sp) +/* 0A0C4 80936694 AFB90010 */ sw $t9, 0x0010($sp) +/* 0A0C8 80936698 AFAC0020 */ sw $t4, 0x0020($sp) +/* 0A0CC 8093669C AFAD0024 */ sw $t5, 0x0024($sp) +/* 0A0D0 809366A0 AFAE0028 */ sw $t6, 0x0028($sp) +/* 0A0D4 809366A4 AFA0001C */ sw $zero, 0x001C($sp) /* 0A0D8 809366A8 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 0A0DC 809366AC 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 /* 0A0E0 809366B0 00408025 */ or $s0, $v0, $zero ## $s0 = 00000000 -/* 0A0E4 809366B4 0C0253D0 */ jal Draw_TwoTexScroll +/* 0A0E4 809366B4 0C0253D0 */ jal Gfx_TwoTexScroll /* 0A0E8 809366B8 3066007F */ andi $a2, $v1, 0x007F ## $a2 = 00000000 /* 0A0EC 809366BC AE020004 */ sw $v0, 0x0004($s0) ## 00000004 /* 0A0F0 809366C0 3C018093 */ lui $at, %hi(D_80937A74) ## $at = 80930000 @@ -211,7 +211,7 @@ glabel func_8093639C /* 0A0F8 809366C8 3C161E00 */ lui $s6, 0x1E00 ## $s6 = 1E000000 /* 0A0FC 809366CC 36D61E00 */ ori $s6, $s6, 0x1E00 ## $s6 = 1E001E00 /* 0A100 809366D0 37DE0003 */ ori $s8, $s8, 0x0003 ## $s8 = DA380003 -/* 0A104 809366D4 C4367A74 */ lwc1 $f22, %lo(D_80937A74)($at) +/* 0A104 809366D4 C4367A74 */ lwc1 $f22, %lo(D_80937A74)($at) /* 0A108 809366D8 0000A025 */ or $s4, $zero, $zero ## $s4 = 00000000 /* 0A10C 809366DC 02209825 */ or $s3, $s1, $zero ## $s3 = 00000000 /* 0A110 809366E0 3C17DE00 */ lui $s7, 0xDE00 ## $s7 = DE000000 @@ -219,27 +219,27 @@ glabel func_8093639C /* 0A114 809366E4 866F0720 */ lh $t7, 0x0720($s3) ## 00000720 /* 0A118 809366E8 26700700 */ addiu $s0, $s3, 0x0700 ## $s0 = 00000700 /* 0A11C 809366EC 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 0A120 809366F0 11E0003E */ beq $t7, $zero, .L809367EC +/* 0A120 809366F0 11E0003E */ beq $t7, $zero, .L809367EC /* 0A124 809366F4 3C150402 */ lui $s5, 0x0402 ## $s5 = 04020000 /* 0A128 809366F8 C60C0000 */ lwc1 $f12, 0x0000($s0) ## 00000700 /* 0A12C 809366FC C60E0004 */ lwc1 $f14, 0x0004($s0) ## 00000704 /* 0A130 80936700 8E060008 */ lw $a2, 0x0008($s0) ## 00000708 -/* 0A134 80936704 0C034261 */ jal Matrix_Translate +/* 0A134 80936704 0C034261 */ jal Matrix_Translate /* 0A138 80936708 26B584B0 */ addiu $s5, $s5, 0x84B0 ## $s5 = 040184B0 /* 0A13C 8093670C 9618001E */ lhu $t8, 0x001E($s0) ## 0000071E /* 0A140 80936710 3C014F80 */ lui $at, 0x4F80 ## $at = 4F800000 /* 0A144 80936714 44988000 */ mtc1 $t8, $f16 ## $f16 = 0.00 -/* 0A148 80936718 07010004 */ bgez $t8, .L8093672C -/* 0A14C 8093671C 468084A0 */ cvt.s.w $f18, $f16 +/* 0A148 80936718 07010004 */ bgez $t8, .L8093672C +/* 0A14C 8093671C 468084A0 */ cvt.s.w $f18, $f16 /* 0A150 80936720 44812000 */ mtc1 $at, $f4 ## $f4 = 4294967296.00 /* 0A154 80936724 00000000 */ nop -/* 0A158 80936728 46049480 */ add.s $f18, $f18, $f4 +/* 0A158 80936728 46049480 */ add.s $f18, $f18, $f4 .L8093672C: -/* 0A15C 8093672C 46169302 */ mul.s $f12, $f18, $f22 -/* 0A160 80936730 4600A386 */ mov.s $f14, $f20 +/* 0A15C 8093672C 46169302 */ mul.s $f12, $f18, $f22 +/* 0A160 80936730 4600A386 */ mov.s $f14, $f20 /* 0A164 80936734 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 0A168 80936738 44066000 */ mfc1 $a2, $f12 -/* 0A16C 8093673C 0C0342A3 */ jal Matrix_Scale +/* 0A168 80936738 44066000 */ mfc1 $a2, $f12 +/* 0A16C 8093673C 0C0342A3 */ jal Matrix_Scale /* 0A170 80936740 00000000 */ nop /* 0A174 80936744 8E4202D0 */ lw $v0, 0x02D0($s2) ## 000002D0 /* 0A178 80936748 3C09E700 */ lui $t1, 0xE700 ## $t1 = E7000000 @@ -258,9 +258,9 @@ glabel func_8093639C /* 0A1AC 8093677C 920C0024 */ lbu $t4, 0x0024($s0) ## 00000724 /* 0A1B0 80936780 3C058093 */ lui $a1, %hi(D_80937960) ## $a1 = 80930000 /* 0A1B4 80936784 24A57960 */ addiu $a1, $a1, %lo(D_80937960) ## $a1 = 80937960 -/* 0A1B8 80936788 018D0019 */ multu $t4, $t5 +/* 0A1B8 80936788 018D0019 */ multu $t4, $t5 /* 0A1BC 8093678C 24061CE4 */ addiu $a2, $zero, 0x1CE4 ## $a2 = 00001CE4 -/* 0A1C0 80936790 00007012 */ mflo $t6 +/* 0A1C0 80936790 00007012 */ mflo $t6 /* 0A1C4 80936794 31CF00FF */ andi $t7, $t6, 0x00FF ## $t7 = 00000000 /* 0A1C8 80936798 01F6C025 */ or $t8, $t7, $s6 ## $t8 = 1E001E00 /* 0A1CC 8093679C AC580004 */ sw $t8, 0x0004($v0) ## 00000004 @@ -273,9 +273,9 @@ glabel func_8093639C /* 0A1E8 809367B8 244A0008 */ addiu $t2, $v0, 0x0008 ## $t2 = 00000008 /* 0A1EC 809367BC AE4A02D0 */ sw $t2, 0x02D0($s2) ## 000002D0 /* 0A1F0 809367C0 AC5E0000 */ sw $s8, 0x0000($v0) ## 00000000 -/* 0A1F4 809367C4 8FAB00F4 */ lw $t3, 0x00F4($sp) +/* 0A1F4 809367C4 8FAB00F4 */ lw $t3, 0x00F4($sp) /* 0A1F8 809367C8 00408025 */ or $s0, $v0, $zero ## $s0 = 00000000 -/* 0A1FC 809367CC 0C0346A2 */ jal Matrix_NewMtx +/* 0A1FC 809367CC 0C0346A2 */ jal Matrix_NewMtx /* 0A200 809367D0 8D640000 */ lw $a0, 0x0000($t3) ## FA008080 /* 0A204 809367D4 AE020004 */ sw $v0, 0x0004($s0) ## 00000004 /* 0A208 809367D8 8E4202D0 */ lw $v0, 0x02D0($s2) ## 000002D0 @@ -287,13 +287,13 @@ glabel func_8093639C /* 0A21C 809367EC 26940028 */ addiu $s4, $s4, 0x0028 ## $s4 = 00000028 /* 0A220 809367F0 24010078 */ addiu $at, $zero, 0x0078 ## $at = 00000078 /* 0A224 809367F4 26730028 */ addiu $s3, $s3, 0x0028 ## $s3 = 00000028 -/* 0A228 809367F8 1681FFBA */ bne $s4, $at, .L809366E4 -/* 0A22C 809367FC 4616A501 */ sub.s $f20, $f20, $f22 -/* 0A230 80936800 1000004D */ beq $zero, $zero, .L80936938 -/* 0A234 80936804 8FA900F4 */ lw $t1, 0x00F4($sp) +/* 0A228 809367F8 1681FFBA */ bne $s4, $at, .L809366E4 +/* 0A22C 809367FC 4616A501 */ sub.s $f20, $f20, $f22 +/* 0A230 80936800 1000004D */ beq $zero, $zero, .L80936938 +/* 0A234 80936804 8FA900F4 */ lw $t1, 0x00F4($sp) .L80936808: /* 0A238 80936808 24010003 */ addiu $at, $zero, 0x0003 ## $at = 00000003 -/* 0A23C 8093680C 14410049 */ bne $v0, $at, .L80936934 +/* 0A23C 8093680C 14410049 */ bne $v0, $at, .L80936934 /* 0A240 80936810 3C0EFA00 */ lui $t6, 0xFA00 ## $t6 = FA000000 /* 0A244 80936814 8E4202D0 */ lw $v0, 0x02D0($s2) ## 000002D0 /* 0A248 80936818 3C0F0A0A */ lui $t7, 0x0A0A ## $t7 = 0A0A0000 @@ -317,10 +317,10 @@ glabel func_8093639C /* 0A290 80936860 862C0722 */ lh $t4, 0x0722($s1) ## 00000722 /* 0A294 80936864 3C138093 */ lui $s3, %hi(D_809372C0) ## $s3 = 80930000 /* 0A298 80936868 26300700 */ addiu $s0, $s1, 0x0700 ## $s0 = 00000700 -/* 0A29C 8093686C 12AC0031 */ beq $s5, $t4, .L80936934 +/* 0A29C 8093686C 12AC0031 */ beq $s5, $t4, .L80936934 /* 0A2A0 80936870 267372C0 */ addiu $s3, $s3, %lo(D_809372C0) ## $s3 = 809372C0 /* 0A2A4 80936874 3C018093 */ lui $at, %hi(D_80937A78) ## $at = 80930000 -/* 0A2A8 80936878 C4367A78 */ lwc1 $f22, %lo(D_80937A78)($at) +/* 0A2A8 80936878 C4367A78 */ lwc1 $f22, %lo(D_80937A78)($at) /* 0A2AC 8093687C 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 /* 0A2B0 80936880 3C1EDA38 */ lui $s8, 0xDA38 ## $s8 = DA380000 /* 0A2B4 80936884 3C148093 */ lui $s4, %hi(D_80937970) ## $s4 = 80930000 @@ -332,22 +332,22 @@ glabel func_8093639C .L8093689C: /* 0A2CC 8093689C C60E0004 */ lwc1 $f14, 0x0004($s0) ## 00000704 /* 0A2D0 809368A0 8E060008 */ lw $a2, 0x0008($s0) ## 00000708 -/* 0A2D4 809368A4 0C034261 */ jal Matrix_Translate +/* 0A2D4 809368A4 0C034261 */ jal Matrix_Translate /* 0A2D8 809368A8 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 /* 0A2DC 809368AC 960D001E */ lhu $t5, 0x001E($s0) ## 0000071E /* 0A2E0 809368B0 3C014F80 */ lui $at, 0x4F80 ## $at = 4F800000 /* 0A2E4 809368B4 448D3000 */ mtc1 $t5, $f6 ## $f6 = 0.00 -/* 0A2E8 809368B8 05A10004 */ bgez $t5, .L809368CC -/* 0A2EC 809368BC 468032A0 */ cvt.s.w $f10, $f6 +/* 0A2E8 809368B8 05A10004 */ bgez $t5, .L809368CC +/* 0A2EC 809368BC 468032A0 */ cvt.s.w $f10, $f6 /* 0A2F0 809368C0 44814000 */ mtc1 $at, $f8 ## $f8 = 4294967296.00 /* 0A2F4 809368C4 00000000 */ nop -/* 0A2F8 809368C8 46085280 */ add.s $f10, $f10, $f8 +/* 0A2F8 809368C8 46085280 */ add.s $f10, $f10, $f8 .L809368CC: -/* 0A2FC 809368CC 46165302 */ mul.s $f12, $f10, $f22 -/* 0A300 809368D0 4600A386 */ mov.s $f14, $f20 +/* 0A2FC 809368CC 46165302 */ mul.s $f12, $f10, $f22 +/* 0A300 809368D0 4600A386 */ mov.s $f14, $f20 /* 0A304 809368D4 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 0A308 809368D8 44066000 */ mfc1 $a2, $f12 -/* 0A30C 809368DC 0C0342A3 */ jal Matrix_Scale +/* 0A308 809368D8 44066000 */ mfc1 $a2, $f12 +/* 0A30C 809368DC 0C0342A3 */ jal Matrix_Scale /* 0A310 809368E0 00000000 */ nop /* 0A314 809368E4 8E4202D0 */ lw $v0, 0x02D0($s2) ## 000002D0 /* 0A318 809368E8 02802825 */ or $a1, $s4, $zero ## $a1 = 80937970 @@ -355,9 +355,9 @@ glabel func_8093639C /* 0A320 809368F0 244E0008 */ addiu $t6, $v0, 0x0008 ## $t6 = 00000008 /* 0A324 809368F4 AE4E02D0 */ sw $t6, 0x02D0($s2) ## 000002D0 /* 0A328 809368F8 AC5E0000 */ sw $s8, 0x0000($v0) ## 00000000 -/* 0A32C 809368FC 8FAF00F4 */ lw $t7, 0x00F4($sp) +/* 0A32C 809368FC 8FAF00F4 */ lw $t7, 0x00F4($sp) /* 0A330 80936900 00408825 */ or $s1, $v0, $zero ## $s1 = 00000000 -/* 0A334 80936904 0C0346A2 */ jal Matrix_NewMtx +/* 0A334 80936904 0C0346A2 */ jal Matrix_NewMtx /* 0A338 80936908 8DE40000 */ lw $a0, 0x0000($t7) ## 00000000 /* 0A33C 8093690C AE220004 */ sw $v0, 0x0004($s1) ## 00000004 /* 0A340 80936910 8E4202D0 */ lw $v0, 0x02D0($s2) ## 000002D0 @@ -367,31 +367,31 @@ glabel func_8093639C /* 0A350 80936920 AC530004 */ sw $s3, 0x0004($v0) ## 00000004 /* 0A354 80936924 AC570000 */ sw $s7, 0x0000($v0) ## 00000000 /* 0A358 80936928 86190022 */ lh $t9, 0x0022($s0) ## 0000074A -/* 0A35C 8093692C 56B9FFDB */ bnel $s5, $t9, .L8093689C +/* 0A35C 8093692C 56B9FFDB */ bnel $s5, $t9, .L8093689C /* 0A360 80936930 C60C0000 */ lwc1 $f12, 0x0000($s0) ## 00000728 .L80936934: -/* 0A364 80936934 8FA900F4 */ lw $t1, 0x00F4($sp) +/* 0A364 80936934 8FA900F4 */ lw $t1, 0x00F4($sp) .L80936938: /* 0A368 80936938 3C068093 */ lui $a2, %hi(D_80937980) ## $a2 = 80930000 /* 0A36C 8093693C 24C67980 */ addiu $a2, $a2, %lo(D_80937980) ## $a2 = 80937980 /* 0A370 80936940 27A400CC */ addiu $a0, $sp, 0x00CC ## $a0 = FFFFFFDC /* 0A374 80936944 24071D09 */ addiu $a3, $zero, 0x1D09 ## $a3 = 00001D09 -/* 0A378 80936948 0C031AD5 */ jal func_800C6B54 +/* 0A378 80936948 0C031AD5 */ jal Graph_CloseDisps /* 0A37C 8093694C 8D250000 */ lw $a1, 0x0000($t1) ## 00000000 .L80936950: -/* 0A380 80936950 8FBF006C */ lw $ra, 0x006C($sp) -/* 0A384 80936954 D7B40038 */ ldc1 $f20, 0x0038($sp) -/* 0A388 80936958 D7B60040 */ ldc1 $f22, 0x0040($sp) -/* 0A38C 8093695C 8FB00048 */ lw $s0, 0x0048($sp) -/* 0A390 80936960 8FB1004C */ lw $s1, 0x004C($sp) -/* 0A394 80936964 8FB20050 */ lw $s2, 0x0050($sp) -/* 0A398 80936968 8FB30054 */ lw $s3, 0x0054($sp) -/* 0A39C 8093696C 8FB40058 */ lw $s4, 0x0058($sp) -/* 0A3A0 80936970 8FB5005C */ lw $s5, 0x005C($sp) -/* 0A3A4 80936974 8FB60060 */ lw $s6, 0x0060($sp) -/* 0A3A8 80936978 8FB70064 */ lw $s7, 0x0064($sp) -/* 0A3AC 8093697C 8FBE0068 */ lw $s8, 0x0068($sp) -/* 0A3B0 80936980 03E00008 */ jr $ra +/* 0A380 80936950 8FBF006C */ lw $ra, 0x006C($sp) +/* 0A384 80936954 D7B40038 */ ldc1 $f20, 0x0038($sp) +/* 0A388 80936958 D7B60040 */ ldc1 $f22, 0x0040($sp) +/* 0A38C 8093695C 8FB00048 */ lw $s0, 0x0048($sp) +/* 0A390 80936960 8FB1004C */ lw $s1, 0x004C($sp) +/* 0A394 80936964 8FB20050 */ lw $s2, 0x0050($sp) +/* 0A398 80936968 8FB30054 */ lw $s3, 0x0054($sp) +/* 0A39C 8093696C 8FB40058 */ lw $s4, 0x0058($sp) +/* 0A3A0 80936970 8FB5005C */ lw $s5, 0x005C($sp) +/* 0A3A4 80936974 8FB60060 */ lw $s6, 0x0060($sp) +/* 0A3A8 80936978 8FB70064 */ lw $s7, 0x0064($sp) +/* 0A3AC 8093697C 8FBE0068 */ lw $s8, 0x0068($sp) +/* 0A3B0 80936980 03E00008 */ jr $ra /* 0A3B4 80936984 27BD00F0 */ addiu $sp, $sp, 0x00F0 ## $sp = 00000000 /* 0A3B8 80936988 00000000 */ nop /* 0A3BC 8093698C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/BossTw_Destroy.s b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/BossTw_Destroy.s index a1b250d0e5..3ef3b808dc 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/BossTw_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/BossTw_Destroy.s @@ -1,32 +1,32 @@ glabel BossTw_Destroy /* 01208 80939ED8 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 0120C 80939EDC AFA40018 */ sw $a0, 0x0018($sp) -/* 01210 80939EE0 AFA5001C */ sw $a1, 0x001C($sp) +/* 0120C 80939EDC AFA40018 */ sw $a0, 0x0018($sp) +/* 01210 80939EE0 AFA5001C */ sw $a1, 0x001C($sp) /* 01214 80939EE4 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 01218 80939EE8 8FA50018 */ lw $a1, 0x0018($sp) -/* 0121C 80939EEC AFBF0014 */ sw $ra, 0x0014($sp) +/* 01218 80939EE8 8FA50018 */ lw $a1, 0x0018($sp) +/* 0121C 80939EEC AFBF0014 */ sw $ra, 0x0014($sp) /* 01220 80939EF0 0C0170EB */ jal ActorCollider_FreeCylinder - + /* 01224 80939EF4 24A505AC */ addiu $a1, $a1, 0x05AC ## $a1 = 000005AC -/* 01228 80939EF8 8FA30018 */ lw $v1, 0x0018($sp) +/* 01228 80939EF8 8FA30018 */ lw $v1, 0x0018($sp) /* 0122C 80939EFC 8462001C */ lh $v0, 0x001C($v1) ## 0000001C /* 01230 80939F00 24640568 */ addiu $a0, $v1, 0x0568 ## $a0 = 00000568 -/* 01234 80939F04 28410064 */ slti $at, $v0, 0x0064 -/* 01238 80939F08 50200006 */ beql $at, $zero, .L80939F24 +/* 01234 80939F04 28410064 */ slti $at, $v0, 0x0064 +/* 01238 80939F08 50200006 */ beql $at, $zero, .L80939F24 /* 0123C 80939F0C 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 01240 80939F10 0C0295BC */ jal func_800A56F0 -/* 01244 80939F14 8FA5001C */ lw $a1, 0x001C($sp) -/* 01248 80939F18 8FAE0018 */ lw $t6, 0x0018($sp) +/* 01240 80939F10 0C0295BC */ jal SkelAnime_Free +/* 01244 80939F14 8FA5001C */ lw $a1, 0x001C($sp) +/* 01248 80939F18 8FAE0018 */ lw $t6, 0x0018($sp) /* 0124C 80939F1C 85C2001C */ lh $v0, 0x001C($t6) ## 0000001C /* 01250 80939F20 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 .L80939F24: -/* 01254 80939F24 14410002 */ bne $v0, $at, .L80939F30 +/* 01254 80939F24 14410002 */ bne $v0, $at, .L80939F30 /* 01258 80939F28 3C018095 */ lui $at, %hi(D_8094A89C) ## $at = 80950000 -/* 0125C 80939F2C A020A89C */ sb $zero, %lo(D_8094A89C)($at) +/* 0125C 80939F2C A020A89C */ sb $zero, %lo(D_8094A89C)($at) .L80939F30: -/* 01260 80939F30 8FBF0014 */ lw $ra, 0x0014($sp) +/* 01260 80939F30 8FBF0014 */ lw $ra, 0x0014($sp) /* 01264 80939F34 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 01268 80939F38 03E00008 */ jr $ra +/* 01268 80939F38 03E00008 */ jr $ra /* 0126C 80939F3C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/BossTw_Draw.s b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/BossTw_Draw.s index 7df1ed4a95..c51b2e3a1d 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/BossTw_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/BossTw_Draw.s @@ -1,24 +1,24 @@ glabel BossTw_Draw /* 0A5A4 80943274 27BDFF70 */ addiu $sp, $sp, 0xFF70 ## $sp = FFFFFF70 -/* 0A5A8 80943278 AFBF0044 */ sw $ra, 0x0044($sp) -/* 0A5AC 8094327C AFB20040 */ sw $s2, 0x0040($sp) -/* 0A5B0 80943280 AFB1003C */ sw $s1, 0x003C($sp) -/* 0A5B4 80943284 AFB00038 */ sw $s0, 0x0038($sp) +/* 0A5A8 80943278 AFBF0044 */ sw $ra, 0x0044($sp) +/* 0A5AC 8094327C AFB20040 */ sw $s2, 0x0040($sp) +/* 0A5B0 80943280 AFB1003C */ sw $s1, 0x003C($sp) +/* 0A5B4 80943284 AFB00038 */ sw $s0, 0x0038($sp) /* 0A5B8 80943288 8CAE1C44 */ lw $t6, 0x1C44($a1) ## 00001C44 /* 0A5BC 8094328C 00A09025 */ or $s2, $a1, $zero ## $s2 = 00000000 /* 0A5C0 80943290 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 0A5C4 80943294 AFAE0084 */ sw $t6, 0x0084($sp) +/* 0A5C4 80943294 AFAE0084 */ sw $t6, 0x0084($sp) /* 0A5C8 80943298 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 /* 0A5CC 8094329C 3C068095 */ lui $a2, %hi(D_8094AC28) ## $a2 = 80950000 /* 0A5D0 809432A0 24C6AC28 */ addiu $a2, $a2, %lo(D_8094AC28) ## $a2 = 8094AC28 /* 0A5D4 809432A4 27A40070 */ addiu $a0, $sp, 0x0070 ## $a0 = FFFFFFE0 /* 0A5D8 809432A8 24071B23 */ addiu $a3, $zero, 0x1B23 ## $a3 = 00001B23 -/* 0A5DC 809432AC 0C031AB1 */ jal func_800C6AC4 +/* 0A5DC 809432AC 0C031AB1 */ jal Graph_OpenDisps /* 0A5E0 809432B0 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 /* 0A5E4 809432B4 920F0564 */ lbu $t7, 0x0564($s0) ## 00000564 /* 0A5E8 809432B8 3C05DB06 */ lui $a1, 0xDB06 ## $a1 = DB060000 /* 0A5EC 809432BC 34A50028 */ ori $a1, $a1, 0x0028 ## $a1 = DB060028 -/* 0A5F0 809432C0 51E0013B */ beql $t7, $zero, .L809437B0 +/* 0A5F0 809432C0 51E0013B */ beql $t7, $zero, .L809437B0 /* 0A5F4 809432C4 860A001C */ lh $t2, 0x001C($s0) ## 0000001C /* 0A5F8 809432C8 8E2302C0 */ lw $v1, 0x02C0($s1) ## 000002C0 /* 0A5FC 809432CC 3C068095 */ lui $a2, %hi(D_8094A998) ## $a2 = 80950000 @@ -29,20 +29,20 @@ glabel BossTw_Draw /* 0A610 809432E0 861904CC */ lh $t9, 0x04CC($s0) ## 000004CC /* 0A614 809432E4 3C088016 */ lui $t0, 0x8016 ## $t0 = 80160000 /* 0A618 809432E8 25086FA8 */ addiu $t0, $t0, 0x6FA8 ## $t0 = 80166FA8 -/* 0A61C 809432EC 00195080 */ sll $t2, $t9, 2 -/* 0A620 809432F0 00CA5821 */ addu $t3, $a2, $t2 +/* 0A61C 809432EC 00195080 */ sll $t2, $t9, 2 +/* 0A620 809432F0 00CA5821 */ addu $t3, $a2, $t2 /* 0A624 809432F4 8D640000 */ lw $a0, 0x0000($t3) ## 00000000 /* 0A628 809432F8 3C0700FF */ lui $a3, 0x00FF ## $a3 = 00FF0000 /* 0A62C 809432FC 34E7FFFF */ ori $a3, $a3, 0xFFFF ## $a3 = 00FFFFFF -/* 0A630 80943300 00046900 */ sll $t5, $a0, 4 -/* 0A634 80943304 000D7702 */ srl $t6, $t5, 28 -/* 0A638 80943308 000E7880 */ sll $t7, $t6, 2 -/* 0A63C 8094330C 010FC021 */ addu $t8, $t0, $t7 +/* 0A630 80943300 00046900 */ sll $t5, $a0, 4 +/* 0A634 80943304 000D7702 */ srl $t6, $t5, 28 +/* 0A638 80943308 000E7880 */ sll $t7, $t6, 2 +/* 0A63C 8094330C 010FC021 */ addu $t8, $t0, $t7 /* 0A640 80943310 8F190000 */ lw $t9, 0x0000($t8) ## 00000008 -/* 0A644 80943314 00876024 */ and $t4, $a0, $a3 +/* 0A644 80943314 00876024 */ and $t4, $a0, $a3 /* 0A648 80943318 3C098000 */ lui $t1, 0x8000 ## $t1 = 80000000 -/* 0A64C 8094331C 01995021 */ addu $t2, $t4, $t9 -/* 0A650 80943320 01495821 */ addu $t3, $t2, $t1 +/* 0A64C 8094331C 01995021 */ addu $t2, $t4, $t9 +/* 0A650 80943320 01495821 */ addu $t3, $t2, $t1 /* 0A654 80943324 AC6B0004 */ sw $t3, 0x0004($v1) ## 00000004 /* 0A658 80943328 8E2202D0 */ lw $v0, 0x02D0($s1) ## 000002D0 /* 0A65C 8094332C 244D0008 */ addiu $t5, $v0, 0x0008 ## $t5 = 00000008 @@ -50,18 +50,18 @@ glabel BossTw_Draw /* 0A664 80943334 AC450000 */ sw $a1, 0x0000($v0) ## 00000000 /* 0A668 80943338 860E04CC */ lh $t6, 0x04CC($s0) ## 000004CC /* 0A66C 8094333C 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 0A670 80943340 000E7880 */ sll $t7, $t6, 2 -/* 0A674 80943344 00CFC021 */ addu $t8, $a2, $t7 +/* 0A670 80943340 000E7880 */ sll $t7, $t6, 2 +/* 0A674 80943344 00CFC021 */ addu $t8, $a2, $t7 /* 0A678 80943348 8F040000 */ lw $a0, 0x0000($t8) ## 00000008 -/* 0A67C 8094334C 0004C900 */ sll $t9, $a0, 4 -/* 0A680 80943350 00195702 */ srl $t2, $t9, 28 -/* 0A684 80943354 000A5880 */ sll $t3, $t2, 2 -/* 0A688 80943358 010B6821 */ addu $t5, $t0, $t3 +/* 0A67C 8094334C 0004C900 */ sll $t9, $a0, 4 +/* 0A680 80943350 00195702 */ srl $t2, $t9, 28 +/* 0A684 80943354 000A5880 */ sll $t3, $t2, 2 +/* 0A688 80943358 010B6821 */ addu $t5, $t0, $t3 /* 0A68C 8094335C 8DAE0000 */ lw $t6, 0x0000($t5) ## 00000008 -/* 0A690 80943360 00876024 */ and $t4, $a0, $a3 +/* 0A690 80943360 00876024 */ and $t4, $a0, $a3 /* 0A694 80943364 3C0ADB06 */ lui $t2, 0xDB06 ## $t2 = DB060000 -/* 0A698 80943368 018E7821 */ addu $t7, $t4, $t6 -/* 0A69C 8094336C 01E9C021 */ addu $t8, $t7, $t1 +/* 0A698 80943368 018E7821 */ addu $t7, $t4, $t6 +/* 0A69C 8094336C 01E9C021 */ addu $t8, $t7, $t1 /* 0A6A0 80943370 AC580004 */ sw $t8, 0x0004($v0) ## 00000004 /* 0A6A4 80943374 8E2202D0 */ lw $v0, 0x02D0($s1) ## 000002D0 /* 0A6A8 80943378 354A0020 */ ori $t2, $t2, 0x0020 ## $t2 = DB060020 @@ -74,42 +74,42 @@ glabel BossTw_Draw /* 0A6C4 80943394 8E440000 */ lw $a0, 0x0000($s2) ## 00000000 /* 0A6C8 80943398 240E0020 */ addiu $t6, $zero, 0x0020 ## $t6 = 00000020 /* 0A6CC 8094339C 240C0020 */ addiu $t4, $zero, 0x0020 ## $t4 = 00000020 -/* 0A6D0 809433A0 AFAC0010 */ sw $t4, 0x0010($sp) -/* 0A6D4 809433A4 AFAE0014 */ sw $t6, 0x0014($sp) -/* 0A6D8 809433A8 AFAF0018 */ sw $t7, 0x0018($sp) +/* 0A6D0 809433A0 AFAC0010 */ sw $t4, 0x0010($sp) +/* 0A6D4 809433A4 AFAE0014 */ sw $t6, 0x0014($sp) +/* 0A6D8 809433A8 AFAF0018 */ sw $t7, 0x0018($sp) /* 0A6DC 809433AC C6120188 */ lwc1 $f18, 0x0188($s0) ## 00000188 -/* 0A6E0 809433B0 4600218D */ trunc.w.s $f6, $f4 +/* 0A6E0 809433B0 4600218D */ trunc.w.s $f6, $f4 /* 0A6E4 809433B4 240A0020 */ addiu $t2, $zero, 0x0020 ## $t2 = 00000020 -/* 0A6E8 809433B8 4600910D */ trunc.w.s $f4, $f18 -/* 0A6EC 809433BC 44063000 */ mfc1 $a2, $f6 -/* 0A6F0 809433C0 4600428D */ trunc.w.s $f10, $f8 -/* 0A6F4 809433C4 440B2000 */ mfc1 $t3, $f4 -/* 0A6F8 809433C8 00063400 */ sll $a2, $a2, 16 -/* 0A6FC 809433CC 00063403 */ sra $a2, $a2, 16 +/* 0A6E8 809433B8 4600910D */ trunc.w.s $f4, $f18 +/* 0A6EC 809433BC 44063000 */ mfc1 $a2, $f6 +/* 0A6F0 809433C0 4600428D */ trunc.w.s $f10, $f8 +/* 0A6F4 809433C4 440B2000 */ mfc1 $t3, $f4 +/* 0A6F8 809433C8 00063400 */ sll $a2, $a2, 16 +/* 0A6FC 809433CC 00063403 */ sra $a2, $a2, 16 /* 0A700 809433D0 316D007F */ andi $t5, $t3, 0x007F ## $t5 = 00000000 -/* 0A704 809433D4 AFAD001C */ sw $t5, 0x001C($sp) +/* 0A704 809433D4 AFAD001C */ sw $t5, 0x001C($sp) /* 0A708 809433D8 C6060198 */ lwc1 $f6, 0x0198($s0) ## 00000198 -/* 0A70C 809433DC 44075000 */ mfc1 $a3, $f10 +/* 0A70C 809433DC 44075000 */ mfc1 $a3, $f10 /* 0A710 809433E0 240B0040 */ addiu $t3, $zero, 0x0040 ## $t3 = 00000040 -/* 0A714 809433E4 4600320D */ trunc.w.s $f8, $f6 -/* 0A718 809433E8 00073C00 */ sll $a3, $a3, 16 -/* 0A71C 809433EC 00073C03 */ sra $a3, $a3, 16 +/* 0A714 809433E4 4600320D */ trunc.w.s $f8, $f6 +/* 0A718 809433E8 00073C00 */ sll $a3, $a3, 16 +/* 0A71C 809433EC 00073C03 */ sra $a3, $a3, 16 /* 0A720 809433F0 30E7007F */ andi $a3, $a3, 0x007F ## $a3 = 0000007F -/* 0A724 809433F4 44184000 */ mfc1 $t8, $f8 -/* 0A728 809433F8 AFAB0028 */ sw $t3, 0x0028($sp) -/* 0A72C 809433FC AFAA0024 */ sw $t2, 0x0024($sp) +/* 0A724 809433F4 44184000 */ mfc1 $t8, $f8 +/* 0A728 809433F8 AFAB0028 */ sw $t3, 0x0028($sp) +/* 0A72C 809433FC AFAA0024 */ sw $t2, 0x0024($sp) /* 0A730 80943400 331900FF */ andi $t9, $t8, 0x00FF ## $t9 = 00000008 -/* 0A734 80943404 AFB90020 */ sw $t9, 0x0020($sp) +/* 0A734 80943404 AFB90020 */ sw $t9, 0x0020($sp) /* 0A738 80943408 30C6007F */ andi $a2, $a2, 0x007F ## $a2 = 00000018 -/* 0A73C 8094340C 0C0253D0 */ jal Draw_TwoTexScroll -/* 0A740 80943410 AFA20064 */ sw $v0, 0x0064($sp) -/* 0A744 80943414 8FA30064 */ lw $v1, 0x0064($sp) +/* 0A73C 8094340C 0C0253D0 */ jal Gfx_TwoTexScroll +/* 0A740 80943410 AFA20064 */ sw $v0, 0x0064($sp) +/* 0A744 80943414 8FA30064 */ lw $v1, 0x0064($sp) /* 0A748 80943418 3C0BDB06 */ lui $t3, 0xDB06 ## $t3 = DB060000 /* 0A74C 8094341C 356B0024 */ ori $t3, $t3, 0x0024 ## $t3 = DB060024 /* 0A750 80943420 AC620004 */ sw $v0, 0x0004($v1) ## 00000004 /* 0A754 80943424 860D001C */ lh $t5, 0x001C($s0) ## 0000001C /* 0A758 80943428 240E0020 */ addiu $t6, $zero, 0x0020 ## $t6 = 00000020 -/* 0A75C 8094342C 55A0001D */ bnel $t5, $zero, .L809434A4 +/* 0A75C 8094342C 55A0001D */ bnel $t5, $zero, .L809434A4 /* 0A760 80943430 8E2202D0 */ lw $v0, 0x02D0($s1) ## 000002D0 /* 0A764 80943434 8E2202D0 */ lw $v0, 0x02D0($s1) ## 000002D0 /* 0A768 80943438 3C0EDB06 */ lui $t6, 0xDB06 ## $t6 = DB060000 @@ -120,23 +120,23 @@ glabel BossTw_Draw /* 0A77C 8094344C C604019C */ lwc1 $f4, 0x019C($s0) ## 0000019C /* 0A780 80943450 C60A018C */ lwc1 $f10, 0x018C($s0) ## 0000018C /* 0A784 80943454 8E440000 */ lw $a0, 0x0000($s2) ## 00000000 -/* 0A788 80943458 4600218D */ trunc.w.s $f6, $f4 +/* 0A788 80943458 4600218D */ trunc.w.s $f6, $f4 /* 0A78C 8094345C 24190040 */ addiu $t9, $zero, 0x0040 ## $t9 = 00000040 -/* 0A790 80943460 AFB90010 */ sw $t9, 0x0010($sp) -/* 0A794 80943464 4600548D */ trunc.w.s $f18, $f10 -/* 0A798 80943468 44063000 */ mfc1 $a2, $f6 +/* 0A790 80943460 AFB90010 */ sw $t9, 0x0010($sp) +/* 0A794 80943464 4600548D */ trunc.w.s $f18, $f10 +/* 0A798 80943468 44063000 */ mfc1 $a2, $f6 /* 0A79C 8094346C 24070020 */ addiu $a3, $zero, 0x0020 ## $a3 = 00000020 -/* 0A7A0 80943470 AFA20060 */ sw $v0, 0x0060($sp) -/* 0A7A4 80943474 44059000 */ mfc1 $a1, $f18 -/* 0A7A8 80943478 00063400 */ sll $a2, $a2, 16 -/* 0A7AC 8094347C 00063403 */ sra $a2, $a2, 16 -/* 0A7B0 80943480 00052C00 */ sll $a1, $a1, 16 -/* 0A7B4 80943484 00052C03 */ sra $a1, $a1, 16 +/* 0A7A0 80943470 AFA20060 */ sw $v0, 0x0060($sp) +/* 0A7A4 80943474 44059000 */ mfc1 $a1, $f18 +/* 0A7A8 80943478 00063400 */ sll $a2, $a2, 16 +/* 0A7AC 8094347C 00063403 */ sra $a2, $a2, 16 +/* 0A7B0 80943480 00052C00 */ sll $a1, $a1, 16 +/* 0A7B4 80943484 00052C03 */ sra $a1, $a1, 16 /* 0A7B8 80943488 30A5007F */ andi $a1, $a1, 0x007F ## $a1 = 00000000 -/* 0A7BC 8094348C 0C0253A7 */ jal Draw_TexScroll +/* 0A7BC 8094348C 0C0253A7 */ jal Gfx_TexScroll /* 0A7C0 80943490 30C600FF */ andi $a2, $a2, 0x00FF ## $a2 = 00000000 -/* 0A7C4 80943494 8FA30060 */ lw $v1, 0x0060($sp) -/* 0A7C8 80943498 1000002A */ beq $zero, $zero, .L80943544 +/* 0A7C4 80943494 8FA30060 */ lw $v1, 0x0060($sp) +/* 0A7C8 80943498 1000002A */ beq $zero, $zero, .L80943544 /* 0A7CC 8094349C AC620004 */ sw $v0, 0x0004($v1) ## 00000004 /* 0A7D0 809434A0 8E2202D0 */ lw $v0, 0x02D0($s1) ## 000002D0 .L809434A4: @@ -148,58 +148,58 @@ glabel BossTw_Draw /* 0A7E8 809434B8 C612019C */ lwc1 $f18, 0x019C($s0) ## 0000019C /* 0A7EC 809434BC C608018C */ lwc1 $f8, 0x018C($s0) ## 0000018C /* 0A7F0 809434C0 8E440000 */ lw $a0, 0x0000($s2) ## 00000000 -/* 0A7F4 809434C4 AFB80018 */ sw $t8, 0x0018($sp) -/* 0A7F8 809434C8 AFAF0014 */ sw $t7, 0x0014($sp) -/* 0A7FC 809434CC AFAE0010 */ sw $t6, 0x0010($sp) +/* 0A7F4 809434C4 AFB80018 */ sw $t8, 0x0018($sp) +/* 0A7F8 809434C8 AFAF0014 */ sw $t7, 0x0014($sp) +/* 0A7FC 809434CC AFAE0010 */ sw $t6, 0x0010($sp) /* 0A800 809434D0 C6060190 */ lwc1 $f6, 0x0190($s0) ## 00000190 -/* 0A804 809434D4 4600428D */ trunc.w.s $f10, $f8 +/* 0A804 809434D4 4600428D */ trunc.w.s $f10, $f8 /* 0A808 809434D8 240B0020 */ addiu $t3, $zero, 0x0020 ## $t3 = 00000020 /* 0A80C 809434DC 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 0A810 809434E0 4600320D */ trunc.w.s $f8, $f6 -/* 0A814 809434E4 44065000 */ mfc1 $a2, $f10 -/* 0A818 809434E8 4600910D */ trunc.w.s $f4, $f18 -/* 0A81C 809434EC 440D4000 */ mfc1 $t5, $f8 -/* 0A820 809434F0 00063400 */ sll $a2, $a2, 16 -/* 0A824 809434F4 00063403 */ sra $a2, $a2, 16 +/* 0A810 809434E0 4600320D */ trunc.w.s $f8, $f6 +/* 0A814 809434E4 44065000 */ mfc1 $a2, $f10 +/* 0A818 809434E8 4600910D */ trunc.w.s $f4, $f18 +/* 0A81C 809434EC 440D4000 */ mfc1 $t5, $f8 +/* 0A820 809434F0 00063400 */ sll $a2, $a2, 16 +/* 0A824 809434F4 00063403 */ sra $a2, $a2, 16 /* 0A828 809434F8 31AC007F */ andi $t4, $t5, 0x007F ## $t4 = 00000000 -/* 0A82C 809434FC AFAC001C */ sw $t4, 0x001C($sp) +/* 0A82C 809434FC AFAC001C */ sw $t4, 0x001C($sp) /* 0A830 80943500 C60A01A0 */ lwc1 $f10, 0x01A0($s0) ## 000001A0 -/* 0A834 80943504 44072000 */ mfc1 $a3, $f4 +/* 0A834 80943504 44072000 */ mfc1 $a3, $f4 /* 0A838 80943508 240D0040 */ addiu $t5, $zero, 0x0040 ## $t5 = 00000040 -/* 0A83C 8094350C 4600548D */ trunc.w.s $f18, $f10 -/* 0A840 80943510 00073C00 */ sll $a3, $a3, 16 -/* 0A844 80943514 00073C03 */ sra $a3, $a3, 16 +/* 0A83C 8094350C 4600548D */ trunc.w.s $f18, $f10 +/* 0A840 80943510 00073C00 */ sll $a3, $a3, 16 +/* 0A844 80943514 00073C03 */ sra $a3, $a3, 16 /* 0A848 80943518 30E7007F */ andi $a3, $a3, 0x007F ## $a3 = 00000000 -/* 0A84C 8094351C 44199000 */ mfc1 $t9, $f18 -/* 0A850 80943520 AFAD0028 */ sw $t5, 0x0028($sp) -/* 0A854 80943524 AFAB0024 */ sw $t3, 0x0024($sp) +/* 0A84C 8094351C 44199000 */ mfc1 $t9, $f18 +/* 0A850 80943520 AFAD0028 */ sw $t5, 0x0028($sp) +/* 0A854 80943524 AFAB0024 */ sw $t3, 0x0024($sp) /* 0A858 80943528 332A00FF */ andi $t2, $t9, 0x00FF ## $t2 = 00000000 -/* 0A85C 8094352C AFAA0020 */ sw $t2, 0x0020($sp) +/* 0A85C 8094352C AFAA0020 */ sw $t2, 0x0020($sp) /* 0A860 80943530 30C6007F */ andi $a2, $a2, 0x007F ## $a2 = 00000000 -/* 0A864 80943534 0C0253D0 */ jal Draw_TwoTexScroll -/* 0A868 80943538 AFA2005C */ sw $v0, 0x005C($sp) -/* 0A86C 8094353C 8FA3005C */ lw $v1, 0x005C($sp) +/* 0A864 80943534 0C0253D0 */ jal Gfx_TwoTexScroll +/* 0A868 80943538 AFA2005C */ sw $v0, 0x005C($sp) +/* 0A86C 8094353C 8FA3005C */ lw $v1, 0x005C($sp) /* 0A870 80943540 AC620004 */ sw $v0, 0x0004($v1) ## 00000004 .L80943544: -/* 0A874 80943544 0C024F46 */ jal func_80093D18 +/* 0A874 80943544 0C024F46 */ jal func_80093D18 /* 0A878 80943548 8E440000 */ lw $a0, 0x0000($s2) ## 00000000 -/* 0A87C 8094354C 0C024F61 */ jal func_80093D84 +/* 0A87C 8094354C 0C024F61 */ jal func_80093D84 /* 0A880 80943550 8E440000 */ lw $a0, 0x0000($s2) ## 00000000 /* 0A884 80943554 860C015C */ lh $t4, 0x015C($s0) ## 0000015C /* 0A888 80943558 24060032 */ addiu $a2, $zero, 0x0032 ## $a2 = 00000032 /* 0A88C 8094355C 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 /* 0A890 80943560 318E0002 */ andi $t6, $t4, 0x0002 ## $t6 = 00000000 -/* 0A894 80943564 11C0000B */ beq $t6, $zero, .L80943594 +/* 0A894 80943564 11C0000B */ beq $t6, $zero, .L80943594 /* 0A898 80943568 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 /* 0A89C 8094356C 8E2402C0 */ lw $a0, 0x02C0($s1) ## 000002C0 /* 0A8A0 80943570 240F0384 */ addiu $t7, $zero, 0x0384 ## $t7 = 00000384 /* 0A8A4 80943574 2418044B */ addiu $t8, $zero, 0x044B ## $t8 = 0000044B -/* 0A8A8 80943578 AFB80018 */ sw $t8, 0x0018($sp) -/* 0A8AC 8094357C AFAF0014 */ sw $t7, 0x0014($sp) -/* 0A8B0 80943580 AFA00010 */ sw $zero, 0x0010($sp) -/* 0A8B4 80943584 0C024CDC */ jal func_80093370 +/* 0A8A8 80943578 AFB80018 */ sw $t8, 0x0018($sp) +/* 0A8AC 8094357C AFAF0014 */ sw $t7, 0x0014($sp) +/* 0A8B0 80943580 AFA00010 */ sw $zero, 0x0010($sp) +/* 0A8B4 80943584 0C024CDC */ jal Gfx_SetFog /* 0A8B8 80943588 240500FF */ addiu $a1, $zero, 0x00FF ## $a1 = 000000FF -/* 0A8BC 8094358C 10000073 */ beq $zero, $zero, .L8094375C +/* 0A8BC 8094358C 10000073 */ beq $zero, $zero, .L8094375C /* 0A8C0 80943590 AE2202C0 */ sw $v0, 0x02C0($s1) ## 000002C0 .L80943594: /* 0A8C4 80943594 4459F800 */ cfc1 $t9, $31 @@ -207,34 +207,34 @@ glabel BossTw_Draw /* 0A8CC 8094359C C60401D4 */ lwc1 $f4, 0x01D4($s0) ## 000001D4 /* 0A8D0 809435A0 8E2402C0 */ lw $a0, 0x02C0($s1) ## 000002C0 /* 0A8D4 809435A4 3C014F00 */ lui $at, 0x4F00 ## $at = 4F000000 -/* 0A8D8 809435A8 460021A4 */ cvt.w.s $f6, $f4 +/* 0A8D8 809435A8 460021A4 */ cvt.w.s $f6, $f4 /* 0A8DC 809435AC 4445F800 */ cfc1 $a1, $31 /* 0A8E0 809435B0 00000000 */ nop /* 0A8E4 809435B4 30A50078 */ andi $a1, $a1, 0x0078 ## $a1 = 00000000 -/* 0A8E8 809435B8 50A00013 */ beql $a1, $zero, .L80943608 -/* 0A8EC 809435BC 44053000 */ mfc1 $a1, $f6 +/* 0A8E8 809435B8 50A00013 */ beql $a1, $zero, .L80943608 +/* 0A8EC 809435BC 44053000 */ mfc1 $a1, $f6 /* 0A8F0 809435C0 44813000 */ mtc1 $at, $f6 ## $f6 = 2147483648.00 /* 0A8F4 809435C4 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 -/* 0A8F8 809435C8 46062181 */ sub.s $f6, $f4, $f6 +/* 0A8F8 809435C8 46062181 */ sub.s $f6, $f4, $f6 /* 0A8FC 809435CC 44C5F800 */ ctc1 $a1, $31 /* 0A900 809435D0 00000000 */ nop -/* 0A904 809435D4 460031A4 */ cvt.w.s $f6, $f6 +/* 0A904 809435D4 460031A4 */ cvt.w.s $f6, $f6 /* 0A908 809435D8 4445F800 */ cfc1 $a1, $31 /* 0A90C 809435DC 00000000 */ nop /* 0A910 809435E0 30A50078 */ andi $a1, $a1, 0x0078 ## $a1 = 00000000 -/* 0A914 809435E4 14A00005 */ bne $a1, $zero, .L809435FC +/* 0A914 809435E4 14A00005 */ bne $a1, $zero, .L809435FC /* 0A918 809435E8 00000000 */ nop -/* 0A91C 809435EC 44053000 */ mfc1 $a1, $f6 +/* 0A91C 809435EC 44053000 */ mfc1 $a1, $f6 /* 0A920 809435F0 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 0A924 809435F4 10000007 */ beq $zero, $zero, .L80943614 +/* 0A924 809435F4 10000007 */ beq $zero, $zero, .L80943614 /* 0A928 809435F8 00A12825 */ or $a1, $a1, $at ## $a1 = 80000000 .L809435FC: -/* 0A92C 809435FC 10000005 */ beq $zero, $zero, .L80943614 +/* 0A92C 809435FC 10000005 */ beq $zero, $zero, .L80943614 /* 0A930 80943600 2405FFFF */ addiu $a1, $zero, 0xFFFF ## $a1 = FFFFFFFF -/* 0A934 80943604 44053000 */ mfc1 $a1, $f6 +/* 0A934 80943604 44053000 */ mfc1 $a1, $f6 .L80943608: /* 0A938 80943608 00000000 */ nop -/* 0A93C 8094360C 04A0FFFB */ bltz $a1, .L809435FC +/* 0A93C 8094360C 04A0FFFB */ bltz $a1, .L809435FC /* 0A940 80943610 00000000 */ nop .L80943614: /* 0A944 80943614 44D9F800 */ ctc1 $t9, $31 @@ -244,34 +244,34 @@ glabel BossTw_Draw /* 0A954 80943624 444AF800 */ cfc1 $t2, $31 /* 0A958 80943628 44C6F800 */ ctc1 $a2, $31 /* 0A95C 8094362C 00000000 */ nop -/* 0A960 80943630 460042A4 */ cvt.w.s $f10, $f8 +/* 0A960 80943630 460042A4 */ cvt.w.s $f10, $f8 /* 0A964 80943634 4446F800 */ cfc1 $a2, $31 /* 0A968 80943638 00000000 */ nop /* 0A96C 8094363C 30C60078 */ andi $a2, $a2, 0x0078 ## $a2 = 00000000 -/* 0A970 80943640 50C00013 */ beql $a2, $zero, .L80943690 -/* 0A974 80943644 44065000 */ mfc1 $a2, $f10 +/* 0A970 80943640 50C00013 */ beql $a2, $zero, .L80943690 +/* 0A974 80943644 44065000 */ mfc1 $a2, $f10 /* 0A978 80943648 44815000 */ mtc1 $at, $f10 ## $f10 = 2147483648.00 /* 0A97C 8094364C 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 -/* 0A980 80943650 460A4281 */ sub.s $f10, $f8, $f10 +/* 0A980 80943650 460A4281 */ sub.s $f10, $f8, $f10 /* 0A984 80943654 44C6F800 */ ctc1 $a2, $31 /* 0A988 80943658 00000000 */ nop -/* 0A98C 8094365C 460052A4 */ cvt.w.s $f10, $f10 +/* 0A98C 8094365C 460052A4 */ cvt.w.s $f10, $f10 /* 0A990 80943660 4446F800 */ cfc1 $a2, $31 /* 0A994 80943664 00000000 */ nop /* 0A998 80943668 30C60078 */ andi $a2, $a2, 0x0078 ## $a2 = 00000000 -/* 0A99C 8094366C 14C00005 */ bne $a2, $zero, .L80943684 +/* 0A99C 8094366C 14C00005 */ bne $a2, $zero, .L80943684 /* 0A9A0 80943670 00000000 */ nop -/* 0A9A4 80943674 44065000 */ mfc1 $a2, $f10 +/* 0A9A4 80943674 44065000 */ mfc1 $a2, $f10 /* 0A9A8 80943678 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 0A9AC 8094367C 10000007 */ beq $zero, $zero, .L8094369C +/* 0A9AC 8094367C 10000007 */ beq $zero, $zero, .L8094369C /* 0A9B0 80943680 00C13025 */ or $a2, $a2, $at ## $a2 = 80000000 .L80943684: -/* 0A9B4 80943684 10000005 */ beq $zero, $zero, .L8094369C +/* 0A9B4 80943684 10000005 */ beq $zero, $zero, .L8094369C /* 0A9B8 80943688 2406FFFF */ addiu $a2, $zero, 0xFFFF ## $a2 = FFFFFFFF -/* 0A9BC 8094368C 44065000 */ mfc1 $a2, $f10 +/* 0A9BC 8094368C 44065000 */ mfc1 $a2, $f10 .L80943690: /* 0A9C0 80943690 00000000 */ nop -/* 0A9C4 80943694 04C0FFFB */ bltz $a2, .L80943684 +/* 0A9C4 80943694 04C0FFFB */ bltz $a2, .L80943684 /* 0A9C8 80943698 00000000 */ nop .L8094369C: /* 0A9CC 8094369C 44CAF800 */ ctc1 $t2, $31 @@ -281,52 +281,52 @@ glabel BossTw_Draw /* 0A9DC 809436AC 444BF800 */ cfc1 $t3, $31 /* 0A9E0 809436B0 44C7F800 */ ctc1 $a3, $31 /* 0A9E4 809436B4 00000000 */ nop -/* 0A9E8 809436B8 46009124 */ cvt.w.s $f4, $f18 +/* 0A9E8 809436B8 46009124 */ cvt.w.s $f4, $f18 /* 0A9EC 809436BC 4447F800 */ cfc1 $a3, $31 /* 0A9F0 809436C0 00000000 */ nop /* 0A9F4 809436C4 30E70078 */ andi $a3, $a3, 0x0078 ## $a3 = 00000000 -/* 0A9F8 809436C8 50E00013 */ beql $a3, $zero, .L80943718 -/* 0A9FC 809436CC 44072000 */ mfc1 $a3, $f4 +/* 0A9F8 809436C8 50E00013 */ beql $a3, $zero, .L80943718 +/* 0A9FC 809436CC 44072000 */ mfc1 $a3, $f4 /* 0AA00 809436D0 44812000 */ mtc1 $at, $f4 ## $f4 = 2147483648.00 /* 0AA04 809436D4 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 0AA08 809436D8 46049101 */ sub.s $f4, $f18, $f4 +/* 0AA08 809436D8 46049101 */ sub.s $f4, $f18, $f4 /* 0AA0C 809436DC 44C7F800 */ ctc1 $a3, $31 /* 0AA10 809436E0 00000000 */ nop -/* 0AA14 809436E4 46002124 */ cvt.w.s $f4, $f4 +/* 0AA14 809436E4 46002124 */ cvt.w.s $f4, $f4 /* 0AA18 809436E8 4447F800 */ cfc1 $a3, $31 /* 0AA1C 809436EC 00000000 */ nop /* 0AA20 809436F0 30E70078 */ andi $a3, $a3, 0x0078 ## $a3 = 00000000 -/* 0AA24 809436F4 14E00005 */ bne $a3, $zero, .L8094370C +/* 0AA24 809436F4 14E00005 */ bne $a3, $zero, .L8094370C /* 0AA28 809436F8 00000000 */ nop -/* 0AA2C 809436FC 44072000 */ mfc1 $a3, $f4 +/* 0AA2C 809436FC 44072000 */ mfc1 $a3, $f4 /* 0AA30 80943700 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 0AA34 80943704 10000007 */ beq $zero, $zero, .L80943724 +/* 0AA34 80943704 10000007 */ beq $zero, $zero, .L80943724 /* 0AA38 80943708 00E13825 */ or $a3, $a3, $at ## $a3 = 80000000 .L8094370C: -/* 0AA3C 8094370C 10000005 */ beq $zero, $zero, .L80943724 +/* 0AA3C 8094370C 10000005 */ beq $zero, $zero, .L80943724 /* 0AA40 80943710 2407FFFF */ addiu $a3, $zero, 0xFFFF ## $a3 = FFFFFFFF -/* 0AA44 80943714 44072000 */ mfc1 $a3, $f4 +/* 0AA44 80943714 44072000 */ mfc1 $a3, $f4 .L80943718: /* 0AA48 80943718 00000000 */ nop -/* 0AA4C 8094371C 04E0FFFB */ bltz $a3, .L8094370C +/* 0AA4C 8094371C 04E0FFFB */ bltz $a3, .L8094370C /* 0AA50 80943720 00000000 */ nop .L80943724: -/* 0AA54 80943724 AFA00010 */ sw $zero, 0x0010($sp) +/* 0AA54 80943724 AFA00010 */ sw $zero, 0x0010($sp) /* 0AA58 80943728 C60601E0 */ lwc1 $f6, 0x01E0($s0) ## 000001E0 /* 0AA5C 8094372C 44CBF800 */ ctc1 $t3, $31 /* 0AA60 80943730 00000000 */ nop -/* 0AA64 80943734 4600320D */ trunc.w.s $f8, $f6 -/* 0AA68 80943738 440C4000 */ mfc1 $t4, $f8 +/* 0AA64 80943734 4600320D */ trunc.w.s $f8, $f6 +/* 0AA68 80943738 440C4000 */ mfc1 $t4, $f8 /* 0AA6C 8094373C 00000000 */ nop -/* 0AA70 80943740 AFAC0014 */ sw $t4, 0x0014($sp) +/* 0AA70 80943740 AFAC0014 */ sw $t4, 0x0014($sp) /* 0AA74 80943744 C60A01E4 */ lwc1 $f10, 0x01E4($s0) ## 000001E4 -/* 0AA78 80943748 4600548D */ trunc.w.s $f18, $f10 -/* 0AA7C 8094374C 440F9000 */ mfc1 $t7, $f18 -/* 0AA80 80943750 0C024CDC */ jal func_80093370 -/* 0AA84 80943754 AFAF0018 */ sw $t7, 0x0018($sp) +/* 0AA78 80943748 4600548D */ trunc.w.s $f18, $f10 +/* 0AA7C 8094374C 440F9000 */ mfc1 $t7, $f18 +/* 0AA80 80943750 0C024CDC */ jal Gfx_SetFog +/* 0AA84 80943754 AFAF0018 */ sw $t7, 0x0018($sp) /* 0AA88 80943758 AE2202C0 */ sw $v0, 0x02C0($s1) ## 000002C0 .L8094375C: -/* 0AA8C 8094375C 0C034213 */ jal Matrix_Push +/* 0AA8C 8094375C 0C034213 */ jal Matrix_Push /* 0AA90 80943760 00000000 */ nop /* 0AA94 80943764 8E05056C */ lw $a1, 0x056C($s0) ## 0000056C /* 0AA98 80943768 8E060588 */ lw $a2, 0x0588($s0) ## 00000588 @@ -335,128 +335,128 @@ glabel BossTw_Draw /* 0AAA4 80943774 3C198094 */ lui $t9, %hi(func_80941788) ## $t9 = 80940000 /* 0AAA8 80943778 27391788 */ addiu $t9, $t9, %lo(func_80941788) ## $t9 = 80941788 /* 0AAAC 8094377C 271816D0 */ addiu $t8, $t8, %lo(func_809416D0) ## $t8 = 809416D0 -/* 0AAB0 80943780 AFB80010 */ sw $t8, 0x0010($sp) -/* 0AAB4 80943784 AFB90014 */ sw $t9, 0x0014($sp) -/* 0AAB8 80943788 AFB00018 */ sw $s0, 0x0018($sp) -/* 0AABC 8094378C 0C0286B2 */ jal func_800A1AC8 +/* 0AAB0 80943780 AFB80010 */ sw $t8, 0x0010($sp) +/* 0AAB4 80943784 AFB90014 */ sw $t9, 0x0014($sp) +/* 0AAB8 80943788 AFB00018 */ sw $s0, 0x0018($sp) +/* 0AABC 8094378C 0C0286B2 */ jal SkelAnime_DrawSV /* 0AAC0 80943790 02402025 */ or $a0, $s2, $zero ## $a0 = 00000000 -/* 0AAC4 80943794 0C034221 */ jal Matrix_Pull +/* 0AAC4 80943794 0C034221 */ jal Matrix_Pull /* 0AAC8 80943798 00000000 */ nop /* 0AACC 8094379C 02402025 */ or $a0, $s2, $zero ## $a0 = 00000000 -/* 0AAD0 809437A0 0C02F228 */ jal func_800BC8A0 +/* 0AAD0 809437A0 0C02F228 */ jal func_800BC8A0 /* 0AAD4 809437A4 8E2502C0 */ lw $a1, 0x02C0($s1) ## 000002C0 /* 0AAD8 809437A8 AE2202C0 */ sw $v0, 0x02C0($s1) ## 000002C0 /* 0AADC 809437AC 860A001C */ lh $t2, 0x001C($s0) ## 0000001C .L809437B0: /* 0AAE0 809437B0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0AAE4 809437B4 15400042 */ bne $t2, $zero, .L809438C0 +/* 0AAE4 809437B4 15400042 */ bne $t2, $zero, .L809438C0 /* 0AAE8 809437B8 00000000 */ nop /* 0AAEC 809437BC 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 /* 0AAF0 809437C0 C60401A8 */ lwc1 $f4, 0x01A8($s0) ## 000001A8 /* 0AAF4 809437C4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0AAF8 809437C8 4604003C */ c.lt.s $f0, $f4 +/* 0AAF8 809437C8 4604003C */ c.lt.s $f0, $f4 /* 0AAFC 809437CC 00000000 */ nop -/* 0AB00 809437D0 45000039 */ bc1f .L809438B8 +/* 0AB00 809437D0 45000039 */ bc1f .L809438B8 /* 0AB04 809437D4 00000000 */ nop /* 0AB08 809437D8 C61001B0 */ lwc1 $f16, 0x01B0($s0) ## 000001B0 -/* 0AB0C 809437DC 8FA20084 */ lw $v0, 0x0084($sp) -/* 0AB10 809437E0 4610003C */ c.lt.s $f0, $f16 +/* 0AB0C 809437DC 8FA20084 */ lw $v0, 0x0084($sp) +/* 0AB10 809437E0 4610003C */ c.lt.s $f0, $f16 /* 0AB14 809437E4 00000000 */ nop -/* 0AB18 809437E8 45000031 */ bc1f .L809438B0 +/* 0AB18 809437E8 45000031 */ bc1f .L809438B0 /* 0AB1C 809437EC 00000000 */ nop /* 0AB20 809437F0 C60A04C0 */ lwc1 $f10, 0x04C0($s0) ## 000004C0 /* 0AB24 809437F4 C4520028 */ lwc1 $f18, 0x0028($v0) ## 00000028 /* 0AB28 809437F8 C60604BC */ lwc1 $f6, 0x04BC($s0) ## 000004BC /* 0AB2C 809437FC C4480024 */ lwc1 $f8, 0x0024($v0) ## 00000024 -/* 0AB30 80943800 46125081 */ sub.s $f2, $f10, $f18 +/* 0AB30 80943800 46125081 */ sub.s $f2, $f10, $f18 /* 0AB34 80943804 3C014120 */ lui $at, 0x4120 ## $at = 41200000 /* 0AB38 80943808 C60404C4 */ lwc1 $f4, 0x04C4($s0) ## 000004C4 -/* 0AB3C 8094380C 46083301 */ sub.s $f12, $f6, $f8 +/* 0AB3C 8094380C 46083301 */ sub.s $f12, $f6, $f8 /* 0AB40 80943810 44814000 */ mtc1 $at, $f8 ## $f8 = 10.00 /* 0AB44 80943814 C446002C */ lwc1 $f6, 0x002C($v0) ## 0000002C -/* 0AB48 80943818 46001005 */ abs.s $f0, $f2 -/* 0AB4C 8094381C 4608003C */ c.lt.s $f0, $f8 -/* 0AB50 80943820 46062381 */ sub.s $f14, $f4, $f6 -/* 0AB54 80943824 45000022 */ bc1f .L809438B0 +/* 0AB48 80943818 46001005 */ abs.s $f0, $f2 +/* 0AB4C 8094381C 4608003C */ c.lt.s $f0, $f8 +/* 0AB50 80943820 46062381 */ sub.s $f14, $f4, $f6 +/* 0AB54 80943824 45000022 */ bc1f .L809438B0 /* 0AB58 80943828 00000000 */ nop /* 0AB5C 8094382C 944B0088 */ lhu $t3, 0x0088($v0) ## 00000088 /* 0AB60 80943830 316D0001 */ andi $t5, $t3, 0x0001 ## $t5 = 00000000 -/* 0AB64 80943834 11A0001E */ beq $t5, $zero, .L809438B0 +/* 0AB64 80943834 11A0001E */ beq $t5, $zero, .L809438B0 /* 0AB68 80943838 00000000 */ nop -/* 0AB6C 8094383C 460C6282 */ mul.s $f10, $f12, $f12 +/* 0AB6C 8094383C 460C6282 */ mul.s $f10, $f12, $f12 /* 0AB70 80943840 3C018095 */ lui $at, %hi(D_8094B06C) ## $at = 80950000 -/* 0AB74 80943844 C426B06C */ lwc1 $f6, %lo(D_8094B06C)($at) -/* 0AB78 80943848 460E7482 */ mul.s $f18, $f14, $f14 +/* 0AB74 80943844 C426B06C */ lwc1 $f6, %lo(D_8094B06C)($at) +/* 0AB78 80943848 460E7482 */ mul.s $f18, $f14, $f14 /* 0AB7C 8094384C C60401B4 */ lwc1 $f4, 0x01B4($s0) ## 000001B4 /* 0AB80 80943850 3C028095 */ lui $v0, %hi(D_8094C85F) ## $v0 = 80950000 /* 0AB84 80943854 2442C85F */ addiu $v0, $v0, %lo(D_8094C85F) ## $v0 = 8094C85F -/* 0AB88 80943858 46062202 */ mul.s $f8, $f4, $f6 -/* 0AB8C 8094385C 46125000 */ add.s $f0, $f10, $f18 -/* 0AB90 80943860 46000004 */ sqrt.s $f0, $f0 -/* 0AB94 80943864 4608003C */ c.lt.s $f0, $f8 +/* 0AB88 80943858 46062202 */ mul.s $f8, $f4, $f6 +/* 0AB8C 8094385C 46125000 */ add.s $f0, $f10, $f18 +/* 0AB90 80943860 46000004 */ sqrt.s $f0, $f0 +/* 0AB94 80943864 4608003C */ c.lt.s $f0, $f8 /* 0AB98 80943868 00000000 */ nop -/* 0AB9C 8094386C 45000010 */ bc1f .L809438B0 +/* 0AB9C 8094386C 45000010 */ bc1f .L809438B0 /* 0ABA0 80943870 00000000 */ nop /* 0ABA4 80943874 904C0000 */ lbu $t4, 0x0000($v0) ## 8094C85F /* 0ABA8 80943878 3C014348 */ lui $at, 0x4348 ## $at = 43480000 -/* 0ABAC 8094387C 1580000C */ bne $t4, $zero, .L809438B0 +/* 0ABAC 8094387C 1580000C */ bne $t4, $zero, .L809438B0 /* 0ABB0 80943880 00000000 */ nop /* 0ABB4 80943884 44815000 */ mtc1 $at, $f10 ## $f10 = 200.00 /* 0ABB8 80943888 240E0001 */ addiu $t6, $zero, 0x0001 ## $t6 = 00000001 /* 0ABBC 8094388C 3C188095 */ lui $t8, %hi(D_8094C84C) ## $t8 = 80950000 -/* 0ABC0 80943890 4610503C */ c.lt.s $f10, $f16 +/* 0ABC0 80943890 4610503C */ c.lt.s $f10, $f16 /* 0ABC4 80943894 00000000 */ nop -/* 0ABC8 80943898 45000005 */ bc1f .L809438B0 +/* 0ABC8 80943898 45000005 */ bc1f .L809438B0 /* 0ABCC 8094389C 00000000 */ nop /* 0ABD0 809438A0 A04E0000 */ sb $t6, 0x0000($v0) ## 8094C85F -/* 0ABD4 809438A4 8F18C84C */ lw $t8, %lo(D_8094C84C)($t8) +/* 0ABD4 809438A4 8F18C84C */ lw $t8, %lo(D_8094C84C)($t8) /* 0ABD8 809438A8 240F0064 */ addiu $t7, $zero, 0x0064 ## $t7 = 00000064 /* 0ABDC 809438AC A70F017C */ sh $t7, 0x017C($t8) ## 8095017C .L809438B0: -/* 0ABE0 809438B0 0C2506F0 */ jal func_80941BC0 +/* 0ABE0 809438B0 0C2506F0 */ jal func_80941BC0 /* 0ABE4 809438B4 02402825 */ or $a1, $s2, $zero ## $a1 = 00000000 .L809438B8: -/* 0ABE8 809438B8 10000004 */ beq $zero, $zero, .L809438CC +/* 0ABE8 809438B8 10000004 */ beq $zero, $zero, .L809438CC /* 0ABEC 809438BC 92020564 */ lbu $v0, 0x0564($s0) ## 00000564 .L809438C0: -/* 0ABF0 809438C0 0C250860 */ jal func_80942180 +/* 0ABF0 809438C0 0C250860 */ jal func_80942180 /* 0ABF4 809438C4 02402825 */ or $a1, $s2, $zero ## $a1 = 00000000 /* 0ABF8 809438C8 92020564 */ lbu $v0, 0x0564($s0) ## 00000564 .L809438CC: -/* 0ABFC 809438CC 10400014 */ beq $v0, $zero, .L80943920 +/* 0ABFC 809438CC 10400014 */ beq $v0, $zero, .L80943920 /* 0AC00 809438D0 00000000 */ nop /* 0AC04 809438D4 8E0A014C */ lw $t2, 0x014C($s0) ## 0000014C /* 0AC08 809438D8 3C198094 */ lui $t9, %hi(func_8093D444) ## $t9 = 80940000 /* 0AC0C 809438DC 2739D444 */ addiu $t9, $t9, %lo(func_8093D444) ## $t9 = 8093D444 -/* 0AC10 809438E0 172A0006 */ bne $t9, $t2, .L809438FC +/* 0AC10 809438E0 172A0006 */ bne $t9, $t2, .L809438FC /* 0AC14 809438E4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 0AC18 809438E8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0AC1C 809438EC 0C250C0A */ jal func_80943028 +/* 0AC1C 809438EC 0C250C0A */ jal func_80943028 /* 0AC20 809438F0 02402825 */ or $a1, $s2, $zero ## $a1 = 00000000 -/* 0AC24 809438F4 1000000A */ beq $zero, $zero, .L80943920 +/* 0AC24 809438F4 1000000A */ beq $zero, $zero, .L80943920 /* 0AC28 809438F8 00000000 */ nop .L809438FC: -/* 0AC2C 809438FC 0C2509BC */ jal func_809426F0 +/* 0AC2C 809438FC 0C2509BC */ jal func_809426F0 /* 0AC30 80943900 02402825 */ or $a1, $s2, $zero ## $a1 = 00000000 /* 0AC34 80943904 3C048095 */ lui $a0, %hi(D_8094A9A4) ## $a0 = 80950000 /* 0AC38 80943908 2484A9A4 */ addiu $a0, $a0, %lo(D_8094A9A4) ## $a0 = 8094A9A4 -/* 0AC3C 8094390C 0C0346BD */ jal Matrix_MultVec3f +/* 0AC3C 8094390C 0C0346BD */ jal Matrix_MultVec3f /* 0AC40 80943910 2605048C */ addiu $a1, $s0, 0x048C ## $a1 = 0000048C /* 0AC44 80943914 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0AC48 80943918 0C250B1C */ jal func_80942C70 +/* 0AC48 80943918 0C250B1C */ jal func_80942C70 /* 0AC4C 8094391C 02402825 */ or $a1, $s2, $zero ## $a1 = 00000000 .L80943920: /* 0AC50 80943920 3C068095 */ lui $a2, %hi(D_8094AC38) ## $a2 = 80950000 /* 0AC54 80943924 24C6AC38 */ addiu $a2, $a2, %lo(D_8094AC38) ## $a2 = 8094AC38 /* 0AC58 80943928 27A40070 */ addiu $a0, $sp, 0x0070 ## $a0 = FFFFFFE0 /* 0AC5C 8094392C 8E450000 */ lw $a1, 0x0000($s2) ## 00000000 -/* 0AC60 80943930 0C031AD5 */ jal func_800C6B54 +/* 0AC60 80943930 0C031AD5 */ jal Graph_CloseDisps /* 0AC64 80943934 24071BD3 */ addiu $a3, $zero, 0x1BD3 ## $a3 = 00001BD3 -/* 0AC68 80943938 8FBF0044 */ lw $ra, 0x0044($sp) -/* 0AC6C 8094393C 8FB00038 */ lw $s0, 0x0038($sp) -/* 0AC70 80943940 8FB1003C */ lw $s1, 0x003C($sp) -/* 0AC74 80943944 8FB20040 */ lw $s2, 0x0040($sp) -/* 0AC78 80943948 03E00008 */ jr $ra +/* 0AC68 80943938 8FBF0044 */ lw $ra, 0x0044($sp) +/* 0AC6C 8094393C 8FB00038 */ lw $s0, 0x0038($sp) +/* 0AC70 80943940 8FB1003C */ lw $s1, 0x003C($sp) +/* 0AC74 80943944 8FB20040 */ lw $s2, 0x0040($sp) +/* 0AC78 80943948 03E00008 */ jr $ra /* 0AC7C 8094394C 27BD0090 */ addiu $sp, $sp, 0x0090 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/BossTw_Init.s b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/BossTw_Init.s index 39a0c120bb..09ad12ec6e 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/BossTw_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/BossTw_Init.s @@ -1,32 +1,32 @@ glabel BossTw_Init /* 009F0 809396C0 27BDFFA8 */ addiu $sp, $sp, 0xFFA8 ## $sp = FFFFFFA8 -/* 009F4 809396C4 AFB10038 */ sw $s1, 0x0038($sp) +/* 009F4 809396C4 AFB10038 */ sw $s1, 0x0038($sp) /* 009F8 809396C8 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 -/* 009FC 809396CC AFBF003C */ sw $ra, 0x003C($sp) -/* 00A00 809396D0 AFB00034 */ sw $s0, 0x0034($sp) +/* 009FC 809396CC AFBF003C */ sw $ra, 0x003C($sp) +/* 00A00 809396D0 AFB00034 */ sw $s0, 0x0034($sp) /* 00A04 809396D4 3C058095 */ lui $a1, %hi(D_8094A8A0) ## $a1 = 80950000 /* 00A08 809396D8 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 00A0C 809396DC 0C01E037 */ jal Actor_ProcessInitChain - + /* 00A10 809396E0 24A5A8A0 */ addiu $a1, $a1, %lo(D_8094A8A0) ## $a1 = 8094A8A0 /* 00A14 809396E4 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 /* 00A18 809396E8 260400B4 */ addiu $a0, $s0, 0x00B4 ## $a0 = 000000B4 /* 00A1C 809396EC 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 00A20 809396F0 44050000 */ mfc1 $a1, $f0 -/* 00A24 809396F4 44070000 */ mfc1 $a3, $f0 +/* 00A20 809396F0 44050000 */ mfc1 $a1, $f0 +/* 00A24 809396F4 44070000 */ mfc1 $a3, $f0 /* 00A28 809396F8 0C00AC78 */ jal ActorShape_Init - + /* 00A2C 809396FC 00000000 */ nop /* 00A30 80939700 860E001C */ lh $t6, 0x001C($s0) ## 0000001C /* 00A34 80939704 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 00A38 80939708 3C053CCC */ lui $a1, 0x3CCC ## $a1 = 3CCC0000 -/* 00A3C 8093970C 29C10064 */ slti $at, $t6, 0x0064 -/* 00A40 80939710 14200048 */ bne $at, $zero, .L80939834 +/* 00A3C 8093970C 29C10064 */ slti $at, $t6, 0x0064 +/* 00A40 80939710 14200048 */ bne $at, $zero, .L80939834 /* 00A44 80939714 00000000 */ nop /* 00A48 80939718 3C053C23 */ lui $a1, 0x3C23 ## $a1 = 3C230000 /* 00A4C 8093971C 34A5D70A */ ori $a1, $a1, 0xD70A ## $a1 = 3C23D70A /* 00A50 80939720 0C00B58B */ jal Actor_SetScale - + /* 00A54 80939724 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 00A58 80939728 8E190004 */ lw $t9, 0x0004($s0) ## 00000004 /* 00A5C 8093972C 3C0F8094 */ lui $t7, %hi(func_80946B00) ## $t7 = 80940000 @@ -34,47 +34,47 @@ glabel BossTw_Init /* 00A64 80939734 2401FFFE */ addiu $at, $zero, 0xFFFE ## $at = FFFFFFFE /* 00A68 80939738 25EF6B00 */ addiu $t7, $t7, %lo(func_80946B00) ## $t7 = 80946B00 /* 00A6C 8093973C 27186C7C */ addiu $t8, $t8, %lo(func_80946C7C) ## $t8 = 80946C7C -/* 00A70 80939740 03217024 */ and $t6, $t9, $at +/* 00A70 80939740 03217024 */ and $t6, $t9, $at /* 00A74 80939744 AE0F0130 */ sw $t7, 0x0130($s0) ## 00000130 /* 00A78 80939748 AE180134 */ sw $t8, 0x0134($s0) ## 00000134 /* 00A7C 8093974C AE0E0004 */ sw $t6, 0x0004($s0) ## 00000004 /* 00A80 80939750 260505AC */ addiu $a1, $s0, 0x05AC ## $a1 = 000005AC -/* 00A84 80939754 AFA50044 */ sw $a1, 0x0044($sp) +/* 00A84 80939754 AFA50044 */ sw $a1, 0x0044($sp) /* 00A88 80939758 0C0170D9 */ jal ActorCollider_AllocCylinder - + /* 00A8C 8093975C 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 00A90 80939760 3C078095 */ lui $a3, %hi(D_8094A7E8) ## $a3 = 80950000 -/* 00A94 80939764 8FA50044 */ lw $a1, 0x0044($sp) +/* 00A94 80939764 8FA50044 */ lw $a1, 0x0044($sp) /* 00A98 80939768 24E7A7E8 */ addiu $a3, $a3, %lo(D_8094A7E8) ## $a3 = 8094A7E8 /* 00A9C 8093976C 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 00AA0 80939770 0C01712B */ jal ActorCollider_InitCylinder - + /* 00AA4 80939774 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 00AA8 80939778 8603001C */ lh $v1, 0x001C($s0) ## 0000001C /* 00AAC 8093977C 24010064 */ addiu $at, $zero, 0x0064 ## $at = 00000064 /* 00AB0 80939780 3C0F8094 */ lui $t7, %hi(func_809453EC) ## $t7 = 80940000 -/* 00AB4 80939784 10610003 */ beq $v1, $at, .L80939794 +/* 00AB4 80939784 10610003 */ beq $v1, $at, .L80939794 /* 00AB8 80939788 25EF53EC */ addiu $t7, $t7, %lo(func_809453EC) ## $t7 = 809453EC /* 00ABC 8093978C 24010065 */ addiu $at, $zero, 0x0065 ## $at = 00000065 -/* 00AC0 80939790 14610004 */ bne $v1, $at, .L809397A4 +/* 00AC0 80939790 14610004 */ bne $v1, $at, .L809397A4 .L80939794: /* 00AC4 80939794 24180001 */ addiu $t8, $zero, 0x0001 ## $t8 = 00000001 /* 00AC8 80939798 AE0F014C */ sw $t7, 0x014C($s0) ## 0000014C -/* 00ACC 8093979C 10000022 */ beq $zero, $zero, .L80939828 +/* 00ACC 8093979C 10000022 */ beq $zero, $zero, .L80939828 /* 00AD0 809397A0 A21805C8 */ sb $t8, 0x05C8($s0) ## 000005C8 .L809397A4: /* 00AD4 809397A4 24010066 */ addiu $at, $zero, 0x0066 ## $at = 00000066 -/* 00AD8 809397A8 10610003 */ beq $v1, $at, .L809397B8 +/* 00AD8 809397A8 10610003 */ beq $v1, $at, .L809397B8 /* 00ADC 809397AC 3C198094 */ lui $t9, %hi(func_80945D14) ## $t9 = 80940000 /* 00AE0 809397B0 24010067 */ addiu $at, $zero, 0x0067 ## $at = 00000067 -/* 00AE4 809397B4 14610003 */ bne $v1, $at, .L809397C4 +/* 00AE4 809397B4 14610003 */ bne $v1, $at, .L809397C4 .L809397B8: /* 00AE8 809397B8 27395D14 */ addiu $t9, $t9, %lo(func_80945D14) ## $t9 = 80945D14 -/* 00AEC 809397BC 1000001A */ beq $zero, $zero, .L80939828 +/* 00AEC 809397BC 1000001A */ beq $zero, $zero, .L80939828 /* 00AF0 809397C0 AE19014C */ sw $t9, 0x014C($s0) ## 0000014C .L809397C4: -/* 00AF4 809397C4 28610068 */ slti $at, $v1, 0x0068 -/* 00AF8 809397C8 14200017 */ bne $at, $zero, .L80939828 +/* 00AF4 809397C4 28610068 */ slti $at, $v1, 0x0068 +/* 00AF8 809397C8 14200017 */ bne $at, $zero, .L80939828 /* 00AFC 809397CC 3C0E8094 */ lui $t6, %hi(func_8093EE10) ## $t6 = 80940000 /* 00B00 809397D0 3C014300 */ lui $at, 0x4300 ## $at = 43000000 /* 00B04 809397D4 44812000 */ mtc1 $at, $f4 ## $f4 = 128.00 @@ -85,61 +85,61 @@ glabel BossTw_Init /* 00B18 809397E8 24010068 */ addiu $at, $zero, 0x0068 ## $at = 00000068 /* 00B1C 809397EC AE0E014C */ sw $t6, 0x014C($s0) ## 0000014C /* 00B20 809397F0 AE0F0134 */ sw $t7, 0x0134($s0) ## 00000134 -/* 00B24 809397F4 17010007 */ bne $t8, $at, .L80939814 +/* 00B24 809397F4 17010007 */ bne $t8, $at, .L80939814 /* 00B28 809397F8 E60401AC */ swc1 $f4, 0x01AC($s0) ## 000001AC /* 00B2C 809397FC 3C198095 */ lui $t9, %hi(D_8094C84C) ## $t9 = 80950000 -/* 00B30 80939800 8F39C84C */ lw $t9, %lo(D_8094C84C)($t9) +/* 00B30 80939800 8F39C84C */ lw $t9, %lo(D_8094C84C)($t9) /* 00B34 80939804 872E0032 */ lh $t6, 0x0032($t9) ## 80950032 /* 00B38 80939808 25CF4000 */ addiu $t7, $t6, 0x4000 ## $t7 = 80942E10 -/* 00B3C 8093980C 10000006 */ beq $zero, $zero, .L80939828 +/* 00B3C 8093980C 10000006 */ beq $zero, $zero, .L80939828 /* 00B40 80939810 A60F0032 */ sh $t7, 0x0032($s0) ## 00000032 .L80939814: /* 00B44 80939814 3C188095 */ lui $t8, %hi(D_8094C84C) ## $t8 = 80950000 -/* 00B48 80939818 8F18C84C */ lw $t8, %lo(D_8094C84C)($t8) +/* 00B48 80939818 8F18C84C */ lw $t8, %lo(D_8094C84C)($t8) /* 00B4C 8093981C 87190032 */ lh $t9, 0x0032($t8) ## 80950032 /* 00B50 80939820 272EC000 */ addiu $t6, $t9, 0xC000 ## $t6 = 8094C000 /* 00B54 80939824 A60E0032 */ sh $t6, 0x0032($s0) ## 00000032 .L80939828: /* 00B58 80939828 240F0096 */ addiu $t7, $zero, 0x0096 ## $t7 = 00000096 -/* 00B5C 8093982C 100001A5 */ beq $zero, $zero, .L80939EC4 +/* 00B5C 8093982C 100001A5 */ beq $zero, $zero, .L80939EC4 /* 00B60 80939830 A60F017A */ sh $t7, 0x017A($s0) ## 0000017A .L80939834: /* 00B64 80939834 0C00B58B */ jal Actor_SetScale - + /* 00B68 80939838 34A5CCCC */ ori $a1, $a1, 0xCCCC ## $a1 = 0000CCCC /* 00B6C 8093983C 241800FF */ addiu $t8, $zero, 0x00FF ## $t8 = 000000FF /* 00B70 80939840 A21800AE */ sb $t8, 0x00AE($s0) ## 000000AE /* 00B74 80939844 A20000AF */ sb $zero, 0x00AF($s0) ## 000000AF /* 00B78 80939848 260505AC */ addiu $a1, $s0, 0x05AC ## $a1 = 000005AC -/* 00B7C 8093984C AFA50044 */ sw $a1, 0x0044($sp) +/* 00B7C 8093984C AFA50044 */ sw $a1, 0x0044($sp) /* 00B80 80939850 0C0170D9 */ jal ActorCollider_AllocCylinder - + /* 00B84 80939854 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 00B88 80939858 3C198095 */ lui $t9, %hi(D_8094A89C) ## $t9 = 80950000 -/* 00B8C 8093985C 9339A89C */ lbu $t9, %lo(D_8094A89C)($t9) +/* 00B8C 8093985C 9339A89C */ lbu $t9, %lo(D_8094A89C)($t9) /* 00B90 80939860 3C028095 */ lui $v0, %hi(D_8094C851) ## $v0 = 80950000 -/* 00B94 80939864 8FA50044 */ lw $a1, 0x0044($sp) -/* 00B98 80939868 17200082 */ bne $t9, $zero, .L80939A74 +/* 00B94 80939864 8FA50044 */ lw $a1, 0x0044($sp) +/* 00B98 80939868 17200082 */ bne $t9, $zero, .L80939A74 /* 00B9C 8093986C 2442C851 */ addiu $v0, $v0, %lo(D_8094C851) ## $v0 = 8094C851 /* 00BA0 80939870 240E0001 */ addiu $t6, $zero, 0x0001 ## $t6 = 00000001 /* 00BA4 80939874 3C018095 */ lui $at, %hi(D_8094A89C) ## $at = 80950000 -/* 00BA8 80939878 A02EA89C */ sb $t6, %lo(D_8094A89C)($at) +/* 00BA8 80939878 A02EA89C */ sb $t6, %lo(D_8094A89C)($at) /* 00BAC 8093987C 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 00BB0 80939880 00310821 */ addu $at, $at, $s1 +/* 00BB0 80939880 00310821 */ addu $at, $at, $s1 /* 00BB4 80939884 240F0001 */ addiu $t7, $zero, 0x0001 ## $t7 = 00000001 /* 00BB8 80939888 A02F0AE3 */ sb $t7, 0x0AE3($at) ## 00010AE3 /* 00BBC 8093988C 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 00BC0 80939890 00310821 */ addu $at, $at, $s1 +/* 00BC0 80939890 00310821 */ addu $at, $at, $s1 /* 00BC4 80939894 24180001 */ addiu $t8, $zero, 0x0001 ## $t8 = 00000001 /* 00BC8 80939898 A0380AE2 */ sb $t8, 0x0AE2($at) ## 00010AE2 /* 00BCC 8093989C 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 00BD0 809398A0 00310821 */ addu $at, $at, $s1 +/* 00BD0 809398A0 00310821 */ addu $at, $at, $s1 /* 00BD4 809398A4 24190001 */ addiu $t9, $zero, 0x0001 ## $t9 = 00000001 /* 00BD8 809398A8 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 /* 00BDC 809398AC A0390AE1 */ sb $t9, 0x0AE1($at) ## 00010AE1 /* 00BE0 809398B0 3C010001 */ lui $at, 0x0001 ## $at = 00010000 /* 00BE4 809398B4 3C098095 */ lui $t1, %hi(D_8094C840) ## $t1 = 80950000 -/* 00BE8 809398B8 00310821 */ addu $at, $at, $s1 +/* 00BE8 809398B8 00310821 */ addu $at, $at, $s1 /* 00BEC 809398BC 2529C840 */ addiu $t1, $t1, %lo(D_8094C840) ## $t1 = 8094C840 /* 00BF0 809398C0 E4200AFC */ swc1 $f0, 0x0AFC($at) ## 00010AFC /* 00BF4 809398C4 A1200000 */ sb $zero, 0x0000($t1) ## 8094C840 @@ -179,91 +179,91 @@ glabel BossTw_Init /* 00C7C 8093994C A1B80000 */ sb $t8, 0x0000($t5) ## 8094C870 /* 00C80 80939950 A3F80000 */ sb $t8, 0x0000($ra) ## 8094C87E /* 00C84 80939954 331900FF */ andi $t9, $t8, 0x00FF ## $t9 = 00000001 -/* 00C88 80939958 A439C87C */ sh $t9, %lo(D_8094C87C)($at) +/* 00C88 80939958 A439C87C */ sh $t9, %lo(D_8094C87C)($at) /* 00C8C 8093995C 3C0E8095 */ lui $t6, %hi(D_8094C87C) ## $t6 = 80950000 -/* 00C90 80939960 85CEC87C */ lh $t6, %lo(D_8094C87C)($t6) +/* 00C90 80939960 85CEC87C */ lh $t6, %lo(D_8094C87C)($t6) /* 00C94 80939964 3C018095 */ lui $at, %hi(D_8094C87A) ## $at = 80950000 -/* 00C98 80939968 AFA50044 */ sw $a1, 0x0044($sp) -/* 00C9C 8093996C A42EC87A */ sh $t6, %lo(D_8094C87A)($at) +/* 00C98 80939968 AFA50044 */ sw $a1, 0x0044($sp) +/* 00C9C 8093996C A42EC87A */ sh $t6, %lo(D_8094C87A)($at) /* 00CA0 80939970 3C018095 */ lui $at, %hi(D_8094C878) ## $at = 80950000 -/* 00CA4 80939974 A02EC878 */ sb $t6, %lo(D_8094C878)($at) +/* 00CA4 80939974 A02EC878 */ sb $t6, %lo(D_8094C878)($at) /* 00CA8 80939978 3C018095 */ lui $at, %hi(D_8094C876) ## $at = 80950000 /* 00CAC 8093997C 31D900FF */ andi $t9, $t6, 0x00FF ## $t9 = 00000000 -/* 00CB0 80939980 A439C876 */ sh $t9, %lo(D_8094C876)($at) +/* 00CB0 80939980 A439C876 */ sh $t9, %lo(D_8094C876)($at) /* 00CB4 80939984 3C018095 */ lui $at, %hi(D_8094C874) ## $at = 80950000 -/* 00CB8 80939988 A439C874 */ sh $t9, %lo(D_8094C874)($at) +/* 00CB8 80939988 A439C874 */ sh $t9, %lo(D_8094C874)($at) /* 00CBC 8093998C 3C018095 */ lui $at, %hi(D_8094C854) ## $at = 80950000 -/* 00CC0 80939990 E420C854 */ swc1 $f0, %lo(D_8094C854)($at) -/* 00CC4 80939994 C426C854 */ lwc1 $f6, %lo(D_8094C854)($at) +/* 00CC0 80939990 E420C854 */ swc1 $f0, %lo(D_8094C854)($at) +/* 00CC4 80939994 C426C854 */ lwc1 $f6, %lo(D_8094C854)($at) /* 00CC8 80939998 3C018095 */ lui $at, %hi(D_8094C858) ## $at = 80950000 -/* 00CCC 8093999C E426C858 */ swc1 $f6, %lo(D_8094C858)($at) +/* 00CCC 8093999C E426C858 */ swc1 $f6, %lo(D_8094C858)($at) /* 00CD0 809399A0 3C018095 */ lui $at, %hi(D_8094AEC4) ## $at = 80950000 /* 00CD4 809399A4 0C00CFBE */ jal Math_Rand_ZeroFloat - -/* 00CD8 809399A8 C42CAEC4 */ lwc1 $f12, %lo(D_8094AEC4)($at) + +/* 00CD8 809399A8 C42CAEC4 */ lwc1 $f12, %lo(D_8094AEC4)($at) /* 00CDC 809399AC 444EF800 */ cfc1 $t6, $31 /* 00CE0 809399B0 240F0001 */ addiu $t7, $zero, 0x0001 ## $t7 = 00000001 /* 00CE4 809399B4 44CFF800 */ ctc1 $t7, $31 /* 00CE8 809399B8 3C048095 */ lui $a0, %hi(D_8094C880) ## $a0 = 80950000 /* 00CEC 809399BC 2484C880 */ addiu $a0, $a0, %lo(D_8094C880) ## $a0 = 8094C880 -/* 00CF0 809399C0 46000224 */ cvt.w.s $f8, $f0 -/* 00CF4 809399C4 8FA50044 */ lw $a1, 0x0044($sp) +/* 00CF0 809399C0 46000224 */ cvt.w.s $f8, $f0 +/* 00CF4 809399C4 8FA50044 */ lw $a1, 0x0044($sp) /* 00CF8 809399C8 3C014F00 */ lui $at, 0x4F00 ## $at = 4F000000 /* 00CFC 809399CC 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 /* 00D00 809399D0 444FF800 */ cfc1 $t7, $31 /* 00D04 809399D4 24030048 */ addiu $v1, $zero, 0x0048 ## $v1 = 00000048 /* 00D08 809399D8 31EF0078 */ andi $t7, $t7, 0x0078 ## $t7 = 00000000 -/* 00D0C 809399DC 51E00013 */ beql $t7, $zero, .L80939A2C -/* 00D10 809399E0 440F4000 */ mfc1 $t7, $f8 +/* 00D0C 809399DC 51E00013 */ beql $t7, $zero, .L80939A2C +/* 00D10 809399E0 440F4000 */ mfc1 $t7, $f8 /* 00D14 809399E4 44814000 */ mtc1 $at, $f8 ## $f8 = 2147483648.00 /* 00D18 809399E8 240F0001 */ addiu $t7, $zero, 0x0001 ## $t7 = 00000001 -/* 00D1C 809399EC 46080201 */ sub.s $f8, $f0, $f8 +/* 00D1C 809399EC 46080201 */ sub.s $f8, $f0, $f8 /* 00D20 809399F0 44CFF800 */ ctc1 $t7, $31 /* 00D24 809399F4 00000000 */ nop -/* 00D28 809399F8 46004224 */ cvt.w.s $f8, $f8 +/* 00D28 809399F8 46004224 */ cvt.w.s $f8, $f8 /* 00D2C 809399FC 444FF800 */ cfc1 $t7, $31 /* 00D30 80939A00 00000000 */ nop /* 00D34 80939A04 31EF0078 */ andi $t7, $t7, 0x0078 ## $t7 = 00000000 -/* 00D38 80939A08 15E00005 */ bne $t7, $zero, .L80939A20 +/* 00D38 80939A08 15E00005 */ bne $t7, $zero, .L80939A20 /* 00D3C 80939A0C 00000000 */ nop -/* 00D40 80939A10 440F4000 */ mfc1 $t7, $f8 +/* 00D40 80939A10 440F4000 */ mfc1 $t7, $f8 /* 00D44 80939A14 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 00D48 80939A18 10000007 */ beq $zero, $zero, .L80939A38 +/* 00D48 80939A18 10000007 */ beq $zero, $zero, .L80939A38 /* 00D4C 80939A1C 01E17825 */ or $t7, $t7, $at ## $t7 = 80000000 .L80939A20: -/* 00D50 80939A20 10000005 */ beq $zero, $zero, .L80939A38 +/* 00D50 80939A20 10000005 */ beq $zero, $zero, .L80939A38 /* 00D54 80939A24 240FFFFF */ addiu $t7, $zero, 0xFFFF ## $t7 = FFFFFFFF -/* 00D58 80939A28 440F4000 */ mfc1 $t7, $f8 +/* 00D58 80939A28 440F4000 */ mfc1 $t7, $f8 .L80939A2C: /* 00D5C 80939A2C 00000000 */ nop -/* 00D60 80939A30 05E0FFFB */ bltz $t7, .L80939A20 +/* 00D60 80939A30 05E0FFFB */ bltz $t7, .L80939A20 /* 00D64 80939A34 00000000 */ nop .L80939A38: /* 00D68 80939A38 3C018095 */ lui $at, %hi(D_8094C85D) ## $at = 80950000 -/* 00D6C 80939A3C A02FC85D */ sb $t7, %lo(D_8094C85D)($at) +/* 00D6C 80939A3C A02FC85D */ sb $t7, %lo(D_8094C85D)($at) /* 00D70 80939A40 3C010001 */ lui $at, 0x0001 ## $at = 00010000 /* 00D74 80939A44 44CEF800 */ ctc1 $t6, $31 -/* 00D78 80939A48 00310821 */ addu $at, $at, $s1 +/* 00D78 80939A48 00310821 */ addu $at, $at, $s1 /* 00D7C 80939A4C AC241E10 */ sw $a0, 0x1E10($at) ## 00011E10 .L80939A50: -/* 00D80 80939A50 00430019 */ multu $v0, $v1 +/* 00D80 80939A50 00430019 */ multu $v0, $v1 /* 00D84 80939A54 24420001 */ addiu $v0, $v0, 0x0001 ## $v0 = 00000001 -/* 00D88 80939A58 00021400 */ sll $v0, $v0, 16 -/* 00D8C 80939A5C 00021403 */ sra $v0, $v0, 16 -/* 00D90 80939A60 28410096 */ slti $at, $v0, 0x0096 -/* 00D94 80939A64 0000C012 */ mflo $t8 -/* 00D98 80939A68 0098C821 */ addu $t9, $a0, $t8 -/* 00D9C 80939A6C 1420FFF8 */ bne $at, $zero, .L80939A50 +/* 00D88 80939A58 00021400 */ sll $v0, $v0, 16 +/* 00D8C 80939A5C 00021403 */ sra $v0, $v0, 16 +/* 00D90 80939A60 28410096 */ slti $at, $v0, 0x0096 +/* 00D94 80939A64 0000C012 */ mflo $t8 +/* 00D98 80939A68 0098C821 */ addu $t9, $a0, $t8 +/* 00D9C 80939A6C 1420FFF8 */ bne $at, $zero, .L80939A50 /* 00DA0 80939A70 A3200000 */ sb $zero, 0x0000($t9) ## 00000000 .L80939A74: /* 00DA4 80939A74 8603001C */ lh $v1, 0x001C($s0) ## 0000001C /* 00DA8 80939A78 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 00DAC 80939A7C 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 -/* 00DB0 80939A80 14600030 */ bne $v1, $zero, .L80939B44 +/* 00DB0 80939A80 14600030 */ bne $v1, $zero, .L80939B44 /* 00DB4 80939A84 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 /* 00DB8 80939A88 3C078095 */ lui $a3, %hi(D_8094A814) ## $a3 = 80950000 /* 00DBC 80939A8C 0C01712B */ jal ActorCollider_InitCylinder - + /* 00DC0 80939A90 24E7A814 */ addiu $a3, $a3, %lo(D_8094A814) ## $a3 = 8094A814 /* 00DC4 80939A94 240E0033 */ addiu $t6, $zero, 0x0033 ## $t6 = 00000033 /* 00DC8 80939A98 A20E0117 */ sb $t6, 0x0117($s0) ## 00000117 @@ -272,20 +272,20 @@ glabel BossTw_Init /* 00DD4 80939AA4 3C070600 */ lui $a3, 0x0600 ## $a3 = 06000000 /* 00DD8 80939AA8 24E76F28 */ addiu $a3, $a3, 0x6F28 ## $a3 = 06006F28 /* 00DDC 80939AAC 24C670E0 */ addiu $a2, $a2, 0x70E0 ## $a2 = 060070E0 -/* 00DE0 80939AB0 AFA50048 */ sw $a1, 0x0048($sp) -/* 00DE4 80939AB4 AFA00018 */ sw $zero, 0x0018($sp) -/* 00DE8 80939AB8 AFA00014 */ sw $zero, 0x0014($sp) -/* 00DEC 80939ABC AFA00010 */ sw $zero, 0x0010($sp) -/* 00DF0 80939AC0 0C0291BE */ jal func_800A46F8 +/* 00DE0 80939AB0 AFA50048 */ sw $a1, 0x0048($sp) +/* 00DE4 80939AB4 AFA00018 */ sw $zero, 0x0018($sp) +/* 00DE8 80939AB8 AFA00014 */ sw $zero, 0x0014($sp) +/* 00DEC 80939ABC AFA00010 */ sw $zero, 0x0010($sp) +/* 00DF0 80939AC0 0C0291BE */ jal SkelAnime_InitSV /* 00DF4 80939AC4 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 00DF8 80939AC8 3C0F8016 */ lui $t7, 0x8016 ## $t7 = 80160000 /* 00DFC 80939ACC 95EFF542 */ lhu $t7, -0x0ABE($t7) ## 8015F542 /* 00E00 80939AD0 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 /* 00E04 80939AD4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 00E08 80939AD8 31F80020 */ andi $t8, $t7, 0x0020 ## $t8 = 00000000 -/* 00E0C 80939ADC 1300000F */ beq $t8, $zero, .L80939B1C +/* 00E0C 80939ADC 1300000F */ beq $t8, $zero, .L80939B1C /* 00E10 80939AE0 00000000 */ nop -/* 00E14 80939AE4 0C24E82A */ jal func_8093A0A8 +/* 00E14 80939AE4 0C24E82A */ jal func_8093A0A8 /* 00E18 80939AE8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 00E1C 80939AEC 3C01C416 */ lui $at, 0xC416 ## $at = C4160000 /* 00E20 80939AF0 44815000 */ mtc1 $at, $f10 ## $f10 = -600.00 @@ -296,30 +296,30 @@ glabel BossTw_Init /* 00E34 80939B04 E60A0024 */ swc1 $f10, 0x0024($s0) ## 00000024 /* 00E38 80939B08 E6100028 */ swc1 $f16, 0x0028($s0) ## 00000028 /* 00E3C 80939B0C 0C03E803 */ jal Audio_SetBGM - + /* 00E40 80939B10 E612002C */ swc1 $f18, 0x002C($s0) ## 0000002C -/* 00E44 80939B14 10000003 */ beq $zero, $zero, .L80939B24 +/* 00E44 80939B14 10000003 */ beq $zero, $zero, .L80939B24 /* 00E48 80939B18 00000000 */ nop .L80939B1C: -/* 00E4C 80939B1C 0C24F553 */ jal func_8093D54C +/* 00E4C 80939B1C 0C24F553 */ jal func_8093D54C /* 00E50 80939B20 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 .L80939B24: /* 00E54 80939B24 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 00E58 80939B28 24A56F28 */ addiu $a1, $a1, 0x6F28 ## $a1 = 06006F28 -/* 00E5C 80939B2C 8FA40048 */ lw $a0, 0x0048($sp) -/* 00E60 80939B30 0C0294D3 */ jal func_800A534C +/* 00E5C 80939B2C 8FA40048 */ lw $a0, 0x0048($sp) +/* 00E60 80939B30 0C0294D3 */ jal SkelAnime_ChangeAnimTransitionRepeat /* 00E64 80939B34 3C06C040 */ lui $a2, 0xC040 ## $a2 = C0400000 /* 00E68 80939B38 24190001 */ addiu $t9, $zero, 0x0001 ## $t9 = 00000001 -/* 00E6C 80939B3C 100000BF */ beq $zero, $zero, .L80939E3C +/* 00E6C 80939B3C 100000BF */ beq $zero, $zero, .L80939E3C /* 00E70 80939B40 A2190564 */ sb $t9, 0x0564($s0) ## 00000564 .L80939B44: -/* 00E74 80939B44 1461002F */ bne $v1, $at, .L80939C04 +/* 00E74 80939B44 1461002F */ bne $v1, $at, .L80939C04 /* 00E78 80939B48 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 00E7C 80939B4C 3C078095 */ lui $a3, %hi(D_8094A814) ## $a3 = 80950000 /* 00E80 80939B50 24E7A814 */ addiu $a3, $a3, %lo(D_8094A814) ## $a3 = 8094A814 /* 00E84 80939B54 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 00E88 80939B58 0C01712B */ jal ActorCollider_InitCylinder - + /* 00E8C 80939B5C 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 00E90 80939B60 240E0032 */ addiu $t6, $zero, 0x0032 ## $t6 = 00000032 /* 00E94 80939B64 A20E0117 */ sb $t6, 0x0117($s0) ## 00000117 @@ -328,20 +328,20 @@ glabel BossTw_Init /* 00EA0 80939B70 3C070600 */ lui $a3, 0x0600 ## $a3 = 06000000 /* 00EA4 80939B74 24E76F28 */ addiu $a3, $a3, 0x6F28 ## $a3 = 06006F28 /* 00EA8 80939B78 24C6F888 */ addiu $a2, $a2, 0xF888 ## $a2 = 0601F888 -/* 00EAC 80939B7C AFA50048 */ sw $a1, 0x0048($sp) -/* 00EB0 80939B80 AFA00018 */ sw $zero, 0x0018($sp) -/* 00EB4 80939B84 AFA00014 */ sw $zero, 0x0014($sp) -/* 00EB8 80939B88 AFA00010 */ sw $zero, 0x0010($sp) -/* 00EBC 80939B8C 0C0291BE */ jal func_800A46F8 +/* 00EAC 80939B7C AFA50048 */ sw $a1, 0x0048($sp) +/* 00EB0 80939B80 AFA00018 */ sw $zero, 0x0018($sp) +/* 00EB4 80939B84 AFA00014 */ sw $zero, 0x0014($sp) +/* 00EB8 80939B88 AFA00010 */ sw $zero, 0x0010($sp) +/* 00EBC 80939B8C 0C0291BE */ jal SkelAnime_InitSV /* 00EC0 80939B90 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 00EC4 80939B94 3C0F8016 */ lui $t7, 0x8016 ## $t7 = 80160000 /* 00EC8 80939B98 95EFF542 */ lhu $t7, -0x0ABE($t7) ## 8015F542 /* 00ECC 80939B9C 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 /* 00ED0 80939BA0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 00ED4 80939BA4 31F80020 */ andi $t8, $t7, 0x0020 ## $t8 = 00000000 -/* 00ED8 80939BA8 1300000C */ beq $t8, $zero, .L80939BDC +/* 00ED8 80939BA8 1300000C */ beq $t8, $zero, .L80939BDC /* 00EDC 80939BAC 00000000 */ nop -/* 00EE0 80939BB0 0C24E82A */ jal func_8093A0A8 +/* 00EE0 80939BB0 0C24E82A */ jal func_8093A0A8 /* 00EE4 80939BB4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 00EE8 80939BB8 3C014416 */ lui $at, 0x4416 ## $at = 44160000 /* 00EEC 80939BBC 44812000 */ mtc1 $at, $f4 ## $f4 = 600.00 @@ -350,25 +350,25 @@ glabel BossTw_Init /* 00EF8 80939BC8 44804000 */ mtc1 $zero, $f8 ## $f8 = 0.00 /* 00EFC 80939BCC E6040024 */ swc1 $f4, 0x0024($s0) ## 00000024 /* 00F00 80939BD0 E6060028 */ swc1 $f6, 0x0028($s0) ## 00000028 -/* 00F04 80939BD4 10000003 */ beq $zero, $zero, .L80939BE4 +/* 00F04 80939BD4 10000003 */ beq $zero, $zero, .L80939BE4 /* 00F08 80939BD8 E608002C */ swc1 $f8, 0x002C($s0) ## 0000002C .L80939BDC: -/* 00F0C 80939BDC 0C24F553 */ jal func_8093D54C +/* 00F0C 80939BDC 0C24F553 */ jal func_8093D54C /* 00F10 80939BE0 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 .L80939BE4: /* 00F14 80939BE4 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 00F18 80939BE8 24A56F28 */ addiu $a1, $a1, 0x6F28 ## $a1 = 06006F28 -/* 00F1C 80939BEC 8FA40048 */ lw $a0, 0x0048($sp) -/* 00F20 80939BF0 0C0294D3 */ jal func_800A534C +/* 00F1C 80939BEC 8FA40048 */ lw $a0, 0x0048($sp) +/* 00F20 80939BF0 0C0294D3 */ jal SkelAnime_ChangeAnimTransitionRepeat /* 00F24 80939BF4 3C06C040 */ lui $a2, 0xC040 ## $a2 = C0400000 /* 00F28 80939BF8 24190001 */ addiu $t9, $zero, 0x0001 ## $t9 = 00000001 -/* 00F2C 80939BFC 1000008F */ beq $zero, $zero, .L80939E3C +/* 00F2C 80939BFC 1000008F */ beq $zero, $zero, .L80939E3C /* 00F30 80939C00 A2190564 */ sb $t9, 0x0564($s0) ## 00000564 .L80939C04: /* 00F34 80939C04 3C078095 */ lui $a3, %hi(D_8094A840) ## $a3 = 80950000 /* 00F38 80939C08 24E7A840 */ addiu $a3, $a3, %lo(D_8094A840) ## $a3 = 8094A840 /* 00F3C 80939C0C 0C01712B */ jal ActorCollider_InitCylinder - + /* 00F40 80939C10 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 00F44 80939C14 3C188094 */ lui $t8, %hi(func_80940D48) ## $t8 = 80940000 /* 00F48 80939C18 3C198094 */ lui $t9, %hi(func_80945084) ## $t9 = 80940000 @@ -385,30 +385,30 @@ glabel BossTw_Init /* 00F74 80939C44 3C070602 */ lui $a3, 0x0602 ## $a3 = 06020000 /* 00F78 80939C48 24E744B4 */ addiu $a3, $a3, 0x44B4 ## $a3 = 060244B4 /* 00F7C 80939C4C 24C62020 */ addiu $a2, $a2, 0x2020 ## $a2 = 06032020 -/* 00F80 80939C50 AFA50048 */ sw $a1, 0x0048($sp) -/* 00F84 80939C54 AFA00018 */ sw $zero, 0x0018($sp) -/* 00F88 80939C58 AFA00014 */ sw $zero, 0x0014($sp) -/* 00F8C 80939C5C AFA00010 */ sw $zero, 0x0010($sp) -/* 00F90 80939C60 0C0291BE */ jal func_800A46F8 +/* 00F80 80939C50 AFA50048 */ sw $a1, 0x0048($sp) +/* 00F84 80939C54 AFA00018 */ sw $zero, 0x0018($sp) +/* 00F88 80939C58 AFA00014 */ sw $zero, 0x0014($sp) +/* 00F8C 80939C5C AFA00010 */ sw $zero, 0x0010($sp) +/* 00F90 80939C60 0C0291BE */ jal SkelAnime_InitSV /* 00F94 80939C64 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 00F98 80939C68 3C050602 */ lui $a1, 0x0602 ## $a1 = 06020000 /* 00F9C 80939C6C 24A544B4 */ addiu $a1, $a1, 0x44B4 ## $a1 = 060244B4 -/* 00FA0 80939C70 8FA40048 */ lw $a0, 0x0048($sp) -/* 00FA4 80939C74 0C0294D3 */ jal func_800A534C +/* 00FA0 80939C70 8FA40048 */ lw $a0, 0x0048($sp) +/* 00FA4 80939C74 0C0294D3 */ jal SkelAnime_ChangeAnimTransitionRepeat /* 00FA8 80939C78 3C06C040 */ lui $a2, 0xC040 ## $a2 = C0400000 /* 00FAC 80939C7C 3C0E8016 */ lui $t6, 0x8016 ## $t6 = 80160000 /* 00FB0 80939C80 95CEF542 */ lhu $t6, -0x0ABE($t6) ## 8015F542 /* 00FB4 80939C84 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 /* 00FB8 80939C88 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 00FBC 80939C8C 31CF0020 */ andi $t7, $t6, 0x0020 ## $t7 = 00000000 -/* 00FC0 80939C90 11E00005 */ beq $t7, $zero, .L80939CA8 +/* 00FC0 80939C90 11E00005 */ beq $t7, $zero, .L80939CA8 /* 00FC4 80939C94 00000000 */ nop -/* 00FC8 80939C98 0C24F209 */ jal func_8093C824 +/* 00FC8 80939C98 0C24F209 */ jal func_8093C824 /* 00FCC 80939C9C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00FD0 80939CA0 1000000B */ beq $zero, $zero, .L80939CD0 +/* 00FD0 80939CA0 1000000B */ beq $zero, $zero, .L80939CD0 /* 00FD4 80939CA4 24180002 */ addiu $t8, $zero, 0x0002 ## $t8 = 00000002 .L80939CA8: -/* 00FD8 80939CA8 0C24F563 */ jal func_8093D58C +/* 00FD8 80939CA8 0C24F563 */ jal func_8093D58C /* 00FDC 80939CAC 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 /* 00FE0 80939CB0 3C01447A */ lui $at, 0x447A ## $at = 447A0000 /* 00FE4 80939CB4 44805000 */ mtc1 $zero, $f10 ## $f10 = 0.00 @@ -422,16 +422,16 @@ glabel BossTw_Init /* 01000 80939CD0 A618001C */ sh $t8, 0x001C($s0) ## 0000001C /* 01004 80939CD4 3C018095 */ lui $at, %hi(D_8094C84C) ## $at = 80950000 /* 01008 80939CD8 3C050001 */ lui $a1, 0x0001 ## $a1 = 00010000 -/* 0100C 80939CDC AC30C84C */ sw $s0, %lo(D_8094C84C)($at) -/* 01010 80939CE0 00B12821 */ addu $a1, $a1, $s1 +/* 0100C 80939CDC AC30C84C */ sw $s0, %lo(D_8094C84C)($at) +/* 01010 80939CE0 00B12821 */ addu $a1, $a1, $s1 /* 01014 80939CE4 80A51CBC */ lb $a1, 0x1CBC($a1) ## 00011CBC /* 01018 80939CE8 0C00B337 */ jal Flags_GetClear - + /* 0101C 80939CEC 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 01020 80939CF0 50400027 */ beql $v0, $zero, .L80939D90 +/* 01020 80939CF0 50400027 */ beql $v0, $zero, .L80939D90 /* 01024 80939CF4 C6120024 */ lwc1 $f18, 0x0024($s0) ## 00000024 /* 01028 80939CF8 0C00B55C */ jal Actor_Kill - + /* 0102C 80939CFC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 01030 80939D00 3C014416 */ lui $at, 0x4416 ## $at = 44160000 /* 01034 80939D04 44812000 */ mtc1 $at, $f4 ## $f4 = 600.00 @@ -440,73 +440,73 @@ glabel BossTw_Init /* 01040 80939D10 44804000 */ mtc1 $zero, $f8 ## $f8 = 0.00 /* 01044 80939D14 26241C24 */ addiu $a0, $s1, 0x1C24 ## $a0 = 00001C24 /* 01048 80939D18 2419FFFF */ addiu $t9, $zero, 0xFFFF ## $t9 = FFFFFFFF -/* 0104C 80939D1C AFB90028 */ sw $t9, 0x0028($sp) -/* 01050 80939D20 AFA40048 */ sw $a0, 0x0048($sp) +/* 0104C 80939D1C AFB90028 */ sw $t9, 0x0028($sp) +/* 01050 80939D20 AFA40048 */ sw $a0, 0x0048($sp) /* 01054 80939D24 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 01058 80939D28 02203025 */ or $a2, $s1, $zero ## $a2 = 00000000 /* 0105C 80939D2C 2407005D */ addiu $a3, $zero, 0x005D ## $a3 = 0000005D -/* 01060 80939D30 AFA0001C */ sw $zero, 0x001C($sp) -/* 01064 80939D34 AFA00020 */ sw $zero, 0x0020($sp) -/* 01068 80939D38 AFA00024 */ sw $zero, 0x0024($sp) -/* 0106C 80939D3C E7A40010 */ swc1 $f4, 0x0010($sp) -/* 01070 80939D40 E7A60014 */ swc1 $f6, 0x0014($sp) +/* 01060 80939D30 AFA0001C */ sw $zero, 0x001C($sp) +/* 01064 80939D34 AFA00020 */ sw $zero, 0x0020($sp) +/* 01068 80939D38 AFA00024 */ sw $zero, 0x0024($sp) +/* 0106C 80939D3C E7A40010 */ swc1 $f4, 0x0010($sp) +/* 01070 80939D40 E7A60014 */ swc1 $f6, 0x0014($sp) /* 01074 80939D44 0C00C916 */ jal Actor_SpawnAttached - -/* 01078 80939D48 E7A80018 */ swc1 $f8, 0x0018($sp) + +/* 01078 80939D48 E7A80018 */ swc1 $f8, 0x0018($sp) /* 0107C 80939D4C 3C014366 */ lui $at, 0x4366 ## $at = 43660000 /* 01080 80939D50 44815000 */ mtc1 $at, $f10 ## $f10 = 230.00 /* 01084 80939D54 44808000 */ mtc1 $zero, $f16 ## $f16 = 0.00 -/* 01088 80939D58 8FA40048 */ lw $a0, 0x0048($sp) +/* 01088 80939D58 8FA40048 */ lw $a0, 0x0048($sp) /* 0108C 80939D5C 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 /* 01090 80939D60 2406005F */ addiu $a2, $zero, 0x005F ## $a2 = 0000005F /* 01094 80939D64 3C07C416 */ lui $a3, 0xC416 ## $a3 = C4160000 -/* 01098 80939D68 AFA00018 */ sw $zero, 0x0018($sp) -/* 0109C 80939D6C AFA0001C */ sw $zero, 0x001C($sp) -/* 010A0 80939D70 AFA00020 */ sw $zero, 0x0020($sp) -/* 010A4 80939D74 AFA00024 */ sw $zero, 0x0024($sp) -/* 010A8 80939D78 E7AA0010 */ swc1 $f10, 0x0010($sp) +/* 01098 80939D68 AFA00018 */ sw $zero, 0x0018($sp) +/* 0109C 80939D6C AFA0001C */ sw $zero, 0x001C($sp) +/* 010A0 80939D70 AFA00020 */ sw $zero, 0x0020($sp) +/* 010A4 80939D74 AFA00024 */ sw $zero, 0x0024($sp) +/* 010A8 80939D78 E7AA0010 */ swc1 $f10, 0x0010($sp) /* 010AC 80939D7C 0C00C7D4 */ jal Actor_Spawn ## ActorSpawn -/* 010B0 80939D80 E7B00014 */ swc1 $f16, 0x0014($sp) -/* 010B4 80939D84 1000002E */ beq $zero, $zero, .L80939E40 +/* 010B0 80939D80 E7B00014 */ swc1 $f16, 0x0014($sp) +/* 010B4 80939D84 1000002E */ beq $zero, $zero, .L80939E40 /* 010B8 80939D88 922F07AF */ lbu $t7, 0x07AF($s1) ## 000007AF /* 010BC 80939D8C C6120024 */ lwc1 $f18, 0x0024($s0) ## 00000024 .L80939D90: /* 010C0 80939D90 26241C24 */ addiu $a0, $s1, 0x1C24 ## $a0 = 00001C24 /* 010C4 80939D94 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 010C8 80939D98 E7B20010 */ swc1 $f18, 0x0010($sp) +/* 010C8 80939D98 E7B20010 */ swc1 $f18, 0x0010($sp) /* 010CC 80939D9C C6040028 */ lwc1 $f4, 0x0028($s0) ## 00000028 /* 010D0 80939DA0 02203025 */ or $a2, $s1, $zero ## $a2 = 00000000 /* 010D4 80939DA4 240700DC */ addiu $a3, $zero, 0x00DC ## $a3 = 000000DC -/* 010D8 80939DA8 E7A40014 */ swc1 $f4, 0x0014($sp) +/* 010D8 80939DA8 E7A40014 */ swc1 $f4, 0x0014($sp) /* 010DC 80939DAC C606002C */ lwc1 $f6, 0x002C($s0) ## 0000002C -/* 010E0 80939DB0 AFA40048 */ sw $a0, 0x0048($sp) -/* 010E4 80939DB4 AFA00028 */ sw $zero, 0x0028($sp) -/* 010E8 80939DB8 AFA00024 */ sw $zero, 0x0024($sp) -/* 010EC 80939DBC AFA00020 */ sw $zero, 0x0020($sp) -/* 010F0 80939DC0 AFA0001C */ sw $zero, 0x001C($sp) +/* 010E0 80939DB0 AFA40048 */ sw $a0, 0x0048($sp) +/* 010E4 80939DB4 AFA00028 */ sw $zero, 0x0028($sp) +/* 010E8 80939DB8 AFA00024 */ sw $zero, 0x0024($sp) +/* 010EC 80939DBC AFA00020 */ sw $zero, 0x0020($sp) +/* 010F0 80939DC0 AFA0001C */ sw $zero, 0x001C($sp) /* 010F4 80939DC4 0C00C916 */ jal Actor_SpawnAttached - -/* 010F8 80939DC8 E7A60018 */ swc1 $f6, 0x0018($sp) + +/* 010F8 80939DC8 E7A60018 */ swc1 $f6, 0x0018($sp) /* 010FC 80939DCC 3C018095 */ lui $at, %hi(D_8094C844) ## $at = 80950000 -/* 01100 80939DD0 AC22C844 */ sw $v0, %lo(D_8094C844)($at) +/* 01100 80939DD0 AC22C844 */ sw $v0, %lo(D_8094C844)($at) /* 01104 80939DD4 C6080024 */ lwc1 $f8, 0x0024($s0) ## 00000024 /* 01108 80939DD8 240E0001 */ addiu $t6, $zero, 0x0001 ## $t6 = 00000001 -/* 0110C 80939DDC 8FA40048 */ lw $a0, 0x0048($sp) -/* 01110 80939DE0 E7A80010 */ swc1 $f8, 0x0010($sp) +/* 0110C 80939DDC 8FA40048 */ lw $a0, 0x0048($sp) +/* 01110 80939DE0 E7A80010 */ swc1 $f8, 0x0010($sp) /* 01114 80939DE4 C60A0028 */ lwc1 $f10, 0x0028($s0) ## 00000028 /* 01118 80939DE8 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 0111C 80939DEC 02203025 */ or $a2, $s1, $zero ## $a2 = 00000000 -/* 01120 80939DF0 E7AA0014 */ swc1 $f10, 0x0014($sp) +/* 01120 80939DF0 E7AA0014 */ swc1 $f10, 0x0014($sp) /* 01124 80939DF4 C610002C */ lwc1 $f16, 0x002C($s0) ## 0000002C -/* 01128 80939DF8 AFAE0028 */ sw $t6, 0x0028($sp) -/* 0112C 80939DFC AFA00024 */ sw $zero, 0x0024($sp) -/* 01130 80939E00 AFA00020 */ sw $zero, 0x0020($sp) -/* 01134 80939E04 AFA0001C */ sw $zero, 0x001C($sp) +/* 01128 80939DF8 AFAE0028 */ sw $t6, 0x0028($sp) +/* 0112C 80939DFC AFA00024 */ sw $zero, 0x0024($sp) +/* 01130 80939E00 AFA00020 */ sw $zero, 0x0020($sp) +/* 01134 80939E04 AFA0001C */ sw $zero, 0x001C($sp) /* 01138 80939E08 240700DC */ addiu $a3, $zero, 0x00DC ## $a3 = 000000DC /* 0113C 80939E0C 0C00C916 */ jal Actor_SpawnAttached - -/* 01140 80939E10 E7B00018 */ swc1 $f16, 0x0018($sp) + +/* 01140 80939E10 E7B00018 */ swc1 $f16, 0x0018($sp) /* 01144 80939E14 3C048095 */ lui $a0, %hi(D_8094C844) ## $a0 = 80950000 /* 01148 80939E18 2484C844 */ addiu $a0, $a0, %lo(D_8094C844) ## $a0 = 8094C844 /* 0114C 80939E1C 8C980000 */ lw $t8, 0x0000($a0) ## 8094C844 @@ -522,31 +522,31 @@ glabel BossTw_Init .L80939E40: /* 01170 80939E40 3C014F80 */ lui $at, 0x4F80 ## $at = 4F800000 /* 01174 80939E44 448F9000 */ mtc1 $t7, $f18 ## $f18 = 0.00 -/* 01178 80939E48 05E10004 */ bgez $t7, .L80939E5C -/* 0117C 80939E4C 46809120 */ cvt.s.w $f4, $f18 +/* 01178 80939E48 05E10004 */ bgez $t7, .L80939E5C +/* 0117C 80939E4C 46809120 */ cvt.s.w $f4, $f18 /* 01180 80939E50 44813000 */ mtc1 $at, $f6 ## $f6 = 4294967296.00 /* 01184 80939E54 00000000 */ nop -/* 01188 80939E58 46062100 */ add.s $f4, $f4, $f6 +/* 01188 80939E58 46062100 */ add.s $f4, $f4, $f6 .L80939E5C: /* 0118C 80939E5C E60401D4 */ swc1 $f4, 0x01D4($s0) ## 000001D4 /* 01190 80939E60 923807B0 */ lbu $t8, 0x07B0($s1) ## 000007B0 /* 01194 80939E64 3C014F80 */ lui $at, 0x4F80 ## $at = 4F800000 /* 01198 80939E68 44984000 */ mtc1 $t8, $f8 ## $f8 = 0.00 -/* 0119C 80939E6C 07010004 */ bgez $t8, .L80939E80 -/* 011A0 80939E70 468042A0 */ cvt.s.w $f10, $f8 +/* 0119C 80939E6C 07010004 */ bgez $t8, .L80939E80 +/* 011A0 80939E70 468042A0 */ cvt.s.w $f10, $f8 /* 011A4 80939E74 44818000 */ mtc1 $at, $f16 ## $f16 = 4294967296.00 /* 011A8 80939E78 00000000 */ nop -/* 011AC 80939E7C 46105280 */ add.s $f10, $f10, $f16 +/* 011AC 80939E7C 46105280 */ add.s $f10, $f10, $f16 .L80939E80: /* 011B0 80939E80 E60A01D8 */ swc1 $f10, 0x01D8($s0) ## 000001D8 /* 011B4 80939E84 923907B1 */ lbu $t9, 0x07B1($s1) ## 000007B1 /* 011B8 80939E88 3C014F80 */ lui $at, 0x4F80 ## $at = 4F800000 /* 011BC 80939E8C 44999000 */ mtc1 $t9, $f18 ## $f18 = 0.00 -/* 011C0 80939E90 07210004 */ bgez $t9, .L80939EA4 -/* 011C4 80939E94 468091A0 */ cvt.s.w $f6, $f18 +/* 011C0 80939E90 07210004 */ bgez $t9, .L80939EA4 +/* 011C4 80939E94 468091A0 */ cvt.s.w $f6, $f18 /* 011C8 80939E98 44812000 */ mtc1 $at, $f4 ## $f4 = 4294967296.00 /* 011CC 80939E9C 00000000 */ nop -/* 011D0 80939EA0 46043180 */ add.s $f6, $f6, $f4 +/* 011D0 80939EA0 46043180 */ add.s $f6, $f6, $f4 .L80939EA4: /* 011D4 80939EA4 E60601DC */ swc1 $f6, 0x01DC($s0) ## 000001DC /* 011D8 80939EA8 862E07B2 */ lh $t6, 0x07B2($s1) ## 000007B2 @@ -554,13 +554,13 @@ glabel BossTw_Init /* 011E0 80939EB0 44815000 */ mtc1 $at, $f10 ## $f10 = 1000.00 /* 011E4 80939EB4 448E4000 */ mtc1 $t6, $f8 ## $f8 = 0.00 /* 011E8 80939EB8 E60A01E4 */ swc1 $f10, 0x01E4($s0) ## 000001E4 -/* 011EC 80939EBC 46804420 */ cvt.s.w $f16, $f8 +/* 011EC 80939EBC 46804420 */ cvt.s.w $f16, $f8 /* 011F0 80939EC0 E61001E0 */ swc1 $f16, 0x01E0($s0) ## 000001E0 .L80939EC4: -/* 011F4 80939EC4 8FBF003C */ lw $ra, 0x003C($sp) -/* 011F8 80939EC8 8FB00034 */ lw $s0, 0x0034($sp) -/* 011FC 80939ECC 8FB10038 */ lw $s1, 0x0038($sp) -/* 01200 80939ED0 03E00008 */ jr $ra +/* 011F4 80939EC4 8FBF003C */ lw $ra, 0x003C($sp) +/* 011F8 80939EC8 8FB00034 */ lw $s0, 0x0034($sp) +/* 011FC 80939ECC 8FB10038 */ lw $s1, 0x0038($sp) +/* 01200 80939ED0 03E00008 */ jr $ra /* 01204 80939ED4 27BD0058 */ addiu $sp, $sp, 0x0058 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093A0A8.s b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093A0A8.s index a1143e9473..71435d4981 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093A0A8.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093A0A8.s @@ -1,12 +1,12 @@ glabel func_8093A0A8 /* 013D8 8093A0A8 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 013DC 8093A0AC AFBF001C */ sw $ra, 0x001C($sp) -/* 013E0 8093A0B0 AFB00018 */ sw $s0, 0x0018($sp) -/* 013E4 8093A0B4 AFA5002C */ sw $a1, 0x002C($sp) +/* 013DC 8093A0AC AFBF001C */ sw $ra, 0x001C($sp) +/* 013E0 8093A0B0 AFB00018 */ sw $s0, 0x0018($sp) +/* 013E4 8093A0B4 AFA5002C */ sw $a1, 0x002C($sp) /* 013E8 8093A0B8 8C8E0118 */ lw $t6, 0x0118($a0) ## 00000118 /* 013EC 8093A0BC 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 /* 013F0 8093A0C0 3C088094 */ lui $t0, %hi(func_8093A2AC) ## $t0 = 80940000 -/* 013F4 8093A0C4 AFAE0024 */ sw $t6, 0x0024($sp) +/* 013F4 8093A0C4 AFAE0024 */ sw $t6, 0x0024($sp) /* 013F8 8093A0C8 8C980004 */ lw $t8, 0x0004($a0) ## 00000004 /* 013FC 8093A0CC 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 01400 8093A0D0 240F0001 */ addiu $t7, $zero, 0x0001 ## $t7 = 00000001 @@ -19,58 +19,58 @@ glabel func_8093A0A8 /* 0141C 8093A0EC 24A56F28 */ addiu $a1, $a1, 0x6F28 ## $a1 = 06006F28 /* 01420 8093A0F0 24840568 */ addiu $a0, $a0, 0x0568 ## $a0 = 00000568 /* 01424 8093A0F4 3C06C120 */ lui $a2, 0xC120 ## $a2 = C1200000 -/* 01428 8093A0F8 0C0294D3 */ jal func_800A534C +/* 01428 8093A0F8 0C0294D3 */ jal SkelAnime_ChangeAnimTransitionRepeat /* 0142C 8093A0FC E484FF60 */ swc1 $f4, -0x00A0($a0) ## 000004C8 /* 01430 8093A100 0C03F66B */ jal Math_Rand_ZeroOne ## Rand.Next() float /* 01434 8093A104 00000000 */ nop /* 01438 8093A108 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 /* 0143C 8093A10C 44813000 */ mtc1 $at, $f6 ## $f6 = 0.50 -/* 01440 8093A110 8FA20024 */ lw $v0, 0x0024($sp) -/* 01444 8093A114 4606003C */ c.lt.s $f0, $f6 +/* 01440 8093A110 8FA20024 */ lw $v0, 0x0024($sp) +/* 01444 8093A114 4606003C */ c.lt.s $f0, $f6 /* 01448 8093A118 00000000 */ nop -/* 0144C 8093A11C 45000026 */ bc1f .L8093A1B8 +/* 0144C 8093A11C 45000026 */ bc1f .L8093A1B8 /* 01450 8093A120 00000000 */ nop -/* 01454 8093A124 10400024 */ beq $v0, $zero, .L8093A1B8 +/* 01454 8093A124 10400024 */ beq $v0, $zero, .L8093A1B8 /* 01458 8093A128 00000000 */ nop /* 0145C 8093A12C 8C4A014C */ lw $t2, 0x014C($v0) ## 0000014C /* 01460 8093A130 3C098094 */ lui $t1, %hi(func_8093B1AC) ## $t1 = 80940000 /* 01464 8093A134 2529B1AC */ addiu $t1, $t1, %lo(func_8093B1AC) ## $t1 = 8093B1AC -/* 01468 8093A138 152A001F */ bne $t1, $t2, .L8093A1B8 +/* 01468 8093A138 152A001F */ bne $t1, $t2, .L8093A1B8 /* 0146C 8093A13C 3C014348 */ lui $at, 0x4348 ## $at = 43480000 /* 01470 8093A140 44816000 */ mtc1 $at, $f12 ## $f12 = 200.00 /* 01474 8093A144 0C00CFC8 */ jal Math_Rand_CenteredFloat - + /* 01478 8093A148 00000000 */ nop -/* 0147C 8093A14C 8FAB0024 */ lw $t3, 0x0024($sp) +/* 0147C 8093A14C 8FAB0024 */ lw $t3, 0x0024($sp) /* 01480 8093A150 3C014348 */ lui $at, 0x4348 ## $at = 43480000 /* 01484 8093A154 44816000 */ mtc1 $at, $f12 ## $f12 = 200.00 /* 01488 8093A158 C5680024 */ lwc1 $f8, 0x0024($t3) ## 00000024 -/* 0148C 8093A15C 46080280 */ add.s $f10, $f0, $f8 +/* 0148C 8093A15C 46080280 */ add.s $f10, $f0, $f8 /* 01490 8093A160 0C00CFBE */ jal Math_Rand_ZeroFloat - + /* 01494 8093A164 E60A04B0 */ swc1 $f10, 0x04B0($s0) ## 000004B0 /* 01498 8093A168 3C0143AA */ lui $at, 0x43AA ## $at = 43AA0000 /* 0149C 8093A16C 44818000 */ mtc1 $at, $f16 ## $f16 = 340.00 /* 014A0 8093A170 3C014348 */ lui $at, 0x4348 ## $at = 43480000 /* 014A4 8093A174 44816000 */ mtc1 $at, $f12 ## $f12 = 200.00 -/* 014A8 8093A178 46100480 */ add.s $f18, $f0, $f16 +/* 014A8 8093A178 46100480 */ add.s $f18, $f0, $f16 /* 014AC 8093A17C 0C00CFC8 */ jal Math_Rand_CenteredFloat - + /* 014B0 8093A180 E61204B4 */ swc1 $f18, 0x04B4($s0) ## 000004B4 -/* 014B4 8093A184 8FAC0024 */ lw $t4, 0x0024($sp) +/* 014B4 8093A184 8FAC0024 */ lw $t4, 0x0024($sp) /* 014B8 8093A188 3C014248 */ lui $at, 0x4248 ## $at = 42480000 /* 014BC 8093A18C 44816000 */ mtc1 $at, $f12 ## $f12 = 50.00 /* 014C0 8093A190 C584002C */ lwc1 $f4, 0x002C($t4) ## 0000002C -/* 014C4 8093A194 46040180 */ add.s $f6, $f0, $f4 +/* 014C4 8093A194 46040180 */ add.s $f6, $f0, $f4 /* 014C8 8093A198 0C00CFBE */ jal Math_Rand_ZeroFloat - + /* 014CC 8093A19C E60604B8 */ swc1 $f6, 0x04B8($s0) ## 000004B8 -/* 014D0 8093A1A0 4600020D */ trunc.w.s $f8, $f0 -/* 014D4 8093A1A4 44184000 */ mfc1 $t8, $f8 +/* 014D0 8093A1A0 4600020D */ trunc.w.s $f8, $f0 +/* 014D4 8093A1A4 44184000 */ mfc1 $t8, $f8 /* 014D8 8093A1A8 00000000 */ nop /* 014DC 8093A1AC 27190032 */ addiu $t9, $t8, 0x0032 ## $t9 = 00000032 -/* 014E0 8093A1B0 10000039 */ beq $zero, $zero, .L8093A298 +/* 014E0 8093A1B0 10000039 */ beq $zero, $zero, .L8093A298 /* 014E4 8093A1B4 A6190178 */ sh $t9, 0x0178($s0) ## 00000178 .L8093A1B8: /* 014E8 8093A1B8 0C03F66B */ jal Math_Rand_ZeroOne @@ -79,55 +79,55 @@ glabel func_8093A0A8 /* 014F0 8093A1C0 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 /* 014F4 8093A1C4 44815000 */ mtc1 $at, $f10 ## $f10 = 0.50 /* 014F8 8093A1C8 3C018095 */ lui $at, %hi(D_8094AEC8) ## $at = 80950000 -/* 014FC 8093A1CC 460A003C */ c.lt.s $f0, $f10 +/* 014FC 8093A1CC 460A003C */ c.lt.s $f0, $f10 /* 01500 8093A1D0 00000000 */ nop -/* 01504 8093A1D4 4500001A */ bc1f .L8093A240 +/* 01504 8093A1D4 4500001A */ bc1f .L8093A240 /* 01508 8093A1D8 00000000 */ nop /* 0150C 8093A1DC 3C014448 */ lui $at, 0x4448 ## $at = 44480000 /* 01510 8093A1E0 44816000 */ mtc1 $at, $f12 ## $f12 = 800.00 /* 01514 8093A1E4 0C00CFC8 */ jal Math_Rand_CenteredFloat - + /* 01518 8093A1E8 00000000 */ nop /* 0151C 8093A1EC 3C014348 */ lui $at, 0x4348 ## $at = 43480000 /* 01520 8093A1F0 44816000 */ mtc1 $at, $f12 ## $f12 = 200.00 /* 01524 8093A1F4 0C00CFBE */ jal Math_Rand_ZeroFloat - + /* 01528 8093A1F8 E60004B0 */ swc1 $f0, 0x04B0($s0) ## 000004B0 /* 0152C 8093A1FC 3C0143AA */ lui $at, 0x43AA ## $at = 43AA0000 /* 01530 8093A200 44818000 */ mtc1 $at, $f16 ## $f16 = 340.00 /* 01534 8093A204 3C014448 */ lui $at, 0x4448 ## $at = 44480000 /* 01538 8093A208 44816000 */ mtc1 $at, $f12 ## $f12 = 800.00 -/* 0153C 8093A20C 46100480 */ add.s $f18, $f0, $f16 +/* 0153C 8093A20C 46100480 */ add.s $f18, $f0, $f16 /* 01540 8093A210 0C00CFC8 */ jal Math_Rand_CenteredFloat - + /* 01544 8093A214 E61204B4 */ swc1 $f18, 0x04B4($s0) ## 000004B4 /* 01548 8093A218 3C014248 */ lui $at, 0x4248 ## $at = 42480000 /* 0154C 8093A21C 44816000 */ mtc1 $at, $f12 ## $f12 = 50.00 /* 01550 8093A220 0C00CFBE */ jal Math_Rand_ZeroFloat - + /* 01554 8093A224 E60004B8 */ swc1 $f0, 0x04B8($s0) ## 000004B8 -/* 01558 8093A228 4600010D */ trunc.w.s $f4, $f0 -/* 0155C 8093A22C 440B2000 */ mfc1 $t3, $f4 +/* 01558 8093A228 4600010D */ trunc.w.s $f4, $f0 +/* 0155C 8093A22C 440B2000 */ mfc1 $t3, $f4 /* 01560 8093A230 00000000 */ nop /* 01564 8093A234 256C0032 */ addiu $t4, $t3, 0x0032 ## $t4 = 00000032 -/* 01568 8093A238 10000017 */ beq $zero, $zero, .L8093A298 +/* 01568 8093A238 10000017 */ beq $zero, $zero, .L8093A298 /* 0156C 8093A23C A60C0178 */ sh $t4, 0x0178($s0) ## 00000178 .L8093A240: /* 01570 8093A240 0C00CFBE */ jal Math_Rand_ZeroFloat - -/* 01574 8093A244 C42CAEC8 */ lwc1 $f12, %lo(D_8094AEC8)($at) -/* 01578 8093A248 4600018D */ trunc.w.s $f6, $f0 + +/* 01574 8093A244 C42CAEC8 */ lwc1 $f12, %lo(D_8094AEC8)($at) +/* 01578 8093A248 4600018D */ trunc.w.s $f6, $f0 /* 0157C 8093A24C 3C088095 */ lui $t0, %hi(D_8094A8AC) ## $t0 = 80950000 /* 01580 8093A250 2508A8AC */ addiu $t0, $t0, %lo(D_8094A8AC) ## $t0 = 8094A8AC /* 01584 8093A254 240C00C8 */ addiu $t4, $zero, 0x00C8 ## $t4 = 000000C8 -/* 01588 8093A258 440E3000 */ mfc1 $t6, $f6 +/* 01588 8093A258 440E3000 */ mfc1 $t6, $f6 /* 0158C 8093A25C 240D0001 */ addiu $t5, $zero, 0x0001 ## $t5 = 00000001 -/* 01590 8093A260 000E7C00 */ sll $t7, $t6, 16 -/* 01594 8093A264 000FC403 */ sra $t8, $t7, 16 -/* 01598 8093A268 0018C880 */ sll $t9, $t8, 2 -/* 0159C 8093A26C 0338C823 */ subu $t9, $t9, $t8 -/* 015A0 8093A270 0019C880 */ sll $t9, $t9, 2 -/* 015A4 8093A274 03284821 */ addu $t1, $t9, $t0 +/* 01590 8093A260 000E7C00 */ sll $t7, $t6, 16 +/* 01594 8093A264 000FC403 */ sra $t8, $t7, 16 +/* 01598 8093A268 0018C880 */ sll $t9, $t8, 2 +/* 0159C 8093A26C 0338C823 */ subu $t9, $t9, $t8 +/* 015A0 8093A270 0019C880 */ sll $t9, $t9, 2 +/* 015A4 8093A274 03284821 */ addu $t1, $t9, $t0 /* 015A8 8093A278 8D2B0000 */ lw $t3, 0x0000($t1) ## 00000000 /* 015AC 8093A27C AE0B04B0 */ sw $t3, 0x04B0($s0) ## 000004B0 /* 015B0 8093A280 8D2A0004 */ lw $t2, 0x0004($t1) ## 00000004 @@ -137,10 +137,10 @@ glabel func_8093A0A8 /* 015C0 8093A290 A60D015E */ sh $t5, 0x015E($s0) ## 0000015E /* 015C4 8093A294 AE0B04B8 */ sw $t3, 0x04B8($s0) ## 000004B8 .L8093A298: -/* 015C8 8093A298 8FBF001C */ lw $ra, 0x001C($sp) -/* 015CC 8093A29C 8FB00018 */ lw $s0, 0x0018($sp) +/* 015C8 8093A298 8FBF001C */ lw $ra, 0x001C($sp) +/* 015CC 8093A29C 8FB00018 */ lw $s0, 0x0018($sp) /* 015D0 8093A2A0 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 015D4 8093A2A4 03E00008 */ jr $ra +/* 015D4 8093A2A4 03E00008 */ jr $ra /* 015D8 8093A2A8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093A2AC.s b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093A2AC.s index 6897026329..874ec1ee87 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093A2AC.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093A2AC.s @@ -27,7 +27,7 @@ glabel func_8093A2AC /* 01634 8093A304 C60404B8 */ lwc1 $f4, 0x04B8($s0) ## 000004B8 /* 01638 8093A308 E7AC003C */ swc1 $f12, 0x003C($sp) /* 0163C 8093A30C 46062381 */ sub.s $f14, $f4, $f6 -/* 01640 8093A310 0C03F494 */ jal func_800FD250 +/* 01640 8093A310 0C03F494 */ jal Math_atan2f /* 01644 8093A314 E7AE0034 */ swc1 $f14, 0x0034($sp) /* 01648 8093A318 3C018095 */ lui $at, %hi(D_8094AECC) ## $at = 80950000 /* 0164C 8093A31C C428AECC */ lwc1 $f8, %lo(D_8094AECC)($at) @@ -47,7 +47,7 @@ glabel func_8093A2AC /* 01684 8093A354 46000384 */ sqrt.s $f14, $f0 /* 01688 8093A358 468021A0 */ cvt.s.w $f6, $f4 /* 0168C 8093A35C E7AE0028 */ swc1 $f14, 0x0028($sp) -/* 01690 8093A360 0C03F494 */ jal func_800FD250 +/* 01690 8093A360 0C03F494 */ jal Math_atan2f /* 01694 8093A364 E7A6002C */ swc1 $f6, 0x002C($sp) /* 01698 8093A368 3C018095 */ lui $at, %hi(D_8094AED0) ## $at = 80950000 /* 0169C 8093A36C C432AED0 */ lwc1 $f18, %lo(D_8094AED0)($at) diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093A4DC.s b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093A4DC.s index 7777f36737..184e367e08 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093A4DC.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093A4DC.s @@ -1,34 +1,34 @@ glabel func_8093A4DC /* 0180C 8093A4DC 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 01810 8093A4E0 AFBF0014 */ sw $ra, 0x0014($sp) -/* 01814 8093A4E4 AFA50024 */ sw $a1, 0x0024($sp) +/* 01810 8093A4E0 AFBF0014 */ sw $ra, 0x0014($sp) +/* 01814 8093A4E4 AFA50024 */ sw $a1, 0x0024($sp) /* 01818 8093A4E8 8CAF1C44 */ lw $t7, 0x1C44($a1) ## 00001C44 /* 0181C 8093A4EC 3C188094 */ lui $t8, %hi(func_8093B1AC) ## $t8 = 80940000 /* 01820 8093A4F0 2718B1AC */ addiu $t8, $t8, %lo(func_8093B1AC) ## $t8 = 8093B1AC -/* 01824 8093A4F4 AFAF001C */ sw $t7, 0x001C($sp) +/* 01824 8093A4F4 AFAF001C */ sw $t7, 0x001C($sp) /* 01828 8093A4F8 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 /* 0182C 8093A4FC AC98014C */ sw $t8, 0x014C($a0) ## 0000014C /* 01830 8093A500 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 01834 8093A504 24A57688 */ addiu $a1, $a1, 0x7688 ## $a1 = 06007688 -/* 01838 8093A508 AFA70020 */ sw $a3, 0x0020($sp) +/* 01838 8093A508 AFA70020 */ sw $a3, 0x0020($sp) /* 0183C 8093A50C 24840568 */ addiu $a0, $a0, 0x0568 ## $a0 = 00000568 -/* 01840 8093A510 0C029490 */ jal func_800A5240 +/* 01840 8093A510 0C029490 */ jal SkelAnime_ChangeAnimTransitionStop /* 01844 8093A514 3C06C0A0 */ lui $a2, 0xC0A0 ## $a2 = C0A00000 /* 01848 8093A518 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 /* 0184C 8093A51C 0C028800 */ jal SkelAnime_GetFrameCount - + /* 01850 8093A520 24847688 */ addiu $a0, $a0, 0x7688 ## $a0 = 06007688 /* 01854 8093A524 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 -/* 01858 8093A528 8FA70020 */ lw $a3, 0x0020($sp) +/* 01858 8093A528 8FA70020 */ lw $a3, 0x0020($sp) /* 0185C 8093A52C 24190046 */ addiu $t9, $zero, 0x0046 ## $t9 = 00000046 -/* 01860 8093A530 468021A0 */ cvt.s.w $f6, $f4 +/* 01860 8093A530 468021A0 */ cvt.s.w $f6, $f4 /* 01864 8093A534 A4F9017A */ sh $t9, 0x017A($a3) ## 0000017A /* 01868 8093A538 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 /* 0186C 8093A53C 240BFFFF */ addiu $t3, $zero, 0xFFFF ## $t3 = FFFFFFFF /* 01870 8093A540 3C018095 */ lui $at, %hi(D_8094AED4) ## $at = 80950000 /* 01874 8093A544 8CED048C */ lw $t5, 0x048C($a3) ## 0000048C /* 01878 8093A548 E4E601A4 */ swc1 $f6, 0x01A4($a3) ## 000001A4 -/* 0187C 8093A54C 8FA8001C */ lw $t0, 0x001C($sp) +/* 0187C 8093A54C 8FA8001C */ lw $t0, 0x001C($sp) /* 01880 8093A550 8CEC0490 */ lw $t4, 0x0490($a3) ## 00000490 /* 01884 8093A554 8D0A0024 */ lw $t2, 0x0024($t0) ## 00000024 /* 01888 8093A558 ACEA04B0 */ sw $t2, 0x04B0($a3) ## 000004B0 @@ -40,7 +40,7 @@ glabel func_8093A4DC /* 018A0 8093A570 E4E0052C */ swc1 $f0, 0x052C($a3) ## 0000052C /* 018A4 8093A574 E4E00548 */ swc1 $f0, 0x0548($a3) ## 00000548 /* 018A8 8093A578 ACEA04B8 */ sw $t2, 0x04B8($a3) ## 000004B8 -/* 018AC 8093A57C C428AED4 */ lwc1 $f8, %lo(D_8094AED4)($at) +/* 018AC 8093A57C C428AED4 */ lwc1 $f8, %lo(D_8094AED4)($at) /* 018B0 8093A580 3C0144FA */ lui $at, 0x44FA ## $at = 44FA0000 /* 018B4 8093A584 ACED050C */ sw $t5, 0x050C($a3) ## 0000050C /* 018B8 8093A588 44815000 */ mtc1 $at, $f10 ## $f10 = 2000.00 @@ -54,9 +54,9 @@ glabel func_8093A4DC /* 018D8 8093A5A8 E4E804F8 */ swc1 $f8, 0x04F8($a3) ## 000004F8 /* 018DC 8093A5AC ACED0514 */ sw $t5, 0x0514($a3) ## 00000514 /* 018E0 8093A5B0 E4EA04E0 */ swc1 $f10, 0x04E0($a3) ## 000004E0 -/* 018E4 8093A5B4 8FBF0014 */ lw $ra, 0x0014($sp) +/* 018E4 8093A5B4 8FBF0014 */ lw $ra, 0x0014($sp) /* 018E8 8093A5B8 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 018EC 8093A5BC 03E00008 */ jr $ra +/* 018EC 8093A5BC 03E00008 */ jr $ra /* 018F0 8093A5C0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093B1AC.s b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093B1AC.s index 56a45afb99..11403916a7 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093B1AC.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093B1AC.s @@ -1,124 +1,124 @@ glabel func_8093B1AC /* 024DC 8093B1AC 27BDFEB0 */ addiu $sp, $sp, 0xFEB0 ## $sp = FFFFFEB0 -/* 024E0 8093B1B0 AFBF0064 */ sw $ra, 0x0064($sp) -/* 024E4 8093B1B4 AFB60060 */ sw $s6, 0x0060($sp) -/* 024E8 8093B1B8 AFB5005C */ sw $s5, 0x005C($sp) -/* 024EC 8093B1BC AFB40058 */ sw $s4, 0x0058($sp) -/* 024F0 8093B1C0 AFB30054 */ sw $s3, 0x0054($sp) -/* 024F4 8093B1C4 AFB20050 */ sw $s2, 0x0050($sp) -/* 024F8 8093B1C8 AFB1004C */ sw $s1, 0x004C($sp) -/* 024FC 8093B1CC AFB00048 */ sw $s0, 0x0048($sp) -/* 02500 8093B1D0 F7BA0040 */ sdc1 $f26, 0x0040($sp) -/* 02504 8093B1D4 F7B80038 */ sdc1 $f24, 0x0038($sp) -/* 02508 8093B1D8 F7B60030 */ sdc1 $f22, 0x0030($sp) -/* 0250C 8093B1DC F7B40028 */ sdc1 $f20, 0x0028($sp) +/* 024E0 8093B1B0 AFBF0064 */ sw $ra, 0x0064($sp) +/* 024E4 8093B1B4 AFB60060 */ sw $s6, 0x0060($sp) +/* 024E8 8093B1B8 AFB5005C */ sw $s5, 0x005C($sp) +/* 024EC 8093B1BC AFB40058 */ sw $s4, 0x0058($sp) +/* 024F0 8093B1C0 AFB30054 */ sw $s3, 0x0054($sp) +/* 024F4 8093B1C4 AFB20050 */ sw $s2, 0x0050($sp) +/* 024F8 8093B1C8 AFB1004C */ sw $s1, 0x004C($sp) +/* 024FC 8093B1CC AFB00048 */ sw $s0, 0x0048($sp) +/* 02500 8093B1D0 F7BA0040 */ sdc1 $f26, 0x0040($sp) +/* 02504 8093B1D4 F7B80038 */ sdc1 $f24, 0x0038($sp) +/* 02508 8093B1D8 F7B60030 */ sdc1 $f22, 0x0030($sp) +/* 0250C 8093B1DC F7B40028 */ sdc1 $f20, 0x0028($sp) /* 02510 8093B1E0 8CAE1C44 */ lw $t6, 0x1C44($a1) ## 00001C44 /* 02514 8093B1E4 0080A825 */ or $s5, $a0, $zero ## $s5 = 00000000 /* 02518 8093B1E8 00A0B025 */ or $s6, $a1, $zero ## $s6 = 00000000 -/* 0251C 8093B1EC AFAE0124 */ sw $t6, 0x0124($sp) +/* 0251C 8093B1EC AFAE0124 */ sw $t6, 0x0124($sp) /* 02520 8093B1F0 8C8F0118 */ lw $t7, 0x0118($a0) ## 00000118 /* 02524 8093B1F4 3C063D4C */ lui $a2, 0x3D4C ## $a2 = 3D4C0000 /* 02528 8093B1F8 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3D4CCCCD -/* 0252C 8093B1FC AFAF0120 */ sw $t7, 0x0120($sp) +/* 0252C 8093B1FC AFAF0120 */ sw $t7, 0x0120($sp) /* 02530 8093B200 8EA70068 */ lw $a3, 0x0068($s5) ## 00000068 /* 02534 8093B204 3C0543C8 */ lui $a1, 0x43C8 ## $a1 = 43C80000 /* 02538 8093B208 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 0253C 8093B20C 24840028 */ addiu $a0, $a0, 0x0028 ## $a0 = 00000028 /* 02540 8093B210 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 /* 02544 8093B214 4481A000 */ mtc1 $at, $f20 ## $f20 = 5.00 /* 02548 8093B218 26A40068 */ addiu $a0, $s5, 0x0068 ## $a0 = 00000068 /* 0254C 8093B21C 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 02550 8093B220 4405A000 */ mfc1 $a1, $f20 +/* 02550 8093B220 4405A000 */ mfc1 $a1, $f20 /* 02554 8093B224 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 02558 8093B228 3C073E80 */ lui $a3, 0x3E80 ## $a3 = 3E800000 /* 0255C 8093B22C 26A40568 */ addiu $a0, $s5, 0x0568 ## $a0 = 00000568 /* 02560 8093B230 0C02927F */ jal SkelAnime_FrameUpdateMatrix - -/* 02564 8093B234 AFA40074 */ sw $a0, 0x0074($sp) + +/* 02564 8093B234 AFA40074 */ sw $a0, 0x0074($sp) /* 02568 8093B238 3C018095 */ lui $at, %hi(D_8094AEF4) ## $at = 80950000 -/* 0256C 8093B23C C426AEF4 */ lwc1 $f6, %lo(D_8094AEF4)($at) +/* 0256C 8093B23C C426AEF4 */ lwc1 $f6, %lo(D_8094AEF4)($at) /* 02570 8093B240 C6A40520 */ lwc1 $f4, 0x0520($s5) ## 00000520 /* 02574 8093B244 86B8017A */ lh $t8, 0x017A($s5) ## 0000017A -/* 02578 8093B248 46062200 */ add.s $f8, $f4, $f6 -/* 0257C 8093B24C 13000108 */ beq $t8, $zero, .L8093B670 +/* 02578 8093B248 46062200 */ add.s $f8, $f4, $f6 +/* 0257C 8093B24C 13000108 */ beq $t8, $zero, .L8093B670 /* 02580 8093B250 E6A80520 */ swc1 $f8, 0x0520($s5) ## 00000520 /* 02584 8093B254 C6AA04C8 */ lwc1 $f10, 0x04C8($s5) ## 000004C8 /* 02588 8093B258 26A400B6 */ addiu $a0, $s5, 0x00B6 ## $a0 = 000000B6 /* 0258C 8093B25C 86A5008A */ lh $a1, 0x008A($s5) ## 0000008A -/* 02590 8093B260 4600548D */ trunc.w.s $f18, $f10 +/* 02590 8093B260 4600548D */ trunc.w.s $f18, $f10 /* 02594 8093B264 24060005 */ addiu $a2, $zero, 0x0005 ## $a2 = 00000005 -/* 02598 8093B268 44079000 */ mfc1 $a3, $f18 +/* 02598 8093B268 44079000 */ mfc1 $a3, $f18 /* 0259C 8093B26C 00000000 */ nop -/* 025A0 8093B270 00073C00 */ sll $a3, $a3, 16 +/* 025A0 8093B270 00073C00 */ sll $a3, $a3, 16 /* 025A4 8093B274 0C01E1EF */ jal Math_SmoothScaleMaxS - -/* 025A8 8093B278 00073C03 */ sra $a3, $a3, 16 -/* 025AC 8093B27C 8FA30124 */ lw $v1, 0x0124($sp) + +/* 025A8 8093B278 00073C03 */ sra $a3, $a3, 16 +/* 025AC 8093B27C 8FA30124 */ lw $v1, 0x0124($sp) /* 025B0 8093B280 26A404B0 */ addiu $a0, $s5, 0x04B0 ## $a0 = 000004B0 /* 025B4 8093B284 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 025B8 8093B288 8C68067C */ lw $t0, 0x067C($v1) ## 0000067C /* 025BC 8093B28C 3C0743C8 */ lui $a3, 0x43C8 ## $a3 = 43C80000 -/* 025C0 8093B290 00084A40 */ sll $t1, $t0, 9 -/* 025C4 8093B294 05210020 */ bgez $t1, .L8093B318 +/* 025C0 8093B290 00084A40 */ sll $t1, $t0, 9 +/* 025C4 8093B294 05210020 */ bgez $t1, .L8093B318 /* 025C8 8093B298 00000000 */ nop /* 025CC 8093B29C 846A00B6 */ lh $t2, 0x00B6($v1) ## 000000B6 /* 025D0 8093B2A0 86AB00B6 */ lh $t3, 0x00B6($s5) ## 000000B6 /* 025D4 8093B2A4 34018000 */ ori $at, $zero, 0x8000 ## $at = 00008000 -/* 025D8 8093B2A8 014B1023 */ subu $v0, $t2, $t3 -/* 025DC 8093B2AC 00411021 */ addu $v0, $v0, $at -/* 025E0 8093B2B0 00021400 */ sll $v0, $v0, 16 -/* 025E4 8093B2B4 00021403 */ sra $v0, $v0, 16 -/* 025E8 8093B2B8 28412000 */ slti $at, $v0, 0x2000 -/* 025EC 8093B2BC 10200016 */ beq $at, $zero, .L8093B318 -/* 025F0 8093B2C0 2841E001 */ slti $at, $v0, 0xE001 -/* 025F4 8093B2C4 14200014 */ bne $at, $zero, .L8093B318 +/* 025D8 8093B2A8 014B1023 */ subu $v0, $t2, $t3 +/* 025DC 8093B2AC 00411021 */ addu $v0, $v0, $at +/* 025E0 8093B2B0 00021400 */ sll $v0, $v0, 16 +/* 025E4 8093B2B4 00021403 */ sra $v0, $v0, 16 +/* 025E8 8093B2B8 28412000 */ slti $at, $v0, 0x2000 +/* 025EC 8093B2BC 10200016 */ beq $at, $zero, .L8093B318 +/* 025F0 8093B2C0 2841E001 */ slti $at, $v0, 0xE001 +/* 025F4 8093B2C4 14200014 */ bne $at, $zero, .L8093B318 /* 025F8 8093B2C8 00000000 */ nop /* 025FC 8093B2CC 26A404B0 */ addiu $a0, $s5, 0x04B0 ## $a0 = 000004B0 /* 02600 8093B2D0 8C6509BC */ lw $a1, 0x09BC($v1) ## 000009BC /* 02604 8093B2D4 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 02608 8093B2D8 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 0260C 8093B2DC 3C0743C8 */ lui $a3, 0x43C8 ## $a3 = 43C80000 -/* 02610 8093B2E0 8FAC0124 */ lw $t4, 0x0124($sp) +/* 02610 8093B2E0 8FAC0124 */ lw $t4, 0x0124($sp) /* 02614 8093B2E4 26A404B4 */ addiu $a0, $s5, 0x04B4 ## $a0 = 000004B4 /* 02618 8093B2E8 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 0261C 8093B2EC 3C0743C8 */ lui $a3, 0x43C8 ## $a3 = 43C80000 /* 02620 8093B2F0 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 02624 8093B2F4 8D8509C0 */ lw $a1, 0x09C0($t4) ## 000009C0 -/* 02628 8093B2F8 8FAD0124 */ lw $t5, 0x0124($sp) +/* 02628 8093B2F8 8FAD0124 */ lw $t5, 0x0124($sp) /* 0262C 8093B2FC 26A404B8 */ addiu $a0, $s5, 0x04B8 ## $a0 = 000004B8 /* 02630 8093B300 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 02634 8093B304 3C0743C8 */ lui $a3, 0x43C8 ## $a3 = 43C80000 /* 02638 8093B308 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 0263C 8093B30C 8DA509C4 */ lw $a1, 0x09C4($t5) ## 000009C4 -/* 02640 8093B310 10000015 */ beq $zero, $zero, .L8093B368 +/* 02640 8093B310 10000015 */ beq $zero, $zero, .L8093B368 /* 02644 8093B314 4480B000 */ mtc1 $zero, $f22 ## $f22 = 0.00 .L8093B318: /* 02648 8093B318 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 0264C 8093B31C 8C650024 */ lw $a1, 0x0024($v1) ## 00000024 -/* 02650 8093B320 8FAE0124 */ lw $t6, 0x0124($sp) +/* 02650 8093B320 8FAE0124 */ lw $t6, 0x0124($sp) /* 02654 8093B324 3C0141F0 */ lui $at, 0x41F0 ## $at = 41F00000 /* 02658 8093B328 44813000 */ mtc1 $at, $f6 ## $f6 = 30.00 /* 0265C 8093B32C C5C40028 */ lwc1 $f4, 0x0028($t6) ## 00000028 /* 02660 8093B330 26A404B4 */ addiu $a0, $s5, 0x04B4 ## $a0 = 000004B4 /* 02664 8093B334 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 02668 8093B338 46062200 */ add.s $f8, $f4, $f6 +/* 02668 8093B338 46062200 */ add.s $f8, $f4, $f6 /* 0266C 8093B33C 3C0743C8 */ lui $a3, 0x43C8 ## $a3 = 43C80000 -/* 02670 8093B340 44054000 */ mfc1 $a1, $f8 +/* 02670 8093B340 44054000 */ mfc1 $a1, $f8 /* 02674 8093B344 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 02678 8093B348 00000000 */ nop -/* 0267C 8093B34C 8FAF0124 */ lw $t7, 0x0124($sp) +/* 0267C 8093B34C 8FAF0124 */ lw $t7, 0x0124($sp) /* 02680 8093B350 26A404B8 */ addiu $a0, $s5, 0x04B8 ## $a0 = 000004B8 /* 02684 8093B354 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 02688 8093B358 3C0743C8 */ lui $a3, 0x43C8 ## $a3 = 43C80000 /* 0268C 8093B35C 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 02690 8093B360 8DE5002C */ lw $a1, 0x002C($t7) ## 0000002C /* 02694 8093B364 4480B000 */ mtc1 $zero, $f22 ## $f22 = 0.00 .L8093B368: @@ -132,311 +132,311 @@ glabel func_8093B1AC /* 026B4 8093B384 E6B60508 */ swc1 $f22, 0x0508($s5) ## 00000508 /* 026B8 8093B388 E6B60504 */ swc1 $f22, 0x0504($s5) ## 00000504 /* 026BC 8093B38C E6B60500 */ swc1 $f22, 0x0500($s5) ## 00000500 -/* 026C0 8093B390 C432AEF8 */ lwc1 $f18, %lo(D_8094AEF8)($at) +/* 026C0 8093B390 C432AEF8 */ lwc1 $f18, %lo(D_8094AEF8)($at) /* 026C4 8093B394 C6AA04F0 */ lwc1 $f10, 0x04F0($s5) ## 000004F0 /* 026C8 8093B398 C6A604EC */ lwc1 $f6, 0x04EC($s5) ## 000004EC /* 026CC 8093B39C 26A404D8 */ addiu $a0, $s5, 0x04D8 ## $a0 = 000004D8 -/* 026D0 8093B3A0 46125102 */ mul.s $f4, $f10, $f18 -/* 026D4 8093B3A4 4407A000 */ mfc1 $a3, $f20 -/* 026D8 8093B3A8 4405D000 */ mfc1 $a1, $f26 +/* 026D0 8093B3A0 46125102 */ mul.s $f4, $f10, $f18 +/* 026D4 8093B3A4 4407A000 */ mfc1 $a3, $f20 +/* 026D8 8093B3A8 4405D000 */ mfc1 $a1, $f26 /* 026DC 8093B3AC 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 026E0 8093B3B0 46043200 */ add.s $f8, $f6, $f4 +/* 026E0 8093B3B0 46043200 */ add.s $f8, $f6, $f4 /* 026E4 8093B3B4 E6A804EC */ swc1 $f8, 0x04EC($s5) ## 000004EC /* 026E8 8093B3B8 0C01E107 */ jal Math_SmoothScaleMaxF - -/* 026EC 8093B3BC AFA4006C */ sw $a0, 0x006C($sp) + +/* 026EC 8093B3BC AFA4006C */ sw $a0, 0x006C($sp) /* 026F0 8093B3C0 26A404F0 */ addiu $a0, $s5, 0x04F0 ## $a0 = 000004F0 /* 026F4 8093B3C4 3C054248 */ lui $a1, 0x4248 ## $a1 = 42480000 /* 026F8 8093B3C8 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 026FC 8093B3CC 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 02700 8093B3D0 3C074000 */ lui $a3, 0x4000 ## $a3 = 40000000 /* 02704 8093B3D4 86A2017A */ lh $v0, 0x017A($s5) ## 0000017A -/* 02708 8093B3D8 28410032 */ slti $at, $v0, 0x0032 -/* 0270C 8093B3DC 10200083 */ beq $at, $zero, .L8093B5EC -/* 02710 8093B3E0 2841000A */ slti $at, $v0, 0x000A -/* 02714 8093B3E4 1020004F */ beq $at, $zero, .L8093B524 +/* 02708 8093B3D8 28410032 */ slti $at, $v0, 0x0032 +/* 0270C 8093B3DC 10200083 */ beq $at, $zero, .L8093B5EC +/* 02710 8093B3E0 2841000A */ slti $at, $v0, 0x000A +/* 02714 8093B3E4 1020004F */ beq $at, $zero, .L8093B524 /* 02718 8093B3E8 24010009 */ addiu $at, $zero, 0x0009 ## $at = 00000009 -/* 0271C 8093B3EC 1441000F */ bne $v0, $at, .L8093B42C +/* 0271C 8093B3EC 1441000F */ bne $v0, $at, .L8093B42C /* 02720 8093B3F0 24080003 */ addiu $t0, $zero, 0x0003 ## $t0 = 00000003 /* 02724 8093B3F4 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 /* 02728 8093B3F8 44815000 */ mtc1 $at, $f10 ## $f10 = 0.50 /* 0272C 8093B3FC 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 02730 8093B400 00360821 */ addu $at, $at, $s6 +/* 02730 8093B400 00360821 */ addu $at, $at, $s6 /* 02734 8093B404 E42A0AFC */ swc1 $f10, 0x0AFC($at) ## 00010AFC /* 02738 8093B408 86B9001C */ lh $t9, 0x001C($s5) ## 0000001C /* 0273C 8093B40C 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 02740 8093B410 00360821 */ addu $at, $at, $s6 -/* 02744 8093B414 01194823 */ subu $t1, $t0, $t9 +/* 02740 8093B410 00360821 */ addu $at, $at, $s6 +/* 02744 8093B414 01194823 */ subu $t1, $t0, $t9 /* 02748 8093B418 A0290AE1 */ sb $t1, 0x0AE1($at) ## 00010AE1 /* 0274C 8093B41C 02A02025 */ or $a0, $s5, $zero ## $a0 = 00000000 /* 02750 8093B420 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 02754 8093B424 24053913 */ addiu $a1, $zero, 0x3913 ## $a1 = 00003913 /* 02758 8093B428 86A2017A */ lh $v0, 0x017A($s5) ## 0000017A .L8093B42C: /* 0275C 8093B42C 24010005 */ addiu $at, $zero, 0x0005 ## $at = 00000005 -/* 02760 8093B430 14410005 */ bne $v0, $at, .L8093B448 +/* 02760 8093B430 14410005 */ bne $v0, $at, .L8093B448 /* 02764 8093B434 27B400F4 */ addiu $s4, $sp, 0x00F4 ## $s4 = FFFFFFA4 /* 02768 8093B438 3C01437F */ lui $at, 0x437F ## $at = 437F0000 /* 0276C 8093B43C 44819000 */ mtc1 $at, $f18 ## $f18 = 255.00 /* 02770 8093B440 86A2017A */ lh $v0, 0x017A($s5) ## 0000017A /* 02774 8093B444 E6B204D0 */ swc1 $f18, 0x04D0($s5) ## 000004D0 .L8093B448: -/* 02778 8093B448 28410005 */ slti $at, $v0, 0x0005 -/* 0277C 8093B44C 14200035 */ bne $at, $zero, .L8093B524 +/* 02778 8093B448 28410005 */ slti $at, $v0, 0x0005 +/* 0277C 8093B44C 14200035 */ bne $at, $zero, .L8093B524 /* 02780 8093B450 27B30100 */ addiu $s3, $sp, 0x0100 ## $s3 = FFFFFFB0 /* 02784 8093B454 3C0141C8 */ lui $at, 0x41C8 ## $at = 41C80000 /* 02788 8093B458 4481C000 */ mtc1 $at, $f24 ## $f24 = 25.00 -/* 0278C 8093B45C A7A0011A */ sh $zero, 0x011A($sp) +/* 0278C 8093B45C A7A0011A */ sh $zero, 0x011A($sp) /* 02790 8093B460 27B2010C */ addiu $s2, $sp, 0x010C ## $s2 = FFFFFFBC /* 02794 8093B464 2411000C */ addiu $s1, $zero, 0x000C ## $s1 = 0000000C .L8093B468: /* 02798 8093B468 00008025 */ or $s0, $zero, $zero ## $s0 = 00000000 .L8093B46C: -/* 0279C 8093B46C 02110019 */ multu $s0, $s1 -/* 027A0 8093B470 4600A306 */ mov.s $f12, $f20 -/* 027A4 8093B474 00005012 */ mflo $t2 -/* 027A8 8093B478 02AA1021 */ addu $v0, $s5, $t2 +/* 0279C 8093B46C 02110019 */ multu $s0, $s1 +/* 027A0 8093B470 4600A306 */ mov.s $f12, $f20 +/* 027A4 8093B474 00005012 */ mflo $t2 +/* 027A8 8093B478 02AA1021 */ addu $v0, $s5, $t2 /* 027AC 8093B47C C4460450 */ lwc1 $f6, 0x0450($v0) ## 00000450 -/* 027B0 8093B480 E7A6010C */ swc1 $f6, 0x010C($sp) +/* 027B0 8093B480 E7A6010C */ swc1 $f6, 0x010C($sp) /* 027B4 8093B484 C4440454 */ lwc1 $f4, 0x0454($v0) ## 00000454 -/* 027B8 8093B488 E7A40110 */ swc1 $f4, 0x0110($sp) +/* 027B8 8093B488 E7A40110 */ swc1 $f4, 0x0110($sp) /* 027BC 8093B48C C4480458 */ lwc1 $f8, 0x0458($v0) ## 00000458 /* 027C0 8093B490 0C00CFC8 */ jal Math_Rand_CenteredFloat - -/* 027C4 8093B494 E7A80114 */ swc1 $f8, 0x0114($sp) -/* 027C8 8093B498 E7A00100 */ swc1 $f0, 0x0100($sp) + +/* 027C4 8093B494 E7A80114 */ swc1 $f8, 0x0114($sp) +/* 027C8 8093B498 E7A00100 */ swc1 $f0, 0x0100($sp) /* 027CC 8093B49C 0C00CFC8 */ jal Math_Rand_CenteredFloat - -/* 027D0 8093B4A0 4600A306 */ mov.s $f12, $f20 -/* 027D4 8093B4A4 E7A00104 */ swc1 $f0, 0x0104($sp) + +/* 027D0 8093B4A0 4600A306 */ mov.s $f12, $f20 +/* 027D4 8093B4A4 E7A00104 */ swc1 $f0, 0x0104($sp) /* 027D8 8093B4A8 0C00CFC8 */ jal Math_Rand_CenteredFloat - -/* 027DC 8093B4AC 4600A306 */ mov.s $f12, $f20 -/* 027E0 8093B4B0 E7A00108 */ swc1 $f0, 0x0108($sp) -/* 027E4 8093B4B4 E7B600F4 */ swc1 $f22, 0x00F4($sp) -/* 027E8 8093B4B8 E7B600F8 */ swc1 $f22, 0x00F8($sp) -/* 027EC 8093B4BC E7B600FC */ swc1 $f22, 0x00FC($sp) + +/* 027DC 8093B4AC 4600A306 */ mov.s $f12, $f20 +/* 027E0 8093B4B0 E7A00108 */ swc1 $f0, 0x0108($sp) +/* 027E4 8093B4B4 E7B600F4 */ swc1 $f22, 0x00F4($sp) +/* 027E8 8093B4B8 E7B600F8 */ swc1 $f22, 0x00F8($sp) +/* 027EC 8093B4BC E7B600FC */ swc1 $f22, 0x00FC($sp) /* 027F0 8093B4C0 0C00CFBE */ jal Math_Rand_ZeroFloat - -/* 027F4 8093B4C4 4600A306 */ mov.s $f12, $f20 -/* 027F8 8093B4C8 46180280 */ add.s $f10, $f0, $f24 + +/* 027F4 8093B4C4 4600A306 */ mov.s $f12, $f20 +/* 027F8 8093B4C8 46180280 */ add.s $f10, $f0, $f24 /* 027FC 8093B4CC 02C02025 */ or $a0, $s6, $zero ## $a0 = 00000000 /* 02800 8093B4D0 02402825 */ or $a1, $s2, $zero ## $a1 = FFFFFFBC /* 02804 8093B4D4 02603025 */ or $a2, $s3, $zero ## $a2 = FFFFFFB0 -/* 02808 8093B4D8 E7AA0010 */ swc1 $f10, 0x0010($sp) +/* 02808 8093B4D8 E7AA0010 */ swc1 $f10, 0x0010($sp) /* 0280C 8093B4DC 86AB001C */ lh $t3, 0x001C($s5) ## 0000001C /* 02810 8093B4E0 02803825 */ or $a3, $s4, $zero ## $a3 = FFFFFFA4 -/* 02814 8093B4E4 0C24E41C */ jal func_80939070 -/* 02818 8093B4E8 AFAB0014 */ sw $t3, 0x0014($sp) +/* 02814 8093B4E4 0C24E41C */ jal func_80939070 +/* 02818 8093B4E8 AFAB0014 */ sw $t3, 0x0014($sp) /* 0281C 8093B4EC 26100001 */ addiu $s0, $s0, 0x0001 ## $s0 = 00000001 -/* 02820 8093B4F0 00108400 */ sll $s0, $s0, 16 -/* 02824 8093B4F4 00108403 */ sra $s0, $s0, 16 -/* 02828 8093B4F8 2A010005 */ slti $at, $s0, 0x0005 -/* 0282C 8093B4FC 1420FFDB */ bne $at, $zero, .L8093B46C +/* 02820 8093B4F0 00108400 */ sll $s0, $s0, 16 +/* 02824 8093B4F4 00108403 */ sra $s0, $s0, 16 +/* 02828 8093B4F8 2A010005 */ slti $at, $s0, 0x0005 +/* 0282C 8093B4FC 1420FFDB */ bne $at, $zero, .L8093B46C /* 02830 8093B500 00000000 */ nop -/* 02834 8093B504 87AC011A */ lh $t4, 0x011A($sp) +/* 02834 8093B504 87AC011A */ lh $t4, 0x011A($sp) /* 02838 8093B508 258D0001 */ addiu $t5, $t4, 0x0001 ## $t5 = 00000001 -/* 0283C 8093B50C 000D7400 */ sll $t6, $t5, 16 -/* 02840 8093B510 000E7C03 */ sra $t7, $t6, 16 -/* 02844 8093B514 29E10002 */ slti $at, $t7, 0x0002 -/* 02848 8093B518 1420FFD3 */ bne $at, $zero, .L8093B468 -/* 0284C 8093B51C A7AD011A */ sh $t5, 0x011A($sp) +/* 0283C 8093B50C 000D7400 */ sll $t6, $t5, 16 +/* 02840 8093B510 000E7C03 */ sra $t7, $t6, 16 +/* 02844 8093B514 29E10002 */ slti $at, $t7, 0x0002 +/* 02848 8093B518 1420FFD3 */ bne $at, $zero, .L8093B468 +/* 0284C 8093B51C A7AD011A */ sh $t5, 0x011A($sp) /* 02850 8093B520 86A2017A */ lh $v0, 0x017A($s5) ## 0000017A .L8093B524: -/* 02854 8093B524 28410014 */ slti $at, $v0, 0x0014 -/* 02858 8093B528 1020000F */ beq $at, $zero, .L8093B568 +/* 02854 8093B524 28410014 */ slti $at, $v0, 0x0014 +/* 02858 8093B528 1020000F */ beq $at, $zero, .L8093B568 /* 0285C 8093B52C 26A404D4 */ addiu $a0, $s5, 0x04D4 ## $a0 = 000004D4 /* 02860 8093B530 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 /* 02864 8093B534 4481D000 */ mtc1 $at, $f26 ## $f26 = 20.00 /* 02868 8093B538 26A404D4 */ addiu $a0, $s5, 0x04D4 ## $a0 = 000004D4 /* 0286C 8093B53C 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 -/* 02870 8093B540 4407D000 */ mfc1 $a3, $f26 +/* 02870 8093B540 4407D000 */ mfc1 $a3, $f26 /* 02874 8093B544 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 02878 8093B548 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 0287C 8093B54C 8FA4006C */ lw $a0, 0x006C($sp) +/* 0287C 8093B54C 8FA4006C */ lw $a0, 0x006C($sp) /* 02880 8093B550 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 /* 02884 8093B554 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 02888 8093B558 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 0288C 8093B55C 3C0741F0 */ lui $a3, 0x41F0 ## $a3 = 41F00000 -/* 02890 8093B560 10000010 */ beq $zero, $zero, .L8093B5A4 +/* 02890 8093B560 10000010 */ beq $zero, $zero, .L8093B5A4 /* 02894 8093B564 00000000 */ nop .L8093B568: -/* 02898 8093B568 4405D000 */ mfc1 $a1, $f26 -/* 0289C 8093B56C 4407A000 */ mfc1 $a3, $f20 +/* 02898 8093B568 4405D000 */ mfc1 $a1, $f26 +/* 0289C 8093B56C 4407A000 */ mfc1 $a3, $f20 /* 028A0 8093B570 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 028A4 8093B574 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 028A8 8093B578 86B8001C */ lh $t8, 0x001C($s5) ## 0000001C /* 028AC 8093B57C 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 /* 028B0 8093B580 2405310E */ addiu $a1, $zero, 0x310E ## $a1 = 0000310E -/* 028B4 8093B584 17010005 */ bne $t8, $at, .L8093B59C +/* 028B4 8093B584 17010005 */ bne $t8, $at, .L8093B59C /* 028B8 8093B588 02A02025 */ or $a0, $s5, $zero ## $a0 = 00000000 /* 028BC 8093B58C 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 028C0 8093B590 02A02025 */ or $a0, $s5, $zero ## $a0 = 00000000 -/* 028C4 8093B594 10000003 */ beq $zero, $zero, .L8093B5A4 +/* 028C4 8093B594 10000003 */ beq $zero, $zero, .L8093B5A4 /* 028C8 8093B598 00000000 */ nop .L8093B59C: /* 028CC 8093B59C 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 028D0 8093B5A0 24053112 */ addiu $a1, $zero, 0x3112 ## $a1 = 00003112 .L8093B5A4: /* 028D4 8093B5A4 3C018095 */ lui $at, %hi(D_8094AEFC) ## $at = 80950000 -/* 028D8 8093B5A8 C426AEFC */ lwc1 $f6, %lo(D_8094AEFC)($at) +/* 028D8 8093B5A8 C426AEFC */ lwc1 $f6, %lo(D_8094AEFC)($at) /* 028DC 8093B5AC C6A004E4 */ lwc1 $f0, 0x04E4($s5) ## 000004E4 /* 028E0 8093B5B0 C6B204E8 */ lwc1 $f18, 0x04E8($s5) ## 000004E8 -/* 028E4 8093B5B4 4405B000 */ mfc1 $a1, $f22 -/* 028E8 8093B5B8 46060102 */ mul.s $f4, $f0, $f6 +/* 028E4 8093B5B4 4405B000 */ mfc1 $a1, $f22 +/* 028E8 8093B5B8 46060102 */ mul.s $f4, $f0, $f6 /* 028EC 8093B5BC 3C063DCC */ lui $a2, 0x3DCC ## $a2 = 3DCC0000 -/* 028F0 8093B5C0 44070000 */ mfc1 $a3, $f0 +/* 028F0 8093B5C0 44070000 */ mfc1 $a3, $f0 /* 028F4 8093B5C4 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3DCCCCCD /* 028F8 8093B5C8 26A404E0 */ addiu $a0, $s5, 0x04E0 ## $a0 = 000004E0 -/* 028FC 8093B5CC 46049200 */ add.s $f8, $f18, $f4 +/* 028FC 8093B5CC 46049200 */ add.s $f8, $f18, $f4 /* 02900 8093B5D0 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 02904 8093B5D4 E6A804E8 */ swc1 $f8, 0x04E8($s5) ## 000004E8 /* 02908 8093B5D8 26A404E4 */ addiu $a0, $s5, 0x04E4 ## $a0 = 000004E4 /* 0290C 8093B5DC 3C054248 */ lui $a1, 0x4248 ## $a1 = 42480000 /* 02910 8093B5E0 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 02914 8093B5E4 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 02918 8093B5E8 3C074000 */ lui $a3, 0x4000 ## $a3 = 40000000 .L8093B5EC: -/* 0291C 8093B5EC 8FA40074 */ lw $a0, 0x0074($sp) -/* 02920 8093B5F0 0C0295B2 */ jal func_800A56C8 +/* 0291C 8093B5EC 8FA40074 */ lw $a0, 0x0074($sp) +/* 02920 8093B5F0 0C0295B2 */ jal func_800A56C8 /* 02924 8093B5F4 8EA501A4 */ lw $a1, 0x01A4($s5) ## 000001A4 -/* 02928 8093B5F8 10400008 */ beq $v0, $zero, .L8093B61C -/* 0292C 8093B5FC 8FA40074 */ lw $a0, 0x0074($sp) +/* 02928 8093B5F8 10400008 */ beq $v0, $zero, .L8093B61C +/* 0292C 8093B5FC 8FA40074 */ lw $a0, 0x0074($sp) /* 02930 8093B600 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 -/* 02934 8093B604 4406B000 */ mfc1 $a2, $f22 -/* 02938 8093B608 0C0294D3 */ jal func_800A534C +/* 02934 8093B604 4406B000 */ mfc1 $a2, $f22 +/* 02938 8093B608 0C0294D3 */ jal SkelAnime_ChangeAnimTransitionRepeat /* 0293C 8093B60C 24A59398 */ addiu $a1, $a1, 0x9398 ## $a1 = 06009398 /* 02940 8093B610 3C018095 */ lui $at, %hi(D_8094AF00) ## $at = 80950000 -/* 02944 8093B614 C42AAF00 */ lwc1 $f10, %lo(D_8094AF00)($at) +/* 02944 8093B614 C42AAF00 */ lwc1 $f10, %lo(D_8094AF00)($at) /* 02948 8093B618 E6AA01A4 */ swc1 $f10, 0x01A4($s5) ## 000001A4 .L8093B61C: /* 0294C 8093B61C 86A8017A */ lh $t0, 0x017A($s5) ## 0000017A /* 02950 8093B620 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 /* 02954 8093B624 3C100600 */ lui $s0, 0x0600 ## $s0 = 06000000 -/* 02958 8093B628 1501000F */ bne $t0, $at, .L8093B668 +/* 02958 8093B628 1501000F */ bne $t0, $at, .L8093B668 /* 0295C 8093B62C 26103614 */ addiu $s0, $s0, 0x3614 ## $s0 = 06003614 -/* 02960 8093B630 4406B000 */ mfc1 $a2, $f22 -/* 02964 8093B634 8FA40074 */ lw $a0, 0x0074($sp) -/* 02968 8093B638 0C029490 */ jal func_800A5240 +/* 02960 8093B630 4406B000 */ mfc1 $a2, $f22 +/* 02964 8093B634 8FA40074 */ lw $a0, 0x0074($sp) +/* 02968 8093B638 0C029490 */ jal SkelAnime_ChangeAnimTransitionStop /* 0296C 8093B63C 02002825 */ or $a1, $s0, $zero ## $a1 = 06003614 /* 02970 8093B640 0C028800 */ jal SkelAnime_GetFrameCount - + /* 02974 8093B644 02002025 */ or $a0, $s0, $zero ## $a0 = 06003614 /* 02978 8093B648 44823000 */ mtc1 $v0, $f6 ## $f6 = 0.00 /* 0297C 8093B64C E6B604DC */ swc1 $f22, 0x04DC($s5) ## 000004DC /* 02980 8093B650 E6B604D8 */ swc1 $f22, 0x04D8($s5) ## 000004D8 -/* 02984 8093B654 468034A0 */ cvt.s.w $f18, $f6 +/* 02984 8093B654 468034A0 */ cvt.s.w $f18, $f6 /* 02988 8093B658 E6B604D4 */ swc1 $f22, 0x04D4($s5) ## 000004D4 /* 0298C 8093B65C 3C018095 */ lui $at, %hi(D_8094C86E) ## $at = 80950000 /* 02990 8093B660 E6B201A4 */ swc1 $f18, 0x01A4($s5) ## 000001A4 -/* 02994 8093B664 A020C86E */ sb $zero, %lo(D_8094C86E)($at) +/* 02994 8093B664 A020C86E */ sb $zero, %lo(D_8094C86E)($at) .L8093B668: -/* 02998 8093B668 1000016E */ beq $zero, $zero, .L8093BC24 +/* 02998 8093B668 1000016E */ beq $zero, $zero, .L8093BC24 /* 0299C 8093B66C 26B3050C */ addiu $s3, $s5, 0x050C ## $s3 = 0000050C .L8093B670: -/* 029A0 8093B670 8FA40074 */ lw $a0, 0x0074($sp) -/* 029A4 8093B674 0C0295B2 */ jal func_800A56C8 +/* 029A0 8093B670 8FA40074 */ lw $a0, 0x0074($sp) +/* 029A4 8093B674 0C0295B2 */ jal func_800A56C8 /* 029A8 8093B678 8EA501A4 */ lw $a1, 0x01A4($s5) ## 000001A4 -/* 029AC 8093B67C 5040000B */ beql $v0, $zero, .L8093B6AC +/* 029AC 8093B67C 5040000B */ beql $v0, $zero, .L8093B6AC /* 029B0 8093B680 C6A801A4 */ lwc1 $f8, 0x01A4($s5) ## 000001A4 /* 029B4 8093B684 4480B000 */ mtc1 $zero, $f22 ## $f22 = 0.00 /* 029B8 8093B688 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 029BC 8093B68C 24A53E34 */ addiu $a1, $a1, 0x3E34 ## $a1 = 06003E34 -/* 029C0 8093B690 4406B000 */ mfc1 $a2, $f22 -/* 029C4 8093B694 0C0294D3 */ jal func_800A534C -/* 029C8 8093B698 8FA40074 */ lw $a0, 0x0074($sp) +/* 029C0 8093B690 4406B000 */ mfc1 $a2, $f22 +/* 029C4 8093B694 0C0294D3 */ jal SkelAnime_ChangeAnimTransitionRepeat +/* 029C8 8093B698 8FA40074 */ lw $a0, 0x0074($sp) /* 029CC 8093B69C 3C018095 */ lui $at, %hi(D_8094AF04) ## $at = 80950000 -/* 029D0 8093B6A0 C424AF04 */ lwc1 $f4, %lo(D_8094AF04)($at) +/* 029D0 8093B6A0 C424AF04 */ lwc1 $f4, %lo(D_8094AF04)($at) /* 029D4 8093B6A4 E6A401A4 */ swc1 $f4, 0x01A4($s5) ## 000001A4 /* 029D8 8093B6A8 C6A801A4 */ lwc1 $f8, 0x01A4($s5) ## 000001A4 .L8093B6AC: /* 029DC 8093B6AC 4480B000 */ mtc1 $zero, $f22 ## $f22 = 0.00 -/* 029E0 8093B6B0 8FA40074 */ lw $a0, 0x0074($sp) -/* 029E4 8093B6B4 46144281 */ sub.s $f10, $f8, $f20 -/* 029E8 8093B6B8 44055000 */ mfc1 $a1, $f10 -/* 029EC 8093B6BC 0C0295B2 */ jal func_800A56C8 +/* 029E0 8093B6B0 8FA40074 */ lw $a0, 0x0074($sp) +/* 029E4 8093B6B4 46144281 */ sub.s $f10, $f8, $f20 +/* 029E8 8093B6B8 44055000 */ mfc1 $a1, $f10 +/* 029EC 8093B6BC 0C0295B2 */ jal func_800A56C8 /* 029F0 8093B6C0 00000000 */ nop -/* 029F4 8093B6C4 50400007 */ beql $v0, $zero, .L8093B6E4 +/* 029F4 8093B6C4 50400007 */ beql $v0, $zero, .L8093B6E4 /* 029F8 8093B6C8 3C014150 */ lui $at, 0x4150 ## $at = 41500000 /* 029FC 8093B6CC 86B9001C */ lh $t9, 0x001C($s5) ## 0000001C /* 02A00 8093B6D0 A6A004FC */ sh $zero, 0x04FC($s5) ## 000004FC /* 02A04 8093B6D4 3C018095 */ lui $at, %hi(D_8094C840) ## $at = 80950000 /* 02A08 8093B6D8 27290001 */ addiu $t1, $t9, 0x0001 ## $t1 = 00000001 -/* 02A0C 8093B6DC A029C840 */ sb $t1, %lo(D_8094C840)($at) +/* 02A0C 8093B6DC A029C840 */ sb $t1, %lo(D_8094C840)($at) /* 02A10 8093B6E0 3C014150 */ lui $at, 0x4150 ## $at = 41500000 .L8093B6E4: /* 02A14 8093B6E4 44819000 */ mtc1 $at, $f18 ## $f18 = 13.00 /* 02A18 8093B6E8 C6A601A4 */ lwc1 $f6, 0x01A4($s5) ## 000001A4 -/* 02A1C 8093B6EC 8FA40074 */ lw $a0, 0x0074($sp) -/* 02A20 8093B6F0 46123101 */ sub.s $f4, $f6, $f18 -/* 02A24 8093B6F4 44052000 */ mfc1 $a1, $f4 -/* 02A28 8093B6F8 0C0295B2 */ jal func_800A56C8 +/* 02A1C 8093B6EC 8FA40074 */ lw $a0, 0x0074($sp) +/* 02A20 8093B6F0 46123101 */ sub.s $f4, $f6, $f18 +/* 02A24 8093B6F4 44052000 */ mfc1 $a1, $f4 +/* 02A28 8093B6F8 0C0295B2 */ jal func_800A56C8 /* 02A2C 8093B6FC 00000000 */ nop -/* 02A30 8093B700 10400006 */ beq $v0, $zero, .L8093B71C +/* 02A30 8093B700 10400006 */ beq $v0, $zero, .L8093B71C /* 02A34 8093B704 02A02025 */ or $a0, $s5, $zero ## $a0 = 00000000 /* 02A38 8093B708 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 02A3C 8093B70C 24053923 */ addiu $a1, $zero, 0x3923 ## $a1 = 00003923 /* 02A40 8093B710 02A02025 */ or $a0, $s5, $zero ## $a0 = 00000000 /* 02A44 8093B714 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 02A48 8093B718 240539B3 */ addiu $a1, $zero, 0x39B3 ## $a1 = 000039B3 .L8093B71C: /* 02A4C 8093B71C C6A804B0 */ lwc1 $f8, 0x04B0($s5) ## 000004B0 /* 02A50 8093B720 C6AA048C */ lwc1 $f10, 0x048C($s5) ## 0000048C /* 02A54 8093B724 C6A404B8 */ lwc1 $f4, 0x04B8($s5) ## 000004B8 /* 02A58 8093B728 C6A604B4 */ lwc1 $f6, 0x04B4($s5) ## 000004B4 -/* 02A5C 8093B72C 460A4501 */ sub.s $f20, $f8, $f10 +/* 02A5C 8093B72C 460A4501 */ sub.s $f20, $f8, $f10 /* 02A60 8093B730 C6A80494 */ lwc1 $f8, 0x0494($s5) ## 00000494 /* 02A64 8093B734 C6B20490 */ lwc1 $f18, 0x0490($s5) ## 00000490 -/* 02A68 8093B738 46082601 */ sub.s $f24, $f4, $f8 -/* 02A6C 8093B73C 4600A306 */ mov.s $f12, $f20 -/* 02A70 8093B740 46123681 */ sub.s $f26, $f6, $f18 -/* 02A74 8093B744 0C03F494 */ jal func_800FD250 -/* 02A78 8093B748 4600C386 */ mov.s $f14, $f24 -/* 02A7C 8093B74C 4614A082 */ mul.s $f2, $f20, $f20 +/* 02A68 8093B738 46082601 */ sub.s $f24, $f4, $f8 +/* 02A6C 8093B73C 4600A306 */ mov.s $f12, $f20 +/* 02A70 8093B740 46123681 */ sub.s $f26, $f6, $f18 +/* 02A74 8093B744 0C03F494 */ jal Math_atan2f +/* 02A78 8093B748 4600C386 */ mov.s $f14, $f24 +/* 02A7C 8093B74C 4614A082 */ mul.s $f2, $f20, $f20 /* 02A80 8093B750 E6A0051C */ swc1 $f0, 0x051C($s5) ## 0000051C -/* 02A84 8093B754 4600D306 */ mov.s $f12, $f26 -/* 02A88 8093B758 4618C402 */ mul.s $f16, $f24, $f24 -/* 02A8C 8093B75C E7A20074 */ swc1 $f2, 0x0074($sp) -/* 02A90 8093B760 46101000 */ add.s $f0, $f2, $f16 -/* 02A94 8093B764 E7B00070 */ swc1 $f16, 0x0070($sp) -/* 02A98 8093B768 0C03F494 */ jal func_800FD250 -/* 02A9C 8093B76C 46000384 */ sqrt.s $f14, $f0 +/* 02A84 8093B754 4600D306 */ mov.s $f12, $f26 +/* 02A88 8093B758 4618C402 */ mul.s $f16, $f24, $f24 +/* 02A8C 8093B75C E7A20074 */ swc1 $f2, 0x0074($sp) +/* 02A90 8093B760 46101000 */ add.s $f0, $f2, $f16 +/* 02A94 8093B764 E7B00070 */ swc1 $f16, 0x0070($sp) +/* 02A98 8093B768 0C03F494 */ jal Math_atan2f +/* 02A9C 8093B76C 46000384 */ sqrt.s $f14, $f0 /* 02AA0 8093B770 86A204FC */ lh $v0, 0x04FC($s5) ## 000004FC -/* 02AA4 8093B774 46000287 */ neg.s $f10, $f0 -/* 02AA8 8093B778 C7B40074 */ lwc1 $f20, 0x0074($sp) -/* 02AAC 8093B77C C7B80070 */ lwc1 $f24, 0x0070($sp) +/* 02AA4 8093B774 46000287 */ neg.s $f10, $f0 +/* 02AA8 8093B778 C7B40074 */ lwc1 $f20, 0x0074($sp) +/* 02AAC 8093B77C C7B80070 */ lwc1 $f24, 0x0070($sp) /* 02AB0 8093B780 2401FFFF */ addiu $at, $zero, 0xFFFF ## $at = FFFFFFFF -/* 02AB4 8093B784 10410007 */ beq $v0, $at, .L8093B7A4 +/* 02AB4 8093B784 10410007 */ beq $v0, $at, .L8093B7A4 /* 02AB8 8093B788 E6AA0518 */ swc1 $f10, 0x0518($s5) ## 00000518 -/* 02ABC 8093B78C 10400007 */ beq $v0, $zero, .L8093B7AC +/* 02ABC 8093B78C 10400007 */ beq $v0, $zero, .L8093B7AC /* 02AC0 8093B790 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 02AC4 8093B794 504100A2 */ beql $v0, $at, .L8093BA20 +/* 02AC4 8093B794 504100A2 */ beql $v0, $at, .L8093BA20 /* 02AC8 8093B798 96CD0014 */ lhu $t5, 0x0014($s6) ## 00000014 -/* 02ACC 8093B79C 10000104 */ beq $zero, $zero, .L8093BBB0 +/* 02ACC 8093B79C 10000104 */ beq $zero, $zero, .L8093BBB0 /* 02AD0 8093B7A0 26B3050C */ addiu $s3, $s5, 0x050C ## $s3 = 0000050C .L8093B7A4: -/* 02AD4 8093B7A4 10000102 */ beq $zero, $zero, .L8093BBB0 +/* 02AD4 8093B7A4 10000102 */ beq $zero, $zero, .L8093BBB0 /* 02AD8 8093B7A8 26B3050C */ addiu $s3, $s5, 0x050C ## $s3 = 0000050C .L8093B7AC: /* 02ADC 8093B7AC 86AA0178 */ lh $t2, 0x0178($s5) ## 00000178 /* 02AE0 8093B7B0 02A02025 */ or $a0, $s5, $zero ## $a0 = 00000000 -/* 02AE4 8093B7B4 51400076 */ beql $t2, $zero, .L8093B990 +/* 02AE4 8093B7B4 51400076 */ beql $t2, $zero, .L8093B990 /* 02AE8 8093B7B8 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 02AEC 8093B7BC 0C24EACC */ jal func_8093AB30 +/* 02AEC 8093B7BC 0C24EACC */ jal func_8093AB30 /* 02AF0 8093B7C0 02C02825 */ or $a1, $s6, $zero ## $a1 = 00000000 /* 02AF4 8093B7C4 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 02AF8 8093B7C8 1441005E */ bne $v0, $at, .L8093B944 +/* 02AF8 8093B7C8 1441005E */ bne $v0, $at, .L8093B944 /* 02AFC 8093B7CC 3C0B8095 */ lui $t3, %hi(D_8094A8DC) ## $t3 = 80950000 /* 02B00 8093B7D0 256BA8DC */ addiu $t3, $t3, %lo(D_8094A8DC) ## $t3 = 8094A8DC /* 02B04 8093B7D4 8D6D0000 */ lw $t5, 0x0000($t3) ## 8094A8DC @@ -451,21 +451,21 @@ glabel func_8093B1AC /* 02B28 8093B7F8 27B400D8 */ addiu $s4, $sp, 0x00D8 ## $s4 = FFFFFF88 /* 02B2C 8093B7FC 27B100E4 */ addiu $s1, $sp, 0x00E4 ## $s1 = FFFFFF94 /* 02B30 8093B800 AE6D0008 */ sw $t5, 0x0008($s3) ## FFFFFF84 -/* 02B34 8093B804 8FB20124 */ lw $s2, 0x0124($sp) +/* 02B34 8093B804 8FB20124 */ lw $s2, 0x0124($sp) /* 02B38 8093B808 265209BC */ addiu $s2, $s2, 0x09BC ## $s2 = 00000978 .L8093B80C: /* 02B3C 8093B80C 0C00CFC8 */ jal Math_Rand_CenteredFloat - -/* 02B40 8093B810 4600A306 */ mov.s $f12, $f20 -/* 02B44 8093B814 E7A000D8 */ swc1 $f0, 0x00D8($sp) + +/* 02B40 8093B810 4600A306 */ mov.s $f12, $f20 +/* 02B44 8093B814 E7A000D8 */ swc1 $f0, 0x00D8($sp) /* 02B48 8093B818 0C00CFC8 */ jal Math_Rand_CenteredFloat - -/* 02B4C 8093B81C 4600A306 */ mov.s $f12, $f20 -/* 02B50 8093B820 E7A000DC */ swc1 $f0, 0x00DC($sp) + +/* 02B4C 8093B81C 4600A306 */ mov.s $f12, $f20 +/* 02B50 8093B820 E7A000DC */ swc1 $f0, 0x00DC($sp) /* 02B54 8093B824 0C00CFC8 */ jal Math_Rand_CenteredFloat - -/* 02B58 8093B828 4600A306 */ mov.s $f12, $f20 -/* 02B5C 8093B82C E7A000E0 */ swc1 $f0, 0x00E0($sp) + +/* 02B58 8093B828 4600A306 */ mov.s $f12, $f20 +/* 02B5C 8093B82C E7A000E0 */ swc1 $f0, 0x00E0($sp) /* 02B60 8093B830 8E4F0000 */ lw $t7, 0x0000($s2) ## 00000978 /* 02B64 8093B834 3C014000 */ lui $at, 0x4000 ## $at = 40000000 /* 02B68 8093B838 44816000 */ mtc1 $at, $f12 ## $f12 = 2.00 @@ -474,87 +474,87 @@ glabel func_8093B1AC /* 02B74 8093B844 AE2E0004 */ sw $t6, 0x0004($s1) ## FFFFFF98 /* 02B78 8093B848 8E4F0008 */ lw $t7, 0x0008($s2) ## 00000980 /* 02B7C 8093B84C 0C00CFBE */ jal Math_Rand_ZeroFloat - + /* 02B80 8093B850 AE2F0008 */ sw $t7, 0x0008($s1) ## FFFFFF9C -/* 02B84 8093B854 4600018D */ trunc.w.s $f6, $f0 +/* 02B84 8093B854 4600018D */ trunc.w.s $f6, $f0 /* 02B88 8093B858 240C0096 */ addiu $t4, $zero, 0x0096 ## $t4 = 00000096 /* 02B8C 8093B85C 02C02025 */ or $a0, $s6, $zero ## $a0 = 00000000 /* 02B90 8093B860 02202825 */ or $a1, $s1, $zero ## $a1 = FFFFFF94 -/* 02B94 8093B864 44083000 */ mfc1 $t0, $f6 +/* 02B94 8093B864 44083000 */ mfc1 $t0, $f6 /* 02B98 8093B868 02803025 */ or $a2, $s4, $zero ## $a2 = FFFFFF88 /* 02B9C 8093B86C 02603825 */ or $a3, $s3, $zero ## $a3 = FFFFFF7C -/* 02BA0 8093B870 0008CC00 */ sll $t9, $t0, 16 -/* 02BA4 8093B874 00194C03 */ sra $t1, $t9, 16 +/* 02BA0 8093B870 0008CC00 */ sll $t9, $t0, 16 +/* 02BA4 8093B874 00194C03 */ sra $t1, $t9, 16 /* 02BA8 8093B878 252A0005 */ addiu $t2, $t1, 0x0005 ## $t2 = 00000005 /* 02BAC 8093B87C 448A9000 */ mtc1 $t2, $f18 ## $f18 = 0.00 /* 02BB0 8093B880 00000000 */ nop -/* 02BB4 8093B884 46809120 */ cvt.s.w $f4, $f18 -/* 02BB8 8093B888 E7A40010 */ swc1 $f4, 0x0010($sp) +/* 02BB4 8093B884 46809120 */ cvt.s.w $f4, $f18 +/* 02BB8 8093B888 E7A40010 */ swc1 $f4, 0x0010($sp) /* 02BBC 8093B88C 86AB001C */ lh $t3, 0x001C($s5) ## 0000001C -/* 02BC0 8093B890 AFAC0018 */ sw $t4, 0x0018($sp) -/* 02BC4 8093B894 0C24E334 */ jal func_80938CD0 -/* 02BC8 8093B898 AFAB0014 */ sw $t3, 0x0014($sp) +/* 02BC0 8093B890 AFAC0018 */ sw $t4, 0x0018($sp) +/* 02BC4 8093B894 0C24E334 */ jal func_80938CD0 +/* 02BC8 8093B898 AFAB0014 */ sw $t3, 0x0014($sp) /* 02BCC 8093B89C 26100001 */ addiu $s0, $s0, 0x0001 ## $s0 = 00000001 -/* 02BD0 8093B8A0 00108400 */ sll $s0, $s0, 16 -/* 02BD4 8093B8A4 00108403 */ sra $s0, $s0, 16 -/* 02BD8 8093B8A8 2A010096 */ slti $at, $s0, 0x0096 -/* 02BDC 8093B8AC 1420FFD7 */ bne $at, $zero, .L8093B80C +/* 02BD0 8093B8A0 00108400 */ sll $s0, $s0, 16 +/* 02BD4 8093B8A4 00108403 */ sra $s0, $s0, 16 +/* 02BD8 8093B8A8 2A010096 */ slti $at, $s0, 0x0096 +/* 02BDC 8093B8AC 1420FFD7 */ bne $at, $zero, .L8093B80C /* 02BE0 8093B8B0 00000000 */ nop /* 02BE4 8093B8B4 240D0001 */ addiu $t5, $zero, 0x0001 ## $t5 = 00000001 /* 02BE8 8093B8B8 A6AD04FC */ sh $t5, 0x04FC($s5) ## 000004FC -/* 02BEC 8093B8BC 8FA40124 */ lw $a0, 0x0124($sp) +/* 02BEC 8093B8BC 8FA40124 */ lw $a0, 0x0124($sp) /* 02BF0 8093B8C0 2405180C */ addiu $a1, $zero, 0x180C ## $a1 = 0000180C -/* 02BF4 8093B8C4 0C01E245 */ jal func_80078914 +/* 02BF4 8093B8C4 0C01E245 */ jal func_80078914 /* 02BF8 8093B8C8 248400E4 */ addiu $a0, $a0, 0x00E4 ## $a0 = 000000E4 -/* 02BFC 8093B8CC 8FA40124 */ lw $a0, 0x0124($sp) +/* 02BFC 8093B8CC 8FA40124 */ lw $a0, 0x0124($sp) /* 02C00 8093B8D0 27A50128 */ addiu $a1, $sp, 0x0128 ## $a1 = FFFFFFD8 /* 02C04 8093B8D4 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 02C08 8093B8D8 0C034833 */ jal func_800D20CC +/* 02C08 8093B8D8 0C034833 */ jal func_800D20CC /* 02C0C 8093B8DC 24840A20 */ addiu $a0, $a0, 0x0A20 ## $a0 = 00000A20 -/* 02C10 8093B8E0 87AE012A */ lh $t6, 0x012A($sp) -/* 02C14 8093B8E4 87B80128 */ lh $t8, 0x0128($sp) +/* 02C10 8093B8E0 87AE012A */ lh $t6, 0x012A($sp) +/* 02C14 8093B8E4 87B80128 */ lh $t8, 0x0128($sp) /* 02C18 8093B8E8 34018000 */ ori $at, $zero, 0x8000 ## $at = 00008000 -/* 02C1C 8093B8EC 01C17821 */ addu $t7, $t6, $at -/* 02C20 8093B8F0 00184823 */ subu $t1, $zero, $t8 -/* 02C24 8093B8F4 A7AF012A */ sh $t7, 0x012A($sp) -/* 02C28 8093B8F8 A7A90128 */ sh $t1, 0x0128($sp) +/* 02C1C 8093B8EC 01C17821 */ addu $t7, $t6, $at +/* 02C20 8093B8F0 00184823 */ subu $t1, $zero, $t8 +/* 02C24 8093B8F4 A7AF012A */ sh $t7, 0x012A($sp) +/* 02C28 8093B8F8 A7A90128 */ sh $t1, 0x0128($sp) /* 02C2C 8093B8FC A6A90524 */ sh $t1, 0x0524($s5) ## 00000524 -/* 02C30 8093B900 87AA012A */ lh $t2, 0x012A($sp) +/* 02C30 8093B900 87AA012A */ lh $t2, 0x012A($sp) /* 02C34 8093B904 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 /* 02C38 8093B908 44814000 */ mtc1 $at, $f8 ## $f8 = 1.00 /* 02C3C 8093B90C 3C010001 */ lui $at, 0x0001 ## $at = 00010000 /* 02C40 8093B910 E6B60500 */ swc1 $f22, 0x0500($s5) ## 00000500 /* 02C44 8093B914 E6B60504 */ swc1 $f22, 0x0504($s5) ## 00000504 /* 02C48 8093B918 E6B60508 */ swc1 $f22, 0x0508($s5) ## 00000508 -/* 02C4C 8093B91C 00360821 */ addu $at, $at, $s6 +/* 02C4C 8093B91C 00360821 */ addu $at, $at, $s6 /* 02C50 8093B920 A6AA0526 */ sh $t2, 0x0526($s5) ## 00000526 -/* 02C54 8093B924 4600B306 */ mov.s $f12, $f22 +/* 02C54 8093B924 4600B306 */ mov.s $f12, $f22 /* 02C58 8093B928 24050064 */ addiu $a1, $zero, 0x0064 ## $a1 = 00000064 /* 02C5C 8093B92C 24060005 */ addiu $a2, $zero, 0x0005 ## $a2 = 00000005 /* 02C60 8093B930 24070004 */ addiu $a3, $zero, 0x0004 ## $a3 = 00000004 -/* 02C64 8093B934 0C02A800 */ jal func_800AA000 +/* 02C64 8093B934 0C02A800 */ jal func_800AA000 /* 02C68 8093B938 E4280AFC */ swc1 $f8, 0x0AFC($at) ## 00010AFC -/* 02C6C 8093B93C 10000014 */ beq $zero, $zero, .L8093B990 +/* 02C6C 8093B93C 10000014 */ beq $zero, $zero, .L8093B990 /* 02C70 8093B940 3C010001 */ lui $at, 0x0001 ## $at = 00010000 .L8093B944: -/* 02C74 8093B944 14400011 */ bne $v0, $zero, .L8093B98C +/* 02C74 8093B944 14400011 */ bne $v0, $zero, .L8093B98C /* 02C78 8093B948 02A02025 */ or $a0, $s5, $zero ## $a0 = 00000000 -/* 02C7C 8093B94C 0C24EA50 */ jal func_8093A940 +/* 02C7C 8093B94C 0C24EA50 */ jal func_8093A940 /* 02C80 8093B950 02C02825 */ or $a1, $s6, $zero ## $a1 = 00000000 /* 02C84 8093B954 86AB0440 */ lh $t3, 0x0440($s5) ## 00000440 -/* 02C88 8093B958 5560000D */ bnel $t3, $zero, .L8093B990 +/* 02C88 8093B958 5560000D */ bnel $t3, $zero, .L8093B990 /* 02C8C 8093B95C 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 02C90 8093B960 461AD282 */ mul.s $f10, $f26, $f26 +/* 02C90 8093B960 461AD282 */ mul.s $f10, $f26, $f26 /* 02C94 8093B964 26A4052C */ addiu $a0, $s5, 0x052C ## $a0 = 0000052C /* 02C98 8093B968 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 02C9C 8093B96C 3C074220 */ lui $a3, 0x4220 ## $a3 = 42200000 -/* 02CA0 8093B970 460AA180 */ add.s $f6, $f20, $f10 -/* 02CA4 8093B974 46183000 */ add.s $f0, $f6, $f24 -/* 02CA8 8093B978 46000004 */ sqrt.s $f0, $f0 -/* 02CAC 8093B97C 46000480 */ add.s $f18, $f0, $f0 -/* 02CB0 8093B980 44059000 */ mfc1 $a1, $f18 +/* 02CA0 8093B970 460AA180 */ add.s $f6, $f20, $f10 +/* 02CA4 8093B974 46183000 */ add.s $f0, $f6, $f24 +/* 02CA8 8093B978 46000004 */ sqrt.s $f0, $f0 +/* 02CAC 8093B97C 46000480 */ add.s $f18, $f0, $f0 +/* 02CB0 8093B980 44059000 */ mfc1 $a1, $f18 /* 02CB4 8093B984 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 02CB8 8093B988 00000000 */ nop .L8093B98C: /* 02CBC 8093B98C 3C010001 */ lui $at, 0x0001 ## $at = 00010000 @@ -564,92 +564,92 @@ glabel func_8093B1AC /* 02CC8 8093B998 26B1054C */ addiu $s1, $s5, 0x054C ## $s1 = 0000054C /* 02CCC 8093B99C 02203025 */ or $a2, $s1, $zero ## $a2 = 0000054C /* 02CD0 8093B9A0 02602825 */ or $a1, $s3, $zero ## $a1 = 0000050C -/* 02CD4 8093B9A4 02C12021 */ addu $a0, $s6, $at -/* 02CD8 8093B9A8 0C029B84 */ jal func_800A6E10 +/* 02CD4 8093B9A4 02C12021 */ addu $a0, $s6, $at +/* 02CD8 8093B9A8 0C029B84 */ jal func_800A6E10 /* 02CDC 8093B9AC 26A700F0 */ addiu $a3, $s5, 0x00F0 ## $a3 = 000000F0 /* 02CE0 8093B9B0 86AC001C */ lh $t4, 0x001C($s5) ## 0000001C /* 02CE4 8093B9B4 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 /* 02CE8 8093B9B8 3C108013 */ lui $s0, 0x8013 ## $s0 = 80130000 -/* 02CEC 8093B9BC 1581000D */ bne $t4, $at, .L8093B9F4 +/* 02CEC 8093B9BC 1581000D */ bne $t4, $at, .L8093B9F4 /* 02CF0 8093B9C0 260733E0 */ addiu $a3, $s0, 0x33E0 ## $a3 = 801333E0 /* 02CF4 8093B9C4 3C108013 */ lui $s0, 0x8013 ## $s0 = 80130000 /* 02CF8 8093B9C8 3C128013 */ lui $s2, 0x8013 ## $s2 = 80130000 /* 02CFC 8093B9CC 265233E8 */ addiu $s2, $s2, 0x33E8 ## $s2 = 801333E8 /* 02D00 8093B9D0 260733E0 */ addiu $a3, $s0, 0x33E0 ## $a3 = 801333E0 -/* 02D04 8093B9D4 AFA70010 */ sw $a3, 0x0010($sp) -/* 02D08 8093B9D8 AFB20014 */ sw $s2, 0x0014($sp) +/* 02D04 8093B9D4 AFA70010 */ sw $a3, 0x0010($sp) +/* 02D08 8093B9D8 AFB20014 */ sw $s2, 0x0014($sp) /* 02D0C 8093B9DC 24043122 */ addiu $a0, $zero, 0x3122 ## $a0 = 00003122 /* 02D10 8093B9E0 02202825 */ or $a1, $s1, $zero ## $a1 = 0000054C /* 02D14 8093B9E4 0C03DCE3 */ jal Audio_PlaySoundGeneral - + /* 02D18 8093B9E8 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 -/* 02D1C 8093B9EC 10000071 */ beq $zero, $zero, .L8093BBB4 +/* 02D1C 8093B9EC 10000071 */ beq $zero, $zero, .L8093BBB4 /* 02D20 8093B9F0 86A20178 */ lh $v0, 0x0178($s5) ## 00000178 .L8093B9F4: /* 02D24 8093B9F4 3C128013 */ lui $s2, 0x8013 ## $s2 = 80130000 /* 02D28 8093B9F8 265233E8 */ addiu $s2, $s2, 0x33E8 ## $s2 = 801333E8 -/* 02D2C 8093B9FC AFB20014 */ sw $s2, 0x0014($sp) +/* 02D2C 8093B9FC AFB20014 */ sw $s2, 0x0014($sp) /* 02D30 8093BA00 24043111 */ addiu $a0, $zero, 0x3111 ## $a0 = 00003111 /* 02D34 8093BA04 02202825 */ or $a1, $s1, $zero ## $a1 = 0000054C /* 02D38 8093BA08 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 /* 02D3C 8093BA0C 0C03DCE3 */ jal Audio_PlaySoundGeneral - -/* 02D40 8093BA10 AFA70010 */ sw $a3, 0x0010($sp) -/* 02D44 8093BA14 10000067 */ beq $zero, $zero, .L8093BBB4 + +/* 02D40 8093BA10 AFA70010 */ sw $a3, 0x0010($sp) +/* 02D44 8093BA14 10000067 */ beq $zero, $zero, .L8093BBB4 /* 02D48 8093BA18 86A20178 */ lh $v0, 0x0178($s5) ## 00000178 /* 02D4C 8093BA1C 96CD0014 */ lhu $t5, 0x0014($s6) ## 00000014 .L8093BA20: /* 02D50 8093BA20 2401FFEF */ addiu $at, $zero, 0xFFEF ## $at = FFFFFFEF -/* 02D54 8093BA24 01A17027 */ nor $t6, $t5, $at -/* 02D58 8093BA28 55C0002E */ bnel $t6, $zero, .L8093BAE4 +/* 02D54 8093BA24 01A17027 */ nor $t6, $t5, $at +/* 02D58 8093BA28 55C0002E */ bnel $t6, $zero, .L8093BAE4 /* 02D5C 8093BA2C A6A004FC */ sh $zero, 0x04FC($s5) ## 000004FC -/* 02D60 8093BA30 461AD102 */ mul.s $f4, $f26, $f26 +/* 02D60 8093BA30 461AD102 */ mul.s $f4, $f26, $f26 /* 02D64 8093BA34 8ED01C44 */ lw $s0, 0x1C44($s6) ## 00001C44 /* 02D68 8093BA38 26A40548 */ addiu $a0, $s5, 0x0548 ## $a0 = 00000548 /* 02D6C 8093BA3C 3C0544FA */ lui $a1, 0x44FA ## $a1 = 44FA0000 /* 02D70 8093BA40 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 02D74 8093BA44 3C074220 */ lui $a3, 0x4220 ## $a3 = 42200000 -/* 02D78 8093BA48 4604A200 */ add.s $f8, $f20, $f4 -/* 02D7C 8093BA4C 46184000 */ add.s $f0, $f8, $f24 -/* 02D80 8093BA50 46000004 */ sqrt.s $f0, $f0 +/* 02D78 8093BA48 4604A200 */ add.s $f8, $f20, $f4 +/* 02D7C 8093BA4C 46184000 */ add.s $f0, $f8, $f24 +/* 02D80 8093BA50 46000004 */ sqrt.s $f0, $f0 /* 02D84 8093BA54 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 02D88 8093BA58 E6A0052C */ swc1 $f0, 0x052C($s5) ## 0000052C /* 02D8C 8093BA5C 26A404B0 */ addiu $a0, $s5, 0x04B0 ## $a0 = 000004B0 /* 02D90 8093BA60 8E0509BC */ lw $a1, 0x09BC($s0) ## 801309BC /* 02D94 8093BA64 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 02D98 8093BA68 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 02D9C 8093BA6C 3C0743C8 */ lui $a3, 0x43C8 ## $a3 = 43C80000 /* 02DA0 8093BA70 26A404B4 */ addiu $a0, $s5, 0x04B4 ## $a0 = 000004B4 /* 02DA4 8093BA74 8E0509C0 */ lw $a1, 0x09C0($s0) ## 801309C0 /* 02DA8 8093BA78 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 02DAC 8093BA7C 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 02DB0 8093BA80 3C0743C8 */ lui $a3, 0x43C8 ## $a3 = 43C80000 /* 02DB4 8093BA84 26A404B8 */ addiu $a0, $s5, 0x04B8 ## $a0 = 000004B8 /* 02DB8 8093BA88 8E0509C4 */ lw $a1, 0x09C4($s0) ## 801309C4 /* 02DBC 8093BA8C 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 02DC0 8093BA90 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 02DC4 8093BA94 3C0743C8 */ lui $a3, 0x43C8 ## $a3 = 43C80000 /* 02DC8 8093BA98 86AF0150 */ lh $t7, 0x0150($s5) ## 00000150 /* 02DCC 8093BA9C 02C02025 */ or $a0, $s6, $zero ## $a0 = 00000000 /* 02DD0 8093BAA0 260509BC */ addiu $a1, $s0, 0x09BC ## $a1 = 801309BC /* 02DD4 8093BAA4 31F80003 */ andi $t8, $t7, 0x0003 ## $t8 = 00000000 -/* 02DD8 8093BAA8 1700000F */ bne $t8, $zero, .L8093BAE8 +/* 02DD8 8093BAA8 1700000F */ bne $t8, $zero, .L8093BAE8 /* 02DDC 8093BAAC 3C063F00 */ lui $a2, 0x3F00 ## $a2 = 3F000000 /* 02DE0 8093BAB0 240800FF */ addiu $t0, $zero, 0x00FF ## $t0 = 000000FF -/* 02DE4 8093BAB4 AFA80010 */ sw $t0, 0x0010($sp) +/* 02DE4 8093BAB4 AFA80010 */ sw $t0, 0x0010($sp) /* 02DE8 8093BAB8 86B9001C */ lh $t9, 0x001C($s5) ## 0000001C /* 02DEC 8093BABC 24090001 */ addiu $t1, $zero, 0x0001 ## $t1 = 00000001 /* 02DF0 8093BAC0 240A0096 */ addiu $t2, $zero, 0x0096 ## $t2 = 00000096 -/* 02DF4 8093BAC4 AFAA001C */ sw $t2, 0x001C($sp) -/* 02DF8 8093BAC8 AFA90018 */ sw $t1, 0x0018($sp) +/* 02DF4 8093BAC4 AFAA001C */ sw $t2, 0x001C($sp) +/* 02DF8 8093BAC8 AFA90018 */ sw $t1, 0x0018($sp) /* 02DFC 8093BACC 3C074040 */ lui $a3, 0x4040 ## $a3 = 40400000 -/* 02E00 8093BAD0 0C24E3B0 */ jal func_80938EC0 -/* 02E04 8093BAD4 AFB90014 */ sw $t9, 0x0014($sp) -/* 02E08 8093BAD8 10000004 */ beq $zero, $zero, .L8093BAEC +/* 02E00 8093BAD0 0C24E3B0 */ jal func_80938EC0 +/* 02E04 8093BAD4 AFB90014 */ sw $t9, 0x0014($sp) +/* 02E08 8093BAD8 10000004 */ beq $zero, $zero, .L8093BAEC /* 02E0C 8093BADC 3C010001 */ lui $at, 0x0001 ## $at = 00010000 /* 02E10 8093BAE0 A6A004FC */ sh $zero, 0x04FC($s5) ## 000004FC .L8093BAE4: @@ -660,88 +660,88 @@ glabel func_8093B1AC /* 02E1C 8093BAEC 34211D60 */ ori $at, $at, 0x1D60 ## $at = 00011D60 /* 02E20 8093BAF0 26B10558 */ addiu $s1, $s5, 0x0558 ## $s1 = 00000558 /* 02E24 8093BAF4 02203025 */ or $a2, $s1, $zero ## $a2 = 00000558 -/* 02E28 8093BAF8 02C12021 */ addu $a0, $s6, $at +/* 02E28 8093BAF8 02C12021 */ addu $a0, $s6, $at /* 02E2C 8093BAFC 26A50530 */ addiu $a1, $s5, 0x0530 ## $a1 = 00000530 -/* 02E30 8093BB00 0C029B84 */ jal func_800A6E10 +/* 02E30 8093BB00 0C029B84 */ jal func_800A6E10 /* 02E34 8093BB04 26A700F0 */ addiu $a3, $s5, 0x00F0 ## $a3 = 000000F0 /* 02E38 8093BB08 86AB001C */ lh $t3, 0x001C($s5) ## 0000001C /* 02E3C 8093BB0C 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 /* 02E40 8093BB10 3C108013 */ lui $s0, 0x8013 ## $s0 = 80130000 -/* 02E44 8093BB14 15610015 */ bne $t3, $at, .L8093BB6C +/* 02E44 8093BB14 15610015 */ bne $t3, $at, .L8093BB6C /* 02E48 8093BB18 261033E0 */ addiu $s0, $s0, 0x33E0 ## $s0 = 801333E0 /* 02E4C 8093BB1C 3C108013 */ lui $s0, 0x8013 ## $s0 = 80130000 /* 02E50 8093BB20 3C128013 */ lui $s2, 0x8013 ## $s2 = 80130000 /* 02E54 8093BB24 265233E8 */ addiu $s2, $s2, 0x33E8 ## $s2 = 801333E8 /* 02E58 8093BB28 261033E0 */ addiu $s0, $s0, 0x33E0 ## $s0 = 801333E0 /* 02E5C 8093BB2C 02003825 */ or $a3, $s0, $zero ## $a3 = 801333E0 -/* 02E60 8093BB30 AFB00010 */ sw $s0, 0x0010($sp) -/* 02E64 8093BB34 AFB20014 */ sw $s2, 0x0014($sp) +/* 02E60 8093BB30 AFB00010 */ sw $s0, 0x0010($sp) +/* 02E64 8093BB34 AFB20014 */ sw $s2, 0x0014($sp) /* 02E68 8093BB38 24043122 */ addiu $a0, $zero, 0x3122 ## $a0 = 00003122 /* 02E6C 8093BB3C 02202825 */ or $a1, $s1, $zero ## $a1 = 00000558 /* 02E70 8093BB40 0C03DCE3 */ jal Audio_PlaySoundGeneral - + /* 02E74 8093BB44 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 /* 02E78 8093BB48 24043117 */ addiu $a0, $zero, 0x3117 ## $a0 = 00003117 /* 02E7C 8093BB4C 02202825 */ or $a1, $s1, $zero ## $a1 = 00000558 /* 02E80 8093BB50 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 /* 02E84 8093BB54 02003825 */ or $a3, $s0, $zero ## $a3 = 801333E0 -/* 02E88 8093BB58 AFB00010 */ sw $s0, 0x0010($sp) +/* 02E88 8093BB58 AFB00010 */ sw $s0, 0x0010($sp) /* 02E8C 8093BB5C 0C03DCE3 */ jal Audio_PlaySoundGeneral - -/* 02E90 8093BB60 AFB20014 */ sw $s2, 0x0014($sp) -/* 02E94 8093BB64 10000012 */ beq $zero, $zero, .L8093BBB0 + +/* 02E90 8093BB60 AFB20014 */ sw $s2, 0x0014($sp) +/* 02E94 8093BB64 10000012 */ beq $zero, $zero, .L8093BBB0 /* 02E98 8093BB68 26B3050C */ addiu $s3, $s5, 0x050C ## $s3 = 0000050C .L8093BB6C: /* 02E9C 8093BB6C 3C128013 */ lui $s2, 0x8013 ## $s2 = 80130000 /* 02EA0 8093BB70 265233E8 */ addiu $s2, $s2, 0x33E8 ## $s2 = 801333E8 -/* 02EA4 8093BB74 AFB20014 */ sw $s2, 0x0014($sp) +/* 02EA4 8093BB74 AFB20014 */ sw $s2, 0x0014($sp) /* 02EA8 8093BB78 24043111 */ addiu $a0, $zero, 0x3111 ## $a0 = 00003111 /* 02EAC 8093BB7C 02202825 */ or $a1, $s1, $zero ## $a1 = 00000558 /* 02EB0 8093BB80 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 /* 02EB4 8093BB84 02003825 */ or $a3, $s0, $zero ## $a3 = 801333E0 /* 02EB8 8093BB88 0C03DCE3 */ jal Audio_PlaySoundGeneral - -/* 02EBC 8093BB8C AFB00010 */ sw $s0, 0x0010($sp) + +/* 02EBC 8093BB8C AFB00010 */ sw $s0, 0x0010($sp) /* 02EC0 8093BB90 24043118 */ addiu $a0, $zero, 0x3118 ## $a0 = 00003118 /* 02EC4 8093BB94 02202825 */ or $a1, $s1, $zero ## $a1 = 00000558 /* 02EC8 8093BB98 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 /* 02ECC 8093BB9C 02003825 */ or $a3, $s0, $zero ## $a3 = 801333E0 -/* 02ED0 8093BBA0 AFB00010 */ sw $s0, 0x0010($sp) +/* 02ED0 8093BBA0 AFB00010 */ sw $s0, 0x0010($sp) /* 02ED4 8093BBA4 0C03DCE3 */ jal Audio_PlaySoundGeneral - -/* 02ED8 8093BBA8 AFB20014 */ sw $s2, 0x0014($sp) + +/* 02ED8 8093BBA8 AFB20014 */ sw $s2, 0x0014($sp) /* 02EDC 8093BBAC 26B3050C */ addiu $s3, $s5, 0x050C ## $s3 = 0000050C .L8093BBB0: /* 02EE0 8093BBB0 86A20178 */ lh $v0, 0x0178($s5) ## 00000178 .L8093BBB4: /* 02EE4 8093BBB4 3C048095 */ lui $a0, %hi(D_8094C840) ## $a0 = 80950000 /* 02EE8 8093BBB8 2484C840 */ addiu $a0, $a0, %lo(D_8094C840) ## $a0 = 8094C840 -/* 02EEC 8093BBBC 14400009 */ bne $v0, $zero, .L8093BBE4 +/* 02EEC 8093BBBC 14400009 */ bne $v0, $zero, .L8093BBE4 /* 02EF0 8093BBC0 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 02EF4 8093BBC4 80830000 */ lb $v1, 0x0000($a0) ## 8094C840 /* 02EF8 8093BBC8 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 02EFC 8093BBCC 10610003 */ beq $v1, $at, .L8093BBDC +/* 02EFC 8093BBCC 10610003 */ beq $v1, $at, .L8093BBDC /* 02F00 8093BBD0 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 02F04 8093BBD4 14610003 */ bne $v1, $at, .L8093BBE4 +/* 02F04 8093BBD4 14610003 */ bne $v1, $at, .L8093BBE4 /* 02F08 8093BBD8 00000000 */ nop .L8093BBDC: /* 02F0C 8093BBDC A0800000 */ sb $zero, 0x0000($a0) ## 8094C840 /* 02F10 8093BBE0 86A20178 */ lh $v0, 0x0178($s5) ## 00000178 .L8093BBE4: -/* 02F14 8093BBE4 1440000F */ bne $v0, $zero, .L8093BC24 +/* 02F14 8093BBE4 1440000F */ bne $v0, $zero, .L8093BC24 /* 02F18 8093BBE8 26A404F8 */ addiu $a0, $s5, 0x04F8 ## $a0 = 000004F8 -/* 02F1C 8093BBEC 4405B000 */ mfc1 $a1, $f22 +/* 02F1C 8093BBEC 4405B000 */ mfc1 $a1, $f22 /* 02F20 8093BBF0 3C073A03 */ lui $a3, 0x3A03 ## $a3 = 3A030000 /* 02F24 8093BBF4 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 02F28 8093BBF8 34E7126F */ ori $a3, $a3, 0x126F ## $a3 = 3A03126F /* 02F2C 8093BBFC C6AA04F8 */ lwc1 $f10, 0x04F8($s5) ## 000004F8 /* 02F30 8093BC00 02A02025 */ or $a0, $s5, $zero ## $a0 = 00000000 -/* 02F34 8093BC04 460AB032 */ c.eq.s $f22, $f10 +/* 02F34 8093BC04 460AB032 */ c.eq.s $f22, $f10 /* 02F38 8093BC08 00000000 */ nop -/* 02F3C 8093BC0C 45020006 */ bc1fl .L8093BC28 +/* 02F3C 8093BC0C 45020006 */ bc1fl .L8093BC28 /* 02F40 8093BC10 3C014120 */ lui $at, 0x4120 ## $at = 41200000 -/* 02F44 8093BC14 0C24F059 */ jal func_8093C164 +/* 02F44 8093BC14 0C24F059 */ jal func_8093C164 /* 02F48 8093BC18 02C02825 */ or $a1, $s6, $zero ## $a1 = 00000000 /* 02F4C 8093BC1C E6B60548 */ swc1 $f22, 0x0548($s5) ## 00000548 /* 02F50 8093BC20 E6B6052C */ swc1 $f22, 0x052C($s5) ## 0000052C @@ -756,48 +756,48 @@ glabel func_8093B1AC /* 02F6C 8093BC3C C6AC048C */ lwc1 $f12, 0x048C($s5) ## 0000048C /* 02F70 8093BC40 C6AE0490 */ lwc1 $f14, 0x0490($s5) ## 00000490 /* 02F74 8093BC44 8EA60494 */ lw $a2, 0x0494($s5) ## 00000494 -/* 02F78 8093BC48 0C034261 */ jal Matrix_Translate +/* 02F78 8093BC48 0C034261 */ jal Matrix_Translate /* 02F7C 8093BC4C 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 /* 02F80 8093BC50 C6AC051C */ lwc1 $f12, 0x051C($s5) ## 0000051C -/* 02F84 8093BC54 0C034348 */ jal Matrix_RotateY +/* 02F84 8093BC54 0C034348 */ jal Matrix_RotateY /* 02F88 8093BC58 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 /* 02F8C 8093BC5C C6AC0518 */ lwc1 $f12, 0x0518($s5) ## 00000518 -/* 02F90 8093BC60 0C0342DC */ jal Matrix_RotateX +/* 02F90 8093BC60 0C0342DC */ jal Matrix_RotateX /* 02F94 8093BC64 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 -/* 02F98 8093BC68 E7B60130 */ swc1 $f22, 0x0130($sp) -/* 02F9C 8093BC6C E7B60134 */ swc1 $f22, 0x0134($sp) +/* 02F98 8093BC68 E7B60130 */ swc1 $f22, 0x0130($sp) +/* 02F9C 8093BC6C E7B60134 */ swc1 $f22, 0x0134($sp) /* 02FA0 8093BC70 3C01C0A0 */ lui $at, 0xC0A0 ## $at = C0A00000 /* 02FA4 8093BC74 44819000 */ mtc1 $at, $f18 ## $f18 = -5.00 /* 02FA8 8093BC78 C6A6052C */ lwc1 $f6, 0x052C($s5) ## 0000052C /* 02FAC 8093BC7C 27B20130 */ addiu $s2, $sp, 0x0130 ## $s2 = FFFFFFE0 /* 02FB0 8093BC80 02402025 */ or $a0, $s2, $zero ## $a0 = FFFFFFE0 -/* 02FB4 8093BC84 46123100 */ add.s $f4, $f6, $f18 +/* 02FB4 8093BC84 46123100 */ add.s $f4, $f6, $f18 /* 02FB8 8093BC88 02602825 */ or $a1, $s3, $zero ## $a1 = 0000050C -/* 02FBC 8093BC8C 0C0346BD */ jal Matrix_MultVec3f -/* 02FC0 8093BC90 E7A40138 */ swc1 $f4, 0x0138($sp) +/* 02FBC 8093BC8C 0C0346BD */ jal Matrix_MultVec3f +/* 02FC0 8093BC90 E7A40138 */ swc1 $f4, 0x0138($sp) /* 02FC4 8093BC94 86AC0440 */ lh $t4, 0x0440($s5) ## 00000440 -/* 02FC8 8093BC98 55800019 */ bnel $t4, $zero, .L8093BD00 +/* 02FC8 8093BC98 55800019 */ bnel $t4, $zero, .L8093BD00 /* 02FCC 8093BC9C 86A804FC */ lh $t0, 0x04FC($s5) ## 000004FC /* 02FD0 8093BCA0 86AD04FC */ lh $t5, 0x04FC($s5) ## 000004FC -/* 02FD4 8093BCA4 55A00016 */ bnel $t5, $zero, .L8093BD00 +/* 02FD4 8093BCA4 55A00016 */ bnel $t5, $zero, .L8093BD00 /* 02FD8 8093BCA8 86A804FC */ lh $t0, 0x04FC($s5) ## 000004FC /* 02FDC 8093BCAC 86AE0178 */ lh $t6, 0x0178($s5) ## 00000178 -/* 02FE0 8093BCB0 51C00013 */ beql $t6, $zero, .L8093BD00 +/* 02FE0 8093BCB0 51C00013 */ beql $t6, $zero, .L8093BD00 /* 02FE4 8093BCB4 86A804FC */ lh $t0, 0x04FC($s5) ## 000004FC -/* 02FE8 8093BCB8 0C24EBB6 */ jal func_8093AED8 +/* 02FE8 8093BCB8 0C24EBB6 */ jal func_8093AED8 /* 02FEC 8093BCBC 02602025 */ or $a0, $s3, $zero ## $a0 = 0000050C -/* 02FF0 8093BCC0 4600B03E */ c.le.s $f22, $f0 +/* 02FF0 8093BCC0 4600B03E */ c.le.s $f22, $f0 /* 02FF4 8093BCC4 E6A00504 */ swc1 $f0, 0x0504($s5) ## 00000504 /* 02FF8 8093BCC8 240F0001 */ addiu $t7, $zero, 0x0001 ## $t7 = 00000001 /* 02FFC 8093BCCC 02A02025 */ or $a0, $s5, $zero ## $a0 = 00000000 -/* 03000 8093BCD0 4500000A */ bc1f .L8093BCFC +/* 03000 8093BCD0 4500000A */ bc1f .L8093BCFC /* 03004 8093BCD4 02C02825 */ or $a1, $s6, $zero ## $a1 = 00000000 /* 03008 8093BCD8 C6A8050C */ lwc1 $f8, 0x050C($s5) ## 0000050C /* 0300C 8093BCDC C6AA0514 */ lwc1 $f10, 0x0514($s5) ## 00000514 /* 03010 8093BCE0 A6AF0440 */ sh $t7, 0x0440($s5) ## 00000440 /* 03014 8093BCE4 86A6001C */ lh $a2, 0x001C($s5) ## 0000001C /* 03018 8093BCE8 E6A80500 */ swc1 $f8, 0x0500($s5) ## 00000500 -/* 0301C 8093BCEC 0C24E971 */ jal func_8093A5C4 +/* 0301C 8093BCEC 0C24E971 */ jal func_8093A5C4 /* 03020 8093BCF0 E6AA0508 */ swc1 $f10, 0x0508($s5) ## 00000508 /* 03024 8093BCF4 24180014 */ addiu $t8, $zero, 0x0014 ## $t8 = 00000014 /* 03028 8093BCF8 A6B80178 */ sh $t8, 0x0178($s5) ## 00000178 @@ -805,35 +805,35 @@ glabel func_8093B1AC /* 0302C 8093BCFC 86A804FC */ lh $t0, 0x04FC($s5) ## 000004FC .L8093BD00: /* 03030 8093BD00 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 03034 8093BD04 5501010A */ bnel $t0, $at, .L8093C130 -/* 03038 8093BD08 8FBF0064 */ lw $ra, 0x0064($sp) +/* 03034 8093BD04 5501010A */ bnel $t0, $at, .L8093C130 +/* 03038 8093BD08 8FBF0064 */ lw $ra, 0x0064($sp) /* 0303C 8093BD0C 86B90440 */ lh $t9, 0x0440($s5) ## 00000440 -/* 03040 8093BD10 8FA40124 */ lw $a0, 0x0124($sp) +/* 03040 8093BD10 8FA40124 */ lw $a0, 0x0124($sp) /* 03044 8093BD14 26B30530 */ addiu $s3, $s5, 0x0530 ## $s3 = 00000530 -/* 03048 8093BD18 17200026 */ bne $t9, $zero, .L8093BDB4 +/* 03048 8093BD18 17200026 */ bne $t9, $zero, .L8093BDB4 /* 0304C 8093BD1C 24840A20 */ addiu $a0, $a0, 0x0A20 ## $a0 = 00000A20 /* 03050 8093BD20 27A50128 */ addiu $a1, $sp, 0x0128 ## $a1 = FFFFFFD8 -/* 03054 8093BD24 0C034833 */ jal func_800D20CC +/* 03054 8093BD24 0C034833 */ jal func_800D20CC /* 03058 8093BD28 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 0305C 8093BD2C 87A50128 */ lh $a1, 0x0128($sp) -/* 03060 8093BD30 87A9012A */ lh $t1, 0x012A($sp) +/* 0305C 8093BD2C 87A50128 */ lh $a1, 0x0128($sp) +/* 03060 8093BD30 87A9012A */ lh $t1, 0x012A($sp) /* 03064 8093BD34 34018000 */ ori $at, $zero, 0x8000 ## $at = 00008000 -/* 03068 8093BD38 00052823 */ subu $a1, $zero, $a1 -/* 0306C 8093BD3C 00052C00 */ sll $a1, $a1, 16 -/* 03070 8093BD40 00052C03 */ sra $a1, $a1, 16 -/* 03074 8093BD44 01215021 */ addu $t2, $t1, $at -/* 03078 8093BD48 A7AA012A */ sh $t2, 0x012A($sp) -/* 0307C 8093BD4C A7A50128 */ sh $a1, 0x0128($sp) +/* 03068 8093BD38 00052823 */ subu $a1, $zero, $a1 +/* 0306C 8093BD3C 00052C00 */ sll $a1, $a1, 16 +/* 03070 8093BD40 00052C03 */ sra $a1, $a1, 16 +/* 03074 8093BD44 01215021 */ addu $t2, $t1, $at +/* 03078 8093BD48 A7AA012A */ sh $t2, 0x012A($sp) +/* 0307C 8093BD4C A7A50128 */ sh $a1, 0x0128($sp) /* 03080 8093BD50 26A40524 */ addiu $a0, $s5, 0x0524 ## $a0 = 00000524 /* 03084 8093BD54 24060005 */ addiu $a2, $zero, 0x0005 ## $a2 = 00000005 /* 03088 8093BD58 0C01E1EF */ jal Math_SmoothScaleMaxS - + /* 0308C 8093BD5C 24072000 */ addiu $a3, $zero, 0x2000 ## $a3 = 00002000 /* 03090 8093BD60 26A40526 */ addiu $a0, $s5, 0x0526 ## $a0 = 00000526 -/* 03094 8093BD64 87A5012A */ lh $a1, 0x012A($sp) +/* 03094 8093BD64 87A5012A */ lh $a1, 0x012A($sp) /* 03098 8093BD68 24060005 */ addiu $a2, $zero, 0x0005 ## $a2 = 00000005 /* 0309C 8093BD6C 0C01E1EF */ jal Math_SmoothScaleMaxS - + /* 030A0 8093BD70 24072000 */ addiu $a3, $zero, 0x2000 ## $a3 = 00002000 /* 030A4 8093BD74 86AB0524 */ lh $t3, 0x0524($s5) ## 00000524 /* 030A8 8093BD78 86AC0526 */ lh $t4, 0x0526($s5) ## 00000526 @@ -841,181 +841,181 @@ glabel func_8093B1AC /* 030B0 8093BD80 448B3000 */ mtc1 $t3, $f6 ## $f6 = 0.00 /* 030B4 8093BD84 448C5000 */ mtc1 $t4, $f10 ## $f10 = 0.00 /* 030B8 8093BD88 44810000 */ mtc1 $at, $f0 ## $f0 = 32768.00 -/* 030BC 8093BD8C 468034A0 */ cvt.s.w $f18, $f6 +/* 030BC 8093BD8C 468034A0 */ cvt.s.w $f18, $f6 /* 030C0 8093BD90 3C018095 */ lui $at, %hi(D_8094AF08) ## $at = 80950000 -/* 030C4 8093BD94 C422AF08 */ lwc1 $f2, %lo(D_8094AF08)($at) -/* 030C8 8093BD98 468051A0 */ cvt.s.w $f6, $f10 -/* 030CC 8093BD9C 46009103 */ div.s $f4, $f18, $f0 -/* 030D0 8093BDA0 46003483 */ div.s $f18, $f6, $f0 -/* 030D4 8093BDA4 46022202 */ mul.s $f8, $f4, $f2 +/* 030C4 8093BD94 C422AF08 */ lwc1 $f2, %lo(D_8094AF08)($at) +/* 030C8 8093BD98 468051A0 */ cvt.s.w $f6, $f10 +/* 030CC 8093BD9C 46009103 */ div.s $f4, $f18, $f0 +/* 030D0 8093BDA0 46003483 */ div.s $f18, $f6, $f0 +/* 030D4 8093BDA4 46022202 */ mul.s $f8, $f4, $f2 /* 030D8 8093BDA8 E6A8053C */ swc1 $f8, 0x053C($s5) ## 0000053C -/* 030DC 8093BDAC 46029102 */ mul.s $f4, $f18, $f2 +/* 030DC 8093BDAC 46029102 */ mul.s $f4, $f18, $f2 /* 030E0 8093BDB0 E6A40540 */ swc1 $f4, 0x0540($s5) ## 00000540 .L8093BDB4: /* 030E4 8093BDB4 C6AC050C */ lwc1 $f12, 0x050C($s5) ## 0000050C /* 030E8 8093BDB8 C6AE0510 */ lwc1 $f14, 0x0510($s5) ## 00000510 /* 030EC 8093BDBC 8EA60514 */ lw $a2, 0x0514($s5) ## 00000514 -/* 030F0 8093BDC0 0C034261 */ jal Matrix_Translate +/* 030F0 8093BDC0 0C034261 */ jal Matrix_Translate /* 030F4 8093BDC4 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 /* 030F8 8093BDC8 C6AC0540 */ lwc1 $f12, 0x0540($s5) ## 00000540 -/* 030FC 8093BDCC 0C034348 */ jal Matrix_RotateY +/* 030FC 8093BDCC 0C034348 */ jal Matrix_RotateY /* 03100 8093BDD0 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 /* 03104 8093BDD4 C6AC053C */ lwc1 $f12, 0x053C($s5) ## 0000053C -/* 03108 8093BDD8 0C0342DC */ jal Matrix_RotateX +/* 03108 8093BDD8 0C0342DC */ jal Matrix_RotateX /* 0310C 8093BDDC 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 -/* 03110 8093BDE0 E7B60130 */ swc1 $f22, 0x0130($sp) -/* 03114 8093BDE4 E7B60134 */ swc1 $f22, 0x0134($sp) +/* 03110 8093BDE0 E7B60130 */ swc1 $f22, 0x0130($sp) +/* 03114 8093BDE4 E7B60134 */ swc1 $f22, 0x0134($sp) /* 03118 8093BDE8 3C01C32A */ lui $at, 0xC32A ## $at = C32A0000 /* 0311C 8093BDEC 44815000 */ mtc1 $at, $f10 ## $f10 = -170.00 /* 03120 8093BDF0 C6A80548 */ lwc1 $f8, 0x0548($s5) ## 00000548 /* 03124 8093BDF4 02402025 */ or $a0, $s2, $zero ## $a0 = FFFFFFE0 /* 03128 8093BDF8 02602825 */ or $a1, $s3, $zero ## $a1 = 00000530 -/* 0312C 8093BDFC 460A4180 */ add.s $f6, $f8, $f10 -/* 03130 8093BE00 0C0346BD */ jal Matrix_MultVec3f -/* 03134 8093BE04 E7A60138 */ swc1 $f6, 0x0138($sp) +/* 0312C 8093BDFC 460A4180 */ add.s $f6, $f8, $f10 +/* 03130 8093BE00 0C0346BD */ jal Matrix_MultVec3f +/* 03134 8093BE04 E7A60138 */ swc1 $f6, 0x0138($sp) /* 03138 8093BE08 86AD0440 */ lh $t5, 0x0440($s5) ## 00000440 /* 0313C 8093BE0C 00008025 */ or $s0, $zero, $zero ## $s0 = 00000000 /* 03140 8093BE10 27B100BC */ addiu $s1, $sp, 0x00BC ## $s1 = FFFFFF6C -/* 03144 8093BE14 55A00061 */ bnel $t5, $zero, .L8093BF9C +/* 03144 8093BE14 55A00061 */ bnel $t5, $zero, .L8093BF9C /* 03148 8093BE18 02A02025 */ or $a0, $s5, $zero ## $a0 = 00000000 -/* 0314C 8093BE1C E7B60138 */ swc1 $f22, 0x0138($sp) +/* 0314C 8093BE1C E7B60138 */ swc1 $f22, 0x0138($sp) /* 03150 8093BE20 02402025 */ or $a0, $s2, $zero ## $a0 = FFFFFFE0 .L8093BE24: -/* 03154 8093BE24 0C0346BD */ jal Matrix_MultVec3f +/* 03154 8093BE24 0C0346BD */ jal Matrix_MultVec3f /* 03158 8093BE28 02202825 */ or $a1, $s1, $zero ## $a1 = FFFFFF6C -/* 0315C 8093BE2C 0C24EBB6 */ jal func_8093AED8 +/* 0315C 8093BE2C 0C24EBB6 */ jal func_8093AED8 /* 03160 8093BE30 02202025 */ or $a0, $s1, $zero ## $a0 = FFFFFF6C -/* 03164 8093BE34 4600B03E */ c.le.s $f22, $f0 +/* 03164 8093BE34 4600B03E */ c.le.s $f22, $f0 /* 03168 8093BE38 26100001 */ addiu $s0, $s0, 0x0001 ## $s0 = 00000001 /* 0316C 8093BE3C E6A00504 */ swc1 $f0, 0x0504($s5) ## 00000504 -/* 03170 8093BE40 00108400 */ sll $s0, $s0, 16 -/* 03174 8093BE44 45000049 */ bc1f .L8093BF6C -/* 03178 8093BE48 C7A80138 */ lwc1 $f8, 0x0138($sp) +/* 03170 8093BE40 00108400 */ sll $s0, $s0, 16 +/* 03174 8093BE44 45000049 */ bc1f .L8093BF6C +/* 03178 8093BE48 C7A80138 */ lwc1 $f8, 0x0138($sp) /* 0317C 8093BE4C 3C01420C */ lui $at, 0x420C ## $at = 420C0000 /* 03180 8093BE50 44819000 */ mtc1 $at, $f18 ## $f18 = 35.00 /* 03184 8093BE54 C6A40504 */ lwc1 $f4, 0x0504($s5) ## 00000504 /* 03188 8093BE58 00008025 */ or $s0, $zero, $zero ## $s0 = 00000000 /* 0318C 8093BE5C 27B200A4 */ addiu $s2, $sp, 0x00A4 ## $s2 = FFFFFF54 -/* 03190 8093BE60 46049032 */ c.eq.s $f18, $f4 +/* 03190 8093BE60 46049032 */ c.eq.s $f18, $f4 /* 03194 8093BE64 27B100B0 */ addiu $s1, $sp, 0x00B0 ## $s1 = FFFFFF60 -/* 03198 8093BE68 45010016 */ bc1t .L8093BEC4 +/* 03198 8093BE68 45010016 */ bc1t .L8093BEC4 /* 0319C 8093BE6C 00000000 */ nop /* 031A0 8093BE70 C6A8053C */ lwc1 $f8, 0x053C($s5) ## 0000053C -/* 031A4 8093BE74 4608B03C */ c.lt.s $f22, $f8 +/* 031A4 8093BE74 4608B03C */ c.lt.s $f22, $f8 /* 031A8 8093BE78 00000000 */ nop -/* 031AC 8093BE7C 45000011 */ bc1f .L8093BEC4 +/* 031AC 8093BE7C 45000011 */ bc1f .L8093BEC4 /* 031B0 8093BE80 00000000 */ nop /* 031B4 8093BE84 86AE0178 */ lh $t6, 0x0178($s5) ## 00000178 /* 031B8 8093BE88 240F0001 */ addiu $t7, $zero, 0x0001 ## $t7 = 00000001 -/* 031BC 8093BE8C 11C0000D */ beq $t6, $zero, .L8093BEC4 +/* 031BC 8093BE8C 11C0000D */ beq $t6, $zero, .L8093BEC4 /* 031C0 8093BE90 00000000 */ nop /* 031C4 8093BE94 A6AF0440 */ sh $t7, 0x0440($s5) ## 00000440 -/* 031C8 8093BE98 C7AA00BC */ lwc1 $f10, 0x00BC($sp) +/* 031C8 8093BE98 C7AA00BC */ lwc1 $f10, 0x00BC($sp) /* 031CC 8093BE9C 02A02025 */ or $a0, $s5, $zero ## $a0 = 00000000 /* 031D0 8093BEA0 02C02825 */ or $a1, $s6, $zero ## $a1 = 00000000 /* 031D4 8093BEA4 E6AA0500 */ swc1 $f10, 0x0500($s5) ## 00000500 -/* 031D8 8093BEA8 C7A600C4 */ lwc1 $f6, 0x00C4($sp) +/* 031D8 8093BEA8 C7A600C4 */ lwc1 $f6, 0x00C4($sp) /* 031DC 8093BEAC 86A6001C */ lh $a2, 0x001C($s5) ## 0000001C -/* 031E0 8093BEB0 0C24E971 */ jal func_8093A5C4 +/* 031E0 8093BEB0 0C24E971 */ jal func_8093A5C4 /* 031E4 8093BEB4 E6A60508 */ swc1 $f6, 0x0508($s5) ## 00000508 /* 031E8 8093BEB8 24180014 */ addiu $t8, $zero, 0x0014 ## $t8 = 00000014 -/* 031EC 8093BEBC 10000036 */ beq $zero, $zero, .L8093BF98 +/* 031EC 8093BEBC 10000036 */ beq $zero, $zero, .L8093BF98 /* 031F0 8093BEC0 A6B80178 */ sh $t8, 0x0178($s5) ## 00000178 .L8093BEC4: /* 031F4 8093BEC4 0C00CFC8 */ jal Math_Rand_CenteredFloat - -/* 031F8 8093BEC8 4600D306 */ mov.s $f12, $f26 -/* 031FC 8093BECC E7A000B0 */ swc1 $f0, 0x00B0($sp) + +/* 031F8 8093BEC8 4600D306 */ mov.s $f12, $f26 +/* 031FC 8093BECC E7A000B0 */ swc1 $f0, 0x00B0($sp) /* 03200 8093BED0 0C00CFC8 */ jal Math_Rand_CenteredFloat - -/* 03204 8093BED4 4600D306 */ mov.s $f12, $f26 -/* 03208 8093BED8 E7A000B4 */ swc1 $f0, 0x00B4($sp) + +/* 03204 8093BED4 4600D306 */ mov.s $f12, $f26 +/* 03208 8093BED8 E7A000B4 */ swc1 $f0, 0x00B4($sp) /* 0320C 8093BEDC 0C00CFC8 */ jal Math_Rand_CenteredFloat - -/* 03210 8093BEE0 4600D306 */ mov.s $f12, $f26 -/* 03214 8093BEE4 E7A000B8 */ swc1 $f0, 0x00B8($sp) -/* 03218 8093BEE8 E7B600A4 */ swc1 $f22, 0x00A4($sp) -/* 0321C 8093BEEC E7B600A8 */ swc1 $f22, 0x00A8($sp) -/* 03220 8093BEF0 E7B600AC */ swc1 $f22, 0x00AC($sp) + +/* 03210 8093BEE0 4600D306 */ mov.s $f12, $f26 +/* 03214 8093BEE4 E7A000B8 */ swc1 $f0, 0x00B8($sp) +/* 03218 8093BEE8 E7B600A4 */ swc1 $f22, 0x00A4($sp) +/* 0321C 8093BEEC E7B600A8 */ swc1 $f22, 0x00A8($sp) +/* 03220 8093BEF0 E7B600AC */ swc1 $f22, 0x00AC($sp) /* 03224 8093BEF4 0C00CFBE */ jal Math_Rand_ZeroFloat - -/* 03228 8093BEF8 4600A306 */ mov.s $f12, $f20 -/* 0322C 8093BEFC 46180480 */ add.s $f18, $f0, $f24 + +/* 03228 8093BEF8 4600A306 */ mov.s $f12, $f20 +/* 0322C 8093BEFC 46180480 */ add.s $f18, $f0, $f24 /* 03230 8093BF00 02C02025 */ or $a0, $s6, $zero ## $a0 = 00000000 /* 03234 8093BF04 02602825 */ or $a1, $s3, $zero ## $a1 = 00000530 /* 03238 8093BF08 02203025 */ or $a2, $s1, $zero ## $a2 = FFFFFF60 -/* 0323C 8093BF0C E7B20010 */ swc1 $f18, 0x0010($sp) +/* 0323C 8093BF0C E7B20010 */ swc1 $f18, 0x0010($sp) /* 03240 8093BF10 86A8001C */ lh $t0, 0x001C($s5) ## 0000001C /* 03244 8093BF14 02403825 */ or $a3, $s2, $zero ## $a3 = FFFFFF54 -/* 03248 8093BF18 0C24E41C */ jal func_80939070 -/* 0324C 8093BF1C AFA80014 */ sw $t0, 0x0014($sp) +/* 03248 8093BF18 0C24E41C */ jal func_80939070 +/* 0324C 8093BF1C AFA80014 */ sw $t0, 0x0014($sp) /* 03250 8093BF20 26100001 */ addiu $s0, $s0, 0x0001 ## $s0 = 00000001 -/* 03254 8093BF24 00108400 */ sll $s0, $s0, 16 -/* 03258 8093BF28 00108403 */ sra $s0, $s0, 16 -/* 0325C 8093BF2C 2A010005 */ slti $at, $s0, 0x0005 -/* 03260 8093BF30 1420FFE4 */ bne $at, $zero, .L8093BEC4 +/* 03254 8093BF24 00108400 */ sll $s0, $s0, 16 +/* 03258 8093BF28 00108403 */ sra $s0, $s0, 16 +/* 0325C 8093BF2C 2A010005 */ slti $at, $s0, 0x0005 +/* 03260 8093BF30 1420FFE4 */ bne $at, $zero, .L8093BEC4 /* 03264 8093BF34 00000000 */ nop -/* 03268 8093BF38 C7A40138 */ lwc1 $f4, 0x0138($sp) +/* 03268 8093BF38 C7A40138 */ lwc1 $f4, 0x0138($sp) /* 0326C 8093BF3C 3C010001 */ lui $at, 0x0001 ## $at = 00010000 /* 03270 8093BF40 34210AFC */ ori $at, $at, 0x0AFC ## $at = 00010AFC /* 03274 8093BF44 3C053F4C */ lui $a1, 0x3F4C ## $a1 = 3F4C0000 /* 03278 8093BF48 3C073E4C */ lui $a3, 0x3E4C ## $a3 = 3E4C0000 /* 0327C 8093BF4C 34E7CCCD */ ori $a3, $a3, 0xCCCD ## $a3 = 3E4CCCCD /* 03280 8093BF50 34A5CCCD */ ori $a1, $a1, 0xCCCD ## $a1 = 3F4CCCCD -/* 03284 8093BF54 02C12021 */ addu $a0, $s6, $at +/* 03284 8093BF54 02C12021 */ addu $a0, $s6, $at /* 03288 8093BF58 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 0328C 8093BF5C 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 03290 8093BF60 E6A40548 */ swc1 $f4, 0x0548($s5) ## 00000548 -/* 03294 8093BF64 1000000D */ beq $zero, $zero, .L8093BF9C +/* 03294 8093BF64 1000000D */ beq $zero, $zero, .L8093BF9C /* 03298 8093BF68 02A02025 */ or $a0, $s5, $zero ## $a0 = 00000000 .L8093BF6C: -/* 0329C 8093BF6C 461A4280 */ add.s $f10, $f8, $f26 -/* 032A0 8093BF70 00108403 */ sra $s0, $s0, 16 -/* 032A4 8093BF74 2A0100C8 */ slti $at, $s0, 0x00C8 -/* 032A8 8093BF78 E7AA0138 */ swc1 $f10, 0x0138($sp) +/* 0329C 8093BF6C 461A4280 */ add.s $f10, $f8, $f26 +/* 032A0 8093BF70 00108403 */ sra $s0, $s0, 16 +/* 032A4 8093BF74 2A0100C8 */ slti $at, $s0, 0x00C8 +/* 032A8 8093BF78 E7AA0138 */ swc1 $f10, 0x0138($sp) /* 032AC 8093BF7C C6A60548 */ lwc1 $f6, 0x0548($s5) ## 00000548 -/* 032B0 8093BF80 460A303C */ c.lt.s $f6, $f10 +/* 032B0 8093BF80 460A303C */ c.lt.s $f6, $f10 /* 032B4 8093BF84 00000000 */ nop -/* 032B8 8093BF88 45030004 */ bc1tl .L8093BF9C +/* 032B8 8093BF88 45030004 */ bc1tl .L8093BF9C /* 032BC 8093BF8C 02A02025 */ or $a0, $s5, $zero ## $a0 = 00000000 -/* 032C0 8093BF90 5420FFA4 */ bnel $at, $zero, .L8093BE24 +/* 032C0 8093BF90 5420FFA4 */ bnel $at, $zero, .L8093BE24 /* 032C4 8093BF94 02402025 */ or $a0, $s2, $zero ## $a0 = FFFFFF54 .L8093BF98: /* 032C8 8093BF98 02A02025 */ or $a0, $s5, $zero ## $a0 = 00000000 .L8093BF9C: -/* 032CC 8093BF9C 0C24EB6D */ jal func_8093ADB4 +/* 032CC 8093BF9C 0C24EB6D */ jal func_8093ADB4 /* 032D0 8093BFA0 26A50024 */ addiu $a1, $s5, 0x0024 ## $a1 = 00000024 -/* 032D4 8093BFA4 50400012 */ beql $v0, $zero, .L8093BFF0 -/* 032D8 8093BFA8 8FA50120 */ lw $a1, 0x0120($sp) +/* 032D4 8093BFA4 50400012 */ beql $v0, $zero, .L8093BFF0 +/* 032D8 8093BFA8 8FA50120 */ lw $a1, 0x0120($sp) /* 032DC 8093BFAC 86B90150 */ lh $t9, 0x0150($s5) ## 00000150 /* 032E0 8093BFB0 02C02025 */ or $a0, $s6, $zero ## $a0 = 00000000 /* 032E4 8093BFB4 02602825 */ or $a1, $s3, $zero ## $a1 = 00000530 /* 032E8 8093BFB8 33290003 */ andi $t1, $t9, 0x0003 ## $t1 = 00000000 -/* 032EC 8093BFBC 1520000B */ bne $t1, $zero, .L8093BFEC +/* 032EC 8093BFBC 1520000B */ bne $t1, $zero, .L8093BFEC /* 032F0 8093BFC0 3C063F00 */ lui $a2, 0x3F00 ## $a2 = 3F000000 /* 032F4 8093BFC4 240A00FF */ addiu $t2, $zero, 0x00FF ## $t2 = 000000FF -/* 032F8 8093BFC8 AFAA0010 */ sw $t2, 0x0010($sp) +/* 032F8 8093BFC8 AFAA0010 */ sw $t2, 0x0010($sp) /* 032FC 8093BFCC 86AB001C */ lh $t3, 0x001C($s5) ## 0000001C /* 03300 8093BFD0 240C0001 */ addiu $t4, $zero, 0x0001 ## $t4 = 00000001 /* 03304 8093BFD4 240D0096 */ addiu $t5, $zero, 0x0096 ## $t5 = 00000096 -/* 03308 8093BFD8 AFAD001C */ sw $t5, 0x001C($sp) -/* 0330C 8093BFDC AFAC0018 */ sw $t4, 0x0018($sp) +/* 03308 8093BFD8 AFAD001C */ sw $t5, 0x001C($sp) +/* 0330C 8093BFDC AFAC0018 */ sw $t4, 0x0018($sp) /* 03310 8093BFE0 3C074040 */ lui $a3, 0x4040 ## $a3 = 40400000 -/* 03314 8093BFE4 0C24E3B0 */ jal func_80938EC0 -/* 03318 8093BFE8 AFAB0014 */ sw $t3, 0x0014($sp) +/* 03314 8093BFE4 0C24E3B0 */ jal func_80938EC0 +/* 03318 8093BFE8 AFAB0014 */ sw $t3, 0x0014($sp) .L8093BFEC: -/* 0331C 8093BFEC 8FA50120 */ lw $a1, 0x0120($sp) +/* 0331C 8093BFEC 8FA50120 */ lw $a1, 0x0120($sp) .L8093BFF0: /* 03320 8093BFF0 02A02025 */ or $a0, $s5, $zero ## $a0 = 00000000 -/* 03324 8093BFF4 0C24EB6D */ jal func_8093ADB4 +/* 03324 8093BFF4 0C24EB6D */ jal func_8093ADB4 /* 03328 8093BFF8 24A50024 */ addiu $a1, $a1, 0x0024 ## $a1 = 00000024 -/* 0332C 8093BFFC 1040004B */ beq $v0, $zero, .L8093C12C -/* 03330 8093C000 8FAF0120 */ lw $t7, 0x0120($sp) +/* 0332C 8093BFFC 1040004B */ beq $v0, $zero, .L8093C12C +/* 03330 8093C000 8FAF0120 */ lw $t7, 0x0120($sp) /* 03334 8093C004 8DF8014C */ lw $t8, 0x014C($t7) ## 0000014C /* 03338 8093C008 3C0E8094 */ lui $t6, %hi(func_8093C2C4) ## $t6 = 80940000 /* 0333C 8093C00C 25CEC2C4 */ addiu $t6, $t6, %lo(func_8093C2C4) ## $t6 = 8093C2C4 -/* 03340 8093C010 11D80046 */ beq $t6, $t8, .L8093C12C +/* 03340 8093C010 11D80046 */ beq $t6, $t8, .L8093C12C /* 03344 8093C014 00008025 */ or $s0, $zero, $zero ## $s0 = 00000000 /* 03348 8093C018 27B30080 */ addiu $s3, $sp, 0x0080 ## $s3 = FFFFFF30 /* 0334C 8093C01C 27B2008C */ addiu $s2, $sp, 0x008C ## $s2 = FFFFFF3C @@ -1024,92 +1024,92 @@ glabel func_8093B1AC .L8093C028: /* 03358 8093C028 44816000 */ mtc1 $at, $f12 ## $f12 = 50.00 /* 0335C 8093C02C 0C00CFC8 */ jal Math_Rand_CenteredFloat - + /* 03360 8093C030 00000000 */ nop -/* 03364 8093C034 8FA80120 */ lw $t0, 0x0120($sp) +/* 03364 8093C034 8FA80120 */ lw $t0, 0x0120($sp) /* 03368 8093C038 3C014248 */ lui $at, 0x4248 ## $at = 42480000 /* 0336C 8093C03C 44816000 */ mtc1 $at, $f12 ## $f12 = 50.00 /* 03370 8093C040 C5120024 */ lwc1 $f18, 0x0024($t0) ## 00000024 -/* 03374 8093C044 46120100 */ add.s $f4, $f0, $f18 +/* 03374 8093C044 46120100 */ add.s $f4, $f0, $f18 /* 03378 8093C048 0C00CFC8 */ jal Math_Rand_CenteredFloat - -/* 0337C 8093C04C E7A40098 */ swc1 $f4, 0x0098($sp) -/* 03380 8093C050 8FB90120 */ lw $t9, 0x0120($sp) + +/* 0337C 8093C04C E7A40098 */ swc1 $f4, 0x0098($sp) +/* 03380 8093C050 8FB90120 */ lw $t9, 0x0120($sp) /* 03384 8093C054 3C014248 */ lui $at, 0x4248 ## $at = 42480000 /* 03388 8093C058 44816000 */ mtc1 $at, $f12 ## $f12 = 50.00 /* 0338C 8093C05C C7280028 */ lwc1 $f8, 0x0028($t9) ## 00000028 -/* 03390 8093C060 46080180 */ add.s $f6, $f0, $f8 +/* 03390 8093C060 46080180 */ add.s $f6, $f0, $f8 /* 03394 8093C064 0C00CFC8 */ jal Math_Rand_CenteredFloat - -/* 03398 8093C068 E7A6009C */ swc1 $f6, 0x009C($sp) -/* 0339C 8093C06C 8FA90120 */ lw $t1, 0x0120($sp) -/* 033A0 8093C070 4600D306 */ mov.s $f12, $f26 + +/* 03398 8093C068 E7A6009C */ swc1 $f6, 0x009C($sp) +/* 0339C 8093C06C 8FA90120 */ lw $t1, 0x0120($sp) +/* 033A0 8093C070 4600D306 */ mov.s $f12, $f26 /* 033A4 8093C074 C52A002C */ lwc1 $f10, 0x002C($t1) ## 0000002C -/* 033A8 8093C078 460A0480 */ add.s $f18, $f0, $f10 +/* 033A8 8093C078 460A0480 */ add.s $f18, $f0, $f10 /* 033AC 8093C07C 0C00CFC8 */ jal Math_Rand_CenteredFloat - -/* 033B0 8093C080 E7B200A0 */ swc1 $f18, 0x00A0($sp) -/* 033B4 8093C084 E7A0008C */ swc1 $f0, 0x008C($sp) + +/* 033B0 8093C080 E7B200A0 */ swc1 $f18, 0x00A0($sp) +/* 033B4 8093C084 E7A0008C */ swc1 $f0, 0x008C($sp) /* 033B8 8093C088 0C00CFC8 */ jal Math_Rand_CenteredFloat - -/* 033BC 8093C08C 4600D306 */ mov.s $f12, $f26 -/* 033C0 8093C090 E7A00090 */ swc1 $f0, 0x0090($sp) + +/* 033BC 8093C08C 4600D306 */ mov.s $f12, $f26 +/* 033C0 8093C090 E7A00090 */ swc1 $f0, 0x0090($sp) /* 033C4 8093C094 0C00CFC8 */ jal Math_Rand_CenteredFloat - -/* 033C8 8093C098 4600D306 */ mov.s $f12, $f26 -/* 033CC 8093C09C E7A00094 */ swc1 $f0, 0x0094($sp) -/* 033D0 8093C0A0 E7B60080 */ swc1 $f22, 0x0080($sp) -/* 033D4 8093C0A4 E7B60084 */ swc1 $f22, 0x0084($sp) -/* 033D8 8093C0A8 E7B60088 */ swc1 $f22, 0x0088($sp) + +/* 033C8 8093C098 4600D306 */ mov.s $f12, $f26 +/* 033CC 8093C09C E7A00094 */ swc1 $f0, 0x0094($sp) +/* 033D0 8093C0A0 E7B60080 */ swc1 $f22, 0x0080($sp) +/* 033D4 8093C0A4 E7B60084 */ swc1 $f22, 0x0084($sp) +/* 033D8 8093C0A8 E7B60088 */ swc1 $f22, 0x0088($sp) /* 033DC 8093C0AC 0C00CFBE */ jal Math_Rand_ZeroFloat - -/* 033E0 8093C0B0 4600A306 */ mov.s $f12, $f20 -/* 033E4 8093C0B4 46180100 */ add.s $f4, $f0, $f24 + +/* 033E0 8093C0B0 4600A306 */ mov.s $f12, $f20 +/* 033E4 8093C0B4 46180100 */ add.s $f4, $f0, $f24 /* 033E8 8093C0B8 02C02025 */ or $a0, $s6, $zero ## $a0 = 00000000 /* 033EC 8093C0BC 02202825 */ or $a1, $s1, $zero ## $a1 = FFFFFF48 /* 033F0 8093C0C0 02403025 */ or $a2, $s2, $zero ## $a2 = FFFFFF3C -/* 033F4 8093C0C4 E7A40010 */ swc1 $f4, 0x0010($sp) +/* 033F4 8093C0C4 E7A40010 */ swc1 $f4, 0x0010($sp) /* 033F8 8093C0C8 86AA001C */ lh $t2, 0x001C($s5) ## 0000001C /* 033FC 8093C0CC 02603825 */ or $a3, $s3, $zero ## $a3 = FFFFFF30 -/* 03400 8093C0D0 0C24E41C */ jal func_80939070 -/* 03404 8093C0D4 AFAA0014 */ sw $t2, 0x0014($sp) +/* 03400 8093C0D0 0C24E41C */ jal func_80939070 +/* 03404 8093C0D4 AFAA0014 */ sw $t2, 0x0014($sp) /* 03408 8093C0D8 26100001 */ addiu $s0, $s0, 0x0001 ## $s0 = 00000001 -/* 0340C 8093C0DC 00108400 */ sll $s0, $s0, 16 -/* 03410 8093C0E0 00108403 */ sra $s0, $s0, 16 -/* 03414 8093C0E4 2A010032 */ slti $at, $s0, 0x0032 -/* 03418 8093C0E8 5420FFCF */ bnel $at, $zero, .L8093C028 +/* 0340C 8093C0DC 00108400 */ sll $s0, $s0, 16 +/* 03410 8093C0E0 00108403 */ sra $s0, $s0, 16 +/* 03414 8093C0E4 2A010032 */ slti $at, $s0, 0x0032 +/* 03418 8093C0E8 5420FFCF */ bnel $at, $zero, .L8093C028 /* 0341C 8093C0EC 3C014248 */ lui $at, 0x4248 ## $at = 42480000 -/* 03420 8093C0F0 8FA40120 */ lw $a0, 0x0120($sp) -/* 03424 8093C0F4 0C24F097 */ jal func_8093C25C +/* 03420 8093C0F0 8FA40120 */ lw $a0, 0x0120($sp) +/* 03424 8093C0F4 0C24F097 */ jal func_8093C25C /* 03428 8093C0F8 02C02825 */ or $a1, $s6, $zero ## $a1 = 00000000 -/* 0342C 8093C0FC 8FA40120 */ lw $a0, 0x0120($sp) +/* 0342C 8093C0FC 8FA40120 */ lw $a0, 0x0120($sp) /* 03430 8093C100 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 03434 8093C104 24053916 */ addiu $a1, $zero, 0x3916 ## $a1 = 00003916 /* 03438 8093C108 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 /* 0343C 8093C10C 44814000 */ mtc1 $at, $f8 ## $f8 = 1.00 /* 03440 8093C110 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 03444 8093C114 00360821 */ addu $at, $at, $s6 +/* 03444 8093C114 00360821 */ addu $at, $at, $s6 /* 03448 8093C118 E4280AFC */ swc1 $f8, 0x0AFC($at) ## 00010AFC -/* 0344C 8093C11C 8FAB0120 */ lw $t3, 0x0120($sp) +/* 0344C 8093C11C 8FAB0120 */ lw $t3, 0x0120($sp) /* 03450 8093C120 916C00AF */ lbu $t4, 0x00AF($t3) ## 000000AF /* 03454 8093C124 258D0001 */ addiu $t5, $t4, 0x0001 ## $t5 = 00000001 /* 03458 8093C128 A16D00AF */ sb $t5, 0x00AF($t3) ## 000000AF .L8093C12C: -/* 0345C 8093C12C 8FBF0064 */ lw $ra, 0x0064($sp) +/* 0345C 8093C12C 8FBF0064 */ lw $ra, 0x0064($sp) .L8093C130: -/* 03460 8093C130 D7B40028 */ ldc1 $f20, 0x0028($sp) -/* 03464 8093C134 D7B60030 */ ldc1 $f22, 0x0030($sp) -/* 03468 8093C138 D7B80038 */ ldc1 $f24, 0x0038($sp) -/* 0346C 8093C13C D7BA0040 */ ldc1 $f26, 0x0040($sp) -/* 03470 8093C140 8FB00048 */ lw $s0, 0x0048($sp) -/* 03474 8093C144 8FB1004C */ lw $s1, 0x004C($sp) -/* 03478 8093C148 8FB20050 */ lw $s2, 0x0050($sp) -/* 0347C 8093C14C 8FB30054 */ lw $s3, 0x0054($sp) -/* 03480 8093C150 8FB40058 */ lw $s4, 0x0058($sp) -/* 03484 8093C154 8FB5005C */ lw $s5, 0x005C($sp) -/* 03488 8093C158 8FB60060 */ lw $s6, 0x0060($sp) -/* 0348C 8093C15C 03E00008 */ jr $ra +/* 03460 8093C130 D7B40028 */ ldc1 $f20, 0x0028($sp) +/* 03464 8093C134 D7B60030 */ ldc1 $f22, 0x0030($sp) +/* 03468 8093C138 D7B80038 */ ldc1 $f24, 0x0038($sp) +/* 0346C 8093C13C D7BA0040 */ ldc1 $f26, 0x0040($sp) +/* 03470 8093C140 8FB00048 */ lw $s0, 0x0048($sp) +/* 03474 8093C144 8FB1004C */ lw $s1, 0x004C($sp) +/* 03478 8093C148 8FB20050 */ lw $s2, 0x0050($sp) +/* 0347C 8093C14C 8FB30054 */ lw $s3, 0x0054($sp) +/* 03480 8093C150 8FB40058 */ lw $s4, 0x0058($sp) +/* 03484 8093C154 8FB5005C */ lw $s5, 0x005C($sp) +/* 03488 8093C158 8FB60060 */ lw $s6, 0x0060($sp) +/* 0348C 8093C15C 03E00008 */ jr $ra /* 03490 8093C160 27BD0150 */ addiu $sp, $sp, 0x0150 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093C164.s b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093C164.s index 97e73bae2e..9dee0e0654 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093C164.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093C164.s @@ -1,28 +1,28 @@ glabel func_8093C164 /* 03494 8093C164 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 03498 8093C168 AFA5001C */ sw $a1, 0x001C($sp) +/* 03498 8093C168 AFA5001C */ sw $a1, 0x001C($sp) /* 0349C 8093C16C 3C0E8094 */ lui $t6, %hi(func_8093C1C4) ## $t6 = 80940000 -/* 034A0 8093C170 AFBF0014 */ sw $ra, 0x0014($sp) +/* 034A0 8093C170 AFBF0014 */ sw $ra, 0x0014($sp) /* 034A4 8093C174 25CEC1C4 */ addiu $t6, $t6, %lo(func_8093C1C4) ## $t6 = 8093C1C4 /* 034A8 8093C178 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 /* 034AC 8093C17C AC8E014C */ sw $t6, 0x014C($a0) ## 0000014C /* 034B0 8093C180 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 034B4 8093C184 24A54548 */ addiu $a1, $a1, 0x4548 ## $a1 = 06004548 -/* 034B8 8093C188 AFA70018 */ sw $a3, 0x0018($sp) +/* 034B8 8093C188 AFA70018 */ sw $a3, 0x0018($sp) /* 034BC 8093C18C 24840568 */ addiu $a0, $a0, 0x0568 ## $a0 = 00000568 -/* 034C0 8093C190 0C029490 */ jal func_800A5240 +/* 034C0 8093C190 0C029490 */ jal SkelAnime_ChangeAnimTransitionStop /* 034C4 8093C194 24060000 */ addiu $a2, $zero, 0x0000 ## $a2 = 00000000 /* 034C8 8093C198 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 /* 034CC 8093C19C 0C028800 */ jal SkelAnime_GetFrameCount - + /* 034D0 8093C1A0 24844548 */ addiu $a0, $a0, 0x4548 ## $a0 = 06004548 /* 034D4 8093C1A4 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 -/* 034D8 8093C1A8 8FAF0018 */ lw $t7, 0x0018($sp) -/* 034DC 8093C1AC 468021A0 */ cvt.s.w $f6, $f4 +/* 034D8 8093C1A8 8FAF0018 */ lw $t7, 0x0018($sp) +/* 034DC 8093C1AC 468021A0 */ cvt.s.w $f6, $f4 /* 034E0 8093C1B0 E5E601A4 */ swc1 $f6, 0x01A4($t7) ## 000001A4 -/* 034E4 8093C1B4 8FBF0014 */ lw $ra, 0x0014($sp) +/* 034E4 8093C1B4 8FBF0014 */ lw $ra, 0x0014($sp) /* 034E8 8093C1B8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 034EC 8093C1BC 03E00008 */ jr $ra +/* 034EC 8093C1BC 03E00008 */ jr $ra /* 034F0 8093C1C0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093C25C.s b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093C25C.s index 25c28e4f7b..0ac54a4e21 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093C25C.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093C25C.s @@ -1,30 +1,30 @@ glabel func_8093C25C /* 0358C 8093C25C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 03590 8093C260 AFA5001C */ sw $a1, 0x001C($sp) +/* 03590 8093C260 AFA5001C */ sw $a1, 0x001C($sp) /* 03594 8093C264 3C0E8094 */ lui $t6, %hi(func_8093C2C4) ## $t6 = 80940000 -/* 03598 8093C268 AFBF0014 */ sw $ra, 0x0014($sp) +/* 03598 8093C268 AFBF0014 */ sw $ra, 0x0014($sp) /* 0359C 8093C26C 25CEC2C4 */ addiu $t6, $t6, %lo(func_8093C2C4) ## $t6 = 8093C2C4 /* 035A0 8093C270 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 /* 035A4 8093C274 AC8E014C */ sw $t6, 0x014C($a0) ## 0000014C /* 035A8 8093C278 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 035AC 8093C27C 24A5578C */ addiu $a1, $a1, 0x578C ## $a1 = 0600578C -/* 035B0 8093C280 AFA70018 */ sw $a3, 0x0018($sp) +/* 035B0 8093C280 AFA70018 */ sw $a3, 0x0018($sp) /* 035B4 8093C284 24840568 */ addiu $a0, $a0, 0x0568 ## $a0 = 00000568 -/* 035B8 8093C288 0C029490 */ jal func_800A5240 +/* 035B8 8093C288 0C029490 */ jal SkelAnime_ChangeAnimTransitionStop /* 035BC 8093C28C 24060000 */ addiu $a2, $zero, 0x0000 ## $a2 = 00000000 -/* 035C0 8093C290 8FA70018 */ lw $a3, 0x0018($sp) +/* 035C0 8093C290 8FA70018 */ lw $a3, 0x0018($sp) /* 035C4 8093C294 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 /* 035C8 8093C298 240F0035 */ addiu $t7, $zero, 0x0035 ## $t7 = 00000035 /* 035CC 8093C29C 84F8001C */ lh $t8, 0x001C($a3) ## 0000001C /* 035D0 8093C2A0 24190014 */ addiu $t9, $zero, 0x0014 ## $t9 = 00000014 /* 035D4 8093C2A4 A4EF0178 */ sh $t7, 0x0178($a3) ## 00000178 -/* 035D8 8093C2A8 17000002 */ bne $t8, $zero, .L8093C2B4 +/* 035D8 8093C2A8 17000002 */ bne $t8, $zero, .L8093C2B4 /* 035DC 8093C2AC E4E40068 */ swc1 $f4, 0x0068($a3) ## 00000068 /* 035E0 8093C2B0 A4F9015C */ sh $t9, 0x015C($a3) ## 0000015C .L8093C2B4: -/* 035E4 8093C2B4 8FBF0014 */ lw $ra, 0x0014($sp) +/* 035E4 8093C2B4 8FBF0014 */ lw $ra, 0x0014($sp) /* 035E8 8093C2B8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 035EC 8093C2BC 03E00008 */ jr $ra +/* 035EC 8093C2BC 03E00008 */ jr $ra /* 035F0 8093C2C0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093C2C4.s b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093C2C4.s index 1d4ba6887f..5863f4768b 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093C2C4.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093C2C4.s @@ -1,166 +1,166 @@ glabel func_8093C2C4 /* 035F4 8093C2C4 27BDFF98 */ addiu $sp, $sp, 0xFF98 ## $sp = FFFFFF98 -/* 035F8 8093C2C8 AFB00030 */ sw $s0, 0x0030($sp) +/* 035F8 8093C2C8 AFB00030 */ sw $s0, 0x0030($sp) /* 035FC 8093C2CC 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 03600 8093C2D0 AFBF0034 */ sw $ra, 0x0034($sp) +/* 03600 8093C2D0 AFBF0034 */ sw $ra, 0x0034($sp) /* 03604 8093C2D4 24840568 */ addiu $a0, $a0, 0x0568 ## $a0 = 00000568 -/* 03608 8093C2D8 AFA5006C */ sw $a1, 0x006C($sp) +/* 03608 8093C2D8 AFA5006C */ sw $a1, 0x006C($sp) /* 0360C 8093C2DC 0C02927F */ jal SkelAnime_FrameUpdateMatrix - -/* 03610 8093C2E0 AFA4003C */ sw $a0, 0x003C($sp) + +/* 03610 8093C2E0 AFA4003C */ sw $a0, 0x003C($sp) /* 03614 8093C2E4 860E0150 */ lh $t6, 0x0150($s0) ## 00000150 /* 03618 8093C2E8 3C0142A0 */ lui $at, 0x42A0 ## $at = 42A00000 /* 0361C 8093C2EC 31CF0003 */ andi $t7, $t6, 0x0003 ## $t7 = 00000000 -/* 03620 8093C2F0 55E00032 */ bnel $t7, $zero, .L8093C3BC +/* 03620 8093C2F0 55E00032 */ bnel $t7, $zero, .L8093C3BC /* 03624 8093C2F4 8608001C */ lh $t0, 0x001C($s0) ## 0000001C /* 03628 8093C2F8 44816000 */ mtc1 $at, $f12 ## $f12 = 80.00 /* 0362C 8093C2FC 0C00CFC8 */ jal Math_Rand_CenteredFloat - + /* 03630 8093C300 00000000 */ nop /* 03634 8093C304 C6040024 */ lwc1 $f4, 0x0024($s0) ## 00000024 /* 03638 8093C308 3C0142A0 */ lui $at, 0x42A0 ## $at = 42A00000 /* 0363C 8093C30C 44816000 */ mtc1 $at, $f12 ## $f12 = 80.00 -/* 03640 8093C310 46040180 */ add.s $f6, $f0, $f4 +/* 03640 8093C310 46040180 */ add.s $f6, $f0, $f4 /* 03644 8093C314 0C00CFC8 */ jal Math_Rand_CenteredFloat - -/* 03648 8093C318 E7A6005C */ swc1 $f6, 0x005C($sp) + +/* 03648 8093C318 E7A6005C */ swc1 $f6, 0x005C($sp) /* 0364C 8093C31C C6080028 */ lwc1 $f8, 0x0028($s0) ## 00000028 /* 03650 8093C320 3C0142A0 */ lui $at, 0x42A0 ## $at = 42A00000 /* 03654 8093C324 44816000 */ mtc1 $at, $f12 ## $f12 = 80.00 -/* 03658 8093C328 46080280 */ add.s $f10, $f0, $f8 +/* 03658 8093C328 46080280 */ add.s $f10, $f0, $f8 /* 0365C 8093C32C 0C00CFC8 */ jal Math_Rand_CenteredFloat - -/* 03660 8093C330 E7AA0060 */ swc1 $f10, 0x0060($sp) + +/* 03660 8093C330 E7AA0060 */ swc1 $f10, 0x0060($sp) /* 03664 8093C334 C610002C */ lwc1 $f16, 0x002C($s0) ## 0000002C /* 03668 8093C338 44801000 */ mtc1 $zero, $f2 ## $f2 = 0.00 /* 0366C 8093C33C 3C018095 */ lui $at, %hi(D_8094AF0C) ## $at = 80950000 -/* 03670 8093C340 46100480 */ add.s $f18, $f0, $f16 -/* 03674 8093C344 C424AF0C */ lwc1 $f4, %lo(D_8094AF0C)($at) +/* 03670 8093C340 46100480 */ add.s $f18, $f0, $f16 +/* 03674 8093C344 C424AF0C */ lwc1 $f4, %lo(D_8094AF0C)($at) /* 03678 8093C348 3C014120 */ lui $at, 0x4120 ## $at = 41200000 /* 0367C 8093C34C 44816000 */ mtc1 $at, $f12 ## $f12 = 10.00 -/* 03680 8093C350 E7B20064 */ swc1 $f18, 0x0064($sp) -/* 03684 8093C354 E7A20050 */ swc1 $f2, 0x0050($sp) -/* 03688 8093C358 E7A20054 */ swc1 $f2, 0x0054($sp) -/* 0368C 8093C35C E7A20058 */ swc1 $f2, 0x0058($sp) -/* 03690 8093C360 E7A20044 */ swc1 $f2, 0x0044($sp) -/* 03694 8093C364 E7A2004C */ swc1 $f2, 0x004C($sp) +/* 03680 8093C350 E7B20064 */ swc1 $f18, 0x0064($sp) +/* 03684 8093C354 E7A20050 */ swc1 $f2, 0x0050($sp) +/* 03688 8093C358 E7A20054 */ swc1 $f2, 0x0054($sp) +/* 0368C 8093C35C E7A20058 */ swc1 $f2, 0x0058($sp) +/* 03690 8093C360 E7A20044 */ swc1 $f2, 0x0044($sp) +/* 03694 8093C364 E7A2004C */ swc1 $f2, 0x004C($sp) /* 03698 8093C368 0C00CFBE */ jal Math_Rand_ZeroFloat - -/* 0369C 8093C36C E7A40048 */ swc1 $f4, 0x0048($sp) + +/* 0369C 8093C36C E7A40048 */ swc1 $f4, 0x0048($sp) /* 036A0 8093C370 3C014170 */ lui $at, 0x4170 ## $at = 41700000 /* 036A4 8093C374 44813000 */ mtc1 $at, $f6 ## $f6 = 15.00 /* 036A8 8093C378 8605001C */ lh $a1, 0x001C($s0) ## 0000001C /* 036AC 8093C37C 27B80044 */ addiu $t8, $sp, 0x0044 ## $t8 = FFFFFFDC -/* 036B0 8093C380 46060200 */ add.s $f8, $f0, $f6 +/* 036B0 8093C380 46060200 */ add.s $f8, $f0, $f6 /* 036B4 8093C384 24A50002 */ addiu $a1, $a1, 0x0002 ## $a1 = 00000002 -/* 036B8 8093C388 00052C00 */ sll $a1, $a1, 16 +/* 036B8 8093C388 00052C00 */ sll $a1, $a1, 16 /* 036BC 8093C38C 24190096 */ addiu $t9, $zero, 0x0096 ## $t9 = 00000096 -/* 036C0 8093C390 AFB90020 */ sw $t9, 0x0020($sp) -/* 036C4 8093C394 00052C03 */ sra $a1, $a1, 16 -/* 036C8 8093C398 E7A80014 */ swc1 $f8, 0x0014($sp) -/* 036CC 8093C39C AFB80010 */ sw $t8, 0x0010($sp) -/* 036D0 8093C3A0 AFA0001C */ sw $zero, 0x001C($sp) -/* 036D4 8093C3A4 AFA00018 */ sw $zero, 0x0018($sp) -/* 036D8 8093C3A8 8FA4006C */ lw $a0, 0x006C($sp) +/* 036C0 8093C390 AFB90020 */ sw $t9, 0x0020($sp) +/* 036C4 8093C394 00052C03 */ sra $a1, $a1, 16 +/* 036C8 8093C398 E7A80014 */ swc1 $f8, 0x0014($sp) +/* 036CC 8093C39C AFB80010 */ sw $t8, 0x0010($sp) +/* 036D0 8093C3A0 AFA0001C */ sw $zero, 0x001C($sp) +/* 036D4 8093C3A4 AFA00018 */ sw $zero, 0x0018($sp) +/* 036D8 8093C3A8 8FA4006C */ lw $a0, 0x006C($sp) /* 036DC 8093C3AC 27A6005C */ addiu $a2, $sp, 0x005C ## $a2 = FFFFFFF4 -/* 036E0 8093C3B0 0C24E371 */ jal func_80938DC4 +/* 036E0 8093C3B0 0C24E371 */ jal func_80938DC4 /* 036E4 8093C3B4 27A70050 */ addiu $a3, $sp, 0x0050 ## $a3 = FFFFFFE8 /* 036E8 8093C3B8 8608001C */ lh $t0, 0x001C($s0) ## 0000001C .L8093C3BC: /* 036EC 8093C3BC 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 /* 036F0 8093C3C0 260401D4 */ addiu $a0, $s0, 0x01D4 ## $a0 = 000001D4 -/* 036F4 8093C3C4 15010019 */ bne $t0, $at, .L8093C42C +/* 036F4 8093C3C4 15010019 */ bne $t0, $at, .L8093C42C /* 036F8 8093C3C8 3C05437F */ lui $a1, 0x437F ## $a1 = 437F0000 /* 036FC 8093C3CC 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 03700 8093C3D0 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 03704 8093C3D4 3C0741F0 */ lui $a3, 0x41F0 ## $a3 = 41F00000 /* 03708 8093C3D8 260401D8 */ addiu $a0, $s0, 0x01D8 ## $a0 = 000001D8 /* 0370C 8093C3DC 3C05437F */ lui $a1, 0x437F ## $a1 = 437F0000 /* 03710 8093C3E0 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 03714 8093C3E4 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 03718 8093C3E8 3C0741F0 */ lui $a3, 0x41F0 ## $a3 = 41F00000 /* 0371C 8093C3EC 260401DC */ addiu $a0, $s0, 0x01DC ## $a0 = 000001DC /* 03720 8093C3F0 3C05437F */ lui $a1, 0x437F ## $a1 = 437F0000 /* 03724 8093C3F4 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 03728 8093C3F8 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 0372C 8093C3FC 3C0741F0 */ lui $a3, 0x41F0 ## $a3 = 41F00000 /* 03730 8093C400 260401E0 */ addiu $a0, $s0, 0x01E0 ## $a0 = 000001E0 /* 03734 8093C404 3C054461 */ lui $a1, 0x4461 ## $a1 = 44610000 /* 03738 8093C408 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 0373C 8093C40C 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 03740 8093C410 3C0741F0 */ lui $a3, 0x41F0 ## $a3 = 41F00000 /* 03744 8093C414 3C054489 */ lui $a1, 0x4489 ## $a1 = 44890000 /* 03748 8093C418 34A56000 */ ori $a1, $a1, 0x6000 ## $a1 = 44896000 /* 0374C 8093C41C 260401E4 */ addiu $a0, $s0, 0x01E4 ## $a0 = 000001E4 /* 03750 8093C420 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 03754 8093C424 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 03758 8093C428 3C0741F0 */ lui $a3, 0x41F0 ## $a3 = 41F00000 .L8093C42C: /* 0375C 8093C42C 86040150 */ lh $a0, 0x0150($s0) ## 00000150 -/* 03760 8093C430 00800821 */ addu $at, $a0, $zero -/* 03764 8093C434 00042080 */ sll $a0, $a0, 2 -/* 03768 8093C438 00812023 */ subu $a0, $a0, $at -/* 0376C 8093C43C 00042100 */ sll $a0, $a0, 4 -/* 03770 8093C440 00812023 */ subu $a0, $a0, $at -/* 03774 8093C444 000420C0 */ sll $a0, $a0, 3 -/* 03778 8093C448 00812023 */ subu $a0, $a0, $at -/* 0377C 8093C44C 00042080 */ sll $a0, $a0, 2 -/* 03780 8093C450 00042400 */ sll $a0, $a0, 16 +/* 03760 8093C430 00800821 */ addu $at, $a0, $zero +/* 03764 8093C434 00042080 */ sll $a0, $a0, 2 +/* 03768 8093C438 00812023 */ subu $a0, $a0, $at +/* 0376C 8093C43C 00042100 */ sll $a0, $a0, 4 +/* 03770 8093C440 00812023 */ subu $a0, $a0, $at +/* 03774 8093C444 000420C0 */ sll $a0, $a0, 3 +/* 03778 8093C448 00812023 */ subu $a0, $a0, $at +/* 0377C 8093C44C 00042080 */ sll $a0, $a0, 2 +/* 03780 8093C450 00042400 */ sll $a0, $a0, 16 /* 03784 8093C454 0C01DE1C */ jal Math_Sins ## sins? -/* 03788 8093C458 00042403 */ sra $a0, $a0, 16 +/* 03788 8093C458 00042403 */ sra $a0, $a0, 16 /* 0378C 8093C45C 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 /* 03790 8093C460 44815000 */ mtc1 $at, $f10 ## $f10 = 20.00 /* 03794 8093C464 3C0143AF */ lui $at, 0x43AF ## $at = 43AF0000 /* 03798 8093C468 44819000 */ mtc1 $at, $f18 ## $f18 = 350.00 -/* 0379C 8093C46C 460A0402 */ mul.s $f16, $f0, $f10 +/* 0379C 8093C46C 460A0402 */ mul.s $f16, $f0, $f10 /* 037A0 8093C470 3C014248 */ lui $at, 0x4248 ## $at = 42480000 /* 037A4 8093C474 44813000 */ mtc1 $at, $f6 ## $f6 = 50.00 /* 037A8 8093C478 3C063DCC */ lui $a2, 0x3DCC ## $a2 = 3DCC0000 /* 037AC 8093C47C 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3DCCCCCD /* 037B0 8093C480 26040028 */ addiu $a0, $s0, 0x0028 ## $a0 = 00000028 /* 037B4 8093C484 8E070068 */ lw $a3, 0x0068($s0) ## 00000068 -/* 037B8 8093C488 46128100 */ add.s $f4, $f16, $f18 -/* 037BC 8093C48C 46062200 */ add.s $f8, $f4, $f6 -/* 037C0 8093C490 44054000 */ mfc1 $a1, $f8 +/* 037B8 8093C488 46128100 */ add.s $f4, $f16, $f18 +/* 037BC 8093C48C 46062200 */ add.s $f8, $f4, $f6 +/* 037C0 8093C490 44054000 */ mfc1 $a1, $f8 /* 037C4 8093C494 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 037C8 8093C498 00000000 */ nop /* 037CC 8093C49C 26040068 */ addiu $a0, $s0, 0x0068 ## $a0 = 00000068 /* 037D0 8093C4A0 3C0540A0 */ lui $a1, 0x40A0 ## $a1 = 40A00000 /* 037D4 8093C4A4 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 037D8 8093C4A8 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 037DC 8093C4AC 3C073F80 */ lui $a3, 0x3F80 ## $a3 = 3F800000 /* 037E0 8093C4B0 3C014248 */ lui $at, 0x4248 ## $at = 42480000 /* 037E4 8093C4B4 44810000 */ mtc1 $at, $f0 ## $f0 = 50.00 /* 037E8 8093C4B8 C60A0028 */ lwc1 $f10, 0x0028($s0) ## 00000028 /* 037EC 8093C4BC 3C0142C8 */ lui $at, 0x42C8 ## $at = 42C80000 /* 037F0 8093C4C0 44819000 */ mtc1 $at, $f18 ## $f18 = 100.00 -/* 037F4 8093C4C4 46005401 */ sub.s $f16, $f10, $f0 +/* 037F4 8093C4C4 46005401 */ sub.s $f16, $f10, $f0 /* 037F8 8093C4C8 24090004 */ addiu $t1, $zero, 0x0004 ## $t1 = 00000004 -/* 037FC 8093C4CC 44060000 */ mfc1 $a2, $f0 -/* 03800 8093C4D0 44070000 */ mfc1 $a3, $f0 +/* 037FC 8093C4CC 44060000 */ mfc1 $a2, $f0 +/* 03800 8093C4D0 44070000 */ mfc1 $a3, $f0 /* 03804 8093C4D4 E6100028 */ swc1 $f16, 0x0028($s0) ## 00000028 -/* 03808 8093C4D8 AFA90014 */ sw $t1, 0x0014($sp) -/* 0380C 8093C4DC 8FA4006C */ lw $a0, 0x006C($sp) +/* 03808 8093C4D8 AFA90014 */ sw $t1, 0x0014($sp) +/* 0380C 8093C4DC 8FA4006C */ lw $a0, 0x006C($sp) /* 03810 8093C4E0 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 03814 8093C4E4 0C00B92D */ jal func_8002E4B4 -/* 03818 8093C4E8 E7B20010 */ swc1 $f18, 0x0010($sp) +/* 03814 8093C4E4 0C00B92D */ jal func_8002E4B4 +/* 03818 8093C4E8 E7B20010 */ swc1 $f18, 0x0010($sp) /* 0381C 8093C4EC 3C014248 */ lui $at, 0x4248 ## $at = 42480000 /* 03820 8093C4F0 44813000 */ mtc1 $at, $f6 ## $f6 = 50.00 /* 03824 8093C4F4 C6040028 */ lwc1 $f4, 0x0028($s0) ## 00000028 /* 03828 8093C4F8 960A0088 */ lhu $t2, 0x0088($s0) ## 00000088 /* 0382C 8093C4FC 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 03830 8093C500 46062200 */ add.s $f8, $f4, $f6 +/* 03830 8093C500 46062200 */ add.s $f8, $f4, $f6 /* 03834 8093C504 314B0001 */ andi $t3, $t2, 0x0001 ## $t3 = 00000000 /* 03838 8093C508 24A56530 */ addiu $a1, $a1, 0x6530 ## $a1 = 06006530 -/* 0383C 8093C50C 11600004 */ beq $t3, $zero, .L8093C520 +/* 0383C 8093C50C 11600004 */ beq $t3, $zero, .L8093C520 /* 03840 8093C510 E6080028 */ swc1 $f8, 0x0028($s0) ## 00000028 /* 03844 8093C514 44805000 */ mtc1 $zero, $f10 ## $f10 = 0.00 /* 03848 8093C518 00000000 */ nop @@ -168,33 +168,33 @@ glabel func_8093C2C4 .L8093C520: /* 03850 8093C520 86030178 */ lh $v1, 0x0178($s0) ## 00000178 /* 03854 8093C524 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 03858 8093C528 8FA4003C */ lw $a0, 0x003C($sp) -/* 0385C 8093C52C 1461000A */ bne $v1, $at, .L8093C558 +/* 03858 8093C528 8FA4003C */ lw $a0, 0x003C($sp) +/* 0385C 8093C52C 1461000A */ bne $v1, $at, .L8093C558 /* 03860 8093C530 00000000 */ nop -/* 03864 8093C534 0C029490 */ jal func_800A5240 +/* 03864 8093C534 0C029490 */ jal SkelAnime_ChangeAnimTransitionStop /* 03868 8093C538 24060000 */ addiu $a2, $zero, 0x0000 ## $a2 = 00000000 /* 0386C 8093C53C 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 /* 03870 8093C540 0C028800 */ jal SkelAnime_GetFrameCount - + /* 03874 8093C544 24846530 */ addiu $a0, $a0, 0x6530 ## $a0 = 06006530 /* 03878 8093C548 44828000 */ mtc1 $v0, $f16 ## $f16 = 0.00 /* 0387C 8093C54C 86030178 */ lh $v1, 0x0178($s0) ## 00000178 -/* 03880 8093C550 468084A0 */ cvt.s.w $f18, $f16 +/* 03880 8093C550 468084A0 */ cvt.s.w $f18, $f16 /* 03884 8093C554 E61201A4 */ swc1 $f18, 0x01A4($s0) ## 000001A4 .L8093C558: -/* 03888 8093C558 14600007 */ bne $v1, $zero, .L8093C578 -/* 0388C 8093C55C 8FA4003C */ lw $a0, 0x003C($sp) -/* 03890 8093C560 0C0295B2 */ jal func_800A56C8 +/* 03888 8093C558 14600007 */ bne $v1, $zero, .L8093C578 +/* 0388C 8093C55C 8FA4003C */ lw $a0, 0x003C($sp) +/* 03890 8093C560 0C0295B2 */ jal func_800A56C8 /* 03894 8093C564 8E0501A4 */ lw $a1, 0x01A4($s0) ## 000001A4 -/* 03898 8093C568 10400003 */ beq $v0, $zero, .L8093C578 +/* 03898 8093C568 10400003 */ beq $v0, $zero, .L8093C578 /* 0389C 8093C56C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 038A0 8093C570 0C24E82A */ jal func_8093A0A8 -/* 038A4 8093C574 8FA5006C */ lw $a1, 0x006C($sp) +/* 038A0 8093C570 0C24E82A */ jal func_8093A0A8 +/* 038A4 8093C574 8FA5006C */ lw $a1, 0x006C($sp) .L8093C578: -/* 038A8 8093C578 8FBF0034 */ lw $ra, 0x0034($sp) -/* 038AC 8093C57C 8FB00030 */ lw $s0, 0x0030($sp) +/* 038A8 8093C578 8FBF0034 */ lw $ra, 0x0034($sp) +/* 038AC 8093C57C 8FB00030 */ lw $s0, 0x0030($sp) /* 038B0 8093C580 27BD0068 */ addiu $sp, $sp, 0x0068 ## $sp = 00000000 -/* 038B4 8093C584 03E00008 */ jr $ra +/* 038B4 8093C584 03E00008 */ jr $ra /* 038B8 8093C588 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093C58C.s b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093C58C.s index c04ca5beec..5935c5c251 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093C58C.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093C58C.s @@ -1,30 +1,30 @@ glabel func_8093C58C /* 038BC 8093C58C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 038C0 8093C590 AFA5001C */ sw $a1, 0x001C($sp) +/* 038C0 8093C590 AFA5001C */ sw $a1, 0x001C($sp) /* 038C4 8093C594 3C0E8094 */ lui $t6, %hi(func_8093C5F4) ## $t6 = 80940000 -/* 038C8 8093C598 AFBF0014 */ sw $ra, 0x0014($sp) +/* 038C8 8093C598 AFBF0014 */ sw $ra, 0x0014($sp) /* 038CC 8093C59C 25CEC5F4 */ addiu $t6, $t6, %lo(func_8093C5F4) ## $t6 = 8093C5F4 /* 038D0 8093C5A0 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 /* 038D4 8093C5A4 AC8E014C */ sw $t6, 0x014C($a0) ## 0000014C /* 038D8 8093C5A8 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 /* 038DC 8093C5AC 24A588C8 */ addiu $a1, $a1, 0x88C8 ## $a1 = 060088C8 -/* 038E0 8093C5B0 AFA70018 */ sw $a3, 0x0018($sp) +/* 038E0 8093C5B0 AFA70018 */ sw $a3, 0x0018($sp) /* 038E4 8093C5B4 24840568 */ addiu $a0, $a0, 0x0568 ## $a0 = 00000568 -/* 038E8 8093C5B8 0C029490 */ jal func_800A5240 +/* 038E8 8093C5B8 0C029490 */ jal SkelAnime_ChangeAnimTransitionStop /* 038EC 8093C5BC 24060000 */ addiu $a2, $zero, 0x0000 ## $a2 = 00000000 /* 038F0 8093C5C0 3C040601 */ lui $a0, 0x0601 ## $a0 = 06010000 /* 038F4 8093C5C4 0C028800 */ jal SkelAnime_GetFrameCount - + /* 038F8 8093C5C8 248488C8 */ addiu $a0, $a0, 0x88C8 ## $a0 = 060088C8 /* 038FC 8093C5CC 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 -/* 03900 8093C5D0 8FA70018 */ lw $a3, 0x0018($sp) +/* 03900 8093C5D0 8FA70018 */ lw $a3, 0x0018($sp) /* 03904 8093C5D4 44804000 */ mtc1 $zero, $f8 ## $f8 = 0.00 -/* 03908 8093C5D8 468021A0 */ cvt.s.w $f6, $f4 +/* 03908 8093C5D8 468021A0 */ cvt.s.w $f6, $f4 /* 0390C 8093C5DC E4E80068 */ swc1 $f8, 0x0068($a3) ## 00000068 /* 03910 8093C5E0 E4E601A4 */ swc1 $f6, 0x01A4($a3) ## 000001A4 -/* 03914 8093C5E4 8FBF0014 */ lw $ra, 0x0014($sp) +/* 03914 8093C5E4 8FBF0014 */ lw $ra, 0x0014($sp) /* 03918 8093C5E8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 0391C 8093C5EC 03E00008 */ jr $ra +/* 0391C 8093C5EC 03E00008 */ jr $ra /* 03920 8093C5F0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093C684.s b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093C684.s index 4690391c77..bd16c67776 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093C684.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093C684.s @@ -1,36 +1,36 @@ glabel func_8093C684 /* 039B4 8093C684 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 039B8 8093C688 AFB00018 */ sw $s0, 0x0018($sp) -/* 039BC 8093C68C AFA5002C */ sw $a1, 0x002C($sp) +/* 039B8 8093C688 AFB00018 */ sw $s0, 0x0018($sp) +/* 039BC 8093C68C AFA5002C */ sw $a1, 0x002C($sp) /* 039C0 8093C690 3C0E8094 */ lui $t6, %hi(func_8093C700) ## $t6 = 80940000 /* 039C4 8093C694 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 039C8 8093C698 AFBF001C */ sw $ra, 0x001C($sp) +/* 039C8 8093C698 AFBF001C */ sw $ra, 0x001C($sp) /* 039CC 8093C69C 25CEC700 */ addiu $t6, $t6, %lo(func_8093C700) ## $t6 = 8093C700 /* 039D0 8093C6A0 AC8E014C */ sw $t6, 0x014C($a0) ## 0000014C /* 039D4 8093C6A4 24840568 */ addiu $a0, $a0, 0x0568 ## $a0 = 00000568 /* 039D8 8093C6A8 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 039DC 8093C6AC 24A57CA8 */ addiu $a1, $a1, 0x7CA8 ## $a1 = 06007CA8 -/* 039E0 8093C6B0 AFA40024 */ sw $a0, 0x0024($sp) -/* 039E4 8093C6B4 0C029490 */ jal func_800A5240 +/* 039E0 8093C6B0 AFA40024 */ sw $a0, 0x0024($sp) +/* 039E4 8093C6B4 0C029490 */ jal SkelAnime_ChangeAnimTransitionStop /* 039E8 8093C6B8 3C06C040 */ lui $a2, 0xC040 ## $a2 = C0400000 /* 039EC 8093C6BC 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 /* 039F0 8093C6C0 0C028800 */ jal SkelAnime_GetFrameCount - + /* 039F4 8093C6C4 24847CA8 */ addiu $a0, $a0, 0x7CA8 ## $a0 = 06007CA8 /* 039F8 8093C6C8 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 039FC 8093C6CC 44804000 */ mtc1 $zero, $f8 ## $f8 = 0.00 -/* 03A00 8093C6D0 468021A0 */ cvt.s.w $f6, $f4 +/* 03A00 8093C6D0 468021A0 */ cvt.s.w $f6, $f4 /* 03A04 8093C6D4 E6080068 */ swc1 $f8, 0x0068($s0) ## 00000068 /* 03A08 8093C6D8 E60601A4 */ swc1 $f6, 0x01A4($s0) ## 000001A4 /* 03A0C 8093C6DC 0C02927F */ jal SkelAnime_FrameUpdateMatrix - -/* 03A10 8093C6E0 8FA40024 */ lw $a0, 0x0024($sp) + +/* 03A10 8093C6E0 8FA40024 */ lw $a0, 0x0024($sp) /* 03A14 8093C6E4 240F0014 */ addiu $t7, $zero, 0x0014 ## $t7 = 00000014 /* 03A18 8093C6E8 A60F0178 */ sh $t7, 0x0178($s0) ## 00000178 -/* 03A1C 8093C6EC 8FBF001C */ lw $ra, 0x001C($sp) -/* 03A20 8093C6F0 8FB00018 */ lw $s0, 0x0018($sp) +/* 03A1C 8093C6EC 8FBF001C */ lw $ra, 0x001C($sp) +/* 03A20 8093C6F0 8FB00018 */ lw $s0, 0x0018($sp) /* 03A24 8093C6F4 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 03A28 8093C6F8 03E00008 */ jr $ra +/* 03A28 8093C6F8 03E00008 */ jr $ra /* 03A2C 8093C6FC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093C79C.s b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093C79C.s index 4176c72e93..022ae152b2 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093C79C.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093C79C.s @@ -1,8 +1,8 @@ glabel func_8093C79C /* 03ACC 8093C79C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 03AD0 8093C7A0 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 03AD4 8093C7A4 AFBF0014 */ sw $ra, 0x0014($sp) -/* 03AD8 8093C7A8 AFA5001C */ sw $a1, 0x001C($sp) +/* 03AD4 8093C7A4 AFBF0014 */ sw $ra, 0x0014($sp) +/* 03AD8 8093C7A8 AFA5001C */ sw $a1, 0x001C($sp) /* 03ADC 8093C7AC 3C0E8094 */ lui $t6, %hi(func_8093C7E4) ## $t6 = 80940000 /* 03AE0 8093C7B0 25CEC7E4 */ addiu $t6, $t6, %lo(func_8093C7E4) ## $t6 = 8093C7E4 /* 03AE4 8093C7B4 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 @@ -11,11 +11,11 @@ glabel func_8093C79C /* 03AF0 8093C7C0 24840568 */ addiu $a0, $a0, 0x0568 ## $a0 = 00000568 /* 03AF4 8093C7C4 3C06C120 */ lui $a2, 0xC120 ## $a2 = C1200000 /* 03AF8 8093C7C8 E480FF60 */ swc1 $f0, -0x00A0($a0) ## 000004C8 -/* 03AFC 8093C7CC 0C0294D3 */ jal func_800A534C +/* 03AFC 8093C7CC 0C0294D3 */ jal SkelAnime_ChangeAnimTransitionRepeat /* 03B00 8093C7D0 E480FB00 */ swc1 $f0, -0x0500($a0) ## 00000068 -/* 03B04 8093C7D4 8FBF0014 */ lw $ra, 0x0014($sp) +/* 03B04 8093C7D4 8FBF0014 */ lw $ra, 0x0014($sp) /* 03B08 8093C7D8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 03B0C 8093C7DC 03E00008 */ jr $ra +/* 03B0C 8093C7DC 03E00008 */ jr $ra /* 03B10 8093C7E0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093C910.s b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093C910.s index efa7d873e3..833a6ecd69 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093C910.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093C910.s @@ -1,92 +1,92 @@ glabel func_8093C910 /* 03C40 8093C910 27BDFF40 */ addiu $sp, $sp, 0xFF40 ## $sp = FFFFFF40 -/* 03C44 8093C914 AFBF003C */ sw $ra, 0x003C($sp) -/* 03C48 8093C918 AFB20038 */ sw $s2, 0x0038($sp) -/* 03C4C 8093C91C AFB10034 */ sw $s1, 0x0034($sp) -/* 03C50 8093C920 AFB00030 */ sw $s0, 0x0030($sp) -/* 03C54 8093C924 F7B60028 */ sdc1 $f22, 0x0028($sp) -/* 03C58 8093C928 F7B40020 */ sdc1 $f20, 0x0020($sp) +/* 03C44 8093C914 AFBF003C */ sw $ra, 0x003C($sp) +/* 03C48 8093C918 AFB20038 */ sw $s2, 0x0038($sp) +/* 03C4C 8093C91C AFB10034 */ sw $s1, 0x0034($sp) +/* 03C50 8093C920 AFB00030 */ sw $s0, 0x0030($sp) +/* 03C54 8093C924 F7B60028 */ sdc1 $f22, 0x0028($sp) +/* 03C58 8093C928 F7B40020 */ sdc1 $f20, 0x0020($sp) /* 03C5C 8093C92C 8CAE1C44 */ lw $t6, 0x1C44($a1) ## 00001C44 /* 03C60 8093C930 00808825 */ or $s1, $a0, $zero ## $s1 = 00000000 /* 03C64 8093C934 00A09025 */ or $s2, $a1, $zero ## $s2 = 00000000 -/* 03C68 8093C938 AFAE00A0 */ sw $t6, 0x00A0($sp) +/* 03C68 8093C938 AFAE00A0 */ sw $t6, 0x00A0($sp) /* 03C6C 8093C93C 848205FA */ lh $v0, 0x05FA($a0) ## 000005FA /* 03C70 8093C940 240F0001 */ addiu $t7, $zero, 0x0001 ## $t7 = 00000001 /* 03C74 8093C944 02402025 */ or $a0, $s2, $zero ## $a0 = 00000000 -/* 03C78 8093C948 1040000A */ beq $v0, $zero, .L8093C974 +/* 03C78 8093C948 1040000A */ beq $v0, $zero, .L8093C974 /* 03C7C 8093C94C 26451D64 */ addiu $a1, $s2, 0x1D64 ## $a1 = 00001D64 /* 03C80 8093C950 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 03C84 8093C954 10410034 */ beq $v0, $at, .L8093CA28 +/* 03C84 8093C954 10410034 */ beq $v0, $at, .L8093CA28 /* 03C88 8093C958 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 03C8C 8093C95C 10410069 */ beq $v0, $at, .L8093CB04 +/* 03C8C 8093C95C 10410069 */ beq $v0, $at, .L8093CB04 /* 03C90 8093C960 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 /* 03C94 8093C964 4481A000 */ mtc1 $at, $f20 ## $f20 = 1.00 /* 03C98 8093C968 4480B000 */ mtc1 $zero, $f22 ## $f22 = 0.00 -/* 03C9C 8093C96C 100000A6 */ beq $zero, $zero, .L8093CC08 +/* 03C9C 8093C96C 100000A6 */ beq $zero, $zero, .L8093CC08 /* 03CA0 8093C970 862505FC */ lh $a1, 0x05FC($s1) ## 000005FC .L8093C974: -/* 03CA4 8093C974 0C019148 */ jal func_80064520 +/* 03CA4 8093C974 0C019148 */ jal func_80064520 /* 03CA8 8093C978 A62F05FA */ sh $t7, 0x05FA($s1) ## 000005FA /* 03CAC 8093C97C 02402025 */ or $a0, $s2, $zero ## $a0 = 00000000 /* 03CB0 8093C980 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 03CB4 8093C984 0C00B7D5 */ jal func_8002DF54 +/* 03CB4 8093C984 0C00B7D5 */ jal func_8002DF54 /* 03CB8 8093C988 24060039 */ addiu $a2, $zero, 0x0039 ## $a2 = 00000039 -/* 03CBC 8093C98C 0C03008C */ jal func_800C0230 +/* 03CBC 8093C98C 0C03008C */ jal func_800C0230 /* 03CC0 8093C990 02402025 */ or $a0, $s2, $zero ## $a0 = 00000000 /* 03CC4 8093C994 A62205FC */ sh $v0, 0x05FC($s1) ## 000005FC /* 03CC8 8093C998 02402025 */ or $a0, $s2, $zero ## $a0 = 00000000 /* 03CCC 8093C99C 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 03CD0 8093C9A0 0C0300C5 */ jal func_800C0314 +/* 03CD0 8093C9A0 0C0300C5 */ jal func_800C0314 /* 03CD4 8093C9A4 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 /* 03CD8 8093C9A8 02402025 */ or $a0, $s2, $zero ## $a0 = 00000000 /* 03CDC 8093C9AC 862505FC */ lh $a1, 0x05FC($s1) ## 000005FC -/* 03CE0 8093C9B0 0C0300C5 */ jal func_800C0314 +/* 03CE0 8093C9B0 0C0300C5 */ jal func_800C0314 /* 03CE4 8093C9B4 24060007 */ addiu $a2, $zero, 0x0007 ## $a2 = 00000007 /* 03CE8 8093C9B8 3C014448 */ lui $at, 0x4448 ## $at = 44480000 /* 03CEC 8093C9BC 44812000 */ mtc1 $at, $f4 ## $f4 = 800.00 /* 03CF0 8093C9C0 3C018095 */ lui $at, %hi(D_8094AF10) ## $at = 80950000 /* 03CF4 8093C9C4 3C188095 */ lui $t8, %hi(D_8094C848) ## $t8 = 80950000 /* 03CF8 8093C9C8 E62406A4 */ swc1 $f4, 0x06A4($s1) ## 000006A4 -/* 03CFC 8093C9CC C426AF10 */ lwc1 $f6, %lo(D_8094AF10)($at) +/* 03CFC 8093C9CC C426AF10 */ lwc1 $f6, %lo(D_8094AF10)($at) /* 03D00 8093C9D0 3C198095 */ lui $t9, %hi(D_8094C848) ## $t9 = 80950000 /* 03D04 8093C9D4 3C088095 */ lui $t0, %hi(D_8094C844) ## $t0 = 80950000 /* 03D08 8093C9D8 E62606AC */ swc1 $f6, 0x06AC($s1) ## 000006AC -/* 03D0C 8093C9DC 8F18C848 */ lw $t8, %lo(D_8094C848)($t8) +/* 03D0C 8093C9DC 8F18C848 */ lw $t8, %lo(D_8094C848)($t8) /* 03D10 8093C9E0 3C098095 */ lui $t1, %hi(D_8094C844) ## $t1 = 80950000 /* 03D14 8093C9E4 4480B000 */ mtc1 $zero, $f22 ## $f22 = 0.00 /* 03D18 8093C9E8 A7000030 */ sh $zero, 0x0030($t8) ## 80950030 -/* 03D1C 8093C9EC 8F39C848 */ lw $t9, %lo(D_8094C848)($t9) +/* 03D1C 8093C9EC 8F39C848 */ lw $t9, %lo(D_8094C848)($t9) /* 03D20 8093C9F0 3C014416 */ lui $at, 0x4416 ## $at = 44160000 /* 03D24 8093C9F4 44814000 */ mtc1 $at, $f8 ## $f8 = 600.00 /* 03D28 8093C9F8 A72000B4 */ sh $zero, 0x00B4($t9) ## 809500B4 -/* 03D2C 8093C9FC 8D08C844 */ lw $t0, %lo(D_8094C844)($t0) +/* 03D2C 8093C9FC 8D08C844 */ lw $t0, %lo(D_8094C844)($t0) /* 03D30 8093CA00 3C0410C8 */ lui $a0, 0x10C8 ## $a0 = 10C80000 /* 03D34 8093CA04 348400FF */ ori $a0, $a0, 0x00FF ## $a0 = 10C800FF /* 03D38 8093CA08 A5000030 */ sh $zero, 0x0030($t0) ## 80950030 -/* 03D3C 8093CA0C 8D29C844 */ lw $t1, %lo(D_8094C844)($t1) +/* 03D3C 8093CA0C 8D29C844 */ lw $t1, %lo(D_8094C844)($t1) /* 03D40 8093CA10 A52000B4 */ sh $zero, 0x00B4($t1) ## 809500B4 /* 03D44 8093CA14 E63601A8 */ swc1 $f22, 0x01A8($s1) ## 000001A8 /* 03D48 8093CA18 E63601AC */ swc1 $f22, 0x01AC($s1) ## 000001AC /* 03D4C 8093CA1C 0C03E803 */ jal Audio_SetBGM - + /* 03D50 8093CA20 E62801B0 */ swc1 $f8, 0x01B0($s1) ## 000001B0 /* 03D54 8093CA24 A6200152 */ sh $zero, 0x0152($s1) ## 00000152 .L8093CA28: /* 03D58 8093CA28 86220152 */ lh $v0, 0x0152($s1) ## 00000152 /* 03D5C 8093CA2C 4480B000 */ mtc1 $zero, $f22 ## $f22 = 0.00 /* 03D60 8093CA30 24010014 */ addiu $at, $zero, 0x0014 ## $at = 00000014 -/* 03D64 8093CA34 14410005 */ bne $v0, $at, .L8093CA4C +/* 03D64 8093CA34 14410005 */ bne $v0, $at, .L8093CA4C /* 03D68 8093CA38 02402025 */ or $a0, $s2, $zero ## $a0 = 00000000 /* 03D6C 8093CA3C 24056059 */ addiu $a1, $zero, 0x6059 ## $a1 = 00006059 -/* 03D70 8093CA40 0C042DA0 */ jal func_8010B680 +/* 03D70 8093CA40 0C042DA0 */ jal func_8010B680 /* 03D74 8093CA44 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 /* 03D78 8093CA48 86220152 */ lh $v0, 0x0152($s1) ## 00000152 .L8093CA4C: /* 03D7C 8093CA4C 24010050 */ addiu $at, $zero, 0x0050 ## $at = 00000050 -/* 03D80 8093CA50 14410004 */ bne $v0, $at, .L8093CA64 +/* 03D80 8093CA50 14410004 */ bne $v0, $at, .L8093CA64 /* 03D84 8093CA54 02402025 */ or $a0, $s2, $zero ## $a0 = 00000000 /* 03D88 8093CA58 2405605A */ addiu $a1, $zero, 0x605A ## $a1 = 0000605A -/* 03D8C 8093CA5C 0C042DA0 */ jal func_8010B680 +/* 03D8C 8093CA5C 0C042DA0 */ jal func_8010B680 /* 03D90 8093CA60 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 .L8093CA64: /* 03D94 8093CA64 3C0143DC */ lui $at, 0x43DC ## $at = 43DC0000 @@ -94,23 +94,23 @@ glabel func_8093C910 /* 03D9C 8093CA6C E636060C */ swc1 $f22, 0x060C($s1) ## 0000060C /* 03DA0 8093CA70 E6360614 */ swc1 $f22, 0x0614($s1) ## 00000614 /* 03DA4 8093CA74 E62A0610 */ swc1 $f10, 0x0610($s1) ## 00000610 -/* 03DA8 8093CA78 E7B600B0 */ swc1 $f22, 0x00B0($sp) -/* 03DAC 8093CA7C E7B600B4 */ swc1 $f22, 0x00B4($sp) +/* 03DA8 8093CA78 E7B600B0 */ swc1 $f22, 0x00B0($sp) +/* 03DAC 8093CA7C E7B600B4 */ swc1 $f22, 0x00B4($sp) /* 03DB0 8093CA80 C63006A4 */ lwc1 $f16, 0x06A4($s1) ## 000006A4 /* 03DB4 8093CA84 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 03DB8 8093CA88 E7B000B8 */ swc1 $f16, 0x00B8($sp) -/* 03DBC 8093CA8C 0C034348 */ jal Matrix_RotateY +/* 03DB8 8093CA88 E7B000B8 */ swc1 $f16, 0x00B8($sp) +/* 03DBC 8093CA8C 0C034348 */ jal Matrix_RotateY /* 03DC0 8093CA90 C62C06AC */ lwc1 $f12, 0x06AC($s1) ## 000006AC /* 03DC4 8093CA94 27A400B0 */ addiu $a0, $sp, 0x00B0 ## $a0 = FFFFFFF0 -/* 03DC8 8093CA98 0C0346BD */ jal Matrix_MultVec3f +/* 03DC8 8093CA98 0C0346BD */ jal Matrix_MultVec3f /* 03DCC 8093CA9C 27A500A4 */ addiu $a1, $sp, 0x00A4 ## $a1 = FFFFFFE4 /* 03DD0 8093CAA0 3C014396 */ lui $at, 0x4396 ## $at = 43960000 -/* 03DD4 8093CAA4 C7B200A4 */ lwc1 $f18, 0x00A4($sp) +/* 03DD4 8093CAA4 C7B200A4 */ lwc1 $f18, 0x00A4($sp) /* 03DD8 8093CAA8 44812000 */ mtc1 $at, $f4 ## $f4 = 300.00 /* 03DDC 8093CAAC 3C053E99 */ lui $a1, 0x3E99 ## $a1 = 3E990000 /* 03DE0 8093CAB0 E6320600 */ swc1 $f18, 0x0600($s1) ## 00000600 /* 03DE4 8093CAB4 E6240604 */ swc1 $f4, 0x0604($s1) ## 00000604 -/* 03DE8 8093CAB8 C7A600AC */ lwc1 $f6, 0x00AC($sp) +/* 03DE8 8093CAB8 C7A600AC */ lwc1 $f6, 0x00AC($sp) /* 03DEC 8093CABC 3C063CA3 */ lui $a2, 0x3CA3 ## $a2 = 3CA30000 /* 03DF0 8093CAC0 3C073CF5 */ lui $a3, 0x3CF5 ## $a3 = 3CF50000 /* 03DF4 8093CAC4 34E7C28F */ ori $a3, $a3, 0xC28F ## $a3 = 3CF5C28F @@ -118,58 +118,58 @@ glabel func_8093C910 /* 03DFC 8093CACC 34A5999A */ ori $a1, $a1, 0x999A ## $a1 = 3E99999A /* 03E00 8093CAD0 262406AC */ addiu $a0, $s1, 0x06AC ## $a0 = 000006AC /* 03E04 8093CAD4 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 03E08 8093CAD8 E6260608 */ swc1 $f6, 0x0608($s1) ## 00000608 /* 03E0C 8093CADC 3C063DCC */ lui $a2, 0x3DCC ## $a2 = 3DCC0000 /* 03E10 8093CAE0 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3DCCCCCD /* 03E14 8093CAE4 262406A4 */ addiu $a0, $s1, 0x06A4 ## $a0 = 000006A4 /* 03E18 8093CAE8 3C054348 */ lui $a1, 0x4348 ## $a1 = 43480000 /* 03E1C 8093CAEC 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 03E20 8093CAF0 3C0740A0 */ lui $a3, 0x40A0 ## $a3 = 40A00000 /* 03E24 8093CAF4 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 /* 03E28 8093CAF8 4481A000 */ mtc1 $at, $f20 ## $f20 = 1.00 -/* 03E2C 8093CAFC 10000042 */ beq $zero, $zero, .L8093CC08 +/* 03E2C 8093CAFC 10000042 */ beq $zero, $zero, .L8093CC08 /* 03E30 8093CB00 862505FC */ lh $a1, 0x05FC($s1) ## 000005FC .L8093CB04: /* 03E34 8093CB04 4480B000 */ mtc1 $zero, $f22 ## $f22 = 0.00 /* 03E38 8093CB08 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 03E3C 8093CB0C E7B600B0 */ swc1 $f22, 0x00B0($sp) -/* 03E40 8093CB10 E7B600B4 */ swc1 $f22, 0x00B4($sp) +/* 03E3C 8093CB0C E7B600B0 */ swc1 $f22, 0x00B0($sp) +/* 03E40 8093CB10 E7B600B4 */ swc1 $f22, 0x00B4($sp) /* 03E44 8093CB14 C62806A4 */ lwc1 $f8, 0x06A4($s1) ## 000006A4 -/* 03E48 8093CB18 E7A800B8 */ swc1 $f8, 0x00B8($sp) -/* 03E4C 8093CB1C 0C034348 */ jal Matrix_RotateY +/* 03E48 8093CB18 E7A800B8 */ swc1 $f8, 0x00B8($sp) +/* 03E4C 8093CB1C 0C034348 */ jal Matrix_RotateY /* 03E50 8093CB20 C62C06AC */ lwc1 $f12, 0x06AC($s1) ## 000006AC /* 03E54 8093CB24 27A400B0 */ addiu $a0, $sp, 0x00B0 ## $a0 = FFFFFFF0 -/* 03E58 8093CB28 0C0346BD */ jal Matrix_MultVec3f +/* 03E58 8093CB28 0C0346BD */ jal Matrix_MultVec3f /* 03E5C 8093CB2C 27A500A4 */ addiu $a1, $sp, 0x00A4 ## $a1 = FFFFFFE4 /* 03E60 8093CB30 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 /* 03E64 8093CB34 44812000 */ mtc1 $at, $f4 ## $f4 = 20.00 /* 03E68 8093CB38 C632069C */ lwc1 $f18, 0x069C($s1) ## 0000069C -/* 03E6C 8093CB3C C7AA00A4 */ lwc1 $f10, 0x00A4($sp) +/* 03E6C 8093CB3C C7AA00A4 */ lwc1 $f10, 0x00A4($sp) /* 03E70 8093CB40 3C063DCC */ lui $a2, 0x3DCC ## $a2 = 3DCC0000 -/* 03E74 8093CB44 46049182 */ mul.s $f6, $f18, $f4 +/* 03E74 8093CB44 46049182 */ mul.s $f6, $f18, $f4 /* 03E78 8093CB48 E62A0600 */ swc1 $f10, 0x0600($s1) ## 00000600 -/* 03E7C 8093CB4C C7B000AC */ lwc1 $f16, 0x00AC($sp) +/* 03E7C 8093CB4C C7B000AC */ lwc1 $f16, 0x00AC($sp) /* 03E80 8093CB50 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3DCCCCCD /* 03E84 8093CB54 26240604 */ addiu $a0, $s1, 0x0604 ## $a0 = 00000604 /* 03E88 8093CB58 3C0543D2 */ lui $a1, 0x43D2 ## $a1 = 43D20000 /* 03E8C 8093CB5C E6300608 */ swc1 $f16, 0x0608($s1) ## 00000608 -/* 03E90 8093CB60 44073000 */ mfc1 $a3, $f6 +/* 03E90 8093CB60 44073000 */ mfc1 $a3, $f6 /* 03E94 8093CB64 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 03E98 8093CB68 00000000 */ nop /* 03E9C 8093CB6C 3C0140C0 */ lui $at, 0x40C0 ## $at = 40C00000 /* 03EA0 8093CB70 44815000 */ mtc1 $at, $f10 ## $f10 = 6.00 /* 03EA4 8093CB74 C628069C */ lwc1 $f8, 0x069C($s1) ## 0000069C /* 03EA8 8093CB78 3C063DCC */ lui $a2, 0x3DCC ## $a2 = 3DCC0000 /* 03EAC 8093CB7C 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3DCCCCCD -/* 03EB0 8093CB80 460A4402 */ mul.s $f16, $f8, $f10 +/* 03EB0 8093CB80 460A4402 */ mul.s $f16, $f8, $f10 /* 03EB4 8093CB84 26240610 */ addiu $a0, $s1, 0x0610 ## $a0 = 00000610 /* 03EB8 8093CB88 3C0543EB */ lui $a1, 0x43EB ## $a1 = 43EB0000 -/* 03EBC 8093CB8C 44078000 */ mfc1 $a3, $f16 +/* 03EBC 8093CB8C 44078000 */ mfc1 $a3, $f16 /* 03EC0 8093CB90 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 03EC4 8093CB94 00000000 */ nop /* 03EC8 8093CB98 3C053E99 */ lui $a1, 0x3E99 ## $a1 = 3E990000 /* 03ECC 8093CB9C 3C063CA3 */ lui $a2, 0x3CA3 ## $a2 = 3CA30000 @@ -178,242 +178,242 @@ glabel func_8093C910 /* 03ED8 8093CBA8 34C6D70A */ ori $a2, $a2, 0xD70A ## $a2 = 3CA3D70A /* 03EDC 8093CBAC 34A5999A */ ori $a1, $a1, 0x999A ## $a1 = 3E99999A /* 03EE0 8093CBB0 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 03EE4 8093CBB4 262406AC */ addiu $a0, $s1, 0x06AC ## $a0 = 000006AC /* 03EE8 8093CBB8 3C014200 */ lui $at, 0x4200 ## $at = 42000000 /* 03EEC 8093CBBC 44812000 */ mtc1 $at, $f4 ## $f4 = 32.00 /* 03EF0 8093CBC0 C632069C */ lwc1 $f18, 0x069C($s1) ## 0000069C /* 03EF4 8093CBC4 3C063DCC */ lui $a2, 0x3DCC ## $a2 = 3DCC0000 /* 03EF8 8093CBC8 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3DCCCCCD -/* 03EFC 8093CBCC 46049182 */ mul.s $f6, $f18, $f4 +/* 03EFC 8093CBCC 46049182 */ mul.s $f6, $f18, $f4 /* 03F00 8093CBD0 262406A4 */ addiu $a0, $s1, 0x06A4 ## $a0 = 000006A4 /* 03F04 8093CBD4 3C054270 */ lui $a1, 0x4270 ## $a1 = 42700000 -/* 03F08 8093CBD8 44073000 */ mfc1 $a3, $f6 +/* 03F08 8093CBD8 44073000 */ mfc1 $a3, $f6 /* 03F0C 8093CBDC 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 03F10 8093CBE0 00000000 */ nop /* 03F14 8093CBE4 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 /* 03F18 8093CBE8 4481A000 */ mtc1 $at, $f20 ## $f20 = 1.00 /* 03F1C 8093CBEC 3C073DCC */ lui $a3, 0x3DCC ## $a3 = 3DCC0000 /* 03F20 8093CBF0 34E7CCCD */ ori $a3, $a3, 0xCCCD ## $a3 = 3DCCCCCD -/* 03F24 8093CBF4 4405A000 */ mfc1 $a1, $f20 -/* 03F28 8093CBF8 4406A000 */ mfc1 $a2, $f20 +/* 03F24 8093CBF4 4405A000 */ mfc1 $a1, $f20 +/* 03F28 8093CBF8 4406A000 */ mfc1 $a2, $f20 /* 03F2C 8093CBFC 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 03F30 8093CC00 2624069C */ addiu $a0, $s1, 0x069C ## $a0 = 0000069C /* 03F34 8093CC04 862505FC */ lh $a1, 0x05FC($s1) ## 000005FC .L8093CC08: -/* 03F38 8093CC08 50A0000E */ beql $a1, $zero, .L8093CC44 +/* 03F38 8093CC08 50A0000E */ beql $a1, $zero, .L8093CC44 /* 03F3C 8093CC0C 86220440 */ lh $v0, 0x0440($s1) ## 00000440 /* 03F40 8093CC10 922A05F9 */ lbu $t2, 0x05F9($s1) ## 000005F9 /* 03F44 8093CC14 26270600 */ addiu $a3, $s1, 0x0600 ## $a3 = 00000600 /* 03F48 8093CC18 02402025 */ or $a0, $s2, $zero ## $a0 = 00000000 -/* 03F4C 8093CC1C 15400006 */ bne $t2, $zero, .L8093CC38 +/* 03F4C 8093CC1C 15400006 */ bne $t2, $zero, .L8093CC38 /* 03F50 8093CC20 26260630 */ addiu $a2, $s1, 0x0630 ## $a2 = 00000630 /* 03F54 8093CC24 02402025 */ or $a0, $s2, $zero ## $a0 = 00000000 -/* 03F58 8093CC28 0C030136 */ jal func_800C04D8 +/* 03F58 8093CC28 0C030136 */ jal func_800C04D8 /* 03F5C 8093CC2C 2626060C */ addiu $a2, $s1, 0x060C ## $a2 = 0000060C -/* 03F60 8093CC30 10000004 */ beq $zero, $zero, .L8093CC44 +/* 03F60 8093CC30 10000004 */ beq $zero, $zero, .L8093CC44 /* 03F64 8093CC34 86220440 */ lh $v0, 0x0440($s1) ## 00000440 .L8093CC38: -/* 03F68 8093CC38 0C030136 */ jal func_800C04D8 +/* 03F68 8093CC38 0C030136 */ jal func_800C04D8 /* 03F6C 8093CC3C 26270624 */ addiu $a3, $s1, 0x0624 ## $a3 = 00000624 /* 03F70 8093CC40 86220440 */ lh $v0, 0x0440($s1) ## 00000440 .L8093CC44: /* 03F74 8093CC44 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 /* 03F78 8093CC48 3C048095 */ lui $a0, %hi(D_8094C844) ## $a0 = 80950000 -/* 03F7C 8093CC4C 10400008 */ beq $v0, $zero, .L8093CC70 +/* 03F7C 8093CC4C 10400008 */ beq $v0, $zero, .L8093CC70 /* 03F80 8093CC50 2405311F */ addiu $a1, $zero, 0x311F ## $a1 = 0000311F -/* 03F84 8093CC54 10410122 */ beq $v0, $at, .L8093D0E0 +/* 03F84 8093CC54 10410122 */ beq $v0, $at, .L8093D0E0 /* 03F88 8093CC58 26300568 */ addiu $s0, $s1, 0x0568 ## $s0 = 00000568 /* 03F8C 8093CC5C 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 03F90 8093CC60 10410137 */ beq $v0, $at, .L8093D140 +/* 03F90 8093CC60 10410137 */ beq $v0, $at, .L8093D140 /* 03F94 8093CC64 00000000 */ nop -/* 03F98 8093CC68 100001D4 */ beq $zero, $zero, .L8093D3BC -/* 03F9C 8093CC6C 8FBF003C */ lw $ra, 0x003C($sp) +/* 03F98 8093CC68 100001D4 */ beq $zero, $zero, .L8093D3BC +/* 03F9C 8093CC6C 8FBF003C */ lw $ra, 0x003C($sp) .L8093CC70: /* 03FA0 8093CC70 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 03FA4 8093CC74 8C84C844 */ lw $a0, %lo(D_8094C844)($a0) + +/* 03FA4 8093CC74 8C84C844 */ lw $a0, %lo(D_8094C844)($a0) /* 03FA8 8093CC78 3C048095 */ lui $a0, %hi(D_8094C848) ## $a0 = 80950000 -/* 03FAC 8093CC7C 8C84C848 */ lw $a0, %lo(D_8094C848)($a0) +/* 03FAC 8093CC7C 8C84C848 */ lw $a0, %lo(D_8094C848)($a0) /* 03FB0 8093CC80 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 03FB4 8093CC84 2405311F */ addiu $a1, $zero, 0x311F ## $a1 = 0000311F /* 03FB8 8093CC88 3C0143C8 */ lui $at, 0x43C8 ## $at = 43C80000 /* 03FBC 8093CC8C C62801B0 */ lwc1 $f8, 0x01B0($s1) ## 000001B0 /* 03FC0 8093CC90 44815000 */ mtc1 $at, $f10 ## $f10 = 400.00 -/* 03FC4 8093CC94 E7B600B8 */ swc1 $f22, 0x00B8($sp) -/* 03FC8 8093CC98 E7A800B0 */ swc1 $f8, 0x00B0($sp) -/* 03FCC 8093CC9C E7AA00B4 */ swc1 $f10, 0x00B4($sp) +/* 03FC4 8093CC94 E7B600B8 */ swc1 $f22, 0x00B8($sp) +/* 03FC8 8093CC98 E7A800B0 */ swc1 $f8, 0x00B0($sp) +/* 03FCC 8093CC9C E7AA00B4 */ swc1 $f10, 0x00B4($sp) /* 03FD0 8093CCA0 C62C01A8 */ lwc1 $f12, 0x01A8($s1) ## 000001A8 -/* 03FD4 8093CCA4 0C034348 */ jal Matrix_RotateY +/* 03FD4 8093CCA4 0C034348 */ jal Matrix_RotateY /* 03FD8 8093CCA8 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 03FDC 8093CCAC 27A400B0 */ addiu $a0, $sp, 0x00B0 ## $a0 = FFFFFFF0 -/* 03FE0 8093CCB0 0C0346BD */ jal Matrix_MultVec3f +/* 03FE0 8093CCB0 0C0346BD */ jal Matrix_MultVec3f /* 03FE4 8093CCB4 27A500A4 */ addiu $a1, $sp, 0x00A4 ## $a1 = FFFFFFE4 /* 03FE8 8093CCB8 3C028095 */ lui $v0, %hi(D_8094C848) ## $v0 = 80950000 /* 03FEC 8093CCBC 2442C848 */ addiu $v0, $v0, %lo(D_8094C848) ## $v0 = 8094C848 /* 03FF0 8093CCC0 8C4B0000 */ lw $t3, 0x0000($v0) ## 8094C848 -/* 03FF4 8093CCC4 C7B000A4 */ lwc1 $f16, 0x00A4($sp) +/* 03FF4 8093CCC4 C7B000A4 */ lwc1 $f16, 0x00A4($sp) /* 03FF8 8093CCC8 3C014700 */ lui $at, 0x4700 ## $at = 47000000 /* 03FFC 8093CCCC 44810000 */ mtc1 $at, $f0 ## $f0 = 32768.00 /* 04000 8093CCD0 E5700024 */ swc1 $f16, 0x0024($t3) ## 00000024 -/* 04004 8093CCD4 C7B200A8 */ lwc1 $f18, 0x00A8($sp) +/* 04004 8093CCD4 C7B200A8 */ lwc1 $f18, 0x00A8($sp) /* 04008 8093CCD8 8C4C0000 */ lw $t4, 0x0000($v0) ## 8094C848 /* 0400C 8093CCDC 3C018095 */ lui $at, %hi(D_8094AF14) ## $at = 80950000 /* 04010 8093CCE0 3C038095 */ lui $v1, %hi(D_8094C844) ## $v1 = 80950000 /* 04014 8093CCE4 E5920028 */ swc1 $f18, 0x0028($t4) ## 00000028 -/* 04018 8093CCE8 C7A400AC */ lwc1 $f4, 0x00AC($sp) +/* 04018 8093CCE8 C7A400AC */ lwc1 $f4, 0x00AC($sp) /* 0401C 8093CCEC 8C4D0000 */ lw $t5, 0x0000($v0) ## 8094C848 /* 04020 8093CCF0 2463C844 */ addiu $v1, $v1, %lo(D_8094C844) ## $v1 = 8094C844 -/* 04024 8093CCF4 4405B000 */ mfc1 $a1, $f22 +/* 04024 8093CCF4 4405B000 */ mfc1 $a1, $f22 /* 04028 8093CCF8 E5A4002C */ swc1 $f4, 0x002C($t5) ## 0000002C /* 0402C 8093CCFC C62601A8 */ lwc1 $f6, 0x01A8($s1) ## 000001A8 -/* 04030 8093CD00 C428AF14 */ lwc1 $f8, %lo(D_8094AF14)($at) +/* 04030 8093CD00 C428AF14 */ lwc1 $f8, %lo(D_8094AF14)($at) /* 04034 8093CD04 8C580000 */ lw $t8, 0x0000($v0) ## 8094C848 /* 04038 8093CD08 3C018095 */ lui $at, %hi(D_8094AF18) ## $at = 80950000 -/* 0403C 8093CD0C 46083283 */ div.s $f10, $f6, $f8 +/* 0403C 8093CD0C 46083283 */ div.s $f10, $f6, $f8 /* 04040 8093CD10 3C063DCC */ lui $a2, 0x3DCC ## $a2 = 3DCC0000 /* 04044 8093CD14 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3DCCCCCD /* 04048 8093CD18 262401B0 */ addiu $a0, $s1, 0x01B0 ## $a0 = 000001B0 /* 0404C 8093CD1C 3C0740E0 */ lui $a3, 0x40E0 ## $a3 = 40E00000 -/* 04050 8093CD20 46005402 */ mul.s $f16, $f10, $f0 -/* 04054 8093CD24 4600848D */ trunc.w.s $f18, $f16 -/* 04058 8093CD28 440F9000 */ mfc1 $t7, $f18 +/* 04050 8093CD20 46005402 */ mul.s $f16, $f10, $f0 +/* 04054 8093CD24 4600848D */ trunc.w.s $f18, $f16 +/* 04058 8093CD28 440F9000 */ mfc1 $t7, $f18 /* 0405C 8093CD2C 00000000 */ nop /* 04060 8093CD30 A70F00B6 */ sh $t7, 0x00B6($t8) ## 000000B6 -/* 04064 8093CD34 C7A400A4 */ lwc1 $f4, 0x00A4($sp) +/* 04064 8093CD34 C7A400A4 */ lwc1 $f4, 0x00A4($sp) /* 04068 8093CD38 8C790000 */ lw $t9, 0x0000($v1) ## 8094C844 -/* 0406C 8093CD3C 46002187 */ neg.s $f6, $f4 +/* 0406C 8093CD3C 46002187 */ neg.s $f6, $f4 /* 04070 8093CD40 E7260024 */ swc1 $f6, 0x0024($t9) ## 00000024 /* 04074 8093CD44 8C680000 */ lw $t0, 0x0000($v1) ## 8094C844 -/* 04078 8093CD48 C7A800A8 */ lwc1 $f8, 0x00A8($sp) +/* 04078 8093CD48 C7A800A8 */ lwc1 $f8, 0x00A8($sp) /* 0407C 8093CD4C E5080028 */ swc1 $f8, 0x0028($t0) ## 00000028 -/* 04080 8093CD50 C7AA00AC */ lwc1 $f10, 0x00AC($sp) +/* 04080 8093CD50 C7AA00AC */ lwc1 $f10, 0x00AC($sp) /* 04084 8093CD54 8C690000 */ lw $t1, 0x0000($v1) ## 8094C844 -/* 04088 8093CD58 46005407 */ neg.s $f16, $f10 +/* 04088 8093CD58 46005407 */ neg.s $f16, $f10 /* 0408C 8093CD5C E530002C */ swc1 $f16, 0x002C($t1) ## 0000002C -/* 04090 8093CD60 C424AF18 */ lwc1 $f4, %lo(D_8094AF18)($at) +/* 04090 8093CD60 C424AF18 */ lwc1 $f4, %lo(D_8094AF18)($at) /* 04094 8093CD64 C63201A8 */ lwc1 $f18, 0x01A8($s1) ## 000001A8 /* 04098 8093CD68 8C6C0000 */ lw $t4, 0x0000($v1) ## 8094C844 -/* 0409C 8093CD6C 46049183 */ div.s $f6, $f18, $f4 -/* 040A0 8093CD70 46003202 */ mul.s $f8, $f6, $f0 -/* 040A4 8093CD74 46004280 */ add.s $f10, $f8, $f0 -/* 040A8 8093CD78 4600540D */ trunc.w.s $f16, $f10 -/* 040AC 8093CD7C 440B8000 */ mfc1 $t3, $f16 +/* 0409C 8093CD6C 46049183 */ div.s $f6, $f18, $f4 +/* 040A0 8093CD70 46003202 */ mul.s $f8, $f6, $f0 +/* 040A4 8093CD74 46004280 */ add.s $f10, $f8, $f0 +/* 040A8 8093CD78 4600540D */ trunc.w.s $f16, $f10 +/* 040AC 8093CD7C 440B8000 */ mfc1 $t3, $f16 /* 040B0 8093CD80 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 040B4 8093CD84 A58B00B6 */ sh $t3, 0x00B6($t4) ## 000000B6 /* 040B8 8093CD88 C63201A8 */ lwc1 $f18, 0x01A8($s1) ## 000001A8 /* 040BC 8093CD8C C62401AC */ lwc1 $f4, 0x01AC($s1) ## 000001AC -/* 040C0 8093CD90 4406A000 */ mfc1 $a2, $f20 +/* 040C0 8093CD90 4406A000 */ mfc1 $a2, $f20 /* 040C4 8093CD94 3C073B83 */ lui $a3, 0x3B83 ## $a3 = 3B830000 -/* 040C8 8093CD98 46049181 */ sub.s $f6, $f18, $f4 +/* 040C8 8093CD98 46049181 */ sub.s $f6, $f18, $f4 /* 040CC 8093CD9C 34E7126E */ ori $a3, $a3, 0x126E ## $a3 = 3B83126E /* 040D0 8093CDA0 262401AC */ addiu $a0, $s1, 0x01AC ## $a0 = 000001AC /* 040D4 8093CDA4 3C053F00 */ lui $a1, 0x3F00 ## $a1 = 3F000000 /* 040D8 8093CDA8 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 040DC 8093CDAC E62601A8 */ swc1 $f6, 0x01A8($s1) ## 000001A8 /* 040E0 8093CDB0 3C014120 */ lui $at, 0x4120 ## $at = 41200000 /* 040E4 8093CDB4 44815000 */ mtc1 $at, $f10 ## $f10 = 10.00 /* 040E8 8093CDB8 C62801B0 */ lwc1 $f8, 0x01B0($s1) ## 000001B0 -/* 040EC 8093CDBC 460A403C */ c.lt.s $f8, $f10 +/* 040EC 8093CDBC 460A403C */ c.lt.s $f8, $f10 /* 040F0 8093CDC0 00000000 */ nop -/* 040F4 8093CDC4 450000B5 */ bc1f .L8093D09C +/* 040F4 8093CDC4 450000B5 */ bc1f .L8093D09C /* 040F8 8093CDC8 00000000 */ nop /* 040FC 8093CDCC 862D0166 */ lh $t5, 0x0166($s1) ## 00000166 /* 04100 8093CDD0 3C048095 */ lui $a0, %hi(D_8094C848) ## $a0 = 80950000 /* 04104 8093CDD4 24053910 */ addiu $a1, $zero, 0x3910 ## $a1 = 00003910 -/* 04108 8093CDD8 15A00005 */ bne $t5, $zero, .L8093CDF0 +/* 04108 8093CDD8 15A00005 */ bne $t5, $zero, .L8093CDF0 /* 0410C 8093CDDC 00000000 */ nop /* 04110 8093CDE0 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 04114 8093CDE4 8C84C848 */ lw $a0, %lo(D_8094C848)($a0) + +/* 04114 8093CDE4 8C84C848 */ lw $a0, %lo(D_8094C848)($a0) /* 04118 8093CDE8 240E0001 */ addiu $t6, $zero, 0x0001 ## $t6 = 00000001 /* 0411C 8093CDEC A62E0166 */ sh $t6, 0x0166($s1) ## 00000166 .L8093CDF0: /* 04120 8093CDF0 3C048095 */ lui $a0, %hi(D_8094C848) ## $a0 = 80950000 -/* 04124 8093CDF4 8C84C848 */ lw $a0, %lo(D_8094C848)($a0) +/* 04124 8093CDF4 8C84C848 */ lw $a0, %lo(D_8094C848)($a0) /* 04128 8093CDF8 3C053BA3 */ lui $a1, 0x3BA3 ## $a1 = 3BA30000 -/* 0412C 8093CDFC 4406A000 */ mfc1 $a2, $f20 +/* 0412C 8093CDFC 4406A000 */ mfc1 $a2, $f20 /* 04130 8093CE00 3C0739C4 */ lui $a3, 0x39C4 ## $a3 = 39C40000 /* 04134 8093CE04 34E79BA9 */ ori $a3, $a3, 0x9BA9 ## $a3 = 39C49BA9 /* 04138 8093CE08 34A5D70C */ ori $a1, $a1, 0xD70C ## $a1 = 3BA3D70C /* 0413C 8093CE0C 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 04140 8093CE10 24840050 */ addiu $a0, $a0, 0x0050 ## $a0 = 80950050 /* 04144 8093CE14 00008025 */ or $s0, $zero, $zero ## $s0 = 00000000 .L8093CE18: /* 04148 8093CE18 3C0F8095 */ lui $t7, %hi(D_8094C848) ## $t7 = 80950000 -/* 0414C 8093CE1C 8DEFC848 */ lw $t7, %lo(D_8094C848)($t7) +/* 0414C 8093CE1C 8DEFC848 */ lw $t7, %lo(D_8094C848)($t7) /* 04150 8093CE20 3C018095 */ lui $at, %hi(D_8094AF1C) ## $at = 80950000 -/* 04154 8093CE24 C432AF1C */ lwc1 $f18, %lo(D_8094AF1C)($at) +/* 04154 8093CE24 C432AF1C */ lwc1 $f18, %lo(D_8094AF1C)($at) /* 04158 8093CE28 C5F00050 */ lwc1 $f16, 0x0050($t7) ## 80950050 -/* 0415C 8093CE2C 46128502 */ mul.s $f20, $f16, $f18 +/* 0415C 8093CE2C 46128502 */ mul.s $f20, $f16, $f18 /* 04160 8093CE30 0C00CFC8 */ jal Math_Rand_CenteredFloat - -/* 04164 8093CE34 4614A300 */ add.s $f12, $f20, $f20 + +/* 04164 8093CE34 4614A300 */ add.s $f12, $f20, $f20 /* 04168 8093CE38 3C018095 */ lui $at, %hi(D_8094AF20) ## $at = 80950000 -/* 0416C 8093CE3C C424AF20 */ lwc1 $f4, %lo(D_8094AF20)($at) +/* 0416C 8093CE3C C424AF20 */ lwc1 $f4, %lo(D_8094AF20)($at) /* 04170 8093CE40 3C0143C8 */ lui $at, 0x43C8 ## $at = 43C80000 /* 04174 8093CE44 44813000 */ mtc1 $at, $f6 ## $f6 = 400.00 /* 04178 8093CE48 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 /* 0417C 8093CE4C 44816000 */ mtc1 $at, $f12 ## $f12 = 5.00 -/* 04180 8093CE50 46003200 */ add.s $f8, $f6, $f0 -/* 04184 8093CE54 E7B6009C */ swc1 $f22, 0x009C($sp) -/* 04188 8093CE58 E7A00090 */ swc1 $f0, 0x0090($sp) -/* 0418C 8093CE5C E7A40094 */ swc1 $f4, 0x0094($sp) +/* 04180 8093CE50 46003200 */ add.s $f8, $f6, $f0 +/* 04184 8093CE54 E7B6009C */ swc1 $f22, 0x009C($sp) +/* 04188 8093CE58 E7A00090 */ swc1 $f0, 0x0090($sp) +/* 0418C 8093CE5C E7A40094 */ swc1 $f4, 0x0094($sp) /* 04190 8093CE60 0C00CFBE */ jal Math_Rand_ZeroFloat - -/* 04194 8093CE64 E7A80098 */ swc1 $f8, 0x0098($sp) -/* 04198 8093CE68 4614A282 */ mul.s $f10, $f20, $f20 -/* 0419C 8093CE6C C7A20090 */ lwc1 $f2, 0x0090($sp) -/* 041A0 8093CE70 E7A00054 */ swc1 $f0, 0x0054($sp) + +/* 04194 8093CE64 E7A80098 */ swc1 $f8, 0x0098($sp) +/* 04198 8093CE68 4614A282 */ mul.s $f10, $f20, $f20 +/* 0419C 8093CE6C C7A20090 */ lwc1 $f2, 0x0090($sp) +/* 041A0 8093CE70 E7A00054 */ swc1 $f0, 0x0054($sp) /* 041A4 8093CE74 3C018095 */ lui $at, %hi(D_8094AF24) ## $at = 80950000 -/* 041A8 8093CE78 46021402 */ mul.s $f16, $f2, $f2 -/* 041AC 8093CE7C C42CAF24 */ lwc1 $f12, %lo(D_8094AF24)($at) -/* 041B0 8093CE80 46105001 */ sub.s $f0, $f10, $f16 -/* 041B4 8093CE84 46000004 */ sqrt.s $f0, $f0 +/* 041A8 8093CE78 46021402 */ mul.s $f16, $f2, $f2 +/* 041AC 8093CE7C C42CAF24 */ lwc1 $f12, %lo(D_8094AF24)($at) +/* 041B0 8093CE80 46105001 */ sub.s $f0, $f10, $f16 +/* 041B4 8093CE84 46000004 */ sqrt.s $f0, $f0 /* 041B8 8093CE88 0C00CFBE */ jal Math_Rand_ZeroFloat - -/* 041BC 8093CE8C E7A00058 */ swc1 $f0, 0x0058($sp) + +/* 041BC 8093CE8C E7A00058 */ swc1 $f0, 0x0058($sp) /* 041C0 8093CE90 3C014120 */ lui $at, 0x4120 ## $at = 41200000 /* 041C4 8093CE94 44812000 */ mtc1 $at, $f4 ## $f4 = 10.00 -/* 041C8 8093CE98 C7B20054 */ lwc1 $f18, 0x0054($sp) -/* 041CC 8093CE9C 4600020D */ trunc.w.s $f8, $f0 +/* 041C8 8093CE98 C7B20054 */ lwc1 $f18, 0x0054($sp) +/* 041CC 8093CE9C 4600020D */ trunc.w.s $f8, $f0 /* 041D0 8093CEA0 02402025 */ or $a0, $s2, $zero ## $a0 = 00000000 /* 041D4 8093CEA4 27A50094 */ addiu $a1, $sp, 0x0094 ## $a1 = FFFFFFD4 -/* 041D8 8093CEA8 46049180 */ add.s $f6, $f18, $f4 -/* 041DC 8093CEAC 44194000 */ mfc1 $t9, $f8 -/* 041E0 8093CEB0 8FA70058 */ lw $a3, 0x0058($sp) -/* 041E4 8093CEB4 44063000 */ mfc1 $a2, $f6 -/* 041E8 8093CEB8 0C24E452 */ jal func_80939148 -/* 041EC 8093CEBC AFB90010 */ sw $t9, 0x0010($sp) +/* 041D8 8093CEA8 46049180 */ add.s $f6, $f18, $f4 +/* 041DC 8093CEAC 44194000 */ mfc1 $t9, $f8 +/* 041E0 8093CEB0 8FA70058 */ lw $a3, 0x0058($sp) +/* 041E4 8093CEB4 44063000 */ mfc1 $a2, $f6 +/* 041E8 8093CEB8 0C24E452 */ jal func_80939148 +/* 041EC 8093CEBC AFB90010 */ sw $t9, 0x0010($sp) /* 041F0 8093CEC0 26100001 */ addiu $s0, $s0, 0x0001 ## $s0 = 00000001 -/* 041F4 8093CEC4 00108400 */ sll $s0, $s0, 16 -/* 041F8 8093CEC8 00108403 */ sra $s0, $s0, 16 -/* 041FC 8093CECC 2A010004 */ slti $at, $s0, 0x0004 -/* 04200 8093CED0 1420FFD1 */ bne $at, $zero, .L8093CE18 +/* 041F4 8093CEC4 00108400 */ sll $s0, $s0, 16 +/* 041F8 8093CEC8 00108403 */ sra $s0, $s0, 16 +/* 041FC 8093CECC 2A010004 */ slti $at, $s0, 0x0004 +/* 04200 8093CED0 1420FFD1 */ bne $at, $zero, .L8093CE18 /* 04204 8093CED4 00000000 */ nop /* 04208 8093CED8 3C088095 */ lui $t0, %hi(D_8094C848) ## $t0 = 80950000 -/* 0420C 8093CEDC 8D08C848 */ lw $t0, %lo(D_8094C848)($t0) +/* 0420C 8093CEDC 8D08C848 */ lw $t0, %lo(D_8094C848)($t0) /* 04210 8093CEE0 3C018095 */ lui $at, %hi(D_8094AF28) ## $at = 80950000 -/* 04214 8093CEE4 C42AAF28 */ lwc1 $f10, %lo(D_8094AF28)($at) +/* 04214 8093CEE4 C42AAF28 */ lwc1 $f10, %lo(D_8094AF28)($at) /* 04218 8093CEE8 C5100050 */ lwc1 $f16, 0x0050($t0) ## 80950050 /* 0421C 8093CEEC 3C0143C8 */ lui $at, 0x43C8 ## $at = 43C80000 /* 04220 8093CEF0 00008025 */ or $s0, $zero, $zero ## $s0 = 00000000 -/* 04224 8093CEF4 460A803E */ c.le.s $f16, $f10 +/* 04224 8093CEF4 460A803E */ c.le.s $f16, $f10 /* 04228 8093CEF8 26220024 */ addiu $v0, $s1, 0x0024 ## $v0 = 00000024 -/* 0422C 8093CEFC 45000067 */ bc1f .L8093D09C +/* 0422C 8093CEFC 45000067 */ bc1f .L8093D09C /* 04230 8093CF00 00000000 */ nop /* 04234 8093CF04 44819000 */ mtc1 $at, $f18 ## $f18 = 400.00 /* 04238 8093CF08 3C0141C8 */ lui $at, 0x41C8 ## $at = 41C80000 /* 0423C 8093CF0C 4481A000 */ mtc1 $at, $f20 ## $f20 = 25.00 /* 04240 8093CF10 E6320028 */ swc1 $f18, 0x0028($s1) ## 00000028 -/* 04244 8093CF14 AFA2004C */ sw $v0, 0x004C($sp) -/* 04248 8093CF18 8FA2004C */ lw $v0, 0x004C($sp) +/* 04244 8093CF14 AFA2004C */ sw $v0, 0x004C($sp) +/* 04248 8093CF18 8FA2004C */ lw $v0, 0x004C($sp) .L8093CF1C: /* 0424C 8093CF1C 27A90080 */ addiu $t1, $sp, 0x0080 ## $t1 = FFFFFFC0 /* 04250 8093CF20 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 @@ -424,57 +424,57 @@ glabel func_8093C910 /* 04264 8093CF34 AD2A0004 */ sw $t2, 0x0004($t1) ## FFFFFFC4 /* 04268 8093CF38 8C4B0008 */ lw $t3, 0x0008($v0) ## 0000002C /* 0426C 8093CF3C 0C00CFC8 */ jal Math_Rand_CenteredFloat - + /* 04270 8093CF40 AD2B0008 */ sw $t3, 0x0008($t1) ## FFFFFFC8 /* 04274 8093CF44 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 /* 04278 8093CF48 44816000 */ mtc1 $at, $f12 ## $f12 = 20.00 /* 0427C 8093CF4C 0C00CFC8 */ jal Math_Rand_CenteredFloat - -/* 04280 8093CF50 E7A00074 */ swc1 $f0, 0x0074($sp) + +/* 04280 8093CF50 E7A00074 */ swc1 $f0, 0x0074($sp) /* 04284 8093CF54 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 /* 04288 8093CF58 44816000 */ mtc1 $at, $f12 ## $f12 = 20.00 /* 0428C 8093CF5C 0C00CFC8 */ jal Math_Rand_CenteredFloat - -/* 04290 8093CF60 E7A00078 */ swc1 $f0, 0x0078($sp) -/* 04294 8093CF64 C7A40080 */ lwc1 $f4, 0x0080($sp) -/* 04298 8093CF68 C7A60074 */ lwc1 $f6, 0x0074($sp) -/* 0429C 8093CF6C C7AA0084 */ lwc1 $f10, 0x0084($sp) -/* 042A0 8093CF70 C7B00078 */ lwc1 $f16, 0x0078($sp) -/* 042A4 8093CF74 46062200 */ add.s $f8, $f4, $f6 -/* 042A8 8093CF78 C7A40088 */ lwc1 $f4, 0x0088($sp) + +/* 04290 8093CF60 E7A00078 */ swc1 $f0, 0x0078($sp) +/* 04294 8093CF64 C7A40080 */ lwc1 $f4, 0x0080($sp) +/* 04298 8093CF68 C7A60074 */ lwc1 $f6, 0x0074($sp) +/* 0429C 8093CF6C C7AA0084 */ lwc1 $f10, 0x0084($sp) +/* 042A0 8093CF70 C7B00078 */ lwc1 $f16, 0x0078($sp) +/* 042A4 8093CF74 46062200 */ add.s $f8, $f4, $f6 +/* 042A8 8093CF78 C7A40088 */ lwc1 $f4, 0x0088($sp) /* 042AC 8093CF7C 3C014120 */ lui $at, 0x4120 ## $at = 41200000 -/* 042B0 8093CF80 46105480 */ add.s $f18, $f10, $f16 +/* 042B0 8093CF80 46105480 */ add.s $f18, $f10, $f16 /* 042B4 8093CF84 44816000 */ mtc1 $at, $f12 ## $f12 = 10.00 -/* 042B8 8093CF88 E7A0007C */ swc1 $f0, 0x007C($sp) -/* 042BC 8093CF8C 46002180 */ add.s $f6, $f4, $f0 -/* 042C0 8093CF90 E7A80080 */ swc1 $f8, 0x0080($sp) -/* 042C4 8093CF94 E7B20084 */ swc1 $f18, 0x0084($sp) -/* 042C8 8093CF98 E7B60068 */ swc1 $f22, 0x0068($sp) -/* 042CC 8093CF9C E7A60088 */ swc1 $f6, 0x0088($sp) -/* 042D0 8093CFA0 E7B6006C */ swc1 $f22, 0x006C($sp) +/* 042B8 8093CF88 E7A0007C */ swc1 $f0, 0x007C($sp) +/* 042BC 8093CF8C 46002180 */ add.s $f6, $f4, $f0 +/* 042C0 8093CF90 E7A80080 */ swc1 $f8, 0x0080($sp) +/* 042C4 8093CF94 E7B20084 */ swc1 $f18, 0x0084($sp) +/* 042C8 8093CF98 E7B60068 */ swc1 $f22, 0x0068($sp) +/* 042CC 8093CF9C E7A60088 */ swc1 $f6, 0x0088($sp) +/* 042D0 8093CFA0 E7B6006C */ swc1 $f22, 0x006C($sp) /* 042D4 8093CFA4 0C00CFBE */ jal Math_Rand_ZeroFloat - -/* 042D8 8093CFA8 E7B60070 */ swc1 $f22, 0x0070($sp) -/* 042DC 8093CFAC C7AA0074 */ lwc1 $f10, 0x0074($sp) -/* 042E0 8093CFB0 46140200 */ add.s $f8, $f0, $f20 + +/* 042D8 8093CFA8 E7B60070 */ swc1 $f22, 0x0070($sp) +/* 042DC 8093CFAC C7AA0074 */ lwc1 $f10, 0x0074($sp) +/* 042E0 8093CFB0 46140200 */ add.s $f8, $f0, $f20 /* 042E4 8093CFB4 02402025 */ or $a0, $s2, $zero ## $a0 = 00000000 /* 042E8 8093CFB8 27A50080 */ addiu $a1, $sp, 0x0080 ## $a1 = FFFFFFC0 -/* 042EC 8093CFBC 4616503C */ c.lt.s $f10, $f22 -/* 042F0 8093CFC0 E7A80010 */ swc1 $f8, 0x0010($sp) +/* 042EC 8093CFBC 4616503C */ c.lt.s $f10, $f22 +/* 042F0 8093CFC0 E7A80010 */ swc1 $f8, 0x0010($sp) /* 042F4 8093CFC4 27A60074 */ addiu $a2, $sp, 0x0074 ## $a2 = FFFFFFB4 /* 042F8 8093CFC8 27A70068 */ addiu $a3, $sp, 0x0068 ## $a3 = FFFFFFA8 -/* 042FC 8093CFCC 45000002 */ bc1f .L8093CFD8 +/* 042FC 8093CFCC 45000002 */ bc1f .L8093CFD8 /* 04300 8093CFD0 00006025 */ or $t4, $zero, $zero ## $t4 = 00000000 /* 04304 8093CFD4 240C0001 */ addiu $t4, $zero, 0x0001 ## $t4 = 00000001 .L8093CFD8: -/* 04308 8093CFD8 0C24E41C */ jal func_80939070 -/* 0430C 8093CFDC AFAC0014 */ sw $t4, 0x0014($sp) +/* 04308 8093CFD8 0C24E41C */ jal func_80939070 +/* 0430C 8093CFDC AFAC0014 */ sw $t4, 0x0014($sp) /* 04310 8093CFE0 26100001 */ addiu $s0, $s0, 0x0001 ## $s0 = 00000001 -/* 04314 8093CFE4 00108400 */ sll $s0, $s0, 16 -/* 04318 8093CFE8 00108403 */ sra $s0, $s0, 16 -/* 0431C 8093CFEC 2A010032 */ slti $at, $s0, 0x0032 -/* 04320 8093CFF0 5420FFCA */ bnel $at, $zero, .L8093CF1C -/* 04324 8093CFF4 8FA2004C */ lw $v0, 0x004C($sp) +/* 04314 8093CFE4 00108400 */ sll $s0, $s0, 16 +/* 04318 8093CFE8 00108403 */ sra $s0, $s0, 16 +/* 0431C 8093CFEC 2A010032 */ slti $at, $s0, 0x0032 +/* 04320 8093CFF0 5420FFCA */ bnel $at, $zero, .L8093CF1C +/* 04324 8093CFF4 8FA2004C */ lw $v0, 0x004C($sp) /* 04328 8093CFF8 8E2F0004 */ lw $t7, 0x0004($s1) ## 00000004 /* 0432C 8093CFFC 240D0001 */ addiu $t5, $zero, 0x0001 ## $t5 = 00000001 /* 04330 8093D000 240E0001 */ addiu $t6, $zero, 0x0001 ## $t6 = 00000001 @@ -484,106 +484,106 @@ glabel func_8093C910 /* 04340 8093D010 AE380004 */ sw $t8, 0x0004($s1) ## 00000004 /* 04344 8093D014 A62000B6 */ sh $zero, 0x00B6($s1) ## 000000B6 /* 04348 8093D018 3C048095 */ lui $a0, %hi(D_8094C844) ## $a0 = 80950000 -/* 0434C 8093D01C 8C84C844 */ lw $a0, %lo(D_8094C844)($a0) -/* 04350 8093D020 0C24F209 */ jal func_8093C824 +/* 0434C 8093D01C 8C84C844 */ lw $a0, %lo(D_8094C844)($a0) +/* 04350 8093D020 0C24F209 */ jal func_8093C824 /* 04354 8093D024 02402825 */ or $a1, $s2, $zero ## $a1 = 00000000 /* 04358 8093D028 3C048095 */ lui $a0, %hi(D_8094C848) ## $a0 = 80950000 -/* 0435C 8093D02C 8C84C848 */ lw $a0, %lo(D_8094C848)($a0) -/* 04360 8093D030 0C24F209 */ jal func_8093C824 +/* 0435C 8093D02C 8C84C848 */ lw $a0, %lo(D_8094C848)($a0) +/* 04360 8093D030 0C24F209 */ jal func_8093C824 /* 04364 8093D034 02402825 */ or $a1, $s2, $zero ## $a1 = 00000000 -/* 04368 8093D038 4405B000 */ mfc1 $a1, $f22 +/* 04368 8093D038 4405B000 */ mfc1 $a1, $f22 /* 0436C 8093D03C 0C00B58B */ jal Actor_SetScale - + /* 04370 8093D040 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 04374 8093D044 3C100604 */ lui $s0, 0x0604 ## $s0 = 06040000 /* 04378 8093D048 26108E2C */ addiu $s0, $s0, 0x8E2C ## $s0 = 06038E2C -/* 0437C 8093D04C 4406B000 */ mfc1 $a2, $f22 +/* 0437C 8093D04C 4406B000 */ mfc1 $a2, $f22 /* 04380 8093D050 02002825 */ or $a1, $s0, $zero ## $a1 = 06038E2C -/* 04384 8093D054 0C029490 */ jal func_800A5240 +/* 04384 8093D054 0C029490 */ jal SkelAnime_ChangeAnimTransitionStop /* 04388 8093D058 26240568 */ addiu $a0, $s1, 0x0568 ## $a0 = 00000568 /* 0438C 8093D05C 0C028800 */ jal SkelAnime_GetFrameCount - + /* 04390 8093D060 02002025 */ or $a0, $s0, $zero ## $a0 = 06038E2C /* 04394 8093D064 44828000 */ mtc1 $v0, $f16 ## $f16 = 0.00 /* 04398 8093D068 24190032 */ addiu $t9, $zero, 0x0032 ## $t9 = 00000032 /* 0439C 8093D06C A6390178 */ sh $t9, 0x0178($s1) ## 00000178 -/* 043A0 8093D070 468084A0 */ cvt.s.w $f18, $f16 +/* 043A0 8093D070 468084A0 */ cvt.s.w $f18, $f16 /* 043A4 8093D074 02402025 */ or $a0, $s2, $zero ## $a0 = 00000000 /* 043A8 8093D078 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 /* 043AC 8093D07C 24060002 */ addiu $a2, $zero, 0x0002 ## $a2 = 00000002 -/* 043B0 8093D080 0C00B7D5 */ jal func_8002DF54 +/* 043B0 8093D080 0C00B7D5 */ jal func_8002DF54 /* 043B4 8093D084 E63201A4 */ swc1 $f18, 0x01A4($s1) ## 000001A4 /* 043B8 8093D088 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 043BC 8093D08C 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 043C0 8093D090 2405390D */ addiu $a1, $zero, 0x390D ## $a1 = 0000390D /* 043C4 8093D094 0C03E803 */ jal Audio_SetBGM - + /* 043C8 8093D098 2404001B */ addiu $a0, $zero, 0x001B ## $a0 = 0000001B .L8093D09C: /* 043CC 8093D09C 3C028095 */ lui $v0, %hi(D_8094C848) ## $v0 = 80950000 -/* 043D0 8093D0A0 8C42C848 */ lw $v0, %lo(D_8094C848)($v0) +/* 043D0 8093D0A0 8C42C848 */ lw $v0, %lo(D_8094C848)($v0) /* 043D4 8093D0A4 3C088095 */ lui $t0, %hi(D_8094C848) ## $t0 = 80950000 /* 043D8 8093D0A8 3C098095 */ lui $t1, %hi(D_8094C844) ## $t1 = 80950000 /* 043DC 8093D0AC C4400050 */ lwc1 $f0, 0x0050($v0) ## 80950050 /* 043E0 8093D0B0 3C0A8095 */ lui $t2, %hi(D_8094C844) ## $t2 = 80950000 /* 043E4 8093D0B4 3C0B8095 */ lui $t3, %hi(D_8094C844) ## $t3 = 80950000 /* 043E8 8093D0B8 E4400058 */ swc1 $f0, 0x0058($v0) ## 80950058 -/* 043EC 8093D0BC 8D08C848 */ lw $t0, %lo(D_8094C848)($t0) +/* 043EC 8093D0BC 8D08C848 */ lw $t0, %lo(D_8094C848)($t0) /* 043F0 8093D0C0 E5000054 */ swc1 $f0, 0x0054($t0) ## 80950054 -/* 043F4 8093D0C4 8D29C844 */ lw $t1, %lo(D_8094C844)($t1) +/* 043F4 8093D0C4 8D29C844 */ lw $t1, %lo(D_8094C844)($t1) /* 043F8 8093D0C8 E5200058 */ swc1 $f0, 0x0058($t1) ## 80950058 -/* 043FC 8093D0CC 8D4AC844 */ lw $t2, %lo(D_8094C844)($t2) +/* 043FC 8093D0CC 8D4AC844 */ lw $t2, %lo(D_8094C844)($t2) /* 04400 8093D0D0 E5400054 */ swc1 $f0, 0x0054($t2) ## 80950054 -/* 04404 8093D0D4 8D6BC844 */ lw $t3, %lo(D_8094C844)($t3) -/* 04408 8093D0D8 100000B7 */ beq $zero, $zero, .L8093D3B8 +/* 04404 8093D0D4 8D6BC844 */ lw $t3, %lo(D_8094C844)($t3) +/* 04408 8093D0D8 100000B7 */ beq $zero, $zero, .L8093D3B8 /* 0440C 8093D0DC E5600050 */ swc1 $f0, 0x0050($t3) ## 80950050 .L8093D0E0: /* 04410 8093D0E0 02002025 */ or $a0, $s0, $zero ## $a0 = 06038E2C -/* 04414 8093D0E4 0C0295B2 */ jal func_800A56C8 +/* 04414 8093D0E4 0C0295B2 */ jal func_800A56C8 /* 04418 8093D0E8 8E2501A4 */ lw $a1, 0x01A4($s1) ## 000001A4 -/* 0441C 8093D0EC 10400005 */ beq $v0, $zero, .L8093D104 +/* 0441C 8093D0EC 10400005 */ beq $v0, $zero, .L8093D104 /* 04420 8093D0F0 02002025 */ or $a0, $s0, $zero ## $a0 = 06038E2C /* 04424 8093D0F4 3C050603 */ lui $a1, 0x0603 ## $a1 = 06030000 /* 04428 8093D0F8 24A52BF8 */ addiu $a1, $a1, 0x2BF8 ## $a1 = 06032BF8 -/* 0442C 8093D0FC 0C0294D3 */ jal func_800A534C +/* 0442C 8093D0FC 0C0294D3 */ jal SkelAnime_ChangeAnimTransitionRepeat /* 04430 8093D100 3C06C170 */ lui $a2, 0xC170 ## $a2 = C1700000 .L8093D104: /* 04434 8093D104 240CFFFF */ addiu $t4, $zero, 0xFFFF ## $t4 = FFFFFFFF /* 04438 8093D108 3C018095 */ lui $at, %hi(D_8094C840) ## $at = 80950000 -/* 0443C 8093D10C A02CC840 */ sb $t4, %lo(D_8094C840)($at) +/* 0443C 8093D10C A02CC840 */ sb $t4, %lo(D_8094C840)($at) /* 04440 8093D110 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 04444 8093D114 00320821 */ addu $at, $at, $s2 +/* 04444 8093D114 00320821 */ addu $at, $at, $s2 /* 04448 8093D118 240D0004 */ addiu $t5, $zero, 0x0004 ## $t5 = 00000004 /* 0444C 8093D11C A02D0AE1 */ sb $t5, 0x0AE1($at) ## 00010AE1 /* 04450 8093D120 3C010001 */ lui $at, 0x0001 ## $at = 00010000 /* 04454 8093D124 34210AFC */ ori $at, $at, 0x0AFC ## $at = 00010AFC -/* 04458 8093D128 4405A000 */ mfc1 $a1, $f20 -/* 0445C 8093D12C 4406A000 */ mfc1 $a2, $f20 +/* 04458 8093D128 4405A000 */ mfc1 $a1, $f20 +/* 0445C 8093D12C 4406A000 */ mfc1 $a2, $f20 /* 04460 8093D130 3C073DCC */ lui $a3, 0x3DCC ## $a3 = 3DCC0000 /* 04464 8093D134 34E7CCCD */ ori $a3, $a3, 0xCCCD ## $a3 = 3DCCCCCD /* 04468 8093D138 0C01E107 */ jal Math_SmoothScaleMaxF - -/* 0446C 8093D13C 02412021 */ addu $a0, $s2, $at + +/* 0446C 8093D13C 02412021 */ addu $a0, $s2, $at .L8093D140: /* 04470 8093D140 0C02927F */ jal SkelAnime_FrameUpdateMatrix - + /* 04474 8093D144 26240568 */ addiu $a0, $s1, 0x0568 ## $a0 = 00000568 /* 04478 8093D148 3C053BE5 */ lui $a1, 0x3BE5 ## $a1 = 3BE50000 -/* 0447C 8093D14C 4406A000 */ mfc1 $a2, $f20 +/* 0447C 8093D14C 4406A000 */ mfc1 $a2, $f20 /* 04480 8093D150 3C073A37 */ lui $a3, 0x3A37 ## $a3 = 3A370000 /* 04484 8093D154 34E78033 */ ori $a3, $a3, 0x8033 ## $a3 = 3A378033 /* 04488 8093D158 34A56040 */ ori $a1, $a1, 0x6040 ## $a1 = 3BE56040 /* 0448C 8093D15C 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 04490 8093D160 26240050 */ addiu $a0, $s1, 0x0050 ## $a0 = 00000050 /* 04494 8093D164 C6200050 */ lwc1 $f0, 0x0050($s1) ## 00000050 /* 04498 8093D168 862E0178 */ lh $t6, 0x0178($s1) ## 00000178 /* 0449C 8093D16C 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 /* 044A0 8093D170 E6200058 */ swc1 $f0, 0x0058($s1) ## 00000058 -/* 044A4 8093D174 15C10026 */ bne $t6, $at, .L8093D210 +/* 044A4 8093D174 15C10026 */ bne $t6, $at, .L8093D210 /* 044A8 8093D178 E6200054 */ swc1 $f0, 0x0054($s1) ## 00000054 -/* 044AC 8093D17C 8FA700A0 */ lw $a3, 0x00A0($sp) +/* 044AC 8093D17C 8FA700A0 */ lw $a3, 0x00A0($sp) /* 044B0 8093D180 3C014370 */ lui $at, 0x4370 ## $at = 43700000 /* 044B4 8093D184 44812000 */ mtc1 $at, $f4 ## $f4 = 240.00 /* 044B8 8093D188 240F0002 */ addiu $t7, $zero, 0x0002 ## $t7 = 00000002 @@ -616,36 +616,36 @@ glabel func_8093C910 /* 04524 8093D1F4 44812000 */ mtc1 $at, $f4 ## $f4 = 54.00 /* 04528 8093D1F8 E6300630 */ swc1 $f16, 0x0630($s1) ## 00000630 /* 0452C 8093D1FC C4F20028 */ lwc1 $f18, 0x0028($a3) ## 00000028 -/* 04530 8093D200 46049180 */ add.s $f6, $f18, $f4 +/* 04530 8093D200 46049180 */ add.s $f6, $f18, $f4 /* 04534 8093D204 E6260634 */ swc1 $f6, 0x0634($s1) ## 00000634 /* 04538 8093D208 C4E8002C */ lwc1 $f8, 0x002C($a3) ## 0000002C /* 0453C 8093D20C E6280638 */ swc1 $f8, 0x0638($s1) ## 00000638 .L8093D210: /* 04540 8093D210 8623017E */ lh $v1, 0x017E($s1) ## 0000017E /* 04544 8093D214 24010013 */ addiu $at, $zero, 0x0013 ## $at = 00000013 -/* 04548 8093D218 8FA700A0 */ lw $a3, 0x00A0($sp) -/* 0454C 8093D21C 14610006 */ bne $v1, $at, .L8093D238 +/* 04548 8093D218 8FA700A0 */ lw $a3, 0x00A0($sp) +/* 0454C 8093D21C 14610006 */ bne $v1, $at, .L8093D238 /* 04550 8093D220 02402025 */ or $a0, $s2, $zero ## $a0 = 00000000 /* 04554 8093D224 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 04558 8093D228 0C00B7D5 */ jal func_8002DF54 +/* 04558 8093D228 0C00B7D5 */ jal func_8002DF54 /* 0455C 8093D22C 24060005 */ addiu $a2, $zero, 0x0005 ## $a2 = 00000005 /* 04560 8093D230 8623017E */ lh $v1, 0x017E($s1) ## 0000017E -/* 04564 8093D234 8FA700A0 */ lw $a3, 0x00A0($sp) +/* 04564 8093D234 8FA700A0 */ lw $a3, 0x00A0($sp) .L8093D238: /* 04568 8093D238 24010010 */ addiu $at, $zero, 0x0010 ## $at = 00000010 -/* 0456C 8093D23C 14610008 */ bne $v1, $at, .L8093D260 +/* 0456C 8093D23C 14610008 */ bne $v1, $at, .L8093D260 /* 04570 8093D240 00000000 */ nop /* 04574 8093D244 8CEB0678 */ lw $t3, 0x0678($a3) ## 00000678 /* 04578 8093D248 00E02025 */ or $a0, $a3, $zero ## $a0 = 00000000 /* 0457C 8093D24C 95650092 */ lhu $a1, 0x0092($t3) ## 00000092 /* 04580 8093D250 24A56816 */ addiu $a1, $a1, 0x6816 ## $a1 = 00006816 -/* 04584 8093D254 0C00BDF7 */ jal func_8002F7DC +/* 04584 8093D254 0C00BDF7 */ jal func_8002F7DC /* 04588 8093D258 30A5FFFF */ andi $a1, $a1, 0xFFFF ## $a1 = 00006816 /* 0458C 8093D25C 8623017E */ lh $v1, 0x017E($s1) ## 0000017E .L8093D260: -/* 04590 8093D260 1060000C */ beq $v1, $zero, .L8093D294 -/* 04594 8093D264 28610014 */ slti $at, $v1, 0x0014 -/* 04598 8093D268 1020000A */ beq $at, $zero, .L8093D294 +/* 04590 8093D260 1060000C */ beq $v1, $zero, .L8093D294 +/* 04594 8093D264 28610014 */ slti $at, $v1, 0x0014 +/* 04598 8093D268 1020000A */ beq $at, $zero, .L8093D294 /* 0459C 8093D26C 240C0001 */ addiu $t4, $zero, 0x0001 ## $t4 = 00000001 /* 045A0 8093D270 3C063E4C */ lui $a2, 0x3E4C ## $a2 = 3E4C0000 /* 045A4 8093D274 A22C05F9 */ sb $t4, 0x05F9($s1) ## 000005F9 @@ -653,9 +653,9 @@ glabel func_8093C910 /* 045AC 8093D27C 2624062C */ addiu $a0, $s1, 0x062C ## $a0 = 0000062C /* 045B0 8093D280 3C054372 */ lui $a1, 0x4372 ## $a1 = 43720000 /* 045B4 8093D284 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 045B8 8093D288 3C0742C8 */ lui $a3, 0x42C8 ## $a3 = 42C80000 -/* 045BC 8093D28C 10000003 */ beq $zero, $zero, .L8093D29C +/* 045BC 8093D28C 10000003 */ beq $zero, $zero, .L8093D29C /* 045C0 8093D290 862D017A */ lh $t5, 0x017A($s1) ## 0000017A .L8093D294: /* 045C4 8093D294 A22005F9 */ sb $zero, 0x05F9($s1) ## 000005F9 @@ -663,31 +663,31 @@ glabel func_8093C910 .L8093D29C: /* 045CC 8093D29C 24020008 */ addiu $v0, $zero, 0x0008 ## $v0 = 00000008 /* 045D0 8093D2A0 240439BB */ addiu $a0, $zero, 0x39BB ## $a0 = 000039BB -/* 045D4 8093D2A4 544D0004 */ bnel $v0, $t5, .L8093D2B8 +/* 045D4 8093D2A4 544D0004 */ bnel $v0, $t5, .L8093D2B8 /* 045D8 8093D2A8 8622017C */ lh $v0, 0x017C($s1) ## 0000017C -/* 045DC 8093D2AC 0C01E221 */ jal func_80078884 +/* 045DC 8093D2AC 0C01E221 */ jal func_80078884 /* 045E0 8093D2B0 A6220162 */ sh $v0, 0x0162($s1) ## 00000162 /* 045E4 8093D2B4 8622017C */ lh $v0, 0x017C($s1) ## 0000017C .L8093D2B8: /* 045E8 8093D2B8 24010004 */ addiu $at, $zero, 0x0004 ## $at = 00000004 /* 045EC 8093D2BC 240E0005 */ addiu $t6, $zero, 0x0005 ## $t6 = 00000005 -/* 045F0 8093D2C0 14410007 */ bne $v0, $at, .L8093D2E0 +/* 045F0 8093D2C0 14410007 */ bne $v0, $at, .L8093D2E0 /* 045F4 8093D2C4 02402025 */ or $a0, $s2, $zero ## $a0 = 00000000 /* 045F8 8093D2C8 3C018095 */ lui $at, %hi(D_8094C840) ## $at = 80950000 -/* 045FC 8093D2CC A020C840 */ sb $zero, %lo(D_8094C840)($at) +/* 045FC 8093D2CC A020C840 */ sb $zero, %lo(D_8094C840)($at) /* 04600 8093D2D0 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 04604 8093D2D4 00320821 */ addu $at, $at, $s2 +/* 04604 8093D2D4 00320821 */ addu $at, $at, $s2 /* 04608 8093D2D8 A02E0AE2 */ sb $t6, 0x0AE2($at) ## 00010AE2 /* 0460C 8093D2DC 8622017C */ lh $v0, 0x017C($s1) ## 0000017C .L8093D2E0: /* 04610 8093D2E0 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 04614 8093D2E4 14410034 */ bne $v0, $at, .L8093D3B8 +/* 04614 8093D2E4 14410034 */ bne $v0, $at, .L8093D3B8 /* 04618 8093D2E8 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 0461C 8093D2EC 264F1D64 */ addiu $t7, $s2, 0x1D64 ## $t7 = 00001D64 /* 04620 8093D2F0 2638060C */ addiu $t8, $s1, 0x060C ## $t8 = 0000060C -/* 04624 8093D2F4 AFB80048 */ sw $t8, 0x0048($sp) -/* 04628 8093D2F8 AFAF004C */ sw $t7, 0x004C($sp) -/* 0462C 8093D2FC 0C030129 */ jal func_800C04A4 +/* 04624 8093D2F4 AFB80048 */ sw $t8, 0x0048($sp) +/* 04628 8093D2F8 AFAF004C */ sw $t7, 0x004C($sp) +/* 0462C 8093D2FC 0C030129 */ jal func_800C04A4 /* 04630 8093D300 26300600 */ addiu $s0, $s1, 0x0600 ## $s0 = 00000600 /* 04634 8093D304 8E080000 */ lw $t0, 0x0000($s0) ## 00000600 /* 04638 8093D308 02402025 */ or $a0, $s2, $zero ## $a0 = 00000000 @@ -703,24 +703,24 @@ glabel func_8093C910 /* 04660 8093D330 AC490078 */ sw $t1, 0x0078($v0) ## 00000078 /* 04664 8093D334 8E0A0008 */ lw $t2, 0x0008($s0) ## 00000608 /* 04668 8093D338 AC4A007C */ sw $t2, 0x007C($v0) ## 0000007C -/* 0466C 8093D33C 8FAB0048 */ lw $t3, 0x0048($sp) +/* 0466C 8093D33C 8FAB0048 */ lw $t3, 0x0048($sp) /* 04670 8093D340 8D6D0000 */ lw $t5, 0x0000($t3) ## 00000000 /* 04674 8093D344 AC4D0050 */ sw $t5, 0x0050($v0) ## 00000050 /* 04678 8093D348 8D6C0004 */ lw $t4, 0x0004($t3) ## 00000004 /* 0467C 8093D34C AC4C0054 */ sw $t4, 0x0054($v0) ## 00000054 /* 04680 8093D350 8D6D0008 */ lw $t5, 0x0008($t3) ## 00000008 /* 04684 8093D354 AC4D0058 */ sw $t5, 0x0058($v0) ## 00000058 -/* 04688 8093D358 0C03022B */ jal func_800C08AC +/* 04688 8093D358 0C03022B */ jal func_800C08AC /* 0468C 8093D35C 862505FC */ lh $a1, 0x05FC($s1) ## 000005FC /* 04690 8093D360 A62005FC */ sh $zero, 0x05FC($s1) ## 000005FC /* 04694 8093D364 862E05FC */ lh $t6, 0x05FC($s1) ## 000005FC /* 04698 8093D368 02402025 */ or $a0, $s2, $zero ## $a0 = 00000000 /* 0469C 8093D36C A62E05FA */ sh $t6, 0x05FA($s1) ## 000005FA -/* 046A0 8093D370 0C01914D */ jal func_80064534 -/* 046A4 8093D374 8FA5004C */ lw $a1, 0x004C($sp) +/* 046A0 8093D370 0C01914D */ jal func_80064534 +/* 046A4 8093D374 8FA5004C */ lw $a1, 0x004C($sp) /* 046A8 8093D378 02402025 */ or $a0, $s2, $zero ## $a0 = 00000000 /* 046AC 8093D37C 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 046B0 8093D380 0C00B7D5 */ jal func_8002DF54 +/* 046B0 8093D380 0C00B7D5 */ jal func_8002DF54 /* 046B4 8093D384 24060007 */ addiu $a2, $zero, 0x0007 ## $a2 = 00000007 /* 046B8 8093D388 3C0F8095 */ lui $t7, %hi(D_8094A86C) ## $t7 = 80950000 /* 046BC 8093D38C A6200154 */ sh $zero, 0x0154($s1) ## 00000154 @@ -732,17 +732,17 @@ glabel func_8093C910 /* 046D4 8093D3A4 8DF80004 */ lw $t8, 0x0004($t7) ## 8094A870 /* 046D8 8093D3A8 AE3804B4 */ sw $t8, 0x04B4($s1) ## 000004B4 /* 046DC 8093D3AC 8DF90008 */ lw $t9, 0x0008($t7) ## 8094A874 -/* 046E0 8093D3B0 0C252870 */ jal func_8094A1C0 +/* 046E0 8093D3B0 0C252870 */ jal func_8094A1C0 /* 046E4 8093D3B4 AE3904B8 */ sw $t9, 0x04B8($s1) ## 000004B8 .L8093D3B8: -/* 046E8 8093D3B8 8FBF003C */ lw $ra, 0x003C($sp) +/* 046E8 8093D3B8 8FBF003C */ lw $ra, 0x003C($sp) .L8093D3BC: -/* 046EC 8093D3BC D7B40020 */ ldc1 $f20, 0x0020($sp) -/* 046F0 8093D3C0 D7B60028 */ ldc1 $f22, 0x0028($sp) -/* 046F4 8093D3C4 8FB00030 */ lw $s0, 0x0030($sp) -/* 046F8 8093D3C8 8FB10034 */ lw $s1, 0x0034($sp) -/* 046FC 8093D3CC 8FB20038 */ lw $s2, 0x0038($sp) -/* 04700 8093D3D0 03E00008 */ jr $ra +/* 046EC 8093D3BC D7B40020 */ ldc1 $f20, 0x0020($sp) +/* 046F0 8093D3C0 D7B60028 */ ldc1 $f22, 0x0028($sp) +/* 046F4 8093D3C4 8FB00030 */ lw $s0, 0x0030($sp) +/* 046F8 8093D3C8 8FB10034 */ lw $s1, 0x0034($sp) +/* 046FC 8093D3CC 8FB20038 */ lw $s2, 0x0038($sp) +/* 04700 8093D3D0 03E00008 */ jr $ra /* 04704 8093D3D4 27BD00C0 */ addiu $sp, $sp, 0x00C0 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093D3D8.s b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093D3D8.s index 8b44a0b929..cc4c93c67b 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093D3D8.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093D3D8.s @@ -1,31 +1,31 @@ glabel func_8093D3D8 /* 04708 8093D3D8 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 0470C 8093D3DC AFA5001C */ sw $a1, 0x001C($sp) +/* 0470C 8093D3DC AFA5001C */ sw $a1, 0x001C($sp) /* 04710 8093D3E0 3C0E8094 */ lui $t6, %hi(func_8093D444) ## $t6 = 80940000 -/* 04714 8093D3E4 AFBF0014 */ sw $ra, 0x0014($sp) +/* 04714 8093D3E4 AFBF0014 */ sw $ra, 0x0014($sp) /* 04718 8093D3E8 25CED444 */ addiu $t6, $t6, %lo(func_8093D444) ## $t6 = 8093D444 /* 0471C 8093D3EC 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 /* 04720 8093D3F0 AC8E014C */ sw $t6, 0x014C($a0) ## 0000014C /* 04724 8093D3F4 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 04728 8093D3F8 24A504A4 */ addiu $a1, $a1, 0x04A4 ## $a1 = 060004A4 -/* 0472C 8093D3FC AFA70018 */ sw $a3, 0x0018($sp) +/* 0472C 8093D3FC AFA70018 */ sw $a3, 0x0018($sp) /* 04730 8093D400 24840568 */ addiu $a0, $a0, 0x0568 ## $a0 = 00000568 -/* 04734 8093D404 0C0294D3 */ jal func_800A534C +/* 04734 8093D404 0C0294D3 */ jal SkelAnime_ChangeAnimTransitionRepeat /* 04738 8093D408 3C06C040 */ lui $a2, 0xC040 ## $a2 = C0400000 -/* 0473C 8093D40C 8FAF0018 */ lw $t7, 0x0018($sp) +/* 0473C 8093D40C 8FAF0018 */ lw $t7, 0x0018($sp) /* 04740 8093D410 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 /* 04744 8093D414 44816000 */ mtc1 $at, $f12 ## $f12 = 20.00 /* 04748 8093D418 0C00CFBE */ jal Math_Rand_ZeroFloat - + /* 0474C 8093D41C A1E005F8 */ sb $zero, 0x05F8($t7) ## 000005F8 -/* 04750 8093D420 4600010D */ trunc.w.s $f4, $f0 -/* 04754 8093D424 8FA80018 */ lw $t0, 0x0018($sp) -/* 04758 8093D428 44192000 */ mfc1 $t9, $f4 +/* 04750 8093D420 4600010D */ trunc.w.s $f4, $f0 +/* 04754 8093D424 8FA80018 */ lw $t0, 0x0018($sp) +/* 04758 8093D428 44192000 */ mfc1 $t9, $f4 /* 0475C 8093D42C 00000000 */ nop /* 04760 8093D430 A5190152 */ sh $t9, 0x0152($t0) ## 00000152 -/* 04764 8093D434 8FBF0014 */ lw $ra, 0x0014($sp) +/* 04764 8093D434 8FBF0014 */ lw $ra, 0x0014($sp) /* 04768 8093D438 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 0476C 8093D43C 03E00008 */ jr $ra +/* 0476C 8093D43C 03E00008 */ jr $ra /* 04770 8093D440 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093D5C0.s b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093D5C0.s index 338ccd0c98..f9886f7fbe 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093D5C0.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093D5C0.s @@ -1,87 +1,87 @@ glabel func_8093D5C0 /* 048F0 8093D5C0 27BDFF60 */ addiu $sp, $sp, 0xFF60 ## $sp = FFFFFF60 -/* 048F4 8093D5C4 AFBF0034 */ sw $ra, 0x0034($sp) -/* 048F8 8093D5C8 AFB30030 */ sw $s3, 0x0030($sp) -/* 048FC 8093D5CC AFB2002C */ sw $s2, 0x002C($sp) -/* 04900 8093D5D0 AFB10028 */ sw $s1, 0x0028($sp) -/* 04904 8093D5D4 AFB00024 */ sw $s0, 0x0024($sp) -/* 04908 8093D5D8 AFA500A4 */ sw $a1, 0x00A4($sp) -/* 0490C 8093D5DC A3A0009F */ sb $zero, 0x009F($sp) +/* 048F4 8093D5C4 AFBF0034 */ sw $ra, 0x0034($sp) +/* 048F8 8093D5C8 AFB30030 */ sw $s3, 0x0030($sp) +/* 048FC 8093D5CC AFB2002C */ sw $s2, 0x002C($sp) +/* 04900 8093D5D0 AFB10028 */ sw $s1, 0x0028($sp) +/* 04904 8093D5D4 AFB00024 */ sw $s0, 0x0024($sp) +/* 04908 8093D5D8 AFA500A4 */ sw $a1, 0x00A4($sp) +/* 0490C 8093D5DC A3A0009F */ sb $zero, 0x009F($sp) /* 04910 8093D5E0 848205FE */ lh $v0, 0x05FE($a0) ## 000005FE /* 04914 8093D5E4 00808825 */ or $s1, $a0, $zero ## $s1 = 00000000 /* 04918 8093D5E8 8CB01C44 */ lw $s0, 0x1C44($a1) ## 00001C44 -/* 0491C 8093D5EC 284100DD */ slti $at, $v0, 0x00DD -/* 04920 8093D5F0 14200006 */ bne $at, $zero, .L8093D60C -/* 04924 8093D5F4 28410276 */ slti $at, $v0, 0x0276 -/* 04928 8093D5F8 50200005 */ beql $at, $zero, .L8093D610 +/* 0491C 8093D5EC 284100DD */ slti $at, $v0, 0x00DD +/* 04920 8093D5F0 14200006 */ bne $at, $zero, .L8093D60C +/* 04924 8093D5F4 28410276 */ slti $at, $v0, 0x0276 +/* 04928 8093D5F8 50200005 */ beql $at, $zero, .L8093D610 /* 0492C 8093D5FC 241300B4 */ addiu $s3, $zero, 0x00B4 ## $s3 = 000000B4 -/* 04930 8093D600 0C01E221 */ jal func_80078884 +/* 04930 8093D600 0C01E221 */ jal func_80078884 /* 04934 8093D604 24043120 */ addiu $a0, $zero, 0x3120 ## $a0 = 00003120 /* 04938 8093D608 862205FE */ lh $v0, 0x05FE($s1) ## 000005FE .L8093D60C: /* 0493C 8093D60C 241300B4 */ addiu $s3, $zero, 0x00B4 ## $s3 = 000000B4 .L8093D610: -/* 04940 8093D610 5662000D */ bnel $s3, $v0, .L8093D648 +/* 04940 8093D610 5662000D */ bnel $s3, $v0, .L8093D648 /* 04944 8093D614 963805FA */ lhu $t8, 0x05FA($s1) ## 000005FA /* 04948 8093D618 3C128095 */ lui $s2, %hi(D_8094A7D0) ## $s2 = 80950000 /* 0494C 8093D61C 2652A7D0 */ addiu $s2, $s2, %lo(D_8094A7D0) ## $s2 = 8094A7D0 /* 04950 8093D620 02402025 */ or $a0, $s2, $zero ## $a0 = 8094A7D0 -/* 04954 8093D624 0C01E245 */ jal func_80078914 +/* 04954 8093D624 0C01E245 */ jal func_80078914 /* 04958 8093D628 240539B0 */ addiu $a1, $zero, 0x39B0 ## $a1 = 000039B0 /* 0495C 8093D62C 02402025 */ or $a0, $s2, $zero ## $a0 = 8094A7D0 -/* 04960 8093D630 0C01E245 */ jal func_80078914 +/* 04960 8093D630 0C01E245 */ jal func_80078914 /* 04964 8093D634 240539B1 */ addiu $a1, $zero, 0x39B1 ## $a1 = 000039B1 /* 04968 8093D638 0C03E803 */ jal Audio_SetBGM - + /* 0496C 8093D63C 24040061 */ addiu $a0, $zero, 0x0061 ## $a0 = 00000061 /* 04970 8093D640 862205FE */ lh $v0, 0x05FE($s1) ## 000005FE /* 04974 8093D644 963805FA */ lhu $t8, 0x05FA($s1) ## 000005FA .L8093D648: /* 04978 8093D648 244F0001 */ addiu $t7, $v0, 0x0001 ## $t7 = 00000001 /* 0497C 8093D64C A62F05FE */ sh $t7, 0x05FE($s1) ## 000005FE -/* 04980 8093D650 2F010015 */ sltiu $at, $t8, 0x0015 -/* 04984 8093D654 102005A5 */ beq $at, $zero, .L8093ECEC -/* 04988 8093D658 0018C080 */ sll $t8, $t8, 2 +/* 04980 8093D650 2F010015 */ sltiu $at, $t8, 0x0015 +/* 04984 8093D654 102005A5 */ beq $at, $zero, .L8093ECEC +/* 04988 8093D658 0018C080 */ sll $t8, $t8, 2 /* 0498C 8093D65C 3C018095 */ lui $at, %hi(jtbl_8094AF2C) ## $at = 80950000 -/* 04990 8093D660 00380821 */ addu $at, $at, $t8 -/* 04994 8093D664 8C38AF2C */ lw $t8, %lo(jtbl_8094AF2C)($at) -/* 04998 8093D668 03000008 */ jr $t8 +/* 04990 8093D660 00380821 */ addu $at, $at, $t8 +/* 04994 8093D664 8C38AF2C */ lw $t8, %lo(jtbl_8094AF2C)($at) +/* 04998 8093D668 03000008 */ jr $t8 /* 0499C 8093D66C 00000000 */ nop glabel L8093D670 /* 049A0 8093D670 A62005FE */ sh $zero, 0x05FE($s1) ## 000005FE /* 049A4 8093D674 C6000024 */ lwc1 $f0, 0x0024($s0) ## 00000024 /* 049A8 8093D678 C602002C */ lwc1 $f2, 0x002C($s0) ## 0000002C /* 049AC 8093D67C 3C018095 */ lui $at, %hi(D_8094AF80) ## $at = 80950000 -/* 049B0 8093D680 46000102 */ mul.s $f4, $f0, $f0 -/* 049B4 8093D684 C42AAF80 */ lwc1 $f10, %lo(D_8094AF80)($at) -/* 049B8 8093D688 46021182 */ mul.s $f6, $f2, $f2 -/* 049BC 8093D68C 46062200 */ add.s $f8, $f4, $f6 -/* 049C0 8093D690 460A403C */ c.lt.s $f8, $f10 +/* 049B0 8093D680 46000102 */ mul.s $f4, $f0, $f0 +/* 049B4 8093D684 C42AAF80 */ lwc1 $f10, %lo(D_8094AF80)($at) +/* 049B8 8093D688 46021182 */ mul.s $f6, $f2, $f2 +/* 049BC 8093D68C 46062200 */ add.s $f8, $f4, $f6 +/* 049C0 8093D690 460A403C */ c.lt.s $f8, $f10 /* 049C4 8093D694 00000000 */ nop -/* 049C8 8093D698 45020595 */ bc1fl .L8093ECF0 +/* 049C8 8093D698 45020595 */ bc1fl .L8093ECF0 /* 049CC 8093D69C 862505FC */ lh $a1, 0x05FC($s1) ## 000005FC /* 049D0 8093D6A0 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 /* 049D4 8093D6A4 24190001 */ addiu $t9, $zero, 0x0001 ## $t9 = 00000001 /* 049D8 8093D6A8 E600002C */ swc1 $f0, 0x002C($s0) ## 0000002C /* 049DC 8093D6AC E6000024 */ swc1 $f0, 0x0024($s0) ## 00000024 /* 049E0 8093D6B0 A63905FA */ sh $t9, 0x05FA($s1) ## 000005FA -/* 049E4 8093D6B4 8FA400A4 */ lw $a0, 0x00A4($sp) -/* 049E8 8093D6B8 0C019148 */ jal func_80064520 +/* 049E4 8093D6B4 8FA400A4 */ lw $a0, 0x00A4($sp) +/* 049E8 8093D6B8 0C019148 */ jal func_80064520 /* 049EC 8093D6BC 24851D64 */ addiu $a1, $a0, 0x1D64 ## $a1 = 00001D64 -/* 049F0 8093D6C0 8FA400A4 */ lw $a0, 0x00A4($sp) +/* 049F0 8093D6C0 8FA400A4 */ lw $a0, 0x00A4($sp) /* 049F4 8093D6C4 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 049F8 8093D6C8 0C00B7D5 */ jal func_8002DF54 +/* 049F8 8093D6C8 0C00B7D5 */ jal func_8002DF54 /* 049FC 8093D6CC 24060039 */ addiu $a2, $zero, 0x0039 ## $a2 = 00000039 -/* 04A00 8093D6D0 0C03008C */ jal func_800C0230 -/* 04A04 8093D6D4 8FA400A4 */ lw $a0, 0x00A4($sp) +/* 04A00 8093D6D0 0C03008C */ jal func_800C0230 +/* 04A04 8093D6D4 8FA400A4 */ lw $a0, 0x00A4($sp) /* 04A08 8093D6D8 A62205FC */ sh $v0, 0x05FC($s1) ## 000005FC -/* 04A0C 8093D6DC 8FA400A4 */ lw $a0, 0x00A4($sp) +/* 04A0C 8093D6DC 8FA400A4 */ lw $a0, 0x00A4($sp) /* 04A10 8093D6E0 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 04A14 8093D6E4 0C0300C5 */ jal func_800C0314 +/* 04A14 8093D6E4 0C0300C5 */ jal func_800C0314 /* 04A18 8093D6E8 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 -/* 04A1C 8093D6EC 8FA400A4 */ lw $a0, 0x00A4($sp) +/* 04A1C 8093D6EC 8FA400A4 */ lw $a0, 0x00A4($sp) /* 04A20 8093D6F0 862505FC */ lh $a1, 0x05FC($s1) ## 000005FC -/* 04A24 8093D6F4 0C0300C5 */ jal func_800C0314 +/* 04A24 8093D6F4 0C0300C5 */ jal func_800C0314 /* 04A28 8093D6F8 24060007 */ addiu $a2, $zero, 0x0007 ## $a2 = 00000007 /* 04A2C 8093D6FC 44809000 */ mtc1 $zero, $f18 ## $f18 = 0.00 /* 04A30 8093D700 3C0143E1 */ lui $at, 0x43E1 ## $at = 43E10000 @@ -91,25 +91,25 @@ glabel L8093D670 /* 04A40 8093D710 3C0143AF */ lui $at, 0x43AF ## $at = 43AF0000 /* 04A44 8093D714 44816000 */ mtc1 $at, $f12 ## $f12 = 350.00 /* 04A48 8093D718 3C018095 */ lui $at, %hi(D_8094AF84) ## $at = 80950000 -/* 04A4C 8093D71C C42AAF84 */ lwc1 $f10, %lo(D_8094AF84)($at) +/* 04A4C 8093D71C C42AAF84 */ lwc1 $f10, %lo(D_8094AF84)($at) /* 04A50 8093D720 44804000 */ mtc1 $zero, $f8 ## $f8 = 0.00 /* 04A54 8093D724 3C014348 */ lui $at, 0x4348 ## $at = 43480000 /* 04A58 8093D728 44813000 */ mtc1 $at, $f6 ## $f6 = 200.00 -/* 04A5C 8093D72C 46008105 */ abs.s $f4, $f16 -/* 04A60 8093D730 460C7081 */ sub.s $f2, $f14, $f12 +/* 04A5C 8093D72C 46008105 */ abs.s $f4, $f16 +/* 04A60 8093D730 460C7081 */ sub.s $f2, $f14, $f12 /* 04A64 8093D734 E6260608 */ swc1 $f6, 0x0608($s1) ## 00000608 /* 04A68 8093D738 C6260608 */ lwc1 $f6, 0x0608($s1) ## 00000608 /* 04A6C 8093D73C E62A0674 */ swc1 $f10, 0x0674($s1) ## 00000674 /* 04A70 8093D740 C62A0674 */ lwc1 $f10, 0x0674($s1) ## 00000674 -/* 04A74 8093D744 46001085 */ abs.s $f2, $f2 +/* 04A74 8093D744 46001085 */ abs.s $f2, $f2 /* 04A78 8093D748 3C014387 */ lui $at, 0x4387 ## $at = 43870000 -/* 04A7C 8093D74C 46065181 */ sub.s $f6, $f10, $f6 +/* 04A7C 8093D74C 46065181 */ sub.s $f6, $f10, $f6 /* 04A80 8093D750 44815000 */ mtc1 $at, $f10 ## $f10 = 270.00 /* 04A84 8093D754 E632060C */ swc1 $f18, 0x060C($s1) ## 0000060C /* 04A88 8093D758 C620060C */ lwc1 $f0, 0x060C($s1) ## 0000060C /* 04A8C 8093D75C E62A0610 */ swc1 $f10, 0x0610($s1) ## 00000610 /* 04A90 8093D760 C62A0610 */ lwc1 $f10, 0x0610($s1) ## 00000610 -/* 04A94 8093D764 46003185 */ abs.s $f6, $f6 +/* 04A94 8093D764 46003185 */ abs.s $f6, $f6 /* 04A98 8093D768 E6320684 */ swc1 $f18, 0x0684($s1) ## 00000684 /* 04A9C 8093D76C 3C014370 */ lui $at, 0x4370 ## $at = 43700000 /* 04AA0 8093D770 E6320614 */ swc1 $f18, 0x0614($s1) ## 00000614 @@ -121,37 +121,37 @@ glabel L8093D670 /* 04AB8 8093D788 C6320684 */ lwc1 $f18, 0x0684($s1) ## 00000684 /* 04ABC 8093D78C E628068C */ swc1 $f8, 0x068C($s1) ## 0000068C /* 04AC0 8093D790 C6280688 */ lwc1 $f8, 0x0688($s1) ## 00000688 -/* 04AC4 8093D794 46009001 */ sub.s $f0, $f18, $f0 +/* 04AC4 8093D794 46009001 */ sub.s $f0, $f18, $f0 /* 04AC8 8093D798 C632068C */ lwc1 $f18, 0x068C($s1) ## 0000068C /* 04ACC 8093D79C E62C0604 */ swc1 $f12, 0x0604($s1) ## 00000604 /* 04AD0 8093D7A0 C62C0614 */ lwc1 $f12, 0x0614($s1) ## 00000614 -/* 04AD4 8093D7A4 46000005 */ abs.s $f0, $f0 -/* 04AD8 8093D7A8 460A4281 */ sub.s $f10, $f8, $f10 +/* 04AD4 8093D7A4 46000005 */ abs.s $f0, $f0 +/* 04AD8 8093D7A8 460A4281 */ sub.s $f10, $f8, $f10 /* 04ADC 8093D7AC E630066C */ swc1 $f16, 0x066C($s1) ## 0000066C /* 04AE0 8093D7B0 E62E0670 */ swc1 $f14, 0x0670($s1) ## 00000670 /* 04AE4 8093D7B4 E6240654 */ swc1 $f4, 0x0654($s1) ## 00000654 -/* 04AE8 8093D7B8 46005285 */ abs.s $f10, $f10 -/* 04AEC 8093D7BC 460C9301 */ sub.s $f12, $f18, $f12 +/* 04AE8 8093D7B8 46005285 */ abs.s $f10, $f10 +/* 04AEC 8093D7BC 460C9301 */ sub.s $f12, $f18, $f12 /* 04AF0 8093D7C0 E6220658 */ swc1 $f2, 0x0658($s1) ## 00000658 /* 04AF4 8093D7C4 E626065C */ swc1 $f6, 0x065C($s1) ## 0000065C /* 04AF8 8093D7C8 E6200660 */ swc1 $f0, 0x0660($s1) ## 00000660 -/* 04AFC 8093D7CC 46006305 */ abs.s $f12, $f12 +/* 04AFC 8093D7CC 46006305 */ abs.s $f12, $f12 /* 04B00 8093D7D0 E62A0664 */ swc1 $f10, 0x0664($s1) ## 00000664 /* 04B04 8093D7D4 E62C0668 */ swc1 $f12, 0x0668($s1) ## 00000668 /* 04B08 8093D7D8 3C018095 */ lui $at, %hi(D_8094AF88) ## $at = 80950000 -/* 04B0C 8093D7DC C42CAF88 */ lwc1 $f12, %lo(D_8094AF88)($at) +/* 04B0C 8093D7DC C42CAF88 */ lwc1 $f12, %lo(D_8094AF88)($at) /* 04B10 8093D7E0 A6200150 */ sh $zero, 0x0150($s1) ## 00000150 -/* 04B14 8093D7E4 10000541 */ beq $zero, $zero, .L8093ECEC +/* 04B14 8093D7E4 10000541 */ beq $zero, $zero, .L8093ECEC /* 04B18 8093D7E8 E62C06A0 */ swc1 $f12, 0x06A0($s1) ## 000006A0 glabel L8093D7EC /* 04B1C 8093D7EC 24090001 */ addiu $t1, $zero, 0x0001 ## $t1 = 00000001 -/* 04B20 8093D7F0 A3A9009F */ sb $t1, 0x009F($sp) +/* 04B20 8093D7F0 A3A9009F */ sb $t1, 0x009F($sp) /* 04B24 8093D7F4 862A0150 */ lh $t2, 0x0150($s1) ## 00000150 /* 04B28 8093D7F8 2401001E */ addiu $at, $zero, 0x001E ## $at = 0000001E -/* 04B2C 8093D7FC 8FA400A4 */ lw $a0, 0x00A4($sp) -/* 04B30 8093D800 15410003 */ bne $t2, $at, .L8093D810 +/* 04B2C 8093D7FC 8FA400A4 */ lw $a0, 0x00A4($sp) +/* 04B30 8093D800 15410003 */ bne $t2, $at, .L8093D810 /* 04B34 8093D804 24056048 */ addiu $a1, $zero, 0x6048 ## $a1 = 00006048 -/* 04B38 8093D808 0C042DA0 */ jal func_8010B680 +/* 04B38 8093D808 0C042DA0 */ jal func_8010B680 /* 04B3C 8093D80C 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 .L8093D810: /* 04B40 8093D810 3C053C23 */ lui $a1, 0x3C23 ## $a1 = 3C230000 @@ -160,49 +160,49 @@ glabel L8093D7EC /* 04B4C 8093D81C 34A5D70A */ ori $a1, $a1, 0xD70A ## $a1 = 3C23D70A /* 04B50 8093D820 2624069C */ addiu $a0, $s1, 0x069C ## $a0 = 0000069C /* 04B54 8093D824 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 04B58 8093D828 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 04B5C 8093D82C 86230150 */ lh $v1, 0x0150($s1) ## 00000150 -/* 04B60 8093D830 8FAB00A4 */ lw $t3, 0x00A4($sp) +/* 04B60 8093D830 8FAB00A4 */ lw $t3, 0x00A4($sp) /* 04B64 8093D834 3C053F80 */ lui $a1, 0x3F80 ## $a1 = 3F800000 -/* 04B68 8093D838 28610065 */ slti $at, $v1, 0x0065 -/* 04B6C 8093D83C 1420000C */ bne $at, $zero, .L8093D870 +/* 04B68 8093D838 28610065 */ slti $at, $v1, 0x0065 +/* 04B6C 8093D83C 1420000C */ bne $at, $zero, .L8093D870 /* 04B70 8093D840 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 04B74 8093D844 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 04B78 8093D848 002B0821 */ addu $at, $at, $t3 +/* 04B78 8093D848 002B0821 */ addu $at, $at, $t3 /* 04B7C 8093D84C A0200AE1 */ sb $zero, 0x0AE1($at) ## 00010AE1 -/* 04B80 8093D850 8FA400A4 */ lw $a0, 0x00A4($sp) +/* 04B80 8093D850 8FA400A4 */ lw $a0, 0x00A4($sp) /* 04B84 8093D854 3C010001 */ lui $at, 0x0001 ## $at = 00010000 /* 04B88 8093D858 34210AFC */ ori $at, $at, 0x0AFC ## $at = 00010AFC /* 04B8C 8093D85C 3C073CF5 */ lui $a3, 0x3CF5 ## $a3 = 3CF50000 /* 04B90 8093D860 34E7C28F */ ori $a3, $a3, 0xC28F ## $a3 = 3CF5C28F /* 04B94 8093D864 0C01E107 */ jal Math_SmoothScaleMaxF - -/* 04B98 8093D868 00812021 */ addu $a0, $a0, $at + +/* 04B98 8093D868 00812021 */ addu $a0, $a0, $at /* 04B9C 8093D86C 86230150 */ lh $v1, 0x0150($s1) ## 00000150 .L8093D870: -/* 04BA0 8093D870 56630005 */ bnel $s3, $v1, .L8093D888 -/* 04BA4 8093D874 286100B5 */ slti $at, $v1, 0x00B5 -/* 04BA8 8093D878 0C01E221 */ jal func_80078884 +/* 04BA0 8093D870 56630005 */ bnel $s3, $v1, .L8093D888 +/* 04BA4 8093D874 286100B5 */ slti $at, $v1, 0x00B5 +/* 04BA8 8093D878 0C01E221 */ jal func_80078884 /* 04BAC 8093D87C 2404390C */ addiu $a0, $zero, 0x390C ## $a0 = 0000390C /* 04BB0 8093D880 86230150 */ lh $v1, 0x0150($s1) ## 00000150 -/* 04BB4 8093D884 286100B5 */ slti $at, $v1, 0x00B5 +/* 04BB4 8093D884 286100B5 */ slti $at, $v1, 0x00B5 .L8093D888: -/* 04BB8 8093D888 14200518 */ bne $at, $zero, .L8093ECEC +/* 04BB8 8093D888 14200518 */ bne $at, $zero, .L8093ECEC /* 04BBC 8093D88C 262404D8 */ addiu $a0, $s1, 0x04D8 ## $a0 = 000004D8 /* 04BC0 8093D890 3C018095 */ lui $at, %hi(D_8094AF8C) ## $at = 80950000 -/* 04BC4 8093D894 C428AF8C */ lwc1 $f8, %lo(D_8094AF8C)($at) +/* 04BC4 8093D894 C428AF8C */ lwc1 $f8, %lo(D_8094AF8C)($at) /* 04BC8 8093D898 3C05437F */ lui $a1, 0x437F ## $a1 = 437F0000 /* 04BCC 8093D89C 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 04BD0 8093D8A0 3C0740A0 */ lui $a3, 0x40A0 ## $a3 = 40A00000 /* 04BD4 8093D8A4 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 04BD8 8093D8A8 E62804E0 */ swc1 $f8, 0x04E0($s1) ## 000004E0 /* 04BDC 8093D8AC 862C0150 */ lh $t4, 0x0150($s1) ## 00000150 /* 04BE0 8093D8B0 3C128095 */ lui $s2, %hi(D_8094C848) ## $s2 = 80950000 /* 04BE4 8093D8B4 2652C848 */ addiu $s2, $s2, %lo(D_8094C848) ## $s2 = 8094C848 -/* 04BE8 8093D8B8 298100EC */ slti $at, $t4, 0x00EC -/* 04BEC 8093D8BC 1420050B */ bne $at, $zero, .L8093ECEC +/* 04BE8 8093D8B8 298100EC */ slti $at, $t4, 0x00EC +/* 04BEC 8093D8BC 1420050B */ bne $at, $zero, .L8093ECEC /* 04BF0 8093D8C0 24100001 */ addiu $s0, $zero, 0x0001 ## $s0 = 00000001 /* 04BF4 8093D8C4 240D0002 */ addiu $t5, $zero, 0x0002 ## $t5 = 00000002 /* 04BF8 8093D8C8 A62D05FA */ sh $t5, 0x05FA($s1) ## 000005FA @@ -212,7 +212,7 @@ glabel L8093D7EC /* 04C08 8093D8D8 A1D00564 */ sb $s0, 0x0564($t6) ## 00000564 /* 04C0C 8093D8DC 8E440000 */ lw $a0, 0x0000($s2) ## 8094C848 /* 04C10 8093D8E0 24060000 */ addiu $a2, $zero, 0x0000 ## $a2 = 00000000 -/* 04C14 8093D8E4 0C0294D3 */ jal func_800A534C +/* 04C14 8093D8E4 0C0294D3 */ jal SkelAnime_ChangeAnimTransitionRepeat /* 04C18 8093D8E8 24840568 */ addiu $a0, $a0, 0x0568 ## $a0 = 00000568 /* 04C1C 8093D8EC 3C014382 */ lui $at, 0x4382 ## $at = 43820000 /* 04C20 8093D8F0 44811000 */ mtc1 $at, $f2 ## $f2 = 260.00 @@ -250,16 +250,16 @@ glabel L8093D7EC /* 04CA0 8093D970 E628060C */ swc1 $f8, 0x060C($s1) ## 0000060C /* 04CA4 8093D974 E62A0610 */ swc1 $f10, 0x0610($s1) ## 00000610 /* 04CA8 8093D978 0C00B58B */ jal Actor_SetScale - + /* 04CAC 8093D97C 8E440000 */ lw $a0, 0x0000($s2) ## 8094C848 -/* 04CB0 8093D980 100004DB */ beq $zero, $zero, .L8093ECF0 +/* 04CB0 8093D980 100004DB */ beq $zero, $zero, .L8093ECF0 /* 04CB4 8093D984 862505FC */ lh $a1, 0x05FC($s1) ## 000005FC glabel L8093D988 /* 04CB8 8093D988 3C128095 */ lui $s2, %hi(D_8094C848) ## $s2 = 80950000 /* 04CBC 8093D98C 2652C848 */ addiu $s2, $s2, %lo(D_8094C848) ## $s2 = 8094C848 /* 04CC0 8093D990 8E440000 */ lw $a0, 0x0000($s2) ## 8094C848 /* 04CC4 8093D994 0C02927F */ jal SkelAnime_FrameUpdateMatrix - + /* 04CC8 8093D998 24840568 */ addiu $a0, $a0, 0x0568 ## $a0 = 00000568 /* 04CCC 8093D99C 8E440000 */ lw $a0, 0x0000($s2) ## 8094C848 /* 04CD0 8093D9A0 3C063D4C */ lui $a2, 0x3D4C ## $a2 = 3D4C0000 @@ -267,19 +267,19 @@ glabel L8093D988 /* 04CD8 8093D9A8 3C054370 */ lui $a1, 0x4370 ## $a1 = 43700000 /* 04CDC 8093D9AC 3C0740A0 */ lui $a3, 0x40A0 ## $a3 = 40A00000 /* 04CE0 8093D9B0 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 04CE4 8093D9B4 24840028 */ addiu $a0, $a0, 0x0028 ## $a0 = 00000028 /* 04CE8 8093D9B8 3C018095 */ lui $at, %hi(D_8094AF90) ## $at = 80950000 -/* 04CEC 8093D9BC C420AF90 */ lwc1 $f0, %lo(D_8094AF90)($at) +/* 04CEC 8093D9BC C420AF90 */ lwc1 $f0, %lo(D_8094AF90)($at) /* 04CF0 8093D9C0 C6240600 */ lwc1 $f4, 0x0600($s1) ## 00000600 /* 04CF4 8093D9C4 C6280608 */ lwc1 $f8, 0x0608($s1) ## 00000608 /* 04CF8 8093D9C8 862B0150 */ lh $t3, 0x0150($s1) ## 00000150 -/* 04CFC 8093D9CC 46002181 */ sub.s $f6, $f4, $f0 +/* 04CFC 8093D9CC 46002181 */ sub.s $f6, $f4, $f0 /* 04D00 8093D9D0 240C0003 */ addiu $t4, $zero, 0x0003 ## $t4 = 00000003 -/* 04D04 8093D9D4 29610033 */ slti $at, $t3, 0x0033 -/* 04D08 8093D9D8 46004280 */ add.s $f10, $f8, $f0 +/* 04D04 8093D9D4 29610033 */ slti $at, $t3, 0x0033 +/* 04D08 8093D9D8 46004280 */ add.s $f10, $f8, $f0 /* 04D0C 8093D9DC E6260600 */ swc1 $f6, 0x0600($s1) ## 00000600 -/* 04D10 8093D9E0 142004C2 */ bne $at, $zero, .L8093ECEC +/* 04D10 8093D9E0 142004C2 */ bne $at, $zero, .L8093ECEC /* 04D14 8093D9E4 E62A0608 */ swc1 $f10, 0x0608($s1) ## 00000608 /* 04D18 8093D9E8 C6320600 */ lwc1 $f18, 0x0600($s1) ## 00000600 /* 04D1C 8093D9EC 44808000 */ mtc1 $zero, $f16 ## $f16 = 0.00 @@ -291,83 +291,83 @@ glabel L8093D988 /* 04D34 8093DA04 44814000 */ mtc1 $at, $f8 ## $f8 = -30.00 /* 04D38 8093DA08 44803000 */ mtc1 $zero, $f6 ## $f6 = 0.00 /* 04D3C 8093DA0C C624060C */ lwc1 $f4, 0x060C($s1) ## 0000060C -/* 04D40 8093DA10 46124481 */ sub.s $f18, $f8, $f18 +/* 04D40 8093DA10 46124481 */ sub.s $f18, $f8, $f18 /* 04D44 8093DA14 3C018095 */ lui $at, %hi(D_8094AF94) ## $at = 80950000 -/* 04D48 8093DA18 C422AF94 */ lwc1 $f2, %lo(D_8094AF94)($at) +/* 04D48 8093DA18 C422AF94 */ lwc1 $f2, %lo(D_8094AF94)($at) /* 04D4C 8093DA1C E628066C */ swc1 $f8, 0x066C($s1) ## 0000066C -/* 04D50 8093DA20 46009485 */ abs.s $f18, $f18 -/* 04D54 8093DA24 460E5381 */ sub.s $f14, $f10, $f14 +/* 04D50 8093DA20 46009485 */ abs.s $f18, $f18 +/* 04D54 8093DA24 460E5381 */ sub.s $f14, $f10, $f14 /* 04D58 8093DA28 E62A0670 */ swc1 $f10, 0x0670($s1) ## 00000670 /* 04D5C 8093DA2C E6300684 */ swc1 $f16, 0x0684($s1) ## 00000684 /* 04D60 8093DA30 C6300610 */ lwc1 $f16, 0x0610($s1) ## 00000610 -/* 04D64 8093DA34 46007385 */ abs.s $f14, $f14 -/* 04D68 8093DA38 460C1301 */ sub.s $f12, $f2, $f12 +/* 04D64 8093DA34 46007385 */ abs.s $f14, $f14 +/* 04D68 8093DA38 460C1301 */ sub.s $f12, $f2, $f12 /* 04D6C 8093DA3C E6220674 */ swc1 $f2, 0x0674($s1) ## 00000674 /* 04D70 8093DA40 A62C05FA */ sh $t4, 0x05FA($s1) ## 000005FA /* 04D74 8093DA44 3C018095 */ lui $at, %hi(D_8094AF98) ## $at = 80950000 -/* 04D78 8093DA48 C422AF98 */ lwc1 $f2, %lo(D_8094AF98)($at) -/* 04D7C 8093DA4C 46006305 */ abs.s $f12, $f12 -/* 04D80 8093DA50 46043101 */ sub.s $f4, $f6, $f4 +/* 04D78 8093DA48 C422AF98 */ lwc1 $f2, %lo(D_8094AF98)($at) +/* 04D7C 8093DA4C 46006305 */ abs.s $f12, $f12 +/* 04D80 8093DA50 46043101 */ sub.s $f4, $f6, $f4 /* 04D84 8093DA54 E6220688 */ swc1 $f2, 0x0688($s1) ## 00000688 /* 04D88 8093DA58 C6220688 */ lwc1 $f2, 0x0688($s1) ## 00000688 /* 04D8C 8093DA5C C6260614 */ lwc1 $f6, 0x0614($s1) ## 00000614 -/* 04D90 8093DA60 46002105 */ abs.s $f4, $f4 -/* 04D94 8093DA64 46101401 */ sub.s $f16, $f2, $f16 +/* 04D90 8093DA60 46002105 */ abs.s $f4, $f4 +/* 04D94 8093DA64 46101401 */ sub.s $f16, $f2, $f16 /* 04D98 8093DA68 3C014411 */ lui $at, 0x4411 ## $at = 44110000 /* 04D9C 8093DA6C 44811000 */ mtc1 $at, $f2 ## $f2 = 580.00 /* 04DA0 8093DA70 44805000 */ mtc1 $zero, $f10 ## $f10 = 0.00 -/* 04DA4 8093DA74 46008405 */ abs.s $f16, $f16 +/* 04DA4 8093DA74 46008405 */ abs.s $f16, $f16 /* 04DA8 8093DA78 E622068C */ swc1 $f2, 0x068C($s1) ## 0000068C /* 04DAC 8093DA7C C622068C */ lwc1 $f2, 0x068C($s1) ## 0000068C /* 04DB0 8093DA80 E6320654 */ swc1 $f18, 0x0654($s1) ## 00000654 /* 04DB4 8093DA84 E62E0658 */ swc1 $f14, 0x0658($s1) ## 00000658 -/* 04DB8 8093DA88 46061181 */ sub.s $f6, $f2, $f6 +/* 04DB8 8093DA88 46061181 */ sub.s $f6, $f2, $f6 /* 04DBC 8093DA8C E62C065C */ swc1 $f12, 0x065C($s1) ## 0000065C /* 04DC0 8093DA90 E6240660 */ swc1 $f4, 0x0660($s1) ## 00000660 /* 04DC4 8093DA94 E6300664 */ swc1 $f16, 0x0664($s1) ## 00000664 -/* 04DC8 8093DA98 46003185 */ abs.s $f6, $f6 +/* 04DC8 8093DA98 46003185 */ abs.s $f6, $f6 /* 04DCC 8093DA9C E62A069C */ swc1 $f10, 0x069C($s1) ## 0000069C /* 04DD0 8093DAA0 E6260668 */ swc1 $f6, 0x0668($s1) ## 00000668 /* 04DD4 8093DAA4 3C018095 */ lui $at, %hi(D_8094AF9C) ## $at = 80950000 -/* 04DD8 8093DAA8 C426AF9C */ lwc1 $f6, %lo(D_8094AF9C)($at) +/* 04DD8 8093DAA8 C426AF9C */ lwc1 $f6, %lo(D_8094AF9C)($at) /* 04DDC 8093DAAC A6200150 */ sh $zero, 0x0150($s1) ## 00000150 -/* 04DE0 8093DAB0 1000048E */ beq $zero, $zero, .L8093ECEC +/* 04DE0 8093DAB0 1000048E */ beq $zero, $zero, .L8093ECEC /* 04DE4 8093DAB4 E62606A0 */ swc1 $f6, 0x06A0($s1) ## 000006A0 glabel L8093DAB8 /* 04DE8 8093DAB8 3C128095 */ lui $s2, %hi(D_8094C848) ## $s2 = 80950000 /* 04DEC 8093DABC 2652C848 */ addiu $s2, $s2, %lo(D_8094C848) ## $s2 = 8094C848 /* 04DF0 8093DAC0 8E440000 */ lw $a0, 0x0000($s2) ## 8094C848 /* 04DF4 8093DAC4 0C02927F */ jal SkelAnime_FrameUpdateMatrix - + /* 04DF8 8093DAC8 24840568 */ addiu $a0, $a0, 0x0568 ## $a0 = 00000568 /* 04DFC 8093DACC 8E440000 */ lw $a0, 0x0000($s2) ## 8094C848 /* 04E00 8093DAD0 240D0001 */ addiu $t5, $zero, 0x0001 ## $t5 = 00000001 /* 04E04 8093DAD4 3C063D4C */ lui $a2, 0x3D4C ## $a2 = 3D4C0000 -/* 04E08 8093DAD8 A3AD009F */ sb $t5, 0x009F($sp) +/* 04E08 8093DAD8 A3AD009F */ sb $t5, 0x009F($sp) /* 04E0C 8093DADC 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3D4CCCCD /* 04E10 8093DAE0 3C054370 */ lui $a1, 0x4370 ## $a1 = 43700000 /* 04E14 8093DAE4 3C0740A0 */ lui $a3, 0x40A0 ## $a3 = 40A00000 /* 04E18 8093DAE8 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 04E1C 8093DAEC 24840028 */ addiu $a0, $a0, 0x0028 ## $a0 = 00000028 /* 04E20 8093DAF0 3C073CA3 */ lui $a3, 0x3CA3 ## $a3 = 3CA30000 /* 04E24 8093DAF4 34E7D70A */ ori $a3, $a3, 0xD70A ## $a3 = 3CA3D70A /* 04E28 8093DAF8 2624069C */ addiu $a0, $s1, 0x069C ## $a0 = 0000069C /* 04E2C 8093DAFC 3C053F80 */ lui $a1, 0x3F80 ## $a1 = 3F800000 /* 04E30 8093DB00 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 04E34 8093DB04 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 04E38 8093DB08 86230150 */ lh $v1, 0x0150($s1) ## 00000150 /* 04E3C 8093DB0C 2401001E */ addiu $at, $zero, 0x001E ## $at = 0000001E -/* 04E40 8093DB10 8FA400A4 */ lw $a0, 0x00A4($sp) -/* 04E44 8093DB14 14610004 */ bne $v1, $at, .L8093DB28 +/* 04E40 8093DB10 8FA400A4 */ lw $a0, 0x00A4($sp) +/* 04E44 8093DB14 14610004 */ bne $v1, $at, .L8093DB28 /* 04E48 8093DB18 24056049 */ addiu $a1, $zero, 0x6049 ## $a1 = 00006049 -/* 04E4C 8093DB1C 0C042DA0 */ jal func_8010B680 +/* 04E4C 8093DB1C 0C042DA0 */ jal func_8010B680 /* 04E50 8093DB20 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 /* 04E54 8093DB24 86230150 */ lh $v1, 0x0150($s1) ## 00000150 .L8093DB28: -/* 04E58 8093DB28 28610051 */ slti $at, $v1, 0x0051 -/* 04E5C 8093DB2C 1420046F */ bne $at, $zero, .L8093ECEC +/* 04E58 8093DB28 28610051 */ slti $at, $v1, 0x0051 +/* 04E5C 8093DB2C 1420046F */ bne $at, $zero, .L8093ECEC /* 04E60 8093DB30 240E0004 */ addiu $t6, $zero, 0x0004 ## $t6 = 00000004 /* 04E64 8093DB34 3C014382 */ lui $at, 0x4382 ## $at = 43820000 /* 04E68 8093DB38 44811000 */ mtc1 $at, $f2 ## $f2 = 260.00 @@ -393,61 +393,61 @@ glabel L8093DAB8 /* 04EB8 8093DB88 02002825 */ or $a1, $s0, $zero ## $a1 = 06000AAC /* 04EBC 8093DB8C C7040028 */ lwc1 $f4, 0x0028($t8) ## 00000028 /* 04EC0 8093DB90 24060000 */ addiu $a2, $zero, 0x0000 ## $a2 = 00000000 -/* 04EC4 8093DB94 46062200 */ add.s $f8, $f4, $f6 +/* 04EC4 8093DB94 46062200 */ add.s $f8, $f4, $f6 /* 04EC8 8093DB98 C6240600 */ lwc1 $f4, 0x0600($s1) ## 00000600 /* 04ECC 8093DB9C C6260604 */ lwc1 $f6, 0x0604($s1) ## 00000604 -/* 04ED0 8093DBA0 46046001 */ sub.s $f0, $f12, $f4 +/* 04ED0 8093DBA0 46046001 */ sub.s $f0, $f12, $f4 /* 04ED4 8093DBA4 E6280688 */ swc1 $f8, 0x0688($s1) ## 00000688 /* 04ED8 8093DBA8 8E590000 */ lw $t9, 0x0000($s2) ## 8094C848 /* 04EDC 8093DBAC C6280608 */ lwc1 $f8, 0x0608($s1) ## 00000608 -/* 04EE0 8093DBB0 46000005 */ abs.s $f0, $f0 +/* 04EE0 8093DBB0 46000005 */ abs.s $f0, $f0 /* 04EE4 8093DBB4 C72A002C */ lwc1 $f10, 0x002C($t9) ## 0000002C /* 04EE8 8093DBB8 E6200654 */ swc1 $f0, 0x0654($s1) ## 00000654 -/* 04EEC 8093DBBC 46061001 */ sub.s $f0, $f2, $f6 +/* 04EEC 8093DBBC 46061001 */ sub.s $f0, $f2, $f6 /* 04EF0 8093DBC0 E62A068C */ swc1 $f10, 0x068C($s1) ## 0000068C /* 04EF4 8093DBC4 C62A0684 */ lwc1 $f10, 0x0684($s1) ## 00000684 /* 04EF8 8093DBC8 C624060C */ lwc1 $f4, 0x060C($s1) ## 0000060C -/* 04EFC 8093DBCC 46000005 */ abs.s $f0, $f0 +/* 04EFC 8093DBCC 46000005 */ abs.s $f0, $f0 /* 04F00 8093DBD0 C6260688 */ lwc1 $f6, 0x0688($s1) ## 00000688 /* 04F04 8093DBD4 E6200658 */ swc1 $f0, 0x0658($s1) ## 00000658 -/* 04F08 8093DBD8 46087001 */ sub.s $f0, $f14, $f8 +/* 04F08 8093DBD8 46087001 */ sub.s $f0, $f14, $f8 /* 04F0C 8093DBDC C6280610 */ lwc1 $f8, 0x0610($s1) ## 00000610 -/* 04F10 8093DBE0 46000005 */ abs.s $f0, $f0 +/* 04F10 8093DBE0 46000005 */ abs.s $f0, $f0 /* 04F14 8093DBE4 E620065C */ swc1 $f0, 0x065C($s1) ## 0000065C -/* 04F18 8093DBE8 46045001 */ sub.s $f0, $f10, $f4 +/* 04F18 8093DBE8 46045001 */ sub.s $f0, $f10, $f4 /* 04F1C 8093DBEC C6240614 */ lwc1 $f4, 0x0614($s1) ## 00000614 /* 04F20 8093DBF0 C62A068C */ lwc1 $f10, 0x068C($s1) ## 0000068C -/* 04F24 8093DBF4 46000005 */ abs.s $f0, $f0 +/* 04F24 8093DBF4 46000005 */ abs.s $f0, $f0 /* 04F28 8093DBF8 E6200660 */ swc1 $f0, 0x0660($s1) ## 00000660 -/* 04F2C 8093DBFC 46083001 */ sub.s $f0, $f6, $f8 +/* 04F2C 8093DBFC 46083001 */ sub.s $f0, $f6, $f8 /* 04F30 8093DC00 44803000 */ mtc1 $zero, $f6 ## $f6 = 0.00 -/* 04F34 8093DC04 46000005 */ abs.s $f0, $f0 +/* 04F34 8093DC04 46000005 */ abs.s $f0, $f0 /* 04F38 8093DC08 E626069C */ swc1 $f6, 0x069C($s1) ## 0000069C /* 04F3C 8093DC0C E6200664 */ swc1 $f0, 0x0664($s1) ## 00000664 -/* 04F40 8093DC10 46045001 */ sub.s $f0, $f10, $f4 -/* 04F44 8093DC14 46000005 */ abs.s $f0, $f0 +/* 04F40 8093DC10 46045001 */ sub.s $f0, $f10, $f4 +/* 04F44 8093DC14 46000005 */ abs.s $f0, $f0 /* 04F48 8093DC18 E6200668 */ swc1 $f0, 0x0668($s1) ## 00000668 -/* 04F4C 8093DC1C C428AFA0 */ lwc1 $f8, %lo(D_8094AFA0)($at) +/* 04F4C 8093DC1C C428AFA0 */ lwc1 $f8, %lo(D_8094AFA0)($at) /* 04F50 8093DC20 E62806A0 */ swc1 $f8, 0x06A0($s1) ## 000006A0 /* 04F54 8093DC24 8E440000 */ lw $a0, 0x0000($s2) ## 8094C848 -/* 04F58 8093DC28 0C029490 */ jal func_800A5240 +/* 04F58 8093DC28 0C029490 */ jal SkelAnime_ChangeAnimTransitionStop /* 04F5C 8093DC2C 24840568 */ addiu $a0, $a0, 0x0568 ## $a0 = 00000568 /* 04F60 8093DC30 0C028800 */ jal SkelAnime_GetFrameCount - + /* 04F64 8093DC34 02002025 */ or $a0, $s0, $zero ## $a0 = 06000AAC /* 04F68 8093DC38 44825000 */ mtc1 $v0, $f10 ## $f10 = 0.00 /* 04F6C 8093DC3C A6200150 */ sh $zero, 0x0150($s1) ## 00000150 -/* 04F70 8093DC40 46805120 */ cvt.s.w $f4, $f10 -/* 04F74 8093DC44 10000429 */ beq $zero, $zero, .L8093ECEC +/* 04F70 8093DC40 46805120 */ cvt.s.w $f4, $f10 +/* 04F74 8093DC44 10000429 */ beq $zero, $zero, .L8093ECEC /* 04F78 8093DC48 E62401A4 */ swc1 $f4, 0x01A4($s1) ## 000001A4 glabel L8093DC4C /* 04F7C 8093DC4C 3C128095 */ lui $s2, %hi(D_8094C848) ## $s2 = 80950000 /* 04F80 8093DC50 2652C848 */ addiu $s2, $s2, %lo(D_8094C848) ## $s2 = 8094C848 /* 04F84 8093DC54 8E440000 */ lw $a0, 0x0000($s2) ## 8094C848 /* 04F88 8093DC58 24080001 */ addiu $t0, $zero, 0x0001 ## $t0 = 00000001 -/* 04F8C 8093DC5C A3A8009F */ sb $t0, 0x009F($sp) +/* 04F8C 8093DC5C A3A8009F */ sb $t0, 0x009F($sp) /* 04F90 8093DC60 0C02927F */ jal SkelAnime_FrameUpdateMatrix - + /* 04F94 8093DC64 24840568 */ addiu $a0, $a0, 0x0568 ## $a0 = 00000568 /* 04F98 8093DC68 8E490000 */ lw $t1, 0x0000($s2) ## 8094C848 /* 04F9C 8093DC6C 3C0143AF */ lui $at, 0x43AF ## $at = 43AF0000 @@ -456,207 +456,207 @@ glabel L8093DC4C /* 04FA8 8093DC78 44814000 */ mtc1 $at, $f8 ## $f8 = 20.00 /* 04FAC 8093DC7C C5260028 */ lwc1 $f6, 0x0028($t1) ## 00000028 /* 04FB0 8093DC80 3C063DCC */ lui $a2, 0x3DCC ## $a2 = 3DCC0000 -/* 04FB4 8093DC84 44058000 */ mfc1 $a1, $f16 -/* 04FB8 8093DC88 46083280 */ add.s $f10, $f6, $f8 +/* 04FB4 8093DC84 44058000 */ mfc1 $a1, $f16 +/* 04FB8 8093DC88 46083280 */ add.s $f10, $f6, $f8 /* 04FBC 8093DC8C 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3DCCCCCD /* 04FC0 8093DC90 8E270068 */ lw $a3, 0x0068($s1) ## 00000068 /* 04FC4 8093DC94 E62A0688 */ swc1 $f10, 0x0688($s1) ## 00000688 /* 04FC8 8093DC98 8E440000 */ lw $a0, 0x0000($s2) ## 8094C848 /* 04FCC 8093DC9C 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 04FD0 8093DCA0 24840028 */ addiu $a0, $a0, 0x0028 ## $a0 = 00000028 /* 04FD4 8093DCA4 3C073F66 */ lui $a3, 0x3F66 ## $a3 = 3F660000 /* 04FD8 8093DCA8 34E76666 */ ori $a3, $a3, 0x6666 ## $a3 = 3F666666 /* 04FDC 8093DCAC 26240068 */ addiu $a0, $s1, 0x0068 ## $a0 = 00000068 /* 04FE0 8093DCB0 3C054110 */ lui $a1, 0x4110 ## $a1 = 41100000 /* 04FE4 8093DCB4 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 04FE8 8093DCB8 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 04FEC 8093DCBC 3C073CA3 */ lui $a3, 0x3CA3 ## $a3 = 3CA30000 /* 04FF0 8093DCC0 34E7D70A */ ori $a3, $a3, 0xD70A ## $a3 = 3CA3D70A /* 04FF4 8093DCC4 2624069C */ addiu $a0, $s1, 0x069C ## $a0 = 0000069C /* 04FF8 8093DCC8 3C053F80 */ lui $a1, 0x3F80 ## $a1 = 3F800000 /* 04FFC 8093DCCC 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 05000 8093DCD0 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 05004 8093DCD4 86230150 */ lh $v1, 0x0150($s1) ## 00000150 -/* 05008 8093DCD8 2861001E */ slti $at, $v1, 0x001E -/* 0500C 8093DCDC 142000F5 */ bne $at, $zero, .L8093E0B4 +/* 05008 8093DCD8 2861001E */ slti $at, $v1, 0x001E +/* 0500C 8093DCDC 142000F5 */ bne $at, $zero, .L8093E0B4 /* 05010 8093DCE0 30780007 */ andi $t8, $v1, 0x0007 ## $t8 = 00000000 -/* 05014 8093DCE4 2861002D */ slti $at, $v1, 0x002D -/* 05018 8093DCE8 10200011 */ beq $at, $zero, .L8093DD30 -/* 0501C 8093DCEC 8FA400A4 */ lw $a0, 0x00A4($sp) -/* 05020 8093DCF0 8FAA00A4 */ lw $t2, 0x00A4($sp) +/* 05014 8093DCE4 2861002D */ slti $at, $v1, 0x002D +/* 05018 8093DCE8 10200011 */ beq $at, $zero, .L8093DD30 +/* 0501C 8093DCEC 8FA400A4 */ lw $a0, 0x00A4($sp) +/* 05020 8093DCF0 8FAA00A4 */ lw $t2, 0x00A4($sp) /* 05024 8093DCF4 3C010001 */ lui $at, 0x0001 ## $at = 00010000 /* 05028 8093DCF8 240B0002 */ addiu $t3, $zero, 0x0002 ## $t3 = 00000002 -/* 0502C 8093DCFC 002A0821 */ addu $at, $at, $t2 +/* 0502C 8093DCFC 002A0821 */ addu $at, $at, $t2 /* 05030 8093DD00 A0200AE2 */ sb $zero, 0x0AE2($at) ## 00010AE2 -/* 05034 8093DD04 8FAC00A4 */ lw $t4, 0x00A4($sp) +/* 05034 8093DD04 8FAC00A4 */ lw $t4, 0x00A4($sp) /* 05038 8093DD08 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 0503C 8093DD0C 002C0821 */ addu $at, $at, $t4 +/* 0503C 8093DD0C 002C0821 */ addu $at, $at, $t4 /* 05040 8093DD10 A02B0AE1 */ sb $t3, 0x0AE1($at) ## 00010AE1 -/* 05044 8093DD14 8FAD00A4 */ lw $t5, 0x00A4($sp) +/* 05044 8093DD14 8FAD00A4 */ lw $t5, 0x00A4($sp) /* 05048 8093DD18 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 /* 0504C 8093DD1C 44812000 */ mtc1 $at, $f4 ## $f4 = 1.00 /* 05050 8093DD20 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 05054 8093DD24 002D0821 */ addu $at, $at, $t5 -/* 05058 8093DD28 10000008 */ beq $zero, $zero, .L8093DD4C +/* 05054 8093DD24 002D0821 */ addu $at, $at, $t5 +/* 05058 8093DD28 10000008 */ beq $zero, $zero, .L8093DD4C /* 0505C 8093DD2C E4240AFC */ swc1 $f4, 0x0AFC($at) ## 00010AFC .L8093DD30: /* 05060 8093DD30 3C010001 */ lui $at, 0x0001 ## $at = 00010000 /* 05064 8093DD34 34210AFC */ ori $at, $at, 0x0AFC ## $at = 00010AFC /* 05068 8093DD38 3C063DCC */ lui $a2, 0x3DCC ## $a2 = 3DCC0000 /* 0506C 8093DD3C 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3DCCCCCD -/* 05070 8093DD40 00812021 */ addu $a0, $a0, $at +/* 05070 8093DD40 00812021 */ addu $a0, $a0, $at /* 05074 8093DD44 0C01E123 */ jal Math_SmoothDownscaleMaxF - + /* 05078 8093DD48 3C053F80 */ lui $a1, 0x3F80 ## $a1 = 3F800000 .L8093DD4C: /* 0507C 8093DD4C 86230150 */ lh $v1, 0x0150($s1) ## 00000150 /* 05080 8093DD50 2401001E */ addiu $at, $zero, 0x001E ## $at = 0000001E /* 05084 8093DD54 00008025 */ or $s0, $zero, $zero ## $s0 = 00000000 -/* 05088 8093DD58 14610041 */ bne $v1, $at, .L8093DE60 +/* 05088 8093DD58 14610041 */ bne $v1, $at, .L8093DE60 /* 0508C 8093DD5C 27B30074 */ addiu $s3, $sp, 0x0074 ## $s3 = FFFFFFD4 /* 05090 8093DD60 3C014248 */ lui $at, 0x4248 ## $at = 42480000 .L8093DD64: /* 05094 8093DD64 44816000 */ mtc1 $at, $f12 ## $f12 = 50.00 /* 05098 8093DD68 0C00CFC8 */ jal Math_Rand_CenteredFloat - + /* 0509C 8093DD6C 00000000 */ nop /* 050A0 8093DD70 8E4E0000 */ lw $t6, 0x0000($s2) ## 8094C848 /* 050A4 8093DD74 3C014248 */ lui $at, 0x4248 ## $at = 42480000 /* 050A8 8093DD78 44816000 */ mtc1 $at, $f12 ## $f12 = 50.00 /* 050AC 8093DD7C C5C60024 */ lwc1 $f6, 0x0024($t6) ## 00000024 -/* 050B0 8093DD80 46060200 */ add.s $f8, $f0, $f6 +/* 050B0 8093DD80 46060200 */ add.s $f8, $f0, $f6 /* 050B4 8093DD84 0C00CFC8 */ jal Math_Rand_CenteredFloat - -/* 050B8 8093DD88 E7A80074 */ swc1 $f8, 0x0074($sp) + +/* 050B8 8093DD88 E7A80074 */ swc1 $f8, 0x0074($sp) /* 050BC 8093DD8C 8E4F0000 */ lw $t7, 0x0000($s2) ## 8094C848 /* 050C0 8093DD90 3C014248 */ lui $at, 0x4248 ## $at = 42480000 /* 050C4 8093DD94 44816000 */ mtc1 $at, $f12 ## $f12 = 50.00 /* 050C8 8093DD98 C5EA0028 */ lwc1 $f10, 0x0028($t7) ## 00000028 -/* 050CC 8093DD9C 460A0100 */ add.s $f4, $f0, $f10 +/* 050CC 8093DD9C 460A0100 */ add.s $f4, $f0, $f10 /* 050D0 8093DDA0 0C00CFC8 */ jal Math_Rand_CenteredFloat - -/* 050D4 8093DDA4 E7A40078 */ swc1 $f4, 0x0078($sp) + +/* 050D4 8093DDA4 E7A40078 */ swc1 $f4, 0x0078($sp) /* 050D8 8093DDA8 8E580000 */ lw $t8, 0x0000($s2) ## 8094C848 /* 050DC 8093DDAC 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 /* 050E0 8093DDB0 44816000 */ mtc1 $at, $f12 ## $f12 = 20.00 /* 050E4 8093DDB4 C706002C */ lwc1 $f6, 0x002C($t8) ## 0000002C -/* 050E8 8093DDB8 46060200 */ add.s $f8, $f0, $f6 +/* 050E8 8093DDB8 46060200 */ add.s $f8, $f0, $f6 /* 050EC 8093DDBC 0C00CFC8 */ jal Math_Rand_CenteredFloat - -/* 050F0 8093DDC0 E7A8007C */ swc1 $f8, 0x007C($sp) + +/* 050F0 8093DDC0 E7A8007C */ swc1 $f8, 0x007C($sp) /* 050F4 8093DDC4 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 /* 050F8 8093DDC8 44816000 */ mtc1 $at, $f12 ## $f12 = 20.00 /* 050FC 8093DDCC 0C00CFC8 */ jal Math_Rand_CenteredFloat - -/* 05100 8093DDD0 E7A00068 */ swc1 $f0, 0x0068($sp) + +/* 05100 8093DDD0 E7A00068 */ swc1 $f0, 0x0068($sp) /* 05104 8093DDD4 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 /* 05108 8093DDD8 44816000 */ mtc1 $at, $f12 ## $f12 = 20.00 /* 0510C 8093DDDC 0C00CFC8 */ jal Math_Rand_CenteredFloat - -/* 05110 8093DDE0 E7A0006C */ swc1 $f0, 0x006C($sp) + +/* 05110 8093DDE0 E7A0006C */ swc1 $f0, 0x006C($sp) /* 05114 8093DDE4 3C014120 */ lui $at, 0x4120 ## $at = 41200000 /* 05118 8093DDE8 44816000 */ mtc1 $at, $f12 ## $f12 = 10.00 /* 0511C 8093DDEC 0C00CFBE */ jal Math_Rand_ZeroFloat - -/* 05120 8093DDF0 E7A00070 */ swc1 $f0, 0x0070($sp) + +/* 05120 8093DDF0 E7A00070 */ swc1 $f0, 0x0070($sp) /* 05124 8093DDF4 3C0141C8 */ lui $at, 0x41C8 ## $at = 41C80000 /* 05128 8093DDF8 44815000 */ mtc1 $at, $f10 ## $f10 = 25.00 /* 0512C 8093DDFC 3C078095 */ lui $a3, %hi(D_8094A7DC) ## $a3 = 80950000 /* 05130 8093DE00 24190001 */ addiu $t9, $zero, 0x0001 ## $t9 = 00000001 -/* 05134 8093DE04 460A0100 */ add.s $f4, $f0, $f10 -/* 05138 8093DE08 AFB90014 */ sw $t9, 0x0014($sp) +/* 05134 8093DE04 460A0100 */ add.s $f4, $f0, $f10 +/* 05138 8093DE08 AFB90014 */ sw $t9, 0x0014($sp) /* 0513C 8093DE0C 24E7A7DC */ addiu $a3, $a3, %lo(D_8094A7DC) ## $a3 = 8094A7DC -/* 05140 8093DE10 8FA400A4 */ lw $a0, 0x00A4($sp) -/* 05144 8093DE14 E7A40010 */ swc1 $f4, 0x0010($sp) +/* 05140 8093DE10 8FA400A4 */ lw $a0, 0x00A4($sp) +/* 05144 8093DE14 E7A40010 */ swc1 $f4, 0x0010($sp) /* 05148 8093DE18 02602825 */ or $a1, $s3, $zero ## $a1 = FFFFFFD4 -/* 0514C 8093DE1C 0C24E41C */ jal func_80939070 +/* 0514C 8093DE1C 0C24E41C */ jal func_80939070 /* 05150 8093DE20 27A60068 */ addiu $a2, $sp, 0x0068 ## $a2 = FFFFFFC8 /* 05154 8093DE24 26100001 */ addiu $s0, $s0, 0x0001 ## $s0 = 00000001 -/* 05158 8093DE28 00108400 */ sll $s0, $s0, 16 -/* 0515C 8093DE2C 00108403 */ sra $s0, $s0, 16 -/* 05160 8093DE30 2A010032 */ slti $at, $s0, 0x0032 -/* 05164 8093DE34 5420FFCB */ bnel $at, $zero, .L8093DD64 +/* 05158 8093DE28 00108400 */ sll $s0, $s0, 16 +/* 0515C 8093DE2C 00108403 */ sra $s0, $s0, 16 +/* 05160 8093DE30 2A010032 */ slti $at, $s0, 0x0032 +/* 05164 8093DE34 5420FFCB */ bnel $at, $zero, .L8093DD64 /* 05168 8093DE38 3C014248 */ lui $at, 0x4248 ## $at = 42480000 /* 0516C 8093DE3C 8E440000 */ lw $a0, 0x0000($s2) ## 8094C848 /* 05170 8093DE40 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 05174 8093DE44 2405390D */ addiu $a1, $zero, 0x390D ## $a1 = 0000390D -/* 05178 8093DE48 8FA800A4 */ lw $t0, 0x00A4($sp) +/* 05178 8093DE48 8FA800A4 */ lw $t0, 0x00A4($sp) /* 0517C 8093DE4C 44803000 */ mtc1 $zero, $f6 ## $f6 = 0.00 /* 05180 8093DE50 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 05184 8093DE54 00280821 */ addu $at, $at, $t0 +/* 05184 8093DE54 00280821 */ addu $at, $at, $t0 /* 05188 8093DE58 E4260AFC */ swc1 $f6, 0x0AFC($at) ## 00010AFC /* 0518C 8093DE5C 86230150 */ lh $v1, 0x0150($s1) ## 00000150 .L8093DE60: -/* 05190 8093DE60 28610023 */ slti $at, $v1, 0x0023 -/* 05194 8093DE64 1420008A */ bne $at, $zero, .L8093E090 -/* 05198 8093DE68 28610032 */ slti $at, $v1, 0x0032 -/* 0519C 8093DE6C 10200019 */ beq $at, $zero, .L8093DED4 -/* 051A0 8093DE70 00032140 */ sll $a0, $v1, 5 -/* 051A4 8093DE74 00832021 */ addu $a0, $a0, $v1 -/* 051A8 8093DE78 00042240 */ sll $a0, $a0, 9 -/* 051AC 8093DE7C 00042400 */ sll $a0, $a0, 16 +/* 05190 8093DE60 28610023 */ slti $at, $v1, 0x0023 +/* 05194 8093DE64 1420008A */ bne $at, $zero, .L8093E090 +/* 05198 8093DE68 28610032 */ slti $at, $v1, 0x0032 +/* 0519C 8093DE6C 10200019 */ beq $at, $zero, .L8093DED4 +/* 051A0 8093DE70 00032140 */ sll $a0, $v1, 5 +/* 051A4 8093DE74 00832021 */ addu $a0, $a0, $v1 +/* 051A8 8093DE78 00042240 */ sll $a0, $a0, 9 +/* 051AC 8093DE7C 00042400 */ sll $a0, $a0, 16 /* 051B0 8093DE80 0C01DE1C */ jal Math_Sins ## sins? -/* 051B4 8093DE84 00042403 */ sra $a0, $a0, 16 +/* 051B4 8093DE84 00042403 */ sra $a0, $a0, 16 /* 051B8 8093DE88 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 /* 051BC 8093DE8C 44814000 */ mtc1 $at, $f8 ## $f8 = 20.00 /* 051C0 8093DE90 3C018095 */ lui $at, %hi(D_8094AFA4) ## $at = 80950000 -/* 051C4 8093DE94 C424AFA4 */ lwc1 $f4, %lo(D_8094AFA4)($at) -/* 051C8 8093DE98 46080282 */ mul.s $f10, $f0, $f8 +/* 051C4 8093DE94 C424AFA4 */ lwc1 $f4, %lo(D_8094AFA4)($at) +/* 051C8 8093DE98 46080282 */ mul.s $f10, $f0, $f8 /* 051CC 8093DE9C 3C018095 */ lui $at, %hi(D_8094AFA8) ## $at = 80950000 -/* 051D0 8093DEA0 C428AFA8 */ lwc1 $f8, %lo(D_8094AFA8)($at) +/* 051D0 8093DEA0 C428AFA8 */ lwc1 $f8, %lo(D_8094AFA8)($at) /* 051D4 8093DEA4 8E440000 */ lw $a0, 0x0000($s2) ## 8094C848 /* 051D8 8093DEA8 3C073BA3 */ lui $a3, 0x3BA3 ## $a3 = 3BA30000 /* 051DC 8093DEAC 34E7D70A */ ori $a3, $a3, 0xD70A ## $a3 = 3BA3D70A /* 051E0 8093DEB0 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 051E4 8093DEB4 46045183 */ div.s $f6, $f10, $f4 +/* 051E4 8093DEB4 46045183 */ div.s $f6, $f10, $f4 /* 051E8 8093DEB8 24840050 */ addiu $a0, $a0, 0x0050 ## $a0 = 00000050 -/* 051EC 8093DEBC 46083280 */ add.s $f10, $f6, $f8 -/* 051F0 8093DEC0 44055000 */ mfc1 $a1, $f10 +/* 051EC 8093DEBC 46083280 */ add.s $f10, $f6, $f8 +/* 051F0 8093DEC0 44055000 */ mfc1 $a1, $f10 /* 051F4 8093DEC4 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 051F8 8093DEC8 00000000 */ nop -/* 051FC 8093DECC 1000002E */ beq $zero, $zero, .L8093DF88 +/* 051FC 8093DECC 1000002E */ beq $zero, $zero, .L8093DF88 /* 05200 8093DED0 8E500000 */ lw $s0, 0x0000($s2) ## 8094C848 .L8093DED4: /* 05204 8093DED4 24010032 */ addiu $at, $zero, 0x0032 ## $at = 00000032 -/* 05208 8093DED8 1461000D */ bne $v1, $at, .L8093DF10 +/* 05208 8093DED8 1461000D */ bne $v1, $at, .L8093DF10 /* 0520C 8093DEDC 3C100601 */ lui $s0, 0x0601 ## $s0 = 06010000 /* 05210 8093DEE0 8E440000 */ lw $a0, 0x0000($s2) ## 8094C848 /* 05214 8093DEE4 261088C8 */ addiu $s0, $s0, 0x88C8 ## $s0 = 060088C8 /* 05218 8093DEE8 02002825 */ or $a1, $s0, $zero ## $a1 = 060088C8 /* 0521C 8093DEEC 3C06C0A0 */ lui $a2, 0xC0A0 ## $a2 = C0A00000 -/* 05220 8093DEF0 0C029490 */ jal func_800A5240 +/* 05220 8093DEF0 0C029490 */ jal SkelAnime_ChangeAnimTransitionStop /* 05224 8093DEF4 24840568 */ addiu $a0, $a0, 0x0568 ## $a0 = 00000568 /* 05228 8093DEF8 0C028800 */ jal SkelAnime_GetFrameCount - + /* 0522C 8093DEFC 02002025 */ or $a0, $s0, $zero ## $a0 = 060088C8 /* 05230 8093DF00 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 05234 8093DF04 86230150 */ lh $v1, 0x0150($s1) ## 00000150 -/* 05238 8093DF08 468021A0 */ cvt.s.w $f6, $f4 +/* 05238 8093DF08 468021A0 */ cvt.s.w $f6, $f4 /* 0523C 8093DF0C E62601A4 */ swc1 $f6, 0x01A4($s1) ## 000001A4 .L8093DF10: /* 05240 8093DF10 2401003C */ addiu $at, $zero, 0x003C ## $at = 0000003C -/* 05244 8093DF14 14610003 */ bne $v1, $at, .L8093DF24 +/* 05244 8093DF14 14610003 */ bne $v1, $at, .L8093DF24 /* 05248 8093DF18 240539B0 */ addiu $a1, $zero, 0x39B0 ## $a1 = 000039B0 /* 0524C 8093DF1C 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 05250 8093DF20 8E440000 */ lw $a0, 0x0000($s2) ## 8094C848 .L8093DF24: /* 05254 8093DF24 8E440000 */ lw $a0, 0x0000($s2) ## 8094C848 /* 05258 8093DF28 8E2501A4 */ lw $a1, 0x01A4($s1) ## 000001A4 -/* 0525C 8093DF2C 0C0295B2 */ jal func_800A56C8 +/* 0525C 8093DF2C 0C0295B2 */ jal func_800A56C8 /* 05260 8093DF30 24840568 */ addiu $a0, $a0, 0x0568 ## $a0 = 00000568 -/* 05264 8093DF34 1040000A */ beq $v0, $zero, .L8093DF60 +/* 05264 8093DF34 1040000A */ beq $v0, $zero, .L8093DF60 /* 05268 8093DF38 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 0526C 8093DF3C 8E440000 */ lw $a0, 0x0000($s2) ## 8094C848 /* 05270 8093DF40 24A56F28 */ addiu $a1, $a1, 0x6F28 ## $a1 = 06006F28 /* 05274 8093DF44 24060000 */ addiu $a2, $zero, 0x0000 ## $a2 = 00000000 -/* 05278 8093DF48 0C0294D3 */ jal func_800A534C +/* 05278 8093DF48 0C0294D3 */ jal SkelAnime_ChangeAnimTransitionRepeat /* 0527C 8093DF4C 24840568 */ addiu $a0, $a0, 0x0568 ## $a0 = 00000568 /* 05280 8093DF50 3C01447A */ lui $at, 0x447A ## $at = 447A0000 /* 05284 8093DF54 44814000 */ mtc1 $at, $f8 ## $f8 = 1000.00 @@ -671,13 +671,13 @@ glabel L8093DC4C /* 052A4 8093DF74 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3DCCCCCD /* 052A8 8093DF78 34A5CCCC */ ori $a1, $a1, 0xCCCC ## $a1 = 3CCCCCCC /* 052AC 8093DF7C 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 052B0 8093DF80 24840050 */ addiu $a0, $a0, 0x0050 ## $a0 = 00000050 /* 052B4 8093DF84 8E500000 */ lw $s0, 0x0000($s2) ## 8094C848 .L8093DF88: /* 052B8 8093DF88 02002025 */ or $a0, $s0, $zero ## $a0 = 060088C8 /* 052BC 8093DF8C 0C00B58B */ jal Actor_SetScale - + /* 052C0 8093DF90 8E050050 */ lw $a1, 0x0050($s0) ## 06008918 /* 052C4 8093DF94 8E4A0000 */ lw $t2, 0x0000($s2) ## 8094C848 /* 052C8 8093DF98 24098000 */ addiu $t1, $zero, 0x8000 ## $t1 = FFFF8000 @@ -690,7 +690,7 @@ glabel L8093DC4C /* 052E4 8093DFB4 862C0150 */ lh $t4, 0x0150($s1) ## 00000150 /* 052E8 8093DFB8 2673C844 */ addiu $s3, $s3, %lo(D_8094C844) ## $s3 = 8094C844 /* 052EC 8093DFBC 240D000A */ addiu $t5, $zero, 0x000A ## $t5 = 0000000A -/* 052F0 8093DFC0 548C034B */ bnel $a0, $t4, .L8093ECF0 +/* 052F0 8093DFC0 548C034B */ bnel $a0, $t4, .L8093ECF0 /* 052F4 8093DFC4 862505FC */ lh $a1, 0x05FC($s1) ## 000005FC /* 052F8 8093DFC8 44805000 */ mtc1 $zero, $f10 ## $f10 = 0.00 /* 052FC 8093DFCC A62D05FA */ sh $t5, 0x05FA($s1) ## 000005FA @@ -702,7 +702,7 @@ glabel L8093DC4C /* 05314 8093DFE4 A1D00564 */ sb $s0, 0x0564($t6) ## 00000564 /* 05318 8093DFE8 8E640000 */ lw $a0, 0x0000($s3) ## 8094C844 /* 0531C 8093DFEC 24060000 */ addiu $a2, $zero, 0x0000 ## $a2 = 00000000 -/* 05320 8093DFF0 0C0294D3 */ jal func_800A534C +/* 05320 8093DFF0 0C0294D3 */ jal SkelAnime_ChangeAnimTransitionRepeat /* 05324 8093DFF4 24840568 */ addiu $a0, $a0, 0x0568 ## $a0 = 000005CC /* 05328 8093DFF8 3C014382 */ lui $at, 0x4382 ## $at = 43820000 /* 0532C 8093DFFC 44811000 */ mtc1 $at, $f2 ## $f2 = 260.00 @@ -739,61 +739,61 @@ glabel L8093DC4C /* 053A8 8093E078 E62A060C */ swc1 $f10, 0x060C($s1) ## 0000060C /* 053AC 8093E07C E6240610 */ swc1 $f4, 0x0610($s1) ## 00000610 /* 053B0 8093E080 0C00B58B */ jal Actor_SetScale - + /* 053B4 8093E084 8E640000 */ lw $a0, 0x0000($s3) ## 8094C844 -/* 053B8 8093E088 10000319 */ beq $zero, $zero, .L8093ECF0 +/* 053B8 8093E088 10000319 */ beq $zero, $zero, .L8093ECF0 /* 053BC 8093E08C 862505FC */ lh $a1, 0x05FC($s1) ## 000005FC .L8093E090: /* 053C0 8093E090 C62606B0 */ lwc1 $f6, 0x06B0($s1) ## 000006B0 /* 053C4 8093E094 8E500000 */ lw $s0, 0x0000($s2) ## 8094C848 -/* 053C8 8093E098 4600320D */ trunc.w.s $f8, $f6 +/* 053C8 8093E098 4600320D */ trunc.w.s $f8, $f6 /* 053CC 8093E09C 860A00B6 */ lh $t2, 0x00B6($s0) ## 000000B7 -/* 053D0 8093E0A0 440E4000 */ mfc1 $t6, $f8 +/* 053D0 8093E0A0 440E4000 */ mfc1 $t6, $f8 /* 053D4 8093E0A4 00000000 */ nop -/* 053D8 8093E0A8 014E7821 */ addu $t7, $t2, $t6 -/* 053DC 8093E0AC 1000030F */ beq $zero, $zero, .L8093ECEC +/* 053D8 8093E0A8 014E7821 */ addu $t7, $t2, $t6 +/* 053DC 8093E0AC 1000030F */ beq $zero, $zero, .L8093ECEC /* 053E0 8093E0B0 A60F00B6 */ sh $t7, 0x00B6($s0) ## 000000B7 .L8093E0B4: -/* 053E4 8093E0B4 17000003 */ bne $t8, $zero, .L8093E0C4 +/* 053E4 8093E0B4 17000003 */ bne $t8, $zero, .L8093E0C4 /* 053E8 8093E0B8 24053921 */ addiu $a1, $zero, 0x3921 ## $a1 = 00003921 /* 053EC 8093E0BC 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 053F0 8093E0C0 8E440000 */ lw $a0, 0x0000($s2) ## 8094C848 .L8093E0C4: /* 053F4 8093E0C4 C62A06B0 */ lwc1 $f10, 0x06B0($s1) ## 000006B0 /* 053F8 8093E0C8 8E500000 */ lw $s0, 0x0000($s2) ## 8094C848 /* 053FC 8093E0CC 262406B0 */ addiu $a0, $s1, 0x06B0 ## $a0 = 000006B0 -/* 05400 8093E0D0 4600510D */ trunc.w.s $f4, $f10 +/* 05400 8093E0D0 4600510D */ trunc.w.s $f4, $f10 /* 05404 8093E0D4 861900B6 */ lh $t9, 0x00B6($s0) ## 000000B7 /* 05408 8093E0D8 3C054640 */ lui $a1, 0x4640 ## $a1 = 46400000 /* 0540C 8093E0DC 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 05410 8093E0E0 440C2000 */ mfc1 $t4, $f4 +/* 05410 8093E0E0 440C2000 */ mfc1 $t4, $f4 /* 05414 8093E0E4 3C0743C0 */ lui $a3, 0x43C0 ## $a3 = 43C00000 -/* 05418 8093E0E8 032C6821 */ addu $t5, $t9, $t4 +/* 05418 8093E0E8 032C6821 */ addu $t5, $t9, $t4 /* 0541C 8093E0EC 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 05420 8093E0F0 A60D00B6 */ sh $t5, 0x00B6($s0) ## 000000B7 /* 05424 8093E0F4 8E440000 */ lw $a0, 0x0000($s2) ## 8094C848 /* 05428 8093E0F8 8E2501A4 */ lw $a1, 0x01A4($s1) ## 000001A4 -/* 0542C 8093E0FC 0C0295B2 */ jal func_800A56C8 +/* 0542C 8093E0FC 0C0295B2 */ jal func_800A56C8 /* 05430 8093E100 24840568 */ addiu $a0, $a0, 0x0568 ## $a0 = 00000568 -/* 05434 8093E104 104002F9 */ beq $v0, $zero, .L8093ECEC +/* 05434 8093E104 104002F9 */ beq $v0, $zero, .L8093ECEC /* 05438 8093E108 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 0543C 8093E10C 8E440000 */ lw $a0, 0x0000($s2) ## 8094C848 /* 05440 8093E110 24A56F28 */ addiu $a1, $a1, 0x6F28 ## $a1 = 06006F28 /* 05444 8093E114 24060000 */ addiu $a2, $zero, 0x0000 ## $a2 = 00000000 -/* 05448 8093E118 0C0294D3 */ jal func_800A534C +/* 05448 8093E118 0C0294D3 */ jal SkelAnime_ChangeAnimTransitionRepeat /* 0544C 8093E11C 24840568 */ addiu $a0, $a0, 0x0568 ## $a0 = 00000568 /* 05450 8093E120 3C01447A */ lui $at, 0x447A ## $at = 447A0000 /* 05454 8093E124 44813000 */ mtc1 $at, $f6 ## $f6 = 1000.00 -/* 05458 8093E128 100002F0 */ beq $zero, $zero, .L8093ECEC +/* 05458 8093E128 100002F0 */ beq $zero, $zero, .L8093ECEC /* 0545C 8093E12C E62601A4 */ swc1 $f6, 0x01A4($s1) ## 000001A4 glabel L8093E130 /* 05460 8093E130 3C138095 */ lui $s3, %hi(D_8094C844) ## $s3 = 80950000 /* 05464 8093E134 2673C844 */ addiu $s3, $s3, %lo(D_8094C844) ## $s3 = 8094C844 /* 05468 8093E138 8E640000 */ lw $a0, 0x0000($s3) ## 8094C844 /* 0546C 8093E13C 0C02927F */ jal SkelAnime_FrameUpdateMatrix - + /* 05470 8093E140 24840568 */ addiu $a0, $a0, 0x0568 ## $a0 = 00000568 /* 05474 8093E144 8E640000 */ lw $a0, 0x0000($s3) ## 8094C844 /* 05478 8093E148 3C063D4C */ lui $a2, 0x3D4C ## $a2 = 3D4C0000 @@ -801,19 +801,19 @@ glabel L8093E130 /* 05480 8093E150 3C054370 */ lui $a1, 0x4370 ## $a1 = 43700000 /* 05484 8093E154 3C0740A0 */ lui $a3, 0x40A0 ## $a3 = 40A00000 /* 05488 8093E158 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 0548C 8093E15C 24840028 */ addiu $a0, $a0, 0x0028 ## $a0 = 00000028 /* 05490 8093E160 3C018095 */ lui $at, %hi(D_8094AFAC) ## $at = 80950000 -/* 05494 8093E164 C420AFAC */ lwc1 $f0, %lo(D_8094AFAC)($at) +/* 05494 8093E164 C420AFAC */ lwc1 $f0, %lo(D_8094AFAC)($at) /* 05498 8093E168 C6280600 */ lwc1 $f8, 0x0600($s1) ## 00000600 /* 0549C 8093E16C C6240608 */ lwc1 $f4, 0x0608($s1) ## 00000608 /* 054A0 8093E170 862A0150 */ lh $t2, 0x0150($s1) ## 00000150 -/* 054A4 8093E174 46004281 */ sub.s $f10, $f8, $f0 +/* 054A4 8093E174 46004281 */ sub.s $f10, $f8, $f0 /* 054A8 8093E178 240E000B */ addiu $t6, $zero, 0x000B ## $t6 = 0000000B -/* 054AC 8093E17C 29410033 */ slti $at, $t2, 0x0033 -/* 054B0 8093E180 46002181 */ sub.s $f6, $f4, $f0 +/* 054AC 8093E17C 29410033 */ slti $at, $t2, 0x0033 +/* 054B0 8093E180 46002181 */ sub.s $f6, $f4, $f0 /* 054B4 8093E184 E62A0600 */ swc1 $f10, 0x0600($s1) ## 00000600 -/* 054B8 8093E188 142002D8 */ bne $at, $zero, .L8093ECEC +/* 054B8 8093E188 142002D8 */ bne $at, $zero, .L8093ECEC /* 054BC 8093E18C E6260608 */ swc1 $f6, 0x0608($s1) ## 00000608 /* 054C0 8093E190 44809000 */ mtc1 $zero, $f18 ## $f18 = 0.00 /* 054C4 8093E194 C6300600 */ lwc1 $f16, 0x0600($s1) ## 00000600 @@ -825,81 +825,81 @@ glabel L8093E130 /* 054DC 8093E1AC 44814000 */ mtc1 $at, $f8 ## $f8 = -30.00 /* 054E0 8093E1B0 C626060C */ lwc1 $f6, 0x060C($s1) ## 0000060C /* 054E4 8093E1B4 3C018095 */ lui $at, %hi(D_8094AFB0) ## $at = 80950000 -/* 054E8 8093E1B8 46104401 */ sub.s $f16, $f8, $f16 -/* 054EC 8093E1BC C424AFB0 */ lwc1 $f4, %lo(D_8094AFB0)($at) +/* 054E8 8093E1B8 46104401 */ sub.s $f16, $f8, $f16 +/* 054EC 8093E1BC C424AFB0 */ lwc1 $f4, %lo(D_8094AFB0)($at) /* 054F0 8093E1C0 E628066C */ swc1 $f8, 0x066C($s1) ## 0000066C /* 054F4 8093E1C4 C6280610 */ lwc1 $f8, 0x0610($s1) ## 00000610 -/* 054F8 8093E1C8 46008405 */ abs.s $f16, $f16 -/* 054FC 8093E1CC 460E5381 */ sub.s $f14, $f10, $f14 +/* 054F8 8093E1C8 46008405 */ abs.s $f16, $f16 +/* 054FC 8093E1CC 460E5381 */ sub.s $f14, $f10, $f14 /* 05500 8093E1D0 E62A0670 */ swc1 $f10, 0x0670($s1) ## 00000670 /* 05504 8093E1D4 A62E05FA */ sh $t6, 0x05FA($s1) ## 000005FA /* 05508 8093E1D8 E6240674 */ swc1 $f4, 0x0674($s1) ## 00000674 -/* 0550C 8093E1DC 46007385 */ abs.s $f14, $f14 -/* 05510 8093E1E0 460C2301 */ sub.s $f12, $f4, $f12 +/* 0550C 8093E1DC 46007385 */ abs.s $f14, $f14 +/* 05510 8093E1E0 460C2301 */ sub.s $f12, $f4, $f12 /* 05514 8093E1E4 E6320684 */ swc1 $f18, 0x0684($s1) ## 00000684 /* 05518 8093E1E8 3C018095 */ lui $at, %hi(D_8094AFB4) ## $at = 80950000 -/* 0551C 8093E1EC C424AFB4 */ lwc1 $f4, %lo(D_8094AFB4)($at) -/* 05520 8093E1F0 46006305 */ abs.s $f12, $f12 -/* 05524 8093E1F4 46069181 */ sub.s $f6, $f18, $f6 +/* 0551C 8093E1EC C424AFB4 */ lwc1 $f4, %lo(D_8094AFB4)($at) +/* 05520 8093E1F0 46006305 */ abs.s $f12, $f12 +/* 05524 8093E1F4 46069181 */ sub.s $f6, $f18, $f6 /* 05528 8093E1F8 E6240688 */ swc1 $f4, 0x0688($s1) ## 00000688 /* 0552C 8093E1FC C6240688 */ lwc1 $f4, 0x0688($s1) ## 00000688 /* 05530 8093E200 C62A0614 */ lwc1 $f10, 0x0614($s1) ## 00000614 -/* 05534 8093E204 46003185 */ abs.s $f6, $f6 -/* 05538 8093E208 46082201 */ sub.s $f8, $f4, $f8 +/* 05534 8093E204 46003185 */ abs.s $f6, $f6 +/* 05538 8093E208 46082201 */ sub.s $f8, $f4, $f8 /* 0553C 8093E20C 3C01C411 */ lui $at, 0xC411 ## $at = C4110000 /* 05540 8093E210 44812000 */ mtc1 $at, $f4 ## $f4 = -580.00 /* 05544 8093E214 E6300654 */ swc1 $f16, 0x0654($s1) ## 00000654 -/* 05548 8093E218 46004205 */ abs.s $f8, $f8 +/* 05548 8093E218 46004205 */ abs.s $f8, $f8 /* 0554C 8093E21C E624068C */ swc1 $f4, 0x068C($s1) ## 0000068C /* 05550 8093E220 C624068C */ lwc1 $f4, 0x068C($s1) ## 0000068C /* 05554 8093E224 E62E0658 */ swc1 $f14, 0x0658($s1) ## 00000658 /* 05558 8093E228 E62C065C */ swc1 $f12, 0x065C($s1) ## 0000065C -/* 0555C 8093E22C 460A2281 */ sub.s $f10, $f4, $f10 +/* 0555C 8093E22C 460A2281 */ sub.s $f10, $f4, $f10 /* 05560 8093E230 E6260660 */ swc1 $f6, 0x0660($s1) ## 00000660 /* 05564 8093E234 E6280664 */ swc1 $f8, 0x0664($s1) ## 00000664 /* 05568 8093E238 E632069C */ swc1 $f18, 0x069C($s1) ## 0000069C -/* 0556C 8093E23C 46005285 */ abs.s $f10, $f10 +/* 0556C 8093E23C 46005285 */ abs.s $f10, $f10 /* 05570 8093E240 3C018095 */ lui $at, %hi(D_8094AFB8) ## $at = 80950000 /* 05574 8093E244 E62A0668 */ swc1 $f10, 0x0668($s1) ## 00000668 -/* 05578 8093E248 C42AAFB8 */ lwc1 $f10, %lo(D_8094AFB8)($at) +/* 05578 8093E248 C42AAFB8 */ lwc1 $f10, %lo(D_8094AFB8)($at) /* 0557C 8093E24C A6200150 */ sh $zero, 0x0150($s1) ## 00000150 -/* 05580 8093E250 100002A6 */ beq $zero, $zero, .L8093ECEC +/* 05580 8093E250 100002A6 */ beq $zero, $zero, .L8093ECEC /* 05584 8093E254 E62A06A0 */ swc1 $f10, 0x06A0($s1) ## 000006A0 glabel L8093E258 /* 05588 8093E258 3C138095 */ lui $s3, %hi(D_8094C844) ## $s3 = 80950000 /* 0558C 8093E25C 2673C844 */ addiu $s3, $s3, %lo(D_8094C844) ## $s3 = 8094C844 /* 05590 8093E260 8E640000 */ lw $a0, 0x0000($s3) ## 8094C844 /* 05594 8093E264 0C02927F */ jal SkelAnime_FrameUpdateMatrix - + /* 05598 8093E268 24840568 */ addiu $a0, $a0, 0x0568 ## $a0 = 00000568 /* 0559C 8093E26C 8E640000 */ lw $a0, 0x0000($s3) ## 8094C844 /* 055A0 8093E270 240F0001 */ addiu $t7, $zero, 0x0001 ## $t7 = 00000001 /* 055A4 8093E274 3C063D4C */ lui $a2, 0x3D4C ## $a2 = 3D4C0000 -/* 055A8 8093E278 A3AF009F */ sb $t7, 0x009F($sp) +/* 055A8 8093E278 A3AF009F */ sb $t7, 0x009F($sp) /* 055AC 8093E27C 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3D4CCCCD /* 055B0 8093E280 3C054370 */ lui $a1, 0x4370 ## $a1 = 43700000 /* 055B4 8093E284 3C0740A0 */ lui $a3, 0x40A0 ## $a3 = 40A00000 /* 055B8 8093E288 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 055BC 8093E28C 24840028 */ addiu $a0, $a0, 0x0028 ## $a0 = 00000028 /* 055C0 8093E290 3C073CA3 */ lui $a3, 0x3CA3 ## $a3 = 3CA30000 /* 055C4 8093E294 34E7D70A */ ori $a3, $a3, 0xD70A ## $a3 = 3CA3D70A /* 055C8 8093E298 2624069C */ addiu $a0, $s1, 0x069C ## $a0 = 0000069C /* 055CC 8093E29C 3C053F80 */ lui $a1, 0x3F80 ## $a1 = 3F800000 /* 055D0 8093E2A0 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 055D4 8093E2A4 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 055D8 8093E2A8 86230150 */ lh $v1, 0x0150($s1) ## 00000150 /* 055DC 8093E2AC 2401001E */ addiu $at, $zero, 0x001E ## $at = 0000001E -/* 055E0 8093E2B0 8FA400A4 */ lw $a0, 0x00A4($sp) -/* 055E4 8093E2B4 14610004 */ bne $v1, $at, .L8093E2C8 +/* 055E0 8093E2B0 8FA400A4 */ lw $a0, 0x00A4($sp) +/* 055E4 8093E2B4 14610004 */ bne $v1, $at, .L8093E2C8 /* 055E8 8093E2B8 2405604A */ addiu $a1, $zero, 0x604A ## $a1 = 0000604A -/* 055EC 8093E2BC 0C042DA0 */ jal func_8010B680 +/* 055EC 8093E2BC 0C042DA0 */ jal func_8010B680 /* 055F0 8093E2C0 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 /* 055F4 8093E2C4 86230150 */ lh $v1, 0x0150($s1) ## 00000150 .L8093E2C8: -/* 055F8 8093E2C8 28610051 */ slti $at, $v1, 0x0051 -/* 055FC 8093E2CC 14200287 */ bne $at, $zero, .L8093ECEC +/* 055F8 8093E2C8 28610051 */ slti $at, $v1, 0x0051 +/* 055FC 8093E2CC 14200287 */ bne $at, $zero, .L8093ECEC /* 05600 8093E2D0 2418000C */ addiu $t8, $zero, 0x000C ## $t8 = 0000000C /* 05604 8093E2D4 3C014382 */ lui $at, 0x4382 ## $at = 43820000 /* 05608 8093E2D8 44811000 */ mtc1 $at, $f2 ## $f2 = 260.00 @@ -922,63 +922,63 @@ glabel L8093E258 /* 0564C 8093E31C E6260684 */ swc1 $f6, 0x0684($s1) ## 00000684 /* 05650 8093E320 8E690000 */ lw $t1, 0x0000($s3) ## 8094C844 /* 05654 8093E324 26100AAC */ addiu $s0, $s0, 0x0AAC ## $s0 = 06000AAC -/* 05658 8093E328 44068000 */ mfc1 $a2, $f16 +/* 05658 8093E328 44068000 */ mfc1 $a2, $f16 /* 0565C 8093E32C C5280028 */ lwc1 $f8, 0x0028($t1) ## 00000028 /* 05660 8093E330 02002825 */ or $a1, $s0, $zero ## $a1 = 06000AAC -/* 05664 8093E334 460A4100 */ add.s $f4, $f8, $f10 +/* 05664 8093E334 460A4100 */ add.s $f4, $f8, $f10 /* 05668 8093E338 C6280600 */ lwc1 $f8, 0x0600($s1) ## 00000600 /* 0566C 8093E33C C62A0604 */ lwc1 $f10, 0x0604($s1) ## 00000604 -/* 05670 8093E340 46086001 */ sub.s $f0, $f12, $f8 +/* 05670 8093E340 46086001 */ sub.s $f0, $f12, $f8 /* 05674 8093E344 E6240688 */ swc1 $f4, 0x0688($s1) ## 00000688 /* 05678 8093E348 8E6B0000 */ lw $t3, 0x0000($s3) ## 8094C844 /* 0567C 8093E34C C6240608 */ lwc1 $f4, 0x0608($s1) ## 00000608 -/* 05680 8093E350 46000005 */ abs.s $f0, $f0 +/* 05680 8093E350 46000005 */ abs.s $f0, $f0 /* 05684 8093E354 C566002C */ lwc1 $f6, 0x002C($t3) ## 0000002C /* 05688 8093E358 E6200654 */ swc1 $f0, 0x0654($s1) ## 00000654 -/* 0568C 8093E35C 460A1001 */ sub.s $f0, $f2, $f10 +/* 0568C 8093E35C 460A1001 */ sub.s $f0, $f2, $f10 /* 05690 8093E360 E626068C */ swc1 $f6, 0x068C($s1) ## 0000068C /* 05694 8093E364 C6260684 */ lwc1 $f6, 0x0684($s1) ## 00000684 /* 05698 8093E368 C628060C */ lwc1 $f8, 0x060C($s1) ## 0000060C -/* 0569C 8093E36C 46000005 */ abs.s $f0, $f0 +/* 0569C 8093E36C 46000005 */ abs.s $f0, $f0 /* 056A0 8093E370 C62A0688 */ lwc1 $f10, 0x0688($s1) ## 00000688 /* 056A4 8093E374 E6200658 */ swc1 $f0, 0x0658($s1) ## 00000658 -/* 056A8 8093E378 46047001 */ sub.s $f0, $f14, $f4 +/* 056A8 8093E378 46047001 */ sub.s $f0, $f14, $f4 /* 056AC 8093E37C C6240610 */ lwc1 $f4, 0x0610($s1) ## 00000610 /* 056B0 8093E380 E630069C */ swc1 $f16, 0x069C($s1) ## 0000069C -/* 056B4 8093E384 46000005 */ abs.s $f0, $f0 +/* 056B4 8093E384 46000005 */ abs.s $f0, $f0 /* 056B8 8093E388 E620065C */ swc1 $f0, 0x065C($s1) ## 0000065C -/* 056BC 8093E38C 46083001 */ sub.s $f0, $f6, $f8 +/* 056BC 8093E38C 46083001 */ sub.s $f0, $f6, $f8 /* 056C0 8093E390 C6280614 */ lwc1 $f8, 0x0614($s1) ## 00000614 /* 056C4 8093E394 C626068C */ lwc1 $f6, 0x068C($s1) ## 0000068C -/* 056C8 8093E398 46000005 */ abs.s $f0, $f0 +/* 056C8 8093E398 46000005 */ abs.s $f0, $f0 /* 056CC 8093E39C E6200660 */ swc1 $f0, 0x0660($s1) ## 00000660 -/* 056D0 8093E3A0 46045001 */ sub.s $f0, $f10, $f4 -/* 056D4 8093E3A4 46000005 */ abs.s $f0, $f0 +/* 056D0 8093E3A0 46045001 */ sub.s $f0, $f10, $f4 +/* 056D4 8093E3A4 46000005 */ abs.s $f0, $f0 /* 056D8 8093E3A8 E6200664 */ swc1 $f0, 0x0664($s1) ## 00000664 -/* 056DC 8093E3AC 46083001 */ sub.s $f0, $f6, $f8 -/* 056E0 8093E3B0 46000005 */ abs.s $f0, $f0 +/* 056DC 8093E3AC 46083001 */ sub.s $f0, $f6, $f8 +/* 056E0 8093E3B0 46000005 */ abs.s $f0, $f0 /* 056E4 8093E3B4 E6200668 */ swc1 $f0, 0x0668($s1) ## 00000668 -/* 056E8 8093E3B8 C42AAFBC */ lwc1 $f10, %lo(D_8094AFBC)($at) +/* 056E8 8093E3B8 C42AAFBC */ lwc1 $f10, %lo(D_8094AFBC)($at) /* 056EC 8093E3BC E62A06A0 */ swc1 $f10, 0x06A0($s1) ## 000006A0 /* 056F0 8093E3C0 8E640000 */ lw $a0, 0x0000($s3) ## 8094C844 -/* 056F4 8093E3C4 0C029490 */ jal func_800A5240 +/* 056F4 8093E3C4 0C029490 */ jal SkelAnime_ChangeAnimTransitionStop /* 056F8 8093E3C8 24840568 */ addiu $a0, $a0, 0x0568 ## $a0 = 00000568 /* 056FC 8093E3CC 0C028800 */ jal SkelAnime_GetFrameCount - + /* 05700 8093E3D0 02002025 */ or $a0, $s0, $zero ## $a0 = 06000AAC /* 05704 8093E3D4 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 05708 8093E3D8 A6200150 */ sh $zero, 0x0150($s1) ## 00000150 -/* 0570C 8093E3DC 468021A0 */ cvt.s.w $f6, $f4 -/* 05710 8093E3E0 10000242 */ beq $zero, $zero, .L8093ECEC +/* 0570C 8093E3DC 468021A0 */ cvt.s.w $f6, $f4 +/* 05710 8093E3E0 10000242 */ beq $zero, $zero, .L8093ECEC /* 05714 8093E3E4 E62601A4 */ swc1 $f6, 0x01A4($s1) ## 000001A4 glabel L8093E3E8 /* 05718 8093E3E8 3C138095 */ lui $s3, %hi(D_8094C844) ## $s3 = 80950000 /* 0571C 8093E3EC 2673C844 */ addiu $s3, $s3, %lo(D_8094C844) ## $s3 = 8094C844 /* 05720 8093E3F0 8E640000 */ lw $a0, 0x0000($s3) ## 8094C844 /* 05724 8093E3F4 24190001 */ addiu $t9, $zero, 0x0001 ## $t9 = 00000001 -/* 05728 8093E3F8 A3B9009F */ sb $t9, 0x009F($sp) +/* 05728 8093E3F8 A3B9009F */ sb $t9, 0x009F($sp) /* 0572C 8093E3FC 0C02927F */ jal SkelAnime_FrameUpdateMatrix - + /* 05730 8093E400 24840568 */ addiu $a0, $a0, 0x0568 ## $a0 = 00000568 /* 05734 8093E404 8E6C0000 */ lw $t4, 0x0000($s3) ## 8094C844 /* 05738 8093E408 3C0143AF */ lui $at, 0x43AF ## $at = 43AF0000 @@ -987,204 +987,204 @@ glabel L8093E3E8 /* 05744 8093E414 44815000 */ mtc1 $at, $f10 ## $f10 = 20.00 /* 05748 8093E418 C5880028 */ lwc1 $f8, 0x0028($t4) ## 00000028 /* 0574C 8093E41C 3C063DCC */ lui $a2, 0x3DCC ## $a2 = 3DCC0000 -/* 05750 8093E420 44058000 */ mfc1 $a1, $f16 -/* 05754 8093E424 460A4100 */ add.s $f4, $f8, $f10 +/* 05750 8093E420 44058000 */ mfc1 $a1, $f16 +/* 05754 8093E424 460A4100 */ add.s $f4, $f8, $f10 /* 05758 8093E428 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3DCCCCCD /* 0575C 8093E42C 8E270068 */ lw $a3, 0x0068($s1) ## 00000068 /* 05760 8093E430 E6240688 */ swc1 $f4, 0x0688($s1) ## 00000688 /* 05764 8093E434 8E640000 */ lw $a0, 0x0000($s3) ## 8094C844 /* 05768 8093E438 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 0576C 8093E43C 24840028 */ addiu $a0, $a0, 0x0028 ## $a0 = 00000028 /* 05770 8093E440 3C073F66 */ lui $a3, 0x3F66 ## $a3 = 3F660000 /* 05774 8093E444 34E76666 */ ori $a3, $a3, 0x6666 ## $a3 = 3F666666 /* 05778 8093E448 26240068 */ addiu $a0, $s1, 0x0068 ## $a0 = 00000068 /* 0577C 8093E44C 3C054110 */ lui $a1, 0x4110 ## $a1 = 41100000 /* 05780 8093E450 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 05784 8093E454 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 05788 8093E458 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 /* 0578C 8093E45C 44810000 */ mtc1 $at, $f0 ## $f0 = 1.00 /* 05790 8093E460 3C073CA3 */ lui $a3, 0x3CA3 ## $a3 = 3CA30000 /* 05794 8093E464 34E7D70A */ ori $a3, $a3, 0xD70A ## $a3 = 3CA3D70A -/* 05798 8093E468 44050000 */ mfc1 $a1, $f0 -/* 0579C 8093E46C 44060000 */ mfc1 $a2, $f0 +/* 05798 8093E468 44050000 */ mfc1 $a1, $f0 +/* 0579C 8093E46C 44060000 */ mfc1 $a2, $f0 /* 057A0 8093E470 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 057A4 8093E474 2624069C */ addiu $a0, $s1, 0x069C ## $a0 = 0000069C /* 057A8 8093E478 86230150 */ lh $v1, 0x0150($s1) ## 00000150 -/* 057AC 8093E47C 2861001E */ slti $at, $v1, 0x001E -/* 057B0 8093E480 142000D5 */ bne $at, $zero, .L8093E7D8 +/* 057AC 8093E47C 2861001E */ slti $at, $v1, 0x001E +/* 057B0 8093E480 142000D5 */ bne $at, $zero, .L8093E7D8 /* 057B4 8093E484 306B0007 */ andi $t3, $v1, 0x0007 ## $t3 = 00000000 -/* 057B8 8093E488 2861002D */ slti $at, $v1, 0x002D -/* 057BC 8093E48C 1020000D */ beq $at, $zero, .L8093E4C4 -/* 057C0 8093E490 8FA400A4 */ lw $a0, 0x00A4($sp) -/* 057C4 8093E494 8FAA00A4 */ lw $t2, 0x00A4($sp) +/* 057B8 8093E488 2861002D */ slti $at, $v1, 0x002D +/* 057BC 8093E48C 1020000D */ beq $at, $zero, .L8093E4C4 +/* 057C0 8093E490 8FA400A4 */ lw $a0, 0x00A4($sp) +/* 057C4 8093E494 8FAA00A4 */ lw $t2, 0x00A4($sp) /* 057C8 8093E498 3C010001 */ lui $at, 0x0001 ## $at = 00010000 /* 057CC 8093E49C 240D0003 */ addiu $t5, $zero, 0x0003 ## $t5 = 00000003 -/* 057D0 8093E4A0 002A0821 */ addu $at, $at, $t2 +/* 057D0 8093E4A0 002A0821 */ addu $at, $at, $t2 /* 057D4 8093E4A4 A02D0AE1 */ sb $t5, 0x0AE1($at) ## 00010AE1 -/* 057D8 8093E4A8 8FAE00A4 */ lw $t6, 0x00A4($sp) +/* 057D8 8093E4A8 8FAE00A4 */ lw $t6, 0x00A4($sp) /* 057DC 8093E4AC 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 /* 057E0 8093E4B0 44813000 */ mtc1 $at, $f6 ## $f6 = 1.00 /* 057E4 8093E4B4 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 057E8 8093E4B8 002E0821 */ addu $at, $at, $t6 -/* 057EC 8093E4BC 10000008 */ beq $zero, $zero, .L8093E4E0 +/* 057E8 8093E4B8 002E0821 */ addu $at, $at, $t6 +/* 057EC 8093E4BC 10000008 */ beq $zero, $zero, .L8093E4E0 /* 057F0 8093E4C0 E4260AFC */ swc1 $f6, 0x0AFC($at) ## 00010AFC .L8093E4C4: /* 057F4 8093E4C4 3C010001 */ lui $at, 0x0001 ## $at = 00010000 /* 057F8 8093E4C8 34210AFC */ ori $at, $at, 0x0AFC ## $at = 00010AFC /* 057FC 8093E4CC 3C063DCC */ lui $a2, 0x3DCC ## $a2 = 3DCC0000 /* 05800 8093E4D0 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3DCCCCCD -/* 05804 8093E4D4 00812021 */ addu $a0, $a0, $at +/* 05804 8093E4D4 00812021 */ addu $a0, $a0, $at /* 05808 8093E4D8 0C01E123 */ jal Math_SmoothDownscaleMaxF - + /* 0580C 8093E4DC 3C053F80 */ lui $a1, 0x3F80 ## $a1 = 3F800000 .L8093E4E0: /* 05810 8093E4E0 86230150 */ lh $v1, 0x0150($s1) ## 00000150 /* 05814 8093E4E4 2401001E */ addiu $at, $zero, 0x001E ## $at = 0000001E /* 05818 8093E4E8 00008025 */ or $s0, $zero, $zero ## $s0 = 00000000 -/* 0581C 8093E4EC 14610040 */ bne $v1, $at, .L8093E5F0 +/* 0581C 8093E4EC 14610040 */ bne $v1, $at, .L8093E5F0 /* 05820 8093E4F0 27B2005C */ addiu $s2, $sp, 0x005C ## $s2 = FFFFFFBC /* 05824 8093E4F4 3C014248 */ lui $at, 0x4248 ## $at = 42480000 .L8093E4F8: /* 05828 8093E4F8 44816000 */ mtc1 $at, $f12 ## $f12 = 50.00 /* 0582C 8093E4FC 0C00CFC8 */ jal Math_Rand_CenteredFloat - + /* 05830 8093E500 00000000 */ nop /* 05834 8093E504 8E6F0000 */ lw $t7, 0x0000($s3) ## 8094C844 /* 05838 8093E508 3C014248 */ lui $at, 0x4248 ## $at = 42480000 /* 0583C 8093E50C 44816000 */ mtc1 $at, $f12 ## $f12 = 50.00 /* 05840 8093E510 C5E80024 */ lwc1 $f8, 0x0024($t7) ## 00000024 -/* 05844 8093E514 46080280 */ add.s $f10, $f0, $f8 +/* 05844 8093E514 46080280 */ add.s $f10, $f0, $f8 /* 05848 8093E518 0C00CFC8 */ jal Math_Rand_CenteredFloat - -/* 0584C 8093E51C E7AA005C */ swc1 $f10, 0x005C($sp) + +/* 0584C 8093E51C E7AA005C */ swc1 $f10, 0x005C($sp) /* 05850 8093E520 8E780000 */ lw $t8, 0x0000($s3) ## 8094C844 /* 05854 8093E524 3C014248 */ lui $at, 0x4248 ## $at = 42480000 /* 05858 8093E528 44816000 */ mtc1 $at, $f12 ## $f12 = 50.00 /* 0585C 8093E52C C7040028 */ lwc1 $f4, 0x0028($t8) ## 00000028 -/* 05860 8093E530 46040180 */ add.s $f6, $f0, $f4 +/* 05860 8093E530 46040180 */ add.s $f6, $f0, $f4 /* 05864 8093E534 0C00CFC8 */ jal Math_Rand_CenteredFloat - -/* 05868 8093E538 E7A60060 */ swc1 $f6, 0x0060($sp) + +/* 05868 8093E538 E7A60060 */ swc1 $f6, 0x0060($sp) /* 0586C 8093E53C 8E680000 */ lw $t0, 0x0000($s3) ## 8094C844 /* 05870 8093E540 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 /* 05874 8093E544 44816000 */ mtc1 $at, $f12 ## $f12 = 20.00 /* 05878 8093E548 C508002C */ lwc1 $f8, 0x002C($t0) ## 0000002C -/* 0587C 8093E54C 46080280 */ add.s $f10, $f0, $f8 +/* 0587C 8093E54C 46080280 */ add.s $f10, $f0, $f8 /* 05880 8093E550 0C00CFC8 */ jal Math_Rand_CenteredFloat - -/* 05884 8093E554 E7AA0064 */ swc1 $f10, 0x0064($sp) + +/* 05884 8093E554 E7AA0064 */ swc1 $f10, 0x0064($sp) /* 05888 8093E558 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 /* 0588C 8093E55C 44816000 */ mtc1 $at, $f12 ## $f12 = 20.00 /* 05890 8093E560 0C00CFC8 */ jal Math_Rand_CenteredFloat - -/* 05894 8093E564 E7A00050 */ swc1 $f0, 0x0050($sp) + +/* 05894 8093E564 E7A00050 */ swc1 $f0, 0x0050($sp) /* 05898 8093E568 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 /* 0589C 8093E56C 44816000 */ mtc1 $at, $f12 ## $f12 = 20.00 /* 058A0 8093E570 0C00CFC8 */ jal Math_Rand_CenteredFloat - -/* 058A4 8093E574 E7A00054 */ swc1 $f0, 0x0054($sp) + +/* 058A4 8093E574 E7A00054 */ swc1 $f0, 0x0054($sp) /* 058A8 8093E578 3C014120 */ lui $at, 0x4120 ## $at = 41200000 /* 058AC 8093E57C 44816000 */ mtc1 $at, $f12 ## $f12 = 10.00 /* 058B0 8093E580 0C00CFBE */ jal Math_Rand_ZeroFloat - -/* 058B4 8093E584 E7A00058 */ swc1 $f0, 0x0058($sp) + +/* 058B4 8093E584 E7A00058 */ swc1 $f0, 0x0058($sp) /* 058B8 8093E588 3C0141C8 */ lui $at, 0x41C8 ## $at = 41C80000 /* 058BC 8093E58C 44812000 */ mtc1 $at, $f4 ## $f4 = 25.00 /* 058C0 8093E590 3C078095 */ lui $a3, %hi(D_8094A7DC) ## $a3 = 80950000 /* 058C4 8093E594 24E7A7DC */ addiu $a3, $a3, %lo(D_8094A7DC) ## $a3 = 8094A7DC -/* 058C8 8093E598 46040180 */ add.s $f6, $f0, $f4 -/* 058CC 8093E59C 8FA400A4 */ lw $a0, 0x00A4($sp) +/* 058C8 8093E598 46040180 */ add.s $f6, $f0, $f4 +/* 058CC 8093E59C 8FA400A4 */ lw $a0, 0x00A4($sp) /* 058D0 8093E5A0 02402825 */ or $a1, $s2, $zero ## $a1 = FFFFFFBC /* 058D4 8093E5A4 27A60050 */ addiu $a2, $sp, 0x0050 ## $a2 = FFFFFFB0 -/* 058D8 8093E5A8 E7A60010 */ swc1 $f6, 0x0010($sp) -/* 058DC 8093E5AC 0C24E41C */ jal func_80939070 -/* 058E0 8093E5B0 AFA00014 */ sw $zero, 0x0014($sp) +/* 058D8 8093E5A8 E7A60010 */ swc1 $f6, 0x0010($sp) +/* 058DC 8093E5AC 0C24E41C */ jal func_80939070 +/* 058E0 8093E5B0 AFA00014 */ sw $zero, 0x0014($sp) /* 058E4 8093E5B4 26100001 */ addiu $s0, $s0, 0x0001 ## $s0 = 00000001 -/* 058E8 8093E5B8 00108400 */ sll $s0, $s0, 16 -/* 058EC 8093E5BC 00108403 */ sra $s0, $s0, 16 -/* 058F0 8093E5C0 2A010032 */ slti $at, $s0, 0x0032 -/* 058F4 8093E5C4 5420FFCC */ bnel $at, $zero, .L8093E4F8 +/* 058E8 8093E5B8 00108400 */ sll $s0, $s0, 16 +/* 058EC 8093E5BC 00108403 */ sra $s0, $s0, 16 +/* 058F0 8093E5C0 2A010032 */ slti $at, $s0, 0x0032 +/* 058F4 8093E5C4 5420FFCC */ bnel $at, $zero, .L8093E4F8 /* 058F8 8093E5C8 3C014248 */ lui $at, 0x4248 ## $at = 42480000 /* 058FC 8093E5CC 8E640000 */ lw $a0, 0x0000($s3) ## 8094C844 /* 05900 8093E5D0 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 05904 8093E5D4 2405390D */ addiu $a1, $zero, 0x390D ## $a1 = 0000390D -/* 05908 8093E5D8 8FA900A4 */ lw $t1, 0x00A4($sp) +/* 05908 8093E5D8 8FA900A4 */ lw $t1, 0x00A4($sp) /* 0590C 8093E5DC 44804000 */ mtc1 $zero, $f8 ## $f8 = 0.00 /* 05910 8093E5E0 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 05914 8093E5E4 00290821 */ addu $at, $at, $t1 +/* 05914 8093E5E4 00290821 */ addu $at, $at, $t1 /* 05918 8093E5E8 E4280AFC */ swc1 $f8, 0x0AFC($at) ## 00010AFC /* 0591C 8093E5EC 86230150 */ lh $v1, 0x0150($s1) ## 00000150 .L8093E5F0: -/* 05920 8093E5F0 28610023 */ slti $at, $v1, 0x0023 -/* 05924 8093E5F4 1420006F */ bne $at, $zero, .L8093E7B4 -/* 05928 8093E5F8 28610032 */ slti $at, $v1, 0x0032 -/* 0592C 8093E5FC 10200019 */ beq $at, $zero, .L8093E664 -/* 05930 8093E600 00032140 */ sll $a0, $v1, 5 -/* 05934 8093E604 00832021 */ addu $a0, $a0, $v1 -/* 05938 8093E608 00042240 */ sll $a0, $a0, 9 -/* 0593C 8093E60C 00042400 */ sll $a0, $a0, 16 +/* 05920 8093E5F0 28610023 */ slti $at, $v1, 0x0023 +/* 05924 8093E5F4 1420006F */ bne $at, $zero, .L8093E7B4 +/* 05928 8093E5F8 28610032 */ slti $at, $v1, 0x0032 +/* 0592C 8093E5FC 10200019 */ beq $at, $zero, .L8093E664 +/* 05930 8093E600 00032140 */ sll $a0, $v1, 5 +/* 05934 8093E604 00832021 */ addu $a0, $a0, $v1 +/* 05938 8093E608 00042240 */ sll $a0, $a0, 9 +/* 0593C 8093E60C 00042400 */ sll $a0, $a0, 16 /* 05940 8093E610 0C01DE1C */ jal Math_Sins ## sins? -/* 05944 8093E614 00042403 */ sra $a0, $a0, 16 +/* 05944 8093E614 00042403 */ sra $a0, $a0, 16 /* 05948 8093E618 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 /* 0594C 8093E61C 44815000 */ mtc1 $at, $f10 ## $f10 = 20.00 /* 05950 8093E620 3C018095 */ lui $at, %hi(D_8094AFC0) ## $at = 80950000 -/* 05954 8093E624 C426AFC0 */ lwc1 $f6, %lo(D_8094AFC0)($at) -/* 05958 8093E628 460A0102 */ mul.s $f4, $f0, $f10 +/* 05954 8093E624 C426AFC0 */ lwc1 $f6, %lo(D_8094AFC0)($at) +/* 05958 8093E628 460A0102 */ mul.s $f4, $f0, $f10 /* 0595C 8093E62C 3C018095 */ lui $at, %hi(D_8094AFC4) ## $at = 80950000 -/* 05960 8093E630 C42AAFC4 */ lwc1 $f10, %lo(D_8094AFC4)($at) +/* 05960 8093E630 C42AAFC4 */ lwc1 $f10, %lo(D_8094AFC4)($at) /* 05964 8093E634 8E640000 */ lw $a0, 0x0000($s3) ## 8094C844 /* 05968 8093E638 3C073BA3 */ lui $a3, 0x3BA3 ## $a3 = 3BA30000 /* 0596C 8093E63C 34E7D70A */ ori $a3, $a3, 0xD70A ## $a3 = 3BA3D70A /* 05970 8093E640 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 05974 8093E644 46062203 */ div.s $f8, $f4, $f6 +/* 05974 8093E644 46062203 */ div.s $f8, $f4, $f6 /* 05978 8093E648 24840050 */ addiu $a0, $a0, 0x0050 ## $a0 = 00000050 -/* 0597C 8093E64C 460A4100 */ add.s $f4, $f8, $f10 -/* 05980 8093E650 44052000 */ mfc1 $a1, $f4 +/* 0597C 8093E64C 460A4100 */ add.s $f4, $f8, $f10 +/* 05980 8093E650 44052000 */ mfc1 $a1, $f4 /* 05984 8093E654 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 05988 8093E658 00000000 */ nop -/* 0598C 8093E65C 1000002E */ beq $zero, $zero, .L8093E718 +/* 0598C 8093E65C 1000002E */ beq $zero, $zero, .L8093E718 /* 05990 8093E660 8E700000 */ lw $s0, 0x0000($s3) ## 8094C844 .L8093E664: /* 05994 8093E664 24010032 */ addiu $at, $zero, 0x0032 ## $at = 00000032 -/* 05998 8093E668 1461000D */ bne $v1, $at, .L8093E6A0 +/* 05998 8093E668 1461000D */ bne $v1, $at, .L8093E6A0 /* 0599C 8093E66C 3C100601 */ lui $s0, 0x0601 ## $s0 = 06010000 /* 059A0 8093E670 8E640000 */ lw $a0, 0x0000($s3) ## 8094C844 /* 059A4 8093E674 261088C8 */ addiu $s0, $s0, 0x88C8 ## $s0 = 060088C8 /* 059A8 8093E678 02002825 */ or $a1, $s0, $zero ## $a1 = 060088C8 /* 059AC 8093E67C 3C06C0A0 */ lui $a2, 0xC0A0 ## $a2 = C0A00000 -/* 059B0 8093E680 0C029490 */ jal func_800A5240 +/* 059B0 8093E680 0C029490 */ jal SkelAnime_ChangeAnimTransitionStop /* 059B4 8093E684 24840568 */ addiu $a0, $a0, 0x0568 ## $a0 = 00000568 /* 059B8 8093E688 0C028800 */ jal SkelAnime_GetFrameCount - + /* 059BC 8093E68C 02002025 */ or $a0, $s0, $zero ## $a0 = 060088C8 /* 059C0 8093E690 44823000 */ mtc1 $v0, $f6 ## $f6 = 0.00 /* 059C4 8093E694 86230150 */ lh $v1, 0x0150($s1) ## 00000150 -/* 059C8 8093E698 46803220 */ cvt.s.w $f8, $f6 +/* 059C8 8093E698 46803220 */ cvt.s.w $f8, $f6 /* 059CC 8093E69C E62801A4 */ swc1 $f8, 0x01A4($s1) ## 000001A4 .L8093E6A0: /* 059D0 8093E6A0 2401003C */ addiu $at, $zero, 0x003C ## $at = 0000003C -/* 059D4 8093E6A4 14610003 */ bne $v1, $at, .L8093E6B4 +/* 059D4 8093E6A4 14610003 */ bne $v1, $at, .L8093E6B4 /* 059D8 8093E6A8 240539B1 */ addiu $a1, $zero, 0x39B1 ## $a1 = 000039B1 /* 059DC 8093E6AC 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 059E0 8093E6B0 8E640000 */ lw $a0, 0x0000($s3) ## 8094C844 .L8093E6B4: /* 059E4 8093E6B4 8E640000 */ lw $a0, 0x0000($s3) ## 8094C844 /* 059E8 8093E6B8 8E2501A4 */ lw $a1, 0x01A4($s1) ## 000001A4 -/* 059EC 8093E6BC 0C0295B2 */ jal func_800A56C8 +/* 059EC 8093E6BC 0C0295B2 */ jal func_800A56C8 /* 059F0 8093E6C0 24840568 */ addiu $a0, $a0, 0x0568 ## $a0 = 00000568 -/* 059F4 8093E6C4 1040000A */ beq $v0, $zero, .L8093E6F0 +/* 059F4 8093E6C4 1040000A */ beq $v0, $zero, .L8093E6F0 /* 059F8 8093E6C8 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 059FC 8093E6CC 8E640000 */ lw $a0, 0x0000($s3) ## 8094C844 /* 05A00 8093E6D0 24A56F28 */ addiu $a1, $a1, 0x6F28 ## $a1 = 06006F28 /* 05A04 8093E6D4 24060000 */ addiu $a2, $zero, 0x0000 ## $a2 = 00000000 -/* 05A08 8093E6D8 0C0294D3 */ jal func_800A534C +/* 05A08 8093E6D8 0C0294D3 */ jal SkelAnime_ChangeAnimTransitionRepeat /* 05A0C 8093E6DC 24840568 */ addiu $a0, $a0, 0x0568 ## $a0 = 00000568 /* 05A10 8093E6E0 3C01447A */ lui $at, 0x447A ## $at = 447A0000 /* 05A14 8093E6E4 44815000 */ mtc1 $at, $f10 ## $f10 = 1000.00 @@ -1199,13 +1199,13 @@ glabel L8093E3E8 /* 05A34 8093E704 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3DCCCCCD /* 05A38 8093E708 34A5CCCC */ ori $a1, $a1, 0xCCCC ## $a1 = 3CCCCCCC /* 05A3C 8093E70C 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 05A40 8093E710 24840050 */ addiu $a0, $a0, 0x0050 ## $a0 = 00000050 /* 05A44 8093E714 8E700000 */ lw $s0, 0x0000($s3) ## 8094C844 .L8093E718: /* 05A48 8093E718 02002025 */ or $a0, $s0, $zero ## $a0 = 060088C8 /* 05A4C 8093E71C 0C00B58B */ jal Actor_SetScale - + /* 05A50 8093E720 8E050050 */ lw $a1, 0x0050($s0) ## 06008918 /* 05A54 8093E724 8E6B0000 */ lw $t3, 0x0000($s3) ## 8094C844 /* 05A58 8093E728 24100001 */ addiu $s0, $zero, 0x0001 ## $s0 = 00000001 @@ -1216,7 +1216,7 @@ glabel L8093E3E8 /* 05A6C 8093E73C 240D0014 */ addiu $t5, $zero, 0x0014 ## $t5 = 00000014 /* 05A70 8093E740 A33005F8 */ sb $s0, 0x05F8($t9) ## 000005F8 /* 05A74 8093E744 862C0150 */ lh $t4, 0x0150($s1) ## 00000150 -/* 05A78 8093E748 548C0169 */ bnel $a0, $t4, .L8093ECF0 +/* 05A78 8093E748 548C0169 */ bnel $a0, $t4, .L8093ECF0 /* 05A7C 8093E74C 862505FC */ lh $a1, 0x05FC($s1) ## 000005FC /* 05A80 8093E750 44817000 */ mtc1 $at, $f14 ## $f14 = 600.00 /* 05A84 8093E754 3C014448 */ lui $at, 0x4448 ## $at = 44480000 @@ -1237,132 +1237,132 @@ glabel L8093E3E8 /* 05AC0 8093E790 E6200614 */ swc1 $f0, 0x0614($s1) ## 00000614 /* 05AC4 8093E794 E622060C */ swc1 $f2, 0x060C($s1) ## 0000060C /* 05AC8 8093E798 E6280610 */ swc1 $f8, 0x0610($s1) ## 00000610 -/* 05ACC 8093E79C C42AAFC8 */ lwc1 $f10, %lo(D_8094AFC8)($at) +/* 05ACC 8093E79C C42AAFC8 */ lwc1 $f10, %lo(D_8094AFC8)($at) /* 05AD0 8093E7A0 E62201AC */ swc1 $f2, 0x01AC($s1) ## 000001AC /* 05AD4 8093E7A4 E6220654 */ swc1 $f2, 0x0654($s1) ## 00000654 /* 05AD8 8093E7A8 E62204D8 */ swc1 $f2, 0x04D8($s1) ## 000004D8 -/* 05ADC 8093E7AC 1000014F */ beq $zero, $zero, .L8093ECEC +/* 05ADC 8093E7AC 1000014F */ beq $zero, $zero, .L8093ECEC /* 05AE0 8093E7B0 E62A01A8 */ swc1 $f10, 0x01A8($s1) ## 000001A8 .L8093E7B4: /* 05AE4 8093E7B4 C62406B0 */ lwc1 $f4, 0x06B0($s1) ## 000006B0 /* 05AE8 8093E7B8 8E700000 */ lw $s0, 0x0000($s3) ## 8094C844 -/* 05AEC 8093E7BC 4600218D */ trunc.w.s $f6, $f4 +/* 05AEC 8093E7BC 4600218D */ trunc.w.s $f6, $f4 /* 05AF0 8093E7C0 860A00B6 */ lh $t2, 0x00B6($s0) ## 000000B7 -/* 05AF4 8093E7C4 44083000 */ mfc1 $t0, $f6 +/* 05AF4 8093E7C4 44083000 */ mfc1 $t0, $f6 /* 05AF8 8093E7C8 00000000 */ nop -/* 05AFC 8093E7CC 01484821 */ addu $t1, $t2, $t0 -/* 05B00 8093E7D0 10000146 */ beq $zero, $zero, .L8093ECEC +/* 05AFC 8093E7CC 01484821 */ addu $t1, $t2, $t0 +/* 05B00 8093E7D0 10000146 */ beq $zero, $zero, .L8093ECEC /* 05B04 8093E7D4 A60900B6 */ sh $t1, 0x00B6($s0) ## 000000B7 .L8093E7D8: -/* 05B08 8093E7D8 15600003 */ bne $t3, $zero, .L8093E7E8 +/* 05B08 8093E7D8 15600003 */ bne $t3, $zero, .L8093E7E8 /* 05B0C 8093E7DC 24053921 */ addiu $a1, $zero, 0x3921 ## $a1 = 00003921 /* 05B10 8093E7E0 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 05B14 8093E7E4 8E640000 */ lw $a0, 0x0000($s3) ## 8094C844 .L8093E7E8: /* 05B18 8093E7E8 C62806B0 */ lwc1 $f8, 0x06B0($s1) ## 000006B0 /* 05B1C 8093E7EC 8E700000 */ lw $s0, 0x0000($s3) ## 8094C844 /* 05B20 8093E7F0 262406B0 */ addiu $a0, $s1, 0x06B0 ## $a0 = 000006B0 -/* 05B24 8093E7F4 4600428D */ trunc.w.s $f10, $f8 +/* 05B24 8093E7F4 4600428D */ trunc.w.s $f10, $f8 /* 05B28 8093E7F8 861900B6 */ lh $t9, 0x00B6($s0) ## 000000B7 /* 05B2C 8093E7FC 3C054640 */ lui $a1, 0x4640 ## $a1 = 46400000 /* 05B30 8093E800 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 05B34 8093E804 440F5000 */ mfc1 $t7, $f10 +/* 05B34 8093E804 440F5000 */ mfc1 $t7, $f10 /* 05B38 8093E808 3C0743C0 */ lui $a3, 0x43C0 ## $a3 = 43C00000 -/* 05B3C 8093E80C 032FC021 */ addu $t8, $t9, $t7 +/* 05B3C 8093E80C 032FC021 */ addu $t8, $t9, $t7 /* 05B40 8093E810 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 05B44 8093E814 A61800B6 */ sh $t8, 0x00B6($s0) ## 000000B7 /* 05B48 8093E818 8E640000 */ lw $a0, 0x0000($s3) ## 8094C844 /* 05B4C 8093E81C 8E2501A4 */ lw $a1, 0x01A4($s1) ## 000001A4 -/* 05B50 8093E820 0C0295B2 */ jal func_800A56C8 +/* 05B50 8093E820 0C0295B2 */ jal func_800A56C8 /* 05B54 8093E824 24840568 */ addiu $a0, $a0, 0x0568 ## $a0 = 00000568 -/* 05B58 8093E828 10400130 */ beq $v0, $zero, .L8093ECEC +/* 05B58 8093E828 10400130 */ beq $v0, $zero, .L8093ECEC /* 05B5C 8093E82C 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 05B60 8093E830 8E640000 */ lw $a0, 0x0000($s3) ## 8094C844 /* 05B64 8093E834 24A56F28 */ addiu $a1, $a1, 0x6F28 ## $a1 = 06006F28 /* 05B68 8093E838 24060000 */ addiu $a2, $zero, 0x0000 ## $a2 = 00000000 -/* 05B6C 8093E83C 0C0294D3 */ jal func_800A534C +/* 05B6C 8093E83C 0C0294D3 */ jal SkelAnime_ChangeAnimTransitionRepeat /* 05B70 8093E840 24840568 */ addiu $a0, $a0, 0x0568 ## $a0 = 00000568 /* 05B74 8093E844 3C01447A */ lui $at, 0x447A ## $at = 447A0000 /* 05B78 8093E848 44812000 */ mtc1 $at, $f4 ## $f4 = 1000.00 -/* 05B7C 8093E84C 10000127 */ beq $zero, $zero, .L8093ECEC +/* 05B7C 8093E84C 10000127 */ beq $zero, $zero, .L8093ECEC /* 05B80 8093E850 E62401A4 */ swc1 $f4, 0x01A4($s1) ## 000001A4 glabel L8093E854 /* 05B84 8093E854 86230150 */ lh $v1, 0x0150($s1) ## 00000150 -/* 05B88 8093E858 28610015 */ slti $at, $v1, 0x0015 -/* 05B8C 8093E85C 14200013 */ bne $at, $zero, .L8093E8AC -/* 05B90 8093E860 28610078 */ slti $at, $v1, 0x0078 -/* 05B94 8093E864 10200011 */ beq $at, $zero, .L8093E8AC +/* 05B88 8093E858 28610015 */ slti $at, $v1, 0x0015 +/* 05B8C 8093E85C 14200013 */ bne $at, $zero, .L8093E8AC +/* 05B90 8093E860 28610078 */ slti $at, $v1, 0x0078 +/* 05B94 8093E864 10200011 */ beq $at, $zero, .L8093E8AC /* 05B98 8093E868 24100001 */ addiu $s0, $zero, 0x0001 ## $s0 = 00000001 -/* 05B9C 8093E86C 8FAA00A4 */ lw $t2, 0x00A4($sp) +/* 05B9C 8093E86C 8FAA00A4 */ lw $t2, 0x00A4($sp) /* 05BA0 8093E870 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 /* 05BA4 8093E874 44810000 */ mtc1 $at, $f0 ## $f0 = 1.00 /* 05BA8 8093E878 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 05BAC 8093E87C 002A0821 */ addu $at, $at, $t2 +/* 05BAC 8093E87C 002A0821 */ addu $at, $at, $t2 /* 05BB0 8093E880 A0300AE1 */ sb $s0, 0x0AE1($at) ## 00010AE1 -/* 05BB4 8093E884 8FA400A4 */ lw $a0, 0x00A4($sp) +/* 05BB4 8093E884 8FA400A4 */ lw $a0, 0x00A4($sp) /* 05BB8 8093E888 3C010001 */ lui $at, 0x0001 ## $at = 00010000 /* 05BBC 8093E88C 34210AFC */ ori $at, $at, 0x0AFC ## $at = 00010AFC /* 05BC0 8093E890 3C073C75 */ lui $a3, 0x3C75 ## $a3 = 3C750000 -/* 05BC4 8093E894 44050000 */ mfc1 $a1, $f0 -/* 05BC8 8093E898 44060000 */ mfc1 $a2, $f0 +/* 05BC4 8093E894 44050000 */ mfc1 $a1, $f0 +/* 05BC8 8093E898 44060000 */ mfc1 $a2, $f0 /* 05BCC 8093E89C 34E7C28F */ ori $a3, $a3, 0xC28F ## $a3 = 3C75C28F /* 05BD0 8093E8A0 0C01E107 */ jal Math_SmoothScaleMaxF - -/* 05BD4 8093E8A4 00812021 */ addu $a0, $a0, $at + +/* 05BD4 8093E8A4 00812021 */ addu $a0, $a0, $at /* 05BD8 8093E8A8 86230150 */ lh $v1, 0x0150($s1) ## 00000150 .L8093E8AC: /* 05BDC 8093E8AC 2401005A */ addiu $at, $zero, 0x005A ## $at = 0000005A -/* 05BE0 8093E8B0 14610005 */ bne $v1, $at, .L8093E8C8 +/* 05BE0 8093E8B0 14610005 */ bne $v1, $at, .L8093E8C8 /* 05BE4 8093E8B4 24100001 */ addiu $s0, $zero, 0x0001 ## $s0 = 00000001 /* 05BE8 8093E8B8 3C04105A */ lui $a0, 0x105A ## $a0 = 105A0000 /* 05BEC 8093E8BC 0C03E803 */ jal Audio_SetBGM - + /* 05BF0 8093E8C0 348400FF */ ori $a0, $a0, 0x00FF ## $a0 = 105A00FF /* 05BF4 8093E8C4 86230150 */ lh $v1, 0x0150($s1) ## 00000150 .L8093E8C8: /* 05BF8 8093E8C8 24010078 */ addiu $at, $zero, 0x0078 ## $at = 00000078 -/* 05BFC 8093E8CC 1461002F */ bne $v1, $at, .L8093E98C +/* 05BFC 8093E8CC 1461002F */ bne $v1, $at, .L8093E98C /* 05C00 8093E8D0 3C020603 */ lui $v0, 0x0603 ## $v0 = 06030000 -/* 05C04 8093E8D4 8FA800A4 */ lw $t0, 0x00A4($sp) +/* 05C04 8093E8D4 8FA800A4 */ lw $t0, 0x00A4($sp) /* 05C08 8093E8D8 3C018095 */ lui $at, %hi(D_8094C840) ## $at = 80950000 -/* 05C0C 8093E8DC A020C840 */ sb $zero, %lo(D_8094C840)($at) +/* 05C0C 8093E8DC A020C840 */ sb $zero, %lo(D_8094C840)($at) /* 05C10 8093E8E0 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 05C14 8093E8E4 00280821 */ addu $at, $at, $t0 +/* 05C14 8093E8E4 00280821 */ addu $at, $at, $t0 /* 05C18 8093E8E8 A0300AE2 */ sb $s0, 0x0AE2($at) ## 00010AE2 -/* 05C1C 8093E8EC 8FA900A4 */ lw $t1, 0x00A4($sp) +/* 05C1C 8093E8EC 8FA900A4 */ lw $t1, 0x00A4($sp) /* 05C20 8093E8F0 3C010001 */ lui $at, 0x0001 ## $at = 00010000 /* 05C24 8093E8F4 44803000 */ mtc1 $zero, $f6 ## $f6 = 0.00 -/* 05C28 8093E8F8 00290821 */ addu $at, $at, $t1 +/* 05C28 8093E8F8 00290821 */ addu $at, $at, $t1 /* 05C2C 8093E8FC A0300AE1 */ sb $s0, 0x0AE1($at) ## 00010AE1 -/* 05C30 8093E900 8FAB00A4 */ lw $t3, 0x00A4($sp) +/* 05C30 8093E900 8FAB00A4 */ lw $t3, 0x00A4($sp) /* 05C34 8093E904 2442E170 */ addiu $v0, $v0, 0xE170 ## $v0 = 0602E170 /* 05C38 8093E908 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 05C3C 8093E90C 00026900 */ sll $t5, $v0, 4 -/* 05C40 8093E910 000D7702 */ srl $t6, $t5, 28 -/* 05C44 8093E914 002B0821 */ addu $at, $at, $t3 -/* 05C48 8093E918 000EC880 */ sll $t9, $t6, 2 +/* 05C3C 8093E90C 00026900 */ sll $t5, $v0, 4 +/* 05C40 8093E910 000D7702 */ srl $t6, $t5, 28 +/* 05C44 8093E914 002B0821 */ addu $at, $at, $t3 +/* 05C48 8093E918 000EC880 */ sll $t9, $t6, 2 /* 05C4C 8093E91C 3C0F8016 */ lui $t7, 0x8016 ## $t7 = 80160000 /* 05C50 8093E920 E4260AFC */ swc1 $f6, 0x0AFC($at) ## 00010AFC /* 05C54 8093E924 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 -/* 05C58 8093E928 01F97821 */ addu $t7, $t7, $t9 +/* 05C58 8093E928 01F97821 */ addu $t7, $t7, $t9 /* 05C5C 8093E92C 8DEF6FA8 */ lw $t7, 0x6FA8($t7) ## 80166FA8 /* 05C60 8093E930 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF -/* 05C64 8093E934 0041C024 */ and $t8, $v0, $at -/* 05C68 8093E938 8FA400A4 */ lw $a0, 0x00A4($sp) +/* 05C64 8093E934 0041C024 */ and $t8, $v0, $at +/* 05C68 8093E938 8FA400A4 */ lw $a0, 0x00A4($sp) /* 05C6C 8093E93C 3C018000 */ lui $at, 0x8000 ## $at = 80000000 /* 05C70 8093E940 24090028 */ addiu $t1, $zero, 0x0028 ## $t1 = 00000028 /* 05C74 8093E944 24080080 */ addiu $t0, $zero, 0x0080 ## $t0 = 00000080 /* 05C78 8093E948 240A00B4 */ addiu $t2, $zero, 0x00B4 ## $t2 = 000000B4 -/* 05C7C 8093E94C 01F83021 */ addu $a2, $t7, $t8 -/* 05C80 8093E950 00C13021 */ addu $a2, $a2, $at -/* 05C84 8093E954 AFAA0010 */ sw $t2, 0x0010($sp) -/* 05C88 8093E958 AFA80014 */ sw $t0, 0x0014($sp) -/* 05C8C 8093E95C AFA90018 */ sw $t1, 0x0018($sp) +/* 05C7C 8093E94C 01F83021 */ addu $a2, $t7, $t8 +/* 05C80 8093E950 00C13021 */ addu $a2, $a2, $at +/* 05C84 8093E954 AFAA0010 */ sw $t2, 0x0010($sp) +/* 05C88 8093E958 AFA80014 */ sw $t0, 0x0014($sp) +/* 05C8C 8093E95C AFA90018 */ sw $t1, 0x0018($sp) /* 05C90 8093E960 240700A0 */ addiu $a3, $zero, 0x00A0 ## $a3 = 000000A0 /* 05C94 8093E964 0C00B380 */ jal TitleCard_InitBossName - + /* 05C98 8093E968 24851D4C */ addiu $a1, $a0, 0x1D4C ## $a1 = 00001D4C /* 05C9C 8093E96C 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 /* 05CA0 8093E970 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 @@ -1370,15 +1370,15 @@ glabel L8093E854 /* 05CA8 8093E978 2404001B */ addiu $a0, $zero, 0x001B ## $a0 = 0000001B /* 05CAC 8093E97C 356C0020 */ ori $t4, $t3, 0x0020 ## $t4 = 00000020 /* 05CB0 8093E980 0C03E803 */ jal Audio_SetBGM - + /* 05CB4 8093E984 A44C0EE2 */ sh $t4, 0x0EE2($v0) ## 8015F542 /* 05CB8 8093E988 86230150 */ lh $v1, 0x0150($s1) ## 00000150 .L8093E98C: -/* 05CBC 8093E98C 286100A0 */ slti $at, $v1, 0x00A0 -/* 05CC0 8093E990 14200020 */ bne $at, $zero, .L8093EA14 +/* 05CBC 8093E98C 286100A0 */ slti $at, $v1, 0x00A0 +/* 05CC0 8093E990 14200020 */ bne $at, $zero, .L8093EA14 /* 05CC4 8093E994 26300600 */ addiu $s0, $s1, 0x0600 ## $s0 = 00000600 /* 05CC8 8093E998 240100A0 */ addiu $at, $zero, 0x00A0 ## $at = 000000A0 -/* 05CCC 8093E99C 54610005 */ bnel $v1, $at, .L8093E9B4 +/* 05CCC 8093E99C 54610005 */ bnel $v1, $at, .L8093E9B4 /* 05CD0 8093E9A0 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 /* 05CD4 8093E9A4 44804000 */ mtc1 $zero, $f8 ## $f8 = 0.00 /* 05CD8 8093E9A8 00000000 */ nop @@ -1389,28 +1389,28 @@ glabel L8093E854 /* 05CE8 8093E9B8 C62A0654 */ lwc1 $f10, 0x0654($s1) ## 00000654 /* 05CEC 8093E9BC 26300600 */ addiu $s0, $s1, 0x0600 ## $s0 = 00000600 /* 05CF0 8093E9C0 3C063D4C */ lui $a2, 0x3D4C ## $a2 = 3D4C0000 -/* 05CF4 8093E9C4 46045182 */ mul.s $f6, $f10, $f4 +/* 05CF4 8093E9C4 46045182 */ mul.s $f6, $f10, $f4 /* 05CF8 8093E9C8 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3D4CCCCD /* 05CFC 8093E9CC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000600 /* 05D00 8093E9D0 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 -/* 05D04 8093E9D4 44073000 */ mfc1 $a3, $f6 +/* 05D04 8093E9D4 44073000 */ mfc1 $a3, $f6 /* 05D08 8093E9D8 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 05D0C 8093E9DC 00000000 */ nop /* 05D10 8093E9E0 3C063D4C */ lui $a2, 0x3D4C ## $a2 = 3D4C0000 /* 05D14 8093E9E4 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3D4CCCCD /* 05D18 8093E9E8 26240608 */ addiu $a0, $s1, 0x0608 ## $a0 = 00000608 /* 05D1C 8093E9EC 3C05447A */ lui $a1, 0x447A ## $a1 = 447A0000 /* 05D20 8093E9F0 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 05D24 8093E9F4 8E270654 */ lw $a3, 0x0654($s1) ## 00000654 /* 05D28 8093E9F8 26240654 */ addiu $a0, $s1, 0x0654 ## $a0 = 00000654 /* 05D2C 8093E9FC 3C054220 */ lui $a1, 0x4220 ## $a1 = 42200000 /* 05D30 8093EA00 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 05D34 8093EA04 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 05D38 8093EA08 3C073F80 */ lui $a3, 0x3F80 ## $a3 = 3F800000 -/* 05D3C 8093EA0C 1000000D */ beq $zero, $zero, .L8093EA44 +/* 05D3C 8093EA0C 1000000D */ beq $zero, $zero, .L8093EA44 /* 05D40 8093EA10 86230150 */ lh $v1, 0x0150($s1) ## 00000150 .L8093EA14: /* 05D44 8093EA14 3C063D4C */ lui $a2, 0x3D4C ## $a2 = 3D4C0000 @@ -1418,56 +1418,56 @@ glabel L8093E854 /* 05D4C 8093EA1C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000600 /* 05D50 8093EA20 3C054396 */ lui $a1, 0x4396 ## $a1 = 43960000 /* 05D54 8093EA24 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 05D58 8093EA28 8E270654 */ lw $a3, 0x0654($s1) ## 00000654 /* 05D5C 8093EA2C 26240654 */ addiu $a0, $s1, 0x0654 ## $a0 = 00000654 /* 05D60 8093EA30 3C0540A0 */ lui $a1, 0x40A0 ## $a1 = 40A00000 /* 05D64 8093EA34 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 05D68 8093EA38 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 05D6C 8093EA3C 3C073F00 */ lui $a3, 0x3F00 ## $a3 = 3F000000 /* 05D70 8093EA40 86230150 */ lh $v1, 0x0150($s1) ## 00000150 .L8093EA44: /* 05D74 8093EA44 3C128095 */ lui $s2, %hi(D_8094C848) ## $s2 = 80950000 /* 05D78 8093EA48 2652C848 */ addiu $s2, $s2, %lo(D_8094C848) ## $s2 = 8094C848 -/* 05D7C 8093EA4C 286100C8 */ slti $at, $v1, 0x00C8 -/* 05D80 8093EA50 10200058 */ beq $at, $zero, .L8093EBB4 +/* 05D7C 8093EA4C 286100C8 */ slti $at, $v1, 0x00C8 +/* 05D80 8093EA50 10200058 */ beq $at, $zero, .L8093EBB4 /* 05D84 8093EA54 2405311F */ addiu $a1, $zero, 0x311F ## $a1 = 0000311F /* 05D88 8093EA58 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 05D8C 8093EA5C 8E440000 */ lw $a0, 0x0000($s2) ## 8094C848 /* 05D90 8093EA60 3C138095 */ lui $s3, %hi(D_8094C844) ## $s3 = 80950000 /* 05D94 8093EA64 2673C844 */ addiu $s3, $s3, %lo(D_8094C844) ## $s3 = 8094C844 /* 05D98 8093EA68 8E640000 */ lw $a0, 0x0000($s3) ## 8094C844 /* 05D9C 8093EA6C 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 05DA0 8093EA70 2405311F */ addiu $a1, $zero, 0x311F ## $a1 = 0000311F /* 05DA4 8093EA74 3C0143C8 */ lui $at, 0x43C8 ## $at = 43C80000 /* 05DA8 8093EA78 C62801B0 */ lwc1 $f8, 0x01B0($s1) ## 000001B0 /* 05DAC 8093EA7C 44815000 */ mtc1 $at, $f10 ## $f10 = 400.00 /* 05DB0 8093EA80 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 -/* 05DB4 8093EA84 E7A80090 */ swc1 $f8, 0x0090($sp) -/* 05DB8 8093EA88 E7AA0094 */ swc1 $f10, 0x0094($sp) -/* 05DBC 8093EA8C E7A40098 */ swc1 $f4, 0x0098($sp) +/* 05DB4 8093EA84 E7A80090 */ swc1 $f8, 0x0090($sp) +/* 05DB8 8093EA88 E7AA0094 */ swc1 $f10, 0x0094($sp) +/* 05DBC 8093EA8C E7A40098 */ swc1 $f4, 0x0098($sp) /* 05DC0 8093EA90 C62C01A8 */ lwc1 $f12, 0x01A8($s1) ## 000001A8 -/* 05DC4 8093EA94 0C034348 */ jal Matrix_RotateY +/* 05DC4 8093EA94 0C034348 */ jal Matrix_RotateY /* 05DC8 8093EA98 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 05DCC 8093EA9C 27A40090 */ addiu $a0, $sp, 0x0090 ## $a0 = FFFFFFF0 -/* 05DD0 8093EAA0 0C0346BD */ jal Matrix_MultVec3f +/* 05DD0 8093EAA0 0C0346BD */ jal Matrix_MultVec3f /* 05DD4 8093EAA4 27A50084 */ addiu $a1, $sp, 0x0084 ## $a1 = FFFFFFE4 /* 05DD8 8093EAA8 3C014700 */ lui $at, 0x4700 ## $at = 47000000 /* 05DDC 8093EAAC 44810000 */ mtc1 $at, $f0 ## $f0 = 32768.00 -/* 05DE0 8093EAB0 C7A60084 */ lwc1 $f6, 0x0084($sp) +/* 05DE0 8093EAB0 C7A60084 */ lwc1 $f6, 0x0084($sp) /* 05DE4 8093EAB4 8E4D0000 */ lw $t5, 0x0000($s2) ## 8094C848 /* 05DE8 8093EAB8 3C018095 */ lui $at, %hi(D_8094AFCC) ## $at = 80950000 -/* 05DEC 8093EABC C422AFCC */ lwc1 $f2, %lo(D_8094AFCC)($at) +/* 05DEC 8093EABC C422AFCC */ lwc1 $f2, %lo(D_8094AFCC)($at) /* 05DF0 8093EAC0 E5A60024 */ swc1 $f6, 0x0024($t5) ## 00000024 -/* 05DF4 8093EAC4 C7A80088 */ lwc1 $f8, 0x0088($sp) +/* 05DF4 8093EAC4 C7A80088 */ lwc1 $f8, 0x0088($sp) /* 05DF8 8093EAC8 8E4E0000 */ lw $t6, 0x0000($s2) ## 8094C848 /* 05DFC 8093EACC 3C063DCC */ lui $a2, 0x3DCC ## $a2 = 3DCC0000 /* 05E00 8093EAD0 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3DCCCCCD /* 05E04 8093EAD4 E5C80028 */ swc1 $f8, 0x0028($t6) ## 00000028 -/* 05E08 8093EAD8 C7AA008C */ lwc1 $f10, 0x008C($sp) +/* 05E08 8093EAD8 C7AA008C */ lwc1 $f10, 0x008C($sp) /* 05E0C 8093EADC 8E590000 */ lw $t9, 0x0000($s2) ## 8094C848 /* 05E10 8093EAE0 262401B0 */ addiu $a0, $s1, 0x01B0 ## $a0 = 000001B0 /* 05E14 8093EAE4 3C0542A0 */ lui $a1, 0x42A0 ## $a1 = 42A00000 @@ -1475,53 +1475,53 @@ glabel L8093E854 /* 05E1C 8093EAEC C62401A8 */ lwc1 $f4, 0x01A8($s1) ## 000001A8 /* 05E20 8093EAF0 8E580000 */ lw $t8, 0x0000($s2) ## 8094C848 /* 05E24 8093EAF4 3C0740A0 */ lui $a3, 0x40A0 ## $a3 = 40A00000 -/* 05E28 8093EAF8 46022183 */ div.s $f6, $f4, $f2 -/* 05E2C 8093EAFC 46003202 */ mul.s $f8, $f6, $f0 -/* 05E30 8093EB00 4600428D */ trunc.w.s $f10, $f8 -/* 05E34 8093EB04 44025000 */ mfc1 $v0, $f10 +/* 05E28 8093EAF8 46022183 */ div.s $f6, $f4, $f2 +/* 05E2C 8093EAFC 46003202 */ mul.s $f8, $f6, $f0 +/* 05E30 8093EB00 4600428D */ trunc.w.s $f10, $f8 +/* 05E34 8093EB04 44025000 */ mfc1 $v0, $f10 /* 05E38 8093EB08 00000000 */ nop -/* 05E3C 8093EB0C 00021400 */ sll $v0, $v0, 16 -/* 05E40 8093EB10 00021403 */ sra $v0, $v0, 16 +/* 05E3C 8093EB0C 00021400 */ sll $v0, $v0, 16 +/* 05E40 8093EB10 00021403 */ sra $v0, $v0, 16 /* 05E44 8093EB14 A70200B6 */ sh $v0, 0x00B6($t8) ## 000000B6 /* 05E48 8093EB18 8E4A0000 */ lw $t2, 0x0000($s2) ## 8094C848 /* 05E4C 8093EB1C A5420032 */ sh $v0, 0x0032($t2) ## 00000032 -/* 05E50 8093EB20 C7A40084 */ lwc1 $f4, 0x0084($sp) +/* 05E50 8093EB20 C7A40084 */ lwc1 $f4, 0x0084($sp) /* 05E54 8093EB24 8E680000 */ lw $t0, 0x0000($s3) ## 8094C844 -/* 05E58 8093EB28 46002187 */ neg.s $f6, $f4 +/* 05E58 8093EB28 46002187 */ neg.s $f6, $f4 /* 05E5C 8093EB2C E5060024 */ swc1 $f6, 0x0024($t0) ## 00000024 /* 05E60 8093EB30 8E690000 */ lw $t1, 0x0000($s3) ## 8094C844 -/* 05E64 8093EB34 C7A80088 */ lwc1 $f8, 0x0088($sp) +/* 05E64 8093EB34 C7A80088 */ lwc1 $f8, 0x0088($sp) /* 05E68 8093EB38 E5280028 */ swc1 $f8, 0x0028($t1) ## 00000028 -/* 05E6C 8093EB3C C7AA008C */ lwc1 $f10, 0x008C($sp) +/* 05E6C 8093EB3C C7AA008C */ lwc1 $f10, 0x008C($sp) /* 05E70 8093EB40 8E6B0000 */ lw $t3, 0x0000($s3) ## 8094C844 -/* 05E74 8093EB44 46005107 */ neg.s $f4, $f10 +/* 05E74 8093EB44 46005107 */ neg.s $f4, $f10 /* 05E78 8093EB48 E564002C */ swc1 $f4, 0x002C($t3) ## 0000002C /* 05E7C 8093EB4C C62601A8 */ lwc1 $f6, 0x01A8($s1) ## 000001A8 /* 05E80 8093EB50 8E6D0000 */ lw $t5, 0x0000($s3) ## 8094C844 -/* 05E84 8093EB54 46023203 */ div.s $f8, $f6, $f2 -/* 05E88 8093EB58 46004282 */ mul.s $f10, $f8, $f0 -/* 05E8C 8093EB5C 46005100 */ add.s $f4, $f10, $f0 -/* 05E90 8093EB60 4600218D */ trunc.w.s $f6, $f4 -/* 05E94 8093EB64 44023000 */ mfc1 $v0, $f6 +/* 05E84 8093EB54 46023203 */ div.s $f8, $f6, $f2 +/* 05E88 8093EB58 46004282 */ mul.s $f10, $f8, $f0 +/* 05E8C 8093EB5C 46005100 */ add.s $f4, $f10, $f0 +/* 05E90 8093EB60 4600218D */ trunc.w.s $f6, $f4 +/* 05E94 8093EB64 44023000 */ mfc1 $v0, $f6 /* 05E98 8093EB68 00000000 */ nop -/* 05E9C 8093EB6C 00021400 */ sll $v0, $v0, 16 -/* 05EA0 8093EB70 00021403 */ sra $v0, $v0, 16 +/* 05E9C 8093EB6C 00021400 */ sll $v0, $v0, 16 +/* 05EA0 8093EB70 00021403 */ sra $v0, $v0, 16 /* 05EA4 8093EB74 A5A20032 */ sh $v0, 0x0032($t5) ## 00000032 /* 05EA8 8093EB78 8E6E0000 */ lw $t6, 0x0000($s3) ## 8094C844 /* 05EAC 8093EB7C 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 05EB0 8093EB80 A5C200B6 */ sh $v0, 0x00B6($t6) ## 000000B6 /* 05EB4 8093EB84 C62801A8 */ lwc1 $f8, 0x01A8($s1) ## 000001A8 /* 05EB8 8093EB88 C62A01AC */ lwc1 $f10, 0x01AC($s1) ## 000001AC /* 05EBC 8093EB8C 3C053E4C */ lui $a1, 0x3E4C ## $a1 = 3E4C0000 /* 05EC0 8093EB90 3C073B03 */ lui $a3, 0x3B03 ## $a3 = 3B030000 -/* 05EC4 8093EB94 460A4101 */ sub.s $f4, $f8, $f10 +/* 05EC4 8093EB94 460A4101 */ sub.s $f4, $f8, $f10 /* 05EC8 8093EB98 34E7126C */ ori $a3, $a3, 0x126C ## $a3 = 3B03126C /* 05ECC 8093EB9C 34A5CCCC */ ori $a1, $a1, 0xCCCC ## $a1 = 3E4CCCCC /* 05ED0 8093EBA0 262401AC */ addiu $a0, $s1, 0x01AC ## $a0 = 000001AC /* 05ED4 8093EBA4 E62401A8 */ swc1 $f4, 0x01A8($s1) ## 000001A8 /* 05ED8 8093EBA8 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 05EDC 8093EBAC 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 05EE0 8093EBB0 86230150 */ lh $v1, 0x0150($s1) ## 00000150 .L8093EBB4: @@ -1529,7 +1529,7 @@ glabel L8093E854 /* 05EE8 8093EBB8 3C138095 */ lui $s3, %hi(D_8094C844) ## $s3 = 80950000 /* 05EEC 8093EBBC 240100C8 */ addiu $at, $zero, 0x00C8 ## $at = 000000C8 /* 05EF0 8093EBC0 2673C844 */ addiu $s3, $s3, %lo(D_8094C844) ## $s3 = 8094C844 -/* 05EF4 8093EBC4 14610021 */ bne $v1, $at, .L8093EC4C +/* 05EF4 8093EBC4 14610021 */ bne $v1, $at, .L8093EC4C /* 05EF8 8093EBC8 2652C848 */ addiu $s2, $s2, %lo(D_8094C848) ## $s2 = 8094C848 /* 05EFC 8093EBCC 8E590000 */ lw $t9, 0x0000($s2) ## 8094C848 /* 05F00 8093EBD0 3C028094 */ lui $v0, %hi(func_8093A2AC) ## $v0 = 80940000 @@ -1565,9 +1565,9 @@ glabel L8093E854 /* 05F78 8093EC48 86230150 */ lh $v1, 0x0150($s1) ## 00000150 .L8093EC4C: /* 05F7C 8093EC4C 24010104 */ addiu $at, $zero, 0x0104 ## $at = 00000104 -/* 05F80 8093EC50 14610026 */ bne $v1, $at, .L8093ECEC -/* 05F84 8093EC54 8FA400A4 */ lw $a0, 0x00A4($sp) -/* 05F88 8093EC58 0C030129 */ jal func_800C04A4 +/* 05F80 8093EC50 14610026 */ bne $v1, $at, .L8093ECEC +/* 05F84 8093EC54 8FA400A4 */ lw $a0, 0x00A4($sp) +/* 05F88 8093EC58 0C030129 */ jal func_800C04A4 /* 05F8C 8093EC5C 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 05F90 8093EC60 8E0F0000 */ lw $t7, 0x0000($s0) ## 00000600 /* 05F94 8093EC64 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 @@ -1589,104 +1589,104 @@ glabel L8093E854 /* 05FD4 8093ECA4 8E290614 */ lw $t1, 0x0614($s1) ## 00000614 /* 05FD8 8093ECA8 AC490058 */ sw $t1, 0x0058($v0) ## 00000058 /* 05FDC 8093ECAC 862505FC */ lh $a1, 0x05FC($s1) ## 000005FC -/* 05FE0 8093ECB0 0C03022B */ jal func_800C08AC -/* 05FE4 8093ECB4 8FA400A4 */ lw $a0, 0x00A4($sp) -/* 05FE8 8093ECB8 8FA400A4 */ lw $a0, 0x00A4($sp) +/* 05FE0 8093ECB0 0C03022B */ jal func_800C08AC +/* 05FE4 8093ECB4 8FA400A4 */ lw $a0, 0x00A4($sp) +/* 05FE8 8093ECB8 8FA400A4 */ lw $a0, 0x00A4($sp) /* 05FEC 8093ECBC A62005FC */ sh $zero, 0x05FC($s1) ## 000005FC /* 05FF0 8093ECC0 862B05FC */ lh $t3, 0x05FC($s1) ## 000005FC /* 05FF4 8093ECC4 24851D64 */ addiu $a1, $a0, 0x1D64 ## $a1 = 00001D64 -/* 05FF8 8093ECC8 0C01914D */ jal func_80064534 +/* 05FF8 8093ECC8 0C01914D */ jal func_80064534 /* 05FFC 8093ECCC A62B05FA */ sh $t3, 0x05FA($s1) ## 000005FA -/* 06000 8093ECD0 8FA400A4 */ lw $a0, 0x00A4($sp) +/* 06000 8093ECD0 8FA400A4 */ lw $a0, 0x00A4($sp) /* 06004 8093ECD4 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 06008 8093ECD8 0C00B7D5 */ jal func_8002DF54 +/* 06008 8093ECD8 0C00B7D5 */ jal func_8002DF54 /* 0600C 8093ECDC 24060007 */ addiu $a2, $zero, 0x0007 ## $a2 = 00000007 /* 06010 8093ECE0 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 06014 8093ECE4 0C24F209 */ jal func_8093C824 -/* 06018 8093ECE8 8FA500A4 */ lw $a1, 0x00A4($sp) +/* 06014 8093ECE4 0C24F209 */ jal func_8093C824 +/* 06018 8093ECE8 8FA500A4 */ lw $a1, 0x00A4($sp) glabel L8093ECEC .L8093ECEC: /* 0601C 8093ECEC 862505FC */ lh $a1, 0x05FC($s1) ## 000005FC .L8093ECF0: -/* 06020 8093ECF0 93AC009F */ lbu $t4, 0x009F($sp) -/* 06024 8093ECF4 10A0003F */ beq $a1, $zero, .L8093EDF4 +/* 06020 8093ECF0 93AC009F */ lbu $t4, 0x009F($sp) +/* 06024 8093ECF4 10A0003F */ beq $a1, $zero, .L8093EDF4 /* 06028 8093ECF8 26300600 */ addiu $s0, $s1, 0x0600 ## $s0 = 00000600 -/* 0602C 8093ECFC 11800039 */ beq $t4, $zero, .L8093EDE4 +/* 0602C 8093ECFC 11800039 */ beq $t4, $zero, .L8093EDE4 /* 06030 8093ED00 2633060C */ addiu $s3, $s1, 0x060C ## $s3 = 0000060C /* 06034 8093ED04 C62A0654 */ lwc1 $f10, 0x0654($s1) ## 00000654 /* 06038 8093ED08 C624069C */ lwc1 $f4, 0x069C($s1) ## 0000069C /* 0603C 8093ED0C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000600 /* 06040 8093ED10 8E25066C */ lw $a1, 0x066C($s1) ## 0000066C -/* 06044 8093ED14 46045182 */ mul.s $f6, $f10, $f4 +/* 06044 8093ED14 46045182 */ mul.s $f6, $f10, $f4 /* 06048 8093ED18 8E2606A0 */ lw $a2, 0x06A0($s1) ## 000006A0 /* 0604C 8093ED1C 26320608 */ addiu $s2, $s1, 0x0608 ## $s2 = 00000608 -/* 06050 8093ED20 44073000 */ mfc1 $a3, $f6 +/* 06050 8093ED20 44073000 */ mfc1 $a3, $f6 /* 06054 8093ED24 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 06058 8093ED28 00000000 */ nop /* 0605C 8093ED2C C6280658 */ lwc1 $f8, 0x0658($s1) ## 00000658 /* 06060 8093ED30 C62A069C */ lwc1 $f10, 0x069C($s1) ## 0000069C /* 06064 8093ED34 26240604 */ addiu $a0, $s1, 0x0604 ## $a0 = 00000604 /* 06068 8093ED38 8E250670 */ lw $a1, 0x0670($s1) ## 00000670 -/* 0606C 8093ED3C 460A4102 */ mul.s $f4, $f8, $f10 +/* 0606C 8093ED3C 460A4102 */ mul.s $f4, $f8, $f10 /* 06070 8093ED40 8E2606A0 */ lw $a2, 0x06A0($s1) ## 000006A0 -/* 06074 8093ED44 44072000 */ mfc1 $a3, $f4 +/* 06074 8093ED44 44072000 */ mfc1 $a3, $f4 /* 06078 8093ED48 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 0607C 8093ED4C 00000000 */ nop /* 06080 8093ED50 C626065C */ lwc1 $f6, 0x065C($s1) ## 0000065C /* 06084 8093ED54 C628069C */ lwc1 $f8, 0x069C($s1) ## 0000069C /* 06088 8093ED58 02402025 */ or $a0, $s2, $zero ## $a0 = 00000608 /* 0608C 8093ED5C 8E250674 */ lw $a1, 0x0674($s1) ## 00000674 -/* 06090 8093ED60 46083282 */ mul.s $f10, $f6, $f8 +/* 06090 8093ED60 46083282 */ mul.s $f10, $f6, $f8 /* 06094 8093ED64 8E2606A0 */ lw $a2, 0x06A0($s1) ## 000006A0 -/* 06098 8093ED68 44075000 */ mfc1 $a3, $f10 +/* 06098 8093ED68 44075000 */ mfc1 $a3, $f10 /* 0609C 8093ED6C 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 060A0 8093ED70 00000000 */ nop /* 060A4 8093ED74 C6240660 */ lwc1 $f4, 0x0660($s1) ## 00000660 /* 060A8 8093ED78 C626069C */ lwc1 $f6, 0x069C($s1) ## 0000069C /* 060AC 8093ED7C 02602025 */ or $a0, $s3, $zero ## $a0 = 0000060C /* 060B0 8093ED80 8E250684 */ lw $a1, 0x0684($s1) ## 00000684 -/* 060B4 8093ED84 46062202 */ mul.s $f8, $f4, $f6 +/* 060B4 8093ED84 46062202 */ mul.s $f8, $f4, $f6 /* 060B8 8093ED88 8E2606A0 */ lw $a2, 0x06A0($s1) ## 000006A0 -/* 060BC 8093ED8C 44074000 */ mfc1 $a3, $f8 +/* 060BC 8093ED8C 44074000 */ mfc1 $a3, $f8 /* 060C0 8093ED90 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 060C4 8093ED94 00000000 */ nop /* 060C8 8093ED98 C62A0664 */ lwc1 $f10, 0x0664($s1) ## 00000664 /* 060CC 8093ED9C C624069C */ lwc1 $f4, 0x069C($s1) ## 0000069C /* 060D0 8093EDA0 26240610 */ addiu $a0, $s1, 0x0610 ## $a0 = 00000610 /* 060D4 8093EDA4 8E250688 */ lw $a1, 0x0688($s1) ## 00000688 -/* 060D8 8093EDA8 46045182 */ mul.s $f6, $f10, $f4 +/* 060D8 8093EDA8 46045182 */ mul.s $f6, $f10, $f4 /* 060DC 8093EDAC 8E2606A0 */ lw $a2, 0x06A0($s1) ## 000006A0 -/* 060E0 8093EDB0 44073000 */ mfc1 $a3, $f6 +/* 060E0 8093EDB0 44073000 */ mfc1 $a3, $f6 /* 060E4 8093EDB4 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 060E8 8093EDB8 00000000 */ nop /* 060EC 8093EDBC C6280668 */ lwc1 $f8, 0x0668($s1) ## 00000668 /* 060F0 8093EDC0 C62A069C */ lwc1 $f10, 0x069C($s1) ## 0000069C /* 060F4 8093EDC4 26240614 */ addiu $a0, $s1, 0x0614 ## $a0 = 00000614 /* 060F8 8093EDC8 8E25068C */ lw $a1, 0x068C($s1) ## 0000068C -/* 060FC 8093EDCC 460A4102 */ mul.s $f4, $f8, $f10 +/* 060FC 8093EDCC 460A4102 */ mul.s $f4, $f8, $f10 /* 06100 8093EDD0 8E2606A0 */ lw $a2, 0x06A0($s1) ## 000006A0 -/* 06104 8093EDD4 44072000 */ mfc1 $a3, $f4 +/* 06104 8093EDD4 44072000 */ mfc1 $a3, $f4 /* 06108 8093EDD8 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 0610C 8093EDDC 00000000 */ nop /* 06110 8093EDE0 862505FC */ lh $a1, 0x05FC($s1) ## 000005FC .L8093EDE4: -/* 06114 8093EDE4 8FA400A4 */ lw $a0, 0x00A4($sp) +/* 06114 8093EDE4 8FA400A4 */ lw $a0, 0x00A4($sp) /* 06118 8093EDE8 02603025 */ or $a2, $s3, $zero ## $a2 = 0000060C -/* 0611C 8093EDEC 0C030136 */ jal func_800C04D8 +/* 0611C 8093EDEC 0C030136 */ jal func_800C04D8 /* 06120 8093EDF0 02003825 */ or $a3, $s0, $zero ## $a3 = 00000600 .L8093EDF4: -/* 06124 8093EDF4 8FBF0034 */ lw $ra, 0x0034($sp) -/* 06128 8093EDF8 8FB00024 */ lw $s0, 0x0024($sp) -/* 0612C 8093EDFC 8FB10028 */ lw $s1, 0x0028($sp) -/* 06130 8093EE00 8FB2002C */ lw $s2, 0x002C($sp) -/* 06134 8093EE04 8FB30030 */ lw $s3, 0x0030($sp) -/* 06138 8093EE08 03E00008 */ jr $ra +/* 06124 8093EDF4 8FBF0034 */ lw $ra, 0x0034($sp) +/* 06128 8093EDF8 8FB00024 */ lw $s0, 0x0024($sp) +/* 0612C 8093EDFC 8FB10028 */ lw $s1, 0x0028($sp) +/* 06130 8093EE00 8FB2002C */ lw $s2, 0x002C($sp) +/* 06134 8093EE04 8FB30030 */ lw $s3, 0x0030($sp) +/* 06138 8093EE08 03E00008 */ jr $ra /* 0613C 8093EE0C 27BD00A0 */ addiu $sp, $sp, 0x00A0 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093EE10.s b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093EE10.s index 8f8b60f7af..bcd2349a12 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093EE10.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093EE10.s @@ -153,7 +153,7 @@ glabel func_8093EE10 /* 0635C 8093F02C C60804B8 */ lwc1 $f8, 0x04B8($s0) ## 000004B8 /* 06360 8093F030 E7AC0034 */ swc1 $f12, 0x0034($sp) /* 06364 8093F034 460A4381 */ sub.s $f14, $f8, $f10 -/* 06368 8093F038 0C03F494 */ jal func_800FD250 +/* 06368 8093F038 0C03F494 */ jal Math_atan2f /* 0636C 8093F03C E7AE002C */ swc1 $f14, 0x002C($sp) /* 06370 8093F040 3C018095 */ lui $at, %hi(D_8094AFD8) ## $at = 80950000 /* 06374 8093F044 C432AFD8 */ lwc1 $f18, %lo(D_8094AFD8)($at) @@ -168,7 +168,7 @@ glabel func_8093EE10 /* 06398 8093F068 460A4000 */ add.s $f0, $f8, $f10 /* 0639C 8093F06C 44183000 */ mfc1 $t8, $f6 /* 063A0 8093F070 46000384 */ sqrt.s $f14, $f0 -/* 063A4 8093F074 0C03F494 */ jal func_800FD250 +/* 063A4 8093F074 0C03F494 */ jal Math_atan2f /* 063A8 8093F078 A7B80024 */ sh $t8, 0x0024($sp) /* 063AC 8093F07C 3C018095 */ lui $at, %hi(D_8094AFDC) ## $at = 80950000 /* 063B0 8093F080 C432AFDC */ lwc1 $f18, %lo(D_8094AFDC)($at) diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093F108.s b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093F108.s index 313c31ea97..9114ee6719 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093F108.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093F108.s @@ -1,16 +1,16 @@ glabel func_8093F108 /* 06438 8093F108 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 0643C 8093F10C AFB00018 */ sw $s0, 0x0018($sp) -/* 06440 8093F110 AFA50024 */ sw $a1, 0x0024($sp) +/* 0643C 8093F10C AFB00018 */ sw $s0, 0x0018($sp) +/* 06440 8093F110 AFA50024 */ sw $a1, 0x0024($sp) /* 06444 8093F114 3C0E8094 */ lui $t6, %hi(func_8093F9E4) ## $t6 = 80940000 /* 06448 8093F118 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 0644C 8093F11C AFBF001C */ sw $ra, 0x001C($sp) +/* 0644C 8093F11C AFBF001C */ sw $ra, 0x001C($sp) /* 06450 8093F120 25CEF9E4 */ addiu $t6, $t6, %lo(func_8093F9E4) ## $t6 = 8093F9E4 /* 06454 8093F124 3C050602 */ lui $a1, 0x0602 ## $a1 = 06020000 /* 06458 8093F128 AC8E014C */ sw $t6, 0x014C($a0) ## 0000014C /* 0645C 8093F12C 24A54374 */ addiu $a1, $a1, 0x4374 ## $a1 = 06024374 /* 06460 8093F130 24840568 */ addiu $a0, $a0, 0x0568 ## $a0 = 00000568 -/* 06464 8093F134 0C0294D3 */ jal func_800A534C +/* 06464 8093F134 0C0294D3 */ jal SkelAnime_ChangeAnimTransitionRepeat /* 06468 8093F138 3C06C040 */ lui $a2, 0xC040 ## $a2 = C0400000 /* 0646C 8093F13C 8E180004 */ lw $t8, 0x0004($s0) ## 00000004 /* 06470 8093F140 A6000440 */ sh $zero, 0x0440($s0) ## 00000440 @@ -20,31 +20,31 @@ glabel func_8093F108 /* 06480 8093F150 86090152 */ lh $t1, 0x0152($s0) ## 00000152 /* 06484 8093F154 2401FFFE */ addiu $at, $zero, 0xFFFE ## $at = FFFFFFFE /* 06488 8093F158 240A2710 */ addiu $t2, $zero, 0x2710 ## $t2 = 00002710 -/* 0648C 8093F15C 0301C824 */ and $t9, $t8, $at +/* 0648C 8093F15C 0301C824 */ and $t9, $t8, $at /* 06490 8093F160 AE190004 */ sw $t9, 0x0004($s0) ## 00000004 /* 06494 8093F164 A60A015A */ sh $t2, 0x015A($s0) ## 0000015A /* 06498 8093F168 3C048095 */ lui $a0, %hi(D_8094C848) ## $a0 = 80950000 /* 0649C 8093F16C A60F0032 */ sh $t7, 0x0032($s0) ## 00000032 /* 064A0 8093F170 A60805FA */ sh $t0, 0x05FA($s0) ## 000005FA /* 064A4 8093F174 A6090150 */ sh $t1, 0x0150($s0) ## 00000150 -/* 064A8 8093F178 8FA50024 */ lw $a1, 0x0024($sp) -/* 064AC 8093F17C 0C24F4F6 */ jal func_8093D3D8 -/* 064B0 8093F180 8C84C848 */ lw $a0, %lo(D_8094C848)($a0) +/* 064A8 8093F178 8FA50024 */ lw $a1, 0x0024($sp) +/* 064AC 8093F17C 0C24F4F6 */ jal func_8093D3D8 +/* 064B0 8093F180 8C84C848 */ lw $a0, %lo(D_8094C848)($a0) /* 064B4 8093F184 3C048095 */ lui $a0, %hi(D_8094C844) ## $a0 = 80950000 -/* 064B8 8093F188 8C84C844 */ lw $a0, %lo(D_8094C844)($a0) -/* 064BC 8093F18C 0C24F4F6 */ jal func_8093D3D8 -/* 064C0 8093F190 8FA50024 */ lw $a1, 0x0024($sp) +/* 064B8 8093F188 8C84C844 */ lw $a0, %lo(D_8094C844)($a0) +/* 064BC 8093F18C 0C24F4F6 */ jal func_8093D3D8 +/* 064C0 8093F190 8FA50024 */ lw $a1, 0x0024($sp) /* 064C4 8093F194 3C0C8095 */ lui $t4, %hi(D_8094C844) ## $t4 = 80950000 -/* 064C8 8093F198 8D8CC844 */ lw $t4, %lo(D_8094C844)($t4) +/* 064C8 8093F198 8D8CC844 */ lw $t4, %lo(D_8094C844)($t4) /* 064CC 8093F19C 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 /* 064D0 8093F1A0 44812000 */ mtc1 $at, $f4 ## $f4 = 1.00 /* 064D4 8093F1A4 240B0008 */ addiu $t3, $zero, 0x0008 ## $t3 = 00000008 /* 064D8 8093F1A8 A58B0178 */ sh $t3, 0x0178($t4) ## 80950178 /* 064DC 8093F1AC E60401D0 */ swc1 $f4, 0x01D0($s0) ## 000001D0 -/* 064E0 8093F1B0 8FBF001C */ lw $ra, 0x001C($sp) -/* 064E4 8093F1B4 8FB00018 */ lw $s0, 0x0018($sp) +/* 064E0 8093F1B0 8FBF001C */ lw $ra, 0x001C($sp) +/* 064E4 8093F1B4 8FB00018 */ lw $s0, 0x0018($sp) /* 064E8 8093F1B8 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 064EC 8093F1BC 03E00008 */ jr $ra +/* 064EC 8093F1BC 03E00008 */ jr $ra /* 064F0 8093F1C0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093F1C4.s b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093F1C4.s index 566e4b237d..e7ede0a3b0 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093F1C4.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093F1C4.s @@ -1,40 +1,40 @@ glabel func_8093F1C4 /* 064F4 8093F1C4 27BDFFB8 */ addiu $sp, $sp, 0xFFB8 ## $sp = FFFFFFB8 -/* 064F8 8093F1C8 AFBF001C */ sw $ra, 0x001C($sp) -/* 064FC 8093F1CC AFB00018 */ sw $s0, 0x0018($sp) -/* 06500 8093F1D0 AFA5004C */ sw $a1, 0x004C($sp) -/* 06504 8093F1D4 A7A00038 */ sh $zero, 0x0038($sp) -/* 06508 8093F1D8 A3A00037 */ sb $zero, 0x0037($sp) -/* 0650C 8093F1DC A3A00036 */ sb $zero, 0x0036($sp) -/* 06510 8093F1E0 A3A00035 */ sb $zero, 0x0035($sp) +/* 064F8 8093F1C8 AFBF001C */ sw $ra, 0x001C($sp) +/* 064FC 8093F1CC AFB00018 */ sw $s0, 0x0018($sp) +/* 06500 8093F1D0 AFA5004C */ sw $a1, 0x004C($sp) +/* 06504 8093F1D4 A7A00038 */ sh $zero, 0x0038($sp) +/* 06508 8093F1D8 A3A00037 */ sb $zero, 0x0037($sp) +/* 0650C 8093F1DC A3A00036 */ sb $zero, 0x0036($sp) +/* 06510 8093F1E0 A3A00035 */ sb $zero, 0x0035($sp) /* 06514 8093F1E4 84820152 */ lh $v0, 0x0152($a0) ## 00000152 /* 06518 8093F1E8 24060050 */ addiu $a2, $zero, 0x0050 ## $a2 = 00000050 /* 0651C 8093F1EC 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 06520 8093F1F0 14C20003 */ bne $a2, $v0, .L8093F200 +/* 06520 8093F1F0 14C20003 */ bne $a2, $v0, .L8093F200 /* 06524 8093F1F4 00001825 */ or $v1, $zero, $zero ## $v1 = 00000000 /* 06528 8093F1F8 240E0001 */ addiu $t6, $zero, 0x0001 ## $t6 = 00000001 -/* 0652C 8093F1FC A3AE0036 */ sb $t6, 0x0036($sp) +/* 0652C 8093F1FC A3AE0036 */ sb $t6, 0x0036($sp) .L8093F200: -/* 06530 8093F200 14C20004 */ bne $a2, $v0, .L8093F214 +/* 06530 8093F200 14C20004 */ bne $a2, $v0, .L8093F214 /* 06534 8093F204 2401008C */ addiu $at, $zero, 0x008C ## $at = 0000008C /* 06538 8093F208 240F0032 */ addiu $t7, $zero, 0x0032 ## $t7 = 00000032 /* 0653C 8093F20C 2403604B */ addiu $v1, $zero, 0x604B ## $v1 = 0000604B -/* 06540 8093F210 A3AF0035 */ sb $t7, 0x0035($sp) +/* 06540 8093F210 A3AF0035 */ sb $t7, 0x0035($sp) .L8093F214: -/* 06544 8093F214 14410004 */ bne $v0, $at, .L8093F228 +/* 06544 8093F214 14410004 */ bne $v0, $at, .L8093F228 /* 06548 8093F218 24180002 */ addiu $t8, $zero, 0x0002 ## $t8 = 00000002 /* 0654C 8093F21C 24190002 */ addiu $t9, $zero, 0x0002 ## $t9 = 00000002 -/* 06550 8093F220 A3B90037 */ sb $t9, 0x0037($sp) -/* 06554 8093F224 A3B80036 */ sb $t8, 0x0036($sp) +/* 06550 8093F220 A3B90037 */ sb $t9, 0x0037($sp) +/* 06554 8093F224 A3B80036 */ sb $t8, 0x0036($sp) .L8093F228: /* 06558 8093F228 240100AA */ addiu $at, $zero, 0x00AA ## $at = 000000AA -/* 0655C 8093F22C 54410011 */ bnel $v0, $at, .L8093F274 +/* 0655C 8093F22C 54410011 */ bnel $v0, $at, .L8093F274 /* 06560 8093F230 240100D2 */ addiu $at, $zero, 0x00D2 ## $at = 000000D2 /* 06564 8093F234 3C028095 */ lui $v0, %hi(D_8094C844) ## $v0 = 80950000 /* 06568 8093F238 2442C844 */ addiu $v0, $v0, %lo(D_8094C844) ## $v0 = 8094C844 /* 0656C 8093F23C 8C4A0000 */ lw $t2, 0x0000($v0) ## 8094C844 /* 06570 8093F240 24080003 */ addiu $t0, $zero, 0x0003 ## $t0 = 00000003 -/* 06574 8093F244 A3A80037 */ sb $t0, 0x0037($sp) +/* 06574 8093F244 A3A80037 */ sb $t0, 0x0037($sp) /* 06578 8093F248 2409C000 */ addiu $t1, $zero, 0xC000 ## $t1 = FFFFC000 /* 0657C 8093F24C A5490164 */ sh $t1, 0x0164($t2) ## 00000164 /* 06580 8093F250 8C4B0000 */ lw $t3, 0x0000($v0) ## 8094C844 @@ -42,548 +42,548 @@ glabel func_8093F1C4 /* 06588 8093F258 240539B4 */ addiu $a1, $zero, 0x39B4 ## $a1 = 000039B4 /* 0658C 8093F25C E56404C8 */ swc1 $f4, 0x04C8($t3) ## 000004C8 /* 06590 8093F260 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 06594 8093F264 8C440000 */ lw $a0, 0x0000($v0) ## 8094C844 /* 06598 8093F268 2403604C */ addiu $v1, $zero, 0x604C ## $v1 = 0000604C /* 0659C 8093F26C 86020152 */ lh $v0, 0x0152($s0) ## 00000152 /* 065A0 8093F270 240100D2 */ addiu $at, $zero, 0x00D2 ## $at = 000000D2 .L8093F274: -/* 065A4 8093F274 14410004 */ bne $v0, $at, .L8093F288 +/* 065A4 8093F274 14410004 */ bne $v0, $at, .L8093F288 /* 065A8 8093F278 240C001E */ addiu $t4, $zero, 0x001E ## $t4 = 0000001E /* 065AC 8093F27C 3C018095 */ lui $at, %hi(D_8094C874) ## $at = 80950000 -/* 065B0 8093F280 A42CC874 */ sh $t4, %lo(D_8094C874)($at) +/* 065B0 8093F280 A42CC874 */ sh $t4, %lo(D_8094C874)($at) /* 065B4 8093F284 86020152 */ lh $v0, 0x0152($s0) ## 00000152 .L8093F288: /* 065B8 8093F288 2401010E */ addiu $at, $zero, 0x010E ## $at = 0000010E -/* 065BC 8093F28C 54410012 */ bnel $v0, $at, .L8093F2D8 +/* 065BC 8093F28C 54410012 */ bnel $v0, $at, .L8093F2D8 /* 065C0 8093F290 24010122 */ addiu $at, $zero, 0x0122 ## $at = 00000122 /* 065C4 8093F294 3C028095 */ lui $v0, %hi(D_8094C848) ## $v0 = 80950000 /* 065C8 8093F298 2442C848 */ addiu $v0, $v0, %lo(D_8094C848) ## $v0 = 8094C848 /* 065CC 8093F29C 8C4F0000 */ lw $t7, 0x0000($v0) ## 8094C848 /* 065D0 8093F2A0 240D0003 */ addiu $t5, $zero, 0x0003 ## $t5 = 00000003 -/* 065D4 8093F2A4 A3AD0036 */ sb $t5, 0x0036($sp) +/* 065D4 8093F2A4 A3AD0036 */ sb $t5, 0x0036($sp) /* 065D8 8093F2A8 240E4000 */ addiu $t6, $zero, 0x4000 ## $t6 = 00004000 /* 065DC 8093F2AC A5EE0164 */ sh $t6, 0x0164($t7) ## 00000164 /* 065E0 8093F2B0 8C580000 */ lw $t8, 0x0000($v0) ## 8094C848 /* 065E4 8093F2B4 44803000 */ mtc1 $zero, $f6 ## $f6 = 0.00 /* 065E8 8093F2B8 240539B4 */ addiu $a1, $zero, 0x39B4 ## $a1 = 000039B4 /* 065EC 8093F2BC E70604C8 */ swc1 $f6, 0x04C8($t8) ## 000004C8 -/* 065F0 8093F2C0 A7A3003A */ sh $v1, 0x003A($sp) +/* 065F0 8093F2C0 A7A3003A */ sh $v1, 0x003A($sp) /* 065F4 8093F2C4 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 065F8 8093F2C8 8C440000 */ lw $a0, 0x0000($v0) ## 8094C848 -/* 065FC 8093F2CC 87A3003A */ lh $v1, 0x003A($sp) +/* 065FC 8093F2CC 87A3003A */ lh $v1, 0x003A($sp) /* 06600 8093F2D0 86020152 */ lh $v0, 0x0152($s0) ## 00000152 /* 06604 8093F2D4 24010122 */ addiu $at, $zero, 0x0122 ## $at = 00000122 .L8093F2D8: -/* 06608 8093F2D8 14410003 */ bne $v0, $at, .L8093F2E8 +/* 06608 8093F2D8 14410003 */ bne $v0, $at, .L8093F2E8 /* 0660C 8093F2DC 24190023 */ addiu $t9, $zero, 0x0023 ## $t9 = 00000023 /* 06610 8093F2E0 2403604D */ addiu $v1, $zero, 0x604D ## $v1 = 0000604D -/* 06614 8093F2E4 A3B90035 */ sb $t9, 0x0035($sp) +/* 06614 8093F2E4 A3B90035 */ sb $t9, 0x0035($sp) .L8093F2E8: /* 06618 8093F2E8 2401015E */ addiu $at, $zero, 0x015E ## $at = 0000015E -/* 0661C 8093F2EC 14410018 */ bne $v0, $at, .L8093F350 +/* 0661C 8093F2EC 14410018 */ bne $v0, $at, .L8093F350 /* 06620 8093F2F0 3C0A8095 */ lui $t2, %hi(D_8094C844) ## $t2 = 80950000 -/* 06624 8093F2F4 8D4AC844 */ lw $t2, %lo(D_8094C844)($t2) +/* 06624 8093F2F4 8D4AC844 */ lw $t2, %lo(D_8094C844)($t2) /* 06628 8093F2F8 24080002 */ addiu $t0, $zero, 0x0002 ## $t0 = 00000002 /* 0662C 8093F2FC 24090002 */ addiu $t1, $zero, 0x0002 ## $t1 = 00000002 -/* 06630 8093F300 A3A90036 */ sb $t1, 0x0036($sp) -/* 06634 8093F304 A3A80037 */ sb $t0, 0x0037($sp) +/* 06630 8093F300 A3A90036 */ sb $t1, 0x0036($sp) +/* 06634 8093F304 A3A80037 */ sb $t0, 0x0037($sp) /* 06638 8093F308 3C0B8095 */ lui $t3, %hi(D_8094C844) ## $t3 = 80950000 /* 0663C 8093F30C A5400164 */ sh $zero, 0x0164($t2) ## 80950164 -/* 06640 8093F310 8D6BC844 */ lw $t3, %lo(D_8094C844)($t3) +/* 06640 8093F310 8D6BC844 */ lw $t3, %lo(D_8094C844)($t3) /* 06644 8093F314 3C0D8095 */ lui $t5, %hi(D_8094C848) ## $t5 = 80950000 -/* 06648 8093F318 8DADC848 */ lw $t5, %lo(D_8094C848)($t5) +/* 06648 8093F318 8DADC848 */ lw $t5, %lo(D_8094C848)($t5) /* 0664C 8093F31C 856C0164 */ lh $t4, 0x0164($t3) ## 80950164 /* 06650 8093F320 3C0E8095 */ lui $t6, %hi(D_8094C844) ## $t6 = 80950000 /* 06654 8093F324 44804000 */ mtc1 $zero, $f8 ## $f8 = 0.00 /* 06658 8093F328 A5AC0164 */ sh $t4, 0x0164($t5) ## 80950164 -/* 0665C 8093F32C 8DCEC844 */ lw $t6, %lo(D_8094C844)($t6) +/* 0665C 8093F32C 8DCEC844 */ lw $t6, %lo(D_8094C844)($t6) /* 06660 8093F330 3C0F8095 */ lui $t7, %hi(D_8094C844) ## $t7 = 80950000 /* 06664 8093F334 3C188095 */ lui $t8, %hi(D_8094C848) ## $t8 = 80950000 /* 06668 8093F338 E5C804C8 */ swc1 $f8, 0x04C8($t6) ## 809504C8 -/* 0666C 8093F33C 8DEFC844 */ lw $t7, %lo(D_8094C844)($t7) -/* 06670 8093F340 8F18C848 */ lw $t8, %lo(D_8094C848)($t8) +/* 0666C 8093F33C 8DEFC844 */ lw $t7, %lo(D_8094C844)($t7) +/* 06670 8093F340 8F18C848 */ lw $t8, %lo(D_8094C848)($t8) /* 06674 8093F344 C5EA04C8 */ lwc1 $f10, 0x04C8($t7) ## 809504C8 /* 06678 8093F348 E70A04C8 */ swc1 $f10, 0x04C8($t8) ## 809504C8 /* 0667C 8093F34C 86020152 */ lh $v0, 0x0152($s0) ## 00000152 .L8093F350: /* 06680 8093F350 2401017C */ addiu $at, $zero, 0x017C ## $at = 0000017C -/* 06684 8093F354 14410004 */ bne $v0, $at, .L8093F368 +/* 06684 8093F354 14410004 */ bne $v0, $at, .L8093F368 /* 06688 8093F358 24190003 */ addiu $t9, $zero, 0x0003 ## $t9 = 00000003 /* 0668C 8093F35C 24080003 */ addiu $t0, $zero, 0x0003 ## $t0 = 00000003 -/* 06690 8093F360 A3A80036 */ sb $t0, 0x0036($sp) -/* 06694 8093F364 A3B90037 */ sb $t9, 0x0037($sp) +/* 06690 8093F360 A3A80036 */ sb $t0, 0x0036($sp) +/* 06694 8093F364 A3B90037 */ sb $t9, 0x0037($sp) .L8093F368: /* 06698 8093F368 24010190 */ addiu $at, $zero, 0x0190 ## $at = 00000190 -/* 0669C 8093F36C 14410004 */ bne $v0, $at, .L8093F380 +/* 0669C 8093F36C 14410004 */ bne $v0, $at, .L8093F380 /* 066A0 8093F370 24090002 */ addiu $t1, $zero, 0x0002 ## $t1 = 00000002 /* 066A4 8093F374 240A0002 */ addiu $t2, $zero, 0x0002 ## $t2 = 00000002 -/* 066A8 8093F378 A3AA0036 */ sb $t2, 0x0036($sp) -/* 066AC 8093F37C A3A90037 */ sb $t1, 0x0037($sp) +/* 066A8 8093F378 A3AA0036 */ sb $t2, 0x0036($sp) +/* 066AC 8093F37C A3A90037 */ sb $t1, 0x0037($sp) .L8093F380: /* 066B0 8093F380 240101AE */ addiu $at, $zero, 0x01AE ## $at = 000001AE -/* 066B4 8093F384 14410009 */ bne $v0, $at, .L8093F3AC +/* 066B4 8093F384 14410009 */ bne $v0, $at, .L8093F3AC /* 066B8 8093F388 240C01B3 */ addiu $t4, $zero, 0x01B3 ## $t4 = 000001B3 /* 066BC 8093F38C 3C018095 */ lui $at, %hi(D_8094C874) ## $at = 80950000 -/* 066C0 8093F390 A42CC874 */ sh $t4, %lo(D_8094C874)($at) +/* 066C0 8093F390 A42CC874 */ sh $t4, %lo(D_8094C874)($at) /* 066C4 8093F394 240B0004 */ addiu $t3, $zero, 0x0004 ## $t3 = 00000004 /* 066C8 8093F398 3C018095 */ lui $at, %hi(D_8094C878) ## $at = 80950000 /* 066CC 8093F39C 240D0001 */ addiu $t5, $zero, 0x0001 ## $t5 = 00000001 -/* 066D0 8093F3A0 A3AB0036 */ sb $t3, 0x0036($sp) -/* 066D4 8093F3A4 A02DC878 */ sb $t5, %lo(D_8094C878)($at) +/* 066D0 8093F3A0 A3AB0036 */ sb $t3, 0x0036($sp) +/* 066D4 8093F3A4 A02DC878 */ sb $t5, %lo(D_8094C878)($at) /* 066D8 8093F3A8 86020152 */ lh $v0, 0x0152($s0) ## 00000152 .L8093F3AC: -/* 066DC 8093F3AC 284101B9 */ slti $at, $v0, 0x01B9 -/* 066E0 8093F3B0 14200007 */ bne $at, $zero, .L8093F3D0 -/* 066E4 8093F3B4 2841035C */ slti $at, $v0, 0x035C -/* 066E8 8093F3B8 10200005 */ beq $at, $zero, .L8093F3D0 +/* 066DC 8093F3AC 284101B9 */ slti $at, $v0, 0x01B9 +/* 066E0 8093F3B0 14200007 */ bne $at, $zero, .L8093F3D0 +/* 066E4 8093F3B4 2841035C */ slti $at, $v0, 0x035C +/* 066E8 8093F3B8 10200005 */ beq $at, $zero, .L8093F3D0 /* 066EC 8093F3BC 240431E7 */ addiu $a0, $zero, 0x31E7 ## $a0 = 000031E7 -/* 066F0 8093F3C0 0C01E221 */ jal func_80078884 -/* 066F4 8093F3C4 A7A3003A */ sh $v1, 0x003A($sp) -/* 066F8 8093F3C8 87A3003A */ lh $v1, 0x003A($sp) +/* 066F0 8093F3C0 0C01E221 */ jal func_80078884 +/* 066F4 8093F3C4 A7A3003A */ sh $v1, 0x003A($sp) +/* 066F8 8093F3C8 87A3003A */ lh $v1, 0x003A($sp) /* 066FC 8093F3CC 86020152 */ lh $v0, 0x0152($s0) ## 00000152 .L8093F3D0: /* 06700 8093F3D0 240101AE */ addiu $at, $zero, 0x01AE ## $at = 000001AE -/* 06704 8093F3D4 14410002 */ bne $v0, $at, .L8093F3E0 +/* 06704 8093F3D4 14410002 */ bne $v0, $at, .L8093F3E0 /* 06708 8093F3D8 240401E0 */ addiu $a0, $zero, 0x01E0 ## $a0 = 000001E0 /* 0670C 8093F3DC 2403604E */ addiu $v1, $zero, 0x604E ## $v1 = 0000604E .L8093F3E0: -/* 06710 8093F3E0 14820008 */ bne $a0, $v0, .L8093F404 +/* 06710 8093F3E0 14820008 */ bne $a0, $v0, .L8093F404 /* 06714 8093F3E4 240101F4 */ addiu $at, $zero, 0x01F4 ## $at = 000001F4 /* 06718 8093F3E8 3C188095 */ lui $t8, %hi(D_8094C844) ## $t8 = 80950000 -/* 0671C 8093F3EC 8F18C844 */ lw $t8, %lo(D_8094C844)($t8) +/* 0671C 8093F3EC 8F18C844 */ lw $t8, %lo(D_8094C844)($t8) /* 06720 8093F3F0 240E0004 */ addiu $t6, $zero, 0x0004 ## $t6 = 00000004 -/* 06724 8093F3F4 A3AE0037 */ sb $t6, 0x0037($sp) +/* 06724 8093F3F4 A3AE0037 */ sb $t6, 0x0037($sp) /* 06728 8093F3F8 240FC000 */ addiu $t7, $zero, 0xC000 ## $t7 = FFFFC000 /* 0672C 8093F3FC A70F0164 */ sh $t7, 0x0164($t8) ## 80950164 /* 06730 8093F400 86020152 */ lh $v0, 0x0152($s0) ## 00000152 .L8093F404: -/* 06734 8093F404 14410002 */ bne $v0, $at, .L8093F410 +/* 06734 8093F404 14410002 */ bne $v0, $at, .L8093F410 /* 06738 8093F408 24190002 */ addiu $t9, $zero, 0x0002 ## $t9 = 00000002 -/* 0673C 8093F40C A3B90036 */ sb $t9, 0x0036($sp) +/* 0673C 8093F40C A3B90036 */ sb $t9, 0x0036($sp) .L8093F410: -/* 06740 8093F410 14820002 */ bne $a0, $v0, .L8093F41C +/* 06740 8093F410 14820002 */ bne $a0, $v0, .L8093F41C /* 06744 8093F414 2408604F */ addiu $t0, $zero, 0x604F ## $t0 = 0000604F -/* 06748 8093F418 A7A80038 */ sh $t0, 0x0038($sp) +/* 06748 8093F418 A7A80038 */ sh $t0, 0x0038($sp) .L8093F41C: /* 0674C 8093F41C 24040212 */ addiu $a0, $zero, 0x0212 ## $a0 = 00000212 -/* 06750 8093F420 1482000D */ bne $a0, $v0, .L8093F458 +/* 06750 8093F420 1482000D */ bne $a0, $v0, .L8093F458 /* 06754 8093F424 3C0B8095 */ lui $t3, %hi(D_8094C848) ## $t3 = 80950000 -/* 06758 8093F428 8D6BC848 */ lw $t3, %lo(D_8094C848)($t3) +/* 06758 8093F428 8D6BC848 */ lw $t3, %lo(D_8094C848)($t3) /* 0675C 8093F42C 24090004 */ addiu $t1, $zero, 0x0004 ## $t1 = 00000004 -/* 06760 8093F430 A3A90036 */ sb $t1, 0x0036($sp) +/* 06760 8093F430 A3A90036 */ sb $t1, 0x0036($sp) /* 06764 8093F434 240A4000 */ addiu $t2, $zero, 0x4000 ## $t2 = 00004000 /* 06768 8093F438 240C014F */ addiu $t4, $zero, 0x014F ## $t4 = 0000014F /* 0676C 8093F43C 3C018095 */ lui $at, %hi(D_8094C87A) ## $at = 80950000 /* 06770 8093F440 A56A0164 */ sh $t2, 0x0164($t3) ## 80950164 -/* 06774 8093F444 A42CC87A */ sh $t4, %lo(D_8094C87A)($at) +/* 06774 8093F444 A42CC87A */ sh $t4, %lo(D_8094C87A)($at) /* 06778 8093F448 3C018095 */ lui $at, %hi(D_8094C87E) ## $at = 80950000 /* 0677C 8093F44C 240D0001 */ addiu $t5, $zero, 0x0001 ## $t5 = 00000001 -/* 06780 8093F450 A02DC87E */ sb $t5, %lo(D_8094C87E)($at) +/* 06780 8093F450 A02DC87E */ sb $t5, %lo(D_8094C87E)($at) /* 06784 8093F454 86020152 */ lh $v0, 0x0152($s0) ## 00000152 .L8093F458: -/* 06788 8093F458 14820002 */ bne $a0, $v0, .L8093F464 +/* 06788 8093F458 14820002 */ bne $a0, $v0, .L8093F464 /* 0678C 8093F45C 24010244 */ addiu $at, $zero, 0x0244 ## $at = 00000244 /* 06790 8093F460 24036050 */ addiu $v1, $zero, 0x6050 ## $v1 = 00006050 .L8093F464: -/* 06794 8093F464 14410002 */ bne $v0, $at, .L8093F470 +/* 06794 8093F464 14410002 */ bne $v0, $at, .L8093F470 /* 06798 8093F468 240E6051 */ addiu $t6, $zero, 0x6051 ## $t6 = 00006051 -/* 0679C 8093F46C A7AE0038 */ sh $t6, 0x0038($sp) +/* 0679C 8093F46C A7AE0038 */ sh $t6, 0x0038($sp) .L8093F470: /* 067A0 8093F470 2401026C */ addiu $at, $zero, 0x026C ## $at = 0000026C -/* 067A4 8093F474 54410003 */ bnel $v0, $at, .L8093F484 +/* 067A4 8093F474 54410003 */ bnel $v0, $at, .L8093F484 /* 067A8 8093F478 24010294 */ addiu $at, $zero, 0x0294 ## $at = 00000294 /* 067AC 8093F47C 24036052 */ addiu $v1, $zero, 0x6052 ## $v1 = 00006052 /* 067B0 8093F480 24010294 */ addiu $at, $zero, 0x0294 ## $at = 00000294 .L8093F484: -/* 067B4 8093F484 14410002 */ bne $v0, $at, .L8093F490 +/* 067B4 8093F484 14410002 */ bne $v0, $at, .L8093F490 /* 067B8 8093F488 240F6053 */ addiu $t7, $zero, 0x6053 ## $t7 = 00006053 -/* 067BC 8093F48C A7AF0038 */ sh $t7, 0x0038($sp) +/* 067BC 8093F48C A7AF0038 */ sh $t7, 0x0038($sp) .L8093F490: /* 067C0 8093F490 240102BC */ addiu $at, $zero, 0x02BC ## $at = 000002BC -/* 067C4 8093F494 54410003 */ bnel $v0, $at, .L8093F4A4 +/* 067C4 8093F494 54410003 */ bnel $v0, $at, .L8093F4A4 /* 067C8 8093F498 240102E4 */ addiu $at, $zero, 0x02E4 ## $at = 000002E4 /* 067CC 8093F49C 24036054 */ addiu $v1, $zero, 0x6054 ## $v1 = 00006054 /* 067D0 8093F4A0 240102E4 */ addiu $at, $zero, 0x02E4 ## $at = 000002E4 .L8093F4A4: -/* 067D4 8093F4A4 14410002 */ bne $v0, $at, .L8093F4B0 +/* 067D4 8093F4A4 14410002 */ bne $v0, $at, .L8093F4B0 /* 067D8 8093F4A8 24186055 */ addiu $t8, $zero, 0x6055 ## $t8 = 00006055 -/* 067DC 8093F4AC A7B80038 */ sh $t8, 0x0038($sp) +/* 067DC 8093F4AC A7B80038 */ sh $t8, 0x0038($sp) .L8093F4B0: /* 067E0 8093F4B0 2401030C */ addiu $at, $zero, 0x030C ## $at = 0000030C -/* 067E4 8093F4B4 54410003 */ bnel $v0, $at, .L8093F4C4 +/* 067E4 8093F4B4 54410003 */ bnel $v0, $at, .L8093F4C4 /* 067E8 8093F4B8 24010334 */ addiu $at, $zero, 0x0334 ## $at = 00000334 /* 067EC 8093F4BC 24036056 */ addiu $v1, $zero, 0x6056 ## $v1 = 00006056 /* 067F0 8093F4C0 24010334 */ addiu $at, $zero, 0x0334 ## $at = 00000334 .L8093F4C4: -/* 067F4 8093F4C4 14410008 */ bne $v0, $at, .L8093F4E8 +/* 067F4 8093F4C4 14410008 */ bne $v0, $at, .L8093F4E8 /* 067F8 8093F4C8 24196057 */ addiu $t9, $zero, 0x6057 ## $t9 = 00006057 /* 067FC 8093F4CC 3C041050 */ lui $a0, 0x1050 ## $a0 = 10500000 -/* 06800 8093F4D0 A7B90038 */ sh $t9, 0x0038($sp) +/* 06800 8093F4D0 A7B90038 */ sh $t9, 0x0038($sp) /* 06804 8093F4D4 348400FF */ ori $a0, $a0, 0x00FF ## $a0 = 105000FF /* 06808 8093F4D8 0C03E803 */ jal Audio_SetBGM - -/* 0680C 8093F4DC A7A3003A */ sh $v1, 0x003A($sp) -/* 06810 8093F4E0 87A3003A */ lh $v1, 0x003A($sp) + +/* 0680C 8093F4DC A7A3003A */ sh $v1, 0x003A($sp) +/* 06810 8093F4E0 87A3003A */ lh $v1, 0x003A($sp) /* 06814 8093F4E4 86020152 */ lh $v0, 0x0152($s0) ## 00000152 .L8093F4E8: /* 06818 8093F4E8 2401035C */ addiu $at, $zero, 0x035C ## $at = 0000035C -/* 0681C 8093F4EC 14410004 */ bne $v0, $at, .L8093F500 +/* 0681C 8093F4EC 14410004 */ bne $v0, $at, .L8093F500 /* 06820 8093F4F0 24080003 */ addiu $t0, $zero, 0x0003 ## $t0 = 00000003 /* 06824 8093F4F4 24090003 */ addiu $t1, $zero, 0x0003 ## $t1 = 00000003 -/* 06828 8093F4F8 A3A90036 */ sb $t1, 0x0036($sp) -/* 0682C 8093F4FC A3A80037 */ sb $t0, 0x0037($sp) +/* 06828 8093F4F8 A3A90036 */ sb $t1, 0x0036($sp) +/* 0682C 8093F4FC A3A80037 */ sb $t0, 0x0037($sp) .L8093F500: /* 06830 8093F500 24010384 */ addiu $at, $zero, 0x0384 ## $at = 00000384 -/* 06834 8093F504 1441000B */ bne $v0, $at, .L8093F534 +/* 06834 8093F504 1441000B */ bne $v0, $at, .L8093F534 /* 06838 8093F508 3C048095 */ lui $a0, %hi(D_8094C848) ## $a0 = 80950000 -/* 0683C 8093F50C 8C84C848 */ lw $a0, %lo(D_8094C848)($a0) +/* 0683C 8093F50C 8C84C848 */ lw $a0, %lo(D_8094C848)($a0) /* 06840 8093F510 240539B5 */ addiu $a1, $zero, 0x39B5 ## $a1 = 000039B5 /* 06844 8093F514 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 06848 8093F518 A7A3003A */ sh $v1, 0x003A($sp) + +/* 06848 8093F518 A7A3003A */ sh $v1, 0x003A($sp) /* 0684C 8093F51C 3C048095 */ lui $a0, %hi(D_8094C844) ## $a0 = 80950000 -/* 06850 8093F520 8C84C844 */ lw $a0, %lo(D_8094C844)($a0) +/* 06850 8093F520 8C84C844 */ lw $a0, %lo(D_8094C844)($a0) /* 06854 8093F524 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 06858 8093F528 240539B5 */ addiu $a1, $zero, 0x39B5 ## $a1 = 000039B5 -/* 0685C 8093F52C 87A3003A */ lh $v1, 0x003A($sp) +/* 0685C 8093F52C 87A3003A */ lh $v1, 0x003A($sp) /* 06860 8093F530 86020152 */ lh $v0, 0x0152($s0) ## 00000152 .L8093F534: /* 06864 8093F534 240103A2 */ addiu $at, $zero, 0x03A2 ## $at = 000003A2 -/* 06868 8093F538 14410002 */ bne $v0, $at, .L8093F544 -/* 0686C 8093F53C 8FA4004C */ lw $a0, 0x004C($sp) +/* 06868 8093F538 14410002 */ bne $v0, $at, .L8093F544 +/* 0686C 8093F53C 8FA4004C */ lw $a0, 0x004C($sp) /* 06870 8093F540 24036058 */ addiu $v1, $zero, 0x6058 ## $v1 = 00006058 .L8093F544: -/* 06874 8093F544 1060000D */ beq $v1, $zero, .L8093F57C +/* 06874 8093F544 1060000D */ beq $v1, $zero, .L8093F57C /* 06878 8093F548 3065FFFF */ andi $a1, $v1, 0xFFFF ## $a1 = 00006058 -/* 0687C 8093F54C 0C042DA0 */ jal func_8010B680 +/* 0687C 8093F54C 0C042DA0 */ jal func_8010B680 /* 06880 8093F550 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 06884 8093F554 93AA0035 */ lbu $t2, 0x0035($sp) +/* 06884 8093F554 93AA0035 */ lbu $t2, 0x0035($sp) /* 06888 8093F558 240B000A */ addiu $t3, $zero, 0x000A ## $t3 = 0000000A /* 0688C 8093F55C 3C018095 */ lui $at, %hi(D_8094C876) ## $at = 80950000 -/* 06890 8093F560 51400007 */ beql $t2, $zero, .L8093F580 -/* 06894 8093F564 87AC0038 */ lh $t4, 0x0038($sp) -/* 06898 8093F568 A42BC876 */ sh $t3, %lo(D_8094C876)($at) +/* 06890 8093F560 51400007 */ beql $t2, $zero, .L8093F580 +/* 06894 8093F564 87AC0038 */ lh $t4, 0x0038($sp) +/* 06898 8093F568 A42BC876 */ sh $t3, %lo(D_8094C876)($at) /* 0689C 8093F56C 3C018095 */ lui $at, %hi(D_8094C874) ## $at = 80950000 -/* 068A0 8093F570 A42AC874 */ sh $t2, %lo(D_8094C874)($at) +/* 068A0 8093F570 A42AC874 */ sh $t2, %lo(D_8094C874)($at) /* 068A4 8093F574 3C018095 */ lui $at, %hi(D_8094C878) ## $at = 80950000 -/* 068A8 8093F578 A020C878 */ sb $zero, %lo(D_8094C878)($at) +/* 068A8 8093F578 A020C878 */ sb $zero, %lo(D_8094C878)($at) .L8093F57C: -/* 068AC 8093F57C 87AC0038 */ lh $t4, 0x0038($sp) +/* 068AC 8093F57C 87AC0038 */ lh $t4, 0x0038($sp) .L8093F580: -/* 068B0 8093F580 8FA4004C */ lw $a0, 0x004C($sp) -/* 068B4 8093F584 97A50038 */ lhu $a1, 0x0038($sp) -/* 068B8 8093F588 51800004 */ beql $t4, $zero, .L8093F59C -/* 068BC 8093F58C 93A20037 */ lbu $v0, 0x0037($sp) -/* 068C0 8093F590 0C042DA0 */ jal func_8010B680 +/* 068B0 8093F580 8FA4004C */ lw $a0, 0x004C($sp) +/* 068B4 8093F584 97A50038 */ lhu $a1, 0x0038($sp) +/* 068B8 8093F588 51800004 */ beql $t4, $zero, .L8093F59C +/* 068BC 8093F58C 93A20037 */ lbu $v0, 0x0037($sp) +/* 068C0 8093F590 0C042DA0 */ jal func_8010B680 /* 068C4 8093F594 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 068C8 8093F598 93A20037 */ lbu $v0, 0x0037($sp) +/* 068C8 8093F598 93A20037 */ lbu $v0, 0x0037($sp) .L8093F59C: /* 068CC 8093F59C 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 /* 068D0 8093F5A0 3C048095 */ lui $a0, %hi(D_8094C844) ## $a0 = 80950000 -/* 068D4 8093F5A4 1041000C */ beq $v0, $at, .L8093F5D8 +/* 068D4 8093F5A4 1041000C */ beq $v0, $at, .L8093F5D8 /* 068D8 8093F5A8 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 068DC 8093F5AC 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 068E0 8093F5B0 10410010 */ beq $v0, $at, .L8093F5F4 +/* 068E0 8093F5B0 10410010 */ beq $v0, $at, .L8093F5F4 /* 068E4 8093F5B4 3C048095 */ lui $a0, %hi(D_8094C844) ## $a0 = 80950000 /* 068E8 8093F5B8 24010003 */ addiu $at, $zero, 0x0003 ## $at = 00000003 -/* 068EC 8093F5BC 10410015 */ beq $v0, $at, .L8093F614 +/* 068EC 8093F5BC 10410015 */ beq $v0, $at, .L8093F614 /* 068F0 8093F5C0 3C048095 */ lui $a0, %hi(D_8094C844) ## $a0 = 80950000 /* 068F4 8093F5C4 24010004 */ addiu $at, $zero, 0x0004 ## $at = 00000004 -/* 068F8 8093F5C8 1041001A */ beq $v0, $at, .L8093F634 +/* 068F8 8093F5C8 1041001A */ beq $v0, $at, .L8093F634 /* 068FC 8093F5CC 3C048095 */ lui $a0, %hi(D_8094C844) ## $a0 = 80950000 -/* 06900 8093F5D0 1000001F */ beq $zero, $zero, .L8093F650 -/* 06904 8093F5D4 93A20036 */ lbu $v0, 0x0036($sp) +/* 06900 8093F5D0 1000001F */ beq $zero, $zero, .L8093F650 +/* 06904 8093F5D4 93A20036 */ lbu $v0, 0x0036($sp) .L8093F5D8: -/* 06908 8093F5D8 8C84C844 */ lw $a0, %lo(D_8094C844)($a0) +/* 06908 8093F5D8 8C84C844 */ lw $a0, %lo(D_8094C844)($a0) /* 0690C 8093F5DC 24A5230C */ addiu $a1, $a1, 0x230C ## $a1 = 0600230C /* 06910 8093F5E0 3C06C0A0 */ lui $a2, 0xC0A0 ## $a2 = C0A00000 -/* 06914 8093F5E4 0C0294D3 */ jal func_800A534C +/* 06914 8093F5E4 0C0294D3 */ jal SkelAnime_ChangeAnimTransitionRepeat /* 06918 8093F5E8 24840568 */ addiu $a0, $a0, 0x0568 ## $a0 = 80950568 -/* 0691C 8093F5EC 10000018 */ beq $zero, $zero, .L8093F650 -/* 06920 8093F5F0 93A20036 */ lbu $v0, 0x0036($sp) +/* 0691C 8093F5EC 10000018 */ beq $zero, $zero, .L8093F650 +/* 06920 8093F5F0 93A20036 */ lbu $v0, 0x0036($sp) .L8093F5F4: -/* 06924 8093F5F4 8C84C844 */ lw $a0, %lo(D_8094C844)($a0) +/* 06924 8093F5F4 8C84C844 */ lw $a0, %lo(D_8094C844)($a0) /* 06928 8093F5F8 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 0692C 8093F5FC 24A51D10 */ addiu $a1, $a1, 0x1D10 ## $a1 = 06001D10 /* 06930 8093F600 3C06C0A0 */ lui $a2, 0xC0A0 ## $a2 = C0A00000 -/* 06934 8093F604 0C0294D3 */ jal func_800A534C +/* 06934 8093F604 0C0294D3 */ jal SkelAnime_ChangeAnimTransitionRepeat /* 06938 8093F608 24840568 */ addiu $a0, $a0, 0x0568 ## $a0 = 00000568 -/* 0693C 8093F60C 10000010 */ beq $zero, $zero, .L8093F650 -/* 06940 8093F610 93A20036 */ lbu $v0, 0x0036($sp) +/* 0693C 8093F60C 10000010 */ beq $zero, $zero, .L8093F650 +/* 06940 8093F610 93A20036 */ lbu $v0, 0x0036($sp) .L8093F614: -/* 06944 8093F614 8C84C844 */ lw $a0, %lo(D_8094C844)($a0) +/* 06944 8093F614 8C84C844 */ lw $a0, %lo(D_8094C844)($a0) /* 06948 8093F618 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 0694C 8093F61C 24A517E0 */ addiu $a1, $a1, 0x17E0 ## $a1 = 060017E0 /* 06950 8093F620 3C06C0A0 */ lui $a2, 0xC0A0 ## $a2 = C0A00000 -/* 06954 8093F624 0C0294D3 */ jal func_800A534C +/* 06954 8093F624 0C0294D3 */ jal SkelAnime_ChangeAnimTransitionRepeat /* 06958 8093F628 24840568 */ addiu $a0, $a0, 0x0568 ## $a0 = 00000568 -/* 0695C 8093F62C 10000008 */ beq $zero, $zero, .L8093F650 -/* 06960 8093F630 93A20036 */ lbu $v0, 0x0036($sp) +/* 0695C 8093F62C 10000008 */ beq $zero, $zero, .L8093F650 +/* 06960 8093F630 93A20036 */ lbu $v0, 0x0036($sp) .L8093F634: -/* 06964 8093F634 8C84C844 */ lw $a0, %lo(D_8094C844)($a0) +/* 06964 8093F634 8C84C844 */ lw $a0, %lo(D_8094C844)($a0) /* 06968 8093F638 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 0696C 8093F63C 24A512A4 */ addiu $a1, $a1, 0x12A4 ## $a1 = 060012A4 /* 06970 8093F640 3C06C0A0 */ lui $a2, 0xC0A0 ## $a2 = C0A00000 -/* 06974 8093F644 0C0294D3 */ jal func_800A534C +/* 06974 8093F644 0C0294D3 */ jal SkelAnime_ChangeAnimTransitionRepeat /* 06978 8093F648 24840568 */ addiu $a0, $a0, 0x0568 ## $a0 = 00000568 -/* 0697C 8093F64C 93A20036 */ lbu $v0, 0x0036($sp) +/* 0697C 8093F64C 93A20036 */ lbu $v0, 0x0036($sp) .L8093F650: /* 06980 8093F650 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 /* 06984 8093F654 3C048095 */ lui $a0, %hi(D_8094C848) ## $a0 = 80950000 -/* 06988 8093F658 1041000C */ beq $v0, $at, .L8093F68C +/* 06988 8093F658 1041000C */ beq $v0, $at, .L8093F68C /* 0698C 8093F65C 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 06990 8093F660 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 06994 8093F664 10410010 */ beq $v0, $at, .L8093F6A8 +/* 06994 8093F664 10410010 */ beq $v0, $at, .L8093F6A8 /* 06998 8093F668 3C048095 */ lui $a0, %hi(D_8094C848) ## $a0 = 80950000 /* 0699C 8093F66C 24010003 */ addiu $at, $zero, 0x0003 ## $at = 00000003 -/* 069A0 8093F670 10410015 */ beq $v0, $at, .L8093F6C8 +/* 069A0 8093F670 10410015 */ beq $v0, $at, .L8093F6C8 /* 069A4 8093F674 3C048095 */ lui $a0, %hi(D_8094C848) ## $a0 = 80950000 /* 069A8 8093F678 24010004 */ addiu $at, $zero, 0x0004 ## $at = 00000004 -/* 069AC 8093F67C 1041001A */ beq $v0, $at, .L8093F6E8 +/* 069AC 8093F67C 1041001A */ beq $v0, $at, .L8093F6E8 /* 069B0 8093F680 3C048095 */ lui $a0, %hi(D_8094C848) ## $a0 = 80950000 -/* 069B4 8093F684 1000001F */ beq $zero, $zero, .L8093F704 +/* 069B4 8093F684 1000001F */ beq $zero, $zero, .L8093F704 /* 069B8 8093F688 86020152 */ lh $v0, 0x0152($s0) ## 00000152 .L8093F68C: -/* 069BC 8093F68C 8C84C848 */ lw $a0, %lo(D_8094C848)($a0) +/* 069BC 8093F68C 8C84C848 */ lw $a0, %lo(D_8094C848)($a0) /* 069C0 8093F690 24A5230C */ addiu $a1, $a1, 0x230C ## $a1 = 0600230C /* 069C4 8093F694 3C06C0A0 */ lui $a2, 0xC0A0 ## $a2 = C0A00000 -/* 069C8 8093F698 0C0294D3 */ jal func_800A534C +/* 069C8 8093F698 0C0294D3 */ jal SkelAnime_ChangeAnimTransitionRepeat /* 069CC 8093F69C 24840568 */ addiu $a0, $a0, 0x0568 ## $a0 = 80950568 -/* 069D0 8093F6A0 10000018 */ beq $zero, $zero, .L8093F704 +/* 069D0 8093F6A0 10000018 */ beq $zero, $zero, .L8093F704 /* 069D4 8093F6A4 86020152 */ lh $v0, 0x0152($s0) ## 00000152 .L8093F6A8: -/* 069D8 8093F6A8 8C84C848 */ lw $a0, %lo(D_8094C848)($a0) +/* 069D8 8093F6A8 8C84C848 */ lw $a0, %lo(D_8094C848)($a0) /* 069DC 8093F6AC 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 069E0 8093F6B0 24A51D10 */ addiu $a1, $a1, 0x1D10 ## $a1 = 06001D10 /* 069E4 8093F6B4 3C06C0A0 */ lui $a2, 0xC0A0 ## $a2 = C0A00000 -/* 069E8 8093F6B8 0C0294D3 */ jal func_800A534C +/* 069E8 8093F6B8 0C0294D3 */ jal SkelAnime_ChangeAnimTransitionRepeat /* 069EC 8093F6BC 24840568 */ addiu $a0, $a0, 0x0568 ## $a0 = 00000568 -/* 069F0 8093F6C0 10000010 */ beq $zero, $zero, .L8093F704 +/* 069F0 8093F6C0 10000010 */ beq $zero, $zero, .L8093F704 /* 069F4 8093F6C4 86020152 */ lh $v0, 0x0152($s0) ## 00000152 .L8093F6C8: -/* 069F8 8093F6C8 8C84C848 */ lw $a0, %lo(D_8094C848)($a0) +/* 069F8 8093F6C8 8C84C848 */ lw $a0, %lo(D_8094C848)($a0) /* 069FC 8093F6CC 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 06A00 8093F6D0 24A517E0 */ addiu $a1, $a1, 0x17E0 ## $a1 = 060017E0 /* 06A04 8093F6D4 3C06C0A0 */ lui $a2, 0xC0A0 ## $a2 = C0A00000 -/* 06A08 8093F6D8 0C0294D3 */ jal func_800A534C +/* 06A08 8093F6D8 0C0294D3 */ jal SkelAnime_ChangeAnimTransitionRepeat /* 06A0C 8093F6DC 24840568 */ addiu $a0, $a0, 0x0568 ## $a0 = 00000568 -/* 06A10 8093F6E0 10000008 */ beq $zero, $zero, .L8093F704 +/* 06A10 8093F6E0 10000008 */ beq $zero, $zero, .L8093F704 /* 06A14 8093F6E4 86020152 */ lh $v0, 0x0152($s0) ## 00000152 .L8093F6E8: -/* 06A18 8093F6E8 8C84C848 */ lw $a0, %lo(D_8094C848)($a0) +/* 06A18 8093F6E8 8C84C848 */ lw $a0, %lo(D_8094C848)($a0) /* 06A1C 8093F6EC 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 06A20 8093F6F0 24A512A4 */ addiu $a1, $a1, 0x12A4 ## $a1 = 060012A4 /* 06A24 8093F6F4 3C06C0A0 */ lui $a2, 0xC0A0 ## $a2 = C0A00000 -/* 06A28 8093F6F8 0C0294D3 */ jal func_800A534C +/* 06A28 8093F6F8 0C0294D3 */ jal SkelAnime_ChangeAnimTransitionRepeat /* 06A2C 8093F6FC 24840568 */ addiu $a0, $a0, 0x0568 ## $a0 = 00000568 /* 06A30 8093F700 86020152 */ lh $v0, 0x0152($s0) ## 00000152 .L8093F704: -/* 06A34 8093F704 28410078 */ slti $at, $v0, 0x0078 -/* 06A38 8093F708 14200009 */ bne $at, $zero, .L8093F730 -/* 06A3C 8093F70C 284101F4 */ slti $at, $v0, 0x01F4 -/* 06A40 8093F710 10200007 */ beq $at, $zero, .L8093F730 +/* 06A34 8093F704 28410078 */ slti $at, $v0, 0x0078 +/* 06A38 8093F708 14200009 */ bne $at, $zero, .L8093F730 +/* 06A3C 8093F70C 284101F4 */ slti $at, $v0, 0x01F4 +/* 06A40 8093F710 10200007 */ beq $at, $zero, .L8093F730 /* 06A44 8093F714 260401CC */ addiu $a0, $s0, 0x01CC ## $a0 = 000001CC /* 06A48 8093F718 3C063DCC */ lui $a2, 0x3DCC ## $a2 = 3DCC0000 /* 06A4C 8093F71C 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3DCCCCCD /* 06A50 8093F720 3C05437F */ lui $a1, 0x437F ## $a1 = 437F0000 /* 06A54 8093F724 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 06A58 8093F728 3C0740A0 */ lui $a3, 0x40A0 ## $a3 = 40A00000 /* 06A5C 8093F72C 86020152 */ lh $v0, 0x0152($s0) ## 00000152 .L8093F730: -/* 06A60 8093F730 28410096 */ slti $at, $v0, 0x0096 -/* 06A64 8093F734 542000A7 */ bnel $at, $zero, .L8093F9D4 -/* 06A68 8093F738 8FBF001C */ lw $ra, 0x001C($sp) +/* 06A60 8093F730 28410096 */ slti $at, $v0, 0x0096 +/* 06A64 8093F734 542000A7 */ bnel $at, $zero, .L8093F9D4 +/* 06A68 8093F738 8FBF001C */ lw $ra, 0x001C($sp) /* 06A6C 8093F73C 86040150 */ lh $a0, 0x0150($s0) ## 00000150 -/* 06A70 8093F740 00800821 */ addu $at, $a0, $zero -/* 06A74 8093F744 00042140 */ sll $a0, $a0, 5 -/* 06A78 8093F748 00812023 */ subu $a0, $a0, $at -/* 06A7C 8093F74C 00042080 */ sll $a0, $a0, 2 -/* 06A80 8093F750 00812021 */ addu $a0, $a0, $at -/* 06A84 8093F754 00042100 */ sll $a0, $a0, 4 -/* 06A88 8093F758 00042400 */ sll $a0, $a0, 16 +/* 06A70 8093F740 00800821 */ addu $at, $a0, $zero +/* 06A74 8093F744 00042140 */ sll $a0, $a0, 5 +/* 06A78 8093F748 00812023 */ subu $a0, $a0, $at +/* 06A7C 8093F74C 00042080 */ sll $a0, $a0, 2 +/* 06A80 8093F750 00812021 */ addu $a0, $a0, $at +/* 06A84 8093F754 00042100 */ sll $a0, $a0, 4 +/* 06A88 8093F758 00042400 */ sll $a0, $a0, 16 /* 06A8C 8093F75C 0C01DE1C */ jal Math_Sins ## sins? -/* 06A90 8093F760 00042403 */ sra $a0, $a0, 16 +/* 06A90 8093F760 00042403 */ sra $a0, $a0, 16 /* 06A94 8093F764 3C018095 */ lui $at, %hi(D_8094AFE0) ## $at = 80950000 -/* 06A98 8093F768 C430AFE0 */ lwc1 $f16, %lo(D_8094AFE0)($at) +/* 06A98 8093F768 C430AFE0 */ lwc1 $f16, %lo(D_8094AFE0)($at) /* 06A9C 8093F76C 3C018095 */ lui $at, %hi(D_8094AFE4) ## $at = 80950000 -/* 06AA0 8093F770 C424AFE4 */ lwc1 $f4, %lo(D_8094AFE4)($at) -/* 06AA4 8093F774 46100482 */ mul.s $f18, $f0, $f16 +/* 06AA0 8093F770 C424AFE4 */ lwc1 $f4, %lo(D_8094AFE4)($at) +/* 06AA4 8093F774 46100482 */ mul.s $f18, $f0, $f16 /* 06AA8 8093F778 3C048095 */ lui $a0, %hi(D_8094C848) ## $a0 = 80950000 -/* 06AAC 8093F77C 8C84C848 */ lw $a0, %lo(D_8094C848)($a0) +/* 06AAC 8093F77C 8C84C848 */ lw $a0, %lo(D_8094C848)($a0) /* 06AB0 8093F780 3C063DCC */ lui $a2, 0x3DCC ## $a2 = 3DCC0000 /* 06AB4 8093F784 3C073C23 */ lui $a3, 0x3C23 ## $a3 = 3C230000 /* 06AB8 8093F788 34E7D70A */ ori $a3, $a3, 0xD70A ## $a3 = 3C23D70A /* 06ABC 8093F78C 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3DCCCCCD -/* 06AC0 8093F790 46049180 */ add.s $f6, $f18, $f4 +/* 06AC0 8093F790 46049180 */ add.s $f6, $f18, $f4 /* 06AC4 8093F794 248401C8 */ addiu $a0, $a0, 0x01C8 ## $a0 = 809501C8 -/* 06AC8 8093F798 44053000 */ mfc1 $a1, $f6 +/* 06AC8 8093F798 44053000 */ mfc1 $a1, $f6 /* 06ACC 8093F79C 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 06AD0 8093F7A0 00000000 */ nop /* 06AD4 8093F7A4 86040150 */ lh $a0, 0x0150($s0) ## 00000150 -/* 06AD8 8093F7A8 00800821 */ addu $at, $a0, $zero -/* 06ADC 8093F7AC 00042080 */ sll $a0, $a0, 2 -/* 06AE0 8093F7B0 00812023 */ subu $a0, $a0, $at -/* 06AE4 8093F7B4 00042080 */ sll $a0, $a0, 2 -/* 06AE8 8093F7B8 00812021 */ addu $a0, $a0, $at -/* 06AEC 8093F7BC 00042080 */ sll $a0, $a0, 2 -/* 06AF0 8093F7C0 00812021 */ addu $a0, $a0, $at -/* 06AF4 8093F7C4 000420C0 */ sll $a0, $a0, 3 -/* 06AF8 8093F7C8 00812021 */ addu $a0, $a0, $at -/* 06AFC 8093F7CC 00042080 */ sll $a0, $a0, 2 -/* 06B00 8093F7D0 00042400 */ sll $a0, $a0, 16 +/* 06AD8 8093F7A8 00800821 */ addu $at, $a0, $zero +/* 06ADC 8093F7AC 00042080 */ sll $a0, $a0, 2 +/* 06AE0 8093F7B0 00812023 */ subu $a0, $a0, $at +/* 06AE4 8093F7B4 00042080 */ sll $a0, $a0, 2 +/* 06AE8 8093F7B8 00812021 */ addu $a0, $a0, $at +/* 06AEC 8093F7BC 00042080 */ sll $a0, $a0, 2 +/* 06AF0 8093F7C0 00812021 */ addu $a0, $a0, $at +/* 06AF4 8093F7C4 000420C0 */ sll $a0, $a0, 3 +/* 06AF8 8093F7C8 00812021 */ addu $a0, $a0, $at +/* 06AFC 8093F7CC 00042080 */ sll $a0, $a0, 2 +/* 06B00 8093F7D0 00042400 */ sll $a0, $a0, 16 /* 06B04 8093F7D4 0C01DE0D */ jal Math_Coss ## coss? -/* 06B08 8093F7D8 00042403 */ sra $a0, $a0, 16 +/* 06B08 8093F7D8 00042403 */ sra $a0, $a0, 16 /* 06B0C 8093F7DC 3C018095 */ lui $at, %hi(D_8094AFE8) ## $at = 80950000 -/* 06B10 8093F7E0 C428AFE8 */ lwc1 $f8, %lo(D_8094AFE8)($at) +/* 06B10 8093F7E0 C428AFE8 */ lwc1 $f8, %lo(D_8094AFE8)($at) /* 06B14 8093F7E4 3C018095 */ lui $at, %hi(D_8094AFEC) ## $at = 80950000 -/* 06B18 8093F7E8 C430AFEC */ lwc1 $f16, %lo(D_8094AFEC)($at) -/* 06B1C 8093F7EC 46080282 */ mul.s $f10, $f0, $f8 +/* 06B18 8093F7E8 C430AFEC */ lwc1 $f16, %lo(D_8094AFEC)($at) +/* 06B1C 8093F7EC 46080282 */ mul.s $f10, $f0, $f8 /* 06B20 8093F7F0 3C048095 */ lui $a0, %hi(D_8094C844) ## $a0 = 80950000 -/* 06B24 8093F7F4 8C84C844 */ lw $a0, %lo(D_8094C844)($a0) +/* 06B24 8093F7F4 8C84C844 */ lw $a0, %lo(D_8094C844)($a0) /* 06B28 8093F7F8 3C063DCC */ lui $a2, 0x3DCC ## $a2 = 3DCC0000 /* 06B2C 8093F7FC 3C073C23 */ lui $a3, 0x3C23 ## $a3 = 3C230000 /* 06B30 8093F800 34E7D70A */ ori $a3, $a3, 0xD70A ## $a3 = 3C23D70A /* 06B34 8093F804 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3DCCCCCD -/* 06B38 8093F808 46105480 */ add.s $f18, $f10, $f16 +/* 06B38 8093F808 46105480 */ add.s $f18, $f10, $f16 /* 06B3C 8093F80C 248401C8 */ addiu $a0, $a0, 0x01C8 ## $a0 = 809501C8 -/* 06B40 8093F810 44059000 */ mfc1 $a1, $f18 +/* 06B40 8093F810 44059000 */ mfc1 $a1, $f18 /* 06B44 8093F814 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 06B48 8093F818 00000000 */ nop /* 06B4C 8093F81C 86020152 */ lh $v0, 0x0152($s0) ## 00000152 /* 06B50 8093F820 3C0544FA */ lui $a1, 0x44FA ## $a1 = 44FA0000 /* 06B54 8093F824 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 06B58 8093F828 28410370 */ slti $at, $v0, 0x0370 -/* 06B5C 8093F82C 14200027 */ bne $at, $zero, .L8093F8CC -/* 06B60 8093F830 00022080 */ sll $a0, $v0, 2 +/* 06B58 8093F828 28410370 */ slti $at, $v0, 0x0370 +/* 06B5C 8093F82C 14200027 */ bne $at, $zero, .L8093F8CC +/* 06B60 8093F830 00022080 */ sll $a0, $v0, 2 /* 06B64 8093F834 3C048095 */ lui $a0, %hi(D_8094C844) ## $a0 = 80950000 -/* 06B68 8093F838 8C84C844 */ lw $a0, %lo(D_8094C844)($a0) +/* 06B68 8093F838 8C84C844 */ lw $a0, %lo(D_8094C844)($a0) /* 06B6C 8093F83C 8E070068 */ lw $a3, 0x0068($s0) ## 00000068 /* 06B70 8093F840 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 06B74 8093F844 24840028 */ addiu $a0, $a0, 0x0028 ## $a0 = 80950028 /* 06B78 8093F848 3C048095 */ lui $a0, %hi(D_8094C848) ## $a0 = 80950000 -/* 06B7C 8093F84C 8C84C848 */ lw $a0, %lo(D_8094C848)($a0) +/* 06B7C 8093F84C 8C84C848 */ lw $a0, %lo(D_8094C848)($a0) /* 06B80 8093F850 3C0544FA */ lui $a1, 0x44FA ## $a1 = 44FA0000 /* 06B84 8093F854 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 06B88 8093F858 8E070068 */ lw $a3, 0x0068($s0) ## 00000068 /* 06B8C 8093F85C 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 06B90 8093F860 24840028 */ addiu $a0, $a0, 0x0028 ## $a0 = 80950028 /* 06B94 8093F864 26040068 */ addiu $a0, $s0, 0x0068 ## $a0 = 00000068 /* 06B98 8093F868 3C054120 */ lui $a1, 0x4120 ## $a1 = 41200000 /* 06B9C 8093F86C 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 06BA0 8093F870 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 06BA4 8093F874 3C073E80 */ lui $a3, 0x3E80 ## $a3 = 3E800000 /* 06BA8 8093F878 860D0152 */ lh $t5, 0x0152($s0) ## 00000152 /* 06BAC 8093F87C 260401D0 */ addiu $a0, $s0, 0x01D0 ## $a0 = 000001D0 /* 06BB0 8093F880 3C0540A0 */ lui $a1, 0x40A0 ## $a1 = 40A00000 -/* 06BB4 8093F884 29A103A2 */ slti $at, $t5, 0x03A2 -/* 06BB8 8093F888 1420000B */ bne $at, $zero, .L8093F8B8 +/* 06BB4 8093F884 29A103A2 */ slti $at, $t5, 0x03A2 +/* 06BB8 8093F888 1420000B */ bne $at, $zero, .L8093F8B8 /* 06BBC 8093F88C 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 06BC0 8093F890 3C073D4C */ lui $a3, 0x3D4C ## $a3 = 3D4C0000 /* 06BC4 8093F894 260E01CC */ addiu $t6, $s0, 0x01CC ## $t6 = 000001CC -/* 06BC8 8093F898 AFAE0024 */ sw $t6, 0x0024($sp) +/* 06BC8 8093F898 AFAE0024 */ sw $t6, 0x0024($sp) /* 06BCC 8093F89C 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 06BD0 8093F8A0 34E7CCCD */ ori $a3, $a3, 0xCCCD ## $a3 = 3D4CCCCD -/* 06BD4 8093F8A4 8FA40024 */ lw $a0, 0x0024($sp) +/* 06BD4 8093F8A4 8FA40024 */ lw $a0, 0x0024($sp) /* 06BD8 8093F8A8 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 /* 06BDC 8093F8AC 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 06BE0 8093F8B0 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 06BE4 8093F8B4 3C074040 */ lui $a3, 0x4040 ## $a3 = 40400000 .L8093F8B8: /* 06BE8 8093F8B8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 06BEC 8093F8BC 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 06BF0 8093F8C0 24052086 */ addiu $a1, $zero, 0x2086 ## $a1 = 00002086 -/* 06BF4 8093F8C4 10000043 */ beq $zero, $zero, .L8093F9D4 -/* 06BF8 8093F8C8 8FBF001C */ lw $ra, 0x001C($sp) +/* 06BF4 8093F8C4 10000043 */ beq $zero, $zero, .L8093F9D4 +/* 06BF8 8093F8C8 8FBF001C */ lw $ra, 0x001C($sp) .L8093F8CC: -/* 06BFC 8093F8CC 00822023 */ subu $a0, $a0, $v0 -/* 06C00 8093F8D0 00042080 */ sll $a0, $a0, 2 -/* 06C04 8093F8D4 00822021 */ addu $a0, $a0, $v0 -/* 06C08 8093F8D8 00042080 */ sll $a0, $a0, 2 -/* 06C0C 8093F8DC 00822021 */ addu $a0, $a0, $v0 -/* 06C10 8093F8E0 000420C0 */ sll $a0, $a0, 3 -/* 06C14 8093F8E4 00822021 */ addu $a0, $a0, $v0 -/* 06C18 8093F8E8 00042080 */ sll $a0, $a0, 2 -/* 06C1C 8093F8EC 00042400 */ sll $a0, $a0, 16 +/* 06BFC 8093F8CC 00822023 */ subu $a0, $a0, $v0 +/* 06C00 8093F8D0 00042080 */ sll $a0, $a0, 2 +/* 06C04 8093F8D4 00822021 */ addu $a0, $a0, $v0 +/* 06C08 8093F8D8 00042080 */ sll $a0, $a0, 2 +/* 06C0C 8093F8DC 00822021 */ addu $a0, $a0, $v0 +/* 06C10 8093F8E0 000420C0 */ sll $a0, $a0, 3 +/* 06C14 8093F8E4 00822021 */ addu $a0, $a0, $v0 +/* 06C18 8093F8E8 00042080 */ sll $a0, $a0, 2 +/* 06C1C 8093F8EC 00042400 */ sll $a0, $a0, 16 /* 06C20 8093F8F0 0C01DE0D */ jal Math_Coss ## coss? -/* 06C24 8093F8F4 00042403 */ sra $a0, $a0, 16 +/* 06C24 8093F8F4 00042403 */ sra $a0, $a0, 16 /* 06C28 8093F8F8 3C018095 */ lui $at, %hi(D_8094AFF0) ## $at = 80950000 -/* 06C2C 8093F8FC C424AFF0 */ lwc1 $f4, %lo(D_8094AFF0)($at) +/* 06C2C 8093F8FC C424AFF0 */ lwc1 $f4, %lo(D_8094AFF0)($at) /* 06C30 8093F900 3C014080 */ lui $at, 0x4080 ## $at = 40800000 /* 06C34 8093F904 44813000 */ mtc1 $at, $f6 ## $f6 = 4.00 /* 06C38 8093F908 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 /* 06C3C 8093F90C 44818000 */ mtc1 $at, $f16 ## $f16 = 20.00 -/* 06C40 8093F910 46060202 */ mul.s $f8, $f0, $f6 +/* 06C40 8093F910 46060202 */ mul.s $f8, $f0, $f6 /* 06C44 8093F914 3C048095 */ lui $a0, %hi(D_8094C844) ## $a0 = 80950000 -/* 06C48 8093F918 8C84C844 */ lw $a0, %lo(D_8094C844)($a0) +/* 06C48 8093F918 8C84C844 */ lw $a0, %lo(D_8094C844)($a0) /* 06C4C 8093F91C 3C063DCC */ lui $a2, 0x3DCC ## $a2 = 3DCC0000 /* 06C50 8093F920 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3DCCCCCD /* 06C54 8093F924 8E070068 */ lw $a3, 0x0068($s0) ## 00000068 /* 06C58 8093F928 24840028 */ addiu $a0, $a0, 0x0028 ## $a0 = 80950028 -/* 06C5C 8093F92C 46082280 */ add.s $f10, $f4, $f8 -/* 06C60 8093F930 46105480 */ add.s $f18, $f10, $f16 -/* 06C64 8093F934 44059000 */ mfc1 $a1, $f18 +/* 06C5C 8093F92C 46082280 */ add.s $f10, $f4, $f8 +/* 06C60 8093F930 46105480 */ add.s $f18, $f10, $f16 +/* 06C64 8093F934 44059000 */ mfc1 $a1, $f18 /* 06C68 8093F938 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 06C6C 8093F93C 00000000 */ nop /* 06C70 8093F940 86040152 */ lh $a0, 0x0152($s0) ## 00000152 -/* 06C74 8093F944 00800821 */ addu $at, $a0, $zero -/* 06C78 8093F948 00042080 */ sll $a0, $a0, 2 -/* 06C7C 8093F94C 00812023 */ subu $a0, $a0, $at -/* 06C80 8093F950 00042100 */ sll $a0, $a0, 4 -/* 06C84 8093F954 00812023 */ subu $a0, $a0, $at -/* 06C88 8093F958 000420C0 */ sll $a0, $a0, 3 -/* 06C8C 8093F95C 00812023 */ subu $a0, $a0, $at -/* 06C90 8093F960 00042080 */ sll $a0, $a0, 2 -/* 06C94 8093F964 00042400 */ sll $a0, $a0, 16 +/* 06C74 8093F944 00800821 */ addu $at, $a0, $zero +/* 06C78 8093F948 00042080 */ sll $a0, $a0, 2 +/* 06C7C 8093F94C 00812023 */ subu $a0, $a0, $at +/* 06C80 8093F950 00042100 */ sll $a0, $a0, 4 +/* 06C84 8093F954 00812023 */ subu $a0, $a0, $at +/* 06C88 8093F958 000420C0 */ sll $a0, $a0, 3 +/* 06C8C 8093F95C 00812023 */ subu $a0, $a0, $at +/* 06C90 8093F960 00042080 */ sll $a0, $a0, 2 +/* 06C94 8093F964 00042400 */ sll $a0, $a0, 16 /* 06C98 8093F968 0C01DE1C */ jal Math_Sins ## sins? -/* 06C9C 8093F96C 00042403 */ sra $a0, $a0, 16 +/* 06C9C 8093F96C 00042403 */ sra $a0, $a0, 16 /* 06CA0 8093F970 3C018095 */ lui $at, %hi(D_8094AFF4) ## $at = 80950000 -/* 06CA4 8093F974 C426AFF4 */ lwc1 $f6, %lo(D_8094AFF4)($at) +/* 06CA4 8093F974 C426AFF4 */ lwc1 $f6, %lo(D_8094AFF4)($at) /* 06CA8 8093F978 3C014080 */ lui $at, 0x4080 ## $at = 40800000 /* 06CAC 8093F97C 44812000 */ mtc1 $at, $f4 ## $f4 = 4.00 /* 06CB0 8093F980 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 /* 06CB4 8093F984 44818000 */ mtc1 $at, $f16 ## $f16 = 20.00 -/* 06CB8 8093F988 46040202 */ mul.s $f8, $f0, $f4 +/* 06CB8 8093F988 46040202 */ mul.s $f8, $f0, $f4 /* 06CBC 8093F98C 3C048095 */ lui $a0, %hi(D_8094C848) ## $a0 = 80950000 -/* 06CC0 8093F990 8C84C848 */ lw $a0, %lo(D_8094C848)($a0) +/* 06CC0 8093F990 8C84C848 */ lw $a0, %lo(D_8094C848)($a0) /* 06CC4 8093F994 3C063DCC */ lui $a2, 0x3DCC ## $a2 = 3DCC0000 /* 06CC8 8093F998 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3DCCCCCD /* 06CCC 8093F99C 8E070068 */ lw $a3, 0x0068($s0) ## 00000068 /* 06CD0 8093F9A0 24840028 */ addiu $a0, $a0, 0x0028 ## $a0 = 80950028 -/* 06CD4 8093F9A4 46083280 */ add.s $f10, $f6, $f8 -/* 06CD8 8093F9A8 46105480 */ add.s $f18, $f10, $f16 -/* 06CDC 8093F9AC 44059000 */ mfc1 $a1, $f18 +/* 06CD4 8093F9A4 46083280 */ add.s $f10, $f6, $f8 +/* 06CD8 8093F9A8 46105480 */ add.s $f18, $f10, $f16 +/* 06CDC 8093F9AC 44059000 */ mfc1 $a1, $f18 /* 06CE0 8093F9B0 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 06CE4 8093F9B4 00000000 */ nop /* 06CE8 8093F9B8 3C073D4C */ lui $a3, 0x3D4C ## $a3 = 3D4C0000 /* 06CEC 8093F9BC 34E7CCCD */ ori $a3, $a3, 0xCCCD ## $a3 = 3D4CCCCD /* 06CF0 8093F9C0 26040068 */ addiu $a0, $s0, 0x0068 ## $a0 = 00000068 /* 06CF4 8093F9C4 3C053F80 */ lui $a1, 0x3F80 ## $a1 = 3F800000 /* 06CF8 8093F9C8 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 06CFC 8093F9CC 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 06D00 8093F9D0 8FBF001C */ lw $ra, 0x001C($sp) +/* 06D00 8093F9D0 8FBF001C */ lw $ra, 0x001C($sp) .L8093F9D4: -/* 06D04 8093F9D4 8FB00018 */ lw $s0, 0x0018($sp) +/* 06D04 8093F9D4 8FB00018 */ lw $s0, 0x0018($sp) /* 06D08 8093F9D8 27BD0048 */ addiu $sp, $sp, 0x0048 ## $sp = 00000000 -/* 06D0C 8093F9DC 03E00008 */ jr $ra +/* 06D0C 8093F9DC 03E00008 */ jr $ra /* 06D10 8093F9E0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093F9E4.s b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093F9E4.s index 8331127ef8..9af82ec5b3 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093F9E4.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8093F9E4.s @@ -1,22 +1,22 @@ glabel func_8093F9E4 /* 06D14 8093F9E4 27BDFF20 */ addiu $sp, $sp, 0xFF20 ## $sp = FFFFFF20 -/* 06D18 8093F9E8 AFB20044 */ sw $s2, 0x0044($sp) -/* 06D1C 8093F9EC AFBF004C */ sw $ra, 0x004C($sp) -/* 06D20 8093F9F0 AFB30048 */ sw $s3, 0x0048($sp) -/* 06D24 8093F9F4 AFB10040 */ sw $s1, 0x0040($sp) -/* 06D28 8093F9F8 AFB0003C */ sw $s0, 0x003C($sp) -/* 06D2C 8093F9FC F7B40030 */ sdc1 $f20, 0x0030($sp) +/* 06D18 8093F9E8 AFB20044 */ sw $s2, 0x0044($sp) +/* 06D1C 8093F9EC AFBF004C */ sw $ra, 0x004C($sp) +/* 06D20 8093F9F0 AFB30048 */ sw $s3, 0x0048($sp) +/* 06D24 8093F9F4 AFB10040 */ sw $s1, 0x0040($sp) +/* 06D28 8093F9F8 AFB0003C */ sw $s0, 0x003C($sp) +/* 06D2C 8093F9FC F7B40030 */ sdc1 $f20, 0x0030($sp) /* 06D30 8093FA00 8CAE1C44 */ lw $t6, 0x1C44($a1) ## 00001C44 /* 06D34 8093FA04 00809025 */ or $s2, $a0, $zero ## $s2 = 00000000 /* 06D38 8093FA08 00A09825 */ or $s3, $a1, $zero ## $s3 = 00000000 /* 06D3C 8093FA0C 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 /* 06D40 8093FA10 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 06D44 8093FA14 0C030129 */ jal func_800C04A4 -/* 06D48 8093FA18 AFAE00CC */ sw $t6, 0x00CC($sp) +/* 06D44 8093FA14 0C030129 */ jal func_800C04A4 +/* 06D48 8093FA18 AFAE00CC */ sw $t6, 0x00CC($sp) /* 06D4C 8093FA1C 26500568 */ addiu $s0, $s2, 0x0568 ## $s0 = 00000568 -/* 06D50 8093FA20 AFA200C8 */ sw $v0, 0x00C8($sp) +/* 06D50 8093FA20 AFA200C8 */ sw $v0, 0x00C8($sp) /* 06D54 8093FA24 0C02927F */ jal SkelAnime_FrameUpdateMatrix - + /* 06D58 8093FA28 02002025 */ or $a0, $s0, $zero ## $a0 = 00000568 /* 06D5C 8093FA2C 864F0160 */ lh $t7, 0x0160($s2) ## 00000160 /* 06D60 8093FA30 240800FF */ addiu $t0, $zero, 0x00FF ## $t0 = 000000FF @@ -26,72 +26,72 @@ glabel func_8093F9E4 /* 06D70 8093FA40 86590160 */ lh $t9, 0x0160($s2) ## 00000160 /* 06D74 8093FA44 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 /* 06D78 8093FA48 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 06D7C 8093FA4C 2B210100 */ slti $at, $t9, 0x0100 -/* 06D80 8093FA50 14200002 */ bne $at, $zero, .L8093FA5C +/* 06D7C 8093FA4C 2B210100 */ slti $at, $t9, 0x0100 +/* 06D80 8093FA50 14200002 */ bne $at, $zero, .L8093FA5C /* 06D84 8093FA54 3C073D4C */ lui $a3, 0x3D4C ## $a3 = 3D4C0000 /* 06D88 8093FA58 A6480160 */ sh $t0, 0x0160($s2) ## 00000160 .L8093FA5C: /* 06D8C 8093FA5C 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 06D90 8093FA60 34E7CCCD */ ori $a3, $a3, 0xCCCD ## $a3 = 3D4CCCCD /* 06D94 8093FA64 86420440 */ lh $v0, 0x0440($s2) ## 00000440 /* 06D98 8093FA68 24090001 */ addiu $t1, $zero, 0x0001 ## $t1 = 00000001 /* 06D9C 8093FA6C A24905F8 */ sb $t1, 0x05F8($s2) ## 000005F8 -/* 06DA0 8093FA70 10400005 */ beq $v0, $zero, .L8093FA88 +/* 06DA0 8093FA70 10400005 */ beq $v0, $zero, .L8093FA88 /* 06DA4 8093FA74 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 06DA8 8093FA78 504100C9 */ beql $v0, $at, .L8093FDA0 +/* 06DA8 8093FA78 504100C9 */ beql $v0, $at, .L8093FDA0 /* 06DAC 8093FA7C 964F05FA */ lhu $t7, 0x05FA($s2) ## 000005FA -/* 06DB0 8093FA80 100000C7 */ beq $zero, $zero, .L8093FDA0 +/* 06DB0 8093FA80 100000C7 */ beq $zero, $zero, .L8093FDA0 /* 06DB4 8093FA84 964F05FA */ lhu $t7, 0x05FA($s2) ## 000005FA .L8093FA88: /* 06DB8 8093FA88 86420150 */ lh $v0, 0x0150($s2) ## 00000150 /* 06DBC 8093FA8C 2401000F */ addiu $at, $zero, 0x000F ## $at = 0000000F /* 06DC0 8093FA90 02002025 */ or $a0, $s0, $zero ## $a0 = 00000568 -/* 06DC4 8093FA94 14410005 */ bne $v0, $at, .L8093FAAC +/* 06DC4 8093FA94 14410005 */ bne $v0, $at, .L8093FAAC /* 06DC8 8093FA98 3C050602 */ lui $a1, 0x0602 ## $a1 = 06020000 /* 06DCC 8093FA9C 24A516DC */ addiu $a1, $a1, 0x16DC ## $a1 = 060216DC -/* 06DD0 8093FAA0 0C029490 */ jal func_800A5240 +/* 06DD0 8093FAA0 0C029490 */ jal SkelAnime_ChangeAnimTransitionStop /* 06DD4 8093FAA4 3C06C040 */ lui $a2, 0xC040 ## $a2 = C0400000 /* 06DD8 8093FAA8 86420150 */ lh $v0, 0x0150($s2) ## 00000150 .L8093FAAC: -/* 06DDC 8093FAAC 2841000F */ slti $at, $v0, 0x000F -/* 06DE0 8093FAB0 14200007 */ bne $at, $zero, .L8093FAD0 +/* 06DDC 8093FAAC 2841000F */ slti $at, $v0, 0x000F +/* 06DE0 8093FAB0 14200007 */ bne $at, $zero, .L8093FAD0 /* 06DE4 8093FAB4 26440028 */ addiu $a0, $s2, 0x0028 ## $a0 = 00000028 /* 06DE8 8093FAB8 3C063D4C */ lui $a2, 0x3D4C ## $a2 = 3D4C0000 /* 06DEC 8093FABC 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3D4CCCCD /* 06DF0 8093FAC0 3C0543C8 */ lui $a1, 0x43C8 ## $a1 = 43C80000 /* 06DF4 8093FAC4 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 06DF8 8093FAC8 3C074120 */ lui $a3, 0x4120 ## $a3 = 41200000 /* 06DFC 8093FACC 86420150 */ lh $v0, 0x0150($s2) ## 00000150 .L8093FAD0: -/* 06E00 8093FAD0 28410037 */ slti $at, $v0, 0x0037 -/* 06E04 8093FAD4 142000AE */ bne $at, $zero, .L8093FD90 +/* 06E00 8093FAD0 28410037 */ slti $at, $v0, 0x0037 +/* 06E04 8093FAD4 142000AE */ bne $at, $zero, .L8093FD90 /* 06E08 8093FAD8 240AFFFF */ addiu $t2, $zero, 0xFFFF ## $t2 = FFFFFFFF /* 06E0C 8093FADC 24010037 */ addiu $at, $zero, 0x0037 ## $at = 00000037 -/* 06E10 8093FAE0 14410005 */ bne $v0, $at, .L8093FAF8 +/* 06E10 8093FAE0 14410005 */ bne $v0, $at, .L8093FAF8 /* 06E14 8093FAE4 240B0005 */ addiu $t3, $zero, 0x0005 ## $t3 = 00000005 /* 06E18 8093FAE8 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 /* 06E1C 8093FAEC 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 06E20 8093FAF0 00330821 */ addu $at, $at, $s3 +/* 06E20 8093FAF0 00330821 */ addu $at, $at, $s3 /* 06E24 8093FAF4 E4240AFC */ swc1 $f4, 0x0AFC($at) ## 00010AFC .L8093FAF8: /* 06E28 8093FAF8 3C018095 */ lui $at, %hi(D_8094C840) ## $at = 80950000 -/* 06E2C 8093FAFC A02AC840 */ sb $t2, %lo(D_8094C840)($at) +/* 06E2C 8093FAFC A02AC840 */ sb $t2, %lo(D_8094C840)($at) /* 06E30 8093FB00 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 06E34 8093FB04 00330821 */ addu $at, $at, $s3 +/* 06E34 8093FB04 00330821 */ addu $at, $at, $s3 /* 06E38 8093FB08 A02B0AE2 */ sb $t3, 0x0AE2($at) ## 00010AE2 /* 06E3C 8093FB0C 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 06E40 8093FB10 00330821 */ addu $at, $at, $s3 +/* 06E40 8093FB10 00330821 */ addu $at, $at, $s3 /* 06E44 8093FB14 A0200AE1 */ sb $zero, 0x0AE1($at) ## 00010AE1 /* 06E48 8093FB18 3C010001 */ lui $at, 0x0001 ## $at = 00010000 /* 06E4C 8093FB1C 34210AFC */ ori $at, $at, 0x0AFC ## $at = 00010AFC /* 06E50 8093FB20 3C073C75 */ lui $a3, 0x3C75 ## $a3 = 3C750000 /* 06E54 8093FB24 34E7C28F */ ori $a3, $a3, 0xC28F ## $a3 = 3C75C28F -/* 06E58 8093FB28 02612021 */ addu $a0, $s3, $at +/* 06E58 8093FB28 02612021 */ addu $a0, $s3, $at /* 06E5C 8093FB2C 3C053F80 */ lui $a1, 0x3F80 ## $a1 = 3F800000 /* 06E60 8093FB30 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 06E64 8093FB34 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 06E68 8093FB38 3C053983 */ lui $a1, 0x3983 ## $a1 = 39830000 /* 06E6C 8093FB3C 3C063DCC */ lui $a2, 0x3DCC ## $a2 = 3DCC0000 @@ -100,41 +100,41 @@ glabel func_8093F9E4 /* 06E78 8093FB48 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3DCCCCCD /* 06E7C 8093FB4C 34A5126E */ ori $a1, $a1, 0x126E ## $a1 = 3983126E /* 06E80 8093FB50 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 06E84 8093FB54 26440050 */ addiu $a0, $s2, 0x0050 ## $a0 = 00000050 /* 06E88 8093FB58 C6400068 */ lwc1 $f0, 0x0068($s2) ## 00000068 /* 06E8C 8093FB5C C64801B8 */ lwc1 $f8, 0x01B8($s2) ## 000001B8 /* 06E90 8093FB60 3C014780 */ lui $at, 0x4780 ## $at = 47800000 -/* 06E94 8093FB64 4600018D */ trunc.w.s $f6, $f0 +/* 06E94 8093FB64 4600018D */ trunc.w.s $f6, $f0 /* 06E98 8093FB68 44816000 */ mtc1 $at, $f12 ## $f12 = 65536.00 /* 06E9C 8093FB6C 864C00B6 */ lh $t4, 0x00B6($s2) ## 000000B6 -/* 06EA0 8093FB70 46004280 */ add.s $f10, $f8, $f0 -/* 06EA4 8093FB74 44183000 */ mfc1 $t8, $f6 +/* 06EA0 8093FB70 46004280 */ add.s $f10, $f8, $f0 +/* 06EA4 8093FB74 44183000 */ mfc1 $t8, $f6 /* 06EA8 8093FB78 E64A01B8 */ swc1 $f10, 0x01B8($s2) ## 000001B8 /* 06EAC 8093FB7C C64201B8 */ lwc1 $f2, 0x01B8($s2) ## 000001B8 -/* 06EB0 8093FB80 0198C821 */ addu $t9, $t4, $t8 +/* 06EB0 8093FB80 0198C821 */ addu $t9, $t4, $t8 /* 06EB4 8093FB84 A65900B6 */ sh $t9, 0x00B6($s2) ## 000000B6 -/* 06EB8 8093FB88 4602603C */ c.lt.s $f12, $f2 +/* 06EB8 8093FB88 4602603C */ c.lt.s $f12, $f2 /* 06EBC 8093FB8C 00000000 */ nop -/* 06EC0 8093FB90 45020007 */ bc1fl .L8093FBB0 +/* 06EC0 8093FB90 45020007 */ bc1fl .L8093FBB0 /* 06EC4 8093FB94 26440068 */ addiu $a0, $s2, 0x0068 ## $a0 = 00000068 -/* 06EC8 8093FB98 460C1401 */ sub.s $f16, $f2, $f12 +/* 06EC8 8093FB98 460C1401 */ sub.s $f16, $f2, $f12 /* 06ECC 8093FB9C 02402025 */ or $a0, $s2, $zero ## $a0 = 00000000 /* 06ED0 8093FBA0 24053921 */ addiu $a1, $zero, 0x3921 ## $a1 = 00003921 /* 06ED4 8093FBA4 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 06ED8 8093FBA8 E65001B8 */ swc1 $f16, 0x01B8($s2) ## 000001B8 /* 06EDC 8093FBAC 26440068 */ addiu $a0, $s2, 0x0068 ## $a0 = 00000068 .L8093FBB0: /* 06EE0 8093FBB0 3C054640 */ lui $a1, 0x4640 ## $a1 = 46400000 /* 06EE4 8093FBB4 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 06EE8 8093FBB8 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 06EEC 8093FBBC 3C074380 */ lui $a3, 0x4380 ## $a3 = 43800000 /* 06EF0 8093FBC0 86480150 */ lh $t0, 0x0150($s2) ## 00000150 /* 06EF4 8093FBC4 24010087 */ addiu $at, $zero, 0x0087 ## $at = 00000087 /* 06EF8 8093FBC8 27A900A4 */ addiu $t1, $sp, 0x00A4 ## $t1 = FFFFFFC4 -/* 06EFC 8093FBCC 15010070 */ bne $t0, $at, .L8093FD90 +/* 06EFC 8093FBCC 15010070 */ bne $t0, $at, .L8093FD90 /* 06F00 8093FBD0 3C0A8095 */ lui $t2, %hi(D_8094A8E8) ## $t2 = 80950000 /* 06F04 8093FBD4 254AA8E8 */ addiu $t2, $t2, %lo(D_8094A8E8) ## $t2 = 8094A8E8 /* 06F08 8093FBD8 8D4D0000 */ lw $t5, 0x0000($t2) ## 8094A8E8 @@ -143,30 +143,30 @@ glabel func_8093F9E4 /* 06F14 8093FBE4 AD2D0000 */ sw $t5, 0x0000($t1) ## FFFFFFC4 /* 06F18 8093FBE8 8D4D0008 */ lw $t5, 0x0008($t2) ## 8094A8F0 /* 06F1C 8093FBEC AD2B0004 */ sw $t3, 0x0004($t1) ## FFFFFFC8 -/* 06F20 8093FBF0 0C01E221 */ jal func_80078884 +/* 06F20 8093FBF0 0C01E221 */ jal func_80078884 /* 06F24 8093FBF4 AD2D0008 */ sw $t5, 0x0008($t1) ## FFFFFFCC /* 06F28 8093FBF8 264E0024 */ addiu $t6, $s2, 0x0024 ## $t6 = 00000024 -/* 06F2C 8093FBFC AFAE0064 */ sw $t6, 0x0064($sp) +/* 06F2C 8093FBFC AFAE0064 */ sw $t6, 0x0064($sp) /* 06F30 8093FC00 00008025 */ or $s0, $zero, $zero ## $s0 = 00000000 /* 06F34 8093FC04 27B100BC */ addiu $s1, $sp, 0x00BC ## $s1 = FFFFFFDC /* 06F38 8093FC08 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 .L8093FC0C: /* 06F3C 8093FC0C 44816000 */ mtc1 $at, $f12 ## $f12 = 5.00 /* 06F40 8093FC10 0C00CFC8 */ jal Math_Rand_CenteredFloat - + /* 06F44 8093FC14 00000000 */ nop /* 06F48 8093FC18 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 /* 06F4C 8093FC1C 44816000 */ mtc1 $at, $f12 ## $f12 = 5.00 /* 06F50 8093FC20 0C00CFC8 */ jal Math_Rand_CenteredFloat - -/* 06F54 8093FC24 E7A000B0 */ swc1 $f0, 0x00B0($sp) + +/* 06F54 8093FC24 E7A000B0 */ swc1 $f0, 0x00B0($sp) /* 06F58 8093FC28 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 /* 06F5C 8093FC2C 44816000 */ mtc1 $at, $f12 ## $f12 = 5.00 /* 06F60 8093FC30 0C00CFC8 */ jal Math_Rand_CenteredFloat - -/* 06F64 8093FC34 E7A000B4 */ swc1 $f0, 0x00B4($sp) -/* 06F68 8093FC38 8FAF0064 */ lw $t7, 0x0064($sp) -/* 06F6C 8093FC3C E7A000B8 */ swc1 $f0, 0x00B8($sp) + +/* 06F64 8093FC34 E7A000B4 */ swc1 $f0, 0x00B4($sp) +/* 06F68 8093FC38 8FAF0064 */ lw $t7, 0x0064($sp) +/* 06F6C 8093FC3C E7A000B8 */ swc1 $f0, 0x00B8($sp) /* 06F70 8093FC40 3C014000 */ lui $at, 0x4000 ## $at = 40000000 /* 06F74 8093FC44 8DF80000 */ lw $t8, 0x0000($t7) ## 00000000 /* 06F78 8093FC48 44816000 */ mtc1 $at, $f12 ## $f12 = 2.00 @@ -175,41 +175,41 @@ glabel func_8093F9E4 /* 06F84 8093FC54 AE2C0004 */ sw $t4, 0x0004($s1) ## FFFFFFE0 /* 06F88 8093FC58 8DF80008 */ lw $t8, 0x0008($t7) ## 00000008 /* 06F8C 8093FC5C AE380008 */ sw $t8, 0x0008($s1) ## FFFFFFE4 -/* 06F90 8093FC60 C7B200BC */ lwc1 $f18, 0x00BC($sp) -/* 06F94 8093FC64 C7A400B0 */ lwc1 $f4, 0x00B0($sp) -/* 06F98 8093FC68 C7A800C0 */ lwc1 $f8, 0x00C0($sp) -/* 06F9C 8093FC6C C7AA00B4 */ lwc1 $f10, 0x00B4($sp) -/* 06FA0 8093FC70 46049180 */ add.s $f6, $f18, $f4 -/* 06FA4 8093FC74 C7B200C4 */ lwc1 $f18, 0x00C4($sp) -/* 06FA8 8093FC78 460A4400 */ add.s $f16, $f8, $f10 -/* 06FAC 8093FC7C E7A600BC */ swc1 $f6, 0x00BC($sp) -/* 06FB0 8093FC80 46009100 */ add.s $f4, $f18, $f0 -/* 06FB4 8093FC84 E7B000C0 */ swc1 $f16, 0x00C0($sp) +/* 06F90 8093FC60 C7B200BC */ lwc1 $f18, 0x00BC($sp) +/* 06F94 8093FC64 C7A400B0 */ lwc1 $f4, 0x00B0($sp) +/* 06F98 8093FC68 C7A800C0 */ lwc1 $f8, 0x00C0($sp) +/* 06F9C 8093FC6C C7AA00B4 */ lwc1 $f10, 0x00B4($sp) +/* 06FA0 8093FC70 46049180 */ add.s $f6, $f18, $f4 +/* 06FA4 8093FC74 C7B200C4 */ lwc1 $f18, 0x00C4($sp) +/* 06FA8 8093FC78 460A4400 */ add.s $f16, $f8, $f10 +/* 06FAC 8093FC7C E7A600BC */ swc1 $f6, 0x00BC($sp) +/* 06FB0 8093FC80 46009100 */ add.s $f4, $f18, $f0 +/* 06FB4 8093FC84 E7B000C0 */ swc1 $f16, 0x00C0($sp) /* 06FB8 8093FC88 0C00CFBE */ jal Math_Rand_ZeroFloat - -/* 06FBC 8093FC8C E7A400C4 */ swc1 $f4, 0x00C4($sp) + +/* 06FBC 8093FC8C E7A400C4 */ swc1 $f4, 0x00C4($sp) /* 06FC0 8093FC90 3C018095 */ lui $at, %hi(D_8094AFF8) ## $at = 80950000 -/* 06FC4 8093FC94 C42CAFF8 */ lwc1 $f12, %lo(D_8094AFF8)($at) +/* 06FC4 8093FC94 C42CAFF8 */ lwc1 $f12, %lo(D_8094AFF8)($at) /* 06FC8 8093FC98 0C00CFBE */ jal Math_Rand_ZeroFloat - -/* 06FCC 8093FC9C 46000506 */ mov.s $f20, $f0 + +/* 06FCC 8093FC9C 46000506 */ mov.s $f20, $f0 /* 06FD0 8093FCA0 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 -/* 06FD4 8093FCA4 4600028D */ trunc.w.s $f10, $f0 +/* 06FD4 8093FCA4 4600028D */ trunc.w.s $f10, $f0 /* 06FD8 8093FCA8 44813000 */ mtc1 $at, $f6 ## $f6 = 5.00 /* 06FDC 8093FCAC 02602025 */ or $a0, $s3, $zero ## $a0 = 00000000 /* 06FE0 8093FCB0 02202825 */ or $a1, $s1, $zero ## $a1 = FFFFFFDC -/* 06FE4 8093FCB4 4606A200 */ add.s $f8, $f20, $f6 -/* 06FE8 8093FCB8 44085000 */ mfc1 $t0, $f10 +/* 06FE4 8093FCB4 4606A200 */ add.s $f8, $f20, $f6 +/* 06FE8 8093FCB8 44085000 */ mfc1 $t0, $f10 /* 06FEC 8093FCBC 27A600B0 */ addiu $a2, $sp, 0x00B0 ## $a2 = FFFFFFD0 /* 06FF0 8093FCC0 27A700A4 */ addiu $a3, $sp, 0x00A4 ## $a3 = FFFFFFC4 -/* 06FF4 8093FCC4 E7A80010 */ swc1 $f8, 0x0010($sp) -/* 06FF8 8093FCC8 0C24E41C */ jal func_80939070 -/* 06FFC 8093FCCC AFA80014 */ sw $t0, 0x0014($sp) +/* 06FF4 8093FCC4 E7A80010 */ swc1 $f8, 0x0010($sp) +/* 06FF8 8093FCC8 0C24E41C */ jal func_80939070 +/* 06FFC 8093FCCC AFA80014 */ sw $t0, 0x0014($sp) /* 07000 8093FCD0 26100001 */ addiu $s0, $s0, 0x0001 ## $s0 = 00000001 -/* 07004 8093FCD4 00108400 */ sll $s0, $s0, 16 -/* 07008 8093FCD8 00108403 */ sra $s0, $s0, 16 -/* 0700C 8093FCDC 2A010064 */ slti $at, $s0, 0x0064 -/* 07010 8093FCE0 5420FFCA */ bnel $at, $zero, .L8093FC0C +/* 07004 8093FCD4 00108400 */ sll $s0, $s0, 16 +/* 07008 8093FCD8 00108403 */ sra $s0, $s0, 16 +/* 0700C 8093FCDC 2A010064 */ slti $at, $s0, 0x0064 +/* 07010 8093FCE0 5420FFCA */ bnel $at, $zero, .L8093FC0C /* 07014 8093FCE4 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 /* 07018 8093FCE8 44808000 */ mtc1 $zero, $f16 ## $f16 = 0.00 /* 0701C 8093FCEC C6520024 */ lwc1 $f18, 0x0024($s2) ## 00000024 @@ -217,81 +217,81 @@ glabel func_8093F9E4 /* 07024 8093FCF4 A6490440 */ sh $t1, 0x0440($s2) ## 00000440 /* 07028 8093FCF8 A2400564 */ sb $zero, 0x0564($s2) ## 00000564 /* 0702C 8093FCFC E6500050 */ swc1 $f16, 0x0050($s2) ## 00000050 -/* 07030 8093FD00 E7B20010 */ swc1 $f18, 0x0010($sp) +/* 07030 8093FD00 E7B20010 */ swc1 $f18, 0x0010($sp) /* 07034 8093FD04 C6440028 */ lwc1 $f4, 0x0028($s2) ## 00000028 /* 07038 8093FD08 26701C24 */ addiu $s0, $s3, 0x1C24 ## $s0 = 00001C24 /* 0703C 8093FD0C 240A0069 */ addiu $t2, $zero, 0x0069 ## $t2 = 00000069 -/* 07040 8093FD10 E7A40014 */ swc1 $f4, 0x0014($sp) +/* 07040 8093FD10 E7A40014 */ swc1 $f4, 0x0014($sp) /* 07044 8093FD14 C646002C */ lwc1 $f6, 0x002C($s2) ## 0000002C -/* 07048 8093FD18 AFAA0028 */ sw $t2, 0x0028($sp) -/* 0704C 8093FD1C AFA00024 */ sw $zero, 0x0024($sp) -/* 07050 8093FD20 AFA00020 */ sw $zero, 0x0020($sp) -/* 07054 8093FD24 AFA0001C */ sw $zero, 0x001C($sp) +/* 07048 8093FD18 AFAA0028 */ sw $t2, 0x0028($sp) +/* 0704C 8093FD1C AFA00024 */ sw $zero, 0x0024($sp) +/* 07050 8093FD20 AFA00020 */ sw $zero, 0x0020($sp) +/* 07054 8093FD24 AFA0001C */ sw $zero, 0x001C($sp) /* 07058 8093FD28 02002025 */ or $a0, $s0, $zero ## $a0 = 00001C24 /* 0705C 8093FD2C 02402825 */ or $a1, $s2, $zero ## $a1 = 00000000 /* 07060 8093FD30 02603025 */ or $a2, $s3, $zero ## $a2 = 00000000 /* 07064 8093FD34 240700DC */ addiu $a3, $zero, 0x00DC ## $a3 = 000000DC /* 07068 8093FD38 0C00C916 */ jal Actor_SpawnAttached - -/* 0706C 8093FD3C E7A60018 */ swc1 $f6, 0x0018($sp) + +/* 0706C 8093FD3C E7A60018 */ swc1 $f6, 0x0018($sp) /* 07070 8093FD40 C6480024 */ lwc1 $f8, 0x0024($s2) ## 00000024 /* 07074 8093FD44 240B0068 */ addiu $t3, $zero, 0x0068 ## $t3 = 00000068 /* 07078 8093FD48 02002025 */ or $a0, $s0, $zero ## $a0 = 00001C24 -/* 0707C 8093FD4C E7A80010 */ swc1 $f8, 0x0010($sp) +/* 0707C 8093FD4C E7A80010 */ swc1 $f8, 0x0010($sp) /* 07080 8093FD50 C64A0028 */ lwc1 $f10, 0x0028($s2) ## 00000028 /* 07084 8093FD54 02402825 */ or $a1, $s2, $zero ## $a1 = 00000000 /* 07088 8093FD58 02603025 */ or $a2, $s3, $zero ## $a2 = 00000000 -/* 0708C 8093FD5C E7AA0014 */ swc1 $f10, 0x0014($sp) +/* 0708C 8093FD5C E7AA0014 */ swc1 $f10, 0x0014($sp) /* 07090 8093FD60 C650002C */ lwc1 $f16, 0x002C($s2) ## 0000002C -/* 07094 8093FD64 AFAB0028 */ sw $t3, 0x0028($sp) -/* 07098 8093FD68 AFA00024 */ sw $zero, 0x0024($sp) -/* 0709C 8093FD6C AFA00020 */ sw $zero, 0x0020($sp) -/* 070A0 8093FD70 AFA0001C */ sw $zero, 0x001C($sp) +/* 07094 8093FD64 AFAB0028 */ sw $t3, 0x0028($sp) +/* 07098 8093FD68 AFA00024 */ sw $zero, 0x0024($sp) +/* 0709C 8093FD6C AFA00020 */ sw $zero, 0x0020($sp) +/* 070A0 8093FD70 AFA0001C */ sw $zero, 0x001C($sp) /* 070A4 8093FD74 240700DC */ addiu $a3, $zero, 0x00DC ## $a3 = 000000DC /* 070A8 8093FD78 0C00C916 */ jal Actor_SpawnAttached - -/* 070AC 8093FD7C E7B00018 */ swc1 $f16, 0x0018($sp) + +/* 070AC 8093FD7C E7B00018 */ swc1 $f16, 0x0018($sp) /* 070B0 8093FD80 8E4D0004 */ lw $t5, 0x0004($s2) ## 00000004 /* 070B4 8093FD84 2401FFFE */ addiu $at, $zero, 0xFFFE ## $at = FFFFFFFE -/* 070B8 8093FD88 01A17024 */ and $t6, $t5, $at +/* 070B8 8093FD88 01A17024 */ and $t6, $t5, $at /* 070BC 8093FD8C AE4E0004 */ sw $t6, 0x0004($s2) ## 00000004 .L8093FD90: /* 070C0 8093FD90 02402025 */ or $a0, $s2, $zero ## $a0 = 00000000 /* 070C4 8093FD94 0C00B58B */ jal Actor_SetScale - + /* 070C8 8093FD98 8E450050 */ lw $a1, 0x0050($s2) ## 00000050 /* 070CC 8093FD9C 964F05FA */ lhu $t7, 0x05FA($s2) ## 000005FA .L8093FDA0: -/* 070D0 8093FDA0 2DE10005 */ sltiu $at, $t7, 0x0005 -/* 070D4 8093FDA4 1020023C */ beq $at, $zero, .L80940698 -/* 070D8 8093FDA8 000F7880 */ sll $t7, $t7, 2 +/* 070D0 8093FDA0 2DE10005 */ sltiu $at, $t7, 0x0005 +/* 070D4 8093FDA4 1020023C */ beq $at, $zero, .L80940698 +/* 070D8 8093FDA8 000F7880 */ sll $t7, $t7, 2 /* 070DC 8093FDAC 3C018095 */ lui $at, %hi(jtbl_8094AFFC) ## $at = 80950000 -/* 070E0 8093FDB0 002F0821 */ addu $at, $at, $t7 -/* 070E4 8093FDB4 8C2FAFFC */ lw $t7, %lo(jtbl_8094AFFC)($at) -/* 070E8 8093FDB8 01E00008 */ jr $t7 +/* 070E0 8093FDB0 002F0821 */ addu $at, $at, $t7 +/* 070E4 8093FDB4 8C2FAFFC */ lw $t7, %lo(jtbl_8094AFFC)($at) +/* 070E8 8093FDB8 01E00008 */ jr $t7 /* 070EC 8093FDBC 00000000 */ nop glabel L8093FDC0 /* 070F0 8093FDC0 240C0001 */ addiu $t4, $zero, 0x0001 ## $t4 = 00000001 /* 070F4 8093FDC4 A64C05FA */ sh $t4, 0x05FA($s2) ## 000005FA /* 070F8 8093FDC8 02602025 */ or $a0, $s3, $zero ## $a0 = 00000000 -/* 070FC 8093FDCC 0C019148 */ jal func_80064520 +/* 070FC 8093FDCC 0C019148 */ jal func_80064520 /* 07100 8093FDD0 26651D64 */ addiu $a1, $s3, 0x1D64 ## $a1 = 00001D64 /* 07104 8093FDD4 02602025 */ or $a0, $s3, $zero ## $a0 = 00000000 /* 07108 8093FDD8 02402825 */ or $a1, $s2, $zero ## $a1 = 00000000 -/* 0710C 8093FDDC 0C00B7D5 */ jal func_8002DF54 +/* 0710C 8093FDDC 0C00B7D5 */ jal func_8002DF54 /* 07110 8093FDE0 24060008 */ addiu $a2, $zero, 0x0008 ## $a2 = 00000008 -/* 07114 8093FDE4 0C03008C */ jal func_800C0230 +/* 07114 8093FDE4 0C03008C */ jal func_800C0230 /* 07118 8093FDE8 02602025 */ or $a0, $s3, $zero ## $a0 = 00000000 /* 0711C 8093FDEC A64205FC */ sh $v0, 0x05FC($s2) ## 000005FC /* 07120 8093FDF0 02602025 */ or $a0, $s3, $zero ## $a0 = 00000000 /* 07124 8093FDF4 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 07128 8093FDF8 0C0300C5 */ jal func_800C0314 +/* 07128 8093FDF8 0C0300C5 */ jal func_800C0314 /* 0712C 8093FDFC 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 /* 07130 8093FE00 02602025 */ or $a0, $s3, $zero ## $a0 = 00000000 /* 07134 8093FE04 864505FC */ lh $a1, 0x05FC($s2) ## 000005FC -/* 07138 8093FE08 0C0300C5 */ jal func_800C0314 +/* 07138 8093FE08 0C0300C5 */ jal func_800C0314 /* 0713C 8093FE0C 24060007 */ addiu $a2, $zero, 0x0007 ## $a2 = 00000007 -/* 07140 8093FE10 8FA300C8 */ lw $v1, 0x00C8($sp) +/* 07140 8093FE10 8FA300C8 */ lw $v1, 0x00C8($sp) /* 07144 8093FE14 3C041001 */ lui $a0, 0x1001 ## $a0 = 10010000 /* 07148 8093FE18 348400FF */ ori $a0, $a0, 0x00FF ## $a0 = 100100FF /* 0714C 8093FE1C 8C79005C */ lw $t9, 0x005C($v1) ## 0000005C @@ -306,9 +306,9 @@ glabel L8093FDC0 /* 07170 8093FE40 AE480610 */ sw $t0, 0x0610($s2) ## 00000610 /* 07174 8093FE44 8C690058 */ lw $t1, 0x0058($v1) ## 00000058 /* 07178 8093FE48 0C03E803 */ jal Audio_SetBGM - + /* 0717C 8093FE4C AE490614 */ sw $t1, 0x0614($s2) ## 00000614 -/* 07180 8093FE50 10000212 */ beq $zero, $zero, .L8094069C +/* 07180 8093FE50 10000212 */ beq $zero, $zero, .L8094069C /* 07184 8093FE54 864505FC */ lh $a1, 0x05FC($s2) ## 000005FC glabel L8093FE58 /* 07188 8093FE58 0C01DE1C */ jal Math_Sins @@ -317,8 +317,8 @@ glabel L8093FE58 /* 07190 8093FE60 3C014348 */ lui $at, 0x4348 ## $at = 43480000 /* 07194 8093FE64 44819000 */ mtc1 $at, $f18 ## $f18 = 200.00 /* 07198 8093FE68 00000000 */ nop -/* 0719C 8093FE6C 46120102 */ mul.s $f4, $f0, $f18 -/* 071A0 8093FE70 E7A400D0 */ swc1 $f4, 0x00D0($sp) +/* 0719C 8093FE6C 46120102 */ mul.s $f4, $f0, $f18 +/* 071A0 8093FE70 E7A400D0 */ swc1 $f4, 0x00D0($sp) /* 071A4 8093FE74 0C01DE0D */ jal Math_Coss ## coss? /* 071A8 8093FE78 86440032 */ lh $a0, 0x0032($s2) ## 00000032 @@ -326,62 +326,62 @@ glabel L8093FE58 /* 071B0 8093FE80 4481A000 */ mtc1 $at, $f20 ## $f20 = 50.00 /* 071B4 8093FE84 3C014348 */ lui $at, 0x4348 ## $at = 43480000 /* 071B8 8093FE88 44813000 */ mtc1 $at, $f6 ## $f6 = 200.00 -/* 071BC 8093FE8C C7B000D0 */ lwc1 $f16, 0x00D0($sp) +/* 071BC 8093FE8C C7B000D0 */ lwc1 $f16, 0x00D0($sp) /* 071C0 8093FE90 3C063DCC */ lui $a2, 0x3DCC ## $a2 = 3DCC0000 -/* 071C4 8093FE94 46060202 */ mul.s $f8, $f0, $f6 -/* 071C8 8093FE98 4407A000 */ mfc1 $a3, $f20 +/* 071C4 8093FE94 46060202 */ mul.s $f8, $f0, $f6 +/* 071C8 8093FE98 4407A000 */ mfc1 $a3, $f20 /* 071CC 8093FE9C 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3DCCCCCD /* 071D0 8093FEA0 26440600 */ addiu $a0, $s2, 0x0600 ## $a0 = 00000600 -/* 071D4 8093FEA4 E7A800D8 */ swc1 $f8, 0x00D8($sp) +/* 071D4 8093FEA4 E7A800D8 */ swc1 $f8, 0x00D8($sp) /* 071D8 8093FEA8 C64A0024 */ lwc1 $f10, 0x0024($s2) ## 00000024 -/* 071DC 8093FEAC 46105480 */ add.s $f18, $f10, $f16 -/* 071E0 8093FEB0 44059000 */ mfc1 $a1, $f18 +/* 071DC 8093FEAC 46105480 */ add.s $f18, $f10, $f16 +/* 071E0 8093FEB0 44059000 */ mfc1 $a1, $f18 /* 071E4 8093FEB4 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 071E8 8093FEB8 00000000 */ nop /* 071EC 8093FEBC 3C063DCC */ lui $a2, 0x3DCC ## $a2 = 3DCC0000 -/* 071F0 8093FEC0 4407A000 */ mfc1 $a3, $f20 +/* 071F0 8093FEC0 4407A000 */ mfc1 $a3, $f20 /* 071F4 8093FEC4 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3DCCCCCD /* 071F8 8093FEC8 26440604 */ addiu $a0, $s2, 0x0604 ## $a0 = 00000604 /* 071FC 8093FECC 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 07200 8093FED0 3C054396 */ lui $a1, 0x4396 ## $a1 = 43960000 /* 07204 8093FED4 C644002C */ lwc1 $f4, 0x002C($s2) ## 0000002C -/* 07208 8093FED8 C7A600D8 */ lwc1 $f6, 0x00D8($sp) +/* 07208 8093FED8 C7A600D8 */ lwc1 $f6, 0x00D8($sp) /* 0720C 8093FEDC 3C063DCC */ lui $a2, 0x3DCC ## $a2 = 3DCC0000 -/* 07210 8093FEE0 4407A000 */ mfc1 $a3, $f20 -/* 07214 8093FEE4 46062200 */ add.s $f8, $f4, $f6 +/* 07210 8093FEE0 4407A000 */ mfc1 $a3, $f20 +/* 07214 8093FEE4 46062200 */ add.s $f8, $f4, $f6 /* 07218 8093FEE8 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3DCCCCCD /* 0721C 8093FEEC 26440608 */ addiu $a0, $s2, 0x0608 ## $a0 = 00000608 -/* 07220 8093FEF0 44054000 */ mfc1 $a1, $f8 +/* 07220 8093FEF0 44054000 */ mfc1 $a1, $f8 /* 07224 8093FEF4 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 07228 8093FEF8 00000000 */ nop /* 0722C 8093FEFC 3C063DCC */ lui $a2, 0x3DCC ## $a2 = 3DCC0000 -/* 07230 8093FF00 4407A000 */ mfc1 $a3, $f20 +/* 07230 8093FF00 4407A000 */ mfc1 $a3, $f20 /* 07234 8093FF04 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3DCCCCCD /* 07238 8093FF08 2644060C */ addiu $a0, $s2, 0x060C ## $a0 = 0000060C /* 0723C 8093FF0C 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 07240 8093FF10 8E450024 */ lw $a1, 0x0024($s2) ## 00000024 /* 07244 8093FF14 3C063DCC */ lui $a2, 0x3DCC ## $a2 = 3DCC0000 -/* 07248 8093FF18 4407A000 */ mfc1 $a3, $f20 +/* 07248 8093FF18 4407A000 */ mfc1 $a3, $f20 /* 0724C 8093FF1C 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3DCCCCCD /* 07250 8093FF20 26440610 */ addiu $a0, $s2, 0x0610 ## $a0 = 00000610 /* 07254 8093FF24 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 07258 8093FF28 8E450028 */ lw $a1, 0x0028($s2) ## 00000028 /* 0725C 8093FF2C 3C063DCC */ lui $a2, 0x3DCC ## $a2 = 3DCC0000 -/* 07260 8093FF30 4407A000 */ mfc1 $a3, $f20 +/* 07260 8093FF30 4407A000 */ mfc1 $a3, $f20 /* 07264 8093FF34 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3DCCCCCD /* 07268 8093FF38 26440614 */ addiu $a0, $s2, 0x0614 ## $a0 = 00000614 /* 0726C 8093FF3C 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 07270 8093FF40 8E45002C */ lw $a1, 0x002C($s2) ## 0000002C /* 07274 8093FF44 864A0150 */ lh $t2, 0x0150($s2) ## 00000150 /* 07278 8093FF48 240100AA */ addiu $at, $zero, 0x00AA ## $at = 000000AA -/* 0727C 8093FF4C 8FA300CC */ lw $v1, 0x00CC($sp) -/* 07280 8093FF50 154101D1 */ bne $t2, $at, .L80940698 +/* 0727C 8093FF4C 8FA300CC */ lw $v1, 0x00CC($sp) +/* 07280 8093FF50 154101D1 */ bne $t2, $at, .L80940698 /* 07284 8093FF54 240B0002 */ addiu $t3, $zero, 0x0002 ## $t3 = 00000002 /* 07288 8093FF58 3C01432A */ lui $at, 0x432A ## $at = 432A0000 /* 0728C 8093FF5C 44810000 */ mtc1 $at, $f0 ## $f0 = 170.00 @@ -409,78 +409,78 @@ glabel L8093FE58 /* 072E4 8093FFB4 E4700024 */ swc1 $f16, 0x0024($v1) ## 00000024 /* 072E8 8093FFB8 E4720028 */ swc1 $f18, 0x0028($v1) ## 00000028 /* 072EC 8093FFBC E464002C */ swc1 $f4, 0x002C($v1) ## 0000002C -/* 072F0 8093FFC0 8DCEC848 */ lw $t6, %lo(D_8094C848)($t6) +/* 072F0 8093FFC0 8DCEC848 */ lw $t6, %lo(D_8094C848)($t6) /* 072F4 8093FFC4 44813000 */ mtc1 $at, $f6 ## $f6 = -37.00 /* 072F8 8093FFC8 3C014214 */ lui $at, 0x4214 ## $at = 42140000 /* 072FC 8093FFCC 3C0F8095 */ lui $t7, %hi(D_8094C844) ## $t7 = 80950000 /* 07300 8093FFD0 E5C60024 */ swc1 $f6, 0x0024($t6) ## 80950024 -/* 07304 8093FFD4 8DEFC844 */ lw $t7, %lo(D_8094C844)($t7) +/* 07304 8093FFD4 8DEFC844 */ lw $t7, %lo(D_8094C844)($t7) /* 07308 8093FFD8 44814000 */ mtc1 $at, $f8 ## $f8 = 37.00 /* 0730C 8093FFDC 3C018095 */ lui $at, %hi(D_8094B010) ## $at = 80950000 /* 07310 8093FFE0 3C0C8095 */ lui $t4, %hi(D_8094C844) ## $t4 = 80950000 /* 07314 8093FFE4 E5E80024 */ swc1 $f8, 0x0024($t7) ## 80950024 -/* 07318 8093FFE8 8D8CC844 */ lw $t4, %lo(D_8094C844)($t4) -/* 0731C 8093FFEC C42AB010 */ lwc1 $f10, %lo(D_8094B010)($at) +/* 07318 8093FFE8 8D8CC844 */ lw $t4, %lo(D_8094C844)($t4) +/* 0731C 8093FFEC C42AB010 */ lwc1 $f10, %lo(D_8094B010)($at) /* 07320 8093FFF0 3C188095 */ lui $t8, %hi(D_8094C844) ## $t8 = 80950000 /* 07324 8093FFF4 3C198095 */ lui $t9, %hi(D_8094C848) ## $t9 = 80950000 /* 07328 8093FFF8 E58A0028 */ swc1 $f10, 0x0028($t4) ## 80950028 -/* 0732C 8093FFFC 8F18C844 */ lw $t8, %lo(D_8094C844)($t8) -/* 07330 80940000 8F39C848 */ lw $t9, %lo(D_8094C848)($t9) +/* 0732C 8093FFFC 8F18C844 */ lw $t8, %lo(D_8094C844)($t8) +/* 07330 80940000 8F39C848 */ lw $t9, %lo(D_8094C848)($t9) /* 07334 80940004 3C088095 */ lui $t0, %hi(D_8094C848) ## $t0 = 80950000 /* 07338 80940008 C7100028 */ lwc1 $f16, 0x0028($t8) ## 80950028 /* 0733C 8094000C 3C014188 */ lui $at, 0x4188 ## $at = 41880000 /* 07340 80940010 44812000 */ mtc1 $at, $f4 ## $f4 = 17.00 /* 07344 80940014 E7300028 */ swc1 $f16, 0x0028($t9) ## 80950028 -/* 07348 80940018 8D08C848 */ lw $t0, %lo(D_8094C848)($t0) +/* 07348 80940018 8D08C848 */ lw $t0, %lo(D_8094C848)($t0) /* 0734C 8094001C 3C098095 */ lui $t1, %hi(D_8094C844) ## $t1 = 80950000 /* 07350 80940020 3C0A8095 */ lui $t2, %hi(D_8094C844) ## $t2 = 80950000 /* 07354 80940024 C5120028 */ lwc1 $f18, 0x0028($t0) ## 80950028 /* 07358 80940028 3C0B8095 */ lui $t3, %hi(D_8094C848) ## $t3 = 80950000 /* 0735C 8094002C 3C0D8095 */ lui $t5, %hi(D_8094C844) ## $t5 = 80950000 -/* 07360 80940030 46049180 */ add.s $f6, $f18, $f4 +/* 07360 80940030 46049180 */ add.s $f6, $f18, $f4 /* 07364 80940034 3C0E8095 */ lui $t6, %hi(D_8094C844) ## $t6 = 80950000 /* 07368 80940038 3C0F8095 */ lui $t7, %hi(D_8094C848) ## $t7 = 80950000 /* 0736C 8094003C 3C0C8095 */ lui $t4, %hi(D_8094C844) ## $t4 = 80950000 /* 07370 80940040 E6460610 */ swc1 $f6, 0x0610($s2) ## 00000610 -/* 07374 80940044 8D29C844 */ lw $t1, %lo(D_8094C844)($t1) +/* 07374 80940044 8D29C844 */ lw $t1, %lo(D_8094C844)($t1) /* 07378 80940048 3C188095 */ lui $t8, %hi(D_8094C848) ## $t8 = 80950000 /* 0737C 8094004C 3C198095 */ lui $t9, %hi(D_8094C844) ## $t9 = 80950000 /* 07380 80940050 E522002C */ swc1 $f2, 0x002C($t1) ## 8095002C -/* 07384 80940054 8D4AC844 */ lw $t2, %lo(D_8094C844)($t2) -/* 07388 80940058 8D6BC848 */ lw $t3, %lo(D_8094C848)($t3) +/* 07384 80940054 8D4AC844 */ lw $t2, %lo(D_8094C844)($t2) +/* 07388 80940058 8D6BC848 */ lw $t3, %lo(D_8094C848)($t3) /* 0738C 8094005C 3C088095 */ lui $t0, %hi(D_8094C848) ## $t0 = 80950000 /* 07390 80940060 C548002C */ lwc1 $f8, 0x002C($t2) ## 8095002C /* 07394 80940064 3C058095 */ lui $a1, %hi(D_8094C848) ## $a1 = 80950000 /* 07398 80940068 02602025 */ or $a0, $s3, $zero ## $a0 = 00000000 /* 0739C 8094006C E568002C */ swc1 $f8, 0x002C($t3) ## 8095002C -/* 073A0 80940070 8DADC844 */ lw $t5, %lo(D_8094C844)($t5) +/* 073A0 80940070 8DADC844 */ lw $t5, %lo(D_8094C844)($t5) /* 073A4 80940074 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 /* 073A8 80940078 A5A000B6 */ sh $zero, 0x00B6($t5) ## 809500B6 -/* 073AC 8094007C 8DCEC844 */ lw $t6, %lo(D_8094C844)($t6) -/* 073B0 80940080 8DEFC848 */ lw $t7, %lo(D_8094C848)($t7) +/* 073AC 8094007C 8DCEC844 */ lw $t6, %lo(D_8094C844)($t6) +/* 073B0 80940080 8DEFC848 */ lw $t7, %lo(D_8094C848)($t7) /* 073B4 80940084 85C200B6 */ lh $v0, 0x00B6($t6) ## 809500B6 /* 073B8 80940088 A5E200B6 */ sh $v0, 0x00B6($t7) ## 809500B6 -/* 073BC 8094008C 8D8CC844 */ lw $t4, %lo(D_8094C844)($t4) +/* 073BC 8094008C 8D8CC844 */ lw $t4, %lo(D_8094C844)($t4) /* 073C0 80940090 A58200B4 */ sh $v0, 0x00B4($t4) ## 809500B4 -/* 073C4 80940094 8F18C848 */ lw $t8, %lo(D_8094C848)($t8) +/* 073C4 80940094 8F18C848 */ lw $t8, %lo(D_8094C848)($t8) /* 073C8 80940098 A70200B4 */ sh $v0, 0x00B4($t8) ## 809500B4 -/* 073CC 8094009C 8F39C844 */ lw $t9, %lo(D_8094C844)($t9) +/* 073CC 8094009C 8F39C844 */ lw $t9, %lo(D_8094C844)($t9) /* 073D0 809400A0 A7220164 */ sh $v0, 0x0164($t9) ## 80950164 -/* 073D4 809400A4 8D08C848 */ lw $t0, %lo(D_8094C848)($t0) +/* 073D4 809400A4 8D08C848 */ lw $t0, %lo(D_8094C848)($t0) /* 073D8 809400A8 A5020164 */ sh $v0, 0x0164($t0) ## 80950164 -/* 073DC 809400AC 0C00B7D5 */ jal func_8002DF54 -/* 073E0 809400B0 8CA5C848 */ lw $a1, %lo(D_8094C848)($a1) +/* 073DC 809400AC 0C00B7D5 */ jal func_8002DF54 +/* 073E0 809400B0 8CA5C848 */ lw $a1, %lo(D_8094C848)($a1) /* 073E4 809400B4 3C048095 */ lui $a0, %hi(D_8094C848) ## $a0 = 80950000 -/* 073E8 809400B8 8C84C848 */ lw $a0, %lo(D_8094C848)($a0) +/* 073E8 809400B8 8C84C848 */ lw $a0, %lo(D_8094C848)($a0) /* 073EC 809400BC 8C890004 */ lw $t1, 0x0004($a0) ## 80950004 /* 073F0 809400C0 352A0001 */ ori $t2, $t1, 0x0001 ## $t2 = 00000001 -/* 073F4 809400C4 10000174 */ beq $zero, $zero, .L80940698 +/* 073F4 809400C4 10000174 */ beq $zero, $zero, .L80940698 /* 073F8 809400C8 AC8A0004 */ sw $t2, 0x0004($a0) ## 80950004 glabel L809400CC /* 073FC 809400CC 864B0152 */ lh $t3, 0x0152($s2) ## 00000152 /* 07400 809400D0 24010064 */ addiu $at, $zero, 0x0064 ## $at = 00000064 /* 07404 809400D4 27AD0080 */ addiu $t5, $sp, 0x0080 ## $t5 = FFFFFFA0 -/* 07408 809400D8 1561016F */ bne $t3, $at, .L80940698 +/* 07408 809400D8 1561016F */ bne $t3, $at, .L80940698 /* 0740C 809400DC 3C0E8095 */ lui $t6, %hi(D_8094A8F4) ## $t6 = 80950000 /* 07410 809400E0 25CEA8F4 */ addiu $t6, $t6, %lo(D_8094A8F4) ## $t6 = 8094A8F4 /* 07414 809400E4 8DCC0000 */ lw $t4, 0x0000($t6) ## 8094A8F4 @@ -495,19 +495,19 @@ glabel L809400CC /* 07438 80940108 ADAC0008 */ sw $t4, 0x0008($t5) ## FFFFFFA8 .L8094010C: /* 0743C 8094010C 0C00CFC8 */ jal Math_Rand_CenteredFloat - -/* 07440 80940110 4600A306 */ mov.s $f12, $f20 -/* 07444 80940114 E7A0008C */ swc1 $f0, 0x008C($sp) + +/* 07440 80940110 4600A306 */ mov.s $f12, $f20 +/* 07444 80940114 E7A0008C */ swc1 $f0, 0x008C($sp) /* 07448 80940118 0C00CFC8 */ jal Math_Rand_CenteredFloat - -/* 0744C 8094011C 4600A306 */ mov.s $f12, $f20 -/* 07450 80940120 E7A00090 */ swc1 $f0, 0x0090($sp) + +/* 0744C 8094011C 4600A306 */ mov.s $f12, $f20 +/* 07450 80940120 E7A00090 */ swc1 $f0, 0x0090($sp) /* 07454 80940124 0C00CFC8 */ jal Math_Rand_CenteredFloat - -/* 07458 80940128 4600A306 */ mov.s $f12, $f20 + +/* 07458 80940128 4600A306 */ mov.s $f12, $f20 /* 0745C 8094012C 3C188095 */ lui $t8, %hi(D_8094C848) ## $t8 = 80950000 -/* 07460 80940130 8F18C848 */ lw $t8, %lo(D_8094C848)($t8) -/* 07464 80940134 E7A00094 */ swc1 $f0, 0x0094($sp) +/* 07460 80940130 8F18C848 */ lw $t8, %lo(D_8094C848)($t8) +/* 07464 80940134 E7A00094 */ swc1 $f0, 0x0094($sp) /* 07468 80940138 3C014000 */ lui $at, 0x4000 ## $at = 40000000 /* 0746C 8094013C 8F080024 */ lw $t0, 0x0024($t8) ## 80950024 /* 07470 80940140 44816000 */ mtc1 $at, $f12 ## $f12 = 2.00 @@ -516,47 +516,47 @@ glabel L809400CC /* 0747C 8094014C AE390004 */ sw $t9, 0x0004($s1) ## FFFFFFBC /* 07480 80940150 8F08002C */ lw $t0, 0x002C($t8) ## 8095002C /* 07484 80940154 AE280008 */ sw $t0, 0x0008($s1) ## FFFFFFC0 -/* 07488 80940158 C7AA008C */ lwc1 $f10, 0x008C($sp) -/* 0748C 8094015C C7B20098 */ lwc1 $f18, 0x0098($sp) -/* 07490 80940160 C7A60090 */ lwc1 $f6, 0x0090($sp) -/* 07494 80940164 460A5400 */ add.s $f16, $f10, $f10 -/* 07498 80940168 C7AA009C */ lwc1 $f10, 0x009C($sp) -/* 0749C 8094016C 46063200 */ add.s $f8, $f6, $f6 -/* 074A0 80940170 46109100 */ add.s $f4, $f18, $f16 -/* 074A4 80940174 C7B000A0 */ lwc1 $f16, 0x00A0($sp) -/* 074A8 80940178 46085480 */ add.s $f18, $f10, $f8 -/* 074AC 8094017C E7A40098 */ swc1 $f4, 0x0098($sp) -/* 074B0 80940180 46000100 */ add.s $f4, $f0, $f0 -/* 074B4 80940184 E7B2009C */ swc1 $f18, 0x009C($sp) -/* 074B8 80940188 46048180 */ add.s $f6, $f16, $f4 +/* 07488 80940158 C7AA008C */ lwc1 $f10, 0x008C($sp) +/* 0748C 8094015C C7B20098 */ lwc1 $f18, 0x0098($sp) +/* 07490 80940160 C7A60090 */ lwc1 $f6, 0x0090($sp) +/* 07494 80940164 460A5400 */ add.s $f16, $f10, $f10 +/* 07498 80940168 C7AA009C */ lwc1 $f10, 0x009C($sp) +/* 0749C 8094016C 46063200 */ add.s $f8, $f6, $f6 +/* 074A0 80940170 46109100 */ add.s $f4, $f18, $f16 +/* 074A4 80940174 C7B000A0 */ lwc1 $f16, 0x00A0($sp) +/* 074A8 80940178 46085480 */ add.s $f18, $f10, $f8 +/* 074AC 8094017C E7A40098 */ swc1 $f4, 0x0098($sp) +/* 074B0 80940180 46000100 */ add.s $f4, $f0, $f0 +/* 074B4 80940184 E7B2009C */ swc1 $f18, 0x009C($sp) +/* 074B8 80940188 46048180 */ add.s $f6, $f16, $f4 /* 074BC 8094018C 0C00CFBE */ jal Math_Rand_ZeroFloat - -/* 074C0 80940190 E7A600A0 */ swc1 $f6, 0x00A0($sp) + +/* 074C0 80940190 E7A600A0 */ swc1 $f6, 0x00A0($sp) /* 074C4 80940194 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 /* 074C8 80940198 44815000 */ mtc1 $at, $f10 ## $f10 = 5.00 /* 074CC 8094019C 24090001 */ addiu $t1, $zero, 0x0001 ## $t1 = 00000001 -/* 074D0 809401A0 AFA90014 */ sw $t1, 0x0014($sp) -/* 074D4 809401A4 460A0200 */ add.s $f8, $f0, $f10 +/* 074D0 809401A0 AFA90014 */ sw $t1, 0x0014($sp) +/* 074D4 809401A4 460A0200 */ add.s $f8, $f0, $f10 /* 074D8 809401A8 02602025 */ or $a0, $s3, $zero ## $a0 = 00000000 /* 074DC 809401AC 02202825 */ or $a1, $s1, $zero ## $a1 = FFFFFFB8 /* 074E0 809401B0 27A6008C */ addiu $a2, $sp, 0x008C ## $a2 = FFFFFFAC -/* 074E4 809401B4 E7A80010 */ swc1 $f8, 0x0010($sp) -/* 074E8 809401B8 0C24E41C */ jal func_80939070 +/* 074E4 809401B4 E7A80010 */ swc1 $f8, 0x0010($sp) +/* 074E8 809401B8 0C24E41C */ jal func_80939070 /* 074EC 809401BC 27A70080 */ addiu $a3, $sp, 0x0080 ## $a3 = FFFFFFA0 /* 074F0 809401C0 0C00CFC8 */ jal Math_Rand_CenteredFloat - -/* 074F4 809401C4 4600A306 */ mov.s $f12, $f20 -/* 074F8 809401C8 E7A0008C */ swc1 $f0, 0x008C($sp) + +/* 074F4 809401C4 4600A306 */ mov.s $f12, $f20 +/* 074F8 809401C8 E7A0008C */ swc1 $f0, 0x008C($sp) /* 074FC 809401CC 0C00CFC8 */ jal Math_Rand_CenteredFloat - -/* 07500 809401D0 4600A306 */ mov.s $f12, $f20 -/* 07504 809401D4 E7A00090 */ swc1 $f0, 0x0090($sp) + +/* 07500 809401D0 4600A306 */ mov.s $f12, $f20 +/* 07504 809401D4 E7A00090 */ swc1 $f0, 0x0090($sp) /* 07508 809401D8 0C00CFC8 */ jal Math_Rand_CenteredFloat - -/* 0750C 809401DC 4600A306 */ mov.s $f12, $f20 + +/* 0750C 809401DC 4600A306 */ mov.s $f12, $f20 /* 07510 809401E0 3C0A8095 */ lui $t2, %hi(D_8094C844) ## $t2 = 80950000 -/* 07514 809401E4 8D4AC844 */ lw $t2, %lo(D_8094C844)($t2) -/* 07518 809401E8 E7A00094 */ swc1 $f0, 0x0094($sp) +/* 07514 809401E4 8D4AC844 */ lw $t2, %lo(D_8094C844)($t2) +/* 07518 809401E8 E7A00094 */ swc1 $f0, 0x0094($sp) /* 0751C 809401EC 3C014000 */ lui $at, 0x4000 ## $at = 40000000 /* 07520 809401F0 8D4D0024 */ lw $t5, 0x0024($t2) ## 80950024 /* 07524 809401F4 44816000 */ mtc1 $at, $f12 ## $f12 = 2.00 @@ -565,60 +565,60 @@ glabel L809400CC /* 07530 80940200 AE2B0004 */ sw $t3, 0x0004($s1) ## FFFFFFBC /* 07534 80940204 8D4D002C */ lw $t5, 0x002C($t2) ## 8095002C /* 07538 80940208 AE2D0008 */ sw $t5, 0x0008($s1) ## FFFFFFC0 -/* 0753C 8094020C C7B2008C */ lwc1 $f18, 0x008C($sp) -/* 07540 80940210 C7A40098 */ lwc1 $f4, 0x0098($sp) -/* 07544 80940214 C7AA0090 */ lwc1 $f10, 0x0090($sp) -/* 07548 80940218 46129400 */ add.s $f16, $f18, $f18 -/* 0754C 8094021C C7B2009C */ lwc1 $f18, 0x009C($sp) -/* 07550 80940220 460A5200 */ add.s $f8, $f10, $f10 -/* 07554 80940224 46102180 */ add.s $f6, $f4, $f16 -/* 07558 80940228 C7B000A0 */ lwc1 $f16, 0x00A0($sp) -/* 0755C 8094022C 46089100 */ add.s $f4, $f18, $f8 -/* 07560 80940230 E7A60098 */ swc1 $f6, 0x0098($sp) -/* 07564 80940234 46000180 */ add.s $f6, $f0, $f0 -/* 07568 80940238 E7A4009C */ swc1 $f4, 0x009C($sp) -/* 0756C 8094023C 46068280 */ add.s $f10, $f16, $f6 +/* 0753C 8094020C C7B2008C */ lwc1 $f18, 0x008C($sp) +/* 07540 80940210 C7A40098 */ lwc1 $f4, 0x0098($sp) +/* 07544 80940214 C7AA0090 */ lwc1 $f10, 0x0090($sp) +/* 07548 80940218 46129400 */ add.s $f16, $f18, $f18 +/* 0754C 8094021C C7B2009C */ lwc1 $f18, 0x009C($sp) +/* 07550 80940220 460A5200 */ add.s $f8, $f10, $f10 +/* 07554 80940224 46102180 */ add.s $f6, $f4, $f16 +/* 07558 80940228 C7B000A0 */ lwc1 $f16, 0x00A0($sp) +/* 0755C 8094022C 46089100 */ add.s $f4, $f18, $f8 +/* 07560 80940230 E7A60098 */ swc1 $f6, 0x0098($sp) +/* 07564 80940234 46000180 */ add.s $f6, $f0, $f0 +/* 07568 80940238 E7A4009C */ swc1 $f4, 0x009C($sp) +/* 0756C 8094023C 46068280 */ add.s $f10, $f16, $f6 /* 07570 80940240 0C00CFBE */ jal Math_Rand_ZeroFloat - -/* 07574 80940244 E7AA00A0 */ swc1 $f10, 0x00A0($sp) + +/* 07574 80940244 E7AA00A0 */ swc1 $f10, 0x00A0($sp) /* 07578 80940248 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 /* 0757C 8094024C 44819000 */ mtc1 $at, $f18 ## $f18 = 5.00 /* 07580 80940250 02602025 */ or $a0, $s3, $zero ## $a0 = 00000000 /* 07584 80940254 02202825 */ or $a1, $s1, $zero ## $a1 = FFFFFFB8 -/* 07588 80940258 46120200 */ add.s $f8, $f0, $f18 +/* 07588 80940258 46120200 */ add.s $f8, $f0, $f18 /* 0758C 8094025C 27A6008C */ addiu $a2, $sp, 0x008C ## $a2 = FFFFFFAC /* 07590 80940260 27A70080 */ addiu $a3, $sp, 0x0080 ## $a3 = FFFFFFA0 -/* 07594 80940264 AFA00014 */ sw $zero, 0x0014($sp) -/* 07598 80940268 0C24E41C */ jal func_80939070 -/* 0759C 8094026C E7A80010 */ swc1 $f8, 0x0010($sp) +/* 07594 80940264 AFA00014 */ sw $zero, 0x0014($sp) +/* 07598 80940268 0C24E41C */ jal func_80939070 +/* 0759C 8094026C E7A80010 */ swc1 $f8, 0x0010($sp) /* 075A0 80940270 26100001 */ addiu $s0, $s0, 0x0001 ## $s0 = 00000001 -/* 075A4 80940274 00108400 */ sll $s0, $s0, 16 -/* 075A8 80940278 00108403 */ sra $s0, $s0, 16 -/* 075AC 8094027C 2A010032 */ slti $at, $s0, 0x0032 -/* 075B0 80940280 1420FFA2 */ bne $at, $zero, .L8094010C +/* 075A4 80940274 00108400 */ sll $s0, $s0, 16 +/* 075A8 80940278 00108403 */ sra $s0, $s0, 16 +/* 075AC 8094027C 2A010032 */ slti $at, $s0, 0x0032 +/* 075B0 80940280 1420FFA2 */ bne $at, $zero, .L8094010C /* 075B4 80940284 00000000 */ nop /* 075B8 80940288 3C048095 */ lui $a0, %hi(D_8094C848) ## $a0 = 80950000 -/* 075BC 8094028C 8C84C848 */ lw $a0, %lo(D_8094C848)($a0) +/* 075BC 8094028C 8C84C848 */ lw $a0, %lo(D_8094C848)($a0) /* 075C0 80940290 0C00B58B */ jal Actor_SetScale - + /* 075C4 80940294 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 /* 075C8 80940298 3C048095 */ lui $a0, %hi(D_8094C844) ## $a0 = 80950000 -/* 075CC 8094029C 8C84C844 */ lw $a0, %lo(D_8094C844)($a0) +/* 075CC 8094029C 8C84C844 */ lw $a0, %lo(D_8094C844)($a0) /* 075D0 809402A0 0C00B58B */ jal Actor_SetScale - + /* 075D4 809402A4 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 /* 075D8 809402A8 3C0F8095 */ lui $t7, %hi(D_8094C848) ## $t7 = 80950000 -/* 075DC 809402AC 8DEFC848 */ lw $t7, %lo(D_8094C848)($t7) +/* 075DC 809402AC 8DEFC848 */ lw $t7, %lo(D_8094C848)($t7) /* 075E0 809402B0 240E0001 */ addiu $t6, $zero, 0x0001 ## $t6 = 00000001 /* 075E4 809402B4 3C188095 */ lui $t8, %hi(D_8094C844) ## $t8 = 80950000 /* 075E8 809402B8 A1EE0564 */ sb $t6, 0x0564($t7) ## 80950564 -/* 075EC 809402BC 8F18C844 */ lw $t8, %lo(D_8094C844)($t8) +/* 075EC 809402BC 8F18C844 */ lw $t8, %lo(D_8094C844)($t8) /* 075F0 809402C0 240C0001 */ addiu $t4, $zero, 0x0001 ## $t4 = 00000001 /* 075F4 809402C4 2404390D */ addiu $a0, $zero, 0x390D ## $a0 = 0000390D -/* 075F8 809402C8 0C01E221 */ jal func_80078884 +/* 075F8 809402C8 0C01E221 */ jal func_80078884 /* 075FC 809402CC A30C0564 */ sb $t4, 0x0564($t8) ## 80950564 /* 07600 809402D0 0C03E803 */ jal Audio_SetBGM - + /* 07604 809402D4 24040061 */ addiu $a0, $zero, 0x0061 ## $a0 = 00000061 /* 07608 809402D8 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 /* 0760C 809402DC 24190003 */ addiu $t9, $zero, 0x0003 ## $t9 = 00000003 @@ -627,138 +627,138 @@ glabel L809400CC /* 07618 809402E8 E64006A0 */ swc1 $f0, 0x06A0($s2) ## 000006A0 /* 0761C 809402EC E6400068 */ swc1 $f0, 0x0068($s2) ## 00000068 /* 07620 809402F0 E64006B0 */ swc1 $f0, 0x06B0($s2) ## 000006B0 -/* 07624 809402F4 100000E8 */ beq $zero, $zero, .L80940698 +/* 07624 809402F4 100000E8 */ beq $zero, $zero, .L80940698 /* 07628 809402F8 E64006AC */ swc1 $f0, 0x06AC($s2) ## 000006AC glabel L809402FC /* 0762C 809402FC 3C010001 */ lui $at, 0x0001 ## $at = 00010000 /* 07630 80940300 34210AFC */ ori $at, $at, 0x0AFC ## $at = 00010AFC -/* 07634 80940304 02618021 */ addu $s0, $s3, $at +/* 07634 80940304 02618021 */ addu $s0, $s3, $at /* 07638 80940308 02402025 */ or $a0, $s2, $zero ## $a0 = 00000000 -/* 0763C 8094030C 0C24FC71 */ jal func_8093F1C4 +/* 0763C 8094030C 0C24FC71 */ jal func_8093F1C4 /* 07640 80940310 02602825 */ or $a1, $s3, $zero ## $a1 = 00000000 /* 07644 80940314 86480152 */ lh $t0, 0x0152($s2) ## 00000152 /* 07648 80940318 24090001 */ addiu $t1, $zero, 0x0001 ## $t1 = 00000001 /* 0764C 8094031C 240A0001 */ addiu $t2, $zero, 0x0001 ## $t2 = 00000001 -/* 07650 80940320 29010096 */ slti $at, $t0, 0x0096 -/* 07654 80940324 1020000E */ beq $at, $zero, .L80940360 +/* 07650 80940320 29010096 */ slti $at, $t0, 0x0096 +/* 07654 80940324 1020000E */ beq $at, $zero, .L80940360 /* 07658 80940328 240B0006 */ addiu $t3, $zero, 0x0006 ## $t3 = 00000006 /* 0765C 8094032C 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 07660 80940330 00330821 */ addu $at, $at, $s3 +/* 07660 80940330 00330821 */ addu $at, $at, $s3 /* 07664 80940334 A0290AE2 */ sb $t1, 0x0AE2($at) ## 00010AE2 /* 07668 80940338 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 0766C 8094033C 00330821 */ addu $at, $at, $s3 +/* 0766C 8094033C 00330821 */ addu $at, $at, $s3 /* 07670 80940340 3C063DCC */ lui $a2, 0x3DCC ## $a2 = 3DCC0000 /* 07674 80940344 A0200AE1 */ sb $zero, 0x0AE1($at) ## 00010AE1 /* 07678 80940348 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3DCCCCCD /* 0767C 8094034C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000001 /* 07680 80940350 0C01E123 */ jal Math_SmoothDownscaleMaxF - + /* 07684 80940354 3C053F80 */ lui $a1, 0x3F80 ## $a1 = 3F800000 -/* 07688 80940358 10000019 */ beq $zero, $zero, .L809403C0 +/* 07688 80940358 10000019 */ beq $zero, $zero, .L809403C0 /* 0768C 8094035C 00000000 */ nop .L80940360: /* 07690 80940360 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 07694 80940364 00330821 */ addu $at, $at, $s3 +/* 07694 80940364 00330821 */ addu $at, $at, $s3 /* 07698 80940368 A02A0AE2 */ sb $t2, 0x0AE2($at) ## 00010AE2 /* 0769C 8094036C 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 076A0 80940370 00330821 */ addu $at, $at, $s3 +/* 076A0 80940370 00330821 */ addu $at, $at, $s3 /* 076A4 80940374 A02B0AE1 */ sb $t3, 0x0AE1($at) ## 00010AE1 /* 076A8 80940378 86440152 */ lh $a0, 0x0152($s2) ## 00000152 -/* 076AC 8094037C 00042300 */ sll $a0, $a0, 12 -/* 076B0 80940380 00042400 */ sll $a0, $a0, 16 +/* 076AC 8094037C 00042300 */ sll $a0, $a0, 12 +/* 076B0 80940380 00042400 */ sll $a0, $a0, 16 /* 076B4 80940384 0C01DE1C */ jal Math_Sins ## sins? -/* 076B8 80940388 00042403 */ sra $a0, $a0, 16 +/* 076B8 80940388 00042403 */ sra $a0, $a0, 16 /* 076BC 8094038C 3C013E80 */ lui $at, 0x3E80 ## $at = 3E800000 /* 076C0 80940390 44812000 */ mtc1 $at, $f4 ## $f4 = 0.25 /* 076C4 80940394 3C013F40 */ lui $at, 0x3F40 ## $at = 3F400000 /* 076C8 80940398 44813000 */ mtc1 $at, $f6 ## $f6 = 0.75 -/* 076CC 8094039C 46040402 */ mul.s $f16, $f0, $f4 +/* 076CC 8094039C 46040402 */ mul.s $f16, $f0, $f4 /* 076D0 809403A0 3C073DCC */ lui $a3, 0x3DCC ## $a3 = 3DCC0000 /* 076D4 809403A4 34E7CCCD */ ori $a3, $a3, 0xCCCD ## $a3 = 3DCCCCCD /* 076D8 809403A8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000001 /* 076DC 809403AC 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 076E0 809403B0 46068280 */ add.s $f10, $f16, $f6 -/* 076E4 809403B4 44055000 */ mfc1 $a1, $f10 +/* 076E0 809403B0 46068280 */ add.s $f10, $f16, $f6 +/* 076E4 809403B4 44055000 */ mfc1 $a1, $f10 /* 076E8 809403B8 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 076EC 809403BC 00000000 */ nop .L809403C0: /* 076F0 809403C0 3C0D8095 */ lui $t5, %hi(D_8094C848) ## $t5 = 80950000 -/* 076F4 809403C4 8DADC848 */ lw $t5, %lo(D_8094C848)($t5) +/* 076F4 809403C4 8DADC848 */ lw $t5, %lo(D_8094C848)($t5) /* 076F8 809403C8 3C014188 */ lui $at, 0x4188 ## $at = 41880000 /* 076FC 809403CC 44814000 */ mtc1 $at, $f8 ## $f8 = 17.00 /* 07700 809403D0 C5B20028 */ lwc1 $f18, 0x0028($t5) ## 80950028 /* 07704 809403D4 3C063D4C */ lui $a2, 0x3D4C ## $a2 = 3D4C0000 /* 07708 809403D8 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3D4CCCCD -/* 0770C 809403DC 46089100 */ add.s $f4, $f18, $f8 +/* 0770C 809403DC 46089100 */ add.s $f4, $f18, $f8 /* 07710 809403E0 26440610 */ addiu $a0, $s2, 0x0610 ## $a0 = 00000610 /* 07714 809403E4 3C074120 */ lui $a3, 0x4120 ## $a3 = 41200000 -/* 07718 809403E8 44052000 */ mfc1 $a1, $f4 +/* 07718 809403E8 44052000 */ mfc1 $a1, $f4 /* 0771C 809403EC 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 07720 809403F0 00000000 */ nop /* 07724 809403F4 864E0152 */ lh $t6, 0x0152($s2) ## 00000152 /* 07728 809403F8 264406A4 */ addiu $a0, $s2, 0x06A4 ## $a0 = 000006A4 /* 0772C 809403FC 3C0542DC */ lui $a1, 0x42DC ## $a1 = 42DC0000 -/* 07730 80940400 29C10032 */ slti $at, $t6, 0x0032 -/* 07734 80940404 1420002E */ bne $at, $zero, .L809404C0 +/* 07730 80940400 29C10032 */ slti $at, $t6, 0x0032 +/* 07734 80940404 1420002E */ bne $at, $zero, .L809404C0 /* 07738 80940408 3C063D4C */ lui $a2, 0x3D4C ## $a2 = 3D4C0000 /* 0773C 8094040C 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3D4CCCCD /* 07740 80940410 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 07744 80940414 8E4706A0 */ lw $a3, 0x06A0($s2) ## 000006A0 /* 07748 80940418 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 /* 0774C 8094041C 44810000 */ mtc1 $at, $f0 ## $f0 = 1.00 /* 07750 80940420 3C073CCC */ lui $a3, 0x3CCC ## $a3 = 3CCC0000 /* 07754 80940424 34E7CCCD */ ori $a3, $a3, 0xCCCD ## $a3 = 3CCCCCCD -/* 07758 80940428 44050000 */ mfc1 $a1, $f0 -/* 0775C 8094042C 44060000 */ mfc1 $a2, $f0 +/* 07758 80940428 44050000 */ mfc1 $a1, $f0 +/* 0775C 8094042C 44060000 */ mfc1 $a2, $f0 /* 07760 80940430 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 07764 80940434 264406A0 */ addiu $a0, $s2, 0x06A0 ## $a0 = 000006A0 /* 07768 80940438 0C0400A4 */ jal sinf - + /* 0776C 8094043C C64C06AC */ lwc1 $f12, 0x06AC($s2) ## 000006AC /* 07770 80940440 C65006A4 */ lwc1 $f16, 0x06A4($s2) ## 000006A4 /* 07774 80940444 C64C06AC */ lwc1 $f12, 0x06AC($s2) ## 000006AC -/* 07778 80940448 46100182 */ mul.s $f6, $f0, $f16 +/* 07778 80940448 46100182 */ mul.s $f6, $f0, $f16 /* 0777C 8094044C 0C041184 */ jal cosf - + /* 07780 80940450 E6460600 */ swc1 $f6, 0x0600($s2) ## 00000600 /* 07784 80940454 C64A06A4 */ lwc1 $f10, 0x06A4($s2) ## 000006A4 /* 07788 80940458 86420152 */ lh $v0, 0x0152($s2) ## 00000152 -/* 0778C 8094045C 460A0482 */ mul.s $f18, $f0, $f10 -/* 07790 80940460 28410097 */ slti $at, $v0, 0x0097 -/* 07794 80940464 14200016 */ bne $at, $zero, .L809404C0 +/* 0778C 8094045C 460A0482 */ mul.s $f18, $f0, $f10 +/* 07790 80940460 28410097 */ slti $at, $v0, 0x0097 +/* 07794 80940464 14200016 */ bne $at, $zero, .L809404C0 /* 07798 80940468 E6520608 */ swc1 $f18, 0x0608($s2) ## 00000608 /* 0779C 8094046C C64806AC */ lwc1 $f8, 0x06AC($s2) ## 000006AC /* 077A0 80940470 C64406B0 */ lwc1 $f4, 0x06B0($s2) ## 000006B0 -/* 077A4 80940474 28410320 */ slti $at, $v0, 0x0320 +/* 077A4 80940474 28410320 */ slti $at, $v0, 0x0320 /* 077A8 80940478 3C053C75 */ lui $a1, 0x3C75 ## $a1 = 3C750000 -/* 077AC 8094047C 46044400 */ add.s $f16, $f8, $f4 +/* 077AC 8094047C 46044400 */ add.s $f16, $f8, $f4 /* 077B0 80940480 34A5C28F */ ori $a1, $a1, 0xC28F ## $a1 = 3C75C28F /* 077B4 80940484 264406B0 */ addiu $a0, $s2, 0x06B0 ## $a0 = 000006B0 -/* 077B8 80940488 14200009 */ bne $at, $zero, .L809404B0 +/* 077B8 80940488 14200009 */ bne $at, $zero, .L809404B0 /* 077BC 8094048C E65006AC */ swc1 $f16, 0x06AC($s2) ## 000006AC /* 077C0 80940490 3C0738D1 */ lui $a3, 0x38D1 ## $a3 = 38D10000 /* 077C4 80940494 34E7B717 */ ori $a3, $a3, 0xB717 ## $a3 = 38D1B717 /* 077C8 80940498 264406B0 */ addiu $a0, $s2, 0x06B0 ## $a0 = 000006B0 /* 077CC 8094049C 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 /* 077D0 809404A0 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 077D4 809404A4 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 077D8 809404A8 10000005 */ beq $zero, $zero, .L809404C0 +/* 077D8 809404A8 10000005 */ beq $zero, $zero, .L809404C0 /* 077DC 809404AC 00000000 */ nop .L809404B0: /* 077E0 809404B0 3C0738D1 */ lui $a3, 0x38D1 ## $a3 = 38D10000 /* 077E4 809404B4 34E7B717 */ ori $a3, $a3, 0xB717 ## $a3 = 38D1B717 /* 077E8 809404B8 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 077EC 809404BC 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 .L809404C0: /* 077F0 809404C0 3C048095 */ lui $a0, %hi(D_8094C848) ## $a0 = 80950000 -/* 077F4 809404C4 8C84C848 */ lw $a0, %lo(D_8094C848)($a0) +/* 077F4 809404C4 8C84C848 */ lw $a0, %lo(D_8094C848)($a0) /* 077F8 809404C8 3C053C23 */ lui $a1, 0x3C23 ## $a1 = 3C230000 /* 077FC 809404CC 3C063DCC */ lui $a2, 0x3DCC ## $a2 = 3DCC0000 /* 07800 809404D0 3C073A83 */ lui $a3, 0x3A83 ## $a3 = 3A830000 @@ -766,27 +766,27 @@ glabel L809402FC /* 07808 809404D8 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3DCCCCCD /* 0780C 809404DC 34A5D709 */ ori $a1, $a1, 0xD709 ## $a1 = 3C23D709 /* 07810 809404E0 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 07814 809404E4 24840050 */ addiu $a0, $a0, 0x0050 ## $a0 = 80950050 /* 07818 809404E8 3C048095 */ lui $a0, %hi(D_8094C848) ## $a0 = 80950000 -/* 0781C 809404EC 8C84C848 */ lw $a0, %lo(D_8094C848)($a0) +/* 0781C 809404EC 8C84C848 */ lw $a0, %lo(D_8094C848)($a0) /* 07820 809404F0 0C00B58B */ jal Actor_SetScale - + /* 07824 809404F4 8C850050 */ lw $a1, 0x0050($a0) ## 80950050 /* 07828 809404F8 3C0F8095 */ lui $t7, %hi(D_8094C848) ## $t7 = 80950000 -/* 0782C 809404FC 8DEFC848 */ lw $t7, %lo(D_8094C848)($t7) +/* 0782C 809404FC 8DEFC848 */ lw $t7, %lo(D_8094C848)($t7) /* 07830 80940500 3C048095 */ lui $a0, %hi(D_8094C844) ## $a0 = 80950000 -/* 07834 80940504 8C84C844 */ lw $a0, %lo(D_8094C844)($a0) +/* 07834 80940504 8C84C844 */ lw $a0, %lo(D_8094C844)($a0) /* 07838 80940508 0C00B58B */ jal Actor_SetScale - + /* 0783C 8094050C 8DE50050 */ lw $a1, 0x0050($t7) ## 80950050 /* 07840 80940510 864C0152 */ lh $t4, 0x0152($s2) ## 00000152 /* 07844 80940514 02602025 */ or $a0, $s3, $zero ## $a0 = 00000000 /* 07848 80940518 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 0784C 8094051C 298103FC */ slti $at, $t4, 0x03FC -/* 07850 80940520 5420005E */ bnel $at, $zero, .L8094069C +/* 0784C 8094051C 298103FC */ slti $at, $t4, 0x03FC +/* 07850 80940520 5420005E */ bnel $at, $zero, .L8094069C /* 07854 80940524 864505FC */ lh $a1, 0x05FC($s2) ## 000005FC -/* 07858 80940528 0C030129 */ jal func_800C04A4 +/* 07858 80940528 0C030129 */ jal func_800C04A4 /* 0785C 8094052C 26701C24 */ addiu $s0, $s3, 0x1C24 ## $s0 = 00001C24 /* 07860 80940530 26510600 */ addiu $s1, $s2, 0x0600 ## $s1 = 00000600 /* 07864 80940534 8E390000 */ lw $t9, 0x0000($s1) ## 00000600 @@ -809,20 +809,20 @@ glabel L809402FC /* 078A8 80940578 AC4A0054 */ sw $t2, 0x0054($v0) ## 00000054 /* 078AC 8094057C 8E4B0614 */ lw $t3, 0x0614($s2) ## 00000614 /* 078B0 80940580 AC4B0058 */ sw $t3, 0x0058($v0) ## 00000058 -/* 078B4 80940584 0C03022B */ jal func_800C08AC +/* 078B4 80940584 0C03022B */ jal func_800C08AC /* 078B8 80940588 864505FC */ lh $a1, 0x05FC($s2) ## 000005FC /* 078BC 8094058C 240D0004 */ addiu $t5, $zero, 0x0004 ## $t5 = 00000004 /* 078C0 80940590 A64D05FA */ sh $t5, 0x05FA($s2) ## 000005FA /* 078C4 80940594 A64005FC */ sh $zero, 0x05FC($s2) ## 000005FC /* 078C8 80940598 02602025 */ or $a0, $s3, $zero ## $a0 = 00000000 -/* 078CC 8094059C 0C01914D */ jal func_80064534 +/* 078CC 8094059C 0C01914D */ jal func_80064534 /* 078D0 809405A0 26651D64 */ addiu $a1, $s3, 0x1D64 ## $a1 = 00001D64 /* 078D4 809405A4 02602025 */ or $a0, $s3, $zero ## $a0 = 00000000 /* 078D8 809405A8 02402825 */ or $a1, $s2, $zero ## $a1 = 00000000 -/* 078DC 809405AC 0C00B7D5 */ jal func_8002DF54 +/* 078DC 809405AC 0C00B7D5 */ jal func_8002DF54 /* 078E0 809405B0 24060007 */ addiu $a2, $zero, 0x0007 ## $a2 = 00000007 /* 078E4 809405B4 0C03E803 */ jal Audio_SetBGM - + /* 078E8 809405B8 24040021 */ addiu $a0, $zero, 0x0021 ## $a0 = 00000021 /* 078EC 809405BC 3C014416 */ lui $at, 0x4416 ## $at = 44160000 /* 078F0 809405C0 44813000 */ mtc1 $at, $f6 ## $f6 = 600.00 @@ -830,19 +830,19 @@ glabel L809402FC /* 078F8 809405C8 44815000 */ mtc1 $at, $f10 ## $f10 = 230.00 /* 078FC 809405CC 44809000 */ mtc1 $zero, $f18 ## $f18 = 0.00 /* 07900 809405D0 240EFFFF */ addiu $t6, $zero, 0xFFFF ## $t6 = FFFFFFFF -/* 07904 809405D4 AFAE0028 */ sw $t6, 0x0028($sp) +/* 07904 809405D4 AFAE0028 */ sw $t6, 0x0028($sp) /* 07908 809405D8 02002025 */ or $a0, $s0, $zero ## $a0 = 00001C24 /* 0790C 809405DC 02402825 */ or $a1, $s2, $zero ## $a1 = 00000000 /* 07910 809405E0 02603025 */ or $a2, $s3, $zero ## $a2 = 00000000 /* 07914 809405E4 2407005D */ addiu $a3, $zero, 0x005D ## $a3 = 0000005D -/* 07918 809405E8 AFA0001C */ sw $zero, 0x001C($sp) -/* 0791C 809405EC AFA00020 */ sw $zero, 0x0020($sp) -/* 07920 809405F0 AFA00024 */ sw $zero, 0x0024($sp) -/* 07924 809405F4 E7A60010 */ swc1 $f6, 0x0010($sp) -/* 07928 809405F8 E7AA0014 */ swc1 $f10, 0x0014($sp) +/* 07918 809405E8 AFA0001C */ sw $zero, 0x001C($sp) +/* 0791C 809405EC AFA00020 */ sw $zero, 0x0020($sp) +/* 07920 809405F0 AFA00024 */ sw $zero, 0x0024($sp) +/* 07924 809405F4 E7A60010 */ swc1 $f6, 0x0010($sp) +/* 07928 809405F8 E7AA0014 */ swc1 $f10, 0x0014($sp) /* 0792C 809405FC 0C00C916 */ jal Actor_SpawnAttached - -/* 07930 80940600 E7B20018 */ swc1 $f18, 0x0018($sp) + +/* 07930 80940600 E7B20018 */ swc1 $f18, 0x0018($sp) /* 07934 80940604 3C014366 */ lui $at, 0x4366 ## $at = 43660000 /* 07938 80940608 44814000 */ mtc1 $at, $f8 ## $f8 = 230.00 /* 0793C 8094060C 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 @@ -850,14 +850,14 @@ glabel L809402FC /* 07944 80940614 02602825 */ or $a1, $s3, $zero ## $a1 = 00000000 /* 07948 80940618 2406005F */ addiu $a2, $zero, 0x005F ## $a2 = 0000005F /* 0794C 8094061C 3C07C416 */ lui $a3, 0xC416 ## $a3 = C4160000 -/* 07950 80940620 AFA00018 */ sw $zero, 0x0018($sp) -/* 07954 80940624 AFA0001C */ sw $zero, 0x001C($sp) -/* 07958 80940628 AFA00020 */ sw $zero, 0x0020($sp) -/* 0795C 8094062C AFA00024 */ sw $zero, 0x0024($sp) -/* 07960 80940630 E7A80010 */ swc1 $f8, 0x0010($sp) +/* 07950 80940620 AFA00018 */ sw $zero, 0x0018($sp) +/* 07954 80940624 AFA0001C */ sw $zero, 0x001C($sp) +/* 07958 80940628 AFA00020 */ sw $zero, 0x0020($sp) +/* 0795C 8094062C AFA00024 */ sw $zero, 0x0024($sp) +/* 07960 80940630 E7A80010 */ swc1 $f8, 0x0010($sp) /* 07964 80940634 0C00C7D4 */ jal Actor_Spawn ## ActorSpawn -/* 07968 80940638 E7A40014 */ swc1 $f4, 0x0014($sp) +/* 07968 80940638 E7A40014 */ swc1 $f4, 0x0014($sp) /* 0796C 8094063C 3C01C4FA */ lui $at, 0xC4FA ## $at = C4FA0000 /* 07970 80940640 44818000 */ mtc1 $at, $f16 ## $f16 = -2000.00 /* 07974 80940644 44803000 */ mtc1 $zero, $f6 ## $f6 = 0.00 @@ -870,36 +870,36 @@ glabel L809402FC /* 07990 80940660 3C050001 */ lui $a1, 0x0001 ## $a1 = 00010000 /* 07994 80940664 A1E00564 */ sb $zero, 0x0564($t7) ## 00000564 /* 07998 80940668 8C6C0000 */ lw $t4, 0x0000($v1) ## 8094C844 -/* 0799C 8094066C 8F39C848 */ lw $t9, %lo(D_8094C848)($t9) -/* 079A0 80940670 00B32821 */ addu $a1, $a1, $s3 +/* 0799C 8094066C 8F39C848 */ lw $t9, %lo(D_8094C848)($t9) +/* 079A0 80940670 00B32821 */ addu $a1, $a1, $s3 /* 079A4 80940674 91980564 */ lbu $t8, 0x0564($t4) ## 00000564 /* 079A8 80940678 02602025 */ or $a0, $s3, $zero ## $a0 = 00000000 /* 079AC 8094067C A3380564 */ sb $t8, 0x0564($t9) ## 80950564 /* 079B0 80940680 0C00B33C */ jal Flags_SetClear - + /* 079B4 80940684 80A51CBC */ lb $a1, 0x1CBC($a1) ## 00011CBC -/* 079B8 80940688 10000004 */ beq $zero, $zero, .L8094069C +/* 079B8 80940688 10000004 */ beq $zero, $zero, .L8094069C /* 079BC 8094068C 864505FC */ lh $a1, 0x05FC($s2) ## 000005FC glabel L80940690 /* 079C0 80940690 3C018095 */ lui $at, %hi(D_8094C840) ## $at = 80950000 -/* 079C4 80940694 A020C840 */ sb $zero, %lo(D_8094C840)($at) +/* 079C4 80940694 A020C840 */ sb $zero, %lo(D_8094C840)($at) .L80940698: /* 079C8 80940698 864505FC */ lh $a1, 0x05FC($s2) ## 000005FC .L8094069C: /* 079CC 8094069C 26470600 */ addiu $a3, $s2, 0x0600 ## $a3 = 00000600 /* 079D0 809406A0 2646060C */ addiu $a2, $s2, 0x060C ## $a2 = 0000060C -/* 079D4 809406A4 50A00004 */ beql $a1, $zero, .L809406B8 -/* 079D8 809406A8 8FBF004C */ lw $ra, 0x004C($sp) -/* 079DC 809406AC 0C030136 */ jal func_800C04D8 +/* 079D4 809406A4 50A00004 */ beql $a1, $zero, .L809406B8 +/* 079D8 809406A8 8FBF004C */ lw $ra, 0x004C($sp) +/* 079DC 809406AC 0C030136 */ jal func_800C04D8 /* 079E0 809406B0 02602025 */ or $a0, $s3, $zero ## $a0 = 00000000 -/* 079E4 809406B4 8FBF004C */ lw $ra, 0x004C($sp) +/* 079E4 809406B4 8FBF004C */ lw $ra, 0x004C($sp) .L809406B8: -/* 079E8 809406B8 D7B40030 */ ldc1 $f20, 0x0030($sp) -/* 079EC 809406BC 8FB0003C */ lw $s0, 0x003C($sp) -/* 079F0 809406C0 8FB10040 */ lw $s1, 0x0040($sp) -/* 079F4 809406C4 8FB20044 */ lw $s2, 0x0044($sp) -/* 079F8 809406C8 8FB30048 */ lw $s3, 0x0048($sp) -/* 079FC 809406CC 03E00008 */ jr $ra +/* 079E8 809406B8 D7B40030 */ ldc1 $f20, 0x0030($sp) +/* 079EC 809406BC 8FB0003C */ lw $s0, 0x003C($sp) +/* 079F0 809406C0 8FB10040 */ lw $s1, 0x0040($sp) +/* 079F4 809406C4 8FB20044 */ lw $s2, 0x0044($sp) +/* 079F8 809406C8 8FB30048 */ lw $s3, 0x0048($sp) +/* 079FC 809406CC 03E00008 */ jr $ra /* 07A00 809406D0 27BD00E0 */ addiu $sp, $sp, 0x00E0 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80941788.s b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80941788.s index 8be6781ee3..85927422e9 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80941788.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80941788.s @@ -12,7 +12,7 @@ glabel func_80941788 /* 08AE0 809417B0 24C6AA88 */ addiu $a2, $a2, %lo(D_8094AA88) ## $a2 = 8094AA88 /* 08AE4 809417B4 27A40058 */ addiu $a0, $sp, 0x0058 ## $a0 = FFFFFFE8 /* 08AE8 809417B8 24071818 */ addiu $a3, $zero, 0x1818 ## $a3 = 00001818 -/* 08AEC 809417BC 0C031AB1 */ jal func_800C6AC4 +/* 08AEC 809417BC 0C031AB1 */ jal Graph_OpenDisps /* 08AF0 809417C0 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 /* 08AF4 809417C4 2401000E */ addiu $at, $zero, 0x000E ## $at = 0000000E /* 08AF8 809417C8 1221004C */ beq $s1, $at, .L809418FC @@ -267,7 +267,7 @@ glabel func_80941788 /* 08EC8 80941B98 24C6AAB8 */ addiu $a2, $a2, %lo(D_8094AAB8) ## $a2 = 8094AAB8 /* 08ECC 80941B9C 27A40058 */ addiu $a0, $sp, 0x0058 ## $a0 = FFFFFFE8 /* 08ED0 80941BA0 2407185C */ addiu $a3, $zero, 0x185C ## $a3 = 0000185C -/* 08ED4 80941BA4 0C031AD5 */ jal func_800C6B54 +/* 08ED4 80941BA4 0C031AD5 */ jal Graph_CloseDisps /* 08ED8 80941BA8 8D450000 */ lw $a1, 0x0000($t2) ## 00000008 /* 08EDC 80941BAC 8FBF001C */ lw $ra, 0x001C($sp) /* 08EE0 80941BB0 8FB00014 */ lw $s0, 0x0014($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80941BC0.s b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80941BC0.s index 0ee7b7c8c1..8534d05b82 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80941BC0.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80941BC0.s @@ -9,7 +9,7 @@ glabel func_80941BC0 /* 08F0C 80941BDC 24C6AAC8 */ addiu $a2, $a2, %lo(D_8094AAC8) ## $a2 = 8094AAC8 /* 08F10 80941BE0 27A40088 */ addiu $a0, $sp, 0x0088 ## $a0 = FFFFFFE8 /* 08F14 80941BE4 240718C5 */ addiu $a3, $zero, 0x18C5 ## $a3 = 000018C5 -/* 08F18 80941BE8 0C031AB1 */ jal func_800C6AC4 +/* 08F18 80941BE8 0C031AB1 */ jal Graph_OpenDisps /* 08F1C 80941BEC 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 /* 08F20 80941BF0 0C034213 */ jal Matrix_Push /* 08F24 80941BF4 00000000 */ nop @@ -207,7 +207,7 @@ glabel func_80941BC0 /* 0920C 80941EDC AFAB0020 */ sw $t3, 0x0020($sp) /* 09210 80941EE0 AFAD0028 */ sw $t5, 0x0028($sp) /* 09214 80941EE4 AFA3006C */ sw $v1, 0x006C($sp) -/* 09218 80941EE8 0C0253D0 */ jal Draw_TwoTexScroll +/* 09218 80941EE8 0C0253D0 */ jal Gfx_TwoTexScroll /* 0921C 80941EEC AFAC0024 */ sw $t4, 0x0024($sp) /* 09220 80941EF0 8FA3006C */ lw $v1, 0x006C($sp) /* 09224 80941EF4 0C034213 */ jal Matrix_Push @@ -296,7 +296,7 @@ glabel func_80941BC0 /* 09370 80942040 AFAE0014 */ sw $t6, 0x0014($sp) /* 09374 80942044 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 09378 80942048 AFA2005C */ sw $v0, 0x005C($sp) -/* 0937C 8094204C 0C0253D0 */ jal Draw_TwoTexScroll +/* 0937C 8094204C 0C0253D0 */ jal Gfx_TwoTexScroll /* 09380 80942050 3066007F */ andi $a2, $v1, 0x007F ## $a2 = 00000000 /* 09384 80942054 8FA8005C */ lw $t0, 0x005C($sp) /* 09388 80942058 3C0FFA00 */ lui $t7, 0xFA00 ## $t7 = FA000000 @@ -366,7 +366,7 @@ glabel func_80941BC0 /* 09488 80942158 24C6AB08 */ addiu $a2, $a2, %lo(D_8094AB08) ## $a2 = 8094AB08 /* 0948C 8094215C 27A40088 */ addiu $a0, $sp, 0x0088 ## $a0 = FFFFFFE8 /* 09490 80942160 2407193D */ addiu $a3, $zero, 0x193D ## $a3 = 0000193D -/* 09494 80942164 0C031AD5 */ jal func_800C6B54 +/* 09494 80942164 0C031AD5 */ jal Graph_CloseDisps /* 09498 80942168 8DA50000 */ lw $a1, 0x0000($t5) ## 00000000 /* 0949C 8094216C 8FBF003C */ lw $ra, 0x003C($sp) /* 094A0 80942170 8FB00038 */ lw $s0, 0x0038($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80942180.s b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80942180.s index 0a63a93fb3..da9220db30 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80942180.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80942180.s @@ -9,7 +9,7 @@ glabel func_80942180 /* 094CC 8094219C 24C6AB18 */ addiu $a2, $a2, %lo(D_8094AB18) ## $a2 = 8094AB18 /* 094D0 809421A0 27A40090 */ addiu $a0, $sp, 0x0090 ## $a0 = FFFFFFE8 /* 094D4 809421A4 24071944 */ addiu $a3, $zero, 0x1944 ## $a3 = 00001944 -/* 094D8 809421A8 0C031AB1 */ jal func_800C6AC4 +/* 094D8 809421A8 0C031AB1 */ jal Graph_OpenDisps /* 094DC 809421AC 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 /* 094E0 809421B0 0C034213 */ jal Matrix_Push /* 094E4 809421B4 00000000 */ nop @@ -56,7 +56,7 @@ glabel func_80942180 /* 09588 80942258 AFA00020 */ sw $zero, 0x0020($sp) /* 0958C 8094225C 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 09590 80942260 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 09594 80942264 0C0253D0 */ jal Draw_TwoTexScroll +/* 09594 80942264 0C0253D0 */ jal Gfx_TwoTexScroll /* 09598 80942268 AFA2008C */ sw $v0, 0x008C($sp) /* 0959C 8094226C 8FA8008C */ lw $t0, 0x008C($sp) /* 095A0 80942270 3C0BDA38 */ lui $t3, 0xDA38 ## $t3 = DA380000 @@ -175,7 +175,7 @@ glabel func_80942180 /* 09764 80942434 AFB80010 */ sw $t8, 0x0010($sp) /* 09768 80942438 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 0976C 8094243C AFA20070 */ sw $v0, 0x0070($sp) -/* 09770 80942440 0C0253D0 */ jal Draw_TwoTexScroll +/* 09770 80942440 0C0253D0 */ jal Gfx_TwoTexScroll /* 09774 80942444 3066007F */ andi $a2, $v1, 0x007F ## $a2 = 00000000 /* 09778 80942448 8FA80070 */ lw $t0, 0x0070($sp) /* 0977C 8094244C 3C0FFA00 */ lui $t7, 0xFA00 ## $t7 = FA000000 @@ -258,7 +258,7 @@ glabel func_80942180 /* 098B0 80942580 AFAA0024 */ sw $t2, 0x0024($sp) /* 098B4 80942584 AFAB0028 */ sw $t3, 0x0028($sp) /* 098B8 80942588 AFA0001C */ sw $zero, 0x001C($sp) -/* 098BC 8094258C 0C0253D0 */ jal Draw_TwoTexScroll +/* 098BC 8094258C 0C0253D0 */ jal Gfx_TwoTexScroll /* 098C0 80942590 AFA2005C */ sw $v0, 0x005C($sp) /* 098C4 80942594 8FA8005C */ lw $t0, 0x005C($sp) /* 098C8 80942598 3C0DFA00 */ lui $t5, 0xFA00 ## $t5 = FA000000 @@ -340,7 +340,7 @@ glabel func_80942180 /* 099F8 809426C8 24C6AB58 */ addiu $a2, $a2, %lo(D_8094AB58) ## $a2 = 8094AB58 /* 099FC 809426CC 27A40090 */ addiu $a0, $sp, 0x0090 ## $a0 = FFFFFFE8 /* 09A00 809426D0 240719B3 */ addiu $a3, $zero, 0x19B3 ## $a3 = 000019B3 -/* 09A04 809426D4 0C031AD5 */ jal func_800C6B54 +/* 09A04 809426D4 0C031AD5 */ jal Graph_CloseDisps /* 09A08 809426D8 8D850000 */ lw $a1, 0x0000($t4) ## 00000000 /* 09A0C 809426DC 8FBF003C */ lw $ra, 0x003C($sp) /* 09A10 809426E0 8FB00038 */ lw $s0, 0x0038($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_809426F0.s b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_809426F0.s index a4c3041260..efdb7b6fb7 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_809426F0.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_809426F0.s @@ -15,7 +15,7 @@ glabel func_809426F0 /* 09A54 80942724 24C6AB68 */ addiu $a2, $a2, %lo(D_8094AB68) ## $a2 = 8094AB68 /* 09A58 80942728 27A400A4 */ addiu $a0, $sp, 0x00A4 ## $a0 = FFFFFFE4 /* 09A5C 8094272C 240719BB */ addiu $a3, $zero, 0x19BB ## $a3 = 000019BB -/* 09A60 80942730 0C031AB1 */ jal func_800C6AC4 +/* 09A60 80942730 0C031AB1 */ jal Graph_OpenDisps /* 09A64 80942734 00A09025 */ or $s2, $a1, $zero ## $s2 = 00000000 /* 09A68 80942738 8E4202D0 */ lw $v0, 0x02D0($s2) ## 000002D0 /* 09A6C 8094273C 3C0FDB06 */ lui $t7, 0xDB06 ## $t7 = DB060000 @@ -44,7 +44,7 @@ glabel func_809426F0 /* 09AC8 80942798 AFA0001C */ sw $zero, 0x001C($sp) /* 09ACC 8094279C 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 09AD0 809427A0 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 09AD4 809427A4 0C0253D0 */ jal Draw_TwoTexScroll +/* 09AD4 809427A4 0C0253D0 */ jal Gfx_TwoTexScroll /* 09AD8 809427A8 00408025 */ or $s0, $v0, $zero ## $s0 = 00000000 /* 09ADC 809427AC 0C034213 */ jal Matrix_Push /* 09AE0 809427B0 AE020004 */ sw $v0, 0x0004($s0) ## 00000004 @@ -298,7 +298,7 @@ glabel func_809426F0 /* 09EAC 80942B7C AFA00020 */ sw $zero, 0x0020($sp) /* 09EB0 80942B80 AFA0001C */ sw $zero, 0x001C($sp) /* 09EB4 80942B84 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 09EB8 80942B88 0C0253D0 */ jal Draw_TwoTexScroll +/* 09EB8 80942B88 0C0253D0 */ jal Gfx_TwoTexScroll /* 09EBC 80942B8C 00408025 */ or $s0, $v0, $zero ## $s0 = 00000000 /* 09EC0 80942B90 4406A000 */ mfc1 $a2, $f20 /* 09EC4 80942B94 AE020004 */ sw $v0, 0x0004($s0) ## 00000004 @@ -344,7 +344,7 @@ glabel func_809426F0 /* 09F64 80942C34 24C6AB98 */ addiu $a2, $a2, %lo(D_8094AB98) ## $a2 = 8094AB98 /* 09F68 80942C38 27A400A4 */ addiu $a0, $sp, 0x00A4 ## $a0 = FFFFFFE4 /* 09F6C 80942C3C 8E850000 */ lw $a1, 0x0000($s4) ## 00000000 -/* 09F70 80942C40 0C031AD5 */ jal func_800C6B54 +/* 09F70 80942C40 0C031AD5 */ jal Graph_CloseDisps /* 09F74 80942C44 24071A64 */ addiu $a3, $zero, 0x1A64 ## $a3 = 00001A64 /* 09F78 80942C48 8FBF005C */ lw $ra, 0x005C($sp) /* 09F7C 80942C4C D7B40038 */ ldc1 $f20, 0x0038($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80942C70.s b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80942C70.s index 1256866dbd..10a9703275 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80942C70.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80942C70.s @@ -10,7 +10,7 @@ glabel func_80942C70 /* 09FC0 80942C90 24C6ABA8 */ addiu $a2, $a2, %lo(D_8094ABA8) ## $a2 = 8094ABA8 /* 09FC4 80942C94 27A4005C */ addiu $a0, $sp, 0x005C ## $a0 = FFFFFFE4 /* 09FC8 80942C98 24071A6D */ addiu $a3, $zero, 0x1A6D ## $a3 = 00001A6D -/* 09FCC 80942C9C 0C031AB1 */ jal func_800C6AC4 +/* 09FCC 80942C9C 0C031AB1 */ jal Graph_OpenDisps /* 09FD0 80942CA0 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 /* 09FD4 80942CA4 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 /* 09FD8 80942CA8 C606052C */ lwc1 $f6, 0x052C($s0) ## 0000052C @@ -37,7 +37,7 @@ glabel func_80942C70 /* 0A02C 80942CFC 30C600FF */ andi $a2, $a2, 0x00FF ## $a2 = 00000000 /* 0A030 80942D00 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 0A034 80942D04 24070020 */ addiu $a3, $zero, 0x0020 ## $a3 = 00000020 -/* 0A038 80942D08 0C0253A7 */ jal Draw_TexScroll +/* 0A038 80942D08 0C0253A7 */ jal Gfx_TexScroll /* 0A03C 80942D0C AFA20058 */ sw $v0, 0x0058($sp) /* 0A040 80942D10 8FA30058 */ lw $v1, 0x0058($sp) /* 0A044 80942D14 3C0142C8 */ lui $at, 0x42C8 ## $at = 42C80000 @@ -234,7 +234,7 @@ glabel func_80942C70 /* 0A330 80943000 24C6ABD8 */ addiu $a2, $a2, %lo(D_8094ABD8) ## $a2 = 8094ABD8 /* 0A334 80943004 27A4005C */ addiu $a0, $sp, 0x005C ## $a0 = FFFFFFE4 /* 0A338 80943008 24071ADE */ addiu $a3, $zero, 0x1ADE ## $a3 = 00001ADE -/* 0A33C 8094300C 0C031AD5 */ jal func_800C6B54 +/* 0A33C 8094300C 0C031AD5 */ jal Graph_CloseDisps /* 0A340 80943010 8D850000 */ lw $a1, 0x0000($t4) ## 00000000 /* 0A344 80943014 8FBF0024 */ lw $ra, 0x0024($sp) /* 0A348 80943018 8FB0001C */ lw $s0, 0x001C($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80943028.s b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80943028.s index 0327a34865..42ab2a0227 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80943028.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80943028.s @@ -10,7 +10,7 @@ glabel func_80943028 /* 0A378 80943048 24C6ABE8 */ addiu $a2, $a2, %lo(D_8094ABE8) ## $a2 = 8094ABE8 /* 0A37C 8094304C 27A40040 */ addiu $a0, $sp, 0x0040 ## $a0 = FFFFFFE8 /* 0A380 80943050 24071AE5 */ addiu $a3, $zero, 0x1AE5 ## $a3 = 00001AE5 -/* 0A384 80943054 0C031AB1 */ jal func_800C6AC4 +/* 0A384 80943054 0C031AB1 */ jal Graph_OpenDisps /* 0A388 80943058 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 /* 0A38C 8094305C 0C034213 */ jal Matrix_Push /* 0A390 80943060 00000000 */ nop @@ -139,7 +139,7 @@ glabel func_80943028 /* 0A57C 8094324C 24C6AC18 */ addiu $a2, $a2, %lo(D_8094AC18) ## $a2 = 8094AC18 /* 0A580 80943250 27A40040 */ addiu $a0, $sp, 0x0040 ## $a0 = FFFFFFE8 /* 0A584 80943254 24071B15 */ addiu $a3, $zero, 0x1B15 ## $a3 = 00001B15 -/* 0A588 80943258 0C031AD5 */ jal func_800C6B54 +/* 0A588 80943258 0C031AD5 */ jal Graph_CloseDisps /* 0A58C 8094325C 8F050000 */ lw $a1, 0x0000($t8) ## 00000000 /* 0A590 80943260 8FBF001C */ lw $ra, 0x001C($sp) /* 0A594 80943264 8FB00014 */ lw $s0, 0x0014($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80943950.s b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80943950.s index 4d45565f4c..dfef6178ac 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80943950.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80943950.s @@ -10,7 +10,7 @@ glabel func_80943950 /* 0ACA0 80943970 24C6AC48 */ addiu $a2, $a2, %lo(D_8094AC48) ## $a2 = 8094AC48 /* 0ACA4 80943974 27A40060 */ addiu $a0, $sp, 0x0060 ## $a0 = FFFFFFE8 /* 0ACA8 80943978 24071BE3 */ addiu $a3, $zero, 0x1BE3 ## $a3 = 00001BE3 -/* 0ACAC 8094397C 0C031AB1 */ jal func_800C6AC4 +/* 0ACAC 8094397C 0C031AB1 */ jal Graph_OpenDisps /* 0ACB0 80943980 AFA50070 */ sw $a1, 0x0070($sp) /* 0ACB4 80943984 8FAF007C */ lw $t7, 0x007C($sp) /* 0ACB8 80943988 8FA80070 */ lw $t0, 0x0070($sp) @@ -48,7 +48,7 @@ glabel L809439B8 /* 0AD34 80943A04 44064000 */ mfc1 $a2, $f8 /* 0AD38 80943A08 00000000 */ nop /* 0AD3C 80943A0C 00063400 */ sll $a2, $a2, 16 -/* 0AD40 80943A10 0C0253A7 */ jal Draw_TexScroll +/* 0AD40 80943A10 0C0253A7 */ jal Gfx_TexScroll /* 0AD44 80943A14 00063403 */ sra $a2, $a2, 16 /* 0AD48 80943A18 8FA3005C */ lw $v1, 0x005C($sp) /* 0AD4C 80943A1C 8FA80070 */ lw $t0, 0x0070($sp) @@ -140,7 +140,7 @@ glabel L80943B0C /* 0AEA0 80943B70 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 0AEA4 80943B74 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 /* 0AEA8 80943B78 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 0AEAC 80943B7C 0C0253D0 */ jal Draw_TwoTexScroll +/* 0AEAC 80943B7C 0C0253D0 */ jal Gfx_TwoTexScroll /* 0AEB0 80943B80 AFA2004C */ sw $v0, 0x004C($sp) /* 0AEB4 80943B84 8FA3004C */ lw $v1, 0x004C($sp) /* 0AEB8 80943B88 8FAA0080 */ lw $t2, 0x0080($sp) @@ -176,7 +176,7 @@ glabel L80943B94 /* 0AF2C 80943BFC 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 0AF30 80943C00 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 /* 0AF34 80943C04 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 0AF38 80943C08 0C0253D0 */ jal Draw_TwoTexScroll +/* 0AF38 80943C08 0C0253D0 */ jal Gfx_TwoTexScroll /* 0AF3C 80943C0C AFA20048 */ sw $v0, 0x0048($sp) /* 0AF40 80943C10 8FA30048 */ lw $v1, 0x0048($sp) /* 0AF44 80943C14 8FAA0080 */ lw $t2, 0x0080($sp) @@ -211,7 +211,7 @@ glabel L80943C20 /* 0AFB4 80943C84 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 /* 0AFB8 80943C88 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 /* 0AFBC 80943C8C AFA20044 */ sw $v0, 0x0044($sp) -/* 0AFC0 80943C90 0C0253D0 */ jal Draw_TwoTexScroll +/* 0AFC0 80943C90 0C0253D0 */ jal Gfx_TwoTexScroll /* 0AFC4 80943C94 AFA3001C */ sw $v1, 0x001C($sp) /* 0AFC8 80943C98 8FA90044 */ lw $t1, 0x0044($sp) /* 0AFCC 80943C9C 8FAA0080 */ lw $t2, 0x0080($sp) @@ -233,7 +233,7 @@ glabel L80943CA8 /* 0B008 80943CD8 AFAD0010 */ sw $t5, 0x0010($sp) /* 0B00C 80943CDC 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 0B010 80943CE0 24070020 */ addiu $a3, $zero, 0x0020 ## $a3 = 00000020 -/* 0B014 80943CE4 0C0253A7 */ jal Draw_TexScroll +/* 0B014 80943CE4 0C0253A7 */ jal Gfx_TexScroll /* 0B018 80943CE8 AFA20040 */ sw $v0, 0x0040($sp) /* 0B01C 80943CEC 8FA30040 */ lw $v1, 0x0040($sp) /* 0B020 80943CF0 8FAA0080 */ lw $t2, 0x0080($sp) @@ -277,7 +277,7 @@ glabel L80943D38 /* 0B09C 80943D6C 8FAF0078 */ lw $t7, 0x0078($sp) .L80943D70: /* 0B0A0 80943D70 24071C53 */ addiu $a3, $zero, 0x1C53 ## $a3 = 00001C53 -/* 0B0A4 80943D74 0C031AD5 */ jal func_800C6B54 +/* 0B0A4 80943D74 0C031AD5 */ jal Graph_CloseDisps /* 0B0A8 80943D78 8DE50000 */ lw $a1, 0x0000($t7) ## 0602D940 /* 0B0AC 80943D7C 8FBF0034 */ lw $ra, 0x0034($sp) /* 0B0B0 80943D80 27BD0078 */ addiu $sp, $sp, 0x0078 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80943D90.s b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80943D90.s index a2ee065867..c5a78d115e 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80943D90.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80943D90.s @@ -10,7 +10,7 @@ glabel func_80943D90 /* 0B0E0 80943DB0 24C6AC68 */ addiu $a2, $a2, %lo(D_8094AC68) ## $a2 = 8094AC68 /* 0B0E4 80943DB4 27A40028 */ addiu $a0, $sp, 0x0028 ## $a0 = FFFFFFE8 /* 0B0E8 80943DB8 24071C5E */ addiu $a3, $zero, 0x1C5E ## $a3 = 00001C5E -/* 0B0EC 80943DBC 0C031AB1 */ jal func_800C6AC4 +/* 0B0EC 80943DBC 0C031AB1 */ jal Graph_OpenDisps /* 0B0F0 80943DC0 AFA50038 */ sw $a1, 0x0038($sp) /* 0B0F4 80943DC4 8FAF0044 */ lw $t7, 0x0044($sp) /* 0B0F8 80943DC8 25F8FFF1 */ addiu $t8, $t7, 0xFFF1 ## $t8 = FFFFFFF1 @@ -94,7 +94,7 @@ glabel L80943EDC /* 0B214 80943EE4 24C6AC88 */ addiu $a2, $a2, %lo(D_8094AC88) ## $a2 = 8094AC88 /* 0B218 80943EE8 27A40028 */ addiu $a0, $sp, 0x0028 ## $a0 = FFFFFFE8 /* 0B21C 80943EEC 24071C85 */ addiu $a3, $zero, 0x1C85 ## $a3 = 00001C85 -/* 0B220 80943EF0 0C031AD5 */ jal func_800C6B54 +/* 0B220 80943EF0 0C031AD5 */ jal Graph_CloseDisps /* 0B224 80943EF4 8F050000 */ lw $a1, 0x0000($t8) ## 00000000 /* 0B228 80943EF8 8FBF0014 */ lw $ra, 0x0014($sp) /* 0B22C 80943EFC 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80943F08.s b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80943F08.s index 6a4c766747..701edff5c9 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80943F08.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80943F08.s @@ -11,7 +11,7 @@ glabel func_80943F08 /* 0B25C 80943F2C 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 /* 0B260 80943F30 27A40098 */ addiu $a0, $sp, 0x0098 ## $a0 = FFFFFFE0 /* 0B264 80943F34 24071C8F */ addiu $a3, $zero, 0x1C8F ## $a3 = 00001C8F -/* 0B268 80943F38 0C031AB1 */ jal func_800C6AC4 +/* 0B268 80943F38 0C031AB1 */ jal Graph_OpenDisps /* 0B26C 80943F3C 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 /* 0B270 80943F40 0C034213 */ jal Matrix_Push /* 0B274 80943F44 00000000 */ nop @@ -224,7 +224,7 @@ glabel func_80943F08 /* 0B588 80944258 AFA20088 */ sw $v0, 0x0088($sp) /* 0B58C 8094425C 0000C812 */ mflo $t9 /* 0B590 80944260 AFB9001C */ sw $t9, 0x001C($sp) -/* 0B594 80944264 0C0253D0 */ jal Draw_TwoTexScroll +/* 0B594 80944264 0C0253D0 */ jal Gfx_TwoTexScroll /* 0B598 80944268 00000000 */ nop /* 0B59C 8094426C 8FA90088 */ lw $t1, 0x0088($sp) /* 0B5A0 80944270 3C0DFA00 */ lui $t5, 0xFA00 ## $t5 = FA000000 @@ -323,7 +323,7 @@ glabel func_80943F08 /* 0B710 809443E0 AFA20074 */ sw $v0, 0x0074($sp) /* 0B714 809443E4 00006012 */ mflo $t4 /* 0B718 809443E8 AFAC001C */ sw $t4, 0x001C($sp) -/* 0B71C 809443EC 0C0253D0 */ jal Draw_TwoTexScroll +/* 0B71C 809443EC 0C0253D0 */ jal Gfx_TwoTexScroll /* 0B720 809443F0 00000000 */ nop /* 0B724 809443F4 8FA90074 */ lw $t1, 0x0074($sp) /* 0B728 809443F8 3C18FA00 */ lui $t8, 0xFA00 ## $t8 = FA000000 @@ -542,7 +542,7 @@ glabel func_80943F08 /* 0BA48 80944718 AFA70020 */ sw $a3, 0x0020($sp) /* 0BA4C 8094471C AFAE0024 */ sw $t6, 0x0024($sp) /* 0BA50 80944720 AFA0001C */ sw $zero, 0x001C($sp) -/* 0BA54 80944724 0C0253D0 */ jal Draw_TwoTexScroll +/* 0BA54 80944724 0C0253D0 */ jal Gfx_TwoTexScroll /* 0BA58 80944728 AFA20048 */ sw $v0, 0x0048($sp) /* 0BA5C 8094472C 8FA30048 */ lw $v1, 0x0048($sp) /* 0BA60 80944730 3C040602 */ lui $a0, 0x0602 ## $a0 = 06020000 @@ -574,7 +574,7 @@ glabel func_80943F08 /* 0BAC4 80944794 24C6ACC8 */ addiu $a2, $a2, %lo(D_8094ACC8) ## $a2 = 8094ACC8 /* 0BAC8 80944798 27A40098 */ addiu $a0, $sp, 0x0098 ## $a0 = FFFFFFE0 /* 0BACC 8094479C 24071D6B */ addiu $a3, $zero, 0x1D6B ## $a3 = 00001D6B -/* 0BAD0 809447A0 0C031AD5 */ jal func_800C6B54 +/* 0BAD0 809447A0 0C031AD5 */ jal Graph_CloseDisps /* 0BAD4 809447A4 8D450000 */ lw $a1, 0x0000($t2) ## 00000000 /* 0BAD8 809447A8 8FBF003C */ lw $ra, 0x003C($sp) /* 0BADC 809447AC 8FB00038 */ lw $s0, 0x0038($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_809447BC.s b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_809447BC.s index c217793181..e092df2c84 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_809447BC.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_809447BC.s @@ -9,7 +9,7 @@ glabel func_809447BC /* 0BB08 809447D8 24C6ACD8 */ addiu $a2, $a2, %lo(D_8094ACD8) ## $a2 = 8094ACD8 /* 0BB0C 809447DC 27A40080 */ addiu $a0, $sp, 0x0080 ## $a0 = FFFFFFE8 /* 0BB10 809447E0 24071D7A */ addiu $a3, $zero, 0x1D7A ## $a3 = 00001D7A -/* 0BB14 809447E4 0C031AB1 */ jal func_800C6AC4 +/* 0BB14 809447E4 0C031AB1 */ jal Graph_OpenDisps /* 0BB18 809447E8 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 /* 0BB1C 809447EC 8FAF009C */ lw $t7, 0x009C($sp) /* 0BB20 809447F0 0C024F61 */ jal func_80093D84 @@ -42,7 +42,7 @@ glabel func_809447BC /* 0BB8C 8094485C AFAB0010 */ sw $t3, 0x0010($sp) /* 0BB90 80944860 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 0BB94 80944864 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 0BB98 80944868 0C0253D0 */ jal Draw_TwoTexScroll +/* 0BB98 80944868 0C0253D0 */ jal Gfx_TwoTexScroll /* 0BB9C 8094486C AFA2007C */ sw $v0, 0x007C($sp) /* 0BBA0 80944870 8FA3007C */ lw $v1, 0x007C($sp) /* 0BBA4 80944874 0C034213 */ jal Matrix_Push @@ -285,7 +285,7 @@ glabel func_809447BC /* 0BF58 80944C28 24C6AD28 */ addiu $a2, $a2, %lo(D_8094AD28) ## $a2 = 8094AD28 /* 0BF5C 80944C2C 27A40080 */ addiu $a0, $sp, 0x0080 ## $a0 = FFFFFFE8 /* 0BF60 80944C30 24071DD3 */ addiu $a3, $zero, 0x1DD3 ## $a3 = 00001DD3 -/* 0BF64 80944C34 0C031AD5 */ jal func_800C6B54 +/* 0BF64 80944C34 0C031AD5 */ jal Graph_CloseDisps /* 0BF68 80944C38 8F250000 */ lw $a1, 0x0000($t9) ## 00000000 /* 0BF6C 80944C3C 8FBF003C */ lw $ra, 0x003C($sp) /* 0BF70 80944C40 8FB00038 */ lw $s0, 0x0038($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80944C50.s b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80944C50.s index 6b5b2a084d..2af4f5f35b 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80944C50.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80944C50.s @@ -9,7 +9,7 @@ glabel func_80944C50 /* 0BF9C 80944C6C 24C6AD38 */ addiu $a2, $a2, %lo(D_8094AD38) ## $a2 = 8094AD38 /* 0BFA0 80944C70 27A4006C */ addiu $a0, $sp, 0x006C ## $a0 = FFFFFFE4 /* 0BFA4 80944C74 24071DDD */ addiu $a3, $zero, 0x1DDD ## $a3 = 00001DDD -/* 0BFA8 80944C78 0C031AB1 */ jal func_800C6AC4 +/* 0BFA8 80944C78 0C031AB1 */ jal Graph_OpenDisps /* 0BFAC 80944C7C 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 /* 0BFB0 80944C80 0C034213 */ jal Matrix_Push /* 0BFB4 80944C84 00000000 */ nop @@ -96,7 +96,7 @@ glabel func_80944C50 /* 0C0F8 80944DC8 AFAE0010 */ sw $t6, 0x0010($sp) /* 0C0FC 80944DCC 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 0C100 80944DD0 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 0C104 80944DD4 0C0253D0 */ jal Draw_TwoTexScroll +/* 0C104 80944DD4 0C0253D0 */ jal Gfx_TwoTexScroll /* 0C108 80944DD8 AFA20060 */ sw $v0, 0x0060($sp) /* 0C10C 80944DDC 8FA30060 */ lw $v1, 0x0060($sp) /* 0C110 80944DE0 3C0BFA00 */ lui $t3, 0xFA00 ## $t3 = FA000000 @@ -185,7 +185,7 @@ glabel func_80944C50 /* 0C258 80944F28 AFAD0028 */ sw $t5, 0x0028($sp) /* 0C25C 80944F2C AFA0001C */ sw $zero, 0x001C($sp) /* 0C260 80944F30 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 0C264 80944F34 0C0253D0 */ jal Draw_TwoTexScroll +/* 0C264 80944F34 0C0253D0 */ jal Gfx_TwoTexScroll /* 0C268 80944F38 AFA20050 */ sw $v0, 0x0050($sp) /* 0C26C 80944F3C 8FA80050 */ lw $t0, 0x0050($sp) /* 0C270 80944F40 3C0FFA00 */ lui $t7, 0xFA00 ## $t7 = FA000000 @@ -263,7 +263,7 @@ glabel func_80944C50 /* 0C38C 8094505C 24C6AD78 */ addiu $a2, $a2, %lo(D_8094AD78) ## $a2 = 8094AD78 /* 0C390 80945060 27A4006C */ addiu $a0, $sp, 0x006C ## $a0 = FFFFFFE4 /* 0C394 80945064 24071E34 */ addiu $a3, $zero, 0x1E34 ## $a3 = 00001E34 -/* 0C398 80945068 0C031AD5 */ jal func_800C6B54 +/* 0C398 80945068 0C031AD5 */ jal Graph_CloseDisps /* 0C39C 8094506C 8D250000 */ lw $a1, 0x0000($t1) ## 00000000 /* 0C3A0 80945070 8FBF003C */ lw $ra, 0x003C($sp) /* 0C3A4 80945074 8FB00038 */ lw $s0, 0x0038($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80945084.s b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80945084.s index 1545d22073..bda209c72a 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80945084.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80945084.s @@ -1,41 +1,41 @@ glabel func_80945084 /* 0C3B4 80945084 27BDFFA8 */ addiu $sp, $sp, 0xFFA8 ## $sp = FFFFFFA8 -/* 0C3B8 80945088 AFB1002C */ sw $s1, 0x002C($sp) +/* 0C3B8 80945088 AFB1002C */ sw $s1, 0x002C($sp) /* 0C3BC 8094508C 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 -/* 0C3C0 80945090 AFBF0034 */ sw $ra, 0x0034($sp) -/* 0C3C4 80945094 AFB20030 */ sw $s2, 0x0030($sp) -/* 0C3C8 80945098 AFB00028 */ sw $s0, 0x0028($sp) +/* 0C3C0 80945090 AFBF0034 */ sw $ra, 0x0034($sp) +/* 0C3C4 80945094 AFB20030 */ sw $s2, 0x0030($sp) +/* 0C3C8 80945098 AFB00028 */ sw $s0, 0x0028($sp) /* 0C3CC 8094509C 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 /* 0C3D0 809450A0 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 0C3D4 809450A4 3C068095 */ lui $a2, %hi(D_8094AD88) ## $a2 = 80950000 /* 0C3D8 809450A8 24C6AD88 */ addiu $a2, $a2, %lo(D_8094AD88) ## $a2 = 8094AD88 /* 0C3DC 809450AC 27A4003C */ addiu $a0, $sp, 0x003C ## $a0 = FFFFFFE4 /* 0C3E0 809450B0 24071E44 */ addiu $a3, $zero, 0x1E44 ## $a3 = 00001E44 -/* 0C3E4 809450B4 0C031AB1 */ jal func_800C6AC4 +/* 0C3E4 809450B4 0C031AB1 */ jal Graph_OpenDisps /* 0C3E8 809450B8 00A09025 */ or $s2, $a1, $zero ## $s2 = 00000000 /* 0C3EC 809450BC 920E0564 */ lbu $t6, 0x0564($s0) ## 00000564 -/* 0C3F0 809450C0 11C000A7 */ beq $t6, $zero, .L80945360 +/* 0C3F0 809450C0 11C000A7 */ beq $t6, $zero, .L80945360 /* 0C3F4 809450C4 00000000 */ nop -/* 0C3F8 809450C8 0C024F46 */ jal func_80093D18 +/* 0C3F8 809450C8 0C024F46 */ jal func_80093D18 /* 0C3FC 809450CC 8E240000 */ lw $a0, 0x0000($s1) ## 00000000 -/* 0C400 809450D0 0C024F61 */ jal func_80093D84 +/* 0C400 809450D0 0C024F61 */ jal func_80093D84 /* 0C404 809450D4 8E240000 */ lw $a0, 0x0000($s1) ## 00000000 /* 0C408 809450D8 860F015C */ lh $t7, 0x015C($s0) ## 0000015C /* 0C40C 809450DC 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 /* 0C410 809450E0 31F80002 */ andi $t8, $t7, 0x0002 ## $t8 = 00000000 -/* 0C414 809450E4 5300000E */ beql $t8, $zero, .L80945120 +/* 0C414 809450E4 5300000E */ beql $t8, $zero, .L80945120 /* 0C418 809450E8 4449F800 */ cfc1 $t1, $31 /* 0C41C 809450EC 8E4402C0 */ lw $a0, 0x02C0($s2) ## 000002C0 /* 0C420 809450F0 24190384 */ addiu $t9, $zero, 0x0384 ## $t9 = 00000384 /* 0C424 809450F4 2408044B */ addiu $t0, $zero, 0x044B ## $t0 = 0000044B -/* 0C428 809450F8 AFA80018 */ sw $t0, 0x0018($sp) -/* 0C42C 809450FC AFB90014 */ sw $t9, 0x0014($sp) -/* 0C430 80945100 AFA00010 */ sw $zero, 0x0010($sp) +/* 0C428 809450F8 AFA80018 */ sw $t0, 0x0018($sp) +/* 0C42C 809450FC AFB90014 */ sw $t9, 0x0014($sp) +/* 0C430 80945100 AFA00010 */ sw $zero, 0x0010($sp) /* 0C434 80945104 240500FF */ addiu $a1, $zero, 0x00FF ## $a1 = 000000FF /* 0C438 80945108 24060032 */ addiu $a2, $zero, 0x0032 ## $a2 = 00000032 -/* 0C43C 8094510C 0C024DC2 */ jal func_80093708 +/* 0C43C 8094510C 0C024DC2 */ jal Gfx_SetFog2 /* 0C440 80945110 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 0C444 80945114 10000073 */ beq $zero, $zero, .L809452E4 +/* 0C444 80945114 10000073 */ beq $zero, $zero, .L809452E4 /* 0C448 80945118 AE4202C0 */ sw $v0, 0x02C0($s2) ## 000002C0 /* 0C44C 8094511C 4449F800 */ cfc1 $t1, $31 .L80945120: @@ -43,34 +43,34 @@ glabel func_80945084 /* 0C454 80945124 C60401D4 */ lwc1 $f4, 0x01D4($s0) ## 000001D4 /* 0C458 80945128 8E4402C0 */ lw $a0, 0x02C0($s2) ## 000002C0 /* 0C45C 8094512C 3C014F00 */ lui $at, 0x4F00 ## $at = 4F000000 -/* 0C460 80945130 460021A4 */ cvt.w.s $f6, $f4 +/* 0C460 80945130 460021A4 */ cvt.w.s $f6, $f4 /* 0C464 80945134 4445F800 */ cfc1 $a1, $31 /* 0C468 80945138 00000000 */ nop /* 0C46C 8094513C 30A50078 */ andi $a1, $a1, 0x0078 ## $a1 = 00000000 -/* 0C470 80945140 50A00013 */ beql $a1, $zero, .L80945190 -/* 0C474 80945144 44053000 */ mfc1 $a1, $f6 +/* 0C470 80945140 50A00013 */ beql $a1, $zero, .L80945190 +/* 0C474 80945144 44053000 */ mfc1 $a1, $f6 /* 0C478 80945148 44813000 */ mtc1 $at, $f6 ## $f6 = 2147483648.00 /* 0C47C 8094514C 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 -/* 0C480 80945150 46062181 */ sub.s $f6, $f4, $f6 +/* 0C480 80945150 46062181 */ sub.s $f6, $f4, $f6 /* 0C484 80945154 44C5F800 */ ctc1 $a1, $31 /* 0C488 80945158 00000000 */ nop -/* 0C48C 8094515C 460031A4 */ cvt.w.s $f6, $f6 +/* 0C48C 8094515C 460031A4 */ cvt.w.s $f6, $f6 /* 0C490 80945160 4445F800 */ cfc1 $a1, $31 /* 0C494 80945164 00000000 */ nop /* 0C498 80945168 30A50078 */ andi $a1, $a1, 0x0078 ## $a1 = 00000000 -/* 0C49C 8094516C 14A00005 */ bne $a1, $zero, .L80945184 +/* 0C49C 8094516C 14A00005 */ bne $a1, $zero, .L80945184 /* 0C4A0 80945170 00000000 */ nop -/* 0C4A4 80945174 44053000 */ mfc1 $a1, $f6 +/* 0C4A4 80945174 44053000 */ mfc1 $a1, $f6 /* 0C4A8 80945178 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 0C4AC 8094517C 10000007 */ beq $zero, $zero, .L8094519C +/* 0C4AC 8094517C 10000007 */ beq $zero, $zero, .L8094519C /* 0C4B0 80945180 00A12825 */ or $a1, $a1, $at ## $a1 = 80000000 .L80945184: -/* 0C4B4 80945184 10000005 */ beq $zero, $zero, .L8094519C +/* 0C4B4 80945184 10000005 */ beq $zero, $zero, .L8094519C /* 0C4B8 80945188 2405FFFF */ addiu $a1, $zero, 0xFFFF ## $a1 = FFFFFFFF -/* 0C4BC 8094518C 44053000 */ mfc1 $a1, $f6 +/* 0C4BC 8094518C 44053000 */ mfc1 $a1, $f6 .L80945190: /* 0C4C0 80945190 00000000 */ nop -/* 0C4C4 80945194 04A0FFFB */ bltz $a1, .L80945184 +/* 0C4C4 80945194 04A0FFFB */ bltz $a1, .L80945184 /* 0C4C8 80945198 00000000 */ nop .L8094519C: /* 0C4CC 8094519C 44C9F800 */ ctc1 $t1, $31 @@ -80,34 +80,34 @@ glabel func_80945084 /* 0C4DC 809451AC 444AF800 */ cfc1 $t2, $31 /* 0C4E0 809451B0 44C6F800 */ ctc1 $a2, $31 /* 0C4E4 809451B4 00000000 */ nop -/* 0C4E8 809451B8 460042A4 */ cvt.w.s $f10, $f8 +/* 0C4E8 809451B8 460042A4 */ cvt.w.s $f10, $f8 /* 0C4EC 809451BC 4446F800 */ cfc1 $a2, $31 /* 0C4F0 809451C0 00000000 */ nop /* 0C4F4 809451C4 30C60078 */ andi $a2, $a2, 0x0078 ## $a2 = 00000000 -/* 0C4F8 809451C8 50C00013 */ beql $a2, $zero, .L80945218 -/* 0C4FC 809451CC 44065000 */ mfc1 $a2, $f10 +/* 0C4F8 809451C8 50C00013 */ beql $a2, $zero, .L80945218 +/* 0C4FC 809451CC 44065000 */ mfc1 $a2, $f10 /* 0C500 809451D0 44815000 */ mtc1 $at, $f10 ## $f10 = 2147483648.00 /* 0C504 809451D4 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 -/* 0C508 809451D8 460A4281 */ sub.s $f10, $f8, $f10 +/* 0C508 809451D8 460A4281 */ sub.s $f10, $f8, $f10 /* 0C50C 809451DC 44C6F800 */ ctc1 $a2, $31 /* 0C510 809451E0 00000000 */ nop -/* 0C514 809451E4 460052A4 */ cvt.w.s $f10, $f10 +/* 0C514 809451E4 460052A4 */ cvt.w.s $f10, $f10 /* 0C518 809451E8 4446F800 */ cfc1 $a2, $31 /* 0C51C 809451EC 00000000 */ nop /* 0C520 809451F0 30C60078 */ andi $a2, $a2, 0x0078 ## $a2 = 00000000 -/* 0C524 809451F4 14C00005 */ bne $a2, $zero, .L8094520C +/* 0C524 809451F4 14C00005 */ bne $a2, $zero, .L8094520C /* 0C528 809451F8 00000000 */ nop -/* 0C52C 809451FC 44065000 */ mfc1 $a2, $f10 +/* 0C52C 809451FC 44065000 */ mfc1 $a2, $f10 /* 0C530 80945200 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 0C534 80945204 10000007 */ beq $zero, $zero, .L80945224 +/* 0C534 80945204 10000007 */ beq $zero, $zero, .L80945224 /* 0C538 80945208 00C13025 */ or $a2, $a2, $at ## $a2 = 80000000 .L8094520C: -/* 0C53C 8094520C 10000005 */ beq $zero, $zero, .L80945224 +/* 0C53C 8094520C 10000005 */ beq $zero, $zero, .L80945224 /* 0C540 80945210 2406FFFF */ addiu $a2, $zero, 0xFFFF ## $a2 = FFFFFFFF -/* 0C544 80945214 44065000 */ mfc1 $a2, $f10 +/* 0C544 80945214 44065000 */ mfc1 $a2, $f10 .L80945218: /* 0C548 80945218 00000000 */ nop -/* 0C54C 8094521C 04C0FFFB */ bltz $a2, .L8094520C +/* 0C54C 8094521C 04C0FFFB */ bltz $a2, .L8094520C /* 0C550 80945220 00000000 */ nop .L80945224: /* 0C554 80945224 44CAF800 */ ctc1 $t2, $31 @@ -117,52 +117,52 @@ glabel func_80945084 /* 0C564 80945234 444BF800 */ cfc1 $t3, $31 /* 0C568 80945238 44C7F800 */ ctc1 $a3, $31 /* 0C56C 8094523C 00000000 */ nop -/* 0C570 80945240 460084A4 */ cvt.w.s $f18, $f16 +/* 0C570 80945240 460084A4 */ cvt.w.s $f18, $f16 /* 0C574 80945244 4447F800 */ cfc1 $a3, $31 /* 0C578 80945248 00000000 */ nop /* 0C57C 8094524C 30E70078 */ andi $a3, $a3, 0x0078 ## $a3 = 00000000 -/* 0C580 80945250 50E00013 */ beql $a3, $zero, .L809452A0 -/* 0C584 80945254 44079000 */ mfc1 $a3, $f18 +/* 0C580 80945250 50E00013 */ beql $a3, $zero, .L809452A0 +/* 0C584 80945254 44079000 */ mfc1 $a3, $f18 /* 0C588 80945258 44819000 */ mtc1 $at, $f18 ## $f18 = 2147483648.00 /* 0C58C 8094525C 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 0C590 80945260 46128481 */ sub.s $f18, $f16, $f18 +/* 0C590 80945260 46128481 */ sub.s $f18, $f16, $f18 /* 0C594 80945264 44C7F800 */ ctc1 $a3, $31 /* 0C598 80945268 00000000 */ nop -/* 0C59C 8094526C 460094A4 */ cvt.w.s $f18, $f18 +/* 0C59C 8094526C 460094A4 */ cvt.w.s $f18, $f18 /* 0C5A0 80945270 4447F800 */ cfc1 $a3, $31 /* 0C5A4 80945274 00000000 */ nop /* 0C5A8 80945278 30E70078 */ andi $a3, $a3, 0x0078 ## $a3 = 00000000 -/* 0C5AC 8094527C 14E00005 */ bne $a3, $zero, .L80945294 +/* 0C5AC 8094527C 14E00005 */ bne $a3, $zero, .L80945294 /* 0C5B0 80945280 00000000 */ nop -/* 0C5B4 80945284 44079000 */ mfc1 $a3, $f18 +/* 0C5B4 80945284 44079000 */ mfc1 $a3, $f18 /* 0C5B8 80945288 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 0C5BC 8094528C 10000007 */ beq $zero, $zero, .L809452AC +/* 0C5BC 8094528C 10000007 */ beq $zero, $zero, .L809452AC /* 0C5C0 80945290 00E13825 */ or $a3, $a3, $at ## $a3 = 80000000 .L80945294: -/* 0C5C4 80945294 10000005 */ beq $zero, $zero, .L809452AC +/* 0C5C4 80945294 10000005 */ beq $zero, $zero, .L809452AC /* 0C5C8 80945298 2407FFFF */ addiu $a3, $zero, 0xFFFF ## $a3 = FFFFFFFF -/* 0C5CC 8094529C 44079000 */ mfc1 $a3, $f18 +/* 0C5CC 8094529C 44079000 */ mfc1 $a3, $f18 .L809452A0: /* 0C5D0 809452A0 00000000 */ nop -/* 0C5D4 809452A4 04E0FFFB */ bltz $a3, .L80945294 +/* 0C5D4 809452A4 04E0FFFB */ bltz $a3, .L80945294 /* 0C5D8 809452A8 00000000 */ nop .L809452AC: -/* 0C5DC 809452AC AFA00010 */ sw $zero, 0x0010($sp) +/* 0C5DC 809452AC AFA00010 */ sw $zero, 0x0010($sp) /* 0C5E0 809452B0 C60401E0 */ lwc1 $f4, 0x01E0($s0) ## 000001E0 /* 0C5E4 809452B4 44CBF800 */ ctc1 $t3, $31 /* 0C5E8 809452B8 00000000 */ nop -/* 0C5EC 809452BC 4600218D */ trunc.w.s $f6, $f4 -/* 0C5F0 809452C0 440D3000 */ mfc1 $t5, $f6 +/* 0C5EC 809452BC 4600218D */ trunc.w.s $f6, $f4 +/* 0C5F0 809452C0 440D3000 */ mfc1 $t5, $f6 /* 0C5F4 809452C4 00000000 */ nop -/* 0C5F8 809452C8 AFAD0014 */ sw $t5, 0x0014($sp) +/* 0C5F8 809452C8 AFAD0014 */ sw $t5, 0x0014($sp) /* 0C5FC 809452CC C60801E4 */ lwc1 $f8, 0x01E4($s0) ## 000001E4 -/* 0C600 809452D0 4600428D */ trunc.w.s $f10, $f8 -/* 0C604 809452D4 440F5000 */ mfc1 $t7, $f10 -/* 0C608 809452D8 0C024DC2 */ jal func_80093708 -/* 0C60C 809452DC AFAF0018 */ sw $t7, 0x0018($sp) +/* 0C600 809452D0 4600428D */ trunc.w.s $f10, $f8 +/* 0C604 809452D4 440F5000 */ mfc1 $t7, $f10 +/* 0C608 809452D8 0C024DC2 */ jal Gfx_SetFog2 +/* 0C60C 809452DC AFAF0018 */ sw $t7, 0x0018($sp) /* 0C610 809452E0 AE4202C0 */ sw $v0, 0x02C0($s2) ## 000002C0 .L809452E4: -/* 0C614 809452E4 0C034213 */ jal Matrix_Push +/* 0C614 809452E4 0C034213 */ jal Matrix_Push /* 0C618 809452E8 00000000 */ nop /* 0C61C 809452EC 8E05056C */ lw $a1, 0x056C($s0) ## 0000056C /* 0C620 809452F0 8E060588 */ lw $a2, 0x0588($s0) ## 00000588 @@ -171,65 +171,65 @@ glabel func_80945084 /* 0C62C 809452FC 3C198094 */ lui $t9, %hi(func_80943D90) ## $t9 = 80940000 /* 0C630 80945300 27393D90 */ addiu $t9, $t9, %lo(func_80943D90) ## $t9 = 80943D90 /* 0C634 80945304 27183950 */ addiu $t8, $t8, %lo(func_80943950) ## $t8 = 80943950 -/* 0C638 80945308 AFB80010 */ sw $t8, 0x0010($sp) -/* 0C63C 8094530C AFB90014 */ sw $t9, 0x0014($sp) -/* 0C640 80945310 AFB00018 */ sw $s0, 0x0018($sp) -/* 0C644 80945314 0C0286B2 */ jal func_800A1AC8 +/* 0C638 80945308 AFB80010 */ sw $t8, 0x0010($sp) +/* 0C63C 8094530C AFB90014 */ sw $t9, 0x0014($sp) +/* 0C640 80945310 AFB00018 */ sw $s0, 0x0018($sp) +/* 0C644 80945314 0C0286B2 */ jal SkelAnime_DrawSV /* 0C648 80945318 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 0C64C 8094531C 0C034221 */ jal Matrix_Pull +/* 0C64C 8094531C 0C034221 */ jal Matrix_Pull /* 0C650 80945320 00000000 */ nop /* 0C654 80945324 3C048095 */ lui $a0, %hi(D_8094A9EC) ## $a0 = 80950000 /* 0C658 80945328 2484A9EC */ addiu $a0, $a0, %lo(D_8094A9EC) ## $a0 = 8094A9EC -/* 0C65C 8094532C 0C0346BD */ jal Matrix_MultVec3f +/* 0C65C 8094532C 0C0346BD */ jal Matrix_MultVec3f /* 0C660 80945330 2605048C */ addiu $a1, $s0, 0x048C ## $a1 = 0000048C /* 0C664 80945334 8E4402C0 */ lw $a0, 0x02C0($s2) ## 000002C0 /* 0C668 80945338 922507AF */ lbu $a1, 0x07AF($s1) ## 000007AF /* 0C66C 8094533C 922607B0 */ lbu $a2, 0x07B0($s1) ## 000007B0 /* 0C670 80945340 922707B1 */ lbu $a3, 0x07B1($s1) ## 000007B1 -/* 0C674 80945344 AFA00010 */ sw $zero, 0x0010($sp) +/* 0C674 80945344 AFA00010 */ sw $zero, 0x0010($sp) /* 0C678 80945348 862807B2 */ lh $t0, 0x07B2($s1) ## 000007B2 /* 0C67C 8094534C 240903E8 */ addiu $t1, $zero, 0x03E8 ## $t1 = 000003E8 -/* 0C680 80945350 AFA90018 */ sw $t1, 0x0018($sp) -/* 0C684 80945354 0C024DC2 */ jal func_80093708 -/* 0C688 80945358 AFA80014 */ sw $t0, 0x0014($sp) +/* 0C680 80945350 AFA90018 */ sw $t1, 0x0018($sp) +/* 0C684 80945354 0C024DC2 */ jal Gfx_SetFog2 +/* 0C688 80945358 AFA80014 */ sw $t0, 0x0014($sp) /* 0C68C 8094535C AE4202C0 */ sw $v0, 0x02C0($s2) ## 000002C0 .L80945360: -/* 0C690 80945360 0C25219A */ jal func_80948668 +/* 0C690 80945360 0C25219A */ jal func_80948668 /* 0C694 80945364 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 0C698 80945368 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0C69C 8094536C 0C250FC2 */ jal func_80943F08 +/* 0C69C 8094536C 0C250FC2 */ jal func_80943F08 /* 0C6A0 80945370 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 /* 0C6A4 80945374 44808000 */ mtc1 $zero, $f16 ## $f16 = 0.00 /* 0C6A8 80945378 C61204D8 */ lwc1 $f18, 0x04D8($s0) ## 000004D8 /* 0C6AC 8094537C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0C6B0 80945380 4612803C */ c.lt.s $f16, $f18 +/* 0C6B0 80945380 4612803C */ c.lt.s $f16, $f18 /* 0C6B4 80945384 00000000 */ nop -/* 0C6B8 80945388 45020004 */ bc1fl .L8094539C +/* 0C6B8 80945388 45020004 */ bc1fl .L8094539C /* 0C6BC 8094538C 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 -/* 0C6C0 80945390 0C2511EF */ jal func_809447BC +/* 0C6C0 80945390 0C2511EF */ jal func_809447BC /* 0C6C4 80945394 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 /* 0C6C8 80945398 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 .L8094539C: /* 0C6CC 8094539C C60601CC */ lwc1 $f6, 0x01CC($s0) ## 000001CC /* 0C6D0 809453A0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0C6D4 809453A4 4606203C */ c.lt.s $f4, $f6 +/* 0C6D4 809453A4 4606203C */ c.lt.s $f4, $f6 /* 0C6D8 809453A8 00000000 */ nop -/* 0C6DC 809453AC 45000003 */ bc1f .L809453BC +/* 0C6DC 809453AC 45000003 */ bc1f .L809453BC /* 0C6E0 809453B0 00000000 */ nop -/* 0C6E4 809453B4 0C251314 */ jal func_80944C50 +/* 0C6E4 809453B4 0C251314 */ jal func_80944C50 /* 0C6E8 809453B8 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 .L809453BC: /* 0C6EC 809453BC 3C068095 */ lui $a2, %hi(D_8094AD98) ## $a2 = 80950000 /* 0C6F0 809453C0 24C6AD98 */ addiu $a2, $a2, %lo(D_8094AD98) ## $a2 = 8094AD98 /* 0C6F4 809453C4 27A4003C */ addiu $a0, $sp, 0x003C ## $a0 = FFFFFFE4 /* 0C6F8 809453C8 8E250000 */ lw $a1, 0x0000($s1) ## 00000000 -/* 0C6FC 809453CC 0C031AD5 */ jal func_800C6B54 +/* 0C6FC 809453CC 0C031AD5 */ jal Graph_CloseDisps /* 0C700 809453D0 24071E7C */ addiu $a3, $zero, 0x1E7C ## $a3 = 00001E7C -/* 0C704 809453D4 8FBF0034 */ lw $ra, 0x0034($sp) -/* 0C708 809453D8 8FB00028 */ lw $s0, 0x0028($sp) -/* 0C70C 809453DC 8FB1002C */ lw $s1, 0x002C($sp) -/* 0C710 809453E0 8FB20030 */ lw $s2, 0x0030($sp) -/* 0C714 809453E4 03E00008 */ jr $ra +/* 0C704 809453D4 8FBF0034 */ lw $ra, 0x0034($sp) +/* 0C708 809453D8 8FB00028 */ lw $s0, 0x0028($sp) +/* 0C70C 809453DC 8FB1002C */ lw $s1, 0x002C($sp) +/* 0C710 809453E0 8FB20030 */ lw $s2, 0x0030($sp) +/* 0C714 809453E4 03E00008 */ jr $ra /* 0C718 809453E8 27BD0058 */ addiu $sp, $sp, 0x0058 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_809453EC.s b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_809453EC.s index c9fbe55acd..a53d5b0c8c 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_809453EC.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_809453EC.s @@ -51,7 +51,7 @@ glabel func_809453EC /* 0C7D4 809454A4 C628002C */ lwc1 $f8, 0x002C($s1) ## 0000002C /* 0C7D8 809454A8 C446002C */ lwc1 $f6, 0x002C($v0) ## 0000002C /* 0C7DC 809454AC 46083381 */ sub.s $f14, $f6, $f8 -/* 0C7E0 809454B0 0C03F494 */ jal func_800FD250 +/* 0C7E0 809454B0 0C03F494 */ jal Math_atan2f /* 0C7E4 809454B4 E7AE00C0 */ swc1 $f14, 0x00C0($sp) /* 0C7E8 809454B8 3C018095 */ lui $at, %hi(D_8094B170) ## $at = 80950000 /* 0C7EC 809454BC C42AB170 */ lwc1 $f10, %lo(D_8094B170)($at) @@ -67,7 +67,7 @@ glabel func_809453EC /* 0C814 809454E4 00000000 */ nop /* 0C818 809454E8 A6280032 */ sh $t0, 0x0032($s1) ## 00000032 /* 0C81C 809454EC 46000384 */ sqrt.s $f14, $f0 -/* 0C820 809454F0 0C03F494 */ jal func_800FD250 +/* 0C820 809454F0 0C03F494 */ jal Math_atan2f /* 0C824 809454F4 C7AC00C4 */ lwc1 $f12, 0x00C4($sp) /* 0C828 809454F8 3C018095 */ lui $at, %hi(D_8094B174) ## $at = 80950000 /* 0C82C 809454FC C428B174 */ lwc1 $f8, %lo(D_8094B174)($at) diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80945D14.s b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80945D14.s index f0067506fb..36838d5466 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80945D14.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80945D14.s @@ -52,7 +52,7 @@ glabel func_80945D14 /* 0D100 80945DD0 C628002C */ lwc1 $f8, 0x002C($s1) ## 0000002C /* 0D104 80945DD4 C446002C */ lwc1 $f6, 0x002C($v0) ## 0000002C /* 0D108 80945DD8 46083381 */ sub.s $f14, $f6, $f8 -/* 0D10C 80945DDC 0C03F494 */ jal func_800FD250 +/* 0D10C 80945DDC 0C03F494 */ jal Math_atan2f /* 0D110 80945DE0 E7AE0118 */ swc1 $f14, 0x0118($sp) /* 0D114 80945DE4 3C018095 */ lui $at, %hi(D_8094B194) ## $at = 80950000 /* 0D118 80945DE8 C42AB194 */ lwc1 $f10, %lo(D_8094B194)($at) @@ -68,7 +68,7 @@ glabel func_80945D14 /* 0D140 80945E10 00000000 */ nop /* 0D144 80945E14 A6390032 */ sh $t9, 0x0032($s1) ## 00000032 /* 0D148 80945E18 46000384 */ sqrt.s $f14, $f0 -/* 0D14C 80945E1C 0C03F494 */ jal func_800FD250 +/* 0D14C 80945E1C 0C03F494 */ jal Math_atan2f /* 0D150 80945E20 C7AC011C */ lwc1 $f12, 0x011C($sp) /* 0D154 80945E24 3C018095 */ lui $at, %hi(D_8094B198) ## $at = 80950000 /* 0D158 80945E28 C428B198 */ lwc1 $f8, %lo(D_8094B198)($at) diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80946C7C.s b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80946C7C.s index 5579572e37..cded773956 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80946C7C.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80946C7C.s @@ -19,7 +19,7 @@ glabel func_80946C7C /* 0DFF0 80946CC0 24C6ADA8 */ addiu $a2, $a2, %lo(D_8094ADA8) ## $a2 = 8094ADA8 /* 0DFF4 80946CC4 27A400AC */ addiu $a0, $sp, 0x00AC ## $a0 = FFFFFFDC /* 0DFF8 80946CC8 24072272 */ addiu $a3, $zero, 0x2272 ## $a3 = 00002272 -/* 0DFFC 80946CCC 0C031AB1 */ jal func_800C6AC4 +/* 0DFFC 80946CCC 0C031AB1 */ jal Graph_OpenDisps /* 0E000 80946CD0 00A09025 */ or $s2, $a1, $zero ## $s2 = 00000000 /* 0E004 80946CD4 0C024F61 */ jal func_80093D84 /* 0E008 80946CD8 8E840000 */ lw $a0, 0x0000($s4) ## 00000000 @@ -120,7 +120,7 @@ glabel func_80946C7C /* 0E17C 80946E4C 01FE0019 */ multu $t7, $s8 /* 0E180 80946E50 0000C012 */ mflo $t8 /* 0E184 80946E54 03193821 */ addu $a3, $t8, $t9 -/* 0E188 80946E58 0C0253D0 */ jal Draw_TwoTexScroll +/* 0E188 80946E58 0C0253D0 */ jal Gfx_TwoTexScroll /* 0E18C 80946E5C 30E700FF */ andi $a3, $a3, 0x00FF ## $a3 = 00000000 /* 0E190 80946E60 AE220004 */ sw $v0, 0x0004($s1) ## 0601A434 /* 0E194 80946E64 866D0156 */ lh $t5, 0x0156($s3) ## 00000156 @@ -285,7 +285,7 @@ glabel func_80946C7C /* 0E408 809470D8 017E0019 */ multu $t3, $s8 /* 0E40C 809470DC 00006012 */ mflo $t4 /* 0E410 809470E0 018D3821 */ addu $a3, $t4, $t5 -/* 0E414 809470E4 0C0253D0 */ jal Draw_TwoTexScroll +/* 0E414 809470E4 0C0253D0 */ jal Gfx_TwoTexScroll /* 0E418 809470E8 30E700FF */ andi $a3, $a3, 0x00FF ## $a3 = 00000000 /* 0E41C 809470EC AE220004 */ sw $v0, 0x0004($s1) ## 0601AB04 /* 0E420 809470F0 86690156 */ lh $t1, 0x0156($s3) ## 00000156 @@ -357,7 +357,7 @@ glabel func_80946C7C /* 0E524 809471F4 24C6ADD8 */ addiu $a2, $a2, %lo(D_8094ADD8) ## $a2 = 8094ADD8 /* 0E528 809471F8 27A400AC */ addiu $a0, $sp, 0x00AC ## $a0 = FFFFFFDC /* 0E52C 809471FC 8E850000 */ lw $a1, 0x0000($s4) ## 00000000 -/* 0E530 80947200 0C031AD5 */ jal func_800C6B54 +/* 0E530 80947200 0C031AD5 */ jal Graph_CloseDisps /* 0E534 80947204 24072335 */ addiu $a3, $zero, 0x2335 ## $a3 = 00002335 /* 0E538 80947208 8FBF006C */ lw $ra, 0x006C($sp) /* 0E53C 8094720C D7B40038 */ ldc1 $f20, 0x0038($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80947240.s b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80947240.s index 2cdb436a4a..bbaa0b9055 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80947240.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80947240.s @@ -19,7 +19,7 @@ glabel func_80947240 /* 0E5B4 80947284 24C6ADE8 */ addiu $a2, $a2, %lo(D_8094ADE8) ## $a2 = 8094ADE8 /* 0E5B8 80947288 27A400AC */ addiu $a0, $sp, 0x00AC ## $a0 = FFFFFFDC /* 0E5BC 8094728C 24072344 */ addiu $a3, $zero, 0x2344 ## $a3 = 00002344 -/* 0E5C0 80947290 0C031AB1 */ jal func_800C6AC4 +/* 0E5C0 80947290 0C031AB1 */ jal Graph_OpenDisps /* 0E5C4 80947294 00A09025 */ or $s2, $a1, $zero ## $s2 = 00000000 /* 0E5C8 80947298 0C024F61 */ jal func_80093D84 /* 0E5CC 8094729C 8E840000 */ lw $a0, 0x0000($s4) ## 00000000 @@ -111,7 +111,7 @@ glabel func_80947240 /* 0E720 809473F0 031E0019 */ multu $t8, $s8 /* 0E724 809473F4 0000C812 */ mflo $t9 /* 0E728 809473F8 03283821 */ addu $a3, $t9, $t0 -/* 0E72C 809473FC 0C0253D0 */ jal Draw_TwoTexScroll +/* 0E72C 809473FC 0C0253D0 */ jal Gfx_TwoTexScroll /* 0E730 80947400 30E700FF */ andi $a3, $a3, 0x00FF ## $a3 = 00000000 /* 0E734 80947404 AE220004 */ sw $v0, 0x0004($s1) ## 0601A434 /* 0E738 80947408 866E0156 */ lh $t6, 0x0156($s3) ## 00000156 @@ -275,7 +275,7 @@ glabel func_80947240 /* 0E9A8 80947678 019E0019 */ multu $t4, $s8 /* 0E9AC 8094767C 00006812 */ mflo $t5 /* 0E9B0 80947680 01AE3821 */ addu $a3, $t5, $t6 -/* 0E9B4 80947684 0C0253D0 */ jal Draw_TwoTexScroll +/* 0E9B4 80947684 0C0253D0 */ jal Gfx_TwoTexScroll /* 0E9B8 80947688 30E700FF */ andi $a3, $a3, 0x00FF ## $a3 = 00000000 /* 0E9BC 8094768C AE220004 */ sw $v0, 0x0004($s1) ## 0601AB04 /* 0E9C0 80947690 866A0156 */ lh $t2, 0x0156($s3) ## 00000156 @@ -347,7 +347,7 @@ glabel func_80947240 /* 0EAC4 80947794 24C6AE18 */ addiu $a2, $a2, %lo(D_8094AE18) ## $a2 = 8094AE18 /* 0EAC8 80947798 27A400AC */ addiu $a0, $sp, 0x00AC ## $a0 = FFFFFFDC /* 0EACC 8094779C 8E850000 */ lw $a1, 0x0000($s4) ## 00000000 -/* 0EAD0 809477A0 0C031AD5 */ jal func_800C6B54 +/* 0EAD0 809477A0 0C031AD5 */ jal Graph_CloseDisps /* 0EAD4 809477A4 24072397 */ addiu $a3, $zero, 0x2397 ## $a3 = 00002397 /* 0EAD8 809477A8 8FBF006C */ lw $ra, 0x006C($sp) /* 0EADC 809477AC D7B40038 */ ldc1 $f20, 0x0038($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80948668.s b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80948668.s index d8600d20f3..0521b809b8 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80948668.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80948668.s @@ -30,7 +30,7 @@ glabel func_80948668 /* 0FA08 809486D8 27A4015C */ addiu $a0, $sp, 0x015C ## $a0 = FFFFFFCC /* 0FA0C 809486DC 24072578 */ addiu $a3, $zero, 0x2578 ## $a3 = 00002578 /* 0FA10 809486E0 02602825 */ or $a1, $s3, $zero ## $a1 = 00000000 -/* 0FA14 809486E4 0C031AB1 */ jal func_800C6AC4 +/* 0FA14 809486E4 0C031AB1 */ jal Graph_OpenDisps /* 0FA18 809486E8 AFB50174 */ sw $s5, 0x0174($sp) /* 0FA1C 809486EC 8FAF0190 */ lw $t7, 0x0190($sp) /* 0FA20 809486F0 0C024F61 */ jal func_80093D84 @@ -206,7 +206,7 @@ glabel func_80948668 /* 0FCB4 80948984 AFAB0024 */ sw $t3, 0x0024($sp) /* 0FCB8 80948988 AFA00020 */ sw $zero, 0x0020($sp) /* 0FCBC 8094898C AFA0001C */ sw $zero, 0x001C($sp) -/* 0FCC0 80948990 0C0253D0 */ jal Draw_TwoTexScroll +/* 0FCC0 80948990 0C0253D0 */ jal Gfx_TwoTexScroll /* 0FCC4 80948994 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 0FCC8 80948998 AE020004 */ sw $v0, 0x0004($s0) ## 00000004 /* 0FCCC 8094899C 8EA6000C */ lw $a2, 0x000C($s5) ## 00010054 @@ -333,7 +333,7 @@ glabel func_80948668 /* 0FEA4 80948B74 AFA00020 */ sw $zero, 0x0020($sp) /* 0FEA8 80948B78 AFA0001C */ sw $zero, 0x001C($sp) /* 0FEAC 80948B7C AFAD0018 */ sw $t5, 0x0018($sp) -/* 0FEB0 80948B80 0C0253D0 */ jal Draw_TwoTexScroll +/* 0FEB0 80948B80 0C0253D0 */ jal Gfx_TwoTexScroll /* 0FEB4 80948B84 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 0FEB8 80948B88 AE020004 */ sw $v0, 0x0004($s0) ## 00000004 /* 0FEBC 80948B8C 8EA6000C */ lw $a2, 0x000C($s5) ## 0001009C @@ -438,7 +438,7 @@ glabel func_80948668 /* 1003C 80948D0C AFAD0014 */ sw $t5, 0x0014($sp) /* 10040 80948D10 AFAF0010 */ sw $t7, 0x0010($sp) /* 10044 80948D14 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 10048 80948D18 0C0253D0 */ jal Draw_TwoTexScroll +/* 10048 80948D18 0C0253D0 */ jal Gfx_TwoTexScroll /* 1004C 80948D1C 3046007F */ andi $a2, $v0, 0x007F ## $a2 = 00000010 /* 10050 80948D20 AE020004 */ sw $v0, 0x0004($s0) ## 00000004 /* 10054 80948D24 86A9002E */ lh $t1, 0x002E($s5) ## 00010106 @@ -643,7 +643,7 @@ glabel func_80948668 /* 10358 80949028 AFA0001C */ sw $zero, 0x001C($sp) /* 1035C 8094902C 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 10360 80949030 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 10364 80949034 0C0253D0 */ jal Draw_TwoTexScroll +/* 10364 80949034 0C0253D0 */ jal Gfx_TwoTexScroll /* 10368 80949038 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 /* 1036C 8094903C AE020004 */ sw $v0, 0x0004($s0) ## 00000004 /* 10370 80949040 93A9018F */ lbu $t1, 0x018F($sp) @@ -869,7 +869,7 @@ glabel func_80948668 /* 106B8 80949388 AFA00020 */ sw $zero, 0x0020($sp) /* 106BC 8094938C AFA0001C */ sw $zero, 0x001C($sp) /* 106C0 80949390 AFAC0010 */ sw $t4, 0x0010($sp) -/* 106C4 80949394 0C0253D0 */ jal Draw_TwoTexScroll +/* 106C4 80949394 0C0253D0 */ jal Gfx_TwoTexScroll /* 106C8 80949398 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 106CC 8094939C AE020004 */ sw $v0, 0x0004($s0) ## 00000004 /* 106D0 809493A0 8EA6000C */ lw $a2, 0x000C($s5) ## 00010174 @@ -955,7 +955,7 @@ glabel func_80948668 /* 10804 809494D4 24C6AE98 */ addiu $a2, $a2, %lo(D_8094AE98) ## $a2 = 8094AE98 /* 10808 809494D8 27A4015C */ addiu $a0, $sp, 0x015C ## $a0 = FFFFFFCC /* 1080C 809494DC 02602825 */ or $a1, $s3, $zero ## $a1 = 00000000 -/* 10810 809494E0 0C031AD5 */ jal func_800C6B54 +/* 10810 809494E0 0C031AD5 */ jal Graph_CloseDisps /* 10814 809494E4 240726C0 */ addiu $a3, $zero, 0x26C0 ## $a3 = 000026C0 /* 10818 809494E8 8FBF008C */ lw $ra, 0x008C($sp) /* 1081C 809494EC D7B40038 */ ldc1 $f20, 0x0038($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80949530.s b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80949530.s index aeed3c13cc..e48b8efba2 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80949530.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80949530.s @@ -1,33 +1,33 @@ glabel func_80949530 /* 10860 80949530 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 10864 80949534 AFA5001C */ sw $a1, 0x001C($sp) +/* 10864 80949534 AFA5001C */ sw $a1, 0x001C($sp) /* 10868 80949538 3C0E8095 */ lui $t6, %hi(func_809495A4) ## $t6 = 80950000 -/* 1086C 8094953C AFBF0014 */ sw $ra, 0x0014($sp) +/* 1086C 8094953C AFBF0014 */ sw $ra, 0x0014($sp) /* 10870 80949540 25CE95A4 */ addiu $t6, $t6, %lo(func_809495A4) ## $t6 = 809495A4 /* 10874 80949544 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 /* 10878 80949548 AC8E014C */ sw $t6, 0x014C($a0) ## 0000014C /* 1087C 8094954C 3C050603 */ lui $a1, 0x0603 ## $a1 = 06030000 /* 10880 80949550 24A52BF8 */ addiu $a1, $a1, 0x2BF8 ## $a1 = 06032BF8 -/* 10884 80949554 AFA70018 */ sw $a3, 0x0018($sp) +/* 10884 80949554 AFA70018 */ sw $a3, 0x0018($sp) /* 10888 80949558 24840568 */ addiu $a0, $a0, 0x0568 ## $a0 = 00000568 -/* 1088C 8094955C 0C0294D3 */ jal func_800A534C +/* 1088C 8094955C 0C0294D3 */ jal SkelAnime_ChangeAnimTransitionRepeat /* 10890 80949560 3C06C040 */ lui $a2, 0xC040 ## $a2 = C0400000 /* 10894 80949564 3C0142C8 */ lui $at, 0x42C8 ## $at = 42C80000 /* 10898 80949568 44816000 */ mtc1 $at, $f12 ## $f12 = 100.00 /* 1089C 8094956C 0C00CFBE */ jal Math_Rand_ZeroFloat - + /* 108A0 80949570 00000000 */ nop -/* 108A4 80949574 4600010D */ trunc.w.s $f4, $f0 -/* 108A8 80949578 8FA70018 */ lw $a3, 0x0018($sp) +/* 108A4 80949574 4600010D */ trunc.w.s $f4, $f0 +/* 108A8 80949578 8FA70018 */ lw $a3, 0x0018($sp) /* 108AC 8094957C 44803000 */ mtc1 $zero, $f6 ## $f6 = 0.00 /* 108B0 80949580 24190019 */ addiu $t9, $zero, 0x0019 ## $t9 = 00000019 -/* 108B4 80949584 44182000 */ mfc1 $t8, $f4 +/* 108B4 80949584 44182000 */ mfc1 $t8, $f4 /* 108B8 80949588 A4F9017A */ sh $t9, 0x017A($a3) ## 0000017A /* 108BC 8094958C E4E604C8 */ swc1 $f6, 0x04C8($a3) ## 000004C8 /* 108C0 80949590 A4F80150 */ sh $t8, 0x0150($a3) ## 00000150 -/* 108C4 80949594 8FBF0014 */ lw $ra, 0x0014($sp) +/* 108C4 80949594 8FBF0014 */ lw $ra, 0x0014($sp) /* 108C8 80949598 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 108CC 8094959C 03E00008 */ jr $ra +/* 108CC 8094959C 03E00008 */ jr $ra /* 108D0 809495A0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_809496D0.s b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_809496D0.s index bbedda8ecc..6901f04cc4 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_809496D0.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_809496D0.s @@ -1,29 +1,29 @@ glabel func_809496D0 /* 10A00 809496D0 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 10A04 809496D4 AFA5001C */ sw $a1, 0x001C($sp) +/* 10A04 809496D4 AFA5001C */ sw $a1, 0x001C($sp) /* 10A08 809496D8 3C0E8095 */ lui $t6, %hi(func_80949734) ## $t6 = 80950000 -/* 10A0C 809496DC AFBF0014 */ sw $ra, 0x0014($sp) +/* 10A0C 809496DC AFBF0014 */ sw $ra, 0x0014($sp) /* 10A10 809496E0 25CE9734 */ addiu $t6, $t6, %lo(func_80949734) ## $t6 = 80949734 /* 10A14 809496E4 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 /* 10A18 809496E8 AC8E014C */ sw $t6, 0x014C($a0) ## 0000014C /* 10A1C 809496EC 3C050603 */ lui $a1, 0x0603 ## $a1 = 06030000 /* 10A20 809496F0 24A56FBC */ addiu $a1, $a1, 0x6FBC ## $a1 = 06036FBC -/* 10A24 809496F4 AFA70018 */ sw $a3, 0x0018($sp) +/* 10A24 809496F4 AFA70018 */ sw $a3, 0x0018($sp) /* 10A28 809496F8 24840568 */ addiu $a0, $a0, 0x0568 ## $a0 = 00000568 -/* 10A2C 809496FC 0C029490 */ jal func_800A5240 +/* 10A2C 809496FC 0C029490 */ jal SkelAnime_ChangeAnimTransitionStop /* 10A30 80949700 3C06C0A0 */ lui $a2, 0xC0A0 ## $a2 = C0A00000 /* 10A34 80949704 3C040603 */ lui $a0, 0x0603 ## $a0 = 06030000 /* 10A38 80949708 0C028800 */ jal SkelAnime_GetFrameCount - + /* 10A3C 8094970C 24846FBC */ addiu $a0, $a0, 0x6FBC ## $a0 = 06036FBC /* 10A40 80949710 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 -/* 10A44 80949714 8FA70018 */ lw $a3, 0x0018($sp) -/* 10A48 80949718 468021A0 */ cvt.s.w $f6, $f4 +/* 10A44 80949714 8FA70018 */ lw $a3, 0x0018($sp) +/* 10A48 80949718 468021A0 */ cvt.s.w $f6, $f4 /* 10A4C 8094971C A4E00440 */ sh $zero, 0x0440($a3) ## 00000440 /* 10A50 80949720 E4E601A4 */ swc1 $f6, 0x01A4($a3) ## 000001A4 -/* 10A54 80949724 8FBF0014 */ lw $ra, 0x0014($sp) +/* 10A54 80949724 8FBF0014 */ lw $ra, 0x0014($sp) /* 10A58 80949728 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 10A5C 8094972C 03E00008 */ jr $ra +/* 10A5C 8094972C 03E00008 */ jr $ra /* 10A60 80949730 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80949920.s b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80949920.s index 2a7c2ce228..31d6eb4ef3 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80949920.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80949920.s @@ -1,41 +1,41 @@ glabel func_80949920 /* 10C50 80949920 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 10C54 80949924 3C0E8095 */ lui $t6, %hi(func_809499AC) ## $t6 = 80950000 -/* 10C58 80949928 AFBF0014 */ sw $ra, 0x0014($sp) -/* 10C5C 8094992C AFA5001C */ sw $a1, 0x001C($sp) +/* 10C58 80949928 AFBF0014 */ sw $ra, 0x0014($sp) +/* 10C5C 8094992C AFA5001C */ sw $a1, 0x001C($sp) /* 10C60 80949930 25CE99AC */ addiu $t6, $t6, %lo(func_809499AC) ## $t6 = 809499AC /* 10C64 80949934 AC8E014C */ sw $t6, 0x014C($a0) ## 0000014C /* 10C68 80949938 3C0F8095 */ lui $t7, %hi(D_8094C85C) ## $t7 = 80950000 -/* 10C6C 8094993C 91EFC85C */ lbu $t7, %lo(D_8094C85C)($t7) +/* 10C6C 8094993C 91EFC85C */ lbu $t7, %lo(D_8094C85C)($t7) /* 10C70 80949940 3C050602 */ lui $a1, 0x0602 ## $a1 = 06020000 /* 10C74 80949944 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 -/* 10C78 80949948 15E00009 */ bne $t7, $zero, .L80949970 +/* 10C78 80949948 15E00009 */ bne $t7, $zero, .L80949970 /* 10C7C 8094994C 24A53750 */ addiu $a1, $a1, 0x3750 ## $a1 = 06023750 /* 10C80 80949950 3C050602 */ lui $a1, 0x0602 ## $a1 = 06020000 /* 10C84 80949954 24A52700 */ addiu $a1, $a1, 0x2700 ## $a1 = 06022700 /* 10C88 80949958 24840568 */ addiu $a0, $a0, 0x0568 ## $a0 = 00000568 /* 10C8C 8094995C 24060000 */ addiu $a2, $zero, 0x0000 ## $a2 = 00000000 -/* 10C90 80949960 0C029490 */ jal func_800A5240 -/* 10C94 80949964 AFA70018 */ sw $a3, 0x0018($sp) -/* 10C98 80949968 10000005 */ beq $zero, $zero, .L80949980 +/* 10C90 80949960 0C029490 */ jal SkelAnime_ChangeAnimTransitionStop +/* 10C94 80949964 AFA70018 */ sw $a3, 0x0018($sp) +/* 10C98 80949968 10000005 */ beq $zero, $zero, .L80949980 /* 10C9C 8094996C 00000000 */ nop .L80949970: /* 10CA0 80949970 24E40568 */ addiu $a0, $a3, 0x0568 ## $a0 = 00000568 /* 10CA4 80949974 24060000 */ addiu $a2, $zero, 0x0000 ## $a2 = 00000000 -/* 10CA8 80949978 0C029490 */ jal func_800A5240 -/* 10CAC 8094997C AFA70018 */ sw $a3, 0x0018($sp) +/* 10CA8 80949978 0C029490 */ jal SkelAnime_ChangeAnimTransitionStop +/* 10CAC 8094997C AFA70018 */ sw $a3, 0x0018($sp) .L80949980: /* 10CB0 80949980 3C040602 */ lui $a0, 0x0602 ## $a0 = 06020000 /* 10CB4 80949984 0C028800 */ jal SkelAnime_GetFrameCount - + /* 10CB8 80949988 24843750 */ addiu $a0, $a0, 0x3750 ## $a0 = 06023750 /* 10CBC 8094998C 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 -/* 10CC0 80949990 8FB80018 */ lw $t8, 0x0018($sp) -/* 10CC4 80949994 468021A0 */ cvt.s.w $f6, $f4 +/* 10CC0 80949990 8FB80018 */ lw $t8, 0x0018($sp) +/* 10CC4 80949994 468021A0 */ cvt.s.w $f6, $f4 /* 10CC8 80949998 E70601A4 */ swc1 $f6, 0x01A4($t8) ## 000001A4 -/* 10CCC 8094999C 8FBF0014 */ lw $ra, 0x0014($sp) +/* 10CCC 8094999C 8FBF0014 */ lw $ra, 0x0014($sp) /* 10CD0 809499A0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 10CD4 809499A4 03E00008 */ jr $ra +/* 10CD4 809499A4 03E00008 */ jr $ra /* 10CD8 809499A8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80949BFC.s b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80949BFC.s index 1b20451e63..726438703a 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80949BFC.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80949BFC.s @@ -1,23 +1,23 @@ glabel func_80949BFC /* 10F2C 80949BFC 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 10F30 80949C00 AFA5001C */ sw $a1, 0x001C($sp) +/* 10F30 80949C00 AFA5001C */ sw $a1, 0x001C($sp) /* 10F34 80949C04 3C0E8095 */ lui $t6, %hi(func_80949C4C) ## $t6 = 80950000 -/* 10F38 80949C08 AFBF0014 */ sw $ra, 0x0014($sp) +/* 10F38 80949C08 AFBF0014 */ sw $ra, 0x0014($sp) /* 10F3C 80949C0C 25CE9C4C */ addiu $t6, $t6, %lo(func_80949C4C) ## $t6 = 80949C4C /* 10F40 80949C10 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 /* 10F44 80949C14 AC8E014C */ sw $t6, 0x014C($a0) ## 0000014C /* 10F48 80949C18 3C050603 */ lui $a1, 0x0603 ## $a1 = 06030000 /* 10F4C 80949C1C 24A52BF8 */ addiu $a1, $a1, 0x2BF8 ## $a1 = 06032BF8 -/* 10F50 80949C20 AFA70018 */ sw $a3, 0x0018($sp) +/* 10F50 80949C20 AFA70018 */ sw $a3, 0x0018($sp) /* 10F54 80949C24 24840568 */ addiu $a0, $a0, 0x0568 ## $a0 = 00000568 -/* 10F58 80949C28 0C0294D3 */ jal func_800A534C +/* 10F58 80949C28 0C0294D3 */ jal SkelAnime_ChangeAnimTransitionRepeat /* 10F5C 80949C2C 3C06C120 */ lui $a2, 0xC120 ## $a2 = C1200000 -/* 10F60 80949C30 8FA70018 */ lw $a3, 0x0018($sp) +/* 10F60 80949C30 8FA70018 */ lw $a3, 0x0018($sp) /* 10F64 80949C34 240F003C */ addiu $t7, $zero, 0x003C ## $t7 = 0000003C /* 10F68 80949C38 A4EF017A */ sh $t7, 0x017A($a3) ## 0000017A -/* 10F6C 80949C3C 8FBF0014 */ lw $ra, 0x0014($sp) +/* 10F6C 80949C3C 8FBF0014 */ lw $ra, 0x0014($sp) /* 10F70 80949C40 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 10F74 80949C44 03E00008 */ jr $ra +/* 10F74 80949C44 03E00008 */ jr $ra /* 10F78 80949C48 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80949CE4.s b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80949CE4.s index 37ba0f51d9..cc1dc9ba57 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80949CE4.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80949CE4.s @@ -2,20 +2,20 @@ glabel func_80949CE4 /* 11014 80949CE4 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 /* 11018 80949CE8 3C0E8095 */ lui $t6, %hi(func_80949E10) ## $t6 = 80950000 /* 1101C 80949CEC 25CE9E10 */ addiu $t6, $t6, %lo(func_80949E10) ## $t6 = 80949E10 -/* 11020 80949CF0 AFBF001C */ sw $ra, 0x001C($sp) -/* 11024 80949CF4 AFB00018 */ sw $s0, 0x0018($sp) -/* 11028 80949CF8 AFA5002C */ sw $a1, 0x002C($sp) -/* 1102C 80949CFC AFA60030 */ sw $a2, 0x0030($sp) -/* 11030 80949D00 AFAE0024 */ sw $t6, 0x0024($sp) +/* 11020 80949CF0 AFBF001C */ sw $ra, 0x001C($sp) +/* 11024 80949CF4 AFB00018 */ sw $s0, 0x0018($sp) +/* 11028 80949CF8 AFA5002C */ sw $a1, 0x002C($sp) +/* 1102C 80949CFC AFA60030 */ sw $a2, 0x0030($sp) +/* 11030 80949D00 AFAE0024 */ sw $t6, 0x0024($sp) /* 11034 80949D04 8C8F014C */ lw $t7, 0x014C($a0) ## 0000014C /* 11038 80949D08 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 1103C 80949D0C 2408000A */ addiu $t0, $zero, 0x000A ## $t0 = 0000000A -/* 11040 80949D10 11CF000E */ beq $t6, $t7, .L80949D4C +/* 11040 80949D10 11CF000E */ beq $t6, $t7, .L80949D4C /* 11044 80949D14 24090014 */ addiu $t1, $zero, 0x0014 ## $t1 = 00000014 /* 11048 80949D18 3C050603 */ lui $a1, 0x0603 ## $a1 = 06030000 /* 1104C 80949D1C 24A538F0 */ addiu $a1, $a1, 0x38F0 ## $a1 = 060338F0 /* 11050 80949D20 24840568 */ addiu $a0, $a0, 0x0568 ## $a0 = 00000568 -/* 11054 80949D24 0C029490 */ jal func_800A5240 +/* 11054 80949D24 0C029490 */ jal SkelAnime_ChangeAnimTransitionStop /* 11058 80949D28 3C06C170 */ lui $a2, 0xC170 ## $a2 = C1700000 /* 1105C 80949D2C 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 /* 11060 80949D30 24180096 */ addiu $t8, $zero, 0x0096 ## $t8 = 00000096 @@ -23,7 +23,7 @@ glabel func_80949CE4 /* 11068 80949D38 A6180178 */ sh $t8, 0x0178($s0) ## 00000178 /* 1106C 80949D3C A619017A */ sh $t9, 0x017A($s0) ## 0000017A /* 11070 80949D40 A6000440 */ sh $zero, 0x0440($s0) ## 00000440 -/* 11074 80949D44 1000002B */ beq $zero, $zero, .L80949DF4 +/* 11074 80949D44 1000002B */ beq $zero, $zero, .L80949DF4 /* 11078 80949D48 E6040060 */ swc1 $f4, 0x0060($s0) ## 00000060 .L80949D4C: /* 1107C 80949D4C 3C050602 */ lui $a1, 0x0602 ## $a1 = 06020000 @@ -31,57 +31,57 @@ glabel func_80949CE4 /* 11084 80949D54 A609015A */ sh $t1, 0x015A($s0) ## 0000015A /* 11088 80949D58 24A54374 */ addiu $a1, $a1, 0x4374 ## $a1 = 06024374 /* 1108C 80949D5C 26040568 */ addiu $a0, $s0, 0x0568 ## $a0 = 00000568 -/* 11090 80949D60 0C029490 */ jal func_800A5240 +/* 11090 80949D60 0C029490 */ jal SkelAnime_ChangeAnimTransitionStop /* 11094 80949D64 3C06C040 */ lui $a2, 0xC040 ## $a2 = C0400000 /* 11098 80949D68 3C040602 */ lui $a0, 0x0602 ## $a0 = 06020000 /* 1109C 80949D6C 0C028800 */ jal SkelAnime_GetFrameCount - + /* 110A0 80949D70 24844374 */ addiu $a0, $a0, 0x4374 ## $a0 = 06024374 /* 110A4 80949D74 44823000 */ mtc1 $v0, $f6 ## $f6 = 0.00 /* 110A8 80949D78 240A0001 */ addiu $t2, $zero, 0x0001 ## $t2 = 00000001 /* 110AC 80949D7C A60A0440 */ sh $t2, 0x0440($s0) ## 00000440 -/* 110B0 80949D80 46803220 */ cvt.s.w $f8, $f6 +/* 110B0 80949D80 46803220 */ cvt.s.w $f8, $f6 /* 110B4 80949D84 920B00AF */ lbu $t3, 0x00AF($s0) ## 000000AF /* 110B8 80949D88 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 110BC 80949D8C E60801A4 */ swc1 $f8, 0x01A4($s0) ## 000001A4 -/* 110C0 80949D90 93AC0033 */ lbu $t4, 0x0033($sp) -/* 110C4 80949D94 016C6823 */ subu $t5, $t3, $t4 +/* 110C0 80949D90 93AC0033 */ lbu $t4, 0x0033($sp) +/* 110C4 80949D94 016C6823 */ subu $t5, $t3, $t4 /* 110C8 80949D98 A20D00AF */ sb $t5, 0x00AF($s0) ## 000000AF /* 110CC 80949D9C 820300AF */ lb $v1, 0x00AF($s0) ## 000000AF -/* 110D0 80949DA0 04610003 */ bgez $v1, .L80949DB0 +/* 110D0 80949DA0 04610003 */ bgez $v1, .L80949DB0 /* 110D4 80949DA4 00000000 */ nop /* 110D8 80949DA8 A20000AF */ sb $zero, 0x00AF($s0) ## 000000AF /* 110DC 80949DAC 820300AF */ lb $v1, 0x00AF($s0) ## 000000AF .L80949DB0: -/* 110E0 80949DB0 1C60000B */ bgtz $v1, .L80949DE0 -/* 110E4 80949DB4 8FA5002C */ lw $a1, 0x002C($sp) -/* 110E8 80949DB8 0C24FC42 */ jal func_8093F108 +/* 110E0 80949DB0 1C60000B */ bgtz $v1, .L80949DE0 +/* 110E4 80949DB4 8FA5002C */ lw $a1, 0x002C($sp) +/* 110E8 80949DB8 0C24FC42 */ jal func_8093F108 /* 110EC 80949DBC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 110F0 80949DC0 8FA4002C */ lw $a0, 0x002C($sp) -/* 110F4 80949DC4 0C00CB1F */ jal func_80032C7C +/* 110F0 80949DC0 8FA4002C */ lw $a0, 0x002C($sp) +/* 110F4 80949DC4 0C00CB1F */ jal func_80032C7C /* 110F8 80949DC8 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 110FC 80949DCC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 11100 80949DD0 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 11104 80949DD4 2405391B */ addiu $a1, $zero, 0x391B ## $a1 = 0000391B -/* 11108 80949DD8 10000009 */ beq $zero, $zero, .L80949E00 -/* 1110C 80949DDC 8FBF001C */ lw $ra, 0x001C($sp) +/* 11108 80949DD8 10000009 */ beq $zero, $zero, .L80949E00 +/* 1110C 80949DDC 8FBF001C */ lw $ra, 0x001C($sp) .L80949DE0: /* 11110 80949DE0 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 11114 80949DE4 240539B7 */ addiu $a1, $zero, 0x39B7 ## $a1 = 000039B7 /* 11118 80949DE8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 1111C 80949DEC 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 11120 80949DF0 24053914 */ addiu $a1, $zero, 0x3914 ## $a1 = 00003914 .L80949DF4: -/* 11124 80949DF4 8FAE0024 */ lw $t6, 0x0024($sp) +/* 11124 80949DF4 8FAE0024 */ lw $t6, 0x0024($sp) /* 11128 80949DF8 AE0E014C */ sw $t6, 0x014C($s0) ## 0000014C -/* 1112C 80949DFC 8FBF001C */ lw $ra, 0x001C($sp) +/* 1112C 80949DFC 8FBF001C */ lw $ra, 0x001C($sp) .L80949E00: -/* 11130 80949E00 8FB00018 */ lw $s0, 0x0018($sp) +/* 11130 80949E00 8FB00018 */ lw $s0, 0x0018($sp) /* 11134 80949E04 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 11138 80949E08 03E00008 */ jr $ra +/* 11138 80949E08 03E00008 */ jr $ra /* 1113C 80949E0C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80949E10.s b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80949E10.s index a7eeee9c0e..1790f9ffae 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80949E10.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_80949E10.s @@ -1,85 +1,85 @@ glabel func_80949E10 /* 11140 80949E10 27BDFF98 */ addiu $sp, $sp, 0xFF98 ## $sp = FFFFFF98 -/* 11144 80949E14 AFBF0034 */ sw $ra, 0x0034($sp) -/* 11148 80949E18 AFB00030 */ sw $s0, 0x0030($sp) -/* 1114C 80949E1C AFA5006C */ sw $a1, 0x006C($sp) +/* 11144 80949E14 AFBF0034 */ sw $ra, 0x0034($sp) +/* 11148 80949E18 AFB00030 */ sw $s0, 0x0030($sp) +/* 1114C 80949E1C AFA5006C */ sw $a1, 0x006C($sp) /* 11150 80949E20 8C8F0004 */ lw $t7, 0x0004($a0) ## 00000004 /* 11154 80949E24 240E0001 */ addiu $t6, $zero, 0x0001 ## $t6 = 00000001 /* 11158 80949E28 A08E05F8 */ sb $t6, 0x05F8($a0) ## 000005F8 /* 1115C 80949E2C 35F80400 */ ori $t8, $t7, 0x0400 ## $t8 = 00000400 /* 11160 80949E30 AC980004 */ sw $t8, 0x0004($a0) ## 00000004 /* 11164 80949E34 3C198095 */ lui $t9, %hi(D_8094C85C) ## $t9 = 80950000 -/* 11168 80949E38 9339C85C */ lbu $t9, %lo(D_8094C85C)($t9) +/* 11168 80949E38 9339C85C */ lbu $t9, %lo(D_8094C85C)($t9) /* 1116C 80949E3C 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 11170 80949E40 24090002 */ addiu $t1, $zero, 0x0002 ## $t1 = 00000002 -/* 11174 80949E44 17200003 */ bne $t9, $zero, .L80949E54 +/* 11174 80949E44 17200003 */ bne $t9, $zero, .L80949E54 /* 11178 80949E48 24080003 */ addiu $t0, $zero, 0x0003 ## $t0 = 00000003 -/* 1117C 80949E4C 10000002 */ beq $zero, $zero, .L80949E58 -/* 11180 80949E50 A7A80066 */ sh $t0, 0x0066($sp) +/* 1117C 80949E4C 10000002 */ beq $zero, $zero, .L80949E58 +/* 11180 80949E50 A7A80066 */ sh $t0, 0x0066($sp) .L80949E54: -/* 11184 80949E54 A7A90066 */ sh $t1, 0x0066($sp) +/* 11184 80949E54 A7A90066 */ sh $t1, 0x0066($sp) .L80949E58: /* 11188 80949E58 860A0150 */ lh $t2, 0x0150($s0) ## 00000150 /* 1118C 80949E5C 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 /* 11190 80949E60 314B0007 */ andi $t3, $t2, 0x0007 ## $t3 = 00000000 -/* 11194 80949E64 55600031 */ bnel $t3, $zero, .L80949F2C +/* 11194 80949E64 55600031 */ bnel $t3, $zero, .L80949F2C /* 11198 80949E68 26040568 */ addiu $a0, $s0, 0x0568 ## $a0 = 00000568 /* 1119C 80949E6C 44816000 */ mtc1 $at, $f12 ## $f12 = 20.00 /* 111A0 80949E70 0C00CFC8 */ jal Math_Rand_CenteredFloat - + /* 111A4 80949E74 00000000 */ nop /* 111A8 80949E78 C6040024 */ lwc1 $f4, 0x0024($s0) ## 00000024 /* 111AC 80949E7C 3C014220 */ lui $at, 0x4220 ## $at = 42200000 /* 111B0 80949E80 44816000 */ mtc1 $at, $f12 ## $f12 = 40.00 -/* 111B4 80949E84 46040180 */ add.s $f6, $f0, $f4 +/* 111B4 80949E84 46040180 */ add.s $f6, $f0, $f4 /* 111B8 80949E88 0C00CFC8 */ jal Math_Rand_CenteredFloat - -/* 111BC 80949E8C E7A60058 */ swc1 $f6, 0x0058($sp) + +/* 111BC 80949E8C E7A60058 */ swc1 $f6, 0x0058($sp) /* 111C0 80949E90 C6080028 */ lwc1 $f8, 0x0028($s0) ## 00000028 /* 111C4 80949E94 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 /* 111C8 80949E98 44818000 */ mtc1 $at, $f16 ## $f16 = 20.00 -/* 111CC 80949E9C 46080280 */ add.s $f10, $f0, $f8 +/* 111CC 80949E9C 46080280 */ add.s $f10, $f0, $f8 /* 111D0 80949EA0 44816000 */ mtc1 $at, $f12 ## $f12 = 20.00 -/* 111D4 80949EA4 46105480 */ add.s $f18, $f10, $f16 +/* 111D4 80949EA4 46105480 */ add.s $f18, $f10, $f16 /* 111D8 80949EA8 0C00CFC8 */ jal Math_Rand_CenteredFloat - -/* 111DC 80949EAC E7B2005C */ swc1 $f18, 0x005C($sp) + +/* 111DC 80949EAC E7B2005C */ swc1 $f18, 0x005C($sp) /* 111E0 80949EB0 C604002C */ lwc1 $f4, 0x002C($s0) ## 0000002C /* 111E4 80949EB4 44801000 */ mtc1 $zero, $f2 ## $f2 = 0.00 /* 111E8 80949EB8 3C018095 */ lui $at, %hi(D_8094B214) ## $at = 80950000 -/* 111EC 80949EBC 46040180 */ add.s $f6, $f0, $f4 -/* 111F0 80949EC0 C428B214 */ lwc1 $f8, %lo(D_8094B214)($at) +/* 111EC 80949EBC 46040180 */ add.s $f6, $f0, $f4 +/* 111F0 80949EC0 C428B214 */ lwc1 $f8, %lo(D_8094B214)($at) /* 111F4 80949EC4 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 /* 111F8 80949EC8 44816000 */ mtc1 $at, $f12 ## $f12 = 5.00 -/* 111FC 80949ECC E7A60060 */ swc1 $f6, 0x0060($sp) -/* 11200 80949ED0 E7A2004C */ swc1 $f2, 0x004C($sp) -/* 11204 80949ED4 E7A20050 */ swc1 $f2, 0x0050($sp) -/* 11208 80949ED8 E7A20054 */ swc1 $f2, 0x0054($sp) -/* 1120C 80949EDC E7A20040 */ swc1 $f2, 0x0040($sp) -/* 11210 80949EE0 E7A20048 */ swc1 $f2, 0x0048($sp) +/* 111FC 80949ECC E7A60060 */ swc1 $f6, 0x0060($sp) +/* 11200 80949ED0 E7A2004C */ swc1 $f2, 0x004C($sp) +/* 11204 80949ED4 E7A20050 */ swc1 $f2, 0x0050($sp) +/* 11208 80949ED8 E7A20054 */ swc1 $f2, 0x0054($sp) +/* 1120C 80949EDC E7A20040 */ swc1 $f2, 0x0040($sp) +/* 11210 80949EE0 E7A20048 */ swc1 $f2, 0x0048($sp) /* 11214 80949EE4 0C00CFBE */ jal Math_Rand_ZeroFloat - -/* 11218 80949EE8 E7A80044 */ swc1 $f8, 0x0044($sp) + +/* 11218 80949EE8 E7A80044 */ swc1 $f8, 0x0044($sp) /* 1121C 80949EEC 3C014120 */ lui $at, 0x4120 ## $at = 41200000 /* 11220 80949EF0 44815000 */ mtc1 $at, $f10 ## $f10 = 10.00 /* 11224 80949EF4 27AC0040 */ addiu $t4, $sp, 0x0040 ## $t4 = FFFFFFD8 /* 11228 80949EF8 240D0096 */ addiu $t5, $zero, 0x0096 ## $t5 = 00000096 -/* 1122C 80949EFC 460A0400 */ add.s $f16, $f0, $f10 -/* 11230 80949F00 AFAD0020 */ sw $t5, 0x0020($sp) -/* 11234 80949F04 AFAC0010 */ sw $t4, 0x0010($sp) -/* 11238 80949F08 8FA4006C */ lw $a0, 0x006C($sp) -/* 1123C 80949F0C E7B00014 */ swc1 $f16, 0x0014($sp) -/* 11240 80949F10 87A50066 */ lh $a1, 0x0066($sp) +/* 1122C 80949EFC 460A0400 */ add.s $f16, $f0, $f10 +/* 11230 80949F00 AFAD0020 */ sw $t5, 0x0020($sp) +/* 11234 80949F04 AFAC0010 */ sw $t4, 0x0010($sp) +/* 11238 80949F08 8FA4006C */ lw $a0, 0x006C($sp) +/* 1123C 80949F0C E7B00014 */ swc1 $f16, 0x0014($sp) +/* 11240 80949F10 87A50066 */ lh $a1, 0x0066($sp) /* 11244 80949F14 27A60058 */ addiu $a2, $sp, 0x0058 ## $a2 = FFFFFFF0 /* 11248 80949F18 27A7004C */ addiu $a3, $sp, 0x004C ## $a3 = FFFFFFE4 -/* 1124C 80949F1C AFA00018 */ sw $zero, 0x0018($sp) -/* 11250 80949F20 0C24E371 */ jal func_80938DC4 -/* 11254 80949F24 AFA0001C */ sw $zero, 0x001C($sp) +/* 1124C 80949F1C AFA00018 */ sw $zero, 0x0018($sp) +/* 11250 80949F20 0C24E371 */ jal func_80938DC4 +/* 11254 80949F24 AFA0001C */ sw $zero, 0x001C($sp) /* 11258 80949F28 26040568 */ addiu $a0, $s0, 0x0568 ## $a0 = 00000568 .L80949F2C: /* 1125C 80949F2C 0C02927F */ jal SkelAnime_FrameUpdateMatrix - -/* 11260 80949F30 AFA40038 */ sw $a0, 0x0038($sp) + +/* 11260 80949F30 AFA40038 */ sw $a0, 0x0038($sp) /* 11264 80949F34 860E0160 */ lh $t6, 0x0160($s0) ## 00000160 /* 11268 80949F38 241900FF */ addiu $t9, $zero, 0x00FF ## $t9 = 000000FF /* 1126C 80949F3C 260401B4 */ addiu $a0, $s0, 0x01B4 ## $a0 = 000001B4 @@ -88,23 +88,23 @@ glabel func_80949E10 /* 11278 80949F48 86180160 */ lh $t8, 0x0160($s0) ## 00000160 /* 1127C 80949F4C 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 /* 11280 80949F50 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 11284 80949F54 2B010100 */ slti $at, $t8, 0x0100 -/* 11288 80949F58 14200002 */ bne $at, $zero, .L80949F64 +/* 11284 80949F54 2B010100 */ slti $at, $t8, 0x0100 +/* 11288 80949F58 14200002 */ bne $at, $zero, .L80949F64 /* 1128C 80949F5C 3C073D4C */ lui $a3, 0x3D4C ## $a3 = 3D4C0000 /* 11290 80949F60 A6190160 */ sh $t9, 0x0160($s0) ## 00000160 .L80949F64: /* 11294 80949F64 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 11298 80949F68 34E7CCCD */ ori $a3, $a3, 0xCCCD ## $a3 = 3D4CCCCD /* 1129C 80949F6C C6120028 */ lwc1 $f18, 0x0028($s0) ## 00000028 /* 112A0 80949F70 C6040060 */ lwc1 $f4, 0x0060($s0) ## 00000060 /* 112A4 80949F74 26040060 */ addiu $a0, $s0, 0x0060 ## $a0 = 00000060 /* 112A8 80949F78 3C05C0A0 */ lui $a1, 0xC0A0 ## $a1 = C0A00000 -/* 112AC 80949F7C 46049180 */ add.s $f6, $f18, $f4 +/* 112AC 80949F7C 46049180 */ add.s $f6, $f18, $f4 /* 112B0 80949F80 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 112B4 80949F84 3C073F00 */ lui $a3, 0x3F00 ## $a3 = 3F000000 /* 112B8 80949F88 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 112BC 80949F8C E6060028 */ swc1 $f6, 0x0028($s0) ## 00000028 /* 112C0 80949F90 3C014248 */ lui $at, 0x4248 ## $at = 42480000 /* 112C4 80949F94 44810000 */ mtc1 $at, $f0 ## $f0 = 50.00 @@ -113,82 +113,82 @@ glabel func_80949E10 /* 112D0 80949FA0 C6080028 */ lwc1 $f8, 0x0028($s0) ## 00000028 /* 112D4 80949FA4 3C0142C8 */ lui $at, 0x42C8 ## $at = 42C80000 /* 112D8 80949FA8 44819000 */ mtc1 $at, $f18 ## $f18 = 100.00 -/* 112DC 80949FAC 460A4401 */ sub.s $f16, $f8, $f10 +/* 112DC 80949FAC 460A4401 */ sub.s $f16, $f8, $f10 /* 112E0 80949FB0 24080004 */ addiu $t0, $zero, 0x0004 ## $t0 = 00000004 -/* 112E4 80949FB4 44060000 */ mfc1 $a2, $f0 -/* 112E8 80949FB8 44070000 */ mfc1 $a3, $f0 +/* 112E4 80949FB4 44060000 */ mfc1 $a2, $f0 +/* 112E8 80949FB8 44070000 */ mfc1 $a3, $f0 /* 112EC 80949FBC E6100028 */ swc1 $f16, 0x0028($s0) ## 00000028 -/* 112F0 80949FC0 AFA80014 */ sw $t0, 0x0014($sp) -/* 112F4 80949FC4 8FA4006C */ lw $a0, 0x006C($sp) +/* 112F0 80949FC0 AFA80014 */ sw $t0, 0x0014($sp) +/* 112F4 80949FC4 8FA4006C */ lw $a0, 0x006C($sp) /* 112F8 80949FC8 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 112FC 80949FCC 0C00B92D */ jal func_8002E4B4 -/* 11300 80949FD0 E7B20010 */ swc1 $f18, 0x0010($sp) +/* 112FC 80949FCC 0C00B92D */ jal func_8002E4B4 +/* 11300 80949FD0 E7B20010 */ swc1 $f18, 0x0010($sp) /* 11304 80949FD4 3C0141F0 */ lui $at, 0x41F0 ## $at = 41F00000 /* 11308 80949FD8 44813000 */ mtc1 $at, $f6 ## $f6 = 30.00 /* 1130C 80949FDC C6040028 */ lwc1 $f4, 0x0028($s0) ## 00000028 /* 11310 80949FE0 86090440 */ lh $t1, 0x0440($s0) ## 00000440 -/* 11314 80949FE4 46062200 */ add.s $f8, $f4, $f6 -/* 11318 80949FE8 15200018 */ bne $t1, $zero, .L8094A04C +/* 11314 80949FE4 46062200 */ add.s $f8, $f4, $f6 +/* 11318 80949FE8 15200018 */ bne $t1, $zero, .L8094A04C /* 1131C 80949FEC E6080028 */ swc1 $f8, 0x0028($s0) ## 00000028 /* 11320 80949FF0 860A017A */ lh $t2, 0x017A($s0) ## 0000017A /* 11324 80949FF4 3C040603 */ lui $a0, 0x0603 ## $a0 = 06030000 /* 11328 80949FF8 240B0001 */ addiu $t3, $zero, 0x0001 ## $t3 = 00000001 -/* 1132C 80949FFC 1540001F */ bne $t2, $zero, .L8094A07C +/* 1132C 80949FFC 1540001F */ bne $t2, $zero, .L8094A07C /* 11330 8094A000 248443B4 */ addiu $a0, $a0, 0x43B4 ## $a0 = 060343B4 /* 11334 8094A004 0C028800 */ jal SkelAnime_GetFrameCount - + /* 11338 8094A008 A60B0440 */ sh $t3, 0x0440($s0) ## 00000440 /* 1133C 8094A00C 44825000 */ mtc1 $v0, $f10 ## $f10 = 0.00 /* 11340 8094A010 44801000 */ mtc1 $zero, $f2 ## $f2 = 0.00 /* 11344 8094A014 3C050603 */ lui $a1, 0x0603 ## $a1 = 06030000 -/* 11348 8094A018 46805020 */ cvt.s.w $f0, $f10 +/* 11348 8094A018 46805020 */ cvt.s.w $f0, $f10 /* 1134C 8094A01C 240C0003 */ addiu $t4, $zero, 0x0003 ## $t4 = 00000003 -/* 11350 8094A020 44071000 */ mfc1 $a3, $f2 +/* 11350 8094A020 44071000 */ mfc1 $a3, $f2 /* 11354 8094A024 24A543B4 */ addiu $a1, $a1, 0x43B4 ## $a1 = 060343B4 /* 11358 8094A028 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 1135C 8094A02C E60001A4 */ swc1 $f0, 0x01A4($s0) ## 000001A4 -/* 11360 8094A030 AFAC0014 */ sw $t4, 0x0014($sp) -/* 11364 8094A034 E7A00010 */ swc1 $f0, 0x0010($sp) -/* 11368 8094A038 8FA40038 */ lw $a0, 0x0038($sp) -/* 1136C 8094A03C 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 11370 8094A040 E7A20018 */ swc1 $f2, 0x0018($sp) -/* 11374 8094A044 1000000E */ beq $zero, $zero, .L8094A080 +/* 11360 8094A030 AFAC0014 */ sw $t4, 0x0014($sp) +/* 11364 8094A034 E7A00010 */ swc1 $f0, 0x0010($sp) +/* 11368 8094A038 8FA40038 */ lw $a0, 0x0038($sp) +/* 1136C 8094A03C 0C029468 */ jal SkelAnime_ChangeAnim + +/* 11370 8094A040 E7A20018 */ swc1 $f2, 0x0018($sp) +/* 11374 8094A044 1000000E */ beq $zero, $zero, .L8094A080 /* 11378 8094A048 960D0088 */ lhu $t5, 0x0088($s0) ## 00000088 .L8094A04C: -/* 1137C 8094A04C 8FA40038 */ lw $a0, 0x0038($sp) -/* 11380 8094A050 0C0295B2 */ jal func_800A56C8 +/* 1137C 8094A04C 8FA40038 */ lw $a0, 0x0038($sp) +/* 11380 8094A050 0C0295B2 */ jal func_800A56C8 /* 11384 8094A054 8E0501A4 */ lw $a1, 0x01A4($s0) ## 000001A4 -/* 11388 8094A058 10400008 */ beq $v0, $zero, .L8094A07C +/* 11388 8094A058 10400008 */ beq $v0, $zero, .L8094A07C /* 1138C 8094A05C 3C01447A */ lui $at, 0x447A ## $at = 447A0000 /* 11390 8094A060 44818000 */ mtc1 $at, $f16 ## $f16 = 1000.00 /* 11394 8094A064 3C050603 */ lui $a1, 0x0603 ## $a1 = 06030000 /* 11398 8094A068 24A55030 */ addiu $a1, $a1, 0x5030 ## $a1 = 06035030 /* 1139C 8094A06C E61001A4 */ swc1 $f16, 0x01A4($s0) ## 000001A4 -/* 113A0 8094A070 8FA40038 */ lw $a0, 0x0038($sp) -/* 113A4 8094A074 0C0294D3 */ jal func_800A534C +/* 113A0 8094A070 8FA40038 */ lw $a0, 0x0038($sp) +/* 113A4 8094A074 0C0294D3 */ jal SkelAnime_ChangeAnimTransitionRepeat /* 113A8 8094A078 24060000 */ addiu $a2, $zero, 0x0000 ## $a2 = 00000000 .L8094A07C: /* 113AC 8094A07C 960D0088 */ lhu $t5, 0x0088($s0) ## 00000088 .L8094A080: /* 113B0 8094A080 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 113B4 8094A084 31AE0001 */ andi $t6, $t5, 0x0001 ## $t6 = 00000000 -/* 113B8 8094A088 51C00005 */ beql $t6, $zero, .L8094A0A0 +/* 113B8 8094A088 51C00005 */ beql $t6, $zero, .L8094A0A0 /* 113BC 8094A08C 860F0178 */ lh $t7, 0x0178($s0) ## 00000178 /* 113C0 8094A090 44809000 */ mtc1 $zero, $f18 ## $f18 = 0.00 /* 113C4 8094A094 00000000 */ nop /* 113C8 8094A098 E6120060 */ swc1 $f18, 0x0060($s0) ## 00000060 /* 113CC 8094A09C 860F0178 */ lh $t7, 0x0178($s0) ## 00000178 .L8094A0A0: -/* 113D0 8094A0A0 55E00004 */ bnel $t7, $zero, .L8094A0B4 -/* 113D4 8094A0A4 8FBF0034 */ lw $ra, 0x0034($sp) -/* 113D8 8094A0A8 0C252831 */ jal func_8094A0C4 -/* 113DC 8094A0AC 8FA5006C */ lw $a1, 0x006C($sp) -/* 113E0 8094A0B0 8FBF0034 */ lw $ra, 0x0034($sp) +/* 113D0 8094A0A0 55E00004 */ bnel $t7, $zero, .L8094A0B4 +/* 113D4 8094A0A4 8FBF0034 */ lw $ra, 0x0034($sp) +/* 113D8 8094A0A8 0C252831 */ jal func_8094A0C4 +/* 113DC 8094A0AC 8FA5006C */ lw $a1, 0x006C($sp) +/* 113E0 8094A0B0 8FBF0034 */ lw $ra, 0x0034($sp) .L8094A0B4: -/* 113E4 8094A0B4 8FB00030 */ lw $s0, 0x0030($sp) +/* 113E4 8094A0B4 8FB00030 */ lw $s0, 0x0030($sp) /* 113E8 8094A0B8 27BD0068 */ addiu $sp, $sp, 0x0068 ## $sp = 00000000 -/* 113EC 8094A0BC 03E00008 */ jr $ra +/* 113EC 8094A0BC 03E00008 */ jr $ra /* 113F0 8094A0C0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8094A0C4.s b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8094A0C4.s index d6192e8c2c..6e8341caa3 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8094A0C4.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8094A0C4.s @@ -1,30 +1,30 @@ glabel func_8094A0C4 /* 113F4 8094A0C4 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 113F8 8094A0C8 AFA5001C */ sw $a1, 0x001C($sp) -/* 113FC 8094A0CC AFBF0014 */ sw $ra, 0x0014($sp) +/* 113F8 8094A0C8 AFA5001C */ sw $a1, 0x001C($sp) +/* 113FC 8094A0CC AFBF0014 */ sw $ra, 0x0014($sp) /* 11400 8094A0D0 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 /* 11404 8094A0D4 3C050603 */ lui $a1, 0x0603 ## $a1 = 06030000 /* 11408 8094A0D8 24A55988 */ addiu $a1, $a1, 0x5988 ## $a1 = 06035988 -/* 1140C 8094A0DC AFA70018 */ sw $a3, 0x0018($sp) +/* 1140C 8094A0DC AFA70018 */ sw $a3, 0x0018($sp) /* 11410 8094A0E0 24840568 */ addiu $a0, $a0, 0x0568 ## $a0 = 00000568 -/* 11414 8094A0E4 0C029490 */ jal func_800A5240 +/* 11414 8094A0E4 0C029490 */ jal SkelAnime_ChangeAnimTransitionStop /* 11418 8094A0E8 24060000 */ addiu $a2, $zero, 0x0000 ## $a2 = 00000000 /* 1141C 8094A0EC 3C040603 */ lui $a0, 0x0603 ## $a0 = 06030000 /* 11420 8094A0F0 0C028800 */ jal SkelAnime_GetFrameCount - + /* 11424 8094A0F4 24845988 */ addiu $a0, $a0, 0x5988 ## $a0 = 06035988 /* 11428 8094A0F8 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 -/* 1142C 8094A0FC 8FA70018 */ lw $a3, 0x0018($sp) +/* 1142C 8094A0FC 8FA70018 */ lw $a3, 0x0018($sp) /* 11430 8094A100 3C0E8095 */ lui $t6, %hi(func_8094A12C) ## $t6 = 80950000 -/* 11434 8094A104 468021A0 */ cvt.s.w $f6, $f4 +/* 11434 8094A104 468021A0 */ cvt.s.w $f6, $f4 /* 11438 8094A108 25CEA12C */ addiu $t6, $t6, %lo(func_8094A12C) ## $t6 = 8094A12C /* 1143C 8094A10C 240F0032 */ addiu $t7, $zero, 0x0032 ## $t7 = 00000032 /* 11440 8094A110 ACEE014C */ sw $t6, 0x014C($a3) ## 0000014C /* 11444 8094A114 A4EF0178 */ sh $t7, 0x0178($a3) ## 00000178 /* 11448 8094A118 E4E601A4 */ swc1 $f6, 0x01A4($a3) ## 000001A4 -/* 1144C 8094A11C 8FBF0014 */ lw $ra, 0x0014($sp) +/* 1144C 8094A11C 8FBF0014 */ lw $ra, 0x0014($sp) /* 11450 8094A120 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 11454 8094A124 03E00008 */ jr $ra +/* 11454 8094A124 03E00008 */ jr $ra /* 11458 8094A128 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8094A12C.s b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8094A12C.s index caf86429a2..390190f813 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8094A12C.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8094A12C.s @@ -1,44 +1,44 @@ glabel func_8094A12C /* 1145C 8094A12C 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 11460 8094A130 AFB00018 */ sw $s0, 0x0018($sp) +/* 11460 8094A130 AFB00018 */ sw $s0, 0x0018($sp) /* 11464 8094A134 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 11468 8094A138 AFBF001C */ sw $ra, 0x001C($sp) +/* 11468 8094A138 AFBF001C */ sw $ra, 0x001C($sp) /* 1146C 8094A13C 24840568 */ addiu $a0, $a0, 0x0568 ## $a0 = 00000568 -/* 11470 8094A140 AFA5002C */ sw $a1, 0x002C($sp) +/* 11470 8094A140 AFA5002C */ sw $a1, 0x002C($sp) /* 11474 8094A144 0C02927F */ jal SkelAnime_FrameUpdateMatrix - -/* 11478 8094A148 AFA40024 */ sw $a0, 0x0024($sp) + +/* 11478 8094A148 AFA40024 */ sw $a0, 0x0024($sp) /* 1147C 8094A14C 3C063D4C */ lui $a2, 0x3D4C ## $a2 = 3D4C0000 /* 11480 8094A150 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3D4CCCCD /* 11484 8094A154 26040028 */ addiu $a0, $s0, 0x0028 ## $a0 = 00000028 /* 11488 8094A158 8E0504B4 */ lw $a1, 0x04B4($s0) ## 000004B4 /* 1148C 8094A15C 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 11490 8094A160 3C0740A0 */ lui $a3, 0x40A0 ## $a3 = 40A00000 -/* 11494 8094A164 8FA40024 */ lw $a0, 0x0024($sp) -/* 11498 8094A168 0C0295B2 */ jal func_800A56C8 +/* 11494 8094A164 8FA40024 */ lw $a0, 0x0024($sp) +/* 11498 8094A168 0C0295B2 */ jal func_800A56C8 /* 1149C 8094A16C 8E0501A4 */ lw $a1, 0x01A4($s0) ## 000001A4 -/* 114A0 8094A170 10400008 */ beq $v0, $zero, .L8094A194 +/* 114A0 8094A170 10400008 */ beq $v0, $zero, .L8094A194 /* 114A4 8094A174 3C01447A */ lui $at, 0x447A ## $at = 447A0000 /* 114A8 8094A178 44812000 */ mtc1 $at, $f4 ## $f4 = 1000.00 /* 114AC 8094A17C 3C050603 */ lui $a1, 0x0603 ## $a1 = 06030000 /* 114B0 8094A180 24A52BF8 */ addiu $a1, $a1, 0x2BF8 ## $a1 = 06032BF8 /* 114B4 8094A184 E60401A4 */ swc1 $f4, 0x01A4($s0) ## 000001A4 -/* 114B8 8094A188 8FA40024 */ lw $a0, 0x0024($sp) -/* 114BC 8094A18C 0C0294D3 */ jal func_800A534C +/* 114B8 8094A188 8FA40024 */ lw $a0, 0x0024($sp) +/* 114BC 8094A18C 0C0294D3 */ jal SkelAnime_ChangeAnimTransitionRepeat /* 114C0 8094A190 24060000 */ addiu $a2, $zero, 0x0000 ## $a2 = 00000000 .L8094A194: /* 114C4 8094A194 860E0178 */ lh $t6, 0x0178($s0) ## 00000178 /* 114C8 8094A198 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 114CC 8094A19C 55C00004 */ bnel $t6, $zero, .L8094A1B0 -/* 114D0 8094A1A0 8FBF001C */ lw $ra, 0x001C($sp) -/* 114D4 8094A1A4 0C252870 */ jal func_8094A1C0 -/* 114D8 8094A1A8 8FA5002C */ lw $a1, 0x002C($sp) -/* 114DC 8094A1AC 8FBF001C */ lw $ra, 0x001C($sp) +/* 114CC 8094A19C 55C00004 */ bnel $t6, $zero, .L8094A1B0 +/* 114D0 8094A1A0 8FBF001C */ lw $ra, 0x001C($sp) +/* 114D4 8094A1A4 0C252870 */ jal func_8094A1C0 +/* 114D8 8094A1A8 8FA5002C */ lw $a1, 0x002C($sp) +/* 114DC 8094A1AC 8FBF001C */ lw $ra, 0x001C($sp) .L8094A1B0: -/* 114E0 8094A1B0 8FB00018 */ lw $s0, 0x0018($sp) +/* 114E0 8094A1B0 8FB00018 */ lw $s0, 0x0018($sp) /* 114E4 8094A1B4 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 114E8 8094A1B8 03E00008 */ jr $ra +/* 114E8 8094A1B8 03E00008 */ jr $ra /* 114EC 8094A1BC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8094A1C0.s b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8094A1C0.s index fa8cafff5d..483c628be8 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8094A1C0.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8094A1C0.s @@ -1,52 +1,52 @@ glabel func_8094A1C0 /* 114F0 8094A1C0 27BDFFB0 */ addiu $sp, $sp, 0xFFB0 ## $sp = FFFFFFB0 -/* 114F4 8094A1C4 F7BA0030 */ sdc1 $f26, 0x0030($sp) +/* 114F4 8094A1C4 F7BA0030 */ sdc1 $f26, 0x0030($sp) /* 114F8 8094A1C8 3C018095 */ lui $at, %hi(D_8094B218) ## $at = 80950000 -/* 114FC 8094A1CC AFB40048 */ sw $s4, 0x0048($sp) -/* 11500 8094A1D0 AFB30044 */ sw $s3, 0x0044($sp) -/* 11504 8094A1D4 AFB20040 */ sw $s2, 0x0040($sp) -/* 11508 8094A1D8 AFB00038 */ sw $s0, 0x0038($sp) -/* 1150C 8094A1DC F7B80028 */ sdc1 $f24, 0x0028($sp) -/* 11510 8094A1E0 C43AB218 */ lwc1 $f26, %lo(D_8094B218)($at) -/* 11514 8094A1E4 AFBF004C */ sw $ra, 0x004C($sp) -/* 11518 8094A1E8 AFB1003C */ sw $s1, 0x003C($sp) -/* 1151C 8094A1EC F7B60020 */ sdc1 $f22, 0x0020($sp) -/* 11520 8094A1F0 F7B40018 */ sdc1 $f20, 0x0018($sp) +/* 114FC 8094A1CC AFB40048 */ sw $s4, 0x0048($sp) +/* 11500 8094A1D0 AFB30044 */ sw $s3, 0x0044($sp) +/* 11504 8094A1D4 AFB20040 */ sw $s2, 0x0040($sp) +/* 11508 8094A1D8 AFB00038 */ sw $s0, 0x0038($sp) +/* 1150C 8094A1DC F7B80028 */ sdc1 $f24, 0x0028($sp) +/* 11510 8094A1E0 C43AB218 */ lwc1 $f26, %lo(D_8094B218)($at) +/* 11514 8094A1E4 AFBF004C */ sw $ra, 0x004C($sp) +/* 11518 8094A1E8 AFB1003C */ sw $s1, 0x003C($sp) +/* 1151C 8094A1EC F7B60020 */ sdc1 $f22, 0x0020($sp) +/* 11520 8094A1F0 F7B40018 */ sdc1 $f20, 0x0018($sp) /* 11524 8094A1F4 3C018095 */ lui $at, %hi(D_8094B21C) ## $at = 80950000 /* 11528 8094A1F8 3C138095 */ lui $s3, %hi(D_8094A86C) ## $s3 = 80950000 /* 1152C 8094A1FC 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 11530 8094A200 8CB11C44 */ lw $s1, 0x1C44($a1) ## 00001C44 /* 11534 8094A204 2673A86C */ addiu $s3, $s3, %lo(D_8094A86C) ## $s3 = 8094A86C -/* 11538 8094A208 C438B21C */ lwc1 $f24, %lo(D_8094B21C)($at) +/* 11538 8094A208 C438B21C */ lwc1 $f24, %lo(D_8094B21C)($at) /* 1153C 8094A20C 249204B0 */ addiu $s2, $a0, 0x04B0 ## $s2 = 000004B0 /* 11540 8094A210 2414000C */ addiu $s4, $zero, 0x000C ## $s4 = 0000000C .L8094A214: /* 11544 8094A214 0C00CFBE */ jal Math_Rand_ZeroFloat - -/* 11548 8094A218 4600C306 */ mov.s $f12, $f24 -/* 1154C 8094A21C 4600010D */ trunc.w.s $f4, $f0 + +/* 11548 8094A218 4600C306 */ mov.s $f12, $f24 +/* 1154C 8094A21C 4600010D */ trunc.w.s $f4, $f0 /* 11550 8094A220 860E0154 */ lh $t6, 0x0154($s0) ## 00000154 -/* 11554 8094A224 44182000 */ mfc1 $t8, $f4 +/* 11554 8094A224 44182000 */ mfc1 $t8, $f4 /* 11558 8094A228 00000000 */ nop -/* 1155C 8094A22C 0018CC00 */ sll $t9, $t8, 16 -/* 11560 8094A230 00194403 */ sra $t0, $t9, 16 +/* 1155C 8094A22C 0018CC00 */ sll $t9, $t8, 16 +/* 11560 8094A230 00194403 */ sra $t0, $t9, 16 /* 11564 8094A234 25090001 */ addiu $t1, $t0, 0x0001 ## $t1 = 00000001 -/* 11568 8094A238 00095400 */ sll $t2, $t1, 16 -/* 1156C 8094A23C 000A5C03 */ sra $t3, $t2, 16 -/* 11570 8094A240 01CB6021 */ addu $t4, $t6, $t3 +/* 11568 8094A238 00095400 */ sll $t2, $t1, 16 +/* 1156C 8094A23C 000A5C03 */ sra $t3, $t2, 16 +/* 11570 8094A240 01CB6021 */ addu $t4, $t6, $t3 /* 11574 8094A244 A60C0154 */ sh $t4, 0x0154($s0) ## 00000154 /* 11578 8094A248 860D0154 */ lh $t5, 0x0154($s0) ## 00000154 -/* 1157C 8094A24C 05A10004 */ bgez $t5, .L8094A260 +/* 1157C 8094A24C 05A10004 */ bgez $t5, .L8094A260 /* 11580 8094A250 31AF0003 */ andi $t7, $t5, 0x0003 ## $t7 = 00000000 -/* 11584 8094A254 11E00002 */ beq $t7, $zero, .L8094A260 +/* 11584 8094A254 11E00002 */ beq $t7, $zero, .L8094A260 /* 11588 8094A258 00000000 */ nop /* 1158C 8094A25C 25EFFFFC */ addiu $t7, $t7, 0xFFFC ## $t7 = FFFFFFFC .L8094A260: /* 11590 8094A260 A60F0154 */ sh $t7, 0x0154($s0) ## 00000154 /* 11594 8094A264 86180154 */ lh $t8, 0x0154($s0) ## 00000154 -/* 11598 8094A268 03140019 */ multu $t8, $s4 -/* 1159C 8094A26C 0000C812 */ mflo $t9 -/* 115A0 8094A270 02794021 */ addu $t0, $s3, $t9 +/* 11598 8094A268 03140019 */ multu $t8, $s4 +/* 1159C 8094A26C 0000C812 */ mflo $t9 +/* 115A0 8094A270 02794021 */ addu $t0, $s3, $t9 /* 115A4 8094A274 8D0A0000 */ lw $t2, 0x0000($t0) ## 00000000 /* 115A8 8094A278 AE4A0000 */ sw $t2, 0x0000($s2) ## 000004B0 /* 115AC 8094A27C 8D090004 */ lw $t1, 0x0004($t0) ## 00000004 @@ -57,68 +57,68 @@ glabel func_8094A1C0 /* 115C0 8094A290 C60204B0 */ lwc1 $f2, 0x04B0($s0) ## 000004B0 /* 115C4 8094A294 C628002C */ lwc1 $f8, 0x002C($s1) ## 0000002C /* 115C8 8094A298 C61004B8 */ lwc1 $f16, 0x04B8($s0) ## 000004B8 -/* 115CC 8094A29C 46061501 */ sub.s $f20, $f2, $f6 -/* 115D0 8094A2A0 46088581 */ sub.s $f22, $f16, $f8 -/* 115D4 8094A2A4 4614A282 */ mul.s $f10, $f20, $f20 +/* 115CC 8094A29C 46061501 */ sub.s $f20, $f2, $f6 +/* 115D0 8094A2A0 46088581 */ sub.s $f22, $f16, $f8 +/* 115D4 8094A2A4 4614A282 */ mul.s $f10, $f20, $f20 /* 115D8 8094A2A8 00000000 */ nop -/* 115DC 8094A2AC 4616B102 */ mul.s $f4, $f22, $f22 -/* 115E0 8094A2B0 46045180 */ add.s $f6, $f10, $f4 -/* 115E4 8094A2B4 4606D03C */ c.lt.s $f26, $f6 +/* 115DC 8094A2AC 4616B102 */ mul.s $f4, $f22, $f22 +/* 115E0 8094A2B0 46045180 */ add.s $f6, $f10, $f4 +/* 115E4 8094A2B4 4606D03C */ c.lt.s $f26, $f6 /* 115E8 8094A2B8 00000000 */ nop -/* 115EC 8094A2BC 4500FFD5 */ bc1f .L8094A214 +/* 115EC 8094A2BC 4500FFD5 */ bc1f .L8094A214 /* 115F0 8094A2C0 00000000 */ nop /* 115F4 8094A2C4 C6080024 */ lwc1 $f8, 0x0024($s0) ## 00000024 /* 115F8 8094A2C8 C604002C */ lwc1 $f4, 0x002C($s0) ## 0000002C /* 115FC 8094A2CC 3C0143F0 */ lui $at, 0x43F0 ## $at = 43F00000 -/* 11600 8094A2D0 46081501 */ sub.s $f20, $f2, $f8 +/* 11600 8094A2D0 46081501 */ sub.s $f20, $f2, $f8 /* 11604 8094A2D4 44810000 */ mtc1 $at, $f0 ## $f0 = 480.00 /* 11608 8094A2D8 44809000 */ mtc1 $zero, $f18 ## $f18 = 0.00 -/* 1160C 8094A2DC 46048581 */ sub.s $f22, $f16, $f4 +/* 1160C 8094A2DC 46048581 */ sub.s $f22, $f16, $f4 /* 11610 8094A2E0 C60A0028 */ lwc1 $f10, 0x0028($s0) ## 00000028 /* 11614 8094A2E4 3C0E8095 */ lui $t6, %hi(func_8094A398) ## $t6 = 80950000 /* 11618 8094A2E8 25CEA398 */ addiu $t6, $t6, %lo(func_8094A398) ## $t6 = 8094A398 /* 1161C 8094A2EC AE0E014C */ sw $t6, 0x014C($s0) ## 0000014C -/* 11620 8094A2F0 4600B386 */ mov.s $f14, $f22 -/* 11624 8094A2F4 4600A306 */ mov.s $f12, $f20 +/* 11620 8094A2F0 4600B386 */ mov.s $f14, $f22 +/* 11624 8094A2F4 4600A306 */ mov.s $f12, $f20 /* 11628 8094A2F8 E60004B4 */ swc1 $f0, 0x04B4($s0) ## 000004B4 /* 1162C 8094A2FC E61204C8 */ swc1 $f18, 0x04C8($s0) ## 000004C8 /* 11630 8094A300 E6120068 */ swc1 $f18, 0x0068($s0) ## 00000068 -/* 11634 8094A304 0C03F494 */ jal func_800FD250 -/* 11638 8094A308 460A0601 */ sub.s $f24, $f0, $f10 +/* 11634 8094A304 0C03F494 */ jal Math_atan2f +/* 11638 8094A308 460A0601 */ sub.s $f24, $f0, $f10 /* 1163C 8094A30C 3C018095 */ lui $at, %hi(D_8094B220) ## $at = 80950000 -/* 11640 8094A310 C43AB220 */ lwc1 $f26, %lo(D_8094B220)($at) -/* 11644 8094A314 4600C306 */ mov.s $f12, $f24 -/* 11648 8094A318 461A0182 */ mul.s $f6, $f0, $f26 +/* 11640 8094A310 C43AB220 */ lwc1 $f26, %lo(D_8094B220)($at) +/* 11644 8094A314 4600C306 */ mov.s $f12, $f24 +/* 11648 8094A318 461A0182 */ mul.s $f6, $f0, $f26 /* 1164C 8094A31C 00000000 */ nop -/* 11650 8094A320 4614A282 */ mul.s $f10, $f20, $f20 +/* 11650 8094A320 4614A282 */ mul.s $f10, $f20, $f20 /* 11654 8094A324 00000000 */ nop -/* 11658 8094A328 4616B102 */ mul.s $f4, $f22, $f22 -/* 1165C 8094A32C 4600320D */ trunc.w.s $f8, $f6 -/* 11660 8094A330 46045000 */ add.s $f0, $f10, $f4 -/* 11664 8094A334 440C4000 */ mfc1 $t4, $f8 -/* 11668 8094A338 46000384 */ sqrt.s $f14, $f0 -/* 1166C 8094A33C 0C03F494 */ jal func_800FD250 +/* 11658 8094A328 4616B102 */ mul.s $f4, $f22, $f22 +/* 1165C 8094A32C 4600320D */ trunc.w.s $f8, $f6 +/* 11660 8094A330 46045000 */ add.s $f0, $f10, $f4 +/* 11664 8094A334 440C4000 */ mfc1 $t4, $f8 +/* 11668 8094A338 46000384 */ sqrt.s $f14, $f0 +/* 1166C 8094A33C 0C03F494 */ jal Math_atan2f /* 11670 8094A340 A60C0032 */ sh $t4, 0x0032($s0) ## 00000032 -/* 11674 8094A344 461A0182 */ mul.s $f6, $f0, $f26 +/* 11674 8094A344 461A0182 */ mul.s $f6, $f0, $f26 /* 11678 8094A348 3C050603 */ lui $a1, 0x0603 ## $a1 = 06030000 /* 1167C 8094A34C 24A52BF8 */ addiu $a1, $a1, 0x2BF8 ## $a1 = 06032BF8 /* 11680 8094A350 26040568 */ addiu $a0, $s0, 0x0568 ## $a0 = 00000568 /* 11684 8094A354 3C06C120 */ lui $a2, 0xC120 ## $a2 = C1200000 -/* 11688 8094A358 4600320D */ trunc.w.s $f8, $f6 -/* 1168C 8094A35C 440F4000 */ mfc1 $t7, $f8 -/* 11690 8094A360 0C0294D3 */ jal func_800A534C +/* 11688 8094A358 4600320D */ trunc.w.s $f8, $f6 +/* 1168C 8094A35C 440F4000 */ mfc1 $t7, $f8 +/* 11690 8094A360 0C0294D3 */ jal SkelAnime_ChangeAnimTransitionRepeat /* 11694 8094A364 A60F0030 */ sh $t7, 0x0030($s0) ## 00000030 -/* 11698 8094A368 8FBF004C */ lw $ra, 0x004C($sp) -/* 1169C 8094A36C D7B40018 */ ldc1 $f20, 0x0018($sp) -/* 116A0 8094A370 D7B60020 */ ldc1 $f22, 0x0020($sp) -/* 116A4 8094A374 D7B80028 */ ldc1 $f24, 0x0028($sp) -/* 116A8 8094A378 D7BA0030 */ ldc1 $f26, 0x0030($sp) -/* 116AC 8094A37C 8FB00038 */ lw $s0, 0x0038($sp) -/* 116B0 8094A380 8FB1003C */ lw $s1, 0x003C($sp) -/* 116B4 8094A384 8FB20040 */ lw $s2, 0x0040($sp) -/* 116B8 8094A388 8FB30044 */ lw $s3, 0x0044($sp) -/* 116BC 8094A38C 8FB40048 */ lw $s4, 0x0048($sp) -/* 116C0 8094A390 03E00008 */ jr $ra +/* 11698 8094A368 8FBF004C */ lw $ra, 0x004C($sp) +/* 1169C 8094A36C D7B40018 */ ldc1 $f20, 0x0018($sp) +/* 116A0 8094A370 D7B60020 */ ldc1 $f22, 0x0020($sp) +/* 116A4 8094A374 D7B80028 */ ldc1 $f24, 0x0028($sp) +/* 116A8 8094A378 D7BA0030 */ ldc1 $f26, 0x0030($sp) +/* 116AC 8094A37C 8FB00038 */ lw $s0, 0x0038($sp) +/* 116B0 8094A380 8FB1003C */ lw $s1, 0x003C($sp) +/* 116B4 8094A384 8FB20040 */ lw $s2, 0x0040($sp) +/* 116B8 8094A388 8FB30044 */ lw $s3, 0x0044($sp) +/* 116BC 8094A38C 8FB40048 */ lw $s4, 0x0048($sp) +/* 116C0 8094A390 03E00008 */ jr $ra /* 116C4 8094A394 27BD0050 */ addiu $sp, $sp, 0x0050 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8094A398.s b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8094A398.s index 951414fbca..cc5dcecc45 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8094A398.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8094A398.s @@ -21,7 +21,7 @@ glabel func_8094A398 /* 1170C 8094A3DC C60404B8 */ lwc1 $f4, 0x04B8($s0) ## 000004B8 /* 11710 8094A3E0 E7AC003C */ swc1 $f12, 0x003C($sp) /* 11714 8094A3E4 46062381 */ sub.s $f14, $f4, $f6 -/* 11718 8094A3E8 0C03F494 */ jal func_800FD250 +/* 11718 8094A3E8 0C03F494 */ jal Math_atan2f /* 1171C 8094A3EC E7AE0034 */ swc1 $f14, 0x0034($sp) /* 11720 8094A3F0 3C018095 */ lui $at, %hi(D_8094B224) ## $at = 80950000 /* 11724 8094A3F4 C428B224 */ lwc1 $f8, %lo(D_8094B224)($at) @@ -41,7 +41,7 @@ glabel func_8094A398 /* 1175C 8094A42C 46000384 */ sqrt.s $f14, $f0 /* 11760 8094A430 468021A0 */ cvt.s.w $f6, $f4 /* 11764 8094A434 E7AE0028 */ swc1 $f14, 0x0028($sp) -/* 11768 8094A438 0C03F494 */ jal func_800FD250 +/* 11768 8094A438 0C03F494 */ jal Math_atan2f /* 1176C 8094A43C E7A6002C */ swc1 $f6, 0x002C($sp) /* 11770 8094A440 3C018095 */ lui $at, %hi(D_8094B228) ## $at = 80950000 /* 11774 8094A444 C432B228 */ lwc1 $f18, %lo(D_8094B228)($at) diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8094A608.s b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8094A608.s index 49a84f0e40..cdab9839da 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8094A608.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8094A608.s @@ -1,25 +1,25 @@ glabel func_8094A608 /* 11938 8094A608 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 1193C 8094A60C AFA5001C */ sw $a1, 0x001C($sp) +/* 1193C 8094A60C AFA5001C */ sw $a1, 0x001C($sp) /* 11940 8094A610 3C0E8095 */ lui $t6, %hi(func_8094A660) ## $t6 = 80950000 -/* 11944 8094A614 AFBF0014 */ sw $ra, 0x0014($sp) +/* 11944 8094A614 AFBF0014 */ sw $ra, 0x0014($sp) /* 11948 8094A618 25CEA660 */ addiu $t6, $t6, %lo(func_8094A660) ## $t6 = 8094A660 /* 1194C 8094A61C 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 /* 11950 8094A620 AC8E014C */ sw $t6, 0x014C($a0) ## 0000014C /* 11954 8094A624 3C050603 */ lui $a1, 0x0603 ## $a1 = 06030000 /* 11958 8094A628 24A52BF8 */ addiu $a1, $a1, 0x2BF8 ## $a1 = 06032BF8 -/* 1195C 8094A62C AFA70018 */ sw $a3, 0x0018($sp) +/* 1195C 8094A62C AFA70018 */ sw $a3, 0x0018($sp) /* 11960 8094A630 24840568 */ addiu $a0, $a0, 0x0568 ## $a0 = 00000568 -/* 11964 8094A634 0C0294D3 */ jal func_800A534C +/* 11964 8094A634 0C0294D3 */ jal SkelAnime_ChangeAnimTransitionRepeat /* 11968 8094A638 24060000 */ addiu $a2, $zero, 0x0000 ## $a2 = 00000000 -/* 1196C 8094A63C 8FA70018 */ lw $a3, 0x0018($sp) +/* 1196C 8094A63C 8FA70018 */ lw $a3, 0x0018($sp) /* 11970 8094A640 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 /* 11974 8094A644 240F0014 */ addiu $t7, $zero, 0x0014 ## $t7 = 00000014 /* 11978 8094A648 A4EF0178 */ sh $t7, 0x0178($a3) ## 00000178 /* 1197C 8094A64C E4E40068 */ swc1 $f4, 0x0068($a3) ## 00000068 -/* 11980 8094A650 8FBF0014 */ lw $ra, 0x0014($sp) +/* 11980 8094A650 8FBF0014 */ lw $ra, 0x0014($sp) /* 11984 8094A654 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 11988 8094A658 03E00008 */ jr $ra +/* 11988 8094A658 03E00008 */ jr $ra /* 1198C 8094A65C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8094A6D8.s b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8094A6D8.s index ca599b3ed4..6ef49524ec 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8094A6D8.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8094A6D8.s @@ -1,30 +1,30 @@ glabel func_8094A6D8 /* 11A08 8094A6D8 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 11A0C 8094A6DC AFA5001C */ sw $a1, 0x001C($sp) +/* 11A0C 8094A6DC AFA5001C */ sw $a1, 0x001C($sp) /* 11A10 8094A6E0 3C0E8095 */ lui $t6, %hi(func_8094A740) ## $t6 = 80950000 -/* 11A14 8094A6E4 AFBF0014 */ sw $ra, 0x0014($sp) +/* 11A14 8094A6E4 AFBF0014 */ sw $ra, 0x0014($sp) /* 11A18 8094A6E8 25CEA740 */ addiu $t6, $t6, %lo(func_8094A740) ## $t6 = 8094A740 /* 11A1C 8094A6EC 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 /* 11A20 8094A6F0 AC8E014C */ sw $t6, 0x014C($a0) ## 0000014C /* 11A24 8094A6F4 3C050604 */ lui $a1, 0x0604 ## $a1 = 06040000 /* 11A28 8094A6F8 24A5A2D0 */ addiu $a1, $a1, 0xA2D0 ## $a1 = 0603A2D0 -/* 11A2C 8094A6FC AFA70018 */ sw $a3, 0x0018($sp) +/* 11A2C 8094A6FC AFA70018 */ sw $a3, 0x0018($sp) /* 11A30 8094A700 24840568 */ addiu $a0, $a0, 0x0568 ## $a0 = 00000568 -/* 11A34 8094A704 0C029490 */ jal func_800A5240 +/* 11A34 8094A704 0C029490 */ jal SkelAnime_ChangeAnimTransitionStop /* 11A38 8094A708 24060000 */ addiu $a2, $zero, 0x0000 ## $a2 = 00000000 /* 11A3C 8094A70C 3C040604 */ lui $a0, 0x0604 ## $a0 = 06040000 /* 11A40 8094A710 0C028800 */ jal SkelAnime_GetFrameCount - + /* 11A44 8094A714 2484A2D0 */ addiu $a0, $a0, 0xA2D0 ## $a0 = 0603A2D0 /* 11A48 8094A718 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 -/* 11A4C 8094A71C 8FA70018 */ lw $a3, 0x0018($sp) +/* 11A4C 8094A71C 8FA70018 */ lw $a3, 0x0018($sp) /* 11A50 8094A720 44804000 */ mtc1 $zero, $f8 ## $f8 = 0.00 -/* 11A54 8094A724 468021A0 */ cvt.s.w $f6, $f4 +/* 11A54 8094A724 468021A0 */ cvt.s.w $f6, $f4 /* 11A58 8094A728 E4E80068 */ swc1 $f8, 0x0068($a3) ## 00000068 /* 11A5C 8094A72C E4E601A4 */ swc1 $f6, 0x01A4($a3) ## 000001A4 -/* 11A60 8094A730 8FBF0014 */ lw $ra, 0x0014($sp) +/* 11A60 8094A730 8FBF0014 */ lw $ra, 0x0014($sp) /* 11A64 8094A734 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 11A68 8094A738 03E00008 */ jr $ra +/* 11A68 8094A738 03E00008 */ jr $ra /* 11A6C 8094A73C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Va/BossVa_Destroy.s b/asm/non_matchings/overlays/actors/ovl_Boss_Va/BossVa_Destroy.s index fc63611591..23ba422a08 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Va/BossVa_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Va/BossVa_Destroy.s @@ -1,22 +1,22 @@ glabel BossVa_Destroy /* 013E8 809506A8 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 013EC 809506AC AFBF0014 */ sw $ra, 0x0014($sp) -/* 013F0 809506B0 AFA40018 */ sw $a0, 0x0018($sp) -/* 013F4 809506B4 AFA5001C */ sw $a1, 0x001C($sp) -/* 013F8 809506B8 0C0295BC */ jal func_800A56F0 +/* 013EC 809506AC AFBF0014 */ sw $ra, 0x0014($sp) +/* 013F0 809506B0 AFA40018 */ sw $a0, 0x0018($sp) +/* 013F4 809506B4 AFA5001C */ sw $a1, 0x001C($sp) +/* 013F8 809506B8 0C0295BC */ jal SkelAnime_Free /* 013FC 809506BC 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 01400 809506C0 8FA50018 */ lw $a1, 0x0018($sp) -/* 01404 809506C4 8FA4001C */ lw $a0, 0x001C($sp) -/* 01408 809506C8 0C016F32 */ jal func_8005BCC8 +/* 01400 809506C0 8FA50018 */ lw $a1, 0x0018($sp) +/* 01404 809506C4 8FA4001C */ lw $a0, 0x001C($sp) +/* 01408 809506C8 0C016F32 */ jal func_8005BCC8 /* 0140C 809506CC 24A502D8 */ addiu $a1, $a1, 0x02D8 ## $a1 = 000002D8 -/* 01410 809506D0 8FA50018 */ lw $a1, 0x0018($sp) -/* 01414 809506D4 8FA4001C */ lw $a0, 0x001C($sp) +/* 01410 809506D0 8FA50018 */ lw $a1, 0x0018($sp) +/* 01414 809506D4 8FA4001C */ lw $a0, 0x001C($sp) /* 01418 809506D8 0C0170EB */ jal ActorCollider_FreeCylinder - + /* 0141C 809506DC 24A5028C */ addiu $a1, $a1, 0x028C ## $a1 = 0000028C -/* 01420 809506E0 8FBF0014 */ lw $ra, 0x0014($sp) +/* 01420 809506E0 8FBF0014 */ lw $ra, 0x0014($sp) /* 01424 809506E4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 01428 809506E8 03E00008 */ jr $ra +/* 01428 809506E8 03E00008 */ jr $ra /* 0142C 809506EC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Va/BossVa_Draw.s b/asm/non_matchings/overlays/actors/ovl_Boss_Va/BossVa_Draw.s index 7f01783a7e..2f2f8d9608 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Va/BossVa_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Va/BossVa_Draw.s @@ -1,9 +1,9 @@ glabel BossVa_Draw /* 09F08 809591C8 27BDFF30 */ addiu $sp, $sp, 0xFF30 ## $sp = FFFFFF30 /* 09F0C 809591CC 3C0F8096 */ lui $t7, %hi(D_8095C2AC) ## $t7 = 80960000 -/* 09F10 809591D0 AFBF003C */ sw $ra, 0x003C($sp) -/* 09F14 809591D4 AFB10038 */ sw $s1, 0x0038($sp) -/* 09F18 809591D8 AFB00034 */ sw $s0, 0x0034($sp) +/* 09F10 809591D0 AFBF003C */ sw $ra, 0x003C($sp) +/* 09F14 809591D4 AFB10038 */ sw $s1, 0x0038($sp) +/* 09F18 809591D8 AFB00034 */ sw $s0, 0x0034($sp) /* 09F1C 809591DC 25EFC2AC */ addiu $t7, $t7, %lo(D_8095C2AC) ## $t7 = 8095C2AC /* 09F20 809591E0 8DF90000 */ lw $t9, 0x0000($t7) ## 8095C2AC /* 09F24 809591E4 27AE00B0 */ addiu $t6, $sp, 0x00B0 ## $t6 = FFFFFFE0 @@ -58,58 +58,58 @@ glabel BossVa_Draw /* 09FE8 809592A8 3C0E8096 */ lui $t6, %hi(D_8095C2F4) ## $t6 = 80960000 /* 09FEC 809592AC AD4C0004 */ sw $t4, 0x0004($t2) ## FFFFFFA8 /* 09FF0 809592B0 AD4D0008 */ sw $t5, 0x0008($t2) ## FFFFFFAC -/* 09FF4 809592B4 8DCEC2F4 */ lw $t6, %lo(D_8095C2F4)($t6) +/* 09FF4 809592B4 8DCEC2F4 */ lw $t6, %lo(D_8095C2F4)($t6) /* 09FF8 809592B8 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 /* 09FFC 809592BC 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 0A000 809592C0 AFAE0070 */ sw $t6, 0x0070($sp) +/* 0A000 809592C0 AFAE0070 */ sw $t6, 0x0070($sp) /* 0A004 809592C4 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 /* 0A008 809592C8 3C068096 */ lui $a2, %hi(D_8095C470) ## $a2 = 80960000 /* 0A00C 809592CC 24C6C470 */ addiu $a2, $a2, %lo(D_8095C470) ## $a2 = 8095C470 /* 0A010 809592D0 27A4005C */ addiu $a0, $sp, 0x005C ## $a0 = FFFFFF8C /* 0A014 809592D4 240711BE */ addiu $a3, $zero, 0x11BE ## $a3 = 000011BE -/* 0A018 809592D8 0C031AB1 */ jal func_800C6AC4 -/* 0A01C 809592DC AFA5006C */ sw $a1, 0x006C($sp) -/* 0A020 809592E0 0C024F46 */ jal func_80093D18 +/* 0A018 809592D8 0C031AB1 */ jal Graph_OpenDisps +/* 0A01C 809592DC AFA5006C */ sw $a1, 0x006C($sp) +/* 0A020 809592E0 0C024F46 */ jal func_80093D18 /* 0A024 809592E4 8E240000 */ lw $a0, 0x0000($s1) ## 00000000 -/* 0A028 809592E8 0C024F61 */ jal func_80093D84 +/* 0A028 809592E8 0C024F61 */ jal func_80093D84 /* 0A02C 809592EC 8E240000 */ lw $a0, 0x0000($s1) ## 00000000 /* 0A030 809592F0 860F001C */ lh $t7, 0x001C($s0) ## 0000001C /* 0A034 809592F4 25F80001 */ addiu $t8, $t7, 0x0001 ## $t8 = 00000001 -/* 0A038 809592F8 2F010015 */ sltiu $at, $t8, 0x0015 -/* 0A03C 809592FC 1020009E */ beq $at, $zero, .L80959578 -/* 0A040 80959300 0018C080 */ sll $t8, $t8, 2 +/* 0A038 809592F8 2F010015 */ sltiu $at, $t8, 0x0015 +/* 0A03C 809592FC 1020009E */ beq $at, $zero, .L80959578 +/* 0A040 80959300 0018C080 */ sll $t8, $t8, 2 /* 0A044 80959304 3C018096 */ lui $at, %hi(jtbl_8095C840) ## $at = 80960000 -/* 0A048 80959308 00380821 */ addu $at, $at, $t8 -/* 0A04C 8095930C 8C38C840 */ lw $t8, %lo(jtbl_8095C840)($at) -/* 0A050 80959310 03000008 */ jr $t8 +/* 0A048 80959308 00380821 */ addu $at, $at, $t8 +/* 0A04C 8095930C 8C38C840 */ lw $t8, %lo(jtbl_8095C840)($at) +/* 0A050 80959310 03000008 */ jr $t8 /* 0A054 80959314 00000000 */ nop glabel L80959318 /* 0A058 80959318 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 0A05C 8095931C 02214021 */ addu $t0, $s1, $at +/* 0A05C 8095931C 02214021 */ addu $t0, $s1, $at /* 0A060 80959320 85020AC2 */ lh $v0, 0x0AC2($t0) ## 00000AC2 /* 0A064 80959324 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 0A068 80959328 00310821 */ addu $at, $at, $s1 -/* 0A06C 8095932C 10400008 */ beq $v0, $zero, .L80959350 +/* 0A068 80959328 00310821 */ addu $at, $at, $s1 +/* 0A06C 8095932C 10400008 */ beq $v0, $zero, .L80959350 /* 0A070 80959330 2459015E */ addiu $t9, $v0, 0x015E ## $t9 = 0000015E /* 0A074 80959334 A4390AC2 */ sh $t9, 0x0AC2($at) ## 00010AC2 /* 0A078 80959338 850A0AC2 */ lh $t2, 0x0AC2($t0) ## 00000AC2 /* 0A07C 8095933C 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 0A080 80959340 00310821 */ addu $at, $at, $s1 -/* 0A084 80959344 59400003 */ blezl $t2, .L80959354 +/* 0A080 80959340 00310821 */ addu $at, $at, $s1 +/* 0A084 80959344 59400003 */ blezl $t2, .L80959354 /* 0A088 80959348 85020AC4 */ lh $v0, 0x0AC4($t0) ## 00000AC4 /* 0A08C 8095934C A4200AC2 */ sh $zero, 0x0AC2($at) ## 00010AC2 .L80959350: /* 0A090 80959350 85020AC4 */ lh $v0, 0x0AC4($t0) ## 00000AC4 .L80959354: /* 0A094 80959354 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 0A098 80959358 00310821 */ addu $at, $at, $s1 -/* 0A09C 8095935C 10400008 */ beq $v0, $zero, .L80959380 +/* 0A098 80959358 00310821 */ addu $at, $at, $s1 +/* 0A09C 8095935C 10400008 */ beq $v0, $zero, .L80959380 /* 0A0A0 80959360 244B015E */ addiu $t3, $v0, 0x015E ## $t3 = 0000015E /* 0A0A4 80959364 A42B0AC4 */ sh $t3, 0x0AC4($at) ## 00010AC4 /* 0A0A8 80959368 850C0AC4 */ lh $t4, 0x0AC4($t0) ## 00000AC4 /* 0A0AC 8095936C 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 0A0B0 80959370 00310821 */ addu $at, $at, $s1 -/* 0A0B4 80959374 59800003 */ blezl $t4, .L80959384 +/* 0A0B0 80959370 00310821 */ addu $at, $at, $s1 +/* 0A0B4 80959374 59800003 */ blezl $t4, .L80959384 /* 0A0B8 80959378 920D0197 */ lbu $t5, 0x0197($s0) ## 00000197 /* 0A0BC 8095937C A4200AC4 */ sh $zero, 0x0AC4($at) ## 00010AC4 .L80959380: @@ -117,8 +117,8 @@ glabel L80959318 .L80959384: /* 0A0C4 80959384 3C0FDB06 */ lui $t7, 0xDB06 ## $t7 = DB060000 /* 0A0C8 80959388 35EF0020 */ ori $t7, $t7, 0x0020 ## $t7 = DB060020 -/* 0A0CC 8095938C 15A000FF */ bne $t5, $zero, .L8095978C -/* 0A0D0 80959390 8FA9006C */ lw $t1, 0x006C($sp) +/* 0A0CC 8095938C 15A000FF */ bne $t5, $zero, .L8095978C +/* 0A0D0 80959390 8FA9006C */ lw $t1, 0x006C($sp) /* 0A0D4 80959394 8D2202C0 */ lw $v0, 0x02C0($t1) ## 000002C0 /* 0A0D8 80959398 24180008 */ addiu $t8, $zero, 0x0008 ## $t8 = 00000008 /* 0A0DC 8095939C 24190010 */ addiu $t9, $zero, 0x0010 ## $t9 = 00000010 @@ -127,32 +127,32 @@ glabel L80959318 /* 0A0E8 809593A8 AC4F0000 */ sw $t7, 0x0000($v0) ## 00000000 /* 0A0EC 809593AC 8E240000 */ lw $a0, 0x0000($s1) ## 00000000 /* 0A0F0 809593B0 240A0001 */ addiu $t2, $zero, 0x0001 ## $t2 = 00000001 -/* 0A0F4 809593B4 AFAA0018 */ sw $t2, 0x0018($sp) -/* 0A0F8 809593B8 AFA0001C */ sw $zero, 0x001C($sp) -/* 0A0FC 809593BC AFB90014 */ sw $t9, 0x0014($sp) -/* 0A100 809593C0 AFB80010 */ sw $t8, 0x0010($sp) +/* 0A0F4 809593B4 AFAA0018 */ sw $t2, 0x0018($sp) +/* 0A0F8 809593B8 AFA0001C */ sw $zero, 0x001C($sp) +/* 0A0FC 809593BC AFB90014 */ sw $t9, 0x0014($sp) +/* 0A100 809593C0 AFB80010 */ sw $t8, 0x0010($sp) /* 0A104 809593C4 8D0B1DE4 */ lw $t3, 0x1DE4($t0) ## 00001DE4 /* 0A108 809593C8 240F0010 */ addiu $t7, $zero, 0x0010 ## $t7 = 00000010 /* 0A10C 809593CC 240E0010 */ addiu $t6, $zero, 0x0010 ## $t6 = 00000010 -/* 0A110 809593D0 000B0823 */ subu $at, $zero, $t3 -/* 0A114 809593D4 00016080 */ sll $t4, $at, 2 -/* 0A118 809593D8 01816021 */ addu $t4, $t4, $at -/* 0A11C 809593DC 000C6040 */ sll $t4, $t4, 1 +/* 0A110 809593D0 000B0823 */ subu $at, $zero, $t3 +/* 0A114 809593D4 00016080 */ sll $t4, $at, 2 +/* 0A118 809593D8 01816021 */ addu $t4, $t4, $at +/* 0A11C 809593DC 000C6040 */ sll $t4, $t4, 1 /* 0A120 809593E0 318D000F */ andi $t5, $t4, 0x000F ## $t5 = 00000000 -/* 0A124 809593E4 AFAD0020 */ sw $t5, 0x0020($sp) -/* 0A128 809593E8 AFAE0024 */ sw $t6, 0x0024($sp) -/* 0A12C 809593EC AFAF0028 */ sw $t7, 0x0028($sp) -/* 0A130 809593F0 AFA8004C */ sw $t0, 0x004C($sp) +/* 0A124 809593E4 AFAD0020 */ sw $t5, 0x0020($sp) +/* 0A128 809593E8 AFAE0024 */ sw $t6, 0x0024($sp) +/* 0A12C 809593EC AFAF0028 */ sw $t7, 0x0028($sp) +/* 0A130 809593F0 AFA8004C */ sw $t0, 0x004C($sp) /* 0A134 809593F4 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 0A138 809593F8 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 /* 0A13C 809593FC 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 0A140 80959400 0C0253D0 */ jal Draw_TwoTexScroll -/* 0A144 80959404 AFA20058 */ sw $v0, 0x0058($sp) -/* 0A148 80959408 8FA30058 */ lw $v1, 0x0058($sp) -/* 0A14C 8095940C 8FA8004C */ lw $t0, 0x004C($sp) +/* 0A140 80959400 0C0253D0 */ jal Gfx_TwoTexScroll +/* 0A144 80959404 AFA20058 */ sw $v0, 0x0058($sp) +/* 0A148 80959408 8FA30058 */ lw $v1, 0x0058($sp) +/* 0A14C 8095940C 8FA8004C */ lw $t0, 0x004C($sp) /* 0A150 80959410 3C0ADB06 */ lui $t2, 0xDB06 ## $t2 = DB060000 /* 0A154 80959414 AC620004 */ sw $v0, 0x0004($v1) ## 00000004 -/* 0A158 80959418 8FB8006C */ lw $t8, 0x006C($sp) +/* 0A158 80959418 8FB8006C */ lw $t8, 0x006C($sp) /* 0A15C 8095941C 354A0024 */ ori $t2, $t2, 0x0024 ## $t2 = DB060024 /* 0A160 80959420 240B0010 */ addiu $t3, $zero, 0x0010 ## $t3 = 00000010 /* 0A164 80959424 8F0202C0 */ lw $v0, 0x02C0($t8) ## 000002C0 @@ -164,27 +164,27 @@ glabel L80959318 /* 0A17C 8095943C 8D031DE4 */ lw $v1, 0x1DE4($t0) ## 00001DE4 /* 0A180 80959440 8E240000 */ lw $a0, 0x0000($s1) ## 00000000 /* 0A184 80959444 24190010 */ addiu $t9, $zero, 0x0010 ## $t9 = 00000010 -/* 0A188 80959448 00030823 */ subu $at, $zero, $v1 -/* 0A18C 8095944C 00013880 */ sll $a3, $at, 2 -/* 0A190 80959450 00017080 */ sll $t6, $at, 2 -/* 0A194 80959454 01C17021 */ addu $t6, $t6, $at -/* 0A198 80959458 00E13821 */ addu $a3, $a3, $at -/* 0A19C 8095945C 00073840 */ sll $a3, $a3, 1 +/* 0A188 80959448 00030823 */ subu $at, $zero, $v1 +/* 0A18C 8095944C 00013880 */ sll $a3, $at, 2 +/* 0A190 80959450 00017080 */ sll $t6, $at, 2 +/* 0A194 80959454 01C17021 */ addu $t6, $t6, $at +/* 0A198 80959458 00E13821 */ addu $a3, $a3, $at +/* 0A19C 8095945C 00073840 */ sll $a3, $a3, 1 /* 0A1A0 80959460 31CF001F */ andi $t7, $t6, 0x001F ## $t7 = 00000000 /* 0A1A4 80959464 24180020 */ addiu $t8, $zero, 0x0020 ## $t8 = 00000020 -/* 0A1A8 80959468 AFB80028 */ sw $t8, 0x0028($sp) -/* 0A1AC 8095946C AFAF0020 */ sw $t7, 0x0020($sp) +/* 0A1A8 80959468 AFB80028 */ sw $t8, 0x0028($sp) +/* 0A1AC 8095946C AFAF0020 */ sw $t7, 0x0020($sp) /* 0A1B0 80959470 30E7001F */ andi $a3, $a3, 0x001F ## $a3 = 00000000 -/* 0A1B4 80959474 AFB90024 */ sw $t9, 0x0024($sp) -/* 0A1B8 80959478 AFA0001C */ sw $zero, 0x001C($sp) -/* 0A1BC 8095947C AFAD0018 */ sw $t5, 0x0018($sp) -/* 0A1C0 80959480 AFAC0014 */ sw $t4, 0x0014($sp) -/* 0A1C4 80959484 AFAB0010 */ sw $t3, 0x0010($sp) +/* 0A1B4 80959474 AFB90024 */ sw $t9, 0x0024($sp) +/* 0A1B8 80959478 AFA0001C */ sw $zero, 0x001C($sp) +/* 0A1BC 8095947C AFAD0018 */ sw $t5, 0x0018($sp) +/* 0A1C0 80959480 AFAC0014 */ sw $t4, 0x0014($sp) +/* 0A1C4 80959484 AFAB0010 */ sw $t3, 0x0010($sp) /* 0A1C8 80959488 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 0A1CC 8095948C 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 0A1D0 80959490 0C0253D0 */ jal Draw_TwoTexScroll -/* 0A1D4 80959494 AFA20054 */ sw $v0, 0x0054($sp) -/* 0A1D8 80959498 8FA90054 */ lw $t1, 0x0054($sp) +/* 0A1D0 80959490 0C0253D0 */ jal Gfx_TwoTexScroll +/* 0A1D4 80959494 AFA20054 */ sw $v0, 0x0054($sp) +/* 0A1D8 80959498 8FA90054 */ lw $t1, 0x0054($sp) /* 0A1DC 8095949C 3C0A8096 */ lui $t2, %hi(func_80958150) ## $t2 = 80960000 /* 0A1E0 809594A0 254A8150 */ addiu $t2, $t2, %lo(func_80958150) ## $t2 = 80958150 /* 0A1E4 809594A4 AD220004 */ sw $v0, 0x0004($t1) ## 00000004 @@ -192,82 +192,82 @@ glabel L80959318 /* 0A1EC 809594AC 8E050150 */ lw $a1, 0x0150($s0) ## 00000150 /* 0A1F0 809594B0 3C078095 */ lui $a3, %hi(func_80957F60) ## $a3 = 80950000 /* 0A1F4 809594B4 24E77F60 */ addiu $a3, $a3, %lo(func_80957F60) ## $a3 = 80957F60 -/* 0A1F8 809594B8 AFB00014 */ sw $s0, 0x0014($sp) -/* 0A1FC 809594BC AFAA0010 */ sw $t2, 0x0010($sp) +/* 0A1F8 809594B8 AFB00014 */ sw $s0, 0x0014($sp) +/* 0A1FC 809594BC AFAA0010 */ sw $t2, 0x0010($sp) /* 0A200 809594C0 0C028572 */ jal SkelAnime_Draw - + /* 0A204 809594C4 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 0A208 809594C8 100000B1 */ beq $zero, $zero, .L80959790 +/* 0A208 809594C8 100000B1 */ beq $zero, $zero, .L80959790 /* 0A20C 809594CC 8602001C */ lh $v0, 0x001C($s0) ## 0000001C glabel L809594D0 /* 0A210 809594D0 920B0197 */ lbu $t3, 0x0197($s0) ## 00000197 /* 0A214 809594D4 3C0C8096 */ lui $t4, %hi(func_809586A4) ## $t4 = 80960000 /* 0A218 809594D8 258C86A4 */ addiu $t4, $t4, %lo(func_809586A4) ## $t4 = 809586A4 -/* 0A21C 809594DC 156000AB */ bne $t3, $zero, .L8095978C +/* 0A21C 809594DC 156000AB */ bne $t3, $zero, .L8095978C /* 0A220 809594E0 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 0A224 809594E4 8E050150 */ lw $a1, 0x0150($s0) ## 00000150 /* 0A228 809594E8 8E06016C */ lw $a2, 0x016C($s0) ## 0000016C /* 0A22C 809594EC 9207014E */ lbu $a3, 0x014E($s0) ## 0000014E /* 0A230 809594F0 3C0D8096 */ lui $t5, %hi(func_809586E4) ## $t5 = 80960000 /* 0A234 809594F4 25AD86E4 */ addiu $t5, $t5, %lo(func_809586E4) ## $t5 = 809586E4 -/* 0A238 809594F8 AFAD0014 */ sw $t5, 0x0014($sp) -/* 0A23C 809594FC AFB00018 */ sw $s0, 0x0018($sp) -/* 0A240 80959500 0C0286B2 */ jal func_800A1AC8 -/* 0A244 80959504 AFAC0010 */ sw $t4, 0x0010($sp) -/* 0A248 80959508 100000A1 */ beq $zero, $zero, .L80959790 +/* 0A238 809594F8 AFAD0014 */ sw $t5, 0x0014($sp) +/* 0A23C 809594FC AFB00018 */ sw $s0, 0x0018($sp) +/* 0A240 80959500 0C0286B2 */ jal SkelAnime_DrawSV +/* 0A244 80959504 AFAC0010 */ sw $t4, 0x0010($sp) +/* 0A248 80959508 100000A1 */ beq $zero, $zero, .L80959790 /* 0A24C 8095950C 8602001C */ lh $v0, 0x001C($s0) ## 0000001C glabel L80959510 /* 0A250 80959510 920E0197 */ lbu $t6, 0x0197($s0) ## 00000197 /* 0A254 80959514 3C0F8096 */ lui $t7, %hi(func_80958934) ## $t7 = 80960000 /* 0A258 80959518 25EF8934 */ addiu $t7, $t7, %lo(func_80958934) ## $t7 = 80958934 -/* 0A25C 8095951C 15C0009B */ bne $t6, $zero, .L8095978C +/* 0A25C 8095951C 15C0009B */ bne $t6, $zero, .L8095978C /* 0A260 80959520 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 0A264 80959524 8E050150 */ lw $a1, 0x0150($s0) ## 00000150 /* 0A268 80959528 8E06016C */ lw $a2, 0x016C($s0) ## 0000016C /* 0A26C 8095952C 9207014E */ lbu $a3, 0x014E($s0) ## 0000014E /* 0A270 80959530 3C198096 */ lui $t9, %hi(func_80958B0C) ## $t9 = 80960000 /* 0A274 80959534 27398B0C */ addiu $t9, $t9, %lo(func_80958B0C) ## $t9 = 80958B0C -/* 0A278 80959538 AFB90014 */ sw $t9, 0x0014($sp) -/* 0A27C 8095953C AFB00018 */ sw $s0, 0x0018($sp) -/* 0A280 80959540 0C0286B2 */ jal func_800A1AC8 -/* 0A284 80959544 AFAF0010 */ sw $t7, 0x0010($sp) -/* 0A288 80959548 10000091 */ beq $zero, $zero, .L80959790 +/* 0A278 80959538 AFB90014 */ sw $t9, 0x0014($sp) +/* 0A27C 8095953C AFB00018 */ sw $s0, 0x0018($sp) +/* 0A280 80959540 0C0286B2 */ jal SkelAnime_DrawSV +/* 0A284 80959544 AFAF0010 */ sw $t7, 0x0010($sp) +/* 0A288 80959548 10000091 */ beq $zero, $zero, .L80959790 /* 0A28C 8095954C 8602001C */ lh $v0, 0x001C($s0) ## 0000001C glabel L80959550 /* 0A290 80959550 8E050150 */ lw $a1, 0x0150($s0) ## 00000150 /* 0A294 80959554 8E06016C */ lw $a2, 0x016C($s0) ## 0000016C /* 0A298 80959558 9207014E */ lbu $a3, 0x014E($s0) ## 0000014E -/* 0A29C 8095955C AFA00018 */ sw $zero, 0x0018($sp) -/* 0A2A0 80959560 AFA00014 */ sw $zero, 0x0014($sp) -/* 0A2A4 80959564 AFA00010 */ sw $zero, 0x0010($sp) -/* 0A2A8 80959568 0C0286B2 */ jal func_800A1AC8 +/* 0A29C 8095955C AFA00018 */ sw $zero, 0x0018($sp) +/* 0A2A0 80959560 AFA00014 */ sw $zero, 0x0014($sp) +/* 0A2A4 80959564 AFA00010 */ sw $zero, 0x0010($sp) +/* 0A2A8 80959568 0C0286B2 */ jal SkelAnime_DrawSV /* 0A2AC 8095956C 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 0A2B0 80959570 10000087 */ beq $zero, $zero, .L80959790 +/* 0A2B0 80959570 10000087 */ beq $zero, $zero, .L80959790 /* 0A2B4 80959574 8602001C */ lh $v0, 0x001C($s0) ## 0000001C glabel L80959578 .L80959578: /* 0A2B8 80959578 92180197 */ lbu $t8, 0x0197($s0) ## 00000197 /* 0A2BC 8095957C 3C078096 */ lui $a3, %hi(func_80958F6C) ## $a3 = 80960000 /* 0A2C0 80959580 24E78F6C */ addiu $a3, $a3, %lo(func_80958F6C) ## $a3 = 80958F6C -/* 0A2C4 80959584 17000081 */ bne $t8, $zero, .L8095978C +/* 0A2C4 80959584 17000081 */ bne $t8, $zero, .L8095978C /* 0A2C8 80959588 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 0A2CC 8095958C 3C0A8096 */ lui $t2, %hi(func_80958FFC) ## $t2 = 80960000 /* 0A2D0 80959590 254A8FFC */ addiu $t2, $t2, %lo(func_80958FFC) ## $t2 = 80958FFC /* 0A2D4 80959594 8E050150 */ lw $a1, 0x0150($s0) ## 00000150 /* 0A2D8 80959598 8E06016C */ lw $a2, 0x016C($s0) ## 0000016C -/* 0A2DC 8095959C AFB00014 */ sw $s0, 0x0014($sp) +/* 0A2DC 8095959C AFB00014 */ sw $s0, 0x0014($sp) /* 0A2E0 809595A0 0C028572 */ jal SkelAnime_Draw - -/* 0A2E4 809595A4 AFAA0010 */ sw $t2, 0x0010($sp) + +/* 0A2E4 809595A4 AFAA0010 */ sw $t2, 0x0010($sp) /* 0A2E8 809595A8 00002025 */ or $a0, $zero, $zero ## $a0 = 00000000 -/* 0A2EC 809595AC 0C018A29 */ jal func_800628A4 +/* 0A2EC 809595AC 0C018A29 */ jal func_800628A4 /* 0A2F0 809595B0 260502D8 */ addiu $a1, $s0, 0x02D8 ## $a1 = 000002D8 /* 0A2F4 809595B4 3C0B8096 */ lui $t3, %hi(D_809668D2) ## $t3 = 80960000 -/* 0A2F8 809595B8 816B68D2 */ lb $t3, %lo(D_809668D2)($t3) +/* 0A2F8 809595B8 816B68D2 */ lb $t3, %lo(D_809668D2)($t3) /* 0A2FC 809595BC 3C048096 */ lui $a0, %hi(D_8095C220) ## $a0 = 80960000 /* 0A300 809595C0 2484C220 */ addiu $a0, $a0, %lo(D_8095C220) ## $a0 = 8095C220 -/* 0A304 809595C4 2961000D */ slti $at, $t3, 0x000D -/* 0A308 809595C8 5020000B */ beql $at, $zero, .L809595F8 +/* 0A304 809595C4 2961000D */ slti $at, $t3, 0x000D +/* 0A308 809595C8 5020000B */ beql $at, $zero, .L809595F8 /* 0A30C 809595CC 8E180118 */ lw $t8, 0x0118($s0) ## 00000118 /* 0A310 809595D0 8E0D0118 */ lw $t5, 0x0118($s0) ## 00000118 /* 0A314 809595D4 27AC00BC */ addiu $t4, $sp, 0x00BC ## $t4 = FFFFFFEC @@ -276,7 +276,7 @@ glabel L80959578 /* 0A320 809595E0 8DAE0028 */ lw $t6, 0x0028($t5) ## 00000028 /* 0A324 809595E4 AD8E0004 */ sw $t6, 0x0004($t4) ## FFFFFFF0 /* 0A328 809595E8 8DAF002C */ lw $t7, 0x002C($t5) ## 0000002C -/* 0A32C 809595EC 10000009 */ beq $zero, $zero, .L80959614 +/* 0A32C 809595EC 10000009 */ beq $zero, $zero, .L80959614 /* 0A330 809595F0 AD8F0008 */ sw $t7, 0x0008($t4) ## FFFFFFF4 /* 0A334 809595F4 8E180118 */ lw $t8, 0x0118($s0) ## 00000118 .L809595F8: @@ -288,62 +288,62 @@ glabel L80959578 /* 0A34C 8095960C 8F0B01E0 */ lw $t3, 0x01E0($t8) ## 000001E0 /* 0A350 80959610 AF2B0008 */ sw $t3, 0x0008($t9) ## FFFFFFF4 .L80959614: -/* 0A354 80959614 0C0346BD */ jal Matrix_MultVec3f +/* 0A354 80959614 0C0346BD */ jal Matrix_MultVec3f /* 0A358 80959618 26050208 */ addiu $a1, $s0, 0x0208 ## $a1 = 00000208 -/* 0A35C 8095961C 0C034213 */ jal Matrix_Push +/* 0A35C 8095961C 0C034213 */ jal Matrix_Push /* 0A360 80959620 00000000 */ nop -/* 0A364 80959624 C7AC00BC */ lwc1 $f12, 0x00BC($sp) -/* 0A368 80959628 C7AE00C0 */ lwc1 $f14, 0x00C0($sp) -/* 0A36C 8095962C 8FA600C4 */ lw $a2, 0x00C4($sp) -/* 0A370 80959630 0C034261 */ jal Matrix_Translate +/* 0A364 80959624 C7AC00BC */ lwc1 $f12, 0x00BC($sp) +/* 0A368 80959628 C7AE00C0 */ lwc1 $f14, 0x00C0($sp) +/* 0A36C 8095962C 8FA600C4 */ lw $a2, 0x00C4($sp) +/* 0A370 80959630 0C034261 */ jal Matrix_Translate /* 0A374 80959634 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 /* 0A378 80959638 86040030 */ lh $a0, 0x0030($s0) ## 00000030 /* 0A37C 8095963C 86050032 */ lh $a1, 0x0032($s0) ## 00000032 /* 0A380 80959640 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 0A384 80959644 0C034421 */ jal Matrix_RotateXYZ +/* 0A384 80959644 0C034421 */ jal Matrix_RotateZYX /* 0A388 80959648 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 /* 0A38C 8095964C C60401A0 */ lwc1 $f4, 0x01A0($s0) ## 000001A0 /* 0A390 80959650 3C013D80 */ lui $at, 0x3D80 ## $at = 3D800000 /* 0A394 80959654 44815000 */ mtc1 $at, $f10 ## $f10 = 0.06 -/* 0A398 80959658 E7A4007C */ swc1 $f4, 0x007C($sp) -/* 0A39C 8095965C C7A6007C */ lwc1 $f6, 0x007C($sp) +/* 0A398 80959658 E7A4007C */ swc1 $f4, 0x007C($sp) +/* 0A39C 8095965C C7A6007C */ lwc1 $f6, 0x007C($sp) /* 0A3A0 80959660 27A400B0 */ addiu $a0, $sp, 0x00B0 ## $a0 = FFFFFFE0 /* 0A3A4 80959664 260501FC */ addiu $a1, $s0, 0x01FC ## $a1 = 000001FC -/* 0A3A8 80959668 E7A60088 */ swc1 $f6, 0x0088($sp) +/* 0A3A8 80959668 E7A60088 */ swc1 $f6, 0x0088($sp) /* 0A3AC 8095966C 860C019C */ lh $t4, 0x019C($s0) ## 0000019C /* 0A3B0 80959670 C60801A0 */ lwc1 $f8, 0x01A0($s0) ## 000001A0 /* 0A3B4 80959674 318D000F */ andi $t5, $t4, 0x000F ## $t5 = 00000000 /* 0A3B8 80959678 448D9000 */ mtc1 $t5, $f18 ## $f18 = 0.00 -/* 0A3BC 8095967C 460A4402 */ mul.s $f16, $f8, $f10 -/* 0A3C0 80959680 46809120 */ cvt.s.w $f4, $f18 -/* 0A3C4 80959684 46102182 */ mul.s $f6, $f4, $f16 -/* 0A3C8 80959688 0C0346BD */ jal Matrix_MultVec3f -/* 0A3CC 8095968C E7A600B8 */ swc1 $f6, 0x00B8($sp) +/* 0A3BC 8095967C 460A4402 */ mul.s $f16, $f8, $f10 +/* 0A3C0 80959680 46809120 */ cvt.s.w $f4, $f18 +/* 0A3C4 80959684 46102182 */ mul.s $f6, $f4, $f16 +/* 0A3C8 80959688 0C0346BD */ jal Matrix_MultVec3f +/* 0A3CC 8095968C E7A600B8 */ swc1 $f6, 0x00B8($sp) /* 0A3D0 80959690 26050384 */ addiu $a1, $s0, 0x0384 ## $a1 = 00000384 -/* 0A3D4 80959694 AFA50048 */ sw $a1, 0x0048($sp) -/* 0A3D8 80959698 0C0346BD */ jal Matrix_MultVec3f +/* 0A3D4 80959694 AFA50048 */ sw $a1, 0x0048($sp) +/* 0A3D8 80959698 0C0346BD */ jal Matrix_MultVec3f /* 0A3DC 8095969C 27A40098 */ addiu $a0, $sp, 0x0098 ## $a0 = FFFFFFC8 /* 0A3E0 809596A0 26050378 */ addiu $a1, $s0, 0x0378 ## $a1 = 00000378 -/* 0A3E4 809596A4 AFA5004C */ sw $a1, 0x004C($sp) -/* 0A3E8 809596A8 0C0346BD */ jal Matrix_MultVec3f +/* 0A3E4 809596A4 AFA5004C */ sw $a1, 0x004C($sp) +/* 0A3E8 809596A8 0C0346BD */ jal Matrix_MultVec3f /* 0A3EC 809596AC 27A4008C */ addiu $a0, $sp, 0x008C ## $a0 = FFFFFFBC /* 0A3F0 809596B0 2605039C */ addiu $a1, $s0, 0x039C ## $a1 = 0000039C -/* 0A3F4 809596B4 AFA50040 */ sw $a1, 0x0040($sp) -/* 0A3F8 809596B8 0C0346BD */ jal Matrix_MultVec3f +/* 0A3F4 809596B4 AFA50040 */ sw $a1, 0x0040($sp) +/* 0A3F8 809596B8 0C0346BD */ jal Matrix_MultVec3f /* 0A3FC 809596BC 27A40080 */ addiu $a0, $sp, 0x0080 ## $a0 = FFFFFFB0 /* 0A400 809596C0 26070390 */ addiu $a3, $s0, 0x0390 ## $a3 = 00000390 /* 0A404 809596C4 00E02825 */ or $a1, $a3, $zero ## $a1 = 00000390 -/* 0A408 809596C8 AFA70044 */ sw $a3, 0x0044($sp) -/* 0A40C 809596CC 0C0346BD */ jal Matrix_MultVec3f +/* 0A408 809596C8 AFA70044 */ sw $a3, 0x0044($sp) +/* 0A40C 809596CC 0C0346BD */ jal Matrix_MultVec3f /* 0A410 809596D0 27A40074 */ addiu $a0, $sp, 0x0074 ## $a0 = FFFFFFA4 -/* 0A414 809596D4 8FAE0040 */ lw $t6, 0x0040($sp) -/* 0A418 809596D8 8FA70044 */ lw $a3, 0x0044($sp) +/* 0A414 809596D4 8FAE0040 */ lw $t6, 0x0040($sp) +/* 0A418 809596D8 8FA70044 */ lw $a3, 0x0044($sp) /* 0A41C 809596DC 26040338 */ addiu $a0, $s0, 0x0338 ## $a0 = 00000338 -/* 0A420 809596E0 8FA5004C */ lw $a1, 0x004C($sp) -/* 0A424 809596E4 8FA60048 */ lw $a2, 0x0048($sp) -/* 0A428 809596E8 0C0189CD */ jal func_80062734 -/* 0A42C 809596EC AFAE0010 */ sw $t6, 0x0010($sp) -/* 0A430 809596F0 0C034221 */ jal Matrix_Pull +/* 0A420 809596E0 8FA5004C */ lw $a1, 0x004C($sp) +/* 0A424 809596E4 8FA60048 */ lw $a2, 0x0048($sp) +/* 0A428 809596E8 0C0189CD */ jal func_80062734 +/* 0A42C 809596EC AFAE0010 */ sw $t6, 0x0010($sp) +/* 0A430 809596F0 0C034221 */ jal Matrix_Pull /* 0A434 809596F4 00000000 */ nop /* 0A438 809596F8 8E180024 */ lw $t8, 0x0024($s0) ## 00000024 /* 0A43C 809596FC 27AF00BC */ addiu $t7, $sp, 0x00BC ## $t7 = FFFFFFEC @@ -354,24 +354,24 @@ glabel L80959578 /* 0A450 80959710 ADF90004 */ sw $t9, 0x0004($t7) ## FFFFFFF0 /* 0A454 80959714 8E18002C */ lw $t8, 0x002C($s0) ## 0000002C /* 0A458 80959718 ADF80008 */ sw $t8, 0x0008($t7) ## FFFFFFF4 -/* 0A45C 8095971C C7A800C0 */ lwc1 $f8, 0x00C0($sp) -/* 0A460 80959720 460A4480 */ add.s $f18, $f8, $f10 -/* 0A464 80959724 E7B200C0 */ swc1 $f18, 0x00C0($sp) +/* 0A45C 8095971C C7A800C0 */ lwc1 $f8, 0x00C0($sp) +/* 0A460 80959720 460A4480 */ add.s $f18, $f8, $f10 +/* 0A464 80959724 E7B200C0 */ swc1 $f18, 0x00C0($sp) /* 0A468 80959728 920A0114 */ lbu $t2, 0x0114($s0) ## 00000114 -/* 0A46C 8095972C 51400004 */ beql $t2, $zero, .L80959740 +/* 0A46C 8095972C 51400004 */ beql $t2, $zero, .L80959740 /* 0A470 80959730 27A400BC */ addiu $a0, $sp, 0x00BC ## $a0 = FFFFFFEC -/* 0A474 80959734 0C009A9B */ jal func_80026A6C +/* 0A474 80959734 0C009A9B */ jal func_80026A6C /* 0A478 80959738 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 0A47C 8095973C 27A400BC */ addiu $a0, $sp, 0x00BC ## $a0 = FFFFFFEC .L80959740: /* 0A480 80959740 27A500A4 */ addiu $a1, $sp, 0x00A4 ## $a1 = FFFFFFD4 /* 0A484 80959744 240600FF */ addiu $a2, $zero, 0x00FF ## $a2 = 000000FF -/* 0A488 80959748 0C00CF0C */ jal func_80033C30 +/* 0A488 80959748 0C00CF0C */ jal func_80033C30 /* 0A48C 8095974C 02203825 */ or $a3, $s1, $zero ## $a3 = 00000000 /* 0A490 80959750 920B0114 */ lbu $t3, 0x0114($s0) ## 00000114 /* 0A494 80959754 3C0C8096 */ lui $t4, %hi(D_8095C2F8) ## $t4 = 80960000 /* 0A498 80959758 258CC2F8 */ addiu $t4, $t4, %lo(D_8095C2F8) ## $t4 = 8095C2F8 -/* 0A49C 8095975C 5160000C */ beql $t3, $zero, .L80959790 +/* 0A49C 8095975C 5160000C */ beql $t3, $zero, .L80959790 /* 0A4A0 80959760 8602001C */ lh $v0, 0x001C($s0) ## 0000001C /* 0A4A4 80959764 8D8E0000 */ lw $t6, 0x0000($t4) ## 8095C2F8 /* 0A4A8 80959768 27A50050 */ addiu $a1, $sp, 0x0050 ## $a1 = FFFFFF80 @@ -380,39 +380,39 @@ glabel L80959578 /* 0A4B4 80959774 96070112 */ lhu $a3, 0x0112($s0) ## 00000112 /* 0A4B8 80959778 92060114 */ lbu $a2, 0x0114($s0) ## 00000114 /* 0A4BC 8095977C 30E700FF */ andi $a3, $a3, 0x00FF ## $a3 = 00000000 -/* 0A4C0 80959780 00073C00 */ sll $a3, $a3, 16 -/* 0A4C4 80959784 0C009A18 */ jal func_80026860 -/* 0A4C8 80959788 00073C03 */ sra $a3, $a3, 16 +/* 0A4C0 80959780 00073C00 */ sll $a3, $a3, 16 +/* 0A4C4 80959784 0C009A18 */ jal func_80026860 +/* 0A4C8 80959788 00073C03 */ sra $a3, $a3, 16 glabel L8095978C .L8095978C: /* 0A4CC 8095978C 8602001C */ lh $v0, 0x001C($s0) ## 0000001C .L80959790: /* 0A4D0 80959790 2401FFFF */ addiu $at, $zero, 0xFFFF ## $at = FFFFFFFF /* 0A4D4 80959794 3C048096 */ lui $a0, %hi(D_8095DF50) ## $a0 = 80960000 -/* 0A4D8 80959798 14410005 */ bne $v0, $at, .L809597B0 +/* 0A4D8 80959798 14410005 */ bne $v0, $at, .L809597B0 /* 0A4DC 8095979C 2484DF50 */ addiu $a0, $a0, %lo(D_8095DF50) ## $a0 = 8095DF50 -/* 0A4E0 809597A0 0C256862 */ jal func_8095A188 +/* 0A4E0 809597A0 0C256862 */ jal func_8095A188 /* 0A4E4 809597A4 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 0A4E8 809597A8 10000007 */ beq $zero, $zero, .L809597C8 +/* 0A4E8 809597A8 10000007 */ beq $zero, $zero, .L809597C8 /* 0A4EC 809597AC 00000000 */ nop .L809597B0: /* 0A4F0 809597B0 24010013 */ addiu $at, $zero, 0x0013 ## $at = 00000013 -/* 0A4F4 809597B4 14410004 */ bne $v0, $at, .L809597C8 +/* 0A4F4 809597B4 14410004 */ bne $v0, $at, .L809597C8 /* 0A4F8 809597B8 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 0A4FC 809597BC 3C058096 */ lui $a1, %hi(D_80966934) ## $a1 = 80960000 -/* 0A500 809597C0 0C256F49 */ jal func_8095BD24 -/* 0A504 809597C4 84A56934 */ lh $a1, %lo(D_80966934)($a1) +/* 0A500 809597C0 0C256F49 */ jal func_8095BD24 +/* 0A504 809597C4 84A56934 */ lh $a1, %lo(D_80966934)($a1) .L809597C8: /* 0A508 809597C8 3C068096 */ lui $a2, %hi(D_8095C480) ## $a2 = 80960000 /* 0A50C 809597CC 24C6C480 */ addiu $a2, $a2, %lo(D_8095C480) ## $a2 = 8095C480 /* 0A510 809597D0 27A4005C */ addiu $a0, $sp, 0x005C ## $a0 = FFFFFF8C /* 0A514 809597D4 8E250000 */ lw $a1, 0x0000($s1) ## 00000000 -/* 0A518 809597D8 0C031AD5 */ jal func_800C6B54 +/* 0A518 809597D8 0C031AD5 */ jal Graph_CloseDisps /* 0A51C 809597DC 24071241 */ addiu $a3, $zero, 0x1241 ## $a3 = 00001241 -/* 0A520 809597E0 8FBF003C */ lw $ra, 0x003C($sp) -/* 0A524 809597E4 8FB00034 */ lw $s0, 0x0034($sp) -/* 0A528 809597E8 8FB10038 */ lw $s1, 0x0038($sp) -/* 0A52C 809597EC 03E00008 */ jr $ra +/* 0A520 809597E0 8FBF003C */ lw $ra, 0x003C($sp) +/* 0A524 809597E4 8FB00034 */ lw $s0, 0x0034($sp) +/* 0A528 809597E8 8FB10038 */ lw $s1, 0x0038($sp) +/* 0A52C 809597EC 03E00008 */ jr $ra /* 0A530 809597F0 27BD00D0 */ addiu $sp, $sp, 0x00D0 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Va/BossVa_Init.s b/asm/non_matchings/overlays/actors/ovl_Boss_Va/BossVa_Init.s index 7f9c4b7146..a2b85bf5c3 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Va/BossVa_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Va/BossVa_Init.s @@ -1,30 +1,30 @@ glabel BossVa_Init /* 00B9C 8094FE5C 27BDFF88 */ addiu $sp, $sp, 0xFF88 ## $sp = FFFFFF88 -/* 00BA0 8094FE60 AFB40048 */ sw $s4, 0x0048($sp) +/* 00BA0 8094FE60 AFB40048 */ sw $s4, 0x0048($sp) /* 00BA4 8094FE64 00A0A025 */ or $s4, $a1, $zero ## $s4 = 00000000 -/* 00BA8 8094FE68 AFBF004C */ sw $ra, 0x004C($sp) -/* 00BAC 8094FE6C AFB30044 */ sw $s3, 0x0044($sp) +/* 00BA8 8094FE68 AFBF004C */ sw $ra, 0x004C($sp) +/* 00BAC 8094FE6C AFB30044 */ sw $s3, 0x0044($sp) /* 00BB0 8094FE70 3C053DCC */ lui $a1, 0x3DCC ## $a1 = 3DCC0000 /* 00BB4 8094FE74 00809825 */ or $s3, $a0, $zero ## $s3 = 00000000 -/* 00BB8 8094FE78 AFB20040 */ sw $s2, 0x0040($sp) -/* 00BBC 8094FE7C AFB1003C */ sw $s1, 0x003C($sp) -/* 00BC0 8094FE80 AFB00038 */ sw $s0, 0x0038($sp) +/* 00BB8 8094FE78 AFB20040 */ sw $s2, 0x0040($sp) +/* 00BBC 8094FE7C AFB1003C */ sw $s1, 0x003C($sp) +/* 00BC0 8094FE80 AFB00038 */ sw $s0, 0x0038($sp) /* 00BC4 8094FE84 0C00B58B */ jal Actor_SetScale - + /* 00BC8 8094FE88 34A5CCCD */ ori $a1, $a1, 0xCCCD ## $a1 = 3DCCCCCD /* 00BCC 8094FE8C 8678001C */ lh $t8, 0x001C($s3) ## 0000001C /* 00BD0 8094FE90 240E0005 */ addiu $t6, $zero, 0x0005 ## $t6 = 00000005 /* 00BD4 8094FE94 240F00FF */ addiu $t7, $zero, 0x00FF ## $t7 = 000000FF /* 00BD8 8094FE98 27190001 */ addiu $t9, $t8, 0x0001 ## $t9 = 00000001 -/* 00BDC 8094FE9C 2F210015 */ sltiu $at, $t9, 0x0015 +/* 00BDC 8094FE9C 2F210015 */ sltiu $at, $t9, 0x0015 /* 00BE0 8094FEA0 A26E001F */ sb $t6, 0x001F($s3) ## 0000001F -/* 00BE4 8094FEA4 1020003A */ beq $at, $zero, .L8094FF90 +/* 00BE4 8094FEA4 1020003A */ beq $at, $zero, .L8094FF90 /* 00BE8 8094FEA8 A26F00AE */ sb $t7, 0x00AE($s3) ## 000000AE -/* 00BEC 8094FEAC 0019C880 */ sll $t9, $t9, 2 +/* 00BEC 8094FEAC 0019C880 */ sll $t9, $t9, 2 /* 00BF0 8094FEB0 3C018096 */ lui $at, %hi(jtbl_8095C58C) ## $at = 80960000 -/* 00BF4 8094FEB4 00390821 */ addu $at, $at, $t9 -/* 00BF8 8094FEB8 8C39C58C */ lw $t9, %lo(jtbl_8095C58C)($at) -/* 00BFC 8094FEBC 03200008 */ jr $t9 +/* 00BF4 8094FEB4 00390821 */ addu $at, $at, $t9 +/* 00BF8 8094FEB8 8C39C58C */ lw $t9, %lo(jtbl_8095C58C)($at) +/* 00BFC 8094FEBC 03200008 */ jr $t9 /* 00C00 8094FEC0 00000000 */ nop glabel L8094FEC4 /* 00C04 8094FEC4 3C060601 */ lui $a2, 0x0601 ## $a2 = 06010000 @@ -33,15 +33,15 @@ glabel L8094FEC4 /* 00C10 8094FED0 24C65B18 */ addiu $a2, $a2, 0x5B18 ## $a2 = 06015B18 /* 00C14 8094FED4 02802025 */ or $a0, $s4, $zero ## $a0 = 00000000 /* 00C18 8094FED8 2665014C */ addiu $a1, $s3, 0x014C ## $a1 = 0000014C -/* 00C1C 8094FEDC AFA00010 */ sw $zero, 0x0010($sp) -/* 00C20 8094FEE0 AFA00014 */ sw $zero, 0x0014($sp) +/* 00C1C 8094FEDC AFA00010 */ sw $zero, 0x0010($sp) +/* 00C20 8094FEE0 AFA00014 */ sw $zero, 0x0014($sp) /* 00C24 8094FEE4 0C02915F */ jal SkelAnime_Init - -/* 00C28 8094FEE8 AFA00018 */ sw $zero, 0x0018($sp) + +/* 00C28 8094FEE8 AFA00018 */ sw $zero, 0x0018($sp) /* 00C2C 8094FEEC 8E690004 */ lw $t1, 0x0004($s3) ## 00000004 /* 00C30 8094FEF0 3C010100 */ lui $at, 0x0100 ## $at = 01000000 /* 00C34 8094FEF4 01215025 */ or $t2, $t1, $at ## $t2 = 01000000 -/* 00C38 8094FEF8 10000037 */ beq $zero, $zero, .L8094FFD8 +/* 00C38 8094FEF8 10000037 */ beq $zero, $zero, .L8094FFD8 /* 00C3C 8094FEFC AE6A0004 */ sw $t2, 0x0004($s3) ## 00000004 glabel L8094FF00 /* 00C40 8094FF00 3C060601 */ lui $a2, 0x0601 ## $a2 = 06010000 @@ -50,11 +50,11 @@ glabel L8094FF00 /* 00C4C 8094FF0C 24C67498 */ addiu $a2, $a2, 0x7498 ## $a2 = 06017498 /* 00C50 8094FF10 02802025 */ or $a0, $s4, $zero ## $a0 = 00000000 /* 00C54 8094FF14 2665014C */ addiu $a1, $s3, 0x014C ## $a1 = 0000014C -/* 00C58 8094FF18 AFA00010 */ sw $zero, 0x0010($sp) -/* 00C5C 8094FF1C AFA00014 */ sw $zero, 0x0014($sp) -/* 00C60 8094FF20 0C0291BE */ jal func_800A46F8 -/* 00C64 8094FF24 AFA00018 */ sw $zero, 0x0018($sp) -/* 00C68 8094FF28 1000002C */ beq $zero, $zero, .L8094FFDC +/* 00C58 8094FF18 AFA00010 */ sw $zero, 0x0010($sp) +/* 00C5C 8094FF1C AFA00014 */ sw $zero, 0x0014($sp) +/* 00C60 8094FF20 0C0291BE */ jal SkelAnime_InitSV +/* 00C64 8094FF24 AFA00018 */ sw $zero, 0x0018($sp) +/* 00C68 8094FF28 1000002C */ beq $zero, $zero, .L8094FFDC /* 00C6C 8094FF2C 8E6E0024 */ lw $t6, 0x0024($s3) ## 00000024 glabel L8094FF30 /* 00C70 8094FF30 3C060602 */ lui $a2, 0x0602 ## $a2 = 06020000 @@ -63,11 +63,11 @@ glabel L8094FF30 /* 00C7C 8094FF3C 24C699A0 */ addiu $a2, $a2, 0x99A0 ## $a2 = 060199A0 /* 00C80 8094FF40 02802025 */ or $a0, $s4, $zero ## $a0 = 00000000 /* 00C84 8094FF44 2665014C */ addiu $a1, $s3, 0x014C ## $a1 = 0000014C -/* 00C88 8094FF48 AFA00010 */ sw $zero, 0x0010($sp) -/* 00C8C 8094FF4C AFA00014 */ sw $zero, 0x0014($sp) -/* 00C90 8094FF50 0C0291BE */ jal func_800A46F8 -/* 00C94 8094FF54 AFA00018 */ sw $zero, 0x0018($sp) -/* 00C98 8094FF58 10000020 */ beq $zero, $zero, .L8094FFDC +/* 00C88 8094FF48 AFA00010 */ sw $zero, 0x0010($sp) +/* 00C8C 8094FF4C AFA00014 */ sw $zero, 0x0014($sp) +/* 00C90 8094FF50 0C0291BE */ jal SkelAnime_InitSV +/* 00C94 8094FF54 AFA00018 */ sw $zero, 0x0018($sp) +/* 00C98 8094FF58 10000020 */ beq $zero, $zero, .L8094FFDC /* 00C9C 8094FF5C 8E6E0024 */ lw $t6, 0x0024($s3) ## 00000024 glabel L8094FF60 /* 00CA0 8094FF60 3C060602 */ lui $a2, 0x0602 ## $a2 = 06020000 @@ -76,11 +76,11 @@ glabel L8094FF60 /* 00CAC 8094FF6C 24C68870 */ addiu $a2, $a2, 0x8870 ## $a2 = 06018870 /* 00CB0 8094FF70 02802025 */ or $a0, $s4, $zero ## $a0 = 00000000 /* 00CB4 8094FF74 2665014C */ addiu $a1, $s3, 0x014C ## $a1 = 0000014C -/* 00CB8 8094FF78 AFA00010 */ sw $zero, 0x0010($sp) -/* 00CBC 8094FF7C AFA00014 */ sw $zero, 0x0014($sp) -/* 00CC0 8094FF80 0C0291BE */ jal func_800A46F8 -/* 00CC4 8094FF84 AFA00018 */ sw $zero, 0x0018($sp) -/* 00CC8 8094FF88 10000014 */ beq $zero, $zero, .L8094FFDC +/* 00CB8 8094FF78 AFA00010 */ sw $zero, 0x0010($sp) +/* 00CBC 8094FF7C AFA00014 */ sw $zero, 0x0014($sp) +/* 00CC0 8094FF80 0C0291BE */ jal SkelAnime_InitSV +/* 00CC4 8094FF84 AFA00018 */ sw $zero, 0x0018($sp) +/* 00CC8 8094FF88 10000014 */ beq $zero, $zero, .L8094FFDC /* 00CCC 8094FF8C 8E6E0024 */ lw $t6, 0x0024($s3) ## 00000024 glabel L8094FF90 .L8094FF90: @@ -91,13 +91,13 @@ glabel L8094FF90 /* 00CE0 8094FFA0 AE6C0004 */ sw $t4, 0x0004($s3) ## 00000004 /* 00CE4 8094FFA4 3C070600 */ lui $a3, 0x0600 ## $a3 = 06000000 /* 00CE8 8094FFA8 24E70024 */ addiu $a3, $a3, 0x0024 ## $a3 = 06000024 -/* 00CEC 8094FFAC AFA00018 */ sw $zero, 0x0018($sp) -/* 00CF0 8094FFB0 AFA00014 */ sw $zero, 0x0014($sp) -/* 00CF4 8094FFB4 AFA00010 */ sw $zero, 0x0010($sp) +/* 00CEC 8094FFAC AFA00018 */ sw $zero, 0x0018($sp) +/* 00CF0 8094FFB0 AFA00014 */ sw $zero, 0x0014($sp) +/* 00CF4 8094FFB4 AFA00010 */ sw $zero, 0x0010($sp) /* 00CF8 8094FFB8 24C64E70 */ addiu $a2, $a2, 0x4E70 ## $a2 = 06004E70 /* 00CFC 8094FFBC 02802025 */ or $a0, $s4, $zero ## $a0 = 00000000 /* 00D00 8094FFC0 0C02915F */ jal SkelAnime_Init - + /* 00D04 8094FFC4 2665014C */ addiu $a1, $s3, 0x014C ## $a1 = 0000014C /* 00D08 8094FFC8 3C0143C8 */ lui $at, 0x43C8 ## $at = 43C80000 /* 00D0C 8094FFCC 44812000 */ mtc1 $at, $f4 ## $f4 = 400.00 @@ -113,17 +113,17 @@ glabel L8094FFD8 /* 00D28 8094FFE8 8E6E002C */ lw $t6, 0x002C($s3) ## 0000002C /* 00D2C 8094FFEC 27190001 */ addiu $t9, $t8, 0x0001 ## $t9 = 00000001 /* 00D30 8094FFF0 240F0014 */ addiu $t7, $zero, 0x0014 ## $t7 = 00000014 -/* 00D34 8094FFF4 2F210015 */ sltiu $at, $t9, 0x0015 +/* 00D34 8094FFF4 2F210015 */ sltiu $at, $t9, 0x0015 /* 00D38 8094FFF8 A2600194 */ sb $zero, 0x0194($s3) ## 00000194 /* 00D3C 8094FFFC A26F0117 */ sb $t7, 0x0117($s3) ## 00000117 /* 00D40 80950000 AE6D003C */ sw $t5, 0x003C($s3) ## 0000003C -/* 00D44 80950004 1020016F */ beq $at, $zero, .L809505C4 +/* 00D44 80950004 1020016F */ beq $at, $zero, .L809505C4 /* 00D48 80950008 AE6E0040 */ sw $t6, 0x0040($s3) ## 00000040 -/* 00D4C 8095000C 0019C880 */ sll $t9, $t9, 2 +/* 00D4C 8095000C 0019C880 */ sll $t9, $t9, 2 /* 00D50 80950010 3C018096 */ lui $at, %hi(jtbl_8095C5E0) ## $at = 80960000 -/* 00D54 80950014 00390821 */ addu $at, $at, $t9 -/* 00D58 80950018 8C39C5E0 */ lw $t9, %lo(jtbl_8095C5E0)($at) -/* 00D5C 8095001C 03200008 */ jr $t9 +/* 00D54 80950014 00390821 */ addu $at, $at, $t9 +/* 00D58 80950018 8C39C5E0 */ lw $t9, %lo(jtbl_8095C5E0)($at) +/* 00D5C 8095001C 03200008 */ jr $t9 /* 00D60 80950020 00000000 */ nop glabel L80950024 /* 00D64 80950024 3C0142A0 */ lui $at, 0x42A0 ## $at = 42A00000 @@ -133,74 +133,74 @@ glabel L80950024 /* 00D74 80950034 44803000 */ mtc1 $zero, $f6 ## $f6 = 0.00 /* 00D78 80950038 26841C24 */ addiu $a0, $s4, 0x1C24 ## $a0 = 00001C24 /* 00D7C 8095003C 24090013 */ addiu $t1, $zero, 0x0013 ## $t1 = 00000013 -/* 00D80 80950040 AFA90028 */ sw $t1, 0x0028($sp) -/* 00D84 80950044 AFA40050 */ sw $a0, 0x0050($sp) +/* 00D80 80950040 AFA90028 */ sw $t1, 0x0028($sp) +/* 00D84 80950044 AFA40050 */ sw $a0, 0x0050($sp) /* 00D88 80950048 02602825 */ or $a1, $s3, $zero ## $a1 = 00000000 /* 00D8C 8095004C 02803025 */ or $a2, $s4, $zero ## $a2 = 00000000 /* 00D90 80950050 240700BA */ addiu $a3, $zero, 0x00BA ## $a3 = 000000BA -/* 00D94 80950054 AFA0001C */ sw $zero, 0x001C($sp) -/* 00D98 80950058 AFA00020 */ sw $zero, 0x0020($sp) -/* 00D9C 8095005C AFA00024 */ sw $zero, 0x0024($sp) -/* 00DA0 80950060 E7A80014 */ swc1 $f8, 0x0014($sp) -/* 00DA4 80950064 E7AA0018 */ swc1 $f10, 0x0018($sp) +/* 00D94 80950054 AFA0001C */ sw $zero, 0x001C($sp) +/* 00D98 80950058 AFA00020 */ sw $zero, 0x0020($sp) +/* 00D9C 8095005C AFA00024 */ sw $zero, 0x0024($sp) +/* 00DA0 80950060 E7A80014 */ swc1 $f8, 0x0014($sp) +/* 00DA4 80950064 E7AA0018 */ swc1 $f10, 0x0018($sp) /* 00DA8 80950068 0C00C916 */ jal Actor_SpawnAttached - -/* 00DAC 8095006C E7A60010 */ swc1 $f6, 0x0010($sp) + +/* 00DAC 8095006C E7A60010 */ swc1 $f6, 0x0010($sp) /* 00DB0 80950070 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 00DB4 80950074 02818021 */ addu $s0, $s4, $at +/* 00DB4 80950074 02818021 */ addu $s0, $s4, $at /* 00DB8 80950078 82051CBC */ lb $a1, 0x1CBC($s0) ## 00001CBC /* 00DBC 8095007C 0C00B337 */ jal Flags_GetClear - + /* 00DC0 80950080 02802025 */ or $a0, $s4, $zero ## $a0 = 00000000 -/* 00DC4 80950084 1040002C */ beq $v0, $zero, .L80950138 +/* 00DC4 80950084 1040002C */ beq $v0, $zero, .L80950138 /* 00DC8 80950088 3C0D8096 */ lui $t5, %hi(D_8095C200) ## $t5 = 80960000 /* 00DCC 8095008C 3C0A8016 */ lui $t2, 0x8016 ## $t2 = 80160000 /* 00DD0 80950090 954AF53A */ lhu $t2, -0x0AC6($t2) ## 8015F53A /* 00DD4 80950094 240600A1 */ addiu $a2, $zero, 0x00A1 ## $a2 = 000000A1 -/* 00DD8 80950098 8FA40050 */ lw $a0, 0x0050($sp) +/* 00DD8 80950098 8FA40050 */ lw $a0, 0x0050($sp) /* 00DDC 8095009C 314B0080 */ andi $t3, $t2, 0x0080 ## $t3 = 00000000 -/* 00DE0 809500A0 51600003 */ beql $t3, $zero, .L809500B0 +/* 00DE0 809500A0 51600003 */ beql $t3, $zero, .L809500B0 /* 00DE4 809500A4 C6700028 */ lwc1 $f16, 0x0028($s3) ## 00000028 /* 00DE8 809500A8 2406005D */ addiu $a2, $zero, 0x005D ## $a2 = 0000005D /* 00DEC 809500AC C6700028 */ lwc1 $f16, 0x0028($s3) ## 00000028 .L809500B0: /* 00DF0 809500B0 8E670024 */ lw $a3, 0x0024($s3) ## 00000024 /* 00DF4 809500B4 02802825 */ or $a1, $s4, $zero ## $a1 = 00000000 -/* 00DF8 809500B8 E7B00010 */ swc1 $f16, 0x0010($sp) +/* 00DF8 809500B8 E7B00010 */ swc1 $f16, 0x0010($sp) /* 00DFC 809500BC C672002C */ lwc1 $f18, 0x002C($s3) ## 0000002C -/* 00E00 809500C0 AFA00024 */ sw $zero, 0x0024($sp) -/* 00E04 809500C4 AFA00020 */ sw $zero, 0x0020($sp) -/* 00E08 809500C8 AFA0001C */ sw $zero, 0x001C($sp) -/* 00E0C 809500CC AFA00018 */ sw $zero, 0x0018($sp) +/* 00E00 809500C0 AFA00024 */ sw $zero, 0x0024($sp) +/* 00E04 809500C4 AFA00020 */ sw $zero, 0x0020($sp) +/* 00E08 809500C8 AFA0001C */ sw $zero, 0x001C($sp) +/* 00E0C 809500CC AFA00018 */ sw $zero, 0x0018($sp) /* 00E10 809500D0 0C00C7D4 */ jal Actor_Spawn ## ActorSpawn -/* 00E14 809500D4 E7B20014 */ swc1 $f18, 0x0014($sp) +/* 00E14 809500D4 E7B20014 */ swc1 $f18, 0x0014($sp) /* 00E18 809500D8 3C014320 */ lui $at, 0x4320 ## $at = 43200000 /* 00E1C 809500DC 44813000 */ mtc1 $at, $f6 ## $f6 = 160.00 /* 00E20 809500E0 C6640024 */ lwc1 $f4, 0x0024($s3) ## 00000024 /* 00E24 809500E4 C66A0028 */ lwc1 $f10, 0x0028($s3) ## 00000028 -/* 00E28 809500E8 8FA40050 */ lw $a0, 0x0050($sp) -/* 00E2C 809500EC 46062200 */ add.s $f8, $f4, $f6 -/* 00E30 809500F0 E7AA0010 */ swc1 $f10, 0x0010($sp) +/* 00E28 809500E8 8FA40050 */ lw $a0, 0x0050($sp) +/* 00E2C 809500EC 46062200 */ add.s $f8, $f4, $f6 +/* 00E30 809500F0 E7AA0010 */ swc1 $f10, 0x0010($sp) /* 00E34 809500F4 C670002C */ lwc1 $f16, 0x002C($s3) ## 0000002C -/* 00E38 809500F8 AFA00024 */ sw $zero, 0x0024($sp) -/* 00E3C 809500FC 44074000 */ mfc1 $a3, $f8 -/* 00E40 80950100 AFA00020 */ sw $zero, 0x0020($sp) -/* 00E44 80950104 AFA0001C */ sw $zero, 0x001C($sp) -/* 00E48 80950108 AFA00018 */ sw $zero, 0x0018($sp) +/* 00E38 809500F8 AFA00024 */ sw $zero, 0x0024($sp) +/* 00E3C 809500FC 44074000 */ mfc1 $a3, $f8 +/* 00E40 80950100 AFA00020 */ sw $zero, 0x0020($sp) +/* 00E44 80950104 AFA0001C */ sw $zero, 0x001C($sp) +/* 00E48 80950108 AFA00018 */ sw $zero, 0x0018($sp) /* 00E4C 8095010C 02802825 */ or $a1, $s4, $zero ## $a1 = 00000000 /* 00E50 80950110 2406005F */ addiu $a2, $zero, 0x005F ## $a2 = 0000005F /* 00E54 80950114 0C00C7D4 */ jal Actor_Spawn ## ActorSpawn -/* 00E58 80950118 E7B00014 */ swc1 $f16, 0x0014($sp) +/* 00E58 80950118 E7B00014 */ swc1 $f16, 0x0014($sp) /* 00E5C 8095011C 240C0064 */ addiu $t4, $zero, 0x0064 ## $t4 = 00000064 /* 00E60 80950120 3C018096 */ lui $at, %hi(D_80966934) ## $at = 80960000 -/* 00E64 80950124 A42C6934 */ sh $t4, %lo(D_80966934)($at) +/* 00E64 80950124 A42C6934 */ sh $t4, %lo(D_80966934)($at) /* 00E68 80950128 0C00B55C */ jal Actor_Kill - + /* 00E6C 8095012C 02602025 */ or $a0, $s3, $zero ## $a0 = 00000000 -/* 00E70 80950130 10000156 */ beq $zero, $zero, .L8095068C -/* 00E74 80950134 8FBF004C */ lw $ra, 0x004C($sp) +/* 00E70 80950130 10000156 */ beq $zero, $zero, .L8095068C +/* 00E74 80950134 8FBF004C */ lw $ra, 0x004C($sp) .L80950138: /* 00E78 80950138 25ADC200 */ addiu $t5, $t5, %lo(D_8095C200) ## $t5 = FFFFC200 /* 00E7C 8095013C AE6D0098 */ sw $t5, 0x0098($s3) ## 00000098 @@ -209,17 +209,17 @@ glabel L80950024 /* 00E88 80950148 340EFFFF */ ori $t6, $zero, 0xFFFF ## $t6 = 0000FFFF /* 00E8C 8095014C 3C018096 */ lui $at, %hi(D_8096693E) ## $at = 80960000 /* 00E90 80950150 31F80040 */ andi $t8, $t7, 0x0040 ## $t8 = 00000000 -/* 00E94 80950154 1300008F */ beq $t8, $zero, .L80950394 -/* 00E98 80950158 A42E693E */ sh $t6, %lo(D_8096693E)($at) +/* 00E94 80950154 1300008F */ beq $t8, $zero, .L80950394 +/* 00E98 80950158 A42E693E */ sh $t6, %lo(D_8096693E)($at) /* 00E9C 8095015C 24190008 */ addiu $t9, $zero, 0x0008 ## $t9 = 00000008 /* 00EA0 80950160 3C018096 */ lui $at, %hi(D_809668D2) ## $at = 80960000 -/* 00EA4 80950164 A03968D2 */ sb $t9, %lo(D_809668D2)($at) +/* 00EA4 80950164 A03968D2 */ sb $t9, %lo(D_809668D2)($at) /* 00EA8 80950168 3C018096 */ lui $at, %hi(D_80966934) ## $at = 80960000 /* 00EAC 8095016C 24090064 */ addiu $t1, $zero, 0x0064 ## $t1 = 00000064 -/* 00EB0 80950170 A4296934 */ sh $t1, %lo(D_80966934)($at) +/* 00EB0 80950170 A4296934 */ sh $t1, %lo(D_80966934)($at) /* 00EB4 80950174 02802025 */ or $a0, $s4, $zero ## $a0 = 00000000 /* 00EB8 80950178 02602825 */ or $a1, $s3, $zero ## $a1 = 00000000 -/* 00EBC 8095017C 0C00B7D5 */ jal func_8002DF54 +/* 00EBC 8095017C 0C00B7D5 */ jal func_8002DF54 /* 00EC0 80950180 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 /* 00EC4 80950184 240300DC */ addiu $v1, $zero, 0x00DC ## $v1 = 000000DC /* 00EC8 80950188 240A00BE */ addiu $t2, $zero, 0x00BE ## $t2 = 000000BE @@ -229,20 +229,20 @@ glabel L80950024 /* 00ED8 80950198 A20A0B08 */ sb $t2, 0x0B08($s0) ## 00000B08 /* 00EDC 8095019C A20B0B09 */ sb $t3, 0x0B09($s0) ## 00000B09 /* 00EE0 809501A0 02802025 */ or $a0, $s4, $zero ## $a0 = 00000000 -/* 00EE4 809501A4 0C019148 */ jal func_80064520 +/* 00EE4 809501A4 0C019148 */ jal func_80064520 /* 00EE8 809501A8 26851D64 */ addiu $a1, $s4, 0x1D64 ## $a1 = 00001D64 -/* 00EEC 809501AC 0C03008C */ jal func_800C0230 +/* 00EEC 809501AC 0C03008C */ jal func_800C0230 /* 00EF0 809501B0 02802025 */ or $a0, $s4, $zero ## $a0 = 00000000 /* 00EF4 809501B4 3C108096 */ lui $s0, %hi(D_8095C23C) ## $s0 = 80960000 /* 00EF8 809501B8 2610C23C */ addiu $s0, $s0, %lo(D_8095C23C) ## $s0 = 8095C23C /* 00EFC 809501BC A6020000 */ sh $v0, 0x0000($s0) ## 8095C23C /* 00F00 809501C0 02802025 */ or $a0, $s4, $zero ## $a0 = 00000000 /* 00F04 809501C4 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 00F08 809501C8 0C0300C5 */ jal func_800C0314 +/* 00F08 809501C8 0C0300C5 */ jal func_800C0314 /* 00F0C 809501CC 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 /* 00F10 809501D0 02802025 */ or $a0, $s4, $zero ## $a0 = 00000000 /* 00F14 809501D4 86050000 */ lh $a1, 0x0000($s0) ## 8095C23C -/* 00F18 809501D8 0C0300C5 */ jal func_800C0314 +/* 00F18 809501D8 0C0300C5 */ jal func_800C0314 /* 00F1C 809501DC 24060007 */ addiu $a2, $zero, 0x0007 ## $a2 = 00000007 /* 00F20 809501E0 3C01430C */ lui $at, 0x430C ## $at = 430C0000 /* 00F24 809501E4 44819000 */ mtc1 $at, $f18 ## $f18 = 140.00 @@ -283,7 +283,7 @@ glabel L80950024 /* 00FB0 80950270 86050000 */ lh $a1, 0x0000($s0) ## 8095C23C /* 00FB4 80950274 E5040000 */ swc1 $f4, 0x0000($t0) ## 80966908 /* 00FB8 80950278 E5080004 */ swc1 $f8, 0x0004($t0) ## 8096690C -/* 00FBC 8095027C 0C030136 */ jal func_800C04D8 +/* 00FBC 8095027C 0C030136 */ jal func_800C04D8 /* 00FC0 80950280 E5100008 */ swc1 $f16, 0x0008($t0) ## 80966910 /* 00FC4 80950284 240C0014 */ addiu $t4, $zero, 0x0014 ## $t4 = 00000014 /* 00FC8 80950288 3C108096 */ lui $s0, %hi(D_8095C0F8) ## $s0 = 80960000 @@ -297,37 +297,37 @@ glabel L80950024 /* 00FE4 809502A4 C6640024 */ lwc1 $f4, 0x0024($s3) ## 00000024 /* 00FE8 809502A8 C6080004 */ lwc1 $f8, 0x0004($s0) ## 8095C0FC /* 00FEC 809502AC 862D0000 */ lh $t5, 0x0000($s1) ## 8095C1D6 -/* 00FF0 809502B0 46049180 */ add.s $f6, $f18, $f4 +/* 00FF0 809502B0 46049180 */ add.s $f6, $f18, $f4 /* 00FF4 809502B4 C6120008 */ lwc1 $f18, 0x0008($s0) ## 8095C100 /* 00FF8 809502B8 86380002 */ lh $t8, 0x0002($s1) ## 8095C1D8 /* 00FFC 809502BC 862A0004 */ lh $t2, 0x0004($s1) ## 8095C1DA -/* 01000 809502C0 E7A60010 */ swc1 $f6, 0x0010($sp) +/* 01000 809502C0 E7A60010 */ swc1 $f6, 0x0010($sp) /* 01004 809502C4 C66A0028 */ lwc1 $f10, 0x0028($s3) ## 00000028 -/* 01008 809502C8 8FA40050 */ lw $a0, 0x0050($sp) +/* 01008 809502C8 8FA40050 */ lw $a0, 0x0050($sp) /* 0100C 809502CC 02602825 */ or $a1, $s3, $zero ## $a1 = 00000000 -/* 01010 809502D0 460A4400 */ add.s $f16, $f8, $f10 +/* 01010 809502D0 460A4400 */ add.s $f16, $f8, $f10 /* 01014 809502D4 02803025 */ or $a2, $s4, $zero ## $a2 = 00000000 /* 01018 809502D8 240700BA */ addiu $a3, $zero, 0x00BA ## $a3 = 000000BA -/* 0101C 809502DC E7B00014 */ swc1 $f16, 0x0014($sp) +/* 0101C 809502DC E7B00014 */ swc1 $f16, 0x0014($sp) /* 01020 809502E0 C664002C */ lwc1 $f4, 0x002C($s3) ## 0000002C -/* 01024 809502E4 46049180 */ add.s $f6, $f18, $f4 -/* 01028 809502E8 E7A60018 */ swc1 $f6, 0x0018($sp) +/* 01024 809502E4 46049180 */ add.s $f6, $f18, $f4 +/* 01028 809502E8 E7A60018 */ swc1 $f6, 0x0018($sp) /* 0102C 809502EC 866E0030 */ lh $t6, 0x0030($s3) ## 00000030 -/* 01030 809502F0 01AE7821 */ addu $t7, $t5, $t6 -/* 01034 809502F4 AFAF001C */ sw $t7, 0x001C($sp) +/* 01030 809502F0 01AE7821 */ addu $t7, $t5, $t6 +/* 01034 809502F4 AFAF001C */ sw $t7, 0x001C($sp) /* 01038 809502F8 86790032 */ lh $t9, 0x0032($s3) ## 00000032 -/* 0103C 809502FC 03194821 */ addu $t1, $t8, $t9 -/* 01040 80950300 AFA90020 */ sw $t1, 0x0020($sp) +/* 0103C 809502FC 03194821 */ addu $t1, $t8, $t9 +/* 01040 80950300 AFA90020 */ sw $t1, 0x0020($sp) /* 01044 80950304 866B0034 */ lh $t3, 0x0034($s3) ## 00000034 -/* 01048 80950308 AFB20028 */ sw $s2, 0x0028($sp) -/* 0104C 8095030C 014B6021 */ addu $t4, $t2, $t3 +/* 01048 80950308 AFB20028 */ sw $s2, 0x0028($sp) +/* 0104C 8095030C 014B6021 */ addu $t4, $t2, $t3 /* 01050 80950310 0C00C916 */ jal Actor_SpawnAttached - -/* 01054 80950314 AFAC0024 */ sw $t4, 0x0024($sp) + +/* 01054 80950314 AFAC0024 */ sw $t4, 0x0024($sp) /* 01058 80950318 2652FFFF */ addiu $s2, $s2, 0xFFFF ## $s2 = 0000000E /* 0105C 8095031C 24010005 */ addiu $at, $zero, 0x0005 ## $at = 00000005 /* 01060 80950320 2610FFF4 */ addiu $s0, $s0, 0xFFF4 ## $s0 = 8095C0EC -/* 01064 80950324 1641FFDE */ bne $s2, $at, .L809502A0 +/* 01064 80950324 1641FFDE */ bne $s2, $at, .L809502A0 /* 01068 80950328 2631FFFA */ addiu $s1, $s1, 0xFFFA ## $s1 = 8095C1D0 /* 0106C 8095032C 3C0D8096 */ lui $t5, %hi(D_8095C220) ## $t5 = 80960000 /* 01070 80950330 25ADC220 */ addiu $t5, $t5, %lo(D_8095C220) ## $t5 = 8095C220 @@ -353,15 +353,15 @@ glabel L80950024 /* 010C0 80950380 8C4B0004 */ lw $t3, 0x0004($v0) ## FFFFFFE8 /* 010C4 80950384 AD4B0004 */ sw $t3, 0x0004($t2) ## 8096692C /* 010C8 80950388 8C4C0008 */ lw $t4, 0x0008($v0) ## FFFFFFEC -/* 010CC 8095038C 10000007 */ beq $zero, $zero, .L809503AC +/* 010CC 8095038C 10000007 */ beq $zero, $zero, .L809503AC /* 010D0 80950390 AD4C0008 */ sw $t4, 0x0008($t2) ## 80966930 .L80950394: /* 010D4 80950394 240DFFFC */ addiu $t5, $zero, 0xFFFC ## $t5 = FFFFFFFC /* 010D8 80950398 3C018096 */ lui $at, %hi(D_809668D2) ## $at = 80960000 -/* 010DC 8095039C A02D68D2 */ sb $t5, %lo(D_809668D2)($at) +/* 010DC 8095039C A02D68D2 */ sb $t5, %lo(D_809668D2)($at) /* 010E0 809503A0 3C018096 */ lui $at, %hi(D_80966934) ## $at = 80960000 /* 010E4 809503A4 240E0005 */ addiu $t6, $zero, 0x0005 ## $t6 = 00000005 -/* 010E8 809503A8 A42E6934 */ sh $t6, %lo(D_80966934)($at) +/* 010E8 809503A8 A42E6934 */ sh $t6, %lo(D_80966934)($at) .L809503AC: /* 010EC 809503AC 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 /* 010F0 809503B0 44810000 */ mtc1 $at, $f0 ## $f0 = 1.00 @@ -369,14 +369,14 @@ glabel L80950024 /* 010F8 809503B8 02002825 */ or $a1, $s0, $zero ## $a1 = 0000028C /* 010FC 809503BC 02802025 */ or $a0, $s4, $zero ## $a0 = 00000000 /* 01100 809503C0 0C0170D9 */ jal ActorCollider_AllocCylinder - + /* 01104 809503C4 E66001CC */ swc1 $f0, 0x01CC($s3) ## 000001CC /* 01108 809503C8 3C078096 */ lui $a3, %hi(D_8095BF60) ## $a3 = 80960000 /* 0110C 809503CC 24E7BF60 */ addiu $a3, $a3, %lo(D_8095BF60) ## $a3 = 8095BF60 /* 01110 809503D0 02802025 */ or $a0, $s4, $zero ## $a0 = 00000000 /* 01114 809503D4 02002825 */ or $a1, $s0, $zero ## $a1 = 0000028C /* 01118 809503D8 0C01712B */ jal ActorCollider_InitCylinder - + /* 0111C 809503DC 02603025 */ or $a2, $s3, $zero ## $a2 = 00000000 /* 01120 809503E0 3C108096 */ lui $s0, %hi(D_8095C080) ## $s0 = 80960000 /* 01124 809503E4 3C118096 */ lui $s1, %hi(D_8095C19A) ## $s1 = 80960000 @@ -388,151 +388,151 @@ glabel L80950024 /* 01138 809503F8 C66A0024 */ lwc1 $f10, 0x0024($s3) ## 00000024 /* 0113C 809503FC C6120004 */ lwc1 $f18, 0x0004($s0) ## 8095C084 /* 01140 80950400 862F0000 */ lh $t7, 0x0000($s1) ## 8095C19A -/* 01144 80950404 460A4400 */ add.s $f16, $f8, $f10 +/* 01144 80950404 460A4400 */ add.s $f16, $f8, $f10 /* 01148 80950408 C6080008 */ lwc1 $f8, 0x0008($s0) ## 8095C088 /* 0114C 8095040C 86290002 */ lh $t1, 0x0002($s1) ## 8095C19C /* 01150 80950410 862C0004 */ lh $t4, 0x0004($s1) ## 8095C19E -/* 01154 80950414 E7B00010 */ swc1 $f16, 0x0010($sp) +/* 01154 80950414 E7B00010 */ swc1 $f16, 0x0010($sp) /* 01158 80950418 C6640028 */ lwc1 $f4, 0x0028($s3) ## 00000028 -/* 0115C 8095041C 8FA40050 */ lw $a0, 0x0050($sp) +/* 0115C 8095041C 8FA40050 */ lw $a0, 0x0050($sp) /* 01160 80950420 02602825 */ or $a1, $s3, $zero ## $a1 = 00000000 -/* 01164 80950424 46049180 */ add.s $f6, $f18, $f4 +/* 01164 80950424 46049180 */ add.s $f6, $f18, $f4 /* 01168 80950428 02803025 */ or $a2, $s4, $zero ## $a2 = 00000000 /* 0116C 8095042C 240700BA */ addiu $a3, $zero, 0x00BA ## $a3 = 000000BA -/* 01170 80950430 E7A60014 */ swc1 $f6, 0x0014($sp) +/* 01170 80950430 E7A60014 */ swc1 $f6, 0x0014($sp) /* 01174 80950434 C66A002C */ lwc1 $f10, 0x002C($s3) ## 0000002C -/* 01178 80950438 460A4400 */ add.s $f16, $f8, $f10 -/* 0117C 8095043C E7B00018 */ swc1 $f16, 0x0018($sp) +/* 01178 80950438 460A4400 */ add.s $f16, $f8, $f10 +/* 0117C 8095043C E7B00018 */ swc1 $f16, 0x0018($sp) /* 01180 80950440 86780030 */ lh $t8, 0x0030($s3) ## 00000030 -/* 01184 80950444 01F8C821 */ addu $t9, $t7, $t8 -/* 01188 80950448 AFB9001C */ sw $t9, 0x001C($sp) +/* 01184 80950444 01F8C821 */ addu $t9, $t7, $t8 +/* 01188 80950448 AFB9001C */ sw $t9, 0x001C($sp) /* 0118C 8095044C 866A0032 */ lh $t2, 0x0032($s3) ## 00000032 -/* 01190 80950450 012A5821 */ addu $t3, $t1, $t2 -/* 01194 80950454 AFAB0020 */ sw $t3, 0x0020($sp) +/* 01190 80950450 012A5821 */ addu $t3, $t1, $t2 +/* 01194 80950454 AFAB0020 */ sw $t3, 0x0020($sp) /* 01198 80950458 866D0034 */ lh $t5, 0x0034($s3) ## 00000034 -/* 0119C 8095045C AFB20028 */ sw $s2, 0x0028($sp) -/* 011A0 80950460 018D7021 */ addu $t6, $t4, $t5 +/* 0119C 8095045C AFB20028 */ sw $s2, 0x0028($sp) +/* 011A0 80950460 018D7021 */ addu $t6, $t4, $t5 /* 011A4 80950464 0C00C916 */ jal Actor_SpawnAttached - -/* 011A8 80950468 AFAE0024 */ sw $t6, 0x0024($sp) + +/* 011A8 80950468 AFAE0024 */ sw $t6, 0x0024($sp) /* 011AC 8095046C 2652FFFF */ addiu $s2, $s2, 0xFFFF ## $s2 = 00000004 /* 011B0 80950470 2610FFF4 */ addiu $s0, $s0, 0xFFF4 ## $s0 = 8095C074 -/* 011B4 80950474 0641FFDF */ bgez $s2, .L809503F4 +/* 011B4 80950474 0641FFDF */ bgez $s2, .L809503F4 /* 011B8 80950478 2631FFFA */ addiu $s1, $s1, 0xFFFA ## $s1 = 8095C194 /* 011BC 8095047C 3C048096 */ lui $a0, %hi(D_8095DF50) ## $a0 = 80960000 /* 011C0 80950480 2484DF50 */ addiu $a0, $a0, %lo(D_8095DF50) ## $a0 = 8095DF50 /* 011C4 80950484 34058980 */ ori $a1, $zero, 0x8980 ## $a1 = 00008980 /* 011C8 80950488 0C01DDF8 */ jal Lib_MemSet - + /* 011CC 8095048C 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 /* 011D0 80950490 3C0F8096 */ lui $t7, %hi(D_809668D2) ## $t7 = 80960000 -/* 011D4 80950494 81EF68D2 */ lb $t7, %lo(D_809668D2)($t7) -/* 011D8 80950498 29E1000D */ slti $at, $t7, 0x000D -/* 011DC 8095049C 10200005 */ beq $at, $zero, .L809504B4 +/* 011D4 80950494 81EF68D2 */ lb $t7, %lo(D_809668D2)($t7) +/* 011D8 80950498 29E1000D */ slti $at, $t7, 0x000D +/* 011DC 8095049C 10200005 */ beq $at, $zero, .L809504B4 /* 011E0 809504A0 00000000 */ nop -/* 011E4 809504A4 0C2541BC */ jal func_809506F0 +/* 011E4 809504A4 0C2541BC */ jal func_809506F0 /* 011E8 809504A8 02602025 */ or $a0, $s3, $zero ## $a0 = 00000000 -/* 011EC 809504AC 10000077 */ beq $zero, $zero, .L8095068C -/* 011F0 809504B0 8FBF004C */ lw $ra, 0x004C($sp) +/* 011EC 809504AC 10000077 */ beq $zero, $zero, .L8095068C +/* 011F0 809504B0 8FBF004C */ lw $ra, 0x004C($sp) .L809504B4: -/* 011F4 809504B4 0C2545E8 */ jal func_809517A0 +/* 011F4 809504B4 0C2545E8 */ jal func_809517A0 /* 011F8 809504B8 02602025 */ or $a0, $s3, $zero ## $a0 = 00000000 -/* 011FC 809504BC 10000073 */ beq $zero, $zero, .L8095068C -/* 01200 809504C0 8FBF004C */ lw $ra, 0x004C($sp) +/* 011FC 809504BC 10000073 */ beq $zero, $zero, .L8095068C +/* 01200 809504C0 8FBF004C */ lw $ra, 0x004C($sp) glabel L809504C4 /* 01204 809504C4 267002D8 */ addiu $s0, $s3, 0x02D8 ## $s0 = 000002D8 /* 01208 809504C8 02002825 */ or $a1, $s0, $zero ## $a1 = 000002D8 -/* 0120C 809504CC 0C016EFE */ jal func_8005BBF8 +/* 0120C 809504CC 0C016EFE */ jal func_8005BBF8 /* 01210 809504D0 02802025 */ or $a0, $s4, $zero ## $a0 = 00000000 /* 01214 809504D4 3C078096 */ lui $a3, %hi(D_8095BFB0) ## $a3 = 80960000 /* 01218 809504D8 267802F8 */ addiu $t8, $s3, 0x02F8 ## $t8 = 000002F8 -/* 0121C 809504DC AFB80010 */ sw $t8, 0x0010($sp) +/* 0121C 809504DC AFB80010 */ sw $t8, 0x0010($sp) /* 01220 809504E0 24E7BFB0 */ addiu $a3, $a3, %lo(D_8095BFB0) ## $a3 = 8095BFB0 /* 01224 809504E4 02802025 */ or $a0, $s4, $zero ## $a0 = 00000000 /* 01228 809504E8 02002825 */ or $a1, $s0, $zero ## $a1 = 000002D8 -/* 0122C 809504EC 0C017014 */ jal func_8005C050 +/* 0122C 809504EC 0C017014 */ jal func_8005C050 /* 01230 809504F0 02603025 */ or $a2, $s3, $zero ## $a2 = 00000000 /* 01234 809504F4 3C198096 */ lui $t9, %hi(D_809668D2) ## $t9 = 80960000 -/* 01238 809504F8 833968D2 */ lb $t9, %lo(D_809668D2)($t9) +/* 01238 809504F8 833968D2 */ lb $t9, %lo(D_809668D2)($t9) /* 0123C 809504FC 02802825 */ or $a1, $s4, $zero ## $a1 = 00000000 /* 01240 80950500 02602025 */ or $a0, $s3, $zero ## $a0 = 00000000 -/* 01244 80950504 2B21000D */ slti $at, $t9, 0x000D -/* 01248 80950508 10200005 */ beq $at, $zero, .L80950520 +/* 01244 80950504 2B21000D */ slti $at, $t9, 0x000D +/* 01248 80950508 10200005 */ beq $at, $zero, .L80950520 /* 0124C 8095050C 00000000 */ nop -/* 01250 80950510 0C254FD3 */ jal func_80953F4C +/* 01250 80950510 0C254FD3 */ jal func_80953F4C /* 01254 80950514 02602025 */ or $a0, $s3, $zero ## $a0 = 00000000 -/* 01258 80950518 10000004 */ beq $zero, $zero, .L8095052C +/* 01258 80950518 10000004 */ beq $zero, $zero, .L8095052C /* 0125C 8095051C 92690194 */ lbu $t1, 0x0194($s3) ## 00000194 .L80950520: -/* 01260 80950520 0C255039 */ jal func_809540E4 +/* 01260 80950520 0C255039 */ jal func_809540E4 /* 01264 80950524 02802825 */ or $a1, $s4, $zero ## $a1 = 00000000 /* 01268 80950528 92690194 */ lbu $t1, 0x0194($s3) ## 00000194 .L8095052C: /* 0126C 8095052C 252A0001 */ addiu $t2, $t1, 0x0001 ## $t2 = 00000001 -/* 01270 80950530 10000055 */ beq $zero, $zero, .L80950688 +/* 01270 80950530 10000055 */ beq $zero, $zero, .L80950688 /* 01274 80950534 A26A0194 */ sb $t2, 0x0194($s3) ## 00000194 glabel L80950538 /* 01278 80950538 26700338 */ addiu $s0, $s3, 0x0338 ## $s0 = 00000338 /* 0127C 8095053C 02002825 */ or $a1, $s0, $zero ## $a1 = 00000338 -/* 01280 80950540 0C017406 */ jal func_8005D018 +/* 01280 80950540 0C017406 */ jal func_8005D018 /* 01284 80950544 02802025 */ or $a0, $s4, $zero ## $a0 = 00000000 /* 01288 80950548 3C078096 */ lui $a3, %hi(D_8095BFF4) ## $a3 = 80960000 /* 0128C 8095054C 24E7BFF4 */ addiu $a3, $a3, %lo(D_8095BFF4) ## $a3 = 8095BFF4 /* 01290 80950550 02802025 */ or $a0, $s4, $zero ## $a0 = 00000000 /* 01294 80950554 02002825 */ or $a1, $s0, $zero ## $a1 = 00000338 -/* 01298 80950558 0C017441 */ jal func_8005D104 +/* 01298 80950558 0C017441 */ jal func_8005D104 /* 0129C 8095055C 02603025 */ or $a2, $s3, $zero ## $a2 = 00000000 /* 012A0 80950560 3C0B8096 */ lui $t3, %hi(D_809668D2) ## $t3 = 80960000 -/* 012A4 80950564 816B68D2 */ lb $t3, %lo(D_809668D2)($t3) +/* 012A4 80950564 816B68D2 */ lb $t3, %lo(D_809668D2)($t3) /* 012A8 80950568 02802825 */ or $a1, $s4, $zero ## $a1 = 00000000 /* 012AC 8095056C 02602025 */ or $a0, $s3, $zero ## $a0 = 00000000 -/* 012B0 80950570 2961000D */ slti $at, $t3, 0x000D -/* 012B4 80950574 10200005 */ beq $at, $zero, .L8095058C +/* 012B0 80950570 2961000D */ slti $at, $t3, 0x000D +/* 012B4 80950574 10200005 */ beq $at, $zero, .L8095058C /* 012B8 80950578 00000000 */ nop -/* 012BC 8095057C 0C25528F */ jal func_80954A3C +/* 012BC 8095057C 0C25528F */ jal func_80954A3C /* 012C0 80950580 02602025 */ or $a0, $s3, $zero ## $a0 = 00000000 -/* 012C4 80950584 10000041 */ beq $zero, $zero, .L8095068C -/* 012C8 80950588 8FBF004C */ lw $ra, 0x004C($sp) +/* 012C4 80950584 10000041 */ beq $zero, $zero, .L8095068C +/* 012C8 80950588 8FBF004C */ lw $ra, 0x004C($sp) .L8095058C: -/* 012CC 8095058C 0C2552E3 */ jal func_80954B8C +/* 012CC 8095058C 0C2552E3 */ jal func_80954B8C /* 012D0 80950590 02802825 */ or $a1, $s4, $zero ## $a1 = 00000000 -/* 012D4 80950594 1000003D */ beq $zero, $zero, .L8095068C -/* 012D8 80950598 8FBF004C */ lw $ra, 0x004C($sp) +/* 012D4 80950594 1000003D */ beq $zero, $zero, .L8095068C +/* 012D8 80950598 8FBF004C */ lw $ra, 0x004C($sp) glabel L8095059C /* 012DC 8095059C 02602025 */ or $a0, $s3, $zero ## $a0 = 00000000 -/* 012E0 809505A0 0C255249 */ jal func_80954924 +/* 012E0 809505A0 0C255249 */ jal func_80954924 /* 012E4 809505A4 02802825 */ or $a1, $s4, $zero ## $a1 = 00000000 -/* 012E8 809505A8 10000038 */ beq $zero, $zero, .L8095068C -/* 012EC 809505AC 8FBF004C */ lw $ra, 0x004C($sp) +/* 012E8 809505A8 10000038 */ beq $zero, $zero, .L8095068C +/* 012EC 809505AC 8FBF004C */ lw $ra, 0x004C($sp) glabel L809505B0 /* 012F0 809505B0 02602025 */ or $a0, $s3, $zero ## $a0 = 00000000 -/* 012F4 809505B4 0C255F27 */ jal func_80957C9C +/* 012F4 809505B4 0C255F27 */ jal func_80957C9C /* 012F8 809505B8 02802825 */ or $a1, $s4, $zero ## $a1 = 00000000 -/* 012FC 809505BC 10000033 */ beq $zero, $zero, .L8095068C -/* 01300 809505C0 8FBF004C */ lw $ra, 0x004C($sp) +/* 012FC 809505BC 10000033 */ beq $zero, $zero, .L8095068C +/* 01300 809505C0 8FBF004C */ lw $ra, 0x004C($sp) glabel L809505C4 .L809505C4: /* 01304 809505C4 267002D8 */ addiu $s0, $s3, 0x02D8 ## $s0 = 000002D8 /* 01308 809505C8 02002825 */ or $a1, $s0, $zero ## $a1 = 000002D8 -/* 0130C 809505CC 0C016EFE */ jal func_8005BBF8 +/* 0130C 809505CC 0C016EFE */ jal func_8005BBF8 /* 01310 809505D0 02802025 */ or $a0, $s4, $zero ## $a0 = 00000000 /* 01314 809505D4 3C078096 */ lui $a3, %hi(D_8095BFE4) ## $a3 = 80960000 /* 01318 809505D8 266C02F8 */ addiu $t4, $s3, 0x02F8 ## $t4 = 000002F8 -/* 0131C 809505DC AFAC0010 */ sw $t4, 0x0010($sp) +/* 0131C 809505DC AFAC0010 */ sw $t4, 0x0010($sp) /* 01320 809505E0 24E7BFE4 */ addiu $a3, $a3, %lo(D_8095BFE4) ## $a3 = 8095BFE4 /* 01324 809505E4 02802025 */ or $a0, $s4, $zero ## $a0 = 00000000 /* 01328 809505E8 02002825 */ or $a1, $s0, $zero ## $a1 = 000002D8 -/* 0132C 809505EC 0C017014 */ jal func_8005C050 +/* 0132C 809505EC 0C017014 */ jal func_8005C050 /* 01330 809505F0 02603025 */ or $a2, $s3, $zero ## $a2 = 00000000 /* 01334 809505F4 26700338 */ addiu $s0, $s3, 0x0338 ## $s0 = 00000338 /* 01338 809505F8 02002825 */ or $a1, $s0, $zero ## $a1 = 00000338 -/* 0133C 809505FC 0C017406 */ jal func_8005D018 +/* 0133C 809505FC 0C017406 */ jal func_8005D018 /* 01340 80950600 02802025 */ or $a0, $s4, $zero ## $a0 = 00000000 /* 01344 80950604 3C078096 */ lui $a3, %hi(D_8095BFF4) ## $a3 = 80960000 /* 01348 80950608 24E7BFF4 */ addiu $a3, $a3, %lo(D_8095BFF4) ## $a3 = 8095BFF4 /* 0134C 8095060C 02802025 */ or $a0, $s4, $zero ## $a0 = 00000000 /* 01350 80950610 02002825 */ or $a1, $s0, $zero ## $a1 = 00000338 -/* 01354 80950614 0C017441 */ jal func_8005D104 +/* 01354 80950614 0C017441 */ jal func_8005D104 /* 01358 80950618 02603025 */ or $a2, $s3, $zero ## $a2 = 00000000 /* 0135C 8095061C 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 /* 01360 80950620 44810000 */ mtc1 $at, $f0 ## $f0 = 1.00 @@ -540,38 +540,38 @@ glabel L809505C4 /* 01368 80950628 02602025 */ or $a0, $s3, $zero ## $a0 = 00000000 /* 0136C 8095062C E66001D8 */ swc1 $f0, 0x01D8($s3) ## 000001D8 /* 01370 80950630 E66001DC */ swc1 $f0, 0x01DC($s3) ## 000001DC -/* 01374 80950634 81AD68D2 */ lb $t5, %lo(D_809668D2)($t5) +/* 01374 80950634 81AD68D2 */ lb $t5, %lo(D_809668D2)($t5) /* 01378 80950638 3C0E8096 */ lui $t6, %hi(D_809668D1) ## $t6 = 80960000 -/* 0137C 8095063C 29A1000D */ slti $at, $t5, 0x000D -/* 01380 80950640 10200005 */ beq $at, $zero, .L80950658 +/* 0137C 8095063C 29A1000D */ slti $at, $t5, 0x000D +/* 01380 80950640 10200005 */ beq $at, $zero, .L80950658 /* 01384 80950644 00000000 */ nop -/* 01388 80950648 0C2559F4 */ jal func_809567D0 +/* 01388 80950648 0C2559F4 */ jal func_809567D0 /* 0138C 8095064C 02802825 */ or $a1, $s4, $zero ## $a1 = 00000000 -/* 01390 80950650 1000000E */ beq $zero, $zero, .L8095068C -/* 01394 80950654 8FBF004C */ lw $ra, 0x004C($sp) +/* 01390 80950650 1000000E */ beq $zero, $zero, .L8095068C +/* 01394 80950654 8FBF004C */ lw $ra, 0x004C($sp) .L80950658: -/* 01398 80950658 91CE68D1 */ lbu $t6, %lo(D_809668D1)($t6) +/* 01398 80950658 91CE68D1 */ lbu $t6, %lo(D_809668D1)($t6) /* 0139C 8095065C 02802825 */ or $a1, $s4, $zero ## $a1 = 00000000 /* 013A0 80950660 02602025 */ or $a0, $s3, $zero ## $a0 = 00000000 -/* 013A4 80950664 29C10009 */ slti $at, $t6, 0x0009 -/* 013A8 80950668 14200005 */ bne $at, $zero, .L80950680 +/* 013A4 80950664 29C10009 */ slti $at, $t6, 0x0009 +/* 013A8 80950668 14200005 */ bne $at, $zero, .L80950680 /* 013AC 8095066C 00000000 */ nop -/* 013B0 80950670 0C255B8E */ jal func_80956E38 +/* 013B0 80950670 0C255B8E */ jal func_80956E38 /* 013B4 80950674 02602025 */ or $a0, $s3, $zero ## $a0 = 00000000 -/* 013B8 80950678 10000004 */ beq $zero, $zero, .L8095068C -/* 013BC 8095067C 8FBF004C */ lw $ra, 0x004C($sp) +/* 013B8 80950678 10000004 */ beq $zero, $zero, .L8095068C +/* 013BC 8095067C 8FBF004C */ lw $ra, 0x004C($sp) .L80950680: -/* 013C0 80950680 0C255CB7 */ jal func_809572DC +/* 013C0 80950680 0C255CB7 */ jal func_809572DC /* 013C4 80950684 02802825 */ or $a1, $s4, $zero ## $a1 = 00000000 .L80950688: -/* 013C8 80950688 8FBF004C */ lw $ra, 0x004C($sp) +/* 013C8 80950688 8FBF004C */ lw $ra, 0x004C($sp) .L8095068C: -/* 013CC 8095068C 8FB00038 */ lw $s0, 0x0038($sp) -/* 013D0 80950690 8FB1003C */ lw $s1, 0x003C($sp) -/* 013D4 80950694 8FB20040 */ lw $s2, 0x0040($sp) -/* 013D8 80950698 8FB30044 */ lw $s3, 0x0044($sp) -/* 013DC 8095069C 8FB40048 */ lw $s4, 0x0048($sp) -/* 013E0 809506A0 03E00008 */ jr $ra +/* 013CC 8095068C 8FB00038 */ lw $s0, 0x0038($sp) +/* 013D0 80950690 8FB1003C */ lw $s1, 0x003C($sp) +/* 013D4 80950694 8FB20040 */ lw $s2, 0x0040($sp) +/* 013D8 80950698 8FB30044 */ lw $s3, 0x0044($sp) +/* 013DC 8095069C 8FB40048 */ lw $s4, 0x0048($sp) +/* 013E0 809506A0 03E00008 */ jr $ra /* 013E4 809506A4 27BD0078 */ addiu $sp, $sp, 0x0078 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_8094F2C8.s b/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_8094F2C8.s index 6a9fe57a5e..5640f0f57b 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_8094F2C8.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_8094F2C8.s @@ -1,140 +1,140 @@ glabel func_8094F2C8 /* 00008 8094F2C8 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 0000C 8094F2CC AFBF001C */ sw $ra, 0x001C($sp) -/* 00010 8094F2D0 AFB10018 */ sw $s1, 0x0018($sp) -/* 00014 8094F2D4 AFB00014 */ sw $s0, 0x0014($sp) +/* 0000C 8094F2CC AFBF001C */ sw $ra, 0x001C($sp) +/* 00010 8094F2D0 AFB10018 */ sw $s1, 0x0018($sp) +/* 00014 8094F2D4 AFB00014 */ sw $s0, 0x0014($sp) /* 00018 8094F2D8 8C910118 */ lw $s1, 0x0118($a0) ## 00000118 /* 0001C 8094F2DC 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 00020 8094F2E0 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 /* 00024 8094F2E4 C62C0024 */ lwc1 $f12, 0x0024($s1) ## 00000024 /* 00028 8094F2E8 C62E0028 */ lwc1 $f14, 0x0028($s1) ## 00000028 -/* 0002C 8094F2EC 0C034261 */ jal Matrix_Translate +/* 0002C 8094F2EC 0C034261 */ jal Matrix_Translate /* 00030 8094F2F0 8E26002C */ lw $a2, 0x002C($s1) ## 0000002C /* 00034 8094F2F4 862400B4 */ lh $a0, 0x00B4($s1) ## 000000B4 /* 00038 8094F2F8 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 0003C 8094F2FC 862600B8 */ lh $a2, 0x00B8($s1) ## 000000B8 -/* 00040 8094F300 0C034421 */ jal Matrix_RotateXYZ +/* 00040 8094F300 0C034421 */ jal Matrix_RotateZYX /* 00044 8094F304 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 /* 00048 8094F308 860E001C */ lh $t6, 0x001C($s0) ## 0000001C /* 0004C 8094F30C 3C188096 */ lui $t8, %hi(D_8095C044) ## $t8 = 80960000 /* 00050 8094F310 2718C044 */ addiu $t8, $t8, %lo(D_8095C044) ## $t8 = 8095C044 -/* 00054 8094F314 000E7880 */ sll $t7, $t6, 2 -/* 00058 8094F318 01EE7823 */ subu $t7, $t7, $t6 -/* 0005C 8094F31C 000F7880 */ sll $t7, $t7, 2 -/* 00060 8094F320 01F82021 */ addu $a0, $t7, $t8 -/* 00064 8094F324 0C0346BD */ jal Matrix_MultVec3f +/* 00054 8094F314 000E7880 */ sll $t7, $t6, 2 +/* 00058 8094F318 01EE7823 */ subu $t7, $t7, $t6 +/* 0005C 8094F31C 000F7880 */ sll $t7, $t7, 2 +/* 00060 8094F320 01F82021 */ addu $a0, $t7, $t8 +/* 00064 8094F324 0C0346BD */ jal Matrix_MultVec3f /* 00068 8094F328 26050024 */ addiu $a1, $s0, 0x0024 ## $a1 = 00000024 /* 0006C 8094F32C 8603001C */ lh $v1, 0x001C($s0) ## 0000001C -/* 00070 8094F330 2C610006 */ sltiu $at, $v1, 0x0006 -/* 00074 8094F334 10200067 */ beq $at, $zero, .L8094F4D4 -/* 00078 8094F338 0003C880 */ sll $t9, $v1, 2 +/* 00070 8094F330 2C610006 */ sltiu $at, $v1, 0x0006 +/* 00074 8094F334 10200067 */ beq $at, $zero, .L8094F4D4 +/* 00078 8094F338 0003C880 */ sll $t9, $v1, 2 /* 0007C 8094F33C 3C018096 */ lui $at, %hi(jtbl_8095C560) ## $at = 80960000 -/* 00080 8094F340 00390821 */ addu $at, $at, $t9 -/* 00084 8094F344 8C39C560 */ lw $t9, %lo(jtbl_8095C560)($at) -/* 00088 8094F348 03200008 */ jr $t9 +/* 00080 8094F340 00390821 */ addu $at, $at, $t9 +/* 00084 8094F344 8C39C560 */ lw $t9, %lo(jtbl_8095C560)($at) +/* 00088 8094F348 03200008 */ jr $t9 /* 0008C 8094F34C 00000000 */ nop glabel L8094F350 /* 00090 8094F350 92080194 */ lbu $t0, 0x0194($s0) ## 00000194 -/* 00094 8094F354 00034880 */ sll $t1, $v1, 2 -/* 00098 8094F358 01234823 */ subu $t1, $t1, $v1 -/* 0009C 8094F35C 1500005D */ bne $t0, $zero, .L8094F4D4 -/* 000A0 8094F360 00094840 */ sll $t1, $t1, 1 +/* 00094 8094F354 00034880 */ sll $t1, $v1, 2 +/* 00098 8094F358 01234823 */ subu $t1, $t1, $v1 +/* 0009C 8094F35C 1500005D */ bne $t0, $zero, .L8094F4D4 +/* 000A0 8094F360 00094840 */ sll $t1, $t1, 1 /* 000A4 8094F364 3C0A8096 */ lui $t2, %hi(D_8095C17C) ## $t2 = 80960000 /* 000A8 8094F368 254AC17C */ addiu $t2, $t2, %lo(D_8095C17C) ## $t2 = 8095C17C -/* 000AC 8094F36C 012A1021 */ addu $v0, $t1, $t2 +/* 000AC 8094F36C 012A1021 */ addu $v0, $t1, $t2 /* 000B0 8094F370 844B0000 */ lh $t3, 0x0000($v0) ## 00000000 /* 000B4 8094F374 862C00B4 */ lh $t4, 0x00B4($s1) ## 000000B4 -/* 000B8 8094F378 016C6821 */ addu $t5, $t3, $t4 +/* 000B8 8094F378 016C6821 */ addu $t5, $t3, $t4 /* 000BC 8094F37C A60D00B4 */ sh $t5, 0x00B4($s0) ## 000000B4 /* 000C0 8094F380 844E0002 */ lh $t6, 0x0002($v0) ## 00000002 /* 000C4 8094F384 A60E00B6 */ sh $t6, 0x00B6($s0) ## 000000B6 /* 000C8 8094F388 863800B8 */ lh $t8, 0x00B8($s1) ## 000000B8 /* 000CC 8094F38C 844F0004 */ lh $t7, 0x0004($v0) ## 00000004 -/* 000D0 8094F390 01F8C821 */ addu $t9, $t7, $t8 -/* 000D4 8094F394 1000004F */ beq $zero, $zero, .L8094F4D4 +/* 000D0 8094F390 01F8C821 */ addu $t9, $t7, $t8 +/* 000D4 8094F394 1000004F */ beq $zero, $zero, .L8094F4D4 /* 000D8 8094F398 A61900B8 */ sh $t9, 0x00B8($s0) ## 000000B8 glabel L8094F39C -/* 000DC 8094F39C 00034080 */ sll $t0, $v1, 2 -/* 000E0 8094F3A0 01034023 */ subu $t0, $t0, $v1 +/* 000DC 8094F39C 00034080 */ sll $t0, $v1, 2 +/* 000E0 8094F3A0 01034023 */ subu $t0, $t0, $v1 /* 000E4 8094F3A4 3C098096 */ lui $t1, %hi(D_8095C17C) ## $t1 = 80960000 /* 000E8 8094F3A8 2529C17C */ addiu $t1, $t1, %lo(D_8095C17C) ## $t1 = 8095C17C -/* 000EC 8094F3AC 00084040 */ sll $t0, $t0, 1 -/* 000F0 8094F3B0 01091021 */ addu $v0, $t0, $t1 +/* 000EC 8094F3AC 00084040 */ sll $t0, $t0, 1 +/* 000F0 8094F3B0 01091021 */ addu $v0, $t0, $t1 /* 000F4 8094F3B4 844A0002 */ lh $t2, 0x0002($v0) ## 00000002 /* 000F8 8094F3B8 A60A00B6 */ sh $t2, 0x00B6($s0) ## 000000B6 /* 000FC 8094F3BC 0C01DE0D */ jal Math_Coss ## coss? /* 00100 8094F3C0 84440002 */ lh $a0, 0x0002($v0) ## 00000002 -/* 00104 8094F3C4 E7A00020 */ swc1 $f0, 0x0020($sp) +/* 00104 8094F3C4 E7A00020 */ swc1 $f0, 0x0020($sp) /* 00108 8094F3C8 860B001C */ lh $t3, 0x001C($s0) ## 0000001C /* 0010C 8094F3CC 3C048096 */ lui $a0, %hi(D_8095C17E) ## $a0 = 80960000 -/* 00110 8094F3D0 000B6080 */ sll $t4, $t3, 2 -/* 00114 8094F3D4 018B6023 */ subu $t4, $t4, $t3 -/* 00118 8094F3D8 000C6040 */ sll $t4, $t4, 1 -/* 0011C 8094F3DC 008C2021 */ addu $a0, $a0, $t4 +/* 00110 8094F3D0 000B6080 */ sll $t4, $t3, 2 +/* 00114 8094F3D4 018B6023 */ subu $t4, $t4, $t3 +/* 00118 8094F3D8 000C6040 */ sll $t4, $t4, 1 +/* 0011C 8094F3DC 008C2021 */ addu $a0, $a0, $t4 /* 00120 8094F3E0 0C01DE1C */ jal Math_Sins ## sins? -/* 00124 8094F3E4 8484C17E */ lh $a0, %lo(D_8095C17E)($a0) +/* 00124 8094F3E4 8484C17E */ lh $a0, %lo(D_8095C17E)($a0) /* 00128 8094F3E8 860D001C */ lh $t5, 0x001C($s0) ## 0000001C /* 0012C 8094F3EC 863800B4 */ lh $t8, 0x00B4($s1) ## 000000B4 -/* 00130 8094F3F0 C7A40020 */ lwc1 $f4, 0x0020($sp) -/* 00134 8094F3F4 000D7080 */ sll $t6, $t5, 2 -/* 00138 8094F3F8 01CD7023 */ subu $t6, $t6, $t5 +/* 00130 8094F3F0 C7A40020 */ lwc1 $f4, 0x0020($sp) +/* 00134 8094F3F4 000D7080 */ sll $t6, $t5, 2 +/* 00138 8094F3F8 01CD7023 */ subu $t6, $t6, $t5 /* 0013C 8094F3FC 862D00B8 */ lh $t5, 0x00B8($s1) ## 000000B8 /* 00140 8094F400 44983000 */ mtc1 $t8, $f6 ## $f6 = 0.00 /* 00144 8094F404 3C0F8096 */ lui $t7, %hi(D_8095C17C) ## $t7 = 80960000 /* 00148 8094F408 448D9000 */ mtc1 $t5, $f18 ## $f18 = 0.00 -/* 0014C 8094F40C 46803220 */ cvt.s.w $f8, $f6 +/* 0014C 8094F40C 46803220 */ cvt.s.w $f8, $f6 /* 00150 8094F410 25EFC17C */ addiu $t7, $t7, %lo(D_8095C17C) ## $t7 = 8095C17C -/* 00154 8094F414 000E7040 */ sll $t6, $t6, 1 -/* 00158 8094F418 01CF1021 */ addu $v0, $t6, $t7 +/* 00154 8094F414 000E7040 */ sll $t6, $t6, 1 +/* 00158 8094F418 01CF1021 */ addu $v0, $t6, $t7 /* 0015C 8094F41C 844B0000 */ lh $t3, 0x0000($v0) ## 00000000 -/* 00160 8094F420 468091A0 */ cvt.s.w $f6, $f18 -/* 00164 8094F424 46082282 */ mul.s $f10, $f4, $f8 +/* 00160 8094F420 468091A0 */ cvt.s.w $f6, $f18 +/* 00164 8094F424 46082282 */ mul.s $f10, $f4, $f8 /* 00168 8094F428 00000000 */ nop -/* 0016C 8094F42C 46060102 */ mul.s $f4, $f0, $f6 -/* 00170 8094F430 4600540D */ trunc.w.s $f16, $f10 -/* 00174 8094F434 4600220D */ trunc.w.s $f8, $f4 -/* 00178 8094F438 440A8000 */ mfc1 $t2, $f16 -/* 0017C 8094F43C 44194000 */ mfc1 $t9, $f8 -/* 00180 8094F440 016A6021 */ addu $t4, $t3, $t2 -/* 00184 8094F444 01994023 */ subu $t0, $t4, $t9 +/* 0016C 8094F42C 46060102 */ mul.s $f4, $f0, $f6 +/* 00170 8094F430 4600540D */ trunc.w.s $f16, $f10 +/* 00174 8094F434 4600220D */ trunc.w.s $f8, $f4 +/* 00178 8094F438 440A8000 */ mfc1 $t2, $f16 +/* 0017C 8094F43C 44194000 */ mfc1 $t9, $f8 +/* 00180 8094F440 016A6021 */ addu $t4, $t3, $t2 +/* 00184 8094F444 01994023 */ subu $t0, $t4, $t9 /* 00188 8094F448 A60800B4 */ sh $t0, 0x00B4($s0) ## 000000B4 /* 0018C 8094F44C 0C01DE0D */ jal Math_Coss ## coss? /* 00190 8094F450 84440002 */ lh $a0, 0x0002($v0) ## 00000002 -/* 00194 8094F454 E7A00020 */ swc1 $f0, 0x0020($sp) +/* 00194 8094F454 E7A00020 */ swc1 $f0, 0x0020($sp) /* 00198 8094F458 8609001C */ lh $t1, 0x001C($s0) ## 0000001C /* 0019C 8094F45C 3C048096 */ lui $a0, %hi(D_8095C17E) ## $a0 = 80960000 -/* 001A0 8094F460 00095880 */ sll $t3, $t1, 2 -/* 001A4 8094F464 01695823 */ subu $t3, $t3, $t1 -/* 001A8 8094F468 000B5840 */ sll $t3, $t3, 1 -/* 001AC 8094F46C 008B2021 */ addu $a0, $a0, $t3 +/* 001A0 8094F460 00095880 */ sll $t3, $t1, 2 +/* 001A4 8094F464 01695823 */ subu $t3, $t3, $t1 +/* 001A8 8094F468 000B5840 */ sll $t3, $t3, 1 +/* 001AC 8094F46C 008B2021 */ addu $a0, $a0, $t3 /* 001B0 8094F470 0C01DE1C */ jal Math_Sins ## sins? -/* 001B4 8094F474 8484C17E */ lh $a0, %lo(D_8095C17E)($a0) +/* 001B4 8094F474 8484C17E */ lh $a0, %lo(D_8095C17E)($a0) /* 001B8 8094F478 862A00B4 */ lh $t2, 0x00B4($s1) ## 000000B4 /* 001BC 8094F47C 862B00B8 */ lh $t3, 0x00B8($s1) ## 000000B8 -/* 001C0 8094F480 C7A40020 */ lwc1 $f4, 0x0020($sp) +/* 001C0 8094F480 C7A40020 */ lwc1 $f4, 0x0020($sp) /* 001C4 8094F484 448A5000 */ mtc1 $t2, $f10 ## $f10 = 0.00 /* 001C8 8094F488 448B4000 */ mtc1 $t3, $f8 ## $f8 = 0.00 /* 001CC 8094F48C 860C001C */ lh $t4, 0x001C($s0) ## 0000001C -/* 001D0 8094F490 46805420 */ cvt.s.w $f16, $f10 +/* 001D0 8094F490 46805420 */ cvt.s.w $f16, $f10 /* 001D4 8094F494 3C088096 */ lui $t0, %hi(D_8095C180) ## $t0 = 80960000 -/* 001D8 8094F498 000CC880 */ sll $t9, $t4, 2 -/* 001DC 8094F49C 032CC823 */ subu $t9, $t9, $t4 -/* 001E0 8094F4A0 0019C840 */ sll $t9, $t9, 1 -/* 001E4 8094F4A4 468042A0 */ cvt.s.w $f10, $f8 -/* 001E8 8094F4A8 46100482 */ mul.s $f18, $f0, $f16 -/* 001EC 8094F4AC 01194021 */ addu $t0, $t0, $t9 -/* 001F0 8094F4B0 8508C180 */ lh $t0, %lo(D_8095C180)($t0) -/* 001F4 8094F4B4 460A2402 */ mul.s $f16, $f4, $f10 -/* 001F8 8094F4B8 4600918D */ trunc.w.s $f6, $f18 -/* 001FC 8094F4BC 4600848D */ trunc.w.s $f18, $f16 -/* 00200 8094F4C0 44183000 */ mfc1 $t8, $f6 -/* 00204 8094F4C4 440F9000 */ mfc1 $t7, $f18 -/* 00208 8094F4C8 03084821 */ addu $t1, $t8, $t0 -/* 0020C 8094F4CC 012F6021 */ addu $t4, $t1, $t7 +/* 001D8 8094F498 000CC880 */ sll $t9, $t4, 2 +/* 001DC 8094F49C 032CC823 */ subu $t9, $t9, $t4 +/* 001E0 8094F4A0 0019C840 */ sll $t9, $t9, 1 +/* 001E4 8094F4A4 468042A0 */ cvt.s.w $f10, $f8 +/* 001E8 8094F4A8 46100482 */ mul.s $f18, $f0, $f16 +/* 001EC 8094F4AC 01194021 */ addu $t0, $t0, $t9 +/* 001F0 8094F4B0 8508C180 */ lh $t0, %lo(D_8095C180)($t0) +/* 001F4 8094F4B4 460A2402 */ mul.s $f16, $f4, $f10 +/* 001F8 8094F4B8 4600918D */ trunc.w.s $f6, $f18 +/* 001FC 8094F4BC 4600848D */ trunc.w.s $f18, $f16 +/* 00200 8094F4C0 44183000 */ mfc1 $t8, $f6 +/* 00204 8094F4C4 440F9000 */ mfc1 $t7, $f18 +/* 00208 8094F4C8 03084821 */ addu $t1, $t8, $t0 +/* 0020C 8094F4CC 012F6021 */ addu $t4, $t1, $t7 /* 00210 8094F4D0 A60C00B8 */ sh $t4, 0x00B8($s0) ## 000000B8 .L8094F4D4: /* 00214 8094F4D4 8A1800B4 */ lwl $t8, 0x00B4($s0) ## 000000B4 @@ -146,10 +146,10 @@ glabel L8094F39C /* 0022C 8094F4EC A6180034 */ sh $t8, 0x0034($s0) ## 00000034 /* 00230 8094F4F0 C50600BC */ lwc1 $f6, 0x00BC($t0) ## 809600BC /* 00234 8094F4F4 E60600BC */ swc1 $f6, 0x00BC($s0) ## 000000BC -/* 00238 8094F4F8 8FBF001C */ lw $ra, 0x001C($sp) -/* 0023C 8094F4FC 8FB10018 */ lw $s1, 0x0018($sp) -/* 00240 8094F500 8FB00014 */ lw $s0, 0x0014($sp) -/* 00244 8094F504 03E00008 */ jr $ra +/* 00238 8094F4F8 8FBF001C */ lw $ra, 0x001C($sp) +/* 0023C 8094F4FC 8FB10018 */ lw $s1, 0x0018($sp) +/* 00240 8094F500 8FB00014 */ lw $s0, 0x0014($sp) +/* 00244 8094F504 03E00008 */ jr $ra /* 00248 8094F508 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_809506F0.s b/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_809506F0.s index 98bd817743..62d4252a38 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_809506F0.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_809506F0.s @@ -1,41 +1,41 @@ glabel func_809506F0 /* 01430 809506F0 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 01434 809506F4 AFB00028 */ sw $s0, 0x0028($sp) +/* 01434 809506F4 AFB00028 */ sw $s0, 0x0028($sp) /* 01438 809506F8 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 0143C 809506FC AFBF002C */ sw $ra, 0x002C($sp) +/* 0143C 809506FC AFBF002C */ sw $ra, 0x002C($sp) /* 01440 80950700 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 /* 01444 80950704 0C028800 */ jal SkelAnime_GetFrameCount - + /* 01448 80950708 24845184 */ addiu $a0, $a0, 0x5184 ## $a0 = 06005184 /* 0144C 8095070C 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 01450 80950710 44803000 */ mtc1 $zero, $f6 ## $f6 = 0.00 /* 01454 80950714 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 01458 80950718 46802020 */ cvt.s.w $f0, $f4 +/* 01458 80950718 46802020 */ cvt.s.w $f0, $f4 /* 0145C 8095071C 240E0002 */ addiu $t6, $zero, 0x0002 ## $t6 = 00000002 -/* 01460 80950720 AFAE0014 */ sw $t6, 0x0014($sp) +/* 01460 80950720 AFAE0014 */ sw $t6, 0x0014($sp) /* 01464 80950724 24A55184 */ addiu $a1, $a1, 0x5184 ## $a1 = 06005184 /* 01468 80950728 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C /* 0146C 8095072C 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 01470 80950730 44070000 */ mfc1 $a3, $f0 -/* 01474 80950734 E7A00010 */ swc1 $f0, 0x0010($sp) -/* 01478 80950738 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 0147C 8095073C E7A60018 */ swc1 $f6, 0x0018($sp) +/* 01470 80950730 44070000 */ mfc1 $a3, $f0 +/* 01474 80950734 E7A00010 */ swc1 $f0, 0x0010($sp) +/* 01478 80950738 0C029468 */ jal SkelAnime_ChangeAnim + +/* 0147C 8095073C E7A60018 */ swc1 $f6, 0x0018($sp) /* 01480 80950740 8E0F0004 */ lw $t7, 0x0004($s0) ## 00000004 /* 01484 80950744 3C01C3E1 */ lui $at, 0xC3E1 ## $at = C3E10000 /* 01488 80950748 44814000 */ mtc1 $at, $f8 ## $f8 = -450.00 /* 0148C 8095074C 2401FFFE */ addiu $at, $zero, 0xFFFE ## $at = FFFFFFFE /* 01490 80950750 3C058095 */ lui $a1, %hi(func_80950780) ## $a1 = 80950000 -/* 01494 80950754 01E1C024 */ and $t8, $t7, $at +/* 01494 80950754 01E1C024 */ and $t8, $t7, $at /* 01498 80950758 AE180004 */ sw $t8, 0x0004($s0) ## 00000004 /* 0149C 8095075C 24A50780 */ addiu $a1, $a1, %lo(func_80950780) ## $a1 = 80950780 /* 014A0 80950760 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 014A4 80950764 0C253CB0 */ jal func_8094F2C0 +/* 014A4 80950764 0C253CB0 */ jal func_8094F2C0 /* 014A8 80950768 E60800BC */ swc1 $f8, 0x00BC($s0) ## 000000BC -/* 014AC 8095076C 8FBF002C */ lw $ra, 0x002C($sp) -/* 014B0 80950770 8FB00028 */ lw $s0, 0x0028($sp) +/* 014AC 8095076C 8FBF002C */ lw $ra, 0x002C($sp) +/* 014B0 80950770 8FB00028 */ lw $s0, 0x0028($sp) /* 014B4 80950774 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 014B8 80950778 03E00008 */ jr $ra +/* 014B8 80950778 03E00008 */ jr $ra /* 014BC 8095077C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_809517A0.s b/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_809517A0.s index 26b5ff80d6..5f5bd67ff0 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_809517A0.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_809517A0.s @@ -1,31 +1,31 @@ glabel func_809517A0 /* 024E0 809517A0 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 024E4 809517A4 AFB00028 */ sw $s0, 0x0028($sp) +/* 024E4 809517A4 AFB00028 */ sw $s0, 0x0028($sp) /* 024E8 809517A8 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 024EC 809517AC AFBF002C */ sw $ra, 0x002C($sp) +/* 024EC 809517AC AFBF002C */ sw $ra, 0x002C($sp) /* 024F0 809517B0 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 /* 024F4 809517B4 0C028800 */ jal SkelAnime_GetFrameCount - + /* 024F8 809517B8 24845184 */ addiu $a0, $a0, 0x5184 ## $a0 = 06005184 /* 024FC 809517BC 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 02500 809517C0 44803000 */ mtc1 $zero, $f6 ## $f6 = 0.00 /* 02504 809517C4 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 02508 809517C8 46802020 */ cvt.s.w $f0, $f4 +/* 02508 809517C8 46802020 */ cvt.s.w $f0, $f4 /* 0250C 809517CC 240E0002 */ addiu $t6, $zero, 0x0002 ## $t6 = 00000002 -/* 02510 809517D0 AFAE0014 */ sw $t6, 0x0014($sp) +/* 02510 809517D0 AFAE0014 */ sw $t6, 0x0014($sp) /* 02514 809517D4 24A55184 */ addiu $a1, $a1, 0x5184 ## $a1 = 06005184 /* 02518 809517D8 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C /* 0251C 809517DC 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 02520 809517E0 44070000 */ mfc1 $a3, $f0 -/* 02524 809517E4 E7A00010 */ swc1 $f0, 0x0010($sp) -/* 02528 809517E8 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 0252C 809517EC E7A60018 */ swc1 $f6, 0x0018($sp) +/* 02520 809517E0 44070000 */ mfc1 $a3, $f0 +/* 02524 809517E4 E7A00010 */ swc1 $f0, 0x0010($sp) +/* 02528 809517E8 0C029468 */ jal SkelAnime_ChangeAnim + +/* 0252C 809517EC E7A60018 */ swc1 $f6, 0x0018($sp) /* 02530 809517F0 8E0F0004 */ lw $t7, 0x0004($s0) ## 00000004 /* 02534 809517F4 3C01C3E1 */ lui $at, 0xC3E1 ## $at = C3E10000 /* 02538 809517F8 44814000 */ mtc1 $at, $f8 ## $f8 = -450.00 /* 0253C 809517FC 2401FFFE */ addiu $at, $zero, 0xFFFE ## $at = FFFFFFFE -/* 02540 80951800 01E1C024 */ and $t8, $t7, $at +/* 02540 80951800 01E1C024 */ and $t8, $t7, $at /* 02544 80951804 24190019 */ addiu $t9, $zero, 0x0019 ## $t9 = 00000019 /* 02548 80951808 AE180004 */ sw $t8, 0x0004($s0) ## 00000004 /* 0254C 8095180C AE190198 */ sw $t9, 0x0198($s0) ## 00000198 @@ -33,14 +33,14 @@ glabel func_809517A0 /* 02554 80951814 24080080 */ addiu $t0, $zero, 0x0080 ## $t0 = 00000080 /* 02558 80951818 3C058095 */ lui $a1, %hi(func_80951844) ## $a1 = 80950000 /* 0255C 8095181C E60800BC */ swc1 $f8, 0x00BC($s0) ## 000000BC -/* 02560 80951820 A02868D0 */ sb $t0, %lo(D_809668D0)($at) +/* 02560 80951820 A02868D0 */ sb $t0, %lo(D_809668D0)($at) /* 02564 80951824 24A51844 */ addiu $a1, $a1, %lo(func_80951844) ## $a1 = 80951844 -/* 02568 80951828 0C253CB0 */ jal func_8094F2C0 +/* 02568 80951828 0C253CB0 */ jal func_8094F2C0 /* 0256C 8095182C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02570 80951830 8FBF002C */ lw $ra, 0x002C($sp) -/* 02574 80951834 8FB00028 */ lw $s0, 0x0028($sp) +/* 02570 80951830 8FBF002C */ lw $ra, 0x002C($sp) +/* 02574 80951834 8FB00028 */ lw $s0, 0x0028($sp) /* 02578 80951838 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 0257C 8095183C 03E00008 */ jr $ra +/* 0257C 8095183C 03E00008 */ jr $ra /* 02580 80951840 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_80953F4C.s b/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_80953F4C.s index 87eafe35f5..af873b08b7 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_80953F4C.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_80953F4C.s @@ -1,35 +1,35 @@ glabel func_80953F4C /* 04C8C 80953F4C 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 04C90 80953F50 AFA40028 */ sw $a0, 0x0028($sp) -/* 04C94 80953F54 AFBF0024 */ sw $ra, 0x0024($sp) +/* 04C90 80953F50 AFA40028 */ sw $a0, 0x0028($sp) +/* 04C94 80953F54 AFBF0024 */ sw $ra, 0x0024($sp) /* 04C98 80953F58 3C040601 */ lui $a0, 0x0601 ## $a0 = 06010000 -/* 04C9C 80953F5C AFA5002C */ sw $a1, 0x002C($sp) +/* 04C9C 80953F5C AFA5002C */ sw $a1, 0x002C($sp) /* 04CA0 80953F60 0C028800 */ jal SkelAnime_GetFrameCount - + /* 04CA4 80953F64 248466A8 */ addiu $a0, $a0, 0x66A8 ## $a0 = 060166A8 /* 04CA8 80953F68 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 04CAC 80953F6C 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 04CB0 80953F70 8FA40028 */ lw $a0, 0x0028($sp) -/* 04CB4 80953F74 468021A0 */ cvt.s.w $f6, $f4 +/* 04CB0 80953F70 8FA40028 */ lw $a0, 0x0028($sp) +/* 04CB4 80953F74 468021A0 */ cvt.s.w $f6, $f4 /* 04CB8 80953F78 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 /* 04CBC 80953F7C 240E0001 */ addiu $t6, $zero, 0x0001 ## $t6 = 00000001 -/* 04CC0 80953F80 44060000 */ mfc1 $a2, $f0 -/* 04CC4 80953F84 44070000 */ mfc1 $a3, $f0 -/* 04CC8 80953F88 AFAE0014 */ sw $t6, 0x0014($sp) +/* 04CC0 80953F80 44060000 */ mfc1 $a2, $f0 +/* 04CC4 80953F84 44070000 */ mfc1 $a3, $f0 +/* 04CC8 80953F88 AFAE0014 */ sw $t6, 0x0014($sp) /* 04CCC 80953F8C 24A566A8 */ addiu $a1, $a1, 0x66A8 ## $a1 = 060166A8 -/* 04CD0 80953F90 E7A60010 */ swc1 $f6, 0x0010($sp) +/* 04CD0 80953F90 E7A60010 */ swc1 $f6, 0x0010($sp) /* 04CD4 80953F94 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 04CD8 80953F98 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 04CDC 80953F9C E7A00018 */ swc1 $f0, 0x0018($sp) -/* 04CE0 80953FA0 8FA40028 */ lw $a0, 0x0028($sp) +/* 04CD8 80953F98 0C029468 */ jal SkelAnime_ChangeAnim + +/* 04CDC 80953F9C E7A00018 */ swc1 $f0, 0x0018($sp) +/* 04CE0 80953FA0 8FA40028 */ lw $a0, 0x0028($sp) /* 04CE4 80953FA4 3C058095 */ lui $a1, %hi(func_80953FC4) ## $a1 = 80950000 /* 04CE8 80953FA8 24A53FC4 */ addiu $a1, $a1, %lo(func_80953FC4) ## $a1 = 80953FC4 -/* 04CEC 80953FAC 0C253CB0 */ jal func_8094F2C0 +/* 04CEC 80953FAC 0C253CB0 */ jal func_8094F2C0 /* 04CF0 80953FB0 AC800198 */ sw $zero, 0x0198($a0) ## 00000198 -/* 04CF4 80953FB4 8FBF0024 */ lw $ra, 0x0024($sp) +/* 04CF4 80953FB4 8FBF0024 */ lw $ra, 0x0024($sp) /* 04CF8 80953FB8 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 04CFC 80953FBC 03E00008 */ jr $ra +/* 04CFC 80953FBC 03E00008 */ jr $ra /* 04D00 80953FC0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_809540E4.s b/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_809540E4.s index a66cb69974..da059b8e39 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_809540E4.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_809540E4.s @@ -1,38 +1,38 @@ glabel func_809540E4 /* 04E24 809540E4 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 04E28 809540E8 AFA40028 */ sw $a0, 0x0028($sp) -/* 04E2C 809540EC AFBF0024 */ sw $ra, 0x0024($sp) +/* 04E28 809540E8 AFA40028 */ sw $a0, 0x0028($sp) +/* 04E2C 809540EC AFBF0024 */ sw $ra, 0x0024($sp) /* 04E30 809540F0 3C040601 */ lui $a0, 0x0601 ## $a0 = 06010000 -/* 04E34 809540F4 AFA5002C */ sw $a1, 0x002C($sp) +/* 04E34 809540F4 AFA5002C */ sw $a1, 0x002C($sp) /* 04E38 809540F8 0C028800 */ jal SkelAnime_GetFrameCount - + /* 04E3C 809540FC 248466A8 */ addiu $a0, $a0, 0x66A8 ## $a0 = 060166A8 /* 04E40 80954100 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 04E44 80954104 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 04E48 80954108 8FA40028 */ lw $a0, 0x0028($sp) -/* 04E4C 8095410C 468021A0 */ cvt.s.w $f6, $f4 +/* 04E48 80954108 8FA40028 */ lw $a0, 0x0028($sp) +/* 04E4C 8095410C 468021A0 */ cvt.s.w $f6, $f4 /* 04E50 80954110 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 -/* 04E54 80954114 44070000 */ mfc1 $a3, $f0 +/* 04E54 80954114 44070000 */ mfc1 $a3, $f0 /* 04E58 80954118 24A566A8 */ addiu $a1, $a1, 0x66A8 ## $a1 = 060166A8 /* 04E5C 8095411C 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 04E60 80954120 AFA00014 */ sw $zero, 0x0014($sp) -/* 04E64 80954124 E7A60010 */ swc1 $f6, 0x0010($sp) +/* 04E60 80954120 AFA00014 */ sw $zero, 0x0014($sp) +/* 04E64 80954124 E7A60010 */ swc1 $f6, 0x0010($sp) /* 04E68 80954128 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 04E6C 8095412C 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 04E70 80954130 E7A00018 */ swc1 $f0, 0x0018($sp) -/* 04E74 80954134 8FA40028 */ lw $a0, 0x0028($sp) +/* 04E6C 8095412C 0C029468 */ jal SkelAnime_ChangeAnim + +/* 04E70 80954130 E7A00018 */ swc1 $f0, 0x0018($sp) +/* 04E74 80954134 8FA40028 */ lw $a0, 0x0028($sp) /* 04E78 80954138 3C058095 */ lui $a1, %hi(func_80954168) ## $a1 = 80950000 /* 04E7C 8095413C 24A54168 */ addiu $a1, $a1, %lo(func_80954168) ## $a1 = 80954168 /* 04E80 80954140 848E001C */ lh $t6, 0x001C($a0) ## 0000001C -/* 04E84 80954144 000E7880 */ sll $t7, $t6, 2 -/* 04E88 80954148 01EE7821 */ addu $t7, $t7, $t6 -/* 04E8C 8095414C 000F7840 */ sll $t7, $t7, 1 -/* 04E90 80954150 0C253CB0 */ jal func_8094F2C0 +/* 04E84 80954144 000E7880 */ sll $t7, $t6, 2 +/* 04E88 80954148 01EE7821 */ addu $t7, $t7, $t6 +/* 04E8C 8095414C 000F7840 */ sll $t7, $t7, 1 +/* 04E90 80954150 0C253CB0 */ jal func_8094F2C0 /* 04E94 80954154 AC8F0198 */ sw $t7, 0x0198($a0) ## 00000198 -/* 04E98 80954158 8FBF0024 */ lw $ra, 0x0024($sp) +/* 04E98 80954158 8FBF0024 */ lw $ra, 0x0024($sp) /* 04E9C 8095415C 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 04EA0 80954160 03E00008 */ jr $ra +/* 04EA0 80954160 03E00008 */ jr $ra /* 04EA4 80954164 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_80954168.s b/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_80954168.s index 698a1cc15e..32f7742879 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_80954168.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_80954168.s @@ -1,160 +1,160 @@ glabel func_80954168 /* 04EA8 80954168 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 -/* 04EAC 8095416C AFBF0034 */ sw $ra, 0x0034($sp) -/* 04EB0 80954170 AFB00030 */ sw $s0, 0x0030($sp) -/* 04EB4 80954174 AFA50044 */ sw $a1, 0x0044($sp) +/* 04EAC 8095416C AFBF0034 */ sw $ra, 0x0034($sp) +/* 04EB0 80954170 AFB00030 */ sw $s0, 0x0030($sp) +/* 04EB4 80954174 AFA50044 */ sw $a1, 0x0044($sp) /* 04EB8 80954178 8C8E0198 */ lw $t6, 0x0198($a0) ## 00000198 /* 04EBC 8095417C 3C188096 */ lui $t8, %hi(D_809668D0) ## $t8 = 80960000 /* 04EC0 80954180 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 04EC4 80954184 25CF0001 */ addiu $t7, $t6, 0x0001 ## $t7 = 00000001 /* 04EC8 80954188 AC8F0198 */ sw $t7, 0x0198($a0) ## 00000198 -/* 04ECC 8095418C 931868D0 */ lbu $t8, %lo(D_809668D0)($t8) +/* 04ECC 8095418C 931868D0 */ lbu $t8, %lo(D_809668D0)($t8) /* 04ED0 80954190 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 04ED4 80954194 240600FF */ addiu $a2, $zero, 0x00FF ## $a2 = 000000FF /* 04ED8 80954198 3319007F */ andi $t9, $t8, 0x007F ## $t9 = 00000000 -/* 04EDC 8095419C 1320002E */ beq $t9, $zero, .L80954258 +/* 04EDC 8095419C 1320002E */ beq $t9, $zero, .L80954258 /* 04EE0 809541A0 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 /* 04EE4 809541A4 2408000C */ addiu $t0, $zero, 0x000C ## $t0 = 0000000C -/* 04EE8 809541A8 0C00D09B */ jal func_8003426C -/* 04EEC 809541AC AFA80010 */ sw $t0, 0x0010($sp) +/* 04EE8 809541A8 0C00D09B */ jal func_8003426C +/* 04EEC 809541AC AFA80010 */ sw $t0, 0x0010($sp) /* 04EF0 809541B0 0C03F66B */ jal Math_Rand_ZeroOne ## Rand.Next() float /* 04EF4 809541B4 00000000 */ nop /* 04EF8 809541B8 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 /* 04EFC 809541BC 44812000 */ mtc1 $at, $f4 ## $f4 = 0.50 /* 04F00 809541C0 3C040601 */ lui $a0, 0x0601 ## $a0 = 06010000 -/* 04F04 809541C4 4600203C */ c.lt.s $f4, $f0 +/* 04F04 809541C4 4600203C */ c.lt.s $f4, $f0 /* 04F08 809541C8 00000000 */ nop -/* 04F0C 809541CC 45000013 */ bc1f .L8095421C +/* 04F0C 809541CC 45000013 */ bc1f .L8095421C /* 04F10 809541D0 00000000 */ nop /* 04F14 809541D4 3C040601 */ lui $a0, 0x0601 ## $a0 = 06010000 /* 04F18 809541D8 0C028800 */ jal SkelAnime_GetFrameCount - + /* 04F1C 809541DC 248462AC */ addiu $a0, $a0, 0x62AC ## $a0 = 060162AC /* 04F20 809541E0 44823000 */ mtc1 $v0, $f6 ## $f6 = 0.00 /* 04F24 809541E4 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 /* 04F28 809541E8 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 -/* 04F2C 809541EC 46803220 */ cvt.s.w $f8, $f6 +/* 04F2C 809541EC 46803220 */ cvt.s.w $f8, $f6 /* 04F30 809541F0 24090002 */ addiu $t1, $zero, 0x0002 ## $t1 = 00000002 -/* 04F34 809541F4 44070000 */ mfc1 $a3, $f0 -/* 04F38 809541F8 AFA90014 */ sw $t1, 0x0014($sp) +/* 04F34 809541F4 44070000 */ mfc1 $a3, $f0 +/* 04F38 809541F8 AFA90014 */ sw $t1, 0x0014($sp) /* 04F3C 809541FC 24A562AC */ addiu $a1, $a1, 0x62AC ## $a1 = 060162AC /* 04F40 80954200 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C -/* 04F44 80954204 E7A80010 */ swc1 $f8, 0x0010($sp) +/* 04F44 80954204 E7A80010 */ swc1 $f8, 0x0010($sp) /* 04F48 80954208 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 04F4C 8095420C 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 04F50 80954210 E7A00018 */ swc1 $f0, 0x0018($sp) -/* 04F54 80954214 10000011 */ beq $zero, $zero, .L8095425C +/* 04F4C 8095420C 0C029468 */ jal SkelAnime_ChangeAnim + +/* 04F50 80954210 E7A00018 */ swc1 $f0, 0x0018($sp) +/* 04F54 80954214 10000011 */ beq $zero, $zero, .L8095425C /* 04F58 80954218 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C .L8095421C: /* 04F5C 8095421C 0C028800 */ jal SkelAnime_GetFrameCount - + /* 04F60 80954220 248464B0 */ addiu $a0, $a0, 0x64B0 ## $a0 = 000065FC /* 04F64 80954224 44825000 */ mtc1 $v0, $f10 ## $f10 = 0.00 /* 04F68 80954228 44809000 */ mtc1 $zero, $f18 ## $f18 = 0.00 /* 04F6C 8095422C 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 -/* 04F70 80954230 46805420 */ cvt.s.w $f16, $f10 +/* 04F70 80954230 46805420 */ cvt.s.w $f16, $f10 /* 04F74 80954234 240A0002 */ addiu $t2, $zero, 0x0002 ## $t2 = 00000002 -/* 04F78 80954238 AFAA0014 */ sw $t2, 0x0014($sp) +/* 04F78 80954238 AFAA0014 */ sw $t2, 0x0014($sp) /* 04F7C 8095423C 24A564B0 */ addiu $a1, $a1, 0x64B0 ## $a1 = 060164B0 /* 04F80 80954240 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C /* 04F84 80954244 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 04F88 80954248 E7B00010 */ swc1 $f16, 0x0010($sp) +/* 04F88 80954248 E7B00010 */ swc1 $f16, 0x0010($sp) /* 04F8C 8095424C 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 04F90 80954250 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 04F94 80954254 E7B20018 */ swc1 $f18, 0x0018($sp) +/* 04F90 80954250 0C029468 */ jal SkelAnime_ChangeAnim + +/* 04F94 80954254 E7B20018 */ swc1 $f18, 0x0018($sp) .L80954258: /* 04F98 80954258 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C .L8095425C: /* 04F9C 8095425C 0C02927F */ jal SkelAnime_FrameUpdateMatrix - -/* 04FA0 80954260 AFA40038 */ sw $a0, 0x0038($sp) -/* 04FA4 80954264 1040000F */ beq $v0, $zero, .L809542A4 + +/* 04FA0 80954260 AFA40038 */ sw $a0, 0x0038($sp) +/* 04FA4 80954264 1040000F */ beq $v0, $zero, .L809542A4 /* 04FA8 80954268 3C040601 */ lui $a0, 0x0601 ## $a0 = 06010000 /* 04FAC 8095426C 0C028800 */ jal SkelAnime_GetFrameCount - + /* 04FB0 80954270 248466A8 */ addiu $a0, $a0, 0x66A8 ## $a0 = 060166A8 /* 04FB4 80954274 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 04FB8 80954278 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 /* 04FBC 8095427C 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 -/* 04FC0 80954280 468021A0 */ cvt.s.w $f6, $f4 -/* 04FC4 80954284 44070000 */ mfc1 $a3, $f0 +/* 04FC0 80954280 468021A0 */ cvt.s.w $f6, $f4 +/* 04FC4 80954284 44070000 */ mfc1 $a3, $f0 /* 04FC8 80954288 24A566A8 */ addiu $a1, $a1, 0x66A8 ## $a1 = 060166A8 -/* 04FCC 8095428C 8FA40038 */ lw $a0, 0x0038($sp) +/* 04FCC 8095428C 8FA40038 */ lw $a0, 0x0038($sp) /* 04FD0 80954290 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 04FD4 80954294 AFA00014 */ sw $zero, 0x0014($sp) -/* 04FD8 80954298 E7A60010 */ swc1 $f6, 0x0010($sp) -/* 04FDC 8095429C 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 04FE0 809542A0 E7A00018 */ swc1 $f0, 0x0018($sp) +/* 04FD4 80954294 AFA00014 */ sw $zero, 0x0014($sp) +/* 04FD8 80954298 E7A60010 */ swc1 $f6, 0x0010($sp) +/* 04FDC 8095429C 0C029468 */ jal SkelAnime_ChangeAnim + +/* 04FE0 809542A0 E7A00018 */ swc1 $f0, 0x0018($sp) .L809542A4: -/* 04FE4 809542A4 0C253CB2 */ jal func_8094F2C8 +/* 04FE4 809542A4 0C253CB2 */ jal func_8094F2C8 /* 04FE8 809542A8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 04FEC 809542AC 0C03F66B */ jal Math_Rand_ZeroOne ## Rand.Next() float /* 04FF0 809542B0 00000000 */ nop /* 04FF4 809542B4 3C018096 */ lui $at, %hi(D_8095C75C) ## $at = 80960000 -/* 04FF8 809542B8 C428C75C */ lwc1 $f8, %lo(D_8095C75C)($at) +/* 04FF8 809542B8 C428C75C */ lwc1 $f8, %lo(D_8095C75C)($at) /* 04FFC 809542BC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 05000 809542C0 4608003C */ c.lt.s $f0, $f8 +/* 05000 809542C0 4608003C */ c.lt.s $f0, $f8 /* 05004 809542C4 00000000 */ nop -/* 05008 809542C8 45020004 */ bc1fl .L809542DC +/* 05008 809542C8 45020004 */ bc1fl .L809542DC /* 0500C 809542CC 920B02E9 */ lbu $t3, 0x02E9($s0) ## 000002E9 /* 05010 809542D0 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 05014 809542D4 24053143 */ addiu $a1, $zero, 0x3143 ## $a1 = 00003143 /* 05018 809542D8 920B02E9 */ lbu $t3, 0x02E9($s0) ## 000002E9 .L809542DC: /* 0501C 809542DC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 05020 809542E0 316C0002 */ andi $t4, $t3, 0x0002 ## $t4 = 00000000 -/* 05024 809542E4 51800006 */ beql $t4, $zero, .L80954300 +/* 05024 809542E4 51800006 */ beql $t4, $zero, .L80954300 /* 05028 809542E8 920D0114 */ lbu $t5, 0x0114($s0) ## 00000114 -/* 0502C 809542EC 0C2550E3 */ jal func_8095438C -/* 05030 809542F0 8FA50044 */ lw $a1, 0x0044($sp) -/* 05034 809542F4 10000021 */ beq $zero, $zero, .L8095437C -/* 05038 809542F8 8FBF0034 */ lw $ra, 0x0034($sp) +/* 0502C 809542EC 0C2550E3 */ jal func_8095438C +/* 05030 809542F0 8FA50044 */ lw $a1, 0x0044($sp) +/* 05034 809542F4 10000021 */ beq $zero, $zero, .L8095437C +/* 05038 809542F8 8FBF0034 */ lw $ra, 0x0034($sp) /* 0503C 809542FC 920D0114 */ lbu $t5, 0x0114($s0) ## 00000114 .L80954300: /* 05040 80954300 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 05044 80954304 8FA40044 */ lw $a0, 0x0044($sp) -/* 05048 80954308 15A00004 */ bne $t5, $zero, .L8095431C +/* 05044 80954304 8FA40044 */ lw $a0, 0x0044($sp) +/* 05048 80954308 15A00004 */ bne $t5, $zero, .L8095431C /* 0504C 8095430C 34211E60 */ ori $at, $at, 0x1E60 ## $at = 00011E60 -/* 05050 80954310 00812821 */ addu $a1, $a0, $at +/* 05050 80954310 00812821 */ addu $a1, $a0, $at /* 05054 80954314 0C01767D */ jal Actor_CollisionCheck_SetAC ## CollisionCheck_setAC /* 05058 80954318 260602D8 */ addiu $a2, $s0, 0x02D8 ## $a2 = 000002D8 .L8095431C: /* 0505C 8095431C 8E020198 */ lw $v0, 0x0198($s0) ## 00000198 -/* 05060 80954320 8FA40044 */ lw $a0, 0x0044($sp) +/* 05060 80954320 8FA40044 */ lw $a0, 0x0044($sp) /* 05064 80954324 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 05068 80954328 304E0001 */ andi $t6, $v0, 0x0001 ## $t6 = 00000000 -/* 0506C 8095432C 15C00012 */ bne $t6, $zero, .L80954378 +/* 0506C 8095432C 15C00012 */ bne $t6, $zero, .L80954378 /* 05070 80954330 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 /* 05074 80954334 30580020 */ andi $t8, $v0, 0x0020 ## $t8 = 00000000 -/* 05078 80954338 0018C943 */ sra $t9, $t8, 5 +/* 05078 80954338 0018C943 */ sra $t9, $t8, 5 /* 0507C 8095433C 27280001 */ addiu $t0, $t9, 0x0001 ## $t0 = 00000001 /* 05080 80954340 44889000 */ mtc1 $t0, $f18 ## $f18 = 0.00 /* 05084 80954344 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 /* 05088 80954348 44815000 */ mtc1 $at, $f10 ## $f10 = 5.00 -/* 0508C 8095434C 46809120 */ cvt.s.w $f4, $f18 +/* 0508C 8095434C 46809120 */ cvt.s.w $f4, $f18 /* 05090 80954350 44808000 */ mtc1 $zero, $f16 ## $f16 = 0.00 /* 05094 80954354 240F0005 */ addiu $t7, $zero, 0x0005 ## $t7 = 00000005 /* 05098 80954358 24090001 */ addiu $t1, $zero, 0x0001 ## $t1 = 00000001 -/* 0509C 8095435C AFA90020 */ sw $t1, 0x0020($sp) -/* 050A0 80954360 AFAF0018 */ sw $t7, 0x0018($sp) -/* 050A4 80954364 E7A4001C */ swc1 $f4, 0x001C($sp) +/* 0509C 8095435C AFA90020 */ sw $t1, 0x0020($sp) +/* 050A0 80954360 AFAF0018 */ sw $t7, 0x0018($sp) +/* 050A4 80954364 E7A4001C */ swc1 $f4, 0x001C($sp) /* 050A8 80954368 24070064 */ addiu $a3, $zero, 0x0064 ## $a3 = 00000064 -/* 050AC 8095436C E7AA0010 */ swc1 $f10, 0x0010($sp) -/* 050B0 80954370 0C253E19 */ jal func_8094F864 -/* 050B4 80954374 E7B00014 */ swc1 $f16, 0x0014($sp) +/* 050AC 8095436C E7AA0010 */ swc1 $f10, 0x0010($sp) +/* 050B0 80954370 0C253E19 */ jal func_8094F864 +/* 050B4 80954374 E7B00014 */ swc1 $f16, 0x0014($sp) .L80954378: -/* 050B8 80954378 8FBF0034 */ lw $ra, 0x0034($sp) +/* 050B8 80954378 8FBF0034 */ lw $ra, 0x0034($sp) .L8095437C: -/* 050BC 8095437C 8FB00030 */ lw $s0, 0x0030($sp) +/* 050BC 8095437C 8FB00030 */ lw $s0, 0x0030($sp) /* 050C0 80954380 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 -/* 050C4 80954384 03E00008 */ jr $ra +/* 050C4 80954384 03E00008 */ jr $ra /* 050C8 80954388 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_80954454.s b/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_80954454.s index 9bec947ef8..4573986589 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_80954454.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_80954454.s @@ -1,84 +1,84 @@ glabel func_80954454 /* 05194 80954454 27BDFFB0 */ addiu $sp, $sp, 0xFFB0 ## $sp = FFFFFFB0 -/* 05198 80954458 AFBF0034 */ sw $ra, 0x0034($sp) -/* 0519C 8095445C AFB00030 */ sw $s0, 0x0030($sp) -/* 051A0 80954460 AFA50054 */ sw $a1, 0x0054($sp) +/* 05198 80954458 AFBF0034 */ sw $ra, 0x0034($sp) +/* 0519C 8095445C AFB00030 */ sw $s0, 0x0030($sp) +/* 051A0 80954460 AFA50054 */ sw $a1, 0x0054($sp) /* 051A4 80954464 8C8E0118 */ lw $t6, 0x0118($a0) ## 00000118 /* 051A8 80954468 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 051AC 8095446C 0C253CB2 */ jal func_8094F2C8 -/* 051B0 80954470 AFAE004C */ sw $t6, 0x004C($sp) +/* 051AC 8095446C 0C253CB2 */ jal func_8094F2C8 +/* 051B0 80954470 AFAE004C */ sw $t6, 0x004C($sp) /* 051B4 80954474 920F0194 */ lbu $t7, 0x0194($s0) ## 00000194 /* 051B8 80954478 3C040601 */ lui $a0, 0x0601 ## $a0 = 06010000 -/* 051BC 8095447C 51E00054 */ beql $t7, $zero, .L809545D0 -/* 051C0 80954480 8FAA004C */ lw $t2, 0x004C($sp) +/* 051BC 8095447C 51E00054 */ beql $t7, $zero, .L809545D0 +/* 051C0 80954480 8FAA004C */ lw $t2, 0x004C($sp) /* 051C4 80954484 0C028800 */ jal SkelAnime_GetFrameCount - + /* 051C8 80954488 24847694 */ addiu $a0, $a0, 0x7694 ## $a0 = 06017694 /* 051CC 8095448C 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 051D0 80954490 00000000 */ nop -/* 051D4 80954494 468021A0 */ cvt.s.w $f6, $f4 -/* 051D8 80954498 E7A60048 */ swc1 $f6, 0x0048($sp) +/* 051D4 80954494 468021A0 */ cvt.s.w $f6, $f4 +/* 051D8 80954498 E7A60048 */ swc1 $f6, 0x0048($sp) /* 051DC 8095449C 0C03F66B */ jal Math_Rand_ZeroOne ## Rand.Next() float /* 051E0 809544A0 A2000194 */ sb $zero, 0x0194($s0) ## 00000194 /* 051E4 809544A4 3C014120 */ lui $at, 0x4120 ## $at = 41200000 /* 051E8 809544A8 44814000 */ mtc1 $at, $f8 ## $f8 = 10.00 /* 051EC 809544AC 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C -/* 051F0 809544B0 46080282 */ mul.s $f10, $f0, $f8 -/* 051F4 809544B4 4600540D */ trunc.w.s $f16, $f10 -/* 051F8 809544B8 44198000 */ mfc1 $t9, $f16 +/* 051F0 809544B0 46080282 */ mul.s $f10, $f0, $f8 +/* 051F4 809544B4 4600540D */ trunc.w.s $f16, $f10 +/* 051F8 809544B8 44198000 */ mfc1 $t9, $f16 /* 051FC 809544BC 00000000 */ nop /* 05200 809544C0 27280005 */ addiu $t0, $t9, 0x0005 ## $t0 = 00000005 /* 05204 809544C4 AE080198 */ sw $t0, 0x0198($s0) ## 00000198 -/* 05208 809544C8 AFA4003C */ sw $a0, 0x003C($sp) -/* 0520C 809544CC 0C0295BC */ jal func_800A56F0 -/* 05210 809544D0 8FA50054 */ lw $a1, 0x0054($sp) +/* 05208 809544C8 AFA4003C */ sw $a0, 0x003C($sp) +/* 0520C 809544CC 0C0295BC */ jal SkelAnime_Free +/* 05210 809544D0 8FA50054 */ lw $a1, 0x0054($sp) /* 05214 809544D4 3C060601 */ lui $a2, 0x0601 ## $a2 = 06010000 /* 05218 809544D8 3C070601 */ lui $a3, 0x0601 ## $a3 = 06010000 /* 0521C 809544DC 24E77694 */ addiu $a3, $a3, 0x7694 ## $a3 = 06017694 /* 05220 809544E0 24C67FC8 */ addiu $a2, $a2, 0x7FC8 ## $a2 = 06017FC8 -/* 05224 809544E4 8FA40054 */ lw $a0, 0x0054($sp) -/* 05228 809544E8 8FA5003C */ lw $a1, 0x003C($sp) -/* 0522C 809544EC AFA00010 */ sw $zero, 0x0010($sp) -/* 05230 809544F0 AFA00014 */ sw $zero, 0x0014($sp) -/* 05234 809544F4 0C0291BE */ jal func_800A46F8 -/* 05238 809544F8 AFA00018 */ sw $zero, 0x0018($sp) +/* 05224 809544E4 8FA40054 */ lw $a0, 0x0054($sp) +/* 05228 809544E8 8FA5003C */ lw $a1, 0x003C($sp) +/* 0522C 809544EC AFA00010 */ sw $zero, 0x0010($sp) +/* 05230 809544F0 AFA00014 */ sw $zero, 0x0014($sp) +/* 05234 809544F4 0C0291BE */ jal SkelAnime_InitSV +/* 05238 809544F8 AFA00018 */ sw $zero, 0x0018($sp) /* 0523C 809544FC 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 05240 80954500 C7B20048 */ lwc1 $f18, 0x0048($sp) +/* 05240 80954500 C7B20048 */ lwc1 $f18, 0x0048($sp) /* 05244 80954504 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 /* 05248 80954508 24090002 */ addiu $t1, $zero, 0x0002 ## $t1 = 00000002 -/* 0524C 8095450C 44070000 */ mfc1 $a3, $f0 -/* 05250 80954510 AFA90014 */ sw $t1, 0x0014($sp) +/* 0524C 8095450C 44070000 */ mfc1 $a3, $f0 +/* 05250 80954510 AFA90014 */ sw $t1, 0x0014($sp) /* 05254 80954514 24A57694 */ addiu $a1, $a1, 0x7694 ## $a1 = 06017694 -/* 05258 80954518 8FA4003C */ lw $a0, 0x003C($sp) +/* 05258 80954518 8FA4003C */ lw $a0, 0x003C($sp) /* 0525C 8095451C 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 05260 80954520 E7B20010 */ swc1 $f18, 0x0010($sp) -/* 05264 80954524 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 05268 80954528 E7A00018 */ swc1 $f0, 0x0018($sp) +/* 05260 80954520 E7B20010 */ swc1 $f18, 0x0010($sp) +/* 05264 80954524 0C029468 */ jal SkelAnime_ChangeAnim + +/* 05268 80954528 E7A00018 */ swc1 $f0, 0x0018($sp) /* 0526C 8095452C 3C018096 */ lui $at, %hi(D_809668D0) ## $at = 80960000 -/* 05270 80954530 A02068D0 */ sb $zero, %lo(D_809668D0)($at) +/* 05270 80954530 A02068D0 */ sb $zero, %lo(D_809668D0)($at) /* 05274 80954534 8E020118 */ lw $v0, 0x0118($s0) ## 00000118 /* 05278 80954538 3C014270 */ lui $at, 0x4270 ## $at = 42700000 /* 0527C 8095453C 44813000 */ mtc1 $at, $f6 ## $f6 = 60.00 /* 05280 80954540 C44400BC */ lwc1 $f4, 0x00BC($v0) ## 000000BC /* 05284 80954544 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 05288 80954548 46062201 */ sub.s $f8, $f4, $f6 +/* 05288 80954548 46062201 */ sub.s $f8, $f4, $f6 /* 0528C 8095454C E44800BC */ swc1 $f8, 0x00BC($v0) ## 000000BC /* 05290 80954550 8603001C */ lh $v1, 0x001C($s0) ## 0000001C -/* 05294 80954554 50600008 */ beql $v1, $zero, .L80954578 +/* 05294 80954554 50600008 */ beql $v1, $zero, .L80954578 /* 05298 80954558 8E020118 */ lw $v0, 0x0118($s0) ## 00000118 -/* 0529C 8095455C 1061000A */ beq $v1, $at, .L80954588 +/* 0529C 8095455C 1061000A */ beq $v1, $at, .L80954588 /* 052A0 80954560 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 052A4 80954564 50610012 */ beql $v1, $at, .L809545B0 +/* 052A4 80954564 50610012 */ beql $v1, $at, .L809545B0 /* 052A8 80954568 8E020118 */ lw $v0, 0x0118($s0) ## 00000118 -/* 052AC 8095456C 10000018 */ beq $zero, $zero, .L809545D0 -/* 052B0 80954570 8FAA004C */ lw $t2, 0x004C($sp) +/* 052AC 8095456C 10000018 */ beq $zero, $zero, .L809545D0 +/* 052B0 80954570 8FAA004C */ lw $t2, 0x004C($sp) /* 052B4 80954574 8E020118 */ lw $v0, 0x0118($s0) ## 00000118 .L80954578: /* 052B8 80954578 844A0030 */ lh $t2, 0x0030($v0) ## 00000030 /* 052BC 8095457C 254B04B0 */ addiu $t3, $t2, 0x04B0 ## $t3 = 000004B0 -/* 052C0 80954580 10000012 */ beq $zero, $zero, .L809545CC +/* 052C0 80954580 10000012 */ beq $zero, $zero, .L809545CC /* 052C4 80954584 A44B0030 */ sh $t3, 0x0030($v0) ## 00000030 .L80954588: /* 052C8 80954588 8E020118 */ lw $v0, 0x0118($s0) ## 00000118 @@ -88,7 +88,7 @@ glabel func_80954454 /* 052D8 80954598 8E020118 */ lw $v0, 0x0118($s0) ## 00000118 /* 052DC 8095459C 844E0034 */ lh $t6, 0x0034($v0) ## 00000034 /* 052E0 809545A0 25CFFB1E */ addiu $t7, $t6, 0xFB1E ## $t7 = FFFFFB1E -/* 052E4 809545A4 10000009 */ beq $zero, $zero, .L809545CC +/* 052E4 809545A4 10000009 */ beq $zero, $zero, .L809545CC /* 052E8 809545A8 A44F0034 */ sh $t7, 0x0034($v0) ## 00000034 /* 052EC 809545AC 8E020118 */ lw $v0, 0x0118($s0) ## 00000118 .L809545B0: @@ -100,56 +100,56 @@ glabel func_80954454 /* 05304 809545C4 250904E2 */ addiu $t1, $t0, 0x04E2 ## $t1 = 000004E2 /* 05308 809545C8 A4490034 */ sh $t1, 0x0034($v0) ## 00000034 .L809545CC: -/* 0530C 809545CC 8FAA004C */ lw $t2, 0x004C($sp) +/* 0530C 809545CC 8FAA004C */ lw $t2, 0x004C($sp) .L809545D0: /* 05310 809545D0 260B014C */ addiu $t3, $s0, 0x014C ## $t3 = 0000014C /* 05314 809545D4 260401F6 */ addiu $a0, $s0, 0x01F6 ## $a0 = 000001F6 /* 05318 809545D8 854501F8 */ lh $a1, 0x01F8($t2) ## 000001F8 -/* 0531C 809545DC AFAB003C */ sw $t3, 0x003C($sp) -/* 05320 809545E0 AFA00010 */ sw $zero, 0x0010($sp) -/* 05324 809545E4 00050823 */ subu $at, $zero, $a1 -/* 05328 809545E8 00012880 */ sll $a1, $at, 2 -/* 0532C 809545EC 00A12823 */ subu $a1, $a1, $at -/* 05330 809545F0 00052C00 */ sll $a1, $a1, 16 -/* 05334 809545F4 00052C03 */ sra $a1, $a1, 16 +/* 0531C 809545DC AFAB003C */ sw $t3, 0x003C($sp) +/* 05320 809545E0 AFA00010 */ sw $zero, 0x0010($sp) +/* 05324 809545E4 00050823 */ subu $at, $zero, $a1 +/* 05328 809545E8 00012880 */ sll $a1, $at, 2 +/* 0532C 809545EC 00A12823 */ subu $a1, $a1, $at +/* 05330 809545F0 00052C00 */ sll $a1, $a1, 16 +/* 05334 809545F4 00052C03 */ sra $a1, $a1, 16 /* 05338 809545F8 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 /* 0533C 809545FC 0C01E1A7 */ jal Math_SmoothScaleMaxMinS - + /* 05340 80954600 240704B0 */ addiu $a3, $zero, 0x04B0 ## $a3 = 000004B0 /* 05344 80954604 0C02927F */ jal SkelAnime_FrameUpdateMatrix - -/* 05348 80954608 8FA4003C */ lw $a0, 0x003C($sp) -/* 0534C 8095460C 10400014 */ beq $v0, $zero, .L80954660 + +/* 05348 80954608 8FA4003C */ lw $a0, 0x003C($sp) +/* 0534C 8095460C 10400014 */ beq $v0, $zero, .L80954660 /* 05350 80954610 3C040601 */ lui $a0, 0x0601 ## $a0 = 06010000 /* 05354 80954614 0C028800 */ jal SkelAnime_GetFrameCount - + /* 05358 80954618 248477F4 */ addiu $a0, $a0, 0x77F4 ## $a0 = 060177F4 /* 0535C 8095461C 44825000 */ mtc1 $v0, $f10 ## $f10 = 0.00 /* 05360 80954620 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 /* 05364 80954624 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 -/* 05368 80954628 46805420 */ cvt.s.w $f16, $f10 +/* 05368 80954628 46805420 */ cvt.s.w $f16, $f10 /* 0536C 8095462C 240C0001 */ addiu $t4, $zero, 0x0001 ## $t4 = 00000001 -/* 05370 80954630 44070000 */ mfc1 $a3, $f0 -/* 05374 80954634 AFAC0014 */ sw $t4, 0x0014($sp) +/* 05370 80954630 44070000 */ mfc1 $a3, $f0 +/* 05374 80954634 AFAC0014 */ sw $t4, 0x0014($sp) /* 05378 80954638 24A577F4 */ addiu $a1, $a1, 0x77F4 ## $a1 = 060177F4 -/* 0537C 8095463C 8FA4003C */ lw $a0, 0x003C($sp) -/* 05380 80954640 E7B00010 */ swc1 $f16, 0x0010($sp) +/* 0537C 8095463C 8FA4003C */ lw $a0, 0x003C($sp) +/* 05380 80954640 E7B00010 */ swc1 $f16, 0x0010($sp) /* 05384 80954644 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 05388 80954648 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 0538C 8095464C E7A00018 */ swc1 $f0, 0x0018($sp) +/* 05388 80954648 0C029468 */ jal SkelAnime_ChangeAnim + +/* 0538C 8095464C E7A00018 */ swc1 $f0, 0x0018($sp) /* 05390 80954650 8E0D0004 */ lw $t5, 0x0004($s0) ## 00000004 /* 05394 80954654 2401FFFE */ addiu $at, $zero, 0xFFFE ## $at = FFFFFFFE -/* 05398 80954658 01A17024 */ and $t6, $t5, $at +/* 05398 80954658 01A17024 */ and $t6, $t5, $at /* 0539C 8095465C AE0E0004 */ sw $t6, 0x0004($s0) ## 00000004 .L80954660: /* 053A0 80954660 8E0F0198 */ lw $t7, 0x0198($s0) ## 00000198 /* 053A4 80954664 3C188096 */ lui $t8, %hi(D_809668D2) ## $t8 = 80960000 -/* 053A8 80954668 15E00014 */ bne $t7, $zero, .L809546BC +/* 053A8 80954668 15E00014 */ bne $t7, $zero, .L809546BC /* 053AC 8095466C 00000000 */ nop -/* 053B0 80954670 831868D2 */ lb $t8, %lo(D_809668D2)($t8) -/* 053B4 80954674 2B01000E */ slti $at, $t8, 0x000E -/* 053B8 80954678 10200010 */ beq $at, $zero, .L809546BC +/* 053B0 80954670 831868D2 */ lb $t8, %lo(D_809668D2)($t8) +/* 053B4 80954674 2B01000E */ slti $at, $t8, 0x000E +/* 053B8 80954678 10200010 */ beq $at, $zero, .L809546BC /* 053BC 8095467C 00000000 */ nop /* 053C0 80954680 0C03F66B */ jal Math_Rand_ZeroOne ## Rand.Next() float @@ -158,44 +158,44 @@ glabel func_80954454 /* 053CC 8095468C 44819000 */ mtc1 $at, $f18 ## $f18 = 10.00 /* 053D0 80954690 260501B4 */ addiu $a1, $s0, 0x01B4 ## $a1 = 000001B4 /* 053D4 80954694 860601F6 */ lh $a2, 0x01F6($s0) ## 000001F6 -/* 053D8 80954698 46120102 */ mul.s $f4, $f0, $f18 +/* 053D8 80954698 46120102 */ mul.s $f4, $f0, $f18 /* 053DC 8095469C 860700B6 */ lh $a3, 0x00B6($s0) ## 000000B6 -/* 053E0 809546A0 4600218D */ trunc.w.s $f6, $f4 -/* 053E4 809546A4 44083000 */ mfc1 $t0, $f6 +/* 053E0 809546A0 4600218D */ trunc.w.s $f6, $f4 +/* 053E4 809546A4 44083000 */ mfc1 $t0, $f6 /* 053E8 809546A8 00000000 */ nop /* 053EC 809546AC 2509000A */ addiu $t1, $t0, 0x000A ## $t1 = 0000000A /* 053F0 809546B0 AE090198 */ sw $t1, 0x0198($s0) ## 00000198 -/* 053F4 809546B4 0C253D43 */ jal func_8094F50C -/* 053F8 809546B8 8FA40054 */ lw $a0, 0x0054($sp) +/* 053F4 809546B4 0C253D43 */ jal func_8094F50C +/* 053F8 809546B8 8FA40054 */ lw $a0, 0x0054($sp) .L809546BC: /* 053FC 809546BC 3C028096 */ lui $v0, %hi(D_809668D2) ## $v0 = 80960000 -/* 05400 809546C0 804268D2 */ lb $v0, %lo(D_809668D2)($v0) +/* 05400 809546C0 804268D2 */ lb $v0, %lo(D_809668D2)($v0) /* 05404 809546C4 26040168 */ addiu $a0, $s0, 0x0168 ## $a0 = 00000168 /* 05408 809546C8 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 -/* 0540C 809546CC 2841000E */ slti $at, $v0, 0x000E -/* 05410 809546D0 14200009 */ bne $at, $zero, .L809546F8 +/* 0540C 809546CC 2841000E */ slti $at, $v0, 0x000E +/* 05410 809546D0 14200009 */ bne $at, $zero, .L809546F8 /* 05414 809546D4 3C063E99 */ lui $a2, 0x3E99 ## $a2 = 3E990000 /* 05418 809546D8 3C013E00 */ lui $at, 0x3E00 ## $at = 3E000000 /* 0541C 809546DC 44814000 */ mtc1 $at, $f8 ## $f8 = 0.12 /* 05420 809546E0 34C6999A */ ori $a2, $a2, 0x999A ## $a2 = 3E99999A /* 05424 809546E4 3C073E80 */ lui $a3, 0x3E80 ## $a3 = 3E800000 /* 05428 809546E8 0C01E0C4 */ jal Math_SmoothScaleMaxMinF - -/* 0542C 809546EC E7A80010 */ swc1 $f8, 0x0010($sp) + +/* 0542C 809546EC E7A80010 */ swc1 $f8, 0x0010($sp) /* 05430 809546F0 3C028096 */ lui $v0, %hi(D_809668D2) ## $v0 = 80960000 -/* 05434 809546F4 804268D2 */ lb $v0, %lo(D_809668D2)($v0) +/* 05434 809546F4 804268D2 */ lb $v0, %lo(D_809668D2)($v0) .L809546F8: /* 05438 809546F8 24010013 */ addiu $at, $zero, 0x0013 ## $at = 00000013 -/* 0543C 809546FC 1041000A */ beq $v0, $at, .L80954728 +/* 0543C 809546FC 1041000A */ beq $v0, $at, .L80954728 /* 05440 80954700 3C048096 */ lui $a0, %hi(D_809668D8) ## $a0 = 80960000 /* 05444 80954704 24010014 */ addiu $at, $zero, 0x0014 ## $at = 00000014 -/* 05448 80954708 10410035 */ beq $v0, $at, .L809547E0 +/* 05448 80954708 10410035 */ beq $v0, $at, .L809547E0 /* 0544C 8095470C 24010015 */ addiu $at, $zero, 0x0015 ## $at = 00000015 -/* 05450 80954710 10410033 */ beq $v0, $at, .L809547E0 +/* 05450 80954710 10410033 */ beq $v0, $at, .L809547E0 /* 05454 80954714 24010016 */ addiu $at, $zero, 0x0016 ## $at = 00000016 -/* 05458 80954718 50410032 */ beql $v0, $at, .L809547E4 +/* 05458 80954718 50410032 */ beql $v0, $at, .L809547E4 /* 0545C 8095471C 92080195 */ lbu $t0, 0x0195($s0) ## 00000195 -/* 05460 80954720 10000079 */ beq $zero, $zero, .L80954908 +/* 05460 80954720 10000079 */ beq $zero, $zero, .L80954908 /* 05464 80954724 8E020198 */ lw $v0, 0x0198($s0) ## 00000198 .L80954728: /* 05468 80954728 3C0A8096 */ lui $t2, %hi(D_809668F8) ## $t2 = 80960000 @@ -222,18 +222,18 @@ glabel func_80954454 /* 054BC 8095477C ADAF0008 */ sw $t7, 0x0008($t5) ## 809668F0 /* 054C0 80954780 8C450000 */ lw $a1, 0x0000($v0) ## 80966908 /* 054C4 80954784 0C01E0C4 */ jal Math_SmoothScaleMaxMinF - -/* 054C8 80954788 E7AA0010 */ swc1 $f10, 0x0010($sp) + +/* 054C8 80954788 E7AA0010 */ swc1 $f10, 0x0010($sp) /* 054CC 8095478C 44808000 */ mtc1 $zero, $f16 ## $f16 = 0.00 /* 054D0 80954790 3C048096 */ lui $a0, %hi(D_809668E0) ## $a0 = 80960000 /* 054D4 80954794 3C058096 */ lui $a1, %hi(D_80966910) ## $a1 = 80960000 -/* 054D8 80954798 8CA56910 */ lw $a1, %lo(D_80966910)($a1) +/* 054D8 80954798 8CA56910 */ lw $a1, %lo(D_80966910)($a1) /* 054DC 8095479C 248468E0 */ addiu $a0, $a0, %lo(D_809668E0) ## $a0 = 809668E0 /* 054E0 809547A0 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 054E4 809547A4 3C074120 */ lui $a3, 0x4120 ## $a3 = 41200000 /* 054E8 809547A8 0C01E0C4 */ jal Math_SmoothScaleMaxMinF - -/* 054EC 809547AC E7B00010 */ swc1 $f16, 0x0010($sp) + +/* 054EC 809547AC E7B00010 */ swc1 $f16, 0x0010($sp) /* 054F0 809547B0 3C028096 */ lui $v0, %hi(D_809668D8) ## $v0 = 80960000 /* 054F4 809547B4 244268D8 */ addiu $v0, $v0, %lo(D_809668D8) ## $v0 = 809668D8 /* 054F8 809547B8 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 @@ -241,53 +241,53 @@ glabel func_80954454 /* 05500 809547C0 C4520004 */ lwc1 $f18, 0x0004($v0) ## 809668DC /* 05504 809547C4 3C188096 */ lui $t8, %hi(D_809668D2) ## $t8 = 80960000 /* 05508 809547C8 3C018096 */ lui $at, %hi(D_809668D2) ## $at = 80960000 -/* 0550C 809547CC 46049180 */ add.s $f6, $f18, $f4 +/* 0550C 809547CC 46049180 */ add.s $f6, $f18, $f4 /* 05510 809547D0 E4460004 */ swc1 $f6, 0x0004($v0) ## 809668DC -/* 05514 809547D4 831868D2 */ lb $t8, %lo(D_809668D2)($t8) +/* 05514 809547D4 831868D2 */ lb $t8, %lo(D_809668D2)($t8) /* 05518 809547D8 27190001 */ addiu $t9, $t8, 0x0001 ## $t9 = 80960001 -/* 0551C 809547DC A03968D2 */ sb $t9, %lo(D_809668D2)($at) +/* 0551C 809547DC A03968D2 */ sb $t9, %lo(D_809668D2)($at) .L809547E0: /* 05520 809547E0 92080195 */ lbu $t0, 0x0195($s0) ## 00000195 .L809547E4: -/* 05524 809547E4 8FA90054 */ lw $t1, 0x0054($sp) +/* 05524 809547E4 8FA90054 */ lw $t1, 0x0054($sp) /* 05528 809547E8 3C0A0001 */ lui $t2, 0x0001 ## $t2 = 00010000 -/* 0552C 809547EC 1500003D */ bne $t0, $zero, .L809548E4 -/* 05530 809547F0 01495021 */ addu $t2, $t2, $t1 +/* 0552C 809547EC 1500003D */ bne $t0, $zero, .L809548E4 +/* 05530 809547F0 01495021 */ addu $t2, $t2, $t1 /* 05534 809547F4 8D4A1DE4 */ lw $t2, 0x1DE4($t2) ## 00011DE4 /* 05538 809547F8 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 /* 0553C 809547FC 314B0001 */ andi $t3, $t2, 0x0001 ## $t3 = 00000000 -/* 05540 80954800 51600020 */ beql $t3, $zero, .L80954884 +/* 05540 80954800 51600020 */ beql $t3, $zero, .L80954884 /* 05544 80954804 8608019C */ lh $t0, 0x019C($s0) ## 0000019C /* 05548 80954808 44816000 */ mtc1 $at, $f12 ## $f12 = 5.00 /* 0554C 8095480C 0C00CFC8 */ jal Math_Rand_CenteredFloat - + /* 05550 80954810 00000000 */ nop /* 05554 80954814 3C0140E0 */ lui $at, 0x40E0 ## $at = 40E00000 /* 05558 80954818 44815000 */ mtc1 $at, $f10 ## $f10 = 7.00 /* 0555C 8095481C 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 /* 05560 80954820 44818000 */ mtc1 $at, $f16 ## $f16 = 5.00 /* 05564 80954824 240D0002 */ addiu $t5, $zero, 0x0002 ## $t5 = 00000002 -/* 05568 80954828 AFAD0018 */ sw $t5, 0x0018($sp) -/* 0556C 8095482C E7AA0010 */ swc1 $f10, 0x0010($sp) -/* 05570 80954830 E7B00014 */ swc1 $f16, 0x0014($sp) +/* 05568 80954828 AFAD0018 */ sw $t5, 0x0018($sp) +/* 0556C 8095482C E7AA0010 */ swc1 $f10, 0x0010($sp) +/* 05570 80954830 E7B00014 */ swc1 $f16, 0x0014($sp) /* 05574 80954834 860E019C */ lh $t6, 0x019C($s0) ## 0000019C -/* 05578 80954838 4600020D */ trunc.w.s $f8, $f0 +/* 05578 80954838 4600020D */ trunc.w.s $f8, $f0 /* 0557C 8095483C 24190001 */ addiu $t9, $zero, 0x0001 ## $t9 = 00000001 -/* 05580 80954840 000E78C3 */ sra $t7, $t6, 3 +/* 05580 80954840 000E78C3 */ sra $t7, $t6, 3 /* 05584 80954844 25F80001 */ addiu $t8, $t7, 0x0001 ## $t8 = 00000001 /* 05588 80954848 44989000 */ mtc1 $t8, $f18 ## $f18 = 0.00 -/* 0558C 8095484C 44074000 */ mfc1 $a3, $f8 -/* 05590 80954850 AFB90020 */ sw $t9, 0x0020($sp) -/* 05594 80954854 46809120 */ cvt.s.w $f4, $f18 -/* 05598 80954858 00073C00 */ sll $a3, $a3, 16 -/* 0559C 8095485C 00073C03 */ sra $a3, $a3, 16 +/* 0558C 8095484C 44074000 */ mfc1 $a3, $f8 +/* 05590 80954850 AFB90020 */ sw $t9, 0x0020($sp) +/* 05594 80954854 46809120 */ cvt.s.w $f4, $f18 +/* 05598 80954858 00073C00 */ sll $a3, $a3, 16 +/* 0559C 8095485C 00073C03 */ sra $a3, $a3, 16 /* 055A0 80954860 24E70006 */ addiu $a3, $a3, 0x0006 ## $a3 = 00000006 -/* 055A4 80954864 00073C00 */ sll $a3, $a3, 16 -/* 055A8 80954868 00073C03 */ sra $a3, $a3, 16 -/* 055AC 8095486C E7A4001C */ swc1 $f4, 0x001C($sp) -/* 055B0 80954870 8FA40054 */ lw $a0, 0x0054($sp) +/* 055A4 80954864 00073C00 */ sll $a3, $a3, 16 +/* 055A8 80954868 00073C03 */ sra $a3, $a3, 16 +/* 055AC 8095486C E7A4001C */ swc1 $f4, 0x001C($sp) +/* 055B0 80954870 8FA40054 */ lw $a0, 0x0054($sp) /* 055B4 80954874 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 055B8 80954878 0C253E7A */ jal func_8094F9E8 +/* 055B8 80954878 0C253E7A */ jal func_8094F9E8 /* 055BC 8095487C 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 /* 055C0 80954880 8608019C */ lh $t0, 0x019C($s0) ## 0000019C .L80954884: @@ -296,45 +296,45 @@ glabel func_80954454 /* 055CC 8095488C 25090001 */ addiu $t1, $t0, 0x0001 ## $t1 = 00000001 /* 055D0 80954890 A609019C */ sh $t1, 0x019C($s0) ## 0000019C /* 055D4 80954894 860A019C */ lh $t2, 0x019C($s0) ## 0000019C -/* 055D8 80954898 29410020 */ slti $at, $t2, 0x0020 -/* 055DC 8095489C 5420001A */ bnel $at, $zero, .L80954908 +/* 055D8 80954898 29410020 */ slti $at, $t2, 0x0020 +/* 055DC 8095489C 5420001A */ bnel $at, $zero, .L80954908 /* 055E0 809548A0 8E020198 */ lw $v0, 0x0198($s0) ## 00000198 /* 055E4 809548A4 920B0195 */ lbu $t3, 0x0195($s0) ## 00000195 /* 055E8 809548A8 A20D0197 */ sb $t5, 0x0197($s0) ## 00000197 /* 055EC 809548AC 24053945 */ addiu $a1, $zero, 0x3945 ## $a1 = 00003945 /* 055F0 809548B0 256C0001 */ addiu $t4, $t3, 0x0001 ## $t4 = 00000001 /* 055F4 809548B4 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 055F8 809548B8 A20C0195 */ sb $t4, 0x0195($s0) ## 00000195 /* 055FC 809548BC 860E001C */ lh $t6, 0x001C($s0) ## 0000001C /* 05600 809548C0 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 /* 05604 809548C4 3C0F8096 */ lui $t7, %hi(D_809668D2) ## $t7 = 80960000 -/* 05608 809548C8 55C1000F */ bnel $t6, $at, .L80954908 +/* 05608 809548C8 55C1000F */ bnel $t6, $at, .L80954908 /* 0560C 809548CC 8E020198 */ lw $v0, 0x0198($s0) ## 00000198 -/* 05610 809548D0 81EF68D2 */ lb $t7, %lo(D_809668D2)($t7) +/* 05610 809548D0 81EF68D2 */ lb $t7, %lo(D_809668D2)($t7) /* 05614 809548D4 3C018096 */ lui $at, %hi(D_809668D2) ## $at = 80960000 /* 05618 809548D8 25F80001 */ addiu $t8, $t7, 0x0001 ## $t8 = 80960001 -/* 0561C 809548DC 10000009 */ beq $zero, $zero, .L80954904 -/* 05620 809548E0 A03868D2 */ sb $t8, %lo(D_809668D2)($at) +/* 0561C 809548DC 10000009 */ beq $zero, $zero, .L80954904 +/* 05620 809548E0 A03868D2 */ sb $t8, %lo(D_809668D2)($at) .L809548E4: /* 05624 809548E4 8619019C */ lh $t9, 0x019C($s0) ## 0000019C /* 05628 809548E8 2728FFFF */ addiu $t0, $t9, 0xFFFF ## $t0 = FFFFFFFF /* 0562C 809548EC A608019C */ sh $t0, 0x019C($s0) ## 0000019C /* 05630 809548F0 8609019C */ lh $t1, 0x019C($s0) ## 0000019C -/* 05634 809548F4 55200004 */ bnel $t1, $zero, .L80954908 +/* 05634 809548F4 55200004 */ bnel $t1, $zero, .L80954908 /* 05638 809548F8 8E020198 */ lw $v0, 0x0198($s0) ## 00000198 /* 0563C 809548FC 0C00B55C */ jal Actor_Kill - + /* 05640 80954900 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 .L80954904: /* 05644 80954904 8E020198 */ lw $v0, 0x0198($s0) ## 00000198 .L80954908: /* 05648 80954908 244AFFFF */ addiu $t2, $v0, 0xFFFF ## $t2 = FFFFFFFF /* 0564C 8095490C AE0A0198 */ sw $t2, 0x0198($s0) ## 00000198 -/* 05650 80954910 8FBF0034 */ lw $ra, 0x0034($sp) -/* 05654 80954914 8FB00030 */ lw $s0, 0x0030($sp) +/* 05650 80954910 8FBF0034 */ lw $ra, 0x0034($sp) +/* 05654 80954914 8FB00030 */ lw $s0, 0x0030($sp) /* 05658 80954918 27BD0050 */ addiu $sp, $sp, 0x0050 ## $sp = 00000000 -/* 0565C 8095491C 03E00008 */ jr $ra +/* 0565C 8095491C 03E00008 */ jr $ra /* 05660 80954920 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_80954924.s b/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_80954924.s index bb80acfb8d..2b5dd87864 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_80954924.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_80954924.s @@ -1,38 +1,38 @@ glabel func_80954924 /* 05664 80954924 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 05668 80954928 AFA40028 */ sw $a0, 0x0028($sp) -/* 0566C 8095492C AFBF0024 */ sw $ra, 0x0024($sp) +/* 05668 80954928 AFA40028 */ sw $a0, 0x0028($sp) +/* 0566C 8095492C AFBF0024 */ sw $ra, 0x0024($sp) /* 05670 80954930 3C040602 */ lui $a0, 0x0602 ## $a0 = 06020000 -/* 05674 80954934 AFA5002C */ sw $a1, 0x002C($sp) +/* 05674 80954934 AFA5002C */ sw $a1, 0x002C($sp) /* 05678 80954938 0C028800 */ jal SkelAnime_GetFrameCount - + /* 0567C 8095493C 24848150 */ addiu $a0, $a0, 0x8150 ## $a0 = 06018150 /* 05680 80954940 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 05684 80954944 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 05688 80954948 8FA40028 */ lw $a0, 0x0028($sp) -/* 0568C 8095494C 468021A0 */ cvt.s.w $f6, $f4 +/* 05688 80954948 8FA40028 */ lw $a0, 0x0028($sp) +/* 0568C 8095494C 468021A0 */ cvt.s.w $f6, $f4 /* 05690 80954950 3C050602 */ lui $a1, 0x0602 ## $a1 = 06020000 /* 05694 80954954 240E0002 */ addiu $t6, $zero, 0x0002 ## $t6 = 00000002 -/* 05698 80954958 44070000 */ mfc1 $a3, $f0 -/* 0569C 8095495C AFAE0014 */ sw $t6, 0x0014($sp) +/* 05698 80954958 44070000 */ mfc1 $a3, $f0 +/* 0569C 8095495C AFAE0014 */ sw $t6, 0x0014($sp) /* 056A0 80954960 24A58150 */ addiu $a1, $a1, 0x8150 ## $a1 = 06018150 -/* 056A4 80954964 E7A60010 */ swc1 $f6, 0x0010($sp) +/* 056A4 80954964 E7A60010 */ swc1 $f6, 0x0010($sp) /* 056A8 80954968 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 056AC 8095496C 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 056B0 80954970 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 056B4 80954974 E7A00018 */ swc1 $f0, 0x0018($sp) -/* 056B8 80954978 8FA40028 */ lw $a0, 0x0028($sp) +/* 056B0 80954970 0C029468 */ jal SkelAnime_ChangeAnim + +/* 056B4 80954974 E7A00018 */ swc1 $f0, 0x0018($sp) +/* 056B8 80954978 8FA40028 */ lw $a0, 0x0028($sp) /* 056BC 8095497C 2401FFFE */ addiu $at, $zero, 0xFFFE ## $at = FFFFFFFE /* 056C0 80954980 3C058095 */ lui $a1, %hi(func_809549A8) ## $a1 = 80950000 /* 056C4 80954984 8C8F0004 */ lw $t7, 0x0004($a0) ## 00000004 /* 056C8 80954988 24A549A8 */ addiu $a1, $a1, %lo(func_809549A8) ## $a1 = 809549A8 -/* 056CC 8095498C 01E1C024 */ and $t8, $t7, $at -/* 056D0 80954990 0C253CB0 */ jal func_8094F2C0 +/* 056CC 8095498C 01E1C024 */ and $t8, $t7, $at +/* 056D0 80954990 0C253CB0 */ jal func_8094F2C0 /* 056D4 80954994 AC980004 */ sw $t8, 0x0004($a0) ## 00000004 -/* 056D8 80954998 8FBF0024 */ lw $ra, 0x0024($sp) +/* 056D8 80954998 8FBF0024 */ lw $ra, 0x0024($sp) /* 056DC 8095499C 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 056E0 809549A0 03E00008 */ jr $ra +/* 056E0 809549A0 03E00008 */ jr $ra /* 056E4 809549A4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_80954A3C.s b/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_80954A3C.s index 17729872b7..41533cc1d9 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_80954A3C.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_80954A3C.s @@ -1,42 +1,42 @@ glabel func_80954A3C /* 0577C 80954A3C 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 05780 80954A40 AFA40028 */ sw $a0, 0x0028($sp) -/* 05784 80954A44 AFBF0024 */ sw $ra, 0x0024($sp) +/* 05780 80954A40 AFA40028 */ sw $a0, 0x0028($sp) +/* 05784 80954A44 AFBF0024 */ sw $ra, 0x0024($sp) /* 05788 80954A48 3C040602 */ lui $a0, 0x0602 ## $a0 = 06020000 -/* 0578C 80954A4C AFA5002C */ sw $a1, 0x002C($sp) +/* 0578C 80954A4C AFA5002C */ sw $a1, 0x002C($sp) /* 05790 80954A50 0C028800 */ jal SkelAnime_GetFrameCount - + /* 05794 80954A54 24848D18 */ addiu $a0, $a0, 0x8D18 ## $a0 = 06018D18 /* 05798 80954A58 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 0579C 80954A5C 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 /* 057A0 80954A60 44811000 */ mtc1 $at, $f2 ## $f2 = 1.00 -/* 057A4 80954A64 46802020 */ cvt.s.w $f0, $f4 +/* 057A4 80954A64 46802020 */ cvt.s.w $f0, $f4 /* 057A8 80954A68 3C01C0C0 */ lui $at, 0xC0C0 ## $at = C0C00000 /* 057AC 80954A6C 44814000 */ mtc1 $at, $f8 ## $f8 = -6.00 -/* 057B0 80954A70 8FA40028 */ lw $a0, 0x0028($sp) +/* 057B0 80954A70 8FA40028 */ lw $a0, 0x0028($sp) /* 057B4 80954A74 3C050602 */ lui $a1, 0x0602 ## $a1 = 06020000 /* 057B8 80954A78 240E0001 */ addiu $t6, $zero, 0x0001 ## $t6 = 00000001 -/* 057BC 80954A7C 46020181 */ sub.s $f6, $f0, $f2 -/* 057C0 80954A80 44061000 */ mfc1 $a2, $f2 -/* 057C4 80954A84 AFAE0014 */ sw $t6, 0x0014($sp) +/* 057BC 80954A7C 46020181 */ sub.s $f6, $f0, $f2 +/* 057C0 80954A80 44061000 */ mfc1 $a2, $f2 +/* 057C4 80954A84 AFAE0014 */ sw $t6, 0x0014($sp) /* 057C8 80954A88 24A58D18 */ addiu $a1, $a1, 0x8D18 ## $a1 = 06018D18 -/* 057CC 80954A8C 44073000 */ mfc1 $a3, $f6 -/* 057D0 80954A90 E7A00010 */ swc1 $f0, 0x0010($sp) +/* 057CC 80954A8C 44073000 */ mfc1 $a3, $f6 +/* 057D0 80954A90 E7A00010 */ swc1 $f0, 0x0010($sp) /* 057D4 80954A94 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 057D8 80954A98 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 057DC 80954A9C E7A80018 */ swc1 $f8, 0x0018($sp) -/* 057E0 80954AA0 8FA40028 */ lw $a0, 0x0028($sp) +/* 057D8 80954A98 0C029468 */ jal SkelAnime_ChangeAnim + +/* 057DC 80954A9C E7A80018 */ swc1 $f8, 0x0018($sp) +/* 057E0 80954AA0 8FA40028 */ lw $a0, 0x0028($sp) /* 057E4 80954AA4 2401FFFE */ addiu $at, $zero, 0xFFFE ## $at = FFFFFFFE /* 057E8 80954AA8 3C058095 */ lui $a1, %hi(func_80954AD0) ## $a1 = 80950000 /* 057EC 80954AAC 8C8F0004 */ lw $t7, 0x0004($a0) ## 00000004 /* 057F0 80954AB0 24A54AD0 */ addiu $a1, $a1, %lo(func_80954AD0) ## $a1 = 80954AD0 -/* 057F4 80954AB4 01E1C024 */ and $t8, $t7, $at -/* 057F8 80954AB8 0C253CB0 */ jal func_8094F2C0 +/* 057F4 80954AB4 01E1C024 */ and $t8, $t7, $at +/* 057F8 80954AB8 0C253CB0 */ jal func_8094F2C0 /* 057FC 80954ABC AC980004 */ sw $t8, 0x0004($a0) ## 00000004 -/* 05800 80954AC0 8FBF0024 */ lw $ra, 0x0024($sp) +/* 05800 80954AC0 8FBF0024 */ lw $ra, 0x0024($sp) /* 05804 80954AC4 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 05808 80954AC8 03E00008 */ jr $ra +/* 05808 80954AC8 03E00008 */ jr $ra /* 0580C 80954ACC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_80954B8C.s b/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_80954B8C.s index 6531591f62..2f24ceb219 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_80954B8C.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_80954B8C.s @@ -1,42 +1,42 @@ glabel func_80954B8C /* 058CC 80954B8C 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 058D0 80954B90 AFA40028 */ sw $a0, 0x0028($sp) -/* 058D4 80954B94 AFBF0024 */ sw $ra, 0x0024($sp) +/* 058D0 80954B90 AFA40028 */ sw $a0, 0x0028($sp) +/* 058D4 80954B94 AFBF0024 */ sw $ra, 0x0024($sp) /* 058D8 80954B98 3C040602 */ lui $a0, 0x0602 ## $a0 = 06020000 -/* 058DC 80954B9C AFA5002C */ sw $a1, 0x002C($sp) +/* 058DC 80954B9C AFA5002C */ sw $a1, 0x002C($sp) /* 058E0 80954BA0 0C028800 */ jal SkelAnime_GetFrameCount - + /* 058E4 80954BA4 24848D18 */ addiu $a0, $a0, 0x8D18 ## $a0 = 06018D18 /* 058E8 80954BA8 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 058EC 80954BAC 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 /* 058F0 80954BB0 44811000 */ mtc1 $at, $f2 ## $f2 = 1.00 -/* 058F4 80954BB4 46802020 */ cvt.s.w $f0, $f4 +/* 058F4 80954BB4 46802020 */ cvt.s.w $f0, $f4 /* 058F8 80954BB8 3C01C0C0 */ lui $at, 0xC0C0 ## $at = C0C00000 /* 058FC 80954BBC 44814000 */ mtc1 $at, $f8 ## $f8 = -6.00 -/* 05900 80954BC0 8FA40028 */ lw $a0, 0x0028($sp) +/* 05900 80954BC0 8FA40028 */ lw $a0, 0x0028($sp) /* 05904 80954BC4 3C050602 */ lui $a1, 0x0602 ## $a1 = 06020000 /* 05908 80954BC8 240E0001 */ addiu $t6, $zero, 0x0001 ## $t6 = 00000001 -/* 0590C 80954BCC 46020181 */ sub.s $f6, $f0, $f2 -/* 05910 80954BD0 44061000 */ mfc1 $a2, $f2 -/* 05914 80954BD4 AFAE0014 */ sw $t6, 0x0014($sp) +/* 0590C 80954BCC 46020181 */ sub.s $f6, $f0, $f2 +/* 05910 80954BD0 44061000 */ mfc1 $a2, $f2 +/* 05914 80954BD4 AFAE0014 */ sw $t6, 0x0014($sp) /* 05918 80954BD8 24A58D18 */ addiu $a1, $a1, 0x8D18 ## $a1 = 06018D18 -/* 0591C 80954BDC 44073000 */ mfc1 $a3, $f6 -/* 05920 80954BE0 E7A00010 */ swc1 $f0, 0x0010($sp) +/* 0591C 80954BDC 44073000 */ mfc1 $a3, $f6 +/* 05920 80954BE0 E7A00010 */ swc1 $f0, 0x0010($sp) /* 05924 80954BE4 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 05928 80954BE8 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 0592C 80954BEC E7A80018 */ swc1 $f8, 0x0018($sp) -/* 05930 80954BF0 8FA40028 */ lw $a0, 0x0028($sp) +/* 05928 80954BE8 0C029468 */ jal SkelAnime_ChangeAnim + +/* 0592C 80954BEC E7A80018 */ swc1 $f8, 0x0018($sp) +/* 05930 80954BF0 8FA40028 */ lw $a0, 0x0028($sp) /* 05934 80954BF4 2401FFFE */ addiu $at, $zero, 0xFFFE ## $at = FFFFFFFE /* 05938 80954BF8 3C058095 */ lui $a1, %hi(func_80954C20) ## $a1 = 80950000 /* 0593C 80954BFC 8C8F0004 */ lw $t7, 0x0004($a0) ## 00000004 /* 05940 80954C00 24A54C20 */ addiu $a1, $a1, %lo(func_80954C20) ## $a1 = 80954C20 -/* 05944 80954C04 01E1C024 */ and $t8, $t7, $at -/* 05948 80954C08 0C253CB0 */ jal func_8094F2C0 +/* 05944 80954C04 01E1C024 */ and $t8, $t7, $at +/* 05948 80954C08 0C253CB0 */ jal func_8094F2C0 /* 0594C 80954C0C AC980004 */ sw $t8, 0x0004($a0) ## 00000004 -/* 05950 80954C10 8FBF0024 */ lw $ra, 0x0024($sp) +/* 05950 80954C10 8FBF0024 */ lw $ra, 0x0024($sp) /* 05954 80954C14 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 05958 80954C18 03E00008 */ jr $ra +/* 05958 80954C18 03E00008 */ jr $ra /* 0595C 80954C1C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_80955658.s b/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_80955658.s index 38ad947d3d..68db0ed08c 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_80955658.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_80955658.s @@ -1,75 +1,75 @@ glabel func_80955658 /* 06398 80955658 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 0639C 8095565C AFBF002C */ sw $ra, 0x002C($sp) -/* 063A0 80955660 AFB00028 */ sw $s0, 0x0028($sp) +/* 0639C 8095565C AFBF002C */ sw $ra, 0x002C($sp) +/* 063A0 80955660 AFB00028 */ sw $s0, 0x0028($sp) /* 063A4 80955664 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 063A8 80955668 0C03F66B */ jal Math_Rand_ZeroOne ## Rand.Next() float -/* 063AC 8095566C AFA50034 */ sw $a1, 0x0034($sp) +/* 063AC 8095566C AFA50034 */ sw $a1, 0x0034($sp) /* 063B0 80955670 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 /* 063B4 80955674 44812000 */ mtc1 $at, $f4 ## $f4 = 0.50 /* 063B8 80955678 3C040602 */ lui $a0, 0x0602 ## $a0 = 06020000 -/* 063BC 8095567C 4600203C */ c.lt.s $f4, $f0 +/* 063BC 8095567C 4600203C */ c.lt.s $f4, $f0 /* 063C0 80955680 00000000 */ nop -/* 063C4 80955684 45000014 */ bc1f .L809556D8 +/* 063C4 80955684 45000014 */ bc1f .L809556D8 /* 063C8 80955688 00000000 */ nop /* 063CC 8095568C 3C040602 */ lui $a0, 0x0602 ## $a0 = 06020000 /* 063D0 80955690 0C028800 */ jal SkelAnime_GetFrameCount - + /* 063D4 80955694 24848A68 */ addiu $a0, $a0, 0x8A68 ## $a0 = 06018A68 /* 063D8 80955698 44823000 */ mtc1 $v0, $f6 ## $f6 = 0.00 /* 063DC 8095569C 3C014080 */ lui $at, 0x4080 ## $at = 40800000 /* 063E0 809556A0 44815000 */ mtc1 $at, $f10 ## $f10 = 4.00 -/* 063E4 809556A4 46803220 */ cvt.s.w $f8, $f6 +/* 063E4 809556A4 46803220 */ cvt.s.w $f8, $f6 /* 063E8 809556A8 3C050602 */ lui $a1, 0x0602 ## $a1 = 06020000 /* 063EC 809556AC 240E0003 */ addiu $t6, $zero, 0x0003 ## $t6 = 00000003 -/* 063F0 809556B0 AFAE0014 */ sw $t6, 0x0014($sp) +/* 063F0 809556B0 AFAE0014 */ sw $t6, 0x0014($sp) /* 063F4 809556B4 24A58A68 */ addiu $a1, $a1, 0x8A68 ## $a1 = 06018A68 /* 063F8 809556B8 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C -/* 063FC 809556BC E7A80010 */ swc1 $f8, 0x0010($sp) +/* 063FC 809556BC E7A80010 */ swc1 $f8, 0x0010($sp) /* 06400 809556C0 3C063F00 */ lui $a2, 0x3F00 ## $a2 = 3F000000 /* 06404 809556C4 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 06408 809556C8 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 0640C 809556CC E7AA0018 */ swc1 $f10, 0x0018($sp) -/* 06410 809556D0 10000012 */ beq $zero, $zero, .L8095571C +/* 06408 809556C8 0C029468 */ jal SkelAnime_ChangeAnim + +/* 0640C 809556CC E7AA0018 */ swc1 $f10, 0x0018($sp) +/* 06410 809556D0 10000012 */ beq $zero, $zero, .L8095571C /* 06414 809556D4 2418000C */ addiu $t8, $zero, 0x000C ## $t8 = 0000000C .L809556D8: /* 06418 809556D8 0C028800 */ jal SkelAnime_GetFrameCount - + /* 0641C 809556DC 24848B90 */ addiu $a0, $a0, 0x8B90 ## $a0 = FFFF8B90 /* 06420 809556E0 44828000 */ mtc1 $v0, $f16 ## $f16 = 0.00 /* 06424 809556E4 3C014080 */ lui $at, 0x4080 ## $at = 40800000 /* 06428 809556E8 44812000 */ mtc1 $at, $f4 ## $f4 = 4.00 -/* 0642C 809556EC 468084A0 */ cvt.s.w $f18, $f16 +/* 0642C 809556EC 468084A0 */ cvt.s.w $f18, $f16 /* 06430 809556F0 3C050602 */ lui $a1, 0x0602 ## $a1 = 06020000 /* 06434 809556F4 240F0003 */ addiu $t7, $zero, 0x0003 ## $t7 = 00000003 -/* 06438 809556F8 AFAF0014 */ sw $t7, 0x0014($sp) +/* 06438 809556F8 AFAF0014 */ sw $t7, 0x0014($sp) /* 0643C 809556FC 24A58B90 */ addiu $a1, $a1, 0x8B90 ## $a1 = 06018B90 /* 06440 80955700 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C -/* 06444 80955704 E7B20010 */ swc1 $f18, 0x0010($sp) +/* 06444 80955704 E7B20010 */ swc1 $f18, 0x0010($sp) /* 06448 80955708 3C063F00 */ lui $a2, 0x3F00 ## $a2 = 3F000000 /* 0644C 8095570C 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 06450 80955710 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 06454 80955714 E7A40018 */ swc1 $f4, 0x0018($sp) +/* 06450 80955710 0C029468 */ jal SkelAnime_ChangeAnim + +/* 06454 80955714 E7A40018 */ swc1 $f4, 0x0018($sp) /* 06458 80955718 2418000C */ addiu $t8, $zero, 0x000C ## $t8 = 0000000C .L8095571C: -/* 0645C 8095571C AFB80010 */ sw $t8, 0x0010($sp) +/* 0645C 8095571C AFB80010 */ sw $t8, 0x0010($sp) /* 06460 80955720 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 06464 80955724 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 06468 80955728 240600FF */ addiu $a2, $zero, 0x00FF ## $a2 = 000000FF -/* 0646C 8095572C 0C00D09B */ jal func_8003426C +/* 0646C 8095572C 0C00D09B */ jal func_8003426C /* 06470 80955730 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 /* 06474 80955734 3C058095 */ lui $a1, %hi(func_8095575C) ## $a1 = 80950000 /* 06478 80955738 A2000195 */ sb $zero, 0x0195($s0) ## 00000195 /* 0647C 8095573C 24A5575C */ addiu $a1, $a1, %lo(func_8095575C) ## $a1 = 8095575C -/* 06480 80955740 0C253CB0 */ jal func_8094F2C0 +/* 06480 80955740 0C253CB0 */ jal func_8094F2C0 /* 06484 80955744 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 06488 80955748 8FBF002C */ lw $ra, 0x002C($sp) -/* 0648C 8095574C 8FB00028 */ lw $s0, 0x0028($sp) +/* 06488 80955748 8FBF002C */ lw $ra, 0x002C($sp) +/* 0648C 8095574C 8FB00028 */ lw $s0, 0x0028($sp) /* 06490 80955750 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 06494 80955754 03E00008 */ jr $ra +/* 06494 80955754 03E00008 */ jr $ra /* 06498 80955758 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_8095586C.s b/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_8095586C.s index bc34c3d86c..1fd5a2d4d8 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_8095586C.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_8095586C.s @@ -1,60 +1,60 @@ glabel func_8095586C /* 065AC 8095586C 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 -/* 065B0 80955870 AFB00028 */ sw $s0, 0x0028($sp) +/* 065B0 80955870 AFB00028 */ sw $s0, 0x0028($sp) /* 065B4 80955874 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 065B8 80955878 AFBF002C */ sw $ra, 0x002C($sp) +/* 065B8 80955878 AFBF002C */ sw $ra, 0x002C($sp) /* 065BC 8095587C 3C040602 */ lui $a0, 0x0602 ## $a0 = 06020000 -/* 065C0 80955880 AFA50044 */ sw $a1, 0x0044($sp) +/* 065C0 80955880 AFA50044 */ sw $a1, 0x0044($sp) /* 065C4 80955884 0C028800 */ jal SkelAnime_GetFrameCount - + /* 065C8 80955888 24848D18 */ addiu $a0, $a0, 0x8D18 ## $a0 = 06018D18 /* 065CC 8095588C 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 065D0 80955890 00000000 */ nop -/* 065D4 80955894 468021A0 */ cvt.s.w $f6, $f4 +/* 065D4 80955894 468021A0 */ cvt.s.w $f6, $f4 /* 065D8 80955898 0C03F66B */ jal Math_Rand_ZeroOne ## Rand.Next() float -/* 065DC 8095589C E7A6003C */ swc1 $f6, 0x003C($sp) +/* 065DC 8095589C E7A6003C */ swc1 $f6, 0x003C($sp) /* 065E0 809558A0 0C03F66B */ jal Math_Rand_ZeroOne ## Rand.Next() float -/* 065E4 809558A4 E7A00034 */ swc1 $f0, 0x0034($sp) +/* 065E4 809558A4 E7A00034 */ swc1 $f0, 0x0034($sp) /* 065E8 809558A8 3C013E80 */ lui $at, 0x3E80 ## $at = 3E800000 /* 065EC 809558AC 44815000 */ mtc1 $at, $f10 ## $f10 = 0.25 /* 065F0 809558B0 3C014040 */ lui $at, 0x4040 ## $at = 40400000 /* 065F4 809558B4 44819000 */ mtc1 $at, $f18 ## $f18 = 3.00 -/* 065F8 809558B8 C7A80034 */ lwc1 $f8, 0x0034($sp) +/* 065F8 809558B8 C7A80034 */ lwc1 $f8, 0x0034($sp) /* 065FC 809558BC 3C01C0C0 */ lui $at, 0xC0C0 ## $at = C0C00000 -/* 06600 809558C0 46120102 */ mul.s $f4, $f0, $f18 -/* 06604 809558C4 460A4400 */ add.s $f16, $f8, $f10 +/* 06600 809558C0 46120102 */ mul.s $f4, $f0, $f18 +/* 06604 809558C4 460A4400 */ add.s $f16, $f8, $f10 /* 06608 809558C8 44814000 */ mtc1 $at, $f8 ## $f8 = -6.00 -/* 0660C 809558CC C7A6003C */ lwc1 $f6, 0x003C($sp) +/* 0660C 809558CC C7A6003C */ lwc1 $f6, 0x003C($sp) /* 06610 809558D0 3C050602 */ lui $a1, 0x0602 ## $a1 = 06020000 -/* 06614 809558D4 44068000 */ mfc1 $a2, $f16 +/* 06614 809558D4 44068000 */ mfc1 $a2, $f16 /* 06618 809558D8 240E0001 */ addiu $t6, $zero, 0x0001 ## $t6 = 00000001 -/* 0661C 809558DC 44072000 */ mfc1 $a3, $f4 -/* 06620 809558E0 AFAE0014 */ sw $t6, 0x0014($sp) +/* 0661C 809558DC 44072000 */ mfc1 $a3, $f4 +/* 06620 809558E0 AFAE0014 */ sw $t6, 0x0014($sp) /* 06624 809558E4 24A58D18 */ addiu $a1, $a1, 0x8D18 ## $a1 = 06018D18 /* 06628 809558E8 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C -/* 0662C 809558EC E7A60010 */ swc1 $f6, 0x0010($sp) -/* 06630 809558F0 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 06634 809558F4 E7A80018 */ swc1 $f8, 0x0018($sp) +/* 0662C 809558EC E7A60010 */ swc1 $f6, 0x0010($sp) +/* 06630 809558F0 0C029468 */ jal SkelAnime_ChangeAnim + +/* 06634 809558F4 E7A80018 */ swc1 $f8, 0x0018($sp) /* 06638 809558F8 860F001C */ lh $t7, 0x001C($s0) ## 0000001C /* 0663C 809558FC 3C058095 */ lui $a1, %hi(func_80955940) ## $a1 = 80950000 /* 06640 80955900 A2000195 */ sb $zero, 0x0195($s0) ## 00000195 -/* 06644 80955904 000F0823 */ subu $at, $zero, $t7 -/* 06648 80955908 0001C080 */ sll $t8, $at, 2 -/* 0664C 8095590C 0301C023 */ subu $t8, $t8, $at -/* 06650 80955910 0018C040 */ sll $t8, $t8, 1 +/* 06644 80955904 000F0823 */ subu $at, $zero, $t7 +/* 06648 80955908 0001C080 */ sll $t8, $at, 2 +/* 0664C 8095590C 0301C023 */ subu $t8, $t8, $at +/* 06650 80955910 0018C040 */ sll $t8, $t8, 1 /* 06654 80955914 27190012 */ addiu $t9, $t8, 0x0012 ## $t9 = 00000012 /* 06658 80955918 A619019C */ sh $t9, 0x019C($s0) ## 0000019C /* 0665C 8095591C A60001B0 */ sh $zero, 0x01B0($s0) ## 000001B0 /* 06660 80955920 24A55940 */ addiu $a1, $a1, %lo(func_80955940) ## $a1 = 80955940 -/* 06664 80955924 0C253CB0 */ jal func_8094F2C0 +/* 06664 80955924 0C253CB0 */ jal func_8094F2C0 /* 06668 80955928 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0666C 8095592C 8FBF002C */ lw $ra, 0x002C($sp) -/* 06670 80955930 8FB00028 */ lw $s0, 0x0028($sp) +/* 0666C 8095592C 8FBF002C */ lw $ra, 0x002C($sp) +/* 06670 80955930 8FB00028 */ lw $s0, 0x0028($sp) /* 06674 80955934 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 -/* 06678 80955938 03E00008 */ jr $ra +/* 06678 80955938 03E00008 */ jr $ra /* 0667C 8095593C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_80955E64.s b/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_80955E64.s index 205703f2b3..027d30e157 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_80955E64.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_80955E64.s @@ -1,39 +1,39 @@ glabel func_80955E64 /* 06BA4 80955E64 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 06BA8 80955E68 AFA40028 */ sw $a0, 0x0028($sp) -/* 06BAC 80955E6C AFBF0024 */ sw $ra, 0x0024($sp) +/* 06BA8 80955E68 AFA40028 */ sw $a0, 0x0028($sp) +/* 06BAC 80955E6C AFBF0024 */ sw $ra, 0x0024($sp) /* 06BB0 80955E70 3C040602 */ lui $a0, 0x0602 ## $a0 = 06020000 -/* 06BB4 80955E74 AFA5002C */ sw $a1, 0x002C($sp) +/* 06BB4 80955E74 AFA5002C */ sw $a1, 0x002C($sp) /* 06BB8 80955E78 0C028800 */ jal SkelAnime_GetFrameCount - + /* 06BBC 80955E7C 24848D18 */ addiu $a0, $a0, 0x8D18 ## $a0 = 06018D18 /* 06BC0 80955E80 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 06BC4 80955E84 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 /* 06BC8 80955E88 44811000 */ mtc1 $at, $f2 ## $f2 = 1.00 -/* 06BCC 80955E8C 46802020 */ cvt.s.w $f0, $f4 +/* 06BCC 80955E8C 46802020 */ cvt.s.w $f0, $f4 /* 06BD0 80955E90 3C01C0C0 */ lui $at, 0xC0C0 ## $at = C0C00000 /* 06BD4 80955E94 44814000 */ mtc1 $at, $f8 ## $f8 = -6.00 -/* 06BD8 80955E98 8FA40028 */ lw $a0, 0x0028($sp) +/* 06BD8 80955E98 8FA40028 */ lw $a0, 0x0028($sp) /* 06BDC 80955E9C 3C050602 */ lui $a1, 0x0602 ## $a1 = 06020000 /* 06BE0 80955EA0 240E0001 */ addiu $t6, $zero, 0x0001 ## $t6 = 00000001 -/* 06BE4 80955EA4 46020181 */ sub.s $f6, $f0, $f2 -/* 06BE8 80955EA8 44061000 */ mfc1 $a2, $f2 -/* 06BEC 80955EAC AFAE0014 */ sw $t6, 0x0014($sp) +/* 06BE4 80955EA4 46020181 */ sub.s $f6, $f0, $f2 +/* 06BE8 80955EA8 44061000 */ mfc1 $a2, $f2 +/* 06BEC 80955EAC AFAE0014 */ sw $t6, 0x0014($sp) /* 06BF0 80955EB0 24A58D18 */ addiu $a1, $a1, 0x8D18 ## $a1 = 06018D18 -/* 06BF4 80955EB4 44073000 */ mfc1 $a3, $f6 -/* 06BF8 80955EB8 E7A00010 */ swc1 $f0, 0x0010($sp) +/* 06BF4 80955EB4 44073000 */ mfc1 $a3, $f6 +/* 06BF8 80955EB8 E7A00010 */ swc1 $f0, 0x0010($sp) /* 06BFC 80955EBC 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 06C00 80955EC0 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 06C04 80955EC4 E7A80018 */ swc1 $f8, 0x0018($sp) -/* 06C08 80955EC8 8FA40028 */ lw $a0, 0x0028($sp) +/* 06C00 80955EC0 0C029468 */ jal SkelAnime_ChangeAnim + +/* 06C04 80955EC4 E7A80018 */ swc1 $f8, 0x0018($sp) +/* 06C08 80955EC8 8FA40028 */ lw $a0, 0x0028($sp) /* 06C0C 80955ECC 3C058095 */ lui $a1, %hi(func_80955EEC) ## $a1 = 80950000 /* 06C10 80955ED0 24A55EEC */ addiu $a1, $a1, %lo(func_80955EEC) ## $a1 = 80955EEC -/* 06C14 80955ED4 0C253CB0 */ jal func_8094F2C0 +/* 06C14 80955ED4 0C253CB0 */ jal func_8094F2C0 /* 06C18 80955ED8 A0800195 */ sb $zero, 0x0195($a0) ## 00000195 -/* 06C1C 80955EDC 8FBF0024 */ lw $ra, 0x0024($sp) +/* 06C1C 80955EDC 8FBF0024 */ lw $ra, 0x0024($sp) /* 06C20 80955EE0 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 06C24 80955EE4 03E00008 */ jr $ra +/* 06C24 80955EE4 03E00008 */ jr $ra /* 06C28 80955EE8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_80956644.s b/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_80956644.s index 6cc180490c..7328d1875c 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_80956644.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_80956644.s @@ -1,37 +1,37 @@ glabel func_80956644 /* 07384 80956644 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 07388 80956648 AFA40028 */ sw $a0, 0x0028($sp) -/* 0738C 8095664C AFBF0024 */ sw $ra, 0x0024($sp) +/* 07388 80956648 AFA40028 */ sw $a0, 0x0028($sp) +/* 0738C 8095664C AFBF0024 */ sw $ra, 0x0024($sp) /* 07390 80956650 3C040602 */ lui $a0, 0x0602 ## $a0 = 06020000 -/* 07394 80956654 AFA5002C */ sw $a1, 0x002C($sp) +/* 07394 80956654 AFA5002C */ sw $a1, 0x002C($sp) /* 07398 80956658 0C028800 */ jal SkelAnime_GetFrameCount - + /* 0739C 8095665C 24848B90 */ addiu $a0, $a0, 0x8B90 ## $a0 = 06018B90 /* 073A0 80956660 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 073A4 80956664 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 /* 073A8 80956668 3C01C0C0 */ lui $at, 0xC0C0 ## $at = C0C00000 -/* 073AC 8095666C 468021A0 */ cvt.s.w $f6, $f4 +/* 073AC 8095666C 468021A0 */ cvt.s.w $f6, $f4 /* 073B0 80956670 44814000 */ mtc1 $at, $f8 ## $f8 = -6.00 -/* 073B4 80956674 8FA40028 */ lw $a0, 0x0028($sp) +/* 073B4 80956674 8FA40028 */ lw $a0, 0x0028($sp) /* 073B8 80956678 3C050602 */ lui $a1, 0x0602 ## $a1 = 06020000 /* 073BC 8095667C 240E0003 */ addiu $t6, $zero, 0x0003 ## $t6 = 00000003 -/* 073C0 80956680 44060000 */ mfc1 $a2, $f0 -/* 073C4 80956684 44070000 */ mfc1 $a3, $f0 -/* 073C8 80956688 AFAE0014 */ sw $t6, 0x0014($sp) +/* 073C0 80956680 44060000 */ mfc1 $a2, $f0 +/* 073C4 80956684 44070000 */ mfc1 $a3, $f0 +/* 073C8 80956688 AFAE0014 */ sw $t6, 0x0014($sp) /* 073CC 8095668C 24A58B90 */ addiu $a1, $a1, 0x8B90 ## $a1 = 06018B90 -/* 073D0 80956690 E7A60010 */ swc1 $f6, 0x0010($sp) +/* 073D0 80956690 E7A60010 */ swc1 $f6, 0x0010($sp) /* 073D4 80956694 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 073D8 80956698 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 073DC 8095669C E7A80018 */ swc1 $f8, 0x0018($sp) -/* 073E0 809566A0 8FA40028 */ lw $a0, 0x0028($sp) +/* 073D8 80956698 0C029468 */ jal SkelAnime_ChangeAnim + +/* 073DC 8095669C E7A80018 */ swc1 $f8, 0x0018($sp) +/* 073E0 809566A0 8FA40028 */ lw $a0, 0x0028($sp) /* 073E4 809566A4 3C058095 */ lui $a1, %hi(func_809566C4) ## $a1 = 80950000 /* 073E8 809566A8 24A566C4 */ addiu $a1, $a1, %lo(func_809566C4) ## $a1 = 809566C4 -/* 073EC 809566AC 0C253CB0 */ jal func_8094F2C0 +/* 073EC 809566AC 0C253CB0 */ jal func_8094F2C0 /* 073F0 809566B0 A0800195 */ sb $zero, 0x0195($a0) ## 00000195 -/* 073F4 809566B4 8FBF0024 */ lw $ra, 0x0024($sp) +/* 073F4 809566B4 8FBF0024 */ lw $ra, 0x0024($sp) /* 073F8 809566B8 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 073FC 809566BC 03E00008 */ jr $ra +/* 073FC 809566BC 03E00008 */ jr $ra /* 07400 809566C0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_809567D0.s b/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_809567D0.s index 7d22074ad1..60b916c980 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_809567D0.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_809567D0.s @@ -1,26 +1,26 @@ glabel func_809567D0 /* 07510 809567D0 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 07514 809567D4 AFB00028 */ sw $s0, 0x0028($sp) +/* 07514 809567D4 AFB00028 */ sw $s0, 0x0028($sp) /* 07518 809567D8 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 0751C 809567DC AFBF002C */ sw $ra, 0x002C($sp) +/* 0751C 809567DC AFBF002C */ sw $ra, 0x002C($sp) /* 07520 809567E0 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 -/* 07524 809567E4 AFA50034 */ sw $a1, 0x0034($sp) +/* 07524 809567E4 AFA50034 */ sw $a1, 0x0034($sp) /* 07528 809567E8 0C028800 */ jal SkelAnime_GetFrameCount - + /* 0752C 809567EC 24840024 */ addiu $a0, $a0, 0x0024 ## $a0 = 06000024 /* 07530 809567F0 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 07534 809567F4 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 /* 07538 809567F8 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 0753C 809567FC 468021A0 */ cvt.s.w $f6, $f4 -/* 07540 80956800 44070000 */ mfc1 $a3, $f0 +/* 0753C 809567FC 468021A0 */ cvt.s.w $f6, $f4 +/* 07540 80956800 44070000 */ mfc1 $a3, $f0 /* 07544 80956804 24A50024 */ addiu $a1, $a1, 0x0024 ## $a1 = 06000024 /* 07548 80956808 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C /* 0754C 8095680C 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 07550 80956810 AFA00014 */ sw $zero, 0x0014($sp) -/* 07554 80956814 E7A60010 */ swc1 $f6, 0x0010($sp) -/* 07558 80956818 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 0755C 8095681C E7A00018 */ swc1 $f0, 0x0018($sp) +/* 07550 80956810 AFA00014 */ sw $zero, 0x0014($sp) +/* 07554 80956814 E7A60010 */ swc1 $f6, 0x0010($sp) +/* 07558 80956818 0C029468 */ jal SkelAnime_ChangeAnim + +/* 0755C 8095681C E7A00018 */ swc1 $f0, 0x0018($sp) /* 07560 80956820 3C014270 */ lui $at, 0x4270 ## $at = 42700000 /* 07564 80956824 44814000 */ mtc1 $at, $f8 ## $f8 = 60.00 /* 07568 80956828 0C03F66B */ jal Math_Rand_ZeroOne @@ -30,45 +30,45 @@ glabel func_809567D0 /* 07574 80956834 44815000 */ mtc1 $at, $f10 ## $f10 = 360.00 /* 07578 80956838 8618001C */ lh $t8, 0x001C($s0) ## 0000001C /* 0757C 8095683C 44809000 */ mtc1 $zero, $f18 ## $f18 = 0.00 -/* 07580 80956840 460A0402 */ mul.s $f16, $f0, $f10 -/* 07584 80956844 0018C880 */ sll $t9, $t8, 2 +/* 07580 80956840 460A0402 */ mul.s $f16, $f0, $f10 +/* 07584 80956844 0018C880 */ sll $t9, $t8, 2 /* 07588 80956848 3C088096 */ lui $t0, %hi(D_8095C044) ## $t0 = 80960000 -/* 0758C 8095684C 0338C823 */ subu $t9, $t9, $t8 +/* 0758C 8095684C 0338C823 */ subu $t9, $t9, $t8 /* 07590 80956850 240E0040 */ addiu $t6, $zero, 0x0040 ## $t6 = 00000040 /* 07594 80956854 240F0078 */ addiu $t7, $zero, 0x0078 ## $t7 = 00000078 -/* 07598 80956858 0019C880 */ sll $t9, $t9, 2 +/* 07598 80956858 0019C880 */ sll $t9, $t9, 2 /* 0759C 8095685C 2508C044 */ addiu $t0, $t0, %lo(D_8095C044) ## $t0 = 8095C044 /* 075A0 80956860 E61001A4 */ swc1 $f16, 0x01A4($s0) ## 000001A4 /* 075A4 80956864 A60E019C */ sh $t6, 0x019C($s0) ## 0000019C /* 075A8 80956868 A60F01F0 */ sh $t7, 0x01F0($s0) ## 000001F0 -/* 075AC 8095686C 03281021 */ addu $v0, $t9, $t0 +/* 075AC 8095686C 03281021 */ addu $v0, $t9, $t0 /* 075B0 80956870 E61201A8 */ swc1 $f18, 0x01A8($s0) ## 000001A8 /* 075B4 80956874 C4440078 */ lwc1 $f4, 0x0078($v0) ## 00000078 /* 075B8 80956878 C6060008 */ lwc1 $f6, 0x0008($s0) ## 00000008 /* 075BC 8095687C C610000C */ lwc1 $f16, 0x000C($s0) ## 0000000C /* 075C0 80956880 8E0A0004 */ lw $t2, 0x0004($s0) ## 00000004 -/* 075C4 80956884 46062200 */ add.s $f8, $f4, $f6 +/* 075C4 80956884 46062200 */ add.s $f8, $f4, $f6 /* 075C8 80956888 C6060010 */ lwc1 $f6, 0x0010($s0) ## 00000010 /* 075CC 8095688C 2401FFFE */ addiu $at, $zero, 0xFFFE ## $at = FFFFFFFE /* 075D0 80956890 2409002D */ addiu $t1, $zero, 0x002D ## $t1 = 0000002D /* 075D4 80956894 E6080024 */ swc1 $f8, 0x0024($s0) ## 00000024 /* 075D8 80956898 C44A007C */ lwc1 $f10, 0x007C($v0) ## 0000007C /* 075DC 8095689C 3C058095 */ lui $a1, %hi(func_809568E0) ## $a1 = 80950000 -/* 075E0 809568A0 01415824 */ and $t3, $t2, $at -/* 075E4 809568A4 46105480 */ add.s $f18, $f10, $f16 +/* 075E0 809568A0 01415824 */ and $t3, $t2, $at +/* 075E4 809568A4 46105480 */ add.s $f18, $f10, $f16 /* 075E8 809568A8 24A568E0 */ addiu $a1, $a1, %lo(func_809568E0) ## $a1 = 809568E0 /* 075EC 809568AC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 075F0 809568B0 E6120028 */ swc1 $f18, 0x0028($s0) ## 00000028 /* 075F4 809568B4 C4440080 */ lwc1 $f4, 0x0080($v0) ## 00000080 /* 075F8 809568B8 AE090198 */ sw $t1, 0x0198($s0) ## 00000198 /* 075FC 809568BC AE0B0004 */ sw $t3, 0x0004($s0) ## 00000004 -/* 07600 809568C0 46062200 */ add.s $f8, $f4, $f6 -/* 07604 809568C4 0C253CB0 */ jal func_8094F2C0 +/* 07600 809568C0 46062200 */ add.s $f8, $f4, $f6 +/* 07604 809568C4 0C253CB0 */ jal func_8094F2C0 /* 07608 809568C8 E608002C */ swc1 $f8, 0x002C($s0) ## 0000002C -/* 0760C 809568CC 8FBF002C */ lw $ra, 0x002C($sp) -/* 07610 809568D0 8FB00028 */ lw $s0, 0x0028($sp) +/* 0760C 809568CC 8FBF002C */ lw $ra, 0x002C($sp) +/* 07610 809568D0 8FB00028 */ lw $s0, 0x0028($sp) /* 07614 809568D4 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 07618 809568D8 03E00008 */ jr $ra +/* 07618 809568D8 03E00008 */ jr $ra /* 0761C 809568DC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_80956E38.s b/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_80956E38.s index 2dbbab84ff..bb50151766 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_80956E38.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_80956E38.s @@ -1,26 +1,26 @@ glabel func_80956E38 /* 07B78 80956E38 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 07B7C 80956E3C AFB00028 */ sw $s0, 0x0028($sp) +/* 07B7C 80956E3C AFB00028 */ sw $s0, 0x0028($sp) /* 07B80 80956E40 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 07B84 80956E44 AFBF002C */ sw $ra, 0x002C($sp) +/* 07B84 80956E44 AFBF002C */ sw $ra, 0x002C($sp) /* 07B88 80956E48 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 -/* 07B8C 80956E4C AFA50034 */ sw $a1, 0x0034($sp) +/* 07B8C 80956E4C AFA50034 */ sw $a1, 0x0034($sp) /* 07B90 80956E50 0C028800 */ jal SkelAnime_GetFrameCount - + /* 07B94 80956E54 24840024 */ addiu $a0, $a0, 0x0024 ## $a0 = 06000024 /* 07B98 80956E58 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 07B9C 80956E5C 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 /* 07BA0 80956E60 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 07BA4 80956E64 468021A0 */ cvt.s.w $f6, $f4 -/* 07BA8 80956E68 44070000 */ mfc1 $a3, $f0 +/* 07BA4 80956E64 468021A0 */ cvt.s.w $f6, $f4 +/* 07BA8 80956E68 44070000 */ mfc1 $a3, $f0 /* 07BAC 80956E6C 24A50024 */ addiu $a1, $a1, 0x0024 ## $a1 = 06000024 /* 07BB0 80956E70 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C /* 07BB4 80956E74 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 07BB8 80956E78 AFA00014 */ sw $zero, 0x0014($sp) -/* 07BBC 80956E7C E7A60010 */ swc1 $f6, 0x0010($sp) -/* 07BC0 80956E80 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 07BC4 80956E84 E7A00018 */ swc1 $f0, 0x0018($sp) +/* 07BB8 80956E78 AFA00014 */ sw $zero, 0x0014($sp) +/* 07BBC 80956E7C E7A60010 */ swc1 $f6, 0x0010($sp) +/* 07BC0 80956E80 0C029468 */ jal SkelAnime_ChangeAnim + +/* 07BC4 80956E84 E7A00018 */ swc1 $f0, 0x0018($sp) /* 07BC8 80956E88 8E180004 */ lw $t8, 0x0004($s0) ## 00000004 /* 07BCC 80956E8C 3C014270 */ lui $at, 0x4270 ## $at = 42700000 /* 07BD0 80956E90 44814000 */ mtc1 $at, $f8 ## $f8 = 60.00 @@ -29,19 +29,19 @@ glabel func_80956E38 /* 07BDC 80956E9C 240E0080 */ addiu $t6, $zero, 0x0080 ## $t6 = 00000080 /* 07BE0 80956EA0 240F0078 */ addiu $t7, $zero, 0x0078 ## $t7 = 00000078 /* 07BE4 80956EA4 3C058095 */ lui $a1, %hi(func_80956EE0) ## $a1 = 80950000 -/* 07BE8 80956EA8 0301C824 */ and $t9, $t8, $at +/* 07BE8 80956EA8 0301C824 */ and $t9, $t8, $at /* 07BEC 80956EAC A60E019C */ sh $t6, 0x019C($s0) ## 0000019C /* 07BF0 80956EB0 A60F01F0 */ sh $t7, 0x01F0($s0) ## 000001F0 /* 07BF4 80956EB4 AE190004 */ sw $t9, 0x0004($s0) ## 00000004 /* 07BF8 80956EB8 24A56EE0 */ addiu $a1, $a1, %lo(func_80956EE0) ## $a1 = 80956EE0 /* 07BFC 80956EBC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 07C00 80956EC0 E60801A0 */ swc1 $f8, 0x01A0($s0) ## 000001A0 -/* 07C04 80956EC4 0C253CB0 */ jal func_8094F2C0 +/* 07C04 80956EC4 0C253CB0 */ jal func_8094F2C0 /* 07C08 80956EC8 E60A01A8 */ swc1 $f10, 0x01A8($s0) ## 000001A8 -/* 07C0C 80956ECC 8FBF002C */ lw $ra, 0x002C($sp) -/* 07C10 80956ED0 8FB00028 */ lw $s0, 0x0028($sp) +/* 07C0C 80956ECC 8FBF002C */ lw $ra, 0x002C($sp) +/* 07C10 80956ED0 8FB00028 */ lw $s0, 0x0028($sp) /* 07C14 80956ED4 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 07C18 80956ED8 03E00008 */ jr $ra +/* 07C18 80956ED8 03E00008 */ jr $ra /* 07C1C 80956EDC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_809572DC.s b/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_809572DC.s index 1abff1eabb..0f014d0868 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_809572DC.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_809572DC.s @@ -1,26 +1,26 @@ glabel func_809572DC /* 0801C 809572DC 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 08020 809572E0 AFB00028 */ sw $s0, 0x0028($sp) +/* 08020 809572E0 AFB00028 */ sw $s0, 0x0028($sp) /* 08024 809572E4 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 08028 809572E8 AFBF002C */ sw $ra, 0x002C($sp) +/* 08028 809572E8 AFBF002C */ sw $ra, 0x002C($sp) /* 0802C 809572EC 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 -/* 08030 809572F0 AFA50034 */ sw $a1, 0x0034($sp) +/* 08030 809572F0 AFA50034 */ sw $a1, 0x0034($sp) /* 08034 809572F4 0C028800 */ jal SkelAnime_GetFrameCount - + /* 08038 809572F8 24840024 */ addiu $a0, $a0, 0x0024 ## $a0 = 06000024 /* 0803C 809572FC 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 08040 80957300 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 /* 08044 80957304 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 08048 80957308 468021A0 */ cvt.s.w $f6, $f4 -/* 0804C 8095730C 44070000 */ mfc1 $a3, $f0 +/* 08048 80957308 468021A0 */ cvt.s.w $f6, $f4 +/* 0804C 8095730C 44070000 */ mfc1 $a3, $f0 /* 08050 80957310 24A50024 */ addiu $a1, $a1, 0x0024 ## $a1 = 06000024 /* 08054 80957314 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C /* 08058 80957318 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 0805C 8095731C AFA00014 */ sw $zero, 0x0014($sp) -/* 08060 80957320 E7A60010 */ swc1 $f6, 0x0010($sp) -/* 08064 80957324 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 08068 80957328 E7A00018 */ swc1 $f0, 0x0018($sp) +/* 0805C 8095731C AFA00014 */ sw $zero, 0x0014($sp) +/* 08060 80957320 E7A60010 */ swc1 $f6, 0x0010($sp) +/* 08064 80957324 0C029468 */ jal SkelAnime_ChangeAnim + +/* 08068 80957328 E7A00018 */ swc1 $f0, 0x0018($sp) /* 0806C 8095732C 8E180004 */ lw $t8, 0x0004($s0) ## 00000004 /* 08070 80957330 3C014270 */ lui $at, 0x4270 ## $at = 42700000 /* 08074 80957334 44814000 */ mtc1 $at, $f8 ## $f8 = 60.00 @@ -29,19 +29,19 @@ glabel func_809572DC /* 08080 80957340 240E0040 */ addiu $t6, $zero, 0x0040 ## $t6 = 00000040 /* 08084 80957344 240F0078 */ addiu $t7, $zero, 0x0078 ## $t7 = 00000078 /* 08088 80957348 3C058095 */ lui $a1, %hi(func_80957384) ## $a1 = 80950000 -/* 0808C 8095734C 0301C824 */ and $t9, $t8, $at +/* 0808C 8095734C 0301C824 */ and $t9, $t8, $at /* 08090 80957350 A60E019C */ sh $t6, 0x019C($s0) ## 0000019C /* 08094 80957354 A60F01F0 */ sh $t7, 0x01F0($s0) ## 000001F0 /* 08098 80957358 AE190004 */ sw $t9, 0x0004($s0) ## 00000004 /* 0809C 8095735C 24A57384 */ addiu $a1, $a1, %lo(func_80957384) ## $a1 = 80957384 /* 080A0 80957360 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 080A4 80957364 E60801A0 */ swc1 $f8, 0x01A0($s0) ## 000001A0 -/* 080A8 80957368 0C253CB0 */ jal func_8094F2C0 +/* 080A8 80957368 0C253CB0 */ jal func_8094F2C0 /* 080AC 8095736C E60A01A8 */ swc1 $f10, 0x01A8($s0) ## 000001A8 -/* 080B0 80957370 8FBF002C */ lw $ra, 0x002C($sp) -/* 080B4 80957374 8FB00028 */ lw $s0, 0x0028($sp) +/* 080B0 80957370 8FBF002C */ lw $ra, 0x002C($sp) +/* 080B4 80957374 8FB00028 */ lw $s0, 0x0028($sp) /* 080B8 80957378 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 080BC 8095737C 03E00008 */ jr $ra +/* 080BC 8095737C 03E00008 */ jr $ra /* 080C0 80957380 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_80957F60.s b/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_80957F60.s index a4b0976c30..39cef429f1 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_80957F60.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_80957F60.s @@ -10,7 +10,7 @@ glabel func_80957F60 /* 08CC0 80957F80 24C6C3B0 */ addiu $a2, $a2, %lo(D_8095C3B0) ## $a2 = 8095C3B0 /* 08CC4 80957F84 27A4004C */ addiu $a0, $sp, 0x004C ## $a0 = FFFFFFE4 /* 08CC8 80957F88 2407103C */ addiu $a3, $zero, 0x103C ## $a3 = 0000103C -/* 08CCC 80957F8C 0C031AB1 */ jal func_800C6AC4 +/* 08CCC 80957F8C 0C031AB1 */ jal Graph_OpenDisps /* 08CD0 80957F90 AFA5005C */ sw $a1, 0x005C($sp) /* 08CD4 80957F94 8FA2006C */ lw $v0, 0x006C($sp) /* 08CD8 80957F98 24010014 */ addiu $at, $zero, 0x0014 ## $at = 00000014 @@ -52,7 +52,7 @@ glabel func_80957F60 /* 08D68 80958028 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 08D6C 8095802C 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 /* 08D70 80958030 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 08D74 80958034 0C0253D0 */ jal Draw_TwoTexScroll +/* 08D74 80958034 0C0253D0 */ jal Gfx_TwoTexScroll /* 08D78 80958038 AFA20044 */ sw $v0, 0x0044($sp) /* 08D7C 8095803C 8FA30044 */ lw $v1, 0x0044($sp) /* 08D80 80958040 8FA8005C */ lw $t0, 0x005C($sp) @@ -123,7 +123,7 @@ glabel func_80957F60 /* 08E68 80958128 24C6C3C0 */ addiu $a2, $a2, %lo(D_8095C3C0) ## $a2 = 8095C3C0 /* 08E6C 8095812C 27A4004C */ addiu $a0, $sp, 0x004C ## $a0 = FFFFFFE4 /* 08E70 80958130 24071057 */ addiu $a3, $zero, 0x1057 ## $a3 = 00001057 -/* 08E74 80958134 0C031AD5 */ jal func_800C6B54 +/* 08E74 80958134 0C031AD5 */ jal Graph_CloseDisps /* 08E78 80958138 8DE50000 */ lw $a1, 0x0000($t7) ## 00000000 /* 08E7C 8095813C 8FBF0034 */ lw $ra, 0x0034($sp) /* 08E80 80958140 27BD0068 */ addiu $sp, $sp, 0x0068 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_80958150.s b/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_80958150.s index 13f2556f82..e69c6df576 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_80958150.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_80958150.s @@ -20,7 +20,7 @@ glabel func_80958150 /* 08ED8 80958198 24071060 */ addiu $a3, $zero, 0x1060 ## $a3 = 00001060 /* 08EDC 8095819C 8D850000 */ lw $a1, 0x0000($t4) ## 00000000 /* 08EE0 809581A0 27A40060 */ addiu $a0, $sp, 0x0060 ## $a0 = FFFFFFD8 -/* 08EE4 809581A4 0C031AB1 */ jal func_800C6AC4 +/* 08EE4 809581A4 0C031AB1 */ jal Graph_OpenDisps /* 08EE8 809581A8 AFA50070 */ sw $a1, 0x0070($sp) /* 08EEC 809581AC 8FAA008C */ lw $t2, 0x008C($sp) /* 08EF0 809581B0 24010006 */ addiu $at, $zero, 0x0006 ## $at = 00000006 @@ -196,7 +196,7 @@ glabel func_80958150 /* 0916C 8095842C AFA0001C */ sw $zero, 0x001C($sp) /* 09170 80958430 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 09174 80958434 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 09178 80958438 0C0253D0 */ jal Draw_TwoTexScroll +/* 09178 80958438 0C0253D0 */ jal Gfx_TwoTexScroll /* 0917C 8095843C AFA2004C */ sw $v0, 0x004C($sp) /* 09180 80958440 8FA9004C */ lw $t1, 0x004C($sp) /* 09184 80958444 8FA80070 */ lw $t0, 0x0070($sp) @@ -357,7 +357,7 @@ glabel func_80958150 /* 093C0 80958680 24C6C420 */ addiu $a2, $a2, %lo(D_8095C420) ## $a2 = 8095C420 /* 093C4 80958684 27A40060 */ addiu $a0, $sp, 0x0060 ## $a0 = FFFFFFD8 /* 093C8 80958688 240710A8 */ addiu $a3, $zero, 0x10A8 ## $a3 = 000010A8 -/* 093CC 8095868C 0C031AD5 */ jal func_800C6B54 +/* 093CC 8095868C 0C031AD5 */ jal Graph_CloseDisps /* 093D0 80958690 8DA50000 */ lw $a1, 0x0000($t5) ## 00000000 /* 093D4 80958694 8FBF0034 */ lw $ra, 0x0034($sp) /* 093D8 80958698 27BD0088 */ addiu $sp, $sp, 0x0088 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_80958B0C.s b/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_80958B0C.s index 9bf1fb8c68..3277c96e9b 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_80958B0C.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_80958B0C.s @@ -1,11 +1,11 @@ glabel func_80958B0C /* 0984C 80958B0C 27BDFF80 */ addiu $sp, $sp, 0xFF80 ## $sp = FFFFFF80 /* 09850 80958B10 3C0E8096 */ lui $t6, %hi(D_8095C270) ## $t6 = 80960000 -/* 09854 80958B14 AFBF0024 */ sw $ra, 0x0024($sp) -/* 09858 80958B18 AFB00020 */ sw $s0, 0x0020($sp) -/* 0985C 80958B1C AFA40080 */ sw $a0, 0x0080($sp) -/* 09860 80958B20 AFA60088 */ sw $a2, 0x0088($sp) -/* 09864 80958B24 AFA7008C */ sw $a3, 0x008C($sp) +/* 09854 80958B14 AFBF0024 */ sw $ra, 0x0024($sp) +/* 09858 80958B18 AFB00020 */ sw $s0, 0x0020($sp) +/* 0985C 80958B1C AFA40080 */ sw $a0, 0x0080($sp) +/* 09860 80958B20 AFA60088 */ sw $a2, 0x0088($sp) +/* 09864 80958B24 AFA7008C */ sw $a3, 0x008C($sp) /* 09868 80958B28 25CEC270 */ addiu $t6, $t6, %lo(D_8095C270) ## $t6 = 8095C270 /* 0986C 80958B2C 8DD80000 */ lw $t8, 0x0000($t6) ## 8095C270 /* 09870 80958B30 27A60070 */ addiu $a2, $sp, 0x0070 ## $a2 = FFFFFFF0 @@ -50,21 +50,21 @@ glabel func_80958B0C /* 0990C 80958BCC 8D4C0008 */ lw $t4, 0x0008($t2) ## 8095C2A8 /* 09910 80958BD0 24010003 */ addiu $at, $zero, 0x0003 ## $at = 00000003 /* 09914 80958BD4 AD2B0004 */ sw $t3, 0x0004($t1) ## FFFFFFC4 -/* 09918 80958BD8 10A1000C */ beq $a1, $at, .L80958C0C +/* 09918 80958BD8 10A1000C */ beq $a1, $at, .L80958C0C /* 0991C 80958BDC AD2C0008 */ sw $t4, 0x0008($t1) ## FFFFFFC8 /* 09920 80958BE0 24010004 */ addiu $at, $zero, 0x0004 ## $at = 00000004 -/* 09924 80958BE4 10A10018 */ beq $a1, $at, .L80958C48 -/* 09928 80958BE8 8FB00090 */ lw $s0, 0x0090($sp) +/* 09924 80958BE4 10A10018 */ beq $a1, $at, .L80958C48 +/* 09928 80958BE8 8FB00090 */ lw $s0, 0x0090($sp) /* 0992C 80958BEC 24010005 */ addiu $at, $zero, 0x0005 ## $at = 00000005 -/* 09930 80958BF0 10A10026 */ beq $a1, $at, .L80958C8C -/* 09934 80958BF4 8FB00090 */ lw $s0, 0x0090($sp) +/* 09930 80958BF0 10A10026 */ beq $a1, $at, .L80958C8C +/* 09934 80958BF4 8FB00090 */ lw $s0, 0x0090($sp) /* 09938 80958BF8 24010007 */ addiu $at, $zero, 0x0007 ## $at = 00000007 -/* 0993C 80958BFC 10A10034 */ beq $a1, $at, .L80958CD0 -/* 09940 80958C00 8FB00090 */ lw $s0, 0x0090($sp) -/* 09944 80958C04 100000D5 */ beq $zero, $zero, .L80958F5C -/* 09948 80958C08 8FBF0024 */ lw $ra, 0x0024($sp) +/* 0993C 80958BFC 10A10034 */ beq $a1, $at, .L80958CD0 +/* 09940 80958C00 8FB00090 */ lw $s0, 0x0090($sp) +/* 09944 80958C04 100000D5 */ beq $zero, $zero, .L80958F5C +/* 09948 80958C08 8FBF0024 */ lw $ra, 0x0024($sp) .L80958C0C: -/* 0994C 80958C0C 8FB00090 */ lw $s0, 0x0090($sp) +/* 0994C 80958C0C 8FB00090 */ lw $s0, 0x0090($sp) /* 09950 80958C10 3C0141F0 */ lui $at, 0x41F0 ## $at = 41F00000 /* 09954 80958C14 44814000 */ mtc1 $at, $f8 ## $f8 = 30.00 /* 09958 80958C18 860D019C */ lh $t5, 0x019C($s0) ## 0000019C @@ -73,16 +73,16 @@ glabel func_80958B0C /* 09964 80958C24 31AE0007 */ andi $t6, $t5, 0x0007 ## $t6 = 00000000 /* 09968 80958C28 448E2000 */ mtc1 $t6, $f4 ## $f4 = 0.00 /* 0996C 80958C2C 00000000 */ nop -/* 09970 80958C30 468021A0 */ cvt.s.w $f6, $f4 -/* 09974 80958C34 46083282 */ mul.s $f10, $f6, $f8 -/* 09978 80958C38 0C0346BD */ jal Matrix_MultVec3f -/* 0997C 80958C3C E7AA0070 */ swc1 $f10, 0x0070($sp) -/* 09980 80958C40 100000C6 */ beq $zero, $zero, .L80958F5C -/* 09984 80958C44 8FBF0024 */ lw $ra, 0x0024($sp) +/* 09970 80958C30 468021A0 */ cvt.s.w $f6, $f4 +/* 09974 80958C34 46083282 */ mul.s $f10, $f6, $f8 +/* 09978 80958C38 0C0346BD */ jal Matrix_MultVec3f +/* 0997C 80958C3C E7AA0070 */ swc1 $f10, 0x0070($sp) +/* 09980 80958C40 100000C6 */ beq $zero, $zero, .L80958F5C +/* 09984 80958C44 8FBF0024 */ lw $ra, 0x0024($sp) .L80958C48: /* 09988 80958C48 3C048096 */ lui $a0, %hi(D_8095C220) ## $a0 = 80960000 /* 0998C 80958C4C 2484C220 */ addiu $a0, $a0, %lo(D_8095C220) ## $a0 = 8095C220 -/* 09990 80958C50 0C0346BD */ jal Matrix_MultVec3f +/* 09990 80958C50 0C0346BD */ jal Matrix_MultVec3f /* 09994 80958C54 260501B4 */ addiu $a1, $s0, 0x01B4 ## $a1 = 000001B4 /* 09998 80958C58 860F019C */ lh $t7, 0x019C($s0) ## 0000019C /* 0999C 80958C5C 3C0141F0 */ lui $at, 0x41F0 ## $at = 41F00000 @@ -91,16 +91,16 @@ glabel func_80958B0C /* 099A8 80958C68 44988000 */ mtc1 $t8, $f16 ## $f16 = 0.00 /* 099AC 80958C6C 27A40070 */ addiu $a0, $sp, 0x0070 ## $a0 = FFFFFFF0 /* 099B0 80958C70 26050208 */ addiu $a1, $s0, 0x0208 ## $a1 = 00000208 -/* 099B4 80958C74 468084A0 */ cvt.s.w $f18, $f16 -/* 099B8 80958C78 46049182 */ mul.s $f6, $f18, $f4 -/* 099BC 80958C7C 0C0346BD */ jal Matrix_MultVec3f -/* 099C0 80958C80 E7A60070 */ swc1 $f6, 0x0070($sp) -/* 099C4 80958C84 100000B5 */ beq $zero, $zero, .L80958F5C -/* 099C8 80958C88 8FBF0024 */ lw $ra, 0x0024($sp) +/* 099B4 80958C74 468084A0 */ cvt.s.w $f18, $f16 +/* 099B8 80958C78 46049182 */ mul.s $f6, $f18, $f4 +/* 099BC 80958C7C 0C0346BD */ jal Matrix_MultVec3f +/* 099C0 80958C80 E7A60070 */ swc1 $f6, 0x0070($sp) +/* 099C4 80958C84 100000B5 */ beq $zero, $zero, .L80958F5C +/* 099C8 80958C88 8FBF0024 */ lw $ra, 0x0024($sp) .L80958C8C: /* 099CC 80958C8C 3C048096 */ lui $a0, %hi(D_8095C220) ## $a0 = 80960000 /* 099D0 80958C90 2484C220 */ addiu $a0, $a0, %lo(D_8095C220) ## $a0 = 8095C220 -/* 099D4 80958C94 0C0346BD */ jal Matrix_MultVec3f +/* 099D4 80958C94 0C0346BD */ jal Matrix_MultVec3f /* 099D8 80958C98 260501C0 */ addiu $a1, $s0, 0x01C0 ## $a1 = 000001C0 /* 099DC 80958C9C 8619019C */ lh $t9, 0x019C($s0) ## 0000019C /* 099E0 80958CA0 3C014238 */ lui $at, 0x4238 ## $at = 42380000 @@ -109,16 +109,16 @@ glabel func_80958B0C /* 099EC 80958CAC 44884000 */ mtc1 $t0, $f8 ## $f8 = 0.00 /* 099F0 80958CB0 27A40070 */ addiu $a0, $sp, 0x0070 ## $a0 = FFFFFFF0 /* 099F4 80958CB4 26050214 */ addiu $a1, $s0, 0x0214 ## $a1 = 00000214 -/* 099F8 80958CB8 468042A0 */ cvt.s.w $f10, $f8 -/* 099FC 80958CBC 46105482 */ mul.s $f18, $f10, $f16 -/* 09A00 80958CC0 0C0346BD */ jal Matrix_MultVec3f -/* 09A04 80958CC4 E7B20070 */ swc1 $f18, 0x0070($sp) -/* 09A08 80958CC8 100000A4 */ beq $zero, $zero, .L80958F5C -/* 09A0C 80958CCC 8FBF0024 */ lw $ra, 0x0024($sp) +/* 099F8 80958CB8 468042A0 */ cvt.s.w $f10, $f8 +/* 099FC 80958CBC 46105482 */ mul.s $f18, $f10, $f16 +/* 09A00 80958CC0 0C0346BD */ jal Matrix_MultVec3f +/* 09A04 80958CC4 E7B20070 */ swc1 $f18, 0x0070($sp) +/* 09A08 80958CC8 100000A4 */ beq $zero, $zero, .L80958F5C +/* 09A0C 80958CCC 8FBF0024 */ lw $ra, 0x0024($sp) .L80958CD0: /* 09A10 80958CD0 3C048096 */ lui $a0, %hi(D_8095C220) ## $a0 = 80960000 /* 09A14 80958CD4 2484C220 */ addiu $a0, $a0, %lo(D_8095C220) ## $a0 = 8095C220 -/* 09A18 80958CD8 0C0346BD */ jal Matrix_MultVec3f +/* 09A18 80958CD8 0C0346BD */ jal Matrix_MultVec3f /* 09A1C 80958CDC 260501CC */ addiu $a1, $s0, 0x01CC ## $a1 = 000001CC /* 09A20 80958CE0 8609019C */ lh $t1, 0x019C($s0) ## 0000019C /* 09A24 80958CE4 3C014238 */ lui $at, 0x4238 ## $at = 42380000 @@ -127,43 +127,43 @@ glabel func_80958B0C /* 09A30 80958CF0 448A2000 */ mtc1 $t2, $f4 ## $f4 = 0.00 /* 09A34 80958CF4 27A40070 */ addiu $a0, $sp, 0x0070 ## $a0 = FFFFFFF0 /* 09A38 80958CF8 26050220 */ addiu $a1, $s0, 0x0220 ## $a1 = 00000220 -/* 09A3C 80958CFC 468021A0 */ cvt.s.w $f6, $f4 -/* 09A40 80958D00 46083282 */ mul.s $f10, $f6, $f8 -/* 09A44 80958D04 0C0346BD */ jal Matrix_MultVec3f -/* 09A48 80958D08 E7AA0070 */ swc1 $f10, 0x0070($sp) +/* 09A3C 80958CFC 468021A0 */ cvt.s.w $f6, $f4 +/* 09A40 80958D00 46083282 */ mul.s $f10, $f6, $f8 +/* 09A44 80958D04 0C0346BD */ jal Matrix_MultVec3f +/* 09A48 80958D08 E7AA0070 */ swc1 $f10, 0x0070($sp) /* 09A4C 80958D0C 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 /* 09A50 80958D10 44818000 */ mtc1 $at, $f16 ## $f16 = 20.00 /* 09A54 80958D14 26050268 */ addiu $a1, $s0, 0x0268 ## $a1 = 00000268 -/* 09A58 80958D18 AFA50034 */ sw $a1, 0x0034($sp) +/* 09A58 80958D18 AFA50034 */ sw $a1, 0x0034($sp) /* 09A5C 80958D1C 27A40070 */ addiu $a0, $sp, 0x0070 ## $a0 = FFFFFFF0 -/* 09A60 80958D20 0C0346BD */ jal Matrix_MultVec3f -/* 09A64 80958D24 E7B00070 */ swc1 $f16, 0x0070($sp) -/* 09A68 80958D28 8FA40034 */ lw $a0, 0x0034($sp) +/* 09A60 80958D20 0C0346BD */ jal Matrix_MultVec3f +/* 09A64 80958D24 E7B00070 */ swc1 $f16, 0x0070($sp) +/* 09A68 80958D28 8FA40034 */ lw $a0, 0x0034($sp) /* 09A6C 80958D2C 260501D8 */ addiu $a1, $s0, 0x01D8 ## $a1 = 000001D8 /* 09A70 80958D30 260601F6 */ addiu $a2, $s0, 0x01F6 ## $a2 = 000001F6 -/* 09A74 80958D34 0C00D611 */ jal func_80035844 +/* 09A74 80958D34 0C00D611 */ jal func_80035844 /* 09A78 80958D38 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 /* 09A7C 80958D3C 860B01F6 */ lh $t3, 0x01F6($s0) ## 000001F6 -/* 09A80 80958D40 A7AB003E */ sh $t3, 0x003E($sp) +/* 09A80 80958D40 A7AB003E */ sh $t3, 0x003E($sp) /* 09A84 80958D44 860C01F8 */ lh $t4, 0x01F8($s0) ## 000001F8 -/* 09A88 80958D48 0C034213 */ jal Matrix_Push -/* 09A8C 80958D4C A7AC003C */ sh $t4, 0x003C($sp) +/* 09A88 80958D48 0C034213 */ jal Matrix_Push +/* 09A8C 80958D4C A7AC003C */ sh $t4, 0x003C($sp) /* 09A90 80958D50 C60C0268 */ lwc1 $f12, 0x0268($s0) ## 00000268 /* 09A94 80958D54 C60E026C */ lwc1 $f14, 0x026C($s0) ## 0000026C /* 09A98 80958D58 8E060270 */ lw $a2, 0x0270($s0) ## 00000270 -/* 09A9C 80958D5C 0C034261 */ jal Matrix_Translate +/* 09A9C 80958D5C 0C034261 */ jal Matrix_Translate /* 09AA0 80958D60 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 09AA4 80958D64 87A4003E */ lh $a0, 0x003E($sp) -/* 09AA8 80958D68 87A5003C */ lh $a1, 0x003C($sp) +/* 09AA4 80958D64 87A4003E */ lh $a0, 0x003E($sp) +/* 09AA8 80958D68 87A5003C */ lh $a1, 0x003C($sp) /* 09AAC 80958D6C 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 09AB0 80958D70 0C034421 */ jal Matrix_RotateXYZ +/* 09AB0 80958D70 0C034421 */ jal Matrix_RotateZYX /* 09AB4 80958D74 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 /* 09AB8 80958D78 3C0D8096 */ lui $t5, %hi(D_809668D1) ## $t5 = 80960000 -/* 09ABC 80958D7C 91AD68D1 */ lbu $t5, %lo(D_809668D1)($t5) +/* 09ABC 80958D7C 91AD68D1 */ lbu $t5, %lo(D_809668D1)($t5) /* 09AC0 80958D80 44801000 */ mtc1 $zero, $f2 ## $f2 = 0.00 -/* 09AC4 80958D84 29A1000F */ slti $at, $t5, 0x000F -/* 09AC8 80958D88 1420000C */ bne $at, $zero, .L80958DBC -/* 09ACC 80958D8C E7A20070 */ swc1 $f2, 0x0070($sp) +/* 09AC4 80958D84 29A1000F */ slti $at, $t5, 0x000F +/* 09AC8 80958D88 1420000C */ bne $at, $zero, .L80958DBC +/* 09ACC 80958D8C E7A20070 */ swc1 $f2, 0x0070($sp) /* 09AD0 80958D90 860E019C */ lh $t6, 0x019C($s0) ## 0000019C /* 09AD4 80958D94 3C0142F0 */ lui $at, 0x42F0 ## $at = 42F00000 /* 09AD8 80958D98 44813000 */ mtc1 $at, $f6 ## $f6 = 120.00 @@ -171,10 +171,10 @@ glabel func_80958B0C /* 09AE0 80958DA0 31F80007 */ andi $t8, $t7, 0x0007 ## $t8 = 00000000 /* 09AE4 80958DA4 44989000 */ mtc1 $t8, $f18 ## $f18 = 0.00 /* 09AE8 80958DA8 00000000 */ nop -/* 09AEC 80958DAC 46809120 */ cvt.s.w $f4, $f18 -/* 09AF0 80958DB0 46062202 */ mul.s $f8, $f4, $f6 -/* 09AF4 80958DB4 1000000B */ beq $zero, $zero, .L80958DE4 -/* 09AF8 80958DB8 E7A80078 */ swc1 $f8, 0x0078($sp) +/* 09AEC 80958DAC 46809120 */ cvt.s.w $f4, $f18 +/* 09AF0 80958DB0 46062202 */ mul.s $f8, $f4, $f6 +/* 09AF4 80958DB4 1000000B */ beq $zero, $zero, .L80958DE4 +/* 09AF8 80958DB8 E7A80078 */ swc1 $f8, 0x0078($sp) .L80958DBC: /* 09AFC 80958DBC 8619019C */ lh $t9, 0x019C($s0) ## 0000019C /* 09B00 80958DC0 3C0142A0 */ lui $at, 0x42A0 ## $at = 42A00000 @@ -183,113 +183,113 @@ glabel func_80958B0C /* 09B0C 80958DCC 3109000F */ andi $t1, $t0, 0x000F ## $t1 = 00000000 /* 09B10 80958DD0 44895000 */ mtc1 $t1, $f10 ## $f10 = 0.00 /* 09B14 80958DD4 00000000 */ nop -/* 09B18 80958DD8 46805420 */ cvt.s.w $f16, $f10 -/* 09B1C 80958DDC 46128102 */ mul.s $f4, $f16, $f18 -/* 09B20 80958DE0 E7A40078 */ swc1 $f4, 0x0078($sp) +/* 09B18 80958DD8 46805420 */ cvt.s.w $f16, $f10 +/* 09B1C 80958DDC 46128102 */ mul.s $f4, $f16, $f18 +/* 09B20 80958DE0 E7A40078 */ swc1 $f4, 0x0078($sp) .L80958DE4: /* 09B24 80958DE4 3C014220 */ lui $at, 0x4220 ## $at = 42200000 -/* 09B28 80958DE8 C7A00078 */ lwc1 $f0, 0x0078($sp) +/* 09B28 80958DE8 C7A00078 */ lwc1 $f0, 0x0078($sp) /* 09B2C 80958DEC 44813000 */ mtc1 $at, $f6 ## $f6 = 40.00 /* 09B30 80958DF0 3C014248 */ lui $at, 0x4248 ## $at = 42480000 /* 09B34 80958DF4 44814000 */ mtc1 $at, $f8 ## $f8 = 50.00 -/* 09B38 80958DF8 46060000 */ add.s $f0, $f0, $f6 +/* 09B38 80958DF8 46060000 */ add.s $f0, $f0, $f6 /* 09B3C 80958DFC 27A40070 */ addiu $a0, $sp, 0x0070 ## $a0 = FFFFFFF0 /* 09B40 80958E00 2605022C */ addiu $a1, $s0, 0x022C ## $a1 = 0000022C -/* 09B44 80958E04 E7A00048 */ swc1 $f0, 0x0048($sp) -/* 09B48 80958E08 E7A00054 */ swc1 $f0, 0x0054($sp) -/* 09B4C 80958E0C 46080000 */ add.s $f0, $f0, $f8 -/* 09B50 80958E10 0C0346BD */ jal Matrix_MultVec3f -/* 09B54 80958E14 E7A00078 */ swc1 $f0, 0x0078($sp) +/* 09B44 80958E04 E7A00048 */ swc1 $f0, 0x0048($sp) +/* 09B48 80958E08 E7A00054 */ swc1 $f0, 0x0054($sp) +/* 09B4C 80958E0C 46080000 */ add.s $f0, $f0, $f8 +/* 09B50 80958E10 0C0346BD */ jal Matrix_MultVec3f +/* 09B54 80958E14 E7A00078 */ swc1 $f0, 0x0078($sp) /* 09B58 80958E18 3C0A8096 */ lui $t2, %hi(D_809668D1) ## $t2 = 80960000 -/* 09B5C 80958E1C 914A68D1 */ lbu $t2, %lo(D_809668D1)($t2) +/* 09B5C 80958E1C 914A68D1 */ lbu $t2, %lo(D_809668D1)($t2) /* 09B60 80958E20 44801000 */ mtc1 $zero, $f2 ## $f2 = 0.00 -/* 09B64 80958E24 C7A00078 */ lwc1 $f0, 0x0078($sp) -/* 09B68 80958E28 2941000F */ slti $at, $t2, 0x000F -/* 09B6C 80958E2C 14200018 */ bne $at, $zero, .L80958E90 +/* 09B64 80958E24 C7A00078 */ lwc1 $f0, 0x0078($sp) +/* 09B68 80958E28 2941000F */ slti $at, $t2, 0x000F +/* 09B6C 80958E2C 14200018 */ bne $at, $zero, .L80958E90 /* 09B70 80958E30 27A40070 */ addiu $a0, $sp, 0x0070 ## $a0 = FFFFFFF0 /* 09B74 80958E34 3C014204 */ lui $at, 0x4204 ## $at = 42040000 -/* 09B78 80958E38 C7A00078 */ lwc1 $f0, 0x0078($sp) +/* 09B78 80958E38 C7A00078 */ lwc1 $f0, 0x0078($sp) /* 09B7C 80958E3C 44815000 */ mtc1 $at, $f10 ## $f10 = 33.00 /* 09B80 80958E40 27A40070 */ addiu $a0, $sp, 0x0070 ## $a0 = FFFFFFF0 -/* 09B84 80958E44 460A0001 */ sub.s $f0, $f0, $f10 -/* 09B88 80958E48 4602003C */ c.lt.s $f0, $f2 -/* 09B8C 80958E4C E7A00078 */ swc1 $f0, 0x0078($sp) -/* 09B90 80958E50 45000002 */ bc1f .L80958E5C +/* 09B84 80958E44 460A0001 */ sub.s $f0, $f0, $f10 +/* 09B88 80958E48 4602003C */ c.lt.s $f0, $f2 +/* 09B8C 80958E4C E7A00078 */ swc1 $f0, 0x0078($sp) +/* 09B90 80958E50 45000002 */ bc1f .L80958E5C /* 09B94 80958E54 00000000 */ nop -/* 09B98 80958E58 E7A20078 */ swc1 $f2, 0x0078($sp) +/* 09B98 80958E58 E7A20078 */ swc1 $f2, 0x0078($sp) .L80958E5C: -/* 09B9C 80958E5C 0C0346BD */ jal Matrix_MultVec3f +/* 09B9C 80958E5C 0C0346BD */ jal Matrix_MultVec3f /* 09BA0 80958E60 26050244 */ addiu $a1, $s0, 0x0244 ## $a1 = 00000244 /* 09BA4 80958E64 3C014204 */ lui $at, 0x4204 ## $at = 42040000 -/* 09BA8 80958E68 C7A00078 */ lwc1 $f0, 0x0078($sp) +/* 09BA8 80958E68 C7A00078 */ lwc1 $f0, 0x0078($sp) /* 09BAC 80958E6C 44818000 */ mtc1 $at, $f16 ## $f16 = 33.00 /* 09BB0 80958E70 44801000 */ mtc1 $zero, $f2 ## $f2 = 0.00 -/* 09BB4 80958E74 46100001 */ sub.s $f0, $f0, $f16 -/* 09BB8 80958E78 4602003C */ c.lt.s $f0, $f2 -/* 09BBC 80958E7C E7A00078 */ swc1 $f0, 0x0078($sp) -/* 09BC0 80958E80 45020019 */ bc1fl .L80958EE8 +/* 09BB4 80958E74 46100001 */ sub.s $f0, $f0, $f16 +/* 09BB8 80958E78 4602003C */ c.lt.s $f0, $f2 +/* 09BBC 80958E7C E7A00078 */ swc1 $f0, 0x0078($sp) +/* 09BC0 80958E80 45020019 */ bc1fl .L80958EE8 /* 09BC4 80958E84 27A40070 */ addiu $a0, $sp, 0x0070 ## $a0 = FFFFFFF0 -/* 09BC8 80958E88 10000016 */ beq $zero, $zero, .L80958EE4 -/* 09BCC 80958E8C E7A20078 */ swc1 $f2, 0x0078($sp) +/* 09BC8 80958E88 10000016 */ beq $zero, $zero, .L80958EE4 +/* 09BCC 80958E8C E7A20078 */ swc1 $f2, 0x0078($sp) .L80958E90: /* 09BD0 80958E90 3C0141B0 */ lui $at, 0x41B0 ## $at = 41B00000 /* 09BD4 80958E94 44819000 */ mtc1 $at, $f18 ## $f18 = 22.00 /* 09BD8 80958E98 00000000 */ nop -/* 09BDC 80958E9C 46120001 */ sub.s $f0, $f0, $f18 -/* 09BE0 80958EA0 4602003C */ c.lt.s $f0, $f2 -/* 09BE4 80958EA4 E7A00078 */ swc1 $f0, 0x0078($sp) -/* 09BE8 80958EA8 45000002 */ bc1f .L80958EB4 +/* 09BDC 80958E9C 46120001 */ sub.s $f0, $f0, $f18 +/* 09BE0 80958EA0 4602003C */ c.lt.s $f0, $f2 +/* 09BE4 80958EA4 E7A00078 */ swc1 $f0, 0x0078($sp) +/* 09BE8 80958EA8 45000002 */ bc1f .L80958EB4 /* 09BEC 80958EAC 00000000 */ nop -/* 09BF0 80958EB0 E7A20078 */ swc1 $f2, 0x0078($sp) +/* 09BF0 80958EB0 E7A20078 */ swc1 $f2, 0x0078($sp) .L80958EB4: -/* 09BF4 80958EB4 0C0346BD */ jal Matrix_MultVec3f +/* 09BF4 80958EB4 0C0346BD */ jal Matrix_MultVec3f /* 09BF8 80958EB8 26050244 */ addiu $a1, $s0, 0x0244 ## $a1 = 00000244 /* 09BFC 80958EBC 3C0141B0 */ lui $at, 0x41B0 ## $at = 41B00000 -/* 09C00 80958EC0 C7A00078 */ lwc1 $f0, 0x0078($sp) +/* 09C00 80958EC0 C7A00078 */ lwc1 $f0, 0x0078($sp) /* 09C04 80958EC4 44812000 */ mtc1 $at, $f4 ## $f4 = 22.00 /* 09C08 80958EC8 44801000 */ mtc1 $zero, $f2 ## $f2 = 0.00 -/* 09C0C 80958ECC 46040001 */ sub.s $f0, $f0, $f4 -/* 09C10 80958ED0 4602003C */ c.lt.s $f0, $f2 -/* 09C14 80958ED4 E7A00078 */ swc1 $f0, 0x0078($sp) -/* 09C18 80958ED8 45020003 */ bc1fl .L80958EE8 +/* 09C0C 80958ECC 46040001 */ sub.s $f0, $f0, $f4 +/* 09C10 80958ED0 4602003C */ c.lt.s $f0, $f2 +/* 09C14 80958ED4 E7A00078 */ swc1 $f0, 0x0078($sp) +/* 09C18 80958ED8 45020003 */ bc1fl .L80958EE8 /* 09C1C 80958EDC 27A40070 */ addiu $a0, $sp, 0x0070 ## $a0 = FFFFFFF0 -/* 09C20 80958EE0 E7A20078 */ swc1 $f2, 0x0078($sp) +/* 09C20 80958EE0 E7A20078 */ swc1 $f2, 0x0078($sp) .L80958EE4: /* 09C24 80958EE4 27A40070 */ addiu $a0, $sp, 0x0070 ## $a0 = FFFFFFF0 .L80958EE8: -/* 09C28 80958EE8 0C0346BD */ jal Matrix_MultVec3f +/* 09C28 80958EE8 0C0346BD */ jal Matrix_MultVec3f /* 09C2C 80958EEC 26050238 */ addiu $a1, $s0, 0x0238 ## $a1 = 00000238 /* 09C30 80958EF0 26050384 */ addiu $a1, $s0, 0x0384 ## $a1 = 00000384 -/* 09C34 80958EF4 AFA50030 */ sw $a1, 0x0030($sp) -/* 09C38 80958EF8 0C0346BD */ jal Matrix_MultVec3f +/* 09C34 80958EF4 AFA50030 */ sw $a1, 0x0030($sp) +/* 09C38 80958EF8 0C0346BD */ jal Matrix_MultVec3f /* 09C3C 80958EFC 27A40064 */ addiu $a0, $sp, 0x0064 ## $a0 = FFFFFFE4 /* 09C40 80958F00 26050378 */ addiu $a1, $s0, 0x0378 ## $a1 = 00000378 -/* 09C44 80958F04 AFA50034 */ sw $a1, 0x0034($sp) -/* 09C48 80958F08 0C0346BD */ jal Matrix_MultVec3f +/* 09C44 80958F04 AFA50034 */ sw $a1, 0x0034($sp) +/* 09C48 80958F08 0C0346BD */ jal Matrix_MultVec3f /* 09C4C 80958F0C 27A40058 */ addiu $a0, $sp, 0x0058 ## $a0 = FFFFFFD8 /* 09C50 80958F10 2605039C */ addiu $a1, $s0, 0x039C ## $a1 = 0000039C -/* 09C54 80958F14 AFA50028 */ sw $a1, 0x0028($sp) -/* 09C58 80958F18 0C0346BD */ jal Matrix_MultVec3f +/* 09C54 80958F14 AFA50028 */ sw $a1, 0x0028($sp) +/* 09C58 80958F18 0C0346BD */ jal Matrix_MultVec3f /* 09C5C 80958F1C 27A4004C */ addiu $a0, $sp, 0x004C ## $a0 = FFFFFFCC /* 09C60 80958F20 26070390 */ addiu $a3, $s0, 0x0390 ## $a3 = 00000390 /* 09C64 80958F24 00E02825 */ or $a1, $a3, $zero ## $a1 = 00000390 -/* 09C68 80958F28 AFA7002C */ sw $a3, 0x002C($sp) -/* 09C6C 80958F2C 0C0346BD */ jal Matrix_MultVec3f +/* 09C68 80958F28 AFA7002C */ sw $a3, 0x002C($sp) +/* 09C6C 80958F2C 0C0346BD */ jal Matrix_MultVec3f /* 09C70 80958F30 27A40040 */ addiu $a0, $sp, 0x0040 ## $a0 = FFFFFFC0 -/* 09C74 80958F34 8FAB0028 */ lw $t3, 0x0028($sp) -/* 09C78 80958F38 8FA7002C */ lw $a3, 0x002C($sp) +/* 09C74 80958F34 8FAB0028 */ lw $t3, 0x0028($sp) +/* 09C78 80958F38 8FA7002C */ lw $a3, 0x002C($sp) /* 09C7C 80958F3C 26040338 */ addiu $a0, $s0, 0x0338 ## $a0 = 00000338 -/* 09C80 80958F40 8FA50034 */ lw $a1, 0x0034($sp) -/* 09C84 80958F44 8FA60030 */ lw $a2, 0x0030($sp) -/* 09C88 80958F48 0C0189CD */ jal func_80062734 -/* 09C8C 80958F4C AFAB0010 */ sw $t3, 0x0010($sp) -/* 09C90 80958F50 0C034221 */ jal Matrix_Pull +/* 09C80 80958F40 8FA50034 */ lw $a1, 0x0034($sp) +/* 09C84 80958F44 8FA60030 */ lw $a2, 0x0030($sp) +/* 09C88 80958F48 0C0189CD */ jal func_80062734 +/* 09C8C 80958F4C AFAB0010 */ sw $t3, 0x0010($sp) +/* 09C90 80958F50 0C034221 */ jal Matrix_Pull /* 09C94 80958F54 00000000 */ nop -/* 09C98 80958F58 8FBF0024 */ lw $ra, 0x0024($sp) +/* 09C98 80958F58 8FBF0024 */ lw $ra, 0x0024($sp) .L80958F5C: -/* 09C9C 80958F5C 8FB00020 */ lw $s0, 0x0020($sp) +/* 09C9C 80958F5C 8FB00020 */ lw $s0, 0x0020($sp) /* 09CA0 80958F60 27BD0080 */ addiu $sp, $sp, 0x0080 ## $sp = 00000000 -/* 09CA4 80958F64 03E00008 */ jr $ra +/* 09CA4 80958F64 03E00008 */ jr $ra /* 09CA8 80958F68 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_80958FFC.s b/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_80958FFC.s index 61de68688b..c713a95853 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_80958FFC.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_80958FFC.s @@ -12,7 +12,7 @@ glabel func_80958FFC /* 09D64 80959024 24C6C430 */ addiu $a2, $a2, %lo(D_8095C430) ## $a2 = 8095C430 /* 09D68 80959028 27A40058 */ addiu $a0, $sp, 0x0058 ## $a0 = FFFFFFE8 /* 09D6C 8095902C 2407118E */ addiu $a3, $zero, 0x118E ## $a3 = 0000118E -/* 09D70 80959030 0C031AB1 */ jal func_800C6AC4 +/* 09D70 80959030 0C031AB1 */ jal Graph_OpenDisps /* 09D74 80959034 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 /* 09D78 80959038 8FA20074 */ lw $v0, 0x0074($sp) /* 09D7C 8095903C 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 @@ -49,7 +49,7 @@ glabel func_80958FFC /* 09DF8 809590B8 AFA0001C */ sw $zero, 0x001C($sp) /* 09DFC 809590BC 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 09E00 809590C0 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 09E04 809590C4 0C0253D0 */ jal Draw_TwoTexScroll +/* 09E04 809590C4 0C0253D0 */ jal Gfx_TwoTexScroll /* 09E08 809590C8 AFA20054 */ sw $v0, 0x0054($sp) /* 09E0C 809590CC 8FA80054 */ lw $t0, 0x0054($sp) /* 09E10 809590D0 3C0FDA38 */ lui $t7, 0xDA38 ## $t7 = DA380000 @@ -110,7 +110,7 @@ glabel func_80958FFC /* 09EE0 809591A0 24C6C460 */ addiu $a2, $a2, %lo(D_8095C460) ## $a2 = 8095C460 /* 09EE4 809591A4 27A40058 */ addiu $a0, $sp, 0x0058 ## $a0 = FFFFFFE8 /* 09EE8 809591A8 8E250000 */ lw $a1, 0x0000($s1) ## 00000000 -/* 09EEC 809591AC 0C031AD5 */ jal func_800C6B54 +/* 09EEC 809591AC 0C031AD5 */ jal Graph_CloseDisps /* 09EF0 809591B0 240711A5 */ addiu $a3, $zero, 0x11A5 ## $a3 = 000011A5 /* 09EF4 809591B4 8FBF003C */ lw $ra, 0x003C($sp) /* 09EF8 809591B8 8FB00034 */ lw $s0, 0x0034($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_8095A188.s b/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_8095A188.s index 808773a784..1289a17ab2 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_8095A188.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_8095A188.s @@ -1,31 +1,31 @@ glabel func_8095A188 /* 0AEC8 8095A188 27BDFEB8 */ addiu $sp, $sp, 0xFEB8 ## $sp = FFFFFEB8 -/* 0AECC 8095A18C AFBF0044 */ sw $ra, 0x0044($sp) -/* 0AED0 8095A190 AFBE0040 */ sw $s8, 0x0040($sp) -/* 0AED4 8095A194 AFB7003C */ sw $s7, 0x003C($sp) -/* 0AED8 8095A198 AFB60038 */ sw $s6, 0x0038($sp) -/* 0AEDC 8095A19C AFB50034 */ sw $s5, 0x0034($sp) -/* 0AEE0 8095A1A0 AFB40030 */ sw $s4, 0x0030($sp) -/* 0AEE4 8095A1A4 AFB3002C */ sw $s3, 0x002C($sp) -/* 0AEE8 8095A1A8 AFB20028 */ sw $s2, 0x0028($sp) -/* 0AEEC 8095A1AC AFB10024 */ sw $s1, 0x0024($sp) -/* 0AEF0 8095A1B0 AFB00020 */ sw $s0, 0x0020($sp) -/* 0AEF4 8095A1B4 F7B40018 */ sdc1 $f20, 0x0018($sp) +/* 0AECC 8095A18C AFBF0044 */ sw $ra, 0x0044($sp) +/* 0AED0 8095A190 AFBE0040 */ sw $s8, 0x0040($sp) +/* 0AED4 8095A194 AFB7003C */ sw $s7, 0x003C($sp) +/* 0AED8 8095A198 AFB60038 */ sw $s6, 0x0038($sp) +/* 0AEDC 8095A19C AFB50034 */ sw $s5, 0x0034($sp) +/* 0AEE0 8095A1A0 AFB40030 */ sw $s4, 0x0030($sp) +/* 0AEE4 8095A1A4 AFB3002C */ sw $s3, 0x002C($sp) +/* 0AEE8 8095A1A8 AFB20028 */ sw $s2, 0x0028($sp) +/* 0AEEC 8095A1AC AFB10024 */ sw $s1, 0x0024($sp) +/* 0AEF0 8095A1B0 AFB00020 */ sw $s0, 0x0020($sp) +/* 0AEF4 8095A1B4 F7B40018 */ sdc1 $f20, 0x0018($sp) /* 0AEF8 8095A1B8 8CB10000 */ lw $s1, 0x0000($a1) ## 00000000 /* 0AEFC 8095A1BC 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 0AF00 8095A1C0 AFA40138 */ sw $a0, 0x0138($sp) +/* 0AF00 8095A1C0 AFA40138 */ sw $a0, 0x0138($sp) /* 0AF04 8095A1C4 00A0B025 */ or $s6, $a1, $zero ## $s6 = 00000000 /* 0AF08 8095A1C8 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 /* 0AF0C 8095A1CC 3C058096 */ lui $a1, %hi(D_8095C23C) ## $a1 = 80960000 /* 0AF10 8095A1D0 0000A025 */ or $s4, $zero, $zero ## $s4 = 00000000 -/* 0AF14 8095A1D4 0C030129 */ jal func_800C04A4 -/* 0AF18 8095A1D8 84A5C23C */ lh $a1, %lo(D_8095C23C)($a1) +/* 0AF14 8095A1D4 0C030129 */ jal func_800C04A4 +/* 0AF18 8095A1D8 84A5C23C */ lh $a1, %lo(D_8095C23C)($a1) /* 0AF1C 8095A1DC 3C068096 */ lui $a2, %hi(D_8095C490) ## $a2 = 80960000 -/* 0AF20 8095A1E0 AFA20134 */ sw $v0, 0x0134($sp) +/* 0AF20 8095A1E0 AFA20134 */ sw $v0, 0x0134($sp) /* 0AF24 8095A1E4 24C6C490 */ addiu $a2, $a2, %lo(D_8095C490) ## $a2 = 8095C490 /* 0AF28 8095A1E8 27A40120 */ addiu $a0, $sp, 0x0120 ## $a0 = FFFFFFD8 /* 0AF2C 8095A1EC 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 0AF30 8095A1F0 0C031AB1 */ jal func_800C6AC4 +/* 0AF30 8095A1F0 0C031AB1 */ jal Graph_OpenDisps /* 0AF34 8095A1F4 24071359 */ addiu $a3, $zero, 0x1359 ## $a3 = 00001359 /* 0AF38 8095A1F8 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 /* 0AF3C 8095A1FC 3C178096 */ lui $s7, %hi(D_8095C4A0) ## $s7 = 80960000 @@ -38,18 +38,18 @@ glabel func_8095A188 /* 0AF54 8095A214 920E0024 */ lbu $t6, 0x0024($s0) ## 00000024 /* 0AF58 8095A218 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 /* 0AF5C 8095A21C 3C0F0601 */ lui $t7, 0x0601 ## $t7 = 06010000 -/* 0AF60 8095A220 15C10053 */ bne $t6, $at, .L8095A370 +/* 0AF60 8095A220 15C10053 */ bne $t6, $at, .L8095A370 /* 0AF64 8095A224 25EF5710 */ addiu $t7, $t7, 0x5710 ## $t7 = 06015710 /* 0AF68 8095A228 3C010001 */ lui $at, 0x0001 ## $at = 00010000 /* 0AF6C 8095A22C 34211DA0 */ ori $at, $at, 0x1DA0 ## $at = 00011DA0 -/* 0AF70 8095A230 02C19021 */ addu $s2, $s6, $at -/* 0AF74 8095A234 16800015 */ bne $s4, $zero, .L8095A28C -/* 0AF78 8095A238 AFAF0050 */ sw $t7, 0x0050($sp) +/* 0AF70 8095A230 02C19021 */ addu $s2, $s6, $at +/* 0AF74 8095A234 16800015 */ bne $s4, $zero, .L8095A28C +/* 0AF78 8095A238 AFAF0050 */ sw $t7, 0x0050($sp) /* 0AF7C 8095A23C 3C180601 */ lui $t8, 0x0601 ## $t8 = 06010000 /* 0AF80 8095A240 271856A0 */ addiu $t8, $t8, 0x56A0 ## $t8 = 060156A0 /* 0AF84 8095A244 8EC40000 */ lw $a0, 0x0000($s6) ## 00000000 -/* 0AF88 8095A248 0C024F61 */ jal func_80093D84 -/* 0AF8C 8095A24C AFB80058 */ sw $t8, 0x0058($sp) +/* 0AF88 8095A248 0C024F61 */ jal func_80093D84 +/* 0AF8C 8095A24C AFB80058 */ sw $t8, 0x0058($sp) /* 0AF90 8095A250 8E2202D0 */ lw $v0, 0x02D0($s1) ## 000002D0 /* 0AF94 8095A254 3C088282 */ lui $t0, 0x8282 ## $t0 = 82820000 /* 0AF98 8095A258 35081E00 */ ori $t0, $t0, 0x1E00 ## $t0 = 82821E00 @@ -63,7 +63,7 @@ glabel func_8095A188 /* 0AFB8 8095A278 24490008 */ addiu $t1, $v0, 0x0008 ## $t1 = 00000008 /* 0AFBC 8095A27C AE2902D0 */ sw $t1, 0x02D0($s1) ## 000002D0 /* 0AFC0 8095A280 AC550000 */ sw $s5, 0x0000($v0) ## 00000000 -/* 0AFC4 8095A284 8FAA0058 */ lw $t2, 0x0058($sp) +/* 0AFC4 8095A284 8FAA0058 */ lw $t2, 0x0058($sp) /* 0AFC8 8095A288 AC4A0004 */ sw $t2, 0x0004($v0) ## 00000004 .L8095A28C: /* 0AFCC 8095A28C 8E2202D0 */ lw $v0, 0x02D0($s1) ## 000002D0 @@ -80,30 +80,30 @@ glabel func_8095A188 /* 0AFF8 8095A2B8 AC4F0004 */ sw $t7, 0x0004($v0) ## 00000004 /* 0AFFC 8095A2BC 8E060008 */ lw $a2, 0x0008($s0) ## 00000008 /* 0B000 8095A2C0 C60E0004 */ lwc1 $f14, 0x0004($s0) ## 00000004 -/* 0B004 8095A2C4 0C034261 */ jal Matrix_Translate +/* 0B004 8095A2C4 0C034261 */ jal Matrix_Translate /* 0B008 8095A2C8 C60C0000 */ lwc1 $f12, 0x0000($s0) ## 00000000 -/* 0B00C 8095A2CC 0C0347F5 */ jal func_800D1FD4 +/* 0B00C 8095A2CC 0C0347F5 */ jal func_800D1FD4 /* 0B010 8095A2D0 02402025 */ or $a0, $s2, $zero ## $a0 = 00000000 /* 0B014 8095A2D4 8618002E */ lh $t8, 0x002E($s0) ## 0000002E /* 0B018 8095A2D8 3C014700 */ lui $at, 0x4700 ## $at = 47000000 /* 0B01C 8095A2DC 44814000 */ mtc1 $at, $f8 ## $f8 = 32768.00 /* 0B020 8095A2E0 44982000 */ mtc1 $t8, $f4 ## $f4 = 0.00 /* 0B024 8095A2E4 3C018096 */ lui $at, %hi(D_8095C8C0) ## $at = 80960000 -/* 0B028 8095A2E8 C430C8C0 */ lwc1 $f16, %lo(D_8095C8C0)($at) -/* 0B02C 8095A2EC 468021A0 */ cvt.s.w $f6, $f4 +/* 0B028 8095A2E8 C430C8C0 */ lwc1 $f16, %lo(D_8095C8C0)($at) +/* 0B02C 8095A2EC 468021A0 */ cvt.s.w $f6, $f4 /* 0B030 8095A2F0 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 -/* 0B034 8095A2F4 46083283 */ div.s $f10, $f6, $f8 -/* 0B038 8095A2F8 46105302 */ mul.s $f12, $f10, $f16 -/* 0B03C 8095A2FC 0C0343B5 */ jal Matrix_RotateZ +/* 0B034 8095A2F4 46083283 */ div.s $f10, $f6, $f8 +/* 0B038 8095A2F8 46105302 */ mul.s $f12, $f10, $f16 +/* 0B03C 8095A2FC 0C0343B5 */ jal Matrix_RotateZ /* 0B040 8095A300 00000000 */ nop /* 0B044 8095A304 3C018096 */ lui $at, %hi(D_8095C8C4) ## $at = 80960000 -/* 0B048 8095A308 C424C8C4 */ lwc1 $f4, %lo(D_8095C8C4)($at) +/* 0B048 8095A308 C424C8C4 */ lwc1 $f4, %lo(D_8095C8C4)($at) /* 0B04C 8095A30C C6120040 */ lwc1 $f18, 0x0040($s0) ## 00000040 -/* 0B050 8095A310 4406A000 */ mfc1 $a2, $f20 +/* 0B050 8095A310 4406A000 */ mfc1 $a2, $f20 /* 0B054 8095A314 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 0B058 8095A318 46049302 */ mul.s $f12, $f18, $f4 -/* 0B05C 8095A31C 0C0342A3 */ jal Matrix_Scale -/* 0B060 8095A320 46006386 */ mov.s $f14, $f12 +/* 0B058 8095A318 46049302 */ mul.s $f12, $f18, $f4 +/* 0B05C 8095A31C 0C0342A3 */ jal Matrix_Scale +/* 0B060 8095A320 46006386 */ mov.s $f14, $f12 /* 0B064 8095A324 8E2202D0 */ lw $v0, 0x02D0($s1) ## 000002D0 /* 0B068 8095A328 3C08DA38 */ lui $t0, 0xDA38 ## $t0 = DA380000 /* 0B06C 8095A32C 35080003 */ ori $t0, $t0, 0x0003 ## $t0 = DA380003 @@ -113,75 +113,75 @@ glabel func_8095A188 /* 0B07C 8095A33C 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 0B080 8095A340 02E02825 */ or $a1, $s7, $zero ## $a1 = 8095C4A0 /* 0B084 8095A344 24061370 */ addiu $a2, $zero, 0x1370 ## $a2 = 00001370 -/* 0B088 8095A348 0C0346A2 */ jal Matrix_NewMtx -/* 0B08C 8095A34C AFA20110 */ sw $v0, 0x0110($sp) -/* 0B090 8095A350 8FA30110 */ lw $v1, 0x0110($sp) +/* 0B088 8095A348 0C0346A2 */ jal Matrix_NewMtx +/* 0B08C 8095A34C AFA20110 */ sw $v0, 0x0110($sp) +/* 0B090 8095A350 8FA30110 */ lw $v1, 0x0110($sp) /* 0B094 8095A354 AC620004 */ sw $v0, 0x0004($v1) ## 00000004 /* 0B098 8095A358 8E2202D0 */ lw $v0, 0x02D0($s1) ## 000002D0 /* 0B09C 8095A35C 24490008 */ addiu $t1, $v0, 0x0008 ## $t1 = 00000008 /* 0B0A0 8095A360 AE2902D0 */ sw $t1, 0x02D0($s1) ## 000002D0 /* 0B0A4 8095A364 AC550000 */ sw $s5, 0x0000($v0) ## 00000000 -/* 0B0A8 8095A368 8FAA0050 */ lw $t2, 0x0050($sp) +/* 0B0A8 8095A368 8FAA0050 */ lw $t2, 0x0050($sp) /* 0B0AC 8095A36C AC4A0004 */ sw $t2, 0x0004($v0) ## 00000004 .L8095A370: /* 0B0B0 8095A370 26730001 */ addiu $s3, $s3, 0x0001 ## $s3 = 00000001 -/* 0B0B4 8095A374 00139C00 */ sll $s3, $s3, 16 -/* 0B0B8 8095A378 00139C03 */ sra $s3, $s3, 16 -/* 0B0BC 8095A37C 2A610190 */ slti $at, $s3, 0x0190 -/* 0B0C0 8095A380 1420FFA4 */ bne $at, $zero, .L8095A214 +/* 0B0B4 8095A374 00139C00 */ sll $s3, $s3, 16 +/* 0B0B8 8095A378 00139C03 */ sra $s3, $s3, 16 +/* 0B0BC 8095A37C 2A610190 */ slti $at, $s3, 0x0190 +/* 0B0C0 8095A380 1420FFA4 */ bne $at, $zero, .L8095A214 /* 0B0C4 8095A384 26100058 */ addiu $s0, $s0, 0x0058 ## $s0 = 00000058 /* 0B0C8 8095A388 0000A025 */ or $s4, $zero, $zero ## $s4 = 00000000 -/* 0B0CC 8095A38C 8FB00138 */ lw $s0, 0x0138($sp) +/* 0B0CC 8095A38C 8FB00138 */ lw $s0, 0x0138($sp) /* 0B0D0 8095A390 00009825 */ or $s3, $zero, $zero ## $s3 = 00000000 /* 0B0D4 8095A394 3C17E700 */ lui $s7, 0xE700 ## $s7 = E7000000 .L8095A398: /* 0B0D8 8095A398 920B0024 */ lbu $t3, 0x0024($s0) ## 0000007C /* 0B0DC 8095A39C 24010004 */ addiu $at, $zero, 0x0004 ## $at = 00000004 /* 0B0E0 8095A3A0 3C0C0601 */ lui $t4, 0x0601 ## $t4 = 06010000 -/* 0B0E4 8095A3A4 15610086 */ bne $t3, $at, .L8095A5C0 +/* 0B0E4 8095A3A4 15610086 */ bne $t3, $at, .L8095A5C0 /* 0B0E8 8095A3A8 258C1768 */ addiu $t4, $t4, 0x1768 ## $t4 = 06011768 /* 0B0EC 8095A3AC 3C010001 */ lui $at, 0x0001 ## $at = 00010000 /* 0B0F0 8095A3B0 34211DA0 */ ori $at, $at, 0x1DA0 ## $at = 00011DA0 -/* 0B0F4 8095A3B4 02C19021 */ addu $s2, $s6, $at -/* 0B0F8 8095A3B8 1680000E */ bne $s4, $zero, .L8095A3F4 -/* 0B0FC 8095A3BC AFAC0050 */ sw $t4, 0x0050($sp) +/* 0B0F4 8095A3B4 02C19021 */ addu $s2, $s6, $at +/* 0B0F8 8095A3B8 1680000E */ bne $s4, $zero, .L8095A3F4 +/* 0B0FC 8095A3BC AFAC0050 */ sw $t4, 0x0050($sp) /* 0B100 8095A3C0 3C0D0601 */ lui $t5, 0x0601 ## $t5 = 06010000 /* 0B104 8095A3C4 25AD1738 */ addiu $t5, $t5, 0x1738 ## $t5 = 06011738 /* 0B108 8095A3C8 8EC40000 */ lw $a0, 0x0000($s6) ## 00000000 -/* 0B10C 8095A3CC 0C024F61 */ jal func_80093D84 -/* 0B110 8095A3D0 AFAD0058 */ sw $t5, 0x0058($sp) +/* 0B10C 8095A3CC 0C024F61 */ jal func_80093D84 +/* 0B110 8095A3D0 AFAD0058 */ sw $t5, 0x0058($sp) /* 0B114 8095A3D4 8E2202D0 */ lw $v0, 0x02D0($s1) ## 000002D0 /* 0B118 8095A3D8 26940001 */ addiu $s4, $s4, 0x0001 ## $s4 = 00000001 /* 0B11C 8095A3DC 329400FF */ andi $s4, $s4, 0x00FF ## $s4 = 00000001 /* 0B120 8095A3E0 244E0008 */ addiu $t6, $v0, 0x0008 ## $t6 = 00000008 /* 0B124 8095A3E4 AE2E02D0 */ sw $t6, 0x02D0($s1) ## 000002D0 /* 0B128 8095A3E8 AC550000 */ sw $s5, 0x0000($v0) ## 00000000 -/* 0B12C 8095A3EC 8FAF0058 */ lw $t7, 0x0058($sp) +/* 0B12C 8095A3EC 8FAF0058 */ lw $t7, 0x0058($sp) /* 0B130 8095A3F0 AC4F0004 */ sw $t7, 0x0004($v0) ## 00000004 .L8095A3F4: /* 0B134 8095A3F4 C60C0000 */ lwc1 $f12, 0x0000($s0) ## 00000058 /* 0B138 8095A3F8 C60E0004 */ lwc1 $f14, 0x0004($s0) ## 0000005C /* 0B13C 8095A3FC 8E060008 */ lw $a2, 0x0008($s0) ## 00000060 -/* 0B140 8095A400 0C034261 */ jal Matrix_Translate +/* 0B140 8095A400 0C034261 */ jal Matrix_Translate /* 0B144 8095A404 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 0B148 8095A408 0C0347F5 */ jal func_800D1FD4 +/* 0B148 8095A408 0C0347F5 */ jal func_800D1FD4 /* 0B14C 8095A40C 02402025 */ or $a0, $s2, $zero ## $a0 = 00000000 /* 0B150 8095A410 C60C0040 */ lwc1 $f12, 0x0040($s0) ## 00000098 /* 0B154 8095A414 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 0B158 8095A418 44066000 */ mfc1 $a2, $f12 -/* 0B15C 8095A41C 0C0342A3 */ jal Matrix_Scale -/* 0B160 8095A420 46006386 */ mov.s $f14, $f12 +/* 0B158 8095A418 44066000 */ mfc1 $a2, $f12 +/* 0B15C 8095A41C 0C0342A3 */ jal Matrix_Scale +/* 0B160 8095A420 46006386 */ mov.s $f14, $f12 /* 0B164 8095A424 8618002E */ lh $t8, 0x002E($s0) ## 00000086 /* 0B168 8095A428 3C014700 */ lui $at, 0x4700 ## $at = 47000000 /* 0B16C 8095A42C 44815000 */ mtc1 $at, $f10 ## $f10 = 32768.00 /* 0B170 8095A430 44983000 */ mtc1 $t8, $f6 ## $f6 = 0.00 /* 0B174 8095A434 3C018096 */ lui $at, %hi(D_8095C8C8) ## $at = 80960000 -/* 0B178 8095A438 C432C8C8 */ lwc1 $f18, %lo(D_8095C8C8)($at) -/* 0B17C 8095A43C 46803220 */ cvt.s.w $f8, $f6 +/* 0B178 8095A438 C432C8C8 */ lwc1 $f18, %lo(D_8095C8C8)($at) +/* 0B17C 8095A43C 46803220 */ cvt.s.w $f8, $f6 /* 0B180 8095A440 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 -/* 0B184 8095A444 460A4403 */ div.s $f16, $f8, $f10 -/* 0B188 8095A448 46128302 */ mul.s $f12, $f16, $f18 -/* 0B18C 8095A44C 0C0343B5 */ jal Matrix_RotateZ +/* 0B184 8095A444 460A4403 */ div.s $f16, $f8, $f10 +/* 0B188 8095A448 46128302 */ mul.s $f12, $f16, $f18 +/* 0B18C 8095A44C 0C0343B5 */ jal Matrix_RotateZ /* 0B190 8095A450 00000000 */ nop /* 0B194 8095A454 8E2202D0 */ lw $v0, 0x02D0($s1) ## 000002D0 /* 0B198 8095A458 3C08DA38 */ lui $t0, 0xDA38 ## $t0 = DA380000 @@ -193,9 +193,9 @@ glabel func_8095A188 /* 0B1B0 8095A470 24A5C4B0 */ addiu $a1, $a1, %lo(D_8095C4B0) ## $a1 = 8095C4B0 /* 0B1B4 8095A474 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 0B1B8 8095A478 2406138A */ addiu $a2, $zero, 0x138A ## $a2 = 0000138A -/* 0B1BC 8095A47C 0C0346A2 */ jal Matrix_NewMtx -/* 0B1C0 8095A480 AFA20104 */ sw $v0, 0x0104($sp) -/* 0B1C4 8095A484 8FA30104 */ lw $v1, 0x0104($sp) +/* 0B1BC 8095A47C 0C0346A2 */ jal Matrix_NewMtx +/* 0B1C0 8095A480 AFA20104 */ sw $v0, 0x0104($sp) +/* 0B1C4 8095A484 8FA30104 */ lw $v1, 0x0104($sp) /* 0B1C8 8095A488 3C0BDB06 */ lui $t3, 0xDB06 ## $t3 = DB060000 /* 0B1CC 8095A48C 356B0020 */ ori $t3, $t3, 0x0020 ## $t3 = DB060020 /* 0B1D0 8095A490 AC620004 */ sw $v0, 0x0004($v1) ## 00000004 @@ -213,19 +213,19 @@ glabel func_8095A188 /* 0B200 8095A4C0 AE2A02D0 */ sw $t2, 0x02D0($s1) ## 000002D0 /* 0B204 8095A4C4 AC4B0000 */ sw $t3, 0x0000($v0) ## 00000000 /* 0B208 8095A4C8 860C0028 */ lh $t4, 0x0028($s0) ## 00000080 -/* 0B20C 8095A4CC 000C6880 */ sll $t5, $t4, 2 -/* 0B210 8095A4D0 008D2021 */ addu $a0, $a0, $t5 -/* 0B214 8095A4D4 8C84C300 */ lw $a0, %lo(D_8095C300)($a0) +/* 0B20C 8095A4CC 000C6880 */ sll $t5, $t4, 2 +/* 0B210 8095A4D0 008D2021 */ addu $a0, $a0, $t5 +/* 0B214 8095A4D4 8C84C300 */ lw $a0, %lo(D_8095C300)($a0) /* 0B218 8095A4D8 3C0CFA00 */ lui $t4, 0xFA00 ## $t4 = FA000000 -/* 0B21C 8095A4DC 00047900 */ sll $t7, $a0, 4 -/* 0B220 8095A4E0 000FC702 */ srl $t8, $t7, 28 -/* 0B224 8095A4E4 0018C880 */ sll $t9, $t8, 2 -/* 0B228 8095A4E8 01194021 */ addu $t0, $t0, $t9 +/* 0B21C 8095A4DC 00047900 */ sll $t7, $a0, 4 +/* 0B220 8095A4E0 000FC702 */ srl $t8, $t7, 28 +/* 0B224 8095A4E4 0018C880 */ sll $t9, $t8, 2 +/* 0B228 8095A4E8 01194021 */ addu $t0, $t0, $t9 /* 0B22C 8095A4EC 8D086FA8 */ lw $t0, 0x6FA8($t0) ## 80166FA8 -/* 0B230 8095A4F0 00817024 */ and $t6, $a0, $at +/* 0B230 8095A4F0 00817024 */ and $t6, $a0, $at /* 0B234 8095A4F4 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 0B238 8095A4F8 01C84821 */ addu $t1, $t6, $t0 -/* 0B23C 8095A4FC 01215021 */ addu $t2, $t1, $at +/* 0B238 8095A4F8 01C84821 */ addu $t1, $t6, $t0 +/* 0B23C 8095A4FC 01215021 */ addu $t2, $t1, $at /* 0B240 8095A500 AC4A0004 */ sw $t2, 0x0004($v0) ## 00000004 /* 0B244 8095A504 8E2202D0 */ lw $v0, 0x02D0($s1) ## 000002D0 /* 0B248 8095A508 244B0008 */ addiu $t3, $v0, 0x0008 ## $t3 = 00000008 @@ -237,11 +237,11 @@ glabel func_8095A188 /* 0B260 8095A520 31AF00FF */ andi $t7, $t5, 0x00FF ## $t7 = 00000000 /* 0B264 8095A524 860D0034 */ lh $t5, 0x0034($s0) ## 0000008C /* 0B268 8095A528 312A00FF */ andi $t2, $t1, 0x00FF ## $t2 = 00000008 -/* 0B26C 8095A52C 00197600 */ sll $t6, $t9, 24 +/* 0B26C 8095A52C 00197600 */ sll $t6, $t9, 24 /* 0B270 8095A530 01EE4025 */ or $t0, $t7, $t6 ## $t0 = 00000000 -/* 0B274 8095A534 000A5C00 */ sll $t3, $t2, 16 +/* 0B274 8095A534 000A5C00 */ sll $t3, $t2, 16 /* 0B278 8095A538 31B800FF */ andi $t8, $t5, 0x00FF ## $t8 = 00000000 -/* 0B27C 8095A53C 0018CA00 */ sll $t9, $t8, 8 +/* 0B27C 8095A53C 0018CA00 */ sll $t9, $t8, 8 /* 0B280 8095A540 010B6025 */ or $t4, $t0, $t3 ## $t4 = 00000008 /* 0B284 8095A544 01997825 */ or $t7, $t4, $t9 ## $t7 = 00000008 /* 0B288 8095A548 AC4F0004 */ sw $t7, 0x0004($v0) ## 00000004 @@ -260,11 +260,11 @@ glabel func_8095A188 /* 0B2BC 8095A57C 314800FF */ andi $t0, $t2, 0x00FF ## $t0 = 00000008 /* 0B2C0 8095A580 860A003C */ lh $t2, 0x003C($s0) ## 00000094 /* 0B2C4 8095A584 332F00FF */ andi $t7, $t9, 0x00FF ## $t7 = 00000000 -/* 0B2C8 8095A588 000DC600 */ sll $t8, $t5, 24 +/* 0B2C8 8095A588 000DC600 */ sll $t8, $t5, 24 /* 0B2CC 8095A58C 01186025 */ or $t4, $t0, $t8 ## $t4 = 00000008 -/* 0B2D0 8095A590 000F7400 */ sll $t6, $t7, 16 +/* 0B2D0 8095A590 000F7400 */ sll $t6, $t7, 16 /* 0B2D4 8095A594 314B00FF */ andi $t3, $t2, 0x00FF ## $t3 = 00000008 -/* 0B2D8 8095A598 000B6A00 */ sll $t5, $t3, 8 +/* 0B2D8 8095A598 000B6A00 */ sll $t5, $t3, 8 /* 0B2DC 8095A59C 018E4825 */ or $t1, $t4, $t6 ## $t1 = 00000008 /* 0B2E0 8095A5A0 012D4025 */ or $t0, $t1, $t5 ## $t0 = 00000008 /* 0B2E4 8095A5A4 AC480004 */ sw $t0, 0x0004($v0) ## 00000004 @@ -272,51 +272,51 @@ glabel func_8095A188 /* 0B2EC 8095A5AC 24580008 */ addiu $t8, $v0, 0x0008 ## $t8 = 00000008 /* 0B2F0 8095A5B0 AE3802D0 */ sw $t8, 0x02D0($s1) ## 000002D0 /* 0B2F4 8095A5B4 AC550000 */ sw $s5, 0x0000($v0) ## 00000000 -/* 0B2F8 8095A5B8 8FB90050 */ lw $t9, 0x0050($sp) +/* 0B2F8 8095A5B8 8FB90050 */ lw $t9, 0x0050($sp) /* 0B2FC 8095A5BC AC590004 */ sw $t9, 0x0004($v0) ## 00000004 .L8095A5C0: /* 0B300 8095A5C0 26730001 */ addiu $s3, $s3, 0x0001 ## $s3 = 00000001 -/* 0B304 8095A5C4 00139C00 */ sll $s3, $s3, 16 -/* 0B308 8095A5C8 00139C03 */ sra $s3, $s3, 16 -/* 0B30C 8095A5CC 2A610190 */ slti $at, $s3, 0x0190 -/* 0B310 8095A5D0 1420FF71 */ bne $at, $zero, .L8095A398 +/* 0B304 8095A5C4 00139C00 */ sll $s3, $s3, 16 +/* 0B308 8095A5C8 00139C03 */ sra $s3, $s3, 16 +/* 0B30C 8095A5CC 2A610190 */ slti $at, $s3, 0x0190 +/* 0B310 8095A5D0 1420FF71 */ bne $at, $zero, .L8095A398 /* 0B314 8095A5D4 26100058 */ addiu $s0, $s0, 0x0058 ## $s0 = 000000B0 /* 0B318 8095A5D8 0000A025 */ or $s4, $zero, $zero ## $s4 = 00000000 -/* 0B31C 8095A5DC 8FB00138 */ lw $s0, 0x0138($sp) +/* 0B31C 8095A5DC 8FB00138 */ lw $s0, 0x0138($sp) /* 0B320 8095A5E0 00009825 */ or $s3, $zero, $zero ## $s3 = 00000000 .L8095A5E4: /* 0B324 8095A5E4 920F0024 */ lbu $t7, 0x0024($s0) ## 000000D4 /* 0B328 8095A5E8 24010006 */ addiu $at, $zero, 0x0006 ## $at = 00000006 /* 0B32C 8095A5EC 3C120601 */ lui $s2, 0x0601 ## $s2 = 06010000 -/* 0B330 8095A5F0 55E10072 */ bnel $t7, $at, .L8095A7BC +/* 0B330 8095A5F0 55E10072 */ bnel $t7, $at, .L8095A7BC /* 0B334 8095A5F4 26730001 */ addiu $s3, $s3, 0x0001 ## $s3 = 00000001 -/* 0B338 8095A5F8 16800028 */ bne $s4, $zero, .L8095A69C +/* 0B338 8095A5F8 16800028 */ bne $s4, $zero, .L8095A69C /* 0B33C 8095A5FC 26529468 */ addiu $s2, $s2, 0x9468 ## $s2 = 06009468 /* 0B340 8095A600 3C020405 */ lui $v0, 0x0405 ## $v0 = 04050000 /* 0B344 8095A604 24425DB0 */ addiu $v0, $v0, 0x5DB0 ## $v0 = 04055DB0 -/* 0B348 8095A608 00027100 */ sll $t6, $v0, 4 -/* 0B34C 8095A60C 000E5702 */ srl $t2, $t6, 28 +/* 0B348 8095A608 00027100 */ sll $t6, $v0, 4 +/* 0B34C 8095A60C 000E5702 */ srl $t2, $t6, 28 /* 0B350 8095A610 3C098016 */ lui $t1, 0x8016 ## $t1 = 80160000 /* 0B354 8095A614 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 /* 0B358 8095A618 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF /* 0B35C 8095A61C 25296FA8 */ addiu $t1, $t1, 0x6FA8 ## $t1 = 80166FA8 -/* 0B360 8095A620 000A5880 */ sll $t3, $t2, 2 +/* 0B360 8095A620 000A5880 */ sll $t3, $t2, 2 /* 0B364 8095A624 8EC40000 */ lw $a0, 0x0000($s6) ## 00000000 /* 0B368 8095A628 3C0C0601 */ lui $t4, 0x0601 ## $t4 = 06010000 /* 0B36C 8095A62C 258C9430 */ addiu $t4, $t4, 0x9430 ## $t4 = 06009430 -/* 0B370 8095A630 01696821 */ addu $t5, $t3, $t1 -/* 0B374 8095A634 00414024 */ and $t0, $v0, $at -/* 0B378 8095A638 AFA8004C */ sw $t0, 0x004C($sp) -/* 0B37C 8095A63C AFAD0050 */ sw $t5, 0x0050($sp) -/* 0B380 8095A640 0C024F61 */ jal func_80093D84 -/* 0B384 8095A644 AFAC0058 */ sw $t4, 0x0058($sp) +/* 0B370 8095A630 01696821 */ addu $t5, $t3, $t1 +/* 0B374 8095A634 00414024 */ and $t0, $v0, $at +/* 0B378 8095A638 AFA8004C */ sw $t0, 0x004C($sp) +/* 0B37C 8095A63C AFAD0050 */ sw $t5, 0x0050($sp) +/* 0B380 8095A640 0C024F61 */ jal func_80093D84 +/* 0B384 8095A644 AFAC0058 */ sw $t4, 0x0058($sp) /* 0B388 8095A648 8E2202D0 */ lw $v0, 0x02D0($s1) ## 000002D0 /* 0B38C 8095A64C 3C0CDB06 */ lui $t4, 0xDB06 ## $t4 = DB060000 /* 0B390 8095A650 358C0020 */ ori $t4, $t4, 0x0020 ## $t4 = DB060020 /* 0B394 8095A654 24580008 */ addiu $t8, $v0, 0x0008 ## $t8 = 00000008 /* 0B398 8095A658 AE3802D0 */ sw $t8, 0x02D0($s1) ## 000002D0 /* 0B39C 8095A65C AC550000 */ sw $s5, 0x0000($v0) ## 00000000 -/* 0B3A0 8095A660 8FB90058 */ lw $t9, 0x0058($sp) +/* 0B3A0 8095A660 8FB90058 */ lw $t9, 0x0058($sp) /* 0B3A4 8095A664 3C018000 */ lui $at, 0x8000 ## $at = 80000000 /* 0B3A8 8095A668 26940001 */ addiu $s4, $s4, 0x0001 ## $s4 = 00000001 /* 0B3AC 8095A66C AC590004 */ sw $t9, 0x0004($v0) ## 00000004 @@ -325,11 +325,11 @@ glabel func_8095A188 /* 0B3B8 8095A678 244F0008 */ addiu $t7, $v0, 0x0008 ## $t7 = 00000008 /* 0B3BC 8095A67C AE2F02D0 */ sw $t7, 0x02D0($s1) ## 000002D0 /* 0B3C0 8095A680 AC4C0000 */ sw $t4, 0x0000($v0) ## 00000000 -/* 0B3C4 8095A684 8FAE0050 */ lw $t6, 0x0050($sp) -/* 0B3C8 8095A688 8FAB004C */ lw $t3, 0x004C($sp) +/* 0B3C4 8095A684 8FAE0050 */ lw $t6, 0x0050($sp) +/* 0B3C8 8095A688 8FAB004C */ lw $t3, 0x004C($sp) /* 0B3CC 8095A68C 8DCA0000 */ lw $t2, 0x0000($t6) ## 00000000 -/* 0B3D0 8095A690 014B4821 */ addu $t1, $t2, $t3 -/* 0B3D4 8095A694 01216821 */ addu $t5, $t1, $at +/* 0B3D0 8095A690 014B4821 */ addu $t1, $t2, $t3 +/* 0B3D4 8095A694 01216821 */ addu $t5, $t1, $at /* 0B3D8 8095A698 AC4D0004 */ sw $t5, 0x0004($v0) ## 00000004 .L8095A69C: /* 0B3DC 8095A69C 8E2202D0 */ lw $v0, 0x02D0($s1) ## 000002D0 @@ -359,28 +359,28 @@ glabel func_8095A188 /* 0B43C 8095A6FC AC4D0004 */ sw $t5, 0x0004($v0) ## 00000004 /* 0B440 8095A700 8E060008 */ lw $a2, 0x0008($s0) ## 000000B8 /* 0B444 8095A704 C60E0004 */ lwc1 $f14, 0x0004($s0) ## 000000B4 -/* 0B448 8095A708 0C034261 */ jal Matrix_Translate +/* 0B448 8095A708 0C034261 */ jal Matrix_Translate /* 0B44C 8095A70C C60C0000 */ lwc1 $f12, 0x0000($s0) ## 000000B0 /* 0B450 8095A710 86080028 */ lh $t0, 0x0028($s0) ## 000000D8 /* 0B454 8095A714 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 /* 0B458 8095A718 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 -/* 0B45C 8095A71C 15010005 */ bne $t0, $at, .L8095A734 +/* 0B45C 8095A71C 15010005 */ bne $t0, $at, .L8095A734 /* 0B460 8095A720 3C018096 */ lui $at, %hi(D_8095C8CC) ## $at = 80960000 -/* 0B464 8095A724 0C0342DC */ jal Matrix_RotateX -/* 0B468 8095A728 C42CC8CC */ lwc1 $f12, %lo(D_8095C8CC)($at) -/* 0B46C 8095A72C 10000006 */ beq $zero, $zero, .L8095A748 +/* 0B464 8095A724 0C0342DC */ jal Matrix_RotateX +/* 0B468 8095A728 C42CC8CC */ lwc1 $f12, %lo(D_8095C8CC)($at) +/* 0B46C 8095A72C 10000006 */ beq $zero, $zero, .L8095A748 /* 0B470 8095A730 C60C0040 */ lwc1 $f12, 0x0040($s0) ## 000000F0 .L8095A734: /* 0B474 8095A734 3C010001 */ lui $at, 0x0001 ## $at = 00010000 /* 0B478 8095A738 34211DA0 */ ori $at, $at, 0x1DA0 ## $at = 00011DA0 -/* 0B47C 8095A73C 0C0347F5 */ jal func_800D1FD4 -/* 0B480 8095A740 02C12021 */ addu $a0, $s6, $at +/* 0B47C 8095A73C 0C0347F5 */ jal func_800D1FD4 +/* 0B480 8095A740 02C12021 */ addu $a0, $s6, $at /* 0B484 8095A744 C60C0040 */ lwc1 $f12, 0x0040($s0) ## 000000F0 .L8095A748: -/* 0B488 8095A748 4406A000 */ mfc1 $a2, $f20 +/* 0B488 8095A748 4406A000 */ mfc1 $a2, $f20 /* 0B48C 8095A74C 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 0B490 8095A750 0C0342A3 */ jal Matrix_Scale -/* 0B494 8095A754 46006386 */ mov.s $f14, $f12 +/* 0B490 8095A750 0C0342A3 */ jal Matrix_Scale +/* 0B494 8095A754 46006386 */ mov.s $f14, $f12 /* 0B498 8095A758 8E2202D0 */ lw $v0, 0x02D0($s1) ## 000002D0 /* 0B49C 8095A75C 3C0FDA38 */ lui $t7, 0xDA38 ## $t7 = DA380000 /* 0B4A0 8095A760 35EF0003 */ ori $t7, $t7, 0x0003 ## $t7 = DA380003 @@ -396,9 +396,9 @@ glabel func_8095A188 /* 0B4C8 8095A788 AC4F0000 */ sw $t7, 0x0000($v0) ## 00000000 /* 0B4CC 8095A78C 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 0B4D0 8095A790 240613BC */ addiu $a2, $zero, 0x13BC ## $a2 = 000013BC -/* 0B4D4 8095A794 0C0346A2 */ jal Matrix_NewMtx -/* 0B4D8 8095A798 AFA200D0 */ sw $v0, 0x00D0($sp) -/* 0B4DC 8095A79C 8FA300D0 */ lw $v1, 0x00D0($sp) +/* 0B4D4 8095A794 0C0346A2 */ jal Matrix_NewMtx +/* 0B4D8 8095A798 AFA200D0 */ sw $v0, 0x00D0($sp) +/* 0B4DC 8095A79C 8FA300D0 */ lw $v1, 0x00D0($sp) /* 0B4E0 8095A7A0 AC620004 */ sw $v0, 0x0004($v1) ## 00000004 /* 0B4E4 8095A7A4 8E2202D0 */ lw $v0, 0x02D0($s1) ## 000002D0 /* 0B4E8 8095A7A8 244C0008 */ addiu $t4, $v0, 0x0008 ## $t4 = 00000008 @@ -407,26 +407,26 @@ glabel func_8095A188 /* 0B4F4 8095A7B4 AC550000 */ sw $s5, 0x0000($v0) ## 00000000 /* 0B4F8 8095A7B8 26730001 */ addiu $s3, $s3, 0x0001 ## $s3 = 00000002 .L8095A7BC: -/* 0B4FC 8095A7BC 00139C00 */ sll $s3, $s3, 16 -/* 0B500 8095A7C0 00139C03 */ sra $s3, $s3, 16 -/* 0B504 8095A7C4 2A610190 */ slti $at, $s3, 0x0190 -/* 0B508 8095A7C8 1420FF86 */ bne $at, $zero, .L8095A5E4 +/* 0B4FC 8095A7BC 00139C00 */ sll $s3, $s3, 16 +/* 0B500 8095A7C0 00139C03 */ sra $s3, $s3, 16 +/* 0B504 8095A7C4 2A610190 */ slti $at, $s3, 0x0190 +/* 0B508 8095A7C8 1420FF86 */ bne $at, $zero, .L8095A5E4 /* 0B50C 8095A7CC 26100058 */ addiu $s0, $s0, 0x0058 ## $s0 = 00000108 /* 0B510 8095A7D0 0000A025 */ or $s4, $zero, $zero ## $s4 = 00000000 -/* 0B514 8095A7D4 8FB00138 */ lw $s0, 0x0138($sp) +/* 0B514 8095A7D4 8FB00138 */ lw $s0, 0x0138($sp) /* 0B518 8095A7D8 00009825 */ or $s3, $zero, $zero ## $s3 = 00000000 .L8095A7DC: /* 0B51C 8095A7DC 920E0024 */ lbu $t6, 0x0024($s0) ## 0000012C /* 0B520 8095A7E0 24010007 */ addiu $at, $zero, 0x0007 ## $at = 00000007 -/* 0B524 8095A7E4 55C1004A */ bnel $t6, $at, .L8095A910 +/* 0B524 8095A7E4 55C1004A */ bnel $t6, $at, .L8095A910 /* 0B528 8095A7E8 26730001 */ addiu $s3, $s3, 0x0001 ## $s3 = 00000001 -/* 0B52C 8095A7EC 16800015 */ bne $s4, $zero, .L8095A844 +/* 0B52C 8095A7EC 16800015 */ bne $s4, $zero, .L8095A844 /* 0B530 8095A7F0 8E120054 */ lw $s2, 0x0054($s0) ## 0000015C /* 0B534 8095A7F4 3C0A0601 */ lui $t2, 0x0601 ## $t2 = 06010000 /* 0B538 8095A7F8 254A28B8 */ addiu $t2, $t2, 0x28B8 ## $t2 = 060128B8 /* 0B53C 8095A7FC 8EC40000 */ lw $a0, 0x0000($s6) ## 00000000 -/* 0B540 8095A800 0C024F46 */ jal func_80093D18 -/* 0B544 8095A804 AFAA0058 */ sw $t2, 0x0058($sp) +/* 0B540 8095A800 0C024F46 */ jal func_80093D18 +/* 0B544 8095A804 AFAA0058 */ sw $t2, 0x0058($sp) /* 0B548 8095A808 8E2202C0 */ lw $v0, 0x02C0($s1) ## 000002C0 /* 0B54C 8095A80C 26940001 */ addiu $s4, $s4, 0x0001 ## $s4 = 00000001 /* 0B550 8095A810 329400FF */ andi $s4, $s4, 0x00FF ## $s4 = 00000001 @@ -440,43 +440,43 @@ glabel func_8095A188 /* 0B570 8095A830 24480008 */ addiu $t0, $v0, 0x0008 ## $t0 = 00000008 /* 0B574 8095A834 AE2802C0 */ sw $t0, 0x02C0($s1) ## 000002C0 /* 0B578 8095A838 AC550000 */ sw $s5, 0x0000($v0) ## 00000000 -/* 0B57C 8095A83C 8FB80058 */ lw $t8, 0x0058($sp) +/* 0B57C 8095A83C 8FB80058 */ lw $t8, 0x0058($sp) /* 0B580 8095A840 AC580004 */ sw $t8, 0x0004($v0) ## 00000004 .L8095A844: /* 0B584 8095A844 86190028 */ lh $t9, 0x0028($s0) ## 00000130 -/* 0B588 8095A848 8FA40134 */ lw $a0, 0x0134($sp) +/* 0B588 8095A848 8FA40134 */ lw $a0, 0x0134($sp) /* 0B58C 8095A84C 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 0B590 8095A850 1721000F */ bne $t9, $at, .L8095A890 +/* 0B590 8095A850 1721000F */ bne $t9, $at, .L8095A890 /* 0B594 8095A854 2484005C */ addiu $a0, $a0, 0x005C ## $a0 = 0000005C /* 0B598 8095A858 02002825 */ or $a1, $s0, $zero ## $a1 = 00000108 /* 0B59C 8095A85C 0C01E00A */ jal Math_Vec3f_DistXZ - -/* 0B5A0 8095A860 AFA40058 */ sw $a0, 0x0058($sp) -/* 0B5A4 8095A864 8FA40058 */ lw $a0, 0x0058($sp) -/* 0B5A8 8095A868 E7A0005C */ swc1 $f0, 0x005C($sp) + +/* 0B5A0 8095A860 AFA40058 */ sw $a0, 0x0058($sp) +/* 0B5A4 8095A864 8FA40058 */ lw $a0, 0x0058($sp) +/* 0B5A8 8095A868 E7A0005C */ swc1 $f0, 0x005C($sp) /* 0B5AC 8095A86C 0C01E00A */ jal Math_Vec3f_DistXZ - + /* 0B5B0 8095A870 26450024 */ addiu $a1, $s2, 0x0024 ## $a1 = 0600948C -/* 0B5B4 8095A874 C7A4005C */ lwc1 $f4, 0x005C($sp) +/* 0B5B4 8095A874 C7A4005C */ lwc1 $f4, 0x005C($sp) /* 0B5B8 8095A878 3C014120 */ lui $at, 0x4120 ## $at = 41200000 /* 0B5BC 8095A87C 44814000 */ mtc1 $at, $f8 ## $f8 = 10.00 -/* 0B5C0 8095A880 46002181 */ sub.s $f6, $f4, $f0 -/* 0B5C4 8095A884 4608303C */ c.lt.s $f6, $f8 +/* 0B5C0 8095A880 46002181 */ sub.s $f6, $f4, $f0 +/* 0B5C4 8095A884 4608303C */ c.lt.s $f6, $f8 /* 0B5C8 8095A888 00000000 */ nop -/* 0B5CC 8095A88C 4500001F */ bc1f .L8095A90C +/* 0B5CC 8095A88C 4500001F */ bc1f .L8095A90C .L8095A890: /* 0B5D0 8095A890 3C120601 */ lui $s2, 0x0601 ## $s2 = 06010000 /* 0B5D4 8095A894 26522948 */ addiu $s2, $s2, 0x2948 ## $s2 = 06012948 /* 0B5D8 8095A898 C60C0000 */ lwc1 $f12, 0x0000($s0) ## 00000108 /* 0B5DC 8095A89C C60E0004 */ lwc1 $f14, 0x0004($s0) ## 0000010C /* 0B5E0 8095A8A0 8E060008 */ lw $a2, 0x0008($s0) ## 00000110 -/* 0B5E4 8095A8A4 0C034261 */ jal Matrix_Translate +/* 0B5E4 8095A8A4 0C034261 */ jal Matrix_Translate /* 0B5E8 8095A8A8 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 /* 0B5EC 8095A8AC C60C0040 */ lwc1 $f12, 0x0040($s0) ## 00000148 /* 0B5F0 8095A8B0 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 0B5F4 8095A8B4 44066000 */ mfc1 $a2, $f12 -/* 0B5F8 8095A8B8 0C0342A3 */ jal Matrix_Scale -/* 0B5FC 8095A8BC 46006386 */ mov.s $f14, $f12 +/* 0B5F4 8095A8B4 44066000 */ mfc1 $a2, $f12 +/* 0B5F8 8095A8B8 0C0342A3 */ jal Matrix_Scale +/* 0B5FC 8095A8BC 46006386 */ mov.s $f14, $f12 /* 0B600 8095A8C0 8E2202C0 */ lw $v0, 0x02C0($s1) ## 000002C0 /* 0B604 8095A8C4 3C0CDA38 */ lui $t4, 0xDA38 ## $t4 = DA380000 /* 0B608 8095A8C8 358C0003 */ ori $t4, $t4, 0x0003 ## $t4 = DA380003 @@ -487,9 +487,9 @@ glabel func_8095A188 /* 0B61C 8095A8DC 24A5C4D0 */ addiu $a1, $a1, %lo(D_8095C4D0) ## $a1 = 8095C4D0 /* 0B620 8095A8E0 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 0B624 8095A8E4 240613D8 */ addiu $a2, $zero, 0x13D8 ## $a2 = 000013D8 -/* 0B628 8095A8E8 0C0346A2 */ jal Matrix_NewMtx -/* 0B62C 8095A8EC AFA200BC */ sw $v0, 0x00BC($sp) -/* 0B630 8095A8F0 8FA300BC */ lw $v1, 0x00BC($sp) +/* 0B628 8095A8E8 0C0346A2 */ jal Matrix_NewMtx +/* 0B62C 8095A8EC AFA200BC */ sw $v0, 0x00BC($sp) +/* 0B630 8095A8F0 8FA300BC */ lw $v1, 0x00BC($sp) /* 0B634 8095A8F4 AC620004 */ sw $v0, 0x0004($v1) ## 00000004 /* 0B638 8095A8F8 8E2202C0 */ lw $v0, 0x02C0($s1) ## 000002C0 /* 0B63C 8095A8FC 244E0008 */ addiu $t6, $v0, 0x0008 ## $t6 = 00000008 @@ -499,34 +499,34 @@ glabel func_8095A188 .L8095A90C: /* 0B64C 8095A90C 26730001 */ addiu $s3, $s3, 0x0001 ## $s3 = 00000002 .L8095A910: -/* 0B650 8095A910 00139C00 */ sll $s3, $s3, 16 -/* 0B654 8095A914 00139C03 */ sra $s3, $s3, 16 -/* 0B658 8095A918 2A610190 */ slti $at, $s3, 0x0190 -/* 0B65C 8095A91C 1420FFAF */ bne $at, $zero, .L8095A7DC +/* 0B650 8095A910 00139C00 */ sll $s3, $s3, 16 +/* 0B654 8095A914 00139C03 */ sra $s3, $s3, 16 +/* 0B658 8095A918 2A610190 */ slti $at, $s3, 0x0190 +/* 0B65C 8095A91C 1420FFAF */ bne $at, $zero, .L8095A7DC /* 0B660 8095A920 26100058 */ addiu $s0, $s0, 0x0058 ## $s0 = 00000160 /* 0B664 8095A924 0000A025 */ or $s4, $zero, $zero ## $s4 = 00000000 -/* 0B668 8095A928 8FB00138 */ lw $s0, 0x0138($sp) +/* 0B668 8095A928 8FB00138 */ lw $s0, 0x0138($sp) /* 0B66C 8095A92C 00009825 */ or $s3, $zero, $zero ## $s3 = 00000000 .L8095A930: /* 0B670 8095A930 920A0024 */ lbu $t2, 0x0024($s0) ## 00000184 /* 0B674 8095A934 24010008 */ addiu $at, $zero, 0x0008 ## $at = 00000008 /* 0B678 8095A938 3C120601 */ lui $s2, 0x0601 ## $s2 = 06010000 -/* 0B67C 8095A93C 55410085 */ bnel $t2, $at, .L8095AB54 +/* 0B67C 8095A93C 55410085 */ bnel $t2, $at, .L8095AB54 /* 0B680 8095A940 26730001 */ addiu $s3, $s3, 0x0001 ## $s3 = 00000001 -/* 0B684 8095A944 1680000E */ bne $s4, $zero, .L8095A980 +/* 0B684 8095A944 1680000E */ bne $s4, $zero, .L8095A980 /* 0B688 8095A948 26522C50 */ addiu $s2, $s2, 0x2C50 ## $s2 = 06012C50 /* 0B68C 8095A94C 3C0B0601 */ lui $t3, 0x0601 ## $t3 = 06010000 /* 0B690 8095A950 256B2BA0 */ addiu $t3, $t3, 0x2BA0 ## $t3 = 06012BA0 /* 0B694 8095A954 8EC40000 */ lw $a0, 0x0000($s6) ## 00000000 -/* 0B698 8095A958 0C024F46 */ jal func_80093D18 -/* 0B69C 8095A95C AFAB0058 */ sw $t3, 0x0058($sp) +/* 0B698 8095A958 0C024F46 */ jal func_80093D18 +/* 0B69C 8095A95C AFAB0058 */ sw $t3, 0x0058($sp) /* 0B6A0 8095A960 8E2202C0 */ lw $v0, 0x02C0($s1) ## 000002C0 /* 0B6A4 8095A964 26940001 */ addiu $s4, $s4, 0x0001 ## $s4 = 00000001 /* 0B6A8 8095A968 329400FF */ andi $s4, $s4, 0x00FF ## $s4 = 00000001 /* 0B6AC 8095A96C 24490008 */ addiu $t1, $v0, 0x0008 ## $t1 = 00000008 /* 0B6B0 8095A970 AE2902C0 */ sw $t1, 0x02C0($s1) ## 000002C0 /* 0B6B4 8095A974 AC550000 */ sw $s5, 0x0000($v0) ## 00000000 -/* 0B6B8 8095A978 8FAD0058 */ lw $t5, 0x0058($sp) +/* 0B6B8 8095A978 8FAD0058 */ lw $t5, 0x0058($sp) /* 0B6BC 8095A97C AC4D0004 */ sw $t5, 0x0004($v0) ## 00000004 .L8095A980: /* 0B6C0 8095A980 8E2202C0 */ lw $v0, 0x02C0($s1) ## 000002C0 @@ -555,77 +555,77 @@ glabel func_8095A188 /* 0B71C 8095A9DC 316900FF */ andi $t1, $t3, 0x00FF ## $t1 = 00000000 /* 0B720 8095A9E0 860B0034 */ lh $t3, 0x0034($s0) ## 00000194 /* 0B724 8095A9E4 31EC00FF */ andi $t4, $t7, 0x00FF ## $t4 = 00000000 -/* 0B728 8095A9E8 0008C600 */ sll $t8, $t0, 24 +/* 0B728 8095A9E8 0008C600 */ sll $t8, $t0, 24 /* 0B72C 8095A9EC 0138C825 */ or $t9, $t1, $t8 ## $t9 = 00000008 -/* 0B730 8095A9F0 000C7400 */ sll $t6, $t4, 16 +/* 0B730 8095A9F0 000C7400 */ sll $t6, $t4, 16 /* 0B734 8095A9F4 316D00FF */ andi $t5, $t3, 0x00FF ## $t5 = 00000000 -/* 0B738 8095A9F8 000D4200 */ sll $t0, $t5, 8 +/* 0B738 8095A9F8 000D4200 */ sll $t0, $t5, 8 /* 0B73C 8095A9FC 032E5025 */ or $t2, $t9, $t6 ## $t2 = 00000008 /* 0B740 8095AA00 01484825 */ or $t1, $t2, $t0 ## $t1 = 00000008 /* 0B744 8095AA04 AC490004 */ sw $t1, 0x0004($v0) ## 00000004 /* 0B748 8095AA08 8E060008 */ lw $a2, 0x0008($s0) ## 00000168 /* 0B74C 8095AA0C C60E0004 */ lwc1 $f14, 0x0004($s0) ## 00000164 -/* 0B750 8095AA10 0C034261 */ jal Matrix_Translate +/* 0B750 8095AA10 0C034261 */ jal Matrix_Translate /* 0B754 8095AA14 C60C0000 */ lwc1 $f12, 0x0000($s0) ## 00000160 /* 0B758 8095AA18 8604002A */ lh $a0, 0x002A($s0) ## 0000018A /* 0B75C 8095AA1C 8605002C */ lh $a1, 0x002C($s0) ## 0000018C /* 0B760 8095AA20 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 0B764 8095AA24 0C034421 */ jal Matrix_RotateXYZ +/* 0B764 8095AA24 0C034421 */ jal Matrix_RotateZYX /* 0B768 8095AA28 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 /* 0B76C 8095AA2C C60C0040 */ lwc1 $f12, 0x0040($s0) ## 000001A0 /* 0B770 8095AA30 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 0B774 8095AA34 44066000 */ mfc1 $a2, $f12 -/* 0B778 8095AA38 0C0342A3 */ jal Matrix_Scale -/* 0B77C 8095AA3C 46006386 */ mov.s $f14, $f12 +/* 0B774 8095AA34 44066000 */ mfc1 $a2, $f12 +/* 0B778 8095AA38 0C0342A3 */ jal Matrix_Scale +/* 0B77C 8095AA3C 46006386 */ mov.s $f14, $f12 /* 0B780 8095AA40 3C018096 */ lui $at, %hi(D_8095C8D0) ## $at = 80960000 -/* 0B784 8095AA44 C430C8D0 */ lwc1 $f16, %lo(D_8095C8D0)($at) +/* 0B784 8095AA44 C430C8D0 */ lwc1 $f16, %lo(D_8095C8D0)($at) /* 0B788 8095AA48 C60A0048 */ lwc1 $f10, 0x0048($s0) ## 000001A8 /* 0B78C 8095AA4C 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 -/* 0B790 8095AA50 46105302 */ mul.s $f12, $f10, $f16 -/* 0B794 8095AA54 0C0342DC */ jal Matrix_RotateX +/* 0B790 8095AA50 46105302 */ mul.s $f12, $f10, $f16 +/* 0B794 8095AA54 0C0342DC */ jal Matrix_RotateX /* 0B798 8095AA58 00000000 */ nop /* 0B79C 8095AA5C 3C018096 */ lui $at, %hi(D_8095C8D4) ## $at = 80960000 -/* 0B7A0 8095AA60 C424C8D4 */ lwc1 $f4, %lo(D_8095C8D4)($at) +/* 0B7A0 8095AA60 C424C8D4 */ lwc1 $f4, %lo(D_8095C8D4)($at) /* 0B7A4 8095AA64 C6120048 */ lwc1 $f18, 0x0048($s0) ## 000001A8 /* 0B7A8 8095AA68 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 -/* 0B7AC 8095AA6C 46049302 */ mul.s $f12, $f18, $f4 -/* 0B7B0 8095AA70 0C034348 */ jal Matrix_RotateY +/* 0B7AC 8095AA6C 46049302 */ mul.s $f12, $f18, $f4 +/* 0B7B0 8095AA70 0C034348 */ jal Matrix_RotateY /* 0B7B4 8095AA74 00000000 */ nop /* 0B7B8 8095AA78 3C018096 */ lui $at, %hi(D_8095C8D8) ## $at = 80960000 -/* 0B7BC 8095AA7C C428C8D8 */ lwc1 $f8, %lo(D_8095C8D8)($at) +/* 0B7BC 8095AA7C C428C8D8 */ lwc1 $f8, %lo(D_8095C8D8)($at) /* 0B7C0 8095AA80 C6060048 */ lwc1 $f6, 0x0048($s0) ## 000001A8 /* 0B7C4 8095AA84 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 -/* 0B7C8 8095AA88 46083302 */ mul.s $f12, $f6, $f8 -/* 0B7CC 8095AA8C 0C0343B5 */ jal Matrix_RotateZ +/* 0B7C8 8095AA88 46083302 */ mul.s $f12, $f6, $f8 +/* 0B7CC 8095AA8C 0C0343B5 */ jal Matrix_RotateZ /* 0B7D0 8095AA90 00000000 */ nop /* 0B7D4 8095AA94 C6000044 */ lwc1 $f0, 0x0044($s0) ## 000001A4 /* 0B7D8 8095AA98 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 0B7DC 8095AA9C 4600A301 */ sub.s $f12, $f20, $f0 -/* 0B7E0 8095AAA0 46140380 */ add.s $f14, $f0, $f20 -/* 0B7E4 8095AAA4 44066000 */ mfc1 $a2, $f12 -/* 0B7E8 8095AAA8 0C0342A3 */ jal Matrix_Scale +/* 0B7DC 8095AA9C 4600A301 */ sub.s $f12, $f20, $f0 +/* 0B7E0 8095AAA0 46140380 */ add.s $f14, $f0, $f20 +/* 0B7E4 8095AAA4 44066000 */ mfc1 $a2, $f12 +/* 0B7E8 8095AAA8 0C0342A3 */ jal Matrix_Scale /* 0B7EC 8095AAAC 00000000 */ nop /* 0B7F0 8095AAB0 3C018096 */ lui $at, %hi(D_8095C8DC) ## $at = 80960000 -/* 0B7F4 8095AAB4 C430C8DC */ lwc1 $f16, %lo(D_8095C8DC)($at) +/* 0B7F4 8095AAB4 C430C8DC */ lwc1 $f16, %lo(D_8095C8DC)($at) /* 0B7F8 8095AAB8 C60A0048 */ lwc1 $f10, 0x0048($s0) ## 000001A8 /* 0B7FC 8095AABC 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 -/* 0B800 8095AAC0 46105302 */ mul.s $f12, $f10, $f16 -/* 0B804 8095AAC4 0C0343B5 */ jal Matrix_RotateZ -/* 0B808 8095AAC8 46006307 */ neg.s $f12, $f12 +/* 0B800 8095AAC0 46105302 */ mul.s $f12, $f10, $f16 +/* 0B804 8095AAC4 0C0343B5 */ jal Matrix_RotateZ +/* 0B808 8095AAC8 46006307 */ neg.s $f12, $f12 /* 0B80C 8095AACC 3C018096 */ lui $at, %hi(D_8095C8E0) ## $at = 80960000 -/* 0B810 8095AAD0 C424C8E0 */ lwc1 $f4, %lo(D_8095C8E0)($at) +/* 0B810 8095AAD0 C424C8E0 */ lwc1 $f4, %lo(D_8095C8E0)($at) /* 0B814 8095AAD4 C6120048 */ lwc1 $f18, 0x0048($s0) ## 000001A8 /* 0B818 8095AAD8 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 -/* 0B81C 8095AADC 46049302 */ mul.s $f12, $f18, $f4 -/* 0B820 8095AAE0 0C034348 */ jal Matrix_RotateY -/* 0B824 8095AAE4 46006307 */ neg.s $f12, $f12 +/* 0B81C 8095AADC 46049302 */ mul.s $f12, $f18, $f4 +/* 0B820 8095AAE0 0C034348 */ jal Matrix_RotateY +/* 0B824 8095AAE4 46006307 */ neg.s $f12, $f12 /* 0B828 8095AAE8 3C018096 */ lui $at, %hi(D_8095C8E4) ## $at = 80960000 -/* 0B82C 8095AAEC C428C8E4 */ lwc1 $f8, %lo(D_8095C8E4)($at) +/* 0B82C 8095AAEC C428C8E4 */ lwc1 $f8, %lo(D_8095C8E4)($at) /* 0B830 8095AAF0 C6060048 */ lwc1 $f6, 0x0048($s0) ## 000001A8 /* 0B834 8095AAF4 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 -/* 0B838 8095AAF8 46083302 */ mul.s $f12, $f6, $f8 -/* 0B83C 8095AAFC 0C0342DC */ jal Matrix_RotateX -/* 0B840 8095AB00 46006307 */ neg.s $f12, $f12 +/* 0B838 8095AAF8 46083302 */ mul.s $f12, $f6, $f8 +/* 0B83C 8095AAFC 0C0342DC */ jal Matrix_RotateX +/* 0B840 8095AB00 46006307 */ neg.s $f12, $f12 /* 0B844 8095AB04 8E2202C0 */ lw $v0, 0x02C0($s1) ## 000002C0 /* 0B848 8095AB08 3C0FDA38 */ lui $t7, 0xDA38 ## $t7 = DA380000 /* 0B84C 8095AB0C 35EF0003 */ ori $t7, $t7, 0x0003 ## $t7 = DA380003 @@ -636,9 +636,9 @@ glabel func_8095A188 /* 0B860 8095AB20 24A5C4E0 */ addiu $a1, $a1, %lo(D_8095C4E0) ## $a1 = 8095C4E0 /* 0B864 8095AB24 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 0B868 8095AB28 24061404 */ addiu $a2, $zero, 0x1404 ## $a2 = 00001404 -/* 0B86C 8095AB2C 0C0346A2 */ jal Matrix_NewMtx -/* 0B870 8095AB30 AFA200A4 */ sw $v0, 0x00A4($sp) -/* 0B874 8095AB34 8FA300A4 */ lw $v1, 0x00A4($sp) +/* 0B86C 8095AB2C 0C0346A2 */ jal Matrix_NewMtx +/* 0B870 8095AB30 AFA200A4 */ sw $v0, 0x00A4($sp) +/* 0B874 8095AB34 8FA300A4 */ lw $v1, 0x00A4($sp) /* 0B878 8095AB38 AC620004 */ sw $v0, 0x0004($v1) ## 00000004 /* 0B87C 8095AB3C 8E2202C0 */ lw $v0, 0x02C0($s1) ## 000002C0 /* 0B880 8095AB40 244C0008 */ addiu $t4, $v0, 0x0008 ## $t4 = 00000008 @@ -647,34 +647,34 @@ glabel func_8095A188 /* 0B88C 8095AB4C AC550000 */ sw $s5, 0x0000($v0) ## 00000000 /* 0B890 8095AB50 26730001 */ addiu $s3, $s3, 0x0001 ## $s3 = 00000002 .L8095AB54: -/* 0B894 8095AB54 00139C00 */ sll $s3, $s3, 16 -/* 0B898 8095AB58 00139C03 */ sra $s3, $s3, 16 -/* 0B89C 8095AB5C 2A610190 */ slti $at, $s3, 0x0190 -/* 0B8A0 8095AB60 1420FF73 */ bne $at, $zero, .L8095A930 +/* 0B894 8095AB54 00139C00 */ sll $s3, $s3, 16 +/* 0B898 8095AB58 00139C03 */ sra $s3, $s3, 16 +/* 0B89C 8095AB5C 2A610190 */ slti $at, $s3, 0x0190 +/* 0B8A0 8095AB60 1420FF73 */ bne $at, $zero, .L8095A930 /* 0B8A4 8095AB64 26100058 */ addiu $s0, $s0, 0x0058 ## $s0 = 000001B8 /* 0B8A8 8095AB68 0000A025 */ or $s4, $zero, $zero ## $s4 = 00000000 -/* 0B8AC 8095AB6C 8FB00138 */ lw $s0, 0x0138($sp) +/* 0B8AC 8095AB6C 8FB00138 */ lw $s0, 0x0138($sp) /* 0B8B0 8095AB70 00009825 */ or $s3, $zero, $zero ## $s3 = 00000000 .L8095AB74: /* 0B8B4 8095AB74 92190024 */ lbu $t9, 0x0024($s0) ## 000001DC /* 0B8B8 8095AB78 24010005 */ addiu $at, $zero, 0x0005 ## $at = 00000005 /* 0B8BC 8095AB7C 3C120601 */ lui $s2, 0x0601 ## $s2 = 06010000 -/* 0B8C0 8095AB80 5721004C */ bnel $t9, $at, .L8095ACB4 +/* 0B8C0 8095AB80 5721004C */ bnel $t9, $at, .L8095ACB4 /* 0B8C4 8095AB84 26730001 */ addiu $s3, $s3, 0x0001 ## $s3 = 00000001 -/* 0B8C8 8095AB88 1680000E */ bne $s4, $zero, .L8095ABC4 +/* 0B8C8 8095AB88 1680000E */ bne $s4, $zero, .L8095ABC4 /* 0B8CC 8095AB8C 26523638 */ addiu $s2, $s2, 0x3638 ## $s2 = 06013638 /* 0B8D0 8095AB90 3C0E0601 */ lui $t6, 0x0601 ## $t6 = 06010000 /* 0B8D4 8095AB94 25CE35B0 */ addiu $t6, $t6, 0x35B0 ## $t6 = 060135B0 /* 0B8D8 8095AB98 8EC40000 */ lw $a0, 0x0000($s6) ## 00000000 -/* 0B8DC 8095AB9C 0C024F61 */ jal func_80093D84 -/* 0B8E0 8095ABA0 AFAE0058 */ sw $t6, 0x0058($sp) +/* 0B8DC 8095AB9C 0C024F61 */ jal func_80093D84 +/* 0B8E0 8095ABA0 AFAE0058 */ sw $t6, 0x0058($sp) /* 0B8E4 8095ABA4 8E2202D0 */ lw $v0, 0x02D0($s1) ## 000002D0 /* 0B8E8 8095ABA8 26940001 */ addiu $s4, $s4, 0x0001 ## $s4 = 00000001 /* 0B8EC 8095ABAC 329400FF */ andi $s4, $s4, 0x00FF ## $s4 = 00000001 /* 0B8F0 8095ABB0 244B0008 */ addiu $t3, $v0, 0x0008 ## $t3 = 00000008 /* 0B8F4 8095ABB4 AE2B02D0 */ sw $t3, 0x02D0($s1) ## 000002D0 /* 0B8F8 8095ABB8 AC550000 */ sw $s5, 0x0000($v0) ## 00000000 -/* 0B8FC 8095ABBC 8FAD0058 */ lw $t5, 0x0058($sp) +/* 0B8FC 8095ABBC 8FAD0058 */ lw $t5, 0x0058($sp) /* 0B900 8095ABC0 AC4D0004 */ sw $t5, 0x0004($v0) ## 00000004 .L8095ABC4: /* 0B904 8095ABC4 8E2202D0 */ lw $v0, 0x02D0($s1) ## 000002D0 @@ -705,18 +705,18 @@ glabel func_8095A188 /* 0B968 8095AC28 AC4D0004 */ sw $t5, 0x0004($v0) ## 00000004 /* 0B96C 8095AC2C 8E060008 */ lw $a2, 0x0008($s0) ## 000001C0 /* 0B970 8095AC30 C60E0004 */ lwc1 $f14, 0x0004($s0) ## 000001BC -/* 0B974 8095AC34 0C034261 */ jal Matrix_Translate +/* 0B974 8095AC34 0C034261 */ jal Matrix_Translate /* 0B978 8095AC38 C60C0000 */ lwc1 $f12, 0x0000($s0) ## 000001B8 /* 0B97C 8095AC3C 8604002A */ lh $a0, 0x002A($s0) ## 000001E2 /* 0B980 8095AC40 8605002C */ lh $a1, 0x002C($s0) ## 000001E4 /* 0B984 8095AC44 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 0B988 8095AC48 0C034421 */ jal Matrix_RotateXYZ +/* 0B988 8095AC48 0C034421 */ jal Matrix_RotateZYX /* 0B98C 8095AC4C 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 /* 0B990 8095AC50 C60C0040 */ lwc1 $f12, 0x0040($s0) ## 000001F8 /* 0B994 8095AC54 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 0B998 8095AC58 44066000 */ mfc1 $a2, $f12 -/* 0B99C 8095AC5C 0C0342A3 */ jal Matrix_Scale -/* 0B9A0 8095AC60 46006386 */ mov.s $f14, $f12 +/* 0B998 8095AC58 44066000 */ mfc1 $a2, $f12 +/* 0B99C 8095AC5C 0C0342A3 */ jal Matrix_Scale +/* 0B9A0 8095AC60 46006386 */ mov.s $f14, $f12 /* 0B9A4 8095AC64 8E2202D0 */ lw $v0, 0x02D0($s1) ## 000002D0 /* 0B9A8 8095AC68 3C08DA38 */ lui $t0, 0xDA38 ## $t0 = DA380000 /* 0B9AC 8095AC6C 35080003 */ ori $t0, $t0, 0x0003 ## $t0 = DA380003 @@ -727,9 +727,9 @@ glabel func_8095A188 /* 0B9C0 8095AC80 24A5C4F0 */ addiu $a1, $a1, %lo(D_8095C4F0) ## $a1 = 8095C4F0 /* 0B9C4 8095AC84 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 0B9C8 8095AC88 24061420 */ addiu $a2, $zero, 0x1420 ## $a2 = 00001420 -/* 0B9CC 8095AC8C 0C0346A2 */ jal Matrix_NewMtx -/* 0B9D0 8095AC90 AFA2008C */ sw $v0, 0x008C($sp) -/* 0B9D4 8095AC94 8FA3008C */ lw $v1, 0x008C($sp) +/* 0B9CC 8095AC8C 0C0346A2 */ jal Matrix_NewMtx +/* 0B9D0 8095AC90 AFA2008C */ sw $v0, 0x008C($sp) +/* 0B9D4 8095AC94 8FA3008C */ lw $v1, 0x008C($sp) /* 0B9D8 8095AC98 AC620004 */ sw $v0, 0x0004($v1) ## 00000004 /* 0B9DC 8095AC9C 8E2202D0 */ lw $v0, 0x02D0($s1) ## 000002D0 /* 0B9E0 8095ACA0 24490008 */ addiu $t1, $v0, 0x0008 ## $t1 = 00000008 @@ -738,32 +738,32 @@ glabel func_8095A188 /* 0B9EC 8095ACAC AC550000 */ sw $s5, 0x0000($v0) ## 00000000 /* 0B9F0 8095ACB0 26730001 */ addiu $s3, $s3, 0x0001 ## $s3 = 00000002 .L8095ACB4: -/* 0B9F4 8095ACB4 00139C00 */ sll $s3, $s3, 16 -/* 0B9F8 8095ACB8 00139C03 */ sra $s3, $s3, 16 -/* 0B9FC 8095ACBC 2A610190 */ slti $at, $s3, 0x0190 -/* 0BA00 8095ACC0 1420FFAC */ bne $at, $zero, .L8095AB74 +/* 0B9F4 8095ACB4 00139C00 */ sll $s3, $s3, 16 +/* 0B9F8 8095ACB8 00139C03 */ sra $s3, $s3, 16 +/* 0B9FC 8095ACBC 2A610190 */ slti $at, $s3, 0x0190 +/* 0BA00 8095ACC0 1420FFAC */ bne $at, $zero, .L8095AB74 /* 0BA04 8095ACC4 26100058 */ addiu $s0, $s0, 0x0058 ## $s0 = 00000210 /* 0BA08 8095ACC8 3C178096 */ lui $s7, %hi(D_8095C500) ## $s7 = 80960000 /* 0BA0C 8095ACCC 0000A025 */ or $s4, $zero, $zero ## $s4 = 00000000 -/* 0BA10 8095ACD0 8FB00138 */ lw $s0, 0x0138($sp) +/* 0BA10 8095ACD0 8FB00138 */ lw $s0, 0x0138($sp) /* 0BA14 8095ACD4 26F7C500 */ addiu $s7, $s7, %lo(D_8095C500) ## $s7 = 8095C500 /* 0BA18 8095ACD8 00009825 */ or $s3, $zero, $zero ## $s3 = 00000000 .L8095ACDC: /* 0BA1C 8095ACDC 92180024 */ lbu $t8, 0x0024($s0) ## 00000234 /* 0BA20 8095ACE0 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 /* 0BA24 8095ACE4 3C0F0601 */ lui $t7, 0x0601 ## $t7 = 06010000 -/* 0BA28 8095ACE8 17010053 */ bne $t8, $at, .L8095AE38 +/* 0BA28 8095ACE8 17010053 */ bne $t8, $at, .L8095AE38 /* 0BA2C 8095ACEC 25EF5710 */ addiu $t7, $t7, 0x5710 ## $t7 = 06015710 /* 0BA30 8095ACF0 3C010001 */ lui $at, 0x0001 ## $at = 00010000 /* 0BA34 8095ACF4 34211DA0 */ ori $at, $at, 0x1DA0 ## $at = 00011DA0 -/* 0BA38 8095ACF8 02C19021 */ addu $s2, $s6, $at -/* 0BA3C 8095ACFC 16800015 */ bne $s4, $zero, .L8095AD54 -/* 0BA40 8095AD00 AFAF0050 */ sw $t7, 0x0050($sp) +/* 0BA38 8095ACF8 02C19021 */ addu $s2, $s6, $at +/* 0BA3C 8095ACFC 16800015 */ bne $s4, $zero, .L8095AD54 +/* 0BA40 8095AD00 AFAF0050 */ sw $t7, 0x0050($sp) /* 0BA44 8095AD04 3C0C0601 */ lui $t4, 0x0601 ## $t4 = 06010000 /* 0BA48 8095AD08 258C56A0 */ addiu $t4, $t4, 0x56A0 ## $t4 = 060156A0 /* 0BA4C 8095AD0C 8EC40000 */ lw $a0, 0x0000($s6) ## 00000000 -/* 0BA50 8095AD10 0C024F05 */ jal func_80093C14 -/* 0BA54 8095AD14 AFAC0058 */ sw $t4, 0x0058($sp) +/* 0BA50 8095AD10 0C024F05 */ jal func_80093C14 +/* 0BA54 8095AD14 AFAC0058 */ sw $t4, 0x0058($sp) /* 0BA58 8095AD18 8E2202D0 */ lw $v0, 0x02D0($s1) ## 000002D0 /* 0BA5C 8095AD1C 3C0E8282 */ lui $t6, 0x8282 ## $t6 = 82820000 /* 0BA60 8095AD20 35CE1E00 */ ori $t6, $t6, 0x1E00 ## $t6 = 82821E00 @@ -777,7 +777,7 @@ glabel func_8095A188 /* 0BA80 8095AD40 244B0008 */ addiu $t3, $v0, 0x0008 ## $t3 = 00000008 /* 0BA84 8095AD44 AE2B02D0 */ sw $t3, 0x02D0($s1) ## 000002D0 /* 0BA88 8095AD48 AC550000 */ sw $s5, 0x0000($v0) ## 00000000 -/* 0BA8C 8095AD4C 8FAD0058 */ lw $t5, 0x0058($sp) +/* 0BA8C 8095AD4C 8FAD0058 */ lw $t5, 0x0058($sp) /* 0BA90 8095AD50 AC4D0004 */ sw $t5, 0x0004($v0) ## 00000004 .L8095AD54: /* 0BA94 8095AD54 8E2202D0 */ lw $v0, 0x02D0($s1) ## 000002D0 @@ -794,30 +794,30 @@ glabel func_8095A188 /* 0BAC0 8095AD80 AC4F0004 */ sw $t7, 0x0004($v0) ## 00000004 /* 0BAC4 8095AD84 8E060008 */ lw $a2, 0x0008($s0) ## 00000218 /* 0BAC8 8095AD88 C60E0004 */ lwc1 $f14, 0x0004($s0) ## 00000214 -/* 0BACC 8095AD8C 0C034261 */ jal Matrix_Translate +/* 0BACC 8095AD8C 0C034261 */ jal Matrix_Translate /* 0BAD0 8095AD90 C60C0000 */ lwc1 $f12, 0x0000($s0) ## 00000210 -/* 0BAD4 8095AD94 0C0347F5 */ jal func_800D1FD4 +/* 0BAD4 8095AD94 0C0347F5 */ jal func_800D1FD4 /* 0BAD8 8095AD98 02402025 */ or $a0, $s2, $zero ## $a0 = 06013638 /* 0BADC 8095AD9C 860C002E */ lh $t4, 0x002E($s0) ## 0000023E /* 0BAE0 8095ADA0 3C014700 */ lui $at, 0x4700 ## $at = 47000000 /* 0BAE4 8095ADA4 44819000 */ mtc1 $at, $f18 ## $f18 = 32768.00 /* 0BAE8 8095ADA8 448C5000 */ mtc1 $t4, $f10 ## $f10 = 0.00 /* 0BAEC 8095ADAC 3C018096 */ lui $at, %hi(D_8095C8E8) ## $at = 80960000 -/* 0BAF0 8095ADB0 C426C8E8 */ lwc1 $f6, %lo(D_8095C8E8)($at) -/* 0BAF4 8095ADB4 46805420 */ cvt.s.w $f16, $f10 +/* 0BAF0 8095ADB0 C426C8E8 */ lwc1 $f6, %lo(D_8095C8E8)($at) +/* 0BAF4 8095ADB4 46805420 */ cvt.s.w $f16, $f10 /* 0BAF8 8095ADB8 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 -/* 0BAFC 8095ADBC 46128103 */ div.s $f4, $f16, $f18 -/* 0BB00 8095ADC0 46062302 */ mul.s $f12, $f4, $f6 -/* 0BB04 8095ADC4 0C0343B5 */ jal Matrix_RotateZ +/* 0BAFC 8095ADBC 46128103 */ div.s $f4, $f16, $f18 +/* 0BB00 8095ADC0 46062302 */ mul.s $f12, $f4, $f6 +/* 0BB04 8095ADC4 0C0343B5 */ jal Matrix_RotateZ /* 0BB08 8095ADC8 00000000 */ nop /* 0BB0C 8095ADCC 3C018096 */ lui $at, %hi(D_8095C8EC) ## $at = 80960000 -/* 0BB10 8095ADD0 C42AC8EC */ lwc1 $f10, %lo(D_8095C8EC)($at) +/* 0BB10 8095ADD0 C42AC8EC */ lwc1 $f10, %lo(D_8095C8EC)($at) /* 0BB14 8095ADD4 C6080040 */ lwc1 $f8, 0x0040($s0) ## 00000250 -/* 0BB18 8095ADD8 4406A000 */ mfc1 $a2, $f20 +/* 0BB18 8095ADD8 4406A000 */ mfc1 $a2, $f20 /* 0BB1C 8095ADDC 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 0BB20 8095ADE0 460A4302 */ mul.s $f12, $f8, $f10 -/* 0BB24 8095ADE4 0C0342A3 */ jal Matrix_Scale -/* 0BB28 8095ADE8 46006386 */ mov.s $f14, $f12 +/* 0BB20 8095ADE0 460A4302 */ mul.s $f12, $f8, $f10 +/* 0BB24 8095ADE4 0C0342A3 */ jal Matrix_Scale +/* 0BB28 8095ADE8 46006386 */ mov.s $f14, $f12 /* 0BB2C 8095ADEC 8E2202D0 */ lw $v0, 0x02D0($s1) ## 000002D0 /* 0BB30 8095ADF0 3C0EDA38 */ lui $t6, 0xDA38 ## $t6 = DA380000 /* 0BB34 8095ADF4 35CE0003 */ ori $t6, $t6, 0x0003 ## $t6 = DA380003 @@ -827,39 +827,39 @@ glabel func_8095A188 /* 0BB44 8095AE04 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 0BB48 8095AE08 02E02825 */ or $a1, $s7, $zero ## $a1 = 8095C500 /* 0BB4C 8095AE0C 2406143C */ addiu $a2, $zero, 0x143C ## $a2 = 0000143C -/* 0BB50 8095AE10 0C0346A2 */ jal Matrix_NewMtx -/* 0BB54 8095AE14 AFA20078 */ sw $v0, 0x0078($sp) -/* 0BB58 8095AE18 8FA30078 */ lw $v1, 0x0078($sp) +/* 0BB50 8095AE10 0C0346A2 */ jal Matrix_NewMtx +/* 0BB54 8095AE14 AFA20078 */ sw $v0, 0x0078($sp) +/* 0BB58 8095AE18 8FA30078 */ lw $v1, 0x0078($sp) /* 0BB5C 8095AE1C AC620004 */ sw $v0, 0x0004($v1) ## 00000004 /* 0BB60 8095AE20 8E2202D0 */ lw $v0, 0x02D0($s1) ## 000002D0 /* 0BB64 8095AE24 244B0008 */ addiu $t3, $v0, 0x0008 ## $t3 = 00000008 /* 0BB68 8095AE28 AE2B02D0 */ sw $t3, 0x02D0($s1) ## 000002D0 /* 0BB6C 8095AE2C AC550000 */ sw $s5, 0x0000($v0) ## 00000000 -/* 0BB70 8095AE30 8FAD0050 */ lw $t5, 0x0050($sp) +/* 0BB70 8095AE30 8FAD0050 */ lw $t5, 0x0050($sp) /* 0BB74 8095AE34 AC4D0004 */ sw $t5, 0x0004($v0) ## 00000004 .L8095AE38: /* 0BB78 8095AE38 26730001 */ addiu $s3, $s3, 0x0001 ## $s3 = 00000001 -/* 0BB7C 8095AE3C 00139C00 */ sll $s3, $s3, 16 -/* 0BB80 8095AE40 00139C03 */ sra $s3, $s3, 16 -/* 0BB84 8095AE44 2A610190 */ slti $at, $s3, 0x0190 -/* 0BB88 8095AE48 1420FFA4 */ bne $at, $zero, .L8095ACDC +/* 0BB7C 8095AE3C 00139C00 */ sll $s3, $s3, 16 +/* 0BB80 8095AE40 00139C03 */ sra $s3, $s3, 16 +/* 0BB84 8095AE44 2A610190 */ slti $at, $s3, 0x0190 +/* 0BB88 8095AE48 1420FFA4 */ bne $at, $zero, .L8095ACDC /* 0BB8C 8095AE4C 26100058 */ addiu $s0, $s0, 0x0058 ## $s0 = 00000268 /* 0BB90 8095AE50 0000A025 */ or $s4, $zero, $zero ## $s4 = 00000000 -/* 0BB94 8095AE54 8FB00138 */ lw $s0, 0x0138($sp) +/* 0BB94 8095AE54 8FB00138 */ lw $s0, 0x0138($sp) /* 0BB98 8095AE58 00009825 */ or $s3, $zero, $zero ## $s3 = 00000000 /* 0BB9C 8095AE5C 24170003 */ addiu $s7, $zero, 0x0003 ## $s7 = 00000003 .L8095AE60: /* 0BBA0 8095AE60 920A0024 */ lbu $t2, 0x0024($s0) ## 0000028C /* 0BBA4 8095AE64 3C120601 */ lui $s2, 0x0601 ## $s2 = 06010000 -/* 0BBA8 8095AE68 56EA0057 */ bnel $s7, $t2, .L8095AFC8 +/* 0BBA8 8095AE68 56EA0057 */ bnel $s7, $t2, .L8095AFC8 /* 0BBAC 8095AE6C 26730001 */ addiu $s3, $s3, 0x0001 ## $s3 = 00000001 -/* 0BBB0 8095AE70 16800015 */ bne $s4, $zero, .L8095AEC8 +/* 0BBB0 8095AE70 16800015 */ bne $s4, $zero, .L8095AEC8 /* 0BBB4 8095AE74 26528F70 */ addiu $s2, $s2, 0x8F70 ## $s2 = 06008F70 /* 0BBB8 8095AE78 3C080601 */ lui $t0, 0x0601 ## $t0 = 06010000 /* 0BBBC 8095AE7C 25088F08 */ addiu $t0, $t0, 0x8F08 ## $t0 = 06008F08 /* 0BBC0 8095AE80 8EC40000 */ lw $a0, 0x0000($s6) ## 00000000 -/* 0BBC4 8095AE84 0C024F61 */ jal func_80093D84 -/* 0BBC8 8095AE88 AFA80058 */ sw $t0, 0x0058($sp) +/* 0BBC4 8095AE84 0C024F61 */ jal func_80093D84 +/* 0BBC8 8095AE88 AFA80058 */ sw $t0, 0x0058($sp) /* 0BBCC 8095AE8C 8E2202D0 */ lw $v0, 0x02D0($s1) ## 000002D0 /* 0BBD0 8095AE90 3C18FFFF */ lui $t8, 0xFFFF ## $t8 = FFFF0000 /* 0BBD4 8095AE94 37186400 */ ori $t8, $t8, 0x6400 ## $t8 = FFFF6400 @@ -873,7 +873,7 @@ glabel func_8095A188 /* 0BBF4 8095AEB4 244F0008 */ addiu $t7, $v0, 0x0008 ## $t7 = 00000008 /* 0BBF8 8095AEB8 AE2F02D0 */ sw $t7, 0x02D0($s1) ## 000002D0 /* 0BBFC 8095AEBC AC550000 */ sw $s5, 0x0000($v0) ## 00000000 -/* 0BC00 8095AEC0 8FAC0058 */ lw $t4, 0x0058($sp) +/* 0BC00 8095AEC0 8FAC0058 */ lw $t4, 0x0058($sp) /* 0BC04 8095AEC4 AC4C0004 */ sw $t4, 0x0004($v0) ## 00000004 .L8095AEC8: /* 0BC08 8095AEC8 8E2202D0 */ lw $v0, 0x02D0($s1) ## 000002D0 @@ -889,37 +889,37 @@ glabel func_8095A188 /* 0BC30 8095AEF0 AC4A0004 */ sw $t2, 0x0004($v0) ## 00000004 /* 0BC34 8095AEF4 8E060008 */ lw $a2, 0x0008($s0) ## 00000270 /* 0BC38 8095AEF8 C60E0004 */ lwc1 $f14, 0x0004($s0) ## 0000026C -/* 0BC3C 8095AEFC 0C034261 */ jal Matrix_Translate +/* 0BC3C 8095AEFC 0C034261 */ jal Matrix_Translate /* 0BC40 8095AF00 C60C0000 */ lwc1 $f12, 0x0000($s0) ## 00000268 /* 0BC44 8095AF04 8608002E */ lh $t0, 0x002E($s0) ## 00000296 /* 0BC48 8095AF08 3C014700 */ lui $at, 0x4700 ## $at = 47000000 /* 0BC4C 8095AF0C 44812000 */ mtc1 $at, $f4 ## $f4 = 32768.00 /* 0BC50 8095AF10 44888000 */ mtc1 $t0, $f16 ## $f16 = 0.00 /* 0BC54 8095AF14 3C018096 */ lui $at, %hi(D_8095C8F0) ## $at = 80960000 -/* 0BC58 8095AF18 C428C8F0 */ lwc1 $f8, %lo(D_8095C8F0)($at) -/* 0BC5C 8095AF1C 468084A0 */ cvt.s.w $f18, $f16 +/* 0BC58 8095AF18 C428C8F0 */ lwc1 $f8, %lo(D_8095C8F0)($at) +/* 0BC5C 8095AF1C 468084A0 */ cvt.s.w $f18, $f16 /* 0BC60 8095AF20 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 -/* 0BC64 8095AF24 46049183 */ div.s $f6, $f18, $f4 -/* 0BC68 8095AF28 46083302 */ mul.s $f12, $f6, $f8 -/* 0BC6C 8095AF2C 0C0343B5 */ jal Matrix_RotateZ +/* 0BC64 8095AF24 46049183 */ div.s $f6, $f18, $f4 +/* 0BC68 8095AF28 46083302 */ mul.s $f12, $f6, $f8 +/* 0BC6C 8095AF2C 0C0343B5 */ jal Matrix_RotateZ /* 0BC70 8095AF30 00000000 */ nop /* 0BC74 8095AF34 8609002C */ lh $t1, 0x002C($s0) ## 00000294 /* 0BC78 8095AF38 3C014700 */ lui $at, 0x4700 ## $at = 47000000 /* 0BC7C 8095AF3C 44819000 */ mtc1 $at, $f18 ## $f18 = 32768.00 /* 0BC80 8095AF40 44895000 */ mtc1 $t1, $f10 ## $f10 = 0.00 /* 0BC84 8095AF44 3C018096 */ lui $at, %hi(D_8095C8F4) ## $at = 80960000 -/* 0BC88 8095AF48 C426C8F4 */ lwc1 $f6, %lo(D_8095C8F4)($at) -/* 0BC8C 8095AF4C 46805420 */ cvt.s.w $f16, $f10 +/* 0BC88 8095AF48 C426C8F4 */ lwc1 $f6, %lo(D_8095C8F4)($at) +/* 0BC8C 8095AF4C 46805420 */ cvt.s.w $f16, $f10 /* 0BC90 8095AF50 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 -/* 0BC94 8095AF54 46128103 */ div.s $f4, $f16, $f18 -/* 0BC98 8095AF58 46062302 */ mul.s $f12, $f4, $f6 -/* 0BC9C 8095AF5C 0C034348 */ jal Matrix_RotateY +/* 0BC94 8095AF54 46128103 */ div.s $f4, $f16, $f18 +/* 0BC98 8095AF58 46062302 */ mul.s $f12, $f4, $f6 +/* 0BC9C 8095AF5C 0C034348 */ jal Matrix_RotateY /* 0BCA0 8095AF60 00000000 */ nop /* 0BCA4 8095AF64 C60C0040 */ lwc1 $f12, 0x0040($s0) ## 000002A8 -/* 0BCA8 8095AF68 4406A000 */ mfc1 $a2, $f20 +/* 0BCA8 8095AF68 4406A000 */ mfc1 $a2, $f20 /* 0BCAC 8095AF6C 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 0BCB0 8095AF70 0C0342A3 */ jal Matrix_Scale -/* 0BCB4 8095AF74 46006386 */ mov.s $f14, $f12 +/* 0BCB0 8095AF70 0C0342A3 */ jal Matrix_Scale +/* 0BCB4 8095AF74 46006386 */ mov.s $f14, $f12 /* 0BCB8 8095AF78 8E2202D0 */ lw $v0, 0x02D0($s1) ## 000002D0 /* 0BCBC 8095AF7C 3C0FDA38 */ lui $t7, 0xDA38 ## $t7 = DA380000 /* 0BCC0 8095AF80 35EF0003 */ ori $t7, $t7, 0x0003 ## $t7 = DA380003 @@ -930,9 +930,9 @@ glabel func_8095A188 /* 0BCD4 8095AF94 24A5C510 */ addiu $a1, $a1, %lo(D_8095C510) ## $a1 = 8095C510 /* 0BCD8 8095AF98 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 0BCDC 8095AF9C 24061458 */ addiu $a2, $zero, 0x1458 ## $a2 = 00001458 -/* 0BCE0 8095AFA0 0C0346A2 */ jal Matrix_NewMtx -/* 0BCE4 8095AFA4 AFA20064 */ sw $v0, 0x0064($sp) -/* 0BCE8 8095AFA8 8FA30064 */ lw $v1, 0x0064($sp) +/* 0BCE0 8095AFA0 0C0346A2 */ jal Matrix_NewMtx +/* 0BCE4 8095AFA4 AFA20064 */ sw $v0, 0x0064($sp) +/* 0BCE8 8095AFA8 8FA30064 */ lw $v1, 0x0064($sp) /* 0BCEC 8095AFAC AC620004 */ sw $v0, 0x0004($v1) ## 00000004 /* 0BCF0 8095AFB0 8E2202D0 */ lw $v0, 0x02D0($s1) ## 000002D0 /* 0BCF4 8095AFB4 244C0008 */ addiu $t4, $v0, 0x0008 ## $t4 = 00000008 @@ -941,29 +941,29 @@ glabel func_8095A188 /* 0BD00 8095AFC0 AC550000 */ sw $s5, 0x0000($v0) ## 00000000 /* 0BD04 8095AFC4 26730001 */ addiu $s3, $s3, 0x0001 ## $s3 = 00000002 .L8095AFC8: -/* 0BD08 8095AFC8 00139C00 */ sll $s3, $s3, 16 -/* 0BD0C 8095AFCC 00139C03 */ sra $s3, $s3, 16 -/* 0BD10 8095AFD0 2A610190 */ slti $at, $s3, 0x0190 -/* 0BD14 8095AFD4 1420FFA2 */ bne $at, $zero, .L8095AE60 +/* 0BD08 8095AFC8 00139C00 */ sll $s3, $s3, 16 +/* 0BD0C 8095AFCC 00139C03 */ sra $s3, $s3, 16 +/* 0BD10 8095AFD0 2A610190 */ slti $at, $s3, 0x0190 +/* 0BD14 8095AFD4 1420FFA2 */ bne $at, $zero, .L8095AE60 /* 0BD18 8095AFD8 26100058 */ addiu $s0, $s0, 0x0058 ## $s0 = 000002C0 /* 0BD1C 8095AFDC 3C068096 */ lui $a2, %hi(D_8095C520) ## $a2 = 80960000 /* 0BD20 8095AFE0 24C6C520 */ addiu $a2, $a2, %lo(D_8095C520) ## $a2 = 8095C520 /* 0BD24 8095AFE4 27A40120 */ addiu $a0, $sp, 0x0120 ## $a0 = FFFFFFD8 /* 0BD28 8095AFE8 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 0BD2C 8095AFEC 0C031AD5 */ jal func_800C6B54 +/* 0BD2C 8095AFEC 0C031AD5 */ jal Graph_CloseDisps /* 0BD30 8095AFF0 2407145F */ addiu $a3, $zero, 0x145F ## $a3 = 0000145F -/* 0BD34 8095AFF4 8FBF0044 */ lw $ra, 0x0044($sp) -/* 0BD38 8095AFF8 D7B40018 */ ldc1 $f20, 0x0018($sp) -/* 0BD3C 8095AFFC 8FB00020 */ lw $s0, 0x0020($sp) -/* 0BD40 8095B000 8FB10024 */ lw $s1, 0x0024($sp) -/* 0BD44 8095B004 8FB20028 */ lw $s2, 0x0028($sp) -/* 0BD48 8095B008 8FB3002C */ lw $s3, 0x002C($sp) -/* 0BD4C 8095B00C 8FB40030 */ lw $s4, 0x0030($sp) -/* 0BD50 8095B010 8FB50034 */ lw $s5, 0x0034($sp) -/* 0BD54 8095B014 8FB60038 */ lw $s6, 0x0038($sp) -/* 0BD58 8095B018 8FB7003C */ lw $s7, 0x003C($sp) -/* 0BD5C 8095B01C 8FBE0040 */ lw $s8, 0x0040($sp) -/* 0BD60 8095B020 03E00008 */ jr $ra +/* 0BD34 8095AFF4 8FBF0044 */ lw $ra, 0x0044($sp) +/* 0BD38 8095AFF8 D7B40018 */ ldc1 $f20, 0x0018($sp) +/* 0BD3C 8095AFFC 8FB00020 */ lw $s0, 0x0020($sp) +/* 0BD40 8095B000 8FB10024 */ lw $s1, 0x0024($sp) +/* 0BD44 8095B004 8FB20028 */ lw $s2, 0x0028($sp) +/* 0BD48 8095B008 8FB3002C */ lw $s3, 0x002C($sp) +/* 0BD4C 8095B00C 8FB40030 */ lw $s4, 0x0030($sp) +/* 0BD50 8095B010 8FB50034 */ lw $s5, 0x0034($sp) +/* 0BD54 8095B014 8FB60038 */ lw $s6, 0x0038($sp) +/* 0BD58 8095B018 8FB7003C */ lw $s7, 0x003C($sp) +/* 0BD5C 8095B01C 8FBE0040 */ lw $s8, 0x0040($sp) +/* 0BD60 8095B020 03E00008 */ jr $ra /* 0BD64 8095B024 27BD0148 */ addiu $sp, $sp, 0x0148 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_8095BD24.s b/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_8095BD24.s index ee75efcad0..e46b3244c9 100644 --- a/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_8095BD24.s +++ b/asm/non_matchings/overlays/actors/ovl_Boss_Va/func_8095BD24.s @@ -25,7 +25,7 @@ glabel func_8095BD24 /* 0CAC0 8095BD80 27A40078 */ addiu $a0, $sp, 0x0078 ## $a0 = FFFFFFA0 /* 0CAC4 8095BD84 240715E0 */ addiu $a3, $zero, 0x15E0 ## $a3 = 000015E0 /* 0CAC8 8095BD88 4600B506 */ mov.s $f20, $f22 -/* 0CACC 8095BD8C 0C031AB1 */ jal func_800C6AC4 +/* 0CACC 8095BD8C 0C031AB1 */ jal Graph_OpenDisps /* 0CAD0 8095BD90 00A09825 */ or $s3, $a1, $zero ## $s3 = 00000000 /* 0CAD4 8095BD94 3C0142A0 */ lui $at, 0x42A0 ## $at = 42A00000 /* 0CAD8 8095BD98 44817000 */ mtc1 $at, $f14 ## $f14 = 80.00 @@ -116,7 +116,7 @@ glabel func_8095BD24 /* 0CC24 8095BEE4 24C6C550 */ addiu $a2, $a2, %lo(D_8095C550) ## $a2 = 8095C550 /* 0CC28 8095BEE8 27A40078 */ addiu $a0, $sp, 0x0078 ## $a0 = FFFFFFA0 /* 0CC2C 8095BEEC 240715FD */ addiu $a3, $zero, 0x15FD ## $a3 = 000015FD -/* 0CC30 8095BEF0 0C031AD5 */ jal func_800C6B54 +/* 0CC30 8095BEF0 0C031AD5 */ jal Graph_CloseDisps /* 0CC34 8095BEF4 8D450000 */ lw $a1, 0x0000($t2) ## 00000000 /* 0CC38 8095BEF8 8FBF005C */ lw $ra, 0x005C($sp) /* 0CC3C 8095BEFC D7B40018 */ ldc1 $f20, 0x0018($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_6K/func_80967FFC.s b/asm/non_matchings/overlays/actors/ovl_Demo_6K/func_80967FFC.s index 29f392fca5..804ecfc77f 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_6K/func_80967FFC.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_6K/func_80967FFC.s @@ -18,7 +18,7 @@ glabel func_80967FFC /* 016EC 8096803C 24C69448 */ addiu $a2, $a2, %lo(D_80969448) ## $a2 = 80969448 /* 016F0 80968040 27A400B8 */ addiu $a0, $sp, 0x00B8 ## $a0 = FFFFFFE0 /* 016F4 80968044 2407042E */ addiu $a3, $zero, 0x042E ## $a3 = 0000042E -/* 016F8 80968048 0C031AB1 */ jal func_800C6AC4 +/* 016F8 80968048 0C031AB1 */ jal Graph_OpenDisps /* 016FC 8096804C 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 /* 01700 80968050 8FAF00DC */ lw $t7, 0x00DC($sp) /* 01704 80968054 0C024F61 */ jal func_80093D84 @@ -54,7 +54,7 @@ glabel func_80967FFC /* 0177C 809680CC AFA0001C */ sw $zero, 0x001C($sp) /* 01780 809680D0 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 01784 809680D4 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 01788 809680D8 0C0253D0 */ jal Draw_TwoTexScroll +/* 01788 809680D8 0C0253D0 */ jal Gfx_TwoTexScroll /* 0178C 809680DC 00408825 */ or $s1, $v0, $zero ## $s1 = 00000000 /* 01790 809680E0 3C088097 */ lui $t0, %hi(D_80969398) ## $t0 = 80970000 /* 01794 809680E4 25089398 */ addiu $t0, $t0, %lo(D_80969398) ## $t0 = 80969398 @@ -153,7 +153,7 @@ glabel func_80967FFC /* 01900 80968250 24C69468 */ addiu $a2, $a2, %lo(D_80969468) ## $a2 = 80969468 /* 01904 80968254 27A400B8 */ addiu $a0, $sp, 0x00B8 ## $a0 = FFFFFFE0 /* 01908 80968258 24070467 */ addiu $a3, $zero, 0x0467 ## $a3 = 00000467 -/* 0190C 8096825C 0C031AD5 */ jal func_800C6B54 +/* 0190C 8096825C 0C031AD5 */ jal Graph_CloseDisps /* 01910 80968260 8DA50000 */ lw $a1, 0x0000($t5) ## 00000000 /* 01914 80968264 8FBF0064 */ lw $ra, 0x0064($sp) /* 01918 80968268 D7B40038 */ ldc1 $f20, 0x0038($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_6K/func_80968298.s b/asm/non_matchings/overlays/actors/ovl_Demo_6K/func_80968298.s index f306dcb593..59844df63e 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_6K/func_80968298.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_6K/func_80968298.s @@ -30,7 +30,7 @@ glabel func_80968298 /* 019B8 80968308 AFA8009C */ sw $t0, 0x009C($sp) /* 019BC 8096830C 27A4007C */ addiu $a0, $sp, 0x007C ## $a0 = FFFFFFCC /* 019C0 80968310 24070479 */ addiu $a3, $zero, 0x0479 ## $a3 = 00000479 -/* 019C4 80968314 0C031AB1 */ jal func_800C6AC4 +/* 019C4 80968314 0C031AB1 */ jal Graph_OpenDisps /* 019C8 80968318 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 /* 019CC 8096831C 8FAD00B0 */ lw $t5, 0x00B0($sp) /* 019D0 80968320 3C01437F */ lui $at, 0x437F ## $at = 437F0000 @@ -172,7 +172,7 @@ glabel func_80968298 /* 01BE8 80968538 AFA70020 */ sw $a3, 0x0020($sp) /* 01BEC 8096853C AFA6001C */ sw $a2, 0x001C($sp) /* 01BF0 80968540 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 01BF4 80968544 0C0253D0 */ jal Draw_TwoTexScroll +/* 01BF4 80968544 0C0253D0 */ jal Gfx_TwoTexScroll /* 01BF8 80968548 AFA2005C */ sw $v0, 0x005C($sp) /* 01BFC 8096854C 8FA3005C */ lw $v1, 0x005C($sp) /* 01C00 80968550 3C090600 */ lui $t1, 0x0600 ## $t1 = 06000000 @@ -235,7 +235,7 @@ glabel func_80968298 /* 01CE4 80968634 24C694A8 */ addiu $a2, $a2, %lo(D_809694A8) ## $a2 = 809694A8 /* 01CE8 80968638 27A4007C */ addiu $a0, $sp, 0x007C ## $a0 = FFFFFFCC /* 01CEC 8096863C 240704AE */ addiu $a3, $zero, 0x04AE ## $a3 = 000004AE -/* 01CF0 80968640 0C031AD5 */ jal func_800C6B54 +/* 01CF0 80968640 0C031AD5 */ jal Graph_CloseDisps /* 01CF4 80968644 8DA50000 */ lw $a1, 0x0000($t5) ## 00000008 /* 01CF8 80968648 8FBF003C */ lw $ra, 0x003C($sp) /* 01CFC 8096864C 8FB00038 */ lw $s0, 0x0038($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_6K/func_8096865C.s b/asm/non_matchings/overlays/actors/ovl_Demo_6K/func_8096865C.s index ccf6107ee7..e6580131a6 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_6K/func_8096865C.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_6K/func_8096865C.s @@ -9,7 +9,7 @@ glabel func_8096865C /* 01D28 80968678 24C694B8 */ addiu $a2, $a2, %lo(D_809694B8) ## $a2 = 809694B8 /* 01D2C 8096867C 27A40040 */ addiu $a0, $sp, 0x0040 ## $a0 = FFFFFFE0 /* 01D30 80968680 240704B8 */ addiu $a3, $zero, 0x04B8 ## $a3 = 000004B8 -/* 01D34 80968684 0C031AB1 */ jal func_800C6AC4 +/* 01D34 80968684 0C031AB1 */ jal Graph_OpenDisps /* 01D38 80968688 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 /* 01D3C 8096868C 8FA20060 */ lw $v0, 0x0060($sp) /* 01D40 80968690 944F028C */ lhu $t7, 0x028C($v0) ## 0000028C @@ -149,7 +149,7 @@ glabel func_8096865C /* 01F4C 8096889C 24C694E8 */ addiu $a2, $a2, %lo(D_809694E8) ## $a2 = 809694E8 /* 01F50 809688A0 27A40040 */ addiu $a0, $sp, 0x0040 ## $a0 = FFFFFFE0 /* 01F54 809688A4 240704DA */ addiu $a3, $zero, 0x04DA ## $a3 = 000004DA -/* 01F58 809688A8 0C031AD5 */ jal func_800C6B54 +/* 01F58 809688A8 0C031AD5 */ jal Graph_CloseDisps /* 01F5C 809688AC 8D450000 */ lw $a1, 0x0000($t2) ## 00000000 /* 01F60 809688B0 8FBF001C */ lw $ra, 0x001C($sp) /* 01F64 809688B4 8FB00018 */ lw $s0, 0x0018($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_6K/func_809688C4.s b/asm/non_matchings/overlays/actors/ovl_Demo_6K/func_809688C4.s index 76a5b86967..f578a37eb8 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_6K/func_809688C4.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_6K/func_809688C4.s @@ -32,7 +32,7 @@ glabel func_809688C4 /* 01FE8 80968938 8FBF0044 */ lw $ra, 0x0044($sp) /* 01FEC 8096893C 8EE50000 */ lw $a1, 0x0000($s7) ## 00000000 /* 01FF0 80968940 240704FD */ addiu $a3, $zero, 0x04FD ## $a3 = 000004FD -/* 01FF4 80968944 0C031AB1 */ jal func_800C6AC4 +/* 01FF4 80968944 0C031AB1 */ jal Graph_OpenDisps /* 01FF8 80968948 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 /* 01FFC 8096894C 0C024F61 */ jal func_80093D84 /* 02000 80968950 8EE40000 */ lw $a0, 0x0000($s7) ## 00000000 @@ -157,7 +157,7 @@ glabel func_809688C4 /* 021D8 80968B28 27A40084 */ addiu $a0, $sp, 0x0084 ## $a0 = FFFFFFDC /* 021DC 80968B2C AC4E0004 */ sw $t6, 0x0004($v0) ## 00000004 /* 021E0 80968B30 8EE50000 */ lw $a1, 0x0000($s7) ## 00000000 -/* 021E4 80968B34 0C031AD5 */ jal func_800C6B54 +/* 021E4 80968B34 0C031AD5 */ jal Graph_CloseDisps /* 021E8 80968B38 24070519 */ addiu $a3, $zero, 0x0519 ## $a3 = 00000519 /* 021EC 80968B3C 8FBF0044 */ lw $ra, 0x0044($sp) .L80968B40: diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_6K/func_80968B70.s b/asm/non_matchings/overlays/actors/ovl_Demo_6K/func_80968B70.s index b1a73d78f5..e036fd98e2 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_6K/func_80968B70.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_6K/func_80968B70.s @@ -12,7 +12,7 @@ glabel func_80968B70 /* 02248 80968B98 24C69528 */ addiu $a2, $a2, %lo(D_80969528) ## $a2 = 80969528 /* 0224C 80968B9C 27A40060 */ addiu $a0, $sp, 0x0060 ## $a0 = FFFFFFD8 /* 02250 80968BA0 24070524 */ addiu $a3, $zero, 0x0524 ## $a3 = 00000524 -/* 02254 80968BA4 0C031AB1 */ jal func_800C6AC4 +/* 02254 80968BA4 0C031AB1 */ jal Graph_OpenDisps /* 02258 80968BA8 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 /* 0225C 80968BAC 8FB8008C */ lw $t8, 0x008C($sp) /* 02260 80968BB0 0C024F61 */ jal func_80093D84 @@ -72,7 +72,7 @@ glabel func_80968B70 /* 02338 80968C88 AFAC0020 */ sw $t4, 0x0020($sp) /* 0233C 80968C8C 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 02340 80968C90 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 02344 80968C94 0C0253D0 */ jal Draw_TwoTexScroll +/* 02344 80968C94 0C0253D0 */ jal Gfx_TwoTexScroll /* 02348 80968C98 AFA20058 */ sw $v0, 0x0058($sp) /* 0234C 80968C9C 8FA30058 */ lw $v1, 0x0058($sp) /* 02350 80968CA0 3C068097 */ lui $a2, %hi(D_80969548) ## $a2 = 80970000 @@ -275,7 +275,7 @@ glabel func_80968B70 /* 02638 80968F88 AC580004 */ sw $t8, 0x0004($v0) ## FFFFFF0A /* 0263C 80968F8C 8FAC008C */ lw $t4, 0x008C($sp) /* 02640 80968F90 24070558 */ addiu $a3, $zero, 0x0558 ## $a3 = 00000558 -/* 02644 80968F94 0C031AD5 */ jal func_800C6B54 +/* 02644 80968F94 0C031AD5 */ jal Graph_CloseDisps /* 02648 80968F98 8D850000 */ lw $a1, 0x0000($t4) ## FFFFFF0E /* 0264C 80968F9C 8FBF003C */ lw $ra, 0x003C($sp) /* 02650 80968FA0 8FB00034 */ lw $s0, 0x0034($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_6K/func_80968FB0.s b/asm/non_matchings/overlays/actors/ovl_Demo_6K/func_80968FB0.s index f03d8cf498..3a9ef4100f 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_6K/func_80968FB0.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_6K/func_80968FB0.s @@ -18,7 +18,7 @@ glabel func_80968FB0 /* 0269C 80968FEC 8C650000 */ lw $a1, 0x0000($v1) ## 00000000 /* 026A0 80968FF0 AFA20060 */ sw $v0, 0x0060($sp) /* 026A4 80968FF4 2407056A */ addiu $a3, $zero, 0x056A ## $a3 = 0000056A -/* 026A8 80968FF8 0C031AB1 */ jal func_800C6AC4 +/* 026A8 80968FF8 0C031AB1 */ jal Graph_OpenDisps /* 026AC 80968FFC AFA50050 */ sw $a1, 0x0050($sp) /* 026B0 80969000 8FB8006C */ lw $t8, 0x006C($sp) /* 026B4 80969004 0C024F61 */ jal func_80093D84 @@ -125,7 +125,7 @@ glabel func_80968FB0 /* 02848 80969198 24C69578 */ addiu $a2, $a2, %lo(D_80969578) ## $a2 = 80969578 /* 0284C 8096919C 27A40040 */ addiu $a0, $sp, 0x0040 ## $a0 = FFFFFFD8 /* 02850 809691A0 24070583 */ addiu $a3, $zero, 0x0583 ## $a3 = 00000583 -/* 02854 809691A4 0C031AD5 */ jal func_800C6B54 +/* 02854 809691A4 0C031AD5 */ jal Graph_CloseDisps /* 02858 809691A8 8F250000 */ lw $a1, 0x0000($t9) ## 0C184B50 /* 0285C 809691AC 8FBF0014 */ lw $ra, 0x0014($sp) /* 02860 809691B0 27BD0068 */ addiu $sp, $sp, 0x0068 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Du/DemoDu_Destroy.s b/asm/non_matchings/overlays/actors/ovl_Demo_Du/DemoDu_Destroy.s index 98689fbb53..2e96d772a1 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Du/DemoDu_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Du/DemoDu_Destroy.s @@ -1,11 +1,11 @@ glabel DemoDu_Destroy /* 00000 80969AD0 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00004 80969AD4 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00008 80969AD8 0C0295BC */ jal func_800A56F0 +/* 00004 80969AD4 AFBF0014 */ sw $ra, 0x0014($sp) +/* 00008 80969AD8 0C0295BC */ jal SkelAnime_Free /* 0000C 80969ADC 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 00010 80969AE0 8FBF0014 */ lw $ra, 0x0014($sp) +/* 00010 80969AE0 8FBF0014 */ lw $ra, 0x0014($sp) /* 00014 80969AE4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00018 80969AE8 03E00008 */ jr $ra +/* 00018 80969AE8 03E00008 */ jr $ra /* 0001C 80969AEC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_80969DDC.s b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_80969DDC.s index 8841914720..f0454cb0c5 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_80969DDC.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_80969DDC.s @@ -1,43 +1,43 @@ glabel func_80969DDC /* 0030C 80969DDC 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 00310 80969DE0 AFBF0024 */ sw $ra, 0x0024($sp) -/* 00314 80969DE4 AFA40028 */ sw $a0, 0x0028($sp) -/* 00318 80969DE8 AFA5002C */ sw $a1, 0x002C($sp) -/* 0031C 80969DEC AFA60030 */ sw $a2, 0x0030($sp) -/* 00320 80969DF0 AFA70034 */ sw $a3, 0x0034($sp) +/* 00310 80969DE0 AFBF0024 */ sw $ra, 0x0024($sp) +/* 00314 80969DE4 AFA40028 */ sw $a0, 0x0028($sp) +/* 00318 80969DE8 AFA5002C */ sw $a1, 0x002C($sp) +/* 0031C 80969DEC AFA60030 */ sw $a2, 0x0030($sp) +/* 00320 80969DF0 AFA70034 */ sw $a3, 0x0034($sp) /* 00324 80969DF4 0C028800 */ jal SkelAnime_GetFrameCount - + /* 00328 80969DF8 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 0032C 80969DFC 8FAE0038 */ lw $t6, 0x0038($sp) -/* 00330 80969E00 8FA40028 */ lw $a0, 0x0028($sp) -/* 00334 80969E04 8FA5002C */ lw $a1, 0x002C($sp) -/* 00338 80969E08 15C00007 */ bne $t6, $zero, .L80969E28 +/* 0032C 80969DFC 8FAE0038 */ lw $t6, 0x0038($sp) +/* 00330 80969E00 8FA40028 */ lw $a0, 0x0028($sp) +/* 00334 80969E04 8FA5002C */ lw $a1, 0x002C($sp) +/* 00338 80969E08 15C00007 */ bne $t6, $zero, .L80969E28 /* 0033C 80969E0C 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C /* 00340 80969E10 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 00344 80969E14 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 /* 00348 80969E18 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 /* 0034C 80969E1C 44816000 */ mtc1 $at, $f12 ## $f12 = 1.00 -/* 00350 80969E20 10000006 */ beq $zero, $zero, .L80969E3C -/* 00354 80969E24 468020A0 */ cvt.s.w $f2, $f4 +/* 00350 80969E20 10000006 */ beq $zero, $zero, .L80969E3C +/* 00354 80969E24 468020A0 */ cvt.s.w $f2, $f4 .L80969E28: /* 00358 80969E28 44823000 */ mtc1 $v0, $f6 ## $f6 = 0.00 /* 0035C 80969E2C 3C01BF80 */ lui $at, 0xBF80 ## $at = BF800000 /* 00360 80969E30 44801000 */ mtc1 $zero, $f2 ## $f2 = 0.00 /* 00364 80969E34 44816000 */ mtc1 $at, $f12 ## $f12 = -1.00 -/* 00368 80969E38 46803020 */ cvt.s.w $f0, $f6 +/* 00368 80969E38 46803020 */ cvt.s.w $f0, $f6 .L80969E3C: -/* 0036C 80969E3C 93AF0033 */ lbu $t7, 0x0033($sp) -/* 00370 80969E40 C7A80034 */ lwc1 $f8, 0x0034($sp) -/* 00374 80969E44 44066000 */ mfc1 $a2, $f12 -/* 00378 80969E48 44070000 */ mfc1 $a3, $f0 -/* 0037C 80969E4C E7A20010 */ swc1 $f2, 0x0010($sp) -/* 00380 80969E50 AFAF0014 */ sw $t7, 0x0014($sp) -/* 00384 80969E54 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 00388 80969E58 E7A80018 */ swc1 $f8, 0x0018($sp) -/* 0038C 80969E5C 8FBF0024 */ lw $ra, 0x0024($sp) +/* 0036C 80969E3C 93AF0033 */ lbu $t7, 0x0033($sp) +/* 00370 80969E40 C7A80034 */ lwc1 $f8, 0x0034($sp) +/* 00374 80969E44 44066000 */ mfc1 $a2, $f12 +/* 00378 80969E48 44070000 */ mfc1 $a3, $f0 +/* 0037C 80969E4C E7A20010 */ swc1 $f2, 0x0010($sp) +/* 00380 80969E50 AFAF0014 */ sw $t7, 0x0014($sp) +/* 00384 80969E54 0C029468 */ jal SkelAnime_ChangeAnim + +/* 00388 80969E58 E7A80018 */ swc1 $f8, 0x0018($sp) +/* 0038C 80969E5C 8FBF0024 */ lw $ra, 0x0024($sp) /* 00390 80969E60 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 00394 80969E64 03E00008 */ jr $ra +/* 00394 80969E64 03E00008 */ jr $ra /* 00398 80969E68 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_80969E6C.s b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_80969E6C.s index 222617d943..4a0b5382b7 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_80969E6C.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_80969E6C.s @@ -1,31 +1,31 @@ glabel func_80969E6C /* 0039C 80969E6C 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 003A0 80969E70 AFA40028 */ sw $a0, 0x0028($sp) -/* 003A4 80969E74 AFA5002C */ sw $a1, 0x002C($sp) +/* 003A0 80969E70 AFA40028 */ sw $a0, 0x0028($sp) +/* 003A4 80969E74 AFA5002C */ sw $a1, 0x002C($sp) /* 003A8 80969E78 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 003AC 80969E7C 8FA50028 */ lw $a1, 0x0028($sp) -/* 003B0 80969E80 AFBF0024 */ sw $ra, 0x0024($sp) +/* 003AC 80969E7C 8FA50028 */ lw $a1, 0x0028($sp) +/* 003B0 80969E80 AFBF0024 */ sw $ra, 0x0024($sp) /* 003B4 80969E84 3C060601 */ lui $a2, 0x0601 ## $a2 = 06010000 /* 003B8 80969E88 3C070600 */ lui $a3, 0x0600 ## $a3 = 06000000 /* 003BC 80969E8C 24E76EB0 */ addiu $a3, $a3, 0x6EB0 ## $a3 = 06006EB0 /* 003C0 80969E90 24C61CA8 */ addiu $a2, $a2, 0x1CA8 ## $a2 = 06011CA8 -/* 003C4 80969E94 AFA00010 */ sw $zero, 0x0010($sp) -/* 003C8 80969E98 AFA00014 */ sw $zero, 0x0014($sp) -/* 003CC 80969E9C AFA00018 */ sw $zero, 0x0018($sp) -/* 003D0 80969EA0 0C0291BE */ jal func_800A46F8 +/* 003C4 80969E94 AFA00010 */ sw $zero, 0x0010($sp) +/* 003C8 80969E98 AFA00014 */ sw $zero, 0x0014($sp) +/* 003CC 80969E9C AFA00018 */ sw $zero, 0x0018($sp) +/* 003D0 80969EA0 0C0291BE */ jal SkelAnime_InitSV /* 003D4 80969EA4 24A5014C */ addiu $a1, $a1, 0x014C ## $a1 = 0000014C /* 003D8 80969EA8 3C018097 */ lui $at, %hi(D_8096D0E8) ## $at = 80970000 -/* 003DC 80969EAC 8FA40028 */ lw $a0, 0x0028($sp) -/* 003E0 80969EB0 C424D0E8 */ lwc1 $f4, %lo(D_8096D0E8)($at) +/* 003DC 80969EAC 8FA40028 */ lw $a0, 0x0028($sp) +/* 003E0 80969EB0 C424D0E8 */ lwc1 $f4, %lo(D_8096D0E8)($at) /* 003E4 80969EB4 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 -/* 003E8 80969EB8 0C25A6DE */ jal func_80969B78 +/* 003E8 80969EB8 0C25A6DE */ jal func_80969B78 /* 003EC 80969EBC E48400BC */ swc1 $f4, 0x00BC($a0) ## 000000BC -/* 003F0 80969EC0 8FA40028 */ lw $a0, 0x0028($sp) -/* 003F4 80969EC4 0C25A6E3 */ jal func_80969B8C +/* 003F0 80969EC0 8FA40028 */ lw $a0, 0x0028($sp) +/* 003F4 80969EC4 0C25A6E3 */ jal func_80969B8C /* 003F8 80969EC8 24050003 */ addiu $a1, $zero, 0x0003 ## $a1 = 00000003 -/* 003FC 80969ECC 8FBF0024 */ lw $ra, 0x0024($sp) +/* 003FC 80969ECC 8FBF0024 */ lw $ra, 0x0024($sp) /* 00400 80969ED0 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 00404 80969ED4 03E00008 */ jr $ra +/* 00404 80969ED4 03E00008 */ jr $ra /* 00408 80969ED8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096A0D8.s b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096A0D8.s index 81c51a3ba6..3dee2407b4 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096A0D8.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096A0D8.s @@ -1,43 +1,43 @@ glabel func_8096A0D8 /* 00608 8096A0D8 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 0060C 8096A0DC AFBF0024 */ sw $ra, 0x0024($sp) -/* 00610 8096A0E0 AFA40028 */ sw $a0, 0x0028($sp) +/* 0060C 8096A0DC AFBF0024 */ sw $ra, 0x0024($sp) +/* 00610 8096A0E0 AFA40028 */ sw $a0, 0x0028($sp) /* 00614 8096A0E4 90AE1D6C */ lbu $t6, 0x1D6C($a1) ## 00001D6C -/* 00618 8096A0E8 51C0001D */ beql $t6, $zero, .L8096A160 -/* 0061C 8096A0EC 8FBF0024 */ lw $ra, 0x0024($sp) +/* 00618 8096A0E8 51C0001D */ beql $t6, $zero, .L8096A160 +/* 0061C 8096A0EC 8FBF0024 */ lw $ra, 0x0024($sp) /* 00620 8096A0F0 8CA21D94 */ lw $v0, 0x1D94($a1) ## 00001D94 -/* 00624 8096A0F4 5040001A */ beql $v0, $zero, .L8096A160 -/* 00628 8096A0F8 8FBF0024 */ lw $ra, 0x0024($sp) +/* 00624 8096A0F4 5040001A */ beql $v0, $zero, .L8096A160 +/* 00628 8096A0F8 8FBF0024 */ lw $ra, 0x0024($sp) /* 0062C 8096A0FC 944F0000 */ lhu $t7, 0x0000($v0) ## 00000000 /* 00630 8096A100 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 /* 00634 8096A104 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 -/* 00638 8096A108 51E10015 */ beql $t7, $at, .L8096A160 -/* 0063C 8096A10C 8FBF0024 */ lw $ra, 0x0024($sp) +/* 00638 8096A108 51E10015 */ beql $t7, $at, .L8096A160 +/* 0063C 8096A10C 8FBF0024 */ lw $ra, 0x0024($sp) /* 00640 8096A110 0C028800 */ jal SkelAnime_GetFrameCount - + /* 00644 8096A114 24840800 */ addiu $a0, $a0, 0x0800 ## $a0 = 06000800 /* 00648 8096A118 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 0064C 8096A11C 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 00650 8096A120 8FA40028 */ lw $a0, 0x0028($sp) -/* 00654 8096A124 468021A0 */ cvt.s.w $f6, $f4 +/* 00650 8096A120 8FA40028 */ lw $a0, 0x0028($sp) +/* 00654 8096A124 468021A0 */ cvt.s.w $f6, $f4 /* 00658 8096A128 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 0065C 8096A12C 24180002 */ addiu $t8, $zero, 0x0002 ## $t8 = 00000002 -/* 00660 8096A130 44070000 */ mfc1 $a3, $f0 -/* 00664 8096A134 AFB80014 */ sw $t8, 0x0014($sp) +/* 00660 8096A130 44070000 */ mfc1 $a3, $f0 +/* 00664 8096A134 AFB80014 */ sw $t8, 0x0014($sp) /* 00668 8096A138 24A50800 */ addiu $a1, $a1, 0x0800 ## $a1 = 06000800 -/* 0066C 8096A13C E7A60010 */ swc1 $f6, 0x0010($sp) +/* 0066C 8096A13C E7A60010 */ swc1 $f6, 0x0010($sp) /* 00670 8096A140 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 00674 8096A144 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 00678 8096A148 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 0067C 8096A14C E7A00018 */ swc1 $f0, 0x0018($sp) -/* 00680 8096A150 8FA80028 */ lw $t0, 0x0028($sp) +/* 00678 8096A148 0C029468 */ jal SkelAnime_ChangeAnim + +/* 0067C 8096A14C E7A00018 */ swc1 $f0, 0x0018($sp) +/* 00680 8096A150 8FA80028 */ lw $t0, 0x0028($sp) /* 00684 8096A154 24190004 */ addiu $t9, $zero, 0x0004 ## $t9 = 00000004 /* 00688 8096A158 AD190198 */ sw $t9, 0x0198($t0) ## 00000198 -/* 0068C 8096A15C 8FBF0024 */ lw $ra, 0x0024($sp) +/* 0068C 8096A15C 8FBF0024 */ lw $ra, 0x0024($sp) .L8096A160: /* 00690 8096A160 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 00694 8096A164 03E00008 */ jr $ra +/* 00694 8096A164 03E00008 */ jr $ra /* 00698 8096A168 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096A16C.s b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096A16C.s index 793ab67821..e45860f7c9 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096A16C.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096A16C.s @@ -1,33 +1,33 @@ glabel func_8096A16C /* 0069C 8096A16C 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 006A0 8096A170 AFBF0024 */ sw $ra, 0x0024($sp) -/* 006A4 8096A174 10A00014 */ beq $a1, $zero, .L8096A1C8 -/* 006A8 8096A178 AFA40028 */ sw $a0, 0x0028($sp) +/* 006A0 8096A170 AFBF0024 */ sw $ra, 0x0024($sp) +/* 006A4 8096A174 10A00014 */ beq $a1, $zero, .L8096A1C8 +/* 006A8 8096A178 AFA40028 */ sw $a0, 0x0028($sp) /* 006AC 8096A17C 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 /* 006B0 8096A180 0C028800 */ jal SkelAnime_GetFrameCount - + /* 006B4 8096A184 24840D00 */ addiu $a0, $a0, 0x0D00 ## $a0 = 06000D00 /* 006B8 8096A188 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 006BC 8096A18C 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 006C0 8096A190 8FA40028 */ lw $a0, 0x0028($sp) -/* 006C4 8096A194 468021A0 */ cvt.s.w $f6, $f4 +/* 006C0 8096A190 8FA40028 */ lw $a0, 0x0028($sp) +/* 006C4 8096A194 468021A0 */ cvt.s.w $f6, $f4 /* 006C8 8096A198 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 006CC 8096A19C 44070000 */ mfc1 $a3, $f0 +/* 006CC 8096A19C 44070000 */ mfc1 $a3, $f0 /* 006D0 8096A1A0 24A50D00 */ addiu $a1, $a1, 0x0D00 ## $a1 = 06000D00 /* 006D4 8096A1A4 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 006D8 8096A1A8 AFA00014 */ sw $zero, 0x0014($sp) -/* 006DC 8096A1AC E7A60010 */ swc1 $f6, 0x0010($sp) +/* 006D8 8096A1A8 AFA00014 */ sw $zero, 0x0014($sp) +/* 006DC 8096A1AC E7A60010 */ swc1 $f6, 0x0010($sp) /* 006E0 8096A1B0 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 006E4 8096A1B4 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 006E8 8096A1B8 E7A00018 */ swc1 $f0, 0x0018($sp) -/* 006EC 8096A1BC 8FAF0028 */ lw $t7, 0x0028($sp) +/* 006E4 8096A1B4 0C029468 */ jal SkelAnime_ChangeAnim + +/* 006E8 8096A1B8 E7A00018 */ swc1 $f0, 0x0018($sp) +/* 006EC 8096A1BC 8FAF0028 */ lw $t7, 0x0028($sp) /* 006F0 8096A1C0 240E0005 */ addiu $t6, $zero, 0x0005 ## $t6 = 00000005 /* 006F4 8096A1C4 ADEE0198 */ sw $t6, 0x0198($t7) ## 00000198 .L8096A1C8: -/* 006F8 8096A1C8 8FBF0024 */ lw $ra, 0x0024($sp) +/* 006F8 8096A1C8 8FBF0024 */ lw $ra, 0x0024($sp) /* 006FC 8096A1CC 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 00700 8096A1D0 03E00008 */ jr $ra +/* 00700 8096A1D0 03E00008 */ jr $ra /* 00704 8096A1D4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096A360.s b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096A360.s index 03b1daae8e..ec4a48b864 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096A360.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096A360.s @@ -1,24 +1,24 @@ glabel func_8096A360 /* 00890 8096A360 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 00894 8096A364 AFA40028 */ sw $a0, 0x0028($sp) -/* 00898 8096A368 AFA5002C */ sw $a1, 0x002C($sp) +/* 00894 8096A364 AFA40028 */ sw $a0, 0x0028($sp) +/* 00898 8096A368 AFA5002C */ sw $a1, 0x002C($sp) /* 0089C 8096A36C 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 008A0 8096A370 8FA50028 */ lw $a1, 0x0028($sp) -/* 008A4 8096A374 AFBF0024 */ sw $ra, 0x0024($sp) +/* 008A0 8096A370 8FA50028 */ lw $a1, 0x0028($sp) +/* 008A4 8096A374 AFBF0024 */ sw $ra, 0x0024($sp) /* 008A8 8096A378 3C060601 */ lui $a2, 0x0601 ## $a2 = 06010000 /* 008AC 8096A37C 24C61CA8 */ addiu $a2, $a2, 0x1CA8 ## $a2 = 06011CA8 -/* 008B0 8096A380 AFA00010 */ sw $zero, 0x0010($sp) -/* 008B4 8096A384 AFA00014 */ sw $zero, 0x0014($sp) -/* 008B8 8096A388 AFA00018 */ sw $zero, 0x0018($sp) +/* 008B0 8096A380 AFA00010 */ sw $zero, 0x0010($sp) +/* 008B4 8096A384 AFA00014 */ sw $zero, 0x0014($sp) +/* 008B8 8096A388 AFA00018 */ sw $zero, 0x0018($sp) /* 008BC 8096A38C 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 008C0 8096A390 0C0291BE */ jal func_800A46F8 +/* 008C0 8096A390 0C0291BE */ jal SkelAnime_InitSV /* 008C4 8096A394 24A5014C */ addiu $a1, $a1, 0x014C ## $a1 = 0000014C -/* 008C8 8096A398 8FAF0028 */ lw $t7, 0x0028($sp) +/* 008C8 8096A398 8FAF0028 */ lw $t7, 0x0028($sp) /* 008CC 8096A39C 240E0007 */ addiu $t6, $zero, 0x0007 ## $t6 = 00000007 /* 008D0 8096A3A0 ADEE0198 */ sw $t6, 0x0198($t7) ## 00000198 -/* 008D4 8096A3A4 8FBF0024 */ lw $ra, 0x0024($sp) +/* 008D4 8096A3A4 8FBF0024 */ lw $ra, 0x0024($sp) /* 008D8 8096A3A8 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 008DC 8096A3AC 03E00008 */ jr $ra +/* 008DC 8096A3AC 03E00008 */ jr $ra /* 008E0 8096A3B0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096AA5C.s b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096AA5C.s index f4fb0ad896..155127a067 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096AA5C.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096AA5C.s @@ -1,48 +1,48 @@ glabel func_8096AA5C /* 00F8C 8096AA5C 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 00F90 8096AA60 AFBF0024 */ sw $ra, 0x0024($sp) -/* 00F94 8096AA64 AFA40028 */ sw $a0, 0x0028($sp) +/* 00F90 8096AA60 AFBF0024 */ sw $ra, 0x0024($sp) +/* 00F94 8096AA64 AFA40028 */ sw $a0, 0x0028($sp) /* 00F98 8096AA68 90AE1D6C */ lbu $t6, 0x1D6C($a1) ## 00001D6C -/* 00F9C 8096AA6C 51C00021 */ beql $t6, $zero, .L8096AAF4 -/* 00FA0 8096AA70 8FBF0024 */ lw $ra, 0x0024($sp) +/* 00F9C 8096AA6C 51C00021 */ beql $t6, $zero, .L8096AAF4 +/* 00FA0 8096AA70 8FBF0024 */ lw $ra, 0x0024($sp) /* 00FA4 8096AA74 8CA21D94 */ lw $v0, 0x1D94($a1) ## 00001D94 -/* 00FA8 8096AA78 5040001E */ beql $v0, $zero, .L8096AAF4 -/* 00FAC 8096AA7C 8FBF0024 */ lw $ra, 0x0024($sp) +/* 00FA8 8096AA78 5040001E */ beql $v0, $zero, .L8096AAF4 +/* 00FAC 8096AA7C 8FBF0024 */ lw $ra, 0x0024($sp) /* 00FB0 8096AA80 944F0000 */ lhu $t7, 0x0000($v0) ## 00000000 /* 00FB4 8096AA84 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 /* 00FB8 8096AA88 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 -/* 00FBC 8096AA8C 11E10018 */ beq $t7, $at, .L8096AAF0 +/* 00FBC 8096AA8C 11E10018 */ beq $t7, $at, .L8096AAF0 /* 00FC0 8096AA90 2484288C */ addiu $a0, $a0, 0x288C ## $a0 = 0600288C /* 00FC4 8096AA94 0C028800 */ jal SkelAnime_GetFrameCount - -/* 00FC8 8096AA98 AFA5002C */ sw $a1, 0x002C($sp) + +/* 00FC8 8096AA98 AFA5002C */ sw $a1, 0x002C($sp) /* 00FCC 8096AA9C 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 00FD0 8096AAA0 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 00FD4 8096AAA4 8FA40028 */ lw $a0, 0x0028($sp) -/* 00FD8 8096AAA8 468021A0 */ cvt.s.w $f6, $f4 +/* 00FD4 8096AAA4 8FA40028 */ lw $a0, 0x0028($sp) +/* 00FD8 8096AAA8 468021A0 */ cvt.s.w $f6, $f4 /* 00FDC 8096AAAC 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 00FE0 8096AAB0 24180002 */ addiu $t8, $zero, 0x0002 ## $t8 = 00000002 -/* 00FE4 8096AAB4 44070000 */ mfc1 $a3, $f0 -/* 00FE8 8096AAB8 AFB80014 */ sw $t8, 0x0014($sp) +/* 00FE4 8096AAB4 44070000 */ mfc1 $a3, $f0 +/* 00FE8 8096AAB8 AFB80014 */ sw $t8, 0x0014($sp) /* 00FEC 8096AABC 24A5288C */ addiu $a1, $a1, 0x288C ## $a1 = 0600288C -/* 00FF0 8096AAC0 E7A60010 */ swc1 $f6, 0x0010($sp) +/* 00FF0 8096AAC0 E7A60010 */ swc1 $f6, 0x0010($sp) /* 00FF4 8096AAC4 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 00FF8 8096AAC8 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 00FFC 8096AACC 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 01000 8096AAD0 E7A00018 */ swc1 $f0, 0x0018($sp) -/* 01004 8096AAD4 8FA40028 */ lw $a0, 0x0028($sp) +/* 00FFC 8096AACC 0C029468 */ jal SkelAnime_ChangeAnim + +/* 01000 8096AAD0 E7A00018 */ swc1 $f0, 0x0018($sp) +/* 01004 8096AAD4 8FA40028 */ lw $a0, 0x0028($sp) /* 01008 8096AAD8 24190009 */ addiu $t9, $zero, 0x0009 ## $t9 = 00000009 /* 0100C 8096AADC 24080001 */ addiu $t0, $zero, 0x0001 ## $t0 = 00000001 /* 01010 8096AAE0 AC990198 */ sw $t9, 0x0198($a0) ## 00000198 /* 01014 8096AAE4 AC88019C */ sw $t0, 0x019C($a0) ## 0000019C -/* 01018 8096AAE8 0C25AA5C */ jal func_8096A970 -/* 0101C 8096AAEC 8FA5002C */ lw $a1, 0x002C($sp) +/* 01018 8096AAE8 0C25AA5C */ jal func_8096A970 +/* 0101C 8096AAEC 8FA5002C */ lw $a1, 0x002C($sp) .L8096AAF0: -/* 01020 8096AAF0 8FBF0024 */ lw $ra, 0x0024($sp) +/* 01020 8096AAF0 8FBF0024 */ lw $ra, 0x0024($sp) .L8096AAF4: /* 01024 8096AAF4 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 01028 8096AAF8 03E00008 */ jr $ra +/* 01028 8096AAF8 03E00008 */ jr $ra /* 0102C 8096AAFC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096AB8C.s b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096AB8C.s index bd6c0459d5..9bda69980c 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096AB8C.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096AB8C.s @@ -1,33 +1,33 @@ glabel func_8096AB8C /* 010BC 8096AB8C 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 010C0 8096AB90 AFBF0024 */ sw $ra, 0x0024($sp) -/* 010C4 8096AB94 10A00014 */ beq $a1, $zero, .L8096ABE8 -/* 010C8 8096AB98 AFA40028 */ sw $a0, 0x0028($sp) +/* 010C0 8096AB90 AFBF0024 */ sw $ra, 0x0024($sp) +/* 010C4 8096AB94 10A00014 */ beq $a1, $zero, .L8096ABE8 +/* 010C8 8096AB98 AFA40028 */ sw $a0, 0x0028($sp) /* 010CC 8096AB9C 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 /* 010D0 8096ABA0 0C028800 */ jal SkelAnime_GetFrameCount - + /* 010D4 8096ABA4 24846EB0 */ addiu $a0, $a0, 0x6EB0 ## $a0 = 06006EB0 /* 010D8 8096ABA8 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 010DC 8096ABAC 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 010E0 8096ABB0 8FA40028 */ lw $a0, 0x0028($sp) -/* 010E4 8096ABB4 468021A0 */ cvt.s.w $f6, $f4 +/* 010E0 8096ABB0 8FA40028 */ lw $a0, 0x0028($sp) +/* 010E4 8096ABB4 468021A0 */ cvt.s.w $f6, $f4 /* 010E8 8096ABB8 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 010EC 8096ABBC 44070000 */ mfc1 $a3, $f0 +/* 010EC 8096ABBC 44070000 */ mfc1 $a3, $f0 /* 010F0 8096ABC0 24A56EB0 */ addiu $a1, $a1, 0x6EB0 ## $a1 = 06006EB0 /* 010F4 8096ABC4 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 010F8 8096ABC8 AFA00014 */ sw $zero, 0x0014($sp) -/* 010FC 8096ABCC E7A60010 */ swc1 $f6, 0x0010($sp) +/* 010F8 8096ABC8 AFA00014 */ sw $zero, 0x0014($sp) +/* 010FC 8096ABCC E7A60010 */ swc1 $f6, 0x0010($sp) /* 01100 8096ABD0 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 01104 8096ABD4 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 01108 8096ABD8 E7A00018 */ swc1 $f0, 0x0018($sp) -/* 0110C 8096ABDC 8FAF0028 */ lw $t7, 0x0028($sp) +/* 01104 8096ABD4 0C029468 */ jal SkelAnime_ChangeAnim + +/* 01108 8096ABD8 E7A00018 */ swc1 $f0, 0x0018($sp) +/* 0110C 8096ABDC 8FAF0028 */ lw $t7, 0x0028($sp) /* 01110 8096ABE0 240E000C */ addiu $t6, $zero, 0x000C ## $t6 = 0000000C /* 01114 8096ABE4 ADEE0198 */ sw $t6, 0x0198($t7) ## 00000198 .L8096ABE8: -/* 01118 8096ABE8 8FBF0024 */ lw $ra, 0x0024($sp) +/* 01118 8096ABE8 8FBF0024 */ lw $ra, 0x0024($sp) /* 0111C 8096ABEC 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 01120 8096ABF0 03E00008 */ jr $ra +/* 01120 8096ABF0 03E00008 */ jr $ra /* 01124 8096ABF4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096ABF8.s b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096ABF8.s index 40a4f1fefd..14dc69327d 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096ABF8.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096ABF8.s @@ -1,44 +1,44 @@ glabel func_8096ABF8 /* 01128 8096ABF8 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 0112C 8096ABFC AFBF0024 */ sw $ra, 0x0024($sp) -/* 01130 8096AC00 AFA40028 */ sw $a0, 0x0028($sp) +/* 0112C 8096ABFC AFBF0024 */ sw $ra, 0x0024($sp) +/* 01130 8096AC00 AFA40028 */ sw $a0, 0x0028($sp) /* 01134 8096AC04 90AE1D6C */ lbu $t6, 0x1D6C($a1) ## 00001D6C -/* 01138 8096AC08 51C0001E */ beql $t6, $zero, .L8096AC84 -/* 0113C 8096AC0C 8FBF0024 */ lw $ra, 0x0024($sp) +/* 01138 8096AC08 51C0001E */ beql $t6, $zero, .L8096AC84 +/* 0113C 8096AC0C 8FBF0024 */ lw $ra, 0x0024($sp) /* 01140 8096AC10 8CA21D94 */ lw $v0, 0x1D94($a1) ## 00001D94 -/* 01144 8096AC14 5040001B */ beql $v0, $zero, .L8096AC84 -/* 01148 8096AC18 8FBF0024 */ lw $ra, 0x0024($sp) +/* 01144 8096AC14 5040001B */ beql $v0, $zero, .L8096AC84 +/* 01148 8096AC18 8FBF0024 */ lw $ra, 0x0024($sp) /* 0114C 8096AC1C 944F0000 */ lhu $t7, 0x0000($v0) ## 00000000 /* 01150 8096AC20 24010003 */ addiu $at, $zero, 0x0003 ## $at = 00000003 /* 01154 8096AC24 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 -/* 01158 8096AC28 51E10016 */ beql $t7, $at, .L8096AC84 -/* 0115C 8096AC2C 8FBF0024 */ lw $ra, 0x0024($sp) +/* 01158 8096AC28 51E10016 */ beql $t7, $at, .L8096AC84 +/* 0115C 8096AC2C 8FBF0024 */ lw $ra, 0x0024($sp) /* 01160 8096AC30 0C028800 */ jal SkelAnime_GetFrameCount - + /* 01164 8096AC34 24842374 */ addiu $a0, $a0, 0x2374 ## $a0 = 06002374 /* 01168 8096AC38 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 0116C 8096AC3C 3C01C080 */ lui $at, 0xC080 ## $at = C0800000 /* 01170 8096AC40 44814000 */ mtc1 $at, $f8 ## $f8 = -4.00 -/* 01174 8096AC44 468021A0 */ cvt.s.w $f6, $f4 -/* 01178 8096AC48 8FA40028 */ lw $a0, 0x0028($sp) +/* 01174 8096AC44 468021A0 */ cvt.s.w $f6, $f4 +/* 01178 8096AC48 8FA40028 */ lw $a0, 0x0028($sp) /* 0117C 8096AC4C 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 01180 8096AC50 24180002 */ addiu $t8, $zero, 0x0002 ## $t8 = 00000002 -/* 01184 8096AC54 AFB80014 */ sw $t8, 0x0014($sp) +/* 01184 8096AC54 AFB80014 */ sw $t8, 0x0014($sp) /* 01188 8096AC58 24A52374 */ addiu $a1, $a1, 0x2374 ## $a1 = 06002374 -/* 0118C 8096AC5C E7A60010 */ swc1 $f6, 0x0010($sp) +/* 0118C 8096AC5C E7A60010 */ swc1 $f6, 0x0010($sp) /* 01190 8096AC60 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 01194 8096AC64 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 01198 8096AC68 E7A80018 */ swc1 $f8, 0x0018($sp) -/* 0119C 8096AC6C 0C029468 */ jal SkelAnime_ChangeAnimation - +/* 01198 8096AC68 E7A80018 */ swc1 $f8, 0x0018($sp) +/* 0119C 8096AC6C 0C029468 */ jal SkelAnime_ChangeAnim + /* 011A0 8096AC70 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 011A4 8096AC74 8FA80028 */ lw $t0, 0x0028($sp) +/* 011A4 8096AC74 8FA80028 */ lw $t0, 0x0028($sp) /* 011A8 8096AC78 2419000D */ addiu $t9, $zero, 0x000D ## $t9 = 0000000D /* 011AC 8096AC7C AD190198 */ sw $t9, 0x0198($t0) ## 00000198 -/* 011B0 8096AC80 8FBF0024 */ lw $ra, 0x0024($sp) +/* 011B0 8096AC80 8FBF0024 */ lw $ra, 0x0024($sp) .L8096AC84: /* 011B4 8096AC84 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 011B8 8096AC88 03E00008 */ jr $ra +/* 011B8 8096AC88 03E00008 */ jr $ra /* 011BC 8096AC8C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096AC90.s b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096AC90.s index 475eaab3fe..56f5914916 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096AC90.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096AC90.s @@ -1,33 +1,33 @@ glabel func_8096AC90 /* 011C0 8096AC90 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 011C4 8096AC94 AFBF0024 */ sw $ra, 0x0024($sp) -/* 011C8 8096AC98 10A00014 */ beq $a1, $zero, .L8096ACEC -/* 011CC 8096AC9C AFA40028 */ sw $a0, 0x0028($sp) +/* 011C4 8096AC94 AFBF0024 */ sw $ra, 0x0024($sp) +/* 011C8 8096AC98 10A00014 */ beq $a1, $zero, .L8096ACEC +/* 011CC 8096AC9C AFA40028 */ sw $a0, 0x0028($sp) /* 011D0 8096ACA0 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 /* 011D4 8096ACA4 0C028800 */ jal SkelAnime_GetFrameCount - + /* 011D8 8096ACA8 24846EB0 */ addiu $a0, $a0, 0x6EB0 ## $a0 = 06006EB0 /* 011DC 8096ACAC 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 011E0 8096ACB0 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 011E4 8096ACB4 8FA40028 */ lw $a0, 0x0028($sp) -/* 011E8 8096ACB8 468021A0 */ cvt.s.w $f6, $f4 +/* 011E4 8096ACB4 8FA40028 */ lw $a0, 0x0028($sp) +/* 011E8 8096ACB8 468021A0 */ cvt.s.w $f6, $f4 /* 011EC 8096ACBC 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 011F0 8096ACC0 44070000 */ mfc1 $a3, $f0 +/* 011F0 8096ACC0 44070000 */ mfc1 $a3, $f0 /* 011F4 8096ACC4 24A56EB0 */ addiu $a1, $a1, 0x6EB0 ## $a1 = 06006EB0 /* 011F8 8096ACC8 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 011FC 8096ACCC AFA00014 */ sw $zero, 0x0014($sp) -/* 01200 8096ACD0 E7A60010 */ swc1 $f6, 0x0010($sp) +/* 011FC 8096ACCC AFA00014 */ sw $zero, 0x0014($sp) +/* 01200 8096ACD0 E7A60010 */ swc1 $f6, 0x0010($sp) /* 01204 8096ACD4 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 01208 8096ACD8 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 0120C 8096ACDC E7A00018 */ swc1 $f0, 0x0018($sp) -/* 01210 8096ACE0 8FAF0028 */ lw $t7, 0x0028($sp) +/* 01208 8096ACD8 0C029468 */ jal SkelAnime_ChangeAnim + +/* 0120C 8096ACDC E7A00018 */ swc1 $f0, 0x0018($sp) +/* 01210 8096ACE0 8FAF0028 */ lw $t7, 0x0028($sp) /* 01214 8096ACE4 240E000E */ addiu $t6, $zero, 0x000E ## $t6 = 0000000E /* 01218 8096ACE8 ADEE0198 */ sw $t6, 0x0198($t7) ## 00000198 .L8096ACEC: -/* 0121C 8096ACEC 8FBF0024 */ lw $ra, 0x0024($sp) +/* 0121C 8096ACEC 8FBF0024 */ lw $ra, 0x0024($sp) /* 01220 8096ACF0 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 01224 8096ACF4 03E00008 */ jr $ra +/* 01224 8096ACF4 03E00008 */ jr $ra /* 01228 8096ACF8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096ACFC.s b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096ACFC.s index 3ffa08bd0c..e67dd9f771 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096ACFC.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096ACFC.s @@ -1,43 +1,43 @@ glabel func_8096ACFC /* 0122C 8096ACFC 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 01230 8096AD00 AFBF0024 */ sw $ra, 0x0024($sp) -/* 01234 8096AD04 AFA40028 */ sw $a0, 0x0028($sp) +/* 01230 8096AD00 AFBF0024 */ sw $ra, 0x0024($sp) +/* 01234 8096AD04 AFA40028 */ sw $a0, 0x0028($sp) /* 01238 8096AD08 90AE1D6C */ lbu $t6, 0x1D6C($a1) ## 00001D6C -/* 0123C 8096AD0C 51C0001D */ beql $t6, $zero, .L8096AD84 -/* 01240 8096AD10 8FBF0024 */ lw $ra, 0x0024($sp) +/* 0123C 8096AD0C 51C0001D */ beql $t6, $zero, .L8096AD84 +/* 01240 8096AD10 8FBF0024 */ lw $ra, 0x0024($sp) /* 01244 8096AD14 8CA21D94 */ lw $v0, 0x1D94($a1) ## 00001D94 -/* 01248 8096AD18 5040001A */ beql $v0, $zero, .L8096AD84 -/* 0124C 8096AD1C 8FBF0024 */ lw $ra, 0x0024($sp) +/* 01248 8096AD18 5040001A */ beql $v0, $zero, .L8096AD84 +/* 0124C 8096AD1C 8FBF0024 */ lw $ra, 0x0024($sp) /* 01250 8096AD20 944F0000 */ lhu $t7, 0x0000($v0) ## 00000000 /* 01254 8096AD24 24010004 */ addiu $at, $zero, 0x0004 ## $at = 00000004 /* 01258 8096AD28 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 -/* 0125C 8096AD2C 51E10015 */ beql $t7, $at, .L8096AD84 -/* 01260 8096AD30 8FBF0024 */ lw $ra, 0x0024($sp) +/* 0125C 8096AD2C 51E10015 */ beql $t7, $at, .L8096AD84 +/* 01260 8096AD30 8FBF0024 */ lw $ra, 0x0024($sp) /* 01264 8096AD34 0C028800 */ jal SkelAnime_GetFrameCount - + /* 01268 8096AD38 24841D70 */ addiu $a0, $a0, 0x1D70 ## $a0 = 06001D70 /* 0126C 8096AD3C 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 01270 8096AD40 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 01274 8096AD44 8FA40028 */ lw $a0, 0x0028($sp) -/* 01278 8096AD48 468021A0 */ cvt.s.w $f6, $f4 +/* 01274 8096AD44 8FA40028 */ lw $a0, 0x0028($sp) +/* 01278 8096AD48 468021A0 */ cvt.s.w $f6, $f4 /* 0127C 8096AD4C 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 01280 8096AD50 24180002 */ addiu $t8, $zero, 0x0002 ## $t8 = 00000002 -/* 01284 8096AD54 44070000 */ mfc1 $a3, $f0 -/* 01288 8096AD58 AFB80014 */ sw $t8, 0x0014($sp) +/* 01284 8096AD54 44070000 */ mfc1 $a3, $f0 +/* 01288 8096AD58 AFB80014 */ sw $t8, 0x0014($sp) /* 0128C 8096AD5C 24A51D70 */ addiu $a1, $a1, 0x1D70 ## $a1 = 06001D70 -/* 01290 8096AD60 E7A60010 */ swc1 $f6, 0x0010($sp) +/* 01290 8096AD60 E7A60010 */ swc1 $f6, 0x0010($sp) /* 01294 8096AD64 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 01298 8096AD68 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 0129C 8096AD6C 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 012A0 8096AD70 E7A00018 */ swc1 $f0, 0x0018($sp) -/* 012A4 8096AD74 8FA80028 */ lw $t0, 0x0028($sp) +/* 0129C 8096AD6C 0C029468 */ jal SkelAnime_ChangeAnim + +/* 012A0 8096AD70 E7A00018 */ swc1 $f0, 0x0018($sp) +/* 012A4 8096AD74 8FA80028 */ lw $t0, 0x0028($sp) /* 012A8 8096AD78 2419000F */ addiu $t9, $zero, 0x000F ## $t9 = 0000000F /* 012AC 8096AD7C AD190198 */ sw $t9, 0x0198($t0) ## 00000198 -/* 012B0 8096AD80 8FBF0024 */ lw $ra, 0x0024($sp) +/* 012B0 8096AD80 8FBF0024 */ lw $ra, 0x0024($sp) .L8096AD84: /* 012B4 8096AD84 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 012B8 8096AD88 03E00008 */ jr $ra +/* 012B8 8096AD88 03E00008 */ jr $ra /* 012BC 8096AD8C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096AD90.s b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096AD90.s index e7cd0dcb94..a9ce0890bf 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096AD90.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096AD90.s @@ -1,34 +1,34 @@ glabel func_8096AD90 /* 012C0 8096AD90 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 012C4 8096AD94 AFBF0024 */ sw $ra, 0x0024($sp) -/* 012C8 8096AD98 10A00015 */ beq $a1, $zero, .L8096ADF0 -/* 012CC 8096AD9C AFA40028 */ sw $a0, 0x0028($sp) +/* 012C4 8096AD94 AFBF0024 */ sw $ra, 0x0024($sp) +/* 012C8 8096AD98 10A00015 */ beq $a1, $zero, .L8096ADF0 +/* 012CC 8096AD9C AFA40028 */ sw $a0, 0x0028($sp) /* 012D0 8096ADA0 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 /* 012D4 8096ADA4 0C028800 */ jal SkelAnime_GetFrameCount - + /* 012D8 8096ADA8 24842374 */ addiu $a0, $a0, 0x2374 ## $a0 = 06002374 /* 012DC 8096ADAC 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 012E0 8096ADB0 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 012E4 8096ADB4 8FA40028 */ lw $a0, 0x0028($sp) -/* 012E8 8096ADB8 468021A0 */ cvt.s.w $f6, $f4 +/* 012E4 8096ADB4 8FA40028 */ lw $a0, 0x0028($sp) +/* 012E8 8096ADB8 468021A0 */ cvt.s.w $f6, $f4 /* 012EC 8096ADBC 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 012F0 8096ADC0 240E0002 */ addiu $t6, $zero, 0x0002 ## $t6 = 00000002 -/* 012F4 8096ADC4 44070000 */ mfc1 $a3, $f0 -/* 012F8 8096ADC8 AFAE0014 */ sw $t6, 0x0014($sp) +/* 012F4 8096ADC4 44070000 */ mfc1 $a3, $f0 +/* 012F8 8096ADC8 AFAE0014 */ sw $t6, 0x0014($sp) /* 012FC 8096ADCC 24A52374 */ addiu $a1, $a1, 0x2374 ## $a1 = 06002374 -/* 01300 8096ADD0 E7A60010 */ swc1 $f6, 0x0010($sp) +/* 01300 8096ADD0 E7A60010 */ swc1 $f6, 0x0010($sp) /* 01304 8096ADD4 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 01308 8096ADD8 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 0130C 8096ADDC 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 01310 8096ADE0 E7A00018 */ swc1 $f0, 0x0018($sp) -/* 01314 8096ADE4 8FB80028 */ lw $t8, 0x0028($sp) +/* 0130C 8096ADDC 0C029468 */ jal SkelAnime_ChangeAnim + +/* 01310 8096ADE0 E7A00018 */ swc1 $f0, 0x0018($sp) +/* 01314 8096ADE4 8FB80028 */ lw $t8, 0x0028($sp) /* 01318 8096ADE8 240F0010 */ addiu $t7, $zero, 0x0010 ## $t7 = 00000010 /* 0131C 8096ADEC AF0F0198 */ sw $t7, 0x0198($t8) ## 00000198 .L8096ADF0: -/* 01320 8096ADF0 8FBF0024 */ lw $ra, 0x0024($sp) +/* 01320 8096ADF0 8FBF0024 */ lw $ra, 0x0024($sp) /* 01324 8096ADF4 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 01328 8096ADF8 03E00008 */ jr $ra +/* 01328 8096ADF8 03E00008 */ jr $ra /* 0132C 8096ADFC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096AE00.s b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096AE00.s index 350f4c8554..42e3dea1ed 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096AE00.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096AE00.s @@ -1,33 +1,33 @@ glabel func_8096AE00 /* 01330 8096AE00 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 01334 8096AE04 AFBF0024 */ sw $ra, 0x0024($sp) -/* 01338 8096AE08 10A00014 */ beq $a1, $zero, .L8096AE5C -/* 0133C 8096AE0C AFA40028 */ sw $a0, 0x0028($sp) +/* 01334 8096AE04 AFBF0024 */ sw $ra, 0x0024($sp) +/* 01338 8096AE08 10A00014 */ beq $a1, $zero, .L8096AE5C +/* 0133C 8096AE0C AFA40028 */ sw $a0, 0x0028($sp) /* 01340 8096AE10 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 /* 01344 8096AE14 0C028800 */ jal SkelAnime_GetFrameCount - + /* 01348 8096AE18 24846EB0 */ addiu $a0, $a0, 0x6EB0 ## $a0 = 06006EB0 /* 0134C 8096AE1C 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 01350 8096AE20 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 01354 8096AE24 8FA40028 */ lw $a0, 0x0028($sp) -/* 01358 8096AE28 468021A0 */ cvt.s.w $f6, $f4 +/* 01354 8096AE24 8FA40028 */ lw $a0, 0x0028($sp) +/* 01358 8096AE28 468021A0 */ cvt.s.w $f6, $f4 /* 0135C 8096AE2C 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 01360 8096AE30 44070000 */ mfc1 $a3, $f0 +/* 01360 8096AE30 44070000 */ mfc1 $a3, $f0 /* 01364 8096AE34 24A56EB0 */ addiu $a1, $a1, 0x6EB0 ## $a1 = 06006EB0 /* 01368 8096AE38 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 0136C 8096AE3C AFA00014 */ sw $zero, 0x0014($sp) -/* 01370 8096AE40 E7A60010 */ swc1 $f6, 0x0010($sp) +/* 0136C 8096AE3C AFA00014 */ sw $zero, 0x0014($sp) +/* 01370 8096AE40 E7A60010 */ swc1 $f6, 0x0010($sp) /* 01374 8096AE44 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 01378 8096AE48 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 0137C 8096AE4C E7A00018 */ swc1 $f0, 0x0018($sp) -/* 01380 8096AE50 8FAF0028 */ lw $t7, 0x0028($sp) +/* 01378 8096AE48 0C029468 */ jal SkelAnime_ChangeAnim + +/* 0137C 8096AE4C E7A00018 */ swc1 $f0, 0x0018($sp) +/* 01380 8096AE50 8FAF0028 */ lw $t7, 0x0028($sp) /* 01384 8096AE54 240E0011 */ addiu $t6, $zero, 0x0011 ## $t6 = 00000011 /* 01388 8096AE58 ADEE0198 */ sw $t6, 0x0198($t7) ## 00000198 .L8096AE5C: -/* 0138C 8096AE5C 8FBF0024 */ lw $ra, 0x0024($sp) +/* 0138C 8096AE5C 8FBF0024 */ lw $ra, 0x0024($sp) /* 01390 8096AE60 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 01394 8096AE64 03E00008 */ jr $ra +/* 01394 8096AE64 03E00008 */ jr $ra /* 01398 8096AE68 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096AE6C.s b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096AE6C.s index 1cac5abba5..28e820d740 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096AE6C.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096AE6C.s @@ -1,43 +1,43 @@ glabel func_8096AE6C /* 0139C 8096AE6C 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 013A0 8096AE70 AFBF0024 */ sw $ra, 0x0024($sp) -/* 013A4 8096AE74 AFA40028 */ sw $a0, 0x0028($sp) +/* 013A0 8096AE70 AFBF0024 */ sw $ra, 0x0024($sp) +/* 013A4 8096AE74 AFA40028 */ sw $a0, 0x0028($sp) /* 013A8 8096AE78 90AE1D6C */ lbu $t6, 0x1D6C($a1) ## 00001D6C -/* 013AC 8096AE7C 51C0001D */ beql $t6, $zero, .L8096AEF4 -/* 013B0 8096AE80 8FBF0024 */ lw $ra, 0x0024($sp) +/* 013AC 8096AE7C 51C0001D */ beql $t6, $zero, .L8096AEF4 +/* 013B0 8096AE80 8FBF0024 */ lw $ra, 0x0024($sp) /* 013B4 8096AE84 8CA21D94 */ lw $v0, 0x1D94($a1) ## 00001D94 -/* 013B8 8096AE88 5040001A */ beql $v0, $zero, .L8096AEF4 -/* 013BC 8096AE8C 8FBF0024 */ lw $ra, 0x0024($sp) +/* 013B8 8096AE88 5040001A */ beql $v0, $zero, .L8096AEF4 +/* 013BC 8096AE8C 8FBF0024 */ lw $ra, 0x0024($sp) /* 013C0 8096AE90 944F0000 */ lhu $t7, 0x0000($v0) ## 00000000 /* 013C4 8096AE94 24010005 */ addiu $at, $zero, 0x0005 ## $at = 00000005 /* 013C8 8096AE98 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 -/* 013CC 8096AE9C 51E10015 */ beql $t7, $at, .L8096AEF4 -/* 013D0 8096AEA0 8FBF0024 */ lw $ra, 0x0024($sp) +/* 013CC 8096AE9C 51E10015 */ beql $t7, $at, .L8096AEF4 +/* 013D0 8096AEA0 8FBF0024 */ lw $ra, 0x0024($sp) /* 013D4 8096AEA4 0C028800 */ jal SkelAnime_GetFrameCount - + /* 013D8 8096AEA8 24840800 */ addiu $a0, $a0, 0x0800 ## $a0 = 06000800 /* 013DC 8096AEAC 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 013E0 8096AEB0 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 013E4 8096AEB4 8FA40028 */ lw $a0, 0x0028($sp) -/* 013E8 8096AEB8 468021A0 */ cvt.s.w $f6, $f4 +/* 013E4 8096AEB4 8FA40028 */ lw $a0, 0x0028($sp) +/* 013E8 8096AEB8 468021A0 */ cvt.s.w $f6, $f4 /* 013EC 8096AEBC 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 013F0 8096AEC0 24180002 */ addiu $t8, $zero, 0x0002 ## $t8 = 00000002 -/* 013F4 8096AEC4 44070000 */ mfc1 $a3, $f0 -/* 013F8 8096AEC8 AFB80014 */ sw $t8, 0x0014($sp) +/* 013F4 8096AEC4 44070000 */ mfc1 $a3, $f0 +/* 013F8 8096AEC8 AFB80014 */ sw $t8, 0x0014($sp) /* 013FC 8096AECC 24A50800 */ addiu $a1, $a1, 0x0800 ## $a1 = 06000800 -/* 01400 8096AED0 E7A60010 */ swc1 $f6, 0x0010($sp) +/* 01400 8096AED0 E7A60010 */ swc1 $f6, 0x0010($sp) /* 01404 8096AED4 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 01408 8096AED8 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 0140C 8096AEDC 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 01410 8096AEE0 E7A00018 */ swc1 $f0, 0x0018($sp) -/* 01414 8096AEE4 8FA80028 */ lw $t0, 0x0028($sp) +/* 0140C 8096AEDC 0C029468 */ jal SkelAnime_ChangeAnim + +/* 01410 8096AEE0 E7A00018 */ swc1 $f0, 0x0018($sp) +/* 01414 8096AEE4 8FA80028 */ lw $t0, 0x0028($sp) /* 01418 8096AEE8 24190012 */ addiu $t9, $zero, 0x0012 ## $t9 = 00000012 /* 0141C 8096AEEC AD190198 */ sw $t9, 0x0198($t0) ## 00000198 -/* 01420 8096AEF0 8FBF0024 */ lw $ra, 0x0024($sp) +/* 01420 8096AEF0 8FBF0024 */ lw $ra, 0x0024($sp) .L8096AEF4: /* 01424 8096AEF4 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 01428 8096AEF8 03E00008 */ jr $ra +/* 01428 8096AEF8 03E00008 */ jr $ra /* 0142C 8096AEFC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096AF00.s b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096AF00.s index f21c9b40b7..9517bb5304 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096AF00.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096AF00.s @@ -1,33 +1,33 @@ glabel func_8096AF00 /* 01430 8096AF00 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 01434 8096AF04 AFBF0024 */ sw $ra, 0x0024($sp) -/* 01438 8096AF08 10A00014 */ beq $a1, $zero, .L8096AF5C -/* 0143C 8096AF0C AFA40028 */ sw $a0, 0x0028($sp) +/* 01434 8096AF04 AFBF0024 */ sw $ra, 0x0024($sp) +/* 01438 8096AF08 10A00014 */ beq $a1, $zero, .L8096AF5C +/* 0143C 8096AF0C AFA40028 */ sw $a0, 0x0028($sp) /* 01440 8096AF10 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 /* 01444 8096AF14 0C028800 */ jal SkelAnime_GetFrameCount - + /* 01448 8096AF18 24840D00 */ addiu $a0, $a0, 0x0D00 ## $a0 = 06000D00 /* 0144C 8096AF1C 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 01450 8096AF20 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 01454 8096AF24 8FA40028 */ lw $a0, 0x0028($sp) -/* 01458 8096AF28 468021A0 */ cvt.s.w $f6, $f4 +/* 01454 8096AF24 8FA40028 */ lw $a0, 0x0028($sp) +/* 01458 8096AF28 468021A0 */ cvt.s.w $f6, $f4 /* 0145C 8096AF2C 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 01460 8096AF30 44070000 */ mfc1 $a3, $f0 +/* 01460 8096AF30 44070000 */ mfc1 $a3, $f0 /* 01464 8096AF34 24A50D00 */ addiu $a1, $a1, 0x0D00 ## $a1 = 06000D00 /* 01468 8096AF38 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 0146C 8096AF3C AFA00014 */ sw $zero, 0x0014($sp) -/* 01470 8096AF40 E7A60010 */ swc1 $f6, 0x0010($sp) +/* 0146C 8096AF3C AFA00014 */ sw $zero, 0x0014($sp) +/* 01470 8096AF40 E7A60010 */ swc1 $f6, 0x0010($sp) /* 01474 8096AF44 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 01478 8096AF48 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 0147C 8096AF4C E7A00018 */ swc1 $f0, 0x0018($sp) -/* 01480 8096AF50 8FAF0028 */ lw $t7, 0x0028($sp) +/* 01478 8096AF48 0C029468 */ jal SkelAnime_ChangeAnim + +/* 0147C 8096AF4C E7A00018 */ swc1 $f0, 0x0018($sp) +/* 01480 8096AF50 8FAF0028 */ lw $t7, 0x0028($sp) /* 01484 8096AF54 240E0013 */ addiu $t6, $zero, 0x0013 ## $t6 = 00000013 /* 01488 8096AF58 ADEE0198 */ sw $t6, 0x0198($t7) ## 00000198 .L8096AF5C: -/* 0148C 8096AF5C 8FBF0024 */ lw $ra, 0x0024($sp) +/* 0148C 8096AF5C 8FBF0024 */ lw $ra, 0x0024($sp) /* 01490 8096AF60 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 01494 8096AF64 03E00008 */ jr $ra +/* 01494 8096AF64 03E00008 */ jr $ra /* 01498 8096AF68 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096AF6C.s b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096AF6C.s index 12f30d9fcb..7689b164b5 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096AF6C.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096AF6C.s @@ -1,42 +1,42 @@ glabel func_8096AF6C /* 0149C 8096AF6C 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 014A0 8096AF70 AFBF0024 */ sw $ra, 0x0024($sp) -/* 014A4 8096AF74 AFA40028 */ sw $a0, 0x0028($sp) +/* 014A0 8096AF70 AFBF0024 */ sw $ra, 0x0024($sp) +/* 014A4 8096AF74 AFA40028 */ sw $a0, 0x0028($sp) /* 014A8 8096AF78 90AE1D6C */ lbu $t6, 0x1D6C($a1) ## 00001D6C -/* 014AC 8096AF7C 51C0001C */ beql $t6, $zero, .L8096AFF0 -/* 014B0 8096AF80 8FBF0024 */ lw $ra, 0x0024($sp) +/* 014AC 8096AF7C 51C0001C */ beql $t6, $zero, .L8096AFF0 +/* 014B0 8096AF80 8FBF0024 */ lw $ra, 0x0024($sp) /* 014B4 8096AF84 8CA21D94 */ lw $v0, 0x1D94($a1) ## 00001D94 -/* 014B8 8096AF88 50400019 */ beql $v0, $zero, .L8096AFF0 -/* 014BC 8096AF8C 8FBF0024 */ lw $ra, 0x0024($sp) +/* 014B8 8096AF88 50400019 */ beql $v0, $zero, .L8096AFF0 +/* 014BC 8096AF8C 8FBF0024 */ lw $ra, 0x0024($sp) /* 014C0 8096AF90 944F0000 */ lhu $t7, 0x0000($v0) ## 00000000 /* 014C4 8096AF94 24010006 */ addiu $at, $zero, 0x0006 ## $at = 00000006 /* 014C8 8096AF98 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 -/* 014CC 8096AF9C 51E10014 */ beql $t7, $at, .L8096AFF0 -/* 014D0 8096AFA0 8FBF0024 */ lw $ra, 0x0024($sp) +/* 014CC 8096AF9C 51E10014 */ beql $t7, $at, .L8096AFF0 +/* 014D0 8096AFA0 8FBF0024 */ lw $ra, 0x0024($sp) /* 014D4 8096AFA4 0C028800 */ jal SkelAnime_GetFrameCount - + /* 014D8 8096AFA8 24846EB0 */ addiu $a0, $a0, 0x6EB0 ## $a0 = 06006EB0 /* 014DC 8096AFAC 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 014E0 8096AFB0 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 014E4 8096AFB4 8FA40028 */ lw $a0, 0x0028($sp) -/* 014E8 8096AFB8 468021A0 */ cvt.s.w $f6, $f4 +/* 014E4 8096AFB4 8FA40028 */ lw $a0, 0x0028($sp) +/* 014E8 8096AFB8 468021A0 */ cvt.s.w $f6, $f4 /* 014EC 8096AFBC 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 014F0 8096AFC0 44070000 */ mfc1 $a3, $f0 +/* 014F0 8096AFC0 44070000 */ mfc1 $a3, $f0 /* 014F4 8096AFC4 24A56EB0 */ addiu $a1, $a1, 0x6EB0 ## $a1 = 06006EB0 /* 014F8 8096AFC8 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 014FC 8096AFCC AFA00014 */ sw $zero, 0x0014($sp) -/* 01500 8096AFD0 E7A60010 */ swc1 $f6, 0x0010($sp) +/* 014FC 8096AFCC AFA00014 */ sw $zero, 0x0014($sp) +/* 01500 8096AFD0 E7A60010 */ swc1 $f6, 0x0010($sp) /* 01504 8096AFD4 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 01508 8096AFD8 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 0150C 8096AFDC E7A00018 */ swc1 $f0, 0x0018($sp) -/* 01510 8096AFE0 8FB90028 */ lw $t9, 0x0028($sp) +/* 01508 8096AFD8 0C029468 */ jal SkelAnime_ChangeAnim + +/* 0150C 8096AFDC E7A00018 */ swc1 $f0, 0x0018($sp) +/* 01510 8096AFE0 8FB90028 */ lw $t9, 0x0028($sp) /* 01514 8096AFE4 24180014 */ addiu $t8, $zero, 0x0014 ## $t8 = 00000014 /* 01518 8096AFE8 AF380198 */ sw $t8, 0x0198($t9) ## 00000198 -/* 0151C 8096AFEC 8FBF0024 */ lw $ra, 0x0024($sp) +/* 0151C 8096AFEC 8FBF0024 */ lw $ra, 0x0024($sp) .L8096AFF0: /* 01520 8096AFF0 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 01524 8096AFF4 03E00008 */ jr $ra +/* 01524 8096AFF4 03E00008 */ jr $ra /* 01528 8096AFF8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096B3E4.s b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096B3E4.s index 510a50375c..0eb5b811e9 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096B3E4.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096B3E4.s @@ -1,46 +1,46 @@ glabel func_8096B3E4 /* 01914 8096B3E4 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 -/* 01918 8096B3E8 AFA40040 */ sw $a0, 0x0040($sp) -/* 0191C 8096B3EC AFBF0024 */ sw $ra, 0x0024($sp) +/* 01918 8096B3E8 AFA40040 */ sw $a0, 0x0040($sp) +/* 0191C 8096B3EC AFBF0024 */ sw $ra, 0x0024($sp) /* 01920 8096B3F0 3C040601 */ lui $a0, 0x0601 ## $a0 = 06010000 -/* 01924 8096B3F4 AFA50044 */ sw $a1, 0x0044($sp) +/* 01924 8096B3F4 AFA50044 */ sw $a1, 0x0044($sp) /* 01928 8096B3F8 0C028800 */ jal SkelAnime_GetFrameCount - + /* 0192C 8096B3FC 24842014 */ addiu $a0, $a0, 0x2014 ## $a0 = 06012014 /* 01930 8096B400 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 -/* 01934 8096B404 8FA50040 */ lw $a1, 0x0040($sp) +/* 01934 8096B404 8FA50040 */ lw $a1, 0x0040($sp) /* 01938 8096B408 3C060601 */ lui $a2, 0x0601 ## $a2 = 06010000 -/* 0193C 8096B40C 468021A0 */ cvt.s.w $f6, $f4 +/* 0193C 8096B40C 468021A0 */ cvt.s.w $f6, $f4 /* 01940 8096B410 24A5014C */ addiu $a1, $a1, 0x014C ## $a1 = 0000014C -/* 01944 8096B414 AFA5002C */ sw $a1, 0x002C($sp) +/* 01944 8096B414 AFA5002C */ sw $a1, 0x002C($sp) /* 01948 8096B418 24C61CA8 */ addiu $a2, $a2, 0x1CA8 ## $a2 = 06011CA8 -/* 0194C 8096B41C 8FA40044 */ lw $a0, 0x0044($sp) +/* 0194C 8096B41C 8FA40044 */ lw $a0, 0x0044($sp) /* 01950 8096B420 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 01954 8096B424 E7A60030 */ swc1 $f6, 0x0030($sp) -/* 01958 8096B428 AFA00010 */ sw $zero, 0x0010($sp) -/* 0195C 8096B42C AFA00014 */ sw $zero, 0x0014($sp) -/* 01960 8096B430 0C0291BE */ jal func_800A46F8 -/* 01964 8096B434 AFA00018 */ sw $zero, 0x0018($sp) +/* 01954 8096B424 E7A60030 */ swc1 $f6, 0x0030($sp) +/* 01958 8096B428 AFA00010 */ sw $zero, 0x0010($sp) +/* 0195C 8096B42C AFA00014 */ sw $zero, 0x0014($sp) +/* 01960 8096B430 0C0291BE */ jal SkelAnime_InitSV +/* 01964 8096B434 AFA00018 */ sw $zero, 0x0018($sp) /* 01968 8096B438 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 0196C 8096B43C C7A80030 */ lwc1 $f8, 0x0030($sp) +/* 0196C 8096B43C C7A80030 */ lwc1 $f8, 0x0030($sp) /* 01970 8096B440 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 /* 01974 8096B444 240E0002 */ addiu $t6, $zero, 0x0002 ## $t6 = 00000002 -/* 01978 8096B448 44070000 */ mfc1 $a3, $f0 -/* 0197C 8096B44C AFAE0014 */ sw $t6, 0x0014($sp) +/* 01978 8096B448 44070000 */ mfc1 $a3, $f0 +/* 0197C 8096B44C AFAE0014 */ sw $t6, 0x0014($sp) /* 01980 8096B450 24A52014 */ addiu $a1, $a1, 0x2014 ## $a1 = 06012014 -/* 01984 8096B454 8FA4002C */ lw $a0, 0x002C($sp) +/* 01984 8096B454 8FA4002C */ lw $a0, 0x002C($sp) /* 01988 8096B458 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 0198C 8096B45C E7A80010 */ swc1 $f8, 0x0010($sp) -/* 01990 8096B460 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 01994 8096B464 E7A00018 */ swc1 $f0, 0x0018($sp) -/* 01998 8096B468 8FA20040 */ lw $v0, 0x0040($sp) +/* 0198C 8096B45C E7A80010 */ swc1 $f8, 0x0010($sp) +/* 01990 8096B460 0C029468 */ jal SkelAnime_ChangeAnim + +/* 01994 8096B464 E7A00018 */ swc1 $f0, 0x0018($sp) +/* 01998 8096B468 8FA20040 */ lw $v0, 0x0040($sp) /* 0199C 8096B46C 240F0015 */ addiu $t7, $zero, 0x0015 ## $t7 = 00000015 /* 019A0 8096B470 AC4F0198 */ sw $t7, 0x0198($v0) ## 00000198 /* 019A4 8096B474 A04000C8 */ sb $zero, 0x00C8($v0) ## 000000C8 -/* 019A8 8096B478 8FBF0024 */ lw $ra, 0x0024($sp) +/* 019A8 8096B478 8FBF0024 */ lw $ra, 0x0024($sp) /* 019AC 8096B47C 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 -/* 019B0 8096B480 03E00008 */ jr $ra +/* 019B0 8096B480 03E00008 */ jr $ra /* 019B4 8096B484 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096B840.s b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096B840.s index 9f5e8d1a53..3af0e25cd0 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096B840.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096B840.s @@ -1,88 +1,88 @@ glabel func_8096B840 /* 01D70 8096B840 27BDFF80 */ addiu $sp, $sp, 0xFF80 ## $sp = FFFFFF80 -/* 01D74 8096B844 AFBF002C */ sw $ra, 0x002C($sp) -/* 01D78 8096B848 AFB00028 */ sw $s0, 0x0028($sp) -/* 01D7C 8096B84C AFA40080 */ sw $a0, 0x0080($sp) -/* 01D80 8096B850 AFA50084 */ sw $a1, 0x0084($sp) +/* 01D74 8096B844 AFBF002C */ sw $ra, 0x002C($sp) +/* 01D78 8096B848 AFB00028 */ sw $s0, 0x0028($sp) +/* 01D7C 8096B84C AFA40080 */ sw $a0, 0x0080($sp) +/* 01D80 8096B850 AFA50084 */ sw $a1, 0x0084($sp) /* 01D84 8096B854 84820190 */ lh $v0, 0x0190($a0) ## 00000190 /* 01D88 8096B858 3C188097 */ lui $t8, %hi(D_8096CE74) ## $t8 = 80970000 /* 01D8C 8096B85C 3C098097 */ lui $t1, %hi(D_8096CE84) ## $t1 = 80970000 -/* 01D90 8096B860 00027880 */ sll $t7, $v0, 2 -/* 01D94 8096B864 030FC021 */ addu $t8, $t8, $t7 -/* 01D98 8096B868 8F18CE74 */ lw $t8, %lo(D_8096CE74)($t8) +/* 01D90 8096B860 00027880 */ sll $t7, $v0, 2 +/* 01D94 8096B864 030FC021 */ addu $t8, $t8, $t7 +/* 01D98 8096B868 8F18CE74 */ lw $t8, %lo(D_8096CE74)($t8) /* 01D9C 8096B86C 3C068097 */ lui $a2, %hi(D_8096CFD0) ## $a2 = 80970000 /* 01DA0 8096B870 24C6CFD0 */ addiu $a2, $a2, %lo(D_8096CFD0) ## $a2 = 8096CFD0 -/* 01DA4 8096B874 AFB80070 */ sw $t8, 0x0070($sp) +/* 01DA4 8096B874 AFB80070 */ sw $t8, 0x0070($sp) /* 01DA8 8096B878 84830194 */ lh $v1, 0x0194($a0) ## 00000194 /* 01DAC 8096B87C 27A4004C */ addiu $a0, $sp, 0x004C ## $a0 = FFFFFFCC /* 01DB0 8096B880 24070113 */ addiu $a3, $zero, 0x0113 ## $a3 = 00000113 -/* 01DB4 8096B884 0003C880 */ sll $t9, $v1, 2 -/* 01DB8 8096B888 01394821 */ addu $t1, $t1, $t9 -/* 01DBC 8096B88C 8D29CE84 */ lw $t1, %lo(D_8096CE84)($t1) -/* 01DC0 8096B890 AFA90064 */ sw $t1, 0x0064($sp) +/* 01DB4 8096B884 0003C880 */ sll $t9, $v1, 2 +/* 01DB8 8096B888 01394821 */ addu $t1, $t1, $t9 +/* 01DBC 8096B88C 8D29CE84 */ lw $t1, %lo(D_8096CE84)($t1) +/* 01DC0 8096B890 AFA90064 */ sw $t1, 0x0064($sp) /* 01DC4 8096B894 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 -/* 01DC8 8096B898 0C031AB1 */ jal func_800C6AC4 +/* 01DC8 8096B898 0C031AB1 */ jal Graph_OpenDisps /* 01DCC 8096B89C 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 -/* 01DD0 8096B8A0 8FAB0084 */ lw $t3, 0x0084($sp) -/* 01DD4 8096B8A4 0C024F61 */ jal func_80093D84 +/* 01DD0 8096B8A0 8FAB0084 */ lw $t3, 0x0084($sp) +/* 01DD4 8096B8A4 0C024F61 */ jal func_80093D84 /* 01DD8 8096B8A8 8D640000 */ lw $a0, 0x0000($t3) ## 00000000 -/* 01DDC 8096B8AC 8FA40070 */ lw $a0, 0x0070($sp) +/* 01DDC 8096B8AC 8FA40070 */ lw $a0, 0x0070($sp) /* 01DE0 8096B8B0 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 /* 01DE4 8096B8B4 3C058016 */ lui $a1, 0x8016 ## $a1 = 80160000 -/* 01DE8 8096B8B8 00047900 */ sll $t7, $a0, 4 -/* 01DEC 8096B8BC 000FC702 */ srl $t8, $t7, 28 +/* 01DE8 8096B8B8 00047900 */ sll $t7, $a0, 4 +/* 01DEC 8096B8BC 000FC702 */ srl $t8, $t7, 28 /* 01DF0 8096B8C0 3C0DDB06 */ lui $t5, 0xDB06 ## $t5 = DB060000 /* 01DF4 8096B8C4 244C0008 */ addiu $t4, $v0, 0x0008 ## $t4 = 00000008 /* 01DF8 8096B8C8 AE0C02D0 */ sw $t4, 0x02D0($s0) ## 000002D0 /* 01DFC 8096B8CC 35AD0020 */ ori $t5, $t5, 0x0020 ## $t5 = DB060020 -/* 01E00 8096B8D0 00187080 */ sll $t6, $t8, 2 +/* 01E00 8096B8D0 00187080 */ sll $t6, $t8, 2 /* 01E04 8096B8D4 24A56FA8 */ addiu $a1, $a1, 0x6FA8 ## $a1 = 80166FA8 -/* 01E08 8096B8D8 00AEC821 */ addu $t9, $a1, $t6 +/* 01E08 8096B8D8 00AEC821 */ addu $t9, $a1, $t6 /* 01E0C 8096B8DC AC4D0000 */ sw $t5, 0x0000($v0) ## 00000000 /* 01E10 8096B8E0 8F290000 */ lw $t1, 0x0000($t9) ## 00000000 /* 01E14 8096B8E4 3C0600FF */ lui $a2, 0x00FF ## $a2 = 00FF0000 /* 01E18 8096B8E8 34C6FFFF */ ori $a2, $a2, 0xFFFF ## $a2 = 00FFFFFF -/* 01E1C 8096B8EC 00865024 */ and $t2, $a0, $a2 +/* 01E1C 8096B8EC 00865024 */ and $t2, $a0, $a2 /* 01E20 8096B8F0 3C078000 */ lui $a3, 0x8000 ## $a3 = 80000000 -/* 01E24 8096B8F4 012A5821 */ addu $t3, $t1, $t2 -/* 01E28 8096B8F8 01676021 */ addu $t4, $t3, $a3 +/* 01E24 8096B8F4 012A5821 */ addu $t3, $t1, $t2 +/* 01E28 8096B8F8 01676021 */ addu $t4, $t3, $a3 /* 01E2C 8096B8FC AC4C0004 */ sw $t4, 0x0004($v0) ## 00000004 -/* 01E30 8096B900 8FA40064 */ lw $a0, 0x0064($sp) +/* 01E30 8096B900 8FA40064 */ lw $a0, 0x0064($sp) /* 01E34 8096B904 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 /* 01E38 8096B908 3C0FDB06 */ lui $t7, 0xDB06 ## $t7 = DB060000 -/* 01E3C 8096B90C 0004C100 */ sll $t8, $a0, 4 -/* 01E40 8096B910 00187702 */ srl $t6, $t8, 28 +/* 01E3C 8096B90C 0004C100 */ sll $t8, $a0, 4 +/* 01E40 8096B910 00187702 */ srl $t6, $t8, 28 /* 01E44 8096B914 244D0008 */ addiu $t5, $v0, 0x0008 ## $t5 = 00000008 /* 01E48 8096B918 AE0D02D0 */ sw $t5, 0x02D0($s0) ## 000002D0 -/* 01E4C 8096B91C 000EC880 */ sll $t9, $t6, 2 +/* 01E4C 8096B91C 000EC880 */ sll $t9, $t6, 2 /* 01E50 8096B920 35EF0024 */ ori $t7, $t7, 0x0024 ## $t7 = DB060024 -/* 01E54 8096B924 00B94821 */ addu $t1, $a1, $t9 +/* 01E54 8096B924 00B94821 */ addu $t1, $a1, $t9 /* 01E58 8096B928 AC4F0000 */ sw $t7, 0x0000($v0) ## 00000000 /* 01E5C 8096B92C 8D2A0000 */ lw $t2, 0x0000($t1) ## 00000000 -/* 01E60 8096B930 00865824 */ and $t3, $a0, $a2 +/* 01E60 8096B930 00865824 */ and $t3, $a0, $a2 /* 01E64 8096B934 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 -/* 01E68 8096B938 014B6021 */ addu $t4, $t2, $t3 -/* 01E6C 8096B93C 01876821 */ addu $t5, $t4, $a3 +/* 01E68 8096B938 014B6021 */ addu $t4, $t2, $t3 +/* 01E6C 8096B93C 01876821 */ addu $t5, $t4, $a3 /* 01E70 8096B940 AC4D0004 */ sw $t5, 0x0004($v0) ## 00000004 /* 01E74 8096B944 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 /* 01E78 8096B948 24847FC0 */ addiu $a0, $a0, 0x7FC0 ## $a0 = 06007FC0 -/* 01E7C 8096B94C 00047100 */ sll $t6, $a0, 4 -/* 01E80 8096B950 000ECF02 */ srl $t9, $t6, 28 +/* 01E7C 8096B94C 00047100 */ sll $t6, $a0, 4 +/* 01E80 8096B950 000ECF02 */ srl $t9, $t6, 28 /* 01E84 8096B954 3C18DB06 */ lui $t8, 0xDB06 ## $t8 = DB060000 /* 01E88 8096B958 244F0008 */ addiu $t7, $v0, 0x0008 ## $t7 = 00000008 /* 01E8C 8096B95C AE0F02D0 */ sw $t7, 0x02D0($s0) ## 000002D0 /* 01E90 8096B960 37180028 */ ori $t8, $t8, 0x0028 ## $t8 = DB060028 -/* 01E94 8096B964 00194880 */ sll $t1, $t9, 2 -/* 01E98 8096B968 00A95021 */ addu $t2, $a1, $t1 +/* 01E94 8096B964 00194880 */ sll $t1, $t9, 2 +/* 01E98 8096B968 00A95021 */ addu $t2, $a1, $t1 /* 01E9C 8096B96C AC580000 */ sw $t8, 0x0000($v0) ## 00000000 /* 01EA0 8096B970 8D4B0000 */ lw $t3, 0x0000($t2) ## 00000000 -/* 01EA4 8096B974 00866024 */ and $t4, $a0, $a2 +/* 01EA4 8096B974 00866024 */ and $t4, $a0, $a2 /* 01EA8 8096B978 3C0EFB00 */ lui $t6, 0xFB00 ## $t6 = FB000000 -/* 01EAC 8096B97C 016C6821 */ addu $t5, $t3, $t4 -/* 01EB0 8096B980 01A77821 */ addu $t7, $t5, $a3 +/* 01EAC 8096B97C 016C6821 */ addu $t5, $t3, $t4 +/* 01EB0 8096B980 01A77821 */ addu $t7, $t5, $a3 /* 01EB4 8096B984 AC4F0004 */ sw $t7, 0x0004($v0) ## 00000004 /* 01EB8 8096B988 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 01EBC 8096B98C 8FA80080 */ lw $t0, 0x0080($sp) +/* 01EBC 8096B98C 8FA80080 */ lw $t0, 0x0080($sp) /* 01EC0 8096B990 3C0C8011 */ lui $t4, 0x8011 ## $t4 = 80110000 /* 01EC4 8096B994 24580008 */ addiu $t8, $v0, 0x0008 ## $t8 = 00000008 /* 01EC8 8096B998 AE1802D0 */ sw $t8, 0x02D0($s0) ## 000002D0 @@ -102,25 +102,25 @@ glabel func_8096B840 /* 01F00 8096B9D0 8C450004 */ lw $a1, 0x0004($v0) ## 00000150 /* 01F04 8096B9D4 8C460020 */ lw $a2, 0x0020($v0) ## 0000016C /* 01F08 8096B9D8 90470002 */ lbu $a3, 0x0002($v0) ## 0000014E -/* 01F0C 8096B9DC AFA00018 */ sw $zero, 0x0018($sp) -/* 01F10 8096B9E0 AFA00014 */ sw $zero, 0x0014($sp) -/* 01F14 8096B9E4 AFA00010 */ sw $zero, 0x0010($sp) +/* 01F0C 8096B9DC AFA00018 */ sw $zero, 0x0018($sp) +/* 01F10 8096B9E0 AFA00014 */ sw $zero, 0x0014($sp) +/* 01F14 8096B9E4 AFA00010 */ sw $zero, 0x0010($sp) /* 01F18 8096B9E8 8E0D02D0 */ lw $t5, 0x02D0($s0) ## 000002D0 -/* 01F1C 8096B9EC 8FA40084 */ lw $a0, 0x0084($sp) -/* 01F20 8096B9F0 0C0289CF */ jal func_800A273C -/* 01F24 8096B9F4 AFAD001C */ sw $t5, 0x001C($sp) +/* 01F1C 8096B9EC 8FA40084 */ lw $a0, 0x0084($sp) +/* 01F20 8096B9F0 0C0289CF */ jal SkelAnime_DrawSV2 +/* 01F24 8096B9F4 AFAD001C */ sw $t5, 0x001C($sp) /* 01F28 8096B9F8 AE0202D0 */ sw $v0, 0x02D0($s0) ## 000002D0 -/* 01F2C 8096B9FC 8FAF0084 */ lw $t7, 0x0084($sp) +/* 01F2C 8096B9FC 8FAF0084 */ lw $t7, 0x0084($sp) /* 01F30 8096BA00 3C068097 */ lui $a2, %hi(D_8096CFF4) ## $a2 = 80970000 /* 01F34 8096BA04 24C6CFF4 */ addiu $a2, $a2, %lo(D_8096CFF4) ## $a2 = 8096CFF4 /* 01F38 8096BA08 27A4004C */ addiu $a0, $sp, 0x004C ## $a0 = FFFFFFCC /* 01F3C 8096BA0C 24070130 */ addiu $a3, $zero, 0x0130 ## $a3 = 00000130 -/* 01F40 8096BA10 0C031AD5 */ jal func_800C6B54 +/* 01F40 8096BA10 0C031AD5 */ jal Graph_CloseDisps /* 01F44 8096BA14 8DE50000 */ lw $a1, 0x0000($t7) ## 00000000 -/* 01F48 8096BA18 8FBF002C */ lw $ra, 0x002C($sp) -/* 01F4C 8096BA1C 8FB00028 */ lw $s0, 0x0028($sp) +/* 01F48 8096BA18 8FBF002C */ lw $ra, 0x002C($sp) +/* 01F4C 8096BA1C 8FB00028 */ lw $s0, 0x0028($sp) /* 01F50 8096BA20 27BD0080 */ addiu $sp, $sp, 0x0080 ## $sp = 00000000 -/* 01F54 8096BA24 03E00008 */ jr $ra +/* 01F54 8096BA24 03E00008 */ jr $ra /* 01F58 8096BA28 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096BA2C.s b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096BA2C.s index 1c83d3d572..1a75b22727 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096BA2C.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096BA2C.s @@ -1,30 +1,30 @@ glabel func_8096BA2C /* 01F5C 8096BA2C 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 01F60 8096BA30 AFB00028 */ sw $s0, 0x0028($sp) +/* 01F60 8096BA30 AFB00028 */ sw $s0, 0x0028($sp) /* 01F64 8096BA34 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 01F68 8096BA38 AFBF002C */ sw $ra, 0x002C($sp) -/* 01F6C 8096BA3C AFA50034 */ sw $a1, 0x0034($sp) +/* 01F68 8096BA38 AFBF002C */ sw $ra, 0x002C($sp) +/* 01F6C 8096BA3C AFA50034 */ sw $a1, 0x0034($sp) /* 01F70 8096BA40 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 /* 01F74 8096BA44 3C060601 */ lui $a2, 0x0601 ## $a2 = 06010000 /* 01F78 8096BA48 3C070600 */ lui $a3, 0x0600 ## $a3 = 06000000 /* 01F7C 8096BA4C 24E767CC */ addiu $a3, $a3, 0x67CC ## $a3 = 060067CC /* 01F80 8096BA50 24C61CA8 */ addiu $a2, $a2, 0x1CA8 ## $a2 = 06011CA8 /* 01F84 8096BA54 2605014C */ addiu $a1, $s0, 0x014C ## $a1 = 0000014C -/* 01F88 8096BA58 AFA00010 */ sw $zero, 0x0010($sp) -/* 01F8C 8096BA5C AFA00014 */ sw $zero, 0x0014($sp) -/* 01F90 8096BA60 0C0291BE */ jal func_800A46F8 -/* 01F94 8096BA64 AFA00018 */ sw $zero, 0x0018($sp) +/* 01F88 8096BA58 AFA00010 */ sw $zero, 0x0010($sp) +/* 01F8C 8096BA5C AFA00014 */ sw $zero, 0x0014($sp) +/* 01F90 8096BA60 0C0291BE */ jal SkelAnime_InitSV +/* 01F94 8096BA64 AFA00018 */ sw $zero, 0x0018($sp) /* 01F98 8096BA68 240E0018 */ addiu $t6, $zero, 0x0018 ## $t6 = 00000018 /* 01F9C 8096BA6C AE0E0198 */ sw $t6, 0x0198($s0) ## 00000198 /* 01FA0 8096BA70 AE00019C */ sw $zero, 0x019C($s0) ## 0000019C /* 01FA4 8096BA74 A20000C8 */ sb $zero, 0x00C8($s0) ## 000000C8 /* 01FA8 8096BA78 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01FAC 8096BA7C 0C25A6E3 */ jal func_80969B8C +/* 01FAC 8096BA7C 0C25A6E3 */ jal func_80969B8C /* 01FB0 8096BA80 24050003 */ addiu $a1, $zero, 0x0003 ## $a1 = 00000003 -/* 01FB4 8096BA84 8FBF002C */ lw $ra, 0x002C($sp) -/* 01FB8 8096BA88 8FB00028 */ lw $s0, 0x0028($sp) +/* 01FB4 8096BA84 8FBF002C */ lw $ra, 0x002C($sp) +/* 01FB8 8096BA88 8FB00028 */ lw $s0, 0x0028($sp) /* 01FBC 8096BA8C 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 01FC0 8096BA90 03E00008 */ jr $ra +/* 01FC0 8096BA90 03E00008 */ jr $ra /* 01FC4 8096BA94 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096BF60.s b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096BF60.s index 6099919b4b..9b950df8af 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096BF60.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Du/func_8096BF60.s @@ -1,85 +1,85 @@ glabel func_8096BF60 /* 02490 8096BF60 27BDFF88 */ addiu $sp, $sp, 0xFF88 ## $sp = FFFFFF88 -/* 02494 8096BF64 AFBF0024 */ sw $ra, 0x0024($sp) -/* 02498 8096BF68 AFA40078 */ sw $a0, 0x0078($sp) -/* 0249C 8096BF6C AFA5007C */ sw $a1, 0x007C($sp) +/* 02494 8096BF64 AFBF0024 */ sw $ra, 0x0024($sp) +/* 02498 8096BF68 AFA40078 */ sw $a0, 0x0078($sp) +/* 0249C 8096BF6C AFA5007C */ sw $a1, 0x007C($sp) /* 024A0 8096BF70 84820190 */ lh $v0, 0x0190($a0) ## 00000190 /* 024A4 8096BF74 3C188097 */ lui $t8, %hi(D_8096CE74) ## $t8 = 80970000 /* 024A8 8096BF78 3C098097 */ lui $t1, %hi(D_8096CE84) ## $t1 = 80970000 -/* 024AC 8096BF7C 00027880 */ sll $t7, $v0, 2 -/* 024B0 8096BF80 030FC021 */ addu $t8, $t8, $t7 -/* 024B4 8096BF84 8F18CE74 */ lw $t8, %lo(D_8096CE74)($t8) +/* 024AC 8096BF7C 00027880 */ sll $t7, $v0, 2 +/* 024B0 8096BF80 030FC021 */ addu $t8, $t8, $t7 +/* 024B4 8096BF84 8F18CE74 */ lw $t8, %lo(D_8096CE74)($t8) /* 024B8 8096BF88 3C068097 */ lui $a2, %hi(D_8096D090) ## $a2 = 80970000 /* 024BC 8096BF8C 24C6D090 */ addiu $a2, $a2, %lo(D_8096D090) ## $a2 = 8096D090 -/* 024C0 8096BF90 AFB80068 */ sw $t8, 0x0068($sp) +/* 024C0 8096BF90 AFB80068 */ sw $t8, 0x0068($sp) /* 024C4 8096BF94 84830194 */ lh $v1, 0x0194($a0) ## 00000194 /* 024C8 8096BF98 27A40044 */ addiu $a0, $sp, 0x0044 ## $a0 = FFFFFFCC /* 024CC 8096BF9C 24070267 */ addiu $a3, $zero, 0x0267 ## $a3 = 00000267 -/* 024D0 8096BFA0 0003C880 */ sll $t9, $v1, 2 -/* 024D4 8096BFA4 01394821 */ addu $t1, $t1, $t9 -/* 024D8 8096BFA8 8D29CE84 */ lw $t1, %lo(D_8096CE84)($t1) -/* 024DC 8096BFAC AFA9005C */ sw $t1, 0x005C($sp) +/* 024D0 8096BFA0 0003C880 */ sll $t9, $v1, 2 +/* 024D4 8096BFA4 01394821 */ addu $t1, $t1, $t9 +/* 024D8 8096BFA8 8D29CE84 */ lw $t1, %lo(D_8096CE84)($t1) +/* 024DC 8096BFAC AFA9005C */ sw $t1, 0x005C($sp) /* 024E0 8096BFB0 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 -/* 024E4 8096BFB4 0C031AB1 */ jal func_800C6AC4 -/* 024E8 8096BFB8 AFA50054 */ sw $a1, 0x0054($sp) -/* 024EC 8096BFBC 8FAB007C */ lw $t3, 0x007C($sp) -/* 024F0 8096BFC0 0C024F46 */ jal func_80093D18 +/* 024E4 8096BFB4 0C031AB1 */ jal Graph_OpenDisps +/* 024E8 8096BFB8 AFA50054 */ sw $a1, 0x0054($sp) +/* 024EC 8096BFBC 8FAB007C */ lw $t3, 0x007C($sp) +/* 024F0 8096BFC0 0C024F46 */ jal func_80093D18 /* 024F4 8096BFC4 8D640000 */ lw $a0, 0x0000($t3) ## 00000000 -/* 024F8 8096BFC8 8FA80054 */ lw $t0, 0x0054($sp) -/* 024FC 8096BFCC 8FA40068 */ lw $a0, 0x0068($sp) +/* 024F8 8096BFC8 8FA80054 */ lw $t0, 0x0054($sp) +/* 024FC 8096BFCC 8FA40068 */ lw $a0, 0x0068($sp) /* 02500 8096BFD0 3C058016 */ lui $a1, 0x8016 ## $a1 = 80160000 /* 02504 8096BFD4 8D0202C0 */ lw $v0, 0x02C0($t0) ## 000002C0 -/* 02508 8096BFD8 00047900 */ sll $t7, $a0, 4 -/* 0250C 8096BFDC 000FC702 */ srl $t8, $t7, 28 +/* 02508 8096BFD8 00047900 */ sll $t7, $a0, 4 +/* 0250C 8096BFDC 000FC702 */ srl $t8, $t7, 28 /* 02510 8096BFE0 3C0DDB06 */ lui $t5, 0xDB06 ## $t5 = DB060000 /* 02514 8096BFE4 244C0008 */ addiu $t4, $v0, 0x0008 ## $t4 = 00000008 /* 02518 8096BFE8 35AD0020 */ ori $t5, $t5, 0x0020 ## $t5 = DB060020 -/* 0251C 8096BFEC 00187080 */ sll $t6, $t8, 2 +/* 0251C 8096BFEC 00187080 */ sll $t6, $t8, 2 /* 02520 8096BFF0 24A56FA8 */ addiu $a1, $a1, 0x6FA8 ## $a1 = 80166FA8 /* 02524 8096BFF4 AD0C02C0 */ sw $t4, 0x02C0($t0) ## 000002C0 -/* 02528 8096BFF8 00AEC821 */ addu $t9, $a1, $t6 +/* 02528 8096BFF8 00AEC821 */ addu $t9, $a1, $t6 /* 0252C 8096BFFC AC4D0000 */ sw $t5, 0x0000($v0) ## 00000000 /* 02530 8096C000 8F290000 */ lw $t1, 0x0000($t9) ## 00000000 /* 02534 8096C004 3C0600FF */ lui $a2, 0x00FF ## $a2 = 00FF0000 /* 02538 8096C008 34C6FFFF */ ori $a2, $a2, 0xFFFF ## $a2 = 00FFFFFF -/* 0253C 8096C00C 00865024 */ and $t2, $a0, $a2 +/* 0253C 8096C00C 00865024 */ and $t2, $a0, $a2 /* 02540 8096C010 3C078000 */ lui $a3, 0x8000 ## $a3 = 80000000 -/* 02544 8096C014 012A5821 */ addu $t3, $t1, $t2 -/* 02548 8096C018 01676021 */ addu $t4, $t3, $a3 +/* 02544 8096C014 012A5821 */ addu $t3, $t1, $t2 +/* 02548 8096C018 01676021 */ addu $t4, $t3, $a3 /* 0254C 8096C01C AC4C0004 */ sw $t4, 0x0004($v0) ## 00000004 -/* 02550 8096C020 8FA4005C */ lw $a0, 0x005C($sp) +/* 02550 8096C020 8FA4005C */ lw $a0, 0x005C($sp) /* 02554 8096C024 8D0202C0 */ lw $v0, 0x02C0($t0) ## 000002C0 /* 02558 8096C028 3C0FDB06 */ lui $t7, 0xDB06 ## $t7 = DB060000 -/* 0255C 8096C02C 0004C100 */ sll $t8, $a0, 4 -/* 02560 8096C030 00187702 */ srl $t6, $t8, 28 +/* 0255C 8096C02C 0004C100 */ sll $t8, $a0, 4 +/* 02560 8096C030 00187702 */ srl $t6, $t8, 28 /* 02564 8096C034 244D0008 */ addiu $t5, $v0, 0x0008 ## $t5 = 00000008 -/* 02568 8096C038 000EC880 */ sll $t9, $t6, 2 +/* 02568 8096C038 000EC880 */ sll $t9, $t6, 2 /* 0256C 8096C03C 35EF0024 */ ori $t7, $t7, 0x0024 ## $t7 = DB060024 /* 02570 8096C040 AD0D02C0 */ sw $t5, 0x02C0($t0) ## 000002C0 -/* 02574 8096C044 00B94821 */ addu $t1, $a1, $t9 +/* 02574 8096C044 00B94821 */ addu $t1, $a1, $t9 /* 02578 8096C048 AC4F0000 */ sw $t7, 0x0000($v0) ## 00000000 /* 0257C 8096C04C 8D2A0000 */ lw $t2, 0x0000($t1) ## 00000000 -/* 02580 8096C050 00865824 */ and $t3, $a0, $a2 +/* 02580 8096C050 00865824 */ and $t3, $a0, $a2 /* 02584 8096C054 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 -/* 02588 8096C058 014B6021 */ addu $t4, $t2, $t3 -/* 0258C 8096C05C 01876821 */ addu $t5, $t4, $a3 +/* 02588 8096C058 014B6021 */ addu $t4, $t2, $t3 +/* 0258C 8096C05C 01876821 */ addu $t5, $t4, $a3 /* 02590 8096C060 AC4D0004 */ sw $t5, 0x0004($v0) ## 00000004 /* 02594 8096C064 8D0202C0 */ lw $v0, 0x02C0($t0) ## 000002C0 /* 02598 8096C068 24847FC0 */ addiu $a0, $a0, 0x7FC0 ## $a0 = 06007FC0 -/* 0259C 8096C06C 00047100 */ sll $t6, $a0, 4 -/* 025A0 8096C070 000ECF02 */ srl $t9, $t6, 28 +/* 0259C 8096C06C 00047100 */ sll $t6, $a0, 4 +/* 025A0 8096C070 000ECF02 */ srl $t9, $t6, 28 /* 025A4 8096C074 3C18DB06 */ lui $t8, 0xDB06 ## $t8 = DB060000 /* 025A8 8096C078 244F0008 */ addiu $t7, $v0, 0x0008 ## $t7 = 00000008 /* 025AC 8096C07C 37180028 */ ori $t8, $t8, 0x0028 ## $t8 = DB060028 -/* 025B0 8096C080 00194880 */ sll $t1, $t9, 2 +/* 025B0 8096C080 00194880 */ sll $t1, $t9, 2 /* 025B4 8096C084 AD0F02C0 */ sw $t7, 0x02C0($t0) ## 000002C0 -/* 025B8 8096C088 00A95021 */ addu $t2, $a1, $t1 +/* 025B8 8096C088 00A95021 */ addu $t2, $a1, $t1 /* 025BC 8096C08C AC580000 */ sw $t8, 0x0000($v0) ## 00000000 /* 025C0 8096C090 8D4B0000 */ lw $t3, 0x0000($t2) ## 00000000 -/* 025C4 8096C094 00866024 */ and $t4, $a0, $a2 +/* 025C4 8096C094 00866024 */ and $t4, $a0, $a2 /* 025C8 8096C098 241900FF */ addiu $t9, $zero, 0x00FF ## $t9 = 000000FF -/* 025CC 8096C09C 016C6821 */ addu $t5, $t3, $t4 -/* 025D0 8096C0A0 01A77821 */ addu $t7, $t5, $a3 +/* 025CC 8096C09C 016C6821 */ addu $t5, $t3, $t4 +/* 025D0 8096C0A0 01A77821 */ addu $t7, $t5, $a3 /* 025D4 8096C0A4 AC4F0004 */ sw $t7, 0x0004($v0) ## 00000004 /* 025D8 8096C0A8 8D0202C0 */ lw $v0, 0x02C0($t0) ## 000002C0 /* 025DC 8096C0AC 3C0EFB00 */ lui $t6, 0xFB00 ## $t6 = FB000000 @@ -96,26 +96,26 @@ glabel func_8096BF60 /* 02608 8096C0D8 256B6290 */ addiu $t3, $t3, 0x6290 ## $t3 = 80116290 /* 0260C 8096C0DC AC4B0004 */ sw $t3, 0x0004($v0) ## 00000004 /* 02610 8096C0E0 AC4A0000 */ sw $t2, 0x0000($v0) ## 00000000 -/* 02614 8096C0E4 8FA30078 */ lw $v1, 0x0078($sp) -/* 02618 8096C0E8 8FA4007C */ lw $a0, 0x007C($sp) +/* 02614 8096C0E4 8FA30078 */ lw $v1, 0x0078($sp) +/* 02618 8096C0E8 8FA4007C */ lw $a0, 0x007C($sp) /* 0261C 8096C0EC 2462014C */ addiu $v0, $v1, 0x014C ## $v0 = 0000014C /* 02620 8096C0F0 8C450004 */ lw $a1, 0x0004($v0) ## 00000150 /* 02624 8096C0F4 8C460020 */ lw $a2, 0x0020($v0) ## 0000016C /* 02628 8096C0F8 90470002 */ lbu $a3, 0x0002($v0) ## 0000014E -/* 0262C 8096C0FC AFA00014 */ sw $zero, 0x0014($sp) -/* 02630 8096C100 AFA00010 */ sw $zero, 0x0010($sp) -/* 02634 8096C104 0C0286B2 */ jal func_800A1AC8 -/* 02638 8096C108 AFA30018 */ sw $v1, 0x0018($sp) -/* 0263C 8096C10C 8FAC007C */ lw $t4, 0x007C($sp) +/* 0262C 8096C0FC AFA00014 */ sw $zero, 0x0014($sp) +/* 02630 8096C100 AFA00010 */ sw $zero, 0x0010($sp) +/* 02634 8096C104 0C0286B2 */ jal SkelAnime_DrawSV +/* 02638 8096C108 AFA30018 */ sw $v1, 0x0018($sp) +/* 0263C 8096C10C 8FAC007C */ lw $t4, 0x007C($sp) /* 02640 8096C110 3C068097 */ lui $a2, %hi(D_8096D0A0) ## $a2 = 80970000 /* 02644 8096C114 24C6D0A0 */ addiu $a2, $a2, %lo(D_8096D0A0) ## $a2 = 8096D0A0 /* 02648 8096C118 27A40044 */ addiu $a0, $sp, 0x0044 ## $a0 = FFFFFFCC /* 0264C 8096C11C 2407027E */ addiu $a3, $zero, 0x027E ## $a3 = 0000027E -/* 02650 8096C120 0C031AD5 */ jal func_800C6B54 +/* 02650 8096C120 0C031AD5 */ jal Graph_CloseDisps /* 02654 8096C124 8D850000 */ lw $a1, 0x0000($t4) ## 00000000 -/* 02658 8096C128 8FBF0024 */ lw $ra, 0x0024($sp) +/* 02658 8096C128 8FBF0024 */ lw $ra, 0x0024($sp) /* 0265C 8096C12C 27BD0078 */ addiu $sp, $sp, 0x0078 ## $sp = 00000000 -/* 02660 8096C130 03E00008 */ jr $ra +/* 02660 8096C130 03E00008 */ jr $ra /* 02664 8096C134 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/DemoEc_Destroy.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/DemoEc_Destroy.s index 65b685f28e..e302254fb6 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/DemoEc_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/DemoEc_Destroy.s @@ -1,11 +1,11 @@ glabel DemoEc_Destroy /* 00000 8096D4B0 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00004 8096D4B4 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00008 8096D4B8 0C0295BC */ jal func_800A56F0 +/* 00004 8096D4B4 AFBF0014 */ sw $ra, 0x0014($sp) +/* 00008 8096D4B8 0C0295BC */ jal SkelAnime_Free /* 0000C 8096D4BC 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 00010 8096D4C0 8FBF0014 */ lw $ra, 0x0014($sp) +/* 00010 8096D4C0 8FBF0014 */ lw $ra, 0x0014($sp) /* 00014 8096D4C4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00018 8096D4C8 03E00008 */ jr $ra +/* 00018 8096D4C8 03E00008 */ jr $ra /* 0001C 8096D4CC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096D594.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096D594.s index 157b645839..d271157999 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096D594.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096D594.s @@ -1,19 +1,19 @@ glabel func_8096D594 /* 000E4 8096D594 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 000E8 8096D598 AFBF0014 */ sw $ra, 0x0014($sp) -/* 000EC 8096D59C AFA40018 */ sw $a0, 0x0018($sp) -/* 000F0 8096D5A0 AFA5001C */ sw $a1, 0x001C($sp) +/* 000E8 8096D598 AFBF0014 */ sw $ra, 0x0014($sp) +/* 000EC 8096D59C AFA40018 */ sw $a0, 0x0018($sp) +/* 000F0 8096D5A0 AFA5001C */ sw $a1, 0x001C($sp) /* 000F4 8096D5A4 908E0181 */ lbu $t6, 0x0181($a0) ## 00000181 /* 000F8 8096D5A8 00802825 */ or $a1, $a0, $zero ## $a1 = 00000000 /* 000FC 8096D5AC 24A6014C */ addiu $a2, $a1, 0x014C ## $a2 = 0000014C /* 00100 8096D5B0 35CF0003 */ ori $t7, $t6, 0x0003 ## $t7 = 00000003 /* 00104 8096D5B4 A08F0181 */ sb $t7, 0x0181($a0) ## 00000181 -/* 00108 8096D5B8 8FA4001C */ lw $a0, 0x001C($sp) -/* 0010C 8096D5BC 0C028D88 */ jal func_800A3620 +/* 00108 8096D5B8 8FA4001C */ lw $a0, 0x001C($sp) +/* 0010C 8096D5BC 0C028D88 */ jal SkelAnime_LoadAnimationType5 /* 00110 8096D5C0 3C073F80 */ lui $a3, 0x3F80 ## $a3 = 3F800000 -/* 00114 8096D5C4 8FBF0014 */ lw $ra, 0x0014($sp) +/* 00114 8096D5C4 8FBF0014 */ lw $ra, 0x0014($sp) /* 00118 8096D5C8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 0011C 8096D5CC 03E00008 */ jr $ra +/* 0011C 8096D5CC 03E00008 */ jr $ra /* 00120 8096D5D0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096D5D4.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096D5D4.s index e20e9b9a13..f3a8de0830 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096D5D4.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096D5D4.s @@ -1,8 +1,8 @@ glabel func_8096D5D4 /* 00124 8096D5D4 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00128 8096D5D8 AFBF0014 */ sw $ra, 0x0014($sp) -/* 0012C 8096D5DC AFA40018 */ sw $a0, 0x0018($sp) -/* 00130 8096D5E0 AFA5001C */ sw $a1, 0x001C($sp) +/* 00128 8096D5D8 AFBF0014 */ sw $ra, 0x0014($sp) +/* 0012C 8096D5DC AFA40018 */ sw $a0, 0x0018($sp) +/* 00130 8096D5E0 AFA5001C */ sw $a1, 0x001C($sp) /* 00134 8096D5E4 8C8E016C */ lw $t6, 0x016C($a0) ## 0000016C /* 00138 8096D5E8 8C99016C */ lw $t9, 0x016C($a0) ## 0000016C /* 0013C 8096D5EC 908A0181 */ lbu $t2, 0x0181($a0) ## 00000181 @@ -23,11 +23,11 @@ glabel func_8096D5D4 /* 00178 8096D628 97290004 */ lhu $t1, 0x0004($t9) ## 00000004 /* 0017C 8096D62C A08B0181 */ sb $t3, 0x0181($a0) ## 00000181 /* 00180 8096D630 A4890188 */ sh $t1, 0x0188($a0) ## 00000188 -/* 00184 8096D634 0C028D88 */ jal func_800A3620 -/* 00188 8096D638 8FA4001C */ lw $a0, 0x001C($sp) -/* 0018C 8096D63C 8FBF0014 */ lw $ra, 0x0014($sp) +/* 00184 8096D634 0C028D88 */ jal SkelAnime_LoadAnimationType5 +/* 00188 8096D638 8FA4001C */ lw $a0, 0x001C($sp) +/* 0018C 8096D63C 8FBF0014 */ lw $ra, 0x0014($sp) /* 00190 8096D640 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00194 8096D644 03E00008 */ jr $ra +/* 00194 8096D644 03E00008 */ jr $ra /* 00198 8096D648 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096D64C.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096D64C.s index 7966ded647..97fa0be67f 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096D64C.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096D64C.s @@ -1,19 +1,19 @@ glabel func_8096D64C /* 0019C 8096D64C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 001A0 8096D650 AFBF0014 */ sw $ra, 0x0014($sp) -/* 001A4 8096D654 AFA40018 */ sw $a0, 0x0018($sp) -/* 001A8 8096D658 AFA5001C */ sw $a1, 0x001C($sp) +/* 001A0 8096D650 AFBF0014 */ sw $ra, 0x0014($sp) +/* 001A4 8096D654 AFA40018 */ sw $a0, 0x0018($sp) +/* 001A8 8096D658 AFA5001C */ sw $a1, 0x001C($sp) /* 001AC 8096D65C 908E0181 */ lbu $t6, 0x0181($a0) ## 00000181 /* 001B0 8096D660 00802825 */ or $a1, $a0, $zero ## $a1 = 00000000 /* 001B4 8096D664 24A6014C */ addiu $a2, $a1, 0x014C ## $a2 = 0000014C /* 001B8 8096D668 35CF0003 */ ori $t7, $t6, 0x0003 ## $t7 = 00000003 /* 001BC 8096D66C A08F0181 */ sb $t7, 0x0181($a0) ## 00000181 -/* 001C0 8096D670 8FA4001C */ lw $a0, 0x001C($sp) -/* 001C4 8096D674 0C028D88 */ jal func_800A3620 +/* 001C0 8096D670 8FA4001C */ lw $a0, 0x001C($sp) +/* 001C4 8096D674 0C028D88 */ jal SkelAnime_LoadAnimationType5 /* 001C8 8096D678 3C073F80 */ lui $a3, 0x3F80 ## $a3 = 3F800000 -/* 001CC 8096D67C 8FBF0014 */ lw $ra, 0x0014($sp) +/* 001CC 8096D67C 8FBF0014 */ lw $ra, 0x0014($sp) /* 001D0 8096D680 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 001D4 8096D684 03E00008 */ jr $ra +/* 001D4 8096D684 03E00008 */ jr $ra /* 001D8 8096D688 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096D728.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096D728.s index d7d6400857..2ec0092e09 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096D728.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096D728.s @@ -1,32 +1,32 @@ glabel func_8096D728 -/* 00278 8096D728 00067900 */ sll $t7, $a2, 4 +/* 00278 8096D728 00067900 */ sll $t7, $a2, 4 /* 0027C 8096D72C 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 00280 8096D730 000FC702 */ srl $t8, $t7, 28 -/* 00284 8096D734 0018C880 */ sll $t9, $t8, 2 +/* 00280 8096D730 000FC702 */ srl $t8, $t7, 28 +/* 00284 8096D734 0018C880 */ sll $t9, $t8, 2 /* 00288 8096D738 3C088016 */ lui $t0, 0x8016 ## $t0 = 80160000 -/* 0028C 8096D73C 01194021 */ addu $t0, $t0, $t9 +/* 0028C 8096D73C 01194021 */ addu $t0, $t0, $t9 /* 00290 8096D740 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 /* 00294 8096D744 8D086FA8 */ lw $t0, 0x6FA8($t0) ## 80166FA8 -/* 00298 8096D748 AFA40028 */ sw $a0, 0x0028($sp) +/* 00298 8096D748 AFA40028 */ sw $a0, 0x0028($sp) /* 0029C 8096D74C 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF -/* 002A0 8096D750 AFA5002C */ sw $a1, 0x002C($sp) -/* 002A4 8096D754 00C14824 */ and $t1, $a2, $at +/* 002A0 8096D750 AFA5002C */ sw $a1, 0x002C($sp) +/* 002A4 8096D754 00C14824 */ and $t1, $a2, $at /* 002A8 8096D758 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 002AC 8096D75C 8FA50028 */ lw $a1, 0x0028($sp) -/* 002B0 8096D760 AFA60030 */ sw $a2, 0x0030($sp) -/* 002B4 8096D764 AFBF0024 */ sw $ra, 0x0024($sp) +/* 002AC 8096D75C 8FA50028 */ lw $a1, 0x0028($sp) +/* 002B0 8096D760 AFA60030 */ sw $a2, 0x0030($sp) +/* 002B4 8096D764 AFBF0024 */ sw $ra, 0x0024($sp) /* 002B8 8096D768 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 002BC 8096D76C 01093021 */ addu $a2, $t0, $t1 -/* 002C0 8096D770 00C13021 */ addu $a2, $a2, $at -/* 002C4 8096D774 AFA00010 */ sw $zero, 0x0010($sp) -/* 002C8 8096D778 AFA00014 */ sw $zero, 0x0014($sp) -/* 002CC 8096D77C AFA00018 */ sw $zero, 0x0018($sp) +/* 002BC 8096D76C 01093021 */ addu $a2, $t0, $t1 +/* 002C0 8096D770 00C13021 */ addu $a2, $a2, $at +/* 002C4 8096D774 AFA00010 */ sw $zero, 0x0010($sp) +/* 002C8 8096D778 AFA00014 */ sw $zero, 0x0014($sp) +/* 002CC 8096D77C AFA00018 */ sw $zero, 0x0018($sp) /* 002D0 8096D780 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 002D4 8096D784 0C0291BE */ jal func_800A46F8 +/* 002D4 8096D784 0C0291BE */ jal SkelAnime_InitSV /* 002D8 8096D788 24A5014C */ addiu $a1, $a1, 0x014C ## $a1 = 0000014C -/* 002DC 8096D78C 8FBF0024 */ lw $ra, 0x0024($sp) +/* 002DC 8096D78C 8FBF0024 */ lw $ra, 0x0024($sp) /* 002E0 8096D790 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 002E4 8096D794 03E00008 */ jr $ra +/* 002E4 8096D794 03E00008 */ jr $ra /* 002E8 8096D798 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096D79C.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096D79C.s index b16922cfc0..a7f549ab3c 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096D79C.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096D79C.s @@ -1,54 +1,54 @@ glabel func_8096D79C -/* 002EC 8096D79C 00057100 */ sll $t6, $a1, 4 -/* 002F0 8096D7A0 000E7F02 */ srl $t7, $t6, 28 -/* 002F4 8096D7A4 000FC080 */ sll $t8, $t7, 2 +/* 002EC 8096D79C 00057100 */ sll $t6, $a1, 4 +/* 002F0 8096D7A0 000E7F02 */ srl $t7, $t6, 28 +/* 002F4 8096D7A4 000FC080 */ sll $t8, $t7, 2 /* 002F8 8096D7A8 3C198016 */ lui $t9, 0x8016 ## $t9 = 80160000 -/* 002FC 8096D7AC 0338C821 */ addu $t9, $t9, $t8 +/* 002FC 8096D7AC 0338C821 */ addu $t9, $t9, $t8 /* 00300 8096D7B0 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 /* 00304 8096D7B4 8F396FA8 */ lw $t9, 0x6FA8($t9) ## 80166FA8 /* 00308 8096D7B8 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF /* 0030C 8096D7BC 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 00310 8096D7C0 00A14024 */ and $t0, $a1, $at -/* 00314 8096D7C4 AFA40038 */ sw $a0, 0x0038($sp) +/* 00310 8096D7C0 00A14024 */ and $t0, $a1, $at +/* 00314 8096D7C4 AFA40038 */ sw $a0, 0x0038($sp) /* 00318 8096D7C8 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 0031C 8096D7CC 03282021 */ addu $a0, $t9, $t0 -/* 00320 8096D7D0 AFBF0024 */ sw $ra, 0x0024($sp) -/* 00324 8096D7D4 00812021 */ addu $a0, $a0, $at -/* 00328 8096D7D8 AFA60040 */ sw $a2, 0x0040($sp) -/* 0032C 8096D7DC AFA70044 */ sw $a3, 0x0044($sp) +/* 0031C 8096D7CC 03282021 */ addu $a0, $t9, $t0 +/* 00320 8096D7D0 AFBF0024 */ sw $ra, 0x0024($sp) +/* 00324 8096D7D4 00812021 */ addu $a0, $a0, $at +/* 00328 8096D7D8 AFA60040 */ sw $a2, 0x0040($sp) +/* 0032C 8096D7DC AFA70044 */ sw $a3, 0x0044($sp) /* 00330 8096D7E0 0C028800 */ jal SkelAnime_GetFrameCount - -/* 00334 8096D7E4 AFA4002C */ sw $a0, 0x002C($sp) -/* 00338 8096D7E8 8FA90048 */ lw $t1, 0x0048($sp) -/* 0033C 8096D7EC 8FA40038 */ lw $a0, 0x0038($sp) -/* 00340 8096D7F0 8FA5002C */ lw $a1, 0x002C($sp) -/* 00344 8096D7F4 15200007 */ bne $t1, $zero, .L8096D814 + +/* 00334 8096D7E4 AFA4002C */ sw $a0, 0x002C($sp) +/* 00338 8096D7E8 8FA90048 */ lw $t1, 0x0048($sp) +/* 0033C 8096D7EC 8FA40038 */ lw $a0, 0x0038($sp) +/* 00340 8096D7F0 8FA5002C */ lw $a1, 0x002C($sp) +/* 00344 8096D7F4 15200007 */ bne $t1, $zero, .L8096D814 /* 00348 8096D7F8 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C /* 0034C 8096D7FC 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 00350 8096D800 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 /* 00354 8096D804 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 /* 00358 8096D808 44816000 */ mtc1 $at, $f12 ## $f12 = 1.00 -/* 0035C 8096D80C 10000006 */ beq $zero, $zero, .L8096D828 -/* 00360 8096D810 468020A0 */ cvt.s.w $f2, $f4 +/* 0035C 8096D80C 10000006 */ beq $zero, $zero, .L8096D828 +/* 00360 8096D810 468020A0 */ cvt.s.w $f2, $f4 .L8096D814: /* 00364 8096D814 44823000 */ mtc1 $v0, $f6 ## $f6 = 0.00 /* 00368 8096D818 3C01BF80 */ lui $at, 0xBF80 ## $at = BF800000 /* 0036C 8096D81C 44801000 */ mtc1 $zero, $f2 ## $f2 = 0.00 /* 00370 8096D820 44816000 */ mtc1 $at, $f12 ## $f12 = -1.00 -/* 00374 8096D824 46803020 */ cvt.s.w $f0, $f6 +/* 00374 8096D824 46803020 */ cvt.s.w $f0, $f6 .L8096D828: -/* 00378 8096D828 93AA0043 */ lbu $t2, 0x0043($sp) -/* 0037C 8096D82C C7A80044 */ lwc1 $f8, 0x0044($sp) -/* 00380 8096D830 44066000 */ mfc1 $a2, $f12 -/* 00384 8096D834 44070000 */ mfc1 $a3, $f0 -/* 00388 8096D838 E7A20010 */ swc1 $f2, 0x0010($sp) -/* 0038C 8096D83C AFAA0014 */ sw $t2, 0x0014($sp) -/* 00390 8096D840 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 00394 8096D844 E7A80018 */ swc1 $f8, 0x0018($sp) -/* 00398 8096D848 8FBF0024 */ lw $ra, 0x0024($sp) +/* 00378 8096D828 93AA0043 */ lbu $t2, 0x0043($sp) +/* 0037C 8096D82C C7A80044 */ lwc1 $f8, 0x0044($sp) +/* 00380 8096D830 44066000 */ mfc1 $a2, $f12 +/* 00384 8096D834 44070000 */ mfc1 $a3, $f0 +/* 00388 8096D838 E7A20010 */ swc1 $f2, 0x0010($sp) +/* 0038C 8096D83C AFAA0014 */ sw $t2, 0x0014($sp) +/* 00390 8096D840 0C029468 */ jal SkelAnime_ChangeAnim + +/* 00394 8096D844 E7A80018 */ swc1 $f8, 0x0018($sp) +/* 00398 8096D848 8FBF0024 */ lw $ra, 0x0024($sp) /* 0039C 8096D84C 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 -/* 003A0 8096D850 03E00008 */ jr $ra +/* 003A0 8096D850 03E00008 */ jr $ra /* 003A4 8096D854 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096D8C4.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096D8C4.s index b6c7d3ac4f..3fc94fc4bf 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096D8C4.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096D8C4.s @@ -1,41 +1,41 @@ glabel func_8096D8C4 /* 00414 8096D8C4 27BDFF90 */ addiu $sp, $sp, 0xFF90 ## $sp = FFFFFF90 -/* 00418 8096D8C8 AFBF002C */ sw $ra, 0x002C($sp) -/* 0041C 8096D8CC AFB00028 */ sw $s0, 0x0028($sp) -/* 00420 8096D8D0 AFA40070 */ sw $a0, 0x0070($sp) -/* 00424 8096D8D4 AFA50074 */ sw $a1, 0x0074($sp) -/* 00428 8096D8D8 AFA60078 */ sw $a2, 0x0078($sp) -/* 0042C 8096D8DC AFA7007C */ sw $a3, 0x007C($sp) +/* 00418 8096D8C8 AFBF002C */ sw $ra, 0x002C($sp) +/* 0041C 8096D8CC AFB00028 */ sw $s0, 0x0028($sp) +/* 00420 8096D8D0 AFA40070 */ sw $a0, 0x0070($sp) +/* 00424 8096D8D4 AFA50074 */ sw $a1, 0x0074($sp) +/* 00428 8096D8D8 AFA60078 */ sw $a2, 0x0078($sp) +/* 0042C 8096D8DC AFA7007C */ sw $a3, 0x007C($sp) /* 00430 8096D8E0 8CB00000 */ lw $s0, 0x0000($a1) ## 00000000 /* 00434 8096D8E4 3C068097 */ lui $a2, %hi(D_8097066C) ## $a2 = 80970000 /* 00438 8096D8E8 24C6066C */ addiu $a2, $a2, %lo(D_8097066C) ## $a2 = 8097066C /* 0043C 8096D8EC 24070235 */ addiu $a3, $zero, 0x0235 ## $a3 = 00000235 /* 00440 8096D8F0 27A40050 */ addiu $a0, $sp, 0x0050 ## $a0 = FFFFFFE0 -/* 00444 8096D8F4 0C031AB1 */ jal func_800C6AC4 +/* 00444 8096D8F4 0C031AB1 */ jal Graph_OpenDisps /* 00448 8096D8F8 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 0044C 8096D8FC 0C024F46 */ jal func_80093D18 +/* 0044C 8096D8FC 0C024F46 */ jal func_80093D18 /* 00450 8096D900 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00454 8096D904 8FA60078 */ lw $a2, 0x0078($sp) +/* 00454 8096D904 8FA60078 */ lw $a2, 0x0078($sp) /* 00458 8096D908 3C18DB06 */ lui $t8, 0xDB06 ## $t8 = DB060000 /* 0045C 8096D90C 37180020 */ ori $t8, $t8, 0x0020 ## $t8 = DB060020 -/* 00460 8096D910 10C0001C */ beq $a2, $zero, .L8096D984 +/* 00460 8096D910 10C0001C */ beq $a2, $zero, .L8096D984 /* 00464 8096D914 3C078000 */ lui $a3, 0x8000 ## $a3 = 80000000 /* 00468 8096D918 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 -/* 0046C 8096D91C 0006C900 */ sll $t9, $a2, 4 -/* 00470 8096D920 00194702 */ srl $t0, $t9, 28 +/* 0046C 8096D91C 0006C900 */ sll $t9, $a2, 4 +/* 00470 8096D920 00194702 */ srl $t0, $t9, 28 /* 00474 8096D924 3C0A8016 */ lui $t2, 0x8016 ## $t2 = 80160000 /* 00478 8096D928 244F0008 */ addiu $t7, $v0, 0x0008 ## $t7 = 00000008 /* 0047C 8096D92C AE0F02C0 */ sw $t7, 0x02C0($s0) ## 000002C0 /* 00480 8096D930 254A6FA8 */ addiu $t2, $t2, 0x6FA8 ## $t2 = 80166FA8 -/* 00484 8096D934 00084880 */ sll $t1, $t0, 2 -/* 00488 8096D938 012A2021 */ addu $a0, $t1, $t2 +/* 00484 8096D934 00084880 */ sll $t1, $t0, 2 +/* 00488 8096D938 012A2021 */ addu $a0, $t1, $t2 /* 0048C 8096D93C AC580000 */ sw $t8, 0x0000($v0) ## 00000000 /* 00490 8096D940 8C8B0000 */ lw $t3, 0x0000($a0) ## 00000000 /* 00494 8096D944 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 /* 00498 8096D948 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF -/* 0049C 8096D94C 00C12824 */ and $a1, $a2, $at -/* 004A0 8096D950 01656021 */ addu $t4, $t3, $a1 -/* 004A4 8096D954 01876821 */ addu $t5, $t4, $a3 +/* 0049C 8096D94C 00C12824 */ and $a1, $a2, $at +/* 004A0 8096D950 01656021 */ addu $t4, $t3, $a1 +/* 004A4 8096D954 01876821 */ addu $t5, $t4, $a3 /* 004A8 8096D958 AC4D0004 */ sw $t5, 0x0004($v0) ## 00000004 /* 004AC 8096D95C 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 /* 004B0 8096D960 3C0FDB06 */ lui $t7, 0xDB06 ## $t7 = DB060000 @@ -44,30 +44,30 @@ glabel func_8096D8C4 /* 004BC 8096D96C AE0E02C0 */ sw $t6, 0x02C0($s0) ## 000002C0 /* 004C0 8096D970 AC4F0000 */ sw $t7, 0x0000($v0) ## 00000000 /* 004C4 8096D974 8C980000 */ lw $t8, 0x0000($a0) ## 00000000 -/* 004C8 8096D978 0305C821 */ addu $t9, $t8, $a1 -/* 004CC 8096D97C 03274021 */ addu $t0, $t9, $a3 +/* 004C8 8096D978 0305C821 */ addu $t9, $t8, $a1 +/* 004CC 8096D97C 03274021 */ addu $t0, $t9, $a3 /* 004D0 8096D980 AC480004 */ sw $t0, 0x0004($v0) ## 00000004 .L8096D984: -/* 004D4 8096D984 8FA4007C */ lw $a0, 0x007C($sp) +/* 004D4 8096D984 8FA4007C */ lw $a0, 0x007C($sp) /* 004D8 8096D988 3C0ADB06 */ lui $t2, 0xDB06 ## $t2 = DB060000 /* 004DC 8096D98C 3C078000 */ lui $a3, 0x8000 ## $a3 = 80000000 -/* 004E0 8096D990 10800011 */ beq $a0, $zero, .L8096D9D8 +/* 004E0 8096D990 10800011 */ beq $a0, $zero, .L8096D9D8 /* 004E4 8096D994 354A0024 */ ori $t2, $t2, 0x0024 ## $t2 = DB060024 /* 004E8 8096D998 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 -/* 004EC 8096D99C 00045900 */ sll $t3, $a0, 4 -/* 004F0 8096D9A0 000B6702 */ srl $t4, $t3, 28 +/* 004EC 8096D99C 00045900 */ sll $t3, $a0, 4 +/* 004F0 8096D9A0 000B6702 */ srl $t4, $t3, 28 /* 004F4 8096D9A4 24490008 */ addiu $t1, $v0, 0x0008 ## $t1 = 00000008 /* 004F8 8096D9A8 AE0902C0 */ sw $t1, 0x02C0($s0) ## 000002C0 -/* 004FC 8096D9AC 000C6880 */ sll $t5, $t4, 2 +/* 004FC 8096D9AC 000C6880 */ sll $t5, $t4, 2 /* 00500 8096D9B0 3C0E8016 */ lui $t6, 0x8016 ## $t6 = 80160000 -/* 00504 8096D9B4 01CD7021 */ addu $t6, $t6, $t5 +/* 00504 8096D9B4 01CD7021 */ addu $t6, $t6, $t5 /* 00508 8096D9B8 AC4A0000 */ sw $t2, 0x0000($v0) ## 00000000 /* 0050C 8096D9BC 8DCE6FA8 */ lw $t6, 0x6FA8($t6) ## 80166FA8 /* 00510 8096D9C0 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 /* 00514 8096D9C4 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF -/* 00518 8096D9C8 00817824 */ and $t7, $a0, $at -/* 0051C 8096D9CC 01CFC021 */ addu $t8, $t6, $t7 -/* 00520 8096D9D0 0307C821 */ addu $t9, $t8, $a3 +/* 00518 8096D9C8 00817824 */ and $t7, $a0, $at +/* 0051C 8096D9CC 01CFC021 */ addu $t8, $t6, $t7 +/* 00520 8096D9D0 0307C821 */ addu $t9, $t8, $a3 /* 00524 8096D9D4 AC590004 */ sw $t9, 0x0004($v0) ## 00000004 .L8096D9D8: /* 00528 8096D9D8 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 @@ -86,31 +86,31 @@ glabel func_8096D8C4 /* 0055C 8096DA0C 358C0030 */ ori $t4, $t4, 0x0030 ## $t4 = DB060030 /* 00560 8096DA10 AC4C0000 */ sw $t4, 0x0000($v0) ## 00000000 /* 00564 8096DA14 AC4D0004 */ sw $t5, 0x0004($v0) ## 00000004 -/* 00568 8096DA18 8FA30070 */ lw $v1, 0x0070($sp) -/* 0056C 8096DA1C 8FAF0084 */ lw $t7, 0x0084($sp) -/* 00570 8096DA20 8FAE0080 */ lw $t6, 0x0080($sp) +/* 00568 8096DA18 8FA30070 */ lw $v1, 0x0070($sp) +/* 0056C 8096DA1C 8FAF0084 */ lw $t7, 0x0084($sp) +/* 00570 8096DA20 8FAE0080 */ lw $t6, 0x0080($sp) /* 00574 8096DA24 2462014C */ addiu $v0, $v1, 0x014C ## $v0 = 0000014C /* 00578 8096DA28 8C450004 */ lw $a1, 0x0004($v0) ## 00000150 /* 0057C 8096DA2C 8C460020 */ lw $a2, 0x0020($v0) ## 0000016C /* 00580 8096DA30 90470002 */ lbu $a3, 0x0002($v0) ## 0000014E -/* 00584 8096DA34 AFA30018 */ sw $v1, 0x0018($sp) -/* 00588 8096DA38 AFAF0014 */ sw $t7, 0x0014($sp) -/* 0058C 8096DA3C AFAE0010 */ sw $t6, 0x0010($sp) +/* 00584 8096DA34 AFA30018 */ sw $v1, 0x0018($sp) +/* 00588 8096DA38 AFAF0014 */ sw $t7, 0x0014($sp) +/* 0058C 8096DA3C AFAE0010 */ sw $t6, 0x0010($sp) /* 00590 8096DA40 8E1802C0 */ lw $t8, 0x02C0($s0) ## 000002C0 -/* 00594 8096DA44 8FA40074 */ lw $a0, 0x0074($sp) -/* 00598 8096DA48 0C0289CF */ jal func_800A273C -/* 0059C 8096DA4C AFB8001C */ sw $t8, 0x001C($sp) +/* 00594 8096DA44 8FA40074 */ lw $a0, 0x0074($sp) +/* 00598 8096DA48 0C0289CF */ jal SkelAnime_DrawSV2 +/* 0059C 8096DA4C AFB8001C */ sw $t8, 0x001C($sp) /* 005A0 8096DA50 3C068097 */ lui $a2, %hi(D_8097067C) ## $a2 = 80970000 /* 005A4 8096DA54 AE0202C0 */ sw $v0, 0x02C0($s0) ## 000002C0 /* 005A8 8096DA58 24C6067C */ addiu $a2, $a2, %lo(D_8097067C) ## $a2 = 8097067C /* 005AC 8096DA5C 27A40050 */ addiu $a0, $sp, 0x0050 ## $a0 = FFFFFFE0 /* 005B0 8096DA60 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 005B4 8096DA64 0C031AD5 */ jal func_800C6B54 +/* 005B4 8096DA64 0C031AD5 */ jal Graph_CloseDisps /* 005B8 8096DA68 24070253 */ addiu $a3, $zero, 0x0253 ## $a3 = 00000253 -/* 005BC 8096DA6C 8FBF002C */ lw $ra, 0x002C($sp) -/* 005C0 8096DA70 8FB00028 */ lw $s0, 0x0028($sp) +/* 005BC 8096DA6C 8FBF002C */ lw $ra, 0x002C($sp) +/* 005C0 8096DA70 8FB00028 */ lw $s0, 0x0028($sp) /* 005C4 8096DA74 27BD0070 */ addiu $sp, $sp, 0x0070 ## $sp = 00000000 -/* 005C8 8096DA78 03E00008 */ jr $ra +/* 005C8 8096DA78 03E00008 */ jr $ra /* 005CC 8096DA7C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096DA80.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096DA80.s index eebde36ea4..347410e5f7 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096DA80.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096DA80.s @@ -1,100 +1,100 @@ glabel func_8096DA80 /* 005D0 8096DA80 27BDFF90 */ addiu $sp, $sp, 0xFF90 ## $sp = FFFFFF90 -/* 005D4 8096DA84 AFBF002C */ sw $ra, 0x002C($sp) -/* 005D8 8096DA88 AFB00028 */ sw $s0, 0x0028($sp) -/* 005DC 8096DA8C AFA40070 */ sw $a0, 0x0070($sp) -/* 005E0 8096DA90 AFA50074 */ sw $a1, 0x0074($sp) -/* 005E4 8096DA94 AFA60078 */ sw $a2, 0x0078($sp) -/* 005E8 8096DA98 AFA7007C */ sw $a3, 0x007C($sp) +/* 005D4 8096DA84 AFBF002C */ sw $ra, 0x002C($sp) +/* 005D8 8096DA88 AFB00028 */ sw $s0, 0x0028($sp) +/* 005DC 8096DA8C AFA40070 */ sw $a0, 0x0070($sp) +/* 005E0 8096DA90 AFA50074 */ sw $a1, 0x0074($sp) +/* 005E4 8096DA94 AFA60078 */ sw $a2, 0x0078($sp) +/* 005E8 8096DA98 AFA7007C */ sw $a3, 0x007C($sp) /* 005EC 8096DA9C 8CB00000 */ lw $s0, 0x0000($a1) ## 00000000 /* 005F0 8096DAA0 3C068097 */ lui $a2, %hi(D_8097068C) ## $a2 = 80970000 /* 005F4 8096DAA4 24C6068C */ addiu $a2, $a2, %lo(D_8097068C) ## $a2 = 8097068C /* 005F8 8096DAA8 24070261 */ addiu $a3, $zero, 0x0261 ## $a3 = 00000261 /* 005FC 8096DAAC 27A40050 */ addiu $a0, $sp, 0x0050 ## $a0 = FFFFFFE0 -/* 00600 8096DAB0 0C031AB1 */ jal func_800C6AC4 +/* 00600 8096DAB0 0C031AB1 */ jal Graph_OpenDisps /* 00604 8096DAB4 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 00608 8096DAB8 0C024F46 */ jal func_80093D18 +/* 00608 8096DAB8 0C024F46 */ jal func_80093D18 /* 0060C 8096DABC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00610 8096DAC0 8FA40078 */ lw $a0, 0x0078($sp) +/* 00610 8096DAC0 8FA40078 */ lw $a0, 0x0078($sp) /* 00614 8096DAC4 3C18DB06 */ lui $t8, 0xDB06 ## $t8 = DB060000 /* 00618 8096DAC8 37180028 */ ori $t8, $t8, 0x0028 ## $t8 = DB060028 -/* 0061C 8096DACC 10800011 */ beq $a0, $zero, .L8096DB14 -/* 00620 8096DAD0 0004C900 */ sll $t9, $a0, 4 +/* 0061C 8096DACC 10800011 */ beq $a0, $zero, .L8096DB14 +/* 00620 8096DAD0 0004C900 */ sll $t9, $a0, 4 /* 00624 8096DAD4 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 -/* 00628 8096DAD8 00194702 */ srl $t0, $t9, 28 -/* 0062C 8096DADC 00084880 */ sll $t1, $t0, 2 +/* 00628 8096DAD8 00194702 */ srl $t0, $t9, 28 +/* 0062C 8096DADC 00084880 */ sll $t1, $t0, 2 /* 00630 8096DAE0 244F0008 */ addiu $t7, $v0, 0x0008 ## $t7 = 00000008 /* 00634 8096DAE4 AE0F02C0 */ sw $t7, 0x02C0($s0) ## 000002C0 /* 00638 8096DAE8 3C0A8016 */ lui $t2, 0x8016 ## $t2 = 80160000 -/* 0063C 8096DAEC 01495021 */ addu $t2, $t2, $t1 +/* 0063C 8096DAEC 01495021 */ addu $t2, $t2, $t1 /* 00640 8096DAF0 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 /* 00644 8096DAF4 AC580000 */ sw $t8, 0x0000($v0) ## 00000000 /* 00648 8096DAF8 8D4A6FA8 */ lw $t2, 0x6FA8($t2) ## 80166FA8 /* 0064C 8096DAFC 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF -/* 00650 8096DB00 00815824 */ and $t3, $a0, $at +/* 00650 8096DB00 00815824 */ and $t3, $a0, $at /* 00654 8096DB04 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 00658 8096DB08 014B6021 */ addu $t4, $t2, $t3 -/* 0065C 8096DB0C 01816821 */ addu $t5, $t4, $at +/* 00658 8096DB08 014B6021 */ addu $t4, $t2, $t3 +/* 0065C 8096DB0C 01816821 */ addu $t5, $t4, $at /* 00660 8096DB10 AC4D0004 */ sw $t5, 0x0004($v0) ## 00000004 .L8096DB14: -/* 00664 8096DB14 8FA4007C */ lw $a0, 0x007C($sp) +/* 00664 8096DB14 8FA4007C */ lw $a0, 0x007C($sp) /* 00668 8096DB18 3C0FDB06 */ lui $t7, 0xDB06 ## $t7 = DB060000 /* 0066C 8096DB1C 35EF002C */ ori $t7, $t7, 0x002C ## $t7 = DB06002C -/* 00670 8096DB20 10800011 */ beq $a0, $zero, .L8096DB68 -/* 00674 8096DB24 0004C100 */ sll $t8, $a0, 4 +/* 00670 8096DB20 10800011 */ beq $a0, $zero, .L8096DB68 +/* 00674 8096DB24 0004C100 */ sll $t8, $a0, 4 /* 00678 8096DB28 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 -/* 0067C 8096DB2C 0018CF02 */ srl $t9, $t8, 28 -/* 00680 8096DB30 00194080 */ sll $t0, $t9, 2 +/* 0067C 8096DB2C 0018CF02 */ srl $t9, $t8, 28 +/* 00680 8096DB30 00194080 */ sll $t0, $t9, 2 /* 00684 8096DB34 244E0008 */ addiu $t6, $v0, 0x0008 ## $t6 = 00000008 /* 00688 8096DB38 AE0E02C0 */ sw $t6, 0x02C0($s0) ## 000002C0 /* 0068C 8096DB3C 3C098016 */ lui $t1, 0x8016 ## $t1 = 80160000 -/* 00690 8096DB40 01284821 */ addu $t1, $t1, $t0 +/* 00690 8096DB40 01284821 */ addu $t1, $t1, $t0 /* 00694 8096DB44 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 /* 00698 8096DB48 AC4F0000 */ sw $t7, 0x0000($v0) ## 00000000 /* 0069C 8096DB4C 8D296FA8 */ lw $t1, 0x6FA8($t1) ## 80166FA8 /* 006A0 8096DB50 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF -/* 006A4 8096DB54 00815024 */ and $t2, $a0, $at +/* 006A4 8096DB54 00815024 */ and $t2, $a0, $at /* 006A8 8096DB58 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 006AC 8096DB5C 012A5821 */ addu $t3, $t1, $t2 -/* 006B0 8096DB60 01616021 */ addu $t4, $t3, $at +/* 006AC 8096DB5C 012A5821 */ addu $t3, $t1, $t2 +/* 006B0 8096DB60 01616021 */ addu $t4, $t3, $at /* 006B4 8096DB64 AC4C0004 */ sw $t4, 0x0004($v0) ## 00000004 .L8096DB68: -/* 006B8 8096DB68 8FA50080 */ lw $a1, 0x0080($sp) +/* 006B8 8096DB68 8FA50080 */ lw $a1, 0x0080($sp) /* 006BC 8096DB6C 3C0EDB06 */ lui $t6, 0xDB06 ## $t6 = DB060000 -/* 006C0 8096DB70 50A0001E */ beql $a1, $zero, .L8096DBEC -/* 006C4 8096DB74 8FAE0084 */ lw $t6, 0x0084($sp) +/* 006C0 8096DB70 50A0001E */ beql $a1, $zero, .L8096DBEC +/* 006C4 8096DB74 8FAE0084 */ lw $t6, 0x0084($sp) /* 006C8 8096DB78 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 /* 006CC 8096DB7C 35CE0020 */ ori $t6, $t6, 0x0020 ## $t6 = DB060020 /* 006D0 8096DB80 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 006D4 8096DB84 244D0008 */ addiu $t5, $v0, 0x0008 ## $t5 = 00000008 /* 006D8 8096DB88 AE0D02C0 */ sw $t5, 0x02C0($s0) ## 000002C0 /* 006DC 8096DB8C AC4E0000 */ sw $t6, 0x0000($v0) ## 00000000 -/* 006E0 8096DB90 0C25B616 */ jal func_8096D858 -/* 006E4 8096DB94 AFA20044 */ sw $v0, 0x0044($sp) -/* 006E8 8096DB98 AFA20034 */ sw $v0, 0x0034($sp) +/* 006E0 8096DB90 0C25B616 */ jal func_8096D858 +/* 006E4 8096DB94 AFA20044 */ sw $v0, 0x0044($sp) +/* 006E8 8096DB98 AFA20034 */ sw $v0, 0x0034($sp) /* 006EC 8096DB9C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 006F0 8096DBA0 0C25B616 */ jal func_8096D858 -/* 006F4 8096DBA4 8FA50080 */ lw $a1, 0x0080($sp) -/* 006F8 8096DBA8 8FB80034 */ lw $t8, 0x0034($sp) +/* 006F0 8096DBA0 0C25B616 */ jal func_8096D858 +/* 006F4 8096DBA4 8FA50080 */ lw $a1, 0x0080($sp) +/* 006F8 8096DBA8 8FB80034 */ lw $t8, 0x0034($sp) /* 006FC 8096DBAC 3C0A8016 */ lui $t2, 0x8016 ## $t2 = 80160000 /* 00700 8096DBB0 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 -/* 00704 8096DBB4 0018C900 */ sll $t9, $t8, 4 -/* 00708 8096DBB8 00194702 */ srl $t0, $t9, 28 -/* 0070C 8096DBBC 00084880 */ sll $t1, $t0, 2 -/* 00710 8096DBC0 01495021 */ addu $t2, $t2, $t1 +/* 00704 8096DBB4 0018C900 */ sll $t9, $t8, 4 +/* 00708 8096DBB8 00194702 */ srl $t0, $t9, 28 +/* 0070C 8096DBBC 00084880 */ sll $t1, $t0, 2 +/* 00710 8096DBC0 01495021 */ addu $t2, $t2, $t1 /* 00714 8096DBC4 8D4A6FA8 */ lw $t2, 0x6FA8($t2) ## 80166FA8 /* 00718 8096DBC8 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF -/* 0071C 8096DBCC 00417824 */ and $t7, $v0, $at -/* 00720 8096DBD0 8FAD0044 */ lw $t5, 0x0044($sp) +/* 0071C 8096DBCC 00417824 */ and $t7, $v0, $at +/* 00720 8096DBD0 8FAD0044 */ lw $t5, 0x0044($sp) /* 00724 8096DBD4 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 00728 8096DBD8 01EA5821 */ addu $t3, $t7, $t2 -/* 0072C 8096DBDC 01616021 */ addu $t4, $t3, $at +/* 00728 8096DBD8 01EA5821 */ addu $t3, $t7, $t2 +/* 0072C 8096DBDC 01616021 */ addu $t4, $t3, $at /* 00730 8096DBE0 ADAC0004 */ sw $t4, 0x0004($t5) ## 00000004 -/* 00734 8096DBE4 8FA50080 */ lw $a1, 0x0080($sp) -/* 00738 8096DBE8 8FAE0084 */ lw $t6, 0x0084($sp) +/* 00734 8096DBE4 8FA50080 */ lw $a1, 0x0080($sp) +/* 00738 8096DBE8 8FAE0084 */ lw $t6, 0x0084($sp) .L8096DBEC: /* 0073C 8096DBEC 3C19DB06 */ lui $t9, 0xDB06 ## $t9 = DB060000 -/* 00740 8096DBF0 51C0001D */ beql $t6, $zero, .L8096DC68 +/* 00740 8096DBF0 51C0001D */ beql $t6, $zero, .L8096DC68 /* 00744 8096DBF4 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 /* 00748 8096DBF8 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 /* 0074C 8096DBFC 37390024 */ ori $t9, $t9, 0x0024 ## $t9 = DB060024 @@ -102,26 +102,26 @@ glabel func_8096DA80 /* 00754 8096DC04 24580008 */ addiu $t8, $v0, 0x0008 ## $t8 = 00000008 /* 00758 8096DC08 AE1802C0 */ sw $t8, 0x02C0($s0) ## 000002C0 /* 0075C 8096DC0C AC590000 */ sw $t9, 0x0000($v0) ## 00000000 -/* 00760 8096DC10 0C25B616 */ jal func_8096D858 -/* 00764 8096DC14 AFA20040 */ sw $v0, 0x0040($sp) -/* 00768 8096DC18 AFA20034 */ sw $v0, 0x0034($sp) +/* 00760 8096DC10 0C25B616 */ jal func_8096D858 +/* 00764 8096DC14 AFA20040 */ sw $v0, 0x0040($sp) +/* 00768 8096DC18 AFA20034 */ sw $v0, 0x0034($sp) /* 0076C 8096DC1C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00770 8096DC20 0C25B616 */ jal func_8096D858 -/* 00774 8096DC24 8FA50080 */ lw $a1, 0x0080($sp) -/* 00778 8096DC28 8FA90034 */ lw $t1, 0x0034($sp) +/* 00770 8096DC20 0C25B616 */ jal func_8096D858 +/* 00774 8096DC24 8FA50080 */ lw $a1, 0x0080($sp) +/* 00778 8096DC28 8FA90034 */ lw $t1, 0x0034($sp) /* 0077C 8096DC2C 3C0C8016 */ lui $t4, 0x8016 ## $t4 = 80160000 /* 00780 8096DC30 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 -/* 00784 8096DC34 00097900 */ sll $t7, $t1, 4 -/* 00788 8096DC38 000F5702 */ srl $t2, $t7, 28 -/* 0078C 8096DC3C 000A5880 */ sll $t3, $t2, 2 -/* 00790 8096DC40 018B6021 */ addu $t4, $t4, $t3 +/* 00784 8096DC34 00097900 */ sll $t7, $t1, 4 +/* 00788 8096DC38 000F5702 */ srl $t2, $t7, 28 +/* 0078C 8096DC3C 000A5880 */ sll $t3, $t2, 2 +/* 00790 8096DC40 018B6021 */ addu $t4, $t4, $t3 /* 00794 8096DC44 8D8C6FA8 */ lw $t4, 0x6FA8($t4) ## 80166FA8 /* 00798 8096DC48 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF -/* 0079C 8096DC4C 00414024 */ and $t0, $v0, $at -/* 007A0 8096DC50 8FB80040 */ lw $t8, 0x0040($sp) +/* 0079C 8096DC4C 00414024 */ and $t0, $v0, $at +/* 007A0 8096DC50 8FB80040 */ lw $t8, 0x0040($sp) /* 007A4 8096DC54 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 007A8 8096DC58 010C6821 */ addu $t5, $t0, $t4 -/* 007AC 8096DC5C 01A17021 */ addu $t6, $t5, $at +/* 007A8 8096DC58 010C6821 */ addu $t5, $t0, $t4 +/* 007AC 8096DC5C 01A17021 */ addu $t6, $t5, $at /* 007B0 8096DC60 AF0E0004 */ sw $t6, 0x0004($t8) ## 00000004 /* 007B4 8096DC64 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 .L8096DC68: @@ -140,31 +140,31 @@ glabel func_8096DA80 /* 007E8 8096DC98 356B0030 */ ori $t3, $t3, 0x0030 ## $t3 = DB060030 /* 007EC 8096DC9C AC4B0000 */ sw $t3, 0x0000($v0) ## 00000000 /* 007F0 8096DCA0 AC480004 */ sw $t0, 0x0004($v0) ## 00000004 -/* 007F4 8096DCA4 8FA30070 */ lw $v1, 0x0070($sp) -/* 007F8 8096DCA8 8FAD008C */ lw $t5, 0x008C($sp) -/* 007FC 8096DCAC 8FAC0088 */ lw $t4, 0x0088($sp) +/* 007F4 8096DCA4 8FA30070 */ lw $v1, 0x0070($sp) +/* 007F8 8096DCA8 8FAD008C */ lw $t5, 0x008C($sp) +/* 007FC 8096DCAC 8FAC0088 */ lw $t4, 0x0088($sp) /* 00800 8096DCB0 2462014C */ addiu $v0, $v1, 0x014C ## $v0 = 0000014C /* 00804 8096DCB4 8C450004 */ lw $a1, 0x0004($v0) ## 00000150 /* 00808 8096DCB8 8C460020 */ lw $a2, 0x0020($v0) ## 0000016C /* 0080C 8096DCBC 90470002 */ lbu $a3, 0x0002($v0) ## 0000014E -/* 00810 8096DCC0 AFA30018 */ sw $v1, 0x0018($sp) -/* 00814 8096DCC4 AFAD0014 */ sw $t5, 0x0014($sp) -/* 00818 8096DCC8 AFAC0010 */ sw $t4, 0x0010($sp) +/* 00810 8096DCC0 AFA30018 */ sw $v1, 0x0018($sp) +/* 00814 8096DCC4 AFAD0014 */ sw $t5, 0x0014($sp) +/* 00818 8096DCC8 AFAC0010 */ sw $t4, 0x0010($sp) /* 0081C 8096DCCC 8E0E02C0 */ lw $t6, 0x02C0($s0) ## 000002C0 -/* 00820 8096DCD0 8FA40074 */ lw $a0, 0x0074($sp) -/* 00824 8096DCD4 0C0289CF */ jal func_800A273C -/* 00828 8096DCD8 AFAE001C */ sw $t6, 0x001C($sp) +/* 00820 8096DCD0 8FA40074 */ lw $a0, 0x0074($sp) +/* 00824 8096DCD4 0C0289CF */ jal SkelAnime_DrawSV2 +/* 00828 8096DCD8 AFAE001C */ sw $t6, 0x001C($sp) /* 0082C 8096DCDC 3C068097 */ lui $a2, %hi(D_8097069C) ## $a2 = 80970000 /* 00830 8096DCE0 AE0202C0 */ sw $v0, 0x02C0($s0) ## 000002C0 /* 00834 8096DCE4 24C6069C */ addiu $a2, $a2, %lo(D_8097069C) ## $a2 = 8097069C /* 00838 8096DCE8 27A40050 */ addiu $a0, $sp, 0x0050 ## $a0 = FFFFFFE0 /* 0083C 8096DCEC 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 00840 8096DCF0 0C031AD5 */ jal func_800C6B54 +/* 00840 8096DCF0 0C031AD5 */ jal Graph_CloseDisps /* 00844 8096DCF4 24070286 */ addiu $a3, $zero, 0x0286 ## $a3 = 00000286 -/* 00848 8096DCF8 8FBF002C */ lw $ra, 0x002C($sp) -/* 0084C 8096DCFC 8FB00028 */ lw $s0, 0x0028($sp) +/* 00848 8096DCF8 8FBF002C */ lw $ra, 0x002C($sp) +/* 0084C 8096DCFC 8FB00028 */ lw $s0, 0x0028($sp) /* 00850 8096DD00 27BD0070 */ addiu $sp, $sp, 0x0070 ## $sp = 00000000 -/* 00854 8096DD04 03E00008 */ jr $ra +/* 00854 8096DD04 03E00008 */ jr $ra /* 00858 8096DD08 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096DD0C.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096DD0C.s index 6e77a7a8eb..9f42d7909a 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096DD0C.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Ec/func_8096DD0C.s @@ -10,7 +10,7 @@ glabel func_8096DD0C /* 0087C 8096DD2C 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 /* 00880 8096DD30 27A40024 */ addiu $a0, $sp, 0x0024 ## $a0 = FFFFFFDC /* 00884 8096DD34 24070296 */ addiu $a3, $zero, 0x0296 ## $a3 = 00000296 -/* 00888 8096DD38 0C031AB1 */ jal func_800C6AC4 +/* 00888 8096DD38 0C031AB1 */ jal Graph_OpenDisps /* 0088C 8096DD3C AFA50038 */ sw $a1, 0x0038($sp) /* 00890 8096DD40 8FA50038 */ lw $a1, 0x0038($sp) /* 00894 8096DD44 8FA6004C */ lw $a2, 0x004C($sp) @@ -37,7 +37,7 @@ glabel func_8096DD0C /* 008E8 8096DD98 24C606BC */ addiu $a2, $a2, %lo(D_809706BC) ## $a2 = 809706BC /* 008EC 8096DD9C 01816821 */ addu $t5, $t4, $at /* 008F0 8096DDA0 3C018016 */ lui $at, 0x8016 ## $at = 80160000 -/* 008F4 8096DDA4 0C031AD5 */ jal func_800C6B54 +/* 008F4 8096DDA4 0C031AD5 */ jal Graph_CloseDisps /* 008F8 8096DDA8 AC2D6FC0 */ sw $t5, 0x6FC0($at) ## 80166FC0 /* 008FC 8096DDAC 8FBF0014 */ lw $ra, 0x0014($sp) /* 00900 8096DDB0 27BD0048 */ addiu $sp, $sp, 0x0048 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_809746F8.s b/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_809746F8.s index 71313cb144..847aa093f4 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_809746F8.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_809746F8.s @@ -12,7 +12,7 @@ glabel func_809746F8 /* 037D0 80974720 27A40078 */ addiu $a0, $sp, 0x0078 ## $a0 = FFFFFFE0 /* 037D4 80974724 240709EF */ addiu $a3, $zero, 0x09EF ## $a3 = 000009EF /* 037D8 80974728 AFA8008C */ sw $t0, 0x008C($sp) -/* 037DC 8097472C 0C031AB1 */ jal func_800C6AC4 +/* 037DC 8097472C 0C031AB1 */ jal Graph_OpenDisps /* 037E0 80974730 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 /* 037E4 80974734 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 037E8 80974738 8FA5009C */ lw $a1, 0x009C($sp) @@ -66,7 +66,7 @@ glabel func_809746F8 /* 038A4 809747F4 AFA8008C */ sw $t0, 0x008C($sp) /* 038A8 809747F8 AFB90020 */ sw $t9, 0x0020($sp) /* 038AC 809747FC 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 038B0 80974800 0C0253D0 */ jal Draw_TwoTexScroll +/* 038B0 80974800 0C0253D0 */ jal Gfx_TwoTexScroll /* 038B4 80974804 AFA20074 */ sw $v0, 0x0074($sp) /* 038B8 80974808 8FA90074 */ lw $t1, 0x0074($sp) /* 038BC 8097480C 8FA8008C */ lw $t0, 0x008C($sp) @@ -102,7 +102,7 @@ glabel func_809746F8 /* 03930 80974880 AFAF0028 */ sw $t7, 0x0028($sp) /* 03934 80974884 AFA8008C */ sw $t0, 0x008C($sp) /* 03938 80974888 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 0393C 8097488C 0C0253D0 */ jal Draw_TwoTexScroll +/* 0393C 8097488C 0C0253D0 */ jal Gfx_TwoTexScroll /* 03940 80974890 AFA20070 */ sw $v0, 0x0070($sp) /* 03944 80974894 8FA90070 */ lw $t1, 0x0070($sp) /* 03948 80974898 8FA8008C */ lw $t0, 0x008C($sp) @@ -138,7 +138,7 @@ glabel func_809746F8 /* 039BC 8097490C AFAB0028 */ sw $t3, 0x0028($sp) /* 039C0 80974910 AFA8008C */ sw $t0, 0x008C($sp) /* 039C4 80974914 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 039C8 80974918 0C0253D0 */ jal Draw_TwoTexScroll +/* 039C8 80974918 0C0253D0 */ jal Gfx_TwoTexScroll /* 039CC 8097491C AFA2006C */ sw $v0, 0x006C($sp) /* 039D0 80974920 8FA9006C */ lw $t1, 0x006C($sp) /* 039D4 80974924 8FA8008C */ lw $t0, 0x008C($sp) @@ -158,7 +158,7 @@ glabel func_809746F8 /* 03A04 80974954 AFAF0010 */ sw $t7, 0x0010($sp) /* 03A08 80974958 00A03025 */ or $a2, $a1, $zero ## $a2 = 00000000 /* 03A0C 8097495C 24070010 */ addiu $a3, $zero, 0x0010 ## $a3 = 00000010 -/* 03A10 80974960 0C0253A7 */ jal Draw_TexScroll +/* 03A10 80974960 0C0253A7 */ jal Gfx_TexScroll /* 03A14 80974964 AFA20068 */ sw $v0, 0x0068($sp) /* 03A18 80974968 8FA30068 */ lw $v1, 0x0068($sp) /* 03A1C 8097496C 3C19DA38 */ lui $t9, 0xDA38 ## $t9 = DA380000 @@ -289,7 +289,7 @@ glabel func_809746F8 /* 03C08 80974B58 24C66988 */ addiu $a2, $a2, %lo(D_80976988) ## $a2 = 80976988 /* 03C0C 80974B5C 27A40078 */ addiu $a0, $sp, 0x0078 ## $a0 = FFFFFFE0 /* 03C10 80974B60 24070A3C */ addiu $a3, $zero, 0x0A3C ## $a3 = 00000A3C -/* 03C14 80974B64 0C031AD5 */ jal func_800C6B54 +/* 03C14 80974B64 0C031AD5 */ jal Graph_CloseDisps /* 03C18 80974B68 8DC50000 */ lw $a1, 0x0000($t6) ## 00000008 /* 03C1C 80974B6C 8FBF003C */ lw $ra, 0x003C($sp) /* 03C20 80974B70 8FB00034 */ lw $s0, 0x0034($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80974B80.s b/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80974B80.s index de82a87dc6..5e4785e465 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80974B80.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80974B80.s @@ -16,7 +16,7 @@ glabel func_80974B80 /* 03C68 80974BB8 27A40070 */ addiu $a0, $sp, 0x0070 ## $a0 = FFFFFFE0 /* 03C6C 80974BBC 24070A4A */ addiu $a3, $zero, 0x0A4A ## $a3 = 00000A4A /* 03C70 80974BC0 AFA80088 */ sw $t0, 0x0088($sp) -/* 03C74 80974BC4 0C031AB1 */ jal func_800C6AC4 +/* 03C74 80974BC4 0C031AB1 */ jal Graph_OpenDisps /* 03C78 80974BC8 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 /* 03C7C 80974BCC 8FA80088 */ lw $t0, 0x0088($sp) /* 03C80 80974BD0 5100000D */ beql $t0, $zero, .L80974C08 @@ -73,7 +73,7 @@ glabel func_80974B80 /* 03D44 80974C94 AFAA001C */ sw $t2, 0x001C($sp) /* 03D48 80974C98 AFA00020 */ sw $zero, 0x0020($sp) /* 03D4C 80974C9C 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 03D50 80974CA0 0C0253D0 */ jal Draw_TwoTexScroll +/* 03D50 80974CA0 0C0253D0 */ jal Gfx_TwoTexScroll /* 03D54 80974CA4 AFA20064 */ sw $v0, 0x0064($sp) /* 03D58 80974CA8 8FA30064 */ lw $v1, 0x0064($sp) /* 03D5C 80974CAC 0C034213 */ jal Matrix_Push @@ -199,7 +199,7 @@ glabel func_80974B80 /* 03F3C 80974E8C 24C669EC */ addiu $a2, $a2, %lo(D_809769EC) ## $a2 = 809769EC /* 03F40 80974E90 27A40070 */ addiu $a0, $sp, 0x0070 ## $a0 = FFFFFFE0 /* 03F44 80974E94 24070A80 */ addiu $a3, $zero, 0x0A80 ## $a3 = 00000A80 -/* 03F48 80974E98 0C031AD5 */ jal func_800C6B54 +/* 03F48 80974E98 0C031AD5 */ jal Graph_CloseDisps /* 03F4C 80974E9C 8DC50000 */ lw $a1, 0x0000($t6) ## 00000000 /* 03F50 80974EA0 8FBF003C */ lw $ra, 0x003C($sp) /* 03F54 80974EA4 8FB00038 */ lw $s0, 0x0038($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80974EB4.s b/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80974EB4.s index f15db64382..3d8dfbcc8c 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80974EB4.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80974EB4.s @@ -15,7 +15,7 @@ glabel func_80974EB4 /* 03F98 80974EE8 24C66A00 */ addiu $a2, $a2, %lo(D_80976A00) ## $a2 = 80976A00 /* 03F9C 80974EEC 27A40064 */ addiu $a0, $sp, 0x0064 ## $a0 = FFFFFFE4 /* 03FA0 80974EF0 24070A8D */ addiu $a3, $zero, 0x0A8D ## $a3 = 00000A8D -/* 03FA4 80974EF4 0C031AB1 */ jal func_800C6AC4 +/* 03FA4 80974EF4 0C031AB1 */ jal Graph_OpenDisps /* 03FA8 80974EF8 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 /* 03FAC 80974EFC 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 /* 03FB0 80974F00 3C18FA00 */ lui $t8, 0xFA00 ## $t8 = FA000000 @@ -88,7 +88,7 @@ glabel func_80974EB4 /* 040BC 8097500C AFAA0014 */ sw $t2, 0x0014($sp) /* 040C0 80975010 AFA90010 */ sw $t1, 0x0010($sp) /* 040C4 80975014 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 040C8 80975018 0C0253D0 */ jal Draw_TwoTexScroll +/* 040C8 80975018 0C0253D0 */ jal Gfx_TwoTexScroll /* 040CC 8097501C AFA20050 */ sw $v0, 0x0050($sp) /* 040D0 80975020 8FA30050 */ lw $v1, 0x0050($sp) /* 040D4 80975024 3C0B0600 */ lui $t3, 0x0600 ## $t3 = 06000000 @@ -104,7 +104,7 @@ glabel func_80974EB4 /* 040FC 8097504C 8E250000 */ lw $a1, 0x0000($s1) ## 00000000 /* 04100 80975050 24C66A28 */ addiu $a2, $a2, %lo(D_80976A28) ## $a2 = 80976A28 /* 04104 80975054 27A40064 */ addiu $a0, $sp, 0x0064 ## $a0 = FFFFFFE4 -/* 04108 80975058 0C031AD5 */ jal func_800C6B54 +/* 04108 80975058 0C031AD5 */ jal Graph_CloseDisps /* 0410C 8097505C 24070AA3 */ addiu $a3, $zero, 0x0AA3 ## $a3 = 00000AA3 /* 04110 80975060 8FBF003C */ lw $ra, 0x003C($sp) /* 04114 80975064 8FB00034 */ lw $s0, 0x0034($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80975074.s b/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80975074.s index 51eadc3c1f..9ce6c7106a 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80975074.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80975074.s @@ -14,7 +14,7 @@ glabel func_80975074 /* 04154 809750A4 24C66A3C */ addiu $a2, $a2, %lo(D_80976A3C) ## $a2 = 80976A3C /* 04158 809750A8 27A40068 */ addiu $a0, $sp, 0x0068 ## $a0 = FFFFFFE0 /* 0415C 809750AC 24070AB1 */ addiu $a3, $zero, 0x0AB1 ## $a3 = 00000AB1 -/* 04160 809750B0 0C031AB1 */ jal func_800C6AC4 +/* 04160 809750B0 0C031AB1 */ jal Graph_OpenDisps /* 04164 809750B4 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 /* 04168 809750B8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 0416C 809750BC 8FA5008C */ lw $a1, 0x008C($sp) @@ -86,7 +86,7 @@ glabel func_80975074 /* 04268 809751B8 AFA9001C */ sw $t1, 0x001C($sp) /* 0426C 809751BC 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 04270 809751C0 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 04274 809751C4 0C0253D0 */ jal Draw_TwoTexScroll +/* 04274 809751C4 0C0253D0 */ jal Gfx_TwoTexScroll /* 04278 809751C8 AFA20064 */ sw $v0, 0x0064($sp) /* 0427C 809751CC 8FA30064 */ lw $v1, 0x0064($sp) /* 04280 809751D0 3C19DB06 */ lui $t9, 0xDB06 ## $t9 = DB060000 @@ -124,7 +124,7 @@ glabel func_80975074 /* 04300 80975250 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 04304 80975254 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 /* 04308 80975258 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 0430C 8097525C 0C0253D0 */ jal Draw_TwoTexScroll +/* 0430C 8097525C 0C0253D0 */ jal Gfx_TwoTexScroll /* 04310 80975260 AFA20060 */ sw $v0, 0x0060($sp) /* 04314 80975264 8FA30060 */ lw $v1, 0x0060($sp) /* 04318 80975268 3C0EFA00 */ lui $t6, 0xFA00 ## $t6 = FA000000 @@ -261,7 +261,7 @@ glabel func_80975074 /* 0451C 8097546C 24C66A78 */ addiu $a2, $a2, %lo(D_80976A78) ## $a2 = 80976A78 /* 04520 80975470 27A40068 */ addiu $a0, $sp, 0x0068 ## $a0 = FFFFFFE0 /* 04524 80975474 24070B0D */ addiu $a3, $zero, 0x0B0D ## $a3 = 00000B0D -/* 04528 80975478 0C031AD5 */ jal func_800C6B54 +/* 04528 80975478 0C031AD5 */ jal Graph_CloseDisps /* 0452C 8097547C 8DE50000 */ lw $a1, 0x0000($t7) ## 00000000 /* 04530 80975480 8FBF003C */ lw $ra, 0x003C($sp) /* 04534 80975484 8FB00034 */ lw $s0, 0x0034($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80975494.s b/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80975494.s index eb3c83c767..d8b3ac6d59 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80975494.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80975494.s @@ -10,7 +10,7 @@ glabel func_80975494 /* 04564 809754B4 24C66A8C */ addiu $a2, $a2, %lo(D_80976A8C) ## $a2 = 80976A8C /* 04568 809754B8 27A40048 */ addiu $a0, $sp, 0x0048 ## $a0 = FFFFFFE0 /* 0456C 809754BC 24070B1A */ addiu $a3, $zero, 0x0B1A ## $a3 = 00000B1A -/* 04570 809754C0 0C031AB1 */ jal func_800C6AC4 +/* 04570 809754C0 0C031AB1 */ jal Graph_OpenDisps /* 04574 809754C4 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 /* 04578 809754C8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 0457C 809754CC 8FA5006C */ lw $a1, 0x006C($sp) @@ -157,7 +157,7 @@ glabel func_80975494 /* 047A4 809756F4 24C66AC8 */ addiu $a2, $a2, %lo(D_80976AC8) ## $a2 = 80976AC8 /* 047A8 809756F8 27A40048 */ addiu $a0, $sp, 0x0048 ## $a0 = FFFFFFE0 /* 047AC 809756FC 24070B41 */ addiu $a3, $zero, 0x0B41 ## $a3 = 00000B41 -/* 047B0 80975700 0C031AD5 */ jal func_800C6B54 +/* 047B0 80975700 0C031AD5 */ jal Graph_CloseDisps /* 047B4 80975704 8DC50000 */ lw $a1, 0x0000($t6) ## 00000000 /* 047B8 80975708 8FBF001C */ lw $ra, 0x001C($sp) /* 047BC 8097570C 8FB00014 */ lw $s0, 0x0014($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_8097571C.s b/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_8097571C.s index 4d349786a3..da7266e56a 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_8097571C.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_8097571C.s @@ -10,7 +10,7 @@ glabel func_8097571C /* 047EC 8097573C 24C66ADC */ addiu $a2, $a2, %lo(D_80976ADC) ## $a2 = 80976ADC /* 047F0 80975740 27A40034 */ addiu $a0, $sp, 0x0034 ## $a0 = FFFFFFE4 /* 047F4 80975744 24070B4C */ addiu $a3, $zero, 0x0B4C ## $a3 = 00000B4C -/* 047F8 80975748 0C031AB1 */ jal func_800C6AC4 +/* 047F8 80975748 0C031AB1 */ jal Graph_OpenDisps /* 047FC 8097574C 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 /* 04800 80975750 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 /* 04804 80975754 3C0FFA00 */ lui $t7, 0xFA00 ## $t7 = FA000000 @@ -80,7 +80,7 @@ glabel func_8097571C /* 04904 80975854 AE0A02D0 */ sw $t2, 0x02D0($s0) ## 000002D0 /* 04908 80975858 AC4C0004 */ sw $t4, 0x0004($v0) ## 00000004 /* 0490C 8097585C AC4B0000 */ sw $t3, 0x0000($v0) ## 00000000 -/* 04910 80975860 0C031AD5 */ jal func_800C6B54 +/* 04910 80975860 0C031AD5 */ jal Graph_CloseDisps /* 04914 80975864 8E250000 */ lw $a1, 0x0000($s1) ## 00000000 /* 04918 80975868 8FBF001C */ lw $ra, 0x001C($sp) /* 0491C 8097586C 8FB00014 */ lw $s0, 0x0014($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_8097587C.s b/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_8097587C.s index 4695e7b4ec..1349a80613 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_8097587C.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_8097587C.s @@ -14,7 +14,7 @@ glabel func_8097587C /* 0495C 809758AC 24C66B18 */ addiu $a2, $a2, %lo(D_80976B18) ## $a2 = 80976B18 /* 04960 809758B0 27A40058 */ addiu $a0, $sp, 0x0058 ## $a0 = FFFFFFE0 /* 04964 809758B4 24070B69 */ addiu $a3, $zero, 0x0B69 ## $a3 = 00000B69 -/* 04968 809758B8 0C031AB1 */ jal func_800C6AC4 +/* 04968 809758B8 0C031AB1 */ jal Graph_OpenDisps /* 0496C 809758BC 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 /* 04970 809758C0 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 /* 04974 809758C4 3C18FA00 */ lui $t8, 0xFA00 ## $t8 = FA000000 @@ -88,7 +88,7 @@ glabel func_8097587C /* 04A84 809759D4 AFA90020 */ sw $t1, 0x0020($sp) /* 04A88 809759D8 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 04A8C 809759DC 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 04A90 809759E0 0C0253D0 */ jal Draw_TwoTexScroll +/* 04A90 809759E0 0C0253D0 */ jal Gfx_TwoTexScroll /* 04A94 809759E4 AFA20048 */ sw $v0, 0x0048($sp) /* 04A98 809759E8 8FA30048 */ lw $v1, 0x0048($sp) /* 04A9C 809759EC 3C0E0600 */ lui $t6, 0x0600 ## $t6 = 06000000 @@ -104,7 +104,7 @@ glabel func_8097587C /* 04AC4 80975A14 8E250000 */ lw $a1, 0x0000($s1) ## 00000000 /* 04AC8 80975A18 24C66B40 */ addiu $a2, $a2, %lo(D_80976B40) ## $a2 = 80976B40 /* 04ACC 80975A1C 27A40058 */ addiu $a0, $sp, 0x0058 ## $a0 = FFFFFFE0 -/* 04AD0 80975A20 0C031AD5 */ jal func_800C6B54 +/* 04AD0 80975A20 0C031AD5 */ jal Graph_CloseDisps /* 04AD4 80975A24 24070B7E */ addiu $a3, $zero, 0x0B7E ## $a3 = 00000B7E /* 04AD8 80975A28 8FBF003C */ lw $ra, 0x003C($sp) /* 04ADC 80975A2C 8FB00034 */ lw $s0, 0x0034($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80975A3C.s b/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80975A3C.s index 08af15e558..cb09765753 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80975A3C.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80975A3C.s @@ -12,7 +12,7 @@ glabel func_80975A3C /* 04B14 80975A64 24C66B54 */ addiu $a2, $a2, %lo(D_80976B54) ## $a2 = 80976B54 /* 04B18 80975A68 27A40058 */ addiu $a0, $sp, 0x0058 ## $a0 = FFFFFFE0 /* 04B1C 80975A6C 24070B8C */ addiu $a3, $zero, 0x0B8C ## $a3 = 00000B8C -/* 04B20 80975A70 0C031AB1 */ jal func_800C6AC4 +/* 04B20 80975A70 0C031AB1 */ jal Graph_OpenDisps /* 04B24 80975A74 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 /* 04B28 80975A78 0C024F61 */ jal func_80093D84 /* 04B2C 80975A7C 8E240000 */ lw $a0, 0x0000($s1) ## 00000000 @@ -78,7 +78,7 @@ glabel func_80975A3C /* 04C1C 80975B6C AFA00020 */ sw $zero, 0x0020($sp) /* 04C20 80975B70 AFA0001C */ sw $zero, 0x001C($sp) /* 04C24 80975B74 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 04C28 80975B78 0C0253D0 */ jal Draw_TwoTexScroll +/* 04C28 80975B78 0C0253D0 */ jal Gfx_TwoTexScroll /* 04C2C 80975B7C AFA20048 */ sw $v0, 0x0048($sp) /* 04C30 80975B80 8FA30048 */ lw $v1, 0x0048($sp) /* 04C34 80975B84 3C0D0600 */ lui $t5, 0x0600 ## $t5 = 06000000 @@ -94,7 +94,7 @@ glabel func_80975A3C /* 04C5C 80975BAC 8E250000 */ lw $a1, 0x0000($s1) ## 00000000 /* 04C60 80975BB0 24C66B7C */ addiu $a2, $a2, %lo(D_80976B7C) ## $a2 = 80976B7C /* 04C64 80975BB4 27A40058 */ addiu $a0, $sp, 0x0058 ## $a0 = FFFFFFE0 -/* 04C68 80975BB8 0C031AD5 */ jal func_800C6B54 +/* 04C68 80975BB8 0C031AD5 */ jal Graph_CloseDisps /* 04C6C 80975BBC 24070BA2 */ addiu $a3, $zero, 0x0BA2 ## $a3 = 00000BA2 /* 04C70 80975BC0 8FBF003C */ lw $ra, 0x003C($sp) /* 04C74 80975BC4 8FB00034 */ lw $s0, 0x0034($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80975BD4.s b/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80975BD4.s index bd883847fd..53efac88d4 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80975BD4.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80975BD4.s @@ -28,7 +28,7 @@ glabel func_80975BD4 /* 04CEC 80975C3C AFA300AC */ sw $v1, 0x00AC($sp) /* 04CF0 80975C40 27A40094 */ addiu $a0, $sp, 0x0094 ## $a0 = FFFFFFDC /* 04CF4 80975C44 24070BB2 */ addiu $a3, $zero, 0x0BB2 ## $a3 = 00000BB2 -/* 04CF8 80975C48 0C031AB1 */ jal func_800C6AC4 +/* 04CF8 80975C48 0C031AB1 */ jal Graph_OpenDisps /* 04CFC 80975C4C 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 /* 04D00 80975C50 3C0E8016 */ lui $t6, 0x8016 ## $t6 = 80160000 /* 04D04 80975C54 8DCEE660 */ lw $t6, -0x19A0($t6) ## 8015E660 @@ -112,7 +112,7 @@ glabel func_80975BD4 /* 04E34 80975D84 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 04E38 80975D88 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 /* 04E3C 80975D8C AFA300AC */ sw $v1, 0x00AC($sp) -/* 04E40 80975D90 0C0253D0 */ jal Draw_TwoTexScroll +/* 04E40 80975D90 0C0253D0 */ jal Gfx_TwoTexScroll /* 04E44 80975D94 AFA2008C */ sw $v0, 0x008C($sp) /* 04E48 80975D98 8FA8008C */ lw $t0, 0x008C($sp) /* 04E4C 80975D9C 8FA300AC */ lw $v1, 0x00AC($sp) @@ -248,7 +248,7 @@ glabel func_80975BD4 /* 0504C 80975F9C 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 05050 80975FA0 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 /* 05054 80975FA4 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 05058 80975FA8 0C0253D0 */ jal Draw_TwoTexScroll +/* 05058 80975FA8 0C0253D0 */ jal Gfx_TwoTexScroll /* 0505C 80975FAC AFA20070 */ sw $v0, 0x0070($sp) /* 05060 80975FB0 8FA30070 */ lw $v1, 0x0070($sp) /* 05064 80975FB4 3C0CFA00 */ lui $t4, 0xFA00 ## $t4 = FA000000 @@ -344,7 +344,7 @@ glabel func_80975BD4 /* 051C8 80976118 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 051CC 8097611C 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 /* 051D0 80976120 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 051D4 80976124 0C0253D0 */ jal Draw_TwoTexScroll +/* 051D4 80976124 0C0253D0 */ jal Gfx_TwoTexScroll /* 051D8 80976128 AFA20058 */ sw $v0, 0x0058($sp) /* 051DC 8097612C 8FA30058 */ lw $v1, 0x0058($sp) /* 051E0 80976130 3C0EFA00 */ lui $t6, 0xFA00 ## $t6 = FA000000 @@ -379,7 +379,7 @@ glabel func_80975BD4 /* 0524C 8097619C 24C66BF4 */ addiu $a2, $a2, %lo(D_80976BF4) ## $a2 = 80976BF4 /* 05250 809761A0 27A40094 */ addiu $a0, $sp, 0x0094 ## $a0 = FFFFFFDC /* 05254 809761A4 24070C28 */ addiu $a3, $zero, 0x0C28 ## $a3 = 00000C28 -/* 05258 809761A8 0C031AD5 */ jal func_800C6B54 +/* 05258 809761A8 0C031AD5 */ jal Graph_CloseDisps /* 0525C 809761AC 8DE50000 */ lw $a1, 0x0000($t7) ## FFFFA0FF /* 05260 809761B0 8FBF003C */ lw $ra, 0x003C($sp) /* 05264 809761B4 8FB00038 */ lw $s0, 0x0038($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80976254.s b/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80976254.s index 04bc444353..970f07606f 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80976254.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80976254.s @@ -15,7 +15,7 @@ glabel func_80976254 /* 05338 80976288 27A40058 */ addiu $a0, $sp, 0x0058 ## $a0 = FFFFFFE0 /* 0533C 8097628C 24070C52 */ addiu $a3, $zero, 0x0C52 ## $a3 = 00000C52 /* 05340 80976290 AFA9006C */ sw $t1, 0x006C($sp) -/* 05344 80976294 0C031AB1 */ jal func_800C6AC4 +/* 05344 80976294 0C031AB1 */ jal Graph_OpenDisps /* 05348 80976298 AFA50068 */ sw $a1, 0x0068($sp) /* 0534C 8097629C 0C024F61 */ jal func_80093D84 /* 05350 809762A0 8E040000 */ lw $a0, 0x0000($s0) ## 00000000 @@ -82,7 +82,7 @@ glabel func_80976254 /* 05444 80976394 30C603FF */ andi $a2, $a2, 0x03FF ## $a2 = 00000000 /* 05448 80976398 AFB8001C */ sw $t8, 0x001C($sp) /* 0544C 8097639C 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 05450 809763A0 0C0253D0 */ jal Draw_TwoTexScroll +/* 05450 809763A0 0C0253D0 */ jal Gfx_TwoTexScroll /* 05454 809763A4 AFA2004C */ sw $v0, 0x004C($sp) /* 05458 809763A8 8FA3004C */ lw $v1, 0x004C($sp) /* 0545C 809763AC 3C068097 */ lui $a2, %hi(D_80976C1C) ## $a2 = 80970000 @@ -90,7 +90,7 @@ glabel func_80976254 /* 05464 809763B4 AC620004 */ sw $v0, 0x0004($v1) ## 00000004 /* 05468 809763B8 8E050000 */ lw $a1, 0x0000($s0) ## 00000000 /* 0546C 809763BC 27A40058 */ addiu $a0, $sp, 0x0058 ## $a0 = FFFFFFE0 -/* 05470 809763C0 0C031AD5 */ jal func_800C6B54 +/* 05470 809763C0 0C031AD5 */ jal Graph_CloseDisps /* 05474 809763C4 24070C64 */ addiu $a3, $zero, 0x0C64 ## $a3 = 00000C64 /* 05478 809763C8 8FAD0080 */ lw $t5, 0x0080($sp) /* 0547C 809763CC 8FB8007C */ lw $t8, 0x007C($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80976404.s b/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80976404.s index 1906ae9fb4..9a1e23f225 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80976404.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_80976404.s @@ -29,10 +29,10 @@ glabel func_80976404 /* 0551C 8097646C 24C66C30 */ addiu $a2, $a2, %lo(D_80976C30) ## $a2 = 80976C30 /* 05520 80976470 27A40038 */ addiu $a0, $sp, 0x0038 ## $a0 = FFFFFFE0 /* 05524 80976474 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 05528 80976478 0C031AB1 */ jal func_800C6AC4 +/* 05528 80976478 0C031AB1 */ jal Graph_OpenDisps /* 0552C 8097647C 24070C81 */ addiu $a3, $zero, 0x0C81 ## $a3 = 00000C81 /* 05530 80976480 8E0402D0 */ lw $a0, 0x02D0($s0) ## 000002D0 -/* 05534 80976484 0C024DDD */ jal func_80093774 +/* 05534 80976484 0C024DDD */ jal Gfx_CallSetupDL /* 05538 80976488 24050019 */ addiu $a1, $zero, 0x0019 ## $a1 = 00000019 /* 0553C 8097648C 3C014000 */ lui $at, 0x4000 ## $at = 40000000 /* 05540 80976490 44816000 */ mtc1 $at, $f12 ## $f12 = 2.00 @@ -55,7 +55,7 @@ glabel func_80976404 /* 05584 809764D4 24C66C44 */ addiu $a2, $a2, %lo(D_80976C44) ## $a2 = 80976C44 /* 05588 809764D8 27A40038 */ addiu $a0, $sp, 0x0038 ## $a0 = FFFFFFE0 /* 0558C 809764DC 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 05590 809764E0 0C031AD5 */ jal func_800C6B54 +/* 05590 809764E0 0C031AD5 */ jal Graph_CloseDisps /* 05594 809764E4 24070C90 */ addiu $a3, $zero, 0x0C90 ## $a3 = 00000C90 .L809764E8: /* 05598 809764E8 8FBF002C */ lw $ra, 0x002C($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_809764FC.s b/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_809764FC.s index 63ea3ce6a8..0bad8a0dba 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_809764FC.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Effect/func_809764FC.s @@ -15,7 +15,7 @@ glabel func_809764FC /* 055E0 80976530 460E7482 */ mul.s $f18, $f14, $f14 /* 055E4 80976534 46128000 */ add.s $f0, $f16, $f18 /* 055E8 80976538 46000004 */ sqrt.s $f0, $f0 -/* 055EC 8097653C 0C03F494 */ jal func_800FD250 +/* 055EC 8097653C 0C03F494 */ jal Math_atan2f /* 055F0 80976540 E7A00018 */ swc1 $f0, 0x0018($sp) /* 055F4 80976544 3C018097 */ lui $at, %hi(D_80976D80) ## $at = 80970000 /* 055F8 80976548 C4246D80 */ lwc1 $f4, %lo(D_80976D80)($at) @@ -29,7 +29,7 @@ glabel func_809764FC /* 05618 80976568 C7AA003C */ lwc1 $f10, 0x003C($sp) /* 0561C 8097656C C7AE0018 */ lwc1 $f14, 0x0018($sp) /* 05620 80976570 46105301 */ sub.s $f12, $f10, $f16 -/* 05624 80976574 0C03F494 */ jal func_800FD250 +/* 05624 80976574 0C03F494 */ jal Math_atan2f /* 05628 80976578 46006307 */ neg.s $f12, $f12 /* 0562C 8097657C 3C018097 */ lui $at, %hi(D_80976D84) ## $at = 80970000 /* 05630 80976580 C4326D84 */ lwc1 $f18, %lo(D_80976D84)($at) diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ext/func_80977950.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ext/func_80977950.s index 1f41e54503..154a5bfb26 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ext/func_80977950.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Ext/func_80977950.s @@ -1,40 +1,40 @@ glabel func_80977950 /* 005C0 80977950 27BDFF78 */ addiu $sp, $sp, 0xFF78 ## $sp = FFFFFF78 -/* 005C4 80977954 AFBF003C */ sw $ra, 0x003C($sp) -/* 005C8 80977958 AFB00038 */ sw $s0, 0x0038($sp) -/* 005CC 8097795C AFA40088 */ sw $a0, 0x0088($sp) +/* 005C4 80977954 AFBF003C */ sw $ra, 0x003C($sp) +/* 005C8 80977958 AFB00038 */ sw $s0, 0x0038($sp) +/* 005CC 8097795C AFA40088 */ sw $a0, 0x0088($sp) /* 005D0 80977960 8CB00000 */ lw $s0, 0x0000($a1) ## 00000000 /* 005D4 80977964 24050040 */ addiu $a1, $zero, 0x0040 ## $a1 = 00000040 /* 005D8 80977968 0C031A73 */ jal Graph_Alloc - + /* 005DC 8097796C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 005E0 80977970 3C068097 */ lui $a2, %hi(D_80977D20) ## $a2 = 80970000 -/* 005E4 80977974 AFA20080 */ sw $v0, 0x0080($sp) +/* 005E4 80977974 AFA20080 */ sw $v0, 0x0080($sp) /* 005E8 80977978 24C67D20 */ addiu $a2, $a2, %lo(D_80977D20) ## $a2 = 80977D20 /* 005EC 8097797C 27A40060 */ addiu $a0, $sp, 0x0060 ## $a0 = FFFFFFD8 /* 005F0 80977980 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 005F4 80977984 0C031AB1 */ jal func_800C6AC4 +/* 005F4 80977984 0C031AB1 */ jal Graph_OpenDisps /* 005F8 80977988 240701CC */ addiu $a3, $zero, 0x01CC ## $a3 = 000001CC -/* 005FC 8097798C 0C034213 */ jal Matrix_Push +/* 005FC 8097798C 0C034213 */ jal Matrix_Push /* 00600 80977990 00000000 */ nop -/* 00604 80977994 8FA20088 */ lw $v0, 0x0088($sp) +/* 00604 80977994 8FA20088 */ lw $v0, 0x0088($sp) /* 00608 80977998 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 /* 0060C 8097799C 24420178 */ addiu $v0, $v0, 0x0178 ## $v0 = 00000178 /* 00610 809779A0 8C460008 */ lw $a2, 0x0008($v0) ## 00000180 /* 00614 809779A4 C44E0004 */ lwc1 $f14, 0x0004($v0) ## 0000017C -/* 00618 809779A8 0C0342A3 */ jal Matrix_Scale +/* 00618 809779A8 0C0342A3 */ jal Matrix_Scale /* 0061C 809779AC C44C0000 */ lwc1 $f12, 0x0000($v0) ## 00000178 /* 00620 809779B0 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 /* 00624 809779B4 8C42FA90 */ lw $v0, -0x0570($v0) ## 8015FA90 -/* 00628 809779B8 8FAE0088 */ lw $t6, 0x0088($sp) +/* 00628 809779B8 8FAE0088 */ lw $t6, 0x0088($sp) /* 0062C 809779BC 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 /* 00630 809779C0 84441474 */ lh $a0, 0x1474($v0) ## 80161474 /* 00634 809779C4 84461478 */ lh $a2, 0x1478($v0) ## 80161478 /* 00638 809779C8 85C50168 */ lh $a1, 0x0168($t6) ## 00000168 /* 0063C 809779CC 24844000 */ addiu $a0, $a0, 0x4000 ## $a0 = 00004000 -/* 00640 809779D0 00042400 */ sll $a0, $a0, 16 -/* 00644 809779D4 0C034421 */ jal Matrix_RotateXYZ -/* 00648 809779D8 00042403 */ sra $a0, $a0, 16 +/* 00640 809779D0 00042400 */ sll $a0, $a0, 16 +/* 00644 809779D4 0C034421 */ jal Matrix_RotateZYX +/* 00648 809779D8 00042403 */ sra $a0, $a0, 16 /* 0064C 809779DC 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 /* 00650 809779E0 8C42FA90 */ lw $v0, -0x0570($v0) ## 8015FA90 /* 00654 809779E4 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 @@ -44,22 +44,22 @@ glabel func_80977950 /* 00664 809779F4 44994000 */ mtc1 $t9, $f8 ## $f8 = 0.00 /* 00668 809779F8 448F2000 */ mtc1 $t7, $f4 ## $f4 = 0.00 /* 0066C 809779FC 44983000 */ mtc1 $t8, $f6 ## $f6 = 0.00 -/* 00670 80977A00 46804220 */ cvt.s.w $f8, $f8 -/* 00674 80977A04 46802320 */ cvt.s.w $f12, $f4 -/* 00678 80977A08 44064000 */ mfc1 $a2, $f8 -/* 0067C 80977A0C 0C034261 */ jal Matrix_Translate -/* 00680 80977A10 468033A0 */ cvt.s.w $f14, $f6 +/* 00670 80977A00 46804220 */ cvt.s.w $f8, $f8 +/* 00674 80977A04 46802320 */ cvt.s.w $f12, $f4 +/* 00678 80977A08 44064000 */ mfc1 $a2, $f8 +/* 0067C 80977A0C 0C034261 */ jal Matrix_Translate +/* 00680 80977A10 468033A0 */ cvt.s.w $f14, $f6 /* 00684 80977A14 3C058097 */ lui $a1, %hi(D_80977D30) ## $a1 = 80970000 /* 00688 80977A18 24A57D30 */ addiu $a1, $a1, %lo(D_80977D30) ## $a1 = 80977D30 -/* 0068C 80977A1C 8FA40080 */ lw $a0, 0x0080($sp) -/* 00690 80977A20 0C034695 */ jal Matrix_ToMtx +/* 0068C 80977A1C 8FA40080 */ lw $a0, 0x0080($sp) +/* 00690 80977A20 0C034695 */ jal Matrix_ToMtx /* 00694 80977A24 240601DC */ addiu $a2, $zero, 0x01DC ## $a2 = 000001DC -/* 00698 80977A28 0C034221 */ jal Matrix_Pull +/* 00698 80977A28 0C034221 */ jal Matrix_Pull /* 0069C 80977A2C 00000000 */ nop -/* 006A0 80977A30 0C024F61 */ jal func_80093D84 +/* 006A0 80977A30 0C024F61 */ jal func_80093D84 /* 006A4 80977A34 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 006A8 80977A38 8E0302D0 */ lw $v1, 0x02D0($s0) ## 000002D0 -/* 006AC 80977A3C 8FA90088 */ lw $t1, 0x0088($sp) +/* 006AC 80977A3C 8FA90088 */ lw $t1, 0x0088($sp) /* 006B0 80977A40 3C058016 */ lui $a1, 0x8016 ## $a1 = 80160000 /* 006B4 80977A44 246A0008 */ addiu $t2, $v1, 0x0008 ## $t2 = 00000008 /* 006B8 80977A48 AE0A02D0 */ sw $t2, 0x02D0($s0) ## 000002D0 @@ -78,14 +78,14 @@ glabel func_80977950 /* 006EC 80977A7C 2719008C */ addiu $t9, $t8, 0x008C ## $t9 = 0000008C /* 006F0 80977A80 332A00FF */ andi $t2, $t9, 0x00FF ## $t2 = 0000008C /* 006F4 80977A84 84591488 */ lh $t9, 0x1488($v0) ## 00001488 -/* 006F8 80977A88 000A5A00 */ sll $t3, $t2, 8 +/* 006F8 80977A88 000A5A00 */ sll $t3, $t2, 8 /* 006FC 80977A8C 258E008C */ addiu $t6, $t4, 0x008C ## $t6 = 0000008C -/* 00700 80977A90 000E7E00 */ sll $t7, $t6, 24 +/* 00700 80977A90 000E7E00 */ sll $t7, $t6, 24 /* 00704 80977A94 016FC025 */ or $t8, $t3, $t7 ## $t8 = FA000080 /* 00708 80977A98 8D2B0170 */ lw $t3, 0x0170($t1) ## 00000170 /* 0070C 80977A9C 272A0050 */ addiu $t2, $t9, 0x0050 ## $t2 = 000000DC /* 00710 80977AA0 314C00FF */ andi $t4, $t2, 0x00FF ## $t4 = 000000DC -/* 00714 80977AA4 000C6C00 */ sll $t5, $t4, 16 +/* 00714 80977AA4 000C6C00 */ sll $t5, $t4, 16 /* 00718 80977AA8 030D7025 */ or $t6, $t8, $t5 ## $t6 = FA000080 /* 0071C 80977AAC 316F00FF */ andi $t7, $t3, 0x00FF ## $t7 = 00000000 /* 00720 80977AB0 01CFC825 */ or $t9, $t6, $t7 ## $t9 = FA000080 @@ -102,14 +102,14 @@ glabel func_80977950 /* 0074C 80977ADC 270D005F */ addiu $t5, $t8, 0x005F ## $t5 = FA0000DF /* 00750 80977AE0 31AB00FF */ andi $t3, $t5, 0x00FF ## $t3 = 000000DF /* 00754 80977AE4 844D1490 */ lh $t5, 0x1490($v0) ## 00001490 -/* 00758 80977AE8 000B7200 */ sll $t6, $t3, 8 +/* 00758 80977AE8 000B7200 */ sll $t6, $t3, 8 /* 0075C 80977AEC 25EA005A */ addiu $t2, $t7, 0x005A ## $t2 = 0000005A -/* 00760 80977AF0 000A6600 */ sll $t4, $t2, 24 +/* 00760 80977AF0 000A6600 */ sll $t4, $t2, 24 /* 00764 80977AF4 01CCC025 */ or $t8, $t6, $t4 ## $t8 = FB000080 /* 00768 80977AF8 8D2E0174 */ lw $t6, 0x0174($t1) ## 00000174 /* 0076C 80977AFC 25AB0032 */ addiu $t3, $t5, 0x0032 ## $t3 = FA000111 /* 00770 80977B00 316F00FF */ andi $t7, $t3, 0x00FF ## $t7 = 00000011 -/* 00774 80977B04 000FCC00 */ sll $t9, $t7, 16 +/* 00774 80977B04 000FCC00 */ sll $t9, $t7, 16 /* 00778 80977B08 03195025 */ or $t2, $t8, $t9 ## $t2 = FB000080 /* 0077C 80977B0C 31CC00FF */ andi $t4, $t6, 0x00FF ## $t4 = 00000080 /* 00780 80977B10 014C6825 */ or $t5, $t2, $t4 ## $t5 = FB000080 @@ -126,20 +126,20 @@ glabel func_80977950 /* 007AC 80977B3C 240E0001 */ addiu $t6, $zero, 0x0001 ## $t6 = 00000001 /* 007B0 80977B40 24190040 */ addiu $t9, $zero, 0x0040 ## $t9 = 00000040 /* 007B4 80977B44 24180040 */ addiu $t8, $zero, 0x0040 ## $t8 = 00000040 -/* 007B8 80977B48 AFB80010 */ sw $t8, 0x0010($sp) -/* 007BC 80977B4C AFB90014 */ sw $t9, 0x0014($sp) -/* 007C0 80977B50 AFAE0018 */ sw $t6, 0x0018($sp) +/* 007B8 80977B48 AFB80010 */ sw $t8, 0x0010($sp) +/* 007BC 80977B4C AFB90014 */ sw $t9, 0x0014($sp) +/* 007C0 80977B50 AFAE0018 */ sw $t6, 0x0018($sp) /* 007C4 80977B54 844A0004 */ lh $t2, 0x0004($v0) ## 00000164 /* 007C8 80977B58 240B0040 */ addiu $t3, $zero, 0x0040 ## $t3 = 00000040 /* 007CC 80977B5C 240D0040 */ addiu $t5, $zero, 0x0040 ## $t5 = 00000040 -/* 007D0 80977B60 AFAA001C */ sw $t2, 0x001C($sp) +/* 007D0 80977B60 AFAA001C */ sw $t2, 0x001C($sp) /* 007D4 80977B64 844C0006 */ lh $t4, 0x0006($v0) ## 00000166 -/* 007D8 80977B68 AFAB0028 */ sw $t3, 0x0028($sp) -/* 007DC 80977B6C AFAD0024 */ sw $t5, 0x0024($sp) -/* 007E0 80977B70 AFA30054 */ sw $v1, 0x0054($sp) -/* 007E4 80977B74 0C0253D0 */ jal Draw_TwoTexScroll -/* 007E8 80977B78 AFAC0020 */ sw $t4, 0x0020($sp) -/* 007EC 80977B7C 8FA80054 */ lw $t0, 0x0054($sp) +/* 007D8 80977B68 AFAB0028 */ sw $t3, 0x0028($sp) +/* 007DC 80977B6C AFAD0024 */ sw $t5, 0x0024($sp) +/* 007E0 80977B70 AFA30054 */ sw $v1, 0x0054($sp) +/* 007E4 80977B74 0C0253D0 */ jal Gfx_TwoTexScroll +/* 007E8 80977B78 AFAC0020 */ sw $t4, 0x0020($sp) +/* 007EC 80977B7C 8FA80054 */ lw $t0, 0x0054($sp) /* 007F0 80977B80 3C18DA38 */ lui $t8, 0xDA38 ## $t8 = DA380000 /* 007F4 80977B84 37180002 */ ori $t8, $t8, 0x0002 ## $t8 = DA380002 /* 007F8 80977B88 AD020004 */ sw $v0, 0x0004($t0) ## 00000004 @@ -149,7 +149,7 @@ glabel func_80977950 /* 00808 80977B98 246F0008 */ addiu $t7, $v1, 0x0008 ## $t7 = 00000008 /* 0080C 80977B9C AE0F02D0 */ sw $t7, 0x02D0($s0) ## 000002D0 /* 00810 80977BA0 AC780000 */ sw $t8, 0x0000($v1) ## 00000000 -/* 00814 80977BA4 8FB90080 */ lw $t9, 0x0080($sp) +/* 00814 80977BA4 8FB90080 */ lw $t9, 0x0080($sp) /* 00818 80977BA8 3C0ADE00 */ lui $t2, 0xDE00 ## $t2 = DE000000 /* 0081C 80977BAC 3C0BD838 */ lui $t3, 0xD838 ## $t3 = D8380000 /* 00820 80977BB0 AC790004 */ sw $t9, 0x0004($v1) ## 00000004 @@ -169,12 +169,12 @@ glabel func_80977950 /* 00858 80977BE8 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 0085C 80977BEC 24070200 */ addiu $a3, $zero, 0x0200 ## $a3 = 00000200 /* 00860 80977BF0 AC6F0004 */ sw $t7, 0x0004($v1) ## 00000004 -/* 00864 80977BF4 0C031AD5 */ jal func_800C6B54 +/* 00864 80977BF4 0C031AD5 */ jal Graph_CloseDisps /* 00868 80977BF8 AC6B0000 */ sw $t3, 0x0000($v1) ## 00000000 -/* 0086C 80977BFC 8FBF003C */ lw $ra, 0x003C($sp) -/* 00870 80977C00 8FB00038 */ lw $s0, 0x0038($sp) +/* 0086C 80977BFC 8FBF003C */ lw $ra, 0x003C($sp) +/* 00870 80977C00 8FB00038 */ lw $s0, 0x0038($sp) /* 00874 80977C04 27BD0088 */ addiu $sp, $sp, 0x0088 ## $sp = 00000000 -/* 00878 80977C08 03E00008 */ jr $ra +/* 00878 80977C08 03E00008 */ jr $ra /* 0087C 80977C0C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Geff/DemoGeff_Destroy.s b/asm/non_matchings/overlays/actors/ovl_Demo_Geff/DemoGeff_Destroy.s deleted file mode 100644 index 4792166bf4..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Geff/DemoGeff_Destroy.s +++ /dev/null @@ -1,6 +0,0 @@ -glabel DemoGeff_Destroy -/* 00000 80977E40 AFA40000 */ sw $a0, 0x0000($sp) -/* 00004 80977E44 03E00008 */ jr $ra -/* 00008 80977E48 AFA50004 */ sw $a1, 0x0004($sp) - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Geff/DemoGeff_Draw.s b/asm/non_matchings/overlays/actors/ovl_Demo_Geff/DemoGeff_Draw.s deleted file mode 100644 index 7be00a7160..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Geff/DemoGeff_Draw.s +++ /dev/null @@ -1,43 +0,0 @@ -glabel DemoGeff_Draw -/* 006A0 809784E0 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 006A4 809784E4 AFBF0014 */ sw $ra, 0x0014($sp) -/* 006A8 809784E8 AFA5002C */ sw $a1, 0x002C($sp) -/* 006AC 809784EC 8C820150 */ lw $v0, 0x0150($a0) ## 00000150 -/* 006B0 809784F0 0440000B */ bltz $v0, .L80978520 -/* 006B4 809784F4 28410002 */ slti $at, $v0, 0x0002 -/* 006B8 809784F8 10200009 */ beq $at, $zero, .L80978520 -/* 006BC 809784FC 00027080 */ sll $t6, $v0, 2 -/* 006C0 80978500 3C0F8098 */ lui $t7, %hi(D_809785B0) ## $t7 = 80980000 -/* 006C4 80978504 25EF85B0 */ addiu $t7, $t7, %lo(D_809785B0) ## $t7 = 809785B0 -/* 006C8 80978508 01CF1821 */ addu $v1, $t6, $t7 -/* 006CC 8097850C 8C660000 */ lw $a2, 0x0000($v1) ## 00000000 -/* 006D0 80978510 3C188098 */ lui $t8, %hi(D_809785B0) ## $t8 = 80980000 -/* 006D4 80978514 271885B0 */ addiu $t8, $t8, %lo(D_809785B0) ## $t8 = 809785B0 -/* 006D8 80978518 14C00006 */ bne $a2, $zero, .L80978534 -/* 006DC 8097851C 00000000 */ nop -.L80978520: -/* 006E0 80978520 3C048098 */ lui $a0, %hi(D_80978740) ## $a0 = 80980000 -/* 006E4 80978524 0C00084C */ jal osSyncPrintf - -/* 006E8 80978528 24848740 */ addiu $a0, $a0, %lo(D_80978740) ## $a0 = 80978740 -/* 006EC 8097852C 1000000C */ beq $zero, $zero, .L80978560 -/* 006F0 80978530 8FBF0014 */ lw $ra, 0x0014($sp) -.L80978534: -/* 006F4 80978534 10780007 */ beq $v1, $t8, .L80978554 -/* 006F8 80978538 8FA5002C */ lw $a1, 0x002C($sp) -/* 006FC 8097853C AFA3001C */ sw $v1, 0x001C($sp) -/* 00700 80978540 0C25DFE0 */ jal func_80977F80 -/* 00704 80978544 AFA40028 */ sw $a0, 0x0028($sp) -/* 00708 80978548 8FA3001C */ lw $v1, 0x001C($sp) -/* 0070C 8097854C 8FA40028 */ lw $a0, 0x0028($sp) -/* 00710 80978550 8C660000 */ lw $a2, 0x0000($v1) ## 00000000 -.L80978554: -/* 00714 80978554 00C0F809 */ jalr $ra, $a2 -/* 00718 80978558 8FA5002C */ lw $a1, 0x002C($sp) -/* 0071C 8097855C 8FBF0014 */ lw $ra, 0x0014($sp) -.L80978560: -/* 00720 80978560 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 00724 80978564 03E00008 */ jr $ra -/* 00728 80978568 00000000 */ nop -/* 0072C 8097856C 00000000 */ nop - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Geff/DemoGeff_Init.s b/asm/non_matchings/overlays/actors/ovl_Demo_Geff/DemoGeff_Init.s deleted file mode 100644 index dfd28b9e27..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Geff/DemoGeff_Init.s +++ /dev/null @@ -1,31 +0,0 @@ -glabel DemoGeff_Init -/* 0000C 80977E4C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00010 80977E50 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00014 80977E54 AFA40018 */ sw $a0, 0x0018($sp) -/* 00018 80977E58 AFA5001C */ sw $a1, 0x001C($sp) -/* 0001C 80977E5C 8482001C */ lh $v0, 0x001C($a0) ## 0000001C -/* 00020 80977E60 00802825 */ or $a1, $a0, $zero ## $a1 = 00000000 -/* 00024 80977E64 3C048098 */ lui $a0, %hi(D_809785E0) ## $a0 = 80980000 -/* 00028 80977E68 04400002 */ bltz $v0, .L80977E74 -/* 0002C 80977E6C 28410009 */ slti $at, $v0, 0x0009 -/* 00030 80977E70 14200007 */ bne $at, $zero, .L80977E90 -.L80977E74: -/* 00034 80977E74 248485E0 */ addiu $a0, $a0, %lo(D_809785E0) ## $a0 = 809785E0 -/* 00038 80977E78 0C00084C */ jal osSyncPrintf - -/* 0003C 80977E7C AFA50018 */ sw $a1, 0x0018($sp) -/* 00040 80977E80 0C00B55C */ jal Actor_Kill - -/* 00044 80977E84 8FA40018 */ lw $a0, 0x0018($sp) -/* 00048 80977E88 10000004 */ beq $zero, $zero, .L80977E9C -/* 0004C 80977E8C 8FBF0014 */ lw $ra, 0x0014($sp) -.L80977E90: -/* 00050 80977E90 ACA0014C */ sw $zero, 0x014C($a1) ## 0000014C -/* 00054 80977E94 ACA00150 */ sw $zero, 0x0150($a1) ## 00000150 -/* 00058 80977E98 8FBF0014 */ lw $ra, 0x0014($sp) -.L80977E9C: -/* 0005C 80977E9C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00060 80977EA0 03E00008 */ jr $ra -/* 00064 80977EA4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Geff/DemoGeff_Update.s b/asm/non_matchings/overlays/actors/ovl_Demo_Geff/DemoGeff_Update.s deleted file mode 100644 index 9df7106d09..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Geff/DemoGeff_Update.s +++ /dev/null @@ -1,30 +0,0 @@ -glabel DemoGeff_Update -/* 00638 80978478 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 0063C 8097847C AFBF0014 */ sw $ra, 0x0014($sp) -/* 00640 80978480 8C82014C */ lw $v0, 0x014C($a0) ## 0000014C -/* 00644 80978484 04400008 */ bltz $v0, .L809784A8 -/* 00648 80978488 28410002 */ slti $at, $v0, 0x0002 -/* 0064C 8097848C 10200006 */ beq $at, $zero, .L809784A8 -/* 00650 80978490 00027080 */ sll $t6, $v0, 2 -/* 00654 80978494 3C038098 */ lui $v1, %hi(D_809785A8) ## $v1 = 80980000 -/* 00658 80978498 006E1821 */ addu $v1, $v1, $t6 -/* 0065C 8097849C 8C6385A8 */ lw $v1, %lo(D_809785A8)($v1) -/* 00660 809784A0 14600006 */ bne $v1, $zero, .L809784BC -/* 00664 809784A4 00000000 */ nop -.L809784A8: -/* 00668 809784A8 3C048098 */ lui $a0, %hi(D_80978704) ## $a0 = 80980000 -/* 0066C 809784AC 0C00084C */ jal osSyncPrintf - -/* 00670 809784B0 24848704 */ addiu $a0, $a0, %lo(D_80978704) ## $a0 = 80978704 -/* 00674 809784B4 10000004 */ beq $zero, $zero, .L809784C8 -/* 00678 809784B8 8FBF0014 */ lw $ra, 0x0014($sp) -.L809784BC: -/* 0067C 809784BC 0060F809 */ jalr $ra, $v1 -/* 00680 809784C0 00000000 */ nop -/* 00684 809784C4 8FBF0014 */ lw $ra, 0x0014($sp) -.L809784C8: -/* 00688 809784C8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 0068C 809784CC 03E00008 */ jr $ra -/* 00690 809784D0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Geff/func_80977EA8.s b/asm/non_matchings/overlays/actors/ovl_Demo_Geff/func_80977EA8.s deleted file mode 100644 index 70b44521f4..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Geff/func_80977EA8.s +++ /dev/null @@ -1,57 +0,0 @@ -glabel func_80977EA8 -/* 00068 80977EA8 27BDFFB8 */ addiu $sp, $sp, 0xFFB8 ## $sp = FFFFFFB8 -/* 0006C 80977EAC AFBF001C */ sw $ra, 0x001C($sp) -/* 00070 80977EB0 AFB00018 */ sw $s0, 0x0018($sp) -/* 00074 80977EB4 AFA40048 */ sw $a0, 0x0048($sp) -/* 00078 80977EB8 AFA5004C */ sw $a1, 0x004C($sp) -/* 0007C 80977EBC 8C900000 */ lw $s0, 0x0000($a0) ## 00000000 -/* 00080 80977EC0 3C068098 */ lui $a2, %hi(D_8097861C) ## $a2 = 80980000 -/* 00084 80977EC4 24C6861C */ addiu $a2, $a2, %lo(D_8097861C) ## $a2 = 8097861C -/* 00088 80977EC8 27A40030 */ addiu $a0, $sp, 0x0030 ## $a0 = FFFFFFE8 -/* 0008C 80977ECC 240700B5 */ addiu $a3, $zero, 0x00B5 ## $a3 = 000000B5 -/* 00090 80977ED0 0C031AB1 */ jal func_800C6AC4 -/* 00094 80977ED4 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 00098 80977ED8 0C024F46 */ jal func_80093D18 -/* 0009C 80977EDC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 000A0 80977EE0 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 -/* 000A4 80977EE4 3C18DA38 */ lui $t8, 0xDA38 ## $t8 = DA380000 -/* 000A8 80977EE8 37180002 */ ori $t8, $t8, 0x0002 ## $t8 = DA380002 -/* 000AC 80977EEC 244F0008 */ addiu $t7, $v0, 0x0008 ## $t7 = 00000008 -/* 000B0 80977EF0 AE0F02C0 */ sw $t7, 0x02C0($s0) ## 000002C0 -/* 000B4 80977EF4 3C058098 */ lui $a1, %hi(D_80978630) ## $a1 = 80980000 -/* 000B8 80977EF8 AC580000 */ sw $t8, 0x0000($v0) ## 00000000 -/* 000BC 80977EFC 24A58630 */ addiu $a1, $a1, %lo(D_80978630) ## $a1 = 80978630 -/* 000C0 80977F00 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 000C4 80977F04 240600B7 */ addiu $a2, $zero, 0x00B7 ## $a2 = 000000B7 -/* 000C8 80977F08 0C0346A2 */ jal Matrix_NewMtx -/* 000CC 80977F0C AFA2002C */ sw $v0, 0x002C($sp) -/* 000D0 80977F10 8FA3002C */ lw $v1, 0x002C($sp) -/* 000D4 80977F14 3C08DE00 */ lui $t0, 0xDE00 ## $t0 = DE000000 -/* 000D8 80977F18 3C0BD838 */ lui $t3, 0xD838 ## $t3 = D8380000 -/* 000DC 80977F1C AC620004 */ sw $v0, 0x0004($v1) ## 00000004 -/* 000E0 80977F20 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 -/* 000E4 80977F24 356B0002 */ ori $t3, $t3, 0x0002 ## $t3 = D8380002 -/* 000E8 80977F28 240C0040 */ addiu $t4, $zero, 0x0040 ## $t4 = 00000040 -/* 000EC 80977F2C 24590008 */ addiu $t9, $v0, 0x0008 ## $t9 = 00000008 -/* 000F0 80977F30 AE1902C0 */ sw $t9, 0x02C0($s0) ## 000002C0 -/* 000F4 80977F34 AC480000 */ sw $t0, 0x0000($v0) ## 00000000 -/* 000F8 80977F38 8FA9004C */ lw $t1, 0x004C($sp) -/* 000FC 80977F3C 3C068098 */ lui $a2, %hi(D_80978644) ## $a2 = 80980000 -/* 00100 80977F40 24C68644 */ addiu $a2, $a2, %lo(D_80978644) ## $a2 = 80978644 -/* 00104 80977F44 AC490004 */ sw $t1, 0x0004($v0) ## 00000004 -/* 00108 80977F48 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 -/* 0010C 80977F4C 27A40030 */ addiu $a0, $sp, 0x0030 ## $a0 = FFFFFFE8 -/* 00110 80977F50 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 00114 80977F54 244A0008 */ addiu $t2, $v0, 0x0008 ## $t2 = 00000008 -/* 00118 80977F58 AE0A02C0 */ sw $t2, 0x02C0($s0) ## 000002C0 -/* 0011C 80977F5C 240700BC */ addiu $a3, $zero, 0x00BC ## $a3 = 000000BC -/* 00120 80977F60 AC4C0004 */ sw $t4, 0x0004($v0) ## 00000004 -/* 00124 80977F64 0C031AD5 */ jal func_800C6B54 -/* 00128 80977F68 AC4B0000 */ sw $t3, 0x0000($v0) ## 00000000 -/* 0012C 80977F6C 8FBF001C */ lw $ra, 0x001C($sp) -/* 00130 80977F70 8FB00018 */ lw $s0, 0x0018($sp) -/* 00134 80977F74 27BD0048 */ addiu $sp, $sp, 0x0048 ## $sp = 00000000 -/* 00138 80977F78 03E00008 */ jr $ra -/* 0013C 80977F7C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Geff/func_80977F80.s b/asm/non_matchings/overlays/actors/ovl_Demo_Geff/func_80977F80.s deleted file mode 100644 index 23cda1aae2..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Geff/func_80977F80.s +++ /dev/null @@ -1,47 +0,0 @@ -glabel func_80977F80 -/* 00140 80977F80 27BDFFB8 */ addiu $sp, $sp, 0xFFB8 ## $sp = FFFFFFB8 -/* 00144 80977F84 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00148 80977F88 AFA40048 */ sw $a0, 0x0048($sp) -/* 0014C 80977F8C AFA5004C */ sw $a1, 0x004C($sp) -/* 00150 80977F90 8C8F0154 */ lw $t7, 0x0154($a0) ## 00000154 -/* 00154 80977F94 3C068098 */ lui $a2, %hi(D_80978658) ## $a2 = 80980000 -/* 00158 80977F98 24C68658 */ addiu $a2, $a2, %lo(D_80978658) ## $a2 = 80978658 -/* 0015C 80977F9C AFAF003C */ sw $t7, 0x003C($sp) -/* 00160 80977FA0 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 -/* 00164 80977FA4 27A40024 */ addiu $a0, $sp, 0x0024 ## $a0 = FFFFFFDC -/* 00168 80977FA8 240700CC */ addiu $a3, $zero, 0x00CC ## $a3 = 000000CC -/* 0016C 80977FAC 0C031AB1 */ jal func_800C6AC4 -/* 00170 80977FB0 AFA50038 */ sw $a1, 0x0038($sp) -/* 00174 80977FB4 8FA50038 */ lw $a1, 0x0038($sp) -/* 00178 80977FB8 8FA6004C */ lw $a2, 0x004C($sp) -/* 0017C 80977FBC 3C08DB06 */ lui $t0, 0xDB06 ## $t0 = DB060000 -/* 00180 80977FC0 8CA302C0 */ lw $v1, 0x02C0($a1) ## 000002C0 -/* 00184 80977FC4 35080018 */ ori $t0, $t0, 0x0018 ## $t0 = DB060018 -/* 00188 80977FC8 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 0018C 80977FCC 24790008 */ addiu $t9, $v1, 0x0008 ## $t9 = 00000008 -/* 00190 80977FD0 ACB902C0 */ sw $t9, 0x02C0($a1) ## 000002C0 -/* 00194 80977FD4 AC680000 */ sw $t0, 0x0000($v1) ## 00000000 -/* 00198 80977FD8 8FA9003C */ lw $t1, 0x003C($sp) -/* 0019C 80977FDC 240700D4 */ addiu $a3, $zero, 0x00D4 ## $a3 = 000000D4 -/* 001A0 80977FE0 00095100 */ sll $t2, $t1, 4 -/* 001A4 80977FE4 01495021 */ addu $t2, $t2, $t1 -/* 001A8 80977FE8 000A5080 */ sll $t2, $t2, 2 -/* 001AC 80977FEC 00CA2021 */ addu $a0, $a2, $t2 -/* 001B0 80977FF0 00812021 */ addu $a0, $a0, $at -/* 001B4 80977FF4 8C8B17B4 */ lw $t3, 0x17B4($a0) ## 000017B4 -/* 001B8 80977FF8 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 001BC 80977FFC 3C068098 */ lui $a2, %hi(D_8097866C) ## $a2 = 80980000 -/* 001C0 80978000 AC6B0004 */ sw $t3, 0x0004($v1) ## 00000004 -/* 001C4 80978004 8C8C17B4 */ lw $t4, 0x17B4($a0) ## 000017B4 -/* 001C8 80978008 27A40024 */ addiu $a0, $sp, 0x0024 ## $a0 = FFFFFFDC -/* 001CC 8097800C 24C6866C */ addiu $a2, $a2, %lo(D_8097866C) ## $a2 = 8097866C -/* 001D0 80978010 01816821 */ addu $t5, $t4, $at -/* 001D4 80978014 3C018016 */ lui $at, 0x8016 ## $at = 80160000 -/* 001D8 80978018 0C031AD5 */ jal func_800C6B54 -/* 001DC 8097801C AC2D6FC0 */ sw $t5, 0x6FC0($at) ## 80166FC0 -/* 001E0 80978020 8FBF0014 */ lw $ra, 0x0014($sp) -/* 001E4 80978024 27BD0048 */ addiu $sp, $sp, 0x0048 ## $sp = 00000000 -/* 001E8 80978028 03E00008 */ jr $ra -/* 001EC 8097802C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Geff/func_80978030.s b/asm/non_matchings/overlays/actors/ovl_Demo_Geff/func_80978030.s deleted file mode 100644 index 5731a2e104..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Geff/func_80978030.s +++ /dev/null @@ -1,48 +0,0 @@ -glabel func_80978030 -/* 001F0 80978030 AFA50004 */ sw $a1, 0x0004($sp) -/* 001F4 80978034 948E001C */ lhu $t6, 0x001C($a0) ## 0000001C -/* 001F8 80978038 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -/* 001FC 8097803C AC82014C */ sw $v0, 0x014C($a0) ## 0000014C -/* 00200 80978040 2DC10008 */ sltiu $at, $t6, 0x0008 -/* 00204 80978044 10200049 */ beq $at, $zero, .L8097816C -/* 00208 80978048 AC820150 */ sw $v0, 0x0150($a0) ## 00000150 -/* 0020C 8097804C 000E7080 */ sll $t6, $t6, 2 -/* 00210 80978050 3C018098 */ lui $at, %hi(jtbl_80978778) ## $at = 80980000 -/* 00214 80978054 002E0821 */ addu $at, $at, $t6 -/* 00218 80978058 8C2E8778 */ lw $t6, %lo(jtbl_80978778)($at) -/* 0021C 8097805C 01C00008 */ jr $t6 -/* 00220 80978060 00000000 */ nop -glabel L80978064 -/* 00224 80978064 3C038016 */ lui $v1, 0x8016 ## $v1 = 80160000 -/* 00228 80978068 2463FA90 */ addiu $v1, $v1, 0xFA90 ## $v1 = 8015FA90 -/* 0022C 8097806C 8C6F0000 */ lw $t7, 0x0000($v1) ## 8015FA90 -/* 00230 80978070 3C018098 */ lui $at, %hi(D_80978798) ## $at = 80980000 -/* 00234 80978074 C4208798 */ lwc1 $f0, %lo(D_80978798)($at) -/* 00238 80978078 85F81462 */ lh $t8, 0x1462($t7) ## 00001462 -/* 0023C 8097807C 3C018098 */ lui $at, %hi(D_8097879C) ## $at = 80980000 -/* 00240 80978080 C422879C */ lwc1 $f2, %lo(D_8097879C)($at) -/* 00244 80978084 44982000 */ mtc1 $t8, $f4 ## $f4 = 0.00 -/* 00248 80978088 24820050 */ addiu $v0, $a0, 0x0050 ## $v0 = 00000050 -/* 0024C 8097808C 468021A0 */ cvt.s.w $f6, $f4 -/* 00250 80978090 46003202 */ mul.s $f8, $f6, $f0 -/* 00254 80978094 46024280 */ add.s $f10, $f8, $f2 -/* 00258 80978098 E44A0000 */ swc1 $f10, 0x0000($v0) ## 00000050 -/* 0025C 8097809C 8C790000 */ lw $t9, 0x0000($v1) ## 8015FA90 -/* 00260 809780A0 87281464 */ lh $t0, 0x1464($t9) ## 00001464 -/* 00264 809780A4 44888000 */ mtc1 $t0, $f16 ## $f16 = 0.00 -/* 00268 809780A8 00000000 */ nop -/* 0026C 809780AC 468084A0 */ cvt.s.w $f18, $f16 -/* 00270 809780B0 46009102 */ mul.s $f4, $f18, $f0 -/* 00274 809780B4 46022180 */ add.s $f6, $f4, $f2 -/* 00278 809780B8 E4460004 */ swc1 $f6, 0x0004($v0) ## 00000054 -/* 0027C 809780BC 8C690000 */ lw $t1, 0x0000($v1) ## 8015FA90 -/* 00280 809780C0 852A1466 */ lh $t2, 0x1466($t1) ## 00001466 -/* 00284 809780C4 448A4000 */ mtc1 $t2, $f8 ## $f8 = 0.00 -/* 00288 809780C8 00000000 */ nop -/* 0028C 809780CC 468042A0 */ cvt.s.w $f10, $f8 -/* 00290 809780D0 46005402 */ mul.s $f16, $f10, $f0 -/* 00294 809780D4 46028480 */ add.s $f18, $f16, $f2 -/* 00298 809780D8 03E00008 */ jr $ra -/* 0029C 809780DC E4520008 */ swc1 $f18, 0x0008($v0) ## 00000058 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Geff/func_809780E0.s b/asm/non_matchings/overlays/actors/ovl_Demo_Geff/func_809780E0.s deleted file mode 100644 index c140b9e4ae..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Geff/func_809780E0.s +++ /dev/null @@ -1,76 +0,0 @@ -glabel func_809780E0 -/* 002A0 809780E0 3C038016 */ lui $v1, 0x8016 ## $v1 = 80160000 -/* 002A4 809780E4 2463FA90 */ addiu $v1, $v1, 0xFA90 ## $v1 = 8015FA90 -/* 002A8 809780E8 8C6B0000 */ lw $t3, 0x0000($v1) ## 8015FA90 -/* 002AC 809780EC 3C018098 */ lui $at, %hi(D_809787A0) ## $at = 80980000 -/* 002B0 809780F0 C42087A0 */ lwc1 $f0, %lo(D_809787A0)($at) -/* 002B4 809780F4 856C1468 */ lh $t4, 0x1468($t3) ## 00001468 -/* 002B8 809780F8 3C018098 */ lui $at, %hi(D_809787A4) ## $at = 80980000 -/* 002BC 809780FC C42A87A4 */ lwc1 $f10, %lo(D_809787A4)($at) -/* 002C0 80978100 448C2000 */ mtc1 $t4, $f4 ## $f4 = 0.00 -/* 002C4 80978104 24820050 */ addiu $v0, $a0, 0x0050 ## $v0 = 00000050 -/* 002C8 80978108 3C018098 */ lui $at, %hi(D_809787A8) ## $at = 80980000 -/* 002CC 8097810C 468021A0 */ cvt.s.w $f6, $f4 -/* 002D0 80978110 46003202 */ mul.s $f8, $f6, $f0 -/* 002D4 80978114 460A4400 */ add.s $f16, $f8, $f10 -/* 002D8 80978118 E4500000 */ swc1 $f16, 0x0000($v0) ## 00000050 -/* 002DC 8097811C 8C6D0000 */ lw $t5, 0x0000($v1) ## 8015FA90 -/* 002E0 80978120 C42887A8 */ lwc1 $f8, %lo(D_809787A8)($at) -/* 002E4 80978124 3C018098 */ lui $at, %hi(D_809787AC) ## $at = 80980000 -/* 002E8 80978128 85AE146A */ lh $t6, 0x146A($t5) ## 0000146A -/* 002EC 8097812C 448E9000 */ mtc1 $t6, $f18 ## $f18 = 0.00 -/* 002F0 80978130 00000000 */ nop -/* 002F4 80978134 46809120 */ cvt.s.w $f4, $f18 -/* 002F8 80978138 46002182 */ mul.s $f6, $f4, $f0 -/* 002FC 8097813C 46083280 */ add.s $f10, $f6, $f8 -/* 00300 80978140 E44A0004 */ swc1 $f10, 0x0004($v0) ## 00000054 -/* 00304 80978144 8C6F0000 */ lw $t7, 0x0000($v1) ## 8015FA90 -/* 00308 80978148 C42687AC */ lwc1 $f6, %lo(D_809787AC)($at) -/* 0030C 8097814C 85F8146C */ lh $t8, 0x146C($t7) ## 0000146C -/* 00310 80978150 44988000 */ mtc1 $t8, $f16 ## $f16 = 0.00 -/* 00314 80978154 00000000 */ nop -/* 00318 80978158 468084A0 */ cvt.s.w $f18, $f16 -/* 0031C 8097815C 46009102 */ mul.s $f4, $f18, $f0 -/* 00320 80978160 46062200 */ add.s $f8, $f4, $f6 -/* 00324 80978164 03E00008 */ jr $ra -/* 00328 80978168 E4480008 */ swc1 $f8, 0x0008($v0) ## 00000058 -glabel L8097816C -.L8097816C: -/* 0032C 8097816C 3C038016 */ lui $v1, 0x8016 ## $v1 = 80160000 -/* 00330 80978170 2463FA90 */ addiu $v1, $v1, 0xFA90 ## $v1 = 8015FA90 -/* 00334 80978174 8C790000 */ lw $t9, 0x0000($v1) ## 8015FA90 -/* 00338 80978178 3C018098 */ lui $at, %hi(D_809787B0) ## $at = 80980000 -/* 0033C 8097817C C42087B0 */ lwc1 $f0, %lo(D_809787B0)($at) -/* 00340 80978180 8728146E */ lh $t0, 0x146E($t9) ## 0000146E -/* 00344 80978184 3C018098 */ lui $at, %hi(D_809787B4) ## $at = 80980000 -/* 00348 80978188 C42487B4 */ lwc1 $f4, %lo(D_809787B4)($at) -/* 0034C 8097818C 44885000 */ mtc1 $t0, $f10 ## $f10 = 0.00 -/* 00350 80978190 24820050 */ addiu $v0, $a0, 0x0050 ## $v0 = 00000050 -/* 00354 80978194 3C018098 */ lui $at, %hi(D_809787B8) ## $at = 80980000 -/* 00358 80978198 46805420 */ cvt.s.w $f16, $f10 -/* 0035C 8097819C 46008482 */ mul.s $f18, $f16, $f0 -/* 00360 809781A0 46049180 */ add.s $f6, $f18, $f4 -/* 00364 809781A4 E4460000 */ swc1 $f6, 0x0000($v0) ## 00000050 -/* 00368 809781A8 8C690000 */ lw $t1, 0x0000($v1) ## 8015FA90 -/* 0036C 809781AC C43287B8 */ lwc1 $f18, %lo(D_809787B8)($at) -/* 00370 809781B0 3C018098 */ lui $at, %hi(D_809787BC) ## $at = 80980000 -/* 00374 809781B4 852A1470 */ lh $t2, 0x1470($t1) ## 00001470 -/* 00378 809781B8 448A4000 */ mtc1 $t2, $f8 ## $f8 = 0.00 -/* 0037C 809781BC 00000000 */ nop -/* 00380 809781C0 468042A0 */ cvt.s.w $f10, $f8 -/* 00384 809781C4 46005402 */ mul.s $f16, $f10, $f0 -/* 00388 809781C8 46128100 */ add.s $f4, $f16, $f18 -/* 0038C 809781CC E4440004 */ swc1 $f4, 0x0004($v0) ## 00000054 -/* 00390 809781D0 8C6B0000 */ lw $t3, 0x0000($v1) ## 8015FA90 -/* 00394 809781D4 C43087BC */ lwc1 $f16, %lo(D_809787BC)($at) -/* 00398 809781D8 856C1472 */ lh $t4, 0x1472($t3) ## 00001472 -/* 0039C 809781DC 448C3000 */ mtc1 $t4, $f6 ## $f6 = 0.00 -/* 003A0 809781E0 00000000 */ nop -/* 003A4 809781E4 46803220 */ cvt.s.w $f8, $f6 -/* 003A8 809781E8 46004282 */ mul.s $f10, $f8, $f0 -/* 003AC 809781EC 46105480 */ add.s $f18, $f10, $f16 -/* 003B0 809781F0 E4520008 */ swc1 $f18, 0x0008($v0) ## 00000058 -/* 003B4 809781F4 03E00008 */ jr $ra -/* 003B8 809781F8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Geff/func_809781FC.s b/asm/non_matchings/overlays/actors/ovl_Demo_Geff/func_809781FC.s deleted file mode 100644 index 7a38c1bb10..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Geff/func_809781FC.s +++ /dev/null @@ -1,49 +0,0 @@ -glabel func_809781FC -/* 003BC 809781FC 8C8E0158 */ lw $t6, 0x0158($a0) ## 00000158 -/* 003C0 80978200 15C00025 */ bne $t6, $zero, .L80978298 -/* 003C4 80978204 00000000 */ nop -/* 003C8 80978208 8482001C */ lh $v0, 0x001C($a0) ## 0000001C -/* 003CC 8097820C 8CA31C64 */ lw $v1, 0x1C64($a1) ## 00001C64 -/* 003D0 80978210 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 003D4 80978214 10400007 */ beq $v0, $zero, .L80978234 -/* 003D8 80978218 24050174 */ addiu $a1, $zero, 0x0174 ## $a1 = 00000174 -/* 003DC 8097821C 10410005 */ beq $v0, $at, .L80978234 -/* 003E0 80978220 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 003E4 80978224 50410004 */ beql $v0, $at, .L80978238 -/* 003E8 80978228 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -/* 003EC 8097822C 10000002 */ beq $zero, $zero, .L80978238 -/* 003F0 80978230 24020002 */ addiu $v0, $zero, 0x0002 ## $v0 = 00000002 -.L80978234: -/* 003F4 80978234 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -.L80978238: -/* 003F8 80978238 10600017 */ beq $v1, $zero, .L80978298 -/* 003FC 8097823C 00000000 */ nop -/* 00400 80978240 846F0000 */ lh $t7, 0x0000($v1) ## 00000000 -.L80978244: -/* 00404 80978244 54AF0012 */ bnel $a1, $t7, .L80978290 -/* 00408 80978248 8C630124 */ lw $v1, 0x0124($v1) ## 00000124 -/* 0040C 8097824C 8478001C */ lh $t8, 0x001C($v1) ## 0000001C -/* 00410 80978250 5458000F */ bnel $v0, $t8, .L80978290 -/* 00414 80978254 8C630124 */ lw $v1, 0x0124($v1) ## 00000124 -/* 00418 80978258 C4840024 */ lwc1 $f4, 0x0024($a0) ## 00000024 -/* 0041C 8097825C C4660024 */ lwc1 $f6, 0x0024($v1) ## 00000024 -/* 00420 80978260 C48A0028 */ lwc1 $f10, 0x0028($a0) ## 00000028 -/* 00424 80978264 46062201 */ sub.s $f8, $f4, $f6 -/* 00428 80978268 C484002C */ lwc1 $f4, 0x002C($a0) ## 0000002C -/* 0042C 8097826C E488015C */ swc1 $f8, 0x015C($a0) ## 0000015C -/* 00430 80978270 C4700028 */ lwc1 $f16, 0x0028($v1) ## 00000028 -/* 00434 80978274 46105481 */ sub.s $f18, $f10, $f16 -/* 00438 80978278 E4920160 */ swc1 $f18, 0x0160($a0) ## 00000160 -/* 0043C 8097827C C466002C */ lwc1 $f6, 0x002C($v1) ## 0000002C -/* 00440 80978280 AC830158 */ sw $v1, 0x0158($a0) ## 00000158 -/* 00444 80978284 46062201 */ sub.s $f8, $f4, $f6 -/* 00448 80978288 E4880164 */ swc1 $f8, 0x0164($a0) ## 00000164 -/* 0044C 8097828C 8C630124 */ lw $v1, 0x0124($v1) ## 00000124 -.L80978290: -/* 00450 80978290 5460FFEC */ bnel $v1, $zero, .L80978244 -/* 00454 80978294 846F0000 */ lh $t7, 0x0000($v1) ## 00000000 -.L80978298: -/* 00458 80978298 03E00008 */ jr $ra -/* 0045C 8097829C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Geff/func_809782A0.s b/asm/non_matchings/overlays/actors/ovl_Demo_Geff/func_809782A0.s deleted file mode 100644 index f30ee56636..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Geff/func_809782A0.s +++ /dev/null @@ -1,30 +0,0 @@ -glabel func_809782A0 -/* 00460 809782A0 AFA50004 */ sw $a1, 0x0004($sp) -/* 00464 809782A4 8C820158 */ lw $v0, 0x0158($a0) ## 00000158 -/* 00468 809782A8 8483001C */ lh $v1, 0x001C($a0) ## 0000001C -/* 0046C 809782AC 24010006 */ addiu $at, $zero, 0x0006 ## $at = 00000006 -/* 00470 809782B0 10400013 */ beq $v0, $zero, .L80978300 -/* 00474 809782B4 00000000 */ nop -/* 00478 809782B8 10610011 */ beq $v1, $at, .L80978300 -/* 0047C 809782BC 24010007 */ addiu $at, $zero, 0x0007 ## $at = 00000007 -/* 00480 809782C0 1061000F */ beq $v1, $at, .L80978300 -/* 00484 809782C4 24010008 */ addiu $at, $zero, 0x0008 ## $at = 00000008 -/* 00488 809782C8 1061000D */ beq $v1, $at, .L80978300 -/* 0048C 809782CC 00000000 */ nop -/* 00490 809782D0 C4440024 */ lwc1 $f4, 0x0024($v0) ## 00000024 -/* 00494 809782D4 C486015C */ lwc1 $f6, 0x015C($a0) ## 0000015C -/* 00498 809782D8 C4900160 */ lwc1 $f16, 0x0160($a0) ## 00000160 -/* 0049C 809782DC 46062200 */ add.s $f8, $f4, $f6 -/* 004A0 809782E0 C4860164 */ lwc1 $f6, 0x0164($a0) ## 00000164 -/* 004A4 809782E4 E4880024 */ swc1 $f8, 0x0024($a0) ## 00000024 -/* 004A8 809782E8 C44A0028 */ lwc1 $f10, 0x0028($v0) ## 00000028 -/* 004AC 809782EC 46105480 */ add.s $f18, $f10, $f16 -/* 004B0 809782F0 E4920028 */ swc1 $f18, 0x0028($a0) ## 00000028 -/* 004B4 809782F4 C444002C */ lwc1 $f4, 0x002C($v0) ## 0000002C -/* 004B8 809782F8 46062200 */ add.s $f8, $f4, $f6 -/* 004BC 809782FC E488002C */ swc1 $f8, 0x002C($a0) ## 0000002C -.L80978300: -/* 004C0 80978300 03E00008 */ jr $ra -/* 004C4 80978304 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Geff/func_80978308.s b/asm/non_matchings/overlays/actors/ovl_Demo_Geff/func_80978308.s deleted file mode 100644 index 50ebfe6a12..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Geff/func_80978308.s +++ /dev/null @@ -1,18 +0,0 @@ -glabel func_80978308 -/* 004C8 80978308 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 004CC 8097830C AFBF0014 */ sw $ra, 0x0014($sp) -/* 004D0 80978310 AFA40018 */ sw $a0, 0x0018($sp) -/* 004D4 80978314 0C25E07F */ jal func_809781FC -/* 004D8 80978318 AFA5001C */ sw $a1, 0x001C($sp) -/* 004DC 8097831C 8FA40018 */ lw $a0, 0x0018($sp) -/* 004E0 80978320 0C25E0A8 */ jal func_809782A0 -/* 004E4 80978324 8FA5001C */ lw $a1, 0x001C($sp) -/* 004E8 80978328 8FA40018 */ lw $a0, 0x0018($sp) -/* 004EC 8097832C 0C25E00C */ jal func_80978030 -/* 004F0 80978330 8FA5001C */ lw $a1, 0x001C($sp) -/* 004F4 80978334 8FBF0014 */ lw $ra, 0x0014($sp) -/* 004F8 80978338 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 004FC 8097833C 03E00008 */ jr $ra -/* 00500 80978340 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Geff/func_80978344.s b/asm/non_matchings/overlays/actors/ovl_Demo_Geff/func_80978344.s deleted file mode 100644 index 24f6c6256e..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Geff/func_80978344.s +++ /dev/null @@ -1,14 +0,0 @@ -glabel func_80978344 -/* 00504 80978344 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00508 80978348 AFA40018 */ sw $a0, 0x0018($sp) -/* 0050C 8097834C 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 00510 80978350 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00514 80978354 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 00518 80978358 0C25DFAA */ jal func_80977EA8 -/* 0051C 8097835C 24A50EA0 */ addiu $a1, $a1, 0x0EA0 ## $a1 = 06000EA0 -/* 00520 80978360 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00524 80978364 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00528 80978368 03E00008 */ jr $ra -/* 0052C 8097836C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Geff/func_80978370.s b/asm/non_matchings/overlays/actors/ovl_Demo_Geff/func_80978370.s deleted file mode 100644 index fa79bc57a7..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Geff/func_80978370.s +++ /dev/null @@ -1,32 +0,0 @@ -glabel func_80978370 -/* 00530 80978370 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00534 80978374 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00538 80978378 8486001C */ lh $a2, 0x001C($a0) ## 0000001C -/* 0053C 8097837C 3C028098 */ lui $v0, %hi(D_80978584) ## $v0 = 80980000 -/* 00540 80978380 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 -/* 00544 80978384 00067080 */ sll $t6, $a2, 2 -/* 00548 80978388 004E1021 */ addu $v0, $v0, $t6 -/* 0054C 8097838C 8C428584 */ lw $v0, %lo(D_80978584)($v0) -/* 00550 80978390 3C048098 */ lui $a0, %hi(D_80978680) ## $a0 = 80980000 -/* 00554 80978394 24848680 */ addiu $a0, $a0, %lo(D_80978680) ## $a0 = 80978680 -/* 00558 80978398 14400008 */ bne $v0, $zero, .L809783BC -/* 0055C 8097839C 00000000 */ nop -/* 00560 809783A0 00C02825 */ or $a1, $a2, $zero ## $a1 = 00000000 -/* 00564 809783A4 0C00084C */ jal osSyncPrintf - -/* 00568 809783A8 AFA70018 */ sw $a3, 0x0018($sp) -/* 0056C 809783AC 0C00B55C */ jal Actor_Kill - -/* 00570 809783B0 8FA40018 */ lw $a0, 0x0018($sp) -/* 00574 809783B4 10000004 */ beq $zero, $zero, .L809783C8 -/* 00578 809783B8 8FBF0014 */ lw $ra, 0x0014($sp) -.L809783BC: -/* 0057C 809783BC 0040F809 */ jalr $ra, $v0 -/* 00580 809783C0 00E02025 */ or $a0, $a3, $zero ## $a0 = 00000000 -/* 00584 809783C4 8FBF0014 */ lw $ra, 0x0014($sp) -.L809783C8: -/* 00588 809783C8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 0058C 809783CC 03E00008 */ jr $ra -/* 00590 809783D0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Geff/func_809783D4.s b/asm/non_matchings/overlays/actors/ovl_Demo_Geff/func_809783D4.s deleted file mode 100644 index 2a2cbdeb76..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Geff/func_809783D4.s +++ /dev/null @@ -1,51 +0,0 @@ -glabel func_809783D4 -/* 00594 809783D4 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 00598 809783D8 AFBF0014 */ sw $ra, 0x0014($sp) -/* 0059C 809783DC AFA40038 */ sw $a0, 0x0038($sp) -/* 005A0 809783E0 AFA5003C */ sw $a1, 0x003C($sp) -/* 005A4 809783E4 8486001C */ lh $a2, 0x001C($a0) ## 0000001C -/* 005A8 809783E8 8FA4003C */ lw $a0, 0x003C($sp) -/* 005AC 809783EC 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 005B0 809783F0 3C058098 */ lui $a1, %hi(D_80978570) ## $a1 = 80980000 -/* 005B4 809783F4 342117A4 */ ori $at, $at, 0x17A4 ## $at = 000117A4 -/* 005B8 809783F8 00067840 */ sll $t7, $a2, 1 -/* 005BC 809783FC 00AF2821 */ addu $a1, $a1, $t7 -/* 005C0 80978400 00812021 */ addu $a0, $a0, $at -/* 005C4 80978404 84A58570 */ lh $a1, %lo(D_80978570)($a1) -/* 005C8 80978408 AFA4001C */ sw $a0, 0x001C($sp) -/* 005CC 8097840C 0C02604B */ jal Object_GetIndex - ## ObjectIndex -/* 005D0 80978410 AFA6002C */ sw $a2, 0x002C($sp) -/* 005D4 80978414 8FA4001C */ lw $a0, 0x001C($sp) -/* 005D8 80978418 8FA6002C */ lw $a2, 0x002C($sp) -/* 005DC 8097841C 04410009 */ bgez $v0, .L80978444 -/* 005E0 80978420 00403825 */ or $a3, $v0, $zero ## $a3 = 00000000 -/* 005E4 80978424 3C048098 */ lui $a0, %hi(D_809786C4) ## $a0 = 80980000 -/* 005E8 80978428 248486C4 */ addiu $a0, $a0, %lo(D_809786C4) ## $a0 = 809786C4 -/* 005EC 8097842C 0C00084C */ jal osSyncPrintf - -/* 005F0 80978430 00C02825 */ or $a1, $a2, $zero ## $a1 = 00000000 -/* 005F4 80978434 0C00B55C */ jal Actor_Kill - -/* 005F8 80978438 8FA40038 */ lw $a0, 0x0038($sp) -/* 005FC 8097843C 1000000B */ beq $zero, $zero, .L8097846C -/* 00600 80978440 8FBF0014 */ lw $ra, 0x0014($sp) -.L80978444: -/* 00604 80978444 00E02825 */ or $a1, $a3, $zero ## $a1 = 00000000 -/* 00608 80978448 0C026062 */ jal Object_IsLoaded - -/* 0060C 8097844C AFA70024 */ sw $a3, 0x0024($sp) -/* 00610 80978450 10400005 */ beq $v0, $zero, .L80978468 -/* 00614 80978454 8FA70024 */ lw $a3, 0x0024($sp) -/* 00618 80978458 8FA40038 */ lw $a0, 0x0038($sp) -/* 0061C 8097845C AC870154 */ sw $a3, 0x0154($a0) ## 00000154 -/* 00620 80978460 0C25E0DC */ jal func_80978370 -/* 00624 80978464 8FA5003C */ lw $a1, 0x003C($sp) -.L80978468: -/* 00628 80978468 8FBF0014 */ lw $ra, 0x0014($sp) -.L8097846C: -/* 0062C 8097846C 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 -/* 00630 80978470 03E00008 */ jr $ra -/* 00634 80978474 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Geff/func_809784D4.s b/asm/non_matchings/overlays/actors/ovl_Demo_Geff/func_809784D4.s deleted file mode 100644 index 6a177148ec..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Geff/func_809784D4.s +++ /dev/null @@ -1,6 +0,0 @@ -glabel func_809784D4 -/* 00694 809784D4 AFA40000 */ sw $a0, 0x0000($sp) -/* 00698 809784D8 03E00008 */ jr $ra -/* 0069C 809784DC AFA50004 */ sw $a1, 0x0004($sp) - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_80979030.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_80979030.s index b94396e279..8c60654399 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_80979030.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_80979030.s @@ -14,7 +14,7 @@ glabel func_80979030 /* 00730 80979060 27A40030 */ addiu $a0, $sp, 0x0030 ## $a0 = FFFFFFE8 /* 00734 80979064 8CB00000 */ lw $s0, 0x0000($a1) ## 00000000 /* 00738 80979068 2407048B */ addiu $a3, $zero, 0x048B ## $a3 = 0000048B -/* 0073C 8097906C 0C031AB1 */ jal func_800C6AC4 +/* 0073C 8097906C 0C031AB1 */ jal Graph_OpenDisps /* 00740 80979070 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 00744 80979074 0C024F46 */ jal func_80093D18 /* 00748 80979078 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 @@ -51,7 +51,7 @@ glabel func_80979030 /* 007C4 809790F4 AE0C02C0 */ sw $t4, 0x02C0($s0) ## 000002C0 /* 007C8 809790F8 24070491 */ addiu $a3, $zero, 0x0491 ## $a3 = 00000491 /* 007CC 809790FC AC4E0004 */ sw $t6, 0x0004($v0) ## 00000004 -/* 007D0 80979100 0C031AD5 */ jal func_800C6B54 +/* 007D0 80979100 0C031AD5 */ jal Graph_CloseDisps /* 007D4 80979104 AC4D0000 */ sw $t5, 0x0000($v0) ## 00000000 .L80979108: /* 007D8 80979108 8FBF001C */ lw $ra, 0x001C($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097911C.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097911C.s index d8a4588c08..017026230f 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097911C.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097911C.s @@ -1,42 +1,42 @@ glabel func_8097911C /* 007EC 8097911C 27BDFFA0 */ addiu $sp, $sp, 0xFFA0 ## $sp = FFFFFFA0 -/* 007F0 80979120 AFBF001C */ sw $ra, 0x001C($sp) -/* 007F4 80979124 AFB00018 */ sw $s0, 0x0018($sp) -/* 007F8 80979128 AFA50064 */ sw $a1, 0x0064($sp) -/* 007FC 8097912C AFA60068 */ sw $a2, 0x0068($sp) +/* 007F0 80979120 AFBF001C */ sw $ra, 0x001C($sp) +/* 007F4 80979124 AFB00018 */ sw $s0, 0x0018($sp) +/* 007F8 80979128 AFA50064 */ sw $a1, 0x0064($sp) +/* 007FC 8097912C AFA60068 */ sw $a2, 0x0068($sp) /* 00800 80979130 848E016C */ lh $t6, 0x016C($a0) ## 0000016C -/* 00804 80979134 A7AE0056 */ sh $t6, 0x0056($sp) +/* 00804 80979134 A7AE0056 */ sh $t6, 0x0056($sp) /* 00808 80979138 848F016E */ lh $t7, 0x016E($a0) ## 0000016E -/* 0080C 8097913C A7AF0054 */ sh $t7, 0x0054($sp) +/* 0080C 8097913C A7AF0054 */ sh $t7, 0x0054($sp) /* 00810 80979140 84980170 */ lh $t8, 0x0170($a0) ## 00000170 -/* 00814 80979144 A7B80052 */ sh $t8, 0x0052($sp) +/* 00814 80979144 A7B80052 */ sh $t8, 0x0052($sp) /* 00818 80979148 8CB00000 */ lw $s0, 0x0000($a1) ## 00000000 /* 0081C 8097914C 24050040 */ addiu $a1, $zero, 0x0040 ## $a1 = 00000040 /* 00820 80979150 0C031A73 */ jal Graph_Alloc - + /* 00824 80979154 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 00828 80979158 3C068098 */ lui $a2, %hi(D_8097C020) ## $a2 = 80980000 -/* 0082C 8097915C AFA20048 */ sw $v0, 0x0048($sp) +/* 0082C 8097915C AFA20048 */ sw $v0, 0x0048($sp) /* 00830 80979160 24C6C020 */ addiu $a2, $a2, %lo(D_8097C020) ## $a2 = 8097C020 /* 00834 80979164 27A40034 */ addiu $a0, $sp, 0x0034 ## $a0 = FFFFFFD4 /* 00838 80979168 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 0083C 8097916C 0C031AB1 */ jal func_800C6AC4 +/* 0083C 8097916C 0C031AB1 */ jal Graph_OpenDisps /* 00840 80979170 240704A3 */ addiu $a3, $zero, 0x04A3 ## $a3 = 000004A3 -/* 00844 80979174 0C034213 */ jal Matrix_Push +/* 00844 80979174 0C034213 */ jal Matrix_Push /* 00848 80979178 00000000 */ nop -/* 0084C 8097917C 87A40056 */ lh $a0, 0x0056($sp) -/* 00850 80979180 87A50054 */ lh $a1, 0x0054($sp) -/* 00854 80979184 87A60052 */ lh $a2, 0x0052($sp) -/* 00858 80979188 0C034421 */ jal Matrix_RotateXYZ +/* 0084C 8097917C 87A40056 */ lh $a0, 0x0056($sp) +/* 00850 80979180 87A50054 */ lh $a1, 0x0054($sp) +/* 00854 80979184 87A60052 */ lh $a2, 0x0052($sp) +/* 00858 80979188 0C034421 */ jal Matrix_RotateZYX /* 0085C 8097918C 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 /* 00860 80979190 3C058098 */ lui $a1, %hi(D_8097C030) ## $a1 = 80980000 /* 00864 80979194 24A5C030 */ addiu $a1, $a1, %lo(D_8097C030) ## $a1 = 8097C030 -/* 00868 80979198 8FA40048 */ lw $a0, 0x0048($sp) -/* 0086C 8097919C 0C034695 */ jal Matrix_ToMtx +/* 00868 80979198 8FA40048 */ lw $a0, 0x0048($sp) +/* 0086C 8097919C 0C034695 */ jal Matrix_ToMtx /* 00870 809791A0 240604A9 */ addiu $a2, $zero, 0x04A9 ## $a2 = 000004A9 -/* 00874 809791A4 0C034221 */ jal Matrix_Pull +/* 00874 809791A4 0C034221 */ jal Matrix_Pull /* 00878 809791A8 00000000 */ nop -/* 0087C 809791AC 0C024F46 */ jal func_80093D18 +/* 0087C 809791AC 0C024F46 */ jal func_80093D18 /* 00880 809791B0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 00884 809791B4 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 /* 00888 809791B8 3C09DA38 */ lui $t1, 0xDA38 ## $t1 = DA380000 @@ -44,7 +44,7 @@ glabel func_8097911C /* 00890 809791C0 24480008 */ addiu $t0, $v0, 0x0008 ## $t0 = 00000008 /* 00894 809791C4 AE0802C0 */ sw $t0, 0x02C0($s0) ## 000002C0 /* 00898 809791C8 AC490000 */ sw $t1, 0x0000($v0) ## 00000000 -/* 0089C 809791CC 8FAA0048 */ lw $t2, 0x0048($sp) +/* 0089C 809791CC 8FAA0048 */ lw $t2, 0x0048($sp) /* 008A0 809791D0 3C0CDE00 */ lui $t4, 0xDE00 ## $t4 = DE000000 /* 008A4 809791D4 3C0FD838 */ lui $t7, 0xD838 ## $t7 = D8380000 /* 008A8 809791D8 AC4A0004 */ sw $t2, 0x0004($v0) ## 00000004 @@ -54,7 +54,7 @@ glabel func_8097911C /* 008B8 809791E8 244B0008 */ addiu $t3, $v0, 0x0008 ## $t3 = 00000008 /* 008BC 809791EC AE0B02C0 */ sw $t3, 0x02C0($s0) ## 000002C0 /* 008C0 809791F0 AC4C0000 */ sw $t4, 0x0000($v0) ## 00000000 -/* 008C4 809791F4 8FAD0068 */ lw $t5, 0x0068($sp) +/* 008C4 809791F4 8FAD0068 */ lw $t5, 0x0068($sp) /* 008C8 809791F8 3C068098 */ lui $a2, %hi(D_8097C040) ## $a2 = 80980000 /* 008CC 809791FC 24C6C040 */ addiu $a2, $a2, %lo(D_8097C040) ## $a2 = 8097C040 /* 008D0 80979200 AC4D0004 */ sw $t5, 0x0004($v0) ## 00000004 @@ -65,12 +65,12 @@ glabel func_8097911C /* 008E4 80979214 AE0E02C0 */ sw $t6, 0x02C0($s0) ## 000002C0 /* 008E8 80979218 240704B1 */ addiu $a3, $zero, 0x04B1 ## $a3 = 000004B1 /* 008EC 8097921C AC580004 */ sw $t8, 0x0004($v0) ## 00000004 -/* 008F0 80979220 0C031AD5 */ jal func_800C6B54 +/* 008F0 80979220 0C031AD5 */ jal Graph_CloseDisps /* 008F4 80979224 AC4F0000 */ sw $t7, 0x0000($v0) ## 00000000 -/* 008F8 80979228 8FBF001C */ lw $ra, 0x001C($sp) -/* 008FC 8097922C 8FB00018 */ lw $s0, 0x0018($sp) +/* 008F8 80979228 8FBF001C */ lw $ra, 0x001C($sp) +/* 008FC 8097922C 8FB00018 */ lw $s0, 0x0018($sp) /* 00900 80979230 27BD0060 */ addiu $sp, $sp, 0x0060 ## $sp = 00000000 -/* 00904 80979234 03E00008 */ jr $ra +/* 00904 80979234 03E00008 */ jr $ra /* 00908 80979238 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_80979860.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_80979860.s index 8a2669aaf5..333ee820d6 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_80979860.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_80979860.s @@ -450,7 +450,7 @@ glabel L80979DE0 /* 01608 80979F38 45030014 */ bc1tl .L80979F8C /* 0160C 80979F3C 8FBF001C */ lw $ra, 0x001C($sp) .L80979F40: -/* 01610 80979F40 0C03F494 */ jal func_800FD250 +/* 01610 80979F40 0C03F494 */ jal Math_atan2f /* 01614 80979F44 00000000 */ nop /* 01618 80979F48 3C018098 */ lui $at, %hi(D_8097C220) ## $at = 80980000 /* 0161C 80979F4C C428C220 */ lwc1 $f8, %lo(D_8097C220)($at) @@ -460,7 +460,7 @@ glabel L80979DE0 /* 0162C 80979F5C 1000000A */ beq $zero, $zero, .L80979F88 /* 01630 80979F60 A6090032 */ sh $t1, 0x0032($s0) ## 00000032 .L80979F64: -/* 01634 80979F64 0C03F494 */ jal func_800FD250 +/* 01634 80979F64 0C03F494 */ jal Math_atan2f /* 01638 80979F68 00000000 */ nop /* 0163C 80979F6C 3C018098 */ lui $at, %hi(D_8097C224) ## $at = 80980000 /* 01640 80979F70 C432C224 */ lwc1 $f18, %lo(D_8097C224)($at) diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Go/func_8097CB0C.s b/asm/non_matchings/overlays/actors/ovl_Demo_Go/func_8097CB0C.s deleted file mode 100644 index d3cd52a91b..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Go/func_8097CB0C.s +++ /dev/null @@ -1,67 +0,0 @@ -glabel func_8097CB0C -/* 0029C 8097CB0C 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 -/* 002A0 8097CB10 AFBF0014 */ sw $ra, 0x0014($sp) -/* 002A4 8097CB14 AFA40040 */ sw $a0, 0x0040($sp) -/* 002A8 8097CB18 90AE1D6C */ lbu $t6, 0x1D6C($a1) ## 00001D6C -/* 002AC 8097CB1C 51C00037 */ beql $t6, $zero, .L8097CBFC -/* 002B0 8097CB20 8FBF0014 */ lw $ra, 0x0014($sp) -/* 002B4 8097CB24 0C25F21C */ jal func_8097C870 -/* 002B8 8097CB28 AFA50044 */ sw $a1, 0x0044($sp) -/* 002BC 8097CB2C 8FA50044 */ lw $a1, 0x0044($sp) -/* 002C0 8097CB30 00027880 */ sll $t7, $v0, 2 -/* 002C4 8097CB34 24A71D64 */ addiu $a3, $a1, 0x1D64 ## $a3 = 00001D64 -/* 002C8 8097CB38 00EFC021 */ addu $t8, $a3, $t7 -/* 002CC 8097CB3C 8F030028 */ lw $v1, 0x0028($t8) ## 00000028 -/* 002D0 8097CB40 5060002E */ beql $v1, $zero, .L8097CBFC -/* 002D4 8097CB44 8FBF0014 */ lw $ra, 0x0014($sp) -/* 002D8 8097CB48 94640004 */ lhu $a0, 0x0004($v1) ## 00000004 -/* 002DC 8097CB4C 94650002 */ lhu $a1, 0x0002($v1) ## 00000002 -/* 002E0 8097CB50 94E60010 */ lhu $a2, 0x0010($a3) ## 00001D74 -/* 002E4 8097CB54 0C01BE4F */ jal func_8006F93C -/* 002E8 8097CB58 AFA30030 */ sw $v1, 0x0030($sp) -/* 002EC 8097CB5C 8FA30030 */ lw $v1, 0x0030($sp) -/* 002F0 8097CB60 8FA50040 */ lw $a1, 0x0040($sp) -/* 002F4 8097CB64 8C680010 */ lw $t0, 0x0010($v1) ## 00000010 -/* 002F8 8097CB68 8C79000C */ lw $t9, 0x000C($v1) ## 0000000C -/* 002FC 8097CB6C 8C6A0018 */ lw $t2, 0x0018($v1) ## 00000018 -/* 00300 8097CB70 8C690014 */ lw $t1, 0x0014($v1) ## 00000014 -/* 00304 8097CB74 44883000 */ mtc1 $t0, $f6 ## $f6 = 0.00 -/* 00308 8097CB78 8C6C0020 */ lw $t4, 0x0020($v1) ## 00000020 -/* 0030C 8097CB7C 44992000 */ mtc1 $t9, $f4 ## $f4 = 0.00 -/* 00310 8097CB80 8C6B001C */ lw $t3, 0x001C($v1) ## 0000001C -/* 00314 8097CB84 448A5000 */ mtc1 $t2, $f10 ## $f10 = 0.00 -/* 00318 8097CB88 46803320 */ cvt.s.w $f12, $f6 -/* 0031C 8097CB8C 44894000 */ mtc1 $t1, $f8 ## $f8 = 0.00 -/* 00320 8097CB90 448C3000 */ mtc1 $t4, $f6 ## $f6 = 0.00 -/* 00324 8097CB94 24A20024 */ addiu $v0, $a1, 0x0024 ## $v0 = 00000024 -/* 00328 8097CB98 468020A0 */ cvt.s.w $f2, $f4 -/* 0032C 8097CB9C 448B2000 */ mtc1 $t3, $f4 ## $f4 = 0.00 -/* 00330 8097CBA0 46805420 */ cvt.s.w $f16, $f10 -/* 00334 8097CBA4 468043A0 */ cvt.s.w $f14, $f8 -/* 00338 8097CBA8 46803220 */ cvt.s.w $f8, $f6 -/* 0033C 8097CBAC 468024A0 */ cvt.s.w $f18, $f4 -/* 00340 8097CBB0 E7A80018 */ swc1 $f8, 0x0018($sp) -/* 00344 8097CBB4 46028281 */ sub.s $f10, $f16, $f2 -/* 00348 8097CBB8 460C9201 */ sub.s $f8, $f18, $f12 -/* 0034C 8097CBBC 46005102 */ mul.s $f4, $f10, $f0 -/* 00350 8097CBC0 00000000 */ nop -/* 00354 8097CBC4 46004282 */ mul.s $f10, $f8, $f0 -/* 00358 8097CBC8 46022180 */ add.s $f6, $f4, $f2 -/* 0035C 8097CBCC 460C5100 */ add.s $f4, $f10, $f12 -/* 00360 8097CBD0 E4460000 */ swc1 $f6, 0x0000($v0) ## 00000024 -/* 00364 8097CBD4 E4440004 */ swc1 $f4, 0x0004($v0) ## 00000028 -/* 00368 8097CBD8 C7A60018 */ lwc1 $f6, 0x0018($sp) -/* 0036C 8097CBDC 460E3201 */ sub.s $f8, $f6, $f14 -/* 00370 8097CBE0 46004282 */ mul.s $f10, $f8, $f0 -/* 00374 8097CBE4 460E5100 */ add.s $f4, $f10, $f14 -/* 00378 8097CBE8 E4440008 */ swc1 $f4, 0x0008($v0) ## 0000002C -/* 0037C 8097CBEC 84640008 */ lh $a0, 0x0008($v1) ## 00000008 -/* 00380 8097CBF0 A4A400B6 */ sh $a0, 0x00B6($a1) ## 000000B6 -/* 00384 8097CBF4 A444000E */ sh $a0, 0x000E($v0) ## 00000032 -/* 00388 8097CBF8 8FBF0014 */ lw $ra, 0x0014($sp) -.L8097CBFC: -/* 0038C 8097CBFC 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 -/* 00390 8097CC00 03E00008 */ jr $ra -/* 00394 8097CC04 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Go/func_8097D29C.s b/asm/non_matchings/overlays/actors/ovl_Demo_Go/func_8097D29C.s deleted file mode 100644 index c0cb0a0e49..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Go/func_8097D29C.s +++ /dev/null @@ -1,95 +0,0 @@ -.rdata - -glabel D_8097D4CC - .asciz "../z_demo_go.c" - .balign 4 - -glabel D_8097D4DC - .asciz "../z_demo_go.c" - .balign 4 - -.text - -glabel func_8097D29C -/* 00A2C 8097D29C 27BDFFA0 */ addiu $sp, $sp, 0xFFA0 ## $sp = FFFFFFA0 -/* 00A30 8097D2A0 AFBF0024 */ sw $ra, 0x0024($sp) -/* 00A34 8097D2A4 AFA40060 */ sw $a0, 0x0060($sp) -/* 00A38 8097D2A8 AFA50064 */ sw $a1, 0x0064($sp) -/* 00A3C 8097D2AC 84820190 */ lh $v0, 0x0190($a0) ## 00000190 -/* 00A40 8097D2B0 3C188098 */ lui $t8, %hi(D_8097D440) ## $t8 = 80980000 -/* 00A44 8097D2B4 3C068098 */ lui $a2, %hi(D_8097D4CC) ## $a2 = 80980000 -/* 00A48 8097D2B8 00027880 */ sll $t7, $v0, 2 -/* 00A4C 8097D2BC 030FC021 */ addu $t8, $t8, $t7 -/* 00A50 8097D2C0 8F18D440 */ lw $t8, %lo(D_8097D440)($t8) -/* 00A54 8097D2C4 24C6D4CC */ addiu $a2, $a2, %lo(D_8097D4CC) ## $a2 = 8097D4CC -/* 00A58 8097D2C8 27A40038 */ addiu $a0, $sp, 0x0038 ## $a0 = FFFFFFD8 -/* 00A5C 8097D2CC AFB80050 */ sw $t8, 0x0050($sp) -/* 00A60 8097D2D0 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 -/* 00A64 8097D2D4 240702DC */ addiu $a3, $zero, 0x02DC ## $a3 = 000002DC -/* 00A68 8097D2D8 0C031AB1 */ jal func_800C6AC4 -/* 00A6C 8097D2DC AFA50048 */ sw $a1, 0x0048($sp) -/* 00A70 8097D2E0 8FA90064 */ lw $t1, 0x0064($sp) -/* 00A74 8097D2E4 0C024F46 */ jal func_80093D18 -/* 00A78 8097D2E8 8D240000 */ lw $a0, 0x0000($t1) ## 00000000 -/* 00A7C 8097D2EC 8FA80048 */ lw $t0, 0x0048($sp) -/* 00A80 8097D2F0 8FA40050 */ lw $a0, 0x0050($sp) -/* 00A84 8097D2F4 3C058016 */ lui $a1, 0x8016 ## $a1 = 80160000 -/* 00A88 8097D2F8 8D0302C0 */ lw $v1, 0x02C0($t0) ## 000002C0 -/* 00A8C 8097D2FC 00046100 */ sll $t4, $a0, 4 -/* 00A90 8097D300 000C6F02 */ srl $t5, $t4, 28 -/* 00A94 8097D304 3C0BDB06 */ lui $t3, 0xDB06 ## $t3 = DB060000 -/* 00A98 8097D308 246A0008 */ addiu $t2, $v1, 0x0008 ## $t2 = 00000008 -/* 00A9C 8097D30C 356B0020 */ ori $t3, $t3, 0x0020 ## $t3 = DB060020 -/* 00AA0 8097D310 000D7080 */ sll $t6, $t5, 2 -/* 00AA4 8097D314 24A56FA8 */ addiu $a1, $a1, 0x6FA8 ## $a1 = 80166FA8 -/* 00AA8 8097D318 AD0A02C0 */ sw $t2, 0x02C0($t0) ## 000002C0 -/* 00AAC 8097D31C 00AE7821 */ addu $t7, $a1, $t6 -/* 00AB0 8097D320 AC6B0000 */ sw $t3, 0x0000($v1) ## 00000000 -/* 00AB4 8097D324 8DF80000 */ lw $t8, 0x0000($t7) ## 00000000 -/* 00AB8 8097D328 3C0600FF */ lui $a2, 0x00FF ## $a2 = 00FF0000 -/* 00ABC 8097D32C 34C6FFFF */ ori $a2, $a2, 0xFFFF ## $a2 = 00FFFFFF -/* 00AC0 8097D330 0086C824 */ and $t9, $a0, $a2 -/* 00AC4 8097D334 3C078000 */ lui $a3, 0x8000 ## $a3 = 80000000 -/* 00AC8 8097D338 03194821 */ addu $t1, $t8, $t9 -/* 00ACC 8097D33C 01275021 */ addu $t2, $t1, $a3 -/* 00AD0 8097D340 AC6A0004 */ sw $t2, 0x0004($v1) ## 00000004 -/* 00AD4 8097D344 8D0302C0 */ lw $v1, 0x02C0($t0) ## 000002C0 -/* 00AD8 8097D348 3C040601 */ lui $a0, 0x0601 ## $a0 = 06010000 -/* 00ADC 8097D34C 2484E680 */ addiu $a0, $a0, 0xE680 ## $a0 = 0600E680 -/* 00AE0 8097D350 00046900 */ sll $t5, $a0, 4 -/* 00AE4 8097D354 000D7702 */ srl $t6, $t5, 28 -/* 00AE8 8097D358 3C0CDB06 */ lui $t4, 0xDB06 ## $t4 = DB060000 -/* 00AEC 8097D35C 246B0008 */ addiu $t3, $v1, 0x0008 ## $t3 = 00000008 -/* 00AF0 8097D360 358C0024 */ ori $t4, $t4, 0x0024 ## $t4 = DB060024 -/* 00AF4 8097D364 000E7880 */ sll $t7, $t6, 2 -/* 00AF8 8097D368 AD0B02C0 */ sw $t3, 0x02C0($t0) ## 000002C0 -/* 00AFC 8097D36C 00AFC021 */ addu $t8, $a1, $t7 -/* 00B00 8097D370 AC6C0000 */ sw $t4, 0x0000($v1) ## 00000000 -/* 00B04 8097D374 8F190000 */ lw $t9, 0x0000($t8) ## 00000000 -/* 00B08 8097D378 00864824 */ and $t1, $a0, $a2 -/* 00B0C 8097D37C 03295021 */ addu $t2, $t9, $t1 -/* 00B10 8097D380 01475821 */ addu $t3, $t2, $a3 -/* 00B14 8097D384 AC6B0004 */ sw $t3, 0x0004($v1) ## 00000004 -/* 00B18 8097D388 8FA30060 */ lw $v1, 0x0060($sp) -/* 00B1C 8097D38C 8FA40064 */ lw $a0, 0x0064($sp) -/* 00B20 8097D390 2462014C */ addiu $v0, $v1, 0x014C ## $v0 = 0000014C -/* 00B24 8097D394 8C450004 */ lw $a1, 0x0004($v0) ## 00000150 -/* 00B28 8097D398 8C460020 */ lw $a2, 0x0020($v0) ## 0000016C -/* 00B2C 8097D39C 90470002 */ lbu $a3, 0x0002($v0) ## 0000014E -/* 00B30 8097D3A0 AFA00014 */ sw $zero, 0x0014($sp) -/* 00B34 8097D3A4 AFA00010 */ sw $zero, 0x0010($sp) -/* 00B38 8097D3A8 0C0286B2 */ jal func_800A1AC8 -/* 00B3C 8097D3AC AFA30018 */ sw $v1, 0x0018($sp) -/* 00B40 8097D3B0 8FAC0064 */ lw $t4, 0x0064($sp) -/* 00B44 8097D3B4 3C068098 */ lui $a2, %hi(D_8097D4DC) ## $a2 = 80980000 -/* 00B48 8097D3B8 24C6D4DC */ addiu $a2, $a2, %lo(D_8097D4DC) ## $a2 = 8097D4DC -/* 00B4C 8097D3BC 27A40038 */ addiu $a0, $sp, 0x0038 ## $a0 = FFFFFFD8 -/* 00B50 8097D3C0 240702EA */ addiu $a3, $zero, 0x02EA ## $a3 = 000002EA -/* 00B54 8097D3C4 0C031AD5 */ jal func_800C6B54 -/* 00B58 8097D3C8 8D850000 */ lw $a1, 0x0000($t4) ## 00000000 -/* 00B5C 8097D3CC 8FBF0024 */ lw $ra, 0x0024($sp) -/* 00B60 8097D3D0 27BD0060 */ addiu $sp, $sp, 0x0060 ## $sp = 00000000 -/* 00B64 8097D3D4 03E00008 */ jr $ra -/* 00B68 8097D3D8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097F508.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097F508.s index 147cef1633..bbbbfd3d78 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097F508.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097F508.s @@ -44,7 +44,7 @@ glabel func_8097F508 /* 01F38 8097F5A8 27A40078 */ addiu $a0, $sp, 0x0078 ## $a0 = FFFFFFA0 /* 01F3C 8097F5AC 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 01F40 8097F5B0 240701CA */ addiu $a3, $zero, 0x01CA ## $a3 = 000001CA -/* 01F44 8097F5B4 0C031AB1 */ jal func_800C6AC4 +/* 01F44 8097F5B4 0C031AB1 */ jal Graph_OpenDisps /* 01F48 8097F5B8 E7A40098 */ swc1 $f4, 0x0098($sp) /* 01F4C 8097F5BC 0C01DE0D */ jal Math_Coss ## coss? @@ -134,7 +134,7 @@ glabel func_8097F508 /* 0208C 8097F6FC AFA80054 */ sw $t0, 0x0054($sp) /* 02090 8097F700 AFB90038 */ sw $t9, 0x0038($sp) /* 02094 8097F704 AFA20074 */ sw $v0, 0x0074($sp) -/* 02098 8097F708 0C02541A */ jal Draw_TwoTexScrollEnvColor +/* 02098 8097F708 0C02541A */ jal Gfx_TwoTexScrollEnvColor /* 0209C 8097F70C AFB80034 */ sw $t8, 0x0034($sp) /* 020A0 8097F710 8FA90074 */ lw $t1, 0x0074($sp) /* 020A4 8097F714 8FA80054 */ lw $t0, 0x0054($sp) @@ -172,7 +172,7 @@ glabel func_8097F508 /* 02124 8097F794 AFAF0038 */ sw $t7, 0x0038($sp) /* 02128 8097F798 AFA20070 */ sw $v0, 0x0070($sp) /* 0212C 8097F79C 24630188 */ addiu $v1, $v1, 0x0188 ## $v1 = 00000188 -/* 02130 8097F7A0 0C02541A */ jal Draw_TwoTexScrollEnvColor +/* 02130 8097F7A0 0C02541A */ jal Gfx_TwoTexScrollEnvColor /* 02134 8097F7A4 AFAE0034 */ sw $t6, 0x0034($sp) /* 02138 8097F7A8 8FA90070 */ lw $t1, 0x0070($sp) /* 0213C 8097F7AC 3C19DA38 */ lui $t9, 0xDA38 ## $t9 = DA380000 @@ -230,7 +230,7 @@ glabel func_8097F508 /* 0220C 8097F87C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 02210 8097F880 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 02214 8097F884 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 02218 8097F888 0C0253D0 */ jal Draw_TwoTexScroll +/* 02218 8097F888 0C0253D0 */ jal Gfx_TwoTexScroll /* 0221C 8097F88C AFA20060 */ sw $v0, 0x0060($sp) /* 02220 8097F890 8FA30060 */ lw $v1, 0x0060($sp) /* 02224 8097F894 3C0DDA38 */ lui $t5, 0xDA38 ## $t5 = DA380000 @@ -254,7 +254,7 @@ glabel func_8097F508 /* 0226C 8097F8DC 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 02270 8097F8E0 2407022D */ addiu $a3, $zero, 0x022D ## $a3 = 0000022D /* 02274 8097F8E4 AC590004 */ sw $t9, 0x0004($v0) ## 00000004 -/* 02278 8097F8E8 0C031AD5 */ jal func_800C6B54 +/* 02278 8097F8E8 0C031AD5 */ jal Graph_CloseDisps /* 0227C 8097F8EC AC580000 */ sw $t8, 0x0000($v0) ## 00000000 /* 02280 8097F8F0 8FBF004C */ lw $ra, 0x004C($sp) /* 02284 8097F8F4 8FB00048 */ lw $s0, 0x0048($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097FF9C.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097FF9C.s index a04d5cf734..26588eabc8 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097FF9C.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_8097FF9C.s @@ -9,7 +9,7 @@ glabel func_8097FF9C /* 02948 8097FFB8 24C627C8 */ addiu $a2, $a2, %lo(D_809827C8) ## $a2 = 809827C8 /* 0294C 8097FFBC 27A40064 */ addiu $a0, $sp, 0x0064 ## $a0 = FFFFFFDC /* 02950 8097FFC0 240701D6 */ addiu $a3, $zero, 0x01D6 ## $a3 = 000001D6 -/* 02954 8097FFC4 0C031AB1 */ jal func_800C6AC4 +/* 02954 8097FFC4 0C031AB1 */ jal Graph_OpenDisps /* 02958 8097FFC8 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 0295C 8097FFCC 0C024F46 */ jal func_80093D18 /* 02960 8097FFD0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 @@ -47,7 +47,7 @@ glabel func_8097FF9C /* 029E0 80980050 8C6B0008 */ lw $t3, 0x0008($v1) ## 00000180 /* 029E4 80980054 AFAC0038 */ sw $t4, 0x0038($sp) /* 029E8 80980058 AFA20060 */ sw $v0, 0x0060($sp) -/* 029EC 8098005C 0C02541A */ jal Draw_TwoTexScrollEnvColor +/* 029EC 8098005C 0C02541A */ jal Gfx_TwoTexScrollEnvColor /* 029F0 80980060 AFAB0034 */ sw $t3, 0x0034($sp) /* 029F4 80980064 8FA90060 */ lw $t1, 0x0060($sp) /* 029F8 80980068 3C0EDA38 */ lui $t6, 0xDA38 ## $t6 = DA380000 @@ -85,7 +85,7 @@ glabel func_8097FF9C /* 02A78 809800E8 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 02A7C 809800EC 240701E9 */ addiu $a3, $zero, 0x01E9 ## $a3 = 000001E9 /* 02A80 809800F0 AC4D0004 */ sw $t5, 0x0004($v0) ## 00000004 -/* 02A84 809800F4 0C031AD5 */ jal func_800C6B54 +/* 02A84 809800F4 0C031AD5 */ jal Graph_CloseDisps /* 02A88 809800F8 AC4C0000 */ sw $t4, 0x0000($v0) ## 00000000 /* 02A8C 809800FC 8FBF004C */ lw $ra, 0x004C($sp) /* 02A90 80980100 8FB00048 */ lw $s0, 0x0048($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_80980E24.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_80980E24.s index f68aa822a6..23aa674616 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_80980E24.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_80980E24.s @@ -9,7 +9,7 @@ glabel func_80980E24 /* 037D0 80980E40 24C62810 */ addiu $a2, $a2, %lo(D_80982810) ## $a2 = 80982810 /* 037D4 80980E44 27A40030 */ addiu $a0, $sp, 0x0030 ## $a0 = FFFFFFE8 /* 037D8 80980E48 24070402 */ addiu $a3, $zero, 0x0402 ## $a3 = 00000402 -/* 037DC 80980E4C 0C031AB1 */ jal func_800C6AC4 +/* 037DC 80980E4C 0C031AB1 */ jal Graph_OpenDisps /* 037E0 80980E50 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 037E4 80980E54 0C024F46 */ jal func_80093D18 /* 037E8 80980E58 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 @@ -47,7 +47,7 @@ glabel func_80980E24 /* 03868 80980ED8 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 0386C 80980EDC 24070408 */ addiu $a3, $zero, 0x0408 ## $a3 = 00000408 /* 03870 80980EE0 AC4C0004 */ sw $t4, 0x0004($v0) ## 00000004 -/* 03874 80980EE4 0C031AD5 */ jal func_800C6B54 +/* 03874 80980EE4 0C031AD5 */ jal Graph_CloseDisps /* 03878 80980EE8 AC4B0000 */ sw $t3, 0x0000($v0) ## 00000000 /* 0387C 80980EEC 8FBF001C */ lw $ra, 0x001C($sp) /* 03880 80980EF0 8FB00018 */ lw $s0, 0x0018($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_809811AC.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_809811AC.s index 18e1702b1e..5b52337e93 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_809811AC.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_809811AC.s @@ -46,7 +46,7 @@ glabel func_809811AC /* 03BE4 80981254 27A40030 */ addiu $a0, $sp, 0x0030 ## $a0 = FFFFFFA8 /* 03BE8 80981258 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 03BEC 8098125C 240700D9 */ addiu $a3, $zero, 0x00D9 ## $a3 = 000000D9 -/* 03BF0 80981260 0C031AB1 */ jal func_800C6AC4 +/* 03BF0 80981260 0C031AB1 */ jal Graph_OpenDisps /* 03BF4 80981264 E7A40044 */ swc1 $f4, 0x0044($sp) /* 03BF8 80981268 0C01DE0D */ jal Math_Coss ## coss? @@ -136,7 +136,7 @@ glabel func_809811AC /* 03D34 809813A4 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 03D38 809813A8 240700F6 */ addiu $a3, $zero, 0x00F6 ## $a3 = 000000F6 /* 03D3C 809813AC AC590004 */ sw $t9, 0x0004($v0) ## 00000004 -/* 03D40 809813B0 0C031AD5 */ jal func_800C6B54 +/* 03D40 809813B0 0C031AD5 */ jal Graph_CloseDisps /* 03D44 809813B4 AC580000 */ sw $t8, 0x0000($v0) ## 00000000 /* 03D48 809813B8 8FBF001C */ lw $ra, 0x001C($sp) .L809813BC: diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_80981694.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_80981694.s index 65f9fdf63d..61ec8460a8 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_80981694.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_80981694.s @@ -42,7 +42,7 @@ glabel func_80981694 /* 040BC 8098172C 27A40030 */ addiu $a0, $sp, 0x0030 ## $a0 = FFFFFFB0 /* 040C0 80981730 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 040C4 80981734 240700D4 */ addiu $a3, $zero, 0x00D4 ## $a3 = 000000D4 -/* 040C8 80981738 0C031AB1 */ jal func_800C6AC4 +/* 040C8 80981738 0C031AB1 */ jal Graph_OpenDisps /* 040CC 8098173C E7A40044 */ swc1 $f4, 0x0044($sp) /* 040D0 80981740 0C01DE0D */ jal Math_Coss ## coss? @@ -132,7 +132,7 @@ glabel func_80981694 /* 0420C 8098187C 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 04210 80981880 240700F1 */ addiu $a3, $zero, 0x00F1 ## $a3 = 000000F1 /* 04214 80981884 AC480004 */ sw $t0, 0x0004($v0) ## 00000004 -/* 04218 80981888 0C031AD5 */ jal func_800C6B54 +/* 04218 80981888 0C031AD5 */ jal Graph_CloseDisps /* 0421C 8098188C AC590000 */ sw $t9, 0x0000($v0) ## 00000000 /* 04220 80981890 8FBF001C */ lw $ra, 0x001C($sp) /* 04224 80981894 8FB00018 */ lw $s0, 0x0018($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_80981AA0.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_80981AA0.s index 05f1649ffb..cc0d827541 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_80981AA0.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_80981AA0.s @@ -41,7 +41,7 @@ glabel func_80981AA0 /* 044C4 80981B34 27A40034 */ addiu $a0, $sp, 0x0034 ## $a0 = FFFFFFB4 /* 044C8 80981B38 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 044CC 80981B3C 24070114 */ addiu $a3, $zero, 0x0114 ## $a3 = 00000114 -/* 044D0 80981B40 0C031AB1 */ jal func_800C6AC4 +/* 044D0 80981B40 0C031AB1 */ jal Graph_OpenDisps /* 044D4 80981B44 E7A40048 */ swc1 $f4, 0x0048($sp) /* 044D8 80981B48 0C01DE0D */ jal Math_Coss ## coss? @@ -124,7 +124,7 @@ glabel func_80981AA0 /* 045FC 80981C6C 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 04600 80981C70 24070133 */ addiu $a3, $zero, 0x0133 ## $a3 = 00000133 /* 04604 80981C74 AC590004 */ sw $t9, 0x0004($v0) ## 00000004 -/* 04608 80981C78 0C031AD5 */ jal func_800C6B54 +/* 04608 80981C78 0C031AD5 */ jal Graph_CloseDisps /* 0460C 80981C7C AC580000 */ sw $t8, 0x0000($v0) ## 00000000 /* 04610 80981C80 8FBF001C */ lw $ra, 0x001C($sp) /* 04614 80981C84 8FB00018 */ lw $s0, 0x0018($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_80981E84.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_80981E84.s index 1338b6db53..649ac670d6 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_80981E84.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_80981E84.s @@ -40,7 +40,7 @@ glabel func_80981E84 /* 048A4 80981F14 27A4002C */ addiu $a0, $sp, 0x002C ## $a0 = FFFFFFB4 /* 048A8 80981F18 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 048AC 80981F1C 24070088 */ addiu $a3, $zero, 0x0088 ## $a3 = 00000088 -/* 048B0 80981F20 0C031AB1 */ jal func_800C6AC4 +/* 048B0 80981F20 0C031AB1 */ jal Graph_OpenDisps /* 048B4 80981F24 E7A40040 */ swc1 $f4, 0x0040($sp) /* 048B8 80981F28 0C01DE0D */ jal Math_Coss ## coss? @@ -115,7 +115,7 @@ glabel func_80981E84 /* 049BC 8098202C 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 049C0 80982030 240700A0 */ addiu $a3, $zero, 0x00A0 ## $a3 = 000000A0 /* 049C4 80982034 AC6E0004 */ sw $t6, 0x0004($v1) ## 00000004 -/* 049C8 80982038 0C031AD5 */ jal func_800C6B54 +/* 049C8 80982038 0C031AD5 */ jal Graph_CloseDisps /* 049CC 8098203C AC6D0000 */ sw $t5, 0x0000($v1) ## 00000000 /* 049D0 80982040 8FBF001C */ lw $ra, 0x001C($sp) /* 049D4 80982044 8FB00018 */ lw $s0, 0x0018($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_80982244.s b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_80982244.s index 7c8d244906..2d66168225 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_80982244.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Gt/func_80982244.s @@ -41,7 +41,7 @@ glabel func_80982244 /* 04C68 809822D8 27A4002C */ addiu $a0, $sp, 0x002C ## $a0 = FFFFFFB4 /* 04C6C 809822DC 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 04C70 809822E0 24070089 */ addiu $a3, $zero, 0x0089 ## $a3 = 00000089 -/* 04C74 809822E4 0C031AB1 */ jal func_800C6AC4 +/* 04C74 809822E4 0C031AB1 */ jal Graph_OpenDisps /* 04C78 809822E8 E7A40040 */ swc1 $f4, 0x0040($sp) /* 04C7C 809822EC 0C01DE0D */ jal Math_Coss ## coss? @@ -116,7 +116,7 @@ glabel func_80982244 /* 04D80 809823F0 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 04D84 809823F4 240700A3 */ addiu $a3, $zero, 0x00A3 ## $a3 = 000000A3 /* 04D88 809823F8 AC6E0004 */ sw $t6, 0x0004($v1) ## 00000004 -/* 04D8C 809823FC 0C031AD5 */ jal func_800C6B54 +/* 04D8C 809823FC 0C031AD5 */ jal Graph_CloseDisps /* 04D90 80982400 AC6D0000 */ sw $t5, 0x0000($v1) ## 00000000 /* 04D94 80982404 8FBF001C */ lw $ra, 0x001C($sp) /* 04D98 80982408 8FB00018 */ lw $s0, 0x0018($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ik/func_809833D8.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ik/func_809833D8.s index 1b887ef802..eb0de7523a 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ik/func_809833D8.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Ik/func_809833D8.s @@ -1,19 +1,19 @@ glabel func_809833D8 /* 000D8 809833D8 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 000DC 809833DC AFBF0014 */ sw $ra, 0x0014($sp) -/* 000E0 809833E0 AFA40018 */ sw $a0, 0x0018($sp) -/* 000E4 809833E4 AFA5001C */ sw $a1, 0x001C($sp) +/* 000DC 809833DC AFBF0014 */ sw $ra, 0x0014($sp) +/* 000E0 809833E0 AFA40018 */ sw $a0, 0x0018($sp) +/* 000E4 809833E4 AFA5001C */ sw $a1, 0x001C($sp) /* 000E8 809833E8 908E0181 */ lbu $t6, 0x0181($a0) ## 00000181 /* 000EC 809833EC 00802825 */ or $a1, $a0, $zero ## $a1 = 00000000 /* 000F0 809833F0 24A6014C */ addiu $a2, $a1, 0x014C ## $a2 = 0000014C /* 000F4 809833F4 35CF0001 */ ori $t7, $t6, 0x0001 ## $t7 = 00000001 /* 000F8 809833F8 A08F0181 */ sb $t7, 0x0181($a0) ## 00000181 -/* 000FC 809833FC 8FA4001C */ lw $a0, 0x001C($sp) -/* 00100 80983400 0C028D88 */ jal func_800A3620 +/* 000FC 809833FC 8FA4001C */ lw $a0, 0x001C($sp) +/* 00100 80983400 0C028D88 */ jal SkelAnime_LoadAnimationType5 /* 00104 80983404 3C073F80 */ lui $a3, 0x3F80 ## $a3 = 3F800000 -/* 00108 80983408 8FBF0014 */ lw $ra, 0x0014($sp) +/* 00108 80983408 8FBF0014 */ lw $ra, 0x0014($sp) /* 0010C 8098340C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00110 80983410 03E00008 */ jr $ra +/* 00110 80983410 03E00008 */ jr $ra /* 00114 80983414 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ik/func_80983820.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ik/func_80983820.s index ddb0183efb..cd7db76bb9 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ik/func_80983820.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Ik/func_80983820.s @@ -1,18 +1,18 @@ glabel func_80983820 /* 00520 80983820 27BDFFA8 */ addiu $sp, $sp, 0xFFA8 ## $sp = FFFFFFA8 -/* 00524 80983824 AFBF002C */ sw $ra, 0x002C($sp) -/* 00528 80983828 AFB10028 */ sw $s1, 0x0028($sp) -/* 0052C 8098382C AFB00024 */ sw $s0, 0x0024($sp) -/* 00530 80983830 AFA5005C */ sw $a1, 0x005C($sp) +/* 00524 80983824 AFBF002C */ sw $ra, 0x002C($sp) +/* 00528 80983828 AFB10028 */ sw $s1, 0x0028($sp) +/* 0052C 8098382C AFB00024 */ sw $s0, 0x0024($sp) +/* 00530 80983830 AFA5005C */ sw $a1, 0x005C($sp) /* 00534 80983834 8482001C */ lh $v0, 0x001C($a0) ## 0000001C /* 00538 80983838 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 0053C 8098383C 260400B4 */ addiu $a0, $s0, 0x00B4 ## $a0 = 000000B4 -/* 00540 80983840 10400006 */ beq $v0, $zero, .L8098385C +/* 00540 80983840 10400006 */ beq $v0, $zero, .L8098385C /* 00544 80983844 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 /* 00548 80983848 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 0054C 8098384C 1041000B */ beq $v0, $at, .L8098387C +/* 0054C 8098384C 1041000B */ beq $v0, $at, .L8098387C /* 00550 80983850 3C0F0600 */ lui $t7, 0x0600 ## $t7 = 06000000 -/* 00554 80983854 10000010 */ beq $zero, $zero, .L80983898 +/* 00554 80983854 10000010 */ beq $zero, $zero, .L80983898 /* 00558 80983858 3C180600 */ lui $t8, 0x0600 ## $t8 = 06000000 .L8098385C: /* 0055C 8098385C 3C0E0600 */ lui $t6, 0x0600 ## $t6 = 06000000 @@ -20,63 +20,63 @@ glabel func_80983820 /* 00564 80983864 25CE0C90 */ addiu $t6, $t6, 0x0C90 ## $t6 = 06000C90 /* 00568 80983868 3C110600 */ lui $s1, 0x0600 ## $s1 = 06000000 /* 0056C 8098386C 44810000 */ mtc1 $at, $f0 ## $f0 = 30.00 -/* 00570 80983870 AFAE0048 */ sw $t6, 0x0048($sp) -/* 00574 80983874 1000000E */ beq $zero, $zero, .L809838B0 +/* 00570 80983870 AFAE0048 */ sw $t6, 0x0048($sp) +/* 00574 80983874 1000000E */ beq $zero, $zero, .L809838B0 /* 00578 80983878 26310C6C */ addiu $s1, $s1, 0x0C6C ## $s1 = 06000C6C .L8098387C: /* 0057C 8098387C 3C014120 */ lui $at, 0x4120 ## $at = 41200000 /* 00580 80983880 25EF0660 */ addiu $t7, $t7, 0x0660 ## $t7 = 06000660 /* 00584 80983884 3C110600 */ lui $s1, 0x0600 ## $s1 = 06000000 /* 00588 80983888 44810000 */ mtc1 $at, $f0 ## $f0 = 10.00 -/* 0058C 8098388C AFAF0048 */ sw $t7, 0x0048($sp) -/* 00590 80983890 10000007 */ beq $zero, $zero, .L809838B0 +/* 0058C 8098388C AFAF0048 */ sw $t7, 0x0048($sp) +/* 00590 80983890 10000007 */ beq $zero, $zero, .L809838B0 /* 00594 80983894 26310634 */ addiu $s1, $s1, 0x0634 ## $s1 = 06000634 .L80983898: /* 00598 80983898 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 /* 0059C 8098389C 27180380 */ addiu $t8, $t8, 0x0380 ## $t8 = 06000380 /* 005A0 809838A0 3C110600 */ lui $s1, 0x0600 ## $s1 = 06000000 /* 005A4 809838A4 44810000 */ mtc1 $at, $f0 ## $f0 = 20.00 -/* 005A8 809838A8 AFB80048 */ sw $t8, 0x0048($sp) +/* 005A8 809838A8 AFB80048 */ sw $t8, 0x0048($sp) /* 005AC 809838AC 2631035C */ addiu $s1, $s1, 0x035C ## $s1 = 0600035C .L809838B0: /* 005B0 809838B0 3C068003 */ lui $a2, 0x8003 ## $a2 = 80030000 -/* 005B4 809838B4 44070000 */ mfc1 $a3, $f0 +/* 005B4 809838B4 44070000 */ mfc1 $a3, $f0 /* 005B8 809838B8 0C00AC78 */ jal ActorShape_Init - + /* 005BC 809838BC 24C6B5EC */ addiu $a2, $a2, 0xB5EC ## $a2 = 8002B5EC /* 005C0 809838C0 2605014C */ addiu $a1, $s0, 0x014C ## $a1 = 0000014C /* 005C4 809838C4 26190190 */ addiu $t9, $s0, 0x0190 ## $t9 = 00000190 /* 005C8 809838C8 2608019C */ addiu $t0, $s0, 0x019C ## $t0 = 0000019C /* 005CC 809838CC 24090002 */ addiu $t1, $zero, 0x0002 ## $t1 = 00000002 -/* 005D0 809838D0 AFA90018 */ sw $t1, 0x0018($sp) -/* 005D4 809838D4 AFA80014 */ sw $t0, 0x0014($sp) -/* 005D8 809838D8 AFB90010 */ sw $t9, 0x0010($sp) -/* 005DC 809838DC AFA50034 */ sw $a1, 0x0034($sp) -/* 005E0 809838E0 8FA4005C */ lw $a0, 0x005C($sp) -/* 005E4 809838E4 8FA60048 */ lw $a2, 0x0048($sp) +/* 005D0 809838D0 AFA90018 */ sw $t1, 0x0018($sp) +/* 005D4 809838D4 AFA80014 */ sw $t0, 0x0014($sp) +/* 005D8 809838D8 AFB90010 */ sw $t9, 0x0010($sp) +/* 005DC 809838DC AFA50034 */ sw $a1, 0x0034($sp) +/* 005E0 809838E0 8FA4005C */ lw $a0, 0x005C($sp) +/* 005E4 809838E4 8FA60048 */ lw $a2, 0x0048($sp) /* 005E8 809838E8 0C02915F */ jal SkelAnime_Init - + /* 005EC 809838EC 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 /* 005F0 809838F0 0C028800 */ jal SkelAnime_GetFrameCount - + /* 005F4 809838F4 02202025 */ or $a0, $s1, $zero ## $a0 = 0600035C /* 005F8 809838F8 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 005FC 809838FC 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 /* 00600 80983900 240A0002 */ addiu $t2, $zero, 0x0002 ## $t2 = 00000002 -/* 00604 80983904 468021A0 */ cvt.s.w $f6, $f4 -/* 00608 80983908 44070000 */ mfc1 $a3, $f0 -/* 0060C 8098390C AFAA0014 */ sw $t2, 0x0014($sp) -/* 00610 80983910 8FA40034 */ lw $a0, 0x0034($sp) +/* 00604 80983904 468021A0 */ cvt.s.w $f6, $f4 +/* 00608 80983908 44070000 */ mfc1 $a3, $f0 +/* 0060C 8098390C AFAA0014 */ sw $t2, 0x0014($sp) +/* 00610 80983910 8FA40034 */ lw $a0, 0x0034($sp) /* 00614 80983914 02202825 */ or $a1, $s1, $zero ## $a1 = 0600035C /* 00618 80983918 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 0061C 8098391C E7A60010 */ swc1 $f6, 0x0010($sp) -/* 00620 80983920 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 00624 80983924 E7A00018 */ swc1 $f0, 0x0018($sp) -/* 00628 80983928 8FBF002C */ lw $ra, 0x002C($sp) -/* 0062C 8098392C 8FB00024 */ lw $s0, 0x0024($sp) -/* 00630 80983930 8FB10028 */ lw $s1, 0x0028($sp) -/* 00634 80983934 03E00008 */ jr $ra +/* 0061C 8098391C E7A60010 */ swc1 $f6, 0x0010($sp) +/* 00620 80983920 0C029468 */ jal SkelAnime_ChangeAnim + +/* 00624 80983924 E7A00018 */ swc1 $f0, 0x0018($sp) +/* 00628 80983928 8FBF002C */ lw $ra, 0x002C($sp) +/* 0062C 8098392C 8FB00024 */ lw $s0, 0x0024($sp) +/* 00630 80983930 8FB10028 */ lw $s1, 0x0028($sp) +/* 00634 80983934 03E00008 */ jr $ra /* 00638 80983938 27BD0058 */ addiu $sp, $sp, 0x0058 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ik/func_80983B58.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ik/func_80983B58.s index e92a5aa303..2922d30d51 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ik/func_80983B58.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Ik/func_80983B58.s @@ -11,7 +11,7 @@ glabel func_80983B58 /* 0087C 80983B7C 24C647E4 */ addiu $a2, $a2, %lo(D_809847E4) ## $a2 = 809847E4 /* 00880 80983B80 27A4003C */ addiu $a0, $sp, 0x003C ## $a0 = FFFFFFE4 /* 00884 80983B84 24070181 */ addiu $a3, $zero, 0x0181 ## $a3 = 00000181 -/* 00888 80983B88 0C031AB1 */ jal func_800C6AC4 +/* 00888 80983B88 0C031AB1 */ jal Graph_OpenDisps /* 0088C 80983B8C 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 00890 80983B90 8FAF005C */ lw $t7, 0x005C($sp) /* 00894 80983B94 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 @@ -76,7 +76,7 @@ glabel func_80983B58 /* 00974 80983C74 24C6482C */ addiu $a2, $a2, %lo(D_8098482C) ## $a2 = 8098482C /* 00978 80983C78 27A4003C */ addiu $a0, $sp, 0x003C ## $a0 = FFFFFFE4 /* 0097C 80983C7C 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 00980 80983C80 0C031AD5 */ jal func_800C6B54 +/* 00980 80983C80 0C031AD5 */ jal Graph_CloseDisps /* 00984 80983C84 24070194 */ addiu $a3, $zero, 0x0194 ## $a3 = 00000194 /* 00988 80983C88 8FBF001C */ lw $ra, 0x001C($sp) /* 0098C 80983C8C 8FB00018 */ lw $s0, 0x0018($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ik/func_80983C9C.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ik/func_80983C9C.s index e109e332f6..7745b6a11b 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ik/func_80983C9C.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Ik/func_80983C9C.s @@ -9,7 +9,7 @@ glabel func_80983C9C /* 009B8 80983CB8 24C64844 */ addiu $a2, $a2, %lo(D_80984844) ## $a2 = 80984844 /* 009BC 80983CBC 27A40044 */ addiu $a0, $sp, 0x0044 ## $a0 = FFFFFFDC /* 009C0 80983CC0 240701A6 */ addiu $a3, $zero, 0x01A6 ## $a3 = 000001A6 -/* 009C4 80983CC4 0C031AB1 */ jal func_800C6AC4 +/* 009C4 80983CC4 0C031AB1 */ jal Graph_OpenDisps /* 009C8 80983CC8 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 009CC 80983CCC 8FA40068 */ lw $a0, 0x0068($sp) /* 009D0 80983CD0 8FA5006C */ lw $a1, 0x006C($sp) @@ -92,7 +92,7 @@ glabel func_80983C9C /* 00B00 80983E00 24C6485C */ addiu $a2, $a2, %lo(D_8098485C) ## $a2 = 8098485C /* 00B04 80983E04 27A40044 */ addiu $a0, $sp, 0x0044 ## $a0 = FFFFFFDC /* 00B08 80983E08 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 00B0C 80983E0C 0C031AD5 */ jal func_800C6B54 +/* 00B0C 80983E0C 0C031AD5 */ jal Graph_CloseDisps /* 00B10 80983E10 240701BC */ addiu $a3, $zero, 0x01BC ## $a3 = 000001BC /* 00B14 80983E14 8FBF002C */ lw $ra, 0x002C($sp) /* 00B18 80983E18 8FB00028 */ lw $s0, 0x0028($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ik/func_80983E28.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ik/func_80983E28.s index f22a6defc8..7a0ae3046d 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ik/func_80983E28.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Ik/func_80983E28.s @@ -1,37 +1,37 @@ glabel func_80983E28 /* 00B28 80983E28 27BDFFB0 */ addiu $sp, $sp, 0xFFB0 ## $sp = FFFFFFB0 -/* 00B2C 80983E2C AFBF002C */ sw $ra, 0x002C($sp) -/* 00B30 80983E30 AFB10028 */ sw $s1, 0x0028($sp) -/* 00B34 80983E34 AFB00024 */ sw $s0, 0x0024($sp) -/* 00B38 80983E38 AFA50054 */ sw $a1, 0x0054($sp) +/* 00B2C 80983E2C AFBF002C */ sw $ra, 0x002C($sp) +/* 00B30 80983E30 AFB10028 */ sw $s1, 0x0028($sp) +/* 00B34 80983E34 AFB00024 */ sw $s0, 0x0024($sp) +/* 00B38 80983E38 AFA50054 */ sw $a1, 0x0054($sp) /* 00B3C 80983E3C 8482001C */ lh $v0, 0x001C($a0) ## 0000001C /* 00B40 80983E40 00808825 */ or $s1, $a0, $zero ## $s1 = 00000000 /* 00B44 80983E44 24010003 */ addiu $at, $zero, 0x0003 ## $at = 00000003 -/* 00B48 80983E48 10410009 */ beq $v0, $at, .L80983E70 -/* 00B4C 80983E4C 8FA40054 */ lw $a0, 0x0054($sp) +/* 00B48 80983E48 10410009 */ beq $v0, $at, .L80983E70 +/* 00B4C 80983E4C 8FA40054 */ lw $a0, 0x0054($sp) /* 00B50 80983E50 24010004 */ addiu $at, $zero, 0x0004 ## $at = 00000004 -/* 00B54 80983E54 1041000B */ beq $v0, $at, .L80983E84 +/* 00B54 80983E54 1041000B */ beq $v0, $at, .L80983E84 /* 00B58 80983E58 3C060602 */ lui $a2, 0x0602 ## $a2 = 06020000 /* 00B5C 80983E5C 24010005 */ addiu $at, $zero, 0x0005 ## $at = 00000005 -/* 00B60 80983E60 1041000C */ beq $v0, $at, .L80983E94 +/* 00B60 80983E60 1041000C */ beq $v0, $at, .L80983E94 /* 00B64 80983E64 3C060600 */ lui $a2, 0x0600 ## $a2 = 06000000 -/* 00B68 80983E68 1000000E */ beq $zero, $zero, .L80983EA4 +/* 00B68 80983E68 1000000E */ beq $zero, $zero, .L80983EA4 /* 00B6C 80983E6C 3C060600 */ lui $a2, 0x0600 ## $a2 = 06000000 .L80983E70: /* 00B70 80983E70 3C060602 */ lui $a2, 0x0602 ## $a2 = 06020000 /* 00B74 80983E74 3C100602 */ lui $s0, 0x0602 ## $s0 = 06020000 /* 00B78 80983E78 24C6EB40 */ addiu $a2, $a2, 0xEB40 ## $a2 = 0601EB40 -/* 00B7C 80983E7C 1000000C */ beq $zero, $zero, .L80983EB0 +/* 00B7C 80983E7C 1000000C */ beq $zero, $zero, .L80983EB0 /* 00B80 80983E80 2610EB14 */ addiu $s0, $s0, 0xEB14 ## $s0 = 0601EB14 .L80983E84: /* 00B84 80983E84 3C100602 */ lui $s0, 0x0602 ## $s0 = 06020000 /* 00B88 80983E88 24C6EE60 */ addiu $a2, $a2, 0xEE60 ## $a2 = 0601D9A0 -/* 00B8C 80983E8C 10000008 */ beq $zero, $zero, .L80983EB0 +/* 00B8C 80983E8C 10000008 */ beq $zero, $zero, .L80983EB0 /* 00B90 80983E90 2610EE34 */ addiu $s0, $s0, 0xEE34 ## $s0 = 0601EE34 .L80983E94: /* 00B94 80983E94 3C100600 */ lui $s0, 0x0600 ## $s0 = 06000000 /* 00B98 80983E98 24C60F30 */ addiu $a2, $a2, 0x0F30 ## $a2 = 0601E8D0 -/* 00B9C 80983E9C 10000004 */ beq $zero, $zero, .L80983EB0 +/* 00B9C 80983E9C 10000004 */ beq $zero, $zero, .L80983EB0 /* 00BA0 80983EA0 26100F0C */ addiu $s0, $s0, 0x0F0C ## $s0 = 06000F0C .L80983EA4: /* 00BA4 80983EA4 3C100600 */ lui $s0, 0x0600 ## $s0 = 06000000 @@ -42,35 +42,35 @@ glabel func_80983E28 /* 00BB4 80983EB4 262E0190 */ addiu $t6, $s1, 0x0190 ## $t6 = 00000190 /* 00BB8 80983EB8 262F019C */ addiu $t7, $s1, 0x019C ## $t7 = 0000019C /* 00BBC 80983EBC 24180002 */ addiu $t8, $zero, 0x0002 ## $t8 = 00000002 -/* 00BC0 80983EC0 AFB80018 */ sw $t8, 0x0018($sp) -/* 00BC4 80983EC4 AFAF0014 */ sw $t7, 0x0014($sp) -/* 00BC8 80983EC8 AFAE0010 */ sw $t6, 0x0010($sp) -/* 00BCC 80983ECC AFA50034 */ sw $a1, 0x0034($sp) -/* 00BD0 80983ED0 0C0291BE */ jal func_800A46F8 +/* 00BC0 80983EC0 AFB80018 */ sw $t8, 0x0018($sp) +/* 00BC4 80983EC4 AFAF0014 */ sw $t7, 0x0014($sp) +/* 00BC8 80983EC8 AFAE0010 */ sw $t6, 0x0010($sp) +/* 00BCC 80983ECC AFA50034 */ sw $a1, 0x0034($sp) +/* 00BD0 80983ED0 0C0291BE */ jal SkelAnime_InitSV /* 00BD4 80983ED4 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 /* 00BD8 80983ED8 0C028800 */ jal SkelAnime_GetFrameCount - + /* 00BDC 80983EDC 02002025 */ or $a0, $s0, $zero ## $a0 = 060008DC /* 00BE0 80983EE0 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 00BE4 80983EE4 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 /* 00BE8 80983EE8 24190002 */ addiu $t9, $zero, 0x0002 ## $t9 = 00000002 -/* 00BEC 80983EEC 468021A0 */ cvt.s.w $f6, $f4 -/* 00BF0 80983EF0 44070000 */ mfc1 $a3, $f0 -/* 00BF4 80983EF4 AFB90014 */ sw $t9, 0x0014($sp) -/* 00BF8 80983EF8 8FA40034 */ lw $a0, 0x0034($sp) +/* 00BEC 80983EEC 468021A0 */ cvt.s.w $f6, $f4 +/* 00BF0 80983EF0 44070000 */ mfc1 $a3, $f0 +/* 00BF4 80983EF4 AFB90014 */ sw $t9, 0x0014($sp) +/* 00BF8 80983EF8 8FA40034 */ lw $a0, 0x0034($sp) /* 00BFC 80983EFC 02002825 */ or $a1, $s0, $zero ## $a1 = 060008DC /* 00C00 80983F00 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 00C04 80983F04 E7A60010 */ swc1 $f6, 0x0010($sp) -/* 00C08 80983F08 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 00C0C 80983F0C E7A00018 */ swc1 $f0, 0x0018($sp) +/* 00C04 80983F04 E7A60010 */ swc1 $f6, 0x0010($sp) +/* 00C08 80983F08 0C029468 */ jal SkelAnime_ChangeAnim + +/* 00C0C 80983F0C E7A00018 */ swc1 $f0, 0x0018($sp) /* 00C10 80983F10 24080003 */ addiu $t0, $zero, 0x0003 ## $t0 = 00000003 /* 00C14 80983F14 AE2801A8 */ sw $t0, 0x01A8($s1) ## 000001A8 /* 00C18 80983F18 AE2001AC */ sw $zero, 0x01AC($s1) ## 000001AC -/* 00C1C 80983F1C 8FBF002C */ lw $ra, 0x002C($sp) -/* 00C20 80983F20 8FB10028 */ lw $s1, 0x0028($sp) -/* 00C24 80983F24 8FB00024 */ lw $s0, 0x0024($sp) -/* 00C28 80983F28 03E00008 */ jr $ra +/* 00C1C 80983F1C 8FBF002C */ lw $ra, 0x002C($sp) +/* 00C20 80983F20 8FB10028 */ lw $s1, 0x0028($sp) +/* 00C24 80983F24 8FB00024 */ lw $s0, 0x0024($sp) +/* 00C28 80983F28 03E00008 */ jr $ra /* 00C2C 80983F2C 27BD0050 */ addiu $sp, $sp, 0x0050 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ik/func_809841F4.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ik/func_809841F4.s index 81128aefa8..c126f09881 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ik/func_809841F4.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Ik/func_809841F4.s @@ -14,7 +14,7 @@ glabel func_809841F4 /* 00F24 80984224 24C648AC */ addiu $a2, $a2, %lo(D_809848AC) ## $a2 = 809848AC /* 00F28 80984228 27A40048 */ addiu $a0, $sp, 0x0048 ## $a0 = FFFFFFE0 /* 00F2C 8098422C 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 00F30 80984230 0C031AB1 */ jal func_800C6AC4 +/* 00F30 80984230 0C031AB1 */ jal Graph_OpenDisps /* 00F34 80984234 2407010C */ addiu $a3, $zero, 0x010C ## $a3 = 0000010C /* 00F38 80984238 8FAE006C */ lw $t6, 0x006C($sp) /* 00F3C 8098423C 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 @@ -135,7 +135,7 @@ glabel func_809841F4 /* 010F4 809843F4 24C64924 */ addiu $a2, $a2, %lo(D_80984924) ## $a2 = 80984924 /* 010F8 809843F8 27A40048 */ addiu $a0, $sp, 0x0048 ## $a0 = FFFFFFE0 /* 010FC 809843FC 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 01100 80984400 0C031AD5 */ jal func_800C6B54 +/* 01100 80984400 0C031AD5 */ jal Graph_CloseDisps /* 01104 80984404 2407012C */ addiu $a3, $zero, 0x012C ## $a3 = 0000012C /* 01108 80984408 8FBF001C */ lw $ra, 0x001C($sp) /* 0110C 8098440C 8FB00018 */ lw $s0, 0x0018($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Ik/func_8098441C.s b/asm/non_matchings/overlays/actors/ovl_Demo_Ik/func_8098441C.s index aeedf3adff..c5cb91ea78 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Ik/func_8098441C.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Ik/func_8098441C.s @@ -1,23 +1,23 @@ glabel func_8098441C /* 0111C 8098441C 27BDFF98 */ addiu $sp, $sp, 0xFF98 ## $sp = FFFFFF98 -/* 01120 80984420 AFBF002C */ sw $ra, 0x002C($sp) -/* 01124 80984424 AFB00028 */ sw $s0, 0x0028($sp) -/* 01128 80984428 AFA40068 */ sw $a0, 0x0068($sp) -/* 0112C 8098442C AFA5006C */ sw $a1, 0x006C($sp) +/* 01120 80984420 AFBF002C */ sw $ra, 0x002C($sp) +/* 01124 80984424 AFB00028 */ sw $s0, 0x0028($sp) +/* 01128 80984428 AFA40068 */ sw $a0, 0x0068($sp) +/* 0112C 8098442C AFA5006C */ sw $a1, 0x006C($sp) /* 01130 80984430 8CB00000 */ lw $s0, 0x0000($a1) ## 00000000 /* 01134 80984434 3C068098 */ lui $a2, %hi(D_8098493C) ## $a2 = 80980000 /* 01138 80984438 24C6493C */ addiu $a2, $a2, %lo(D_8098493C) ## $a2 = 8098493C /* 0113C 8098443C 27A40044 */ addiu $a0, $sp, 0x0044 ## $a0 = FFFFFFDC /* 01140 80984440 2407013E */ addiu $a3, $zero, 0x013E ## $a3 = 0000013E -/* 01144 80984444 0C031AB1 */ jal func_800C6AC4 +/* 01144 80984444 0C031AB1 */ jal Graph_OpenDisps /* 01148 80984448 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 0114C 8098444C 8FA40068 */ lw $a0, 0x0068($sp) -/* 01150 80984450 8FA5006C */ lw $a1, 0x006C($sp) -/* 01154 80984454 0C00BAF3 */ jal func_8002EBCC +/* 0114C 8098444C 8FA40068 */ lw $a0, 0x0068($sp) +/* 01150 80984450 8FA5006C */ lw $a1, 0x006C($sp) +/* 01154 80984454 0C00BAF3 */ jal func_8002EBCC /* 01158 80984458 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 0115C 8098445C 0C024F46 */ jal func_80093D18 +/* 0115C 8098445C 0C024F46 */ jal func_80093D18 /* 01160 80984460 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01164 80984464 0C024F61 */ jal func_80093D84 +/* 01164 80984464 0C024F61 */ jal func_80093D84 /* 01168 80984468 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 0116C 8098446C 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 /* 01170 80984470 3C18DB06 */ lui $t8, 0xDB06 ## $t8 = DB060000 @@ -27,16 +27,16 @@ glabel func_8098441C /* 01180 80984480 AC580000 */ sw $t8, 0x0000($v0) ## 00000000 /* 01184 80984484 2419001E */ addiu $t9, $zero, 0x001E ## $t9 = 0000001E /* 01188 80984488 2408001E */ addiu $t0, $zero, 0x001E ## $t0 = 0000001E -/* 0118C 8098448C AFA80014 */ sw $t0, 0x0014($sp) -/* 01190 80984490 AFB90010 */ sw $t9, 0x0010($sp) -/* 01194 80984494 AFA00018 */ sw $zero, 0x0018($sp) +/* 0118C 8098448C AFA80014 */ sw $t0, 0x0014($sp) +/* 01190 80984490 AFB90010 */ sw $t9, 0x0010($sp) +/* 01194 80984494 AFA00018 */ sw $zero, 0x0018($sp) /* 01198 80984498 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 0119C 8098449C 240500F5 */ addiu $a1, $zero, 0x00F5 ## $a1 = 000000F5 /* 011A0 809844A0 240600E1 */ addiu $a2, $zero, 0x00E1 ## $a2 = 000000E1 /* 011A4 809844A4 2407009B */ addiu $a3, $zero, 0x009B ## $a3 = 0000009B -/* 011A8 809844A8 0C260D0C */ jal func_80983430 -/* 011AC 809844AC AFA20040 */ sw $v0, 0x0040($sp) -/* 011B0 809844B0 8FA30040 */ lw $v1, 0x0040($sp) +/* 011A8 809844A8 0C260D0C */ jal func_80983430 +/* 011AC 809844AC AFA20040 */ sw $v0, 0x0040($sp) +/* 011B0 809844B0 8FA30040 */ lw $v1, 0x0040($sp) /* 011B4 809844B4 3C0ADB06 */ lui $t2, 0xDB06 ## $t2 = DB060000 /* 011B8 809844B8 354A0024 */ ori $t2, $t2, 0x0024 ## $t2 = DB060024 /* 011BC 809844BC AC620004 */ sw $v0, 0x0004($v1) ## 00000004 @@ -46,15 +46,15 @@ glabel func_8098441C /* 011CC 809844CC 24490008 */ addiu $t1, $v0, 0x0008 ## $t1 = 00000008 /* 011D0 809844D0 AE0902C0 */ sw $t1, 0x02C0($s0) ## 000002C0 /* 011D4 809844D4 AC4A0000 */ sw $t2, 0x0000($v0) ## 00000000 -/* 011D8 809844D8 AFA00018 */ sw $zero, 0x0018($sp) -/* 011DC 809844DC AFA00014 */ sw $zero, 0x0014($sp) -/* 011E0 809844E0 AFAB0010 */ sw $t3, 0x0010($sp) +/* 011D8 809844D8 AFA00018 */ sw $zero, 0x0018($sp) +/* 011DC 809844DC AFA00014 */ sw $zero, 0x0014($sp) +/* 011E0 809844E0 AFAB0010 */ sw $t3, 0x0010($sp) /* 011E4 809844E4 240500FF */ addiu $a1, $zero, 0x00FF ## $a1 = 000000FF /* 011E8 809844E8 24060028 */ addiu $a2, $zero, 0x0028 ## $a2 = 00000028 /* 011EC 809844EC 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 011F0 809844F0 0C260D0C */ jal func_80983430 -/* 011F4 809844F4 AFA2003C */ sw $v0, 0x003C($sp) -/* 011F8 809844F8 8FA3003C */ lw $v1, 0x003C($sp) +/* 011F0 809844F0 0C260D0C */ jal func_80983430 +/* 011F4 809844F4 AFA2003C */ sw $v0, 0x003C($sp) +/* 011F8 809844F8 8FA3003C */ lw $v1, 0x003C($sp) /* 011FC 809844FC 3C0DDB06 */ lui $t5, 0xDB06 ## $t5 = DB060000 /* 01200 80984500 35AD0028 */ ori $t5, $t5, 0x0028 ## $t5 = DB060028 /* 01204 80984504 AC620004 */ sw $v0, 0x0004($v1) ## 00000004 @@ -65,41 +65,41 @@ glabel func_8098441C /* 01218 80984518 AE0C02C0 */ sw $t4, 0x02C0($s0) ## 000002C0 /* 0121C 8098451C AC4D0000 */ sw $t5, 0x0000($v0) ## 00000000 /* 01220 80984520 2418001E */ addiu $t8, $zero, 0x001E ## $t8 = 0000001E -/* 01224 80984524 AFB80018 */ sw $t8, 0x0018($sp) -/* 01228 80984528 AFAF0014 */ sw $t7, 0x0014($sp) -/* 0122C 8098452C AFAE0010 */ sw $t6, 0x0010($sp) +/* 01224 80984524 AFB80018 */ sw $t8, 0x0018($sp) +/* 01228 80984528 AFAF0014 */ sw $t7, 0x0014($sp) +/* 0122C 8098452C AFAE0010 */ sw $t6, 0x0010($sp) /* 01230 80984530 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 01234 80984534 240500FF */ addiu $a1, $zero, 0x00FF ## $a1 = 000000FF /* 01238 80984538 240600FF */ addiu $a2, $zero, 0x00FF ## $a2 = 000000FF /* 0123C 8098453C 240700FF */ addiu $a3, $zero, 0x00FF ## $a3 = 000000FF -/* 01240 80984540 0C260D0C */ jal func_80983430 -/* 01244 80984544 AFA20038 */ sw $v0, 0x0038($sp) -/* 01248 80984548 8FA30038 */ lw $v1, 0x0038($sp) +/* 01240 80984540 0C260D0C */ jal func_80983430 +/* 01244 80984544 AFA20038 */ sw $v0, 0x0038($sp) +/* 01248 80984548 8FA30038 */ lw $v1, 0x0038($sp) /* 0124C 8098454C 3C198098 */ lui $t9, %hi(func_8098419C) ## $t9 = 80980000 /* 01250 80984550 3C088098 */ lui $t0, %hi(func_809841F4) ## $t0 = 80980000 /* 01254 80984554 AC620004 */ sw $v0, 0x0004($v1) ## 00000004 -/* 01258 80984558 8FA30068 */ lw $v1, 0x0068($sp) +/* 01258 80984558 8FA30068 */ lw $v1, 0x0068($sp) /* 0125C 8098455C 250841F4 */ addiu $t0, $t0, %lo(func_809841F4) ## $t0 = 809841F4 /* 01260 80984560 2739419C */ addiu $t9, $t9, %lo(func_8098419C) ## $t9 = 8098419C /* 01264 80984564 2462014C */ addiu $v0, $v1, 0x014C ## $v0 = 0000014C /* 01268 80984568 8C450004 */ lw $a1, 0x0004($v0) ## 00000150 /* 0126C 8098456C 8C460020 */ lw $a2, 0x0020($v0) ## 0000016C /* 01270 80984570 90470002 */ lbu $a3, 0x0002($v0) ## 0000014E -/* 01274 80984574 AFA80014 */ sw $t0, 0x0014($sp) -/* 01278 80984578 AFB90010 */ sw $t9, 0x0010($sp) -/* 0127C 8098457C 8FA4006C */ lw $a0, 0x006C($sp) -/* 01280 80984580 0C0286B2 */ jal func_800A1AC8 -/* 01284 80984584 AFA30018 */ sw $v1, 0x0018($sp) +/* 01274 80984574 AFA80014 */ sw $t0, 0x0014($sp) +/* 01278 80984578 AFB90010 */ sw $t9, 0x0010($sp) +/* 0127C 8098457C 8FA4006C */ lw $a0, 0x006C($sp) +/* 01280 80984580 0C0286B2 */ jal SkelAnime_DrawSV +/* 01284 80984584 AFA30018 */ sw $v1, 0x0018($sp) /* 01288 80984588 3C068098 */ lui $a2, %hi(D_80984954) ## $a2 = 80980000 /* 0128C 8098458C 24C64954 */ addiu $a2, $a2, %lo(D_80984954) ## $a2 = 80984954 /* 01290 80984590 27A40044 */ addiu $a0, $sp, 0x0044 ## $a0 = FFFFFFDC /* 01294 80984594 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 01298 80984598 0C031AD5 */ jal func_800C6B54 +/* 01298 80984598 0C031AD5 */ jal Graph_CloseDisps /* 0129C 8098459C 24070155 */ addiu $a3, $zero, 0x0155 ## $a3 = 00000155 -/* 012A0 809845A0 8FBF002C */ lw $ra, 0x002C($sp) -/* 012A4 809845A4 8FB00028 */ lw $s0, 0x0028($sp) +/* 012A0 809845A0 8FBF002C */ lw $ra, 0x002C($sp) +/* 012A4 809845A4 8FB00028 */ lw $s0, 0x0028($sp) /* 012A8 809845A8 27BD0068 */ addiu $sp, $sp, 0x0068 ## $sp = 00000000 -/* 012AC 809845AC 03E00008 */ jr $ra +/* 012AC 809845AC 03E00008 */ jr $ra /* 012B0 809845B0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Im/DemoIm_Init.s b/asm/non_matchings/overlays/actors/ovl_Demo_Im/DemoIm_Init.s index 94490bd22a..e16cf3cb9c 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Im/DemoIm_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Im/DemoIm_Init.s @@ -1,85 +1,85 @@ glabel DemoIm_Init /* 027EC 809873CC 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 027F0 809873D0 AFB10028 */ sw $s1, 0x0028($sp) -/* 027F4 809873D4 AFB00024 */ sw $s0, 0x0024($sp) +/* 027F0 809873D0 AFB10028 */ sw $s1, 0x0028($sp) +/* 027F4 809873D4 AFB00024 */ sw $s0, 0x0024($sp) /* 027F8 809873D8 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 027FC 809873DC 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 -/* 02800 809873E0 AFBF002C */ sw $ra, 0x002C($sp) +/* 02800 809873E0 AFBF002C */ sw $ra, 0x002C($sp) /* 02804 809873E4 3C068003 */ lui $a2, 0x8003 ## $a2 = 80030000 /* 02808 809873E8 24C6B5EC */ addiu $a2, $a2, 0xB5EC ## $a2 = 8002B5EC /* 0280C 809873EC 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 /* 02810 809873F0 248400B4 */ addiu $a0, $a0, 0x00B4 ## $a0 = 000000B4 /* 02814 809873F4 0C00AC78 */ jal ActorShape_Init - + /* 02818 809873F8 3C0741F0 */ lui $a3, 0x41F0 ## $a3 = 41F00000 /* 0281C 809873FC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02820 80987400 0C261340 */ jal func_80984D00 +/* 02820 80987400 0C261340 */ jal func_80984D00 /* 02824 80987404 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 /* 02828 80987408 3C060601 */ lui $a2, 0x0601 ## $a2 = 06010000 /* 0282C 8098740C 260E0190 */ addiu $t6, $s0, 0x0190 ## $t6 = 00000190 /* 02830 80987410 260F01F6 */ addiu $t7, $s0, 0x01F6 ## $t7 = 000001F6 /* 02834 80987414 24180011 */ addiu $t8, $zero, 0x0011 ## $t8 = 00000011 -/* 02838 80987418 AFB80018 */ sw $t8, 0x0018($sp) -/* 0283C 8098741C AFAF0014 */ sw $t7, 0x0014($sp) -/* 02840 80987420 AFAE0010 */ sw $t6, 0x0010($sp) +/* 02838 80987418 AFB80018 */ sw $t8, 0x0018($sp) +/* 0283C 8098741C AFAF0014 */ sw $t7, 0x0014($sp) +/* 02840 80987420 AFAE0010 */ sw $t6, 0x0010($sp) /* 02844 80987424 24C6F788 */ addiu $a2, $a2, 0xF788 ## $a2 = 0600F788 /* 02848 80987428 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 0284C 8098742C 2605014C */ addiu $a1, $s0, 0x014C ## $a1 = 0000014C -/* 02850 80987430 0C0291BE */ jal func_800A46F8 +/* 02850 80987430 0C0291BE */ jal SkelAnime_InitSV /* 02854 80987434 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 /* 02858 80987438 8E190004 */ lw $t9, 0x0004($s0) ## 00000004 /* 0285C 8098743C 8609001C */ lh $t1, 0x001C($s0) ## 0000001C /* 02860 80987440 2401FFFE */ addiu $at, $zero, 0xFFFE ## $at = FFFFFFFE -/* 02864 80987444 03214024 */ and $t0, $t9, $at +/* 02864 80987444 03214024 */ and $t0, $t9, $at /* 02868 80987448 252AFFFE */ addiu $t2, $t1, 0xFFFE ## $t2 = FFFFFFFE -/* 0286C 8098744C 2D410005 */ sltiu $at, $t2, 0x0005 -/* 02870 80987450 10200020 */ beq $at, $zero, .L809874D4 +/* 0286C 8098744C 2D410005 */ sltiu $at, $t2, 0x0005 +/* 02870 80987450 10200020 */ beq $at, $zero, .L809874D4 /* 02874 80987454 AE080004 */ sw $t0, 0x0004($s0) ## 00000004 -/* 02878 80987458 000A5080 */ sll $t2, $t2, 2 +/* 02878 80987458 000A5080 */ sll $t2, $t2, 2 /* 0287C 8098745C 3C018099 */ lui $at, %hi(jtbl_80988A04) ## $at = 80990000 -/* 02880 80987460 002A0821 */ addu $at, $at, $t2 -/* 02884 80987464 8C2A8A04 */ lw $t2, %lo(jtbl_80988A04)($at) -/* 02888 80987468 01400008 */ jr $t2 +/* 02880 80987460 002A0821 */ addu $at, $at, $t2 +/* 02884 80987464 8C2A8A04 */ lw $t2, %lo(jtbl_80988A04)($at) +/* 02888 80987468 01400008 */ jr $t2 /* 0288C 8098746C 00000000 */ nop glabel L80987470 /* 02890 80987470 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02894 80987474 0C261618 */ jal func_80985860 +/* 02894 80987474 0C261618 */ jal func_80985860 /* 02898 80987478 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 0289C 8098747C 10000019 */ beq $zero, $zero, .L809874E4 -/* 028A0 80987480 8FBF002C */ lw $ra, 0x002C($sp) +/* 0289C 8098747C 10000019 */ beq $zero, $zero, .L809874E4 +/* 028A0 80987480 8FBF002C */ lw $ra, 0x002C($sp) glabel L80987484 /* 028A4 80987484 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 028A8 80987488 0C261798 */ jal func_80985E60 +/* 028A8 80987488 0C261798 */ jal func_80985E60 /* 028AC 8098748C 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 028B0 80987490 10000014 */ beq $zero, $zero, .L809874E4 -/* 028B4 80987494 8FBF002C */ lw $ra, 0x002C($sp) +/* 028B0 80987490 10000014 */ beq $zero, $zero, .L809874E4 +/* 028B4 80987494 8FBF002C */ lw $ra, 0x002C($sp) glabel L80987498 /* 028B8 80987498 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 028BC 8098749C 0C26194B */ jal func_8098652C +/* 028BC 8098749C 0C26194B */ jal func_8098652C /* 028C0 809874A0 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 028C4 809874A4 1000000F */ beq $zero, $zero, .L809874E4 -/* 028C8 809874A8 8FBF002C */ lw $ra, 0x002C($sp) +/* 028C4 809874A4 1000000F */ beq $zero, $zero, .L809874E4 +/* 028C8 809874A8 8FBF002C */ lw $ra, 0x002C($sp) glabel L809874AC /* 028CC 809874AC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 028D0 809874B0 0C261A6C */ jal func_809869B0 +/* 028D0 809874B0 0C261A6C */ jal func_809869B0 /* 028D4 809874B4 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 028D8 809874B8 1000000A */ beq $zero, $zero, .L809874E4 -/* 028DC 809874BC 8FBF002C */ lw $ra, 0x002C($sp) +/* 028D8 809874B8 1000000A */ beq $zero, $zero, .L809874E4 +/* 028DC 809874BC 8FBF002C */ lw $ra, 0x002C($sp) glabel L809874C0 /* 028E0 809874C0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 028E4 809874C4 0C261C06 */ jal func_80987018 +/* 028E4 809874C4 0C261C06 */ jal func_80987018 /* 028E8 809874C8 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 028EC 809874CC 10000005 */ beq $zero, $zero, .L809874E4 -/* 028F0 809874D0 8FBF002C */ lw $ra, 0x002C($sp) +/* 028EC 809874CC 10000005 */ beq $zero, $zero, .L809874E4 +/* 028F0 809874D0 8FBF002C */ lw $ra, 0x002C($sp) .L809874D4: /* 028F4 809874D4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 028F8 809874D8 0C2614C4 */ jal func_80985310 +/* 028F8 809874D8 0C2614C4 */ jal func_80985310 /* 028FC 809874DC 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 02900 809874E0 8FBF002C */ lw $ra, 0x002C($sp) +/* 02900 809874E0 8FBF002C */ lw $ra, 0x002C($sp) .L809874E4: -/* 02904 809874E4 8FB00024 */ lw $s0, 0x0024($sp) -/* 02908 809874E8 8FB10028 */ lw $s1, 0x0028($sp) -/* 0290C 809874EC 03E00008 */ jr $ra +/* 02904 809874E4 8FB00024 */ lw $s0, 0x0024($sp) +/* 02908 809874E8 8FB10028 */ lw $s1, 0x0028($sp) +/* 0290C 809874EC 03E00008 */ jr $ra /* 02910 809874F0 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80985280.s b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80985280.s index 3ab3bcc4b9..7aee70c699 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80985280.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80985280.s @@ -1,43 +1,43 @@ glabel func_80985280 /* 006A0 80985280 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 006A4 80985284 AFBF0024 */ sw $ra, 0x0024($sp) -/* 006A8 80985288 AFA40028 */ sw $a0, 0x0028($sp) -/* 006AC 8098528C AFA5002C */ sw $a1, 0x002C($sp) -/* 006B0 80985290 AFA60030 */ sw $a2, 0x0030($sp) -/* 006B4 80985294 AFA70034 */ sw $a3, 0x0034($sp) +/* 006A4 80985284 AFBF0024 */ sw $ra, 0x0024($sp) +/* 006A8 80985288 AFA40028 */ sw $a0, 0x0028($sp) +/* 006AC 8098528C AFA5002C */ sw $a1, 0x002C($sp) +/* 006B0 80985290 AFA60030 */ sw $a2, 0x0030($sp) +/* 006B4 80985294 AFA70034 */ sw $a3, 0x0034($sp) /* 006B8 80985298 0C028800 */ jal SkelAnime_GetFrameCount - + /* 006BC 8098529C 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 006C0 809852A0 8FAE0038 */ lw $t6, 0x0038($sp) -/* 006C4 809852A4 8FA40028 */ lw $a0, 0x0028($sp) -/* 006C8 809852A8 8FA5002C */ lw $a1, 0x002C($sp) -/* 006CC 809852AC 15C00007 */ bne $t6, $zero, .L809852CC +/* 006C0 809852A0 8FAE0038 */ lw $t6, 0x0038($sp) +/* 006C4 809852A4 8FA40028 */ lw $a0, 0x0028($sp) +/* 006C8 809852A8 8FA5002C */ lw $a1, 0x002C($sp) +/* 006CC 809852AC 15C00007 */ bne $t6, $zero, .L809852CC /* 006D0 809852B0 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C /* 006D4 809852B4 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 006D8 809852B8 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 /* 006DC 809852BC 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 /* 006E0 809852C0 44816000 */ mtc1 $at, $f12 ## $f12 = 1.00 -/* 006E4 809852C4 10000006 */ beq $zero, $zero, .L809852E0 -/* 006E8 809852C8 468020A0 */ cvt.s.w $f2, $f4 +/* 006E4 809852C4 10000006 */ beq $zero, $zero, .L809852E0 +/* 006E8 809852C8 468020A0 */ cvt.s.w $f2, $f4 .L809852CC: /* 006EC 809852CC 44823000 */ mtc1 $v0, $f6 ## $f6 = 0.00 /* 006F0 809852D0 3C01BF80 */ lui $at, 0xBF80 ## $at = BF800000 /* 006F4 809852D4 44801000 */ mtc1 $zero, $f2 ## $f2 = 0.00 /* 006F8 809852D8 44816000 */ mtc1 $at, $f12 ## $f12 = -1.00 -/* 006FC 809852DC 46803020 */ cvt.s.w $f0, $f6 +/* 006FC 809852DC 46803020 */ cvt.s.w $f0, $f6 .L809852E0: -/* 00700 809852E0 93AF0033 */ lbu $t7, 0x0033($sp) -/* 00704 809852E4 C7A80034 */ lwc1 $f8, 0x0034($sp) -/* 00708 809852E8 44066000 */ mfc1 $a2, $f12 -/* 0070C 809852EC 44070000 */ mfc1 $a3, $f0 -/* 00710 809852F0 E7A20010 */ swc1 $f2, 0x0010($sp) -/* 00714 809852F4 AFAF0014 */ sw $t7, 0x0014($sp) -/* 00718 809852F8 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 0071C 809852FC E7A80018 */ swc1 $f8, 0x0018($sp) -/* 00720 80985300 8FBF0024 */ lw $ra, 0x0024($sp) +/* 00700 809852E0 93AF0033 */ lbu $t7, 0x0033($sp) +/* 00704 809852E4 C7A80034 */ lwc1 $f8, 0x0034($sp) +/* 00708 809852E8 44066000 */ mfc1 $a2, $f12 +/* 0070C 809852EC 44070000 */ mfc1 $a3, $f0 +/* 00710 809852F0 E7A20010 */ swc1 $f2, 0x0010($sp) +/* 00714 809852F4 AFAF0014 */ sw $t7, 0x0014($sp) +/* 00718 809852F8 0C029468 */ jal SkelAnime_ChangeAnim + +/* 0071C 809852FC E7A80018 */ swc1 $f8, 0x0018($sp) +/* 00720 80985300 8FBF0024 */ lw $ra, 0x0024($sp) /* 00724 80985304 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 00728 80985308 03E00008 */ jr $ra +/* 00728 80985308 03E00008 */ jr $ra /* 0072C 8098530C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_809854DC.s b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_809854DC.s index e092ee316f..ef1e59cd07 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_809854DC.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_809854DC.s @@ -1,47 +1,47 @@ glabel func_809854DC /* 008FC 809854DC 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 00900 809854E0 AFBF0024 */ sw $ra, 0x0024($sp) -/* 00904 809854E4 AFA40028 */ sw $a0, 0x0028($sp) +/* 00900 809854E0 AFBF0024 */ sw $ra, 0x0024($sp) +/* 00904 809854E4 AFA40028 */ sw $a0, 0x0028($sp) /* 00908 809854E8 90AE1D6C */ lbu $t6, 0x1D6C($a1) ## 00001D6C -/* 0090C 809854EC 51C00020 */ beql $t6, $zero, .L80985570 -/* 00910 809854F0 8FBF0024 */ lw $ra, 0x0024($sp) +/* 0090C 809854EC 51C00020 */ beql $t6, $zero, .L80985570 +/* 00910 809854F0 8FBF0024 */ lw $ra, 0x0024($sp) /* 00914 809854F4 8CA21DA0 */ lw $v0, 0x1DA0($a1) ## 00001DA0 -/* 00918 809854F8 5040001D */ beql $v0, $zero, .L80985570 -/* 0091C 809854FC 8FBF0024 */ lw $ra, 0x0024($sp) +/* 00918 809854F8 5040001D */ beql $v0, $zero, .L80985570 +/* 0091C 809854FC 8FBF0024 */ lw $ra, 0x0024($sp) /* 00920 80985500 944F0000 */ lhu $t7, 0x0000($v0) ## 00000000 /* 00924 80985504 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 /* 00928 80985508 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 -/* 0092C 8098550C 15E10017 */ bne $t7, $at, .L8098556C +/* 0092C 8098550C 15E10017 */ bne $t7, $at, .L8098556C /* 00930 80985510 24841868 */ addiu $a0, $a0, 0x1868 ## $a0 = 06001868 /* 00934 80985514 0C028800 */ jal SkelAnime_GetFrameCount - -/* 00938 80985518 AFA5002C */ sw $a1, 0x002C($sp) + +/* 00938 80985518 AFA5002C */ sw $a1, 0x002C($sp) /* 0093C 8098551C 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 00940 80985520 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 00944 80985524 8FA40028 */ lw $a0, 0x0028($sp) -/* 00948 80985528 468021A0 */ cvt.s.w $f6, $f4 +/* 00944 80985524 8FA40028 */ lw $a0, 0x0028($sp) +/* 00948 80985528 468021A0 */ cvt.s.w $f6, $f4 /* 0094C 8098552C 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 00950 80985530 44070000 */ mfc1 $a3, $f0 +/* 00950 80985530 44070000 */ mfc1 $a3, $f0 /* 00954 80985534 24A51868 */ addiu $a1, $a1, 0x1868 ## $a1 = 06001868 /* 00958 80985538 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 0095C 8098553C AFA00014 */ sw $zero, 0x0014($sp) -/* 00960 80985540 E7A60010 */ swc1 $f6, 0x0010($sp) +/* 0095C 8098553C AFA00014 */ sw $zero, 0x0014($sp) +/* 00960 80985540 E7A60010 */ swc1 $f6, 0x0010($sp) /* 00964 80985544 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 00968 80985548 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 0096C 8098554C E7A00018 */ swc1 $f0, 0x0018($sp) -/* 00970 80985550 8FA40028 */ lw $a0, 0x0028($sp) +/* 00968 80985548 0C029468 */ jal SkelAnime_ChangeAnim + +/* 0096C 8098554C E7A00018 */ swc1 $f0, 0x0018($sp) +/* 00970 80985550 8FA40028 */ lw $a0, 0x0028($sp) /* 00974 80985554 24180002 */ addiu $t8, $zero, 0x0002 ## $t8 = 00000002 /* 00978 80985558 24190001 */ addiu $t9, $zero, 0x0001 ## $t9 = 00000001 /* 0097C 8098555C AC980260 */ sw $t8, 0x0260($a0) ## 00000260 /* 00980 80985560 AC990264 */ sw $t9, 0x0264($a0) ## 00000264 -/* 00984 80985564 0C2614D6 */ jal func_80985358 -/* 00988 80985568 8FA5002C */ lw $a1, 0x002C($sp) +/* 00984 80985564 0C2614D6 */ jal func_80985358 +/* 00988 80985568 8FA5002C */ lw $a1, 0x002C($sp) .L8098556C: -/* 0098C 8098556C 8FBF0024 */ lw $ra, 0x0024($sp) +/* 0098C 8098556C 8FBF0024 */ lw $ra, 0x0024($sp) .L80985570: /* 00990 80985570 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 00994 80985574 03E00008 */ jr $ra +/* 00994 80985574 03E00008 */ jr $ra /* 00998 80985578 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_809855A8.s b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_809855A8.s index 0c1ad0089d..9f85dc9b8d 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_809855A8.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_809855A8.s @@ -1,44 +1,44 @@ glabel func_809855A8 /* 009C8 809855A8 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 009CC 809855AC AFBF0024 */ sw $ra, 0x0024($sp) -/* 009D0 809855B0 AFA40028 */ sw $a0, 0x0028($sp) +/* 009CC 809855AC AFBF0024 */ sw $ra, 0x0024($sp) +/* 009D0 809855B0 AFA40028 */ sw $a0, 0x0028($sp) /* 009D4 809855B4 90AE1D6C */ lbu $t6, 0x1D6C($a1) ## 00001D6C -/* 009D8 809855B8 51C0001E */ beql $t6, $zero, .L80985634 -/* 009DC 809855BC 8FBF0024 */ lw $ra, 0x0024($sp) +/* 009D8 809855B8 51C0001E */ beql $t6, $zero, .L80985634 +/* 009DC 809855BC 8FBF0024 */ lw $ra, 0x0024($sp) /* 009E0 809855C0 8CA21DA0 */ lw $v0, 0x1DA0($a1) ## 00001DA0 -/* 009E4 809855C4 5040001B */ beql $v0, $zero, .L80985634 -/* 009E8 809855C8 8FBF0024 */ lw $ra, 0x0024($sp) +/* 009E4 809855C4 5040001B */ beql $v0, $zero, .L80985634 +/* 009E8 809855C8 8FBF0024 */ lw $ra, 0x0024($sp) /* 009EC 809855CC 944F0000 */ lhu $t7, 0x0000($v0) ## 00000000 /* 009F0 809855D0 24010003 */ addiu $at, $zero, 0x0003 ## $at = 00000003 /* 009F4 809855D4 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 -/* 009F8 809855D8 55E10016 */ bnel $t7, $at, .L80985634 -/* 009FC 809855DC 8FBF0024 */ lw $ra, 0x0024($sp) +/* 009F8 809855D8 55E10016 */ bnel $t7, $at, .L80985634 +/* 009FC 809855DC 8FBF0024 */ lw $ra, 0x0024($sp) /* 00A00 809855E0 0C028800 */ jal SkelAnime_GetFrameCount - + /* 00A04 809855E4 24840710 */ addiu $a0, $a0, 0x0710 ## $a0 = 06000710 /* 00A08 809855E8 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 00A0C 809855EC 3C014080 */ lui $at, 0x4080 ## $at = 40800000 /* 00A10 809855F0 44814000 */ mtc1 $at, $f8 ## $f8 = 4.00 -/* 00A14 809855F4 468021A0 */ cvt.s.w $f6, $f4 -/* 00A18 809855F8 8FA40028 */ lw $a0, 0x0028($sp) +/* 00A14 809855F4 468021A0 */ cvt.s.w $f6, $f4 +/* 00A18 809855F8 8FA40028 */ lw $a0, 0x0028($sp) /* 00A1C 809855FC 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 00A20 80985600 24180002 */ addiu $t8, $zero, 0x0002 ## $t8 = 00000002 -/* 00A24 80985604 AFB80014 */ sw $t8, 0x0014($sp) +/* 00A24 80985604 AFB80014 */ sw $t8, 0x0014($sp) /* 00A28 80985608 24A50710 */ addiu $a1, $a1, 0x0710 ## $a1 = 06000710 -/* 00A2C 8098560C E7A60010 */ swc1 $f6, 0x0010($sp) +/* 00A2C 8098560C E7A60010 */ swc1 $f6, 0x0010($sp) /* 00A30 80985610 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 00A34 80985614 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 00A38 80985618 E7A80018 */ swc1 $f8, 0x0018($sp) -/* 00A3C 8098561C 0C029468 */ jal SkelAnime_ChangeAnimation - +/* 00A38 80985618 E7A80018 */ swc1 $f8, 0x0018($sp) +/* 00A3C 8098561C 0C029468 */ jal SkelAnime_ChangeAnim + /* 00A40 80985620 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 00A44 80985624 8FA80028 */ lw $t0, 0x0028($sp) +/* 00A44 80985624 8FA80028 */ lw $t0, 0x0028($sp) /* 00A48 80985628 24190004 */ addiu $t9, $zero, 0x0004 ## $t9 = 00000004 /* 00A4C 8098562C AD190260 */ sw $t9, 0x0260($t0) ## 00000260 -/* 00A50 80985630 8FBF0024 */ lw $ra, 0x0024($sp) +/* 00A50 80985630 8FBF0024 */ lw $ra, 0x0024($sp) .L80985634: /* 00A54 80985634 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 00A58 80985638 03E00008 */ jr $ra +/* 00A58 80985638 03E00008 */ jr $ra /* 00A5C 8098563C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80985640.s b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80985640.s index 8b80d8dd4f..6ccc1b905e 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80985640.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80985640.s @@ -1,33 +1,33 @@ glabel func_80985640 /* 00A60 80985640 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 00A64 80985644 AFBF0024 */ sw $ra, 0x0024($sp) -/* 00A68 80985648 10A00014 */ beq $a1, $zero, .L8098569C -/* 00A6C 8098564C AFA40028 */ sw $a0, 0x0028($sp) +/* 00A64 80985644 AFBF0024 */ sw $ra, 0x0024($sp) +/* 00A68 80985648 10A00014 */ beq $a1, $zero, .L8098569C +/* 00A6C 8098564C AFA40028 */ sw $a0, 0x0028($sp) /* 00A70 80985650 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 /* 00A74 80985654 0C028800 */ jal SkelAnime_GetFrameCount - + /* 00A78 80985658 24840AFC */ addiu $a0, $a0, 0x0AFC ## $a0 = 06000AFC /* 00A7C 8098565C 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 00A80 80985660 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 00A84 80985664 8FA40028 */ lw $a0, 0x0028($sp) -/* 00A88 80985668 468021A0 */ cvt.s.w $f6, $f4 +/* 00A84 80985664 8FA40028 */ lw $a0, 0x0028($sp) +/* 00A88 80985668 468021A0 */ cvt.s.w $f6, $f4 /* 00A8C 8098566C 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 00A90 80985670 44070000 */ mfc1 $a3, $f0 +/* 00A90 80985670 44070000 */ mfc1 $a3, $f0 /* 00A94 80985674 24A50AFC */ addiu $a1, $a1, 0x0AFC ## $a1 = 06000AFC /* 00A98 80985678 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 00A9C 8098567C AFA00014 */ sw $zero, 0x0014($sp) -/* 00AA0 80985680 E7A60010 */ swc1 $f6, 0x0010($sp) +/* 00A9C 8098567C AFA00014 */ sw $zero, 0x0014($sp) +/* 00AA0 80985680 E7A60010 */ swc1 $f6, 0x0010($sp) /* 00AA4 80985684 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 00AA8 80985688 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 00AAC 8098568C E7A00018 */ swc1 $f0, 0x0018($sp) -/* 00AB0 80985690 8FAF0028 */ lw $t7, 0x0028($sp) +/* 00AA8 80985688 0C029468 */ jal SkelAnime_ChangeAnim + +/* 00AAC 8098568C E7A00018 */ swc1 $f0, 0x0018($sp) +/* 00AB0 80985690 8FAF0028 */ lw $t7, 0x0028($sp) /* 00AB4 80985694 240E0005 */ addiu $t6, $zero, 0x0005 ## $t6 = 00000005 /* 00AB8 80985698 ADEE0260 */ sw $t6, 0x0260($t7) ## 00000260 .L8098569C: -/* 00ABC 8098569C 8FBF0024 */ lw $ra, 0x0024($sp) +/* 00ABC 8098569C 8FBF0024 */ lw $ra, 0x0024($sp) /* 00AC0 809856A0 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 00AC4 809856A4 03E00008 */ jr $ra +/* 00AC4 809856A4 03E00008 */ jr $ra /* 00AC8 809856A8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80985948.s b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80985948.s index 29b743f7b3..6095ac198e 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80985948.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80985948.s @@ -1,30 +1,30 @@ glabel func_80985948 /* 00D68 80985948 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 00D6C 8098594C AFBF002C */ sw $ra, 0x002C($sp) -/* 00D70 80985950 AFB00028 */ sw $s0, 0x0028($sp) +/* 00D6C 8098594C AFBF002C */ sw $ra, 0x002C($sp) +/* 00D70 80985950 AFB00028 */ sw $s0, 0x0028($sp) /* 00D74 80985954 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 00D78 80985958 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 -/* 00D7C 8098595C 0C26143A */ jal func_809850E8 +/* 00D7C 8098595C 0C26143A */ jal func_809850E8 /* 00D80 80985960 24070005 */ addiu $a3, $zero, 0x0005 ## $a3 = 00000005 -/* 00D84 80985964 10400019 */ beq $v0, $zero, .L809859CC +/* 00D84 80985964 10400019 */ beq $v0, $zero, .L809859CC /* 00D88 80985968 3C040601 */ lui $a0, 0x0601 ## $a0 = 06010000 /* 00D8C 8098596C 0C028800 */ jal SkelAnime_GetFrameCount - + /* 00D90 80985970 24841C08 */ addiu $a0, $a0, 0x1C08 ## $a0 = 06011C08 /* 00D94 80985974 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 00D98 80985978 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 /* 00D9C 8098597C 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 -/* 00DA0 80985980 468021A0 */ cvt.s.w $f6, $f4 +/* 00DA0 80985980 468021A0 */ cvt.s.w $f6, $f4 /* 00DA4 80985984 240E0002 */ addiu $t6, $zero, 0x0002 ## $t6 = 00000002 -/* 00DA8 80985988 44070000 */ mfc1 $a3, $f0 -/* 00DAC 8098598C AFAE0014 */ sw $t6, 0x0014($sp) +/* 00DA8 80985988 44070000 */ mfc1 $a3, $f0 +/* 00DAC 8098598C AFAE0014 */ sw $t6, 0x0014($sp) /* 00DB0 80985990 24A51C08 */ addiu $a1, $a1, 0x1C08 ## $a1 = 06011C08 /* 00DB4 80985994 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C -/* 00DB8 80985998 E7A60010 */ swc1 $f6, 0x0010($sp) +/* 00DB8 80985998 E7A60010 */ swc1 $f6, 0x0010($sp) /* 00DBC 8098599C 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 00DC0 809859A0 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 00DC4 809859A4 E7A00018 */ swc1 $f0, 0x0018($sp) +/* 00DC0 809859A0 0C029468 */ jal SkelAnime_ChangeAnim + +/* 00DC4 809859A4 E7A00018 */ swc1 $f0, 0x0018($sp) /* 00DC8 809859A8 44804000 */ mtc1 $zero, $f8 ## $f8 = 0.00 /* 00DCC 809859AC 240F0008 */ addiu $t7, $zero, 0x0008 ## $t7 = 00000008 /* 00DD0 809859B0 24180002 */ addiu $t8, $zero, 0x0002 ## $t8 = 00000002 @@ -32,13 +32,13 @@ glabel func_80985948 /* 00DD8 809859B8 AE180264 */ sw $t8, 0x0264($s0) ## 00000264 /* 00DDC 809859BC AE00026C */ sw $zero, 0x026C($s0) ## 0000026C /* 00DE0 809859C0 A20000C8 */ sb $zero, 0x00C8($s0) ## 000000C8 -/* 00DE4 809859C4 0C26162A */ jal func_809858A8 +/* 00DE4 809859C4 0C26162A */ jal func_809858A8 /* 00DE8 809859C8 E6080268 */ swc1 $f8, 0x0268($s0) ## 00000268 .L809859CC: -/* 00DEC 809859CC 8FBF002C */ lw $ra, 0x002C($sp) -/* 00DF0 809859D0 8FB00028 */ lw $s0, 0x0028($sp) +/* 00DEC 809859CC 8FBF002C */ lw $ra, 0x002C($sp) +/* 00DF0 809859D0 8FB00028 */ lw $s0, 0x0028($sp) /* 00DF4 809859D4 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 00DF8 809859D8 03E00008 */ jr $ra +/* 00DF8 809859D8 03E00008 */ jr $ra /* 00DFC 809859DC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80985B34.s b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80985B34.s index 8503161eda..747768ba5c 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80985B34.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80985B34.s @@ -1,32 +1,32 @@ glabel func_80985B34 /* 00F54 80985B34 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 00F58 80985B38 AFBF002C */ sw $ra, 0x002C($sp) -/* 00F5C 80985B3C AFB00028 */ sw $s0, 0x0028($sp) +/* 00F58 80985B38 AFBF002C */ sw $ra, 0x002C($sp) +/* 00F5C 80985B3C AFB00028 */ sw $s0, 0x0028($sp) /* 00F60 80985B40 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00F64 80985B44 AFA50034 */ sw $a1, 0x0034($sp) +/* 00F64 80985B44 AFA50034 */ sw $a1, 0x0034($sp) /* 00F68 80985B48 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 -/* 00F6C 80985B4C 0C26144D */ jal func_80985134 +/* 00F6C 80985B4C 0C26144D */ jal func_80985134 /* 00F70 80985B50 24070005 */ addiu $a3, $zero, 0x0005 ## $a3 = 00000005 -/* 00F74 80985B54 10400029 */ beq $v0, $zero, .L80985BFC +/* 00F74 80985B54 10400029 */ beq $v0, $zero, .L80985BFC /* 00F78 80985B58 3C040601 */ lui $a0, 0x0601 ## $a0 = 06010000 /* 00F7C 80985B5C 0C028800 */ jal SkelAnime_GetFrameCount - + /* 00F80 80985B60 24842218 */ addiu $a0, $a0, 0x2218 ## $a0 = 06012218 /* 00F84 80985B64 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 00F88 80985B68 3C01C100 */ lui $at, 0xC100 ## $at = C1000000 /* 00F8C 80985B6C 44814000 */ mtc1 $at, $f8 ## $f8 = -8.00 -/* 00F90 80985B70 468021A0 */ cvt.s.w $f6, $f4 +/* 00F90 80985B70 468021A0 */ cvt.s.w $f6, $f4 /* 00F94 80985B74 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 /* 00F98 80985B78 240E0002 */ addiu $t6, $zero, 0x0002 ## $t6 = 00000002 -/* 00F9C 80985B7C AFAE0014 */ sw $t6, 0x0014($sp) +/* 00F9C 80985B7C AFAE0014 */ sw $t6, 0x0014($sp) /* 00FA0 80985B80 24A52218 */ addiu $a1, $a1, 0x2218 ## $a1 = 06012218 /* 00FA4 80985B84 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C -/* 00FA8 80985B88 E7A60010 */ swc1 $f6, 0x0010($sp) +/* 00FA8 80985B88 E7A60010 */ swc1 $f6, 0x0010($sp) /* 00FAC 80985B8C 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 00FB0 80985B90 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 00FB4 80985B94 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 00FB8 80985B98 E7A80018 */ swc1 $f8, 0x0018($sp) +/* 00FB4 80985B94 0C029468 */ jal SkelAnime_ChangeAnim + +/* 00FB8 80985B98 E7A80018 */ swc1 $f8, 0x0018($sp) /* 00FBC 80985B9C 240F0008 */ addiu $t7, $zero, 0x0008 ## $t7 = 00000008 /* 00FC0 80985BA0 24180002 */ addiu $t8, $zero, 0x0002 ## $t8 = 00000002 /* 00FC4 80985BA4 AE0F0260 */ sw $t7, 0x0260($s0) ## 00000260 @@ -41,22 +41,22 @@ glabel func_80985B34 /* 00FE8 80985BC8 44885000 */ mtc1 $t0, $f10 ## $f10 = 0.00 /* 00FEC 80985BCC AE09026C */ sw $t1, 0x026C($s0) ## 0000026C /* 00FF0 80985BD0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00FF4 80985BD4 46805420 */ cvt.s.w $f16, $f10 -/* 00FF8 80985BD8 46128100 */ add.s $f4, $f16, $f18 -/* 00FFC 80985BDC 15400005 */ bne $t2, $zero, .L80985BF4 +/* 00FF4 80985BD4 46805420 */ cvt.s.w $f16, $f10 +/* 00FF8 80985BD8 46128100 */ add.s $f4, $f16, $f18 +/* 00FFC 80985BDC 15400005 */ bne $t2, $zero, .L80985BF4 /* 01000 80985BE0 E6040268 */ swc1 $f4, 0x0268($s0) ## 00000268 -/* 01004 80985BE4 0C261632 */ jal func_809858C8 -/* 01008 80985BE8 8FA50034 */ lw $a1, 0x0034($sp) +/* 01004 80985BE4 0C261632 */ jal func_809858C8 +/* 01008 80985BE8 8FA50034 */ lw $a1, 0x0034($sp) /* 0100C 80985BEC 240B0001 */ addiu $t3, $zero, 0x0001 ## $t3 = 00000001 /* 01010 80985BF0 AE0B0270 */ sw $t3, 0x0270($s0) ## 00000270 .L80985BF4: /* 01014 80985BF4 240C00FF */ addiu $t4, $zero, 0x00FF ## $t4 = 000000FF /* 01018 80985BF8 A20C00C8 */ sb $t4, 0x00C8($s0) ## 000000C8 .L80985BFC: -/* 0101C 80985BFC 8FBF002C */ lw $ra, 0x002C($sp) -/* 01020 80985C00 8FB00028 */ lw $s0, 0x0028($sp) +/* 0101C 80985BFC 8FBF002C */ lw $ra, 0x002C($sp) +/* 01020 80985C00 8FB00028 */ lw $s0, 0x0028($sp) /* 01024 80985C04 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 01028 80985C08 03E00008 */ jr $ra +/* 01028 80985C08 03E00008 */ jr $ra /* 0102C 80985C0C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80985CE8.s b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80985CE8.s index dcd7e99143..6ad258b256 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80985CE8.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80985CE8.s @@ -1,45 +1,45 @@ glabel func_80985CE8 /* 01108 80985CE8 27BDFF88 */ addiu $sp, $sp, 0xFF88 ## $sp = FFFFFF88 -/* 0110C 80985CEC AFBF002C */ sw $ra, 0x002C($sp) -/* 01110 80985CF0 AFB00028 */ sw $s0, 0x0028($sp) -/* 01114 80985CF4 AFA40078 */ sw $a0, 0x0078($sp) -/* 01118 80985CF8 AFA5007C */ sw $a1, 0x007C($sp) +/* 0110C 80985CEC AFBF002C */ sw $ra, 0x002C($sp) +/* 01110 80985CF0 AFB00028 */ sw $s0, 0x0028($sp) +/* 01114 80985CF4 AFA40078 */ sw $a0, 0x0078($sp) +/* 01118 80985CF8 AFA5007C */ sw $a1, 0x007C($sp) /* 0111C 80985CFC 8482025C */ lh $v0, 0x025C($a0) ## 0000025C /* 01120 80985D00 3C188098 */ lui $t8, %hi(D_80987830) ## $t8 = 80980000 /* 01124 80985D04 3C068099 */ lui $a2, %hi(D_80988810) ## $a2 = 80990000 -/* 01128 80985D08 00027880 */ sll $t7, $v0, 2 -/* 0112C 80985D0C 030FC021 */ addu $t8, $t8, $t7 -/* 01130 80985D10 8F187830 */ lw $t8, %lo(D_80987830)($t8) +/* 01128 80985D08 00027880 */ sll $t7, $v0, 2 +/* 0112C 80985D0C 030FC021 */ addu $t8, $t8, $t7 +/* 01130 80985D10 8F187830 */ lw $t8, %lo(D_80987830)($t8) /* 01134 80985D14 24C68810 */ addiu $a2, $a2, %lo(D_80988810) ## $a2 = 80988810 /* 01138 80985D18 27A40050 */ addiu $a0, $sp, 0x0050 ## $a0 = FFFFFFD8 -/* 0113C 80985D1C AFB80068 */ sw $t8, 0x0068($sp) +/* 0113C 80985D1C AFB80068 */ sw $t8, 0x0068($sp) /* 01140 80985D20 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 /* 01144 80985D24 24070119 */ addiu $a3, $zero, 0x0119 ## $a3 = 00000119 -/* 01148 80985D28 0C031AB1 */ jal func_800C6AC4 +/* 01148 80985D28 0C031AB1 */ jal Graph_OpenDisps /* 0114C 80985D2C 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 -/* 01150 80985D30 8FA9007C */ lw $t1, 0x007C($sp) -/* 01154 80985D34 0C024F61 */ jal func_80093D84 +/* 01150 80985D30 8FA9007C */ lw $t1, 0x007C($sp) +/* 01154 80985D34 0C024F61 */ jal func_80093D84 /* 01158 80985D38 8D240000 */ lw $a0, 0x0000($t1) ## 00000000 -/* 0115C 80985D3C 8FA70068 */ lw $a3, 0x0068($sp) +/* 0115C 80985D3C 8FA70068 */ lw $a3, 0x0068($sp) /* 01160 80985D40 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 /* 01164 80985D44 3C0BDB06 */ lui $t3, 0xDB06 ## $t3 = DB060000 -/* 01168 80985D48 00076100 */ sll $t4, $a3, 4 -/* 0116C 80985D4C 000C6F02 */ srl $t5, $t4, 28 +/* 01168 80985D48 00076100 */ sll $t4, $a3, 4 +/* 0116C 80985D4C 000C6F02 */ srl $t5, $t4, 28 /* 01170 80985D50 3C0F8016 */ lui $t7, 0x8016 ## $t7 = 80160000 /* 01174 80985D54 244A0008 */ addiu $t2, $v0, 0x0008 ## $t2 = 00000008 /* 01178 80985D58 AE0A02D0 */ sw $t2, 0x02D0($s0) ## 000002D0 /* 0117C 80985D5C 25EF6FA8 */ addiu $t7, $t7, 0x6FA8 ## $t7 = 80166FA8 -/* 01180 80985D60 000D7080 */ sll $t6, $t5, 2 +/* 01180 80985D60 000D7080 */ sll $t6, $t5, 2 /* 01184 80985D64 356B0020 */ ori $t3, $t3, 0x0020 ## $t3 = DB060020 -/* 01188 80985D68 01CF2021 */ addu $a0, $t6, $t7 +/* 01188 80985D68 01CF2021 */ addu $a0, $t6, $t7 /* 0118C 80985D6C AC4B0000 */ sw $t3, 0x0000($v0) ## 00000000 /* 01190 80985D70 8C980000 */ lw $t8, 0x0000($a0) ## 00000000 /* 01194 80985D74 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 /* 01198 80985D78 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF -/* 0119C 80985D7C 00E12824 */ and $a1, $a3, $at +/* 0119C 80985D7C 00E12824 */ and $a1, $a3, $at /* 011A0 80985D80 3C068000 */ lui $a2, 0x8000 ## $a2 = 80000000 -/* 011A4 80985D84 0305C821 */ addu $t9, $t8, $a1 -/* 011A8 80985D88 03264821 */ addu $t1, $t9, $a2 +/* 011A4 80985D84 0305C821 */ addu $t9, $t8, $a1 +/* 011A8 80985D88 03264821 */ addu $t1, $t9, $a2 /* 011AC 80985D8C AC490004 */ sw $t1, 0x0004($v0) ## 00000004 /* 011B0 80985D90 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 /* 011B4 80985D94 3C0BDB06 */ lui $t3, 0xDB06 ## $t3 = DB060000 @@ -50,11 +50,11 @@ glabel func_80985CE8 /* 011C8 80985DA8 8C8C0000 */ lw $t4, 0x0000($a0) ## 00000000 /* 011CC 80985DAC 3C18FB00 */ lui $t8, 0xFB00 ## $t8 = FB000000 /* 011D0 80985DB0 3C0BDB06 */ lui $t3, 0xDB06 ## $t3 = DB060000 -/* 011D4 80985DB4 01856821 */ addu $t5, $t4, $a1 -/* 011D8 80985DB8 01A67021 */ addu $t6, $t5, $a2 +/* 011D4 80985DB4 01856821 */ addu $t5, $t4, $a1 +/* 011D8 80985DB8 01A67021 */ addu $t6, $t5, $a2 /* 011DC 80985DBC AC4E0004 */ sw $t6, 0x0004($v0) ## 00000004 /* 011E0 80985DC0 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 011E4 80985DC4 8FA80078 */ lw $t0, 0x0078($sp) +/* 011E4 80985DC4 8FA80078 */ lw $t0, 0x0078($sp) /* 011E8 80985DC8 3C0C8011 */ lui $t4, 0x8011 ## $t4 = 80110000 /* 011EC 80985DCC 244F0008 */ addiu $t7, $v0, 0x0008 ## $t7 = 00000008 /* 011F0 80985DD0 AE0F02D0 */ sw $t7, 0x02D0($s0) ## 000002D0 @@ -73,25 +73,25 @@ glabel func_80985CE8 /* 01224 80985E04 8C450004 */ lw $a1, 0x0004($v0) ## 00000150 /* 01228 80985E08 8C460020 */ lw $a2, 0x0020($v0) ## 0000016C /* 0122C 80985E0C 90470002 */ lbu $a3, 0x0002($v0) ## 0000014E -/* 01230 80985E10 AFA00018 */ sw $zero, 0x0018($sp) -/* 01234 80985E14 AFA00014 */ sw $zero, 0x0014($sp) -/* 01238 80985E18 AFA00010 */ sw $zero, 0x0010($sp) +/* 01230 80985E10 AFA00018 */ sw $zero, 0x0018($sp) +/* 01234 80985E14 AFA00014 */ sw $zero, 0x0014($sp) +/* 01238 80985E18 AFA00010 */ sw $zero, 0x0010($sp) /* 0123C 80985E1C 8E0D02D0 */ lw $t5, 0x02D0($s0) ## 000002D0 -/* 01240 80985E20 8FA4007C */ lw $a0, 0x007C($sp) -/* 01244 80985E24 0C0289CF */ jal func_800A273C -/* 01248 80985E28 AFAD001C */ sw $t5, 0x001C($sp) +/* 01240 80985E20 8FA4007C */ lw $a0, 0x007C($sp) +/* 01244 80985E24 0C0289CF */ jal SkelAnime_DrawSV2 +/* 01248 80985E28 AFAD001C */ sw $t5, 0x001C($sp) /* 0124C 80985E2C AE0202D0 */ sw $v0, 0x02D0($s0) ## 000002D0 -/* 01250 80985E30 8FAE007C */ lw $t6, 0x007C($sp) +/* 01250 80985E30 8FAE007C */ lw $t6, 0x007C($sp) /* 01254 80985E34 3C068099 */ lui $a2, %hi(D_80988834) ## $a2 = 80990000 /* 01258 80985E38 24C68834 */ addiu $a2, $a2, %lo(D_80988834) ## $a2 = 80988834 /* 0125C 80985E3C 27A40050 */ addiu $a0, $sp, 0x0050 ## $a0 = FFFFFFD8 /* 01260 80985E40 24070134 */ addiu $a3, $zero, 0x0134 ## $a3 = 00000134 -/* 01264 80985E44 0C031AD5 */ jal func_800C6B54 +/* 01264 80985E44 0C031AD5 */ jal Graph_CloseDisps /* 01268 80985E48 8DC50000 */ lw $a1, 0x0000($t6) ## 00000000 -/* 0126C 80985E4C 8FBF002C */ lw $ra, 0x002C($sp) -/* 01270 80985E50 8FB00028 */ lw $s0, 0x0028($sp) +/* 0126C 80985E4C 8FBF002C */ lw $ra, 0x002C($sp) +/* 01270 80985E50 8FB00028 */ lw $s0, 0x0028($sp) /* 01274 80985E54 27BD0078 */ addiu $sp, $sp, 0x0078 ## $sp = 00000000 -/* 01278 80985E58 03E00008 */ jr $ra +/* 01278 80985E58 03E00008 */ jr $ra /* 0127C 80985E5C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80985F64.s b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80985F64.s index 1242c4b5cd..d06303b8c0 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80985F64.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80985F64.s @@ -1,38 +1,38 @@ glabel func_80985F64 /* 01384 80985F64 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 01388 80985F68 AFA40028 */ sw $a0, 0x0028($sp) -/* 0138C 80985F6C AFBF0024 */ sw $ra, 0x0024($sp) +/* 01388 80985F68 AFA40028 */ sw $a0, 0x0028($sp) +/* 0138C 80985F6C AFBF0024 */ sw $ra, 0x0024($sp) /* 01390 80985F70 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 -/* 01394 80985F74 AFA5002C */ sw $a1, 0x002C($sp) +/* 01394 80985F74 AFA5002C */ sw $a1, 0x002C($sp) /* 01398 80985F78 0C028800 */ jal SkelAnime_GetFrameCount - + /* 0139C 80985F7C 24841868 */ addiu $a0, $a0, 0x1868 ## $a0 = 06001868 /* 013A0 80985F80 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 013A4 80985F84 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 013A8 80985F88 8FA40028 */ lw $a0, 0x0028($sp) -/* 013AC 80985F8C 468021A0 */ cvt.s.w $f6, $f4 +/* 013A8 80985F88 8FA40028 */ lw $a0, 0x0028($sp) +/* 013AC 80985F8C 468021A0 */ cvt.s.w $f6, $f4 /* 013B0 80985F90 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 013B4 80985F94 44070000 */ mfc1 $a3, $f0 +/* 013B4 80985F94 44070000 */ mfc1 $a3, $f0 /* 013B8 80985F98 24A51868 */ addiu $a1, $a1, 0x1868 ## $a1 = 06001868 /* 013BC 80985F9C 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 013C0 80985FA0 AFA00014 */ sw $zero, 0x0014($sp) -/* 013C4 80985FA4 E7A60010 */ swc1 $f6, 0x0010($sp) +/* 013C0 80985FA0 AFA00014 */ sw $zero, 0x0014($sp) +/* 013C4 80985FA4 E7A60010 */ swc1 $f6, 0x0010($sp) /* 013C8 80985FA8 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 013CC 80985FAC 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 013D0 80985FB0 E7A00018 */ swc1 $f0, 0x0018($sp) -/* 013D4 80985FB4 8FA40028 */ lw $a0, 0x0028($sp) -/* 013D8 80985FB8 8FA5002C */ lw $a1, 0x002C($sp) -/* 013DC 80985FBC 0C261460 */ jal func_80985180 +/* 013CC 80985FAC 0C029468 */ jal SkelAnime_ChangeAnim + +/* 013D0 80985FB0 E7A00018 */ swc1 $f0, 0x0018($sp) +/* 013D4 80985FB4 8FA40028 */ lw $a0, 0x0028($sp) +/* 013D8 80985FB8 8FA5002C */ lw $a1, 0x002C($sp) +/* 013DC 80985FBC 0C261460 */ jal func_80985180 /* 013E0 80985FC0 24060005 */ addiu $a2, $zero, 0x0005 ## $a2 = 00000005 -/* 013E4 80985FC4 8FA20028 */ lw $v0, 0x0028($sp) +/* 013E4 80985FC4 8FA20028 */ lw $v0, 0x0028($sp) /* 013E8 80985FC8 240E000B */ addiu $t6, $zero, 0x000B ## $t6 = 0000000B /* 013EC 80985FCC 240F0001 */ addiu $t7, $zero, 0x0001 ## $t7 = 00000001 /* 013F0 80985FD0 AC4E0260 */ sw $t6, 0x0260($v0) ## 00000260 /* 013F4 80985FD4 AC4F0264 */ sw $t7, 0x0264($v0) ## 00000264 -/* 013F8 80985FD8 8FBF0024 */ lw $ra, 0x0024($sp) +/* 013F8 80985FD8 8FBF0024 */ lw $ra, 0x0024($sp) /* 013FC 80985FDC 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 01400 80985FE0 03E00008 */ jr $ra +/* 01400 80985FE0 03E00008 */ jr $ra /* 01404 80985FE4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80985FE8.s b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80985FE8.s index 9b34cbd792..fd8567688f 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80985FE8.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80985FE8.s @@ -1,31 +1,31 @@ glabel func_80985FE8 /* 01408 80985FE8 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 0140C 80985FEC AFBF0024 */ sw $ra, 0x0024($sp) -/* 01410 80985FF0 10A00012 */ beq $a1, $zero, .L8098603C -/* 01414 80985FF4 AFA40028 */ sw $a0, 0x0028($sp) +/* 0140C 80985FEC AFBF0024 */ sw $ra, 0x0024($sp) +/* 01410 80985FF0 10A00012 */ beq $a1, $zero, .L8098603C +/* 01414 80985FF4 AFA40028 */ sw $a0, 0x0028($sp) /* 01418 80985FF8 3C040601 */ lui $a0, 0x0601 ## $a0 = 06010000 /* 0141C 80985FFC 0C028800 */ jal SkelAnime_GetFrameCount - + /* 01420 80986000 2484182C */ addiu $a0, $a0, 0x182C ## $a0 = 0601182C /* 01424 80986004 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 01428 80986008 3C01C100 */ lui $at, 0xC100 ## $at = C1000000 /* 0142C 8098600C 44814000 */ mtc1 $at, $f8 ## $f8 = -8.00 -/* 01430 80986010 468021A0 */ cvt.s.w $f6, $f4 -/* 01434 80986014 8FA40028 */ lw $a0, 0x0028($sp) +/* 01430 80986010 468021A0 */ cvt.s.w $f6, $f4 +/* 01434 80986014 8FA40028 */ lw $a0, 0x0028($sp) /* 01438 80986018 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 /* 0143C 8098601C 24A5182C */ addiu $a1, $a1, 0x182C ## $a1 = 0601182C /* 01440 80986020 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 01444 80986024 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 01448 80986028 E7A60010 */ swc1 $f6, 0x0010($sp) -/* 0144C 8098602C AFA00014 */ sw $zero, 0x0014($sp) -/* 01450 80986030 E7A80018 */ swc1 $f8, 0x0018($sp) -/* 01454 80986034 0C029468 */ jal SkelAnime_ChangeAnimation - +/* 01448 80986028 E7A60010 */ swc1 $f6, 0x0010($sp) +/* 0144C 8098602C AFA00014 */ sw $zero, 0x0014($sp) +/* 01450 80986030 E7A80018 */ swc1 $f8, 0x0018($sp) +/* 01454 80986034 0C029468 */ jal SkelAnime_ChangeAnim + /* 01458 80986038 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C .L8098603C: -/* 0145C 8098603C 8FBF0024 */ lw $ra, 0x0024($sp) +/* 0145C 8098603C 8FBF0024 */ lw $ra, 0x0024($sp) /* 01460 80986040 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 01464 80986044 03E00008 */ jr $ra +/* 01464 80986044 03E00008 */ jr $ra /* 01468 80986048 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_8098604C.s b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_8098604C.s index d765981897..df08c022bd 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_8098604C.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_8098604C.s @@ -1,36 +1,36 @@ glabel func_8098604C /* 0146C 8098604C 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 01470 80986050 AFA40028 */ sw $a0, 0x0028($sp) -/* 01474 80986054 AFBF0024 */ sw $ra, 0x0024($sp) +/* 01470 80986050 AFA40028 */ sw $a0, 0x0028($sp) +/* 01474 80986054 AFBF0024 */ sw $ra, 0x0024($sp) /* 01478 80986058 3C040601 */ lui $a0, 0x0601 ## $a0 = 06010000 /* 0147C 8098605C 0C028800 */ jal SkelAnime_GetFrameCount - + /* 01480 80986060 24840EE0 */ addiu $a0, $a0, 0x0EE0 ## $a0 = 06010EE0 /* 01484 80986064 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 01488 80986068 3C01C100 */ lui $at, 0xC100 ## $at = C1000000 -/* 0148C 8098606C 8FA30028 */ lw $v1, 0x0028($sp) -/* 01490 80986070 468021A0 */ cvt.s.w $f6, $f4 +/* 0148C 8098606C 8FA30028 */ lw $v1, 0x0028($sp) +/* 01490 80986070 468021A0 */ cvt.s.w $f6, $f4 /* 01494 80986074 44814000 */ mtc1 $at, $f8 ## $f8 = -8.00 /* 01498 80986078 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 /* 0149C 8098607C 240E0002 */ addiu $t6, $zero, 0x0002 ## $t6 = 00000002 -/* 014A0 80986080 AFAE0014 */ sw $t6, 0x0014($sp) +/* 014A0 80986080 AFAE0014 */ sw $t6, 0x0014($sp) /* 014A4 80986084 24A50EE0 */ addiu $a1, $a1, 0x0EE0 ## $a1 = 06010EE0 -/* 014A8 80986088 E7A60010 */ swc1 $f6, 0x0010($sp) +/* 014A8 80986088 E7A60010 */ swc1 $f6, 0x0010($sp) /* 014AC 8098608C 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 014B0 80986090 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 /* 014B4 80986094 2464014C */ addiu $a0, $v1, 0x014C ## $a0 = 0000014C -/* 014B8 80986098 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 014BC 8098609C E7A80018 */ swc1 $f8, 0x0018($sp) -/* 014C0 809860A0 8FA30028 */ lw $v1, 0x0028($sp) +/* 014B8 80986098 0C029468 */ jal SkelAnime_ChangeAnim + +/* 014BC 8098609C E7A80018 */ swc1 $f8, 0x0018($sp) +/* 014C0 809860A0 8FA30028 */ lw $v1, 0x0028($sp) /* 014C4 809860A4 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 /* 014C8 809860A8 240F000C */ addiu $t7, $zero, 0x000C ## $t7 = 0000000C /* 014CC 809860AC AC6F0260 */ sw $t7, 0x0260($v1) ## 00000260 /* 014D0 809860B0 AC620264 */ sw $v0, 0x0264($v1) ## 00000264 /* 014D4 809860B4 AC6202D0 */ sw $v0, 0x02D0($v1) ## 000002D0 -/* 014D8 809860B8 8FBF0024 */ lw $ra, 0x0024($sp) +/* 014D8 809860B8 8FBF0024 */ lw $ra, 0x0024($sp) /* 014DC 809860BC 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 014E0 809860C0 03E00008 */ jr $ra +/* 014E0 809860C0 03E00008 */ jr $ra /* 014E4 809860C4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_809860DC.s b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_809860DC.s index a2f04191a7..7778730be3 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_809860DC.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_809860DC.s @@ -1,33 +1,33 @@ glabel func_809860DC /* 014FC 809860DC 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 01500 809860E0 AFBF0024 */ sw $ra, 0x0024($sp) -/* 01504 809860E4 10A00014 */ beq $a1, $zero, .L80986138 -/* 01508 809860E8 AFA40028 */ sw $a0, 0x0028($sp) +/* 01500 809860E0 AFBF0024 */ sw $ra, 0x0024($sp) +/* 01504 809860E4 10A00014 */ beq $a1, $zero, .L80986138 +/* 01508 809860E8 AFA40028 */ sw $a0, 0x0028($sp) /* 0150C 809860EC 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 /* 01510 809860F0 0C028800 */ jal SkelAnime_GetFrameCount - + /* 01514 809860F4 24841868 */ addiu $a0, $a0, 0x1868 ## $a0 = 06001868 /* 01518 809860F8 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 0151C 809860FC 3C01C100 */ lui $at, 0xC100 ## $at = C1000000 /* 01520 80986100 44814000 */ mtc1 $at, $f8 ## $f8 = -8.00 -/* 01524 80986104 468021A0 */ cvt.s.w $f6, $f4 -/* 01528 80986108 8FA40028 */ lw $a0, 0x0028($sp) +/* 01524 80986104 468021A0 */ cvt.s.w $f6, $f4 +/* 01528 80986108 8FA40028 */ lw $a0, 0x0028($sp) /* 0152C 8098610C 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 01530 80986110 24A51868 */ addiu $a1, $a1, 0x1868 ## $a1 = 06001868 /* 01534 80986114 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 01538 80986118 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 0153C 8098611C E7A60010 */ swc1 $f6, 0x0010($sp) -/* 01540 80986120 AFA00014 */ sw $zero, 0x0014($sp) -/* 01544 80986124 E7A80018 */ swc1 $f8, 0x0018($sp) -/* 01548 80986128 0C029468 */ jal SkelAnime_ChangeAnimation - +/* 0153C 8098611C E7A60010 */ swc1 $f6, 0x0010($sp) +/* 01540 80986120 AFA00014 */ sw $zero, 0x0014($sp) +/* 01544 80986124 E7A80018 */ swc1 $f8, 0x0018($sp) +/* 01548 80986128 0C029468 */ jal SkelAnime_ChangeAnim + /* 0154C 8098612C 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 01550 80986130 8FAE0028 */ lw $t6, 0x0028($sp) +/* 01550 80986130 8FAE0028 */ lw $t6, 0x0028($sp) /* 01554 80986134 ADC002D0 */ sw $zero, 0x02D0($t6) ## 000002D0 .L80986138: -/* 01558 80986138 8FBF0024 */ lw $ra, 0x0024($sp) +/* 01558 80986138 8FBF0024 */ lw $ra, 0x0024($sp) /* 0155C 8098613C 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 01560 80986140 03E00008 */ jr $ra +/* 01560 80986140 03E00008 */ jr $ra /* 01564 80986144 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80986148.s b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80986148.s index 7c6900ec70..6f98c9ea93 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80986148.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80986148.s @@ -1,36 +1,36 @@ glabel func_80986148 /* 01568 80986148 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 0156C 8098614C AFA40028 */ sw $a0, 0x0028($sp) -/* 01570 80986150 AFBF0024 */ sw $ra, 0x0024($sp) +/* 0156C 8098614C AFA40028 */ sw $a0, 0x0028($sp) +/* 01570 80986150 AFBF0024 */ sw $ra, 0x0024($sp) /* 01574 80986154 3C040601 */ lui $a0, 0x0601 ## $a0 = 06010000 /* 01578 80986158 0C028800 */ jal SkelAnime_GetFrameCount - + /* 0157C 8098615C 24840EE0 */ addiu $a0, $a0, 0x0EE0 ## $a0 = 06010EE0 /* 01580 80986160 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 01584 80986164 3C01C100 */ lui $at, 0xC100 ## $at = C1000000 /* 01588 80986168 44814000 */ mtc1 $at, $f8 ## $f8 = -8.00 -/* 0158C 8098616C 46802120 */ cvt.s.w $f4, $f4 -/* 01590 80986170 8FA40028 */ lw $a0, 0x0028($sp) +/* 0158C 8098616C 46802120 */ cvt.s.w $f4, $f4 +/* 01590 80986170 8FA40028 */ lw $a0, 0x0028($sp) /* 01594 80986174 44803000 */ mtc1 $zero, $f6 ## $f6 = 0.00 /* 01598 80986178 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 /* 0159C 8098617C 240E0002 */ addiu $t6, $zero, 0x0002 ## $t6 = 00000002 -/* 015A0 80986180 AFAE0014 */ sw $t6, 0x0014($sp) -/* 015A4 80986184 44072000 */ mfc1 $a3, $f4 +/* 015A0 80986180 AFAE0014 */ sw $t6, 0x0014($sp) +/* 015A4 80986184 44072000 */ mfc1 $a3, $f4 /* 015A8 80986188 24A50EE0 */ addiu $a1, $a1, 0x0EE0 ## $a1 = 06010EE0 /* 015AC 8098618C 3C06BF80 */ lui $a2, 0xBF80 ## $a2 = BF800000 -/* 015B0 80986190 E7A80018 */ swc1 $f8, 0x0018($sp) +/* 015B0 80986190 E7A80018 */ swc1 $f8, 0x0018($sp) /* 015B4 80986194 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 015B8 80986198 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 015BC 8098619C E7A60010 */ swc1 $f6, 0x0010($sp) -/* 015C0 809861A0 8FA20028 */ lw $v0, 0x0028($sp) +/* 015B8 80986198 0C029468 */ jal SkelAnime_ChangeAnim + +/* 015BC 8098619C E7A60010 */ swc1 $f6, 0x0010($sp) +/* 015C0 809861A0 8FA20028 */ lw $v0, 0x0028($sp) /* 015C4 809861A4 240F000E */ addiu $t7, $zero, 0x000E ## $t7 = 0000000E /* 015C8 809861A8 24180001 */ addiu $t8, $zero, 0x0001 ## $t8 = 00000001 /* 015CC 809861AC AC4F0260 */ sw $t7, 0x0260($v0) ## 00000260 /* 015D0 809861B0 AC580264 */ sw $t8, 0x0264($v0) ## 00000264 -/* 015D4 809861B4 8FBF0024 */ lw $ra, 0x0024($sp) +/* 015D4 809861B4 8FBF0024 */ lw $ra, 0x0024($sp) /* 015D8 809861B8 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 015DC 809861BC 03E00008 */ jr $ra +/* 015DC 809861BC 03E00008 */ jr $ra /* 015E0 809861C0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_809861C4.s b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_809861C4.s index 81d2acd020..9b232dc892 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_809861C4.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_809861C4.s @@ -1,64 +1,64 @@ glabel func_809861C4 /* 015E4 809861C4 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 015E8 809861C8 AFB00028 */ sw $s0, 0x0028($sp) +/* 015E8 809861C8 AFB00028 */ sw $s0, 0x0028($sp) /* 015EC 809861CC 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 015F0 809861D0 AFBF002C */ sw $ra, 0x002C($sp) +/* 015F0 809861D0 AFBF002C */ sw $ra, 0x002C($sp) /* 015F4 809861D4 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 015F8 809861D8 0C261428 */ jal func_809850A0 +/* 015F8 809861D8 0C261428 */ jal func_809850A0 /* 015FC 809861DC 24050005 */ addiu $a1, $zero, 0x0005 ## $a1 = 00000005 -/* 01600 809861E0 5040002A */ beql $v0, $zero, .L8098628C -/* 01604 809861E4 8FBF002C */ lw $ra, 0x002C($sp) +/* 01600 809861E0 5040002A */ beql $v0, $zero, .L8098628C +/* 01604 809861E4 8FBF002C */ lw $ra, 0x002C($sp) /* 01608 809861E8 94480000 */ lhu $t0, 0x0000($v0) ## 00000000 /* 0160C 809861EC 8E030274 */ lw $v1, 0x0274($s0) ## 00000274 /* 01610 809861F0 24010007 */ addiu $at, $zero, 0x0007 ## $at = 00000007 -/* 01614 809861F4 51030025 */ beql $t0, $v1, .L8098628C -/* 01618 809861F8 8FBF002C */ lw $ra, 0x002C($sp) -/* 0161C 809861FC 11010009 */ beq $t0, $at, .L80986224 +/* 01614 809861F4 51030025 */ beql $t0, $v1, .L8098628C +/* 01618 809861F8 8FBF002C */ lw $ra, 0x002C($sp) +/* 0161C 809861FC 11010009 */ beq $t0, $at, .L80986224 /* 01620 80986200 3C040601 */ lui $a0, 0x0601 ## $a0 = 06010000 /* 01624 80986204 24010009 */ addiu $at, $zero, 0x0009 ## $at = 00000009 -/* 01628 80986208 1501001A */ bne $t0, $at, .L80986274 +/* 01628 80986208 1501001A */ bne $t0, $at, .L80986274 /* 0162C 8098620C 3C048099 */ lui $a0, %hi(D_80988858) ## $a0 = 80990000 /* 01630 80986210 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01634 80986214 0C261852 */ jal func_80986148 -/* 01638 80986218 AFA80030 */ sw $t0, 0x0030($sp) -/* 0163C 8098621C 10000019 */ beq $zero, $zero, .L80986284 -/* 01640 80986220 8FA80030 */ lw $t0, 0x0030($sp) +/* 01634 80986214 0C261852 */ jal func_80986148 +/* 01638 80986218 AFA80030 */ sw $t0, 0x0030($sp) +/* 0163C 8098621C 10000019 */ beq $zero, $zero, .L80986284 +/* 01640 80986220 8FA80030 */ lw $t0, 0x0030($sp) .L80986224: /* 01644 80986224 2484182C */ addiu $a0, $a0, 0x182C ## $a0 = 0000182C /* 01648 80986228 0C028800 */ jal SkelAnime_GetFrameCount - -/* 0164C 8098622C AFA80030 */ sw $t0, 0x0030($sp) + +/* 0164C 8098622C AFA80030 */ sw $t0, 0x0030($sp) /* 01650 80986230 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 01654 80986234 3C01C100 */ lui $at, 0xC100 ## $at = C1000000 /* 01658 80986238 44814000 */ mtc1 $at, $f8 ## $f8 = -8.00 -/* 0165C 8098623C 468021A0 */ cvt.s.w $f6, $f4 +/* 0165C 8098623C 468021A0 */ cvt.s.w $f6, $f4 /* 01660 80986240 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 /* 01664 80986244 24A5182C */ addiu $a1, $a1, 0x182C ## $a1 = 0601182C /* 01668 80986248 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C /* 0166C 8098624C 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 01670 80986250 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 01674 80986254 E7A60010 */ swc1 $f6, 0x0010($sp) -/* 01678 80986258 AFA00014 */ sw $zero, 0x0014($sp) -/* 0167C 8098625C 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 01680 80986260 E7A80018 */ swc1 $f8, 0x0018($sp) -/* 01684 80986264 8FA80030 */ lw $t0, 0x0030($sp) +/* 01674 80986254 E7A60010 */ swc1 $f6, 0x0010($sp) +/* 01678 80986258 AFA00014 */ sw $zero, 0x0014($sp) +/* 0167C 8098625C 0C029468 */ jal SkelAnime_ChangeAnim + +/* 01680 80986260 E7A80018 */ swc1 $f8, 0x0018($sp) +/* 01684 80986264 8FA80030 */ lw $t0, 0x0030($sp) /* 01688 80986268 240E000C */ addiu $t6, $zero, 0x000C ## $t6 = 0000000C -/* 0168C 8098626C 10000005 */ beq $zero, $zero, .L80986284 +/* 0168C 8098626C 10000005 */ beq $zero, $zero, .L80986284 /* 01690 80986270 AE0E0260 */ sw $t6, 0x0260($s0) ## 00000260 .L80986274: /* 01694 80986274 24848858 */ addiu $a0, $a0, %lo(D_80988858) ## $a0 = FFFF8858 /* 01698 80986278 0C00084C */ jal osSyncPrintf - -/* 0169C 8098627C AFA80030 */ sw $t0, 0x0030($sp) -/* 016A0 80986280 8FA80030 */ lw $t0, 0x0030($sp) + +/* 0169C 8098627C AFA80030 */ sw $t0, 0x0030($sp) +/* 016A0 80986280 8FA80030 */ lw $t0, 0x0030($sp) .L80986284: /* 016A4 80986284 AE080274 */ sw $t0, 0x0274($s0) ## 00000274 -/* 016A8 80986288 8FBF002C */ lw $ra, 0x002C($sp) +/* 016A8 80986288 8FBF002C */ lw $ra, 0x002C($sp) .L8098628C: -/* 016AC 8098628C 8FB00028 */ lw $s0, 0x0028($sp) +/* 016AC 8098628C 8FB00028 */ lw $s0, 0x0028($sp) /* 016B0 80986290 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 -/* 016B4 80986294 03E00008 */ jr $ra +/* 016B4 80986294 03E00008 */ jr $ra /* 016B8 80986298 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80986710.s b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80986710.s index 21d0ed910f..431e2c65e4 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80986710.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80986710.s @@ -1,38 +1,38 @@ glabel func_80986710 /* 01B30 80986710 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 01B34 80986714 AFA40028 */ sw $a0, 0x0028($sp) -/* 01B38 80986718 AFBF0024 */ sw $ra, 0x0024($sp) +/* 01B34 80986714 AFA40028 */ sw $a0, 0x0028($sp) +/* 01B38 80986718 AFBF0024 */ sw $ra, 0x0024($sp) /* 01B3C 8098671C 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 -/* 01B40 80986720 AFA5002C */ sw $a1, 0x002C($sp) +/* 01B40 80986720 AFA5002C */ sw $a1, 0x002C($sp) /* 01B44 80986724 0C028800 */ jal SkelAnime_GetFrameCount - + /* 01B48 80986728 24841868 */ addiu $a0, $a0, 0x1868 ## $a0 = 06001868 /* 01B4C 8098672C 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 01B50 80986730 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 01B54 80986734 8FA40028 */ lw $a0, 0x0028($sp) -/* 01B58 80986738 468021A0 */ cvt.s.w $f6, $f4 +/* 01B54 80986734 8FA40028 */ lw $a0, 0x0028($sp) +/* 01B58 80986738 468021A0 */ cvt.s.w $f6, $f4 /* 01B5C 8098673C 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 01B60 80986740 44070000 */ mfc1 $a3, $f0 +/* 01B60 80986740 44070000 */ mfc1 $a3, $f0 /* 01B64 80986744 24A51868 */ addiu $a1, $a1, 0x1868 ## $a1 = 06001868 /* 01B68 80986748 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 01B6C 8098674C AFA00014 */ sw $zero, 0x0014($sp) -/* 01B70 80986750 E7A60010 */ swc1 $f6, 0x0010($sp) +/* 01B6C 8098674C AFA00014 */ sw $zero, 0x0014($sp) +/* 01B70 80986750 E7A60010 */ swc1 $f6, 0x0010($sp) /* 01B74 80986754 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 01B78 80986758 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 01B7C 8098675C E7A00018 */ swc1 $f0, 0x0018($sp) -/* 01B80 80986760 8FA40028 */ lw $a0, 0x0028($sp) -/* 01B84 80986764 8FA5002C */ lw $a1, 0x002C($sp) -/* 01B88 80986768 0C261460 */ jal func_80985180 +/* 01B78 80986758 0C029468 */ jal SkelAnime_ChangeAnim + +/* 01B7C 8098675C E7A00018 */ swc1 $f0, 0x0018($sp) +/* 01B80 80986760 8FA40028 */ lw $a0, 0x0028($sp) +/* 01B84 80986764 8FA5002C */ lw $a1, 0x002C($sp) +/* 01B88 80986768 0C261460 */ jal func_80985180 /* 01B8C 8098676C 24060005 */ addiu $a2, $zero, 0x0005 ## $a2 = 00000005 -/* 01B90 80986770 8FA20028 */ lw $v0, 0x0028($sp) +/* 01B90 80986770 8FA20028 */ lw $v0, 0x0028($sp) /* 01B94 80986774 240E0010 */ addiu $t6, $zero, 0x0010 ## $t6 = 00000010 /* 01B98 80986778 240F0001 */ addiu $t7, $zero, 0x0001 ## $t7 = 00000001 /* 01B9C 8098677C AC4E0260 */ sw $t6, 0x0260($v0) ## 00000260 /* 01BA0 80986780 AC4F0264 */ sw $t7, 0x0264($v0) ## 00000264 -/* 01BA4 80986784 8FBF0024 */ lw $ra, 0x0024($sp) +/* 01BA4 80986784 8FBF0024 */ lw $ra, 0x0024($sp) /* 01BA8 80986788 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 01BAC 8098678C 03E00008 */ jr $ra +/* 01BAC 8098678C 03E00008 */ jr $ra /* 01BB0 80986790 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80986794.s b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80986794.s index cce57c7b81..f95955e577 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80986794.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80986794.s @@ -1,35 +1,35 @@ glabel func_80986794 /* 01BB4 80986794 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 01BB8 80986798 AFA40028 */ sw $a0, 0x0028($sp) -/* 01BBC 8098679C AFBF0024 */ sw $ra, 0x0024($sp) +/* 01BB8 80986798 AFA40028 */ sw $a0, 0x0028($sp) +/* 01BBC 8098679C AFBF0024 */ sw $ra, 0x0024($sp) /* 01BC0 809867A0 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 /* 01BC4 809867A4 0C028800 */ jal SkelAnime_GetFrameCount - + /* 01BC8 809867A8 248414E4 */ addiu $a0, $a0, 0x14E4 ## $a0 = 060014E4 /* 01BCC 809867AC 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 01BD0 809867B0 3C01C100 */ lui $at, 0xC100 ## $at = C1000000 /* 01BD4 809867B4 44814000 */ mtc1 $at, $f8 ## $f8 = -8.00 -/* 01BD8 809867B8 468021A0 */ cvt.s.w $f6, $f4 -/* 01BDC 809867BC 8FA40028 */ lw $a0, 0x0028($sp) +/* 01BD8 809867B8 468021A0 */ cvt.s.w $f6, $f4 +/* 01BDC 809867BC 8FA40028 */ lw $a0, 0x0028($sp) /* 01BE0 809867C0 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 01BE4 809867C4 240E0002 */ addiu $t6, $zero, 0x0002 ## $t6 = 00000002 -/* 01BE8 809867C8 AFAE0014 */ sw $t6, 0x0014($sp) +/* 01BE8 809867C8 AFAE0014 */ sw $t6, 0x0014($sp) /* 01BEC 809867CC 24A514E4 */ addiu $a1, $a1, 0x14E4 ## $a1 = 060014E4 -/* 01BF0 809867D0 E7A60010 */ swc1 $f6, 0x0010($sp) +/* 01BF0 809867D0 E7A60010 */ swc1 $f6, 0x0010($sp) /* 01BF4 809867D4 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 01BF8 809867D8 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 01BFC 809867DC E7A80018 */ swc1 $f8, 0x0018($sp) -/* 01C00 809867E0 0C029468 */ jal SkelAnime_ChangeAnimation - +/* 01BFC 809867DC E7A80018 */ swc1 $f8, 0x0018($sp) +/* 01C00 809867E0 0C029468 */ jal SkelAnime_ChangeAnim + /* 01C04 809867E4 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 01C08 809867E8 8FA20028 */ lw $v0, 0x0028($sp) +/* 01C08 809867E8 8FA20028 */ lw $v0, 0x0028($sp) /* 01C0C 809867EC 240F0011 */ addiu $t7, $zero, 0x0011 ## $t7 = 00000011 /* 01C10 809867F0 24180001 */ addiu $t8, $zero, 0x0001 ## $t8 = 00000001 /* 01C14 809867F4 AC4F0260 */ sw $t7, 0x0260($v0) ## 00000260 /* 01C18 809867F8 AC580264 */ sw $t8, 0x0264($v0) ## 00000264 -/* 01C1C 809867FC 8FBF0024 */ lw $ra, 0x0024($sp) +/* 01C1C 809867FC 8FBF0024 */ lw $ra, 0x0024($sp) /* 01C20 80986800 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 01C24 80986804 03E00008 */ jr $ra +/* 01C24 80986804 03E00008 */ jr $ra /* 01C28 80986808 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80987658.s b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80987658.s index 075769e57a..b20ef84a8f 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80987658.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Im/func_80987658.s @@ -1,45 +1,45 @@ glabel func_80987658 /* 02A78 80987658 27BDFF90 */ addiu $sp, $sp, 0xFF90 ## $sp = FFFFFF90 -/* 02A7C 8098765C AFBF0024 */ sw $ra, 0x0024($sp) -/* 02A80 80987660 AFA40070 */ sw $a0, 0x0070($sp) -/* 02A84 80987664 AFA50074 */ sw $a1, 0x0074($sp) +/* 02A7C 8098765C AFBF0024 */ sw $ra, 0x0024($sp) +/* 02A80 80987660 AFA40070 */ sw $a0, 0x0070($sp) +/* 02A84 80987664 AFA50074 */ sw $a1, 0x0074($sp) /* 02A88 80987668 8482025C */ lh $v0, 0x025C($a0) ## 0000025C /* 02A8C 8098766C 3C188098 */ lui $t8, %hi(D_80987830) ## $t8 = 80980000 /* 02A90 80987670 3C068099 */ lui $a2, %hi(D_80988980) ## $a2 = 80990000 -/* 02A94 80987674 00027880 */ sll $t7, $v0, 2 -/* 02A98 80987678 030FC021 */ addu $t8, $t8, $t7 -/* 02A9C 8098767C 8F187830 */ lw $t8, %lo(D_80987830)($t8) +/* 02A94 80987674 00027880 */ sll $t7, $v0, 2 +/* 02A98 80987678 030FC021 */ addu $t8, $t8, $t7 +/* 02A9C 8098767C 8F187830 */ lw $t8, %lo(D_80987830)($t8) /* 02AA0 80987680 24C68980 */ addiu $a2, $a2, %lo(D_80988980) ## $a2 = 80988980 /* 02AA4 80987684 27A40048 */ addiu $a0, $sp, 0x0048 ## $a0 = FFFFFFD8 -/* 02AA8 80987688 AFB80060 */ sw $t8, 0x0060($sp) +/* 02AA8 80987688 AFB80060 */ sw $t8, 0x0060($sp) /* 02AAC 8098768C 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 /* 02AB0 80987690 24070388 */ addiu $a3, $zero, 0x0388 ## $a3 = 00000388 -/* 02AB4 80987694 0C031AB1 */ jal func_800C6AC4 -/* 02AB8 80987698 AFA50058 */ sw $a1, 0x0058($sp) -/* 02ABC 8098769C 8FA90074 */ lw $t1, 0x0074($sp) -/* 02AC0 809876A0 0C024F46 */ jal func_80093D18 +/* 02AB4 80987694 0C031AB1 */ jal Graph_OpenDisps +/* 02AB8 80987698 AFA50058 */ sw $a1, 0x0058($sp) +/* 02ABC 8098769C 8FA90074 */ lw $t1, 0x0074($sp) +/* 02AC0 809876A0 0C024F46 */ jal func_80093D18 /* 02AC4 809876A4 8D240000 */ lw $a0, 0x0000($t1) ## 00000000 -/* 02AC8 809876A8 8FA80058 */ lw $t0, 0x0058($sp) -/* 02ACC 809876AC 8FA70060 */ lw $a3, 0x0060($sp) +/* 02AC8 809876A8 8FA80058 */ lw $t0, 0x0058($sp) +/* 02ACC 809876AC 8FA70060 */ lw $a3, 0x0060($sp) /* 02AD0 809876B0 3C0BDB06 */ lui $t3, 0xDB06 ## $t3 = DB060000 /* 02AD4 809876B4 8D0202C0 */ lw $v0, 0x02C0($t0) ## 000002C0 -/* 02AD8 809876B8 00076100 */ sll $t4, $a3, 4 -/* 02ADC 809876BC 000C6F02 */ srl $t5, $t4, 28 +/* 02AD8 809876B8 00076100 */ sll $t4, $a3, 4 +/* 02ADC 809876BC 000C6F02 */ srl $t5, $t4, 28 /* 02AE0 809876C0 3C0F8016 */ lui $t7, 0x8016 ## $t7 = 80160000 /* 02AE4 809876C4 244A0008 */ addiu $t2, $v0, 0x0008 ## $t2 = 00000008 /* 02AE8 809876C8 25EF6FA8 */ addiu $t7, $t7, 0x6FA8 ## $t7 = 80166FA8 -/* 02AEC 809876CC 000D7080 */ sll $t6, $t5, 2 +/* 02AEC 809876CC 000D7080 */ sll $t6, $t5, 2 /* 02AF0 809876D0 356B0020 */ ori $t3, $t3, 0x0020 ## $t3 = DB060020 /* 02AF4 809876D4 AD0A02C0 */ sw $t2, 0x02C0($t0) ## 000002C0 -/* 02AF8 809876D8 01CF2021 */ addu $a0, $t6, $t7 +/* 02AF8 809876D8 01CF2021 */ addu $a0, $t6, $t7 /* 02AFC 809876DC AC4B0000 */ sw $t3, 0x0000($v0) ## 00000000 /* 02B00 809876E0 8C980000 */ lw $t8, 0x0000($a0) ## 00000000 /* 02B04 809876E4 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 /* 02B08 809876E8 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF -/* 02B0C 809876EC 00E12824 */ and $a1, $a3, $at +/* 02B0C 809876EC 00E12824 */ and $a1, $a3, $at /* 02B10 809876F0 3C068000 */ lui $a2, 0x8000 ## $a2 = 80000000 -/* 02B14 809876F4 0305C821 */ addu $t9, $t8, $a1 -/* 02B18 809876F8 03264821 */ addu $t1, $t9, $a2 +/* 02B14 809876F4 0305C821 */ addu $t9, $t8, $a1 +/* 02B18 809876F8 03264821 */ addu $t1, $t9, $a2 /* 02B1C 809876FC AC490004 */ sw $t1, 0x0004($v0) ## 00000004 /* 02B20 80987700 8D0202C0 */ lw $v0, 0x02C0($t0) ## 000002C0 /* 02B24 80987704 3C0BDB06 */ lui $t3, 0xDB06 ## $t3 = DB060000 @@ -50,8 +50,8 @@ glabel func_80987658 /* 02B38 80987718 8C8C0000 */ lw $t4, 0x0000($a0) ## 00000000 /* 02B3C 8098771C 241900FF */ addiu $t9, $zero, 0x00FF ## $t9 = 000000FF /* 02B40 80987720 3C18FB00 */ lui $t8, 0xFB00 ## $t8 = FB000000 -/* 02B44 80987724 01856821 */ addu $t5, $t4, $a1 -/* 02B48 80987728 01A67021 */ addu $t6, $t5, $a2 +/* 02B44 80987724 01856821 */ addu $t5, $t4, $a1 +/* 02B48 80987728 01A67021 */ addu $t6, $t5, $a2 /* 02B4C 8098772C AC4E0004 */ sw $t6, 0x0004($v0) ## 00000004 /* 02B50 80987730 8D0202C0 */ lw $v0, 0x02C0($t0) ## 000002C0 /* 02B54 80987734 3C0B8011 */ lui $t3, 0x8011 ## $t3 = 80110000 @@ -67,7 +67,7 @@ glabel func_80987658 /* 02B7C 8098775C AD0902C0 */ sw $t1, 0x02C0($t0) ## 000002C0 /* 02B80 80987760 AC4B0004 */ sw $t3, 0x0004($v0) ## 00000004 /* 02B84 80987764 AC4A0000 */ sw $t2, 0x0000($v0) ## 00000000 -/* 02B88 80987768 8FA30070 */ lw $v1, 0x0070($sp) +/* 02B88 80987768 8FA30070 */ lw $v1, 0x0070($sp) /* 02B8C 8098776C 3C0D8098 */ lui $t5, %hi(func_809875C0) ## $t5 = 80980000 /* 02B90 80987770 3C0C8098 */ lui $t4, %hi(func_80987514) ## $t4 = 80980000 /* 02B94 80987774 2462014C */ addiu $v0, $v1, 0x014C ## $v0 = 0000014C @@ -76,21 +76,21 @@ glabel func_80987658 /* 02BA0 80987780 90470002 */ lbu $a3, 0x0002($v0) ## 0000014E /* 02BA4 80987784 258C7514 */ addiu $t4, $t4, %lo(func_80987514) ## $t4 = 80987514 /* 02BA8 80987788 25AD75C0 */ addiu $t5, $t5, %lo(func_809875C0) ## $t5 = 809875C0 -/* 02BAC 8098778C AFAD0014 */ sw $t5, 0x0014($sp) -/* 02BB0 80987790 AFAC0010 */ sw $t4, 0x0010($sp) -/* 02BB4 80987794 8FA40074 */ lw $a0, 0x0074($sp) -/* 02BB8 80987798 0C0286B2 */ jal func_800A1AC8 -/* 02BBC 8098779C AFA30018 */ sw $v1, 0x0018($sp) -/* 02BC0 809877A0 8FAE0074 */ lw $t6, 0x0074($sp) +/* 02BAC 8098778C AFAD0014 */ sw $t5, 0x0014($sp) +/* 02BB0 80987790 AFAC0010 */ sw $t4, 0x0010($sp) +/* 02BB4 80987794 8FA40074 */ lw $a0, 0x0074($sp) +/* 02BB8 80987798 0C0286B2 */ jal SkelAnime_DrawSV +/* 02BBC 8098779C AFA30018 */ sw $v1, 0x0018($sp) +/* 02BC0 809877A0 8FAE0074 */ lw $t6, 0x0074($sp) /* 02BC4 809877A4 3C068099 */ lui $a2, %hi(D_80988990) ## $a2 = 80990000 /* 02BC8 809877A8 24C68990 */ addiu $a2, $a2, %lo(D_80988990) ## $a2 = 80988990 /* 02BCC 809877AC 27A40048 */ addiu $a0, $sp, 0x0048 ## $a0 = FFFFFFD8 /* 02BD0 809877B0 2407039D */ addiu $a3, $zero, 0x039D ## $a3 = 0000039D -/* 02BD4 809877B4 0C031AD5 */ jal func_800C6B54 +/* 02BD4 809877B4 0C031AD5 */ jal Graph_CloseDisps /* 02BD8 809877B8 8DC50000 */ lw $a1, 0x0000($t6) ## 00000000 -/* 02BDC 809877BC 8FBF0024 */ lw $ra, 0x0024($sp) +/* 02BDC 809877BC 8FBF0024 */ lw $ra, 0x0024($sp) /* 02BE0 809877C0 27BD0070 */ addiu $sp, $sp, 0x0070 ## $sp = 00000000 -/* 02BE4 809877C4 03E00008 */ jr $ra +/* 02BE4 809877C4 03E00008 */ jr $ra /* 02BE8 809877C8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_80989D24.s b/asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_80989D24.s index 870fcbfb0c..a204245981 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_80989D24.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_80989D24.s @@ -23,7 +23,7 @@ glabel func_80989D24 /* 00EF8 80989D78 24C6C898 */ addiu $a2, $a2, %lo(D_8098C898) ## $a2 = 8098C898 /* 00EFC 80989D7C 27A400A8 */ addiu $a0, $sp, 0x00A8 ## $a0 = FFFFFFC0 /* 00F00 80989D80 240704A2 */ addiu $a3, $zero, 0x04A2 ## $a3 = 000004A2 -/* 00F04 80989D84 0C031AB1 */ jal func_800C6AC4 +/* 00F04 80989D84 0C031AB1 */ jal Graph_OpenDisps /* 00F08 80989D88 00A09025 */ or $s2, $a1, $zero ## $s2 = 00000000 /* 00F0C 80989D8C 3C014396 */ lui $at, 0x4396 ## $at = 43960000 /* 00F10 80989D90 4481F000 */ mtc1 $at, $f30 ## $f30 = 300.00 @@ -382,7 +382,7 @@ glabel func_80989D24 /* 0142C 8098A2AC 8EA40000 */ lw $a0, 0x0000($s5) ## 00000000 /* 01430 8098A2B0 AE220004 */ sw $v0, 0x0004($s1) ## 00000004 /* 01434 8098A2B4 8E4402D0 */ lw $a0, 0x02D0($s2) ## 000002D0 -/* 01438 8098A2B8 0C024DDD */ jal func_80093774 +/* 01438 8098A2B8 0C024DDD */ jal Gfx_CallSetupDL /* 0143C 8098A2BC 24050014 */ addiu $a1, $zero, 0x0014 ## $a1 = 00000014 /* 01440 8098A2C0 AE4202D0 */ sw $v0, 0x02D0($s2) ## 000002D0 /* 01444 8098A2C4 244F0008 */ addiu $t7, $v0, 0x0008 ## $t7 = 00000008 @@ -407,7 +407,7 @@ glabel func_80989D24 /* 01490 8098A310 24C6C8C0 */ addiu $a2, $a2, %lo(D_8098C8C0) ## $a2 = 8098C8C0 /* 01494 8098A314 27A400A8 */ addiu $a0, $sp, 0x00A8 ## $a0 = FFFFFFC0 /* 01498 8098A318 8EA50000 */ lw $a1, 0x0000($s5) ## 00000000 -/* 0149C 8098A31C 0C031AD5 */ jal func_800C6B54 +/* 0149C 8098A31C 0C031AD5 */ jal Graph_CloseDisps /* 014A0 8098A320 2407054E */ addiu $a3, $zero, 0x054E ## $a3 = 0000054E /* 014A4 8098A324 8FBF006C */ lw $ra, 0x006C($sp) /* 014A8 8098A328 D7B40018 */ ldc1 $f20, 0x0018($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_8098A36C.s b/asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_8098A36C.s index 5fac8f8ee0..1bd9a40c07 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_8098A36C.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_8098A36C.s @@ -10,7 +10,7 @@ glabel func_8098A36C /* 0150C 8098A38C 24C6C8D4 */ addiu $a2, $a2, %lo(D_8098C8D4) ## $a2 = 8098C8D4 /* 01510 8098A390 27A40034 */ addiu $a0, $sp, 0x0034 ## $a0 = FFFFFFE4 /* 01514 8098A394 24070560 */ addiu $a3, $zero, 0x0560 ## $a3 = 00000560 -/* 01518 8098A398 0C031AB1 */ jal func_800C6AC4 +/* 01518 8098A398 0C031AB1 */ jal Graph_OpenDisps /* 0151C 8098A39C 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 /* 01520 8098A3A0 8FAF0054 */ lw $t7, 0x0054($sp) /* 01524 8098A3A4 0C024F46 */ jal func_80093D18 @@ -89,7 +89,7 @@ glabel func_8098A36C /* 01648 8098A4C8 24C6C8FC */ addiu $a2, $a2, %lo(D_8098C8FC) ## $a2 = 8098C8FC /* 0164C 8098A4CC 27A40034 */ addiu $a0, $sp, 0x0034 ## $a0 = FFFFFFE4 /* 01650 8098A4D0 24070581 */ addiu $a3, $zero, 0x0581 ## $a3 = 00000581 -/* 01654 8098A4D4 0C031AD5 */ jal func_800C6B54 +/* 01654 8098A4D4 0C031AD5 */ jal Graph_CloseDisps /* 01658 8098A4D8 8D050000 */ lw $a1, 0x0000($t0) ## 00000000 /* 0165C 8098A4DC 8FBF001C */ lw $ra, 0x001C($sp) /* 01660 8098A4E0 8FB00014 */ lw $s0, 0x0014($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_8098A4F0.s b/asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_8098A4F0.s index 42a79cfb70..aa407d9244 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_8098A4F0.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_8098A4F0.s @@ -23,7 +23,7 @@ glabel func_8098A4F0 /* 016C4 8098A544 24C6C910 */ addiu $a2, $a2, %lo(D_8098C910) ## $a2 = 8098C910 /* 016C8 8098A548 27A400B4 */ addiu $a0, $sp, 0x00B4 ## $a0 = FFFFFFD4 /* 016CC 8098A54C 24070591 */ addiu $a3, $zero, 0x0591 ## $a3 = 00000591 -/* 016D0 8098A550 0C031AB1 */ jal func_800C6AC4 +/* 016D0 8098A550 0C031AB1 */ jal Graph_OpenDisps /* 016D4 8098A554 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 /* 016D8 8098A558 3C020405 */ lui $v0, 0x0405 ## $v0 = 04050000 /* 016DC 8098A55C 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 @@ -200,7 +200,7 @@ glabel func_8098A4F0 /* 01978 8098A7F8 24C6C938 */ addiu $a2, $a2, %lo(D_8098C938) ## $a2 = 8098C938 /* 0197C 8098A7FC 27A400B4 */ addiu $a0, $sp, 0x00B4 ## $a0 = FFFFFFD4 /* 01980 8098A800 8E650000 */ lw $a1, 0x0000($s3) ## 00000000 -/* 01984 8098A804 0C031AD5 */ jal func_800C6B54 +/* 01984 8098A804 0C031AD5 */ jal Graph_CloseDisps /* 01988 8098A808 240705C2 */ addiu $a3, $zero, 0x05C2 ## $a3 = 000005C2 /* 0198C 8098A80C 8FBF006C */ lw $ra, 0x006C($sp) /* 01990 8098A810 D7B40018 */ ldc1 $f20, 0x0018($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_8098A854.s b/asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_8098A854.s index e9510db0ff..fb209bb3ea 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_8098A854.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_8098A854.s @@ -10,7 +10,7 @@ glabel func_8098A854 /* 019F4 8098A874 24C6C94C */ addiu $a2, $a2, %lo(D_8098C94C) ## $a2 = 8098C94C /* 019F8 8098A878 27A40034 */ addiu $a0, $sp, 0x0034 ## $a0 = FFFFFFE4 /* 019FC 8098A87C 240705CF */ addiu $a3, $zero, 0x05CF ## $a3 = 000005CF -/* 01A00 8098A880 0C031AB1 */ jal func_800C6AC4 +/* 01A00 8098A880 0C031AB1 */ jal Graph_OpenDisps /* 01A04 8098A884 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 /* 01A08 8098A888 0C024F46 */ jal func_80093D18 /* 01A0C 8098A88C 8E240000 */ lw $a0, 0x0000($s1) ## 00000000 @@ -76,7 +76,7 @@ glabel func_8098A854 /* 01AFC 8098A97C 8E250000 */ lw $a1, 0x0000($s1) ## 00000000 /* 01B00 8098A980 24C6C988 */ addiu $a2, $a2, %lo(D_8098C988) ## $a2 = 8098C988 /* 01B04 8098A984 27A40034 */ addiu $a0, $sp, 0x0034 ## $a0 = FFFFFFE4 -/* 01B08 8098A988 0C031AD5 */ jal func_800C6B54 +/* 01B08 8098A988 0C031AD5 */ jal Graph_CloseDisps /* 01B0C 8098A98C 240705DD */ addiu $a3, $zero, 0x05DD ## $a3 = 000005DD /* 01B10 8098A990 8FBF001C */ lw $ra, 0x001C($sp) /* 01B14 8098A994 8FB00014 */ lw $s0, 0x0014($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_8098A9A4.s b/asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_8098A9A4.s index 0d7745335c..dfdfcc7715 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_8098A9A4.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_8098A9A4.s @@ -10,7 +10,7 @@ glabel func_8098A9A4 /* 01B44 8098A9C4 24C6C99C */ addiu $a2, $a2, %lo(D_8098C99C) ## $a2 = 8098C99C /* 01B48 8098A9C8 27A4003C */ addiu $a0, $sp, 0x003C ## $a0 = FFFFFFE4 /* 01B4C 8098A9CC 240705EA */ addiu $a3, $zero, 0x05EA ## $a3 = 000005EA -/* 01B50 8098A9D0 0C031AB1 */ jal func_800C6AC4 +/* 01B50 8098A9D0 0C031AB1 */ jal Graph_OpenDisps /* 01B54 8098A9D4 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 /* 01B58 8098A9D8 922E1D6C */ lbu $t6, 0x1D6C($s1) ## 00001D6C /* 01B5C 8098A9DC 3C0F8016 */ lui $t7, 0x8016 ## $t7 = 80160000 @@ -36,7 +36,7 @@ glabel func_8098A9A4 /* 01BA8 8098AA28 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 01BAC 8098AA2C 24070040 */ addiu $a3, $zero, 0x0040 ## $a3 = 00000040 /* 01BB0 8098AA30 AFA20038 */ sw $v0, 0x0038($sp) -/* 01BB4 8098AA34 0C0253A7 */ jal Draw_TexScroll +/* 01BB4 8098AA34 0C0253A7 */ jal Gfx_TexScroll /* 01BB8 8098AA38 30C6007F */ andi $a2, $a2, 0x007F ## $a2 = 00000000 /* 01BBC 8098AA3C 8FA30038 */ lw $v1, 0x0038($sp) /* 01BC0 8098AA40 3C0ADA38 */ lui $t2, 0xDA38 ## $t2 = DA380000 @@ -67,7 +67,7 @@ glabel func_8098A9A4 /* 01C20 8098AAA0 24C6C9C4 */ addiu $a2, $a2, %lo(D_8098C9C4) ## $a2 = 8098C9C4 /* 01C24 8098AAA4 27A4003C */ addiu $a0, $sp, 0x003C ## $a0 = FFFFFFE4 /* 01C28 8098AAA8 8E250000 */ lw $a1, 0x0000($s1) ## 00000000 -/* 01C2C 8098AAAC 0C031AD5 */ jal func_800C6B54 +/* 01C2C 8098AAAC 0C031AD5 */ jal Graph_CloseDisps /* 01C30 8098AAB0 240705FE */ addiu $a3, $zero, 0x05FE ## $a3 = 000005FE /* 01C34 8098AAB4 8FBF0024 */ lw $ra, 0x0024($sp) /* 01C38 8098AAB8 8FB0001C */ lw $s0, 0x001C($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_8098ABC0.s b/asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_8098ABC0.s index 30b1fa528c..a9e6851498 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_8098ABC0.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_8098ABC0.s @@ -26,7 +26,7 @@ glabel func_8098ABC0 /* 01DA0 8098AC20 24C6C9D8 */ addiu $a2, $a2, %lo(D_8098C9D8) ## $a2 = 8098C9D8 /* 01DA4 8098AC24 27A400A0 */ addiu $a0, $sp, 0x00A0 ## $a0 = FFFFFFA8 /* 01DA8 8098AC28 24070720 */ addiu $a3, $zero, 0x0720 ## $a3 = 00000720 -/* 01DAC 8098AC2C 0C031AB1 */ jal func_800C6AC4 +/* 01DAC 8098AC2C 0C031AB1 */ jal Graph_OpenDisps /* 01DB0 8098AC30 00A09825 */ or $s3, $a1, $zero ## $s3 = 00000000 /* 01DB4 8098AC34 9222014D */ lbu $v0, 0x014D($s1) ## 0000014D /* 01DB8 8098AC38 27B600D8 */ addiu $s6, $sp, 0x00D8 ## $s6 = FFFFFFE0 @@ -501,7 +501,7 @@ glabel func_8098ABC0 /* 02480 8098B300 24C6CA00 */ addiu $a2, $a2, %lo(D_8098CA00) ## $a2 = 8098CA00 /* 02484 8098B304 27A400A0 */ addiu $a0, $sp, 0x00A0 ## $a0 = FFFFFFA8 /* 02488 8098B308 8E450000 */ lw $a1, 0x0000($s2) ## 00000000 -/* 0248C 8098B30C 0C031AD5 */ jal func_800C6B54 +/* 0248C 8098B30C 0C031AD5 */ jal Graph_CloseDisps /* 02490 8098B310 240707E3 */ addiu $a3, $zero, 0x07E3 ## $a3 = 000007E3 /* 02494 8098B314 8FBF006C */ lw $ra, 0x006C($sp) /* 02498 8098B318 D7B40020 */ ldc1 $f20, 0x0020($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_8098B354.s b/asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_8098B354.s index 53dca9ed25..f8c2dcfbb7 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_8098B354.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_8098B354.s @@ -23,7 +23,7 @@ glabel func_8098B354 /* 02528 8098B3A8 24C6CA14 */ addiu $a2, $a2, %lo(D_8098CA14) ## $a2 = 8098CA14 /* 0252C 8098B3AC 27A400A0 */ addiu $a0, $sp, 0x00A0 ## $a0 = FFFFFFB0 /* 02530 8098B3B0 24070982 */ addiu $a3, $zero, 0x0982 ## $a3 = 00000982 -/* 02534 8098B3B4 0C031AB1 */ jal func_800C6AC4 +/* 02534 8098B3B4 0C031AB1 */ jal Graph_OpenDisps /* 02538 8098B3B8 00A09825 */ or $s3, $a1, $zero ## $s3 = 00000000 /* 0253C 8098B3BC 9223014D */ lbu $v1, 0x014D($s1) ## 0000014D /* 02540 8098B3C0 3C178099 */ lui $s7, %hi(D_8098C4F0) ## $s7 = 80990000 @@ -370,7 +370,7 @@ glabel func_8098B354 /* 02A30 8098B8B0 24C6CA3C */ addiu $a2, $a2, %lo(D_8098CA3C) ## $a2 = 8098CA3C /* 02A34 8098B8B4 27A400A0 */ addiu $a0, $sp, 0x00A0 ## $a0 = FFFFFFB0 /* 02A38 8098B8B8 8EC50000 */ lw $a1, 0x0000($s6) ## 00000000 -/* 02A3C 8098B8BC 0C031AD5 */ jal func_800C6B54 +/* 02A3C 8098B8BC 0C031AD5 */ jal Graph_CloseDisps /* 02A40 8098B8C0 24070A13 */ addiu $a3, $zero, 0x0A13 ## $a3 = 00000A13 /* 02A44 8098B8C4 8FBF0074 */ lw $ra, 0x0074($sp) /* 02A48 8098B8C8 D7B40020 */ ldc1 $f20, 0x0020($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Kekkai/DemoKekkai_Draw.s b/asm/non_matchings/overlays/actors/ovl_Demo_Kekkai/DemoKekkai_Draw.s index af04d2746c..f1c16cd25e 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Kekkai/DemoKekkai_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Kekkai/DemoKekkai_Draw.s @@ -16,7 +16,7 @@ glabel DemoKekkai_Draw /* 00F88 8098DF58 3319FFFF */ andi $t9, $t8, 0xFFFF ## $t9 = 00000000 /* 00F8C 8098DF5C AFB9006C */ sw $t9, 0x006C($sp) /* 00F90 8098DF60 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 -/* 00F94 8098DF64 0C031AB1 */ jal func_800C6AC4 +/* 00F94 8098DF64 0C031AB1 */ jal Graph_OpenDisps /* 00F98 8098DF68 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 /* 00F9C 8098DF6C 0C024F61 */ jal func_80093D84 /* 00FA0 8098DF70 8E240000 */ lw $a0, 0x0000($s1) ## 00000000 @@ -67,7 +67,7 @@ glabel DemoKekkai_Draw /* 01054 8098E024 AFAB0028 */ sw $t3, 0x0028($sp) /* 01058 8098E028 AFA70020 */ sw $a3, 0x0020($sp) /* 0105C 8098E02C 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 01060 8098E030 0C0253D0 */ jal Draw_TwoTexScroll +/* 01060 8098E030 0C0253D0 */ jal Gfx_TwoTexScroll /* 01064 8098E034 AFA2004C */ sw $v0, 0x004C($sp) /* 01068 8098E038 8FA3004C */ lw $v1, 0x004C($sp) /* 0106C 8098E03C 3C0E0600 */ lui $t6, 0x0600 ## $t6 = 06000000 @@ -83,7 +83,7 @@ glabel DemoKekkai_Draw /* 01094 8098E064 8E250000 */ lw $a1, 0x0000($s1) ## 00000000 /* 01098 8098E068 24C6E27C */ addiu $a2, $a2, %lo(D_8098E27C) ## $a2 = 8098E27C /* 0109C 8098E06C 27A40058 */ addiu $a0, $sp, 0x0058 ## $a0 = FFFFFFE0 -/* 010A0 8098E070 0C031AD5 */ jal func_800C6B54 +/* 010A0 8098E070 0C031AD5 */ jal Graph_CloseDisps /* 010A4 8098E074 240702D2 */ addiu $a3, $zero, 0x02D2 ## $a3 = 000002D2 /* 010A8 8098E078 8FBF003C */ lw $ra, 0x003C($sp) /* 010AC 8098E07C 8FB00034 */ lw $s0, 0x0034($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Kekkai/func_8098D9C0.s b/asm/non_matchings/overlays/actors/ovl_Demo_Kekkai/func_8098D9C0.s index f349bdb52e..ca0878cc0b 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Kekkai/func_8098D9C0.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Kekkai/func_8098D9C0.s @@ -108,7 +108,7 @@ glabel func_8098D9C0 /* 00B90 8098DB60 AFA900AC */ sw $t1, 0x00AC($sp) /* 00B94 8098DB64 8D450000 */ lw $a1, 0x0000($t2) ## 00000000 /* 00B98 8098DB68 24070278 */ addiu $a3, $zero, 0x0278 ## $a3 = 00000278 -/* 00B9C 8098DB6C 0C031AB1 */ jal func_800C6AC4 +/* 00B9C 8098DB6C 0C031AB1 */ jal Graph_OpenDisps /* 00BA0 8098DB70 00A08025 */ or $s0, $a1, $zero ## $s0 = FFFFFFF6 /* 00BA4 8098DB74 8FAB0124 */ lw $t3, 0x0124($sp) /* 00BA8 8098DB78 0C024F61 */ jal func_80093D84 @@ -178,7 +178,7 @@ glabel func_8098D9C0 /* 00CA8 8098DC78 AFA7004C */ sw $a3, 0x004C($sp) /* 00CAC 8098DC7C AFAA0010 */ sw $t2, 0x0010($sp) /* 00CB0 8098DC80 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 00CB4 8098DC84 0C0253D0 */ jal Draw_TwoTexScroll +/* 00CB4 8098DC84 0C0253D0 */ jal Gfx_TwoTexScroll /* 00CB8 8098DC88 AFA20080 */ sw $v0, 0x0080($sp) /* 00CBC 8098DC8C 8FA30080 */ lw $v1, 0x0080($sp) /* 00CC0 8098DC90 3C0C0600 */ lui $t4, 0x0600 ## $t4 = 06000000 @@ -245,7 +245,7 @@ glabel func_8098D9C0 /* 00DB4 8098DD84 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 /* 00DB8 8098DD88 AFA2006C */ sw $v0, 0x006C($sp) /* 00DBC 8098DD8C AFAE0020 */ sw $t6, 0x0020($sp) -/* 00DC0 8098DD90 0C0253D0 */ jal Draw_TwoTexScroll +/* 00DC0 8098DD90 0C0253D0 */ jal Gfx_TwoTexScroll /* 00DC4 8098DD94 AFAE001C */ sw $t6, 0x001C($sp) /* 00DC8 8098DD98 8FA3006C */ lw $v1, 0x006C($sp) /* 00DCC 8098DD9C 3C0A0600 */ lui $t2, 0x0600 ## $t2 = 06000000 @@ -321,7 +321,7 @@ glabel func_8098D9C0 /* 00EE4 8098DEB4 AFAD0024 */ sw $t5, 0x0024($sp) /* 00EE8 8098DEB8 AFA20058 */ sw $v0, 0x0058($sp) /* 00EEC 8098DEBC AFA70020 */ sw $a3, 0x0020($sp) -/* 00EF0 8098DEC0 0C0253D0 */ jal Draw_TwoTexScroll +/* 00EF0 8098DEC0 0C0253D0 */ jal Gfx_TwoTexScroll /* 00EF4 8098DEC4 AFA6001C */ sw $a2, 0x001C($sp) /* 00EF8 8098DEC8 8FA30058 */ lw $v1, 0x0058($sp) /* 00EFC 8098DECC 3C180600 */ lui $t8, 0x0600 ## $t8 = 06000000 @@ -338,7 +338,7 @@ glabel func_8098D9C0 /* 00F28 8098DEF8 24C6E240 */ addiu $a2, $a2, %lo(D_8098E240) ## $a2 = 8098E240 /* 00F2C 8098DEFC 27A40088 */ addiu $a0, $sp, 0x0088 ## $a0 = FFFFFF68 /* 00F30 8098DF00 240702B8 */ addiu $a3, $zero, 0x02B8 ## $a3 = 000002B8 -/* 00F34 8098DF04 0C031AD5 */ jal func_800C6B54 +/* 00F34 8098DF04 0C031AD5 */ jal Graph_CloseDisps /* 00F38 8098DF08 8D250000 */ lw $a1, 0x0000($t1) ## 00000000 .L8098DF0C: /* 00F3C 8098DF0C 8FBF003C */ lw $ra, 0x003C($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/DemoSa_Destroy.s b/asm/non_matchings/overlays/actors/ovl_Demo_Sa/DemoSa_Destroy.s index c375916d27..aec9c036ef 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/DemoSa_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Sa/DemoSa_Destroy.s @@ -1,11 +1,11 @@ glabel DemoSa_Destroy /* 00000 8098E460 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00004 8098E464 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00008 8098E468 0C0295BC */ jal func_800A56F0 +/* 00004 8098E464 AFBF0014 */ sw $ra, 0x0014($sp) +/* 00008 8098E468 0C0295BC */ jal SkelAnime_Free /* 0000C 8098E46C 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 00010 8098E470 8FBF0014 */ lw $ra, 0x0014($sp) +/* 00010 8098E470 8FBF0014 */ lw $ra, 0x0014($sp) /* 00014 8098E474 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00018 8098E478 03E00008 */ jr $ra +/* 00018 8098E478 03E00008 */ jr $ra /* 0001C 8098E47C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098E76C.s b/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098E76C.s index 1348c9fbcd..7070edcc8e 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098E76C.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098E76C.s @@ -1,43 +1,43 @@ glabel func_8098E76C /* 0030C 8098E76C 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 00310 8098E770 AFBF0024 */ sw $ra, 0x0024($sp) -/* 00314 8098E774 AFA40028 */ sw $a0, 0x0028($sp) -/* 00318 8098E778 AFA5002C */ sw $a1, 0x002C($sp) -/* 0031C 8098E77C AFA60030 */ sw $a2, 0x0030($sp) -/* 00320 8098E780 AFA70034 */ sw $a3, 0x0034($sp) +/* 00310 8098E770 AFBF0024 */ sw $ra, 0x0024($sp) +/* 00314 8098E774 AFA40028 */ sw $a0, 0x0028($sp) +/* 00318 8098E778 AFA5002C */ sw $a1, 0x002C($sp) +/* 0031C 8098E77C AFA60030 */ sw $a2, 0x0030($sp) +/* 00320 8098E780 AFA70034 */ sw $a3, 0x0034($sp) /* 00324 8098E784 0C028800 */ jal SkelAnime_GetFrameCount - + /* 00328 8098E788 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 0032C 8098E78C 8FAE0038 */ lw $t6, 0x0038($sp) -/* 00330 8098E790 8FA40028 */ lw $a0, 0x0028($sp) -/* 00334 8098E794 8FA5002C */ lw $a1, 0x002C($sp) -/* 00338 8098E798 15C00007 */ bne $t6, $zero, .L8098E7B8 +/* 0032C 8098E78C 8FAE0038 */ lw $t6, 0x0038($sp) +/* 00330 8098E790 8FA40028 */ lw $a0, 0x0028($sp) +/* 00334 8098E794 8FA5002C */ lw $a1, 0x002C($sp) +/* 00338 8098E798 15C00007 */ bne $t6, $zero, .L8098E7B8 /* 0033C 8098E79C 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C /* 00340 8098E7A0 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 00344 8098E7A4 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 /* 00348 8098E7A8 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 /* 0034C 8098E7AC 44816000 */ mtc1 $at, $f12 ## $f12 = 1.00 -/* 00350 8098E7B0 10000006 */ beq $zero, $zero, .L8098E7CC -/* 00354 8098E7B4 468020A0 */ cvt.s.w $f2, $f4 +/* 00350 8098E7B0 10000006 */ beq $zero, $zero, .L8098E7CC +/* 00354 8098E7B4 468020A0 */ cvt.s.w $f2, $f4 .L8098E7B8: /* 00358 8098E7B8 44823000 */ mtc1 $v0, $f6 ## $f6 = 0.00 /* 0035C 8098E7BC 3C01BF80 */ lui $at, 0xBF80 ## $at = BF800000 /* 00360 8098E7C0 44801000 */ mtc1 $zero, $f2 ## $f2 = 0.00 /* 00364 8098E7C4 44816000 */ mtc1 $at, $f12 ## $f12 = -1.00 -/* 00368 8098E7C8 46803020 */ cvt.s.w $f0, $f6 +/* 00368 8098E7C8 46803020 */ cvt.s.w $f0, $f6 .L8098E7CC: -/* 0036C 8098E7CC 93AF0033 */ lbu $t7, 0x0033($sp) -/* 00370 8098E7D0 C7A80034 */ lwc1 $f8, 0x0034($sp) -/* 00374 8098E7D4 44066000 */ mfc1 $a2, $f12 -/* 00378 8098E7D8 44070000 */ mfc1 $a3, $f0 -/* 0037C 8098E7DC E7A20010 */ swc1 $f2, 0x0010($sp) -/* 00380 8098E7E0 AFAF0014 */ sw $t7, 0x0014($sp) -/* 00384 8098E7E4 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 00388 8098E7E8 E7A80018 */ swc1 $f8, 0x0018($sp) -/* 0038C 8098E7EC 8FBF0024 */ lw $ra, 0x0024($sp) +/* 0036C 8098E7CC 93AF0033 */ lbu $t7, 0x0033($sp) +/* 00370 8098E7D0 C7A80034 */ lwc1 $f8, 0x0034($sp) +/* 00374 8098E7D4 44066000 */ mfc1 $a2, $f12 +/* 00378 8098E7D8 44070000 */ mfc1 $a3, $f0 +/* 0037C 8098E7DC E7A20010 */ swc1 $f2, 0x0010($sp) +/* 00380 8098E7E0 AFAF0014 */ sw $t7, 0x0014($sp) +/* 00384 8098E7E4 0C029468 */ jal SkelAnime_ChangeAnim + +/* 00388 8098E7E8 E7A80018 */ swc1 $f8, 0x0018($sp) +/* 0038C 8098E7EC 8FBF0024 */ lw $ra, 0x0024($sp) /* 00390 8098E7F0 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 00394 8098E7F4 03E00008 */ jr $ra +/* 00394 8098E7F4 03E00008 */ jr $ra /* 00398 8098E7F8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098E7FC.s b/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098E7FC.s index 4c8339418e..2447843bed 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098E7FC.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098E7FC.s @@ -1,31 +1,31 @@ glabel func_8098E7FC /* 0039C 8098E7FC 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 003A0 8098E800 AFA40028 */ sw $a0, 0x0028($sp) -/* 003A4 8098E804 AFA5002C */ sw $a1, 0x002C($sp) +/* 003A0 8098E800 AFA40028 */ sw $a0, 0x0028($sp) +/* 003A4 8098E804 AFA5002C */ sw $a1, 0x002C($sp) /* 003A8 8098E808 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 003AC 8098E80C 8FA50028 */ lw $a1, 0x0028($sp) -/* 003B0 8098E810 AFBF0024 */ sw $ra, 0x0024($sp) +/* 003AC 8098E80C 8FA50028 */ lw $a1, 0x0028($sp) +/* 003B0 8098E810 AFBF0024 */ sw $ra, 0x0024($sp) /* 003B4 8098E814 3C060601 */ lui $a2, 0x0601 ## $a2 = 06010000 /* 003B8 8098E818 3C070600 */ lui $a3, 0x0600 ## $a3 = 06000000 /* 003BC 8098E81C 24E721D8 */ addiu $a3, $a3, 0x21D8 ## $a3 = 060021D8 /* 003C0 8098E820 24C6B1A0 */ addiu $a2, $a2, 0xB1A0 ## $a2 = 0600B1A0 -/* 003C4 8098E824 AFA00010 */ sw $zero, 0x0010($sp) -/* 003C8 8098E828 AFA00014 */ sw $zero, 0x0014($sp) -/* 003CC 8098E82C AFA00018 */ sw $zero, 0x0018($sp) -/* 003D0 8098E830 0C0291BE */ jal func_800A46F8 +/* 003C4 8098E824 AFA00010 */ sw $zero, 0x0010($sp) +/* 003C8 8098E828 AFA00014 */ sw $zero, 0x0014($sp) +/* 003CC 8098E82C AFA00018 */ sw $zero, 0x0018($sp) +/* 003D0 8098E830 0C0291BE */ jal SkelAnime_InitSV /* 003D4 8098E834 24A5014C */ addiu $a1, $a1, 0x014C ## $a1 = 0000014C /* 003D8 8098E838 3C018099 */ lui $at, %hi(D_80990F34) ## $at = 80990000 -/* 003DC 8098E83C 8FA40028 */ lw $a0, 0x0028($sp) -/* 003E0 8098E840 C4240F34 */ lwc1 $f4, %lo(D_80990F34)($at) +/* 003DC 8098E83C 8FA40028 */ lw $a0, 0x0028($sp) +/* 003E0 8098E840 C4240F34 */ lwc1 $f4, %lo(D_80990F34)($at) /* 003E4 8098E844 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 -/* 003E8 8098E848 0C263942 */ jal func_8098E508 +/* 003E8 8098E848 0C263942 */ jal func_8098E508 /* 003EC 8098E84C E48400BC */ swc1 $f4, 0x00BC($a0) ## 000000BC -/* 003F0 8098E850 8FA40028 */ lw $a0, 0x0028($sp) -/* 003F4 8098E854 0C263947 */ jal func_8098E51C +/* 003F0 8098E850 8FA40028 */ lw $a0, 0x0028($sp) +/* 003F4 8098E854 0C263947 */ jal func_8098E51C /* 003F8 8098E858 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 003FC 8098E85C 8FBF0024 */ lw $ra, 0x0024($sp) +/* 003FC 8098E85C 8FBF0024 */ lw $ra, 0x0024($sp) /* 00400 8098E860 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 00404 8098E864 03E00008 */ jr $ra +/* 00404 8098E864 03E00008 */ jr $ra /* 00408 8098E868 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098EA68.s b/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098EA68.s index 06d3666870..b674e1f914 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098EA68.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098EA68.s @@ -1,44 +1,44 @@ glabel func_8098EA68 /* 00608 8098EA68 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 0060C 8098EA6C AFBF0024 */ sw $ra, 0x0024($sp) -/* 00610 8098EA70 AFA40028 */ sw $a0, 0x0028($sp) +/* 0060C 8098EA6C AFBF0024 */ sw $ra, 0x0024($sp) +/* 00610 8098EA70 AFA40028 */ sw $a0, 0x0028($sp) /* 00614 8098EA74 90AE1D6C */ lbu $t6, 0x1D6C($a1) ## 00001D6C -/* 00618 8098EA78 51C0001E */ beql $t6, $zero, .L8098EAF4 -/* 0061C 8098EA7C 8FBF0024 */ lw $ra, 0x0024($sp) +/* 00618 8098EA78 51C0001E */ beql $t6, $zero, .L8098EAF4 +/* 0061C 8098EA7C 8FBF0024 */ lw $ra, 0x0024($sp) /* 00620 8098EA80 8CA21D9C */ lw $v0, 0x1D9C($a1) ## 00001D9C -/* 00624 8098EA84 5040001B */ beql $v0, $zero, .L8098EAF4 -/* 00628 8098EA88 8FBF0024 */ lw $ra, 0x0024($sp) +/* 00624 8098EA84 5040001B */ beql $v0, $zero, .L8098EAF4 +/* 00628 8098EA88 8FBF0024 */ lw $ra, 0x0024($sp) /* 0062C 8098EA8C 944F0000 */ lhu $t7, 0x0000($v0) ## 00000000 /* 00630 8098EA90 24010003 */ addiu $at, $zero, 0x0003 ## $at = 00000003 /* 00634 8098EA94 3C040601 */ lui $a0, 0x0601 ## $a0 = 06010000 -/* 00638 8098EA98 55E10016 */ bnel $t7, $at, .L8098EAF4 -/* 0063C 8098EA9C 8FBF0024 */ lw $ra, 0x0024($sp) +/* 00638 8098EA98 55E10016 */ bnel $t7, $at, .L8098EAF4 +/* 0063C 8098EA9C 8FBF0024 */ lw $ra, 0x0024($sp) /* 00640 8098EAA0 0C028800 */ jal SkelAnime_GetFrameCount - + /* 00644 8098EAA4 2484DF80 */ addiu $a0, $a0, 0xDF80 ## $a0 = 0600DF80 /* 00648 8098EAA8 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 0064C 8098EAAC 3C01C080 */ lui $at, 0xC080 ## $at = C0800000 /* 00650 8098EAB0 44814000 */ mtc1 $at, $f8 ## $f8 = -4.00 -/* 00654 8098EAB4 468021A0 */ cvt.s.w $f6, $f4 -/* 00658 8098EAB8 8FA40028 */ lw $a0, 0x0028($sp) +/* 00654 8098EAB4 468021A0 */ cvt.s.w $f6, $f4 +/* 00658 8098EAB8 8FA40028 */ lw $a0, 0x0028($sp) /* 0065C 8098EABC 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 /* 00660 8098EAC0 24180002 */ addiu $t8, $zero, 0x0002 ## $t8 = 00000002 -/* 00664 8098EAC4 AFB80014 */ sw $t8, 0x0014($sp) +/* 00664 8098EAC4 AFB80014 */ sw $t8, 0x0014($sp) /* 00668 8098EAC8 24A5DF80 */ addiu $a1, $a1, 0xDF80 ## $a1 = 0600DF80 -/* 0066C 8098EACC E7A60010 */ swc1 $f6, 0x0010($sp) +/* 0066C 8098EACC E7A60010 */ swc1 $f6, 0x0010($sp) /* 00670 8098EAD0 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 00674 8098EAD4 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 00678 8098EAD8 E7A80018 */ swc1 $f8, 0x0018($sp) -/* 0067C 8098EADC 0C029468 */ jal SkelAnime_ChangeAnimation - +/* 00678 8098EAD8 E7A80018 */ swc1 $f8, 0x0018($sp) +/* 0067C 8098EADC 0C029468 */ jal SkelAnime_ChangeAnim + /* 00680 8098EAE0 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 00684 8098EAE4 8FA80028 */ lw $t0, 0x0028($sp) +/* 00684 8098EAE4 8FA80028 */ lw $t0, 0x0028($sp) /* 00688 8098EAE8 24190004 */ addiu $t9, $zero, 0x0004 ## $t9 = 00000004 /* 0068C 8098EAEC AD190198 */ sw $t9, 0x0198($t0) ## 00000198 -/* 00690 8098EAF0 8FBF0024 */ lw $ra, 0x0024($sp) +/* 00690 8098EAF0 8FBF0024 */ lw $ra, 0x0024($sp) .L8098EAF4: /* 00694 8098EAF4 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 00698 8098EAF8 03E00008 */ jr $ra +/* 00698 8098EAF8 03E00008 */ jr $ra /* 0069C 8098EAFC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098EB00.s b/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098EB00.s index 6acfcb82d0..a8f9cbd741 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098EB00.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098EB00.s @@ -1,33 +1,33 @@ glabel func_8098EB00 /* 006A0 8098EB00 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 006A4 8098EB04 AFBF0024 */ sw $ra, 0x0024($sp) -/* 006A8 8098EB08 10A00014 */ beq $a1, $zero, .L8098EB5C -/* 006AC 8098EB0C AFA40028 */ sw $a0, 0x0028($sp) +/* 006A4 8098EB04 AFBF0024 */ sw $ra, 0x0024($sp) +/* 006A8 8098EB08 10A00014 */ beq $a1, $zero, .L8098EB5C +/* 006AC 8098EB0C AFA40028 */ sw $a0, 0x0028($sp) /* 006B0 8098EB10 3C040601 */ lui $a0, 0x0601 ## $a0 = 06010000 /* 006B4 8098EB14 0C028800 */ jal SkelAnime_GetFrameCount - + /* 006B8 8098EB18 2484E500 */ addiu $a0, $a0, 0xE500 ## $a0 = 0600E500 /* 006BC 8098EB1C 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 006C0 8098EB20 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 006C4 8098EB24 8FA40028 */ lw $a0, 0x0028($sp) -/* 006C8 8098EB28 468021A0 */ cvt.s.w $f6, $f4 +/* 006C4 8098EB24 8FA40028 */ lw $a0, 0x0028($sp) +/* 006C8 8098EB28 468021A0 */ cvt.s.w $f6, $f4 /* 006CC 8098EB2C 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 -/* 006D0 8098EB30 44070000 */ mfc1 $a3, $f0 +/* 006D0 8098EB30 44070000 */ mfc1 $a3, $f0 /* 006D4 8098EB34 24A5E500 */ addiu $a1, $a1, 0xE500 ## $a1 = 0600E500 /* 006D8 8098EB38 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 006DC 8098EB3C AFA00014 */ sw $zero, 0x0014($sp) -/* 006E0 8098EB40 E7A60010 */ swc1 $f6, 0x0010($sp) +/* 006DC 8098EB3C AFA00014 */ sw $zero, 0x0014($sp) +/* 006E0 8098EB40 E7A60010 */ swc1 $f6, 0x0010($sp) /* 006E4 8098EB44 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 006E8 8098EB48 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 006EC 8098EB4C E7A00018 */ swc1 $f0, 0x0018($sp) -/* 006F0 8098EB50 8FAF0028 */ lw $t7, 0x0028($sp) +/* 006E8 8098EB48 0C029468 */ jal SkelAnime_ChangeAnim + +/* 006EC 8098EB4C E7A00018 */ swc1 $f0, 0x0018($sp) +/* 006F0 8098EB50 8FAF0028 */ lw $t7, 0x0028($sp) /* 006F4 8098EB54 240E0005 */ addiu $t6, $zero, 0x0005 ## $t6 = 00000005 /* 006F8 8098EB58 ADEE0198 */ sw $t6, 0x0198($t7) ## 00000198 .L8098EB5C: -/* 006FC 8098EB5C 8FBF0024 */ lw $ra, 0x0024($sp) +/* 006FC 8098EB5C 8FBF0024 */ lw $ra, 0x0024($sp) /* 00700 8098EB60 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 00704 8098EB64 03E00008 */ jr $ra +/* 00704 8098EB64 03E00008 */ jr $ra /* 00708 8098EB68 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098ECF4.s b/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098ECF4.s index b3648e0f40..61e306ae5b 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098ECF4.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098ECF4.s @@ -1,52 +1,52 @@ glabel func_8098ECF4 /* 00894 8098ECF4 27BDFFB8 */ addiu $sp, $sp, 0xFFB8 ## $sp = FFFFFFB8 -/* 00898 8098ECF8 AFB00028 */ sw $s0, 0x0028($sp) +/* 00898 8098ECF8 AFB00028 */ sw $s0, 0x0028($sp) /* 0089C 8098ECFC 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 008A0 8098ED00 AFBF002C */ sw $ra, 0x002C($sp) +/* 008A0 8098ED00 AFBF002C */ sw $ra, 0x002C($sp) /* 008A4 8098ED04 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 -/* 008A8 8098ED08 AFA5004C */ sw $a1, 0x004C($sp) +/* 008A8 8098ED08 AFA5004C */ sw $a1, 0x004C($sp) /* 008AC 8098ED0C 0C028800 */ jal SkelAnime_GetFrameCount - + /* 008B0 8098ED10 24841334 */ addiu $a0, $a0, 0x1334 ## $a0 = 06001334 /* 008B4 8098ED14 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 008B8 8098ED18 2605014C */ addiu $a1, $s0, 0x014C ## $a1 = 0000014C /* 008BC 8098ED1C 3C060601 */ lui $a2, 0x0601 ## $a2 = 06010000 -/* 008C0 8098ED20 468021A0 */ cvt.s.w $f6, $f4 +/* 008C0 8098ED20 468021A0 */ cvt.s.w $f6, $f4 /* 008C4 8098ED24 24C6B1A0 */ addiu $a2, $a2, 0xB1A0 ## $a2 = 0600B1A0 -/* 008C8 8098ED28 AFA50034 */ sw $a1, 0x0034($sp) -/* 008CC 8098ED2C 8FA4004C */ lw $a0, 0x004C($sp) +/* 008C8 8098ED28 AFA50034 */ sw $a1, 0x0034($sp) +/* 008CC 8098ED2C 8FA4004C */ lw $a0, 0x004C($sp) /* 008D0 8098ED30 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 008D4 8098ED34 AFA00010 */ sw $zero, 0x0010($sp) -/* 008D8 8098ED38 E7A60038 */ swc1 $f6, 0x0038($sp) -/* 008DC 8098ED3C AFA00014 */ sw $zero, 0x0014($sp) -/* 008E0 8098ED40 0C0291BE */ jal func_800A46F8 -/* 008E4 8098ED44 AFA00018 */ sw $zero, 0x0018($sp) +/* 008D4 8098ED34 AFA00010 */ sw $zero, 0x0010($sp) +/* 008D8 8098ED38 E7A60038 */ swc1 $f6, 0x0038($sp) +/* 008DC 8098ED3C AFA00014 */ sw $zero, 0x0014($sp) +/* 008E0 8098ED40 0C0291BE */ jal SkelAnime_InitSV +/* 008E4 8098ED44 AFA00018 */ sw $zero, 0x0018($sp) /* 008E8 8098ED48 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 008EC 8098ED4C C7A80038 */ lwc1 $f8, 0x0038($sp) +/* 008EC 8098ED4C C7A80038 */ lwc1 $f8, 0x0038($sp) /* 008F0 8098ED50 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 008F4 8098ED54 240E0002 */ addiu $t6, $zero, 0x0002 ## $t6 = 00000002 -/* 008F8 8098ED58 44070000 */ mfc1 $a3, $f0 -/* 008FC 8098ED5C AFAE0014 */ sw $t6, 0x0014($sp) +/* 008F8 8098ED58 44070000 */ mfc1 $a3, $f0 +/* 008FC 8098ED5C AFAE0014 */ sw $t6, 0x0014($sp) /* 00900 8098ED60 24A51334 */ addiu $a1, $a1, 0x1334 ## $a1 = 06001334 -/* 00904 8098ED64 8FA40034 */ lw $a0, 0x0034($sp) +/* 00904 8098ED64 8FA40034 */ lw $a0, 0x0034($sp) /* 00908 8098ED68 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 0090C 8098ED6C E7A80010 */ swc1 $f8, 0x0010($sp) -/* 00910 8098ED70 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 00914 8098ED74 E7A00018 */ swc1 $f0, 0x0018($sp) +/* 0090C 8098ED6C E7A80010 */ swc1 $f8, 0x0010($sp) +/* 00910 8098ED70 0C029468 */ jal SkelAnime_ChangeAnim + +/* 00914 8098ED74 E7A00018 */ swc1 $f0, 0x0018($sp) /* 00918 8098ED78 240F0007 */ addiu $t7, $zero, 0x0007 ## $t7 = 00000007 /* 0091C 8098ED7C AE0F0198 */ sw $t7, 0x0198($s0) ## 00000198 /* 00920 8098ED80 A20000C8 */ sb $zero, 0x00C8($s0) ## 000000C8 /* 00924 8098ED84 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00928 8098ED88 0C263942 */ jal func_8098E508 +/* 00928 8098ED88 0C263942 */ jal func_8098E508 /* 0092C 8098ED8C 24050002 */ addiu $a1, $zero, 0x0002 ## $a1 = 00000002 /* 00930 8098ED90 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00934 8098ED94 0C263947 */ jal func_8098E51C +/* 00934 8098ED94 0C263947 */ jal func_8098E51C /* 00938 8098ED98 24050002 */ addiu $a1, $zero, 0x0002 ## $a1 = 00000002 -/* 0093C 8098ED9C 8FBF002C */ lw $ra, 0x002C($sp) -/* 00940 8098EDA0 8FB00028 */ lw $s0, 0x0028($sp) +/* 0093C 8098ED9C 8FBF002C */ lw $ra, 0x002C($sp) +/* 00940 8098EDA0 8FB00028 */ lw $s0, 0x0028($sp) /* 00944 8098EDA4 27BD0048 */ addiu $sp, $sp, 0x0048 ## $sp = 00000000 -/* 00948 8098EDA8 03E00008 */ jr $ra +/* 00948 8098EDA8 03E00008 */ jr $ra /* 0094C 8098EDAC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098F1C0.s b/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098F1C0.s index a374463329..3edcc96573 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098F1C0.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098F1C0.s @@ -1,51 +1,51 @@ glabel func_8098F1C0 /* 00D60 8098F1C0 27BDFF78 */ addiu $sp, $sp, 0xFF78 ## $sp = FFFFFF78 -/* 00D64 8098F1C4 AFBF002C */ sw $ra, 0x002C($sp) -/* 00D68 8098F1C8 AFB00028 */ sw $s0, 0x0028($sp) -/* 00D6C 8098F1CC AFA40088 */ sw $a0, 0x0088($sp) -/* 00D70 8098F1D0 AFA5008C */ sw $a1, 0x008C($sp) +/* 00D64 8098F1C4 AFBF002C */ sw $ra, 0x002C($sp) +/* 00D68 8098F1C8 AFB00028 */ sw $s0, 0x0028($sp) +/* 00D6C 8098F1CC AFA40088 */ sw $a0, 0x0088($sp) +/* 00D70 8098F1D0 AFA5008C */ sw $a1, 0x008C($sp) /* 00D74 8098F1D4 84820190 */ lh $v0, 0x0190($a0) ## 00000190 /* 00D78 8098F1D8 3C188099 */ lui $t8, %hi(D_809900E0) ## $t8 = 80990000 /* 00D7C 8098F1DC 3C0A8099 */ lui $t2, %hi(D_809900F4) ## $t2 = 80990000 -/* 00D80 8098F1E0 00027880 */ sll $t7, $v0, 2 -/* 00D84 8098F1E4 030FC021 */ addu $t8, $t8, $t7 -/* 00D88 8098F1E8 8F1800E0 */ lw $t8, %lo(D_809900E0)($t8) +/* 00D80 8098F1E0 00027880 */ sll $t7, $v0, 2 +/* 00D84 8098F1E4 030FC021 */ addu $t8, $t8, $t7 +/* 00D88 8098F1E8 8F1800E0 */ lw $t8, %lo(D_809900E0)($t8) /* 00D8C 8098F1EC 3C068099 */ lui $a2, %hi(D_80990DE0) ## $a2 = 80990000 /* 00D90 8098F1F0 24C60DE0 */ addiu $a2, $a2, %lo(D_80990DE0) ## $a2 = 80990DE0 -/* 00D94 8098F1F4 AFB80078 */ sw $t8, 0x0078($sp) +/* 00D94 8098F1F4 AFB80078 */ sw $t8, 0x0078($sp) /* 00D98 8098F1F8 84830194 */ lh $v1, 0x0194($a0) ## 00000194 /* 00D9C 8098F1FC 27A40054 */ addiu $a0, $sp, 0x0054 ## $a0 = FFFFFFCC /* 00DA0 8098F200 24070128 */ addiu $a3, $zero, 0x0128 ## $a3 = 00000128 -/* 00DA4 8098F204 0003C880 */ sll $t9, $v1, 2 -/* 00DA8 8098F208 01595021 */ addu $t2, $t2, $t9 -/* 00DAC 8098F20C 8D4A00F4 */ lw $t2, %lo(D_809900F4)($t2) -/* 00DB0 8098F210 AFAA006C */ sw $t2, 0x006C($sp) +/* 00DA4 8098F204 0003C880 */ sll $t9, $v1, 2 +/* 00DA8 8098F208 01595021 */ addu $t2, $t2, $t9 +/* 00DAC 8098F20C 8D4A00F4 */ lw $t2, %lo(D_809900F4)($t2) +/* 00DB0 8098F210 AFAA006C */ sw $t2, 0x006C($sp) /* 00DB4 8098F214 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 -/* 00DB8 8098F218 0C031AB1 */ jal func_800C6AC4 +/* 00DB8 8098F218 0C031AB1 */ jal Graph_OpenDisps /* 00DBC 8098F21C 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 -/* 00DC0 8098F220 8FAC008C */ lw $t4, 0x008C($sp) -/* 00DC4 8098F224 0C024F61 */ jal func_80093D84 +/* 00DC0 8098F220 8FAC008C */ lw $t4, 0x008C($sp) +/* 00DC4 8098F224 0C024F61 */ jal func_80093D84 /* 00DC8 8098F228 8D840000 */ lw $a0, 0x0000($t4) ## 00000000 -/* 00DCC 8098F22C 8FA90078 */ lw $t1, 0x0078($sp) +/* 00DCC 8098F22C 8FA90078 */ lw $t1, 0x0078($sp) /* 00DD0 8098F230 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 /* 00DD4 8098F234 3C078016 */ lui $a3, 0x8016 ## $a3 = 80160000 -/* 00DD8 8098F238 0009C100 */ sll $t8, $t1, 4 -/* 00DDC 8098F23C 00187702 */ srl $t6, $t8, 28 +/* 00DD8 8098F238 0009C100 */ sll $t8, $t1, 4 +/* 00DDC 8098F23C 00187702 */ srl $t6, $t8, 28 /* 00DE0 8098F240 3C0FDB06 */ lui $t7, 0xDB06 ## $t7 = DB060000 /* 00DE4 8098F244 244D0008 */ addiu $t5, $v0, 0x0008 ## $t5 = 00000008 /* 00DE8 8098F248 AE0D02D0 */ sw $t5, 0x02D0($s0) ## 000002D0 /* 00DEC 8098F24C 35EF0020 */ ori $t7, $t7, 0x0020 ## $t7 = DB060020 -/* 00DF0 8098F250 000EC880 */ sll $t9, $t6, 2 +/* 00DF0 8098F250 000EC880 */ sll $t9, $t6, 2 /* 00DF4 8098F254 24E76FA8 */ addiu $a3, $a3, 0x6FA8 ## $a3 = 80166FA8 -/* 00DF8 8098F258 00F92021 */ addu $a0, $a3, $t9 +/* 00DF8 8098F258 00F92021 */ addu $a0, $a3, $t9 /* 00DFC 8098F25C AC4F0000 */ sw $t7, 0x0000($v0) ## 00000000 /* 00E00 8098F260 8C8A0000 */ lw $t2, 0x0000($a0) ## 00000000 /* 00E04 8098F264 3C0800FF */ lui $t0, 0x00FF ## $t0 = 00FF0000 /* 00E08 8098F268 3508FFFF */ ori $t0, $t0, 0xFFFF ## $t0 = 00FFFFFF -/* 00E0C 8098F26C 01282824 */ and $a1, $t1, $t0 +/* 00E0C 8098F26C 01282824 */ and $a1, $t1, $t0 /* 00E10 8098F270 3C068000 */ lui $a2, 0x8000 ## $a2 = 80000000 -/* 00E14 8098F274 01455821 */ addu $t3, $t2, $a1 -/* 00E18 8098F278 01666021 */ addu $t4, $t3, $a2 +/* 00E14 8098F274 01455821 */ addu $t3, $t2, $a1 +/* 00E18 8098F278 01666021 */ addu $t4, $t3, $a2 /* 00E1C 8098F27C AC4C0004 */ sw $t4, 0x0004($v0) ## 00000004 /* 00E20 8098F280 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 /* 00E24 8098F284 3C0FDB06 */ lui $t7, 0xDB06 ## $t7 = DB060000 @@ -56,26 +56,26 @@ glabel func_8098F1C0 /* 00E38 8098F298 8C980000 */ lw $t8, 0x0000($a0) ## 00000000 /* 00E3C 8098F29C 3C0BDB06 */ lui $t3, 0xDB06 ## $t3 = DB060000 /* 00E40 8098F2A0 356B0028 */ ori $t3, $t3, 0x0028 ## $t3 = DB060028 -/* 00E44 8098F2A4 03057021 */ addu $t6, $t8, $a1 -/* 00E48 8098F2A8 01C6C821 */ addu $t9, $t6, $a2 +/* 00E44 8098F2A4 03057021 */ addu $t6, $t8, $a1 +/* 00E48 8098F2A8 01C6C821 */ addu $t9, $t6, $a2 /* 00E4C 8098F2AC AC590004 */ sw $t9, 0x0004($v0) ## 00000004 -/* 00E50 8098F2B0 8FA4006C */ lw $a0, 0x006C($sp) +/* 00E50 8098F2B0 8FA4006C */ lw $a0, 0x006C($sp) /* 00E54 8098F2B4 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 00E58 8098F2B8 00046100 */ sll $t4, $a0, 4 -/* 00E5C 8098F2BC 000C6F02 */ srl $t5, $t4, 28 +/* 00E58 8098F2B8 00046100 */ sll $t4, $a0, 4 +/* 00E5C 8098F2BC 000C6F02 */ srl $t5, $t4, 28 /* 00E60 8098F2C0 244A0008 */ addiu $t2, $v0, 0x0008 ## $t2 = 00000008 /* 00E64 8098F2C4 AE0A02D0 */ sw $t2, 0x02D0($s0) ## 000002D0 -/* 00E68 8098F2C8 000D7880 */ sll $t7, $t5, 2 -/* 00E6C 8098F2CC 00EFC021 */ addu $t8, $a3, $t7 +/* 00E68 8098F2C8 000D7880 */ sll $t7, $t5, 2 +/* 00E6C 8098F2CC 00EFC021 */ addu $t8, $a3, $t7 /* 00E70 8098F2D0 AC4B0000 */ sw $t3, 0x0000($v0) ## 00000000 /* 00E74 8098F2D4 8F0E0000 */ lw $t6, 0x0000($t8) ## 00000000 -/* 00E78 8098F2D8 0088C824 */ and $t9, $a0, $t0 +/* 00E78 8098F2D8 0088C824 */ and $t9, $a0, $t0 /* 00E7C 8098F2DC 3C0DFB00 */ lui $t5, 0xFB00 ## $t5 = FB000000 -/* 00E80 8098F2E0 01D95021 */ addu $t2, $t6, $t9 -/* 00E84 8098F2E4 01465821 */ addu $t3, $t2, $a2 +/* 00E80 8098F2E0 01D95021 */ addu $t2, $t6, $t9 +/* 00E84 8098F2E4 01465821 */ addu $t3, $t2, $a2 /* 00E88 8098F2E8 AC4B0004 */ sw $t3, 0x0004($v0) ## 00000004 /* 00E8C 8098F2EC 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 00E90 8098F2F0 8FA80088 */ lw $t0, 0x0088($sp) +/* 00E90 8098F2F0 8FA80088 */ lw $t0, 0x0088($sp) /* 00E94 8098F2F4 3C0A8011 */ lui $t2, 0x8011 ## $t2 = 80110000 /* 00E98 8098F2F8 244C0008 */ addiu $t4, $v0, 0x0008 ## $t4 = 00000008 /* 00E9C 8098F2FC AE0C02D0 */ sw $t4, 0x02D0($s0) ## 000002D0 @@ -95,25 +95,25 @@ glabel func_8098F1C0 /* 00ED4 8098F334 8C450004 */ lw $a1, 0x0004($v0) ## 0100014F /* 00ED8 8098F338 8C460020 */ lw $a2, 0x0020($v0) ## 0100016B /* 00EDC 8098F33C 90470002 */ lbu $a3, 0x0002($v0) ## 0100014D -/* 00EE0 8098F340 AFA00018 */ sw $zero, 0x0018($sp) -/* 00EE4 8098F344 AFA00014 */ sw $zero, 0x0014($sp) -/* 00EE8 8098F348 AFA00010 */ sw $zero, 0x0010($sp) +/* 00EE0 8098F340 AFA00018 */ sw $zero, 0x0018($sp) +/* 00EE4 8098F344 AFA00014 */ sw $zero, 0x0014($sp) +/* 00EE8 8098F348 AFA00010 */ sw $zero, 0x0010($sp) /* 00EEC 8098F34C 8E0B02D0 */ lw $t3, 0x02D0($s0) ## 000002D0 -/* 00EF0 8098F350 8FA4008C */ lw $a0, 0x008C($sp) -/* 00EF4 8098F354 0C0289CF */ jal func_800A273C -/* 00EF8 8098F358 AFAB001C */ sw $t3, 0x001C($sp) +/* 00EF0 8098F350 8FA4008C */ lw $a0, 0x008C($sp) +/* 00EF4 8098F354 0C0289CF */ jal SkelAnime_DrawSV2 +/* 00EF8 8098F358 AFAB001C */ sw $t3, 0x001C($sp) /* 00EFC 8098F35C AE0202D0 */ sw $v0, 0x02D0($s0) ## 000002D0 -/* 00F00 8098F360 8FAC008C */ lw $t4, 0x008C($sp) +/* 00F00 8098F360 8FAC008C */ lw $t4, 0x008C($sp) /* 00F04 8098F364 3C068099 */ lui $a2, %hi(D_80990E04) ## $a2 = 80990000 /* 00F08 8098F368 24C60E04 */ addiu $a2, $a2, %lo(D_80990E04) ## $a2 = 80990E04 /* 00F0C 8098F36C 27A40054 */ addiu $a0, $sp, 0x0054 ## $a0 = FFFFFFCC /* 00F10 8098F370 24070145 */ addiu $a3, $zero, 0x0145 ## $a3 = 00000145 -/* 00F14 8098F374 0C031AD5 */ jal func_800C6B54 +/* 00F14 8098F374 0C031AD5 */ jal Graph_CloseDisps /* 00F18 8098F378 8D850000 */ lw $a1, 0x0000($t4) ## 00000000 -/* 00F1C 8098F37C 8FBF002C */ lw $ra, 0x002C($sp) -/* 00F20 8098F380 8FB00028 */ lw $s0, 0x0028($sp) +/* 00F1C 8098F37C 8FBF002C */ lw $ra, 0x002C($sp) +/* 00F20 8098F380 8FB00028 */ lw $s0, 0x0028($sp) /* 00F24 8098F384 27BD0088 */ addiu $sp, $sp, 0x0088 ## $sp = 00000000 -/* 00F28 8098F388 03E00008 */ jr $ra +/* 00F28 8098F388 03E00008 */ jr $ra /* 00F2C 8098F38C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098F390.s b/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098F390.s index af44e378c8..12795fd6f9 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098F390.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098F390.s @@ -1,27 +1,27 @@ glabel func_8098F390 /* 00F30 8098F390 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 00F34 8098F394 AFA40028 */ sw $a0, 0x0028($sp) -/* 00F38 8098F398 AFA5002C */ sw $a1, 0x002C($sp) +/* 00F34 8098F394 AFA40028 */ sw $a0, 0x0028($sp) +/* 00F38 8098F398 AFA5002C */ sw $a1, 0x002C($sp) /* 00F3C 8098F39C 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 00F40 8098F3A0 8FA50028 */ lw $a1, 0x0028($sp) -/* 00F44 8098F3A4 AFBF0024 */ sw $ra, 0x0024($sp) +/* 00F40 8098F3A0 8FA50028 */ lw $a1, 0x0028($sp) +/* 00F44 8098F3A4 AFBF0024 */ sw $ra, 0x0024($sp) /* 00F48 8098F3A8 3C060601 */ lui $a2, 0x0601 ## $a2 = 06010000 /* 00F4C 8098F3AC 3C070600 */ lui $a3, 0x0600 ## $a3 = 06000000 /* 00F50 8098F3B0 24E721D8 */ addiu $a3, $a3, 0x21D8 ## $a3 = 060021D8 /* 00F54 8098F3B4 24C6B1A0 */ addiu $a2, $a2, 0xB1A0 ## $a2 = 0600B1A0 -/* 00F58 8098F3B8 AFA00010 */ sw $zero, 0x0010($sp) -/* 00F5C 8098F3BC AFA00014 */ sw $zero, 0x0014($sp) -/* 00F60 8098F3C0 AFA00018 */ sw $zero, 0x0018($sp) -/* 00F64 8098F3C4 0C0291BE */ jal func_800A46F8 +/* 00F58 8098F3B8 AFA00010 */ sw $zero, 0x0010($sp) +/* 00F5C 8098F3BC AFA00014 */ sw $zero, 0x0014($sp) +/* 00F60 8098F3C0 AFA00018 */ sw $zero, 0x0018($sp) +/* 00F64 8098F3C4 0C0291BE */ jal SkelAnime_InitSV /* 00F68 8098F3C8 24A5014C */ addiu $a1, $a1, 0x014C ## $a1 = 0000014C -/* 00F6C 8098F3CC 8FA20028 */ lw $v0, 0x0028($sp) +/* 00F6C 8098F3CC 8FA20028 */ lw $v0, 0x0028($sp) /* 00F70 8098F3D0 240E000A */ addiu $t6, $zero, 0x000A ## $t6 = 0000000A /* 00F74 8098F3D4 240F0001 */ addiu $t7, $zero, 0x0001 ## $t7 = 00000001 /* 00F78 8098F3D8 AC4E0198 */ sw $t6, 0x0198($v0) ## 00000198 /* 00F7C 8098F3DC AC4F019C */ sw $t7, 0x019C($v0) ## 0000019C -/* 00F80 8098F3E0 8FBF0024 */ lw $ra, 0x0024($sp) +/* 00F80 8098F3E0 8FBF0024 */ lw $ra, 0x0024($sp) /* 00F84 8098F3E4 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 00F88 8098F3E8 03E00008 */ jr $ra +/* 00F88 8098F3E8 03E00008 */ jr $ra /* 00F8C 8098F3EC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098F420.s b/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098F420.s index 9b16c461ac..73b3733a41 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098F420.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098F420.s @@ -1,27 +1,27 @@ glabel func_8098F420 /* 00FC0 8098F420 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 00FC4 8098F424 AFA40028 */ sw $a0, 0x0028($sp) -/* 00FC8 8098F428 AFA5002C */ sw $a1, 0x002C($sp) +/* 00FC4 8098F424 AFA40028 */ sw $a0, 0x0028($sp) +/* 00FC8 8098F428 AFA5002C */ sw $a1, 0x002C($sp) /* 00FCC 8098F42C 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 00FD0 8098F430 8FA50028 */ lw $a1, 0x0028($sp) -/* 00FD4 8098F434 AFBF0024 */ sw $ra, 0x0024($sp) +/* 00FD0 8098F430 8FA50028 */ lw $a1, 0x0028($sp) +/* 00FD4 8098F434 AFBF0024 */ sw $ra, 0x0024($sp) /* 00FD8 8098F438 3C060601 */ lui $a2, 0x0601 ## $a2 = 06010000 /* 00FDC 8098F43C 3C070601 */ lui $a3, 0x0601 ## $a3 = 06010000 /* 00FE0 8098F440 24E7FFD4 */ addiu $a3, $a3, 0xFFD4 ## $a3 = 0600FFD4 /* 00FE4 8098F444 24C6B1A0 */ addiu $a2, $a2, 0xB1A0 ## $a2 = 0600B1A0 -/* 00FE8 8098F448 AFA00010 */ sw $zero, 0x0010($sp) -/* 00FEC 8098F44C AFA00014 */ sw $zero, 0x0014($sp) -/* 00FF0 8098F450 AFA00018 */ sw $zero, 0x0018($sp) -/* 00FF4 8098F454 0C0291BE */ jal func_800A46F8 +/* 00FE8 8098F448 AFA00010 */ sw $zero, 0x0010($sp) +/* 00FEC 8098F44C AFA00014 */ sw $zero, 0x0014($sp) +/* 00FF0 8098F450 AFA00018 */ sw $zero, 0x0018($sp) +/* 00FF4 8098F454 0C0291BE */ jal SkelAnime_InitSV /* 00FF8 8098F458 24A5014C */ addiu $a1, $a1, 0x014C ## $a1 = 0000014C -/* 00FFC 8098F45C 8FA20028 */ lw $v0, 0x0028($sp) +/* 00FFC 8098F45C 8FA20028 */ lw $v0, 0x0028($sp) /* 01000 8098F460 240E000B */ addiu $t6, $zero, 0x000B ## $t6 = 0000000B /* 01004 8098F464 AC4E0198 */ sw $t6, 0x0198($v0) ## 00000198 /* 01008 8098F468 AC40019C */ sw $zero, 0x019C($v0) ## 0000019C /* 0100C 8098F46C A04000C8 */ sb $zero, 0x00C8($v0) ## 000000C8 -/* 01010 8098F470 8FBF0024 */ lw $ra, 0x0024($sp) +/* 01010 8098F470 8FBF0024 */ lw $ra, 0x0024($sp) /* 01014 8098F474 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 01018 8098F478 03E00008 */ jr $ra +/* 01018 8098F478 03E00008 */ jr $ra /* 0101C 8098F47C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098F83C.s b/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098F83C.s index 8993576725..1fb66b1c59 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098F83C.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098F83C.s @@ -1,51 +1,51 @@ glabel func_8098F83C /* 013DC 8098F83C 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 -/* 013E0 8098F840 AFB00038 */ sw $s0, 0x0038($sp) +/* 013E0 8098F840 AFB00038 */ sw $s0, 0x0038($sp) /* 013E4 8098F844 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 013E8 8098F848 AFBF003C */ sw $ra, 0x003C($sp) -/* 013EC 8098F84C AFA50044 */ sw $a1, 0x0044($sp) +/* 013E8 8098F848 AFBF003C */ sw $ra, 0x003C($sp) +/* 013EC 8098F84C AFA50044 */ sw $a1, 0x0044($sp) /* 013F0 8098F850 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 /* 013F4 8098F854 3C060601 */ lui $a2, 0x0601 ## $a2 = 06010000 /* 013F8 8098F858 3C070601 */ lui $a3, 0x0601 ## $a3 = 06010000 /* 013FC 8098F85C 24E7113C */ addiu $a3, $a3, 0x113C ## $a3 = 0601113C /* 01400 8098F860 24C6B1A0 */ addiu $a2, $a2, 0xB1A0 ## $a2 = 0600B1A0 /* 01404 8098F864 2605014C */ addiu $a1, $s0, 0x014C ## $a1 = 0000014C -/* 01408 8098F868 AFA00010 */ sw $zero, 0x0010($sp) -/* 0140C 8098F86C AFA00014 */ sw $zero, 0x0014($sp) -/* 01410 8098F870 0C0291BE */ jal func_800A46F8 -/* 01414 8098F874 AFA00018 */ sw $zero, 0x0018($sp) +/* 01408 8098F868 AFA00010 */ sw $zero, 0x0010($sp) +/* 0140C 8098F86C AFA00014 */ sw $zero, 0x0014($sp) +/* 01410 8098F870 0C0291BE */ jal SkelAnime_InitSV +/* 01414 8098F874 AFA00018 */ sw $zero, 0x0018($sp) /* 01418 8098F878 26020024 */ addiu $v0, $s0, 0x0024 ## $v0 = 00000024 /* 0141C 8098F87C C4440000 */ lwc1 $f4, 0x0000($v0) ## 00000024 -/* 01420 8098F880 8FA60044 */ lw $a2, 0x0044($sp) +/* 01420 8098F880 8FA60044 */ lw $a2, 0x0044($sp) /* 01424 8098F884 240E0003 */ addiu $t6, $zero, 0x0003 ## $t6 = 00000003 -/* 01428 8098F888 E7A40010 */ swc1 $f4, 0x0010($sp) +/* 01428 8098F888 E7A40010 */ swc1 $f4, 0x0010($sp) /* 0142C 8098F88C C4460004 */ lwc1 $f6, 0x0004($v0) ## 00000028 /* 01430 8098F890 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 01434 8098F894 24070018 */ addiu $a3, $zero, 0x0018 ## $a3 = 00000018 -/* 01438 8098F898 E7A60014 */ swc1 $f6, 0x0014($sp) +/* 01438 8098F898 E7A60014 */ swc1 $f6, 0x0014($sp) /* 0143C 8098F89C C4480008 */ lwc1 $f8, 0x0008($v0) ## 0000002C -/* 01440 8098F8A0 AFAE0028 */ sw $t6, 0x0028($sp) -/* 01444 8098F8A4 AFA00024 */ sw $zero, 0x0024($sp) -/* 01448 8098F8A8 AFA00020 */ sw $zero, 0x0020($sp) -/* 0144C 8098F8AC AFA0001C */ sw $zero, 0x001C($sp) +/* 01440 8098F8A0 AFAE0028 */ sw $t6, 0x0028($sp) +/* 01444 8098F8A4 AFA00024 */ sw $zero, 0x0024($sp) +/* 01448 8098F8A8 AFA00020 */ sw $zero, 0x0020($sp) +/* 0144C 8098F8AC AFA0001C */ sw $zero, 0x001C($sp) /* 01450 8098F8B0 24C41C24 */ addiu $a0, $a2, 0x1C24 ## $a0 = 00001C24 /* 01454 8098F8B4 0C00C916 */ jal Actor_SpawnAttached - -/* 01458 8098F8B8 E7A80018 */ swc1 $f8, 0x0018($sp) + +/* 01458 8098F8B8 E7A80018 */ swc1 $f8, 0x0018($sp) /* 0145C 8098F8BC 240F0010 */ addiu $t7, $zero, 0x0010 ## $t7 = 00000010 /* 01460 8098F8C0 AE0F0198 */ sw $t7, 0x0198($s0) ## 00000198 /* 01464 8098F8C4 AE00019C */ sw $zero, 0x019C($s0) ## 0000019C /* 01468 8098F8C8 A20000C8 */ sb $zero, 0x00C8($s0) ## 000000C8 /* 0146C 8098F8CC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01470 8098F8D0 0C263942 */ jal func_8098E508 +/* 01470 8098F8D0 0C263942 */ jal func_8098E508 /* 01474 8098F8D4 24050004 */ addiu $a1, $zero, 0x0004 ## $a1 = 00000004 /* 01478 8098F8D8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0147C 8098F8DC 0C263947 */ jal func_8098E51C +/* 0147C 8098F8DC 0C263947 */ jal func_8098E51C /* 01480 8098F8E0 24050002 */ addiu $a1, $zero, 0x0002 ## $a1 = 00000002 -/* 01484 8098F8E4 8FBF003C */ lw $ra, 0x003C($sp) -/* 01488 8098F8E8 8FB00038 */ lw $s0, 0x0038($sp) +/* 01484 8098F8E4 8FBF003C */ lw $ra, 0x003C($sp) +/* 01488 8098F8E8 8FB00038 */ lw $s0, 0x0038($sp) /* 0148C 8098F8EC 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 -/* 01490 8098F8F0 03E00008 */ jr $ra +/* 01490 8098F8F0 03E00008 */ jr $ra /* 01494 8098F8F4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098FEB4.s b/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098FEB4.s index 8fc66b0426..327c9f95a3 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098FEB4.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Sa/func_8098FEB4.s @@ -1,51 +1,51 @@ glabel func_8098FEB4 /* 01A54 8098FEB4 27BDFF80 */ addiu $sp, $sp, 0xFF80 ## $sp = FFFFFF80 -/* 01A58 8098FEB8 AFBF0024 */ sw $ra, 0x0024($sp) -/* 01A5C 8098FEBC AFA40080 */ sw $a0, 0x0080($sp) -/* 01A60 8098FEC0 AFA50084 */ sw $a1, 0x0084($sp) +/* 01A58 8098FEB8 AFBF0024 */ sw $ra, 0x0024($sp) +/* 01A5C 8098FEBC AFA40080 */ sw $a0, 0x0080($sp) +/* 01A60 8098FEC0 AFA50084 */ sw $a1, 0x0084($sp) /* 01A64 8098FEC4 84820190 */ lh $v0, 0x0190($a0) ## 00000190 /* 01A68 8098FEC8 3C188099 */ lui $t8, %hi(D_809900E0) ## $t8 = 80990000 /* 01A6C 8098FECC 3C0B8099 */ lui $t3, %hi(D_809900F4) ## $t3 = 80990000 -/* 01A70 8098FED0 00027880 */ sll $t7, $v0, 2 -/* 01A74 8098FED4 030FC021 */ addu $t8, $t8, $t7 -/* 01A78 8098FED8 8F1800E0 */ lw $t8, %lo(D_809900E0)($t8) +/* 01A70 8098FED0 00027880 */ sll $t7, $v0, 2 +/* 01A74 8098FED4 030FC021 */ addu $t8, $t8, $t7 +/* 01A78 8098FED8 8F1800E0 */ lw $t8, %lo(D_809900E0)($t8) /* 01A7C 8098FEDC 3C068099 */ lui $a2, %hi(D_80990EDC) ## $a2 = 80990000 /* 01A80 8098FEE0 24C60EDC */ addiu $a2, $a2, %lo(D_80990EDC) ## $a2 = 80990EDC -/* 01A84 8098FEE4 AFB80070 */ sw $t8, 0x0070($sp) +/* 01A84 8098FEE4 AFB80070 */ sw $t8, 0x0070($sp) /* 01A88 8098FEE8 84830194 */ lh $v1, 0x0194($a0) ## 00000194 /* 01A8C 8098FEEC 27A4004C */ addiu $a0, $sp, 0x004C ## $a0 = FFFFFFCC /* 01A90 8098FEF0 2407025A */ addiu $a3, $zero, 0x025A ## $a3 = 0000025A -/* 01A94 8098FEF4 0003C880 */ sll $t9, $v1, 2 -/* 01A98 8098FEF8 01795821 */ addu $t3, $t3, $t9 -/* 01A9C 8098FEFC 8D6B00F4 */ lw $t3, %lo(D_809900F4)($t3) -/* 01AA0 8098FF00 AFAB0064 */ sw $t3, 0x0064($sp) +/* 01A94 8098FEF4 0003C880 */ sll $t9, $v1, 2 +/* 01A98 8098FEF8 01795821 */ addu $t3, $t3, $t9 +/* 01A9C 8098FEFC 8D6B00F4 */ lw $t3, %lo(D_809900F4)($t3) +/* 01AA0 8098FF00 AFAB0064 */ sw $t3, 0x0064($sp) /* 01AA4 8098FF04 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 -/* 01AA8 8098FF08 0C031AB1 */ jal func_800C6AC4 -/* 01AAC 8098FF0C AFA5005C */ sw $a1, 0x005C($sp) -/* 01AB0 8098FF10 8FAD0084 */ lw $t5, 0x0084($sp) -/* 01AB4 8098FF14 0C024F46 */ jal func_80093D18 +/* 01AA8 8098FF08 0C031AB1 */ jal Graph_OpenDisps +/* 01AAC 8098FF0C AFA5005C */ sw $a1, 0x005C($sp) +/* 01AB0 8098FF10 8FAD0084 */ lw $t5, 0x0084($sp) +/* 01AB4 8098FF14 0C024F46 */ jal func_80093D18 /* 01AB8 8098FF18 8DA40000 */ lw $a0, 0x0000($t5) ## 00000000 -/* 01ABC 8098FF1C 8FA8005C */ lw $t0, 0x005C($sp) -/* 01AC0 8098FF20 8FAA0070 */ lw $t2, 0x0070($sp) +/* 01ABC 8098FF1C 8FA8005C */ lw $t0, 0x005C($sp) +/* 01AC0 8098FF20 8FAA0070 */ lw $t2, 0x0070($sp) /* 01AC4 8098FF24 3C078016 */ lui $a3, 0x8016 ## $a3 = 80160000 /* 01AC8 8098FF28 8D0202C0 */ lw $v0, 0x02C0($t0) ## 000002C0 -/* 01ACC 8098FF2C 000A7100 */ sll $t6, $t2, 4 -/* 01AD0 8098FF30 000ECF02 */ srl $t9, $t6, 28 +/* 01ACC 8098FF2C 000A7100 */ sll $t6, $t2, 4 +/* 01AD0 8098FF30 000ECF02 */ srl $t9, $t6, 28 /* 01AD4 8098FF34 3C18DB06 */ lui $t8, 0xDB06 ## $t8 = DB060000 /* 01AD8 8098FF38 244F0008 */ addiu $t7, $v0, 0x0008 ## $t7 = 00000008 /* 01ADC 8098FF3C 37180020 */ ori $t8, $t8, 0x0020 ## $t8 = DB060020 -/* 01AE0 8098FF40 00195880 */ sll $t3, $t9, 2 +/* 01AE0 8098FF40 00195880 */ sll $t3, $t9, 2 /* 01AE4 8098FF44 24E76FA8 */ addiu $a3, $a3, 0x6FA8 ## $a3 = 80166FA8 /* 01AE8 8098FF48 AD0F02C0 */ sw $t7, 0x02C0($t0) ## 000002C0 -/* 01AEC 8098FF4C 00EB2021 */ addu $a0, $a3, $t3 +/* 01AEC 8098FF4C 00EB2021 */ addu $a0, $a3, $t3 /* 01AF0 8098FF50 AC580000 */ sw $t8, 0x0000($v0) ## 00000000 /* 01AF4 8098FF54 8C8C0000 */ lw $t4, 0x0000($a0) ## 00000000 /* 01AF8 8098FF58 3C0900FF */ lui $t1, 0x00FF ## $t1 = 00FF0000 /* 01AFC 8098FF5C 3529FFFF */ ori $t1, $t1, 0xFFFF ## $t1 = 00FFFFFF -/* 01B00 8098FF60 01492824 */ and $a1, $t2, $t1 +/* 01B00 8098FF60 01492824 */ and $a1, $t2, $t1 /* 01B04 8098FF64 3C068000 */ lui $a2, 0x8000 ## $a2 = 80000000 -/* 01B08 8098FF68 01856821 */ addu $t5, $t4, $a1 -/* 01B0C 8098FF6C 01A67821 */ addu $t7, $t5, $a2 +/* 01B08 8098FF68 01856821 */ addu $t5, $t4, $a1 +/* 01B0C 8098FF6C 01A67821 */ addu $t7, $t5, $a2 /* 01B10 8098FF70 AC4F0004 */ sw $t7, 0x0004($v0) ## 00000004 /* 01B14 8098FF74 8D0202C0 */ lw $v0, 0x02C0($t0) ## 000002C0 /* 01B18 8098FF78 3C0EDB06 */ lui $t6, 0xDB06 ## $t6 = DB060000 @@ -56,23 +56,23 @@ glabel func_8098FEB4 /* 01B2C 8098FF8C 8C990000 */ lw $t9, 0x0000($a0) ## 00000000 /* 01B30 8098FF90 3C0FDB06 */ lui $t7, 0xDB06 ## $t7 = DB060000 /* 01B34 8098FF94 35EF0028 */ ori $t7, $t7, 0x0028 ## $t7 = DB060028 -/* 01B38 8098FF98 03255821 */ addu $t3, $t9, $a1 -/* 01B3C 8098FF9C 01666021 */ addu $t4, $t3, $a2 +/* 01B38 8098FF98 03255821 */ addu $t3, $t9, $a1 +/* 01B3C 8098FF9C 01666021 */ addu $t4, $t3, $a2 /* 01B40 8098FFA0 AC4C0004 */ sw $t4, 0x0004($v0) ## 00000004 -/* 01B44 8098FFA4 8FA40064 */ lw $a0, 0x0064($sp) +/* 01B44 8098FFA4 8FA40064 */ lw $a0, 0x0064($sp) /* 01B48 8098FFA8 8D0202C0 */ lw $v0, 0x02C0($t0) ## 000002C0 -/* 01B4C 8098FFAC 0004C100 */ sll $t8, $a0, 4 -/* 01B50 8098FFB0 00187702 */ srl $t6, $t8, 28 +/* 01B4C 8098FFAC 0004C100 */ sll $t8, $a0, 4 +/* 01B50 8098FFB0 00187702 */ srl $t6, $t8, 28 /* 01B54 8098FFB4 244D0008 */ addiu $t5, $v0, 0x0008 ## $t5 = 00000008 -/* 01B58 8098FFB8 000EC880 */ sll $t9, $t6, 2 +/* 01B58 8098FFB8 000EC880 */ sll $t9, $t6, 2 /* 01B5C 8098FFBC AD0D02C0 */ sw $t5, 0x02C0($t0) ## 000002C0 -/* 01B60 8098FFC0 00F95821 */ addu $t3, $a3, $t9 +/* 01B60 8098FFC0 00F95821 */ addu $t3, $a3, $t9 /* 01B64 8098FFC4 AC4F0000 */ sw $t7, 0x0000($v0) ## 00000000 /* 01B68 8098FFC8 8D6C0000 */ lw $t4, 0x0000($t3) ## 00000000 -/* 01B6C 8098FFCC 00896824 */ and $t5, $a0, $t1 +/* 01B6C 8098FFCC 00896824 */ and $t5, $a0, $t1 /* 01B70 8098FFD0 240B00FF */ addiu $t3, $zero, 0x00FF ## $t3 = 000000FF -/* 01B74 8098FFD4 018D7821 */ addu $t7, $t4, $t5 -/* 01B78 8098FFD8 01E6C021 */ addu $t8, $t7, $a2 +/* 01B74 8098FFD4 018D7821 */ addu $t7, $t4, $t5 +/* 01B78 8098FFD8 01E6C021 */ addu $t8, $t7, $a2 /* 01B7C 8098FFDC AC580004 */ sw $t8, 0x0004($v0) ## 00000004 /* 01B80 8098FFE0 8D0202C0 */ lw $v0, 0x02C0($t0) ## 000002C0 /* 01B84 8098FFE4 3C19FB00 */ lui $t9, 0xFB00 ## $t9 = FB000000 @@ -89,28 +89,28 @@ glabel func_8098FEB4 /* 01BB0 80990010 25EF6290 */ addiu $t7, $t7, 0x6290 ## $t7 = 80116290 /* 01BB4 80990014 AC4F0004 */ sw $t7, 0x0004($v0) ## 00000004 /* 01BB8 80990018 AC4D0000 */ sw $t5, 0x0000($v0) ## 00000000 -/* 01BBC 8099001C 8FA30080 */ lw $v1, 0x0080($sp) +/* 01BBC 8099001C 8FA30080 */ lw $v1, 0x0080($sp) /* 01BC0 80990020 3C188099 */ lui $t8, %hi(func_8098FE74) ## $t8 = 80990000 /* 01BC4 80990024 2718FE74 */ addiu $t8, $t8, %lo(func_8098FE74) ## $t8 = 8098FE74 /* 01BC8 80990028 2462014C */ addiu $v0, $v1, 0x014C ## $v0 = 0000014C /* 01BCC 8099002C 8C450004 */ lw $a1, 0x0004($v0) ## 00000150 /* 01BD0 80990030 8C460020 */ lw $a2, 0x0020($v0) ## 0000016C /* 01BD4 80990034 90470002 */ lbu $a3, 0x0002($v0) ## 0000014E -/* 01BD8 80990038 AFA00014 */ sw $zero, 0x0014($sp) -/* 01BDC 8099003C AFB80010 */ sw $t8, 0x0010($sp) -/* 01BE0 80990040 8FA40084 */ lw $a0, 0x0084($sp) -/* 01BE4 80990044 0C0286B2 */ jal func_800A1AC8 -/* 01BE8 80990048 AFA30018 */ sw $v1, 0x0018($sp) -/* 01BEC 8099004C 8FAE0084 */ lw $t6, 0x0084($sp) +/* 01BD8 80990038 AFA00014 */ sw $zero, 0x0014($sp) +/* 01BDC 8099003C AFB80010 */ sw $t8, 0x0010($sp) +/* 01BE0 80990040 8FA40084 */ lw $a0, 0x0084($sp) +/* 01BE4 80990044 0C0286B2 */ jal SkelAnime_DrawSV +/* 01BE8 80990048 AFA30018 */ sw $v1, 0x0018($sp) +/* 01BEC 8099004C 8FAE0084 */ lw $t6, 0x0084($sp) /* 01BF0 80990050 3C068099 */ lui $a2, %hi(D_80990EEC) ## $a2 = 80990000 /* 01BF4 80990054 24C60EEC */ addiu $a2, $a2, %lo(D_80990EEC) ## $a2 = 80990EEC /* 01BF8 80990058 27A4004C */ addiu $a0, $sp, 0x004C ## $a0 = FFFFFFCC /* 01BFC 8099005C 24070272 */ addiu $a3, $zero, 0x0272 ## $a3 = 00000272 -/* 01C00 80990060 0C031AD5 */ jal func_800C6B54 +/* 01C00 80990060 0C031AD5 */ jal Graph_CloseDisps /* 01C04 80990064 8DC50000 */ lw $a1, 0x0000($t6) ## 00000000 -/* 01C08 80990068 8FBF0024 */ lw $ra, 0x0024($sp) +/* 01C08 80990068 8FBF0024 */ lw $ra, 0x0024($sp) /* 01C0C 8099006C 27BD0080 */ addiu $sp, $sp, 0x0080 ## $sp = 00000000 -/* 01C10 80990070 03E00008 */ jr $ra +/* 01C10 80990070 03E00008 */ jr $ra /* 01C14 80990074 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Shd/DemoShd_Draw.s b/asm/non_matchings/overlays/actors/ovl_Demo_Shd/DemoShd_Draw.s index 84d226f102..0e081a36d6 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Shd/DemoShd_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Shd/DemoShd_Draw.s @@ -11,7 +11,7 @@ glabel DemoShd_Draw /* 0020C 8099143C 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 /* 00210 80991440 27A40060 */ addiu $a0, $sp, 0x0060 ## $a0 = FFFFFFE0 /* 00214 80991444 240702D6 */ addiu $a3, $zero, 0x02D6 ## $a3 = 000002D6 -/* 00218 80991448 0C031AB1 */ jal func_800C6AC4 +/* 00218 80991448 0C031AB1 */ jal Graph_OpenDisps /* 0021C 8099144C 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 /* 00220 80991450 8FB90084 */ lw $t9, 0x0084($sp) /* 00224 80991454 0C024F61 */ jal func_80093D84 @@ -74,7 +74,7 @@ glabel DemoShd_Draw /* 00308 80991538 AFAE0018 */ sw $t6, 0x0018($sp) /* 0030C 8099153C AFAD0014 */ sw $t5, 0x0014($sp) /* 00310 80991540 AFAC0010 */ sw $t4, 0x0010($sp) -/* 00314 80991544 0C0253D0 */ jal Draw_TwoTexScroll +/* 00314 80991544 0C0253D0 */ jal Gfx_TwoTexScroll /* 00318 80991548 AFA20054 */ sw $v0, 0x0054($sp) /* 0031C 8099154C 8FA80054 */ lw $t0, 0x0054($sp) /* 00320 80991550 3C0E8099 */ lui $t6, %hi(D_80993390) ## $t6 = 80990000 @@ -119,7 +119,7 @@ glabel DemoShd_Draw /* 003B8 809915E8 AFA0001C */ sw $zero, 0x001C($sp) /* 003BC 809915EC AFAC0010 */ sw $t4, 0x0010($sp) /* 003C0 809915F0 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 003C4 809915F4 0C0253D0 */ jal Draw_TwoTexScroll +/* 003C4 809915F4 0C0253D0 */ jal Gfx_TwoTexScroll /* 003C8 809915F8 AFA2004C */ sw $v0, 0x004C($sp) /* 003CC 809915FC 8FA8004C */ lw $t0, 0x004C($sp) /* 003D0 80991600 3C0E8099 */ lui $t6, %hi(D_809934B8) ## $t6 = 80990000 @@ -137,7 +137,7 @@ glabel DemoShd_Draw /* 003FC 8099162C 24C63620 */ addiu $a2, $a2, %lo(D_80993620) ## $a2 = 80993620 /* 00400 80991630 27A40060 */ addiu $a0, $sp, 0x0060 ## $a0 = FFFFFFE0 /* 00404 80991634 240702FA */ addiu $a3, $zero, 0x02FA ## $a3 = 000002FA -/* 00408 80991638 0C031AD5 */ jal func_800C6B54 +/* 00408 80991638 0C031AD5 */ jal Graph_CloseDisps /* 0040C 8099163C 8DE50000 */ lw $a1, 0x0000($t7) ## 00000000 /* 00410 80991640 8FBF003C */ lw $ra, 0x003C($sp) /* 00414 80991644 8FB00038 */ lw $s0, 0x0038($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Tre_Lgt/DemoTreLgt_Draw.s b/asm/non_matchings/overlays/actors/ovl_Demo_Tre_Lgt/DemoTreLgt_Draw.s index 315603eee5..22419badda 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Tre_Lgt/DemoTreLgt_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Tre_Lgt/DemoTreLgt_Draw.s @@ -9,7 +9,7 @@ glabel DemoTreLgt_Draw /* 0060C 80993CCC 24C63E2C */ addiu $a2, $a2, %lo(D_80993E2C) ## $a2 = 80993E2C /* 00610 80993CD0 27A4003C */ addiu $a0, $sp, 0x003C ## $a0 = FFFFFFE4 /* 00614 80993CD4 240701CD */ addiu $a3, $zero, 0x01CD ## $a3 = 000001CD -/* 00618 80993CD8 0C031AB1 */ jal func_800C6AC4 +/* 00618 80993CD8 0C031AB1 */ jal Graph_OpenDisps /* 0061C 80993CDC 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 00620 80993CE0 8FAF0058 */ lw $t7, 0x0058($sp) /* 00624 80993CE4 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 @@ -39,7 +39,7 @@ glabel DemoTreLgt_Draw /* 00684 80993D44 24C63E40 */ addiu $a2, $a2, %lo(D_80993E40) ## $a2 = 80993E40 /* 00688 80993D48 27A4003C */ addiu $a0, $sp, 0x003C ## $a0 = FFFFFFE4 /* 0068C 80993D4C 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 00690 80993D50 0C031AD5 */ jal func_800C6B54 +/* 00690 80993D50 0C031AD5 */ jal Graph_CloseDisps /* 00694 80993D54 240701DC */ addiu $a3, $zero, 0x01DC ## $a3 = 000001DC /* 00698 80993D58 8FBF002C */ lw $ra, 0x002C($sp) .L80993D5C: diff --git a/asm/non_matchings/overlays/actors/ovl_Demo_Tre_Lgt/func_80993B2C.s b/asm/non_matchings/overlays/actors/ovl_Demo_Tre_Lgt/func_80993B2C.s index f3487dabd6..0b7b403f29 100644 --- a/asm/non_matchings/overlays/actors/ovl_Demo_Tre_Lgt/func_80993B2C.s +++ b/asm/non_matchings/overlays/actors/ovl_Demo_Tre_Lgt/func_80993B2C.s @@ -11,7 +11,7 @@ glabel func_80993B2C /* 00490 80993B50 24C63E04 */ addiu $a2, $a2, %lo(D_80993E04) ## $a2 = 80993E04 /* 00494 80993B54 27A40054 */ addiu $a0, $sp, 0x0054 ## $a0 = FFFFFFE4 /* 00498 80993B58 240701A7 */ addiu $a3, $zero, 0x01A7 ## $a3 = 000001A7 -/* 0049C 80993B5C 0C031AB1 */ jal func_800C6AC4 +/* 0049C 80993B5C 0C031AB1 */ jal Graph_OpenDisps /* 004A0 80993B60 AFA50064 */ sw $a1, 0x0064($sp) /* 004A4 80993B64 8FA90064 */ lw $t1, 0x0064($sp) /* 004A8 80993B68 8FAA0070 */ lw $t2, 0x0070($sp) @@ -43,7 +43,7 @@ glabel func_80993B2C /* 00510 80993BD0 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 00514 80993BD4 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 /* 00518 80993BD8 AFA90064 */ sw $t1, 0x0064($sp) -/* 0051C 80993BDC 0C0253D0 */ jal Draw_TwoTexScroll +/* 0051C 80993BDC 0C0253D0 */ jal Gfx_TwoTexScroll /* 00520 80993BE0 AFA20050 */ sw $v0, 0x0050($sp) /* 00524 80993BE4 8FA80050 */ lw $t0, 0x0050($sp) /* 00528 80993BE8 8FA90064 */ lw $t1, 0x0064($sp) @@ -93,7 +93,7 @@ glabel func_80993B2C /* 005C8 80993C88 24C63E18 */ addiu $a2, $a2, %lo(D_80993E18) ## $a2 = 80993E18 /* 005CC 80993C8C 27A40054 */ addiu $a0, $sp, 0x0054 ## $a0 = FFFFFFE4 /* 005D0 80993C90 240701C0 */ addiu $a3, $zero, 0x01C0 ## $a3 = 000001C0 -/* 005D4 80993C94 0C031AD5 */ jal func_800C6B54 +/* 005D4 80993C94 0C031AD5 */ jal Graph_CloseDisps /* 005D8 80993C98 8DE50000 */ lw $a1, 0x0000($t7) ## FFFFB400 /* 005DC 80993C9C 8FBF003C */ lw $ra, 0x003C($sp) /* 005E0 80993CA0 8FB00038 */ lw $s0, 0x0038($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Door_Ana/DoorAna_Destroy.s b/asm/non_matchings/overlays/actors/ovl_Door_Ana/DoorAna_Destroy.s deleted file mode 100644 index 0d91f670cf..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Door_Ana/DoorAna_Destroy.s +++ /dev/null @@ -1,19 +0,0 @@ -glabel DoorAna_Destroy -/* 000C4 80993FB4 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 000C8 80993FB8 AFBF0014 */ sw $ra, 0x0014($sp) -/* 000CC 80993FBC 848E001C */ lh $t6, 0x001C($a0) ## 0000001C -/* 000D0 80993FC0 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 -/* 000D4 80993FC4 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 000D8 80993FC8 31CF0200 */ andi $t7, $t6, 0x0200 ## $t7 = 00000000 -/* 000DC 80993FCC 51E00004 */ beql $t7, $zero, .L80993FE0 -/* 000E0 80993FD0 8FBF0014 */ lw $ra, 0x0014($sp) -/* 000E4 80993FD4 0C0170EB */ jal ActorCollider_FreeCylinder - -/* 000E8 80993FD8 24C5014C */ addiu $a1, $a2, 0x014C ## $a1 = 0000014C -/* 000EC 80993FDC 8FBF0014 */ lw $ra, 0x0014($sp) -.L80993FE0: -/* 000F0 80993FE0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 000F4 80993FE4 03E00008 */ jr $ra -/* 000F8 80993FE8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Door_Ana/DoorAna_Draw.s b/asm/non_matchings/overlays/actors/ovl_Door_Ana/DoorAna_Draw.s deleted file mode 100644 index 50ebb191cf..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Door_Ana/DoorAna_Draw.s +++ /dev/null @@ -1,52 +0,0 @@ -glabel DoorAna_Draw -/* 004E8 809943D8 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 -/* 004EC 809943DC AFBF001C */ sw $ra, 0x001C($sp) -/* 004F0 809943E0 AFB00018 */ sw $s0, 0x0018($sp) -/* 004F4 809943E4 AFA40040 */ sw $a0, 0x0040($sp) -/* 004F8 809943E8 AFA50044 */ sw $a1, 0x0044($sp) -/* 004FC 809943EC 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 -/* 00500 809943F0 3C068099 */ lui $a2, %hi(D_80994510) ## $a2 = 80990000 -/* 00504 809943F4 24C64510 */ addiu $a2, $a2, %lo(D_80994510) ## $a2 = 80994510 -/* 00508 809943F8 27A4002C */ addiu $a0, $sp, 0x002C ## $a0 = FFFFFFEC -/* 0050C 809943FC 240701B8 */ addiu $a3, $zero, 0x01B8 ## $a3 = 000001B8 -/* 00510 80994400 0C031AB1 */ jal func_800C6AC4 -/* 00514 80994404 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 -/* 00518 80994408 8FAF0044 */ lw $t7, 0x0044($sp) -/* 0051C 8099440C 0C024F61 */ jal func_80093D84 -/* 00520 80994410 8DE40000 */ lw $a0, 0x0000($t7) ## 00000000 -/* 00524 80994414 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 00528 80994418 3C19DA38 */ lui $t9, 0xDA38 ## $t9 = DA380000 -/* 0052C 8099441C 37390003 */ ori $t9, $t9, 0x0003 ## $t9 = DA380003 -/* 00530 80994420 24580008 */ addiu $t8, $v0, 0x0008 ## $t8 = 00000008 -/* 00534 80994424 AE1802D0 */ sw $t8, 0x02D0($s0) ## 000002D0 -/* 00538 80994428 AC590000 */ sw $t9, 0x0000($v0) ## 00000000 -/* 0053C 8099442C 8FA80044 */ lw $t0, 0x0044($sp) -/* 00540 80994430 3C058099 */ lui $a1, %hi(D_80994520) ## $a1 = 80990000 -/* 00544 80994434 24A54520 */ addiu $a1, $a1, %lo(D_80994520) ## $a1 = 80994520 -/* 00548 80994438 8D040000 */ lw $a0, 0x0000($t0) ## 00000000 -/* 0054C 8099443C 240601BE */ addiu $a2, $zero, 0x01BE ## $a2 = 000001BE -/* 00550 80994440 0C0346A2 */ jal Matrix_NewMtx -/* 00554 80994444 AFA20028 */ sw $v0, 0x0028($sp) -/* 00558 80994448 8FA30028 */ lw $v1, 0x0028($sp) -/* 0055C 8099444C 3C0B0500 */ lui $t3, 0x0500 ## $t3 = 05000000 -/* 00560 80994450 256B1390 */ addiu $t3, $t3, 0x1390 ## $t3 = 05001390 -/* 00564 80994454 AC620004 */ sw $v0, 0x0004($v1) ## 00000004 -/* 00568 80994458 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 0056C 8099445C 3C0ADE00 */ lui $t2, 0xDE00 ## $t2 = DE000000 -/* 00570 80994460 3C068099 */ lui $a2, %hi(D_80994530) ## $a2 = 80990000 -/* 00574 80994464 24490008 */ addiu $t1, $v0, 0x0008 ## $t1 = 00000008 -/* 00578 80994468 AE0902D0 */ sw $t1, 0x02D0($s0) ## 000002D0 -/* 0057C 8099446C AC4B0004 */ sw $t3, 0x0004($v0) ## 00000004 -/* 00580 80994470 AC4A0000 */ sw $t2, 0x0000($v0) ## 00000000 -/* 00584 80994474 8FAC0044 */ lw $t4, 0x0044($sp) -/* 00588 80994478 24C64530 */ addiu $a2, $a2, %lo(D_80994530) ## $a2 = 80994530 -/* 0058C 8099447C 27A4002C */ addiu $a0, $sp, 0x002C ## $a0 = FFFFFFEC -/* 00590 80994480 240701C1 */ addiu $a3, $zero, 0x01C1 ## $a3 = 000001C1 -/* 00594 80994484 0C031AD5 */ jal func_800C6B54 -/* 00598 80994488 8D850000 */ lw $a1, 0x0000($t4) ## 00000000 -/* 0059C 8099448C 8FBF001C */ lw $ra, 0x001C($sp) -/* 005A0 80994490 8FB00018 */ lw $s0, 0x0018($sp) -/* 005A4 80994494 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 -/* 005A8 80994498 03E00008 */ jr $ra -/* 005AC 8099449C 00000000 */ nop - diff --git a/asm/non_matchings/overlays/actors/ovl_Door_Ana/DoorAna_Init.s b/asm/non_matchings/overlays/actors/ovl_Door_Ana/DoorAna_Init.s deleted file mode 100644 index e84ebf365f..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Door_Ana/DoorAna_Init.s +++ /dev/null @@ -1,57 +0,0 @@ -glabel DoorAna_Init -/* 00008 80993EF8 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 0000C 80993EFC AFBF001C */ sw $ra, 0x001C($sp) -/* 00010 80993F00 AFB00018 */ sw $s0, 0x0018($sp) -/* 00014 80993F04 AFA5002C */ sw $a1, 0x002C($sp) -/* 00018 80993F08 8482001C */ lh $v0, 0x001C($a0) ## 0000001C -/* 0001C 80993F0C A48000B8 */ sh $zero, 0x00B8($a0) ## 000000B8 -/* 00020 80993F10 848E00B8 */ lh $t6, 0x00B8($a0) ## 000000B8 -/* 00024 80993F14 304F0300 */ andi $t7, $v0, 0x0300 ## $t7 = 00000000 -/* 00028 80993F18 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 0002C 80993F1C 11E0001B */ beq $t7, $zero, .L80993F8C -/* 00030 80993F20 A48E00B6 */ sh $t6, 0x00B6($a0) ## 000000B6 -/* 00034 80993F24 30580200 */ andi $t8, $v0, 0x0200 ## $t8 = 00000000 -/* 00038 80993F28 1300000C */ beq $t8, $zero, .L80993F5C -/* 0003C 80993F2C 8FA4002C */ lw $a0, 0x002C($sp) -/* 00040 80993F30 2605014C */ addiu $a1, $s0, 0x014C ## $a1 = 0000014C -/* 00044 80993F34 0C0170D9 */ jal ActorCollider_AllocCylinder - -/* 00048 80993F38 AFA50020 */ sw $a1, 0x0020($sp) -/* 0004C 80993F3C 3C078099 */ lui $a3, %hi(D_809944C0) ## $a3 = 80990000 -/* 00050 80993F40 8FA50020 */ lw $a1, 0x0020($sp) -/* 00054 80993F44 24E744C0 */ addiu $a3, $a3, %lo(D_809944C0) ## $a3 = 809944C0 -/* 00058 80993F48 8FA4002C */ lw $a0, 0x002C($sp) -/* 0005C 80993F4C 0C01712B */ jal ActorCollider_InitCylinder - -/* 00060 80993F50 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 -/* 00064 80993F54 10000005 */ beq $zero, $zero, .L80993F6C -/* 00068 80993F58 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -.L80993F5C: -/* 0006C 80993F5C 8E190004 */ lw $t9, 0x0004($s0) ## 00000004 -/* 00070 80993F60 37280010 */ ori $t0, $t9, 0x0010 ## $t0 = 00000010 -/* 00074 80993F64 AE080004 */ sw $t0, 0x0004($s0) ## 00000004 -/* 00078 80993F68 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -.L80993F6C: -/* 0007C 80993F6C 0C00B58B */ jal Actor_SetScale - -/* 00080 80993F70 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 -/* 00084 80993F74 3C058099 */ lui $a1, %hi(func_80993FEC) ## $a1 = 80990000 -/* 00088 80993F78 24A53FEC */ addiu $a1, $a1, %lo(func_80993FEC) ## $a1 = 80993FEC -/* 0008C 80993F7C 0C264FBC */ jal func_80993EF0 -/* 00090 80993F80 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00094 80993F84 10000006 */ beq $zero, $zero, .L80993FA0 -/* 00098 80993F88 A200001F */ sb $zero, 0x001F($s0) ## 0000001F -.L80993F8C: -/* 0009C 80993F8C 3C058099 */ lui $a1, %hi(func_80994124) ## $a1 = 80990000 -/* 000A0 80993F90 24A54124 */ addiu $a1, $a1, %lo(func_80994124) ## $a1 = 80994124 -/* 000A4 80993F94 0C264FBC */ jal func_80993EF0 -/* 000A8 80993F98 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 000AC 80993F9C A200001F */ sb $zero, 0x001F($s0) ## 0000001F -.L80993FA0: -/* 000B0 80993FA0 8FBF001C */ lw $ra, 0x001C($sp) -/* 000B4 80993FA4 8FB00018 */ lw $s0, 0x0018($sp) -/* 000B8 80993FA8 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 000BC 80993FAC 03E00008 */ jr $ra -/* 000C0 80993FB0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Door_Ana/DoorAna_Update.s b/asm/non_matchings/overlays/actors/ovl_Door_Ana/DoorAna_Update.s deleted file mode 100644 index 8f3efc4499..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Door_Ana/DoorAna_Update.s +++ /dev/null @@ -1,24 +0,0 @@ -glabel DoorAna_Update -/* 00494 80994384 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00498 80994388 AFBF0014 */ sw $ra, 0x0014($sp) -/* 0049C 8099438C AFA40018 */ sw $a0, 0x0018($sp) -/* 004A0 80994390 AFA5001C */ sw $a1, 0x001C($sp) -/* 004A4 80994394 8C990198 */ lw $t9, 0x0198($a0) ## 00000198 -/* 004A8 80994398 0320F809 */ jalr $ra, $t9 -/* 004AC 8099439C 00000000 */ nop -/* 004B0 809943A0 8FA5001C */ lw $a1, 0x001C($sp) -/* 004B4 809943A4 84AE07A0 */ lh $t6, 0x07A0($a1) ## 000007A0 -/* 004B8 809943A8 000E7880 */ sll $t7, $t6, 2 -/* 004BC 809943AC 00AFC021 */ addu $t8, $a1, $t7 -/* 004C0 809943B0 0C016A7D */ jal func_8005A9F4 -/* 004C4 809943B4 8F040790 */ lw $a0, 0x0790($t8) ## 00000790 -/* 004C8 809943B8 8FA90018 */ lw $t1, 0x0018($sp) -/* 004CC 809943BC 34018000 */ ori $at, $zero, 0x8000 ## $at = 00008000 -/* 004D0 809943C0 00414021 */ addu $t0, $v0, $at -/* 004D4 809943C4 A52800B6 */ sh $t0, 0x00B6($t1) ## 000000B6 -/* 004D8 809943C8 8FBF0014 */ lw $ra, 0x0014($sp) -/* 004DC 809943CC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 004E0 809943D0 03E00008 */ jr $ra -/* 004E4 809943D4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Door_Ana/func_80993EF0.s b/asm/non_matchings/overlays/actors/ovl_Door_Ana/func_80993EF0.s deleted file mode 100644 index bf19e85496..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Door_Ana/func_80993EF0.s +++ /dev/null @@ -1,5 +0,0 @@ -glabel func_80993EF0 -/* 00000 80993EF0 03E00008 */ jr $ra -/* 00004 80993EF4 AC850198 */ sw $a1, 0x0198($a0) ## 00000198 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Door_Ana/func_80993FEC.s b/asm/non_matchings/overlays/actors/ovl_Door_Ana/func_80993FEC.s deleted file mode 100644 index e3b9bd45bd..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Door_Ana/func_80993FEC.s +++ /dev/null @@ -1,90 +0,0 @@ -glabel func_80993FEC -/* 000FC 80993FEC 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 00100 80993FF0 AFBF0024 */ sw $ra, 0x0024($sp) -/* 00104 80993FF4 AFB00020 */ sw $s0, 0x0020($sp) -/* 00108 80993FF8 AFA50034 */ sw $a1, 0x0034($sp) -/* 0010C 80993FFC AFA0002C */ sw $zero, 0x002C($sp) -/* 00110 80994000 848E001C */ lh $t6, 0x001C($a0) ## 0000001C -/* 00114 80994004 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00118 80994008 3C018099 */ lui $at, %hi(D_80994540) ## $at = 80990000 -/* 0011C 8099400C 31CF0200 */ andi $t7, $t6, 0x0200 ## $t7 = 00000000 -/* 00120 80994010 55E00013 */ bnel $t7, $zero, .L80994060 -/* 00124 80994014 9209015D */ lbu $t1, 0x015D($s0) ## 0000015D -/* 00128 80994018 C484008C */ lwc1 $f4, 0x008C($a0) ## 0000008C -/* 0012C 8099401C C4264540 */ lwc1 $f6, %lo(D_80994540)($at) -/* 00130 80994020 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 00134 80994024 4606203C */ c.lt.s $f4, $f6 -/* 00138 80994028 00000000 */ nop -/* 0013C 8099402C 45020021 */ bc1fl .L809940B4 -/* 00140 80994030 8FAD002C */ lw $t5, 0x002C($sp) -/* 00144 80994034 0C01B129 */ jal func_8006C4A4 -/* 00148 80994038 24050005 */ addiu $a1, $zero, 0x0005 ## $a1 = 00000005 -/* 0014C 8099403C 1040001C */ beq $v0, $zero, .L809940B0 -/* 00150 80994040 24180001 */ addiu $t8, $zero, 0x0001 ## $t8 = 00000001 -/* 00154 80994044 AFB8002C */ sw $t8, 0x002C($sp) -/* 00158 80994048 8E190004 */ lw $t9, 0x0004($s0) ## 00000004 -/* 0015C 8099404C 2401FFEF */ addiu $at, $zero, 0xFFEF ## $at = FFFFFFEF -/* 00160 80994050 03214024 */ and $t0, $t9, $at -/* 00164 80994054 10000016 */ beq $zero, $zero, .L809940B0 -/* 00168 80994058 AE080004 */ sw $t0, 0x0004($s0) ## 00000004 -/* 0016C 8099405C 9209015D */ lbu $t1, 0x015D($s0) ## 0000015D -.L80994060: -/* 00170 80994060 2606014C */ addiu $a2, $s0, 0x014C ## $a2 = 0000014C -/* 00174 80994064 00C02825 */ or $a1, $a2, $zero ## $a1 = 0000014C -/* 00178 80994068 312A0002 */ andi $t2, $t1, 0x0002 ## $t2 = 00000000 -/* 0017C 8099406C 11400008 */ beq $t2, $zero, .L80994090 -/* 00180 80994070 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00184 80994074 240B0001 */ addiu $t3, $zero, 0x0001 ## $t3 = 00000001 -/* 00188 80994078 AFAB002C */ sw $t3, 0x002C($sp) -/* 0018C 8099407C 8FA40034 */ lw $a0, 0x0034($sp) -/* 00190 80994080 0C0170EB */ jal ActorCollider_FreeCylinder - -/* 00194 80994084 2605014C */ addiu $a1, $s0, 0x014C ## $a1 = 0000014C -/* 00198 80994088 1000000A */ beq $zero, $zero, .L809940B4 -/* 0019C 8099408C 8FAD002C */ lw $t5, 0x002C($sp) -.L80994090: -/* 001A0 80994090 0C0189B7 */ jal ActorCollider_Cylinder_Update - -/* 001A4 80994094 AFA60028 */ sw $a2, 0x0028($sp) -/* 001A8 80994098 8FA40034 */ lw $a0, 0x0034($sp) -/* 001AC 8099409C 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 001B0 809940A0 34211E60 */ ori $at, $at, 0x1E60 ## $at = 00011E60 -/* 001B4 809940A4 8FA60028 */ lw $a2, 0x0028($sp) -/* 001B8 809940A8 0C01767D */ jal Actor_CollisionCheck_SetAC - ## CollisionCheck_setAC -/* 001BC 809940AC 00812821 */ addu $a1, $a0, $at -.L809940B0: -/* 001C0 809940B0 8FAD002C */ lw $t5, 0x002C($sp) -.L809940B4: -/* 001C4 809940B4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 001C8 809940B8 51A00013 */ beql $t5, $zero, .L80994108 -/* 001CC 809940BC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 001D0 809940C0 860E001C */ lh $t6, 0x001C($s0) ## 0000001C -/* 001D4 809940C4 3C058099 */ lui $a1, %hi(func_80994124) ## $a1 = 80990000 -/* 001D8 809940C8 24A54124 */ addiu $a1, $a1, %lo(func_80994124) ## $a1 = 80994124 -/* 001DC 809940CC 31CFFCFF */ andi $t7, $t6, 0xFCFF ## $t7 = 00000000 -/* 001E0 809940D0 0C264FBC */ jal func_80993EF0 -/* 001E4 809940D4 A60F001C */ sh $t7, 0x001C($s0) ## 0000001C -/* 001E8 809940D8 3C078013 */ lui $a3, 0x8013 ## $a3 = 80130000 -/* 001EC 809940DC 3C188013 */ lui $t8, 0x8013 ## $t8 = 80130000 -/* 001F0 809940E0 24E733E0 */ addiu $a3, $a3, 0x33E0 ## $a3 = 801333E0 -/* 001F4 809940E4 271833E8 */ addiu $t8, $t8, 0x33E8 ## $t8 = 801333E8 -/* 001F8 809940E8 3C058013 */ lui $a1, 0x8013 ## $a1 = 80130000 -/* 001FC 809940EC 24A533D4 */ addiu $a1, $a1, 0x33D4 ## $a1 = 801333D4 -/* 00200 809940F0 AFB80014 */ sw $t8, 0x0014($sp) -/* 00204 809940F4 AFA70010 */ sw $a3, 0x0010($sp) -/* 00208 809940F8 24044802 */ addiu $a0, $zero, 0x4802 ## $a0 = 00004802 -/* 0020C 809940FC 0C03DCE3 */ jal Audio_PlaySoundGeneral - -/* 00210 80994100 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 -/* 00214 80994104 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -.L80994108: -/* 00218 80994108 0C00BD7C */ jal func_8002F5F0 -/* 0021C 8099410C 8FA50034 */ lw $a1, 0x0034($sp) -/* 00220 80994110 8FBF0024 */ lw $ra, 0x0024($sp) -/* 00224 80994114 8FB00020 */ lw $s0, 0x0020($sp) -/* 00228 80994118 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 0022C 8099411C 03E00008 */ jr $ra -/* 00230 80994120 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Door_Ana/func_80994124.s b/asm/non_matchings/overlays/actors/ovl_Door_Ana/func_80994124.s deleted file mode 100644 index 79f7836cb6..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Door_Ana/func_80994124.s +++ /dev/null @@ -1,119 +0,0 @@ -glabel func_80994124 -/* 00234 80994124 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 00238 80994128 AFBF001C */ sw $ra, 0x001C($sp) -/* 0023C 8099412C AFB00018 */ sw $s0, 0x0018($sp) -/* 00240 80994130 8CA31C44 */ lw $v1, 0x1C44($a1) ## 00001C44 -/* 00244 80994134 00A03825 */ or $a3, $a1, $zero ## $a3 = 00000000 -/* 00248 80994138 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 0024C 8099413C 3C053C23 */ lui $a1, 0x3C23 ## $a1 = 3C230000 -/* 00250 80994140 3C063A83 */ lui $a2, 0x3A83 ## $a2 = 3A830000 -/* 00254 80994144 34C6126F */ ori $a2, $a2, 0x126F ## $a2 = 3A83126F -/* 00258 80994148 34A5D70A */ ori $a1, $a1, 0xD70A ## $a1 = 3C23D70A -/* 0025C 8099414C 24840050 */ addiu $a0, $a0, 0x0050 ## $a0 = 00000050 -/* 00260 80994150 AFA7002C */ sw $a3, 0x002C($sp) -/* 00264 80994154 0C01DE80 */ jal Math_ApproxF - -/* 00268 80994158 AFA30024 */ sw $v1, 0x0024($sp) -/* 0026C 8099415C 8FA30024 */ lw $v1, 0x0024($sp) -/* 00270 80994160 10400055 */ beq $v0, $zero, .L809942B8 -/* 00274 80994164 8FA7002C */ lw $a3, 0x002C($sp) -/* 00278 80994168 820E001F */ lb $t6, 0x001F($s0) ## 0000001F -/* 0027C 8099416C 3C0F0001 */ lui $t7, 0x0001 ## $t7 = 00010000 -/* 00280 80994170 01E77821 */ addu $t7, $t7, $a3 -/* 00284 80994174 11C0002F */ beq $t6, $zero, .L80994234 -/* 00288 80994178 00E02025 */ or $a0, $a3, $zero ## $a0 = 00000000 -/* 0028C 8099417C 81EF1E15 */ lb $t7, 0x1E15($t7) ## 00011E15 -/* 00290 80994180 15E0002C */ bne $t7, $zero, .L80994234 -/* 00294 80994184 00000000 */ nop -/* 00298 80994188 8C78067C */ lw $t8, 0x067C($v1) ## 0000067C -/* 0029C 8099418C 0018C800 */ sll $t9, $t8, 0 -/* 002A0 80994190 07210028 */ bgez $t9, .L80994234 -/* 002A4 80994194 00000000 */ nop -/* 002A8 80994198 8068084F */ lb $t0, 0x084F($v1) ## 0000084F -/* 002AC 8099419C 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 -/* 002B0 809941A0 240604FF */ addiu $a2, $zero, 0x04FF ## $a2 = 000004FF -/* 002B4 809941A4 15000023 */ bne $t0, $zero, .L80994234 -/* 002B8 809941A8 00000000 */ nop -/* 002BC 809941AC 8602001C */ lh $v0, 0x001C($s0) ## 0000001C -/* 002C0 809941B0 AFA7002C */ sw $a3, 0x002C($sp) -/* 002C4 809941B4 00E02025 */ or $a0, $a3, $zero ## $a0 = 00000000 -/* 002C8 809941B8 00021303 */ sra $v0, $v0, 12 -/* 002CC 809941BC 30420007 */ andi $v0, $v0, 0x0007 ## $v0 = 00000000 -/* 002D0 809941C0 2442FFFF */ addiu $v0, $v0, 0xFFFF ## $v0 = FFFFFFFF -/* 002D4 809941C4 0C0302BD */ jal func_800C0AF4 -/* 002D8 809941C8 AFA20020 */ sw $v0, 0x0020($sp) -/* 002DC 809941CC C6040028 */ lwc1 $f4, 0x0028($s0) ## 00000028 -/* 002E0 809941D0 3C038016 */ lui $v1, 0x8016 ## $v1 = 80160000 -/* 002E4 809941D4 2463E660 */ addiu $v1, $v1, 0xE660 ## $v1 = 8015E660 -/* 002E8 809941D8 E4641388 */ swc1 $f4, 0x1388($v1) ## 8015F9E8 -/* 002EC 809941DC 86090016 */ lh $t1, 0x0016($s0) ## 00000016 -/* 002F0 809941E0 8FA20020 */ lw $v0, 0x0020($sp) -/* 002F4 809941E4 8FA7002C */ lw $a3, 0x002C($sp) -/* 002F8 809941E8 A4691390 */ sh $t1, 0x1390($v1) ## 8015F9F0 -/* 002FC 809941EC 860B001C */ lh $t3, 0x001C($s0) ## 0000001C -/* 00300 809941F0 3C0D8099 */ lui $t5, %hi(D_809944EC) ## $t5 = 80990000 -/* 00304 809941F4 04410003 */ bgez $v0, .L80994204 -/* 00308 809941F8 A06B1397 */ sb $t3, 0x1397($v1) ## 8015F9F7 -/* 0030C 809941FC 86020018 */ lh $v0, 0x0018($s0) ## 00000018 -/* 00310 80994200 24420001 */ addiu $v0, $v0, 0x0001 ## $v0 = 00000001 -.L80994204: -/* 00314 80994204 00026040 */ sll $t4, $v0, 1 -/* 00318 80994208 01AC6821 */ addu $t5, $t5, $t4 -/* 0031C 8099420C 85AD44EC */ lh $t5, %lo(D_809944EC)($t5) -/* 00320 80994210 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 00324 80994214 00270821 */ addu $at, $at, $a3 -/* 00328 80994218 3C058099 */ lui $a1, %hi(func_809942D8) ## $a1 = 80990000 -/* 0032C 8099421C 24A542D8 */ addiu $a1, $a1, %lo(func_809942D8) ## $a1 = 809942D8 -/* 00330 80994220 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00334 80994224 0C264FBC */ jal func_80993EF0 -/* 00338 80994228 A42D1E1A */ sh $t5, 0x1E1A($at) ## 00011E1A -/* 0033C 8099422C 10000023 */ beq $zero, $zero, .L809942BC -/* 00340 80994230 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -.L80994234: -/* 00344 80994234 0C023A62 */ jal func_8008E988 -/* 00348 80994238 AFA30024 */ sw $v1, 0x0024($sp) -/* 0034C 8099423C 1440001D */ bne $v0, $zero, .L809942B4 -/* 00350 80994240 8FA30024 */ lw $v1, 0x0024($sp) -/* 00354 80994244 8C62067C */ lw $v0, 0x067C($v1) ## 0000067C -/* 00358 80994248 3C010880 */ lui $at, 0x0880 ## $at = 08800000 -/* 0035C 8099424C 00417024 */ and $t6, $v0, $at -/* 00360 80994250 15C00018 */ bne $t6, $zero, .L809942B4 -/* 00364 80994254 3C014170 */ lui $at, 0x4170 ## $at = 41700000 -/* 00368 80994258 44811000 */ mtc1 $at, $f2 ## $f2 = 15.00 -/* 0036C 8099425C C6060090 */ lwc1 $f6, 0x0090($s0) ## 00000090 -/* 00370 80994260 3C01C248 */ lui $at, 0xC248 ## $at = C2480000 -/* 00374 80994264 4602303E */ c.le.s $f6, $f2 -/* 00378 80994268 00000000 */ nop -/* 0037C 8099426C 45020012 */ bc1fl .L809942B8 -/* 00380 80994270 A200001F */ sb $zero, 0x001F($s0) ## 0000001F -/* 00384 80994274 C6000094 */ lwc1 $f0, 0x0094($s0) ## 00000094 -/* 00388 80994278 44814000 */ mtc1 $at, $f8 ## $f8 = -50.00 -/* 0038C 8099427C 00000000 */ nop -/* 00390 80994280 4600403E */ c.le.s $f8, $f0 -/* 00394 80994284 00000000 */ nop -/* 00398 80994288 4502000B */ bc1fl .L809942B8 -/* 0039C 8099428C A200001F */ sb $zero, 0x001F($s0) ## 0000001F -/* 003A0 80994290 4602003E */ c.le.s $f0, $f2 -/* 003A4 80994294 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 003A8 80994298 00417825 */ or $t7, $v0, $at ## $t7 = 80000000 -/* 003AC 8099429C 24180001 */ addiu $t8, $zero, 0x0001 ## $t8 = 00000001 -/* 003B0 809942A0 45020005 */ bc1fl .L809942B8 -/* 003B4 809942A4 A200001F */ sb $zero, 0x001F($s0) ## 0000001F -/* 003B8 809942A8 AC6F067C */ sw $t7, 0x067C($v1) ## 0000067C -/* 003BC 809942AC 10000002 */ beq $zero, $zero, .L809942B8 -/* 003C0 809942B0 A218001F */ sb $t8, 0x001F($s0) ## 0000001F -.L809942B4: -/* 003C4 809942B4 A200001F */ sb $zero, 0x001F($s0) ## 0000001F -.L809942B8: -/* 003C8 809942B8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -.L809942BC: -/* 003CC 809942BC 0C00B58B */ jal Actor_SetScale - -/* 003D0 809942C0 8E050050 */ lw $a1, 0x0050($s0) ## 00000050 -/* 003D4 809942C4 8FBF001C */ lw $ra, 0x001C($sp) -/* 003D8 809942C8 8FB00018 */ lw $s0, 0x0018($sp) -/* 003DC 809942CC 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 003E0 809942D0 03E00008 */ jr $ra -/* 003E4 809942D4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Door_Ana/func_809942D8.s b/asm/non_matchings/overlays/actors/ovl_Door_Ana/func_809942D8.s deleted file mode 100644 index e10cdfadb5..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Door_Ana/func_809942D8.s +++ /dev/null @@ -1,49 +0,0 @@ -glabel func_809942D8 -/* 003E8 809942D8 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 003EC 809942DC AFBF0014 */ sw $ra, 0x0014($sp) -/* 003F0 809942E0 C4860094 */ lwc1 $f6, 0x0094($a0) ## 00000094 -/* 003F4 809942E4 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 -/* 003F8 809942E8 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 -/* 003FC 809942EC 3C014170 */ lui $at, 0x4170 ## $at = 41700000 -/* 00400 809942F0 4604303E */ c.le.s $f6, $f4 -/* 00404 809942F4 00000000 */ nop -/* 00408 809942F8 4502001F */ bc1fl .L80994378 -/* 0040C 809942FC 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00410 80994300 44814000 */ mtc1 $at, $f8 ## $f8 = 15.00 -/* 00414 80994304 C48A0090 */ lwc1 $f10, 0x0090($a0) ## 00000090 -/* 00418 80994308 460A403C */ c.lt.s $f8, $f10 -/* 0041C 8099430C 00000000 */ nop -/* 00420 80994310 45020019 */ bc1fl .L80994378 -/* 00424 80994314 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00428 80994318 8CAE1C44 */ lw $t6, 0x1C44($a1) ## 00001C44 -/* 0042C 8099431C AFAE001C */ sw $t6, 0x001C($sp) -/* 00430 80994320 8484008A */ lh $a0, 0x008A($a0) ## 0000008A -/* 00434 80994324 0C01DE1C */ jal Math_Sins - ## sins? -/* 00438 80994328 AFA60020 */ sw $a2, 0x0020($sp) -/* 0043C 8099432C 3C014170 */ lui $at, 0x4170 ## $at = 41700000 -/* 00440 80994330 44818000 */ mtc1 $at, $f16 ## $f16 = 15.00 -/* 00444 80994334 8FA60020 */ lw $a2, 0x0020($sp) -/* 00448 80994338 8FAF001C */ lw $t7, 0x001C($sp) -/* 0044C 8099433C 46100482 */ mul.s $f18, $f0, $f16 -/* 00450 80994340 C4C40024 */ lwc1 $f4, 0x0024($a2) ## 00000024 -/* 00454 80994344 46049180 */ add.s $f6, $f18, $f4 -/* 00458 80994348 E5E60024 */ swc1 $f6, 0x0024($t7) ## 00000024 -/* 0045C 8099434C 0C01DE0D */ jal Math_Coss - ## coss? -/* 00460 80994350 84C4008A */ lh $a0, 0x008A($a2) ## 0000008A -/* 00464 80994354 3C014170 */ lui $at, 0x4170 ## $at = 41700000 -/* 00468 80994358 44814000 */ mtc1 $at, $f8 ## $f8 = 15.00 -/* 0046C 8099435C 8FA60020 */ lw $a2, 0x0020($sp) -/* 00470 80994360 8FB8001C */ lw $t8, 0x001C($sp) -/* 00474 80994364 46080282 */ mul.s $f10, $f0, $f8 -/* 00478 80994368 C4D0002C */ lwc1 $f16, 0x002C($a2) ## 0000002C -/* 0047C 8099436C 46105480 */ add.s $f18, $f10, $f16 -/* 00480 80994370 E712002C */ swc1 $f18, 0x002C($t8) ## 0000002C -/* 00484 80994374 8FBF0014 */ lw $ra, 0x0014($sp) -.L80994378: -/* 00488 80994378 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 0048C 8099437C 03E00008 */ jr $ra -/* 00490 80994380 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Door_Gerudo/DoorGerudo_Draw.s b/asm/non_matchings/overlays/actors/ovl_Door_Gerudo/DoorGerudo_Draw.s index a1e309b4f6..f1a7695004 100644 --- a/asm/non_matchings/overlays/actors/ovl_Door_Gerudo/DoorGerudo_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Door_Gerudo/DoorGerudo_Draw.s @@ -10,7 +10,7 @@ glabel DoorGerudo_Draw /* 00488 80994A68 24C64B80 */ addiu $a2, $a2, %lo(D_80994B80) ## $a2 = 80994B80 /* 0048C 80994A6C 27A40030 */ addiu $a0, $sp, 0x0030 ## $a0 = FFFFFFE8 /* 00490 80994A70 24070169 */ addiu $a3, $zero, 0x0169 ## $a3 = 00000169 -/* 00494 80994A74 0C031AB1 */ jal func_800C6AC4 +/* 00494 80994A74 0C031AB1 */ jal Graph_OpenDisps /* 00498 80994A78 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 /* 0049C 80994A7C 0C024F46 */ jal func_80093D18 /* 004A0 80994A80 8E240000 */ lw $a0, 0x0000($s1) ## 00000000 @@ -57,7 +57,7 @@ glabel DoorGerudo_Draw /* 00540 80994B20 24C64BA8 */ addiu $a2, $a2, %lo(D_80994BA8) ## $a2 = 80994BA8 /* 00544 80994B24 27A40030 */ addiu $a0, $sp, 0x0030 ## $a0 = FFFFFFE8 /* 00548 80994B28 8E250000 */ lw $a1, 0x0000($s1) ## 00000000 -/* 0054C 80994B2C 0C031AD5 */ jal func_800C6B54 +/* 0054C 80994B2C 0C031AD5 */ jal Graph_CloseDisps /* 00550 80994B30 24070179 */ addiu $a3, $zero, 0x0179 ## $a3 = 00000179 /* 00554 80994B34 8FBF001C */ lw $ra, 0x001C($sp) /* 00558 80994B38 8FB00014 */ lw $s0, 0x0014($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Door_Killer/DoorKiller_Init.s b/asm/non_matchings/overlays/actors/ovl_Door_Killer/DoorKiller_Init.s index fa3ffca8a7..6c85e1e5aa 100644 --- a/asm/non_matchings/overlays/actors/ovl_Door_Killer/DoorKiller_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_Door_Killer/DoorKiller_Init.s @@ -1,19 +1,19 @@ glabel DoorKiller_Init /* 00000 80994C50 27BDFFA8 */ addiu $sp, $sp, 0xFFA8 ## $sp = FFFFFFA8 -/* 00004 80994C54 AFB10028 */ sw $s1, 0x0028($sp) +/* 00004 80994C54 AFB10028 */ sw $s1, 0x0028($sp) /* 00008 80994C58 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 0000C 80994C5C AFB50038 */ sw $s5, 0x0038($sp) -/* 00010 80994C60 AFB40034 */ sw $s4, 0x0034($sp) -/* 00014 80994C64 AFB2002C */ sw $s2, 0x002C($sp) -/* 00018 80994C68 AFB00024 */ sw $s0, 0x0024($sp) +/* 0000C 80994C5C AFB50038 */ sw $s5, 0x0038($sp) +/* 00010 80994C60 AFB40034 */ sw $s4, 0x0034($sp) +/* 00014 80994C64 AFB2002C */ sw $s2, 0x002C($sp) +/* 00018 80994C68 AFB00024 */ sw $s0, 0x0024($sp) /* 0001C 80994C6C 342117A4 */ ori $at, $at, 0x17A4 ## $at = 000117A4 /* 00020 80994C70 3C118099 */ lui $s1, %hi(D_80996010) ## $s1 = 80990000 /* 00024 80994C74 00809025 */ or $s2, $a0, $zero ## $s2 = 00000000 /* 00028 80994C78 00A0A825 */ or $s5, $a1, $zero ## $s5 = 00000000 -/* 0002C 80994C7C AFBF003C */ sw $ra, 0x003C($sp) -/* 00030 80994C80 AFB30030 */ sw $s3, 0x0030($sp) +/* 0002C 80994C7C AFBF003C */ sw $ra, 0x003C($sp) +/* 00030 80994C80 AFB30030 */ sw $s3, 0x0030($sp) /* 00034 80994C84 26316010 */ addiu $s1, $s1, %lo(D_80996010) ## $s1 = 80996010 -/* 00038 80994C88 00A1A021 */ addu $s4, $a1, $at +/* 00038 80994C88 00A1A021 */ addu $s4, $a1, $at /* 0003C 80994C8C 00008025 */ or $s0, $zero, $zero ## $s0 = 00000000 .L80994C90: /* 00040 80994C90 02802025 */ or $a0, $s4, $zero ## $a0 = 00000000 @@ -23,68 +23,68 @@ glabel DoorKiller_Init /* 0004C 80994C9C A250021D */ sb $s0, 0x021D($s2) ## 0000021D /* 00050 80994CA0 26100001 */ addiu $s0, $s0, 0x0001 ## $s0 = 00000001 /* 00054 80994CA4 26310008 */ addiu $s1, $s1, 0x0008 ## $s1 = 80996018 -/* 00058 80994CA8 0440FFF9 */ bltz $v0, .L80994C90 +/* 00058 80994CA8 0440FFF9 */ bltz $v0, .L80994C90 /* 0005C 80994CAC 00409825 */ or $s3, $v0, $zero ## $s3 = 00000000 /* 00060 80994CB0 3C048099 */ lui $a0, %hi(D_80996060) ## $a0 = 80990000 /* 00064 80994CB4 24846060 */ addiu $a0, $a0, %lo(D_80996060) ## $a0 = 80996060 /* 00068 80994CB8 0C00084C */ jal osSyncPrintf - + /* 0006C 80994CBC 00402825 */ or $a1, $v0, $zero ## $a1 = 00000000 /* 00070 80994CC0 3C048099 */ lui $a0, %hi(D_80996070) ## $a0 = 80990000 /* 00074 80994CC4 24846070 */ addiu $a0, $a0, %lo(D_80996070) ## $a0 = 80996070 /* 00078 80994CC8 0C00084C */ jal osSyncPrintf - + /* 0007C 80994CCC 9245021D */ lbu $a1, 0x021D($s2) ## 0000021D /* 00080 80994CD0 924E021D */ lbu $t6, 0x021D($s2) ## 0000021D /* 00084 80994CD4 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 /* 00088 80994CD8 3C188099 */ lui $t8, %hi(D_80996014) ## $t8 = 80990000 -/* 0008C 80994CDC 000E78C0 */ sll $t7, $t6, 3 +/* 0008C 80994CDC 000E78C0 */ sll $t7, $t6, 3 /* 00090 80994CE0 A253021C */ sb $s3, 0x021C($s2) ## 0000021C -/* 00094 80994CE4 030FC021 */ addu $t8, $t8, $t7 -/* 00098 80994CE8 8F186014 */ lw $t8, %lo(D_80996014)($t8) -/* 0009C 80994CEC 44050000 */ mfc1 $a1, $f0 -/* 000A0 80994CF0 44070000 */ mfc1 $a3, $f0 +/* 00094 80994CE4 030FC021 */ addu $t8, $t8, $t7 +/* 00098 80994CE8 8F186014 */ lw $t8, %lo(D_80996014)($t8) +/* 0009C 80994CEC 44050000 */ mfc1 $a1, $f0 +/* 000A0 80994CF0 44070000 */ mfc1 $a3, $f0 /* 000A4 80994CF4 264400B4 */ addiu $a0, $s2, 0x00B4 ## $a0 = 000000B4 /* 000A8 80994CF8 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 /* 000AC 80994CFC 0C00AC78 */ jal ActorShape_Init - + /* 000B0 80994D00 AE580214 */ sw $t8, 0x0214($s2) ## 00000214 /* 000B4 80994D04 3C053C23 */ lui $a1, 0x3C23 ## $a1 = 3C230000 /* 000B8 80994D08 34A5D70A */ ori $a1, $a1, 0xD70A ## $a1 = 3C23D70A /* 000BC 80994D0C 0C00B58B */ jal Actor_SetScale - + /* 000C0 80994D10 02402025 */ or $a0, $s2, $zero ## $a0 = 00000000 /* 000C4 80994D14 8648001C */ lh $t0, 0x001C($s2) ## 0000001C /* 000C8 80994D18 A640021A */ sh $zero, 0x021A($s2) ## 0000021A /* 000CC 80994D1C A6400218 */ sh $zero, 0x0218($s2) ## 00000218 /* 000D0 80994D20 310900FF */ andi $t1, $t0, 0x00FF ## $t1 = 00000000 -/* 000D4 80994D24 2D210005 */ sltiu $at, $t1, 0x0005 +/* 000D4 80994D24 2D210005 */ sltiu $at, $t1, 0x0005 /* 000D8 80994D28 A2400190 */ sb $zero, 0x0190($s2) ## 00000190 -/* 000DC 80994D2C 102000A0 */ beq $at, $zero, .L80994FB0 +/* 000DC 80994D2C 102000A0 */ beq $at, $zero, .L80994FB0 /* 000E0 80994D30 A2400191 */ sb $zero, 0x0191($s2) ## 00000191 -/* 000E4 80994D34 00094880 */ sll $t1, $t1, 2 +/* 000E4 80994D34 00094880 */ sll $t1, $t1, 2 /* 000E8 80994D38 3C018099 */ lui $at, %hi(jtbl_809960A8) ## $at = 80990000 -/* 000EC 80994D3C 00290821 */ addu $at, $at, $t1 -/* 000F0 80994D40 8C2960A8 */ lw $t1, %lo(jtbl_809960A8)($at) -/* 000F4 80994D44 01200008 */ jr $t1 +/* 000EC 80994D3C 00290821 */ addu $at, $at, $t1 +/* 000F0 80994D40 8C2960A8 */ lw $t1, %lo(jtbl_809960A8)($at) +/* 000F4 80994D44 01200008 */ jr $t1 /* 000F8 80994D48 00000000 */ nop glabel L80994D4C /* 000FC 80994D4C 3C060600 */ lui $a2, 0x0600 ## $a2 = 06000000 /* 00100 80994D50 26420192 */ addiu $v0, $s2, 0x0192 ## $v0 = 00000192 /* 00104 80994D54 240A0009 */ addiu $t2, $zero, 0x0009 ## $t2 = 00000009 -/* 00108 80994D58 AFAA0018 */ sw $t2, 0x0018($sp) -/* 0010C 80994D5C AFA20010 */ sw $v0, 0x0010($sp) -/* 00110 80994D60 AFA20014 */ sw $v0, 0x0014($sp) +/* 00108 80994D58 AFAA0018 */ sw $t2, 0x0018($sp) +/* 0010C 80994D5C AFA20010 */ sw $v0, 0x0010($sp) +/* 00110 80994D60 AFA20014 */ sw $v0, 0x0014($sp) /* 00114 80994D64 24C61BC8 */ addiu $a2, $a2, 0x1BC8 ## $a2 = 06001BC8 /* 00118 80994D68 02A02025 */ or $a0, $s5, $zero ## $a0 = 00000000 /* 0011C 80994D6C 2645014C */ addiu $a1, $s2, 0x014C ## $a1 = 0000014C -/* 00120 80994D70 0C0291BE */ jal func_800A46F8 +/* 00120 80994D70 0C0291BE */ jal SkelAnime_InitSV /* 00124 80994D74 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 /* 00128 80994D78 3C0B8099 */ lui $t3, %hi(func_80995D6C) ## $t3 = 80990000 /* 0012C 80994D7C 256B5D6C */ addiu $t3, $t3, %lo(func_80995D6C) ## $t3 = 80995D6C /* 00130 80994D80 AE4B0280 */ sw $t3, 0x0280($s2) ## 00000280 /* 00134 80994D84 02402025 */ or $a0, $s2, $zero ## $a0 = 00000000 -/* 00138 80994D88 0C26575B */ jal func_80995D6C +/* 00138 80994D88 0C26575B */ jal func_80995D6C /* 0013C 80994D8C 02A02825 */ or $a1, $s5, $zero ## $a1 = 00000000 /* 00140 80994D90 240C4000 */ addiu $t4, $zero, 0x4000 ## $t4 = 00004000 /* 00144 80994D94 A64C019C */ sh $t4, 0x019C($s2) ## 0000019C @@ -93,26 +93,26 @@ glabel L80994D4C /* 00150 80994DA0 02002825 */ or $a1, $s0, $zero ## $a1 = 000001C8 /* 00154 80994DA4 02A02025 */ or $a0, $s5, $zero ## $a0 = 00000000 /* 00158 80994DA8 0C0170D9 */ jal ActorCollider_AllocCylinder - + /* 0015C 80994DAC A64D0198 */ sh $t5, 0x0198($s2) ## 00000198 /* 00160 80994DB0 3C078099 */ lui $a3, %hi(D_80995FB0) ## $a3 = 80990000 /* 00164 80994DB4 24E75FB0 */ addiu $a3, $a3, %lo(D_80995FB0) ## $a3 = 80995FB0 /* 00168 80994DB8 02A02025 */ or $a0, $s5, $zero ## $a0 = 00000000 /* 0016C 80994DBC 02002825 */ or $a1, $s0, $zero ## $a1 = 000001C8 /* 00170 80994DC0 0C01712B */ jal ActorCollider_InitCylinder - + /* 00174 80994DC4 02403025 */ or $a2, $s2, $zero ## $a2 = 00000000 /* 00178 80994DC8 26500220 */ addiu $s0, $s2, 0x0220 ## $s0 = 00000220 /* 0017C 80994DCC 02002825 */ or $a1, $s0, $zero ## $a1 = 00000220 -/* 00180 80994DD0 0C016EFE */ jal func_8005BBF8 +/* 00180 80994DD0 0C016EFE */ jal func_8005BBF8 /* 00184 80994DD4 02A02025 */ or $a0, $s5, $zero ## $a0 = 00000000 /* 00188 80994DD8 3C078099 */ lui $a3, %hi(D_80996000) ## $a3 = 80990000 /* 0018C 80994DDC 264E0240 */ addiu $t6, $s2, 0x0240 ## $t6 = 00000240 -/* 00190 80994DE0 AFAE0010 */ sw $t6, 0x0010($sp) +/* 00190 80994DE0 AFAE0010 */ sw $t6, 0x0010($sp) /* 00194 80994DE4 24E76000 */ addiu $a3, $a3, %lo(D_80996000) ## $a3 = 80996000 /* 00198 80994DE8 02A02025 */ or $a0, $s5, $zero ## $a0 = 00000000 /* 0019C 80994DEC 02002825 */ or $a1, $s0, $zero ## $a1 = 00000220 -/* 001A0 80994DF0 0C017014 */ jal func_8005C050 +/* 001A0 80994DF0 0C017014 */ jal func_8005C050 /* 001A4 80994DF4 02403025 */ or $a2, $s2, $zero ## $a2 = 00000000 /* 001A8 80994DF8 8E58023C */ lw $t8, 0x023C($s2) ## 0000023C /* 001AC 80994DFC 240F0050 */ addiu $t7, $zero, 0x0050 ## $t7 = 00000050 @@ -120,133 +120,133 @@ glabel L80994D4C /* 001B4 80994E04 A70F0036 */ sh $t7, 0x0036($t8) ## 00000036 /* 001B8 80994E08 C6440024 */ lwc1 $f4, 0x0024($s2) ## 00000024 /* 001BC 80994E0C 8E49023C */ lw $t1, 0x023C($s2) ## 0000023C -/* 001C0 80994E10 4600218D */ trunc.w.s $f6, $f4 -/* 001C4 80994E14 44083000 */ mfc1 $t0, $f6 +/* 001C0 80994E10 4600218D */ trunc.w.s $f6, $f4 +/* 001C4 80994E14 44083000 */ mfc1 $t0, $f6 /* 001C8 80994E18 00000000 */ nop /* 001CC 80994E1C A5280030 */ sh $t0, 0x0030($t1) ## 00000030 /* 001D0 80994E20 C6480028 */ lwc1 $f8, 0x0028($s2) ## 00000028 /* 001D4 80994E24 8E4F023C */ lw $t7, 0x023C($s2) ## 0000023C -/* 001D8 80994E28 4600428D */ trunc.w.s $f10, $f8 -/* 001DC 80994E2C 440D5000 */ mfc1 $t5, $f10 +/* 001D8 80994E28 4600428D */ trunc.w.s $f10, $f8 +/* 001DC 80994E2C 440D5000 */ mfc1 $t5, $f10 /* 001E0 80994E30 00000000 */ nop /* 001E4 80994E34 25AE0032 */ addiu $t6, $t5, 0x0032 ## $t6 = 00000032 /* 001E8 80994E38 A5EE0032 */ sh $t6, 0x0032($t7) ## 00000082 /* 001EC 80994E3C C650002C */ lwc1 $f16, 0x002C($s2) ## 0000002C /* 001F0 80994E40 8E48023C */ lw $t0, 0x023C($s2) ## 0000023C -/* 001F4 80994E44 4600848D */ trunc.w.s $f18, $f16 -/* 001F8 80994E48 44199000 */ mfc1 $t9, $f18 +/* 001F4 80994E44 4600848D */ trunc.w.s $f18, $f16 +/* 001F8 80994E48 44199000 */ mfc1 $t9, $f18 /* 001FC 80994E4C 00000000 */ nop /* 00200 80994E50 A5190034 */ sh $t9, 0x0034($t0) ## 00000034 /* 00204 80994E54 8645001C */ lh $a1, 0x001C($s2) ## 0000001C -/* 00208 80994E58 00052A03 */ sra $a1, $a1, 8 +/* 00208 80994E58 00052A03 */ sra $a1, $a1, 8 /* 0020C 80994E5C 30A5003F */ andi $a1, $a1, 0x003F ## $a1 = 00000000 -/* 00210 80994E60 50A10054 */ beql $a1, $at, .L80994FB4 -/* 00214 80994E64 8FBF003C */ lw $ra, 0x003C($sp) +/* 00210 80994E60 50A10054 */ beql $a1, $at, .L80994FB4 +/* 00214 80994E64 8FBF003C */ lw $ra, 0x003C($sp) /* 00218 80994E68 0C00B2D0 */ jal Flags_GetSwitch - + /* 0021C 80994E6C 02A02025 */ or $a0, $s5, $zero ## $a0 = 00000000 -/* 00220 80994E70 50400050 */ beql $v0, $zero, .L80994FB4 -/* 00224 80994E74 8FBF003C */ lw $ra, 0x003C($sp) +/* 00220 80994E70 50400050 */ beql $v0, $zero, .L80994FB4 +/* 00224 80994E74 8FBF003C */ lw $ra, 0x003C($sp) /* 00228 80994E78 0C00B55C */ jal Actor_Kill - + /* 0022C 80994E7C 02402025 */ or $a0, $s2, $zero ## $a0 = 00000000 -/* 00230 80994E80 1000004C */ beq $zero, $zero, .L80994FB4 -/* 00234 80994E84 8FBF003C */ lw $ra, 0x003C($sp) +/* 00230 80994E80 1000004C */ beq $zero, $zero, .L80994FB4 +/* 00234 80994E84 8FBF003C */ lw $ra, 0x003C($sp) glabel L80994E88 /* 00238 80994E88 3C098099 */ lui $t1, %hi(func_80995D6C) ## $t1 = 80990000 /* 0023C 80994E8C 25295D6C */ addiu $t1, $t1, %lo(func_80995D6C) ## $t1 = 80995D6C /* 00240 80994E90 AE490280 */ sw $t1, 0x0280($s2) ## 00000280 /* 00244 80994E94 02402025 */ or $a0, $s2, $zero ## $a0 = 00000000 -/* 00248 80994E98 0C26575B */ jal func_80995D6C +/* 00248 80994E98 0C26575B */ jal func_80995D6C /* 0024C 80994E9C 02A02825 */ or $a1, $s5, $zero ## $a1 = 00000000 /* 00250 80994EA0 3C018099 */ lui $at, %hi(D_809960BC) ## $at = 80990000 -/* 00254 80994EA4 C42460BC */ lwc1 $f4, %lo(D_809960BC)($at) +/* 00254 80994EA4 C42460BC */ lwc1 $f4, %lo(D_809960BC)($at) /* 00258 80994EA8 3C01C0C0 */ lui $at, 0xC0C0 ## $at = C0C00000 /* 0025C 80994EAC 44813000 */ mtc1 $at, $f6 ## $f6 = -6.00 /* 00260 80994EB0 3C014100 */ lui $at, 0x4100 ## $at = 41000000 /* 00264 80994EB4 44816000 */ mtc1 $at, $f12 ## $f12 = 8.00 /* 00268 80994EB8 E644006C */ swc1 $f4, 0x006C($s2) ## 0000006C /* 0026C 80994EBC 0C00CFC8 */ jal Math_Rand_CenteredFloat - + /* 00270 80994EC0 E6460070 */ swc1 $f6, 0x0070($s2) ## 00000070 /* 00274 80994EC4 3C014100 */ lui $at, 0x4100 ## $at = 41000000 /* 00278 80994EC8 44816000 */ mtc1 $at, $f12 ## $f12 = 8.00 /* 0027C 80994ECC 0C00CFBE */ jal Math_Rand_ZeroFloat - -/* 00280 80994ED0 E7A00050 */ swc1 $f0, 0x0050($sp) + +/* 00280 80994ED0 E7A00050 */ swc1 $f0, 0x0050($sp) /* 00284 80994ED4 E6400064 */ swc1 $f0, 0x0064($s2) ## 00000064 /* 00288 80994ED8 0C01DE0D */ jal Math_Coss ## coss? /* 0028C 80994EDC 86440032 */ lh $a0, 0x0032($s2) ## 00000032 -/* 00290 80994EE0 E7A00040 */ swc1 $f0, 0x0040($sp) +/* 00290 80994EE0 E7A00040 */ swc1 $f0, 0x0040($sp) /* 00294 80994EE4 0C01DE1C */ jal Math_Sins ## sins? /* 00298 80994EE8 86440032 */ lh $a0, 0x0032($s2) ## 00000032 -/* 0029C 80994EEC C7A80040 */ lwc1 $f8, 0x0040($sp) -/* 002A0 80994EF0 C7AA0050 */ lwc1 $f10, 0x0050($sp) +/* 0029C 80994EEC C7A80040 */ lwc1 $f8, 0x0040($sp) +/* 002A0 80994EF0 C7AA0050 */ lwc1 $f10, 0x0050($sp) /* 002A4 80994EF4 C6520064 */ lwc1 $f18, 0x0064($s2) ## 00000064 /* 002A8 80994EF8 86440032 */ lh $a0, 0x0032($s2) ## 00000032 -/* 002AC 80994EFC 460A4402 */ mul.s $f16, $f8, $f10 +/* 002AC 80994EFC 460A4402 */ mul.s $f16, $f8, $f10 /* 002B0 80994F00 00000000 */ nop -/* 002B4 80994F04 46120102 */ mul.s $f4, $f0, $f18 -/* 002B8 80994F08 46102180 */ add.s $f6, $f4, $f16 +/* 002B4 80994F04 46120102 */ mul.s $f4, $f0, $f18 +/* 002B8 80994F08 46102180 */ add.s $f6, $f4, $f16 /* 002BC 80994F0C 0C01DE1C */ jal Math_Sins ## sins? /* 002C0 80994F10 E646005C */ swc1 $f6, 0x005C($s2) ## 0000005C -/* 002C4 80994F14 E7A00040 */ swc1 $f0, 0x0040($sp) +/* 002C4 80994F14 E7A00040 */ swc1 $f0, 0x0040($sp) /* 002C8 80994F18 0C01DE0D */ jal Math_Coss ## coss? /* 002CC 80994F1C 86440032 */ lh $a0, 0x0032($s2) ## 00000032 -/* 002D0 80994F20 C7A80040 */ lwc1 $f8, 0x0040($sp) -/* 002D4 80994F24 C7B20050 */ lwc1 $f18, 0x0050($sp) +/* 002D0 80994F20 C7A80040 */ lwc1 $f8, 0x0040($sp) +/* 002D4 80994F24 C7B20050 */ lwc1 $f18, 0x0050($sp) /* 002D8 80994F28 C6500064 */ lwc1 $f16, 0x0064($s2) ## 00000064 -/* 002DC 80994F2C 46004287 */ neg.s $f10, $f8 +/* 002DC 80994F2C 46004287 */ neg.s $f10, $f8 /* 002E0 80994F30 3C014080 */ lui $at, 0x4080 ## $at = 40800000 -/* 002E4 80994F34 46125102 */ mul.s $f4, $f10, $f18 +/* 002E4 80994F34 46125102 */ mul.s $f4, $f10, $f18 /* 002E8 80994F38 44816000 */ mtc1 $at, $f12 ## $f12 = 4.00 -/* 002EC 80994F3C 46100182 */ mul.s $f6, $f0, $f16 -/* 002F0 80994F40 46043200 */ add.s $f8, $f6, $f4 +/* 002EC 80994F3C 46100182 */ mul.s $f6, $f0, $f16 +/* 002F0 80994F40 46043200 */ add.s $f8, $f6, $f4 /* 002F4 80994F44 0C00CFBE */ jal Math_Rand_ZeroFloat - + /* 002F8 80994F48 E6480064 */ swc1 $f8, 0x0064($s2) ## 00000064 /* 002FC 80994F4C 3C014080 */ lui $at, 0x4080 ## $at = 40800000 /* 00300 80994F50 44815000 */ mtc1 $at, $f10 ## $f10 = 4.00 /* 00304 80994F54 3C014580 */ lui $at, 0x4580 ## $at = 45800000 /* 00308 80994F58 44816000 */ mtc1 $at, $f12 ## $f12 = 4096.00 -/* 0030C 80994F5C 460A0480 */ add.s $f18, $f0, $f10 +/* 0030C 80994F5C 460A0480 */ add.s $f18, $f0, $f10 /* 00310 80994F60 0C00CFC8 */ jal Math_Rand_CenteredFloat - + /* 00314 80994F64 E6520060 */ swc1 $f18, 0x0060($s2) ## 00000060 -/* 00318 80994F68 4600040D */ trunc.w.s $f16, $f0 +/* 00318 80994F68 4600040D */ trunc.w.s $f16, $f0 /* 0031C 80994F6C 3C014580 */ lui $at, 0x4580 ## $at = 45800000 /* 00320 80994F70 44816000 */ mtc1 $at, $f12 ## $f12 = 4096.00 -/* 00324 80994F74 440B8000 */ mfc1 $t3, $f16 +/* 00324 80994F74 440B8000 */ mfc1 $t3, $f16 /* 00328 80994F78 0C00CFC8 */ jal Math_Rand_CenteredFloat - + /* 0032C 80994F7C A64B0030 */ sh $t3, 0x0030($s2) ## 00000030 -/* 00330 80994F80 4600018D */ trunc.w.s $f6, $f0 +/* 00330 80994F80 4600018D */ trunc.w.s $f6, $f0 /* 00334 80994F84 3C014580 */ lui $at, 0x4580 ## $at = 45800000 /* 00338 80994F88 44816000 */ mtc1 $at, $f12 ## $f12 = 4096.00 -/* 0033C 80994F8C 440D3000 */ mfc1 $t5, $f6 +/* 0033C 80994F8C 440D3000 */ mfc1 $t5, $f6 /* 00340 80994F90 0C00CFC8 */ jal Math_Rand_CenteredFloat - + /* 00344 80994F94 A64D0032 */ sh $t5, 0x0032($s2) ## 00000032 -/* 00348 80994F98 4600010D */ trunc.w.s $f4, $f0 +/* 00348 80994F98 4600010D */ trunc.w.s $f4, $f0 /* 0034C 80994F9C 24180050 */ addiu $t8, $zero, 0x0050 ## $t8 = 00000050 /* 00350 80994FA0 A658021A */ sh $t8, 0x021A($s2) ## 0000021A -/* 00354 80994FA4 440F2000 */ mfc1 $t7, $f4 +/* 00354 80994FA4 440F2000 */ mfc1 $t7, $f4 /* 00358 80994FA8 00000000 */ nop /* 0035C 80994FAC A64F0034 */ sh $t7, 0x0034($s2) ## 00000034 .L80994FB0: -/* 00360 80994FB0 8FBF003C */ lw $ra, 0x003C($sp) +/* 00360 80994FB0 8FBF003C */ lw $ra, 0x003C($sp) .L80994FB4: -/* 00364 80994FB4 8FB00024 */ lw $s0, 0x0024($sp) -/* 00368 80994FB8 8FB10028 */ lw $s1, 0x0028($sp) -/* 0036C 80994FBC 8FB2002C */ lw $s2, 0x002C($sp) -/* 00370 80994FC0 8FB30030 */ lw $s3, 0x0030($sp) -/* 00374 80994FC4 8FB40034 */ lw $s4, 0x0034($sp) -/* 00378 80994FC8 8FB50038 */ lw $s5, 0x0038($sp) -/* 0037C 80994FCC 03E00008 */ jr $ra +/* 00364 80994FB4 8FB00024 */ lw $s0, 0x0024($sp) +/* 00368 80994FB8 8FB10028 */ lw $s1, 0x0028($sp) +/* 0036C 80994FBC 8FB2002C */ lw $s2, 0x002C($sp) +/* 00370 80994FC0 8FB30030 */ lw $s3, 0x0030($sp) +/* 00374 80994FC4 8FB40034 */ lw $s4, 0x0034($sp) +/* 00378 80994FC8 8FB50038 */ lw $s5, 0x0038($sp) +/* 0037C 80994FCC 03E00008 */ jr $ra /* 00380 80994FD0 27BD0058 */ addiu $sp, $sp, 0x0058 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Door_Killer/func_80995E40.s b/asm/non_matchings/overlays/actors/ovl_Door_Killer/func_80995E40.s index 114e303e08..3839c58bc9 100644 --- a/asm/non_matchings/overlays/actors/ovl_Door_Killer/func_80995E40.s +++ b/asm/non_matchings/overlays/actors/ovl_Door_Killer/func_80995E40.s @@ -10,7 +10,7 @@ glabel func_80995E40 /* 01210 80995E60 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 /* 01214 80995E64 27A40024 */ addiu $a0, $sp, 0x0024 ## $a0 = FFFFFFE4 /* 01218 80995E68 24070373 */ addiu $a3, $zero, 0x0373 ## $a3 = 00000373 -/* 0121C 80995E6C 0C031AB1 */ jal func_800C6AC4 +/* 0121C 80995E6C 0C031AB1 */ jal Graph_OpenDisps /* 01220 80995E70 AFA50034 */ sw $a1, 0x0034($sp) /* 01224 80995E74 8FA80034 */ lw $t0, 0x0034($sp) /* 01228 80995E78 3C09DB06 */ lui $t1, 0xDB06 ## $t1 = DB060000 @@ -26,7 +26,7 @@ glabel func_80995E40 /* 01250 80995EA0 24070375 */ addiu $a3, $zero, 0x0375 ## $a3 = 00000375 /* 01254 80995EA4 AC6A0004 */ sw $t2, 0x0004($v1) ## 00000004 /* 01258 80995EA8 8FAB0044 */ lw $t3, 0x0044($sp) -/* 0125C 80995EAC 0C031AD5 */ jal func_800C6B54 +/* 0125C 80995EAC 0C031AD5 */ jal Graph_CloseDisps /* 01260 80995EB0 8D650000 */ lw $a1, 0x0000($t3) ## 00000000 /* 01264 80995EB4 8FBF0014 */ lw $ra, 0x0014($sp) /* 01268 80995EB8 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Door_Killer/func_80995EC4.s b/asm/non_matchings/overlays/actors/ovl_Door_Killer/func_80995EC4.s index 36d888a9b2..91d359ef87 100644 --- a/asm/non_matchings/overlays/actors/ovl_Door_Killer/func_80995EC4.s +++ b/asm/non_matchings/overlays/actors/ovl_Door_Killer/func_80995EC4.s @@ -1,25 +1,25 @@ glabel func_80995EC4 /* 01274 80995EC4 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 01278 80995EC8 AFBF0024 */ sw $ra, 0x0024($sp) -/* 0127C 80995ECC AFA40028 */ sw $a0, 0x0028($sp) -/* 01280 80995ED0 AFA5002C */ sw $a1, 0x002C($sp) -/* 01284 80995ED4 0C0250F2 */ jal func_800943C8 +/* 01278 80995EC8 AFBF0024 */ sw $ra, 0x0024($sp) +/* 0127C 80995ECC AFA40028 */ sw $a0, 0x0028($sp) +/* 01280 80995ED0 AFA5002C */ sw $a1, 0x002C($sp) +/* 01284 80995ED4 0C0250F2 */ jal func_800943C8 /* 01288 80995ED8 8CA40000 */ lw $a0, 0x0000($a1) ## 00000000 -/* 0128C 80995EDC 8FA40028 */ lw $a0, 0x0028($sp) -/* 01290 80995EE0 0C265790 */ jal func_80995E40 -/* 01294 80995EE4 8FA5002C */ lw $a1, 0x002C($sp) -/* 01298 80995EE8 8FA20028 */ lw $v0, 0x0028($sp) -/* 0129C 80995EEC 8FA4002C */ lw $a0, 0x002C($sp) +/* 0128C 80995EDC 8FA40028 */ lw $a0, 0x0028($sp) +/* 01290 80995EE0 0C265790 */ jal func_80995E40 +/* 01294 80995EE4 8FA5002C */ lw $a1, 0x002C($sp) +/* 01298 80995EE8 8FA20028 */ lw $v0, 0x0028($sp) +/* 0129C 80995EEC 8FA4002C */ lw $a0, 0x002C($sp) /* 012A0 80995EF0 8C450150 */ lw $a1, 0x0150($v0) ## 00000150 /* 012A4 80995EF4 8C46016C */ lw $a2, 0x016C($v0) ## 0000016C /* 012A8 80995EF8 9047014E */ lbu $a3, 0x014E($v0) ## 0000014E -/* 012AC 80995EFC AFA00018 */ sw $zero, 0x0018($sp) -/* 012B0 80995F00 AFA00014 */ sw $zero, 0x0014($sp) -/* 012B4 80995F04 0C0286B2 */ jal func_800A1AC8 -/* 012B8 80995F08 AFA00010 */ sw $zero, 0x0010($sp) -/* 012BC 80995F0C 8FBF0024 */ lw $ra, 0x0024($sp) +/* 012AC 80995EFC AFA00018 */ sw $zero, 0x0018($sp) +/* 012B0 80995F00 AFA00014 */ sw $zero, 0x0014($sp) +/* 012B4 80995F04 0C0286B2 */ jal SkelAnime_DrawSV +/* 012B8 80995F08 AFA00010 */ sw $zero, 0x0010($sp) +/* 012BC 80995F0C 8FBF0024 */ lw $ra, 0x0024($sp) /* 012C0 80995F10 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 012C4 80995F14 03E00008 */ jr $ra +/* 012C4 80995F14 03E00008 */ jr $ra /* 012C8 80995F18 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Door_Killer/func_80995F1C.s b/asm/non_matchings/overlays/actors/ovl_Door_Killer/func_80995F1C.s index 18d4912877..4c33efc925 100644 --- a/asm/non_matchings/overlays/actors/ovl_Door_Killer/func_80995F1C.s +++ b/asm/non_matchings/overlays/actors/ovl_Door_Killer/func_80995F1C.s @@ -20,7 +20,7 @@ glabel func_80995F1C /* 01310 80995F60 8FA40024 */ lw $a0, 0x0024($sp) /* 01314 80995F64 00037880 */ sll $t7, $v1, 2 /* 01318 80995F68 00AF2821 */ addu $a1, $a1, $t7 -/* 0131C 80995F6C 0C00D498 */ jal Draw_DListOpa +/* 0131C 80995F6C 0C00D498 */ jal Gfx_DrawDListOpa /* 01320 80995F70 8CA56048 */ lw $a1, %lo(D_80996048)($a1) /* 01324 80995F74 8FBF0014 */ lw $ra, 0x0014($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Door_Shutter/DoorShutter_Draw.s b/asm/non_matchings/overlays/actors/ovl_Door_Shutter/DoorShutter_Draw.s index 3e84c82869..ba8513dff2 100644 --- a/asm/non_matchings/overlays/actors/ovl_Door_Shutter/DoorShutter_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Door_Shutter/DoorShutter_Draw.s @@ -31,7 +31,7 @@ glabel DoorShutter_Draw /* 018B0 80997B50 24C6832C */ addiu $a2, $a2, %lo(D_8099832C) ## $a2 = 8099832C /* 018B4 80997B54 27A4005C */ addiu $a0, $sp, 0x005C ## $a0 = FFFFFFDC /* 018B8 80997B58 24070800 */ addiu $a3, $zero, 0x0800 ## $a3 = 00000800 -/* 018BC 80997B5C 0C031AB1 */ jal func_800C6AC4 +/* 018BC 80997B5C 0C031AB1 */ jal Graph_OpenDisps /* 018C0 80997B60 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 /* 018C4 80997B64 8FAC0084 */ lw $t4, 0x0084($sp) /* 018C8 80997B68 0C024F46 */ jal func_80093D18 @@ -356,7 +356,7 @@ glabel DoorShutter_Draw /* 01D74 80998014 24C6837C */ addiu $a2, $a2, %lo(D_8099837C) ## $a2 = 8099837C /* 01D78 80998018 27A4005C */ addiu $a0, $sp, 0x005C ## $a0 = FFFFFFDC /* 01D7C 8099801C 24070857 */ addiu $a3, $zero, 0x0857 ## $a3 = 00000857 -/* 01D80 80998020 0C031AD5 */ jal func_800C6B54 +/* 01D80 80998020 0C031AD5 */ jal Graph_CloseDisps /* 01D84 80998024 8DC50000 */ lw $a1, 0x0000($t6) ## 00000000 /* 01D88 80998028 8FBF001C */ lw $ra, 0x001C($sp) .L8099802C: diff --git a/asm/non_matchings/overlays/actors/ovl_Door_Shutter/func_809973E8.s b/asm/non_matchings/overlays/actors/ovl_Door_Shutter/func_809973E8.s index c91637a99a..e35f3bd1a0 100644 --- a/asm/non_matchings/overlays/actors/ovl_Door_Shutter/func_809973E8.s +++ b/asm/non_matchings/overlays/actors/ovl_Door_Shutter/func_809973E8.s @@ -54,22 +54,22 @@ glabel func_809973E8 /* 01204 809974A4 0C030129 */ jal func_800C04A4 /* 01208 809974A8 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 0120C 809974AC 00402025 */ or $a0, $v0, $zero ## $a0 = 00000000 -/* 01210 809974B0 0C024BE2 */ jal func_80092F88 +/* 01210 809974B0 0C024BE2 */ jal Quake_Add /* 01214 809974B4 24050003 */ addiu $a1, $zero, 0x0003 ## $a1 = 00000003 /* 01218 809974B8 00022400 */ sll $a0, $v0, 16 /* 0121C 809974BC AFA20044 */ sw $v0, 0x0044($sp) /* 01220 809974C0 00042403 */ sra $a0, $a0, 16 -/* 01224 809974C4 0C024B6B */ jal func_80092DAC +/* 01224 809974C4 0C024B6B */ jal Quake_SetSpeed /* 01228 809974C8 240580E8 */ addiu $a1, $zero, 0x80E8 ## $a1 = FFFF80E8 /* 0122C 809974CC 87A40046 */ lh $a0, 0x0046($sp) /* 01230 809974D0 24050002 */ addiu $a1, $zero, 0x0002 ## $a1 = 00000002 /* 01234 809974D4 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 /* 01238 809974D8 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 /* 0123C 809974DC AFA00010 */ sw $zero, 0x0010($sp) -/* 01240 809974E0 0C024B9C */ jal func_80092E70 +/* 01240 809974E0 0C024B9C */ jal Quake_SetQuakeValues /* 01244 809974E4 AFA4003C */ sw $a0, 0x003C($sp) /* 01248 809974E8 8FA4003C */ lw $a0, 0x003C($sp) -/* 0124C 809974EC 0C024B7C */ jal func_80092DF0 +/* 0124C 809974EC 0C024B7C */ jal Quake_SetCountdown /* 01250 809974F0 2405000A */ addiu $a1, $zero, 0x000A ## $a1 = 0000000A /* 01254 809974F4 C60C008C */ lwc1 $f12, 0x008C($s0) ## 0000008C /* 01258 809974F8 240500B4 */ addiu $a1, $zero, 0x00B4 ## $a1 = 000000B4 diff --git a/asm/non_matchings/overlays/actors/ovl_Door_Shutter/func_8099803C.s b/asm/non_matchings/overlays/actors/ovl_Door_Shutter/func_8099803C.s index 3d839b5d58..5cf08c88f2 100644 --- a/asm/non_matchings/overlays/actors/ovl_Door_Shutter/func_8099803C.s +++ b/asm/non_matchings/overlays/actors/ovl_Door_Shutter/func_8099803C.s @@ -10,7 +10,7 @@ glabel func_8099803C /* 01DBC 8099805C 0C030129 */ jal func_800C04A4 /* 01DC0 80998060 00052C03 */ sra $a1, $a1, 16 /* 01DC4 80998064 00402025 */ or $a0, $v0, $zero ## $a0 = 00000000 -/* 01DC8 80998068 0C024BE2 */ jal func_80092F88 +/* 01DC8 80998068 0C024BE2 */ jal Quake_Add /* 01DCC 8099806C 24050003 */ addiu $a1, $zero, 0x0003 ## $a1 = 00000003 /* 01DD0 80998070 44806000 */ mtc1 $zero, $f12 ## $f12 = 0.00 /* 01DD4 80998074 A7A20026 */ sh $v0, 0x0026($sp) @@ -19,16 +19,16 @@ glabel func_8099803C /* 01DE0 80998080 0C02A7DB */ jal func_800A9F6C /* 01DE4 80998084 24070064 */ addiu $a3, $zero, 0x0064 ## $a3 = 00000064 /* 01DE8 80998088 87A40026 */ lh $a0, 0x0026($sp) -/* 01DEC 8099808C 0C024B6B */ jal func_80092DAC +/* 01DEC 8099808C 0C024B6B */ jal Quake_SetSpeed /* 01DF0 80998090 24054E20 */ addiu $a1, $zero, 0x4E20 ## $a1 = 00004E20 /* 01DF4 80998094 87A40026 */ lh $a0, 0x0026($sp) /* 01DF8 80998098 87A5002E */ lh $a1, 0x002E($sp) /* 01DFC 8099809C 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 /* 01E00 809980A0 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 01E04 809980A4 0C024B9C */ jal func_80092E70 +/* 01E04 809980A4 0C024B9C */ jal Quake_SetQuakeValues /* 01E08 809980A8 AFA00010 */ sw $zero, 0x0010($sp) /* 01E0C 809980AC 87A40026 */ lh $a0, 0x0026($sp) -/* 01E10 809980B0 0C024B7C */ jal func_80092DF0 +/* 01E10 809980B0 0C024B7C */ jal Quake_SetCountdown /* 01E14 809980B4 87A50032 */ lh $a1, 0x0032($sp) /* 01E18 809980B8 8FBF001C */ lw $ra, 0x001C($sp) /* 01E1C 809980BC 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Door_Warp1/func_80998C90.s b/asm/non_matchings/overlays/actors/ovl_Door_Warp1/func_80998C90.s index 7df6a25c56..4426959f0f 100644 --- a/asm/non_matchings/overlays/actors/ovl_Door_Warp1/func_80998C90.s +++ b/asm/non_matchings/overlays/actors/ovl_Door_Warp1/func_80998C90.s @@ -1,21 +1,21 @@ glabel func_80998C90 /* 00510 80998C90 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 00514 80998C94 AFB00028 */ sw $s0, 0x0028($sp) +/* 00514 80998C94 AFB00028 */ sw $s0, 0x0028($sp) /* 00518 80998C98 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 0051C 80998C9C AFA5003C */ sw $a1, 0x003C($sp) +/* 0051C 80998C9C AFA5003C */ sw $a1, 0x003C($sp) /* 00520 80998CA0 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 00524 80998CA4 AFBF002C */ sw $ra, 0x002C($sp) +/* 00524 80998CA4 AFBF002C */ sw $ra, 0x002C($sp) /* 00528 80998CA8 2605014C */ addiu $a1, $s0, 0x014C ## $a1 = 0000014C /* 0052C 80998CAC 3C060600 */ lui $a2, 0x0600 ## $a2 = 06000000 /* 00530 80998CB0 3C070600 */ lui $a3, 0x0600 ## $a3 = 06000000 /* 00534 80998CB4 24E71374 */ addiu $a3, $a3, 0x1374 ## $a3 = 06001374 /* 00538 80998CB8 24C62CA8 */ addiu $a2, $a2, 0x2CA8 ## $a2 = 06002CA8 -/* 0053C 80998CBC AFA50034 */ sw $a1, 0x0034($sp) -/* 00540 80998CC0 AFA00010 */ sw $zero, 0x0010($sp) -/* 00544 80998CC4 AFA00014 */ sw $zero, 0x0014($sp) +/* 0053C 80998CBC AFA50034 */ sw $a1, 0x0034($sp) +/* 00540 80998CC0 AFA00010 */ sw $zero, 0x0010($sp) +/* 00544 80998CC4 AFA00014 */ sw $zero, 0x0014($sp) /* 00548 80998CC8 0C02915F */ jal SkelAnime_Init - -/* 0054C 80998CCC AFA00018 */ sw $zero, 0x0018($sp) + +/* 0054C 80998CCC AFA00018 */ sw $zero, 0x0018($sp) /* 00550 80998CD0 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 /* 00554 80998CD4 44811000 */ mtc1 $at, $f2 ## $f2 = 1.00 /* 00558 80998CD8 3C014220 */ lui $at, 0x4220 ## $at = 42200000 @@ -23,19 +23,19 @@ glabel func_80998C90 /* 00560 80998CE0 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 00564 80998CE4 240E0002 */ addiu $t6, $zero, 0x0002 ## $t6 = 00000002 /* 00568 80998CE8 240F0001 */ addiu $t7, $zero, 0x0001 ## $t7 = 00000001 -/* 0056C 80998CEC 44061000 */ mfc1 $a2, $f2 -/* 00570 80998CF0 44071000 */ mfc1 $a3, $f2 -/* 00574 80998CF4 AFAF001C */ sw $t7, 0x001C($sp) -/* 00578 80998CF8 AFAE0014 */ sw $t6, 0x0014($sp) +/* 0056C 80998CEC 44061000 */ mfc1 $a2, $f2 +/* 00570 80998CF0 44071000 */ mfc1 $a3, $f2 +/* 00574 80998CF4 AFAF001C */ sw $t7, 0x001C($sp) +/* 00578 80998CF8 AFAE0014 */ sw $t6, 0x0014($sp) /* 0057C 80998CFC 24A51374 */ addiu $a1, $a1, 0x1374 ## $a1 = 06001374 -/* 00580 80998D00 8FA40034 */ lw $a0, 0x0034($sp) -/* 00584 80998D04 E7A20010 */ swc1 $f2, 0x0010($sp) -/* 00588 80998D08 0C0293F9 */ jal func_800A4FE4 -/* 0058C 80998D0C E7A40018 */ swc1 $f4, 0x0018($sp) +/* 00580 80998D00 8FA40034 */ lw $a0, 0x0034($sp) +/* 00584 80998D04 E7A20010 */ swc1 $f2, 0x0010($sp) +/* 00588 80998D08 0C0293F9 */ jal SkelAnime_ChangeAnimImpl +/* 0058C 80998D0C E7A40018 */ swc1 $f4, 0x0018($sp) /* 00590 80998D10 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 /* 00594 80998D14 44811000 */ mtc1 $at, $f2 ## $f2 = 1.00 /* 00598 80998D18 3C01809A */ lui $at, %hi(D_8099C724) ## $at = 809A0000 -/* 0059C 80998D1C C42CC724 */ lwc1 $f12, %lo(D_8099C724)($at) +/* 0059C 80998D1C C42CC724 */ lwc1 $f12, %lo(D_8099C724)($at) /* 005A0 80998D20 2418FF74 */ addiu $t8, $zero, 0xFF74 ## $t8 = FFFFFF74 /* 005A4 80998D24 2419FFB0 */ addiu $t9, $zero, 0xFFB0 ## $t9 = FFFFFFB0 /* 005A8 80998D28 A60001AC */ sh $zero, 0x01AC($s0) ## 000001AC @@ -43,7 +43,7 @@ glabel func_80998C90 /* 005B0 80998D30 A61901B0 */ sh $t9, 0x01B0($s0) ## 000001B0 /* 005B4 80998D34 3C01809A */ lui $at, %hi(D_8099CCA0) ## $at = 809A0000 /* 005B8 80998D38 240800A0 */ addiu $t0, $zero, 0x00A0 ## $t0 = 000000A0 -/* 005BC 80998D3C A428CCA0 */ sh $t0, %lo(D_8099CCA0)($at) +/* 005BC 80998D3C A428CCA0 */ sh $t0, %lo(D_8099CCA0)($at) /* 005C0 80998D40 3C01C3C8 */ lui $at, 0xC3C8 ## $at = C3C80000 /* 005C4 80998D44 44813000 */ mtc1 $at, $f6 ## $f6 = -400.00 /* 005C8 80998D48 C604002C */ lwc1 $f4, 0x002C($s0) ## 0000002C @@ -51,17 +51,17 @@ glabel func_80998C90 /* 005D0 80998D50 C6080024 */ lwc1 $f8, 0x0024($s0) ## 00000024 /* 005D4 80998D54 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 /* 005D8 80998D58 E60600BC */ swc1 $f6, 0x00BC($s0) ## 000000BC -/* 005DC 80998D5C 4600218D */ trunc.w.s $f6, $f4 +/* 005DC 80998D5C 4600218D */ trunc.w.s $f6, $f4 /* 005E0 80998D60 A6000192 */ sh $zero, 0x0192($s0) ## 00000192 /* 005E4 80998D64 E60201BC */ swc1 $f2, 0x01BC($s0) ## 000001BC -/* 005E8 80998D68 4600848D */ trunc.w.s $f18, $f16 -/* 005EC 80998D6C 44073000 */ mfc1 $a3, $f6 +/* 005E8 80998D68 4600848D */ trunc.w.s $f18, $f16 +/* 005EC 80998D6C 44073000 */ mfc1 $a3, $f6 /* 005F0 80998D70 E60C0194 */ swc1 $f12, 0x0194($s0) ## 00000194 -/* 005F4 80998D74 4600428D */ trunc.w.s $f10, $f8 -/* 005F8 80998D78 44069000 */ mfc1 $a2, $f18 +/* 005F4 80998D74 4600428D */ trunc.w.s $f10, $f8 +/* 005F8 80998D78 44069000 */ mfc1 $a2, $f18 /* 005FC 80998D7C E60C0198 */ swc1 $f12, 0x0198($s0) ## 00000198 /* 00600 80998D80 E60001A0 */ swc1 $f0, 0x01A0($s0) ## 000001A0 -/* 00604 80998D84 44055000 */ mfc1 $a1, $f10 +/* 00604 80998D84 44055000 */ mfc1 $a1, $f10 /* 00608 80998D88 E60001A4 */ swc1 $f0, 0x01A4($s0) ## 000001A4 /* 0060C 80998D8C E60001A8 */ swc1 $f0, 0x01A8($s0) ## 000001A8 /* 00610 80998D90 E600019C */ swc1 $f0, 0x019C($s0) ## 0000019C @@ -69,53 +69,53 @@ glabel func_80998C90 /* 00618 80998D98 240D00FF */ addiu $t5, $zero, 0x00FF ## $t5 = 000000FF /* 0061C 80998D9C 240E00FF */ addiu $t6, $zero, 0x00FF ## $t6 = 000000FF /* 00620 80998DA0 240F00FF */ addiu $t7, $zero, 0x00FF ## $t7 = 000000FF -/* 00624 80998DA4 00073C00 */ sll $a3, $a3, 16 -/* 00628 80998DA8 00063400 */ sll $a2, $a2, 16 -/* 0062C 80998DAC 00052C00 */ sll $a1, $a1, 16 -/* 00630 80998DB0 00052C03 */ sra $a1, $a1, 16 -/* 00634 80998DB4 00063403 */ sra $a2, $a2, 16 -/* 00638 80998DB8 00073C03 */ sra $a3, $a3, 16 -/* 0063C 80998DBC AFAF001C */ sw $t7, 0x001C($sp) -/* 00640 80998DC0 AFAE0018 */ sw $t6, 0x0018($sp) -/* 00644 80998DC4 AFAD0014 */ sw $t5, 0x0014($sp) -/* 00648 80998DC8 AFAC0010 */ sw $t4, 0x0010($sp) +/* 00624 80998DA4 00073C00 */ sll $a3, $a3, 16 +/* 00628 80998DA8 00063400 */ sll $a2, $a2, 16 +/* 0062C 80998DAC 00052C00 */ sll $a1, $a1, 16 +/* 00630 80998DB0 00052C03 */ sra $a1, $a1, 16 +/* 00634 80998DB4 00063403 */ sra $a2, $a2, 16 +/* 00638 80998DB8 00073C03 */ sra $a3, $a3, 16 +/* 0063C 80998DBC AFAF001C */ sw $t7, 0x001C($sp) +/* 00640 80998DC0 AFAE0018 */ sw $t6, 0x0018($sp) +/* 00644 80998DC4 AFAD0014 */ sw $t5, 0x0014($sp) +/* 00648 80998DC8 AFAC0010 */ sw $t4, 0x0010($sp) /* 0064C 80998DCC 0C01E763 */ jal Lights_InitType0PositionalLight - + /* 00650 80998DD0 260401C8 */ addiu $a0, $s0, 0x01C8 ## $a0 = 000001C8 /* 00654 80998DD4 C6080024 */ lwc1 $f8, 0x0024($s0) ## 00000024 /* 00658 80998DD8 C6100028 */ lwc1 $f16, 0x0028($s0) ## 00000028 /* 0065C 80998DDC C604002C */ lwc1 $f4, 0x002C($s0) ## 0000002C -/* 00660 80998DE0 4600428D */ trunc.w.s $f10, $f8 +/* 00660 80998DE0 4600428D */ trunc.w.s $f10, $f8 /* 00664 80998DE4 240900C8 */ addiu $t1, $zero, 0x00C8 ## $t1 = 000000C8 /* 00668 80998DE8 240A00FF */ addiu $t2, $zero, 0x00FF ## $t2 = 000000FF -/* 0066C 80998DEC 4600848D */ trunc.w.s $f18, $f16 -/* 00670 80998DF0 44055000 */ mfc1 $a1, $f10 +/* 0066C 80998DEC 4600848D */ trunc.w.s $f18, $f16 +/* 00670 80998DF0 44055000 */ mfc1 $a1, $f10 /* 00674 80998DF4 240B00FF */ addiu $t3, $zero, 0x00FF ## $t3 = 000000FF -/* 00678 80998DF8 4600218D */ trunc.w.s $f6, $f4 -/* 0067C 80998DFC 44069000 */ mfc1 $a2, $f18 +/* 00678 80998DF8 4600218D */ trunc.w.s $f6, $f4 +/* 0067C 80998DFC 44069000 */ mfc1 $a2, $f18 /* 00680 80998E00 240C00FF */ addiu $t4, $zero, 0x00FF ## $t4 = 000000FF -/* 00684 80998E04 00052C00 */ sll $a1, $a1, 16 -/* 00688 80998E08 44073000 */ mfc1 $a3, $f6 -/* 0068C 80998E0C 00063400 */ sll $a2, $a2, 16 -/* 00690 80998E10 00063403 */ sra $a2, $a2, 16 -/* 00694 80998E14 00073C00 */ sll $a3, $a3, 16 -/* 00698 80998E18 00073C03 */ sra $a3, $a3, 16 -/* 0069C 80998E1C 00052C03 */ sra $a1, $a1, 16 -/* 006A0 80998E20 AFAC001C */ sw $t4, 0x001C($sp) -/* 006A4 80998E24 AFAB0018 */ sw $t3, 0x0018($sp) -/* 006A8 80998E28 AFAA0014 */ sw $t2, 0x0014($sp) -/* 006AC 80998E2C AFA90010 */ sw $t1, 0x0010($sp) +/* 00684 80998E04 00052C00 */ sll $a1, $a1, 16 +/* 00688 80998E08 44073000 */ mfc1 $a3, $f6 +/* 0068C 80998E0C 00063400 */ sll $a2, $a2, 16 +/* 00690 80998E10 00063403 */ sra $a2, $a2, 16 +/* 00694 80998E14 00073C00 */ sll $a3, $a3, 16 +/* 00698 80998E18 00073C03 */ sra $a3, $a3, 16 +/* 0069C 80998E1C 00052C03 */ sra $a1, $a1, 16 +/* 006A0 80998E20 AFAC001C */ sw $t4, 0x001C($sp) +/* 006A4 80998E24 AFAB0018 */ sw $t3, 0x0018($sp) +/* 006A8 80998E28 AFAA0014 */ sw $t2, 0x0014($sp) +/* 006AC 80998E2C AFA90010 */ sw $t1, 0x0010($sp) /* 006B0 80998E30 0C01E763 */ jal Lights_InitType0PositionalLight - + /* 006B4 80998E34 260401DC */ addiu $a0, $s0, 0x01DC ## $a0 = 000001DC /* 006B8 80998E38 3C05809A */ lui $a1, %hi(func_8099A3A4) ## $a1 = 809A0000 /* 006BC 80998E3C 24A5A3A4 */ addiu $a1, $a1, %lo(func_8099A3A4) ## $a1 = 8099A3A4 -/* 006C0 80998E40 0C2661E0 */ jal func_80998780 +/* 006C0 80998E40 0C2661E0 */ jal func_80998780 /* 006C4 80998E44 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 006C8 80998E48 8FBF002C */ lw $ra, 0x002C($sp) -/* 006CC 80998E4C 8FB00028 */ lw $s0, 0x0028($sp) +/* 006C8 80998E48 8FBF002C */ lw $ra, 0x002C($sp) +/* 006CC 80998E4C 8FB00028 */ lw $s0, 0x0028($sp) /* 006D0 80998E50 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 -/* 006D4 80998E54 03E00008 */ jr $ra +/* 006D4 80998E54 03E00008 */ jr $ra /* 006D8 80998E58 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Door_Warp1/func_80998E5C.s b/asm/non_matchings/overlays/actors/ovl_Door_Warp1/func_80998E5C.s index 0d52f522db..d1940a09f1 100644 --- a/asm/non_matchings/overlays/actors/ovl_Door_Warp1/func_80998E5C.s +++ b/asm/non_matchings/overlays/actors/ovl_Door_Warp1/func_80998E5C.s @@ -1,59 +1,59 @@ glabel func_80998E5C /* 006DC 80998E5C 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 -/* 006E0 80998E60 AFB00024 */ sw $s0, 0x0024($sp) +/* 006E0 80998E60 AFB00024 */ sw $s0, 0x0024($sp) /* 006E4 80998E64 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 006E8 80998E68 AFB10028 */ sw $s1, 0x0028($sp) +/* 006E8 80998E68 AFB10028 */ sw $s1, 0x0028($sp) /* 006EC 80998E6C 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 /* 006F0 80998E70 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 006F4 80998E74 AFBF002C */ sw $ra, 0x002C($sp) +/* 006F4 80998E74 AFBF002C */ sw $ra, 0x002C($sp) /* 006F8 80998E78 2605014C */ addiu $a1, $s0, 0x014C ## $a1 = 0000014C /* 006FC 80998E7C 3C060600 */ lui $a2, 0x0600 ## $a2 = 06000000 /* 00700 80998E80 3C070600 */ lui $a3, 0x0600 ## $a3 = 06000000 /* 00704 80998E84 24E71374 */ addiu $a3, $a3, 0x1374 ## $a3 = 06001374 /* 00708 80998E88 24C62CA8 */ addiu $a2, $a2, 0x2CA8 ## $a2 = 06002CA8 -/* 0070C 80998E8C AFA50034 */ sw $a1, 0x0034($sp) -/* 00710 80998E90 AFA00010 */ sw $zero, 0x0010($sp) -/* 00714 80998E94 AFA00014 */ sw $zero, 0x0014($sp) +/* 0070C 80998E8C AFA50034 */ sw $a1, 0x0034($sp) +/* 00710 80998E90 AFA00010 */ sw $zero, 0x0010($sp) +/* 00714 80998E94 AFA00014 */ sw $zero, 0x0014($sp) /* 00718 80998E98 0C02915F */ jal SkelAnime_Init - -/* 0071C 80998E9C AFA00018 */ sw $zero, 0x0018($sp) + +/* 0071C 80998E9C AFA00018 */ sw $zero, 0x0018($sp) /* 00720 80998EA0 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 /* 00724 80998EA4 0C028800 */ jal SkelAnime_GetFrameCount - + /* 00728 80998EA8 24841374 */ addiu $a0, $a0, 0x1374 ## $a0 = 06001374 /* 0072C 80998EAC 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 /* 00730 80998EB0 24841374 */ addiu $a0, $a0, 0x1374 ## $a0 = 06001374 /* 00734 80998EB4 0C028800 */ jal SkelAnime_GetFrameCount - -/* 00738 80998EB8 A7A2003A */ sh $v0, 0x003A($sp) -/* 0073C 80998EBC 87AE003A */ lh $t6, 0x003A($sp) + +/* 00738 80998EB8 A7A2003A */ sh $v0, 0x003A($sp) +/* 0073C 80998EBC 87AE003A */ lh $t6, 0x003A($sp) /* 00740 80998EC0 44823000 */ mtc1 $v0, $f6 ## $f6 = 0.00 /* 00744 80998EC4 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 /* 00748 80998EC8 448E2000 */ mtc1 $t6, $f4 ## $f4 = 0.00 -/* 0074C 80998ECC 46803220 */ cvt.s.w $f8, $f6 +/* 0074C 80998ECC 46803220 */ cvt.s.w $f8, $f6 /* 00750 80998ED0 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 00754 80998ED4 240F0002 */ addiu $t7, $zero, 0x0002 ## $t7 = 00000002 /* 00758 80998ED8 24180001 */ addiu $t8, $zero, 0x0001 ## $t8 = 00000001 -/* 0075C 80998EDC AFB8001C */ sw $t8, 0x001C($sp) -/* 00760 80998EE0 46802120 */ cvt.s.w $f4, $f4 -/* 00764 80998EE4 AFAF0014 */ sw $t7, 0x0014($sp) +/* 0075C 80998EDC AFB8001C */ sw $t8, 0x001C($sp) +/* 00760 80998EE0 46802120 */ cvt.s.w $f4, $f4 +/* 00764 80998EE4 AFAF0014 */ sw $t7, 0x0014($sp) /* 00768 80998EE8 24A51374 */ addiu $a1, $a1, 0x1374 ## $a1 = 06001374 -/* 0076C 80998EEC E7A80010 */ swc1 $f8, 0x0010($sp) -/* 00770 80998EF0 8FA40034 */ lw $a0, 0x0034($sp) +/* 0076C 80998EEC E7A80010 */ swc1 $f8, 0x0010($sp) +/* 00770 80998EF0 8FA40034 */ lw $a0, 0x0034($sp) /* 00774 80998EF4 24060000 */ addiu $a2, $zero, 0x0000 ## $a2 = 00000000 -/* 00778 80998EF8 44072000 */ mfc1 $a3, $f4 -/* 0077C 80998EFC 0C0293F9 */ jal func_800A4FE4 -/* 00780 80998F00 E7A00018 */ swc1 $f0, 0x0018($sp) +/* 00778 80998EF8 44072000 */ mfc1 $a3, $f4 +/* 0077C 80998EFC 0C0293F9 */ jal SkelAnime_ChangeAnimImpl +/* 00780 80998F00 E7A00018 */ swc1 $f0, 0x0018($sp) /* 00784 80998F04 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 /* 00788 80998F08 0C028800 */ jal SkelAnime_GetFrameCount - + /* 0078C 80998F0C 24841374 */ addiu $a0, $a0, 0x1374 ## $a0 = 06001374 /* 00790 80998F10 3C01809A */ lui $at, %hi(D_8099C728) ## $at = 809A0000 -/* 00794 80998F14 C422C728 */ lwc1 $f2, %lo(D_8099C728)($at) +/* 00794 80998F14 C422C728 */ lwc1 $f2, %lo(D_8099C728)($at) /* 00798 80998F18 44825000 */ mtc1 $v0, $f10 ## $f10 = 0.00 /* 0079C 80998F1C 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 /* 007A0 80998F20 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 007A4 80998F24 46805420 */ cvt.s.w $f16, $f10 +/* 007A4 80998F24 46805420 */ cvt.s.w $f16, $f10 /* 007A8 80998F28 44819000 */ mtc1 $at, $f18 ## $f18 = 1.00 /* 007AC 80998F2C 3C014448 */ lui $at, 0x4448 ## $at = 44480000 /* 007B0 80998F30 44812000 */ mtc1 $at, $f4 ## $f4 = 800.00 @@ -77,20 +77,20 @@ glabel func_80998E5C /* 007F8 80998F78 E61201BC */ swc1 $f18, 0x01BC($s0) ## 000001BC /* 007FC 80998F7C E60400BC */ swc1 $f4, 0x00BC($s0) ## 000000BC .L80998F80: -/* 00800 80998F80 00045040 */ sll $t2, $a0, 1 -/* 00804 80998F84 022A5821 */ addu $t3, $s1, $t2 -/* 00808 80998F88 01651021 */ addu $v0, $t3, $a1 +/* 00800 80998F80 00045040 */ sll $t2, $a0, 1 +/* 00804 80998F84 022A5821 */ addu $t3, $s1, $t2 +/* 00808 80998F88 01651021 */ addu $v0, $t3, $a1 /* 0080C 80998F8C 24840001 */ addiu $a0, $a0, 0x0001 ## $a0 = 00000001 /* 00810 80998F90 A4460AB6 */ sh $a2, 0x0AB6($v0) ## 00000AB6 /* 00814 80998F94 84430AB6 */ lh $v1, 0x0AB6($v0) ## 00000AB6 -/* 00818 80998F98 00042400 */ sll $a0, $a0, 16 -/* 0081C 80998F9C 00042403 */ sra $a0, $a0, 16 -/* 00820 80998FA0 28810003 */ slti $at, $a0, 0x0003 +/* 00818 80998F98 00042400 */ sll $a0, $a0, 16 +/* 0081C 80998F9C 00042403 */ sra $a0, $a0, 16 +/* 00820 80998FA0 28810003 */ slti $at, $a0, 0x0003 /* 00824 80998FA4 A4430ABC */ sh $v1, 0x0ABC($v0) ## 00000ABC -/* 00828 80998FA8 1420FFF5 */ bne $at, $zero, .L80998F80 +/* 00828 80998FA8 1420FFF5 */ bne $at, $zero, .L80998F80 /* 0082C 80998FAC A4430AB0 */ sh $v1, 0x0AB0($v0) ## 00000AB0 /* 00830 80998FB0 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 00834 80998FB4 00310821 */ addu $at, $at, $s1 +/* 00834 80998FB4 00310821 */ addu $at, $at, $s1 /* 00838 80998FB8 240CFE0C */ addiu $t4, $zero, 0xFE0C ## $t4 = FFFFFE0C /* 0083C 80998FBC A42C0AC2 */ sh $t4, 0x0AC2($at) ## 00010AC2 /* 00840 80998FC0 240D001E */ addiu $t5, $zero, 0x001E ## $t5 = 0000001E @@ -99,12 +99,12 @@ glabel func_80998E5C /* 0084C 80998FCC A60D0192 */ sh $t5, 0x0192($s0) ## 00000192 /* 00850 80998FD0 A60E01B8 */ sh $t6, 0x01B8($s0) ## 000001B8 /* 00854 80998FD4 24A591C8 */ addiu $a1, $a1, %lo(func_809991C8) ## $a1 = 809991C8 -/* 00858 80998FD8 0C2661E0 */ jal func_80998780 +/* 00858 80998FD8 0C2661E0 */ jal func_80998780 /* 0085C 80998FDC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00860 80998FE0 8FBF002C */ lw $ra, 0x002C($sp) -/* 00864 80998FE4 8FB00024 */ lw $s0, 0x0024($sp) -/* 00868 80998FE8 8FB10028 */ lw $s1, 0x0028($sp) -/* 0086C 80998FEC 03E00008 */ jr $ra +/* 00860 80998FE0 8FBF002C */ lw $ra, 0x002C($sp) +/* 00864 80998FE4 8FB00024 */ lw $s0, 0x0024($sp) +/* 00868 80998FE8 8FB10028 */ lw $s1, 0x0028($sp) +/* 0086C 80998FEC 03E00008 */ jr $ra /* 00870 80998FF0 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Door_Warp1/func_80998FF4.s b/asm/non_matchings/overlays/actors/ovl_Door_Warp1/func_80998FF4.s index 6e2d33109d..2170b04430 100644 --- a/asm/non_matchings/overlays/actors/ovl_Door_Warp1/func_80998FF4.s +++ b/asm/non_matchings/overlays/actors/ovl_Door_Warp1/func_80998FF4.s @@ -1,60 +1,60 @@ glabel func_80998FF4 /* 00874 80998FF4 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 -/* 00878 80998FF8 AFB00028 */ sw $s0, 0x0028($sp) +/* 00878 80998FF8 AFB00028 */ sw $s0, 0x0028($sp) /* 0087C 80998FFC 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00880 80999000 AFA50044 */ sw $a1, 0x0044($sp) +/* 00880 80999000 AFA50044 */ sw $a1, 0x0044($sp) /* 00884 80999004 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 00888 80999008 AFBF002C */ sw $ra, 0x002C($sp) +/* 00888 80999008 AFBF002C */ sw $ra, 0x002C($sp) /* 0088C 8099900C 2605014C */ addiu $a1, $s0, 0x014C ## $a1 = 0000014C /* 00890 80999010 3C060600 */ lui $a2, 0x0600 ## $a2 = 06000000 /* 00894 80999014 3C070600 */ lui $a3, 0x0600 ## $a3 = 06000000 /* 00898 80999018 24E71374 */ addiu $a3, $a3, 0x1374 ## $a3 = 06001374 /* 0089C 8099901C 24C62CA8 */ addiu $a2, $a2, 0x2CA8 ## $a2 = 06002CA8 -/* 008A0 80999020 AFA50034 */ sw $a1, 0x0034($sp) -/* 008A4 80999024 AFA00010 */ sw $zero, 0x0010($sp) -/* 008A8 80999028 AFA00014 */ sw $zero, 0x0014($sp) +/* 008A0 80999020 AFA50034 */ sw $a1, 0x0034($sp) +/* 008A4 80999024 AFA00010 */ sw $zero, 0x0010($sp) +/* 008A8 80999028 AFA00014 */ sw $zero, 0x0014($sp) /* 008AC 8099902C 0C02915F */ jal SkelAnime_Init - -/* 008B0 80999030 AFA00018 */ sw $zero, 0x0018($sp) + +/* 008B0 80999030 AFA00018 */ sw $zero, 0x0018($sp) /* 008B4 80999034 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 /* 008B8 80999038 0C028800 */ jal SkelAnime_GetFrameCount - + /* 008BC 8099903C 24841374 */ addiu $a0, $a0, 0x1374 ## $a0 = 06001374 /* 008C0 80999040 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 /* 008C4 80999044 24841374 */ addiu $a0, $a0, 0x1374 ## $a0 = 06001374 /* 008C8 80999048 0C028800 */ jal SkelAnime_GetFrameCount - -/* 008CC 8099904C A7A2003C */ sh $v0, 0x003C($sp) -/* 008D0 80999050 87AE003C */ lh $t6, 0x003C($sp) + +/* 008CC 8099904C A7A2003C */ sh $v0, 0x003C($sp) +/* 008D0 80999050 87AE003C */ lh $t6, 0x003C($sp) /* 008D4 80999054 44823000 */ mtc1 $v0, $f6 ## $f6 = 0.00 /* 008D8 80999058 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 /* 008DC 8099905C 448E2000 */ mtc1 $t6, $f4 ## $f4 = 0.00 -/* 008E0 80999060 46803220 */ cvt.s.w $f8, $f6 +/* 008E0 80999060 46803220 */ cvt.s.w $f8, $f6 /* 008E4 80999064 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 008E8 80999068 240F0002 */ addiu $t7, $zero, 0x0002 ## $t7 = 00000002 /* 008EC 8099906C 24180001 */ addiu $t8, $zero, 0x0001 ## $t8 = 00000001 -/* 008F0 80999070 AFB8001C */ sw $t8, 0x001C($sp) -/* 008F4 80999074 46802120 */ cvt.s.w $f4, $f4 -/* 008F8 80999078 AFAF0014 */ sw $t7, 0x0014($sp) +/* 008F0 80999070 AFB8001C */ sw $t8, 0x001C($sp) +/* 008F4 80999074 46802120 */ cvt.s.w $f4, $f4 +/* 008F8 80999078 AFAF0014 */ sw $t7, 0x0014($sp) /* 008FC 8099907C 24A51374 */ addiu $a1, $a1, 0x1374 ## $a1 = 06001374 -/* 00900 80999080 E7A80010 */ swc1 $f8, 0x0010($sp) -/* 00904 80999084 8FA40034 */ lw $a0, 0x0034($sp) +/* 00900 80999080 E7A80010 */ swc1 $f8, 0x0010($sp) +/* 00904 80999084 8FA40034 */ lw $a0, 0x0034($sp) /* 00908 80999088 24060000 */ addiu $a2, $zero, 0x0000 ## $a2 = 00000000 -/* 0090C 8099908C 44072000 */ mfc1 $a3, $f4 -/* 00910 80999090 0C0293F9 */ jal func_800A4FE4 -/* 00914 80999094 E7A00018 */ swc1 $f0, 0x0018($sp) +/* 0090C 8099908C 44072000 */ mfc1 $a3, $f4 +/* 00910 80999090 0C0293F9 */ jal SkelAnime_ChangeAnimImpl +/* 00914 80999094 E7A00018 */ swc1 $f0, 0x0018($sp) /* 00918 80999098 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 /* 0091C 8099909C 0C028800 */ jal SkelAnime_GetFrameCount - + /* 00920 809990A0 24841374 */ addiu $a0, $a0, 0x1374 ## $a0 = 06001374 /* 00924 809990A4 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 /* 00928 809990A8 44811000 */ mtc1 $at, $f2 ## $f2 = 1.00 /* 0092C 809990AC 3C01809A */ lui $at, %hi(D_8099C72C) ## $at = 809A0000 -/* 00930 809990B0 C42CC72C */ lwc1 $f12, %lo(D_8099C72C)($at) +/* 00930 809990B0 C42CC72C */ lwc1 $f12, %lo(D_8099C72C)($at) /* 00934 809990B4 44825000 */ mtc1 $v0, $f10 ## $f10 = 0.00 /* 00938 809990B8 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 /* 0093C 809990BC 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 00940 809990C0 46805420 */ cvt.s.w $f16, $f10 +/* 00940 809990C0 46805420 */ cvt.s.w $f16, $f10 /* 00944 809990C4 44819000 */ mtc1 $at, $f18 ## $f18 = 1.00 /* 00948 809990C8 3C014448 */ lui $at, 0x4448 ## $at = 44480000 /* 0094C 809990CC 44812000 */ mtc1 $at, $f4 ## $f4 = 800.00 @@ -82,33 +82,33 @@ glabel func_80998FF4 /* 009A4 80999124 8D6BE660 */ lw $t3, -0x19A0($t3) ## 8015E660 /* 009A8 80999128 24010053 */ addiu $at, $zero, 0x0053 ## $at = 00000053 /* 009AC 8099912C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 009B0 80999130 1161000D */ beq $t3, $at, .L80999168 +/* 009B0 80999130 1161000D */ beq $t3, $at, .L80999168 /* 009B4 80999134 3C01809A */ lui $at, %hi(D_8099C730) ## $at = 809A0000 -/* 009B8 80999138 C426C730 */ lwc1 $f6, %lo(D_8099C730)($at) +/* 009B8 80999138 C426C730 */ lwc1 $f6, %lo(D_8099C730)($at) /* 009BC 8099913C 3C01809A */ lui $at, %hi(D_8099C734) ## $at = 809A0000 /* 009C0 80999140 E6060050 */ swc1 $f6, 0x0050($s0) ## 00000050 -/* 009C4 80999144 C428C734 */ lwc1 $f8, %lo(D_8099C734)($at) +/* 009C4 80999144 C428C734 */ lwc1 $f8, %lo(D_8099C734)($at) /* 009C8 80999148 3C01809A */ lui $at, %hi(D_8099C738) ## $at = 809A0000 /* 009CC 8099914C E6080054 */ swc1 $f8, 0x0054($s0) ## 00000054 -/* 009D0 80999150 C42AC738 */ lwc1 $f10, %lo(D_8099C738)($at) +/* 009D0 80999150 C42AC738 */ lwc1 $f10, %lo(D_8099C738)($at) /* 009D4 80999154 3C01437F */ lui $at, 0x437F ## $at = 437F0000 /* 009D8 80999158 44818000 */ mtc1 $at, $f16 ## $f16 = 255.00 /* 009DC 8099915C E60A0058 */ swc1 $f10, 0x0058($s0) ## 00000058 -/* 009E0 80999160 10000003 */ beq $zero, $zero, .L80999170 +/* 009E0 80999160 10000003 */ beq $zero, $zero, .L80999170 /* 009E4 80999164 E61001A8 */ swc1 $f16, 0x01A8($s0) ## 000001A8 .L80999168: /* 009E8 80999168 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 009EC 8099916C 24052899 */ addiu $a1, $zero, 0x2899 ## $a1 = 00002899 .L80999170: /* 009F0 80999170 3C05809A */ lui $a1, %hi(func_80999428) ## $a1 = 809A0000 /* 009F4 80999174 24A59428 */ addiu $a1, $a1, %lo(func_80999428) ## $a1 = 80999428 -/* 009F8 80999178 0C2661E0 */ jal func_80998780 +/* 009F8 80999178 0C2661E0 */ jal func_80998780 /* 009FC 8099917C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00A00 80999180 8FBF002C */ lw $ra, 0x002C($sp) -/* 00A04 80999184 8FB00028 */ lw $s0, 0x0028($sp) +/* 00A00 80999180 8FBF002C */ lw $ra, 0x002C($sp) +/* 00A04 80999184 8FB00028 */ lw $s0, 0x0028($sp) /* 00A08 80999188 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 -/* 00A0C 8099918C 03E00008 */ jr $ra +/* 00A0C 8099918C 03E00008 */ jr $ra /* 00A10 80999190 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Door_Warp1/func_8099A508.s b/asm/non_matchings/overlays/actors/ovl_Door_Warp1/func_8099A508.s index 628b8062b1..02e5bb2f28 100644 --- a/asm/non_matchings/overlays/actors/ovl_Door_Warp1/func_8099A508.s +++ b/asm/non_matchings/overlays/actors/ovl_Door_Warp1/func_8099A508.s @@ -1,65 +1,65 @@ glabel func_8099A508 /* 01D88 8099A508 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 01D8C 8099A50C AFBF002C */ sw $ra, 0x002C($sp) -/* 01D90 8099A510 AFB00028 */ sw $s0, 0x0028($sp) +/* 01D8C 8099A50C AFBF002C */ sw $ra, 0x002C($sp) +/* 01D90 8099A510 AFB00028 */ sw $s0, 0x0028($sp) /* 01D94 8099A514 848201B2 */ lh $v0, 0x01B2($a0) ## 000001B2 /* 01D98 8099A518 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 01D9C 8099A51C 8CA31C44 */ lw $v1, 0x1C44($a1) ## 00001C44 -/* 01DA0 8099A520 10400004 */ beq $v0, $zero, .L8099A534 +/* 01DA0 8099A520 10400004 */ beq $v0, $zero, .L8099A534 /* 01DA4 8099A524 3C078013 */ lui $a3, 0x8013 ## $a3 = 80130000 /* 01DA8 8099A528 244EFFFF */ addiu $t6, $v0, 0xFFFF ## $t6 = FFFFFFFF -/* 01DAC 8099A52C 1000002A */ beq $zero, $zero, .L8099A5D8 +/* 01DAC 8099A52C 1000002A */ beq $zero, $zero, .L8099A5D8 /* 01DB0 8099A530 A48E01B2 */ sh $t6, 0x01B2($a0) ## 000001B2 .L8099A534: /* 01DB4 8099A534 3C0F8013 */ lui $t7, 0x8013 ## $t7 = 80130000 /* 01DB8 8099A538 24E733E0 */ addiu $a3, $a3, 0x33E0 ## $a3 = 801333E0 /* 01DBC 8099A53C 25EF33E8 */ addiu $t7, $t7, 0x33E8 ## $t7 = 801333E8 -/* 01DC0 8099A540 AFAF0014 */ sw $t7, 0x0014($sp) -/* 01DC4 8099A544 AFA70010 */ sw $a3, 0x0010($sp) +/* 01DC0 8099A540 AFAF0014 */ sw $t7, 0x0014($sp) +/* 01DC4 8099A544 AFA70010 */ sw $a3, 0x0010($sp) /* 01DC8 8099A548 24042826 */ addiu $a0, $zero, 0x2826 ## $a0 = 00002826 /* 01DCC 8099A54C 246500E4 */ addiu $a1, $v1, 0x00E4 ## $a1 = 000000E4 /* 01DD0 8099A550 0C03DCE3 */ jal Audio_PlaySoundGeneral - + /* 01DD4 8099A554 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 /* 01DD8 8099A558 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 /* 01DDC 8099A55C 0C028800 */ jal SkelAnime_GetFrameCount - + /* 01DE0 8099A560 24841374 */ addiu $a0, $a0, 0x1374 ## $a0 = 06001374 /* 01DE4 8099A564 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 /* 01DE8 8099A568 24841374 */ addiu $a0, $a0, 0x1374 ## $a0 = 06001374 /* 01DEC 8099A56C 0C028800 */ jal SkelAnime_GetFrameCount - -/* 01DF0 8099A570 A7A20030 */ sh $v0, 0x0030($sp) -/* 01DF4 8099A574 87B80030 */ lh $t8, 0x0030($sp) + +/* 01DF0 8099A570 A7A20030 */ sh $v0, 0x0030($sp) +/* 01DF4 8099A574 87B80030 */ lh $t8, 0x0030($sp) /* 01DF8 8099A578 44823000 */ mtc1 $v0, $f6 ## $f6 = 0.00 /* 01DFC 8099A57C 3C014220 */ lui $at, 0x4220 ## $at = 42200000 /* 01E00 8099A580 44982000 */ mtc1 $t8, $f4 ## $f4 = 0.00 -/* 01E04 8099A584 46803220 */ cvt.s.w $f8, $f6 +/* 01E04 8099A584 46803220 */ cvt.s.w $f8, $f6 /* 01E08 8099A588 44815000 */ mtc1 $at, $f10 ## $f10 = 40.00 /* 01E0C 8099A58C 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 01E10 8099A590 24190002 */ addiu $t9, $zero, 0x0002 ## $t9 = 00000002 /* 01E14 8099A594 24080001 */ addiu $t0, $zero, 0x0001 ## $t0 = 00000001 -/* 01E18 8099A598 46802120 */ cvt.s.w $f4, $f4 -/* 01E1C 8099A59C AFA8001C */ sw $t0, 0x001C($sp) -/* 01E20 8099A5A0 AFB90014 */ sw $t9, 0x0014($sp) +/* 01E18 8099A598 46802120 */ cvt.s.w $f4, $f4 +/* 01E1C 8099A59C AFA8001C */ sw $t0, 0x001C($sp) +/* 01E20 8099A5A0 AFB90014 */ sw $t9, 0x0014($sp) /* 01E24 8099A5A4 24A51374 */ addiu $a1, $a1, 0x1374 ## $a1 = 06001374 -/* 01E28 8099A5A8 E7A80010 */ swc1 $f8, 0x0010($sp) +/* 01E28 8099A5A8 E7A80010 */ swc1 $f8, 0x0010($sp) /* 01E2C 8099A5AC 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C -/* 01E30 8099A5B0 44072000 */ mfc1 $a3, $f4 +/* 01E30 8099A5B0 44072000 */ mfc1 $a3, $f4 /* 01E34 8099A5B4 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 01E38 8099A5B8 0C0293F9 */ jal func_800A4FE4 -/* 01E3C 8099A5BC E7AA0018 */ swc1 $f10, 0x0018($sp) +/* 01E38 8099A5B8 0C0293F9 */ jal SkelAnime_ChangeAnimImpl +/* 01E3C 8099A5BC E7AA0018 */ swc1 $f10, 0x0018($sp) /* 01E40 8099A5C0 24090032 */ addiu $t1, $zero, 0x0032 ## $t1 = 00000032 /* 01E44 8099A5C4 3C05809A */ lui $a1, %hi(func_8099A5EC) ## $a1 = 809A0000 /* 01E48 8099A5C8 A60901B2 */ sh $t1, 0x01B2($s0) ## 000001B2 /* 01E4C 8099A5CC 24A5A5EC */ addiu $a1, $a1, %lo(func_8099A5EC) ## $a1 = 8099A5EC -/* 01E50 8099A5D0 0C2661E0 */ jal func_80998780 +/* 01E50 8099A5D0 0C2661E0 */ jal func_80998780 /* 01E54 8099A5D4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 .L8099A5D8: -/* 01E58 8099A5D8 8FBF002C */ lw $ra, 0x002C($sp) -/* 01E5C 8099A5DC 8FB00028 */ lw $s0, 0x0028($sp) +/* 01E58 8099A5D8 8FBF002C */ lw $ra, 0x002C($sp) +/* 01E5C 8099A5DC 8FB00028 */ lw $s0, 0x0028($sp) /* 01E60 8099A5E0 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 -/* 01E64 8099A5E4 03E00008 */ jr $ra +/* 01E64 8099A5E4 03E00008 */ jr $ra /* 01E68 8099A5E8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Door_Warp1/func_8099B140.s b/asm/non_matchings/overlays/actors/ovl_Door_Warp1/func_8099B140.s index bbfb7a95ad..b81f64a5fd 100644 --- a/asm/non_matchings/overlays/actors/ovl_Door_Warp1/func_8099B140.s +++ b/asm/non_matchings/overlays/actors/ovl_Door_Warp1/func_8099B140.s @@ -1,19 +1,19 @@ glabel func_8099B140 /* 029C0 8099B140 27BDFFA8 */ addiu $sp, $sp, 0xFFA8 ## $sp = FFFFFFA8 -/* 029C4 8099B144 AFBF002C */ sw $ra, 0x002C($sp) -/* 029C8 8099B148 AFB10028 */ sw $s1, 0x0028($sp) -/* 029CC 8099B14C AFB00024 */ sw $s0, 0x0024($sp) -/* 029D0 8099B150 AFA5005C */ sw $a1, 0x005C($sp) +/* 029C4 8099B144 AFBF002C */ sw $ra, 0x002C($sp) +/* 029C8 8099B148 AFB10028 */ sw $s1, 0x0028($sp) +/* 029CC 8099B14C AFB00024 */ sw $s0, 0x0024($sp) +/* 029D0 8099B150 AFA5005C */ sw $a1, 0x005C($sp) /* 029D4 8099B154 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 /* 029D8 8099B158 00808825 */ or $s1, $a0, $zero ## $s1 = 00000000 /* 029DC 8099B15C 3C06809A */ lui $a2, %hi(D_8099C61C) ## $a2 = 809A0000 /* 029E0 8099B160 24C6C61C */ addiu $a2, $a2, %lo(D_8099C61C) ## $a2 = 8099C61C /* 029E4 8099B164 27A40040 */ addiu $a0, $sp, 0x0040 ## $a0 = FFFFFFE8 /* 029E8 8099B168 2407081E */ addiu $a3, $zero, 0x081E ## $a3 = 0000081E -/* 029EC 8099B16C 0C031AB1 */ jal func_800C6AC4 +/* 029EC 8099B16C 0C031AB1 */ jal Graph_OpenDisps /* 029F0 8099B170 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 -/* 029F4 8099B174 8FAF005C */ lw $t7, 0x005C($sp) -/* 029F8 8099B178 0C024F61 */ jal func_80093D84 +/* 029F4 8099B174 8FAF005C */ lw $t7, 0x005C($sp) +/* 029F8 8099B178 0C024F61 */ jal func_80093D84 /* 029FC 8099B17C 8DE40000 */ lw $a0, 0x0000($t7) ## 00000000 /* 02A00 8099B180 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 /* 02A04 8099B184 3C19FA00 */ lui $t9, 0xFA00 ## $t9 = FA000000 @@ -27,35 +27,35 @@ glabel func_8099B140 /* 02A24 8099B1A4 C62401A8 */ lwc1 $f4, 0x01A8($s1) ## 000001A8 /* 02A28 8099B1A8 3C014F00 */ lui $at, 0x4F00 ## $at = 4F000000 /* 02A2C 8099B1AC 3C0EFB00 */ lui $t6, 0xFB00 ## $t6 = FB000000 -/* 02A30 8099B1B0 460021A4 */ cvt.w.s $f6, $f4 +/* 02A30 8099B1B0 460021A4 */ cvt.w.s $f6, $f4 /* 02A34 8099B1B4 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 /* 02A38 8099B1B8 4449F800 */ cfc1 $t1, $31 /* 02A3C 8099B1BC 00000000 */ nop /* 02A40 8099B1C0 31290078 */ andi $t1, $t1, 0x0078 ## $t1 = 00000000 -/* 02A44 8099B1C4 51200013 */ beql $t1, $zero, .L8099B214 -/* 02A48 8099B1C8 44093000 */ mfc1 $t1, $f6 +/* 02A44 8099B1C4 51200013 */ beql $t1, $zero, .L8099B214 +/* 02A48 8099B1C8 44093000 */ mfc1 $t1, $f6 /* 02A4C 8099B1CC 44813000 */ mtc1 $at, $f6 ## $f6 = 2147483648.00 /* 02A50 8099B1D0 24090001 */ addiu $t1, $zero, 0x0001 ## $t1 = 00000001 -/* 02A54 8099B1D4 46062181 */ sub.s $f6, $f4, $f6 +/* 02A54 8099B1D4 46062181 */ sub.s $f6, $f4, $f6 /* 02A58 8099B1D8 44C9F800 */ ctc1 $t1, $31 /* 02A5C 8099B1DC 00000000 */ nop -/* 02A60 8099B1E0 460031A4 */ cvt.w.s $f6, $f6 +/* 02A60 8099B1E0 460031A4 */ cvt.w.s $f6, $f6 /* 02A64 8099B1E4 4449F800 */ cfc1 $t1, $31 /* 02A68 8099B1E8 00000000 */ nop /* 02A6C 8099B1EC 31290078 */ andi $t1, $t1, 0x0078 ## $t1 = 00000000 -/* 02A70 8099B1F0 15200005 */ bne $t1, $zero, .L8099B208 +/* 02A70 8099B1F0 15200005 */ bne $t1, $zero, .L8099B208 /* 02A74 8099B1F4 00000000 */ nop -/* 02A78 8099B1F8 44093000 */ mfc1 $t1, $f6 +/* 02A78 8099B1F8 44093000 */ mfc1 $t1, $f6 /* 02A7C 8099B1FC 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 02A80 8099B200 10000007 */ beq $zero, $zero, .L8099B220 +/* 02A80 8099B200 10000007 */ beq $zero, $zero, .L8099B220 /* 02A84 8099B204 01214825 */ or $t1, $t1, $at ## $t1 = 80000000 .L8099B208: -/* 02A88 8099B208 10000005 */ beq $zero, $zero, .L8099B220 +/* 02A88 8099B208 10000005 */ beq $zero, $zero, .L8099B220 /* 02A8C 8099B20C 2409FFFF */ addiu $t1, $zero, 0xFFFF ## $t1 = FFFFFFFF -/* 02A90 8099B210 44093000 */ mfc1 $t1, $f6 +/* 02A90 8099B210 44093000 */ mfc1 $t1, $f6 .L8099B214: /* 02A94 8099B214 00000000 */ nop -/* 02A98 8099B218 0520FFFB */ bltz $t1, .L8099B208 +/* 02A98 8099B218 0520FFFB */ bltz $t1, .L8099B208 /* 02A9C 8099B21C 00000000 */ nop .L8099B220: /* 02AA0 8099B220 3C01C8FF */ lui $at, 0xC8FF ## $at = C8FF0000 @@ -73,34 +73,34 @@ glabel func_8099B140 /* 02AD0 8099B250 44D8F800 */ ctc1 $t8, $31 /* 02AD4 8099B254 C62801A8 */ lwc1 $f8, 0x01A8($s1) ## 000001A8 /* 02AD8 8099B258 3C014F00 */ lui $at, 0x4F00 ## $at = 4F000000 -/* 02ADC 8099B25C 460042A4 */ cvt.w.s $f10, $f8 +/* 02ADC 8099B25C 460042A4 */ cvt.w.s $f10, $f8 /* 02AE0 8099B260 4458F800 */ cfc1 $t8, $31 /* 02AE4 8099B264 00000000 */ nop /* 02AE8 8099B268 33180078 */ andi $t8, $t8, 0x0078 ## $t8 = 00000000 -/* 02AEC 8099B26C 53000013 */ beql $t8, $zero, .L8099B2BC -/* 02AF0 8099B270 44185000 */ mfc1 $t8, $f10 +/* 02AEC 8099B26C 53000013 */ beql $t8, $zero, .L8099B2BC +/* 02AF0 8099B270 44185000 */ mfc1 $t8, $f10 /* 02AF4 8099B274 44815000 */ mtc1 $at, $f10 ## $f10 = 2147483648.00 /* 02AF8 8099B278 24180001 */ addiu $t8, $zero, 0x0001 ## $t8 = 00000001 -/* 02AFC 8099B27C 460A4281 */ sub.s $f10, $f8, $f10 +/* 02AFC 8099B27C 460A4281 */ sub.s $f10, $f8, $f10 /* 02B00 8099B280 44D8F800 */ ctc1 $t8, $31 /* 02B04 8099B284 00000000 */ nop -/* 02B08 8099B288 460052A4 */ cvt.w.s $f10, $f10 +/* 02B08 8099B288 460052A4 */ cvt.w.s $f10, $f10 /* 02B0C 8099B28C 4458F800 */ cfc1 $t8, $31 /* 02B10 8099B290 00000000 */ nop /* 02B14 8099B294 33180078 */ andi $t8, $t8, 0x0078 ## $t8 = 00000000 -/* 02B18 8099B298 17000005 */ bne $t8, $zero, .L8099B2B0 +/* 02B18 8099B298 17000005 */ bne $t8, $zero, .L8099B2B0 /* 02B1C 8099B29C 00000000 */ nop -/* 02B20 8099B2A0 44185000 */ mfc1 $t8, $f10 +/* 02B20 8099B2A0 44185000 */ mfc1 $t8, $f10 /* 02B24 8099B2A4 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 02B28 8099B2A8 10000007 */ beq $zero, $zero, .L8099B2C8 +/* 02B28 8099B2A8 10000007 */ beq $zero, $zero, .L8099B2C8 /* 02B2C 8099B2AC 0301C025 */ or $t8, $t8, $at ## $t8 = 80000000 .L8099B2B0: -/* 02B30 8099B2B0 10000005 */ beq $zero, $zero, .L8099B2C8 +/* 02B30 8099B2B0 10000005 */ beq $zero, $zero, .L8099B2C8 /* 02B34 8099B2B4 2418FFFF */ addiu $t8, $zero, 0xFFFF ## $t8 = FFFFFFFF -/* 02B38 8099B2B8 44185000 */ mfc1 $t8, $f10 +/* 02B38 8099B2B8 44185000 */ mfc1 $t8, $f10 .L8099B2BC: /* 02B3C 8099B2BC 00000000 */ nop -/* 02B40 8099B2C0 0700FFFB */ bltz $t8, .L8099B2B0 +/* 02B40 8099B2C0 0700FFFB */ bltz $t8, .L8099B2B0 /* 02B44 8099B2C4 00000000 */ nop .L8099B2C8: /* 02B48 8099B2C8 3C010064 */ lui $at, 0x0064 ## $at = 00640000 @@ -110,28 +110,28 @@ glabel func_8099B140 /* 02B58 8099B2D8 AC490004 */ sw $t1, 0x0004($v0) ## 00000004 /* 02B5C 8099B2DC 8E26016C */ lw $a2, 0x016C($s1) ## 0000016C /* 02B60 8099B2E0 8E250150 */ lw $a1, 0x0150($s1) ## 00000150 -/* 02B64 8099B2E4 AFB10014 */ sw $s1, 0x0014($sp) -/* 02B68 8099B2E8 AFA00010 */ sw $zero, 0x0010($sp) +/* 02B64 8099B2E4 AFB10014 */ sw $s1, 0x0014($sp) +/* 02B68 8099B2E8 AFA00010 */ sw $zero, 0x0010($sp) /* 02B6C 8099B2EC 8E0A02D0 */ lw $t2, 0x02D0($s0) ## 000002D0 /* 02B70 8099B2F0 44CFF800 */ ctc1 $t7, $31 -/* 02B74 8099B2F4 8FA4005C */ lw $a0, 0x005C($sp) -/* 02B78 8099B2F8 0C0288A2 */ jal func_800A2288 -/* 02B7C 8099B2FC AFAA0018 */ sw $t2, 0x0018($sp) +/* 02B74 8099B2F4 8FA4005C */ lw $a0, 0x005C($sp) +/* 02B78 8099B2F8 0C0288A2 */ jal SkelAnime_Draw2 +/* 02B7C 8099B2FC AFAA0018 */ sw $t2, 0x0018($sp) /* 02B80 8099B300 AE0202D0 */ sw $v0, 0x02D0($s0) ## 000002D0 -/* 02B84 8099B304 8FAB005C */ lw $t3, 0x005C($sp) +/* 02B84 8099B304 8FAB005C */ lw $t3, 0x005C($sp) /* 02B88 8099B308 3C06809A */ lui $a2, %hi(D_8099C630) ## $a2 = 809A0000 /* 02B8C 8099B30C 24C6C630 */ addiu $a2, $a2, %lo(D_8099C630) ## $a2 = 8099C630 /* 02B90 8099B310 27A40040 */ addiu $a0, $sp, 0x0040 ## $a0 = FFFFFFE8 /* 02B94 8099B314 24070832 */ addiu $a3, $zero, 0x0832 ## $a3 = 00000832 -/* 02B98 8099B318 0C031AD5 */ jal func_800C6B54 +/* 02B98 8099B318 0C031AD5 */ jal Graph_CloseDisps /* 02B9C 8099B31C 8D650000 */ lw $a1, 0x0000($t3) ## 00000000 /* 02BA0 8099B320 0C02927F */ jal SkelAnime_FrameUpdateMatrix - + /* 02BA4 8099B324 2624014C */ addiu $a0, $s1, 0x014C ## $a0 = 0000014C -/* 02BA8 8099B328 8FBF002C */ lw $ra, 0x002C($sp) -/* 02BAC 8099B32C 8FB00024 */ lw $s0, 0x0024($sp) -/* 02BB0 8099B330 8FB10028 */ lw $s1, 0x0028($sp) -/* 02BB4 8099B334 03E00008 */ jr $ra +/* 02BA8 8099B328 8FBF002C */ lw $ra, 0x002C($sp) +/* 02BAC 8099B32C 8FB00024 */ lw $s0, 0x0024($sp) +/* 02BB0 8099B330 8FB10028 */ lw $s1, 0x0028($sp) +/* 02BB4 8099B334 03E00008 */ jr $ra /* 02BB8 8099B338 27BD0058 */ addiu $sp, $sp, 0x0058 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Door_Warp1/func_8099B33C.s b/asm/non_matchings/overlays/actors/ovl_Door_Warp1/func_8099B33C.s index 87af50666e..cb7c7d44b8 100644 --- a/asm/non_matchings/overlays/actors/ovl_Door_Warp1/func_8099B33C.s +++ b/asm/non_matchings/overlays/actors/ovl_Door_Warp1/func_8099B33C.s @@ -1,69 +1,69 @@ glabel func_8099B33C /* 02BBC 8099B33C 27BDFF90 */ addiu $sp, $sp, 0xFF90 ## $sp = FFFFFF90 -/* 02BC0 8099B340 AFBF0034 */ sw $ra, 0x0034($sp) -/* 02BC4 8099B344 AFB20030 */ sw $s2, 0x0030($sp) -/* 02BC8 8099B348 AFB1002C */ sw $s1, 0x002C($sp) -/* 02BCC 8099B34C AFB00028 */ sw $s0, 0x0028($sp) +/* 02BC0 8099B340 AFBF0034 */ sw $ra, 0x0034($sp) +/* 02BC4 8099B344 AFB20030 */ sw $s2, 0x0030($sp) +/* 02BC8 8099B348 AFB1002C */ sw $s1, 0x002C($sp) +/* 02BCC 8099B34C AFB00028 */ sw $s0, 0x0028($sp) /* 02BD0 8099B350 8CAE009C */ lw $t6, 0x009C($a1) ## 0000009C /* 02BD4 8099B354 241000C8 */ addiu $s0, $zero, 0x00C8 ## $s0 = 000000C8 /* 02BD8 8099B358 00809025 */ or $s2, $a0, $zero ## $s2 = 00000000 -/* 02BDC 8099B35C 01D00019 */ multu $t6, $s0 +/* 02BDC 8099B35C 01D00019 */ multu $t6, $s0 /* 02BE0 8099B360 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 -/* 02BE4 8099B364 00002012 */ mflo $a0 -/* 02BE8 8099B368 00042400 */ sll $a0, $a0, 16 +/* 02BE4 8099B364 00002012 */ mflo $a0 +/* 02BE8 8099B368 00042400 */ sll $a0, $a0, 16 /* 02BEC 8099B36C 0C01DE1C */ jal Math_Sins ## sins? -/* 02BF0 8099B370 00042403 */ sra $a0, $a0, 16 +/* 02BF0 8099B370 00042403 */ sra $a0, $a0, 16 /* 02BF4 8099B374 3C0142F0 */ lui $at, 0x42F0 ## $at = 42F00000 /* 02BF8 8099B378 44812000 */ mtc1 $at, $f4 ## $f4 = 120.00 /* 02BFC 8099B37C 3C0142A0 */ lui $at, 0x42A0 ## $at = 42A00000 /* 02C00 8099B380 44815000 */ mtc1 $at, $f10 ## $f10 = 80.00 -/* 02C04 8099B384 46040182 */ mul.s $f6, $f0, $f4 -/* 02C08 8099B388 46003207 */ neg.s $f8, $f6 -/* 02C0C 8099B38C 460A4402 */ mul.s $f16, $f8, $f10 -/* 02C10 8099B390 E7B0005C */ swc1 $f16, 0x005C($sp) +/* 02C04 8099B384 46040182 */ mul.s $f6, $f0, $f4 +/* 02C08 8099B388 46003207 */ neg.s $f8, $f6 +/* 02C0C 8099B38C 460A4402 */ mul.s $f16, $f8, $f10 +/* 02C10 8099B390 E7B0005C */ swc1 $f16, 0x005C($sp) /* 02C14 8099B394 8E2F009C */ lw $t7, 0x009C($s1) ## 0000009C -/* 02C18 8099B398 01F00019 */ multu $t7, $s0 -/* 02C1C 8099B39C 00002012 */ mflo $a0 -/* 02C20 8099B3A0 00042400 */ sll $a0, $a0, 16 +/* 02C18 8099B398 01F00019 */ multu $t7, $s0 +/* 02C1C 8099B39C 00002012 */ mflo $a0 +/* 02C20 8099B3A0 00042400 */ sll $a0, $a0, 16 /* 02C24 8099B3A4 0C01DE0D */ jal Math_Coss ## coss? -/* 02C28 8099B3A8 00042403 */ sra $a0, $a0, 16 +/* 02C28 8099B3A8 00042403 */ sra $a0, $a0, 16 /* 02C2C 8099B3AC 3C0142F0 */ lui $at, 0x42F0 ## $at = 42F00000 /* 02C30 8099B3B0 44819000 */ mtc1 $at, $f18 ## $f18 = 120.00 /* 02C34 8099B3B4 3C0142A0 */ lui $at, 0x42A0 ## $at = 42A00000 /* 02C38 8099B3B8 44813000 */ mtc1 $at, $f6 ## $f6 = 80.00 -/* 02C3C 8099B3BC 46120102 */ mul.s $f4, $f0, $f18 +/* 02C3C 8099B3BC 46120102 */ mul.s $f4, $f0, $f18 /* 02C40 8099B3C0 00000000 */ nop -/* 02C44 8099B3C4 46062202 */ mul.s $f8, $f4, $f6 -/* 02C48 8099B3C8 E7A80060 */ swc1 $f8, 0x0060($sp) +/* 02C44 8099B3C4 46062202 */ mul.s $f8, $f4, $f6 +/* 02C48 8099B3C8 E7A80060 */ swc1 $f8, 0x0060($sp) /* 02C4C 8099B3CC 8E38009C */ lw $t8, 0x009C($s1) ## 0000009C -/* 02C50 8099B3D0 03100019 */ multu $t8, $s0 -/* 02C54 8099B3D4 00002012 */ mflo $a0 -/* 02C58 8099B3D8 00042400 */ sll $a0, $a0, 16 +/* 02C50 8099B3D0 03100019 */ multu $t8, $s0 +/* 02C54 8099B3D4 00002012 */ mflo $a0 +/* 02C58 8099B3D8 00042400 */ sll $a0, $a0, 16 /* 02C5C 8099B3DC 0C01DE0D */ jal Math_Coss ## coss? -/* 02C60 8099B3E0 00042403 */ sra $a0, $a0, 16 +/* 02C60 8099B3E0 00042403 */ sra $a0, $a0, 16 /* 02C64 8099B3E4 3C0142F0 */ lui $at, 0x42F0 ## $at = 42F00000 /* 02C68 8099B3E8 44815000 */ mtc1 $at, $f10 ## $f10 = 120.00 /* 02C6C 8099B3EC 3C0142A0 */ lui $at, 0x42A0 ## $at = 42A00000 /* 02C70 8099B3F0 44819000 */ mtc1 $at, $f18 ## $f18 = 80.00 -/* 02C74 8099B3F4 460A0402 */ mul.s $f16, $f0, $f10 +/* 02C74 8099B3F4 460A0402 */ mul.s $f16, $f0, $f10 /* 02C78 8099B3F8 3C06809A */ lui $a2, %hi(D_8099C644) ## $a2 = 809A0000 /* 02C7C 8099B3FC 24C6C644 */ addiu $a2, $a2, %lo(D_8099C644) ## $a2 = 8099C644 /* 02C80 8099B400 27A40048 */ addiu $a0, $sp, 0x0048 ## $a0 = FFFFFFD8 /* 02C84 8099B404 2407084A */ addiu $a3, $zero, 0x084A ## $a3 = 0000084A -/* 02C88 8099B408 46128102 */ mul.s $f4, $f16, $f18 -/* 02C8C 8099B40C E7A40064 */ swc1 $f4, 0x0064($sp) +/* 02C88 8099B408 46128102 */ mul.s $f4, $f16, $f18 +/* 02C8C 8099B40C E7A40064 */ swc1 $f4, 0x0064($sp) /* 02C90 8099B410 8E250000 */ lw $a1, 0x0000($s1) ## 00000000 -/* 02C94 8099B414 0C031AB1 */ jal func_800C6AC4 +/* 02C94 8099B414 0C031AB1 */ jal Graph_OpenDisps /* 02C98 8099B418 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 -/* 02C9C 8099B41C 0C024F61 */ jal func_80093D84 +/* 02C9C 8099B41C 0C024F61 */ jal func_80093D84 /* 02CA0 8099B420 8E240000 */ lw $a0, 0x0000($s1) ## 00000000 /* 02CA4 8099B424 27A5005C */ addiu $a1, $sp, 0x005C ## $a1 = FFFFFFEC /* 02CA8 8099B428 00A03025 */ or $a2, $a1, $zero ## $a2 = FFFFFFEC /* 02CAC 8099B42C 26440024 */ addiu $a0, $s2, 0x0024 ## $a0 = 00000024 -/* 02CB0 8099B430 0C00BAD1 */ jal func_8002EB44 +/* 02CB0 8099B430 0C00BAD1 */ jal func_8002EB44 /* 02CB4 8099B434 8E270000 */ lw $a3, 0x0000($s1) ## 00000000 /* 02CB8 8099B438 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 /* 02CBC 8099B43C 3C08FA00 */ lui $t0, 0xFA00 ## $t0 = FA000000 @@ -76,36 +76,36 @@ glabel func_8099B33C /* 02CD8 8099B458 C64601A8 */ lwc1 $f6, 0x01A8($s2) ## 000001A8 /* 02CDC 8099B45C 3C014F00 */ lui $at, 0x4F00 ## $at = 4F000000 /* 02CE0 8099B460 3C0FFB00 */ lui $t7, 0xFB00 ## $t7 = FB000000 -/* 02CE4 8099B464 46003224 */ cvt.w.s $f8, $f6 +/* 02CE4 8099B464 46003224 */ cvt.w.s $f8, $f6 /* 02CE8 8099B468 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 02CEC 8099B46C 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 /* 02CF0 8099B470 444AF800 */ cfc1 $t2, $31 /* 02CF4 8099B474 00000000 */ nop /* 02CF8 8099B478 314A0078 */ andi $t2, $t2, 0x0078 ## $t2 = 00000000 -/* 02CFC 8099B47C 51400013 */ beql $t2, $zero, .L8099B4CC -/* 02D00 8099B480 440A4000 */ mfc1 $t2, $f8 +/* 02CFC 8099B47C 51400013 */ beql $t2, $zero, .L8099B4CC +/* 02D00 8099B480 440A4000 */ mfc1 $t2, $f8 /* 02D04 8099B484 44814000 */ mtc1 $at, $f8 ## $f8 = 2147483648.00 /* 02D08 8099B488 240A0001 */ addiu $t2, $zero, 0x0001 ## $t2 = 00000001 -/* 02D0C 8099B48C 46083201 */ sub.s $f8, $f6, $f8 +/* 02D0C 8099B48C 46083201 */ sub.s $f8, $f6, $f8 /* 02D10 8099B490 44CAF800 */ ctc1 $t2, $31 /* 02D14 8099B494 00000000 */ nop -/* 02D18 8099B498 46004224 */ cvt.w.s $f8, $f8 +/* 02D18 8099B498 46004224 */ cvt.w.s $f8, $f8 /* 02D1C 8099B49C 444AF800 */ cfc1 $t2, $31 /* 02D20 8099B4A0 00000000 */ nop /* 02D24 8099B4A4 314A0078 */ andi $t2, $t2, 0x0078 ## $t2 = 00000000 -/* 02D28 8099B4A8 15400005 */ bne $t2, $zero, .L8099B4C0 +/* 02D28 8099B4A8 15400005 */ bne $t2, $zero, .L8099B4C0 /* 02D2C 8099B4AC 00000000 */ nop -/* 02D30 8099B4B0 440A4000 */ mfc1 $t2, $f8 +/* 02D30 8099B4B0 440A4000 */ mfc1 $t2, $f8 /* 02D34 8099B4B4 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 02D38 8099B4B8 10000007 */ beq $zero, $zero, .L8099B4D8 +/* 02D38 8099B4B8 10000007 */ beq $zero, $zero, .L8099B4D8 /* 02D3C 8099B4BC 01415025 */ or $t2, $t2, $at ## $t2 = 80000000 .L8099B4C0: -/* 02D40 8099B4C0 10000005 */ beq $zero, $zero, .L8099B4D8 +/* 02D40 8099B4C0 10000005 */ beq $zero, $zero, .L8099B4D8 /* 02D44 8099B4C4 240AFFFF */ addiu $t2, $zero, 0xFFFF ## $t2 = FFFFFFFF -/* 02D48 8099B4C8 440A4000 */ mfc1 $t2, $f8 +/* 02D48 8099B4C8 440A4000 */ mfc1 $t2, $f8 .L8099B4CC: /* 02D4C 8099B4CC 00000000 */ nop -/* 02D50 8099B4D0 0540FFFB */ bltz $t2, .L8099B4C0 +/* 02D50 8099B4D0 0540FFFB */ bltz $t2, .L8099B4C0 /* 02D54 8099B4D4 00000000 */ nop .L8099B4D8: /* 02D58 8099B4D8 314C00FF */ andi $t4, $t2, 0x00FF ## $t4 = 000000FF @@ -122,34 +122,34 @@ glabel func_8099B33C /* 02D84 8099B504 44D9F800 */ ctc1 $t9, $31 /* 02D88 8099B508 C64A01A8 */ lwc1 $f10, 0x01A8($s2) ## 000001A8 /* 02D8C 8099B50C 3C014F00 */ lui $at, 0x4F00 ## $at = 4F000000 -/* 02D90 8099B510 46005424 */ cvt.w.s $f16, $f10 +/* 02D90 8099B510 46005424 */ cvt.w.s $f16, $f10 /* 02D94 8099B514 4459F800 */ cfc1 $t9, $31 /* 02D98 8099B518 00000000 */ nop /* 02D9C 8099B51C 33390078 */ andi $t9, $t9, 0x0078 ## $t9 = 00000000 -/* 02DA0 8099B520 53200013 */ beql $t9, $zero, .L8099B570 -/* 02DA4 8099B524 44198000 */ mfc1 $t9, $f16 +/* 02DA0 8099B520 53200013 */ beql $t9, $zero, .L8099B570 +/* 02DA4 8099B524 44198000 */ mfc1 $t9, $f16 /* 02DA8 8099B528 44818000 */ mtc1 $at, $f16 ## $f16 = 2147483648.00 /* 02DAC 8099B52C 24190001 */ addiu $t9, $zero, 0x0001 ## $t9 = 00000001 -/* 02DB0 8099B530 46105401 */ sub.s $f16, $f10, $f16 +/* 02DB0 8099B530 46105401 */ sub.s $f16, $f10, $f16 /* 02DB4 8099B534 44D9F800 */ ctc1 $t9, $31 /* 02DB8 8099B538 00000000 */ nop -/* 02DBC 8099B53C 46008424 */ cvt.w.s $f16, $f16 +/* 02DBC 8099B53C 46008424 */ cvt.w.s $f16, $f16 /* 02DC0 8099B540 4459F800 */ cfc1 $t9, $31 /* 02DC4 8099B544 00000000 */ nop /* 02DC8 8099B548 33390078 */ andi $t9, $t9, 0x0078 ## $t9 = 00000000 -/* 02DCC 8099B54C 17200005 */ bne $t9, $zero, .L8099B564 +/* 02DCC 8099B54C 17200005 */ bne $t9, $zero, .L8099B564 /* 02DD0 8099B550 00000000 */ nop -/* 02DD4 8099B554 44198000 */ mfc1 $t9, $f16 +/* 02DD4 8099B554 44198000 */ mfc1 $t9, $f16 /* 02DD8 8099B558 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 02DDC 8099B55C 10000007 */ beq $zero, $zero, .L8099B57C +/* 02DDC 8099B55C 10000007 */ beq $zero, $zero, .L8099B57C /* 02DE0 8099B560 0321C825 */ or $t9, $t9, $at ## $t9 = 80000000 .L8099B564: -/* 02DE4 8099B564 10000005 */ beq $zero, $zero, .L8099B57C +/* 02DE4 8099B564 10000005 */ beq $zero, $zero, .L8099B57C /* 02DE8 8099B568 2419FFFF */ addiu $t9, $zero, 0xFFFF ## $t9 = FFFFFFFF -/* 02DEC 8099B56C 44198000 */ mfc1 $t9, $f16 +/* 02DEC 8099B56C 44198000 */ mfc1 $t9, $f16 .L8099B570: /* 02DF0 8099B570 00000000 */ nop -/* 02DF4 8099B574 0720FFFB */ bltz $t9, .L8099B564 +/* 02DF4 8099B574 0720FFFB */ bltz $t9, .L8099B564 /* 02DF8 8099B578 00000000 */ nop .L8099B57C: /* 02DFC 8099B57C 3C019600 */ lui $at, 0x9600 ## $at = 96000000 @@ -159,27 +159,27 @@ glabel func_8099B33C /* 02E0C 8099B58C AC4A0004 */ sw $t2, 0x0004($v0) ## 00000004 /* 02E10 8099B590 8E46016C */ lw $a2, 0x016C($s2) ## 0000016C /* 02E14 8099B594 8E450150 */ lw $a1, 0x0150($s2) ## 00000150 -/* 02E18 8099B598 AFB20014 */ sw $s2, 0x0014($sp) -/* 02E1C 8099B59C AFA00010 */ sw $zero, 0x0010($sp) +/* 02E18 8099B598 AFB20014 */ sw $s2, 0x0014($sp) +/* 02E1C 8099B59C AFA00010 */ sw $zero, 0x0010($sp) /* 02E20 8099B5A0 8E0B02D0 */ lw $t3, 0x02D0($s0) ## 000002D0 /* 02E24 8099B5A4 44D8F800 */ ctc1 $t8, $31 -/* 02E28 8099B5A8 0C0288A2 */ jal func_800A2288 -/* 02E2C 8099B5AC AFAB0018 */ sw $t3, 0x0018($sp) +/* 02E28 8099B5A8 0C0288A2 */ jal SkelAnime_Draw2 +/* 02E2C 8099B5AC AFAB0018 */ sw $t3, 0x0018($sp) /* 02E30 8099B5B0 AE0202D0 */ sw $v0, 0x02D0($s0) ## 000002D0 /* 02E34 8099B5B4 3C06809A */ lui $a2, %hi(D_8099C658) ## $a2 = 809A0000 /* 02E38 8099B5B8 24C6C658 */ addiu $a2, $a2, %lo(D_8099C658) ## $a2 = 8099C658 /* 02E3C 8099B5BC 8E250000 */ lw $a1, 0x0000($s1) ## 00000000 /* 02E40 8099B5C0 27A40048 */ addiu $a0, $sp, 0x0048 ## $a0 = FFFFFFD8 -/* 02E44 8099B5C4 0C031AD5 */ jal func_800C6B54 +/* 02E44 8099B5C4 0C031AD5 */ jal Graph_CloseDisps /* 02E48 8099B5C8 24070868 */ addiu $a3, $zero, 0x0868 ## $a3 = 00000868 /* 02E4C 8099B5CC 0C02927F */ jal SkelAnime_FrameUpdateMatrix - + /* 02E50 8099B5D0 2644014C */ addiu $a0, $s2, 0x014C ## $a0 = 0000014C -/* 02E54 8099B5D4 8FBF0034 */ lw $ra, 0x0034($sp) -/* 02E58 8099B5D8 8FB00028 */ lw $s0, 0x0028($sp) -/* 02E5C 8099B5DC 8FB1002C */ lw $s1, 0x002C($sp) -/* 02E60 8099B5E0 8FB20030 */ lw $s2, 0x0030($sp) -/* 02E64 8099B5E4 03E00008 */ jr $ra +/* 02E54 8099B5D4 8FBF0034 */ lw $ra, 0x0034($sp) +/* 02E58 8099B5D8 8FB00028 */ lw $s0, 0x0028($sp) +/* 02E5C 8099B5DC 8FB1002C */ lw $s1, 0x002C($sp) +/* 02E60 8099B5E0 8FB20030 */ lw $s2, 0x0030($sp) +/* 02E64 8099B5E4 03E00008 */ jr $ra /* 02E68 8099B5E8 27BD0070 */ addiu $sp, $sp, 0x0070 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Door_Warp1/func_8099B5EC.s b/asm/non_matchings/overlays/actors/ovl_Door_Warp1/func_8099B5EC.s index 57e1e1e2ae..0d9a721738 100644 --- a/asm/non_matchings/overlays/actors/ovl_Door_Warp1/func_8099B5EC.s +++ b/asm/non_matchings/overlays/actors/ovl_Door_Warp1/func_8099B5EC.s @@ -41,7 +41,7 @@ glabel func_8099B5EC /* 02EF8 8099B678 24C6C66C */ addiu $a2, $a2, %lo(D_8099C66C) ## $a2 = 8099C66C /* 02EFC 8099B67C 8F250000 */ lw $a1, 0x0000($t9) ## 00000000 /* 02F00 8099B680 2407087D */ addiu $a3, $zero, 0x087D ## $a3 = 0000087D -/* 02F04 8099B684 0C031AB1 */ jal func_800C6AC4 +/* 02F04 8099B684 0C031AB1 */ jal Graph_OpenDisps /* 02F08 8099B688 AFA500D8 */ sw $a1, 0x00D8($sp) /* 02F0C 8099B68C 3C014000 */ lui $at, 0x4000 ## $at = 40000000 /* 02F10 8099B690 44818000 */ mtc1 $at, $f16 ## $f16 = 2.00 @@ -513,7 +513,7 @@ glabel func_8099B5EC /* 035F0 8099BD70 AFAD0010 */ sw $t5, 0x0010($sp) /* 035F4 8099BD74 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 035F8 8099BD78 AFA800D8 */ sw $t0, 0x00D8($sp) -/* 035FC 8099BD7C 0C0253D0 */ jal Draw_TwoTexScroll +/* 035FC 8099BD7C 0C0253D0 */ jal Gfx_TwoTexScroll /* 03600 8099BD80 AFA20090 */ sw $v0, 0x0090($sp) /* 03604 8099BD84 8FA30090 */ lw $v1, 0x0090($sp) /* 03608 8099BD88 8FA800D8 */ lw $t0, 0x00D8($sp) @@ -947,7 +947,7 @@ glabel func_8099B5EC /* 03C58 8099C3D8 AFA90028 */ sw $t1, 0x0028($sp) /* 03C5C 8099C3DC AFAC0024 */ sw $t4, 0x0024($sp) /* 03C60 8099C3E0 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 03C64 8099C3E4 0C0253D0 */ jal Draw_TwoTexScroll +/* 03C64 8099C3E4 0C0253D0 */ jal Gfx_TwoTexScroll /* 03C68 8099C3E8 AFA2005C */ sw $v0, 0x005C($sp) /* 03C6C 8099C3EC 8FA3005C */ lw $v1, 0x005C($sp) /* 03C70 8099C3F0 8FA800D8 */ lw $t0, 0x00D8($sp) @@ -1008,7 +1008,7 @@ glabel func_8099B5EC /* 03D48 8099C4C8 24C6C6BC */ addiu $a2, $a2, %lo(D_8099C6BC) ## $a2 = 8099C6BC /* 03D4C 8099C4CC 27A400C8 */ addiu $a0, $sp, 0x00C8 ## $a0 = FFFFFFD0 /* 03D50 8099C4D0 24070924 */ addiu $a3, $zero, 0x0924 ## $a3 = 00000924 -/* 03D54 8099C4D4 0C031AD5 */ jal func_800C6B54 +/* 03D54 8099C4D4 0C031AD5 */ jal Graph_CloseDisps /* 03D58 8099C4D8 8D850000 */ lw $a1, 0x0000($t4) ## 00000000 /* 03D5C 8099C4DC 8FBF003C */ lw $ra, 0x003C($sp) /* 03D60 8099C4E0 8FB00038 */ lw $s0, 0x0038($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Efc_Erupc/EfcErupc_Draw.s b/asm/non_matchings/overlays/actors/ovl_Efc_Erupc/EfcErupc_Draw.s index 56609d5cc0..eaa8aaf487 100644 --- a/asm/non_matchings/overlays/actors/ovl_Efc_Erupc/EfcErupc_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Efc_Erupc/EfcErupc_Draw.s @@ -10,7 +10,7 @@ glabel EfcErupc_Draw /* 00320 8099CFD0 24C6D790 */ addiu $a2, $a2, %lo(D_8099D790) ## $a2 = 8099D790 /* 00324 8099CFD4 27A40074 */ addiu $a0, $sp, 0x0074 ## $a0 = FFFFFFE4 /* 00328 8099CFD8 2407011A */ addiu $a3, $zero, 0x011A ## $a3 = 0000011A -/* 0032C 8099CFDC 0C031AB1 */ jal func_800C6AC4 +/* 0032C 8099CFDC 0C031AB1 */ jal Graph_OpenDisps /* 00330 8099CFE0 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 /* 00334 8099CFE4 0C024F61 */ jal func_80093D84 /* 00338 8099CFE8 8E240000 */ lw $a0, 0x0000($s1) ## 00000000 @@ -44,7 +44,7 @@ glabel EfcErupc_Draw /* 003A8 8099D058 AFAF0028 */ sw $t7, 0x0028($sp) /* 003AC 8099D05C 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 003B0 8099D060 AFA20070 */ sw $v0, 0x0070($sp) -/* 003B4 8099D064 0C0253D0 */ jal Draw_TwoTexScroll +/* 003B4 8099D064 0C0253D0 */ jal Gfx_TwoTexScroll /* 003B8 8099D068 00603025 */ or $a2, $v1, $zero ## $a2 = 00000000 /* 003BC 8099D06C 8FA90070 */ lw $t1, 0x0070($sp) /* 003C0 8099D070 3C19DB06 */ lui $t9, 0xDB06 ## $t9 = DB060000 @@ -76,7 +76,7 @@ glabel EfcErupc_Draw /* 00428 8099D0D8 AFAC0010 */ sw $t4, 0x0010($sp) /* 0042C 8099D0DC 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 00430 8099D0E0 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 00434 8099D0E4 0C0253D0 */ jal Draw_TwoTexScroll +/* 00434 8099D0E4 0C0253D0 */ jal Gfx_TwoTexScroll /* 00438 8099D0E8 AFA2006C */ sw $v0, 0x006C($sp) /* 0043C 8099D0EC 8FA8006C */ lw $t0, 0x006C($sp) /* 00440 8099D0F0 3C0CDB06 */ lui $t4, 0xDB06 ## $t4 = DB060000 @@ -108,7 +108,7 @@ glabel EfcErupc_Draw /* 004A8 8099D158 AFAE0010 */ sw $t6, 0x0010($sp) /* 004AC 8099D15C 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 004B0 8099D160 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 004B4 8099D164 0C0253D0 */ jal Draw_TwoTexScroll +/* 004B4 8099D164 0C0253D0 */ jal Gfx_TwoTexScroll /* 004B8 8099D168 AFA20068 */ sw $v0, 0x0068($sp) /* 004BC 8099D16C 8FA80068 */ lw $t0, 0x0068($sp) /* 004C0 8099D170 0C034213 */ jal Matrix_Push @@ -216,7 +216,7 @@ glabel EfcErupc_Draw /* 00650 8099D300 AC580000 */ sw $t8, 0x0000($v0) ## 00000000 /* 00654 8099D304 AC590004 */ sw $t9, 0x0004($v0) ## 00000004 .L8099D308: -/* 00658 8099D308 0C031AD5 */ jal func_800C6B54 +/* 00658 8099D308 0C031AD5 */ jal Graph_CloseDisps /* 0065C 8099D30C 8E250000 */ lw $a1, 0x0000($s1) ## 00000000 /* 00660 8099D310 8FA40090 */ lw $a0, 0x0090($sp) /* 00664 8099D314 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Efc_Erupc/func_8099D334.s b/asm/non_matchings/overlays/actors/ovl_Efc_Erupc/func_8099D334.s index 116def9cd3..adf7fece29 100644 --- a/asm/non_matchings/overlays/actors/ovl_Efc_Erupc/func_8099D334.s +++ b/asm/non_matchings/overlays/actors/ovl_Efc_Erupc/func_8099D334.s @@ -18,7 +18,7 @@ glabel func_8099D334 /* 006C4 8099D374 24C6D7E0 */ addiu $a2, $a2, %lo(D_8099D7E0) ## $a2 = 8099D7E0 /* 006C8 8099D378 27A40070 */ addiu $a0, $sp, 0x0070 ## $a0 = FFFFFFE0 /* 006CC 8099D37C 24070170 */ addiu $a3, $zero, 0x0170 ## $a3 = 00000170 -/* 006D0 8099D380 0C031AB1 */ jal func_800C6AC4 +/* 006D0 8099D380 0C031AB1 */ jal Graph_OpenDisps /* 006D4 8099D384 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 006D8 8099D388 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 /* 006DC 8099D38C 4481A000 */ mtc1 $at, $f20 ## $f20 = 1.00 @@ -112,7 +112,7 @@ glabel func_8099D334 /* 00834 8099D4E4 24C6D808 */ addiu $a2, $a2, %lo(D_8099D808) ## $a2 = 8099D808 /* 00838 8099D4E8 27A40070 */ addiu $a0, $sp, 0x0070 ## $a0 = FFFFFFE0 /* 0083C 8099D4EC 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 00840 8099D4F0 0C031AD5 */ jal func_800C6B54 +/* 00840 8099D4F0 0C031AD5 */ jal Graph_CloseDisps /* 00844 8099D4F4 2407018F */ addiu $a3, $zero, 0x018F ## $a3 = 0000018F /* 00848 8099D4F8 8FBF0044 */ lw $ra, 0x0044($sp) /* 0084C 8099D4FC D7B40018 */ ldc1 $f20, 0x0018($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Eff_Dust/func_8099E4F4.s b/asm/non_matchings/overlays/actors/ovl_Eff_Dust/func_8099E4F4.s index 50c27f7d34..722b8e376e 100644 --- a/asm/non_matchings/overlays/actors/ovl_Eff_Dust/func_8099E4F4.s +++ b/asm/non_matchings/overlays/actors/ovl_Eff_Dust/func_8099E4F4.s @@ -19,7 +19,7 @@ glabel func_8099E4F4 /* 00C68 8099E538 24C6EB80 */ addiu $a2, $a2, %lo(D_8099EB80) ## $a2 = 8099EB80 /* 00C6C 8099E53C 27A40080 */ addiu $a0, $sp, 0x0080 ## $a0 = FFFFFFD0 /* 00C70 8099E540 240701A9 */ addiu $a3, $zero, 0x01A9 ## $a3 = 000001A9 -/* 00C74 8099E544 0C031AB1 */ jal func_800C6AC4 +/* 00C74 8099E544 0C031AB1 */ jal Graph_OpenDisps /* 00C78 8099E548 02602825 */ or $a1, $s3, $zero ## $a1 = 00000000 /* 00C7C 8099E54C 0C024F46 */ jal func_80093D18 /* 00C80 8099E550 02602025 */ or $a0, $s3, $zero ## $a0 = 00000000 @@ -149,7 +149,7 @@ glabel func_8099E4F4 /* 00E68 8099E738 24C6EBA0 */ addiu $a2, $a2, %lo(D_8099EBA0) ## $a2 = 8099EBA0 /* 00E6C 8099E73C 27A40080 */ addiu $a0, $sp, 0x0080 ## $a0 = FFFFFFD0 /* 00E70 8099E740 02602825 */ or $a1, $s3, $zero ## $a1 = 00000000 -/* 00E74 8099E744 0C031AD5 */ jal func_800C6B54 +/* 00E74 8099E744 0C031AD5 */ jal Graph_CloseDisps /* 00E78 8099E748 240701CA */ addiu $a3, $zero, 0x01CA ## $a3 = 000001CA /* 00E7C 8099E74C 8FBF004C */ lw $ra, 0x004C($sp) /* 00E80 8099E750 D7B40018 */ ldc1 $f20, 0x0018($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Eff_Dust/func_8099E784.s b/asm/non_matchings/overlays/actors/ovl_Eff_Dust/func_8099E784.s index 7c281d0e5d..283d5c8d60 100644 --- a/asm/non_matchings/overlays/actors/ovl_Eff_Dust/func_8099E784.s +++ b/asm/non_matchings/overlays/actors/ovl_Eff_Dust/func_8099E784.s @@ -24,7 +24,7 @@ glabel func_8099E784 /* 00F0C 8099E7DC 27A4009C */ addiu $a0, $sp, 0x009C ## $a0 = FFFFFFCC /* 00F10 8099E7E0 240701D8 */ addiu $a3, $zero, 0x01D8 ## $a3 = 000001D8 /* 00F14 8099E7E4 02402825 */ or $a1, $s2, $zero ## $a1 = 00000000 -/* 00F18 8099E7E8 0C031AB1 */ jal func_800C6AC4 +/* 00F18 8099E7E8 0C031AB1 */ jal Graph_OpenDisps /* 00F1C 8099E7EC AFAE00B0 */ sw $t6, 0x00B0($sp) /* 00F20 8099E7F0 0C024F46 */ jal func_80093D18 /* 00F24 8099E7F4 02402025 */ or $a0, $s2, $zero ## $a0 = 00000000 @@ -217,7 +217,7 @@ glabel func_8099E784 /* 011F4 8099EAC4 24C6EBD0 */ addiu $a2, $a2, %lo(D_8099EBD0) ## $a2 = 8099EBD0 /* 011F8 8099EAC8 27A4009C */ addiu $a0, $sp, 0x009C ## $a0 = FFFFFFCC /* 011FC 8099EACC 02402825 */ or $a1, $s2, $zero ## $a1 = 00000000 -/* 01200 8099EAD0 0C031AD5 */ jal func_800C6B54 +/* 01200 8099EAD0 0C031AD5 */ jal Graph_CloseDisps /* 01204 8099EAD4 24070203 */ addiu $a3, $zero, 0x0203 ## $a3 = 00000203 /* 01208 8099EAD8 8FBF0064 */ lw $ra, 0x0064($sp) /* 0120C 8099EADC D7B40018 */ ldc1 $f20, 0x0018($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Elf_Msg/ElfMsg_Draw.s b/asm/non_matchings/overlays/actors/ovl_Elf_Msg/ElfMsg_Draw.s index 7325cfc82d..7d54a789a4 100644 --- a/asm/non_matchings/overlays/actors/ovl_Elf_Msg/ElfMsg_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Elf_Msg/ElfMsg_Draw.s @@ -8,7 +8,7 @@ glabel ElfMsg_Draw /* 00588 809AD0A8 24C6D5C0 */ addiu $a2, $a2, %lo(D_809AD5C0) ## $a2 = 809AD5C0 /* 0058C 809AD0AC 27A40034 */ addiu $a0, $sp, 0x0034 ## $a0 = FFFFFFEC /* 00590 809AD0B0 240701B4 */ addiu $a3, $zero, 0x01B4 ## $a3 = 000001B4 -/* 00594 809AD0B4 0C031AB1 */ jal func_800C6AC4 +/* 00594 809AD0B4 0C031AB1 */ jal Graph_OpenDisps /* 00598 809AD0B8 AFA50044 */ sw $a1, 0x0044($sp) /* 0059C 809AD0BC 3C058016 */ lui $a1, 0x8016 ## $a1 = 80160000 /* 005A0 809AD0C0 24A5FA90 */ addiu $a1, $a1, 0xFA90 ## $a1 = 8015FA90 @@ -107,7 +107,7 @@ glabel ElfMsg_Draw .L809AD228: /* 00708 809AD228 8FA9004C */ lw $t1, 0x004C($sp) /* 0070C 809AD22C 27A40034 */ addiu $a0, $sp, 0x0034 ## $a0 = FFFFFFEC -/* 00710 809AD230 0C031AD5 */ jal func_800C6B54 +/* 00710 809AD230 0C031AD5 */ jal Graph_CloseDisps /* 00714 809AD234 8D250000 */ lw $a1, 0x0000($t1) ## 00000008 /* 00718 809AD238 8FBF0014 */ lw $ra, 0x0014($sp) .L809AD23C: diff --git a/asm/non_matchings/overlays/actors/ovl_Elf_Msg2/ElfMsg2_Draw.s b/asm/non_matchings/overlays/actors/ovl_Elf_Msg2/ElfMsg2_Draw.s index b28b99a59c..de9371c9c6 100644 --- a/asm/non_matchings/overlays/actors/ovl_Elf_Msg2/ElfMsg2_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Elf_Msg2/ElfMsg2_Draw.s @@ -9,7 +9,7 @@ glabel ElfMsg2_Draw /* 003F8 809ADAF8 24C6DDE4 */ addiu $a2, $a2, %lo(D_809ADDE4) ## $a2 = 809ADDE4 /* 003FC 809ADAFC 27A40034 */ addiu $a0, $sp, 0x0034 ## $a0 = FFFFFFEC /* 00400 809ADB00 24070163 */ addiu $a3, $zero, 0x0163 ## $a3 = 00000163 -/* 00404 809ADB04 0C031AB1 */ jal func_800C6AC4 +/* 00404 809ADB04 0C031AB1 */ jal Graph_OpenDisps /* 00408 809ADB08 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 /* 0040C 809ADB0C 3C0F8016 */ lui $t7, 0x8016 ## $t7 = 80160000 /* 00410 809ADB10 8DEFFA90 */ lw $t7, -0x0570($t7) ## 8015FA90 @@ -67,7 +67,7 @@ glabel ElfMsg2_Draw /* 004E0 809ADBE0 27A40034 */ addiu $a0, $sp, 0x0034 ## $a0 = FFFFFFEC /* 004E4 809ADBE4 24C6DE04 */ addiu $a2, $a2, %lo(D_809ADE04) ## $a2 = 809ADE04 /* 004E8 809ADBE8 2407016F */ addiu $a3, $zero, 0x016F ## $a3 = 0000016F -/* 004EC 809ADBEC 0C031AD5 */ jal func_800C6B54 +/* 004EC 809ADBEC 0C031AD5 */ jal Graph_CloseDisps /* 004F0 809ADBF0 8D650000 */ lw $a1, 0x0000($t3) ## 00000000 /* 004F4 809ADBF4 8FBF001C */ lw $ra, 0x001C($sp) .L809ADBF8: diff --git a/asm/non_matchings/overlays/actors/ovl_En_Am/EnAm_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Am/EnAm_Draw.s index 426398a30f..55cedeb8db 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Am/EnAm_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Am/EnAm_Draw.s @@ -10,7 +10,7 @@ glabel EnAm_Draw /* 01EE4 809AFE04 24C60160 */ addiu $a2, $a2, %lo(D_809B0160) ## $a2 = 809B0160 /* 01EE8 809AFE08 27A40050 */ addiu $a0, $sp, 0x0050 ## $a0 = FFFFFFD8 /* 01EEC 809AFE0C 2407062C */ addiu $a3, $zero, 0x062C ## $a3 = 0000062C -/* 01EF0 809AFE10 0C031AB1 */ jal func_800C6AC4 +/* 01EF0 809AFE10 0C031AB1 */ jal Graph_OpenDisps /* 01EF4 809AFE14 AFA50060 */ sw $a1, 0x0060($sp) /* 01EF8 809AFE18 0C024F46 */ jal func_80093D18 /* 01EFC 809AFE1C 8E240000 */ lw $a0, 0x0000($s1) ## 00000000 @@ -88,7 +88,7 @@ glabel EnAm_Draw /* 02014 809AFF34 24C60170 */ addiu $a2, $a2, %lo(D_809B0170) ## $a2 = 809B0170 /* 02018 809AFF38 27A40050 */ addiu $a0, $sp, 0x0050 ## $a0 = FFFFFFD8 /* 0201C 809AFF3C 8E250000 */ lw $a1, 0x0000($s1) ## 00000000 -/* 02020 809AFF40 0C031AD5 */ jal func_800C6B54 +/* 02020 809AFF40 0C031AD5 */ jal Graph_CloseDisps /* 02024 809AFF44 24070645 */ addiu $a3, $zero, 0x0645 ## $a3 = 00000645 /* 02028 809AFF48 8FBF003C */ lw $ra, 0x003C($sp) /* 0202C 809AFF4C 8FB00034 */ lw $s0, 0x0034($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Am/func_809AE40C.s b/asm/non_matchings/overlays/actors/ovl_En_Am/func_809AE40C.s index 7662642300..5bdaf9cbf3 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Am/func_809AE40C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Am/func_809AE40C.s @@ -1,33 +1,33 @@ glabel func_809AE40C /* 004EC 809AE40C 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 004F0 809AE410 AFB00028 */ sw $s0, 0x0028($sp) +/* 004F0 809AE410 AFB00028 */ sw $s0, 0x0028($sp) /* 004F4 809AE414 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 004F8 809AE418 AFBF002C */ sw $ra, 0x002C($sp) +/* 004F8 809AE418 AFBF002C */ sw $ra, 0x002C($sp) /* 004FC 809AE41C 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 /* 00500 809AE420 0C028800 */ jal SkelAnime_GetFrameCount - + /* 00504 809AE424 2484033C */ addiu $a0, $a0, 0x033C ## $a0 = 0600033C /* 00508 809AE428 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 0050C 809AE42C 44801000 */ mtc1 $zero, $f2 ## $f2 = 0.00 /* 00510 809AE430 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 00514 809AE434 46802020 */ cvt.s.w $f0, $f4 -/* 00518 809AE438 44061000 */ mfc1 $a2, $f2 +/* 00514 809AE434 46802020 */ cvt.s.w $f0, $f4 +/* 00518 809AE438 44061000 */ mfc1 $a2, $f2 /* 0051C 809AE43C 24A5033C */ addiu $a1, $a1, 0x033C ## $a1 = 0600033C /* 00520 809AE440 26040164 */ addiu $a0, $s0, 0x0164 ## $a0 = 00000164 -/* 00524 809AE444 AFA00014 */ sw $zero, 0x0014($sp) -/* 00528 809AE448 E7A20018 */ swc1 $f2, 0x0018($sp) -/* 0052C 809AE44C 44070000 */ mfc1 $a3, $f0 -/* 00530 809AE450 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 00534 809AE454 E7A00010 */ swc1 $f0, 0x0010($sp) +/* 00524 809AE444 AFA00014 */ sw $zero, 0x0014($sp) +/* 00528 809AE448 E7A20018 */ swc1 $f2, 0x0018($sp) +/* 0052C 809AE44C 44070000 */ mfc1 $a3, $f0 +/* 00530 809AE450 0C029468 */ jal SkelAnime_ChangeAnim + +/* 00534 809AE454 E7A00010 */ swc1 $f0, 0x0010($sp) /* 00538 809AE458 920F0266 */ lbu $t7, 0x0266($s0) ## 00000266 /* 0053C 809AE45C 44803000 */ mtc1 $zero, $f6 ## $f6 = 0.00 /* 00540 809AE460 240E0003 */ addiu $t6, $zero, 0x0003 ## $t6 = 00000003 /* 00544 809AE464 240100FF */ addiu $at, $zero, 0x00FF ## $at = 000000FF /* 00548 809AE468 AE0E01A8 */ sw $t6, 0x01A8($s0) ## 000001A8 -/* 0054C 809AE46C 15E10003 */ bne $t7, $at, .L809AE47C +/* 0054C 809AE46C 15E10003 */ bne $t7, $at, .L809AE47C /* 00550 809AE470 E6060068 */ swc1 $f6, 0x0068($s0) ## 00000068 -/* 00554 809AE474 10000003 */ beq $zero, $zero, .L809AE484 +/* 00554 809AE474 10000003 */ beq $zero, $zero, .L809AE484 /* 00558 809AE478 A6000258 */ sh $zero, 0x0258($s0) ## 00000258 .L809AE47C: /* 0055C 809AE47C 24180001 */ addiu $t8, $zero, 0x0001 ## $t8 = 00000001 @@ -35,12 +35,12 @@ glabel func_809AE40C .L809AE484: /* 00564 809AE484 3C05809B */ lui $a1, %hi(func_809AE8A8) ## $a1 = 809B0000 /* 00568 809AE488 24A5E8A8 */ addiu $a1, $a1, %lo(func_809AE8A8) ## $a1 = 809AE8A8 -/* 0056C 809AE48C 0C26B7C8 */ jal func_809ADF20 +/* 0056C 809AE48C 0C26B7C8 */ jal func_809ADF20 /* 00570 809AE490 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00574 809AE494 8FBF002C */ lw $ra, 0x002C($sp) -/* 00578 809AE498 8FB00028 */ lw $s0, 0x0028($sp) +/* 00574 809AE494 8FBF002C */ lw $ra, 0x002C($sp) +/* 00578 809AE498 8FB00028 */ lw $s0, 0x0028($sp) /* 0057C 809AE49C 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 00580 809AE4A0 03E00008 */ jr $ra +/* 00580 809AE4A0 03E00008 */ jr $ra /* 00584 809AE4A4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Am/func_809AE4A8.s b/asm/non_matchings/overlays/actors/ovl_En_Am/func_809AE4A8.s index 5f36e93419..269fba4b6e 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Am/func_809AE4A8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Am/func_809AE4A8.s @@ -1,41 +1,41 @@ glabel func_809AE4A8 /* 00588 809AE4A8 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 0058C 809AE4AC AFB00028 */ sw $s0, 0x0028($sp) +/* 0058C 809AE4AC AFB00028 */ sw $s0, 0x0028($sp) /* 00590 809AE4B0 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00594 809AE4B4 AFBF002C */ sw $ra, 0x002C($sp) +/* 00594 809AE4B4 AFBF002C */ sw $ra, 0x002C($sp) /* 00598 809AE4B8 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 /* 0059C 809AE4BC 0C028800 */ jal SkelAnime_GetFrameCount - + /* 005A0 809AE4C0 2484033C */ addiu $a0, $a0, 0x033C ## $a0 = 0600033C /* 005A4 809AE4C4 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 005A8 809AE4C8 44801000 */ mtc1 $zero, $f2 ## $f2 = 0.00 /* 005AC 809AE4CC 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 005B0 809AE4D0 46802020 */ cvt.s.w $f0, $f4 -/* 005B4 809AE4D4 44061000 */ mfc1 $a2, $f2 +/* 005B0 809AE4D0 46802020 */ cvt.s.w $f0, $f4 +/* 005B4 809AE4D4 44061000 */ mfc1 $a2, $f2 /* 005B8 809AE4D8 24A5033C */ addiu $a1, $a1, 0x033C ## $a1 = 0600033C /* 005BC 809AE4DC 26040164 */ addiu $a0, $s0, 0x0164 ## $a0 = 00000164 -/* 005C0 809AE4E0 AFA00014 */ sw $zero, 0x0014($sp) -/* 005C4 809AE4E4 E7A20018 */ swc1 $f2, 0x0018($sp) -/* 005C8 809AE4E8 44070000 */ mfc1 $a3, $f0 -/* 005CC 809AE4EC 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 005D0 809AE4F0 E7A00010 */ swc1 $f0, 0x0010($sp) +/* 005C0 809AE4E0 AFA00014 */ sw $zero, 0x0014($sp) +/* 005C4 809AE4E4 E7A20018 */ swc1 $f2, 0x0018($sp) +/* 005C8 809AE4E8 44070000 */ mfc1 $a3, $f0 +/* 005CC 809AE4EC 0C029468 */ jal SkelAnime_ChangeAnim + +/* 005D0 809AE4F0 E7A00010 */ swc1 $f0, 0x0010($sp) /* 005D4 809AE4F4 8E0E0004 */ lw $t6, 0x0004($s0) ## 00000004 /* 005D8 809AE4F8 44803000 */ mtc1 $zero, $f6 ## $f6 = 0.00 /* 005DC 809AE4FC 2401FFFE */ addiu $at, $zero, 0xFFFE ## $at = FFFFFFFE /* 005E0 809AE500 24180003 */ addiu $t8, $zero, 0x0003 ## $t8 = 00000003 /* 005E4 809AE504 3C05809B */ lui $a1, %hi(func_809AF30C) ## $a1 = 809B0000 -/* 005E8 809AE508 01C17824 */ and $t7, $t6, $at +/* 005E8 809AE508 01C17824 */ and $t7, $t6, $at /* 005EC 809AE50C AE0F0004 */ sw $t7, 0x0004($s0) ## 00000004 /* 005F0 809AE510 AE1801A8 */ sw $t8, 0x01A8($s0) ## 000001A8 /* 005F4 809AE514 24A5F30C */ addiu $a1, $a1, %lo(func_809AF30C) ## $a1 = 809AF30C /* 005F8 809AE518 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 005FC 809AE51C 0C26B7C8 */ jal func_809ADF20 +/* 005FC 809AE51C 0C26B7C8 */ jal func_809ADF20 /* 00600 809AE520 E6060068 */ swc1 $f6, 0x0068($s0) ## 00000068 -/* 00604 809AE524 8FBF002C */ lw $ra, 0x002C($sp) -/* 00608 809AE528 8FB00028 */ lw $s0, 0x0028($sp) +/* 00604 809AE524 8FBF002C */ lw $ra, 0x002C($sp) +/* 00608 809AE528 8FB00028 */ lw $s0, 0x0028($sp) /* 0060C 809AE52C 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 00610 809AE530 03E00008 */ jr $ra +/* 00610 809AE530 03E00008 */ jr $ra /* 00614 809AE534 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Am/func_809AE538.s b/asm/non_matchings/overlays/actors/ovl_En_Am/func_809AE538.s index 2778ec6ee5..b246a78566 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Am/func_809AE538.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Am/func_809AE538.s @@ -1,14 +1,14 @@ glabel func_809AE538 /* 00618 809AE538 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 0061C 809AE53C AFBF0014 */ sw $ra, 0x0014($sp) +/* 0061C 809AE53C AFBF0014 */ sw $ra, 0x0014($sp) /* 00620 809AE540 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 /* 00624 809AE544 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 00628 809AE548 24A50238 */ addiu $a1, $a1, 0x0238 ## $a1 = 06000238 -/* 0062C 809AE54C AFA70018 */ sw $a3, 0x0018($sp) +/* 0062C 809AE54C AFA70018 */ sw $a3, 0x0018($sp) /* 00630 809AE550 24840164 */ addiu $a0, $a0, 0x0164 ## $a0 = 00000164 -/* 00634 809AE554 0C0294E1 */ jal func_800A5384 +/* 00634 809AE554 0C0294E1 */ jal SkelAnime_ChangeAnimPlaybackRepeat /* 00638 809AE558 3C064080 */ lui $a2, 0x4080 ## $a2 = 40800000 -/* 0063C 809AE55C 8FA40018 */ lw $a0, 0x0018($sp) +/* 0063C 809AE55C 8FA40018 */ lw $a0, 0x0018($sp) /* 00640 809AE560 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 /* 00644 809AE564 240E0003 */ addiu $t6, $zero, 0x0003 ## $t6 = 00000003 /* 00648 809AE568 849800B6 */ lh $t8, 0x00B6($a0) ## 000000B6 @@ -18,11 +18,11 @@ glabel func_809AE538 /* 00658 809AE578 A48E0258 */ sh $t6, 0x0258($a0) ## 00000258 /* 0065C 809AE57C AC8F01A8 */ sw $t7, 0x01A8($a0) ## 000001A8 /* 00660 809AE580 E4840068 */ swc1 $f4, 0x0068($a0) ## 00000068 -/* 00664 809AE584 0C26B7C8 */ jal func_809ADF20 +/* 00664 809AE584 0C26B7C8 */ jal func_809ADF20 /* 00668 809AE588 A4980032 */ sh $t8, 0x0032($a0) ## 00000032 -/* 0066C 809AE58C 8FBF0014 */ lw $ra, 0x0014($sp) +/* 0066C 809AE58C 8FBF0014 */ lw $ra, 0x0014($sp) /* 00670 809AE590 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00674 809AE594 03E00008 */ jr $ra +/* 00674 809AE594 03E00008 */ jr $ra /* 00678 809AE598 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Am/func_809AE59C.s b/asm/non_matchings/overlays/actors/ovl_En_Am/func_809AE59C.s index 592b037e9e..6520213c07 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Am/func_809AE59C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Am/func_809AE59C.s @@ -1,14 +1,14 @@ glabel func_809AE59C /* 0067C 809AE59C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00680 809AE5A0 AFBF0014 */ sw $ra, 0x0014($sp) +/* 00680 809AE5A0 AFBF0014 */ sw $ra, 0x0014($sp) /* 00684 809AE5A4 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 /* 00688 809AE5A8 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 0068C 809AE5AC 24A50238 */ addiu $a1, $a1, 0x0238 ## $a1 = 06000238 -/* 00690 809AE5B0 AFA70018 */ sw $a3, 0x0018($sp) +/* 00690 809AE5B0 AFA70018 */ sw $a3, 0x0018($sp) /* 00694 809AE5B4 24840164 */ addiu $a0, $a0, 0x0164 ## $a0 = 00000164 -/* 00698 809AE5B8 0C0294E1 */ jal func_800A5384 +/* 00698 809AE5B8 0C0294E1 */ jal SkelAnime_ChangeAnimPlaybackRepeat /* 0069C 809AE5BC 3C064080 */ lui $a2, 0x4080 ## $a2 = 40800000 -/* 006A0 809AE5C0 8FA40018 */ lw $a0, 0x0018($sp) +/* 006A0 809AE5C0 8FA40018 */ lw $a0, 0x0018($sp) /* 006A4 809AE5C4 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 /* 006A8 809AE5C8 240E0003 */ addiu $t6, $zero, 0x0003 ## $t6 = 00000003 /* 006AC 809AE5CC 849900B6 */ lh $t9, 0x00B6($a0) ## 000000B6 @@ -20,11 +20,11 @@ glabel func_809AE59C /* 006C4 809AE5E4 A48F025A */ sh $t7, 0x025A($a0) ## 0000025A /* 006C8 809AE5E8 AC9801A8 */ sw $t8, 0x01A8($a0) ## 000001A8 /* 006CC 809AE5EC E4840068 */ swc1 $f4, 0x0068($a0) ## 00000068 -/* 006D0 809AE5F0 0C26B7C8 */ jal func_809ADF20 +/* 006D0 809AE5F0 0C26B7C8 */ jal func_809ADF20 /* 006D4 809AE5F4 A4990032 */ sh $t9, 0x0032($a0) ## 00000032 -/* 006D8 809AE5F8 8FBF0014 */ lw $ra, 0x0014($sp) +/* 006D8 809AE5F8 8FBF0014 */ lw $ra, 0x0014($sp) /* 006DC 809AE5FC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 006E0 809AE600 03E00008 */ jr $ra +/* 006E0 809AE600 03E00008 */ jr $ra /* 006E4 809AE604 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Am/func_809AE608.s b/asm/non_matchings/overlays/actors/ovl_En_Am/func_809AE608.s index b8ffee41a5..bf6548664d 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Am/func_809AE608.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Am/func_809AE608.s @@ -1,14 +1,14 @@ glabel func_809AE608 /* 006E8 809AE608 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 006EC 809AE60C AFBF0014 */ sw $ra, 0x0014($sp) +/* 006EC 809AE60C AFBF0014 */ sw $ra, 0x0014($sp) /* 006F0 809AE610 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 /* 006F4 809AE614 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 006F8 809AE618 24A50238 */ addiu $a1, $a1, 0x0238 ## $a1 = 06000238 -/* 006FC 809AE61C AFA70018 */ sw $a3, 0x0018($sp) +/* 006FC 809AE61C AFA70018 */ sw $a3, 0x0018($sp) /* 00700 809AE620 24840164 */ addiu $a0, $a0, 0x0164 ## $a0 = 00000164 -/* 00704 809AE624 0C0294E1 */ jal func_800A5384 +/* 00704 809AE624 0C0294E1 */ jal SkelAnime_ChangeAnimPlaybackRepeat /* 00708 809AE628 3C064080 */ lui $a2, 0x4080 ## $a2 = 40800000 -/* 0070C 809AE62C 8FA40018 */ lw $a0, 0x0018($sp) +/* 0070C 809AE62C 8FA40018 */ lw $a0, 0x0018($sp) /* 00710 809AE630 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 /* 00714 809AE634 240E0007 */ addiu $t6, $zero, 0x0007 ## $t6 = 00000007 /* 00718 809AE638 240F0001 */ addiu $t7, $zero, 0x0001 ## $t7 = 00000001 @@ -16,11 +16,11 @@ glabel func_809AE608 /* 00720 809AE640 24A5ED8C */ addiu $a1, $a1, %lo(func_809AED8C) ## $a1 = 809AED8C /* 00724 809AE644 AC8E01A8 */ sw $t6, 0x01A8($a0) ## 000001A8 /* 00728 809AE648 A48F0258 */ sh $t7, 0x0258($a0) ## 00000258 -/* 0072C 809AE64C 0C26B7C8 */ jal func_809ADF20 +/* 0072C 809AE64C 0C26B7C8 */ jal func_809ADF20 /* 00730 809AE650 E4840068 */ swc1 $f4, 0x0068($a0) ## 00000068 -/* 00734 809AE654 8FBF0014 */ lw $ra, 0x0014($sp) +/* 00734 809AE654 8FBF0014 */ lw $ra, 0x0014($sp) /* 00738 809AE658 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 0073C 809AE65C 03E00008 */ jr $ra +/* 0073C 809AE65C 03E00008 */ jr $ra /* 00740 809AE660 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Am/func_809AE664.s b/asm/non_matchings/overlays/actors/ovl_En_Am/func_809AE664.s index 633e1611ff..eb6abb7515 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Am/func_809AE664.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Am/func_809AE664.s @@ -1,14 +1,14 @@ glabel func_809AE664 /* 00744 809AE664 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00748 809AE668 AFBF0014 */ sw $ra, 0x0014($sp) +/* 00748 809AE668 AFBF0014 */ sw $ra, 0x0014($sp) /* 0074C 809AE66C 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 /* 00750 809AE670 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 00754 809AE674 24A50238 */ addiu $a1, $a1, 0x0238 ## $a1 = 06000238 -/* 00758 809AE678 AFA70018 */ sw $a3, 0x0018($sp) +/* 00758 809AE678 AFA70018 */ sw $a3, 0x0018($sp) /* 0075C 809AE67C 24840164 */ addiu $a0, $a0, 0x0164 ## $a0 = 00000164 -/* 00760 809AE680 0C0294E1 */ jal func_800A5384 +/* 00760 809AE680 0C0294E1 */ jal SkelAnime_ChangeAnimPlaybackRepeat /* 00764 809AE684 3C064080 */ lui $a2, 0x4080 ## $a2 = 40800000 -/* 00768 809AE688 8FA40018 */ lw $a0, 0x0018($sp) +/* 00768 809AE688 8FA40018 */ lw $a0, 0x0018($sp) /* 0076C 809AE68C 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 /* 00770 809AE690 240E0007 */ addiu $t6, $zero, 0x0007 ## $t6 = 00000007 /* 00774 809AE694 240F0001 */ addiu $t7, $zero, 0x0001 ## $t7 = 00000001 @@ -16,11 +16,11 @@ glabel func_809AE664 /* 0077C 809AE69C 24A5EC1C */ addiu $a1, $a1, %lo(func_809AEC1C) ## $a1 = 809AEC1C /* 00780 809AE6A0 AC8E01A8 */ sw $t6, 0x01A8($a0) ## 000001A8 /* 00784 809AE6A4 A48F0258 */ sh $t7, 0x0258($a0) ## 00000258 -/* 00788 809AE6A8 0C26B7C8 */ jal func_809ADF20 +/* 00788 809AE6A8 0C26B7C8 */ jal func_809ADF20 /* 0078C 809AE6AC E4840068 */ swc1 $f4, 0x0068($a0) ## 00000068 -/* 00790 809AE6B0 8FBF0014 */ lw $ra, 0x0014($sp) +/* 00790 809AE6B0 8FBF0014 */ lw $ra, 0x0014($sp) /* 00794 809AE6B4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00798 809AE6B8 03E00008 */ jr $ra +/* 00798 809AE6B8 03E00008 */ jr $ra /* 0079C 809AE6BC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Am/func_809AE6C0.s b/asm/non_matchings/overlays/actors/ovl_En_Am/func_809AE6C0.s index 94f004af97..380b57e367 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Am/func_809AE6C0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Am/func_809AE6C0.s @@ -1,14 +1,14 @@ glabel func_809AE6C0 /* 007A0 809AE6C0 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 007A4 809AE6C4 AFBF0014 */ sw $ra, 0x0014($sp) +/* 007A4 809AE6C4 AFBF0014 */ sw $ra, 0x0014($sp) /* 007A8 809AE6C8 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 /* 007AC 809AE6CC 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 007B0 809AE6D0 24A50238 */ addiu $a1, $a1, 0x0238 ## $a1 = 06000238 -/* 007B4 809AE6D4 AFA70018 */ sw $a3, 0x0018($sp) +/* 007B4 809AE6D4 AFA70018 */ sw $a3, 0x0018($sp) /* 007B8 809AE6D8 24840164 */ addiu $a0, $a0, 0x0164 ## $a0 = 00000164 -/* 007BC 809AE6DC 0C0294E1 */ jal func_800A5384 +/* 007BC 809AE6DC 0C0294E1 */ jal SkelAnime_ChangeAnimPlaybackRepeat /* 007C0 809AE6E0 3C064080 */ lui $a2, 0x4080 ## $a2 = 40800000 -/* 007C4 809AE6E4 8FA40018 */ lw $a0, 0x0018($sp) +/* 007C4 809AE6E4 8FA40018 */ lw $a0, 0x0018($sp) /* 007C8 809AE6E8 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 /* 007CC 809AE6EC 240E0007 */ addiu $t6, $zero, 0x0007 ## $t6 = 00000007 /* 007D0 809AE6F0 848F00B6 */ lh $t7, 0x00B6($a0) ## 000000B6 @@ -16,11 +16,11 @@ glabel func_809AE6C0 /* 007D8 809AE6F8 24A5EB14 */ addiu $a1, $a1, %lo(func_809AEB14) ## $a1 = 809AEB14 /* 007DC 809AE6FC AC8E01A8 */ sw $t6, 0x01A8($a0) ## 000001A8 /* 007E0 809AE700 E4840068 */ swc1 $f4, 0x0068($a0) ## 00000068 -/* 007E4 809AE704 0C26B7C8 */ jal func_809ADF20 +/* 007E4 809AE704 0C26B7C8 */ jal func_809ADF20 /* 007E8 809AE708 A48F0032 */ sh $t7, 0x0032($a0) ## 00000032 -/* 007EC 809AE70C 8FBF0014 */ lw $ra, 0x0014($sp) +/* 007EC 809AE70C 8FBF0014 */ lw $ra, 0x0014($sp) /* 007F0 809AE710 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 007F4 809AE714 03E00008 */ jr $ra +/* 007F4 809AE714 03E00008 */ jr $ra /* 007F8 809AE718 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Am/func_809AE71C.s b/asm/non_matchings/overlays/actors/ovl_En_Am/func_809AE71C.s index 707876ec5f..b8c4aed7fa 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Am/func_809AE71C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Am/func_809AE71C.s @@ -1,44 +1,44 @@ glabel func_809AE71C /* 007FC 809AE71C 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 00800 809AE720 AFB00028 */ sw $s0, 0x0028($sp) +/* 00800 809AE720 AFB00028 */ sw $s0, 0x0028($sp) /* 00804 809AE724 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00808 809AE728 AFBF002C */ sw $ra, 0x002C($sp) +/* 00808 809AE728 AFBF002C */ sw $ra, 0x002C($sp) /* 0080C 809AE72C 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 -/* 00810 809AE730 AFA50034 */ sw $a1, 0x0034($sp) +/* 00810 809AE730 AFA50034 */ sw $a1, 0x0034($sp) /* 00814 809AE734 0C028800 */ jal SkelAnime_GetFrameCount - + /* 00818 809AE738 24845B3C */ addiu $a0, $a0, 0x5B3C ## $a0 = 06005B3C /* 0081C 809AE73C 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 00820 809AE740 3C0140C0 */ lui $at, 0x40C0 ## $at = 40C00000 /* 00824 809AE744 44814000 */ mtc1 $at, $f8 ## $f8 = 6.00 -/* 00828 809AE748 468021A0 */ cvt.s.w $f6, $f4 +/* 00828 809AE748 468021A0 */ cvt.s.w $f6, $f4 /* 0082C 809AE74C 44808000 */ mtc1 $zero, $f16 ## $f16 = 0.00 /* 00830 809AE750 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 00834 809AE754 240E0002 */ addiu $t6, $zero, 0x0002 ## $t6 = 00000002 -/* 00838 809AE758 AFAE0014 */ sw $t6, 0x0014($sp) +/* 00838 809AE758 AFAE0014 */ sw $t6, 0x0014($sp) /* 0083C 809AE75C 24A55B3C */ addiu $a1, $a1, 0x5B3C ## $a1 = 06005B3C -/* 00840 809AE760 46083281 */ sub.s $f10, $f6, $f8 +/* 00840 809AE760 46083281 */ sub.s $f10, $f6, $f8 /* 00844 809AE764 26040164 */ addiu $a0, $s0, 0x0164 ## $a0 = 00000164 /* 00848 809AE768 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 0084C 809AE76C 3C074080 */ lui $a3, 0x4080 ## $a3 = 40800000 -/* 00850 809AE770 E7AA0010 */ swc1 $f10, 0x0010($sp) -/* 00854 809AE774 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 00858 809AE778 E7B00018 */ swc1 $f16, 0x0018($sp) +/* 00850 809AE770 E7AA0010 */ swc1 $f10, 0x0010($sp) +/* 00854 809AE774 0C029468 */ jal SkelAnime_ChangeAnim + +/* 00858 809AE778 E7B00018 */ swc1 $f16, 0x0018($sp) /* 0085C 809AE77C 8618008A */ lh $t8, 0x008A($s0) ## 0000008A /* 00860 809AE780 240F0001 */ addiu $t7, $zero, 0x0001 ## $t7 = 00000001 /* 00864 809AE784 AE0F01A8 */ sw $t7, 0x01A8($s0) ## 000001A8 /* 00868 809AE788 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 0086C 809AE78C 24053847 */ addiu $a1, $zero, 0x3847 ## $a1 = 00003847 /* 00870 809AE790 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 00874 809AE794 A6180032 */ sh $t8, 0x0032($s0) ## 00000032 /* 00878 809AE798 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0087C 809AE79C 8FA50034 */ lw $a1, 0x0034($sp) +/* 0087C 809AE79C 8FA50034 */ lw $a1, 0x0034($sp) /* 00880 809AE7A0 3C06C0C0 */ lui $a2, 0xC0C0 ## $a2 = C0C00000 -/* 00884 809AE7A4 0C26B7CA */ jal func_809ADF28 +/* 00884 809AE7A4 0C26B7CA */ jal func_809ADF28 /* 00888 809AE7A8 86070032 */ lh $a3, 0x0032($s0) ## 00000032 -/* 0088C 809AE7AC 10400005 */ beq $v0, $zero, .L809AE7C4 +/* 0088C 809AE7AC 10400005 */ beq $v0, $zero, .L809AE7C4 /* 00890 809AE7B0 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 00894 809AE7B4 3C01C0C0 */ lui $at, 0xC0C0 ## $at = C0C00000 /* 00898 809AE7B8 44819000 */ mtc1 $at, $f18 ## $f18 = -6.00 @@ -46,16 +46,16 @@ glabel func_809AE71C /* 008A0 809AE7C0 E6120068 */ swc1 $f18, 0x0068($s0) ## 00000068 .L809AE7C4: /* 008A4 809AE7C4 A2000114 */ sb $zero, 0x0114($s0) ## 00000114 -/* 008A8 809AE7C8 0C00CB1F */ jal func_80032C7C -/* 008AC 809AE7CC 8FA40034 */ lw $a0, 0x0034($sp) +/* 008A8 809AE7C8 0C00CB1F */ jal func_80032C7C +/* 008AC 809AE7CC 8FA40034 */ lw $a0, 0x0034($sp) /* 008B0 809AE7D0 3C05809B */ lui $a1, %hi(func_809AEF00) ## $a1 = 809B0000 /* 008B4 809AE7D4 24A5EF00 */ addiu $a1, $a1, %lo(func_809AEF00) ## $a1 = 809AEF00 -/* 008B8 809AE7D8 0C26B7C8 */ jal func_809ADF20 +/* 008B8 809AE7D8 0C26B7C8 */ jal func_809ADF20 /* 008BC 809AE7DC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 008C0 809AE7E0 8FBF002C */ lw $ra, 0x002C($sp) -/* 008C4 809AE7E4 8FB00028 */ lw $s0, 0x0028($sp) +/* 008C0 809AE7E0 8FBF002C */ lw $ra, 0x002C($sp) +/* 008C4 809AE7E4 8FB00028 */ lw $s0, 0x0028($sp) /* 008C8 809AE7E8 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 008CC 809AE7EC 03E00008 */ jr $ra +/* 008CC 809AE7EC 03E00008 */ jr $ra /* 008D0 809AE7F0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Am/func_809AE7F4.s b/asm/non_matchings/overlays/actors/ovl_En_Am/func_809AE7F4.s index a5f72d04ff..ed98992773 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Am/func_809AE7F4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Am/func_809AE7F4.s @@ -3,29 +3,29 @@ glabel func_809AE7F4 /* 008D8 809AE7F8 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 /* 008DC 809AE7FC 3C014100 */ lui $at, 0x4100 ## $at = 41000000 /* 008E0 809AE800 44812000 */ mtc1 $at, $f4 ## $f4 = 8.00 -/* 008E4 809AE804 AFB00028 */ sw $s0, 0x0028($sp) -/* 008E8 809AE808 AFA50034 */ sw $a1, 0x0034($sp) +/* 008E4 809AE804 AFB00028 */ sw $s0, 0x0028($sp) +/* 008E8 809AE808 AFA50034 */ sw $a1, 0x0034($sp) /* 008EC 809AE80C 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 008F0 809AE810 AFBF002C */ sw $ra, 0x002C($sp) +/* 008F0 809AE810 AFBF002C */ sw $ra, 0x002C($sp) /* 008F4 809AE814 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 008F8 809AE818 240E0002 */ addiu $t6, $zero, 0x0002 ## $t6 = 00000002 -/* 008FC 809AE81C 44070000 */ mfc1 $a3, $f0 -/* 00900 809AE820 AFAE0014 */ sw $t6, 0x0014($sp) +/* 008FC 809AE81C 44070000 */ mfc1 $a3, $f0 +/* 00900 809AE820 AFAE0014 */ sw $t6, 0x0014($sp) /* 00904 809AE824 24A5033C */ addiu $a1, $a1, 0x033C ## $a1 = 0600033C /* 00908 809AE828 24840164 */ addiu $a0, $a0, 0x0164 ## $a0 = 00000164 /* 0090C 809AE82C 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 00910 809AE830 E7A00018 */ swc1 $f0, 0x0018($sp) -/* 00914 809AE834 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 00918 809AE838 E7A40010 */ swc1 $f4, 0x0010($sp) +/* 00910 809AE830 E7A00018 */ swc1 $f0, 0x0018($sp) +/* 00914 809AE834 0C029468 */ jal SkelAnime_ChangeAnim + +/* 00918 809AE838 E7A40010 */ swc1 $f4, 0x0010($sp) /* 0091C 809AE83C 860F008A */ lh $t7, 0x008A($s0) ## 0000008A /* 00920 809AE840 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 00924 809AE844 3C06C0C0 */ lui $a2, 0xC0C0 ## $a2 = C0C00000 /* 00928 809AE848 A60F0032 */ sh $t7, 0x0032($s0) ## 00000032 /* 0092C 809AE84C 86070032 */ lh $a3, 0x0032($s0) ## 00000032 -/* 00930 809AE850 0C26B7CA */ jal func_809ADF28 -/* 00934 809AE854 8FA50034 */ lw $a1, 0x0034($sp) -/* 00938 809AE858 10400005 */ beq $v0, $zero, .L809AE870 +/* 00930 809AE850 0C26B7CA */ jal func_809ADF28 +/* 00934 809AE854 8FA50034 */ lw $a1, 0x0034($sp) +/* 00938 809AE858 10400005 */ beq $v0, $zero, .L809AE870 /* 0093C 809AE85C 24180005 */ addiu $t8, $zero, 0x0005 ## $t8 = 00000005 /* 00940 809AE860 3C01C0C0 */ lui $at, 0xC0C0 ## $at = C0C00000 /* 00944 809AE864 44813000 */ mtc1 $at, $f6 ## $f6 = -6.00 @@ -39,12 +39,12 @@ glabel func_809AE7F4 /* 00960 809AE880 A618025A */ sh $t8, 0x025A($s0) ## 0000025A /* 00964 809AE884 AE1901A8 */ sw $t9, 0x01A8($s0) ## 000001A8 /* 00968 809AE888 24A5F718 */ addiu $a1, $a1, %lo(func_809AF718) ## $a1 = 809AF718 -/* 0096C 809AE88C 0C26B7C8 */ jal func_809ADF20 +/* 0096C 809AE88C 0C26B7C8 */ jal func_809ADF20 /* 00970 809AE890 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00974 809AE894 8FBF002C */ lw $ra, 0x002C($sp) -/* 00978 809AE898 8FB00028 */ lw $s0, 0x0028($sp) +/* 00974 809AE894 8FBF002C */ lw $ra, 0x002C($sp) +/* 00978 809AE898 8FB00028 */ lw $s0, 0x0028($sp) /* 0097C 809AE89C 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 00980 809AE8A0 03E00008 */ jr $ra +/* 00980 809AE8A0 03E00008 */ jr $ra /* 00984 809AE8A4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Am/func_809AF558.s b/asm/non_matchings/overlays/actors/ovl_En_Am/func_809AF558.s index 4ed6a03520..29f76d6e4c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Am/func_809AF558.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Am/func_809AF558.s @@ -1,35 +1,35 @@ glabel func_809AF558 /* 01638 809AF558 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 0163C 809AF55C AFB00028 */ sw $s0, 0x0028($sp) +/* 0163C 809AF55C AFB00028 */ sw $s0, 0x0028($sp) /* 01640 809AF560 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 01644 809AF564 AFBF002C */ sw $ra, 0x002C($sp) +/* 01644 809AF564 AFBF002C */ sw $ra, 0x002C($sp) /* 01648 809AF568 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 -/* 0164C 809AF56C AFA50034 */ sw $a1, 0x0034($sp) +/* 0164C 809AF56C AFA50034 */ sw $a1, 0x0034($sp) /* 01650 809AF570 0C028800 */ jal SkelAnime_GetFrameCount - + /* 01654 809AF574 24845B3C */ addiu $a0, $a0, 0x5B3C ## $a0 = 06005B3C /* 01658 809AF578 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 0165C 809AF57C 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 /* 01660 809AF580 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 01664 809AF584 468021A0 */ cvt.s.w $f6, $f4 +/* 01664 809AF584 468021A0 */ cvt.s.w $f6, $f4 /* 01668 809AF588 240E0002 */ addiu $t6, $zero, 0x0002 ## $t6 = 00000002 -/* 0166C 809AF58C 44070000 */ mfc1 $a3, $f0 -/* 01670 809AF590 AFAE0014 */ sw $t6, 0x0014($sp) +/* 0166C 809AF58C 44070000 */ mfc1 $a3, $f0 +/* 01670 809AF590 AFAE0014 */ sw $t6, 0x0014($sp) /* 01674 809AF594 24A55B3C */ addiu $a1, $a1, 0x5B3C ## $a1 = 06005B3C /* 01678 809AF598 26040164 */ addiu $a0, $s0, 0x0164 ## $a0 = 00000164 -/* 0167C 809AF59C E7A60010 */ swc1 $f6, 0x0010($sp) +/* 0167C 809AF59C E7A60010 */ swc1 $f6, 0x0010($sp) /* 01680 809AF5A0 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 01684 809AF5A4 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 01688 809AF5A8 E7A00018 */ swc1 $f0, 0x0018($sp) +/* 01684 809AF5A4 0C029468 */ jal SkelAnime_ChangeAnim + +/* 01688 809AF5A8 E7A00018 */ swc1 $f0, 0x0018($sp) /* 0168C 809AF5AC 860F008A */ lh $t7, 0x008A($s0) ## 0000008A /* 01690 809AF5B0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 01694 809AF5B4 3C06C0C0 */ lui $a2, 0xC0C0 ## $a2 = C0C00000 /* 01698 809AF5B8 A60F0032 */ sh $t7, 0x0032($s0) ## 00000032 /* 0169C 809AF5BC 86070032 */ lh $a3, 0x0032($s0) ## 00000032 -/* 016A0 809AF5C0 0C26B7CA */ jal func_809ADF28 -/* 016A4 809AF5C4 8FA50034 */ lw $a1, 0x0034($sp) -/* 016A8 809AF5C8 10400005 */ beq $v0, $zero, .L809AF5E0 +/* 016A0 809AF5C0 0C26B7CA */ jal func_809ADF28 +/* 016A4 809AF5C4 8FA50034 */ lw $a1, 0x0034($sp) +/* 016A8 809AF5C8 10400005 */ beq $v0, $zero, .L809AF5E0 /* 016AC 809AF5CC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 016B0 809AF5D0 3C01C0C0 */ lui $at, 0xC0C0 ## $at = C0C00000 /* 016B4 809AF5D4 44814000 */ mtc1 $at, $f8 ## $f8 = -6.00 @@ -37,31 +37,31 @@ glabel func_809AF558 /* 016BC 809AF5DC E6080068 */ swc1 $f8, 0x0068($s0) ## 00000068 .L809AF5E0: /* 016C0 809AF5E0 24180064 */ addiu $t8, $zero, 0x0064 ## $t8 = 00000064 -/* 016C4 809AF5E4 AFB80010 */ sw $t8, 0x0010($sp) +/* 016C4 809AF5E4 AFB80010 */ sw $t8, 0x0010($sp) /* 016C8 809AF5E8 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 016CC 809AF5EC 24060078 */ addiu $a2, $zero, 0x0078 ## $a2 = 00000078 -/* 016D0 809AF5F0 0C00D09B */ jal func_8003426C +/* 016D0 809AF5F0 0C00D09B */ jal func_8003426C /* 016D4 809AF5F4 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 /* 016D8 809AF5F8 92190267 */ lbu $t9, 0x0267($s0) ## 00000267 /* 016DC 809AF5FC 2401000D */ addiu $at, $zero, 0x000D ## $at = 0000000D /* 016E0 809AF600 24090006 */ addiu $t1, $zero, 0x0006 ## $t1 = 00000006 -/* 016E4 809AF604 17210003 */ bne $t9, $at, .L809AF614 +/* 016E4 809AF604 17210003 */ bne $t9, $at, .L809AF614 /* 016E8 809AF608 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 016EC 809AF60C 24080030 */ addiu $t0, $zero, 0x0030 ## $t0 = 00000030 /* 016F0 809AF610 A608025E */ sh $t0, 0x025E($s0) ## 0000025E .L809AF614: /* 016F4 809AF614 AE0901A8 */ sw $t1, 0x01A8($s0) ## 000001A8 /* 016F8 809AF618 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 016FC 809AF61C 2405389E */ addiu $a1, $zero, 0x389E ## $a1 = 0000389E /* 01700 809AF620 3C05809B */ lui $a1, %hi(func_809AF644) ## $a1 = 809B0000 /* 01704 809AF624 24A5F644 */ addiu $a1, $a1, %lo(func_809AF644) ## $a1 = 809AF644 -/* 01708 809AF628 0C26B7C8 */ jal func_809ADF20 +/* 01708 809AF628 0C26B7C8 */ jal func_809ADF20 /* 0170C 809AF62C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01710 809AF630 8FBF002C */ lw $ra, 0x002C($sp) -/* 01714 809AF634 8FB00028 */ lw $s0, 0x0028($sp) +/* 01710 809AF630 8FBF002C */ lw $ra, 0x002C($sp) +/* 01714 809AF634 8FB00028 */ lw $s0, 0x0028($sp) /* 01718 809AF638 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 0171C 809AF63C 03E00008 */ jr $ra +/* 0171C 809AF63C 03E00008 */ jr $ra /* 01720 809AF640 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ani/EnAni_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Ani/EnAni_Draw.s index 324925d43b..8292062185 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ani/EnAni_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ani/EnAni_Draw.s @@ -1,20 +1,20 @@ glabel EnAni_Draw /* 00AA4 809B0E14 27BDFFA8 */ addiu $sp, $sp, 0xFFA8 ## $sp = FFFFFFA8 -/* 00AA8 809B0E18 AFBF002C */ sw $ra, 0x002C($sp) -/* 00AAC 809B0E1C AFB00028 */ sw $s0, 0x0028($sp) -/* 00AB0 809B0E20 AFA5005C */ sw $a1, 0x005C($sp) +/* 00AA8 809B0E18 AFBF002C */ sw $ra, 0x002C($sp) +/* 00AAC 809B0E1C AFB00028 */ sw $s0, 0x0028($sp) +/* 00AB0 809B0E20 AFA5005C */ sw $a1, 0x005C($sp) /* 00AB4 809B0E24 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 /* 00AB8 809B0E28 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 00ABC 809B0E2C 3C06809B */ lui $a2, %hi(D_809B0F90) ## $a2 = 809B0000 /* 00AC0 809B0E30 24C60F90 */ addiu $a2, $a2, %lo(D_809B0F90) ## $a2 = 809B0F90 /* 00AC4 809B0E34 27A4003C */ addiu $a0, $sp, 0x003C ## $a0 = FFFFFFE4 /* 00AC8 809B0E38 240702CF */ addiu $a3, $zero, 0x02CF ## $a3 = 000002CF -/* 00ACC 809B0E3C 0C031AB1 */ jal func_800C6AC4 -/* 00AD0 809B0E40 AFA5004C */ sw $a1, 0x004C($sp) -/* 00AD4 809B0E44 8FAF005C */ lw $t7, 0x005C($sp) -/* 00AD8 809B0E48 0C0250F2 */ jal func_800943C8 +/* 00ACC 809B0E3C 0C031AB1 */ jal Graph_OpenDisps +/* 00AD0 809B0E40 AFA5004C */ sw $a1, 0x004C($sp) +/* 00AD4 809B0E44 8FAF005C */ lw $t7, 0x005C($sp) +/* 00AD8 809B0E48 0C0250F2 */ jal func_800943C8 /* 00ADC 809B0E4C 8DE40000 */ lw $a0, 0x0000($t7) ## 00000000 -/* 00AE0 809B0E50 8FA5004C */ lw $a1, 0x004C($sp) +/* 00AE0 809B0E50 8FA5004C */ lw $a1, 0x004C($sp) /* 00AE4 809B0E54 3C19DB06 */ lui $t9, 0xDB06 ## $t9 = DB060000 /* 00AE8 809B0E58 37390020 */ ori $t9, $t9, 0x0020 ## $t9 = DB060020 /* 00AEC 809B0E5C 8CA302C0 */ lw $v1, 0x02C0($a1) ## 000002C0 @@ -26,42 +26,42 @@ glabel EnAni_Draw /* 00B04 809B0E74 860802AC */ lh $t0, 0x02AC($s0) ## 000002AC /* 00B08 809B0E78 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 /* 00B0C 809B0E7C 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF -/* 00B10 809B0E80 00084880 */ sll $t1, $t0, 2 -/* 00B14 809B0E84 00892021 */ addu $a0, $a0, $t1 -/* 00B18 809B0E88 8C840F80 */ lw $a0, %lo(D_809B0F80)($a0) +/* 00B10 809B0E80 00084880 */ sll $t1, $t0, 2 +/* 00B14 809B0E84 00892021 */ addu $a0, $a0, $t1 +/* 00B18 809B0E88 8C840F80 */ lw $a0, %lo(D_809B0F80)($a0) /* 00B1C 809B0E8C 3C08809B */ lui $t0, %hi(func_809B0DD4) ## $t0 = 809B0000 /* 00B20 809B0E90 3C19809B */ lui $t9, %hi(func_809B0D90) ## $t9 = 809B0000 -/* 00B24 809B0E94 00045900 */ sll $t3, $a0, 4 -/* 00B28 809B0E98 000B6702 */ srl $t4, $t3, 28 -/* 00B2C 809B0E9C 000C6880 */ sll $t5, $t4, 2 -/* 00B30 809B0EA0 01CD7021 */ addu $t6, $t6, $t5 +/* 00B24 809B0E94 00045900 */ sll $t3, $a0, 4 +/* 00B28 809B0E98 000B6702 */ srl $t4, $t3, 28 +/* 00B2C 809B0E9C 000C6880 */ sll $t5, $t4, 2 +/* 00B30 809B0EA0 01CD7021 */ addu $t6, $t6, $t5 /* 00B34 809B0EA4 8DCE6FA8 */ lw $t6, 0x6FA8($t6) ## 80166FA8 -/* 00B38 809B0EA8 00815024 */ and $t2, $a0, $at +/* 00B38 809B0EA8 00815024 */ and $t2, $a0, $at /* 00B3C 809B0EAC 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 00B40 809B0EB0 014E7821 */ addu $t7, $t2, $t6 -/* 00B44 809B0EB4 01E1C021 */ addu $t8, $t7, $at +/* 00B40 809B0EB0 014E7821 */ addu $t7, $t2, $t6 +/* 00B44 809B0EB4 01E1C021 */ addu $t8, $t7, $at /* 00B48 809B0EB8 AC780004 */ sw $t8, 0x0004($v1) ## 00000004 /* 00B4C 809B0EBC 9207019A */ lbu $a3, 0x019A($s0) ## 0000019A /* 00B50 809B0EC0 8E0601B8 */ lw $a2, 0x01B8($s0) ## 000001B8 /* 00B54 809B0EC4 8E05019C */ lw $a1, 0x019C($s0) ## 0000019C /* 00B58 809B0EC8 27390D90 */ addiu $t9, $t9, %lo(func_809B0D90) ## $t9 = 809B0D90 /* 00B5C 809B0ECC 25080DD4 */ addiu $t0, $t0, %lo(func_809B0DD4) ## $t0 = 809B0DD4 -/* 00B60 809B0ED0 AFA80014 */ sw $t0, 0x0014($sp) -/* 00B64 809B0ED4 AFB90010 */ sw $t9, 0x0010($sp) -/* 00B68 809B0ED8 AFB00018 */ sw $s0, 0x0018($sp) -/* 00B6C 809B0EDC 0C0286B2 */ jal func_800A1AC8 -/* 00B70 809B0EE0 8FA4005C */ lw $a0, 0x005C($sp) -/* 00B74 809B0EE4 8FA9005C */ lw $t1, 0x005C($sp) +/* 00B60 809B0ED0 AFA80014 */ sw $t0, 0x0014($sp) +/* 00B64 809B0ED4 AFB90010 */ sw $t9, 0x0010($sp) +/* 00B68 809B0ED8 AFB00018 */ sw $s0, 0x0018($sp) +/* 00B6C 809B0EDC 0C0286B2 */ jal SkelAnime_DrawSV +/* 00B70 809B0EE0 8FA4005C */ lw $a0, 0x005C($sp) +/* 00B74 809B0EE4 8FA9005C */ lw $t1, 0x005C($sp) /* 00B78 809B0EE8 3C06809B */ lui $a2, %hi(D_809B0FA0) ## $a2 = 809B0000 /* 00B7C 809B0EEC 24C60FA0 */ addiu $a2, $a2, %lo(D_809B0FA0) ## $a2 = 809B0FA0 /* 00B80 809B0EF0 27A4003C */ addiu $a0, $sp, 0x003C ## $a0 = FFFFFFE4 /* 00B84 809B0EF4 240702E0 */ addiu $a3, $zero, 0x02E0 ## $a3 = 000002E0 -/* 00B88 809B0EF8 0C031AD5 */ jal func_800C6B54 +/* 00B88 809B0EF8 0C031AD5 */ jal Graph_CloseDisps /* 00B8C 809B0EFC 8D250000 */ lw $a1, 0x0000($t1) ## 00000000 -/* 00B90 809B0F00 8FBF002C */ lw $ra, 0x002C($sp) -/* 00B94 809B0F04 8FB00028 */ lw $s0, 0x0028($sp) +/* 00B90 809B0F00 8FBF002C */ lw $ra, 0x002C($sp) +/* 00B94 809B0F04 8FB00028 */ lw $s0, 0x0028($sp) /* 00B98 809B0F08 27BD0058 */ addiu $sp, $sp, 0x0058 ## $sp = 00000000 -/* 00B9C 809B0F0C 03E00008 */ jr $ra +/* 00B9C 809B0F0C 03E00008 */ jr $ra /* 00BA0 809B0F10 00000000 */ nop /* 00BA4 809B0F14 00000000 */ nop /* 00BA8 809B0F18 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ani/EnAni_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Ani/EnAni_Init.s index 9985e2433d..1e050b6b26 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ani/EnAni_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ani/EnAni_Init.s @@ -1,19 +1,19 @@ glabel EnAni_Init /* 00008 809B0378 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 -/* 0000C 809B037C AFA50044 */ sw $a1, 0x0044($sp) -/* 00010 809B0380 AFBF002C */ sw $ra, 0x002C($sp) -/* 00014 809B0384 AFB00028 */ sw $s0, 0x0028($sp) +/* 0000C 809B037C AFA50044 */ sw $a1, 0x0044($sp) +/* 00010 809B0380 AFBF002C */ sw $ra, 0x002C($sp) +/* 00014 809B0384 AFB00028 */ sw $s0, 0x0028($sp) /* 00018 809B0388 3C05809B */ lui $a1, %hi(D_809B0F6C) ## $a1 = 809B0000 /* 0001C 809B038C 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 00020 809B0390 0C01E037 */ jal Actor_ProcessInitChain - + /* 00024 809B0394 24A50F6C */ addiu $a1, $a1, %lo(D_809B0F6C) ## $a1 = 809B0F6C /* 00028 809B0398 3C068003 */ lui $a2, 0x8003 ## $a2 = 80030000 /* 0002C 809B039C 24C6B5EC */ addiu $a2, $a2, 0xB5EC ## $a2 = 8002B5EC /* 00030 809B03A0 260400B4 */ addiu $a0, $s0, 0x00B4 ## $a0 = 000000B4 /* 00034 809B03A4 3C05C52F */ lui $a1, 0xC52F ## $a1 = C52F0000 /* 00038 809B03A8 0C00AC78 */ jal ActorShape_Init - + /* 0003C 809B03AC 3C074210 */ lui $a3, 0x4210 ## $a3 = 42100000 /* 00040 809B03B0 26050198 */ addiu $a1, $s0, 0x0198 ## $a1 = 00000198 /* 00044 809B03B4 3C060600 */ lui $a2, 0x0600 ## $a2 = 06000000 @@ -21,29 +21,29 @@ glabel EnAni_Init /* 0004C 809B03BC 260E01DC */ addiu $t6, $s0, 0x01DC ## $t6 = 000001DC /* 00050 809B03C0 260F023C */ addiu $t7, $s0, 0x023C ## $t7 = 0000023C /* 00054 809B03C4 24180010 */ addiu $t8, $zero, 0x0010 ## $t8 = 00000010 -/* 00058 809B03C8 AFB80018 */ sw $t8, 0x0018($sp) -/* 0005C 809B03CC AFAF0014 */ sw $t7, 0x0014($sp) -/* 00060 809B03D0 AFAE0010 */ sw $t6, 0x0010($sp) +/* 00058 809B03C8 AFB80018 */ sw $t8, 0x0018($sp) +/* 0005C 809B03CC AFAF0014 */ sw $t7, 0x0014($sp) +/* 00060 809B03D0 AFAE0010 */ sw $t6, 0x0010($sp) /* 00064 809B03D4 24E776EC */ addiu $a3, $a3, 0x76EC ## $a3 = 060076EC /* 00068 809B03D8 24C600F0 */ addiu $a2, $a2, 0x00F0 ## $a2 = 060000F0 -/* 0006C 809B03DC AFA50034 */ sw $a1, 0x0034($sp) -/* 00070 809B03E0 0C0291BE */ jal func_800A46F8 -/* 00074 809B03E4 8FA40044 */ lw $a0, 0x0044($sp) +/* 0006C 809B03DC AFA50034 */ sw $a1, 0x0034($sp) +/* 00070 809B03E0 0C0291BE */ jal SkelAnime_InitSV +/* 00074 809B03E4 8FA40044 */ lw $a0, 0x0044($sp) /* 00078 809B03E8 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 0007C 809B03EC 24A576EC */ addiu $a1, $a1, 0x76EC ## $a1 = 060076EC -/* 00080 809B03F0 0C02947A */ jal func_800A51E8 -/* 00084 809B03F4 8FA40034 */ lw $a0, 0x0034($sp) +/* 00080 809B03F0 0C02947A */ jal SkelAnime_ChangeAnimDefaultStop +/* 00084 809B03F4 8FA40034 */ lw $a0, 0x0034($sp) /* 00088 809B03F8 2605014C */ addiu $a1, $s0, 0x014C ## $a1 = 0000014C -/* 0008C 809B03FC AFA50034 */ sw $a1, 0x0034($sp) +/* 0008C 809B03FC AFA50034 */ sw $a1, 0x0034($sp) /* 00090 809B0400 0C0170D9 */ jal ActorCollider_AllocCylinder - -/* 00094 809B0404 8FA40044 */ lw $a0, 0x0044($sp) + +/* 00094 809B0404 8FA40044 */ lw $a0, 0x0044($sp) /* 00098 809B0408 3C07809B */ lui $a3, %hi(D_809B0F40) ## $a3 = 809B0000 -/* 0009C 809B040C 8FA50034 */ lw $a1, 0x0034($sp) +/* 0009C 809B040C 8FA50034 */ lw $a1, 0x0034($sp) /* 000A0 809B0410 24E70F40 */ addiu $a3, $a3, %lo(D_809B0F40) ## $a3 = 809B0F40 -/* 000A4 809B0414 8FA40044 */ lw $a0, 0x0044($sp) +/* 000A4 809B0414 8FA40044 */ lw $a0, 0x0044($sp) /* 000A8 809B0418 0C01712B */ jal ActorCollider_InitCylinder - + /* 000AC 809B041C 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 000B0 809B0420 241900FF */ addiu $t9, $zero, 0x00FF ## $t9 = 000000FF /* 000B4 809B0424 A21900AE */ sb $t9, 0x00AE($s0) ## 000000AE @@ -51,16 +51,16 @@ glabel EnAni_Init /* 000BC 809B042C 8D08E664 */ lw $t0, -0x199C($t0) ## 8015E664 /* 000C0 809B0430 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 000C4 809B0434 3C05809B */ lui $a1, %hi(func_809B07F8) ## $a1 = 809B0000 -/* 000C8 809B0438 11000007 */ beq $t0, $zero, .L809B0458 +/* 000C8 809B0438 11000007 */ beq $t0, $zero, .L809B0458 /* 000CC 809B043C 00000000 */ nop /* 000D0 809B0440 3C05809B */ lui $a1, %hi(func_809B064C) ## $a1 = 809B0000 /* 000D4 809B0444 24A5064C */ addiu $a1, $a1, %lo(func_809B064C) ## $a1 = 809B064C -/* 000D8 809B0448 0C26C0DC */ jal func_809B0370 +/* 000D8 809B0448 0C26C0DC */ jal func_809B0370 /* 000DC 809B044C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 000E0 809B0450 10000004 */ beq $zero, $zero, .L809B0464 +/* 000E0 809B0450 10000004 */ beq $zero, $zero, .L809B0464 /* 000E4 809B0454 3C01BF80 */ lui $at, 0xBF80 ## $at = BF800000 .L809B0458: -/* 000E8 809B0458 0C26C0DC */ jal func_809B0370 +/* 000E8 809B0458 0C26C0DC */ jal func_809B0370 /* 000EC 809B045C 24A507F8 */ addiu $a1, $a1, %lo(func_809B07F8) ## $a1 = 000007F8 /* 000F0 809B0460 3C01BF80 */ lui $at, 0xBF80 ## $at = BF800000 .L809B0464: @@ -69,10 +69,10 @@ glabel EnAni_Init /* 000FC 809B046C A60002A8 */ sh $zero, 0x02A8($s0) ## 000002A8 /* 00100 809B0470 E6000070 */ swc1 $f0, 0x0070($s0) ## 00000070 /* 00104 809B0474 E6000060 */ swc1 $f0, 0x0060($s0) ## 00000060 -/* 00108 809B0478 8FBF002C */ lw $ra, 0x002C($sp) -/* 0010C 809B047C 8FB00028 */ lw $s0, 0x0028($sp) +/* 00108 809B0478 8FBF002C */ lw $ra, 0x002C($sp) +/* 0010C 809B047C 8FB00028 */ lw $s0, 0x0028($sp) /* 00110 809B0480 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 -/* 00114 809B0484 03E00008 */ jr $ra +/* 00114 809B0484 03E00008 */ jr $ra /* 00118 809B0488 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ani/func_809B064C.s b/asm/non_matchings/overlays/actors/ovl_En_Ani/func_809B064C.s index 8fdaaa796d..60bf27aa84 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ani/func_809B064C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ani/func_809B064C.s @@ -5,7 +5,7 @@ glabel func_809B064C /* 002E8 809B0658 AFA50024 */ sw $a1, 0x0024($sp) /* 002EC 809B065C 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 /* 002F0 809B0660 2405000A */ addiu $a1, $zero, 0x000A ## $a1 = 0000000A -/* 002F4 809B0664 0C01B0D8 */ jal func_8006C360 +/* 002F4 809B0664 0C01B0D8 */ jal Text_GetFaceReaction /* 002F8 809B0668 AFA70020 */ sw $a3, 0x0020($sp) /* 002FC 809B066C 8FA50024 */ lw $a1, 0x0024($sp) /* 00300 809B0670 8FA70020 */ lw $a3, 0x0020($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ani/func_809B0994.s b/asm/non_matchings/overlays/actors/ovl_En_Ani/func_809B0994.s index 74c36ff7bc..5d88fbdc16 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ani/func_809B0994.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ani/func_809B0994.s @@ -1,43 +1,43 @@ glabel func_809B0994 /* 00624 809B0994 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 00628 809B0998 AFBF0024 */ sw $ra, 0x0024($sp) -/* 0062C 809B099C AFA40028 */ sw $a0, 0x0028($sp) +/* 00628 809B0998 AFBF0024 */ sw $ra, 0x0024($sp) +/* 0062C 809B099C AFA40028 */ sw $a0, 0x0028($sp) /* 00630 809B09A0 8CAE1D8C */ lw $t6, 0x1D8C($a1) ## 00001D8C /* 00634 809B09A4 24010004 */ addiu $at, $zero, 0x0004 ## $at = 00000004 /* 00638 809B09A8 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 /* 0063C 809B09AC 95CF0000 */ lhu $t7, 0x0000($t6) ## 00000000 -/* 00640 809B09B0 55E1001A */ bnel $t7, $at, .L809B0A1C -/* 00644 809B09B4 8FBF0024 */ lw $ra, 0x0024($sp) +/* 00640 809B09B0 55E1001A */ bnel $t7, $at, .L809B0A1C +/* 00644 809B09B4 8FBF0024 */ lw $ra, 0x0024($sp) /* 00648 809B09B8 0C028800 */ jal SkelAnime_GetFrameCount - + /* 0064C 809B09BC 248470F0 */ addiu $a0, $a0, 0x70F0 ## $a0 = 060070F0 /* 00650 809B09C0 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 00654 809B09C4 3C01C080 */ lui $at, 0xC080 ## $at = C0800000 /* 00658 809B09C8 44814000 */ mtc1 $at, $f8 ## $f8 = -4.00 -/* 0065C 809B09CC 468021A0 */ cvt.s.w $f6, $f4 -/* 00660 809B09D0 8FA30028 */ lw $v1, 0x0028($sp) +/* 0065C 809B09CC 468021A0 */ cvt.s.w $f6, $f4 +/* 00660 809B09D0 8FA30028 */ lw $v1, 0x0028($sp) /* 00664 809B09D4 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 00668 809B09D8 24180002 */ addiu $t8, $zero, 0x0002 ## $t8 = 00000002 -/* 0066C 809B09DC AFB80014 */ sw $t8, 0x0014($sp) +/* 0066C 809B09DC AFB80014 */ sw $t8, 0x0014($sp) /* 00670 809B09E0 24A570F0 */ addiu $a1, $a1, 0x70F0 ## $a1 = 060070F0 -/* 00674 809B09E4 E7A60010 */ swc1 $f6, 0x0010($sp) +/* 00674 809B09E4 E7A60010 */ swc1 $f6, 0x0010($sp) /* 00678 809B09E8 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 0067C 809B09EC 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 00680 809B09F0 E7A80018 */ swc1 $f8, 0x0018($sp) -/* 00684 809B09F4 0C029468 */ jal SkelAnime_ChangeAnimation - +/* 00680 809B09F0 E7A80018 */ swc1 $f8, 0x0018($sp) +/* 00684 809B09F4 0C029468 */ jal SkelAnime_ChangeAnim + /* 00688 809B09F8 24640198 */ addiu $a0, $v1, 0x0198 ## $a0 = 00000198 -/* 0068C 809B09FC 8FA30028 */ lw $v1, 0x0028($sp) +/* 0068C 809B09FC 8FA30028 */ lw $v1, 0x0028($sp) /* 00690 809B0A00 3C098003 */ lui $t1, 0x8003 ## $t1 = 80030000 /* 00694 809B0A04 2529B5EC */ addiu $t1, $t1, 0xB5EC ## $t1 = 8002B5EC /* 00698 809B0A08 947902AA */ lhu $t9, 0x02AA($v1) ## 000002AA /* 0069C 809B0A0C AC6900C0 */ sw $t1, 0x00C0($v1) ## 000000C0 /* 006A0 809B0A10 27280001 */ addiu $t0, $t9, 0x0001 ## $t0 = 00000001 /* 006A4 809B0A14 A46802AA */ sh $t0, 0x02AA($v1) ## 000002AA -/* 006A8 809B0A18 8FBF0024 */ lw $ra, 0x0024($sp) +/* 006A8 809B0A18 8FBF0024 */ lw $ra, 0x0024($sp) .L809B0A1C: /* 006AC 809B0A1C 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 006B0 809B0A20 03E00008 */ jr $ra +/* 006B0 809B0A20 03E00008 */ jr $ra /* 006B4 809B0A24 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ani/func_809B0A6C.s b/asm/non_matchings/overlays/actors/ovl_En_Ani/func_809B0A6C.s index 556e1fe192..dd1c6f79ca 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ani/func_809B0A6C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ani/func_809B0A6C.s @@ -1,51 +1,51 @@ glabel func_809B0A6C /* 006FC 809B0A6C 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 00700 809B0A70 AFB00028 */ sw $s0, 0x0028($sp) +/* 00700 809B0A70 AFB00028 */ sw $s0, 0x0028($sp) /* 00704 809B0A74 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00708 809B0A78 AFBF002C */ sw $ra, 0x002C($sp) +/* 00708 809B0A78 AFBF002C */ sw $ra, 0x002C($sp) /* 0070C 809B0A7C 24840198 */ addiu $a0, $a0, 0x0198 ## $a0 = 00000198 -/* 00710 809B0A80 AFA5003C */ sw $a1, 0x003C($sp) +/* 00710 809B0A80 AFA5003C */ sw $a1, 0x003C($sp) /* 00714 809B0A84 0C02927F */ jal SkelAnime_FrameUpdateMatrix - -/* 00718 809B0A88 AFA40030 */ sw $a0, 0x0030($sp) -/* 0071C 809B0A8C 10400004 */ beq $v0, $zero, .L809B0AA0 + +/* 00718 809B0A88 AFA40030 */ sw $a0, 0x0030($sp) +/* 0071C 809B0A8C 10400004 */ beq $v0, $zero, .L809B0AA0 /* 00720 809B0A90 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 /* 00724 809B0A94 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 /* 00728 809B0A98 00000000 */ nop /* 0072C 809B0A9C E60401B0 */ swc1 $f4, 0x01B0($s0) ## 000001B0 .L809B0AA0: -/* 00730 809B0AA0 8FAE003C */ lw $t6, 0x003C($sp) +/* 00730 809B0AA0 8FAE003C */ lw $t6, 0x003C($sp) /* 00734 809B0AA4 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 /* 00738 809B0AA8 8DCF1D8C */ lw $t7, 0x1D8C($t6) ## 00001D8C /* 0073C 809B0AAC 95F80000 */ lhu $t8, 0x0000($t7) ## 00000000 -/* 00740 809B0AB0 57010015 */ bnel $t8, $at, .L809B0B08 -/* 00744 809B0AB4 8FBF002C */ lw $ra, 0x002C($sp) +/* 00740 809B0AB0 57010015 */ bnel $t8, $at, .L809B0B08 +/* 00744 809B0AB4 8FBF002C */ lw $ra, 0x002C($sp) /* 00748 809B0AB8 0C028800 */ jal SkelAnime_GetFrameCount - + /* 0074C 809B0ABC 248467B8 */ addiu $a0, $a0, 0x67B8 ## $a0 = 060067B8 /* 00750 809B0AC0 44823000 */ mtc1 $v0, $f6 ## $f6 = 0.00 /* 00754 809B0AC4 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 /* 00758 809B0AC8 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 0075C 809B0ACC 46803220 */ cvt.s.w $f8, $f6 +/* 0075C 809B0ACC 46803220 */ cvt.s.w $f8, $f6 /* 00760 809B0AD0 24190002 */ addiu $t9, $zero, 0x0002 ## $t9 = 00000002 -/* 00764 809B0AD4 44070000 */ mfc1 $a3, $f0 -/* 00768 809B0AD8 AFB90014 */ sw $t9, 0x0014($sp) +/* 00764 809B0AD4 44070000 */ mfc1 $a3, $f0 +/* 00768 809B0AD8 AFB90014 */ sw $t9, 0x0014($sp) /* 0076C 809B0ADC 24A567B8 */ addiu $a1, $a1, 0x67B8 ## $a1 = 060067B8 -/* 00770 809B0AE0 8FA40030 */ lw $a0, 0x0030($sp) -/* 00774 809B0AE4 E7A80010 */ swc1 $f8, 0x0010($sp) +/* 00770 809B0AE0 8FA40030 */ lw $a0, 0x0030($sp) +/* 00774 809B0AE4 E7A80010 */ swc1 $f8, 0x0010($sp) /* 00778 809B0AE8 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 0077C 809B0AEC 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 00780 809B0AF0 E7A00018 */ swc1 $f0, 0x0018($sp) +/* 0077C 809B0AEC 0C029468 */ jal SkelAnime_ChangeAnim + +/* 00780 809B0AF0 E7A00018 */ swc1 $f0, 0x0018($sp) /* 00784 809B0AF4 960802AA */ lhu $t0, 0x02AA($s0) ## 000002AA /* 00788 809B0AF8 AE0000C0 */ sw $zero, 0x00C0($s0) ## 000000C0 /* 0078C 809B0AFC 25090001 */ addiu $t1, $t0, 0x0001 ## $t1 = 00000001 /* 00790 809B0B00 A60902AA */ sh $t1, 0x02AA($s0) ## 000002AA -/* 00794 809B0B04 8FBF002C */ lw $ra, 0x002C($sp) +/* 00794 809B0B04 8FBF002C */ lw $ra, 0x002C($sp) .L809B0B08: -/* 00798 809B0B08 8FB00028 */ lw $s0, 0x0028($sp) +/* 00798 809B0B08 8FB00028 */ lw $s0, 0x0028($sp) /* 0079C 809B0B0C 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 -/* 007A0 809B0B10 03E00008 */ jr $ra +/* 007A0 809B0B10 03E00008 */ jr $ra /* 007A4 809B0B14 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Anubice/func_809B11C0.s b/asm/non_matchings/overlays/actors/ovl_En_Anubice/func_809B11C0.s index 721e8a23f7..87b0d8af60 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Anubice/func_809B11C0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Anubice/func_809B11C0.s @@ -20,7 +20,7 @@ glabel func_809B11C0 /* 000E8 809B1208 46108482 */ mul.s $f18, $f16, $f16 /* 000EC 809B120C E7B00018 */ swc1 $f16, 0x0018($sp) /* 000F0 809B1210 46125000 */ add.s $f0, $f10, $f18 -/* 000F4 809B1214 0C03F494 */ jal func_800FD250 +/* 000F4 809B1214 0C03F494 */ jal Math_atan2f /* 000F8 809B1218 46000384 */ sqrt.s $f14, $f0 /* 000FC 809B121C 3C01809B */ lui $at, %hi(D_809B2414) ## $at = 809B0000 /* 00100 809B1220 C4242414 */ lwc1 $f4, %lo(D_809B2414)($at) @@ -37,7 +37,7 @@ glabel func_809B11C0 /* 0012C 809B124C 468054A0 */ cvt.s.w $f18, $f10 /* 00130 809B1250 E492028C */ swc1 $f18, 0x028C($a0) ## 0000028C /* 00134 809B1254 C7AE0018 */ lwc1 $f14, 0x0018($sp) -/* 00138 809B1258 0C03F494 */ jal func_800FD250 +/* 00138 809B1258 0C03F494 */ jal Math_atan2f /* 0013C 809B125C C7AC0020 */ lwc1 $f12, 0x0020($sp) /* 00140 809B1260 3C01809B */ lui $at, %hi(D_809B2418) ## $at = 809B0000 /* 00144 809B1264 C4242418 */ lwc1 $f4, %lo(D_809B2418)($at) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Anubice/func_809B1524.s b/asm/non_matchings/overlays/actors/ovl_En_Anubice/func_809B1524.s index 1ddd8af184..642e5896ae 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Anubice/func_809B1524.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Anubice/func_809B1524.s @@ -1,36 +1,36 @@ glabel func_809B1524 /* 00404 809B1524 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 00408 809B1528 AFB00028 */ sw $s0, 0x0028($sp) +/* 00408 809B1528 AFB00028 */ sw $s0, 0x0028($sp) /* 0040C 809B152C 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00410 809B1530 AFBF002C */ sw $ra, 0x002C($sp) +/* 00410 809B1530 AFBF002C */ sw $ra, 0x002C($sp) /* 00414 809B1534 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 -/* 00418 809B1538 AFA50034 */ sw $a1, 0x0034($sp) +/* 00418 809B1538 AFA50034 */ sw $a1, 0x0034($sp) /* 0041C 809B153C 0C028800 */ jal SkelAnime_GetFrameCount - + /* 00420 809B1540 24840F74 */ addiu $a0, $a0, 0x0F74 ## $a0 = 06000F74 /* 00424 809B1544 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 00428 809B1548 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 /* 0042C 809B154C 3C01C120 */ lui $at, 0xC120 ## $at = C1200000 -/* 00430 809B1550 468021A0 */ cvt.s.w $f6, $f4 +/* 00430 809B1550 468021A0 */ cvt.s.w $f6, $f4 /* 00434 809B1554 44819000 */ mtc1 $at, $f18 ## $f18 = -10.00 /* 00438 809B1558 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 0043C 809B155C 44070000 */ mfc1 $a3, $f0 +/* 0043C 809B155C 44070000 */ mfc1 $a3, $f0 /* 00440 809B1560 24A50F74 */ addiu $a1, $a1, 0x0F74 ## $a1 = 06000F74 /* 00444 809B1564 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C -/* 00448 809B1568 4600320D */ trunc.w.s $f8, $f6 +/* 00448 809B1568 4600320D */ trunc.w.s $f8, $f6 /* 0044C 809B156C 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 00450 809B1570 AFA00014 */ sw $zero, 0x0014($sp) -/* 00454 809B1574 E7B20018 */ swc1 $f18, 0x0018($sp) -/* 00458 809B1578 440F4000 */ mfc1 $t7, $f8 +/* 00450 809B1570 AFA00014 */ sw $zero, 0x0014($sp) +/* 00454 809B1574 E7B20018 */ swc1 $f18, 0x0018($sp) +/* 00458 809B1578 440F4000 */ mfc1 $t7, $f8 /* 0045C 809B157C 00000000 */ nop -/* 00460 809B1580 000FC400 */ sll $t8, $t7, 16 -/* 00464 809B1584 0018CC03 */ sra $t9, $t8, 16 +/* 00460 809B1580 000FC400 */ sll $t8, $t7, 16 +/* 00464 809B1584 0018CC03 */ sra $t9, $t8, 16 /* 00468 809B1588 44995000 */ mtc1 $t9, $f10 ## $f10 = 0.00 /* 0046C 809B158C 00000000 */ nop -/* 00470 809B1590 46805420 */ cvt.s.w $f16, $f10 -/* 00474 809B1594 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 00478 809B1598 E7B00010 */ swc1 $f16, 0x0010($sp) +/* 00470 809B1590 46805420 */ cvt.s.w $f16, $f10 +/* 00474 809B1594 0C029468 */ jal SkelAnime_ChangeAnim + +/* 00478 809B1598 E7B00010 */ swc1 $f16, 0x0010($sp) /* 0047C 809B159C 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 /* 00480 809B15A0 3C08809B */ lui $t0, %hi(func_809B15CC) ## $t0 = 809B0000 /* 00484 809B15A4 250815CC */ addiu $t0, $t0, %lo(func_809B15CC) ## $t0 = 809B15CC @@ -38,10 +38,10 @@ glabel func_809B1524 /* 0048C 809B15AC E600006C */ swc1 $f0, 0x006C($s0) ## 0000006C /* 00490 809B15B0 E6000064 */ swc1 $f0, 0x0064($s0) ## 00000064 /* 00494 809B15B4 E600005C */ swc1 $f0, 0x005C($s0) ## 0000005C -/* 00498 809B15B8 8FBF002C */ lw $ra, 0x002C($sp) -/* 0049C 809B15BC 8FB00028 */ lw $s0, 0x0028($sp) +/* 00498 809B15B8 8FBF002C */ lw $ra, 0x002C($sp) +/* 0049C 809B15BC 8FB00028 */ lw $s0, 0x0028($sp) /* 004A0 809B15C0 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 004A4 809B15C4 03E00008 */ jr $ra +/* 004A4 809B15C4 03E00008 */ jr $ra /* 004A8 809B15C8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Anubice/func_809B17FC.s b/asm/non_matchings/overlays/actors/ovl_En_Anubice/func_809B17FC.s index 716f0b987f..4e783a9d94 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Anubice/func_809B17FC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Anubice/func_809B17FC.s @@ -1,39 +1,39 @@ glabel func_809B17FC /* 006DC 809B17FC 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 006E0 809B1800 AFB00028 */ sw $s0, 0x0028($sp) +/* 006E0 809B1800 AFB00028 */ sw $s0, 0x0028($sp) /* 006E4 809B1804 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 006E8 809B1808 AFBF002C */ sw $ra, 0x002C($sp) +/* 006E8 809B1808 AFBF002C */ sw $ra, 0x002C($sp) /* 006EC 809B180C 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 -/* 006F0 809B1810 AFA50034 */ sw $a1, 0x0034($sp) +/* 006F0 809B1810 AFA50034 */ sw $a1, 0x0034($sp) /* 006F4 809B1814 0C028800 */ jal SkelAnime_GetFrameCount - + /* 006F8 809B1818 2484078C */ addiu $a0, $a0, 0x078C ## $a0 = 0600078C /* 006FC 809B181C 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 00700 809B1820 3C01C120 */ lui $at, 0xC120 ## $at = C1200000 /* 00704 809B1824 44813000 */ mtc1 $at, $f6 ## $f6 = -10.00 -/* 00708 809B1828 46802020 */ cvt.s.w $f0, $f4 +/* 00708 809B1828 46802020 */ cvt.s.w $f0, $f4 /* 0070C 809B182C 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 00710 809B1830 240E0002 */ addiu $t6, $zero, 0x0002 ## $t6 = 00000002 /* 00714 809B1834 24A5078C */ addiu $a1, $a1, 0x078C ## $a1 = 0600078C /* 00718 809B1838 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C /* 0071C 809B183C 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 00720 809B1840 E600026C */ swc1 $f0, 0x026C($s0) ## 0000026C -/* 00724 809B1844 AFAE0014 */ sw $t6, 0x0014($sp) -/* 00728 809B1848 E7A00010 */ swc1 $f0, 0x0010($sp) +/* 00724 809B1844 AFAE0014 */ sw $t6, 0x0014($sp) +/* 00728 809B1848 E7A00010 */ swc1 $f0, 0x0010($sp) /* 0072C 809B184C 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 00730 809B1850 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 00734 809B1854 E7A60018 */ swc1 $f6, 0x0018($sp) +/* 00730 809B1850 0C029468 */ jal SkelAnime_ChangeAnim + +/* 00734 809B1854 E7A60018 */ swc1 $f6, 0x0018($sp) /* 00738 809B1858 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 /* 0073C 809B185C 3C0F809B */ lui $t7, %hi(func_809B1884) ## $t7 = 809B0000 /* 00740 809B1860 25EF1884 */ addiu $t7, $t7, %lo(func_809B1884) ## $t7 = 809B1884 /* 00744 809B1864 AE0F0250 */ sw $t7, 0x0250($s0) ## 00000250 /* 00748 809B1868 E6000064 */ swc1 $f0, 0x0064($s0) ## 00000064 /* 0074C 809B186C E600005C */ swc1 $f0, 0x005C($s0) ## 0000005C -/* 00750 809B1870 8FBF002C */ lw $ra, 0x002C($sp) -/* 00754 809B1874 8FB00028 */ lw $s0, 0x0028($sp) +/* 00750 809B1870 8FBF002C */ lw $ra, 0x002C($sp) +/* 00754 809B1874 8FB00028 */ lw $s0, 0x0028($sp) /* 00758 809B1878 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 0075C 809B187C 03E00008 */ jr $ra +/* 0075C 809B187C 03E00008 */ jr $ra /* 00760 809B1880 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Anubice/func_809B1984.s b/asm/non_matchings/overlays/actors/ovl_En_Anubice/func_809B1984.s index f240ba812c..7a49704ed7 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Anubice/func_809B1984.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Anubice/func_809B1984.s @@ -1,29 +1,29 @@ glabel func_809B1984 /* 00864 809B1984 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 00868 809B1988 AFB00028 */ sw $s0, 0x0028($sp) +/* 00868 809B1988 AFB00028 */ sw $s0, 0x0028($sp) /* 0086C 809B198C 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00870 809B1990 AFBF002C */ sw $ra, 0x002C($sp) +/* 00870 809B1990 AFBF002C */ sw $ra, 0x002C($sp) /* 00874 809B1994 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 -/* 00878 809B1998 AFA50034 */ sw $a1, 0x0034($sp) +/* 00878 809B1998 AFA50034 */ sw $a1, 0x0034($sp) /* 0087C 809B199C 0C028800 */ jal SkelAnime_GetFrameCount - + /* 00880 809B19A0 24840348 */ addiu $a0, $a0, 0x0348 ## $a0 = 06000348 /* 00884 809B19A4 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 00888 809B19A8 3C01C1A0 */ lui $at, 0xC1A0 ## $at = C1A00000 /* 0088C 809B19AC 44813000 */ mtc1 $at, $f6 ## $f6 = -20.00 -/* 00890 809B19B0 46802020 */ cvt.s.w $f0, $f4 +/* 00890 809B19B0 46802020 */ cvt.s.w $f0, $f4 /* 00894 809B19B4 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 00898 809B19B8 240E0002 */ addiu $t6, $zero, 0x0002 ## $t6 = 00000002 /* 0089C 809B19BC 24A50348 */ addiu $a1, $a1, 0x0348 ## $a1 = 06000348 /* 008A0 809B19C0 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C /* 008A4 809B19C4 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 008A8 809B19C8 E600026C */ swc1 $f0, 0x026C($s0) ## 0000026C -/* 008AC 809B19CC AFAE0014 */ sw $t6, 0x0014($sp) -/* 008B0 809B19D0 E7A00010 */ swc1 $f0, 0x0010($sp) +/* 008AC 809B19CC AFAE0014 */ sw $t6, 0x0014($sp) +/* 008B0 809B19D0 E7A00010 */ swc1 $f0, 0x0010($sp) /* 008B4 809B19D4 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 008B8 809B19D8 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 008BC 809B19DC E7A60018 */ swc1 $f6, 0x0018($sp) +/* 008B8 809B19D8 0C029468 */ jal SkelAnime_ChangeAnim + +/* 008BC 809B19DC E7A60018 */ swc1 $f6, 0x0018($sp) /* 008C0 809B19E0 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 /* 008C4 809B19E4 3C01BF80 */ lui $at, 0xBF80 ## $at = BF800000 /* 008C8 809B19E8 44814000 */ mtc1 $at, $f8 ## $f8 = -1.00 @@ -34,12 +34,12 @@ glabel func_809B1984 /* 008DC 809B19FC E6000064 */ swc1 $f0, 0x0064($s0) ## 00000064 /* 008E0 809B1A00 E600005C */ swc1 $f0, 0x005C($s0) ## 0000005C /* 008E4 809B1A04 E608006C */ swc1 $f8, 0x006C($s0) ## 0000006C -/* 008E8 809B1A08 8FA40034 */ lw $a0, 0x0034($sp) +/* 008E8 809B1A08 8FA40034 */ lw $a0, 0x0034($sp) /* 008EC 809B1A0C 26050280 */ addiu $a1, $s0, 0x0280 ## $a1 = 00000280 /* 008F0 809B1A10 3C06428C */ lui $a2, 0x428C ## $a2 = 428C0000 -/* 008F4 809B1A14 0C00F8C3 */ jal func_8003E30C +/* 008F4 809B1A14 0C00F8C3 */ jal func_8003E30C /* 008F8 809B1A18 248407C0 */ addiu $a0, $a0, 0x07C0 ## $a0 = 000007C0 -/* 008FC 809B1A1C 10400006 */ beq $v0, $zero, .L809B1A38 +/* 008FC 809B1A1C 10400006 */ beq $v0, $zero, .L809B1A38 /* 00900 809B1A20 3C09809B */ lui $t1, %hi(func_809B1A54) ## $t1 = 809B0000 /* 00904 809B1A24 861900B4 */ lh $t9, 0x00B4($s0) ## 000000B4 /* 00908 809B1A28 24180001 */ addiu $t8, $zero, 0x0001 ## $t8 = 00000001 @@ -49,10 +49,10 @@ glabel func_809B1984 .L809B1A38: /* 00918 809B1A38 25291A54 */ addiu $t1, $t1, %lo(func_809B1A54) ## $t1 = 809B1A54 /* 0091C 809B1A3C AE090250 */ sw $t1, 0x0250($s0) ## 00000250 -/* 00920 809B1A40 8FBF002C */ lw $ra, 0x002C($sp) -/* 00924 809B1A44 8FB00028 */ lw $s0, 0x0028($sp) +/* 00920 809B1A40 8FBF002C */ lw $ra, 0x002C($sp) +/* 00924 809B1A44 8FB00028 */ lw $s0, 0x0028($sp) /* 00928 809B1A48 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 0092C 809B1A4C 03E00008 */ jr $ra +/* 0092C 809B1A4C 03E00008 */ jr $ra /* 00930 809B1A50 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Anubice/func_809B2150.s b/asm/non_matchings/overlays/actors/ovl_En_Anubice/func_809B2150.s index 337f7de874..329213a1a6 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Anubice/func_809B2150.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Anubice/func_809B2150.s @@ -21,7 +21,7 @@ glabel func_809B2150 /* 0107C 809B219C 8D250000 */ lw $a1, 0x0000($t1) ## 00000000 /* 01080 809B21A0 27A40024 */ addiu $a0, $sp, 0x0024 ## $a0 = FFFFFFDC /* 01084 809B21A4 24070355 */ addiu $a3, $zero, 0x0355 ## $a3 = 00000355 -/* 01088 809B21A8 0C031AB1 */ jal func_800C6AC4 +/* 01088 809B21A8 0C031AB1 */ jal Graph_OpenDisps /* 0108C 809B21AC AFA50034 */ sw $a1, 0x0034($sp) /* 01090 809B21B0 8FA80034 */ lw $t0, 0x0034($sp) /* 01094 809B21B4 3C0BDA38 */ lui $t3, 0xDA38 ## $t3 = DA380000 @@ -58,7 +58,7 @@ glabel func_809B2150 /* 01110 809B2230 24C623FC */ addiu $a2, $a2, %lo(D_809B23FC) ## $a2 = 809B23FC /* 01114 809B2234 27A40024 */ addiu $a0, $sp, 0x0024 ## $a0 = FFFFFFDC /* 01118 809B2238 24070364 */ addiu $a3, $zero, 0x0364 ## $a3 = 00000364 -/* 0111C 809B223C 0C031AD5 */ jal func_800C6B54 +/* 0111C 809B223C 0C031AD5 */ jal Graph_CloseDisps /* 01120 809B2240 8F050000 */ lw $a1, 0x0000($t8) ## 00000000 .L809B2244: /* 01124 809B2244 8FBF0014 */ lw $ra, 0x0014($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Anubice_Fire/EnAnubiceFire_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Anubice_Fire/EnAnubiceFire_Draw.s index 07f493f836..ba0445baf1 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Anubice_Fire/EnAnubiceFire_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Anubice_Fire/EnAnubiceFire_Draw.s @@ -23,7 +23,7 @@ glabel EnAnubiceFire_Draw /* 009A0 809B2F40 24C63290 */ addiu $a2, $a2, %lo(D_809B3290) ## $a2 = 809B3290 /* 009A4 809B2F44 27A4009C */ addiu $a0, $sp, 0x009C ## $a0 = FFFFFFDC /* 009A8 809B2F48 240701F7 */ addiu $a3, $zero, 0x01F7 ## $a3 = 000001F7 -/* 009AC 809B2F4C 0C031AB1 */ jal func_800C6AC4 +/* 009AC 809B2F4C 0C031AB1 */ jal Graph_OpenDisps /* 009B0 809B2F50 00A09825 */ or $s3, $a1, $zero ## $s3 = 00000000 /* 009B4 809B2F54 0C024F61 */ jal func_80093D84 /* 009B8 809B2F58 8EA40000 */ lw $a0, 0x0000($s5) ## 00000000 @@ -161,7 +161,7 @@ glabel EnAnubiceFire_Draw /* 00BB8 809B3158 24C632C0 */ addiu $a2, $a2, %lo(D_809B32C0) ## $a2 = 809B32C0 /* 00BBC 809B315C 27A4009C */ addiu $a0, $sp, 0x009C ## $a0 = FFFFFFDC /* 00BC0 809B3160 8EA50000 */ lw $a1, 0x0000($s5) ## 00000000 -/* 00BC4 809B3164 0C031AD5 */ jal func_800C6B54 +/* 00BC4 809B3164 0C031AD5 */ jal Graph_CloseDisps /* 00BC8 809B3168 2407022C */ addiu $a3, $zero, 0x022C ## $a3 = 0000022C /* 00BCC 809B316C 8FBF006C */ lw $ra, 0x006C($sp) /* 00BD0 809B3170 D7B40018 */ ldc1 $f20, 0x0018($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Arrow/EnArrow_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Arrow/EnArrow_Destroy.s index 08861fbed9..e9bef8871f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Arrow/EnArrow_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Arrow/EnArrow_Destroy.s @@ -1,39 +1,39 @@ glabel EnArrow_Destroy /* 0022C 809B3B4C 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 00230 809B3B50 AFBF001C */ sw $ra, 0x001C($sp) -/* 00234 809B3B54 AFB00018 */ sw $s0, 0x0018($sp) -/* 00238 809B3B58 AFA50024 */ sw $a1, 0x0024($sp) +/* 00230 809B3B50 AFBF001C */ sw $ra, 0x001C($sp) +/* 00234 809B3B54 AFB00018 */ sw $s0, 0x0018($sp) +/* 00238 809B3B58 AFA50024 */ sw $a1, 0x0024($sp) /* 0023C 809B3B5C 848E001C */ lh $t6, 0x001C($a0) ## 0000001C /* 00240 809B3B60 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 00244 809B3B64 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 00248 809B3B68 29C10006 */ slti $at, $t6, 0x0006 -/* 0024C 809B3B6C 50200004 */ beql $at, $zero, .L809B3B80 +/* 00248 809B3B68 29C10006 */ slti $at, $t6, 0x0006 +/* 0024C 809B3B6C 50200004 */ beql $at, $zero, .L809B3B80 /* 00250 809B3B70 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C -/* 00254 809B3B74 0C009C27 */ jal func_8002709C +/* 00254 809B3B74 0C009C27 */ jal func_8002709C /* 00258 809B3B78 8E050228 */ lw $a1, 0x0228($s0) ## 00000228 /* 0025C 809B3B7C 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C .L809B3B80: -/* 00260 809B3B80 0C0295BC */ jal func_800A56F0 -/* 00264 809B3B84 8FA50024 */ lw $a1, 0x0024($sp) -/* 00268 809B3B88 8FA40024 */ lw $a0, 0x0024($sp) -/* 0026C 809B3B8C 0C017418 */ jal func_8005D060 +/* 00260 809B3B80 0C0295BC */ jal SkelAnime_Free +/* 00264 809B3B84 8FA50024 */ lw $a1, 0x0024($sp) +/* 00268 809B3B88 8FA40024 */ lw $a0, 0x0024($sp) +/* 0026C 809B3B8C 0C017418 */ jal func_8005D060 /* 00270 809B3B90 26050190 */ addiu $a1, $s0, 0x0190 ## $a1 = 00000190 /* 00274 809B3B94 8E02024C */ lw $v0, 0x024C($s0) ## 0000024C -/* 00278 809B3B98 5040000A */ beql $v0, $zero, .L809B3BC4 -/* 0027C 809B3B9C 8FBF001C */ lw $ra, 0x001C($sp) +/* 00278 809B3B98 5040000A */ beql $v0, $zero, .L809B3BC4 +/* 0027C 809B3B9C 8FBF001C */ lw $ra, 0x001C($sp) /* 00280 809B3BA0 8C4F0130 */ lw $t7, 0x0130($v0) ## 00000130 -/* 00284 809B3BA4 51E00007 */ beql $t7, $zero, .L809B3BC4 -/* 00288 809B3BA8 8FBF001C */ lw $ra, 0x001C($sp) +/* 00284 809B3BA4 51E00007 */ beql $t7, $zero, .L809B3BC4 +/* 00288 809B3BA8 8FBF001C */ lw $ra, 0x001C($sp) /* 0028C 809B3BAC 8C580004 */ lw $t8, 0x0004($v0) ## 00000004 /* 00290 809B3BB0 3C01FFFF */ lui $at, 0xFFFF ## $at = FFFF0000 /* 00294 809B3BB4 34217FFF */ ori $at, $at, 0x7FFF ## $at = FFFF7FFF -/* 00298 809B3BB8 0301C824 */ and $t9, $t8, $at +/* 00298 809B3BB8 0301C824 */ and $t9, $t8, $at /* 0029C 809B3BBC AC590004 */ sw $t9, 0x0004($v0) ## 00000004 -/* 002A0 809B3BC0 8FBF001C */ lw $ra, 0x001C($sp) +/* 002A0 809B3BC0 8FBF001C */ lw $ra, 0x001C($sp) .L809B3BC4: -/* 002A4 809B3BC4 8FB00018 */ lw $s0, 0x0018($sp) +/* 002A4 809B3BC4 8FB00018 */ lw $s0, 0x0018($sp) /* 002A8 809B3BC8 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 002AC 809B3BCC 03E00008 */ jr $ra +/* 002AC 809B3BCC 03E00008 */ jr $ra /* 002B0 809B3BD0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Arrow/EnArrow_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Arrow/EnArrow_Draw.s index cb95dbfb7f..8cd475946b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Arrow/EnArrow_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Arrow/EnArrow_Draw.s @@ -1,115 +1,115 @@ glabel EnArrow_Draw /* 01048 809B4968 27BDFF88 */ addiu $sp, $sp, 0xFF88 ## $sp = FFFFFF88 -/* 0104C 809B496C AFBF002C */ sw $ra, 0x002C($sp) -/* 01050 809B4970 AFB00028 */ sw $s0, 0x0028($sp) -/* 01054 809B4974 AFA5007C */ sw $a1, 0x007C($sp) +/* 0104C 809B496C AFBF002C */ sw $ra, 0x002C($sp) +/* 01050 809B4970 AFB00028 */ sw $s0, 0x0028($sp) +/* 01054 809B4974 AFA5007C */ sw $a1, 0x007C($sp) /* 01058 809B4978 848E001C */ lh $t6, 0x001C($a0) ## 0000001C /* 0105C 809B497C 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 01060 809B4980 29C10009 */ slti $at, $t6, 0x0009 -/* 01064 809B4984 5020001C */ beql $at, $zero, .L809B49F8 +/* 01060 809B4980 29C10009 */ slti $at, $t6, 0x0009 +/* 01064 809B4984 5020001C */ beql $at, $zero, .L809B49F8 /* 01068 809B4988 44805000 */ mtc1 $zero, $f10 ## $f10 = 0.00 -/* 0106C 809B498C 0C024F46 */ jal func_80093D18 +/* 0106C 809B498C 0C024F46 */ jal func_80093D18 /* 01070 809B4990 8CA40000 */ lw $a0, 0x0000($a1) ## 00000000 /* 01074 809B4994 3C188016 */ lui $t8, 0x8016 ## $t8 = 80160000 /* 01078 809B4998 8F18FA90 */ lw $t8, -0x0570($t8) ## 8015FA90 /* 0107C 809B499C C60400EC */ lwc1 $f4, 0x00EC($s0) ## 000000EC -/* 01080 809B49A0 8FA4007C */ lw $a0, 0x007C($sp) +/* 01080 809B49A0 8FA4007C */ lw $a0, 0x007C($sp) /* 01084 809B49A4 87190492 */ lh $t9, 0x0492($t8) ## 80160492 /* 01088 809B49A8 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 /* 0108C 809B49AC 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 /* 01090 809B49B0 44993000 */ mtc1 $t9, $f6 ## $f6 = 0.00 /* 01094 809B49B4 00000000 */ nop -/* 01098 809B49B8 46803220 */ cvt.s.w $f8, $f6 -/* 0109C 809B49BC 4608203C */ c.lt.s $f4, $f8 +/* 01098 809B49B8 46803220 */ cvt.s.w $f8, $f6 +/* 0109C 809B49BC 4608203C */ c.lt.s $f4, $f8 /* 010A0 809B49C0 00000000 */ nop -/* 010A4 809B49C4 45000003 */ bc1f .L809B49D4 +/* 010A4 809B49C4 45000003 */ bc1f .L809B49D4 /* 010A8 809B49C8 00000000 */ nop -/* 010AC 809B49CC 10000001 */ beq $zero, $zero, .L809B49D4 +/* 010AC 809B49CC 10000001 */ beq $zero, $zero, .L809B49D4 /* 010B0 809B49D0 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 .L809B49D4: /* 010B4 809B49D4 8E050150 */ lw $a1, 0x0150($s0) ## 00000150 /* 010B8 809B49D8 8E06016C */ lw $a2, 0x016C($s0) ## 0000016C -/* 010BC 809B49DC AFA20018 */ sw $v0, 0x0018($sp) -/* 010C0 809B49E0 AFB00014 */ sw $s0, 0x0014($sp) -/* 010C4 809B49E4 0C0282D0 */ jal func_800A0B40 -/* 010C8 809B49E8 AFA00010 */ sw $zero, 0x0010($sp) -/* 010CC 809B49EC 100000C9 */ beq $zero, $zero, .L809B4D14 +/* 010BC 809B49DC AFA20018 */ sw $v0, 0x0018($sp) +/* 010C0 809B49E0 AFB00014 */ sw $s0, 0x0014($sp) +/* 010C4 809B49E4 0C0282D0 */ jal SkelAnime_LodDraw +/* 010C8 809B49E8 AFA00010 */ sw $zero, 0x0010($sp) +/* 010CC 809B49EC 100000C9 */ beq $zero, $zero, .L809B4D14 /* 010D0 809B49F0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 010D4 809B49F4 44805000 */ mtc1 $zero, $f10 ## $f10 = 0.00 .L809B49F8: /* 010D8 809B49F8 C6100068 */ lwc1 $f16, 0x0068($s0) ## 00000068 -/* 010DC 809B49FC 46105032 */ c.eq.s $f10, $f16 +/* 010DC 809B49FC 46105032 */ c.eq.s $f10, $f16 /* 010E0 809B4A00 00000000 */ nop -/* 010E4 809B4A04 450300C3 */ bc1tl .L809B4D14 +/* 010E4 809B4A04 450300C3 */ bc1tl .L809B4D14 /* 010E8 809B4A08 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 010EC 809B4A0C 92040248 */ lbu $a0, 0x0248($s0) ## 00000248 -/* 010F0 809B4A10 00800821 */ addu $at, $a0, $zero -/* 010F4 809B4A14 00042080 */ sll $a0, $a0, 2 -/* 010F8 809B4A18 00812021 */ addu $a0, $a0, $at -/* 010FC 809B4A1C 000420C0 */ sll $a0, $a0, 3 -/* 01100 809B4A20 00812023 */ subu $a0, $a0, $at -/* 01104 809B4A24 00042100 */ sll $a0, $a0, 4 -/* 01108 809B4A28 00812021 */ addu $a0, $a0, $at -/* 0110C 809B4A2C 000420C0 */ sll $a0, $a0, 3 -/* 01110 809B4A30 00042400 */ sll $a0, $a0, 16 +/* 010F0 809B4A10 00800821 */ addu $at, $a0, $zero +/* 010F4 809B4A14 00042080 */ sll $a0, $a0, 2 +/* 010F8 809B4A18 00812021 */ addu $a0, $a0, $at +/* 010FC 809B4A1C 000420C0 */ sll $a0, $a0, 3 +/* 01100 809B4A20 00812023 */ subu $a0, $a0, $at +/* 01104 809B4A24 00042100 */ sll $a0, $a0, 4 +/* 01108 809B4A28 00812021 */ addu $a0, $a0, $at +/* 0110C 809B4A2C 000420C0 */ sll $a0, $a0, 3 +/* 01110 809B4A30 00042400 */ sll $a0, $a0, 16 /* 01114 809B4A34 0C01DE0D */ jal Math_Coss ## coss? -/* 01118 809B4A38 00042403 */ sra $a0, $a0, 16 +/* 01118 809B4A38 00042403 */ sra $a0, $a0, 16 /* 0111C 809B4A3C 3C0142FF */ lui $at, 0x42FF ## $at = 42FF0000 /* 01120 809B4A40 44811000 */ mtc1 $at, $f2 ## $f2 = 127.50 /* 01124 809B4A44 240A0001 */ addiu $t2, $zero, 0x0001 ## $t2 = 00000001 /* 01128 809B4A48 3C06809B */ lui $a2, %hi(D_809B4EF0) ## $a2 = 809B0000 -/* 0112C 809B4A4C 46020482 */ mul.s $f18, $f0, $f2 +/* 0112C 809B4A4C 46020482 */ mul.s $f18, $f0, $f2 /* 01130 809B4A50 24C64EF0 */ addiu $a2, $a2, %lo(D_809B4EF0) ## $a2 = 809B4EF0 /* 01134 809B4A54 27A40054 */ addiu $a0, $sp, 0x0054 ## $a0 = FFFFFFDC -/* 01138 809B4A58 46029180 */ add.s $f6, $f18, $f2 +/* 01138 809B4A58 46029180 */ add.s $f6, $f18, $f2 /* 0113C 809B4A5C 4449F800 */ cfc1 $t1, $31 /* 01140 809B4A60 44CAF800 */ ctc1 $t2, $31 /* 01144 809B4A64 00000000 */ nop -/* 01148 809B4A68 46003124 */ cvt.w.s $f4, $f6 +/* 01148 809B4A68 46003124 */ cvt.w.s $f4, $f6 /* 0114C 809B4A6C 444AF800 */ cfc1 $t2, $31 /* 01150 809B4A70 00000000 */ nop /* 01154 809B4A74 314A0078 */ andi $t2, $t2, 0x0078 ## $t2 = 00000000 -/* 01158 809B4A78 11400012 */ beq $t2, $zero, .L809B4AC4 +/* 01158 809B4A78 11400012 */ beq $t2, $zero, .L809B4AC4 /* 0115C 809B4A7C 3C014F00 */ lui $at, 0x4F00 ## $at = 4F000000 /* 01160 809B4A80 44812000 */ mtc1 $at, $f4 ## $f4 = 2147483648.00 /* 01164 809B4A84 240A0001 */ addiu $t2, $zero, 0x0001 ## $t2 = 00000001 -/* 01168 809B4A88 46043101 */ sub.s $f4, $f6, $f4 +/* 01168 809B4A88 46043101 */ sub.s $f4, $f6, $f4 /* 0116C 809B4A8C 44CAF800 */ ctc1 $t2, $31 /* 01170 809B4A90 00000000 */ nop -/* 01174 809B4A94 46002124 */ cvt.w.s $f4, $f4 +/* 01174 809B4A94 46002124 */ cvt.w.s $f4, $f4 /* 01178 809B4A98 444AF800 */ cfc1 $t2, $31 /* 0117C 809B4A9C 00000000 */ nop /* 01180 809B4AA0 314A0078 */ andi $t2, $t2, 0x0078 ## $t2 = 00000000 -/* 01184 809B4AA4 15400005 */ bne $t2, $zero, .L809B4ABC +/* 01184 809B4AA4 15400005 */ bne $t2, $zero, .L809B4ABC /* 01188 809B4AA8 00000000 */ nop -/* 0118C 809B4AAC 440A2000 */ mfc1 $t2, $f4 +/* 0118C 809B4AAC 440A2000 */ mfc1 $t2, $f4 /* 01190 809B4AB0 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 01194 809B4AB4 10000007 */ beq $zero, $zero, .L809B4AD4 +/* 01194 809B4AB4 10000007 */ beq $zero, $zero, .L809B4AD4 /* 01198 809B4AB8 01415025 */ or $t2, $t2, $at ## $t2 = 80000000 .L809B4ABC: -/* 0119C 809B4ABC 10000005 */ beq $zero, $zero, .L809B4AD4 +/* 0119C 809B4ABC 10000005 */ beq $zero, $zero, .L809B4AD4 /* 011A0 809B4AC0 240AFFFF */ addiu $t2, $zero, 0xFFFF ## $t2 = FFFFFFFF .L809B4AC4: -/* 011A4 809B4AC4 440A2000 */ mfc1 $t2, $f4 +/* 011A4 809B4AC4 440A2000 */ mfc1 $t2, $f4 /* 011A8 809B4AC8 00000000 */ nop -/* 011AC 809B4ACC 0540FFFB */ bltz $t2, .L809B4ABC +/* 011AC 809B4ACC 0540FFFB */ bltz $t2, .L809B4ABC /* 011B0 809B4AD0 00000000 */ nop .L809B4AD4: -/* 011B4 809B4AD4 8FAB007C */ lw $t3, 0x007C($sp) -/* 011B8 809B4AD8 A3AA006F */ sb $t2, 0x006F($sp) +/* 011B4 809B4AD4 8FAB007C */ lw $t3, 0x007C($sp) +/* 011B8 809B4AD8 A3AA006F */ sb $t2, 0x006F($sp) /* 011BC 809B4ADC 44C9F800 */ ctc1 $t1, $31 /* 011C0 809B4AE0 8D650000 */ lw $a1, 0x0000($t3) ## 00000000 /* 011C4 809B4AE4 24070542 */ addiu $a3, $zero, 0x0542 ## $a3 = 00000542 -/* 011C8 809B4AE8 0C031AB1 */ jal func_800C6AC4 -/* 011CC 809B4AEC AFA50064 */ sw $a1, 0x0064($sp) -/* 011D0 809B4AF0 8FAC007C */ lw $t4, 0x007C($sp) -/* 011D4 809B4AF4 0C024F05 */ jal func_80093C14 +/* 011C8 809B4AE8 0C031AB1 */ jal Graph_OpenDisps +/* 011CC 809B4AEC AFA50064 */ sw $a1, 0x0064($sp) +/* 011D0 809B4AF0 8FAC007C */ lw $t4, 0x007C($sp) +/* 011D4 809B4AF4 0C024F05 */ jal func_80093C14 /* 011D8 809B4AF8 8D840000 */ lw $a0, 0x0000($t4) ## 00000000 /* 011DC 809B4AFC 860D001C */ lh $t5, 0x001C($s0) ## 0000001C /* 011E0 809B4B00 24010009 */ addiu $at, $zero, 0x0009 ## $at = 00000009 -/* 011E4 809B4B04 8FA80064 */ lw $t0, 0x0064($sp) -/* 011E8 809B4B08 15A10016 */ bne $t5, $at, .L809B4B64 +/* 011E4 809B4B04 8FA80064 */ lw $t0, 0x0064($sp) +/* 011E8 809B4B08 15A10016 */ bne $t5, $at, .L809B4B64 /* 011EC 809B4B0C 3C0EFA00 */ lui $t6, 0xFA00 ## $t6 = FA000000 /* 011F0 809B4B10 8D0202D0 */ lw $v0, 0x02D0($t0) ## 000002D0 /* 011F4 809B4B14 3C0FFA00 */ lui $t7, 0xFA00 ## $t7 = FA000000 @@ -124,14 +124,14 @@ glabel EnArrow_Draw /* 01218 809B4B38 24590008 */ addiu $t9, $v0, 0x0008 ## $t9 = 00000008 /* 0121C 809B4B3C AD1902D0 */ sw $t9, 0x02D0($t0) ## 000002D0 /* 01220 809B4B40 AC490000 */ sw $t1, 0x0000($v0) ## 00000000 -/* 01224 809B4B44 93AB006F */ lbu $t3, 0x006F($sp) +/* 01224 809B4B44 93AB006F */ lbu $t3, 0x006F($sp) /* 01228 809B4B48 3421FF00 */ ori $at, $at, 0xFF00 ## $at = 00FFFF00 /* 0122C 809B4B4C 01616025 */ or $t4, $t3, $at ## $t4 = 00FFFF00 /* 01230 809B4B50 3C014248 */ lui $at, 0x4248 ## $at = 42480000 /* 01234 809B4B54 44814000 */ mtc1 $at, $f8 ## $f8 = 50.00 /* 01238 809B4B58 AC4C0004 */ sw $t4, 0x0004($v0) ## 00000004 -/* 0123C 809B4B5C 10000014 */ beq $zero, $zero, .L809B4BB0 -/* 01240 809B4B60 E7A80068 */ swc1 $f8, 0x0068($sp) +/* 0123C 809B4B5C 10000014 */ beq $zero, $zero, .L809B4BB0 +/* 01240 809B4B60 E7A80068 */ swc1 $f8, 0x0068($sp) .L809B4B64: /* 01244 809B4B64 8D0202D0 */ lw $v0, 0x02D0($t0) ## 000002D0 /* 01248 809B4B68 3C0F0C00 */ lui $t7, 0x0C00 ## $t7 = 0C000000 @@ -146,62 +146,62 @@ glabel EnArrow_Draw /* 0126C 809B4B8C 24580008 */ addiu $t8, $v0, 0x0008 ## $t8 = 00000008 /* 01270 809B4B90 AD1802D0 */ sw $t8, 0x02D0($t0) ## 000002D0 /* 01274 809B4B94 AC590000 */ sw $t9, 0x0000($v0) ## 00000000 -/* 01278 809B4B98 93AA006F */ lbu $t2, 0x006F($sp) +/* 01278 809B4B98 93AA006F */ lbu $t2, 0x006F($sp) /* 0127C 809B4B9C 01415825 */ or $t3, $t2, $at ## $t3 = FAFA0000 /* 01280 809B4BA0 3C014316 */ lui $at, 0x4316 ## $at = 43160000 /* 01284 809B4BA4 44815000 */ mtc1 $at, $f10 ## $f10 = 150.00 /* 01288 809B4BA8 AC4B0004 */ sw $t3, 0x0004($v0) ## 00000004 -/* 0128C 809B4BAC E7AA0068 */ swc1 $f10, 0x0068($sp) +/* 0128C 809B4BAC E7AA0068 */ swc1 $f10, 0x0068($sp) .L809B4BB0: -/* 01290 809B4BB0 0C034213 */ jal Matrix_Push -/* 01294 809B4BB4 AFA80064 */ sw $t0, 0x0064($sp) -/* 01298 809B4BB8 8FA4007C */ lw $a0, 0x007C($sp) +/* 01290 809B4BB0 0C034213 */ jal Matrix_Push +/* 01294 809B4BB4 AFA80064 */ sw $t0, 0x0064($sp) +/* 01298 809B4BB8 8FA4007C */ lw $a0, 0x007C($sp) /* 0129C 809B4BBC 3C010001 */ lui $at, 0x0001 ## $at = 00010000 /* 012A0 809B4BC0 34211DA0 */ ori $at, $at, 0x1DA0 ## $at = 00011DA0 /* 012A4 809B4BC4 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 -/* 012A8 809B4BC8 0C03424C */ jal Matrix_Mult -/* 012AC 809B4BCC 00812021 */ addu $a0, $a0, $at +/* 012A8 809B4BC8 0C03424C */ jal Matrix_Mult +/* 012AC 809B4BCC 00812021 */ addu $a0, $a0, $at /* 012B0 809B4BD0 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 /* 012B4 809B4BD4 C6100068 */ lwc1 $f16, 0x0068($s0) ## 00000068 -/* 012B8 809B4BD8 8FAC007C */ lw $t4, 0x007C($sp) +/* 012B8 809B4BD8 8FAC007C */ lw $t4, 0x007C($sp) /* 012BC 809B4BDC 3C0D0001 */ lui $t5, 0x0001 ## $t5 = 00010000 -/* 012C0 809B4BE0 46100032 */ c.eq.s $f0, $f16 -/* 012C4 809B4BE4 8FA80064 */ lw $t0, 0x0064($sp) +/* 012C0 809B4BE0 46100032 */ c.eq.s $f0, $f16 +/* 012C4 809B4BE4 8FA80064 */ lw $t0, 0x0064($sp) /* 012C8 809B4BE8 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 -/* 012CC 809B4BEC 01AC6821 */ addu $t5, $t5, $t4 -/* 012D0 809B4BF0 45020004 */ bc1fl .L809B4C04 +/* 012CC 809B4BEC 01AC6821 */ addu $t5, $t5, $t4 +/* 012D0 809B4BF0 45020004 */ bc1fl .L809B4C04 /* 012D4 809B4BF4 8DAD1DE4 */ lw $t5, 0x1DE4($t5) ## 00011DE4 -/* 012D8 809B4BF8 10000013 */ beq $zero, $zero, .L809B4C48 -/* 012DC 809B4BFC 46000306 */ mov.s $f12, $f0 +/* 012D8 809B4BF8 10000013 */ beq $zero, $zero, .L809B4C48 +/* 012DC 809B4BFC 46000306 */ mov.s $f12, $f0 /* 012E0 809B4C00 8DAD1DE4 */ lw $t5, 0x1DE4($t5) ## 00011DE4 .L809B4C04: /* 012E4 809B4C04 3C014F80 */ lui $at, 0x4F80 ## $at = 4F800000 /* 012E8 809B4C08 31AE00FF */ andi $t6, $t5, 0x00FF ## $t6 = 00000000 -/* 012EC 809B4C0C 000E7940 */ sll $t7, $t6, 5 -/* 012F0 809B4C10 01EE7823 */ subu $t7, $t7, $t6 -/* 012F4 809B4C14 000F7880 */ sll $t7, $t7, 2 -/* 012F8 809B4C18 01EE7821 */ addu $t7, $t7, $t6 -/* 012FC 809B4C1C 000F7940 */ sll $t7, $t7, 5 +/* 012EC 809B4C0C 000E7940 */ sll $t7, $t6, 5 +/* 012F0 809B4C10 01EE7823 */ subu $t7, $t7, $t6 +/* 012F4 809B4C14 000F7880 */ sll $t7, $t7, 2 +/* 012F8 809B4C18 01EE7821 */ addu $t7, $t7, $t6 +/* 012FC 809B4C1C 000F7940 */ sll $t7, $t7, 5 /* 01300 809B4C20 448F9000 */ mtc1 $t7, $f18 ## $f18 = 0.00 -/* 01304 809B4C24 05E10004 */ bgez $t7, .L809B4C38 -/* 01308 809B4C28 468091A0 */ cvt.s.w $f6, $f18 +/* 01304 809B4C24 05E10004 */ bgez $t7, .L809B4C38 +/* 01308 809B4C28 468091A0 */ cvt.s.w $f6, $f18 /* 0130C 809B4C2C 44812000 */ mtc1 $at, $f4 ## $f4 = 4294967296.00 /* 01310 809B4C30 00000000 */ nop -/* 01314 809B4C34 46043180 */ add.s $f6, $f6, $f4 +/* 01314 809B4C34 46043180 */ add.s $f6, $f6, $f4 .L809B4C38: /* 01318 809B4C38 3C01809B */ lui $at, %hi(D_809B4F5C) ## $at = 809B0000 -/* 0131C 809B4C3C C4284F5C */ lwc1 $f8, %lo(D_809B4F5C)($at) -/* 01320 809B4C40 46083302 */ mul.s $f12, $f6, $f8 +/* 0131C 809B4C3C C4284F5C */ lwc1 $f8, %lo(D_809B4F5C)($at) +/* 01320 809B4C40 46083302 */ mul.s $f12, $f6, $f8 /* 01324 809B4C44 00000000 */ nop .L809B4C48: -/* 01328 809B4C48 0C0343B5 */ jal Matrix_RotateZ -/* 0132C 809B4C4C AFA80064 */ sw $t0, 0x0064($sp) -/* 01330 809B4C50 C7AC0068 */ lwc1 $f12, 0x0068($sp) +/* 01328 809B4C48 0C0343B5 */ jal Matrix_RotateZ +/* 0132C 809B4C4C AFA80064 */ sw $t0, 0x0064($sp) +/* 01330 809B4C50 C7AC0068 */ lwc1 $f12, 0x0068($sp) /* 01334 809B4C54 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 01338 809B4C58 44066000 */ mfc1 $a2, $f12 -/* 0133C 809B4C5C 0C0342A3 */ jal Matrix_Scale -/* 01340 809B4C60 46006386 */ mov.s $f14, $f12 -/* 01344 809B4C64 8FA80064 */ lw $t0, 0x0064($sp) +/* 01338 809B4C58 44066000 */ mfc1 $a2, $f12 +/* 0133C 809B4C5C 0C0342A3 */ jal Matrix_Scale +/* 01340 809B4C60 46006386 */ mov.s $f14, $f12 +/* 01344 809B4C64 8FA80064 */ lw $t0, 0x0064($sp) /* 01348 809B4C68 3C19DA38 */ lui $t9, 0xDA38 ## $t9 = DA380000 /* 0134C 809B4C6C 37390003 */ ori $t9, $t9, 0x0003 ## $t9 = DA380003 /* 01350 809B4C70 8D0202D0 */ lw $v0, 0x02D0($t0) ## 000002D0 @@ -210,14 +210,14 @@ glabel EnArrow_Draw /* 0135C 809B4C7C 24580008 */ addiu $t8, $v0, 0x0008 ## $t8 = 00000008 /* 01360 809B4C80 AD1802D0 */ sw $t8, 0x02D0($t0) ## 000002D0 /* 01364 809B4C84 AC590000 */ sw $t9, 0x0000($v0) ## 00000000 -/* 01368 809B4C88 8FA9007C */ lw $t1, 0x007C($sp) +/* 01368 809B4C88 8FA9007C */ lw $t1, 0x007C($sp) /* 0136C 809B4C8C 2406055E */ addiu $a2, $zero, 0x055E ## $a2 = 0000055E /* 01370 809B4C90 8D240000 */ lw $a0, 0x0000($t1) ## 00000000 -/* 01374 809B4C94 AFA80064 */ sw $t0, 0x0064($sp) -/* 01378 809B4C98 0C0346A2 */ jal Matrix_NewMtx -/* 0137C 809B4C9C AFA20040 */ sw $v0, 0x0040($sp) -/* 01380 809B4CA0 8FA30040 */ lw $v1, 0x0040($sp) -/* 01384 809B4CA4 8FA80064 */ lw $t0, 0x0064($sp) +/* 01374 809B4C94 AFA80064 */ sw $t0, 0x0064($sp) +/* 01378 809B4C98 0C0346A2 */ jal Matrix_NewMtx +/* 0137C 809B4C9C AFA20040 */ sw $v0, 0x0040($sp) +/* 01380 809B4CA0 8FA30040 */ lw $v1, 0x0040($sp) +/* 01384 809B4CA4 8FA80064 */ lw $t0, 0x0064($sp) /* 01388 809B4CA8 3C0C0403 */ lui $t4, 0x0403 ## $t4 = 04030000 /* 0138C 809B4CAC AC620004 */ sw $v0, 0x0004($v1) ## 00000004 /* 01390 809B4CB0 8D0202D0 */ lw $v0, 0x02D0($t0) ## 000002D0 @@ -226,31 +226,31 @@ glabel EnArrow_Draw /* 0139C 809B4CBC 244A0008 */ addiu $t2, $v0, 0x0008 ## $t2 = 00000008 /* 013A0 809B4CC0 AD0A02D0 */ sw $t2, 0x02D0($t0) ## 000002D0 /* 013A4 809B4CC4 AC4C0004 */ sw $t4, 0x0004($v0) ## 00000004 -/* 013A8 809B4CC8 0C034221 */ jal Matrix_Pull +/* 013A8 809B4CC8 0C034221 */ jal Matrix_Pull /* 013AC 809B4CCC AC4B0000 */ sw $t3, 0x0000($v0) ## 00000000 /* 013B0 809B4CD0 860D0032 */ lh $t5, 0x0032($s0) ## 00000032 /* 013B4 809B4CD4 3C01809B */ lui $at, %hi(D_809B4F60) ## $at = 809B0000 -/* 013B8 809B4CD8 C4324F60 */ lwc1 $f18, %lo(D_809B4F60)($at) +/* 013B8 809B4CD8 C4324F60 */ lwc1 $f18, %lo(D_809B4F60)($at) /* 013BC 809B4CDC 448D5000 */ mtc1 $t5, $f10 ## $f10 = 0.00 /* 013C0 809B4CE0 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 -/* 013C4 809B4CE4 46805420 */ cvt.s.w $f16, $f10 -/* 013C8 809B4CE8 46128302 */ mul.s $f12, $f16, $f18 -/* 013CC 809B4CEC 0C034348 */ jal Matrix_RotateY +/* 013C4 809B4CE4 46805420 */ cvt.s.w $f16, $f10 +/* 013C8 809B4CE8 46128302 */ mul.s $f12, $f16, $f18 +/* 013CC 809B4CEC 0C034348 */ jal Matrix_RotateY /* 013D0 809B4CF0 00000000 */ nop -/* 013D4 809B4CF4 8FAE007C */ lw $t6, 0x007C($sp) +/* 013D4 809B4CF4 8FAE007C */ lw $t6, 0x007C($sp) /* 013D8 809B4CF8 3C06809B */ lui $a2, %hi(D_809B4F10) ## $a2 = 809B0000 /* 013DC 809B4CFC 24C64F10 */ addiu $a2, $a2, %lo(D_809B4F10) ## $a2 = 809B4F10 /* 013E0 809B4D00 27A40054 */ addiu $a0, $sp, 0x0054 ## $a0 = FFFFFFDC /* 013E4 809B4D04 24070565 */ addiu $a3, $zero, 0x0565 ## $a3 = 00000565 -/* 013E8 809B4D08 0C031AD5 */ jal func_800C6B54 +/* 013E8 809B4D08 0C031AD5 */ jal Graph_CloseDisps /* 013EC 809B4D0C 8DC50000 */ lw $a1, 0x0000($t6) ## 00000000 /* 013F0 809B4D10 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 .L809B4D14: -/* 013F4 809B4D14 0C26D200 */ jal func_809B4800 -/* 013F8 809B4D18 8FA5007C */ lw $a1, 0x007C($sp) -/* 013FC 809B4D1C 8FBF002C */ lw $ra, 0x002C($sp) -/* 01400 809B4D20 8FB00028 */ lw $s0, 0x0028($sp) +/* 013F4 809B4D14 0C26D200 */ jal func_809B4800 +/* 013F8 809B4D18 8FA5007C */ lw $a1, 0x007C($sp) +/* 013FC 809B4D1C 8FBF002C */ lw $ra, 0x002C($sp) +/* 01400 809B4D20 8FB00028 */ lw $s0, 0x0028($sp) /* 01404 809B4D24 27BD0078 */ addiu $sp, $sp, 0x0078 ## $sp = 00000000 -/* 01408 809B4D28 03E00008 */ jr $ra +/* 01408 809B4D28 03E00008 */ jr $ra /* 0140C 809B4D2C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Arrow/func_809B3CEC.s b/asm/non_matchings/overlays/actors/ovl_En_Arrow/func_809B3CEC.s index 90748134f2..87e7485aeb 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Arrow/func_809B3CEC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Arrow/func_809B3CEC.s @@ -1,16 +1,16 @@ glabel func_809B3CEC /* 003CC 809B3CEC 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 003D0 809B3CF0 AFB00018 */ sw $s0, 0x0018($sp) -/* 003D4 809B3CF4 AFA40020 */ sw $a0, 0x0020($sp) +/* 003D0 809B3CF0 AFB00018 */ sw $s0, 0x0018($sp) +/* 003D4 809B3CF4 AFA40020 */ sw $a0, 0x0020($sp) /* 003D8 809B3CF8 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 /* 003DC 809B3CFC 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 003E0 809B3D00 AFBF001C */ sw $ra, 0x001C($sp) +/* 003E0 809B3D00 AFBF001C */ sw $ra, 0x001C($sp) /* 003E4 809B3D04 3C05809B */ lui $a1, %hi(func_809B4640) ## $a1 = 809B0000 -/* 003E8 809B3D08 0C26CE48 */ jal func_809B3920 +/* 003E8 809B3D08 0C26CE48 */ jal func_809B3920 /* 003EC 809B3D0C 24A54640 */ addiu $a1, $a1, %lo(func_809B4640) ## $a1 = 809B4640 /* 003F0 809B3D10 3C050400 */ lui $a1, 0x0400 ## $a1 = 04000000 /* 003F4 809B3D14 24A54310 */ addiu $a1, $a1, 0x4310 ## $a1 = 04004310 -/* 003F8 809B3D18 0C02947A */ jal func_800A51E8 +/* 003F8 809B3D18 0C02947A */ jal SkelAnime_ChangeAnimDefaultStop /* 003FC 809B3D1C 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C /* 00400 809B3D20 0C03F66B */ jal Math_Rand_ZeroOne ## Rand.Next() float @@ -21,45 +21,45 @@ glabel func_809B3CEC /* 00414 809B3D34 44813000 */ mtc1 $at, $f6 ## $f6 = 0.50 /* 00418 809B3D38 86180032 */ lh $t8, 0x0032($s0) ## 00000032 /* 0041C 809B3D3C 34018000 */ ori $at, $zero, 0x8000 ## $at = 00008000 -/* 00420 809B3D40 46060201 */ sub.s $f8, $f0, $f6 -/* 00424 809B3D44 46082282 */ mul.s $f10, $f4, $f8 -/* 00428 809B3D48 4600540D */ trunc.w.s $f16, $f10 -/* 0042C 809B3D4C 440F8000 */ mfc1 $t7, $f16 +/* 00420 809B3D40 46060201 */ sub.s $f8, $f0, $f6 +/* 00424 809B3D44 46082282 */ mul.s $f10, $f4, $f8 +/* 00428 809B3D48 4600540D */ trunc.w.s $f16, $f10 +/* 0042C 809B3D4C 440F8000 */ mfc1 $t7, $f16 /* 00430 809B3D50 00000000 */ nop -/* 00434 809B3D54 030FC821 */ addu $t9, $t8, $t7 -/* 00438 809B3D58 03214021 */ addu $t0, $t9, $at +/* 00434 809B3D54 030FC821 */ addu $t9, $t8, $t7 +/* 00438 809B3D58 03214021 */ addu $t0, $t9, $at /* 0043C 809B3D5C 0C03F66B */ jal Math_Rand_ZeroOne ## Rand.Next() float /* 00440 809B3D60 A6080032 */ sh $t0, 0x0032($s0) ## 00000032 /* 00444 809B3D64 3C01809B */ lui $at, %hi(D_809B4F48) ## $at = 809B0000 -/* 00448 809B3D68 C4224F48 */ lwc1 $f2, %lo(D_809B4F48)($at) +/* 00448 809B3D68 C4224F48 */ lwc1 $f2, %lo(D_809B4F48)($at) /* 0044C 809B3D6C C6120068 */ lwc1 $f18, 0x0068($s0) ## 00000068 /* 00450 809B3D70 C60A0060 */ lwc1 $f10, 0x0060($s0) ## 00000060 -/* 00454 809B3D74 46001182 */ mul.s $f6, $f2, $f0 -/* 00458 809B3D78 46061100 */ add.s $f4, $f2, $f6 -/* 0045C 809B3D7C 46049202 */ mul.s $f8, $f18, $f4 -/* 00460 809B3D80 46085400 */ add.s $f16, $f10, $f8 +/* 00454 809B3D74 46001182 */ mul.s $f6, $f2, $f0 +/* 00458 809B3D78 46061100 */ add.s $f4, $f2, $f6 +/* 0045C 809B3D7C 46049202 */ mul.s $f8, $f18, $f4 +/* 00460 809B3D80 46085400 */ add.s $f16, $f10, $f8 /* 00464 809B3D84 0C03F66B */ jal Math_Rand_ZeroOne ## Rand.Next() float /* 00468 809B3D88 E6100060 */ swc1 $f16, 0x0060($s0) ## 00000060 /* 0046C 809B3D8C 3C01809B */ lui $at, %hi(D_809B4F4C) ## $at = 809B0000 -/* 00470 809B3D90 C4264F4C */ lwc1 $f6, %lo(D_809B4F4C)($at) +/* 00470 809B3D90 C4264F4C */ lwc1 $f6, %lo(D_809B4F4C)($at) /* 00474 809B3D94 3C01809B */ lui $at, %hi(D_809B4F50) ## $at = 809B0000 -/* 00478 809B3D98 C4324F50 */ lwc1 $f18, %lo(D_809B4F50)($at) +/* 00478 809B3D98 C4324F50 */ lwc1 $f18, %lo(D_809B4F50)($at) /* 0047C 809B3D9C C6080068 */ lwc1 $f8, 0x0068($s0) ## 00000068 /* 00480 809B3DA0 3C01BFC0 */ lui $at, 0xBFC0 ## $at = BFC00000 -/* 00484 809B3DA4 46009102 */ mul.s $f4, $f18, $f0 +/* 00484 809B3DA4 46009102 */ mul.s $f4, $f18, $f0 /* 00488 809B3DA8 44819000 */ mtc1 $at, $f18 ## $f18 = -1.50 /* 0048C 809B3DAC 24090032 */ addiu $t1, $zero, 0x0032 ## $t1 = 00000032 /* 00490 809B3DB0 A2090248 */ sb $t1, 0x0248($s0) ## 00000248 /* 00494 809B3DB4 E612006C */ swc1 $f18, 0x006C($s0) ## 0000006C -/* 00498 809B3DB8 46043280 */ add.s $f10, $f6, $f4 -/* 0049C 809B3DBC 460A4402 */ mul.s $f16, $f8, $f10 +/* 00498 809B3DB8 46043280 */ add.s $f10, $f6, $f4 +/* 0049C 809B3DBC 460A4402 */ mul.s $f16, $f8, $f10 /* 004A0 809B3DC0 E6100068 */ swc1 $f16, 0x0068($s0) ## 00000068 -/* 004A4 809B3DC4 8FBF001C */ lw $ra, 0x001C($sp) -/* 004A8 809B3DC8 8FB00018 */ lw $s0, 0x0018($sp) +/* 004A4 809B3DC4 8FBF001C */ lw $ra, 0x001C($sp) +/* 004A8 809B3DC8 8FB00018 */ lw $s0, 0x0018($sp) /* 004AC 809B3DCC 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 004B0 809B3DD0 03E00008 */ jr $ra +/* 004B0 809B3DD0 03E00008 */ jr $ra /* 004B4 809B3DD4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Arrow/func_809B3FDC.s b/asm/non_matchings/overlays/actors/ovl_En_Arrow/func_809B3FDC.s index fdd865602c..e74a257e45 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Arrow/func_809B3FDC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Arrow/func_809B3FDC.s @@ -1,89 +1,89 @@ glabel func_809B3FDC /* 006BC 809B3FDC 27BDFF68 */ addiu $sp, $sp, 0xFF68 ## $sp = FFFFFF68 -/* 006C0 809B3FE0 AFBF0034 */ sw $ra, 0x0034($sp) -/* 006C4 809B3FE4 AFB00030 */ sw $s0, 0x0030($sp) -/* 006C8 809B3FE8 AFA5009C */ sw $a1, 0x009C($sp) +/* 006C0 809B3FE0 AFBF0034 */ sw $ra, 0x0034($sp) +/* 006C4 809B3FE4 AFB00030 */ sw $s0, 0x0030($sp) +/* 006C8 809B3FE8 AFA5009C */ sw $a1, 0x009C($sp) /* 006CC 809B3FEC 90820248 */ lbu $v0, 0x0248($a0) ## 00000248 /* 006D0 809B3FF0 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 006D4 809B3FF4 14400003 */ bne $v0, $zero, .L809B4004 +/* 006D4 809B3FF4 14400003 */ bne $v0, $zero, .L809B4004 /* 006D8 809B3FF8 244EFFFF */ addiu $t6, $v0, 0xFFFF ## $t6 = FFFFFFFF -/* 006DC 809B3FFC 10000004 */ beq $zero, $zero, .L809B4010 +/* 006DC 809B3FFC 10000004 */ beq $zero, $zero, .L809B4010 /* 006E0 809B4000 00001825 */ or $v1, $zero, $zero ## $v1 = 00000000 .L809B4004: /* 006E4 809B4004 31C200FF */ andi $v0, $t6, 0x00FF ## $v0 = 000000FF /* 006E8 809B4008 00401825 */ or $v1, $v0, $zero ## $v1 = 000000FF /* 006EC 809B400C A20E0248 */ sb $t6, 0x0248($s0) ## 00000248 .L809B4010: -/* 006F0 809B4010 54600006 */ bnel $v1, $zero, .L809B402C +/* 006F0 809B4010 54600006 */ bnel $v1, $zero, .L809B402C /* 006F4 809B4014 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 006F8 809B4018 0C00B55C */ jal Actor_Kill - + /* 006FC 809B401C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00700 809B4020 1000016B */ beq $zero, $zero, .L809B45D0 -/* 00704 809B4024 8FBF0034 */ lw $ra, 0x0034($sp) +/* 00700 809B4020 1000016B */ beq $zero, $zero, .L809B45D0 +/* 00704 809B4024 8FBF0034 */ lw $ra, 0x0034($sp) /* 00708 809B4028 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 .L809B402C: /* 0070C 809B402C 3C014F80 */ lui $at, 0x4F80 ## $at = 4F800000 -/* 00710 809B4030 04410004 */ bgez $v0, .L809B4044 -/* 00714 809B4034 468021A0 */ cvt.s.w $f6, $f4 +/* 00710 809B4030 04410004 */ bgez $v0, .L809B4044 +/* 00714 809B4034 468021A0 */ cvt.s.w $f6, $f4 /* 00718 809B4038 44814000 */ mtc1 $at, $f8 ## $f8 = 4294967296.00 /* 0071C 809B403C 00000000 */ nop -/* 00720 809B4040 46083180 */ add.s $f6, $f6, $f8 +/* 00720 809B4040 46083180 */ add.s $f6, $f6, $f8 .L809B4044: /* 00724 809B4044 3C01809B */ lui $at, %hi(D_809B4F54) ## $at = 809B0000 -/* 00728 809B4048 C42A4F54 */ lwc1 $f10, %lo(D_809B4F54)($at) +/* 00728 809B4048 C42A4F54 */ lwc1 $f10, %lo(D_809B4F54)($at) /* 0072C 809B404C 3C01809B */ lui $at, %hi(D_809B4F58) ## $at = 809B0000 -/* 00730 809B4050 460A303C */ c.lt.s $f6, $f10 +/* 00730 809B4050 460A303C */ c.lt.s $f6, $f10 /* 00734 809B4054 00000000 */ nop -/* 00738 809B4058 45020004 */ bc1fl .L809B406C +/* 00738 809B4058 45020004 */ bc1fl .L809B406C /* 0073C 809B405C 8602001C */ lh $v0, 0x001C($s0) ## 0000001C -/* 00740 809B4060 C4304F58 */ lwc1 $f16, %lo(D_809B4F58)($at) +/* 00740 809B4060 C4304F58 */ lwc1 $f16, %lo(D_809B4F58)($at) /* 00744 809B4064 E610006C */ swc1 $f16, 0x006C($s0) ## 0000006C /* 00748 809B4068 8602001C */ lh $v0, 0x001C($s0) ## 0000001C .L809B406C: -/* 0074C 809B406C 0002182B */ sltu $v1, $zero, $v0 -/* 00750 809B4070 10600007 */ beq $v1, $zero, .L809B4090 -/* 00754 809B4074 28410009 */ slti $at, $v0, 0x0009 -/* 00758 809B4078 2843000A */ slti $v1, $v0, 0x000A -/* 0075C 809B407C 10600004 */ beq $v1, $zero, .L809B4090 +/* 0074C 809B406C 0002182B */ sltu $v1, $zero, $v0 +/* 00750 809B4070 10600007 */ beq $v1, $zero, .L809B4090 +/* 00754 809B4074 28410009 */ slti $at, $v0, 0x0009 +/* 00758 809B4078 2843000A */ slti $v1, $v0, 0x000A +/* 0075C 809B407C 10600004 */ beq $v1, $zero, .L809B4090 /* 00760 809B4080 00000000 */ nop /* 00764 809B4084 920301A0 */ lbu $v1, 0x01A0($s0) ## 000001A0 /* 00768 809B4088 30630002 */ andi $v1, $v1, 0x0002 ## $v1 = 00000000 -/* 0076C 809B408C 0003182B */ sltu $v1, $zero, $v1 +/* 0076C 809B408C 0003182B */ sltu $v1, $zero, $v1 .L809B4090: -/* 00770 809B4090 14600006 */ bne $v1, $zero, .L809B40AC +/* 00770 809B4090 14600006 */ bne $v1, $zero, .L809B40AC /* 00774 809B4094 00000000 */ nop /* 00778 809B4098 920F024A */ lbu $t7, 0x024A($s0) ## 0000024A /* 0077C 809B409C 26040210 */ addiu $a0, $s0, 0x0210 ## $a0 = 00000210 /* 00780 809B40A0 26050024 */ addiu $a1, $s0, 0x0024 ## $a1 = 00000024 -/* 00784 809B40A4 11E000A8 */ beq $t7, $zero, .L809B4348 +/* 00784 809B40A4 11E000A8 */ beq $t7, $zero, .L809B4348 /* 00788 809B40A8 00000000 */ nop .L809B40AC: -/* 0078C 809B40AC 14200039 */ bne $at, $zero, .L809B4194 -/* 00790 809B40B0 8FA4009C */ lw $a0, 0x009C($sp) -/* 00794 809B40B4 10600013 */ beq $v1, $zero, .L809B4104 +/* 0078C 809B40AC 14200039 */ bne $at, $zero, .L809B4194 +/* 00790 809B40B0 8FA4009C */ lw $a0, 0x009C($sp) +/* 00794 809B40B4 10600013 */ beq $v1, $zero, .L809B4104 /* 00798 809B40B8 24071825 */ addiu $a3, $zero, 0x1825 ## $a3 = 00001825 /* 0079C 809B40BC C6120024 */ lwc1 $f18, 0x0024($s0) ## 00000024 /* 007A0 809B40C0 C6040100 */ lwc1 $f4, 0x0100($s0) ## 00000100 /* 007A4 809B40C4 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 /* 007A8 809B40C8 44810000 */ mtc1 $at, $f0 ## $f0 = 0.50 -/* 007AC 809B40CC 46049200 */ add.s $f8, $f18, $f4 +/* 007AC 809B40CC 46049200 */ add.s $f8, $f18, $f4 /* 007B0 809B40D0 C60A0028 */ lwc1 $f10, 0x0028($s0) ## 00000028 /* 007B4 809B40D4 C6100104 */ lwc1 $f16, 0x0104($s0) ## 00000104 /* 007B8 809B40D8 8602001C */ lh $v0, 0x001C($s0) ## 0000001C -/* 007BC 809B40DC 46004182 */ mul.s $f6, $f8, $f0 -/* 007C0 809B40E0 46105480 */ add.s $f18, $f10, $f16 +/* 007BC 809B40DC 46004182 */ mul.s $f6, $f8, $f0 +/* 007C0 809B40E0 46105480 */ add.s $f18, $f10, $f16 /* 007C4 809B40E4 C608002C */ lwc1 $f8, 0x002C($s0) ## 0000002C -/* 007C8 809B40E8 46009102 */ mul.s $f4, $f18, $f0 +/* 007C8 809B40E8 46009102 */ mul.s $f4, $f18, $f0 /* 007CC 809B40EC E6060024 */ swc1 $f6, 0x0024($s0) ## 00000024 /* 007D0 809B40F0 C6060108 */ lwc1 $f6, 0x0108($s0) ## 00000108 -/* 007D4 809B40F4 46064280 */ add.s $f10, $f8, $f6 +/* 007D4 809B40F4 46064280 */ add.s $f10, $f8, $f6 /* 007D8 809B40F8 E6040028 */ swc1 $f4, 0x0028($s0) ## 00000028 -/* 007DC 809B40FC 46005402 */ mul.s $f16, $f10, $f0 +/* 007DC 809B40FC 46005402 */ mul.s $f16, $f10, $f0 /* 007E0 809B4100 E610002C */ swc1 $f16, 0x002C($s0) ## 0000002C .L809B4104: /* 007E4 809B4104 2401000A */ addiu $at, $zero, 0x000A ## $at = 0000000A -/* 007E8 809B4108 14410013 */ bne $v0, $at, .L809B4158 +/* 007E8 809B4108 14410013 */ bne $v0, $at, .L809B4158 /* 007EC 809B410C 3C198016 */ lui $t9, 0x8016 ## $t9 = 80160000 /* 007F0 809B4110 8F39FA90 */ lw $t9, -0x0570($t9) ## 8015FA90 /* 007F4 809B4114 2418FFFF */ addiu $t8, $zero, 0xFFFF ## $t8 = FFFFFFFF @@ -91,77 +91,77 @@ glabel func_809B3FDC /* 007FC 809B411C A7380D38 */ sh $t8, 0x0D38($t9) ## 80160D38 /* 00800 809B4120 C6120028 */ lwc1 $f18, 0x0028($s0) ## 00000028 /* 00804 809B4124 8E070024 */ lw $a3, 0x0024($s0) ## 00000024 -/* 00808 809B4128 8FA5009C */ lw $a1, 0x009C($sp) -/* 0080C 809B412C E7B20010 */ swc1 $f18, 0x0010($sp) +/* 00808 809B4128 8FA5009C */ lw $a1, 0x009C($sp) +/* 0080C 809B412C E7B20010 */ swc1 $f18, 0x0010($sp) /* 00810 809B4130 C604002C */ lwc1 $f4, 0x002C($s0) ## 0000002C -/* 00814 809B4134 AFA00024 */ sw $zero, 0x0024($sp) -/* 00818 809B4138 AFA00020 */ sw $zero, 0x0020($sp) -/* 0081C 809B413C AFA0001C */ sw $zero, 0x001C($sp) -/* 00820 809B4140 AFA00018 */ sw $zero, 0x0018($sp) +/* 00814 809B4134 AFA00024 */ sw $zero, 0x0024($sp) +/* 00818 809B4138 AFA00020 */ sw $zero, 0x0020($sp) +/* 0081C 809B413C AFA0001C */ sw $zero, 0x001C($sp) +/* 00820 809B4140 AFA00018 */ sw $zero, 0x0018($sp) /* 00824 809B4144 24A41C24 */ addiu $a0, $a1, 0x1C24 ## $a0 = 00001C48 /* 00828 809B4148 0C00C7D4 */ jal Actor_Spawn ## ActorSpawn -/* 0082C 809B414C E7A40014 */ swc1 $f4, 0x0014($sp) -/* 00830 809B4150 10000001 */ beq $zero, $zero, .L809B4158 +/* 0082C 809B414C E7A40014 */ swc1 $f4, 0x0014($sp) +/* 00830 809B4150 10000001 */ beq $zero, $zero, .L809B4158 /* 00834 809B4154 2407182B */ addiu $a3, $zero, 0x182B ## $a3 = 0000182B .L809B4158: /* 00838 809B4158 26050024 */ addiu $a1, $s0, 0x0024 ## $a1 = 00000024 -/* 0083C 809B415C AFA50044 */ sw $a1, 0x0044($sp) -/* 00840 809B4160 8FA4009C */ lw $a0, 0x009C($sp) +/* 0083C 809B415C AFA50044 */ sw $a1, 0x0044($sp) +/* 00840 809B4160 8FA4009C */ lw $a0, 0x009C($sp) /* 00844 809B4164 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 00848 809B4168 0C00A700 */ jal func_80029C00 -/* 0084C 809B416C A7A70072 */ sh $a3, 0x0072($sp) -/* 00850 809B4170 97A70072 */ lhu $a3, 0x0072($sp) -/* 00854 809B4174 8FA4009C */ lw $a0, 0x009C($sp) -/* 00858 809B4178 8FA50044 */ lw $a1, 0x0044($sp) +/* 00848 809B4168 0C00A700 */ jal func_80029C00 +/* 0084C 809B416C A7A70072 */ sh $a3, 0x0072($sp) +/* 00850 809B4170 97A70072 */ lhu $a3, 0x0072($sp) +/* 00854 809B4174 8FA4009C */ lw $a0, 0x009C($sp) +/* 00858 809B4178 8FA50044 */ lw $a1, 0x0044($sp) /* 0085C 809B417C 0C01AEB6 */ jal Audio_PlaySoundAtPosition - + /* 00860 809B4180 24060014 */ addiu $a2, $zero, 0x0014 ## $a2 = 00000014 /* 00864 809B4184 0C00B55C */ jal Actor_Kill - + /* 00868 809B4188 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0086C 809B418C 1000009E */ beq $zero, $zero, .L809B4408 +/* 0086C 809B418C 1000009E */ beq $zero, $zero, .L809B4408 /* 00870 809B4190 8E02024C */ lw $v0, 0x024C($s0) ## 0000024C .L809B4194: /* 00874 809B4194 26070024 */ addiu $a3, $s0, 0x0024 ## $a3 = 00000024 -/* 00878 809B4198 AFA70044 */ sw $a3, 0x0044($sp) +/* 00878 809B4198 AFA70044 */ sw $a3, 0x0044($sp) /* 0087C 809B419C 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 00880 809B41A0 24060096 */ addiu $a2, $zero, 0x0096 ## $a2 = 00000096 -/* 00884 809B41A4 0C00A732 */ jal func_80029CC8 -/* 00888 809B41A8 AFA30050 */ sw $v1, 0x0050($sp) -/* 0088C 809B41AC 8FA30050 */ lw $v1, 0x0050($sp) -/* 00890 809B41B0 5060004D */ beql $v1, $zero, .L809B42E8 +/* 00884 809B41A4 0C00A732 */ jal func_80029CC8 +/* 00888 809B41A8 AFA30050 */ sw $v1, 0x0050($sp) +/* 0088C 809B41AC 8FA30050 */ lw $v1, 0x0050($sp) +/* 00890 809B41B0 5060004D */ beql $v1, $zero, .L809B42E8 /* 00894 809B41B4 9208024A */ lbu $t0, 0x024A($s0) ## 0000024A /* 00898 809B41B8 8E0301C8 */ lw $v1, 0x01C8($s0) ## 000001C8 /* 0089C 809B41BC 24010004 */ addiu $at, $zero, 0x0004 ## $at = 00000004 /* 008A0 809B41C0 90690014 */ lbu $t1, 0x0014($v1) ## 00000014 -/* 008A4 809B41C4 51210048 */ beql $t1, $at, .L809B42E8 +/* 008A4 809B41C4 51210048 */ beql $t1, $at, .L809B42E8 /* 008A8 809B41C8 9208024A */ lbu $t0, 0x024A($s0) ## 0000024A /* 008AC 809B41CC 8E020194 */ lw $v0, 0x0194($s0) ## 00000194 /* 008B0 809B41D0 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 008B4 809B41D4 8C4A0130 */ lw $t2, 0x0130($v0) ## 00000130 -/* 008B8 809B41D8 51400024 */ beql $t2, $zero, .L809B426C +/* 008B8 809B41D8 51400024 */ beql $t2, $zero, .L809B426C /* 008BC 809B41DC 92090249 */ lbu $t1, 0x0249($s0) ## 00000249 /* 008C0 809B41E0 920B01A0 */ lbu $t3, 0x01A0($s0) ## 000001A0 /* 008C4 809B41E4 316C0004 */ andi $t4, $t3, 0x0004 ## $t4 = 00000000 -/* 008C8 809B41E8 55800020 */ bnel $t4, $zero, .L809B426C +/* 008C8 809B41E8 55800020 */ bnel $t4, $zero, .L809B426C /* 008CC 809B41EC 92090249 */ lbu $t1, 0x0249($s0) ## 00000249 /* 008D0 809B41F0 8C4D0004 */ lw $t5, 0x0004($v0) ## 00000004 /* 008D4 809B41F4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 008D8 809B41F8 31AE4000 */ andi $t6, $t5, 0x4000 ## $t6 = 00000000 -/* 008DC 809B41FC 51C0001B */ beql $t6, $zero, .L809B426C +/* 008DC 809B41FC 51C0001B */ beql $t6, $zero, .L809B426C /* 008E0 809B4200 92090249 */ lbu $t1, 0x0249($s0) ## 00000249 /* 008E4 809B4204 AE02024C */ sw $v0, 0x024C($s0) ## 0000024C -/* 008E8 809B4208 AFA2006C */ sw $v0, 0x006C($sp) -/* 008EC 809B420C 0C26CF76 */ jal func_809B3DD8 -/* 008F0 809B4210 8FA5009C */ lw $a1, 0x009C($sp) -/* 008F4 809B4214 8FA2006C */ lw $v0, 0x006C($sp) -/* 008F8 809B4218 8FA50044 */ lw $a1, 0x0044($sp) +/* 008E8 809B4208 AFA2006C */ sw $v0, 0x006C($sp) +/* 008EC 809B420C 0C26CF76 */ jal func_809B3DD8 +/* 008F0 809B4210 8FA5009C */ lw $a1, 0x009C($sp) +/* 008F4 809B4214 8FA2006C */ lw $v0, 0x006C($sp) +/* 008F8 809B4218 8FA50044 */ lw $a1, 0x0044($sp) /* 008FC 809B421C 26060250 */ addiu $a2, $s0, 0x0250 ## $a2 = 00000250 /* 00900 809B4220 0C01DFB4 */ jal Math_Vec3f_Diff ## Vec3f_Sub /* 00904 809B4224 24440024 */ addiu $a0, $v0, 0x0024 ## $a0 = 00000024 -/* 00908 809B4228 8FA2006C */ lw $v0, 0x006C($sp) +/* 00908 809B4228 8FA2006C */ lw $v0, 0x006C($sp) /* 0090C 809B422C 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 /* 00910 809B4230 44810000 */ mtc1 $at, $f0 ## $f0 = 0.50 /* 00914 809B4234 8C4F0004 */ lw $t7, 0x0004($v0) ## 00000004 @@ -170,12 +170,12 @@ glabel func_809B3FDC /* 00920 809B4240 C6080068 */ lwc1 $f8, 0x0068($s0) ## 00000068 /* 00924 809B4244 C60A0060 */ lwc1 $f10, 0x0060($s0) ## 00000060 /* 00928 809B4248 921901A0 */ lbu $t9, 0x01A0($s0) ## 000001A0 -/* 0092C 809B424C 46004182 */ mul.s $f6, $f8, $f0 +/* 0092C 809B424C 46004182 */ mul.s $f6, $f8, $f0 /* 00930 809B4250 3328FFFD */ andi $t0, $t9, 0xFFFD ## $t0 = 00000000 -/* 00934 809B4254 46005402 */ mul.s $f16, $f10, $f0 +/* 00934 809B4254 46005402 */ mul.s $f16, $f10, $f0 /* 00938 809B4258 A20801A0 */ sb $t0, 0x01A0($s0) ## 000001A0 /* 0093C 809B425C E6060068 */ swc1 $f6, 0x0068($s0) ## 00000068 -/* 00940 809B4260 10000068 */ beq $zero, $zero, .L809B4404 +/* 00940 809B4260 10000068 */ beq $zero, $zero, .L809B4404 /* 00944 809B4264 E6100060 */ swc1 $f16, 0x0060($s0) ## 00000060 /* 00948 809B4268 92090249 */ lbu $t1, 0x0249($s0) ## 00000249 .L809B426C: @@ -185,133 +185,133 @@ glabel func_809B3FDC /* 00958 809B4278 A20C0249 */ sb $t4, 0x0249($s0) ## 00000249 /* 0095C 809B427C 906D0016 */ lbu $t5, 0x0016($v1) ## 00000016 /* 00960 809B4280 31AE0002 */ andi $t6, $t5, 0x0002 ## $t6 = 00000000 -/* 00964 809B4284 11C00010 */ beq $t6, $zero, .L809B42C8 +/* 00964 809B4284 11C00010 */ beq $t6, $zero, .L809B42C8 /* 00968 809B4288 00000000 */ nop /* 0096C 809B428C 846F000E */ lh $t7, 0x000E($v1) ## 0000000E /* 00970 809B4290 448F9000 */ mtc1 $t7, $f18 ## $f18 = 0.00 /* 00974 809B4294 00000000 */ nop -/* 00978 809B4298 46809120 */ cvt.s.w $f4, $f18 +/* 00978 809B4298 46809120 */ cvt.s.w $f4, $f18 /* 0097C 809B429C E6040024 */ swc1 $f4, 0x0024($s0) ## 00000024 /* 00980 809B42A0 84780010 */ lh $t8, 0x0010($v1) ## 00000010 /* 00984 809B42A4 44984000 */ mtc1 $t8, $f8 ## $f8 = 0.00 /* 00988 809B42A8 00000000 */ nop -/* 0098C 809B42AC 468041A0 */ cvt.s.w $f6, $f8 +/* 0098C 809B42AC 468041A0 */ cvt.s.w $f6, $f8 /* 00990 809B42B0 E6060028 */ swc1 $f6, 0x0028($s0) ## 00000028 /* 00994 809B42B4 84790012 */ lh $t9, 0x0012($v1) ## 00000012 /* 00998 809B42B8 44995000 */ mtc1 $t9, $f10 ## $f10 = 0.00 /* 0099C 809B42BC 00000000 */ nop -/* 009A0 809B42C0 46805420 */ cvt.s.w $f16, $f10 +/* 009A0 809B42C0 46805420 */ cvt.s.w $f16, $f10 /* 009A4 809B42C4 E610002C */ swc1 $f16, 0x002C($s0) ## 0000002C .L809B42C8: -/* 009A8 809B42C8 0C26CF3B */ jal func_809B3CEC -/* 009AC 809B42CC 8FA4009C */ lw $a0, 0x009C($sp) +/* 009A8 809B42C8 0C26CF3B */ jal func_809B3CEC +/* 009AC 809B42CC 8FA4009C */ lw $a0, 0x009C($sp) /* 009B0 809B42D0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 009B4 809B42D4 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 009B8 809B42D8 24051814 */ addiu $a1, $zero, 0x1814 ## $a1 = 00001814 -/* 009BC 809B42DC 1000004A */ beq $zero, $zero, .L809B4408 +/* 009BC 809B42DC 1000004A */ beq $zero, $zero, .L809B4408 /* 009C0 809B42E0 8E02024C */ lw $v0, 0x024C($s0) ## 0000024C /* 009C4 809B42E4 9208024A */ lbu $t0, 0x024A($s0) ## 0000024A .L809B42E8: /* 009C8 809B42E8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 009CC 809B42EC 3C05809B */ lui $a1, %hi(func_809B45E0) ## $a1 = 809B0000 -/* 009D0 809B42F0 51000045 */ beql $t0, $zero, .L809B4408 +/* 009D0 809B42F0 51000045 */ beql $t0, $zero, .L809B4408 /* 009D4 809B42F4 8E02024C */ lw $v0, 0x024C($s0) ## 0000024C -/* 009D8 809B42F8 0C26CE48 */ jal func_809B3920 +/* 009D8 809B42F8 0C26CE48 */ jal func_809B3920 /* 009DC 809B42FC 24A545E0 */ addiu $a1, $a1, %lo(func_809B45E0) ## $a1 = 809B45E0 /* 009E0 809B4300 3C050400 */ lui $a1, 0x0400 ## $a1 = 04000000 /* 009E4 809B4304 24A5436C */ addiu $a1, $a1, 0x436C ## $a1 = 0400436C -/* 009E8 809B4308 0C02947A */ jal func_800A51E8 +/* 009E8 809B4308 0C02947A */ jal SkelAnime_ChangeAnimDefaultStop /* 009EC 809B430C 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C /* 009F0 809B4310 8609001C */ lh $t1, 0x001C($s0) ## 0000001C /* 009F4 809B4314 240A003C */ addiu $t2, $zero, 0x003C ## $t2 = 0000003C /* 009F8 809B4318 240B0014 */ addiu $t3, $zero, 0x0014 ## $t3 = 00000014 -/* 009FC 809B431C 05200003 */ bltz $t1, .L809B432C +/* 009FC 809B431C 05200003 */ bltz $t1, .L809B432C /* 00A00 809B4320 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00A04 809B4324 10000002 */ beq $zero, $zero, .L809B4330 +/* 00A04 809B4324 10000002 */ beq $zero, $zero, .L809B4330 /* 00A08 809B4328 A20A0248 */ sb $t2, 0x0248($s0) ## 00000248 .L809B432C: /* 00A0C 809B432C A20B0248 */ sb $t3, 0x0248($s0) ## 00000248 .L809B4330: /* 00A10 809B4330 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 00A14 809B4334 24051815 */ addiu $a1, $zero, 0x1815 ## $a1 = 00001815 /* 00A18 809B4338 920C0249 */ lbu $t4, 0x0249($s0) ## 00000249 /* 00A1C 809B433C 358D0001 */ ori $t5, $t4, 0x0001 ## $t5 = 00000001 -/* 00A20 809B4340 10000030 */ beq $zero, $zero, .L809B4404 +/* 00A20 809B4340 10000030 */ beq $zero, $zero, .L809B4404 /* 00A24 809B4344 A20D0249 */ sb $t5, 0x0249($s0) ## 00000249 .L809B4348: /* 00A28 809B4348 0C01DF90 */ jal Math_Vec3f_Copy ## Vec3f_Copy -/* 00A2C 809B434C AFA50044 */ sw $a1, 0x0044($sp) +/* 00A2C 809B434C AFA50044 */ sw $a1, 0x0044($sp) /* 00A30 809B4350 0C00B638 */ jal Actor_MoveForward - + /* 00A34 809B4354 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00A38 809B4358 8FA4009C */ lw $a0, 0x009C($sp) +/* 00A38 809B4358 8FA4009C */ lw $a0, 0x009C($sp) /* 00A3C 809B435C 260E0074 */ addiu $t6, $s0, 0x0074 ## $t6 = 00000074 /* 00A40 809B4360 240F0001 */ addiu $t7, $zero, 0x0001 ## $t7 = 00000001 /* 00A44 809B4364 24180001 */ addiu $t8, $zero, 0x0001 ## $t8 = 00000001 /* 00A48 809B4368 24190001 */ addiu $t9, $zero, 0x0001 ## $t9 = 00000001 /* 00A4C 809B436C 24080001 */ addiu $t0, $zero, 0x0001 ## $t0 = 00000001 /* 00A50 809B4370 27A90090 */ addiu $t1, $sp, 0x0090 ## $t1 = FFFFFFF8 -/* 00A54 809B4374 AFA90024 */ sw $t1, 0x0024($sp) -/* 00A58 809B4378 AFA80020 */ sw $t0, 0x0020($sp) -/* 00A5C 809B437C AFB9001C */ sw $t9, 0x001C($sp) -/* 00A60 809B4380 AFB80018 */ sw $t8, 0x0018($sp) -/* 00A64 809B4384 AFAF0014 */ sw $t7, 0x0014($sp) -/* 00A68 809B4388 AFAE0010 */ sw $t6, 0x0010($sp) +/* 00A54 809B4374 AFA90024 */ sw $t1, 0x0024($sp) +/* 00A58 809B4378 AFA80020 */ sw $t0, 0x0020($sp) +/* 00A5C 809B437C AFB9001C */ sw $t9, 0x001C($sp) +/* 00A60 809B4380 AFB80018 */ sw $t8, 0x0018($sp) +/* 00A64 809B4384 AFAF0014 */ sw $t7, 0x0014($sp) +/* 00A68 809B4388 AFAE0010 */ sw $t6, 0x0010($sp) /* 00A6C 809B438C 26050100 */ addiu $a1, $s0, 0x0100 ## $a1 = 00000100 -/* 00A70 809B4390 8FA60044 */ lw $a2, 0x0044($sp) +/* 00A70 809B4390 8FA60044 */ lw $a2, 0x0044($sp) /* 00A74 809B4394 27A70084 */ addiu $a3, $sp, 0x0084 ## $a3 = FFFFFFEC -/* 00A78 809B4398 0C00F80B */ jal func_8003E02C +/* 00A78 809B4398 0C00F80B */ jal func_8003E02C /* 00A7C 809B439C 248407C0 */ addiu $a0, $a0, 0x07C0 ## $a0 = 000007C0 /* 00A80 809B43A0 304A00FF */ andi $t2, $v0, 0x00FF ## $t2 = 00000000 -/* 00A84 809B43A4 1140000E */ beq $t2, $zero, .L809B43E0 +/* 00A84 809B43A4 1140000E */ beq $t2, $zero, .L809B43E0 /* 00A88 809B43A8 A202024A */ sb $v0, 0x024A($s0) ## 0000024A /* 00A8C 809B43AC 8E060074 */ lw $a2, 0x0074($s0) ## 00000074 /* 00A90 809B43B0 27AB0084 */ addiu $t3, $sp, 0x0084 ## $t3 = FFFFFFEC -/* 00A94 809B43B4 AFAB0010 */ sw $t3, 0x0010($sp) -/* 00A98 809B43B8 8FA4009C */ lw $a0, 0x009C($sp) +/* 00A94 809B43B4 AFAB0010 */ sw $t3, 0x0010($sp) +/* 00A98 809B43B8 8FA4009C */ lw $a0, 0x009C($sp) /* 00A9C 809B43BC 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 00AA0 809B43C0 0C00BE7B */ jal func_8002F9EC -/* 00AA4 809B43C4 8FA70090 */ lw $a3, 0x0090($sp) +/* 00AA0 809B43C0 0C00BE7B */ jal func_8002F9EC +/* 00AA4 809B43C4 8FA70090 */ lw $a3, 0x0090($sp) /* 00AA8 809B43C8 27A40078 */ addiu $a0, $sp, 0x0078 ## $a0 = FFFFFFE0 /* 00AAC 809B43CC 0C01DF90 */ jal Math_Vec3f_Copy ## Vec3f_Copy -/* 00AB0 809B43D0 8FA50044 */ lw $a1, 0x0044($sp) -/* 00AB4 809B43D4 8FA40044 */ lw $a0, 0x0044($sp) +/* 00AB0 809B43D0 8FA50044 */ lw $a1, 0x0044($sp) +/* 00AB4 809B43D4 8FA40044 */ lw $a0, 0x0044($sp) /* 00AB8 809B43D8 0C01DF90 */ jal Math_Vec3f_Copy ## Vec3f_Copy /* 00ABC 809B43DC 27A50084 */ addiu $a1, $sp, 0x0084 ## $a1 = FFFFFFEC .L809B43E0: /* 00AC0 809B43E0 860C001C */ lh $t4, 0x001C($s0) ## 0000001C -/* 00AC4 809B43E4 29810009 */ slti $at, $t4, 0x0009 -/* 00AC8 809B43E8 50200007 */ beql $at, $zero, .L809B4408 +/* 00AC4 809B43E4 29810009 */ slti $at, $t4, 0x0009 +/* 00AC8 809B43E8 50200007 */ beql $at, $zero, .L809B4408 /* 00ACC 809B43EC 8E02024C */ lw $v0, 0x024C($s0) ## 0000024C /* 00AD0 809B43F0 C60E0060 */ lwc1 $f14, 0x0060($s0) ## 00000060 /* 00AD4 809B43F4 C60C0068 */ lwc1 $f12, 0x0068($s0) ## 00000068 /* 00AD8 809B43F8 0C034199 */ jal atan2s - -/* 00ADC 809B43FC 46007387 */ neg.s $f14, $f14 + +/* 00ADC 809B43FC 46007387 */ neg.s $f14, $f14 /* 00AE0 809B4400 A60200B4 */ sh $v0, 0x00B4($s0) ## 000000B4 .L809B4404: /* 00AE4 809B4404 8E02024C */ lw $v0, 0x024C($s0) ## 0000024C .L809B4408: -/* 00AE8 809B4408 50400071 */ beql $v0, $zero, .L809B45D0 -/* 00AEC 809B440C 8FBF0034 */ lw $ra, 0x0034($sp) +/* 00AE8 809B4408 50400071 */ beql $v0, $zero, .L809B45D0 +/* 00AEC 809B440C 8FBF0034 */ lw $ra, 0x0034($sp) /* 00AF0 809B4410 8C4D0130 */ lw $t5, 0x0130($v0) ## 00000130 /* 00AF4 809B4414 26040210 */ addiu $a0, $s0, 0x0210 ## $a0 = 00000210 /* 00AF8 809B4418 26050250 */ addiu $a1, $s0, 0x0250 ## $a1 = 00000250 -/* 00AFC 809B441C 11A0006A */ beq $t5, $zero, .L809B45C8 -/* 00B00 809B4420 8FAE009C */ lw $t6, 0x009C($sp) +/* 00AFC 809B441C 11A0006A */ beq $t5, $zero, .L809B45C8 +/* 00B00 809B4420 8FAE009C */ lw $t6, 0x009C($sp) /* 00B04 809B4424 25CF07C0 */ addiu $t7, $t6, 0x07C0 ## $t7 = 000007C0 -/* 00B08 809B4428 AFAF003C */ sw $t7, 0x003C($sp) +/* 00B08 809B4428 AFAF003C */ sw $t7, 0x003C($sp) /* 00B0C 809B442C 27A60060 */ addiu $a2, $sp, 0x0060 ## $a2 = FFFFFFC8 /* 00B10 809B4430 0C01DFA7 */ jal Math_Vec3f_Sum ## Vec3f_Add -/* 00B14 809B4434 AFA50040 */ sw $a1, 0x0040($sp) -/* 00B18 809B4438 8FA40044 */ lw $a0, 0x0044($sp) -/* 00B1C 809B443C 8FA50040 */ lw $a1, 0x0040($sp) +/* 00B14 809B4434 AFA50040 */ sw $a1, 0x0040($sp) +/* 00B18 809B4438 8FA40044 */ lw $a0, 0x0044($sp) +/* 00B1C 809B443C 8FA50040 */ lw $a1, 0x0040($sp) /* 00B20 809B4440 0C01DFA7 */ jal Math_Vec3f_Sum ## Vec3f_Add /* 00B24 809B4444 27A60054 */ addiu $a2, $sp, 0x0054 ## $a2 = FFFFFFBC @@ -321,73 +321,73 @@ glabel func_809B3FDC /* 00B34 809B4454 24090001 */ addiu $t1, $zero, 0x0001 ## $t1 = 00000001 /* 00B38 809B4458 240A0001 */ addiu $t2, $zero, 0x0001 ## $t2 = 00000001 /* 00B3C 809B445C 27AB0090 */ addiu $t3, $sp, 0x0090 ## $t3 = FFFFFFF8 -/* 00B40 809B4460 AFAB0024 */ sw $t3, 0x0024($sp) -/* 00B44 809B4464 AFAA0020 */ sw $t2, 0x0020($sp) -/* 00B48 809B4468 AFA9001C */ sw $t1, 0x001C($sp) -/* 00B4C 809B446C AFA80018 */ sw $t0, 0x0018($sp) -/* 00B50 809B4470 AFB90014 */ sw $t9, 0x0014($sp) -/* 00B54 809B4474 AFB80010 */ sw $t8, 0x0010($sp) -/* 00B58 809B4478 8FA4003C */ lw $a0, 0x003C($sp) +/* 00B40 809B4460 AFAB0024 */ sw $t3, 0x0024($sp) +/* 00B44 809B4464 AFAA0020 */ sw $t2, 0x0020($sp) +/* 00B48 809B4468 AFA9001C */ sw $t1, 0x001C($sp) +/* 00B4C 809B446C AFA80018 */ sw $t0, 0x0018($sp) +/* 00B50 809B4470 AFB90014 */ sw $t9, 0x0014($sp) +/* 00B54 809B4474 AFB80010 */ sw $t8, 0x0010($sp) +/* 00B58 809B4478 8FA4003C */ lw $a0, 0x003C($sp) /* 00B5C 809B447C 27A50060 */ addiu $a1, $sp, 0x0060 ## $a1 = FFFFFFC8 /* 00B60 809B4480 27A60054 */ addiu $a2, $sp, 0x0054 ## $a2 = FFFFFFBC -/* 00B64 809B4484 0C00F7A1 */ jal func_8003DE84 +/* 00B64 809B4484 0C00F7A1 */ jal func_8003DE84 /* 00B68 809B4488 27A70084 */ addiu $a3, $sp, 0x0084 ## $a3 = FFFFFFEC -/* 00B6C 809B448C 1040003D */ beq $v0, $zero, .L809B4584 -/* 00B70 809B4490 8FA40044 */ lw $a0, 0x0044($sp) -/* 00B74 809B4494 C7B20084 */ lwc1 $f18, 0x0084($sp) -/* 00B78 809B4498 C7A40054 */ lwc1 $f4, 0x0054($sp) -/* 00B7C 809B449C C7A80084 */ lwc1 $f8, 0x0084($sp) +/* 00B6C 809B448C 1040003D */ beq $v0, $zero, .L809B4584 +/* 00B70 809B4490 8FA40044 */ lw $a0, 0x0044($sp) +/* 00B74 809B4494 C7B20084 */ lwc1 $f18, 0x0084($sp) +/* 00B78 809B4498 C7A40054 */ lwc1 $f4, 0x0054($sp) +/* 00B7C 809B449C C7A80084 */ lwc1 $f8, 0x0084($sp) /* 00B80 809B44A0 3C01BF80 */ lui $at, 0xBF80 ## $at = BF800000 -/* 00B84 809B44A4 4612203E */ c.le.s $f4, $f18 +/* 00B84 809B44A4 4612203E */ c.le.s $f4, $f18 /* 00B88 809B44A8 00000000 */ nop -/* 00B8C 809B44AC 45020008 */ bc1fl .L809B44D0 +/* 00B8C 809B44AC 45020008 */ bc1fl .L809B44D0 /* 00B90 809B44B0 44816000 */ mtc1 $at, $f12 ## $f12 = -1.00 /* 00B94 809B44B4 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 /* 00B98 809B44B8 44811000 */ mtc1 $at, $f2 ## $f2 = 1.00 /* 00B9C 809B44BC 3C01BF80 */ lui $at, 0xBF80 ## $at = BF800000 /* 00BA0 809B44C0 44816000 */ mtc1 $at, $f12 ## $f12 = -1.00 -/* 00BA4 809B44C4 10000005 */ beq $zero, $zero, .L809B44DC -/* 00BA8 809B44C8 46001006 */ mov.s $f0, $f2 +/* 00BA4 809B44C4 10000005 */ beq $zero, $zero, .L809B44DC +/* 00BA8 809B44C8 46001006 */ mov.s $f0, $f2 /* 00BAC 809B44CC 44816000 */ mtc1 $at, $f12 ## $f12 = -1.00 .L809B44D0: /* 00BB0 809B44D0 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 /* 00BB4 809B44D4 44811000 */ mtc1 $at, $f2 ## $f2 = 1.00 -/* 00BB8 809B44D8 46006006 */ mov.s $f0, $f12 +/* 00BB8 809B44D8 46006006 */ mov.s $f0, $f12 .L809B44DC: -/* 00BBC 809B44DC 46080180 */ add.s $f6, $f0, $f8 +/* 00BBC 809B44DC 46080180 */ add.s $f6, $f0, $f8 /* 00BC0 809B44E0 8E0C024C */ lw $t4, 0x024C($s0) ## 0000024C /* 00BC4 809B44E4 E5860024 */ swc1 $f6, 0x0024($t4) ## 00000024 -/* 00BC8 809B44E8 C7AA0088 */ lwc1 $f10, 0x0088($sp) -/* 00BCC 809B44EC C7B00058 */ lwc1 $f16, 0x0058($sp) -/* 00BD0 809B44F0 C7B20088 */ lwc1 $f18, 0x0088($sp) -/* 00BD4 809B44F4 460A803E */ c.le.s $f16, $f10 +/* 00BC8 809B44E8 C7AA0088 */ lwc1 $f10, 0x0088($sp) +/* 00BCC 809B44EC C7B00058 */ lwc1 $f16, 0x0058($sp) +/* 00BD0 809B44F0 C7B20088 */ lwc1 $f18, 0x0088($sp) +/* 00BD4 809B44F4 460A803E */ c.le.s $f16, $f10 /* 00BD8 809B44F8 00000000 */ nop -/* 00BDC 809B44FC 45020004 */ bc1fl .L809B4510 -/* 00BE0 809B4500 46006006 */ mov.s $f0, $f12 -/* 00BE4 809B4504 10000002 */ beq $zero, $zero, .L809B4510 -/* 00BE8 809B4508 46001006 */ mov.s $f0, $f2 -/* 00BEC 809B450C 46006006 */ mov.s $f0, $f12 +/* 00BDC 809B44FC 45020004 */ bc1fl .L809B4510 +/* 00BE0 809B4500 46006006 */ mov.s $f0, $f12 +/* 00BE4 809B4504 10000002 */ beq $zero, $zero, .L809B4510 +/* 00BE8 809B4508 46001006 */ mov.s $f0, $f2 +/* 00BEC 809B450C 46006006 */ mov.s $f0, $f12 .L809B4510: -/* 00BF0 809B4510 46120100 */ add.s $f4, $f0, $f18 +/* 00BF0 809B4510 46120100 */ add.s $f4, $f0, $f18 /* 00BF4 809B4514 8E0D024C */ lw $t5, 0x024C($s0) ## 0000024C /* 00BF8 809B4518 E5A40028 */ swc1 $f4, 0x0028($t5) ## 00000028 -/* 00BFC 809B451C C7A8008C */ lwc1 $f8, 0x008C($sp) -/* 00C00 809B4520 C7A6005C */ lwc1 $f6, 0x005C($sp) -/* 00C04 809B4524 C7AA008C */ lwc1 $f10, 0x008C($sp) -/* 00C08 809B4528 4608303E */ c.le.s $f6, $f8 +/* 00BFC 809B451C C7A8008C */ lwc1 $f8, 0x008C($sp) +/* 00C00 809B4520 C7A6005C */ lwc1 $f6, 0x005C($sp) +/* 00C04 809B4524 C7AA008C */ lwc1 $f10, 0x008C($sp) +/* 00C08 809B4528 4608303E */ c.le.s $f6, $f8 /* 00C0C 809B452C 00000000 */ nop -/* 00C10 809B4530 45020004 */ bc1fl .L809B4544 -/* 00C14 809B4534 46006006 */ mov.s $f0, $f12 -/* 00C18 809B4538 10000002 */ beq $zero, $zero, .L809B4544 -/* 00C1C 809B453C 46001006 */ mov.s $f0, $f2 -/* 00C20 809B4540 46006006 */ mov.s $f0, $f12 +/* 00C10 809B4530 45020004 */ bc1fl .L809B4544 +/* 00C14 809B4534 46006006 */ mov.s $f0, $f12 +/* 00C18 809B4538 10000002 */ beq $zero, $zero, .L809B4544 +/* 00C1C 809B453C 46001006 */ mov.s $f0, $f2 +/* 00C20 809B4540 46006006 */ mov.s $f0, $f12 .L809B4544: -/* 00C24 809B4544 460A0400 */ add.s $f16, $f0, $f10 +/* 00C24 809B4544 460A0400 */ add.s $f16, $f0, $f10 /* 00C28 809B4548 8E0E024C */ lw $t6, 0x024C($s0) ## 0000024C /* 00C2C 809B454C E5D0002C */ swc1 $f16, 0x002C($t6) ## 0000002C /* 00C30 809B4550 8E04024C */ lw $a0, 0x024C($s0) ## 0000024C -/* 00C34 809B4554 8FA60040 */ lw $a2, 0x0040($sp) -/* 00C38 809B4558 8FA50044 */ lw $a1, 0x0044($sp) +/* 00C34 809B4554 8FA60040 */ lw $a2, 0x0040($sp) +/* 00C38 809B4558 8FA50044 */ lw $a1, 0x0044($sp) /* 00C3C 809B455C 0C01DFB4 */ jal Math_Vec3f_Diff ## Vec3f_Sub /* 00C40 809B4560 24840024 */ addiu $a0, $a0, 0x0024 ## $a0 = 00000024 @@ -395,38 +395,38 @@ glabel func_809B3FDC /* 00C48 809B4568 3C01FFFF */ lui $at, 0xFFFF ## $at = FFFF0000 /* 00C4C 809B456C 34217FFF */ ori $at, $at, 0x7FFF ## $at = FFFF7FFF /* 00C50 809B4570 8C4F0004 */ lw $t7, 0x0004($v0) ## 00000004 -/* 00C54 809B4574 01E1C024 */ and $t8, $t7, $at +/* 00C54 809B4574 01E1C024 */ and $t8, $t7, $at /* 00C58 809B4578 AC580004 */ sw $t8, 0x0004($v0) ## 00000004 -/* 00C5C 809B457C 10000005 */ beq $zero, $zero, .L809B4594 +/* 00C5C 809B457C 10000005 */ beq $zero, $zero, .L809B4594 /* 00C60 809B4580 AE00024C */ sw $zero, 0x024C($s0) ## 0000024C .L809B4584: /* 00C64 809B4584 8E06024C */ lw $a2, 0x024C($s0) ## 0000024C -/* 00C68 809B4588 8FA50040 */ lw $a1, 0x0040($sp) +/* 00C68 809B4588 8FA50040 */ lw $a1, 0x0040($sp) /* 00C6C 809B458C 0C01DFA7 */ jal Math_Vec3f_Sum ## Vec3f_Add /* 00C70 809B4590 24C60024 */ addiu $a2, $a2, 0x0024 ## $a2 = 00000024 .L809B4594: /* 00C74 809B4594 9219024A */ lbu $t9, 0x024A($s0) ## 0000024A -/* 00C78 809B4598 5320000D */ beql $t9, $zero, .L809B45D0 -/* 00C7C 809B459C 8FBF0034 */ lw $ra, 0x0034($sp) +/* 00C78 809B4598 5320000D */ beql $t9, $zero, .L809B45D0 +/* 00C7C 809B459C 8FBF0034 */ lw $ra, 0x0034($sp) /* 00C80 809B45A0 8E02024C */ lw $v0, 0x024C($s0) ## 0000024C -/* 00C84 809B45A4 5040000A */ beql $v0, $zero, .L809B45D0 -/* 00C88 809B45A8 8FBF0034 */ lw $ra, 0x0034($sp) +/* 00C84 809B45A4 5040000A */ beql $v0, $zero, .L809B45D0 +/* 00C88 809B45A8 8FBF0034 */ lw $ra, 0x0034($sp) /* 00C8C 809B45AC 8C480004 */ lw $t0, 0x0004($v0) ## 00000004 /* 00C90 809B45B0 3C01FFFF */ lui $at, 0xFFFF ## $at = FFFF0000 /* 00C94 809B45B4 34217FFF */ ori $at, $at, 0x7FFF ## $at = FFFF7FFF -/* 00C98 809B45B8 01014824 */ and $t1, $t0, $at +/* 00C98 809B45B8 01014824 */ and $t1, $t0, $at /* 00C9C 809B45BC AC490004 */ sw $t1, 0x0004($v0) ## 00000004 -/* 00CA0 809B45C0 10000002 */ beq $zero, $zero, .L809B45CC +/* 00CA0 809B45C0 10000002 */ beq $zero, $zero, .L809B45CC /* 00CA4 809B45C4 AE00024C */ sw $zero, 0x024C($s0) ## 0000024C .L809B45C8: /* 00CA8 809B45C8 AE00024C */ sw $zero, 0x024C($s0) ## 0000024C .L809B45CC: -/* 00CAC 809B45CC 8FBF0034 */ lw $ra, 0x0034($sp) +/* 00CAC 809B45CC 8FBF0034 */ lw $ra, 0x0034($sp) .L809B45D0: -/* 00CB0 809B45D0 8FB00030 */ lw $s0, 0x0030($sp) +/* 00CB0 809B45D0 8FB00030 */ lw $s0, 0x0030($sp) /* 00CB4 809B45D4 27BD0098 */ addiu $sp, $sp, 0x0098 ## $sp = 00000000 -/* 00CB8 809B45D8 03E00008 */ jr $ra +/* 00CB8 809B45D8 03E00008 */ jr $ra /* 00CBC 809B45DC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Attack_Niw/EnAttackNiw_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Attack_Niw/EnAttackNiw_Draw.s index 8c647b55cb..66144c5c94 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Attack_Niw/EnAttackNiw_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Attack_Niw/EnAttackNiw_Draw.s @@ -1,24 +1,24 @@ glabel EnAttackNiw_Draw /* 00FF0 809B60F0 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 00FF4 809B60F4 AFBF0024 */ sw $ra, 0x0024($sp) -/* 00FF8 809B60F8 AFA40028 */ sw $a0, 0x0028($sp) -/* 00FFC 809B60FC AFA5002C */ sw $a1, 0x002C($sp) -/* 01000 809B6100 0C024F46 */ jal func_80093D18 +/* 00FF4 809B60F4 AFBF0024 */ sw $ra, 0x0024($sp) +/* 00FF8 809B60F8 AFA40028 */ sw $a0, 0x0028($sp) +/* 00FFC 809B60FC AFA5002C */ sw $a1, 0x002C($sp) +/* 01000 809B6100 0C024F46 */ jal func_80093D18 /* 01004 809B6104 8CA40000 */ lw $a0, 0x0000($a1) ## 00000000 -/* 01008 809B6108 8FA20028 */ lw $v0, 0x0028($sp) +/* 01008 809B6108 8FA20028 */ lw $v0, 0x0028($sp) /* 0100C 809B610C 3C0F809B */ lui $t7, %hi(func_809B5F98) ## $t7 = 809B0000 /* 01010 809B6110 25EF5F98 */ addiu $t7, $t7, %lo(func_809B5F98) ## $t7 = 809B5F98 /* 01014 809B6114 8C450150 */ lw $a1, 0x0150($v0) ## 00000150 /* 01018 809B6118 8C46016C */ lw $a2, 0x016C($v0) ## 0000016C /* 0101C 809B611C 9047014E */ lbu $a3, 0x014E($v0) ## 0000014E -/* 01020 809B6120 AFA00014 */ sw $zero, 0x0014($sp) -/* 01024 809B6124 AFAF0010 */ sw $t7, 0x0010($sp) -/* 01028 809B6128 8FA4002C */ lw $a0, 0x002C($sp) -/* 0102C 809B612C 0C0286B2 */ jal func_800A1AC8 -/* 01030 809B6130 AFA20018 */ sw $v0, 0x0018($sp) -/* 01034 809B6134 8FBF0024 */ lw $ra, 0x0024($sp) +/* 01020 809B6120 AFA00014 */ sw $zero, 0x0014($sp) +/* 01024 809B6124 AFAF0010 */ sw $t7, 0x0010($sp) +/* 01028 809B6128 8FA4002C */ lw $a0, 0x002C($sp) +/* 0102C 809B612C 0C0286B2 */ jal SkelAnime_DrawSV +/* 01030 809B6130 AFA20018 */ sw $v0, 0x0018($sp) +/* 01034 809B6134 8FBF0024 */ lw $ra, 0x0024($sp) /* 01038 809B6138 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 0103C 809B613C 03E00008 */ jr $ra +/* 0103C 809B613C 03E00008 */ jr $ra /* 01040 809B6140 00000000 */ nop /* 01044 809B6144 00000000 */ nop /* 01048 809B6148 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Attack_Niw/EnAttackNiw_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Attack_Niw/EnAttackNiw_Init.s index fa64187dcc..3bb2eae2ae 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Attack_Niw/EnAttackNiw_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Attack_Niw/EnAttackNiw_Init.s @@ -1,89 +1,89 @@ glabel EnAttackNiw_Init /* 00000 809B5100 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 00004 809B5104 AFA50034 */ sw $a1, 0x0034($sp) -/* 00008 809B5108 AFBF002C */ sw $ra, 0x002C($sp) -/* 0000C 809B510C AFB00028 */ sw $s0, 0x0028($sp) +/* 00004 809B5104 AFA50034 */ sw $a1, 0x0034($sp) +/* 00008 809B5108 AFBF002C */ sw $ra, 0x002C($sp) +/* 0000C 809B510C AFB00028 */ sw $s0, 0x0028($sp) /* 00010 809B5110 3C05809B */ lui $a1, %hi(D_809B6170) ## $a1 = 809B0000 /* 00014 809B5114 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 00018 809B5118 0C01E037 */ jal Actor_ProcessInitChain - + /* 0001C 809B511C 24A56170 */ addiu $a1, $a1, %lo(D_809B6170) ## $a1 = 809B6170 /* 00020 809B5120 3C068003 */ lui $a2, 0x8003 ## $a2 = 80030000 /* 00024 809B5124 24C6B5EC */ addiu $a2, $a2, 0xB5EC ## $a2 = 8002B5EC /* 00028 809B5128 260400B4 */ addiu $a0, $s0, 0x00B4 ## $a0 = 000000B4 /* 0002C 809B512C 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 /* 00030 809B5130 0C00AC78 */ jal ActorShape_Init - + /* 00034 809B5134 3C0741C8 */ lui $a3, 0x41C8 ## $a3 = 41C80000 /* 00038 809B5138 3C060600 */ lui $a2, 0x0600 ## $a2 = 06000000 /* 0003C 809B513C 3C070600 */ lui $a3, 0x0600 ## $a3 = 06000000 /* 00040 809B5140 260E0190 */ addiu $t6, $s0, 0x0190 ## $t6 = 00000190 /* 00044 809B5144 260F01F0 */ addiu $t7, $s0, 0x01F0 ## $t7 = 000001F0 /* 00048 809B5148 24180010 */ addiu $t8, $zero, 0x0010 ## $t8 = 00000010 -/* 0004C 809B514C AFB80018 */ sw $t8, 0x0018($sp) -/* 00050 809B5150 AFAF0014 */ sw $t7, 0x0014($sp) -/* 00054 809B5154 AFAE0010 */ sw $t6, 0x0010($sp) +/* 0004C 809B514C AFB80018 */ sw $t8, 0x0018($sp) +/* 00050 809B5150 AFAF0014 */ sw $t7, 0x0014($sp) +/* 00054 809B5154 AFAE0010 */ sw $t6, 0x0010($sp) /* 00058 809B5158 24E700E8 */ addiu $a3, $a3, 0x00E8 ## $a3 = 060000E8 /* 0005C 809B515C 24C62530 */ addiu $a2, $a2, 0x2530 ## $a2 = 06002530 -/* 00060 809B5160 8FA40034 */ lw $a0, 0x0034($sp) -/* 00064 809B5164 0C0291BE */ jal func_800A46F8 +/* 00060 809B5160 8FA40034 */ lw $a0, 0x0034($sp) +/* 00064 809B5164 0C0291BE */ jal SkelAnime_InitSV /* 00068 809B5168 2605014C */ addiu $a1, $s0, 0x014C ## $a1 = 0000014C /* 0006C 809B516C 8619001C */ lh $t9, 0x001C($s0) ## 0000001C /* 00070 809B5170 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 00074 809B5174 3C053C23 */ lui $a1, 0x3C23 ## $a1 = 3C230000 -/* 00078 809B5178 07210002 */ bgez $t9, .L809B5184 +/* 00078 809B5178 07210002 */ bgez $t9, .L809B5184 /* 0007C 809B517C 00000000 */ nop /* 00080 809B5180 A600001C */ sh $zero, 0x001C($s0) ## 0000001C .L809B5184: /* 00084 809B5184 0C00B58B */ jal Actor_SetScale - + /* 00088 809B5188 34A5D70A */ ori $a1, $a1, 0xD70A ## $a1 = 3C23D70A /* 0008C 809B518C 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 /* 00090 809B5190 3C0142C8 */ lui $at, 0x42C8 ## $at = 42C80000 /* 00094 809B5194 44816000 */ mtc1 $at, $f12 ## $f12 = 100.00 /* 00098 809B5198 0C00CFC8 */ jal Math_Rand_CenteredFloat - + /* 0009C 809B519C E604006C */ swc1 $f4, 0x006C($s0) ## 0000006C /* 000A0 809B51A0 3C014120 */ lui $at, 0x4120 ## $at = 41200000 /* 000A4 809B51A4 44816000 */ mtc1 $at, $f12 ## $f12 = 10.00 /* 000A8 809B51A8 0C00CFC8 */ jal Math_Rand_CenteredFloat - + /* 000AC 809B51AC E6000298 */ swc1 $f0, 0x0298($s0) ## 00000298 /* 000B0 809B51B0 3C0142C8 */ lui $at, 0x42C8 ## $at = 42C80000 /* 000B4 809B51B4 44816000 */ mtc1 $at, $f12 ## $f12 = 100.00 /* 000B8 809B51B8 0C00CFC8 */ jal Math_Rand_CenteredFloat - + /* 000BC 809B51BC E600029C */ swc1 $f0, 0x029C($s0) ## 0000029C /* 000C0 809B51C0 3C053C23 */ lui $a1, 0x3C23 ## $a1 = 3C230000 /* 000C4 809B51C4 E60002A0 */ swc1 $f0, 0x02A0($s0) ## 000002A0 /* 000C8 809B51C8 34A5D70A */ ori $a1, $a1, 0xD70A ## $a1 = 3C23D70A /* 000CC 809B51CC 0C00B58B */ jal Actor_SetScale - + /* 000D0 809B51D0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 000D4 809B51D4 8E080004 */ lw $t0, 0x0004($s0) ## 00000004 /* 000D8 809B51D8 2401FFFE */ addiu $at, $zero, 0xFFFE ## $at = FFFFFFFE -/* 000DC 809B51DC 01014824 */ and $t1, $t0, $at +/* 000DC 809B51DC 01014824 */ and $t1, $t0, $at /* 000E0 809B51E0 0C03F66B */ jal Math_Rand_ZeroOne ## Rand.Next() float /* 000E4 809B51E4 AE090004 */ sw $t1, 0x0004($s0) ## 00000004 /* 000E8 809B51E8 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 /* 000EC 809B51EC 44813000 */ mtc1 $at, $f6 ## $f6 = 0.50 /* 000F0 809B51F0 3C01809B */ lui $at, %hi(D_809B6190) ## $at = 809B0000 -/* 000F4 809B51F4 C42A6190 */ lwc1 $f10, %lo(D_809B6190)($at) -/* 000F8 809B51F8 46060201 */ sub.s $f8, $f0, $f6 +/* 000F4 809B51F4 C42A6190 */ lwc1 $f10, %lo(D_809B6190)($at) +/* 000F8 809B51F8 46060201 */ sub.s $f8, $f0, $f6 /* 000FC 809B51FC 3C0B809B */ lui $t3, %hi(func_809B5670) ## $t3 = 809B0000 /* 00100 809B5200 256B5670 */ addiu $t3, $t3, %lo(func_809B5670) ## $t3 = 809B5670 /* 00104 809B5204 AE0B0250 */ sw $t3, 0x0250($s0) ## 00000250 -/* 00108 809B5208 460A4402 */ mul.s $f16, $f8, $f10 -/* 0010C 809B520C 4600848D */ trunc.w.s $f18, $f16 -/* 00110 809B5210 44029000 */ mfc1 $v0, $f18 +/* 00108 809B5208 460A4402 */ mul.s $f16, $f8, $f10 +/* 0010C 809B520C 4600848D */ trunc.w.s $f18, $f16 +/* 00110 809B5210 44029000 */ mfc1 $v0, $f18 /* 00114 809B5214 00000000 */ nop /* 00118 809B5218 A6020032 */ sh $v0, 0x0032($s0) ## 00000032 /* 0011C 809B521C A60200B6 */ sh $v0, 0x00B6($s0) ## 000000B6 -/* 00120 809B5220 8FBF002C */ lw $ra, 0x002C($sp) -/* 00124 809B5224 8FB00028 */ lw $s0, 0x0028($sp) +/* 00120 809B5220 8FBF002C */ lw $ra, 0x002C($sp) +/* 00124 809B5224 8FB00028 */ lw $s0, 0x0028($sp) /* 00128 809B5228 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 0012C 809B522C 03E00008 */ jr $ra +/* 0012C 809B522C 03E00008 */ jr $ra /* 00130 809B5230 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ba/EnBa_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Ba/EnBa_Draw.s index dc6a2c7219..5f6e7be4e7 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ba/EnBa_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ba/EnBa_Draw.s @@ -1,19 +1,19 @@ glabel EnBa_Draw /* 018D8 809B7C28 27BDFF40 */ addiu $sp, $sp, 0xFF40 ## $sp = FFFFFF40 -/* 018DC 809B7C2C AFB20048 */ sw $s2, 0x0048($sp) +/* 018DC 809B7C2C AFB20048 */ sw $s2, 0x0048($sp) /* 018E0 809B7C30 00809025 */ or $s2, $a0, $zero ## $s2 = 00000000 -/* 018E4 809B7C34 AFBF005C */ sw $ra, 0x005C($sp) -/* 018E8 809B7C38 AFB60058 */ sw $s6, 0x0058($sp) -/* 018EC 809B7C3C AFB50054 */ sw $s5, 0x0054($sp) -/* 018F0 809B7C40 AFB40050 */ sw $s4, 0x0050($sp) -/* 018F4 809B7C44 AFB3004C */ sw $s3, 0x004C($sp) -/* 018F8 809B7C48 AFB10044 */ sw $s1, 0x0044($sp) -/* 018FC 809B7C4C AFB00040 */ sw $s0, 0x0040($sp) -/* 01900 809B7C50 F7B40038 */ sdc1 $f20, 0x0038($sp) -/* 01904 809B7C54 AFA500C4 */ sw $a1, 0x00C4($sp) +/* 018E4 809B7C34 AFBF005C */ sw $ra, 0x005C($sp) +/* 018E8 809B7C38 AFB60058 */ sw $s6, 0x0058($sp) +/* 018EC 809B7C3C AFB50054 */ sw $s5, 0x0054($sp) +/* 018F0 809B7C40 AFB40050 */ sw $s4, 0x0050($sp) +/* 018F4 809B7C44 AFB3004C */ sw $s3, 0x004C($sp) +/* 018F8 809B7C48 AFB10044 */ sw $s1, 0x0044($sp) +/* 018FC 809B7C4C AFB00040 */ sw $s0, 0x0040($sp) +/* 01900 809B7C50 F7B40038 */ sdc1 $f20, 0x0038($sp) +/* 01904 809B7C54 AFA500C4 */ sw $a1, 0x00C4($sp) /* 01908 809B7C58 8CA40000 */ lw $a0, 0x0000($a1) ## 00000000 /* 0190C 809B7C5C 0C031A73 */ jal Graph_Alloc - + /* 01910 809B7C60 24050380 */ addiu $a1, $zero, 0x0380 ## $a1 = 00000380 /* 01914 809B7C64 3C18809C */ lui $t8, %hi(D_809B8124) ## $t8 = 809C0000 /* 01918 809B7C68 27188124 */ addiu $t8, $t8, %lo(D_809B8124) ## $t8 = 809B8124 @@ -25,24 +25,24 @@ glabel EnBa_Draw /* 01930 809B7C80 ADF90004 */ sw $t9, 0x0004($t7) ## FFFFFFE8 /* 01934 809B7C84 3C06809C */ lui $a2, %hi(D_809B8130) ## $a2 = 809C0000 /* 01938 809B7C88 ADE90008 */ sw $t1, 0x0008($t7) ## FFFFFFEC -/* 0193C 809B7C8C 8FAA00C4 */ lw $t2, 0x00C4($sp) +/* 0193C 809B7C8C 8FAA00C4 */ lw $t2, 0x00C4($sp) /* 01940 809B7C90 00409825 */ or $s3, $v0, $zero ## $s3 = 00000000 /* 01944 809B7C94 24C68130 */ addiu $a2, $a2, %lo(D_809B8130) ## $a2 = 809B8130 /* 01948 809B7C98 8D450000 */ lw $a1, 0x0000($t2) ## 00000000 /* 0194C 809B7C9C 27A40090 */ addiu $a0, $sp, 0x0090 ## $a0 = FFFFFFD0 /* 01950 809B7CA0 240703A5 */ addiu $a3, $zero, 0x03A5 ## $a3 = 000003A5 -/* 01954 809B7CA4 0C031AB1 */ jal func_800C6AC4 +/* 01954 809B7CA4 0C031AB1 */ jal Graph_OpenDisps /* 01958 809B7CA8 00A0B025 */ or $s6, $a1, $zero ## $s6 = 00000000 -/* 0195C 809B7CAC 8FAB00C4 */ lw $t3, 0x00C4($sp) -/* 01960 809B7CB0 0C024F46 */ jal func_80093D18 +/* 0195C 809B7CAC 8FAB00C4 */ lw $t3, 0x00C4($sp) +/* 01960 809B7CB0 0C024F46 */ jal func_80093D18 /* 01964 809B7CB4 8D640000 */ lw $a0, 0x0000($t3) ## 00000000 /* 01968 809B7CB8 864C001C */ lh $t4, 0x001C($s2) ## 0000001C /* 0196C 809B7CBC 3C09DB06 */ lui $t1, 0xDB06 ## $t1 = DB060000 /* 01970 809B7CC0 35290020 */ ori $t1, $t1, 0x0020 ## $t1 = DB060020 -/* 01974 809B7CC4 29810003 */ slti $at, $t4, 0x0003 -/* 01978 809B7CC8 10200096 */ beq $at, $zero, .L809B7F24 +/* 01974 809B7CC4 29810003 */ slti $at, $t4, 0x0003 +/* 01978 809B7CC8 10200096 */ beq $at, $zero, .L809B7F24 /* 0197C 809B7CCC 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 01980 809B7CD0 0C034213 */ jal Matrix_Push +/* 01980 809B7CD0 0C034213 */ jal Matrix_Push /* 01984 809B7CD4 00000000 */ nop /* 01988 809B7CD8 8EC202C0 */ lw $v0, 0x02C0($s6) ## 000002C0 /* 0198C 809B7CDC 3C0EDB06 */ lui $t6, 0xDB06 ## $t6 = DB060000 @@ -60,23 +60,23 @@ glabel EnBa_Draw /* 019BC 809B7D0C 8659001C */ lh $t9, 0x001C($s2) ## 0000001C /* 019C0 809B7D10 3C04809C */ lui $a0, %hi(D_809B8118) ## $a0 = 809C0000 /* 019C4 809B7D14 3C0E8016 */ lui $t6, 0x8016 ## $t6 = 80160000 -/* 019C8 809B7D18 00194880 */ sll $t1, $t9, 2 -/* 019CC 809B7D1C 00892021 */ addu $a0, $a0, $t1 -/* 019D0 809B7D20 8C848118 */ lw $a0, %lo(D_809B8118)($a0) +/* 019C8 809B7D18 00194880 */ sll $t1, $t9, 2 +/* 019CC 809B7D1C 00892021 */ addu $a0, $a0, $t1 +/* 019D0 809B7D20 8C848118 */ lw $a0, %lo(D_809B8118)($a0) /* 019D4 809B7D24 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 /* 019D8 809B7D28 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF -/* 019DC 809B7D2C 00045900 */ sll $t3, $a0, 4 -/* 019E0 809B7D30 000B6702 */ srl $t4, $t3, 28 -/* 019E4 809B7D34 000C6880 */ sll $t5, $t4, 2 -/* 019E8 809B7D38 01CD7021 */ addu $t6, $t6, $t5 +/* 019DC 809B7D2C 00045900 */ sll $t3, $a0, 4 +/* 019E0 809B7D30 000B6702 */ srl $t4, $t3, 28 +/* 019E4 809B7D34 000C6880 */ sll $t5, $t4, 2 +/* 019E8 809B7D38 01CD7021 */ addu $t6, $t6, $t5 /* 019EC 809B7D3C 8DCE6FA8 */ lw $t6, 0x6FA8($t6) ## 80166FA8 -/* 019F0 809B7D40 00815024 */ and $t2, $a0, $at +/* 019F0 809B7D40 00815024 */ and $t2, $a0, $at /* 019F4 809B7D44 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 019F8 809B7D48 014E7821 */ addu $t7, $t2, $t6 -/* 019FC 809B7D4C 01E1C021 */ addu $t8, $t7, $at +/* 019F8 809B7D48 014E7821 */ addu $t7, $t2, $t6 +/* 019FC 809B7D4C 01E1C021 */ addu $t8, $t7, $at /* 01A00 809B7D50 AC580004 */ sw $t8, 0x0004($v0) ## 00000004 /* 01A04 809B7D54 8EC202C0 */ lw $v0, 0x02C0($s6) ## 000002C0 -/* 01A08 809B7D58 8FA300C4 */ lw $v1, 0x00C4($sp) +/* 01A08 809B7D58 8FA300C4 */ lw $v1, 0x00C4($sp) /* 01A0C 809B7D5C 3C09DB06 */ lui $t1, 0xDB06 ## $t1 = DB060000 /* 01A10 809B7D60 24590008 */ addiu $t9, $v0, 0x0008 ## $t9 = 00000008 /* 01A14 809B7D64 AED902C0 */ sw $t9, 0x02C0($s6) ## 000002C0 @@ -87,26 +87,26 @@ glabel EnBa_Draw /* 01A28 809B7D78 240D0001 */ addiu $t5, $zero, 0x0001 ## $t5 = 00000001 /* 01A2C 809B7D7C 240C0010 */ addiu $t4, $zero, 0x0010 ## $t4 = 00000010 /* 01A30 809B7D80 240B0010 */ addiu $t3, $zero, 0x0010 ## $t3 = 00000010 -/* 01A34 809B7D84 AFAB0010 */ sw $t3, 0x0010($sp) -/* 01A38 809B7D88 AFAC0014 */ sw $t4, 0x0014($sp) -/* 01A3C 809B7D8C AFAD0018 */ sw $t5, 0x0018($sp) -/* 01A40 809B7D90 AFA0001C */ sw $zero, 0x001C($sp) -/* 01A44 809B7D94 01435021 */ addu $t2, $t2, $v1 +/* 01A34 809B7D84 AFAB0010 */ sw $t3, 0x0010($sp) +/* 01A38 809B7D88 AFAC0014 */ sw $t4, 0x0014($sp) +/* 01A3C 809B7D8C AFAD0018 */ sw $t5, 0x0018($sp) +/* 01A40 809B7D90 AFA0001C */ sw $zero, 0x001C($sp) +/* 01A44 809B7D94 01435021 */ addu $t2, $t2, $v1 /* 01A48 809B7D98 8D4A1DE4 */ lw $t2, 0x1DE4($t2) ## 00011DE4 /* 01A4C 809B7D9C 24190020 */ addiu $t9, $zero, 0x0020 ## $t9 = 00000020 /* 01A50 809B7DA0 24180020 */ addiu $t8, $zero, 0x0020 ## $t8 = 00000020 -/* 01A54 809B7DA4 000A0823 */ subu $at, $zero, $t2 -/* 01A58 809B7DA8 00017080 */ sll $t6, $at, 2 -/* 01A5C 809B7DAC 01C17021 */ addu $t6, $t6, $at -/* 01A60 809B7DB0 000E7040 */ sll $t6, $t6, 1 +/* 01A54 809B7DA4 000A0823 */ subu $at, $zero, $t2 +/* 01A58 809B7DA8 00017080 */ sll $t6, $at, 2 +/* 01A5C 809B7DAC 01C17021 */ addu $t6, $t6, $at +/* 01A60 809B7DB0 000E7040 */ sll $t6, $t6, 1 /* 01A64 809B7DB4 31CF007F */ andi $t7, $t6, 0x007F ## $t7 = 00000000 -/* 01A68 809B7DB8 AFAF0020 */ sw $t7, 0x0020($sp) -/* 01A6C 809B7DBC AFB80024 */ sw $t8, 0x0024($sp) -/* 01A70 809B7DC0 AFB90028 */ sw $t9, 0x0028($sp) +/* 01A68 809B7DB8 AFAF0020 */ sw $t7, 0x0020($sp) +/* 01A6C 809B7DBC AFB80024 */ sw $t8, 0x0024($sp) +/* 01A70 809B7DC0 AFB90028 */ sw $t9, 0x0028($sp) /* 01A74 809B7DC4 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 01A78 809B7DC8 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 /* 01A7C 809B7DCC 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 01A80 809B7DD0 0C0253D0 */ jal Draw_TwoTexScroll +/* 01A80 809B7DD0 0C0253D0 */ jal Gfx_TwoTexScroll /* 01A84 809B7DD4 00408025 */ or $s0, $v0, $zero ## $s0 = 00000000 /* 01A88 809B7DD8 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 /* 01A8C 809B7DDC 4481A000 */ mtc1 $at, $f20 ## $f20 = 0.50 @@ -115,62 +115,62 @@ glabel EnBa_Draw /* 01A98 809B7DE8 2415000D */ addiu $s5, $zero, 0x000D ## $s5 = 0000000D /* 01A9C 809B7DEC 24140006 */ addiu $s4, $zero, 0x0006 ## $s4 = 00000006 .L809B7DF0: -/* 01AA0 809B7DF0 00114880 */ sll $t1, $s1, 2 -/* 01AA4 809B7DF4 01314823 */ subu $t1, $t1, $s1 -/* 01AA8 809B7DF8 00094880 */ sll $t1, $t1, 2 -/* 01AAC 809B7DFC 02498021 */ addu $s0, $s2, $t1 +/* 01AA0 809B7DF0 00114880 */ sll $t1, $s1, 2 +/* 01AA4 809B7DF4 01314823 */ subu $t1, $t1, $s1 +/* 01AA8 809B7DF8 00094880 */ sll $t1, $t1, 2 +/* 01AAC 809B7DFC 02498021 */ addu $s0, $s2, $t1 /* 01AB0 809B7E00 C60C0158 */ lwc1 $f12, 0x0158($s0) ## 00000158 /* 01AB4 809B7E04 C60E015C */ lwc1 $f14, 0x015C($s0) ## 0000015C /* 01AB8 809B7E08 8E060160 */ lw $a2, 0x0160($s0) ## 00000160 -/* 01ABC 809B7E0C 0C034261 */ jal Matrix_Translate +/* 01ABC 809B7E0C 0C034261 */ jal Matrix_Translate /* 01AC0 809B7E10 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 01AC4 809B7E14 02340019 */ multu $s1, $s4 +/* 01AC4 809B7E14 02340019 */ multu $s1, $s4 /* 01AC8 809B7E18 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 01ACC 809B7E1C 00005812 */ mflo $t3 -/* 01AD0 809B7E20 024B1021 */ addu $v0, $s2, $t3 +/* 01ACC 809B7E1C 00005812 */ mflo $t3 +/* 01AD0 809B7E20 024B1021 */ addu $v0, $s2, $t3 /* 01AD4 809B7E24 844402A8 */ lh $a0, 0x02A8($v0) ## 000002A8 /* 01AD8 809B7E28 844502AA */ lh $a1, 0x02AA($v0) ## 000002AA -/* 01ADC 809B7E2C 0C034421 */ jal Matrix_RotateXYZ +/* 01ADC 809B7E2C 0C034421 */ jal Matrix_RotateZYX /* 01AE0 809B7E30 844602AC */ lh $a2, 0x02AC($v0) ## 000002AC /* 01AE4 809B7E34 C60C0200 */ lwc1 $f12, 0x0200($s0) ## 00000200 /* 01AE8 809B7E38 C60E0204 */ lwc1 $f14, 0x0204($s0) ## 00000204 /* 01AEC 809B7E3C 8E060208 */ lw $a2, 0x0208($s0) ## 00000208 -/* 01AF0 809B7E40 0C0342A3 */ jal Matrix_Scale +/* 01AF0 809B7E40 0C0342A3 */ jal Matrix_Scale /* 01AF4 809B7E44 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 01AF8 809B7E48 12340003 */ beq $s1, $s4, .L809B7E58 +/* 01AF8 809B7E48 12340003 */ beq $s1, $s4, .L809B7E58 /* 01AFC 809B7E4C 00000000 */ nop -/* 01B00 809B7E50 16350010 */ bne $s1, $s5, .L809B7E94 +/* 01B00 809B7E50 16350010 */ bne $s1, $s5, .L809B7E94 /* 01B04 809B7E54 00000000 */ nop .L809B7E58: -/* 01B08 809B7E58 16350006 */ bne $s1, $s5, .L809B7E74 +/* 01B08 809B7E58 16350006 */ bne $s1, $s5, .L809B7E74 /* 01B0C 809B7E5C 26500320 */ addiu $s0, $s2, 0x0320 ## $s0 = 00000320 /* 01B10 809B7E60 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 01B14 809B7E64 0C018A29 */ jal func_800628A4 +/* 01B14 809B7E64 0C018A29 */ jal func_800628A4 /* 01B18 809B7E68 02002825 */ or $a1, $s0, $zero ## $a1 = 00000320 -/* 01B1C 809B7E6C 10000009 */ beq $zero, $zero, .L809B7E94 +/* 01B1C 809B7E6C 10000009 */ beq $zero, $zero, .L809B7E94 /* 01B20 809B7E70 00000000 */ nop .L809B7E74: -/* 01B24 809B7E74 4600A306 */ mov.s $f12, $f20 -/* 01B28 809B7E78 4600A386 */ mov.s $f14, $f20 +/* 01B24 809B7E74 4600A306 */ mov.s $f12, $f20 +/* 01B28 809B7E78 4600A386 */ mov.s $f14, $f20 /* 01B2C 809B7E7C 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 01B30 809B7E80 0C0342A3 */ jal Matrix_Scale +/* 01B30 809B7E80 0C0342A3 */ jal Matrix_Scale /* 01B34 809B7E84 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 /* 01B38 809B7E88 24040008 */ addiu $a0, $zero, 0x0008 ## $a0 = 00000008 -/* 01B3C 809B7E8C 0C018A29 */ jal func_800628A4 +/* 01B3C 809B7E8C 0C018A29 */ jal func_800628A4 /* 01B40 809B7E90 02002825 */ or $a1, $s0, $zero ## $a1 = 00000320 .L809B7E94: /* 01B44 809B7E94 3C05809C */ lui $a1, %hi(D_809B8140) ## $a1 = 809C0000 /* 01B48 809B7E98 24A58140 */ addiu $a1, $a1, %lo(D_809B8140) ## $a1 = 809B8140 /* 01B4C 809B7E9C 02602025 */ or $a0, $s3, $zero ## $a0 = 00000000 -/* 01B50 809B7EA0 0C034695 */ jal Matrix_ToMtx +/* 01B50 809B7EA0 0C034695 */ jal Matrix_ToMtx /* 01B54 809B7EA4 240603CA */ addiu $a2, $zero, 0x03CA ## $a2 = 000003CA /* 01B58 809B7EA8 26310001 */ addiu $s1, $s1, 0x0001 ## $s1 = 00000001 -/* 01B5C 809B7EAC 00118C00 */ sll $s1, $s1, 16 -/* 01B60 809B7EB0 00118C03 */ sra $s1, $s1, 16 -/* 01B64 809B7EB4 2A21000E */ slti $at, $s1, 0x000E -/* 01B68 809B7EB8 1420FFCD */ bne $at, $zero, .L809B7DF0 +/* 01B5C 809B7EAC 00118C00 */ sll $s1, $s1, 16 +/* 01B60 809B7EB0 00118C03 */ sra $s1, $s1, 16 +/* 01B64 809B7EB4 2A21000E */ slti $at, $s1, 0x000E +/* 01B68 809B7EB8 1420FFCD */ bne $at, $zero, .L809B7DF0 /* 01B6C 809B7EBC 26730040 */ addiu $s3, $s3, 0x0040 ## $s3 = 00000040 -/* 01B70 809B7EC0 0C034221 */ jal Matrix_Pull +/* 01B70 809B7EC0 0C034221 */ jal Matrix_Pull /* 01B74 809B7EC4 00000000 */ nop /* 01B78 809B7EC8 8EC202C0 */ lw $v0, 0x02C0($s6) ## 000002C0 /* 01B7C 809B7ECC 3C0DDA38 */ lui $t5, 0xDA38 ## $t5 = DA380000 @@ -178,12 +178,12 @@ glabel EnBa_Draw /* 01B84 809B7ED4 244C0008 */ addiu $t4, $v0, 0x0008 ## $t4 = 00000008 /* 01B88 809B7ED8 AECC02C0 */ sw $t4, 0x02C0($s6) ## 000002C0 /* 01B8C 809B7EDC AC4D0000 */ sw $t5, 0x0000($v0) ## 00000000 -/* 01B90 809B7EE0 8FAA00C4 */ lw $t2, 0x00C4($sp) +/* 01B90 809B7EE0 8FAA00C4 */ lw $t2, 0x00C4($sp) /* 01B94 809B7EE4 3C05809C */ lui $a1, %hi(D_809B8150) ## $a1 = 809C0000 /* 01B98 809B7EE8 24A58150 */ addiu $a1, $a1, %lo(D_809B8150) ## $a1 = 809B8150 /* 01B9C 809B7EEC 240603CD */ addiu $a2, $zero, 0x03CD ## $a2 = 000003CD /* 01BA0 809B7EF0 00408025 */ or $s0, $v0, $zero ## $s0 = 00000000 -/* 01BA4 809B7EF4 0C0346A2 */ jal Matrix_NewMtx +/* 01BA4 809B7EF4 0C0346A2 */ jal Matrix_NewMtx /* 01BA8 809B7EF8 8D440000 */ lw $a0, 0x0000($t2) ## 00000000 /* 01BAC 809B7EFC AE020004 */ sw $v0, 0x0004($s0) ## 00000004 /* 01BB0 809B7F00 8EC202C0 */ lw $v0, 0x02C0($s6) ## 000002C0 @@ -193,7 +193,7 @@ glabel EnBa_Draw /* 01BC0 809B7F10 AECE02C0 */ sw $t6, 0x02C0($s6) ## 000002C0 /* 01BC4 809B7F14 3C0FDE00 */ lui $t7, 0xDE00 ## $t7 = DE000000 /* 01BC8 809B7F18 AC4F0000 */ sw $t7, 0x0000($v0) ## 00000000 -/* 01BCC 809B7F1C 1000003E */ beq $zero, $zero, .L809B8018 +/* 01BCC 809B7F1C 1000003E */ beq $zero, $zero, .L809B8018 /* 01BD0 809B7F20 AC580004 */ sw $t8, 0x0004($v0) ## 00000004 .L809B7F24: /* 01BD4 809B7F24 8EC202C0 */ lw $v0, 0x02C0($s6) ## 000002C0 @@ -202,29 +202,29 @@ glabel EnBa_Draw /* 01BE0 809B7F30 24590008 */ addiu $t9, $v0, 0x0008 ## $t9 = 00000008 /* 01BE4 809B7F34 AED902C0 */ sw $t9, 0x02C0($s6) ## 000002C0 /* 01BE8 809B7F38 AC490000 */ sw $t1, 0x0000($v0) ## 00000000 -/* 01BEC 809B7F3C 8FAB00C4 */ lw $t3, 0x00C4($sp) +/* 01BEC 809B7F3C 8FAB00C4 */ lw $t3, 0x00C4($sp) /* 01BF0 809B7F40 240D0020 */ addiu $t5, $zero, 0x0020 ## $t5 = 00000020 /* 01BF4 809B7F44 240A0001 */ addiu $t2, $zero, 0x0001 ## $t2 = 00000001 -/* 01BF8 809B7F48 006B1821 */ addu $v1, $v1, $t3 +/* 01BF8 809B7F48 006B1821 */ addu $v1, $v1, $t3 /* 01BFC 809B7F4C 8C631DE4 */ lw $v1, 0x1DE4($v1) ## 00011DE4 /* 01C00 809B7F50 8D640000 */ lw $a0, 0x0000($t3) ## 00000000 /* 01C04 809B7F54 240E0020 */ addiu $t6, $zero, 0x0020 ## $t6 = 00000020 -/* 01C08 809B7F58 00030823 */ subu $at, $zero, $v1 -/* 01C0C 809B7F5C 00014080 */ sll $t0, $at, 2 -/* 01C10 809B7F60 01014021 */ addu $t0, $t0, $at -/* 01C14 809B7F64 00033040 */ sll $a2, $v1, 1 +/* 01C08 809B7F58 00030823 */ subu $at, $zero, $v1 +/* 01C0C 809B7F5C 00014080 */ sll $t0, $at, 2 +/* 01C10 809B7F60 01014021 */ addu $t0, $t0, $at +/* 01C14 809B7F64 00033040 */ sll $a2, $v1, 1 /* 01C18 809B7F68 30C6007F */ andi $a2, $a2, 0x007F ## $a2 = 00000000 /* 01C1C 809B7F6C 3108007F */ andi $t0, $t0, 0x007F ## $t0 = 00000000 /* 01C20 809B7F70 240F0020 */ addiu $t7, $zero, 0x0020 ## $t7 = 00000020 -/* 01C24 809B7F74 AFAF0028 */ sw $t7, 0x0028($sp) -/* 01C28 809B7F78 AFA8001C */ sw $t0, 0x001C($sp) -/* 01C2C 809B7F7C AFA80020 */ sw $t0, 0x0020($sp) +/* 01C24 809B7F74 AFAF0028 */ sw $t7, 0x0028($sp) +/* 01C28 809B7F78 AFA8001C */ sw $t0, 0x001C($sp) +/* 01C2C 809B7F7C AFA80020 */ sw $t0, 0x0020($sp) /* 01C30 809B7F80 00C03825 */ or $a3, $a2, $zero ## $a3 = 00000000 -/* 01C34 809B7F84 AFAE0024 */ sw $t6, 0x0024($sp) -/* 01C38 809B7F88 AFAA0018 */ sw $t2, 0x0018($sp) -/* 01C3C 809B7F8C AFAD0014 */ sw $t5, 0x0014($sp) -/* 01C40 809B7F90 AFAC0010 */ sw $t4, 0x0010($sp) -/* 01C44 809B7F94 0C0253D0 */ jal Draw_TwoTexScroll +/* 01C34 809B7F84 AFAE0024 */ sw $t6, 0x0024($sp) +/* 01C38 809B7F88 AFAA0018 */ sw $t2, 0x0018($sp) +/* 01C3C 809B7F8C AFAD0014 */ sw $t5, 0x0014($sp) +/* 01C40 809B7F90 AFAC0010 */ sw $t4, 0x0010($sp) +/* 01C44 809B7F94 0C0253D0 */ jal Gfx_TwoTexScroll /* 01C48 809B7F98 00408025 */ or $s0, $v0, $zero ## $s0 = 00000000 /* 01C4C 809B7F9C AE020004 */ sw $v0, 0x0004($s0) ## 00000004 /* 01C50 809B7FA0 8EC202C0 */ lw $v0, 0x02C0($s6) ## 000002C0 @@ -241,12 +241,12 @@ glabel EnBa_Draw /* 01C7C 809B7FCC 244B0008 */ addiu $t3, $v0, 0x0008 ## $t3 = 00000008 /* 01C80 809B7FD0 AECB02C0 */ sw $t3, 0x02C0($s6) ## 000002C0 /* 01C84 809B7FD4 AC4C0000 */ sw $t4, 0x0000($v0) ## 00000000 -/* 01C88 809B7FD8 8FAD00C4 */ lw $t5, 0x00C4($sp) +/* 01C88 809B7FD8 8FAD00C4 */ lw $t5, 0x00C4($sp) /* 01C8C 809B7FDC 3C05809C */ lui $a1, %hi(D_809B8160) ## $a1 = 809C0000 /* 01C90 809B7FE0 24A58160 */ addiu $a1, $a1, %lo(D_809B8160) ## $a1 = 809B8160 /* 01C94 809B7FE4 240603DF */ addiu $a2, $zero, 0x03DF ## $a2 = 000003DF /* 01C98 809B7FE8 00408025 */ or $s0, $v0, $zero ## $s0 = 00000000 -/* 01C9C 809B7FEC 0C0346A2 */ jal Matrix_NewMtx +/* 01C9C 809B7FEC 0C0346A2 */ jal Matrix_NewMtx /* 01CA0 809B7FF0 8DA40000 */ lw $a0, 0x0000($t5) ## 00000000 /* 01CA4 809B7FF4 AE020004 */ sw $v0, 0x0004($s0) ## 00000004 /* 01CA8 809B7FF8 8EC202C0 */ lw $v0, 0x02C0($s6) ## 000002C0 @@ -258,22 +258,22 @@ glabel EnBa_Draw /* 01CC0 809B8010 AC4E0000 */ sw $t6, 0x0000($v0) ## 00000000 /* 01CC4 809B8014 AC4F0004 */ sw $t7, 0x0004($v0) ## 00000004 .L809B8018: -/* 01CC8 809B8018 8FB800C4 */ lw $t8, 0x00C4($sp) +/* 01CC8 809B8018 8FB800C4 */ lw $t8, 0x00C4($sp) /* 01CCC 809B801C 3C06809C */ lui $a2, %hi(D_809B8170) ## $a2 = 809C0000 /* 01CD0 809B8020 24C68170 */ addiu $a2, $a2, %lo(D_809B8170) ## $a2 = 809B8170 /* 01CD4 809B8024 27A40090 */ addiu $a0, $sp, 0x0090 ## $a0 = FFFFFFD0 /* 01CD8 809B8028 240703E3 */ addiu $a3, $zero, 0x03E3 ## $a3 = 000003E3 -/* 01CDC 809B802C 0C031AD5 */ jal func_800C6B54 +/* 01CDC 809B802C 0C031AD5 */ jal Graph_CloseDisps /* 01CE0 809B8030 8F050000 */ lw $a1, 0x0000($t8) ## 00000000 -/* 01CE4 809B8034 8FBF005C */ lw $ra, 0x005C($sp) -/* 01CE8 809B8038 D7B40038 */ ldc1 $f20, 0x0038($sp) -/* 01CEC 809B803C 8FB00040 */ lw $s0, 0x0040($sp) -/* 01CF0 809B8040 8FB10044 */ lw $s1, 0x0044($sp) -/* 01CF4 809B8044 8FB20048 */ lw $s2, 0x0048($sp) -/* 01CF8 809B8048 8FB3004C */ lw $s3, 0x004C($sp) -/* 01CFC 809B804C 8FB40050 */ lw $s4, 0x0050($sp) -/* 01D00 809B8050 8FB50054 */ lw $s5, 0x0054($sp) -/* 01D04 809B8054 8FB60058 */ lw $s6, 0x0058($sp) -/* 01D08 809B8058 03E00008 */ jr $ra +/* 01CE4 809B8034 8FBF005C */ lw $ra, 0x005C($sp) +/* 01CE8 809B8038 D7B40038 */ ldc1 $f20, 0x0038($sp) +/* 01CEC 809B803C 8FB00040 */ lw $s0, 0x0040($sp) +/* 01CF0 809B8040 8FB10044 */ lw $s1, 0x0044($sp) +/* 01CF4 809B8044 8FB20048 */ lw $s2, 0x0048($sp) +/* 01CF8 809B8048 8FB3004C */ lw $s3, 0x004C($sp) +/* 01CFC 809B804C 8FB40050 */ lw $s4, 0x0050($sp) +/* 01D00 809B8050 8FB50054 */ lw $s5, 0x0054($sp) +/* 01D04 809B8054 8FB60058 */ lw $s6, 0x0058($sp) +/* 01D08 809B8058 03E00008 */ jr $ra /* 01D0C 809B805C 27BD00C0 */ addiu $sp, $sp, 0x00C0 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ba/func_809B65A8.s b/asm/non_matchings/overlays/actors/ovl_En_Ba/func_809B65A8.s index d5841d803e..dcc2114f5e 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ba/func_809B65A8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ba/func_809B65A8.s @@ -1,42 +1,42 @@ glabel func_809B65A8 /* 00258 809B65A8 27BDFF90 */ addiu $sp, $sp, 0xFF90 ## $sp = FFFFFF90 -/* 0025C 809B65AC AFBF003C */ sw $ra, 0x003C($sp) -/* 00260 809B65B0 AFB70038 */ sw $s7, 0x0038($sp) -/* 00264 809B65B4 AFB60034 */ sw $s6, 0x0034($sp) -/* 00268 809B65B8 AFB50030 */ sw $s5, 0x0030($sp) -/* 0026C 809B65BC AFB4002C */ sw $s4, 0x002C($sp) -/* 00270 809B65C0 AFB30028 */ sw $s3, 0x0028($sp) -/* 00274 809B65C4 AFB20024 */ sw $s2, 0x0024($sp) -/* 00278 809B65C8 AFB10020 */ sw $s1, 0x0020($sp) -/* 0027C 809B65CC AFB0001C */ sw $s0, 0x001C($sp) +/* 0025C 809B65AC AFBF003C */ sw $ra, 0x003C($sp) +/* 00260 809B65B0 AFB70038 */ sw $s7, 0x0038($sp) +/* 00264 809B65B4 AFB60034 */ sw $s6, 0x0034($sp) +/* 00268 809B65B8 AFB50030 */ sw $s5, 0x0030($sp) +/* 0026C 809B65BC AFB4002C */ sw $s4, 0x002C($sp) +/* 00270 809B65C0 AFB30028 */ sw $s3, 0x0028($sp) +/* 00274 809B65C4 AFB20024 */ sw $s2, 0x0024($sp) +/* 00278 809B65C8 AFB10020 */ sw $s1, 0x0020($sp) +/* 0027C 809B65CC AFB0001C */ sw $s0, 0x001C($sp) /* 00280 809B65D0 8CAE1C44 */ lw $t6, 0x1C44($a1) ## 00001C44 /* 00284 809B65D4 240100FF */ addiu $at, $zero, 0x00FF ## $at = 000000FF /* 00288 809B65D8 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 -/* 0028C 809B65DC AFAE006C */ sw $t6, 0x006C($sp) +/* 0028C 809B65DC AFAE006C */ sw $t6, 0x006C($sp) /* 00290 809B65E0 908F00AE */ lbu $t7, 0x00AE($a0) ## 000000AE /* 00294 809B65E4 0080B025 */ or $s6, $a0, $zero ## $s6 = 00000000 -/* 00298 809B65E8 15E10015 */ bne $t7, $at, .L809B6640 +/* 00298 809B65E8 15E10015 */ bne $t7, $at, .L809B6640 /* 0029C 809B65EC 3C01432F */ lui $at, 0x432F ## $at = 432F0000 /* 002A0 809B65F0 44812000 */ mtc1 $at, $f4 ## $f4 = 175.00 /* 002A4 809B65F4 C4860090 */ lwc1 $f6, 0x0090($a0) ## 00000090 /* 002A8 809B65F8 3C0143A5 */ lui $at, 0x43A5 ## $at = 43A50000 -/* 002AC 809B65FC 4606203C */ c.lt.s $f4, $f6 +/* 002AC 809B65FC 4606203C */ c.lt.s $f4, $f6 /* 002B0 809B6600 00000000 */ nop -/* 002B4 809B6604 4502000F */ bc1fl .L809B6644 +/* 002B4 809B6604 4502000F */ bc1fl .L809B6644 /* 002B8 809B6608 3C0142C8 */ lui $at, 0x42C8 ## $at = 42C80000 /* 002BC 809B660C C6C8000C */ lwc1 $f8, 0x000C($s6) ## 0000000C /* 002C0 809B6610 44815000 */ mtc1 $at, $f10 ## $f10 = 100.00 /* 002C4 809B6614 44809000 */ mtc1 $zero, $f18 ## $f18 = 0.00 /* 002C8 809B6618 24840028 */ addiu $a0, $a0, 0x0028 ## $a0 = 00000028 -/* 002CC 809B661C 460A4400 */ add.s $f16, $f8, $f10 +/* 002CC 809B661C 460A4400 */ add.s $f16, $f8, $f10 /* 002D0 809B6620 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 002D4 809B6624 3C0740E0 */ lui $a3, 0x40E0 ## $a3 = 40E00000 -/* 002D8 809B6628 E7B20010 */ swc1 $f18, 0x0010($sp) -/* 002DC 809B662C 44058000 */ mfc1 $a1, $f16 +/* 002D8 809B6628 E7B20010 */ swc1 $f18, 0x0010($sp) +/* 002DC 809B662C 44058000 */ mfc1 $a1, $f16 /* 002E0 809B6630 0C01E0C4 */ jal Math_SmoothScaleMaxMinF - + /* 002E4 809B6634 00000000 */ nop -/* 002E8 809B6638 10000010 */ beq $zero, $zero, .L809B667C +/* 002E8 809B6638 10000010 */ beq $zero, $zero, .L809B667C /* 002EC 809B663C 8EC90024 */ lw $t1, 0x0024($s6) ## 00000024 .L809B6640: /* 002F0 809B6640 3C0142C8 */ lui $at, 0x42C8 ## $at = 42C80000 @@ -45,56 +45,56 @@ glabel func_809B65A8 /* 002F8 809B6648 C6C4000C */ lwc1 $f4, 0x000C($s6) ## 0000000C /* 002FC 809B664C 8ED80004 */ lw $t8, 0x0004($s6) ## 00000004 /* 00300 809B6650 44805000 */ mtc1 $zero, $f10 ## $f10 = 0.00 -/* 00304 809B6654 46062200 */ add.s $f8, $f4, $f6 +/* 00304 809B6654 46062200 */ add.s $f8, $f4, $f6 /* 00308 809B6658 37190001 */ ori $t9, $t8, 0x0001 ## $t9 = 00000001 /* 0030C 809B665C AED90004 */ sw $t9, 0x0004($s6) ## 00000004 /* 00310 809B6660 26C40028 */ addiu $a0, $s6, 0x0028 ## $a0 = 00000028 -/* 00314 809B6664 44054000 */ mfc1 $a1, $f8 +/* 00314 809B6664 44054000 */ mfc1 $a1, $f8 /* 00318 809B6668 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 0031C 809B666C 3C074120 */ lui $a3, 0x4120 ## $a3 = 41200000 /* 00320 809B6670 0C01E0C4 */ jal Math_SmoothScaleMaxMinF - -/* 00324 809B6674 E7AA0010 */ swc1 $f10, 0x0010($sp) + +/* 00324 809B6674 E7AA0010 */ swc1 $f10, 0x0010($sp) /* 00328 809B6678 8EC90024 */ lw $t1, 0x0024($s6) ## 00000024 .L809B667C: /* 0032C 809B667C 26D502FC */ addiu $s5, $s6, 0x02FC ## $s5 = 000002FC /* 00330 809B6680 3C0A0001 */ lui $t2, 0x0001 ## $t2 = 00010000 /* 00334 809B6684 AEA90000 */ sw $t1, 0x0000($s5) ## 000002FC /* 00338 809B6688 8EC80028 */ lw $t0, 0x0028($s6) ## 00000028 -/* 0033C 809B668C 01505021 */ addu $t2, $t2, $s0 +/* 0033C 809B668C 01505021 */ addu $t2, $t2, $s0 /* 00340 809B6690 AEA80004 */ sw $t0, 0x0004($s5) ## 00000300 /* 00344 809B6694 8EC9002C */ lw $t1, 0x002C($s6) ## 0000002C /* 00348 809B6698 AEA90008 */ sw $t1, 0x0008($s5) ## 00000304 /* 0034C 809B669C 8D4A1DE4 */ lw $t2, 0x1DE4($t2) ## 00011DE4 /* 00350 809B66A0 314B000F */ andi $t3, $t2, 0x000F ## $t3 = 00000000 -/* 00354 809B66A4 1560001A */ bne $t3, $zero, .L809B6710 +/* 00354 809B66A4 1560001A */ bne $t3, $zero, .L809B6710 /* 00358 809B66A8 3C014334 */ lui $at, 0x4334 ## $at = 43340000 /* 0035C 809B66AC 44816000 */ mtc1 $at, $f12 ## $f12 = 180.00 /* 00360 809B66B0 0C00CFC8 */ jal Math_Rand_CenteredFloat - + /* 00364 809B66B4 00000000 */ nop /* 00368 809B66B8 C6D00310 */ lwc1 $f16, 0x0310($s6) ## 00000310 /* 0036C 809B66BC 3C014334 */ lui $at, 0x4334 ## $at = 43340000 /* 00370 809B66C0 44816000 */ mtc1 $at, $f12 ## $f12 = 180.00 -/* 00374 809B66C4 46008480 */ add.s $f18, $f16, $f0 +/* 00374 809B66C4 46008480 */ add.s $f18, $f16, $f0 /* 00378 809B66C8 0C00CFC8 */ jal Math_Rand_CenteredFloat - + /* 0037C 809B66CC E6D20310 */ swc1 $f18, 0x0310($s6) ## 00000310 /* 00380 809B66D0 C6C40314 */ lwc1 $f4, 0x0314($s6) ## 00000314 /* 00384 809B66D4 C6CC0310 */ lwc1 $f12, 0x0310($s6) ## 00000310 -/* 00388 809B66D8 46002180 */ add.s $f6, $f4, $f0 -/* 0038C 809B66DC 0C0329C8 */ jal func_800CA720 +/* 00388 809B66D8 46002180 */ add.s $f6, $f4, $f0 +/* 0038C 809B66DC 0C0329C8 */ jal func_800CA720 /* 00390 809B66E0 E6C60314 */ swc1 $f6, 0x0314($s6) ## 00000314 /* 00394 809B66E4 3C0142A0 */ lui $at, 0x42A0 ## $at = 42A00000 /* 00398 809B66E8 44814000 */ mtc1 $at, $f8 ## $f8 = 80.00 /* 0039C 809B66EC C6CC0314 */ lwc1 $f12, 0x0314($s6) ## 00000314 -/* 003A0 809B66F0 46080282 */ mul.s $f10, $f0, $f8 -/* 003A4 809B66F4 0C0329DD */ jal func_800CA774 +/* 003A0 809B66F0 46080282 */ mul.s $f10, $f0, $f8 +/* 003A4 809B66F4 0C0329DD */ jal func_800CA774 /* 003A8 809B66F8 E6CA0308 */ swc1 $f10, 0x0308($s6) ## 00000308 /* 003AC 809B66FC 3C0142A0 */ lui $at, 0x42A0 ## $at = 42A00000 /* 003B0 809B6700 44818000 */ mtc1 $at, $f16 ## $f16 = 80.00 /* 003B4 809B6704 00000000 */ nop -/* 003B8 809B6708 46100482 */ mul.s $f18, $f0, $f16 +/* 003B8 809B6708 46100482 */ mul.s $f18, $f0, $f16 /* 003BC 809B670C E6D2030C */ swc1 $f18, 0x030C($s6) ## 0000030C .L809B6710: /* 003C0 809B6710 3C0143E0 */ lui $at, 0x43E0 ## $at = 43E00000 @@ -102,22 +102,22 @@ glabel func_809B65A8 /* 003C8 809B6718 C6C40300 */ lwc1 $f4, 0x0300($s6) ## 00000300 /* 003CC 809B671C C6CA02FC */ lwc1 $f10, 0x02FC($s6) ## 000002FC /* 003D0 809B6720 C6D00308 */ lwc1 $f16, 0x0308($s6) ## 00000308 -/* 003D4 809B6724 46062201 */ sub.s $f8, $f4, $f6 +/* 003D4 809B6724 46062201 */ sub.s $f8, $f4, $f6 /* 003D8 809B6728 C6C6030C */ lwc1 $f6, 0x030C($s6) ## 0000030C /* 003DC 809B672C C6C40304 */ lwc1 $f4, 0x0304($s6) ## 00000304 -/* 003E0 809B6730 46105480 */ add.s $f18, $f10, $f16 +/* 003E0 809B6730 46105480 */ add.s $f18, $f10, $f16 /* 003E4 809B6734 E6C80300 */ swc1 $f8, 0x0300($s6) ## 00000300 /* 003E8 809B6738 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 003EC 809B673C 46062200 */ add.s $f8, $f4, $f6 +/* 003EC 809B673C 46062200 */ add.s $f8, $f4, $f6 /* 003F0 809B6740 E6D202FC */ swc1 $f18, 0x02FC($s6) ## 000002FC /* 003F4 809B6744 8EC70068 */ lw $a3, 0x0068($s6) ## 00000068 /* 003F8 809B6748 02A02025 */ or $a0, $s5, $zero ## $a0 = 000002FC /* 003FC 809B674C E6C80304 */ swc1 $f8, 0x0304($s6) ## 00000304 /* 00400 809B6750 26C501F4 */ addiu $a1, $s6, 0x01F4 ## $a1 = 000001F4 /* 00404 809B6754 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 00408 809B6758 E7A00014 */ swc1 $f0, 0x0014($sp) -/* 0040C 809B675C 0C00CEBB */ jal func_80033AEC -/* 00410 809B6760 E7A00010 */ swc1 $f0, 0x0010($sp) +/* 00408 809B6758 E7A00014 */ swc1 $f0, 0x0014($sp) +/* 0040C 809B675C 0C00CEBB */ jal func_80033AEC +/* 00410 809B6760 E7A00010 */ swc1 $f0, 0x0010($sp) /* 00414 809B6764 26D00090 */ addiu $s0, $s6, 0x0090 ## $s0 = 00000090 /* 00418 809B6768 3C17809C */ lui $s7, %hi(D_809B8080) ## $s7 = 809C0000 /* 0041C 809B676C 26F78080 */ addiu $s7, $s7, %lo(D_809B8080) ## $s7 = 809B8080 @@ -129,73 +129,73 @@ glabel func_809B65A8 /* 00430 809B6780 02402025 */ or $a0, $s2, $zero ## $a0 = 000001F4 /* 00434 809B6784 02202825 */ or $a1, $s1, $zero ## $a1 = 000001E8 /* 00438 809B6788 02803025 */ or $a2, $s4, $zero ## $a2 = FFFFFFEC -/* 0043C 809B678C 0C00D611 */ jal func_80035844 +/* 0043C 809B678C 0C00D611 */ jal func_80035844 /* 00440 809B6790 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 /* 00444 809B6794 C60C0164 */ lwc1 $f12, 0x0164($s0) ## 000001F4 /* 00448 809B6798 C60E0168 */ lwc1 $f14, 0x0168($s0) ## 000001F8 /* 0044C 809B679C 8E06016C */ lw $a2, 0x016C($s0) ## 000001FC -/* 00450 809B67A0 0C034261 */ jal Matrix_Translate +/* 00450 809B67A0 0C034261 */ jal Matrix_Translate /* 00454 809B67A4 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 00458 809B67A8 87A4005C */ lh $a0, 0x005C($sp) -/* 0045C 809B67AC 87A5005E */ lh $a1, 0x005E($sp) +/* 00458 809B67A8 87A4005C */ lh $a0, 0x005C($sp) +/* 0045C 809B67AC 87A5005E */ lh $a1, 0x005E($sp) /* 00460 809B67B0 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 00464 809B67B4 0C034421 */ jal Matrix_RotateXYZ +/* 00464 809B67B4 0C034421 */ jal Matrix_RotateZYX /* 00468 809B67B8 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 /* 0046C 809B67BC 02E02025 */ or $a0, $s7, $zero ## $a0 = 809B8080 -/* 00470 809B67C0 0C0346BD */ jal Matrix_MultVec3f +/* 00470 809B67C0 0C0346BD */ jal Matrix_MultVec3f /* 00474 809B67C4 02202825 */ or $a1, $s1, $zero ## $a1 = 000001E8 /* 00478 809B67C8 2673FFF4 */ addiu $s3, $s3, 0xFFF4 ## $s3 = 00000084 /* 0047C 809B67CC 2610FFF4 */ addiu $s0, $s0, 0xFFF4 ## $s0 = 00000084 /* 00480 809B67D0 2652FFF4 */ addiu $s2, $s2, 0xFFF4 ## $s2 = 000001E8 -/* 00484 809B67D4 0661FFEA */ bgez $s3, .L809B6780 +/* 00484 809B67D4 0661FFEA */ bgez $s3, .L809B6780 /* 00488 809B67D8 2631FFF4 */ addiu $s1, $s1, 0xFFF4 ## $s1 = 000001DC /* 0048C 809B67DC 26D00158 */ addiu $s0, $s6, 0x0158 ## $s0 = 00000158 /* 00490 809B67E0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000158 /* 00494 809B67E4 02A02825 */ or $a1, $s5, $zero ## $a1 = 000002FC /* 00498 809B67E8 02803025 */ or $a2, $s4, $zero ## $a2 = FFFFFFEC -/* 0049C 809B67EC 0C00D611 */ jal func_80035844 +/* 0049C 809B67EC 0C00D611 */ jal func_80035844 /* 004A0 809B67F0 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 /* 004A4 809B67F4 C6CC0024 */ lwc1 $f12, 0x0024($s6) ## 00000024 /* 004A8 809B67F8 C6CE0028 */ lwc1 $f14, 0x0028($s6) ## 00000028 /* 004AC 809B67FC 8EC6002C */ lw $a2, 0x002C($s6) ## 0000002C -/* 004B0 809B6800 0C034261 */ jal Matrix_Translate +/* 004B0 809B6800 0C034261 */ jal Matrix_Translate /* 004B4 809B6804 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 /* 004B8 809B6808 86C502AA */ lh $a1, 0x02AA($s6) ## 000002AA /* 004BC 809B680C 86C7031C */ lh $a3, 0x031C($s6) ## 0000031C /* 004C0 809B6810 240C00B6 */ addiu $t4, $zero, 0x00B6 ## $t4 = 000000B6 -/* 004C4 809B6814 AFAC0010 */ sw $t4, 0x0010($sp) +/* 004C4 809B6814 AFAC0010 */ sw $t4, 0x0010($sp) /* 004C8 809B6818 26C400B6 */ addiu $a0, $s6, 0x00B6 ## $a0 = 000000B6 /* 004CC 809B681C 0C01E1A7 */ jal Math_SmoothScaleMaxMinS - + /* 004D0 809B6820 24060003 */ addiu $a2, $zero, 0x0003 ## $a2 = 00000003 /* 004D4 809B6824 86C502A8 */ lh $a1, 0x02A8($s6) ## 000002A8 /* 004D8 809B6828 86C7031C */ lh $a3, 0x031C($s6) ## 0000031C /* 004DC 809B682C 240D00B6 */ addiu $t5, $zero, 0x00B6 ## $t5 = 000000B6 -/* 004E0 809B6830 AFAD0010 */ sw $t5, 0x0010($sp) +/* 004E0 809B6830 AFAD0010 */ sw $t5, 0x0010($sp) /* 004E4 809B6834 26C400B4 */ addiu $a0, $s6, 0x00B4 ## $a0 = 000000B4 /* 004E8 809B6838 0C01E1A7 */ jal Math_SmoothScaleMaxMinS - + /* 004EC 809B683C 24060003 */ addiu $a2, $zero, 0x0003 ## $a2 = 00000003 /* 004F0 809B6840 86C400B4 */ lh $a0, 0x00B4($s6) ## 000000B4 /* 004F4 809B6844 24018000 */ addiu $at, $zero, 0x8000 ## $at = FFFF8000 /* 004F8 809B6848 86C500B6 */ lh $a1, 0x00B6($s6) ## 000000B6 -/* 004FC 809B684C 00812021 */ addu $a0, $a0, $at -/* 00500 809B6850 00042400 */ sll $a0, $a0, 16 -/* 00504 809B6854 00042403 */ sra $a0, $a0, 16 +/* 004FC 809B684C 00812021 */ addu $a0, $a0, $at +/* 00500 809B6850 00042400 */ sll $a0, $a0, 16 +/* 00504 809B6854 00042403 */ sra $a0, $a0, 16 /* 00508 809B6858 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 0050C 809B685C 0C034421 */ jal Matrix_RotateXYZ +/* 0050C 809B685C 0C034421 */ jal Matrix_RotateZYX /* 00510 809B6860 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 /* 00514 809B6864 02E02025 */ or $a0, $s7, $zero ## $a0 = 809B8080 -/* 00518 809B6868 0C0346BD */ jal Matrix_MultVec3f +/* 00518 809B6868 0C0346BD */ jal Matrix_MultVec3f /* 0051C 809B686C 02002825 */ or $a1, $s0, $zero ## $a1 = 00000158 -/* 00520 809B6870 87AE005E */ lh $t6, 0x005E($sp) +/* 00520 809B6870 87AE005E */ lh $t6, 0x005E($sp) /* 00524 809B6874 34018000 */ ori $at, $zero, 0x8000 ## $at = 00008000 /* 00528 809B6878 02C08025 */ or $s0, $s6, $zero ## $s0 = 00000000 /* 0052C 809B687C A6CE02F8 */ sh $t6, 0x02F8($s6) ## 000002F8 -/* 00530 809B6880 87AF005C */ lh $t7, 0x005C($sp) +/* 00530 809B6880 87AF005C */ lh $t7, 0x005C($sp) /* 00534 809B6884 26D20164 */ addiu $s2, $s6, 0x0164 ## $s2 = 00000164 /* 00538 809B6888 00009825 */ or $s3, $zero, $zero ## $s3 = 00000000 -/* 0053C 809B688C 01E1C021 */ addu $t8, $t7, $at +/* 0053C 809B688C 01E1C021 */ addu $t8, $t7, $at /* 00540 809B6890 A6D802F6 */ sh $t8, 0x02F6($s6) ## 000002F6 /* 00544 809B6894 02C08825 */ or $s1, $s6, $zero ## $s1 = 00000000 /* 00548 809B6898 26D402AA */ addiu $s4, $s6, 0x02AA ## $s4 = 000002AA @@ -204,35 +204,35 @@ glabel func_809B65A8 /* 00550 809B68A0 C60C0158 */ lwc1 $f12, 0x0158($s0) ## 00000158 /* 00554 809B68A4 C60E015C */ lwc1 $f14, 0x015C($s0) ## 0000015C /* 00558 809B68A8 8E060160 */ lw $a2, 0x0160($s0) ## 00000160 -/* 0055C 809B68AC 0C034261 */ jal Matrix_Translate +/* 0055C 809B68AC 0C034261 */ jal Matrix_Translate /* 00560 809B68B0 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 /* 00564 809B68B4 862502B0 */ lh $a1, 0x02B0($s1) ## 000002B0 /* 00568 809B68B8 86C7031C */ lh $a3, 0x031C($s6) ## 0000031C /* 0056C 809B68BC 241900B6 */ addiu $t9, $zero, 0x00B6 ## $t9 = 000000B6 -/* 00570 809B68C0 AFB90010 */ sw $t9, 0x0010($sp) +/* 00570 809B68C0 AFB90010 */ sw $t9, 0x0010($sp) /* 00574 809B68C4 02802025 */ or $a0, $s4, $zero ## $a0 = 000002AA /* 00578 809B68C8 0C01E1A7 */ jal Math_SmoothScaleMaxMinS - + /* 0057C 809B68CC 24060003 */ addiu $a2, $zero, 0x0003 ## $a2 = 00000003 /* 00580 809B68D0 862502AE */ lh $a1, 0x02AE($s1) ## 000002AE /* 00584 809B68D4 86C7031C */ lh $a3, 0x031C($s6) ## 0000031C /* 00588 809B68D8 240800B6 */ addiu $t0, $zero, 0x00B6 ## $t0 = 000000B6 -/* 0058C 809B68DC AFA80010 */ sw $t0, 0x0010($sp) +/* 0058C 809B68DC AFA80010 */ sw $t0, 0x0010($sp) /* 00590 809B68E0 02A02025 */ or $a0, $s5, $zero ## $a0 = 000002A8 /* 00594 809B68E4 0C01E1A7 */ jal Math_SmoothScaleMaxMinS - + /* 00598 809B68E8 24060003 */ addiu $a2, $zero, 0x0003 ## $a2 = 00000003 /* 0059C 809B68EC 862402A8 */ lh $a0, 0x02A8($s1) ## 000002A8 /* 005A0 809B68F0 24018000 */ addiu $at, $zero, 0x8000 ## $at = FFFF8000 /* 005A4 809B68F4 862502AA */ lh $a1, 0x02AA($s1) ## 000002AA -/* 005A8 809B68F8 00812021 */ addu $a0, $a0, $at -/* 005AC 809B68FC 00042400 */ sll $a0, $a0, 16 -/* 005B0 809B6900 00042403 */ sra $a0, $a0, 16 +/* 005A8 809B68F8 00812021 */ addu $a0, $a0, $at +/* 005AC 809B68FC 00042400 */ sll $a0, $a0, 16 +/* 005B0 809B6900 00042403 */ sra $a0, $a0, 16 /* 005B4 809B6904 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 005B8 809B6908 0C034421 */ jal Matrix_RotateXYZ +/* 005B8 809B6908 0C034421 */ jal Matrix_RotateZYX /* 005BC 809B690C 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 /* 005C0 809B6910 02E02025 */ or $a0, $s7, $zero ## $a0 = 809B8080 -/* 005C4 809B6914 0C0346BD */ jal Matrix_MultVec3f +/* 005C4 809B6914 0C0346BD */ jal Matrix_MultVec3f /* 005C8 809B6918 02402825 */ or $a1, $s2, $zero ## $a1 = 00000164 /* 005CC 809B691C 26730006 */ addiu $s3, $s3, 0x0006 ## $s3 = 00000006 /* 005D0 809B6920 2401004E */ addiu $at, $zero, 0x004E ## $at = 0000004E @@ -240,46 +240,46 @@ glabel func_809B65A8 /* 005D8 809B6928 2652000C */ addiu $s2, $s2, 0x000C ## $s2 = 00000170 /* 005DC 809B692C 26310006 */ addiu $s1, $s1, 0x0006 ## $s1 = 00000006 /* 005E0 809B6930 26940006 */ addiu $s4, $s4, 0x0006 ## $s4 = 000002B0 -/* 005E4 809B6934 1661FFDA */ bne $s3, $at, .L809B68A0 +/* 005E4 809B6934 1661FFDA */ bne $s3, $at, .L809B68A0 /* 005E8 809B6938 26B50006 */ addiu $s5, $s5, 0x0006 ## $s5 = 000002AE /* 005EC 809B693C 86C902F0 */ lh $t1, 0x02F0($s6) ## 000002F0 /* 005F0 809B6940 86CA02F2 */ lh $t2, 0x02F2($s6) ## 000002F2 /* 005F4 809B6944 3C01432F */ lui $at, 0x432F ## $at = 432F0000 /* 005F8 809B6948 A6C902F6 */ sh $t1, 0x02F6($s6) ## 000002F6 /* 005FC 809B694C A6CA02F8 */ sh $t2, 0x02F8($s6) ## 000002F8 -/* 00600 809B6950 8FAB006C */ lw $t3, 0x006C($sp) +/* 00600 809B6950 8FAB006C */ lw $t3, 0x006C($sp) /* 00604 809B6954 8D6C067C */ lw $t4, 0x067C($t3) ## 0000067C -/* 00608 809B6958 000C6940 */ sll $t5, $t4, 5 -/* 0060C 809B695C 05A20013 */ bltzl $t5, .L809B69AC -/* 00610 809B6960 8FBF003C */ lw $ra, 0x003C($sp) +/* 00608 809B6958 000C6940 */ sll $t5, $t4, 5 +/* 0060C 809B695C 05A20013 */ bltzl $t5, .L809B69AC +/* 00610 809B6960 8FBF003C */ lw $ra, 0x003C($sp) /* 00614 809B6964 44815000 */ mtc1 $at, $f10 ## $f10 = 175.00 /* 00618 809B6968 C6D00090 */ lwc1 $f16, 0x0090($s6) ## 00000090 /* 0061C 809B696C 3C0142C8 */ lui $at, 0x42C8 ## $at = 42C80000 -/* 00620 809B6970 460A803E */ c.le.s $f16, $f10 +/* 00620 809B6970 460A803E */ c.le.s $f16, $f10 /* 00624 809B6974 00000000 */ nop -/* 00628 809B6978 4502000C */ bc1fl .L809B69AC -/* 0062C 809B697C 8FBF003C */ lw $ra, 0x003C($sp) +/* 00628 809B6978 4502000C */ bc1fl .L809B69AC +/* 0062C 809B697C 8FBF003C */ lw $ra, 0x003C($sp) /* 00630 809B6980 C6D2000C */ lwc1 $f18, 0x000C($s6) ## 0000000C /* 00634 809B6984 44812000 */ mtc1 $at, $f4 ## $f4 = 100.00 /* 00638 809B6988 C6C80028 */ lwc1 $f8, 0x0028($s6) ## 00000028 -/* 0063C 809B698C 46049180 */ add.s $f6, $f18, $f4 -/* 00640 809B6990 46083032 */ c.eq.s $f6, $f8 +/* 0063C 809B698C 46049180 */ add.s $f6, $f18, $f4 +/* 00640 809B6990 46083032 */ c.eq.s $f6, $f8 /* 00644 809B6994 00000000 */ nop -/* 00648 809B6998 45020004 */ bc1fl .L809B69AC -/* 0064C 809B699C 8FBF003C */ lw $ra, 0x003C($sp) -/* 00650 809B69A0 0C26DAC1 */ jal func_809B6B04 +/* 00648 809B6998 45020004 */ bc1fl .L809B69AC +/* 0064C 809B699C 8FBF003C */ lw $ra, 0x003C($sp) +/* 00650 809B69A0 0C26DAC1 */ jal func_809B6B04 /* 00654 809B69A4 02C02025 */ or $a0, $s6, $zero ## $a0 = 00000000 -/* 00658 809B69A8 8FBF003C */ lw $ra, 0x003C($sp) +/* 00658 809B69A8 8FBF003C */ lw $ra, 0x003C($sp) .L809B69AC: -/* 0065C 809B69AC 8FB0001C */ lw $s0, 0x001C($sp) -/* 00660 809B69B0 8FB10020 */ lw $s1, 0x0020($sp) -/* 00664 809B69B4 8FB20024 */ lw $s2, 0x0024($sp) -/* 00668 809B69B8 8FB30028 */ lw $s3, 0x0028($sp) -/* 0066C 809B69BC 8FB4002C */ lw $s4, 0x002C($sp) -/* 00670 809B69C0 8FB50030 */ lw $s5, 0x0030($sp) -/* 00674 809B69C4 8FB60034 */ lw $s6, 0x0034($sp) -/* 00678 809B69C8 8FB70038 */ lw $s7, 0x0038($sp) -/* 0067C 809B69CC 03E00008 */ jr $ra +/* 0065C 809B69AC 8FB0001C */ lw $s0, 0x001C($sp) +/* 00660 809B69B0 8FB10020 */ lw $s1, 0x0020($sp) +/* 00664 809B69B4 8FB20024 */ lw $s2, 0x0024($sp) +/* 00668 809B69B8 8FB30028 */ lw $s3, 0x0028($sp) +/* 0066C 809B69BC 8FB4002C */ lw $s4, 0x002C($sp) +/* 00670 809B69C0 8FB50030 */ lw $s5, 0x0030($sp) +/* 00674 809B69C4 8FB60034 */ lw $s6, 0x0034($sp) +/* 00678 809B69C8 8FB70038 */ lw $s7, 0x0038($sp) +/* 0067C 809B69CC 03E00008 */ jr $ra /* 00680 809B69D0 27BD0070 */ addiu $sp, $sp, 0x0070 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ba/func_809B6B58.s b/asm/non_matchings/overlays/actors/ovl_En_Ba/func_809B6B58.s index 28bb56fc40..35416071e7 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ba/func_809B6B58.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ba/func_809B6B58.s @@ -1,66 +1,66 @@ glabel func_809B6B58 /* 00808 809B6B58 27BDFF98 */ addiu $sp, $sp, 0xFF98 ## $sp = FFFFFF98 -/* 0080C 809B6B5C AFBF0044 */ sw $ra, 0x0044($sp) -/* 00810 809B6B60 AFBE0040 */ sw $s8, 0x0040($sp) -/* 00814 809B6B64 AFB7003C */ sw $s7, 0x003C($sp) -/* 00818 809B6B68 AFB60038 */ sw $s6, 0x0038($sp) -/* 0081C 809B6B6C AFB50034 */ sw $s5, 0x0034($sp) -/* 00820 809B6B70 AFB40030 */ sw $s4, 0x0030($sp) -/* 00824 809B6B74 AFB3002C */ sw $s3, 0x002C($sp) -/* 00828 809B6B78 AFB20028 */ sw $s2, 0x0028($sp) -/* 0082C 809B6B7C AFB10024 */ sw $s1, 0x0024($sp) -/* 00830 809B6B80 AFB00020 */ sw $s0, 0x0020($sp) -/* 00834 809B6B84 AFA5006C */ sw $a1, 0x006C($sp) +/* 0080C 809B6B5C AFBF0044 */ sw $ra, 0x0044($sp) +/* 00810 809B6B60 AFBE0040 */ sw $s8, 0x0040($sp) +/* 00814 809B6B64 AFB7003C */ sw $s7, 0x003C($sp) +/* 00818 809B6B68 AFB60038 */ sw $s6, 0x0038($sp) +/* 0081C 809B6B6C AFB50034 */ sw $s5, 0x0034($sp) +/* 00820 809B6B70 AFB40030 */ sw $s4, 0x0030($sp) +/* 00824 809B6B74 AFB3002C */ sw $s3, 0x002C($sp) +/* 00828 809B6B78 AFB20028 */ sw $s2, 0x0028($sp) +/* 0082C 809B6B7C AFB10024 */ sw $s1, 0x0024($sp) +/* 00830 809B6B80 AFB00020 */ sw $s0, 0x0020($sp) +/* 00834 809B6B84 AFA5006C */ sw $a1, 0x006C($sp) /* 00838 809B6B88 8CAF1C44 */ lw $t7, 0x1C44($a1) ## 00001C44 /* 0083C 809B6B8C 00809825 */ or $s3, $a0, $zero ## $s3 = 00000000 /* 00840 809B6B90 3C014270 */ lui $at, 0x4270 ## $at = 42700000 -/* 00844 809B6B94 AFAF0064 */ sw $t7, 0x0064($sp) +/* 00844 809B6B94 AFAF0064 */ sw $t7, 0x0064($sp) /* 00848 809B6B98 C664000C */ lwc1 $f4, 0x000C($s3) ## 0000000C /* 0084C 809B6B9C 44813000 */ mtc1 $at, $f6 ## $f6 = 60.00 /* 00850 809B6BA0 44805000 */ mtc1 $zero, $f10 ## $f10 = 0.00 /* 00854 809B6BA4 24840028 */ addiu $a0, $a0, 0x0028 ## $a0 = 00000028 -/* 00858 809B6BA8 46062200 */ add.s $f8, $f4, $f6 +/* 00858 809B6BA8 46062200 */ add.s $f8, $f4, $f6 /* 0085C 809B6BAC 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 00860 809B6BB0 3C074120 */ lui $a3, 0x4120 ## $a3 = 41200000 -/* 00864 809B6BB4 E7AA0010 */ swc1 $f10, 0x0010($sp) -/* 00868 809B6BB8 44054000 */ mfc1 $a1, $f8 +/* 00864 809B6BB4 E7AA0010 */ swc1 $f10, 0x0010($sp) +/* 00868 809B6BB8 44054000 */ mfc1 $a1, $f8 /* 0086C 809B6BBC 0C01E0C4 */ jal Math_SmoothScaleMaxMinF - + /* 00870 809B6BC0 00000000 */ nop /* 00874 809B6BC4 3C01432F */ lui $at, 0x432F ## $at = 432F0000 /* 00878 809B6BC8 44818000 */ mtc1 $at, $f16 ## $f16 = 175.00 /* 0087C 809B6BCC C6620090 */ lwc1 $f2, 0x0090($s3) ## 00000090 -/* 00880 809B6BD0 4610103E */ c.le.s $f2, $f16 +/* 00880 809B6BD0 4610103E */ c.le.s $f2, $f16 /* 00884 809B6BD4 00000000 */ nop -/* 00888 809B6BD8 45030006 */ bc1tl .L809B6BF4 +/* 00888 809B6BD8 45030006 */ bc1tl .L809B6BF4 /* 0088C 809B6BDC 86620318 */ lh $v0, 0x0318($s3) ## 00000318 /* 00890 809B6BE0 8678031A */ lh $t8, 0x031A($s3) ## 0000031A /* 00894 809B6BE4 3C01432F */ lui $at, 0x432F ## $at = 432F0000 -/* 00898 809B6BE8 53000143 */ beql $t8, $zero, .L809B70F8 +/* 00898 809B6BE8 53000143 */ beql $t8, $zero, .L809B70F8 /* 0089C 809B6BEC 44815000 */ mtc1 $at, $f10 ## $f10 = 175.00 /* 008A0 809B6BF0 86620318 */ lh $v0, 0x0318($s3) ## 00000318 .L809B6BF4: /* 008A4 809B6BF4 24010014 */ addiu $at, $zero, 0x0014 ## $at = 00000014 /* 008A8 809B6BF8 02602025 */ or $a0, $s3, $zero ## $a0 = 00000000 -/* 008AC 809B6BFC 14410006 */ bne $v0, $at, .L809B6C18 +/* 008AC 809B6BFC 14410006 */ bne $v0, $at, .L809B6C18 /* 008B0 809B6C00 00000000 */ nop /* 008B4 809B6C04 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 008B8 809B6C08 24053959 */ addiu $a1, $zero, 0x3959 ## $a1 = 00003959 /* 008BC 809B6C0C 241905DC */ addiu $t9, $zero, 0x05DC ## $t9 = 000005DC /* 008C0 809B6C10 A679031C */ sh $t9, 0x031C($s3) ## 0000031C /* 008C4 809B6C14 86620318 */ lh $v0, 0x0318($s3) ## 00000318 .L809B6C18: -/* 008C8 809B6C18 1040007F */ beq $v0, $zero, .L809B6E18 +/* 008C8 809B6C18 1040007F */ beq $v0, $zero, .L809B6E18 /* 008CC 809B6C1C 2449FFFF */ addiu $t1, $v0, 0xFFFF ## $t1 = FFFFFFFF /* 008D0 809B6C20 A6690318 */ sh $t1, 0x0318($s3) ## 00000318 /* 008D4 809B6C24 866A0318 */ lh $t2, 0x0318($s3) ## 00000318 /* 008D8 809B6C28 2408000A */ addiu $t0, $zero, 0x000A ## $t0 = 0000000A /* 008DC 809B6C2C A668031A */ sh $t0, 0x031A($s3) ## 0000031A -/* 008E0 809B6C30 2941000B */ slti $at, $t2, 0x000B -/* 008E4 809B6C34 14200010 */ bne $at, $zero, .L809B6C78 +/* 008E0 809B6C30 2941000B */ slti $at, $t2, 0x000B +/* 008E4 809B6C34 14200010 */ bne $at, $zero, .L809B6C78 /* 008E8 809B6C38 26700024 */ addiu $s0, $s3, 0x0024 ## $s0 = 00000024 -/* 008EC 809B6C3C 8FAB0064 */ lw $t3, 0x0064($sp) +/* 008EC 809B6C3C 8FAB0064 */ lw $t3, 0x0064($sp) /* 008F0 809B6C40 3C0141F0 */ lui $at, 0x41F0 ## $at = 41F00000 /* 008F4 809B6C44 44812000 */ mtc1 $at, $f4 ## $f4 = 30.00 /* 008F8 809B6C48 8D6D0024 */ lw $t5, 0x0024($t3) ## 00000024 @@ -71,135 +71,135 @@ glabel func_809B6B58 /* 0090C 809B6C5C AE6C0300 */ sw $t4, 0x0300($s3) ## 00000300 /* 00910 809B6C60 C6720300 */ lwc1 $f18, 0x0300($s3) ## 00000300 /* 00914 809B6C64 8D6D002C */ lw $t5, 0x002C($t3) ## 0000002C -/* 00918 809B6C68 46049180 */ add.s $f6, $f18, $f4 +/* 00918 809B6C68 46049180 */ add.s $f6, $f18, $f4 /* 0091C 809B6C6C AE6D0304 */ sw $t5, 0x0304($s3) ## 00000304 -/* 00920 809B6C70 10000006 */ beq $zero, $zero, .L809B6C8C +/* 00920 809B6C70 10000006 */ beq $zero, $zero, .L809B6C8C /* 00924 809B6C74 E6660300 */ swc1 $f6, 0x0300($s3) ## 00000300 .L809B6C78: /* 00928 809B6C78 02002025 */ or $a0, $s0, $zero ## $a0 = 00000024 /* 0092C 809B6C7C 0C01E01A */ jal Math_Vec3f_Yaw - + /* 00930 809B6C80 266502FC */ addiu $a1, $s3, 0x02FC ## $a1 = 000002FC -/* 00934 809B6C84 0002F400 */ sll $s8, $v0, 16 -/* 00938 809B6C88 001EF403 */ sra $s8, $s8, 16 +/* 00934 809B6C84 0002F400 */ sll $s8, $v0, 16 +/* 00938 809B6C88 001EF403 */ sra $s8, $s8, 16 .L809B6C8C: /* 0093C 809B6C8C 2664031C */ addiu $a0, $s3, 0x031C ## $a0 = 0000031C /* 00940 809B6C90 240505DC */ addiu $a1, $zero, 0x05DC ## $a1 = 000005DC /* 00944 809B6C94 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 /* 00948 809B6C98 2407001E */ addiu $a3, $zero, 0x001E ## $a3 = 0000001E /* 0094C 809B6C9C 0C01E1A7 */ jal Math_SmoothScaleMaxMinS - -/* 00950 809B6CA0 AFA00010 */ sw $zero, 0x0010($sp) + +/* 00950 809B6CA0 AFA00010 */ sw $zero, 0x0010($sp) /* 00954 809B6CA4 26710158 */ addiu $s1, $s3, 0x0158 ## $s1 = 00000158 /* 00958 809B6CA8 02202825 */ or $a1, $s1, $zero ## $a1 = 00000158 /* 0095C 809B6CAC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000024 /* 00960 809B6CB0 27A60058 */ addiu $a2, $sp, 0x0058 ## $a2 = FFFFFFF0 -/* 00964 809B6CB4 0C00D611 */ jal func_80035844 +/* 00964 809B6CB4 0C00D611 */ jal func_80035844 /* 00968 809B6CB8 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 /* 0096C 809B6CBC 8667031C */ lh $a3, 0x031C($s3) ## 0000031C -/* 00970 809B6CC0 AFA00010 */ sw $zero, 0x0010($sp) +/* 00970 809B6CC0 AFA00010 */ sw $zero, 0x0010($sp) /* 00974 809B6CC4 266400B6 */ addiu $a0, $s3, 0x00B6 ## $a0 = 000000B6 -/* 00978 809B6CC8 87A5005A */ lh $a1, 0x005A($sp) +/* 00978 809B6CC8 87A5005A */ lh $a1, 0x005A($sp) /* 0097C 809B6CCC 0C01E1A7 */ jal Math_SmoothScaleMaxMinS - + /* 00980 809B6CD0 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 -/* 00984 809B6CD4 87A50058 */ lh $a1, 0x0058($sp) +/* 00984 809B6CD4 87A50058 */ lh $a1, 0x0058($sp) /* 00988 809B6CD8 34018000 */ ori $at, $zero, 0x8000 ## $at = 00008000 /* 0098C 809B6CDC 8667031C */ lh $a3, 0x031C($s3) ## 0000031C -/* 00990 809B6CE0 00A12821 */ addu $a1, $a1, $at -/* 00994 809B6CE4 00052C00 */ sll $a1, $a1, 16 -/* 00998 809B6CE8 00052C03 */ sra $a1, $a1, 16 -/* 0099C 809B6CEC AFA00010 */ sw $zero, 0x0010($sp) +/* 00990 809B6CE0 00A12821 */ addu $a1, $a1, $at +/* 00994 809B6CE4 00052C00 */ sll $a1, $a1, 16 +/* 00998 809B6CE8 00052C03 */ sra $a1, $a1, 16 +/* 0099C 809B6CEC AFA00010 */ sw $zero, 0x0010($sp) /* 009A0 809B6CF0 266400B4 */ addiu $a0, $s3, 0x00B4 ## $a0 = 000000B4 /* 009A4 809B6CF4 0C01E1A7 */ jal Math_SmoothScaleMaxMinS - + /* 009A8 809B6CF8 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 /* 009AC 809B6CFC C66C0024 */ lwc1 $f12, 0x0024($s3) ## 00000024 /* 009B0 809B6D00 C66E0028 */ lwc1 $f14, 0x0028($s3) ## 00000028 /* 009B4 809B6D04 8E66002C */ lw $a2, 0x002C($s3) ## 0000002C -/* 009B8 809B6D08 0C034261 */ jal Matrix_Translate +/* 009B8 809B6D08 0C034261 */ jal Matrix_Translate /* 009BC 809B6D0C 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 /* 009C0 809B6D10 866400B4 */ lh $a0, 0x00B4($s3) ## 000000B4 /* 009C4 809B6D14 24018000 */ addiu $at, $zero, 0x8000 ## $at = FFFF8000 /* 009C8 809B6D18 866500B6 */ lh $a1, 0x00B6($s3) ## 000000B6 -/* 009CC 809B6D1C 00812021 */ addu $a0, $a0, $at -/* 009D0 809B6D20 00042400 */ sll $a0, $a0, 16 -/* 009D4 809B6D24 00042403 */ sra $a0, $a0, 16 +/* 009CC 809B6D1C 00812021 */ addu $a0, $a0, $at +/* 009D0 809B6D20 00042400 */ sll $a0, $a0, 16 +/* 009D4 809B6D24 00042403 */ sra $a0, $a0, 16 /* 009D8 809B6D28 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 009DC 809B6D2C 0C034421 */ jal Matrix_RotateXYZ +/* 009DC 809B6D2C 0C034421 */ jal Matrix_RotateZYX /* 009E0 809B6D30 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 /* 009E4 809B6D34 3C17809C */ lui $s7, %hi(D_809B8080) ## $s7 = 809C0000 /* 009E8 809B6D38 26F78080 */ addiu $s7, $s7, %lo(D_809B8080) ## $s7 = 809B8080 /* 009EC 809B6D3C 02E02025 */ or $a0, $s7, $zero ## $a0 = 809B8080 -/* 009F0 809B6D40 0C0346BD */ jal Matrix_MultVec3f +/* 009F0 809B6D40 0C0346BD */ jal Matrix_MultVec3f /* 009F4 809B6D44 02202825 */ or $a1, $s1, $zero ## $a1 = 00000158 /* 009F8 809B6D48 00009025 */ or $s2, $zero, $zero ## $s2 = 00000000 /* 009FC 809B6D4C 2416000C */ addiu $s6, $zero, 0x000C ## $s6 = 0000000C /* 00A00 809B6D50 241504B0 */ addiu $s5, $zero, 0x04B0 ## $s5 = 000004B0 /* 00A04 809B6D54 24140006 */ addiu $s4, $zero, 0x0006 ## $s4 = 00000006 .L809B6D58: -/* 00A08 809B6D58 02540019 */ multu $s2, $s4 +/* 00A08 809B6D58 02540019 */ multu $s2, $s4 /* 00A0C 809B6D5C 8667031C */ lh $a3, 0x031C($s3) ## 0000031C -/* 00A10 809B6D60 AFA00010 */ sw $zero, 0x0010($sp) +/* 00A10 809B6D60 AFA00010 */ sw $zero, 0x0010($sp) /* 00A14 809B6D64 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 -/* 00A18 809B6D68 00007012 */ mflo $t6 -/* 00A1C 809B6D6C 026E8021 */ addu $s0, $s3, $t6 +/* 00A18 809B6D68 00007012 */ mflo $t6 +/* 00A1C 809B6D6C 026E8021 */ addu $s0, $s3, $t6 /* 00A20 809B6D70 260402A8 */ addiu $a0, $s0, 0x02A8 ## $a0 = 000002CC -/* 00A24 809B6D74 02550019 */ multu $s2, $s5 -/* 00A28 809B6D78 00002812 */ mflo $a1 +/* 00A24 809B6D74 02550019 */ multu $s2, $s5 +/* 00A28 809B6D78 00002812 */ mflo $a1 /* 00A2C 809B6D7C 24A5C000 */ addiu $a1, $a1, 0xC000 ## $a1 = FFFFC000 -/* 00A30 809B6D80 00052C00 */ sll $a1, $a1, 16 +/* 00A30 809B6D80 00052C00 */ sll $a1, $a1, 16 /* 00A34 809B6D84 0C01E1A7 */ jal Math_SmoothScaleMaxMinS - -/* 00A38 809B6D88 00052C03 */ sra $a1, $a1, 16 -/* 00A3C 809B6D8C 001E2C00 */ sll $a1, $s8, 16 + +/* 00A38 809B6D88 00052C03 */ sra $a1, $a1, 16 +/* 00A3C 809B6D8C 001E2C00 */ sll $a1, $s8, 16 /* 00A40 809B6D90 8667031C */ lh $a3, 0x031C($s3) ## 0000031C -/* 00A44 809B6D94 AFA00010 */ sw $zero, 0x0010($sp) -/* 00A48 809B6D98 00052C03 */ sra $a1, $a1, 16 +/* 00A44 809B6D94 AFA00010 */ sw $zero, 0x0010($sp) +/* 00A48 809B6D98 00052C03 */ sra $a1, $a1, 16 /* 00A4C 809B6D9C 260402AA */ addiu $a0, $s0, 0x02AA ## $a0 = 000002CE /* 00A50 809B6DA0 0C01E1A7 */ jal Math_SmoothScaleMaxMinS - + /* 00A54 809B6DA4 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 -/* 00A58 809B6DA8 02560019 */ multu $s2, $s6 +/* 00A58 809B6DA8 02560019 */ multu $s2, $s6 /* 00A5C 809B6DAC 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 00A60 809B6DB0 00007812 */ mflo $t7 -/* 00A64 809B6DB4 026F8821 */ addu $s1, $s3, $t7 +/* 00A60 809B6DB0 00007812 */ mflo $t7 +/* 00A64 809B6DB4 026F8821 */ addu $s1, $s3, $t7 /* 00A68 809B6DB8 C62C0158 */ lwc1 $f12, 0x0158($s1) ## 000002B0 /* 00A6C 809B6DBC C62E015C */ lwc1 $f14, 0x015C($s1) ## 000002B4 -/* 00A70 809B6DC0 0C034261 */ jal Matrix_Translate +/* 00A70 809B6DC0 0C034261 */ jal Matrix_Translate /* 00A74 809B6DC4 8E260160 */ lw $a2, 0x0160($s1) ## 000002B8 /* 00A78 809B6DC8 860402A8 */ lh $a0, 0x02A8($s0) ## 000002CC /* 00A7C 809B6DCC 24018000 */ addiu $at, $zero, 0x8000 ## $at = FFFF8000 /* 00A80 809B6DD0 860502AA */ lh $a1, 0x02AA($s0) ## 000002CE -/* 00A84 809B6DD4 00812021 */ addu $a0, $a0, $at -/* 00A88 809B6DD8 00042400 */ sll $a0, $a0, 16 -/* 00A8C 809B6DDC 00042403 */ sra $a0, $a0, 16 +/* 00A84 809B6DD4 00812021 */ addu $a0, $a0, $at +/* 00A88 809B6DD8 00042400 */ sll $a0, $a0, 16 +/* 00A8C 809B6DDC 00042403 */ sra $a0, $a0, 16 /* 00A90 809B6DE0 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 00A94 809B6DE4 0C034421 */ jal Matrix_RotateXYZ +/* 00A94 809B6DE4 0C034421 */ jal Matrix_RotateZYX /* 00A98 809B6DE8 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 /* 00A9C 809B6DEC 02E02025 */ or $a0, $s7, $zero ## $a0 = 809B8080 -/* 00AA0 809B6DF0 0C0346BD */ jal Matrix_MultVec3f +/* 00AA0 809B6DF0 0C0346BD */ jal Matrix_MultVec3f /* 00AA4 809B6DF4 26250164 */ addiu $a1, $s1, 0x0164 ## $a1 = 000002BC /* 00AA8 809B6DF8 26520001 */ addiu $s2, $s2, 0x0001 ## $s2 = 00000001 -/* 00AAC 809B6DFC 00129400 */ sll $s2, $s2, 16 -/* 00AB0 809B6E00 00129403 */ sra $s2, $s2, 16 -/* 00AB4 809B6E04 2A41000D */ slti $at, $s2, 0x000D -/* 00AB8 809B6E08 1420FFD3 */ bne $at, $zero, .L809B6D58 +/* 00AAC 809B6DFC 00129400 */ sll $s2, $s2, 16 +/* 00AB0 809B6E00 00129403 */ sra $s2, $s2, 16 +/* 00AB4 809B6E04 2A41000D */ slti $at, $s2, 0x000D +/* 00AB8 809B6E08 1420FFD3 */ bne $at, $zero, .L809B6D58 /* 00ABC 809B6E0C 00000000 */ nop -/* 00AC0 809B6E10 1000009C */ beq $zero, $zero, .L809B7084 +/* 00AC0 809B6E10 1000009C */ beq $zero, $zero, .L809B7084 /* 00AC4 809B6E14 92620330 */ lbu $v0, 0x0330($s3) ## 00000330 .L809B6E18: /* 00AC8 809B6E18 8662031A */ lh $v0, 0x031A($s3) ## 0000031A /* 00ACC 809B6E1C 2401000A */ addiu $at, $zero, 0x000A ## $at = 0000000A /* 00AD0 809B6E20 02602025 */ or $a0, $s3, $zero ## $a0 = 00000000 -/* 00AD4 809B6E24 14410004 */ bne $v0, $at, .L809B6E38 +/* 00AD4 809B6E24 14410004 */ bne $v0, $at, .L809B6E38 /* 00AD8 809B6E28 00000000 */ nop /* 00ADC 809B6E2C 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 00AE0 809B6E30 24053958 */ addiu $a1, $zero, 0x3958 ## $a1 = 00003958 /* 00AE4 809B6E34 8662031A */ lh $v0, 0x031A($s3) ## 0000031A .L809B6E38: -/* 00AE8 809B6E38 1040007C */ beq $v0, $zero, .L809B702C +/* 00AE8 809B6E38 1040007C */ beq $v0, $zero, .L809B702C /* 00AEC 809B6E3C 3C01432F */ lui $at, 0x432F ## $at = 432F0000 /* 00AF0 809B6E40 3C0141F0 */ lui $at, 0x41F0 ## $at = 41F00000 /* 00AF4 809B6E44 44814000 */ mtc1 $at, $f8 ## $f8 = 30.00 @@ -209,53 +209,53 @@ glabel func_809B6B58 /* 00B04 809B6E54 02002025 */ or $a0, $s0, $zero ## $a0 = 00000024 /* 00B08 809B6E58 266502FC */ addiu $a1, $s3, 0x02FC ## $a1 = 000002FC /* 00B0C 809B6E5C 0C01E01A */ jal Math_Vec3f_Yaw - + /* 00B10 809B6E60 E6680068 */ swc1 $f8, 0x0068($s3) ## 00000068 -/* 00B14 809B6E64 0002F400 */ sll $s8, $v0, 16 +/* 00B14 809B6E64 0002F400 */ sll $s8, $v0, 16 /* 00B18 809B6E68 26710158 */ addiu $s1, $s3, 0x0158 ## $s1 = 00000158 -/* 00B1C 809B6E6C 001EF403 */ sra $s8, $s8, 16 +/* 00B1C 809B6E6C 001EF403 */ sra $s8, $s8, 16 /* 00B20 809B6E70 02202825 */ or $a1, $s1, $zero ## $a1 = 00000158 /* 00B24 809B6E74 0C01E027 */ jal Math_Vec3f_Pitch - + /* 00B28 809B6E78 02002025 */ or $a0, $s0, $zero ## $a0 = 00000024 /* 00B2C 809B6E7C 34018000 */ ori $at, $zero, 0x8000 ## $at = 00008000 -/* 00B30 809B6E80 00418021 */ addu $s0, $v0, $at -/* 00B34 809B6E84 00108400 */ sll $s0, $s0, 16 -/* 00B38 809B6E88 001E2C00 */ sll $a1, $s8, 16 +/* 00B30 809B6E80 00418021 */ addu $s0, $v0, $at +/* 00B34 809B6E84 00108400 */ sll $s0, $s0, 16 +/* 00B38 809B6E88 001E2C00 */ sll $a1, $s8, 16 /* 00B3C 809B6E8C 8667031C */ lh $a3, 0x031C($s3) ## 0000031C -/* 00B40 809B6E90 00108403 */ sra $s0, $s0, 16 -/* 00B44 809B6E94 AFA00010 */ sw $zero, 0x0010($sp) -/* 00B48 809B6E98 00052C03 */ sra $a1, $a1, 16 +/* 00B40 809B6E90 00108403 */ sra $s0, $s0, 16 +/* 00B44 809B6E94 AFA00010 */ sw $zero, 0x0010($sp) +/* 00B48 809B6E98 00052C03 */ sra $a1, $a1, 16 /* 00B4C 809B6E9C 266400B6 */ addiu $a0, $s3, 0x00B6 ## $a0 = 000000B6 /* 00B50 809B6EA0 0C01E1A7 */ jal Math_SmoothScaleMaxMinS - + /* 00B54 809B6EA4 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 -/* 00B58 809B6EA8 00102C00 */ sll $a1, $s0, 16 +/* 00B58 809B6EA8 00102C00 */ sll $a1, $s0, 16 /* 00B5C 809B6EAC 8667031C */ lh $a3, 0x031C($s3) ## 0000031C -/* 00B60 809B6EB0 AFA00010 */ sw $zero, 0x0010($sp) -/* 00B64 809B6EB4 00052C03 */ sra $a1, $a1, 16 +/* 00B60 809B6EB0 AFA00010 */ sw $zero, 0x0010($sp) +/* 00B64 809B6EB4 00052C03 */ sra $a1, $a1, 16 /* 00B68 809B6EB8 266400B4 */ addiu $a0, $s3, 0x00B4 ## $a0 = 000000B4 /* 00B6C 809B6EBC 0C01E1A7 */ jal Math_SmoothScaleMaxMinS - + /* 00B70 809B6EC0 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 /* 00B74 809B6EC4 C66C0024 */ lwc1 $f12, 0x0024($s3) ## 00000024 /* 00B78 809B6EC8 C66E0028 */ lwc1 $f14, 0x0028($s3) ## 00000028 /* 00B7C 809B6ECC 8E66002C */ lw $a2, 0x002C($s3) ## 0000002C -/* 00B80 809B6ED0 0C034261 */ jal Matrix_Translate +/* 00B80 809B6ED0 0C034261 */ jal Matrix_Translate /* 00B84 809B6ED4 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 /* 00B88 809B6ED8 866400B4 */ lh $a0, 0x00B4($s3) ## 000000B4 /* 00B8C 809B6EDC 24018000 */ addiu $at, $zero, 0x8000 ## $at = FFFF8000 /* 00B90 809B6EE0 866500B6 */ lh $a1, 0x00B6($s3) ## 000000B6 -/* 00B94 809B6EE4 00812021 */ addu $a0, $a0, $at -/* 00B98 809B6EE8 00042400 */ sll $a0, $a0, 16 -/* 00B9C 809B6EEC 00042403 */ sra $a0, $a0, 16 +/* 00B94 809B6EE4 00812021 */ addu $a0, $a0, $at +/* 00B98 809B6EE8 00042400 */ sll $a0, $a0, 16 +/* 00B9C 809B6EEC 00042403 */ sra $a0, $a0, 16 /* 00BA0 809B6EF0 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 00BA4 809B6EF4 0C034421 */ jal Matrix_RotateXYZ +/* 00BA4 809B6EF4 0C034421 */ jal Matrix_RotateZYX /* 00BA8 809B6EF8 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 /* 00BAC 809B6EFC 3C17809C */ lui $s7, %hi(D_809B8080) ## $s7 = 809C0000 /* 00BB0 809B6F00 26F78080 */ addiu $s7, $s7, %lo(D_809B8080) ## $s7 = 809B8080 /* 00BB4 809B6F04 02E02025 */ or $a0, $s7, $zero ## $a0 = 809B8080 -/* 00BB8 809B6F08 0C0346BD */ jal Matrix_MultVec3f +/* 00BB8 809B6F08 0C0346BD */ jal Matrix_MultVec3f /* 00BBC 809B6F0C 02202825 */ or $a1, $s1, $zero ## $a1 = 00000158 /* 00BC0 809B6F10 00009025 */ or $s2, $zero, $zero ## $s2 = 00000000 /* 00BC4 809B6F14 2416000C */ addiu $s6, $zero, 0x000C ## $s6 = 0000000C @@ -264,93 +264,93 @@ glabel func_809B6B58 /* 00BD0 809B6F20 8664031A */ lh $a0, 0x031A($s3) ## 0000031A .L809B6F24: /* 00BD4 809B6F24 24010CCC */ addiu $at, $zero, 0x0CCC ## $at = 00000CCC -/* 00BD8 809B6F28 00810019 */ multu $a0, $at -/* 00BDC 809B6F2C 00002012 */ mflo $a0 -/* 00BE0 809B6F30 00042400 */ sll $a0, $a0, 16 +/* 00BD8 809B6F28 00810019 */ multu $a0, $at +/* 00BDC 809B6F2C 00002012 */ mflo $a0 +/* 00BE0 809B6F30 00042400 */ sll $a0, $a0, 16 /* 00BE4 809B6F34 0C01DE0D */ jal Math_Coss ## coss? -/* 00BE8 809B6F38 00042403 */ sra $a0, $a0, 16 -/* 00BEC 809B6F3C 02540019 */ multu $s2, $s4 -/* 00BF0 809B6F40 46000287 */ neg.s $f10, $f0 +/* 00BE8 809B6F38 00042403 */ sra $a0, $a0, 16 +/* 00BEC 809B6F3C 02540019 */ multu $s2, $s4 +/* 00BF0 809B6F40 46000287 */ neg.s $f10, $f0 /* 00BF4 809B6F44 8667031C */ lh $a3, 0x031C($s3) ## 0000031C -/* 00BF8 809B6F48 AFA00010 */ sw $zero, 0x0010($sp) +/* 00BF8 809B6F48 AFA00010 */ sw $zero, 0x0010($sp) /* 00BFC 809B6F4C 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 -/* 00C00 809B6F50 0000C812 */ mflo $t9 -/* 00C04 809B6F54 02798021 */ addu $s0, $s3, $t9 +/* 00C00 809B6F50 0000C812 */ mflo $t9 +/* 00C04 809B6F54 02798021 */ addu $s0, $s3, $t9 /* 00C08 809B6F58 260402A8 */ addiu $a0, $s0, 0x02A8 ## $a0 = 000002CC -/* 00C0C 809B6F5C 02550019 */ multu $s2, $s5 -/* 00C10 809B6F60 00004012 */ mflo $t0 +/* 00C0C 809B6F5C 02550019 */ multu $s2, $s5 +/* 00C10 809B6F60 00004012 */ mflo $t0 /* 00C14 809B6F64 44888000 */ mtc1 $t0, $f16 ## $f16 = 0.00 /* 00C18 809B6F68 00000000 */ nop -/* 00C1C 809B6F6C 468084A0 */ cvt.s.w $f18, $f16 -/* 00C20 809B6F70 46125102 */ mul.s $f4, $f10, $f18 -/* 00C24 809B6F74 4600218D */ trunc.w.s $f6, $f4 -/* 00C28 809B6F78 44053000 */ mfc1 $a1, $f6 +/* 00C1C 809B6F6C 468084A0 */ cvt.s.w $f18, $f16 +/* 00C20 809B6F70 46125102 */ mul.s $f4, $f10, $f18 +/* 00C24 809B6F74 4600218D */ trunc.w.s $f6, $f4 +/* 00C28 809B6F78 44053000 */ mfc1 $a1, $f6 /* 00C2C 809B6F7C 00000000 */ nop -/* 00C30 809B6F80 00052C00 */ sll $a1, $a1, 16 -/* 00C34 809B6F84 00052C03 */ sra $a1, $a1, 16 +/* 00C30 809B6F80 00052C00 */ sll $a1, $a1, 16 +/* 00C34 809B6F84 00052C03 */ sra $a1, $a1, 16 /* 00C38 809B6F88 24A5C000 */ addiu $a1, $a1, 0xC000 ## $a1 = FFFFC000 -/* 00C3C 809B6F8C 00052C00 */ sll $a1, $a1, 16 +/* 00C3C 809B6F8C 00052C00 */ sll $a1, $a1, 16 /* 00C40 809B6F90 0C01E1A7 */ jal Math_SmoothScaleMaxMinS - -/* 00C44 809B6F94 00052C03 */ sra $a1, $a1, 16 -/* 00C48 809B6F98 001E2C00 */ sll $a1, $s8, 16 + +/* 00C44 809B6F94 00052C03 */ sra $a1, $a1, 16 +/* 00C48 809B6F98 001E2C00 */ sll $a1, $s8, 16 /* 00C4C 809B6F9C 8667031C */ lh $a3, 0x031C($s3) ## 0000031C -/* 00C50 809B6FA0 AFA00010 */ sw $zero, 0x0010($sp) -/* 00C54 809B6FA4 00052C03 */ sra $a1, $a1, 16 +/* 00C50 809B6FA0 AFA00010 */ sw $zero, 0x0010($sp) +/* 00C54 809B6FA4 00052C03 */ sra $a1, $a1, 16 /* 00C58 809B6FA8 260402AA */ addiu $a0, $s0, 0x02AA ## $a0 = 000002CE /* 00C5C 809B6FAC 0C01E1A7 */ jal Math_SmoothScaleMaxMinS - + /* 00C60 809B6FB0 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 -/* 00C64 809B6FB4 02560019 */ multu $s2, $s6 +/* 00C64 809B6FB4 02560019 */ multu $s2, $s6 /* 00C68 809B6FB8 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 00C6C 809B6FBC 00005012 */ mflo $t2 -/* 00C70 809B6FC0 026A8821 */ addu $s1, $s3, $t2 +/* 00C6C 809B6FBC 00005012 */ mflo $t2 +/* 00C70 809B6FC0 026A8821 */ addu $s1, $s3, $t2 /* 00C74 809B6FC4 C62C0158 */ lwc1 $f12, 0x0158($s1) ## 000002B0 /* 00C78 809B6FC8 C62E015C */ lwc1 $f14, 0x015C($s1) ## 000002B4 -/* 00C7C 809B6FCC 0C034261 */ jal Matrix_Translate +/* 00C7C 809B6FCC 0C034261 */ jal Matrix_Translate /* 00C80 809B6FD0 8E260160 */ lw $a2, 0x0160($s1) ## 000002B8 /* 00C84 809B6FD4 860402A8 */ lh $a0, 0x02A8($s0) ## 000002CC /* 00C88 809B6FD8 24018000 */ addiu $at, $zero, 0x8000 ## $at = FFFF8000 /* 00C8C 809B6FDC 860502AA */ lh $a1, 0x02AA($s0) ## 000002CE -/* 00C90 809B6FE0 00812021 */ addu $a0, $a0, $at -/* 00C94 809B6FE4 00042400 */ sll $a0, $a0, 16 -/* 00C98 809B6FE8 00042403 */ sra $a0, $a0, 16 +/* 00C90 809B6FE0 00812021 */ addu $a0, $a0, $at +/* 00C94 809B6FE4 00042400 */ sll $a0, $a0, 16 +/* 00C98 809B6FE8 00042403 */ sra $a0, $a0, 16 /* 00C9C 809B6FEC 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 00CA0 809B6FF0 0C034421 */ jal Matrix_RotateXYZ +/* 00CA0 809B6FF0 0C034421 */ jal Matrix_RotateZYX /* 00CA4 809B6FF4 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 /* 00CA8 809B6FF8 02E02025 */ or $a0, $s7, $zero ## $a0 = 809B8080 -/* 00CAC 809B6FFC 0C0346BD */ jal Matrix_MultVec3f +/* 00CAC 809B6FFC 0C0346BD */ jal Matrix_MultVec3f /* 00CB0 809B7000 26250164 */ addiu $a1, $s1, 0x0164 ## $a1 = 000002BC /* 00CB4 809B7004 26520001 */ addiu $s2, $s2, 0x0001 ## $s2 = 00000001 -/* 00CB8 809B7008 00129400 */ sll $s2, $s2, 16 -/* 00CBC 809B700C 00129403 */ sra $s2, $s2, 16 -/* 00CC0 809B7010 2A41000D */ slti $at, $s2, 0x000D -/* 00CC4 809B7014 5420FFC3 */ bnel $at, $zero, .L809B6F24 +/* 00CB8 809B7008 00129400 */ sll $s2, $s2, 16 +/* 00CBC 809B700C 00129403 */ sra $s2, $s2, 16 +/* 00CC0 809B7010 2A41000D */ slti $at, $s2, 0x000D +/* 00CC4 809B7014 5420FFC3 */ bnel $at, $zero, .L809B6F24 /* 00CC8 809B7018 8664031A */ lh $a0, 0x031A($s3) ## 0000031A /* 00CCC 809B701C 866B031A */ lh $t3, 0x031A($s3) ## 0000031A /* 00CD0 809B7020 256CFFFF */ addiu $t4, $t3, 0xFFFF ## $t4 = FFFFFFFF -/* 00CD4 809B7024 10000016 */ beq $zero, $zero, .L809B7080 +/* 00CD4 809B7024 10000016 */ beq $zero, $zero, .L809B7080 /* 00CD8 809B7028 A66C031A */ sh $t4, 0x031A($s3) ## 0000031A .L809B702C: /* 00CDC 809B702C 44814000 */ mtc1 $at, $f8 ## $f8 = 0.00 /* 00CE0 809B7030 C6700090 */ lwc1 $f16, 0x0090($s3) ## 00000090 -/* 00CE4 809B7034 8FAD0064 */ lw $t5, 0x0064($sp) -/* 00CE8 809B7038 4610403C */ c.lt.s $f8, $f16 +/* 00CE4 809B7034 8FAD0064 */ lw $t5, 0x0064($sp) +/* 00CE8 809B7038 4610403C */ c.lt.s $f8, $f16 /* 00CEC 809B703C 00000000 */ nop -/* 00CF0 809B7040 45010005 */ bc1t .L809B7058 +/* 00CF0 809B7040 45010005 */ bc1t .L809B7058 /* 00CF4 809B7044 00000000 */ nop /* 00CF8 809B7048 8DAE067C */ lw $t6, 0x067C($t5) ## 0000067C -/* 00CFC 809B704C 000E7940 */ sll $t7, $t6, 5 -/* 00D00 809B7050 05E10005 */ bgez $t7, .L809B7068 +/* 00CFC 809B704C 000E7940 */ sll $t7, $t6, 5 +/* 00D00 809B7050 05E10005 */ bgez $t7, .L809B7068 /* 00D04 809B7054 00000000 */ nop .L809B7058: -/* 00D08 809B7058 0C26D95A */ jal func_809B6568 +/* 00D08 809B7058 0C26D95A */ jal func_809B6568 /* 00D0C 809B705C 02602025 */ or $a0, $s3, $zero ## $a0 = 00000000 -/* 00D10 809B7060 10000008 */ beq $zero, $zero, .L809B7084 +/* 00D10 809B7060 10000008 */ beq $zero, $zero, .L809B7084 /* 00D14 809B7064 92620330 */ lbu $v0, 0x0330($s3) ## 00000330 .L809B7068: -/* 00D18 809B7068 0C26DAC1 */ jal func_809B6B04 +/* 00D18 809B7068 0C26DAC1 */ jal func_809B6B04 /* 00D1C 809B706C 02602025 */ or $a0, $s3, $zero ## $a0 = 00000000 /* 00D20 809B7070 2418001B */ addiu $t8, $zero, 0x001B ## $t8 = 0000001B /* 00D24 809B7074 241902EE */ addiu $t9, $zero, 0x02EE ## $t9 = 000002EE @@ -363,68 +363,68 @@ glabel func_809B6B58 /* 00D38 809B7088 866902F2 */ lh $t1, 0x02F2($s3) ## 000002F2 /* 00D3C 809B708C 304A0002 */ andi $t2, $v0, 0x0002 ## $t2 = 00000000 /* 00D40 809B7090 A66802F6 */ sh $t0, 0x02F6($s3) ## 000002F6 -/* 00D44 809B7094 1140000F */ beq $t2, $zero, .L809B70D4 +/* 00D44 809B7094 1140000F */ beq $t2, $zero, .L809B70D4 /* 00D48 809B7098 A66902F8 */ sh $t1, 0x02F8($s3) ## 000002F8 /* 00D4C 809B709C 304BFFFD */ andi $t3, $v0, 0xFFFD ## $t3 = 00000000 /* 00D50 809B70A0 A26B0330 */ sb $t3, 0x0330($s3) ## 00000330 -/* 00D54 809B70A4 8FAC0064 */ lw $t4, 0x0064($sp) +/* 00D54 809B70A4 8FAC0064 */ lw $t4, 0x0064($sp) /* 00D58 809B70A8 8E6D0324 */ lw $t5, 0x0324($s3) ## 00000324 /* 00D5C 809B70AC 3C014100 */ lui $at, 0x4100 ## $at = 41000000 -/* 00D60 809B70B0 8FA4006C */ lw $a0, 0x006C($sp) -/* 00D64 809B70B4 558D0008 */ bnel $t4, $t5, .L809B70D8 -/* 00D68 809B70B8 8FA4006C */ lw $a0, 0x006C($sp) +/* 00D60 809B70B0 8FA4006C */ lw $a0, 0x006C($sp) +/* 00D64 809B70B4 558D0008 */ bnel $t4, $t5, .L809B70D8 +/* 00D68 809B70B8 8FA4006C */ lw $a0, 0x006C($sp) /* 00D6C 809B70BC 44810000 */ mtc1 $at, $f0 ## $f0 = 8.00 /* 00D70 809B70C0 8667008A */ lh $a3, 0x008A($s3) ## 0000008A /* 00D74 809B70C4 02602825 */ or $a1, $s3, $zero ## $a1 = 00000000 -/* 00D78 809B70C8 44060000 */ mfc1 $a2, $f0 -/* 00D7C 809B70CC 0C00BDC7 */ jal func_8002F71C -/* 00D80 809B70D0 E7A00010 */ swc1 $f0, 0x0010($sp) +/* 00D78 809B70C8 44060000 */ mfc1 $a2, $f0 +/* 00D7C 809B70CC 0C00BDC7 */ jal func_8002F71C +/* 00D80 809B70D0 E7A00010 */ swc1 $f0, 0x0010($sp) .L809B70D4: -/* 00D84 809B70D4 8FA4006C */ lw $a0, 0x006C($sp) +/* 00D84 809B70D4 8FA4006C */ lw $a0, 0x006C($sp) .L809B70D8: /* 00D88 809B70D8 3C010001 */ lui $at, 0x0001 ## $at = 00010000 /* 00D8C 809B70DC 34211E60 */ ori $at, $at, 0x1E60 ## $at = 00011E60 /* 00D90 809B70E0 26660320 */ addiu $a2, $s3, 0x0320 ## $a2 = 00000320 /* 00D94 809B70E4 0C0175E7 */ jal Actor_CollisionCheck_SetAT ## CollisionCheck_setAT -/* 00D98 809B70E8 00812821 */ addu $a1, $a0, $at -/* 00D9C 809B70EC 10000016 */ beq $zero, $zero, .L809B7148 -/* 00DA0 809B70F0 8FBF0044 */ lw $ra, 0x0044($sp) +/* 00D98 809B70E8 00812821 */ addu $a1, $a0, $at +/* 00D9C 809B70EC 10000016 */ beq $zero, $zero, .L809B7148 +/* 00DA0 809B70F0 8FBF0044 */ lw $ra, 0x0044($sp) /* 00DA4 809B70F4 44815000 */ mtc1 $at, $f10 ## $f10 = 0.00 .L809B70F8: -/* 00DA8 809B70F8 8FAF0064 */ lw $t7, 0x0064($sp) -/* 00DAC 809B70FC 4602503C */ c.lt.s $f10, $f2 +/* 00DA8 809B70F8 8FAF0064 */ lw $t7, 0x0064($sp) +/* 00DAC 809B70FC 4602503C */ c.lt.s $f10, $f2 /* 00DB0 809B7100 00000000 */ nop -/* 00DB4 809B7104 45010005 */ bc1t .L809B711C +/* 00DB4 809B7104 45010005 */ bc1t .L809B711C /* 00DB8 809B7108 00000000 */ nop /* 00DBC 809B710C 8DF8067C */ lw $t8, 0x067C($t7) ## 0000067C -/* 00DC0 809B7110 0018C940 */ sll $t9, $t8, 5 -/* 00DC4 809B7114 07210005 */ bgez $t9, .L809B712C +/* 00DC0 809B7110 0018C940 */ sll $t9, $t8, 5 +/* 00DC4 809B7114 07210005 */ bgez $t9, .L809B712C /* 00DC8 809B7118 00000000 */ nop .L809B711C: -/* 00DCC 809B711C 0C26D95A */ jal func_809B6568 +/* 00DCC 809B711C 0C26D95A */ jal func_809B6568 /* 00DD0 809B7120 02602025 */ or $a0, $s3, $zero ## $a0 = 00000000 -/* 00DD4 809B7124 10000008 */ beq $zero, $zero, .L809B7148 -/* 00DD8 809B7128 8FBF0044 */ lw $ra, 0x0044($sp) +/* 00DD4 809B7124 10000008 */ beq $zero, $zero, .L809B7148 +/* 00DD8 809B7128 8FBF0044 */ lw $ra, 0x0044($sp) .L809B712C: -/* 00DDC 809B712C 0C26DAC1 */ jal func_809B6B04 +/* 00DDC 809B712C 0C26DAC1 */ jal func_809B6B04 /* 00DE0 809B7130 02602025 */ or $a0, $s3, $zero ## $a0 = 00000000 /* 00DE4 809B7134 2408001B */ addiu $t0, $zero, 0x001B ## $t0 = 0000001B /* 00DE8 809B7138 240902EE */ addiu $t1, $zero, 0x02EE ## $t1 = 000002EE /* 00DEC 809B713C A6680318 */ sh $t0, 0x0318($s3) ## 00000318 /* 00DF0 809B7140 A669031C */ sh $t1, 0x031C($s3) ## 0000031C -/* 00DF4 809B7144 8FBF0044 */ lw $ra, 0x0044($sp) +/* 00DF4 809B7144 8FBF0044 */ lw $ra, 0x0044($sp) .L809B7148: -/* 00DF8 809B7148 8FB00020 */ lw $s0, 0x0020($sp) -/* 00DFC 809B714C 8FB10024 */ lw $s1, 0x0024($sp) -/* 00E00 809B7150 8FB20028 */ lw $s2, 0x0028($sp) -/* 00E04 809B7154 8FB3002C */ lw $s3, 0x002C($sp) -/* 00E08 809B7158 8FB40030 */ lw $s4, 0x0030($sp) -/* 00E0C 809B715C 8FB50034 */ lw $s5, 0x0034($sp) -/* 00E10 809B7160 8FB60038 */ lw $s6, 0x0038($sp) -/* 00E14 809B7164 8FB7003C */ lw $s7, 0x003C($sp) -/* 00E18 809B7168 8FBE0040 */ lw $s8, 0x0040($sp) -/* 00E1C 809B716C 03E00008 */ jr $ra +/* 00DF8 809B7148 8FB00020 */ lw $s0, 0x0020($sp) +/* 00DFC 809B714C 8FB10024 */ lw $s1, 0x0024($sp) +/* 00E00 809B7150 8FB20028 */ lw $s2, 0x0028($sp) +/* 00E04 809B7154 8FB3002C */ lw $s3, 0x002C($sp) +/* 00E08 809B7158 8FB40030 */ lw $s4, 0x0030($sp) +/* 00E0C 809B715C 8FB50034 */ lw $s5, 0x0034($sp) +/* 00E10 809B7160 8FB60038 */ lw $s6, 0x0038($sp) +/* 00E14 809B7164 8FB7003C */ lw $s7, 0x003C($sp) +/* 00E18 809B7168 8FBE0040 */ lw $s8, 0x0040($sp) +/* 00E1C 809B716C 03E00008 */ jr $ra /* 00E20 809B7170 27BD0068 */ addiu $sp, $sp, 0x0068 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ba/func_809B71F0.s b/asm/non_matchings/overlays/actors/ovl_En_Ba/func_809B71F0.s index 8953538770..708e2b650a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ba/func_809B71F0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ba/func_809B71F0.s @@ -1,69 +1,69 @@ glabel func_809B71F0 /* 00EA0 809B71F0 27BDFF88 */ addiu $sp, $sp, 0xFF88 ## $sp = FFFFFF88 -/* 00EA4 809B71F4 AFB7003C */ sw $s7, 0x003C($sp) +/* 00EA4 809B71F4 AFB7003C */ sw $s7, 0x003C($sp) /* 00EA8 809B71F8 0080B825 */ or $s7, $a0, $zero ## $s7 = 00000000 -/* 00EAC 809B71FC AFBF0044 */ sw $ra, 0x0044($sp) -/* 00EB0 809B7200 AFBE0040 */ sw $s8, 0x0040($sp) -/* 00EB4 809B7204 AFB60038 */ sw $s6, 0x0038($sp) -/* 00EB8 809B7208 AFB50034 */ sw $s5, 0x0034($sp) -/* 00EBC 809B720C AFB40030 */ sw $s4, 0x0030($sp) -/* 00EC0 809B7210 AFB3002C */ sw $s3, 0x002C($sp) -/* 00EC4 809B7214 AFB20028 */ sw $s2, 0x0028($sp) -/* 00EC8 809B7218 AFB10024 */ sw $s1, 0x0024($sp) -/* 00ECC 809B721C AFB00020 */ sw $s0, 0x0020($sp) +/* 00EAC 809B71FC AFBF0044 */ sw $ra, 0x0044($sp) +/* 00EB0 809B7200 AFBE0040 */ sw $s8, 0x0040($sp) +/* 00EB4 809B7204 AFB60038 */ sw $s6, 0x0038($sp) +/* 00EB8 809B7208 AFB50034 */ sw $s5, 0x0034($sp) +/* 00EBC 809B720C AFB40030 */ sw $s4, 0x0030($sp) +/* 00EC0 809B7210 AFB3002C */ sw $s3, 0x002C($sp) +/* 00EC4 809B7214 AFB20028 */ sw $s2, 0x0028($sp) +/* 00EC8 809B7218 AFB10024 */ sw $s1, 0x0024($sp) +/* 00ECC 809B721C AFB00020 */ sw $s0, 0x0020($sp) /* 00ED0 809B7220 3C0143A5 */ lui $at, 0x43A5 ## $at = 43A50000 /* 00ED4 809B7224 44813000 */ mtc1 $at, $f6 ## $f6 = 330.00 /* 00ED8 809B7228 C6E4000C */ lwc1 $f4, 0x000C($s7) ## 0000000C /* 00EDC 809B722C 44805000 */ mtc1 $zero, $f10 ## $f10 = 0.00 /* 00EE0 809B7230 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 -/* 00EE4 809B7234 46062200 */ add.s $f8, $f4, $f6 +/* 00EE4 809B7234 46062200 */ add.s $f8, $f4, $f6 /* 00EE8 809B7238 24840028 */ addiu $a0, $a0, 0x0028 ## $a0 = 00000028 /* 00EEC 809B723C 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 00EF0 809B7240 3C0741F0 */ lui $a3, 0x41F0 ## $a3 = 41F00000 -/* 00EF4 809B7244 44054000 */ mfc1 $a1, $f8 +/* 00EF4 809B7244 44054000 */ mfc1 $a1, $f8 /* 00EF8 809B7248 0C01E0C4 */ jal Math_SmoothScaleMaxMinF - -/* 00EFC 809B724C E7AA0010 */ swc1 $f10, 0x0010($sp) + +/* 00EFC 809B724C E7AA0010 */ swc1 $f10, 0x0010($sp) /* 00F00 809B7250 26F40024 */ addiu $s4, $s7, 0x0024 ## $s4 = 00000024 /* 00F04 809B7254 8E8F0000 */ lw $t7, 0x0000($s4) ## 00000024 /* 00F08 809B7258 26F002FC */ addiu $s0, $s7, 0x02FC ## $s0 = 000002FC /* 00F0C 809B725C 3C180001 */ lui $t8, 0x0001 ## $t8 = 00010000 /* 00F10 809B7260 AE0F0000 */ sw $t7, 0x0000($s0) ## 000002FC /* 00F14 809B7264 8E8E0004 */ lw $t6, 0x0004($s4) ## 00000028 -/* 00F18 809B7268 0311C021 */ addu $t8, $t8, $s1 +/* 00F18 809B7268 0311C021 */ addu $t8, $t8, $s1 /* 00F1C 809B726C AE0E0004 */ sw $t6, 0x0004($s0) ## 00000300 /* 00F20 809B7270 8E8F0008 */ lw $t7, 0x0008($s4) ## 0000002C /* 00F24 809B7274 AE0F0008 */ sw $t7, 0x0008($s0) ## 00000304 /* 00F28 809B7278 8F181DE4 */ lw $t8, 0x1DE4($t8) ## 00011DE4 /* 00F2C 809B727C 3319000F */ andi $t9, $t8, 0x000F ## $t9 = 00000000 -/* 00F30 809B7280 1720001A */ bne $t9, $zero, .L809B72EC +/* 00F30 809B7280 1720001A */ bne $t9, $zero, .L809B72EC /* 00F34 809B7284 3C014334 */ lui $at, 0x4334 ## $at = 43340000 /* 00F38 809B7288 44816000 */ mtc1 $at, $f12 ## $f12 = 180.00 /* 00F3C 809B728C 0C00CFC8 */ jal Math_Rand_CenteredFloat - + /* 00F40 809B7290 00000000 */ nop /* 00F44 809B7294 C6F00310 */ lwc1 $f16, 0x0310($s7) ## 00000310 /* 00F48 809B7298 3C014334 */ lui $at, 0x4334 ## $at = 43340000 /* 00F4C 809B729C 44816000 */ mtc1 $at, $f12 ## $f12 = 180.00 -/* 00F50 809B72A0 46008480 */ add.s $f18, $f16, $f0 +/* 00F50 809B72A0 46008480 */ add.s $f18, $f16, $f0 /* 00F54 809B72A4 0C00CFC8 */ jal Math_Rand_CenteredFloat - + /* 00F58 809B72A8 E6F20310 */ swc1 $f18, 0x0310($s7) ## 00000310 /* 00F5C 809B72AC C6E40314 */ lwc1 $f4, 0x0314($s7) ## 00000314 /* 00F60 809B72B0 C6EC0310 */ lwc1 $f12, 0x0310($s7) ## 00000310 -/* 00F64 809B72B4 46002180 */ add.s $f6, $f4, $f0 -/* 00F68 809B72B8 0C0329C8 */ jal func_800CA720 +/* 00F64 809B72B4 46002180 */ add.s $f6, $f4, $f0 +/* 00F68 809B72B8 0C0329C8 */ jal func_800CA720 /* 00F6C 809B72BC E6E60314 */ swc1 $f6, 0x0314($s7) ## 00000314 /* 00F70 809B72C0 3C0142A0 */ lui $at, 0x42A0 ## $at = 42A00000 /* 00F74 809B72C4 44814000 */ mtc1 $at, $f8 ## $f8 = 80.00 /* 00F78 809B72C8 C6EC0314 */ lwc1 $f12, 0x0314($s7) ## 00000314 -/* 00F7C 809B72CC 46080282 */ mul.s $f10, $f0, $f8 -/* 00F80 809B72D0 0C0329DD */ jal func_800CA774 +/* 00F7C 809B72CC 46080282 */ mul.s $f10, $f0, $f8 +/* 00F80 809B72D0 0C0329DD */ jal func_800CA774 /* 00F84 809B72D4 E6EA0308 */ swc1 $f10, 0x0308($s7) ## 00000308 /* 00F88 809B72D8 3C0142A0 */ lui $at, 0x42A0 ## $at = 42A00000 /* 00F8C 809B72DC 44818000 */ mtc1 $at, $f16 ## $f16 = 80.00 /* 00F90 809B72E0 00000000 */ nop -/* 00F94 809B72E4 46100482 */ mul.s $f18, $f0, $f16 +/* 00F94 809B72E4 46100482 */ mul.s $f18, $f0, $f16 /* 00F98 809B72E8 E6F2030C */ swc1 $f18, 0x030C($s7) ## 0000030C .L809B72EC: /* 00F9C 809B72EC 3C0143E0 */ lui $at, 0x43E0 ## $at = 43E00000 @@ -71,22 +71,22 @@ glabel func_809B71F0 /* 00FA4 809B72F4 C6E40300 */ lwc1 $f4, 0x0300($s7) ## 00000300 /* 00FA8 809B72F8 C6EA02FC */ lwc1 $f10, 0x02FC($s7) ## 000002FC /* 00FAC 809B72FC C6F00308 */ lwc1 $f16, 0x0308($s7) ## 00000308 -/* 00FB0 809B7300 46062201 */ sub.s $f8, $f4, $f6 +/* 00FB0 809B7300 46062201 */ sub.s $f8, $f4, $f6 /* 00FB4 809B7304 C6E6030C */ lwc1 $f6, 0x030C($s7) ## 0000030C /* 00FB8 809B7308 C6E40304 */ lwc1 $f4, 0x0304($s7) ## 00000304 -/* 00FBC 809B730C 46105480 */ add.s $f18, $f10, $f16 +/* 00FBC 809B730C 46105480 */ add.s $f18, $f10, $f16 /* 00FC0 809B7310 E6E80300 */ swc1 $f8, 0x0300($s7) ## 00000300 /* 00FC4 809B7314 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 00FC8 809B7318 46062200 */ add.s $f8, $f4, $f6 +/* 00FC8 809B7318 46062200 */ add.s $f8, $f4, $f6 /* 00FCC 809B731C E6F202FC */ swc1 $f18, 0x02FC($s7) ## 000002FC /* 00FD0 809B7320 8EE70068 */ lw $a3, 0x0068($s7) ## 00000068 /* 00FD4 809B7324 02002025 */ or $a0, $s0, $zero ## $a0 = 000002FC /* 00FD8 809B7328 E6E80304 */ swc1 $f8, 0x0304($s7) ## 00000304 /* 00FDC 809B732C 26E501F4 */ addiu $a1, $s7, 0x01F4 ## $a1 = 000001F4 /* 00FE0 809B7330 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 00FE4 809B7334 E7A00014 */ swc1 $f0, 0x0014($sp) -/* 00FE8 809B7338 0C00CEBB */ jal func_80033AEC -/* 00FEC 809B733C E7A00010 */ swc1 $f0, 0x0010($sp) +/* 00FE4 809B7334 E7A00014 */ swc1 $f0, 0x0014($sp) +/* 00FE8 809B7338 0C00CEBB */ jal func_80033AEC +/* 00FEC 809B733C E7A00010 */ swc1 $f0, 0x0010($sp) /* 00FF0 809B7340 26F00090 */ addiu $s0, $s7, 0x0090 ## $s0 = 00000090 /* 00FF4 809B7344 26110164 */ addiu $s1, $s0, 0x0164 ## $s1 = 000001F4 /* 00FF8 809B7348 26120158 */ addiu $s2, $s0, 0x0158 ## $s2 = 000001E8 @@ -96,70 +96,70 @@ glabel func_809B71F0 /* 01004 809B7354 02202025 */ or $a0, $s1, $zero ## $a0 = 000001F4 /* 01008 809B7358 02402825 */ or $a1, $s2, $zero ## $a1 = 000001E8 /* 0100C 809B735C 03C03025 */ or $a2, $s8, $zero ## $a2 = FFFFFFF4 -/* 01010 809B7360 0C00D611 */ jal func_80035844 +/* 01010 809B7360 0C00D611 */ jal func_80035844 /* 01014 809B7364 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 /* 01018 809B7368 C60C0164 */ lwc1 $f12, 0x0164($s0) ## 000001F4 /* 0101C 809B736C C60E0168 */ lwc1 $f14, 0x0168($s0) ## 000001F8 /* 01020 809B7370 8E06016C */ lw $a2, 0x016C($s0) ## 000001FC -/* 01024 809B7374 0C034261 */ jal Matrix_Translate +/* 01024 809B7374 0C034261 */ jal Matrix_Translate /* 01028 809B7378 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 0102C 809B737C 87A4006C */ lh $a0, 0x006C($sp) -/* 01030 809B7380 87A5006E */ lh $a1, 0x006E($sp) +/* 0102C 809B737C 87A4006C */ lh $a0, 0x006C($sp) +/* 01030 809B7380 87A5006E */ lh $a1, 0x006E($sp) /* 01034 809B7384 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 01038 809B7388 0C034421 */ jal Matrix_RotateXYZ +/* 01038 809B7388 0C034421 */ jal Matrix_RotateZYX /* 0103C 809B738C 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 /* 01040 809B7390 3C04809C */ lui $a0, %hi(D_809B8080) ## $a0 = 809C0000 /* 01044 809B7394 24848080 */ addiu $a0, $a0, %lo(D_809B8080) ## $a0 = 809B8080 -/* 01048 809B7398 0C0346BD */ jal Matrix_MultVec3f +/* 01048 809B7398 0C0346BD */ jal Matrix_MultVec3f /* 0104C 809B739C 02402825 */ or $a1, $s2, $zero ## $a1 = 000001E8 /* 01050 809B73A0 2673FFF4 */ addiu $s3, $s3, 0xFFF4 ## $s3 = 00000084 /* 01054 809B73A4 2610FFF4 */ addiu $s0, $s0, 0xFFF4 ## $s0 = 00000084 /* 01058 809B73A8 2631FFF4 */ addiu $s1, $s1, 0xFFF4 ## $s1 = 000001E8 -/* 0105C 809B73AC 0661FFE9 */ bgez $s3, .L809B7354 +/* 0105C 809B73AC 0661FFE9 */ bgez $s3, .L809B7354 /* 01060 809B73B0 2652FFF4 */ addiu $s2, $s2, 0xFFF4 ## $s2 = 000001DC /* 01064 809B73B4 26F00158 */ addiu $s0, $s7, 0x0158 ## $s0 = 00000158 /* 01068 809B73B8 02002825 */ or $a1, $s0, $zero ## $a1 = 00000158 /* 0106C 809B73BC 02802025 */ or $a0, $s4, $zero ## $a0 = 00000024 /* 01070 809B73C0 03C03025 */ or $a2, $s8, $zero ## $a2 = FFFFFFF4 -/* 01074 809B73C4 0C00D611 */ jal func_80035844 +/* 01074 809B73C4 0C00D611 */ jal func_80035844 /* 01078 809B73C8 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 /* 0107C 809B73CC C6EC0024 */ lwc1 $f12, 0x0024($s7) ## 00000024 /* 01080 809B73D0 C6EE0028 */ lwc1 $f14, 0x0028($s7) ## 00000028 /* 01084 809B73D4 8EE6002C */ lw $a2, 0x002C($s7) ## 0000002C -/* 01088 809B73D8 0C034261 */ jal Matrix_Translate +/* 01088 809B73D8 0C034261 */ jal Matrix_Translate /* 0108C 809B73DC 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 /* 01090 809B73E0 86E7031C */ lh $a3, 0x031C($s7) ## 0000031C /* 01094 809B73E4 240800B6 */ addiu $t0, $zero, 0x00B6 ## $t0 = 000000B6 -/* 01098 809B73E8 AFA80010 */ sw $t0, 0x0010($sp) +/* 01098 809B73E8 AFA80010 */ sw $t0, 0x0010($sp) /* 0109C 809B73EC 26E400B6 */ addiu $a0, $s7, 0x00B6 ## $a0 = 000000B6 -/* 010A0 809B73F0 87A5006E */ lh $a1, 0x006E($sp) +/* 010A0 809B73F0 87A5006E */ lh $a1, 0x006E($sp) /* 010A4 809B73F4 0C01E1A7 */ jal Math_SmoothScaleMaxMinS - + /* 010A8 809B73F8 24060003 */ addiu $a2, $zero, 0x0003 ## $a2 = 00000003 -/* 010AC 809B73FC 87A5006C */ lh $a1, 0x006C($sp) +/* 010AC 809B73FC 87A5006C */ lh $a1, 0x006C($sp) /* 010B0 809B7400 34018000 */ ori $at, $zero, 0x8000 ## $at = 00008000 /* 010B4 809B7404 86E7031C */ lh $a3, 0x031C($s7) ## 0000031C -/* 010B8 809B7408 00A12821 */ addu $a1, $a1, $at -/* 010BC 809B740C 00052C00 */ sll $a1, $a1, 16 +/* 010B8 809B7408 00A12821 */ addu $a1, $a1, $at +/* 010BC 809B740C 00052C00 */ sll $a1, $a1, 16 /* 010C0 809B7410 240900B6 */ addiu $t1, $zero, 0x00B6 ## $t1 = 000000B6 -/* 010C4 809B7414 AFA90010 */ sw $t1, 0x0010($sp) -/* 010C8 809B7418 00052C03 */ sra $a1, $a1, 16 +/* 010C4 809B7414 AFA90010 */ sw $t1, 0x0010($sp) +/* 010C8 809B7418 00052C03 */ sra $a1, $a1, 16 /* 010CC 809B741C 26E400B4 */ addiu $a0, $s7, 0x00B4 ## $a0 = 000000B4 /* 010D0 809B7420 0C01E1A7 */ jal Math_SmoothScaleMaxMinS - + /* 010D4 809B7424 24060003 */ addiu $a2, $zero, 0x0003 ## $a2 = 00000003 /* 010D8 809B7428 86E400B4 */ lh $a0, 0x00B4($s7) ## 000000B4 /* 010DC 809B742C 24018000 */ addiu $at, $zero, 0x8000 ## $at = FFFF8000 /* 010E0 809B7430 86E500B6 */ lh $a1, 0x00B6($s7) ## 000000B6 -/* 010E4 809B7434 00812021 */ addu $a0, $a0, $at -/* 010E8 809B7438 00042400 */ sll $a0, $a0, 16 -/* 010EC 809B743C 00042403 */ sra $a0, $a0, 16 +/* 010E4 809B7434 00812021 */ addu $a0, $a0, $at +/* 010E8 809B7438 00042400 */ sll $a0, $a0, 16 +/* 010EC 809B743C 00042403 */ sra $a0, $a0, 16 /* 010F0 809B7440 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 010F4 809B7444 0C034421 */ jal Matrix_RotateXYZ +/* 010F4 809B7444 0C034421 */ jal Matrix_RotateZYX /* 010F8 809B7448 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 /* 010FC 809B744C 3C04809C */ lui $a0, %hi(D_809B8080) ## $a0 = 809C0000 /* 01100 809B7450 24848080 */ addiu $a0, $a0, %lo(D_809B8080) ## $a0 = 809B8080 -/* 01104 809B7454 0C0346BD */ jal Matrix_MultVec3f +/* 01104 809B7454 0C0346BD */ jal Matrix_MultVec3f /* 01108 809B7458 02002825 */ or $a1, $s0, $zero ## $a1 = 00000158 /* 0110C 809B745C 02E08025 */ or $s0, $s7, $zero ## $s0 = 00000000 /* 01110 809B7460 26F10164 */ addiu $s1, $s7, 0x0164 ## $s1 = 00000164 @@ -172,45 +172,45 @@ glabel func_809B71F0 /* 01128 809B7478 02402025 */ or $a0, $s2, $zero ## $a0 = 00000158 /* 0112C 809B747C 02202825 */ or $a1, $s1, $zero ## $a1 = 00000164 /* 01130 809B7480 03C03025 */ or $a2, $s8, $zero ## $a2 = FFFFFFF4 -/* 01134 809B7484 0C00D611 */ jal func_80035844 +/* 01134 809B7484 0C00D611 */ jal func_80035844 /* 01138 809B7488 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 /* 0113C 809B748C C60C0158 */ lwc1 $f12, 0x0158($s0) ## 00000158 /* 01140 809B7490 C60E015C */ lwc1 $f14, 0x015C($s0) ## 0000015C /* 01144 809B7494 8E060160 */ lw $a2, 0x0160($s0) ## 00000160 -/* 01148 809B7498 0C034261 */ jal Matrix_Translate +/* 01148 809B7498 0C034261 */ jal Matrix_Translate /* 0114C 809B749C 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 /* 01150 809B74A0 86E7031C */ lh $a3, 0x031C($s7) ## 0000031C /* 01154 809B74A4 240A00B6 */ addiu $t2, $zero, 0x00B6 ## $t2 = 000000B6 -/* 01158 809B74A8 AFAA0010 */ sw $t2, 0x0010($sp) +/* 01158 809B74A8 AFAA0010 */ sw $t2, 0x0010($sp) /* 0115C 809B74AC 02A02025 */ or $a0, $s5, $zero ## $a0 = 000002AA -/* 01160 809B74B0 87A5006E */ lh $a1, 0x006E($sp) +/* 01160 809B74B0 87A5006E */ lh $a1, 0x006E($sp) /* 01164 809B74B4 0C01E1A7 */ jal Math_SmoothScaleMaxMinS - + /* 01168 809B74B8 24060003 */ addiu $a2, $zero, 0x0003 ## $a2 = 00000003 -/* 0116C 809B74BC 87A5006C */ lh $a1, 0x006C($sp) +/* 0116C 809B74BC 87A5006C */ lh $a1, 0x006C($sp) /* 01170 809B74C0 34018000 */ ori $at, $zero, 0x8000 ## $at = 00008000 /* 01174 809B74C4 86E7031C */ lh $a3, 0x031C($s7) ## 0000031C -/* 01178 809B74C8 00A12821 */ addu $a1, $a1, $at -/* 0117C 809B74CC 00052C00 */ sll $a1, $a1, 16 +/* 01178 809B74C8 00A12821 */ addu $a1, $a1, $at +/* 0117C 809B74CC 00052C00 */ sll $a1, $a1, 16 /* 01180 809B74D0 240B00B6 */ addiu $t3, $zero, 0x00B6 ## $t3 = 000000B6 -/* 01184 809B74D4 AFAB0010 */ sw $t3, 0x0010($sp) -/* 01188 809B74D8 00052C03 */ sra $a1, $a1, 16 +/* 01184 809B74D4 AFAB0010 */ sw $t3, 0x0010($sp) +/* 01188 809B74D8 00052C03 */ sra $a1, $a1, 16 /* 0118C 809B74DC 02C02025 */ or $a0, $s6, $zero ## $a0 = 000002A8 /* 01190 809B74E0 0C01E1A7 */ jal Math_SmoothScaleMaxMinS - + /* 01194 809B74E4 24060003 */ addiu $a2, $zero, 0x0003 ## $a2 = 00000003 /* 01198 809B74E8 866402A8 */ lh $a0, 0x02A8($s3) ## 000002A8 /* 0119C 809B74EC 24018000 */ addiu $at, $zero, 0x8000 ## $at = FFFF8000 /* 011A0 809B74F0 866502AA */ lh $a1, 0x02AA($s3) ## 000002AA -/* 011A4 809B74F4 00812021 */ addu $a0, $a0, $at -/* 011A8 809B74F8 00042400 */ sll $a0, $a0, 16 -/* 011AC 809B74FC 00042403 */ sra $a0, $a0, 16 +/* 011A4 809B74F4 00812021 */ addu $a0, $a0, $at +/* 011A8 809B74F8 00042400 */ sll $a0, $a0, 16 +/* 011AC 809B74FC 00042403 */ sra $a0, $a0, 16 /* 011B0 809B7500 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 011B4 809B7504 0C034421 */ jal Matrix_RotateXYZ +/* 011B4 809B7504 0C034421 */ jal Matrix_RotateZYX /* 011B8 809B7508 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 /* 011BC 809B750C 3C04809C */ lui $a0, %hi(D_809B8080) ## $a0 = 809C0000 /* 011C0 809B7510 24848080 */ addiu $a0, $a0, %lo(D_809B8080) ## $a0 = 809B8080 -/* 011C4 809B7514 0C0346BD */ jal Matrix_MultVec3f +/* 011C4 809B7514 0C0346BD */ jal Matrix_MultVec3f /* 011C8 809B7518 02202825 */ or $a1, $s1, $zero ## $a1 = 00000164 /* 011CC 809B751C 26940006 */ addiu $s4, $s4, 0x0006 ## $s4 = 00000006 /* 011D0 809B7520 2401004E */ addiu $at, $zero, 0x004E ## $at = 0000004E @@ -219,7 +219,7 @@ glabel func_809B71F0 /* 011DC 809B752C 2652000C */ addiu $s2, $s2, 0x000C ## $s2 = 00000164 /* 011E0 809B7530 26730006 */ addiu $s3, $s3, 0x0006 ## $s3 = 00000006 /* 011E4 809B7534 26B50006 */ addiu $s5, $s5, 0x0006 ## $s5 = 000002B0 -/* 011E8 809B7538 1681FFCF */ bne $s4, $at, .L809B7478 +/* 011E8 809B7538 1681FFCF */ bne $s4, $at, .L809B7478 /* 011EC 809B753C 26D60006 */ addiu $s6, $s6, 0x0006 ## $s6 = 000002AE /* 011F0 809B7540 86EE0318 */ lh $t6, 0x0318($s7) ## 00000318 /* 011F4 809B7544 86EC02F0 */ lh $t4, 0x02F0($s7) ## 000002F0 @@ -229,22 +229,22 @@ glabel func_809B71F0 /* 01204 809B7554 86F80318 */ lh $t8, 0x0318($s7) ## 00000318 /* 01208 809B7558 A6EC02F6 */ sh $t4, 0x02F6($s7) ## 000002F6 /* 0120C 809B755C A6ED02F8 */ sh $t5, 0x02F8($s7) ## 000002F8 -/* 01210 809B7560 57000004 */ bnel $t8, $zero, .L809B7574 -/* 01214 809B7564 8FBF0044 */ lw $ra, 0x0044($sp) -/* 01218 809B7568 0C26D95A */ jal func_809B6568 +/* 01210 809B7560 57000004 */ bnel $t8, $zero, .L809B7574 +/* 01214 809B7564 8FBF0044 */ lw $ra, 0x0044($sp) +/* 01218 809B7568 0C26D95A */ jal func_809B6568 /* 0121C 809B756C 02E02025 */ or $a0, $s7, $zero ## $a0 = 00000000 -/* 01220 809B7570 8FBF0044 */ lw $ra, 0x0044($sp) +/* 01220 809B7570 8FBF0044 */ lw $ra, 0x0044($sp) .L809B7574: -/* 01224 809B7574 8FB00020 */ lw $s0, 0x0020($sp) -/* 01228 809B7578 8FB10024 */ lw $s1, 0x0024($sp) -/* 0122C 809B757C 8FB20028 */ lw $s2, 0x0028($sp) -/* 01230 809B7580 8FB3002C */ lw $s3, 0x002C($sp) -/* 01234 809B7584 8FB40030 */ lw $s4, 0x0030($sp) -/* 01238 809B7588 8FB50034 */ lw $s5, 0x0034($sp) -/* 0123C 809B758C 8FB60038 */ lw $s6, 0x0038($sp) -/* 01240 809B7590 8FB7003C */ lw $s7, 0x003C($sp) -/* 01244 809B7594 8FBE0040 */ lw $s8, 0x0040($sp) -/* 01248 809B7598 03E00008 */ jr $ra +/* 01224 809B7574 8FB00020 */ lw $s0, 0x0020($sp) +/* 01228 809B7578 8FB10024 */ lw $s1, 0x0024($sp) +/* 0122C 809B757C 8FB20028 */ lw $s2, 0x0028($sp) +/* 01230 809B7580 8FB3002C */ lw $s3, 0x002C($sp) +/* 01234 809B7584 8FB40030 */ lw $s4, 0x0030($sp) +/* 01238 809B7588 8FB50034 */ lw $s5, 0x0034($sp) +/* 0123C 809B758C 8FB60038 */ lw $s6, 0x0038($sp) +/* 01240 809B7590 8FB7003C */ lw $s7, 0x003C($sp) +/* 01244 809B7594 8FBE0040 */ lw $s8, 0x0040($sp) +/* 01248 809B7598 03E00008 */ jr $ra /* 0124C 809B759C 27BD0078 */ addiu $sp, $sp, 0x0078 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ba/func_809B75A0.s b/asm/non_matchings/overlays/actors/ovl_En_Ba/func_809B75A0.s index a2135cff2f..e632705e5f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ba/func_809B75A0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ba/func_809B75A0.s @@ -1,16 +1,16 @@ glabel func_809B75A0 /* 01250 809B75A0 27BDFF78 */ addiu $sp, $sp, 0xFF78 ## $sp = FFFFFF78 /* 01254 809B75A4 3C0E809C */ lui $t6, %hi(D_809B8100) ## $t6 = 809C0000 -/* 01258 809B75A8 AFBF0054 */ sw $ra, 0x0054($sp) -/* 0125C 809B75AC AFBE0050 */ sw $s8, 0x0050($sp) -/* 01260 809B75B0 AFB7004C */ sw $s7, 0x004C($sp) -/* 01264 809B75B4 AFB60048 */ sw $s6, 0x0048($sp) -/* 01268 809B75B8 AFB50044 */ sw $s5, 0x0044($sp) -/* 0126C 809B75BC AFB40040 */ sw $s4, 0x0040($sp) -/* 01270 809B75C0 AFB3003C */ sw $s3, 0x003C($sp) -/* 01274 809B75C4 AFB20038 */ sw $s2, 0x0038($sp) -/* 01278 809B75C8 AFB10034 */ sw $s1, 0x0034($sp) -/* 0127C 809B75CC AFB00030 */ sw $s0, 0x0030($sp) +/* 01258 809B75A8 AFBF0054 */ sw $ra, 0x0054($sp) +/* 0125C 809B75AC AFBE0050 */ sw $s8, 0x0050($sp) +/* 01260 809B75B0 AFB7004C */ sw $s7, 0x004C($sp) +/* 01264 809B75B4 AFB60048 */ sw $s6, 0x0048($sp) +/* 01268 809B75B8 AFB50044 */ sw $s5, 0x0044($sp) +/* 0126C 809B75BC AFB40040 */ sw $s4, 0x0040($sp) +/* 01270 809B75C0 AFB3003C */ sw $s3, 0x003C($sp) +/* 01274 809B75C4 AFB20038 */ sw $s2, 0x0038($sp) +/* 01278 809B75C8 AFB10034 */ sw $s1, 0x0034($sp) +/* 0127C 809B75CC AFB00030 */ sw $s0, 0x0030($sp) /* 01280 809B75D0 25CE8100 */ addiu $t6, $t6, %lo(D_809B8100) ## $t6 = 809B8100 /* 01284 809B75D4 8DD80000 */ lw $t8, 0x0000($t6) ## 809B8100 /* 01288 809B75D8 27BE0074 */ addiu $s8, $sp, 0x0074 ## $s8 = FFFFFFEC @@ -27,10 +27,10 @@ glabel func_809B75A0 /* 012B4 809B7604 A499031C */ sh $t9, 0x031C($a0) ## 0000031C /* 012B8 809B7608 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 /* 012BC 809B760C 266500E4 */ addiu $a1, $s3, 0x00E4 ## $a1 = 000000E4 -/* 012C0 809B7610 AFA90014 */ sw $t1, 0x0014($sp) -/* 012C4 809B7614 AFA80010 */ sw $t0, 0x0010($sp) +/* 012C0 809B7610 AFA90014 */ sw $t1, 0x0014($sp) +/* 012C4 809B7614 AFA80010 */ sw $t0, 0x0010($sp) /* 012C8 809B7618 2406395B */ addiu $a2, $zero, 0x395B ## $a2 = 0000395B -/* 012CC 809B761C 0C00AA7D */ jal func_8002A9F4 +/* 012CC 809B761C 0C00AA7D */ jal func_8002A9F4 /* 012D0 809B7620 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 /* 012D4 809B7624 AE60014C */ sw $zero, 0x014C($s3) ## 0000014C /* 012D8 809B7628 24110054 */ addiu $s1, $zero, 0x0054 ## $s1 = 00000054 @@ -40,69 +40,69 @@ glabel func_809B75A0 /* 012E4 809B7634 C604015C */ lwc1 $f4, 0x015C($s0) ## 000001B0 /* 012E8 809B7638 8E070158 */ lw $a3, 0x0158($s0) ## 000001AC /* 012EC 809B763C 240A0003 */ addiu $t2, $zero, 0x0003 ## $t2 = 00000003 -/* 012F0 809B7640 E7A40010 */ swc1 $f4, 0x0010($sp) +/* 012F0 809B7640 E7A40010 */ swc1 $f4, 0x0010($sp) /* 012F4 809B7644 C6060160 */ lwc1 $f6, 0x0160($s0) ## 000001B4 -/* 012F8 809B7648 AFAA0024 */ sw $t2, 0x0024($sp) -/* 012FC 809B764C AFA00020 */ sw $zero, 0x0020($sp) -/* 01300 809B7650 AFA0001C */ sw $zero, 0x001C($sp) -/* 01304 809B7654 AFA00018 */ sw $zero, 0x0018($sp) +/* 012F8 809B7648 AFAA0024 */ sw $t2, 0x0024($sp) +/* 012FC 809B764C AFA00020 */ sw $zero, 0x0020($sp) +/* 01300 809B7650 AFA0001C */ sw $zero, 0x001C($sp) +/* 01304 809B7654 AFA00018 */ sw $zero, 0x0018($sp) /* 01308 809B7658 02802025 */ or $a0, $s4, $zero ## $a0 = 00001C24 /* 0130C 809B765C 02402825 */ or $a1, $s2, $zero ## $a1 = 00000000 /* 01310 809B7660 240600DE */ addiu $a2, $zero, 0x00DE ## $a2 = 000000DE /* 01314 809B7664 0C00C7D4 */ jal Actor_Spawn ## ActorSpawn -/* 01318 809B7668 E7A60014 */ swc1 $f6, 0x0014($sp) +/* 01318 809B7668 E7A60014 */ swc1 $f6, 0x0014($sp) /* 0131C 809B766C 2631000C */ addiu $s1, $s1, 0x000C ## $s1 = 00000060 -/* 01320 809B7670 2A2100A8 */ slti $at, $s1, 0x00A8 -/* 01324 809B7674 1420FFEF */ bne $at, $zero, .L809B7634 +/* 01320 809B7670 2A2100A8 */ slti $at, $s1, 0x00A8 +/* 01324 809B7674 1420FFEF */ bne $at, $zero, .L809B7634 /* 01328 809B7678 2610000C */ addiu $s0, $s0, 0x000C ## $s0 = 00000060 /* 0132C 809B767C 26700158 */ addiu $s0, $s3, 0x0158 ## $s0 = 00000158 /* 01330 809B7680 02002825 */ or $a1, $s0, $zero ## $a1 = 00000158 /* 01334 809B7684 0C01E027 */ jal Math_Vec3f_Pitch - + /* 01338 809B7688 26640024 */ addiu $a0, $s3, 0x0024 ## $a0 = 00000024 /* 0133C 809B768C 34018000 */ ori $at, $zero, 0x8000 ## $at = 00008000 -/* 01340 809B7690 00418821 */ addu $s1, $v0, $at -/* 01344 809B7694 00118C00 */ sll $s1, $s1, 16 +/* 01340 809B7690 00418821 */ addu $s1, $v0, $at +/* 01344 809B7694 00118C00 */ sll $s1, $s1, 16 /* 01348 809B7698 8665008A */ lh $a1, 0x008A($s3) ## 0000008A /* 0134C 809B769C 8667031C */ lh $a3, 0x031C($s3) ## 0000031C -/* 01350 809B76A0 00118C03 */ sra $s1, $s1, 16 -/* 01354 809B76A4 AFA00010 */ sw $zero, 0x0010($sp) +/* 01350 809B76A0 00118C03 */ sra $s1, $s1, 16 +/* 01354 809B76A4 AFA00010 */ sw $zero, 0x0010($sp) /* 01358 809B76A8 266400B6 */ addiu $a0, $s3, 0x00B6 ## $a0 = 000000B6 /* 0135C 809B76AC 0C01E1A7 */ jal Math_SmoothScaleMaxMinS - + /* 01360 809B76B0 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 -/* 01364 809B76B4 00112C00 */ sll $a1, $s1, 16 +/* 01364 809B76B4 00112C00 */ sll $a1, $s1, 16 /* 01368 809B76B8 8667031C */ lh $a3, 0x031C($s3) ## 0000031C -/* 0136C 809B76BC AFA00010 */ sw $zero, 0x0010($sp) -/* 01370 809B76C0 00052C03 */ sra $a1, $a1, 16 +/* 0136C 809B76BC AFA00010 */ sw $zero, 0x0010($sp) +/* 01370 809B76C0 00052C03 */ sra $a1, $a1, 16 /* 01374 809B76C4 266400B4 */ addiu $a0, $s3, 0x00B4 ## $a0 = 000000B4 /* 01378 809B76C8 0C01E1A7 */ jal Math_SmoothScaleMaxMinS - + /* 0137C 809B76CC 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 /* 01380 809B76D0 C66C0024 */ lwc1 $f12, 0x0024($s3) ## 00000024 /* 01384 809B76D4 C66E0028 */ lwc1 $f14, 0x0028($s3) ## 00000028 /* 01388 809B76D8 8E66002C */ lw $a2, 0x002C($s3) ## 0000002C -/* 0138C 809B76DC 0C034261 */ jal Matrix_Translate +/* 0138C 809B76DC 0C034261 */ jal Matrix_Translate /* 01390 809B76E0 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 /* 01394 809B76E4 866400B4 */ lh $a0, 0x00B4($s3) ## 000000B4 /* 01398 809B76E8 24018000 */ addiu $at, $zero, 0x8000 ## $at = FFFF8000 /* 0139C 809B76EC 866500B6 */ lh $a1, 0x00B6($s3) ## 000000B6 -/* 013A0 809B76F0 00812021 */ addu $a0, $a0, $at -/* 013A4 809B76F4 00042400 */ sll $a0, $a0, 16 -/* 013A8 809B76F8 00042403 */ sra $a0, $a0, 16 +/* 013A0 809B76F0 00812021 */ addu $a0, $a0, $at +/* 013A4 809B76F4 00042400 */ sll $a0, $a0, 16 +/* 013A8 809B76F8 00042403 */ sra $a0, $a0, 16 /* 013AC 809B76FC 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 013B0 809B7700 0C034421 */ jal Matrix_RotateXYZ +/* 013B0 809B7700 0C034421 */ jal Matrix_RotateZYX /* 013B4 809B7704 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 /* 013B8 809B7708 3C04809C */ lui $a0, %hi(D_809B8080) ## $a0 = 809C0000 /* 013BC 809B770C 24848080 */ addiu $a0, $a0, %lo(D_809B8080) ## $a0 = 809B8080 -/* 013C0 809B7710 0C0346BD */ jal Matrix_MultVec3f +/* 013C0 809B7710 0C0346BD */ jal Matrix_MultVec3f /* 013C4 809B7714 02002825 */ or $a1, $s0, $zero ## $a1 = 00000158 /* 013C8 809B7718 8E6B0004 */ lw $t3, 0x0004($s3) ## 00000004 /* 013CC 809B771C 2401FFFE */ addiu $at, $zero, 0xFFFE ## $at = FFFFFFFE /* 013D0 809B7720 2671001E */ addiu $s1, $s3, 0x001E ## $s1 = 0000001E /* 013D4 809B7724 2670003C */ addiu $s0, $s3, 0x003C ## $s0 = 0000003C -/* 013D8 809B7728 01616024 */ and $t4, $t3, $at +/* 013D8 809B7728 01616024 */ and $t4, $t3, $at /* 013DC 809B772C AE6C0004 */ sw $t4, 0x0004($s3) ## 00000004 /* 013E0 809B7730 26160164 */ addiu $s6, $s0, 0x0164 ## $s6 = 000001A0 /* 013E4 809B7734 263402A8 */ addiu $s4, $s1, 0x02A8 ## $s4 = 000002C6 @@ -112,59 +112,59 @@ glabel func_809B75A0 .L809B7744: /* 013F4 809B7744 866502C6 */ lh $a1, 0x02C6($s3) ## 000002C6 /* 013F8 809B7748 8667031C */ lh $a3, 0x031C($s3) ## 0000031C -/* 013FC 809B774C AFA00010 */ sw $zero, 0x0010($sp) +/* 013FC 809B774C AFA00010 */ sw $zero, 0x0010($sp) /* 01400 809B7750 02802025 */ or $a0, $s4, $zero ## $a0 = 000002C6 /* 01404 809B7754 0C01E1A7 */ jal Math_SmoothScaleMaxMinS - + /* 01408 809B7758 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 /* 0140C 809B775C 866502C8 */ lh $a1, 0x02C8($s3) ## 000002C8 /* 01410 809B7760 8667031C */ lh $a3, 0x031C($s3) ## 0000031C -/* 01414 809B7764 AFA00010 */ sw $zero, 0x0010($sp) +/* 01414 809B7764 AFA00010 */ sw $zero, 0x0010($sp) /* 01418 809B7768 02A02025 */ or $a0, $s5, $zero ## $a0 = 000002C8 /* 0141C 809B776C 0C01E1A7 */ jal Math_SmoothScaleMaxMinS - + /* 01420 809B7770 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 /* 01424 809B7774 C60C0158 */ lwc1 $f12, 0x0158($s0) ## 00000194 /* 01428 809B7778 C60E015C */ lwc1 $f14, 0x015C($s0) ## 00000198 /* 0142C 809B777C 8E060160 */ lw $a2, 0x0160($s0) ## 0000019C -/* 01430 809B7780 0C034261 */ jal Matrix_Translate +/* 01430 809B7780 0C034261 */ jal Matrix_Translate /* 01434 809B7784 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 /* 01438 809B7788 862402A8 */ lh $a0, 0x02A8($s1) ## 000002C6 /* 0143C 809B778C 24018000 */ addiu $at, $zero, 0x8000 ## $at = FFFF8000 /* 01440 809B7790 862502AA */ lh $a1, 0x02AA($s1) ## 000002C8 -/* 01444 809B7794 00812021 */ addu $a0, $a0, $at -/* 01448 809B7798 00042400 */ sll $a0, $a0, 16 -/* 0144C 809B779C 00042403 */ sra $a0, $a0, 16 +/* 01444 809B7794 00812021 */ addu $a0, $a0, $at +/* 01448 809B7798 00042400 */ sll $a0, $a0, 16 +/* 0144C 809B779C 00042403 */ sra $a0, $a0, 16 /* 01450 809B77A0 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 01454 809B77A4 0C034421 */ jal Matrix_RotateXYZ +/* 01454 809B77A4 0C034421 */ jal Matrix_RotateZYX /* 01458 809B77A8 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 /* 0145C 809B77AC 03C02025 */ or $a0, $s8, $zero ## $a0 = FFFFFFEC -/* 01460 809B77B0 0C0346BD */ jal Matrix_MultVec3f +/* 01460 809B77B0 0C0346BD */ jal Matrix_MultVec3f /* 01464 809B77B4 02C02825 */ or $a1, $s6, $zero ## $a1 = 000001A0 /* 01468 809B77B8 26520006 */ addiu $s2, $s2, 0x0006 ## $s2 = 00000024 /* 0146C 809B77BC 2610000C */ addiu $s0, $s0, 0x000C ## $s0 = 00000048 /* 01470 809B77C0 26310006 */ addiu $s1, $s1, 0x0006 ## $s1 = 00000024 /* 01474 809B77C4 26940006 */ addiu $s4, $s4, 0x0006 ## $s4 = 000002CC /* 01478 809B77C8 26B50006 */ addiu $s5, $s5, 0x0006 ## $s5 = 000002CE -/* 0147C 809B77CC 1657FFDD */ bne $s2, $s7, .L809B7744 +/* 0147C 809B77CC 1657FFDD */ bne $s2, $s7, .L809B7744 /* 01480 809B77D0 26D6000C */ addiu $s6, $s6, 0x000C ## $s6 = 000001AC /* 01484 809B77D4 240D000F */ addiu $t5, $zero, 0x000F ## $t5 = 0000000F /* 01488 809B77D8 3C05809B */ lui $a1, %hi(func_809B781C) ## $a1 = 809B0000 /* 0148C 809B77DC A66D031A */ sh $t5, 0x031A($s3) ## 0000031A /* 01490 809B77E0 24A5781C */ addiu $a1, $a1, %lo(func_809B781C) ## $a1 = 809B781C -/* 01494 809B77E4 0C26D8D4 */ jal func_809B6350 +/* 01494 809B77E4 0C26D8D4 */ jal func_809B6350 /* 01498 809B77E8 02602025 */ or $a0, $s3, $zero ## $a0 = 00000000 -/* 0149C 809B77EC 8FBF0054 */ lw $ra, 0x0054($sp) -/* 014A0 809B77F0 8FB00030 */ lw $s0, 0x0030($sp) -/* 014A4 809B77F4 8FB10034 */ lw $s1, 0x0034($sp) -/* 014A8 809B77F8 8FB20038 */ lw $s2, 0x0038($sp) -/* 014AC 809B77FC 8FB3003C */ lw $s3, 0x003C($sp) -/* 014B0 809B7800 8FB40040 */ lw $s4, 0x0040($sp) -/* 014B4 809B7804 8FB50044 */ lw $s5, 0x0044($sp) -/* 014B8 809B7808 8FB60048 */ lw $s6, 0x0048($sp) -/* 014BC 809B780C 8FB7004C */ lw $s7, 0x004C($sp) -/* 014C0 809B7810 8FBE0050 */ lw $s8, 0x0050($sp) -/* 014C4 809B7814 03E00008 */ jr $ra +/* 0149C 809B77EC 8FBF0054 */ lw $ra, 0x0054($sp) +/* 014A0 809B77F0 8FB00030 */ lw $s0, 0x0030($sp) +/* 014A4 809B77F4 8FB10034 */ lw $s1, 0x0034($sp) +/* 014A8 809B77F8 8FB20038 */ lw $s2, 0x0038($sp) +/* 014AC 809B77FC 8FB3003C */ lw $s3, 0x003C($sp) +/* 014B0 809B7800 8FB40040 */ lw $s4, 0x0040($sp) +/* 014B4 809B7804 8FB50044 */ lw $s5, 0x0044($sp) +/* 014B8 809B7808 8FB60048 */ lw $s6, 0x0048($sp) +/* 014BC 809B780C 8FB7004C */ lw $s7, 0x004C($sp) +/* 014C0 809B7810 8FBE0050 */ lw $s8, 0x0050($sp) +/* 014C4 809B7814 03E00008 */ jr $ra /* 014C8 809B7818 27BD0088 */ addiu $sp, $sp, 0x0088 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ba/func_809B781C.s b/asm/non_matchings/overlays/actors/ovl_En_Ba/func_809B781C.s index c9e12f240a..3ed4555a8e 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ba/func_809B781C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ba/func_809B781C.s @@ -1,16 +1,16 @@ glabel func_809B781C /* 014CC 809B781C 27BDFF88 */ addiu $sp, $sp, 0xFF88 ## $sp = FFFFFF88 /* 014D0 809B7820 3C0F809C */ lui $t7, %hi(D_809B810C) ## $t7 = 809C0000 -/* 014D4 809B7824 AFBF0044 */ sw $ra, 0x0044($sp) -/* 014D8 809B7828 AFBE0040 */ sw $s8, 0x0040($sp) -/* 014DC 809B782C AFB7003C */ sw $s7, 0x003C($sp) -/* 014E0 809B7830 AFB60038 */ sw $s6, 0x0038($sp) -/* 014E4 809B7834 AFB50034 */ sw $s5, 0x0034($sp) -/* 014E8 809B7838 AFB40030 */ sw $s4, 0x0030($sp) -/* 014EC 809B783C AFB3002C */ sw $s3, 0x002C($sp) -/* 014F0 809B7840 AFB20028 */ sw $s2, 0x0028($sp) -/* 014F4 809B7844 AFB10024 */ sw $s1, 0x0024($sp) -/* 014F8 809B7848 AFB00020 */ sw $s0, 0x0020($sp) +/* 014D4 809B7824 AFBF0044 */ sw $ra, 0x0044($sp) +/* 014D8 809B7828 AFBE0040 */ sw $s8, 0x0040($sp) +/* 014DC 809B782C AFB7003C */ sw $s7, 0x003C($sp) +/* 014E0 809B7830 AFB60038 */ sw $s6, 0x0038($sp) +/* 014E4 809B7834 AFB50034 */ sw $s5, 0x0034($sp) +/* 014E8 809B7838 AFB40030 */ sw $s4, 0x0030($sp) +/* 014EC 809B783C AFB3002C */ sw $s3, 0x002C($sp) +/* 014F0 809B7840 AFB20028 */ sw $s2, 0x0028($sp) +/* 014F4 809B7844 AFB10024 */ sw $s1, 0x0024($sp) +/* 014F8 809B7848 AFB00020 */ sw $s0, 0x0020($sp) /* 014FC 809B784C 25EF810C */ addiu $t7, $t7, %lo(D_809B810C) ## $t7 = 809B810C /* 01500 809B7850 8DF90000 */ lw $t9, 0x0000($t7) ## 809B810C /* 01504 809B7854 27AE006C */ addiu $t6, $sp, 0x006C ## $t6 = FFFFFFF4 @@ -23,7 +23,7 @@ glabel func_809B781C /* 01520 809B7870 8488031A */ lh $t0, 0x031A($a0) ## 0000031A /* 01524 809B7874 00A03025 */ or $a2, $a1, $zero ## $a2 = 00000000 /* 01528 809B7878 3C0141F0 */ lui $at, 0x41F0 ## $at = 41F00000 -/* 0152C 809B787C 110000A2 */ beq $t0, $zero, .L809B7B08 +/* 0152C 809B787C 110000A2 */ beq $t0, $zero, .L809B7B08 /* 01530 809B7880 24091F40 */ addiu $t1, $zero, 0x1F40 ## $t1 = 00001F40 /* 01534 809B7884 44812000 */ mtc1 $at, $f4 ## $f4 = 30.00 /* 01538 809B7888 3C014100 */ lui $at, 0x4100 ## $at = 41000000 @@ -31,50 +31,50 @@ glabel func_809B781C /* 01540 809B7890 C4860028 */ lwc1 $f6, 0x0028($a0) ## 00000028 /* 01544 809B7894 26500158 */ addiu $s0, $s2, 0x0158 ## $s0 = 00000158 /* 01548 809B7898 A489031C */ sh $t1, 0x031C($a0) ## 0000031C -/* 0154C 809B789C 46083280 */ add.s $f10, $f6, $f8 +/* 0154C 809B789C 46083280 */ add.s $f10, $f6, $f8 /* 01550 809B78A0 02002825 */ or $a1, $s0, $zero ## $a1 = 00000158 /* 01554 809B78A4 24840024 */ addiu $a0, $a0, 0x0024 ## $a0 = 00000024 /* 01558 809B78A8 E4840044 */ swc1 $f4, 0x0044($a0) ## 00000068 /* 0155C 809B78AC 0C01E027 */ jal Math_Vec3f_Pitch - + /* 01560 809B78B0 E48A0004 */ swc1 $f10, 0x0004($a0) ## 00000028 /* 01564 809B78B4 34018000 */ ori $at, $zero, 0x8000 ## $at = 00008000 -/* 01568 809B78B8 00418821 */ addu $s1, $v0, $at -/* 0156C 809B78BC 00118C00 */ sll $s1, $s1, 16 +/* 01568 809B78B8 00418821 */ addu $s1, $v0, $at +/* 0156C 809B78BC 00118C00 */ sll $s1, $s1, 16 /* 01570 809B78C0 8645008A */ lh $a1, 0x008A($s2) ## 0000008A /* 01574 809B78C4 8647031C */ lh $a3, 0x031C($s2) ## 0000031C -/* 01578 809B78C8 00118C03 */ sra $s1, $s1, 16 -/* 0157C 809B78CC AFA00010 */ sw $zero, 0x0010($sp) +/* 01578 809B78C8 00118C03 */ sra $s1, $s1, 16 +/* 0157C 809B78CC AFA00010 */ sw $zero, 0x0010($sp) /* 01580 809B78D0 264400B6 */ addiu $a0, $s2, 0x00B6 ## $a0 = 000000B6 /* 01584 809B78D4 0C01E1A7 */ jal Math_SmoothScaleMaxMinS - + /* 01588 809B78D8 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 -/* 0158C 809B78DC 00112C00 */ sll $a1, $s1, 16 +/* 0158C 809B78DC 00112C00 */ sll $a1, $s1, 16 /* 01590 809B78E0 8647031C */ lh $a3, 0x031C($s2) ## 0000031C -/* 01594 809B78E4 AFA00010 */ sw $zero, 0x0010($sp) -/* 01598 809B78E8 00052C03 */ sra $a1, $a1, 16 +/* 01594 809B78E4 AFA00010 */ sw $zero, 0x0010($sp) +/* 01598 809B78E8 00052C03 */ sra $a1, $a1, 16 /* 0159C 809B78EC 264400B4 */ addiu $a0, $s2, 0x00B4 ## $a0 = 000000B4 /* 015A0 809B78F0 0C01E1A7 */ jal Math_SmoothScaleMaxMinS - + /* 015A4 809B78F4 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 /* 015A8 809B78F8 C64C0024 */ lwc1 $f12, 0x0024($s2) ## 00000024 /* 015AC 809B78FC C64E0028 */ lwc1 $f14, 0x0028($s2) ## 00000028 /* 015B0 809B7900 8E46002C */ lw $a2, 0x002C($s2) ## 0000002C -/* 015B4 809B7904 0C034261 */ jal Matrix_Translate +/* 015B4 809B7904 0C034261 */ jal Matrix_Translate /* 015B8 809B7908 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 /* 015BC 809B790C 864400B4 */ lh $a0, 0x00B4($s2) ## 000000B4 /* 015C0 809B7910 24018000 */ addiu $at, $zero, 0x8000 ## $at = FFFF8000 /* 015C4 809B7914 864500B6 */ lh $a1, 0x00B6($s2) ## 000000B6 -/* 015C8 809B7918 00812021 */ addu $a0, $a0, $at -/* 015CC 809B791C 00042400 */ sll $a0, $a0, 16 -/* 015D0 809B7920 00042403 */ sra $a0, $a0, 16 +/* 015C8 809B7918 00812021 */ addu $a0, $a0, $at +/* 015CC 809B791C 00042400 */ sll $a0, $a0, 16 +/* 015D0 809B7920 00042403 */ sra $a0, $a0, 16 /* 015D4 809B7924 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 015D8 809B7928 0C034421 */ jal Matrix_RotateXYZ +/* 015D8 809B7928 0C034421 */ jal Matrix_RotateZYX /* 015DC 809B792C 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 /* 015E0 809B7930 3C1E809C */ lui $s8, %hi(D_809B8080) ## $s8 = 809C0000 /* 015E4 809B7934 27DE8080 */ addiu $s8, $s8, %lo(D_809B8080) ## $s8 = 809B8080 /* 015E8 809B7938 03C02025 */ or $a0, $s8, $zero ## $a0 = 809B8080 -/* 015EC 809B793C 0C0346BD */ jal Matrix_MultVec3f +/* 015EC 809B793C 0C0346BD */ jal Matrix_MultVec3f /* 015F0 809B7940 02002825 */ or $a1, $s0, $zero ## $a1 = 00000158 /* 015F4 809B7944 0000B825 */ or $s7, $zero, $zero ## $s7 = 00000000 /* 015F8 809B7948 02408825 */ or $s1, $s2, $zero ## $s1 = 00000000 @@ -85,66 +85,66 @@ glabel func_809B781C /* 0160C 809B795C 26560164 */ addiu $s6, $s2, 0x0164 ## $s6 = 00000164 .L809B7960: /* 01610 809B7960 8644031A */ lh $a0, 0x031A($s2) ## 0000031A -/* 01614 809B7964 00800821 */ addu $at, $a0, $zero -/* 01618 809B7968 00042100 */ sll $a0, $a0, 4 -/* 0161C 809B796C 00812021 */ addu $a0, $a0, $at -/* 01620 809B7970 00042100 */ sll $a0, $a0, 4 -/* 01624 809B7974 00812021 */ addu $a0, $a0, $at -/* 01628 809B7978 00042080 */ sll $a0, $a0, 2 -/* 0162C 809B797C 00042400 */ sll $a0, $a0, 16 +/* 01614 809B7964 00800821 */ addu $at, $a0, $zero +/* 01618 809B7968 00042100 */ sll $a0, $a0, 4 +/* 0161C 809B796C 00812021 */ addu $a0, $a0, $at +/* 01620 809B7970 00042100 */ sll $a0, $a0, 4 +/* 01624 809B7974 00812021 */ addu $a0, $a0, $at +/* 01628 809B7978 00042080 */ sll $a0, $a0, 2 +/* 0162C 809B797C 00042400 */ sll $a0, $a0, 16 /* 01630 809B7980 0C01DE0D */ jal Math_Coss ## coss? -/* 01634 809B7984 00042403 */ sra $a0, $a0, 16 +/* 01634 809B7984 00042403 */ sra $a0, $a0, 16 /* 01638 809B7988 44979000 */ mtc1 $s7, $f18 ## $f18 = 0.00 -/* 0163C 809B798C 46000407 */ neg.s $f16, $f0 +/* 0163C 809B798C 46000407 */ neg.s $f16, $f0 /* 01640 809B7990 8647031C */ lh $a3, 0x031C($s2) ## 0000031C -/* 01644 809B7994 46809120 */ cvt.s.w $f4, $f18 -/* 01648 809B7998 AFA00010 */ sw $zero, 0x0010($sp) +/* 01644 809B7994 46809120 */ cvt.s.w $f4, $f18 +/* 01648 809B7998 AFA00010 */ sw $zero, 0x0010($sp) /* 0164C 809B799C 02602025 */ or $a0, $s3, $zero ## $a0 = 000002A8 /* 01650 809B79A0 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 -/* 01654 809B79A4 46048182 */ mul.s $f6, $f16, $f4 -/* 01658 809B79A8 4600320D */ trunc.w.s $f8, $f6 -/* 0165C 809B79AC 44054000 */ mfc1 $a1, $f8 +/* 01654 809B79A4 46048182 */ mul.s $f6, $f16, $f4 +/* 01658 809B79A8 4600320D */ trunc.w.s $f8, $f6 +/* 0165C 809B79AC 44054000 */ mfc1 $a1, $f8 /* 01660 809B79B0 00000000 */ nop -/* 01664 809B79B4 00052C00 */ sll $a1, $a1, 16 -/* 01668 809B79B8 00052C03 */ sra $a1, $a1, 16 +/* 01664 809B79B4 00052C00 */ sll $a1, $a1, 16 +/* 01668 809B79B8 00052C03 */ sra $a1, $a1, 16 /* 0166C 809B79BC 24A5C000 */ addiu $a1, $a1, 0xC000 ## $a1 = FFFFC000 -/* 01670 809B79C0 00052C00 */ sll $a1, $a1, 16 +/* 01670 809B79C0 00052C00 */ sll $a1, $a1, 16 /* 01674 809B79C4 0C01E1A7 */ jal Math_SmoothScaleMaxMinS - -/* 01678 809B79C8 00052C03 */ sra $a1, $a1, 16 + +/* 01678 809B79C8 00052C03 */ sra $a1, $a1, 16 /* 0167C 809B79CC 8645008A */ lh $a1, 0x008A($s2) ## 0000008A /* 01680 809B79D0 8647031C */ lh $a3, 0x031C($s2) ## 0000031C -/* 01684 809B79D4 AFA00010 */ sw $zero, 0x0010($sp) +/* 01684 809B79D4 AFA00010 */ sw $zero, 0x0010($sp) /* 01688 809B79D8 02802025 */ or $a0, $s4, $zero ## $a0 = 000002AA /* 0168C 809B79DC 0C01E1A7 */ jal Math_SmoothScaleMaxMinS - + /* 01690 809B79E0 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 /* 01694 809B79E4 C60C0158 */ lwc1 $f12, 0x0158($s0) ## 00000158 /* 01698 809B79E8 C60E015C */ lwc1 $f14, 0x015C($s0) ## 0000015C /* 0169C 809B79EC 8E060160 */ lw $a2, 0x0160($s0) ## 00000160 -/* 016A0 809B79F0 0C034261 */ jal Matrix_Translate +/* 016A0 809B79F0 0C034261 */ jal Matrix_Translate /* 016A4 809B79F4 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 /* 016A8 809B79F8 862402A8 */ lh $a0, 0x02A8($s1) ## 000002A8 /* 016AC 809B79FC 24018000 */ addiu $at, $zero, 0x8000 ## $at = FFFF8000 /* 016B0 809B7A00 862502AA */ lh $a1, 0x02AA($s1) ## 000002AA -/* 016B4 809B7A04 00812021 */ addu $a0, $a0, $at -/* 016B8 809B7A08 00042400 */ sll $a0, $a0, 16 -/* 016BC 809B7A0C 00042403 */ sra $a0, $a0, 16 +/* 016B4 809B7A04 00812021 */ addu $a0, $a0, $at +/* 016B8 809B7A08 00042400 */ sll $a0, $a0, 16 +/* 016BC 809B7A0C 00042403 */ sra $a0, $a0, 16 /* 016C0 809B7A10 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 016C4 809B7A14 0C034421 */ jal Matrix_RotateXYZ +/* 016C4 809B7A14 0C034421 */ jal Matrix_RotateZYX /* 016C8 809B7A18 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 /* 016CC 809B7A1C 03C02025 */ or $a0, $s8, $zero ## $a0 = 809B8080 -/* 016D0 809B7A20 0C0346BD */ jal Matrix_MultVec3f +/* 016D0 809B7A20 0C0346BD */ jal Matrix_MultVec3f /* 016D4 809B7A24 02C02825 */ or $a1, $s6, $zero ## $a1 = 00000164 /* 016D8 809B7A28 26B5000C */ addiu $s5, $s5, 0x000C ## $s5 = 0000000C -/* 016DC 809B7A2C 2AA1003C */ slti $at, $s5, 0x003C +/* 016DC 809B7A2C 2AA1003C */ slti $at, $s5, 0x003C /* 016E0 809B7A30 26F70190 */ addiu $s7, $s7, 0x0190 ## $s7 = 00000190 /* 016E4 809B7A34 26310006 */ addiu $s1, $s1, 0x0006 ## $s1 = 00000006 /* 016E8 809B7A38 26730006 */ addiu $s3, $s3, 0x0006 ## $s3 = 000002AE /* 016EC 809B7A3C 26940006 */ addiu $s4, $s4, 0x0006 ## $s4 = 000002B0 /* 016F0 809B7A40 2610000C */ addiu $s0, $s0, 0x000C ## $s0 = 0000000C -/* 016F4 809B7A44 1420FFC6 */ bne $at, $zero, .L809B7960 +/* 016F4 809B7A44 1420FFC6 */ bne $at, $zero, .L809B7960 /* 016F8 809B7A48 26D6000C */ addiu $s6, $s6, 0x000C ## $s6 = 00000170 /* 016FC 809B7A4C 2651001E */ addiu $s1, $s2, 0x001E ## $s1 = 0000001E /* 01700 809B7A50 2650003C */ addiu $s0, $s2, 0x003C ## $s0 = 0000003C @@ -156,66 +156,66 @@ glabel func_809B781C .L809B7A68: /* 01718 809B7A68 864502C6 */ lh $a1, 0x02C6($s2) ## 000002C6 /* 0171C 809B7A6C 8647031C */ lh $a3, 0x031C($s2) ## 0000031C -/* 01720 809B7A70 AFA00010 */ sw $zero, 0x0010($sp) +/* 01720 809B7A70 AFA00010 */ sw $zero, 0x0010($sp) /* 01724 809B7A74 02602025 */ or $a0, $s3, $zero ## $a0 = 000002C6 /* 01728 809B7A78 0C01E1A7 */ jal Math_SmoothScaleMaxMinS - + /* 0172C 809B7A7C 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 /* 01730 809B7A80 864502C8 */ lh $a1, 0x02C8($s2) ## 000002C8 /* 01734 809B7A84 8647031C */ lh $a3, 0x031C($s2) ## 0000031C -/* 01738 809B7A88 AFA00010 */ sw $zero, 0x0010($sp) +/* 01738 809B7A88 AFA00010 */ sw $zero, 0x0010($sp) /* 0173C 809B7A8C 02802025 */ or $a0, $s4, $zero ## $a0 = 000002C8 /* 01740 809B7A90 0C01E1A7 */ jal Math_SmoothScaleMaxMinS - + /* 01744 809B7A94 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 /* 01748 809B7A98 C60C0158 */ lwc1 $f12, 0x0158($s0) ## 00000194 /* 0174C 809B7A9C C60E015C */ lwc1 $f14, 0x015C($s0) ## 00000198 /* 01750 809B7AA0 8E060160 */ lw $a2, 0x0160($s0) ## 0000019C -/* 01754 809B7AA4 0C034261 */ jal Matrix_Translate +/* 01754 809B7AA4 0C034261 */ jal Matrix_Translate /* 01758 809B7AA8 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 /* 0175C 809B7AAC 862402A8 */ lh $a0, 0x02A8($s1) ## 000002C6 /* 01760 809B7AB0 24018000 */ addiu $at, $zero, 0x8000 ## $at = FFFF8000 /* 01764 809B7AB4 862502AA */ lh $a1, 0x02AA($s1) ## 000002C8 -/* 01768 809B7AB8 00812021 */ addu $a0, $a0, $at -/* 0176C 809B7ABC 00042400 */ sll $a0, $a0, 16 -/* 01770 809B7AC0 00042403 */ sra $a0, $a0, 16 +/* 01768 809B7AB8 00812021 */ addu $a0, $a0, $at +/* 0176C 809B7ABC 00042400 */ sll $a0, $a0, 16 +/* 01770 809B7AC0 00042403 */ sra $a0, $a0, 16 /* 01774 809B7AC4 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 01778 809B7AC8 0C034421 */ jal Matrix_RotateXYZ +/* 01778 809B7AC8 0C034421 */ jal Matrix_RotateZYX /* 0177C 809B7ACC 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 /* 01780 809B7AD0 27A4006C */ addiu $a0, $sp, 0x006C ## $a0 = FFFFFFF4 -/* 01784 809B7AD4 0C0346BD */ jal Matrix_MultVec3f +/* 01784 809B7AD4 0C0346BD */ jal Matrix_MultVec3f /* 01788 809B7AD8 02C02825 */ or $a1, $s6, $zero ## $a1 = 000001A0 /* 0178C 809B7ADC 26B5000C */ addiu $s5, $s5, 0x000C ## $s5 = 00000048 /* 01790 809B7AE0 26310006 */ addiu $s1, $s1, 0x0006 ## $s1 = 00000024 /* 01794 809B7AE4 26730006 */ addiu $s3, $s3, 0x0006 ## $s3 = 000002CC /* 01798 809B7AE8 26940006 */ addiu $s4, $s4, 0x0006 ## $s4 = 000002CE /* 0179C 809B7AEC 2610000C */ addiu $s0, $s0, 0x000C ## $s0 = 00000048 -/* 017A0 809B7AF0 16B7FFDD */ bne $s5, $s7, .L809B7A68 +/* 017A0 809B7AF0 16B7FFDD */ bne $s5, $s7, .L809B7A68 /* 017A4 809B7AF4 26D6000C */ addiu $s6, $s6, 0x000C ## $s6 = 000001AC /* 017A8 809B7AF8 864B031A */ lh $t3, 0x031A($s2) ## 0000031A /* 017AC 809B7AFC 256CFFFF */ addiu $t4, $t3, 0xFFFF ## $t4 = FFFFFFFF -/* 017B0 809B7B00 10000006 */ beq $zero, $zero, .L809B7B1C +/* 017B0 809B7B00 10000006 */ beq $zero, $zero, .L809B7B1C /* 017B4 809B7B04 A64C031A */ sh $t4, 0x031A($s2) ## 0000031A .L809B7B08: /* 017B8 809B7B08 00C02025 */ or $a0, $a2, $zero ## $a0 = 00000000 /* 017BC 809B7B0C 0C00B2DD */ jal Flags_SetSwitch - + /* 017C0 809B7B10 86450154 */ lh $a1, 0x0154($s2) ## 00000154 /* 017C4 809B7B14 0C00B55C */ jal Actor_Kill - + /* 017C8 809B7B18 02402025 */ or $a0, $s2, $zero ## $a0 = 00000000 .L809B7B1C: -/* 017CC 809B7B1C 8FBF0044 */ lw $ra, 0x0044($sp) -/* 017D0 809B7B20 8FB00020 */ lw $s0, 0x0020($sp) -/* 017D4 809B7B24 8FB10024 */ lw $s1, 0x0024($sp) -/* 017D8 809B7B28 8FB20028 */ lw $s2, 0x0028($sp) -/* 017DC 809B7B2C 8FB3002C */ lw $s3, 0x002C($sp) -/* 017E0 809B7B30 8FB40030 */ lw $s4, 0x0030($sp) -/* 017E4 809B7B34 8FB50034 */ lw $s5, 0x0034($sp) -/* 017E8 809B7B38 8FB60038 */ lw $s6, 0x0038($sp) -/* 017EC 809B7B3C 8FB7003C */ lw $s7, 0x003C($sp) -/* 017F0 809B7B40 8FBE0040 */ lw $s8, 0x0040($sp) -/* 017F4 809B7B44 03E00008 */ jr $ra +/* 017CC 809B7B1C 8FBF0044 */ lw $ra, 0x0044($sp) +/* 017D0 809B7B20 8FB00020 */ lw $s0, 0x0020($sp) +/* 017D4 809B7B24 8FB10024 */ lw $s1, 0x0024($sp) +/* 017D8 809B7B28 8FB20028 */ lw $s2, 0x0028($sp) +/* 017DC 809B7B2C 8FB3002C */ lw $s3, 0x002C($sp) +/* 017E0 809B7B30 8FB40030 */ lw $s4, 0x0030($sp) +/* 017E4 809B7B34 8FB50034 */ lw $s5, 0x0034($sp) +/* 017E8 809B7B38 8FB60038 */ lw $s6, 0x0038($sp) +/* 017EC 809B7B3C 8FB7003C */ lw $s7, 0x003C($sp) +/* 017F0 809B7B40 8FBE0040 */ lw $s8, 0x0040($sp) +/* 017F4 809B7B44 03E00008 */ jr $ra /* 017F8 809B7B48 27BD0078 */ addiu $sp, $sp, 0x0078 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bb/EnBb_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Bb/EnBb_Draw.s index e2e920efbc..afa41f03cd 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bb/EnBb_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bb/EnBb_Draw.s @@ -28,7 +28,7 @@ glabel EnBb_Draw /* 032CC 809BB5AC 8DE50000 */ lw $a1, 0x0000($t7) ## 809BBC18 /* 032D0 809BB5B0 27A4007C */ addiu $a0, $sp, 0x007C ## $a0 = FFFFFFB4 /* 032D4 809BB5B4 240707FC */ addiu $a3, $zero, 0x07FC ## $a3 = 000007FC -/* 032D8 809BB5B8 0C031AB1 */ jal func_800C6AC4 +/* 032D8 809BB5B8 0C031AB1 */ jal Graph_OpenDisps /* 032DC 809BB5BC AFA5008C */ sw $a1, 0x008C($sp) /* 032E0 809BB5C0 3C0142A0 */ lui $at, 0x42A0 ## $at = 42A00000 /* 032E4 809BB5C4 44810000 */ mtc1 $at, $f0 ## $f0 = 80.00 @@ -198,7 +198,7 @@ glabel EnBb_Draw /* 0355C 809BB83C AFA20068 */ sw $v0, 0x0068($sp) /* 03560 809BB840 00007012 */ mflo $t6 /* 03564 809BB844 31CF01FF */ andi $t7, $t6, 0x01FF ## $t7 = 00000001 -/* 03568 809BB848 0C0253D0 */ jal Draw_TwoTexScroll +/* 03568 809BB848 0C0253D0 */ jal Gfx_TwoTexScroll /* 0356C 809BB84C AFAF0020 */ sw $t7, 0x0020($sp) /* 03570 809BB850 8FA80068 */ lw $t0, 0x0068($sp) /* 03574 809BB854 3C19FA00 */ lui $t9, 0xFA00 ## $t9 = FA000000 @@ -335,7 +335,7 @@ glabel EnBb_Draw /* 0376C 809BBA4C 24C6BC50 */ addiu $a2, $a2, %lo(D_809BBC50) ## $a2 = 809BBC50 /* 03770 809BBA50 27A4007C */ addiu $a0, $sp, 0x007C ## $a0 = FFFFFFB4 /* 03774 809BBA54 2407084F */ addiu $a3, $zero, 0x084F ## $a3 = 0000084F -/* 03778 809BBA58 0C031AD5 */ jal func_800C6B54 +/* 03778 809BBA58 0C031AD5 */ jal Graph_CloseDisps /* 0377C 809BBA5C 8F050000 */ lw $a1, 0x0000($t8) ## 00000000 /* 03780 809BBA60 8FBF003C */ lw $ra, 0x003C($sp) /* 03784 809BBA64 8FB00038 */ lw $s0, 0x0038($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bb/func_809B8E34.s b/asm/non_matchings/overlays/actors/ovl_En_Bb/func_809B8E34.s index 361feb4e7f..08da5c8e03 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bb/func_809B8E34.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bb/func_809B8E34.s @@ -1,11 +1,11 @@ glabel func_809B8E34 /* 00B54 809B8E34 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 00B58 809B8E38 AFB00018 */ sw $s0, 0x0018($sp) +/* 00B58 809B8E38 AFB00018 */ sw $s0, 0x0018($sp) /* 00B5C 809B8E3C 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00B60 809B8E40 AFBF001C */ sw $ra, 0x001C($sp) +/* 00B60 809B8E40 AFBF001C */ sw $ra, 0x001C($sp) /* 00B64 809B8E44 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 00B68 809B8E48 24A50444 */ addiu $a1, $a1, 0x0444 ## $a1 = 06000444 -/* 00B6C 809B8E4C 0C0294BE */ jal func_800A52F8 +/* 00B6C 809B8E4C 0C0294BE */ jal SkelAnime_ChangeAnimDefaultRepeat /* 00B70 809B8E50 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C /* 00B74 809B8E54 0C03F66B */ jal Math_Rand_ZeroOne ## Rand.Next() float @@ -13,8 +13,8 @@ glabel func_809B8E34 /* 00B7C 809B8E5C 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 /* 00B80 809B8E60 44811000 */ mtc1 $at, $f2 ## $f2 = 0.50 /* 00B84 809B8E64 00000000 */ nop -/* 00B88 809B8E68 46020102 */ mul.s $f4, $f0, $f2 -/* 00B8C 809B8E6C 46022180 */ add.s $f6, $f4, $f2 +/* 00B88 809B8E68 46020102 */ mul.s $f4, $f0, $f2 +/* 00B8C 809B8E6C 46022180 */ add.s $f6, $f4, $f2 /* 00B90 809B8E70 0C03F66B */ jal Math_Rand_ZeroOne ## Rand.Next() float /* 00B94 809B8E74 E6060068 */ swc1 $f6, 0x0068($s0) ## 00000068 @@ -22,10 +22,10 @@ glabel func_809B8E34 /* 00B9C 809B8E7C 44814000 */ mtc1 $at, $f8 ## $f8 = 20.00 /* 00BA0 809B8E80 3C014220 */ lui $at, 0x4220 ## $at = 42200000 /* 00BA4 809B8E84 44818000 */ mtc1 $at, $f16 ## $f16 = 40.00 -/* 00BA8 809B8E88 46080282 */ mul.s $f10, $f0, $f8 -/* 00BAC 809B8E8C 46105480 */ add.s $f18, $f10, $f16 -/* 00BB0 809B8E90 4600910D */ trunc.w.s $f4, $f18 -/* 00BB4 809B8E94 440F2000 */ mfc1 $t7, $f4 +/* 00BA8 809B8E88 46080282 */ mul.s $f10, $f0, $f8 +/* 00BAC 809B8E8C 46105480 */ add.s $f18, $f10, $f16 +/* 00BB0 809B8E90 4600910D */ trunc.w.s $f4, $f18 +/* 00BB4 809B8E94 440F2000 */ mfc1 $t7, $f4 /* 00BB8 809B8E98 0C03F66B */ jal Math_Rand_ZeroOne ## Rand.Next() float /* 00BBC 809B8E9C AE0F0260 */ sw $t7, 0x0260($s0) ## 00000260 @@ -33,22 +33,22 @@ glabel func_809B8E34 /* 00BC4 809B8EA4 44813000 */ mtc1 $at, $f6 ## $f6 = 30.00 /* 00BC8 809B8EA8 3C014334 */ lui $at, 0x4334 ## $at = 43340000 /* 00BCC 809B8EAC 44815000 */ mtc1 $at, $f10 ## $f10 = 180.00 -/* 00BD0 809B8EB0 46060202 */ mul.s $f8, $f0, $f6 +/* 00BD0 809B8EB0 46060202 */ mul.s $f8, $f0, $f6 /* 00BD4 809B8EB4 24080006 */ addiu $t0, $zero, 0x0006 ## $t0 = 00000006 /* 00BD8 809B8EB8 3C05809C */ lui $a1, %hi(func_809B8EF4) ## $a1 = 809C0000 /* 00BDC 809B8EBC AE000324 */ sw $zero, 0x0324($s0) ## 00000324 /* 00BE0 809B8EC0 AE080250 */ sw $t0, 0x0250($s0) ## 00000250 /* 00BE4 809B8EC4 24A58EF4 */ addiu $a1, $a1, %lo(func_809B8EF4) ## $a1 = 809B8EF4 /* 00BE8 809B8EC8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00BEC 809B8ECC 460A4400 */ add.s $f16, $f8, $f10 -/* 00BF0 809B8ED0 4600848D */ trunc.w.s $f18, $f16 -/* 00BF4 809B8ED4 44199000 */ mfc1 $t9, $f18 -/* 00BF8 809B8ED8 0C26E0B8 */ jal func_809B82E0 +/* 00BEC 809B8ECC 460A4400 */ add.s $f16, $f8, $f10 +/* 00BF0 809B8ED0 4600848D */ trunc.w.s $f18, $f16 +/* 00BF4 809B8ED4 44199000 */ mfc1 $t9, $f18 +/* 00BF8 809B8ED8 0C26E0B8 */ jal func_809B82E0 /* 00BFC 809B8EDC AE190264 */ sw $t9, 0x0264($s0) ## 00000264 -/* 00C00 809B8EE0 8FBF001C */ lw $ra, 0x001C($sp) -/* 00C04 809B8EE4 8FB00018 */ lw $s0, 0x0018($sp) +/* 00C00 809B8EE0 8FBF001C */ lw $ra, 0x001C($sp) +/* 00C04 809B8EE4 8FB00018 */ lw $s0, 0x0018($sp) /* 00C08 809B8EE8 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 00C0C 809B8EEC 03E00008 */ jr $ra +/* 00C0C 809B8EEC 03E00008 */ jr $ra /* 00C10 809B8EF0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bb/func_809B8EF4.s b/asm/non_matchings/overlays/actors/ovl_En_Bb/func_809B8EF4.s index 2f455327ed..f950a52e36 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bb/func_809B8EF4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bb/func_809B8EF4.s @@ -1,66 +1,66 @@ glabel func_809B8EF4 /* 00C14 809B8EF4 27BDFFB0 */ addiu $sp, $sp, 0xFFB0 ## $sp = FFFFFFB0 /* 00C18 809B8EF8 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 -/* 00C1C 809B8EFC AFB00020 */ sw $s0, 0x0020($sp) +/* 00C1C 809B8EFC AFB00020 */ sw $s0, 0x0020($sp) /* 00C20 809B8F00 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00C24 809B8F04 AFBF0024 */ sw $ra, 0x0024($sp) -/* 00C28 809B8F08 AFA50054 */ sw $a1, 0x0054($sp) +/* 00C24 809B8F04 AFBF0024 */ sw $ra, 0x0024($sp) +/* 00C28 809B8F08 AFA50054 */ sw $a1, 0x0054($sp) /* 00C2C 809B8F0C 3C0542A0 */ lui $a1, 0x42A0 ## $a1 = 42A00000 /* 00C30 809B8F10 24840288 */ addiu $a0, $a0, 0x0288 ## $a0 = 00000288 /* 00C34 809B8F14 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 00C38 809B8F18 3C074120 */ lui $a3, 0x4120 ## $a3 = 41200000 /* 00C3C 809B8F1C 0C01E0C4 */ jal Math_SmoothScaleMaxMinF - -/* 00C40 809B8F20 E7A40010 */ swc1 $f4, 0x0010($sp) + +/* 00C40 809B8F20 E7A40010 */ swc1 $f4, 0x0010($sp) /* 00C44 809B8F24 44803000 */ mtc1 $zero, $f6 ## $f6 = 0.00 /* 00C48 809B8F28 2604028C */ addiu $a0, $s0, 0x028C ## $a0 = 0000028C /* 00C4C 809B8F2C 3C0542C8 */ lui $a1, 0x42C8 ## $a1 = 42C80000 /* 00C50 809B8F30 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 00C54 809B8F34 3C074120 */ lui $a3, 0x4120 ## $a3 = 41200000 /* 00C58 809B8F38 0C01E0C4 */ jal Math_SmoothScaleMaxMinF - -/* 00C5C 809B8F3C E7A60010 */ swc1 $f6, 0x0010($sp) + +/* 00C5C 809B8F3C E7A60010 */ swc1 $f6, 0x0010($sp) /* 00C60 809B8F40 3C01C6FA */ lui $at, 0xC6FA ## $at = C6FA0000 /* 00C64 809B8F44 44814000 */ mtc1 $at, $f8 ## $f8 = -32000.00 /* 00C68 809B8F48 C6020080 */ lwc1 $f2, 0x0080($s0) ## 00000080 -/* 00C6C 809B8F4C 4602403C */ c.lt.s $f8, $f2 +/* 00C6C 809B8F4C 4602403C */ c.lt.s $f8, $f2 /* 00C70 809B8F50 00000000 */ nop -/* 00C74 809B8F54 4500000D */ bc1f .L809B8F8C +/* 00C74 809B8F54 4500000D */ bc1f .L809B8F8C /* 00C78 809B8F58 3C014248 */ lui $at, 0x4248 ## $at = 42480000 /* 00C7C 809B8F5C 44815000 */ mtc1 $at, $f10 ## $f10 = 50.00 /* 00C80 809B8F60 C6120280 */ lwc1 $f18, 0x0280($s0) ## 00000280 /* 00C84 809B8F64 44803000 */ mtc1 $zero, $f6 ## $f6 = 0.00 -/* 00C88 809B8F68 460A1400 */ add.s $f16, $f2, $f10 +/* 00C88 809B8F68 460A1400 */ add.s $f16, $f2, $f10 /* 00C8C 809B8F6C 26040028 */ addiu $a0, $s0, 0x0028 ## $a0 = 00000028 /* 00C90 809B8F70 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 00C94 809B8F74 3C073F00 */ lui $a3, 0x3F00 ## $a3 = 3F000000 -/* 00C98 809B8F78 46128100 */ add.s $f4, $f16, $f18 -/* 00C9C 809B8F7C E7A60010 */ swc1 $f6, 0x0010($sp) -/* 00CA0 809B8F80 44052000 */ mfc1 $a1, $f4 +/* 00C98 809B8F78 46128100 */ add.s $f4, $f16, $f18 +/* 00C9C 809B8F7C E7A60010 */ swc1 $f6, 0x0010($sp) +/* 00CA0 809B8F80 44052000 */ mfc1 $a1, $f4 /* 00CA4 809B8F84 0C01E0C4 */ jal Math_SmoothScaleMaxMinF - + /* 00CA8 809B8F88 00000000 */ nop .L809B8F8C: /* 00CAC 809B8F8C 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C /* 00CB0 809B8F90 0C02927F */ jal SkelAnime_FrameUpdateMatrix - -/* 00CB4 809B8F94 AFA40034 */ sw $a0, 0x0034($sp) -/* 00CB8 809B8F98 0C0329DD */ jal func_800CA774 + +/* 00CB4 809B8F94 AFA40034 */ sw $a0, 0x0034($sp) +/* 00CB8 809B8F98 0C0329DD */ jal func_800CA774 /* 00CBC 809B8F9C C60C0274 */ lwc1 $f12, 0x0274($s0) ## 00000274 /* 00CC0 809B8FA0 44804000 */ mtc1 $zero, $f8 ## $f8 = 0.00 /* 00CC4 809B8FA4 00000000 */ nop -/* 00CC8 809B8FA8 46080032 */ c.eq.s $f0, $f8 +/* 00CC8 809B8FA8 46080032 */ c.eq.s $f0, $f8 /* 00CCC 809B8FAC 00000000 */ nop -/* 00CD0 809B8FB0 45000010 */ bc1f .L809B8FF4 +/* 00CD0 809B8FB0 45000010 */ bc1f .L809B8FF4 /* 00CD4 809B8FB4 00000000 */ nop /* 00CD8 809B8FB8 860E026A */ lh $t6, 0x026A($s0) ## 0000026A -/* 00CDC 809B8FBC 11C00006 */ beq $t6, $zero, .L809B8FD8 +/* 00CDC 809B8FBC 11C00006 */ beq $t6, $zero, .L809B8FD8 /* 00CE0 809B8FC0 00000000 */ nop /* 00CE4 809B8FC4 0C03F66B */ jal Math_Rand_ZeroOne ## Rand.Next() float /* 00CE8 809B8FC8 00000000 */ nop -/* 00CEC 809B8FCC 46000280 */ add.s $f10, $f0, $f0 -/* 00CF0 809B8FD0 10000008 */ beq $zero, $zero, .L809B8FF4 +/* 00CEC 809B8FCC 46000280 */ add.s $f10, $f0, $f0 +/* 00CF0 809B8FD0 10000008 */ beq $zero, $zero, .L809B8FF4 /* 00CF4 809B8FD4 E60A0284 */ swc1 $f10, 0x0284($s0) ## 00000284 .L809B8FD8: /* 00CF8 809B8FD8 0C03F66B */ jal Math_Rand_ZeroOne @@ -69,101 +69,101 @@ glabel func_809B8EF4 /* 00D00 809B8FE0 3C014080 */ lui $at, 0x4080 ## $at = 40800000 /* 00D04 809B8FE4 44818000 */ mtc1 $at, $f16 ## $f16 = 4.00 /* 00D08 809B8FE8 00000000 */ nop -/* 00D0C 809B8FEC 46100482 */ mul.s $f18, $f0, $f16 +/* 00D0C 809B8FEC 46100482 */ mul.s $f18, $f0, $f16 /* 00D10 809B8FF0 E6120284 */ swc1 $f18, 0x0284($s0) ## 00000284 .L809B8FF4: -/* 00D14 809B8FF4 0C0329DD */ jal func_800CA774 +/* 00D14 809B8FF4 0C0329DD */ jal func_800CA774 /* 00D18 809B8FF8 C60C0274 */ lwc1 $f12, 0x0274($s0) ## 00000274 /* 00D1C 809B8FFC 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 /* 00D20 809B9000 44811000 */ mtc1 $at, $f2 ## $f2 = 1.00 /* 00D24 809B9004 C6060284 */ lwc1 $f6, 0x0284($s0) ## 00000284 /* 00D28 809B9008 C6040028 */ lwc1 $f4, 0x0028($s0) ## 00000028 /* 00D2C 809B900C 3C01809C */ lui $at, %hi(D_809BBC8C) ## $at = 809C0000 -/* 00D30 809B9010 46061200 */ add.s $f8, $f2, $f6 +/* 00D30 809B9010 46061200 */ add.s $f8, $f2, $f6 /* 00D34 809B9014 C6120274 */ lwc1 $f18, 0x0274($s0) ## 00000274 /* 00D38 809B9018 8E05027C */ lw $a1, 0x027C($s0) ## 0000027C -/* 00D3C 809B901C 44061000 */ mfc1 $a2, $f2 -/* 00D40 809B9020 46080282 */ mul.s $f10, $f0, $f8 +/* 00D3C 809B901C 44061000 */ mfc1 $a2, $f2 +/* 00D40 809B9020 46080282 */ mul.s $f10, $f0, $f8 /* 00D44 809B9024 26040068 */ addiu $a0, $s0, 0x0068 ## $a0 = 00000068 /* 00D48 809B9028 3C073F00 */ lui $a3, 0x3F00 ## $a3 = 3F000000 -/* 00D4C 809B902C 460A2400 */ add.s $f16, $f4, $f10 +/* 00D4C 809B902C 460A2400 */ add.s $f16, $f4, $f10 /* 00D50 809B9030 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 /* 00D54 809B9034 E6100028 */ swc1 $f16, 0x0028($s0) ## 00000028 -/* 00D58 809B9038 C426BC8C */ lwc1 $f6, %lo(D_809BBC8C)($at) -/* 00D5C 809B903C 46069200 */ add.s $f8, $f18, $f6 +/* 00D58 809B9038 C426BC8C */ lwc1 $f6, %lo(D_809BBC8C)($at) +/* 00D5C 809B903C 46069200 */ add.s $f8, $f18, $f6 /* 00D60 809B9040 E6080274 */ swc1 $f8, 0x0274($s0) ## 00000274 /* 00D64 809B9044 0C01E0C4 */ jal Math_SmoothScaleMaxMinF - -/* 00D68 809B9048 E7A40010 */ swc1 $f4, 0x0010($sp) + +/* 00D68 809B9048 E7A40010 */ swc1 $f4, 0x0010($sp) /* 00D6C 809B904C 26040024 */ addiu $a0, $s0, 0x0024 ## $a0 = 00000024 /* 00D70 809B9050 26050008 */ addiu $a1, $s0, 0x0008 ## $a1 = 00000008 -/* 00D74 809B9054 AFA5002C */ sw $a1, 0x002C($sp) +/* 00D74 809B9054 AFA5002C */ sw $a1, 0x002C($sp) /* 00D78 809B9058 0C01E00A */ jal Math_Vec3f_DistXZ - -/* 00D7C 809B905C AFA40030 */ sw $a0, 0x0030($sp) + +/* 00D7C 809B905C AFA40030 */ sw $a0, 0x0030($sp) /* 00D80 809B9060 3C014396 */ lui $at, 0x4396 ## $at = 43960000 /* 00D84 809B9064 44815000 */ mtc1 $at, $f10 ## $f10 = 300.00 -/* 00D88 809B9068 8FA5002C */ lw $a1, 0x002C($sp) -/* 00D8C 809B906C 4600503C */ c.lt.s $f10, $f0 +/* 00D88 809B9068 8FA5002C */ lw $a1, 0x002C($sp) +/* 00D8C 809B906C 4600503C */ c.lt.s $f10, $f0 /* 00D90 809B9070 00000000 */ nop -/* 00D94 809B9074 4502000E */ bc1fl .L809B90B0 +/* 00D94 809B9074 4502000E */ bc1fl .L809B90B0 /* 00D98 809B9078 8E0F0260 */ lw $t7, 0x0260($s0) ## 00000260 /* 00D9C 809B907C 0C01E01A */ jal Math_Vec3f_Yaw - -/* 00DA0 809B9080 8FA40030 */ lw $a0, 0x0030($sp) + +/* 00DA0 809B9080 8FA40030 */ lw $a0, 0x0030($sp) /* 00DA4 809B9084 A602026E */ sh $v0, 0x026E($s0) ## 0000026E /* 00DA8 809B9088 8605026E */ lh $a1, 0x026E($s0) ## 0000026E /* 00DAC 809B908C 26040032 */ addiu $a0, $s0, 0x0032 ## $a0 = 00000032 -/* 00DB0 809B9090 AFA4002C */ sw $a0, 0x002C($sp) -/* 00DB4 809B9094 AFA00010 */ sw $zero, 0x0010($sp) +/* 00DB0 809B9090 AFA4002C */ sw $a0, 0x002C($sp) +/* 00DB4 809B9094 AFA00010 */ sw $zero, 0x0010($sp) /* 00DB8 809B9098 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 /* 00DBC 809B909C 0C01E1A7 */ jal Math_SmoothScaleMaxMinS - + /* 00DC0 809B90A0 240707D0 */ addiu $a3, $zero, 0x07D0 ## $a3 = 000007D0 -/* 00DC4 809B90A4 1000011F */ beq $zero, $zero, .L809B9524 +/* 00DC4 809B90A4 1000011F */ beq $zero, $zero, .L809B9524 /* 00DC8 809B90A8 8605026E */ lh $a1, 0x026E($s0) ## 0000026E /* 00DCC 809B90AC 8E0F0260 */ lw $t7, 0x0260($s0) ## 00000260 .L809B90B0: /* 00DD0 809B90B0 25F8FFFF */ addiu $t8, $t7, 0xFFFF ## $t8 = FFFFFFFF -/* 00DD4 809B90B4 1F00005C */ bgtz $t8, .L809B9228 +/* 00DD4 809B90B4 1F00005C */ bgtz $t8, .L809B9228 /* 00DD8 809B90B8 AE180260 */ sw $t8, 0x0260($s0) ## 00000260 /* 00DDC 809B90BC 860A026A */ lh $t2, 0x026A($s0) ## 0000026A /* 00DE0 809B90C0 C60C0274 */ lwc1 $f12, 0x0274($s0) ## 00000274 /* 00DE4 809B90C4 394B0001 */ xori $t3, $t2, 0x0001 ## $t3 = 00000001 -/* 00DE8 809B90C8 0C0329DD */ jal func_800CA774 +/* 00DE8 809B90C8 0C0329DD */ jal func_800CA774 /* 00DEC 809B90CC A60B026A */ sh $t3, 0x026A($s0) ## 0000026A /* 00DF0 809B90D0 3C014120 */ lui $at, 0x4120 ## $at = 41200000 /* 00DF4 809B90D4 44818000 */ mtc1 $at, $f16 ## $f16 = 10.00 /* 00DF8 809B90D8 8618026A */ lh $t8, 0x026A($s0) ## 0000026A /* 00DFC 809B90DC 44805000 */ mtc1 $zero, $f10 ## $f10 = 0.00 -/* 00E00 809B90E0 46100482 */ mul.s $f18, $f0, $f16 +/* 00E00 809B90E0 46100482 */ mul.s $f18, $f0, $f16 /* 00E04 809B90E4 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 00E08 809B90E8 24A50444 */ addiu $a1, $a1, 0x0444 ## $a1 = 06000444 /* 00E0C 809B90EC E60A0068 */ swc1 $f10, 0x0068($s0) ## 00000068 -/* 00E10 809B90F0 4600918D */ trunc.w.s $f6, $f18 -/* 00E14 809B90F4 440D3000 */ mfc1 $t5, $f6 +/* 00E10 809B90F0 4600918D */ trunc.w.s $f6, $f18 +/* 00E14 809B90F4 440D3000 */ mfc1 $t5, $f6 /* 00E18 809B90F8 00000000 */ nop -/* 00E1C 809B90FC 000D7400 */ sll $t6, $t5, 16 -/* 00E20 809B9100 000E7C03 */ sra $t7, $t6, 16 +/* 00E1C 809B90FC 000D7400 */ sll $t6, $t5, 16 +/* 00E20 809B9100 000E7C03 */ sra $t7, $t6, 16 /* 00E24 809B9104 448F4000 */ mtc1 $t7, $f8 ## $f8 = 0.00 /* 00E28 809B9108 00000000 */ nop -/* 00E2C 809B910C 46804120 */ cvt.s.w $f4, $f8 -/* 00E30 809B9110 13000027 */ beq $t8, $zero, .L809B91B0 +/* 00E2C 809B910C 46804120 */ cvt.s.w $f4, $f8 +/* 00E30 809B9110 13000027 */ beq $t8, $zero, .L809B91B0 /* 00E34 809B9114 E6040280 */ swc1 $f4, 0x0280($s0) ## 00000280 /* 00E38 809B9118 8E190324 */ lw $t9, 0x0324($s0) ## 00000324 /* 00E3C 809B911C 3C014348 */ lui $at, 0x4348 ## $at = 43480000 -/* 00E40 809B9120 17200023 */ bne $t9, $zero, .L809B91B0 +/* 00E40 809B9120 17200023 */ bne $t9, $zero, .L809B91B0 /* 00E44 809B9124 00000000 */ nop /* 00E48 809B9128 C6100090 */ lwc1 $f16, 0x0090($s0) ## 00000090 /* 00E4C 809B912C 44819000 */ mtc1 $at, $f18 ## $f18 = 200.00 /* 00E50 809B9130 860A0032 */ lh $t2, 0x0032($s0) ## 00000032 /* 00E54 809B9134 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 00E58 809B9138 4612803C */ c.lt.s $f16, $f18 +/* 00E58 809B9138 4612803C */ c.lt.s $f16, $f18 /* 00E5C 809B913C A60A026E */ sh $t2, 0x026E($s0) ## 0000026E -/* 00E60 809B9140 8FA40034 */ lw $a0, 0x0034($sp) -/* 00E64 809B9144 45000005 */ bc1f .L809B915C +/* 00E60 809B9140 8FA40034 */ lw $a0, 0x0034($sp) +/* 00E64 809B9144 45000005 */ bc1f .L809B915C /* 00E68 809B9148 00000000 */ nop -/* 00E6C 809B914C 0C0294BE */ jal func_800A52F8 +/* 00E6C 809B914C 0C0294BE */ jal SkelAnime_ChangeAnimDefaultRepeat /* 00E70 809B9150 24A50184 */ addiu $a1, $a1, 0x0184 ## $a1 = 06000184 /* 00E74 809B9154 860B008A */ lh $t3, 0x008A($s0) ## 0000008A /* 00E78 809B9158 A60B026E */ sh $t3, 0x026E($s0) ## 0000026E @@ -175,8 +175,8 @@ glabel func_809B8EF4 /* 00E88 809B9168 44813000 */ mtc1 $at, $f6 ## $f6 = 1.50 /* 00E8C 809B916C 3C0140C0 */ lui $at, 0x40C0 ## $at = 40C00000 /* 00E90 809B9170 44812000 */ mtc1 $at, $f4 ## $f4 = 6.00 -/* 00E94 809B9174 46060202 */ mul.s $f8, $f0, $f6 -/* 00E98 809B9178 46044280 */ add.s $f10, $f8, $f4 +/* 00E94 809B9174 46060202 */ mul.s $f8, $f0, $f6 +/* 00E98 809B9178 46044280 */ add.s $f10, $f8, $f4 /* 00E9C 809B917C 0C03F66B */ jal Math_Rand_ZeroOne ## Rand.Next() float /* 00EA0 809B9180 E60A027C */ swc1 $f10, 0x027C($s0) ## 0000027C @@ -184,16 +184,16 @@ glabel func_809B8EF4 /* 00EA8 809B9188 44818000 */ mtc1 $at, $f16 ## $f16 = 5.00 /* 00EAC 809B918C 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 /* 00EB0 809B9190 44813000 */ mtc1 $at, $f6 ## $f6 = 20.00 -/* 00EB4 809B9194 46100482 */ mul.s $f18, $f0, $f16 +/* 00EB4 809B9194 46100482 */ mul.s $f18, $f0, $f16 /* 00EB8 809B9198 A6000268 */ sh $zero, 0x0268($s0) ## 00000268 -/* 00EBC 809B919C 46069200 */ add.s $f8, $f18, $f6 -/* 00EC0 809B91A0 4600410D */ trunc.w.s $f4, $f8 -/* 00EC4 809B91A4 440D2000 */ mfc1 $t5, $f4 -/* 00EC8 809B91A8 1000001F */ beq $zero, $zero, .L809B9228 +/* 00EBC 809B919C 46069200 */ add.s $f8, $f18, $f6 +/* 00EC0 809B91A0 4600410D */ trunc.w.s $f4, $f8 +/* 00EC4 809B91A4 440D2000 */ mfc1 $t5, $f4 +/* 00EC8 809B91A8 1000001F */ beq $zero, $zero, .L809B9228 /* 00ECC 809B91AC AE0D0260 */ sw $t5, 0x0260($s0) ## 00000260 .L809B91B0: -/* 00ED0 809B91B0 0C0294BE */ jal func_800A52F8 -/* 00ED4 809B91B4 8FA40034 */ lw $a0, 0x0034($sp) +/* 00ED0 809B91B0 0C0294BE */ jal SkelAnime_ChangeAnimDefaultRepeat +/* 00ED4 809B91B4 8FA40034 */ lw $a0, 0x0034($sp) /* 00ED8 809B91B8 0C03F66B */ jal Math_Rand_ZeroOne ## Rand.Next() float /* 00EDC 809B91BC 00000000 */ nop @@ -201,8 +201,8 @@ glabel func_809B8EF4 /* 00EE4 809B91C4 44815000 */ mtc1 $at, $f10 ## $f10 = 1.50 /* 00EE8 809B91C8 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 /* 00EEC 809B91CC 44819000 */ mtc1 $at, $f18 ## $f18 = 1.00 -/* 00EF0 809B91D0 460A0402 */ mul.s $f16, $f0, $f10 -/* 00EF4 809B91D4 46128180 */ add.s $f6, $f16, $f18 +/* 00EF0 809B91D0 460A0402 */ mul.s $f16, $f0, $f10 +/* 00EF4 809B91D4 46128180 */ add.s $f6, $f16, $f18 /* 00EF8 809B91D8 0C03F66B */ jal Math_Rand_ZeroOne ## Rand.Next() float /* 00EFC 809B91DC E606027C */ swc1 $f6, 0x027C($s0) ## 0000027C @@ -210,18 +210,18 @@ glabel func_809B8EF4 /* 00F04 809B91E4 44814000 */ mtc1 $at, $f8 ## $f8 = 20.00 /* 00F08 809B91E8 3C014220 */ lui $at, 0x4220 ## $at = 42200000 /* 00F0C 809B91EC 44815000 */ mtc1 $at, $f10 ## $f10 = 40.00 -/* 00F10 809B91F0 46080102 */ mul.s $f4, $f0, $f8 +/* 00F10 809B91F0 46080102 */ mul.s $f4, $f0, $f8 /* 00F14 809B91F4 C60C0274 */ lwc1 $f12, 0x0274($s0) ## 00000274 -/* 00F18 809B91F8 460A2400 */ add.s $f16, $f4, $f10 -/* 00F1C 809B91FC 4600848D */ trunc.w.s $f18, $f16 -/* 00F20 809B9200 440F9000 */ mfc1 $t7, $f18 -/* 00F24 809B9204 0C0329C8 */ jal func_800CA720 +/* 00F18 809B91F8 460A2400 */ add.s $f16, $f4, $f10 +/* 00F1C 809B91FC 4600848D */ trunc.w.s $f18, $f16 +/* 00F20 809B9200 440F9000 */ mfc1 $t7, $f18 +/* 00F24 809B9204 0C0329C8 */ jal func_800CA720 /* 00F28 809B9208 AE0F0260 */ sw $t7, 0x0260($s0) ## 00000260 /* 00F2C 809B920C 3C01809C */ lui $at, %hi(D_809BBC90) ## $at = 809C0000 -/* 00F30 809B9210 C426BC90 */ lwc1 $f6, %lo(D_809BBC90)($at) -/* 00F34 809B9214 46060202 */ mul.s $f8, $f0, $f6 -/* 00F38 809B9218 4600410D */ trunc.w.s $f4, $f8 -/* 00F3C 809B921C 44192000 */ mfc1 $t9, $f4 +/* 00F30 809B9210 C426BC90 */ lwc1 $f6, %lo(D_809BBC90)($at) +/* 00F34 809B9214 46060202 */ mul.s $f8, $f0, $f6 +/* 00F38 809B9218 4600410D */ trunc.w.s $f4, $f8 +/* 00F3C 809B921C 44192000 */ mfc1 $t9, $f4 /* 00F40 809B9220 00000000 */ nop /* 00F44 809B9224 A619026E */ sh $t9, 0x026E($s0) ## 0000026E .L809B9228: @@ -229,19 +229,19 @@ glabel func_809B8EF4 /* 00F4C 809B922C 44815000 */ mtc1 $at, $f10 ## $f10 = 150.00 /* 00F50 809B9230 C6000090 */ lwc1 $f0, 0x0090($s0) ## 00000090 /* 00F54 809B9234 3C014348 */ lui $at, 0x4348 ## $at = 43480000 -/* 00F58 809B9238 460A003C */ c.lt.s $f0, $f10 +/* 00F58 809B9238 460A003C */ c.lt.s $f0, $f10 /* 00F5C 809B923C 00000000 */ nop -/* 00F60 809B9240 45020026 */ bc1fl .L809B92DC +/* 00F60 809B9240 45020026 */ bc1fl .L809B92DC /* 00F64 809B9244 44814000 */ mtc1 $at, $f8 ## $f8 = 200.00 /* 00F68 809B9248 860A0268 */ lh $t2, 0x0268($s0) ## 00000268 -/* 00F6C 809B924C 51400023 */ beql $t2, $zero, .L809B92DC +/* 00F6C 809B924C 51400023 */ beql $t2, $zero, .L809B92DC /* 00F70 809B9250 44814000 */ mtc1 $at, $f8 ## $f8 = 200.00 /* 00F74 809B9254 860B026A */ lh $t3, 0x026A($s0) ## 0000026A -/* 00F78 809B9258 8FA40034 */ lw $a0, 0x0034($sp) +/* 00F78 809B9258 8FA40034 */ lw $a0, 0x0034($sp) /* 00F7C 809B925C 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 00F80 809B9260 55600026 */ bnel $t3, $zero, .L809B92FC +/* 00F80 809B9260 55600026 */ bnel $t3, $zero, .L809B92FC /* 00F84 809B9264 8E020324 */ lw $v0, 0x0324($s0) ## 00000324 -/* 00F88 809B9268 0C0294BE */ jal func_800A52F8 +/* 00F88 809B9268 0C0294BE */ jal SkelAnime_ChangeAnimDefaultRepeat /* 00F8C 809B926C 24A50184 */ addiu $a1, $a1, 0x0184 ## $a1 = 06000184 /* 00F90 809B9270 0C03F66B */ jal Math_Rand_ZeroOne ## Rand.Next() float @@ -250,8 +250,8 @@ glabel func_809B8EF4 /* 00F9C 809B927C 44818000 */ mtc1 $at, $f16 ## $f16 = 1.50 /* 00FA0 809B9280 3C0140C0 */ lui $at, 0x40C0 ## $at = 40C00000 /* 00FA4 809B9284 44813000 */ mtc1 $at, $f6 ## $f6 = 6.00 -/* 00FA8 809B9288 46100482 */ mul.s $f18, $f0, $f16 -/* 00FAC 809B928C 46069200 */ add.s $f8, $f18, $f6 +/* 00FA8 809B9288 46100482 */ mul.s $f18, $f0, $f16 +/* 00FAC 809B928C 46069200 */ add.s $f8, $f18, $f6 /* 00FB0 809B9290 0C03F66B */ jal Math_Rand_ZeroOne ## Rand.Next() float /* 00FB4 809B9294 E608027C */ swc1 $f8, 0x027C($s0) ## 0000027C @@ -259,223 +259,223 @@ glabel func_809B8EF4 /* 00FBC 809B929C 44812000 */ mtc1 $at, $f4 ## $f4 = 5.00 /* 00FC0 809B92A0 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 /* 00FC4 809B92A4 44818000 */ mtc1 $at, $f16 ## $f16 = 20.00 -/* 00FC8 809B92A8 46040282 */ mul.s $f10, $f0, $f4 +/* 00FC8 809B92A8 46040282 */ mul.s $f10, $f0, $f4 /* 00FCC 809B92AC 240F0001 */ addiu $t7, $zero, 0x0001 ## $t7 = 00000001 /* 00FD0 809B92B0 A60F026A */ sh $t7, 0x026A($s0) ## 0000026A /* 00FD4 809B92B4 860E008A */ lh $t6, 0x008A($s0) ## 0000008A /* 00FD8 809B92B8 8618026A */ lh $t8, 0x026A($s0) ## 0000026A /* 00FDC 809B92BC A60E026E */ sh $t6, 0x026E($s0) ## 0000026E -/* 00FE0 809B92C0 46105480 */ add.s $f18, $f10, $f16 +/* 00FE0 809B92C0 46105480 */ add.s $f18, $f10, $f16 /* 00FE4 809B92C4 A6180268 */ sh $t8, 0x0268($s0) ## 00000268 -/* 00FE8 809B92C8 4600918D */ trunc.w.s $f6, $f18 -/* 00FEC 809B92CC 440D3000 */ mfc1 $t5, $f6 -/* 00FF0 809B92D0 10000009 */ beq $zero, $zero, .L809B92F8 +/* 00FE8 809B92C8 4600918D */ trunc.w.s $f6, $f18 +/* 00FEC 809B92CC 440D3000 */ mfc1 $t5, $f6 +/* 00FF0 809B92D0 10000009 */ beq $zero, $zero, .L809B92F8 /* 00FF4 809B92D4 AE0D0260 */ sw $t5, 0x0260($s0) ## 00000260 /* 00FF8 809B92D8 44814000 */ mtc1 $at, $f8 ## $f8 = 20.00 .L809B92DC: /* 00FFC 809B92DC 00000000 */ nop -/* 01000 809B92E0 4608003C */ c.lt.s $f0, $f8 +/* 01000 809B92E0 4608003C */ c.lt.s $f0, $f8 /* 01004 809B92E4 00000000 */ nop -/* 01008 809B92E8 45020004 */ bc1fl .L809B92FC +/* 01008 809B92E8 45020004 */ bc1fl .L809B92FC /* 0100C 809B92EC 8E020324 */ lw $v0, 0x0324($s0) ## 00000324 /* 01010 809B92F0 8619008A */ lh $t9, 0x008A($s0) ## 0000008A /* 01014 809B92F4 A619026E */ sh $t9, 0x026E($s0) ## 0000026E .L809B92F8: /* 01018 809B92F8 8E020324 */ lw $v0, 0x0324($s0) ## 00000324 .L809B92FC: -/* 0101C 809B92FC 8FA40054 */ lw $a0, 0x0054($sp) +/* 0101C 809B92FC 8FA40054 */ lw $a0, 0x0054($sp) /* 01020 809B9300 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 01024 809B9304 54400006 */ bnel $v0, $zero, .L809B9320 +/* 01024 809B9304 54400006 */ bnel $v0, $zero, .L809B9320 /* 01028 809B9308 844A001C */ lh $t2, 0x001C($v0) ## 0000001C -/* 0102C 809B930C 0C26E0BA */ jal func_809B82E8 +/* 0102C 809B930C 0C26E0BA */ jal func_809B82E8 /* 01030 809B9310 3C064396 */ lui $a2, 0x4396 ## $a2 = 43960000 -/* 01034 809B9314 10000007 */ beq $zero, $zero, .L809B9334 -/* 01038 809B9318 AFA2004C */ sw $v0, 0x004C($sp) +/* 01034 809B9314 10000007 */ beq $zero, $zero, .L809B9334 +/* 01038 809B9318 AFA2004C */ sw $v0, 0x004C($sp) /* 0103C 809B931C 844A001C */ lh $t2, 0x001C($v0) ## 0000001C .L809B9320: -/* 01040 809B9320 55400004 */ bnel $t2, $zero, .L809B9334 -/* 01044 809B9324 AFA0004C */ sw $zero, 0x004C($sp) -/* 01048 809B9328 10000002 */ beq $zero, $zero, .L809B9334 -/* 0104C 809B932C AFA2004C */ sw $v0, 0x004C($sp) -/* 01050 809B9330 AFA0004C */ sw $zero, 0x004C($sp) +/* 01040 809B9320 55400004 */ bnel $t2, $zero, .L809B9334 +/* 01044 809B9324 AFA0004C */ sw $zero, 0x004C($sp) +/* 01048 809B9328 10000002 */ beq $zero, $zero, .L809B9334 +/* 0104C 809B932C AFA2004C */ sw $v0, 0x004C($sp) +/* 01050 809B9330 AFA0004C */ sw $zero, 0x004C($sp) .L809B9334: -/* 01054 809B9334 8FAB004C */ lw $t3, 0x004C($sp) +/* 01054 809B9334 8FAB004C */ lw $t3, 0x004C($sp) /* 01058 809B9338 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 0105C 809B933C 260D0032 */ addiu $t5, $s0, 0x0032 ## $t5 = 00000032 -/* 01060 809B9340 1160003A */ beq $t3, $zero, .L809B942C +/* 01060 809B9340 1160003A */ beq $t3, $zero, .L809B942C /* 01064 809B9344 01602825 */ or $a1, $t3, $zero ## $a1 = 00000000 /* 01068 809B9348 260C0028 */ addiu $t4, $s0, 0x0028 ## $t4 = 00000028 -/* 0106C 809B934C 0C00B69E */ jal func_8002DA78 -/* 01070 809B9350 AFAC0034 */ sw $t4, 0x0034($sp) +/* 0106C 809B934C 0C00B69E */ jal func_8002DA78 +/* 01070 809B9350 AFAC0034 */ sw $t4, 0x0034($sp) /* 01074 809B9354 860D026C */ lh $t5, 0x026C($s0) ## 0000026C /* 01078 809B9358 A602026E */ sh $v0, 0x026E($s0) ## 0000026E /* 0107C 809B935C 26040032 */ addiu $a0, $s0, 0x0032 ## $a0 = 00000032 -/* 01080 809B9360 15A0000E */ bne $t5, $zero, .L809B939C +/* 01080 809B9360 15A0000E */ bne $t5, $zero, .L809B939C /* 01084 809B9364 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 -/* 01088 809B9368 8FAE004C */ lw $t6, 0x004C($sp) +/* 01088 809B9368 8FAE004C */ lw $t6, 0x004C($sp) /* 0108C 809B936C 8E0F0324 */ lw $t7, 0x0324($s0) ## 00000324 /* 01090 809B9370 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 -/* 01094 809B9374 51CF000A */ beql $t6, $t7, .L809B93A0 +/* 01094 809B9374 51CF000A */ beql $t6, $t7, .L809B93A0 /* 01098 809B9378 8605026E */ lh $a1, 0x026E($s0) ## 0000026E /* 0109C 809B937C C6040068 */ lwc1 $f4, 0x0068($s0) ## 00000068 /* 010A0 809B9380 44815000 */ mtc1 $at, $f10 ## $f10 = 0.50 /* 010A4 809B9384 24188000 */ addiu $t8, $zero, 0x8000 ## $t8 = FFFF8000 /* 010A8 809B9388 A618026C */ sh $t8, 0x026C($s0) ## 0000026C -/* 010AC 809B938C 460A2402 */ mul.s $f16, $f4, $f10 -/* 010B0 809B9390 8FB9004C */ lw $t9, 0x004C($sp) +/* 010AC 809B938C 460A2402 */ mul.s $f16, $f4, $f10 +/* 010B0 809B9390 8FB9004C */ lw $t9, 0x004C($sp) /* 010B4 809B9394 AE190324 */ sw $t9, 0x0324($s0) ## 00000324 /* 010B8 809B9398 E6100068 */ swc1 $f16, 0x0068($s0) ## 00000068 .L809B939C: /* 010BC 809B939C 8605026E */ lh $a1, 0x026E($s0) ## 0000026E .L809B93A0: -/* 010C0 809B93A0 AFA4002C */ sw $a0, 0x002C($sp) -/* 010C4 809B93A4 AFA00010 */ sw $zero, 0x0010($sp) +/* 010C0 809B93A0 AFA4002C */ sw $a0, 0x002C($sp) +/* 010C4 809B93A4 AFA00010 */ sw $zero, 0x0010($sp) /* 010C8 809B93A8 0C01E1A7 */ jal Math_SmoothScaleMaxMinS - + /* 010CC 809B93AC 24071388 */ addiu $a3, $zero, 0x1388 ## $a3 = 00001388 -/* 010D0 809B93B0 8FAA004C */ lw $t2, 0x004C($sp) +/* 010D0 809B93B0 8FAA004C */ lw $t2, 0x004C($sp) /* 010D4 809B93B4 44809000 */ mtc1 $zero, $f18 ## $f18 = 0.00 -/* 010D8 809B93B8 8FA40030 */ lw $a0, 0x0030($sp) +/* 010D8 809B93B8 8FA40030 */ lw $a0, 0x0030($sp) /* 010DC 809B93BC 8D450024 */ lw $a1, 0x0024($t2) ## 00000024 /* 010E0 809B93C0 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 010E4 809B93C4 3C073FC0 */ lui $a3, 0x3FC0 ## $a3 = 3FC00000 /* 010E8 809B93C8 0C01E0C4 */ jal Math_SmoothScaleMaxMinF - -/* 010EC 809B93CC E7B20010 */ swc1 $f18, 0x0010($sp) -/* 010F0 809B93D0 8FAB004C */ lw $t3, 0x004C($sp) + +/* 010EC 809B93CC E7B20010 */ swc1 $f18, 0x0010($sp) +/* 010F0 809B93D0 8FAB004C */ lw $t3, 0x004C($sp) /* 010F4 809B93D4 3C014220 */ lui $at, 0x4220 ## $at = 42200000 /* 010F8 809B93D8 44814000 */ mtc1 $at, $f8 ## $f8 = 40.00 /* 010FC 809B93DC C5660028 */ lwc1 $f6, 0x0028($t3) ## 00000028 /* 01100 809B93E0 44805000 */ mtc1 $zero, $f10 ## $f10 = 0.00 -/* 01104 809B93E4 8FA40034 */ lw $a0, 0x0034($sp) -/* 01108 809B93E8 46083100 */ add.s $f4, $f6, $f8 +/* 01104 809B93E4 8FA40034 */ lw $a0, 0x0034($sp) +/* 01108 809B93E8 46083100 */ add.s $f4, $f6, $f8 /* 0110C 809B93EC 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 01110 809B93F0 3C073FC0 */ lui $a3, 0x3FC0 ## $a3 = 3FC00000 -/* 01114 809B93F4 E7AA0010 */ swc1 $f10, 0x0010($sp) -/* 01118 809B93F8 44052000 */ mfc1 $a1, $f4 +/* 01114 809B93F4 E7AA0010 */ swc1 $f10, 0x0010($sp) +/* 01118 809B93F8 44052000 */ mfc1 $a1, $f4 /* 0111C 809B93FC 0C01E0C4 */ jal Math_SmoothScaleMaxMinF - + /* 01120 809B9400 00000000 */ nop -/* 01124 809B9404 8FAC004C */ lw $t4, 0x004C($sp) +/* 01124 809B9404 8FAC004C */ lw $t4, 0x004C($sp) /* 01128 809B9408 44808000 */ mtc1 $zero, $f16 ## $f16 = 0.00 /* 0112C 809B940C 2604002C */ addiu $a0, $s0, 0x002C ## $a0 = 0000002C /* 01130 809B9410 8D85002C */ lw $a1, 0x002C($t4) ## 0000002C /* 01134 809B9414 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 01138 809B9418 3C073FC0 */ lui $a3, 0x3FC0 ## $a3 = 3FC00000 /* 0113C 809B941C 0C01E0C4 */ jal Math_SmoothScaleMaxMinF - -/* 01140 809B9420 E7B00010 */ swc1 $f16, 0x0010($sp) -/* 01144 809B9424 10000004 */ beq $zero, $zero, .L809B9438 + +/* 01140 809B9420 E7B00010 */ swc1 $f16, 0x0010($sp) +/* 01144 809B9424 10000004 */ beq $zero, $zero, .L809B9438 /* 01148 809B9428 8604026C */ lh $a0, 0x026C($s0) ## 0000026C .L809B942C: /* 0114C 809B942C AE000324 */ sw $zero, 0x0324($s0) ## 00000324 -/* 01150 809B9430 AFAD002C */ sw $t5, 0x002C($sp) +/* 01150 809B9430 AFAD002C */ sw $t5, 0x002C($sp) /* 01154 809B9434 8604026C */ lh $a0, 0x026C($s0) ## 0000026C .L809B9438: -/* 01158 809B9438 50800014 */ beql $a0, $zero, .L809B948C +/* 01158 809B9438 50800014 */ beql $a0, $zero, .L809B948C /* 0115C 809B943C 8608007E */ lh $t0, 0x007E($s0) ## 0000007E /* 01160 809B9440 0C01DE0D */ jal Math_Coss ## coss? /* 01164 809B9444 00000000 */ nop /* 01168 809B9448 3C014120 */ lui $at, 0x4120 ## $at = 41200000 /* 0116C 809B944C 44813000 */ mtc1 $at, $f6 ## $f6 = 10.00 -/* 01170 809B9450 46000487 */ neg.s $f18, $f0 +/* 01170 809B9450 46000487 */ neg.s $f18, $f0 /* 01174 809B9454 C6040028 */ lwc1 $f4, 0x0028($s0) ## 00000028 -/* 01178 809B9458 46069202 */ mul.s $f8, $f18, $f6 +/* 01178 809B9458 46069202 */ mul.s $f8, $f18, $f6 /* 0117C 809B945C 860E026C */ lh $t6, 0x026C($s0) ## 0000026C /* 01180 809B9460 8605026E */ lh $a1, 0x026E($s0) ## 0000026E /* 01184 809B9464 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 /* 01188 809B9468 25CF1000 */ addiu $t7, $t6, 0x1000 ## $t7 = 00001000 /* 0118C 809B946C A60F026C */ sh $t7, 0x026C($s0) ## 0000026C /* 01190 809B9470 240707D0 */ addiu $a3, $zero, 0x07D0 ## $a3 = 000007D0 -/* 01194 809B9474 46082280 */ add.s $f10, $f4, $f8 +/* 01194 809B9474 46082280 */ add.s $f10, $f4, $f8 /* 01198 809B9478 E60A0028 */ swc1 $f10, 0x0028($s0) ## 00000028 -/* 0119C 809B947C AFA00010 */ sw $zero, 0x0010($sp) +/* 0119C 809B947C AFA00010 */ sw $zero, 0x0010($sp) /* 011A0 809B9480 0C01E1A7 */ jal Math_SmoothScaleMaxMinS - -/* 011A4 809B9484 8FA4002C */ lw $a0, 0x002C($sp) + +/* 011A4 809B9484 8FA4002C */ lw $a0, 0x002C($sp) /* 011A8 809B9488 8608007E */ lh $t0, 0x007E($s0) ## 0000007E .L809B948C: /* 011AC 809B948C 86090032 */ lh $t1, 0x0032($s0) ## 00000032 /* 011B0 809B9490 8605026E */ lh $a1, 0x026E($s0) ## 0000026E /* 011B4 809B9494 8E180324 */ lw $t8, 0x0324($s0) ## 00000324 -/* 011B8 809B9498 01091023 */ subu $v0, $t0, $t1 -/* 011BC 809B949C 01052023 */ subu $a0, $t0, $a1 -/* 011C0 809B94A0 00021400 */ sll $v0, $v0, 16 -/* 011C4 809B94A4 00042400 */ sll $a0, $a0, 16 -/* 011C8 809B94A8 00021403 */ sra $v0, $v0, 16 -/* 011CC 809B94AC 1700001D */ bne $t8, $zero, .L809B9524 -/* 011D0 809B94B0 00042403 */ sra $a0, $a0, 16 +/* 011B8 809B9498 01091023 */ subu $v0, $t0, $t1 +/* 011BC 809B949C 01052023 */ subu $a0, $t0, $a1 +/* 011C0 809B94A0 00021400 */ sll $v0, $v0, 16 +/* 011C4 809B94A4 00042400 */ sll $a0, $a0, 16 +/* 011C8 809B94A8 00021403 */ sra $v0, $v0, 16 +/* 011CC 809B94AC 1700001D */ bne $t8, $zero, .L809B9524 +/* 011D0 809B94B0 00042403 */ sra $a0, $a0, 16 /* 011D4 809B94B4 96190088 */ lhu $t9, 0x0088($s0) ## 00000088 /* 011D8 809B94B8 332A0008 */ andi $t2, $t9, 0x0008 ## $t2 = 00000000 -/* 011DC 809B94BC 5140001A */ beql $t2, $zero, .L809B9528 -/* 011E0 809B94C0 8FA4002C */ lw $a0, 0x002C($sp) -/* 011E4 809B94C4 04400003 */ bltz $v0, .L809B94D4 -/* 011E8 809B94C8 00021823 */ subu $v1, $zero, $v0 -/* 011EC 809B94CC 10000001 */ beq $zero, $zero, .L809B94D4 +/* 011DC 809B94BC 5140001A */ beql $t2, $zero, .L809B9528 +/* 011E0 809B94C0 8FA4002C */ lw $a0, 0x002C($sp) +/* 011E4 809B94C4 04400003 */ bltz $v0, .L809B94D4 +/* 011E8 809B94C8 00021823 */ subu $v1, $zero, $v0 +/* 011EC 809B94CC 10000001 */ beq $zero, $zero, .L809B94D4 /* 011F0 809B94D0 00401825 */ or $v1, $v0, $zero ## $v1 = 00000000 .L809B94D4: -/* 011F4 809B94D4 28614001 */ slti $at, $v1, 0x4001 -/* 011F8 809B94D8 10200007 */ beq $at, $zero, .L809B94F8 -/* 011FC 809B94DC 01085821 */ addu $t3, $t0, $t0 -/* 01200 809B94E0 04800003 */ bltz $a0, .L809B94F0 -/* 01204 809B94E4 00041023 */ subu $v0, $zero, $a0 -/* 01208 809B94E8 10000001 */ beq $zero, $zero, .L809B94F0 +/* 011F4 809B94D4 28614001 */ slti $at, $v1, 0x4001 +/* 011F8 809B94D8 10200007 */ beq $at, $zero, .L809B94F8 +/* 011FC 809B94DC 01085821 */ addu $t3, $t0, $t0 +/* 01200 809B94E0 04800003 */ bltz $a0, .L809B94F0 +/* 01204 809B94E4 00041023 */ subu $v0, $zero, $a0 +/* 01208 809B94E8 10000001 */ beq $zero, $zero, .L809B94F0 /* 0120C 809B94EC 00801025 */ or $v0, $a0, $zero ## $v0 = 00000000 .L809B94F0: -/* 01210 809B94F0 28414001 */ slti $at, $v0, 0x4001 -/* 01214 809B94F4 1420000B */ bne $at, $zero, .L809B9524 +/* 01210 809B94F0 28414001 */ slti $at, $v0, 0x4001 +/* 01214 809B94F4 1420000B */ bne $at, $zero, .L809B9524 .L809B94F8: -/* 01218 809B94F8 01696023 */ subu $t4, $t3, $t1 +/* 01218 809B94F8 01696023 */ subu $t4, $t3, $t1 /* 0121C 809B94FC 24018000 */ addiu $at, $zero, 0x8000 ## $at = FFFF8000 -/* 01220 809B9500 01816821 */ addu $t5, $t4, $at +/* 01220 809B9500 01816821 */ addu $t5, $t4, $at /* 01224 809B9504 A60D026E */ sh $t5, 0x026E($s0) ## 0000026E /* 01228 809B9508 8605026E */ lh $a1, 0x026E($s0) ## 0000026E -/* 0122C 809B950C AFA00010 */ sw $zero, 0x0010($sp) -/* 01230 809B9510 8FA4002C */ lw $a0, 0x002C($sp) +/* 0122C 809B950C AFA00010 */ sw $zero, 0x0010($sp) +/* 01230 809B9510 8FA4002C */ lw $a0, 0x002C($sp) /* 01234 809B9514 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 /* 01238 809B9518 0C01E1A7 */ jal Math_SmoothScaleMaxMinS - + /* 0123C 809B951C 24070BB8 */ addiu $a3, $zero, 0x0BB8 ## $a3 = 00000BB8 /* 01240 809B9520 8605026E */ lh $a1, 0x026E($s0) ## 0000026E .L809B9524: -/* 01244 809B9524 8FA4002C */ lw $a0, 0x002C($sp) +/* 01244 809B9524 8FA4002C */ lw $a0, 0x002C($sp) .L809B9528: /* 01248 809B9528 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 /* 0124C 809B952C 240703E8 */ addiu $a3, $zero, 0x03E8 ## $a3 = 000003E8 /* 01250 809B9530 0C01E1A7 */ jal Math_SmoothScaleMaxMinS - -/* 01254 809B9534 AFA00010 */ sw $zero, 0x0010($sp) + +/* 01254 809B9534 AFA00010 */ sw $zero, 0x0010($sp) /* 01258 809B9538 920302BD */ lbu $v1, 0x02BD($s0) ## 000002BD /* 0125C 809B953C 30630002 */ andi $v1, $v1, 0x0002 ## $v1 = 00000000 -/* 01260 809B9540 54600006 */ bnel $v1, $zero, .L809B955C +/* 01260 809B9540 54600006 */ bnel $v1, $zero, .L809B955C /* 01264 809B9544 8618008A */ lh $t8, 0x008A($s0) ## 0000008A /* 01268 809B9548 920E02BC */ lbu $t6, 0x02BC($s0) ## 000002BC /* 0126C 809B954C 31CF0002 */ andi $t7, $t6, 0x0002 ## $t7 = 00000000 -/* 01270 809B9550 51E00020 */ beql $t7, $zero, .L809B95D4 +/* 01270 809B9550 51E00020 */ beql $t7, $zero, .L809B95D4 /* 01274 809B9554 3C0140C0 */ lui $at, 0x40C0 ## $at = 40C00000 /* 01278 809B9558 8618008A */ lh $t8, 0x008A($s0) ## 0000008A .L809B955C: /* 0127C 809B955C 34018000 */ ori $at, $zero, 0x8000 ## $at = 00008000 /* 01280 809B9560 24024000 */ addiu $v0, $zero, 0x4000 ## $v0 = 00004000 -/* 01284 809B9564 0301C821 */ addu $t9, $t8, $at -/* 01288 809B9568 10600003 */ beq $v1, $zero, .L809B9578 +/* 01284 809B9564 0301C821 */ addu $t9, $t8, $at +/* 01288 809B9568 10600003 */ beq $v1, $zero, .L809B9578 /* 0128C 809B956C A619026E */ sh $t9, 0x026E($s0) ## 0000026E -/* 01290 809B9570 1000000E */ beq $zero, $zero, .L809B95AC +/* 01290 809B9570 1000000E */ beq $zero, $zero, .L809B95AC /* 01294 809B9574 24028000 */ addiu $v0, $zero, 0x8000 ## $v0 = FFFF8000 .L809B9578: /* 01298 809B9578 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 0129C 809B957C 240538CB */ addiu $a1, $zero, 0x38CB ## $a1 = 000038CB /* 012A0 809B9580 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 012A4 809B9584 A7A20046 */ sh $v0, 0x0046($sp) -/* 012A8 809B9588 8FAA0054 */ lw $t2, 0x0054($sp) + +/* 012A4 809B9584 A7A20046 */ sh $v0, 0x0046($sp) +/* 012A8 809B9588 8FAA0054 */ lw $t2, 0x0054($sp) /* 012AC 809B958C 3C0B0001 */ lui $t3, 0x0001 ## $t3 = 00010000 -/* 012B0 809B9590 87A20046 */ lh $v0, 0x0046($sp) -/* 012B4 809B9594 016A5821 */ addu $t3, $t3, $t2 +/* 012B0 809B9590 87A20046 */ lh $v0, 0x0046($sp) +/* 012B4 809B9594 016A5821 */ addu $t3, $t3, $t2 /* 012B8 809B9598 8D6B1DE4 */ lw $t3, 0x1DE4($t3) ## 00011DE4 /* 012BC 809B959C 316C0001 */ andi $t4, $t3, 0x0001 ## $t4 = 00000000 -/* 012C0 809B95A0 51800003 */ beql $t4, $zero, .L809B95B0 +/* 012C0 809B95A0 51800003 */ beql $t4, $zero, .L809B95B0 /* 012C4 809B95A4 860D008A */ lh $t5, 0x008A($s0) ## 0000008A /* 012C8 809B95A8 2402C000 */ addiu $v0, $zero, 0xC000 ## $v0 = FFFFC000 .L809B95AC: @@ -483,7 +483,7 @@ glabel func_809B8EF4 .L809B95B0: /* 012D0 809B95B0 920F02BD */ lbu $t7, 0x02BD($s0) ## 000002BD /* 012D4 809B95B4 921902BC */ lbu $t9, 0x02BC($s0) ## 000002BC -/* 012D8 809B95B8 01A27021 */ addu $t6, $t5, $v0 +/* 012D8 809B95B8 01A27021 */ addu $t6, $t5, $v0 /* 012DC 809B95BC 31F8FFFD */ andi $t8, $t7, 0xFFFD ## $t8 = 00000000 /* 012E0 809B95C0 332AFFFD */ andi $t2, $t9, 0xFFFD ## $t2 = 00000000 /* 012E4 809B95C4 A60E0032 */ sh $t6, 0x0032($s0) ## 00000032 @@ -493,84 +493,84 @@ glabel func_809B8EF4 .L809B95D4: /* 012F4 809B95D4 44819000 */ mtc1 $at, $f18 ## $f18 = 6.00 /* 012F8 809B95D8 C610027C */ lwc1 $f16, 0x027C($s0) ## 0000027C -/* 012FC 809B95DC 4610903E */ c.le.s $f18, $f16 +/* 012FC 809B95DC 4610903E */ c.le.s $f18, $f16 /* 01300 809B95E0 00000000 */ nop -/* 01304 809B95E4 45020020 */ bc1fl .L809B9668 +/* 01304 809B95E4 45020020 */ bc1fl .L809B9668 /* 01308 809B95E8 C6060164 */ lwc1 $f6, 0x0164($s0) ## 00000164 /* 0130C 809B95EC C6060164 */ lwc1 $f6, 0x0164($s0) ## 00000164 /* 01310 809B95F0 24010005 */ addiu $at, $zero, 0x0005 ## $at = 00000005 /* 01314 809B95F4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01318 809B95F8 4600310D */ trunc.w.s $f4, $f6 -/* 0131C 809B95FC 44022000 */ mfc1 $v0, $f4 +/* 01318 809B95F8 4600310D */ trunc.w.s $f4, $f6 +/* 0131C 809B95FC 44022000 */ mfc1 $v0, $f4 /* 01320 809B9600 00000000 */ nop -/* 01324 809B9604 10400003 */ beq $v0, $zero, .L809B9614 +/* 01324 809B9604 10400003 */ beq $v0, $zero, .L809B9614 /* 01328 809B9608 00000000 */ nop -/* 0132C 809B960C 54410009 */ bnel $v0, $at, .L809B9634 +/* 0132C 809B960C 54410009 */ bnel $v0, $at, .L809B9634 /* 01330 809B9610 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 .L809B9614: /* 01334 809B9614 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 01338 809B9618 240538C9 */ addiu $a1, $zero, 0x38C9 ## $a1 = 000038C9 /* 0133C 809B961C C6080164 */ lwc1 $f8, 0x0164($s0) ## 00000164 -/* 01340 809B9620 4600428D */ trunc.w.s $f10, $f8 -/* 01344 809B9624 44025000 */ mfc1 $v0, $f10 -/* 01348 809B9628 1000001C */ beq $zero, $zero, .L809B969C +/* 01340 809B9620 4600428D */ trunc.w.s $f10, $f8 +/* 01344 809B9624 44025000 */ mfc1 $v0, $f10 +/* 01348 809B9628 1000001C */ beq $zero, $zero, .L809B969C /* 0134C 809B962C 00000000 */ nop /* 01350 809B9630 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 .L809B9634: -/* 01354 809B9634 10410004 */ beq $v0, $at, .L809B9648 +/* 01354 809B9634 10410004 */ beq $v0, $at, .L809B9648 /* 01358 809B9638 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 0135C 809B963C 24010007 */ addiu $at, $zero, 0x0007 ## $at = 00000007 -/* 01360 809B9640 14410016 */ bne $v0, $at, .L809B969C +/* 01360 809B9640 14410016 */ bne $v0, $at, .L809B969C /* 01364 809B9644 00000000 */ nop .L809B9648: /* 01368 809B9648 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 0136C 809B964C 240538C8 */ addiu $a1, $zero, 0x38C8 ## $a1 = 000038C8 /* 01370 809B9650 C6100164 */ lwc1 $f16, 0x0164($s0) ## 00000164 -/* 01374 809B9654 4600848D */ trunc.w.s $f18, $f16 -/* 01378 809B9658 44029000 */ mfc1 $v0, $f18 -/* 0137C 809B965C 1000000F */ beq $zero, $zero, .L809B969C +/* 01374 809B9654 4600848D */ trunc.w.s $f18, $f16 +/* 01378 809B9658 44029000 */ mfc1 $v0, $f18 +/* 0137C 809B965C 1000000F */ beq $zero, $zero, .L809B969C /* 01380 809B9660 00000000 */ nop /* 01384 809B9664 C6060164 */ lwc1 $f6, 0x0164($s0) ## 00000164 .L809B9668: /* 01388 809B9668 24010005 */ addiu $at, $zero, 0x0005 ## $at = 00000005 /* 0138C 809B966C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01390 809B9670 4600310D */ trunc.w.s $f4, $f6 -/* 01394 809B9674 44022000 */ mfc1 $v0, $f4 +/* 01390 809B9670 4600310D */ trunc.w.s $f4, $f6 +/* 01394 809B9674 44022000 */ mfc1 $v0, $f4 /* 01398 809B9678 00000000 */ nop -/* 0139C 809B967C 14410007 */ bne $v0, $at, .L809B969C +/* 0139C 809B967C 14410007 */ bne $v0, $at, .L809B969C /* 013A0 809B9680 00000000 */ nop /* 013A4 809B9684 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 013A8 809B9688 240538C8 */ addiu $a1, $zero, 0x38C8 ## $a1 = 000038C8 /* 013AC 809B968C C6080164 */ lwc1 $f8, 0x0164($s0) ## 00000164 -/* 013B0 809B9690 4600428D */ trunc.w.s $f10, $f8 -/* 013B4 809B9694 44025000 */ mfc1 $v0, $f10 +/* 013B0 809B9690 4600428D */ trunc.w.s $f10, $f8 +/* 013B4 809B9694 44025000 */ mfc1 $v0, $f10 /* 013B8 809B9698 00000000 */ nop .L809B969C: -/* 013BC 809B969C 5440000D */ bnel $v0, $zero, .L809B96D4 +/* 013BC 809B969C 5440000D */ bnel $v0, $zero, .L809B96D4 /* 013C0 809B96A0 86180032 */ lh $t8, 0x0032($s0) ## 00000032 /* 013C4 809B96A4 0C03F66B */ jal Math_Rand_ZeroOne ## Rand.Next() float /* 013C8 809B96A8 00000000 */ nop /* 013CC 809B96AC 3C01809C */ lui $at, %hi(D_809BBC94) ## $at = 809C0000 -/* 013D0 809B96B0 C430BC94 */ lwc1 $f16, %lo(D_809BBC94)($at) +/* 013D0 809B96B0 C430BC94 */ lwc1 $f16, %lo(D_809BBC94)($at) /* 013D4 809B96B4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 013D8 809B96B8 4610003C */ c.lt.s $f0, $f16 +/* 013D8 809B96B8 4610003C */ c.lt.s $f0, $f16 /* 013DC 809B96BC 00000000 */ nop -/* 013E0 809B96C0 45020004 */ bc1fl .L809B96D4 +/* 013E0 809B96C0 45020004 */ bc1fl .L809B96D4 /* 013E4 809B96C4 86180032 */ lh $t8, 0x0032($s0) ## 00000032 /* 013E8 809B96C8 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 013EC 809B96CC 240538CA */ addiu $a1, $zero, 0x38CA ## $a1 = 000038CA /* 013F0 809B96D0 86180032 */ lh $t8, 0x0032($s0) ## 00000032 .L809B96D4: /* 013F4 809B96D4 A61800B6 */ sh $t8, 0x00B6($s0) ## 000000B6 -/* 013F8 809B96D8 8FBF0024 */ lw $ra, 0x0024($sp) -/* 013FC 809B96DC 8FB00020 */ lw $s0, 0x0020($sp) +/* 013F8 809B96D8 8FBF0024 */ lw $ra, 0x0024($sp) +/* 013FC 809B96DC 8FB00020 */ lw $s0, 0x0020($sp) /* 01400 809B96E0 27BD0050 */ addiu $sp, $sp, 0x0050 ## $sp = 00000000 -/* 01404 809B96E4 03E00008 */ jr $ra +/* 01404 809B96E4 03E00008 */ jr $ra /* 01408 809B96E8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bb/func_809B96EC.s b/asm/non_matchings/overlays/actors/ovl_En_Bb/func_809B96EC.s index d202869190..112448b5f4 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bb/func_809B96EC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bb/func_809B96EC.s @@ -1,13 +1,13 @@ glabel func_809B96EC /* 0140C 809B96EC 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 01410 809B96F0 AFBF0014 */ sw $ra, 0x0014($sp) +/* 01410 809B96F0 AFBF0014 */ sw $ra, 0x0014($sp) /* 01414 809B96F4 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 /* 01418 809B96F8 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 0141C 809B96FC 24A50444 */ addiu $a1, $a1, 0x0444 ## $a1 = 06000444 -/* 01420 809B9700 AFA60018 */ sw $a2, 0x0018($sp) -/* 01424 809B9704 0C0294BE */ jal func_800A52F8 +/* 01420 809B9700 AFA60018 */ sw $a2, 0x0018($sp) +/* 01424 809B9704 0C0294BE */ jal SkelAnime_ChangeAnimDefaultRepeat /* 01428 809B9708 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 0142C 809B970C 8FA40018 */ lw $a0, 0x0018($sp) +/* 0142C 809B970C 8FA40018 */ lw $a0, 0x0018($sp) /* 01430 809B9710 3C014040 */ lui $at, 0x4040 ## $at = 40400000 /* 01434 809B9714 44812000 */ mtc1 $at, $f4 ## $f4 = 3.00 /* 01438 809B9718 94980088 */ lhu $t8, 0x0088($a0) ## 00000088 @@ -26,15 +26,15 @@ glabel func_809B96EC /* 0146C 809B974C E480028C */ swc1 $f0, 0x028C($a0) ## 0000028C /* 01470 809B9750 E4800288 */ swc1 $f0, 0x0288($a0) ## 00000288 /* 01474 809B9754 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 01478 809B9758 E486006C */ swc1 $f6, 0x006C($a0) ## 0000006C /* 0147C 809B975C 3C05809C */ lui $a1, %hi(func_809B977C) ## $a1 = 809C0000 -/* 01480 809B9760 8FA40018 */ lw $a0, 0x0018($sp) -/* 01484 809B9764 0C26E0B8 */ jal func_809B82E0 +/* 01480 809B9760 8FA40018 */ lw $a0, 0x0018($sp) +/* 01484 809B9764 0C26E0B8 */ jal func_809B82E0 /* 01488 809B9768 24A5977C */ addiu $a1, $a1, %lo(func_809B977C) ## $a1 = 809B977C -/* 0148C 809B976C 8FBF0014 */ lw $ra, 0x0014($sp) +/* 0148C 809B976C 8FBF0014 */ lw $ra, 0x0014($sp) /* 01490 809B9770 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 01494 809B9774 03E00008 */ jr $ra +/* 01494 809B9774 03E00008 */ jr $ra /* 01498 809B9778 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bb/func_809B9A54.s b/asm/non_matchings/overlays/actors/ovl_En_Bb/func_809B9A54.s index 723a3c468f..51892fb5a1 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bb/func_809B9A54.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bb/func_809B9A54.s @@ -1,20 +1,20 @@ glabel func_809B9A54 /* 01774 809B9A54 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 01778 809B9A58 AFA40018 */ sw $a0, 0x0018($sp) +/* 01778 809B9A58 AFA40018 */ sw $a0, 0x0018($sp) /* 0177C 809B9A5C 00A03025 */ or $a2, $a1, $zero ## $a2 = 00000000 /* 01780 809B9A60 24A4014C */ addiu $a0, $a1, 0x014C ## $a0 = 0000014C -/* 01784 809B9A64 AFBF0014 */ sw $ra, 0x0014($sp) +/* 01784 809B9A64 AFBF0014 */ sw $ra, 0x0014($sp) /* 01788 809B9A68 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 0178C 809B9A6C 24A50184 */ addiu $a1, $a1, 0x0184 ## $a1 = 06000184 -/* 01790 809B9A70 0C0294BE */ jal func_800A52F8 -/* 01794 809B9A74 AFA6001C */ sw $a2, 0x001C($sp) -/* 01798 809B9A78 8FA6001C */ lw $a2, 0x001C($sp) +/* 01790 809B9A70 0C0294BE */ jal SkelAnime_ChangeAnimDefaultRepeat +/* 01794 809B9A74 AFA6001C */ sw $a2, 0x001C($sp) +/* 01798 809B9A78 8FA6001C */ lw $a2, 0x001C($sp) /* 0179C 809B9A7C 24010003 */ addiu $at, $zero, 0x0003 ## $at = 00000003 /* 017A0 809B9A80 3C05809C */ lui $a1, %hi(func_809B9B64) ## $a1 = 809C0000 /* 017A4 809B9A84 8CCE0250 */ lw $t6, 0x0250($a2) ## 00000250 /* 017A8 809B9A88 24080004 */ addiu $t0, $zero, 0x0004 ## $t0 = 00000004 /* 017AC 809B9A8C 24A59B64 */ addiu $a1, $a1, %lo(func_809B9B64) ## $a1 = 809B9B64 -/* 017B0 809B9A90 15C10012 */ bne $t6, $at, .L809B9ADC +/* 017B0 809B9A90 15C10012 */ bne $t6, $at, .L809B9ADC /* 017B4 809B9A94 00C02025 */ or $a0, $a2, $zero ## $a0 = 00000000 /* 017B8 809B9A98 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 /* 017BC 809B9A9C 44812000 */ mtc1 $at, $f4 ## $f4 = 5.00 @@ -31,7 +31,7 @@ glabel func_809B9A54 /* 017E8 809B9AC8 A4D90088 */ sh $t9, 0x0088($a2) ## 00000088 /* 017EC 809B9ACC E4C40068 */ swc1 $f4, 0x0068($a2) ## 00000068 /* 017F0 809B9AD0 E4C6006C */ swc1 $f6, 0x006C($a2) ## 0000006C -/* 017F4 809B9AD4 1000001C */ beq $zero, $zero, .L809B9B48 +/* 017F4 809B9AD4 1000001C */ beq $zero, $zero, .L809B9B48 /* 017F8 809B9AD8 E4C80060 */ swc1 $f8, 0x0060($a2) ## 00000060 .L809B9ADC: /* 017FC 809B9ADC 3C0142A0 */ lui $at, 0x42A0 ## $at = 42A00000 @@ -39,7 +39,7 @@ glabel func_809B9A54 /* 01804 809B9AE4 C4CA0028 */ lwc1 $f10, 0x0028($a2) ## 00000028 /* 01808 809B9AE8 8CCB0024 */ lw $t3, 0x0024($a2) ## 00000024 /* 0180C 809B9AEC 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 01810 809B9AF0 46105481 */ sub.s $f18, $f10, $f16 +/* 01810 809B9AF0 46105481 */ sub.s $f18, $f10, $f16 /* 01814 809B9AF4 94CC0088 */ lhu $t4, 0x0088($a2) ## 00000088 /* 01818 809B9AF8 8CCE0004 */ lw $t6, 0x0004($a2) ## 00000004 /* 0181C 809B9AFC ACCB0008 */ sw $t3, 0x0008($a2) ## 00000008 @@ -49,7 +49,7 @@ glabel func_809B9A54 /* 0182C 809B9B0C 2401FFFE */ addiu $at, $zero, 0xFFFE ## $at = FFFFFFFE /* 01830 809B9B10 24090002 */ addiu $t1, $zero, 0x0002 ## $t1 = 00000002 /* 01834 809B9B14 318DFFFE */ andi $t5, $t4, 0xFFFE ## $t5 = 00000000 -/* 01838 809B9B18 01C17824 */ and $t7, $t6, $at +/* 01838 809B9B18 01C17824 */ and $t7, $t6, $at /* 0183C 809B9B1C A0C800AF */ sb $t0, 0x00AF($a2) ## 000000AF /* 01840 809B9B20 ACC00260 */ sw $zero, 0x0260($a2) ## 00000260 /* 01844 809B9B24 A4C00268 */ sh $zero, 0x0268($a2) ## 00000268 @@ -63,11 +63,11 @@ glabel func_809B9A54 /* 01864 809B9B44 ACCB0010 */ sw $t3, 0x0010($a2) ## 00000010 .L809B9B48: /* 01868 809B9B48 24180007 */ addiu $t8, $zero, 0x0007 ## $t8 = 00000007 -/* 0186C 809B9B4C 0C26E0B8 */ jal func_809B82E0 +/* 0186C 809B9B4C 0C26E0B8 */ jal func_809B82E0 /* 01870 809B9B50 ACD80250 */ sw $t8, 0x0250($a2) ## 00000250 -/* 01874 809B9B54 8FBF0014 */ lw $ra, 0x0014($sp) +/* 01874 809B9B54 8FBF0014 */ lw $ra, 0x0014($sp) /* 01878 809B9B58 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 0187C 809B9B5C 03E00008 */ jr $ra +/* 0187C 809B9B5C 03E00008 */ jr $ra /* 01880 809B9B60 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bb/func_809BA028.s b/asm/non_matchings/overlays/actors/ovl_En_Bb/func_809BA028.s index 4bd1bd40fd..e083b6b496 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bb/func_809BA028.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bb/func_809BA028.s @@ -1,20 +1,20 @@ glabel func_809BA028 /* 01D48 809BA028 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 01D4C 809BA02C AFA40018 */ sw $a0, 0x0018($sp) +/* 01D4C 809BA02C AFA40018 */ sw $a0, 0x0018($sp) /* 01D50 809BA030 00A03025 */ or $a2, $a1, $zero ## $a2 = 00000000 /* 01D54 809BA034 24A4014C */ addiu $a0, $a1, 0x014C ## $a0 = 0000014C -/* 01D58 809BA038 AFBF0014 */ sw $ra, 0x0014($sp) +/* 01D58 809BA038 AFBF0014 */ sw $ra, 0x0014($sp) /* 01D5C 809BA03C 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 01D60 809BA040 24A50444 */ addiu $a1, $a1, 0x0444 ## $a1 = 06000444 -/* 01D64 809BA044 0C0294BE */ jal func_800A52F8 -/* 01D68 809BA048 AFA6001C */ sw $a2, 0x001C($sp) -/* 01D6C 809BA04C 8FA6001C */ lw $a2, 0x001C($sp) +/* 01D64 809BA044 0C0294BE */ jal SkelAnime_ChangeAnimDefaultRepeat +/* 01D68 809BA048 AFA6001C */ sw $a2, 0x001C($sp) +/* 01D6C 809BA04C 8FA6001C */ lw $a2, 0x001C($sp) /* 01D70 809BA050 3C014270 */ lui $at, 0x4270 ## $at = 42700000 /* 01D74 809BA054 44814000 */ mtc1 $at, $f8 ## $f8 = 60.00 /* 01D78 809BA058 C4C60028 */ lwc1 $f6, 0x0028($a2) ## 00000028 /* 01D7C 809BA05C 3C0142C8 */ lui $at, 0x42C8 ## $at = 42C80000 /* 01D80 809BA060 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 -/* 01D84 809BA064 46083280 */ add.s $f10, $f6, $f8 +/* 01D84 809BA064 46083280 */ add.s $f10, $f6, $f8 /* 01D88 809BA068 44818000 */ mtc1 $at, $f16 ## $f16 = 100.00 /* 01D8C 809BA06C 240E0008 */ addiu $t6, $zero, 0x0008 ## $t6 = 00000008 /* 01D90 809BA070 ACCE0250 */ sw $t6, 0x0250($a2) ## 00000250 @@ -28,21 +28,21 @@ glabel func_809BA028 /* 01DAC 809BA08C 44819000 */ mtc1 $at, $f18 ## $f18 = 30.00 /* 01DB0 809BA090 3C014220 */ lui $at, 0x4220 ## $at = 42200000 /* 01DB4 809BA094 44813000 */ mtc1 $at, $f6 ## $f6 = 40.00 -/* 01DB8 809BA098 46120102 */ mul.s $f4, $f0, $f18 -/* 01DBC 809BA09C 8FA4001C */ lw $a0, 0x001C($sp) +/* 01DB8 809BA098 46120102 */ mul.s $f4, $f0, $f18 +/* 01DBC 809BA09C 8FA4001C */ lw $a0, 0x001C($sp) /* 01DC0 809BA0A0 3C0140E0 */ lui $at, 0x40E0 ## $at = 40E00000 /* 01DC4 809BA0A4 44818000 */ mtc1 $at, $f16 ## $f16 = 7.00 /* 01DC8 809BA0A8 3C05809C */ lui $a1, %hi(func_809BA0D8) ## $a1 = 809C0000 /* 01DCC 809BA0AC 24A5A0D8 */ addiu $a1, $a1, %lo(func_809BA0D8) ## $a1 = 809BA0D8 /* 01DD0 809BA0B0 E490027C */ swc1 $f16, 0x027C($a0) ## 0000027C -/* 01DD4 809BA0B4 46062200 */ add.s $f8, $f4, $f6 -/* 01DD8 809BA0B8 4600428D */ trunc.w.s $f10, $f8 -/* 01DDC 809BA0BC 44185000 */ mfc1 $t8, $f10 -/* 01DE0 809BA0C0 0C26E0B8 */ jal func_809B82E0 +/* 01DD4 809BA0B4 46062200 */ add.s $f8, $f4, $f6 +/* 01DD8 809BA0B8 4600428D */ trunc.w.s $f10, $f8 +/* 01DDC 809BA0BC 44185000 */ mfc1 $t8, $f10 +/* 01DE0 809BA0C0 0C26E0B8 */ jal func_809B82E0 /* 01DE4 809BA0C4 AC980260 */ sw $t8, 0x0260($a0) ## 00000260 -/* 01DE8 809BA0C8 8FBF0014 */ lw $ra, 0x0014($sp) +/* 01DE8 809BA0C8 8FBF0014 */ lw $ra, 0x0014($sp) /* 01DEC 809BA0CC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 01DF0 809BA0D0 03E00008 */ jr $ra +/* 01DF0 809BA0D0 03E00008 */ jr $ra /* 01DF4 809BA0D4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bb/func_809BA0D8.s b/asm/non_matchings/overlays/actors/ovl_En_Bb/func_809BA0D8.s index e57cee7b08..86ba21423f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bb/func_809BA0D8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bb/func_809BA0D8.s @@ -1,136 +1,136 @@ glabel func_809BA0D8 /* 01DF8 809BA0D8 27BDFFB0 */ addiu $sp, $sp, 0xFFB0 ## $sp = FFFFFFB0 -/* 01DFC 809BA0DC AFBF0024 */ sw $ra, 0x0024($sp) -/* 01E00 809BA0E0 AFB00020 */ sw $s0, 0x0020($sp) -/* 01E04 809BA0E4 AFA50054 */ sw $a1, 0x0054($sp) +/* 01DFC 809BA0DC AFBF0024 */ sw $ra, 0x0024($sp) +/* 01E00 809BA0E0 AFB00020 */ sw $s0, 0x0020($sp) +/* 01E04 809BA0E4 AFA50054 */ sw $a1, 0x0054($sp) /* 01E08 809BA0E8 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 /* 01E0C 809BA0EC C4840068 */ lwc1 $f4, 0x0068($a0) ## 00000068 /* 01E10 809BA0F0 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 01E14 809BA0F4 26050290 */ addiu $a1, $s0, 0x0290 ## $a1 = 00000290 -/* 01E18 809BA0F8 46040032 */ c.eq.s $f0, $f4 +/* 01E18 809BA0F8 46040032 */ c.eq.s $f0, $f4 /* 01E1C 809BA0FC 24840024 */ addiu $a0, $a0, 0x0024 ## $a0 = 00000024 /* 01E20 809BA100 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 01E24 809BA104 3C073F00 */ lui $a3, 0x3F00 ## $a3 = 3F000000 -/* 01E28 809BA108 45020098 */ bc1fl .L809BA36C -/* 01E2C 809BA10C 44050000 */ mfc1 $a1, $f0 +/* 01E28 809BA108 45020098 */ bc1fl .L809BA36C +/* 01E2C 809BA10C 44050000 */ mfc1 $a1, $f0 /* 01E30 809BA110 0C01E027 */ jal Math_Vec3f_Pitch - -/* 01E34 809BA114 AFA4002C */ sw $a0, 0x002C($sp) -/* 01E38 809BA118 00022400 */ sll $a0, $v0, 16 -/* 01E3C 809BA11C A7A20042 */ sh $v0, 0x0042($sp) + +/* 01E34 809BA114 AFA4002C */ sw $a0, 0x002C($sp) +/* 01E38 809BA118 00022400 */ sll $a0, $v0, 16 +/* 01E3C 809BA11C A7A20042 */ sh $v0, 0x0042($sp) /* 01E40 809BA120 0C01DE1C */ jal Math_Sins ## sins? -/* 01E44 809BA124 00042403 */ sra $a0, $a0, 16 +/* 01E44 809BA124 00042403 */ sra $a0, $a0, 16 /* 01E48 809BA128 C606027C */ lwc1 $f6, 0x027C($s0) ## 0000027C -/* 01E4C 809BA12C 87A40042 */ lh $a0, 0x0042($sp) -/* 01E50 809BA130 46060202 */ mul.s $f8, $f0, $f6 +/* 01E4C 809BA12C 87A40042 */ lh $a0, 0x0042($sp) +/* 01E50 809BA130 46060202 */ mul.s $f8, $f0, $f6 /* 01E54 809BA134 0C01DE0D */ jal Math_Coss ## coss? -/* 01E58 809BA138 E7A8003C */ swc1 $f8, 0x003C($sp) +/* 01E58 809BA138 E7A8003C */ swc1 $f8, 0x003C($sp) /* 01E5C 809BA13C C60A027C */ lwc1 $f10, 0x027C($s0) ## 0000027C -/* 01E60 809BA140 460A0402 */ mul.s $f16, $f0, $f10 -/* 01E64 809BA144 E7B00038 */ swc1 $f16, 0x0038($sp) +/* 01E60 809BA140 460A0402 */ mul.s $f16, $f0, $f10 +/* 01E64 809BA144 E7B00038 */ swc1 $f16, 0x0038($sp) /* 01E68 809BA148 0C01DE1C */ jal Math_Sins ## sins? /* 01E6C 809BA14C 860400B6 */ lh $a0, 0x00B6($s0) ## 000000B6 -/* 01E70 809BA150 C7B20038 */ lwc1 $f18, 0x0038($sp) +/* 01E70 809BA150 C7B20038 */ lwc1 $f18, 0x0038($sp) /* 01E74 809BA154 860400B6 */ lh $a0, 0x00B6($s0) ## 000000B6 -/* 01E78 809BA158 46120082 */ mul.s $f2, $f0, $f18 +/* 01E78 809BA158 46120082 */ mul.s $f2, $f0, $f18 /* 01E7C 809BA15C 0C01DE0D */ jal Math_Coss ## coss? -/* 01E80 809BA160 E7A20048 */ swc1 $f2, 0x0048($sp) -/* 01E84 809BA164 C7A20048 */ lwc1 $f2, 0x0048($sp) +/* 01E80 809BA160 E7A20048 */ swc1 $f2, 0x0048($sp) +/* 01E84 809BA164 C7A20048 */ lwc1 $f2, 0x0048($sp) /* 01E88 809BA168 44803000 */ mtc1 $zero, $f6 ## $f6 = 0.00 -/* 01E8C 809BA16C C7A40038 */ lwc1 $f4, 0x0038($sp) +/* 01E8C 809BA16C C7A40038 */ lwc1 $f4, 0x0038($sp) /* 01E90 809BA170 44804000 */ mtc1 $zero, $f8 ## $f8 = 0.00 -/* 01E94 809BA174 4602303E */ c.le.s $f6, $f2 -/* 01E98 809BA178 46040302 */ mul.s $f12, $f0, $f4 -/* 01E9C 809BA17C 8FA4002C */ lw $a0, 0x002C($sp) +/* 01E94 809BA174 4602303E */ c.le.s $f6, $f2 +/* 01E98 809BA178 46040302 */ mul.s $f12, $f0, $f4 +/* 01E9C 809BA17C 8FA4002C */ lw $a0, 0x002C($sp) /* 01EA0 809BA180 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 01EA4 809BA184 45020004 */ bc1fl .L809BA198 -/* 01EA8 809BA188 46001007 */ neg.s $f0, $f2 -/* 01EAC 809BA18C 10000002 */ beq $zero, $zero, .L809BA198 -/* 01EB0 809BA190 46001006 */ mov.s $f0, $f2 -/* 01EB4 809BA194 46001007 */ neg.s $f0, $f2 +/* 01EA4 809BA184 45020004 */ bc1fl .L809BA198 +/* 01EA8 809BA188 46001007 */ neg.s $f0, $f2 +/* 01EAC 809BA18C 10000002 */ beq $zero, $zero, .L809BA198 +/* 01EB0 809BA190 46001006 */ mov.s $f0, $f2 +/* 01EB4 809BA194 46001007 */ neg.s $f0, $f2 .L809BA198: /* 01EB8 809BA198 8E050290 */ lw $a1, 0x0290($s0) ## 00000290 -/* 01EBC 809BA19C 44070000 */ mfc1 $a3, $f0 -/* 01EC0 809BA1A0 E7AC0044 */ swc1 $f12, 0x0044($sp) +/* 01EBC 809BA19C 44070000 */ mfc1 $a3, $f0 +/* 01EC0 809BA1A0 E7AC0044 */ swc1 $f12, 0x0044($sp) /* 01EC4 809BA1A4 0C01E0C4 */ jal Math_SmoothScaleMaxMinF - -/* 01EC8 809BA1A8 E7A80010 */ swc1 $f8, 0x0010($sp) -/* 01ECC 809BA1AC C7AE003C */ lwc1 $f14, 0x003C($sp) + +/* 01EC8 809BA1A8 E7A80010 */ swc1 $f8, 0x0010($sp) +/* 01ECC 809BA1AC C7AE003C */ lwc1 $f14, 0x003C($sp) /* 01ED0 809BA1B0 44805000 */ mtc1 $zero, $f10 ## $f10 = 0.00 /* 01ED4 809BA1B4 44808000 */ mtc1 $zero, $f16 ## $f16 = 0.00 -/* 01ED8 809BA1B8 C7AC0044 */ lwc1 $f12, 0x0044($sp) -/* 01EDC 809BA1BC 460E503E */ c.le.s $f10, $f14 -/* 01EE0 809BA1C0 46000086 */ mov.s $f2, $f0 +/* 01ED8 809BA1B8 C7AC0044 */ lwc1 $f12, 0x0044($sp) +/* 01EDC 809BA1BC 460E503E */ c.le.s $f10, $f14 +/* 01EE0 809BA1C0 46000086 */ mov.s $f2, $f0 /* 01EE4 809BA1C4 26040028 */ addiu $a0, $s0, 0x0028 ## $a0 = 00000028 /* 01EE8 809BA1C8 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 01EEC 809BA1CC 45020004 */ bc1fl .L809BA1E0 -/* 01EF0 809BA1D0 46007007 */ neg.s $f0, $f14 -/* 01EF4 809BA1D4 10000002 */ beq $zero, $zero, .L809BA1E0 -/* 01EF8 809BA1D8 46007006 */ mov.s $f0, $f14 -/* 01EFC 809BA1DC 46007007 */ neg.s $f0, $f14 +/* 01EEC 809BA1CC 45020004 */ bc1fl .L809BA1E0 +/* 01EF0 809BA1D0 46007007 */ neg.s $f0, $f14 +/* 01EF4 809BA1D4 10000002 */ beq $zero, $zero, .L809BA1E0 +/* 01EF8 809BA1D8 46007006 */ mov.s $f0, $f14 +/* 01EFC 809BA1DC 46007007 */ neg.s $f0, $f14 .L809BA1E0: /* 01F00 809BA1E0 8E050294 */ lw $a1, 0x0294($s0) ## 00000294 -/* 01F04 809BA1E4 44070000 */ mfc1 $a3, $f0 -/* 01F08 809BA1E8 E7AC0044 */ swc1 $f12, 0x0044($sp) -/* 01F0C 809BA1EC E7A2004C */ swc1 $f2, 0x004C($sp) +/* 01F04 809BA1E4 44070000 */ mfc1 $a3, $f0 +/* 01F08 809BA1E8 E7AC0044 */ swc1 $f12, 0x0044($sp) +/* 01F0C 809BA1EC E7A2004C */ swc1 $f2, 0x004C($sp) /* 01F10 809BA1F0 0C01E0C4 */ jal Math_SmoothScaleMaxMinF - -/* 01F14 809BA1F4 E7B00010 */ swc1 $f16, 0x0010($sp) -/* 01F18 809BA1F8 C7AC0044 */ lwc1 $f12, 0x0044($sp) + +/* 01F14 809BA1F4 E7B00010 */ swc1 $f16, 0x0010($sp) +/* 01F18 809BA1F8 C7AC0044 */ lwc1 $f12, 0x0044($sp) /* 01F1C 809BA1FC 44809000 */ mtc1 $zero, $f18 ## $f18 = 0.00 -/* 01F20 809BA200 C7A2004C */ lwc1 $f2, 0x004C($sp) +/* 01F20 809BA200 C7A2004C */ lwc1 $f2, 0x004C($sp) /* 01F24 809BA204 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 -/* 01F28 809BA208 460C903E */ c.le.s $f18, $f12 +/* 01F28 809BA208 460C903E */ c.le.s $f18, $f12 /* 01F2C 809BA20C 2604002C */ addiu $a0, $s0, 0x002C ## $a0 = 0000002C /* 01F30 809BA210 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 01F34 809BA214 46001080 */ add.s $f2, $f2, $f0 -/* 01F38 809BA218 45020004 */ bc1fl .L809BA22C -/* 01F3C 809BA21C 46006007 */ neg.s $f0, $f12 -/* 01F40 809BA220 10000002 */ beq $zero, $zero, .L809BA22C -/* 01F44 809BA224 46006006 */ mov.s $f0, $f12 -/* 01F48 809BA228 46006007 */ neg.s $f0, $f12 +/* 01F34 809BA214 46001080 */ add.s $f2, $f2, $f0 +/* 01F38 809BA218 45020004 */ bc1fl .L809BA22C +/* 01F3C 809BA21C 46006007 */ neg.s $f0, $f12 +/* 01F40 809BA220 10000002 */ beq $zero, $zero, .L809BA22C +/* 01F44 809BA224 46006006 */ mov.s $f0, $f12 +/* 01F48 809BA228 46006007 */ neg.s $f0, $f12 .L809BA22C: /* 01F4C 809BA22C 8E050298 */ lw $a1, 0x0298($s0) ## 00000298 -/* 01F50 809BA230 44070000 */ mfc1 $a3, $f0 -/* 01F54 809BA234 E7A2004C */ swc1 $f2, 0x004C($sp) +/* 01F50 809BA230 44070000 */ mfc1 $a3, $f0 +/* 01F54 809BA234 E7A2004C */ swc1 $f2, 0x004C($sp) /* 01F58 809BA238 0C01E0C4 */ jal Math_SmoothScaleMaxMinF - -/* 01F5C 809BA23C E7A40010 */ swc1 $f4, 0x0010($sp) -/* 01F60 809BA240 C7A2004C */ lwc1 $f2, 0x004C($sp) -/* 01F64 809BA244 46001080 */ add.s $f2, $f2, $f0 + +/* 01F5C 809BA23C E7A40010 */ swc1 $f4, 0x0010($sp) +/* 01F60 809BA240 C7A2004C */ lwc1 $f2, 0x004C($sp) +/* 01F64 809BA244 46001080 */ add.s $f2, $f2, $f0 /* 01F68 809BA248 0C03F66B */ jal Math_Rand_ZeroOne ## Rand.Next() float -/* 01F6C 809BA24C E7A2004C */ swc1 $f2, 0x004C($sp) +/* 01F6C 809BA24C E7A2004C */ swc1 $f2, 0x004C($sp) /* 01F70 809BA250 3C01809C */ lui $at, %hi(D_809BBCA4) ## $at = 809C0000 -/* 01F74 809BA254 C426BCA4 */ lwc1 $f6, %lo(D_809BBCA4)($at) +/* 01F74 809BA254 C426BCA4 */ lwc1 $f6, %lo(D_809BBCA4)($at) /* 01F78 809BA258 3C01809C */ lui $at, %hi(D_809BBCA8) ## $at = 809C0000 -/* 01F7C 809BA25C C428BCA8 */ lwc1 $f8, %lo(D_809BBCA8)($at) -/* 01F80 809BA260 C7A2004C */ lwc1 $f2, 0x004C($sp) +/* 01F7C 809BA25C C428BCA8 */ lwc1 $f8, %lo(D_809BBCA8)($at) +/* 01F80 809BA260 C7A2004C */ lwc1 $f2, 0x004C($sp) /* 01F84 809BA264 C6120274 */ lwc1 $f18, 0x0274($s0) ## 00000274 -/* 01F88 809BA268 46080282 */ mul.s $f10, $f0, $f8 +/* 01F88 809BA268 46080282 */ mul.s $f10, $f0, $f8 /* 01F8C 809BA26C 44804000 */ mtc1 $zero, $f8 ## $f8 = 0.00 /* 01F90 809BA270 3C014120 */ lui $at, 0x4120 ## $at = 41200000 -/* 01F94 809BA274 46081032 */ c.eq.s $f2, $f8 -/* 01F98 809BA278 460A3400 */ add.s $f16, $f6, $f10 -/* 01F9C 809BA27C 46109100 */ add.s $f4, $f18, $f16 -/* 01FA0 809BA280 45000028 */ bc1f .L809BA324 +/* 01F94 809BA274 46081032 */ c.eq.s $f2, $f8 +/* 01F98 809BA278 460A3400 */ add.s $f16, $f6, $f10 +/* 01F9C 809BA27C 46109100 */ add.s $f4, $f18, $f16 +/* 01FA0 809BA280 45000028 */ bc1f .L809BA324 /* 01FA4 809BA284 E6040274 */ swc1 $f4, 0x0274($s0) ## 00000274 /* 01FA8 809BA288 8E0E0260 */ lw $t6, 0x0260($s0) ## 00000260 /* 01FAC 809BA28C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 01FB0 809BA290 25CFFFFF */ addiu $t7, $t6, 0xFFFF ## $t7 = FFFFFFFF -/* 01FB4 809BA294 15E00015 */ bne $t7, $zero, .L809BA2EC +/* 01FB4 809BA294 15E00015 */ bne $t7, $zero, .L809BA2EC /* 01FB8 809BA298 AE0F0260 */ sw $t7, 0x0260($s0) ## 00000260 -/* 01FBC 809BA29C 0C26E7D8 */ jal func_809B9F60 -/* 01FC0 809BA2A0 8FA50054 */ lw $a1, 0x0054($sp) -/* 01FC4 809BA2A4 0C26E7CA */ jal func_809B9F28 +/* 01FBC 809BA29C 0C26E7D8 */ jal func_809B9F60 +/* 01FC0 809BA2A0 8FA50054 */ lw $a1, 0x0054($sp) +/* 01FC4 809BA2A4 0C26E7CA */ jal func_809B9F28 /* 01FC8 809BA2A8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 01FCC 809BA2AC 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 01FD0 809BA2B0 24A50184 */ addiu $a1, $a1, 0x0184 ## $a1 = 06000184 -/* 01FD4 809BA2B4 0C0294BE */ jal func_800A52F8 +/* 01FD4 809BA2B4 0C0294BE */ jal SkelAnime_ChangeAnimDefaultRepeat /* 01FD8 809BA2B8 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C /* 01FDC 809BA2BC 0C03F66B */ jal Math_Rand_ZeroOne ## Rand.Next() float @@ -139,19 +139,19 @@ glabel func_809BA0D8 /* 01FE8 809BA2C8 44813000 */ mtc1 $at, $f6 ## $f6 = 30.00 /* 01FEC 809BA2CC 3C014220 */ lui $at, 0x4220 ## $at = 42200000 /* 01FF0 809BA2D0 44819000 */ mtc1 $at, $f18 ## $f18 = 40.00 -/* 01FF4 809BA2D4 46060282 */ mul.s $f10, $f0, $f6 -/* 01FF8 809BA2D8 46125400 */ add.s $f16, $f10, $f18 -/* 01FFC 809BA2DC 4600810D */ trunc.w.s $f4, $f16 -/* 02000 809BA2E0 44082000 */ mfc1 $t0, $f4 -/* 02004 809BA2E4 1000000B */ beq $zero, $zero, .L809BA314 +/* 01FF4 809BA2D4 46060282 */ mul.s $f10, $f0, $f6 +/* 01FF8 809BA2D8 46125400 */ add.s $f16, $f10, $f18 +/* 01FFC 809BA2DC 4600810D */ trunc.w.s $f4, $f16 +/* 02000 809BA2E0 44082000 */ mfc1 $t0, $f4 +/* 02004 809BA2E4 1000000B */ beq $zero, $zero, .L809BA314 /* 02008 809BA2E8 AE080260 */ sw $t0, 0x0260($s0) ## 00000260 .L809BA2EC: /* 0200C 809BA2EC 8E09025C */ lw $t1, 0x025C($s0) ## 0000025C /* 02010 809BA2F0 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C /* 02014 809BA2F4 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 02018 809BA2F8 51200004 */ beql $t1, $zero, .L809BA30C +/* 02018 809BA2F8 51200004 */ beql $t1, $zero, .L809BA30C /* 0201C 809BA2FC 860A0032 */ lh $t2, 0x0032($s0) ## 00000032 -/* 02020 809BA300 0C0294BE */ jal func_800A52F8 +/* 02020 809BA300 0C0294BE */ jal SkelAnime_ChangeAnimDefaultRepeat /* 02024 809BA304 24A50444 */ addiu $a1, $a1, 0x0444 ## $a1 = 06000444 /* 02028 809BA308 860A0032 */ lh $t2, 0x0032($s0) ## 00000032 .L809BA30C: @@ -160,7 +160,7 @@ glabel func_809BA0D8 .L809BA314: /* 02034 809BA314 44804000 */ mtc1 $zero, $f8 ## $f8 = 0.00 /* 02038 809BA318 AE00025C */ sw $zero, 0x025C($s0) ## 0000025C -/* 0203C 809BA31C 10000005 */ beq $zero, $zero, .L809BA334 +/* 0203C 809BA31C 10000005 */ beq $zero, $zero, .L809BA334 /* 02040 809BA320 E608027C */ swc1 $f8, 0x027C($s0) ## 0000027C .L809BA324: /* 02044 809BA324 44813000 */ mtc1 $at, $f6 ## $f6 = 0.00 @@ -171,91 +171,91 @@ glabel func_809BA0D8 /* 02054 809BA334 920D02BC */ lbu $t5, 0x02BC($s0) ## 000002BC /* 02058 809BA338 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 0205C 809BA33C 31AE0002 */ andi $t6, $t5, 0x0002 ## $t6 = 00000000 -/* 02060 809BA340 51C00007 */ beql $t6, $zero, .L809BA360 +/* 02060 809BA340 51C00007 */ beql $t6, $zero, .L809BA360 /* 02064 809BA344 86190032 */ lh $t9, 0x0032($s0) ## 00000032 /* 02068 809BA348 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 0206C 809BA34C 240538CB */ addiu $a1, $zero, 0x38CB ## $a1 = 000038CB /* 02070 809BA350 920F02BC */ lbu $t7, 0x02BC($s0) ## 000002BC /* 02074 809BA354 31F8FFFD */ andi $t8, $t7, 0xFFFD ## $t8 = 00000000 /* 02078 809BA358 A21802BC */ sb $t8, 0x02BC($s0) ## 000002BC /* 0207C 809BA35C 86190032 */ lh $t9, 0x0032($s0) ## 00000032 .L809BA360: -/* 02080 809BA360 1000000D */ beq $zero, $zero, .L809BA398 +/* 02080 809BA360 1000000D */ beq $zero, $zero, .L809BA398 /* 02084 809BA364 A61900B6 */ sh $t9, 0x00B6($s0) ## 000000B6 -/* 02088 809BA368 44050000 */ mfc1 $a1, $f0 +/* 02088 809BA368 44050000 */ mfc1 $a1, $f0 .L809BA36C: /* 0208C 809BA36C 26040068 */ addiu $a0, $s0, 0x0068 ## $a0 = 00000068 /* 02090 809BA370 0C01E0C4 */ jal Math_SmoothScaleMaxMinF - -/* 02094 809BA374 E7A00010 */ swc1 $f0, 0x0010($sp) + +/* 02094 809BA374 E7A00010 */ swc1 $f0, 0x0010($sp) /* 02098 809BA378 44805000 */ mtc1 $zero, $f10 ## $f10 = 0.00 /* 0209C 809BA37C 00000000 */ nop -/* 020A0 809BA380 460A0032 */ c.eq.s $f0, $f10 +/* 020A0 809BA380 460A0032 */ c.eq.s $f0, $f10 /* 020A4 809BA384 00000000 */ nop -/* 020A8 809BA388 45000003 */ bc1f .L809BA398 +/* 020A8 809BA388 45000003 */ bc1f .L809BA398 /* 020AC 809BA38C 00000000 */ nop -/* 020B0 809BA390 0C26E7CA */ jal func_809B9F28 +/* 020B0 809BA390 0C26E7CA */ jal func_809B9F28 /* 020B4 809BA394 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 .L809BA398: /* 020B8 809BA398 0C02927F */ jal SkelAnime_FrameUpdateMatrix - + /* 020BC 809BA39C 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C /* 020C0 809BA3A0 C6120164 */ lwc1 $f18, 0x0164($s0) ## 00000164 -/* 020C4 809BA3A4 4600940D */ trunc.w.s $f16, $f18 -/* 020C8 809BA3A8 44098000 */ mfc1 $t1, $f16 +/* 020C4 809BA3A4 4600940D */ trunc.w.s $f16, $f18 +/* 020C8 809BA3A8 44098000 */ mfc1 $t1, $f16 /* 020CC 809BA3AC 00000000 */ nop -/* 020D0 809BA3B0 5520000D */ bnel $t1, $zero, .L809BA3E8 +/* 020D0 809BA3B0 5520000D */ bnel $t1, $zero, .L809BA3E8 /* 020D4 809BA3B4 C6080164 */ lwc1 $f8, 0x0164($s0) ## 00000164 /* 020D8 809BA3B8 0C03F66B */ jal Math_Rand_ZeroOne ## Rand.Next() float /* 020DC 809BA3BC 00000000 */ nop /* 020E0 809BA3C0 3C01809C */ lui $at, %hi(D_809BBCAC) ## $at = 809C0000 -/* 020E4 809BA3C4 C424BCAC */ lwc1 $f4, %lo(D_809BBCAC)($at) +/* 020E4 809BA3C4 C424BCAC */ lwc1 $f4, %lo(D_809BBCAC)($at) /* 020E8 809BA3C8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 020EC 809BA3CC 4604003E */ c.le.s $f0, $f4 +/* 020EC 809BA3CC 4604003E */ c.le.s $f0, $f4 /* 020F0 809BA3D0 00000000 */ nop -/* 020F4 809BA3D4 45020004 */ bc1fl .L809BA3E8 +/* 020F4 809BA3D4 45020004 */ bc1fl .L809BA3E8 /* 020F8 809BA3D8 C6080164 */ lwc1 $f8, 0x0164($s0) ## 00000164 /* 020FC 809BA3DC 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 02100 809BA3E0 240538CA */ addiu $a1, $zero, 0x38CA ## $a1 = 000038CA /* 02104 809BA3E4 C6080164 */ lwc1 $f8, 0x0164($s0) ## 00000164 .L809BA3E8: /* 02108 809BA3E8 44805000 */ mtc1 $zero, $f10 ## $f10 = 0.00 /* 0210C 809BA3EC C612027C */ lwc1 $f18, 0x027C($s0) ## 0000027C -/* 02110 809BA3F0 4600418D */ trunc.w.s $f6, $f8 -/* 02114 809BA3F4 46125032 */ c.eq.s $f10, $f18 -/* 02118 809BA3F8 44023000 */ mfc1 $v0, $f6 -/* 0211C 809BA3FC 4503000A */ bc1tl .L809BA428 +/* 02110 809BA3F0 4600418D */ trunc.w.s $f6, $f8 +/* 02114 809BA3F4 46125032 */ c.eq.s $f10, $f18 +/* 02118 809BA3F8 44023000 */ mfc1 $v0, $f6 +/* 0211C 809BA3FC 4503000A */ bc1tl .L809BA428 /* 02120 809BA400 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 02124 809BA404 10400002 */ beq $v0, $zero, .L809BA410 +/* 02124 809BA404 10400002 */ beq $v0, $zero, .L809BA410 /* 02128 809BA408 24010005 */ addiu $at, $zero, 0x0005 ## $at = 00000005 -/* 0212C 809BA40C 14410005 */ bne $v0, $at, .L809BA424 +/* 0212C 809BA40C 14410005 */ bne $v0, $at, .L809BA424 .L809BA410: /* 02130 809BA410 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 02134 809BA414 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 02138 809BA418 240538C9 */ addiu $a1, $zero, 0x38C9 ## $a1 = 000038C9 -/* 0213C 809BA41C 1000000A */ beq $zero, $zero, .L809BA448 -/* 02140 809BA420 8FBF0024 */ lw $ra, 0x0024($sp) +/* 0213C 809BA41C 1000000A */ beq $zero, $zero, .L809BA448 +/* 02140 809BA420 8FBF0024 */ lw $ra, 0x0024($sp) .L809BA424: /* 02144 809BA424 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 .L809BA428: -/* 02148 809BA428 10410004 */ beq $v0, $at, .L809BA43C +/* 02148 809BA428 10410004 */ beq $v0, $at, .L809BA43C /* 0214C 809BA42C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 02150 809BA430 24010007 */ addiu $at, $zero, 0x0007 ## $at = 00000007 -/* 02154 809BA434 54410004 */ bnel $v0, $at, .L809BA448 -/* 02158 809BA438 8FBF0024 */ lw $ra, 0x0024($sp) +/* 02154 809BA434 54410004 */ bnel $v0, $at, .L809BA448 +/* 02158 809BA438 8FBF0024 */ lw $ra, 0x0024($sp) .L809BA43C: /* 0215C 809BA43C 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 02160 809BA440 240538C8 */ addiu $a1, $zero, 0x38C8 ## $a1 = 000038C8 -/* 02164 809BA444 8FBF0024 */ lw $ra, 0x0024($sp) +/* 02164 809BA444 8FBF0024 */ lw $ra, 0x0024($sp) .L809BA448: -/* 02168 809BA448 8FB00020 */ lw $s0, 0x0020($sp) +/* 02168 809BA448 8FB00020 */ lw $s0, 0x0020($sp) /* 0216C 809BA44C 27BD0050 */ addiu $sp, $sp, 0x0050 ## $sp = 00000000 -/* 02170 809BA450 03E00008 */ jr $ra +/* 02170 809BA450 03E00008 */ jr $ra /* 02174 809BA454 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bb/func_809BA458.s b/asm/non_matchings/overlays/actors/ovl_En_Bb/func_809BA458.s index b1d2c24feb..6ce202d346 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bb/func_809BA458.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bb/func_809BA458.s @@ -1,9 +1,9 @@ glabel func_809BA458 /* 02178 809BA458 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 /* 0217C 809BA45C 3C0F809C */ lui $t7, %hi(D_809BBB50) ## $t7 = 809C0000 -/* 02180 809BA460 AFBF001C */ sw $ra, 0x001C($sp) -/* 02184 809BA464 AFB00018 */ sw $s0, 0x0018($sp) -/* 02188 809BA468 AFA50034 */ sw $a1, 0x0034($sp) +/* 02180 809BA460 AFBF001C */ sw $ra, 0x001C($sp) +/* 02184 809BA464 AFB00018 */ sw $s0, 0x0018($sp) +/* 02188 809BA468 AFA50034 */ sw $a1, 0x0034($sp) /* 0218C 809BA46C 25EFBB50 */ addiu $t7, $t7, %lo(D_809BBB50) ## $t7 = 809BBB50 /* 02190 809BA470 8DF90000 */ lw $t9, 0x0000($t7) ## 809BBB50 /* 02194 809BA474 27AE0024 */ addiu $t6, $sp, 0x0024 ## $t6 = FFFFFFF4 @@ -15,7 +15,7 @@ glabel func_809BA458 /* 021AC 809BA48C 24A50444 */ addiu $a1, $a1, 0x0444 ## $a1 = 06000444 /* 021B0 809BA490 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C /* 021B4 809BA494 ADD80004 */ sw $t8, 0x0004($t6) ## FFFFFFF8 -/* 021B8 809BA498 0C0294BE */ jal func_800A52F8 +/* 021B8 809BA498 0C0294BE */ jal SkelAnime_ChangeAnimDefaultRepeat /* 021BC 809BA49C ADD90008 */ sw $t9, 0x0008($t6) ## FFFFFFFC /* 021C0 809BA4A0 24080001 */ addiu $t0, $zero, 0x0001 ## $t0 = 00000001 /* 021C4 809BA4A4 AE08025C */ sw $t0, 0x025C($s0) ## 0000025C @@ -29,32 +29,32 @@ glabel func_809BA458 /* 021E0 809BA4C0 2401FFFB */ addiu $at, $zero, 0xFFFB ## $at = FFFFFFFB /* 021E4 809BA4C4 E6000274 */ swc1 $f0, 0x0274($s0) ## 00000274 /* 021E8 809BA4C8 A60900B4 */ sh $t1, 0x00B4($s0) ## 000000B4 -/* 021EC 809BA4CC 15610006 */ bne $t3, $at, .L809BA4E8 +/* 021EC 809BA4CC 15610006 */ bne $t3, $at, .L809BA4E8 /* 021F0 809BA4D0 A60A00B6 */ sh $t2, 0x00B6($s0) ## 000000B6 /* 021F4 809BA4D4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 021F8 809BA4D8 0C26E7D8 */ jal func_809B9F60 -/* 021FC 809BA4DC 8FA50034 */ lw $a1, 0x0034($sp) -/* 02200 809BA4E0 0C26E7CA */ jal func_809B9F28 +/* 021F8 809BA4D8 0C26E7D8 */ jal func_809B9F60 +/* 021FC 809BA4DC 8FA50034 */ lw $a1, 0x0034($sp) +/* 02200 809BA4E0 0C26E7CA */ jal func_809B9F28 /* 02204 809BA4E4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 .L809BA4E8: /* 02208 809BA4E8 C60C0008 */ lwc1 $f12, 0x0008($s0) ## 00000008 /* 0220C 809BA4EC C60E000C */ lwc1 $f14, 0x000C($s0) ## 0000000C /* 02210 809BA4F0 8E060010 */ lw $a2, 0x0010($s0) ## 00000010 -/* 02214 809BA4F4 0C034261 */ jal Matrix_Translate +/* 02214 809BA4F4 0C034261 */ jal Matrix_Translate /* 02218 809BA4F8 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 /* 0221C 809BA4FC 86040030 */ lh $a0, 0x0030($s0) ## 00000030 /* 02220 809BA500 86050032 */ lh $a1, 0x0032($s0) ## 00000032 /* 02224 809BA504 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 02228 809BA508 0C034421 */ jal Matrix_RotateXYZ +/* 02228 809BA508 0C034421 */ jal Matrix_RotateZYX /* 0222C 809BA50C 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 /* 02230 809BA510 C60C0274 */ lwc1 $f12, 0x0274($s0) ## 00000274 -/* 02234 809BA514 0C0343B5 */ jal Matrix_RotateZ +/* 02234 809BA514 0C0343B5 */ jal Matrix_RotateZ /* 02238 809BA518 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 /* 0223C 809BA51C C6040278 */ lwc1 $f4, 0x0278($s0) ## 00000278 /* 02240 809BA520 27A40024 */ addiu $a0, $sp, 0x0024 ## $a0 = FFFFFFF4 /* 02244 809BA524 26050024 */ addiu $a1, $s0, 0x0024 ## $a1 = 00000024 -/* 02248 809BA528 0C0346BD */ jal Matrix_MultVec3f -/* 0224C 809BA52C E7A40028 */ swc1 $f4, 0x0028($sp) +/* 02248 809BA528 0C0346BD */ jal Matrix_MultVec3f +/* 0224C 809BA52C E7A40028 */ swc1 $f4, 0x0028($sp) /* 02250 809BA530 44803000 */ mtc1 $zero, $f6 ## $f6 = 0.00 /* 02254 809BA534 240C0009 */ addiu $t4, $zero, 0x0009 ## $t4 = 00000009 /* 02258 809BA538 AE000324 */ sw $zero, 0x0324($s0) ## 00000324 @@ -66,19 +66,19 @@ glabel func_809BA458 /* 0226C 809BA54C 44814000 */ mtc1 $at, $f8 ## $f8 = 30.00 /* 02270 809BA550 3C014334 */ lui $at, 0x4334 ## $at = 43340000 /* 02274 809BA554 44818000 */ mtc1 $at, $f16 ## $f16 = 180.00 -/* 02278 809BA558 46080282 */ mul.s $f10, $f0, $f8 +/* 02278 809BA558 46080282 */ mul.s $f10, $f0, $f8 /* 0227C 809BA55C 3C05809C */ lui $a1, %hi(func_809BA628) ## $a1 = 809C0000 /* 02280 809BA560 24A5A628 */ addiu $a1, $a1, %lo(func_809BA628) ## $a1 = 809BA628 /* 02284 809BA564 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02288 809BA568 46105480 */ add.s $f18, $f10, $f16 -/* 0228C 809BA56C 4600910D */ trunc.w.s $f4, $f18 -/* 02290 809BA570 440E2000 */ mfc1 $t6, $f4 -/* 02294 809BA574 0C26E0B8 */ jal func_809B82E0 +/* 02288 809BA568 46105480 */ add.s $f18, $f10, $f16 +/* 0228C 809BA56C 4600910D */ trunc.w.s $f4, $f18 +/* 02290 809BA570 440E2000 */ mfc1 $t6, $f4 +/* 02294 809BA574 0C26E0B8 */ jal func_809B82E0 /* 02298 809BA578 A60E026E */ sh $t6, 0x026E($s0) ## 0000026E -/* 0229C 809BA57C 8FBF001C */ lw $ra, 0x001C($sp) -/* 022A0 809BA580 8FB00018 */ lw $s0, 0x0018($sp) +/* 0229C 809BA57C 8FBF001C */ lw $ra, 0x001C($sp) +/* 022A0 809BA580 8FB00018 */ lw $s0, 0x0018($sp) /* 022A4 809BA584 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 022A8 809BA588 03E00008 */ jr $ra +/* 022A8 809BA588 03E00008 */ jr $ra /* 022AC 809BA58C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bb/func_809BA590.s b/asm/non_matchings/overlays/actors/ovl_En_Bb/func_809BA590.s index 7d8638e81a..7e5c480e2a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bb/func_809BA590.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bb/func_809BA590.s @@ -1,13 +1,13 @@ glabel func_809BA590 /* 022B0 809BA590 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 022B4 809BA594 AFBF0014 */ sw $ra, 0x0014($sp) +/* 022B4 809BA594 AFBF0014 */ sw $ra, 0x0014($sp) /* 022B8 809BA598 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 /* 022BC 809BA59C 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 022C0 809BA5A0 24A50444 */ addiu $a1, $a1, 0x0444 ## $a1 = 06000444 -/* 022C4 809BA5A4 AFA60018 */ sw $a2, 0x0018($sp) -/* 022C8 809BA5A8 0C0294BE */ jal func_800A52F8 +/* 022C4 809BA5A4 AFA60018 */ sw $a2, 0x0018($sp) +/* 022C8 809BA5A8 0C0294BE */ jal SkelAnime_ChangeAnimDefaultRepeat /* 022CC 809BA5AC 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 022D0 809BA5B0 8FA60018 */ lw $a2, 0x0018($sp) +/* 022D0 809BA5B0 8FA60018 */ lw $a2, 0x0018($sp) /* 022D4 809BA5B4 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 /* 022D8 809BA5B8 240E0001 */ addiu $t6, $zero, 0x0001 ## $t6 = 00000001 /* 022DC 809BA5BC 240F0009 */ addiu $t7, $zero, 0x0009 ## $t7 = 00000009 @@ -22,21 +22,21 @@ glabel func_809BA590 /* 022FC 809BA5DC 44813000 */ mtc1 $at, $f6 ## $f6 = 30.00 /* 02300 809BA5E0 3C014334 */ lui $at, 0x4334 ## $at = 43340000 /* 02304 809BA5E4 44815000 */ mtc1 $at, $f10 ## $f10 = 180.00 -/* 02308 809BA5E8 46060202 */ mul.s $f8, $f0, $f6 -/* 0230C 809BA5EC 8FA40018 */ lw $a0, 0x0018($sp) +/* 02308 809BA5E8 46060202 */ mul.s $f8, $f0, $f6 +/* 0230C 809BA5EC 8FA40018 */ lw $a0, 0x0018($sp) /* 02310 809BA5F0 3C05809C */ lui $a1, %hi(func_809BA628) ## $a1 = 809C0000 /* 02314 809BA5F4 24A5A628 */ addiu $a1, $a1, %lo(func_809BA628) ## $a1 = 809BA628 /* 02318 809BA5F8 8488008A */ lh $t0, 0x008A($a0) ## 0000008A /* 0231C 809BA5FC A48000B8 */ sh $zero, 0x00B8($a0) ## 000000B8 -/* 02320 809BA600 460A4400 */ add.s $f16, $f8, $f10 +/* 02320 809BA600 460A4400 */ add.s $f16, $f8, $f10 /* 02324 809BA604 A48800B6 */ sh $t0, 0x00B6($a0) ## 000000B6 -/* 02328 809BA608 4600848D */ trunc.w.s $f18, $f16 -/* 0232C 809BA60C 44199000 */ mfc1 $t9, $f18 -/* 02330 809BA610 0C26E0B8 */ jal func_809B82E0 +/* 02328 809BA608 4600848D */ trunc.w.s $f18, $f16 +/* 0232C 809BA60C 44199000 */ mfc1 $t9, $f18 +/* 02330 809BA610 0C26E0B8 */ jal func_809B82E0 /* 02334 809BA614 A499026E */ sh $t9, 0x026E($a0) ## 0000026E -/* 02338 809BA618 8FBF0014 */ lw $ra, 0x0014($sp) +/* 02338 809BA618 8FBF0014 */ lw $ra, 0x0014($sp) /* 0233C 809BA61C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 02340 809BA620 03E00008 */ jr $ra +/* 02340 809BA620 03E00008 */ jr $ra /* 02344 809BA624 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bb/func_809BA628.s b/asm/non_matchings/overlays/actors/ovl_En_Bb/func_809BA628.s index dc18053715..7a62a7f6f5 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bb/func_809BA628.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bb/func_809BA628.s @@ -1,9 +1,9 @@ glabel func_809BA628 /* 02348 809BA628 27BDFF90 */ addiu $sp, $sp, 0xFF90 ## $sp = FFFFFF90 /* 0234C 809BA62C 3C18809C */ lui $t8, %hi(D_809BBB5C) ## $t8 = 809C0000 -/* 02350 809BA630 AFBF0024 */ sw $ra, 0x0024($sp) -/* 02354 809BA634 AFB00020 */ sw $s0, 0x0020($sp) -/* 02358 809BA638 AFA50074 */ sw $a1, 0x0074($sp) +/* 02350 809BA630 AFBF0024 */ sw $ra, 0x0024($sp) +/* 02354 809BA634 AFB00020 */ sw $s0, 0x0020($sp) +/* 02358 809BA638 AFA50074 */ sw $a1, 0x0074($sp) /* 0235C 809BA63C 2718BB5C */ addiu $t8, $t8, %lo(D_809BBB5C) ## $t8 = 809BBB5C /* 02360 809BA640 8F080000 */ lw $t0, 0x0000($t8) ## 809BBB5C /* 02364 809BA644 8CA21C44 */ lw $v0, 0x1C44($a1) ## 00001C44 @@ -24,141 +24,141 @@ glabel func_809BA628 /* 023A0 809BA680 AD2A0004 */ sw $t2, 0x0004($t1) ## FFFFFFE8 /* 023A4 809BA684 8C4B002C */ lw $t3, 0x002C($v0) ## 0000002C /* 023A8 809BA688 AD2B0008 */ sw $t3, 0x0008($t1) ## FFFFFFEC -/* 023AC 809BA68C C7A40058 */ lwc1 $f4, 0x0058($sp) -/* 023B0 809BA690 46062200 */ add.s $f8, $f4, $f6 -/* 023B4 809BA694 E7A80058 */ swc1 $f8, 0x0058($sp) +/* 023AC 809BA68C C7A40058 */ lwc1 $f4, 0x0058($sp) +/* 023B0 809BA690 46062200 */ add.s $f8, $f4, $f6 +/* 023B4 809BA694 E7A80058 */ swc1 $f8, 0x0058($sp) /* 023B8 809BA698 848C001C */ lh $t4, 0x001C($a0) ## 0000001C -/* 023BC 809BA69C 558100AD */ bnel $t4, $at, .L809BA954 +/* 023BC 809BA69C 558100AD */ bnel $t4, $at, .L809BA954 /* 023C0 809BA6A0 8605008A */ lh $a1, 0x008A($s0) ## 0000008A /* 023C4 809BA6A4 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 /* 023C8 809BA6A8 C48A0068 */ lwc1 $f10, 0x0068($a0) ## 00000068 /* 023CC 809BA6AC 24840008 */ addiu $a0, $a0, 0x0008 ## $a0 = 00000008 /* 023D0 809BA6B0 26050290 */ addiu $a1, $s0, 0x0290 ## $a1 = 00000290 -/* 023D4 809BA6B4 460A0032 */ c.eq.s $f0, $f10 +/* 023D4 809BA6B4 460A0032 */ c.eq.s $f0, $f10 /* 023D8 809BA6B8 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 023DC 809BA6BC 3C073F00 */ lui $a3, 0x3F00 ## $a3 = 3F000000 -/* 023E0 809BA6C0 45020095 */ bc1fl .L809BA918 -/* 023E4 809BA6C4 44050000 */ mfc1 $a1, $f0 -/* 023E8 809BA6C8 AFA4002C */ sw $a0, 0x002C($sp) +/* 023E0 809BA6C0 45020095 */ bc1fl .L809BA918 +/* 023E4 809BA6C4 44050000 */ mfc1 $a1, $f0 +/* 023E8 809BA6C8 AFA4002C */ sw $a0, 0x002C($sp) /* 023EC 809BA6CC 0C01E027 */ jal Math_Vec3f_Pitch - -/* 023F0 809BA6D0 AFA50028 */ sw $a1, 0x0028($sp) -/* 023F4 809BA6D4 8FA50028 */ lw $a1, 0x0028($sp) -/* 023F8 809BA6D8 A7A20052 */ sh $v0, 0x0052($sp) + +/* 023F0 809BA6D0 AFA50028 */ sw $a1, 0x0028($sp) +/* 023F4 809BA6D4 8FA50028 */ lw $a1, 0x0028($sp) +/* 023F8 809BA6D8 A7A20052 */ sh $v0, 0x0052($sp) /* 023FC 809BA6DC 0C01E01A */ jal Math_Vec3f_Yaw - -/* 02400 809BA6E0 8FA4002C */ lw $a0, 0x002C($sp) -/* 02404 809BA6E4 A7A20050 */ sh $v0, 0x0050($sp) + +/* 02400 809BA6E0 8FA4002C */ lw $a0, 0x002C($sp) +/* 02404 809BA6E4 A7A20050 */ sh $v0, 0x0050($sp) /* 02408 809BA6E8 0C01DE1C */ jal Math_Sins ## sins? -/* 0240C 809BA6EC 87A40052 */ lh $a0, 0x0052($sp) +/* 0240C 809BA6EC 87A40052 */ lh $a0, 0x0052($sp) /* 02410 809BA6F0 C610027C */ lwc1 $f16, 0x027C($s0) ## 0000027C -/* 02414 809BA6F4 87A40052 */ lh $a0, 0x0052($sp) -/* 02418 809BA6F8 46100482 */ mul.s $f18, $f0, $f16 +/* 02414 809BA6F4 87A40052 */ lh $a0, 0x0052($sp) +/* 02418 809BA6F8 46100482 */ mul.s $f18, $f0, $f16 /* 0241C 809BA6FC 0C01DE0D */ jal Math_Coss ## coss? -/* 02420 809BA700 E7B2004C */ swc1 $f18, 0x004C($sp) +/* 02420 809BA700 E7B2004C */ swc1 $f18, 0x004C($sp) /* 02424 809BA704 C604027C */ lwc1 $f4, 0x027C($s0) ## 0000027C -/* 02428 809BA708 AFA00010 */ sw $zero, 0x0010($sp) +/* 02428 809BA708 AFA00010 */ sw $zero, 0x0010($sp) /* 0242C 809BA70C 26040032 */ addiu $a0, $s0, 0x0032 ## $a0 = 00000032 -/* 02430 809BA710 46040182 */ mul.s $f6, $f0, $f4 -/* 02434 809BA714 87A50050 */ lh $a1, 0x0050($sp) +/* 02430 809BA710 46040182 */ mul.s $f6, $f0, $f4 +/* 02434 809BA714 87A50050 */ lh $a1, 0x0050($sp) /* 02438 809BA718 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 /* 0243C 809BA71C 240703E8 */ addiu $a3, $zero, 0x03E8 ## $a3 = 000003E8 /* 02440 809BA720 0C01E1A7 */ jal Math_SmoothScaleMaxMinS - -/* 02444 809BA724 E7A60048 */ swc1 $f6, 0x0048($sp) + +/* 02444 809BA724 E7A60048 */ swc1 $f6, 0x0048($sp) /* 02448 809BA728 0C01DE1C */ jal Math_Sins ## sins? /* 0244C 809BA72C 86040032 */ lh $a0, 0x0032($s0) ## 00000032 -/* 02450 809BA730 C7A80048 */ lwc1 $f8, 0x0048($sp) +/* 02450 809BA730 C7A80048 */ lwc1 $f8, 0x0048($sp) /* 02454 809BA734 86040032 */ lh $a0, 0x0032($s0) ## 00000032 -/* 02458 809BA738 46080082 */ mul.s $f2, $f0, $f8 +/* 02458 809BA738 46080082 */ mul.s $f2, $f0, $f8 /* 0245C 809BA73C 0C01DE0D */ jal Math_Coss ## coss? -/* 02460 809BA740 E7A20040 */ swc1 $f2, 0x0040($sp) -/* 02464 809BA744 C7A20040 */ lwc1 $f2, 0x0040($sp) +/* 02460 809BA740 E7A20040 */ swc1 $f2, 0x0040($sp) +/* 02464 809BA744 C7A20040 */ lwc1 $f2, 0x0040($sp) /* 02468 809BA748 44808000 */ mtc1 $zero, $f16 ## $f16 = 0.00 -/* 0246C 809BA74C C7AA0048 */ lwc1 $f10, 0x0048($sp) +/* 0246C 809BA74C C7AA0048 */ lwc1 $f10, 0x0048($sp) /* 02470 809BA750 44809000 */ mtc1 $zero, $f18 ## $f18 = 0.00 -/* 02474 809BA754 4602803E */ c.le.s $f16, $f2 -/* 02478 809BA758 460A0302 */ mul.s $f12, $f0, $f10 -/* 0247C 809BA75C 8FA4002C */ lw $a0, 0x002C($sp) +/* 02474 809BA754 4602803E */ c.le.s $f16, $f2 +/* 02478 809BA758 460A0302 */ mul.s $f12, $f0, $f10 +/* 0247C 809BA75C 8FA4002C */ lw $a0, 0x002C($sp) /* 02480 809BA760 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 02484 809BA764 45020004 */ bc1fl .L809BA778 -/* 02488 809BA768 46001007 */ neg.s $f0, $f2 -/* 0248C 809BA76C 10000002 */ beq $zero, $zero, .L809BA778 -/* 02490 809BA770 46001006 */ mov.s $f0, $f2 -/* 02494 809BA774 46001007 */ neg.s $f0, $f2 +/* 02484 809BA764 45020004 */ bc1fl .L809BA778 +/* 02488 809BA768 46001007 */ neg.s $f0, $f2 +/* 0248C 809BA76C 10000002 */ beq $zero, $zero, .L809BA778 +/* 02490 809BA770 46001006 */ mov.s $f0, $f2 +/* 02494 809BA774 46001007 */ neg.s $f0, $f2 .L809BA778: /* 02498 809BA778 8E050290 */ lw $a1, 0x0290($s0) ## 00000290 -/* 0249C 809BA77C 44070000 */ mfc1 $a3, $f0 -/* 024A0 809BA780 E7AC003C */ swc1 $f12, 0x003C($sp) +/* 0249C 809BA77C 44070000 */ mfc1 $a3, $f0 +/* 024A0 809BA780 E7AC003C */ swc1 $f12, 0x003C($sp) /* 024A4 809BA784 0C01E0C4 */ jal Math_SmoothScaleMaxMinF - -/* 024A8 809BA788 E7B20010 */ swc1 $f18, 0x0010($sp) -/* 024AC 809BA78C C7AE004C */ lwc1 $f14, 0x004C($sp) + +/* 024A8 809BA788 E7B20010 */ swc1 $f18, 0x0010($sp) +/* 024AC 809BA78C C7AE004C */ lwc1 $f14, 0x004C($sp) /* 024B0 809BA790 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 /* 024B4 809BA794 44803000 */ mtc1 $zero, $f6 ## $f6 = 0.00 -/* 024B8 809BA798 C7AC003C */ lwc1 $f12, 0x003C($sp) -/* 024BC 809BA79C 460E203E */ c.le.s $f4, $f14 -/* 024C0 809BA7A0 46000086 */ mov.s $f2, $f0 +/* 024B8 809BA798 C7AC003C */ lwc1 $f12, 0x003C($sp) +/* 024BC 809BA79C 460E203E */ c.le.s $f4, $f14 +/* 024C0 809BA7A0 46000086 */ mov.s $f2, $f0 /* 024C4 809BA7A4 2604000C */ addiu $a0, $s0, 0x000C ## $a0 = 0000000C /* 024C8 809BA7A8 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 024CC 809BA7AC 45020004 */ bc1fl .L809BA7C0 -/* 024D0 809BA7B0 46007007 */ neg.s $f0, $f14 -/* 024D4 809BA7B4 10000002 */ beq $zero, $zero, .L809BA7C0 -/* 024D8 809BA7B8 46007006 */ mov.s $f0, $f14 -/* 024DC 809BA7BC 46007007 */ neg.s $f0, $f14 +/* 024CC 809BA7AC 45020004 */ bc1fl .L809BA7C0 +/* 024D0 809BA7B0 46007007 */ neg.s $f0, $f14 +/* 024D4 809BA7B4 10000002 */ beq $zero, $zero, .L809BA7C0 +/* 024D8 809BA7B8 46007006 */ mov.s $f0, $f14 +/* 024DC 809BA7BC 46007007 */ neg.s $f0, $f14 .L809BA7C0: /* 024E0 809BA7C0 8E050294 */ lw $a1, 0x0294($s0) ## 00000294 -/* 024E4 809BA7C4 44070000 */ mfc1 $a3, $f0 -/* 024E8 809BA7C8 E7AC003C */ swc1 $f12, 0x003C($sp) -/* 024EC 809BA7CC E7A20044 */ swc1 $f2, 0x0044($sp) +/* 024E4 809BA7C4 44070000 */ mfc1 $a3, $f0 +/* 024E8 809BA7C8 E7AC003C */ swc1 $f12, 0x003C($sp) +/* 024EC 809BA7CC E7A20044 */ swc1 $f2, 0x0044($sp) /* 024F0 809BA7D0 0C01E0C4 */ jal Math_SmoothScaleMaxMinF - -/* 024F4 809BA7D4 E7A60010 */ swc1 $f6, 0x0010($sp) -/* 024F8 809BA7D8 C7AC003C */ lwc1 $f12, 0x003C($sp) + +/* 024F4 809BA7D4 E7A60010 */ swc1 $f6, 0x0010($sp) +/* 024F8 809BA7D8 C7AC003C */ lwc1 $f12, 0x003C($sp) /* 024FC 809BA7DC 44804000 */ mtc1 $zero, $f8 ## $f8 = 0.00 -/* 02500 809BA7E0 C7A20044 */ lwc1 $f2, 0x0044($sp) +/* 02500 809BA7E0 C7A20044 */ lwc1 $f2, 0x0044($sp) /* 02504 809BA7E4 44805000 */ mtc1 $zero, $f10 ## $f10 = 0.00 -/* 02508 809BA7E8 460C403E */ c.le.s $f8, $f12 +/* 02508 809BA7E8 460C403E */ c.le.s $f8, $f12 /* 0250C 809BA7EC 26040010 */ addiu $a0, $s0, 0x0010 ## $a0 = 00000010 /* 02510 809BA7F0 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 02514 809BA7F4 46001080 */ add.s $f2, $f2, $f0 -/* 02518 809BA7F8 45020004 */ bc1fl .L809BA80C -/* 0251C 809BA7FC 46006007 */ neg.s $f0, $f12 -/* 02520 809BA800 10000002 */ beq $zero, $zero, .L809BA80C -/* 02524 809BA804 46006006 */ mov.s $f0, $f12 -/* 02528 809BA808 46006007 */ neg.s $f0, $f12 +/* 02514 809BA7F4 46001080 */ add.s $f2, $f2, $f0 +/* 02518 809BA7F8 45020004 */ bc1fl .L809BA80C +/* 0251C 809BA7FC 46006007 */ neg.s $f0, $f12 +/* 02520 809BA800 10000002 */ beq $zero, $zero, .L809BA80C +/* 02524 809BA804 46006006 */ mov.s $f0, $f12 +/* 02528 809BA808 46006007 */ neg.s $f0, $f12 .L809BA80C: /* 0252C 809BA80C 8E050298 */ lw $a1, 0x0298($s0) ## 00000298 -/* 02530 809BA810 44070000 */ mfc1 $a3, $f0 -/* 02534 809BA814 E7A20044 */ swc1 $f2, 0x0044($sp) +/* 02530 809BA810 44070000 */ mfc1 $a3, $f0 +/* 02534 809BA814 E7A20044 */ swc1 $f2, 0x0044($sp) /* 02538 809BA818 0C01E0C4 */ jal Math_SmoothScaleMaxMinF - -/* 0253C 809BA81C E7AA0010 */ swc1 $f10, 0x0010($sp) -/* 02540 809BA820 C7A20044 */ lwc1 $f2, 0x0044($sp) -/* 02544 809BA824 46001080 */ add.s $f2, $f2, $f0 + +/* 0253C 809BA81C E7AA0010 */ swc1 $f10, 0x0010($sp) +/* 02540 809BA820 C7A20044 */ lwc1 $f2, 0x0044($sp) +/* 02544 809BA824 46001080 */ add.s $f2, $f2, $f0 /* 02548 809BA828 0C03F66B */ jal Math_Rand_ZeroOne ## Rand.Next() float -/* 0254C 809BA82C E7A20044 */ swc1 $f2, 0x0044($sp) +/* 0254C 809BA82C E7A20044 */ swc1 $f2, 0x0044($sp) /* 02550 809BA830 3C01809C */ lui $at, %hi(D_809BBCB0) ## $at = 809C0000 -/* 02554 809BA834 C430BCB0 */ lwc1 $f16, %lo(D_809BBCB0)($at) +/* 02554 809BA834 C430BCB0 */ lwc1 $f16, %lo(D_809BBCB0)($at) /* 02558 809BA838 3C01809C */ lui $at, %hi(D_809BBCB4) ## $at = 809C0000 -/* 0255C 809BA83C C432BCB4 */ lwc1 $f18, %lo(D_809BBCB4)($at) -/* 02560 809BA840 C7A20044 */ lwc1 $f2, 0x0044($sp) +/* 0255C 809BA83C C432BCB4 */ lwc1 $f18, %lo(D_809BBCB4)($at) +/* 02560 809BA840 C7A20044 */ lwc1 $f2, 0x0044($sp) /* 02564 809BA844 C6080274 */ lwc1 $f8, 0x0274($s0) ## 00000274 -/* 02568 809BA848 46120102 */ mul.s $f4, $f0, $f18 +/* 02568 809BA848 46120102 */ mul.s $f4, $f0, $f18 /* 0256C 809BA84C 44809000 */ mtc1 $zero, $f18 ## $f18 = 0.00 /* 02570 809BA850 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02574 809BA854 46121032 */ c.eq.s $f2, $f18 -/* 02578 809BA858 46048180 */ add.s $f6, $f16, $f4 -/* 0257C 809BA85C 46064280 */ add.s $f10, $f8, $f6 -/* 02580 809BA860 45000003 */ bc1f .L809BA870 +/* 02574 809BA854 46121032 */ c.eq.s $f2, $f18 +/* 02578 809BA858 46048180 */ add.s $f6, $f16, $f4 +/* 0257C 809BA85C 46064280 */ add.s $f10, $f8, $f6 +/* 02580 809BA860 45000003 */ bc1f .L809BA870 /* 02584 809BA864 E60A0274 */ swc1 $f10, 0x0274($s0) ## 00000274 -/* 02588 809BA868 0C26E7D8 */ jal func_809B9F60 -/* 0258C 809BA86C 8FA50074 */ lw $a1, 0x0074($sp) +/* 02588 809BA868 0C26E7D8 */ jal func_809B9F60 +/* 0258C 809BA86C 8FA50074 */ lw $a1, 0x0074($sp) .L809BA870: /* 02590 809BA870 920E02BC */ lbu $t6, 0x02BC($s0) ## 000002BC /* 02594 809BA874 3C014120 */ lui $at, 0x4120 ## $at = 41200000 @@ -166,31 +166,31 @@ glabel func_809BA628 /* 0259C 809BA87C 240D0001 */ addiu $t5, $zero, 0x0001 ## $t5 = 00000001 /* 025A0 809BA880 31CF0002 */ andi $t7, $t6, 0x0002 ## $t7 = 00000000 /* 025A4 809BA884 AE0D025C */ sw $t5, 0x025C($s0) ## 0000025C -/* 025A8 809BA888 11E00007 */ beq $t7, $zero, .L809BA8A8 +/* 025A8 809BA888 11E00007 */ beq $t7, $zero, .L809BA8A8 /* 025AC 809BA88C E610027C */ swc1 $f16, 0x027C($s0) ## 0000027C /* 025B0 809BA890 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 025B4 809BA894 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 025B8 809BA898 240538CB */ addiu $a1, $zero, 0x38CB ## $a1 = 000038CB /* 025BC 809BA89C 921802BC */ lbu $t8, 0x02BC($s0) ## 000002BC /* 025C0 809BA8A0 3319FFFD */ andi $t9, $t8, 0xFFFD ## $t9 = 00000000 /* 025C4 809BA8A4 A21902BC */ sb $t9, 0x02BC($s0) ## 000002BC .L809BA8A8: -/* 025C8 809BA8A8 0C0329DD */ jal func_800CA774 +/* 025C8 809BA8A8 0C0329DD */ jal func_800CA774 /* 025CC 809BA8AC C60C0274 */ lwc1 $f12, 0x0274($s0) ## 00000274 /* 025D0 809BA8B0 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 /* 025D4 809BA8B4 00000000 */ nop -/* 025D8 809BA8B8 46040032 */ c.eq.s $f0, $f4 +/* 025D8 809BA8B8 46040032 */ c.eq.s $f0, $f4 /* 025DC 809BA8BC 00000000 */ nop -/* 025E0 809BA8C0 45020012 */ bc1fl .L809BA90C +/* 025E0 809BA8C0 45020012 */ bc1fl .L809BA90C /* 025E4 809BA8C4 86090032 */ lh $t1, 0x0032($s0) ## 00000032 /* 025E8 809BA8C8 8608026A */ lh $t0, 0x026A($s0) ## 0000026A -/* 025EC 809BA8CC 11000005 */ beq $t0, $zero, .L809BA8E4 +/* 025EC 809BA8CC 11000005 */ beq $t0, $zero, .L809BA8E4 /* 025F0 809BA8D0 00000000 */ nop /* 025F4 809BA8D4 0C03F66B */ jal Math_Rand_ZeroOne ## Rand.Next() float /* 025F8 809BA8D8 00000000 */ nop -/* 025FC 809BA8DC 1000000A */ beq $zero, $zero, .L809BA908 +/* 025FC 809BA8DC 1000000A */ beq $zero, $zero, .L809BA908 /* 02600 809BA8E0 E6000284 */ swc1 $f0, 0x0284($s0) ## 00000284 .L809BA8E4: /* 02604 809BA8E4 0C03F66B */ jal Math_Rand_ZeroOne @@ -200,149 +200,149 @@ glabel func_809BA628 /* 02610 809BA8F0 44814000 */ mtc1 $at, $f8 ## $f8 = 3.00 /* 02614 809BA8F4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 02618 809BA8F8 240538CA */ addiu $a1, $zero, 0x38CA ## $a1 = 000038CA -/* 0261C 809BA8FC 46080182 */ mul.s $f6, $f0, $f8 +/* 0261C 809BA8FC 46080182 */ mul.s $f6, $f0, $f8 /* 02620 809BA900 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 02624 809BA904 E6060284 */ swc1 $f6, 0x0284($s0) ## 00000284 .L809BA908: /* 02628 809BA908 86090032 */ lh $t1, 0x0032($s0) ## 00000032 .L809BA90C: -/* 0262C 809BA90C 1000000D */ beq $zero, $zero, .L809BA944 +/* 0262C 809BA90C 1000000D */ beq $zero, $zero, .L809BA944 /* 02630 809BA910 A60900B6 */ sh $t1, 0x00B6($s0) ## 000000B6 -/* 02634 809BA914 44050000 */ mfc1 $a1, $f0 +/* 02634 809BA914 44050000 */ mfc1 $a1, $f0 .L809BA918: /* 02638 809BA918 26040068 */ addiu $a0, $s0, 0x0068 ## $a0 = 00000068 /* 0263C 809BA91C 0C01E0C4 */ jal Math_SmoothScaleMaxMinF - -/* 02640 809BA920 E7A00010 */ swc1 $f0, 0x0010($sp) + +/* 02640 809BA920 E7A00010 */ swc1 $f0, 0x0010($sp) /* 02644 809BA924 44805000 */ mtc1 $zero, $f10 ## $f10 = 0.00 /* 02648 809BA928 00000000 */ nop -/* 0264C 809BA92C 460A0032 */ c.eq.s $f0, $f10 +/* 0264C 809BA92C 460A0032 */ c.eq.s $f0, $f10 /* 02650 809BA930 00000000 */ nop -/* 02654 809BA934 45020004 */ bc1fl .L809BA948 +/* 02654 809BA934 45020004 */ bc1fl .L809BA948 /* 02658 809BA938 260A0024 */ addiu $t2, $s0, 0x0024 ## $t2 = 00000024 -/* 0265C 809BA93C 0C26E7CA */ jal func_809B9F28 +/* 0265C 809BA93C 0C26E7CA */ jal func_809B9F28 /* 02660 809BA940 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 .L809BA944: /* 02664 809BA944 260A0024 */ addiu $t2, $s0, 0x0024 ## $t2 = 00000024 .L809BA948: -/* 02668 809BA948 10000012 */ beq $zero, $zero, .L809BA994 -/* 0266C 809BA94C AFAA002C */ sw $t2, 0x002C($sp) +/* 02668 809BA948 10000012 */ beq $zero, $zero, .L809BA994 +/* 0266C 809BA94C AFAA002C */ sw $t2, 0x002C($sp) /* 02670 809BA950 8605008A */ lh $a1, 0x008A($s0) ## 0000008A .L809BA954: -/* 02674 809BA954 AFA00010 */ sw $zero, 0x0010($sp) +/* 02674 809BA954 AFA00010 */ sw $zero, 0x0010($sp) /* 02678 809BA958 260400B6 */ addiu $a0, $s0, 0x00B6 ## $a0 = 000000B6 /* 0267C 809BA95C 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 /* 02680 809BA960 0C01E1A7 */ jal Math_SmoothScaleMaxMinS - + /* 02684 809BA964 24070FA0 */ addiu $a3, $zero, 0x0FA0 ## $a3 = 00000FA0 /* 02688 809BA968 26040024 */ addiu $a0, $s0, 0x0024 ## $a0 = 00000024 -/* 0268C 809BA96C AFA4002C */ sw $a0, 0x002C($sp) +/* 0268C 809BA96C AFA4002C */ sw $a0, 0x002C($sp) /* 02690 809BA970 0C01E027 */ jal Math_Vec3f_Pitch - + /* 02694 809BA974 27A50054 */ addiu $a1, $sp, 0x0054 ## $a1 = FFFFFFE4 -/* 02698 809BA978 00022C00 */ sll $a1, $v0, 16 -/* 0269C 809BA97C 00052C03 */ sra $a1, $a1, 16 +/* 02698 809BA978 00022C00 */ sll $a1, $v0, 16 +/* 0269C 809BA97C 00052C03 */ sra $a1, $a1, 16 /* 026A0 809BA980 260400B4 */ addiu $a0, $s0, 0x00B4 ## $a0 = 000000B4 /* 026A4 809BA984 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 /* 026A8 809BA988 24070FA0 */ addiu $a3, $zero, 0x0FA0 ## $a3 = 00000FA0 /* 026AC 809BA98C 0C01E1A7 */ jal Math_SmoothScaleMaxMinS - -/* 026B0 809BA990 AFA00010 */ sw $zero, 0x0010($sp) + +/* 026B0 809BA990 AFA00010 */ sw $zero, 0x0010($sp) .L809BA994: /* 026B4 809BA994 0C02927F */ jal SkelAnime_FrameUpdateMatrix - + /* 026B8 809BA998 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C -/* 026BC 809BA99C 0C0329DD */ jal func_800CA774 +/* 026BC 809BA99C 0C0329DD */ jal func_800CA774 /* 026C0 809BA9A0 C60C0274 */ lwc1 $f12, 0x0274($s0) ## 00000274 /* 026C4 809BA9A4 3C01809C */ lui $at, %hi(D_809BBCB8) ## $at = 809C0000 -/* 026C8 809BA9A8 C432BCB8 */ lwc1 $f18, %lo(D_809BBCB8)($at) -/* 026CC 809BA9AC 4612003E */ c.le.s $f0, $f18 +/* 026C8 809BA9A8 C432BCB8 */ lwc1 $f18, %lo(D_809BBCB8)($at) +/* 026CC 809BA9AC 4612003E */ c.le.s $f0, $f18 /* 026D0 809BA9B0 00000000 */ nop -/* 026D4 809BA9B4 45020008 */ bc1fl .L809BA9D8 +/* 026D4 809BA9B4 45020008 */ bc1fl .L809BA9D8 /* 026D8 809BA9B8 C60C0008 */ lwc1 $f12, 0x0008($s0) ## 00000008 /* 026DC 809BA9BC 0C03F66B */ jal Math_Rand_ZeroOne ## Rand.Next() float /* 026E0 809BA9C0 00000000 */ nop /* 026E4 809BA9C4 3C01809C */ lui $at, %hi(D_809BBCBC) ## $at = 809C0000 -/* 026E8 809BA9C8 C430BCBC */ lwc1 $f16, %lo(D_809BBCBC)($at) -/* 026EC 809BA9CC 46100102 */ mul.s $f4, $f0, $f16 +/* 026E8 809BA9C8 C430BCBC */ lwc1 $f16, %lo(D_809BBCBC)($at) +/* 026EC 809BA9CC 46100102 */ mul.s $f4, $f0, $f16 /* 026F0 809BA9D0 E6040284 */ swc1 $f4, 0x0284($s0) ## 00000284 /* 026F4 809BA9D4 C60C0008 */ lwc1 $f12, 0x0008($s0) ## 00000008 .L809BA9D8: /* 026F8 809BA9D8 C60E000C */ lwc1 $f14, 0x000C($s0) ## 0000000C /* 026FC 809BA9DC 8E060010 */ lw $a2, 0x0010($s0) ## 00000010 -/* 02700 809BA9E0 0C034261 */ jal Matrix_Translate +/* 02700 809BA9E0 0C034261 */ jal Matrix_Translate /* 02704 809BA9E4 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 /* 02708 809BA9E8 86040030 */ lh $a0, 0x0030($s0) ## 00000030 /* 0270C 809BA9EC 86050032 */ lh $a1, 0x0032($s0) ## 00000032 /* 02710 809BA9F0 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 02714 809BA9F4 0C034421 */ jal Matrix_RotateXYZ +/* 02714 809BA9F4 0C034421 */ jal Matrix_RotateZYX /* 02718 809BA9F8 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 /* 0271C 809BA9FC C60C0274 */ lwc1 $f12, 0x0274($s0) ## 00000274 -/* 02720 809BAA00 0C0343B5 */ jal Matrix_RotateZ +/* 02720 809BAA00 0C0343B5 */ jal Matrix_RotateZ /* 02724 809BAA04 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 /* 02728 809BAA08 C6080278 */ lwc1 $f8, 0x0278($s0) ## 00000278 /* 0272C 809BAA0C 27A40060 */ addiu $a0, $sp, 0x0060 ## $a0 = FFFFFFF0 /* 02730 809BAA10 27A50054 */ addiu $a1, $sp, 0x0054 ## $a1 = FFFFFFE4 -/* 02734 809BAA14 0C0346BD */ jal Matrix_MultVec3f -/* 02738 809BAA18 E7A80064 */ swc1 $f8, 0x0064($sp) +/* 02734 809BAA14 0C0346BD */ jal Matrix_MultVec3f +/* 02738 809BAA18 E7A80064 */ swc1 $f8, 0x0064($sp) /* 0273C 809BAA1C 3C013F40 */ lui $at, 0x3F40 ## $at = 3F400000 /* 02740 809BAA20 44815000 */ mtc1 $at, $f10 ## $f10 = 0.75 /* 02744 809BAA24 C6060274 */ lwc1 $f6, 0x0274($s0) ## 00000274 /* 02748 809BAA28 44808000 */ mtc1 $zero, $f16 ## $f16 = 0.00 -/* 0274C 809BAA2C 8FA4002C */ lw $a0, 0x002C($sp) -/* 02750 809BAA30 460A3482 */ mul.s $f18, $f6, $f10 -/* 02754 809BAA34 8FA50054 */ lw $a1, 0x0054($sp) +/* 0274C 809BAA2C 8FA4002C */ lw $a0, 0x002C($sp) +/* 02750 809BAA30 460A3482 */ mul.s $f18, $f6, $f10 +/* 02754 809BAA34 8FA50054 */ lw $a1, 0x0054($sp) /* 02758 809BAA38 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 0275C 809BAA3C E7B00010 */ swc1 $f16, 0x0010($sp) -/* 02760 809BAA40 44079000 */ mfc1 $a3, $f18 +/* 0275C 809BAA3C E7B00010 */ swc1 $f16, 0x0010($sp) +/* 02760 809BAA40 44079000 */ mfc1 $a3, $f18 /* 02764 809BAA44 0C01E0C4 */ jal Math_SmoothScaleMaxMinF - + /* 02768 809BAA48 00000000 */ nop /* 0276C 809BAA4C 3C013F40 */ lui $at, 0x3F40 ## $at = 3F400000 /* 02770 809BAA50 44814000 */ mtc1 $at, $f8 ## $f8 = 0.75 /* 02774 809BAA54 C6040274 */ lwc1 $f4, 0x0274($s0) ## 00000274 /* 02778 809BAA58 44805000 */ mtc1 $zero, $f10 ## $f10 = 0.00 /* 0277C 809BAA5C 26040028 */ addiu $a0, $s0, 0x0028 ## $a0 = 00000028 -/* 02780 809BAA60 46082182 */ mul.s $f6, $f4, $f8 -/* 02784 809BAA64 8FA50058 */ lw $a1, 0x0058($sp) +/* 02780 809BAA60 46082182 */ mul.s $f6, $f4, $f8 +/* 02784 809BAA64 8FA50058 */ lw $a1, 0x0058($sp) /* 02788 809BAA68 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 0278C 809BAA6C E7AA0010 */ swc1 $f10, 0x0010($sp) -/* 02790 809BAA70 44073000 */ mfc1 $a3, $f6 +/* 0278C 809BAA6C E7AA0010 */ swc1 $f10, 0x0010($sp) +/* 02790 809BAA70 44073000 */ mfc1 $a3, $f6 /* 02794 809BAA74 0C01E0C4 */ jal Math_SmoothScaleMaxMinF - + /* 02798 809BAA78 00000000 */ nop /* 0279C 809BAA7C 3C013F40 */ lui $at, 0x3F40 ## $at = 3F400000 /* 027A0 809BAA80 44818000 */ mtc1 $at, $f16 ## $f16 = 0.75 /* 027A4 809BAA84 C6120274 */ lwc1 $f18, 0x0274($s0) ## 00000274 /* 027A8 809BAA88 44804000 */ mtc1 $zero, $f8 ## $f8 = 0.00 /* 027AC 809BAA8C 2604002C */ addiu $a0, $s0, 0x002C ## $a0 = 0000002C -/* 027B0 809BAA90 46109102 */ mul.s $f4, $f18, $f16 -/* 027B4 809BAA94 8FA5005C */ lw $a1, 0x005C($sp) +/* 027B0 809BAA90 46109102 */ mul.s $f4, $f18, $f16 +/* 027B4 809BAA94 8FA5005C */ lw $a1, 0x005C($sp) /* 027B8 809BAA98 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 027BC 809BAA9C E7A80010 */ swc1 $f8, 0x0010($sp) -/* 027C0 809BAAA0 44072000 */ mfc1 $a3, $f4 +/* 027BC 809BAA9C E7A80010 */ swc1 $f8, 0x0010($sp) +/* 027C0 809BAAA0 44072000 */ mfc1 $a3, $f4 /* 027C4 809BAAA4 0C01E0C4 */ jal Math_SmoothScaleMaxMinF - + /* 027C8 809BAAA8 00000000 */ nop /* 027CC 809BAAAC 3C01809C */ lui $at, %hi(D_809BBCC0) ## $at = 809C0000 -/* 027D0 809BAAB0 C426BCC0 */ lwc1 $f6, %lo(D_809BBCC0)($at) +/* 027D0 809BAAB0 C426BCC0 */ lwc1 $f6, %lo(D_809BBCC0)($at) /* 027D4 809BAAB4 C60A0284 */ lwc1 $f10, 0x0284($s0) ## 00000284 /* 027D8 809BAAB8 C6100274 */ lwc1 $f16, 0x0274($s0) ## 00000274 /* 027DC 809BAABC 260502AC */ addiu $a1, $s0, 0x02AC ## $a1 = 000002AC -/* 027E0 809BAAC0 460A3480 */ add.s $f18, $f6, $f10 -/* 027E4 809BAAC4 46128100 */ add.s $f4, $f16, $f18 +/* 027E0 809BAAC0 460A3480 */ add.s $f18, $f6, $f10 +/* 027E4 809BAAC4 46128100 */ add.s $f4, $f16, $f18 /* 027E8 809BAAC8 E6040274 */ swc1 $f4, 0x0274($s0) ## 00000274 -/* 027EC 809BAACC 0C00CD90 */ jal func_80033640 -/* 027F0 809BAAD0 8FA40074 */ lw $a0, 0x0074($sp) -/* 027F4 809BAAD4 54400008 */ bnel $v0, $zero, .L809BAAF8 +/* 027EC 809BAACC 0C00CD90 */ jal func_80033640 +/* 027F0 809BAAD0 8FA40074 */ lw $a0, 0x0074($sp) +/* 027F4 809BAAD4 54400008 */ bnel $v0, $zero, .L809BAAF8 /* 027F8 809BAAD8 860E0268 */ lh $t6, 0x0268($s0) ## 00000268 /* 027FC 809BAADC 860B026E */ lh $t3, 0x026E($s0) ## 0000026E /* 02800 809BAAE0 256CFFFF */ addiu $t4, $t3, 0xFFFF ## $t4 = FFFFFFFF /* 02804 809BAAE4 A60C026E */ sh $t4, 0x026E($s0) ## 0000026E /* 02808 809BAAE8 860D026E */ lh $t5, 0x026E($s0) ## 0000026E -/* 0280C 809BAAEC 55A00017 */ bnel $t5, $zero, .L809BAB4C +/* 0280C 809BAAEC 55A00017 */ bnel $t5, $zero, .L809BAB4C /* 02810 809BAAF0 860B0268 */ lh $t3, 0x0268($s0) ## 00000268 /* 02814 809BAAF4 860E0268 */ lh $t6, 0x0268($s0) ## 00000268 .L809BAAF8: @@ -354,30 +354,30 @@ glabel func_809BA628 /* 02828 809BAB08 44814000 */ mtc1 $at, $f8 ## $f8 = 30.00 /* 0282C 809BAB0C 3C014270 */ lui $at, 0x4270 ## $at = 42700000 /* 02830 809BAB10 44815000 */ mtc1 $at, $f10 ## $f10 = 60.00 -/* 02834 809BAB14 46080182 */ mul.s $f6, $f0, $f8 +/* 02834 809BAB14 46080182 */ mul.s $f6, $f0, $f8 /* 02838 809BAB18 8608026E */ lh $t0, 0x026E($s0) ## 0000026E /* 0283C 809BAB1C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02840 809BAB20 460A3400 */ add.s $f16, $f6, $f10 -/* 02844 809BAB24 4600848D */ trunc.w.s $f18, $f16 -/* 02848 809BAB28 44199000 */ mfc1 $t9, $f18 -/* 0284C 809BAB2C 11000004 */ beq $t0, $zero, .L809BAB40 +/* 02840 809BAB20 460A3400 */ add.s $f16, $f6, $f10 +/* 02844 809BAB24 4600848D */ trunc.w.s $f18, $f16 +/* 02848 809BAB28 44199000 */ mfc1 $t9, $f18 +/* 0284C 809BAB2C 11000004 */ beq $t0, $zero, .L809BAB40 /* 02850 809BAB30 AE190260 */ sw $t9, 0x0260($s0) ## 00000260 /* 02854 809BAB34 920902BD */ lbu $t1, 0x02BD($s0) ## 000002BD /* 02858 809BAB38 312AFFFD */ andi $t2, $t1, 0xFFFD ## $t2 = 00000000 /* 0285C 809BAB3C A20A02BD */ sb $t2, 0x02BD($s0) ## 000002BD .L809BAB40: /* 02860 809BAB40 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 02864 809BAB44 240538CD */ addiu $a1, $zero, 0x38CD ## $a1 = 000038CD /* 02868 809BAB48 860B0268 */ lh $t3, 0x0268($s0) ## 00000268 .L809BAB4C: /* 0286C 809BAB4C 26040288 */ addiu $a0, $s0, 0x0288 ## $a0 = 00000288 /* 02870 809BAB50 3C0542A0 */ lui $a1, 0x42A0 ## $a1 = 42A00000 -/* 02874 809BAB54 11600023 */ beq $t3, $zero, .L809BABE4 +/* 02874 809BAB54 11600023 */ beq $t3, $zero, .L809BABE4 /* 02878 809BAB58 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 0287C 809BAB5C 8E0C0260 */ lw $t4, 0x0260($s0) ## 00000260 /* 02880 809BAB60 258DFFFF */ addiu $t5, $t4, 0xFFFF ## $t5 = FFFFFFFF -/* 02884 809BAB64 15A0000F */ bne $t5, $zero, .L809BABA4 +/* 02884 809BAB64 15A0000F */ bne $t5, $zero, .L809BABA4 /* 02888 809BAB68 AE0D0260 */ sw $t5, 0x0260($s0) ## 00000260 /* 0288C 809BAB6C 0C03F66B */ jal Math_Rand_ZeroOne ## Rand.Next() float @@ -386,14 +386,14 @@ glabel func_809BA628 /* 02898 809BAB78 44812000 */ mtc1 $at, $f4 ## $f4 = 30.00 /* 0289C 809BAB7C 3C014334 */ lui $at, 0x4334 ## $at = 43340000 /* 028A0 809BAB80 44813000 */ mtc1 $at, $f6 ## $f6 = 180.00 -/* 028A4 809BAB84 46040202 */ mul.s $f8, $f0, $f4 +/* 028A4 809BAB84 46040202 */ mul.s $f8, $f0, $f4 /* 028A8 809BAB88 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 028AC 809BAB8C 240538CC */ addiu $a1, $zero, 0x38CC ## $a1 = 000038CC -/* 028B0 809BAB90 46064280 */ add.s $f10, $f8, $f6 -/* 028B4 809BAB94 4600540D */ trunc.w.s $f16, $f10 -/* 028B8 809BAB98 44188000 */ mfc1 $t8, $f16 +/* 028B0 809BAB90 46064280 */ add.s $f10, $f8, $f6 +/* 028B4 809BAB94 4600540D */ trunc.w.s $f16, $f10 +/* 028B8 809BAB98 44188000 */ mfc1 $t8, $f16 /* 028BC 809BAB9C 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 028C0 809BABA0 A618026E */ sh $t8, 0x026E($s0) ## 0000026E .L809BABA4: /* 028C4 809BABA4 44809000 */ mtc1 $zero, $f18 ## $f18 = 0.00 @@ -402,69 +402,69 @@ glabel func_809BA628 /* 028D0 809BABB0 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 028D4 809BABB4 3C074120 */ lui $a3, 0x4120 ## $a3 = 41200000 /* 028D8 809BABB8 0C01E0C4 */ jal Math_SmoothScaleMaxMinF - -/* 028DC 809BABBC E7B20010 */ swc1 $f18, 0x0010($sp) + +/* 028DC 809BABBC E7B20010 */ swc1 $f18, 0x0010($sp) /* 028E0 809BABC0 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 /* 028E4 809BABC4 2604028C */ addiu $a0, $s0, 0x028C ## $a0 = 0000028C /* 028E8 809BABC8 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 /* 028EC 809BABCC 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 028F0 809BABD0 3C074120 */ lui $a3, 0x4120 ## $a3 = 41200000 /* 028F4 809BABD4 0C01E0C4 */ jal Math_SmoothScaleMaxMinF - -/* 028F8 809BABD8 E7A40010 */ swc1 $f4, 0x0010($sp) -/* 028FC 809BABDC 1000000D */ beq $zero, $zero, .L809BAC14 + +/* 028F8 809BABD8 E7A40010 */ swc1 $f4, 0x0010($sp) +/* 028FC 809BABDC 1000000D */ beq $zero, $zero, .L809BAC14 /* 02900 809BABE0 C60A0164 */ lwc1 $f10, 0x0164($s0) ## 00000164 .L809BABE4: /* 02904 809BABE4 44804000 */ mtc1 $zero, $f8 ## $f8 = 0.00 /* 02908 809BABE8 3C074120 */ lui $a3, 0x4120 ## $a3 = 41200000 /* 0290C 809BABEC 0C01E0C4 */ jal Math_SmoothScaleMaxMinF - -/* 02910 809BABF0 E7A80010 */ swc1 $f8, 0x0010($sp) + +/* 02910 809BABF0 E7A80010 */ swc1 $f8, 0x0010($sp) /* 02914 809BABF4 44803000 */ mtc1 $zero, $f6 ## $f6 = 0.00 /* 02918 809BABF8 2604028C */ addiu $a0, $s0, 0x028C ## $a0 = 0000028C /* 0291C 809BABFC 3C0542C8 */ lui $a1, 0x42C8 ## $a1 = 42C80000 /* 02920 809BAC00 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 02924 809BAC04 3C074120 */ lui $a3, 0x4120 ## $a3 = 41200000 /* 02928 809BAC08 0C01E0C4 */ jal Math_SmoothScaleMaxMinF - -/* 0292C 809BAC0C E7A60010 */ swc1 $f6, 0x0010($sp) + +/* 0292C 809BAC0C E7A60010 */ swc1 $f6, 0x0010($sp) /* 02930 809BAC10 C60A0164 */ lwc1 $f10, 0x0164($s0) ## 00000164 .L809BAC14: /* 02934 809BAC14 24010005 */ addiu $at, $zero, 0x0005 ## $at = 00000005 /* 02938 809BAC18 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0293C 809BAC1C 4600540D */ trunc.w.s $f16, $f10 -/* 02940 809BAC20 44028000 */ mfc1 $v0, $f16 +/* 0293C 809BAC1C 4600540D */ trunc.w.s $f16, $f10 +/* 02940 809BAC20 44028000 */ mfc1 $v0, $f16 /* 02944 809BAC24 00000000 */ nop -/* 02948 809BAC28 14410007 */ bne $v0, $at, .L809BAC48 +/* 02948 809BAC28 14410007 */ bne $v0, $at, .L809BAC48 /* 0294C 809BAC2C 00000000 */ nop /* 02950 809BAC30 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 02954 809BAC34 240538C8 */ addiu $a1, $zero, 0x38C8 ## $a1 = 000038C8 /* 02958 809BAC38 C6120164 */ lwc1 $f18, 0x0164($s0) ## 00000164 -/* 0295C 809BAC3C 4600910D */ trunc.w.s $f4, $f18 -/* 02960 809BAC40 44022000 */ mfc1 $v0, $f4 +/* 0295C 809BAC3C 4600910D */ trunc.w.s $f4, $f18 +/* 02960 809BAC40 44022000 */ mfc1 $v0, $f4 /* 02964 809BAC44 00000000 */ nop .L809BAC48: -/* 02968 809BAC48 5440000D */ bnel $v0, $zero, .L809BAC80 -/* 0296C 809BAC4C 8FBF0024 */ lw $ra, 0x0024($sp) +/* 02968 809BAC48 5440000D */ bnel $v0, $zero, .L809BAC80 +/* 0296C 809BAC4C 8FBF0024 */ lw $ra, 0x0024($sp) /* 02970 809BAC50 0C03F66B */ jal Math_Rand_ZeroOne ## Rand.Next() float /* 02974 809BAC54 00000000 */ nop /* 02978 809BAC58 3C01809C */ lui $at, %hi(D_809BBCC4) ## $at = 809C0000 -/* 0297C 809BAC5C C428BCC4 */ lwc1 $f8, %lo(D_809BBCC4)($at) +/* 0297C 809BAC5C C428BCC4 */ lwc1 $f8, %lo(D_809BBCC4)($at) /* 02980 809BAC60 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02984 809BAC64 4608003C */ c.lt.s $f0, $f8 +/* 02984 809BAC64 4608003C */ c.lt.s $f0, $f8 /* 02988 809BAC68 00000000 */ nop -/* 0298C 809BAC6C 45020004 */ bc1fl .L809BAC80 -/* 02990 809BAC70 8FBF0024 */ lw $ra, 0x0024($sp) +/* 0298C 809BAC6C 45020004 */ bc1fl .L809BAC80 +/* 02990 809BAC70 8FBF0024 */ lw $ra, 0x0024($sp) /* 02994 809BAC74 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 02998 809BAC78 240538CA */ addiu $a1, $zero, 0x38CA ## $a1 = 000038CA -/* 0299C 809BAC7C 8FBF0024 */ lw $ra, 0x0024($sp) +/* 0299C 809BAC7C 8FBF0024 */ lw $ra, 0x0024($sp) .L809BAC80: -/* 029A0 809BAC80 8FB00020 */ lw $s0, 0x0020($sp) +/* 029A0 809BAC80 8FB00020 */ lw $s0, 0x0020($sp) /* 029A4 809BAC84 27BD0070 */ addiu $sp, $sp, 0x0070 ## $sp = 00000000 -/* 029A8 809BAC88 03E00008 */ jr $ra +/* 029A8 809BAC88 03E00008 */ jr $ra /* 029AC 809BAC8C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bdfire/func_809BC8C8.s b/asm/non_matchings/overlays/actors/ovl_En_Bdfire/func_809BC8C8.s index f76a876e92..8a94af8479 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bdfire/func_809BC8C8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bdfire/func_809BC8C8.s @@ -9,7 +9,7 @@ glabel func_809BC8C8 /* 008B4 809BC8E4 24C6CB38 */ addiu $a2, $a2, %lo(D_809BCB38) ## $a2 = 809BCB38 /* 008B8 809BC8E8 27A40044 */ addiu $a0, $sp, 0x0044 ## $a0 = FFFFFFE4 /* 008BC 809BC8EC 24070264 */ addiu $a3, $zero, 0x0264 ## $a3 = 00000264 -/* 008C0 809BC8F0 0C031AB1 */ jal func_800C6AC4 +/* 008C0 809BC8F0 0C031AB1 */ jal Graph_OpenDisps /* 008C4 809BC8F4 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 /* 008C8 809BC8F8 8FAF0060 */ lw $t7, 0x0060($sp) /* 008CC 809BC8FC 8FA40064 */ lw $a0, 0x0064($sp) @@ -119,7 +119,7 @@ glabel func_809BC8C8 /* 00A6C 809BCA9C 24C6CB60 */ addiu $a2, $a2, %lo(D_809BCB60) ## $a2 = 809BCB60 /* 00A70 809BCAA0 27A40044 */ addiu $a0, $sp, 0x0044 ## $a0 = FFFFFFE4 /* 00A74 809BCAA4 2407028B */ addiu $a3, $zero, 0x028B ## $a3 = 0000028B -/* 00A78 809BCAA8 0C031AD5 */ jal func_800C6B54 +/* 00A78 809BCAA8 0C031AD5 */ jal Graph_CloseDisps /* 00A7C 809BCAAC 8D450000 */ lw $a1, 0x0000($t2) ## 00000000 /* 00A80 809BCAB0 8FBF001C */ lw $ra, 0x001C($sp) /* 00A84 809BCAB4 8FB00018 */ lw $s0, 0x0018($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/EnBigokuta_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/EnBigokuta_Draw.s index 363d9af87d..4100856e60 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/EnBigokuta_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/EnBigokuta_Draw.s @@ -1,37 +1,37 @@ glabel EnBigokuta_Draw /* 0244C 809BF0AC 27BDFF90 */ addiu $sp, $sp, 0xFF90 ## $sp = FFFFFF90 -/* 02450 809BF0B0 AFBF002C */ sw $ra, 0x002C($sp) -/* 02454 809BF0B4 AFB00028 */ sw $s0, 0x0028($sp) -/* 02458 809BF0B8 AFA50074 */ sw $a1, 0x0074($sp) +/* 02450 809BF0B0 AFBF002C */ sw $ra, 0x002C($sp) +/* 02454 809BF0B4 AFB00028 */ sw $s0, 0x0028($sp) +/* 02458 809BF0B8 AFA50074 */ sw $a1, 0x0074($sp) /* 0245C 809BF0BC 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 /* 02460 809BF0C0 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 02464 809BF0C4 3C06809C */ lui $a2, %hi(D_809BF500) ## $a2 = 809C0000 /* 02468 809BF0C8 24C6F500 */ addiu $a2, $a2, %lo(D_809BF500) ## $a2 = 809BF500 /* 0246C 809BF0CC 27A40058 */ addiu $a0, $sp, 0x0058 ## $a0 = FFFFFFE8 /* 02470 809BF0D0 240707E1 */ addiu $a3, $zero, 0x07E1 ## $a3 = 000007E1 -/* 02474 809BF0D4 0C031AB1 */ jal func_800C6AC4 -/* 02478 809BF0D8 AFA50068 */ sw $a1, 0x0068($sp) +/* 02474 809BF0D4 0C031AB1 */ jal Graph_OpenDisps +/* 02478 809BF0D8 AFA50068 */ sw $a1, 0x0068($sp) /* 0247C 809BF0DC 8E0F0190 */ lw $t7, 0x0190($s0) ## 00000190 /* 02480 809BF0E0 3C05809C */ lui $a1, %hi(func_809BE26C) ## $a1 = 809C0000 /* 02484 809BF0E4 24A5E26C */ addiu $a1, $a1, %lo(func_809BE26C) ## $a1 = 809BE26C -/* 02488 809BF0E8 14AF0008 */ bne $a1, $t7, .L809BF10C -/* 0248C 809BF0EC 8FA80068 */ lw $t0, 0x0068($sp) +/* 02488 809BF0E8 14AF0008 */ bne $a1, $t7, .L809BF10C +/* 0248C 809BF0EC 8FA80068 */ lw $t0, 0x0068($sp) /* 02490 809BF0F0 86180196 */ lh $t8, 0x0196($s0) ## 00000196 -/* 02494 809BF0F4 57000006 */ bnel $t8, $zero, .L809BF110 -/* 02498 809BF0F8 8FA90074 */ lw $t1, 0x0074($sp) +/* 02494 809BF0F4 57000006 */ bnel $t8, $zero, .L809BF110 +/* 02498 809BF0F8 8FA90074 */ lw $t1, 0x0074($sp) /* 0249C 809BF0FC 86190198 */ lh $t9, 0x0198($s0) ## 00000198 -/* 024A0 809BF100 8FAA0074 */ lw $t2, 0x0074($sp) -/* 024A4 809BF104 53200053 */ beql $t9, $zero, .L809BF254 +/* 024A0 809BF100 8FAA0074 */ lw $t2, 0x0074($sp) +/* 024A4 809BF104 53200053 */ beql $t9, $zero, .L809BF254 /* 024A8 809BF108 8D440000 */ lw $a0, 0x0000($t2) ## 00000000 .L809BF10C: -/* 024AC 809BF10C 8FA90074 */ lw $t1, 0x0074($sp) +/* 024AC 809BF10C 8FA90074 */ lw $t1, 0x0074($sp) .L809BF110: /* 024B0 809BF110 8D240000 */ lw $a0, 0x0000($t1) ## 00000000 -/* 024B4 809BF114 AFA80068 */ sw $t0, 0x0068($sp) -/* 024B8 809BF118 0C024F46 */ jal func_80093D18 -/* 024BC 809BF11C AFA5003C */ sw $a1, 0x003C($sp) -/* 024C0 809BF120 8FA80068 */ lw $t0, 0x0068($sp) -/* 024C4 809BF124 8FA5003C */ lw $a1, 0x003C($sp) +/* 024B4 809BF114 AFA80068 */ sw $t0, 0x0068($sp) +/* 024B8 809BF118 0C024F46 */ jal func_80093D18 +/* 024BC 809BF11C AFA5003C */ sw $a1, 0x003C($sp) +/* 024C0 809BF120 8FA80068 */ lw $t0, 0x0068($sp) +/* 024C4 809BF124 8FA5003C */ lw $a1, 0x003C($sp) /* 024C8 809BF128 3C0BDB06 */ lui $t3, 0xDB06 ## $t3 = DB060000 /* 024CC 809BF12C 8D0302C0 */ lw $v1, 0x02C0($t0) ## 000002C0 /* 024D0 809BF130 3C0C8011 */ lui $t4, 0x8011 ## $t4 = 80110000 @@ -50,54 +50,54 @@ glabel EnBigokuta_Draw /* 02504 809BF164 AC6E0000 */ sw $t6, 0x0000($v1) ## 00000000 /* 02508 809BF168 86030196 */ lh $v1, 0x0196($s0) ## 00000196 /* 0250C 809BF16C 30780001 */ andi $t8, $v1, 0x0001 ## $t8 = 00000000 -/* 02510 809BF170 5300002C */ beql $t8, $zero, .L809BF224 +/* 02510 809BF170 5300002C */ beql $t8, $zero, .L809BF224 /* 02514 809BF174 8E050150 */ lw $a1, 0x0150($s0) ## 00000150 /* 02518 809BF178 8E020190 */ lw $v0, 0x0190($s0) ## 00000190 /* 0251C 809BF17C 3C19809C */ lui $t9, %hi(func_809BE180) ## $t9 = 809C0000 /* 02520 809BF180 2739E180 */ addiu $t9, $t9, %lo(func_809BE180) ## $t9 = 809BE180 -/* 02524 809BF184 17220003 */ bne $t9, $v0, .L809BF194 -/* 02528 809BF188 28610008 */ slti $at, $v1, 0x0008 -/* 0252C 809BF18C 10200005 */ beq $at, $zero, .L809BF1A4 +/* 02524 809BF184 17220003 */ bne $t9, $v0, .L809BF194 +/* 02528 809BF188 28610008 */ slti $at, $v1, 0x0008 +/* 0252C 809BF18C 10200005 */ beq $at, $zero, .L809BF1A4 /* 02530 809BF190 00000000 */ nop .L809BF194: -/* 02534 809BF194 14A20022 */ bne $a1, $v0, .L809BF220 -/* 02538 809BF198 2861000A */ slti $at, $v1, 0x000A -/* 0253C 809BF19C 54200021 */ bnel $at, $zero, .L809BF224 +/* 02534 809BF194 14A20022 */ bne $a1, $v0, .L809BF220 +/* 02538 809BF198 2861000A */ slti $at, $v1, 0x000A +/* 0253C 809BF19C 54200021 */ bnel $at, $zero, .L809BF224 /* 02540 809BF1A0 8E050150 */ lw $a1, 0x0150($s0) ## 00000150 .L809BF1A4: /* 02544 809BF1A4 0C03F66B */ jal Math_Rand_ZeroOne ## Rand.Next() float /* 02548 809BF1A8 00000000 */ nop /* 0254C 809BF1AC 3C01809C */ lui $at, %hi(D_809BF580) ## $at = 809C0000 -/* 02550 809BF1B0 C424F580 */ lwc1 $f4, %lo(D_809BF580)($at) -/* 02554 809BF1B4 46040182 */ mul.s $f6, $f0, $f4 +/* 02550 809BF1B0 C424F580 */ lwc1 $f4, %lo(D_809BF580)($at) +/* 02554 809BF1B4 46040182 */ mul.s $f6, $f0, $f4 /* 02558 809BF1B8 0C03F66B */ jal Math_Rand_ZeroOne ## Rand.Next() float -/* 0255C 809BF1BC E7A6004C */ swc1 $f6, 0x004C($sp) +/* 0255C 809BF1BC E7A6004C */ swc1 $f6, 0x004C($sp) /* 02560 809BF1C0 3C01809C */ lui $at, %hi(D_809BF584) ## $at = 809C0000 -/* 02564 809BF1C4 C428F584 */ lwc1 $f8, %lo(D_809BF584)($at) +/* 02564 809BF1C4 C428F584 */ lwc1 $f8, %lo(D_809BF584)($at) /* 02568 809BF1C8 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 -/* 0256C 809BF1CC 46080302 */ mul.s $f12, $f0, $f8 -/* 02570 809BF1D0 0C034348 */ jal Matrix_RotateY -/* 02574 809BF1D4 E7AC0048 */ swc1 $f12, 0x0048($sp) -/* 02578 809BF1D8 C7AC004C */ lwc1 $f12, 0x004C($sp) -/* 0257C 809BF1DC 0C0342DC */ jal Matrix_RotateX +/* 0256C 809BF1CC 46080302 */ mul.s $f12, $f0, $f8 +/* 02570 809BF1D0 0C034348 */ jal Matrix_RotateY +/* 02574 809BF1D4 E7AC0048 */ swc1 $f12, 0x0048($sp) +/* 02578 809BF1D8 C7AC004C */ lwc1 $f12, 0x004C($sp) +/* 0257C 809BF1DC 0C0342DC */ jal Matrix_RotateX /* 02580 809BF1E0 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 /* 02584 809BF1E4 3C01809C */ lui $at, %hi(D_809BF588) ## $at = 809C0000 -/* 02588 809BF1E8 C42CF588 */ lwc1 $f12, %lo(D_809BF588)($at) +/* 02588 809BF1E8 C42CF588 */ lwc1 $f12, %lo(D_809BF588)($at) /* 0258C 809BF1EC 3C01809C */ lui $at, %hi(D_809BF58C) ## $at = 809C0000 -/* 02590 809BF1F0 C42EF58C */ lwc1 $f14, %lo(D_809BF58C)($at) -/* 02594 809BF1F4 44066000 */ mfc1 $a2, $f12 -/* 02598 809BF1F8 0C0342A3 */ jal Matrix_Scale +/* 02590 809BF1F0 C42EF58C */ lwc1 $f14, %lo(D_809BF58C)($at) +/* 02594 809BF1F4 44066000 */ mfc1 $a2, $f12 +/* 02598 809BF1F8 0C0342A3 */ jal Matrix_Scale /* 0259C 809BF1FC 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 025A0 809BF200 C7AC004C */ lwc1 $f12, 0x004C($sp) +/* 025A0 809BF200 C7AC004C */ lwc1 $f12, 0x004C($sp) /* 025A4 809BF204 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 -/* 025A8 809BF208 0C0342DC */ jal Matrix_RotateX -/* 025AC 809BF20C 46006307 */ neg.s $f12, $f12 -/* 025B0 809BF210 C7AC0048 */ lwc1 $f12, 0x0048($sp) +/* 025A8 809BF208 0C0342DC */ jal Matrix_RotateX +/* 025AC 809BF20C 46006307 */ neg.s $f12, $f12 +/* 025B0 809BF210 C7AC0048 */ lwc1 $f12, 0x0048($sp) /* 025B4 809BF214 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 -/* 025B8 809BF218 0C034348 */ jal Matrix_RotateY -/* 025BC 809BF21C 46006307 */ neg.s $f12, $f12 +/* 025B8 809BF218 0C034348 */ jal Matrix_RotateY +/* 025BC 809BF21C 46006307 */ neg.s $f12, $f12 .L809BF220: /* 025C0 809BF220 8E050150 */ lw $a1, 0x0150($s0) ## 00000150 .L809BF224: @@ -105,18 +105,18 @@ glabel EnBigokuta_Draw /* 025C8 809BF228 9207014E */ lbu $a3, 0x014E($s0) ## 0000014E /* 025CC 809BF22C 3C09809C */ lui $t1, %hi(func_809BEBBC) ## $t1 = 809C0000 /* 025D0 809BF230 2529EBBC */ addiu $t1, $t1, %lo(func_809BEBBC) ## $t1 = 809BEBBC -/* 025D4 809BF234 AFA90010 */ sw $t1, 0x0010($sp) -/* 025D8 809BF238 AFB00018 */ sw $s0, 0x0018($sp) -/* 025DC 809BF23C AFA00014 */ sw $zero, 0x0014($sp) -/* 025E0 809BF240 0C0286B2 */ jal func_800A1AC8 -/* 025E4 809BF244 8FA40074 */ lw $a0, 0x0074($sp) -/* 025E8 809BF248 10000048 */ beq $zero, $zero, .L809BF36C -/* 025EC 809BF24C 8FAB0074 */ lw $t3, 0x0074($sp) +/* 025D4 809BF234 AFA90010 */ sw $t1, 0x0010($sp) +/* 025D8 809BF238 AFB00018 */ sw $s0, 0x0018($sp) +/* 025DC 809BF23C AFA00014 */ sw $zero, 0x0014($sp) +/* 025E0 809BF240 0C0286B2 */ jal SkelAnime_DrawSV +/* 025E4 809BF244 8FA40074 */ lw $a0, 0x0074($sp) +/* 025E8 809BF248 10000048 */ beq $zero, $zero, .L809BF36C +/* 025EC 809BF24C 8FAB0074 */ lw $t3, 0x0074($sp) /* 025F0 809BF250 8D440000 */ lw $a0, 0x0000($t2) ## 00000000 .L809BF254: -/* 025F4 809BF254 0C024F61 */ jal func_80093D84 -/* 025F8 809BF258 AFA80068 */ sw $t0, 0x0068($sp) -/* 025FC 809BF25C 8FA80068 */ lw $t0, 0x0068($sp) +/* 025F4 809BF254 0C024F61 */ jal func_80093D84 +/* 025F8 809BF258 AFA80068 */ sw $t0, 0x0068($sp) +/* 025FC 809BF25C 8FA80068 */ lw $t0, 0x0068($sp) /* 02600 809BF260 3C0CDB06 */ lui $t4, 0xDB06 ## $t4 = DB060000 /* 02604 809BF264 3C0D8011 */ lui $t5, 0x8011 ## $t5 = 80110000 /* 02608 809BF268 8D0302D0 */ lw $v1, 0x02D0($t0) ## 000002D0 @@ -132,42 +132,42 @@ glabel EnBigokuta_Draw /* 02630 809BF290 244E0008 */ addiu $t6, $v0, 0x0008 ## $t6 = 00000008 /* 02634 809BF294 AD0E02D0 */ sw $t6, 0x02D0($t0) ## 000002D0 /* 02638 809BF298 AC4F0000 */ sw $t7, 0x0000($v0) ## 00000000 -/* 0263C 809BF29C C430F590 */ lwc1 $f16, %lo(D_809BF590)($at) +/* 0263C 809BF29C C430F590 */ lwc1 $f16, %lo(D_809BF590)($at) /* 02640 809BF2A0 C60A0054 */ lwc1 $f10, 0x0054($s0) ## 00000054 /* 02644 809BF2A4 24190001 */ addiu $t9, $zero, 0x0001 ## $t9 = 00000001 /* 02648 809BF2A8 3C014F00 */ lui $at, 0x4F00 ## $at = 4F000000 -/* 0264C 809BF2AC 46105482 */ mul.s $f18, $f10, $f16 +/* 0264C 809BF2AC 46105482 */ mul.s $f18, $f10, $f16 /* 02650 809BF2B0 4458F800 */ cfc1 $t8, $31 /* 02654 809BF2B4 44D9F800 */ ctc1 $t9, $31 /* 02658 809BF2B8 00000000 */ nop -/* 0265C 809BF2BC 46009124 */ cvt.w.s $f4, $f18 +/* 0265C 809BF2BC 46009124 */ cvt.w.s $f4, $f18 /* 02660 809BF2C0 4459F800 */ cfc1 $t9, $31 /* 02664 809BF2C4 00000000 */ nop /* 02668 809BF2C8 33390078 */ andi $t9, $t9, 0x0078 ## $t9 = 00000000 -/* 0266C 809BF2CC 53200013 */ beql $t9, $zero, .L809BF31C -/* 02670 809BF2D0 44192000 */ mfc1 $t9, $f4 +/* 0266C 809BF2CC 53200013 */ beql $t9, $zero, .L809BF31C +/* 02670 809BF2D0 44192000 */ mfc1 $t9, $f4 /* 02674 809BF2D4 44812000 */ mtc1 $at, $f4 ## $f4 = 2147483648.00 /* 02678 809BF2D8 24190001 */ addiu $t9, $zero, 0x0001 ## $t9 = 00000001 -/* 0267C 809BF2DC 46049101 */ sub.s $f4, $f18, $f4 +/* 0267C 809BF2DC 46049101 */ sub.s $f4, $f18, $f4 /* 02680 809BF2E0 44D9F800 */ ctc1 $t9, $31 /* 02684 809BF2E4 00000000 */ nop -/* 02688 809BF2E8 46002124 */ cvt.w.s $f4, $f4 +/* 02688 809BF2E8 46002124 */ cvt.w.s $f4, $f4 /* 0268C 809BF2EC 4459F800 */ cfc1 $t9, $31 /* 02690 809BF2F0 00000000 */ nop /* 02694 809BF2F4 33390078 */ andi $t9, $t9, 0x0078 ## $t9 = 00000000 -/* 02698 809BF2F8 17200005 */ bne $t9, $zero, .L809BF310 +/* 02698 809BF2F8 17200005 */ bne $t9, $zero, .L809BF310 /* 0269C 809BF2FC 00000000 */ nop -/* 026A0 809BF300 44192000 */ mfc1 $t9, $f4 +/* 026A0 809BF300 44192000 */ mfc1 $t9, $f4 /* 026A4 809BF304 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 026A8 809BF308 10000007 */ beq $zero, $zero, .L809BF328 +/* 026A8 809BF308 10000007 */ beq $zero, $zero, .L809BF328 /* 026AC 809BF30C 0321C825 */ or $t9, $t9, $at ## $t9 = 80000000 .L809BF310: -/* 026B0 809BF310 10000005 */ beq $zero, $zero, .L809BF328 +/* 026B0 809BF310 10000005 */ beq $zero, $zero, .L809BF328 /* 026B4 809BF314 2419FFFF */ addiu $t9, $zero, 0xFFFF ## $t9 = FFFFFFFF -/* 026B8 809BF318 44192000 */ mfc1 $t9, $f4 +/* 026B8 809BF318 44192000 */ mfc1 $t9, $f4 .L809BF31C: /* 026BC 809BF31C 00000000 */ nop -/* 026C0 809BF320 0720FFFB */ bltz $t9, .L809BF310 +/* 026C0 809BF320 0720FFFB */ bltz $t9, .L809BF310 /* 026C4 809BF324 00000000 */ nop .L809BF328: /* 026C8 809BF328 332900FF */ andi $t1, $t9, 0x00FF ## $t1 = 000000FF @@ -175,29 +175,29 @@ glabel EnBigokuta_Draw /* 026D0 809BF330 9207014E */ lbu $a3, 0x014E($s0) ## 0000014E /* 026D4 809BF334 8E06016C */ lw $a2, 0x016C($s0) ## 0000016C /* 026D8 809BF338 8E050150 */ lw $a1, 0x0150($s0) ## 00000150 -/* 026DC 809BF33C AFA00018 */ sw $zero, 0x0018($sp) -/* 026E0 809BF340 AFA00014 */ sw $zero, 0x0014($sp) -/* 026E4 809BF344 AFA00010 */ sw $zero, 0x0010($sp) +/* 026DC 809BF33C AFA00018 */ sw $zero, 0x0018($sp) +/* 026E0 809BF340 AFA00014 */ sw $zero, 0x0014($sp) +/* 026E4 809BF344 AFA00010 */ sw $zero, 0x0010($sp) /* 026E8 809BF348 8D0A02D0 */ lw $t2, 0x02D0($t0) ## 000002D0 /* 026EC 809BF34C 44D8F800 */ ctc1 $t8, $31 -/* 026F0 809BF350 AFA80068 */ sw $t0, 0x0068($sp) -/* 026F4 809BF354 8FA40074 */ lw $a0, 0x0074($sp) -/* 026F8 809BF358 0C0289CF */ jal func_800A273C -/* 026FC 809BF35C AFAA001C */ sw $t2, 0x001C($sp) -/* 02700 809BF360 8FA80068 */ lw $t0, 0x0068($sp) +/* 026F0 809BF350 AFA80068 */ sw $t0, 0x0068($sp) +/* 026F4 809BF354 8FA40074 */ lw $a0, 0x0074($sp) +/* 026F8 809BF358 0C0289CF */ jal SkelAnime_DrawSV2 +/* 026FC 809BF35C AFAA001C */ sw $t2, 0x001C($sp) +/* 02700 809BF360 8FA80068 */ lw $t0, 0x0068($sp) /* 02704 809BF364 AD0202D0 */ sw $v0, 0x02D0($t0) ## 000002D0 -/* 02708 809BF368 8FAB0074 */ lw $t3, 0x0074($sp) +/* 02708 809BF368 8FAB0074 */ lw $t3, 0x0074($sp) .L809BF36C: /* 0270C 809BF36C 3C06809C */ lui $a2, %hi(D_809BF514) ## $a2 = 809C0000 /* 02710 809BF370 24C6F514 */ addiu $a2, $a2, %lo(D_809BF514) ## $a2 = 809BF514 /* 02714 809BF374 27A40058 */ addiu $a0, $sp, 0x0058 ## $a0 = FFFFFFE8 /* 02718 809BF378 2407081C */ addiu $a3, $zero, 0x081C ## $a3 = 0000081C -/* 0271C 809BF37C 0C031AD5 */ jal func_800C6B54 +/* 0271C 809BF37C 0C031AD5 */ jal Graph_CloseDisps /* 02720 809BF380 8D650000 */ lw $a1, 0x0000($t3) ## 00000000 -/* 02724 809BF384 8FBF002C */ lw $ra, 0x002C($sp) -/* 02728 809BF388 8FB00028 */ lw $s0, 0x0028($sp) +/* 02724 809BF384 8FBF002C */ lw $ra, 0x002C($sp) +/* 02728 809BF388 8FB00028 */ lw $s0, 0x0028($sp) /* 0272C 809BF38C 27BD0070 */ addiu $sp, $sp, 0x0070 ## $sp = 00000000 -/* 02730 809BF390 03E00008 */ jr $ra +/* 02730 809BF390 03E00008 */ jr $ra /* 02734 809BF394 00000000 */ nop /* 02738 809BF398 00000000 */ nop /* 0273C 809BF39C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/EnBigokuta_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/EnBigokuta_Init.s index 8701195f58..abb1fbb57f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/EnBigokuta_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/EnBigokuta_Init.s @@ -1,41 +1,41 @@ glabel EnBigokuta_Init /* 00000 809BCC60 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 -/* 00004 809BCC64 AFB30034 */ sw $s3, 0x0034($sp) +/* 00004 809BCC64 AFB30034 */ sw $s3, 0x0034($sp) /* 00008 809BCC68 00A09825 */ or $s3, $a1, $zero ## $s3 = 00000000 -/* 0000C 809BCC6C AFBF003C */ sw $ra, 0x003C($sp) -/* 00010 809BCC70 AFB20030 */ sw $s2, 0x0030($sp) +/* 0000C 809BCC6C AFBF003C */ sw $ra, 0x003C($sp) +/* 00010 809BCC70 AFB20030 */ sw $s2, 0x0030($sp) /* 00014 809BCC74 3C05809C */ lui $a1, %hi(D_809BF488) ## $a1 = 809C0000 /* 00018 809BCC78 00809025 */ or $s2, $a0, $zero ## $s2 = 00000000 -/* 0001C 809BCC7C AFB40038 */ sw $s4, 0x0038($sp) -/* 00020 809BCC80 AFB1002C */ sw $s1, 0x002C($sp) -/* 00024 809BCC84 AFB00028 */ sw $s0, 0x0028($sp) +/* 0001C 809BCC7C AFB40038 */ sw $s4, 0x0038($sp) +/* 00020 809BCC80 AFB1002C */ sw $s1, 0x002C($sp) +/* 00024 809BCC84 AFB00028 */ sw $s0, 0x0028($sp) /* 00028 809BCC88 0C01E037 */ jal Actor_ProcessInitChain - + /* 0002C 809BCC8C 24A5F488 */ addiu $a1, $a1, %lo(D_809BF488) ## $a1 = 809BF488 /* 00030 809BCC90 3C060600 */ lui $a2, 0x0600 ## $a2 = 06000000 /* 00034 809BCC94 3C070600 */ lui $a3, 0x0600 ## $a3 = 06000000 /* 00038 809BCC98 264E019C */ addiu $t6, $s2, 0x019C ## $t6 = 0000019C /* 0003C 809BCC9C 264F0214 */ addiu $t7, $s2, 0x0214 ## $t7 = 00000214 /* 00040 809BCCA0 24180014 */ addiu $t8, $zero, 0x0014 ## $t8 = 00000014 -/* 00044 809BCCA4 AFB80018 */ sw $t8, 0x0018($sp) -/* 00048 809BCCA8 AFAF0014 */ sw $t7, 0x0014($sp) -/* 0004C 809BCCAC AFAE0010 */ sw $t6, 0x0010($sp) +/* 00044 809BCCA4 AFB80018 */ sw $t8, 0x0018($sp) +/* 00048 809BCCA8 AFAF0014 */ sw $t7, 0x0014($sp) +/* 0004C 809BCCAC AFAE0010 */ sw $t6, 0x0010($sp) /* 00050 809BCCB0 24E714B8 */ addiu $a3, $a3, 0x14B8 ## $a3 = 060014B8 /* 00054 809BCCB4 24C66BC0 */ addiu $a2, $a2, 0x6BC0 ## $a2 = 06006BC0 /* 00058 809BCCB8 02602025 */ or $a0, $s3, $zero ## $a0 = 00000000 -/* 0005C 809BCCBC 0C0291BE */ jal func_800A46F8 +/* 0005C 809BCCBC 0C0291BE */ jal SkelAnime_InitSV /* 00060 809BCCC0 2645014C */ addiu $a1, $s2, 0x014C ## $a1 = 0000014C /* 00064 809BCCC4 2650028C */ addiu $s0, $s2, 0x028C ## $s0 = 0000028C /* 00068 809BCCC8 02002825 */ or $a1, $s0, $zero ## $a1 = 0000028C -/* 0006C 809BCCCC 0C016EFE */ jal func_8005BBF8 +/* 0006C 809BCCCC 0C016EFE */ jal func_8005BBF8 /* 00070 809BCCD0 02602025 */ or $a0, $s3, $zero ## $a0 = 00000000 /* 00074 809BCCD4 3C07809C */ lui $a3, %hi(D_809BF3F8) ## $a3 = 809C0000 /* 00078 809BCCD8 265902AC */ addiu $t9, $s2, 0x02AC ## $t9 = 000002AC -/* 0007C 809BCCDC AFB90010 */ sw $t9, 0x0010($sp) +/* 0007C 809BCCDC AFB90010 */ sw $t9, 0x0010($sp) /* 00080 809BCCE0 24E7F3F8 */ addiu $a3, $a3, %lo(D_809BF3F8) ## $a3 = 809BF3F8 /* 00084 809BCCE4 02602025 */ or $a0, $s3, $zero ## $a0 = 00000000 /* 00088 809BCCE8 02002825 */ or $a1, $s0, $zero ## $a1 = 0000028C -/* 0008C 809BCCEC 0C017014 */ jal func_8005C050 +/* 0008C 809BCCEC 0C017014 */ jal func_8005C050 /* 00090 809BCCF0 02403025 */ or $a2, $s2, $zero ## $a2 = 00000000 /* 00094 809BCCF4 8E4202A8 */ lw $v0, 0x02A8($s2) ## 000002A8 /* 00098 809BCCF8 3C10809C */ lui $s0, %hi(D_809BF408) ## $s0 = 809C0000 @@ -48,53 +48,53 @@ glabel EnBigokuta_Init .L809BCD14: /* 000B4 809BCD14 02602025 */ or $a0, $s3, $zero ## $a0 = 00000000 /* 000B8 809BCD18 0C0170D9 */ jal ActorCollider_AllocCylinder - + /* 000BC 809BCD1C 02202825 */ or $a1, $s1, $zero ## $a1 = 000002EC /* 000C0 809BCD20 02602025 */ or $a0, $s3, $zero ## $a0 = 00000000 /* 000C4 809BCD24 02202825 */ or $a1, $s1, $zero ## $a1 = 000002EC /* 000C8 809BCD28 02403025 */ or $a2, $s2, $zero ## $a2 = 00000000 /* 000CC 809BCD2C 0C01712B */ jal ActorCollider_InitCylinder - + /* 000D0 809BCD30 02003825 */ or $a3, $s0, $zero ## $a3 = 809BF408 /* 000D4 809BCD34 2610002C */ addiu $s0, $s0, 0x002C ## $s0 = 809BF434 -/* 000D8 809BCD38 1614FFF6 */ bne $s0, $s4, .L809BCD14 +/* 000D8 809BCD38 1614FFF6 */ bne $s0, $s4, .L809BCD14 /* 000DC 809BCD3C 2631004C */ addiu $s1, $s1, 0x004C ## $s1 = 00000338 /* 000E0 809BCD40 3C05809C */ lui $a1, %hi(D_809BF468) ## $a1 = 809C0000 /* 000E4 809BCD44 3C06809C */ lui $a2, %hi(D_809BF460) ## $a2 = 809C0000 /* 000E8 809BCD48 24C6F460 */ addiu $a2, $a2, %lo(D_809BF460) ## $a2 = 809BF460 /* 000EC 809BCD4C 24A5F468 */ addiu $a1, $a1, %lo(D_809BF468) ## $a1 = 809BF468 -/* 000F0 809BCD50 0C0187B5 */ jal func_80061ED4 +/* 000F0 809BCD50 0C0187B5 */ jal func_80061ED4 /* 000F4 809BCD54 26440098 */ addiu $a0, $s2, 0x0098 ## $a0 = 00000098 /* 000F8 809BCD58 8649001C */ lh $t1, 0x001C($s2) ## 0000001C /* 000FC 809BCD5C 24100001 */ addiu $s0, $zero, 0x0001 ## $s0 = 00000001 /* 00100 809BCD60 A2500194 */ sb $s0, 0x0194($s2) ## 00000194 -/* 00104 809BCD64 15200009 */ bne $t1, $zero, .L809BCD8C +/* 00104 809BCD64 15200009 */ bne $t1, $zero, .L809BCD8C /* 00108 809BCD68 02602025 */ or $a0, $s3, $zero ## $a0 = 00000000 /* 0010C 809BCD6C 26651C24 */ addiu $a1, $s3, 0x1C24 ## $a1 = 00001C24 /* 00110 809BCD70 02403025 */ or $a2, $s2, $zero ## $a2 = 00000000 /* 00114 809BCD74 0C00CDD2 */ jal Actor_ChangeType - + /* 00118 809BCD78 24070006 */ addiu $a3, $zero, 0x0006 ## $a3 = 00000006 -/* 0011C 809BCD7C 0C26F4C6 */ jal func_809BD318 +/* 0011C 809BCD7C 0C26F4C6 */ jal func_809BD318 /* 00120 809BCD80 02402025 */ or $a0, $s2, $zero ## $a0 = 00000000 -/* 00124 809BCD84 10000009 */ beq $zero, $zero, .L809BCDAC -/* 00128 809BCD88 8FBF003C */ lw $ra, 0x003C($sp) +/* 00124 809BCD84 10000009 */ beq $zero, $zero, .L809BCDAC +/* 00128 809BCD88 8FBF003C */ lw $ra, 0x003C($sp) .L809BCD8C: -/* 0012C 809BCD8C 0C26F4F8 */ jal func_809BD3E0 +/* 0012C 809BCD8C 0C26F4F8 */ jal func_809BD3E0 /* 00130 809BCD90 02402025 */ or $a0, $s2, $zero ## $a0 = 00000000 /* 00134 809BCD94 A640019A */ sh $zero, 0x019A($s2) ## 0000019A /* 00138 809BCD98 A6500196 */ sh $s0, 0x0196($s2) ## 00000196 /* 0013C 809BCD9C 3C01809C */ lui $at, %hi(D_809BF528) ## $at = 809C0000 -/* 00140 809BCDA0 C424F528 */ lwc1 $f4, %lo(D_809BF528)($at) +/* 00140 809BCDA0 C424F528 */ lwc1 $f4, %lo(D_809BF528)($at) /* 00144 809BCDA4 E644000C */ swc1 $f4, 0x000C($s2) ## 0000000C -/* 00148 809BCDA8 8FBF003C */ lw $ra, 0x003C($sp) +/* 00148 809BCDA8 8FBF003C */ lw $ra, 0x003C($sp) .L809BCDAC: -/* 0014C 809BCDAC 8FB00028 */ lw $s0, 0x0028($sp) -/* 00150 809BCDB0 8FB1002C */ lw $s1, 0x002C($sp) -/* 00154 809BCDB4 8FB20030 */ lw $s2, 0x0030($sp) -/* 00158 809BCDB8 8FB30034 */ lw $s3, 0x0034($sp) -/* 0015C 809BCDBC 8FB40038 */ lw $s4, 0x0038($sp) -/* 00160 809BCDC0 03E00008 */ jr $ra +/* 0014C 809BCDAC 8FB00028 */ lw $s0, 0x0028($sp) +/* 00150 809BCDB0 8FB1002C */ lw $s1, 0x002C($sp) +/* 00154 809BCDB4 8FB20030 */ lw $s2, 0x0030($sp) +/* 00158 809BCDB8 8FB30034 */ lw $s3, 0x0034($sp) +/* 0015C 809BCDBC 8FB40038 */ lw $s4, 0x0038($sp) +/* 00160 809BCDC0 03E00008 */ jr $ra /* 00164 809BCDC4 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BD318.s b/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BD318.s index b0d4beaa24..66bd3290b7 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BD318.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BD318.s @@ -1,25 +1,25 @@ glabel func_809BD318 /* 006B8 809BD318 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 006BC 809BD31C AFBF0014 */ sw $ra, 0x0014($sp) +/* 006BC 809BD31C AFBF0014 */ sw $ra, 0x0014($sp) /* 006C0 809BD320 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 /* 006C4 809BD324 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 006C8 809BD328 24A514B8 */ addiu $a1, $a1, 0x14B8 ## $a1 = 060014B8 -/* 006CC 809BD32C AFA60018 */ sw $a2, 0x0018($sp) -/* 006D0 809BD330 0C0294BE */ jal func_800A52F8 +/* 006CC 809BD32C AFA60018 */ sw $a2, 0x0018($sp) +/* 006D0 809BD330 0C0294BE */ jal SkelAnime_ChangeAnimDefaultRepeat /* 006D4 809BD334 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 006D8 809BD338 8FA60018 */ lw $a2, 0x0018($sp) +/* 006D8 809BD338 8FA60018 */ lw $a2, 0x0018($sp) /* 006DC 809BD33C 3C01809C */ lui $at, %hi(D_809BF534) ## $at = 809C0000 /* 006E0 809BD340 3C0F809C */ lui $t7, %hi(func_809BD84C) ## $t7 = 809C0000 /* 006E4 809BD344 A4C0019A */ sh $zero, 0x019A($a2) ## 0000019A -/* 006E8 809BD348 C424F534 */ lwc1 $f4, %lo(D_809BF534)($at) +/* 006E8 809BD348 C424F534 */ lwc1 $f4, %lo(D_809BF534)($at) /* 006EC 809BD34C 240E0079 */ addiu $t6, $zero, 0x0079 ## $t6 = 00000079 /* 006F0 809BD350 25EFD84C */ addiu $t7, $t7, %lo(func_809BD84C) ## $t7 = 809BD84C /* 006F4 809BD354 A4CE0196 */ sh $t6, 0x0196($a2) ## 00000196 /* 006F8 809BD358 ACCF0190 */ sw $t7, 0x0190($a2) ## 00000190 /* 006FC 809BD35C E4C4000C */ swc1 $f4, 0x000C($a2) ## 0000000C -/* 00700 809BD360 8FBF0014 */ lw $ra, 0x0014($sp) +/* 00700 809BD360 8FBF0014 */ lw $ra, 0x0014($sp) /* 00704 809BD364 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00708 809BD368 03E00008 */ jr $ra +/* 00708 809BD368 03E00008 */ jr $ra /* 0070C 809BD36C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BD3F8.s b/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BD3F8.s index 005d817a46..3ed15e472e 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BD3F8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BD3F8.s @@ -1,24 +1,24 @@ glabel func_809BD3F8 /* 00798 809BD3F8 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 0079C 809BD3FC AFBF0014 */ sw $ra, 0x0014($sp) +/* 0079C 809BD3FC AFBF0014 */ sw $ra, 0x0014($sp) /* 007A0 809BD400 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 /* 007A4 809BD404 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 007A8 809BD408 24A51CA4 */ addiu $a1, $a1, 0x1CA4 ## $a1 = 06001CA4 -/* 007AC 809BD40C AFA70018 */ sw $a3, 0x0018($sp) +/* 007AC 809BD40C AFA70018 */ sw $a3, 0x0018($sp) /* 007B0 809BD410 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 007B4 809BD414 0C0294D3 */ jal func_800A534C +/* 007B4 809BD414 0C0294D3 */ jal SkelAnime_ChangeAnimTransitionRepeat /* 007B8 809BD418 3C06C0A0 */ lui $a2, 0xC0A0 ## $a2 = C0A00000 -/* 007BC 809BD41C 8FA40018 */ lw $a0, 0x0018($sp) +/* 007BC 809BD41C 8FA40018 */ lw $a0, 0x0018($sp) /* 007C0 809BD420 240E015E */ addiu $t6, $zero, 0x015E ## $t6 = 0000015E /* 007C4 809BD424 240F0050 */ addiu $t7, $zero, 0x0050 ## $t7 = 00000050 /* 007C8 809BD428 80980194 */ lb $t8, 0x0194($a0) ## 00000194 /* 007CC 809BD42C A48E0196 */ sh $t6, 0x0196($a0) ## 00000196 /* 007D0 809BD430 A48F0198 */ sh $t7, 0x0198($a0) ## 00000198 -/* 007D4 809BD434 00180823 */ subu $at, $zero, $t8 -/* 007D8 809BD438 0001CA40 */ sll $t9, $at, 9 -/* 007DC 809BD43C 0C26F38F */ jal func_809BCE3C +/* 007D4 809BD434 00180823 */ subu $at, $zero, $t8 +/* 007D8 809BD438 0001CA40 */ sll $t9, $at, 9 +/* 007DC 809BD43C 0C26F38F */ jal func_809BCE3C /* 007E0 809BD440 A499019A */ sh $t9, 0x019A($a0) ## 0000019A -/* 007E4 809BD444 8FA70018 */ lw $a3, 0x0018($sp) +/* 007E4 809BD444 8FA70018 */ lw $a3, 0x0018($sp) /* 007E8 809BD448 3C0C809C */ lui $t4, %hi(func_809BDC08) ## $t4 = 809C0000 /* 007EC 809BD44C 258CDC08 */ addiu $t4, $t4, %lo(func_809BDC08) ## $t4 = 809BDC08 /* 007F0 809BD450 90E802FC */ lbu $t0, 0x02FC($a3) ## 000002FC @@ -28,9 +28,9 @@ glabel func_809BD3F8 /* 00800 809BD460 354B0001 */ ori $t3, $t2, 0x0001 ## $t3 = 00000001 /* 00804 809BD464 A0E902FC */ sb $t1, 0x02FC($a3) ## 000002FC /* 00808 809BD468 A0EB029D */ sb $t3, 0x029D($a3) ## 0000029D -/* 0080C 809BD46C 8FBF0014 */ lw $ra, 0x0014($sp) +/* 0080C 809BD46C 8FBF0014 */ lw $ra, 0x0014($sp) /* 00810 809BD470 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00814 809BD474 03E00008 */ jr $ra +/* 00814 809BD474 03E00008 */ jr $ra /* 00818 809BD478 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BD4A4.s b/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BD4A4.s index edff3afc5e..6e2cebad64 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BD4A4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BD4A4.s @@ -1,14 +1,14 @@ glabel func_809BD4A4 /* 00844 809BD4A4 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00848 809BD4A8 AFBF0014 */ sw $ra, 0x0014($sp) +/* 00848 809BD4A8 AFBF0014 */ sw $ra, 0x0014($sp) /* 0084C 809BD4AC 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 /* 00850 809BD4B0 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 00854 809BD4B4 24A514B8 */ addiu $a1, $a1, 0x14B8 ## $a1 = 060014B8 -/* 00858 809BD4B8 AFA70018 */ sw $a3, 0x0018($sp) +/* 00858 809BD4B8 AFA70018 */ sw $a3, 0x0018($sp) /* 0085C 809BD4BC 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 00860 809BD4C0 0C0294D3 */ jal func_800A534C +/* 00860 809BD4C0 0C0294D3 */ jal SkelAnime_ChangeAnimTransitionRepeat /* 00864 809BD4C4 3C06C0A0 */ lui $a2, 0xC0A0 ## $a2 = C0A00000 -/* 00868 809BD4C8 8FA70018 */ lw $a3, 0x0018($sp) +/* 00868 809BD4C8 8FA70018 */ lw $a3, 0x0018($sp) /* 0086C 809BD4CC 34018000 */ ori $at, $zero, 0x8000 ## $at = 00008000 /* 00870 809BD4D0 3C0D809C */ lui $t5, %hi(func_809BDFC8) ## $t5 = 809C0000 /* 00874 809BD4D4 84EF00B6 */ lh $t7, 0x00B6($a3) ## 000000B6 @@ -17,8 +17,8 @@ glabel func_809BD4A4 /* 00880 809BD4E0 90EB02FC */ lbu $t3, 0x02FC($a3) ## 000002FC /* 00884 809BD4E4 240E0001 */ addiu $t6, $zero, 0x0001 ## $t6 = 00000001 /* 00888 809BD4E8 25ADDFC8 */ addiu $t5, $t5, %lo(func_809BDFC8) ## $t5 = 809BDFC8 -/* 0088C 809BD4EC 01E1C021 */ addu $t8, $t7, $at -/* 00890 809BD4F0 00194240 */ sll $t0, $t9, 9 +/* 0088C 809BD4EC 01E1C021 */ addu $t8, $t7, $at +/* 00890 809BD4F0 00194240 */ sll $t0, $t9, 9 /* 00894 809BD4F4 312AFFFE */ andi $t2, $t1, 0xFFFE ## $t2 = 00000000 /* 00898 809BD4F8 356C0001 */ ori $t4, $t3, 0x0001 ## $t4 = 00000001 /* 0089C 809BD4FC A0EE0195 */ sb $t6, 0x0195($a3) ## 00000195 @@ -27,9 +27,9 @@ glabel func_809BD4A4 /* 008A8 809BD508 A0EA029D */ sb $t2, 0x029D($a3) ## 0000029D /* 008AC 809BD50C A0EC02FC */ sb $t4, 0x02FC($a3) ## 000002FC /* 008B0 809BD510 ACED0190 */ sw $t5, 0x0190($a3) ## 00000190 -/* 008B4 809BD514 8FBF0014 */ lw $ra, 0x0014($sp) +/* 008B4 809BD514 8FBF0014 */ lw $ra, 0x0014($sp) /* 008B8 809BD518 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 008BC 809BD51C 03E00008 */ jr $ra +/* 008BC 809BD51C 03E00008 */ jr $ra /* 008C0 809BD520 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BD524.s b/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BD524.s index c67bd2f404..db54922686 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BD524.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BD524.s @@ -1,12 +1,12 @@ glabel func_809BD524 /* 008C4 809BD524 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 008C8 809BD528 AFB00020 */ sw $s0, 0x0020($sp) +/* 008C8 809BD528 AFB00020 */ sw $s0, 0x0020($sp) /* 008CC 809BD52C 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 008D0 809BD530 AFBF0024 */ sw $ra, 0x0024($sp) +/* 008D0 809BD530 AFBF0024 */ sw $ra, 0x0024($sp) /* 008D4 809BD534 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 008D8 809BD538 24A50D1C */ addiu $a1, $a1, 0x0D1C ## $a1 = 06000D1C /* 008DC 809BD53C 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 008E0 809BD540 0C029490 */ jal func_800A5240 +/* 008E0 809BD540 0C029490 */ jal SkelAnime_ChangeAnimTransitionStop /* 008E4 809BD544 3C06C0A0 */ lui $a2, 0xC0A0 ## $a2 = C0A00000 /* 008E8 809BD548 920F02FC */ lbu $t7, 0x02FC($s0) ## 000002FC /* 008EC 809BD54C 240E0050 */ addiu $t6, $zero, 0x0050 ## $t6 = 00000050 @@ -16,7 +16,7 @@ glabel func_809BD524 /* 008FC 809BD55C A21802FC */ sb $t8, 0x02FC($s0) ## 000002FC /* 00900 809BD560 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 00904 809BD564 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 00908 809BD568 24053904 */ addiu $a1, $zero, 0x3904 ## $a1 = 00003904 /* 0090C 809BD56C 8E1902A8 */ lw $t9, 0x02A8($s0) ## 000002A8 /* 00910 809BD570 240B0001 */ addiu $t3, $zero, 0x0001 ## $t3 = 00000001 @@ -28,10 +28,10 @@ glabel func_809BD524 /* 00928 809BD588 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 0092C 809BD58C 240600FF */ addiu $a2, $zero, 0x00FF ## $a2 = 000000FF /* 00930 809BD590 312A0001 */ andi $t2, $t1, 0x0001 ## $t2 = 00000000 -/* 00934 809BD594 51400005 */ beql $t2, $zero, .L809BD5AC +/* 00934 809BD594 51400005 */ beql $t2, $zero, .L809BD5AC /* 00938 809BD598 A2000195 */ sb $zero, 0x0195($s0) ## 00000195 /* 0093C 809BD59C A20B0195 */ sb $t3, 0x0195($s0) ## 00000195 -/* 00940 809BD5A0 10000003 */ beq $zero, $zero, .L809BD5B0 +/* 00940 809BD5A0 10000003 */ beq $zero, $zero, .L809BD5B0 /* 00944 809BD5A4 A60C0196 */ sh $t4, 0x0196($s0) ## 00000196 /* 00948 809BD5A8 A2000195 */ sb $zero, 0x0195($s0) ## 00000195 .L809BD5AC: @@ -39,15 +39,15 @@ glabel func_809BD524 .L809BD5B0: /* 00950 809BD5B0 860E0196 */ lh $t6, 0x0196($s0) ## 00000196 /* 00954 809BD5B4 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 00958 809BD5B8 0C00D09B */ jal func_8003426C -/* 0095C 809BD5BC AFAE0010 */ sw $t6, 0x0010($sp) +/* 00958 809BD5B8 0C00D09B */ jal func_8003426C +/* 0095C 809BD5BC AFAE0010 */ sw $t6, 0x0010($sp) /* 00960 809BD5C0 3C0F809C */ lui $t7, %hi(func_809BE058) ## $t7 = 809C0000 /* 00964 809BD5C4 25EFE058 */ addiu $t7, $t7, %lo(func_809BE058) ## $t7 = 809BE058 /* 00968 809BD5C8 AE0F0190 */ sw $t7, 0x0190($s0) ## 00000190 -/* 0096C 809BD5CC 8FBF0024 */ lw $ra, 0x0024($sp) -/* 00970 809BD5D0 8FB00020 */ lw $s0, 0x0020($sp) +/* 0096C 809BD5CC 8FBF0024 */ lw $ra, 0x0024($sp) +/* 00970 809BD5D0 8FB00020 */ lw $s0, 0x0020($sp) /* 00974 809BD5D4 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 00978 809BD5D8 03E00008 */ jr $ra +/* 00978 809BD5D8 03E00008 */ jr $ra /* 0097C 809BD5DC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BD5E0.s b/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BD5E0.s index 253089568f..f452820521 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BD5E0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BD5E0.s @@ -1,12 +1,12 @@ glabel func_809BD5E0 /* 00980 809BD5E0 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 00984 809BD5E4 AFB00020 */ sw $s0, 0x0020($sp) +/* 00984 809BD5E4 AFB00020 */ sw $s0, 0x0020($sp) /* 00988 809BD5E8 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 0098C 809BD5EC AFBF0024 */ sw $ra, 0x0024($sp) +/* 0098C 809BD5EC AFBF0024 */ sw $ra, 0x0024($sp) /* 00990 809BD5F0 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 00994 809BD5F4 24A50444 */ addiu $a1, $a1, 0x0444 ## $a1 = 06000444 /* 00998 809BD5F8 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 0099C 809BD5FC 0C029490 */ jal func_800A5240 +/* 0099C 809BD5FC 0C029490 */ jal SkelAnime_ChangeAnimTransitionStop /* 009A0 809BD600 3C06C0A0 */ lui $a2, 0xC0A0 ## $a2 = C0A00000 /* 009A4 809BD604 920F02FC */ lbu $t7, 0x02FC($s0) ## 000002FC /* 009A8 809BD608 240E0018 */ addiu $t6, $zero, 0x0018 ## $t6 = 00000018 @@ -15,19 +15,19 @@ glabel func_809BD5E0 /* 009B4 809BD614 A600019A */ sh $zero, 0x019A($s0) ## 0000019A /* 009B8 809BD618 A21802FC */ sb $t8, 0x02FC($s0) ## 000002FC /* 009BC 809BD61C 24190018 */ addiu $t9, $zero, 0x0018 ## $t9 = 00000018 -/* 009C0 809BD620 AFB90010 */ sw $t9, 0x0010($sp) +/* 009C0 809BD620 AFB90010 */ sw $t9, 0x0010($sp) /* 009C4 809BD624 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 009C8 809BD628 24054000 */ addiu $a1, $zero, 0x4000 ## $a1 = 00004000 /* 009CC 809BD62C 240600FF */ addiu $a2, $zero, 0x00FF ## $a2 = 000000FF -/* 009D0 809BD630 0C00D09B */ jal func_8003426C +/* 009D0 809BD630 0C00D09B */ jal func_8003426C /* 009D4 809BD634 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 /* 009D8 809BD638 3C08809C */ lui $t0, %hi(func_809BE180) ## $t0 = 809C0000 /* 009DC 809BD63C 2508E180 */ addiu $t0, $t0, %lo(func_809BE180) ## $t0 = 809BE180 /* 009E0 809BD640 AE080190 */ sw $t0, 0x0190($s0) ## 00000190 -/* 009E4 809BD644 8FBF0024 */ lw $ra, 0x0024($sp) -/* 009E8 809BD648 8FB00020 */ lw $s0, 0x0020($sp) +/* 009E4 809BD644 8FBF0024 */ lw $ra, 0x0024($sp) +/* 009E8 809BD648 8FB00020 */ lw $s0, 0x0020($sp) /* 009EC 809BD64C 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 009F0 809BD650 03E00008 */ jr $ra +/* 009F0 809BD650 03E00008 */ jr $ra /* 009F4 809BD654 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BD658.s b/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BD658.s index e687d901b2..5beac5e1db 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BD658.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BD658.s @@ -1,18 +1,18 @@ glabel func_809BD658 /* 009F8 809BD658 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 009FC 809BD65C AFBF0014 */ sw $ra, 0x0014($sp) +/* 009FC 809BD65C AFBF0014 */ sw $ra, 0x0014($sp) /* 00A00 809BD660 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 /* 00A04 809BD664 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 00A08 809BD668 24A50A74 */ addiu $a1, $a1, 0x0A74 ## $a1 = 06000A74 -/* 00A0C 809BD66C AFA70018 */ sw $a3, 0x0018($sp) +/* 00A0C 809BD66C AFA70018 */ sw $a3, 0x0018($sp) /* 00A10 809BD670 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 00A14 809BD674 0C029490 */ jal func_800A5240 +/* 00A14 809BD674 0C029490 */ jal SkelAnime_ChangeAnimTransitionStop /* 00A18 809BD678 3C06C0A0 */ lui $a2, 0xC0A0 ## $a2 = C0A00000 -/* 00A1C 809BD67C 8FA40018 */ lw $a0, 0x0018($sp) +/* 00A1C 809BD67C 8FA40018 */ lw $a0, 0x0018($sp) /* 00A20 809BD680 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 00A24 809BD684 2405390A */ addiu $a1, $zero, 0x390A ## $a1 = 0000390A -/* 00A28 809BD688 8FA70018 */ lw $a3, 0x0018($sp) +/* 00A28 809BD688 8FA70018 */ lw $a3, 0x0018($sp) /* 00A2C 809BD68C 3C18809C */ lui $t8, %hi(func_809BE26C) ## $t8 = 809C0000 /* 00A30 809BD690 240E0026 */ addiu $t6, $zero, 0x0026 ## $t6 = 00000026 /* 00A34 809BD694 240F000A */ addiu $t7, $zero, 0x000A ## $t7 = 0000000A @@ -20,9 +20,9 @@ glabel func_809BD658 /* 00A3C 809BD69C A4EE0196 */ sh $t6, 0x0196($a3) ## 00000196 /* 00A40 809BD6A0 A4EF0198 */ sh $t7, 0x0198($a3) ## 00000198 /* 00A44 809BD6A4 ACF80190 */ sw $t8, 0x0190($a3) ## 00000190 -/* 00A48 809BD6A8 8FBF0014 */ lw $ra, 0x0014($sp) +/* 00A48 809BD6A8 8FBF0014 */ lw $ra, 0x0014($sp) /* 00A4C 809BD6AC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00A50 809BD6B0 03E00008 */ jr $ra +/* 00A50 809BD6B0 03E00008 */ jr $ra /* 00A54 809BD6B4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BEBBC.s b/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BEBBC.s index b9ba826a0f..b0064c1f16 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BEBBC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bigokuta/func_809BEBBC.s @@ -23,7 +23,7 @@ glabel func_809BEBBC /* 01FAC 809BEC0C AFA2001C */ sw $v0, 0x001C($sp) /* 01FB0 809BEC10 27A40044 */ addiu $a0, $sp, 0x0044 ## $a0 = FFFFFFDC /* 01FB4 809BEC14 2407077A */ addiu $a3, $zero, 0x077A ## $a3 = 0000077A -/* 01FB8 809BEC18 0C031AB1 */ jal func_800C6AC4 +/* 01FB8 809BEC18 0C031AB1 */ jal Graph_OpenDisps /* 01FBC 809BEC1C AFA50054 */ sw $a1, 0x0054($sp) /* 01FC0 809BEC20 8FA3007C */ lw $v1, 0x007C($sp) /* 01FC4 809BEC24 8FA2001C */ lw $v0, 0x001C($sp) @@ -166,7 +166,7 @@ glabel func_809BEBBC /* 021B8 809BEE18 8FAE0068 */ lw $t6, 0x0068($sp) /* 021BC 809BEE1C 44D8F800 */ ctc1 $t8, $31 /* 021C0 809BEE20 27A40044 */ addiu $a0, $sp, 0x0044 ## $a0 = FFFFFFDC -/* 021C4 809BEE24 0C031AD5 */ jal func_800C6B54 +/* 021C4 809BEE24 0C031AD5 */ jal Graph_CloseDisps /* 021C8 809BEE28 8DC50000 */ lw $a1, 0x0000($t6) ## 00000008 /* 021CC 809BEE2C 1000009B */ beq $zero, $zero, .L809BF09C /* 021D0 809BEE30 8FBF0014 */ lw $ra, 0x0014($sp) @@ -179,7 +179,7 @@ glabel func_809BEBBC /* 021E8 809BEE48 24C6F4D8 */ addiu $a2, $a2, %lo(D_809BF4D8) ## $a2 = 809BF4D8 /* 021EC 809BEE4C 27A40028 */ addiu $a0, $sp, 0x0028 ## $a0 = FFFFFFC0 /* 021F0 809BEE50 2407079E */ addiu $a3, $zero, 0x079E ## $a3 = 0000079E -/* 021F4 809BEE54 0C031AB1 */ jal func_800C6AC4 +/* 021F4 809BEE54 0C031AB1 */ jal Graph_OpenDisps /* 021F8 809BEE58 AFA50038 */ sw $a1, 0x0038($sp) /* 021FC 809BEE5C 8FA3007C */ lw $v1, 0x007C($sp) /* 02200 809BEE60 3C18809C */ lui $t8, %hi(func_809BE26C) ## $t8 = 809C0000 @@ -261,7 +261,7 @@ glabel func_809BEBBC /* 02320 809BEF80 24C6F4EC */ addiu $a2, $a2, %lo(D_809BF4EC) ## $a2 = 809BF4EC /* 02324 809BEF84 27A40028 */ addiu $a0, $sp, 0x0028 ## $a0 = FFFFFFC0 /* 02328 809BEF88 240707B4 */ addiu $a3, $zero, 0x07B4 ## $a3 = 000007B4 -/* 0232C 809BEF8C 0C031AD5 */ jal func_800C6B54 +/* 0232C 809BEF8C 0C031AD5 */ jal Graph_CloseDisps /* 02330 809BEF90 8D850000 */ lw $a1, 0x0000($t4) ## E7000000 /* 02334 809BEF94 10000041 */ beq $zero, $zero, .L809BF09C /* 02338 809BEF98 8FBF0014 */ lw $ra, 0x0014($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bili/EnBili_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Bili/EnBili_Draw.s index d653bef92f..45d33d5574 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bili/EnBili_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bili/EnBili_Draw.s @@ -1,27 +1,27 @@ glabel EnBili_Draw /* 01BF8 809C1498 27BDFFA8 */ addiu $sp, $sp, 0xFFA8 ## $sp = FFFFFFA8 -/* 01BFC 809C149C AFBF002C */ sw $ra, 0x002C($sp) -/* 01C00 809C14A0 AFB10028 */ sw $s1, 0x0028($sp) -/* 01C04 809C14A4 AFB00024 */ sw $s0, 0x0024($sp) -/* 01C08 809C14A8 AFA5005C */ sw $a1, 0x005C($sp) +/* 01BFC 809C149C AFBF002C */ sw $ra, 0x002C($sp) +/* 01C00 809C14A0 AFB10028 */ sw $s1, 0x0028($sp) +/* 01C04 809C14A4 AFB00024 */ sw $s0, 0x0024($sp) +/* 01C08 809C14A8 AFA5005C */ sw $a1, 0x005C($sp) /* 01C0C 809C14AC 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 /* 01C10 809C14B0 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 01C14 809C14B4 3C06809C */ lui $a2, %hi(D_809C1710) ## $a2 = 809C0000 /* 01C18 809C14B8 24C61710 */ addiu $a2, $a2, %lo(D_809C1710) ## $a2 = 809C1710 /* 01C1C 809C14BC 27A40040 */ addiu $a0, $sp, 0x0040 ## $a0 = FFFFFFE8 /* 01C20 809C14C0 240705F1 */ addiu $a3, $zero, 0x05F1 ## $a3 = 000005F1 -/* 01C24 809C14C4 0C031AB1 */ jal func_800C6AC4 +/* 01C24 809C14C4 0C031AB1 */ jal Graph_OpenDisps /* 01C28 809C14C8 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 -/* 01C2C 809C14CC 8FAF005C */ lw $t7, 0x005C($sp) -/* 01C30 809C14D0 0C024F61 */ jal func_80093D84 +/* 01C2C 809C14CC 8FAF005C */ lw $t7, 0x005C($sp) +/* 01C30 809C14D0 0C024F61 */ jal func_80093D84 /* 01C34 809C14D4 8DE40000 */ lw $a0, 0x0000($t7) ## 00000000 /* 01C38 809C14D8 92020194 */ lbu $v0, 0x0194($s0) ## 00000194 /* 01C3C 809C14DC 3C07809C */ lui $a3, %hi(func_809C13A8) ## $a3 = 809C0000 /* 01C40 809C14E0 24180007 */ addiu $t8, $zero, 0x0007 ## $t8 = 00000007 -/* 01C44 809C14E4 28410008 */ slti $at, $v0, 0x0008 -/* 01C48 809C14E8 14200003 */ bne $at, $zero, .L809C14F8 +/* 01C44 809C14E4 28410008 */ slti $at, $v0, 0x0008 +/* 01C48 809C14E8 14200003 */ bne $at, $zero, .L809C14F8 /* 01C4C 809C14EC 24E713A8 */ addiu $a3, $a3, %lo(func_809C13A8) ## $a3 = 809C13A8 -/* 01C50 809C14F0 10000002 */ beq $zero, $zero, .L809C14FC +/* 01C50 809C14F0 10000002 */ beq $zero, $zero, .L809C14FC /* 01C54 809C14F4 A2180194 */ sb $t8, 0x0194($s0) ## 00000194 .L809C14F8: /* 01C58 809C14F8 A2020194 */ sb $v0, 0x0194($s0) ## 00000194 @@ -35,31 +35,31 @@ glabel EnBili_Draw /* 01C74 809C1514 92090194 */ lbu $t1, 0x0194($s0) ## 00000194 /* 01C78 809C1518 3C04809C */ lui $a0, %hi(D_809C16CC) ## $a0 = 809C0000 /* 01C7C 809C151C 3C0F8016 */ lui $t7, 0x8016 ## $t7 = 80160000 -/* 01C80 809C1520 00095080 */ sll $t2, $t1, 2 -/* 01C84 809C1524 008A2021 */ addu $a0, $a0, $t2 -/* 01C88 809C1528 8C8416CC */ lw $a0, %lo(D_809C16CC)($a0) +/* 01C80 809C1520 00095080 */ sll $t2, $t1, 2 +/* 01C84 809C1524 008A2021 */ addu $a0, $a0, $t2 +/* 01C88 809C1528 8C8416CC */ lw $a0, %lo(D_809C16CC)($a0) /* 01C8C 809C152C 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 /* 01C90 809C1530 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF -/* 01C94 809C1534 00046100 */ sll $t4, $a0, 4 -/* 01C98 809C1538 000C6F02 */ srl $t5, $t4, 28 -/* 01C9C 809C153C 000D7080 */ sll $t6, $t5, 2 -/* 01CA0 809C1540 01EE7821 */ addu $t7, $t7, $t6 +/* 01C94 809C1534 00046100 */ sll $t4, $a0, 4 +/* 01C98 809C1538 000C6F02 */ srl $t5, $t4, 28 +/* 01C9C 809C153C 000D7080 */ sll $t6, $t5, 2 +/* 01CA0 809C1540 01EE7821 */ addu $t7, $t7, $t6 /* 01CA4 809C1544 8DEF6FA8 */ lw $t7, 0x6FA8($t7) ## 80166FA8 -/* 01CA8 809C1548 00815824 */ and $t3, $a0, $at +/* 01CA8 809C1548 00815824 */ and $t3, $a0, $at /* 01CAC 809C154C 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 01CB0 809C1550 016FC021 */ addu $t8, $t3, $t7 -/* 01CB4 809C1554 0301C821 */ addu $t9, $t8, $at +/* 01CB0 809C1550 016FC021 */ addu $t8, $t3, $t7 +/* 01CB4 809C1554 0301C821 */ addu $t9, $t8, $at /* 01CB8 809C1558 AC590004 */ sw $t9, 0x0004($v0) ## 00000004 /* 01CBC 809C155C 8E090190 */ lw $t1, 0x0190($s0) ## 00000190 /* 01CC0 809C1560 3C08809C */ lui $t0, %hi(func_809C02B8) ## $t0 = 809C0000 /* 01CC4 809C1564 250802B8 */ addiu $t0, $t0, %lo(func_809C02B8) ## $t0 = 809C02B8 -/* 01CC8 809C1568 1509000F */ bne $t0, $t1, .L809C15A8 +/* 01CC8 809C1568 1509000F */ bne $t0, $t1, .L809C15A8 /* 01CCC 809C156C 3C18DB06 */ lui $t8, 0xDB06 ## $t8 = DB060000 /* 01CD0 809C1570 860A0196 */ lh $t2, 0x0196($s0) ## 00000196 /* 01CD4 809C1574 3C0EDB06 */ lui $t6, 0xDB06 ## $t6 = DB060000 /* 01CD8 809C1578 35CE0024 */ ori $t6, $t6, 0x0024 ## $t6 = DB060024 /* 01CDC 809C157C 314C0001 */ andi $t4, $t2, 0x0001 ## $t4 = 00000000 -/* 01CE0 809C1580 5180000A */ beql $t4, $zero, .L809C15AC +/* 01CE0 809C1580 5180000A */ beql $t4, $zero, .L809C15AC /* 01CE4 809C1584 8E2202D0 */ lw $v0, 0x02D0($s1) ## 000002D0 /* 01CE8 809C1588 8E2202D0 */ lw $v0, 0x02D0($s1) ## 000002D0 /* 01CEC 809C158C 3C0B809C */ lui $t3, %hi(D_809C16F0) ## $t3 = 809C0000 @@ -67,7 +67,7 @@ glabel EnBili_Draw /* 01CF4 809C1594 244D0008 */ addiu $t5, $v0, 0x0008 ## $t5 = 00000008 /* 01CF8 809C1598 AE2D02D0 */ sw $t5, 0x02D0($s1) ## 000002D0 /* 01CFC 809C159C AC4B0004 */ sw $t3, 0x0004($v0) ## 00000004 -/* 01D00 809C15A0 10000009 */ beq $zero, $zero, .L809C15C8 +/* 01D00 809C15A0 10000009 */ beq $zero, $zero, .L809C15C8 /* 01D04 809C15A4 AC4E0000 */ sw $t6, 0x0000($v0) ## 00000000 .L809C15A8: /* 01D08 809C15A8 8E2202D0 */ lw $v0, 0x02D0($s1) ## 000002D0 @@ -82,24 +82,24 @@ glabel EnBili_Draw .L809C15C8: /* 01D28 809C15C8 8E050150 */ lw $a1, 0x0150($s0) ## 00000150 /* 01D2C 809C15CC 8E06016C */ lw $a2, 0x016C($s0) ## 0000016C -/* 01D30 809C15D0 AFB00014 */ sw $s0, 0x0014($sp) -/* 01D34 809C15D4 AFA00010 */ sw $zero, 0x0010($sp) +/* 01D30 809C15D0 AFB00014 */ sw $s0, 0x0014($sp) +/* 01D34 809C15D4 AFA00010 */ sw $zero, 0x0010($sp) /* 01D38 809C15D8 8E2802D0 */ lw $t0, 0x02D0($s1) ## 000002D0 -/* 01D3C 809C15DC 8FA4005C */ lw $a0, 0x005C($sp) -/* 01D40 809C15E0 0C0288A2 */ jal func_800A2288 -/* 01D44 809C15E4 AFA80018 */ sw $t0, 0x0018($sp) +/* 01D3C 809C15DC 8FA4005C */ lw $a0, 0x005C($sp) +/* 01D40 809C15E0 0C0288A2 */ jal SkelAnime_Draw2 +/* 01D44 809C15E4 AFA80018 */ sw $t0, 0x0018($sp) /* 01D48 809C15E8 AE2202D0 */ sw $v0, 0x02D0($s1) ## 000002D0 -/* 01D4C 809C15EC 8FA9005C */ lw $t1, 0x005C($sp) +/* 01D4C 809C15EC 8FA9005C */ lw $t1, 0x005C($sp) /* 01D50 809C15F0 3C06809C */ lui $a2, %hi(D_809C1720) ## $a2 = 809C0000 /* 01D54 809C15F4 24C61720 */ addiu $a2, $a2, %lo(D_809C1720) ## $a2 = 809C1720 /* 01D58 809C15F8 27A40040 */ addiu $a0, $sp, 0x0040 ## $a0 = FFFFFFE8 /* 01D5C 809C15FC 24070610 */ addiu $a3, $zero, 0x0610 ## $a3 = 00000610 -/* 01D60 809C1600 0C031AD5 */ jal func_800C6B54 +/* 01D60 809C1600 0C031AD5 */ jal Graph_CloseDisps /* 01D64 809C1604 8D250000 */ lw $a1, 0x0000($t1) ## 00000000 -/* 01D68 809C1608 8FBF002C */ lw $ra, 0x002C($sp) -/* 01D6C 809C160C 8FB00024 */ lw $s0, 0x0024($sp) -/* 01D70 809C1610 8FB10028 */ lw $s1, 0x0028($sp) -/* 01D74 809C1614 03E00008 */ jr $ra +/* 01D68 809C1608 8FBF002C */ lw $ra, 0x002C($sp) +/* 01D6C 809C160C 8FB00024 */ lw $s0, 0x0024($sp) +/* 01D70 809C1610 8FB10028 */ lw $s1, 0x0028($sp) +/* 01D74 809C1614 03E00008 */ jr $ra /* 01D78 809C1618 27BD0058 */ addiu $sp, $sp, 0x0058 ## $sp = 00000000 /* 01D7C 809C161C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bili/func_809BFA14.s b/asm/non_matchings/overlays/actors/ovl_En_Bili/func_809BFA14.s index 434ce0c714..bae576b6e8 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bili/func_809BFA14.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bili/func_809BFA14.s @@ -1,20 +1,20 @@ glabel func_809BFA14 /* 00174 809BFA14 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00178 809BFA18 AFBF0014 */ sw $ra, 0x0014($sp) +/* 00178 809BFA18 AFBF0014 */ sw $ra, 0x0014($sp) /* 0017C 809BFA1C 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 /* 00180 809BFA20 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 00184 809BFA24 24A500A4 */ addiu $a1, $a1, 0x00A4 ## $a1 = 060000A4 -/* 00188 809BFA28 AFA60018 */ sw $a2, 0x0018($sp) -/* 0018C 809BFA2C 0C0294BE */ jal func_800A52F8 +/* 00188 809BFA28 AFA60018 */ sw $a2, 0x0018($sp) +/* 0018C 809BFA2C 0C0294BE */ jal SkelAnime_ChangeAnimDefaultRepeat /* 00190 809BFA30 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 00194 809BFA34 8FA60018 */ lw $a2, 0x0018($sp) +/* 00194 809BFA34 8FA60018 */ lw $a2, 0x0018($sp) /* 00198 809BFA38 3C0140C0 */ lui $at, 0x40C0 ## $at = 40C00000 /* 0019C 809BFA3C 44812000 */ mtc1 $at, $f4 ## $f4 = 6.00 /* 001A0 809BFA40 240E0019 */ addiu $t6, $zero, 0x0019 ## $t6 = 00000019 /* 001A4 809BFA44 3C01809C */ lui $at, %hi(D_809C1734) ## $at = 809C0000 /* 001A8 809BFA48 A4CE0196 */ sh $t6, 0x0196($a2) ## 00000196 /* 001AC 809BFA4C E4C40060 */ swc1 $f4, 0x0060($a2) ## 00000060 -/* 001B0 809BFA50 C4261734 */ lwc1 $f6, %lo(D_809C1734)($at) +/* 001B0 809BFA50 C4261734 */ lwc1 $f6, %lo(D_809C1734)($at) /* 001B4 809BFA54 90CF01E4 */ lbu $t7, 0x01E4($a2) ## 000001E4 /* 001B8 809BFA58 3C014040 */ lui $at, 0x4040 ## $at = 40400000 /* 001BC 809BFA5C 44814000 */ mtc1 $at, $f8 ## $f8 = 3.00 @@ -25,9 +25,9 @@ glabel func_809BFA14 /* 001D0 809BFA70 ACD90190 */ sw $t9, 0x0190($a2) ## 00000190 /* 001D4 809BFA74 E4C6006C */ swc1 $f6, 0x006C($a2) ## 0000006C /* 001D8 809BFA78 E4C80068 */ swc1 $f8, 0x0068($a2) ## 00000068 -/* 001DC 809BFA7C 8FBF0014 */ lw $ra, 0x0014($sp) +/* 001DC 809BFA7C 8FBF0014 */ lw $ra, 0x0014($sp) /* 001E0 809BFA80 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 001E4 809BFA84 03E00008 */ jr $ra +/* 001E4 809BFA84 03E00008 */ jr $ra /* 001E8 809BFA88 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bili/func_809BFA8C.s b/asm/non_matchings/overlays/actors/ovl_En_Bili/func_809BFA8C.s index 12bfb71f71..aa3cd69a17 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bili/func_809BFA8C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bili/func_809BFA8C.s @@ -1,13 +1,13 @@ glabel func_809BFA8C /* 001EC 809BFA8C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 001F0 809BFA90 AFBF0014 */ sw $ra, 0x0014($sp) +/* 001F0 809BFA90 AFBF0014 */ sw $ra, 0x0014($sp) /* 001F4 809BFA94 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 /* 001F8 809BFA98 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 001FC 809BFA9C 24A50024 */ addiu $a1, $a1, 0x0024 ## $a1 = 06000024 -/* 00200 809BFAA0 AFA60018 */ sw $a2, 0x0018($sp) -/* 00204 809BFAA4 0C0294BE */ jal func_800A52F8 +/* 00200 809BFAA0 AFA60018 */ sw $a2, 0x0018($sp) +/* 00204 809BFAA4 0C0294BE */ jal SkelAnime_ChangeAnimDefaultRepeat /* 00208 809BFAA8 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 0020C 809BFAAC 8FA60018 */ lw $a2, 0x0018($sp) +/* 0020C 809BFAAC 8FA60018 */ lw $a2, 0x0018($sp) /* 00210 809BFAB0 3C01BF80 */ lui $at, 0xBF80 ## $at = BF800000 /* 00214 809BFAB4 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 /* 00218 809BFAB8 44813000 */ mtc1 $at, $f6 ## $f6 = -1.00 @@ -18,9 +18,9 @@ glabel func_809BFA8C /* 0022C 809BFACC ACCF0190 */ sw $t7, 0x0190($a2) ## 00000190 /* 00230 809BFAD0 E4C40068 */ swc1 $f4, 0x0068($a2) ## 00000068 /* 00234 809BFAD4 E4C60060 */ swc1 $f6, 0x0060($a2) ## 00000060 -/* 00238 809BFAD8 8FBF0014 */ lw $ra, 0x0014($sp) +/* 00238 809BFAD8 8FBF0014 */ lw $ra, 0x0014($sp) /* 0023C 809BFADC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00240 809BFAE0 03E00008 */ jr $ra +/* 00240 809BFAE0 03E00008 */ jr $ra /* 00244 809BFAE4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bili/func_809BFAE8.s b/asm/non_matchings/overlays/actors/ovl_En_Bili/func_809BFAE8.s index 0124253aaf..8465027a26 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bili/func_809BFAE8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bili/func_809BFAE8.s @@ -1,13 +1,13 @@ glabel func_809BFAE8 /* 00248 809BFAE8 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 0024C 809BFAEC AFBF0014 */ sw $ra, 0x0014($sp) +/* 0024C 809BFAEC AFBF0014 */ sw $ra, 0x0014($sp) /* 00250 809BFAF0 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 /* 00254 809BFAF4 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 00258 809BFAF8 24A50064 */ addiu $a1, $a1, 0x0064 ## $a1 = 06000064 -/* 0025C 809BFAFC AFA60018 */ sw $a2, 0x0018($sp) -/* 00260 809BFB00 0C02947A */ jal func_800A51E8 +/* 0025C 809BFAFC AFA60018 */ sw $a2, 0x0018($sp) +/* 00260 809BFB00 0C02947A */ jal SkelAnime_ChangeAnimDefaultStop /* 00264 809BFB04 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 00268 809BFB08 8FA60018 */ lw $a2, 0x0018($sp) +/* 00268 809BFB08 8FA60018 */ lw $a2, 0x0018($sp) /* 0026C 809BFB0C 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 /* 00270 809BFB10 3C18809C */ lui $t8, %hi(func_809C04B4) ## $t8 = 809C0000 /* 00274 809BFB14 90CE01E4 */ lbu $t6, 0x01E4($a2) ## 000001E4 @@ -17,9 +17,9 @@ glabel func_809BFAE8 /* 00284 809BFB24 A0CF01E4 */ sb $t7, 0x01E4($a2) ## 000001E4 /* 00288 809BFB28 E4C00068 */ swc1 $f0, 0x0068($a2) ## 00000068 /* 0028C 809BFB2C E4C00060 */ swc1 $f0, 0x0060($a2) ## 00000060 -/* 00290 809BFB30 8FBF0014 */ lw $ra, 0x0014($sp) +/* 00290 809BFB30 8FBF0014 */ lw $ra, 0x0014($sp) /* 00294 809BFB34 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00298 809BFB38 03E00008 */ jr $ra +/* 00298 809BFB38 03E00008 */ jr $ra /* 0029C 809BFB3C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bili/func_809BFB5C.s b/asm/non_matchings/overlays/actors/ovl_En_Bili/func_809BFB5C.s index f913d5caac..c6057aa37c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bili/func_809BFB5C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bili/func_809BFB5C.s @@ -1,17 +1,17 @@ glabel func_809BFB5C /* 002BC 809BFB5C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 002C0 809BFB60 AFBF0014 */ sw $ra, 0x0014($sp) +/* 002C0 809BFB60 AFBF0014 */ sw $ra, 0x0014($sp) /* 002C4 809BFB64 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 /* 002C8 809BFB68 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 002CC 809BFB6C 24A500A4 */ addiu $a1, $a1, 0x00A4 ## $a1 = 060000A4 -/* 002D0 809BFB70 AFA60018 */ sw $a2, 0x0018($sp) -/* 002D4 809BFB74 0C0294BE */ jal func_800A52F8 +/* 002D0 809BFB70 AFA60018 */ sw $a2, 0x0018($sp) +/* 002D4 809BFB74 0C0294BE */ jal SkelAnime_ChangeAnimDefaultRepeat /* 002D8 809BFB78 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 002DC 809BFB7C 8FA60018 */ lw $a2, 0x0018($sp) +/* 002DC 809BFB7C 8FA60018 */ lw $a2, 0x0018($sp) /* 002E0 809BFB80 240E0060 */ addiu $t6, $zero, 0x0060 ## $t6 = 00000060 /* 002E4 809BFB84 3C01809C */ lui $at, %hi(D_809C173C) ## $at = 809C0000 /* 002E8 809BFB88 A4CE0196 */ sh $t6, 0x0196($a2) ## 00000196 -/* 002EC 809BFB8C C424173C */ lwc1 $f4, %lo(D_809C173C)($at) +/* 002EC 809BFB8C C424173C */ lwc1 $f4, %lo(D_809C173C)($at) /* 002F0 809BFB90 90CF01E4 */ lbu $t7, 0x01E4($a2) ## 000001E4 /* 002F4 809BFB94 C4C60028 */ lwc1 $f6, 0x0028($a2) ## 00000028 /* 002F8 809BFB98 3C19809C */ lui $t9, %hi(func_809C0600) ## $t9 = 809C0000 @@ -21,9 +21,9 @@ glabel func_809BFB5C /* 00308 809BFBA8 ACD90190 */ sw $t9, 0x0190($a2) ## 00000190 /* 0030C 809BFBAC E4C40068 */ swc1 $f4, 0x0068($a2) ## 00000068 /* 00310 809BFBB0 E4C6000C */ swc1 $f6, 0x000C($a2) ## 0000000C -/* 00314 809BFBB4 8FBF0014 */ lw $ra, 0x0014($sp) +/* 00314 809BFBB4 8FBF0014 */ lw $ra, 0x0014($sp) /* 00318 809BFBB8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 0031C 809BFBBC 03E00008 */ jr $ra +/* 0031C 809BFBBC 03E00008 */ jr $ra /* 00320 809BFBC0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bili/func_809BFBC4.s b/asm/non_matchings/overlays/actors/ovl_En_Bili/func_809BFBC4.s index 93d6cfcd33..904cd0cbff 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bili/func_809BFBC4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bili/func_809BFBC4.s @@ -1,25 +1,25 @@ glabel func_809BFBC4 /* 00324 809BFBC4 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 00328 809BFBC8 AFBF001C */ sw $ra, 0x001C($sp) -/* 0032C 809BFBCC AFB00018 */ sw $s0, 0x0018($sp) +/* 00328 809BFBC8 AFBF001C */ sw $ra, 0x001C($sp) +/* 0032C 809BFBCC AFB00018 */ sw $s0, 0x0018($sp) /* 00330 809BFBD0 8C8E0154 */ lw $t6, 0x0154($a0) ## 00000154 /* 00334 809BFBD4 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 00338 809BFBD8 24A500A4 */ addiu $a1, $a1, 0x00A4 ## $a1 = 060000A4 -/* 0033C 809BFBDC 10AE0003 */ beq $a1, $t6, .L809BFBEC +/* 0033C 809BFBDC 10AE0003 */ beq $a1, $t6, .L809BFBEC /* 00340 809BFBE0 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00344 809BFBE4 0C0294BE */ jal func_800A52F8 +/* 00344 809BFBE4 0C0294BE */ jal SkelAnime_ChangeAnimDefaultRepeat /* 00348 809BFBE8 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C .L809BFBEC: /* 0034C 809BFBEC 8E0501DC */ lw $a1, 0x01DC($s0) ## 000001DC /* 00350 809BFBF0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00354 809BFBF4 0C00B6B0 */ jal func_8002DAC0 +/* 00354 809BFBF4 0C00B6B0 */ jal func_8002DAC0 /* 00358 809BFBF8 24A50100 */ addiu $a1, $a1, 0x0100 ## $a1 = 00000100 /* 0035C 809BFBFC 8E0501DC */ lw $a1, 0x01DC($s0) ## 000001DC /* 00360 809BFC00 34018000 */ ori $at, $zero, 0x8000 ## $at = 00008000 -/* 00364 809BFC04 00417821 */ addu $t7, $v0, $at +/* 00364 809BFC04 00417821 */ addu $t7, $v0, $at /* 00368 809BFC08 A60F0032 */ sh $t7, 0x0032($s0) ## 00000032 /* 0036C 809BFC0C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00370 809BFC10 0C00B6CA */ jal func_8002DB28 +/* 00370 809BFC10 0C00B6CA */ jal func_8002DB28 /* 00374 809BFC14 24A50100 */ addiu $a1, $a1, 0x0100 ## $a1 = 00000100 /* 00378 809BFC18 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 /* 0037C 809BFC1C 44812000 */ mtc1 $at, $f4 ## $f4 = 5.00 @@ -28,10 +28,10 @@ glabel func_809BFBC4 /* 00388 809BFC28 A6020030 */ sh $v0, 0x0030($s0) ## 00000030 /* 0038C 809BFC2C AE180190 */ sw $t8, 0x0190($s0) ## 00000190 /* 00390 809BFC30 E6040068 */ swc1 $f4, 0x0068($s0) ## 00000068 -/* 00394 809BFC34 8FBF001C */ lw $ra, 0x001C($sp) -/* 00398 809BFC38 8FB00018 */ lw $s0, 0x0018($sp) +/* 00394 809BFC34 8FBF001C */ lw $ra, 0x001C($sp) +/* 00398 809BFC38 8FB00018 */ lw $s0, 0x0018($sp) /* 0039C 809BFC3C 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 003A0 809BFC40 03E00008 */ jr $ra +/* 003A0 809BFC40 03E00008 */ jr $ra /* 003A4 809BFC44 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bili/func_809BFC48.s b/asm/non_matchings/overlays/actors/ovl_En_Bili/func_809BFC48.s index 3d397ab1b6..85c7a0fee8 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bili/func_809BFC48.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bili/func_809BFC48.s @@ -1,15 +1,15 @@ glabel func_809BFC48 /* 003A8 809BFC48 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 003AC 809BFC4C AFBF0024 */ sw $ra, 0x0024($sp) -/* 003B0 809BFC50 AFB00020 */ sw $s0, 0x0020($sp) +/* 003AC 809BFC4C AFBF0024 */ sw $ra, 0x0024($sp) +/* 003B0 809BFC50 AFB00020 */ sw $s0, 0x0020($sp) /* 003B4 809BFC54 8C8F0190 */ lw $t7, 0x0190($a0) ## 00000190 /* 003B8 809BFC58 3C0E809C */ lui $t6, %hi(func_809C04B4) ## $t6 = 809C0000 /* 003BC 809BFC5C 25CE04B4 */ addiu $t6, $t6, %lo(func_809C04B4) ## $t6 = 809C04B4 -/* 003C0 809BFC60 15CF0005 */ bne $t6, $t7, .L809BFC78 +/* 003C0 809BFC60 15CF0005 */ bne $t6, $t7, .L809BFC78 /* 003C4 809BFC64 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 003C8 809BFC68 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 003CC 809BFC6C 24A500A4 */ addiu $a1, $a1, 0x00A4 ## $a1 = 060000A4 -/* 003D0 809BFC70 0C0294BE */ jal func_800A52F8 +/* 003D0 809BFC70 0C0294BE */ jal SkelAnime_ChangeAnimDefaultRepeat /* 003D4 809BFC74 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C .L809BFC78: /* 003D8 809BFC78 921901E4 */ lbu $t9, 0x01E4($s0) ## 000001E4 @@ -26,19 +26,19 @@ glabel func_809BFC48 /* 00404 809BFCA4 AE0C0004 */ sw $t4, 0x0004($s0) ## 00000004 /* 00408 809BFCA8 240D0014 */ addiu $t5, $zero, 0x0014 ## $t5 = 00000014 /* 0040C 809BFCAC E6040068 */ swc1 $f4, 0x0068($s0) ## 00000068 -/* 00410 809BFCB0 AFAD0010 */ sw $t5, 0x0010($sp) +/* 00410 809BFCB0 AFAD0010 */ sw $t5, 0x0010($sp) /* 00414 809BFCB4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 00418 809BFCB8 24054000 */ addiu $a1, $zero, 0x4000 ## $a1 = 00004000 /* 0041C 809BFCBC 240600C8 */ addiu $a2, $zero, 0x00C8 ## $a2 = 000000C8 -/* 00420 809BFCC0 0C00D09B */ jal func_8003426C +/* 00420 809BFCC0 0C00D09B */ jal func_8003426C /* 00424 809BFCC4 24072000 */ addiu $a3, $zero, 0x2000 ## $a3 = 00002000 /* 00428 809BFCC8 3C0E809C */ lui $t6, %hi(func_809C06E0) ## $t6 = 809C0000 /* 0042C 809BFCCC 25CE06E0 */ addiu $t6, $t6, %lo(func_809C06E0) ## $t6 = 809C06E0 /* 00430 809BFCD0 AE0E0190 */ sw $t6, 0x0190($s0) ## 00000190 -/* 00434 809BFCD4 8FBF0024 */ lw $ra, 0x0024($sp) -/* 00438 809BFCD8 8FB00020 */ lw $s0, 0x0020($sp) +/* 00434 809BFCD4 8FBF0024 */ lw $ra, 0x0024($sp) +/* 00438 809BFCD8 8FB00020 */ lw $s0, 0x0020($sp) /* 0043C 809BFCDC 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 00440 809BFCE0 03E00008 */ jr $ra +/* 00440 809BFCE0 03E00008 */ jr $ra /* 00444 809BFCE4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bird/func_809C1CAC.s b/asm/non_matchings/overlays/actors/ovl_En_Bird/func_809C1CAC.s deleted file mode 100644 index 2b110bf08e..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Bird/func_809C1CAC.s +++ /dev/null @@ -1,53 +0,0 @@ -glabel func_809C1CAC -/* 000FC 809C1CAC 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 00100 809C1CB0 AFA40030 */ sw $a0, 0x0030($sp) -/* 00104 809C1CB4 AFBF0024 */ sw $ra, 0x0024($sp) -/* 00108 809C1CB8 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 -/* 0010C 809C1CBC AFA50034 */ sw $a1, 0x0034($sp) -/* 00110 809C1CC0 0C028800 */ jal SkelAnime_GetFrameCount - -/* 00114 809C1CC4 2484006C */ addiu $a0, $a0, 0x006C ## $a0 = 0600006C -/* 00118 809C1CC8 8FAE0030 */ lw $t6, 0x0030($sp) -/* 0011C 809C1CCC 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 -/* 00120 809C1CD0 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 00124 809C1CD4 85CF019C */ lh $t7, 0x019C($t6) ## 0000019C -/* 00128 809C1CD8 24040005 */ addiu $a0, $zero, 0x0005 ## $a0 = 00000005 -/* 0012C 809C1CDC 24050023 */ addiu $a1, $zero, 0x0023 ## $a1 = 00000023 -/* 00130 809C1CE0 11E00004 */ beq $t7, $zero, .L809C1CF4 -/* 00134 809C1CE4 468020A0 */ cvt.s.w $f2, $f4 -/* 00138 809C1CE8 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 0013C 809C1CEC 10000004 */ beq $zero, $zero, .L809C1D00 -/* 00140 809C1CF0 E7A00028 */ swc1 $f0, 0x0028($sp) -.L809C1CF4: -/* 00144 809C1CF4 44810000 */ mtc1 $at, $f0 ## $f0 = 1.00 -/* 00148 809C1CF8 00000000 */ nop -/* 0014C 809C1CFC E7A00028 */ swc1 $f0, 0x0028($sp) -.L809C1D00: -/* 00150 809C1D00 0C01DF64 */ jal Math_Rand_S16Offset - -/* 00154 809C1D04 E7A2002C */ swc1 $f2, 0x002C($sp) -/* 00158 809C1D08 8FA30030 */ lw $v1, 0x0030($sp) -/* 0015C 809C1D0C C7A00028 */ lwc1 $f0, 0x0028($sp) -/* 00160 809C1D10 44806000 */ mtc1 $zero, $f12 ## $f12 = 0.00 -/* 00164 809C1D14 C7A2002C */ lwc1 $f2, 0x002C($sp) -/* 00168 809C1D18 AC620198 */ sw $v0, 0x0198($v1) ## 00000198 -/* 0016C 809C1D1C 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 00170 809C1D20 44060000 */ mfc1 $a2, $f0 -/* 00174 809C1D24 44076000 */ mfc1 $a3, $f12 -/* 00178 809C1D28 24A5006C */ addiu $a1, $a1, 0x006C ## $a1 = 0600006C -/* 0017C 809C1D2C AFA00014 */ sw $zero, 0x0014($sp) -/* 00180 809C1D30 2464014C */ addiu $a0, $v1, 0x014C ## $a0 = 0000014C -/* 00184 809C1D34 E7AC0018 */ swc1 $f12, 0x0018($sp) -/* 00188 809C1D38 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 0018C 809C1D3C E7A20010 */ swc1 $f2, 0x0010($sp) -/* 00190 809C1D40 3C05809C */ lui $a1, %hi(func_809C1D60) ## $a1 = 809C0000 -/* 00194 809C1D44 24A51D60 */ addiu $a1, $a1, %lo(func_809C1D60) ## $a1 = 809C1D60 -/* 00198 809C1D48 0C2706EC */ jal EnBird_SetNewUpdate -/* 0019C 809C1D4C 8FA40030 */ lw $a0, 0x0030($sp) -/* 001A0 809C1D50 8FBF0024 */ lw $ra, 0x0024($sp) -/* 001A4 809C1D54 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 001A8 809C1D58 03E00008 */ jr $ra -/* 001AC 809C1D5C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Blkobj/EnBlkobj_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Blkobj/EnBlkobj_Draw.s index c19720cdc0..eb4eafb0d1 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Blkobj/EnBlkobj_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Blkobj/EnBlkobj_Draw.s @@ -10,7 +10,7 @@ glabel EnBlkobj_Draw /* 003B8 809C2418 24C625D8 */ addiu $a2, $a2, %lo(D_809C25D8) ## $a2 = 809C25D8 /* 003BC 809C241C 27A4004C */ addiu $a0, $sp, 0x004C ## $a0 = FFFFFFDC /* 003C0 809C2420 2407015D */ addiu $a3, $zero, 0x015D ## $a3 = 0000015D -/* 003C4 809C2424 0C031AB1 */ jal func_800C6AC4 +/* 003C4 809C2424 0C031AB1 */ jal Graph_OpenDisps /* 003C8 809C2428 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 /* 003CC 809C242C 0C024F61 */ jal func_80093D84 /* 003D0 809C2430 8E240000 */ lw $a0, 0x0000($s1) ## 00000000 @@ -39,7 +39,7 @@ glabel EnBlkobj_Draw /* 0042C 809C248C AFA00020 */ sw $zero, 0x0020($sp) /* 00430 809C2490 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 00434 809C2494 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 00438 809C2498 0C0253D0 */ jal Draw_TwoTexScroll +/* 00438 809C2498 0C0253D0 */ jal Gfx_TwoTexScroll /* 0043C 809C249C AFA20048 */ sw $v0, 0x0048($sp) /* 00440 809C24A0 8FA30048 */ lw $v1, 0x0048($sp) /* 00444 809C24A4 3C0CDA38 */ lui $t4, 0xDA38 ## $t4 = DA380000 @@ -81,7 +81,7 @@ glabel EnBlkobj_Draw /* 004CC 809C252C 24C62600 */ addiu $a2, $a2, %lo(D_809C2600) ## $a2 = 809C2600 /* 004D0 809C2530 27A4004C */ addiu $a0, $sp, 0x004C ## $a0 = FFFFFFDC /* 004D4 809C2534 8E250000 */ lw $a1, 0x0000($s1) ## 00000000 -/* 004D8 809C2538 0C031AD5 */ jal func_800C6B54 +/* 004D8 809C2538 0C031AD5 */ jal Graph_CloseDisps /* 004DC 809C253C 24070177 */ addiu $a3, $zero, 0x0177 ## $a3 = 00000177 /* 004E0 809C2540 8FBF003C */ lw $ra, 0x003C($sp) /* 004E4 809C2544 8FB00034 */ lw $s0, 0x0034($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Blkobj/func_809C2324.s b/asm/non_matchings/overlays/actors/ovl_En_Blkobj/func_809C2324.s index 34d7782dc5..c46039c60a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Blkobj/func_809C2324.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Blkobj/func_809C2324.s @@ -9,7 +9,7 @@ glabel func_809C2324 /* 002E0 809C2340 24C625B0 */ addiu $a2, $a2, %lo(D_809C25B0) ## $a2 = 809C25B0 /* 002E4 809C2344 27A40028 */ addiu $a0, $sp, 0x0028 ## $a0 = FFFFFFE8 /* 002E8 809C2348 24070142 */ addiu $a3, $zero, 0x0142 ## $a3 = 00000142 -/* 002EC 809C234C 0C031AB1 */ jal func_800C6AC4 +/* 002EC 809C234C 0C031AB1 */ jal Graph_OpenDisps /* 002F0 809C2350 AFA50038 */ sw $a1, 0x0038($sp) /* 002F4 809C2354 8FA50048 */ lw $a1, 0x0048($sp) /* 002F8 809C2358 240100FF */ addiu $at, $zero, 0x00FF ## $at = 000000FF @@ -48,7 +48,7 @@ glabel func_809C2324 /* 00374 809C23D4 AC4D0004 */ sw $t5, 0x0004($v0) ## 00000004 /* 00378 809C23D8 8FAE0040 */ lw $t6, 0x0040($sp) /* 0037C 809C23DC 2407014A */ addiu $a3, $zero, 0x014A ## $a3 = 0000014A -/* 00380 809C23E0 0C031AD5 */ jal func_800C6B54 +/* 00380 809C23E0 0C031AD5 */ jal Graph_CloseDisps /* 00384 809C23E4 8DC50000 */ lw $a1, 0x0000($t6) ## 00000000 /* 00388 809C23E8 8FBF0014 */ lw $ra, 0x0014($sp) /* 0038C 809C23EC 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bom/EnBom_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Bom/EnBom_Draw.s index b842a23075..c534c37556 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bom/EnBom_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bom/EnBom_Draw.s @@ -1,31 +1,31 @@ glabel EnBom_Draw /* 00B48 809C3218 27BDFFA0 */ addiu $sp, $sp, 0xFFA0 ## $sp = FFFFFFA0 -/* 00B4C 809C321C AFBF001C */ sw $ra, 0x001C($sp) -/* 00B50 809C3220 AFB00018 */ sw $s0, 0x0018($sp) -/* 00B54 809C3224 AFA40060 */ sw $a0, 0x0060($sp) -/* 00B58 809C3228 AFA50064 */ sw $a1, 0x0064($sp) +/* 00B4C 809C321C AFBF001C */ sw $ra, 0x001C($sp) +/* 00B50 809C3220 AFB00018 */ sw $s0, 0x0018($sp) +/* 00B54 809C3224 AFA40060 */ sw $a0, 0x0060($sp) +/* 00B58 809C3228 AFA50064 */ sw $a1, 0x0064($sp) /* 00B5C 809C322C 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 /* 00B60 809C3230 3C06809C */ lui $a2, %hi(D_809C34D0) ## $a2 = 809C0000 /* 00B64 809C3234 24C634D0 */ addiu $a2, $a2, %lo(D_809C34D0) ## $a2 = 809C34D0 /* 00B68 809C3238 27A40044 */ addiu $a0, $sp, 0x0044 ## $a0 = FFFFFFE4 /* 00B6C 809C323C 24070391 */ addiu $a3, $zero, 0x0391 ## $a3 = 00000391 -/* 00B70 809C3240 0C031AB1 */ jal func_800C6AC4 +/* 00B70 809C3240 0C031AB1 */ jal Graph_OpenDisps /* 00B74 809C3244 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 -/* 00B78 809C3248 8FAF0060 */ lw $t7, 0x0060($sp) -/* 00B7C 809C324C 8FB90064 */ lw $t9, 0x0064($sp) +/* 00B78 809C3248 8FAF0060 */ lw $t7, 0x0060($sp) +/* 00B7C 809C324C 8FB90064 */ lw $t9, 0x0064($sp) /* 00B80 809C3250 85F8001C */ lh $t8, 0x001C($t7) ## 0000001C -/* 00B84 809C3254 57000062 */ bnel $t8, $zero, .L809C33E0 -/* 00B88 809C3258 8FAC0064 */ lw $t4, 0x0064($sp) -/* 00B8C 809C325C 0C024F46 */ jal func_80093D18 +/* 00B84 809C3254 57000062 */ bnel $t8, $zero, .L809C33E0 +/* 00B88 809C3258 8FAC0064 */ lw $t4, 0x0064($sp) +/* 00B8C 809C325C 0C024F46 */ jal func_80093D18 /* 00B90 809C3260 8F240000 */ lw $a0, 0x0000($t9) ## 00000000 -/* 00B94 809C3264 8FA40064 */ lw $a0, 0x0064($sp) +/* 00B94 809C3264 8FA40064 */ lw $a0, 0x0064($sp) /* 00B98 809C3268 3C010001 */ lui $at, 0x0001 ## $at = 00010000 /* 00B9C 809C326C 34211DA0 */ ori $at, $at, 0x1DA0 ## $at = 00011DA0 -/* 00BA0 809C3270 0C0347F5 */ jal func_800D1FD4 -/* 00BA4 809C3274 00812021 */ addu $a0, $a0, $at -/* 00BA8 809C3278 8FA40060 */ lw $a0, 0x0060($sp) -/* 00BAC 809C327C 8FA50064 */ lw $a1, 0x0064($sp) -/* 00BB0 809C3280 0C00BAF3 */ jal func_8002EBCC +/* 00BA0 809C3270 0C0347F5 */ jal func_800D1FD4 +/* 00BA4 809C3274 00812021 */ addu $a0, $a0, $at +/* 00BA8 809C3278 8FA40060 */ lw $a0, 0x0060($sp) +/* 00BAC 809C327C 8FA50064 */ lw $a1, 0x0064($sp) +/* 00BB0 809C3280 0C00BAF3 */ jal func_8002EBCC /* 00BB4 809C3284 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 /* 00BB8 809C3288 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 /* 00BBC 809C328C 3C09DA38 */ lui $t1, 0xDA38 ## $t1 = DA380000 @@ -33,14 +33,14 @@ glabel EnBom_Draw /* 00BC4 809C3294 24480008 */ addiu $t0, $v0, 0x0008 ## $t0 = 00000008 /* 00BC8 809C3298 AE0802C0 */ sw $t0, 0x02C0($s0) ## 000002C0 /* 00BCC 809C329C AC490000 */ sw $t1, 0x0000($v0) ## 00000000 -/* 00BD0 809C32A0 8FAA0064 */ lw $t2, 0x0064($sp) +/* 00BD0 809C32A0 8FAA0064 */ lw $t2, 0x0064($sp) /* 00BD4 809C32A4 3C05809C */ lui $a1, %hi(D_809C34E0) ## $a1 = 809C0000 /* 00BD8 809C32A8 24A534E0 */ addiu $a1, $a1, %lo(D_809C34E0) ## $a1 = 809C34E0 /* 00BDC 809C32AC 8D440000 */ lw $a0, 0x0000($t2) ## 00000000 /* 00BE0 809C32B0 240603A0 */ addiu $a2, $zero, 0x03A0 ## $a2 = 000003A0 -/* 00BE4 809C32B4 0C0346A2 */ jal Matrix_NewMtx -/* 00BE8 809C32B8 AFA20040 */ sw $v0, 0x0040($sp) -/* 00BEC 809C32BC 8FA30040 */ lw $v1, 0x0040($sp) +/* 00BE4 809C32B4 0C0346A2 */ jal Matrix_NewMtx +/* 00BE8 809C32B8 AFA20040 */ sw $v0, 0x0040($sp) +/* 00BEC 809C32BC 8FA30040 */ lw $v1, 0x0040($sp) /* 00BF0 809C32C0 3C0D0400 */ lui $t5, 0x0400 ## $t5 = 04000000 /* 00BF4 809C32C4 25AD7A50 */ addiu $t5, $t5, 0x7A50 ## $t5 = 04007A50 /* 00BF8 809C32C8 AC620004 */ sw $v0, 0x0004($v1) ## 00000004 @@ -53,7 +53,7 @@ glabel EnBom_Draw /* 00C14 809C32E4 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 /* 00C18 809C32E8 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 /* 00C1C 809C32EC AC4D0004 */ sw $t5, 0x0004($v0) ## 00000004 -/* 00C20 809C32F0 0C034421 */ jal Matrix_RotateXYZ +/* 00C20 809C32F0 0C034421 */ jal Matrix_RotateZYX /* 00C24 809C32F4 AC4C0000 */ sw $t4, 0x0000($v0) ## 00000000 /* 00C28 809C32F8 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 /* 00C2C 809C32FC 3C0FDA38 */ lui $t7, 0xDA38 ## $t7 = DA380000 @@ -61,14 +61,14 @@ glabel EnBom_Draw /* 00C34 809C3304 244E0008 */ addiu $t6, $v0, 0x0008 ## $t6 = 00000008 /* 00C38 809C3308 AE0E02C0 */ sw $t6, 0x02C0($s0) ## 000002C0 /* 00C3C 809C330C AC4F0000 */ sw $t7, 0x0000($v0) ## 00000000 -/* 00C40 809C3310 8FB80064 */ lw $t8, 0x0064($sp) +/* 00C40 809C3310 8FB80064 */ lw $t8, 0x0064($sp) /* 00C44 809C3314 3C05809C */ lui $a1, %hi(D_809C34F0) ## $a1 = 809C0000 /* 00C48 809C3318 24A534F0 */ addiu $a1, $a1, %lo(D_809C34F0) ## $a1 = 809C34F0 /* 00C4C 809C331C 8F040000 */ lw $a0, 0x0000($t8) ## 00000000 /* 00C50 809C3320 240603A6 */ addiu $a2, $zero, 0x03A6 ## $a2 = 000003A6 -/* 00C54 809C3324 0C0346A2 */ jal Matrix_NewMtx -/* 00C58 809C3328 AFA20038 */ sw $v0, 0x0038($sp) -/* 00C5C 809C332C 8FA30038 */ lw $v1, 0x0038($sp) +/* 00C54 809C3324 0C0346A2 */ jal Matrix_NewMtx +/* 00C58 809C3328 AFA20038 */ sw $v0, 0x0038($sp) +/* 00C5C 809C332C 8FA30038 */ lw $v1, 0x0038($sp) /* 00C60 809C3330 3C08E700 */ lui $t0, 0xE700 ## $t0 = E7000000 /* 00C64 809C3334 3C0AFB00 */ lui $t2, 0xFB00 ## $t2 = FB000000 /* 00C68 809C3338 AC620004 */ sw $v0, 0x0004($v1) ## 00000004 @@ -80,7 +80,7 @@ glabel EnBom_Draw /* 00C80 809C3350 AC400004 */ sw $zero, 0x0004($v0) ## 00000004 /* 00C84 809C3354 AC480000 */ sw $t0, 0x0000($v0) ## 00000000 /* 00C88 809C3358 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 -/* 00C8C 809C335C 8FA60060 */ lw $a2, 0x0060($sp) +/* 00C8C 809C335C 8FA60060 */ lw $a2, 0x0060($sp) /* 00C90 809C3360 00002025 */ or $a0, $zero, $zero ## $a0 = 00000000 /* 00C94 809C3364 24490008 */ addiu $t1, $v0, 0x0008 ## $t1 = 00000008 /* 00C98 809C3368 AE0902C0 */ sw $t1, 0x02C0($s0) ## 000002C0 @@ -88,10 +88,10 @@ glabel EnBom_Draw /* 00CA0 809C3370 C4C401FC */ lwc1 $f4, 0x01FC($a2) ## 000001FC /* 00CA4 809C3374 3C0AFA00 */ lui $t2, 0xFA00 ## $t2 = FA000000 /* 00CA8 809C3378 24C50198 */ addiu $a1, $a2, 0x0198 ## $a1 = 00000198 -/* 00CAC 809C337C 4600218D */ trunc.w.s $f6, $f4 -/* 00CB0 809C3380 440F3000 */ mfc1 $t7, $f6 +/* 00CAC 809C337C 4600218D */ trunc.w.s $f6, $f4 +/* 00CB0 809C3380 440F3000 */ mfc1 $t7, $f6 /* 00CB4 809C3384 00000000 */ nop -/* 00CB8 809C3388 000FCE00 */ sll $t9, $t7, 24 +/* 00CB8 809C3388 000FCE00 */ sll $t9, $t7, 24 /* 00CBC 809C338C 372828FF */ ori $t0, $t9, 0x28FF ## $t0 = 000028FF /* 00CC0 809C3390 AC480004 */ sw $t0, 0x0004($v0) ## 00000004 /* 00CC4 809C3394 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 @@ -100,30 +100,30 @@ glabel EnBom_Draw /* 00CD0 809C33A0 AC4A0000 */ sw $t2, 0x0000($v0) ## 00000000 /* 00CD4 809C33A4 C4C801FC */ lwc1 $f8, 0x01FC($a2) ## 000001FC /* 00CD8 809C33A8 3C0ADE00 */ lui $t2, 0xDE00 ## $t2 = DE000000 -/* 00CDC 809C33AC 4600428D */ trunc.w.s $f10, $f8 -/* 00CE0 809C33B0 440F5000 */ mfc1 $t7, $f10 +/* 00CDC 809C33AC 4600428D */ trunc.w.s $f10, $f8 +/* 00CE0 809C33B0 440F5000 */ mfc1 $t7, $f10 /* 00CE4 809C33B4 00000000 */ nop -/* 00CE8 809C33B8 000FCE00 */ sll $t9, $t7, 24 +/* 00CE8 809C33B8 000FCE00 */ sll $t9, $t7, 24 /* 00CEC 809C33BC 372828FF */ ori $t0, $t9, 0x28FF ## $t0 = 000028FF /* 00CF0 809C33C0 AC480004 */ sw $t0, 0x0004($v0) ## 00000004 /* 00CF4 809C33C4 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 /* 00CF8 809C33C8 24490008 */ addiu $t1, $v0, 0x0008 ## $t1 = 00000008 /* 00CFC 809C33CC AE0902C0 */ sw $t1, 0x02C0($s0) ## 000002C0 /* 00D00 809C33D0 AC4B0004 */ sw $t3, 0x0004($v0) ## 00000004 -/* 00D04 809C33D4 0C018A29 */ jal func_800628A4 +/* 00D04 809C33D4 0C018A29 */ jal func_800628A4 /* 00D08 809C33D8 AC4A0000 */ sw $t2, 0x0000($v0) ## 00000000 -/* 00D0C 809C33DC 8FAC0064 */ lw $t4, 0x0064($sp) +/* 00D0C 809C33DC 8FAC0064 */ lw $t4, 0x0064($sp) .L809C33E0: /* 00D10 809C33E0 3C06809C */ lui $a2, %hi(D_809C3500) ## $a2 = 809C0000 /* 00D14 809C33E4 24C63500 */ addiu $a2, $a2, %lo(D_809C3500) ## $a2 = 809C3500 /* 00D18 809C33E8 27A40044 */ addiu $a0, $sp, 0x0044 ## $a0 = FFFFFFE4 /* 00D1C 809C33EC 240703B7 */ addiu $a3, $zero, 0x03B7 ## $a3 = 000003B7 -/* 00D20 809C33F0 0C031AD5 */ jal func_800C6B54 +/* 00D20 809C33F0 0C031AD5 */ jal Graph_CloseDisps /* 00D24 809C33F4 8D850000 */ lw $a1, 0x0000($t4) ## 00000000 -/* 00D28 809C33F8 8FBF001C */ lw $ra, 0x001C($sp) -/* 00D2C 809C33FC 8FB00018 */ lw $s0, 0x0018($sp) +/* 00D28 809C33F8 8FBF001C */ lw $ra, 0x001C($sp) +/* 00D2C 809C33FC 8FB00018 */ lw $s0, 0x0018($sp) /* 00D30 809C3400 27BD0060 */ addiu $sp, $sp, 0x0060 ## $sp = 00000000 -/* 00D34 809C3404 03E00008 */ jr $ra +/* 00D34 809C3404 03E00008 */ jr $ra /* 00D38 809C3408 00000000 */ nop /* 00D3C 809C340C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bom_Bowl_Man/EnBomBowlMan_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Bom_Bowl_Man/EnBomBowlMan_Draw.s index 5be811c2d4..ddb0f1c32f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bom_Bowl_Man/EnBomBowlMan_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bom_Bowl_Man/EnBomBowlMan_Draw.s @@ -1,20 +1,20 @@ glabel EnBomBowlMan_Draw /* 012BC 809C48EC 27BDFFB0 */ addiu $sp, $sp, 0xFFB0 ## $sp = FFFFFFB0 -/* 012C0 809C48F0 AFBF002C */ sw $ra, 0x002C($sp) -/* 012C4 809C48F4 AFB00028 */ sw $s0, 0x0028($sp) -/* 012C8 809C48F8 AFA50054 */ sw $a1, 0x0054($sp) +/* 012C0 809C48F0 AFBF002C */ sw $ra, 0x002C($sp) +/* 012C4 809C48F4 AFB00028 */ sw $s0, 0x0028($sp) +/* 012C8 809C48F8 AFA50054 */ sw $a1, 0x0054($sp) /* 012CC 809C48FC 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 /* 012D0 809C4900 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 012D4 809C4904 3C06809C */ lui $a2, %hi(D_809C4C44) ## $a2 = 809C0000 /* 012D8 809C4908 24C64C44 */ addiu $a2, $a2, %lo(D_809C4C44) ## $a2 = 809C4C44 /* 012DC 809C490C 27A40038 */ addiu $a0, $sp, 0x0038 ## $a0 = FFFFFFE8 /* 012E0 809C4910 2407038B */ addiu $a3, $zero, 0x038B ## $a3 = 0000038B -/* 012E4 809C4914 0C031AB1 */ jal func_800C6AC4 -/* 012E8 809C4918 AFA50048 */ sw $a1, 0x0048($sp) -/* 012EC 809C491C 8FAF0054 */ lw $t7, 0x0054($sp) -/* 012F0 809C4920 0C024F46 */ jal func_80093D18 +/* 012E4 809C4914 0C031AB1 */ jal Graph_OpenDisps +/* 012E8 809C4918 AFA50048 */ sw $a1, 0x0048($sp) +/* 012EC 809C491C 8FAF0054 */ lw $t7, 0x0054($sp) +/* 012F0 809C4920 0C024F46 */ jal func_80093D18 /* 012F4 809C4924 8DE40000 */ lw $a0, 0x0000($t7) ## 00000000 -/* 012F8 809C4928 8FA50048 */ lw $a1, 0x0048($sp) +/* 012F8 809C4928 8FA50048 */ lw $a1, 0x0048($sp) /* 012FC 809C492C 3C19DB06 */ lui $t9, 0xDB06 ## $t9 = DB060000 /* 01300 809C4930 37390020 */ ori $t9, $t9, 0x0020 ## $t9 = DB060020 /* 01304 809C4934 8CA302C0 */ lw $v1, 0x02C0($a1) ## 000002C0 @@ -26,40 +26,40 @@ glabel EnBomBowlMan_Draw /* 0131C 809C494C 86080234 */ lh $t0, 0x0234($s0) ## 00000234 /* 01320 809C4950 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 /* 01324 809C4954 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF -/* 01328 809C4958 00084880 */ sll $t1, $t0, 2 -/* 0132C 809C495C 00892021 */ addu $a0, $a0, $t1 -/* 01330 809C4960 8C844AA8 */ lw $a0, %lo(D_809C4AA8)($a0) +/* 01328 809C4958 00084880 */ sll $t1, $t0, 2 +/* 0132C 809C495C 00892021 */ addu $a0, $a0, $t1 +/* 01330 809C4960 8C844AA8 */ lw $a0, %lo(D_809C4AA8)($a0) /* 01334 809C4964 3C19809C */ lui $t9, %hi(func_809C48A8) ## $t9 = 809C0000 /* 01338 809C4968 273948A8 */ addiu $t9, $t9, %lo(func_809C48A8) ## $t9 = 809C48A8 -/* 0133C 809C496C 00045900 */ sll $t3, $a0, 4 -/* 01340 809C4970 000B6702 */ srl $t4, $t3, 28 -/* 01344 809C4974 000C6880 */ sll $t5, $t4, 2 -/* 01348 809C4978 01CD7021 */ addu $t6, $t6, $t5 +/* 0133C 809C496C 00045900 */ sll $t3, $a0, 4 +/* 01340 809C4970 000B6702 */ srl $t4, $t3, 28 +/* 01344 809C4974 000C6880 */ sll $t5, $t4, 2 +/* 01348 809C4978 01CD7021 */ addu $t6, $t6, $t5 /* 0134C 809C497C 8DCE6FA8 */ lw $t6, 0x6FA8($t6) ## 80166FA8 -/* 01350 809C4980 00815024 */ and $t2, $a0, $at +/* 01350 809C4980 00815024 */ and $t2, $a0, $at /* 01354 809C4984 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 01358 809C4988 014E7821 */ addu $t7, $t2, $t6 -/* 0135C 809C498C 01E1C021 */ addu $t8, $t7, $at +/* 01358 809C4988 014E7821 */ addu $t7, $t2, $t6 +/* 0135C 809C498C 01E1C021 */ addu $t8, $t7, $at /* 01360 809C4990 AC780004 */ sw $t8, 0x0004($v1) ## 00000004 /* 01364 809C4994 9207014E */ lbu $a3, 0x014E($s0) ## 0000014E /* 01368 809C4998 8E06016C */ lw $a2, 0x016C($s0) ## 0000016C /* 0136C 809C499C 8E050150 */ lw $a1, 0x0150($s0) ## 00000150 -/* 01370 809C49A0 AFB00018 */ sw $s0, 0x0018($sp) -/* 01374 809C49A4 AFA00014 */ sw $zero, 0x0014($sp) -/* 01378 809C49A8 AFB90010 */ sw $t9, 0x0010($sp) -/* 0137C 809C49AC 0C0286B2 */ jal func_800A1AC8 -/* 01380 809C49B0 8FA40054 */ lw $a0, 0x0054($sp) -/* 01384 809C49B4 8FA80054 */ lw $t0, 0x0054($sp) +/* 01370 809C49A0 AFB00018 */ sw $s0, 0x0018($sp) +/* 01374 809C49A4 AFA00014 */ sw $zero, 0x0014($sp) +/* 01378 809C49A8 AFB90010 */ sw $t9, 0x0010($sp) +/* 0137C 809C49AC 0C0286B2 */ jal SkelAnime_DrawSV +/* 01380 809C49B0 8FA40054 */ lw $a0, 0x0054($sp) +/* 01384 809C49B4 8FA80054 */ lw $t0, 0x0054($sp) /* 01388 809C49B8 3C06809C */ lui $a2, %hi(D_809C4C5C) ## $a2 = 809C0000 /* 0138C 809C49BC 24C64C5C */ addiu $a2, $a2, %lo(D_809C4C5C) ## $a2 = 809C4C5C /* 01390 809C49C0 27A40038 */ addiu $a0, $sp, 0x0038 ## $a0 = FFFFFFE8 /* 01394 809C49C4 2407039B */ addiu $a3, $zero, 0x039B ## $a3 = 0000039B -/* 01398 809C49C8 0C031AD5 */ jal func_800C6B54 +/* 01398 809C49C8 0C031AD5 */ jal Graph_CloseDisps /* 0139C 809C49CC 8D050000 */ lw $a1, 0x0000($t0) ## 00000000 -/* 013A0 809C49D0 8FBF002C */ lw $ra, 0x002C($sp) -/* 013A4 809C49D4 8FB00028 */ lw $s0, 0x0028($sp) +/* 013A0 809C49D0 8FBF002C */ lw $ra, 0x002C($sp) +/* 013A4 809C49D4 8FB00028 */ lw $s0, 0x0028($sp) /* 013A8 809C49D8 27BD0050 */ addiu $sp, $sp, 0x0050 ## $sp = 00000000 -/* 013AC 809C49DC 03E00008 */ jr $ra +/* 013AC 809C49DC 03E00008 */ jr $ra /* 013B0 809C49E0 00000000 */ nop /* 013B4 809C49E4 00000000 */ nop /* 013B8 809C49E8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bom_Bowl_Man/EnBomBowlMan_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Bom_Bowl_Man/EnBomBowlMan_Init.s index 22903f5b8d..61fd8fb8f1 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bom_Bowl_Man/EnBomBowlMan_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bom_Bowl_Man/EnBomBowlMan_Init.s @@ -1,47 +1,47 @@ glabel EnBomBowlMan_Init /* 00000 809C3630 27BDFFA8 */ addiu $sp, $sp, 0xFFA8 ## $sp = FFFFFFA8 -/* 00004 809C3634 AFBE0050 */ sw $s8, 0x0050($sp) -/* 00008 809C3638 AFB3003C */ sw $s3, 0x003C($sp) +/* 00004 809C3634 AFBE0050 */ sw $s8, 0x0050($sp) +/* 00008 809C3638 AFB3003C */ sw $s3, 0x003C($sp) /* 0000C 809C363C 00A09825 */ or $s3, $a1, $zero ## $s3 = 00000000 /* 00010 809C3640 0080F025 */ or $s8, $a0, $zero ## $s8 = 00000000 -/* 00014 809C3644 AFBF0054 */ sw $ra, 0x0054($sp) +/* 00014 809C3644 AFBF0054 */ sw $ra, 0x0054($sp) /* 00018 809C3648 3C068003 */ lui $a2, 0x8003 ## $a2 = 80030000 -/* 0001C 809C364C AFB7004C */ sw $s7, 0x004C($sp) -/* 00020 809C3650 AFB60048 */ sw $s6, 0x0048($sp) -/* 00024 809C3654 AFB50044 */ sw $s5, 0x0044($sp) -/* 00028 809C3658 AFB40040 */ sw $s4, 0x0040($sp) -/* 0002C 809C365C AFB20038 */ sw $s2, 0x0038($sp) -/* 00030 809C3660 AFB10034 */ sw $s1, 0x0034($sp) -/* 00034 809C3664 AFB00030 */ sw $s0, 0x0030($sp) +/* 0001C 809C364C AFB7004C */ sw $s7, 0x004C($sp) +/* 00020 809C3650 AFB60048 */ sw $s6, 0x0048($sp) +/* 00024 809C3654 AFB50044 */ sw $s5, 0x0044($sp) +/* 00028 809C3658 AFB40040 */ sw $s4, 0x0040($sp) +/* 0002C 809C365C AFB20038 */ sw $s2, 0x0038($sp) +/* 00030 809C3660 AFB10034 */ sw $s1, 0x0034($sp) +/* 00034 809C3664 AFB00030 */ sw $s0, 0x0030($sp) /* 00038 809C3668 24C6B5EC */ addiu $a2, $a2, 0xB5EC ## $a2 = 8002B5EC /* 0003C 809C366C 248400B4 */ addiu $a0, $a0, 0x00B4 ## $a0 = 000000B4 /* 00040 809C3670 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 /* 00044 809C3674 0C00AC78 */ jal ActorShape_Init - + /* 00048 809C3678 3C0741F0 */ lui $a3, 0x41F0 ## $a3 = 41F00000 /* 0004C 809C367C 3C060600 */ lui $a2, 0x0600 ## $a2 = 06000000 /* 00050 809C3680 3C070600 */ lui $a3, 0x0600 ## $a3 = 06000000 /* 00054 809C3684 27CE0190 */ addiu $t6, $s8, 0x0190 ## $t6 = 00000190 /* 00058 809C3688 27CF01D2 */ addiu $t7, $s8, 0x01D2 ## $t7 = 000001D2 /* 0005C 809C368C 2418000B */ addiu $t8, $zero, 0x000B ## $t8 = 0000000B -/* 00060 809C3690 AFB80018 */ sw $t8, 0x0018($sp) -/* 00064 809C3694 AFAF0014 */ sw $t7, 0x0014($sp) -/* 00068 809C3698 AFAE0010 */ sw $t6, 0x0010($sp) +/* 00060 809C3690 AFB80018 */ sw $t8, 0x0018($sp) +/* 00064 809C3694 AFAF0014 */ sw $t7, 0x0014($sp) +/* 00068 809C3698 AFAE0010 */ sw $t6, 0x0010($sp) /* 0006C 809C369C 24E70710 */ addiu $a3, $a3, 0x0710 ## $a3 = 06000710 /* 00070 809C36A0 24C66EB0 */ addiu $a2, $a2, 0x6EB0 ## $a2 = 06006EB0 /* 00074 809C36A4 02602025 */ or $a0, $s3, $zero ## $a0 = 00000000 -/* 00078 809C36A8 0C0291BE */ jal func_800A46F8 +/* 00078 809C36A8 0C0291BE */ jal SkelAnime_InitSV /* 0007C 809C36AC 27C5014C */ addiu $a1, $s8, 0x014C ## $a1 = 0000014C /* 00080 809C36B0 3C04809C */ lui $a0, %hi(D_809C4AC0) ## $a0 = 809C0000 /* 00084 809C36B4 0C00084C */ jal osSyncPrintf - + /* 00088 809C36B8 24844AC0 */ addiu $a0, $a0, %lo(D_809C4AC0) ## $a0 = 809C4AC0 /* 0008C 809C36BC 3C050001 */ lui $a1, 0x0001 ## $a1 = 00010000 -/* 00090 809C36C0 00B32821 */ addu $a1, $a1, $s3 +/* 00090 809C36C0 00B32821 */ addu $a1, $a1, $s3 /* 00094 809C36C4 3C04809C */ lui $a0, %hi(D_809C4AF0) ## $a0 = 809C0000 /* 00098 809C36C8 24844AF0 */ addiu $a0, $a0, %lo(D_809C4AF0) ## $a0 = 809C4AF0 /* 0009C 809C36CC 0C00084C */ jal osSyncPrintf - + /* 000A0 809C36D0 80A51E5D */ lb $a1, 0x1E5D($a1) ## 00011E5D /* 000A4 809C36D4 8FC80024 */ lw $t0, 0x0024($s8) ## 00000024 /* 000A8 809C36D8 3C01C270 */ lui $at, 0xC270 ## $at = C2700000 @@ -55,7 +55,7 @@ glabel EnBomBowlMan_Init /* 000C8 809C36F8 AFD9024C */ sw $t9, 0x024C($s8) ## 0000024C /* 000CC 809C36FC AFC80250 */ sw $t0, 0x0250($s8) ## 00000250 /* 000D0 809C3700 0C00B58B */ jal Actor_SetScale - + /* 000D4 809C3704 E7C400BC */ swc1 $f4, 0x00BC($s8) ## 000000BC /* 000D8 809C3708 3C10809C */ lui $s0, %hi(D_809C4A28) ## $s0 = 809C0000 /* 000DC 809C370C 3C16809C */ lui $s6, %hi(D_809C4A10) ## $s6 = 809C0000 @@ -71,62 +71,62 @@ glabel EnBomBowlMan_Init /* 00100 809C3730 C6060004 */ lwc1 $f6, 0x0004($s0) ## 809C4A2C /* 00104 809C3734 C6080008 */ lwc1 $f8, 0x0008($s0) ## 809C4A30 /* 00108 809C3738 24090001 */ addiu $t1, $zero, 0x0001 ## $t1 = 00000001 -/* 0010C 809C373C AFA90024 */ sw $t1, 0x0024($sp) +/* 0010C 809C373C AFA90024 */ sw $t1, 0x0024($sp) /* 00110 809C3740 02802025 */ or $a0, $s4, $zero ## $a0 = 00001C24 /* 00114 809C3744 02602825 */ or $a1, $s3, $zero ## $a1 = 00000000 /* 00118 809C3748 24060143 */ addiu $a2, $zero, 0x0143 ## $a2 = 00000143 /* 0011C 809C374C 8E070000 */ lw $a3, 0x0000($s0) ## 809C4A28 -/* 00120 809C3750 AFA00018 */ sw $zero, 0x0018($sp) -/* 00124 809C3754 AFA0001C */ sw $zero, 0x001C($sp) -/* 00128 809C3758 AFA00020 */ sw $zero, 0x0020($sp) -/* 0012C 809C375C E7A60010 */ swc1 $f6, 0x0010($sp) +/* 00120 809C3750 AFA00018 */ sw $zero, 0x0018($sp) +/* 00124 809C3754 AFA0001C */ sw $zero, 0x001C($sp) +/* 00128 809C3758 AFA00020 */ sw $zero, 0x0020($sp) +/* 0012C 809C375C E7A60010 */ swc1 $f6, 0x0010($sp) /* 00130 809C3760 0C00C7D4 */ jal Actor_Spawn ## ActorSpawn -/* 00134 809C3764 E7A80014 */ swc1 $f8, 0x0014($sp) -/* 00138 809C3768 10400010 */ beq $v0, $zero, .L809C37AC +/* 00134 809C3764 E7A80014 */ swc1 $f8, 0x0014($sp) +/* 00138 809C3768 10400010 */ beq $v0, $zero, .L809C37AC /* 0013C 809C376C 2610000C */ addiu $s0, $s0, 0x000C ## $s0 = 809C4A34 -/* 00140 809C3770 00115080 */ sll $t2, $s1, 2 -/* 00144 809C3774 02AA5821 */ addu $t3, $s5, $t2 +/* 00140 809C3770 00115080 */ sll $t2, $s1, 2 +/* 00144 809C3774 02AA5821 */ addu $t3, $s5, $t2 /* 00148 809C3778 C56A0000 */ lwc1 $f10, 0x0000($t3) ## 00000000 -/* 0014C 809C377C 02D21821 */ addu $v1, $s6, $s2 +/* 0014C 809C377C 02D21821 */ addu $v1, $s6, $s2 /* 00150 809C3780 E44A02F4 */ swc1 $f10, 0x02F4($v0) ## 000002F4 /* 00154 809C3784 C4700000 */ lwc1 $f16, 0x0000($v1) ## 00000000 -/* 00158 809C3788 4600848D */ trunc.w.s $f18, $f16 -/* 0015C 809C378C 440D9000 */ mfc1 $t5, $f18 +/* 00158 809C3788 4600848D */ trunc.w.s $f18, $f16 +/* 0015C 809C378C 440D9000 */ mfc1 $t5, $f18 /* 00160 809C3790 00000000 */ nop /* 00164 809C3794 A44D033C */ sh $t5, 0x033C($v0) ## 0000033C /* 00168 809C3798 C4640004 */ lwc1 $f4, 0x0004($v1) ## 00000004 -/* 0016C 809C379C 4600218D */ trunc.w.s $f6, $f4 -/* 00170 809C37A0 440F3000 */ mfc1 $t7, $f6 +/* 0016C 809C379C 4600218D */ trunc.w.s $f6, $f4 +/* 00170 809C37A0 440F3000 */ mfc1 $t7, $f6 /* 00174 809C37A4 00000000 */ nop /* 00178 809C37A8 A44F033E */ sh $t7, 0x033E($v0) ## 0000033E .L809C37AC: /* 0017C 809C37AC 26310001 */ addiu $s1, $s1, 0x0001 ## $s1 = 00000001 -/* 00180 809C37B0 1637FFDF */ bne $s1, $s7, .L809C3730 +/* 00180 809C37B0 1637FFDF */ bne $s1, $s7, .L809C3730 /* 00184 809C37B4 2652000C */ addiu $s2, $s2, 0x000C ## $s2 = 0000000C /* 00188 809C37B8 3C01809C */ lui $at, %hi(D_809C4C74) ## $at = 809C0000 /* 0018C 809C37BC 0C00CFBE */ jal Math_Rand_ZeroFloat - -/* 00190 809C37C0 C42C4C74 */ lwc1 $f12, %lo(D_809C4C74)($at) -/* 00194 809C37C4 4600020D */ trunc.w.s $f8, $f0 + +/* 00190 809C37C0 C42C4C74 */ lwc1 $f12, %lo(D_809C4C74)($at) +/* 00194 809C37C4 4600020D */ trunc.w.s $f8, $f0 /* 00198 809C37C8 3C09809C */ lui $t1, %hi(func_809C3820) ## $t1 = 809C0000 /* 0019C 809C37CC 24080001 */ addiu $t0, $zero, 0x0001 ## $t0 = 00000001 /* 001A0 809C37D0 25293820 */ addiu $t1, $t1, %lo(func_809C3820) ## $t1 = 809C3820 -/* 001A4 809C37D4 44194000 */ mfc1 $t9, $f8 +/* 001A4 809C37D4 44194000 */ mfc1 $t9, $f8 /* 001A8 809C37D8 A3C8001F */ sb $t0, 0x001F($s8) ## 0000001F /* 001AC 809C37DC AFC90214 */ sw $t1, 0x0214($s8) ## 00000214 /* 001B0 809C37E0 A7D90242 */ sh $t9, 0x0242($s8) ## 00000242 -/* 001B4 809C37E4 8FBF0054 */ lw $ra, 0x0054($sp) -/* 001B8 809C37E8 8FBE0050 */ lw $s8, 0x0050($sp) -/* 001BC 809C37EC 8FB7004C */ lw $s7, 0x004C($sp) -/* 001C0 809C37F0 8FB60048 */ lw $s6, 0x0048($sp) -/* 001C4 809C37F4 8FB50044 */ lw $s5, 0x0044($sp) -/* 001C8 809C37F8 8FB40040 */ lw $s4, 0x0040($sp) -/* 001CC 809C37FC 8FB3003C */ lw $s3, 0x003C($sp) -/* 001D0 809C3800 8FB20038 */ lw $s2, 0x0038($sp) -/* 001D4 809C3804 8FB10034 */ lw $s1, 0x0034($sp) -/* 001D8 809C3808 8FB00030 */ lw $s0, 0x0030($sp) -/* 001DC 809C380C 03E00008 */ jr $ra +/* 001B4 809C37E4 8FBF0054 */ lw $ra, 0x0054($sp) +/* 001B8 809C37E8 8FBE0050 */ lw $s8, 0x0050($sp) +/* 001BC 809C37EC 8FB7004C */ lw $s7, 0x004C($sp) +/* 001C0 809C37F0 8FB60048 */ lw $s6, 0x0048($sp) +/* 001C4 809C37F4 8FB50044 */ lw $s5, 0x0044($sp) +/* 001C8 809C37F8 8FB40040 */ lw $s4, 0x0040($sp) +/* 001CC 809C37FC 8FB3003C */ lw $s3, 0x003C($sp) +/* 001D0 809C3800 8FB20038 */ lw $s2, 0x0038($sp) +/* 001D4 809C3804 8FB10034 */ lw $s1, 0x0034($sp) +/* 001D8 809C3808 8FB00030 */ lw $s0, 0x0030($sp) +/* 001DC 809C380C 03E00008 */ jr $ra /* 001E0 809C3810 27BD0058 */ addiu $sp, $sp, 0x0058 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bom_Bowl_Man/func_809C3820.s b/asm/non_matchings/overlays/actors/ovl_En_Bom_Bowl_Man/func_809C3820.s index 9156c3a05f..3c53e59e84 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bom_Bowl_Man/func_809C3820.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bom_Bowl_Man/func_809C3820.s @@ -1,28 +1,28 @@ glabel func_809C3820 /* 001F0 809C3820 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 001F4 809C3824 AFB00028 */ sw $s0, 0x0028($sp) +/* 001F4 809C3824 AFB00028 */ sw $s0, 0x0028($sp) /* 001F8 809C3828 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 001FC 809C382C AFBF002C */ sw $ra, 0x002C($sp) +/* 001FC 809C382C AFBF002C */ sw $ra, 0x002C($sp) /* 00200 809C3830 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 -/* 00204 809C3834 AFA50034 */ sw $a1, 0x0034($sp) +/* 00204 809C3834 AFA50034 */ sw $a1, 0x0034($sp) /* 00208 809C3838 0C028800 */ jal SkelAnime_GetFrameCount - + /* 0020C 809C383C 24840710 */ addiu $a0, $a0, 0x0710 ## $a0 = 06000710 /* 00210 809C3840 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 00214 809C3844 3C01C120 */ lui $at, 0xC120 ## $at = C1200000 /* 00218 809C3848 44813000 */ mtc1 $at, $f6 ## $f6 = -10.00 -/* 0021C 809C384C 46802020 */ cvt.s.w $f0, $f4 +/* 0021C 809C384C 46802020 */ cvt.s.w $f0, $f4 /* 00220 809C3850 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 00224 809C3854 24A50710 */ addiu $a1, $a1, 0x0710 ## $a1 = 06000710 /* 00228 809C3858 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C /* 0022C 809C385C 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 00230 809C3860 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 /* 00234 809C3864 E6000254 */ swc1 $f0, 0x0254($s0) ## 00000254 -/* 00238 809C3868 AFA00014 */ sw $zero, 0x0014($sp) -/* 0023C 809C386C E7A00010 */ swc1 $f0, 0x0010($sp) -/* 00240 809C3870 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 00244 809C3874 E7A60018 */ swc1 $f6, 0x0018($sp) +/* 00238 809C3868 AFA00014 */ sw $zero, 0x0014($sp) +/* 0023C 809C386C E7A00010 */ swc1 $f0, 0x0010($sp) +/* 00240 809C3870 0C029468 */ jal SkelAnime_ChangeAnim + +/* 00244 809C3874 E7A60018 */ swc1 $f6, 0x0018($sp) /* 00248 809C3878 3C18809C */ lui $t8, %hi(func_809C38A8) ## $t8 = 809C0000 /* 0024C 809C387C 240E00C0 */ addiu $t6, $zero, 0x00C0 ## $t6 = 000000C0 /* 00250 809C3880 240F0005 */ addiu $t7, $zero, 0x0005 ## $t7 = 00000005 @@ -30,10 +30,10 @@ glabel func_809C3820 /* 00258 809C3888 A60E010E */ sh $t6, 0x010E($s0) ## 0000010E /* 0025C 809C388C A60F022E */ sh $t7, 0x022E($s0) ## 0000022E /* 00260 809C3890 AE180214 */ sw $t8, 0x0214($s0) ## 00000214 -/* 00264 809C3894 8FBF002C */ lw $ra, 0x002C($sp) -/* 00268 809C3898 8FB00028 */ lw $s0, 0x0028($sp) +/* 00264 809C3894 8FBF002C */ lw $ra, 0x002C($sp) +/* 00268 809C3898 8FB00028 */ lw $s0, 0x0028($sp) /* 0026C 809C389C 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 00270 809C38A0 03E00008 */ jr $ra +/* 00270 809C38A0 03E00008 */ jr $ra /* 00274 809C38A4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bom_Bowl_Man/func_809C39D0.s b/asm/non_matchings/overlays/actors/ovl_En_Bom_Bowl_Man/func_809C39D0.s index 7ad26c67ed..91ffdc321e 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bom_Bowl_Man/func_809C39D0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bom_Bowl_Man/func_809C39D0.s @@ -1,38 +1,38 @@ glabel func_809C39D0 /* 003A0 809C39D0 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 003A4 809C39D4 AFA40028 */ sw $a0, 0x0028($sp) -/* 003A8 809C39D8 AFBF0024 */ sw $ra, 0x0024($sp) +/* 003A4 809C39D4 AFA40028 */ sw $a0, 0x0028($sp) +/* 003A8 809C39D8 AFBF0024 */ sw $ra, 0x0024($sp) /* 003AC 809C39DC 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 -/* 003B0 809C39E0 AFA5002C */ sw $a1, 0x002C($sp) +/* 003B0 809C39E0 AFA5002C */ sw $a1, 0x002C($sp) /* 003B4 809C39E4 0C028800 */ jal SkelAnime_GetFrameCount - + /* 003B8 809C39E8 24840080 */ addiu $a0, $a0, 0x0080 ## $a0 = 06000080 /* 003BC 809C39EC 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 -/* 003C0 809C39F0 8FA30028 */ lw $v1, 0x0028($sp) +/* 003C0 809C39F0 8FA30028 */ lw $v1, 0x0028($sp) /* 003C4 809C39F4 3C01C120 */ lui $at, 0xC120 ## $at = C1200000 -/* 003C8 809C39F8 46802020 */ cvt.s.w $f0, $f4 +/* 003C8 809C39F8 46802020 */ cvt.s.w $f0, $f4 /* 003CC 809C39FC 44813000 */ mtc1 $at, $f6 ## $f6 = -10.00 /* 003D0 809C3A00 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 003D4 809C3A04 240E0002 */ addiu $t6, $zero, 0x0002 ## $t6 = 00000002 /* 003D8 809C3A08 24A50080 */ addiu $a1, $a1, 0x0080 ## $a1 = 06000080 /* 003DC 809C3A0C 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 003E0 809C3A10 E4600254 */ swc1 $f0, 0x0254($v1) ## 00000254 -/* 003E4 809C3A14 AFAE0014 */ sw $t6, 0x0014($sp) -/* 003E8 809C3A18 E7A00010 */ swc1 $f0, 0x0010($sp) +/* 003E4 809C3A14 AFAE0014 */ sw $t6, 0x0014($sp) +/* 003E8 809C3A18 E7A00010 */ swc1 $f0, 0x0010($sp) /* 003EC 809C3A1C 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 /* 003F0 809C3A20 2464014C */ addiu $a0, $v1, 0x014C ## $a0 = 0000014C -/* 003F4 809C3A24 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 003F8 809C3A28 E7A60018 */ swc1 $f6, 0x0018($sp) -/* 003FC 809C3A2C 8FA30028 */ lw $v1, 0x0028($sp) +/* 003F4 809C3A24 0C029468 */ jal SkelAnime_ChangeAnim + +/* 003F8 809C3A28 E7A60018 */ swc1 $f6, 0x0018($sp) +/* 003FC 809C3A2C 8FA30028 */ lw $v1, 0x0028($sp) /* 00400 809C3A30 3C18809C */ lui $t8, %hi(func_809C3A54) ## $t8 = 809C0000 /* 00404 809C3A34 240F0001 */ addiu $t7, $zero, 0x0001 ## $t7 = 00000001 /* 00408 809C3A38 27183A54 */ addiu $t8, $t8, %lo(func_809C3A54) ## $t8 = 809C3A54 /* 0040C 809C3A3C A46F0238 */ sh $t7, 0x0238($v1) ## 00000238 /* 00410 809C3A40 AC780214 */ sw $t8, 0x0214($v1) ## 00000214 -/* 00414 809C3A44 8FBF0024 */ lw $ra, 0x0024($sp) +/* 00414 809C3A44 8FBF0024 */ lw $ra, 0x0024($sp) /* 00418 809C3A48 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 0041C 809C3A4C 03E00008 */ jr $ra +/* 0041C 809C3A4C 03E00008 */ jr $ra /* 00420 809C3A50 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bom_Bowl_Man/func_809C3B50.s b/asm/non_matchings/overlays/actors/ovl_En_Bom_Bowl_Man/func_809C3B50.s index 8b0c32ff9c..f9d34d6edd 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bom_Bowl_Man/func_809C3B50.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bom_Bowl_Man/func_809C3B50.s @@ -1,85 +1,85 @@ glabel func_809C3B50 /* 00520 809C3B50 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 00524 809C3B54 AFB00028 */ sw $s0, 0x0028($sp) +/* 00524 809C3B54 AFB00028 */ sw $s0, 0x0028($sp) /* 00528 809C3B58 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 0052C 809C3B5C AFBF002C */ sw $ra, 0x002C($sp) +/* 0052C 809C3B5C AFBF002C */ sw $ra, 0x002C($sp) /* 00530 809C3B60 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 00534 809C3B64 AFA5003C */ sw $a1, 0x003C($sp) +/* 00534 809C3B64 AFA5003C */ sw $a1, 0x003C($sp) /* 00538 809C3B68 0C02927F */ jal SkelAnime_FrameUpdateMatrix - -/* 0053C 809C3B6C AFA40034 */ sw $a0, 0x0034($sp) -/* 00540 809C3B70 8FA4003C */ lw $a0, 0x003C($sp) -/* 00544 809C3B74 0C042F6F */ jal func_8010BDBC + +/* 0053C 809C3B6C AFA40034 */ sw $a0, 0x0034($sp) +/* 00540 809C3B70 8FA4003C */ lw $a0, 0x003C($sp) +/* 00544 809C3B74 0C042F6F */ jal func_8010BDBC /* 00548 809C3B78 248420D8 */ addiu $a0, $a0, 0x20D8 ## $a0 = 000020D8 /* 0054C 809C3B7C 860E022E */ lh $t6, 0x022E($s0) ## 0000022E -/* 00550 809C3B80 55C2003A */ bnel $t6, $v0, .L809C3C6C -/* 00554 809C3B84 8FBF002C */ lw $ra, 0x002C($sp) -/* 00558 809C3B88 0C041AF2 */ jal func_80106BC8 -/* 0055C 809C3B8C 8FA4003C */ lw $a0, 0x003C($sp) -/* 00560 809C3B90 50400036 */ beql $v0, $zero, .L809C3C6C -/* 00564 809C3B94 8FBF002C */ lw $ra, 0x002C($sp) -/* 00568 809C3B98 0C041B33 */ jal func_80106CCC -/* 0056C 809C3B9C 8FA4003C */ lw $a0, 0x003C($sp) +/* 00550 809C3B80 55C2003A */ bnel $t6, $v0, .L809C3C6C +/* 00554 809C3B84 8FBF002C */ lw $ra, 0x002C($sp) +/* 00558 809C3B88 0C041AF2 */ jal func_80106BC8 +/* 0055C 809C3B8C 8FA4003C */ lw $a0, 0x003C($sp) +/* 00560 809C3B90 50400036 */ beql $v0, $zero, .L809C3C6C +/* 00564 809C3B94 8FBF002C */ lw $ra, 0x002C($sp) +/* 00568 809C3B98 0C041B33 */ jal func_80106CCC +/* 0056C 809C3B9C 8FA4003C */ lw $a0, 0x003C($sp) /* 00570 809C3BA0 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 /* 00574 809C3BA4 0C028800 */ jal SkelAnime_GetFrameCount - + /* 00578 809C3BA8 248472AC */ addiu $a0, $a0, 0x72AC ## $a0 = 060072AC /* 0057C 809C3BAC 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 00580 809C3BB0 3C01C120 */ lui $at, 0xC120 ## $at = C1200000 /* 00584 809C3BB4 44813000 */ mtc1 $at, $f6 ## $f6 = -10.00 -/* 00588 809C3BB8 46802020 */ cvt.s.w $f0, $f4 +/* 00588 809C3BB8 46802020 */ cvt.s.w $f0, $f4 /* 0058C 809C3BBC 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 00590 809C3BC0 24A572AC */ addiu $a1, $a1, 0x72AC ## $a1 = 060072AC /* 00594 809C3BC4 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 00598 809C3BC8 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 /* 0059C 809C3BCC E6000254 */ swc1 $f0, 0x0254($s0) ## 00000254 -/* 005A0 809C3BD0 AFA00014 */ sw $zero, 0x0014($sp) -/* 005A4 809C3BD4 E7A00010 */ swc1 $f0, 0x0010($sp) -/* 005A8 809C3BD8 8FA40034 */ lw $a0, 0x0034($sp) -/* 005AC 809C3BDC 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 005B0 809C3BE0 E7A60018 */ swc1 $f6, 0x0018($sp) +/* 005A0 809C3BD0 AFA00014 */ sw $zero, 0x0014($sp) +/* 005A4 809C3BD4 E7A00010 */ swc1 $f0, 0x0010($sp) +/* 005A8 809C3BD8 8FA40034 */ lw $a0, 0x0034($sp) +/* 005AC 809C3BDC 0C029468 */ jal SkelAnime_ChangeAnim + +/* 005B0 809C3BE0 E7A60018 */ swc1 $f6, 0x0018($sp) /* 005B4 809C3BE4 3C014270 */ lui $at, 0x4270 ## $at = 42700000 /* 005B8 809C3BE8 240F0003 */ addiu $t7, $zero, 0x0003 ## $t7 = 00000003 /* 005BC 809C3BEC 44816000 */ mtc1 $at, $f12 ## $f12 = 60.00 /* 005C0 809C3BF0 0C00CFBE */ jal Math_Rand_ZeroFloat - + /* 005C4 809C3BF4 A60F0238 */ sh $t7, 0x0238($s0) ## 00000238 -/* 005C8 809C3BF8 4600020D */ trunc.w.s $f8, $f0 +/* 005C8 809C3BF8 4600020D */ trunc.w.s $f8, $f0 /* 005CC 809C3BFC 3C0B8016 */ lui $t3, 0x8016 ## $t3 = 80160000 /* 005D0 809C3C00 24180018 */ addiu $t8, $zero, 0x0018 ## $t8 = 00000018 /* 005D4 809C3C04 3C0D8016 */ lui $t5, 0x8016 ## $t5 = 80160000 -/* 005D8 809C3C08 44094000 */ mfc1 $t1, $f8 +/* 005D8 809C3C08 44094000 */ mfc1 $t1, $f8 /* 005DC 809C3C0C 24190004 */ addiu $t9, $zero, 0x0004 ## $t9 = 00000004 /* 005E0 809C3C10 3305FFFF */ andi $a1, $t8, 0xFFFF ## $a1 = 00000018 /* 005E4 809C3C14 252A0014 */ addiu $t2, $t1, 0x0014 ## $t2 = 00000014 /* 005E8 809C3C18 A60A0236 */ sh $t2, 0x0236($s0) ## 00000236 /* 005EC 809C3C1C 956BF538 */ lhu $t3, -0x0AC8($t3) ## 8015F538 /* 005F0 809C3C20 316C0020 */ andi $t4, $t3, 0x0020 ## $t4 = 00000000 -/* 005F4 809C3C24 5580000A */ bnel $t4, $zero, .L809C3C50 +/* 005F4 809C3C24 5580000A */ bnel $t4, $zero, .L809C3C50 /* 005F8 809C3C28 A618010E */ sh $t8, 0x010E($s0) ## 0000010E /* 005FC 809C3C2C 8DADFA90 */ lw $t5, -0x0570($t5) ## 8015FA90 /* 00600 809C3C30 3C0F809C */ lui $t7, %hi(func_809C3C7C) ## $t7 = 809C0000 /* 00604 809C3C34 25EF3C7C */ addiu $t7, $t7, %lo(func_809C3C7C) ## $t7 = 809C3C7C /* 00608 809C3C38 85AE12D8 */ lh $t6, 0x12D8($t5) ## 801612D8 -/* 0060C 809C3C3C 55C00004 */ bnel $t6, $zero, .L809C3C50 +/* 0060C 809C3C3C 55C00004 */ bnel $t6, $zero, .L809C3C50 /* 00610 809C3C40 A618010E */ sh $t8, 0x010E($s0) ## 0000010E -/* 00614 809C3C44 10000008 */ beq $zero, $zero, .L809C3C68 +/* 00614 809C3C44 10000008 */ beq $zero, $zero, .L809C3C68 /* 00618 809C3C48 AE0F0214 */ sw $t7, 0x0214($s0) ## 00000214 /* 0061C 809C3C4C A618010E */ sh $t8, 0x010E($s0) ## 0000010E .L809C3C50: /* 00620 809C3C50 A619022E */ sh $t9, 0x022E($s0) ## 0000022E -/* 00624 809C3C54 0C042DC8 */ jal func_8010B720 -/* 00628 809C3C58 8FA4003C */ lw $a0, 0x003C($sp) +/* 00624 809C3C54 0C042DC8 */ jal func_8010B720 +/* 00628 809C3C58 8FA4003C */ lw $a0, 0x003C($sp) /* 0062C 809C3C5C 3C08809C */ lui $t0, %hi(func_809C4040) ## $t0 = 809C0000 /* 00630 809C3C60 25084040 */ addiu $t0, $t0, %lo(func_809C4040) ## $t0 = 809C4040 /* 00634 809C3C64 AE080214 */ sw $t0, 0x0214($s0) ## 00000214 .L809C3C68: -/* 00638 809C3C68 8FBF002C */ lw $ra, 0x002C($sp) +/* 00638 809C3C68 8FBF002C */ lw $ra, 0x002C($sp) .L809C3C6C: -/* 0063C 809C3C6C 8FB00028 */ lw $s0, 0x0028($sp) +/* 0063C 809C3C6C 8FB00028 */ lw $s0, 0x0028($sp) /* 00640 809C3C70 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 -/* 00644 809C3C74 03E00008 */ jr $ra +/* 00644 809C3C74 03E00008 */ jr $ra /* 00648 809C3C78 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bom_Chu/EnBomChu_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Bom_Chu/EnBomChu_Draw.s index f1094e8564..9647ff3ab0 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bom_Chu/EnBomChu_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bom_Chu/EnBomChu_Draw.s @@ -10,7 +10,7 @@ glabel EnBomChu_Draw /* 01184 809C69B4 24C66DA0 */ addiu $a2, $a2, %lo(D_809C6DA0) ## $a2 = 809C6DA0 /* 01188 809C69B8 27A40030 */ addiu $a0, $sp, 0x0030 ## $a0 = FFFFFFD8 /* 0118C 809C69BC 24070399 */ addiu $a3, $zero, 0x0399 ## $a3 = 00000399 -/* 01190 809C69C0 0C031AB1 */ jal func_800C6AC4 +/* 01190 809C69C0 0C031AB1 */ jal Graph_OpenDisps /* 01194 809C69C4 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 /* 01198 809C69C8 8FAF005C */ lw $t7, 0x005C($sp) /* 0119C 809C69CC 0C024F46 */ jal func_80093D18 @@ -225,7 +225,7 @@ glabel EnBomChu_Draw /* 014AC 809C6CDC 24C66DC8 */ addiu $a2, $a2, %lo(D_809C6DC8) ## $a2 = 809C6DC8 /* 014B0 809C6CE0 27A40030 */ addiu $a0, $sp, 0x0030 ## $a0 = FFFFFFD8 /* 014B4 809C6CE4 240703C1 */ addiu $a3, $zero, 0x03C1 ## $a3 = 000003C1 -/* 014B8 809C6CE8 0C031AD5 */ jal func_800C6B54 +/* 014B8 809C6CE8 0C031AD5 */ jal Graph_CloseDisps /* 014BC 809C6CEC 8F250000 */ lw $a1, 0x0000($t9) ## 00000000 /* 014C0 809C6CF0 8FBF001C */ lw $ra, 0x001C($sp) /* 014C4 809C6CF4 8FB00014 */ lw $s0, 0x0014($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bom_Chu/func_809C5BA8.s b/asm/non_matchings/overlays/actors/ovl_En_Bom_Chu/func_809C5BA8.s index 8b93b69a05..50fe411b1a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bom_Chu/func_809C5BA8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bom_Chu/func_809C5BA8.s @@ -41,7 +41,7 @@ glabel func_809C5BA8 /* 00414 809C5C44 00000000 */ nop /* 00418 809C5C48 4501005F */ bc1t .L809C5DC8 /* 0041C 809C5C4C 00000000 */ nop -/* 00420 809C5C50 0C03F4DA */ jal func_800FD368 +/* 00420 809C5C50 0C03F4DA */ jal Math_acosf /* 00424 809C5C54 00000000 */ nop /* 00428 809C5C58 3C01809C */ lui $at, %hi(D_809C6DE0) ## $at = 809C0000 /* 0042C 809C5C5C C4306DE0 */ lwc1 $f16, %lo(D_809C6DE0)($at) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bombf/EnBombf_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Bombf/EnBombf_Draw.s index d973a224f4..5f63422a3d 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bombf/EnBombf_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bombf/EnBombf_Draw.s @@ -9,7 +9,7 @@ glabel EnBombf_Draw /* 01070 809C7FD0 24C68310 */ addiu $a2, $a2, %lo(D_809C8310) ## $a2 = 809C8310 /* 01074 809C7FD4 27A4004C */ addiu $a0, $sp, 0x004C ## $a0 = FFFFFFE4 /* 01078 809C7FD8 2407040A */ addiu $a3, $zero, 0x040A ## $a3 = 0000040A -/* 0107C 809C7FDC 0C031AB1 */ jal func_800C6AC4 +/* 0107C 809C7FDC 0C031AB1 */ jal Graph_OpenDisps /* 01080 809C7FE0 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 /* 01084 809C7FE4 8FA20068 */ lw $v0, 0x0068($sp) /* 01088 809C7FE8 8FB8006C */ lw $t8, 0x006C($sp) @@ -157,7 +157,7 @@ glabel EnBombf_Draw /* 012B4 809C8214 24C68340 */ addiu $a2, $a2, %lo(D_809C8340) ## $a2 = 809C8340 /* 012B8 809C8218 27A4004C */ addiu $a0, $sp, 0x004C ## $a0 = FFFFFFE4 /* 012BC 809C821C 24070427 */ addiu $a3, $zero, 0x0427 ## $a3 = 00000427 -/* 012C0 809C8220 0C031AD5 */ jal func_800C6B54 +/* 012C0 809C8220 0C031AD5 */ jal Graph_CloseDisps /* 012C4 809C8224 8D850000 */ lw $a1, 0x0000($t4) ## 00000000 /* 012C8 809C8228 8FBF001C */ lw $ra, 0x001C($sp) /* 012CC 809C822C 8FB00018 */ lw $s0, 0x0018($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Box/EnBox_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Box/EnBox_Draw.s index 131c1dfeb6..b3c073095e 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Box/EnBox_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Box/EnBox_Draw.s @@ -1,39 +1,39 @@ glabel EnBox_Draw /* 017D0 809CA590 27BDFF90 */ addiu $sp, $sp, 0xFF90 ## $sp = FFFFFF90 -/* 017D4 809CA594 AFBF002C */ sw $ra, 0x002C($sp) -/* 017D8 809CA598 AFB10028 */ sw $s1, 0x0028($sp) -/* 017DC 809CA59C AFB00024 */ sw $s0, 0x0024($sp) -/* 017E0 809CA5A0 AFA50074 */ sw $a1, 0x0074($sp) +/* 017D4 809CA594 AFBF002C */ sw $ra, 0x002C($sp) +/* 017D8 809CA598 AFB10028 */ sw $s1, 0x0028($sp) +/* 017DC 809CA59C AFB00024 */ sw $s0, 0x0024($sp) +/* 017E0 809CA5A0 AFA50074 */ sw $a1, 0x0074($sp) /* 017E4 809CA5A4 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 /* 017E8 809CA5A8 00808825 */ or $s1, $a0, $zero ## $s1 = 00000000 /* 017EC 809CA5AC 3C06809D */ lui $a2, %hi(D_809CA8D0) ## $a2 = 809D0000 /* 017F0 809CA5B0 24C6A8D0 */ addiu $a2, $a2, %lo(D_809CA8D0) ## $a2 = 809CA8D0 /* 017F4 809CA5B4 27A40058 */ addiu $a0, $sp, 0x0058 ## $a0 = FFFFFFE8 /* 017F8 809CA5B8 2407062D */ addiu $a3, $zero, 0x062D ## $a3 = 0000062D -/* 017FC 809CA5BC 0C031AB1 */ jal func_800C6AC4 +/* 017FC 809CA5BC 0C031AB1 */ jal Graph_OpenDisps /* 01800 809CA5C0 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 /* 01804 809CA5C4 922301F7 */ lbu $v1, 0x01F7($s1) ## 000001F7 /* 01808 809CA5C8 240100FF */ addiu $at, $zero, 0x00FF ## $at = 000000FF -/* 0180C 809CA5CC 54610008 */ bnel $v1, $at, .L809CA5F0 +/* 0180C 809CA5CC 54610008 */ bnel $v1, $at, .L809CA5F0 /* 01810 809CA5D0 8E2F0004 */ lw $t7, 0x0004($s1) ## 00000004 /* 01814 809CA5D4 922201F9 */ lbu $v0, 0x01F9($s1) ## 000001F9 /* 01818 809CA5D8 24010004 */ addiu $at, $zero, 0x0004 ## $at = 00000004 -/* 0181C 809CA5DC 10410003 */ beq $v0, $at, .L809CA5EC +/* 0181C 809CA5DC 10410003 */ beq $v0, $at, .L809CA5EC /* 01820 809CA5E0 24010006 */ addiu $at, $zero, 0x0006 ## $at = 00000006 -/* 01824 809CA5E4 5441000D */ bnel $v0, $at, .L809CA61C +/* 01824 809CA5E4 5441000D */ bnel $v0, $at, .L809CA61C /* 01828 809CA5E8 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 .L809CA5EC: /* 0182C 809CA5EC 8E2F0004 */ lw $t7, 0x0004($s1) ## 00000004 .L809CA5F0: /* 01830 809CA5F0 24010080 */ addiu $at, $zero, 0x0080 ## $at = 00000080 /* 01834 809CA5F4 31F80080 */ andi $t8, $t7, 0x0080 ## $t8 = 00000000 -/* 01838 809CA5F8 13010030 */ beq $t8, $at, .L809CA6BC +/* 01838 809CA5F8 13010030 */ beq $t8, $at, .L809CA6BC /* 0183C 809CA5FC 00000000 */ nop /* 01840 809CA600 922201F9 */ lbu $v0, 0x01F9($s1) ## 000001F9 /* 01844 809CA604 24010004 */ addiu $at, $zero, 0x0004 ## $at = 00000004 -/* 01848 809CA608 10410003 */ beq $v0, $at, .L809CA618 +/* 01848 809CA608 10410003 */ beq $v0, $at, .L809CA618 /* 0184C 809CA60C 24010006 */ addiu $at, $zero, 0x0006 ## $at = 00000006 -/* 01850 809CA610 1441002A */ bne $v0, $at, .L809CA6BC +/* 01850 809CA610 1441002A */ bne $v0, $at, .L809CA6BC /* 01854 809CA614 00000000 */ nop .L809CA618: /* 01858 809CA618 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 @@ -56,39 +56,39 @@ glabel EnBox_Draw /* 01898 809CA658 244C0008 */ addiu $t4, $v0, 0x0008 ## $t4 = 00000008 /* 0189C 809CA65C AE0C02C0 */ sw $t4, 0x02C0($s0) ## 000002C0 /* 018A0 809CA660 AC4D0000 */ sw $t5, 0x0000($v0) ## 00000000 -/* 018A4 809CA664 8FAE0074 */ lw $t6, 0x0074($sp) +/* 018A4 809CA664 8FAE0074 */ lw $t6, 0x0074($sp) /* 018A8 809CA668 8DC40000 */ lw $a0, 0x0000($t6) ## 00000000 -/* 018AC 809CA66C 0C272912 */ jal func_809CA448 -/* 018B0 809CA670 AFA2004C */ sw $v0, 0x004C($sp) -/* 018B4 809CA674 8FA3004C */ lw $v1, 0x004C($sp) +/* 018AC 809CA66C 0C272912 */ jal func_809CA448 +/* 018B0 809CA670 AFA2004C */ sw $v0, 0x004C($sp) +/* 018B4 809CA674 8FA3004C */ lw $v1, 0x004C($sp) /* 018B8 809CA678 AC620004 */ sw $v0, 0x0004($v1) ## 00000004 -/* 018BC 809CA67C 8FAF0074 */ lw $t7, 0x0074($sp) -/* 018C0 809CA680 0C024F46 */ jal func_80093D18 +/* 018BC 809CA67C 8FAF0074 */ lw $t7, 0x0074($sp) +/* 018C0 809CA680 0C024F46 */ jal func_80093D18 /* 018C4 809CA684 8DE40000 */ lw $a0, 0x0000($t7) ## 00000000 /* 018C8 809CA688 8E250168 */ lw $a1, 0x0168($s1) ## 00000168 /* 018CC 809CA68C 8E260184 */ lw $a2, 0x0184($s1) ## 00000184 /* 018D0 809CA690 3C18809D */ lui $t8, %hi(func_809CA2D8) ## $t8 = 809D0000 /* 018D4 809CA694 2718A2D8 */ addiu $t8, $t8, %lo(func_809CA2D8) ## $t8 = 809CA2D8 -/* 018D8 809CA698 AFB80010 */ sw $t8, 0x0010($sp) -/* 018DC 809CA69C AFB10014 */ sw $s1, 0x0014($sp) +/* 018D8 809CA698 AFB80010 */ sw $t8, 0x0010($sp) +/* 018DC 809CA69C AFB10014 */ sw $s1, 0x0014($sp) /* 018E0 809CA6A0 8E1902C0 */ lw $t9, 0x02C0($s0) ## 000002C0 -/* 018E4 809CA6A4 8FA40074 */ lw $a0, 0x0074($sp) +/* 018E4 809CA6A4 8FA40074 */ lw $a0, 0x0074($sp) /* 018E8 809CA6A8 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 018EC 809CA6AC 0C0288A2 */ jal func_800A2288 -/* 018F0 809CA6B0 AFB90018 */ sw $t9, 0x0018($sp) -/* 018F4 809CA6B4 1000003E */ beq $zero, $zero, .L809CA7B0 +/* 018EC 809CA6AC 0C0288A2 */ jal SkelAnime_Draw2 +/* 018F0 809CA6B0 AFB90018 */ sw $t9, 0x0018($sp) +/* 018F4 809CA6B4 1000003E */ beq $zero, $zero, .L809CA7B0 /* 018F8 809CA6B8 AE0202C0 */ sw $v0, 0x02C0($s0) ## 000002C0 .L809CA6BC: -/* 018FC 809CA6BC 5060003D */ beql $v1, $zero, .L809CA7B4 -/* 01900 809CA6C0 8FAD0074 */ lw $t5, 0x0074($sp) +/* 018FC 809CA6BC 5060003D */ beql $v1, $zero, .L809CA7B4 +/* 01900 809CA6C0 8FAD0074 */ lw $t5, 0x0074($sp) /* 01904 809CA6C4 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 /* 01908 809CA6C8 3C09E700 */ lui $t1, 0xE700 ## $t1 = E7000000 /* 0190C 809CA6CC 24480008 */ addiu $t0, $v0, 0x0008 ## $t0 = 00000008 /* 01910 809CA6D0 AE0802D0 */ sw $t0, 0x02D0($s0) ## 000002D0 /* 01914 809CA6D4 AC400004 */ sw $zero, 0x0004($v0) ## 00000004 /* 01918 809CA6D8 AC490000 */ sw $t1, 0x0000($v0) ## 00000000 -/* 0191C 809CA6DC 8FAA0074 */ lw $t2, 0x0074($sp) -/* 01920 809CA6E0 0C024F61 */ jal func_80093D84 +/* 0191C 809CA6DC 8FAA0074 */ lw $t2, 0x0074($sp) +/* 01920 809CA6E0 0C024F61 */ jal func_80093D84 /* 01924 809CA6E4 8D440000 */ lw $a0, 0x0000($t2) ## 00000000 /* 01928 809CA6E8 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 /* 0192C 809CA6EC 3C0CFB00 */ lui $t4, 0xFB00 ## $t4 = FB000000 @@ -99,9 +99,9 @@ glabel EnBox_Draw /* 01940 809CA700 922E01F7 */ lbu $t6, 0x01F7($s1) ## 000001F7 /* 01944 809CA704 AC4E0004 */ sw $t6, 0x0004($v0) ## 00000004 /* 01948 809CA708 922201F9 */ lbu $v0, 0x01F9($s1) ## 000001F9 -/* 0194C 809CA70C 10410003 */ beq $v0, $at, .L809CA71C +/* 0194C 809CA70C 10410003 */ beq $v0, $at, .L809CA71C /* 01950 809CA710 24010006 */ addiu $at, $zero, 0x0006 ## $at = 00000006 -/* 01954 809CA714 5441000F */ bnel $v0, $at, .L809CA754 +/* 01954 809CA714 5441000F */ bnel $v0, $at, .L809CA754 /* 01958 809CA718 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 .L809CA71C: /* 0195C 809CA71C 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 @@ -110,12 +110,12 @@ glabel EnBox_Draw /* 01968 809CA728 244F0008 */ addiu $t7, $v0, 0x0008 ## $t7 = 00000008 /* 0196C 809CA72C AE0F02D0 */ sw $t7, 0x02D0($s0) ## 000002D0 /* 01970 809CA730 AC580000 */ sw $t8, 0x0000($v0) ## 00000000 -/* 01974 809CA734 8FB90074 */ lw $t9, 0x0074($sp) +/* 01974 809CA734 8FB90074 */ lw $t9, 0x0074($sp) /* 01978 809CA738 8F240000 */ lw $a0, 0x0000($t9) ## 00000000 -/* 0197C 809CA73C 0C272946 */ jal func_809CA518 -/* 01980 809CA740 AFA20040 */ sw $v0, 0x0040($sp) -/* 01984 809CA744 8FA30040 */ lw $v1, 0x0040($sp) -/* 01988 809CA748 1000000D */ beq $zero, $zero, .L809CA780 +/* 0197C 809CA73C 0C272946 */ jal func_809CA518 +/* 01980 809CA740 AFA20040 */ sw $v0, 0x0040($sp) +/* 01984 809CA744 8FA30040 */ lw $v1, 0x0040($sp) +/* 01988 809CA748 1000000D */ beq $zero, $zero, .L809CA780 /* 0198C 809CA74C AC620004 */ sw $v0, 0x0004($v1) ## 00000004 /* 01990 809CA750 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 .L809CA754: @@ -124,37 +124,37 @@ glabel EnBox_Draw /* 0199C 809CA75C 24480008 */ addiu $t0, $v0, 0x0008 ## $t0 = 00000008 /* 019A0 809CA760 AE0802D0 */ sw $t0, 0x02D0($s0) ## 000002D0 /* 019A4 809CA764 AC490000 */ sw $t1, 0x0000($v0) ## 00000000 -/* 019A8 809CA768 8FAA0074 */ lw $t2, 0x0074($sp) +/* 019A8 809CA768 8FAA0074 */ lw $t2, 0x0074($sp) /* 019AC 809CA76C 8D440000 */ lw $a0, 0x0000($t2) ## 00000000 -/* 019B0 809CA770 0C272928 */ jal func_809CA4A0 -/* 019B4 809CA774 AFA2003C */ sw $v0, 0x003C($sp) -/* 019B8 809CA778 8FA3003C */ lw $v1, 0x003C($sp) +/* 019B0 809CA770 0C272928 */ jal func_809CA4A0 +/* 019B4 809CA774 AFA2003C */ sw $v0, 0x003C($sp) +/* 019B8 809CA778 8FA3003C */ lw $v1, 0x003C($sp) /* 019BC 809CA77C AC620004 */ sw $v0, 0x0004($v1) ## 00000004 .L809CA780: /* 019C0 809CA780 8E250168 */ lw $a1, 0x0168($s1) ## 00000168 /* 019C4 809CA784 8E260184 */ lw $a2, 0x0184($s1) ## 00000184 /* 019C8 809CA788 3C0B809D */ lui $t3, %hi(func_809CA2D8) ## $t3 = 809D0000 /* 019CC 809CA78C 256BA2D8 */ addiu $t3, $t3, %lo(func_809CA2D8) ## $t3 = 809CA2D8 -/* 019D0 809CA790 AFAB0010 */ sw $t3, 0x0010($sp) -/* 019D4 809CA794 AFB10014 */ sw $s1, 0x0014($sp) +/* 019D0 809CA790 AFAB0010 */ sw $t3, 0x0010($sp) +/* 019D4 809CA794 AFB10014 */ sw $s1, 0x0014($sp) /* 019D8 809CA798 8E0C02D0 */ lw $t4, 0x02D0($s0) ## 000002D0 -/* 019DC 809CA79C 8FA40074 */ lw $a0, 0x0074($sp) +/* 019DC 809CA79C 8FA40074 */ lw $a0, 0x0074($sp) /* 019E0 809CA7A0 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 019E4 809CA7A4 0C0288A2 */ jal func_800A2288 -/* 019E8 809CA7A8 AFAC0018 */ sw $t4, 0x0018($sp) +/* 019E4 809CA7A4 0C0288A2 */ jal SkelAnime_Draw2 +/* 019E8 809CA7A8 AFAC0018 */ sw $t4, 0x0018($sp) /* 019EC 809CA7AC AE0202D0 */ sw $v0, 0x02D0($s0) ## 000002D0 .L809CA7B0: -/* 019F0 809CA7B0 8FAD0074 */ lw $t5, 0x0074($sp) +/* 019F0 809CA7B0 8FAD0074 */ lw $t5, 0x0074($sp) .L809CA7B4: /* 019F4 809CA7B4 3C06809D */ lui $a2, %hi(D_809CA8E0) ## $a2 = 809D0000 /* 019F8 809CA7B8 24C6A8E0 */ addiu $a2, $a2, %lo(D_809CA8E0) ## $a2 = 809CA8E0 /* 019FC 809CA7BC 27A40058 */ addiu $a0, $sp, 0x0058 ## $a0 = FFFFFFE8 /* 01A00 809CA7C0 24070667 */ addiu $a3, $zero, 0x0667 ## $a3 = 00000667 -/* 01A04 809CA7C4 0C031AD5 */ jal func_800C6B54 +/* 01A04 809CA7C4 0C031AD5 */ jal Graph_CloseDisps /* 01A08 809CA7C8 8DA50000 */ lw $a1, 0x0000($t5) ## 00000000 -/* 01A0C 809CA7CC 8FBF002C */ lw $ra, 0x002C($sp) -/* 01A10 809CA7D0 8FB00024 */ lw $s0, 0x0024($sp) -/* 01A14 809CA7D4 8FB10028 */ lw $s1, 0x0028($sp) -/* 01A18 809CA7D8 03E00008 */ jr $ra +/* 01A0C 809CA7CC 8FBF002C */ lw $ra, 0x002C($sp) +/* 01A10 809CA7D0 8FB00024 */ lw $s0, 0x0024($sp) +/* 01A14 809CA7D4 8FB10028 */ lw $s1, 0x0028($sp) +/* 01A18 809CA7D8 03E00008 */ jr $ra /* 01A1C 809CA7DC 27BD0070 */ addiu $sp, $sp, 0x0070 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Box/EnBox_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Box/EnBox_Init.s index 0330b77f9a..33ff9b203b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Box/EnBox_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Box/EnBox_Init.s @@ -2,49 +2,49 @@ glabel EnBox_Init /* 00094 809C8E54 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 /* 00098 809C8E58 8C42E664 */ lw $v0, -0x199C($v0) ## 8015E664 /* 0009C 809C8E5C 27BDFFA8 */ addiu $sp, $sp, 0xFFA8 ## $sp = FFFFFFA8 -/* 000A0 809C8E60 AFB00024 */ sw $s0, 0x0024($sp) +/* 000A0 809C8E60 AFB00024 */ sw $s0, 0x0024($sp) /* 000A4 809C8E64 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 000A8 809C8E68 3C04809D */ lui $a0, %hi(D_809CA800) ## $a0 = 809D0000 -/* 000AC 809C8E6C 00027080 */ sll $t6, $v0, 2 -/* 000B0 809C8E70 008E2021 */ addu $a0, $a0, $t6 +/* 000AC 809C8E6C 00027080 */ sll $t6, $v0, 2 +/* 000B0 809C8E70 008E2021 */ addu $a0, $a0, $t6 /* 000B4 809C8E74 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 -/* 000B8 809C8E78 8C84A800 */ lw $a0, %lo(D_809CA800)($a0) -/* 000BC 809C8E7C AFBF002C */ sw $ra, 0x002C($sp) -/* 000C0 809C8E80 AFB10028 */ sw $s1, 0x0028($sp) +/* 000B8 809C8E78 8C84A800 */ lw $a0, %lo(D_809CA800)($a0) +/* 000BC 809C8E7C AFBF002C */ sw $ra, 0x002C($sp) +/* 000C0 809C8E80 AFB10028 */ sw $s1, 0x0028($sp) /* 000C4 809C8E84 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 -/* 000C8 809C8E88 AFA00048 */ sw $zero, 0x0048($sp) -/* 000CC 809C8E8C E7A40044 */ swc1 $f4, 0x0044($sp) +/* 000C8 809C8E88 AFA00048 */ sw $zero, 0x0048($sp) +/* 000CC 809C8E8C E7A40044 */ swc1 $f4, 0x0044($sp) /* 000D0 809C8E90 0C028800 */ jal SkelAnime_GetFrameCount - -/* 000D4 809C8E94 AFA4004C */ sw $a0, 0x004C($sp) + +/* 000D4 809C8E94 AFA4004C */ sw $a0, 0x004C($sp) /* 000D8 809C8E98 44823000 */ mtc1 $v0, $f6 ## $f6 = 0.00 /* 000DC 809C8E9C 3C05809D */ lui $a1, %hi(D_809CA810) ## $a1 = 809D0000 /* 000E0 809C8EA0 24A5A810 */ addiu $a1, $a1, %lo(D_809CA810) ## $a1 = 809CA810 -/* 000E4 809C8EA4 46803220 */ cvt.s.w $f8, $f6 +/* 000E4 809C8EA4 46803220 */ cvt.s.w $f8, $f6 /* 000E8 809C8EA8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 000EC 809C8EAC 0C01E037 */ jal Actor_ProcessInitChain - -/* 000F0 809C8EB0 E7A80040 */ swc1 $f8, 0x0040($sp) + +/* 000F0 809C8EB0 E7A80040 */ swc1 $f8, 0x0040($sp) /* 000F4 809C8EB4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 000F8 809C8EB8 0C010D20 */ jal DynaPolyInfo_SetActorMove - + /* 000FC 809C8EBC 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 00100 809C8EC0 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 /* 00104 809C8EC4 24845FC8 */ addiu $a0, $a0, 0x5FC8 ## $a0 = 06005FC8 /* 00108 809C8EC8 0C010620 */ jal DynaPolyInfo_Alloc - + /* 0010C 809C8ECC 27A50048 */ addiu $a1, $sp, 0x0048 ## $a1 = FFFFFFF0 /* 00110 809C8ED0 26250810 */ addiu $a1, $s1, 0x0810 ## $a1 = 00000810 -/* 00114 809C8ED4 AFA50030 */ sw $a1, 0x0030($sp) +/* 00114 809C8ED4 AFA50030 */ sw $a1, 0x0030($sp) /* 00118 809C8ED8 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 0011C 809C8EDC 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 00120 809C8EE0 0C00FA9D */ jal DynaPolyInfo_RegisterActor ## DynaPolyInfo_setActor -/* 00124 809C8EE4 8FA70048 */ lw $a3, 0x0048($sp) +/* 00124 809C8EE4 8FA70048 */ lw $a3, 0x0048($sp) /* 00128 809C8EE8 AE02014C */ sw $v0, 0x014C($s0) ## 0000014C -/* 0012C 809C8EEC 8FA50030 */ lw $a1, 0x0030($sp) +/* 0012C 809C8EEC 8FA50030 */ lw $a1, 0x0030($sp) /* 00130 809C8EF0 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 00134 809C8EF4 0C00FB2A */ jal func_8003ECA8 +/* 00134 809C8EF4 0C00FB2A */ jal func_8003ECA8 /* 00138 809C8EF8 00403025 */ or $a2, $v0, $zero ## $a2 = 00000000 /* 0013C 809C8EFC 860F001C */ lh $t7, 0x001C($s0) ## 0000001C /* 00140 809C8F00 3C01C0B0 */ lui $at, 0xC0B0 ## $at = C0B00000 @@ -53,7 +53,7 @@ glabel EnBox_Init /* 0014C 809C8F0C 86080034 */ lh $t0, 0x0034($s0) ## 00000034 /* 00150 809C8F10 44818000 */ mtc1 $at, $f16 ## $f16 = -50.00 /* 00154 809C8F14 8605001C */ lh $a1, 0x001C($s0) ## 0000001C -/* 00158 809C8F18 000FC303 */ sra $t8, $t7, 12 +/* 00158 809C8F18 000FC303 */ sra $t8, $t7, 12 /* 0015C 809C8F1C 3319000F */ andi $t9, $t8, 0x000F ## $t9 = 00000000 /* 00160 809C8F20 A20001F6 */ sb $zero, 0x01F6($s0) ## 000001F6 /* 00164 809C8F24 A21901F9 */ sb $t9, 0x01F9($s0) ## 000001F9 @@ -64,39 +64,39 @@ glabel EnBox_Init /* 00178 809C8F38 A20801F8 */ sb $t0, 0x01F8($s0) ## 000001F8 /* 0017C 809C8F3C E6100070 */ swc1 $f16, 0x0070($s0) ## 00000070 /* 00180 809C8F40 0C00B32C */ jal Flags_GetTreasure - + /* 00184 809C8F44 30A5001F */ andi $a1, $a1, 0x001F ## $a1 = 00000000 -/* 00188 809C8F48 1040000E */ beq $v0, $zero, .L809C8F84 +/* 00188 809C8F48 1040000E */ beq $v0, $zero, .L809C8F84 /* 0018C 809C8F4C 240900FF */ addiu $t1, $zero, 0x00FF ## $t1 = 000000FF /* 00190 809C8F50 240A0064 */ addiu $t2, $zero, 0x0064 ## $t2 = 00000064 /* 00194 809C8F54 3C05809D */ lui $a1, %hi(func_809C9D70) ## $a1 = 809D0000 /* 00198 809C8F58 A20901F7 */ sb $t1, 0x01F7($s0) ## 000001F7 /* 0019C 809C8F5C A20A01FA */ sb $t2, 0x01FA($s0) ## 000001FA /* 001A0 809C8F60 24A59D70 */ addiu $a1, $a1, %lo(func_809C9D70) ## $a1 = 809C9D70 -/* 001A4 809C8F64 0C272370 */ jal func_809C8DC0 +/* 001A4 809C8F64 0C272370 */ jal func_809C8DC0 /* 001A8 809C8F68 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 001AC 809C8F6C 920B01F6 */ lbu $t3, 0x01F6($s0) ## 000001F6 /* 001B0 809C8F70 356C0010 */ ori $t4, $t3, 0x0010 ## $t4 = 00000010 /* 001B4 809C8F74 A20C01F6 */ sb $t4, 0x01F6($s0) ## 000001F6 -/* 001B8 809C8F78 C7B20040 */ lwc1 $f18, 0x0040($sp) -/* 001BC 809C8F7C 10000092 */ beq $zero, $zero, .L809C91C8 -/* 001C0 809C8F80 E7B20044 */ swc1 $f18, 0x0044($sp) +/* 001B8 809C8F78 C7B20040 */ lwc1 $f18, 0x0040($sp) +/* 001BC 809C8F7C 10000092 */ beq $zero, $zero, .L809C91C8 +/* 001C0 809C8F80 E7B20044 */ swc1 $f18, 0x0044($sp) .L809C8F84: /* 001C4 809C8F84 920201F9 */ lbu $v0, 0x01F9($s0) ## 000001F9 /* 001C8 809C8F88 24010003 */ addiu $at, $zero, 0x0003 ## $at = 00000003 /* 001CC 809C8F8C 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 001D0 809C8F90 10410003 */ beq $v0, $at, .L809C8FA0 +/* 001D0 809C8F90 10410003 */ beq $v0, $at, .L809C8FA0 /* 001D4 809C8F94 24010008 */ addiu $at, $zero, 0x0008 ## $at = 00000008 -/* 001D8 809C8F98 54410021 */ bnel $v0, $at, .L809C9020 +/* 001D8 809C8F98 54410021 */ bnel $v0, $at, .L809C9020 /* 001DC 809C8F9C 920201F9 */ lbu $v0, 0x01F9($s0) ## 000001F9 .L809C8FA0: /* 001E0 809C8FA0 0C00B2D0 */ jal Flags_GetSwitch - + /* 001E4 809C8FA4 920501F8 */ lbu $a1, 0x01F8($s0) ## 000001F8 -/* 001E8 809C8FA8 1440001C */ bne $v0, $zero, .L809C901C +/* 001E8 809C8FA8 1440001C */ bne $v0, $zero, .L809C901C /* 001EC 809C8FAC 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 001F0 809C8FB0 8FA50030 */ lw $a1, 0x0030($sp) -/* 001F4 809C8FB4 0C00FAFE */ jal func_8003EBF8 +/* 001F0 809C8FB0 8FA50030 */ lw $a1, 0x0030($sp) +/* 001F4 809C8FB4 0C00FAFE */ jal func_8003EBF8 /* 001F8 809C8FB8 8E06014C */ lw $a2, 0x014C($s0) ## 0000014C /* 001FC 809C8FBC 0C03F66B */ jal Math_Rand_ZeroOne ## Rand.Next() float @@ -105,16 +105,16 @@ glabel EnBox_Init /* 00208 809C8FC8 44812000 */ mtc1 $at, $f4 ## $f4 = 0.50 /* 0020C 809C8FCC 3C05809D */ lui $a1, %hi(func_809C9630) ## $a1 = 809D0000 /* 00210 809C8FD0 240FFFF4 */ addiu $t7, $zero, 0xFFF4 ## $t7 = FFFFFFF4 -/* 00214 809C8FD4 4604003C */ c.lt.s $f0, $f4 +/* 00214 809C8FD4 4604003C */ c.lt.s $f0, $f4 /* 00218 809C8FD8 24A59630 */ addiu $a1, $a1, %lo(func_809C9630) ## $a1 = 809C9630 /* 0021C 809C8FDC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00220 809C8FE0 45000004 */ bc1f .L809C8FF4 +/* 00220 809C8FE0 45000004 */ bc1f .L809C8FF4 /* 00224 809C8FE4 00000000 */ nop /* 00228 809C8FE8 920D01F6 */ lbu $t5, 0x01F6($s0) ## 000001F6 /* 0022C 809C8FEC 35AE0004 */ ori $t6, $t5, 0x0004 ## $t6 = 00000004 /* 00230 809C8FF0 A20E01F6 */ sb $t6, 0x01F6($s0) ## 000001F6 .L809C8FF4: -/* 00234 809C8FF4 0C272370 */ jal func_809C8DC0 +/* 00234 809C8FF4 0C272370 */ jal func_809C8DC0 /* 00238 809C8FF8 AE0F01A8 */ sw $t7, 0x01A8($s0) ## 000001A8 /* 0023C 809C8FFC 921801F6 */ lbu $t8, 0x01F6($s0) ## 000001F6 /* 00240 809C9000 8E080004 */ lw $t0, 0x0004($s0) ## 00000004 @@ -122,121 +122,121 @@ glabel EnBox_Init /* 00248 809C9008 37190001 */ ori $t9, $t8, 0x0001 ## $t9 = 00000001 /* 0024C 809C900C 35090010 */ ori $t1, $t0, 0x0010 ## $t1 = 00000010 /* 00250 809C9010 A21901F6 */ sb $t9, 0x01F6($s0) ## 000001F6 -/* 00254 809C9014 1000006C */ beq $zero, $zero, .L809C91C8 +/* 00254 809C9014 1000006C */ beq $zero, $zero, .L809C91C8 /* 00258 809C9018 AE090004 */ sw $t1, 0x0004($s0) ## 00000004 .L809C901C: /* 0025C 809C901C 920201F9 */ lbu $v0, 0x01F9($s0) ## 000001F9 .L809C9020: /* 00260 809C9020 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 /* 00264 809C9024 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 00268 809C9028 10410003 */ beq $v0, $at, .L809C9038 +/* 00268 809C9028 10410003 */ beq $v0, $at, .L809C9038 /* 0026C 809C902C 24010007 */ addiu $at, $zero, 0x0007 ## $at = 00000007 -/* 00270 809C9030 5441001A */ bnel $v0, $at, .L809C909C +/* 00270 809C9030 5441001A */ bnel $v0, $at, .L809C909C /* 00274 809C9034 920201F9 */ lbu $v0, 0x01F9($s0) ## 000001F9 .L809C9038: /* 00278 809C9038 0C00B337 */ jal Flags_GetClear - + /* 0027C 809C903C 82050003 */ lb $a1, 0x0003($s0) ## 00000003 -/* 00280 809C9040 14400015 */ bne $v0, $zero, .L809C9098 +/* 00280 809C9040 14400015 */ bne $v0, $zero, .L809C9098 /* 00284 809C9044 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 00288 809C9048 3C05809D */ lui $a1, %hi(func_809C990C) ## $a1 = 809D0000 -/* 0028C 809C904C 0C272370 */ jal func_809C8DC0 +/* 0028C 809C904C 0C272370 */ jal func_809C8DC0 /* 00290 809C9050 24A5990C */ addiu $a1, $a1, %lo(func_809C990C) ## $a1 = 809C990C /* 00294 809C9054 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 00298 809C9058 8FA50030 */ lw $a1, 0x0030($sp) -/* 0029C 809C905C 0C00FAFE */ jal func_8003EBF8 +/* 00298 809C9058 8FA50030 */ lw $a1, 0x0030($sp) +/* 0029C 809C905C 0C00FAFE */ jal func_8003EBF8 /* 002A0 809C9060 8E06014C */ lw $a2, 0x014C($s0) ## 0000014C /* 002A4 809C9064 3C014248 */ lui $at, 0x4248 ## $at = 42480000 /* 002A8 809C9068 44814000 */ mtc1 $at, $f8 ## $f8 = 50.00 /* 002AC 809C906C C606000C */ lwc1 $f6, 0x000C($s0) ## 0000000C /* 002B0 809C9070 920A01F6 */ lbu $t2, 0x01F6($s0) ## 000001F6 /* 002B4 809C9074 8E0C0004 */ lw $t4, 0x0004($s0) ## 00000004 -/* 002B8 809C9078 46083281 */ sub.s $f10, $f6, $f8 +/* 002B8 809C9078 46083281 */ sub.s $f10, $f6, $f8 /* 002BC 809C907C 354B0001 */ ori $t3, $t2, 0x0001 ## $t3 = 00000001 /* 002C0 809C9080 358D0010 */ ori $t5, $t4, 0x0010 ## $t5 = 00000010 /* 002C4 809C9084 A20B01F6 */ sb $t3, 0x01F6($s0) ## 000001F6 /* 002C8 809C9088 E60A0028 */ swc1 $f10, 0x0028($s0) ## 00000028 /* 002CC 809C908C A20001F7 */ sb $zero, 0x01F7($s0) ## 000001F7 -/* 002D0 809C9090 1000004D */ beq $zero, $zero, .L809C91C8 +/* 002D0 809C9090 1000004D */ beq $zero, $zero, .L809C91C8 /* 002D4 809C9094 AE0D0004 */ sw $t5, 0x0004($s0) ## 00000004 .L809C9098: /* 002D8 809C9098 920201F9 */ lbu $v0, 0x01F9($s0) ## 000001F9 .L809C909C: /* 002DC 809C909C 24010009 */ addiu $at, $zero, 0x0009 ## $at = 00000009 /* 002E0 809C90A0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 002E4 809C90A4 10410004 */ beq $v0, $at, .L809C90B8 +/* 002E4 809C90A4 10410004 */ beq $v0, $at, .L809C90B8 /* 002E8 809C90A8 3C05809D */ lui $a1, %hi(func_809C9700) ## $a1 = 809D0000 /* 002EC 809C90AC 2401000A */ addiu $at, $zero, 0x000A ## $at = 0000000A -/* 002F0 809C90B0 54410019 */ bnel $v0, $at, .L809C9118 +/* 002F0 809C90B0 54410019 */ bnel $v0, $at, .L809C9118 /* 002F4 809C90B4 2401000B */ addiu $at, $zero, 0x000B ## $at = 0000000B .L809C90B8: -/* 002F8 809C90B8 0C272370 */ jal func_809C8DC0 +/* 002F8 809C90B8 0C272370 */ jal func_809C8DC0 /* 002FC 809C90BC 24A59700 */ addiu $a1, $a1, %lo(func_809C9700) ## $a1 = 809C9700 /* 00300 809C90C0 8E0E0004 */ lw $t6, 0x0004($s0) ## 00000004 /* 00304 809C90C4 3C010200 */ lui $at, 0x0200 ## $at = 02000000 /* 00308 809C90C8 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 0030C 809C90CC 01C17825 */ or $t7, $t6, $at ## $t7 = 02000000 /* 00310 809C90D0 AE0F0004 */ sw $t7, 0x0004($s0) ## 00000004 -/* 00314 809C90D4 8FA50030 */ lw $a1, 0x0030($sp) -/* 00318 809C90D8 0C00FAFE */ jal func_8003EBF8 +/* 00314 809C90D4 8FA50030 */ lw $a1, 0x0030($sp) +/* 00318 809C90D8 0C00FAFE */ jal func_8003EBF8 /* 0031C 809C90DC 8E06014C */ lw $a2, 0x014C($s0) ## 0000014C /* 00320 809C90E0 3C014248 */ lui $at, 0x4248 ## $at = 42480000 /* 00324 809C90E4 44819000 */ mtc1 $at, $f18 ## $f18 = 50.00 /* 00328 809C90E8 C610000C */ lwc1 $f16, 0x000C($s0) ## 0000000C /* 0032C 809C90EC 921801F6 */ lbu $t8, 0x01F6($s0) ## 000001F6 /* 00330 809C90F0 8E080004 */ lw $t0, 0x0004($s0) ## 00000004 -/* 00334 809C90F4 46128101 */ sub.s $f4, $f16, $f18 +/* 00334 809C90F4 46128101 */ sub.s $f4, $f16, $f18 /* 00338 809C90F8 37190001 */ ori $t9, $t8, 0x0001 ## $t9 = 00000001 /* 0033C 809C90FC 35090010 */ ori $t1, $t0, 0x0010 ## $t1 = 00000010 /* 00340 809C9100 A21901F6 */ sb $t9, 0x01F6($s0) ## 000001F6 /* 00344 809C9104 E6040028 */ swc1 $f4, 0x0028($s0) ## 00000028 /* 00348 809C9108 A20001F7 */ sb $zero, 0x01F7($s0) ## 000001F7 -/* 0034C 809C910C 1000002E */ beq $zero, $zero, .L809C91C8 +/* 0034C 809C910C 1000002E */ beq $zero, $zero, .L809C91C8 /* 00350 809C9110 AE090004 */ sw $t1, 0x0004($s0) ## 00000004 /* 00354 809C9114 2401000B */ addiu $at, $zero, 0x000B ## $at = 0000000B .L809C9118: -/* 00358 809C9118 14410019 */ bne $v0, $at, .L809C9180 +/* 00358 809C9118 14410019 */ bne $v0, $at, .L809C9180 /* 0035C 809C911C 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 00360 809C9120 0C00B2D0 */ jal Flags_GetSwitch - + /* 00364 809C9124 920501F8 */ lbu $a1, 0x01F8($s0) ## 000001F8 -/* 00368 809C9128 14400015 */ bne $v0, $zero, .L809C9180 +/* 00368 809C9128 14400015 */ bne $v0, $zero, .L809C9180 /* 0036C 809C912C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 00370 809C9130 3C05809D */ lui $a1, %hi(func_809C988C) ## $a1 = 809D0000 -/* 00374 809C9134 0C272370 */ jal func_809C8DC0 +/* 00374 809C9134 0C272370 */ jal func_809C8DC0 /* 00378 809C9138 24A5988C */ addiu $a1, $a1, %lo(func_809C988C) ## $a1 = 809C988C /* 0037C 809C913C 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 00380 809C9140 8FA50030 */ lw $a1, 0x0030($sp) -/* 00384 809C9144 0C00FAFE */ jal func_8003EBF8 +/* 00380 809C9140 8FA50030 */ lw $a1, 0x0030($sp) +/* 00384 809C9144 0C00FAFE */ jal func_8003EBF8 /* 00388 809C9148 8E06014C */ lw $a2, 0x014C($s0) ## 0000014C /* 0038C 809C914C 3C014248 */ lui $at, 0x4248 ## $at = 42480000 /* 00390 809C9150 44814000 */ mtc1 $at, $f8 ## $f8 = 50.00 /* 00394 809C9154 C606000C */ lwc1 $f6, 0x000C($s0) ## 0000000C /* 00398 809C9158 920A01F6 */ lbu $t2, 0x01F6($s0) ## 000001F6 /* 0039C 809C915C 8E0C0004 */ lw $t4, 0x0004($s0) ## 00000004 -/* 003A0 809C9160 46083281 */ sub.s $f10, $f6, $f8 +/* 003A0 809C9160 46083281 */ sub.s $f10, $f6, $f8 /* 003A4 809C9164 354B0001 */ ori $t3, $t2, 0x0001 ## $t3 = 00000001 /* 003A8 809C9168 358D0010 */ ori $t5, $t4, 0x0010 ## $t5 = 00000010 /* 003AC 809C916C A20B01F6 */ sb $t3, 0x01F6($s0) ## 000001F6 /* 003B0 809C9170 E60A0028 */ swc1 $f10, 0x0028($s0) ## 00000028 /* 003B4 809C9174 A20001F7 */ sb $zero, 0x01F7($s0) ## 000001F7 -/* 003B8 809C9178 10000013 */ beq $zero, $zero, .L809C91C8 +/* 003B8 809C9178 10000013 */ beq $zero, $zero, .L809C91C8 /* 003BC 809C917C AE0D0004 */ sw $t5, 0x0004($s0) ## 00000004 .L809C9180: /* 003C0 809C9180 920201F9 */ lbu $v0, 0x01F9($s0) ## 000001F9 /* 003C4 809C9184 24010004 */ addiu $at, $zero, 0x0004 ## $at = 00000004 /* 003C8 809C9188 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 003CC 809C918C 10410004 */ beq $v0, $at, .L809C91A0 +/* 003CC 809C918C 10410004 */ beq $v0, $at, .L809C91A0 /* 003D0 809C9190 3C05809D */ lui $a1, %hi(func_809C9B28) ## $a1 = 809D0000 /* 003D4 809C9194 24010006 */ addiu $at, $zero, 0x0006 ## $at = 00000006 -/* 003D8 809C9198 14410004 */ bne $v0, $at, .L809C91AC +/* 003D8 809C9198 14410004 */ bne $v0, $at, .L809C91AC /* 003DC 809C919C 00000000 */ nop .L809C91A0: /* 003E0 809C91A0 8E0E0004 */ lw $t6, 0x0004($s0) ## 00000004 /* 003E4 809C91A4 35CF0080 */ ori $t7, $t6, 0x0080 ## $t7 = 00000080 /* 003E8 809C91A8 AE0F0004 */ sw $t7, 0x0004($s0) ## 00000004 .L809C91AC: -/* 003EC 809C91AC 0C272370 */ jal func_809C8DC0 +/* 003EC 809C91AC 0C272370 */ jal func_809C8DC0 /* 003F0 809C91B0 24A59B28 */ addiu $a1, $a1, %lo(func_809C9B28) ## $a1 = 809C9B28 /* 003F4 809C91B4 921801F6 */ lbu $t8, 0x01F6($s0) ## 000001F6 /* 003F8 809C91B8 37080001 */ ori $t0, $t8, 0x0001 ## $t0 = 00000001 @@ -248,7 +248,7 @@ glabel EnBox_Init /* 0040C 809C91CC 860A0032 */ lh $t2, 0x0032($s0) ## 00000032 /* 00410 809C91D0 860200B8 */ lh $v0, 0x00B8($s0) ## 000000B8 /* 00414 809C91D4 34018000 */ ori $at, $zero, 0x8000 ## $at = 00008000 -/* 00418 809C91D8 01415821 */ addu $t3, $t2, $at +/* 00418 809C91D8 01415821 */ addu $t3, $t2, $at /* 0041C 809C91DC A60B0032 */ sh $t3, 0x0032($s0) ## 00000032 /* 00420 809C91E0 A6020034 */ sh $v0, 0x0034($s0) ## 00000034 /* 00424 809C91E4 A6020018 */ sh $v0, 0x0018($s0) ## 00000018 @@ -257,64 +257,64 @@ glabel EnBox_Init /* 00430 809C91F0 260C01B8 */ addiu $t4, $s0, 0x01B8 ## $t4 = 000001B8 /* 00434 809C91F4 260D01D6 */ addiu $t5, $s0, 0x01D6 ## $t5 = 000001D6 /* 00438 809C91F8 240E0005 */ addiu $t6, $zero, 0x0005 ## $t6 = 00000005 -/* 0043C 809C91FC AFAE0018 */ sw $t6, 0x0018($sp) -/* 00440 809C9200 AFAD0014 */ sw $t5, 0x0014($sp) -/* 00444 809C9204 AFAC0010 */ sw $t4, 0x0010($sp) +/* 0043C 809C91FC AFAE0018 */ sw $t6, 0x0018($sp) +/* 00440 809C9200 AFAD0014 */ sw $t5, 0x0014($sp) +/* 00444 809C9204 AFAC0010 */ sw $t4, 0x0010($sp) /* 00448 809C9208 24C647D8 */ addiu $a2, $a2, 0x47D8 ## $a2 = 060047D8 -/* 0044C 809C920C AFA50034 */ sw $a1, 0x0034($sp) -/* 00450 809C9210 8FA7004C */ lw $a3, 0x004C($sp) +/* 0044C 809C920C AFA50034 */ sw $a1, 0x0034($sp) +/* 00450 809C9210 8FA7004C */ lw $a3, 0x004C($sp) /* 00454 809C9214 0C02915F */ jal SkelAnime_Init - + /* 00458 809C9218 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 0045C 809C921C C7B00040 */ lwc1 $f16, 0x0040($sp) +/* 0045C 809C921C C7B00040 */ lwc1 $f16, 0x0040($sp) /* 00460 809C9220 44809000 */ mtc1 $zero, $f18 ## $f18 = 0.00 /* 00464 809C9224 240F0002 */ addiu $t7, $zero, 0x0002 ## $t7 = 00000002 -/* 00468 809C9228 AFAF0014 */ sw $t7, 0x0014($sp) -/* 0046C 809C922C 8FA40034 */ lw $a0, 0x0034($sp) -/* 00470 809C9230 8FA5004C */ lw $a1, 0x004C($sp) +/* 00468 809C9228 AFAF0014 */ sw $t7, 0x0014($sp) +/* 0046C 809C922C 8FA40034 */ lw $a0, 0x0034($sp) +/* 00470 809C9230 8FA5004C */ lw $a1, 0x004C($sp) /* 00474 809C9234 3C063FC0 */ lui $a2, 0x3FC0 ## $a2 = 3FC00000 -/* 00478 809C9238 8FA70044 */ lw $a3, 0x0044($sp) -/* 0047C 809C923C E7B00010 */ swc1 $f16, 0x0010($sp) -/* 00480 809C9240 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 00484 809C9244 E7B20018 */ swc1 $f18, 0x0018($sp) +/* 00478 809C9238 8FA70044 */ lw $a3, 0x0044($sp) +/* 0047C 809C923C E7B00010 */ swc1 $f16, 0x0010($sp) +/* 00480 809C9240 0C029468 */ jal SkelAnime_ChangeAnim + +/* 00484 809C9244 E7B20018 */ swc1 $f18, 0x0018($sp) /* 00488 809C9248 920201F9 */ lbu $v0, 0x01F9($s0) ## 000001F9 /* 0048C 809C924C 24010005 */ addiu $at, $zero, 0x0005 ## $at = 00000005 /* 00490 809C9250 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00494 809C9254 10410008 */ beq $v0, $at, .L809C9278 +/* 00494 809C9254 10410008 */ beq $v0, $at, .L809C9278 /* 00498 809C9258 3C053BA3 */ lui $a1, 0x3BA3 ## $a1 = 3BA30000 /* 0049C 809C925C 24010006 */ addiu $at, $zero, 0x0006 ## $at = 00000006 -/* 004A0 809C9260 10410005 */ beq $v0, $at, .L809C9278 +/* 004A0 809C9260 10410005 */ beq $v0, $at, .L809C9278 /* 004A4 809C9264 24010007 */ addiu $at, $zero, 0x0007 ## $at = 00000007 -/* 004A8 809C9268 10410003 */ beq $v0, $at, .L809C9278 +/* 004A8 809C9268 10410003 */ beq $v0, $at, .L809C9278 /* 004AC 809C926C 24010008 */ addiu $at, $zero, 0x0008 ## $at = 00000008 -/* 004B0 809C9270 54410009 */ bnel $v0, $at, .L809C9298 +/* 004B0 809C9270 54410009 */ bnel $v0, $at, .L809C9298 /* 004B4 809C9274 3C053C23 */ lui $a1, 0x3C23 ## $a1 = 3C230000 .L809C9278: /* 004B8 809C9278 0C00B58B */ jal Actor_SetScale - + /* 004BC 809C927C 34A5D70A */ ori $a1, $a1, 0xD70A ## $a1 = 3C23D70A /* 004C0 809C9280 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 004C4 809C9284 0C00B56E */ jal Actor_SetHeight - + /* 004C8 809C9288 3C0541A0 */ lui $a1, 0x41A0 ## $a1 = 41A00000 -/* 004CC 809C928C 10000009 */ beq $zero, $zero, .L809C92B4 -/* 004D0 809C9290 8FBF002C */ lw $ra, 0x002C($sp) +/* 004CC 809C928C 10000009 */ beq $zero, $zero, .L809C92B4 +/* 004D0 809C9290 8FBF002C */ lw $ra, 0x002C($sp) /* 004D4 809C9294 3C053C23 */ lui $a1, 0x3C23 ## $a1 = 3C230000 .L809C9298: /* 004D8 809C9298 34A5D70A */ ori $a1, $a1, 0xD70A ## $a1 = 3C23D70A /* 004DC 809C929C 0C00B58B */ jal Actor_SetScale - + /* 004E0 809C92A0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 004E4 809C92A4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 004E8 809C92A8 0C00B56E */ jal Actor_SetHeight - + /* 004EC 809C92AC 3C054220 */ lui $a1, 0x4220 ## $a1 = 42200000 -/* 004F0 809C92B0 8FBF002C */ lw $ra, 0x002C($sp) +/* 004F0 809C92B0 8FBF002C */ lw $ra, 0x002C($sp) .L809C92B4: -/* 004F4 809C92B4 8FB00024 */ lw $s0, 0x0024($sp) -/* 004F8 809C92B8 8FB10028 */ lw $s1, 0x0028($sp) -/* 004FC 809C92BC 03E00008 */ jr $ra +/* 004F4 809C92B4 8FB00024 */ lw $s0, 0x0024($sp) +/* 004F8 809C92B8 8FB10028 */ lw $s1, 0x0028($sp) +/* 004FC 809C92BC 03E00008 */ jr $ra /* 00500 809C92C0 27BD0058 */ addiu $sp, $sp, 0x0058 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Box/func_809C9B28.s b/asm/non_matchings/overlays/actors/ovl_En_Box/func_809C9B28.s index 438cb91304..8fd433b19d 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Box/func_809C9B28.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Box/func_809C9B28.s @@ -1,84 +1,84 @@ glabel func_809C9B28 /* 00D68 809C9B28 27BDFF98 */ addiu $sp, $sp, 0xFF98 ## $sp = FFFFFF98 -/* 00D6C 809C9B2C AFBF003C */ sw $ra, 0x003C($sp) -/* 00D70 809C9B30 AFB00038 */ sw $s0, 0x0038($sp) -/* 00D74 809C9B34 AFA5006C */ sw $a1, 0x006C($sp) +/* 00D6C 809C9B2C AFBF003C */ sw $ra, 0x003C($sp) +/* 00D70 809C9B30 AFB00038 */ sw $s0, 0x0038($sp) +/* 00D74 809C9B34 AFA5006C */ sw $a1, 0x006C($sp) /* 00D78 809C9B38 908F01F6 */ lbu $t7, 0x01F6($a0) ## 000001F6 /* 00D7C 809C9B3C 848201F4 */ lh $v0, 0x01F4($a0) ## 000001F4 /* 00D80 809C9B40 240E00FF */ addiu $t6, $zero, 0x00FF ## $t6 = 000000FF /* 00D84 809C9B44 35F80001 */ ori $t8, $t7, 0x0001 ## $t8 = 00000001 /* 00D88 809C9B48 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 00D8C 809C9B4C A08E01F7 */ sb $t6, 0x01F7($a0) ## 000001F7 -/* 00D90 809C9B50 1040004C */ beq $v0, $zero, .L809C9C84 +/* 00D90 809C9B50 1040004C */ beq $v0, $zero, .L809C9C84 /* 00D94 809C9B54 A09801F6 */ sb $t8, 0x01F6($a0) ## 000001F6 /* 00D98 809C9B58 3C038016 */ lui $v1, 0x8016 ## $v1 = 80160000 -/* 00D9C 809C9B5C 04410003 */ bgez $v0, .L809C9B6C +/* 00D9C 809C9B5C 04410003 */ bgez $v0, .L809C9B6C /* 00DA0 809C9B60 8C63E664 */ lw $v1, -0x199C($v1) ## 8015E664 -/* 00DA4 809C9B64 10000002 */ beq $zero, $zero, .L809C9B70 +/* 00DA4 809C9B64 10000002 */ beq $zero, $zero, .L809C9B70 /* 00DA8 809C9B68 24020002 */ addiu $v0, $zero, 0x0002 ## $v0 = 00000002 .L809C9B6C: /* 00DAC 809C9B6C 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 .L809C9B70: -/* 00DB0 809C9B70 0002C880 */ sll $t9, $v0, 2 -/* 00DB4 809C9B74 00034080 */ sll $t0, $v1, 2 -/* 00DB8 809C9B78 03284821 */ addu $t1, $t9, $t0 +/* 00DB0 809C9B70 0002C880 */ sll $t9, $v0, 2 +/* 00DB4 809C9B74 00034080 */ sll $t0, $v1, 2 +/* 00DB8 809C9B78 03284821 */ addu $t1, $t9, $t0 /* 00DBC 809C9B7C 3C05809D */ lui $a1, %hi(D_809CA800) ## $a1 = 809D0000 -/* 00DC0 809C9B80 00A92821 */ addu $a1, $a1, $t1 -/* 00DC4 809C9B84 8CA4A800 */ lw $a0, %lo(D_809CA800)($a1) +/* 00DC0 809C9B80 00A92821 */ addu $a1, $a1, $t1 +/* 00DC4 809C9B84 8CA4A800 */ lw $a0, %lo(D_809CA800)($a1) /* 00DC8 809C9B88 0C028800 */ jal SkelAnime_GetFrameCount - -/* 00DCC 809C9B8C AFA40060 */ sw $a0, 0x0060($sp) + +/* 00DCC 809C9B8C AFA40060 */ sw $a0, 0x0060($sp) /* 00DD0 809C9B90 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 00DD4 809C9B94 44804000 */ mtc1 $zero, $f8 ## $f8 = 0.00 /* 00DD8 809C9B98 240A0002 */ addiu $t2, $zero, 0x0002 ## $t2 = 00000002 -/* 00DDC 809C9B9C 468021A0 */ cvt.s.w $f6, $f4 -/* 00DE0 809C9BA0 8FA50060 */ lw $a1, 0x0060($sp) -/* 00DE4 809C9BA4 AFAA0014 */ sw $t2, 0x0014($sp) +/* 00DDC 809C9B9C 468021A0 */ cvt.s.w $f6, $f4 +/* 00DE0 809C9BA0 8FA50060 */ lw $a1, 0x0060($sp) +/* 00DE4 809C9BA4 AFAA0014 */ sw $t2, 0x0014($sp) /* 00DE8 809C9BA8 26040164 */ addiu $a0, $s0, 0x0164 ## $a0 = 00000164 /* 00DEC 809C9BAC 3C063FC0 */ lui $a2, 0x3FC0 ## $a2 = 3FC00000 /* 00DF0 809C9BB0 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 00DF4 809C9BB4 E7A60010 */ swc1 $f6, 0x0010($sp) -/* 00DF8 809C9BB8 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 00DFC 809C9BBC E7A80018 */ swc1 $f8, 0x0018($sp) +/* 00DF4 809C9BB4 E7A60010 */ swc1 $f6, 0x0010($sp) +/* 00DF8 809C9BB8 0C029468 */ jal SkelAnime_ChangeAnim + +/* 00DFC 809C9BBC E7A80018 */ swc1 $f8, 0x0018($sp) /* 00E00 809C9BC0 3C05809D */ lui $a1, %hi(func_809C9D70) ## $a1 = 809D0000 /* 00E04 809C9BC4 24A59D70 */ addiu $a1, $a1, %lo(func_809C9D70) ## $a1 = 809C9D70 -/* 00E08 809C9BC8 0C272370 */ jal func_809C8DC0 +/* 00E08 809C9BC8 0C272370 */ jal func_809C8DC0 /* 00E0C 809C9BCC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 00E10 809C9BD0 860B01F4 */ lh $t3, 0x01F4($s0) ## 000001F4 -/* 00E14 809C9BD4 59600021 */ blezl $t3, .L809C9C5C +/* 00E14 809C9BD4 59600021 */ blezl $t3, .L809C9C5C /* 00E18 809C9BD8 8605001C */ lh $a1, 0x001C($s0) ## 0000001C /* 00E1C 809C9BDC 920201F9 */ lbu $v0, 0x01F9($s0) ## 000001F9 /* 00E20 809C9BE0 24010005 */ addiu $at, $zero, 0x0005 ## $at = 00000005 -/* 00E24 809C9BE4 1041001C */ beq $v0, $at, .L809C9C58 +/* 00E24 809C9BE4 1041001C */ beq $v0, $at, .L809C9C58 /* 00E28 809C9BE8 24010006 */ addiu $at, $zero, 0x0006 ## $at = 00000006 -/* 00E2C 809C9BEC 1041001A */ beq $v0, $at, .L809C9C58 +/* 00E2C 809C9BEC 1041001A */ beq $v0, $at, .L809C9C58 /* 00E30 809C9BF0 24010007 */ addiu $at, $zero, 0x0007 ## $at = 00000007 -/* 00E34 809C9BF4 10410018 */ beq $v0, $at, .L809C9C58 +/* 00E34 809C9BF4 10410018 */ beq $v0, $at, .L809C9C58 /* 00E38 809C9BF8 24010008 */ addiu $at, $zero, 0x0008 ## $at = 00000008 -/* 00E3C 809C9BFC 50410017 */ beql $v0, $at, .L809C9C5C +/* 00E3C 809C9BFC 50410017 */ beql $v0, $at, .L809C9C5C /* 00E40 809C9C00 8605001C */ lh $a1, 0x001C($s0) ## 0000001C /* 00E44 809C9C04 C60A0024 */ lwc1 $f10, 0x0024($s0) ## 00000024 -/* 00E48 809C9C08 8FA6006C */ lw $a2, 0x006C($sp) +/* 00E48 809C9C08 8FA6006C */ lw $a2, 0x006C($sp) /* 00E4C 809C9C0C 240FFFFF */ addiu $t7, $zero, 0xFFFF ## $t7 = FFFFFFFF -/* 00E50 809C9C10 E7AA0010 */ swc1 $f10, 0x0010($sp) +/* 00E50 809C9C10 E7AA0010 */ swc1 $f10, 0x0010($sp) /* 00E54 809C9C14 C6100028 */ lwc1 $f16, 0x0028($s0) ## 00000028 /* 00E58 809C9C18 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 00E5C 809C9C1C 240700AA */ addiu $a3, $zero, 0x00AA ## $a3 = 000000AA -/* 00E60 809C9C20 E7B00014 */ swc1 $f16, 0x0014($sp) +/* 00E60 809C9C20 E7B00014 */ swc1 $f16, 0x0014($sp) /* 00E64 809C9C24 C612002C */ lwc1 $f18, 0x002C($s0) ## 0000002C /* 00E68 809C9C28 24C41C24 */ addiu $a0, $a2, 0x1C24 ## $a0 = 00001C24 -/* 00E6C 809C9C2C E7B20018 */ swc1 $f18, 0x0018($sp) +/* 00E6C 809C9C2C E7B20018 */ swc1 $f18, 0x0018($sp) /* 00E70 809C9C30 860C00B4 */ lh $t4, 0x00B4($s0) ## 000000B4 -/* 00E74 809C9C34 AFAC001C */ sw $t4, 0x001C($sp) +/* 00E74 809C9C34 AFAC001C */ sw $t4, 0x001C($sp) /* 00E78 809C9C38 860D00B6 */ lh $t5, 0x00B6($s0) ## 000000B6 -/* 00E7C 809C9C3C AFAD0020 */ sw $t5, 0x0020($sp) +/* 00E7C 809C9C3C AFAD0020 */ sw $t5, 0x0020($sp) /* 00E80 809C9C40 860E00B8 */ lh $t6, 0x00B8($s0) ## 000000B8 -/* 00E84 809C9C44 AFAF0028 */ sw $t7, 0x0028($sp) +/* 00E84 809C9C44 AFAF0028 */ sw $t7, 0x0028($sp) /* 00E88 809C9C48 0C00C916 */ jal Actor_SpawnAttached - -/* 00E8C 809C9C4C AFAE0024 */ sw $t6, 0x0024($sp) -/* 00E90 809C9C50 0C03D719 */ jal func_800F5C64 + +/* 00E8C 809C9C4C AFAE0024 */ sw $t6, 0x0024($sp) +/* 00E90 809C9C50 0C03D719 */ jal func_800F5C64 /* 00E94 809C9C54 2404092B */ addiu $a0, $zero, 0x092B ## $a0 = 0000092B .L809C9C58: /* 00E98 809C9C58 8605001C */ lh $a1, 0x001C($s0) ## 0000001C @@ -86,78 +86,78 @@ glabel func_809C9B28 /* 00E9C 809C9C5C 3C04809D */ lui $a0, %hi(D_809CA830) ## $a0 = 809D0000 /* 00EA0 809C9C60 2484A830 */ addiu $a0, $a0, %lo(D_809CA830) ## $a0 = 809CA830 /* 00EA4 809C9C64 0C00084C */ jal osSyncPrintf - + /* 00EA8 809C9C68 30A5001F */ andi $a1, $a1, 0x001F ## $a1 = 00000000 /* 00EAC 809C9C6C 8605001C */ lh $a1, 0x001C($s0) ## 0000001C -/* 00EB0 809C9C70 8FA4006C */ lw $a0, 0x006C($sp) +/* 00EB0 809C9C70 8FA4006C */ lw $a0, 0x006C($sp) /* 00EB4 809C9C74 0C00B331 */ jal Flags_SetTreasure - + /* 00EB8 809C9C78 30A5001F */ andi $a1, $a1, 0x001F ## $a1 = 00000000 -/* 00EBC 809C9C7C 10000038 */ beq $zero, $zero, .L809C9D60 -/* 00EC0 809C9C80 8FBF003C */ lw $ra, 0x003C($sp) +/* 00EBC 809C9C7C 10000038 */ beq $zero, $zero, .L809C9D60 +/* 00EC0 809C9C80 8FBF003C */ lw $ra, 0x003C($sp) .L809C9C84: -/* 00EC4 809C9C84 8FB8006C */ lw $t8, 0x006C($sp) +/* 00EC4 809C9C84 8FB8006C */ lw $t8, 0x006C($sp) /* 00EC8 809C9C88 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 00ECC 809C9C8C 27A5004C */ addiu $a1, $sp, 0x004C ## $a1 = FFFFFFE4 /* 00ED0 809C9C90 8F021C44 */ lw $v0, 0x1C44($t8) ## 00001C44 -/* 00ED4 809C9C94 0C00B6F4 */ jal func_8002DBD0 +/* 00ED4 809C9C94 0C00B6F4 */ jal func_8002DBD0 /* 00ED8 809C9C98 24460024 */ addiu $a2, $v0, 0x0024 ## $a2 = 00000024 /* 00EDC 809C9C9C 3C01C248 */ lui $at, 0xC248 ## $at = C2480000 -/* 00EE0 809C9CA0 C7A00054 */ lwc1 $f0, 0x0054($sp) +/* 00EE0 809C9CA0 C7A00054 */ lwc1 $f0, 0x0054($sp) /* 00EE4 809C9CA4 44812000 */ mtc1 $at, $f4 ## $f4 = -50.00 /* 00EE8 809C9CA8 00000000 */ nop -/* 00EEC 809C9CAC 4600203C */ c.lt.s $f4, $f0 +/* 00EEC 809C9CAC 4600203C */ c.lt.s $f4, $f0 /* 00EF0 809C9CB0 00000000 */ nop -/* 00EF4 809C9CB4 45020021 */ bc1fl .L809C9D3C +/* 00EF4 809C9CB4 45020021 */ bc1fl .L809C9D3C /* 00EF8 809C9CB8 8605001C */ lh $a1, 0x001C($s0) ## 0000001C /* 00EFC 809C9CBC 44803000 */ mtc1 $zero, $f6 ## $f6 = 0.00 /* 00F00 809C9CC0 3C014120 */ lui $at, 0x4120 ## $at = 41200000 -/* 00F04 809C9CC4 4606003C */ c.lt.s $f0, $f6 -/* 00F08 809C9CC8 C7A00050 */ lwc1 $f0, 0x0050($sp) -/* 00F0C 809C9CCC 4502001B */ bc1fl .L809C9D3C +/* 00F04 809C9CC4 4606003C */ c.lt.s $f0, $f6 +/* 00F08 809C9CC8 C7A00050 */ lwc1 $f0, 0x0050($sp) +/* 00F0C 809C9CCC 4502001B */ bc1fl .L809C9D3C /* 00F10 809C9CD0 8605001C */ lh $a1, 0x001C($s0) ## 0000001C /* 00F14 809C9CD4 44814000 */ mtc1 $at, $f8 ## $f8 = 10.00 -/* 00F18 809C9CD8 46000005 */ abs.s $f0, $f0 +/* 00F18 809C9CD8 46000005 */ abs.s $f0, $f0 /* 00F1C 809C9CDC 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 -/* 00F20 809C9CE0 4608003C */ c.lt.s $f0, $f8 -/* 00F24 809C9CE4 C7A0004C */ lwc1 $f0, 0x004C($sp) -/* 00F28 809C9CE8 45020014 */ bc1fl .L809C9D3C +/* 00F20 809C9CE0 4608003C */ c.lt.s $f0, $f8 +/* 00F24 809C9CE4 C7A0004C */ lwc1 $f0, 0x004C($sp) +/* 00F28 809C9CE8 45020014 */ bc1fl .L809C9D3C /* 00F2C 809C9CEC 8605001C */ lh $a1, 0x001C($s0) ## 0000001C /* 00F30 809C9CF0 44815000 */ mtc1 $at, $f10 ## $f10 = 20.00 -/* 00F34 809C9CF4 46000005 */ abs.s $f0, $f0 +/* 00F34 809C9CF4 46000005 */ abs.s $f0, $f0 /* 00F38 809C9CF8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00F3C 809C9CFC 460A003C */ c.lt.s $f0, $f10 +/* 00F3C 809C9CFC 460A003C */ c.lt.s $f0, $f10 /* 00F40 809C9D00 24053000 */ addiu $a1, $zero, 0x3000 ## $a1 = 00003000 -/* 00F44 809C9D04 4502000D */ bc1fl .L809C9D3C +/* 00F44 809C9D04 4502000D */ bc1fl .L809C9D3C /* 00F48 809C9D08 8605001C */ lh $a1, 0x001C($s0) ## 0000001C -/* 00F4C 809C9D0C 0C00B7F2 */ jal func_8002DFC8 -/* 00F50 809C9D10 8FA6006C */ lw $a2, 0x006C($sp) -/* 00F54 809C9D14 50400009 */ beql $v0, $zero, .L809C9D3C +/* 00F4C 809C9D0C 0C00B7F2 */ jal func_8002DFC8 +/* 00F50 809C9D10 8FA6006C */ lw $a2, 0x006C($sp) +/* 00F54 809C9D14 50400009 */ beql $v0, $zero, .L809C9D3C /* 00F58 809C9D18 8605001C */ lh $a1, 0x001C($s0) ## 0000001C /* 00F5C 809C9D1C 8606001C */ lh $a2, 0x001C($s0) ## 0000001C /* 00F60 809C9D20 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00F64 809C9D24 8FA5006C */ lw $a1, 0x006C($sp) -/* 00F68 809C9D28 00063143 */ sra $a2, $a2, 5 +/* 00F64 809C9D24 8FA5006C */ lw $a1, 0x006C($sp) +/* 00F68 809C9D28 00063143 */ sra $a2, $a2, 5 /* 00F6C 809C9D2C 30C6007F */ andi $a2, $a2, 0x007F ## $a2 = 00000000 -/* 00F70 809C9D30 0C00BD55 */ jal func_8002F554 -/* 00F74 809C9D34 00063023 */ subu $a2, $zero, $a2 +/* 00F70 809C9D30 0C00BD55 */ jal func_8002F554 +/* 00F74 809C9D34 00063023 */ subu $a2, $zero, $a2 /* 00F78 809C9D38 8605001C */ lh $a1, 0x001C($s0) ## 0000001C .L809C9D3C: -/* 00F7C 809C9D3C 8FA4006C */ lw $a0, 0x006C($sp) +/* 00F7C 809C9D3C 8FA4006C */ lw $a0, 0x006C($sp) /* 00F80 809C9D40 0C00B32C */ jal Flags_GetTreasure - + /* 00F84 809C9D44 30A5001F */ andi $a1, $a1, 0x001F ## $a1 = 00000000 -/* 00F88 809C9D48 10400004 */ beq $v0, $zero, .L809C9D5C +/* 00F88 809C9D48 10400004 */ beq $v0, $zero, .L809C9D5C /* 00F8C 809C9D4C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 00F90 809C9D50 3C05809D */ lui $a1, %hi(func_809C9D70) ## $a1 = 809D0000 -/* 00F94 809C9D54 0C272370 */ jal func_809C8DC0 +/* 00F94 809C9D54 0C272370 */ jal func_809C8DC0 /* 00F98 809C9D58 24A59D70 */ addiu $a1, $a1, %lo(func_809C9D70) ## $a1 = 809C9D70 .L809C9D5C: -/* 00F9C 809C9D5C 8FBF003C */ lw $ra, 0x003C($sp) +/* 00F9C 809C9D5C 8FBF003C */ lw $ra, 0x003C($sp) .L809C9D60: -/* 00FA0 809C9D60 8FB00038 */ lw $s0, 0x0038($sp) +/* 00FA0 809C9D60 8FB00038 */ lw $s0, 0x0038($sp) /* 00FA4 809C9D64 27BD0068 */ addiu $sp, $sp, 0x0068 ## $sp = 00000000 -/* 00FA8 809C9D68 03E00008 */ jr $ra +/* 00FA8 809C9D68 03E00008 */ jr $ra /* 00FAC 809C9D6C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Brob/EnBrob_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Brob/EnBrob_Draw.s index dd87939664..875c976745 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Brob/EnBrob_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Brob/EnBrob_Draw.s @@ -1,32 +1,32 @@ glabel EnBrob_Draw /* 00ED0 809CB9E0 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 00ED4 809CB9E4 AFB00028 */ sw $s0, 0x0028($sp) +/* 00ED4 809CB9E4 AFB00028 */ sw $s0, 0x0028($sp) /* 00ED8 809CB9E8 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00EDC 809CB9EC AFBF002C */ sw $ra, 0x002C($sp) -/* 00EE0 809CB9F0 AFA50034 */ sw $a1, 0x0034($sp) -/* 00EE4 809CB9F4 0C024F46 */ jal func_80093D18 +/* 00EDC 809CB9EC AFBF002C */ sw $ra, 0x002C($sp) +/* 00EE0 809CB9F0 AFA50034 */ sw $a1, 0x0034($sp) +/* 00EE4 809CB9F4 0C024F46 */ jal func_80093D18 /* 00EE8 809CB9F8 8CA40000 */ lw $a0, 0x0000($a1) ## 00000000 /* 00EEC 809CB9FC 860F01AE */ lh $t7, 0x01AE($s0) ## 000001AE /* 00EF0 809CBA00 44806000 */ mtc1 $zero, $f12 ## $f12 = 0.00 /* 00EF4 809CBA04 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 /* 00EF8 809CBA08 448F2000 */ mtc1 $t7, $f4 ## $f4 = 0.00 -/* 00EFC 809CBA0C 44066000 */ mfc1 $a2, $f12 -/* 00F00 809CBA10 0C034261 */ jal Matrix_Translate -/* 00F04 809CBA14 468023A0 */ cvt.s.w $f14, $f4 +/* 00EFC 809CBA0C 44066000 */ mfc1 $a2, $f12 +/* 00F00 809CBA10 0C034261 */ jal Matrix_Translate +/* 00F04 809CBA14 468023A0 */ cvt.s.w $f14, $f4 /* 00F08 809CBA18 8E050168 */ lw $a1, 0x0168($s0) ## 00000168 /* 00F0C 809CBA1C 8E060184 */ lw $a2, 0x0184($s0) ## 00000184 /* 00F10 809CBA20 92070166 */ lbu $a3, 0x0166($s0) ## 00000166 /* 00F14 809CBA24 3C18809D */ lui $t8, %hi(func_809CB90C) ## $t8 = 809D0000 /* 00F18 809CBA28 2718B90C */ addiu $t8, $t8, %lo(func_809CB90C) ## $t8 = 809CB90C -/* 00F1C 809CBA2C AFB80014 */ sw $t8, 0x0014($sp) -/* 00F20 809CBA30 AFB00018 */ sw $s0, 0x0018($sp) -/* 00F24 809CBA34 AFA00010 */ sw $zero, 0x0010($sp) -/* 00F28 809CBA38 0C0286B2 */ jal func_800A1AC8 -/* 00F2C 809CBA3C 8FA40034 */ lw $a0, 0x0034($sp) -/* 00F30 809CBA40 8FBF002C */ lw $ra, 0x002C($sp) -/* 00F34 809CBA44 8FB00028 */ lw $s0, 0x0028($sp) +/* 00F1C 809CBA2C AFB80014 */ sw $t8, 0x0014($sp) +/* 00F20 809CBA30 AFB00018 */ sw $s0, 0x0018($sp) +/* 00F24 809CBA34 AFA00010 */ sw $zero, 0x0010($sp) +/* 00F28 809CBA38 0C0286B2 */ jal SkelAnime_DrawSV +/* 00F2C 809CBA3C 8FA40034 */ lw $a0, 0x0034($sp) +/* 00F30 809CBA40 8FBF002C */ lw $ra, 0x002C($sp) +/* 00F34 809CBA44 8FB00028 */ lw $s0, 0x0028($sp) /* 00F38 809CBA48 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 00F3C 809CBA4C 03E00008 */ jr $ra +/* 00F3C 809CBA4C 03E00008 */ jr $ra /* 00F40 809CBA50 00000000 */ nop /* 00F44 809CBA54 00000000 */ nop /* 00F48 809CBA58 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Brob/EnBrob_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Brob/EnBrob_Init.s index e4915fe982..4b5ce0b40f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Brob/EnBrob_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Brob/EnBrob_Init.s @@ -1,117 +1,117 @@ glabel EnBrob_Init /* 00000 809CAB10 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 -/* 00004 809CAB14 AFB00024 */ sw $s0, 0x0024($sp) +/* 00004 809CAB14 AFB00024 */ sw $s0, 0x0024($sp) /* 00008 809CAB18 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 0000C 809CAB1C AFB10028 */ sw $s1, 0x0028($sp) +/* 0000C 809CAB1C AFB10028 */ sw $s1, 0x0028($sp) /* 00010 809CAB20 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 -/* 00014 809CAB24 AFBF002C */ sw $ra, 0x002C($sp) +/* 00014 809CAB24 AFBF002C */ sw $ra, 0x002C($sp) /* 00018 809CAB28 260E01B0 */ addiu $t6, $s0, 0x01B0 ## $t6 = 000001B0 /* 0001C 809CAB2C 260F01EC */ addiu $t7, $s0, 0x01EC ## $t7 = 000001EC /* 00020 809CAB30 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 /* 00024 809CAB34 3C060600 */ lui $a2, 0x0600 ## $a2 = 06000000 /* 00028 809CAB38 3C070600 */ lui $a3, 0x0600 ## $a3 = 06000000 /* 0002C 809CAB3C 2418000A */ addiu $t8, $zero, 0x000A ## $t8 = 0000000A -/* 00030 809CAB40 AFA00034 */ sw $zero, 0x0034($sp) -/* 00034 809CAB44 AFB80018 */ sw $t8, 0x0018($sp) +/* 00030 809CAB40 AFA00034 */ sw $zero, 0x0034($sp) +/* 00034 809CAB44 AFB80018 */ sw $t8, 0x0018($sp) /* 00038 809CAB48 24E71750 */ addiu $a3, $a3, 0x1750 ## $a3 = 06001750 /* 0003C 809CAB4C 24C615D8 */ addiu $a2, $a2, 0x15D8 ## $a2 = 060015D8 /* 00040 809CAB50 26050164 */ addiu $a1, $s0, 0x0164 ## $a1 = 00000164 -/* 00044 809CAB54 AFAF0014 */ sw $t7, 0x0014($sp) -/* 00048 809CAB58 0C0291BE */ jal func_800A46F8 -/* 0004C 809CAB5C AFAE0010 */ sw $t6, 0x0010($sp) +/* 00044 809CAB54 AFAF0014 */ sw $t7, 0x0014($sp) +/* 00048 809CAB58 0C0291BE */ jal SkelAnime_InitSV +/* 0004C 809CAB5C AFAE0010 */ sw $t6, 0x0010($sp) /* 00050 809CAB60 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 00054 809CAB64 0C010D20 */ jal DynaPolyInfo_SetActorMove - + /* 00058 809CAB68 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 0005C 809CAB6C 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 /* 00060 809CAB70 24841A70 */ addiu $a0, $a0, 0x1A70 ## $a0 = 06001A70 /* 00064 809CAB74 0C010620 */ jal DynaPolyInfo_Alloc - + /* 00068 809CAB78 27A50034 */ addiu $a1, $sp, 0x0034 ## $a1 = FFFFFFF4 /* 0006C 809CAB7C 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 00070 809CAB80 26250810 */ addiu $a1, $s1, 0x0810 ## $a1 = 00000810 /* 00074 809CAB84 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 00078 809CAB88 0C00FA9D */ jal DynaPolyInfo_RegisterActor ## DynaPolyInfo_setActor -/* 0007C 809CAB8C 8FA70034 */ lw $a3, 0x0034($sp) +/* 0007C 809CAB8C 8FA70034 */ lw $a3, 0x0034($sp) /* 00080 809CAB90 AE02014C */ sw $v0, 0x014C($s0) ## 0000014C /* 00084 809CAB94 26050228 */ addiu $a1, $s0, 0x0228 ## $a1 = 00000228 -/* 00088 809CAB98 AFA50030 */ sw $a1, 0x0030($sp) +/* 00088 809CAB98 AFA50030 */ sw $a1, 0x0030($sp) /* 0008C 809CAB9C 0C0170D9 */ jal ActorCollider_AllocCylinder - + /* 00090 809CABA0 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 00094 809CABA4 3C07809D */ lui $a3, %hi(D_809CBA80) ## $a3 = 809D0000 -/* 00098 809CABA8 8FA50030 */ lw $a1, 0x0030($sp) +/* 00098 809CABA8 8FA50030 */ lw $a1, 0x0030($sp) /* 0009C 809CABAC 24E7BA80 */ addiu $a3, $a3, %lo(D_809CBA80) ## $a3 = 809CBA80 /* 000A0 809CABB0 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 000A4 809CABB4 0C01712B */ jal ActorCollider_InitCylinder - + /* 000A8 809CABB8 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 000AC 809CABBC 26050274 */ addiu $a1, $s0, 0x0274 ## $a1 = 00000274 -/* 000B0 809CABC0 AFA50030 */ sw $a1, 0x0030($sp) +/* 000B0 809CABC0 AFA50030 */ sw $a1, 0x0030($sp) /* 000B4 809CABC4 0C0170D9 */ jal ActorCollider_AllocCylinder - + /* 000B8 809CABC8 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 000BC 809CABCC 3C07809D */ lui $a3, %hi(D_809CBA80) ## $a3 = 809D0000 -/* 000C0 809CABD0 8FA50030 */ lw $a1, 0x0030($sp) +/* 000C0 809CABD0 8FA50030 */ lw $a1, 0x0030($sp) /* 000C4 809CABD4 24E7BA80 */ addiu $a3, $a3, %lo(D_809CBA80) ## $a3 = 809CBA80 /* 000C8 809CABD8 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 000CC 809CABDC 0C01712B */ jal ActorCollider_InitCylinder - + /* 000D0 809CABE0 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 000D4 809CABE4 3C06809D */ lui $a2, %hi(D_809CBAAC) ## $a2 = 809D0000 /* 000D8 809CABE8 24C6BAAC */ addiu $a2, $a2, %lo(D_809CBAAC) ## $a2 = 809CBAAC /* 000DC 809CABEC 26040098 */ addiu $a0, $s0, 0x0098 ## $a0 = 00000098 -/* 000E0 809CABF0 0C0187B5 */ jal func_80061ED4 +/* 000E0 809CABF0 0C0187B5 */ jal func_80061ED4 /* 000E4 809CABF4 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 000E8 809CABF8 8619001C */ lh $t9, 0x001C($s0) ## 0000001C /* 000EC 809CABFC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 000F0 809CAC00 3C053BA3 */ lui $a1, 0x3BA3 ## $a1 = 3BA30000 -/* 000F4 809CAC04 00194203 */ sra $t0, $t9, 8 +/* 000F4 809CAC04 00194203 */ sra $t0, $t9, 8 /* 000F8 809CAC08 310900FF */ andi $t1, $t0, 0x00FF ## $t1 = 00000000 -/* 000FC 809CAC0C 15200016 */ bne $t1, $zero, .L809CAC68 +/* 000FC 809CAC0C 15200016 */ bne $t1, $zero, .L809CAC68 /* 00100 809CAC10 00000000 */ nop /* 00104 809CAC14 3C053C23 */ lui $a1, 0x3C23 ## $a1 = 3C230000 /* 00108 809CAC18 34A5D70A */ ori $a1, $a1, 0xD70A ## $a1 = 3C23D70A /* 0010C 809CAC1C 0C00B58B */ jal Actor_SetScale - + /* 00110 809CAC20 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 00114 809CAC24 860A001C */ lh $t2, 0x001C($s0) ## 0000001C /* 00118 809CAC28 240100FF */ addiu $at, $zero, 0x00FF ## $at = 000000FF /* 0011C 809CAC2C 314B00FF */ andi $t3, $t2, 0x00FF ## $t3 = 00000000 /* 00120 809CAC30 A60B001C */ sh $t3, 0x001C($s0) ## 0000001C /* 00124 809CAC34 8602001C */ lh $v0, 0x001C($s0) ## 0000001C -/* 00128 809CAC38 1041001D */ beq $v0, $at, .L809CACB0 +/* 00128 809CAC38 1041001D */ beq $v0, $at, .L809CACB0 /* 0012C 809CAC3C 304C00FF */ andi $t4, $v0, 0x00FF ## $t4 = 00000000 /* 00130 809CAC40 448C2000 */ mtc1 $t4, $f4 ## $f4 = 0.00 /* 00134 809CAC44 3C01809D */ lui $at, %hi(D_809CBAC0) ## $at = 809D0000 -/* 00138 809CAC48 C428BAC0 */ lwc1 $f8, %lo(D_809CBAC0)($at) -/* 0013C 809CAC4C 468021A0 */ cvt.s.w $f6, $f4 +/* 00138 809CAC48 C428BAC0 */ lwc1 $f8, %lo(D_809CBAC0)($at) +/* 0013C 809CAC4C 468021A0 */ cvt.s.w $f6, $f4 /* 00140 809CAC50 C6100054 */ lwc1 $f16, 0x0054($s0) ## 00000054 -/* 00144 809CAC54 46083282 */ mul.s $f10, $f6, $f8 +/* 00144 809CAC54 46083282 */ mul.s $f10, $f6, $f8 /* 00148 809CAC58 00000000 */ nop -/* 0014C 809CAC5C 460A8482 */ mul.s $f18, $f16, $f10 -/* 00150 809CAC60 10000013 */ beq $zero, $zero, .L809CACB0 +/* 0014C 809CAC5C 460A8482 */ mul.s $f18, $f16, $f10 +/* 00150 809CAC60 10000013 */ beq $zero, $zero, .L809CACB0 /* 00154 809CAC64 E6120054 */ swc1 $f18, 0x0054($s0) ## 00000054 .L809CAC68: /* 00158 809CAC68 0C00B58B */ jal Actor_SetScale - + /* 0015C 809CAC6C 34A5D70A */ ori $a1, $a1, 0xD70A ## $a1 = 0000D70A /* 00160 809CAC70 860D001C */ lh $t5, 0x001C($s0) ## 0000001C /* 00164 809CAC74 240100FF */ addiu $at, $zero, 0x00FF ## $at = 000000FF /* 00168 809CAC78 31AE00FF */ andi $t6, $t5, 0x00FF ## $t6 = 00000000 /* 0016C 809CAC7C A60E001C */ sh $t6, 0x001C($s0) ## 0000001C /* 00170 809CAC80 8602001C */ lh $v0, 0x001C($s0) ## 0000001C -/* 00174 809CAC84 1041000A */ beq $v0, $at, .L809CACB0 +/* 00174 809CAC84 1041000A */ beq $v0, $at, .L809CACB0 /* 00178 809CAC88 304F00FF */ andi $t7, $v0, 0x00FF ## $t7 = 00000000 /* 0017C 809CAC8C 448F2000 */ mtc1 $t7, $f4 ## $f4 = 0.00 /* 00180 809CAC90 3C01809D */ lui $at, %hi(D_809CBAC4) ## $at = 809D0000 -/* 00184 809CAC94 C428BAC4 */ lwc1 $f8, %lo(D_809CBAC4)($at) -/* 00188 809CAC98 468021A0 */ cvt.s.w $f6, $f4 +/* 00184 809CAC94 C428BAC4 */ lwc1 $f8, %lo(D_809CBAC4)($at) +/* 00188 809CAC98 468021A0 */ cvt.s.w $f6, $f4 /* 0018C 809CAC9C C60A0054 */ lwc1 $f10, 0x0054($s0) ## 00000054 -/* 00190 809CACA0 46083402 */ mul.s $f16, $f6, $f8 +/* 00190 809CACA0 46083402 */ mul.s $f16, $f6, $f8 /* 00194 809CACA4 00000000 */ nop -/* 00198 809CACA8 46105482 */ mul.s $f18, $f10, $f16 +/* 00198 809CACA8 46105482 */ mul.s $f18, $f10, $f16 /* 0019C 809CACAC E6120054 */ swc1 $f18, 0x0054($s0) ## 00000054 .L809CACB0: /* 001A0 809CACB0 86180268 */ lh $t8, 0x0268($s0) ## 00000268 @@ -120,52 +120,52 @@ glabel EnBrob_Init /* 001AC 809CACBC 44982000 */ mtc1 $t8, $f4 ## $f4 = 0.00 /* 001B0 809CACC0 3C01809D */ lui $at, %hi(D_809CBAC8) ## $at = 809D0000 /* 001B4 809CACC4 C6120054 */ lwc1 $f18, 0x0054($s0) ## 00000054 -/* 001B8 809CACC8 468021A0 */ cvt.s.w $f6, $f4 +/* 001B8 809CACC8 468021A0 */ cvt.s.w $f6, $f4 /* 001BC 809CACCC 860E02B6 */ lh $t6, 0x02B6($s0) ## 000002B6 /* 001C0 809CACD0 861902B8 */ lh $t9, 0x02B8($s0) ## 000002B8 /* 001C4 809CACD4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 001C8 809CACD8 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 001CC 809CACDC 46083282 */ mul.s $f10, $f6, $f8 -/* 001D0 809CACE0 4600540D */ trunc.w.s $f16, $f10 +/* 001CC 809CACDC 46083282 */ mul.s $f10, $f6, $f8 +/* 001D0 809CACE0 4600540D */ trunc.w.s $f16, $f10 /* 001D4 809CACE4 448B5000 */ mtc1 $t3, $f10 ## $f10 = 0.00 -/* 001D8 809CACE8 44088000 */ mfc1 $t0, $f16 -/* 001DC 809CACEC 46805420 */ cvt.s.w $f16, $f10 +/* 001D8 809CACE8 44088000 */ mfc1 $t0, $f16 +/* 001DC 809CACEC 46805420 */ cvt.s.w $f16, $f10 /* 001E0 809CACF0 A6080268 */ sh $t0, 0x0268($s0) ## 00000268 -/* 001E4 809CACF4 C424BAC8 */ lwc1 $f4, %lo(D_809CBAC8)($at) +/* 001E4 809CACF4 C424BAC8 */ lwc1 $f4, %lo(D_809CBAC8)($at) /* 001E8 809CACF8 2401FFFE */ addiu $at, $zero, 0xFFFE ## $at = FFFFFFFE /* 001EC 809CACFC A600026C */ sh $zero, 0x026C($s0) ## 0000026C -/* 001F0 809CAD00 46049182 */ mul.s $f6, $f18, $f4 +/* 001F0 809CAD00 46049182 */ mul.s $f6, $f18, $f4 /* 001F4 809CAD04 C6120050 */ lwc1 $f18, 0x0050($s0) ## 00000050 /* 001F8 809CAD08 AE0001A8 */ sw $zero, 0x01A8($s0) ## 000001A8 -/* 001FC 809CAD0C 46128102 */ mul.s $f4, $f16, $f18 +/* 001FC 809CAD0C 46128102 */ mul.s $f4, $f16, $f18 /* 00200 809CAD10 C6100054 */ lwc1 $f16, 0x0054($s0) ## 00000054 -/* 00204 809CAD14 4600320D */ trunc.w.s $f8, $f6 -/* 00208 809CAD18 4600218D */ trunc.w.s $f6, $f4 -/* 0020C 809CAD1C 440A4000 */ mfc1 $t2, $f8 +/* 00204 809CAD14 4600320D */ trunc.w.s $f8, $f6 +/* 00208 809CAD18 4600218D */ trunc.w.s $f6, $f4 +/* 0020C 809CAD1C 440A4000 */ mfc1 $t2, $f8 /* 00210 809CAD20 448E4000 */ mtc1 $t6, $f8 ## $f8 = 0.00 -/* 00214 809CAD24 440D3000 */ mfc1 $t5, $f6 -/* 00218 809CAD28 468042A0 */ cvt.s.w $f10, $f8 +/* 00214 809CAD24 440D3000 */ mfc1 $t5, $f6 +/* 00218 809CAD28 468042A0 */ cvt.s.w $f10, $f8 /* 0021C 809CAD2C 44993000 */ mtc1 $t9, $f6 ## $f6 = 0.00 /* 00220 809CAD30 A60A026A */ sh $t2, 0x026A($s0) ## 0000026A /* 00224 809CAD34 8E0A0004 */ lw $t2, 0x0004($s0) ## 00000004 /* 00228 809CAD38 A60D02B4 */ sh $t5, 0x02B4($s0) ## 000002B4 -/* 0022C 809CAD3C 46803220 */ cvt.s.w $f8, $f6 -/* 00230 809CAD40 46105482 */ mul.s $f18, $f10, $f16 +/* 0022C 809CAD3C 46803220 */ cvt.s.w $f8, $f6 +/* 00230 809CAD40 46105482 */ mul.s $f18, $f10, $f16 /* 00234 809CAD44 C60A0054 */ lwc1 $f10, 0x0054($s0) ## 00000054 -/* 00238 809CAD48 01415824 */ and $t3, $t2, $at +/* 00238 809CAD48 01415824 */ and $t3, $t2, $at /* 0023C 809CAD4C AE0B0004 */ sw $t3, 0x0004($s0) ## 00000004 -/* 00240 809CAD50 460A4402 */ mul.s $f16, $f8, $f10 -/* 00244 809CAD54 4600910D */ trunc.w.s $f4, $f18 -/* 00248 809CAD58 4600848D */ trunc.w.s $f18, $f16 -/* 0024C 809CAD5C 44182000 */ mfc1 $t8, $f4 -/* 00250 809CAD60 44099000 */ mfc1 $t1, $f18 +/* 00240 809CAD50 460A4402 */ mul.s $f16, $f8, $f10 +/* 00244 809CAD54 4600910D */ trunc.w.s $f4, $f18 +/* 00248 809CAD58 4600848D */ trunc.w.s $f18, $f16 +/* 0024C 809CAD5C 44182000 */ mfc1 $t8, $f4 +/* 00250 809CAD60 44099000 */ mfc1 $t1, $f18 /* 00254 809CAD64 A61802B6 */ sh $t8, 0x02B6($s0) ## 000002B6 -/* 00258 809CAD68 0C272B77 */ jal func_809CADDC +/* 00258 809CAD68 0C272B77 */ jal func_809CADDC /* 0025C 809CAD6C A60902B8 */ sh $t1, 0x02B8($s0) ## 000002B8 -/* 00260 809CAD70 8FBF002C */ lw $ra, 0x002C($sp) -/* 00264 809CAD74 8FB00024 */ lw $s0, 0x0024($sp) -/* 00268 809CAD78 8FB10028 */ lw $s1, 0x0028($sp) -/* 0026C 809CAD7C 03E00008 */ jr $ra +/* 00260 809CAD70 8FBF002C */ lw $ra, 0x002C($sp) +/* 00264 809CAD74 8FB00024 */ lw $s0, 0x0024($sp) +/* 00268 809CAD78 8FB10028 */ lw $s1, 0x0028($sp) +/* 0026C 809CAD7C 03E00008 */ jr $ra /* 00270 809CAD80 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Brob/func_809CAE44.s b/asm/non_matchings/overlays/actors/ovl_En_Brob/func_809CAE44.s index 22aa269fef..c73f98262f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Brob/func_809CAE44.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Brob/func_809CAE44.s @@ -1,26 +1,26 @@ glabel func_809CAE44 /* 00334 809CAE44 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00338 809CAE48 AFA5001C */ sw $a1, 0x001C($sp) -/* 0033C 809CAE4C AFBF0014 */ sw $ra, 0x0014($sp) -/* 00340 809CAE50 AFA40018 */ sw $a0, 0x0018($sp) +/* 00338 809CAE48 AFA5001C */ sw $a1, 0x001C($sp) +/* 0033C 809CAE4C AFBF0014 */ sw $ra, 0x0014($sp) +/* 00340 809CAE50 AFA40018 */ sw $a0, 0x0018($sp) /* 00344 809CAE54 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 00348 809CAE58 24A51750 */ addiu $a1, $a1, 0x1750 ## $a1 = 06001750 -/* 0034C 809CAE5C 0C02947A */ jal func_800A51E8 +/* 0034C 809CAE5C 0C02947A */ jal SkelAnime_ChangeAnimDefaultStop /* 00350 809CAE60 24840164 */ addiu $a0, $a0, 0x0164 ## $a0 = 00000164 -/* 00354 809CAE64 8FA4001C */ lw $a0, 0x001C($sp) -/* 00358 809CAE68 8FAE0018 */ lw $t6, 0x0018($sp) +/* 00354 809CAE64 8FA4001C */ lw $a0, 0x001C($sp) +/* 00358 809CAE68 8FAE0018 */ lw $t6, 0x0018($sp) /* 0035C 809CAE6C 24850810 */ addiu $a1, $a0, 0x0810 ## $a1 = 00000810 -/* 00360 809CAE70 0C00FAFE */ jal func_8003EBF8 +/* 00360 809CAE70 0C00FAFE */ jal func_8003EBF8 /* 00364 809CAE74 8DC6014C */ lw $a2, 0x014C($t6) ## 0000014C -/* 00368 809CAE78 8FA20018 */ lw $v0, 0x0018($sp) +/* 00368 809CAE78 8FA20018 */ lw $v0, 0x0018($sp) /* 0036C 809CAE7C 3C18809D */ lui $t8, %hi(func_809CB114) ## $t8 = 809D0000 /* 00370 809CAE80 240F03E8 */ addiu $t7, $zero, 0x03E8 ## $t7 = 000003E8 /* 00374 809CAE84 2718B114 */ addiu $t8, $t8, %lo(func_809CB114) ## $t8 = 809CB114 /* 00378 809CAE88 A44F01AE */ sh $t7, 0x01AE($v0) ## 000001AE /* 0037C 809CAE8C AC5801A8 */ sw $t8, 0x01A8($v0) ## 000001A8 -/* 00380 809CAE90 8FBF0014 */ lw $ra, 0x0014($sp) +/* 00380 809CAE90 8FBF0014 */ lw $ra, 0x0014($sp) /* 00384 809CAE94 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00388 809CAE98 03E00008 */ jr $ra +/* 00388 809CAE98 03E00008 */ jr $ra /* 0038C 809CAE9C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Brob/func_809CAEA0.s b/asm/non_matchings/overlays/actors/ovl_En_Brob/func_809CAEA0.s index 33c8445c82..83d8ed950f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Brob/func_809CAEA0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Brob/func_809CAEA0.s @@ -1,14 +1,14 @@ glabel func_809CAEA0 /* 00390 809CAEA0 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00394 809CAEA4 AFBF0014 */ sw $ra, 0x0014($sp) +/* 00394 809CAEA4 AFBF0014 */ sw $ra, 0x0014($sp) /* 00398 809CAEA8 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 /* 0039C 809CAEAC 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 003A0 809CAEB0 24A51958 */ addiu $a1, $a1, 0x1958 ## $a1 = 06001958 -/* 003A4 809CAEB4 AFA70018 */ sw $a3, 0x0018($sp) +/* 003A4 809CAEB4 AFA70018 */ sw $a3, 0x0018($sp) /* 003A8 809CAEB8 24840164 */ addiu $a0, $a0, 0x0164 ## $a0 = 00000164 -/* 003AC 809CAEBC 0C0294D3 */ jal func_800A534C +/* 003AC 809CAEBC 0C0294D3 */ jal SkelAnime_ChangeAnimTransitionRepeat /* 003B0 809CAEC0 3C06C0A0 */ lui $a2, 0xC0A0 ## $a2 = C0A00000 -/* 003B4 809CAEC4 8FA70018 */ lw $a3, 0x0018($sp) +/* 003B4 809CAEC4 8FA70018 */ lw $a3, 0x0018($sp) /* 003B8 809CAEC8 3C18809D */ lui $t8, %hi(func_809CB218) ## $t8 = 809D0000 /* 003BC 809CAECC 240E1F40 */ addiu $t6, $zero, 0x1F40 ## $t6 = 00001F40 /* 003C0 809CAED0 240F04B0 */ addiu $t7, $zero, 0x04B0 ## $t7 = 000004B0 @@ -16,9 +16,9 @@ glabel func_809CAEA0 /* 003C8 809CAED8 A4EE01AE */ sh $t6, 0x01AE($a3) ## 000001AE /* 003CC 809CAEDC A4EF01AC */ sh $t7, 0x01AC($a3) ## 000001AC /* 003D0 809CAEE0 ACF801A8 */ sw $t8, 0x01A8($a3) ## 000001A8 -/* 003D4 809CAEE4 8FBF0014 */ lw $ra, 0x0014($sp) +/* 003D4 809CAEE4 8FBF0014 */ lw $ra, 0x0014($sp) /* 003D8 809CAEE8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 003DC 809CAEEC 03E00008 */ jr $ra +/* 003DC 809CAEEC 03E00008 */ jr $ra /* 003E0 809CAEF0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Brob/func_809CAEF4.s b/asm/non_matchings/overlays/actors/ovl_En_Brob/func_809CAEF4.s index 184110f589..3a82824222 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Brob/func_809CAEF4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Brob/func_809CAEF4.s @@ -1,12 +1,12 @@ glabel func_809CAEF4 /* 003E4 809CAEF4 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 003E8 809CAEF8 AFB00020 */ sw $s0, 0x0020($sp) +/* 003E8 809CAEF8 AFB00020 */ sw $s0, 0x0020($sp) /* 003EC 809CAEFC 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 003F0 809CAF00 AFBF0024 */ sw $ra, 0x0024($sp) +/* 003F0 809CAF00 AFBF0024 */ sw $ra, 0x0024($sp) /* 003F4 809CAF04 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 003F8 809CAF08 24A50290 */ addiu $a1, $a1, 0x0290 ## $a1 = 06000290 /* 003FC 809CAF0C 24840164 */ addiu $a0, $a0, 0x0164 ## $a0 = 00000164 -/* 00400 809CAF10 0C029490 */ jal func_800A5240 +/* 00400 809CAF10 0C029490 */ jal SkelAnime_ChangeAnimTransitionStop /* 00404 809CAF14 3C06C0A0 */ lui $a2, 0xC0A0 ## $a2 = C0A00000 /* 00408 809CAF18 860E01AE */ lh $t6, 0x01AE($s0) ## 000001AE /* 0040C 809CAF1C 3C0142FA */ lui $at, 0x42FA ## $at = 42FA0000 @@ -14,28 +14,28 @@ glabel func_809CAEF4 /* 00414 809CAF24 448E2000 */ mtc1 $t6, $f4 ## $f4 = 0.00 /* 00418 809CAF28 24190050 */ addiu $t9, $zero, 0x0050 ## $t9 = 00000050 /* 0041C 809CAF2C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00420 809CAF30 468021A0 */ cvt.s.w $f6, $f4 +/* 00420 809CAF30 468021A0 */ cvt.s.w $f6, $f4 /* 00424 809CAF34 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 00428 809CAF38 240600FF */ addiu $a2, $zero, 0x00FF ## $a2 = 000000FF /* 0042C 809CAF3C 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 00430 809CAF40 46083281 */ sub.s $f10, $f6, $f8 -/* 00434 809CAF44 4600540D */ trunc.w.s $f16, $f10 -/* 00438 809CAF48 44188000 */ mfc1 $t8, $f16 +/* 00430 809CAF40 46083281 */ sub.s $f10, $f6, $f8 +/* 00434 809CAF44 4600540D */ trunc.w.s $f16, $f10 +/* 00438 809CAF48 44188000 */ mfc1 $t8, $f16 /* 0043C 809CAF4C 00000000 */ nop /* 00440 809CAF50 A61801AE */ sh $t8, 0x01AE($s0) ## 000001AE -/* 00444 809CAF54 0C00D09B */ jal func_8003426C -/* 00448 809CAF58 AFB90010 */ sw $t9, 0x0010($sp) +/* 00444 809CAF54 0C00D09B */ jal func_8003426C +/* 00448 809CAF58 AFB90010 */ sw $t9, 0x0010($sp) /* 0044C 809CAF5C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 00450 809CAF60 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 00454 809CAF64 2405389E */ addiu $a1, $zero, 0x389E ## $a1 = 0000389E /* 00458 809CAF68 3C08809D */ lui $t0, %hi(func_809CB2B8) ## $t0 = 809D0000 /* 0045C 809CAF6C 2508B2B8 */ addiu $t0, $t0, %lo(func_809CB2B8) ## $t0 = 809CB2B8 /* 00460 809CAF70 AE0801A8 */ sw $t0, 0x01A8($s0) ## 000001A8 -/* 00464 809CAF74 8FBF0024 */ lw $ra, 0x0024($sp) -/* 00468 809CAF78 8FB00020 */ lw $s0, 0x0020($sp) +/* 00464 809CAF74 8FBF0024 */ lw $ra, 0x0024($sp) +/* 00468 809CAF78 8FB00020 */ lw $s0, 0x0020($sp) /* 0046C 809CAF7C 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 00470 809CAF80 03E00008 */ jr $ra +/* 00470 809CAF80 03E00008 */ jr $ra /* 00474 809CAF84 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Brob/func_809CAF88.s b/asm/non_matchings/overlays/actors/ovl_En_Brob/func_809CAF88.s index fe0db8188b..1a908d8f60 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Brob/func_809CAF88.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Brob/func_809CAF88.s @@ -1,37 +1,37 @@ glabel func_809CAF88 /* 00478 809CAF88 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 0047C 809CAF8C AFA40028 */ sw $a0, 0x0028($sp) -/* 00480 809CAF90 AFBF0024 */ sw $ra, 0x0024($sp) +/* 0047C 809CAF8C AFA40028 */ sw $a0, 0x0028($sp) +/* 00480 809CAF90 AFBF0024 */ sw $ra, 0x0024($sp) /* 00484 809CAF94 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 /* 00488 809CAF98 0C028800 */ jal SkelAnime_GetFrameCount - + /* 0048C 809CAF9C 24841750 */ addiu $a0, $a0, 0x1750 ## $a0 = 06001750 /* 00490 809CAFA0 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 00494 809CAFA4 3C01C0A0 */ lui $at, 0xC0A0 ## $at = C0A00000 /* 00498 809CAFA8 44814000 */ mtc1 $at, $f8 ## $f8 = -5.00 -/* 0049C 809CAFAC 46802120 */ cvt.s.w $f4, $f4 -/* 004A0 809CAFB0 8FA40028 */ lw $a0, 0x0028($sp) +/* 0049C 809CAFAC 46802120 */ cvt.s.w $f4, $f4 +/* 004A0 809CAFB0 8FA40028 */ lw $a0, 0x0028($sp) /* 004A4 809CAFB4 44803000 */ mtc1 $zero, $f6 ## $f6 = 0.00 /* 004A8 809CAFB8 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 004AC 809CAFBC 240E0002 */ addiu $t6, $zero, 0x0002 ## $t6 = 00000002 -/* 004B0 809CAFC0 AFAE0014 */ sw $t6, 0x0014($sp) -/* 004B4 809CAFC4 44072000 */ mfc1 $a3, $f4 +/* 004B0 809CAFC0 AFAE0014 */ sw $t6, 0x0014($sp) +/* 004B4 809CAFC4 44072000 */ mfc1 $a3, $f4 /* 004B8 809CAFC8 24A51750 */ addiu $a1, $a1, 0x1750 ## $a1 = 06001750 /* 004BC 809CAFCC 3C06BF80 */ lui $a2, 0xBF80 ## $a2 = BF800000 -/* 004C0 809CAFD0 E7A80018 */ swc1 $f8, 0x0018($sp) +/* 004C0 809CAFD0 E7A80018 */ swc1 $f8, 0x0018($sp) /* 004C4 809CAFD4 24840164 */ addiu $a0, $a0, 0x0164 ## $a0 = 00000164 -/* 004C8 809CAFD8 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 004CC 809CAFDC E7A60010 */ swc1 $f6, 0x0010($sp) -/* 004D0 809CAFE0 8FA20028 */ lw $v0, 0x0028($sp) +/* 004C8 809CAFD8 0C029468 */ jal SkelAnime_ChangeAnim + +/* 004CC 809CAFDC E7A60010 */ swc1 $f6, 0x0010($sp) +/* 004D0 809CAFE0 8FA20028 */ lw $v0, 0x0028($sp) /* 004D4 809CAFE4 3C18809D */ lui $t8, %hi(func_809CB354) ## $t8 = 809D0000 /* 004D8 809CAFE8 240F203A */ addiu $t7, $zero, 0x203A ## $t7 = 0000203A /* 004DC 809CAFEC 2718B354 */ addiu $t8, $t8, %lo(func_809CB354) ## $t8 = 809CB354 /* 004E0 809CAFF0 A44F01AE */ sh $t7, 0x01AE($v0) ## 000001AE /* 004E4 809CAFF4 AC5801A8 */ sw $t8, 0x01A8($v0) ## 000001A8 -/* 004E8 809CAFF8 8FBF0024 */ lw $ra, 0x0024($sp) +/* 004E8 809CAFF8 8FBF0024 */ lw $ra, 0x0024($sp) /* 004EC 809CAFFC 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 004F0 809CB000 03E00008 */ jr $ra +/* 004F0 809CB000 03E00008 */ jr $ra /* 004F4 809CB004 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Brob/func_809CB008.s b/asm/non_matchings/overlays/actors/ovl_En_Brob/func_809CB008.s index 7a42216b76..d1a4d55556 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Brob/func_809CB008.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Brob/func_809CB008.s @@ -1,22 +1,22 @@ glabel func_809CB008 /* 004F8 809CB008 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 004FC 809CB00C AFBF0014 */ sw $ra, 0x0014($sp) +/* 004FC 809CB00C AFBF0014 */ sw $ra, 0x0014($sp) /* 00500 809CB010 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 /* 00504 809CB014 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 00508 809CB018 24A51678 */ addiu $a1, $a1, 0x1678 ## $a1 = 06001678 -/* 0050C 809CB01C AFA70018 */ sw $a3, 0x0018($sp) +/* 0050C 809CB01C AFA70018 */ sw $a3, 0x0018($sp) /* 00510 809CB020 24840164 */ addiu $a0, $a0, 0x0164 ## $a0 = 00000164 -/* 00514 809CB024 0C0294D3 */ jal func_800A534C +/* 00514 809CB024 0C0294D3 */ jal SkelAnime_ChangeAnimTransitionRepeat /* 00518 809CB028 3C06C0A0 */ lui $a2, 0xC0A0 ## $a2 = C0A00000 -/* 0051C 809CB02C 8FA70018 */ lw $a3, 0x0018($sp) +/* 0051C 809CB02C 8FA70018 */ lw $a3, 0x0018($sp) /* 00520 809CB030 3C0F809D */ lui $t7, %hi(func_809CB458) ## $t7 = 809D0000 /* 00524 809CB034 240E000A */ addiu $t6, $zero, 0x000A ## $t6 = 0000000A /* 00528 809CB038 25EFB458 */ addiu $t7, $t7, %lo(func_809CB458) ## $t7 = 809CB458 /* 0052C 809CB03C A4EE01AC */ sh $t6, 0x01AC($a3) ## 000001AC /* 00530 809CB040 ACEF01A8 */ sw $t7, 0x01A8($a3) ## 000001A8 -/* 00534 809CB044 8FBF0014 */ lw $ra, 0x0014($sp) +/* 00534 809CB044 8FBF0014 */ lw $ra, 0x0014($sp) /* 00538 809CB048 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 0053C 809CB04C 03E00008 */ jr $ra +/* 0053C 809CB04C 03E00008 */ jr $ra /* 00540 809CB050 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bubble/EnBubble_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Bubble/EnBubble_Draw.s index 6e3590b622..68fd3d7c39 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bubble/EnBubble_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bubble/EnBubble_Draw.s @@ -10,7 +10,7 @@ glabel EnBubble_Draw /* 00FF0 809CCBF0 24C6CEB0 */ addiu $a2, $a2, %lo(D_809CCEB0) ## $a2 = 809CCEB0 /* 00FF4 809CCBF4 27A4003C */ addiu $a0, $sp, 0x003C ## $a0 = FFFFFFE4 /* 00FF8 809CCBF8 24070497 */ addiu $a3, $zero, 0x0497 ## $a3 = 00000497 -/* 00FFC 809CCBFC 0C031AB1 */ jal func_800C6AC4 +/* 00FFC 809CCBFC 0C031AB1 */ jal Graph_OpenDisps /* 01000 809CCC00 AFA5004C */ sw $a1, 0x004C($sp) /* 01004 809CCC04 3C0E809D */ lui $t6, %hi(func_809CCAA8) ## $t6 = 809D0000 /* 01008 809CCC08 25CECAA8 */ addiu $t6, $t6, %lo(func_809CCAA8) ## $t6 = 809CCAA8 @@ -124,7 +124,7 @@ glabel EnBubble_Draw /* 011A4 809CCDA4 24C6CED8 */ addiu $a2, $a2, %lo(D_809CCED8) ## $a2 = 809CCED8 /* 011A8 809CCDA8 27A4003C */ addiu $a0, $sp, 0x003C ## $a0 = FFFFFFE4 /* 011AC 809CCDAC 8E250000 */ lw $a1, 0x0000($s1) ## 00000000 -/* 011B0 809CCDB0 0C031AD5 */ jal func_800C6B54 +/* 011B0 809CCDB0 0C031AD5 */ jal Graph_CloseDisps /* 011B4 809CCDB4 240704CA */ addiu $a3, $zero, 0x04CA ## $a3 = 000004CA /* 011B8 809CCDB8 8FAE0030 */ lw $t6, 0x0030($sp) /* 011BC 809CCDBC 8E0F014C */ lw $t7, 0x014C($s0) ## 0000014C diff --git a/asm/non_matchings/overlays/actors/ovl_En_Butte/EnButte_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Butte/EnButte_Init.s index 0d03aee956..f1959b404c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Butte/EnButte_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Butte/EnButte_Init.s @@ -1,24 +1,24 @@ glabel EnButte_Init /* 0034C 809CD3BC 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 -/* 00350 809CD3C0 AFBF002C */ sw $ra, 0x002C($sp) -/* 00354 809CD3C4 AFB00028 */ sw $s0, 0x0028($sp) -/* 00358 809CD3C8 AFA50044 */ sw $a1, 0x0044($sp) +/* 00350 809CD3C0 AFBF002C */ sw $ra, 0x002C($sp) +/* 00354 809CD3C4 AFB00028 */ sw $s0, 0x0028($sp) +/* 00358 809CD3C8 AFA50044 */ sw $a1, 0x0044($sp) /* 0035C 809CD3CC 848E001C */ lh $t6, 0x001C($a0) ## 0000001C /* 00360 809CD3D0 2401FFFF */ addiu $at, $zero, 0xFFFF ## $at = FFFFFFFF /* 00364 809CD3D4 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00368 809CD3D8 15C10002 */ bne $t6, $at, .L809CD3E4 +/* 00368 809CD3D8 15C10002 */ bne $t6, $at, .L809CD3E4 /* 0036C 809CD3DC 3C05809D */ lui $a1, %hi(D_809CE3D0) ## $a1 = 809D0000 /* 00370 809CD3E0 A480001C */ sh $zero, 0x001C($a0) ## 0000001C .L809CD3E4: /* 00374 809CD3E4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 00378 809CD3E8 0C01E037 */ jal Actor_ProcessInitChain - + /* 0037C 809CD3EC 24A5E3D0 */ addiu $a1, $a1, %lo(D_809CE3D0) ## $a1 = 809CE3D0 /* 00380 809CD3F0 860F001C */ lh $t7, 0x001C($s0) ## 0000001C /* 00384 809CD3F4 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 /* 00388 809CD3F8 260501AC */ addiu $a1, $s0, 0x01AC ## $a1 = 000001AC /* 0038C 809CD3FC 31F80001 */ andi $t8, $t7, 0x0001 ## $t8 = 00000000 -/* 00390 809CD400 17010005 */ bne $t8, $at, .L809CD418 +/* 00390 809CD400 17010005 */ bne $t8, $at, .L809CD418 /* 00394 809CD404 3C060500 */ lui $a2, 0x0500 ## $a2 = 05000000 /* 00398 809CD408 3C014348 */ lui $at, 0x4348 ## $at = 43480000 /* 0039C 809CD40C 44812000 */ mtc1 $at, $f4 ## $f4 = 200.00 @@ -29,66 +29,66 @@ glabel EnButte_Init /* 003AC 809CD41C 261901F0 */ addiu $t9, $s0, 0x01F0 ## $t9 = 000001F0 /* 003B0 809CD420 26080220 */ addiu $t0, $s0, 0x0220 ## $t0 = 00000220 /* 003B4 809CD424 24090008 */ addiu $t1, $zero, 0x0008 ## $t1 = 00000008 -/* 003B8 809CD428 AFA90018 */ sw $t1, 0x0018($sp) -/* 003BC 809CD42C AFA80014 */ sw $t0, 0x0014($sp) -/* 003C0 809CD430 AFB90010 */ sw $t9, 0x0010($sp) +/* 003B8 809CD428 AFA90018 */ sw $t1, 0x0018($sp) +/* 003BC 809CD42C AFA80014 */ sw $t0, 0x0014($sp) +/* 003C0 809CD430 AFB90010 */ sw $t9, 0x0010($sp) /* 003C4 809CD434 24E72470 */ addiu $a3, $a3, 0x2470 ## $a3 = 05002470 -/* 003C8 809CD438 8FA40044 */ lw $a0, 0x0044($sp) +/* 003C8 809CD438 8FA40044 */ lw $a0, 0x0044($sp) /* 003CC 809CD43C 24C636F0 */ addiu $a2, $a2, 0x36F0 ## $a2 = 050036F0 /* 003D0 809CD440 0C02915F */ jal SkelAnime_Init - -/* 003D4 809CD444 AFA50038 */ sw $a1, 0x0038($sp) + +/* 003D4 809CD444 AFA50038 */ sw $a1, 0x0038($sp) /* 003D8 809CD448 2605014C */ addiu $a1, $s0, 0x014C ## $a1 = 0000014C -/* 003DC 809CD44C AFA50034 */ sw $a1, 0x0034($sp) -/* 003E0 809CD450 0C016EFE */ jal func_8005BBF8 -/* 003E4 809CD454 8FA40044 */ lw $a0, 0x0044($sp) +/* 003DC 809CD44C AFA50034 */ sw $a1, 0x0034($sp) +/* 003E0 809CD450 0C016EFE */ jal func_8005BBF8 +/* 003E4 809CD454 8FA40044 */ lw $a0, 0x0044($sp) /* 003E8 809CD458 3C07809D */ lui $a3, %hi(D_809CE314) ## $a3 = 809D0000 /* 003EC 809CD45C 260A016C */ addiu $t2, $s0, 0x016C ## $t2 = 0000016C -/* 003F0 809CD460 8FA50034 */ lw $a1, 0x0034($sp) -/* 003F4 809CD464 AFAA0010 */ sw $t2, 0x0010($sp) +/* 003F0 809CD460 8FA50034 */ lw $a1, 0x0034($sp) +/* 003F4 809CD464 AFAA0010 */ sw $t2, 0x0010($sp) /* 003F8 809CD468 24E7E314 */ addiu $a3, $a3, %lo(D_809CE314) ## $a3 = 809CE314 -/* 003FC 809CD46C 8FA40044 */ lw $a0, 0x0044($sp) -/* 00400 809CD470 0C017014 */ jal func_8005C050 +/* 003FC 809CD46C 8FA40044 */ lw $a0, 0x0044($sp) +/* 00400 809CD470 0C017014 */ jal func_8005C050 /* 00404 809CD474 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 00408 809CD478 0C03F66B */ jal Math_Rand_ZeroOne ## Rand.Next() float /* 0040C 809CD47C A20000AE */ sb $zero, 0x00AE($s0) ## 000000AE /* 00410 809CD480 3C01809D */ lui $at, %hi(D_809CE48C) ## $at = 809D0000 -/* 00414 809CD484 C426E48C */ lwc1 $f6, %lo(D_809CE48C)($at) -/* 00418 809CD488 46060202 */ mul.s $f8, $f0, $f6 -/* 0041C 809CD48C 4600428D */ trunc.w.s $f10, $f8 -/* 00420 809CD490 440C5000 */ mfc1 $t4, $f10 +/* 00414 809CD484 C426E48C */ lwc1 $f6, %lo(D_809CE48C)($at) +/* 00418 809CD488 46060202 */ mul.s $f8, $f0, $f6 +/* 0041C 809CD48C 4600428D */ trunc.w.s $f10, $f8 +/* 00420 809CD490 440C5000 */ mfc1 $t4, $f10 /* 00424 809CD494 0C03F66B */ jal Math_Rand_ZeroOne ## Rand.Next() float /* 00428 809CD498 A60C025C */ sh $t4, 0x025C($s0) ## 0000025C /* 0042C 809CD49C 3C01809D */ lui $at, %hi(D_809CE490) ## $at = 809D0000 -/* 00430 809CD4A0 C430E490 */ lwc1 $f16, %lo(D_809CE490)($at) -/* 00434 809CD4A4 46100482 */ mul.s $f18, $f0, $f16 -/* 00438 809CD4A8 4600910D */ trunc.w.s $f4, $f18 -/* 0043C 809CD4AC 440E2000 */ mfc1 $t6, $f4 +/* 00430 809CD4A0 C430E490 */ lwc1 $f16, %lo(D_809CE490)($at) +/* 00434 809CD4A4 46100482 */ mul.s $f18, $f0, $f16 +/* 00438 809CD4A8 4600910D */ trunc.w.s $f4, $f18 +/* 0043C 809CD4AC 440E2000 */ mfc1 $t6, $f4 /* 00440 809CD4B0 0C03F66B */ jal Math_Rand_ZeroOne ## Rand.Next() float /* 00444 809CD4B4 A60E025E */ sh $t6, 0x025E($s0) ## 0000025E /* 00448 809CD4B8 3C01809D */ lui $at, %hi(D_809CE494) ## $at = 809D0000 -/* 0044C 809CD4BC C426E494 */ lwc1 $f6, %lo(D_809CE494)($at) +/* 0044C 809CD4BC C426E494 */ lwc1 $f6, %lo(D_809CE494)($at) /* 00450 809CD4C0 44801000 */ mtc1 $zero, $f2 ## $f2 = 0.00 /* 00454 809CD4C4 3C050500 */ lui $a1, 0x0500 ## $a1 = 05000000 -/* 00458 809CD4C8 46060202 */ mul.s $f8, $f0, $f6 +/* 00458 809CD4C8 46060202 */ mul.s $f8, $f0, $f6 /* 0045C 809CD4CC 24190001 */ addiu $t9, $zero, 0x0001 ## $t9 = 00000001 -/* 00460 809CD4D0 44071000 */ mfc1 $a3, $f2 +/* 00460 809CD4D0 44071000 */ mfc1 $a3, $f2 /* 00464 809CD4D4 24A52470 */ addiu $a1, $a1, 0x2470 ## $a1 = 05002470 /* 00468 809CD4D8 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 0046C 809CD4DC 4600428D */ trunc.w.s $f10, $f8 -/* 00470 809CD4E0 44185000 */ mfc1 $t8, $f10 +/* 0046C 809CD4DC 4600428D */ trunc.w.s $f10, $f8 +/* 00470 809CD4E0 44185000 */ mfc1 $t8, $f10 /* 00474 809CD4E4 00000000 */ nop /* 00478 809CD4E8 A6180260 */ sh $t8, 0x0260($s0) ## 00000260 -/* 0047C 809CD4EC AFB90014 */ sw $t9, 0x0014($sp) -/* 00480 809CD4F0 8FA40038 */ lw $a0, 0x0038($sp) -/* 00484 809CD4F4 E7A20018 */ swc1 $f2, 0x0018($sp) -/* 00488 809CD4F8 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 0048C 809CD4FC E7A20010 */ swc1 $f2, 0x0010($sp) -/* 00490 809CD500 0C2735E7 */ jal func_809CD79C +/* 0047C 809CD4EC AFB90014 */ sw $t9, 0x0014($sp) +/* 00480 809CD4F0 8FA40038 */ lw $a0, 0x0038($sp) +/* 00484 809CD4F4 E7A20018 */ swc1 $f2, 0x0018($sp) +/* 00488 809CD4F8 0C029468 */ jal SkelAnime_ChangeAnim + +/* 0048C 809CD4FC E7A20010 */ swc1 $f2, 0x0010($sp) +/* 00490 809CD500 0C2735E7 */ jal func_809CD79C /* 00494 809CD504 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 00498 809CD508 860800B4 */ lh $t0, 0x00B4($s0) ## 000000B4 /* 0049C 809CD50C 240A0001 */ addiu $t2, $zero, 0x0001 ## $t2 = 00000001 @@ -99,12 +99,12 @@ glabel EnButte_Init /* 004B0 809CD520 2484E450 */ addiu $a0, $a0, %lo(D_809CE450) ## $a0 = 809CE450 /* 004B4 809CD524 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 004B8 809CD528 0C00084C */ jal osSyncPrintf - + /* 004BC 809CD52C 8606001C */ lh $a2, 0x001C($s0) ## 0000001C -/* 004C0 809CD530 8FBF002C */ lw $ra, 0x002C($sp) -/* 004C4 809CD534 8FB00028 */ lw $s0, 0x0028($sp) +/* 004C0 809CD530 8FBF002C */ lw $ra, 0x002C($sp) +/* 004C4 809CD534 8FB00028 */ lw $s0, 0x0028($sp) /* 004C8 809CD538 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 -/* 004CC 809CD53C 03E00008 */ jr $ra +/* 004CC 809CD53C 03E00008 */ jr $ra /* 004D0 809CD540 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Butte/func_809CD144.s b/asm/non_matchings/overlays/actors/ovl_En_Butte/func_809CD144.s index 927475ce17..39e20be2eb 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Butte/func_809CD144.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Butte/func_809CD144.s @@ -9,7 +9,7 @@ glabel func_809CD144 /* 000F0 809CD160 24C6E420 */ addiu $a2, $a2, %lo(D_809CE420) ## $a2 = 809CE420 /* 000F4 809CD164 27A4003C */ addiu $a0, $sp, 0x003C ## $a0 = FFFFFFD4 /* 000F8 809CD168 24070127 */ addiu $a3, $zero, 0x0127 ## $a3 = 00000127 -/* 000FC 809CD16C 0C031AB1 */ jal func_800C6AC4 +/* 000FC 809CD16C 0C031AB1 */ jal Graph_OpenDisps /* 00100 809CD170 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 /* 00104 809CD174 8FAF006C */ lw $t7, 0x006C($sp) /* 00108 809CD178 0C024F05 */ jal func_80093C14 @@ -154,7 +154,7 @@ glabel func_809CD144 /* 00324 809CD394 24C6E440 */ addiu $a2, $a2, %lo(D_809CE440) ## $a2 = 809CE440 /* 00328 809CD398 27A4003C */ addiu $a0, $sp, 0x003C ## $a0 = FFFFFFD4 /* 0032C 809CD39C 24070146 */ addiu $a3, $zero, 0x0146 ## $a3 = 00000146 -/* 00330 809CD3A0 0C031AD5 */ jal func_800C6B54 +/* 00330 809CD3A0 0C031AD5 */ jal Graph_CloseDisps /* 00334 809CD3A4 8DA50000 */ lw $a1, 0x0000($t5) ## C8C8D2FF /* 00338 809CD3A8 8FBF001C */ lw $ra, 0x001C($sp) /* 0033C 809CD3AC 8FB00018 */ lw $s0, 0x0018($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bw/EnBw_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Bw/EnBw_Draw.s index c34b43592e..af7a717ed5 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bw/EnBw_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bw/EnBw_Draw.s @@ -1,10 +1,10 @@ glabel EnBw_Draw /* 02858 809D0F38 27BDFF48 */ addiu $sp, $sp, 0xFF48 ## $sp = FFFFFF48 /* 0285C 809D0F3C 3C0F809D */ lui $t7, %hi(D_809D1554) ## $t7 = 809D0000 -/* 02860 809D0F40 AFBF0044 */ sw $ra, 0x0044($sp) -/* 02864 809D0F44 AFB20040 */ sw $s2, 0x0040($sp) -/* 02868 809D0F48 AFB1003C */ sw $s1, 0x003C($sp) -/* 0286C 809D0F4C AFB00038 */ sw $s0, 0x0038($sp) +/* 02860 809D0F40 AFBF0044 */ sw $ra, 0x0044($sp) +/* 02864 809D0F44 AFB20040 */ sw $s2, 0x0040($sp) +/* 02868 809D0F48 AFB1003C */ sw $s1, 0x003C($sp) +/* 0286C 809D0F4C AFB00038 */ sw $s0, 0x0038($sp) /* 02870 809D0F50 25EF1554 */ addiu $t7, $t7, %lo(D_809D1554) ## $t7 = 809D1554 /* 02874 809D0F54 8DF90000 */ lw $t9, 0x0000($t7) ## 809D1554 /* 02878 809D0F58 27AE00AC */ addiu $t6, $sp, 0x00AC ## $t6 = FFFFFFF4 @@ -20,13 +20,13 @@ glabel EnBw_Draw /* 028A0 809D0F80 24C61570 */ addiu $a2, $a2, %lo(D_809D1570) ## $a2 = 809D1570 /* 028A4 809D0F84 27A40080 */ addiu $a0, $sp, 0x0080 ## $a0 = FFFFFFC8 /* 028A8 809D0F88 2407058F */ addiu $a3, $zero, 0x058F ## $a3 = 0000058F -/* 028AC 809D0F8C 0C031AB1 */ jal func_800C6AC4 +/* 028AC 809D0F8C 0C031AB1 */ jal Graph_OpenDisps /* 028B0 809D0F90 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 /* 028B4 809D0F94 9209022F */ lbu $t1, 0x022F($s0) ## 0000022F /* 028B8 809D0F98 240100FF */ addiu $at, $zero, 0x00FF ## $at = 000000FF -/* 028BC 809D0F9C 15210028 */ bne $t1, $at, .L809D1040 +/* 028BC 809D0F9C 15210028 */ bne $t1, $at, .L809D1040 /* 028C0 809D0FA0 00000000 */ nop -/* 028C4 809D0FA4 0C024F46 */ jal func_80093D18 +/* 028C4 809D0FA4 0C024F46 */ jal func_80093D18 /* 028C8 809D0FA8 8E440000 */ lw $a0, 0x0000($s2) ## 00000000 /* 028CC 809D0FAC 8E2302C0 */ lw $v1, 0x02C0($s1) ## 000002C0 /* 028D0 809D0FB0 3C0BFB00 */ lui $t3, 0xFB00 ## $t3 = FB000000 @@ -37,11 +37,11 @@ glabel EnBw_Draw /* 028E4 809D0FC4 9218022D */ lbu $t8, 0x022D($s0) ## 0000022D /* 028E8 809D0FC8 920D022C */ lbu $t5, 0x022C($s0) ## 0000022C /* 028EC 809D0FCC 920B022E */ lbu $t3, 0x022E($s0) ## 0000022E -/* 028F0 809D0FD0 0018CC00 */ sll $t9, $t8, 16 +/* 028F0 809D0FD0 0018CC00 */ sll $t9, $t8, 16 /* 028F4 809D0FD4 9218022F */ lbu $t8, 0x022F($s0) ## 0000022F -/* 028F8 809D0FD8 000D7600 */ sll $t6, $t5, 24 +/* 028F8 809D0FD8 000D7600 */ sll $t6, $t5, 24 /* 028FC 809D0FDC 01D94825 */ or $t1, $t6, $t9 ## $t1 = 00000000 -/* 02900 809D0FE0 000B6200 */ sll $t4, $t3, 8 +/* 02900 809D0FE0 000B6200 */ sll $t4, $t3, 8 /* 02904 809D0FE4 012C6825 */ or $t5, $t1, $t4 ## $t5 = 00000000 /* 02908 809D0FE8 01B87025 */ or $t6, $t5, $t8 ## $t6 = 00000000 /* 0290C 809D0FEC AC6E0004 */ sw $t6, 0x0004($v1) ## 00000004 @@ -56,17 +56,17 @@ glabel EnBw_Draw /* 02930 809D1010 AC6A0000 */ sw $t2, 0x0000($v1) ## 00000000 /* 02934 809D1014 8E06016C */ lw $a2, 0x016C($s0) ## 0000016C /* 02938 809D1018 8E050150 */ lw $a1, 0x0150($s0) ## 00000150 -/* 0293C 809D101C AFB00014 */ sw $s0, 0x0014($sp) -/* 02940 809D1020 AFA00010 */ sw $zero, 0x0010($sp) +/* 0293C 809D101C AFB00014 */ sw $s0, 0x0014($sp) +/* 02940 809D1020 AFA00010 */ sw $zero, 0x0010($sp) /* 02944 809D1024 8E2902C0 */ lw $t1, 0x02C0($s1) ## 000002C0 /* 02948 809D1028 24E70D18 */ addiu $a3, $a3, %lo(func_809D0D18) ## $a3 = 809D0D18 /* 0294C 809D102C 02402025 */ or $a0, $s2, $zero ## $a0 = 00000000 -/* 02950 809D1030 0C0288A2 */ jal func_800A2288 -/* 02954 809D1034 AFA90018 */ sw $t1, 0x0018($sp) -/* 02958 809D1038 10000035 */ beq $zero, $zero, .L809D1110 +/* 02950 809D1030 0C0288A2 */ jal SkelAnime_Draw2 +/* 02954 809D1034 AFA90018 */ sw $t1, 0x0018($sp) +/* 02958 809D1038 10000035 */ beq $zero, $zero, .L809D1110 /* 0295C 809D103C AE2202C0 */ sw $v0, 0x02C0($s1) ## 000002C0 .L809D1040: -/* 02960 809D1040 0C024F61 */ jal func_80093D84 +/* 02960 809D1040 0C024F61 */ jal func_80093D84 /* 02964 809D1044 8E440000 */ lw $a0, 0x0000($s2) ## 00000000 /* 02968 809D1048 8E2202D0 */ lw $v0, 0x02D0($s1) ## 000002D0 /* 0296C 809D104C 3C0FE700 */ lui $t7, 0xE700 ## $t7 = E7000000 @@ -93,11 +93,11 @@ glabel EnBw_Draw /* 029C0 809D10A0 9218022D */ lbu $t8, 0x022D($s0) ## 0000022D /* 029C4 809D10A4 920C022C */ lbu $t4, 0x022C($s0) ## 0000022C /* 029C8 809D10A8 920B022E */ lbu $t3, 0x022E($s0) ## 0000022E -/* 029CC 809D10AC 00187400 */ sll $t6, $t8, 16 +/* 029CC 809D10AC 00187400 */ sll $t6, $t8, 16 /* 029D0 809D10B0 9218022F */ lbu $t8, 0x022F($s0) ## 0000022F -/* 029D4 809D10B4 000C7E00 */ sll $t7, $t4, 24 +/* 029D4 809D10B4 000C7E00 */ sll $t7, $t4, 24 /* 029D8 809D10B8 01EEC825 */ or $t9, $t7, $t6 ## $t9 = E7000000 -/* 029DC 809D10BC 000B4A00 */ sll $t1, $t3, 8 +/* 029DC 809D10BC 000B4A00 */ sll $t1, $t3, 8 /* 029E0 809D10C0 03296025 */ or $t4, $t9, $t1 ## $t4 = E7000000 /* 029E4 809D10C4 01987825 */ or $t7, $t4, $t8 ## $t7 = FF008080 /* 029E8 809D10C8 AC4F0004 */ sw $t7, 0x0004($v0) ## 00000004 @@ -112,67 +112,67 @@ glabel EnBw_Draw /* 02A0C 809D10EC AC4A0000 */ sw $t2, 0x0000($v0) ## 00000000 /* 02A10 809D10F0 8E06016C */ lw $a2, 0x016C($s0) ## 0000016C /* 02A14 809D10F4 8E050150 */ lw $a1, 0x0150($s0) ## 00000150 -/* 02A18 809D10F8 AFB00014 */ sw $s0, 0x0014($sp) -/* 02A1C 809D10FC AFA00010 */ sw $zero, 0x0010($sp) +/* 02A18 809D10F8 AFB00014 */ sw $s0, 0x0014($sp) +/* 02A1C 809D10FC AFA00010 */ sw $zero, 0x0010($sp) /* 02A20 809D1100 8E3902D0 */ lw $t9, 0x02D0($s1) ## 000002D0 -/* 02A24 809D1104 0C0288A2 */ jal func_800A2288 -/* 02A28 809D1108 AFB90018 */ sw $t9, 0x0018($sp) +/* 02A24 809D1104 0C0288A2 */ jal SkelAnime_Draw2 +/* 02A28 809D1108 AFB90018 */ sw $t9, 0x0018($sp) /* 02A2C 809D110C AE2202D0 */ sw $v0, 0x02D0($s1) ## 000002D0 .L809D1110: /* 02A30 809D1110 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 02A34 809D1114 02414821 */ addu $t1, $s2, $at -/* 02A38 809D1118 AFA90050 */ sw $t1, 0x0050($sp) +/* 02A34 809D1114 02414821 */ addu $t1, $s2, $at +/* 02A38 809D1118 AFA90050 */ sw $t1, 0x0050($sp) /* 02A3C 809D111C 8D381DE4 */ lw $t8, 0x1DE4($t1) ## 00001DE4 /* 02A40 809D1120 860D001C */ lh $t5, 0x001C($s0) ## 0000001C /* 02A44 809D1124 3C01809D */ lui $at, %hi(D_809D16CC) ## $at = 809D0000 /* 02A48 809D1128 270F0001 */ addiu $t7, $t8, 0x0001 ## $t7 = 00000001 /* 02A4C 809D112C 31EE0003 */ andi $t6, $t7, 0x0003 ## $t6 = 00000001 -/* 02A50 809D1130 15AE001E */ bne $t5, $t6, .L809D11AC +/* 02A50 809D1130 15AE001E */ bne $t5, $t6, .L809D11AC /* 02A54 809D1134 00000000 */ nop /* 02A58 809D1138 C6040058 */ lwc1 $f4, 0x0058($s0) ## 00000058 -/* 02A5C 809D113C C42616CC */ lwc1 $f6, %lo(D_809D16CC)($at) +/* 02A5C 809D113C C42616CC */ lwc1 $f6, %lo(D_809D16CC)($at) /* 02A60 809D1140 27A400AC */ addiu $a0, $sp, 0x00AC ## $a0 = FFFFFFF4 /* 02A64 809D1144 26050264 */ addiu $a1, $s0, 0x0264 ## $a1 = 00000264 -/* 02A68 809D1148 46062202 */ mul.s $f8, $f4, $f6 -/* 02A6C 809D114C 0C0346BD */ jal Matrix_MultVec3f -/* 02A70 809D1150 E7A800B4 */ swc1 $f8, 0x00B4($sp) +/* 02A68 809D1148 46062202 */ mul.s $f8, $f4, $f6 +/* 02A6C 809D114C 0C0346BD */ jal Matrix_MultVec3f +/* 02A70 809D1150 E7A800B4 */ swc1 $f8, 0x00B4($sp) /* 02A74 809D1154 3C01809D */ lui $at, %hi(D_809D16D0) ## $at = 809D0000 -/* 02A78 809D1158 C43016D0 */ lwc1 $f16, %lo(D_809D16D0)($at) +/* 02A78 809D1158 C43016D0 */ lwc1 $f16, %lo(D_809D16D0)($at) /* 02A7C 809D115C C60A0058 */ lwc1 $f10, 0x0058($s0) ## 00000058 /* 02A80 809D1160 27A400AC */ addiu $a0, $sp, 0x00AC ## $a0 = FFFFFFF4 /* 02A84 809D1164 26050270 */ addiu $a1, $s0, 0x0270 ## $a1 = 00000270 -/* 02A88 809D1168 46105482 */ mul.s $f18, $f10, $f16 -/* 02A8C 809D116C 0C0346BD */ jal Matrix_MultVec3f -/* 02A90 809D1170 E7B200B4 */ swc1 $f18, 0x00B4($sp) +/* 02A88 809D1168 46105482 */ mul.s $f18, $f10, $f16 +/* 02A8C 809D116C 0C0346BD */ jal Matrix_MultVec3f +/* 02A90 809D1170 E7B200B4 */ swc1 $f18, 0x00B4($sp) /* 02A94 809D1174 3C01809D */ lui $at, %hi(D_809D16D4) ## $at = 809D0000 -/* 02A98 809D1178 C42616D4 */ lwc1 $f6, %lo(D_809D16D4)($at) +/* 02A98 809D1178 C42616D4 */ lwc1 $f6, %lo(D_809D16D4)($at) /* 02A9C 809D117C C6040050 */ lwc1 $f4, 0x0050($s0) ## 00000050 /* 02AA0 809D1180 27A400AC */ addiu $a0, $sp, 0x00AC ## $a0 = FFFFFFF4 /* 02AA4 809D1184 26050288 */ addiu $a1, $s0, 0x0288 ## $a1 = 00000288 -/* 02AA8 809D1188 46062202 */ mul.s $f8, $f4, $f6 -/* 02AAC 809D118C 0C0346BD */ jal Matrix_MultVec3f -/* 02AB0 809D1190 E7A800AC */ swc1 $f8, 0x00AC($sp) -/* 02AB4 809D1194 C7AA00AC */ lwc1 $f10, 0x00AC($sp) +/* 02AA8 809D1188 46062202 */ mul.s $f8, $f4, $f6 +/* 02AAC 809D118C 0C0346BD */ jal Matrix_MultVec3f +/* 02AB0 809D1190 E7A800AC */ swc1 $f8, 0x00AC($sp) +/* 02AB4 809D1194 C7AA00AC */ lwc1 $f10, 0x00AC($sp) /* 02AB8 809D1198 27A400AC */ addiu $a0, $sp, 0x00AC ## $a0 = FFFFFFF4 /* 02ABC 809D119C 2605027C */ addiu $a1, $s0, 0x027C ## $a1 = 0000027C -/* 02AC0 809D11A0 46005407 */ neg.s $f16, $f10 -/* 02AC4 809D11A4 0C0346BD */ jal Matrix_MultVec3f -/* 02AC8 809D11A8 E7B000AC */ swc1 $f16, 0x00AC($sp) +/* 02AC0 809D11A0 46005407 */ neg.s $f16, $f10 +/* 02AC4 809D11A4 0C0346BD */ jal Matrix_MultVec3f +/* 02AC8 809D11A8 E7B000AC */ swc1 $f16, 0x00AC($sp) .L809D11AC: /* 02ACC 809D11AC 3C01809D */ lui $at, %hi(D_809D16D8) ## $at = 809D0000 -/* 02AD0 809D11B0 C42416D8 */ lwc1 $f4, %lo(D_809D16D8)($at) +/* 02AD0 809D11B0 C42416D8 */ lwc1 $f4, %lo(D_809D16D8)($at) /* 02AD4 809D11B4 C6120054 */ lwc1 $f18, 0x0054($s0) ## 00000054 /* 02AD8 809D11B8 3C01447A */ lui $at, 0x447A ## $at = 447A0000 /* 02ADC 809D11BC 44814000 */ mtc1 $at, $f8 ## $f8 = 1000.00 -/* 02AE0 809D11C0 46049181 */ sub.s $f6, $f18, $f4 +/* 02AE0 809D11C0 46049181 */ sub.s $f6, $f18, $f4 /* 02AE4 809D11C4 C6100028 */ lwc1 $f16, 0x0028($s0) ## 00000028 /* 02AE8 809D11C8 C60C0024 */ lwc1 $f12, 0x0024($s0) ## 00000024 /* 02AEC 809D11CC 8E06002C */ lw $a2, 0x002C($s0) ## 0000002C -/* 02AF0 809D11D0 46083282 */ mul.s $f10, $f6, $f8 +/* 02AF0 809D11D0 46083282 */ mul.s $f10, $f6, $f8 /* 02AF4 809D11D4 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 02AF8 809D11D8 0C034261 */ jal Matrix_Translate -/* 02AFC 809D11DC 460A8380 */ add.s $f14, $f16, $f10 -/* 02B00 809D11E0 0C024F61 */ jal func_80093D84 +/* 02AF8 809D11D8 0C034261 */ jal Matrix_Translate +/* 02AFC 809D11DC 460A8380 */ add.s $f14, $f16, $f10 +/* 02B00 809D11E0 0C024F61 */ jal func_80093D84 /* 02B04 809D11E4 8E440000 */ lw $a0, 0x0000($s2) ## 00000000 /* 02B08 809D11E8 8E2202D0 */ lw $v0, 0x02D0($s1) ## 000002D0 /* 02B0C 809D11EC 3C0BFB00 */ lui $t3, 0xFB00 ## $t3 = FB000000 @@ -188,31 +188,31 @@ glabel EnBw_Draw /* 02B34 809D1214 AE2902D0 */ sw $t1, 0x02D0($s1) ## 000002D0 /* 02B38 809D1218 AC4C0000 */ sw $t4, 0x0000($v0) ## 00000000 /* 02B3C 809D121C 8E440000 */ lw $a0, 0x0000($s2) ## 00000000 -/* 02B40 809D1220 8FAE0050 */ lw $t6, 0x0050($sp) +/* 02B40 809D1220 8FAE0050 */ lw $t6, 0x0050($sp) /* 02B44 809D1224 24180020 */ addiu $t8, $zero, 0x0020 ## $t8 = 00000020 /* 02B48 809D1228 240F0040 */ addiu $t7, $zero, 0x0040 ## $t7 = 00000040 /* 02B4C 809D122C 240D0001 */ addiu $t5, $zero, 0x0001 ## $t5 = 00000001 -/* 02B50 809D1230 AFAD0018 */ sw $t5, 0x0018($sp) -/* 02B54 809D1234 AFAF0014 */ sw $t7, 0x0014($sp) -/* 02B58 809D1238 AFB80010 */ sw $t8, 0x0010($sp) -/* 02B5C 809D123C AFA0001C */ sw $zero, 0x001C($sp) +/* 02B50 809D1230 AFAD0018 */ sw $t5, 0x0018($sp) +/* 02B54 809D1234 AFAF0014 */ sw $t7, 0x0014($sp) +/* 02B58 809D1238 AFB80010 */ sw $t8, 0x0010($sp) +/* 02B5C 809D123C AFA0001C */ sw $zero, 0x001C($sp) /* 02B60 809D1240 8DCA1DE4 */ lw $t2, 0x1DE4($t6) ## 00001DE4 /* 02B64 809D1244 240C0080 */ addiu $t4, $zero, 0x0080 ## $t4 = 00000080 /* 02B68 809D1248 24090020 */ addiu $t1, $zero, 0x0020 ## $t1 = 00000020 -/* 02B6C 809D124C 000A0823 */ subu $at, $zero, $t2 -/* 02B70 809D1250 00015880 */ sll $t3, $at, 2 -/* 02B74 809D1254 01615821 */ addu $t3, $t3, $at -/* 02B78 809D1258 000B5880 */ sll $t3, $t3, 2 +/* 02B6C 809D124C 000A0823 */ subu $at, $zero, $t2 +/* 02B70 809D1250 00015880 */ sll $t3, $at, 2 +/* 02B74 809D1254 01615821 */ addu $t3, $t3, $at +/* 02B78 809D1258 000B5880 */ sll $t3, $t3, 2 /* 02B7C 809D125C 317901FF */ andi $t9, $t3, 0x01FF ## $t9 = 00000000 -/* 02B80 809D1260 AFB90020 */ sw $t9, 0x0020($sp) -/* 02B84 809D1264 AFA90024 */ sw $t1, 0x0024($sp) -/* 02B88 809D1268 AFAC0028 */ sw $t4, 0x0028($sp) +/* 02B80 809D1260 AFB90020 */ sw $t9, 0x0020($sp) +/* 02B84 809D1264 AFA90024 */ sw $t1, 0x0024($sp) +/* 02B88 809D1268 AFAC0028 */ sw $t4, 0x0028($sp) /* 02B8C 809D126C 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 02B90 809D1270 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 /* 02B94 809D1274 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 02B98 809D1278 0C0253D0 */ jal Draw_TwoTexScroll -/* 02B9C 809D127C AFA20060 */ sw $v0, 0x0060($sp) -/* 02BA0 809D1280 8FA30060 */ lw $v1, 0x0060($sp) +/* 02B98 809D1278 0C0253D0 */ jal Gfx_TwoTexScroll +/* 02B9C 809D127C AFA20060 */ sw $v0, 0x0060($sp) +/* 02BA0 809D1280 8FA30060 */ lw $v1, 0x0060($sp) /* 02BA4 809D1284 3C0FFA00 */ lui $t7, 0xFA00 ## $t7 = FA000000 /* 02BA8 809D1288 3C0DFFFF */ lui $t5, 0xFFFF ## $t5 = FFFF0000 /* 02BAC 809D128C AC620004 */ sw $v0, 0x0004($v1) ## 00000004 @@ -224,17 +224,17 @@ glabel EnBw_Draw /* 02BC4 809D12A4 AC4D0004 */ sw $t5, 0x0004($v0) ## 00000004 /* 02BC8 809D12A8 AC4F0000 */ sw $t7, 0x0000($v0) ## 00000000 /* 02BCC 809D12AC 3C01809D */ lui $at, %hi(D_809D16DC) ## $at = 809D0000 -/* 02BD0 809D12B0 C42416DC */ lwc1 $f4, %lo(D_809D16DC)($at) +/* 02BD0 809D12B0 C42416DC */ lwc1 $f4, %lo(D_809D16DC)($at) /* 02BD4 809D12B4 C6120248 */ lwc1 $f18, 0x0248($s0) ## 00000248 /* 02BD8 809D12B8 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 02BDC 809D12BC 46049302 */ mul.s $f12, $f18, $f4 -/* 02BE0 809D12C0 44066000 */ mfc1 $a2, $f12 -/* 02BE4 809D12C4 0C0342A3 */ jal Matrix_Scale -/* 02BE8 809D12C8 46006386 */ mov.s $f14, $f12 +/* 02BDC 809D12BC 46049302 */ mul.s $f12, $f18, $f4 +/* 02BE0 809D12C0 44066000 */ mfc1 $a2, $f12 +/* 02BE4 809D12C4 0C0342A3 */ jal Matrix_Scale +/* 02BE8 809D12C8 46006386 */ mov.s $f14, $f12 /* 02BEC 809D12CC 3C010001 */ lui $at, 0x0001 ## $at = 00010000 /* 02BF0 809D12D0 34211DA0 */ ori $at, $at, 0x1DA0 ## $at = 00011DA0 -/* 02BF4 809D12D4 0C0347F5 */ jal func_800D1FD4 -/* 02BF8 809D12D8 02412021 */ addu $a0, $s2, $at +/* 02BF4 809D12D4 0C0347F5 */ jal func_800D1FD4 +/* 02BF8 809D12D8 02412021 */ addu $a0, $s2, $at /* 02BFC 809D12DC 8E2202D0 */ lw $v0, 0x02D0($s1) ## 000002D0 /* 02C00 809D12E0 3C0ADA38 */ lui $t2, 0xDA38 ## $t2 = DA380000 /* 02C04 809D12E4 354A0003 */ ori $t2, $t2, 0x0003 ## $t2 = DA380003 @@ -245,9 +245,9 @@ glabel EnBw_Draw /* 02C18 809D12F8 3C05809D */ lui $a1, %hi(D_809D1580) ## $a1 = 809D0000 /* 02C1C 809D12FC 24A51580 */ addiu $a1, $a1, %lo(D_809D1580) ## $a1 = 809D1580 /* 02C20 809D1300 240605DC */ addiu $a2, $zero, 0x05DC ## $a2 = 000005DC -/* 02C24 809D1304 0C0346A2 */ jal Matrix_NewMtx -/* 02C28 809D1308 AFA20058 */ sw $v0, 0x0058($sp) -/* 02C2C 809D130C 8FA30058 */ lw $v1, 0x0058($sp) +/* 02C24 809D1304 0C0346A2 */ jal Matrix_NewMtx +/* 02C28 809D1308 AFA20058 */ sw $v0, 0x0058($sp) +/* 02C2C 809D130C 8FA30058 */ lw $v1, 0x0058($sp) /* 02C30 809D1310 3C090405 */ lui $t1, 0x0405 ## $t1 = 04050000 /* 02C34 809D1314 2529D4E0 */ addiu $t1, $t1, 0xD4E0 ## $t1 = 0404D4E0 /* 02C38 809D1318 AC620004 */ sw $v0, 0x0004($v1) ## 00000004 @@ -258,7 +258,7 @@ glabel EnBw_Draw /* 02C4C 809D132C AC490004 */ sw $t1, 0x0004($v0) ## 00000004 /* 02C50 809D1330 AC590000 */ sw $t9, 0x0000($v0) ## 00000000 /* 02C54 809D1334 920C023B */ lbu $t4, 0x023B($s0) ## 0000023B -/* 02C58 809D1338 11800031 */ beq $t4, $zero, .L809D1400 +/* 02C58 809D1338 11800031 */ beq $t4, $zero, .L809D1400 /* 02C5C 809D133C 00000000 */ nop /* 02C60 809D1340 920D023B */ lbu $t5, 0x023B($s0) ## 0000023B /* 02C64 809D1344 92180114 */ lbu $t8, 0x0114($s0) ## 00000114 @@ -268,57 +268,57 @@ glabel EnBw_Draw /* 02C74 809D1354 310A0003 */ andi $t2, $t0, 0x0003 ## $t2 = 00000003 /* 02C78 809D1358 270F0001 */ addiu $t7, $t8, 0x0001 ## $t7 = 00000001 /* 02C7C 809D135C A20F0114 */ sb $t7, 0x0114($s0) ## 00000114 -/* 02C80 809D1360 15400027 */ bne $t2, $zero, .L809D1400 +/* 02C80 809D1360 15400027 */ bne $t2, $zero, .L809D1400 /* 02C84 809D1364 A20E023B */ sb $t6, 0x023B($s0) ## 0000023B -/* 02C88 809D1368 00081883 */ sra $v1, $t0, 2 -/* 02C8C 809D136C 00035880 */ sll $t3, $v1, 2 -/* 02C90 809D1370 01635823 */ subu $t3, $t3, $v1 -/* 02C94 809D1374 000B5880 */ sll $t3, $t3, 2 +/* 02C88 809D1368 00081883 */ sra $v1, $t0, 2 +/* 02C8C 809D136C 00035880 */ sll $t3, $v1, 2 +/* 02C90 809D1370 01635823 */ subu $t3, $t3, $v1 +/* 02C94 809D1374 000B5880 */ sll $t3, $t3, 2 /* 02C98 809D1378 273914F4 */ addiu $t9, $t9, %lo(D_809D14F4) ## $t9 = 809D14F4 -/* 02C9C 809D137C 01791021 */ addu $v0, $t3, $t9 +/* 02C9C 809D137C 01791021 */ addu $v0, $t3, $t9 /* 02CA0 809D1380 C4460000 */ lwc1 $f6, 0x0000($v0) ## 00000000 /* 02CA4 809D1384 C6080024 */ lwc1 $f8, 0x0024($s0) ## 00000024 /* 02CA8 809D1388 C44A0004 */ lwc1 $f10, 0x0004($v0) ## 00000004 /* 02CAC 809D138C 3C01809D */ lui $at, %hi(D_809D16E0) ## $at = 809D0000 -/* 02CB0 809D1390 46083400 */ add.s $f16, $f6, $f8 +/* 02CB0 809D1390 46083400 */ add.s $f16, $f6, $f8 /* 02CB4 809D1394 C4460008 */ lwc1 $f6, 0x0008($v0) ## 00000008 /* 02CB8 809D1398 24090096 */ addiu $t1, $zero, 0x0096 ## $t1 = 00000096 /* 02CBC 809D139C 240C0096 */ addiu $t4, $zero, 0x0096 ## $t4 = 00000096 -/* 02CC0 809D13A0 E7B00098 */ swc1 $f16, 0x0098($sp) +/* 02CC0 809D13A0 E7B00098 */ swc1 $f16, 0x0098($sp) /* 02CC4 809D13A4 C6120028 */ lwc1 $f18, 0x0028($s0) ## 00000028 /* 02CC8 809D13A8 241800FA */ addiu $t8, $zero, 0x00FA ## $t8 = 000000FA /* 02CCC 809D13AC 240F00EB */ addiu $t7, $zero, 0x00EB ## $t7 = 000000EB -/* 02CD0 809D13B0 46125100 */ add.s $f4, $f10, $f18 -/* 02CD4 809D13B4 C42A16E0 */ lwc1 $f10, %lo(D_809D16E0)($at) +/* 02CD0 809D13B0 46125100 */ add.s $f4, $f10, $f18 +/* 02CD4 809D13B4 C42A16E0 */ lwc1 $f10, %lo(D_809D16E0)($at) /* 02CD8 809D13B8 240D00F5 */ addiu $t5, $zero, 0x00F5 ## $t5 = 000000F5 /* 02CDC 809D13BC 240E00FF */ addiu $t6, $zero, 0x00FF ## $t6 = 000000FF -/* 02CE0 809D13C0 E7A4009C */ swc1 $f4, 0x009C($sp) +/* 02CE0 809D13C0 E7A4009C */ swc1 $f4, 0x009C($sp) /* 02CE4 809D13C4 C608002C */ lwc1 $f8, 0x002C($s0) ## 0000002C -/* 02CE8 809D13C8 AFAE0024 */ sw $t6, 0x0024($sp) -/* 02CEC 809D13CC AFAD0020 */ sw $t5, 0x0020($sp) -/* 02CF0 809D13D0 46083400 */ add.s $f16, $f6, $f8 -/* 02CF4 809D13D4 AFAF001C */ sw $t7, 0x001C($sp) -/* 02CF8 809D13D8 AFB80018 */ sw $t8, 0x0018($sp) -/* 02CFC 809D13DC AFAC0014 */ sw $t4, 0x0014($sp) -/* 02D00 809D13E0 E7B000A0 */ swc1 $f16, 0x00A0($sp) -/* 02D04 809D13E4 AFA90010 */ sw $t1, 0x0010($sp) +/* 02CE8 809D13C8 AFAE0024 */ sw $t6, 0x0024($sp) +/* 02CEC 809D13CC AFAD0020 */ sw $t5, 0x0020($sp) +/* 02CF0 809D13D0 46083400 */ add.s $f16, $f6, $f8 +/* 02CF4 809D13D4 AFAF001C */ sw $t7, 0x001C($sp) +/* 02CF8 809D13D8 AFB80018 */ sw $t8, 0x0018($sp) +/* 02CFC 809D13DC AFAC0014 */ sw $t4, 0x0014($sp) +/* 02D00 809D13E0 E7B000A0 */ swc1 $f16, 0x00A0($sp) +/* 02D04 809D13E4 AFA90010 */ sw $t1, 0x0010($sp) /* 02D08 809D13E8 02402025 */ or $a0, $s2, $zero ## $a0 = 00000000 /* 02D0C 809D13EC 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 02D10 809D13F0 27A60098 */ addiu $a2, $sp, 0x0098 ## $a2 = FFFFFFE0 /* 02D14 809D13F4 24070096 */ addiu $a3, $zero, 0x0096 ## $a3 = 00000096 -/* 02D18 809D13F8 0C00A850 */ jal func_8002A140 -/* 02D1C 809D13FC E7AA0028 */ swc1 $f10, 0x0028($sp) +/* 02D18 809D13F8 0C00A850 */ jal func_8002A140 +/* 02D1C 809D13FC E7AA0028 */ swc1 $f10, 0x0028($sp) .L809D1400: /* 02D20 809D1400 3C06809D */ lui $a2, %hi(D_809D1590) ## $a2 = 809D0000 /* 02D24 809D1404 24C61590 */ addiu $a2, $a2, %lo(D_809D1590) ## $a2 = 809D1590 /* 02D28 809D1408 27A40080 */ addiu $a0, $sp, 0x0080 ## $a0 = FFFFFFC8 /* 02D2C 809D140C 8E450000 */ lw $a1, 0x0000($s2) ## 00000000 -/* 02D30 809D1410 0C031AD5 */ jal func_800C6B54 +/* 02D30 809D1410 0C031AD5 */ jal Graph_CloseDisps /* 02D34 809D1414 240705F1 */ addiu $a3, $zero, 0x05F1 ## $a3 = 000005F1 -/* 02D38 809D1418 8FBF0044 */ lw $ra, 0x0044($sp) -/* 02D3C 809D141C 8FB00038 */ lw $s0, 0x0038($sp) -/* 02D40 809D1420 8FB1003C */ lw $s1, 0x003C($sp) -/* 02D44 809D1424 8FB20040 */ lw $s2, 0x0040($sp) -/* 02D48 809D1428 03E00008 */ jr $ra +/* 02D38 809D1418 8FBF0044 */ lw $ra, 0x0044($sp) +/* 02D3C 809D141C 8FB00038 */ lw $s0, 0x0038($sp) +/* 02D40 809D1420 8FB1003C */ lw $s1, 0x003C($sp) +/* 02D44 809D1424 8FB20040 */ lw $s2, 0x0040($sp) +/* 02D48 809D1428 03E00008 */ jr $ra /* 02D4C 809D142C 27BD00B8 */ addiu $sp, $sp, 0x00B8 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bw/func_809CE9A8.s b/asm/non_matchings/overlays/actors/ovl_En_Bw/func_809CE9A8.s index 45e5f114d0..c9d13b1afe 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bw/func_809CE9A8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bw/func_809CE9A8.s @@ -1,35 +1,35 @@ glabel func_809CE9A8 /* 002C8 809CE9A8 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 002CC 809CE9AC AFBF0014 */ sw $ra, 0x0014($sp) +/* 002CC 809CE9AC AFBF0014 */ sw $ra, 0x0014($sp) /* 002D0 809CE9B0 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 /* 002D4 809CE9B4 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 002D8 809CE9B8 24A50228 */ addiu $a1, $a1, 0x0228 ## $a1 = 06000228 -/* 002DC 809CE9BC AFA70018 */ sw $a3, 0x0018($sp) +/* 002DC 809CE9BC AFA70018 */ sw $a3, 0x0018($sp) /* 002E0 809CE9C0 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 002E4 809CE9C4 0C0294D3 */ jal func_800A534C +/* 002E4 809CE9C4 0C0294D3 */ jal SkelAnime_ChangeAnimTransitionRepeat /* 002E8 809CE9C8 3C06C000 */ lui $a2, 0xC000 ## $a2 = C0000000 -/* 002EC 809CE9CC 8FA70018 */ lw $a3, 0x0018($sp) +/* 002EC 809CE9CC 8FA70018 */ lw $a3, 0x0018($sp) /* 002F0 809CE9D0 240E0002 */ addiu $t6, $zero, 0x0002 ## $t6 = 00000002 /* 002F4 809CE9D4 0C03F66B */ jal Math_Rand_ZeroOne ## Rand.Next() float /* 002F8 809CE9D8 A0EE0220 */ sb $t6, 0x0220($a3) ## 00000220 /* 002FC 809CE9DC 3C014348 */ lui $at, 0x4348 ## $at = 43480000 /* 00300 809CE9E0 44811000 */ mtc1 $at, $f2 ## $f2 = 200.00 -/* 00304 809CE9E4 8FA40018 */ lw $a0, 0x0018($sp) +/* 00304 809CE9E4 8FA40018 */ lw $a0, 0x0018($sp) /* 00308 809CE9E8 44805000 */ mtc1 $zero, $f10 ## $f10 = 0.00 -/* 0030C 809CE9EC 46020102 */ mul.s $f4, $f0, $f2 +/* 0030C 809CE9EC 46020102 */ mul.s $f4, $f0, $f2 /* 00310 809CE9F0 3C05809D */ lui $a1, %hi(func_809CEA24) ## $a1 = 809D0000 /* 00314 809CE9F4 24A5EA24 */ addiu $a1, $a1, %lo(func_809CEA24) ## $a1 = 809CEA24 /* 00318 809CE9F8 A0800232 */ sb $zero, 0x0232($a0) ## 00000232 /* 0031C 809CE9FC E48A0068 */ swc1 $f10, 0x0068($a0) ## 00000068 -/* 00320 809CEA00 46022180 */ add.s $f6, $f4, $f2 -/* 00324 809CEA04 4600320D */ trunc.w.s $f8, $f6 -/* 00328 809CEA08 44184000 */ mfc1 $t8, $f8 -/* 0032C 809CEA0C 0C2739B8 */ jal func_809CE6E0 +/* 00320 809CEA00 46022180 */ add.s $f6, $f4, $f2 +/* 00324 809CEA04 4600320D */ trunc.w.s $f8, $f6 +/* 00328 809CEA08 44184000 */ mfc1 $t8, $f8 +/* 0032C 809CEA0C 0C2739B8 */ jal func_809CE6E0 /* 00330 809CEA10 A4980222 */ sh $t8, 0x0222($a0) ## 00000222 -/* 00334 809CEA14 8FBF0014 */ lw $ra, 0x0014($sp) +/* 00334 809CEA14 8FBF0014 */ lw $ra, 0x0014($sp) /* 00338 809CEA18 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 0033C 809CEA1C 03E00008 */ jr $ra +/* 0033C 809CEA1C 03E00008 */ jr $ra /* 00340 809CEA20 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bw/func_809CEA24.s b/asm/non_matchings/overlays/actors/ovl_En_Bw/func_809CEA24.s index 38ab861309..b39b41277a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bw/func_809CEA24.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bw/func_809CEA24.s @@ -237,7 +237,7 @@ glabel func_809CEA24 /* 006AC 809CED8C 44894000 */ mtc1 $t1, $f8 ## $f8 = -0.00 /* 006B0 809CED90 448A8000 */ mtc1 $t2, $f16 ## $f16 = -0.00 /* 006B4 809CED94 46804320 */ cvt.s.w $f12, $f8 -/* 006B8 809CED98 0C03F494 */ jal func_800FD250 +/* 006B8 809CED98 0C03F494 */ jal Math_atan2f /* 006BC 809CED9C 468083A0 */ cvt.s.w $f14, $f16 /* 006C0 809CEDA0 3C01809D */ lui $at, %hi(D_809D15EC) ## $at = 809D0000 /* 006C4 809CEDA4 C42A15EC */ lwc1 $f10, %lo(D_809D15EC)($at) @@ -512,7 +512,7 @@ glabel L809CEF9C /* 00A90 809CF170 44995000 */ mtc1 $t9, $f10 ## $f10 = -0.00 /* 00A94 809CF174 448A9000 */ mtc1 $t2, $f18 ## $f18 = -0.00 /* 00A98 809CF178 46805320 */ cvt.s.w $f12, $f10 -/* 00A9C 809CF17C 0C03F494 */ jal func_800FD250 +/* 00A9C 809CF17C 0C03F494 */ jal Math_atan2f /* 00AA0 809CF180 468093A0 */ cvt.s.w $f14, $f18 /* 00AA4 809CF184 3C01809D */ lui $at, %hi(D_809D1610) ## $at = 809D0000 /* 00AA8 809CF188 C4241610 */ lwc1 $f4, %lo(D_809D1610)($at) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bw/func_809CF72C.s b/asm/non_matchings/overlays/actors/ovl_En_Bw/func_809CF72C.s index f7e23fd7d7..a2af8709c5 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bw/func_809CF72C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bw/func_809CF72C.s @@ -1,19 +1,19 @@ glabel func_809CF72C /* 0104C 809CF72C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 01050 809CF730 AFBF0014 */ sw $ra, 0x0014($sp) +/* 01050 809CF730 AFBF0014 */ sw $ra, 0x0014($sp) /* 01054 809CF734 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 /* 01058 809CF738 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 0105C 809CF73C 24A521A0 */ addiu $a1, $a1, 0x21A0 ## $a1 = 060021A0 -/* 01060 809CF740 AFA70018 */ sw $a3, 0x0018($sp) +/* 01060 809CF740 AFA70018 */ sw $a3, 0x0018($sp) /* 01064 809CF744 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 01068 809CF748 0C029490 */ jal func_800A5240 +/* 01068 809CF748 0C029490 */ jal SkelAnime_ChangeAnimTransitionStop /* 0106C 809CF74C 3C06C000 */ lui $a2, 0xC000 ## $a2 = C0000000 -/* 01070 809CF750 8FA40018 */ lw $a0, 0x0018($sp) +/* 01070 809CF750 8FA40018 */ lw $a0, 0x0018($sp) /* 01074 809CF754 240E0003 */ addiu $t6, $zero, 0x0003 ## $t6 = 00000003 /* 01078 809CF758 3C01809D */ lui $at, %hi(D_809D1614) ## $at = 809D0000 /* 0107C 809CF75C A08E0220 */ sb $t6, 0x0220($a0) ## 00000220 /* 01080 809CF760 A0800221 */ sb $zero, 0x0221($a0) ## 00000221 -/* 01084 809CF764 C4241614 */ lwc1 $f4, %lo(D_809D1614)($at) +/* 01084 809CF764 C4241614 */ lwc1 $f4, %lo(D_809D1614)($at) /* 01088 809CF768 44803000 */ mtc1 $zero, $f6 ## $f6 = 0.00 /* 0108C 809CF76C 240F0014 */ addiu $t7, $zero, 0x0014 ## $t7 = 00000014 /* 01090 809CF770 24180BB8 */ addiu $t8, $zero, 0x0BB8 ## $t8 = 00000BB8 @@ -22,15 +22,15 @@ glabel func_809CF72C /* 0109C 809CF77C A4980224 */ sh $t8, 0x0224($a0) ## 00000224 /* 010A0 809CF780 E4840250 */ swc1 $f4, 0x0250($a0) ## 00000250 /* 010A4 809CF784 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 010A8 809CF788 E4860068 */ swc1 $f6, 0x0068($a0) ## 00000068 /* 010AC 809CF78C 3C05809D */ lui $a1, %hi(func_809CF7AC) ## $a1 = 809D0000 -/* 010B0 809CF790 8FA40018 */ lw $a0, 0x0018($sp) -/* 010B4 809CF794 0C2739B8 */ jal func_809CE6E0 +/* 010B0 809CF790 8FA40018 */ lw $a0, 0x0018($sp) +/* 010B4 809CF794 0C2739B8 */ jal func_809CE6E0 /* 010B8 809CF798 24A5F7AC */ addiu $a1, $a1, %lo(func_809CF7AC) ## $a1 = 809CF7AC -/* 010BC 809CF79C 8FBF0014 */ lw $ra, 0x0014($sp) +/* 010BC 809CF79C 8FBF0014 */ lw $ra, 0x0014($sp) /* 010C0 809CF7A0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 010C4 809CF7A4 03E00008 */ jr $ra +/* 010C4 809CF7A4 03E00008 */ jr $ra /* 010C8 809CF7A8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bw/func_809CF8F0.s b/asm/non_matchings/overlays/actors/ovl_En_Bw/func_809CF8F0.s index 67b9dc0285..8cadb6b90d 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bw/func_809CF8F0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bw/func_809CF8F0.s @@ -1,14 +1,14 @@ glabel func_809CF8F0 /* 01210 809CF8F0 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 01214 809CF8F4 AFBF0014 */ sw $ra, 0x0014($sp) +/* 01214 809CF8F4 AFBF0014 */ sw $ra, 0x0014($sp) /* 01218 809CF8F8 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 /* 0121C 809CF8FC 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 01220 809CF900 24A52250 */ addiu $a1, $a1, 0x2250 ## $a1 = 06002250 -/* 01224 809CF904 AFA70018 */ sw $a3, 0x0018($sp) +/* 01224 809CF904 AFA70018 */ sw $a3, 0x0018($sp) /* 01228 809CF908 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 0122C 809CF90C 0C029490 */ jal func_800A5240 +/* 0122C 809CF90C 0C029490 */ jal SkelAnime_ChangeAnimTransitionStop /* 01230 809CF910 3C06BF80 */ lui $a2, 0xBF80 ## $a2 = BF800000 -/* 01234 809CF914 8FA40018 */ lw $a0, 0x0018($sp) +/* 01234 809CF914 8FA40018 */ lw $a0, 0x0018($sp) /* 01238 809CF918 3C0140E0 */ lui $at, 0x40E0 ## $at = 40E00000 /* 0123C 809CF91C 44812000 */ mtc1 $at, $f4 ## $f4 = 7.00 /* 01240 809CF920 8482008A */ lh $v0, 0x008A($a0) ## 0000008A @@ -23,19 +23,19 @@ glabel func_809CF8F0 /* 01264 809CF944 A48200B6 */ sh $v0, 0x00B6($a0) ## 000000B6 /* 01268 809CF948 A4820032 */ sh $v0, 0x0032($a0) ## 00000032 /* 0126C 809CF94C 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 01270 809CF950 E4860060 */ swc1 $f6, 0x0060($a0) ## 00000060 -/* 01274 809CF954 8FA40018 */ lw $a0, 0x0018($sp) +/* 01274 809CF954 8FA40018 */ lw $a0, 0x0018($sp) /* 01278 809CF958 3C010100 */ lui $at, 0x0100 ## $at = 01000000 /* 0127C 809CF95C 3C05809D */ lui $a1, %hi(func_809CF984) ## $a1 = 809D0000 /* 01280 809CF960 8C980004 */ lw $t8, 0x0004($a0) ## 00000004 /* 01284 809CF964 24A5F984 */ addiu $a1, $a1, %lo(func_809CF984) ## $a1 = 809CF984 /* 01288 809CF968 0301C825 */ or $t9, $t8, $at ## $t9 = 01000000 -/* 0128C 809CF96C 0C2739B8 */ jal func_809CE6E0 +/* 0128C 809CF96C 0C2739B8 */ jal func_809CE6E0 /* 01290 809CF970 AC990004 */ sw $t9, 0x0004($a0) ## 00000004 -/* 01294 809CF974 8FBF0014 */ lw $ra, 0x0014($sp) +/* 01294 809CF974 8FBF0014 */ lw $ra, 0x0014($sp) /* 01298 809CF978 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 0129C 809CF97C 03E00008 */ jr $ra +/* 0129C 809CF97C 03E00008 */ jr $ra /* 012A0 809CF980 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bw/func_809CFBA8.s b/asm/non_matchings/overlays/actors/ovl_En_Bw/func_809CFBA8.s index ca80deeaf1..6cc7c6d3a2 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bw/func_809CFBA8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bw/func_809CFBA8.s @@ -1,12 +1,12 @@ glabel func_809CFBA8 /* 014C8 809CFBA8 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 014CC 809CFBAC AFB00018 */ sw $s0, 0x0018($sp) +/* 014CC 809CFBAC AFB00018 */ sw $s0, 0x0018($sp) /* 014D0 809CFBB0 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 014D4 809CFBB4 AFBF001C */ sw $ra, 0x001C($sp) +/* 014D4 809CFBB4 AFBF001C */ sw $ra, 0x001C($sp) /* 014D8 809CFBB8 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 014DC 809CFBBC 24A52250 */ addiu $a1, $a1, 0x2250 ## $a1 = 06002250 /* 014E0 809CFBC0 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 014E4 809CFBC4 0C0294D3 */ jal func_800A534C +/* 014E4 809CFBC4 0C0294D3 */ jal SkelAnime_ChangeAnimTransitionRepeat /* 014E8 809CFBC8 3C06BF80 */ lui $a2, 0xBF80 ## $a2 = BF800000 /* 014EC 809CFBCC 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 /* 014F0 809CFBD0 3C014130 */ lui $at, 0x4130 ## $at = 41300000 @@ -24,23 +24,23 @@ glabel func_809CFBA8 /* 0151C 809CFBFC 44813000 */ mtc1 $at, $f6 ## $f6 = 0.25 /* 01520 809CFC00 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 /* 01524 809CFC04 44815000 */ mtc1 $at, $f10 ## $f10 = 1.00 -/* 01528 809CFC08 46060202 */ mul.s $f8, $f0, $f6 +/* 01528 809CFC08 46060202 */ mul.s $f8, $f0, $f6 /* 0152C 809CFC0C 24180BB8 */ addiu $t8, $zero, 0x0BB8 ## $t8 = 00000BB8 /* 01530 809CFC10 A6180224 */ sh $t8, 0x0224($s0) ## 00000224 /* 01534 809CFC14 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 01538 809CFC18 24053976 */ addiu $a1, $zero, 0x3976 ## $a1 = 00003976 -/* 0153C 809CFC1C 460A4400 */ add.s $f16, $f8, $f10 +/* 0153C 809CFC1C 460A4400 */ add.s $f16, $f8, $f10 /* 01540 809CFC20 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 01544 809CFC24 E610025C */ swc1 $f16, 0x025C($s0) ## 0000025C /* 01548 809CFC28 3C05809D */ lui $a1, %hi(func_809CFC4C) ## $a1 = 809D0000 /* 0154C 809CFC2C 24A5FC4C */ addiu $a1, $a1, %lo(func_809CFC4C) ## $a1 = 809CFC4C -/* 01550 809CFC30 0C2739B8 */ jal func_809CE6E0 +/* 01550 809CFC30 0C2739B8 */ jal func_809CE6E0 /* 01554 809CFC34 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01558 809CFC38 8FBF001C */ lw $ra, 0x001C($sp) -/* 0155C 809CFC3C 8FB00018 */ lw $s0, 0x0018($sp) +/* 01558 809CFC38 8FBF001C */ lw $ra, 0x001C($sp) +/* 0155C 809CFC3C 8FB00018 */ lw $s0, 0x0018($sp) /* 01560 809CFC40 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 01564 809CFC44 03E00008 */ jr $ra +/* 01564 809CFC44 03E00008 */ jr $ra /* 01568 809CFC48 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bw/func_809CFF10.s b/asm/non_matchings/overlays/actors/ovl_En_Bw/func_809CFF10.s index 0f468a1bc4..fe0dcd87ac 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bw/func_809CFF10.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bw/func_809CFF10.s @@ -1,14 +1,14 @@ glabel func_809CFF10 /* 01830 809CFF10 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 01834 809CFF14 AFBF0014 */ sw $ra, 0x0014($sp) +/* 01834 809CFF14 AFBF0014 */ sw $ra, 0x0014($sp) /* 01838 809CFF18 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 /* 0183C 809CFF1C 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 01840 809CFF20 24A52250 */ addiu $a1, $a1, 0x2250 ## $a1 = 06002250 -/* 01844 809CFF24 AFA70018 */ sw $a3, 0x0018($sp) +/* 01844 809CFF24 AFA70018 */ sw $a3, 0x0018($sp) /* 01848 809CFF28 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 0184C 809CFF2C 0C0294D3 */ jal func_800A534C +/* 0184C 809CFF2C 0C0294D3 */ jal SkelAnime_ChangeAnimTransitionRepeat /* 01850 809CFF30 3C06BF80 */ lui $a2, 0xBF80 ## $a2 = BF800000 -/* 01854 809CFF34 8FA40018 */ lw $a0, 0x0018($sp) +/* 01854 809CFF34 8FA40018 */ lw $a0, 0x0018($sp) /* 01858 809CFF38 3C014130 */ lui $at, 0x4130 ## $at = 41300000 /* 0185C 809CFF3C 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 /* 01860 809CFF40 44813000 */ mtc1 $at, $f6 ## $f6 = 11.00 @@ -21,18 +21,18 @@ glabel func_809CFF10 /* 0187C 809CFF5C A0980221 */ sb $t8, 0x0221($a0) ## 00000221 /* 01880 809CFF60 E4840068 */ swc1 $f4, 0x0068($a0) ## 00000068 /* 01884 809CFF64 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 01888 809CFF68 E4860060 */ swc1 $f6, 0x0060($a0) ## 00000060 -/* 0188C 809CFF6C 8FA40018 */ lw $a0, 0x0018($sp) +/* 0188C 809CFF6C 8FA40018 */ lw $a0, 0x0018($sp) /* 01890 809CFF70 3C05809D */ lui $a1, %hi(func_809CFF98) ## $a1 = 809D0000 /* 01894 809CFF74 24A5FF98 */ addiu $a1, $a1, %lo(func_809CFF98) ## $a1 = 809CFF98 /* 01898 809CFF78 94990088 */ lhu $t9, 0x0088($a0) ## 00000088 /* 0189C 809CFF7C 3328FFFE */ andi $t0, $t9, 0xFFFE ## $t0 = 00000000 -/* 018A0 809CFF80 0C2739B8 */ jal func_809CE6E0 +/* 018A0 809CFF80 0C2739B8 */ jal func_809CE6E0 /* 018A4 809CFF84 A4880088 */ sh $t0, 0x0088($a0) ## 00000088 -/* 018A8 809CFF88 8FBF0014 */ lw $ra, 0x0014($sp) +/* 018A8 809CFF88 8FBF0014 */ lw $ra, 0x0014($sp) /* 018AC 809CFF8C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 018B0 809CFF90 03E00008 */ jr $ra +/* 018B0 809CFF90 03E00008 */ jr $ra /* 018B4 809CFF94 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bw/func_809D0D18.s b/asm/non_matchings/overlays/actors/ovl_En_Bw/func_809D0D18.s index e953ee069e..3d9f5395a5 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bw/func_809D0D18.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bw/func_809D0D18.s @@ -33,7 +33,7 @@ glabel func_809D0D18 /* 026B4 809D0D94 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 /* 026B8 809D0D98 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 /* 026BC 809D0D9C AFA20040 */ sw $v0, 0x0040($sp) -/* 026C0 809D0DA0 0C0253D0 */ jal Draw_TwoTexScroll +/* 026C0 809D0DA0 0C0253D0 */ jal Gfx_TwoTexScroll /* 026C4 809D0DA4 AFAB0020 */ sw $t3, 0x0020($sp) /* 026C8 809D0DA8 8FA30040 */ lw $v1, 0x0040($sp) /* 026CC 809D0DAC 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Bx/EnBx_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Bx/EnBx_Draw.s index a83cf8e439..5867fcc545 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Bx/EnBx_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Bx/EnBx_Draw.s @@ -1,33 +1,33 @@ glabel EnBx_Draw /* 0061C 809D20FC 27BDFF50 */ addiu $sp, $sp, 0xFF50 ## $sp = FFFFFF50 -/* 00620 809D2100 AFB2004C */ sw $s2, 0x004C($sp) +/* 00620 809D2100 AFB2004C */ sw $s2, 0x004C($sp) /* 00624 809D2104 00809025 */ or $s2, $a0, $zero ## $s2 = 00000000 -/* 00628 809D2108 AFBF0064 */ sw $ra, 0x0064($sp) -/* 0062C 809D210C AFB70060 */ sw $s7, 0x0060($sp) -/* 00630 809D2110 AFB6005C */ sw $s6, 0x005C($sp) -/* 00634 809D2114 AFB50058 */ sw $s5, 0x0058($sp) -/* 00638 809D2118 AFB40054 */ sw $s4, 0x0054($sp) -/* 0063C 809D211C AFB30050 */ sw $s3, 0x0050($sp) -/* 00640 809D2120 AFB10048 */ sw $s1, 0x0048($sp) -/* 00644 809D2124 AFB00044 */ sw $s0, 0x0044($sp) -/* 00648 809D2128 F7B60038 */ sdc1 $f22, 0x0038($sp) -/* 0064C 809D212C F7B40030 */ sdc1 $f20, 0x0030($sp) -/* 00650 809D2130 AFA500B4 */ sw $a1, 0x00B4($sp) +/* 00628 809D2108 AFBF0064 */ sw $ra, 0x0064($sp) +/* 0062C 809D210C AFB70060 */ sw $s7, 0x0060($sp) +/* 00630 809D2110 AFB6005C */ sw $s6, 0x005C($sp) +/* 00634 809D2114 AFB50058 */ sw $s5, 0x0058($sp) +/* 00638 809D2118 AFB40054 */ sw $s4, 0x0054($sp) +/* 0063C 809D211C AFB30050 */ sw $s3, 0x0050($sp) +/* 00640 809D2120 AFB10048 */ sw $s1, 0x0048($sp) +/* 00644 809D2124 AFB00044 */ sw $s0, 0x0044($sp) +/* 00648 809D2128 F7B60038 */ sdc1 $f22, 0x0038($sp) +/* 0064C 809D212C F7B40030 */ sdc1 $f20, 0x0030($sp) +/* 00650 809D2130 AFA500B4 */ sw $a1, 0x00B4($sp) /* 00654 809D2134 8CA40000 */ lw $a0, 0x0000($a1) ## 00000000 /* 00658 809D2138 0C031A73 */ jal Graph_Alloc - + /* 0065C 809D213C 24050100 */ addiu $a1, $zero, 0x0100 ## $a1 = 00000100 -/* 00660 809D2140 8FAF00B4 */ lw $t7, 0x00B4($sp) +/* 00660 809D2140 8FAF00B4 */ lw $t7, 0x00B4($sp) /* 00664 809D2144 3C06809D */ lui $a2, %hi(D_809D2570) ## $a2 = 809D0000 /* 00668 809D2148 0040B025 */ or $s6, $v0, $zero ## $s6 = 00000000 /* 0066C 809D214C 8DE50000 */ lw $a1, 0x0000($t7) ## 00000000 /* 00670 809D2150 24C62570 */ addiu $a2, $a2, %lo(D_809D2570) ## $a2 = 809D2570 /* 00674 809D2154 27A4008C */ addiu $a0, $sp, 0x008C ## $a0 = FFFFFFDC /* 00678 809D2158 240701D0 */ addiu $a3, $zero, 0x01D0 ## $a3 = 000001D0 -/* 0067C 809D215C 0C031AB1 */ jal func_800C6AC4 +/* 0067C 809D215C 0C031AB1 */ jal Graph_OpenDisps /* 00680 809D2160 00A0B825 */ or $s7, $a1, $zero ## $s7 = 00000000 -/* 00684 809D2164 8FB800B4 */ lw $t8, 0x00B4($sp) -/* 00688 809D2168 0C024F46 */ jal func_80093D18 +/* 00684 809D2164 8FB800B4 */ lw $t8, 0x00B4($sp) +/* 00688 809D2168 0C024F46 */ jal func_80093D18 /* 0068C 809D216C 8F040000 */ lw $a0, 0x0000($t8) ## 00000000 /* 00690 809D2170 8EE202C0 */ lw $v0, 0x02C0($s7) ## 000002C0 /* 00694 809D2174 3C08DB06 */ lui $t0, 0xDB06 ## $t0 = DB060000 @@ -46,23 +46,23 @@ glabel EnBx_Draw /* 006C8 809D21A8 3C04809D */ lui $a0, %hi(D_809D2560) ## $a0 = 809D0000 /* 006CC 809D21AC 3C088016 */ lui $t0, 0x8016 ## $t0 = 80160000 /* 006D0 809D21B0 316C007F */ andi $t4, $t3, 0x007F ## $t4 = 00000000 -/* 006D4 809D21B4 000C6880 */ sll $t5, $t4, 2 -/* 006D8 809D21B8 008D2021 */ addu $a0, $a0, $t5 -/* 006DC 809D21BC 8C842560 */ lw $a0, %lo(D_809D2560)($a0) +/* 006D4 809D21B4 000C6880 */ sll $t5, $t4, 2 +/* 006D8 809D21B8 008D2021 */ addu $a0, $a0, $t5 +/* 006DC 809D21BC 8C842560 */ lw $a0, %lo(D_809D2560)($a0) /* 006E0 809D21C0 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 /* 006E4 809D21C4 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF -/* 006E8 809D21C8 00047900 */ sll $t7, $a0, 4 -/* 006EC 809D21CC 000FC702 */ srl $t8, $t7, 28 -/* 006F0 809D21D0 0018C880 */ sll $t9, $t8, 2 -/* 006F4 809D21D4 01194021 */ addu $t0, $t0, $t9 +/* 006E8 809D21C8 00047900 */ sll $t7, $a0, 4 +/* 006EC 809D21CC 000FC702 */ srl $t8, $t7, 28 +/* 006F0 809D21D0 0018C880 */ sll $t9, $t8, 2 +/* 006F4 809D21D4 01194021 */ addu $t0, $t0, $t9 /* 006F8 809D21D8 8D086FA8 */ lw $t0, 0x6FA8($t0) ## 80166FA8 -/* 006FC 809D21DC 00817024 */ and $t6, $a0, $at +/* 006FC 809D21DC 00817024 */ and $t6, $a0, $at /* 00700 809D21E0 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 00704 809D21E4 01C84821 */ addu $t1, $t6, $t0 -/* 00708 809D21E8 01215021 */ addu $t2, $t1, $at +/* 00704 809D21E4 01C84821 */ addu $t1, $t6, $t0 +/* 00708 809D21E8 01215021 */ addu $t2, $t1, $at /* 0070C 809D21EC AC4A0004 */ sw $t2, 0x0004($v0) ## 00000004 /* 00710 809D21F0 8EE202C0 */ lw $v0, 0x02C0($s7) ## 000002C0 -/* 00714 809D21F4 8FA300B4 */ lw $v1, 0x00B4($sp) +/* 00714 809D21F4 8FA300B4 */ lw $v1, 0x00B4($sp) /* 00718 809D21F8 3C0CDB06 */ lui $t4, 0xDB06 ## $t4 = DB060000 /* 0071C 809D21FC 244B0008 */ addiu $t3, $v0, 0x0008 ## $t3 = 00000008 /* 00720 809D2200 AEEB02C0 */ sw $t3, 0x02C0($s7) ## 000002C0 @@ -73,26 +73,26 @@ glabel EnBx_Draw /* 00734 809D2214 24180001 */ addiu $t8, $zero, 0x0001 ## $t8 = 00000001 /* 00738 809D2218 240F0010 */ addiu $t7, $zero, 0x0010 ## $t7 = 00000010 /* 0073C 809D221C 240D0010 */ addiu $t5, $zero, 0x0010 ## $t5 = 00000010 -/* 00740 809D2220 AFAD0010 */ sw $t5, 0x0010($sp) -/* 00744 809D2224 AFAF0014 */ sw $t7, 0x0014($sp) -/* 00748 809D2228 AFB80018 */ sw $t8, 0x0018($sp) -/* 0074C 809D222C AFA0001C */ sw $zero, 0x001C($sp) -/* 00750 809D2230 0323C821 */ addu $t9, $t9, $v1 +/* 00740 809D2220 AFAD0010 */ sw $t5, 0x0010($sp) +/* 00744 809D2224 AFAF0014 */ sw $t7, 0x0014($sp) +/* 00748 809D2228 AFB80018 */ sw $t8, 0x0018($sp) +/* 0074C 809D222C AFA0001C */ sw $zero, 0x001C($sp) +/* 00750 809D2230 0323C821 */ addu $t9, $t9, $v1 /* 00754 809D2234 8F391DE4 */ lw $t9, 0x1DE4($t9) ## 00011DE4 /* 00758 809D2238 240A0020 */ addiu $t2, $zero, 0x0020 ## $t2 = 00000020 /* 0075C 809D223C 24090020 */ addiu $t1, $zero, 0x0020 ## $t1 = 00000020 -/* 00760 809D2240 00190823 */ subu $at, $zero, $t9 -/* 00764 809D2244 00017080 */ sll $t6, $at, 2 -/* 00768 809D2248 01C17021 */ addu $t6, $t6, $at -/* 0076C 809D224C 000E7040 */ sll $t6, $t6, 1 +/* 00760 809D2240 00190823 */ subu $at, $zero, $t9 +/* 00764 809D2244 00017080 */ sll $t6, $at, 2 +/* 00768 809D2248 01C17021 */ addu $t6, $t6, $at +/* 0076C 809D224C 000E7040 */ sll $t6, $t6, 1 /* 00770 809D2250 31C8007F */ andi $t0, $t6, 0x007F ## $t0 = 00000000 -/* 00774 809D2254 AFA80020 */ sw $t0, 0x0020($sp) -/* 00778 809D2258 AFA90024 */ sw $t1, 0x0024($sp) -/* 0077C 809D225C AFAA0028 */ sw $t2, 0x0028($sp) +/* 00774 809D2254 AFA80020 */ sw $t0, 0x0020($sp) +/* 00778 809D2258 AFA90024 */ sw $t1, 0x0024($sp) +/* 0077C 809D225C AFAA0028 */ sw $t2, 0x0028($sp) /* 00780 809D2260 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 00784 809D2264 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 /* 00788 809D2268 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 0078C 809D226C 0C0253D0 */ jal Draw_TwoTexScroll +/* 0078C 809D226C 0C0253D0 */ jal Gfx_TwoTexScroll /* 00790 809D2270 00408025 */ or $s0, $v0, $zero ## $s0 = 00000000 /* 00794 809D2274 AE020004 */ sw $v0, 0x0004($s0) ## 00000004 /* 00798 809D2278 8EE202C0 */ lw $v0, 0x02C0($s7) ## 000002C0 @@ -101,21 +101,21 @@ glabel EnBx_Draw /* 007A4 809D2284 244B0008 */ addiu $t3, $v0, 0x0008 ## $t3 = 00000008 /* 007A8 809D2288 AEEB02C0 */ sw $t3, 0x02C0($s7) ## 000002C0 /* 007AC 809D228C AC4C0000 */ sw $t4, 0x0000($v0) ## 00000000 -/* 007B0 809D2290 8FAD00B4 */ lw $t5, 0x00B4($sp) +/* 007B0 809D2290 8FAD00B4 */ lw $t5, 0x00B4($sp) /* 007B4 809D2294 3C05809D */ lui $a1, %hi(D_809D2580) ## $a1 = 809D0000 /* 007B8 809D2298 24A52580 */ addiu $a1, $a1, %lo(D_809D2580) ## $a1 = 809D2580 /* 007BC 809D229C 240601DE */ addiu $a2, $zero, 0x01DE ## $a2 = 000001DE /* 007C0 809D22A0 00408025 */ or $s0, $v0, $zero ## $s0 = 00000000 -/* 007C4 809D22A4 0C0346A2 */ jal Matrix_NewMtx +/* 007C4 809D22A4 0C0346A2 */ jal Matrix_NewMtx /* 007C8 809D22A8 8DA40000 */ lw $a0, 0x0000($t5) ## 00000000 /* 007CC 809D22AC AE020004 */ sw $v0, 0x0004($s0) ## 00000004 /* 007D0 809D22B0 864F001C */ lh $t7, 0x001C($s2) ## 0000001C /* 007D4 809D22B4 02402025 */ or $a0, $s2, $zero ## $a0 = 00000000 /* 007D8 809D22B8 31F80080 */ andi $t8, $t7, 0x0080 ## $t8 = 00000000 -/* 007DC 809D22BC 53000004 */ beql $t8, $zero, .L809D22D0 +/* 007DC 809D22BC 53000004 */ beql $t8, $zero, .L809D22D0 /* 007E0 809D22C0 8659014E */ lh $t9, 0x014E($s2) ## 0000014E -/* 007E4 809D22C4 0C274743 */ jal func_809D1D0C -/* 007E8 809D22C8 8FA500B4 */ lw $a1, 0x00B4($sp) +/* 007E4 809D22C4 0C274743 */ jal func_809D1D0C +/* 007E8 809D22C8 8FA500B4 */ lw $a1, 0x00B4($sp) /* 007EC 809D22CC 8659014E */ lh $t9, 0x014E($s2) ## 0000014E .L809D22D0: /* 007F0 809D22D0 272EF448 */ addiu $t6, $t9, 0xF448 ## $t6 = FFFFF448 @@ -124,78 +124,78 @@ glabel EnBx_Draw ## coss? /* 007FC 809D22DC 8644014E */ lh $a0, 0x014E($s2) ## 0000014E /* 00800 809D22E0 3C01809D */ lui $at, %hi(D_809D25B8) ## $at = 809D0000 -/* 00804 809D22E4 C43425B8 */ lwc1 $f20, %lo(D_809D25B8)($at) +/* 00804 809D22E4 C43425B8 */ lwc1 $f20, %lo(D_809D25B8)($at) /* 00808 809D22E8 3C01809D */ lui $at, %hi(D_809D25BC) ## $at = 809D0000 -/* 0080C 809D22EC C43625BC */ lwc1 $f22, %lo(D_809D25BC)($at) -/* 00810 809D22F0 46140102 */ mul.s $f4, $f0, $f20 +/* 0080C 809D22EC C43625BC */ lwc1 $f22, %lo(D_809D25BC)($at) +/* 00810 809D22F0 46140102 */ mul.s $f4, $f0, $f20 /* 00814 809D22F4 24110003 */ addiu $s1, $zero, 0x0003 ## $s1 = 00000003 /* 00818 809D22F8 24140006 */ addiu $s4, $zero, 0x0006 ## $s4 = 00000006 /* 0081C 809D22FC 2413000C */ addiu $s3, $zero, 0x000C ## $s3 = 0000000C -/* 00820 809D2300 46162080 */ add.s $f2, $f4, $f22 +/* 00820 809D2300 46162080 */ add.s $f2, $f4, $f22 /* 00824 809D2304 E6420050 */ swc1 $f2, 0x0050($s2) ## 00000050 /* 00828 809D2308 E6420058 */ swc1 $f2, 0x0058($s2) ## 00000058 .L809D230C: /* 0082C 809D230C 8648014E */ lh $t0, 0x014E($s2) ## 0000014E -/* 00830 809D2310 00115B40 */ sll $t3, $s1, 13 -/* 00834 809D2314 010B2021 */ addu $a0, $t0, $t3 -/* 00838 809D2318 00042400 */ sll $a0, $a0, 16 +/* 00830 809D2310 00115B40 */ sll $t3, $s1, 13 +/* 00834 809D2314 010B2021 */ addu $a0, $t0, $t3 +/* 00838 809D2318 00042400 */ sll $a0, $a0, 16 /* 0083C 809D231C 0C01DE0D */ jal Math_Coss ## coss? -/* 00840 809D2320 00042403 */ sra $a0, $a0, 16 -/* 00844 809D2324 02330019 */ multu $s1, $s3 -/* 00848 809D2328 46140182 */ mul.s $f6, $f0, $f20 -/* 0084C 809D232C 46163080 */ add.s $f2, $f6, $f22 -/* 00850 809D2330 00006012 */ mflo $t4 -/* 00854 809D2334 024C8021 */ addu $s0, $s2, $t4 +/* 00840 809D2320 00042403 */ sra $a0, $a0, 16 +/* 00844 809D2324 02330019 */ multu $s1, $s3 +/* 00848 809D2328 46140182 */ mul.s $f6, $f0, $f20 +/* 0084C 809D232C 46163080 */ add.s $f2, $f6, $f22 +/* 00850 809D2330 00006012 */ mflo $t4 +/* 00854 809D2334 024C8021 */ addu $s0, $s2, $t4 /* 00858 809D2338 E6020184 */ swc1 $f2, 0x0184($s0) ## 00000184 -/* 0085C 809D233C 02340019 */ multu $s1, $s4 +/* 0085C 809D233C 02340019 */ multu $s1, $s4 /* 00860 809D2340 E602018C */ swc1 $f2, 0x018C($s0) ## 0000018C /* 00864 809D2344 864F00B4 */ lh $t7, 0x00B4($s2) ## 000000B4 /* 00868 809D2348 2631FFFF */ addiu $s1, $s1, 0xFFFF ## $s1 = 00000002 -/* 0086C 809D234C 00118C00 */ sll $s1, $s1, 16 -/* 00870 809D2350 00118C03 */ sra $s1, $s1, 16 -/* 00874 809D2354 00006812 */ mflo $t5 -/* 00878 809D2358 024D1021 */ addu $v0, $s2, $t5 +/* 0086C 809D234C 00118C00 */ sll $s1, $s1, 16 +/* 00870 809D2350 00118C03 */ sra $s1, $s1, 16 +/* 00874 809D2354 00006812 */ mflo $t5 +/* 00878 809D2358 024D1021 */ addu $v0, $s2, $t5 /* 0087C 809D235C A44F01B4 */ sh $t7, 0x01B4($v0) ## 000001B4 /* 00880 809D2360 865800B6 */ lh $t8, 0x00B6($s2) ## 000000B6 /* 00884 809D2364 A45801B6 */ sh $t8, 0x01B6($v0) ## 000001B6 /* 00888 809D2368 865900B8 */ lh $t9, 0x00B8($s2) ## 000000B8 -/* 0088C 809D236C 0621FFE7 */ bgez $s1, .L809D230C +/* 0088C 809D236C 0621FFE7 */ bgez $s1, .L809D230C /* 00890 809D2370 A45901B8 */ sh $t9, 0x01B8($v0) ## 000001B8 /* 00894 809D2374 3C15809D */ lui $s5, %hi(D_809D2590) ## $s5 = 809D0000 /* 00898 809D2378 26B52590 */ addiu $s5, $s5, %lo(D_809D2590) ## $s5 = 809D2590 /* 0089C 809D237C 00008825 */ or $s1, $zero, $zero ## $s1 = 00000000 .L809D2380: -/* 008A0 809D2380 02330019 */ multu $s1, $s3 +/* 008A0 809D2380 02330019 */ multu $s1, $s3 /* 008A4 809D2384 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 008A8 809D2388 00007012 */ mflo $t6 -/* 008AC 809D238C 024E8021 */ addu $s0, $s2, $t6 +/* 008A8 809D2388 00007012 */ mflo $t6 +/* 008AC 809D238C 024E8021 */ addu $s0, $s2, $t6 /* 008B0 809D2390 C60C0154 */ lwc1 $f12, 0x0154($s0) ## 00000154 /* 008B4 809D2394 C60E0158 */ lwc1 $f14, 0x0158($s0) ## 00000158 -/* 008B8 809D2398 0C034261 */ jal Matrix_Translate +/* 008B8 809D2398 0C034261 */ jal Matrix_Translate /* 008BC 809D239C 8E06015C */ lw $a2, 0x015C($s0) ## 0000015C -/* 008C0 809D23A0 02340019 */ multu $s1, $s4 +/* 008C0 809D23A0 02340019 */ multu $s1, $s4 /* 008C4 809D23A4 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 008C8 809D23A8 00004812 */ mflo $t1 -/* 008CC 809D23AC 02491021 */ addu $v0, $s2, $t1 +/* 008C8 809D23A8 00004812 */ mflo $t1 +/* 008CC 809D23AC 02491021 */ addu $v0, $s2, $t1 /* 008D0 809D23B0 844401B4 */ lh $a0, 0x01B4($v0) ## 000001B4 /* 008D4 809D23B4 844501B6 */ lh $a1, 0x01B6($v0) ## 000001B6 -/* 008D8 809D23B8 0C034421 */ jal Matrix_RotateXYZ +/* 008D8 809D23B8 0C034421 */ jal Matrix_RotateZYX /* 008DC 809D23BC 844601B8 */ lh $a2, 0x01B8($v0) ## 000001B8 /* 008E0 809D23C0 C60C0184 */ lwc1 $f12, 0x0184($s0) ## 00000184 /* 008E4 809D23C4 C60E0188 */ lwc1 $f14, 0x0188($s0) ## 00000188 /* 008E8 809D23C8 8E06018C */ lw $a2, 0x018C($s0) ## 0000018C -/* 008EC 809D23CC 0C0342A3 */ jal Matrix_Scale +/* 008EC 809D23CC 0C0342A3 */ jal Matrix_Scale /* 008F0 809D23D0 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 /* 008F4 809D23D4 02C02025 */ or $a0, $s6, $zero ## $a0 = 00000000 /* 008F8 809D23D8 02A02825 */ or $a1, $s5, $zero ## $a1 = 809D2590 -/* 008FC 809D23DC 0C034695 */ jal Matrix_ToMtx +/* 008FC 809D23DC 0C034695 */ jal Matrix_ToMtx /* 00900 809D23E0 240601FB */ addiu $a2, $zero, 0x01FB ## $a2 = 000001FB /* 00904 809D23E4 26310001 */ addiu $s1, $s1, 0x0001 ## $s1 = 00000001 -/* 00908 809D23E8 00118C00 */ sll $s1, $s1, 16 -/* 0090C 809D23EC 00118C03 */ sra $s1, $s1, 16 -/* 00910 809D23F0 2A210004 */ slti $at, $s1, 0x0004 -/* 00914 809D23F4 1420FFE2 */ bne $at, $zero, .L809D2380 +/* 00908 809D23E8 00118C00 */ sll $s1, $s1, 16 +/* 0090C 809D23EC 00118C03 */ sra $s1, $s1, 16 +/* 00910 809D23F0 2A210004 */ slti $at, $s1, 0x0004 +/* 00914 809D23F4 1420FFE2 */ bne $at, $zero, .L809D2380 /* 00918 809D23F8 26D60040 */ addiu $s6, $s6, 0x0040 ## $s6 = 00000040 /* 0091C 809D23FC 8EE202C0 */ lw $v0, 0x02C0($s7) ## 000002C0 /* 00920 809D2400 3C0B0600 */ lui $t3, 0x0600 ## $t3 = 06000000 @@ -205,25 +205,25 @@ glabel EnBx_Draw /* 00930 809D2410 3C08DE00 */ lui $t0, 0xDE00 ## $t0 = DE000000 /* 00934 809D2414 AC480000 */ sw $t0, 0x0000($v0) ## 00000000 /* 00938 809D2418 AC4B0004 */ sw $t3, 0x0004($v0) ## 00000004 -/* 0093C 809D241C 8FAC00B4 */ lw $t4, 0x00B4($sp) +/* 0093C 809D241C 8FAC00B4 */ lw $t4, 0x00B4($sp) /* 00940 809D2420 3C06809D */ lui $a2, %hi(D_809D25A0) ## $a2 = 809D0000 /* 00944 809D2424 24C625A0 */ addiu $a2, $a2, %lo(D_809D25A0) ## $a2 = 809D25A0 /* 00948 809D2428 27A4008C */ addiu $a0, $sp, 0x008C ## $a0 = FFFFFFDC /* 0094C 809D242C 240701FF */ addiu $a3, $zero, 0x01FF ## $a3 = 000001FF -/* 00950 809D2430 0C031AD5 */ jal func_800C6B54 +/* 00950 809D2430 0C031AD5 */ jal Graph_CloseDisps /* 00954 809D2434 8D850000 */ lw $a1, 0x0000($t4) ## 00000000 -/* 00958 809D2438 8FBF0064 */ lw $ra, 0x0064($sp) -/* 0095C 809D243C D7B40030 */ ldc1 $f20, 0x0030($sp) -/* 00960 809D2440 D7B60038 */ ldc1 $f22, 0x0038($sp) -/* 00964 809D2444 8FB00044 */ lw $s0, 0x0044($sp) -/* 00968 809D2448 8FB10048 */ lw $s1, 0x0048($sp) -/* 0096C 809D244C 8FB2004C */ lw $s2, 0x004C($sp) -/* 00970 809D2450 8FB30050 */ lw $s3, 0x0050($sp) -/* 00974 809D2454 8FB40054 */ lw $s4, 0x0054($sp) -/* 00978 809D2458 8FB50058 */ lw $s5, 0x0058($sp) -/* 0097C 809D245C 8FB6005C */ lw $s6, 0x005C($sp) -/* 00980 809D2460 8FB70060 */ lw $s7, 0x0060($sp) -/* 00984 809D2464 03E00008 */ jr $ra +/* 00958 809D2438 8FBF0064 */ lw $ra, 0x0064($sp) +/* 0095C 809D243C D7B40030 */ ldc1 $f20, 0x0030($sp) +/* 00960 809D2440 D7B60038 */ ldc1 $f22, 0x0038($sp) +/* 00964 809D2444 8FB00044 */ lw $s0, 0x0044($sp) +/* 00968 809D2448 8FB10048 */ lw $s1, 0x0048($sp) +/* 0096C 809D244C 8FB2004C */ lw $s2, 0x004C($sp) +/* 00970 809D2450 8FB30050 */ lw $s3, 0x0050($sp) +/* 00974 809D2454 8FB40054 */ lw $s4, 0x0054($sp) +/* 00978 809D2458 8FB50058 */ lw $s5, 0x0058($sp) +/* 0097C 809D245C 8FB6005C */ lw $s6, 0x005C($sp) +/* 00980 809D2460 8FB70060 */ lw $s7, 0x0060($sp) +/* 00984 809D2464 03E00008 */ jr $ra /* 00988 809D2468 27BD00B0 */ addiu $sp, $sp, 0x00B0 ## $sp = 00000000 /* 0098C 809D246C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Clear_Tag/EnClearTag_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Clear_Tag/EnClearTag_Draw.s index 515a94e800..cf177e111a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Clear_Tag/EnClearTag_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Clear_Tag/EnClearTag_Draw.s @@ -10,7 +10,7 @@ glabel EnClearTag_Draw /* 01470 809D4A20 24C6BFC0 */ addiu $a2, $a2, %lo(D_809DBFC0) ## $a2 = 809DBFC0 /* 01474 809D4A24 27A40084 */ addiu $a0, $sp, 0x0084 ## $a0 = FFFFFFE4 /* 01478 809D4A28 240703D7 */ addiu $a3, $zero, 0x03D7 ## $a3 = 000003D7 -/* 0147C 809D4A2C 0C031AB1 */ jal func_800C6AC4 +/* 0147C 809D4A2C 0C031AB1 */ jal Graph_OpenDisps /* 01480 809D4A30 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 /* 01484 809D4A34 9224014D */ lbu $a0, 0x014D($s1) ## 0000014D /* 01488 809D4A38 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 @@ -387,7 +387,7 @@ glabel EnClearTag_Draw /* 01A2C 809D4FDC 24C6C038 */ addiu $a2, $a2, %lo(D_809DC038) ## $a2 = 809DC038 /* 01A30 809D4FE0 27A40084 */ addiu $a0, $sp, 0x0084 ## $a0 = FFFFFFE4 /* 01A34 809D4FE4 2407045F */ addiu $a3, $zero, 0x045F ## $a3 = 0000045F -/* 01A38 809D4FE8 0C031AD5 */ jal func_800C6B54 +/* 01A38 809D4FE8 0C031AD5 */ jal Graph_CloseDisps /* 01A3C 809D4FEC 8DC50000 */ lw $a1, 0x0000($t6) ## 00000000 /* 01A40 809D4FF0 8FBF001C */ lw $ra, 0x001C($sp) /* 01A44 809D4FF4 8FB00014 */ lw $s0, 0x0014($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Clear_Tag/EnClearTag_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Clear_Tag/EnClearTag_Update.s index 207df15e69..9ff80e744e 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Clear_Tag/EnClearTag_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Clear_Tag/EnClearTag_Update.s @@ -315,7 +315,7 @@ glabel EnClearTag_Update .L809D409C: /* 00AEC 809D409C C7AC00B0 */ lwc1 $f12, 0x00B0($sp) /* 00AF0 809D40A0 E7A2003C */ swc1 $f2, 0x003C($sp) -/* 00AF4 809D40A4 0C03F494 */ jal func_800FD250 +/* 00AF4 809D40A4 0C03F494 */ jal Math_atan2f /* 00AF8 809D40A8 E7B00038 */ swc1 $f16, 0x0038($sp) /* 00AFC 809D40AC 3C01809E */ lui $at, %hi(D_809DC0F0) ## $at = 809E0000 /* 00B00 809D40B0 C432C0F0 */ lwc1 $f18, %lo(D_809DC0F0)($at) @@ -329,7 +329,7 @@ glabel EnClearTag_Update /* 00B20 809D40D0 44103000 */ mfc1 $s0, $f6 /* 00B24 809D40D4 00000000 */ nop /* 00B28 809D40D8 00108400 */ sll $s0, $s0, 16 -/* 00B2C 809D40DC 0C03F494 */ jal func_800FD250 +/* 00B2C 809D40DC 0C03F494 */ jal Math_atan2f /* 00B30 809D40E0 00108403 */ sra $s0, $s0, 16 /* 00B34 809D40E4 3C01809E */ lui $at, %hi(D_809DC0F4) ## $at = 809E0000 /* 00B38 809D40E8 C428C0F4 */ lwc1 $f8, %lo(D_809DC0F4)($at) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Clear_Tag/func_809D3B80.s b/asm/non_matchings/overlays/actors/ovl_En_Clear_Tag/func_809D3B80.s index 32da0075c9..fa0ae54944 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Clear_Tag/func_809D3B80.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Clear_Tag/func_809D3B80.s @@ -26,7 +26,7 @@ glabel func_809D3B80 /* 00630 809D3BE0 E7B00018 */ swc1 $f16, 0x0018($sp) /* 00634 809D3BE4 46000207 */ neg.s $f8, $f0 /* 00638 809D3BE8 46104302 */ mul.s $f12, $f8, $f16 -/* 0063C 809D3BEC 0C03F494 */ jal func_800FD250 +/* 0063C 809D3BEC 0C03F494 */ jal Math_atan2f /* 00640 809D3BF0 00000000 */ nop /* 00644 809D3BF4 8FA80020 */ lw $t0, 0x0020($sp) /* 00648 809D3BF8 46000287 */ neg.s $f10, $f0 @@ -37,7 +37,7 @@ glabel func_809D3B80 /* 0065C 809D3C0C 44817000 */ mtc1 $at, $f14 ## $f14 = 1.00 /* 00660 809D3C10 46009107 */ neg.s $f4, $f18 /* 00664 809D3C14 46102302 */ mul.s $f12, $f4, $f16 -/* 00668 809D3C18 0C03F494 */ jal func_800FD250 +/* 00668 809D3C18 0C03F494 */ jal Math_atan2f /* 0066C 809D3C1C 00000000 */ nop /* 00670 809D3C20 8FA90020 */ lw $t1, 0x0020($sp) /* 00674 809D3C24 E5200190 */ swc1 $f0, 0x0190($t1) ## 00000190 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Clear_Tag/func_809D53CC.s b/asm/non_matchings/overlays/actors/ovl_En_Clear_Tag/func_809D53CC.s index 10a57265fa..ea154ffa2e 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Clear_Tag/func_809D53CC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Clear_Tag/func_809D53CC.s @@ -23,7 +23,7 @@ glabel func_809D53CC /* 01E70 809D5420 27A400E8 */ addiu $a0, $sp, 0x00E8 ## $a0 = FFFFFFD8 /* 01E74 809D5424 24070508 */ addiu $a3, $zero, 0x0508 ## $a3 = 00000508 /* 01E78 809D5428 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 01E7C 809D542C 0C031AB1 */ jal func_800C6AC4 +/* 01E7C 809D542C 0C031AB1 */ jal Graph_OpenDisps /* 01E80 809D5430 AFB100FC */ sw $s1, 0x00FC($sp) /* 01E84 809D5434 0C024F46 */ jal func_80093D18 /* 01E88 809D5438 8EE40000 */ lw $a0, 0x0000($s7) ## 00000000 @@ -281,7 +281,7 @@ glabel func_809D53CC /* 02258 809D5808 AFA80024 */ sw $t0, 0x0024($sp) /* 0225C 809D580C AFA00020 */ sw $zero, 0x0020($sp) /* 02260 809D5810 AFA0001C */ sw $zero, 0x001C($sp) -/* 02264 809D5814 0C0253D0 */ jal Draw_TwoTexScroll +/* 02264 809D5814 0C0253D0 */ jal Gfx_TwoTexScroll /* 02268 809D5818 AFA200B4 */ sw $v0, 0x00B4($sp) /* 0226C 809D581C 8FA300B4 */ lw $v1, 0x00B4($sp) /* 02270 809D5820 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 @@ -397,7 +397,7 @@ glabel func_809D53CC /* 0241C 809D59CC AFAC0018 */ sw $t4, 0x0018($sp) /* 02420 809D59D0 AFA80014 */ sw $t0, 0x0014($sp) /* 02424 809D59D4 AFB80010 */ sw $t8, 0x0010($sp) -/* 02428 809D59D8 0C0253D0 */ jal Draw_TwoTexScroll +/* 02428 809D59D8 0C0253D0 */ jal Gfx_TwoTexScroll /* 0242C 809D59DC AFA2009C */ sw $v0, 0x009C($sp) /* 02430 809D59E0 8FA3009C */ lw $v1, 0x009C($sp) /* 02434 809D59E4 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 @@ -524,7 +524,7 @@ glabel func_809D53CC /* 02608 809D5BB8 24C6C0C4 */ addiu $a2, $a2, %lo(D_809DC0C4) ## $a2 = 809DC0C4 /* 0260C 809D5BBC 27A400E8 */ addiu $a0, $sp, 0x00E8 ## $a0 = FFFFFFD8 /* 02610 809D5BC0 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 02614 809D5BC4 0C031AD5 */ jal func_800C6B54 +/* 02614 809D5BC4 0C031AD5 */ jal Graph_CloseDisps /* 02618 809D5BC8 240705C5 */ addiu $a3, $zero, 0x05C5 ## $a3 = 000005C5 /* 0261C 809D5BCC 8FBF006C */ lw $ra, 0x006C($sp) /* 02620 809D5BD0 D7B40038 */ ldc1 $f20, 0x0038($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Cow/EnCow_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Cow/EnCow_Draw.s index adf918f7ee..ef97dc040a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Cow/EnCow_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Cow/EnCow_Draw.s @@ -1,11 +1,11 @@ glabel EnCow_Draw /* 01214 809E0014 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 01218 809E0018 AFBF0024 */ sw $ra, 0x0024($sp) -/* 0121C 809E001C AFA40028 */ sw $a0, 0x0028($sp) -/* 01220 809E0020 AFA5002C */ sw $a1, 0x002C($sp) -/* 01224 809E0024 0C0250F2 */ jal func_800943C8 +/* 01218 809E0018 AFBF0024 */ sw $ra, 0x0024($sp) +/* 0121C 809E001C AFA40028 */ sw $a0, 0x0028($sp) +/* 01220 809E0020 AFA5002C */ sw $a1, 0x002C($sp) +/* 01224 809E0024 0C0250F2 */ jal func_800943C8 /* 01228 809E0028 8CA40000 */ lw $a0, 0x0000($a1) ## 00000000 -/* 0122C 809E002C 8FA20028 */ lw $v0, 0x0028($sp) +/* 0122C 809E002C 8FA20028 */ lw $v0, 0x0028($sp) /* 01230 809E0030 3C0F809E */ lui $t7, %hi(func_809DFF84) ## $t7 = 809E0000 /* 01234 809E0034 3C18809E */ lui $t8, %hi(func_809DFFD4) ## $t8 = 809E0000 /* 01238 809E0038 8C4501E8 */ lw $a1, 0x01E8($v0) ## 000001E8 @@ -13,14 +13,14 @@ glabel EnCow_Draw /* 01240 809E0040 904701E6 */ lbu $a3, 0x01E6($v0) ## 000001E6 /* 01244 809E0044 2718FFD4 */ addiu $t8, $t8, %lo(func_809DFFD4) ## $t8 = 809DFFD4 /* 01248 809E0048 25EFFF84 */ addiu $t7, $t7, %lo(func_809DFF84) ## $t7 = 809DFF84 -/* 0124C 809E004C AFAF0010 */ sw $t7, 0x0010($sp) -/* 01250 809E0050 AFB80014 */ sw $t8, 0x0014($sp) -/* 01254 809E0054 8FA4002C */ lw $a0, 0x002C($sp) -/* 01258 809E0058 0C0286B2 */ jal func_800A1AC8 -/* 0125C 809E005C AFA20018 */ sw $v0, 0x0018($sp) -/* 01260 809E0060 8FBF0024 */ lw $ra, 0x0024($sp) +/* 0124C 809E004C AFAF0010 */ sw $t7, 0x0010($sp) +/* 01250 809E0050 AFB80014 */ sw $t8, 0x0014($sp) +/* 01254 809E0054 8FA4002C */ lw $a0, 0x002C($sp) +/* 01258 809E0058 0C0286B2 */ jal SkelAnime_DrawSV +/* 0125C 809E005C AFA20018 */ sw $v0, 0x0018($sp) +/* 01260 809E0060 8FBF0024 */ lw $ra, 0x0024($sp) /* 01264 809E0064 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 01268 809E0068 03E00008 */ jr $ra +/* 01268 809E0068 03E00008 */ jr $ra /* 0126C 809E006C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Cow/EnCow_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Cow/EnCow_Init.s index 5ce00241f0..0cfe94afeb 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Cow/EnCow_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Cow/EnCow_Init.s @@ -1,67 +1,67 @@ glabel EnCow_Init /* 00214 809DF014 27BDFFB0 */ addiu $sp, $sp, 0xFFB0 ## $sp = FFFFFFB0 -/* 00218 809DF018 AFB10038 */ sw $s1, 0x0038($sp) -/* 0021C 809DF01C AFB00034 */ sw $s0, 0x0034($sp) +/* 00218 809DF018 AFB10038 */ sw $s1, 0x0038($sp) +/* 0021C 809DF01C AFB00034 */ sw $s0, 0x0034($sp) /* 00220 809DF020 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 00224 809DF024 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 -/* 00228 809DF028 AFBF003C */ sw $ra, 0x003C($sp) +/* 00228 809DF028 AFBF003C */ sw $ra, 0x003C($sp) /* 0022C 809DF02C 3C068003 */ lui $a2, 0x8003 ## $a2 = 80030000 /* 00230 809DF030 24C6B5EC */ addiu $a2, $a2, 0xB5EC ## $a2 = 8002B5EC /* 00234 809DF034 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 /* 00238 809DF038 248400B4 */ addiu $a0, $a0, 0x00B4 ## $a0 = 000000B4 /* 0023C 809DF03C 0C00AC78 */ jal ActorShape_Init - + /* 00240 809DF040 3C074290 */ lui $a3, 0x4290 ## $a3 = 42900000 /* 00244 809DF044 8602001C */ lh $v0, 0x001C($s0) ## 0000001C /* 00248 809DF048 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 0024C 809DF04C 260501E4 */ addiu $a1, $s0, 0x01E4 ## $a1 = 000001E4 -/* 00250 809DF050 10400006 */ beq $v0, $zero, .L809DF06C +/* 00250 809DF050 10400006 */ beq $v0, $zero, .L809DF06C /* 00254 809DF054 3C060600 */ lui $a2, 0x0600 ## $a2 = 06000000 /* 00258 809DF058 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 0025C 809DF05C 1041007F */ beq $v0, $at, .L809DF25C +/* 0025C 809DF05C 1041007F */ beq $v0, $at, .L809DF25C /* 00260 809DF060 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 00264 809DF064 100000EE */ beq $zero, $zero, .L809DF420 +/* 00264 809DF064 100000EE */ beq $zero, $zero, .L809DF420 /* 00268 809DF068 240B00FF */ addiu $t3, $zero, 0x00FF ## $t3 = 000000FF .L809DF06C: /* 0026C 809DF06C 260E0228 */ addiu $t6, $s0, 0x0228 ## $t6 = 00000228 /* 00270 809DF070 260F024C */ addiu $t7, $s0, 0x024C ## $t7 = 0000024C /* 00274 809DF074 24180006 */ addiu $t8, $zero, 0x0006 ## $t8 = 00000006 -/* 00278 809DF078 AFB80018 */ sw $t8, 0x0018($sp) -/* 0027C 809DF07C AFAF0014 */ sw $t7, 0x0014($sp) -/* 00280 809DF080 AFAE0010 */ sw $t6, 0x0010($sp) +/* 00278 809DF078 AFB80018 */ sw $t8, 0x0018($sp) +/* 0027C 809DF07C AFAF0014 */ sw $t7, 0x0014($sp) +/* 00280 809DF080 AFAE0010 */ sw $t6, 0x0010($sp) /* 00284 809DF084 24C64010 */ addiu $a2, $a2, 0x4010 ## $a2 = 06004010 /* 00288 809DF088 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 0028C 809DF08C 0C0291BE */ jal func_800A46F8 -/* 00290 809DF090 AFA50040 */ sw $a1, 0x0040($sp) +/* 0028C 809DF08C 0C0291BE */ jal SkelAnime_InitSV +/* 00290 809DF090 AFA50040 */ sw $a1, 0x0040($sp) /* 00294 809DF094 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 00298 809DF098 24A501CC */ addiu $a1, $a1, 0x01CC ## $a1 = 060001CC -/* 0029C 809DF09C 0C0294BE */ jal func_800A52F8 -/* 002A0 809DF0A0 8FA40040 */ lw $a0, 0x0040($sp) +/* 0029C 809DF09C 0C0294BE */ jal SkelAnime_ChangeAnimDefaultRepeat +/* 002A0 809DF0A0 8FA40040 */ lw $a0, 0x0040($sp) /* 002A4 809DF0A4 2605014C */ addiu $a1, $s0, 0x014C ## $a1 = 0000014C -/* 002A8 809DF0A8 AFA50040 */ sw $a1, 0x0040($sp) +/* 002A8 809DF0A8 AFA50040 */ sw $a1, 0x0040($sp) /* 002AC 809DF0AC 0C0170D9 */ jal ActorCollider_AllocCylinder - + /* 002B0 809DF0B0 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 002B4 809DF0B4 3C07809E */ lui $a3, %hi(D_809E00E0) ## $a3 = 809E0000 -/* 002B8 809DF0B8 8FA50040 */ lw $a1, 0x0040($sp) +/* 002B8 809DF0B8 8FA50040 */ lw $a1, 0x0040($sp) /* 002BC 809DF0BC 24E700E0 */ addiu $a3, $a3, %lo(D_809E00E0) ## $a3 = 809E00E0 /* 002C0 809DF0C0 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 002C4 809DF0C4 0C01712B */ jal ActorCollider_InitCylinder - + /* 002C8 809DF0C8 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 002CC 809DF0CC 26050198 */ addiu $a1, $s0, 0x0198 ## $a1 = 00000198 -/* 002D0 809DF0D0 AFA50040 */ sw $a1, 0x0040($sp) +/* 002D0 809DF0D0 AFA50040 */ sw $a1, 0x0040($sp) /* 002D4 809DF0D4 0C0170D9 */ jal ActorCollider_AllocCylinder - + /* 002D8 809DF0D8 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 002DC 809DF0DC 3C07809E */ lui $a3, %hi(D_809E00E0) ## $a3 = 809E0000 -/* 002E0 809DF0E0 8FA50040 */ lw $a1, 0x0040($sp) +/* 002E0 809DF0E0 8FA50040 */ lw $a1, 0x0040($sp) /* 002E4 809DF0E4 24E700E0 */ addiu $a3, $a3, %lo(D_809E00E0) ## $a3 = 809E00E0 /* 002E8 809DF0E8 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 002EC 809DF0EC 0C01712B */ jal ActorCollider_InitCylinder - + /* 002F0 809DF0F0 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 -/* 002F4 809DF0F4 0C277BA7 */ jal func_809DEE9C +/* 002F4 809DF0F4 0C277BA7 */ jal func_809DEE9C /* 002F8 809DF0F8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 002FC 809DF0FC 3C19809E */ lui $t9, %hi(func_809DF96C) ## $t9 = 809E0000 /* 00300 809DF100 2739F96C */ addiu $t9, $t9, %lo(func_809DF96C) ## $t9 = 809DF96C @@ -69,89 +69,89 @@ glabel EnCow_Init /* 00308 809DF108 862800A4 */ lh $t0, 0x00A4($s1) ## 000000A4 /* 0030C 809DF10C 24010034 */ addiu $at, $zero, 0x0034 ## $at = 00000034 /* 00310 809DF110 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 00314 809DF114 15010010 */ bne $t0, $at, .L809DF158 +/* 00314 809DF114 15010010 */ bne $t0, $at, .L809DF158 /* 00318 809DF118 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 /* 0031C 809DF11C 8C490004 */ lw $t1, 0x0004($v0) ## 8015E664 -/* 00320 809DF120 51200006 */ beql $t1, $zero, .L809DF13C +/* 00320 809DF120 51200006 */ beql $t1, $zero, .L809DF13C /* 00324 809DF124 944A0ED6 */ lhu $t2, 0x0ED6($v0) ## 8015F536 /* 00328 809DF128 0C00B55C */ jal Actor_Kill - + /* 0032C 809DF12C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00330 809DF130 100000C2 */ beq $zero, $zero, .L809DF43C -/* 00334 809DF134 8FBF003C */ lw $ra, 0x003C($sp) +/* 00330 809DF130 100000C2 */ beq $zero, $zero, .L809DF43C +/* 00334 809DF134 8FBF003C */ lw $ra, 0x003C($sp) /* 00338 809DF138 944A0ED6 */ lhu $t2, 0x0ED6($v0) ## 00000ED6 .L809DF13C: /* 0033C 809DF13C 314B4000 */ andi $t3, $t2, 0x4000 ## $t3 = 00000000 -/* 00340 809DF140 55600006 */ bnel $t3, $zero, .L809DF15C +/* 00340 809DF140 55600006 */ bnel $t3, $zero, .L809DF15C /* 00344 809DF144 C6040024 */ lwc1 $f4, 0x0024($s0) ## 00000024 /* 00348 809DF148 0C00B55C */ jal Actor_Kill - + /* 0034C 809DF14C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00350 809DF150 100000BA */ beq $zero, $zero, .L809DF43C -/* 00354 809DF154 8FBF003C */ lw $ra, 0x003C($sp) +/* 00350 809DF150 100000BA */ beq $zero, $zero, .L809DF43C +/* 00354 809DF154 8FBF003C */ lw $ra, 0x003C($sp) .L809DF158: /* 00358 809DF158 C6040024 */ lwc1 $f4, 0x0024($s0) ## 00000024 .L809DF15C: /* 0035C 809DF15C 240D0001 */ addiu $t5, $zero, 0x0001 ## $t5 = 00000001 /* 00360 809DF160 26241C24 */ addiu $a0, $s1, 0x1C24 ## $a0 = 00001C24 -/* 00364 809DF164 E7A40010 */ swc1 $f4, 0x0010($sp) +/* 00364 809DF164 E7A40010 */ swc1 $f4, 0x0010($sp) /* 00368 809DF168 C6060028 */ lwc1 $f6, 0x0028($s0) ## 00000028 /* 0036C 809DF16C 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 00370 809DF170 02203025 */ or $a2, $s1, $zero ## $a2 = 00000000 -/* 00374 809DF174 E7A60014 */ swc1 $f6, 0x0014($sp) +/* 00374 809DF174 E7A60014 */ swc1 $f6, 0x0014($sp) /* 00378 809DF178 C608002C */ lwc1 $f8, 0x002C($s0) ## 0000002C -/* 0037C 809DF17C AFA0001C */ sw $zero, 0x001C($sp) +/* 0037C 809DF17C AFA0001C */ sw $zero, 0x001C($sp) /* 00380 809DF180 240701C6 */ addiu $a3, $zero, 0x01C6 ## $a3 = 000001C6 -/* 00384 809DF184 E7A80018 */ swc1 $f8, 0x0018($sp) +/* 00384 809DF184 E7A80018 */ swc1 $f8, 0x0018($sp) /* 00388 809DF188 860C00B6 */ lh $t4, 0x00B6($s0) ## 000000B6 -/* 0038C 809DF18C AFAD0028 */ sw $t5, 0x0028($sp) -/* 00390 809DF190 AFA00024 */ sw $zero, 0x0024($sp) +/* 0038C 809DF18C AFAD0028 */ sw $t5, 0x0028($sp) +/* 00390 809DF190 AFA00024 */ sw $zero, 0x0024($sp) /* 00394 809DF194 0C00C916 */ jal Actor_SpawnAttached - -/* 00398 809DF198 AFAC0020 */ sw $t4, 0x0020($sp) + +/* 00398 809DF198 AFAC0020 */ sw $t4, 0x0020($sp) /* 0039C 809DF19C 3C01447A */ lui $at, 0x447A ## $at = 447A0000 /* 003A0 809DF1A0 44816000 */ mtc1 $at, $f12 ## $f12 = 1000.00 /* 003A4 809DF1A4 0C00CFBE */ jal Math_Rand_ZeroFloat - + /* 003A8 809DF1A8 00000000 */ nop /* 003AC 809DF1AC 3C014220 */ lui $at, 0x4220 ## $at = 42200000 /* 003B0 809DF1B0 44815000 */ mtc1 $at, $f10 ## $f10 = 40.00 /* 003B4 809DF1B4 240F0001 */ addiu $t7, $zero, 0x0001 ## $t7 = 00000001 /* 003B8 809DF1B8 3C014F00 */ lui $at, 0x4F00 ## $at = 4F000000 -/* 003BC 809DF1BC 460A0400 */ add.s $f16, $f0, $f10 +/* 003BC 809DF1BC 460A0400 */ add.s $f16, $f0, $f10 /* 003C0 809DF1C0 24180006 */ addiu $t8, $zero, 0x0006 ## $t8 = 00000006 /* 003C4 809DF1C4 3C198016 */ lui $t9, 0x8016 ## $t9 = 80160000 /* 003C8 809DF1C8 444EF800 */ cfc1 $t6, $31 /* 003CC 809DF1CC 44CFF800 */ ctc1 $t7, $31 /* 003D0 809DF1D0 00000000 */ nop -/* 003D4 809DF1D4 460084A4 */ cvt.w.s $f18, $f16 +/* 003D4 809DF1D4 460084A4 */ cvt.w.s $f18, $f16 /* 003D8 809DF1D8 444FF800 */ cfc1 $t7, $31 /* 003DC 809DF1DC 00000000 */ nop /* 003E0 809DF1E0 31EF0078 */ andi $t7, $t7, 0x0078 ## $t7 = 00000000 -/* 003E4 809DF1E4 51E00013 */ beql $t7, $zero, .L809DF234 -/* 003E8 809DF1E8 440F9000 */ mfc1 $t7, $f18 +/* 003E4 809DF1E4 51E00013 */ beql $t7, $zero, .L809DF234 +/* 003E8 809DF1E8 440F9000 */ mfc1 $t7, $f18 /* 003EC 809DF1EC 44819000 */ mtc1 $at, $f18 ## $f18 = 2147483648.00 /* 003F0 809DF1F0 240F0001 */ addiu $t7, $zero, 0x0001 ## $t7 = 00000001 -/* 003F4 809DF1F4 46128481 */ sub.s $f18, $f16, $f18 +/* 003F4 809DF1F4 46128481 */ sub.s $f18, $f16, $f18 /* 003F8 809DF1F8 44CFF800 */ ctc1 $t7, $31 /* 003FC 809DF1FC 00000000 */ nop -/* 00400 809DF200 460094A4 */ cvt.w.s $f18, $f18 +/* 00400 809DF200 460094A4 */ cvt.w.s $f18, $f18 /* 00404 809DF204 444FF800 */ cfc1 $t7, $31 /* 00408 809DF208 00000000 */ nop /* 0040C 809DF20C 31EF0078 */ andi $t7, $t7, 0x0078 ## $t7 = 00000000 -/* 00410 809DF210 15E00005 */ bne $t7, $zero, .L809DF228 +/* 00410 809DF210 15E00005 */ bne $t7, $zero, .L809DF228 /* 00414 809DF214 00000000 */ nop -/* 00418 809DF218 440F9000 */ mfc1 $t7, $f18 +/* 00418 809DF218 440F9000 */ mfc1 $t7, $f18 /* 0041C 809DF21C 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 00420 809DF220 10000007 */ beq $zero, $zero, .L809DF240 +/* 00420 809DF220 10000007 */ beq $zero, $zero, .L809DF240 /* 00424 809DF224 01E17825 */ or $t7, $t7, $at ## $t7 = 80000000 .L809DF228: -/* 00428 809DF228 10000005 */ beq $zero, $zero, .L809DF240 +/* 00428 809DF228 10000005 */ beq $zero, $zero, .L809DF240 /* 0042C 809DF22C 240FFFFF */ addiu $t7, $zero, 0xFFFF ## $t7 = FFFFFFFF -/* 00430 809DF230 440F9000 */ mfc1 $t7, $f18 +/* 00430 809DF230 440F9000 */ mfc1 $t7, $f18 .L809DF234: /* 00434 809DF234 00000000 */ nop -/* 00438 809DF238 05E0FFFB */ bltz $t7, .L809DF228 +/* 00438 809DF238 05E0FFFB */ bltz $t7, .L809DF228 /* 0043C 809DF23C 00000000 */ nop .L809DF240: /* 00440 809DF240 A60F0278 */ sh $t7, 0x0278($s0) ## 00000278 @@ -159,7 +159,7 @@ glabel EnCow_Init /* 00448 809DF248 A218001F */ sb $t8, 0x001F($s0) ## 0000001F /* 0044C 809DF24C 8F39FA90 */ lw $t9, -0x0570($t9) ## 8015FA90 /* 00450 809DF250 44CEF800 */ ctc1 $t6, $31 -/* 00454 809DF254 10000071 */ beq $zero, $zero, .L809DF41C +/* 00454 809DF254 10000071 */ beq $zero, $zero, .L809DF41C /* 00458 809DF258 A72005BE */ sh $zero, 0x05BE($t9) ## 801605BE .L809DF25C: /* 0045C 809DF25C 260501E4 */ addiu $a1, $s0, 0x01E4 ## $a1 = 000001E4 @@ -167,17 +167,17 @@ glabel EnCow_Init /* 00464 809DF264 26080228 */ addiu $t0, $s0, 0x0228 ## $t0 = 00000228 /* 00468 809DF268 2609024C */ addiu $t1, $s0, 0x024C ## $t1 = 0000024C /* 0046C 809DF26C 240A0006 */ addiu $t2, $zero, 0x0006 ## $t2 = 00000006 -/* 00470 809DF270 AFAA0018 */ sw $t2, 0x0018($sp) -/* 00474 809DF274 AFA90014 */ sw $t1, 0x0014($sp) -/* 00478 809DF278 AFA80010 */ sw $t0, 0x0010($sp) +/* 00470 809DF270 AFAA0018 */ sw $t2, 0x0018($sp) +/* 00474 809DF274 AFA90014 */ sw $t1, 0x0014($sp) +/* 00478 809DF278 AFA80010 */ sw $t0, 0x0010($sp) /* 0047C 809DF27C 24C64C30 */ addiu $a2, $a2, 0x4C30 ## $a2 = 06004C30 -/* 00480 809DF280 AFA50040 */ sw $a1, 0x0040($sp) -/* 00484 809DF284 0C0291BE */ jal func_800A46F8 +/* 00480 809DF280 AFA50040 */ sw $a1, 0x0040($sp) +/* 00484 809DF284 0C0291BE */ jal SkelAnime_InitSV /* 00488 809DF288 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 /* 0048C 809DF28C 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 00490 809DF290 24A54348 */ addiu $a1, $a1, 0x4348 ## $a1 = 06004348 -/* 00494 809DF294 0C0294BE */ jal func_800A52F8 -/* 00498 809DF298 8FA40040 */ lw $a0, 0x0040($sp) +/* 00494 809DF294 0C0294BE */ jal SkelAnime_ChangeAnimDefaultRepeat +/* 00498 809DF298 8FA40040 */ lw $a0, 0x0040($sp) /* 0049C 809DF29C 3C0B809E */ lui $t3, %hi(func_809DFE98) ## $t3 = 809E0000 /* 004A0 809DF2A0 3C0C809E */ lui $t4, %hi(func_809E0070) ## $t4 = 809E0000 /* 004A4 809DF2A4 3C0D809E */ lui $t5, %hi(func_809DFA84) ## $t5 = 809E0000 @@ -187,96 +187,96 @@ glabel EnCow_Init /* 004B4 809DF2B4 AE0B0130 */ sw $t3, 0x0130($s0) ## 00000130 /* 004B8 809DF2B8 AE0C0134 */ sw $t4, 0x0134($s0) ## 00000134 /* 004BC 809DF2BC AE0D027C */ sw $t5, 0x027C($s0) ## 0000027C -/* 004C0 809DF2C0 0C277BE5 */ jal func_809DEF94 +/* 004C0 809DF2C0 0C277BE5 */ jal func_809DEF94 /* 004C4 809DF2C4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 004C8 809DF2C8 8E0E0004 */ lw $t6, 0x0004($s0) ## 00000004 /* 004CC 809DF2CC 2401FFFE */ addiu $at, $zero, 0xFFFE ## $at = FFFFFFFE -/* 004D0 809DF2D0 01C17824 */ and $t7, $t6, $at +/* 004D0 809DF2D0 01C17824 */ and $t7, $t6, $at /* 004D4 809DF2D4 3C01447A */ lui $at, 0x447A ## $at = 447A0000 /* 004D8 809DF2D8 44816000 */ mtc1 $at, $f12 ## $f12 = 1000.00 /* 004DC 809DF2DC 0C00CFBE */ jal Math_Rand_ZeroFloat - + /* 004E0 809DF2E0 AE0F0004 */ sw $t7, 0x0004($s0) ## 00000004 /* 004E4 809DF2E4 4458F800 */ cfc1 $t8, $31 /* 004E8 809DF2E8 24190001 */ addiu $t9, $zero, 0x0001 ## $t9 = 00000001 /* 004EC 809DF2EC 44D9F800 */ ctc1 $t9, $31 /* 004F0 809DF2F0 3C014F00 */ lui $at, 0x4F00 ## $at = 4F000000 -/* 004F4 809DF2F4 46000124 */ cvt.w.s $f4, $f0 +/* 004F4 809DF2F4 46000124 */ cvt.w.s $f4, $f0 /* 004F8 809DF2F8 4459F800 */ cfc1 $t9, $31 /* 004FC 809DF2FC 00000000 */ nop /* 00500 809DF300 33390078 */ andi $t9, $t9, 0x0078 ## $t9 = 00000000 -/* 00504 809DF304 53200013 */ beql $t9, $zero, .L809DF354 -/* 00508 809DF308 44192000 */ mfc1 $t9, $f4 +/* 00504 809DF304 53200013 */ beql $t9, $zero, .L809DF354 +/* 00508 809DF308 44192000 */ mfc1 $t9, $f4 /* 0050C 809DF30C 44812000 */ mtc1 $at, $f4 ## $f4 = 2147483648.00 /* 00510 809DF310 24190001 */ addiu $t9, $zero, 0x0001 ## $t9 = 00000001 -/* 00514 809DF314 46040101 */ sub.s $f4, $f0, $f4 +/* 00514 809DF314 46040101 */ sub.s $f4, $f0, $f4 /* 00518 809DF318 44D9F800 */ ctc1 $t9, $31 /* 0051C 809DF31C 00000000 */ nop -/* 00520 809DF320 46002124 */ cvt.w.s $f4, $f4 +/* 00520 809DF320 46002124 */ cvt.w.s $f4, $f4 /* 00524 809DF324 4459F800 */ cfc1 $t9, $31 /* 00528 809DF328 00000000 */ nop /* 0052C 809DF32C 33390078 */ andi $t9, $t9, 0x0078 ## $t9 = 00000000 -/* 00530 809DF330 17200005 */ bne $t9, $zero, .L809DF348 +/* 00530 809DF330 17200005 */ bne $t9, $zero, .L809DF348 /* 00534 809DF334 00000000 */ nop -/* 00538 809DF338 44192000 */ mfc1 $t9, $f4 +/* 00538 809DF338 44192000 */ mfc1 $t9, $f4 /* 0053C 809DF33C 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 00540 809DF340 10000007 */ beq $zero, $zero, .L809DF360 +/* 00540 809DF340 10000007 */ beq $zero, $zero, .L809DF360 /* 00544 809DF344 0321C825 */ or $t9, $t9, $at ## $t9 = 80000000 .L809DF348: -/* 00548 809DF348 10000005 */ beq $zero, $zero, .L809DF360 +/* 00548 809DF348 10000005 */ beq $zero, $zero, .L809DF360 /* 0054C 809DF34C 2419FFFF */ addiu $t9, $zero, 0xFFFF ## $t9 = FFFFFFFF -/* 00550 809DF350 44192000 */ mfc1 $t9, $f4 +/* 00550 809DF350 44192000 */ mfc1 $t9, $f4 .L809DF354: /* 00554 809DF354 00000000 */ nop -/* 00558 809DF358 0720FFFB */ bltz $t9, .L809DF348 +/* 00558 809DF358 0720FFFB */ bltz $t9, .L809DF348 /* 0055C 809DF35C 00000000 */ nop .L809DF360: /* 00560 809DF360 3328FFFF */ andi $t0, $t9, 0xFFFF ## $t0 = 0000FFFF /* 00564 809DF364 44883000 */ mtc1 $t0, $f6 ## $f6 = 0.00 /* 00568 809DF368 44D8F800 */ ctc1 $t8, $31 /* 0056C 809DF36C 3C014F80 */ lui $at, 0x4F80 ## $at = 4F800000 -/* 00570 809DF370 05010004 */ bgez $t0, .L809DF384 -/* 00574 809DF374 46803220 */ cvt.s.w $f8, $f6 +/* 00570 809DF370 05010004 */ bgez $t0, .L809DF384 +/* 00574 809DF374 46803220 */ cvt.s.w $f8, $f6 /* 00578 809DF378 44815000 */ mtc1 $at, $f10 ## $f10 = 4294967296.00 /* 0057C 809DF37C 00000000 */ nop -/* 00580 809DF380 460A4200 */ add.s $f8, $f8, $f10 +/* 00580 809DF380 460A4200 */ add.s $f8, $f8, $f10 .L809DF384: /* 00584 809DF384 3C014220 */ lui $at, 0x4220 ## $at = 42200000 /* 00588 809DF388 44818000 */ mtc1 $at, $f16 ## $f16 = 40.00 /* 0058C 809DF38C 240A0001 */ addiu $t2, $zero, 0x0001 ## $t2 = 00000001 /* 00590 809DF390 3C014F00 */ lui $at, 0x4F00 ## $at = 4F000000 -/* 00594 809DF394 46104480 */ add.s $f18, $f8, $f16 +/* 00594 809DF394 46104480 */ add.s $f18, $f8, $f16 /* 00598 809DF398 4449F800 */ cfc1 $t1, $31 /* 0059C 809DF39C 44CAF800 */ ctc1 $t2, $31 /* 005A0 809DF3A0 00000000 */ nop -/* 005A4 809DF3A4 46009124 */ cvt.w.s $f4, $f18 +/* 005A4 809DF3A4 46009124 */ cvt.w.s $f4, $f18 /* 005A8 809DF3A8 444AF800 */ cfc1 $t2, $31 /* 005AC 809DF3AC 00000000 */ nop /* 005B0 809DF3B0 314A0078 */ andi $t2, $t2, 0x0078 ## $t2 = 00000000 -/* 005B4 809DF3B4 51400013 */ beql $t2, $zero, .L809DF404 -/* 005B8 809DF3B8 440A2000 */ mfc1 $t2, $f4 +/* 005B4 809DF3B4 51400013 */ beql $t2, $zero, .L809DF404 +/* 005B8 809DF3B8 440A2000 */ mfc1 $t2, $f4 /* 005BC 809DF3BC 44812000 */ mtc1 $at, $f4 ## $f4 = 2147483648.00 /* 005C0 809DF3C0 240A0001 */ addiu $t2, $zero, 0x0001 ## $t2 = 00000001 -/* 005C4 809DF3C4 46049101 */ sub.s $f4, $f18, $f4 +/* 005C4 809DF3C4 46049101 */ sub.s $f4, $f18, $f4 /* 005C8 809DF3C8 44CAF800 */ ctc1 $t2, $31 /* 005CC 809DF3CC 00000000 */ nop -/* 005D0 809DF3D0 46002124 */ cvt.w.s $f4, $f4 +/* 005D0 809DF3D0 46002124 */ cvt.w.s $f4, $f4 /* 005D4 809DF3D4 444AF800 */ cfc1 $t2, $31 /* 005D8 809DF3D8 00000000 */ nop /* 005DC 809DF3DC 314A0078 */ andi $t2, $t2, 0x0078 ## $t2 = 00000000 -/* 005E0 809DF3E0 15400005 */ bne $t2, $zero, .L809DF3F8 +/* 005E0 809DF3E0 15400005 */ bne $t2, $zero, .L809DF3F8 /* 005E4 809DF3E4 00000000 */ nop -/* 005E8 809DF3E8 440A2000 */ mfc1 $t2, $f4 +/* 005E8 809DF3E8 440A2000 */ mfc1 $t2, $f4 /* 005EC 809DF3EC 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 005F0 809DF3F0 10000007 */ beq $zero, $zero, .L809DF410 +/* 005F0 809DF3F0 10000007 */ beq $zero, $zero, .L809DF410 /* 005F4 809DF3F4 01415025 */ or $t2, $t2, $at ## $t2 = 80000000 .L809DF3F8: -/* 005F8 809DF3F8 10000005 */ beq $zero, $zero, .L809DF410 +/* 005F8 809DF3F8 10000005 */ beq $zero, $zero, .L809DF410 /* 005FC 809DF3FC 240AFFFF */ addiu $t2, $zero, 0xFFFF ## $t2 = FFFFFFFF -/* 00600 809DF400 440A2000 */ mfc1 $t2, $f4 +/* 00600 809DF400 440A2000 */ mfc1 $t2, $f4 .L809DF404: /* 00604 809DF404 00000000 */ nop -/* 00608 809DF408 0540FFFB */ bltz $t2, .L809DF3F8 +/* 00608 809DF408 0540FFFB */ bltz $t2, .L809DF3F8 /* 0060C 809DF40C 00000000 */ nop .L809DF410: /* 00610 809DF410 44C9F800 */ ctc1 $t1, $31 @@ -289,14 +289,14 @@ glabel EnCow_Init /* 00624 809DF424 A20B00AE */ sb $t3, 0x00AE($s0) ## 000000AE /* 00628 809DF428 34A5D70A */ ori $a1, $a1, 0xD70A ## $a1 = 3C23D70A /* 0062C 809DF42C 0C00B58B */ jal Actor_SetScale - + /* 00630 809DF430 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 00634 809DF434 A6000276 */ sh $zero, 0x0276($s0) ## 00000276 -/* 00638 809DF438 8FBF003C */ lw $ra, 0x003C($sp) +/* 00638 809DF438 8FBF003C */ lw $ra, 0x003C($sp) .L809DF43C: -/* 0063C 809DF43C 8FB00034 */ lw $s0, 0x0034($sp) -/* 00640 809DF440 8FB10038 */ lw $s1, 0x0038($sp) -/* 00644 809DF444 03E00008 */ jr $ra +/* 0063C 809DF43C 8FB00034 */ lw $s0, 0x0034($sp) +/* 00640 809DF440 8FB10038 */ lw $s1, 0x0038($sp) +/* 00644 809DF444 03E00008 */ jr $ra /* 00648 809DF448 27BD0050 */ addiu $sp, $sp, 0x0050 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Cow/EnCow_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Cow/EnCow_Update.s index 282c86a647..b3e7786e66 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Cow/EnCow_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Cow/EnCow_Update.s @@ -1,189 +1,189 @@ glabel EnCow_Update /* 00E1C 809DFC1C 27BDFFB0 */ addiu $sp, $sp, 0xFFB0 ## $sp = FFFFFFB0 -/* 00E20 809DFC20 AFB00028 */ sw $s0, 0x0028($sp) -/* 00E24 809DFC24 AFBF002C */ sw $ra, 0x002C($sp) +/* 00E20 809DFC20 AFB00028 */ sw $s0, 0x0028($sp) +/* 00E24 809DFC24 AFBF002C */ sw $ra, 0x002C($sp) /* 00E28 809DFC28 8CAE1C44 */ lw $t6, 0x1C44($a1) ## 00001C44 /* 00E2C 809DFC2C 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 00E30 809DFC30 3C010001 */ lui $at, 0x0001 ## $at = 00010000 /* 00E34 809DFC34 00A03825 */ or $a3, $a1, $zero ## $a3 = 00000000 /* 00E38 809DFC38 34211E60 */ ori $at, $at, 0x1E60 ## $at = 00011E60 /* 00E3C 809DFC3C 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 00E40 809DFC40 00A12821 */ addu $a1, $a1, $at -/* 00E44 809DFC44 AFA50034 */ sw $a1, 0x0034($sp) -/* 00E48 809DFC48 AFA70054 */ sw $a3, 0x0054($sp) +/* 00E40 809DFC40 00A12821 */ addu $a1, $a1, $at +/* 00E44 809DFC44 AFA50034 */ sw $a1, 0x0034($sp) +/* 00E48 809DFC48 AFA70054 */ sw $a3, 0x0054($sp) /* 00E4C 809DFC4C 2606014C */ addiu $a2, $s0, 0x014C ## $a2 = 0000014C /* 00E50 809DFC50 0C017713 */ jal Actor_CollisionCheck_SetOT ## CollisionCheck_setOT -/* 00E54 809DFC54 AFAE0040 */ sw $t6, 0x0040($sp) -/* 00E58 809DFC58 8FA40054 */ lw $a0, 0x0054($sp) -/* 00E5C 809DFC5C 8FA50034 */ lw $a1, 0x0034($sp) +/* 00E54 809DFC54 AFAE0040 */ sw $t6, 0x0040($sp) +/* 00E58 809DFC58 8FA40054 */ lw $a0, 0x0054($sp) +/* 00E5C 809DFC5C 8FA50034 */ lw $a1, 0x0034($sp) /* 00E60 809DFC60 0C017713 */ jal Actor_CollisionCheck_SetOT ## CollisionCheck_setOT /* 00E64 809DFC64 26060198 */ addiu $a2, $s0, 0x0198 ## $a2 = 00000198 /* 00E68 809DFC68 0C00B638 */ jal Actor_MoveForward - + /* 00E6C 809DFC6C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 00E70 809DFC70 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 /* 00E74 809DFC74 240F0004 */ addiu $t7, $zero, 0x0004 ## $t7 = 00000004 -/* 00E78 809DFC78 AFAF0014 */ sw $t7, 0x0014($sp) -/* 00E7C 809DFC7C 44060000 */ mfc1 $a2, $f0 -/* 00E80 809DFC80 44070000 */ mfc1 $a3, $f0 -/* 00E84 809DFC84 8FA40054 */ lw $a0, 0x0054($sp) +/* 00E78 809DFC78 AFAF0014 */ sw $t7, 0x0014($sp) +/* 00E7C 809DFC7C 44060000 */ mfc1 $a2, $f0 +/* 00E80 809DFC80 44070000 */ mfc1 $a3, $f0 +/* 00E84 809DFC84 8FA40054 */ lw $a0, 0x0054($sp) /* 00E88 809DFC88 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 00E8C 809DFC8C 0C00B92D */ jal func_8002E4B4 -/* 00E90 809DFC90 E7A00010 */ swc1 $f0, 0x0010($sp) +/* 00E8C 809DFC8C 0C00B92D */ jal func_8002E4B4 +/* 00E90 809DFC90 E7A00010 */ swc1 $f0, 0x0010($sp) /* 00E94 809DFC94 260401E4 */ addiu $a0, $s0, 0x01E4 ## $a0 = 000001E4 /* 00E98 809DFC98 0C02927F */ jal SkelAnime_FrameUpdateMatrix - -/* 00E9C 809DFC9C AFA40034 */ sw $a0, 0x0034($sp) -/* 00EA0 809DFCA0 5040002B */ beql $v0, $zero, .L809DFD50 + +/* 00E9C 809DFC9C AFA40034 */ sw $a0, 0x0034($sp) +/* 00EA0 809DFCA0 5040002B */ beql $v0, $zero, .L809DFD50 /* 00EA4 809DFCA4 8E19027C */ lw $t9, 0x027C($s0) ## 0000027C /* 00EA8 809DFCA8 8E1801EC */ lw $t8, 0x01EC($s0) ## 000001EC /* 00EAC 809DFCAC 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 /* 00EB0 809DFCB0 248401CC */ addiu $a0, $a0, 0x01CC ## $a0 = 060001CC -/* 00EB4 809DFCB4 14980016 */ bne $a0, $t8, .L809DFD10 +/* 00EB4 809DFCB4 14980016 */ bne $a0, $t8, .L809DFD10 /* 00EB8 809DFCB8 240528DF */ addiu $a1, $zero, 0x28DF ## $a1 = 000028DF /* 00EBC 809DFCBC 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 00EC0 809DFCC0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 00EC4 809DFCC4 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 /* 00EC8 809DFCC8 0C028800 */ jal SkelAnime_GetFrameCount - + /* 00ECC 809DFCCC 24844264 */ addiu $a0, $a0, 0x4264 ## $a0 = 06004264 /* 00ED0 809DFCD0 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 00ED4 809DFCD4 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 /* 00ED8 809DFCD8 44810000 */ mtc1 $at, $f0 ## $f0 = 1.00 -/* 00EDC 809DFCDC 468021A0 */ cvt.s.w $f6, $f4 +/* 00EDC 809DFCDC 468021A0 */ cvt.s.w $f6, $f4 /* 00EE0 809DFCE0 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 00EE4 809DFCE4 24190002 */ addiu $t9, $zero, 0x0002 ## $t9 = 00000002 -/* 00EE8 809DFCE8 44060000 */ mfc1 $a2, $f0 -/* 00EEC 809DFCEC AFB90014 */ sw $t9, 0x0014($sp) +/* 00EE8 809DFCE8 44060000 */ mfc1 $a2, $f0 +/* 00EEC 809DFCEC AFB90014 */ sw $t9, 0x0014($sp) /* 00EF0 809DFCF0 24A54264 */ addiu $a1, $a1, 0x4264 ## $a1 = 06004264 -/* 00EF4 809DFCF4 E7A60010 */ swc1 $f6, 0x0010($sp) -/* 00EF8 809DFCF8 8FA40034 */ lw $a0, 0x0034($sp) +/* 00EF4 809DFCF4 E7A60010 */ swc1 $f6, 0x0010($sp) +/* 00EF8 809DFCF8 8FA40034 */ lw $a0, 0x0034($sp) /* 00EFC 809DFCFC 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 00F00 809DFD00 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 00F04 809DFD04 E7A00018 */ swc1 $f0, 0x0018($sp) -/* 00F08 809DFD08 10000011 */ beq $zero, $zero, .L809DFD50 +/* 00F00 809DFD00 0C029468 */ jal SkelAnime_ChangeAnim + +/* 00F04 809DFD04 E7A00018 */ swc1 $f0, 0x0018($sp) +/* 00F08 809DFD08 10000011 */ beq $zero, $zero, .L809DFD50 /* 00F0C 809DFD0C 8E19027C */ lw $t9, 0x027C($s0) ## 0000027C .L809DFD10: /* 00F10 809DFD10 0C028800 */ jal SkelAnime_GetFrameCount - + /* 00F14 809DFD14 00000000 */ nop /* 00F18 809DFD18 44824000 */ mtc1 $v0, $f8 ## $f8 = 0.00 /* 00F1C 809DFD1C 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 /* 00F20 809DFD20 44810000 */ mtc1 $at, $f0 ## $f0 = 1.00 -/* 00F24 809DFD24 468042A0 */ cvt.s.w $f10, $f8 +/* 00F24 809DFD24 468042A0 */ cvt.s.w $f10, $f8 /* 00F28 809DFD28 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 00F2C 809DFD2C 44060000 */ mfc1 $a2, $f0 +/* 00F2C 809DFD2C 44060000 */ mfc1 $a2, $f0 /* 00F30 809DFD30 24A501CC */ addiu $a1, $a1, 0x01CC ## $a1 = 060001CC -/* 00F34 809DFD34 8FA40034 */ lw $a0, 0x0034($sp) +/* 00F34 809DFD34 8FA40034 */ lw $a0, 0x0034($sp) /* 00F38 809DFD38 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 00F3C 809DFD3C E7AA0010 */ swc1 $f10, 0x0010($sp) -/* 00F40 809DFD40 AFA00014 */ sw $zero, 0x0014($sp) -/* 00F44 809DFD44 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 00F48 809DFD48 E7A00018 */ swc1 $f0, 0x0018($sp) +/* 00F3C 809DFD3C E7AA0010 */ swc1 $f10, 0x0010($sp) +/* 00F40 809DFD40 AFA00014 */ sw $zero, 0x0014($sp) +/* 00F44 809DFD44 0C029468 */ jal SkelAnime_ChangeAnim + +/* 00F48 809DFD48 E7A00018 */ swc1 $f0, 0x0018($sp) /* 00F4C 809DFD4C 8E19027C */ lw $t9, 0x027C($s0) ## 0000027C .L809DFD50: /* 00F50 809DFD50 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00F54 809DFD54 8FA50054 */ lw $a1, 0x0054($sp) -/* 00F58 809DFD58 0320F809 */ jalr $ra, $t9 +/* 00F54 809DFD54 8FA50054 */ lw $a1, 0x0054($sp) +/* 00F58 809DFD58 0320F809 */ jalr $ra, $t9 /* 00F5C 809DFD5C 00000000 */ nop /* 00F60 809DFD60 3C014316 */ lui $at, 0x4316 ## $at = 43160000 /* 00F64 809DFD64 44819000 */ mtc1 $at, $f18 ## $f18 = 150.00 /* 00F68 809DFD68 C6100090 */ lwc1 $f16, 0x0090($s0) ## 00000090 -/* 00F6C 809DFD6C 8FA50040 */ lw $a1, 0x0040($sp) -/* 00F70 809DFD70 4612803C */ c.lt.s $f16, $f18 +/* 00F6C 809DFD6C 8FA50040 */ lw $a1, 0x0040($sp) +/* 00F70 809DFD70 4612803C */ c.lt.s $f16, $f18 /* 00F74 809DFD74 24A50024 */ addiu $a1, $a1, 0x0024 ## $a1 = 00000024 -/* 00F78 809DFD78 45000033 */ bc1f .L809DFE48 +/* 00F78 809DFD78 45000033 */ bc1f .L809DFE48 /* 00F7C 809DFD7C 26040024 */ addiu $a0, $s0, 0x0024 ## $a0 = 00000024 -/* 00F80 809DFD80 AFA40034 */ sw $a0, 0x0034($sp) +/* 00F80 809DFD80 AFA40034 */ sw $a0, 0x0034($sp) /* 00F84 809DFD84 0C01E01A */ jal Math_Vec3f_Yaw - -/* 00F88 809DFD88 AFA50030 */ sw $a1, 0x0030($sp) -/* 00F8C 809DFD8C 8FA40034 */ lw $a0, 0x0034($sp) -/* 00F90 809DFD90 04400005 */ bltz $v0, .L809DFDA8 -/* 00F94 809DFD94 8FA50030 */ lw $a1, 0x0030($sp) + +/* 00F88 809DFD88 AFA50030 */ sw $a1, 0x0030($sp) +/* 00F8C 809DFD8C 8FA40034 */ lw $a0, 0x0034($sp) +/* 00F90 809DFD90 04400005 */ bltz $v0, .L809DFDA8 +/* 00F94 809DFD94 8FA50030 */ lw $a1, 0x0030($sp) /* 00F98 809DFD98 0C01E01A */ jal Math_Vec3f_Yaw - + /* 00F9C 809DFD9C 00000000 */ nop -/* 00FA0 809DFDA0 10000004 */ beq $zero, $zero, .L809DFDB4 +/* 00FA0 809DFDA0 10000004 */ beq $zero, $zero, .L809DFDB4 /* 00FA4 809DFDA4 00401825 */ or $v1, $v0, $zero ## $v1 = 00000000 .L809DFDA8: /* 00FA8 809DFDA8 0C01E01A */ jal Math_Vec3f_Yaw - + /* 00FAC 809DFDAC 00000000 */ nop -/* 00FB0 809DFDB0 00021823 */ subu $v1, $zero, $v0 +/* 00FB0 809DFDB0 00021823 */ subu $v1, $zero, $v0 .L809DFDB4: /* 00FB4 809DFDB4 3401C000 */ ori $at, $zero, 0xC000 ## $at = 0000C000 -/* 00FB8 809DFDB8 0061082A */ slt $at, $v1, $at -/* 00FBC 809DFDBC 10200022 */ beq $at, $zero, .L809DFE48 -/* 00FC0 809DFDC0 8FA50040 */ lw $a1, 0x0040($sp) +/* 00FB8 809DFDB8 0061082A */ slt $at, $v1, $at +/* 00FBC 809DFDBC 10200022 */ beq $at, $zero, .L809DFE48 +/* 00FC0 809DFDC0 8FA50040 */ lw $a1, 0x0040($sp) /* 00FC4 809DFDC4 26040038 */ addiu $a0, $s0, 0x0038 ## $a0 = 00000038 /* 00FC8 809DFDC8 24A50038 */ addiu $a1, $a1, 0x0038 ## $a1 = 00000038 -/* 00FCC 809DFDCC AFA50030 */ sw $a1, 0x0030($sp) +/* 00FCC 809DFDCC AFA50030 */ sw $a1, 0x0030($sp) /* 00FD0 809DFDD0 0C01E027 */ jal Math_Vec3f_Pitch - -/* 00FD4 809DFDD4 AFA40034 */ sw $a0, 0x0034($sp) -/* 00FD8 809DFDD8 8FA40034 */ lw $a0, 0x0034($sp) -/* 00FDC 809DFDDC 8FA50030 */ lw $a1, 0x0030($sp) + +/* 00FD4 809DFDD4 AFA40034 */ sw $a0, 0x0034($sp) +/* 00FD8 809DFDD8 8FA40034 */ lw $a0, 0x0034($sp) +/* 00FDC 809DFDDC 8FA50030 */ lw $a1, 0x0030($sp) /* 00FE0 809DFDE0 0C01E01A */ jal Math_Vec3f_Yaw - -/* 00FE4 809DFDE4 A7A20046 */ sh $v0, 0x0046($sp) + +/* 00FE4 809DFDE4 A7A20046 */ sh $v0, 0x0046($sp) /* 00FE8 809DFDE8 860800B6 */ lh $t0, 0x00B6($s0) ## 000000B6 -/* 00FEC 809DFDEC 87A50046 */ lh $a1, 0x0046($sp) -/* 00FF0 809DFDF0 00481823 */ subu $v1, $v0, $t0 -/* 00FF4 809DFDF4 00031C00 */ sll $v1, $v1, 16 -/* 00FF8 809DFDF8 28A11001 */ slti $at, $a1, 0x1001 -/* 00FFC 809DFDFC 14200003 */ bne $at, $zero, .L809DFE0C -/* 01000 809DFE00 00031C03 */ sra $v1, $v1, 16 -/* 01004 809DFE04 10000005 */ beq $zero, $zero, .L809DFE1C +/* 00FEC 809DFDEC 87A50046 */ lh $a1, 0x0046($sp) +/* 00FF0 809DFDF0 00481823 */ subu $v1, $v0, $t0 +/* 00FF4 809DFDF4 00031C00 */ sll $v1, $v1, 16 +/* 00FF8 809DFDF8 28A11001 */ slti $at, $a1, 0x1001 +/* 00FFC 809DFDFC 14200003 */ bne $at, $zero, .L809DFE0C +/* 01000 809DFE00 00031C03 */ sra $v1, $v1, 16 +/* 01004 809DFE04 10000005 */ beq $zero, $zero, .L809DFE1C /* 01008 809DFE08 24051000 */ addiu $a1, $zero, 0x1000 ## $a1 = 00001000 .L809DFE0C: -/* 0100C 809DFE0C 28A1F000 */ slti $at, $a1, 0xF000 -/* 01010 809DFE10 50200003 */ beql $at, $zero, .L809DFE20 -/* 01014 809DFE14 28612501 */ slti $at, $v1, 0x2501 +/* 0100C 809DFE0C 28A1F000 */ slti $at, $a1, 0xF000 +/* 01010 809DFE10 50200003 */ beql $at, $zero, .L809DFE20 +/* 01014 809DFE14 28612501 */ slti $at, $v1, 0x2501 /* 01018 809DFE18 2405F000 */ addiu $a1, $zero, 0xF000 ## $a1 = FFFFF000 .L809DFE1C: -/* 0101C 809DFE1C 28612501 */ slti $at, $v1, 0x2501 +/* 0101C 809DFE1C 28612501 */ slti $at, $v1, 0x2501 .L809DFE20: -/* 01020 809DFE20 54200004 */ bnel $at, $zero, .L809DFE34 -/* 01024 809DFE24 2861DB00 */ slti $at, $v1, 0xDB00 -/* 01028 809DFE28 10000005 */ beq $zero, $zero, .L809DFE40 +/* 01020 809DFE20 54200004 */ bnel $at, $zero, .L809DFE34 +/* 01024 809DFE24 2861DB00 */ slti $at, $v1, 0xDB00 +/* 01028 809DFE28 10000005 */ beq $zero, $zero, .L809DFE40 /* 0102C 809DFE2C 24032500 */ addiu $v1, $zero, 0x2500 ## $v1 = 00002500 -/* 01030 809DFE30 2861DB00 */ slti $at, $v1, 0xDB00 +/* 01030 809DFE30 2861DB00 */ slti $at, $v1, 0xDB00 .L809DFE34: -/* 01034 809DFE34 10200002 */ beq $at, $zero, .L809DFE40 +/* 01034 809DFE34 10200002 */ beq $at, $zero, .L809DFE40 /* 01038 809DFE38 00000000 */ nop /* 0103C 809DFE3C 2403DB00 */ addiu $v1, $zero, 0xDB00 ## $v1 = FFFFDB00 .L809DFE40: -/* 01040 809DFE40 10000003 */ beq $zero, $zero, .L809DFE50 -/* 01044 809DFE44 A7A30044 */ sh $v1, 0x0044($sp) +/* 01040 809DFE40 10000003 */ beq $zero, $zero, .L809DFE50 +/* 01044 809DFE44 A7A30044 */ sh $v1, 0x0044($sp) .L809DFE48: -/* 01048 809DFE48 A7A00044 */ sh $zero, 0x0044($sp) +/* 01048 809DFE48 A7A00044 */ sh $zero, 0x0044($sp) /* 0104C 809DFE4C 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 .L809DFE50: /* 01050 809DFE50 2409000A */ addiu $t1, $zero, 0x000A ## $t1 = 0000000A -/* 01054 809DFE54 AFA90010 */ sw $t1, 0x0010($sp) +/* 01054 809DFE54 AFA90010 */ sw $t1, 0x0010($sp) /* 01058 809DFE58 26040270 */ addiu $a0, $s0, 0x0270 ## $a0 = 00000270 /* 0105C 809DFE5C 2406000A */ addiu $a2, $zero, 0x000A ## $a2 = 0000000A /* 01060 809DFE60 0C01E1A7 */ jal Math_SmoothScaleMaxMinS - + /* 01064 809DFE64 240700C8 */ addiu $a3, $zero, 0x00C8 ## $a3 = 000000C8 /* 01068 809DFE68 240A000A */ addiu $t2, $zero, 0x000A ## $t2 = 0000000A -/* 0106C 809DFE6C AFAA0010 */ sw $t2, 0x0010($sp) +/* 0106C 809DFE6C AFAA0010 */ sw $t2, 0x0010($sp) /* 01070 809DFE70 26040272 */ addiu $a0, $s0, 0x0272 ## $a0 = 00000272 -/* 01074 809DFE74 87A50044 */ lh $a1, 0x0044($sp) +/* 01074 809DFE74 87A50044 */ lh $a1, 0x0044($sp) /* 01078 809DFE78 2406000A */ addiu $a2, $zero, 0x000A ## $a2 = 0000000A /* 0107C 809DFE7C 0C01E1A7 */ jal Math_SmoothScaleMaxMinS - + /* 01080 809DFE80 240700C8 */ addiu $a3, $zero, 0x00C8 ## $a3 = 000000C8 -/* 01084 809DFE84 8FBF002C */ lw $ra, 0x002C($sp) -/* 01088 809DFE88 8FB00028 */ lw $s0, 0x0028($sp) +/* 01084 809DFE84 8FBF002C */ lw $ra, 0x002C($sp) +/* 01088 809DFE88 8FB00028 */ lw $s0, 0x0028($sp) /* 0108C 809DFE8C 27BD0050 */ addiu $sp, $sp, 0x0050 ## $sp = 00000000 -/* 01090 809DFE90 03E00008 */ jr $ra +/* 01090 809DFE90 03E00008 */ jr $ra /* 01094 809DFE94 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Cow/func_809DF494.s b/asm/non_matchings/overlays/actors/ovl_En_Cow/func_809DF494.s index 3fc85231f0..4674788017 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Cow/func_809DF494.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Cow/func_809DF494.s @@ -1,95 +1,95 @@ glabel func_809DF494 /* 00694 809DF494 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 00698 809DF498 AFBF002C */ sw $ra, 0x002C($sp) -/* 0069C 809DF49C AFB00028 */ sw $s0, 0x0028($sp) -/* 006A0 809DF4A0 AFA50034 */ sw $a1, 0x0034($sp) +/* 00698 809DF498 AFBF002C */ sw $ra, 0x002C($sp) +/* 0069C 809DF49C AFB00028 */ sw $s0, 0x0028($sp) +/* 006A0 809DF4A0 AFA50034 */ sw $a1, 0x0034($sp) /* 006A4 809DF4A4 94820278 */ lhu $v0, 0x0278($a0) ## 00000278 /* 006A8 809DF4A8 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 006AC 809DF4AC 3C0143FA */ lui $at, 0x43FA ## $at = 43FA0000 -/* 006B0 809DF4B0 18400003 */ blez $v0, .L809DF4C0 +/* 006B0 809DF4B0 18400003 */ blez $v0, .L809DF4C0 /* 006B4 809DF4B4 244EFFFF */ addiu $t6, $v0, 0xFFFF ## $t6 = FFFFFFFF -/* 006B8 809DF4B8 1000003A */ beq $zero, $zero, .L809DF5A4 +/* 006B8 809DF4B8 1000003A */ beq $zero, $zero, .L809DF5A4 /* 006BC 809DF4BC A48E0278 */ sh $t6, 0x0278($a0) ## 00000278 .L809DF4C0: /* 006C0 809DF4C0 44816000 */ mtc1 $at, $f12 ## $f12 = 500.00 /* 006C4 809DF4C4 0C00CFBE */ jal Math_Rand_ZeroFloat - + /* 006C8 809DF4C8 00000000 */ nop /* 006CC 809DF4CC 3C014220 */ lui $at, 0x4220 ## $at = 42200000 /* 006D0 809DF4D0 44812000 */ mtc1 $at, $f4 ## $f4 = 40.00 /* 006D4 809DF4D4 24180001 */ addiu $t8, $zero, 0x0001 ## $t8 = 00000001 /* 006D8 809DF4D8 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 -/* 006DC 809DF4DC 46040180 */ add.s $f6, $f0, $f4 +/* 006DC 809DF4DC 46040180 */ add.s $f6, $f0, $f4 /* 006E0 809DF4E0 3C014F00 */ lui $at, 0x4F00 ## $at = 4F000000 /* 006E4 809DF4E4 248401CC */ addiu $a0, $a0, 0x01CC ## $a0 = 060001CC /* 006E8 809DF4E8 444FF800 */ cfc1 $t7, $31 /* 006EC 809DF4EC 44D8F800 */ ctc1 $t8, $31 /* 006F0 809DF4F0 00000000 */ nop -/* 006F4 809DF4F4 46003224 */ cvt.w.s $f8, $f6 +/* 006F4 809DF4F4 46003224 */ cvt.w.s $f8, $f6 /* 006F8 809DF4F8 4458F800 */ cfc1 $t8, $31 /* 006FC 809DF4FC 00000000 */ nop /* 00700 809DF500 33180078 */ andi $t8, $t8, 0x0078 ## $t8 = 00000000 -/* 00704 809DF504 53000013 */ beql $t8, $zero, .L809DF554 -/* 00708 809DF508 44184000 */ mfc1 $t8, $f8 +/* 00704 809DF504 53000013 */ beql $t8, $zero, .L809DF554 +/* 00708 809DF508 44184000 */ mfc1 $t8, $f8 /* 0070C 809DF50C 44814000 */ mtc1 $at, $f8 ## $f8 = 2147483648.00 /* 00710 809DF510 24180001 */ addiu $t8, $zero, 0x0001 ## $t8 = 00000001 -/* 00714 809DF514 46083201 */ sub.s $f8, $f6, $f8 +/* 00714 809DF514 46083201 */ sub.s $f8, $f6, $f8 /* 00718 809DF518 44D8F800 */ ctc1 $t8, $31 /* 0071C 809DF51C 00000000 */ nop -/* 00720 809DF520 46004224 */ cvt.w.s $f8, $f8 +/* 00720 809DF520 46004224 */ cvt.w.s $f8, $f8 /* 00724 809DF524 4458F800 */ cfc1 $t8, $31 /* 00728 809DF528 00000000 */ nop /* 0072C 809DF52C 33180078 */ andi $t8, $t8, 0x0078 ## $t8 = 00000000 -/* 00730 809DF530 17000005 */ bne $t8, $zero, .L809DF548 +/* 00730 809DF530 17000005 */ bne $t8, $zero, .L809DF548 /* 00734 809DF534 00000000 */ nop -/* 00738 809DF538 44184000 */ mfc1 $t8, $f8 +/* 00738 809DF538 44184000 */ mfc1 $t8, $f8 /* 0073C 809DF53C 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 00740 809DF540 10000007 */ beq $zero, $zero, .L809DF560 +/* 00740 809DF540 10000007 */ beq $zero, $zero, .L809DF560 /* 00744 809DF544 0301C025 */ or $t8, $t8, $at ## $t8 = 80000000 .L809DF548: -/* 00748 809DF548 10000005 */ beq $zero, $zero, .L809DF560 +/* 00748 809DF548 10000005 */ beq $zero, $zero, .L809DF560 /* 0074C 809DF54C 2418FFFF */ addiu $t8, $zero, 0xFFFF ## $t8 = FFFFFFFF -/* 00750 809DF550 44184000 */ mfc1 $t8, $f8 +/* 00750 809DF550 44184000 */ mfc1 $t8, $f8 .L809DF554: /* 00754 809DF554 00000000 */ nop -/* 00758 809DF558 0700FFFB */ bltz $t8, .L809DF548 +/* 00758 809DF558 0700FFFB */ bltz $t8, .L809DF548 /* 0075C 809DF55C 00000000 */ nop .L809DF560: /* 00760 809DF560 44CFF800 */ ctc1 $t7, $31 /* 00764 809DF564 0C028800 */ jal SkelAnime_GetFrameCount - + /* 00768 809DF568 A6180278 */ sh $t8, 0x0278($s0) ## 00000278 /* 0076C 809DF56C 44825000 */ mtc1 $v0, $f10 ## $f10 = 0.00 /* 00770 809DF570 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 /* 00774 809DF574 44819000 */ mtc1 $at, $f18 ## $f18 = 1.00 -/* 00778 809DF578 46805420 */ cvt.s.w $f16, $f10 +/* 00778 809DF578 46805420 */ cvt.s.w $f16, $f10 /* 0077C 809DF57C 8E0701FC */ lw $a3, 0x01FC($s0) ## 000001FC /* 00780 809DF580 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 00784 809DF584 24190002 */ addiu $t9, $zero, 0x0002 ## $t9 = 00000002 -/* 00788 809DF588 AFB90014 */ sw $t9, 0x0014($sp) +/* 00788 809DF588 AFB90014 */ sw $t9, 0x0014($sp) /* 0078C 809DF58C 24A501CC */ addiu $a1, $a1, 0x01CC ## $a1 = 060001CC -/* 00790 809DF590 E7B00010 */ swc1 $f16, 0x0010($sp) +/* 00790 809DF590 E7B00010 */ swc1 $f16, 0x0010($sp) /* 00794 809DF594 260401E4 */ addiu $a0, $s0, 0x01E4 ## $a0 = 000001E4 /* 00798 809DF598 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 0079C 809DF59C 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 007A0 809DF5A0 E7B20018 */ swc1 $f18, 0x0018($sp) +/* 0079C 809DF59C 0C029468 */ jal SkelAnime_ChangeAnim + +/* 007A0 809DF5A0 E7B20018 */ swc1 $f18, 0x0018($sp) .L809DF5A4: /* 007A4 809DF5A4 3C014316 */ lui $at, 0x4316 ## $at = 43160000 /* 007A8 809DF5A8 44813000 */ mtc1 $at, $f6 ## $f6 = 150.00 /* 007AC 809DF5AC C6040090 */ lwc1 $f4, 0x0090($s0) ## 00000090 -/* 007B0 809DF5B0 4606203C */ c.lt.s $f4, $f6 +/* 007B0 809DF5B0 4606203C */ c.lt.s $f4, $f6 /* 007B4 809DF5B4 00000000 */ nop -/* 007B8 809DF5B8 4502000C */ bc1fl .L809DF5EC +/* 007B8 809DF5B8 4502000C */ bc1fl .L809DF5EC /* 007BC 809DF5BC 960C027A */ lhu $t4, 0x027A($s0) ## 0000027A /* 007C0 809DF5C0 96020276 */ lhu $v0, 0x0276($s0) ## 00000276 /* 007C4 809DF5C4 30480002 */ andi $t0, $v0, 0x0002 ## $t0 = 00000000 -/* 007C8 809DF5C8 15000007 */ bne $t0, $zero, .L809DF5E8 +/* 007C8 809DF5C8 15000007 */ bne $t0, $zero, .L809DF5E8 /* 007CC 809DF5CC 34490002 */ ori $t1, $v0, 0x0002 ## $t1 = 00000002 /* 007D0 809DF5D0 8E0B01EC */ lw $t3, 0x01EC($s0) ## 000001EC /* 007D4 809DF5D4 3C0A0600 */ lui $t2, 0x0600 ## $t2 = 06000000 /* 007D8 809DF5D8 254A01CC */ addiu $t2, $t2, 0x01CC ## $t2 = 060001CC -/* 007DC 809DF5DC 154B0002 */ bne $t2, $t3, .L809DF5E8 +/* 007DC 809DF5DC 154B0002 */ bne $t2, $t3, .L809DF5E8 /* 007E0 809DF5E0 A6090276 */ sh $t1, 0x0276($s0) ## 00000276 /* 007E4 809DF5E4 A6000278 */ sh $zero, 0x0278($s0) ## 00000278 .L809DF5E8: @@ -97,62 +97,62 @@ glabel func_809DF494 .L809DF5EC: /* 007EC 809DF5EC 258D0001 */ addiu $t5, $t4, 0x0001 ## $t5 = 00000001 /* 007F0 809DF5F0 31A2FFFF */ andi $v0, $t5, 0xFFFF ## $v0 = 00000001 -/* 007F4 809DF5F4 28410031 */ slti $at, $v0, 0x0031 -/* 007F8 809DF5F8 14200003 */ bne $at, $zero, .L809DF608 +/* 007F4 809DF5F4 28410031 */ slti $at, $v0, 0x0031 +/* 007F8 809DF5F8 14200003 */ bne $at, $zero, .L809DF608 /* 007FC 809DF5FC A60D027A */ sh $t5, 0x027A($s0) ## 0000027A /* 00800 809DF600 A600027A */ sh $zero, 0x027A($s0) ## 0000027A /* 00804 809DF604 3002FFFF */ andi $v0, $zero, 0xFFFF ## $v0 = 00000000 .L809DF608: -/* 00808 809DF608 28410020 */ slti $at, $v0, 0x0020 -/* 0080C 809DF60C 1020000F */ beq $at, $zero, .L809DF64C +/* 00808 809DF608 28410020 */ slti $at, $v0, 0x0020 +/* 0080C 809DF60C 1020000F */ beq $at, $zero, .L809DF64C /* 00810 809DF610 00402025 */ or $a0, $v0, $zero ## $a0 = 00000000 -/* 00814 809DF614 00042680 */ sll $a0, $a0, 26 +/* 00814 809DF614 00042680 */ sll $a0, $a0, 26 /* 00818 809DF618 0C01DE1C */ jal Math_Sins ## sins? -/* 0081C 809DF61C 00042403 */ sra $a0, $a0, 16 +/* 0081C 809DF61C 00042403 */ sra $a0, $a0, 16 /* 00820 809DF620 3C01809E */ lui $at, %hi(D_809E0120) ## $at = 809E0000 -/* 00824 809DF624 C4220120 */ lwc1 $f2, %lo(D_809E0120)($at) +/* 00824 809DF624 C4220120 */ lwc1 $f2, %lo(D_809E0120)($at) /* 00828 809DF628 3C01809E */ lui $at, %hi(D_809E0124) ## $at = 809E0000 -/* 0082C 809DF62C C4280124 */ lwc1 $f8, %lo(D_809E0124)($at) +/* 0082C 809DF62C C4280124 */ lwc1 $f8, %lo(D_809E0124)($at) /* 00830 809DF630 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 /* 00834 809DF634 44818000 */ mtc1 $at, $f16 ## $f16 = 1.00 -/* 00838 809DF638 46080282 */ mul.s $f10, $f0, $f8 -/* 0083C 809DF63C 46105480 */ add.s $f18, $f10, $f16 -/* 00840 809DF640 46029102 */ mul.s $f4, $f18, $f2 -/* 00844 809DF644 10000004 */ beq $zero, $zero, .L809DF658 +/* 00838 809DF638 46080282 */ mul.s $f10, $f0, $f8 +/* 0083C 809DF63C 46105480 */ add.s $f18, $f10, $f16 +/* 00840 809DF640 46029102 */ mul.s $f4, $f18, $f2 +/* 00844 809DF644 10000004 */ beq $zero, $zero, .L809DF658 /* 00848 809DF648 E6040050 */ swc1 $f4, 0x0050($s0) ## 00000050 .L809DF64C: /* 0084C 809DF64C 3C01809E */ lui $at, %hi(D_809E0128) ## $at = 809E0000 -/* 00850 809DF650 C4220128 */ lwc1 $f2, %lo(D_809E0128)($at) +/* 00850 809DF650 C4220128 */ lwc1 $f2, %lo(D_809E0128)($at) /* 00854 809DF654 E6020050 */ swc1 $f2, 0x0050($s0) ## 00000050 .L809DF658: /* 00858 809DF658 9602027A */ lhu $v0, 0x027A($s0) ## 0000027A -/* 0085C 809DF65C 28410011 */ slti $at, $v0, 0x0011 -/* 00860 809DF660 14200010 */ bne $at, $zero, .L809DF6A4 -/* 00864 809DF664 00022280 */ sll $a0, $v0, 10 +/* 0085C 809DF65C 28410011 */ slti $at, $v0, 0x0011 +/* 00860 809DF660 14200010 */ bne $at, $zero, .L809DF6A4 +/* 00864 809DF664 00022280 */ sll $a0, $v0, 10 /* 00868 809DF668 2484C000 */ addiu $a0, $a0, 0xC000 ## $a0 = FFFFC000 -/* 0086C 809DF66C 00042400 */ sll $a0, $a0, 16 +/* 0086C 809DF66C 00042400 */ sll $a0, $a0, 16 /* 00870 809DF670 0C01DE1C */ jal Math_Sins ## sins? -/* 00874 809DF674 00042403 */ sra $a0, $a0, 16 +/* 00874 809DF674 00042403 */ sra $a0, $a0, 16 /* 00878 809DF678 3C01809E */ lui $at, %hi(D_809E012C) ## $at = 809E0000 -/* 0087C 809DF67C C422012C */ lwc1 $f2, %lo(D_809E012C)($at) +/* 0087C 809DF67C C422012C */ lwc1 $f2, %lo(D_809E012C)($at) /* 00880 809DF680 3C01809E */ lui $at, %hi(D_809E0130) ## $at = 809E0000 -/* 00884 809DF684 C4260130 */ lwc1 $f6, %lo(D_809E0130)($at) +/* 00884 809DF684 C4260130 */ lwc1 $f6, %lo(D_809E0130)($at) /* 00888 809DF688 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 /* 0088C 809DF68C 44815000 */ mtc1 $at, $f10 ## $f10 = 1.00 -/* 00890 809DF690 46060202 */ mul.s $f8, $f0, $f6 -/* 00894 809DF694 460A4400 */ add.s $f16, $f8, $f10 -/* 00898 809DF698 46028482 */ mul.s $f18, $f16, $f2 -/* 0089C 809DF69C 10000002 */ beq $zero, $zero, .L809DF6A8 +/* 00890 809DF690 46060202 */ mul.s $f8, $f0, $f6 +/* 00894 809DF694 460A4400 */ add.s $f16, $f8, $f10 +/* 00898 809DF698 46028482 */ mul.s $f18, $f16, $f2 +/* 0089C 809DF69C 10000002 */ beq $zero, $zero, .L809DF6A8 /* 008A0 809DF6A0 E6120054 */ swc1 $f18, 0x0054($s0) ## 00000054 .L809DF6A4: /* 008A4 809DF6A4 E6020054 */ swc1 $f2, 0x0054($s0) ## 00000054 .L809DF6A8: -/* 008A8 809DF6A8 8FBF002C */ lw $ra, 0x002C($sp) -/* 008AC 809DF6AC 8FB00028 */ lw $s0, 0x0028($sp) +/* 008A8 809DF6A8 8FBF002C */ lw $ra, 0x002C($sp) +/* 008AC 809DF6AC 8FB00028 */ lw $s0, 0x0028($sp) /* 008B0 809DF6B0 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 008B4 809DF6B4 03E00008 */ jr $ra +/* 008B4 809DF6B4 03E00008 */ jr $ra /* 008B8 809DF6B8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Cow/func_809DFA84.s b/asm/non_matchings/overlays/actors/ovl_En_Cow/func_809DFA84.s index 8b3d0c149f..75fb148d58 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Cow/func_809DFA84.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Cow/func_809DFA84.s @@ -1,116 +1,116 @@ glabel func_809DFA84 /* 00C84 809DFA84 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 00C88 809DFA88 AFBF002C */ sw $ra, 0x002C($sp) -/* 00C8C 809DFA8C AFB00028 */ sw $s0, 0x0028($sp) -/* 00C90 809DFA90 AFA50034 */ sw $a1, 0x0034($sp) +/* 00C88 809DFA88 AFBF002C */ sw $ra, 0x002C($sp) +/* 00C8C 809DFA8C AFB00028 */ sw $s0, 0x0028($sp) +/* 00C90 809DFA90 AFA50034 */ sw $a1, 0x0034($sp) /* 00C94 809DFA94 94820278 */ lhu $v0, 0x0278($a0) ## 00000278 /* 00C98 809DFA98 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 00C9C 809DFA9C 3C014348 */ lui $at, 0x4348 ## $at = 43480000 -/* 00CA0 809DFAA0 18400003 */ blez $v0, .L809DFAB0 +/* 00CA0 809DFAA0 18400003 */ blez $v0, .L809DFAB0 /* 00CA4 809DFAA4 244EFFFF */ addiu $t6, $v0, 0xFFFF ## $t6 = FFFFFFFF -/* 00CA8 809DFAA8 1000003A */ beq $zero, $zero, .L809DFB94 +/* 00CA8 809DFAA8 1000003A */ beq $zero, $zero, .L809DFB94 /* 00CAC 809DFAAC A48E0278 */ sh $t6, 0x0278($a0) ## 00000278 .L809DFAB0: /* 00CB0 809DFAB0 44816000 */ mtc1 $at, $f12 ## $f12 = 200.00 /* 00CB4 809DFAB4 0C00CFBE */ jal Math_Rand_ZeroFloat - + /* 00CB8 809DFAB8 00000000 */ nop /* 00CBC 809DFABC 3C014220 */ lui $at, 0x4220 ## $at = 42200000 /* 00CC0 809DFAC0 44812000 */ mtc1 $at, $f4 ## $f4 = 40.00 /* 00CC4 809DFAC4 24180001 */ addiu $t8, $zero, 0x0001 ## $t8 = 00000001 /* 00CC8 809DFAC8 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 -/* 00CCC 809DFACC 46040180 */ add.s $f6, $f0, $f4 +/* 00CCC 809DFACC 46040180 */ add.s $f6, $f0, $f4 /* 00CD0 809DFAD0 3C014F00 */ lui $at, 0x4F00 ## $at = 4F000000 /* 00CD4 809DFAD4 24844348 */ addiu $a0, $a0, 0x4348 ## $a0 = 06004348 /* 00CD8 809DFAD8 444FF800 */ cfc1 $t7, $31 /* 00CDC 809DFADC 44D8F800 */ ctc1 $t8, $31 /* 00CE0 809DFAE0 00000000 */ nop -/* 00CE4 809DFAE4 46003224 */ cvt.w.s $f8, $f6 +/* 00CE4 809DFAE4 46003224 */ cvt.w.s $f8, $f6 /* 00CE8 809DFAE8 4458F800 */ cfc1 $t8, $31 /* 00CEC 809DFAEC 00000000 */ nop /* 00CF0 809DFAF0 33180078 */ andi $t8, $t8, 0x0078 ## $t8 = 00000000 -/* 00CF4 809DFAF4 53000013 */ beql $t8, $zero, .L809DFB44 -/* 00CF8 809DFAF8 44184000 */ mfc1 $t8, $f8 +/* 00CF4 809DFAF4 53000013 */ beql $t8, $zero, .L809DFB44 +/* 00CF8 809DFAF8 44184000 */ mfc1 $t8, $f8 /* 00CFC 809DFAFC 44814000 */ mtc1 $at, $f8 ## $f8 = 2147483648.00 /* 00D00 809DFB00 24180001 */ addiu $t8, $zero, 0x0001 ## $t8 = 00000001 -/* 00D04 809DFB04 46083201 */ sub.s $f8, $f6, $f8 +/* 00D04 809DFB04 46083201 */ sub.s $f8, $f6, $f8 /* 00D08 809DFB08 44D8F800 */ ctc1 $t8, $31 /* 00D0C 809DFB0C 00000000 */ nop -/* 00D10 809DFB10 46004224 */ cvt.w.s $f8, $f8 +/* 00D10 809DFB10 46004224 */ cvt.w.s $f8, $f8 /* 00D14 809DFB14 4458F800 */ cfc1 $t8, $31 /* 00D18 809DFB18 00000000 */ nop /* 00D1C 809DFB1C 33180078 */ andi $t8, $t8, 0x0078 ## $t8 = 00000000 -/* 00D20 809DFB20 17000005 */ bne $t8, $zero, .L809DFB38 +/* 00D20 809DFB20 17000005 */ bne $t8, $zero, .L809DFB38 /* 00D24 809DFB24 00000000 */ nop -/* 00D28 809DFB28 44184000 */ mfc1 $t8, $f8 +/* 00D28 809DFB28 44184000 */ mfc1 $t8, $f8 /* 00D2C 809DFB2C 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 00D30 809DFB30 10000007 */ beq $zero, $zero, .L809DFB50 +/* 00D30 809DFB30 10000007 */ beq $zero, $zero, .L809DFB50 /* 00D34 809DFB34 0301C025 */ or $t8, $t8, $at ## $t8 = 80000000 .L809DFB38: -/* 00D38 809DFB38 10000005 */ beq $zero, $zero, .L809DFB50 +/* 00D38 809DFB38 10000005 */ beq $zero, $zero, .L809DFB50 /* 00D3C 809DFB3C 2418FFFF */ addiu $t8, $zero, 0xFFFF ## $t8 = FFFFFFFF -/* 00D40 809DFB40 44184000 */ mfc1 $t8, $f8 +/* 00D40 809DFB40 44184000 */ mfc1 $t8, $f8 .L809DFB44: /* 00D44 809DFB44 00000000 */ nop -/* 00D48 809DFB48 0700FFFB */ bltz $t8, .L809DFB38 +/* 00D48 809DFB48 0700FFFB */ bltz $t8, .L809DFB38 /* 00D4C 809DFB4C 00000000 */ nop .L809DFB50: /* 00D50 809DFB50 44CFF800 */ ctc1 $t7, $31 /* 00D54 809DFB54 0C028800 */ jal SkelAnime_GetFrameCount - + /* 00D58 809DFB58 A6180278 */ sh $t8, 0x0278($s0) ## 00000278 /* 00D5C 809DFB5C 44825000 */ mtc1 $v0, $f10 ## $f10 = 0.00 /* 00D60 809DFB60 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 /* 00D64 809DFB64 44810000 */ mtc1 $at, $f0 ## $f0 = 1.00 -/* 00D68 809DFB68 46805420 */ cvt.s.w $f16, $f10 +/* 00D68 809DFB68 46805420 */ cvt.s.w $f16, $f10 /* 00D6C 809DFB6C 8E0701FC */ lw $a3, 0x01FC($s0) ## 000001FC /* 00D70 809DFB70 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 00D74 809DFB74 24190002 */ addiu $t9, $zero, 0x0002 ## $t9 = 00000002 -/* 00D78 809DFB78 44060000 */ mfc1 $a2, $f0 -/* 00D7C 809DFB7C AFB90014 */ sw $t9, 0x0014($sp) +/* 00D78 809DFB78 44060000 */ mfc1 $a2, $f0 +/* 00D7C 809DFB7C AFB90014 */ sw $t9, 0x0014($sp) /* 00D80 809DFB80 24A54348 */ addiu $a1, $a1, 0x4348 ## $a1 = 06004348 -/* 00D84 809DFB84 E7B00010 */ swc1 $f16, 0x0010($sp) +/* 00D84 809DFB84 E7B00010 */ swc1 $f16, 0x0010($sp) /* 00D88 809DFB88 260401E4 */ addiu $a0, $s0, 0x01E4 ## $a0 = 000001E4 -/* 00D8C 809DFB8C 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 00D90 809DFB90 E7A00018 */ swc1 $f0, 0x0018($sp) +/* 00D8C 809DFB8C 0C029468 */ jal SkelAnime_ChangeAnim + +/* 00D90 809DFB90 E7A00018 */ swc1 $f0, 0x0018($sp) .L809DFB94: /* 00D94 809DFB94 3C014316 */ lui $at, 0x4316 ## $at = 43160000 /* 00D98 809DFB98 44812000 */ mtc1 $at, $f4 ## $f4 = 150.00 /* 00D9C 809DFB9C C6120090 */ lwc1 $f18, 0x0090($s0) ## 00000090 -/* 00DA0 809DFBA0 4604903C */ c.lt.s $f18, $f4 +/* 00DA0 809DFBA0 4604903C */ c.lt.s $f18, $f4 /* 00DA4 809DFBA4 00000000 */ nop -/* 00DA8 809DFBA8 45020018 */ bc1fl .L809DFC0C -/* 00DAC 809DFBAC 8FBF002C */ lw $ra, 0x002C($sp) +/* 00DA8 809DFBA8 45020018 */ bc1fl .L809DFC0C +/* 00DAC 809DFBAC 8FBF002C */ lw $ra, 0x002C($sp) /* 00DB0 809DFBB0 8608008A */ lh $t0, 0x008A($s0) ## 0000008A /* 00DB4 809DFBB4 860900B6 */ lh $t1, 0x00B6($s0) ## 000000B6 -/* 00DB8 809DFBB8 01091023 */ subu $v0, $t0, $t1 -/* 00DBC 809DFBBC 00021400 */ sll $v0, $v0, 16 -/* 00DC0 809DFBC0 00021403 */ sra $v0, $v0, 16 -/* 00DC4 809DFBC4 04400003 */ bltz $v0, .L809DFBD4 -/* 00DC8 809DFBC8 00021823 */ subu $v1, $zero, $v0 -/* 00DCC 809DFBCC 10000001 */ beq $zero, $zero, .L809DFBD4 +/* 00DB8 809DFBB8 01091023 */ subu $v0, $t0, $t1 +/* 00DBC 809DFBBC 00021400 */ sll $v0, $v0, 16 +/* 00DC0 809DFBC0 00021403 */ sra $v0, $v0, 16 +/* 00DC4 809DFBC4 04400003 */ bltz $v0, .L809DFBD4 +/* 00DC8 809DFBC8 00021823 */ subu $v1, $zero, $v0 +/* 00DCC 809DFBCC 10000001 */ beq $zero, $zero, .L809DFBD4 /* 00DD0 809DFBD0 00401825 */ or $v1, $v0, $zero ## $v1 = 00000000 .L809DFBD4: -/* 00DD4 809DFBD4 286161A9 */ slti $at, $v1, 0x61A9 -/* 00DD8 809DFBD8 5420000C */ bnel $at, $zero, .L809DFC0C -/* 00DDC 809DFBDC 8FBF002C */ lw $ra, 0x002C($sp) +/* 00DD4 809DFBD4 286161A9 */ slti $at, $v1, 0x61A9 +/* 00DD8 809DFBD8 5420000C */ bnel $at, $zero, .L809DFC0C +/* 00DDC 809DFBDC 8FBF002C */ lw $ra, 0x002C($sp) /* 00DE0 809DFBE0 96020276 */ lhu $v0, 0x0276($s0) ## 00000276 /* 00DE4 809DFBE4 304A0002 */ andi $t2, $v0, 0x0002 ## $t2 = 00000000 -/* 00DE8 809DFBE8 15400007 */ bne $t2, $zero, .L809DFC08 +/* 00DE8 809DFBE8 15400007 */ bne $t2, $zero, .L809DFC08 /* 00DEC 809DFBEC 344B0002 */ ori $t3, $v0, 0x0002 ## $t3 = 00000002 /* 00DF0 809DFBF0 8E0D01EC */ lw $t5, 0x01EC($s0) ## 000001EC /* 00DF4 809DFBF4 3C0C0600 */ lui $t4, 0x0600 ## $t4 = 06000000 /* 00DF8 809DFBF8 258C4348 */ addiu $t4, $t4, 0x4348 ## $t4 = 06004348 -/* 00DFC 809DFBFC 158D0002 */ bne $t4, $t5, .L809DFC08 +/* 00DFC 809DFBFC 158D0002 */ bne $t4, $t5, .L809DFC08 /* 00E00 809DFC00 A60B0276 */ sh $t3, 0x0276($s0) ## 00000276 /* 00E04 809DFC04 A6000278 */ sh $zero, 0x0278($s0) ## 00000278 .L809DFC08: -/* 00E08 809DFC08 8FBF002C */ lw $ra, 0x002C($sp) +/* 00E08 809DFC08 8FBF002C */ lw $ra, 0x002C($sp) .L809DFC0C: -/* 00E0C 809DFC0C 8FB00028 */ lw $s0, 0x0028($sp) +/* 00E0C 809DFC0C 8FB00028 */ lw $s0, 0x0028($sp) /* 00E10 809DFC10 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 00E14 809DFC14 03E00008 */ jr $ra +/* 00E14 809DFC14 03E00008 */ jr $ra /* 00E18 809DFC18 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Cow/func_809DFE98.s b/asm/non_matchings/overlays/actors/ovl_En_Cow/func_809DFE98.s index f17102e4a6..f139308b82 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Cow/func_809DFE98.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Cow/func_809DFE98.s @@ -1,69 +1,69 @@ glabel func_809DFE98 /* 01098 809DFE98 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 -/* 0109C 809DFE9C AFB00028 */ sw $s0, 0x0028($sp) +/* 0109C 809DFE9C AFB00028 */ sw $s0, 0x0028($sp) /* 010A0 809DFEA0 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 010A4 809DFEA4 AFBF002C */ sw $ra, 0x002C($sp) +/* 010A4 809DFEA4 AFBF002C */ sw $ra, 0x002C($sp) /* 010A8 809DFEA8 248401E4 */ addiu $a0, $a0, 0x01E4 ## $a0 = 000001E4 -/* 010AC 809DFEAC AFA50044 */ sw $a1, 0x0044($sp) +/* 010AC 809DFEAC AFA50044 */ sw $a1, 0x0044($sp) /* 010B0 809DFEB0 0C02927F */ jal SkelAnime_FrameUpdateMatrix - -/* 010B4 809DFEB4 AFA40030 */ sw $a0, 0x0030($sp) -/* 010B8 809DFEB8 50400029 */ beql $v0, $zero, .L809DFF60 + +/* 010B4 809DFEB4 AFA40030 */ sw $a0, 0x0030($sp) +/* 010B8 809DFEB8 50400029 */ beql $v0, $zero, .L809DFF60 /* 010BC 809DFEBC 8E19027C */ lw $t9, 0x027C($s0) ## 0000027C /* 010C0 809DFEC0 8E0E01EC */ lw $t6, 0x01EC($s0) ## 000001EC /* 010C4 809DFEC4 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 /* 010C8 809DFEC8 24844348 */ addiu $a0, $a0, 0x4348 ## $a0 = 06004348 -/* 010CC 809DFECC 148E0014 */ bne $a0, $t6, .L809DFF20 +/* 010CC 809DFECC 148E0014 */ bne $a0, $t6, .L809DFF20 /* 010D0 809DFED0 00000000 */ nop /* 010D4 809DFED4 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 /* 010D8 809DFED8 0C028800 */ jal SkelAnime_GetFrameCount - + /* 010DC 809DFEDC 24844E98 */ addiu $a0, $a0, 0x4E98 ## $a0 = 06004E98 /* 010E0 809DFEE0 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 010E4 809DFEE4 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 /* 010E8 809DFEE8 44810000 */ mtc1 $at, $f0 ## $f0 = 1.00 -/* 010EC 809DFEEC 468021A0 */ cvt.s.w $f6, $f4 +/* 010EC 809DFEEC 468021A0 */ cvt.s.w $f6, $f4 /* 010F0 809DFEF0 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 010F4 809DFEF4 240F0002 */ addiu $t7, $zero, 0x0002 ## $t7 = 00000002 -/* 010F8 809DFEF8 44060000 */ mfc1 $a2, $f0 -/* 010FC 809DFEFC AFAF0014 */ sw $t7, 0x0014($sp) +/* 010F8 809DFEF8 44060000 */ mfc1 $a2, $f0 +/* 010FC 809DFEFC AFAF0014 */ sw $t7, 0x0014($sp) /* 01100 809DFF00 24A54E98 */ addiu $a1, $a1, 0x4E98 ## $a1 = 06004E98 -/* 01104 809DFF04 E7A60010 */ swc1 $f6, 0x0010($sp) -/* 01108 809DFF08 8FA40030 */ lw $a0, 0x0030($sp) +/* 01104 809DFF04 E7A60010 */ swc1 $f6, 0x0010($sp) +/* 01108 809DFF08 8FA40030 */ lw $a0, 0x0030($sp) /* 0110C 809DFF0C 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 01110 809DFF10 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 01114 809DFF14 E7A00018 */ swc1 $f0, 0x0018($sp) -/* 01118 809DFF18 10000011 */ beq $zero, $zero, .L809DFF60 +/* 01110 809DFF10 0C029468 */ jal SkelAnime_ChangeAnim + +/* 01114 809DFF14 E7A00018 */ swc1 $f0, 0x0018($sp) +/* 01118 809DFF18 10000011 */ beq $zero, $zero, .L809DFF60 /* 0111C 809DFF1C 8E19027C */ lw $t9, 0x027C($s0) ## 0000027C .L809DFF20: /* 01120 809DFF20 0C028800 */ jal SkelAnime_GetFrameCount - + /* 01124 809DFF24 00000000 */ nop /* 01128 809DFF28 44824000 */ mtc1 $v0, $f8 ## $f8 = 0.00 /* 0112C 809DFF2C 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 /* 01130 809DFF30 44810000 */ mtc1 $at, $f0 ## $f0 = 1.00 -/* 01134 809DFF34 468042A0 */ cvt.s.w $f10, $f8 +/* 01134 809DFF34 468042A0 */ cvt.s.w $f10, $f8 /* 01138 809DFF38 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 0113C 809DFF3C 44060000 */ mfc1 $a2, $f0 +/* 0113C 809DFF3C 44060000 */ mfc1 $a2, $f0 /* 01140 809DFF40 24A54348 */ addiu $a1, $a1, 0x4348 ## $a1 = 06004348 -/* 01144 809DFF44 8FA40030 */ lw $a0, 0x0030($sp) +/* 01144 809DFF44 8FA40030 */ lw $a0, 0x0030($sp) /* 01148 809DFF48 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 0114C 809DFF4C E7AA0010 */ swc1 $f10, 0x0010($sp) -/* 01150 809DFF50 AFA00014 */ sw $zero, 0x0014($sp) -/* 01154 809DFF54 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 01158 809DFF58 E7A00018 */ swc1 $f0, 0x0018($sp) +/* 0114C 809DFF4C E7AA0010 */ swc1 $f10, 0x0010($sp) +/* 01150 809DFF50 AFA00014 */ sw $zero, 0x0014($sp) +/* 01154 809DFF54 0C029468 */ jal SkelAnime_ChangeAnim + +/* 01158 809DFF58 E7A00018 */ swc1 $f0, 0x0018($sp) /* 0115C 809DFF5C 8E19027C */ lw $t9, 0x027C($s0) ## 0000027C .L809DFF60: /* 01160 809DFF60 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01164 809DFF64 8FA50044 */ lw $a1, 0x0044($sp) -/* 01168 809DFF68 0320F809 */ jalr $ra, $t9 +/* 01164 809DFF64 8FA50044 */ lw $a1, 0x0044($sp) +/* 01168 809DFF68 0320F809 */ jalr $ra, $t9 /* 0116C 809DFF6C 00000000 */ nop -/* 01170 809DFF70 8FBF002C */ lw $ra, 0x002C($sp) -/* 01174 809DFF74 8FB00028 */ lw $s0, 0x0028($sp) +/* 01170 809DFF70 8FBF002C */ lw $ra, 0x002C($sp) +/* 01174 809DFF74 8FB00028 */ lw $s0, 0x0028($sp) /* 01178 809DFF78 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 -/* 0117C 809DFF7C 03E00008 */ jr $ra +/* 0117C 809DFF7C 03E00008 */ jr $ra /* 01180 809DFF80 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Cow/func_809E0070.s b/asm/non_matchings/overlays/actors/ovl_En_Cow/func_809E0070.s index 3aca511e73..8b04f983dd 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Cow/func_809E0070.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Cow/func_809E0070.s @@ -1,22 +1,22 @@ glabel func_809E0070 /* 01270 809E0070 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 01274 809E0074 AFBF0024 */ sw $ra, 0x0024($sp) -/* 01278 809E0078 AFA40028 */ sw $a0, 0x0028($sp) -/* 0127C 809E007C AFA5002C */ sw $a1, 0x002C($sp) -/* 01280 809E0080 0C0250F2 */ jal func_800943C8 +/* 01274 809E0074 AFBF0024 */ sw $ra, 0x0024($sp) +/* 01278 809E0078 AFA40028 */ sw $a0, 0x0028($sp) +/* 0127C 809E007C AFA5002C */ sw $a1, 0x002C($sp) +/* 01280 809E0080 0C0250F2 */ jal func_800943C8 /* 01284 809E0084 8CA40000 */ lw $a0, 0x0000($a1) ## 00000000 -/* 01288 809E0088 8FA20028 */ lw $v0, 0x0028($sp) -/* 0128C 809E008C 8FA4002C */ lw $a0, 0x002C($sp) +/* 01288 809E0088 8FA20028 */ lw $v0, 0x0028($sp) +/* 0128C 809E008C 8FA4002C */ lw $a0, 0x002C($sp) /* 01290 809E0090 8C4501E8 */ lw $a1, 0x01E8($v0) ## 000001E8 /* 01294 809E0094 8C460204 */ lw $a2, 0x0204($v0) ## 00000204 /* 01298 809E0098 904701E6 */ lbu $a3, 0x01E6($v0) ## 000001E6 -/* 0129C 809E009C AFA00014 */ sw $zero, 0x0014($sp) -/* 012A0 809E00A0 AFA00010 */ sw $zero, 0x0010($sp) -/* 012A4 809E00A4 0C0286B2 */ jal func_800A1AC8 -/* 012A8 809E00A8 AFA20018 */ sw $v0, 0x0018($sp) -/* 012AC 809E00AC 8FBF0024 */ lw $ra, 0x0024($sp) +/* 0129C 809E009C AFA00014 */ sw $zero, 0x0014($sp) +/* 012A0 809E00A0 AFA00010 */ sw $zero, 0x0010($sp) +/* 012A4 809E00A4 0C0286B2 */ jal SkelAnime_DrawSV +/* 012A8 809E00A8 AFA20018 */ sw $v0, 0x0018($sp) +/* 012AC 809E00AC 8FBF0024 */ lw $ra, 0x0024($sp) /* 012B0 809E00B0 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 012B4 809E00B4 03E00008 */ jr $ra +/* 012B4 809E00B4 03E00008 */ jr $ra /* 012B8 809E00B8 00000000 */ nop /* 012BC 809E00BC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Crow/EnCrow_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Crow/EnCrow_Draw.s index 2a8163938c..1bff8bad0f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Crow/EnCrow_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Crow/EnCrow_Draw.s @@ -1,11 +1,11 @@ glabel EnCrow_Draw /* 013A0 809E15E0 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 013A4 809E15E4 AFBF0024 */ sw $ra, 0x0024($sp) -/* 013A8 809E15E8 AFA40028 */ sw $a0, 0x0028($sp) -/* 013AC 809E15EC AFA5002C */ sw $a1, 0x002C($sp) -/* 013B0 809E15F0 0C024F46 */ jal func_80093D18 +/* 013A4 809E15E4 AFBF0024 */ sw $ra, 0x0024($sp) +/* 013A8 809E15E8 AFA40028 */ sw $a0, 0x0028($sp) +/* 013AC 809E15EC AFA5002C */ sw $a1, 0x002C($sp) +/* 013B0 809E15F0 0C024F46 */ jal func_80093D18 /* 013B4 809E15F4 8CA40000 */ lw $a0, 0x0000($a1) ## 00000000 -/* 013B8 809E15F8 8FA20028 */ lw $v0, 0x0028($sp) +/* 013B8 809E15F8 8FA20028 */ lw $v0, 0x0028($sp) /* 013BC 809E15FC 3C0F809E */ lui $t7, %hi(func_809E1434) ## $t7 = 809E0000 /* 013C0 809E1600 3C18809E */ lui $t8, %hi(func_809E1520) ## $t8 = 809E0000 /* 013C4 809E1604 8C450180 */ lw $a1, 0x0180($v0) ## 00000180 @@ -13,14 +13,14 @@ glabel EnCrow_Draw /* 013CC 809E160C 9047017E */ lbu $a3, 0x017E($v0) ## 0000017E /* 013D0 809E1610 27181520 */ addiu $t8, $t8, %lo(func_809E1520) ## $t8 = 809E1520 /* 013D4 809E1614 25EF1434 */ addiu $t7, $t7, %lo(func_809E1434) ## $t7 = 809E1434 -/* 013D8 809E1618 AFAF0010 */ sw $t7, 0x0010($sp) -/* 013DC 809E161C AFB80014 */ sw $t8, 0x0014($sp) -/* 013E0 809E1620 8FA4002C */ lw $a0, 0x002C($sp) -/* 013E4 809E1624 0C0286B2 */ jal func_800A1AC8 -/* 013E8 809E1628 AFA20018 */ sw $v0, 0x0018($sp) -/* 013EC 809E162C 8FBF0024 */ lw $ra, 0x0024($sp) +/* 013D8 809E1618 AFAF0010 */ sw $t7, 0x0010($sp) +/* 013DC 809E161C AFB80014 */ sw $t8, 0x0014($sp) +/* 013E0 809E1620 8FA4002C */ lw $a0, 0x002C($sp) +/* 013E4 809E1624 0C0286B2 */ jal SkelAnime_DrawSV +/* 013E8 809E1628 AFA20018 */ sw $v0, 0x0018($sp) +/* 013EC 809E162C 8FBF0024 */ lw $ra, 0x0024($sp) /* 013F0 809E1630 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 013F4 809E1634 03E00008 */ jr $ra +/* 013F4 809E1634 03E00008 */ jr $ra /* 013F8 809E1638 00000000 */ nop /* 013FC 809E163C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Crow/EnCrow_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Crow/EnCrow_Init.s index 26c75d3d45..0107a44945 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Crow/EnCrow_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Crow/EnCrow_Init.s @@ -1,40 +1,40 @@ glabel EnCrow_Init /* 00000 809E0240 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 00004 809E0244 AFA5003C */ sw $a1, 0x003C($sp) -/* 00008 809E0248 AFBF002C */ sw $ra, 0x002C($sp) -/* 0000C 809E024C AFB00028 */ sw $s0, 0x0028($sp) +/* 00004 809E0244 AFA5003C */ sw $a1, 0x003C($sp) +/* 00008 809E0248 AFBF002C */ sw $ra, 0x002C($sp) +/* 0000C 809E024C AFB00028 */ sw $s0, 0x0028($sp) /* 00010 809E0250 3C05809E */ lui $a1, %hi(D_809E16CC) ## $a1 = 809E0000 /* 00014 809E0254 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 00018 809E0258 0C01E037 */ jal Actor_ProcessInitChain - + /* 0001C 809E025C 24A516CC */ addiu $a1, $a1, %lo(D_809E16CC) ## $a1 = 809E16CC /* 00020 809E0260 3C060600 */ lui $a2, 0x0600 ## $a2 = 06000000 /* 00024 809E0264 3C070600 */ lui $a3, 0x0600 ## $a3 = 06000000 /* 00028 809E0268 260E01CA */ addiu $t6, $s0, 0x01CA ## $t6 = 000001CA /* 0002C 809E026C 260F0200 */ addiu $t7, $s0, 0x0200 ## $t7 = 00000200 /* 00030 809E0270 24180009 */ addiu $t8, $zero, 0x0009 ## $t8 = 00000009 -/* 00034 809E0274 AFB80018 */ sw $t8, 0x0018($sp) -/* 00038 809E0278 AFAF0014 */ sw $t7, 0x0014($sp) -/* 0003C 809E027C AFAE0010 */ sw $t6, 0x0010($sp) +/* 00034 809E0274 AFB80018 */ sw $t8, 0x0018($sp) +/* 00038 809E0278 AFAF0014 */ sw $t7, 0x0014($sp) +/* 0003C 809E027C AFAE0010 */ sw $t6, 0x0010($sp) /* 00040 809E0280 24E700F0 */ addiu $a3, $a3, 0x00F0 ## $a3 = 060000F0 /* 00044 809E0284 24C610C0 */ addiu $a2, $a2, 0x10C0 ## $a2 = 060010C0 -/* 00048 809E0288 8FA4003C */ lw $a0, 0x003C($sp) -/* 0004C 809E028C 0C0291BE */ jal func_800A46F8 +/* 00048 809E0288 8FA4003C */ lw $a0, 0x003C($sp) +/* 0004C 809E028C 0C0291BE */ jal SkelAnime_InitSV /* 00050 809E0290 2605017C */ addiu $a1, $s0, 0x017C ## $a1 = 0000017C /* 00054 809E0294 26050238 */ addiu $a1, $s0, 0x0238 ## $a1 = 00000238 -/* 00058 809E0298 AFA50030 */ sw $a1, 0x0030($sp) -/* 0005C 809E029C 0C016EFE */ jal func_8005BBF8 -/* 00060 809E02A0 8FA4003C */ lw $a0, 0x003C($sp) +/* 00058 809E0298 AFA50030 */ sw $a1, 0x0030($sp) +/* 0005C 809E029C 0C016EFE */ jal func_8005BBF8 +/* 00060 809E02A0 8FA4003C */ lw $a0, 0x003C($sp) /* 00064 809E02A4 3C07809E */ lui $a3, %hi(D_809E1690) ## $a3 = 809E0000 /* 00068 809E02A8 26190258 */ addiu $t9, $s0, 0x0258 ## $t9 = 00000258 -/* 0006C 809E02AC 8FA50030 */ lw $a1, 0x0030($sp) -/* 00070 809E02B0 AFB90010 */ sw $t9, 0x0010($sp) +/* 0006C 809E02AC 8FA50030 */ lw $a1, 0x0030($sp) +/* 00070 809E02B0 AFB90010 */ sw $t9, 0x0010($sp) /* 00074 809E02B4 24E71690 */ addiu $a3, $a3, %lo(D_809E1690) ## $a3 = 809E1690 -/* 00078 809E02B8 8FA4003C */ lw $a0, 0x003C($sp) -/* 0007C 809E02BC 0C017014 */ jal func_8005C050 +/* 00078 809E02B8 8FA4003C */ lw $a0, 0x003C($sp) +/* 0007C 809E02BC 0C017014 */ jal func_8005C050 /* 00080 809E02C0 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 00084 809E02C4 3C08809E */ lui $t0, %hi(D_809E169C) ## $t0 = 809E0000 -/* 00088 809E02C8 8D08169C */ lw $t0, %lo(D_809E169C)($t0) +/* 00088 809E02C8 8D08169C */ lw $t0, %lo(D_809E169C)($t0) /* 0008C 809E02CC 8E0A0254 */ lw $t2, 0x0254($s0) ## 00000254 /* 00090 809E02D0 3C05809E */ lui $a1, %hi(D_809E16A8) ## $a1 = 809E0000 /* 00094 809E02D4 85090020 */ lh $t1, 0x0020($t0) ## 809E0020 @@ -42,23 +42,23 @@ glabel EnCrow_Init /* 0009C 809E02DC 24C616A0 */ addiu $a2, $a2, %lo(D_809E16A0) ## $a2 = 809E16A0 /* 000A0 809E02E0 24A516A8 */ addiu $a1, $a1, %lo(D_809E16A8) ## $a1 = 809E16A8 /* 000A4 809E02E4 26040098 */ addiu $a0, $s0, 0x0098 ## $a0 = 00000098 -/* 000A8 809E02E8 0C0187B5 */ jal func_80061ED4 +/* 000A8 809E02E8 0C0187B5 */ jal func_80061ED4 /* 000AC 809E02EC A5490036 */ sh $t1, 0x0036($t2) ## 00000036 /* 000B0 809E02F0 3C068003 */ lui $a2, 0x8003 ## $a2 = 80030000 /* 000B4 809E02F4 24C6B5EC */ addiu $a2, $a2, 0xB5EC ## $a2 = 8002B5EC /* 000B8 809E02F8 260400B4 */ addiu $a0, $s0, 0x00B4 ## $a0 = 000000B4 /* 000BC 809E02FC 3C0544FA */ lui $a1, 0x44FA ## $a1 = 44FA0000 /* 000C0 809E0300 0C00AC78 */ jal ActorShape_Init - + /* 000C4 809E0304 3C0741A0 */ lui $a3, 0x41A0 ## $a3 = 41A00000 /* 000C8 809E0308 3C01809E */ lui $at, %hi(D_809E16C8) ## $at = 809E0000 -/* 000CC 809E030C AC2016C8 */ sw $zero, %lo(D_809E16C8)($at) -/* 000D0 809E0310 0C2780D5 */ jal func_809E0354 +/* 000CC 809E030C AC2016C8 */ sw $zero, %lo(D_809E16C8)($at) +/* 000D0 809E0310 0C2780D5 */ jal func_809E0354 /* 000D4 809E0314 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 000D8 809E0318 8FBF002C */ lw $ra, 0x002C($sp) -/* 000DC 809E031C 8FB00028 */ lw $s0, 0x0028($sp) +/* 000D8 809E0318 8FBF002C */ lw $ra, 0x002C($sp) +/* 000DC 809E031C 8FB00028 */ lw $s0, 0x0028($sp) /* 000E0 809E0320 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 -/* 000E4 809E0324 03E00008 */ jr $ra +/* 000E4 809E0324 03E00008 */ jr $ra /* 000E8 809E0328 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Crow/func_809E03B4.s b/asm/non_matchings/overlays/actors/ovl_En_Crow/func_809E03B4.s index bab7875799..b8cfbff913 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Crow/func_809E03B4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Crow/func_809E03B4.s @@ -1,18 +1,18 @@ glabel func_809E03B4 /* 00174 809E03B4 27BDFF68 */ addiu $sp, $sp, 0xFF68 ## $sp = FFFFFF68 -/* 00178 809E03B8 AFB10060 */ sw $s1, 0x0060($sp) +/* 00178 809E03B8 AFB10060 */ sw $s1, 0x0060($sp) /* 0017C 809E03BC 00808825 */ or $s1, $a0, $zero ## $s1 = 00000000 -/* 00180 809E03C0 AFBF0074 */ sw $ra, 0x0074($sp) -/* 00184 809E03C4 AFB50070 */ sw $s5, 0x0070($sp) -/* 00188 809E03C8 AFB4006C */ sw $s4, 0x006C($sp) -/* 0018C 809E03CC AFB30068 */ sw $s3, 0x0068($sp) -/* 00190 809E03D0 AFB20064 */ sw $s2, 0x0064($sp) -/* 00194 809E03D4 AFB0005C */ sw $s0, 0x005C($sp) -/* 00198 809E03D8 F7BC0050 */ sdc1 $f28, 0x0050($sp) -/* 0019C 809E03DC F7BA0048 */ sdc1 $f26, 0x0048($sp) -/* 001A0 809E03E0 F7B80040 */ sdc1 $f24, 0x0040($sp) -/* 001A4 809E03E4 F7B60038 */ sdc1 $f22, 0x0038($sp) -/* 001A8 809E03E8 F7B40030 */ sdc1 $f20, 0x0030($sp) +/* 00180 809E03C0 AFBF0074 */ sw $ra, 0x0074($sp) +/* 00184 809E03C4 AFB50070 */ sw $s5, 0x0070($sp) +/* 00188 809E03C8 AFB4006C */ sw $s4, 0x006C($sp) +/* 0018C 809E03CC AFB30068 */ sw $s3, 0x0068($sp) +/* 00190 809E03D0 AFB20064 */ sw $s2, 0x0064($sp) +/* 00194 809E03D4 AFB0005C */ sw $s0, 0x005C($sp) +/* 00198 809E03D8 F7BC0050 */ sdc1 $f28, 0x0050($sp) +/* 0019C 809E03DC F7BA0048 */ sdc1 $f26, 0x0048($sp) +/* 001A0 809E03E0 F7B80040 */ sdc1 $f24, 0x0040($sp) +/* 001A4 809E03E4 F7B60038 */ sdc1 $f22, 0x0038($sp) +/* 001A8 809E03E8 F7B40030 */ sdc1 $f20, 0x0030($sp) /* 001AC 809E03EC 00A0A825 */ or $s5, $a1, $zero ## $s5 = 00000000 /* 001B0 809E03F0 0C01DE0D */ jal Math_Coss ## coss? @@ -20,56 +20,56 @@ glabel func_809E03B4 /* 001B8 809E03F8 C6240068 */ lwc1 $f4, 0x0068($s1) ## 00000068 /* 001BC 809E03FC 44801000 */ mtc1 $zero, $f2 ## $f2 = 0.00 /* 001C0 809E0400 3C01C040 */ lui $at, 0xC040 ## $at = C0400000 -/* 001C4 809E0404 46002182 */ mul.s $f6, $f4, $f0 +/* 001C4 809E0404 46002182 */ mul.s $f6, $f4, $f0 /* 001C8 809E0408 44814000 */ mtc1 $at, $f8 ## $f8 = -3.00 /* 001CC 809E040C E6220060 */ swc1 $f2, 0x0060($s1) ## 00000060 /* 001D0 809E0410 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 001D4 809E0414 3C063ECC */ lui $a2, 0x3ECC ## $a2 = 3ECC0000 /* 001D8 809E0418 240E0001 */ addiu $t6, $zero, 0x0001 ## $t6 = 00000001 -/* 001DC 809E041C 44071000 */ mfc1 $a3, $f2 +/* 001DC 809E041C 44071000 */ mfc1 $a3, $f2 /* 001E0 809E0420 E6260068 */ swc1 $f6, 0x0068($s1) ## 00000068 -/* 001E4 809E0424 AFAE0014 */ sw $t6, 0x0014($sp) +/* 001E4 809E0424 AFAE0014 */ sw $t6, 0x0014($sp) /* 001E8 809E0428 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3ECCCCCD /* 001EC 809E042C 24A500F0 */ addiu $a1, $a1, 0x00F0 ## $a1 = 060000F0 /* 001F0 809E0430 2624017C */ addiu $a0, $s1, 0x017C ## $a0 = 0000017C -/* 001F4 809E0434 E7A20010 */ swc1 $f2, 0x0010($sp) -/* 001F8 809E0438 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 001FC 809E043C E7A80018 */ swc1 $f8, 0x0018($sp) +/* 001F4 809E0434 E7A20010 */ swc1 $f2, 0x0010($sp) +/* 001F8 809E0438 0C029468 */ jal SkelAnime_ChangeAnim + +/* 001FC 809E043C E7A80018 */ swc1 $f8, 0x0018($sp) /* 00200 809E0440 3C0142C8 */ lui $at, 0x42C8 ## $at = 42C80000 /* 00204 809E0444 44818000 */ mtc1 $at, $f16 ## $f16 = 100.00 /* 00208 809E0448 C62A0050 */ lwc1 $f10, 0x0050($s1) ## 00000050 /* 0020C 809E044C 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 /* 00210 809E0450 44812000 */ mtc1 $at, $f4 ## $f4 = 20.00 -/* 00214 809E0454 46105602 */ mul.s $f24, $f10, $f16 +/* 00214 809E0454 46105602 */ mul.s $f24, $f10, $f16 /* 00218 809E0458 C6320028 */ lwc1 $f18, 0x0028($s1) ## 00000028 /* 0021C 809E045C 962F0088 */ lhu $t7, 0x0088($s1) ## 00000088 /* 00220 809E0460 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 /* 00224 809E0464 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 00228 809E0468 31F8FFFE */ andi $t8, $t7, 0xFFFE ## $t8 = 00000000 /* 0022C 809E046C A6380088 */ sh $t8, 0x0088($s1) ## 00000088 -/* 00230 809E0470 46182182 */ mul.s $f6, $f4, $f24 +/* 00230 809E0470 46182182 */ mul.s $f6, $f4, $f24 /* 00234 809E0474 240538EB */ addiu $a1, $zero, 0x38EB ## $a1 = 000038EB /* 00238 809E0478 E62000BC */ swc1 $f0, 0x00BC($s1) ## 000000BC /* 0023C 809E047C E620004C */ swc1 $f0, 0x004C($s1) ## 0000004C -/* 00240 809E0480 46069200 */ add.s $f8, $f18, $f6 +/* 00240 809E0480 46069200 */ add.s $f8, $f18, $f6 /* 00244 809E0484 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 00248 809E0488 E6280028 */ swc1 $f8, 0x0028($s1) ## 00000028 /* 0024C 809E048C 922200B1 */ lbu $v0, 0x00B1($s1) ## 000000B1 /* 00250 809E0490 24010003 */ addiu $at, $zero, 0x0003 ## $at = 00000003 /* 00254 809E0494 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 00258 809E0498 14410048 */ bne $v0, $at, .L809E05BC +/* 00258 809E0498 14410048 */ bne $v0, $at, .L809E05BC /* 0025C 809E049C 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 00260 809E04A0 24190028 */ addiu $t9, $zero, 0x0028 ## $t9 = 00000028 -/* 00264 809E04A4 AFB90010 */ sw $t9, 0x0010($sp) +/* 00264 809E04A4 AFB90010 */ sw $t9, 0x0010($sp) /* 00268 809E04A8 240600FF */ addiu $a2, $zero, 0x00FF ## $a2 = 000000FF -/* 0026C 809E04AC 0C00D09B */ jal func_8003426C +/* 0026C 809E04AC 0C00D09B */ jal func_8003426C /* 00270 809E04B0 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 /* 00274 809E04B4 3C01809E */ lui $at, %hi(D_809E16F0) ## $at = 809E0000 -/* 00278 809E04B8 C43C16F0 */ lwc1 $f28, %lo(D_809E16F0)($at) +/* 00278 809E04B8 C43C16F0 */ lwc1 $f28, %lo(D_809E16F0)($at) /* 0027C 809E04BC 3C01809E */ lui $at, %hi(D_809E16F4) ## $at = 809E0000 -/* 00280 809E04C0 C43A16F4 */ lwc1 $f26, %lo(D_809E16F4)($at) +/* 00280 809E04C0 C43A16F4 */ lwc1 $f26, %lo(D_809E16F4)($at) /* 00284 809E04C4 3C01C0E0 */ lui $at, 0xC0E0 ## $at = C0E00000 /* 00288 809E04C8 4481B000 */ mtc1 $at, $f22 ## $f22 = -7.00 /* 0028C 809E04CC 3C0140E0 */ lui $at, 0x40E0 ## $at = 40E00000 @@ -79,116 +79,116 @@ glabel func_809E03B4 /* 0029C 809E04DC 27B20084 */ addiu $s2, $sp, 0x0084 ## $s2 = FFFFFFEC /* 002A0 809E04E0 32080001 */ andi $t0, $s0, 0x0001 ## $t0 = 00000000 .L809E04E4: -/* 002A4 809E04E4 51000004 */ beql $t0, $zero, .L809E04F8 -/* 002A8 809E04E8 4600B006 */ mov.s $f0, $f22 -/* 002AC 809E04EC 10000002 */ beq $zero, $zero, .L809E04F8 -/* 002B0 809E04F0 4600A006 */ mov.s $f0, $f20 -/* 002B4 809E04F4 4600B006 */ mov.s $f0, $f22 +/* 002A4 809E04E4 51000004 */ beql $t0, $zero, .L809E04F8 +/* 002A8 809E04E8 4600B006 */ mov.s $f0, $f22 +/* 002AC 809E04EC 10000002 */ beq $zero, $zero, .L809E04F8 +/* 002B0 809E04F0 4600A006 */ mov.s $f0, $f20 +/* 002B4 809E04F4 4600B006 */ mov.s $f0, $f22 .L809E04F8: -/* 002B8 809E04F8 46180282 */ mul.s $f10, $f0, $f24 +/* 002B8 809E04F8 46180282 */ mul.s $f10, $f0, $f24 /* 002BC 809E04FC C6300024 */ lwc1 $f16, 0x0024($s1) ## 00000024 /* 002C0 809E0500 32090002 */ andi $t1, $s0, 0x0002 ## $t1 = 00000000 -/* 002C4 809E0504 46105100 */ add.s $f4, $f10, $f16 -/* 002C8 809E0508 11200003 */ beq $t1, $zero, .L809E0518 -/* 002CC 809E050C E7A40084 */ swc1 $f4, 0x0084($sp) -/* 002D0 809E0510 10000002 */ beq $zero, $zero, .L809E051C -/* 002D4 809E0514 4600A006 */ mov.s $f0, $f20 +/* 002C4 809E0504 46105100 */ add.s $f4, $f10, $f16 +/* 002C8 809E0508 11200003 */ beq $t1, $zero, .L809E0518 +/* 002CC 809E050C E7A40084 */ swc1 $f4, 0x0084($sp) +/* 002D0 809E0510 10000002 */ beq $zero, $zero, .L809E051C +/* 002D4 809E0514 4600A006 */ mov.s $f0, $f20 .L809E0518: -/* 002D8 809E0518 4600B006 */ mov.s $f0, $f22 +/* 002D8 809E0518 4600B006 */ mov.s $f0, $f22 .L809E051C: -/* 002DC 809E051C 46180482 */ mul.s $f18, $f0, $f24 +/* 002DC 809E051C 46180482 */ mul.s $f18, $f0, $f24 /* 002E0 809E0520 C6260028 */ lwc1 $f6, 0x0028($s1) ## 00000028 /* 002E4 809E0524 320A0004 */ andi $t2, $s0, 0x0004 ## $t2 = 00000000 -/* 002E8 809E0528 46069200 */ add.s $f8, $f18, $f6 -/* 002EC 809E052C 11400003 */ beq $t2, $zero, .L809E053C -/* 002F0 809E0530 E7A80088 */ swc1 $f8, 0x0088($sp) -/* 002F4 809E0534 10000002 */ beq $zero, $zero, .L809E0540 -/* 002F8 809E0538 4600A006 */ mov.s $f0, $f20 +/* 002E8 809E0528 46069200 */ add.s $f8, $f18, $f6 +/* 002EC 809E052C 11400003 */ beq $t2, $zero, .L809E053C +/* 002F0 809E0530 E7A80088 */ swc1 $f8, 0x0088($sp) +/* 002F4 809E0534 10000002 */ beq $zero, $zero, .L809E0540 +/* 002F8 809E0538 4600A006 */ mov.s $f0, $f20 .L809E053C: -/* 002FC 809E053C 4600B006 */ mov.s $f0, $f22 +/* 002FC 809E053C 4600B006 */ mov.s $f0, $f22 .L809E0540: -/* 00300 809E0540 46180282 */ mul.s $f10, $f0, $f24 +/* 00300 809E0540 46180282 */ mul.s $f10, $f0, $f24 /* 00304 809E0544 C630002C */ lwc1 $f16, 0x002C($s1) ## 0000002C -/* 00308 809E0548 46105100 */ add.s $f4, $f10, $f16 +/* 00308 809E0548 46105100 */ add.s $f4, $f10, $f16 /* 0030C 809E054C 0C03F66B */ jal Math_Rand_ZeroOne ## Rand.Next() float -/* 00310 809E0550 E7A4008C */ swc1 $f4, 0x008C($sp) -/* 00314 809E0554 461A0482 */ mul.s $f18, $f0, $f26 +/* 00310 809E0550 E7A4008C */ swc1 $f4, 0x008C($sp) +/* 00314 809E0554 461A0482 */ mul.s $f18, $f0, $f26 /* 00318 809E0558 240B0096 */ addiu $t3, $zero, 0x0096 ## $t3 = 00000096 /* 0031C 809E055C 240C0096 */ addiu $t4, $zero, 0x0096 ## $t4 = 00000096 /* 00320 809E0560 240D00FA */ addiu $t5, $zero, 0x00FA ## $t5 = 000000FA /* 00324 809E0564 240E00EB */ addiu $t6, $zero, 0x00EB ## $t6 = 000000EB /* 00328 809E0568 240F00F5 */ addiu $t7, $zero, 0x00F5 ## $t7 = 000000F5 /* 0032C 809E056C 241800FF */ addiu $t8, $zero, 0x00FF ## $t8 = 000000FF -/* 00330 809E0570 461C9180 */ add.s $f6, $f18, $f28 -/* 00334 809E0574 AFB80024 */ sw $t8, 0x0024($sp) -/* 00338 809E0578 AFAF0020 */ sw $t7, 0x0020($sp) -/* 0033C 809E057C AFAE001C */ sw $t6, 0x001C($sp) -/* 00340 809E0580 46183202 */ mul.s $f8, $f6, $f24 -/* 00344 809E0584 AFAD0018 */ sw $t5, 0x0018($sp) -/* 00348 809E0588 AFAC0014 */ sw $t4, 0x0014($sp) -/* 0034C 809E058C AFAB0010 */ sw $t3, 0x0010($sp) +/* 00330 809E0570 461C9180 */ add.s $f6, $f18, $f28 +/* 00334 809E0574 AFB80024 */ sw $t8, 0x0024($sp) +/* 00338 809E0578 AFAF0020 */ sw $t7, 0x0020($sp) +/* 0033C 809E057C AFAE001C */ sw $t6, 0x001C($sp) +/* 00340 809E0580 46183202 */ mul.s $f8, $f6, $f24 +/* 00344 809E0584 AFAD0018 */ sw $t5, 0x0018($sp) +/* 00348 809E0588 AFAC0014 */ sw $t4, 0x0014($sp) +/* 0034C 809E058C AFAB0010 */ sw $t3, 0x0010($sp) /* 00350 809E0590 02A02025 */ or $a0, $s5, $zero ## $a0 = 00000000 /* 00354 809E0594 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 /* 00358 809E0598 02403025 */ or $a2, $s2, $zero ## $a2 = FFFFFFEC -/* 0035C 809E059C E7A80028 */ swc1 $f8, 0x0028($sp) -/* 00360 809E05A0 0C00A850 */ jal func_8002A140 +/* 0035C 809E059C E7A80028 */ swc1 $f8, 0x0028($sp) +/* 00360 809E05A0 0C00A850 */ jal func_8002A140 /* 00364 809E05A4 24070096 */ addiu $a3, $zero, 0x0096 ## $a3 = 00000096 /* 00368 809E05A8 26100001 */ addiu $s0, $s0, 0x0001 ## $s0 = 00000001 -/* 0036C 809E05AC 5613FFCD */ bnel $s0, $s3, .L809E04E4 +/* 0036C 809E05AC 5613FFCD */ bnel $s0, $s3, .L809E04E4 /* 00370 809E05B0 32080001 */ andi $t0, $s0, 0x0001 ## $t0 = 00000001 -/* 00374 809E05B4 1000002B */ beq $zero, $zero, .L809E0664 +/* 00374 809E05B4 1000002B */ beq $zero, $zero, .L809E0664 /* 00378 809E05B8 8E220004 */ lw $v0, 0x0004($s1) ## 00000004 .L809E05BC: /* 0037C 809E05BC 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 00380 809E05C0 14410021 */ bne $v0, $at, .L809E0648 +/* 00380 809E05C0 14410021 */ bne $v0, $at, .L809E0648 /* 00384 809E05C4 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 00388 809E05C8 24190028 */ addiu $t9, $zero, 0x0028 ## $t9 = 00000028 -/* 0038C 809E05CC AFB90010 */ sw $t9, 0x0010($sp) +/* 0038C 809E05CC AFB90010 */ sw $t9, 0x0010($sp) /* 00390 809E05D0 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 00394 809E05D4 24054000 */ addiu $a1, $zero, 0x4000 ## $a1 = 00004000 /* 00398 809E05D8 240600FF */ addiu $a2, $zero, 0x00FF ## $a2 = 000000FF -/* 0039C 809E05DC 0C00D09B */ jal func_8003426C +/* 0039C 809E05DC 0C00D09B */ jal func_8003426C /* 003A0 809E05E0 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 /* 003A4 809E05E4 3C014248 */ lui $at, 0x4248 ## $at = 42480000 /* 003A8 809E05E8 44815000 */ mtc1 $at, $f10 ## $f10 = 50.00 /* 003AC 809E05EC 00008025 */ or $s0, $zero, $zero ## $s0 = 00000000 /* 003B0 809E05F0 26320024 */ addiu $s2, $s1, 0x0024 ## $s2 = 00000024 -/* 003B4 809E05F4 46185402 */ mul.s $f16, $f10, $f24 +/* 003B4 809E05F4 46185402 */ mul.s $f16, $f10, $f24 /* 003B8 809E05F8 24140004 */ addiu $s4, $zero, 0x0004 ## $s4 = 00000004 -/* 003BC 809E05FC 4600810D */ trunc.w.s $f4, $f16 -/* 003C0 809E0600 44132000 */ mfc1 $s3, $f4 +/* 003BC 809E05FC 4600810D */ trunc.w.s $f4, $f16 +/* 003C0 809E0600 44132000 */ mfc1 $s3, $f4 /* 003C4 809E0604 00000000 */ nop -/* 003C8 809E0608 00139C00 */ sll $s3, $s3, 16 -/* 003CC 809E060C 00139C03 */ sra $s3, $s3, 16 -/* 003D0 809E0610 00133C00 */ sll $a3, $s3, 16 +/* 003C8 809E0608 00139C00 */ sll $s3, $s3, 16 +/* 003CC 809E060C 00139C03 */ sra $s3, $s3, 16 +/* 003D0 809E0610 00133C00 */ sll $a3, $s3, 16 .L809E0614: -/* 003D4 809E0614 00073C03 */ sra $a3, $a3, 16 +/* 003D4 809E0614 00073C03 */ sra $a3, $a3, 16 /* 003D8 809E0618 02A02025 */ or $a0, $s5, $zero ## $a0 = 00000000 /* 003DC 809E061C 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 /* 003E0 809E0620 02403025 */ or $a2, $s2, $zero ## $a2 = 00000024 -/* 003E4 809E0624 AFA00010 */ sw $zero, 0x0010($sp) -/* 003E8 809E0628 AFA00014 */ sw $zero, 0x0014($sp) -/* 003EC 809E062C 0C00A935 */ jal func_8002A4D4 -/* 003F0 809E0630 AFB00018 */ sw $s0, 0x0018($sp) +/* 003E4 809E0624 AFA00010 */ sw $zero, 0x0010($sp) +/* 003E8 809E0628 AFA00014 */ sw $zero, 0x0014($sp) +/* 003EC 809E062C 0C00A935 */ jal func_8002A4D4 +/* 003F0 809E0630 AFB00018 */ sw $s0, 0x0018($sp) /* 003F4 809E0634 26100001 */ addiu $s0, $s0, 0x0001 ## $s0 = 00000001 -/* 003F8 809E0638 5614FFF6 */ bnel $s0, $s4, .L809E0614 -/* 003FC 809E063C 00133C00 */ sll $a3, $s3, 16 -/* 00400 809E0640 10000008 */ beq $zero, $zero, .L809E0664 +/* 003F8 809E0638 5614FFF6 */ bnel $s0, $s4, .L809E0614 +/* 003FC 809E063C 00133C00 */ sll $a3, $s3, 16 +/* 00400 809E0640 10000008 */ beq $zero, $zero, .L809E0664 /* 00404 809E0644 8E220004 */ lw $v0, 0x0004($s1) ## 00000004 .L809E0648: /* 00408 809E0648 24090028 */ addiu $t1, $zero, 0x0028 ## $t1 = 00000028 -/* 0040C 809E064C AFA90010 */ sw $t1, 0x0010($sp) +/* 0040C 809E064C AFA90010 */ sw $t1, 0x0010($sp) /* 00410 809E0650 24054000 */ addiu $a1, $zero, 0x4000 ## $a1 = 00004000 /* 00414 809E0654 240600FF */ addiu $a2, $zero, 0x00FF ## $a2 = 000000FF -/* 00418 809E0658 0C00D09B */ jal func_8003426C +/* 00418 809E0658 0C00D09B */ jal func_8003426C /* 0041C 809E065C 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 /* 00420 809E0660 8E220004 */ lw $v0, 0x0004($s1) ## 00000004 .L809E0664: /* 00424 809E0664 3C0E809E */ lui $t6, %hi(func_809E0E2C) ## $t6 = 809E0000 /* 00428 809E0668 25CE0E2C */ addiu $t6, $t6, %lo(func_809E0E2C) ## $t6 = 809E0E2C /* 0042C 809E066C 304A8000 */ andi $t2, $v0, 0x8000 ## $t2 = 00000000 -/* 00430 809E0670 51400005 */ beql $t2, $zero, .L809E0688 +/* 00430 809E0670 51400005 */ beql $t2, $zero, .L809E0688 /* 00434 809E0674 922B0249 */ lbu $t3, 0x0249($s1) ## 00000249 /* 00438 809E0678 44809000 */ mtc1 $zero, $f18 ## $f18 = 0.00 /* 0043C 809E067C 8E220004 */ lw $v0, 0x0004($s1) ## 00000004 @@ -200,19 +200,19 @@ glabel func_809E03B4 /* 00450 809E0690 316CFFFE */ andi $t4, $t3, 0xFFFE ## $t4 = 00000000 /* 00454 809E0694 A22C0249 */ sb $t4, 0x0249($s1) ## 00000249 /* 00458 809E0698 AE2E01C0 */ sw $t6, 0x01C0($s1) ## 000001C0 -/* 0045C 809E069C 8FBF0074 */ lw $ra, 0x0074($sp) -/* 00460 809E06A0 8FB50070 */ lw $s5, 0x0070($sp) -/* 00464 809E06A4 8FB4006C */ lw $s4, 0x006C($sp) -/* 00468 809E06A8 8FB30068 */ lw $s3, 0x0068($sp) -/* 0046C 809E06AC 8FB20064 */ lw $s2, 0x0064($sp) -/* 00470 809E06B0 8FB10060 */ lw $s1, 0x0060($sp) -/* 00474 809E06B4 8FB0005C */ lw $s0, 0x005C($sp) -/* 00478 809E06B8 D7BC0050 */ ldc1 $f28, 0x0050($sp) -/* 0047C 809E06BC D7BA0048 */ ldc1 $f26, 0x0048($sp) -/* 00480 809E06C0 D7B80040 */ ldc1 $f24, 0x0040($sp) -/* 00484 809E06C4 D7B60038 */ ldc1 $f22, 0x0038($sp) -/* 00488 809E06C8 D7B40030 */ ldc1 $f20, 0x0030($sp) -/* 0048C 809E06CC 03E00008 */ jr $ra +/* 0045C 809E069C 8FBF0074 */ lw $ra, 0x0074($sp) +/* 00460 809E06A0 8FB50070 */ lw $s5, 0x0070($sp) +/* 00464 809E06A4 8FB4006C */ lw $s4, 0x006C($sp) +/* 00468 809E06A8 8FB30068 */ lw $s3, 0x0068($sp) +/* 0046C 809E06AC 8FB20064 */ lw $s2, 0x0064($sp) +/* 00470 809E06B0 8FB10060 */ lw $s1, 0x0060($sp) +/* 00474 809E06B4 8FB0005C */ lw $s0, 0x005C($sp) +/* 00478 809E06B8 D7BC0050 */ ldc1 $f28, 0x0050($sp) +/* 0047C 809E06BC D7BA0048 */ ldc1 $f26, 0x0048($sp) +/* 00480 809E06C0 D7B80040 */ ldc1 $f24, 0x0040($sp) +/* 00484 809E06C4 D7B60038 */ ldc1 $f22, 0x0038($sp) +/* 00488 809E06C8 D7B40030 */ ldc1 $f20, 0x0030($sp) +/* 0048C 809E06CC 03E00008 */ jr $ra /* 00490 809E06D0 27BD0098 */ addiu $sp, $sp, 0x0098 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Crow/func_809E0770.s b/asm/non_matchings/overlays/actors/ovl_En_Crow/func_809E0770.s index 9e177e32c7..5f98a8bfe5 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Crow/func_809E0770.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Crow/func_809E0770.s @@ -4,33 +4,33 @@ glabel func_809E0770 /* 00538 809E0778 8C4E0000 */ lw $t6, 0x0000($v0) ## 809E16C8 /* 0053C 809E077C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 00540 809E0780 2401000A */ addiu $at, $zero, 0x000A ## $at = 0000000A -/* 00544 809E0784 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00548 809E0788 15C10015 */ bne $t6, $at, .L809E07E0 +/* 00544 809E0784 AFBF0014 */ sw $ra, 0x0014($sp) +/* 00548 809E0788 15C10015 */ bne $t6, $at, .L809E07E0 /* 0054C 809E078C 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 /* 00550 809E0790 240F0001 */ addiu $t7, $zero, 0x0001 ## $t7 = 00000001 /* 00554 809E0794 A48F001C */ sh $t7, 0x001C($a0) ## 0000001C /* 00558 809E0798 AC400000 */ sw $zero, 0x0000($v0) ## 809E16C8 /* 0055C 809E079C 3C18809E */ lui $t8, %hi(D_809E169C) ## $t8 = 809E0000 -/* 00560 809E07A0 8F18169C */ lw $t8, %lo(D_809E169C)($t8) +/* 00560 809E07A0 8F18169C */ lw $t8, %lo(D_809E169C)($t8) /* 00564 809E07A4 3C01809E */ lui $at, %hi(D_809E16F8) ## $at = 809E0000 -/* 00568 809E07A8 C42816F8 */ lwc1 $f8, %lo(D_809E16F8)($at) +/* 00568 809E07A8 C42816F8 */ lwc1 $f8, %lo(D_809E16F8)($at) /* 0056C 809E07AC 87190020 */ lh $t9, 0x0020($t8) ## 809E0020 /* 00570 809E07B0 3C0142C8 */ lui $at, 0x42C8 ## $at = 42C80000 /* 00574 809E07B4 44818000 */ mtc1 $at, $f16 ## $f16 = 100.00 /* 00578 809E07B8 44992000 */ mtc1 $t9, $f4 ## $f4 = 0.00 /* 0057C 809E07BC 8C8A0254 */ lw $t2, 0x0254($a0) ## 00000254 -/* 00580 809E07C0 468021A0 */ cvt.s.w $f6, $f4 -/* 00584 809E07C4 46083282 */ mul.s $f10, $f6, $f8 +/* 00580 809E07C0 468021A0 */ cvt.s.w $f6, $f4 +/* 00584 809E07C4 46083282 */ mul.s $f10, $f6, $f8 /* 00588 809E07C8 00000000 */ nop -/* 0058C 809E07CC 46105482 */ mul.s $f18, $f10, $f16 -/* 00590 809E07D0 4600910D */ trunc.w.s $f4, $f18 -/* 00594 809E07D4 44092000 */ mfc1 $t1, $f4 -/* 00598 809E07D8 10000007 */ beq $zero, $zero, .L809E07F8 +/* 0058C 809E07CC 46105482 */ mul.s $f18, $f10, $f16 +/* 00590 809E07D0 4600910D */ trunc.w.s $f4, $f18 +/* 00594 809E07D4 44092000 */ mfc1 $t1, $f4 +/* 00598 809E07D8 10000007 */ beq $zero, $zero, .L809E07F8 /* 0059C 809E07DC A5490036 */ sh $t1, 0x0036($t2) ## 00000036 .L809E07E0: /* 005A0 809E07E0 A4C0001C */ sh $zero, 0x001C($a2) ## 0000001C /* 005A4 809E07E4 3C0B809E */ lui $t3, %hi(D_809E169C) ## $t3 = 809E0000 -/* 005A8 809E07E8 8D6B169C */ lw $t3, %lo(D_809E169C)($t3) +/* 005A8 809E07E8 8D6B169C */ lw $t3, %lo(D_809E169C)($t3) /* 005AC 809E07EC 8CCD0254 */ lw $t5, 0x0254($a2) ## 00000254 /* 005B0 809E07F0 856C0020 */ lh $t4, 0x0020($t3) ## 809E0020 /* 005B4 809E07F4 A5AC0036 */ sh $t4, 0x0036($t5) ## 00000036 @@ -38,14 +38,14 @@ glabel func_809E0770 /* 005B8 809E07F8 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 005BC 809E07FC 24A500F0 */ addiu $a1, $a1, 0x00F0 ## $a1 = 060000F0 /* 005C0 809E0800 24C4017C */ addiu $a0, $a2, 0x017C ## $a0 = 0000017C -/* 005C4 809E0804 0C0294BE */ jal func_800A52F8 -/* 005C8 809E0808 AFA60018 */ sw $a2, 0x0018($sp) -/* 005CC 809E080C 8FA60018 */ lw $a2, 0x0018($sp) +/* 005C4 809E0804 0C0294BE */ jal SkelAnime_ChangeAnimDefaultRepeat +/* 005C8 809E0808 AFA60018 */ sw $a2, 0x0018($sp) +/* 005CC 809E080C 8FA60018 */ lw $a2, 0x0018($sp) /* 005D0 809E0810 24C40024 */ addiu $a0, $a2, 0x0024 ## $a0 = 00000024 /* 005D4 809E0814 0C01DF90 */ jal Math_Vec3f_Copy ## Vec3f_Copy /* 005D8 809E0818 24C50008 */ addiu $a1, $a2, 0x0008 ## $a1 = 00000008 -/* 005DC 809E081C 8FA60018 */ lw $a2, 0x0018($sp) +/* 005DC 809E081C 8FA60018 */ lw $a2, 0x0018($sp) /* 005E0 809E0820 3C0144FA */ lui $at, 0x44FA ## $at = 44FA0000 /* 005E4 809E0824 44813000 */ mtc1 $at, $f6 ## $f6 = 2000.00 /* 005E8 809E0828 44814000 */ mtc1 $at, $f8 ## $f8 = 2000.00 @@ -59,9 +59,9 @@ glabel func_809E0770 /* 00608 809E0848 ACCF01C0 */ sw $t7, 0x01C0($a2) ## 000001C0 /* 0060C 809E084C E4C600BC */ swc1 $f6, 0x00BC($a2) ## 000000BC /* 00610 809E0850 E4C8004C */ swc1 $f8, 0x004C($a2) ## 0000004C -/* 00614 809E0854 8FBF0014 */ lw $ra, 0x0014($sp) +/* 00614 809E0854 8FBF0014 */ lw $ra, 0x0014($sp) /* 00618 809E0858 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 0061C 809E085C 03E00008 */ jr $ra +/* 0061C 809E085C 03E00008 */ jr $ra /* 00620 809E0860 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Cs/EnCs_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Cs/EnCs_Draw.s index 41631f211f..0137503e37 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Cs/EnCs_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Cs/EnCs_Draw.s @@ -1,19 +1,19 @@ glabel EnCs_Draw /* 00CE4 809E2594 27BDFF88 */ addiu $sp, $sp, 0xFF88 ## $sp = FFFFFF88 -/* 00CE8 809E2598 AFB1002C */ sw $s1, 0x002C($sp) +/* 00CE8 809E2598 AFB1002C */ sw $s1, 0x002C($sp) /* 00CEC 809E259C 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 -/* 00CF0 809E25A0 AFBF0034 */ sw $ra, 0x0034($sp) -/* 00CF4 809E25A4 AFB20030 */ sw $s2, 0x0030($sp) -/* 00CF8 809E25A8 AFB00028 */ sw $s0, 0x0028($sp) +/* 00CF0 809E25A0 AFBF0034 */ sw $ra, 0x0034($sp) +/* 00CF4 809E25A4 AFB20030 */ sw $s2, 0x0030($sp) +/* 00CF8 809E25A8 AFB00028 */ sw $s0, 0x0028($sp) /* 00CFC 809E25AC 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 /* 00D00 809E25B0 00809025 */ or $s2, $a0, $zero ## $s2 = 00000000 /* 00D04 809E25B4 3C06809E */ lui $a2, %hi(D_809E2980) ## $a2 = 809E0000 /* 00D08 809E25B8 24C62980 */ addiu $a2, $a2, %lo(D_809E2980) ## $a2 = 809E2980 /* 00D0C 809E25BC 27A4005C */ addiu $a0, $sp, 0x005C ## $a0 = FFFFFFE4 /* 00D10 809E25C0 240703C8 */ addiu $a3, $zero, 0x03C8 ## $a3 = 000003C8 -/* 00D14 809E25C4 0C031AB1 */ jal func_800C6AC4 +/* 00D14 809E25C4 0C031AB1 */ jal Graph_OpenDisps /* 00D18 809E25C8 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 -/* 00D1C 809E25CC 0C024F46 */ jal func_80093D18 +/* 00D1C 809E25CC 0C024F46 */ jal func_80093D18 /* 00D20 809E25D0 8E240000 */ lw $a0, 0x0000($s1) ## 00000000 /* 00D24 809E25D4 8E0302C0 */ lw $v1, 0x02C0($s0) ## 000002C0 /* 00D28 809E25D8 3C0FDB06 */ lui $t7, 0xDB06 ## $t7 = DB060000 @@ -24,20 +24,20 @@ glabel EnCs_Draw /* 00D3C 809E25EC 8E5801E4 */ lw $t8, 0x01E4($s2) ## 000001E4 /* 00D40 809E25F0 3C04809E */ lui $a0, %hi(D_809E2964) ## $a0 = 809E0000 /* 00D44 809E25F4 3C0C8016 */ lui $t4, 0x8016 ## $t4 = 80160000 -/* 00D48 809E25F8 0018C880 */ sll $t9, $t8, 2 -/* 00D4C 809E25FC 00992021 */ addu $a0, $a0, $t9 -/* 00D50 809E2600 8C842964 */ lw $a0, %lo(D_809E2964)($a0) +/* 00D48 809E25F8 0018C880 */ sll $t9, $t8, 2 +/* 00D4C 809E25FC 00992021 */ addu $a0, $a0, $t9 +/* 00D50 809E2600 8C842964 */ lw $a0, %lo(D_809E2964)($a0) /* 00D54 809E2604 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 /* 00D58 809E2608 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF -/* 00D5C 809E260C 00044900 */ sll $t1, $a0, 4 -/* 00D60 809E2610 00095702 */ srl $t2, $t1, 28 -/* 00D64 809E2614 000A5880 */ sll $t3, $t2, 2 -/* 00D68 809E2618 018B6021 */ addu $t4, $t4, $t3 +/* 00D5C 809E260C 00044900 */ sll $t1, $a0, 4 +/* 00D60 809E2610 00095702 */ srl $t2, $t1, 28 +/* 00D64 809E2614 000A5880 */ sll $t3, $t2, 2 +/* 00D68 809E2618 018B6021 */ addu $t4, $t4, $t3 /* 00D6C 809E261C 8D8C6FA8 */ lw $t4, 0x6FA8($t4) ## 80166FA8 -/* 00D70 809E2620 00814024 */ and $t0, $a0, $at +/* 00D70 809E2620 00814024 */ and $t0, $a0, $at /* 00D74 809E2624 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 00D78 809E2628 010C6821 */ addu $t5, $t0, $t4 -/* 00D7C 809E262C 01A17021 */ addu $t6, $t5, $at +/* 00D78 809E2628 010C6821 */ addu $t5, $t0, $t4 +/* 00D7C 809E262C 01A17021 */ addu $t6, $t5, $at /* 00D80 809E2630 AC6E0004 */ sw $t6, 0x0004($v1) ## 00000004 /* 00D84 809E2634 9247014E */ lbu $a3, 0x014E($s2) ## 0000014E /* 00D88 809E2638 8E46016C */ lw $a2, 0x016C($s2) ## 0000016C @@ -46,29 +46,29 @@ glabel EnCs_Draw /* 00D94 809E2644 3C0F809E */ lui $t7, %hi(func_809E2784) ## $t7 = 809E0000 /* 00D98 809E2648 25EF2784 */ addiu $t7, $t7, %lo(func_809E2784) ## $t7 = 809E2784 /* 00D9C 809E264C 27182814 */ addiu $t8, $t8, %lo(func_809E2814) ## $t8 = 809E2814 -/* 00DA0 809E2650 AFB80014 */ sw $t8, 0x0014($sp) -/* 00DA4 809E2654 AFAF0010 */ sw $t7, 0x0010($sp) -/* 00DA8 809E2658 AFB20018 */ sw $s2, 0x0018($sp) -/* 00DAC 809E265C 0C0286B2 */ jal func_800A1AC8 +/* 00DA0 809E2650 AFB80014 */ sw $t8, 0x0014($sp) +/* 00DA4 809E2654 AFAF0010 */ sw $t7, 0x0010($sp) +/* 00DA8 809E2658 AFB20018 */ sw $s2, 0x0018($sp) +/* 00DAC 809E265C 0C0286B2 */ jal SkelAnime_DrawSV /* 00DB0 809E2660 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 00DB4 809E2664 3C198016 */ lui $t9, 0x8016 ## $t9 = 80160000 /* 00DB8 809E2668 9739F556 */ lhu $t9, -0x0AAA($t9) ## 8015F556 /* 00DBC 809E266C 3C010001 */ lui $at, 0x0001 ## $at = 00010000 /* 00DC0 809E2670 342117A4 */ ori $at, $at, 0x17A4 ## $at = 000117A4 /* 00DC4 809E2674 33290400 */ andi $t1, $t9, 0x0400 ## $t1 = 00000000 -/* 00DC8 809E2678 11200036 */ beq $t1, $zero, .L809E2754 -/* 00DCC 809E267C 02212021 */ addu $a0, $s1, $at +/* 00DC8 809E2678 11200036 */ beq $t1, $zero, .L809E2754 +/* 00DCC 809E267C 02212021 */ addu $a0, $s1, $at /* 00DD0 809E2680 0C02604B */ jal Object_GetIndex ## ObjectIndex /* 00DD4 809E2684 24050015 */ addiu $a1, $zero, 0x0015 ## $a1 = 00000015 -/* 00DD8 809E2688 04400032 */ bltz $v0, .L809E2754 -/* 00DDC 809E268C AFA20054 */ sw $v0, 0x0054($sp) -/* 00DE0 809E2690 0C03423F */ jal Matrix_Put +/* 00DD8 809E2688 04400032 */ bltz $v0, .L809E2754 +/* 00DDC 809E268C AFA20054 */ sw $v0, 0x0054($sp) +/* 00DE0 809E2690 0C03423F */ jal Matrix_Put /* 00DE4 809E2694 26440218 */ addiu $a0, $s2, 0x0218 ## $a0 = 00000218 /* 00DE8 809E2698 3C05809E */ lui $a1, %hi(D_809E2990) ## $a1 = 809E0000 /* 00DEC 809E269C 24A52990 */ addiu $a1, $a1, %lo(D_809E2990) ## $a1 = 809E2990 /* 00DF0 809E26A0 8E240000 */ lw $a0, 0x0000($s1) ## 00000000 -/* 00DF4 809E26A4 0C0346A2 */ jal Matrix_NewMtx +/* 00DF4 809E26A4 0C0346A2 */ jal Matrix_NewMtx /* 00DF8 809E26A8 240603E8 */ addiu $a2, $zero, 0x03E8 ## $a2 = 000003E8 /* 00DFC 809E26AC 8E0302C0 */ lw $v1, 0x02C0($s0) ## 000002C0 /* 00E00 809E26B0 3C05DB06 */ lui $a1, 0xDB06 ## $a1 = DB060000 @@ -76,19 +76,19 @@ glabel EnCs_Draw /* 00E08 809E26B8 246A0008 */ addiu $t2, $v1, 0x0008 ## $t2 = 00000008 /* 00E0C 809E26BC AE0A02C0 */ sw $t2, 0x02C0($s0) ## 000002C0 /* 00E10 809E26C0 AC650000 */ sw $a1, 0x0000($v1) ## 00000000 -/* 00E14 809E26C4 8FAB0054 */ lw $t3, 0x0054($sp) +/* 00E14 809E26C4 8FAB0054 */ lw $t3, 0x0054($sp) /* 00E18 809E26C8 24060044 */ addiu $a2, $zero, 0x0044 ## $a2 = 00000044 /* 00E1C 809E26CC 3C070001 */ lui $a3, 0x0001 ## $a3 = 00010000 -/* 00E20 809E26D0 01660019 */ multu $t3, $a2 +/* 00E20 809E26D0 01660019 */ multu $t3, $a2 /* 00E24 809E26D4 3C18DB06 */ lui $t8, 0xDB06 ## $t8 = DB060000 /* 00E28 809E26D8 37180034 */ ori $t8, $t8, 0x0034 ## $t8 = DB060034 /* 00E2C 809E26DC 2459FE40 */ addiu $t9, $v0, 0xFE40 ## $t9 = FFFFFE40 /* 00E30 809E26E0 3C0B0603 */ lui $t3, 0x0603 ## $t3 = 06030000 /* 00E34 809E26E4 256BAF70 */ addiu $t3, $t3, 0xAF70 ## $t3 = 0602AF70 /* 00E38 809E26E8 3C0ADE00 */ lui $t2, 0xDE00 ## $t2 = DE000000 -/* 00E3C 809E26EC 00004012 */ mflo $t0 -/* 00E40 809E26F0 02286021 */ addu $t4, $s1, $t0 -/* 00E44 809E26F4 01876821 */ addu $t5, $t4, $a3 +/* 00E3C 809E26EC 00004012 */ mflo $t0 +/* 00E40 809E26F0 02286021 */ addu $t4, $s1, $t0 +/* 00E44 809E26F4 01876821 */ addu $t5, $t4, $a3 /* 00E48 809E26F8 8DAE17B4 */ lw $t6, 0x17B4($t5) ## 000017B4 /* 00E4C 809E26FC AC6E0004 */ sw $t6, 0x0004($v1) ## 00000004 /* 00E50 809E2700 8E0302C0 */ lw $v1, 0x02C0($s0) ## 000002C0 @@ -106,10 +106,10 @@ glabel EnCs_Draw /* 00E80 809E2730 AE0802C0 */ sw $t0, 0x02C0($s0) ## 000002C0 /* 00E84 809E2734 AC650000 */ sw $a1, 0x0000($v1) ## 00000000 /* 00E88 809E2738 824C001E */ lb $t4, 0x001E($s2) ## 0000001E -/* 00E8C 809E273C 01860019 */ multu $t4, $a2 -/* 00E90 809E2740 00006812 */ mflo $t5 -/* 00E94 809E2744 022D7021 */ addu $t6, $s1, $t5 -/* 00E98 809E2748 01C77821 */ addu $t7, $t6, $a3 +/* 00E8C 809E273C 01860019 */ multu $t4, $a2 +/* 00E90 809E2740 00006812 */ mflo $t5 +/* 00E94 809E2744 022D7021 */ addu $t6, $s1, $t5 +/* 00E98 809E2748 01C77821 */ addu $t7, $t6, $a3 /* 00E9C 809E274C 8DF817B4 */ lw $t8, 0x17B4($t7) ## 000017BC /* 00EA0 809E2750 AC780004 */ sw $t8, 0x0004($v1) ## 00000004 .L809E2754: @@ -117,13 +117,13 @@ glabel EnCs_Draw /* 00EA8 809E2758 24C629A0 */ addiu $a2, $a2, %lo(D_809E29A0) ## $a2 = 809E29A0 /* 00EAC 809E275C 27A4005C */ addiu $a0, $sp, 0x005C ## $a0 = FFFFFFE4 /* 00EB0 809E2760 8E250000 */ lw $a1, 0x0000($s1) ## 00000000 -/* 00EB4 809E2764 0C031AD5 */ jal func_800C6B54 +/* 00EB4 809E2764 0C031AD5 */ jal Graph_CloseDisps /* 00EB8 809E2768 240703F7 */ addiu $a3, $zero, 0x03F7 ## $a3 = 000003F7 -/* 00EBC 809E276C 8FBF0034 */ lw $ra, 0x0034($sp) -/* 00EC0 809E2770 8FB00028 */ lw $s0, 0x0028($sp) -/* 00EC4 809E2774 8FB1002C */ lw $s1, 0x002C($sp) -/* 00EC8 809E2778 8FB20030 */ lw $s2, 0x0030($sp) -/* 00ECC 809E277C 03E00008 */ jr $ra +/* 00EBC 809E276C 8FBF0034 */ lw $ra, 0x0034($sp) +/* 00EC0 809E2770 8FB00028 */ lw $s0, 0x0028($sp) +/* 00EC4 809E2774 8FB1002C */ lw $s1, 0x002C($sp) +/* 00EC8 809E2778 8FB20030 */ lw $s2, 0x0030($sp) +/* 00ECC 809E277C 03E00008 */ jr $ra /* 00ED0 809E2780 27BD0078 */ addiu $sp, $sp, 0x0078 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Cs/EnCs_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Cs/EnCs_Init.s index 0f07026a1d..6d597b4d5c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Cs/EnCs_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Cs/EnCs_Init.s @@ -2,84 +2,84 @@ glabel EnCs_Init /* 00120 809E19D0 3C0E8016 */ lui $t6, 0x8016 ## $t6 = 80160000 /* 00124 809E19D4 8DCEE670 */ lw $t6, -0x1990($t6) ## 8015E670 /* 00128 809E19D8 27BDFFB8 */ addiu $sp, $sp, 0xFFB8 ## $sp = FFFFFFB8 -/* 0012C 809E19DC AFB00028 */ sw $s0, 0x0028($sp) +/* 0012C 809E19DC AFB00028 */ sw $s0, 0x0028($sp) /* 00130 809E19E0 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00134 809E19E4 AFBF002C */ sw $ra, 0x002C($sp) -/* 00138 809E19E8 11C00005 */ beq $t6, $zero, .L809E1A00 -/* 0013C 809E19EC AFA5004C */ sw $a1, 0x004C($sp) +/* 00134 809E19E4 AFBF002C */ sw $ra, 0x002C($sp) +/* 00138 809E19E8 11C00005 */ beq $t6, $zero, .L809E1A00 +/* 0013C 809E19EC AFA5004C */ sw $a1, 0x004C($sp) /* 00140 809E19F0 0C00B55C */ jal Actor_Kill - + /* 00144 809E19F4 00000000 */ nop -/* 00148 809E19F8 10000056 */ beq $zero, $zero, .L809E1B54 -/* 0014C 809E19FC 8FBF002C */ lw $ra, 0x002C($sp) +/* 00148 809E19F8 10000056 */ beq $zero, $zero, .L809E1B54 +/* 0014C 809E19FC 8FBF002C */ lw $ra, 0x002C($sp) .L809E1A00: /* 00150 809E1A00 3C068003 */ lui $a2, 0x8003 ## $a2 = 80030000 /* 00154 809E1A04 24C6B5EC */ addiu $a2, $a2, 0xB5EC ## $a2 = 8002B5EC /* 00158 809E1A08 260400B4 */ addiu $a0, $s0, 0x00B4 ## $a0 = 000000B4 /* 0015C 809E1A0C 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 /* 00160 809E1A10 0C00AC78 */ jal ActorShape_Init - + /* 00164 809E1A14 3C074198 */ lui $a3, 0x4198 ## $a3 = 41980000 /* 00168 809E1A18 2605014C */ addiu $a1, $s0, 0x014C ## $a1 = 0000014C /* 0016C 809E1A1C 3C060601 */ lui $a2, 0x0601 ## $a2 = 06010000 /* 00170 809E1A20 260F0284 */ addiu $t7, $s0, 0x0284 ## $t7 = 00000284 /* 00174 809E1A24 261802E4 */ addiu $t8, $s0, 0x02E4 ## $t8 = 000002E4 /* 00178 809E1A28 24190010 */ addiu $t9, $zero, 0x0010 ## $t9 = 00000010 -/* 0017C 809E1A2C AFB90018 */ sw $t9, 0x0018($sp) -/* 00180 809E1A30 AFB80014 */ sw $t8, 0x0014($sp) -/* 00184 809E1A34 AFAF0010 */ sw $t7, 0x0010($sp) +/* 0017C 809E1A2C AFB90018 */ sw $t9, 0x0018($sp) +/* 00180 809E1A30 AFB80014 */ sw $t8, 0x0014($sp) +/* 00184 809E1A34 AFAF0010 */ sw $t7, 0x0010($sp) /* 00188 809E1A38 24C68540 */ addiu $a2, $a2, 0x8540 ## $a2 = 06008540 -/* 0018C 809E1A3C AFA50038 */ sw $a1, 0x0038($sp) -/* 00190 809E1A40 8FA4004C */ lw $a0, 0x004C($sp) -/* 00194 809E1A44 0C0291BE */ jal func_800A46F8 +/* 0018C 809E1A3C AFA50038 */ sw $a1, 0x0038($sp) +/* 00190 809E1A40 8FA4004C */ lw $a0, 0x004C($sp) +/* 00194 809E1A44 0C0291BE */ jal SkelAnime_InitSV /* 00198 809E1A48 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 /* 0019C 809E1A4C 26050194 */ addiu $a1, $s0, 0x0194 ## $a1 = 00000194 -/* 001A0 809E1A50 AFA50034 */ sw $a1, 0x0034($sp) +/* 001A0 809E1A50 AFA50034 */ sw $a1, 0x0034($sp) /* 001A4 809E1A54 0C0170D9 */ jal ActorCollider_AllocCylinder - -/* 001A8 809E1A58 8FA4004C */ lw $a0, 0x004C($sp) + +/* 001A8 809E1A58 8FA4004C */ lw $a0, 0x004C($sp) /* 001AC 809E1A5C 3C07809E */ lui $a3, %hi(D_809E28C0) ## $a3 = 809E0000 -/* 001B0 809E1A60 8FA50034 */ lw $a1, 0x0034($sp) +/* 001B0 809E1A60 8FA50034 */ lw $a1, 0x0034($sp) /* 001B4 809E1A64 24E728C0 */ addiu $a3, $a3, %lo(D_809E28C0) ## $a3 = 809E28C0 -/* 001B8 809E1A68 8FA4004C */ lw $a0, 0x004C($sp) +/* 001B8 809E1A68 8FA4004C */ lw $a0, 0x004C($sp) /* 001BC 809E1A6C 0C01712B */ jal ActorCollider_InitCylinder - + /* 001C0 809E1A70 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 001C4 809E1A74 3C05809E */ lui $a1, %hi(D_809E28F8) ## $a1 = 809E0000 /* 001C8 809E1A78 3C06809E */ lui $a2, %hi(D_809E28EC) ## $a2 = 809E0000 /* 001CC 809E1A7C 24C628EC */ addiu $a2, $a2, %lo(D_809E28EC) ## $a2 = 809E28EC /* 001D0 809E1A80 24A528F8 */ addiu $a1, $a1, %lo(D_809E28F8) ## $a1 = 809E28F8 -/* 001D4 809E1A84 0C0187BF */ jal func_80061EFC +/* 001D4 809E1A84 0C0187BF */ jal func_80061EFC /* 001D8 809E1A88 26040098 */ addiu $a0, $s0, 0x0098 ## $a0 = 00000098 /* 001DC 809E1A8C 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 /* 001E0 809E1A90 24080004 */ addiu $t0, $zero, 0x0004 ## $t0 = 00000004 -/* 001E4 809E1A94 AFA80014 */ sw $t0, 0x0014($sp) -/* 001E8 809E1A98 44060000 */ mfc1 $a2, $f0 -/* 001EC 809E1A9C 44070000 */ mfc1 $a3, $f0 -/* 001F0 809E1AA0 8FA4004C */ lw $a0, 0x004C($sp) +/* 001E4 809E1A94 AFA80014 */ sw $t0, 0x0014($sp) +/* 001E8 809E1A98 44060000 */ mfc1 $a2, $f0 +/* 001EC 809E1A9C 44070000 */ mfc1 $a3, $f0 +/* 001F0 809E1AA0 8FA4004C */ lw $a0, 0x004C($sp) /* 001F4 809E1AA4 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 001F8 809E1AA8 0C00B92D */ jal func_8002E4B4 -/* 001FC 809E1AAC E7A00010 */ swc1 $f0, 0x0010($sp) +/* 001F8 809E1AA8 0C00B92D */ jal func_8002E4B4 +/* 001FC 809E1AAC E7A00010 */ swc1 $f0, 0x0010($sp) /* 00200 809E1AB0 3C03809E */ lui $v1, %hi(D_809E2918) ## $v1 = 809E0000 /* 00204 809E1AB4 24632918 */ addiu $v1, $v1, %lo(D_809E2918) ## $v1 = 809E2918 /* 00208 809E1AB8 0C028800 */ jal SkelAnime_GetFrameCount - + /* 0020C 809E1ABC 8C640000 */ lw $a0, 0x0000($v1) ## 809E2918 /* 00210 809E1AC0 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 00214 809E1AC4 3C03809E */ lui $v1, %hi(D_809E2918) ## $v1 = 809E0000 /* 00218 809E1AC8 24632918 */ addiu $v1, $v1, %lo(D_809E2918) ## $v1 = 809E2918 -/* 0021C 809E1ACC 468021A0 */ cvt.s.w $f6, $f4 +/* 0021C 809E1ACC 468021A0 */ cvt.s.w $f6, $f4 /* 00220 809E1AD0 90690008 */ lbu $t1, 0x0008($v1) ## 809E2920 /* 00224 809E1AD4 C468000C */ lwc1 $f8, 0x000C($v1) ## 809E2924 /* 00228 809E1AD8 8C650000 */ lw $a1, 0x0000($v1) ## 809E2918 -/* 0022C 809E1ADC 8FA40038 */ lw $a0, 0x0038($sp) +/* 0022C 809E1ADC 8FA40038 */ lw $a0, 0x0038($sp) /* 00230 809E1AE0 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 00234 809E1AE4 E7A60010 */ swc1 $f6, 0x0010($sp) +/* 00234 809E1AE4 E7A60010 */ swc1 $f6, 0x0010($sp) /* 00238 809E1AE8 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 0023C 809E1AEC AFA90014 */ sw $t1, 0x0014($sp) -/* 00240 809E1AF0 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 00244 809E1AF4 E7A80018 */ swc1 $f8, 0x0018($sp) +/* 0023C 809E1AEC AFA90014 */ sw $t1, 0x0014($sp) +/* 00240 809E1AF0 0C029468 */ jal SkelAnime_ChangeAnim + +/* 00244 809E1AF4 E7A80018 */ swc1 $f8, 0x0018($sp) /* 00248 809E1AF8 860B001C */ lh $t3, 0x001C($s0) ## 0000001C /* 0024C 809E1AFC 3C01BF80 */ lui $at, 0xBF80 ## $at = BF800000 /* 00250 809E1B00 44815000 */ mtc1 $at, $f10 ## $f10 = -1.00 @@ -94,7 +94,7 @@ glabel EnCs_Init /* 00274 809E1B24 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 00278 809E1B28 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 0027C 809E1B2C 26060210 */ addiu $a2, $s0, 0x0210 ## $a2 = 00000210 -/* 00280 809E1B30 0C27862C */ jal func_809E18B0 +/* 00280 809E1B30 0C27862C */ jal func_809E18B0 /* 00284 809E1B34 E60A006C */ swc1 $f10, 0x006C($s0) ## 0000006C /* 00288 809E1B38 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 /* 0028C 809E1B3C 44818000 */ mtc1 $at, $f16 ## $f16 = 1.00 @@ -102,11 +102,11 @@ glabel EnCs_Init /* 00294 809E1B44 25CE2134 */ addiu $t6, $t6, %lo(func_809E2134) ## $t6 = 809E2134 /* 00298 809E1B48 AE0E0190 */ sw $t6, 0x0190($s0) ## 00000190 /* 0029C 809E1B4C E610020C */ swc1 $f16, 0x020C($s0) ## 0000020C -/* 002A0 809E1B50 8FBF002C */ lw $ra, 0x002C($sp) +/* 002A0 809E1B50 8FBF002C */ lw $ra, 0x002C($sp) .L809E1B54: -/* 002A4 809E1B54 8FB00028 */ lw $s0, 0x0028($sp) +/* 002A4 809E1B54 8FB00028 */ lw $s0, 0x0028($sp) /* 002A8 809E1B58 27BD0048 */ addiu $sp, $sp, 0x0048 ## $sp = 00000000 -/* 002AC 809E1B5C 03E00008 */ jr $ra +/* 002AC 809E1B5C 03E00008 */ jr $ra /* 002B0 809E1B60 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Cs/func_809E18B0.s b/asm/non_matchings/overlays/actors/ovl_En_Cs/func_809E18B0.s index 7256907047..641a0dae0b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Cs/func_809E18B0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Cs/func_809E18B0.s @@ -1,84 +1,84 @@ glabel func_809E18B0 /* 00000 809E18B0 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 00004 809E18B4 AFBF0024 */ sw $ra, 0x0024($sp) -/* 00008 809E18B8 AFA40038 */ sw $a0, 0x0038($sp) -/* 0000C 809E18BC AFA60040 */ sw $a2, 0x0040($sp) +/* 00004 809E18B4 AFBF0024 */ sw $ra, 0x0024($sp) +/* 00008 809E18B8 AFA40038 */ sw $a0, 0x0038($sp) +/* 0000C 809E18BC AFA60040 */ sw $a2, 0x0040($sp) /* 00010 809E18C0 8CC20000 */ lw $v0, 0x0000($a2) ## 00000000 /* 00014 809E18C4 44803000 */ mtc1 $zero, $f6 ## $f6 = 0.00 -/* 00018 809E18C8 00057900 */ sll $t7, $a1, 4 -/* 0001C 809E18CC 04400003 */ bltz $v0, .L809E18DC +/* 00018 809E18C8 00057900 */ sll $t7, $a1, 4 +/* 0001C 809E18CC 04400003 */ bltz $v0, .L809E18DC /* 00020 809E18D0 3C18809E */ lui $t8, %hi(D_809E2918) ## $t8 = 809E0000 -/* 00024 809E18D4 14A20005 */ bne $a1, $v0, .L809E18EC -/* 00028 809E18D8 0005C900 */ sll $t9, $a1, 4 +/* 00024 809E18D4 14A20005 */ bne $a1, $v0, .L809E18EC +/* 00028 809E18D8 0005C900 */ sll $t9, $a1, 4 .L809E18DC: /* 0002C 809E18DC 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 /* 00030 809E18E0 27182918 */ addiu $t8, $t8, %lo(D_809E2918) ## $t8 = 809E2918 -/* 00034 809E18E4 10000005 */ beq $zero, $zero, .L809E18FC -/* 00038 809E18E8 01F81821 */ addu $v1, $t7, $t8 +/* 00034 809E18E4 10000005 */ beq $zero, $zero, .L809E18FC +/* 00038 809E18E8 01F81821 */ addu $v1, $t7, $t8 .L809E18EC: /* 0003C 809E18EC 3C08809E */ lui $t0, %hi(D_809E2918) ## $t0 = 809E0000 /* 00040 809E18F0 25082918 */ addiu $t0, $t0, %lo(D_809E2918) ## $t0 = 809E2918 -/* 00044 809E18F4 03281821 */ addu $v1, $t9, $t0 +/* 00044 809E18F4 03281821 */ addu $v1, $t9, $t0 /* 00048 809E18F8 C460000C */ lwc1 $f0, 0x000C($v1) ## 0000000C .L809E18FC: /* 0004C 809E18FC C4640004 */ lwc1 $f4, 0x0004($v1) ## 00000004 -/* 00050 809E1900 4604303E */ c.le.s $f6, $f4 +/* 00050 809E1900 4604303E */ c.le.s $f6, $f4 /* 00054 809E1904 00000000 */ nop -/* 00058 809E1908 45020017 */ bc1fl .L809E1968 +/* 00058 809E1908 45020017 */ bc1fl .L809E1968 /* 0005C 809E190C 8C640000 */ lw $a0, 0x0000($v1) ## 00000000 /* 00060 809E1910 8C640000 */ lw $a0, 0x0000($v1) ## 00000000 -/* 00064 809E1914 AFA3002C */ sw $v1, 0x002C($sp) -/* 00068 809E1918 AFA5003C */ sw $a1, 0x003C($sp) +/* 00064 809E1914 AFA3002C */ sw $v1, 0x002C($sp) +/* 00068 809E1918 AFA5003C */ sw $a1, 0x003C($sp) /* 0006C 809E191C 0C028800 */ jal SkelAnime_GetFrameCount - -/* 00070 809E1920 E7A00034 */ swc1 $f0, 0x0034($sp) + +/* 00070 809E1920 E7A00034 */ swc1 $f0, 0x0034($sp) /* 00074 809E1924 44824000 */ mtc1 $v0, $f8 ## $f8 = 0.00 -/* 00078 809E1928 8FA3002C */ lw $v1, 0x002C($sp) -/* 0007C 809E192C C7A00034 */ lwc1 $f0, 0x0034($sp) -/* 00080 809E1930 468042A0 */ cvt.s.w $f10, $f8 -/* 00084 809E1934 8FA40038 */ lw $a0, 0x0038($sp) +/* 00078 809E1928 8FA3002C */ lw $v1, 0x002C($sp) +/* 0007C 809E192C C7A00034 */ lwc1 $f0, 0x0034($sp) +/* 00080 809E1930 468042A0 */ cvt.s.w $f10, $f8 +/* 00084 809E1934 8FA40038 */ lw $a0, 0x0038($sp) /* 00088 809E1938 90690008 */ lbu $t1, 0x0008($v1) ## 00000008 /* 0008C 809E193C 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 /* 00090 809E1940 8C650000 */ lw $a1, 0x0000($v1) ## 00000000 /* 00094 809E1944 8C660004 */ lw $a2, 0x0004($v1) ## 00000004 -/* 00098 809E1948 E7AA0010 */ swc1 $f10, 0x0010($sp) -/* 0009C 809E194C E7A00018 */ swc1 $f0, 0x0018($sp) +/* 00098 809E1948 E7AA0010 */ swc1 $f10, 0x0010($sp) +/* 0009C 809E194C E7A00018 */ swc1 $f0, 0x0018($sp) /* 000A0 809E1950 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 000A4 809E1954 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 000A8 809E1958 AFA90014 */ sw $t1, 0x0014($sp) -/* 000AC 809E195C 10000016 */ beq $zero, $zero, .L809E19B8 -/* 000B0 809E1960 8FAB003C */ lw $t3, 0x003C($sp) +/* 000A4 809E1954 0C029468 */ jal SkelAnime_ChangeAnim + +/* 000A8 809E1958 AFA90014 */ sw $t1, 0x0014($sp) +/* 000AC 809E195C 10000016 */ beq $zero, $zero, .L809E19B8 +/* 000B0 809E1960 8FAB003C */ lw $t3, 0x003C($sp) /* 000B4 809E1964 8C640000 */ lw $a0, 0x0000($v1) ## 00000000 .L809E1968: -/* 000B8 809E1968 AFA3002C */ sw $v1, 0x002C($sp) -/* 000BC 809E196C AFA5003C */ sw $a1, 0x003C($sp) +/* 000B8 809E1968 AFA3002C */ sw $v1, 0x002C($sp) +/* 000BC 809E196C AFA5003C */ sw $a1, 0x003C($sp) /* 000C0 809E1970 0C028800 */ jal SkelAnime_GetFrameCount - -/* 000C4 809E1974 E7A00034 */ swc1 $f0, 0x0034($sp) + +/* 000C4 809E1974 E7A00034 */ swc1 $f0, 0x0034($sp) /* 000C8 809E1978 44828000 */ mtc1 $v0, $f16 ## $f16 = 0.00 -/* 000CC 809E197C 8FA3002C */ lw $v1, 0x002C($sp) -/* 000D0 809E1980 C7A00034 */ lwc1 $f0, 0x0034($sp) -/* 000D4 809E1984 46808420 */ cvt.s.w $f16, $f16 -/* 000D8 809E1988 8FA40038 */ lw $a0, 0x0038($sp) +/* 000CC 809E197C 8FA3002C */ lw $v1, 0x002C($sp) +/* 000D0 809E1980 C7A00034 */ lwc1 $f0, 0x0034($sp) +/* 000D4 809E1984 46808420 */ cvt.s.w $f16, $f16 +/* 000D8 809E1988 8FA40038 */ lw $a0, 0x0038($sp) /* 000DC 809E198C 44809000 */ mtc1 $zero, $f18 ## $f18 = 0.00 /* 000E0 809E1990 906A0008 */ lbu $t2, 0x0008($v1) ## 00000008 /* 000E4 809E1994 8C650000 */ lw $a1, 0x0000($v1) ## 00000000 /* 000E8 809E1998 8C660004 */ lw $a2, 0x0004($v1) ## 00000004 -/* 000EC 809E199C 44078000 */ mfc1 $a3, $f16 -/* 000F0 809E19A0 E7A00018 */ swc1 $f0, 0x0018($sp) +/* 000EC 809E199C 44078000 */ mfc1 $a3, $f16 +/* 000F0 809E19A0 E7A00018 */ swc1 $f0, 0x0018($sp) /* 000F4 809E19A4 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 000F8 809E19A8 AFAA0014 */ sw $t2, 0x0014($sp) -/* 000FC 809E19AC 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 00100 809E19B0 E7B20010 */ swc1 $f18, 0x0010($sp) -/* 00104 809E19B4 8FAB003C */ lw $t3, 0x003C($sp) +/* 000F8 809E19A8 AFAA0014 */ sw $t2, 0x0014($sp) +/* 000FC 809E19AC 0C029468 */ jal SkelAnime_ChangeAnim + +/* 00100 809E19B0 E7B20010 */ swc1 $f18, 0x0010($sp) +/* 00104 809E19B4 8FAB003C */ lw $t3, 0x003C($sp) .L809E19B8: -/* 00108 809E19B8 8FAC0040 */ lw $t4, 0x0040($sp) +/* 00108 809E19B8 8FAC0040 */ lw $t4, 0x0040($sp) /* 0010C 809E19BC AD8B0000 */ sw $t3, 0x0000($t4) ## 00000000 -/* 00110 809E19C0 8FBF0024 */ lw $ra, 0x0024($sp) +/* 00110 809E19C0 8FBF0024 */ lw $ra, 0x0024($sp) /* 00114 809E19C4 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 -/* 00118 809E19C8 03E00008 */ jr $ra +/* 00118 809E19C8 03E00008 */ jr $ra /* 0011C 809E19CC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Cs/func_809E1CB8.s b/asm/non_matchings/overlays/actors/ovl_En_Cs/func_809E1CB8.s index 7e0ecfb29e..608e7d4775 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Cs/func_809E1CB8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Cs/func_809E1CB8.s @@ -5,7 +5,7 @@ glabel func_809E1CB8 /* 00414 809E1CC4 8CAE1C44 */ lw $t6, 0x1C44($a1) ## 00001C44 /* 00418 809E1CC8 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 /* 0041C 809E1CCC 2405000F */ addiu $a1, $zero, 0x000F ## $a1 = 0000000F -/* 00420 809E1CD0 0C01B0D8 */ jal func_8006C360 +/* 00420 809E1CD0 0C01B0D8 */ jal Text_GetFaceReaction /* 00424 809E1CD4 AFAE001C */ sw $t6, 0x001C($sp) /* 00428 809E1CD8 3C0F8016 */ lui $t7, 0x8016 ## $t7 = 80160000 /* 0042C 809E1CDC 95EFF556 */ lhu $t7, -0x0AAA($t7) ## 8015F556 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Cs/func_809E1F20.s b/asm/non_matchings/overlays/actors/ovl_En_Cs/func_809E1F20.s index 92cda7030b..61bbbdeab4 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Cs/func_809E1F20.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Cs/func_809E1F20.s @@ -25,7 +25,7 @@ glabel func_809E1F20 /* 006CC 809E1F7C 46062501 */ sub.s $f20, $f4, $f6 /* 006D0 809E1F80 460A4581 */ sub.s $f22, $f8, $f10 /* 006D4 809E1F84 4600A306 */ mov.s $f12, $f20 -/* 006D8 809E1F88 0C03F494 */ jal func_800FD250 +/* 006D8 809E1F88 0C03F494 */ jal Math_atan2f /* 006DC 809E1F8C 4600B386 */ mov.s $f14, $f22 /* 006E0 809E1F90 3C01809E */ lui $at, %hi(D_809E29CC) ## $at = 809E0000 /* 006E4 809E1F94 C43829CC */ lwc1 $f24, %lo(D_809E29CC)($at) @@ -77,7 +77,7 @@ glabel func_809E1F20 /* 00790 809E2040 46128501 */ sub.s $f20, $f16, $f18 /* 00794 809E2044 46062581 */ sub.s $f22, $f4, $f6 /* 00798 809E2048 4600A306 */ mov.s $f12, $f20 -/* 0079C 809E204C 0C03F494 */ jal func_800FD250 +/* 0079C 809E204C 0C03F494 */ jal Math_atan2f /* 007A0 809E2050 4600B386 */ mov.s $f14, $f22 /* 007A4 809E2054 46180202 */ mul.s $f8, $f0, $f24 /* 007A8 809E2058 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Daiku/EnDaiku_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Daiku/EnDaiku_Draw.s index 94e25c5889..8b20a23350 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Daiku/EnDaiku_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Daiku/EnDaiku_Draw.s @@ -1,25 +1,25 @@ glabel EnDaiku_Draw /* 01278 809E3DA8 27BDFFA8 */ addiu $sp, $sp, 0xFFA8 ## $sp = FFFFFFA8 -/* 0127C 809E3DAC AFBF0024 */ sw $ra, 0x0024($sp) -/* 01280 809E3DB0 AFA40058 */ sw $a0, 0x0058($sp) -/* 01284 809E3DB4 AFA5005C */ sw $a1, 0x005C($sp) +/* 0127C 809E3DAC AFBF0024 */ sw $ra, 0x0024($sp) +/* 01280 809E3DB0 AFA40058 */ sw $a0, 0x0058($sp) +/* 01284 809E3DB4 AFA5005C */ sw $a1, 0x005C($sp) /* 01288 809E3DB8 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 /* 0128C 809E3DBC 3C06809E */ lui $a2, %hi(D_809E4170) ## $a2 = 809E0000 /* 01290 809E3DC0 24C64170 */ addiu $a2, $a2, %lo(D_809E4170) ## $a2 = 809E4170 /* 01294 809E3DC4 27A40040 */ addiu $a0, $sp, 0x0040 ## $a0 = FFFFFFE8 /* 01298 809E3DC8 240704CB */ addiu $a3, $zero, 0x04CB ## $a3 = 000004CB -/* 0129C 809E3DCC 0C031AB1 */ jal func_800C6AC4 -/* 012A0 809E3DD0 AFA50050 */ sw $a1, 0x0050($sp) -/* 012A4 809E3DD4 8FAF005C */ lw $t7, 0x005C($sp) -/* 012A8 809E3DD8 0C024F46 */ jal func_80093D18 +/* 0129C 809E3DCC 0C031AB1 */ jal Graph_OpenDisps +/* 012A0 809E3DD0 AFA50050 */ sw $a1, 0x0050($sp) +/* 012A4 809E3DD4 8FAF005C */ lw $t7, 0x005C($sp) +/* 012A8 809E3DD8 0C024F46 */ jal func_80093D18 /* 012AC 809E3DDC 8DE40000 */ lw $a0, 0x0000($t7) ## 00000000 -/* 012B0 809E3DE0 8FA90058 */ lw $t1, 0x0058($sp) -/* 012B4 809E3DE4 8FA80050 */ lw $t0, 0x0050($sp) +/* 012B0 809E3DE0 8FA90058 */ lw $t1, 0x0058($sp) +/* 012B4 809E3DE4 8FA80050 */ lw $t0, 0x0050($sp) /* 012B8 809E3DE8 3C19FB00 */ lui $t9, 0xFB00 ## $t9 = FB000000 /* 012BC 809E3DEC 8522001C */ lh $v0, 0x001C($t1) ## 0000001C /* 012C0 809E3DF0 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 /* 012C4 809E3DF4 30420003 */ andi $v0, $v0, 0x0003 ## $v0 = 00000000 -/* 012C8 809E3DF8 14400009 */ bne $v0, $zero, .L809E3E20 +/* 012C8 809E3DF8 14400009 */ bne $v0, $zero, .L809E3E20 /* 012CC 809E3DFC 00000000 */ nop /* 012D0 809E3E00 8D0202C0 */ lw $v0, 0x02C0($t0) ## 000002C0 /* 012D4 809E3E04 3C0AAA0A */ lui $t2, 0xAA0A ## $t2 = AA0A0000 @@ -27,10 +27,10 @@ glabel EnDaiku_Draw /* 012DC 809E3E0C 24580008 */ addiu $t8, $v0, 0x0008 ## $t8 = 00000008 /* 012E0 809E3E10 AD1802C0 */ sw $t8, 0x02C0($t0) ## 000002C0 /* 012E4 809E3E14 AC4A0004 */ sw $t2, 0x0004($v0) ## 00000004 -/* 012E8 809E3E18 10000020 */ beq $zero, $zero, .L809E3E9C +/* 012E8 809E3E18 10000020 */ beq $zero, $zero, .L809E3E9C /* 012EC 809E3E1C AC590000 */ sw $t9, 0x0000($v0) ## 00000000 .L809E3E20: -/* 012F0 809E3E20 14410009 */ bne $v0, $at, .L809E3E48 +/* 012F0 809E3E20 14410009 */ bne $v0, $at, .L809E3E48 /* 012F4 809E3E24 3C0CFB00 */ lui $t4, 0xFB00 ## $t4 = FB000000 /* 012F8 809E3E28 8D0202C0 */ lw $v0, 0x02C0($t0) ## 000002C0 /* 012FC 809E3E2C 3C0DAAC8 */ lui $t5, 0xAAC8 ## $t5 = AAC80000 @@ -38,11 +38,11 @@ glabel EnDaiku_Draw /* 01304 809E3E34 244B0008 */ addiu $t3, $v0, 0x0008 ## $t3 = 00000008 /* 01308 809E3E38 AD0B02C0 */ sw $t3, 0x02C0($t0) ## 000002C0 /* 0130C 809E3E3C AC4D0004 */ sw $t5, 0x0004($v0) ## 00000004 -/* 01310 809E3E40 10000016 */ beq $zero, $zero, .L809E3E9C +/* 01310 809E3E40 10000016 */ beq $zero, $zero, .L809E3E9C /* 01314 809E3E44 AC4C0000 */ sw $t4, 0x0000($v0) ## 00000000 .L809E3E48: /* 01318 809E3E48 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 0131C 809E3E4C 14410009 */ bne $v0, $at, .L809E3E74 +/* 0131C 809E3E4C 14410009 */ bne $v0, $at, .L809E3E74 /* 01320 809E3E50 3C0FFB00 */ lui $t7, 0xFB00 ## $t7 = FB000000 /* 01324 809E3E54 8D0202C0 */ lw $v0, 0x02C0($t0) ## 000002C0 /* 01328 809E3E58 3C1800E6 */ lui $t8, 0x00E6 ## $t8 = 00E60000 @@ -50,11 +50,11 @@ glabel EnDaiku_Draw /* 01330 809E3E60 244E0008 */ addiu $t6, $v0, 0x0008 ## $t6 = 00000008 /* 01334 809E3E64 AD0E02C0 */ sw $t6, 0x02C0($t0) ## 000002C0 /* 01338 809E3E68 AC580004 */ sw $t8, 0x0004($v0) ## 00000004 -/* 0133C 809E3E6C 1000000B */ beq $zero, $zero, .L809E3E9C +/* 0133C 809E3E6C 1000000B */ beq $zero, $zero, .L809E3E9C /* 01340 809E3E70 AC4F0000 */ sw $t7, 0x0000($v0) ## 00000000 .L809E3E74: /* 01344 809E3E74 24010003 */ addiu $at, $zero, 0x0003 ## $at = 00000003 -/* 01348 809E3E78 14410008 */ bne $v0, $at, .L809E3E9C +/* 01348 809E3E78 14410008 */ bne $v0, $at, .L809E3E9C /* 0134C 809E3E7C 3C0AFB00 */ lui $t2, 0xFB00 ## $t2 = FB000000 /* 01350 809E3E80 8D0202C0 */ lw $v0, 0x02C0($t0) ## 000002C0 /* 01354 809E3E84 3C0BC800 */ lui $t3, 0xC800 ## $t3 = C8000000 @@ -71,21 +71,21 @@ glabel EnDaiku_Draw /* 0137C 809E3EAC 3C0D809E */ lui $t5, %hi(func_809E3F7C) ## $t5 = 809E0000 /* 01380 809E3EB0 25AD3F7C */ addiu $t5, $t5, %lo(func_809E3F7C) ## $t5 = 809E3F7C /* 01384 809E3EB4 258C3EF8 */ addiu $t4, $t4, %lo(func_809E3EF8) ## $t4 = 809E3EF8 -/* 01388 809E3EB8 AFAC0010 */ sw $t4, 0x0010($sp) -/* 0138C 809E3EBC AFAD0014 */ sw $t5, 0x0014($sp) -/* 01390 809E3EC0 AFA90018 */ sw $t1, 0x0018($sp) -/* 01394 809E3EC4 0C0286B2 */ jal func_800A1AC8 -/* 01398 809E3EC8 8FA4005C */ lw $a0, 0x005C($sp) -/* 0139C 809E3ECC 8FAE005C */ lw $t6, 0x005C($sp) +/* 01388 809E3EB8 AFAC0010 */ sw $t4, 0x0010($sp) +/* 0138C 809E3EBC AFAD0014 */ sw $t5, 0x0014($sp) +/* 01390 809E3EC0 AFA90018 */ sw $t1, 0x0018($sp) +/* 01394 809E3EC4 0C0286B2 */ jal SkelAnime_DrawSV +/* 01398 809E3EC8 8FA4005C */ lw $a0, 0x005C($sp) +/* 0139C 809E3ECC 8FAE005C */ lw $t6, 0x005C($sp) /* 013A0 809E3ED0 3C06809E */ lui $a2, %hi(D_809E4180) ## $a2 = 809E0000 /* 013A4 809E3ED4 24C64180 */ addiu $a2, $a2, %lo(D_809E4180) ## $a2 = 809E4180 /* 013A8 809E3ED8 27A40040 */ addiu $a0, $sp, 0x0040 ## $a0 = FFFFFFE8 /* 013AC 809E3EDC 240704E7 */ addiu $a3, $zero, 0x04E7 ## $a3 = 000004E7 -/* 013B0 809E3EE0 0C031AD5 */ jal func_800C6B54 +/* 013B0 809E3EE0 0C031AD5 */ jal Graph_CloseDisps /* 013B4 809E3EE4 8DC50000 */ lw $a1, 0x0000($t6) ## 00000000 -/* 013B8 809E3EE8 8FBF0024 */ lw $ra, 0x0024($sp) +/* 013B8 809E3EE8 8FBF0024 */ lw $ra, 0x0024($sp) /* 013BC 809E3EEC 27BD0058 */ addiu $sp, $sp, 0x0058 ## $sp = 00000000 -/* 013C0 809E3EF0 03E00008 */ jr $ra +/* 013C0 809E3EF0 03E00008 */ jr $ra /* 013C4 809E3EF4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Daiku/EnDaiku_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Daiku/EnDaiku_Init.s index d8c6011b2f..f6754c59c5 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Daiku/EnDaiku_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Daiku/EnDaiku_Init.s @@ -1,71 +1,71 @@ glabel EnDaiku_Init /* 000B0 809E2BE0 27BDFFB0 */ addiu $sp, $sp, 0xFFB0 ## $sp = FFFFFFB0 -/* 000B4 809E2BE4 AFBF002C */ sw $ra, 0x002C($sp) -/* 000B8 809E2BE8 AFB00028 */ sw $s0, 0x0028($sp) -/* 000BC 809E2BEC AFA50054 */ sw $a1, 0x0054($sp) +/* 000B4 809E2BE4 AFBF002C */ sw $ra, 0x002C($sp) +/* 000B8 809E2BE8 AFB00028 */ sw $s0, 0x0028($sp) +/* 000BC 809E2BEC AFA50054 */ sw $a1, 0x0054($sp) /* 000C0 809E2BF0 8482001C */ lh $v0, 0x001C($a0) ## 0000001C /* 000C4 809E2BF4 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 000C8 809E2BF8 24080001 */ addiu $t0, $zero, 0x0001 ## $t0 = 00000001 /* 000CC 809E2BFC 30420003 */ andi $v0, $v0, 0x0003 ## $v0 = 00000000 -/* 000D0 809E2C00 14400009 */ bne $v0, $zero, .L809E2C28 +/* 000D0 809E2C00 14400009 */ bne $v0, $zero, .L809E2C28 /* 000D4 809E2C04 00001825 */ or $v1, $zero, $zero ## $v1 = 00000000 /* 000D8 809E2C08 3C048016 */ lui $a0, 0x8016 ## $a0 = 80160000 /* 000DC 809E2C0C 2484E660 */ addiu $a0, $a0, 0xE660 ## $a0 = 8015E660 /* 000E0 809E2C10 948E0EE6 */ lhu $t6, 0x0EE6($a0) ## 8015F546 /* 000E4 809E2C14 31CF0001 */ andi $t7, $t6, 0x0001 ## $t7 = 00000000 -/* 000E8 809E2C18 11E00003 */ beq $t7, $zero, .L809E2C28 +/* 000E8 809E2C18 11E00003 */ beq $t7, $zero, .L809E2C28 /* 000EC 809E2C1C 00000000 */ nop -/* 000F0 809E2C20 1000001C */ beq $zero, $zero, .L809E2C94 +/* 000F0 809E2C20 1000001C */ beq $zero, $zero, .L809E2C94 /* 000F4 809E2C24 24030001 */ addiu $v1, $zero, 0x0001 ## $v1 = 00000001 .L809E2C28: /* 000F8 809E2C28 3C048016 */ lui $a0, 0x8016 ## $a0 = 80160000 /* 000FC 809E2C2C 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 00100 809E2C30 14410007 */ bne $v0, $at, .L809E2C50 +/* 00100 809E2C30 14410007 */ bne $v0, $at, .L809E2C50 /* 00104 809E2C34 2484E660 */ addiu $a0, $a0, 0xE660 ## $a0 = 8015E660 /* 00108 809E2C38 94980EE6 */ lhu $t8, 0x0EE6($a0) ## 8015F546 /* 0010C 809E2C3C 33190002 */ andi $t9, $t8, 0x0002 ## $t9 = 00000000 -/* 00110 809E2C40 53200004 */ beql $t9, $zero, .L809E2C54 +/* 00110 809E2C40 53200004 */ beql $t9, $zero, .L809E2C54 /* 00114 809E2C44 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 00118 809E2C48 10000012 */ beq $zero, $zero, .L809E2C94 +/* 00118 809E2C48 10000012 */ beq $zero, $zero, .L809E2C94 /* 0011C 809E2C4C 24030001 */ addiu $v1, $zero, 0x0001 ## $v1 = 00000001 .L809E2C50: /* 00120 809E2C50 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 .L809E2C54: -/* 00124 809E2C54 54410008 */ bnel $v0, $at, .L809E2C78 +/* 00124 809E2C54 54410008 */ bnel $v0, $at, .L809E2C78 /* 00128 809E2C58 24010003 */ addiu $at, $zero, 0x0003 ## $at = 00000003 /* 0012C 809E2C5C 94890EE6 */ lhu $t1, 0x0EE6($a0) ## 8015F546 /* 00130 809E2C60 312A0004 */ andi $t2, $t1, 0x0004 ## $t2 = 00000000 -/* 00134 809E2C64 51400004 */ beql $t2, $zero, .L809E2C78 +/* 00134 809E2C64 51400004 */ beql $t2, $zero, .L809E2C78 /* 00138 809E2C68 24010003 */ addiu $at, $zero, 0x0003 ## $at = 00000003 -/* 0013C 809E2C6C 10000009 */ beq $zero, $zero, .L809E2C94 +/* 0013C 809E2C6C 10000009 */ beq $zero, $zero, .L809E2C94 /* 00140 809E2C70 24030001 */ addiu $v1, $zero, 0x0001 ## $v1 = 00000001 /* 00144 809E2C74 24010003 */ addiu $at, $zero, 0x0003 ## $at = 00000003 .L809E2C78: -/* 00148 809E2C78 54410007 */ bnel $v0, $at, .L809E2C98 +/* 00148 809E2C78 54410007 */ bnel $v0, $at, .L809E2C98 /* 0014C 809E2C7C 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 /* 00150 809E2C80 948B0EE6 */ lhu $t3, 0x0EE6($a0) ## 8015F546 /* 00154 809E2C84 316C0008 */ andi $t4, $t3, 0x0008 ## $t4 = 00000000 -/* 00158 809E2C88 51800003 */ beql $t4, $zero, .L809E2C98 +/* 00158 809E2C88 51800003 */ beql $t4, $zero, .L809E2C98 /* 0015C 809E2C8C 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 /* 00160 809E2C90 24030001 */ addiu $v1, $zero, 0x0001 ## $v1 = 00000001 .L809E2C94: /* 00164 809E2C94 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 .L809E2C98: -/* 00168 809E2C98 14610008 */ bne $v1, $at, .L809E2CBC +/* 00168 809E2C98 14610008 */ bne $v1, $at, .L809E2CBC /* 0016C 809E2C9C 260400B4 */ addiu $a0, $s0, 0x00B4 ## $a0 = 000000B4 -/* 00170 809E2CA0 8FAD0054 */ lw $t5, 0x0054($sp) +/* 00170 809E2CA0 8FAD0054 */ lw $t5, 0x0054($sp) /* 00174 809E2CA4 2401000C */ addiu $at, $zero, 0x000C ## $at = 0000000C /* 00178 809E2CA8 85AE00A4 */ lh $t6, 0x00A4($t5) ## 000000A4 -/* 0017C 809E2CAC 15C10003 */ bne $t6, $at, .L809E2CBC +/* 0017C 809E2CAC 15C10003 */ bne $t6, $at, .L809E2CBC /* 00180 809E2CB0 00000000 */ nop -/* 00184 809E2CB4 10000008 */ beq $zero, $zero, .L809E2CD8 +/* 00184 809E2CB4 10000008 */ beq $zero, $zero, .L809E2CD8 /* 00188 809E2CB8 00004025 */ or $t0, $zero, $zero ## $t0 = 00000000 .L809E2CBC: -/* 0018C 809E2CBC 14600006 */ bne $v1, $zero, .L809E2CD8 -/* 00190 809E2CC0 8FAF0054 */ lw $t7, 0x0054($sp) +/* 0018C 809E2CBC 14600006 */ bne $v1, $zero, .L809E2CD8 +/* 00190 809E2CC0 8FAF0054 */ lw $t7, 0x0054($sp) /* 00194 809E2CC4 85F800A4 */ lh $t8, 0x00A4($t7) ## 000000A4 /* 00198 809E2CC8 24010039 */ addiu $at, $zero, 0x0039 ## $at = 00000039 -/* 0019C 809E2CCC 57010003 */ bnel $t8, $at, .L809E2CDC +/* 0019C 809E2CCC 57010003 */ bnel $t8, $at, .L809E2CDC /* 001A0 809E2CD0 861900B8 */ lh $t9, 0x00B8($s0) ## 000000B8 /* 001A4 809E2CD4 00004025 */ or $t0, $zero, $zero ## $t0 = 00000000 .L809E2CD8: @@ -75,81 +75,81 @@ glabel EnDaiku_Init /* 001B0 809E2CE0 3C068003 */ lui $a2, 0x8003 ## $a2 = 80030000 /* 001B4 809E2CE4 3329003F */ andi $t1, $t9, 0x003F ## $t1 = 00000000 /* 001B8 809E2CE8 AE090240 */ sw $t1, 0x0240($s0) ## 00000240 -/* 001BC 809E2CEC AFA80044 */ sw $t0, 0x0044($sp) +/* 001BC 809E2CEC AFA80044 */ sw $t0, 0x0044($sp) /* 001C0 809E2CF0 24C6B5EC */ addiu $a2, $a2, 0xB5EC ## $a2 = 8002B5EC /* 001C4 809E2CF4 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 /* 001C8 809E2CF8 0C00AC78 */ jal ActorShape_Init - + /* 001CC 809E2CFC 3C074220 */ lui $a3, 0x4220 ## $a3 = 42200000 /* 001D0 809E2D00 2605014C */ addiu $a1, $s0, 0x014C ## $a1 = 0000014C /* 001D4 809E2D04 3C060600 */ lui $a2, 0x0600 ## $a2 = 06000000 /* 001D8 809E2D08 260A026C */ addiu $t2, $s0, 0x026C ## $t2 = 0000026C /* 001DC 809E2D0C 260B02D2 */ addiu $t3, $s0, 0x02D2 ## $t3 = 000002D2 /* 001E0 809E2D10 240C0011 */ addiu $t4, $zero, 0x0011 ## $t4 = 00000011 -/* 001E4 809E2D14 AFAC0018 */ sw $t4, 0x0018($sp) -/* 001E8 809E2D18 AFAB0014 */ sw $t3, 0x0014($sp) -/* 001EC 809E2D1C AFAA0010 */ sw $t2, 0x0010($sp) +/* 001E4 809E2D14 AFAC0018 */ sw $t4, 0x0018($sp) +/* 001E8 809E2D18 AFAB0014 */ sw $t3, 0x0014($sp) +/* 001EC 809E2D1C AFAA0010 */ sw $t2, 0x0010($sp) /* 001F0 809E2D20 24C67958 */ addiu $a2, $a2, 0x7958 ## $a2 = 06007958 -/* 001F4 809E2D24 AFA50038 */ sw $a1, 0x0038($sp) -/* 001F8 809E2D28 8FA40054 */ lw $a0, 0x0054($sp) -/* 001FC 809E2D2C 0C0291BE */ jal func_800A46F8 +/* 001F4 809E2D24 AFA50038 */ sw $a1, 0x0038($sp) +/* 001F8 809E2D28 8FA40054 */ lw $a0, 0x0054($sp) +/* 001FC 809E2D2C 0C0291BE */ jal SkelAnime_InitSV /* 00200 809E2D30 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 00204 809E2D34 8FA80044 */ lw $t0, 0x0044($sp) -/* 00208 809E2D38 8FA40054 */ lw $a0, 0x0054($sp) +/* 00204 809E2D34 8FA80044 */ lw $t0, 0x0044($sp) +/* 00208 809E2D38 8FA40054 */ lw $a0, 0x0054($sp) /* 0020C 809E2D3C 26050194 */ addiu $a1, $s0, 0x0194 ## $a1 = 00000194 -/* 00210 809E2D40 15000005 */ bne $t0, $zero, .L809E2D58 +/* 00210 809E2D40 15000005 */ bne $t0, $zero, .L809E2D58 /* 00214 809E2D44 00000000 */ nop /* 00218 809E2D48 0C00B55C */ jal Actor_Kill - + /* 0021C 809E2D4C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00220 809E2D50 10000071 */ beq $zero, $zero, .L809E2F18 -/* 00224 809E2D54 8FBF002C */ lw $ra, 0x002C($sp) +/* 00220 809E2D50 10000071 */ beq $zero, $zero, .L809E2F18 +/* 00224 809E2D54 8FBF002C */ lw $ra, 0x002C($sp) .L809E2D58: /* 00228 809E2D58 0C0170D9 */ jal ActorCollider_AllocCylinder - -/* 0022C 809E2D5C AFA50034 */ sw $a1, 0x0034($sp) + +/* 0022C 809E2D5C AFA50034 */ sw $a1, 0x0034($sp) /* 00230 809E2D60 3C07809E */ lui $a3, %hi(D_809E4060) ## $a3 = 809E0000 -/* 00234 809E2D64 8FA50034 */ lw $a1, 0x0034($sp) +/* 00234 809E2D64 8FA50034 */ lw $a1, 0x0034($sp) /* 00238 809E2D68 24E74060 */ addiu $a3, $a3, %lo(D_809E4060) ## $a3 = 809E4060 -/* 0023C 809E2D6C 8FA40054 */ lw $a0, 0x0054($sp) +/* 0023C 809E2D6C 8FA40054 */ lw $a0, 0x0054($sp) /* 00240 809E2D70 0C01712B */ jal ActorCollider_InitCylinder - + /* 00244 809E2D74 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 00248 809E2D78 3C05809E */ lui $a1, %hi(D_809E4098) ## $a1 = 809E0000 /* 0024C 809E2D7C 3C06809E */ lui $a2, %hi(D_809E408C) ## $a2 = 809E0000 /* 00250 809E2D80 24C6408C */ addiu $a2, $a2, %lo(D_809E408C) ## $a2 = 809E408C /* 00254 809E2D84 24A54098 */ addiu $a1, $a1, %lo(D_809E4098) ## $a1 = 809E4098 -/* 00258 809E2D88 0C0187BF */ jal func_80061EFC +/* 00258 809E2D88 0C0187BF */ jal func_80061EFC /* 0025C 809E2D8C 26040098 */ addiu $a0, $s0, 0x0098 ## $a0 = 00000098 /* 00260 809E2D90 3C03809E */ lui $v1, %hi(D_809E40B8) ## $v1 = 809E0000 /* 00264 809E2D94 246340B8 */ addiu $v1, $v1, %lo(D_809E40B8) ## $v1 = 809E40B8 /* 00268 809E2D98 0C028800 */ jal SkelAnime_GetFrameCount - + /* 0026C 809E2D9C 8C640000 */ lw $a0, 0x0000($v1) ## 809E40B8 /* 00270 809E2DA0 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 00274 809E2DA4 3C03809E */ lui $v1, %hi(D_809E40B8) ## $v1 = 809E0000 /* 00278 809E2DA8 246340B8 */ addiu $v1, $v1, %lo(D_809E40B8) ## $v1 = 809E40B8 -/* 0027C 809E2DAC 468021A0 */ cvt.s.w $f6, $f4 +/* 0027C 809E2DAC 468021A0 */ cvt.s.w $f6, $f4 /* 00280 809E2DB0 906D0008 */ lbu $t5, 0x0008($v1) ## 809E40C0 /* 00284 809E2DB4 C468000C */ lwc1 $f8, 0x000C($v1) ## 809E40C4 /* 00288 809E2DB8 8C650000 */ lw $a1, 0x0000($v1) ## 809E40B8 -/* 0028C 809E2DBC 8FA40038 */ lw $a0, 0x0038($sp) +/* 0028C 809E2DBC 8FA40038 */ lw $a0, 0x0038($sp) /* 00290 809E2DC0 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 00294 809E2DC4 E7A60010 */ swc1 $f6, 0x0010($sp) +/* 00294 809E2DC4 E7A60010 */ swc1 $f6, 0x0010($sp) /* 00298 809E2DC8 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 0029C 809E2DCC AFAD0014 */ sw $t5, 0x0014($sp) -/* 002A0 809E2DD0 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 002A4 809E2DD4 E7A80018 */ swc1 $f8, 0x0018($sp) +/* 0029C 809E2DCC AFAD0014 */ sw $t5, 0x0014($sp) +/* 002A0 809E2DD0 0C029468 */ jal SkelAnime_ChangeAnim + +/* 002A4 809E2DD4 E7A80018 */ swc1 $f8, 0x0018($sp) /* 002A8 809E2DD8 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 /* 002AC 809E2DDC 240E0004 */ addiu $t6, $zero, 0x0004 ## $t6 = 00000004 -/* 002B0 809E2DE0 AFAE0014 */ sw $t6, 0x0014($sp) -/* 002B4 809E2DE4 44060000 */ mfc1 $a2, $f0 -/* 002B8 809E2DE8 44070000 */ mfc1 $a3, $f0 -/* 002BC 809E2DEC 8FA40054 */ lw $a0, 0x0054($sp) +/* 002B0 809E2DE0 AFAE0014 */ sw $t6, 0x0014($sp) +/* 002B4 809E2DE4 44060000 */ mfc1 $a2, $f0 +/* 002B8 809E2DE8 44070000 */ mfc1 $a3, $f0 +/* 002BC 809E2DEC 8FA40054 */ lw $a0, 0x0054($sp) /* 002C0 809E2DF0 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 002C4 809E2DF4 0C00B92D */ jal func_8002E4B4 -/* 002C8 809E2DF8 E7A00010 */ swc1 $f0, 0x0010($sp) +/* 002C4 809E2DF4 0C00B92D */ jal func_8002E4B4 +/* 002C8 809E2DF8 E7A00010 */ swc1 $f0, 0x0010($sp) /* 002CC 809E2DFC 8A090030 */ lwl $t1, 0x0030($s0) ## 00000030 /* 002D0 809E2E00 9A090033 */ lwr $t1, 0x0033($s0) ## 00000033 /* 002D4 809E2E04 8E0B0024 */ lw $t3, 0x0024($s0) ## 00000024 @@ -169,42 +169,42 @@ glabel EnDaiku_Init /* 0030C 809E2E3C A609033C */ sh $t1, 0x033C($s0) ## 0000033C /* 00310 809E2E40 AE0B0348 */ sw $t3, 0x0348($s0) ## 00000348 /* 00314 809E2E44 AE0A0344 */ sw $t2, 0x0344($s0) ## 00000344 -/* 00318 809E2E48 8FAC0054 */ lw $t4, 0x0054($sp) +/* 00318 809E2E48 8FAC0054 */ lw $t4, 0x0054($sp) /* 0031C 809E2E4C 2401000C */ addiu $at, $zero, 0x000C ## $at = 0000000C /* 00320 809E2E50 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 00324 809E2E54 858D00A4 */ lh $t5, 0x00A4($t4) ## 000000A4 /* 00328 809E2E58 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 -/* 0032C 809E2E5C 55A1000B */ bnel $t5, $at, .L809E2E8C +/* 0032C 809E2E5C 55A1000B */ bnel $t5, $at, .L809E2E8C /* 00330 809E2E60 8602001C */ lh $v0, 0x001C($s0) ## 0000001C -/* 00334 809E2E64 0C278ACC */ jal func_809E2B30 +/* 00334 809E2E64 0C278ACC */ jal func_809E2B30 /* 00338 809E2E68 260601F4 */ addiu $a2, $s0, 0x01F4 ## $a2 = 000001F4 /* 0033C 809E2E6C 8E0E023C */ lw $t6, 0x023C($s0) ## 0000023C /* 00340 809E2E70 3C18809E */ lui $t8, %hi(func_809E336C) ## $t8 = 809E0000 /* 00344 809E2E74 2718336C */ addiu $t8, $t8, %lo(func_809E336C) ## $t8 = 809E336C /* 00348 809E2E78 35CF0006 */ ori $t7, $t6, 0x0006 ## $t7 = 00000006 /* 0034C 809E2E7C AE0F023C */ sw $t7, 0x023C($s0) ## 0000023C -/* 00350 809E2E80 10000024 */ beq $zero, $zero, .L809E2F14 +/* 00350 809E2E80 10000024 */ beq $zero, $zero, .L809E2F14 /* 00354 809E2E84 AE180190 */ sw $t8, 0x0190($s0) ## 00000190 /* 00358 809E2E88 8602001C */ lh $v0, 0x001C($s0) ## 0000001C .L809E2E8C: /* 0035C 809E2E8C 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 /* 00360 809E2E90 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 00364 809E2E94 30420003 */ andi $v0, $v0, 0x0003 ## $v0 = 00000000 -/* 00368 809E2E98 10410004 */ beq $v0, $at, .L809E2EAC +/* 00368 809E2E98 10410004 */ beq $v0, $at, .L809E2EAC /* 0036C 809E2E9C 24050004 */ addiu $a1, $zero, 0x0004 ## $a1 = 00000004 /* 00370 809E2EA0 24010003 */ addiu $at, $zero, 0x0003 ## $at = 00000003 -/* 00374 809E2EA4 14410007 */ bne $v0, $at, .L809E2EC4 +/* 00374 809E2EA4 14410007 */ bne $v0, $at, .L809E2EC4 /* 00378 809E2EA8 260601F4 */ addiu $a2, $s0, 0x01F4 ## $a2 = 000001F4 .L809E2EAC: -/* 0037C 809E2EAC 0C278ACC */ jal func_809E2B30 +/* 0037C 809E2EAC 0C278ACC */ jal func_809E2B30 /* 00380 809E2EB0 260601F4 */ addiu $a2, $s0, 0x01F4 ## $a2 = 000001F4 /* 00384 809E2EB4 8E19023C */ lw $t9, 0x023C($s0) ## 0000023C /* 00388 809E2EB8 37290002 */ ori $t1, $t9, 0x0002 ## $t1 = 00000002 -/* 0038C 809E2EBC 10000007 */ beq $zero, $zero, .L809E2EDC +/* 0038C 809E2EBC 10000007 */ beq $zero, $zero, .L809E2EDC /* 00390 809E2EC0 AE09023C */ sw $t1, 0x023C($s0) ## 0000023C .L809E2EC4: /* 00394 809E2EC4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00398 809E2EC8 0C278ACC */ jal func_809E2B30 +/* 00398 809E2EC8 0C278ACC */ jal func_809E2B30 /* 0039C 809E2ECC 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 003A0 809E2ED0 8E0A023C */ lw $t2, 0x023C($s0) ## 0000023C /* 003A4 809E2ED4 354B0006 */ ori $t3, $t2, 0x0006 ## $t3 = 00000006 @@ -216,21 +216,21 @@ glabel EnDaiku_Init /* 003B4 809E2EE4 C610015C */ lwc1 $f16, 0x015C($s0) ## 0000015C /* 003B8 809E2EE8 3C0E809E */ lui $t6, %hi(func_809E3338) ## $t6 = 809E0000 /* 003BC 809E2EEC 25CE3338 */ addiu $t6, $t6, %lo(func_809E3338) ## $t6 = 809E3338 -/* 003C0 809E2EF0 46100482 */ mul.s $f18, $f0, $f16 +/* 003C0 809E2EF0 46100482 */ mul.s $f18, $f0, $f16 /* 003C4 809E2EF4 AE0E0190 */ sw $t6, 0x0190($s0) ## 00000190 -/* 003C8 809E2EF8 4600910D */ trunc.w.s $f4, $f18 -/* 003CC 809E2EFC 440D2000 */ mfc1 $t5, $f4 +/* 003C8 809E2EF8 4600910D */ trunc.w.s $f4, $f18 +/* 003CC 809E2EFC 440D2000 */ mfc1 $t5, $f4 /* 003D0 809E2F00 00000000 */ nop /* 003D4 809E2F04 448D3000 */ mtc1 $t5, $f6 ## $f6 = 0.00 /* 003D8 809E2F08 00000000 */ nop -/* 003DC 809E2F0C 46803220 */ cvt.s.w $f8, $f6 +/* 003DC 809E2F0C 46803220 */ cvt.s.w $f8, $f6 /* 003E0 809E2F10 E6080164 */ swc1 $f8, 0x0164($s0) ## 00000164 .L809E2F14: -/* 003E4 809E2F14 8FBF002C */ lw $ra, 0x002C($sp) +/* 003E4 809E2F14 8FBF002C */ lw $ra, 0x002C($sp) .L809E2F18: -/* 003E8 809E2F18 8FB00028 */ lw $s0, 0x0028($sp) +/* 003E8 809E2F18 8FB00028 */ lw $s0, 0x0028($sp) /* 003EC 809E2F1C 27BD0050 */ addiu $sp, $sp, 0x0050 ## $sp = 00000000 -/* 003F0 809E2F20 03E00008 */ jr $ra +/* 003F0 809E2F20 03E00008 */ jr $ra /* 003F4 809E2F24 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Daiku/func_809E2B30.s b/asm/non_matchings/overlays/actors/ovl_En_Daiku/func_809E2B30.s index 417e1c3cac..b5718c2333 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Daiku/func_809E2B30.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Daiku/func_809E2B30.s @@ -1,52 +1,52 @@ glabel func_809E2B30 /* 00000 809E2B30 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 00004 809E2B34 AFBF0024 */ sw $ra, 0x0024($sp) -/* 00008 809E2B38 AFA40038 */ sw $a0, 0x0038($sp) -/* 0000C 809E2B3C AFA60040 */ sw $a2, 0x0040($sp) +/* 00004 809E2B34 AFBF0024 */ sw $ra, 0x0024($sp) +/* 00008 809E2B38 AFA40038 */ sw $a0, 0x0038($sp) +/* 0000C 809E2B3C AFA60040 */ sw $a2, 0x0040($sp) /* 00010 809E2B40 8CC20000 */ lw $v0, 0x0000($a2) ## 00000000 /* 00014 809E2B44 3C18809E */ lui $t8, %hi(D_809E40B8) ## $t8 = 809E0000 /* 00018 809E2B48 271840B8 */ addiu $t8, $t8, %lo(D_809E40B8) ## $t8 = 809E40B8 -/* 0001C 809E2B4C 04400003 */ bltz $v0, .L809E2B5C -/* 00020 809E2B50 00057900 */ sll $t7, $a1, 4 -/* 00024 809E2B54 14A20004 */ bne $a1, $v0, .L809E2B68 -/* 00028 809E2B58 0005C900 */ sll $t9, $a1, 4 +/* 0001C 809E2B4C 04400003 */ bltz $v0, .L809E2B5C +/* 00020 809E2B50 00057900 */ sll $t7, $a1, 4 +/* 00024 809E2B54 14A20004 */ bne $a1, $v0, .L809E2B68 +/* 00028 809E2B58 0005C900 */ sll $t9, $a1, 4 .L809E2B5C: /* 0002C 809E2B5C 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 00030 809E2B60 10000005 */ beq $zero, $zero, .L809E2B78 -/* 00034 809E2B64 01F81821 */ addu $v1, $t7, $t8 +/* 00030 809E2B60 10000005 */ beq $zero, $zero, .L809E2B78 +/* 00034 809E2B64 01F81821 */ addu $v1, $t7, $t8 .L809E2B68: /* 00038 809E2B68 3C08809E */ lui $t0, %hi(D_809E40B8) ## $t0 = 809E0000 /* 0003C 809E2B6C 250840B8 */ addiu $t0, $t0, %lo(D_809E40B8) ## $t0 = 809E40B8 -/* 00040 809E2B70 03281821 */ addu $v1, $t9, $t0 +/* 00040 809E2B70 03281821 */ addu $v1, $t9, $t0 /* 00044 809E2B74 C460000C */ lwc1 $f0, 0x000C($v1) ## 0000000C .L809E2B78: /* 00048 809E2B78 8C640000 */ lw $a0, 0x0000($v1) ## 00000000 -/* 0004C 809E2B7C AFA3002C */ sw $v1, 0x002C($sp) -/* 00050 809E2B80 AFA5003C */ sw $a1, 0x003C($sp) +/* 0004C 809E2B7C AFA3002C */ sw $v1, 0x002C($sp) +/* 00050 809E2B80 AFA5003C */ sw $a1, 0x003C($sp) /* 00054 809E2B84 0C028800 */ jal SkelAnime_GetFrameCount - -/* 00058 809E2B88 E7A00034 */ swc1 $f0, 0x0034($sp) + +/* 00058 809E2B88 E7A00034 */ swc1 $f0, 0x0034($sp) /* 0005C 809E2B8C 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 -/* 00060 809E2B90 8FA3002C */ lw $v1, 0x002C($sp) -/* 00064 809E2B94 C7A00034 */ lwc1 $f0, 0x0034($sp) -/* 00068 809E2B98 468021A0 */ cvt.s.w $f6, $f4 -/* 0006C 809E2B9C 8FA40038 */ lw $a0, 0x0038($sp) +/* 00060 809E2B90 8FA3002C */ lw $v1, 0x002C($sp) +/* 00064 809E2B94 C7A00034 */ lwc1 $f0, 0x0034($sp) +/* 00068 809E2B98 468021A0 */ cvt.s.w $f6, $f4 +/* 0006C 809E2B9C 8FA40038 */ lw $a0, 0x0038($sp) /* 00070 809E2BA0 90690008 */ lbu $t1, 0x0008($v1) ## 00000008 /* 00074 809E2BA4 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 00078 809E2BA8 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 /* 0007C 809E2BAC 8C650000 */ lw $a1, 0x0000($v1) ## 00000000 -/* 00080 809E2BB0 E7A60010 */ swc1 $f6, 0x0010($sp) -/* 00084 809E2BB4 E7A00018 */ swc1 $f0, 0x0018($sp) +/* 00080 809E2BB0 E7A60010 */ swc1 $f6, 0x0010($sp) +/* 00084 809E2BB4 E7A00018 */ swc1 $f0, 0x0018($sp) /* 00088 809E2BB8 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 0008C 809E2BBC 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 00090 809E2BC0 AFA90014 */ sw $t1, 0x0014($sp) -/* 00094 809E2BC4 8FAA003C */ lw $t2, 0x003C($sp) -/* 00098 809E2BC8 8FAB0040 */ lw $t3, 0x0040($sp) +/* 0008C 809E2BBC 0C029468 */ jal SkelAnime_ChangeAnim + +/* 00090 809E2BC0 AFA90014 */ sw $t1, 0x0014($sp) +/* 00094 809E2BC4 8FAA003C */ lw $t2, 0x003C($sp) +/* 00098 809E2BC8 8FAB0040 */ lw $t3, 0x0040($sp) /* 0009C 809E2BCC AD6A0000 */ sw $t2, 0x0000($t3) ## 00000000 -/* 000A0 809E2BD0 8FBF0024 */ lw $ra, 0x0024($sp) +/* 000A0 809E2BD0 8FBF0024 */ lw $ra, 0x0024($sp) /* 000A4 809E2BD4 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 -/* 000A8 809E2BD8 03E00008 */ jr $ra +/* 000A8 809E2BD8 03E00008 */ jr $ra /* 000AC 809E2BDC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Daiku/func_809E349C.s b/asm/non_matchings/overlays/actors/ovl_En_Daiku/func_809E349C.s index 712aee4426..bfff7e6157 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Daiku/func_809E349C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Daiku/func_809E349C.s @@ -90,7 +90,7 @@ glabel func_809E349C /* 00AC8 809E35F8 460A4501 */ sub.s $f20, $f8, $f10 /* 00ACC 809E35FC 46049581 */ sub.s $f22, $f18, $f4 /* 00AD0 809E3600 4600A306 */ mov.s $f12, $f20 -/* 00AD4 809E3604 0C03F494 */ jal func_800FD250 +/* 00AD4 809E3604 0C03F494 */ jal Math_atan2f /* 00AD8 809E3608 4600B386 */ mov.s $f14, $f22 /* 00ADC 809E360C 46180182 */ mul.s $f6, $f0, $f24 /* 00AE0 809E3610 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Daiku/func_809E3954.s b/asm/non_matchings/overlays/actors/ovl_En_Daiku/func_809E3954.s index 7a489f5ccc..978b835a6c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Daiku/func_809E3954.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Daiku/func_809E3954.s @@ -36,7 +36,7 @@ glabel func_809E3954 /* 00EAC 809E39DC C7AC0040 */ lwc1 $f12, 0x0040($sp) /* 00EB0 809E39E0 C7AE0048 */ lwc1 $f14, 0x0048($sp) /* 00EB4 809E39E4 46006307 */ neg.s $f12, $f12 -/* 00EB8 809E39E8 0C03F494 */ jal func_800FD250 +/* 00EB8 809E39E8 0C03F494 */ jal Math_atan2f /* 00EBC 809E39EC 46007387 */ neg.s $f14, $f14 /* 00EC0 809E39F0 C6040344 */ lwc1 $f4, 0x0344($s0) ## 00000344 /* 00EC4 809E39F4 C7A60044 */ lwc1 $f6, 0x0044($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Daiku/func_809E3A8C.s b/asm/non_matchings/overlays/actors/ovl_En_Daiku/func_809E3A8C.s index 0b088520c6..b41d06b505 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Daiku/func_809E3A8C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Daiku/func_809E3A8C.s @@ -42,7 +42,7 @@ glabel func_809E3A8C /* 00FFC 809E3B2C 46083301 */ sub.s $f12, $f6, $f8 /* 01000 809E3B30 46128381 */ sub.s $f14, $f16, $f18 /* 01004 809E3B34 E7AC0038 */ swc1 $f12, 0x0038($sp) -/* 01008 809E3B38 0C03F494 */ jal func_800FD250 +/* 01008 809E3B38 0C03F494 */ jal Math_atan2f /* 0100C 809E3B3C E7AE0034 */ swc1 $f14, 0x0034($sp) /* 01010 809E3B40 3C01809E */ lui $at, %hi(D_809E41C0) ## $at = 809E0000 /* 01014 809E3B44 C42441C0 */ lwc1 $f4, %lo(D_809E41C0)($at) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Daiku/func_809E3F7C.s b/asm/non_matchings/overlays/actors/ovl_En_Daiku/func_809E3F7C.s index 2101224a72..acaacb57d2 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Daiku/func_809E3F7C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Daiku/func_809E3F7C.s @@ -10,7 +10,7 @@ glabel func_809E3F7C /* 0146C 809E3F9C 24C64190 */ addiu $a2, $a2, %lo(D_809E4190) ## $a2 = 809E4190 /* 01470 809E3FA0 27A40020 */ addiu $a0, $sp, 0x0020 ## $a0 = FFFFFFE8 /* 01474 809E3FA4 2407052B */ addiu $a3, $zero, 0x052B ## $a3 = 0000052B -/* 01478 809E3FA8 0C031AB1 */ jal func_800C6AC4 +/* 01478 809E3FA8 0C031AB1 */ jal Graph_OpenDisps /* 0147C 809E3FAC AFA50030 */ sw $a1, 0x0030($sp) /* 01480 809E3FB0 8FAF003C */ lw $t7, 0x003C($sp) /* 01484 809E3FB4 2401000F */ addiu $at, $zero, 0x000F ## $at = 0000000F @@ -40,7 +40,7 @@ glabel func_809E3F7C /* 014E0 809E4010 24C641A0 */ addiu $a2, $a2, %lo(D_809E41A0) ## $a2 = 809E41A0 /* 014E4 809E4014 27A40020 */ addiu $a0, $sp, 0x0020 ## $a0 = FFFFFFE8 /* 014E8 809E4018 24070532 */ addiu $a3, $zero, 0x0532 ## $a3 = 00000532 -/* 014EC 809E401C 0C031AD5 */ jal func_800C6B54 +/* 014EC 809E401C 0C031AD5 */ jal Graph_CloseDisps /* 014F0 809E4020 8DA50000 */ lw $a1, 0x0000($t5) ## 00000000 /* 014F4 809E4024 8FBF0014 */ lw $ra, 0x0014($sp) /* 014F8 809E4028 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Daiku_Kakariko/EnDaikuKakariko_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Daiku_Kakariko/EnDaikuKakariko_Draw.s index 5ca8ee320e..86a6322a8e 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Daiku_Kakariko/EnDaikuKakariko_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Daiku_Kakariko/EnDaikuKakariko_Draw.s @@ -1,25 +1,25 @@ glabel EnDaikuKakariko_Draw /* 01020 809E5340 27BDFFA8 */ addiu $sp, $sp, 0xFFA8 ## $sp = FFFFFFA8 -/* 01024 809E5344 AFBF0024 */ sw $ra, 0x0024($sp) -/* 01028 809E5348 AFA40058 */ sw $a0, 0x0058($sp) -/* 0102C 809E534C AFA5005C */ sw $a1, 0x005C($sp) +/* 01024 809E5344 AFBF0024 */ sw $ra, 0x0024($sp) +/* 01028 809E5348 AFA40058 */ sw $a0, 0x0058($sp) +/* 0102C 809E534C AFA5005C */ sw $a1, 0x005C($sp) /* 01030 809E5350 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 /* 01034 809E5354 3C06809E */ lui $a2, %hi(D_809E55E0) ## $a2 = 809E0000 /* 01038 809E5358 24C655E0 */ addiu $a2, $a2, %lo(D_809E55E0) ## $a2 = 809E55E0 /* 0103C 809E535C 27A40040 */ addiu $a0, $sp, 0x0040 ## $a0 = FFFFFFE8 /* 01040 809E5360 24070464 */ addiu $a3, $zero, 0x0464 ## $a3 = 00000464 -/* 01044 809E5364 0C031AB1 */ jal func_800C6AC4 -/* 01048 809E5368 AFA50050 */ sw $a1, 0x0050($sp) -/* 0104C 809E536C 8FAF005C */ lw $t7, 0x005C($sp) -/* 01050 809E5370 0C024F46 */ jal func_80093D18 +/* 01044 809E5364 0C031AB1 */ jal Graph_OpenDisps +/* 01048 809E5368 AFA50050 */ sw $a1, 0x0050($sp) +/* 0104C 809E536C 8FAF005C */ lw $t7, 0x005C($sp) +/* 01050 809E5370 0C024F46 */ jal func_80093D18 /* 01054 809E5374 8DE40000 */ lw $a0, 0x0000($t7) ## 00000000 -/* 01058 809E5378 8FA90058 */ lw $t1, 0x0058($sp) -/* 0105C 809E537C 8FA80050 */ lw $t0, 0x0050($sp) +/* 01058 809E5378 8FA90058 */ lw $t1, 0x0058($sp) +/* 0105C 809E537C 8FA80050 */ lw $t0, 0x0050($sp) /* 01060 809E5380 3C19FB00 */ lui $t9, 0xFB00 ## $t9 = FB000000 /* 01064 809E5384 8522001C */ lh $v0, 0x001C($t1) ## 0000001C /* 01068 809E5388 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 /* 0106C 809E538C 30420003 */ andi $v0, $v0, 0x0003 ## $v0 = 00000000 -/* 01070 809E5390 14400009 */ bne $v0, $zero, .L809E53B8 +/* 01070 809E5390 14400009 */ bne $v0, $zero, .L809E53B8 /* 01074 809E5394 00000000 */ nop /* 01078 809E5398 8D0202C0 */ lw $v0, 0x02C0($t0) ## 000002C0 /* 0107C 809E539C 3C0AAA0A */ lui $t2, 0xAA0A ## $t2 = AA0A0000 @@ -27,10 +27,10 @@ glabel EnDaikuKakariko_Draw /* 01084 809E53A4 24580008 */ addiu $t8, $v0, 0x0008 ## $t8 = 00000008 /* 01088 809E53A8 AD1802C0 */ sw $t8, 0x02C0($t0) ## 000002C0 /* 0108C 809E53AC AC4A0004 */ sw $t2, 0x0004($v0) ## 00000004 -/* 01090 809E53B0 10000020 */ beq $zero, $zero, .L809E5434 +/* 01090 809E53B0 10000020 */ beq $zero, $zero, .L809E5434 /* 01094 809E53B4 AC590000 */ sw $t9, 0x0000($v0) ## 00000000 .L809E53B8: -/* 01098 809E53B8 14410009 */ bne $v0, $at, .L809E53E0 +/* 01098 809E53B8 14410009 */ bne $v0, $at, .L809E53E0 /* 0109C 809E53BC 3C0CFB00 */ lui $t4, 0xFB00 ## $t4 = FB000000 /* 010A0 809E53C0 8D0202C0 */ lw $v0, 0x02C0($t0) ## 000002C0 /* 010A4 809E53C4 3C0DAAC8 */ lui $t5, 0xAAC8 ## $t5 = AAC80000 @@ -38,11 +38,11 @@ glabel EnDaikuKakariko_Draw /* 010AC 809E53CC 244B0008 */ addiu $t3, $v0, 0x0008 ## $t3 = 00000008 /* 010B0 809E53D0 AD0B02C0 */ sw $t3, 0x02C0($t0) ## 000002C0 /* 010B4 809E53D4 AC4D0004 */ sw $t5, 0x0004($v0) ## 00000004 -/* 010B8 809E53D8 10000016 */ beq $zero, $zero, .L809E5434 +/* 010B8 809E53D8 10000016 */ beq $zero, $zero, .L809E5434 /* 010BC 809E53DC AC4C0000 */ sw $t4, 0x0000($v0) ## 00000000 .L809E53E0: /* 010C0 809E53E0 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 010C4 809E53E4 14410009 */ bne $v0, $at, .L809E540C +/* 010C4 809E53E4 14410009 */ bne $v0, $at, .L809E540C /* 010C8 809E53E8 3C0FFB00 */ lui $t7, 0xFB00 ## $t7 = FB000000 /* 010CC 809E53EC 8D0202C0 */ lw $v0, 0x02C0($t0) ## 000002C0 /* 010D0 809E53F0 3C1800E6 */ lui $t8, 0x00E6 ## $t8 = 00E60000 @@ -50,11 +50,11 @@ glabel EnDaikuKakariko_Draw /* 010D8 809E53F8 244E0008 */ addiu $t6, $v0, 0x0008 ## $t6 = 00000008 /* 010DC 809E53FC AD0E02C0 */ sw $t6, 0x02C0($t0) ## 000002C0 /* 010E0 809E5400 AC580004 */ sw $t8, 0x0004($v0) ## 00000004 -/* 010E4 809E5404 1000000B */ beq $zero, $zero, .L809E5434 +/* 010E4 809E5404 1000000B */ beq $zero, $zero, .L809E5434 /* 010E8 809E5408 AC4F0000 */ sw $t7, 0x0000($v0) ## 00000000 .L809E540C: /* 010EC 809E540C 24010003 */ addiu $at, $zero, 0x0003 ## $at = 00000003 -/* 010F0 809E5410 14410008 */ bne $v0, $at, .L809E5434 +/* 010F0 809E5410 14410008 */ bne $v0, $at, .L809E5434 /* 010F4 809E5414 3C0AFB00 */ lui $t2, 0xFB00 ## $t2 = FB000000 /* 010F8 809E5418 8D0202C0 */ lw $v0, 0x02C0($t0) ## 000002C0 /* 010FC 809E541C 3C0BC800 */ lui $t3, 0xC800 ## $t3 = C8000000 @@ -71,20 +71,20 @@ glabel EnDaikuKakariko_Draw /* 01124 809E5444 3C0D809E */ lui $t5, %hi(func_809E5288) ## $t5 = 809E0000 /* 01128 809E5448 25AD5288 */ addiu $t5, $t5, %lo(func_809E5288) ## $t5 = 809E5288 /* 0112C 809E544C 258C50B4 */ addiu $t4, $t4, %lo(func_809E50B4) ## $t4 = 809E50B4 -/* 01130 809E5450 AFAC0010 */ sw $t4, 0x0010($sp) -/* 01134 809E5454 AFAD0014 */ sw $t5, 0x0014($sp) -/* 01138 809E5458 AFA90018 */ sw $t1, 0x0018($sp) -/* 0113C 809E545C 0C0286B2 */ jal func_800A1AC8 -/* 01140 809E5460 8FA4005C */ lw $a0, 0x005C($sp) -/* 01144 809E5464 8FAE005C */ lw $t6, 0x005C($sp) +/* 01130 809E5450 AFAC0010 */ sw $t4, 0x0010($sp) +/* 01134 809E5454 AFAD0014 */ sw $t5, 0x0014($sp) +/* 01138 809E5458 AFA90018 */ sw $t1, 0x0018($sp) +/* 0113C 809E545C 0C0286B2 */ jal SkelAnime_DrawSV +/* 01140 809E5460 8FA4005C */ lw $a0, 0x005C($sp) +/* 01144 809E5464 8FAE005C */ lw $t6, 0x005C($sp) /* 01148 809E5468 3C06809E */ lui $a2, %hi(D_809E55FC) ## $a2 = 809E0000 /* 0114C 809E546C 24C655FC */ addiu $a2, $a2, %lo(D_809E55FC) ## $a2 = 809E55FC /* 01150 809E5470 27A40040 */ addiu $a0, $sp, 0x0040 ## $a0 = FFFFFFE8 /* 01154 809E5474 2407047F */ addiu $a3, $zero, 0x047F ## $a3 = 0000047F -/* 01158 809E5478 0C031AD5 */ jal func_800C6B54 +/* 01158 809E5478 0C031AD5 */ jal Graph_CloseDisps /* 0115C 809E547C 8DC50000 */ lw $a1, 0x0000($t6) ## 00000000 -/* 01160 809E5480 8FBF0024 */ lw $ra, 0x0024($sp) +/* 01160 809E5480 8FBF0024 */ lw $ra, 0x0024($sp) /* 01164 809E5484 27BD0058 */ addiu $sp, $sp, 0x0058 ## $sp = 00000000 -/* 01168 809E5488 03E00008 */ jr $ra +/* 01168 809E5488 03E00008 */ jr $ra /* 0116C 809E548C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Daiku_Kakariko/EnDaikuKakariko_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Daiku_Kakariko/EnDaikuKakariko_Init.s index c13083db61..e0c69880cf 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Daiku_Kakariko/EnDaikuKakariko_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Daiku_Kakariko/EnDaikuKakariko_Init.s @@ -3,51 +3,51 @@ glabel EnDaikuKakariko_Init /* 000B4 809E43D4 2463E660 */ addiu $v1, $v1, 0xE660 ## $v1 = 8015E660 /* 000B8 809E43D8 8C6E0004 */ lw $t6, 0x0004($v1) ## 8015E664 /* 000BC 809E43DC 27BDFFB8 */ addiu $sp, $sp, 0xFFB8 ## $sp = FFFFFFB8 -/* 000C0 809E43E0 AFB00028 */ sw $s0, 0x0028($sp) +/* 000C0 809E43E0 AFB00028 */ sw $s0, 0x0028($sp) /* 000C4 809E43E4 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 000C8 809E43E8 AFBF002C */ sw $ra, 0x002C($sp) -/* 000CC 809E43EC 11C00003 */ beq $t6, $zero, .L809E43FC -/* 000D0 809E43F0 AFA5004C */ sw $a1, 0x004C($sp) -/* 000D4 809E43F4 10000002 */ beq $zero, $zero, .L809E4400 +/* 000C8 809E43E8 AFBF002C */ sw $ra, 0x002C($sp) +/* 000CC 809E43EC 11C00003 */ beq $t6, $zero, .L809E43FC +/* 000D0 809E43F0 AFA5004C */ sw $a1, 0x004C($sp) +/* 000D4 809E43F4 10000002 */ beq $zero, $zero, .L809E4400 /* 000D8 809E43F8 24020005 */ addiu $v0, $zero, 0x0005 ## $v0 = 00000005 .L809E43FC: /* 000DC 809E43FC 24020011 */ addiu $v0, $zero, 0x0011 ## $v0 = 00000011 .L809E4400: /* 000E0 809E4400 24010005 */ addiu $at, $zero, 0x0005 ## $at = 00000005 -/* 000E4 809E4404 54410025 */ bnel $v0, $at, .L809E449C +/* 000E4 809E4404 54410025 */ bnel $v0, $at, .L809E449C /* 000E8 809E4408 960B0200 */ lhu $t3, 0x0200($s0) ## 00000200 -/* 000EC 809E440C 8FAF004C */ lw $t7, 0x004C($sp) +/* 000EC 809E440C 8FAF004C */ lw $t7, 0x004C($sp) /* 000F0 809E4410 2401002A */ addiu $at, $zero, 0x002A ## $at = 0000002A /* 000F4 809E4414 85E200A4 */ lh $v0, 0x00A4($t7) ## 000000A4 -/* 000F8 809E4418 10410014 */ beq $v0, $at, .L809E446C +/* 000F8 809E4418 10410014 */ beq $v0, $at, .L809E446C /* 000FC 809E441C 24010030 */ addiu $at, $zero, 0x0030 ## $at = 00000030 -/* 00100 809E4420 1041001A */ beq $v0, $at, .L809E448C +/* 00100 809E4420 1041001A */ beq $v0, $at, .L809E448C /* 00104 809E4424 24010052 */ addiu $at, $zero, 0x0052 ## $at = 00000052 -/* 00108 809E4428 5441001C */ bnel $v0, $at, .L809E449C +/* 00108 809E4428 5441001C */ bnel $v0, $at, .L809E449C /* 0010C 809E442C 960B0200 */ lhu $t3, 0x0200($s0) ## 00000200 /* 00110 809E4430 8C780010 */ lw $t8, 0x0010($v1) ## 8015E670 -/* 00114 809E4434 57000019 */ bnel $t8, $zero, .L809E449C +/* 00114 809E4434 57000019 */ bnel $t8, $zero, .L809E449C /* 00118 809E4438 960B0200 */ lhu $t3, 0x0200($s0) ## 00000200 /* 0011C 809E443C 860A001C */ lh $t2, 0x001C($s0) ## 0000001C /* 00120 809E4440 96190200 */ lhu $t9, 0x0200($s0) ## 00000200 /* 00124 809E4444 3C0D809E */ lui $t5, %hi(D_809E5568) ## $t5 = 809E0000 /* 00128 809E4448 314B0003 */ andi $t3, $t2, 0x0003 ## $t3 = 00000000 -/* 0012C 809E444C 000B6040 */ sll $t4, $t3, 1 +/* 0012C 809E444C 000B6040 */ sll $t4, $t3, 1 /* 00130 809E4450 37290001 */ ori $t1, $t9, 0x0001 ## $t1 = 00000001 /* 00134 809E4454 A6090200 */ sh $t1, 0x0200($s0) ## 00000200 -/* 00138 809E4458 01AC6821 */ addu $t5, $t5, $t4 -/* 0013C 809E445C 95AD5568 */ lhu $t5, %lo(D_809E5568)($t5) +/* 00138 809E4458 01AC6821 */ addu $t5, $t5, $t4 +/* 0013C 809E445C 95AD5568 */ lhu $t5, %lo(D_809E5568)($t5) /* 00140 809E4460 012D7025 */ or $t6, $t1, $t5 ## $t6 = 809E0001 -/* 00144 809E4464 1000000C */ beq $zero, $zero, .L809E4498 +/* 00144 809E4464 1000000C */ beq $zero, $zero, .L809E4498 /* 00148 809E4468 A60E0200 */ sh $t6, 0x0200($s0) ## 00000200 .L809E446C: /* 0014C 809E446C 8C6F0010 */ lw $t7, 0x0010($v1) ## 8015E670 /* 00150 809E4470 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 00154 809E4474 55E10009 */ bnel $t7, $at, .L809E449C +/* 00154 809E4474 55E10009 */ bnel $t7, $at, .L809E449C /* 00158 809E4478 960B0200 */ lhu $t3, 0x0200($s0) ## 00000200 /* 0015C 809E447C 96180200 */ lhu $t8, 0x0200($s0) ## 00000200 /* 00160 809E4480 37190002 */ ori $t9, $t8, 0x0002 ## $t9 = 00000002 -/* 00164 809E4484 10000004 */ beq $zero, $zero, .L809E4498 +/* 00164 809E4484 10000004 */ beq $zero, $zero, .L809E4498 /* 00168 809E4488 A6190200 */ sh $t9, 0x0200($s0) ## 00000200 .L809E448C: /* 0016C 809E448C 96080200 */ lhu $t0, 0x0200($s0) ## 00000200 @@ -57,10 +57,10 @@ glabel EnDaikuKakariko_Init /* 00178 809E4498 960B0200 */ lhu $t3, 0x0200($s0) ## 00000200 .L809E449C: /* 0017C 809E449C 316C0007 */ andi $t4, $t3, 0x0007 ## $t4 = 00000000 -/* 00180 809E44A0 55800006 */ bnel $t4, $zero, .L809E44BC +/* 00180 809E44A0 55800006 */ bnel $t4, $zero, .L809E44BC /* 00184 809E44A4 8C690010 */ lw $t1, 0x0010($v1) ## 8015E670 /* 00188 809E44A8 0C00B55C */ jal Actor_Kill - + /* 0018C 809E44AC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 00190 809E44B0 3C038016 */ lui $v1, 0x8016 ## $v1 = 80160000 /* 00194 809E44B4 2463E660 */ addiu $v1, $v1, 0xE660 ## $v1 = 8015E660 @@ -68,7 +68,7 @@ glabel EnDaikuKakariko_Init .L809E44BC: /* 0019C 809E44BC 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 /* 001A0 809E44C0 260400B4 */ addiu $a0, $s0, 0x00B4 ## $a0 = 000000B4 -/* 001A4 809E44C4 15210004 */ bne $t1, $at, .L809E44D8 +/* 001A4 809E44C4 15210004 */ bne $t1, $at, .L809E44D8 /* 001A8 809E44C8 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 /* 001AC 809E44CC 960D0200 */ lhu $t5, 0x0200($s0) ## 00000200 /* 001B0 809E44D0 35AE0008 */ ori $t6, $t5, 0x0008 ## $t6 = 00000008 @@ -77,68 +77,68 @@ glabel EnDaikuKakariko_Init /* 001B8 809E44D8 3C068003 */ lui $a2, 0x8003 ## $a2 = 80030000 /* 001BC 809E44DC 24C6B5EC */ addiu $a2, $a2, 0xB5EC ## $a2 = 8002B5EC /* 001C0 809E44E0 0C00AC78 */ jal ActorShape_Init - + /* 001C4 809E44E4 3C074220 */ lui $a3, 0x4220 ## $a3 = 42200000 /* 001C8 809E44E8 2605014C */ addiu $a1, $s0, 0x014C ## $a1 = 0000014C /* 001CC 809E44EC 3C060600 */ lui $a2, 0x0600 ## $a2 = 06000000 /* 001D0 809E44F0 260F022C */ addiu $t7, $s0, 0x022C ## $t7 = 0000022C /* 001D4 809E44F4 26180292 */ addiu $t8, $s0, 0x0292 ## $t8 = 00000292 /* 001D8 809E44F8 24190011 */ addiu $t9, $zero, 0x0011 ## $t9 = 00000011 -/* 001DC 809E44FC AFB90018 */ sw $t9, 0x0018($sp) -/* 001E0 809E4500 AFB80014 */ sw $t8, 0x0014($sp) -/* 001E4 809E4504 AFAF0010 */ sw $t7, 0x0010($sp) +/* 001DC 809E44FC AFB90018 */ sw $t9, 0x0018($sp) +/* 001E0 809E4500 AFB80014 */ sw $t8, 0x0014($sp) +/* 001E4 809E4504 AFAF0010 */ sw $t7, 0x0010($sp) /* 001E8 809E4508 24C67958 */ addiu $a2, $a2, 0x7958 ## $a2 = 06007958 -/* 001EC 809E450C AFA50034 */ sw $a1, 0x0034($sp) -/* 001F0 809E4510 8FA4004C */ lw $a0, 0x004C($sp) -/* 001F4 809E4514 0C0291BE */ jal func_800A46F8 +/* 001EC 809E450C AFA50034 */ sw $a1, 0x0034($sp) +/* 001F0 809E4510 8FA4004C */ lw $a0, 0x004C($sp) +/* 001F4 809E4514 0C0291BE */ jal SkelAnime_InitSV /* 001F8 809E4518 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 /* 001FC 809E451C 26050194 */ addiu $a1, $s0, 0x0194 ## $a1 = 00000194 -/* 00200 809E4520 AFA50030 */ sw $a1, 0x0030($sp) +/* 00200 809E4520 AFA50030 */ sw $a1, 0x0030($sp) /* 00204 809E4524 0C0170D9 */ jal ActorCollider_AllocCylinder - -/* 00208 809E4528 8FA4004C */ lw $a0, 0x004C($sp) + +/* 00208 809E4528 8FA4004C */ lw $a0, 0x004C($sp) /* 0020C 809E452C 3C07809E */ lui $a3, %hi(D_809E54B0) ## $a3 = 809E0000 -/* 00210 809E4530 8FA50030 */ lw $a1, 0x0030($sp) +/* 00210 809E4530 8FA50030 */ lw $a1, 0x0030($sp) /* 00214 809E4534 24E754B0 */ addiu $a3, $a3, %lo(D_809E54B0) ## $a3 = 809E54B0 -/* 00218 809E4538 8FA4004C */ lw $a0, 0x004C($sp) +/* 00218 809E4538 8FA4004C */ lw $a0, 0x004C($sp) /* 0021C 809E453C 0C01712B */ jal ActorCollider_InitCylinder - + /* 00220 809E4540 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 00224 809E4544 3C05809E */ lui $a1, %hi(D_809E54E8) ## $a1 = 809E0000 /* 00228 809E4548 3C06809E */ lui $a2, %hi(D_809E54DC) ## $a2 = 809E0000 /* 0022C 809E454C 24C654DC */ addiu $a2, $a2, %lo(D_809E54DC) ## $a2 = 809E54DC /* 00230 809E4550 24A554E8 */ addiu $a1, $a1, %lo(D_809E54E8) ## $a1 = 809E54E8 -/* 00234 809E4554 0C0187BF */ jal func_80061EFC +/* 00234 809E4554 0C0187BF */ jal func_80061EFC /* 00238 809E4558 26040098 */ addiu $a0, $s0, 0x0098 ## $a0 = 00000098 /* 0023C 809E455C 3C03809E */ lui $v1, %hi(D_809E5508) ## $v1 = 809E0000 /* 00240 809E4560 24635508 */ addiu $v1, $v1, %lo(D_809E5508) ## $v1 = 809E5508 /* 00244 809E4564 0C028800 */ jal SkelAnime_GetFrameCount - + /* 00248 809E4568 8C640000 */ lw $a0, 0x0000($v1) ## 809E5508 /* 0024C 809E456C 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 00250 809E4570 3C03809E */ lui $v1, %hi(D_809E5508) ## $v1 = 809E0000 /* 00254 809E4574 24635508 */ addiu $v1, $v1, %lo(D_809E5508) ## $v1 = 809E5508 -/* 00258 809E4578 468021A0 */ cvt.s.w $f6, $f4 +/* 00258 809E4578 468021A0 */ cvt.s.w $f6, $f4 /* 0025C 809E457C 90680008 */ lbu $t0, 0x0008($v1) ## 809E5510 /* 00260 809E4580 C468000C */ lwc1 $f8, 0x000C($v1) ## 809E5514 /* 00264 809E4584 8C650000 */ lw $a1, 0x0000($v1) ## 809E5508 -/* 00268 809E4588 8FA40034 */ lw $a0, 0x0034($sp) +/* 00268 809E4588 8FA40034 */ lw $a0, 0x0034($sp) /* 0026C 809E458C 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 00270 809E4590 E7A60010 */ swc1 $f6, 0x0010($sp) +/* 00270 809E4590 E7A60010 */ swc1 $f6, 0x0010($sp) /* 00274 809E4594 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 00278 809E4598 AFA80014 */ sw $t0, 0x0014($sp) -/* 0027C 809E459C 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 00280 809E45A0 E7A80018 */ swc1 $f8, 0x0018($sp) +/* 00278 809E4598 AFA80014 */ sw $t0, 0x0014($sp) +/* 0027C 809E459C 0C029468 */ jal SkelAnime_ChangeAnim + +/* 00280 809E45A0 E7A80018 */ swc1 $f8, 0x0018($sp) /* 00284 809E45A4 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 /* 00288 809E45A8 240A0004 */ addiu $t2, $zero, 0x0004 ## $t2 = 00000004 -/* 0028C 809E45AC AFAA0014 */ sw $t2, 0x0014($sp) -/* 00290 809E45B0 44060000 */ mfc1 $a2, $f0 -/* 00294 809E45B4 44070000 */ mfc1 $a3, $f0 -/* 00298 809E45B8 8FA4004C */ lw $a0, 0x004C($sp) +/* 0028C 809E45AC AFAA0014 */ sw $t2, 0x0014($sp) +/* 00290 809E45B0 44060000 */ mfc1 $a2, $f0 +/* 00294 809E45B4 44070000 */ mfc1 $a3, $f0 +/* 00298 809E45B8 8FA4004C */ lw $a0, 0x004C($sp) /* 0029C 809E45BC 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 002A0 809E45C0 0C00B92D */ jal func_8002E4B4 -/* 002A4 809E45C4 E7A00010 */ swc1 $f0, 0x0010($sp) +/* 002A0 809E45C0 0C00B92D */ jal func_8002E4B4 +/* 002A4 809E45C4 E7A00010 */ swc1 $f0, 0x0010($sp) /* 002A8 809E45C8 3C014040 */ lui $at, 0x4040 ## $at = 40400000 /* 002AC 809E45CC 44818000 */ mtc1 $at, $f16 ## $f16 = 3.00 /* 002B0 809E45D0 96020200 */ lhu $v0, 0x0200($s0) ## 00000200 @@ -152,7 +152,7 @@ glabel EnDaikuKakariko_Init /* 002D0 809E45F0 AE0C01EC */ sw $t4, 0x01EC($s0) ## 000001EC /* 002D4 809E45F4 E61001E8 */ swc1 $f16, 0x01E8($s0) ## 000001E8 /* 002D8 809E45F8 E60A006C */ swc1 $f10, 0x006C($s0) ## 0000006C -/* 002DC 809E45FC 11200005 */ beq $t1, $zero, .L809E4614 +/* 002DC 809E45FC 11200005 */ beq $t1, $zero, .L809E4614 /* 002E0 809E4600 E61200F4 */ swc1 $f18, 0x00F4($s0) ## 000000F4 /* 002E4 809E4604 3C01BF80 */ lui $at, 0xBF80 ## $at = BF800000 /* 002E8 809E4608 44812000 */ mtc1 $at, $f4 ## $f4 = -1.00 @@ -160,68 +160,68 @@ glabel EnDaikuKakariko_Init /* 002F0 809E4610 E604006C */ swc1 $f4, 0x006C($s0) ## 0000006C .L809E4614: /* 002F4 809E4614 304D0010 */ andi $t5, $v0, 0x0010 ## $t5 = 00000000 -/* 002F8 809E4618 11A00009 */ beq $t5, $zero, .L809E4640 +/* 002F8 809E4618 11A00009 */ beq $t5, $zero, .L809E4640 /* 002FC 809E461C 304F0008 */ andi $t7, $v0, 0x0008 ## $t7 = 00000000 /* 00300 809E4620 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 00304 809E4624 24050003 */ addiu $a1, $zero, 0x0003 ## $a1 = 00000003 -/* 00308 809E4628 0C2790C8 */ jal func_809E4320 +/* 00308 809E4628 0C2790C8 */ jal func_809E4320 /* 0030C 809E462C 260601EC */ addiu $a2, $s0, 0x01EC ## $a2 = 000001EC /* 00310 809E4630 3C0E809E */ lui $t6, %hi(func_809E4BC4) ## $t6 = 809E0000 /* 00314 809E4634 25CE4BC4 */ addiu $t6, $t6, %lo(func_809E4BC4) ## $t6 = 809E4BC4 -/* 00318 809E4638 10000035 */ beq $zero, $zero, .L809E4710 +/* 00318 809E4638 10000035 */ beq $zero, $zero, .L809E4710 /* 0031C 809E463C AE0E0190 */ sw $t6, 0x0190($s0) ## 00000190 .L809E4640: -/* 00320 809E4640 11E0001F */ beq $t7, $zero, .L809E46C0 +/* 00320 809E4640 11E0001F */ beq $t7, $zero, .L809E46C0 /* 00324 809E4644 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 00328 809E4648 8602001C */ lh $v0, 0x001C($s0) ## 0000001C /* 0032C 809E464C 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 /* 00330 809E4650 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 00334 809E4654 30420003 */ andi $v0, $v0, 0x0003 ## $v0 = 00000000 -/* 00338 809E4658 10410004 */ beq $v0, $at, .L809E466C +/* 00338 809E4658 10410004 */ beq $v0, $at, .L809E466C /* 0033C 809E465C 24050005 */ addiu $a1, $zero, 0x0005 ## $a1 = 00000005 /* 00340 809E4660 24010003 */ addiu $at, $zero, 0x0003 ## $at = 00000003 -/* 00344 809E4664 14410007 */ bne $v0, $at, .L809E4684 +/* 00344 809E4664 14410007 */ bne $v0, $at, .L809E4684 /* 00348 809E4668 260601EC */ addiu $a2, $s0, 0x01EC ## $a2 = 000001EC .L809E466C: -/* 0034C 809E466C 0C2790C8 */ jal func_809E4320 +/* 0034C 809E466C 0C2790C8 */ jal func_809E4320 /* 00350 809E4670 260601EC */ addiu $a2, $s0, 0x01EC ## $a2 = 000001EC /* 00354 809E4674 96180200 */ lhu $t8, 0x0200($s0) ## 00000200 /* 00358 809E4678 37190800 */ ori $t9, $t8, 0x0800 ## $t9 = 00000800 -/* 0035C 809E467C 10000004 */ beq $zero, $zero, .L809E4690 +/* 0035C 809E467C 10000004 */ beq $zero, $zero, .L809E4690 /* 00360 809E4680 A6190200 */ sh $t9, 0x0200($s0) ## 00000200 .L809E4684: /* 00364 809E4684 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00368 809E4688 0C2790C8 */ jal func_809E4320 +/* 00368 809E4688 0C2790C8 */ jal func_809E4320 /* 0036C 809E468C 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 .L809E4690: /* 00370 809E4690 0C03F66B */ jal Math_Rand_ZeroOne ## Rand.Next() float /* 00374 809E4694 00000000 */ nop /* 00378 809E4698 C606015C */ lwc1 $f6, 0x015C($s0) ## 0000015C -/* 0037C 809E469C 46060202 */ mul.s $f8, $f0, $f6 -/* 00380 809E46A0 4600428D */ trunc.w.s $f10, $f8 -/* 00384 809E46A4 440A5000 */ mfc1 $t2, $f10 +/* 0037C 809E469C 46060202 */ mul.s $f8, $f0, $f6 +/* 00380 809E46A0 4600428D */ trunc.w.s $f10, $f8 +/* 00384 809E46A4 440A5000 */ mfc1 $t2, $f10 /* 00388 809E46A8 00000000 */ nop /* 0038C 809E46AC 448A8000 */ mtc1 $t2, $f16 ## $f16 = 0.00 /* 00390 809E46B0 00000000 */ nop -/* 00394 809E46B4 468084A0 */ cvt.s.w $f18, $f16 -/* 00398 809E46B8 1000000F */ beq $zero, $zero, .L809E46F8 +/* 00394 809E46B4 468084A0 */ cvt.s.w $f18, $f16 +/* 00398 809E46B8 1000000F */ beq $zero, $zero, .L809E46F8 /* 0039C 809E46BC E6120164 */ swc1 $f18, 0x0164($s0) ## 00000164 .L809E46C0: /* 003A0 809E46C0 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 003A4 809E46C4 0C2790C8 */ jal func_809E4320 +/* 003A4 809E46C4 0C2790C8 */ jal func_809E4320 /* 003A8 809E46C8 260601EC */ addiu $a2, $s0, 0x01EC ## $a2 = 000001EC /* 003AC 809E46CC 0C03F66B */ jal Math_Rand_ZeroOne ## Rand.Next() float /* 003B0 809E46D0 00000000 */ nop /* 003B4 809E46D4 C604015C */ lwc1 $f4, 0x015C($s0) ## 0000015C -/* 003B8 809E46D8 46040182 */ mul.s $f6, $f0, $f4 -/* 003BC 809E46DC 4600320D */ trunc.w.s $f8, $f6 -/* 003C0 809E46E0 440C4000 */ mfc1 $t4, $f8 +/* 003B8 809E46D8 46040182 */ mul.s $f6, $f0, $f4 +/* 003BC 809E46DC 4600320D */ trunc.w.s $f8, $f6 +/* 003C0 809E46E0 440C4000 */ mfc1 $t4, $f8 /* 003C4 809E46E4 00000000 */ nop /* 003C8 809E46E8 448C5000 */ mtc1 $t4, $f10 ## $f10 = 0.00 /* 003CC 809E46EC 00000000 */ nop -/* 003D0 809E46F0 46805420 */ cvt.s.w $f16, $f10 +/* 003D0 809E46F0 46805420 */ cvt.s.w $f16, $f10 /* 003D4 809E46F4 E6100164 */ swc1 $f16, 0x0164($s0) ## 00000164 .L809E46F8: /* 003D8 809E46F8 96090200 */ lhu $t1, 0x0200($s0) ## 00000200 @@ -231,10 +231,10 @@ glabel EnDaikuKakariko_Init /* 003E8 809E4708 A60D0200 */ sh $t5, 0x0200($s0) ## 00000200 /* 003EC 809E470C AE0E0190 */ sw $t6, 0x0190($s0) ## 00000190 .L809E4710: -/* 003F0 809E4710 8FBF002C */ lw $ra, 0x002C($sp) -/* 003F4 809E4714 8FB00028 */ lw $s0, 0x0028($sp) +/* 003F0 809E4710 8FBF002C */ lw $ra, 0x002C($sp) +/* 003F4 809E4714 8FB00028 */ lw $s0, 0x0028($sp) /* 003F8 809E4718 27BD0048 */ addiu $sp, $sp, 0x0048 ## $sp = 00000000 -/* 003FC 809E471C 03E00008 */ jr $ra +/* 003FC 809E471C 03E00008 */ jr $ra /* 00400 809E4720 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Daiku_Kakariko/func_809E4320.s b/asm/non_matchings/overlays/actors/ovl_En_Daiku_Kakariko/func_809E4320.s index 3ba50c940e..98d9ea9460 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Daiku_Kakariko/func_809E4320.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Daiku_Kakariko/func_809E4320.s @@ -1,52 +1,52 @@ glabel func_809E4320 /* 00000 809E4320 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 00004 809E4324 AFBF0024 */ sw $ra, 0x0024($sp) -/* 00008 809E4328 AFA40038 */ sw $a0, 0x0038($sp) -/* 0000C 809E432C AFA60040 */ sw $a2, 0x0040($sp) +/* 00004 809E4324 AFBF0024 */ sw $ra, 0x0024($sp) +/* 00008 809E4328 AFA40038 */ sw $a0, 0x0038($sp) +/* 0000C 809E432C AFA60040 */ sw $a2, 0x0040($sp) /* 00010 809E4330 8CC20000 */ lw $v0, 0x0000($a2) ## 00000000 /* 00014 809E4334 3C18809E */ lui $t8, %hi(D_809E5508) ## $t8 = 809E0000 /* 00018 809E4338 27185508 */ addiu $t8, $t8, %lo(D_809E5508) ## $t8 = 809E5508 -/* 0001C 809E433C 04400003 */ bltz $v0, .L809E434C -/* 00020 809E4340 00057900 */ sll $t7, $a1, 4 -/* 00024 809E4344 14A20004 */ bne $a1, $v0, .L809E4358 -/* 00028 809E4348 0005C900 */ sll $t9, $a1, 4 +/* 0001C 809E433C 04400003 */ bltz $v0, .L809E434C +/* 00020 809E4340 00057900 */ sll $t7, $a1, 4 +/* 00024 809E4344 14A20004 */ bne $a1, $v0, .L809E4358 +/* 00028 809E4348 0005C900 */ sll $t9, $a1, 4 .L809E434C: /* 0002C 809E434C 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 00030 809E4350 10000005 */ beq $zero, $zero, .L809E4368 -/* 00034 809E4354 01F81821 */ addu $v1, $t7, $t8 +/* 00030 809E4350 10000005 */ beq $zero, $zero, .L809E4368 +/* 00034 809E4354 01F81821 */ addu $v1, $t7, $t8 .L809E4358: /* 00038 809E4358 3C08809E */ lui $t0, %hi(D_809E5508) ## $t0 = 809E0000 /* 0003C 809E435C 25085508 */ addiu $t0, $t0, %lo(D_809E5508) ## $t0 = 809E5508 -/* 00040 809E4360 03281821 */ addu $v1, $t9, $t0 +/* 00040 809E4360 03281821 */ addu $v1, $t9, $t0 /* 00044 809E4364 C460000C */ lwc1 $f0, 0x000C($v1) ## 0000000C .L809E4368: /* 00048 809E4368 8C640000 */ lw $a0, 0x0000($v1) ## 00000000 -/* 0004C 809E436C AFA3002C */ sw $v1, 0x002C($sp) -/* 00050 809E4370 AFA5003C */ sw $a1, 0x003C($sp) +/* 0004C 809E436C AFA3002C */ sw $v1, 0x002C($sp) +/* 00050 809E4370 AFA5003C */ sw $a1, 0x003C($sp) /* 00054 809E4374 0C028800 */ jal SkelAnime_GetFrameCount - -/* 00058 809E4378 E7A00034 */ swc1 $f0, 0x0034($sp) + +/* 00058 809E4378 E7A00034 */ swc1 $f0, 0x0034($sp) /* 0005C 809E437C 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 -/* 00060 809E4380 8FA3002C */ lw $v1, 0x002C($sp) -/* 00064 809E4384 C7A00034 */ lwc1 $f0, 0x0034($sp) -/* 00068 809E4388 468021A0 */ cvt.s.w $f6, $f4 -/* 0006C 809E438C 8FA40038 */ lw $a0, 0x0038($sp) +/* 00060 809E4380 8FA3002C */ lw $v1, 0x002C($sp) +/* 00064 809E4384 C7A00034 */ lwc1 $f0, 0x0034($sp) +/* 00068 809E4388 468021A0 */ cvt.s.w $f6, $f4 +/* 0006C 809E438C 8FA40038 */ lw $a0, 0x0038($sp) /* 00070 809E4390 90690008 */ lbu $t1, 0x0008($v1) ## 00000008 /* 00074 809E4394 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 00078 809E4398 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 /* 0007C 809E439C 8C650000 */ lw $a1, 0x0000($v1) ## 00000000 -/* 00080 809E43A0 E7A60010 */ swc1 $f6, 0x0010($sp) -/* 00084 809E43A4 E7A00018 */ swc1 $f0, 0x0018($sp) +/* 00080 809E43A0 E7A60010 */ swc1 $f6, 0x0010($sp) +/* 00084 809E43A4 E7A00018 */ swc1 $f0, 0x0018($sp) /* 00088 809E43A8 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 0008C 809E43AC 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 00090 809E43B0 AFA90014 */ sw $t1, 0x0014($sp) -/* 00094 809E43B4 8FAA003C */ lw $t2, 0x003C($sp) -/* 00098 809E43B8 8FAB0040 */ lw $t3, 0x0040($sp) +/* 0008C 809E43AC 0C029468 */ jal SkelAnime_ChangeAnim + +/* 00090 809E43B0 AFA90014 */ sw $t1, 0x0014($sp) +/* 00094 809E43B4 8FAA003C */ lw $t2, 0x003C($sp) +/* 00098 809E43B8 8FAB0040 */ lw $t3, 0x0040($sp) /* 0009C 809E43BC AD6A0000 */ sw $t2, 0x0000($t3) ## 00000000 -/* 000A0 809E43C0 8FBF0024 */ lw $ra, 0x0024($sp) +/* 000A0 809E43C0 8FBF0024 */ lw $ra, 0x0024($sp) /* 000A4 809E43C4 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 -/* 000A8 809E43C8 03E00008 */ jr $ra +/* 000A8 809E43C8 03E00008 */ jr $ra /* 000AC 809E43CC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Daiku_Kakariko/func_809E47EC.s b/asm/non_matchings/overlays/actors/ovl_En_Daiku_Kakariko/func_809E47EC.s index 67dc9a4376..85ed73e028 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Daiku_Kakariko/func_809E47EC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Daiku_Kakariko/func_809E47EC.s @@ -50,7 +50,7 @@ glabel func_809E47EC /* 00584 809E48A4 33280003 */ andi $t0, $t9, 0x0003 ## $t0 = 00000000 /* 00588 809E48A8 00084880 */ sll $t1, $t0, 2 /* 0058C 809E48AC 00A92821 */ addu $a1, $a1, $t1 -/* 00590 809E48B0 0C01B0D8 */ jal func_8006C360 +/* 00590 809E48B0 0C01B0D8 */ jal Text_GetFaceReaction /* 00594 809E48B4 8CA55570 */ lw $a1, %lo(D_809E5570)($a1) /* 00598 809E48B8 304AFFFF */ andi $t2, $v0, 0xFFFF ## $t2 = 00000000 /* 0059C 809E48BC 15400035 */ bne $t2, $zero, .L809E4994 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Daiku_Kakariko/func_809E4BC4.s b/asm/non_matchings/overlays/actors/ovl_En_Daiku_Kakariko/func_809E4BC4.s index 78e54c7573..73f1909b44 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Daiku_Kakariko/func_809E4BC4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Daiku_Kakariko/func_809E4BC4.s @@ -51,7 +51,7 @@ glabel func_809E4BC4 /* 00964 809E4C84 46083501 */ sub.s $f20, $f6, $f8 /* 00968 809E4C88 46128581 */ sub.s $f22, $f16, $f18 /* 0096C 809E4C8C 4600A306 */ mov.s $f12, $f20 -/* 00970 809E4C90 0C03F494 */ jal func_800FD250 +/* 00970 809E4C90 0C03F494 */ jal Math_atan2f /* 00974 809E4C94 4600B386 */ mov.s $f14, $f22 /* 00978 809E4C98 3C01809E */ lui $at, %hi(D_809E5618) ## $at = 809E0000 /* 0097C 809E4C9C C4245618 */ lwc1 $f4, %lo(D_809E5618)($at) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Daiku_Kakariko/func_809E5288.s b/asm/non_matchings/overlays/actors/ovl_En_Daiku_Kakariko/func_809E5288.s index 31568ef00f..547fb50c00 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Daiku_Kakariko/func_809E5288.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Daiku_Kakariko/func_809E5288.s @@ -10,7 +10,7 @@ glabel func_809E5288 /* 00F88 809E52A8 24C655A8 */ addiu $a2, $a2, %lo(D_809E55A8) ## $a2 = 809E55A8 /* 00F8C 809E52AC 27A40020 */ addiu $a0, $sp, 0x0020 ## $a0 = FFFFFFE8 /* 00F90 809E52B0 24070450 */ addiu $a3, $zero, 0x0450 ## $a3 = 00000450 -/* 00F94 809E52B4 0C031AB1 */ jal func_800C6AC4 +/* 00F94 809E52B4 0C031AB1 */ jal Graph_OpenDisps /* 00F98 809E52B8 AFA50030 */ sw $a1, 0x0030($sp) /* 00F9C 809E52BC 8FAF003C */ lw $t7, 0x003C($sp) /* 00FA0 809E52C0 2401000F */ addiu $at, $zero, 0x000F ## $at = 0000000F @@ -40,7 +40,7 @@ glabel func_809E5288 /* 00FFC 809E531C 24C655C4 */ addiu $a2, $a2, %lo(D_809E55C4) ## $a2 = 809E55C4 /* 01000 809E5320 27A40020 */ addiu $a0, $sp, 0x0020 ## $a0 = FFFFFFE8 /* 01004 809E5324 24070459 */ addiu $a3, $zero, 0x0459 ## $a3 = 00000459 -/* 01008 809E5328 0C031AD5 */ jal func_800C6B54 +/* 01008 809E5328 0C031AD5 */ jal Graph_CloseDisps /* 0100C 809E532C 8DA50000 */ lw $a1, 0x0000($t5) ## 00000000 /* 01010 809E5330 8FBF0014 */ lw $ra, 0x0014($sp) /* 01014 809E5334 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/EnDekubaba_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/EnDekubaba_Draw.s index f7cc2ebb6d..8ea3cf4d1b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/EnDekubaba_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/EnDekubaba_Draw.s @@ -10,7 +10,7 @@ glabel EnDekubaba_Draw /* 03498 809E8C68 24C69130 */ addiu $a2, $a2, %lo(D_809E9130) ## $a2 = 809E9130 /* 0349C 809E8C6C 27A4003C */ addiu $a0, $sp, 0x003C ## $a0 = FFFFFFE4 /* 034A0 809E8C70 24070AC0 */ addiu $a3, $zero, 0x0AC0 ## $a3 = 00000AC0 -/* 034A4 809E8C74 0C031AB1 */ jal func_800C6AC4 +/* 034A4 809E8C74 0C031AB1 */ jal Graph_OpenDisps /* 034A8 809E8C78 AFA5004C */ sw $a1, 0x004C($sp) /* 034AC 809E8C7C 0C024F46 */ jal func_80093D18 /* 034B0 809E8C80 8E240000 */ lw $a0, 0x0000($s1) ## 00000000 @@ -148,7 +148,7 @@ glabel EnDekubaba_Draw /* 036A4 809E8E74 24C6916C */ addiu $a2, $a2, %lo(D_809E916C) ## $a2 = 809E916C /* 036A8 809E8E78 27A4003C */ addiu $a0, $sp, 0x003C ## $a0 = FFFFFFE4 /* 036AC 809E8E7C 8E250000 */ lw $a1, 0x0000($s1) ## 00000000 -/* 036B0 809E8E80 0C031AD5 */ jal func_800C6B54 +/* 036B0 809E8E80 0C031AD5 */ jal Graph_CloseDisps /* 036B4 809E8E84 24070AF4 */ addiu $a3, $zero, 0x0AF4 ## $a3 = 00000AF4 /* 036B8 809E8E88 8FBF0024 */ lw $ra, 0x0024($sp) /* 036BC 809E8E8C 8FB0001C */ lw $s0, 0x001C($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/func_809E5D28.s b/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/func_809E5D28.s index 227697ece4..66400550ec 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/func_809E5D28.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/func_809E5D28.s @@ -1,67 +1,67 @@ glabel func_809E5D28 /* 00558 809E5D28 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 0055C 809E5D2C AFB00028 */ sw $s0, 0x0028($sp) +/* 0055C 809E5D2C AFB00028 */ sw $s0, 0x0028($sp) /* 00560 809E5D30 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00564 809E5D34 AFBF002C */ sw $ra, 0x002C($sp) +/* 00564 809E5D34 AFBF002C */ sw $ra, 0x002C($sp) /* 00568 809E5D38 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 /* 0056C 809E5D3C 0C028800 */ jal SkelAnime_GetFrameCount - + /* 00570 809E5D40 248402B8 */ addiu $a0, $a0, 0x02B8 ## $a0 = 060002B8 /* 00574 809E5D44 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 /* 00578 809E5D48 248402B8 */ addiu $a0, $a0, 0x02B8 ## $a0 = 060002B8 /* 0057C 809E5D4C 0C028800 */ jal SkelAnime_GetFrameCount - -/* 00580 809E5D50 A7A20030 */ sh $v0, 0x0030($sp) -/* 00584 809E5D54 87AE0030 */ lh $t6, 0x0030($sp) + +/* 00580 809E5D50 A7A20030 */ sh $v0, 0x0030($sp) +/* 00584 809E5D54 87AE0030 */ lh $t6, 0x0030($sp) /* 00588 809E5D58 3C01809F */ lui $at, %hi(D_809E9184) ## $at = 809F0000 -/* 0058C 809E5D5C C4289184 */ lwc1 $f8, %lo(D_809E9184)($at) +/* 0058C 809E5D5C C4289184 */ lwc1 $f8, %lo(D_809E9184)($at) /* 00590 809E5D60 448E2000 */ mtc1 $t6, $f4 ## $f4 = 0.00 /* 00594 809E5D64 44828000 */ mtc1 $v0, $f16 ## $f16 = 0.00 /* 00598 809E5D68 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 0059C 809E5D6C 468021A0 */ cvt.s.w $f6, $f4 +/* 0059C 809E5D6C 468021A0 */ cvt.s.w $f6, $f4 /* 005A0 809E5D70 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 005A4 809E5D74 240F0002 */ addiu $t7, $zero, 0x0002 ## $t7 = 00000002 -/* 005A8 809E5D78 44070000 */ mfc1 $a3, $f0 -/* 005AC 809E5D7C AFAF0014 */ sw $t7, 0x0014($sp) -/* 005B0 809E5D80 468084A0 */ cvt.s.w $f18, $f16 -/* 005B4 809E5D84 46083282 */ mul.s $f10, $f6, $f8 +/* 005A8 809E5D78 44070000 */ mfc1 $a3, $f0 +/* 005AC 809E5D7C AFAF0014 */ sw $t7, 0x0014($sp) +/* 005B0 809E5D80 468084A0 */ cvt.s.w $f18, $f16 +/* 005B4 809E5D84 46083282 */ mul.s $f10, $f6, $f8 /* 005B8 809E5D88 24A502B8 */ addiu $a1, $a1, 0x02B8 ## $a1 = 060002B8 /* 005BC 809E5D8C 2604017C */ addiu $a0, $s0, 0x017C ## $a0 = 0000017C -/* 005C0 809E5D90 E7A00018 */ swc1 $f0, 0x0018($sp) -/* 005C4 809E5D94 E7B20010 */ swc1 $f18, 0x0010($sp) -/* 005C8 809E5D98 44065000 */ mfc1 $a2, $f10 -/* 005CC 809E5D9C 0C029468 */ jal SkelAnime_ChangeAnimation - +/* 005C0 809E5D90 E7A00018 */ swc1 $f0, 0x0018($sp) +/* 005C4 809E5D94 E7B20010 */ swc1 $f18, 0x0010($sp) +/* 005C8 809E5D98 44065000 */ mfc1 $a2, $f10 +/* 005CC 809E5D9C 0C029468 */ jal SkelAnime_ChangeAnim + /* 005D0 809E5DA0 00000000 */ nop /* 005D4 809E5DA4 8E020254 */ lw $v0, 0x0254($s0) ## 00000254 /* 005D8 809E5DA8 2418000F */ addiu $t8, $zero, 0x000F ## $t8 = 0000000F /* 005DC 809E5DAC A61801C6 */ sh $t8, 0x01C6($s0) ## 000001C6 /* 005E0 809E5DB0 90590097 */ lbu $t9, 0x0097($v0) ## 00000097 /* 005E4 809E5DB4 24040003 */ addiu $a0, $zero, 0x0003 ## $a0 = 00000003 -/* 005E8 809E5DB8 00041980 */ sll $v1, $a0, 6 +/* 005E8 809E5DB8 00041980 */ sll $v1, $a0, 6 /* 005EC 809E5DBC 37280001 */ ori $t0, $t9, 0x0001 ## $t0 = 00000001 /* 005F0 809E5DC0 A0480097 */ sb $t0, 0x0097($v0) ## 00000097 /* 005F4 809E5DC4 8E090254 */ lw $t1, 0x0254($s0) ## 00000254 /* 005F8 809E5DC8 24420080 */ addiu $v0, $v0, 0x0080 ## $v0 = 00000080 /* 005FC 809E5DCC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00600 809E5DD0 01231021 */ addu $v0, $t1, $v1 +/* 00600 809E5DD0 01231021 */ addu $v0, $t1, $v1 /* 00604 809E5DD4 904A0017 */ lbu $t2, 0x0017($v0) ## 00000097 /* 00608 809E5DD8 240539E2 */ addiu $a1, $zero, 0x39E2 ## $a1 = 000039E2 /* 0060C 809E5DDC 354B0001 */ ori $t3, $t2, 0x0001 ## $t3 = 00000001 /* 00610 809E5DE0 A04B0017 */ sb $t3, 0x0017($v0) ## 00000097 /* 00614 809E5DE4 8E0C0254 */ lw $t4, 0x0254($s0) ## 00000254 /* 00618 809E5DE8 240B0006 */ addiu $t3, $zero, 0x0006 ## $t3 = 00000006 -/* 0061C 809E5DEC 01831021 */ addu $v0, $t4, $v1 +/* 0061C 809E5DEC 01831021 */ addu $v0, $t4, $v1 /* 00620 809E5DF0 904D0057 */ lbu $t5, 0x0057($v0) ## 000000D7 /* 00624 809E5DF4 35AE0001 */ ori $t6, $t5, 0x0001 ## $t6 = 00000001 /* 00628 809E5DF8 A04E0057 */ sb $t6, 0x0057($v0) ## 000000D7 /* 0062C 809E5DFC 8E0F0254 */ lw $t7, 0x0254($s0) ## 00000254 -/* 00630 809E5E00 01E31021 */ addu $v0, $t7, $v1 +/* 00630 809E5E00 01E31021 */ addu $v0, $t7, $v1 /* 00634 809E5E04 90580097 */ lbu $t8, 0x0097($v0) ## 00000117 /* 00638 809E5E08 37190001 */ ori $t9, $t8, 0x0001 ## $t9 = 0000000F /* 0063C 809E5E0C A0590097 */ sb $t9, 0x0097($v0) ## 00000117 /* 00640 809E5E10 8E080254 */ lw $t0, 0x0254($s0) ## 00000254 -/* 00644 809E5E14 01031021 */ addu $v0, $t0, $v1 +/* 00644 809E5E14 01031021 */ addu $v0, $t0, $v1 /* 00648 809E5E18 904900D7 */ lbu $t1, 0x00D7($v0) ## 00000157 /* 0064C 809E5E1C 352A0001 */ ori $t2, $t1, 0x0001 ## $t2 = 00000001 /* 00650 809E5E20 A04A00D7 */ sb $t2, 0x00D7($v0) ## 00000157 @@ -69,15 +69,15 @@ glabel func_809E5D28 /* 00658 809E5E28 A20B024C */ sb $t3, 0x024C($s0) ## 0000024C /* 0065C 809E5E2C 318DFFFB */ andi $t5, $t4, 0xFFFB ## $t5 = 00000000 /* 00660 809E5E30 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 00664 809E5E34 A20D0249 */ sb $t5, 0x0249($s0) ## 00000249 /* 00668 809E5E38 3C0E809E */ lui $t6, %hi(func_809E65A0) ## $t6 = 809E0000 /* 0066C 809E5E3C 25CE65A0 */ addiu $t6, $t6, %lo(func_809E65A0) ## $t6 = 809E65A0 /* 00670 809E5E40 AE0E01C0 */ sw $t6, 0x01C0($s0) ## 000001C0 -/* 00674 809E5E44 8FBF002C */ lw $ra, 0x002C($sp) -/* 00678 809E5E48 8FB00028 */ lw $s0, 0x0028($sp) +/* 00674 809E5E44 8FBF002C */ lw $ra, 0x002C($sp) +/* 00678 809E5E48 8FB00028 */ lw $s0, 0x0028($sp) /* 0067C 809E5E4C 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 -/* 00680 809E5E50 03E00008 */ jr $ra +/* 00680 809E5E50 03E00008 */ jr $ra /* 00684 809E5E54 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/func_809E5E58.s b/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/func_809E5E58.s index 440baed5cc..ebf9a60edb 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/func_809E5E58.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/func_809E5E58.s @@ -1,64 +1,64 @@ glabel func_809E5E58 /* 00688 809E5E58 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 0068C 809E5E5C AFB00028 */ sw $s0, 0x0028($sp) +/* 0068C 809E5E5C AFB00028 */ sw $s0, 0x0028($sp) /* 00690 809E5E60 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00694 809E5E64 AFBF002C */ sw $ra, 0x002C($sp) +/* 00694 809E5E64 AFBF002C */ sw $ra, 0x002C($sp) /* 00698 809E5E68 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 /* 0069C 809E5E6C 0C028800 */ jal SkelAnime_GetFrameCount - + /* 006A0 809E5E70 248402B8 */ addiu $a0, $a0, 0x02B8 ## $a0 = 060002B8 /* 006A4 809E5E74 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 006A8 809E5E78 3C01C040 */ lui $at, 0xC040 ## $at = C0400000 /* 006AC 809E5E7C 44814000 */ mtc1 $at, $f8 ## $f8 = -3.00 -/* 006B0 809E5E80 46802120 */ cvt.s.w $f4, $f4 +/* 006B0 809E5E80 46802120 */ cvt.s.w $f4, $f4 /* 006B4 809E5E84 44803000 */ mtc1 $zero, $f6 ## $f6 = 0.00 /* 006B8 809E5E88 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 006BC 809E5E8C 240E0002 */ addiu $t6, $zero, 0x0002 ## $t6 = 00000002 -/* 006C0 809E5E90 AFAE0014 */ sw $t6, 0x0014($sp) +/* 006C0 809E5E90 AFAE0014 */ sw $t6, 0x0014($sp) /* 006C4 809E5E94 24A502B8 */ addiu $a1, $a1, 0x02B8 ## $a1 = 060002B8 -/* 006C8 809E5E98 44072000 */ mfc1 $a3, $f4 +/* 006C8 809E5E98 44072000 */ mfc1 $a3, $f4 /* 006CC 809E5E9C 2604017C */ addiu $a0, $s0, 0x017C ## $a0 = 0000017C /* 006D0 809E5EA0 3C06BFC0 */ lui $a2, 0xBFC0 ## $a2 = BFC00000 -/* 006D4 809E5EA4 E7A80018 */ swc1 $f8, 0x0018($sp) -/* 006D8 809E5EA8 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 006DC 809E5EAC E7A60010 */ swc1 $f6, 0x0010($sp) +/* 006D4 809E5EA4 E7A80018 */ swc1 $f8, 0x0018($sp) +/* 006D8 809E5EA8 0C029468 */ jal SkelAnime_ChangeAnim + +/* 006DC 809E5EAC E7A60010 */ swc1 $f6, 0x0010($sp) /* 006E0 809E5EB0 8E020254 */ lw $v0, 0x0254($s0) ## 00000254 /* 006E4 809E5EB4 240F000F */ addiu $t7, $zero, 0x000F ## $t7 = 0000000F /* 006E8 809E5EB8 A60F01C6 */ sh $t7, 0x01C6($s0) ## 000001C6 /* 006EC 809E5EBC 90580097 */ lbu $t8, 0x0097($v0) ## 00000097 /* 006F0 809E5EC0 24050003 */ addiu $a1, $zero, 0x0003 ## $a1 = 00000003 -/* 006F4 809E5EC4 00051980 */ sll $v1, $a1, 6 +/* 006F4 809E5EC4 00051980 */ sll $v1, $a1, 6 /* 006F8 809E5EC8 3319FFFE */ andi $t9, $t8, 0xFFFE ## $t9 = 00000000 /* 006FC 809E5ECC A0590097 */ sb $t9, 0x0097($v0) ## 00000097 /* 00700 809E5ED0 8E080254 */ lw $t0, 0x0254($s0) ## 00000254 /* 00704 809E5ED4 24420080 */ addiu $v0, $v0, 0x0080 ## $v0 = 00000080 -/* 00708 809E5ED8 01031021 */ addu $v0, $t0, $v1 +/* 00708 809E5ED8 01031021 */ addu $v0, $t0, $v1 /* 0070C 809E5EDC 90490017 */ lbu $t1, 0x0017($v0) ## 00000097 /* 00710 809E5EE0 312AFFFE */ andi $t2, $t1, 0xFFFE ## $t2 = 00000000 /* 00714 809E5EE4 A04A0017 */ sb $t2, 0x0017($v0) ## 00000097 /* 00718 809E5EE8 8E0B0254 */ lw $t3, 0x0254($s0) ## 00000254 /* 0071C 809E5EEC 3C0A809E */ lui $t2, %hi(func_809E6A04) ## $t2 = 809E0000 /* 00720 809E5EF0 254A6A04 */ addiu $t2, $t2, %lo(func_809E6A04) ## $t2 = 809E6A04 -/* 00724 809E5EF4 01631021 */ addu $v0, $t3, $v1 +/* 00724 809E5EF4 01631021 */ addu $v0, $t3, $v1 /* 00728 809E5EF8 904C0057 */ lbu $t4, 0x0057($v0) ## 000000D7 /* 0072C 809E5EFC 318DFFFE */ andi $t5, $t4, 0xFFFE ## $t5 = 00000000 /* 00730 809E5F00 A04D0057 */ sb $t5, 0x0057($v0) ## 000000D7 /* 00734 809E5F04 8E0E0254 */ lw $t6, 0x0254($s0) ## 00000254 -/* 00738 809E5F08 01C31021 */ addu $v0, $t6, $v1 +/* 00738 809E5F08 01C31021 */ addu $v0, $t6, $v1 /* 0073C 809E5F0C 904F0097 */ lbu $t7, 0x0097($v0) ## 00000117 /* 00740 809E5F10 31F8FFFE */ andi $t8, $t7, 0xFFFE ## $t8 = 0000000E /* 00744 809E5F14 A0580097 */ sb $t8, 0x0097($v0) ## 00000117 /* 00748 809E5F18 8E190254 */ lw $t9, 0x0254($s0) ## 00000254 -/* 0074C 809E5F1C 03231021 */ addu $v0, $t9, $v1 +/* 0074C 809E5F1C 03231021 */ addu $v0, $t9, $v1 /* 00750 809E5F20 904800D7 */ lbu $t0, 0x00D7($v0) ## 00000157 /* 00754 809E5F24 3109FFFE */ andi $t1, $t0, 0xFFFE ## $t1 = 00000000 /* 00758 809E5F28 A04900D7 */ sb $t1, 0x00D7($v0) ## 00000157 /* 0075C 809E5F2C AE0A01C0 */ sw $t2, 0x01C0($s0) ## 000001C0 -/* 00760 809E5F30 8FBF002C */ lw $ra, 0x002C($sp) -/* 00764 809E5F34 8FB00028 */ lw $s0, 0x0028($sp) +/* 00760 809E5F30 8FBF002C */ lw $ra, 0x002C($sp) +/* 00764 809E5F34 8FB00028 */ lw $s0, 0x0028($sp) /* 00768 809E5F38 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 0076C 809E5F3C 03E00008 */ jr $ra +/* 0076C 809E5F3C 03E00008 */ jr $ra /* 00770 809E5F40 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/func_809E5F44.s b/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/func_809E5F44.s index 25eb7db5c9..9f04fb728d 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/func_809E5F44.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/func_809E5F44.s @@ -1,26 +1,26 @@ glabel func_809E5F44 /* 00774 809E5F44 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00778 809E5F48 AFA40018 */ sw $a0, 0x0018($sp) -/* 0077C 809E5F4C AFBF0014 */ sw $ra, 0x0014($sp) +/* 00778 809E5F48 AFA40018 */ sw $a0, 0x0018($sp) +/* 0077C 809E5F4C AFBF0014 */ sw $ra, 0x0014($sp) /* 00780 809E5F50 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 /* 00784 809E5F54 0C028800 */ jal SkelAnime_GetFrameCount - + /* 00788 809E5F58 248402B8 */ addiu $a0, $a0, 0x02B8 ## $a0 = 060002B8 -/* 0078C 809E5F5C 8FA30018 */ lw $v1, 0x0018($sp) -/* 00790 809E5F60 00027040 */ sll $t6, $v0, 1 +/* 0078C 809E5F5C 8FA30018 */ lw $v1, 0x0018($sp) +/* 00790 809E5F60 00027040 */ sll $t6, $v0, 1 /* 00794 809E5F64 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 00798 809E5F68 24A502B8 */ addiu $a1, $a1, 0x02B8 ## $a1 = 060002B8 /* 0079C 809E5F6C 3C06C040 */ lui $a2, 0xC040 ## $a2 = C0400000 /* 007A0 809E5F70 A46E01C6 */ sh $t6, 0x01C6($v1) ## 000001C6 -/* 007A4 809E5F74 0C0294D3 */ jal func_800A534C +/* 007A4 809E5F74 0C0294D3 */ jal SkelAnime_ChangeAnimTransitionRepeat /* 007A8 809E5F78 2464017C */ addiu $a0, $v1, 0x017C ## $a0 = 0000017C -/* 007AC 809E5F7C 8FB80018 */ lw $t8, 0x0018($sp) +/* 007AC 809E5F7C 8FB80018 */ lw $t8, 0x0018($sp) /* 007B0 809E5F80 3C0F809E */ lui $t7, %hi(func_809E6ED4) ## $t7 = 809E0000 /* 007B4 809E5F84 25EF6ED4 */ addiu $t7, $t7, %lo(func_809E6ED4) ## $t7 = 809E6ED4 /* 007B8 809E5F88 AF0F01C0 */ sw $t7, 0x01C0($t8) ## 000001C0 -/* 007BC 809E5F8C 8FBF0014 */ lw $ra, 0x0014($sp) +/* 007BC 809E5F8C 8FBF0014 */ lw $ra, 0x0014($sp) /* 007C0 809E5F90 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 007C4 809E5F94 03E00008 */ jr $ra +/* 007C4 809E5F94 03E00008 */ jr $ra /* 007C8 809E5F98 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/func_809E5FBC.s b/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/func_809E5FBC.s index 8756ba4e73..0d5d0e6932 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/func_809E5FBC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/func_809E5FBC.s @@ -1,20 +1,20 @@ glabel func_809E5FBC /* 007EC 809E5FBC 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 007F0 809E5FC0 AFBF0014 */ sw $ra, 0x0014($sp) +/* 007F0 809E5FC0 AFBF0014 */ sw $ra, 0x0014($sp) /* 007F4 809E5FC4 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 /* 007F8 809E5FC8 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 007FC 809E5FCC 24A50208 */ addiu $a1, $a1, 0x0208 ## $a1 = 06000208 -/* 00800 809E5FD0 AFA60018 */ sw $a2, 0x0018($sp) -/* 00804 809E5FD4 0C02947A */ jal func_800A51E8 +/* 00800 809E5FD0 AFA60018 */ sw $a2, 0x0018($sp) +/* 00804 809E5FD4 0C02947A */ jal SkelAnime_ChangeAnimDefaultStop /* 00808 809E5FD8 2484017C */ addiu $a0, $a0, 0x017C ## $a0 = 0000017C -/* 0080C 809E5FDC 8FA60018 */ lw $a2, 0x0018($sp) +/* 0080C 809E5FDC 8FA60018 */ lw $a2, 0x0018($sp) /* 00810 809E5FE0 3C0E809E */ lui $t6, %hi(func_809E7104) ## $t6 = 809E0000 /* 00814 809E5FE4 25CE7104 */ addiu $t6, $t6, %lo(func_809E7104) ## $t6 = 809E7104 /* 00818 809E5FE8 A4C001C6 */ sh $zero, 0x01C6($a2) ## 000001C6 /* 0081C 809E5FEC ACCE01C0 */ sw $t6, 0x01C0($a2) ## 000001C0 -/* 00820 809E5FF0 8FBF0014 */ lw $ra, 0x0014($sp) +/* 00820 809E5FF0 8FBF0014 */ lw $ra, 0x0014($sp) /* 00824 809E5FF4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00828 809E5FF8 03E00008 */ jr $ra +/* 00828 809E5FF8 03E00008 */ jr $ra /* 0082C 809E5FFC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/func_809E6000.s b/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/func_809E6000.s index 4f072fb818..688ad47215 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/func_809E6000.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/func_809E6000.s @@ -1,35 +1,35 @@ glabel func_809E6000 /* 00830 809E6000 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 00834 809E6004 AFA40028 */ sw $a0, 0x0028($sp) -/* 00838 809E6008 AFBF0024 */ sw $ra, 0x0024($sp) +/* 00834 809E6004 AFA40028 */ sw $a0, 0x0028($sp) +/* 00838 809E6008 AFBF0024 */ sw $ra, 0x0024($sp) /* 0083C 809E600C 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 /* 00840 809E6010 0C028800 */ jal SkelAnime_GetFrameCount - + /* 00844 809E6014 24840208 */ addiu $a0, $a0, 0x0208 ## $a0 = 06000208 /* 00848 809E6018 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 0084C 809E601C 3C01C040 */ lui $at, 0xC040 ## $at = C0400000 /* 00850 809E6020 44814000 */ mtc1 $at, $f8 ## $f8 = -3.00 -/* 00854 809E6024 468021A0 */ cvt.s.w $f6, $f4 -/* 00858 809E6028 8FA40028 */ lw $a0, 0x0028($sp) +/* 00854 809E6024 468021A0 */ cvt.s.w $f6, $f4 +/* 00858 809E6028 8FA40028 */ lw $a0, 0x0028($sp) /* 0085C 809E602C 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 00860 809E6030 240E0002 */ addiu $t6, $zero, 0x0002 ## $t6 = 00000002 -/* 00864 809E6034 AFAE0014 */ sw $t6, 0x0014($sp) +/* 00864 809E6034 AFAE0014 */ sw $t6, 0x0014($sp) /* 00868 809E6038 24A50208 */ addiu $a1, $a1, 0x0208 ## $a1 = 06000208 -/* 0086C 809E603C E7A60010 */ swc1 $f6, 0x0010($sp) +/* 0086C 809E603C E7A60010 */ swc1 $f6, 0x0010($sp) /* 00870 809E6040 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 00874 809E6044 3C074170 */ lui $a3, 0x4170 ## $a3 = 41700000 -/* 00878 809E6048 E7A80018 */ swc1 $f8, 0x0018($sp) -/* 0087C 809E604C 0C029468 */ jal SkelAnime_ChangeAnimation - +/* 00878 809E6048 E7A80018 */ swc1 $f8, 0x0018($sp) +/* 0087C 809E604C 0C029468 */ jal SkelAnime_ChangeAnim + /* 00880 809E6050 2484017C */ addiu $a0, $a0, 0x017C ## $a0 = 0000017C -/* 00884 809E6054 8FA20028 */ lw $v0, 0x0028($sp) +/* 00884 809E6054 8FA20028 */ lw $v0, 0x0028($sp) /* 00888 809E6058 3C0F809E */ lui $t7, %hi(func_809E7458) ## $t7 = 809E0000 /* 0088C 809E605C 25EF7458 */ addiu $t7, $t7, %lo(func_809E7458) ## $t7 = 809E7458 /* 00890 809E6060 A44001C6 */ sh $zero, 0x01C6($v0) ## 000001C6 /* 00894 809E6064 AC4F01C0 */ sw $t7, 0x01C0($v0) ## 000001C0 -/* 00898 809E6068 8FBF0024 */ lw $ra, 0x0024($sp) +/* 00898 809E6068 8FBF0024 */ lw $ra, 0x0024($sp) /* 0089C 809E606C 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 008A0 809E6070 03E00008 */ jr $ra +/* 008A0 809E6070 03E00008 */ jr $ra /* 008A4 809E6074 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/func_809E60A8.s b/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/func_809E60A8.s index 2c7efd82c0..6d7f4dc2e8 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/func_809E60A8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/func_809E60A8.s @@ -1,56 +1,56 @@ glabel func_809E60A8 /* 008D8 809E60A8 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 008DC 809E60AC AFB00020 */ sw $s0, 0x0020($sp) -/* 008E0 809E60B0 AFA5002C */ sw $a1, 0x002C($sp) +/* 008DC 809E60AC AFB00020 */ sw $s0, 0x0020($sp) +/* 008E0 809E60B0 AFA5002C */ sw $a1, 0x002C($sp) /* 008E4 809E60B4 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 008E8 809E60B8 AFBF0024 */ sw $ra, 0x0024($sp) +/* 008E8 809E60B8 AFBF0024 */ sw $ra, 0x0024($sp) /* 008EC 809E60BC 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 008F0 809E60C0 24A50208 */ addiu $a1, $a1, 0x0208 ## $a1 = 06000208 /* 008F4 809E60C4 2484017C */ addiu $a0, $a0, 0x017C ## $a0 = 0000017C -/* 008F8 809E60C8 0C029490 */ jal func_800A5240 +/* 008F8 809E60C8 0C029490 */ jal SkelAnime_ChangeAnimTransitionStop /* 008FC 809E60CC 3C06C0A0 */ lui $a2, 0xC0A0 ## $a2 = C0A00000 /* 00900 809E60D0 920F0249 */ lbu $t7, 0x0249($s0) ## 00000249 -/* 00904 809E60D4 8FAE002C */ lw $t6, 0x002C($sp) +/* 00904 809E60D4 8FAE002C */ lw $t6, 0x002C($sp) /* 00908 809E60D8 3C01809F */ lui $at, %hi(D_809E9188) ## $at = 809F0000 /* 0090C 809E60DC 31F8FFFE */ andi $t8, $t7, 0xFFFE ## $t8 = 00000000 /* 00910 809E60E0 A2180249 */ sb $t8, 0x0249($s0) ## 00000249 /* 00914 809E60E4 A60E01C6 */ sh $t6, 0x01C6($s0) ## 000001C6 -/* 00918 809E60E8 C4269188 */ lwc1 $f6, %lo(D_809E9188)($at) +/* 00918 809E60E8 C4269188 */ lwc1 $f6, %lo(D_809E9188)($at) /* 0091C 809E60EC C6040230 */ lwc1 $f4, 0x0230($s0) ## 00000230 /* 00920 809E60F0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00924 809E60F4 46062202 */ mul.s $f8, $f4, $f6 -/* 00928 809E60F8 44054000 */ mfc1 $a1, $f8 +/* 00924 809E60F4 46062202 */ mul.s $f8, $f4, $f6 +/* 00928 809E60F8 44054000 */ mfc1 $a1, $f8 /* 0092C 809E60FC 0C00B58B */ jal Actor_SetScale - + /* 00930 809E6100 00000000 */ nop -/* 00934 809E6104 8FB9002C */ lw $t9, 0x002C($sp) +/* 00934 809E6104 8FB9002C */ lw $t9, 0x002C($sp) /* 00938 809E6108 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 /* 0093C 809E610C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00940 809E6110 1721000A */ bne $t9, $at, .L809E613C +/* 00940 809E6110 1721000A */ bne $t9, $at, .L809E613C /* 00944 809E6114 24054000 */ addiu $a1, $zero, 0x4000 ## $a1 = 00004000 /* 00948 809E6118 2408003E */ addiu $t0, $zero, 0x003E ## $t0 = 0000003E -/* 0094C 809E611C AFA80010 */ sw $t0, 0x0010($sp) +/* 0094C 809E611C AFA80010 */ sw $t0, 0x0010($sp) /* 00950 809E6120 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 00954 809E6124 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 00958 809E6128 2406009B */ addiu $a2, $zero, 0x009B ## $a2 = 0000009B -/* 0095C 809E612C 0C00D09B */ jal func_8003426C +/* 0095C 809E612C 0C00D09B */ jal func_8003426C /* 00960 809E6130 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 00964 809E6134 10000006 */ beq $zero, $zero, .L809E6150 +/* 00964 809E6134 10000006 */ beq $zero, $zero, .L809E6150 /* 00968 809E6138 00000000 */ nop .L809E613C: /* 0096C 809E613C 2409002A */ addiu $t1, $zero, 0x002A ## $t1 = 0000002A -/* 00970 809E6140 AFA90010 */ sw $t1, 0x0010($sp) +/* 00970 809E6140 AFA90010 */ sw $t1, 0x0010($sp) /* 00974 809E6144 240600FF */ addiu $a2, $zero, 0x00FF ## $a2 = 000000FF -/* 00978 809E6148 0C00D09B */ jal func_8003426C +/* 00978 809E6148 0C00D09B */ jal func_8003426C /* 0097C 809E614C 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 .L809E6150: /* 00980 809E6150 3C0A809E */ lui $t2, %hi(func_809E78DC) ## $t2 = 809E0000 /* 00984 809E6154 254A78DC */ addiu $t2, $t2, %lo(func_809E78DC) ## $t2 = 809E78DC /* 00988 809E6158 AE0A01C0 */ sw $t2, 0x01C0($s0) ## 000001C0 -/* 0098C 809E615C 8FBF0024 */ lw $ra, 0x0024($sp) -/* 00990 809E6160 8FB00020 */ lw $s0, 0x0020($sp) +/* 0098C 809E615C 8FBF0024 */ lw $ra, 0x0024($sp) +/* 00990 809E6160 8FB00020 */ lw $s0, 0x0020($sp) /* 00994 809E6164 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 00998 809E6168 03E00008 */ jr $ra +/* 00998 809E6168 03E00008 */ jr $ra /* 0099C 809E616C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/func_809E61E0.s b/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/func_809E61E0.s index 011be06265..c2774fc748 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/func_809E61E0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/func_809E61E0.s @@ -1,38 +1,38 @@ glabel func_809E61E0 /* 00A10 809E61E0 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 00A14 809E61E4 AFA40028 */ sw $a0, 0x0028($sp) -/* 00A18 809E61E8 AFBF0024 */ sw $ra, 0x0024($sp) +/* 00A14 809E61E4 AFA40028 */ sw $a0, 0x0028($sp) +/* 00A18 809E61E8 AFBF0024 */ sw $ra, 0x0024($sp) /* 00A1C 809E61EC 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 /* 00A20 809E61F0 0C028800 */ jal SkelAnime_GetFrameCount - + /* 00A24 809E61F4 248402B8 */ addiu $a0, $a0, 0x02B8 ## $a0 = 060002B8 /* 00A28 809E61F8 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 00A2C 809E61FC 3C01C040 */ lui $at, 0xC040 ## $at = C0400000 /* 00A30 809E6200 44814000 */ mtc1 $at, $f8 ## $f8 = -3.00 -/* 00A34 809E6204 46802120 */ cvt.s.w $f4, $f4 -/* 00A38 809E6208 8FA30028 */ lw $v1, 0x0028($sp) +/* 00A34 809E6204 46802120 */ cvt.s.w $f4, $f4 +/* 00A38 809E6208 8FA30028 */ lw $v1, 0x0028($sp) /* 00A3C 809E620C 44803000 */ mtc1 $zero, $f6 ## $f6 = 0.00 /* 00A40 809E6210 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 00A44 809E6214 240E0002 */ addiu $t6, $zero, 0x0002 ## $t6 = 00000002 -/* 00A48 809E6218 AFAE0014 */ sw $t6, 0x0014($sp) -/* 00A4C 809E621C 44072000 */ mfc1 $a3, $f4 +/* 00A48 809E6218 AFAE0014 */ sw $t6, 0x0014($sp) +/* 00A4C 809E621C 44072000 */ mfc1 $a3, $f4 /* 00A50 809E6220 24A502B8 */ addiu $a1, $a1, 0x02B8 ## $a1 = 060002B8 /* 00A54 809E6224 3C06BFC0 */ lui $a2, 0xBFC0 ## $a2 = BFC00000 -/* 00A58 809E6228 E7A80018 */ swc1 $f8, 0x0018($sp) +/* 00A58 809E6228 E7A80018 */ swc1 $f8, 0x0018($sp) /* 00A5C 809E622C 2464017C */ addiu $a0, $v1, 0x017C ## $a0 = 0000017C -/* 00A60 809E6230 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 00A64 809E6234 E7A60010 */ swc1 $f6, 0x0010($sp) -/* 00A68 809E6238 8FA30028 */ lw $v1, 0x0028($sp) +/* 00A60 809E6230 0C029468 */ jal SkelAnime_ChangeAnim + +/* 00A64 809E6234 E7A60010 */ swc1 $f6, 0x0010($sp) +/* 00A68 809E6238 8FA30028 */ lw $v1, 0x0028($sp) /* 00A6C 809E623C 3C19809E */ lui $t9, %hi(func_809E7F14) ## $t9 = 809E0000 /* 00A70 809E6240 27397F14 */ addiu $t9, $t9, %lo(func_809E7F14) ## $t9 = 809E7F14 /* 00A74 809E6244 906F0249 */ lbu $t7, 0x0249($v1) ## 00000249 /* 00A78 809E6248 AC7901C0 */ sw $t9, 0x01C0($v1) ## 000001C0 /* 00A7C 809E624C 31F8FFFE */ andi $t8, $t7, 0xFFFE ## $t8 = 00000000 /* 00A80 809E6250 A0780249 */ sb $t8, 0x0249($v1) ## 00000249 -/* 00A84 809E6254 8FBF0024 */ lw $ra, 0x0024($sp) +/* 00A84 809E6254 8FBF0024 */ lw $ra, 0x0024($sp) /* 00A88 809E6258 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 00A8C 809E625C 03E00008 */ jr $ra +/* 00A8C 809E625C 03E00008 */ jr $ra /* 00A90 809E6260 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/func_809E6264.s b/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/func_809E6264.s index 103b344694..35c79f8b02 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/func_809E6264.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/func_809E6264.s @@ -1,7 +1,7 @@ glabel func_809E6264 /* 00A94 809E6264 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 00A98 809E6268 AFBF002C */ sw $ra, 0x002C($sp) -/* 00A9C 809E626C AFB00028 */ sw $s0, 0x0028($sp) +/* 00A98 809E6268 AFBF002C */ sw $ra, 0x002C($sp) +/* 00A9C 809E626C AFB00028 */ sw $s0, 0x0028($sp) /* 00AA0 809E6270 8C820254 */ lw $v0, 0x0254($a0) ## 00000254 /* 00AA4 809E6274 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 00AA8 809E6278 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 @@ -11,76 +11,76 @@ glabel func_809E6264 /* 00AB8 809E6288 A04F0016 */ sb $t7, 0x0016($v0) ## 00000056 /* 00ABC 809E628C 8C820254 */ lw $v0, 0x0254($a0) ## 00000254 /* 00AC0 809E6290 24040003 */ addiu $a0, $zero, 0x0003 ## $a0 = 00000003 -/* 00AC4 809E6294 00041980 */ sll $v1, $a0, 6 +/* 00AC4 809E6294 00041980 */ sll $v1, $a0, 6 /* 00AC8 809E6298 90580096 */ lbu $t8, 0x0096($v0) ## 000000D6 /* 00ACC 809E629C 24420040 */ addiu $v0, $v0, 0x0040 ## $v0 = 00000080 /* 00AD0 809E62A0 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 /* 00AD4 809E62A4 37190001 */ ori $t9, $t8, 0x0001 ## $t9 = 00000001 /* 00AD8 809E62A8 A0590056 */ sb $t9, 0x0056($v0) ## 000000D6 /* 00ADC 809E62AC 8E080254 */ lw $t0, 0x0254($s0) ## 00000254 -/* 00AE0 809E62B0 01031021 */ addu $v0, $t0, $v1 +/* 00AE0 809E62B0 01031021 */ addu $v0, $t0, $v1 /* 00AE4 809E62B4 90490016 */ lbu $t1, 0x0016($v0) ## 00000096 /* 00AE8 809E62B8 352A0001 */ ori $t2, $t1, 0x0001 ## $t2 = 00000001 /* 00AEC 809E62BC A04A0016 */ sb $t2, 0x0016($v0) ## 00000096 /* 00AF0 809E62C0 8E0B0254 */ lw $t3, 0x0254($s0) ## 00000254 -/* 00AF4 809E62C4 01631021 */ addu $v0, $t3, $v1 +/* 00AF4 809E62C4 01631021 */ addu $v0, $t3, $v1 /* 00AF8 809E62C8 904C0056 */ lbu $t4, 0x0056($v0) ## 000000D6 /* 00AFC 809E62CC 358D0001 */ ori $t5, $t4, 0x0001 ## $t5 = 00000001 /* 00B00 809E62D0 A04D0056 */ sb $t5, 0x0056($v0) ## 000000D6 /* 00B04 809E62D4 8E0E0254 */ lw $t6, 0x0254($s0) ## 00000254 -/* 00B08 809E62D8 01C31021 */ addu $v0, $t6, $v1 +/* 00B08 809E62D8 01C31021 */ addu $v0, $t6, $v1 /* 00B0C 809E62DC 904F0096 */ lbu $t7, 0x0096($v0) ## 00000116 /* 00B10 809E62E0 35F80001 */ ori $t8, $t7, 0x0001 ## $t8 = 00000001 /* 00B14 809E62E4 A0580096 */ sb $t8, 0x0096($v0) ## 00000116 /* 00B18 809E62E8 8E190254 */ lw $t9, 0x0254($s0) ## 00000254 -/* 00B1C 809E62EC 03231021 */ addu $v0, $t9, $v1 +/* 00B1C 809E62EC 03231021 */ addu $v0, $t9, $v1 /* 00B20 809E62F0 904800D6 */ lbu $t0, 0x00D6($v0) ## 00000156 /* 00B24 809E62F4 35090001 */ ori $t1, $t0, 0x0001 ## $t1 = 00000001 /* 00B28 809E62F8 A04900D6 */ sb $t1, 0x00D6($v0) ## 00000156 /* 00B2C 809E62FC 860A01C6 */ lh $t2, 0x01C6($s0) ## 000001C6 -/* 00B30 809E6300 15410015 */ bne $t2, $at, .L809E6358 +/* 00B30 809E6300 15410015 */ bne $t2, $at, .L809E6358 /* 00B34 809E6304 00000000 */ nop /* 00B38 809E6308 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 /* 00B3C 809E630C 0C028800 */ jal SkelAnime_GetFrameCount - + /* 00B40 809E6310 248402B8 */ addiu $a0, $a0, 0x02B8 ## $a0 = 060002B8 /* 00B44 809E6314 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 00B48 809E6318 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 /* 00B4C 809E631C 3C01C040 */ lui $at, 0xC040 ## $at = C0400000 -/* 00B50 809E6320 468021A0 */ cvt.s.w $f6, $f4 +/* 00B50 809E6320 468021A0 */ cvt.s.w $f6, $f4 /* 00B54 809E6324 44814000 */ mtc1 $at, $f8 ## $f8 = -3.00 /* 00B58 809E6328 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 00B5C 809E632C 44070000 */ mfc1 $a3, $f0 +/* 00B5C 809E632C 44070000 */ mfc1 $a3, $f0 /* 00B60 809E6330 24A502B8 */ addiu $a1, $a1, 0x02B8 ## $a1 = 060002B8 /* 00B64 809E6334 2604017C */ addiu $a0, $s0, 0x017C ## $a0 = 0000017C -/* 00B68 809E6338 E7A60010 */ swc1 $f6, 0x0010($sp) +/* 00B68 809E6338 E7A60010 */ swc1 $f6, 0x0010($sp) /* 00B6C 809E633C 3C064080 */ lui $a2, 0x4080 ## $a2 = 40800000 -/* 00B70 809E6340 AFA00014 */ sw $zero, 0x0014($sp) -/* 00B74 809E6344 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 00B78 809E6348 E7A80018 */ swc1 $f8, 0x0018($sp) +/* 00B70 809E6340 AFA00014 */ sw $zero, 0x0014($sp) +/* 00B74 809E6344 0C029468 */ jal SkelAnime_ChangeAnim + +/* 00B78 809E6348 E7A80018 */ swc1 $f8, 0x0018($sp) /* 00B7C 809E634C 240B0028 */ addiu $t3, $zero, 0x0028 ## $t3 = 00000028 -/* 00B80 809E6350 10000013 */ beq $zero, $zero, .L809E63A0 +/* 00B80 809E6350 10000013 */ beq $zero, $zero, .L809E63A0 /* 00B84 809E6354 A60B01C6 */ sh $t3, 0x01C6($s0) ## 000001C6 .L809E6358: /* 00B88 809E6358 0C028800 */ jal SkelAnime_GetFrameCount - + /* 00B8C 809E635C 248402B8 */ addiu $a0, $a0, 0x02B8 ## $a0 = 000002B8 /* 00B90 809E6360 44825000 */ mtc1 $v0, $f10 ## $f10 = 0.00 /* 00B94 809E6364 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 /* 00B98 809E6368 3C01C040 */ lui $at, 0xC040 ## $at = C0400000 -/* 00B9C 809E636C 46805420 */ cvt.s.w $f16, $f10 +/* 00B9C 809E636C 46805420 */ cvt.s.w $f16, $f10 /* 00BA0 809E6370 44819000 */ mtc1 $at, $f18 ## $f18 = -3.00 /* 00BA4 809E6374 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 00BA8 809E6378 44060000 */ mfc1 $a2, $f0 -/* 00BAC 809E637C 44070000 */ mfc1 $a3, $f0 +/* 00BA8 809E6378 44060000 */ mfc1 $a2, $f0 +/* 00BAC 809E637C 44070000 */ mfc1 $a3, $f0 /* 00BB0 809E6380 24A502B8 */ addiu $a1, $a1, 0x02B8 ## $a1 = 060002B8 -/* 00BB4 809E6384 E7B00010 */ swc1 $f16, 0x0010($sp) +/* 00BB4 809E6384 E7B00010 */ swc1 $f16, 0x0010($sp) /* 00BB8 809E6388 2604017C */ addiu $a0, $s0, 0x017C ## $a0 = 0000017C -/* 00BBC 809E638C AFA00014 */ sw $zero, 0x0014($sp) -/* 00BC0 809E6390 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 00BC4 809E6394 E7B20018 */ swc1 $f18, 0x0018($sp) +/* 00BBC 809E638C AFA00014 */ sw $zero, 0x0014($sp) +/* 00BC0 809E6390 0C029468 */ jal SkelAnime_ChangeAnim + +/* 00BC4 809E6394 E7B20018 */ swc1 $f18, 0x0018($sp) /* 00BC8 809E6398 240C003C */ addiu $t4, $zero, 0x003C ## $t4 = 0000003C /* 00BCC 809E639C A60C01C6 */ sh $t4, 0x01C6($s0) ## 000001C6 .L809E63A0: @@ -89,19 +89,19 @@ glabel func_809E6264 /* 00BD8 809E63A8 C6080230 */ lwc1 $f8, 0x0230($s0) ## 00000230 /* 00BDC 809E63AC C6040008 */ lwc1 $f4, 0x0008($s0) ## 00000008 /* 00BE0 809E63B0 C610000C */ lwc1 $f16, 0x000C($s0) ## 0000000C -/* 00BE4 809E63B4 46083282 */ mul.s $f10, $f6, $f8 +/* 00BE4 809E63B4 46083282 */ mul.s $f10, $f6, $f8 /* 00BE8 809E63B8 E6040024 */ swc1 $f4, 0x0024($s0) ## 00000024 /* 00BEC 809E63BC C6040010 */ lwc1 $f4, 0x0010($s0) ## 00000010 /* 00BF0 809E63C0 3C0D809E */ lui $t5, %hi(func_809E79EC) ## $t5 = 809E0000 /* 00BF4 809E63C4 25AD79EC */ addiu $t5, $t5, %lo(func_809E79EC) ## $t5 = 809E79EC /* 00BF8 809E63C8 AE0D01C0 */ sw $t5, 0x01C0($s0) ## 000001C0 /* 00BFC 809E63CC E604002C */ swc1 $f4, 0x002C($s0) ## 0000002C -/* 00C00 809E63D0 460A8480 */ add.s $f18, $f16, $f10 +/* 00C00 809E63D0 460A8480 */ add.s $f18, $f16, $f10 /* 00C04 809E63D4 E6120028 */ swc1 $f18, 0x0028($s0) ## 00000028 -/* 00C08 809E63D8 8FBF002C */ lw $ra, 0x002C($sp) -/* 00C0C 809E63DC 8FB00028 */ lw $s0, 0x0028($sp) +/* 00C08 809E63D8 8FBF002C */ lw $ra, 0x002C($sp) +/* 00C0C 809E63DC 8FB00028 */ lw $s0, 0x0028($sp) /* 00C10 809E63E0 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 00C14 809E63E4 03E00008 */ jr $ra +/* 00C14 809E63E4 03E00008 */ jr $ra /* 00C18 809E63E8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/func_809E7104.s b/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/func_809E7104.s index 8619ece5a5..c21fc2797e 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/func_809E7104.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/func_809E7104.s @@ -1,86 +1,86 @@ glabel func_809E7104 /* 01934 809E7104 27BDFFB0 */ addiu $sp, $sp, 0xFFB0 ## $sp = FFFFFFB0 -/* 01938 809E7108 AFB00028 */ sw $s0, 0x0028($sp) +/* 01938 809E7108 AFB00028 */ sw $s0, 0x0028($sp) /* 0193C 809E710C 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 01940 809E7110 AFBF002C */ sw $ra, 0x002C($sp) +/* 01940 809E7110 AFBF002C */ sw $ra, 0x002C($sp) /* 01944 809E7114 2484017C */ addiu $a0, $a0, 0x017C ## $a0 = 0000017C -/* 01948 809E7118 AFA50054 */ sw $a1, 0x0054($sp) +/* 01948 809E7118 AFA50054 */ sw $a1, 0x0054($sp) /* 0194C 809E711C 0C02927F */ jal SkelAnime_FrameUpdateMatrix - -/* 01950 809E7120 AFA40034 */ sw $a0, 0x0034($sp) + +/* 01950 809E7120 AFA40034 */ sw $a0, 0x0034($sp) /* 01954 809E7124 860301C6 */ lh $v1, 0x01C6($s0) ## 000001C6 -/* 01958 809E7128 8FA40034 */ lw $a0, 0x0034($sp) -/* 0195C 809E712C 14600068 */ bne $v1, $zero, .L809E72D0 -/* 01960 809E7130 2861000B */ slti $at, $v1, 0x000B -/* 01964 809E7134 0C0295B2 */ jal func_800A56C8 +/* 01958 809E7128 8FA40034 */ lw $a0, 0x0034($sp) +/* 0195C 809E712C 14600068 */ bne $v1, $zero, .L809E72D0 +/* 01960 809E7130 2861000B */ slti $at, $v1, 0x000B +/* 01964 809E7134 0C0295B2 */ jal func_800A56C8 /* 01968 809E7138 3C053F80 */ lui $a1, 0x3F80 ## $a1 = 3F800000 -/* 0196C 809E713C 5040000D */ beql $v0, $zero, .L809E7174 +/* 0196C 809E713C 5040000D */ beql $v0, $zero, .L809E7174 /* 01970 809E7140 260400B4 */ addiu $a0, $s0, 0x00B4 ## $a0 = 000000B4 /* 01974 809E7144 860E001C */ lh $t6, 0x001C($s0) ## 0000001C /* 01978 809E7148 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 /* 0197C 809E714C 2405385D */ addiu $a1, $zero, 0x385D ## $a1 = 0000385D -/* 01980 809E7150 15C10005 */ bne $t6, $at, .L809E7168 +/* 01980 809E7150 15C10005 */ bne $t6, $at, .L809E7168 /* 01984 809E7154 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 01988 809E7158 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 0198C 809E715C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01990 809E7160 10000004 */ beq $zero, $zero, .L809E7174 +/* 01990 809E7160 10000004 */ beq $zero, $zero, .L809E7174 /* 01994 809E7164 260400B4 */ addiu $a0, $s0, 0x00B4 ## $a0 = 000000B4 .L809E7168: /* 01998 809E7168 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 0199C 809E716C 24053861 */ addiu $a1, $zero, 0x3861 ## $a1 = 00003861 /* 019A0 809E7170 260400B4 */ addiu $a0, $s0, 0x00B4 ## $a0 = 000000B4 .L809E7174: /* 019A4 809E7174 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 019A8 809E7178 0C01DE2B */ jal Math_ApproxUpdateScaledS - + /* 019AC 809E717C 24060222 */ addiu $a2, $zero, 0x0222 ## $a2 = 00000222 /* 019B0 809E7180 3C014120 */ lui $at, 0x4120 ## $at = 41200000 /* 019B4 809E7184 44813000 */ mtc1 $at, $f6 ## $f6 = 10.00 /* 019B8 809E7188 C6040194 */ lwc1 $f4, 0x0194($s0) ## 00000194 /* 019BC 809E718C 260401CA */ addiu $a0, $s0, 0x01CA ## $a0 = 000001CA /* 019C0 809E7190 2405F1C8 */ addiu $a1, $zero, 0xF1C8 ## $a1 = FFFFF1C8 -/* 019C4 809E7194 46062202 */ mul.s $f8, $f4, $f6 -/* 019C8 809E7198 4600428D */ trunc.w.s $f10, $f8 -/* 019CC 809E719C 44035000 */ mfc1 $v1, $f10 +/* 019C4 809E7194 46062202 */ mul.s $f8, $f4, $f6 +/* 019C8 809E7198 4600428D */ trunc.w.s $f10, $f8 +/* 019CC 809E719C 44035000 */ mfc1 $v1, $f10 /* 019D0 809E71A0 00000000 */ nop -/* 019D4 809E71A4 00031C00 */ sll $v1, $v1, 16 -/* 019D8 809E71A8 00031C03 */ sra $v1, $v1, 16 +/* 019D4 809E71A4 00031C00 */ sll $v1, $v1, 16 +/* 019D8 809E71A8 00031C03 */ sra $v1, $v1, 16 /* 019DC 809E71AC 2466038E */ addiu $a2, $v1, 0x038E ## $a2 = 0000038E -/* 019E0 809E71B0 00063400 */ sll $a2, $a2, 16 -/* 019E4 809E71B4 00063403 */ sra $a2, $a2, 16 +/* 019E0 809E71B0 00063400 */ sll $a2, $a2, 16 +/* 019E4 809E71B4 00063403 */ sra $a2, $a2, 16 /* 019E8 809E71B8 0C01DE2B */ jal Math_ApproxUpdateScaledS - -/* 019EC 809E71BC A7A3004A */ sh $v1, 0x004A($sp) -/* 019F0 809E71C0 87A6004A */ lh $a2, 0x004A($sp) + +/* 019EC 809E71BC A7A3004A */ sh $v1, 0x004A($sp) +/* 019F0 809E71C0 87A6004A */ lh $a2, 0x004A($sp) /* 019F4 809E71C4 30430001 */ andi $v1, $v0, 0x0001 ## $v1 = 00000000 -/* 019F8 809E71C8 AFA3004C */ sw $v1, 0x004C($sp) +/* 019F8 809E71C8 AFA3004C */ sw $v1, 0x004C($sp) /* 019FC 809E71CC 24C6071C */ addiu $a2, $a2, 0x071C ## $a2 = 0000071C -/* 01A00 809E71D0 00063400 */ sll $a2, $a2, 16 -/* 01A04 809E71D4 00063403 */ sra $a2, $a2, 16 +/* 01A00 809E71D0 00063400 */ sll $a2, $a2, 16 +/* 01A04 809E71D4 00063403 */ sra $a2, $a2, 16 /* 01A08 809E71D8 260401CC */ addiu $a0, $s0, 0x01CC ## $a0 = 000001CC /* 01A0C 809E71DC 0C01DE2B */ jal Math_ApproxUpdateScaledS - + /* 01A10 809E71E0 2405F1C8 */ addiu $a1, $zero, 0xF1C8 ## $a1 = FFFFF1C8 -/* 01A14 809E71E4 87A6004A */ lh $a2, 0x004A($sp) -/* 01A18 809E71E8 8FA3004C */ lw $v1, 0x004C($sp) +/* 01A14 809E71E4 87A6004A */ lh $a2, 0x004A($sp) +/* 01A18 809E71E8 8FA3004C */ lw $v1, 0x004C($sp) /* 01A1C 809E71EC 260401CE */ addiu $a0, $s0, 0x01CE ## $a0 = 000001CE /* 01A20 809E71F0 24C60E38 */ addiu $a2, $a2, 0x0E38 ## $a2 = 00000E38 -/* 01A24 809E71F4 00063400 */ sll $a2, $a2, 16 -/* 01A28 809E71F8 00621824 */ and $v1, $v1, $v0 -/* 01A2C 809E71FC AFA3004C */ sw $v1, 0x004C($sp) -/* 01A30 809E7200 00063403 */ sra $a2, $a2, 16 +/* 01A24 809E71F4 00063400 */ sll $a2, $a2, 16 +/* 01A28 809E71F8 00621824 */ and $v1, $v1, $v0 +/* 01A2C 809E71FC AFA3004C */ sw $v1, 0x004C($sp) +/* 01A30 809E7200 00063403 */ sra $a2, $a2, 16 /* 01A34 809E7204 0C01DE2B */ jal Math_ApproxUpdateScaledS - + /* 01A38 809E7208 2405F1C8 */ addiu $a1, $zero, 0xF1C8 ## $a1 = FFFFF1C8 -/* 01A3C 809E720C 8FA3004C */ lw $v1, 0x004C($sp) +/* 01A3C 809E720C 8FA3004C */ lw $v1, 0x004C($sp) /* 01A40 809E7210 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 01A44 809E7214 24A502B8 */ addiu $a1, $a1, 0x02B8 ## $a1 = 060002B8 -/* 01A48 809E7218 00621824 */ and $v1, $v1, $v0 -/* 01A4C 809E721C 10600054 */ beq $v1, $zero, .L809E7370 -/* 01A50 809E7220 8FA40034 */ lw $a0, 0x0034($sp) -/* 01A54 809E7224 0C0294E1 */ jal func_800A5384 +/* 01A48 809E7218 00621824 */ and $v1, $v1, $v0 +/* 01A4C 809E721C 10600054 */ beq $v1, $zero, .L809E7370 +/* 01A50 809E7220 8FA40034 */ lw $a0, 0x0034($sp) +/* 01A54 809E7224 0C0294E1 */ jal SkelAnime_ChangeAnimPlaybackRepeat /* 01A58 809E7228 3C064080 */ lui $a2, 0x4080 ## $a2 = 40800000 /* 01A5C 809E722C 0C01DE1C */ jal Math_Sins ## sins? @@ -88,9 +88,9 @@ glabel func_809E7104 /* 01A64 809E7234 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 /* 01A68 809E7238 44818000 */ mtc1 $at, $f16 ## $f16 = 5.00 /* 01A6C 809E723C 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 -/* 01A70 809E7240 46100482 */ mul.s $f18, $f0, $f16 -/* 01A74 809E7244 E7A40040 */ swc1 $f4, 0x0040($sp) -/* 01A78 809E7248 E7B2003C */ swc1 $f18, 0x003C($sp) +/* 01A70 809E7240 46100482 */ mul.s $f18, $f0, $f16 +/* 01A74 809E7244 E7A40040 */ swc1 $f4, 0x0040($sp) +/* 01A78 809E7248 E7B2003C */ swc1 $f18, 0x003C($sp) /* 01A7C 809E724C 0C01DE0D */ jal Math_Coss ## coss? /* 01A80 809E7250 860400B6 */ lh $a0, 0x00B6($s0) ## 000000B6 @@ -98,89 +98,89 @@ glabel func_809E7104 /* 01A88 809E7258 44813000 */ mtc1 $at, $f6 ## $f6 = 5.00 /* 01A8C 809E725C 3C18809F */ lui $t8, %hi(D_809E9024) ## $t8 = 809F0000 /* 01A90 809E7260 3C19809F */ lui $t9, %hi(D_809E9028) ## $t9 = 809F0000 -/* 01A94 809E7264 46060202 */ mul.s $f8, $f0, $f6 +/* 01A94 809E7264 46060202 */ mul.s $f8, $f0, $f6 /* 01A98 809E7268 27399028 */ addiu $t9, $t9, %lo(D_809E9028) ## $t9 = 809E9028 /* 01A9C 809E726C 27189024 */ addiu $t8, $t8, %lo(D_809E9024) ## $t8 = 809E9024 /* 01AA0 809E7270 24080001 */ addiu $t0, $zero, 0x0001 ## $t0 = 00000001 -/* 01AA4 809E7274 AFA80018 */ sw $t0, 0x0018($sp) -/* 01AA8 809E7278 AFB80010 */ sw $t8, 0x0010($sp) -/* 01AAC 809E727C AFB90014 */ sw $t9, 0x0014($sp) -/* 01AB0 809E7280 E7A80044 */ swc1 $f8, 0x0044($sp) +/* 01AA4 809E7274 AFA80018 */ sw $t0, 0x0018($sp) +/* 01AA8 809E7278 AFB80010 */ sw $t8, 0x0010($sp) +/* 01AAC 809E727C AFB90014 */ sw $t9, 0x0014($sp) +/* 01AB0 809E7280 E7A80044 */ swc1 $f8, 0x0044($sp) /* 01AB4 809E7284 3C0142C8 */ lui $at, 0x42C8 ## $at = 42C80000 /* 01AB8 809E7288 44818000 */ mtc1 $at, $f16 ## $f16 = 100.00 /* 01ABC 809E728C C60A0230 */ lwc1 $f10, 0x0230($s0) ## 00000230 /* 01AC0 809E7290 3C07809F */ lui $a3, %hi(D_809E8EA0) ## $a3 = 809F0000 /* 01AC4 809E7294 24E78EA0 */ addiu $a3, $a3, %lo(D_809E8EA0) ## $a3 = 809E8EA0 -/* 01AC8 809E7298 46105482 */ mul.s $f18, $f10, $f16 -/* 01ACC 809E729C 8FA40054 */ lw $a0, 0x0054($sp) +/* 01AC8 809E7298 46105482 */ mul.s $f18, $f10, $f16 +/* 01ACC 809E729C 8FA40054 */ lw $a0, 0x0054($sp) /* 01AD0 809E72A0 26050024 */ addiu $a1, $s0, 0x0024 ## $a1 = 00000024 /* 01AD4 809E72A4 27A6003C */ addiu $a2, $sp, 0x003C ## $a2 = FFFFFFEC -/* 01AD8 809E72A8 4600910D */ trunc.w.s $f4, $f18 -/* 01ADC 809E72AC 440A2000 */ mfc1 $t2, $f4 -/* 01AE0 809E72B0 0C00A0A7 */ jal func_8002829C -/* 01AE4 809E72B4 AFAA001C */ sw $t2, 0x001C($sp) +/* 01AD8 809E72A8 4600910D */ trunc.w.s $f4, $f18 +/* 01ADC 809E72AC 440A2000 */ mfc1 $t2, $f4 +/* 01AE0 809E72B0 0C00A0A7 */ jal func_8002829C +/* 01AE4 809E72B4 AFAA001C */ sw $t2, 0x001C($sp) /* 01AE8 809E72B8 920C0249 */ lbu $t4, 0x0249($s0) ## 00000249 /* 01AEC 809E72BC 240B0001 */ addiu $t3, $zero, 0x0001 ## $t3 = 00000001 /* 01AF0 809E72C0 A60B01C6 */ sh $t3, 0x01C6($s0) ## 000001C6 /* 01AF4 809E72C4 358D0001 */ ori $t5, $t4, 0x0001 ## $t5 = 00000001 -/* 01AF8 809E72C8 10000029 */ beq $zero, $zero, .L809E7370 +/* 01AF8 809E72C8 10000029 */ beq $zero, $zero, .L809E7370 /* 01AFC 809E72CC A20D0249 */ sb $t5, 0x0249($s0) ## 00000249 .L809E72D0: -/* 01B00 809E72D0 14200005 */ bne $at, $zero, .L809E72E8 +/* 01B00 809E72D0 14200005 */ bne $at, $zero, .L809E72E8 /* 01B04 809E72D4 246E0001 */ addiu $t6, $v1, 0x0001 ## $t6 = 00000001 -/* 01B08 809E72D8 0C279800 */ jal func_809E6000 +/* 01B08 809E72D8 0C279800 */ jal func_809E6000 /* 01B0C 809E72DC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01B10 809E72E0 10000023 */ beq $zero, $zero, .L809E7370 +/* 01B10 809E72E0 10000023 */ beq $zero, $zero, .L809E7370 /* 01B14 809E72E4 00000000 */ nop .L809E72E8: /* 01B18 809E72E8 A60E01C6 */ sh $t6, 0x01C6($s0) ## 000001C6 /* 01B1C 809E72EC 860F01C6 */ lh $t7, 0x01C6($s0) ## 000001C6 /* 01B20 809E72F0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01B24 809E72F4 29E10004 */ slti $at, $t7, 0x0004 -/* 01B28 809E72F8 5420000A */ bnel $at, $zero, .L809E7324 -/* 01B2C 809E72FC 8FA40034 */ lw $a0, 0x0034($sp) -/* 01B30 809E7300 0C00B821 */ jal func_8002E084 +/* 01B24 809E72F4 29E10004 */ slti $at, $t7, 0x0004 +/* 01B28 809E72F8 5420000A */ bnel $at, $zero, .L809E7324 +/* 01B2C 809E72FC 8FA40034 */ lw $a0, 0x0034($sp) +/* 01B30 809E7300 0C00B821 */ jal func_8002E084 /* 01B34 809E7304 2405016C */ addiu $a1, $zero, 0x016C ## $a1 = 0000016C -/* 01B38 809E7308 14400005 */ bne $v0, $zero, .L809E7320 +/* 01B38 809E7308 14400005 */ bne $v0, $zero, .L809E7320 /* 01B3C 809E730C 260400B6 */ addiu $a0, $s0, 0x00B6 ## $a0 = 000000B6 /* 01B40 809E7310 8605008A */ lh $a1, 0x008A($s0) ## 0000008A /* 01B44 809E7314 2406000F */ addiu $a2, $zero, 0x000F ## $a2 = 0000000F /* 01B48 809E7318 0C01E1EF */ jal Math_SmoothScaleMaxS - + /* 01B4C 809E731C 2407071C */ addiu $a3, $zero, 0x071C ## $a3 = 0000071C .L809E7320: -/* 01B50 809E7320 8FA40034 */ lw $a0, 0x0034($sp) +/* 01B50 809E7320 8FA40034 */ lw $a0, 0x0034($sp) .L809E7324: -/* 01B54 809E7324 0C0295B2 */ jal func_800A56C8 +/* 01B54 809E7324 0C0295B2 */ jal func_800A56C8 /* 01B58 809E7328 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 -/* 01B5C 809E732C 14400005 */ bne $v0, $zero, .L809E7344 -/* 01B60 809E7330 8FA40034 */ lw $a0, 0x0034($sp) -/* 01B64 809E7334 0C0295B2 */ jal func_800A56C8 +/* 01B5C 809E732C 14400005 */ bne $v0, $zero, .L809E7344 +/* 01B60 809E7330 8FA40034 */ lw $a0, 0x0034($sp) +/* 01B64 809E7334 0C0295B2 */ jal func_800A56C8 /* 01B68 809E7338 3C054140 */ lui $a1, 0x4140 ## $a1 = 41400000 -/* 01B6C 809E733C 1040000C */ beq $v0, $zero, .L809E7370 +/* 01B6C 809E733C 1040000C */ beq $v0, $zero, .L809E7370 /* 01B70 809E7340 00000000 */ nop .L809E7344: /* 01B74 809E7344 8618001C */ lh $t8, 0x001C($s0) ## 0000001C /* 01B78 809E7348 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 /* 01B7C 809E734C 2405385C */ addiu $a1, $zero, 0x385C ## $a1 = 0000385C -/* 01B80 809E7350 17010005 */ bne $t8, $at, .L809E7368 +/* 01B80 809E7350 17010005 */ bne $t8, $at, .L809E7368 /* 01B84 809E7354 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 01B88 809E7358 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 01B8C 809E735C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01B90 809E7360 10000003 */ beq $zero, $zero, .L809E7370 +/* 01B90 809E7360 10000003 */ beq $zero, $zero, .L809E7370 /* 01B94 809E7364 00000000 */ nop .L809E7368: /* 01B98 809E7368 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 01B9C 809E736C 24053860 */ addiu $a1, $zero, 0x3860 ## $a1 = 00003860 .L809E7370: -/* 01BA0 809E7370 0C279B73 */ jal func_809E6DCC +/* 01BA0 809E7370 0C279B73 */ jal func_809E6DCC /* 01BA4 809E7374 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01BA8 809E7378 8FBF002C */ lw $ra, 0x002C($sp) -/* 01BAC 809E737C 8FB00028 */ lw $s0, 0x0028($sp) +/* 01BA8 809E7378 8FBF002C */ lw $ra, 0x002C($sp) +/* 01BAC 809E737C 8FB00028 */ lw $s0, 0x0028($sp) /* 01BB0 809E7380 27BD0050 */ addiu $sp, $sp, 0x0050 ## $sp = 00000000 -/* 01BB4 809E7384 03E00008 */ jr $ra +/* 01BB4 809E7384 03E00008 */ jr $ra /* 01BB8 809E7388 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/func_809E858C.s b/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/func_809E858C.s index 86e9c0ae8d..e4597b32fb 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/func_809E858C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/func_809E858C.s @@ -1,55 +1,55 @@ glabel func_809E858C /* 02DBC 809E858C 27BDFFB8 */ addiu $sp, $sp, 0xFFB8 ## $sp = FFFFFFB8 -/* 02DC0 809E8590 AFBF001C */ sw $ra, 0x001C($sp) -/* 02DC4 809E8594 AFB10018 */ sw $s1, 0x0018($sp) -/* 02DC8 809E8598 AFB00014 */ sw $s0, 0x0014($sp) -/* 02DCC 809E859C AFA5004C */ sw $a1, 0x004C($sp) +/* 02DC0 809E8590 AFBF001C */ sw $ra, 0x001C($sp) +/* 02DC4 809E8594 AFB10018 */ sw $s1, 0x0018($sp) +/* 02DC8 809E8598 AFB00014 */ sw $s0, 0x0014($sp) +/* 02DCC 809E859C AFA5004C */ sw $a1, 0x004C($sp) /* 02DD0 809E85A0 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 /* 02DD4 809E85A4 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 02DD8 809E85A8 3C06809F */ lui $a2, %hi(D_809E9040) ## $a2 = 809F0000 /* 02DDC 809E85AC 24C69040 */ addiu $a2, $a2, %lo(D_809E9040) ## $a2 = 809E9040 /* 02DE0 809E85B0 27A40030 */ addiu $a0, $sp, 0x0030 ## $a0 = FFFFFFE8 /* 02DE4 809E85B4 2407098D */ addiu $a3, $zero, 0x098D ## $a3 = 0000098D -/* 02DE8 809E85B8 0C031AB1 */ jal func_800C6AC4 +/* 02DE8 809E85B8 0C031AB1 */ jal Graph_OpenDisps /* 02DEC 809E85BC 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 /* 02DF0 809E85C0 3C01809F */ lui $at, %hi(D_809E91C8) ## $at = 809F0000 -/* 02DF4 809E85C4 C42491C8 */ lwc1 $f4, %lo(D_809E91C8)($at) +/* 02DF4 809E85C4 C42491C8 */ lwc1 $f4, %lo(D_809E91C8)($at) /* 02DF8 809E85C8 C6000230 */ lwc1 $f0, 0x0230($s0) ## 00000230 /* 02DFC 809E85CC 3C01C0C0 */ lui $at, 0xC0C0 ## $at = C0C00000 /* 02E00 809E85D0 44815000 */ mtc1 $at, $f10 ## $f10 = -6.00 -/* 02E04 809E85D4 46040182 */ mul.s $f6, $f0, $f4 +/* 02E04 809E85D4 46040182 */ mul.s $f6, $f0, $f4 /* 02E08 809E85D8 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 02E0C 809E85DC 46005402 */ mul.s $f16, $f10, $f0 -/* 02E10 809E85E0 E7A60044 */ swc1 $f6, 0x0044($sp) +/* 02E0C 809E85DC 46005402 */ mul.s $f16, $f10, $f0 +/* 02E10 809E85E0 E7A60044 */ swc1 $f6, 0x0044($sp) /* 02E14 809E85E4 C608000C */ lwc1 $f8, 0x000C($s0) ## 0000000C /* 02E18 809E85E8 8E060010 */ lw $a2, 0x0010($s0) ## 00000010 /* 02E1C 809E85EC C60C0008 */ lwc1 $f12, 0x0008($s0) ## 00000008 -/* 02E20 809E85F0 0C034261 */ jal Matrix_Translate -/* 02E24 809E85F4 46104380 */ add.s $f14, $f8, $f16 +/* 02E20 809E85F0 0C034261 */ jal Matrix_Translate +/* 02E24 809E85F4 46104380 */ add.s $f14, $f8, $f16 /* 02E28 809E85F8 860401CA */ lh $a0, 0x01CA($s0) ## 000001CA /* 02E2C 809E85FC 860500B6 */ lh $a1, 0x00B6($s0) ## 000000B6 /* 02E30 809E8600 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 02E34 809E8604 0C034421 */ jal Matrix_RotateXYZ +/* 02E34 809E8604 0C034421 */ jal Matrix_RotateZYX /* 02E38 809E8608 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 02E3C 809E860C C7AC0044 */ lwc1 $f12, 0x0044($sp) +/* 02E3C 809E860C C7AC0044 */ lwc1 $f12, 0x0044($sp) /* 02E40 809E8610 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 02E44 809E8614 44066000 */ mfc1 $a2, $f12 -/* 02E48 809E8618 0C0342A3 */ jal Matrix_Scale -/* 02E4C 809E861C 46006386 */ mov.s $f14, $f12 +/* 02E44 809E8614 44066000 */ mfc1 $a2, $f12 +/* 02E48 809E8618 0C0342A3 */ jal Matrix_Scale +/* 02E4C 809E861C 46006386 */ mov.s $f14, $f12 /* 02E50 809E8620 8E2202C0 */ lw $v0, 0x02C0($s1) ## 000002C0 /* 02E54 809E8624 3C18DA38 */ lui $t8, 0xDA38 ## $t8 = DA380000 /* 02E58 809E8628 37180003 */ ori $t8, $t8, 0x0003 ## $t8 = DA380003 /* 02E5C 809E862C 244F0008 */ addiu $t7, $v0, 0x0008 ## $t7 = 00000008 /* 02E60 809E8630 AE2F02C0 */ sw $t7, 0x02C0($s1) ## 000002C0 /* 02E64 809E8634 AC580000 */ sw $t8, 0x0000($v0) ## 00000000 -/* 02E68 809E8638 8FB9004C */ lw $t9, 0x004C($sp) +/* 02E68 809E8638 8FB9004C */ lw $t9, 0x004C($sp) /* 02E6C 809E863C 3C05809F */ lui $a1, %hi(D_809E9054) ## $a1 = 809F0000 /* 02E70 809E8640 24A59054 */ addiu $a1, $a1, %lo(D_809E9054) ## $a1 = 809E9054 /* 02E74 809E8644 8F240000 */ lw $a0, 0x0000($t9) ## 00000000 /* 02E78 809E8648 2406099D */ addiu $a2, $zero, 0x099D ## $a2 = 0000099D -/* 02E7C 809E864C 0C0346A2 */ jal Matrix_NewMtx -/* 02E80 809E8650 AFA2002C */ sw $v0, 0x002C($sp) -/* 02E84 809E8654 8FA3002C */ lw $v1, 0x002C($sp) +/* 02E7C 809E864C 0C0346A2 */ jal Matrix_NewMtx +/* 02E80 809E8650 AFA2002C */ sw $v0, 0x002C($sp) +/* 02E84 809E8654 8FA3002C */ lw $v1, 0x002C($sp) /* 02E88 809E8658 3C0A0600 */ lui $t2, 0x0600 ## $t2 = 06000000 /* 02E8C 809E865C 254A1330 */ addiu $t2, $t2, 0x1330 ## $t2 = 06001330 /* 02E90 809E8660 AC620004 */ sw $v0, 0x0004($v1) ## 00000004 @@ -61,19 +61,19 @@ glabel func_809E858C /* 02EA8 809E8678 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 /* 02EAC 809E867C AC4A0004 */ sw $t2, 0x0004($v0) ## 00000004 /* 02EB0 809E8680 0C00B56E */ jal Actor_SetHeight - + /* 02EB4 809E8684 AC490000 */ sw $t1, 0x0000($v0) ## 00000000 -/* 02EB8 809E8688 8FAB004C */ lw $t3, 0x004C($sp) +/* 02EB8 809E8688 8FAB004C */ lw $t3, 0x004C($sp) /* 02EBC 809E868C 3C06809F */ lui $a2, %hi(D_809E9068) ## $a2 = 809F0000 /* 02EC0 809E8690 24C69068 */ addiu $a2, $a2, %lo(D_809E9068) ## $a2 = 809E9068 /* 02EC4 809E8694 27A40030 */ addiu $a0, $sp, 0x0030 ## $a0 = FFFFFFE8 /* 02EC8 809E8698 240709A4 */ addiu $a3, $zero, 0x09A4 ## $a3 = 000009A4 -/* 02ECC 809E869C 0C031AD5 */ jal func_800C6B54 +/* 02ECC 809E869C 0C031AD5 */ jal Graph_CloseDisps /* 02ED0 809E86A0 8D650000 */ lw $a1, 0x0000($t3) ## 00000000 -/* 02ED4 809E86A4 8FBF001C */ lw $ra, 0x001C($sp) -/* 02ED8 809E86A8 8FB00014 */ lw $s0, 0x0014($sp) -/* 02EDC 809E86AC 8FB10018 */ lw $s1, 0x0018($sp) -/* 02EE0 809E86B0 03E00008 */ jr $ra +/* 02ED4 809E86A4 8FBF001C */ lw $ra, 0x001C($sp) +/* 02ED8 809E86A8 8FB00014 */ lw $s0, 0x0014($sp) +/* 02EDC 809E86AC 8FB10018 */ lw $s1, 0x0018($sp) +/* 02EE0 809E86B0 03E00008 */ jr $ra /* 02EE4 809E86B4 27BD0048 */ addiu $sp, $sp, 0x0048 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/func_809E86B8.s b/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/func_809E86B8.s index dcbf6c3948..9ad8ca1a28 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/func_809E86B8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/func_809E86B8.s @@ -1,77 +1,77 @@ glabel func_809E86B8 /* 02EE8 809E86B8 27BDFF10 */ addiu $sp, $sp, 0xFF10 ## $sp = FFFFFF10 -/* 02EEC 809E86BC AFBF005C */ sw $ra, 0x005C($sp) -/* 02EF0 809E86C0 AFBE0058 */ sw $s8, 0x0058($sp) -/* 02EF4 809E86C4 AFB70054 */ sw $s7, 0x0054($sp) -/* 02EF8 809E86C8 AFB60050 */ sw $s6, 0x0050($sp) -/* 02EFC 809E86CC AFB5004C */ sw $s5, 0x004C($sp) -/* 02F00 809E86D0 AFB40048 */ sw $s4, 0x0048($sp) -/* 02F04 809E86D4 AFB30044 */ sw $s3, 0x0044($sp) -/* 02F08 809E86D8 AFB20040 */ sw $s2, 0x0040($sp) -/* 02F0C 809E86DC AFB1003C */ sw $s1, 0x003C($sp) -/* 02F10 809E86E0 AFB00038 */ sw $s0, 0x0038($sp) -/* 02F14 809E86E4 F7BA0030 */ sdc1 $f26, 0x0030($sp) -/* 02F18 809E86E8 F7B80028 */ sdc1 $f24, 0x0028($sp) -/* 02F1C 809E86EC F7B60020 */ sdc1 $f22, 0x0020($sp) -/* 02F20 809E86F0 F7B40018 */ sdc1 $f20, 0x0018($sp) -/* 02F24 809E86F4 AFA500F4 */ sw $a1, 0x00F4($sp) +/* 02EEC 809E86BC AFBF005C */ sw $ra, 0x005C($sp) +/* 02EF0 809E86C0 AFBE0058 */ sw $s8, 0x0058($sp) +/* 02EF4 809E86C4 AFB70054 */ sw $s7, 0x0054($sp) +/* 02EF8 809E86C8 AFB60050 */ sw $s6, 0x0050($sp) +/* 02EFC 809E86CC AFB5004C */ sw $s5, 0x004C($sp) +/* 02F00 809E86D0 AFB40048 */ sw $s4, 0x0048($sp) +/* 02F04 809E86D4 AFB30044 */ sw $s3, 0x0044($sp) +/* 02F08 809E86D8 AFB20040 */ sw $s2, 0x0040($sp) +/* 02F0C 809E86DC AFB1003C */ sw $s1, 0x003C($sp) +/* 02F10 809E86E0 AFB00038 */ sw $s0, 0x0038($sp) +/* 02F14 809E86E4 F7BA0030 */ sdc1 $f26, 0x0030($sp) +/* 02F18 809E86E8 F7B80028 */ sdc1 $f24, 0x0028($sp) +/* 02F1C 809E86EC F7B60020 */ sdc1 $f22, 0x0020($sp) +/* 02F20 809E86F0 F7B40018 */ sdc1 $f20, 0x0018($sp) +/* 02F24 809E86F4 AFA500F4 */ sw $a1, 0x00F4($sp) /* 02F28 809E86F8 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 /* 02F2C 809E86FC 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 02F30 809E8700 3C06809F */ lui $a2, %hi(D_809E907C) ## $a2 = 809F0000 /* 02F34 809E8704 24C6907C */ addiu $a2, $a2, %lo(D_809E907C) ## $a2 = 809E907C /* 02F38 809E8708 27A40088 */ addiu $a0, $sp, 0x0088 ## $a0 = FFFFFF98 /* 02F3C 809E870C 240709B7 */ addiu $a3, $zero, 0x09B7 ## $a3 = 000009B7 -/* 02F40 809E8710 0C031AB1 */ jal func_800C6AC4 +/* 02F40 809E8710 0C031AB1 */ jal Graph_OpenDisps /* 02F44 809E8714 00A0A025 */ or $s4, $a1, $zero ## $s4 = 00000000 /* 02F48 809E8718 8E1801C0 */ lw $t8, 0x01C0($s0) ## 000001C0 /* 02F4C 809E871C 3C0F809E */ lui $t7, %hi(func_809E7BB0) ## $t7 = 809E0000 /* 02F50 809E8720 25EF7BB0 */ addiu $t7, $t7, %lo(func_809E7BB0) ## $t7 = 809E7BB0 -/* 02F54 809E8724 15F80004 */ bne $t7, $t8, .L809E8738 +/* 02F54 809E8724 15F80004 */ bne $t7, $t8, .L809E8738 /* 02F58 809E8728 3C01809F */ lui $at, %hi(D_809E91CC) ## $at = 809F0000 /* 02F5C 809E872C 24190002 */ addiu $t9, $zero, 0x0002 ## $t9 = 00000002 -/* 02F60 809E8730 10000003 */ beq $zero, $zero, .L809E8740 -/* 02F64 809E8734 AFB9009C */ sw $t9, 0x009C($sp) +/* 02F60 809E8730 10000003 */ beq $zero, $zero, .L809E8740 +/* 02F64 809E8734 AFB9009C */ sw $t9, 0x009C($sp) .L809E8738: /* 02F68 809E8738 24080003 */ addiu $t0, $zero, 0x0003 ## $t0 = 00000003 -/* 02F6C 809E873C AFA8009C */ sw $t0, 0x009C($sp) +/* 02F6C 809E873C AFA8009C */ sw $t0, 0x009C($sp) .L809E8740: /* 02F70 809E8740 C6040230 */ lwc1 $f4, 0x0230($s0) ## 00000230 -/* 02F74 809E8744 C42691CC */ lwc1 $f6, %lo(D_809E91CC)($at) +/* 02F74 809E8744 C42691CC */ lwc1 $f6, %lo(D_809E91CC)($at) /* 02F78 809E8748 C60C0024 */ lwc1 $f12, 0x0024($s0) ## 00000024 /* 02F7C 809E874C C60E0028 */ lwc1 $f14, 0x0028($s0) ## 00000028 -/* 02F80 809E8750 46062502 */ mul.s $f20, $f4, $f6 +/* 02F80 809E8750 46062502 */ mul.s $f20, $f4, $f6 /* 02F84 809E8754 8E06002C */ lw $a2, 0x002C($s0) ## 0000002C -/* 02F88 809E8758 0C034261 */ jal Matrix_Translate +/* 02F88 809E8758 0C034261 */ jal Matrix_Translate /* 02F8C 809E875C 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 02F90 809E8760 4406A000 */ mfc1 $a2, $f20 -/* 02F94 809E8764 4600A306 */ mov.s $f12, $f20 -/* 02F98 809E8768 4600A386 */ mov.s $f14, $f20 -/* 02F9C 809E876C 0C0342A3 */ jal Matrix_Scale +/* 02F90 809E8760 4406A000 */ mfc1 $a2, $f20 +/* 02F94 809E8764 4600A306 */ mov.s $f12, $f20 +/* 02F98 809E8768 4600A386 */ mov.s $f14, $f20 +/* 02F9C 809E876C 0C0342A3 */ jal Matrix_Scale /* 02FA0 809E8770 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 02FA4 809E8774 0C034236 */ jal Matrix_Get +/* 02FA4 809E8774 0C034236 */ jal Matrix_Get /* 02FA8 809E8778 27A400B0 */ addiu $a0, $sp, 0x00B0 ## $a0 = FFFFFFC0 /* 02FAC 809E877C 92090114 */ lbu $t1, 0x0114($s0) ## 00000114 /* 02FB0 809E8780 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 /* 02FB4 809E8784 00009025 */ or $s2, $zero, $zero ## $s2 = 00000000 -/* 02FB8 809E8788 1120000C */ beq $t1, $zero, .L809E87BC +/* 02FB8 809E8788 1120000C */ beq $t1, $zero, .L809E87BC /* 02FBC 809E878C 02009825 */ or $s3, $s0, $zero ## $s3 = 00000000 /* 02FC0 809E8790 4481B000 */ mtc1 $at, $f22 ## $f22 = 20.00 /* 02FC4 809E8794 C6080230 */ lwc1 $f8, 0x0230($s0) ## 00000230 /* 02FC8 809E8798 C6100028 */ lwc1 $f16, 0x0028($s0) ## 00000028 /* 02FCC 809E879C C60A0024 */ lwc1 $f10, 0x0024($s0) ## 00000024 -/* 02FD0 809E87A0 46164682 */ mul.s $f26, $f8, $f22 +/* 02FD0 809E87A0 46164682 */ mul.s $f26, $f8, $f22 /* 02FD4 809E87A4 C604002C */ lwc1 $f4, 0x002C($s0) ## 0000002C /* 02FD8 809E87A8 E60A0164 */ swc1 $f10, 0x0164($s0) ## 00000164 /* 02FDC 809E87AC E604016C */ swc1 $f4, 0x016C($s0) ## 0000016C -/* 02FE0 809E87B0 461A8481 */ sub.s $f18, $f16, $f26 +/* 02FE0 809E87B0 461A8481 */ sub.s $f18, $f16, $f26 /* 02FE4 809E87B4 E6120168 */ swc1 $f18, 0x0168($s0) ## 00000168 -/* 02FE8 809E87B8 E7BA00A4 */ swc1 $f26, 0x00A4($sp) +/* 02FE8 809E87B8 E7BA00A4 */ swc1 $f26, 0x00A4($sp) .L809E87BC: -/* 02FEC 809E87BC 8FAA009C */ lw $t2, 0x009C($sp) +/* 02FEC 809E87BC 8FAA009C */ lw $t2, 0x009C($sp) /* 02FF0 809E87C0 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 /* 02FF4 809E87C4 4481B000 */ mtc1 $at, $f22 ## $f22 = 20.00 -/* 02FF8 809E87C8 1940006F */ blez $t2, .L809E8988 -/* 02FFC 809E87CC C7BA00A4 */ lwc1 $f26, 0x00A4($sp) +/* 02FF8 809E87C8 1940006F */ blez $t2, .L809E8988 +/* 02FFC 809E87CC C7BA00A4 */ lwc1 $f26, 0x00A4($sp) /* 03000 809E87D0 3C014220 */ lui $at, 0x4220 ## $at = 42200000 /* 03004 809E87D4 3C15809F */ lui $s5, %hi(D_809E902C) ## $s5 = 809F0000 /* 03008 809E87D8 4481C000 */ mtc1 $at, $f24 ## $f24 = 40.00 @@ -83,39 +83,39 @@ glabel func_809E86B8 /* 0301C 809E87EC 0C01DE1C */ jal Math_Sins ## sins? /* 03020 809E87F0 866401CA */ lh $a0, 0x01CA($s3) ## 000001CA -/* 03024 809E87F4 4600B182 */ mul.s $f6, $f22, $f0 +/* 03024 809E87F4 4600B182 */ mul.s $f6, $f22, $f0 /* 03028 809E87F8 C6080230 */ lwc1 $f8, 0x0230($s0) ## 00000230 -/* 0302C 809E87FC C7B000E4 */ lwc1 $f16, 0x00E4($sp) -/* 03030 809E8800 46083282 */ mul.s $f10, $f6, $f8 -/* 03034 809E8804 460A8480 */ add.s $f18, $f16, $f10 -/* 03038 809E8808 E7B200E4 */ swc1 $f18, 0x00E4($sp) +/* 0302C 809E87FC C7B000E4 */ lwc1 $f16, 0x00E4($sp) +/* 03030 809E8800 46083282 */ mul.s $f10, $f6, $f8 +/* 03034 809E8804 460A8480 */ add.s $f18, $f16, $f10 +/* 03038 809E8808 E7B200E4 */ swc1 $f18, 0x00E4($sp) /* 0303C 809E880C 0C01DE0D */ jal Math_Coss ## coss? /* 03040 809E8810 866401CA */ lh $a0, 0x01CA($s3) ## 000001CA -/* 03044 809E8814 46160102 */ mul.s $f4, $f0, $f22 +/* 03044 809E8814 46160102 */ mul.s $f4, $f0, $f22 /* 03048 809E8818 C6060230 */ lwc1 $f6, 0x0230($s0) ## 00000230 /* 0304C 809E881C 860400B6 */ lh $a0, 0x00B6($s0) ## 000000B6 -/* 03050 809E8820 46062502 */ mul.s $f20, $f4, $f6 +/* 03050 809E8820 46062502 */ mul.s $f20, $f4, $f6 /* 03054 809E8824 0C01DE1C */ jal Math_Sins ## sins? /* 03058 809E8828 00000000 */ nop -/* 0305C 809E882C 4600A402 */ mul.s $f16, $f20, $f0 -/* 03060 809E8830 C7A800E0 */ lwc1 $f8, 0x00E0($sp) -/* 03064 809E8834 46104281 */ sub.s $f10, $f8, $f16 -/* 03068 809E8838 E7AA00E0 */ swc1 $f10, 0x00E0($sp) +/* 0305C 809E882C 4600A402 */ mul.s $f16, $f20, $f0 +/* 03060 809E8830 C7A800E0 */ lwc1 $f8, 0x00E0($sp) +/* 03064 809E8834 46104281 */ sub.s $f10, $f8, $f16 +/* 03068 809E8838 E7AA00E0 */ swc1 $f10, 0x00E0($sp) /* 0306C 809E883C 0C01DE0D */ jal Math_Coss ## coss? /* 03070 809E8840 860400B6 */ lh $a0, 0x00B6($s0) ## 000000B6 -/* 03074 809E8844 4600A102 */ mul.s $f4, $f20, $f0 -/* 03078 809E8848 C7B200E8 */ lwc1 $f18, 0x00E8($sp) +/* 03074 809E8844 4600A102 */ mul.s $f4, $f20, $f0 +/* 03078 809E8848 C7B200E8 */ lwc1 $f18, 0x00E8($sp) /* 0307C 809E884C 27A400B0 */ addiu $a0, $sp, 0x00B0 ## $a0 = FFFFFFC0 -/* 03080 809E8850 46049181 */ sub.s $f6, $f18, $f4 -/* 03084 809E8854 0C03423F */ jal Matrix_Put -/* 03088 809E8858 E7A600E8 */ swc1 $f6, 0x00E8($sp) +/* 03080 809E8850 46049181 */ sub.s $f6, $f18, $f4 +/* 03084 809E8854 0C03423F */ jal Matrix_Put +/* 03088 809E8858 E7A600E8 */ swc1 $f6, 0x00E8($sp) /* 0308C 809E885C 866401CA */ lh $a0, 0x01CA($s3) ## 000001CA /* 03090 809E8860 860500B6 */ lh $a1, 0x00B6($s0) ## 000000B6 /* 03094 809E8864 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 03098 809E8868 0C034421 */ jal Matrix_RotateXYZ +/* 03098 809E8868 0C034421 */ jal Matrix_RotateZYX /* 0309C 809E886C 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 /* 030A0 809E8870 8E8202C0 */ lw $v0, 0x02C0($s4) ## 000002C0 /* 030A4 809E8874 3C0CDA38 */ lui $t4, 0xDA38 ## $t4 = DA380000 @@ -123,12 +123,12 @@ glabel func_809E86B8 /* 030AC 809E887C 244B0008 */ addiu $t3, $v0, 0x0008 ## $t3 = 00000008 /* 030B0 809E8880 AE8B02C0 */ sw $t3, 0x02C0($s4) ## 000002C0 /* 030B4 809E8884 AC4C0000 */ sw $t4, 0x0000($v0) ## 00000000 -/* 030B8 809E8888 8FAD00F4 */ lw $t5, 0x00F4($sp) +/* 030B8 809E8888 8FAD00F4 */ lw $t5, 0x00F4($sp) /* 030BC 809E888C 3C05809F */ lui $a1, %hi(D_809E9090) ## $a1 = 809F0000 /* 030C0 809E8890 24A59090 */ addiu $a1, $a1, %lo(D_809E9090) ## $a1 = 809E9090 /* 030C4 809E8894 240609E5 */ addiu $a2, $zero, 0x09E5 ## $a2 = 000009E5 /* 030C8 809E8898 00408825 */ or $s1, $v0, $zero ## $s1 = 00000000 -/* 030CC 809E889C 0C0346A2 */ jal Matrix_NewMtx +/* 030CC 809E889C 0C0346A2 */ jal Matrix_NewMtx /* 030D0 809E88A0 8DA40000 */ lw $a0, 0x0000($t5) ## 00000000 /* 030D4 809E88A4 AE220004 */ sw $v0, 0x0004($s1) ## 00000004 /* 030D8 809E88A8 8E8202C0 */ lw $v0, 0x02C0($s4) ## 000002C0 @@ -139,80 +139,80 @@ glabel func_809E86B8 /* 030EC 809E88BC AC4F0000 */ sw $t7, 0x0000($v0) ## 00000000 /* 030F0 809E88C0 8EB80000 */ lw $t8, 0x0000($s5) ## 809E902C /* 030F4 809E88C4 03C02825 */ or $a1, $s8, $zero ## $a1 = 00000238 -/* 030F8 809E88C8 0C018A29 */ jal func_800628A4 +/* 030F8 809E88C8 0C018A29 */ jal func_800628A4 /* 030FC 809E88CC AC580004 */ sw $t8, 0x0004($v0) ## 00000004 /* 03100 809E88D0 02E02025 */ or $a0, $s7, $zero ## $a0 = 00000034 -/* 03104 809E88D4 0C018A29 */ jal func_800628A4 +/* 03104 809E88D4 0C018A29 */ jal func_800628A4 /* 03108 809E88D8 03C02825 */ or $a1, $s8, $zero ## $a1 = 00000238 -/* 0310C 809E88DC 16400015 */ bne $s2, $zero, .L809E8934 -/* 03110 809E88E0 2A410002 */ slti $at, $s2, 0x0002 +/* 0310C 809E88DC 16400015 */ bne $s2, $zero, .L809E8934 +/* 03110 809E88E0 2A410002 */ slti $at, $s2, 0x0002 /* 03114 809E88E4 8E0801C0 */ lw $t0, 0x01C0($s0) ## 000001C0 /* 03118 809E88E8 3C19809E */ lui $t9, %hi(func_809E7A88) ## $t9 = 809E0000 /* 0311C 809E88EC 27397A88 */ addiu $t9, $t9, %lo(func_809E7A88) ## $t9 = 809E7A88 -/* 03120 809E88F0 13280007 */ beq $t9, $t0, .L809E8910 -/* 03124 809E88F4 C7A800E0 */ lwc1 $f8, 0x00E0($sp) +/* 03120 809E88F0 13280007 */ beq $t9, $t0, .L809E8910 +/* 03124 809E88F4 C7A800E0 */ lwc1 $f8, 0x00E0($sp) /* 03128 809E88F8 E6080038 */ swc1 $f8, 0x0038($s0) ## 00000038 -/* 0312C 809E88FC C7B000E4 */ lwc1 $f16, 0x00E4($sp) +/* 0312C 809E88FC C7B000E4 */ lwc1 $f16, 0x00E4($sp) /* 03130 809E8900 E610003C */ swc1 $f16, 0x003C($s0) ## 0000003C -/* 03134 809E8904 C7AA00E8 */ lwc1 $f10, 0x00E8($sp) -/* 03138 809E8908 1000000A */ beq $zero, $zero, .L809E8934 +/* 03134 809E8904 C7AA00E8 */ lwc1 $f10, 0x00E8($sp) +/* 03138 809E8908 1000000A */ beq $zero, $zero, .L809E8934 /* 0313C 809E890C E60A0040 */ swc1 $f10, 0x0040($s0) ## 00000040 .L809E8910: /* 03140 809E8910 C6060230 */ lwc1 $f6, 0x0230($s0) ## 00000230 /* 03144 809E8914 C604000C */ lwc1 $f4, 0x000C($s0) ## 0000000C /* 03148 809E8918 C6120008 */ lwc1 $f18, 0x0008($s0) ## 00000008 -/* 0314C 809E891C 4606C202 */ mul.s $f8, $f24, $f6 +/* 0314C 809E891C 4606C202 */ mul.s $f8, $f24, $f6 /* 03150 809E8920 C60A0010 */ lwc1 $f10, 0x0010($s0) ## 00000010 /* 03154 809E8924 E6120038 */ swc1 $f18, 0x0038($s0) ## 00000038 /* 03158 809E8928 E60A0040 */ swc1 $f10, 0x0040($s0) ## 00000040 -/* 0315C 809E892C 46082400 */ add.s $f16, $f4, $f8 +/* 0315C 809E892C 46082400 */ add.s $f16, $f4, $f8 /* 03160 809E8930 E610003C */ swc1 $f16, 0x003C($s0) ## 0000003C .L809E8934: -/* 03164 809E8934 1020000E */ beq $at, $zero, .L809E8970 +/* 03164 809E8934 1020000E */ beq $at, $zero, .L809E8970 /* 03168 809E8938 26730002 */ addiu $s3, $s3, 0x0002 ## $s3 = 00000002 /* 0316C 809E893C 92090114 */ lbu $t1, 0x0114($s0) ## 00000114 -/* 03170 809E8940 00125080 */ sll $t2, $s2, 2 -/* 03174 809E8944 01525023 */ subu $t2, $t2, $s2 -/* 03178 809E8948 11200009 */ beq $t1, $zero, .L809E8970 -/* 0317C 809E894C C7B200E0 */ lwc1 $f18, 0x00E0($sp) -/* 03180 809E8950 000A5080 */ sll $t2, $t2, 2 -/* 03184 809E8954 020A1021 */ addu $v0, $s0, $t2 +/* 03170 809E8940 00125080 */ sll $t2, $s2, 2 +/* 03174 809E8944 01525023 */ subu $t2, $t2, $s2 +/* 03178 809E8948 11200009 */ beq $t1, $zero, .L809E8970 +/* 0317C 809E894C C7B200E0 */ lwc1 $f18, 0x00E0($sp) +/* 03180 809E8950 000A5080 */ sll $t2, $t2, 2 +/* 03184 809E8954 020A1021 */ addu $v0, $s0, $t2 /* 03188 809E8958 E452014C */ swc1 $f18, 0x014C($v0) ## 0000014C -/* 0318C 809E895C C7A600E4 */ lwc1 $f6, 0x00E4($sp) -/* 03190 809E8960 461A3101 */ sub.s $f4, $f6, $f26 +/* 0318C 809E895C C7A600E4 */ lwc1 $f6, 0x00E4($sp) +/* 03190 809E8960 461A3101 */ sub.s $f4, $f6, $f26 /* 03194 809E8964 E4440150 */ swc1 $f4, 0x0150($v0) ## 00000150 -/* 03198 809E8968 C7A800E8 */ lwc1 $f8, 0x00E8($sp) +/* 03198 809E8968 C7A800E8 */ lwc1 $f8, 0x00E8($sp) /* 0319C 809E896C E4480154 */ swc1 $f8, 0x0154($v0) ## 00000154 .L809E8970: -/* 031A0 809E8970 8FAB009C */ lw $t3, 0x009C($sp) +/* 031A0 809E8970 8FAB009C */ lw $t3, 0x009C($sp) /* 031A4 809E8974 26520001 */ addiu $s2, $s2, 0x0001 ## $s2 = 00000001 /* 031A8 809E8978 26B50004 */ addiu $s5, $s5, 0x0004 ## $s5 = 809E9030 /* 031AC 809E897C 26D60002 */ addiu $s6, $s6, 0x0002 ## $s6 = 00000035 -/* 031B0 809E8980 164BFF9A */ bne $s2, $t3, .L809E87EC +/* 031B0 809E8980 164BFF9A */ bne $s2, $t3, .L809E87EC /* 031B4 809E8984 26F70002 */ addiu $s7, $s7, 0x0002 ## $s7 = 00000036 .L809E8988: -/* 031B8 809E8988 8FAC00F4 */ lw $t4, 0x00F4($sp) +/* 031B8 809E8988 8FAC00F4 */ lw $t4, 0x00F4($sp) /* 031BC 809E898C 3C06809F */ lui $a2, %hi(D_809E90A4) ## $a2 = 809F0000 /* 031C0 809E8990 24C690A4 */ addiu $a2, $a2, %lo(D_809E90A4) ## $a2 = 809E90A4 /* 031C4 809E8994 27A40088 */ addiu $a0, $sp, 0x0088 ## $a0 = FFFFFF98 /* 031C8 809E8998 24070A09 */ addiu $a3, $zero, 0x0A09 ## $a3 = 00000A09 -/* 031CC 809E899C 0C031AD5 */ jal func_800C6B54 +/* 031CC 809E899C 0C031AD5 */ jal Graph_CloseDisps /* 031D0 809E89A0 8D850000 */ lw $a1, 0x0000($t4) ## 00000000 -/* 031D4 809E89A4 8FBF005C */ lw $ra, 0x005C($sp) -/* 031D8 809E89A8 D7B40018 */ ldc1 $f20, 0x0018($sp) -/* 031DC 809E89AC D7B60020 */ ldc1 $f22, 0x0020($sp) -/* 031E0 809E89B0 D7B80028 */ ldc1 $f24, 0x0028($sp) -/* 031E4 809E89B4 D7BA0030 */ ldc1 $f26, 0x0030($sp) -/* 031E8 809E89B8 8FB00038 */ lw $s0, 0x0038($sp) -/* 031EC 809E89BC 8FB1003C */ lw $s1, 0x003C($sp) -/* 031F0 809E89C0 8FB20040 */ lw $s2, 0x0040($sp) -/* 031F4 809E89C4 8FB30044 */ lw $s3, 0x0044($sp) -/* 031F8 809E89C8 8FB40048 */ lw $s4, 0x0048($sp) -/* 031FC 809E89CC 8FB5004C */ lw $s5, 0x004C($sp) -/* 03200 809E89D0 8FB60050 */ lw $s6, 0x0050($sp) -/* 03204 809E89D4 8FB70054 */ lw $s7, 0x0054($sp) -/* 03208 809E89D8 8FBE0058 */ lw $s8, 0x0058($sp) -/* 0320C 809E89DC 03E00008 */ jr $ra +/* 031D4 809E89A4 8FBF005C */ lw $ra, 0x005C($sp) +/* 031D8 809E89A8 D7B40018 */ ldc1 $f20, 0x0018($sp) +/* 031DC 809E89AC D7B60020 */ ldc1 $f22, 0x0020($sp) +/* 031E0 809E89B0 D7B80028 */ ldc1 $f24, 0x0028($sp) +/* 031E4 809E89B4 D7BA0030 */ ldc1 $f26, 0x0030($sp) +/* 031E8 809E89B8 8FB00038 */ lw $s0, 0x0038($sp) +/* 031EC 809E89BC 8FB1003C */ lw $s1, 0x003C($sp) +/* 031F0 809E89C0 8FB20040 */ lw $s2, 0x0040($sp) +/* 031F4 809E89C4 8FB30044 */ lw $s3, 0x0044($sp) +/* 031F8 809E89C8 8FB40048 */ lw $s4, 0x0048($sp) +/* 031FC 809E89CC 8FB5004C */ lw $s5, 0x004C($sp) +/* 03200 809E89D0 8FB60050 */ lw $s6, 0x0050($sp) +/* 03204 809E89D4 8FB70054 */ lw $s7, 0x0054($sp) +/* 03208 809E89D8 8FBE0058 */ lw $s8, 0x0058($sp) +/* 0320C 809E89DC 03E00008 */ jr $ra /* 03210 809E89E0 27BD00F0 */ addiu $sp, $sp, 0x00F0 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/func_809E89E4.s b/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/func_809E89E4.s index 01de988052..e58d535ffb 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/func_809E89E4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/func_809E89E4.s @@ -1,21 +1,21 @@ glabel func_809E89E4 /* 03214 809E89E4 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 -/* 03218 809E89E8 AFBF001C */ sw $ra, 0x001C($sp) -/* 0321C 809E89EC AFB00018 */ sw $s0, 0x0018($sp) -/* 03220 809E89F0 AFA40040 */ sw $a0, 0x0040($sp) -/* 03224 809E89F4 AFA50044 */ sw $a1, 0x0044($sp) +/* 03218 809E89E8 AFBF001C */ sw $ra, 0x001C($sp) +/* 0321C 809E89EC AFB00018 */ sw $s0, 0x0018($sp) +/* 03220 809E89F0 AFA40040 */ sw $a0, 0x0040($sp) +/* 03224 809E89F4 AFA50044 */ sw $a1, 0x0044($sp) /* 03228 809E89F8 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 /* 0322C 809E89FC 3C06809F */ lui $a2, %hi(D_809E90B8) ## $a2 = 809F0000 /* 03230 809E8A00 24C690B8 */ addiu $a2, $a2, %lo(D_809E90B8) ## $a2 = 809E90B8 /* 03234 809E8A04 27A4002C */ addiu $a0, $sp, 0x002C ## $a0 = FFFFFFEC /* 03238 809E8A08 24070A13 */ addiu $a3, $zero, 0x0A13 ## $a3 = 00000A13 -/* 0323C 809E8A0C 0C031AB1 */ jal func_800C6AC4 +/* 0323C 809E8A0C 0C031AB1 */ jal Graph_OpenDisps /* 03240 809E8A10 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 -/* 03244 809E8A14 8FA20040 */ lw $v0, 0x0040($sp) +/* 03244 809E8A14 8FA20040 */ lw $v0, 0x0040($sp) /* 03248 809E8A18 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 /* 0324C 809E8A1C 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 /* 03250 809E8A20 844401CE */ lh $a0, 0x01CE($v0) ## 000001CE -/* 03254 809E8A24 0C034421 */ jal Matrix_RotateXYZ +/* 03254 809E8A24 0C034421 */ jal Matrix_RotateZYX /* 03258 809E8A28 844500B6 */ lh $a1, 0x00B6($v0) ## 000000B6 /* 0325C 809E8A2C 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 /* 03260 809E8A30 3C18DA38 */ lui $t8, 0xDA38 ## $t8 = DA380000 @@ -23,14 +23,14 @@ glabel func_809E89E4 /* 03268 809E8A38 244F0008 */ addiu $t7, $v0, 0x0008 ## $t7 = 00000008 /* 0326C 809E8A3C AE0F02C0 */ sw $t7, 0x02C0($s0) ## 000002C0 /* 03270 809E8A40 AC580000 */ sw $t8, 0x0000($v0) ## 00000000 -/* 03274 809E8A44 8FB90044 */ lw $t9, 0x0044($sp) +/* 03274 809E8A44 8FB90044 */ lw $t9, 0x0044($sp) /* 03278 809E8A48 3C05809F */ lui $a1, %hi(D_809E90CC) ## $a1 = 809F0000 /* 0327C 809E8A4C 24A590CC */ addiu $a1, $a1, %lo(D_809E90CC) ## $a1 = 809E90CC /* 03280 809E8A50 8F240000 */ lw $a0, 0x0000($t9) ## 00000000 /* 03284 809E8A54 24060A1A */ addiu $a2, $zero, 0x0A1A ## $a2 = 00000A1A -/* 03288 809E8A58 0C0346A2 */ jal Matrix_NewMtx -/* 0328C 809E8A5C AFA20028 */ sw $v0, 0x0028($sp) -/* 03290 809E8A60 8FA30028 */ lw $v1, 0x0028($sp) +/* 03288 809E8A58 0C0346A2 */ jal Matrix_NewMtx +/* 0328C 809E8A5C AFA20028 */ sw $v0, 0x0028($sp) +/* 03290 809E8A60 8FA30028 */ lw $v1, 0x0028($sp) /* 03294 809E8A64 3C0A0600 */ lui $t2, 0x0600 ## $t2 = 06000000 /* 03298 809E8A68 254A1828 */ addiu $t2, $t2, 0x1828 ## $t2 = 06001828 /* 0329C 809E8A6C AC620004 */ sw $v0, 0x0004($v1) ## 00000004 @@ -41,24 +41,24 @@ glabel func_809E89E4 /* 032B0 809E8A80 AE0802C0 */ sw $t0, 0x02C0($s0) ## 000002C0 /* 032B4 809E8A84 AC4A0004 */ sw $t2, 0x0004($v0) ## 00000004 /* 032B8 809E8A88 AC490000 */ sw $t1, 0x0000($v0) ## 00000000 -/* 032BC 809E8A8C 8FB00040 */ lw $s0, 0x0040($sp) +/* 032BC 809E8A8C 8FB00040 */ lw $s0, 0x0040($sp) /* 032C0 809E8A90 26100238 */ addiu $s0, $s0, 0x0238 ## $s0 = 00000238 -/* 032C4 809E8A94 0C018A29 */ jal func_800628A4 +/* 032C4 809E8A94 0C018A29 */ jal func_800628A4 /* 032C8 809E8A98 02002825 */ or $a1, $s0, $zero ## $a1 = 00000238 /* 032CC 809E8A9C 24040038 */ addiu $a0, $zero, 0x0038 ## $a0 = 00000038 -/* 032D0 809E8AA0 0C018A29 */ jal func_800628A4 +/* 032D0 809E8AA0 0C018A29 */ jal func_800628A4 /* 032D4 809E8AA4 02002825 */ or $a1, $s0, $zero ## $a1 = 00000238 -/* 032D8 809E8AA8 8FAB0044 */ lw $t3, 0x0044($sp) +/* 032D8 809E8AA8 8FAB0044 */ lw $t3, 0x0044($sp) /* 032DC 809E8AAC 3C06809F */ lui $a2, %hi(D_809E90E0) ## $a2 = 809F0000 /* 032E0 809E8AB0 24C690E0 */ addiu $a2, $a2, %lo(D_809E90E0) ## $a2 = 809E90E0 /* 032E4 809E8AB4 27A4002C */ addiu $a0, $sp, 0x002C ## $a0 = FFFFFFEC /* 032E8 809E8AB8 24070A24 */ addiu $a3, $zero, 0x0A24 ## $a3 = 00000A24 -/* 032EC 809E8ABC 0C031AD5 */ jal func_800C6B54 +/* 032EC 809E8ABC 0C031AD5 */ jal Graph_CloseDisps /* 032F0 809E8AC0 8D650000 */ lw $a1, 0x0000($t3) ## 00000000 -/* 032F4 809E8AC4 8FBF001C */ lw $ra, 0x001C($sp) -/* 032F8 809E8AC8 8FB00018 */ lw $s0, 0x0018($sp) +/* 032F4 809E8AC4 8FBF001C */ lw $ra, 0x001C($sp) +/* 032F8 809E8AC8 8FB00018 */ lw $s0, 0x0018($sp) /* 032FC 809E8ACC 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 -/* 03300 809E8AD0 03E00008 */ jr $ra +/* 03300 809E8AD0 03E00008 */ jr $ra /* 03304 809E8AD4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/func_809E8AD8.s b/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/func_809E8AD8.s index 74dd082fbe..dbfb8250f4 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/func_809E8AD8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dekubaba/func_809E8AD8.s @@ -10,7 +10,7 @@ glabel func_809E8AD8 /* 03328 809E8AF8 24C690F4 */ addiu $a2, $a2, %lo(D_809E90F4) ## $a2 = 809E90F4 /* 0332C 809E8AFC 27A40038 */ addiu $a0, $sp, 0x0038 ## $a0 = FFFFFFA8 /* 03330 809E8B00 24070A84 */ addiu $a3, $zero, 0x0A84 ## $a3 = 00000A84 -/* 03334 809E8B04 0C031AB1 */ jal func_800C6AC4 +/* 03334 809E8B04 0C031AB1 */ jal Graph_OpenDisps /* 03338 809E8B08 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 /* 0333C 809E8B0C 8FAF0094 */ lw $t7, 0x0094($sp) /* 03340 809E8B10 0C025011 */ jal func_80094044 @@ -69,7 +69,7 @@ glabel func_809E8AD8 /* 03414 809E8BE4 24C6911C */ addiu $a2, $a2, %lo(D_809E911C) ## $a2 = 809E911C /* 03418 809E8BE8 27A40038 */ addiu $a0, $sp, 0x0038 ## $a0 = FFFFFFA8 /* 0341C 809E8BEC 24070A9B */ addiu $a3, $zero, 0x0A9B ## $a3 = 00000A9B -/* 03420 809E8BF0 0C031AD5 */ jal func_800C6B54 +/* 03420 809E8BF0 0C031AD5 */ jal Graph_CloseDisps /* 03424 809E8BF4 8F050000 */ lw $a1, 0x0000($t8) ## 00000000 /* 03428 809E8BF8 8FBF0024 */ lw $ra, 0x0024($sp) /* 0342C 809E8BFC 8FB0001C */ lw $s0, 0x001C($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dekunuts/EnDekunuts_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Dekunuts/EnDekunuts_Draw.s index 6fb300ce47..4aa4f45b4a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dekunuts/EnDekunuts_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dekunuts/EnDekunuts_Draw.s @@ -10,7 +10,7 @@ glabel EnDekunuts_Draw /* 01584 809EAAE4 8FB80020 */ lw $t8, 0x0020($sp) /* 01588 809EAAE8 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 /* 0158C 809EAAEC 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 01590 809EAAF0 0C00D498 */ jal Draw_DListOpa +/* 01590 809EAAF0 0C00D498 */ jal Gfx_DrawDListOpa /* 01594 809EAAF4 24A52298 */ addiu $a1, $a1, 0x2298 ## $a1 = 06002298 /* 01598 809EAAF8 10000009 */ beq $zero, $zero, .L809EAB20 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dekunuts/func_809E96FC.s b/asm/non_matchings/overlays/actors/ovl_En_Dekunuts/func_809E96FC.s index c8507ee4c1..9c04eabeb1 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dekunuts/func_809E96FC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dekunuts/func_809E96FC.s @@ -1,16 +1,16 @@ glabel func_809E96FC /* 0019C 809E96FC 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 001A0 809E9700 AFB00018 */ sw $s0, 0x0018($sp) +/* 001A0 809E9700 AFB00018 */ sw $s0, 0x0018($sp) /* 001A4 809E9704 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 001A8 809E9708 AFBF001C */ sw $ra, 0x001C($sp) +/* 001A8 809E9708 AFBF001C */ sw $ra, 0x001C($sp) /* 001AC 809E970C 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 001B0 809E9710 24A50D1C */ addiu $a1, $a1, 0x0D1C ## $a1 = 06000D1C /* 001B4 809E9714 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 001B8 809E9718 0C0294A7 */ jal func_800A529C +/* 001B8 809E9718 0C0294A7 */ jal SkelAnime_ChangeAnimPlaybackStop /* 001BC 809E971C 24060000 */ addiu $a2, $zero, 0x0000 ## $a2 = 00000000 /* 001C0 809E9720 24040064 */ addiu $a0, $zero, 0x0064 ## $a0 = 00000064 /* 001C4 809E9724 0C01DF64 */ jal Math_Rand_S16Offset - + /* 001C8 809E9728 24050032 */ addiu $a1, $zero, 0x0032 ## $a1 = 00000032 /* 001CC 809E972C 240E0005 */ addiu $t6, $zero, 0x0005 ## $t6 = 00000005 /* 001D0 809E9730 A6020196 */ sh $v0, 0x0196($s0) ## 00000196 @@ -25,10 +25,10 @@ glabel func_809E96FC /* 001F0 809E9750 31F8FFFE */ andi $t8, $t7, 0xFFFE ## $t8 = 00000000 /* 001F4 809E9754 A21802D9 */ sb $t8, 0x02D9($s0) ## 000002D9 /* 001F8 809E9758 AE190190 */ sw $t9, 0x0190($s0) ## 00000190 -/* 001FC 809E975C 8FBF001C */ lw $ra, 0x001C($sp) -/* 00200 809E9760 8FB00018 */ lw $s0, 0x0018($sp) +/* 001FC 809E975C 8FBF001C */ lw $ra, 0x001C($sp) +/* 00200 809E9760 8FB00018 */ lw $s0, 0x0018($sp) /* 00204 809E9764 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 00208 809E9768 03E00008 */ jr $ra +/* 00208 809E9768 03E00008 */ jr $ra /* 0020C 809E976C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dekunuts/func_809E9770.s b/asm/non_matchings/overlays/actors/ovl_En_Dekunuts/func_809E9770.s index 87ef57375f..66cceb1e38 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dekunuts/func_809E9770.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dekunuts/func_809E9770.s @@ -1,21 +1,21 @@ glabel func_809E9770 /* 00210 809E9770 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00214 809E9774 AFBF0014 */ sw $ra, 0x0014($sp) +/* 00214 809E9774 AFBF0014 */ sw $ra, 0x0014($sp) /* 00218 809E9778 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 /* 0021C 809E977C 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 00220 809E9780 24A50AF0 */ addiu $a1, $a1, 0x0AF0 ## $a1 = 06000AF0 -/* 00224 809E9784 AFA60018 */ sw $a2, 0x0018($sp) -/* 00228 809E9788 0C0294BE */ jal func_800A52F8 +/* 00224 809E9784 AFA60018 */ sw $a2, 0x0018($sp) +/* 00228 809E9788 0C0294BE */ jal SkelAnime_ChangeAnimDefaultRepeat /* 0022C 809E978C 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 00230 809E9790 8FA60018 */ lw $a2, 0x0018($sp) +/* 00230 809E9790 8FA60018 */ lw $a2, 0x0018($sp) /* 00234 809E9794 3C0F809F */ lui $t7, %hi(func_809E9DFC) ## $t7 = 809F0000 /* 00238 809E9798 240E0002 */ addiu $t6, $zero, 0x0002 ## $t6 = 00000002 /* 0023C 809E979C 25EF9DFC */ addiu $t7, $t7, %lo(func_809E9DFC) ## $t7 = 809E9DFC /* 00240 809E97A0 A4CE0196 */ sh $t6, 0x0196($a2) ## 00000196 /* 00244 809E97A4 ACCF0190 */ sw $t7, 0x0190($a2) ## 00000190 -/* 00248 809E97A8 8FBF0014 */ lw $ra, 0x0014($sp) +/* 00248 809E97A8 8FBF0014 */ lw $ra, 0x0014($sp) /* 0024C 809E97AC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00250 809E97B0 03E00008 */ jr $ra +/* 00250 809E97B0 03E00008 */ jr $ra /* 00254 809E97B4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dekunuts/func_809E97B8.s b/asm/non_matchings/overlays/actors/ovl_En_Dekunuts/func_809E97B8.s index 615376f32b..552bfde68b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dekunuts/func_809E97B8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dekunuts/func_809E97B8.s @@ -1,21 +1,21 @@ glabel func_809E97B8 /* 00258 809E97B8 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 0025C 809E97BC AFBF0014 */ sw $ra, 0x0014($sp) +/* 0025C 809E97BC AFBF0014 */ sw $ra, 0x0014($sp) /* 00260 809E97C0 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 /* 00264 809E97C4 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 00268 809E97C8 24A501C4 */ addiu $a1, $a1, 0x01C4 ## $a1 = 060001C4 -/* 0026C 809E97CC AFA60018 */ sw $a2, 0x0018($sp) -/* 00270 809E97D0 0C02947A */ jal func_800A51E8 +/* 0026C 809E97CC AFA60018 */ sw $a2, 0x0018($sp) +/* 00270 809E97D0 0C02947A */ jal SkelAnime_ChangeAnimDefaultStop /* 00274 809E97D4 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 00278 809E97D8 8FA60018 */ lw $a2, 0x0018($sp) +/* 00278 809E97D8 8FA60018 */ lw $a2, 0x0018($sp) /* 0027C 809E97DC 3C0F809F */ lui $t7, %hi(func_809E9F6C) ## $t7 = 809F0000 /* 00280 809E97E0 25EF9F6C */ addiu $t7, $t7, %lo(func_809E9F6C) ## $t7 = 809E9F6C /* 00284 809E97E4 84CE019A */ lh $t6, 0x019A($a2) ## 0000019A /* 00288 809E97E8 ACCF0190 */ sw $t7, 0x0190($a2) ## 00000190 /* 0028C 809E97EC A4CE0196 */ sh $t6, 0x0196($a2) ## 00000196 -/* 00290 809E97F0 8FBF0014 */ lw $ra, 0x0014($sp) +/* 00290 809E97F0 8FBF0014 */ lw $ra, 0x0014($sp) /* 00294 809E97F4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00298 809E97F8 03E00008 */ jr $ra +/* 00298 809E97F8 03E00008 */ jr $ra /* 0029C 809E97FC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dekunuts/func_809E9800.s b/asm/non_matchings/overlays/actors/ovl_En_Dekunuts/func_809E9800.s index 2f5c78d7f4..0d104b23aa 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dekunuts/func_809E9800.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dekunuts/func_809E9800.s @@ -1,31 +1,31 @@ glabel func_809E9800 /* 002A0 809E9800 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 002A4 809E9804 AFBF0014 */ sw $ra, 0x0014($sp) +/* 002A4 809E9804 AFBF0014 */ sw $ra, 0x0014($sp) /* 002A8 809E9808 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 /* 002AC 809E980C 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 002B0 809E9810 24A50E6C */ addiu $a1, $a1, 0x0E6C ## $a1 = 06000E6C -/* 002B4 809E9814 AFA70018 */ sw $a3, 0x0018($sp) +/* 002B4 809E9814 AFA70018 */ sw $a3, 0x0018($sp) /* 002B8 809E9818 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 002BC 809E981C 0C0294D3 */ jal func_800A534C +/* 002BC 809E981C 0C0294D3 */ jal SkelAnime_ChangeAnimTransitionRepeat /* 002C0 809E9820 3C06C040 */ lui $a2, 0xC040 ## $a2 = C0400000 -/* 002C4 809E9824 8FA70018 */ lw $a3, 0x0018($sp) +/* 002C4 809E9824 8FA70018 */ lw $a3, 0x0018($sp) /* 002C8 809E9828 3C0E809F */ lui $t6, %hi(func_809E9F6C) ## $t6 = 809F0000 /* 002CC 809E982C 25CE9F6C */ addiu $t6, $t6, %lo(func_809E9F6C) ## $t6 = 809E9F6C /* 002D0 809E9830 8CEF0190 */ lw $t7, 0x0190($a3) ## 00000190 /* 002D4 809E9834 3C08809F */ lui $t0, %hi(func_809E9E80) ## $t0 = 809F0000 /* 002D8 809E9838 24190001 */ addiu $t9, $zero, 0x0001 ## $t9 = 00000001 -/* 002DC 809E983C 15CF0004 */ bne $t6, $t7, .L809E9850 +/* 002DC 809E983C 15CF0004 */ bne $t6, $t7, .L809E9850 /* 002E0 809E9840 25089E80 */ addiu $t0, $t0, %lo(func_809E9E80) ## $t0 = 809E9E80 /* 002E4 809E9844 24181002 */ addiu $t8, $zero, 0x1002 ## $t8 = 00001002 -/* 002E8 809E9848 10000002 */ beq $zero, $zero, .L809E9854 +/* 002E8 809E9848 10000002 */ beq $zero, $zero, .L809E9854 /* 002EC 809E984C A4F80196 */ sh $t8, 0x0196($a3) ## 00000196 .L809E9850: /* 002F0 809E9850 A4F90196 */ sh $t9, 0x0196($a3) ## 00000196 .L809E9854: /* 002F4 809E9854 ACE80190 */ sw $t0, 0x0190($a3) ## 00000190 -/* 002F8 809E9858 8FBF0014 */ lw $ra, 0x0014($sp) +/* 002F8 809E9858 8FBF0014 */ lw $ra, 0x0014($sp) /* 002FC 809E985C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00300 809E9860 03E00008 */ jr $ra +/* 00300 809E9860 03E00008 */ jr $ra /* 00304 809E9864 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dekunuts/func_809E9868.s b/asm/non_matchings/overlays/actors/ovl_En_Dekunuts/func_809E9868.s index a7d2a5c3b7..e2bcf42598 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dekunuts/func_809E9868.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dekunuts/func_809E9868.s @@ -1,23 +1,23 @@ glabel func_809E9868 /* 00308 809E9868 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 0030C 809E986C AFBF0014 */ sw $ra, 0x0014($sp) -/* 00310 809E9870 AFA40018 */ sw $a0, 0x0018($sp) +/* 0030C 809E986C AFBF0014 */ sw $ra, 0x0014($sp) +/* 00310 809E9870 AFA40018 */ sw $a0, 0x0018($sp) /* 00314 809E9874 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 00318 809E9878 24A504D8 */ addiu $a1, $a1, 0x04D8 ## $a1 = 060004D8 /* 0031C 809E987C 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 00320 809E9880 0C029490 */ jal func_800A5240 +/* 00320 809E9880 0C029490 */ jal SkelAnime_ChangeAnimTransitionStop /* 00324 809E9884 3C06C0A0 */ lui $a2, 0xC0A0 ## $a2 = C0A00000 -/* 00328 809E9888 8FA40018 */ lw $a0, 0x0018($sp) +/* 00328 809E9888 8FA40018 */ lw $a0, 0x0018($sp) /* 0032C 809E988C 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 00330 809E9890 2405387D */ addiu $a1, $zero, 0x387D ## $a1 = 0000387D -/* 00334 809E9894 8FAF0018 */ lw $t7, 0x0018($sp) +/* 00334 809E9894 8FAF0018 */ lw $t7, 0x0018($sp) /* 00338 809E9898 3C0E809F */ lui $t6, %hi(func_809EA0C4) ## $t6 = 809F0000 /* 0033C 809E989C 25CEA0C4 */ addiu $t6, $t6, %lo(func_809EA0C4) ## $t6 = 809EA0C4 /* 00340 809E98A0 ADEE0190 */ sw $t6, 0x0190($t7) ## 00000190 -/* 00344 809E98A4 8FBF0014 */ lw $ra, 0x0014($sp) +/* 00344 809E98A4 8FBF0014 */ lw $ra, 0x0014($sp) /* 00348 809E98A8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 0034C 809E98AC 03E00008 */ jr $ra +/* 0034C 809E98AC 03E00008 */ jr $ra /* 00350 809E98B0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dekunuts/func_809E98B4.s b/asm/non_matchings/overlays/actors/ovl_En_Dekunuts/func_809E98B4.s index 68f747535d..e3a319c44f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dekunuts/func_809E98B4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dekunuts/func_809E98B4.s @@ -1,31 +1,31 @@ glabel func_809E98B4 /* 00354 809E98B4 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00358 809E98B8 AFBF0014 */ sw $ra, 0x0014($sp) +/* 00358 809E98B8 AFBF0014 */ sw $ra, 0x0014($sp) /* 0035C 809E98BC 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 /* 00360 809E98C0 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 00364 809E98C4 24A508C4 */ addiu $a1, $a1, 0x08C4 ## $a1 = 060008C4 -/* 00368 809E98C8 AFA70018 */ sw $a3, 0x0018($sp) +/* 00368 809E98C8 AFA70018 */ sw $a3, 0x0018($sp) /* 0036C 809E98CC 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 00370 809E98D0 0C029490 */ jal func_800A5240 +/* 00370 809E98D0 0C029490 */ jal SkelAnime_ChangeAnimTransitionStop /* 00374 809E98D4 3C06C040 */ lui $a2, 0xC040 ## $a2 = C0400000 -/* 00378 809E98D8 8FA40018 */ lw $a0, 0x0018($sp) +/* 00378 809E98D8 8FA40018 */ lw $a0, 0x0018($sp) /* 0037C 809E98DC 240E0025 */ addiu $t6, $zero, 0x0025 ## $t6 = 00000025 /* 00380 809E98E0 240F0032 */ addiu $t7, $zero, 0x0032 ## $t7 = 00000032 /* 00384 809E98E4 24053880 */ addiu $a1, $zero, 0x3880 ## $a1 = 00003880 /* 00388 809E98E8 A48E030A */ sh $t6, 0x030A($a0) ## 0000030A /* 0038C 809E98EC 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 00390 809E98F0 A08F00AE */ sb $t7, 0x00AE($a0) ## 000000AE -/* 00394 809E98F4 8FA70018 */ lw $a3, 0x0018($sp) +/* 00394 809E98F4 8FA70018 */ lw $a3, 0x0018($sp) /* 00398 809E98F8 3C08809F */ lui $t0, %hi(func_809EA1D8) ## $t0 = 809F0000 /* 0039C 809E98FC 2508A1D8 */ addiu $t0, $t0, %lo(func_809EA1D8) ## $t0 = 809EA1D8 /* 003A0 809E9900 90F802D9 */ lbu $t8, 0x02D9($a3) ## 000002D9 /* 003A4 809E9904 ACE80190 */ sw $t0, 0x0190($a3) ## 00000190 /* 003A8 809E9908 3319FFFE */ andi $t9, $t8, 0xFFFE ## $t9 = 00000000 /* 003AC 809E990C A0F902D9 */ sb $t9, 0x02D9($a3) ## 000002D9 -/* 003B0 809E9910 8FBF0014 */ lw $ra, 0x0014($sp) +/* 003B0 809E9910 8FBF0014 */ lw $ra, 0x0014($sp) /* 003B4 809E9914 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 003B8 809E9918 03E00008 */ jr $ra +/* 003B8 809E9918 03E00008 */ jr $ra /* 003BC 809E991C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dekunuts/func_809E9920.s b/asm/non_matchings/overlays/actors/ovl_En_Dekunuts/func_809E9920.s index 3c02e3218c..22e1e20911 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dekunuts/func_809E9920.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dekunuts/func_809E9920.s @@ -1,13 +1,13 @@ glabel func_809E9920 /* 003C0 809E9920 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 003C4 809E9924 AFBF0014 */ sw $ra, 0x0014($sp) +/* 003C4 809E9924 AFBF0014 */ sw $ra, 0x0014($sp) /* 003C8 809E9928 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 /* 003CC 809E992C 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 003D0 809E9930 24A53650 */ addiu $a1, $a1, 0x3650 ## $a1 = 06003650 -/* 003D4 809E9934 AFA60018 */ sw $a2, 0x0018($sp) -/* 003D8 809E9938 0C0294BE */ jal func_800A52F8 +/* 003D4 809E9934 AFA60018 */ sw $a2, 0x0018($sp) +/* 003D8 809E9938 0C0294BE */ jal SkelAnime_ChangeAnimDefaultRepeat /* 003DC 809E993C 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 003E0 809E9940 8FA60018 */ lw $a2, 0x0018($sp) +/* 003E0 809E9940 8FA60018 */ lw $a2, 0x0018($sp) /* 003E4 809E9944 3C19809F */ lui $t9, %hi(func_809EA240) ## $t9 = 809F0000 /* 003E8 809E9948 240E0002 */ addiu $t6, $zero, 0x0002 ## $t6 = 00000002 /* 003EC 809E994C 90CF02D9 */ lbu $t7, 0x02D9($a2) ## 000002D9 @@ -17,9 +17,9 @@ glabel func_809E9920 /* 003FC 809E995C A0C00194 */ sb $zero, 0x0194($a2) ## 00000194 /* 00400 809E9960 A0D802D9 */ sb $t8, 0x02D9($a2) ## 000002D9 /* 00404 809E9964 ACD90190 */ sw $t9, 0x0190($a2) ## 00000190 -/* 00408 809E9968 8FBF0014 */ lw $ra, 0x0014($sp) +/* 00408 809E9968 8FBF0014 */ lw $ra, 0x0014($sp) /* 0040C 809E996C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00410 809E9970 03E00008 */ jr $ra +/* 00410 809E9970 03E00008 */ jr $ra /* 00414 809E9974 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dekunuts/func_809E9978.s b/asm/non_matchings/overlays/actors/ovl_En_Dekunuts/func_809E9978.s index 436f3659f8..0065a80c91 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dekunuts/func_809E9978.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dekunuts/func_809E9978.s @@ -1,28 +1,28 @@ glabel func_809E9978 /* 00418 809E9978 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 0041C 809E997C AFBF0014 */ sw $ra, 0x0014($sp) +/* 0041C 809E997C AFBF0014 */ sw $ra, 0x0014($sp) /* 00420 809E9980 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 /* 00424 809E9984 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 00428 809E9988 24A51024 */ addiu $a1, $a1, 0x1024 ## $a1 = 06001024 -/* 0042C 809E998C AFA60018 */ sw $a2, 0x0018($sp) -/* 00430 809E9990 0C0294BE */ jal func_800A52F8 +/* 0042C 809E998C AFA60018 */ sw $a2, 0x0018($sp) +/* 00430 809E9990 0C0294BE */ jal SkelAnime_ChangeAnimDefaultRepeat /* 00434 809E9994 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 00438 809E9998 8FA60018 */ lw $a2, 0x0018($sp) +/* 00438 809E9998 8FA60018 */ lw $a2, 0x0018($sp) /* 0043C 809E999C 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 /* 00440 809E99A0 240E0003 */ addiu $t6, $zero, 0x0003 ## $t6 = 00000003 /* 00444 809E99A4 90C20195 */ lbu $v0, 0x0195($a2) ## 00000195 /* 00448 809E99A8 3C18809F */ lui $t8, %hi(func_809EA480) ## $t8 = 809F0000 /* 0044C 809E99AC A4CE0196 */ sh $t6, 0x0196($a2) ## 00000196 -/* 00450 809E99B0 10400003 */ beq $v0, $zero, .L809E99C0 +/* 00450 809E99B0 10400003 */ beq $v0, $zero, .L809E99C0 /* 00454 809E99B4 E4C40068 */ swc1 $f4, 0x0068($a2) ## 00000068 /* 00458 809E99B8 244FFFFF */ addiu $t7, $v0, 0xFFFF ## $t7 = FFFFFFFF /* 0045C 809E99BC A0CF0195 */ sb $t7, 0x0195($a2) ## 00000195 .L809E99C0: /* 00460 809E99C0 2718A480 */ addiu $t8, $t8, %lo(func_809EA480) ## $t8 = 809EA480 /* 00464 809E99C4 ACD80190 */ sw $t8, 0x0190($a2) ## 00000190 -/* 00468 809E99C8 8FBF0014 */ lw $ra, 0x0014($sp) +/* 00468 809E99C8 8FBF0014 */ lw $ra, 0x0014($sp) /* 0046C 809E99CC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00470 809E99D0 03E00008 */ jr $ra +/* 00470 809E99D0 03E00008 */ jr $ra /* 00474 809E99D4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dekunuts/func_809E99D8.s b/asm/non_matchings/overlays/actors/ovl_En_Dekunuts/func_809E99D8.s index d47312471b..04d44cb857 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dekunuts/func_809E99D8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dekunuts/func_809E99D8.s @@ -1,30 +1,30 @@ glabel func_809E99D8 /* 00478 809E99D8 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 0047C 809E99DC AFB00020 */ sw $s0, 0x0020($sp) +/* 0047C 809E99DC AFB00020 */ sw $s0, 0x0020($sp) /* 00480 809E99E0 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00484 809E99E4 AFBF0024 */ sw $ra, 0x0024($sp) +/* 00484 809E99E4 AFBF0024 */ sw $ra, 0x0024($sp) /* 00488 809E99E8 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 0048C 809E99EC 24A50368 */ addiu $a1, $a1, 0x0368 ## $a1 = 06000368 /* 00490 809E99F0 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 00494 809E99F4 0C029490 */ jal func_800A5240 +/* 00494 809E99F4 0C029490 */ jal SkelAnime_ChangeAnimTransitionStop /* 00498 809E99F8 3C06C040 */ lui $a2, 0xC040 ## $a2 = C0400000 /* 0049C 809E99FC 8E0E0304 */ lw $t6, 0x0304($s0) ## 00000304 /* 004A0 809E9A00 3C010001 */ lui $at, 0x0001 ## $at = 00010000 /* 004A4 809E9A04 3421F824 */ ori $at, $at, 0xF824 ## $at = 0001F824 /* 004A8 809E9A08 8DCF0000 */ lw $t7, 0x0000($t6) ## 00000000 /* 004AC 809E9A0C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 004B0 809E9A10 01E1C024 */ and $t8, $t7, $at -/* 004B4 809E9A14 13000005 */ beq $t8, $zero, .L809E9A2C +/* 004B0 809E9A10 01E1C024 */ and $t8, $t7, $at +/* 004B4 809E9A14 13000005 */ beq $t8, $zero, .L809E9A2C /* 004B8 809E9A18 00000000 */ nop /* 004BC 809E9A1C 8E1902D0 */ lw $t9, 0x02D0($s0) ## 000002D0 /* 004C0 809E9A20 87280032 */ lh $t0, 0x0032($t9) ## 00000032 -/* 004C4 809E9A24 10000006 */ beq $zero, $zero, .L809E9A40 +/* 004C4 809E9A24 10000006 */ beq $zero, $zero, .L809E9A40 /* 004C8 809E9A28 A6080032 */ sh $t0, 0x0032($s0) ## 00000032 .L809E9A2C: -/* 004CC 809E9A2C 0C00B69E */ jal func_8002DA78 +/* 004CC 809E9A2C 0C00B69E */ jal func_8002DA78 /* 004D0 809E9A30 8E0502D0 */ lw $a1, 0x02D0($s0) ## 000002D0 /* 004D4 809E9A34 34018000 */ ori $at, $zero, 0x8000 ## $at = 00008000 -/* 004D8 809E9A38 00414821 */ addu $t1, $v0, $at +/* 004D8 809E9A38 00414821 */ addu $t1, $v0, $at /* 004DC 809E9A3C A6090032 */ sh $t1, 0x0032($s0) ## 00000032 .L809E9A40: /* 004E0 809E9A40 920A02D9 */ lbu $t2, 0x02D9($s0) ## 000002D9 @@ -38,26 +38,26 @@ glabel func_809E99D8 /* 00500 809E9A60 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 00504 809E9A64 24053880 */ addiu $a1, $zero, 0x3880 ## $a1 = 00003880 /* 00508 809E9A68 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 0050C 809E9A6C E6040068 */ swc1 $f4, 0x0068($s0) ## 00000068 /* 00510 809E9A70 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 00514 809E9A74 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 00518 809E9A78 2405393B */ addiu $a1, $zero, 0x393B ## $a1 = 0000393B /* 0051C 809E9A7C 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 /* 00520 809E9A80 0C028800 */ jal SkelAnime_GetFrameCount - + /* 00524 809E9A84 24840368 */ addiu $a0, $a0, 0x0368 ## $a0 = 06000368 /* 00528 809E9A88 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 0052C 809E9A8C 24054000 */ addiu $a1, $zero, 0x4000 ## $a1 = 00004000 /* 00530 809E9A90 240600FF */ addiu $a2, $zero, 0x00FF ## $a2 = 000000FF /* 00534 809E9A94 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 00538 809E9A98 0C00D09B */ jal func_8003426C -/* 0053C 809E9A9C AFA20010 */ sw $v0, 0x0010($sp) -/* 00540 809E9AA0 8FBF0024 */ lw $ra, 0x0024($sp) -/* 00544 809E9AA4 8FB00020 */ lw $s0, 0x0020($sp) +/* 00538 809E9A98 0C00D09B */ jal func_8003426C +/* 0053C 809E9A9C AFA20010 */ sw $v0, 0x0010($sp) +/* 00540 809E9AA0 8FBF0024 */ lw $ra, 0x0024($sp) +/* 00544 809E9AA4 8FB00020 */ lw $s0, 0x0020($sp) /* 00548 809E9AA8 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 0054C 809E9AAC 03E00008 */ jr $ra +/* 0054C 809E9AAC 03E00008 */ jr $ra /* 00550 809E9AB0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dekunuts/func_809E9AB4.s b/asm/non_matchings/overlays/actors/ovl_En_Dekunuts/func_809E9AB4.s index f38b040a22..dc020aafcd 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dekunuts/func_809E9AB4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dekunuts/func_809E9AB4.s @@ -1,12 +1,12 @@ glabel func_809E9AB4 /* 00554 809E9AB4 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 00558 809E9AB8 AFB00020 */ sw $s0, 0x0020($sp) +/* 00558 809E9AB8 AFB00020 */ sw $s0, 0x0020($sp) /* 0055C 809E9ABC 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00560 809E9AC0 AFBF0024 */ sw $ra, 0x0024($sp) +/* 00560 809E9AC0 AFBF0024 */ sw $ra, 0x0024($sp) /* 00564 809E9AC4 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 00568 809E9AC8 24A50368 */ addiu $a1, $a1, 0x0368 ## $a1 = 06000368 /* 0056C 809E9ACC 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 00570 809E9AD0 0C0294D3 */ jal func_800A534C +/* 00570 809E9AD0 0C0294D3 */ jal SkelAnime_ChangeAnimTransitionRepeat /* 00574 809E9AD4 3C06C040 */ lui $a2, 0xC040 ## $a2 = C0400000 /* 00578 809E9AD8 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 /* 0057C 809E9ADC 3C0F809F */ lui $t7, %hi(func_809EA534) ## $t7 = 809F0000 @@ -17,26 +17,26 @@ glabel func_809E9AB4 /* 00590 809E9AF0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 00594 809E9AF4 2405389E */ addiu $a1, $zero, 0x389E ## $a1 = 0000389E /* 00598 809E9AF8 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 0059C 809E9AFC E6040068 */ swc1 $f4, 0x0068($s0) ## 00000068 /* 005A0 809E9B00 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 /* 005A4 809E9B04 0C028800 */ jal SkelAnime_GetFrameCount - + /* 005A8 809E9B08 24840368 */ addiu $a0, $a0, 0x0368 ## $a0 = 06000368 /* 005AC 809E9B0C 86180196 */ lh $t8, 0x0196($s0) ## 00000196 /* 005B0 809E9B10 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 005B4 809E9B14 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 005B8 809E9B18 00580019 */ multu $v0, $t8 +/* 005B8 809E9B18 00580019 */ multu $v0, $t8 /* 005BC 809E9B1C 240600FF */ addiu $a2, $zero, 0x00FF ## $a2 = 000000FF /* 005C0 809E9B20 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 005C4 809E9B24 0000C812 */ mflo $t9 -/* 005C8 809E9B28 AFB90010 */ sw $t9, 0x0010($sp) -/* 005CC 809E9B2C 0C00D09B */ jal func_8003426C +/* 005C4 809E9B24 0000C812 */ mflo $t9 +/* 005C8 809E9B28 AFB90010 */ sw $t9, 0x0010($sp) +/* 005CC 809E9B2C 0C00D09B */ jal func_8003426C /* 005D0 809E9B30 00000000 */ nop -/* 005D4 809E9B34 8FBF0024 */ lw $ra, 0x0024($sp) -/* 005D8 809E9B38 8FB00020 */ lw $s0, 0x0020($sp) +/* 005D4 809E9B34 8FBF0024 */ lw $ra, 0x0024($sp) +/* 005D8 809E9B38 8FB00020 */ lw $s0, 0x0020($sp) /* 005DC 809E9B3C 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 005E0 809E9B40 03E00008 */ jr $ra +/* 005E0 809E9B40 03E00008 */ jr $ra /* 005E4 809E9B44 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dekunuts/func_809E9B48.s b/asm/non_matchings/overlays/actors/ovl_En_Dekunuts/func_809E9B48.s index 9c8c4d3304..a6a82a8435 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dekunuts/func_809E9B48.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dekunuts/func_809E9B48.s @@ -1,24 +1,24 @@ glabel func_809E9B48 /* 005E8 809E9B48 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 005EC 809E9B4C AFBF0014 */ sw $ra, 0x0014($sp) +/* 005EC 809E9B4C AFBF0014 */ sw $ra, 0x0014($sp) /* 005F0 809E9B50 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 /* 005F4 809E9B54 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 005F8 809E9B58 24A506B0 */ addiu $a1, $a1, 0x06B0 ## $a1 = 060006B0 -/* 005FC 809E9B5C AFA60018 */ sw $a2, 0x0018($sp) -/* 00600 809E9B60 0C02947A */ jal func_800A51E8 +/* 005FC 809E9B5C AFA60018 */ sw $a2, 0x0018($sp) +/* 00600 809E9B60 0C02947A */ jal SkelAnime_ChangeAnimDefaultStop /* 00604 809E9B64 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 00608 809E9B68 8FA40018 */ lw $a0, 0x0018($sp) +/* 00608 809E9B68 8FA40018 */ lw $a0, 0x0018($sp) /* 0060C 809E9B6C 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 /* 00610 809E9B70 3C0E809F */ lui $t6, %hi(func_809EA5B0) ## $t6 = 809F0000 /* 00614 809E9B74 25CEA5B0 */ addiu $t6, $t6, %lo(func_809EA5B0) ## $t6 = 809EA5B0 /* 00618 809E9B78 24053881 */ addiu $a1, $zero, 0x3881 ## $a1 = 00003881 /* 0061C 809E9B7C AC8E0190 */ sw $t6, 0x0190($a0) ## 00000190 /* 00620 809E9B80 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 00624 809E9B84 E4840068 */ swc1 $f4, 0x0068($a0) ## 00000068 -/* 00628 809E9B88 8FBF0014 */ lw $ra, 0x0014($sp) +/* 00628 809E9B88 8FBF0014 */ lw $ra, 0x0014($sp) /* 0062C 809E9B8C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00630 809E9B90 03E00008 */ jr $ra +/* 00630 809E9B90 03E00008 */ jr $ra /* 00634 809E9B94 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dekunuts/func_809E9F6C.s b/asm/non_matchings/overlays/actors/ovl_En_Dekunuts/func_809E9F6C.s index cae848fd3a..2125a145d6 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dekunuts/func_809E9F6C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dekunuts/func_809E9F6C.s @@ -1,29 +1,29 @@ glabel func_809E9F6C /* 00A0C 809E9F6C 27BDFFB8 */ addiu $sp, $sp, 0xFFB8 ## $sp = FFFFFFB8 -/* 00A10 809E9F70 AFB00030 */ sw $s0, 0x0030($sp) +/* 00A10 809E9F70 AFB00030 */ sw $s0, 0x0030($sp) /* 00A14 809E9F74 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00A18 809E9F78 AFBF0034 */ sw $ra, 0x0034($sp) -/* 00A1C 809E9F7C AFA5004C */ sw $a1, 0x004C($sp) +/* 00A18 809E9F78 AFBF0034 */ sw $ra, 0x0034($sp) +/* 00A1C 809E9F7C AFA5004C */ sw $a1, 0x004C($sp) /* 00A20 809E9F80 8605008A */ lh $a1, 0x008A($s0) ## 0000008A /* 00A24 809E9F84 248400B6 */ addiu $a0, $a0, 0x00B6 ## $a0 = 000000B6 /* 00A28 809E9F88 24060002 */ addiu $a2, $zero, 0x0002 ## $a2 = 00000002 /* 00A2C 809E9F8C 0C01E1EF */ jal Math_SmoothScaleMaxS - + /* 00A30 809E9F90 24070E38 */ addiu $a3, $zero, 0x0E38 ## $a3 = 00000E38 /* 00A34 809E9F94 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C /* 00A38 809E9F98 0C02927F */ jal SkelAnime_FrameUpdateMatrix - -/* 00A3C 809E9F9C AFA40038 */ sw $a0, 0x0038($sp) -/* 00A40 809E9FA0 10400005 */ beq $v0, $zero, .L809E9FB8 -/* 00A44 809E9FA4 8FA40038 */ lw $a0, 0x0038($sp) -/* 00A48 809E9FA8 0C27A600 */ jal func_809E9800 + +/* 00A3C 809E9F9C AFA40038 */ sw $a0, 0x0038($sp) +/* 00A40 809E9FA0 10400005 */ beq $v0, $zero, .L809E9FB8 +/* 00A44 809E9FA4 8FA40038 */ lw $a0, 0x0038($sp) +/* 00A48 809E9FA8 0C27A600 */ jal func_809E9800 /* 00A4C 809E9FAC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00A50 809E9FB0 10000040 */ beq $zero, $zero, .L809EA0B4 -/* 00A54 809E9FB4 8FBF0034 */ lw $ra, 0x0034($sp) +/* 00A50 809E9FB0 10000040 */ beq $zero, $zero, .L809EA0B4 +/* 00A54 809E9FB4 8FBF0034 */ lw $ra, 0x0034($sp) .L809E9FB8: -/* 00A58 809E9FB8 0C0295B2 */ jal func_800A56C8 +/* 00A58 809E9FB8 0C0295B2 */ jal func_800A56C8 /* 00A5C 809E9FBC 3C0540C0 */ lui $a1, 0x40C0 ## $a1 = 40C00000 -/* 00A60 809E9FC0 5040002B */ beql $v0, $zero, .L809EA070 +/* 00A60 809E9FC0 5040002B */ beql $v0, $zero, .L809EA070 /* 00A64 809E9FC4 86190196 */ lh $t9, 0x0196($s0) ## 00000196 /* 00A68 809E9FC8 0C01DE1C */ jal Math_Sins ## sins? @@ -32,68 +32,68 @@ glabel func_809E9F6C /* 00A74 809E9FD4 44812000 */ mtc1 $at, $f4 ## $f4 = 23.00 /* 00A78 809E9FD8 C6080024 */ lwc1 $f8, 0x0024($s0) ## 00000024 /* 00A7C 809E9FDC 3C014140 */ lui $at, 0x4140 ## $at = 41400000 -/* 00A80 809E9FE0 46040182 */ mul.s $f6, $f0, $f4 +/* 00A80 809E9FE0 46040182 */ mul.s $f6, $f0, $f4 /* 00A84 809E9FE4 44819000 */ mtc1 $at, $f18 ## $f18 = 12.00 -/* 00A88 809E9FE8 46083280 */ add.s $f10, $f6, $f8 -/* 00A8C 809E9FEC E7AA003C */ swc1 $f10, 0x003C($sp) +/* 00A88 809E9FE8 46083280 */ add.s $f10, $f6, $f8 +/* 00A8C 809E9FEC E7AA003C */ swc1 $f10, 0x003C($sp) /* 00A90 809E9FF0 C6100028 */ lwc1 $f16, 0x0028($s0) ## 00000028 -/* 00A94 809E9FF4 46128100 */ add.s $f4, $f16, $f18 -/* 00A98 809E9FF8 E7A40040 */ swc1 $f4, 0x0040($sp) +/* 00A94 809E9FF4 46128100 */ add.s $f4, $f16, $f18 +/* 00A98 809E9FF8 E7A40040 */ swc1 $f4, 0x0040($sp) /* 00A9C 809E9FFC 0C01DE0D */ jal Math_Coss ## coss? /* 00AA0 809EA000 860400B6 */ lh $a0, 0x00B6($s0) ## 000000B6 /* 00AA4 809EA004 3C0141B8 */ lui $at, 0x41B8 ## $at = 41B80000 /* 00AA8 809EA008 44813000 */ mtc1 $at, $f6 ## $f6 = 23.00 /* 00AAC 809EA00C C60A002C */ lwc1 $f10, 0x002C($s0) ## 0000002C -/* 00AB0 809EA010 C7B00040 */ lwc1 $f16, 0x0040($sp) -/* 00AB4 809EA014 46060202 */ mul.s $f8, $f0, $f6 -/* 00AB8 809EA018 8FA5004C */ lw $a1, 0x004C($sp) -/* 00ABC 809EA01C E7B00010 */ swc1 $f16, 0x0010($sp) +/* 00AB0 809EA010 C7B00040 */ lwc1 $f16, 0x0040($sp) +/* 00AB4 809EA014 46060202 */ mul.s $f8, $f0, $f6 +/* 00AB8 809EA018 8FA5004C */ lw $a1, 0x004C($sp) +/* 00ABC 809EA01C E7B00010 */ swc1 $f16, 0x0010($sp) /* 00AC0 809EA020 24060193 */ addiu $a2, $zero, 0x0193 ## $a2 = 00000193 -/* 00AC4 809EA024 8FA7003C */ lw $a3, 0x003C($sp) +/* 00AC4 809EA024 8FA7003C */ lw $a3, 0x003C($sp) /* 00AC8 809EA028 24A41C24 */ addiu $a0, $a1, 0x1C24 ## $a0 = 00001C24 -/* 00ACC 809EA02C 460A4080 */ add.s $f2, $f8, $f10 -/* 00AD0 809EA030 E7A20014 */ swc1 $f2, 0x0014($sp) +/* 00ACC 809EA02C 460A4080 */ add.s $f2, $f8, $f10 +/* 00AD0 809EA030 E7A20014 */ swc1 $f2, 0x0014($sp) /* 00AD4 809EA034 860E00B4 */ lh $t6, 0x00B4($s0) ## 000000B4 -/* 00AD8 809EA038 AFAE0018 */ sw $t6, 0x0018($sp) +/* 00AD8 809EA038 AFAE0018 */ sw $t6, 0x0018($sp) /* 00ADC 809EA03C 860F00B6 */ lh $t7, 0x00B6($s0) ## 000000B6 -/* 00AE0 809EA040 AFAF001C */ sw $t7, 0x001C($sp) +/* 00AE0 809EA040 AFAF001C */ sw $t7, 0x001C($sp) /* 00AE4 809EA044 861800B8 */ lh $t8, 0x00B8($s0) ## 000000B8 -/* 00AE8 809EA048 AFA00024 */ sw $zero, 0x0024($sp) +/* 00AE8 809EA048 AFA00024 */ sw $zero, 0x0024($sp) /* 00AEC 809EA04C 0C00C7D4 */ jal Actor_Spawn ## ActorSpawn -/* 00AF0 809EA050 AFB80020 */ sw $t8, 0x0020($sp) -/* 00AF4 809EA054 10400016 */ beq $v0, $zero, .L809EA0B0 +/* 00AF0 809EA050 AFB80020 */ sw $t8, 0x0020($sp) +/* 00AF4 809EA054 10400016 */ beq $v0, $zero, .L809EA0B0 /* 00AF8 809EA058 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 00AFC 809EA05C 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 00B00 809EA060 2405387E */ addiu $a1, $zero, 0x387E ## $a1 = 0000387E -/* 00B04 809EA064 10000013 */ beq $zero, $zero, .L809EA0B4 -/* 00B08 809EA068 8FBF0034 */ lw $ra, 0x0034($sp) +/* 00B04 809EA064 10000013 */ beq $zero, $zero, .L809EA0B4 +/* 00B08 809EA068 8FBF0034 */ lw $ra, 0x0034($sp) /* 00B0C 809EA06C 86190196 */ lh $t9, 0x0196($s0) ## 00000196 .L809EA070: -/* 00B10 809EA070 8FA40038 */ lw $a0, 0x0038($sp) -/* 00B14 809EA074 2B210002 */ slti $at, $t9, 0x0002 -/* 00B18 809EA078 5420000E */ bnel $at, $zero, .L809EA0B4 -/* 00B1C 809EA07C 8FBF0034 */ lw $ra, 0x0034($sp) -/* 00B20 809EA080 0C0295B2 */ jal func_800A56C8 +/* 00B10 809EA070 8FA40038 */ lw $a0, 0x0038($sp) +/* 00B14 809EA074 2B210002 */ slti $at, $t9, 0x0002 +/* 00B18 809EA078 5420000E */ bnel $at, $zero, .L809EA0B4 +/* 00B1C 809EA07C 8FBF0034 */ lw $ra, 0x0034($sp) +/* 00B20 809EA080 0C0295B2 */ jal func_800A56C8 /* 00B24 809EA084 3C054140 */ lui $a1, 0x4140 ## $a1 = 41400000 -/* 00B28 809EA088 10400009 */ beq $v0, $zero, .L809EA0B0 -/* 00B2C 809EA08C 8FA40038 */ lw $a0, 0x0038($sp) +/* 00B28 809EA088 10400009 */ beq $v0, $zero, .L809EA0B0 +/* 00B2C 809EA08C 8FA40038 */ lw $a0, 0x0038($sp) /* 00B30 809EA090 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 00B34 809EA094 24A501C4 */ addiu $a1, $a1, 0x01C4 ## $a1 = 060001C4 -/* 00B38 809EA098 0C029490 */ jal func_800A5240 +/* 00B38 809EA098 0C029490 */ jal SkelAnime_ChangeAnimTransitionStop /* 00B3C 809EA09C 3C06C040 */ lui $a2, 0xC040 ## $a2 = C0400000 /* 00B40 809EA0A0 86020196 */ lh $v0, 0x0196($s0) ## 00000196 -/* 00B44 809EA0A4 10400002 */ beq $v0, $zero, .L809EA0B0 +/* 00B44 809EA0A4 10400002 */ beq $v0, $zero, .L809EA0B0 /* 00B48 809EA0A8 2448FFFF */ addiu $t0, $v0, 0xFFFF ## $t0 = FFFFFFFF /* 00B4C 809EA0AC A6080196 */ sh $t0, 0x0196($s0) ## 00000196 .L809EA0B0: -/* 00B50 809EA0B0 8FBF0034 */ lw $ra, 0x0034($sp) +/* 00B50 809EA0B0 8FBF0034 */ lw $ra, 0x0034($sp) .L809EA0B4: -/* 00B54 809EA0B4 8FB00030 */ lw $s0, 0x0030($sp) +/* 00B54 809EA0B4 8FB00030 */ lw $s0, 0x0030($sp) /* 00B58 809EA0B8 27BD0048 */ addiu $sp, $sp, 0x0048 ## $sp = 00000000 -/* 00B5C 809EA0BC 03E00008 */ jr $ra +/* 00B5C 809EA0BC 03E00008 */ jr $ra /* 00B60 809EA0C0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dh/EnDh_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Dh/EnDh_Draw.s index b24cedb788..0a08ebc2f0 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dh/EnDh_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dh/EnDh_Draw.s @@ -1,23 +1,23 @@ glabel EnDh_Draw /* 014F0 809EC230 27BDFF70 */ addiu $sp, $sp, 0xFF70 ## $sp = FFFFFF70 -/* 014F4 809EC234 AFB20040 */ sw $s2, 0x0040($sp) +/* 014F4 809EC234 AFB20040 */ sw $s2, 0x0040($sp) /* 014F8 809EC238 00A09025 */ or $s2, $a1, $zero ## $s2 = 00000000 -/* 014FC 809EC23C AFBF0044 */ sw $ra, 0x0044($sp) -/* 01500 809EC240 AFB1003C */ sw $s1, 0x003C($sp) -/* 01504 809EC244 AFB00038 */ sw $s0, 0x0038($sp) +/* 014FC 809EC23C AFBF0044 */ sw $ra, 0x0044($sp) +/* 01500 809EC240 AFB1003C */ sw $s1, 0x003C($sp) +/* 01504 809EC244 AFB00038 */ sw $s0, 0x0038($sp) /* 01508 809EC248 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 /* 0150C 809EC24C 00808825 */ or $s1, $a0, $zero ## $s1 = 00000000 /* 01510 809EC250 3C06809F */ lui $a2, %hi(D_809EC680) ## $a2 = 809F0000 /* 01514 809EC254 24C6C680 */ addiu $a2, $a2, %lo(D_809EC680) ## $a2 = 809EC680 /* 01518 809EC258 27A40074 */ addiu $a0, $sp, 0x0074 ## $a0 = FFFFFFE4 /* 0151C 809EC25C 2407044B */ addiu $a3, $zero, 0x044B ## $a3 = 0000044B -/* 01520 809EC260 0C031AB1 */ jal func_800C6AC4 +/* 01520 809EC260 0C031AB1 */ jal Graph_OpenDisps /* 01524 809EC264 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 /* 01528 809EC268 922E025A */ lbu $t6, 0x025A($s1) ## 0000025A /* 0152C 809EC26C 240100FF */ addiu $at, $zero, 0x00FF ## $at = 000000FF -/* 01530 809EC270 15C10021 */ bne $t6, $at, .L809EC2F8 +/* 01530 809EC270 15C10021 */ bne $t6, $at, .L809EC2F8 /* 01534 809EC274 00000000 */ nop -/* 01538 809EC278 0C024F46 */ jal func_80093D18 +/* 01538 809EC278 0C024F46 */ jal func_80093D18 /* 0153C 809EC27C 8E440000 */ lw $a0, 0x0000($s2) ## 00000000 /* 01540 809EC280 8E0302C0 */ lw $v1, 0x02C0($s0) ## 000002C0 /* 01544 809EC284 3C18FB00 */ lui $t8, 0xFB00 ## $t8 = FB000000 @@ -40,17 +40,17 @@ glabel EnDh_Draw /* 01588 809EC2C8 8E26016C */ lw $a2, 0x016C($s1) ## 0000016C /* 0158C 809EC2CC 8E250150 */ lw $a1, 0x0150($s1) ## 00000150 /* 01590 809EC2D0 25ADC1A0 */ addiu $t5, $t5, %lo(func_809EC1A0) ## $t5 = 809EC1A0 -/* 01594 809EC2D4 AFAD0014 */ sw $t5, 0x0014($sp) -/* 01598 809EC2D8 AFB10018 */ sw $s1, 0x0018($sp) -/* 0159C 809EC2DC AFA00010 */ sw $zero, 0x0010($sp) +/* 01594 809EC2D4 AFAD0014 */ sw $t5, 0x0014($sp) +/* 01598 809EC2D8 AFB10018 */ sw $s1, 0x0018($sp) +/* 0159C 809EC2DC AFA00010 */ sw $zero, 0x0010($sp) /* 015A0 809EC2E0 8E0E02C0 */ lw $t6, 0x02C0($s0) ## 000002C0 /* 015A4 809EC2E4 02402025 */ or $a0, $s2, $zero ## $a0 = 00000000 -/* 015A8 809EC2E8 0C0289CF */ jal func_800A273C -/* 015AC 809EC2EC AFAE001C */ sw $t6, 0x001C($sp) -/* 015B0 809EC2F0 1000001E */ beq $zero, $zero, .L809EC36C +/* 015A8 809EC2E8 0C0289CF */ jal SkelAnime_DrawSV2 +/* 015AC 809EC2EC AFAE001C */ sw $t6, 0x001C($sp) +/* 015B0 809EC2F0 1000001E */ beq $zero, $zero, .L809EC36C /* 015B4 809EC2F4 AE0202C0 */ sw $v0, 0x02C0($s0) ## 000002C0 .L809EC2F8: -/* 015B8 809EC2F8 0C024F61 */ jal func_80093D84 +/* 015B8 809EC2F8 0C024F61 */ jal func_80093D84 /* 015BC 809EC2FC 8E440000 */ lw $a0, 0x0000($s2) ## 00000000 /* 015C0 809EC300 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 /* 015C4 809EC304 3C18FB00 */ lui $t8, 0xFB00 ## $t8 = FB000000 @@ -72,18 +72,18 @@ glabel EnDh_Draw /* 01604 809EC344 9227014E */ lbu $a3, 0x014E($s1) ## 0000014E /* 01608 809EC348 8E26016C */ lw $a2, 0x016C($s1) ## 0000016C /* 0160C 809EC34C 8E250150 */ lw $a1, 0x0150($s1) ## 00000150 -/* 01610 809EC350 AFB10018 */ sw $s1, 0x0018($sp) -/* 01614 809EC354 AFA00014 */ sw $zero, 0x0014($sp) -/* 01618 809EC358 AFA00010 */ sw $zero, 0x0010($sp) +/* 01610 809EC350 AFB10018 */ sw $s1, 0x0018($sp) +/* 01614 809EC354 AFA00014 */ sw $zero, 0x0014($sp) +/* 01618 809EC358 AFA00010 */ sw $zero, 0x0010($sp) /* 0161C 809EC35C 8E0D02D0 */ lw $t5, 0x02D0($s0) ## 000002D0 -/* 01620 809EC360 0C0289CF */ jal func_800A273C -/* 01624 809EC364 AFAD001C */ sw $t5, 0x001C($sp) +/* 01620 809EC360 0C0289CF */ jal SkelAnime_DrawSV2 +/* 01624 809EC364 AFAD001C */ sw $t5, 0x001C($sp) /* 01628 809EC368 AE0202D0 */ sw $v0, 0x02D0($s0) ## 000002D0 .L809EC36C: /* 0162C 809EC36C 922E0252 */ lbu $t6, 0x0252($s1) ## 00000252 -/* 01630 809EC370 11C0007F */ beq $t6, $zero, .L809EC570 +/* 01630 809EC370 11C0007F */ beq $t6, $zero, .L809EC570 /* 01634 809EC374 00000000 */ nop -/* 01638 809EC378 0C024F61 */ jal func_80093D84 +/* 01638 809EC378 0C024F61 */ jal func_80093D84 /* 0163C 809EC37C 8E440000 */ lw $a0, 0x0000($s2) ## 00000000 /* 01640 809EC380 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 /* 01644 809EC384 3C195537 */ lui $t9, 0x5537 ## $t9 = 55370000 @@ -102,34 +102,34 @@ glabel EnDh_Draw /* 01678 809EC3B8 8E43009C */ lw $v1, 0x009C($s2) ## 0000009C /* 0167C 809EC3BC 8E440000 */ lw $a0, 0x0000($s2) ## 00000000 /* 01680 809EC3C0 240A0040 */ addiu $t2, $zero, 0x0040 ## $t2 = 00000040 -/* 01684 809EC3C4 00030823 */ subu $at, $zero, $v1 -/* 01688 809EC3C8 00017080 */ sll $t6, $at, 2 -/* 0168C 809EC3CC 0001C080 */ sll $t8, $at, 2 -/* 01690 809EC3D0 0301C021 */ addu $t8, $t8, $at -/* 01694 809EC3D4 01C17021 */ addu $t6, $t6, $at -/* 01698 809EC3D8 000E7040 */ sll $t6, $t6, 1 -/* 0169C 809EC3DC 0018C080 */ sll $t8, $t8, 2 -/* 016A0 809EC3E0 00013080 */ sll $a2, $at, 2 -/* 016A4 809EC3E4 00C13023 */ subu $a2, $a2, $at +/* 01684 809EC3C4 00030823 */ subu $at, $zero, $v1 +/* 01688 809EC3C8 00017080 */ sll $t6, $at, 2 +/* 0168C 809EC3CC 0001C080 */ sll $t8, $at, 2 +/* 01690 809EC3D0 0301C021 */ addu $t8, $t8, $at +/* 01694 809EC3D4 01C17021 */ addu $t6, $t6, $at +/* 01698 809EC3D8 000E7040 */ sll $t6, $t6, 1 +/* 0169C 809EC3DC 0018C080 */ sll $t8, $t8, 2 +/* 016A0 809EC3E0 00013080 */ sll $a2, $at, 2 +/* 016A4 809EC3E4 00C13023 */ subu $a2, $a2, $at /* 016A8 809EC3E8 331900FF */ andi $t9, $t8, 0x00FF ## $t9 = 00000000 /* 016AC 809EC3EC 31CF007F */ andi $t7, $t6, 0x007F ## $t7 = 00000000 /* 016B0 809EC3F0 24090020 */ addiu $t1, $zero, 0x0020 ## $t1 = 00000020 /* 016B4 809EC3F4 240B0020 */ addiu $t3, $zero, 0x0020 ## $t3 = 00000020 /* 016B8 809EC3F8 240C0040 */ addiu $t4, $zero, 0x0040 ## $t4 = 00000040 /* 016BC 809EC3FC 240D0001 */ addiu $t5, $zero, 0x0001 ## $t5 = 00000001 -/* 016C0 809EC400 AFAD0018 */ sw $t5, 0x0018($sp) -/* 016C4 809EC404 AFAC0014 */ sw $t4, 0x0014($sp) -/* 016C8 809EC408 AFAB0010 */ sw $t3, 0x0010($sp) -/* 016CC 809EC40C AFA90024 */ sw $t1, 0x0024($sp) -/* 016D0 809EC410 AFAF001C */ sw $t7, 0x001C($sp) -/* 016D4 809EC414 AFB90020 */ sw $t9, 0x0020($sp) +/* 016C0 809EC400 AFAD0018 */ sw $t5, 0x0018($sp) +/* 016C4 809EC404 AFAC0014 */ sw $t4, 0x0014($sp) +/* 016C8 809EC408 AFAB0010 */ sw $t3, 0x0010($sp) +/* 016CC 809EC40C AFA90024 */ sw $t1, 0x0024($sp) +/* 016D0 809EC410 AFAF001C */ sw $t7, 0x001C($sp) +/* 016D4 809EC414 AFB90020 */ sw $t9, 0x0020($sp) /* 016D8 809EC418 30C6007F */ andi $a2, $a2, 0x007F ## $a2 = 00000000 -/* 016DC 809EC41C AFAA0028 */ sw $t2, 0x0028($sp) +/* 016DC 809EC41C AFAA0028 */ sw $t2, 0x0028($sp) /* 016E0 809EC420 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 016E4 809EC424 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 016E8 809EC428 0C0253D0 */ jal Draw_TwoTexScroll -/* 016EC 809EC42C AFA2005C */ sw $v0, 0x005C($sp) -/* 016F0 809EC430 8FA8005C */ lw $t0, 0x005C($sp) +/* 016E8 809EC428 0C0253D0 */ jal Gfx_TwoTexScroll +/* 016EC 809EC42C AFA2005C */ sw $v0, 0x005C($sp) +/* 016F0 809EC430 8FA8005C */ lw $t0, 0x005C($sp) /* 016F4 809EC434 3C0CFA00 */ lui $t4, 0xFA00 ## $t4 = FA000000 /* 016F8 809EC438 358C8080 */ ori $t4, $t4, 0x8080 ## $t4 = FA008080 /* 016FC 809EC43C AD020004 */ sw $v0, 0x0004($t0) ## 00000004 @@ -143,34 +143,34 @@ glabel EnDh_Draw /* 0171C 809EC45C C6240320 */ lwc1 $f4, 0x0320($s1) ## 00000320 /* 01720 809EC460 3C014F00 */ lui $at, 0x4F00 ## $at = 4F000000 /* 01724 809EC464 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 01728 809EC468 460021A4 */ cvt.w.s $f6, $f4 +/* 01728 809EC468 460021A4 */ cvt.w.s $f6, $f4 /* 0172C 809EC46C 444EF800 */ cfc1 $t6, $31 /* 01730 809EC470 00000000 */ nop /* 01734 809EC474 31CE0078 */ andi $t6, $t6, 0x0078 ## $t6 = 00000000 -/* 01738 809EC478 51C00013 */ beql $t6, $zero, .L809EC4C8 -/* 0173C 809EC47C 440E3000 */ mfc1 $t6, $f6 +/* 01738 809EC478 51C00013 */ beql $t6, $zero, .L809EC4C8 +/* 0173C 809EC47C 440E3000 */ mfc1 $t6, $f6 /* 01740 809EC480 44813000 */ mtc1 $at, $f6 ## $f6 = 2147483648.00 /* 01744 809EC484 240E0001 */ addiu $t6, $zero, 0x0001 ## $t6 = 00000001 -/* 01748 809EC488 46062181 */ sub.s $f6, $f4, $f6 +/* 01748 809EC488 46062181 */ sub.s $f6, $f4, $f6 /* 0174C 809EC48C 44CEF800 */ ctc1 $t6, $31 /* 01750 809EC490 00000000 */ nop -/* 01754 809EC494 460031A4 */ cvt.w.s $f6, $f6 +/* 01754 809EC494 460031A4 */ cvt.w.s $f6, $f6 /* 01758 809EC498 444EF800 */ cfc1 $t6, $31 /* 0175C 809EC49C 00000000 */ nop /* 01760 809EC4A0 31CE0078 */ andi $t6, $t6, 0x0078 ## $t6 = 00000000 -/* 01764 809EC4A4 15C00005 */ bne $t6, $zero, .L809EC4BC +/* 01764 809EC4A4 15C00005 */ bne $t6, $zero, .L809EC4BC /* 01768 809EC4A8 00000000 */ nop -/* 0176C 809EC4AC 440E3000 */ mfc1 $t6, $f6 +/* 0176C 809EC4AC 440E3000 */ mfc1 $t6, $f6 /* 01770 809EC4B0 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 01774 809EC4B4 10000007 */ beq $zero, $zero, .L809EC4D4 +/* 01774 809EC4B4 10000007 */ beq $zero, $zero, .L809EC4D4 /* 01778 809EC4B8 01C17025 */ or $t6, $t6, $at ## $t6 = 80000000 .L809EC4BC: -/* 0177C 809EC4BC 10000005 */ beq $zero, $zero, .L809EC4D4 +/* 0177C 809EC4BC 10000005 */ beq $zero, $zero, .L809EC4D4 /* 01780 809EC4C0 240EFFFF */ addiu $t6, $zero, 0xFFFF ## $t6 = FFFFFFFF -/* 01784 809EC4C4 440E3000 */ mfc1 $t6, $f6 +/* 01784 809EC4C4 440E3000 */ mfc1 $t6, $f6 .L809EC4C8: /* 01788 809EC4C8 00000000 */ nop -/* 0178C 809EC4CC 05C0FFFB */ bltz $t6, .L809EC4BC +/* 0178C 809EC4CC 05C0FFFB */ bltz $t6, .L809EC4BC /* 01790 809EC4D0 00000000 */ nop .L809EC4D4: /* 01794 809EC4D4 44806000 */ mtc1 $zero, $f12 ## $f12 = 0.00 @@ -178,18 +178,18 @@ glabel EnDh_Draw /* 0179C 809EC4DC AC6F0004 */ sw $t7, 0x0004($v1) ## 00000004 /* 017A0 809EC4E0 44CDF800 */ ctc1 $t5, $31 /* 017A4 809EC4E4 C62E00BC */ lwc1 $f14, 0x00BC($s1) ## 000000BC -/* 017A8 809EC4E8 44066000 */ mfc1 $a2, $f12 -/* 017AC 809EC4EC 0C034261 */ jal Matrix_Translate -/* 017B0 809EC4F0 46007387 */ neg.s $f14, $f14 +/* 017A8 809EC4E8 44066000 */ mfc1 $a2, $f12 +/* 017AC 809EC4EC 0C034261 */ jal Matrix_Translate +/* 017B0 809EC4F0 46007387 */ neg.s $f14, $f14 /* 017B4 809EC4F4 3C01809F */ lui $at, %hi(D_809EC6EC) ## $at = 809F0000 -/* 017B8 809EC4F8 C420C6EC */ lwc1 $f0, %lo(D_809EC6EC)($at) +/* 017B8 809EC4F8 C420C6EC */ lwc1 $f0, %lo(D_809EC6EC)($at) /* 017BC 809EC4FC C6280318 */ lwc1 $f8, 0x0318($s1) ## 00000318 /* 017C0 809EC500 C62A031C */ lwc1 $f10, 0x031C($s1) ## 0000031C /* 017C4 809EC504 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 017C8 809EC508 46004302 */ mul.s $f12, $f8, $f0 -/* 017CC 809EC50C 44066000 */ mfc1 $a2, $f12 -/* 017D0 809EC510 46005382 */ mul.s $f14, $f10, $f0 -/* 017D4 809EC514 0C0342A3 */ jal Matrix_Scale +/* 017C8 809EC508 46004302 */ mul.s $f12, $f8, $f0 +/* 017CC 809EC50C 44066000 */ mfc1 $a2, $f12 +/* 017D0 809EC510 46005382 */ mul.s $f14, $f10, $f0 +/* 017D4 809EC514 0C0342A3 */ jal Matrix_Scale /* 017D8 809EC518 00000000 */ nop /* 017DC 809EC51C 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 /* 017E0 809EC520 3C19DA38 */ lui $t9, 0xDA38 ## $t9 = DA380000 @@ -201,7 +201,7 @@ glabel EnDh_Draw /* 017F8 809EC538 8E440000 */ lw $a0, 0x0000($s2) ## 00000000 /* 017FC 809EC53C 24A5C690 */ addiu $a1, $a1, %lo(D_809EC690) ## $a1 = 809EC690 /* 01800 809EC540 24060488 */ addiu $a2, $zero, 0x0488 ## $a2 = 00000488 -/* 01804 809EC544 0C0346A2 */ jal Matrix_NewMtx +/* 01804 809EC544 0C0346A2 */ jal Matrix_NewMtx /* 01808 809EC548 00408825 */ or $s1, $v0, $zero ## $s1 = 00000000 /* 0180C 809EC54C AE220004 */ sw $v0, 0x0004($s1) ## 00000004 /* 01810 809EC550 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 @@ -217,12 +217,12 @@ glabel EnDh_Draw /* 01834 809EC574 24C6C6A0 */ addiu $a2, $a2, %lo(D_809EC6A0) ## $a2 = 809EC6A0 /* 01838 809EC578 27A40074 */ addiu $a0, $sp, 0x0074 ## $a0 = FFFFFFE4 /* 0183C 809EC57C 8E450000 */ lw $a1, 0x0000($s2) ## 00000000 -/* 01840 809EC580 0C031AD5 */ jal func_800C6B54 +/* 01840 809EC580 0C031AD5 */ jal Graph_CloseDisps /* 01844 809EC584 2407048E */ addiu $a3, $zero, 0x048E ## $a3 = 0000048E -/* 01848 809EC588 8FBF0044 */ lw $ra, 0x0044($sp) -/* 0184C 809EC58C 8FB00038 */ lw $s0, 0x0038($sp) -/* 01850 809EC590 8FB1003C */ lw $s1, 0x003C($sp) -/* 01854 809EC594 8FB20040 */ lw $s2, 0x0040($sp) -/* 01858 809EC598 03E00008 */ jr $ra +/* 01848 809EC588 8FBF0044 */ lw $ra, 0x0044($sp) +/* 0184C 809EC58C 8FB00038 */ lw $s0, 0x0038($sp) +/* 01850 809EC590 8FB1003C */ lw $s1, 0x003C($sp) +/* 01854 809EC594 8FB20040 */ lw $s2, 0x0040($sp) +/* 01858 809EC598 03E00008 */ jr $ra /* 0185C 809EC59C 27BD0090 */ addiu $sp, $sp, 0x0090 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dh/EnDh_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Dh/EnDh_Init.s index fb86f63910..aff50d5f7e 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dh/EnDh_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dh/EnDh_Init.s @@ -1,13 +1,13 @@ glabel EnDh_Init /* 00008 809EAD48 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 0000C 809EAD4C AFB10028 */ sw $s1, 0x0028($sp) +/* 0000C 809EAD4C AFB10028 */ sw $s1, 0x0028($sp) /* 00010 809EAD50 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 -/* 00014 809EAD54 AFBF002C */ sw $ra, 0x002C($sp) -/* 00018 809EAD58 AFB00024 */ sw $s0, 0x0024($sp) +/* 00014 809EAD54 AFBF002C */ sw $ra, 0x002C($sp) +/* 00018 809EAD58 AFB00024 */ sw $s0, 0x0024($sp) /* 0001C 809EAD5C 3C05809F */ lui $a1, %hi(D_809EC640) ## $a1 = 809F0000 /* 00020 809EAD60 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 00024 809EAD64 0C01E037 */ jal Actor_ProcessInitChain - + /* 00028 809EAD68 24A5C640 */ addiu $a1, $a1, %lo(D_809EC640) ## $a1 = 809EC640 /* 0002C 809EAD6C 3C0E809F */ lui $t6, %hi(D_809EC620) ## $t6 = 809F0000 /* 00030 809EAD70 25CEC620 */ addiu $t6, $t6, %lo(D_809EC620) ## $t6 = 809EC620 @@ -17,20 +17,20 @@ glabel EnDh_Init /* 00040 809EAD80 260F0190 */ addiu $t7, $s0, 0x0190 ## $t7 = 00000190 /* 00044 809EAD84 261801F0 */ addiu $t8, $s0, 0x01F0 ## $t8 = 000001F0 /* 00048 809EAD88 24190010 */ addiu $t9, $zero, 0x0010 ## $t9 = 00000010 -/* 0004C 809EAD8C AFB90018 */ sw $t9, 0x0018($sp) -/* 00050 809EAD90 AFB80014 */ sw $t8, 0x0014($sp) -/* 00054 809EAD94 AFAF0010 */ sw $t7, 0x0010($sp) +/* 0004C 809EAD8C AFB90018 */ sw $t9, 0x0018($sp) +/* 00050 809EAD90 AFB80014 */ sw $t8, 0x0014($sp) +/* 00054 809EAD94 AFAF0010 */ sw $t7, 0x0010($sp) /* 00058 809EAD98 24E75880 */ addiu $a3, $a3, 0x5880 ## $a3 = 06005880 /* 0005C 809EAD9C 24C67E88 */ addiu $a2, $a2, 0x7E88 ## $a2 = 06007E88 /* 00060 809EADA0 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 00064 809EADA4 0C0291BE */ jal func_800A46F8 +/* 00064 809EADA4 0C0291BE */ jal SkelAnime_InitSV /* 00068 809EADA8 2605014C */ addiu $a1, $s0, 0x014C ## $a1 = 0000014C /* 0006C 809EADAC 3C068003 */ lui $a2, 0x8003 ## $a2 = 80030000 /* 00070 809EADB0 24C6B5EC */ addiu $a2, $a2, 0xB5EC ## $a2 = 8002B5EC /* 00074 809EADB4 260400B4 */ addiu $a0, $s0, 0x00B4 ## $a0 = 000000B4 /* 00078 809EADB8 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 /* 0007C 809EADBC 0C00AC78 */ jal ActorShape_Init - + /* 00080 809EADC0 3C074280 */ lui $a3, 0x4280 ## $a3 = 42800000 /* 00084 809EADC4 240800FE */ addiu $t0, $zero, 0x00FE ## $t0 = 000000FE /* 00088 809EADC8 A600001C */ sh $zero, 0x001C($s0) ## 0000001C @@ -39,10 +39,10 @@ glabel EnDh_Init /* 00094 809EADD4 8D29E664 */ lw $t1, -0x199C($t1) ## 8015E664 /* 00098 809EADD8 240D00FF */ addiu $t5, $zero, 0x00FF ## $t5 = 000000FF /* 0009C 809EADDC 2401FFFE */ addiu $at, $zero, 0xFFFE ## $at = FFFFFFFE -/* 000A0 809EADE0 15200004 */ bne $t1, $zero, .L809EADF4 +/* 000A0 809EADE0 15200004 */ bne $t1, $zero, .L809EADF4 /* 000A4 809EADE4 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 000A8 809EADE8 240A000E */ addiu $t2, $zero, 0x000E ## $t2 = 0000000E -/* 000AC 809EADEC 10000003 */ beq $zero, $zero, .L809EADFC +/* 000AC 809EADEC 10000003 */ beq $zero, $zero, .L809EADFC /* 000B0 809EADF0 A20A00AF */ sb $t2, 0x00AF($s0) ## 000000AF .L809EADF4: /* 000B4 809EADF4 240B0014 */ addiu $t3, $zero, 0x0014 ## $t3 = 00000014 @@ -51,37 +51,37 @@ glabel EnDh_Init /* 000BC 809EADFC 8E0E0004 */ lw $t6, 0x0004($s0) ## 00000004 /* 000C0 809EAE00 A20D0258 */ sb $t5, 0x0258($s0) ## 00000258 /* 000C4 809EAE04 A20D025A */ sb $t5, 0x025A($s0) ## 0000025A -/* 000C8 809EAE08 01C17824 */ and $t7, $t6, $at +/* 000C8 809EAE08 01C17824 */ and $t7, $t6, $at /* 000CC 809EAE0C AE0F0004 */ sw $t7, 0x0004($s0) ## 00000004 /* 000D0 809EAE10 26050260 */ addiu $a1, $s0, 0x0260 ## $a1 = 00000260 /* 000D4 809EAE14 0C0170D9 */ jal ActorCollider_AllocCylinder - -/* 000D8 809EAE18 AFA50030 */ sw $a1, 0x0030($sp) + +/* 000D8 809EAE18 AFA50030 */ sw $a1, 0x0030($sp) /* 000DC 809EAE1C 3C07809F */ lui $a3, %hi(D_809EC5C0) ## $a3 = 809F0000 -/* 000E0 809EAE20 8FA50030 */ lw $a1, 0x0030($sp) +/* 000E0 809EAE20 8FA50030 */ lw $a1, 0x0030($sp) /* 000E4 809EAE24 24E7C5C0 */ addiu $a3, $a3, %lo(D_809EC5C0) ## $a3 = 809EC5C0 /* 000E8 809EAE28 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 000EC 809EAE2C 0C01712B */ jal ActorCollider_InitCylinder - + /* 000F0 809EAE30 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 000F4 809EAE34 260502AC */ addiu $a1, $s0, 0x02AC ## $a1 = 000002AC -/* 000F8 809EAE38 AFA50030 */ sw $a1, 0x0030($sp) -/* 000FC 809EAE3C 0C016EFE */ jal func_8005BBF8 +/* 000F8 809EAE38 AFA50030 */ sw $a1, 0x0030($sp) +/* 000FC 809EAE3C 0C016EFE */ jal func_8005BBF8 /* 00100 809EAE40 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 00104 809EAE44 3C07809F */ lui $a3, %hi(D_809EC610) ## $a3 = 809F0000 /* 00108 809EAE48 261802CC */ addiu $t8, $s0, 0x02CC ## $t8 = 000002CC -/* 0010C 809EAE4C 8FA50030 */ lw $a1, 0x0030($sp) -/* 00110 809EAE50 AFB80010 */ sw $t8, 0x0010($sp) +/* 0010C 809EAE4C 8FA50030 */ lw $a1, 0x0030($sp) +/* 00110 809EAE50 AFB80010 */ sw $t8, 0x0010($sp) /* 00114 809EAE54 24E7C610 */ addiu $a3, $a3, %lo(D_809EC610) ## $a3 = 809EC610 /* 00118 809EAE58 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 0011C 809EAE5C 0C017014 */ jal func_8005C050 +/* 0011C 809EAE5C 0C017014 */ jal func_8005C050 /* 00120 809EAE60 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 -/* 00124 809EAE64 0C27AC17 */ jal func_809EB05C +/* 00124 809EAE64 0C27AC17 */ jal func_809EB05C /* 00128 809EAE68 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0012C 809EAE6C 8FBF002C */ lw $ra, 0x002C($sp) -/* 00130 809EAE70 8FB00024 */ lw $s0, 0x0024($sp) -/* 00134 809EAE74 8FB10028 */ lw $s1, 0x0028($sp) -/* 00138 809EAE78 03E00008 */ jr $ra +/* 0012C 809EAE6C 8FBF002C */ lw $ra, 0x002C($sp) +/* 00130 809EAE70 8FB00024 */ lw $s0, 0x0024($sp) +/* 00134 809EAE74 8FB10028 */ lw $s1, 0x0028($sp) +/* 00138 809EAE78 03E00008 */ jr $ra /* 0013C 809EAE7C 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dh/func_809EB05C.s b/asm/non_matchings/overlays/actors/ovl_En_Dh/func_809EB05C.s index cd7f2838a4..43b22180ed 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dh/func_809EB05C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dh/func_809EB05C.s @@ -1,33 +1,33 @@ glabel func_809EB05C /* 0031C 809EB05C 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 00320 809EB060 AFB00018 */ sw $s0, 0x0018($sp) +/* 00320 809EB060 AFB00018 */ sw $s0, 0x0018($sp) /* 00324 809EB064 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00328 809EB068 AFBF001C */ sw $ra, 0x001C($sp) +/* 00328 809EB068 AFBF001C */ sw $ra, 0x001C($sp) /* 0032C 809EB06C 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 00330 809EB070 24A53A8C */ addiu $a1, $a1, 0x3A8C ## $a1 = 06003A8C -/* 00334 809EB074 0C0294BE */ jal func_800A52F8 +/* 00334 809EB074 0C0294BE */ jal SkelAnime_ChangeAnimDefaultRepeat /* 00338 809EB078 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C /* 0033C 809EB07C 3C014416 */ lui $at, 0x4416 ## $at = 44160000 /* 00340 809EB080 44816000 */ mtc1 $at, $f12 ## $f12 = 600.00 /* 00344 809EB084 0C00CFC8 */ jal Math_Rand_CenteredFloat - + /* 00348 809EB088 A200025B */ sb $zero, 0x025B($s0) ## 0000025B /* 0034C 809EB08C C6040008 */ lwc1 $f4, 0x0008($s0) ## 00000008 /* 00350 809EB090 3C014416 */ lui $at, 0x4416 ## $at = 44160000 /* 00354 809EB094 44816000 */ mtc1 $at, $f12 ## $f12 = 600.00 -/* 00358 809EB098 46040180 */ add.s $f6, $f0, $f4 +/* 00358 809EB098 46040180 */ add.s $f6, $f0, $f4 /* 0035C 809EB09C 0C00CFC8 */ jal Math_Rand_CenteredFloat - + /* 00360 809EB0A0 E6060024 */ swc1 $f6, 0x0024($s0) ## 00000024 /* 00364 809EB0A4 C6080010 */ lwc1 $f8, 0x0010($s0) ## 00000010 /* 00368 809EB0A8 3C01809F */ lui $at, %hi(D_809EC6B4) ## $at = 809F0000 /* 0036C 809EB0AC 8E0F0004 */ lw $t7, 0x0004($s0) ## 00000004 -/* 00370 809EB0B0 46080280 */ add.s $f10, $f0, $f8 +/* 00370 809EB0B0 46080280 */ add.s $f10, $f0, $f8 /* 00374 809EB0B4 44801000 */ mtc1 $zero, $f2 ## $f2 = 0.00 /* 00378 809EB0B8 860E00B6 */ lh $t6, 0x00B6($s0) ## 000000B6 /* 0037C 809EB0BC 3C05809F */ lui $a1, %hi(func_809EB110) ## $a1 = 809F0000 /* 00380 809EB0C0 E60A002C */ swc1 $f10, 0x002C($s0) ## 0000002C -/* 00384 809EB0C4 C430C6B4 */ lwc1 $f16, %lo(D_809EC6B4)($at) +/* 00384 809EB0C4 C430C6B4 */ lwc1 $f16, %lo(D_809EC6B4)($at) /* 00388 809EB0C8 A600001C */ sh $zero, 0x001C($s0) ## 0000001C /* 0038C 809EB0CC 9202001D */ lbu $v0, 0x001D($s0) ## 0000001D /* 00390 809EB0D0 35F80080 */ ori $t8, $t7, 0x0080 ## $t8 = 00000080 @@ -39,12 +39,12 @@ glabel func_809EB05C /* 003A8 809EB0E8 A60E0032 */ sh $t6, 0x0032($s0) ## 00000032 /* 003AC 809EB0EC E61000BC */ swc1 $f16, 0x00BC($s0) ## 000000BC /* 003B0 809EB0F0 A2020250 */ sb $v0, 0x0250($s0) ## 00000250 -/* 003B4 809EB0F4 0C27AB50 */ jal func_809EAD40 +/* 003B4 809EB0F4 0C27AB50 */ jal func_809EAD40 /* 003B8 809EB0F8 A602025E */ sh $v0, 0x025E($s0) ## 0000025E -/* 003BC 809EB0FC 8FBF001C */ lw $ra, 0x001C($sp) -/* 003C0 809EB100 8FB00018 */ lw $s0, 0x0018($sp) +/* 003BC 809EB0FC 8FBF001C */ lw $ra, 0x001C($sp) +/* 003C0 809EB100 8FB00018 */ lw $s0, 0x0018($sp) /* 003C4 809EB104 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 003C8 809EB108 03E00008 */ jr $ra +/* 003C8 809EB108 03E00008 */ jr $ra /* 003CC 809EB10C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dh/func_809EB334.s b/asm/non_matchings/overlays/actors/ovl_En_Dh/func_809EB334.s index 358c2eb171..a787185925 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dh/func_809EB334.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dh/func_809EB334.s @@ -1,29 +1,29 @@ glabel func_809EB334 /* 005F4 809EB334 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 005F8 809EB338 AFB00028 */ sw $s0, 0x0028($sp) +/* 005F8 809EB338 AFB00028 */ sw $s0, 0x0028($sp) /* 005FC 809EB33C 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00600 809EB340 AFBF002C */ sw $ra, 0x002C($sp) +/* 00600 809EB340 AFBF002C */ sw $ra, 0x002C($sp) /* 00604 809EB344 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 /* 00608 809EB348 0C028800 */ jal SkelAnime_GetFrameCount - + /* 0060C 809EB34C 24843A8C */ addiu $a0, $a0, 0x3A8C ## $a0 = 06003A8C /* 00610 809EB350 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 00614 809EB354 3C014040 */ lui $at, 0x4040 ## $at = 40400000 /* 00618 809EB358 44814000 */ mtc1 $at, $f8 ## $f8 = 3.00 -/* 0061C 809EB35C 468021A0 */ cvt.s.w $f6, $f4 +/* 0061C 809EB35C 468021A0 */ cvt.s.w $f6, $f4 /* 00620 809EB360 3C01C0C0 */ lui $at, 0xC0C0 ## $at = C0C00000 /* 00624 809EB364 44818000 */ mtc1 $at, $f16 ## $f16 = -6.00 /* 00628 809EB368 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 0062C 809EB36C 24A53A8C */ addiu $a1, $a1, 0x3A8C ## $a1 = 06003A8C /* 00630 809EB370 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C -/* 00634 809EB374 46083281 */ sub.s $f10, $f6, $f8 +/* 00634 809EB374 46083281 */ sub.s $f10, $f6, $f8 /* 00638 809EB378 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 0063C 809EB37C 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 00640 809EB380 AFA00014 */ sw $zero, 0x0014($sp) -/* 00644 809EB384 E7AA0010 */ swc1 $f10, 0x0010($sp) -/* 00648 809EB388 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 0064C 809EB38C E7B00018 */ swc1 $f16, 0x0018($sp) +/* 00640 809EB380 AFA00014 */ sw $zero, 0x0014($sp) +/* 00644 809EB384 E7AA0010 */ swc1 $f10, 0x0010($sp) +/* 00648 809EB388 0C029468 */ jal SkelAnime_ChangeAnim + +/* 0064C 809EB38C E7B00018 */ swc1 $f16, 0x0018($sp) /* 00650 809EB390 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 /* 00654 809EB394 44819000 */ mtc1 $at, $f18 ## $f18 = 1.00 /* 00658 809EB398 240E0003 */ addiu $t6, $zero, 0x0003 ## $t6 = 00000003 @@ -33,12 +33,12 @@ glabel func_809EB334 /* 00668 809EB3A8 A60F025C */ sh $t7, 0x025C($s0) ## 0000025C /* 0066C 809EB3AC 24A5B3D0 */ addiu $a1, $a1, %lo(func_809EB3D0) ## $a1 = 809EB3D0 /* 00670 809EB3B0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00674 809EB3B4 0C27AB50 */ jal func_809EAD40 +/* 00674 809EB3B4 0C27AB50 */ jal func_809EAD40 /* 00678 809EB3B8 E6120068 */ swc1 $f18, 0x0068($s0) ## 00000068 -/* 0067C 809EB3BC 8FBF002C */ lw $ra, 0x002C($sp) -/* 00680 809EB3C0 8FB00028 */ lw $s0, 0x0028($sp) +/* 0067C 809EB3BC 8FBF002C */ lw $ra, 0x002C($sp) +/* 00680 809EB3C0 8FB00028 */ lw $s0, 0x0028($sp) /* 00684 809EB3C4 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 00688 809EB3C8 03E00008 */ jr $ra +/* 00688 809EB3C8 03E00008 */ jr $ra /* 0068C 809EB3CC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dh/func_809EB4D8.s b/asm/non_matchings/overlays/actors/ovl_En_Dh/func_809EB4D8.s index afa26c51bb..d40e813f16 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dh/func_809EB4D8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dh/func_809EB4D8.s @@ -1,15 +1,15 @@ glabel func_809EB4D8 /* 00798 809EB4D8 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 0079C 809EB4DC AFA5001C */ sw $a1, 0x001C($sp) -/* 007A0 809EB4E0 AFBF0014 */ sw $ra, 0x0014($sp) +/* 0079C 809EB4DC AFA5001C */ sw $a1, 0x001C($sp) +/* 007A0 809EB4E0 AFBF0014 */ sw $ra, 0x0014($sp) /* 007A4 809EB4E4 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 /* 007A8 809EB4E8 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 007AC 809EB4EC 24A55880 */ addiu $a1, $a1, 0x5880 ## $a1 = 06005880 -/* 007B0 809EB4F0 AFA70018 */ sw $a3, 0x0018($sp) +/* 007B0 809EB4F0 AFA70018 */ sw $a3, 0x0018($sp) /* 007B4 809EB4F4 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 007B8 809EB4F8 0C0294D3 */ jal func_800A534C +/* 007B8 809EB4F8 0C0294D3 */ jal SkelAnime_ChangeAnimTransitionRepeat /* 007BC 809EB4FC 3C06C080 */ lui $a2, 0xC080 ## $a2 = C0800000 -/* 007C0 809EB500 8FA40018 */ lw $a0, 0x0018($sp) +/* 007C0 809EB500 8FA40018 */ lw $a0, 0x0018($sp) /* 007C4 809EB504 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 /* 007C8 809EB508 44812000 */ mtc1 $at, $f4 ## $f4 = 1.00 /* 007CC 809EB50C 240E0001 */ addiu $t6, $zero, 0x0001 ## $t6 = 00000001 @@ -18,11 +18,11 @@ glabel func_809EB4D8 /* 007D8 809EB518 24A5B53C */ addiu $a1, $a1, %lo(func_809EB53C) ## $a1 = 809EB53C /* 007DC 809EB51C A08E025B */ sb $t6, 0x025B($a0) ## 0000025B /* 007E0 809EB520 A48F025C */ sh $t7, 0x025C($a0) ## 0000025C -/* 007E4 809EB524 0C27AB50 */ jal func_809EAD40 +/* 007E4 809EB524 0C27AB50 */ jal func_809EAD40 /* 007E8 809EB528 E4840068 */ swc1 $f4, 0x0068($a0) ## 00000068 -/* 007EC 809EB52C 8FBF0014 */ lw $ra, 0x0014($sp) +/* 007EC 809EB52C 8FBF0014 */ lw $ra, 0x0014($sp) /* 007F0 809EB530 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 007F4 809EB534 03E00008 */ jr $ra +/* 007F4 809EB534 03E00008 */ jr $ra /* 007F8 809EB538 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dh/func_809EB5C4.s b/asm/non_matchings/overlays/actors/ovl_En_Dh/func_809EB5C4.s index 136f956d23..61bbdff968 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dh/func_809EB5C4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dh/func_809EB5C4.s @@ -1,14 +1,14 @@ glabel func_809EB5C4 /* 00884 809EB5C4 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00888 809EB5C8 AFBF0014 */ sw $ra, 0x0014($sp) +/* 00888 809EB5C8 AFBF0014 */ sw $ra, 0x0014($sp) /* 0088C 809EB5CC 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 /* 00890 809EB5D0 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 00894 809EB5D4 24A54658 */ addiu $a1, $a1, 0x4658 ## $a1 = 06004658 -/* 00898 809EB5D8 AFA70018 */ sw $a3, 0x0018($sp) +/* 00898 809EB5D8 AFA70018 */ sw $a3, 0x0018($sp) /* 0089C 809EB5DC 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 008A0 809EB5E0 0C029490 */ jal func_800A5240 +/* 008A0 809EB5E0 0C029490 */ jal SkelAnime_ChangeAnimTransitionStop /* 008A4 809EB5E4 3C06C0C0 */ lui $a2, 0xC0C0 ## $a2 = C0C00000 -/* 008A8 809EB5E8 8FA40018 */ lw $a0, 0x0018($sp) +/* 008A8 809EB5E8 8FA40018 */ lw $a0, 0x0018($sp) /* 008AC 809EB5EC 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 /* 008B0 809EB5F0 300E00FF */ andi $t6, $zero, 0x00FF ## $t6 = 00000000 /* 008B4 809EB5F4 240F0004 */ addiu $t7, $zero, 0x0004 ## $t7 = 00000004 @@ -17,11 +17,11 @@ glabel func_809EB5C4 /* 008C0 809EB600 A48E025C */ sh $t6, 0x025C($a0) ## 0000025C /* 008C4 809EB604 A0800250 */ sb $zero, 0x0250($a0) ## 00000250 /* 008C8 809EB608 A08F025B */ sb $t7, 0x025B($a0) ## 0000025B -/* 008CC 809EB60C 0C27AB50 */ jal func_809EAD40 +/* 008CC 809EB60C 0C27AB50 */ jal func_809EAD40 /* 008D0 809EB610 E4840068 */ swc1 $f4, 0x0068($a0) ## 00000068 -/* 008D4 809EB614 8FBF0014 */ lw $ra, 0x0014($sp) +/* 008D4 809EB614 8FBF0014 */ lw $ra, 0x0014($sp) /* 008D8 809EB618 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 008DC 809EB61C 03E00008 */ jr $ra +/* 008DC 809EB61C 03E00008 */ jr $ra /* 008E0 809EB620 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dh/func_809EB624.s b/asm/non_matchings/overlays/actors/ovl_En_Dh/func_809EB624.s index 8ea9957d09..7713365438 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dh/func_809EB624.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dh/func_809EB624.s @@ -1,30 +1,30 @@ glabel func_809EB624 /* 008E4 809EB624 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 -/* 008E8 809EB628 AFB00028 */ sw $s0, 0x0028($sp) +/* 008E8 809EB628 AFB00028 */ sw $s0, 0x0028($sp) /* 008EC 809EB62C 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 008F0 809EB630 AFBF002C */ sw $ra, 0x002C($sp) +/* 008F0 809EB630 AFBF002C */ sw $ra, 0x002C($sp) /* 008F4 809EB634 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 008F8 809EB638 AFA50044 */ sw $a1, 0x0044($sp) +/* 008F8 809EB638 AFA50044 */ sw $a1, 0x0044($sp) /* 008FC 809EB63C 0C02927F */ jal SkelAnime_FrameUpdateMatrix - -/* 00900 809EB640 AFA40034 */ sw $a0, 0x0034($sp) -/* 00904 809EB644 10400005 */ beq $v0, $zero, .L809EB65C + +/* 00900 809EB640 AFA40034 */ sw $a0, 0x0034($sp) +/* 00904 809EB644 10400005 */ beq $v0, $zero, .L809EB65C /* 00908 809EB648 3C0142C8 */ lui $at, 0x42C8 ## $at = 42C80000 /* 0090C 809EB64C 920E0250 */ lbu $t6, 0x0250($s0) ## 00000250 /* 00910 809EB650 25CF0001 */ addiu $t7, $t6, 0x0001 ## $t7 = 00000001 -/* 00914 809EB654 10000023 */ beq $zero, $zero, .L809EB6E4 +/* 00914 809EB654 10000023 */ beq $zero, $zero, .L809EB6E4 /* 00918 809EB658 A20F0250 */ sb $t7, 0x0250($s0) ## 00000250 .L809EB65C: /* 0091C 809EB65C 44812000 */ mtc1 $at, $f4 ## $f4 = 100.00 /* 00920 809EB660 C6060090 */ lwc1 $f6, 0x0090($s0) ## 00000090 /* 00924 809EB664 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00928 809EB668 4606203C */ c.lt.s $f4, $f6 +/* 00928 809EB668 4606203C */ c.lt.s $f4, $f6 /* 0092C 809EB66C 00000000 */ nop -/* 00930 809EB670 45030005 */ bc1tl .L809EB688 +/* 00930 809EB670 45030005 */ bc1tl .L809EB688 /* 00934 809EB674 3C01C080 */ lui $at, 0xC080 ## $at = C0800000 -/* 00938 809EB678 0C00B821 */ jal func_8002E084 +/* 00938 809EB678 0C00B821 */ jal func_8002E084 /* 0093C 809EB67C 24052AAA */ addiu $a1, $zero, 0x2AAA ## $a1 = 00002AAA -/* 00940 809EB680 14400018 */ bne $v0, $zero, .L809EB6E4 +/* 00940 809EB680 14400018 */ bne $v0, $zero, .L809EB6E4 /* 00944 809EB684 3C01C080 */ lui $at, 0xC080 ## $at = C0800000 .L809EB688: /* 00948 809EB688 44815000 */ mtc1 $at, $f10 ## $f10 = -4.00 @@ -32,14 +32,14 @@ glabel func_809EB624 /* 00950 809EB690 8E070164 */ lw $a3, 0x0164($s0) ## 00000164 /* 00954 809EB694 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 00958 809EB698 24180002 */ addiu $t8, $zero, 0x0002 ## $t8 = 00000002 -/* 0095C 809EB69C AFB80014 */ sw $t8, 0x0014($sp) +/* 0095C 809EB69C AFB80014 */ sw $t8, 0x0014($sp) /* 00960 809EB6A0 24A54658 */ addiu $a1, $a1, 0x4658 ## $a1 = 06004658 -/* 00964 809EB6A4 8FA40034 */ lw $a0, 0x0034($sp) +/* 00964 809EB6A4 8FA40034 */ lw $a0, 0x0034($sp) /* 00968 809EB6A8 3C06BF80 */ lui $a2, 0xBF80 ## $a2 = BF800000 -/* 0096C 809EB6AC E7AA0018 */ swc1 $f10, 0x0018($sp) -/* 00970 809EB6B0 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 00974 809EB6B4 E7A80010 */ swc1 $f8, 0x0010($sp) +/* 0096C 809EB6AC E7AA0018 */ swc1 $f10, 0x0018($sp) +/* 00970 809EB6B0 0C029468 */ jal SkelAnime_ChangeAnim + +/* 00974 809EB6B4 E7A80010 */ swc1 $f8, 0x0010($sp) /* 00978 809EB6B8 8E0802C8 */ lw $t0, 0x02C8($s0) ## 000002C8 /* 0097C 809EB6BC 24190004 */ addiu $t9, $zero, 0x0004 ## $t9 = 00000004 /* 00980 809EB6C0 A2190250 */ sb $t9, 0x0250($s0) ## 00000250 @@ -53,43 +53,43 @@ glabel func_809EB624 /* 009A0 809EB6E0 AC4A0000 */ sw $t2, 0x0000($v0) ## 00000000 .L809EB6E4: /* 009A4 809EB6E4 920B0250 */ lbu $t3, 0x0250($s0) ## 00000250 -/* 009A8 809EB6E8 2D610006 */ sltiu $at, $t3, 0x0006 -/* 009AC 809EB6EC 1020008A */ beq $at, $zero, .L809EB918 -/* 009B0 809EB6F0 000B5880 */ sll $t3, $t3, 2 +/* 009A8 809EB6E8 2D610006 */ sltiu $at, $t3, 0x0006 +/* 009AC 809EB6EC 1020008A */ beq $at, $zero, .L809EB918 +/* 009B0 809EB6F0 000B5880 */ sll $t3, $t3, 2 /* 009B4 809EB6F4 3C01809F */ lui $at, %hi(jtbl_809EC6C0) ## $at = 809F0000 -/* 009B8 809EB6F8 002B0821 */ addu $at, $at, $t3 -/* 009BC 809EB6FC 8C2BC6C0 */ lw $t3, %lo(jtbl_809EC6C0)($at) -/* 009C0 809EB700 01600008 */ jr $t3 +/* 009B8 809EB6F8 002B0821 */ addu $at, $at, $t3 +/* 009BC 809EB6FC 8C2BC6C0 */ lw $t3, %lo(jtbl_809EC6C0)($at) +/* 009C0 809EB700 01600008 */ jr $t3 /* 009C4 809EB704 00000000 */ nop glabel L809EB708 /* 009C8 809EB708 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 009CC 809EB70C 24A51A3C */ addiu $a1, $a1, 0x1A3C ## $a1 = 06001A3C -/* 009D0 809EB710 0C02947A */ jal func_800A51E8 -/* 009D4 809EB714 8FA40034 */ lw $a0, 0x0034($sp) +/* 009D0 809EB710 0C02947A */ jal SkelAnime_ChangeAnimDefaultStop +/* 009D4 809EB714 8FA40034 */ lw $a0, 0x0034($sp) /* 009D8 809EB718 920C0250 */ lbu $t4, 0x0250($s0) ## 00000250 /* 009DC 809EB71C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 009E0 809EB720 24053900 */ addiu $a1, $zero, 0x3900 ## $a1 = 00003900 /* 009E4 809EB724 258D0001 */ addiu $t5, $t4, 0x0001 ## $t5 = 00000001 /* 009E8 809EB728 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 009EC 809EB72C A20D0250 */ sb $t5, 0x0250($s0) ## 00000250 glabel L809EB730 /* 009F0 809EB730 8605008A */ lh $a1, 0x008A($s0) ## 0000008A -/* 009F4 809EB734 AFA00010 */ sw $zero, 0x0010($sp) +/* 009F4 809EB734 AFA00010 */ sw $zero, 0x0010($sp) /* 009F8 809EB738 260400B6 */ addiu $a0, $s0, 0x00B6 ## $a0 = 000000B6 /* 009FC 809EB73C 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 /* 00A00 809EB740 0C01E1A7 */ jal Math_SmoothScaleMaxMinS - + /* 00A04 809EB744 240705DC */ addiu $a3, $zero, 0x05DC ## $a3 = 000005DC -/* 00A08 809EB748 10000074 */ beq $zero, $zero, .L809EB91C +/* 00A08 809EB748 10000074 */ beq $zero, $zero, .L809EB91C /* 00A0C 809EB74C 861800B6 */ lh $t8, 0x00B6($s0) ## 000000B6 glabel L809EB750 /* 00A10 809EB750 3C014080 */ lui $at, 0x4080 ## $at = 40800000 /* 00A14 809EB754 44819000 */ mtc1 $at, $f18 ## $f18 = 4.00 /* 00A18 809EB758 C6100164 */ lwc1 $f16, 0x0164($s0) ## 00000164 -/* 00A1C 809EB75C 4610903E */ c.le.s $f18, $f16 +/* 00A1C 809EB75C 4610903E */ c.le.s $f18, $f16 /* 00A20 809EB760 00000000 */ nop -/* 00A24 809EB764 4502000E */ bc1fl .L809EB7A0 +/* 00A24 809EB764 4502000E */ bc1fl .L809EB7A0 /* 00A28 809EB768 920302BC */ lbu $v1, 0x02BC($s0) ## 000002BC /* 00A2C 809EB76C 8E0F02C8 */ lw $t7, 0x02C8($s0) ## 000002C8 /* 00A30 809EB770 240E0011 */ addiu $t6, $zero, 0x0011 ## $t6 = 00000011 @@ -106,7 +106,7 @@ glabel L809EB750 /* 00A5C 809EB79C 920302BC */ lbu $v1, 0x02BC($s0) ## 000002BC .L809EB7A0: /* 00A60 809EB7A0 306A0004 */ andi $t2, $v1, 0x0004 ## $t2 = 00000000 -/* 00A64 809EB7A4 11400010 */ beq $t2, $zero, .L809EB7E8 +/* 00A64 809EB7A4 11400010 */ beq $t2, $zero, .L809EB7E8 /* 00A68 809EB7A8 30790002 */ andi $t9, $v1, 0x0002 ## $t9 = 00000000 /* 00A6C 809EB7AC 8E0C02C8 */ lw $t4, 0x02C8($s0) ## 000002C8 /* 00A70 809EB7B0 306BFFF9 */ andi $t3, $v1, 0xFFF9 ## $t3 = 00000000 @@ -121,76 +121,76 @@ glabel L809EB750 /* 00A94 809EB7D4 AC4E0000 */ sw $t6, 0x0000($v0) ## 00000000 /* 00A98 809EB7D8 920F0250 */ lbu $t7, 0x0250($s0) ## 00000250 /* 00A9C 809EB7DC 25F80001 */ addiu $t8, $t7, 0x0001 ## $t8 = 00000001 -/* 00AA0 809EB7E0 1000004D */ beq $zero, $zero, .L809EB918 +/* 00AA0 809EB7E0 1000004D */ beq $zero, $zero, .L809EB918 /* 00AA4 809EB7E4 A2180250 */ sb $t8, 0x0250($s0) ## 00000250 .L809EB7E8: -/* 00AA8 809EB7E8 1320004B */ beq $t9, $zero, .L809EB918 +/* 00AA8 809EB7E8 1320004B */ beq $t9, $zero, .L809EB918 /* 00AAC 809EB7EC 3C014100 */ lui $at, 0x4100 ## $at = 41000000 /* 00AB0 809EB7F0 44810000 */ mtc1 $at, $f0 ## $f0 = 8.00 /* 00AB4 809EB7F4 3068FFFD */ andi $t0, $v1, 0xFFFD ## $t0 = 00000000 /* 00AB8 809EB7F8 A20802BC */ sb $t0, 0x02BC($s0) ## 000002BC /* 00ABC 809EB7FC 860700B6 */ lh $a3, 0x00B6($s0) ## 000000B6 -/* 00AC0 809EB800 44060000 */ mfc1 $a2, $f0 -/* 00AC4 809EB804 8FA40044 */ lw $a0, 0x0044($sp) +/* 00AC0 809EB800 44060000 */ mfc1 $a2, $f0 +/* 00AC4 809EB804 8FA40044 */ lw $a0, 0x0044($sp) /* 00AC8 809EB808 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 00ACC 809EB80C 0C00BDC7 */ jal func_8002F71C -/* 00AD0 809EB810 E7A00010 */ swc1 $f0, 0x0010($sp) -/* 00AD4 809EB814 10000041 */ beq $zero, $zero, .L809EB91C +/* 00ACC 809EB80C 0C00BDC7 */ jal func_8002F71C +/* 00AD0 809EB810 E7A00010 */ swc1 $f0, 0x0010($sp) +/* 00AD4 809EB814 10000041 */ beq $zero, $zero, .L809EB91C /* 00AD8 809EB818 861800B6 */ lh $t8, 0x00B6($s0) ## 000000B6 glabel L809EB81C /* 00ADC 809EB81C 3C0142C8 */ lui $at, 0x42C8 ## $at = 42C80000 /* 00AE0 809EB820 44812000 */ mtc1 $at, $f4 ## $f4 = 100.00 /* 00AE4 809EB824 C6060090 */ lwc1 $f6, 0x0090($s0) ## 00000090 /* 00AE8 809EB828 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00AEC 809EB82C 4604303E */ c.le.s $f6, $f4 +/* 00AEC 809EB82C 4604303E */ c.le.s $f6, $f4 /* 00AF0 809EB830 00000000 */ nop -/* 00AF4 809EB834 45000017 */ bc1f .L809EB894 +/* 00AF4 809EB834 45000017 */ bc1f .L809EB894 /* 00AF8 809EB838 00000000 */ nop -/* 00AFC 809EB83C 0C00B821 */ jal func_8002E084 +/* 00AFC 809EB83C 0C00B821 */ jal func_8002E084 /* 00B00 809EB840 24052AAA */ addiu $a1, $zero, 0x2AAA ## $a1 = 00002AAA -/* 00B04 809EB844 10400013 */ beq $v0, $zero, .L809EB894 +/* 00B04 809EB844 10400013 */ beq $v0, $zero, .L809EB894 /* 00B08 809EB848 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 /* 00B0C 809EB84C 0C028800 */ jal SkelAnime_GetFrameCount - + /* 00B10 809EB850 24844658 */ addiu $a0, $a0, 0x4658 ## $a0 = 06004658 /* 00B14 809EB854 44824000 */ mtc1 $v0, $f8 ## $f8 = 0.00 /* 00B18 809EB858 3C01C0C0 */ lui $at, 0xC0C0 ## $at = C0C00000 /* 00B1C 809EB85C 44818000 */ mtc1 $at, $f16 ## $f16 = -6.00 -/* 00B20 809EB860 468042A0 */ cvt.s.w $f10, $f8 +/* 00B20 809EB860 468042A0 */ cvt.s.w $f10, $f8 /* 00B24 809EB864 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 00B28 809EB868 24090002 */ addiu $t1, $zero, 0x0002 ## $t1 = 00000002 -/* 00B2C 809EB86C AFA90014 */ sw $t1, 0x0014($sp) +/* 00B2C 809EB86C AFA90014 */ sw $t1, 0x0014($sp) /* 00B30 809EB870 24A54658 */ addiu $a1, $a1, 0x4658 ## $a1 = 06004658 -/* 00B34 809EB874 8FA40034 */ lw $a0, 0x0034($sp) -/* 00B38 809EB878 E7AA0010 */ swc1 $f10, 0x0010($sp) +/* 00B34 809EB874 8FA40034 */ lw $a0, 0x0034($sp) +/* 00B38 809EB878 E7AA0010 */ swc1 $f10, 0x0010($sp) /* 00B3C 809EB87C 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 00B40 809EB880 3C0741A0 */ lui $a3, 0x41A0 ## $a3 = 41A00000 -/* 00B44 809EB884 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 00B48 809EB888 E7B00018 */ swc1 $f16, 0x0018($sp) -/* 00B4C 809EB88C 10000022 */ beq $zero, $zero, .L809EB918 +/* 00B44 809EB884 0C029468 */ jal SkelAnime_ChangeAnim + +/* 00B48 809EB888 E7B00018 */ swc1 $f16, 0x0018($sp) +/* 00B4C 809EB88C 10000022 */ beq $zero, $zero, .L809EB918 /* 00B50 809EB890 A2000250 */ sb $zero, 0x0250($s0) ## 00000250 .L809EB894: /* 00B54 809EB894 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 /* 00B58 809EB898 0C028800 */ jal SkelAnime_GetFrameCount - + /* 00B5C 809EB89C 24844658 */ addiu $a0, $a0, 0x4658 ## $a0 = 06004658 /* 00B60 809EB8A0 44829000 */ mtc1 $v0, $f18 ## $f18 = 0.00 /* 00B64 809EB8A4 3C01C080 */ lui $at, 0xC080 ## $at = C0800000 /* 00B68 809EB8A8 44813000 */ mtc1 $at, $f6 ## $f6 = -4.00 -/* 00B6C 809EB8AC 468094A0 */ cvt.s.w $f18, $f18 +/* 00B6C 809EB8AC 468094A0 */ cvt.s.w $f18, $f18 /* 00B70 809EB8B0 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 /* 00B74 809EB8B4 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 00B78 809EB8B8 240A0002 */ addiu $t2, $zero, 0x0002 ## $t2 = 00000002 -/* 00B7C 809EB8BC AFAA0014 */ sw $t2, 0x0014($sp) +/* 00B7C 809EB8BC AFAA0014 */ sw $t2, 0x0014($sp) /* 00B80 809EB8C0 24A54658 */ addiu $a1, $a1, 0x4658 ## $a1 = 06004658 -/* 00B84 809EB8C4 44079000 */ mfc1 $a3, $f18 -/* 00B88 809EB8C8 8FA40034 */ lw $a0, 0x0034($sp) +/* 00B84 809EB8C4 44079000 */ mfc1 $a3, $f18 +/* 00B88 809EB8C8 8FA40034 */ lw $a0, 0x0034($sp) /* 00B8C 809EB8CC 3C06BF80 */ lui $a2, 0xBF80 ## $a2 = BF800000 -/* 00B90 809EB8D0 E7A60018 */ swc1 $f6, 0x0018($sp) -/* 00B94 809EB8D4 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 00B98 809EB8D8 E7A40010 */ swc1 $f4, 0x0010($sp) +/* 00B90 809EB8D0 E7A60018 */ swc1 $f6, 0x0018($sp) +/* 00B94 809EB8D4 0C029468 */ jal SkelAnime_ChangeAnim + +/* 00B98 809EB8D8 E7A40010 */ swc1 $f4, 0x0010($sp) /* 00B9C 809EB8DC 920B0250 */ lbu $t3, 0x0250($s0) ## 00000250 /* 00BA0 809EB8E0 8E0D02C8 */ lw $t5, 0x02C8($s0) ## 000002C8 /* 00BA4 809EB8E4 256C0001 */ addiu $t4, $t3, 0x0001 ## $t4 = 00000001 @@ -202,20 +202,20 @@ glabel L809EB81C /* 00BBC 809EB8FC A0400005 */ sb $zero, 0x0005($v0) ## 00000005 /* 00BC0 809EB900 8E0202C8 */ lw $v0, 0x02C8($s0) ## 000002C8 /* 00BC4 809EB904 904F0005 */ lbu $t7, 0x0005($v0) ## 00000005 -/* 00BC8 809EB908 10000003 */ beq $zero, $zero, .L809EB918 +/* 00BC8 809EB908 10000003 */ beq $zero, $zero, .L809EB918 /* 00BCC 809EB90C AC4F0000 */ sw $t7, 0x0000($v0) ## 00000000 glabel L809EB910 -/* 00BD0 809EB910 0C27ACCD */ jal func_809EB334 +/* 00BD0 809EB910 0C27ACCD */ jal func_809EB334 /* 00BD4 809EB914 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 glabel L809EB918 .L809EB918: /* 00BD8 809EB918 861800B6 */ lh $t8, 0x00B6($s0) ## 000000B6 .L809EB91C: /* 00BDC 809EB91C A6180032 */ sh $t8, 0x0032($s0) ## 00000032 -/* 00BE0 809EB920 8FBF002C */ lw $ra, 0x002C($sp) -/* 00BE4 809EB924 8FB00028 */ lw $s0, 0x0028($sp) +/* 00BE0 809EB920 8FBF002C */ lw $ra, 0x002C($sp) +/* 00BE4 809EB924 8FB00028 */ lw $s0, 0x0028($sp) /* 00BE8 809EB928 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 -/* 00BEC 809EB92C 03E00008 */ jr $ra +/* 00BEC 809EB92C 03E00008 */ jr $ra /* 00BF0 809EB930 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dh/func_809EB934.s b/asm/non_matchings/overlays/actors/ovl_En_Dh/func_809EB934.s index e9f46fee95..8b2ed10718 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dh/func_809EB934.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dh/func_809EB934.s @@ -1,20 +1,20 @@ glabel func_809EB934 /* 00BF4 809EB934 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00BF8 809EB938 AFBF0014 */ sw $ra, 0x0014($sp) +/* 00BF8 809EB938 AFBF0014 */ sw $ra, 0x0014($sp) /* 00BFC 809EB93C 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 /* 00C00 809EB940 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 00C04 809EB944 24A52148 */ addiu $a1, $a1, 0x2148 ## $a1 = 06002148 -/* 00C08 809EB948 AFA70018 */ sw $a3, 0x0018($sp) +/* 00C08 809EB948 AFA70018 */ sw $a3, 0x0018($sp) /* 00C0C 809EB94C 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 00C10 809EB950 0C029490 */ jal func_800A5240 +/* 00C10 809EB950 0C029490 */ jal SkelAnime_ChangeAnimTransitionStop /* 00C14 809EB954 3C06C0C0 */ lui $a2, 0xC0C0 ## $a2 = C0C00000 -/* 00C18 809EB958 8FA40018 */ lw $a0, 0x0018($sp) +/* 00C18 809EB958 8FA40018 */ lw $a0, 0x0018($sp) /* 00C1C 809EB95C 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 /* 00C20 809EB960 2401FFFE */ addiu $at, $zero, 0xFFFE ## $at = FFFFFFFE /* 00C24 809EB964 8C980004 */ lw $t8, 0x0004($a0) ## 00000004 /* 00C28 809EB968 848F00B6 */ lh $t7, 0x00B6($a0) ## 000000B6 /* 00C2C 809EB96C 240E0002 */ addiu $t6, $zero, 0x0002 ## $t6 = 00000002 -/* 00C30 809EB970 0301C824 */ and $t9, $t8, $at +/* 00C30 809EB970 0301C824 */ and $t9, $t8, $at /* 00C34 809EB974 240539A8 */ addiu $a1, $zero, 0x39A8 ## $a1 = 000039A8 /* 00C38 809EB978 A08E025B */ sb $t6, 0x025B($a0) ## 0000025B /* 00C3C 809EB97C A480025E */ sh $zero, 0x025E($a0) ## 0000025E @@ -23,15 +23,15 @@ glabel func_809EB934 /* 00C48 809EB988 E4800068 */ swc1 $f0, 0x0068($a0) ## 00000068 /* 00C4C 809EB98C E4800318 */ swc1 $f0, 0x0318($a0) ## 00000318 /* 00C50 809EB990 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 00C54 809EB994 A48F0032 */ sh $t7, 0x0032($a0) ## 00000032 /* 00C58 809EB998 3C05809F */ lui $a1, %hi(func_809EB9B8) ## $a1 = 809F0000 -/* 00C5C 809EB99C 8FA40018 */ lw $a0, 0x0018($sp) -/* 00C60 809EB9A0 0C27AB50 */ jal func_809EAD40 +/* 00C5C 809EB99C 8FA40018 */ lw $a0, 0x0018($sp) +/* 00C60 809EB9A0 0C27AB50 */ jal func_809EAD40 /* 00C64 809EB9A4 24A5B9B8 */ addiu $a1, $a1, %lo(func_809EB9B8) ## $a1 = 809EB9B8 -/* 00C68 809EB9A8 8FBF0014 */ lw $ra, 0x0014($sp) +/* 00C68 809EB9A8 8FBF0014 */ lw $ra, 0x0014($sp) /* 00C6C 809EB9AC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00C70 809EB9B0 03E00008 */ jr $ra +/* 00C70 809EB9B0 03E00008 */ jr $ra /* 00C74 809EB9B4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dh/func_809EBB48.s b/asm/non_matchings/overlays/actors/ovl_En_Dh/func_809EBB48.s index 86486014e0..0f83bb41b3 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dh/func_809EBB48.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dh/func_809EBB48.s @@ -1,37 +1,37 @@ glabel func_809EBB48 /* 00E08 809EBB48 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00E0C 809EBB4C AFBF0014 */ sw $ra, 0x0014($sp) +/* 00E0C 809EBB4C AFBF0014 */ sw $ra, 0x0014($sp) /* 00E10 809EBB50 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 /* 00E14 809EBB54 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 00E18 809EBB58 24A53D6C */ addiu $a1, $a1, 0x3D6C ## $a1 = 06003D6C -/* 00E1C 809EBB5C AFA70018 */ sw $a3, 0x0018($sp) +/* 00E1C 809EBB5C AFA70018 */ sw $a3, 0x0018($sp) /* 00E20 809EBB60 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 00E24 809EBB64 0C029490 */ jal func_800A5240 +/* 00E24 809EBB64 0C029490 */ jal SkelAnime_ChangeAnimTransitionStop /* 00E28 809EBB68 3C06C0C0 */ lui $a2, 0xC0C0 ## $a2 = C0C00000 -/* 00E2C 809EBB6C 8FA70018 */ lw $a3, 0x0018($sp) +/* 00E2C 809EBB6C 8FA70018 */ lw $a3, 0x0018($sp) /* 00E30 809EBB70 3C01BF80 */ lui $at, 0xBF80 ## $at = BF800000 /* 00E34 809EBB74 240539A9 */ addiu $a1, $zero, 0x39A9 ## $a1 = 000039A9 /* 00E38 809EBB78 94EE0088 */ lhu $t6, 0x0088($a3) ## 00000088 /* 00E3C 809EBB7C 00E02025 */ or $a0, $a3, $zero ## $a0 = 00000000 /* 00E40 809EBB80 31CF0001 */ andi $t7, $t6, 0x0001 ## $t7 = 00000000 -/* 00E44 809EBB84 11E00004 */ beq $t7, $zero, .L809EBB98 +/* 00E44 809EBB84 11E00004 */ beq $t7, $zero, .L809EBB98 /* 00E48 809EBB88 00000000 */ nop /* 00E4C 809EBB8C 44812000 */ mtc1 $at, $f4 ## $f4 = -1.00 /* 00E50 809EBB90 00000000 */ nop /* 00E54 809EBB94 E4E40068 */ swc1 $f4, 0x0068($a3) ## 00000068 .L809EBB98: /* 00E58 809EBB98 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 00E5C 809EBB9C AFA70018 */ sw $a3, 0x0018($sp) -/* 00E60 809EBBA0 8FA40018 */ lw $a0, 0x0018($sp) + +/* 00E5C 809EBB9C AFA70018 */ sw $a3, 0x0018($sp) +/* 00E60 809EBBA0 8FA40018 */ lw $a0, 0x0018($sp) /* 00E64 809EBBA4 24180006 */ addiu $t8, $zero, 0x0006 ## $t8 = 00000006 /* 00E68 809EBBA8 3C05809F */ lui $a1, %hi(func_809EBBC8) ## $a1 = 809F0000 /* 00E6C 809EBBAC 24A5BBC8 */ addiu $a1, $a1, %lo(func_809EBBC8) ## $a1 = 809EBBC8 -/* 00E70 809EBBB0 0C27AB50 */ jal func_809EAD40 +/* 00E70 809EBBB0 0C27AB50 */ jal func_809EAD40 /* 00E74 809EBBB4 A098025B */ sb $t8, 0x025B($a0) ## 0000025B -/* 00E78 809EBBB8 8FBF0014 */ lw $ra, 0x0014($sp) +/* 00E78 809EBBB8 8FBF0014 */ lw $ra, 0x0014($sp) /* 00E7C 809EBBBC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00E80 809EBBC0 03E00008 */ jr $ra +/* 00E80 809EBBC0 03E00008 */ jr $ra /* 00E84 809EBBC4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dh/func_809EBBC8.s b/asm/non_matchings/overlays/actors/ovl_En_Dh/func_809EBBC8.s index 954c3ff02e..798a6bbfa7 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dh/func_809EBBC8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dh/func_809EBBC8.s @@ -1,85 +1,85 @@ glabel func_809EBBC8 /* 00E88 809EBBC8 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 00E8C 809EBBCC AFBF002C */ sw $ra, 0x002C($sp) -/* 00E90 809EBBD0 AFB00028 */ sw $s0, 0x0028($sp) -/* 00E94 809EBBD4 AFA5003C */ sw $a1, 0x003C($sp) +/* 00E8C 809EBBCC AFBF002C */ sw $ra, 0x002C($sp) +/* 00E90 809EBBD0 AFB00028 */ sw $s0, 0x0028($sp) +/* 00E94 809EBBD4 AFA5003C */ sw $a1, 0x003C($sp) /* 00E98 809EBBD8 C4800068 */ lwc1 $f0, 0x0068($a0) ## 00000068 /* 00E9C 809EBBDC 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 /* 00EA0 809EBBE0 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 00EA4 809EBBE4 3C01809F */ lui $at, %hi(D_809EC6E4) ## $at = 809F0000 -/* 00EA8 809EBBE8 4604003C */ c.lt.s $f0, $f4 +/* 00EA8 809EBBE8 4604003C */ c.lt.s $f0, $f4 /* 00EAC 809EBBEC 00000000 */ nop -/* 00EB0 809EBBF0 45020005 */ bc1fl .L809EBC08 +/* 00EB0 809EBBF0 45020005 */ bc1fl .L809EBC08 /* 00EB4 809EBBF4 860E008A */ lh $t6, 0x008A($s0) ## 0000008A -/* 00EB8 809EBBF8 C426C6E4 */ lwc1 $f6, %lo(D_809EC6E4)($at) -/* 00EBC 809EBBFC 46060200 */ add.s $f8, $f0, $f6 +/* 00EB8 809EBBF8 C426C6E4 */ lwc1 $f6, %lo(D_809EC6E4)($at) +/* 00EBC 809EBBFC 46060200 */ add.s $f8, $f0, $f6 /* 00EC0 809EBC00 E4880068 */ swc1 $f8, 0x0068($a0) ## 00000068 /* 00EC4 809EBC04 860E008A */ lh $t6, 0x008A($s0) ## 0000008A .L809EBC08: /* 00EC8 809EBC08 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C /* 00ECC 809EBC0C A60E0032 */ sh $t6, 0x0032($s0) ## 00000032 /* 00ED0 809EBC10 0C02927F */ jal SkelAnime_FrameUpdateMatrix - -/* 00ED4 809EBC14 AFA40030 */ sw $a0, 0x0030($sp) -/* 00ED8 809EBC18 50400031 */ beql $v0, $zero, .L809EBCE0 -/* 00EDC 809EBC1C 8FBF002C */ lw $ra, 0x002C($sp) + +/* 00ED4 809EBC14 AFA40030 */ sw $a0, 0x0030($sp) +/* 00ED8 809EBC18 50400031 */ beql $v0, $zero, .L809EBCE0 +/* 00EDC 809EBC1C 8FBF002C */ lw $ra, 0x002C($sp) /* 00EE0 809EBC20 92180251 */ lbu $t8, 0x0251($s0) ## 00000251 /* 00EE4 809EBC24 860F00B6 */ lh $t7, 0x00B6($s0) ## 000000B6 /* 00EE8 809EBC28 3C0142D2 */ lui $at, 0x42D2 ## $at = 42D20000 -/* 00EEC 809EBC2C 13000006 */ beq $t8, $zero, .L809EBC48 +/* 00EEC 809EBC2C 13000006 */ beq $t8, $zero, .L809EBC48 /* 00EF0 809EBC30 A60F0032 */ sh $t7, 0x0032($s0) ## 00000032 /* 00EF4 809EBC34 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00EF8 809EBC38 0C27AD36 */ jal func_809EB4D8 -/* 00EFC 809EBC3C 8FA5003C */ lw $a1, 0x003C($sp) -/* 00F00 809EBC40 10000025 */ beq $zero, $zero, .L809EBCD8 +/* 00EF8 809EBC38 0C27AD36 */ jal func_809EB4D8 +/* 00EFC 809EBC3C 8FA5003C */ lw $a1, 0x003C($sp) +/* 00F00 809EBC40 10000025 */ beq $zero, $zero, .L809EBCD8 /* 00F04 809EBC44 240800FF */ addiu $t0, $zero, 0x00FF ## $t0 = 000000FF .L809EBC48: /* 00F08 809EBC48 44815000 */ mtc1 $at, $f10 ## $f10 = 0.00 /* 00F0C 809EBC4C C6100090 */ lwc1 $f16, 0x0090($s0) ## 00000090 /* 00F10 809EBC50 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00F14 809EBC54 460A803E */ c.le.s $f16, $f10 +/* 00F14 809EBC54 460A803E */ c.le.s $f16, $f10 /* 00F18 809EBC58 00000000 */ nop -/* 00F1C 809EBC5C 4500001B */ bc1f .L809EBCCC +/* 00F1C 809EBC5C 4500001B */ bc1f .L809EBCCC /* 00F20 809EBC60 00000000 */ nop -/* 00F24 809EBC64 0C00B821 */ jal func_8002E084 +/* 00F24 809EBC64 0C00B821 */ jal func_8002E084 /* 00F28 809EBC68 24052AAA */ addiu $a1, $zero, 0x2AAA ## $a1 = 00002AAA -/* 00F2C 809EBC6C 10400017 */ beq $v0, $zero, .L809EBCCC +/* 00F2C 809EBC6C 10400017 */ beq $v0, $zero, .L809EBCCC /* 00F30 809EBC70 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 /* 00F34 809EBC74 0C028800 */ jal SkelAnime_GetFrameCount - + /* 00F38 809EBC78 24844658 */ addiu $a0, $a0, 0x4658 ## $a0 = 06004658 /* 00F3C 809EBC7C 44829000 */ mtc1 $v0, $f18 ## $f18 = 0.00 /* 00F40 809EBC80 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00F44 809EBC84 46809120 */ cvt.s.w $f4, $f18 -/* 00F48 809EBC88 0C27AD71 */ jal func_809EB5C4 -/* 00F4C 809EBC8C E7A40034 */ swc1 $f4, 0x0034($sp) +/* 00F44 809EBC84 46809120 */ cvt.s.w $f4, $f18 +/* 00F48 809EBC88 0C27AD71 */ jal func_809EB5C4 +/* 00F4C 809EBC8C E7A40034 */ swc1 $f4, 0x0034($sp) /* 00F50 809EBC90 3C01C0C0 */ lui $at, 0xC0C0 ## $at = C0C00000 /* 00F54 809EBC94 44814000 */ mtc1 $at, $f8 ## $f8 = -6.00 -/* 00F58 809EBC98 C7A60034 */ lwc1 $f6, 0x0034($sp) +/* 00F58 809EBC98 C7A60034 */ lwc1 $f6, 0x0034($sp) /* 00F5C 809EBC9C 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 00F60 809EBCA0 24190002 */ addiu $t9, $zero, 0x0002 ## $t9 = 00000002 -/* 00F64 809EBCA4 AFB90014 */ sw $t9, 0x0014($sp) +/* 00F64 809EBCA4 AFB90014 */ sw $t9, 0x0014($sp) /* 00F68 809EBCA8 24A54658 */ addiu $a1, $a1, 0x4658 ## $a1 = 06004658 -/* 00F6C 809EBCAC 8FA40030 */ lw $a0, 0x0030($sp) +/* 00F6C 809EBCAC 8FA40030 */ lw $a0, 0x0030($sp) /* 00F70 809EBCB0 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 00F74 809EBCB4 3C0741A0 */ lui $a3, 0x41A0 ## $a3 = 41A00000 -/* 00F78 809EBCB8 E7A60010 */ swc1 $f6, 0x0010($sp) -/* 00F7C 809EBCBC 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 00F80 809EBCC0 E7A80018 */ swc1 $f8, 0x0018($sp) -/* 00F84 809EBCC4 10000004 */ beq $zero, $zero, .L809EBCD8 +/* 00F78 809EBCB8 E7A60010 */ swc1 $f6, 0x0010($sp) +/* 00F7C 809EBCBC 0C029468 */ jal SkelAnime_ChangeAnim + +/* 00F80 809EBCC0 E7A80018 */ swc1 $f8, 0x0018($sp) +/* 00F84 809EBCC4 10000004 */ beq $zero, $zero, .L809EBCD8 /* 00F88 809EBCC8 240800FF */ addiu $t0, $zero, 0x00FF ## $t0 = 000000FF .L809EBCCC: -/* 00F8C 809EBCCC 0C27ACCD */ jal func_809EB334 +/* 00F8C 809EBCCC 0C27ACCD */ jal func_809EB334 /* 00F90 809EBCD0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 00F94 809EBCD4 240800FF */ addiu $t0, $zero, 0x00FF ## $t0 = 000000FF .L809EBCD8: /* 00F98 809EBCD8 A2080258 */ sb $t0, 0x0258($s0) ## 00000258 -/* 00F9C 809EBCDC 8FBF002C */ lw $ra, 0x002C($sp) +/* 00F9C 809EBCDC 8FBF002C */ lw $ra, 0x002C($sp) .L809EBCE0: -/* 00FA0 809EBCE0 8FB00028 */ lw $s0, 0x0028($sp) +/* 00FA0 809EBCE0 8FB00028 */ lw $s0, 0x0028($sp) /* 00FA4 809EBCE4 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 -/* 00FA8 809EBCE8 03E00008 */ jr $ra +/* 00FA8 809EBCE8 03E00008 */ jr $ra /* 00FAC 809EBCEC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dh/func_809EBCF0.s b/asm/non_matchings/overlays/actors/ovl_En_Dh/func_809EBCF0.s index 1948706b42..5abd654e2b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dh/func_809EBCF0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dh/func_809EBCF0.s @@ -1,38 +1,38 @@ glabel func_809EBCF0 /* 00FB0 809EBCF0 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 00FB4 809EBCF4 AFB00018 */ sw $s0, 0x0018($sp) +/* 00FB4 809EBCF4 AFB00018 */ sw $s0, 0x0018($sp) /* 00FB8 809EBCF8 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00FBC 809EBCFC AFBF001C */ sw $ra, 0x001C($sp) +/* 00FBC 809EBCFC AFBF001C */ sw $ra, 0x001C($sp) /* 00FC0 809EBD00 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 00FC4 809EBD04 24A532BC */ addiu $a1, $a1, 0x32BC ## $a1 = 060032BC /* 00FC8 809EBD08 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 00FCC 809EBD0C 0C029490 */ jal func_800A5240 +/* 00FCC 809EBD0C 0C029490 */ jal SkelAnime_ChangeAnimTransitionStop /* 00FD0 809EBD10 3C06BF80 */ lui $a2, 0xBF80 ## $a2 = BF800000 /* 00FD4 809EBD14 8E180004 */ lw $t8, 0x0004($s0) ## 00000004 /* 00FD8 809EBD18 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 /* 00FDC 809EBD1C 2401FFFE */ addiu $at, $zero, 0xFFFE ## $at = FFFFFFFE /* 00FE0 809EBD20 240E0005 */ addiu $t6, $zero, 0x0005 ## $t6 = 00000005 /* 00FE4 809EBD24 240F012C */ addiu $t7, $zero, 0x012C ## $t7 = 0000012C -/* 00FE8 809EBD28 0301C824 */ and $t9, $t8, $at +/* 00FE8 809EBD28 0301C824 */ and $t9, $t8, $at /* 00FEC 809EBD2C A20E025B */ sb $t6, 0x025B($s0) ## 0000025B /* 00FF0 809EBD30 A60F025C */ sh $t7, 0x025C($s0) ## 0000025C /* 00FF4 809EBD34 AE190004 */ sw $t9, 0x0004($s0) ## 00000004 -/* 00FF8 809EBD38 0C03D6D6 */ jal func_800F5B58 +/* 00FF8 809EBD38 0C03D6D6 */ jal func_800F5B58 /* 00FFC 809EBD3C E6040068 */ swc1 $f4, 0x0068($s0) ## 00000068 /* 01000 809EBD40 2408000A */ addiu $t0, $zero, 0x000A ## $t0 = 0000000A /* 01004 809EBD44 A608001C */ sh $t0, 0x001C($s0) ## 0000001C /* 01008 809EBD48 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 0100C 809EBD4C 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 01010 809EBD50 240539AB */ addiu $a1, $zero, 0x39AB ## $a1 = 000039AB /* 01014 809EBD54 3C05809F */ lui $a1, %hi(func_809EBD78) ## $a1 = 809F0000 /* 01018 809EBD58 24A5BD78 */ addiu $a1, $a1, %lo(func_809EBD78) ## $a1 = 809EBD78 -/* 0101C 809EBD5C 0C27AB50 */ jal func_809EAD40 +/* 0101C 809EBD5C 0C27AB50 */ jal func_809EAD40 /* 01020 809EBD60 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01024 809EBD64 8FBF001C */ lw $ra, 0x001C($sp) -/* 01028 809EBD68 8FB00018 */ lw $s0, 0x0018($sp) +/* 01024 809EBD64 8FBF001C */ lw $ra, 0x001C($sp) +/* 01028 809EBD68 8FB00018 */ lw $s0, 0x0018($sp) /* 0102C 809EBD6C 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 01030 809EBD70 03E00008 */ jr $ra +/* 01030 809EBD70 03E00008 */ jr $ra /* 01034 809EBD74 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dh/func_809EBD78.s b/asm/non_matchings/overlays/actors/ovl_En_Dh/func_809EBD78.s index 06b035cb29..fcfe0c8e6a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dh/func_809EBD78.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dh/func_809EBD78.s @@ -1,91 +1,91 @@ glabel func_809EBD78 /* 01038 809EBD78 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 /* 0103C 809EBD7C 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 -/* 01040 809EBD80 AFBF0014 */ sw $ra, 0x0014($sp) +/* 01040 809EBD80 AFBF0014 */ sw $ra, 0x0014($sp) /* 01044 809EBD84 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 01048 809EBD88 AFA50024 */ sw $a1, 0x0024($sp) -/* 0104C 809EBD8C AFA4001C */ sw $a0, 0x001C($sp) +/* 01048 809EBD88 AFA50024 */ sw $a1, 0x0024($sp) +/* 0104C 809EBD8C AFA4001C */ sw $a0, 0x001C($sp) /* 01050 809EBD90 0C02927F */ jal SkelAnime_FrameUpdateMatrix - -/* 01054 809EBD94 AFA60020 */ sw $a2, 0x0020($sp) -/* 01058 809EBD98 8FA4001C */ lw $a0, 0x001C($sp) -/* 0105C 809EBD9C 14400005 */ bne $v0, $zero, .L809EBDB4 -/* 01060 809EBDA0 8FA60020 */ lw $a2, 0x0020($sp) + +/* 01054 809EBD94 AFA60020 */ sw $a2, 0x0020($sp) +/* 01058 809EBD98 8FA4001C */ lw $a0, 0x001C($sp) +/* 0105C 809EBD9C 14400005 */ bne $v0, $zero, .L809EBDB4 +/* 01060 809EBDA0 8FA60020 */ lw $a2, 0x0020($sp) /* 01064 809EBDA4 84CE025C */ lh $t6, 0x025C($a2) ## 0000025C /* 01068 809EBDA8 2401012C */ addiu $at, $zero, 0x012C ## $at = 0000012C -/* 0106C 809EBDAC 51C10021 */ beql $t6, $at, .L809EBE34 +/* 0106C 809EBDAC 51C10021 */ beql $t6, $at, .L809EBE34 /* 01070 809EBDB0 C4CA0164 */ lwc1 $f10, 0x0164($a2) ## 00000164 .L809EBDB4: /* 01074 809EBDB4 84C2025C */ lh $v0, 0x025C($a2) ## 0000025C /* 01078 809EBDB8 2401012C */ addiu $at, $zero, 0x012C ## $at = 0000012C /* 0107C 809EBDBC 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 01080 809EBDC0 14410005 */ bne $v0, $at, .L809EBDD8 +/* 01080 809EBDC0 14410005 */ bne $v0, $at, .L809EBDD8 /* 01084 809EBDC4 24A5375C */ addiu $a1, $a1, 0x375C ## $a1 = 0600375C -/* 01088 809EBDC8 0C0294BE */ jal func_800A52F8 -/* 0108C 809EBDCC AFA60020 */ sw $a2, 0x0020($sp) -/* 01090 809EBDD0 8FA60020 */ lw $a2, 0x0020($sp) +/* 01088 809EBDC8 0C0294BE */ jal SkelAnime_ChangeAnimDefaultRepeat +/* 0108C 809EBDCC AFA60020 */ sw $a2, 0x0020($sp) +/* 01090 809EBDD0 8FA60020 */ lw $a2, 0x0020($sp) /* 01094 809EBDD4 84C2025C */ lh $v0, 0x025C($a2) ## 0000025C .L809EBDD8: /* 01098 809EBDD8 244FFFFF */ addiu $t7, $v0, 0xFFFF ## $t7 = FFFFFFFF /* 0109C 809EBDDC A4CF025C */ sh $t7, 0x025C($a2) ## 0000025C /* 010A0 809EBDE0 84D8025C */ lh $t8, 0x025C($a2) ## 0000025C -/* 010A4 809EBDE4 2B010096 */ slti $at, $t8, 0x0096 -/* 010A8 809EBDE8 5020002C */ beql $at, $zero, .L809EBE9C -/* 010AC 809EBDEC 8FBF0014 */ lw $ra, 0x0014($sp) +/* 010A4 809EBDE4 2B010096 */ slti $at, $t8, 0x0096 +/* 010A8 809EBDE8 5020002C */ beql $at, $zero, .L809EBE9C +/* 010AC 809EBDEC 8FBF0014 */ lw $ra, 0x0014($sp) /* 010B0 809EBDF0 90C2025A */ lbu $v0, 0x025A($a2) ## 0000025A /* 010B4 809EBDF4 3C01809F */ lui $at, %hi(D_809EC6E8) ## $at = 809F0000 -/* 010B8 809EBDF8 10400009 */ beq $v0, $zero, .L809EBE20 +/* 010B8 809EBDF8 10400009 */ beq $v0, $zero, .L809EBE20 /* 010BC 809EBDFC 00000000 */ nop /* 010C0 809EBE00 C4C40054 */ lwc1 $f4, 0x0054($a2) ## 00000054 -/* 010C4 809EBE04 C426C6E8 */ lwc1 $f6, %lo(D_809EC6E8)($at) +/* 010C4 809EBE04 C426C6E8 */ lwc1 $f6, %lo(D_809EC6E8)($at) /* 010C8 809EBE08 2448FFFB */ addiu $t0, $v0, 0xFFFB ## $t0 = FFFFFFFB /* 010CC 809EBE0C A0C8025A */ sb $t0, 0x025A($a2) ## 0000025A -/* 010D0 809EBE10 46062201 */ sub.s $f8, $f4, $f6 +/* 010D0 809EBE10 46062201 */ sub.s $f8, $f4, $f6 /* 010D4 809EBE14 A0C800C8 */ sb $t0, 0x00C8($a2) ## 000000C8 -/* 010D8 809EBE18 1000001F */ beq $zero, $zero, .L809EBE98 +/* 010D8 809EBE18 1000001F */ beq $zero, $zero, .L809EBE98 /* 010DC 809EBE1C E4C80054 */ swc1 $f8, 0x0054($a2) ## 00000054 .L809EBE20: /* 010E0 809EBE20 0C00B55C */ jal Actor_Kill - + /* 010E4 809EBE24 00C02025 */ or $a0, $a2, $zero ## $a0 = 00000000 -/* 010E8 809EBE28 1000001C */ beq $zero, $zero, .L809EBE9C -/* 010EC 809EBE2C 8FBF0014 */ lw $ra, 0x0014($sp) +/* 010E8 809EBE28 1000001C */ beq $zero, $zero, .L809EBE9C +/* 010EC 809EBE2C 8FBF0014 */ lw $ra, 0x0014($sp) /* 010F0 809EBE30 C4CA0164 */ lwc1 $f10, 0x0164($a2) ## 00000164 .L809EBE34: /* 010F4 809EBE34 24010035 */ addiu $at, $zero, 0x0035 ## $at = 00000035 /* 010F8 809EBE38 00C02025 */ or $a0, $a2, $zero ## $a0 = 00000000 -/* 010FC 809EBE3C 4600540D */ trunc.w.s $f16, $f10 +/* 010FC 809EBE3C 4600540D */ trunc.w.s $f16, $f10 /* 01100 809EBE40 2405387A */ addiu $a1, $zero, 0x387A ## $a1 = 0000387A -/* 01104 809EBE44 44028000 */ mfc1 $v0, $f16 +/* 01104 809EBE44 44028000 */ mfc1 $v0, $f16 /* 01108 809EBE48 00000000 */ nop -/* 0110C 809EBE4C 10410005 */ beq $v0, $at, .L809EBE64 +/* 0110C 809EBE4C 10410005 */ beq $v0, $at, .L809EBE64 /* 01110 809EBE50 24010038 */ addiu $at, $zero, 0x0038 ## $at = 00000038 -/* 01114 809EBE54 10410003 */ beq $v0, $at, .L809EBE64 +/* 01114 809EBE54 10410003 */ beq $v0, $at, .L809EBE64 /* 01118 809EBE58 2401003D */ addiu $at, $zero, 0x003D ## $at = 0000003D -/* 0111C 809EBE5C 54410009 */ bnel $v0, $at, .L809EBE84 +/* 0111C 809EBE5C 54410009 */ bnel $v0, $at, .L809EBE84 /* 01120 809EBE60 2401003D */ addiu $at, $zero, 0x003D ## $at = 0000003D .L809EBE64: /* 01124 809EBE64 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 01128 809EBE68 AFA60020 */ sw $a2, 0x0020($sp) -/* 0112C 809EBE6C 8FA60020 */ lw $a2, 0x0020($sp) + +/* 01128 809EBE68 AFA60020 */ sw $a2, 0x0020($sp) +/* 0112C 809EBE6C 8FA60020 */ lw $a2, 0x0020($sp) /* 01130 809EBE70 C4D20164 */ lwc1 $f18, 0x0164($a2) ## 00000164 -/* 01134 809EBE74 4600910D */ trunc.w.s $f4, $f18 -/* 01138 809EBE78 44022000 */ mfc1 $v0, $f4 +/* 01134 809EBE74 4600910D */ trunc.w.s $f4, $f18 +/* 01138 809EBE78 44022000 */ mfc1 $v0, $f4 /* 0113C 809EBE7C 00000000 */ nop /* 01140 809EBE80 2401003D */ addiu $at, $zero, 0x003D ## $at = 0000003D .L809EBE84: -/* 01144 809EBE84 14410004 */ bne $v0, $at, .L809EBE98 -/* 01148 809EBE88 8FA40024 */ lw $a0, 0x0024($sp) +/* 01144 809EBE84 14410004 */ bne $v0, $at, .L809EBE98 +/* 01148 809EBE88 8FA40024 */ lw $a0, 0x0024($sp) /* 0114C 809EBE8C 24851C24 */ addiu $a1, $a0, 0x1C24 ## $a1 = 00001C24 /* 01150 809EBE90 0C00CDD2 */ jal Actor_ChangeType - + /* 01154 809EBE94 24070006 */ addiu $a3, $zero, 0x0006 ## $a3 = 00000006 .L809EBE98: -/* 01158 809EBE98 8FBF0014 */ lw $ra, 0x0014($sp) +/* 01158 809EBE98 8FBF0014 */ lw $ra, 0x0014($sp) .L809EBE9C: /* 0115C 809EBE9C 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 01160 809EBEA0 03E00008 */ jr $ra +/* 01160 809EBEA0 03E00008 */ jr $ra /* 01164 809EBEA4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dha/EnDha_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Dha/EnDha_Draw.s index 83e04ef297..f6483f80c4 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dha/EnDha_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dha/EnDha_Draw.s @@ -1,11 +1,11 @@ glabel EnDha_Draw /* 00D50 809ED5D0 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 00D54 809ED5D4 AFBF0024 */ sw $ra, 0x0024($sp) -/* 00D58 809ED5D8 AFA40028 */ sw $a0, 0x0028($sp) -/* 00D5C 809ED5DC AFA5002C */ sw $a1, 0x002C($sp) -/* 00D60 809ED5E0 0C024F46 */ jal func_80093D18 +/* 00D54 809ED5D4 AFBF0024 */ sw $ra, 0x0024($sp) +/* 00D58 809ED5D8 AFA40028 */ sw $a0, 0x0028($sp) +/* 00D5C 809ED5DC AFA5002C */ sw $a1, 0x002C($sp) +/* 00D60 809ED5E0 0C024F46 */ jal func_80093D18 /* 00D64 809ED5E4 8CA40000 */ lw $a0, 0x0000($a1) ## 00000000 -/* 00D68 809ED5E8 8FA20028 */ lw $v0, 0x0028($sp) +/* 00D68 809ED5E8 8FA20028 */ lw $v0, 0x0028($sp) /* 00D6C 809ED5EC 3C0F809F */ lui $t7, %hi(func_809ED414) ## $t7 = 809F0000 /* 00D70 809ED5F0 3C18809F */ lui $t8, %hi(func_809ED4B8) ## $t8 = 809F0000 /* 00D74 809ED5F4 8C450150 */ lw $a1, 0x0150($v0) ## 00000150 @@ -13,14 +13,14 @@ glabel EnDha_Draw /* 00D7C 809ED5FC 9047014E */ lbu $a3, 0x014E($v0) ## 0000014E /* 00D80 809ED600 2718D4B8 */ addiu $t8, $t8, %lo(func_809ED4B8) ## $t8 = 809ED4B8 /* 00D84 809ED604 25EFD414 */ addiu $t7, $t7, %lo(func_809ED414) ## $t7 = 809ED414 -/* 00D88 809ED608 AFAF0010 */ sw $t7, 0x0010($sp) -/* 00D8C 809ED60C AFB80014 */ sw $t8, 0x0014($sp) -/* 00D90 809ED610 8FA4002C */ lw $a0, 0x002C($sp) -/* 00D94 809ED614 0C0286B2 */ jal func_800A1AC8 -/* 00D98 809ED618 AFA20018 */ sw $v0, 0x0018($sp) -/* 00D9C 809ED61C 8FBF0024 */ lw $ra, 0x0024($sp) +/* 00D88 809ED608 AFAF0010 */ sw $t7, 0x0010($sp) +/* 00D8C 809ED60C AFB80014 */ sw $t8, 0x0014($sp) +/* 00D90 809ED610 8FA4002C */ lw $a0, 0x002C($sp) +/* 00D94 809ED614 0C0286B2 */ jal SkelAnime_DrawSV +/* 00D98 809ED618 AFA20018 */ sw $v0, 0x0018($sp) +/* 00D9C 809ED61C 8FBF0024 */ lw $ra, 0x0024($sp) /* 00DA0 809ED620 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 00DA4 809ED624 03E00008 */ jr $ra +/* 00DA4 809ED624 03E00008 */ jr $ra /* 00DA8 809ED628 00000000 */ nop /* 00DAC 809ED62C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dha/EnDha_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Dha/EnDha_Init.s index 35af0be3a9..56219dd1e2 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dha/EnDha_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dha/EnDha_Init.s @@ -1,12 +1,12 @@ glabel EnDha_Init /* 00008 809EC888 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 0000C 809EC88C AFA5003C */ sw $a1, 0x003C($sp) -/* 00010 809EC890 AFBF002C */ sw $ra, 0x002C($sp) -/* 00014 809EC894 AFB00028 */ sw $s0, 0x0028($sp) +/* 0000C 809EC88C AFA5003C */ sw $a1, 0x003C($sp) +/* 00010 809EC890 AFBF002C */ sw $ra, 0x002C($sp) +/* 00014 809EC894 AFB00028 */ sw $s0, 0x0028($sp) /* 00018 809EC898 3C05809F */ lui $a1, %hi(D_809ED734) ## $a1 = 809F0000 /* 0001C 809EC89C 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 00020 809EC8A0 0C01E037 */ jal Actor_ProcessInitChain - + /* 00024 809EC8A4 24A5D734 */ addiu $a1, $a1, %lo(D_809ED734) ## $a1 = 809ED734 /* 00028 809EC8A8 3C0E809F */ lui $t6, %hi(D_809ED650) ## $t6 = 809F0000 /* 0002C 809EC8AC 25CED650 */ addiu $t6, $t6, %lo(D_809ED650) ## $t6 = 809ED650 @@ -16,20 +16,20 @@ glabel EnDha_Init /* 0003C 809EC8BC 260F0190 */ addiu $t7, $s0, 0x0190 ## $t7 = 00000190 /* 00040 809EC8C0 261801A8 */ addiu $t8, $s0, 0x01A8 ## $t8 = 000001A8 /* 00044 809EC8C4 24190004 */ addiu $t9, $zero, 0x0004 ## $t9 = 00000004 -/* 00048 809EC8C8 AFB90018 */ sw $t9, 0x0018($sp) -/* 0004C 809EC8CC AFB80014 */ sw $t8, 0x0014($sp) -/* 00050 809EC8D0 AFAF0010 */ sw $t7, 0x0010($sp) +/* 00048 809EC8C8 AFB90018 */ sw $t9, 0x0018($sp) +/* 0004C 809EC8CC AFB80014 */ sw $t8, 0x0014($sp) +/* 00050 809EC8D0 AFAF0010 */ sw $t7, 0x0010($sp) /* 00054 809EC8D4 24E715B0 */ addiu $a3, $a3, 0x15B0 ## $a3 = 060015B0 /* 00058 809EC8D8 24C60BD8 */ addiu $a2, $a2, 0x0BD8 ## $a2 = 06000BD8 -/* 0005C 809EC8DC 8FA4003C */ lw $a0, 0x003C($sp) -/* 00060 809EC8E0 0C0291BE */ jal func_800A46F8 +/* 0005C 809EC8DC 8FA4003C */ lw $a0, 0x003C($sp) +/* 00060 809EC8E0 0C0291BE */ jal SkelAnime_InitSV /* 00064 809EC8E4 2605014C */ addiu $a1, $s0, 0x014C ## $a1 = 0000014C /* 00068 809EC8E8 3C068003 */ lui $a2, 0x8003 ## $a2 = 80030000 /* 0006C 809EC8EC 24C6B8C4 */ addiu $a2, $a2, 0xB8C4 ## $a2 = 8002B8C4 /* 00070 809EC8F0 260400B4 */ addiu $a0, $s0, 0x00B4 ## $a0 = 000000B4 /* 00074 809EC8F4 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 /* 00078 809EC8F8 0C00AC78 */ jal ActorShape_Init - + /* 0007C 809EC8FC 3C0742B4 */ lui $a3, 0x42B4 ## $a3 = 42B40000 /* 00080 809EC900 8E080028 */ lw $t0, 0x0028($s0) ## 00000028 /* 00084 809EC904 3C014248 */ lui $at, 0x4248 ## $at = 42480000 @@ -39,7 +39,7 @@ glabel EnDha_Init /* 00094 809EC914 44813000 */ mtc1 $at, $f6 ## $f6 = 50.00 /* 00098 809EC918 AE090038 */ sw $t1, 0x0038($s0) ## 00000038 /* 0009C 809EC91C 8E09002C */ lw $t1, 0x002C($s0) ## 0000002C -/* 000A0 809EC920 46062200 */ add.s $f8, $f4, $f6 +/* 000A0 809EC920 46062200 */ add.s $f8, $f4, $f6 /* 000A4 809EC924 240A00FE */ addiu $t2, $zero, 0x00FE ## $t2 = 000000FE /* 000A8 809EC928 240B0008 */ addiu $t3, $zero, 0x0008 ## $t3 = 00000008 /* 000AC 809EC92C 240CC000 */ addiu $t4, $zero, 0xC000 ## $t4 = FFFFC000 @@ -49,27 +49,27 @@ glabel EnDha_Init /* 000BC 809EC93C A60C01CE */ sh $t4, 0x01CE($s0) ## 000001CE /* 000C0 809EC940 26050200 */ addiu $a1, $s0, 0x0200 ## $a1 = 00000200 /* 000C4 809EC944 AE090040 */ sw $t1, 0x0040($s0) ## 00000040 -/* 000C8 809EC948 AFA50030 */ sw $a1, 0x0030($sp) -/* 000CC 809EC94C 0C016EFE */ jal func_8005BBF8 -/* 000D0 809EC950 8FA4003C */ lw $a0, 0x003C($sp) +/* 000C8 809EC948 AFA50030 */ sw $a1, 0x0030($sp) +/* 000CC 809EC94C 0C016EFE */ jal func_8005BBF8 +/* 000D0 809EC950 8FA4003C */ lw $a0, 0x003C($sp) /* 000D4 809EC954 3C07809F */ lui $a3, %hi(D_809ED724) ## $a3 = 809F0000 /* 000D8 809EC958 260D0220 */ addiu $t5, $s0, 0x0220 ## $t5 = 00000220 -/* 000DC 809EC95C 8FA50030 */ lw $a1, 0x0030($sp) -/* 000E0 809EC960 AFAD0010 */ sw $t5, 0x0010($sp) +/* 000DC 809EC95C 8FA50030 */ lw $a1, 0x0030($sp) +/* 000E0 809EC960 AFAD0010 */ sw $t5, 0x0010($sp) /* 000E4 809EC964 24E7D724 */ addiu $a3, $a3, %lo(D_809ED724) ## $a3 = 809ED724 -/* 000E8 809EC968 8FA4003C */ lw $a0, 0x003C($sp) -/* 000EC 809EC96C 0C017014 */ jal func_8005C050 +/* 000E8 809EC968 8FA4003C */ lw $a0, 0x003C($sp) +/* 000EC 809EC96C 0C017014 */ jal func_8005C050 /* 000F0 809EC970 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 000F4 809EC974 8E0E0004 */ lw $t6, 0x0004($s0) ## 00000004 /* 000F8 809EC978 2401FFFE */ addiu $at, $zero, 0xFFFE ## $at = FFFFFFFE /* 000FC 809EC97C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00100 809EC980 01C17824 */ and $t7, $t6, $at -/* 00104 809EC984 0C27B272 */ jal func_809EC9C8 +/* 00100 809EC980 01C17824 */ and $t7, $t6, $at +/* 00104 809EC984 0C27B272 */ jal func_809EC9C8 /* 00108 809EC988 AE0F0004 */ sw $t7, 0x0004($s0) ## 00000004 -/* 0010C 809EC98C 8FBF002C */ lw $ra, 0x002C($sp) -/* 00110 809EC990 8FB00028 */ lw $s0, 0x0028($sp) +/* 0010C 809EC98C 8FBF002C */ lw $ra, 0x002C($sp) +/* 00110 809EC990 8FB00028 */ lw $s0, 0x0028($sp) /* 00114 809EC994 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 -/* 00118 809EC998 03E00008 */ jr $ra +/* 00118 809EC998 03E00008 */ jr $ra /* 0011C 809EC99C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dha/func_809EC9C8.s b/asm/non_matchings/overlays/actors/ovl_En_Dha/func_809EC9C8.s index 2bb0cf756a..2fc8dfae1b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dha/func_809EC9C8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dha/func_809EC9C8.s @@ -1,13 +1,13 @@ glabel func_809EC9C8 /* 00148 809EC9C8 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 0014C 809EC9CC AFBF0014 */ sw $ra, 0x0014($sp) +/* 0014C 809EC9CC AFBF0014 */ sw $ra, 0x0014($sp) /* 00150 809EC9D0 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 /* 00154 809EC9D4 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 00158 809EC9D8 24A515B0 */ addiu $a1, $a1, 0x15B0 ## $a1 = 060015B0 -/* 0015C 809EC9DC AFA60018 */ sw $a2, 0x0018($sp) -/* 00160 809EC9E0 0C0294BE */ jal func_800A52F8 +/* 0015C 809EC9DC AFA60018 */ sw $a2, 0x0018($sp) +/* 00160 809EC9E0 0C0294BE */ jal SkelAnime_ChangeAnimDefaultRepeat /* 00164 809EC9E4 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 00168 809EC9E8 8FA60018 */ lw $a2, 0x0018($sp) +/* 00168 809EC9E8 8FA60018 */ lw $a2, 0x0018($sp) /* 0016C 809EC9EC 0C03F66B */ jal Math_Rand_ZeroOne ## Rand.Next() float /* 00170 809EC9F0 A0C001C0 */ sb $zero, 0x01C0($a2) ## 000001C0 @@ -15,24 +15,24 @@ glabel func_809EC9C8 /* 00178 809EC9F8 44812000 */ mtc1 $at, $f4 ## $f4 = 10.00 /* 0017C 809EC9FC 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 /* 00180 809ECA00 44814000 */ mtc1 $at, $f8 ## $f8 = 5.00 -/* 00184 809ECA04 46040182 */ mul.s $f6, $f0, $f4 -/* 00188 809ECA08 8FA40018 */ lw $a0, 0x0018($sp) +/* 00184 809ECA04 46040182 */ mul.s $f6, $f0, $f4 +/* 00188 809ECA08 8FA40018 */ lw $a0, 0x0018($sp) /* 0018C 809ECA0C 44809000 */ mtc1 $zero, $f18 ## $f18 = 0.00 /* 00190 809ECA10 24190001 */ addiu $t9, $zero, 0x0001 ## $t9 = 00000001 /* 00194 809ECA14 849800B6 */ lh $t8, 0x00B6($a0) ## 000000B6 /* 00198 809ECA18 3C05809F */ lui $a1, %hi(func_809ECA50) ## $a1 = 809F0000 /* 0019C 809ECA1C 24A5CA50 */ addiu $a1, $a1, %lo(func_809ECA50) ## $a1 = 809ECA50 -/* 001A0 809ECA20 46083280 */ add.s $f10, $f6, $f8 +/* 001A0 809ECA20 46083280 */ add.s $f10, $f6, $f8 /* 001A4 809ECA24 A4990018 */ sh $t9, 0x0018($a0) ## 00000018 /* 001A8 809ECA28 E4920068 */ swc1 $f18, 0x0068($a0) ## 00000068 /* 001AC 809ECA2C A4980032 */ sh $t8, 0x0032($a0) ## 00000032 -/* 001B0 809ECA30 4600540D */ trunc.w.s $f16, $f10 -/* 001B4 809ECA34 440F8000 */ mfc1 $t7, $f16 -/* 001B8 809ECA38 0C27B220 */ jal func_809EC880 +/* 001B0 809ECA30 4600540D */ trunc.w.s $f16, $f10 +/* 001B4 809ECA34 440F8000 */ mfc1 $t7, $f16 +/* 001B8 809ECA38 0C27B220 */ jal func_809EC880 /* 001BC 809ECA3C A48F01C8 */ sh $t7, 0x01C8($a0) ## 000001C8 -/* 001C0 809ECA40 8FBF0014 */ lw $ra, 0x0014($sp) +/* 001C0 809ECA40 8FBF0014 */ lw $ra, 0x0014($sp) /* 001C4 809ECA44 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 001C8 809ECA48 03E00008 */ jr $ra +/* 001C8 809ECA48 03E00008 */ jr $ra /* 001CC 809ECA4C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dha/func_809ECA50.s b/asm/non_matchings/overlays/actors/ovl_En_Dha/func_809ECA50.s index a2c65a2297..b03252ea6f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dha/func_809ECA50.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dha/func_809ECA50.s @@ -1,9 +1,9 @@ glabel func_809ECA50 /* 001D0 809ECA50 27BDFF78 */ addiu $sp, $sp, 0xFF78 ## $sp = FFFFFF78 /* 001D4 809ECA54 3C0F809F */ lui $t7, %hi(D_809ED740) ## $t7 = 809F0000 -/* 001D8 809ECA58 AFBF0024 */ sw $ra, 0x0024($sp) -/* 001DC 809ECA5C AFB00020 */ sw $s0, 0x0020($sp) -/* 001E0 809ECA60 AFA5008C */ sw $a1, 0x008C($sp) +/* 001D8 809ECA58 AFBF0024 */ sw $ra, 0x0024($sp) +/* 001DC 809ECA5C AFB00020 */ sw $s0, 0x0020($sp) +/* 001E0 809ECA60 AFA5008C */ sw $a1, 0x008C($sp) /* 001E4 809ECA64 25EFD740 */ addiu $t7, $t7, %lo(D_809ED740) ## $t7 = 809ED740 /* 001E8 809ECA68 8DF90000 */ lw $t9, 0x0000($t7) ## 809ED740 /* 001EC 809ECA6C 27AE007C */ addiu $t6, $sp, 0x007C ## $t6 = FFFFFFF4 @@ -31,7 +31,7 @@ glabel func_809ECA50 /* 00244 809ECAC4 AD8E0004 */ sw $t6, 0x0004($t4) ## FFFFFFE0 /* 00248 809ECAC8 27B9004C */ addiu $t9, $sp, 0x004C ## $t9 = FFFFFFC4 /* 0024C 809ECACC AD8F0008 */ sw $t7, 0x0008($t4) ## FFFFFFE4 -/* 00250 809ECAD0 8FB8008C */ lw $t8, 0x008C($sp) +/* 00250 809ECAD0 8FB8008C */ lw $t8, 0x008C($sp) /* 00254 809ECAD4 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 00258 809ECAD8 8F061C44 */ lw $a2, 0x1C44($t8) ## 00001C44 /* 0025C 809ECADC 8CC90024 */ lw $t1, 0x0024($a2) ## 00000024 @@ -43,52 +43,52 @@ glabel func_809ECA50 /* 00274 809ECAF4 84C400B6 */ lh $a0, 0x00B6($a2) ## 000000B6 /* 00278 809ECAF8 0C01DE1C */ jal Math_Sins ## sins? -/* 0027C 809ECAFC AFA60060 */ sw $a2, 0x0060($sp) +/* 0027C 809ECAFC AFA60060 */ sw $a2, 0x0060($sp) /* 00280 809ECB00 3C01C0A0 */ lui $at, 0xC0A0 ## $at = C0A00000 /* 00284 809ECB04 44813000 */ mtc1 $at, $f6 ## $f6 = -5.00 -/* 00288 809ECB08 C7A4004C */ lwc1 $f4, 0x004C($sp) -/* 0028C 809ECB0C 8FA60060 */ lw $a2, 0x0060($sp) -/* 00290 809ECB10 46060202 */ mul.s $f8, $f0, $f6 -/* 00294 809ECB14 46082280 */ add.s $f10, $f4, $f8 -/* 00298 809ECB18 E7AA004C */ swc1 $f10, 0x004C($sp) +/* 00288 809ECB08 C7A4004C */ lwc1 $f4, 0x004C($sp) +/* 0028C 809ECB0C 8FA60060 */ lw $a2, 0x0060($sp) +/* 00290 809ECB10 46060202 */ mul.s $f8, $f0, $f6 +/* 00294 809ECB14 46082280 */ add.s $f10, $f4, $f8 +/* 00298 809ECB18 E7AA004C */ swc1 $f10, 0x004C($sp) /* 0029C 809ECB1C 0C01DE0D */ jal Math_Coss ## coss? /* 002A0 809ECB20 84C400B6 */ lh $a0, 0x00B6($a2) ## 000000B6 /* 002A4 809ECB24 3C01C0A0 */ lui $at, 0xC0A0 ## $at = C0A00000 /* 002A8 809ECB28 44819000 */ mtc1 $at, $f18 ## $f18 = -5.00 -/* 002AC 809ECB2C C7B00054 */ lwc1 $f16, 0x0054($sp) +/* 002AC 809ECB2C C7B00054 */ lwc1 $f16, 0x0054($sp) /* 002B0 809ECB30 3C0A8016 */ lui $t2, 0x8016 ## $t2 = 80160000 -/* 002B4 809ECB34 46120182 */ mul.s $f6, $f0, $f18 +/* 002B4 809ECB34 46120182 */ mul.s $f6, $f0, $f18 /* 002B8 809ECB38 8D4AE664 */ lw $t2, -0x199C($t2) ## 8015E664 -/* 002BC 809ECB3C 8FA60060 */ lw $a2, 0x0060($sp) -/* 002C0 809ECB40 C7A80050 */ lwc1 $f8, 0x0050($sp) +/* 002BC 809ECB3C 8FA60060 */ lw $a2, 0x0060($sp) +/* 002C0 809ECB40 C7A80050 */ lwc1 $f8, 0x0050($sp) /* 002C4 809ECB44 3C014260 */ lui $at, 0x4260 ## $at = 42600000 /* 002C8 809ECB48 240B0001 */ addiu $t3, $zero, 0x0001 ## $t3 = 00000001 /* 002CC 809ECB4C 260401D0 */ addiu $a0, $s0, 0x01D0 ## $a0 = 000001D0 -/* 002D0 809ECB50 46068100 */ add.s $f4, $f16, $f6 -/* 002D4 809ECB54 C7B00050 */ lwc1 $f16, 0x0050($sp) +/* 002D0 809ECB50 46068100 */ add.s $f4, $f16, $f6 +/* 002D4 809ECB54 C7B00050 */ lwc1 $f16, 0x0050($sp) /* 002D8 809ECB58 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 002DC 809ECB5C 11400007 */ beq $t2, $zero, .L809ECB7C -/* 002E0 809ECB60 E7A40054 */ swc1 $f4, 0x0054($sp) +/* 002DC 809ECB5C 11400007 */ beq $t2, $zero, .L809ECB7C +/* 002E0 809ECB60 E7A40054 */ swc1 $f4, 0x0054($sp) /* 002E4 809ECB64 3C014218 */ lui $at, 0x4218 ## $at = 42180000 /* 002E8 809ECB68 44815000 */ mtc1 $at, $f10 ## $f10 = 38.00 /* 002EC 809ECB6C 00000000 */ nop -/* 002F0 809ECB70 460A4480 */ add.s $f18, $f8, $f10 -/* 002F4 809ECB74 10000005 */ beq $zero, $zero, .L809ECB8C -/* 002F8 809ECB78 E7B20050 */ swc1 $f18, 0x0050($sp) +/* 002F0 809ECB70 460A4480 */ add.s $f18, $f8, $f10 +/* 002F4 809ECB74 10000005 */ beq $zero, $zero, .L809ECB8C +/* 002F8 809ECB78 E7B20050 */ swc1 $f18, 0x0050($sp) .L809ECB7C: /* 002FC 809ECB7C 44813000 */ mtc1 $at, $f6 ## $f6 = 38.00 /* 00300 809ECB80 00000000 */ nop -/* 00304 809ECB84 46068100 */ add.s $f4, $f16, $f6 -/* 00308 809ECB88 E7A40050 */ swc1 $f4, 0x0050($sp) +/* 00304 809ECB84 46068100 */ add.s $f4, $f16, $f6 +/* 00308 809ECB88 E7A40050 */ swc1 $f4, 0x0050($sp) .L809ECB8C: /* 0030C 809ECB8C 3C0142C8 */ lui $at, 0x42C8 ## $at = 42C80000 /* 00310 809ECB90 44814000 */ mtc1 $at, $f8 ## $f8 = 100.00 /* 00314 809ECB94 C60A0090 */ lwc1 $f10, 0x0090($s0) ## 00000090 /* 00318 809ECB98 240703E8 */ addiu $a3, $zero, 0x03E8 ## $a3 = 000003E8 -/* 0031C 809ECB9C 4608503E */ c.le.s $f10, $f8 +/* 0031C 809ECB9C 4608503E */ c.le.s $f10, $f8 /* 00320 809ECBA0 00000000 */ nop -/* 00324 809ECBA4 450200D2 */ bc1fl .L809ECEF0 +/* 00324 809ECBA4 450200D2 */ bc1fl .L809ECEF0 /* 00328 809ECBA8 8CC20680 */ lw $v0, 0x0680($a2) ## 00000680 /* 0032C 809ECBAC A60001D2 */ sh $zero, 0x01D2($s0) ## 000001D2 /* 00330 809ECBB0 860201D2 */ lh $v0, 0x01D2($s0) ## 000001D2 @@ -96,41 +96,41 @@ glabel func_809ECA50 /* 00338 809ECBB8 27A4004C */ addiu $a0, $sp, 0x004C ## $a0 = FFFFFFC4 /* 0033C 809ECBBC A60201D4 */ sh $v0, 0x01D4($s0) ## 000001D4 /* 00340 809ECBC0 A60201D6 */ sh $v0, 0x01D6($s0) ## 000001D6 -/* 00344 809ECBC4 AFA60060 */ sw $a2, 0x0060($sp) +/* 00344 809ECBC4 AFA60060 */ sw $a2, 0x0060($sp) /* 00348 809ECBC8 0C01DFE4 */ jal Math_Vec3f_DistXYZ - -/* 0034C 809ECBCC AFA50030 */ sw $a1, 0x0030($sp) + +/* 0034C 809ECBCC AFA50030 */ sw $a1, 0x0030($sp) /* 00350 809ECBD0 3C014140 */ lui $at, 0x4140 ## $at = 41400000 /* 00354 809ECBD4 44819000 */ mtc1 $at, $f18 ## $f18 = 12.00 -/* 00358 809ECBD8 8FA60060 */ lw $a2, 0x0060($sp) -/* 0035C 809ECBDC 4612003E */ c.le.s $f0, $f18 +/* 00358 809ECBD8 8FA60060 */ lw $a2, 0x0060($sp) +/* 0035C 809ECBDC 4612003E */ c.le.s $f0, $f18 /* 00360 809ECBE0 00000000 */ nop -/* 00364 809ECBE4 4502004B */ bc1fl .L809ECD14 +/* 00364 809ECBE4 4502004B */ bc1fl .L809ECD14 /* 00368 809ECBE8 8CC20680 */ lw $v0, 0x0680($a2) ## 00000680 /* 0036C 809ECBEC 920B01CC */ lbu $t3, 0x01CC($s0) ## 000001CC -/* 00370 809ECBF0 8FA4008C */ lw $a0, 0x008C($sp) +/* 00370 809ECBF0 8FA4008C */ lw $a0, 0x008C($sp) /* 00374 809ECBF4 3C190001 */ lui $t9, 0x0001 ## $t9 = 00010000 -/* 00378 809ECBF8 15600013 */ bne $t3, $zero, .L809ECC48 -/* 0037C 809ECBFC 0324C821 */ addu $t9, $t9, $a0 +/* 00378 809ECBF8 15600013 */ bne $t3, $zero, .L809ECC48 +/* 0037C 809ECBFC 0324C821 */ addu $t9, $t9, $a0 /* 00380 809ECC00 8F391D4C */ lw $t9, 0x1D4C($t9) ## 00011D4C /* 00384 809ECC04 00C02825 */ or $a1, $a2, $zero ## $a1 = 00000000 -/* 00388 809ECC08 0320F809 */ jalr $ra, $t9 +/* 00388 809ECC08 0320F809 */ jalr $ra, $t9 /* 0038C 809ECC0C 00000000 */ nop -/* 00390 809ECC10 1040002B */ beq $v0, $zero, .L809ECCC0 +/* 00390 809ECC10 1040002B */ beq $v0, $zero, .L809ECCC0 /* 00394 809ECC14 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 00398 809ECC18 920C01CC */ lbu $t4, 0x01CC($s0) ## 000001CC /* 0039C 809ECC1C 8E020118 */ lw $v0, 0x0118($s0) ## 00000118 /* 003A0 809ECC20 A60001CA */ sh $zero, 0x01CA($s0) ## 000001CA /* 003A4 809ECC24 258D0001 */ addiu $t5, $t4, 0x0001 ## $t5 = 00000001 -/* 003A8 809ECC28 10400003 */ beq $v0, $zero, .L809ECC38 +/* 003A8 809ECC28 10400003 */ beq $v0, $zero, .L809ECC38 /* 003AC 809ECC2C A20D01CC */ sb $t5, 0x01CC($s0) ## 000001CC /* 003B0 809ECC30 240E0001 */ addiu $t6, $zero, 0x0001 ## $t6 = 00000001 /* 003B4 809ECC34 A44E001C */ sh $t6, 0x001C($v0) ## 0000001C .L809ECC38: /* 003B8 809ECC38 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 003BC 809ECC3C 24053902 */ addiu $a1, $zero, 0x3902 ## $a1 = 00003902 -/* 003C0 809ECC40 10000020 */ beq $zero, $zero, .L809ECCC4 +/* 003C0 809ECC40 10000020 */ beq $zero, $zero, .L809ECCC4 /* 003C4 809ECC44 260401E8 */ addiu $a0, $s0, 0x01E8 ## $a0 = 000001E8 .L809ECC48: /* 003C8 809ECC48 860F01CA */ lh $t7, 0x01CA($s0) ## 000001CA @@ -139,65 +139,65 @@ glabel func_809ECA50 /* 003D4 809ECC54 860401CA */ lh $a0, 0x01CA($s0) ## 000001CA /* 003D8 809ECC58 0C01DE1C */ jal Math_Sins ## sins? -/* 003DC 809ECC5C AFA60060 */ sw $a2, 0x0060($sp) +/* 003DC 809ECC5C AFA60060 */ sw $a2, 0x0060($sp) /* 003E0 809ECC60 3C01809F */ lui $at, %hi(D_809ED780) ## $at = 809F0000 -/* 003E4 809ECC64 C430D780 */ lwc1 $f16, %lo(D_809ED780)($at) -/* 003E8 809ECC68 8FA60060 */ lw $a2, 0x0060($sp) +/* 003E4 809ECC64 C430D780 */ lwc1 $f16, %lo(D_809ED780)($at) +/* 003E8 809ECC68 8FA60060 */ lw $a2, 0x0060($sp) /* 003EC 809ECC6C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 003F0 809ECC70 46100182 */ mul.s $f6, $f0, $f16 -/* 003F4 809ECC74 4600310D */ trunc.w.s $f4, $f6 -/* 003F8 809ECC78 44092000 */ mfc1 $t1, $f4 +/* 003F0 809ECC70 46100182 */ mul.s $f6, $f0, $f16 +/* 003F4 809ECC74 4600310D */ trunc.w.s $f4, $f6 +/* 003F8 809ECC78 44092000 */ mfc1 $t1, $f4 /* 003FC 809ECC7C 00000000 */ nop /* 00400 809ECC80 A60901D2 */ sh $t1, 0x01D2($s0) ## 000001D2 /* 00404 809ECC84 8CCA0680 */ lw $t2, 0x0680($a2) ## 00000680 /* 00408 809ECC88 314B0080 */ andi $t3, $t2, 0x0080 ## $t3 = 00000000 -/* 0040C 809ECC8C 55600006 */ bnel $t3, $zero, .L809ECCA8 +/* 0040C 809ECC8C 55600006 */ bnel $t3, $zero, .L809ECCA8 /* 00410 809ECC90 861901CA */ lh $t9, 0x01CA($s0) ## 000001CA -/* 00414 809ECC94 0C27B3D8 */ jal func_809ECF60 +/* 00414 809ECC94 0C27B3D8 */ jal func_809ECF60 /* 00418 809ECC98 A20001CC */ sb $zero, 0x01CC($s0) ## 000001CC -/* 0041C 809ECC9C 100000AC */ beq $zero, $zero, .L809ECF50 -/* 00420 809ECCA0 8FBF0024 */ lw $ra, 0x0024($sp) +/* 0041C 809ECC9C 100000AC */ beq $zero, $zero, .L809ECF50 +/* 00420 809ECCA0 8FBF0024 */ lw $ra, 0x0024($sp) /* 00424 809ECCA4 861901CA */ lh $t9, 0x01CA($s0) ## 000001CA .L809ECCA8: /* 00428 809ECCA8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0042C 809ECCAC 2B219195 */ slti $at, $t9, 0x9195 -/* 00430 809ECCB0 50200004 */ beql $at, $zero, .L809ECCC4 +/* 0042C 809ECCAC 2B219195 */ slti $at, $t9, 0x9195 +/* 00430 809ECCB0 50200004 */ beql $at, $zero, .L809ECCC4 /* 00434 809ECCB4 260401E8 */ addiu $a0, $s0, 0x01E8 ## $a0 = 000001E8 /* 00438 809ECCB8 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 0043C 809ECCBC 24053902 */ addiu $a1, $zero, 0x3902 ## $a1 = 00003902 .L809ECCC0: /* 00440 809ECCC0 260401E8 */ addiu $a0, $s0, 0x01E8 ## $a0 = 000001E8 .L809ECCC4: /* 00444 809ECCC4 27A5004C */ addiu $a1, $sp, 0x004C ## $a1 = FFFFFFC4 /* 00448 809ECCC8 260601D4 */ addiu $a2, $s0, 0x01D4 ## $a2 = 000001D4 -/* 0044C 809ECCCC 0C00D611 */ jal func_80035844 +/* 0044C 809ECCCC 0C00D611 */ jal func_80035844 /* 00450 809ECCD0 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 /* 00454 809ECCD4 860C01D6 */ lh $t4, 0x01D6($s0) ## 000001D6 /* 00458 809ECCD8 860D00B6 */ lh $t5, 0x00B6($s0) ## 000000B6 /* 0045C 809ECCDC 860801D4 */ lh $t0, 0x01D4($s0) ## 000001D4 /* 00460 809ECCE0 860900B4 */ lh $t1, 0x00B4($s0) ## 000000B4 /* 00464 809ECCE4 860B01CE */ lh $t3, 0x01CE($s0) ## 000001CE -/* 00468 809ECCE8 018D7023 */ subu $t6, $t4, $t5 +/* 00468 809ECCE8 018D7023 */ subu $t6, $t4, $t5 /* 0046C 809ECCEC 860F01D2 */ lh $t7, 0x01D2($s0) ## 000001D2 /* 00470 809ECCF0 860C01D0 */ lh $t4, 0x01D0($s0) ## 000001D0 -/* 00474 809ECCF4 01095023 */ subu $t2, $t0, $t1 -/* 00478 809ECCF8 014BC823 */ subu $t9, $t2, $t3 -/* 0047C 809ECCFC 01CFC023 */ subu $t8, $t6, $t7 -/* 00480 809ECD00 032C6823 */ subu $t5, $t9, $t4 +/* 00474 809ECCF4 01095023 */ subu $t2, $t0, $t1 +/* 00478 809ECCF8 014BC823 */ subu $t9, $t2, $t3 +/* 0047C 809ECCFC 01CFC023 */ subu $t8, $t6, $t7 +/* 00480 809ECD00 032C6823 */ subu $t5, $t9, $t4 /* 00484 809ECD04 A61801D6 */ sh $t8, 0x01D6($s0) ## 000001D6 -/* 00488 809ECD08 10000014 */ beq $zero, $zero, .L809ECD5C +/* 00488 809ECD08 10000014 */ beq $zero, $zero, .L809ECD5C /* 0048C 809ECD0C A60D01D4 */ sh $t5, 0x01D4($s0) ## 000001D4 /* 00490 809ECD10 8CC20680 */ lw $v0, 0x0680($a2) ## 00000680 .L809ECD14: /* 00494 809ECD14 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 00498 809ECD18 304E0080 */ andi $t6, $v0, 0x0080 ## $t6 = 00000000 -/* 0049C 809ECD1C 51C0000A */ beql $t6, $zero, .L809ECD48 +/* 0049C 809ECD1C 51C0000A */ beql $t6, $zero, .L809ECD48 /* 004A0 809ECD20 86090018 */ lh $t1, 0x0018($s0) ## 00000018 /* 004A4 809ECD24 8CCF0118 */ lw $t7, 0x0118($a2) ## 00000118 /* 004A8 809ECD28 2401FF7F */ addiu $at, $zero, 0xFF7F ## $at = FFFFFF7F -/* 004AC 809ECD2C 0041C024 */ and $t8, $v0, $at -/* 004B0 809ECD30 160F0004 */ bne $s0, $t7, .L809ECD44 +/* 004AC 809ECD2C 0041C024 */ and $t8, $v0, $at +/* 004B0 809ECD30 160F0004 */ bne $s0, $t7, .L809ECD44 /* 004B4 809ECD34 240800C8 */ addiu $t0, $zero, 0x00C8 ## $t0 = 000000C8 /* 004B8 809ECD38 ACD80680 */ sw $t8, 0x0680($a2) ## 00000680 /* 004BC 809ECD3C ACC00118 */ sw $zero, 0x0118($a2) ## 00000118 @@ -205,132 +205,132 @@ glabel func_809ECA50 .L809ECD44: /* 004C4 809ECD44 86090018 */ lh $t1, 0x0018($s0) ## 00000018 .L809ECD48: -/* 004C8 809ECD48 51200005 */ beql $t1, $zero, .L809ECD60 +/* 004C8 809ECD48 51200005 */ beql $t1, $zero, .L809ECD60 /* 004CC 809ECD4C 26040024 */ addiu $a0, $s0, 0x0024 ## $a0 = 00000024 /* 004D0 809ECD50 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 004D4 809ECD54 24053903 */ addiu $a1, $zero, 0x3903 ## $a1 = 00003903 /* 004D8 809ECD58 A6000018 */ sh $zero, 0x0018($s0) ## 00000018 .L809ECD5C: /* 004DC 809ECD5C 26040024 */ addiu $a0, $s0, 0x0024 ## $a0 = 00000024 .L809ECD60: -/* 004E0 809ECD60 AFA4002C */ sw $a0, 0x002C($sp) +/* 004E0 809ECD60 AFA4002C */ sw $a0, 0x002C($sp) /* 004E4 809ECD64 0C01E01A */ jal Math_Vec3f_Yaw - + /* 004E8 809ECD68 27A5004C */ addiu $a1, $sp, 0x004C ## $a1 = FFFFFFC4 /* 004EC 809ECD6C 44804000 */ mtc1 $zero, $f8 ## $f8 = 0.00 /* 004F0 809ECD70 A60200B6 */ sh $v0, 0x00B6($s0) ## 000000B6 -/* 004F4 809ECD74 8FA5004C */ lw $a1, 0x004C($sp) -/* 004F8 809ECD78 8FA40030 */ lw $a0, 0x0030($sp) +/* 004F4 809ECD74 8FA5004C */ lw $a1, 0x004C($sp) +/* 004F8 809ECD78 8FA40030 */ lw $a0, 0x0030($sp) /* 004FC 809ECD7C 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 00500 809ECD80 3C074180 */ lui $a3, 0x4180 ## $a3 = 41800000 /* 00504 809ECD84 0C01E0C4 */ jal Math_SmoothScaleMaxMinF - -/* 00508 809ECD88 E7A80010 */ swc1 $f8, 0x0010($sp) + +/* 00508 809ECD88 E7A80010 */ swc1 $f8, 0x0010($sp) /* 0050C 809ECD8C 44805000 */ mtc1 $zero, $f10 ## $f10 = 0.00 /* 00510 809ECD90 260401E0 */ addiu $a0, $s0, 0x01E0 ## $a0 = 000001E0 -/* 00514 809ECD94 8FA50050 */ lw $a1, 0x0050($sp) +/* 00514 809ECD94 8FA50050 */ lw $a1, 0x0050($sp) /* 00518 809ECD98 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 0051C 809ECD9C 3C074180 */ lui $a3, 0x4180 ## $a3 = 41800000 /* 00520 809ECDA0 0C01E0C4 */ jal Math_SmoothScaleMaxMinF - -/* 00524 809ECDA4 E7AA0010 */ swc1 $f10, 0x0010($sp) + +/* 00524 809ECDA4 E7AA0010 */ swc1 $f10, 0x0010($sp) /* 00528 809ECDA8 44809000 */ mtc1 $zero, $f18 ## $f18 = 0.00 /* 0052C 809ECDAC 260401E4 */ addiu $a0, $s0, 0x01E4 ## $a0 = 000001E4 -/* 00530 809ECDB0 8FA50054 */ lw $a1, 0x0054($sp) +/* 00530 809ECDB0 8FA50054 */ lw $a1, 0x0054($sp) /* 00534 809ECDB4 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 00538 809ECDB8 3C074180 */ lui $a3, 0x4180 ## $a3 = 41800000 /* 0053C 809ECDBC 0C01E0C4 */ jal Math_SmoothScaleMaxMinF - -/* 00540 809ECDC0 E7B20010 */ swc1 $f18, 0x0010($sp) + +/* 00540 809ECDC0 E7B20010 */ swc1 $f18, 0x0010($sp) /* 00544 809ECDC4 260401F4 */ addiu $a0, $s0, 0x01F4 ## $a0 = 000001F4 -/* 00548 809ECDC8 AFA40028 */ sw $a0, 0x0028($sp) -/* 0054C 809ECDCC 8FA50030 */ lw $a1, 0x0030($sp) +/* 00548 809ECDC8 AFA40028 */ sw $a0, 0x0028($sp) +/* 0054C 809ECDCC 8FA50030 */ lw $a1, 0x0030($sp) /* 00550 809ECDD0 27A60044 */ addiu $a2, $sp, 0x0044 ## $a2 = FFFFFFBC -/* 00554 809ECDD4 0C00D611 */ jal func_80035844 +/* 00554 809ECDD4 0C00D611 */ jal func_80035844 /* 00558 809ECDD8 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 /* 0055C 809ECDDC C60C01DC */ lwc1 $f12, 0x01DC($s0) ## 000001DC /* 00560 809ECDE0 C60E01E0 */ lwc1 $f14, 0x01E0($s0) ## 000001E0 /* 00564 809ECDE4 8E0601E4 */ lw $a2, 0x01E4($s0) ## 000001E4 -/* 00568 809ECDE8 0C034261 */ jal Matrix_Translate +/* 00568 809ECDE8 0C034261 */ jal Matrix_Translate /* 0056C 809ECDEC 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 00570 809ECDF0 87A40044 */ lh $a0, 0x0044($sp) -/* 00574 809ECDF4 87A50046 */ lh $a1, 0x0046($sp) +/* 00570 809ECDF0 87A40044 */ lh $a0, 0x0044($sp) +/* 00574 809ECDF4 87A50046 */ lh $a1, 0x0046($sp) /* 00578 809ECDF8 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 0057C 809ECDFC 0C034421 */ jal Matrix_RotateXYZ +/* 0057C 809ECDFC 0C034421 */ jal Matrix_RotateZYX /* 00580 809ECE00 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 /* 00584 809ECE04 27A40064 */ addiu $a0, $sp, 0x0064 ## $a0 = FFFFFFDC -/* 00588 809ECE08 0C0346BD */ jal Matrix_MultVec3f -/* 0058C 809ECE0C 8FA50028 */ lw $a1, 0x0028($sp) +/* 00588 809ECE08 0C0346BD */ jal Matrix_MultVec3f +/* 0058C 809ECE0C 8FA50028 */ lw $a1, 0x0028($sp) /* 00590 809ECE10 C60C0024 */ lwc1 $f12, 0x0024($s0) ## 00000024 /* 00594 809ECE14 C60E0028 */ lwc1 $f14, 0x0028($s0) ## 00000028 /* 00598 809ECE18 8E06002C */ lw $a2, 0x002C($s0) ## 0000002C -/* 0059C 809ECE1C 0C034261 */ jal Matrix_Translate +/* 0059C 809ECE1C 0C034261 */ jal Matrix_Translate /* 005A0 809ECE20 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 005A4 809ECE24 8FA4002C */ lw $a0, 0x002C($sp) -/* 005A8 809ECE28 8FA50028 */ lw $a1, 0x0028($sp) +/* 005A4 809ECE24 8FA4002C */ lw $a0, 0x002C($sp) +/* 005A8 809ECE28 8FA50028 */ lw $a1, 0x0028($sp) /* 005AC 809ECE2C 27A60044 */ addiu $a2, $sp, 0x0044 ## $a2 = FFFFFFBC -/* 005B0 809ECE30 0C00D611 */ jal func_80035844 +/* 005B0 809ECE30 0C00D611 */ jal func_80035844 /* 005B4 809ECE34 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 005B8 809ECE38 87A40044 */ lh $a0, 0x0044($sp) -/* 005BC 809ECE3C 87A50046 */ lh $a1, 0x0046($sp) +/* 005B8 809ECE38 87A40044 */ lh $a0, 0x0044($sp) +/* 005BC 809ECE3C 87A50046 */ lh $a1, 0x0046($sp) /* 005C0 809ECE40 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 005C4 809ECE44 0C034421 */ jal Matrix_RotateXYZ +/* 005C4 809ECE44 0C034421 */ jal Matrix_RotateZYX /* 005C8 809ECE48 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 /* 005CC 809ECE4C 27A40070 */ addiu $a0, $sp, 0x0070 ## $a0 = FFFFFFE8 -/* 005D0 809ECE50 0C0346BD */ jal Matrix_MultVec3f -/* 005D4 809ECE54 8FA50028 */ lw $a1, 0x0028($sp) -/* 005D8 809ECE58 8FA4002C */ lw $a0, 0x002C($sp) +/* 005D0 809ECE50 0C0346BD */ jal Matrix_MultVec3f +/* 005D4 809ECE54 8FA50028 */ lw $a1, 0x0028($sp) +/* 005D8 809ECE58 8FA4002C */ lw $a0, 0x002C($sp) /* 005DC 809ECE5C 0C01E027 */ jal Math_Vec3f_Pitch - -/* 005E0 809ECE60 8FA50028 */ lw $a1, 0x0028($sp) + +/* 005E0 809ECE60 8FA50028 */ lw $a1, 0x0028($sp) /* 005E4 809ECE64 A60201CE */ sh $v0, 0x01CE($s0) ## 000001CE -/* 005E8 809ECE68 8FA50028 */ lw $a1, 0x0028($sp) +/* 005E8 809ECE68 8FA50028 */ lw $a1, 0x0028($sp) /* 005EC 809ECE6C 0C01E01A */ jal Math_Vec3f_Yaw - -/* 005F0 809ECE70 8FA4002C */ lw $a0, 0x002C($sp) + +/* 005F0 809ECE70 8FA4002C */ lw $a0, 0x002C($sp) /* 005F4 809ECE74 860A00B6 */ lh $t2, 0x00B6($s0) ## 000000B6 -/* 005F8 809ECE78 004A1823 */ subu $v1, $v0, $t2 -/* 005FC 809ECE7C 00031C00 */ sll $v1, $v1, 16 -/* 00600 809ECE80 00031C03 */ sra $v1, $v1, 16 -/* 00604 809ECE84 04600003 */ bltz $v1, .L809ECE94 -/* 00608 809ECE88 00031023 */ subu $v0, $zero, $v1 -/* 0060C 809ECE8C 10000001 */ beq $zero, $zero, .L809ECE94 +/* 005F8 809ECE78 004A1823 */ subu $v1, $v0, $t2 +/* 005FC 809ECE7C 00031C00 */ sll $v1, $v1, 16 +/* 00600 809ECE80 00031C03 */ sra $v1, $v1, 16 +/* 00604 809ECE84 04600003 */ bltz $v1, .L809ECE94 +/* 00608 809ECE88 00031023 */ subu $v0, $zero, $v1 +/* 0060C 809ECE8C 10000001 */ beq $zero, $zero, .L809ECE94 /* 00610 809ECE90 00601025 */ or $v0, $v1, $zero ## $v0 = 00000000 .L809ECE94: -/* 00614 809ECE94 28414000 */ slti $at, $v0, 0x4000 -/* 00618 809ECE98 54200006 */ bnel $at, $zero, .L809ECEB4 -/* 0061C 809ECE9C 8FA40028 */ lw $a0, 0x0028($sp) +/* 00614 809ECE94 28414000 */ slti $at, $v0, 0x4000 +/* 00618 809ECE98 54200006 */ bnel $at, $zero, .L809ECEB4 +/* 0061C 809ECE9C 8FA40028 */ lw $a0, 0x0028($sp) /* 00620 809ECEA0 860B01CE */ lh $t3, 0x01CE($s0) ## 000001CE /* 00624 809ECEA4 24198000 */ addiu $t9, $zero, 0x8000 ## $t9 = FFFF8000 -/* 00628 809ECEA8 032B6023 */ subu $t4, $t9, $t3 +/* 00628 809ECEA8 032B6023 */ subu $t4, $t9, $t3 /* 0062C 809ECEAC A60C01CE */ sh $t4, 0x01CE($s0) ## 000001CE -/* 00630 809ECEB0 8FA40028 */ lw $a0, 0x0028($sp) +/* 00630 809ECEB0 8FA40028 */ lw $a0, 0x0028($sp) .L809ECEB4: /* 00634 809ECEB4 0C01E027 */ jal Math_Vec3f_Pitch - -/* 00638 809ECEB8 8FA50030 */ lw $a1, 0x0030($sp) + +/* 00638 809ECEB8 8FA50030 */ lw $a1, 0x0030($sp) /* 0063C 809ECEBC 860401CE */ lh $a0, 0x01CE($s0) ## 000001CE -/* 00640 809ECEC0 00446823 */ subu $t5, $v0, $a0 +/* 00640 809ECEC0 00446823 */ subu $t5, $v0, $a0 /* 00644 809ECEC4 A60D01D0 */ sh $t5, 0x01D0($s0) ## 000001D0 /* 00648 809ECEC8 860301D0 */ lh $v1, 0x01D0($s0) ## 000001D0 -/* 0064C 809ECECC 0461001F */ bgez $v1, .L809ECF4C -/* 00650 809ECED0 00037040 */ sll $t6, $v1, 1 -/* 00654 809ECED4 00030823 */ subu $at, $zero, $v1 -/* 00658 809ECED8 008E7821 */ addu $t7, $a0, $t6 -/* 0065C 809ECEDC 0001C040 */ sll $t8, $at, 1 +/* 0064C 809ECECC 0461001F */ bgez $v1, .L809ECF4C +/* 00650 809ECED0 00037040 */ sll $t6, $v1, 1 +/* 00654 809ECED4 00030823 */ subu $at, $zero, $v1 +/* 00658 809ECED8 008E7821 */ addu $t7, $a0, $t6 +/* 0065C 809ECEDC 0001C040 */ sll $t8, $at, 1 /* 00660 809ECEE0 A60F01CE */ sh $t7, 0x01CE($s0) ## 000001CE -/* 00664 809ECEE4 10000019 */ beq $zero, $zero, .L809ECF4C +/* 00664 809ECEE4 10000019 */ beq $zero, $zero, .L809ECF4C /* 00668 809ECEE8 A61801D0 */ sh $t8, 0x01D0($s0) ## 000001D0 /* 0066C 809ECEEC 8CC20680 */ lw $v0, 0x0680($a2) ## 00000680 .L809ECEF0: /* 00670 809ECEF0 30480080 */ andi $t0, $v0, 0x0080 ## $t0 = 00000000 -/* 00674 809ECEF4 5100000A */ beql $t0, $zero, .L809ECF20 +/* 00674 809ECEF4 5100000A */ beql $t0, $zero, .L809ECF20 /* 00678 809ECEF8 A60B0018 */ sh $t3, 0x0018($s0) ## 00000018 /* 0067C 809ECEFC 8CC90118 */ lw $t1, 0x0118($a2) ## 00000118 /* 00680 809ECF00 2401FF7F */ addiu $at, $zero, 0xFF7F ## $at = FFFFFF7F -/* 00684 809ECF04 00415024 */ and $t2, $v0, $at -/* 00688 809ECF08 16090004 */ bne $s0, $t1, .L809ECF1C +/* 00684 809ECF04 00415024 */ and $t2, $v0, $at +/* 00688 809ECF08 16090004 */ bne $s0, $t1, .L809ECF1C /* 0068C 809ECF0C 241900C8 */ addiu $t9, $zero, 0x00C8 ## $t9 = 000000C8 /* 00690 809ECF10 ACCA0680 */ sw $t2, 0x0680($a2) ## 00000680 /* 00694 809ECF14 ACC00118 */ sw $zero, 0x0118($a2) ## 00000118 @@ -338,26 +338,26 @@ glabel func_809ECA50 .L809ECF1C: /* 0069C 809ECF1C A60B0018 */ sh $t3, 0x0018($s0) ## 00000018 .L809ECF20: -/* 006A0 809ECF20 AFA00010 */ sw $zero, 0x0010($sp) +/* 006A0 809ECF20 AFA00010 */ sw $zero, 0x0010($sp) /* 006A4 809ECF24 0C01E1A7 */ jal Math_SmoothScaleMaxMinS - + /* 006A8 809ECF28 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 /* 006AC 809ECF2C 260401CE */ addiu $a0, $s0, 0x01CE ## $a0 = 000001CE /* 006B0 809ECF30 2405C000 */ addiu $a1, $zero, 0xC000 ## $a1 = FFFFC000 /* 006B4 809ECF34 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 /* 006B8 809ECF38 240703E8 */ addiu $a3, $zero, 0x03E8 ## $a3 = 000003E8 /* 006BC 809ECF3C 0C01E1A7 */ jal Math_SmoothScaleMaxMinS - -/* 006C0 809ECF40 AFA00010 */ sw $zero, 0x0010($sp) + +/* 006C0 809ECF40 AFA00010 */ sw $zero, 0x0010($sp) /* 006C4 809ECF44 0C02927F */ jal SkelAnime_FrameUpdateMatrix - + /* 006C8 809ECF48 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C .L809ECF4C: -/* 006CC 809ECF4C 8FBF0024 */ lw $ra, 0x0024($sp) +/* 006CC 809ECF4C 8FBF0024 */ lw $ra, 0x0024($sp) .L809ECF50: -/* 006D0 809ECF50 8FB00020 */ lw $s0, 0x0020($sp) +/* 006D0 809ECF50 8FB00020 */ lw $s0, 0x0020($sp) /* 006D4 809ECF54 27BD0088 */ addiu $sp, $sp, 0x0088 ## $sp = 00000000 -/* 006D8 809ECF58 03E00008 */ jr $ra +/* 006D8 809ECF58 03E00008 */ jr $ra /* 006DC 809ECF5C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Diving_Game/EnDivingGame_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Diving_Game/EnDivingGame_Draw.s index 7369a62fd8..a964b7a47d 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Diving_Game/EnDivingGame_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Diving_Game/EnDivingGame_Draw.s @@ -1,19 +1,19 @@ glabel EnDivingGame_Draw /* 016D4 809EEF44 27BDFF98 */ addiu $sp, $sp, 0xFF98 ## $sp = FFFFFF98 -/* 016D8 809EEF48 AFB20030 */ sw $s2, 0x0030($sp) +/* 016D8 809EEF48 AFB20030 */ sw $s2, 0x0030($sp) /* 016DC 809EEF4C 00A09025 */ or $s2, $a1, $zero ## $s2 = 00000000 -/* 016E0 809EEF50 AFBF0034 */ sw $ra, 0x0034($sp) -/* 016E4 809EEF54 AFB1002C */ sw $s1, 0x002C($sp) -/* 016E8 809EEF58 AFB00028 */ sw $s0, 0x0028($sp) +/* 016E0 809EEF50 AFBF0034 */ sw $ra, 0x0034($sp) +/* 016E4 809EEF54 AFB1002C */ sw $s1, 0x002C($sp) +/* 016E8 809EEF58 AFB00028 */ sw $s0, 0x0028($sp) /* 016EC 809EEF5C 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 /* 016F0 809EEF60 00808825 */ or $s1, $a0, $zero ## $s1 = 00000000 /* 016F4 809EEF64 3C06809F */ lui $a2, %hi(D_809EF17C) ## $a2 = 809F0000 /* 016F8 809EEF68 24C6F17C */ addiu $a2, $a2, %lo(D_809EF17C) ## $a2 = 809EF17C /* 016FC 809EEF6C 27A4004C */ addiu $a0, $sp, 0x004C ## $a0 = FFFFFFE4 /* 01700 809EEF70 240704BC */ addiu $a3, $zero, 0x04BC ## $a3 = 000004BC -/* 01704 809EEF74 0C031AB1 */ jal func_800C6AC4 +/* 01704 809EEF74 0C031AB1 */ jal Graph_OpenDisps /* 01708 809EEF78 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 -/* 0170C 809EEF7C 0C024F46 */ jal func_80093D18 +/* 0170C 809EEF7C 0C024F46 */ jal func_80093D18 /* 01710 809EEF80 8E440000 */ lw $a0, 0x0000($s2) ## 00000000 /* 01714 809EEF84 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 /* 01718 809EEF88 3C0FFB00 */ lui $t7, 0xFB00 ## $t7 = FB000000 @@ -29,9 +29,9 @@ glabel EnDivingGame_Draw /* 01740 809EEFB0 AE1902C0 */ sw $t9, 0x02C0($s0) ## 000002C0 /* 01744 809EEFB4 AC480000 */ sw $t0, 0x0000($v0) ## 00000000 /* 01748 809EEFB8 8E440000 */ lw $a0, 0x0000($s2) ## 00000000 -/* 0174C 809EEFBC 0C27BB6E */ jal func_809EEDB8 -/* 01750 809EEFC0 AFA20044 */ sw $v0, 0x0044($sp) -/* 01754 809EEFC4 8FA30044 */ lw $v1, 0x0044($sp) +/* 0174C 809EEFBC 0C27BB6E */ jal func_809EEDB8 +/* 01750 809EEFC0 AFA20044 */ sw $v0, 0x0044($sp) +/* 01754 809EEFC4 8FA30044 */ lw $v1, 0x0044($sp) /* 01758 809EEFC8 3C0ADB06 */ lui $t2, 0xDB06 ## $t2 = DB060000 /* 0175C 809EEFCC 354A0020 */ ori $t2, $t2, 0x0020 ## $t2 = DB060020 /* 01760 809EEFD0 AC620004 */ sw $v0, 0x0004($v1) ## 00000004 @@ -44,40 +44,40 @@ glabel EnDivingGame_Draw /* 0177C 809EEFEC 862B029E */ lh $t3, 0x029E($s1) ## 0000029E /* 01780 809EEFF0 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 /* 01784 809EEFF4 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF -/* 01788 809EEFF8 000B6080 */ sll $t4, $t3, 2 -/* 0178C 809EEFFC 008C2021 */ addu $a0, $a0, $t4 -/* 01790 809EF000 8C84F0E0 */ lw $a0, %lo(D_809EF0E0)($a0) +/* 01788 809EEFF8 000B6080 */ sll $t4, $t3, 2 +/* 0178C 809EEFFC 008C2021 */ addu $a0, $a0, $t4 +/* 01790 809EF000 8C84F0E0 */ lw $a0, %lo(D_809EF0E0)($a0) /* 01794 809EF004 3C0A809F */ lui $t2, %hi(func_809EEDE4) ## $t2 = 809F0000 /* 01798 809EF008 254AEDE4 */ addiu $t2, $t2, %lo(func_809EEDE4) ## $t2 = 809EEDE4 -/* 0179C 809EF00C 00047100 */ sll $t6, $a0, 4 -/* 017A0 809EF010 000E7F02 */ srl $t7, $t6, 28 -/* 017A4 809EF014 000FC080 */ sll $t8, $t7, 2 -/* 017A8 809EF018 0338C821 */ addu $t9, $t9, $t8 +/* 0179C 809EF00C 00047100 */ sll $t6, $a0, 4 +/* 017A0 809EF010 000E7F02 */ srl $t7, $t6, 28 +/* 017A4 809EF014 000FC080 */ sll $t8, $t7, 2 +/* 017A8 809EF018 0338C821 */ addu $t9, $t9, $t8 /* 017AC 809EF01C 8F396FA8 */ lw $t9, 0x6FA8($t9) ## 80166FA8 -/* 017B0 809EF020 00816824 */ and $t5, $a0, $at +/* 017B0 809EF020 00816824 */ and $t5, $a0, $at /* 017B4 809EF024 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 017B8 809EF028 01B94021 */ addu $t0, $t5, $t9 -/* 017BC 809EF02C 01014821 */ addu $t1, $t0, $at +/* 017B8 809EF028 01B94021 */ addu $t0, $t5, $t9 +/* 017BC 809EF02C 01014821 */ addu $t1, $t0, $at /* 017C0 809EF030 AC490004 */ sw $t1, 0x0004($v0) ## 00000004 /* 017C4 809EF034 9227014E */ lbu $a3, 0x014E($s1) ## 0000014E /* 017C8 809EF038 8E26016C */ lw $a2, 0x016C($s1) ## 0000016C /* 017CC 809EF03C 8E250150 */ lw $a1, 0x0150($s1) ## 00000150 -/* 017D0 809EF040 AFB10018 */ sw $s1, 0x0018($sp) -/* 017D4 809EF044 AFA00014 */ sw $zero, 0x0014($sp) -/* 017D8 809EF048 AFAA0010 */ sw $t2, 0x0010($sp) -/* 017DC 809EF04C 0C0286B2 */ jal func_800A1AC8 +/* 017D0 809EF040 AFB10018 */ sw $s1, 0x0018($sp) +/* 017D4 809EF044 AFA00014 */ sw $zero, 0x0014($sp) +/* 017D8 809EF048 AFAA0010 */ sw $t2, 0x0010($sp) +/* 017DC 809EF04C 0C0286B2 */ jal SkelAnime_DrawSV /* 017E0 809EF050 02402025 */ or $a0, $s2, $zero ## $a0 = 00000000 /* 017E4 809EF054 3C06809F */ lui $a2, %hi(D_809EF194) ## $a2 = 809F0000 /* 017E8 809EF058 24C6F194 */ addiu $a2, $a2, %lo(D_809EF194) ## $a2 = 809EF194 /* 017EC 809EF05C 27A4004C */ addiu $a0, $sp, 0x004C ## $a0 = FFFFFFE4 /* 017F0 809EF060 8E450000 */ lw $a1, 0x0000($s2) ## 00000000 -/* 017F4 809EF064 0C031AD5 */ jal func_800C6B54 +/* 017F4 809EF064 0C031AD5 */ jal Graph_CloseDisps /* 017F8 809EF068 240704D0 */ addiu $a3, $zero, 0x04D0 ## $a3 = 000004D0 -/* 017FC 809EF06C 8FBF0034 */ lw $ra, 0x0034($sp) -/* 01800 809EF070 8FB00028 */ lw $s0, 0x0028($sp) -/* 01804 809EF074 8FB1002C */ lw $s1, 0x002C($sp) -/* 01808 809EF078 8FB20030 */ lw $s2, 0x0030($sp) -/* 0180C 809EF07C 03E00008 */ jr $ra +/* 017FC 809EF06C 8FBF0034 */ lw $ra, 0x0034($sp) +/* 01800 809EF070 8FB00028 */ lw $s0, 0x0028($sp) +/* 01804 809EF074 8FB1002C */ lw $s1, 0x002C($sp) +/* 01808 809EF078 8FB20030 */ lw $s2, 0x0030($sp) +/* 0180C 809EF07C 03E00008 */ jr $ra /* 01810 809EF080 27BD0068 */ addiu $sp, $sp, 0x0068 ## $sp = 00000000 /* 01814 809EF084 00000000 */ nop /* 01818 809EF088 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Diving_Game/EnDivingGame_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Diving_Game/EnDivingGame_Init.s index 45420ec7b1..aaf483eb35 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Diving_Game/EnDivingGame_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Diving_Game/EnDivingGame_Init.s @@ -2,87 +2,87 @@ glabel EnDivingGame_Init /* 00000 809ED870 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 /* 00004 809ED874 3C01C040 */ lui $at, 0xC040 ## $at = C0400000 /* 00008 809ED878 44812000 */ mtc1 $at, $f4 ## $f4 = -3.00 -/* 0000C 809ED87C AFB00028 */ sw $s0, 0x0028($sp) +/* 0000C 809ED87C AFB00028 */ sw $s0, 0x0028($sp) /* 00010 809ED880 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00014 809ED884 AFBF002C */ sw $ra, 0x002C($sp) -/* 00018 809ED888 AFA5003C */ sw $a1, 0x003C($sp) +/* 00014 809ED884 AFBF002C */ sw $ra, 0x002C($sp) +/* 00018 809ED888 AFA5003C */ sw $a1, 0x003C($sp) /* 0001C 809ED88C 3C068003 */ lui $a2, 0x8003 ## $a2 = 80030000 /* 00020 809ED890 24C6B5EC */ addiu $a2, $a2, 0xB5EC ## $a2 = 8002B5EC /* 00024 809ED894 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 /* 00028 809ED898 248400B4 */ addiu $a0, $a0, 0x00B4 ## $a0 = 000000B4 /* 0002C 809ED89C 3C0741F0 */ lui $a3, 0x41F0 ## $a3 = 41F00000 /* 00030 809ED8A0 0C00AC78 */ jal ActorShape_Init - + /* 00034 809ED8A4 E484FFB8 */ swc1 $f4, -0x0048($a0) ## 0000006C /* 00038 809ED8A8 3C060601 */ lui $a2, 0x0601 ## $a2 = 06010000 /* 0003C 809ED8AC 3C070600 */ lui $a3, 0x0600 ## $a3 = 06000000 /* 00040 809ED8B0 260E0190 */ addiu $t6, $s0, 0x0190 ## $t6 = 00000190 /* 00044 809ED8B4 260F0208 */ addiu $t7, $s0, 0x0208 ## $t7 = 00000208 /* 00048 809ED8B8 24180014 */ addiu $t8, $zero, 0x0014 ## $t8 = 00000014 -/* 0004C 809ED8BC AFB80018 */ sw $t8, 0x0018($sp) -/* 00050 809ED8C0 AFAF0014 */ sw $t7, 0x0014($sp) -/* 00054 809ED8C4 AFAE0010 */ sw $t6, 0x0010($sp) +/* 0004C 809ED8BC AFB80018 */ sw $t8, 0x0018($sp) +/* 00050 809ED8C0 AFAF0014 */ sw $t7, 0x0014($sp) +/* 00054 809ED8C4 AFAE0010 */ sw $t6, 0x0010($sp) /* 00058 809ED8C8 24E72FE8 */ addiu $a3, $a3, 0x2FE8 ## $a3 = 06002FE8 /* 0005C 809ED8CC 24C6BFA8 */ addiu $a2, $a2, 0xBFA8 ## $a2 = 0600BFA8 -/* 00060 809ED8D0 8FA4003C */ lw $a0, 0x003C($sp) -/* 00064 809ED8D4 0C0291BE */ jal func_800A46F8 +/* 00060 809ED8D0 8FA4003C */ lw $a0, 0x003C($sp) +/* 00064 809ED8D4 0C0291BE */ jal SkelAnime_InitSV /* 00068 809ED8D8 2605014C */ addiu $a1, $s0, 0x014C ## $a1 = 0000014C /* 0006C 809ED8DC 2605034C */ addiu $a1, $s0, 0x034C ## $a1 = 0000034C -/* 00070 809ED8E0 AFA50030 */ sw $a1, 0x0030($sp) +/* 00070 809ED8E0 AFA50030 */ sw $a1, 0x0030($sp) /* 00074 809ED8E4 0C0170D9 */ jal ActorCollider_AllocCylinder - -/* 00078 809ED8E8 8FA4003C */ lw $a0, 0x003C($sp) + +/* 00078 809ED8E8 8FA4003C */ lw $a0, 0x003C($sp) /* 0007C 809ED8EC 3C07809F */ lui $a3, %hi(D_809EF0B4) ## $a3 = 809F0000 -/* 00080 809ED8F0 8FA50030 */ lw $a1, 0x0030($sp) +/* 00080 809ED8F0 8FA50030 */ lw $a1, 0x0030($sp) /* 00084 809ED8F4 24E7F0B4 */ addiu $a3, $a3, %lo(D_809EF0B4) ## $a3 = 809EF0B4 -/* 00088 809ED8F8 8FA4003C */ lw $a0, 0x003C($sp) +/* 00088 809ED8F8 8FA4003C */ lw $a0, 0x003C($sp) /* 0008C 809ED8FC 0C01712B */ jal ActorCollider_InitCylinder - + /* 00090 809ED900 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 00094 809ED904 3C04809F */ lui $a0, %hi(D_809EF0F0) ## $a0 = 809F0000 /* 00098 809ED908 0C00084C */ jal osSyncPrintf - + /* 0009C 809ED90C 2484F0F0 */ addiu $a0, $a0, %lo(D_809EF0F0) ## $a0 = 809EF0F0 /* 000A0 809ED910 2419FFFF */ addiu $t9, $zero, 0xFFFF ## $t9 = FFFFFFFF /* 000A4 809ED914 A2190003 */ sb $t9, 0x0003($s0) ## 00000003 /* 000A8 809ED918 3C01809F */ lui $at, %hi(D_809EF1AC) ## $at = 809F0000 -/* 000AC 809ED91C C426F1AC */ lwc1 $f6, %lo(D_809EF1AC)($at) +/* 000AC 809ED91C C426F1AC */ lwc1 $f6, %lo(D_809EF1AC)($at) /* 000B0 809ED920 3C01809F */ lui $at, %hi(D_809EF1B0) ## $at = 809F0000 /* 000B4 809ED924 3C02809F */ lui $v0, %hi(D_809EF0B0) ## $v0 = 809F0000 /* 000B8 809ED928 E6060050 */ swc1 $f6, 0x0050($s0) ## 00000050 -/* 000BC 809ED92C C428F1B0 */ lwc1 $f8, %lo(D_809EF1B0)($at) +/* 000BC 809ED92C C428F1B0 */ lwc1 $f8, %lo(D_809EF1B0)($at) /* 000C0 809ED930 3C01809F */ lui $at, %hi(D_809EF1B4) ## $at = 809F0000 /* 000C4 809ED934 2442F0B0 */ addiu $v0, $v0, %lo(D_809EF0B0) ## $v0 = 809EF0B0 /* 000C8 809ED938 E6080054 */ swc1 $f8, 0x0054($s0) ## 00000054 -/* 000CC 809ED93C C42AF1B4 */ lwc1 $f10, %lo(D_809EF1B4)($at) +/* 000CC 809ED93C C42AF1B4 */ lwc1 $f10, %lo(D_809EF1B4)($at) /* 000D0 809ED940 3C0C809F */ lui $t4, %hi(func_809EDCB0) ## $t4 = 809F0000 /* 000D4 809ED944 3C04809F */ lui $a0, %hi(D_809EF120) ## $a0 = 809F0000 /* 000D8 809ED948 E60A0058 */ swc1 $f10, 0x0058($s0) ## 00000058 /* 000DC 809ED94C 90480000 */ lbu $t0, 0x0000($v0) ## 809EF0B0 /* 000E0 809ED950 240A0001 */ addiu $t2, $zero, 0x0001 ## $t2 = 00000001 /* 000E4 809ED954 240B00FF */ addiu $t3, $zero, 0x00FF ## $t3 = 000000FF -/* 000E8 809ED958 11000009 */ beq $t0, $zero, .L809ED980 +/* 000E8 809ED958 11000009 */ beq $t0, $zero, .L809ED980 /* 000EC 809ED95C 258CDCB0 */ addiu $t4, $t4, %lo(func_809EDCB0) ## $t4 = 809EDCB0 /* 000F0 809ED960 0C00084C */ jal osSyncPrintf - + /* 000F4 809ED964 2484F120 */ addiu $a0, $a0, %lo(D_809EF120) ## $a0 = 809EF120 /* 000F8 809ED968 24090001 */ addiu $t1, $zero, 0x0001 ## $t1 = 00000001 /* 000FC 809ED96C A209031F */ sb $t1, 0x031F($s0) ## 0000031F /* 00100 809ED970 0C00B55C */ jal Actor_Kill - + /* 00104 809ED974 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00108 809ED978 10000006 */ beq $zero, $zero, .L809ED994 -/* 0010C 809ED97C 8FBF002C */ lw $ra, 0x002C($sp) +/* 00108 809ED978 10000006 */ beq $zero, $zero, .L809ED994 +/* 0010C 809ED97C 8FBF002C */ lw $ra, 0x002C($sp) .L809ED980: /* 00110 809ED980 A04A0000 */ sb $t2, 0x0000($v0) ## 00000000 /* 00114 809ED984 A200001F */ sb $zero, 0x001F($s0) ## 0000001F /* 00118 809ED988 A20B00AE */ sb $t3, 0x00AE($s0) ## 000000AE /* 0011C 809ED98C AE0C0280 */ sw $t4, 0x0280($s0) ## 00000280 -/* 00120 809ED990 8FBF002C */ lw $ra, 0x002C($sp) +/* 00120 809ED990 8FBF002C */ lw $ra, 0x002C($sp) .L809ED994: -/* 00124 809ED994 8FB00028 */ lw $s0, 0x0028($sp) +/* 00124 809ED994 8FB00028 */ lw $s0, 0x0028($sp) /* 00128 809ED998 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 -/* 0012C 809ED99C 03E00008 */ jr $ra +/* 0012C 809ED99C 03E00008 */ jr $ra /* 00130 809ED9A0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Diving_Game/func_809EDCB0.s b/asm/non_matchings/overlays/actors/ovl_En_Diving_Game/func_809EDCB0.s index 87b2ac90ed..d4ba3dd932 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Diving_Game/func_809EDCB0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Diving_Game/func_809EDCB0.s @@ -1,44 +1,44 @@ glabel func_809EDCB0 /* 00440 809EDCB0 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 00444 809EDCB4 AFA40028 */ sw $a0, 0x0028($sp) -/* 00448 809EDCB8 AFBF0024 */ sw $ra, 0x0024($sp) +/* 00444 809EDCB4 AFA40028 */ sw $a0, 0x0028($sp) +/* 00448 809EDCB8 AFBF0024 */ sw $ra, 0x0024($sp) /* 0044C 809EDCBC 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 -/* 00450 809EDCC0 AFA5002C */ sw $a1, 0x002C($sp) +/* 00450 809EDCC0 AFA5002C */ sw $a1, 0x002C($sp) /* 00454 809EDCC4 0C028800 */ jal SkelAnime_GetFrameCount - + /* 00458 809EDCC8 24842FE8 */ addiu $a0, $a0, 0x2FE8 ## $a0 = 06002FE8 /* 0045C 809EDCCC 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 00460 809EDCD0 3C01C120 */ lui $at, 0xC120 ## $at = C1200000 /* 00464 809EDCD4 44819000 */ mtc1 $at, $f18 ## $f18 = -10.00 -/* 00468 809EDCD8 468021A0 */ cvt.s.w $f6, $f4 -/* 0046C 809EDCDC 8FA40028 */ lw $a0, 0x0028($sp) +/* 00468 809EDCD8 468021A0 */ cvt.s.w $f6, $f4 +/* 0046C 809EDCDC 8FA40028 */ lw $a0, 0x0028($sp) /* 00470 809EDCE0 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 00474 809EDCE4 24A52FE8 */ addiu $a1, $a1, 0x2FE8 ## $a1 = 06002FE8 /* 00478 809EDCE8 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 0047C 809EDCEC 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 00480 809EDCF0 4600320D */ trunc.w.s $f8, $f6 -/* 00484 809EDCF4 AFA00014 */ sw $zero, 0x0014($sp) -/* 00488 809EDCF8 E7B20018 */ swc1 $f18, 0x0018($sp) +/* 00480 809EDCF0 4600320D */ trunc.w.s $f8, $f6 +/* 00484 809EDCF4 AFA00014 */ sw $zero, 0x0014($sp) +/* 00488 809EDCF8 E7B20018 */ swc1 $f18, 0x0018($sp) /* 0048C 809EDCFC 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 00490 809EDD00 440F4000 */ mfc1 $t7, $f8 +/* 00490 809EDD00 440F4000 */ mfc1 $t7, $f8 /* 00494 809EDD04 00000000 */ nop -/* 00498 809EDD08 000FC400 */ sll $t8, $t7, 16 -/* 0049C 809EDD0C 0018CC03 */ sra $t9, $t8, 16 +/* 00498 809EDD08 000FC400 */ sll $t8, $t7, 16 +/* 0049C 809EDD0C 0018CC03 */ sra $t9, $t8, 16 /* 004A0 809EDD10 44995000 */ mtc1 $t9, $f10 ## $f10 = 0.00 /* 004A4 809EDD14 00000000 */ nop -/* 004A8 809EDD18 46805420 */ cvt.s.w $f16, $f10 -/* 004AC 809EDD1C 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 004B0 809EDD20 E7B00010 */ swc1 $f16, 0x0010($sp) -/* 004B4 809EDD24 8FA20028 */ lw $v0, 0x0028($sp) +/* 004A8 809EDD18 46805420 */ cvt.s.w $f16, $f10 +/* 004AC 809EDD1C 0C029468 */ jal SkelAnime_ChangeAnim + +/* 004B0 809EDD20 E7B00010 */ swc1 $f16, 0x0010($sp) +/* 004B4 809EDD24 8FA20028 */ lw $v0, 0x0028($sp) /* 004B8 809EDD28 3C09809F */ lui $t1, %hi(func_809EDD4C) ## $t1 = 809F0000 /* 004BC 809EDD2C 24080001 */ addiu $t0, $zero, 0x0001 ## $t0 = 00000001 /* 004C0 809EDD30 2529DD4C */ addiu $t1, $t1, %lo(func_809EDD4C) ## $t1 = 809EDD4C /* 004C4 809EDD34 A048031D */ sb $t0, 0x031D($v0) ## 0000031D /* 004C8 809EDD38 AC490280 */ sw $t1, 0x0280($v0) ## 00000280 -/* 004CC 809EDD3C 8FBF0024 */ lw $ra, 0x0024($sp) +/* 004CC 809EDD3C 8FBF0024 */ lw $ra, 0x0024($sp) /* 004D0 809EDD40 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 004D4 809EDD44 03E00008 */ jr $ra +/* 004D4 809EDD44 03E00008 */ jr $ra /* 004D8 809EDD48 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Diving_Game/func_809EDD4C.s b/asm/non_matchings/overlays/actors/ovl_En_Diving_Game/func_809EDD4C.s index ae1e3eaf81..66f336ea7f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Diving_Game/func_809EDD4C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Diving_Game/func_809EDD4C.s @@ -53,11 +53,11 @@ glabel func_809EDD4C /* 00594 809EDE04 10000030 */ beq $zero, $zero, .L809EDEC8 /* 00598 809EDE08 AE080280 */ sw $t0, 0x0280($s0) ## 00000280 .L809EDE0C: -/* 0059C 809EDE0C 0C01B0D8 */ jal func_8006C360 +/* 0059C 809EDE0C 0C01B0D8 */ jal Text_GetFaceReaction /* 005A0 809EDE10 2405001D */ addiu $a1, $zero, 0x001D ## $a1 = 0000001D /* 005A4 809EDE14 10400007 */ beq $v0, $zero, .L809EDE34 /* 005A8 809EDE18 8FA40024 */ lw $a0, 0x0024($sp) -/* 005AC 809EDE1C 0C01B0D8 */ jal func_8006C360 +/* 005AC 809EDE1C 0C01B0D8 */ jal Text_GetFaceReaction /* 005B0 809EDE20 2405001D */ addiu $a1, $zero, 0x001D ## $a1 = 0000001D /* 005B4 809EDE24 24090006 */ addiu $t1, $zero, 0x0006 ## $t1 = 00000006 /* 005B8 809EDE28 A602010E */ sh $v0, 0x010E($s0) ## 0000010E diff --git a/asm/non_matchings/overlays/actors/ovl_En_Diving_Game/func_809EE0FC.s b/asm/non_matchings/overlays/actors/ovl_En_Diving_Game/func_809EE0FC.s index b493fb8032..7cda987fa5 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Diving_Game/func_809EE0FC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Diving_Game/func_809EE0FC.s @@ -1,43 +1,43 @@ glabel func_809EE0FC /* 0088C 809EE0FC 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 00890 809EE100 AFA40028 */ sw $a0, 0x0028($sp) -/* 00894 809EE104 AFBF0024 */ sw $ra, 0x0024($sp) +/* 00890 809EE100 AFA40028 */ sw $a0, 0x0028($sp) +/* 00894 809EE104 AFBF0024 */ sw $ra, 0x0024($sp) /* 00898 809EE108 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 -/* 0089C 809EE10C AFA5002C */ sw $a1, 0x002C($sp) +/* 0089C 809EE10C AFA5002C */ sw $a1, 0x002C($sp) /* 008A0 809EE110 0C028800 */ jal SkelAnime_GetFrameCount - + /* 008A4 809EE114 2484219C */ addiu $a0, $a0, 0x219C ## $a0 = 0600219C /* 008A8 809EE118 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 008AC 809EE11C 3C01C120 */ lui $at, 0xC120 ## $at = C1200000 /* 008B0 809EE120 44819000 */ mtc1 $at, $f18 ## $f18 = -10.00 -/* 008B4 809EE124 468021A0 */ cvt.s.w $f6, $f4 -/* 008B8 809EE128 8FA40028 */ lw $a0, 0x0028($sp) +/* 008B4 809EE124 468021A0 */ cvt.s.w $f6, $f4 +/* 008B8 809EE128 8FA40028 */ lw $a0, 0x0028($sp) /* 008BC 809EE12C 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 008C0 809EE130 24080002 */ addiu $t0, $zero, 0x0002 ## $t0 = 00000002 -/* 008C4 809EE134 AFA80014 */ sw $t0, 0x0014($sp) +/* 008C4 809EE134 AFA80014 */ sw $t0, 0x0014($sp) /* 008C8 809EE138 24A5219C */ addiu $a1, $a1, 0x219C ## $a1 = 0600219C -/* 008CC 809EE13C 4600320D */ trunc.w.s $f8, $f6 +/* 008CC 809EE13C 4600320D */ trunc.w.s $f8, $f6 /* 008D0 809EE140 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 008D4 809EE144 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 008D8 809EE148 E7B20018 */ swc1 $f18, 0x0018($sp) -/* 008DC 809EE14C 440F4000 */ mfc1 $t7, $f8 +/* 008D8 809EE148 E7B20018 */ swc1 $f18, 0x0018($sp) +/* 008DC 809EE14C 440F4000 */ mfc1 $t7, $f8 /* 008E0 809EE150 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 008E4 809EE154 000FC400 */ sll $t8, $t7, 16 -/* 008E8 809EE158 0018CC03 */ sra $t9, $t8, 16 +/* 008E4 809EE154 000FC400 */ sll $t8, $t7, 16 +/* 008E8 809EE158 0018CC03 */ sra $t9, $t8, 16 /* 008EC 809EE15C 44995000 */ mtc1 $t9, $f10 ## $f10 = 0.00 /* 008F0 809EE160 00000000 */ nop -/* 008F4 809EE164 46805420 */ cvt.s.w $f16, $f10 -/* 008F8 809EE168 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 008FC 809EE16C E7B00010 */ swc1 $f16, 0x0010($sp) -/* 00900 809EE170 8FA20028 */ lw $v0, 0x0028($sp) +/* 008F4 809EE164 46805420 */ cvt.s.w $f16, $f10 +/* 008F8 809EE168 0C029468 */ jal SkelAnime_ChangeAnim + +/* 008FC 809EE16C E7B00010 */ swc1 $f16, 0x0010($sp) +/* 00900 809EE170 8FA20028 */ lw $v0, 0x0028($sp) /* 00904 809EE174 3C09809F */ lui $t1, %hi(func_809EE194) ## $t1 = 809F0000 /* 00908 809EE178 2529E194 */ addiu $t1, $t1, %lo(func_809EE194) ## $t1 = 809EE194 /* 0090C 809EE17C A040031D */ sb $zero, 0x031D($v0) ## 0000031D /* 00910 809EE180 AC490280 */ sw $t1, 0x0280($v0) ## 00000280 -/* 00914 809EE184 8FBF0024 */ lw $ra, 0x0024($sp) +/* 00914 809EE184 8FBF0024 */ lw $ra, 0x0024($sp) /* 00918 809EE188 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 0091C 809EE18C 03E00008 */ jr $ra +/* 0091C 809EE18C 03E00008 */ jr $ra /* 00920 809EE190 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dns/EnDns_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Dns/EnDns_Draw.s index 8b8e77604c..9799d86a93 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dns/EnDns_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dns/EnDns_Draw.s @@ -1,22 +1,22 @@ glabel EnDns_Draw /* 0101C 809F036C 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 01020 809F0370 AFBF0024 */ sw $ra, 0x0024($sp) -/* 01024 809F0374 AFA40028 */ sw $a0, 0x0028($sp) -/* 01028 809F0378 AFA5002C */ sw $a1, 0x002C($sp) -/* 0102C 809F037C 0C024F46 */ jal func_80093D18 +/* 01020 809F0370 AFBF0024 */ sw $ra, 0x0024($sp) +/* 01024 809F0374 AFA40028 */ sw $a0, 0x0028($sp) +/* 01028 809F0378 AFA5002C */ sw $a1, 0x002C($sp) +/* 0102C 809F037C 0C024F46 */ jal func_80093D18 /* 01030 809F0380 8CA40000 */ lw $a0, 0x0000($a1) ## 00000000 -/* 01034 809F0384 8FA20028 */ lw $v0, 0x0028($sp) -/* 01038 809F0388 8FA4002C */ lw $a0, 0x002C($sp) +/* 01034 809F0384 8FA20028 */ lw $v0, 0x0028($sp) +/* 01038 809F0388 8FA4002C */ lw $a0, 0x002C($sp) /* 0103C 809F038C 8C450150 */ lw $a1, 0x0150($v0) ## 00000150 /* 01040 809F0390 8C46016C */ lw $a2, 0x016C($v0) ## 0000016C /* 01044 809F0394 9047014E */ lbu $a3, 0x014E($v0) ## 0000014E -/* 01048 809F0398 AFA00014 */ sw $zero, 0x0014($sp) -/* 0104C 809F039C AFA00010 */ sw $zero, 0x0010($sp) -/* 01050 809F03A0 0C0286B2 */ jal func_800A1AC8 -/* 01054 809F03A4 AFA20018 */ sw $v0, 0x0018($sp) -/* 01058 809F03A8 8FBF0024 */ lw $ra, 0x0024($sp) +/* 01048 809F0398 AFA00014 */ sw $zero, 0x0014($sp) +/* 0104C 809F039C AFA00010 */ sw $zero, 0x0010($sp) +/* 01050 809F03A0 0C0286B2 */ jal SkelAnime_DrawSV +/* 01054 809F03A4 AFA20018 */ sw $v0, 0x0018($sp) +/* 01058 809F03A8 8FBF0024 */ lw $ra, 0x0024($sp) /* 0105C 809F03AC 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 01060 809F03B0 03E00008 */ jr $ra +/* 01060 809F03B0 03E00008 */ jr $ra /* 01064 809F03B4 00000000 */ nop /* 01068 809F03B8 00000000 */ nop /* 0106C 809F03BC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dns/EnDns_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Dns/EnDns_Init.s index ebc2596481..4f355702ed 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dns/EnDns_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dns/EnDns_Init.s @@ -1,93 +1,93 @@ glabel EnDns_Init /* 00000 809EF350 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 -/* 00004 809EF354 AFBF002C */ sw $ra, 0x002C($sp) -/* 00008 809EF358 AFB00028 */ sw $s0, 0x0028($sp) -/* 0000C 809EF35C AFA50044 */ sw $a1, 0x0044($sp) +/* 00004 809EF354 AFBF002C */ sw $ra, 0x002C($sp) +/* 00008 809EF358 AFB00028 */ sw $s0, 0x0028($sp) +/* 0000C 809EF35C AFA50044 */ sw $a1, 0x0044($sp) /* 00010 809EF360 8486001C */ lh $a2, 0x001C($a0) ## 0000001C /* 00014 809EF364 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 00018 809EF368 24010006 */ addiu $at, $zero, 0x0006 ## $at = 00000006 -/* 0001C 809EF36C 04C10009 */ bgez $a2, .L809EF394 +/* 0001C 809EF36C 04C10009 */ bgez $a2, .L809EF394 /* 00020 809EF370 3C04809F */ lui $a0, %hi(D_809F06C8) ## $a0 = 809F0000 /* 00024 809EF374 3C04809F */ lui $a0, %hi(D_809F0694) ## $a0 = 809F0000 /* 00028 809EF378 24840694 */ addiu $a0, $a0, %lo(D_809F0694) ## $a0 = 809F0694 /* 0002C 809EF37C 0C00084C */ jal osSyncPrintf - + /* 00030 809EF380 00C02825 */ or $a1, $a2, $zero ## $a1 = 00000000 /* 00034 809EF384 0C00B55C */ jal Actor_Kill - + /* 00038 809EF388 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0003C 809EF38C 10000055 */ beq $zero, $zero, .L809EF4E4 -/* 00040 809EF390 8FBF002C */ lw $ra, 0x002C($sp) +/* 0003C 809EF38C 10000055 */ beq $zero, $zero, .L809EF4E4 +/* 00040 809EF390 8FBF002C */ lw $ra, 0x002C($sp) .L809EF394: -/* 00044 809EF394 14C1000D */ bne $a2, $at, .L809EF3CC +/* 00044 809EF394 14C1000D */ bne $a2, $at, .L809EF3CC /* 00048 809EF398 248406C8 */ addiu $a0, $a0, %lo(D_809F06C8) ## $a0 = 000006C8 /* 0004C 809EF39C 3C0E8016 */ lui $t6, 0x8016 ## $t6 = 80160000 /* 00050 809EF3A0 8DCEE664 */ lw $t6, -0x199C($t6) ## 8015E664 /* 00054 809EF3A4 24010005 */ addiu $at, $zero, 0x0005 ## $at = 00000005 /* 00058 809EF3A8 24020011 */ addiu $v0, $zero, 0x0011 ## $v0 = 00000011 -/* 0005C 809EF3AC 11C00003 */ beq $t6, $zero, .L809EF3BC +/* 0005C 809EF3AC 11C00003 */ beq $t6, $zero, .L809EF3BC /* 00060 809EF3B0 240F0003 */ addiu $t7, $zero, 0x0003 ## $t7 = 00000003 -/* 00064 809EF3B4 10000001 */ beq $zero, $zero, .L809EF3BC +/* 00064 809EF3B4 10000001 */ beq $zero, $zero, .L809EF3BC /* 00068 809EF3B8 24020005 */ addiu $v0, $zero, 0x0005 ## $v0 = 00000005 .L809EF3BC: -/* 0006C 809EF3BC 54410004 */ bnel $v0, $at, .L809EF3D0 -/* 00070 809EF3C0 0006C080 */ sll $t8, $a2, 2 +/* 0006C 809EF3BC 54410004 */ bnel $v0, $at, .L809EF3D0 +/* 00070 809EF3C0 0006C080 */ sll $t8, $a2, 2 /* 00074 809EF3C4 A60F001C */ sh $t7, 0x001C($s0) ## 0000001C /* 00078 809EF3C8 8606001C */ lh $a2, 0x001C($s0) ## 0000001C .L809EF3CC: -/* 0007C 809EF3CC 0006C080 */ sll $t8, $a2, 2 +/* 0007C 809EF3CC 0006C080 */ sll $t8, $a2, 2 .L809EF3D0: /* 00080 809EF3D0 3C05809F */ lui $a1, %hi(D_809F0424) ## $a1 = 809F0000 -/* 00084 809EF3D4 00B82821 */ addu $a1, $a1, $t8 +/* 00084 809EF3D4 00B82821 */ addu $a1, $a1, $t8 /* 00088 809EF3D8 0C00084C */ jal osSyncPrintf - -/* 0008C 809EF3DC 8CA50424 */ lw $a1, %lo(D_809F0424)($a1) + +/* 0008C 809EF3DC 8CA50424 */ lw $a1, %lo(D_809F0424)($a1) /* 00090 809EF3E0 3C05809F */ lui $a1, %hi(D_809F052C) ## $a1 = 809F0000 /* 00094 809EF3E4 24A5052C */ addiu $a1, $a1, %lo(D_809F052C) ## $a1 = 809F052C /* 00098 809EF3E8 0C01E037 */ jal Actor_ProcessInitChain - + /* 0009C 809EF3EC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 000A0 809EF3F0 3C060600 */ lui $a2, 0x0600 ## $a2 = 06000000 /* 000A4 809EF3F4 3C070600 */ lui $a3, 0x0600 ## $a3 = 06000000 /* 000A8 809EF3F8 26190190 */ addiu $t9, $s0, 0x0190 ## $t9 = 00000190 /* 000AC 809EF3FC 260801FC */ addiu $t0, $s0, 0x01FC ## $t0 = 000001FC /* 000B0 809EF400 24090012 */ addiu $t1, $zero, 0x0012 ## $t1 = 00000012 -/* 000B4 809EF404 AFA90018 */ sw $t1, 0x0018($sp) -/* 000B8 809EF408 AFA80014 */ sw $t0, 0x0014($sp) -/* 000BC 809EF40C AFB90010 */ sw $t9, 0x0010($sp) +/* 000B4 809EF404 AFA90018 */ sw $t1, 0x0018($sp) +/* 000B8 809EF408 AFA80014 */ sw $t0, 0x0014($sp) +/* 000BC 809EF40C AFB90010 */ sw $t9, 0x0010($sp) /* 000C0 809EF410 24E709A0 */ addiu $a3, $a3, 0x09A0 ## $a3 = 060009A0 /* 000C4 809EF414 24C641A8 */ addiu $a2, $a2, 0x41A8 ## $a2 = 060041A8 -/* 000C8 809EF418 8FA40044 */ lw $a0, 0x0044($sp) -/* 000CC 809EF41C 0C0291BE */ jal func_800A46F8 +/* 000C8 809EF418 8FA40044 */ lw $a0, 0x0044($sp) +/* 000CC 809EF41C 0C0291BE */ jal SkelAnime_InitSV /* 000D0 809EF420 2605014C */ addiu $a1, $s0, 0x014C ## $a1 = 0000014C /* 000D4 809EF424 2605026C */ addiu $a1, $s0, 0x026C ## $a1 = 0000026C -/* 000D8 809EF428 AFA50034 */ sw $a1, 0x0034($sp) +/* 000D8 809EF428 AFA50034 */ sw $a1, 0x0034($sp) /* 000DC 809EF42C 0C0170D9 */ jal ActorCollider_AllocCylinder - -/* 000E0 809EF430 8FA40044 */ lw $a0, 0x0044($sp) + +/* 000E0 809EF430 8FA40044 */ lw $a0, 0x0044($sp) /* 000E4 809EF434 3C07809F */ lui $a3, %hi(D_809F03E0) ## $a3 = 809F0000 -/* 000E8 809EF438 8FA50034 */ lw $a1, 0x0034($sp) +/* 000E8 809EF438 8FA50034 */ lw $a1, 0x0034($sp) /* 000EC 809EF43C 24E703E0 */ addiu $a3, $a3, %lo(D_809F03E0) ## $a3 = 809F03E0 -/* 000F0 809EF440 8FA40044 */ lw $a0, 0x0044($sp) -/* 000F4 809EF444 0C017114 */ jal func_8005C450 +/* 000F0 809EF440 8FA40044 */ lw $a0, 0x0044($sp) +/* 000F4 809EF444 0C017114 */ jal func_8005C450 /* 000F8 809EF448 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 000FC 809EF44C 3C068003 */ lui $a2, 0x8003 ## $a2 = 80030000 /* 00100 809EF450 24C6B5EC */ addiu $a2, $a2, 0xB5EC ## $a2 = 8002B5EC /* 00104 809EF454 260400B4 */ addiu $a0, $s0, 0x00B4 ## $a0 = 000000B4 /* 00108 809EF458 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 /* 0010C 809EF45C 0C00AC78 */ jal ActorShape_Init - + /* 00110 809EF460 3C07420C */ lui $a3, 0x420C ## $a3 = 420C0000 /* 00114 809EF464 860A001C */ lh $t2, 0x001C($s0) ## 0000001C /* 00118 809EF468 3C0C809F */ lui $t4, %hi(D_809F040C) ## $t4 = 809F0000 /* 0011C 809EF46C 3C053C23 */ lui $a1, 0x3C23 ## $a1 = 3C230000 -/* 00120 809EF470 000A5840 */ sll $t3, $t2, 1 -/* 00124 809EF474 018B6021 */ addu $t4, $t4, $t3 -/* 00128 809EF478 958C040C */ lhu $t4, %lo(D_809F040C)($t4) +/* 00120 809EF470 000A5840 */ sll $t3, $t2, 1 +/* 00124 809EF474 018B6021 */ addu $t4, $t4, $t3 +/* 00128 809EF478 958C040C */ lhu $t4, %lo(D_809F040C)($t4) /* 0012C 809EF47C 34A5D70A */ ori $a1, $a1, 0xD70A ## $a1 = 3C23D70A /* 00130 809EF480 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 00134 809EF484 0C00B58B */ jal Actor_SetScale - + /* 00138 809EF488 A60C010E */ sh $t4, 0x010E($s0) ## 0000010E /* 0013C 809EF48C 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 /* 00140 809EF490 860E001C */ lh $t6, 0x001C($s0) ## 0000001C @@ -96,25 +96,25 @@ glabel EnDns_Init /* 0014C 809EF49C 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 /* 00150 809EF4A0 240D00FF */ addiu $t5, $zero, 0x00FF ## $t5 = 000000FF /* 00154 809EF4A4 3C18809F */ lui $t8, %hi(D_809F0500) ## $t8 = 809F0000 -/* 00158 809EF4A8 000E7880 */ sll $t7, $t6, 2 +/* 00158 809EF4A8 000E7880 */ sll $t7, $t6, 2 /* 0015C 809EF4AC A20D00AE */ sb $t5, 0x00AE($s0) ## 000000AE /* 00160 809EF4B0 A20202BB */ sb $v0, 0x02BB($s0) ## 000002BB /* 00164 809EF4B4 A20202BC */ sb $v0, 0x02BC($s0) ## 000002BC /* 00168 809EF4B8 A20002BD */ sb $zero, 0x02BD($s0) ## 000002BD -/* 0016C 809EF4BC 030FC021 */ addu $t8, $t8, $t7 +/* 0016C 809EF4BC 030FC021 */ addu $t8, $t8, $t7 /* 00170 809EF4C0 E6000068 */ swc1 $f0, 0x0068($s0) ## 00000068 /* 00174 809EF4C4 E6000060 */ swc1 $f0, 0x0060($s0) ## 00000060 /* 00178 809EF4C8 E604006C */ swc1 $f4, 0x006C($s0) ## 0000006C -/* 0017C 809EF4CC 8F180500 */ lw $t8, %lo(D_809F0500)($t8) +/* 0017C 809EF4CC 8F180500 */ lw $t8, %lo(D_809F0500)($t8) /* 00180 809EF4D0 3C19809F */ lui $t9, %hi(func_809EFB84) ## $t9 = 809F0000 /* 00184 809EF4D4 2739FB84 */ addiu $t9, $t9, %lo(func_809EFB84) ## $t9 = 809EFB84 /* 00188 809EF4D8 AE190268 */ sw $t9, 0x0268($s0) ## 00000268 /* 0018C 809EF4DC AE1802C0 */ sw $t8, 0x02C0($s0) ## 000002C0 -/* 00190 809EF4E0 8FBF002C */ lw $ra, 0x002C($sp) +/* 00190 809EF4E0 8FBF002C */ lw $ra, 0x002C($sp) .L809EF4E4: -/* 00194 809EF4E4 8FB00028 */ lw $s0, 0x0028($sp) +/* 00194 809EF4E4 8FB00028 */ lw $s0, 0x0028($sp) /* 00198 809EF4E8 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 -/* 0019C 809EF4EC 03E00008 */ jr $ra +/* 0019C 809EF4EC 03E00008 */ jr $ra /* 001A0 809EF4F0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dns/func_809EF51C.s b/asm/non_matchings/overlays/actors/ovl_En_Dns/func_809EF51C.s index 00946b2b72..e67852436b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dns/func_809EF51C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dns/func_809EF51C.s @@ -1,39 +1,39 @@ glabel func_809EF51C /* 001CC 809EF51C 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 001D0 809EF520 AFA50034 */ sw $a1, 0x0034($sp) -/* 001D4 809EF524 93AE0037 */ lbu $t6, 0x0037($sp) +/* 001D0 809EF520 AFA50034 */ sw $a1, 0x0034($sp) +/* 001D4 809EF524 93AE0037 */ lbu $t6, 0x0037($sp) /* 001D8 809EF528 3C18809F */ lui $t8, %hi(D_809F0538) ## $t8 = 809F0000 /* 001DC 809EF52C 27180538 */ addiu $t8, $t8, %lo(D_809F0538) ## $t8 = 809F0538 -/* 001E0 809EF530 000E7880 */ sll $t7, $t6, 2 -/* 001E4 809EF534 01EE7823 */ subu $t7, $t7, $t6 -/* 001E8 809EF538 000F7880 */ sll $t7, $t7, 2 -/* 001EC 809EF53C AFBF0024 */ sw $ra, 0x0024($sp) -/* 001F0 809EF540 AFA40030 */ sw $a0, 0x0030($sp) -/* 001F4 809EF544 01F81821 */ addu $v1, $t7, $t8 +/* 001E0 809EF530 000E7880 */ sll $t7, $t6, 2 +/* 001E4 809EF534 01EE7823 */ subu $t7, $t7, $t6 +/* 001E8 809EF538 000F7880 */ sll $t7, $t7, 2 +/* 001EC 809EF53C AFBF0024 */ sw $ra, 0x0024($sp) +/* 001F0 809EF540 AFA40030 */ sw $a0, 0x0030($sp) +/* 001F4 809EF544 01F81821 */ addu $v1, $t7, $t8 /* 001F8 809EF548 8C640000 */ lw $a0, 0x0000($v1) ## 00000000 /* 001FC 809EF54C 0C028800 */ jal SkelAnime_GetFrameCount - -/* 00200 809EF550 AFA30028 */ sw $v1, 0x0028($sp) -/* 00204 809EF554 8FA80030 */ lw $t0, 0x0030($sp) -/* 00208 809EF558 93B90037 */ lbu $t9, 0x0037($sp) + +/* 00200 809EF550 AFA30028 */ sw $v1, 0x0028($sp) +/* 00204 809EF554 8FA80030 */ lw $t0, 0x0030($sp) +/* 00208 809EF558 93B90037 */ lbu $t9, 0x0037($sp) /* 0020C 809EF55C 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 -/* 00210 809EF560 8FA30028 */ lw $v1, 0x0028($sp) +/* 00210 809EF560 8FA30028 */ lw $v1, 0x0028($sp) /* 00214 809EF564 A11902BA */ sb $t9, 0x02BA($t0) ## 000002BA -/* 00218 809EF568 468021A0 */ cvt.s.w $f6, $f4 +/* 00218 809EF568 468021A0 */ cvt.s.w $f6, $f4 /* 0021C 809EF56C C4680008 */ lwc1 $f8, 0x0008($v1) ## 00000008 /* 00220 809EF570 90690004 */ lbu $t1, 0x0004($v1) ## 00000004 /* 00224 809EF574 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 00228 809EF578 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 /* 0022C 809EF57C 2504014C */ addiu $a0, $t0, 0x014C ## $a0 = 0000014C -/* 00230 809EF580 E7A60010 */ swc1 $f6, 0x0010($sp) +/* 00230 809EF580 E7A60010 */ swc1 $f6, 0x0010($sp) /* 00234 809EF584 8C650000 */ lw $a1, 0x0000($v1) ## 00000000 -/* 00238 809EF588 E7A80018 */ swc1 $f8, 0x0018($sp) -/* 0023C 809EF58C 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 00240 809EF590 AFA90014 */ sw $t1, 0x0014($sp) -/* 00244 809EF594 8FBF0024 */ lw $ra, 0x0024($sp) +/* 00238 809EF588 E7A80018 */ swc1 $f8, 0x0018($sp) +/* 0023C 809EF58C 0C029468 */ jal SkelAnime_ChangeAnim + +/* 00240 809EF590 AFA90014 */ sw $t1, 0x0014($sp) +/* 00244 809EF594 8FBF0024 */ lw $ra, 0x0024($sp) /* 00248 809EF598 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 0024C 809EF59C 03E00008 */ jr $ra +/* 0024C 809EF59C 03E00008 */ jr $ra /* 00250 809EF5A0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Jiji/EnDntJiji_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Jiji/EnDntJiji_Draw.s index bb7845b3b3..43478d7930 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Jiji/EnDntJiji_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Jiji/EnDntJiji_Draw.s @@ -11,7 +11,7 @@ glabel EnDntJiji_Draw /* 01344 809F2E24 24C630B8 */ addiu $a2, $a2, %lo(D_809F30B8) ## $a2 = 809F30B8 /* 01348 809F2E28 27A40040 */ addiu $a0, $sp, 0x0040 ## $a0 = FFFFFFE8 /* 0134C 809F2E2C 240703FB */ addiu $a3, $zero, 0x03FB ## $a3 = 000003FB -/* 01350 809F2E30 0C031AB1 */ jal func_800C6AC4 +/* 01350 809F2E30 0C031AB1 */ jal Graph_OpenDisps /* 01354 809F2E34 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 /* 01358 809F2E38 0C024F46 */ jal func_80093D18 /* 0135C 809F2E3C 8E440000 */ lw $a0, 0x0000($s2) ## 00000000 @@ -87,7 +87,7 @@ glabel EnDntJiji_Draw /* 01470 809F2F50 8E450000 */ lw $a1, 0x0000($s2) ## 00000000 /* 01474 809F2F54 24C630E0 */ addiu $a2, $a2, %lo(D_809F30E0) ## $a2 = 809F30E0 /* 01478 809F2F58 27A40040 */ addiu $a0, $sp, 0x0040 ## $a0 = FFFFFFE8 -/* 0147C 809F2F5C 0C031AD5 */ jal func_800C6B54 +/* 0147C 809F2F5C 0C031AD5 */ jal Graph_CloseDisps /* 01480 809F2F60 24070413 */ addiu $a3, $zero, 0x0413 ## $a3 = 00000413 /* 01484 809F2F64 8FBF002C */ lw $ra, 0x002C($sp) /* 01488 809F2F68 8FB00020 */ lw $s0, 0x0020($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Jiji/func_809F1C44.s b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Jiji/func_809F1C44.s index cf0788e4d6..5b10f2c5ad 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Jiji/func_809F1C44.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Jiji/func_809F1C44.s @@ -1,36 +1,36 @@ glabel func_809F1C44 /* 00164 809F1C44 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 00168 809F1C48 AFB00028 */ sw $s0, 0x0028($sp) +/* 00168 809F1C48 AFB00028 */ sw $s0, 0x0028($sp) /* 0016C 809F1C4C 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00170 809F1C50 AFBF002C */ sw $ra, 0x002C($sp) +/* 00170 809F1C50 AFBF002C */ sw $ra, 0x002C($sp) /* 00174 809F1C54 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 -/* 00178 809F1C58 AFA50034 */ sw $a1, 0x0034($sp) +/* 00178 809F1C58 AFA50034 */ sw $a1, 0x0034($sp) /* 0017C 809F1C5C 0C028800 */ jal SkelAnime_GetFrameCount - + /* 00180 809F1C60 24840560 */ addiu $a0, $a0, 0x0560 ## $a0 = 06000560 /* 00184 809F1C64 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 00188 809F1C68 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 /* 0018C 809F1C6C 3C01C120 */ lui $at, 0xC120 ## $at = C1200000 -/* 00190 809F1C70 468021A0 */ cvt.s.w $f6, $f4 +/* 00190 809F1C70 468021A0 */ cvt.s.w $f6, $f4 /* 00194 809F1C74 44819000 */ mtc1 $at, $f18 ## $f18 = -10.00 /* 00198 809F1C78 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 0019C 809F1C7C 44060000 */ mfc1 $a2, $f0 -/* 001A0 809F1C80 44070000 */ mfc1 $a3, $f0 +/* 0019C 809F1C7C 44060000 */ mfc1 $a2, $f0 +/* 001A0 809F1C80 44070000 */ mfc1 $a3, $f0 /* 001A4 809F1C84 24A50560 */ addiu $a1, $a1, 0x0560 ## $a1 = 06000560 -/* 001A8 809F1C88 4600320D */ trunc.w.s $f8, $f6 +/* 001A8 809F1C88 4600320D */ trunc.w.s $f8, $f6 /* 001AC 809F1C8C 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C -/* 001B0 809F1C90 440F4000 */ mfc1 $t7, $f8 +/* 001B0 809F1C90 440F4000 */ mfc1 $t7, $f8 /* 001B4 809F1C94 00000000 */ nop /* 001B8 809F1C98 A60F0248 */ sh $t7, 0x0248($s0) ## 00000248 /* 001BC 809F1C9C 86180248 */ lh $t8, 0x0248($s0) ## 00000248 -/* 001C0 809F1CA0 AFA00014 */ sw $zero, 0x0014($sp) -/* 001C4 809F1CA4 E7B20018 */ swc1 $f18, 0x0018($sp) +/* 001C0 809F1CA0 AFA00014 */ sw $zero, 0x0014($sp) +/* 001C4 809F1CA4 E7B20018 */ swc1 $f18, 0x0018($sp) /* 001C8 809F1CA8 44985000 */ mtc1 $t8, $f10 ## $f10 = 0.00 /* 001CC 809F1CAC 00000000 */ nop -/* 001D0 809F1CB0 46805420 */ cvt.s.w $f16, $f10 -/* 001D4 809F1CB4 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 001D8 809F1CB8 E7B00010 */ swc1 $f16, 0x0010($sp) +/* 001D0 809F1CB0 46805420 */ cvt.s.w $f16, $f10 +/* 001D4 809F1CB4 0C029468 */ jal SkelAnime_ChangeAnim + +/* 001D8 809F1CB8 E7B00010 */ swc1 $f16, 0x0010($sp) /* 001DC 809F1CBC 3C014100 */ lui $at, 0x4100 ## $at = 41000000 /* 001E0 809F1CC0 A600023E */ sh $zero, 0x023E($s0) ## 0000023E /* 001E4 809F1CC4 44812000 */ mtc1 $at, $f4 ## $f4 = 8.00 @@ -40,10 +40,10 @@ glabel func_809F1C44 /* 001F4 809F1CD4 AE08022C */ sw $t0, 0x022C($s0) ## 0000022C /* 001F8 809F1CD8 E6040164 */ swc1 $f4, 0x0164($s0) ## 00000164 /* 001FC 809F1CDC A219023C */ sb $t9, 0x023C($s0) ## 0000023C -/* 00200 809F1CE0 8FBF002C */ lw $ra, 0x002C($sp) -/* 00204 809F1CE4 8FB00028 */ lw $s0, 0x0028($sp) +/* 00200 809F1CE0 8FBF002C */ lw $ra, 0x002C($sp) +/* 00204 809F1CE4 8FB00028 */ lw $s0, 0x0028($sp) /* 00208 809F1CE8 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 0020C 809F1CEC 03E00008 */ jr $ra +/* 0020C 809F1CEC 03E00008 */ jr $ra /* 00210 809F1CF0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Jiji/func_809F1DA8.s b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Jiji/func_809F1DA8.s index a3d7a5d8b4..543ad4bf11 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Jiji/func_809F1DA8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Jiji/func_809F1DA8.s @@ -1,63 +1,63 @@ glabel func_809F1DA8 /* 002C8 809F1DA8 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 002CC 809F1DAC AFB00030 */ sw $s0, 0x0030($sp) +/* 002CC 809F1DAC AFB00030 */ sw $s0, 0x0030($sp) /* 002D0 809F1DB0 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 002D4 809F1DB4 AFBF0034 */ sw $ra, 0x0034($sp) +/* 002D4 809F1DB4 AFBF0034 */ sw $ra, 0x0034($sp) /* 002D8 809F1DB8 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 -/* 002DC 809F1DBC AFA5003C */ sw $a1, 0x003C($sp) +/* 002DC 809F1DBC AFA5003C */ sw $a1, 0x003C($sp) /* 002E0 809F1DC0 0C028800 */ jal SkelAnime_GetFrameCount - + /* 002E4 809F1DC4 248412B0 */ addiu $a0, $a0, 0x12B0 ## $a0 = 060012B0 /* 002E8 809F1DC8 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 002EC 809F1DCC 3C01C120 */ lui $at, 0xC120 ## $at = C1200000 /* 002F0 809F1DD0 44819000 */ mtc1 $at, $f18 ## $f18 = -10.00 -/* 002F4 809F1DD4 468021A0 */ cvt.s.w $f6, $f4 +/* 002F4 809F1DD4 468021A0 */ cvt.s.w $f6, $f4 /* 002F8 809F1DD8 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 002FC 809F1DDC 24190002 */ addiu $t9, $zero, 0x0002 ## $t9 = 00000002 /* 00300 809F1DE0 24A512B0 */ addiu $a1, $a1, 0x12B0 ## $a1 = 060012B0 /* 00304 809F1DE4 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C /* 00308 809F1DE8 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 0030C 809F1DEC 4600320D */ trunc.w.s $f8, $f6 +/* 0030C 809F1DEC 4600320D */ trunc.w.s $f8, $f6 /* 00310 809F1DF0 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 00314 809F1DF4 440F4000 */ mfc1 $t7, $f8 +/* 00314 809F1DF4 440F4000 */ mfc1 $t7, $f8 /* 00318 809F1DF8 00000000 */ nop /* 0031C 809F1DFC A60F0248 */ sh $t7, 0x0248($s0) ## 00000248 /* 00320 809F1E00 86180248 */ lh $t8, 0x0248($s0) ## 00000248 -/* 00324 809F1E04 AFB90014 */ sw $t9, 0x0014($sp) -/* 00328 809F1E08 E7B20018 */ swc1 $f18, 0x0018($sp) +/* 00324 809F1E04 AFB90014 */ sw $t9, 0x0014($sp) +/* 00328 809F1E08 E7B20018 */ swc1 $f18, 0x0018($sp) /* 0032C 809F1E0C 44985000 */ mtc1 $t8, $f10 ## $f10 = 0.00 /* 00330 809F1E10 00000000 */ nop -/* 00334 809F1E14 46805420 */ cvt.s.w $f16, $f10 -/* 00338 809F1E18 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 0033C 809F1E1C E7B00010 */ swc1 $f16, 0x0010($sp) +/* 00334 809F1E14 46805420 */ cvt.s.w $f16, $f10 +/* 00338 809F1E18 0C029468 */ jal SkelAnime_ChangeAnim + +/* 0033C 809F1E1C E7B00010 */ swc1 $f16, 0x0010($sp) /* 00340 809F1E20 2408000F */ addiu $t0, $zero, 0x000F ## $t0 = 0000000F /* 00344 809F1E24 24090005 */ addiu $t1, $zero, 0x0005 ## $t1 = 00000005 /* 00348 809F1E28 240A0014 */ addiu $t2, $zero, 0x0014 ## $t2 = 00000014 /* 0034C 809F1E2C 240BFFFF */ addiu $t3, $zero, 0xFFFF ## $t3 = FFFFFFFF /* 00350 809F1E30 240C000A */ addiu $t4, $zero, 0x000A ## $t4 = 0000000A -/* 00354 809F1E34 AFAC0020 */ sw $t4, 0x0020($sp) -/* 00358 809F1E38 AFAB001C */ sw $t3, 0x001C($sp) -/* 0035C 809F1E3C AFAA0018 */ sw $t2, 0x0018($sp) -/* 00360 809F1E40 AFA90014 */ sw $t1, 0x0014($sp) -/* 00364 809F1E44 AFA80010 */ sw $t0, 0x0010($sp) -/* 00368 809F1E48 8FA4003C */ lw $a0, 0x003C($sp) +/* 00354 809F1E34 AFAC0020 */ sw $t4, 0x0020($sp) +/* 00358 809F1E38 AFAB001C */ sw $t3, 0x001C($sp) +/* 0035C 809F1E3C AFAA0018 */ sw $t2, 0x0018($sp) +/* 00360 809F1E40 AFA90014 */ sw $t1, 0x0014($sp) +/* 00364 809F1E44 AFA80010 */ sw $t0, 0x0010($sp) +/* 00368 809F1E48 8FA4003C */ lw $a0, 0x003C($sp) /* 0036C 809F1E4C 26050024 */ addiu $a1, $s0, 0x0024 ## $a1 = 00000024 /* 00370 809F1E50 3C0640C0 */ lui $a2, 0x40C0 ## $a2 = 40C00000 /* 00374 809F1E54 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 00378 809F1E58 0C00A5E9 */ jal func_800297A4 -/* 0037C 809F1E5C AFA00024 */ sw $zero, 0x0024($sp) +/* 00378 809F1E58 0C00A5E9 */ jal func_800297A4 +/* 0037C 809F1E5C AFA00024 */ sw $zero, 0x0024($sp) /* 00380 809F1E60 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 00384 809F1E64 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 00388 809F1E68 2405387C */ addiu $a1, $zero, 0x387C ## $a1 = 0000387C /* 0038C 809F1E6C 3C0D809F */ lui $t5, %hi(func_809F1E8C) ## $t5 = 809F0000 /* 00390 809F1E70 25AD1E8C */ addiu $t5, $t5, %lo(func_809F1E8C) ## $t5 = 809F1E8C /* 00394 809F1E74 AE0D022C */ sw $t5, 0x022C($s0) ## 0000022C -/* 00398 809F1E78 8FBF0034 */ lw $ra, 0x0034($sp) -/* 0039C 809F1E7C 8FB00030 */ lw $s0, 0x0030($sp) +/* 00398 809F1E78 8FBF0034 */ lw $ra, 0x0034($sp) +/* 0039C 809F1E7C 8FB00030 */ lw $s0, 0x0030($sp) /* 003A0 809F1E80 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 -/* 003A4 809F1E84 03E00008 */ jr $ra +/* 003A4 809F1E84 03E00008 */ jr $ra /* 003A8 809F1E88 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Jiji/func_809F1EFC.s b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Jiji/func_809F1EFC.s index f3800929ca..c72b63a40f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Jiji/func_809F1EFC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Jiji/func_809F1EFC.s @@ -1,63 +1,63 @@ glabel func_809F1EFC /* 0041C 809F1EFC 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 00420 809F1F00 AFB00030 */ sw $s0, 0x0030($sp) +/* 00420 809F1F00 AFB00030 */ sw $s0, 0x0030($sp) /* 00424 809F1F04 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00428 809F1F08 AFBF0034 */ sw $ra, 0x0034($sp) +/* 00428 809F1F08 AFBF0034 */ sw $ra, 0x0034($sp) /* 0042C 809F1F0C 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 -/* 00430 809F1F10 AFA5003C */ sw $a1, 0x003C($sp) +/* 00430 809F1F10 AFA5003C */ sw $a1, 0x003C($sp) /* 00434 809F1F14 0C028800 */ jal SkelAnime_GetFrameCount - + /* 00438 809F1F18 24840DF8 */ addiu $a0, $a0, 0x0DF8 ## $a0 = 06000DF8 /* 0043C 809F1F1C 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 00440 809F1F20 3C01C120 */ lui $at, 0xC120 ## $at = C1200000 /* 00444 809F1F24 44819000 */ mtc1 $at, $f18 ## $f18 = -10.00 -/* 00448 809F1F28 468021A0 */ cvt.s.w $f6, $f4 +/* 00448 809F1F28 468021A0 */ cvt.s.w $f6, $f4 /* 0044C 809F1F2C 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 00450 809F1F30 24190002 */ addiu $t9, $zero, 0x0002 ## $t9 = 00000002 /* 00454 809F1F34 24A50DF8 */ addiu $a1, $a1, 0x0DF8 ## $a1 = 06000DF8 /* 00458 809F1F38 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C /* 0045C 809F1F3C 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 00460 809F1F40 4600320D */ trunc.w.s $f8, $f6 +/* 00460 809F1F40 4600320D */ trunc.w.s $f8, $f6 /* 00464 809F1F44 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 00468 809F1F48 440F4000 */ mfc1 $t7, $f8 +/* 00468 809F1F48 440F4000 */ mfc1 $t7, $f8 /* 0046C 809F1F4C 00000000 */ nop /* 00470 809F1F50 A60F0248 */ sh $t7, 0x0248($s0) ## 00000248 /* 00474 809F1F54 86180248 */ lh $t8, 0x0248($s0) ## 00000248 -/* 00478 809F1F58 AFB90014 */ sw $t9, 0x0014($sp) -/* 0047C 809F1F5C E7B20018 */ swc1 $f18, 0x0018($sp) +/* 00478 809F1F58 AFB90014 */ sw $t9, 0x0014($sp) +/* 0047C 809F1F5C E7B20018 */ swc1 $f18, 0x0018($sp) /* 00480 809F1F60 44985000 */ mtc1 $t8, $f10 ## $f10 = 0.00 /* 00484 809F1F64 00000000 */ nop -/* 00488 809F1F68 46805420 */ cvt.s.w $f16, $f10 -/* 0048C 809F1F6C 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 00490 809F1F70 E7B00010 */ swc1 $f16, 0x0010($sp) +/* 00488 809F1F68 46805420 */ cvt.s.w $f16, $f10 +/* 0048C 809F1F6C 0C029468 */ jal SkelAnime_ChangeAnim + +/* 00490 809F1F70 E7B00010 */ swc1 $f16, 0x0010($sp) /* 00494 809F1F74 2408000F */ addiu $t0, $zero, 0x000F ## $t0 = 0000000F /* 00498 809F1F78 24090005 */ addiu $t1, $zero, 0x0005 ## $t1 = 00000005 /* 0049C 809F1F7C 240A0014 */ addiu $t2, $zero, 0x0014 ## $t2 = 00000014 /* 004A0 809F1F80 240BFFFF */ addiu $t3, $zero, 0xFFFF ## $t3 = FFFFFFFF /* 004A4 809F1F84 240C000A */ addiu $t4, $zero, 0x000A ## $t4 = 0000000A -/* 004A8 809F1F88 AFAC0020 */ sw $t4, 0x0020($sp) -/* 004AC 809F1F8C AFAB001C */ sw $t3, 0x001C($sp) -/* 004B0 809F1F90 AFAA0018 */ sw $t2, 0x0018($sp) -/* 004B4 809F1F94 AFA90014 */ sw $t1, 0x0014($sp) -/* 004B8 809F1F98 AFA80010 */ sw $t0, 0x0010($sp) -/* 004BC 809F1F9C 8FA4003C */ lw $a0, 0x003C($sp) +/* 004A8 809F1F88 AFAC0020 */ sw $t4, 0x0020($sp) +/* 004AC 809F1F8C AFAB001C */ sw $t3, 0x001C($sp) +/* 004B0 809F1F90 AFAA0018 */ sw $t2, 0x0018($sp) +/* 004B4 809F1F94 AFA90014 */ sw $t1, 0x0014($sp) +/* 004B8 809F1F98 AFA80010 */ sw $t0, 0x0010($sp) +/* 004BC 809F1F9C 8FA4003C */ lw $a0, 0x003C($sp) /* 004C0 809F1FA0 26050024 */ addiu $a1, $s0, 0x0024 ## $a1 = 00000024 /* 004C4 809F1FA4 3C0640C0 */ lui $a2, 0x40C0 ## $a2 = 40C00000 /* 004C8 809F1FA8 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 004CC 809F1FAC 0C00A5E9 */ jal func_800297A4 -/* 004D0 809F1FB0 AFA00024 */ sw $zero, 0x0024($sp) +/* 004CC 809F1FAC 0C00A5E9 */ jal func_800297A4 +/* 004D0 809F1FB0 AFA00024 */ sw $zero, 0x0024($sp) /* 004D4 809F1FB4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 004D8 809F1FB8 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 004DC 809F1FBC 2405387C */ addiu $a1, $zero, 0x387C ## $a1 = 0000387C /* 004E0 809F1FC0 3C0D809F */ lui $t5, %hi(func_809F1FE0) ## $t5 = 809F0000 /* 004E4 809F1FC4 25AD1FE0 */ addiu $t5, $t5, %lo(func_809F1FE0) ## $t5 = 809F1FE0 /* 004E8 809F1FC8 AE0D022C */ sw $t5, 0x022C($s0) ## 0000022C -/* 004EC 809F1FCC 8FBF0034 */ lw $ra, 0x0034($sp) -/* 004F0 809F1FD0 8FB00030 */ lw $s0, 0x0030($sp) +/* 004EC 809F1FCC 8FBF0034 */ lw $ra, 0x0034($sp) +/* 004F0 809F1FD0 8FB00030 */ lw $s0, 0x0030($sp) /* 004F4 809F1FD4 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 -/* 004F8 809F1FD8 03E00008 */ jr $ra +/* 004F8 809F1FD8 03E00008 */ jr $ra /* 004FC 809F1FDC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Jiji/func_809F2068.s b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Jiji/func_809F2068.s index 9f183d2cff..b365564ada 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Jiji/func_809F2068.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Jiji/func_809F2068.s @@ -1,35 +1,35 @@ glabel func_809F2068 /* 00588 809F2068 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 0058C 809F206C AFB00028 */ sw $s0, 0x0028($sp) +/* 0058C 809F206C AFB00028 */ sw $s0, 0x0028($sp) /* 00590 809F2070 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00594 809F2074 AFBF002C */ sw $ra, 0x002C($sp) +/* 00594 809F2074 AFBF002C */ sw $ra, 0x002C($sp) /* 00598 809F2078 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 -/* 0059C 809F207C AFA50034 */ sw $a1, 0x0034($sp) +/* 0059C 809F207C AFA50034 */ sw $a1, 0x0034($sp) /* 005A0 809F2080 0C028800 */ jal SkelAnime_GetFrameCount - + /* 005A4 809F2084 248437C0 */ addiu $a0, $a0, 0x37C0 ## $a0 = 060037C0 /* 005A8 809F2088 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 005AC 809F208C 3C01C120 */ lui $at, 0xC120 ## $at = C1200000 /* 005B0 809F2090 44819000 */ mtc1 $at, $f18 ## $f18 = -10.00 -/* 005B4 809F2094 468021A0 */ cvt.s.w $f6, $f4 +/* 005B4 809F2094 468021A0 */ cvt.s.w $f6, $f4 /* 005B8 809F2098 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 005BC 809F209C 24A537C0 */ addiu $a1, $a1, 0x37C0 ## $a1 = 060037C0 /* 005C0 809F20A0 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C /* 005C4 809F20A4 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 005C8 809F20A8 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 005CC 809F20AC 4600320D */ trunc.w.s $f8, $f6 -/* 005D0 809F20B0 440F4000 */ mfc1 $t7, $f8 +/* 005CC 809F20AC 4600320D */ trunc.w.s $f8, $f6 +/* 005D0 809F20B0 440F4000 */ mfc1 $t7, $f8 /* 005D4 809F20B4 00000000 */ nop /* 005D8 809F20B8 A60F0248 */ sh $t7, 0x0248($s0) ## 00000248 /* 005DC 809F20BC 86180248 */ lh $t8, 0x0248($s0) ## 00000248 -/* 005E0 809F20C0 AFA00014 */ sw $zero, 0x0014($sp) -/* 005E4 809F20C4 E7B20018 */ swc1 $f18, 0x0018($sp) +/* 005E0 809F20C0 AFA00014 */ sw $zero, 0x0014($sp) +/* 005E4 809F20C4 E7B20018 */ swc1 $f18, 0x0018($sp) /* 005E8 809F20C8 44985000 */ mtc1 $t8, $f10 ## $f10 = 0.00 /* 005EC 809F20CC 00000000 */ nop -/* 005F0 809F20D0 46805420 */ cvt.s.w $f16, $f10 -/* 005F4 809F20D4 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 005F8 809F20D8 E7B00010 */ swc1 $f16, 0x0010($sp) +/* 005F0 809F20D0 46805420 */ cvt.s.w $f16, $f10 +/* 005F4 809F20D4 0C029468 */ jal SkelAnime_ChangeAnim + +/* 005F8 809F20D8 E7B00010 */ swc1 $f16, 0x0010($sp) /* 005FC 809F20DC 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 /* 00600 809F20E0 44812000 */ mtc1 $at, $f4 ## $f4 = 1.00 /* 00604 809F20E4 3C09809F */ lui $t1, %hi(func_809F2118) ## $t1 = 809F0000 @@ -40,10 +40,10 @@ glabel func_809F2068 /* 00618 809F20F8 A608024A */ sh $t0, 0x024A($s0) ## 0000024A /* 0061C 809F20FC AE09022C */ sw $t1, 0x022C($s0) ## 0000022C /* 00620 809F2100 E6040068 */ swc1 $f4, 0x0068($s0) ## 00000068 -/* 00624 809F2104 8FBF002C */ lw $ra, 0x002C($sp) -/* 00628 809F2108 8FB00028 */ lw $s0, 0x0028($sp) +/* 00624 809F2104 8FBF002C */ lw $ra, 0x002C($sp) +/* 00628 809F2108 8FB00028 */ lw $s0, 0x0028($sp) /* 0062C 809F210C 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 00630 809F2110 03E00008 */ jr $ra +/* 00630 809F2110 03E00008 */ jr $ra /* 00634 809F2114 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Jiji/func_809F2254.s b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Jiji/func_809F2254.s index aab14ed9ad..f926c63181 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Jiji/func_809F2254.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Jiji/func_809F2254.s @@ -1,67 +1,67 @@ glabel func_809F2254 /* 00774 809F2254 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 00778 809F2258 AFB00030 */ sw $s0, 0x0030($sp) +/* 00778 809F2258 AFB00030 */ sw $s0, 0x0030($sp) /* 0077C 809F225C 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00780 809F2260 AFBF0034 */ sw $ra, 0x0034($sp) +/* 00780 809F2260 AFBF0034 */ sw $ra, 0x0034($sp) /* 00784 809F2264 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 -/* 00788 809F2268 AFA5003C */ sw $a1, 0x003C($sp) +/* 00788 809F2268 AFA5003C */ sw $a1, 0x003C($sp) /* 0078C 809F226C 0C028800 */ jal SkelAnime_GetFrameCount - + /* 00790 809F2270 24840560 */ addiu $a0, $a0, 0x0560 ## $a0 = 06000560 /* 00794 809F2274 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 00798 809F2278 3C01C120 */ lui $at, 0xC120 ## $at = C1200000 /* 0079C 809F227C 44819000 */ mtc1 $at, $f18 ## $f18 = -10.00 -/* 007A0 809F2280 468021A0 */ cvt.s.w $f6, $f4 +/* 007A0 809F2280 468021A0 */ cvt.s.w $f6, $f4 /* 007A4 809F2284 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 007A8 809F2288 24190002 */ addiu $t9, $zero, 0x0002 ## $t9 = 00000002 /* 007AC 809F228C 24A50560 */ addiu $a1, $a1, 0x0560 ## $a1 = 06000560 /* 007B0 809F2290 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C /* 007B4 809F2294 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 007B8 809F2298 4600320D */ trunc.w.s $f8, $f6 +/* 007B8 809F2298 4600320D */ trunc.w.s $f8, $f6 /* 007BC 809F229C 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 007C0 809F22A0 440F4000 */ mfc1 $t7, $f8 +/* 007C0 809F22A0 440F4000 */ mfc1 $t7, $f8 /* 007C4 809F22A4 00000000 */ nop /* 007C8 809F22A8 A60F0248 */ sh $t7, 0x0248($s0) ## 00000248 /* 007CC 809F22AC 86180248 */ lh $t8, 0x0248($s0) ## 00000248 -/* 007D0 809F22B0 AFB90014 */ sw $t9, 0x0014($sp) -/* 007D4 809F22B4 E7B20018 */ swc1 $f18, 0x0018($sp) +/* 007D0 809F22B0 AFB90014 */ sw $t9, 0x0014($sp) +/* 007D4 809F22B4 E7B20018 */ swc1 $f18, 0x0018($sp) /* 007D8 809F22B8 44985000 */ mtc1 $t8, $f10 ## $f10 = 0.00 /* 007DC 809F22BC 00000000 */ nop -/* 007E0 809F22C0 46805420 */ cvt.s.w $f16, $f10 -/* 007E4 809F22C4 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 007E8 809F22C8 E7B00010 */ swc1 $f16, 0x0010($sp) +/* 007E0 809F22C0 46805420 */ cvt.s.w $f16, $f10 +/* 007E4 809F22C4 0C029468 */ jal SkelAnime_ChangeAnim + +/* 007E8 809F22C8 E7B00010 */ swc1 $f16, 0x0010($sp) /* 007EC 809F22CC 2408000F */ addiu $t0, $zero, 0x000F ## $t0 = 0000000F /* 007F0 809F22D0 24090005 */ addiu $t1, $zero, 0x0005 ## $t1 = 00000005 /* 007F4 809F22D4 240A0014 */ addiu $t2, $zero, 0x0014 ## $t2 = 00000014 /* 007F8 809F22D8 240BFFFF */ addiu $t3, $zero, 0xFFFF ## $t3 = FFFFFFFF /* 007FC 809F22DC 240C000A */ addiu $t4, $zero, 0x000A ## $t4 = 0000000A -/* 00800 809F22E0 AFAC0020 */ sw $t4, 0x0020($sp) -/* 00804 809F22E4 AFAB001C */ sw $t3, 0x001C($sp) -/* 00808 809F22E8 AFAA0018 */ sw $t2, 0x0018($sp) -/* 0080C 809F22EC AFA90014 */ sw $t1, 0x0014($sp) -/* 00810 809F22F0 AFA80010 */ sw $t0, 0x0010($sp) -/* 00814 809F22F4 8FA4003C */ lw $a0, 0x003C($sp) +/* 00800 809F22E0 AFAC0020 */ sw $t4, 0x0020($sp) +/* 00804 809F22E4 AFAB001C */ sw $t3, 0x001C($sp) +/* 00808 809F22E8 AFAA0018 */ sw $t2, 0x0018($sp) +/* 0080C 809F22EC AFA90014 */ sw $t1, 0x0014($sp) +/* 00810 809F22F0 AFA80010 */ sw $t0, 0x0010($sp) +/* 00814 809F22F4 8FA4003C */ lw $a0, 0x003C($sp) /* 00818 809F22F8 26050024 */ addiu $a1, $s0, 0x0024 ## $a1 = 00000024 /* 0081C 809F22FC 3C0640C0 */ lui $a2, 0x40C0 ## $a2 = 40C00000 /* 00820 809F2300 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 00824 809F2304 0C00A5E9 */ jal func_800297A4 -/* 00828 809F2308 AFA00024 */ sw $zero, 0x0024($sp) +/* 00824 809F2304 0C00A5E9 */ jal func_800297A4 +/* 00828 809F2308 AFA00024 */ sw $zero, 0x0024($sp) /* 0082C 809F230C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 00830 809F2310 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 00834 809F2314 2405387C */ addiu $a1, $zero, 0x387C ## $a1 = 0000387C /* 00838 809F2318 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 0083C 809F231C 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 00840 809F2320 2405387D */ addiu $a1, $zero, 0x387D ## $a1 = 0000387D /* 00844 809F2324 3C0D809F */ lui $t5, %hi(func_809F2344) ## $t5 = 809F0000 /* 00848 809F2328 25AD2344 */ addiu $t5, $t5, %lo(func_809F2344) ## $t5 = 809F2344 /* 0084C 809F232C AE0D022C */ sw $t5, 0x022C($s0) ## 0000022C -/* 00850 809F2330 8FBF0034 */ lw $ra, 0x0034($sp) -/* 00854 809F2334 8FB00030 */ lw $s0, 0x0030($sp) +/* 00850 809F2330 8FBF0034 */ lw $ra, 0x0034($sp) +/* 00854 809F2334 8FB00030 */ lw $s0, 0x0030($sp) /* 00858 809F2338 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 -/* 0085C 809F233C 03E00008 */ jr $ra +/* 0085C 809F233C 03E00008 */ jr $ra /* 00860 809F2340 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Jiji/func_809F236C.s b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Jiji/func_809F236C.s index 185ddedd1e..3060f109f7 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Jiji/func_809F236C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Jiji/func_809F236C.s @@ -1,55 +1,55 @@ glabel func_809F236C /* 0088C 809F236C 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 00890 809F2370 AFB00030 */ sw $s0, 0x0030($sp) +/* 00890 809F2370 AFB00030 */ sw $s0, 0x0030($sp) /* 00894 809F2374 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00898 809F2378 AFBF0034 */ sw $ra, 0x0034($sp) +/* 00898 809F2378 AFBF0034 */ sw $ra, 0x0034($sp) /* 0089C 809F237C 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 -/* 008A0 809F2380 AFA5003C */ sw $a1, 0x003C($sp) +/* 008A0 809F2380 AFA5003C */ sw $a1, 0x003C($sp) /* 008A4 809F2384 0C028800 */ jal SkelAnime_GetFrameCount - + /* 008A8 809F2388 24840944 */ addiu $a0, $a0, 0x0944 ## $a0 = 06000944 /* 008AC 809F238C 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 008B0 809F2390 3C01C120 */ lui $at, 0xC120 ## $at = C1200000 /* 008B4 809F2394 44819000 */ mtc1 $at, $f18 ## $f18 = -10.00 -/* 008B8 809F2398 468021A0 */ cvt.s.w $f6, $f4 +/* 008B8 809F2398 468021A0 */ cvt.s.w $f6, $f4 /* 008BC 809F239C 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 008C0 809F23A0 24190002 */ addiu $t9, $zero, 0x0002 ## $t9 = 00000002 /* 008C4 809F23A4 24A50944 */ addiu $a1, $a1, 0x0944 ## $a1 = 06000944 /* 008C8 809F23A8 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C /* 008CC 809F23AC 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 008D0 809F23B0 4600320D */ trunc.w.s $f8, $f6 +/* 008D0 809F23B0 4600320D */ trunc.w.s $f8, $f6 /* 008D4 809F23B4 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 008D8 809F23B8 440F4000 */ mfc1 $t7, $f8 +/* 008D8 809F23B8 440F4000 */ mfc1 $t7, $f8 /* 008DC 809F23BC 00000000 */ nop /* 008E0 809F23C0 A60F0248 */ sh $t7, 0x0248($s0) ## 00000248 /* 008E4 809F23C4 86180248 */ lh $t8, 0x0248($s0) ## 00000248 -/* 008E8 809F23C8 AFB90014 */ sw $t9, 0x0014($sp) -/* 008EC 809F23CC E7B20018 */ swc1 $f18, 0x0018($sp) +/* 008E8 809F23C8 AFB90014 */ sw $t9, 0x0014($sp) +/* 008EC 809F23CC E7B20018 */ swc1 $f18, 0x0018($sp) /* 008F0 809F23D0 44985000 */ mtc1 $t8, $f10 ## $f10 = 0.00 /* 008F4 809F23D4 00000000 */ nop -/* 008F8 809F23D8 46805420 */ cvt.s.w $f16, $f10 -/* 008FC 809F23DC 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 00900 809F23E0 E7B00010 */ swc1 $f16, 0x0010($sp) +/* 008F8 809F23D8 46805420 */ cvt.s.w $f16, $f10 +/* 008FC 809F23DC 0C029468 */ jal SkelAnime_ChangeAnim + +/* 00900 809F23E0 E7B00010 */ swc1 $f16, 0x0010($sp) /* 00904 809F23E4 24080009 */ addiu $t0, $zero, 0x0009 ## $t0 = 00000009 /* 00908 809F23E8 24090003 */ addiu $t1, $zero, 0x0003 ## $t1 = 00000003 /* 0090C 809F23EC 240A000A */ addiu $t2, $zero, 0x000A ## $t2 = 0000000A /* 00910 809F23F0 240BFFFF */ addiu $t3, $zero, 0xFFFF ## $t3 = FFFFFFFF /* 00914 809F23F4 240C000A */ addiu $t4, $zero, 0x000A ## $t4 = 0000000A -/* 00918 809F23F8 AFAC0020 */ sw $t4, 0x0020($sp) -/* 0091C 809F23FC AFAB001C */ sw $t3, 0x001C($sp) -/* 00920 809F2400 AFAA0018 */ sw $t2, 0x0018($sp) -/* 00924 809F2404 AFA90014 */ sw $t1, 0x0014($sp) -/* 00928 809F2408 AFA80010 */ sw $t0, 0x0010($sp) -/* 0092C 809F240C 8FA4003C */ lw $a0, 0x003C($sp) +/* 00918 809F23F8 AFAC0020 */ sw $t4, 0x0020($sp) +/* 0091C 809F23FC AFAB001C */ sw $t3, 0x001C($sp) +/* 00920 809F2400 AFAA0018 */ sw $t2, 0x0018($sp) +/* 00924 809F2404 AFA90014 */ sw $t1, 0x0014($sp) +/* 00928 809F2408 AFA80010 */ sw $t0, 0x0010($sp) +/* 0092C 809F240C 8FA4003C */ lw $a0, 0x003C($sp) /* 00930 809F2410 26050024 */ addiu $a1, $s0, 0x0024 ## $a1 = 00000024 /* 00934 809F2414 3C064040 */ lui $a2, 0x4040 ## $a2 = 40400000 /* 00938 809F2418 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 0093C 809F241C 0C00A5E9 */ jal func_800297A4 -/* 00940 809F2420 AFA00024 */ sw $zero, 0x0024($sp) +/* 0093C 809F241C 0C00A5E9 */ jal func_800297A4 +/* 00940 809F2420 AFA00024 */ sw $zero, 0x0024($sp) /* 00944 809F2424 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 00948 809F2428 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 0094C 809F242C 2405387C */ addiu $a1, $zero, 0x387C ## $a1 = 0000387C /* 00950 809F2430 3C0D8016 */ lui $t5, 0x8016 ## $t5 = 80160000 /* 00954 809F2434 3C0E8012 */ lui $t6, 0x8012 ## $t6 = 80120000 @@ -57,16 +57,16 @@ glabel func_809F236C /* 0095C 809F243C 8DADE700 */ lw $t5, -0x1900($t5) ## 8015E700 /* 00960 809F2440 3C188012 */ lui $t8, 0x8012 ## $t8 = 80120000 /* 00964 809F2444 931871FB */ lbu $t8, 0x71FB($t8) ## 801271FB -/* 00968 809F2448 01AE7824 */ and $t7, $t5, $t6 +/* 00968 809F2448 01AE7824 */ and $t7, $t5, $t6 /* 0096C 809F244C 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 00970 809F2450 030F1007 */ srav $v0, $t7, $t8 -/* 00974 809F2454 10410003 */ beq $v0, $at, .L809F2464 +/* 00970 809F2450 030F1007 */ srav $v0, $t7, $t8 +/* 00974 809F2454 10410003 */ beq $v0, $at, .L809F2464 /* 00978 809F2458 240B10DB */ addiu $t3, $zero, 0x10DB ## $t3 = 000010DB -/* 0097C 809F245C 14400004 */ bne $v0, $zero, .L809F2470 +/* 0097C 809F245C 14400004 */ bne $v0, $zero, .L809F2470 /* 00980 809F2460 2408007A */ addiu $t0, $zero, 0x007A ## $t0 = 0000007A .L809F2464: /* 00984 809F2464 24190079 */ addiu $t9, $zero, 0x0079 ## $t9 = 00000079 -/* 00988 809F2468 10000002 */ beq $zero, $zero, .L809F2474 +/* 00988 809F2468 10000002 */ beq $zero, $zero, .L809F2474 /* 0098C 809F246C AE190254 */ sw $t9, 0x0254($s0) ## 00000254 .L809F2470: /* 00990 809F2470 AE080254 */ sw $t0, 0x0254($s0) ## 00000254 @@ -80,10 +80,10 @@ glabel func_809F236C /* 009AC 809F248C A60B010E */ sh $t3, 0x010E($s0) ## 0000010E /* 009B0 809F2490 A60C0250 */ sh $t4, 0x0250($s0) ## 00000250 /* 009B4 809F2494 AE0D022C */ sw $t5, 0x022C($s0) ## 0000022C -/* 009B8 809F2498 8FBF0034 */ lw $ra, 0x0034($sp) -/* 009BC 809F249C 8FB00030 */ lw $s0, 0x0030($sp) +/* 009B8 809F2498 8FBF0034 */ lw $ra, 0x0034($sp) +/* 009BC 809F249C 8FB00030 */ lw $s0, 0x0030($sp) /* 009C0 809F24A0 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 -/* 009C4 809F24A4 03E00008 */ jr $ra +/* 009C4 809F24A4 03E00008 */ jr $ra /* 009C8 809F24A8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Jiji/func_809F2550.s b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Jiji/func_809F2550.s index d379733a87..85dbafbf21 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Jiji/func_809F2550.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Jiji/func_809F2550.s @@ -1,42 +1,42 @@ glabel func_809F2550 /* 00A70 809F2550 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 00A74 809F2554 AFA40028 */ sw $a0, 0x0028($sp) -/* 00A78 809F2558 AFBF0024 */ sw $ra, 0x0024($sp) +/* 00A74 809F2554 AFA40028 */ sw $a0, 0x0028($sp) +/* 00A78 809F2558 AFBF0024 */ sw $ra, 0x0024($sp) /* 00A7C 809F255C 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 -/* 00A80 809F2560 AFA5002C */ sw $a1, 0x002C($sp) +/* 00A80 809F2560 AFA5002C */ sw $a1, 0x002C($sp) /* 00A84 809F2564 0C028800 */ jal SkelAnime_GetFrameCount - + /* 00A88 809F2568 24840BD0 */ addiu $a0, $a0, 0x0BD0 ## $a0 = 06000BD0 /* 00A8C 809F256C 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 -/* 00A90 809F2570 8FA30028 */ lw $v1, 0x0028($sp) +/* 00A90 809F2570 8FA30028 */ lw $v1, 0x0028($sp) /* 00A94 809F2574 3C01C120 */ lui $at, 0xC120 ## $at = C1200000 -/* 00A98 809F2578 468021A0 */ cvt.s.w $f6, $f4 +/* 00A98 809F2578 468021A0 */ cvt.s.w $f6, $f4 /* 00A9C 809F257C 44819000 */ mtc1 $at, $f18 ## $f18 = -10.00 /* 00AA0 809F2580 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 00AA4 809F2584 24A50BD0 */ addiu $a1, $a1, 0x0BD0 ## $a1 = 06000BD0 /* 00AA8 809F2588 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 00AAC 809F258C 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 00AB0 809F2590 4600320D */ trunc.w.s $f8, $f6 +/* 00AB0 809F2590 4600320D */ trunc.w.s $f8, $f6 /* 00AB4 809F2594 2464014C */ addiu $a0, $v1, 0x014C ## $a0 = 0000014C -/* 00AB8 809F2598 440F4000 */ mfc1 $t7, $f8 +/* 00AB8 809F2598 440F4000 */ mfc1 $t7, $f8 /* 00ABC 809F259C 00000000 */ nop /* 00AC0 809F25A0 A46F0248 */ sh $t7, 0x0248($v1) ## 00000248 /* 00AC4 809F25A4 84780248 */ lh $t8, 0x0248($v1) ## 00000248 -/* 00AC8 809F25A8 AFA00014 */ sw $zero, 0x0014($sp) -/* 00ACC 809F25AC E7B20018 */ swc1 $f18, 0x0018($sp) +/* 00AC8 809F25A8 AFA00014 */ sw $zero, 0x0014($sp) +/* 00ACC 809F25AC E7B20018 */ swc1 $f18, 0x0018($sp) /* 00AD0 809F25B0 44985000 */ mtc1 $t8, $f10 ## $f10 = 0.00 /* 00AD4 809F25B4 00000000 */ nop -/* 00AD8 809F25B8 46805420 */ cvt.s.w $f16, $f10 -/* 00ADC 809F25BC 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 00AE0 809F25C0 E7B00010 */ swc1 $f16, 0x0010($sp) -/* 00AE4 809F25C4 8FA30028 */ lw $v1, 0x0028($sp) +/* 00AD8 809F25B8 46805420 */ cvt.s.w $f16, $f10 +/* 00ADC 809F25BC 0C029468 */ jal SkelAnime_ChangeAnim + +/* 00AE0 809F25C0 E7B00010 */ swc1 $f16, 0x0010($sp) +/* 00AE4 809F25C4 8FA30028 */ lw $v1, 0x0028($sp) /* 00AE8 809F25C8 3C19809F */ lui $t9, %hi(func_809F25E4) ## $t9 = 809F0000 /* 00AEC 809F25CC 273925E4 */ addiu $t9, $t9, %lo(func_809F25E4) ## $t9 = 809F25E4 /* 00AF0 809F25D0 AC79022C */ sw $t9, 0x022C($v1) ## 0000022C -/* 00AF4 809F25D4 8FBF0024 */ lw $ra, 0x0024($sp) +/* 00AF4 809F25D4 8FBF0024 */ lw $ra, 0x0024($sp) /* 00AF8 809F25D8 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 00AFC 809F25DC 03E00008 */ jr $ra +/* 00AFC 809F25DC 03E00008 */ jr $ra /* 00B00 809F25E0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Jiji/func_809F28DC.s b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Jiji/func_809F28DC.s index f43a2ff633..f6d6443fd0 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Jiji/func_809F28DC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Jiji/func_809F28DC.s @@ -1,43 +1,43 @@ glabel func_809F28DC /* 00DFC 809F28DC 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 00E00 809F28E0 AFA40028 */ sw $a0, 0x0028($sp) -/* 00E04 809F28E4 AFBF0024 */ sw $ra, 0x0024($sp) +/* 00E00 809F28E0 AFA40028 */ sw $a0, 0x0028($sp) +/* 00E04 809F28E4 AFBF0024 */ sw $ra, 0x0024($sp) /* 00E08 809F28E8 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 -/* 00E0C 809F28EC AFA5002C */ sw $a1, 0x002C($sp) +/* 00E0C 809F28EC AFA5002C */ sw $a1, 0x002C($sp) /* 00E10 809F28F0 0C028800 */ jal SkelAnime_GetFrameCount - + /* 00E14 809F28F4 24840A70 */ addiu $a0, $a0, 0x0A70 ## $a0 = 06000A70 /* 00E18 809F28F8 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 -/* 00E1C 809F28FC 8FA30028 */ lw $v1, 0x0028($sp) +/* 00E1C 809F28FC 8FA30028 */ lw $v1, 0x0028($sp) /* 00E20 809F2900 3C01C120 */ lui $at, 0xC120 ## $at = C1200000 -/* 00E24 809F2904 468021A0 */ cvt.s.w $f6, $f4 +/* 00E24 809F2904 468021A0 */ cvt.s.w $f6, $f4 /* 00E28 809F2908 44819000 */ mtc1 $at, $f18 ## $f18 = -10.00 /* 00E2C 809F290C 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 00E30 809F2910 24190002 */ addiu $t9, $zero, 0x0002 ## $t9 = 00000002 /* 00E34 809F2914 24A50A70 */ addiu $a1, $a1, 0x0A70 ## $a1 = 06000A70 /* 00E38 809F2918 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 00E3C 809F291C 4600320D */ trunc.w.s $f8, $f6 +/* 00E3C 809F291C 4600320D */ trunc.w.s $f8, $f6 /* 00E40 809F2920 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 /* 00E44 809F2924 2464014C */ addiu $a0, $v1, 0x014C ## $a0 = 0000014C -/* 00E48 809F2928 440F4000 */ mfc1 $t7, $f8 +/* 00E48 809F2928 440F4000 */ mfc1 $t7, $f8 /* 00E4C 809F292C 00000000 */ nop /* 00E50 809F2930 A46F0248 */ sh $t7, 0x0248($v1) ## 00000248 /* 00E54 809F2934 84780248 */ lh $t8, 0x0248($v1) ## 00000248 -/* 00E58 809F2938 AFB90014 */ sw $t9, 0x0014($sp) -/* 00E5C 809F293C E7B20018 */ swc1 $f18, 0x0018($sp) +/* 00E58 809F2938 AFB90014 */ sw $t9, 0x0014($sp) +/* 00E5C 809F293C E7B20018 */ swc1 $f18, 0x0018($sp) /* 00E60 809F2940 44985000 */ mtc1 $t8, $f10 ## $f10 = 0.00 /* 00E64 809F2944 00000000 */ nop -/* 00E68 809F2948 46805420 */ cvt.s.w $f16, $f10 -/* 00E6C 809F294C 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 00E70 809F2950 E7B00010 */ swc1 $f16, 0x0010($sp) -/* 00E74 809F2954 8FA30028 */ lw $v1, 0x0028($sp) +/* 00E68 809F2948 46805420 */ cvt.s.w $f16, $f10 +/* 00E6C 809F294C 0C029468 */ jal SkelAnime_ChangeAnim + +/* 00E70 809F2950 E7B00010 */ swc1 $f16, 0x0010($sp) +/* 00E74 809F2954 8FA30028 */ lw $v1, 0x0028($sp) /* 00E78 809F2958 3C08809F */ lui $t0, %hi(func_809F2974) ## $t0 = 809F0000 /* 00E7C 809F295C 25082974 */ addiu $t0, $t0, %lo(func_809F2974) ## $t0 = 809F2974 /* 00E80 809F2960 AC68022C */ sw $t0, 0x022C($v1) ## 0000022C -/* 00E84 809F2964 8FBF0024 */ lw $ra, 0x0024($sp) +/* 00E84 809F2964 8FBF0024 */ lw $ra, 0x0024($sp) /* 00E88 809F2968 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 00E8C 809F296C 03E00008 */ jr $ra +/* 00E8C 809F296C 03E00008 */ jr $ra /* 00E90 809F2970 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Jiji/func_809F29E0.s b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Jiji/func_809F29E0.s index b3bdfba44f..e79af28c9e 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Jiji/func_809F29E0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Jiji/func_809F29E0.s @@ -1,35 +1,35 @@ glabel func_809F29E0 /* 00F00 809F29E0 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 00F04 809F29E4 AFB00028 */ sw $s0, 0x0028($sp) +/* 00F04 809F29E4 AFB00028 */ sw $s0, 0x0028($sp) /* 00F08 809F29E8 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00F0C 809F29EC AFBF002C */ sw $ra, 0x002C($sp) +/* 00F0C 809F29EC AFBF002C */ sw $ra, 0x002C($sp) /* 00F10 809F29F0 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 -/* 00F14 809F29F4 AFA50034 */ sw $a1, 0x0034($sp) +/* 00F14 809F29F4 AFA50034 */ sw $a1, 0x0034($sp) /* 00F18 809F29F8 0C028800 */ jal SkelAnime_GetFrameCount - + /* 00F1C 809F29FC 248437C0 */ addiu $a0, $a0, 0x37C0 ## $a0 = 060037C0 /* 00F20 809F2A00 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 00F24 809F2A04 3C01C120 */ lui $at, 0xC120 ## $at = C1200000 /* 00F28 809F2A08 44819000 */ mtc1 $at, $f18 ## $f18 = -10.00 -/* 00F2C 809F2A0C 468021A0 */ cvt.s.w $f6, $f4 +/* 00F2C 809F2A0C 468021A0 */ cvt.s.w $f6, $f4 /* 00F30 809F2A10 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 00F34 809F2A14 24A537C0 */ addiu $a1, $a1, 0x37C0 ## $a1 = 060037C0 /* 00F38 809F2A18 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C /* 00F3C 809F2A1C 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 00F40 809F2A20 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 00F44 809F2A24 4600320D */ trunc.w.s $f8, $f6 -/* 00F48 809F2A28 440F4000 */ mfc1 $t7, $f8 +/* 00F44 809F2A24 4600320D */ trunc.w.s $f8, $f6 +/* 00F48 809F2A28 440F4000 */ mfc1 $t7, $f8 /* 00F4C 809F2A2C 00000000 */ nop /* 00F50 809F2A30 A60F0248 */ sh $t7, 0x0248($s0) ## 00000248 /* 00F54 809F2A34 86180248 */ lh $t8, 0x0248($s0) ## 00000248 -/* 00F58 809F2A38 AFA00014 */ sw $zero, 0x0014($sp) -/* 00F5C 809F2A3C E7B20018 */ swc1 $f18, 0x0018($sp) +/* 00F58 809F2A38 AFA00014 */ sw $zero, 0x0014($sp) +/* 00F5C 809F2A3C E7B20018 */ swc1 $f18, 0x0018($sp) /* 00F60 809F2A40 44985000 */ mtc1 $t8, $f10 ## $f10 = 0.00 /* 00F64 809F2A44 00000000 */ nop -/* 00F68 809F2A48 46805420 */ cvt.s.w $f16, $f10 -/* 00F6C 809F2A4C 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 00F70 809F2A50 E7B00010 */ swc1 $f16, 0x0010($sp) +/* 00F68 809F2A48 46805420 */ cvt.s.w $f16, $f10 +/* 00F6C 809F2A4C 0C029468 */ jal SkelAnime_ChangeAnim + +/* 00F70 809F2A50 E7B00010 */ swc1 $f16, 0x0010($sp) /* 00F74 809F2A54 24190001 */ addiu $t9, $zero, 0x0001 ## $t9 = 00000001 /* 00F78 809F2A58 3C014000 */ lui $at, 0x4000 ## $at = 40000000 /* 00F7C 809F2A5C A619024A */ sh $t9, 0x024A($s0) ## 0000024A @@ -40,10 +40,10 @@ glabel func_809F29E0 /* 00F90 809F2A70 AE09022C */ sw $t1, 0x022C($s0) ## 0000022C /* 00F94 809F2A74 E6040068 */ swc1 $f4, 0x0068($s0) ## 00000068 /* 00F98 809F2A78 A208023C */ sb $t0, 0x023C($s0) ## 0000023C -/* 00F9C 809F2A7C 8FBF002C */ lw $ra, 0x002C($sp) -/* 00FA0 809F2A80 8FB00028 */ lw $s0, 0x0028($sp) +/* 00F9C 809F2A7C 8FBF002C */ lw $ra, 0x002C($sp) +/* 00FA0 809F2A80 8FB00028 */ lw $s0, 0x0028($sp) /* 00FA4 809F2A84 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 00FA8 809F2A88 03E00008 */ jr $ra +/* 00FA8 809F2A88 03E00008 */ jr $ra /* 00FAC 809F2A8C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Jiji/func_809F2A90.s b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Jiji/func_809F2A90.s index 889fad172e..c92bd490af 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Jiji/func_809F2A90.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Jiji/func_809F2A90.s @@ -14,7 +14,7 @@ glabel func_809F2A90 /* 00FDC 809F2ABC 46062301 */ sub.s $f12, $f4, $f6 /* 00FE0 809F2AC0 460A4381 */ sub.s $f14, $f8, $f10 /* 00FE4 809F2AC4 E7AC002C */ swc1 $f12, 0x002C($sp) -/* 00FE8 809F2AC8 0C03F494 */ jal func_800FD250 +/* 00FE8 809F2AC8 0C03F494 */ jal Math_atan2f /* 00FEC 809F2ACC E7AE0028 */ swc1 $f14, 0x0028($sp) /* 00FF0 809F2AD0 3C01809F */ lui $at, %hi(D_809F30F4) ## $at = 809F0000 /* 00FF4 809F2AD4 C43030F4 */ lwc1 $f16, %lo(D_809F30F4)($at) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F3624.s b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F3624.s index 80a602c842..95cdac2508 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F3624.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F3624.s @@ -1,47 +1,47 @@ glabel func_809F3624 /* 00364 809F3624 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 00368 809F3628 AFB00028 */ sw $s0, 0x0028($sp) +/* 00368 809F3628 AFB00028 */ sw $s0, 0x0028($sp) /* 0036C 809F362C 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00370 809F3630 AFBF002C */ sw $ra, 0x002C($sp) +/* 00370 809F3630 AFBF002C */ sw $ra, 0x002C($sp) /* 00374 809F3634 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 -/* 00378 809F3638 AFA50034 */ sw $a1, 0x0034($sp) +/* 00378 809F3638 AFA50034 */ sw $a1, 0x0034($sp) /* 0037C 809F363C 0C028800 */ jal SkelAnime_GetFrameCount - + /* 00380 809F3640 248424CC */ addiu $a0, $a0, 0x24CC ## $a0 = 060024CC /* 00384 809F3644 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 00388 809F3648 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 /* 0038C 809F364C 3C01C120 */ lui $at, 0xC120 ## $at = C1200000 -/* 00390 809F3650 468021A0 */ cvt.s.w $f6, $f4 +/* 00390 809F3650 468021A0 */ cvt.s.w $f6, $f4 /* 00394 809F3654 44819000 */ mtc1 $at, $f18 ## $f18 = -10.00 /* 00398 809F3658 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 0039C 809F365C 24190002 */ addiu $t9, $zero, 0x0002 ## $t9 = 00000002 -/* 003A0 809F3660 44060000 */ mfc1 $a2, $f0 -/* 003A4 809F3664 44070000 */ mfc1 $a3, $f0 -/* 003A8 809F3668 4600320D */ trunc.w.s $f8, $f6 +/* 003A0 809F3660 44060000 */ mfc1 $a2, $f0 +/* 003A4 809F3664 44070000 */ mfc1 $a3, $f0 +/* 003A8 809F3668 4600320D */ trunc.w.s $f8, $f6 /* 003AC 809F366C 24A524CC */ addiu $a1, $a1, 0x24CC ## $a1 = 060024CC /* 003B0 809F3670 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C -/* 003B4 809F3674 440F4000 */ mfc1 $t7, $f8 +/* 003B4 809F3674 440F4000 */ mfc1 $t7, $f8 /* 003B8 809F3678 00000000 */ nop /* 003BC 809F367C A60F026E */ sh $t7, 0x026E($s0) ## 0000026E /* 003C0 809F3680 8618026E */ lh $t8, 0x026E($s0) ## 0000026E -/* 003C4 809F3684 AFB90014 */ sw $t9, 0x0014($sp) -/* 003C8 809F3688 E7B20018 */ swc1 $f18, 0x0018($sp) +/* 003C4 809F3684 AFB90014 */ sw $t9, 0x0014($sp) +/* 003C8 809F3688 E7B20018 */ swc1 $f18, 0x0018($sp) /* 003CC 809F368C 44985000 */ mtc1 $t8, $f10 ## $f10 = 0.00 /* 003D0 809F3690 00000000 */ nop -/* 003D4 809F3694 46805420 */ cvt.s.w $f16, $f10 -/* 003D8 809F3698 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 003DC 809F369C E7B00010 */ swc1 $f16, 0x0010($sp) +/* 003D4 809F3694 46805420 */ cvt.s.w $f16, $f10 +/* 003D8 809F3698 0C029468 */ jal SkelAnime_ChangeAnim + +/* 003DC 809F369C E7B00010 */ swc1 $f16, 0x0010($sp) /* 003E0 809F36A0 3C014100 */ lui $at, 0x4100 ## $at = 41000000 /* 003E4 809F36A4 44812000 */ mtc1 $at, $f4 ## $f4 = 8.00 /* 003E8 809F36A8 3C08809F */ lui $t0, %hi(func_809F36CC) ## $t0 = 809F0000 /* 003EC 809F36AC 250836CC */ addiu $t0, $t0, %lo(func_809F36CC) ## $t0 = 809F36CC /* 003F0 809F36B0 AE080214 */ sw $t0, 0x0214($s0) ## 00000214 /* 003F4 809F36B4 E6040164 */ swc1 $f4, 0x0164($s0) ## 00000164 -/* 003F8 809F36B8 8FBF002C */ lw $ra, 0x002C($sp) -/* 003FC 809F36BC 8FB00028 */ lw $s0, 0x0028($sp) +/* 003F8 809F36B8 8FBF002C */ lw $ra, 0x002C($sp) +/* 003FC 809F36BC 8FB00028 */ lw $s0, 0x0028($sp) /* 00400 809F36C0 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 00404 809F36C4 03E00008 */ jr $ra +/* 00404 809F36C4 03E00008 */ jr $ra /* 00408 809F36C8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F39B8.s b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F39B8.s index 19235b12e8..428886b477 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F39B8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F39B8.s @@ -1,39 +1,39 @@ glabel func_809F39B8 /* 006F8 809F39B8 27BDFFB8 */ addiu $sp, $sp, 0xFFB8 ## $sp = FFFFFFB8 -/* 006FC 809F39BC AFBF0034 */ sw $ra, 0x0034($sp) -/* 00700 809F39C0 AFB00030 */ sw $s0, 0x0030($sp) -/* 00704 809F39C4 AFA5004C */ sw $a1, 0x004C($sp) +/* 006FC 809F39BC AFBF0034 */ sw $ra, 0x0034($sp) +/* 00700 809F39C0 AFB00030 */ sw $s0, 0x0030($sp) +/* 00704 809F39C4 AFA5004C */ sw $a1, 0x004C($sp) /* 00708 809F39C8 848E025C */ lh $t6, 0x025C($a0) ## 0000025C /* 0070C 809F39CC 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 00710 809F39D0 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 -/* 00714 809F39D4 55C0003B */ bnel $t6, $zero, .L809F3AC4 -/* 00718 809F39D8 8FBF0034 */ lw $ra, 0x0034($sp) +/* 00714 809F39D4 55C0003B */ bnel $t6, $zero, .L809F3AC4 +/* 00718 809F39D8 8FBF0034 */ lw $ra, 0x0034($sp) /* 0071C 809F39DC 0C028800 */ jal SkelAnime_GetFrameCount - + /* 00720 809F39E0 248426C4 */ addiu $a0, $a0, 0x26C4 ## $a0 = 060026C4 /* 00724 809F39E4 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 00728 809F39E8 3C01C120 */ lui $at, 0xC120 ## $at = C1200000 /* 0072C 809F39EC 44819000 */ mtc1 $at, $f18 ## $f18 = -10.00 -/* 00730 809F39F0 468021A0 */ cvt.s.w $f6, $f4 +/* 00730 809F39F0 468021A0 */ cvt.s.w $f6, $f4 /* 00734 809F39F4 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 00738 809F39F8 24080002 */ addiu $t0, $zero, 0x0002 ## $t0 = 00000002 /* 0073C 809F39FC 24A526C4 */ addiu $a1, $a1, 0x26C4 ## $a1 = 060026C4 /* 00740 809F3A00 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C /* 00744 809F3A04 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 00748 809F3A08 4600320D */ trunc.w.s $f8, $f6 +/* 00748 809F3A08 4600320D */ trunc.w.s $f8, $f6 /* 0074C 809F3A0C 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 00750 809F3A10 44184000 */ mfc1 $t8, $f8 +/* 00750 809F3A10 44184000 */ mfc1 $t8, $f8 /* 00754 809F3A14 00000000 */ nop /* 00758 809F3A18 A618026E */ sh $t8, 0x026E($s0) ## 0000026E /* 0075C 809F3A1C 8619026E */ lh $t9, 0x026E($s0) ## 0000026E -/* 00760 809F3A20 AFA80014 */ sw $t0, 0x0014($sp) -/* 00764 809F3A24 E7B20018 */ swc1 $f18, 0x0018($sp) +/* 00760 809F3A20 AFA80014 */ sw $t0, 0x0014($sp) +/* 00764 809F3A24 E7B20018 */ swc1 $f18, 0x0018($sp) /* 00768 809F3A28 44995000 */ mtc1 $t9, $f10 ## $f10 = 0.00 /* 0076C 809F3A2C 00000000 */ nop -/* 00770 809F3A30 46805420 */ cvt.s.w $f16, $f10 -/* 00774 809F3A34 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 00778 809F3A38 E7B00010 */ swc1 $f16, 0x0010($sp) +/* 00770 809F3A30 46805420 */ cvt.s.w $f16, $f10 +/* 00774 809F3A34 0C029468 */ jal SkelAnime_ChangeAnim + +/* 00778 809F3A38 E7B00010 */ swc1 $f16, 0x0010($sp) /* 0077C 809F3A3C 8E0A0024 */ lw $t2, 0x0024($s0) ## 00000024 /* 00780 809F3A40 27A5003C */ addiu $a1, $sp, 0x003C ## $a1 = FFFFFFF4 /* 00784 809F3A44 3C014248 */ lui $at, 0x4248 ## $at = 42480000 @@ -49,30 +49,30 @@ glabel func_809F39B8 /* 007AC 809F3A6C C6040028 */ lwc1 $f4, 0x0028($s0) ## 00000028 /* 007B0 809F3A70 240EFFFF */ addiu $t6, $zero, 0xFFFF ## $t6 = FFFFFFFF /* 007B4 809F3A74 240F000A */ addiu $t7, $zero, 0x000A ## $t7 = 0000000A -/* 007B8 809F3A78 46062200 */ add.s $f8, $f4, $f6 -/* 007BC 809F3A7C AFAF0020 */ sw $t7, 0x0020($sp) -/* 007C0 809F3A80 AFAE001C */ sw $t6, 0x001C($sp) -/* 007C4 809F3A84 AFA00024 */ sw $zero, 0x0024($sp) -/* 007C8 809F3A88 E7A80040 */ swc1 $f8, 0x0040($sp) -/* 007CC 809F3A8C AFAD0018 */ sw $t5, 0x0018($sp) -/* 007D0 809F3A90 AFAC0014 */ sw $t4, 0x0014($sp) -/* 007D4 809F3A94 AFAB0010 */ sw $t3, 0x0010($sp) -/* 007D8 809F3A98 8FA4004C */ lw $a0, 0x004C($sp) +/* 007B8 809F3A78 46062200 */ add.s $f8, $f4, $f6 +/* 007BC 809F3A7C AFAF0020 */ sw $t7, 0x0020($sp) +/* 007C0 809F3A80 AFAE001C */ sw $t6, 0x001C($sp) +/* 007C4 809F3A84 AFA00024 */ sw $zero, 0x0024($sp) +/* 007C8 809F3A88 E7A80040 */ swc1 $f8, 0x0040($sp) +/* 007CC 809F3A8C AFAD0018 */ sw $t5, 0x0018($sp) +/* 007D0 809F3A90 AFAC0014 */ sw $t4, 0x0014($sp) +/* 007D4 809F3A94 AFAB0010 */ sw $t3, 0x0010($sp) +/* 007D8 809F3A98 8FA4004C */ lw $a0, 0x004C($sp) /* 007DC 809F3A9C 3C064080 */ lui $a2, 0x4080 ## $a2 = 40800000 -/* 007E0 809F3AA0 0C00A5E9 */ jal func_800297A4 +/* 007E0 809F3AA0 0C00A5E9 */ jal func_800297A4 /* 007E4 809F3AA4 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 /* 007E8 809F3AA8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 007EC 809F3AAC 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 007F0 809F3AB0 2405387C */ addiu $a1, $zero, 0x387C ## $a1 = 0000387C /* 007F4 809F3AB4 3C18809F */ lui $t8, %hi(func_809F3AD4) ## $t8 = 809F0000 /* 007F8 809F3AB8 27183AD4 */ addiu $t8, $t8, %lo(func_809F3AD4) ## $t8 = 809F3AD4 /* 007FC 809F3ABC AE180214 */ sw $t8, 0x0214($s0) ## 00000214 -/* 00800 809F3AC0 8FBF0034 */ lw $ra, 0x0034($sp) +/* 00800 809F3AC0 8FBF0034 */ lw $ra, 0x0034($sp) .L809F3AC4: -/* 00804 809F3AC4 8FB00030 */ lw $s0, 0x0030($sp) +/* 00804 809F3AC4 8FB00030 */ lw $s0, 0x0030($sp) /* 00808 809F3AC8 27BD0048 */ addiu $sp, $sp, 0x0048 ## $sp = 00000000 -/* 0080C 809F3ACC 03E00008 */ jr $ra +/* 0080C 809F3ACC 03E00008 */ jr $ra /* 00810 809F3AD0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F3B40.s b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F3B40.s index f025e890a4..493d7beab6 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F3B40.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F3B40.s @@ -1,35 +1,35 @@ glabel func_809F3B40 /* 00880 809F3B40 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 00884 809F3B44 AFB00028 */ sw $s0, 0x0028($sp) +/* 00884 809F3B44 AFB00028 */ sw $s0, 0x0028($sp) /* 00888 809F3B48 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 0088C 809F3B4C AFBF002C */ sw $ra, 0x002C($sp) +/* 0088C 809F3B4C AFBF002C */ sw $ra, 0x002C($sp) /* 00890 809F3B50 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 -/* 00894 809F3B54 AFA50034 */ sw $a1, 0x0034($sp) +/* 00894 809F3B54 AFA50034 */ sw $a1, 0x0034($sp) /* 00898 809F3B58 0C028800 */ jal SkelAnime_GetFrameCount - + /* 0089C 809F3B5C 24843128 */ addiu $a0, $a0, 0x3128 ## $a0 = 06003128 /* 008A0 809F3B60 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 008A4 809F3B64 3C01C120 */ lui $at, 0xC120 ## $at = C1200000 /* 008A8 809F3B68 44819000 */ mtc1 $at, $f18 ## $f18 = -10.00 -/* 008AC 809F3B6C 468021A0 */ cvt.s.w $f6, $f4 +/* 008AC 809F3B6C 468021A0 */ cvt.s.w $f6, $f4 /* 008B0 809F3B70 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 008B4 809F3B74 24A53128 */ addiu $a1, $a1, 0x3128 ## $a1 = 06003128 /* 008B8 809F3B78 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C /* 008BC 809F3B7C 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 008C0 809F3B80 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 008C4 809F3B84 4600320D */ trunc.w.s $f8, $f6 -/* 008C8 809F3B88 440F4000 */ mfc1 $t7, $f8 +/* 008C4 809F3B84 4600320D */ trunc.w.s $f8, $f6 +/* 008C8 809F3B88 440F4000 */ mfc1 $t7, $f8 /* 008CC 809F3B8C 00000000 */ nop /* 008D0 809F3B90 A60F026E */ sh $t7, 0x026E($s0) ## 0000026E /* 008D4 809F3B94 8618026E */ lh $t8, 0x026E($s0) ## 0000026E -/* 008D8 809F3B98 AFA00014 */ sw $zero, 0x0014($sp) -/* 008DC 809F3B9C E7B20018 */ swc1 $f18, 0x0018($sp) +/* 008D8 809F3B98 AFA00014 */ sw $zero, 0x0014($sp) +/* 008DC 809F3B9C E7B20018 */ swc1 $f18, 0x0018($sp) /* 008E0 809F3BA0 44985000 */ mtc1 $t8, $f10 ## $f10 = 0.00 /* 008E4 809F3BA4 00000000 */ nop -/* 008E8 809F3BA8 46805420 */ cvt.s.w $f16, $f10 -/* 008EC 809F3BAC 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 008F0 809F3BB0 E7B00010 */ swc1 $f16, 0x0010($sp) +/* 008E8 809F3BA8 46805420 */ cvt.s.w $f16, $f10 +/* 008EC 809F3BAC 0C029468 */ jal SkelAnime_ChangeAnim + +/* 008F0 809F3BB0 E7B00010 */ swc1 $f16, 0x0010($sp) /* 008F4 809F3BB4 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 /* 008F8 809F3BB8 44812000 */ mtc1 $at, $f4 ## $f4 = 1.00 /* 008FC 809F3BBC 3C19809F */ lui $t9, %hi(func_809F3BE4) ## $t9 = 809F0000 @@ -37,10 +37,10 @@ glabel func_809F3B40 /* 00904 809F3BC4 A20000AE */ sb $zero, 0x00AE($s0) ## 000000AE /* 00908 809F3BC8 AE190214 */ sw $t9, 0x0214($s0) ## 00000214 /* 0090C 809F3BCC E6040068 */ swc1 $f4, 0x0068($s0) ## 00000068 -/* 00910 809F3BD0 8FBF002C */ lw $ra, 0x002C($sp) -/* 00914 809F3BD4 8FB00028 */ lw $s0, 0x0028($sp) +/* 00910 809F3BD0 8FBF002C */ lw $ra, 0x002C($sp) +/* 00914 809F3BD4 8FB00028 */ lw $s0, 0x0028($sp) /* 00918 809F3BD8 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 0091C 809F3BDC 03E00008 */ jr $ra +/* 0091C 809F3BDC 03E00008 */ jr $ra /* 00920 809F3BE0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F3BE4.s b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F3BE4.s index b27c23d443..d7bc837d63 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F3BE4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F3BE4.s @@ -14,7 +14,7 @@ glabel func_809F3BE4 /* 00950 809F3C10 44804000 */ mtc1 $zero, $f8 ## $f8 = 0.00 /* 00954 809F3C14 C60A002C */ lwc1 $f10, 0x002C($s0) ## 0000002C /* 00958 809F3C18 46062301 */ sub.s $f12, $f4, $f6 -/* 0095C 809F3C1C 0C03F494 */ jal func_800FD250 +/* 0095C 809F3C1C 0C03F494 */ jal Math_atan2f /* 00960 809F3C20 460A4381 */ sub.s $f14, $f8, $f10 /* 00964 809F3C24 3C01809F */ lui $at, %hi(D_809F6040) ## $at = 809F0000 /* 00968 809F3C28 C4306040 */ lwc1 $f16, %lo(D_809F6040)($at) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F3D84.s b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F3D84.s index 20f6e75d73..1df945a3d4 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F3D84.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F3D84.s @@ -1,48 +1,48 @@ glabel func_809F3D84 /* 00AC4 809F3D84 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 00AC8 809F3D88 AFB00028 */ sw $s0, 0x0028($sp) +/* 00AC8 809F3D88 AFB00028 */ sw $s0, 0x0028($sp) /* 00ACC 809F3D8C 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00AD0 809F3D90 AFBF002C */ sw $ra, 0x002C($sp) +/* 00AD0 809F3D90 AFBF002C */ sw $ra, 0x002C($sp) /* 00AD4 809F3D94 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 -/* 00AD8 809F3D98 AFA50034 */ sw $a1, 0x0034($sp) +/* 00AD8 809F3D98 AFA50034 */ sw $a1, 0x0034($sp) /* 00ADC 809F3D9C 0C028800 */ jal SkelAnime_GetFrameCount - + /* 00AE0 809F3DA0 24842E84 */ addiu $a0, $a0, 0x2E84 ## $a0 = 06002E84 /* 00AE4 809F3DA4 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 00AE8 809F3DA8 3C01C120 */ lui $at, 0xC120 ## $at = C1200000 /* 00AEC 809F3DAC 44819000 */ mtc1 $at, $f18 ## $f18 = -10.00 -/* 00AF0 809F3DB0 468021A0 */ cvt.s.w $f6, $f4 +/* 00AF0 809F3DB0 468021A0 */ cvt.s.w $f6, $f4 /* 00AF4 809F3DB4 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 00AF8 809F3DB8 24A52E84 */ addiu $a1, $a1, 0x2E84 ## $a1 = 06002E84 /* 00AFC 809F3DBC 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C /* 00B00 809F3DC0 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 00B04 809F3DC4 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 00B08 809F3DC8 4600320D */ trunc.w.s $f8, $f6 -/* 00B0C 809F3DCC 440F4000 */ mfc1 $t7, $f8 +/* 00B08 809F3DC8 4600320D */ trunc.w.s $f8, $f6 +/* 00B0C 809F3DCC 440F4000 */ mfc1 $t7, $f8 /* 00B10 809F3DD0 00000000 */ nop /* 00B14 809F3DD4 A60F026E */ sh $t7, 0x026E($s0) ## 0000026E /* 00B18 809F3DD8 8618026E */ lh $t8, 0x026E($s0) ## 0000026E -/* 00B1C 809F3DDC AFA00014 */ sw $zero, 0x0014($sp) -/* 00B20 809F3DE0 E7B20018 */ swc1 $f18, 0x0018($sp) +/* 00B1C 809F3DDC AFA00014 */ sw $zero, 0x0014($sp) +/* 00B20 809F3DE0 E7B20018 */ swc1 $f18, 0x0018($sp) /* 00B24 809F3DE4 44985000 */ mtc1 $t8, $f10 ## $f10 = 0.00 /* 00B28 809F3DE8 00000000 */ nop -/* 00B2C 809F3DEC 46805420 */ cvt.s.w $f16, $f10 -/* 00B30 809F3DF0 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 00B34 809F3DF4 E7B00010 */ swc1 $f16, 0x0010($sp) +/* 00B2C 809F3DEC 46805420 */ cvt.s.w $f16, $f10 +/* 00B30 809F3DF0 0C029468 */ jal SkelAnime_ChangeAnim + +/* 00B34 809F3DF4 E7B00010 */ swc1 $f16, 0x0010($sp) /* 00B38 809F3DF8 241910AF */ addiu $t9, $zero, 0x10AF ## $t9 = 000010AF /* 00B3C 809F3DFC A619010E */ sh $t9, 0x010E($s0) ## 0000010E -/* 00B40 809F3E00 8FA40034 */ lw $a0, 0x0034($sp) +/* 00B40 809F3E00 8FA40034 */ lw $a0, 0x0034($sp) /* 00B44 809F3E04 3325FFFF */ andi $a1, $t9, 0xFFFF ## $a1 = 000010AF -/* 00B48 809F3E08 0C042DA0 */ jal func_8010B680 +/* 00B48 809F3E08 0C042DA0 */ jal func_8010B680 /* 00B4C 809F3E0C 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 /* 00B50 809F3E10 3C08809F */ lui $t0, %hi(func_809F3E30) ## $t0 = 809F0000 /* 00B54 809F3E14 25083E30 */ addiu $t0, $t0, %lo(func_809F3E30) ## $t0 = 809F3E30 /* 00B58 809F3E18 AE080214 */ sw $t0, 0x0214($s0) ## 00000214 -/* 00B5C 809F3E1C 8FBF002C */ lw $ra, 0x002C($sp) -/* 00B60 809F3E20 8FB00028 */ lw $s0, 0x0028($sp) +/* 00B5C 809F3E1C 8FBF002C */ lw $ra, 0x002C($sp) +/* 00B60 809F3E20 8FB00028 */ lw $s0, 0x0028($sp) /* 00B64 809F3E24 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 00B68 809F3E28 03E00008 */ jr $ra +/* 00B68 809F3E28 03E00008 */ jr $ra /* 00B6C 809F3E2C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F3ED4.s b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F3ED4.s index fa20e3bf1f..94148bfa0b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F3ED4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F3ED4.s @@ -1,43 +1,43 @@ glabel func_809F3ED4 /* 00C14 809F3ED4 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 00C18 809F3ED8 AFA40028 */ sw $a0, 0x0028($sp) -/* 00C1C 809F3EDC AFBF0024 */ sw $ra, 0x0024($sp) +/* 00C18 809F3ED8 AFA40028 */ sw $a0, 0x0028($sp) +/* 00C1C 809F3EDC AFBF0024 */ sw $ra, 0x0024($sp) /* 00C20 809F3EE0 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 -/* 00C24 809F3EE4 AFA5002C */ sw $a1, 0x002C($sp) +/* 00C24 809F3EE4 AFA5002C */ sw $a1, 0x002C($sp) /* 00C28 809F3EE8 0C028800 */ jal SkelAnime_GetFrameCount - + /* 00C2C 809F3EEC 24840168 */ addiu $a0, $a0, 0x0168 ## $a0 = 06000168 /* 00C30 809F3EF0 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 -/* 00C34 809F3EF4 8FA30028 */ lw $v1, 0x0028($sp) +/* 00C34 809F3EF4 8FA30028 */ lw $v1, 0x0028($sp) /* 00C38 809F3EF8 3C01C120 */ lui $at, 0xC120 ## $at = C1200000 -/* 00C3C 809F3EFC 468021A0 */ cvt.s.w $f6, $f4 +/* 00C3C 809F3EFC 468021A0 */ cvt.s.w $f6, $f4 /* 00C40 809F3F00 44819000 */ mtc1 $at, $f18 ## $f18 = -10.00 /* 00C44 809F3F04 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 00C48 809F3F08 24190002 */ addiu $t9, $zero, 0x0002 ## $t9 = 00000002 /* 00C4C 809F3F0C 24A50168 */ addiu $a1, $a1, 0x0168 ## $a1 = 06000168 /* 00C50 809F3F10 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 00C54 809F3F14 4600320D */ trunc.w.s $f8, $f6 +/* 00C54 809F3F14 4600320D */ trunc.w.s $f8, $f6 /* 00C58 809F3F18 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 /* 00C5C 809F3F1C 2464014C */ addiu $a0, $v1, 0x014C ## $a0 = 0000014C -/* 00C60 809F3F20 440F4000 */ mfc1 $t7, $f8 +/* 00C60 809F3F20 440F4000 */ mfc1 $t7, $f8 /* 00C64 809F3F24 00000000 */ nop /* 00C68 809F3F28 A46F026E */ sh $t7, 0x026E($v1) ## 0000026E /* 00C6C 809F3F2C 8478026E */ lh $t8, 0x026E($v1) ## 0000026E -/* 00C70 809F3F30 AFB90014 */ sw $t9, 0x0014($sp) -/* 00C74 809F3F34 E7B20018 */ swc1 $f18, 0x0018($sp) +/* 00C70 809F3F30 AFB90014 */ sw $t9, 0x0014($sp) +/* 00C74 809F3F34 E7B20018 */ swc1 $f18, 0x0018($sp) /* 00C78 809F3F38 44985000 */ mtc1 $t8, $f10 ## $f10 = 0.00 /* 00C7C 809F3F3C 00000000 */ nop -/* 00C80 809F3F40 46805420 */ cvt.s.w $f16, $f10 -/* 00C84 809F3F44 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 00C88 809F3F48 E7B00010 */ swc1 $f16, 0x0010($sp) -/* 00C8C 809F3F4C 8FA30028 */ lw $v1, 0x0028($sp) +/* 00C80 809F3F40 46805420 */ cvt.s.w $f16, $f10 +/* 00C84 809F3F44 0C029468 */ jal SkelAnime_ChangeAnim + +/* 00C88 809F3F48 E7B00010 */ swc1 $f16, 0x0010($sp) +/* 00C8C 809F3F4C 8FA30028 */ lw $v1, 0x0028($sp) /* 00C90 809F3F50 3C08809F */ lui $t0, %hi(func_809F3F6C) ## $t0 = 809F0000 /* 00C94 809F3F54 25083F6C */ addiu $t0, $t0, %lo(func_809F3F6C) ## $t0 = 809F3F6C /* 00C98 809F3F58 AC680214 */ sw $t0, 0x0214($v1) ## 00000214 -/* 00C9C 809F3F5C 8FBF0024 */ lw $ra, 0x0024($sp) +/* 00C9C 809F3F5C 8FBF0024 */ lw $ra, 0x0024($sp) /* 00CA0 809F3F60 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 00CA4 809F3F64 03E00008 */ jr $ra +/* 00CA4 809F3F64 03E00008 */ jr $ra /* 00CA8 809F3F68 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F3F6C.s b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F3F6C.s index c598d3b43e..fb2b0c0bdb 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F3F6C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F3F6C.s @@ -1,103 +1,103 @@ glabel func_809F3F6C /* 00CAC 809F3F6C 27BDFFA8 */ addiu $sp, $sp, 0xFFA8 ## $sp = FFFFFFA8 -/* 00CB0 809F3F70 AFB00038 */ sw $s0, 0x0038($sp) -/* 00CB4 809F3F74 AFBF003C */ sw $ra, 0x003C($sp) -/* 00CB8 809F3F78 AFA5005C */ sw $a1, 0x005C($sp) +/* 00CB0 809F3F70 AFB00038 */ sw $s0, 0x0038($sp) +/* 00CB4 809F3F74 AFBF003C */ sw $ra, 0x003C($sp) +/* 00CB8 809F3F78 AFA5005C */ sw $a1, 0x005C($sp) /* 00CBC 809F3F7C C4840164 */ lwc1 $f4, 0x0164($a0) ## 00000164 /* 00CC0 809F3F80 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 00CC4 809F3F84 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 00CC8 809F3F88 AFA40044 */ sw $a0, 0x0044($sp) +/* 00CC8 809F3F88 AFA40044 */ sw $a0, 0x0044($sp) /* 00CCC 809F3F8C 0C02927F */ jal SkelAnime_FrameUpdateMatrix - -/* 00CD0 809F3F90 E7A40054 */ swc1 $f4, 0x0054($sp) + +/* 00CD0 809F3F90 E7A40054 */ swc1 $f4, 0x0054($sp) /* 00CD4 809F3F94 3C014100 */ lui $at, 0x4100 ## $at = 41000000 /* 00CD8 809F3F98 44814000 */ mtc1 $at, $f8 ## $f8 = 8.00 -/* 00CDC 809F3F9C C7A60054 */ lwc1 $f6, 0x0054($sp) -/* 00CE0 809F3FA0 4606403E */ c.le.s $f8, $f6 +/* 00CDC 809F3F9C C7A60054 */ lwc1 $f6, 0x0054($sp) +/* 00CE0 809F3FA0 4606403E */ c.le.s $f8, $f6 /* 00CE4 809F3FA4 00000000 */ nop -/* 00CE8 809F3FA8 45020023 */ bc1fl .L809F4038 +/* 00CE8 809F3FA8 45020023 */ bc1fl .L809F4038 /* 00CEC 809F3FAC 8619026E */ lh $t9, 0x026E($s0) ## 0000026E /* 00CF0 809F3FB0 920E0277 */ lbu $t6, 0x0277($s0) ## 00000277 -/* 00CF4 809F3FB4 8FA6005C */ lw $a2, 0x005C($sp) +/* 00CF4 809F3FB4 8FA6005C */ lw $a2, 0x005C($sp) /* 00CF8 809F3FB8 3C014120 */ lui $at, 0x4120 ## $at = 41200000 -/* 00CFC 809F3FBC 15C0001D */ bne $t6, $zero, .L809F4034 +/* 00CFC 809F3FBC 15C0001D */ bne $t6, $zero, .L809F4034 /* 00D00 809F3FC0 24C41C24 */ addiu $a0, $a2, 0x1C24 ## $a0 = 00001C24 /* 00D04 809F3FC4 C60A027C */ lwc1 $f10, 0x027C($s0) ## 0000027C /* 00D08 809F3FC8 44818000 */ mtc1 $at, $f16 ## $f16 = 10.00 /* 00D0C 809F3FCC C6020280 */ lwc1 $f2, 0x0280($s0) ## 00000280 /* 00D10 809F3FD0 C60C0284 */ lwc1 $f12, 0x0284($s0) ## 00000284 -/* 00D14 809F3FD4 46105001 */ sub.s $f0, $f10, $f16 +/* 00D14 809F3FD4 46105001 */ sub.s $f0, $f10, $f16 /* 00D18 809F3FD8 240F0013 */ addiu $t7, $zero, 0x0013 ## $t7 = 00000013 -/* 00D1C 809F3FDC AFAF0028 */ sw $t7, 0x0028($sp) -/* 00D20 809F3FE0 AFA00024 */ sw $zero, 0x0024($sp) -/* 00D24 809F3FE4 E7A00010 */ swc1 $f0, 0x0010($sp) -/* 00D28 809F3FE8 AFA00020 */ sw $zero, 0x0020($sp) -/* 00D2C 809F3FEC AFA0001C */ sw $zero, 0x001C($sp) +/* 00D1C 809F3FDC AFAF0028 */ sw $t7, 0x0028($sp) +/* 00D20 809F3FE0 AFA00024 */ sw $zero, 0x0024($sp) +/* 00D24 809F3FE4 E7A00010 */ swc1 $f0, 0x0010($sp) +/* 00D28 809F3FE8 AFA00020 */ sw $zero, 0x0020($sp) +/* 00D2C 809F3FEC AFA0001C */ sw $zero, 0x001C($sp) /* 00D30 809F3FF0 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 00D34 809F3FF4 24070168 */ addiu $a3, $zero, 0x0168 ## $a3 = 00000168 -/* 00D38 809F3FF8 E7A20014 */ swc1 $f2, 0x0014($sp) +/* 00D38 809F3FF8 E7A20014 */ swc1 $f2, 0x0014($sp) /* 00D3C 809F3FFC 0C00C916 */ jal Actor_SpawnAttached - -/* 00D40 809F4000 E7AC0018 */ swc1 $f12, 0x0018($sp) -/* 00D44 809F4004 14400006 */ bne $v0, $zero, .L809F4020 -/* 00D48 809F4008 8FA4005C */ lw $a0, 0x005C($sp) + +/* 00D40 809F4000 E7AC0018 */ swc1 $f12, 0x0018($sp) +/* 00D44 809F4004 14400006 */ bne $v0, $zero, .L809F4020 +/* 00D48 809F4008 8FA4005C */ lw $a0, 0x005C($sp) /* 00D4C 809F400C 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 00D50 809F4010 0C00B7D5 */ jal func_8002DF54 +/* 00D50 809F4010 0C00B7D5 */ jal func_8002DF54 /* 00D54 809F4014 24060007 */ addiu $a2, $zero, 0x0007 ## $a2 = 00000007 /* 00D58 809F4018 0C00B55C */ jal Actor_Kill - + /* 00D5C 809F401C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 .L809F4020: /* 00D60 809F4020 24180001 */ addiu $t8, $zero, 0x0001 ## $t8 = 00000001 /* 00D64 809F4024 A2180277 */ sb $t8, 0x0277($s0) ## 00000277 /* 00D68 809F4028 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 00D6C 809F402C 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 00D70 809F4030 2405387E */ addiu $a1, $zero, 0x387E ## $a1 = 0000387E .L809F4034: /* 00D74 809F4034 8619026E */ lh $t9, 0x026E($s0) ## 0000026E .L809F4038: -/* 00D78 809F4038 C7B20054 */ lwc1 $f18, 0x0054($sp) +/* 00D78 809F4038 C7B20054 */ lwc1 $f18, 0x0054($sp) /* 00D7C 809F403C 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 /* 00D80 809F4040 44992000 */ mtc1 $t9, $f4 ## $f4 = 0.00 /* 00D84 809F4044 00000000 */ nop -/* 00D88 809F4048 468021A0 */ cvt.s.w $f6, $f4 -/* 00D8C 809F404C 4612303E */ c.le.s $f6, $f18 +/* 00D88 809F4048 468021A0 */ cvt.s.w $f6, $f4 +/* 00D8C 809F404C 4612303E */ c.le.s $f6, $f18 /* 00D90 809F4050 00000000 */ nop -/* 00D94 809F4054 4502001B */ bc1fl .L809F40C4 -/* 00D98 809F4058 8FBF003C */ lw $ra, 0x003C($sp) +/* 00D94 809F4054 4502001B */ bc1fl .L809F40C4 +/* 00D98 809F4058 8FBF003C */ lw $ra, 0x003C($sp) /* 00D9C 809F405C 0C028800 */ jal SkelAnime_GetFrameCount - + /* 00DA0 809F4060 24843128 */ addiu $a0, $a0, 0x3128 ## $a0 = 06003128 /* 00DA4 809F4064 44824000 */ mtc1 $v0, $f8 ## $f8 = 0.00 /* 00DA8 809F4068 3C01C120 */ lui $at, 0xC120 ## $at = C1200000 /* 00DAC 809F406C 44813000 */ mtc1 $at, $f6 ## $f6 = -10.00 -/* 00DB0 809F4070 468042A0 */ cvt.s.w $f10, $f8 +/* 00DB0 809F4070 468042A0 */ cvt.s.w $f10, $f8 /* 00DB4 809F4074 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 00DB8 809F4078 24A53128 */ addiu $a1, $a1, 0x3128 ## $a1 = 06003128 /* 00DBC 809F407C 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 00DC0 809F4080 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 00DC4 809F4084 4600540D */ trunc.w.s $f16, $f10 -/* 00DC8 809F4088 44098000 */ mfc1 $t1, $f16 +/* 00DC4 809F4084 4600540D */ trunc.w.s $f16, $f10 +/* 00DC8 809F4088 44098000 */ mfc1 $t1, $f16 /* 00DCC 809F408C 00000000 */ nop /* 00DD0 809F4090 A609026E */ sh $t1, 0x026E($s0) ## 0000026E /* 00DD4 809F4094 860A026E */ lh $t2, 0x026E($s0) ## 0000026E -/* 00DD8 809F4098 AFA00014 */ sw $zero, 0x0014($sp) -/* 00DDC 809F409C 8FA40044 */ lw $a0, 0x0044($sp) +/* 00DD8 809F4098 AFA00014 */ sw $zero, 0x0014($sp) +/* 00DDC 809F409C 8FA40044 */ lw $a0, 0x0044($sp) /* 00DE0 809F40A0 448A2000 */ mtc1 $t2, $f4 ## $f4 = 0.00 -/* 00DE4 809F40A4 E7A60018 */ swc1 $f6, 0x0018($sp) -/* 00DE8 809F40A8 468024A0 */ cvt.s.w $f18, $f4 -/* 00DEC 809F40AC 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 00DF0 809F40B0 E7B20010 */ swc1 $f18, 0x0010($sp) +/* 00DE4 809F40A4 E7A60018 */ swc1 $f6, 0x0018($sp) +/* 00DE8 809F40A8 468024A0 */ cvt.s.w $f18, $f4 +/* 00DEC 809F40AC 0C029468 */ jal SkelAnime_ChangeAnim + +/* 00DF0 809F40B0 E7B20010 */ swc1 $f18, 0x0010($sp) /* 00DF4 809F40B4 3C0B809F */ lui $t3, %hi(func_809F40D4) ## $t3 = 809F0000 /* 00DF8 809F40B8 256B40D4 */ addiu $t3, $t3, %lo(func_809F40D4) ## $t3 = 809F40D4 /* 00DFC 809F40BC AE0B0214 */ sw $t3, 0x0214($s0) ## 00000214 -/* 00E00 809F40C0 8FBF003C */ lw $ra, 0x003C($sp) +/* 00E00 809F40C0 8FBF003C */ lw $ra, 0x003C($sp) .L809F40C4: -/* 00E04 809F40C4 8FB00038 */ lw $s0, 0x0038($sp) +/* 00E04 809F40C4 8FB00038 */ lw $s0, 0x0038($sp) /* 00E08 809F40C8 27BD0058 */ addiu $sp, $sp, 0x0058 ## $sp = 00000000 -/* 00E0C 809F40CC 03E00008 */ jr $ra +/* 00E0C 809F40CC 03E00008 */ jr $ra /* 00E10 809F40D0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F40D4.s b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F40D4.s index 17d7a927ac..0c31a8fedc 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F40D4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F40D4.s @@ -1,78 +1,78 @@ glabel func_809F40D4 /* 00E14 809F40D4 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 00E18 809F40D8 AFB10028 */ sw $s1, 0x0028($sp) -/* 00E1C 809F40DC AFB00024 */ sw $s0, 0x0024($sp) +/* 00E18 809F40D8 AFB10028 */ sw $s1, 0x0028($sp) +/* 00E1C 809F40DC AFB00024 */ sw $s0, 0x0024($sp) /* 00E20 809F40E0 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00E24 809F40E4 AFBF002C */ sw $ra, 0x002C($sp) +/* 00E24 809F40E4 AFBF002C */ sw $ra, 0x002C($sp) /* 00E28 809F40E8 2491014C */ addiu $s1, $a0, 0x014C ## $s1 = 0000014C -/* 00E2C 809F40EC AFA5003C */ sw $a1, 0x003C($sp) +/* 00E2C 809F40EC AFA5003C */ sw $a1, 0x003C($sp) /* 00E30 809F40F0 0C02927F */ jal SkelAnime_FrameUpdateMatrix - + /* 00E34 809F40F4 02202025 */ or $a0, $s1, $zero ## $a0 = 0000014C /* 00E38 809F40F8 3C01C334 */ lui $at, 0xC334 ## $at = C3340000 /* 00E3C 809F40FC C604021C */ lwc1 $f4, 0x021C($s0) ## 0000021C /* 00E40 809F4100 C6060024 */ lwc1 $f6, 0x0024($s0) ## 00000024 /* 00E44 809F4104 44814000 */ mtc1 $at, $f8 ## $f8 = -180.00 /* 00E48 809F4108 C60A002C */ lwc1 $f10, 0x002C($s0) ## 0000002C -/* 00E4C 809F410C 46062301 */ sub.s $f12, $f4, $f6 -/* 00E50 809F4110 460A4381 */ sub.s $f14, $f8, $f10 -/* 00E54 809F4114 E7AC0034 */ swc1 $f12, 0x0034($sp) -/* 00E58 809F4118 0C03F494 */ jal func_800FD250 -/* 00E5C 809F411C E7AE0030 */ swc1 $f14, 0x0030($sp) +/* 00E4C 809F410C 46062301 */ sub.s $f12, $f4, $f6 +/* 00E50 809F4110 460A4381 */ sub.s $f14, $f8, $f10 +/* 00E54 809F4114 E7AC0034 */ swc1 $f12, 0x0034($sp) +/* 00E58 809F4118 0C03F494 */ jal Math_atan2f +/* 00E5C 809F411C E7AE0030 */ swc1 $f14, 0x0030($sp) /* 00E60 809F4120 3C01809F */ lui $at, %hi(D_809F6044) ## $at = 809F0000 -/* 00E64 809F4124 C4306044 */ lwc1 $f16, %lo(D_809F6044)($at) +/* 00E64 809F4124 C4306044 */ lwc1 $f16, %lo(D_809F6044)($at) /* 00E68 809F4128 260400B6 */ addiu $a0, $s0, 0x00B6 ## $a0 = 000000B6 /* 00E6C 809F412C 24060003 */ addiu $a2, $zero, 0x0003 ## $a2 = 00000003 -/* 00E70 809F4130 46100482 */ mul.s $f18, $f0, $f16 +/* 00E70 809F4130 46100482 */ mul.s $f18, $f0, $f16 /* 00E74 809F4134 24071388 */ addiu $a3, $zero, 0x1388 ## $a3 = 00001388 -/* 00E78 809F4138 AFA00010 */ sw $zero, 0x0010($sp) -/* 00E7C 809F413C 4600910D */ trunc.w.s $f4, $f18 -/* 00E80 809F4140 44052000 */ mfc1 $a1, $f4 +/* 00E78 809F4138 AFA00010 */ sw $zero, 0x0010($sp) +/* 00E7C 809F413C 4600910D */ trunc.w.s $f4, $f18 +/* 00E80 809F4140 44052000 */ mfc1 $a1, $f4 /* 00E84 809F4144 00000000 */ nop -/* 00E88 809F4148 00052C00 */ sll $a1, $a1, 16 +/* 00E88 809F4148 00052C00 */ sll $a1, $a1, 16 /* 00E8C 809F414C 0C01E1A7 */ jal Math_SmoothScaleMaxMinS - -/* 00E90 809F4150 00052C03 */ sra $a1, $a1, 16 -/* 00E94 809F4154 C7AC0034 */ lwc1 $f12, 0x0034($sp) -/* 00E98 809F4158 0C03F494 */ jal func_800FD250 -/* 00E9C 809F415C C7AE0030 */ lwc1 $f14, 0x0030($sp) + +/* 00E90 809F4150 00052C03 */ sra $a1, $a1, 16 +/* 00E94 809F4154 C7AC0034 */ lwc1 $f12, 0x0034($sp) +/* 00E98 809F4158 0C03F494 */ jal Math_atan2f +/* 00E9C 809F415C C7AE0030 */ lwc1 $f14, 0x0030($sp) /* 00EA0 809F4160 3C01809F */ lui $at, %hi(D_809F6048) ## $at = 809F0000 -/* 00EA4 809F4164 C4266048 */ lwc1 $f6, %lo(D_809F6048)($at) +/* 00EA4 809F4164 C4266048 */ lwc1 $f6, %lo(D_809F6048)($at) /* 00EA8 809F4168 860F00B6 */ lh $t7, 0x00B6($s0) ## 000000B6 /* 00EAC 809F416C 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 -/* 00EB0 809F4170 46060202 */ mul.s $f8, $f0, $f6 +/* 00EB0 809F4170 46060202 */ mul.s $f8, $f0, $f6 /* 00EB4 809F4174 44819000 */ mtc1 $at, $f18 ## $f18 = 20.00 /* 00EB8 809F4178 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 /* 00EBC 809F417C 02202025 */ or $a0, $s1, $zero ## $a0 = 0000014C -/* 00EC0 809F4180 4600428D */ trunc.w.s $f10, $f8 -/* 00EC4 809F4184 44195000 */ mfc1 $t9, $f10 +/* 00EC0 809F4180 4600428D */ trunc.w.s $f10, $f8 +/* 00EC4 809F4184 44195000 */ mfc1 $t9, $f10 /* 00EC8 809F4188 00000000 */ nop -/* 00ECC 809F418C 00194400 */ sll $t0, $t9, 16 -/* 00ED0 809F4190 00084C03 */ sra $t1, $t0, 16 -/* 00ED4 809F4194 01E95023 */ subu $t2, $t7, $t1 +/* 00ECC 809F418C 00194400 */ sll $t0, $t9, 16 +/* 00ED0 809F4190 00084C03 */ sra $t1, $t0, 16 +/* 00ED4 809F4194 01E95023 */ subu $t2, $t7, $t1 /* 00ED8 809F4198 448A8000 */ mtc1 $t2, $f16 ## $f16 = 0.00 /* 00EDC 809F419C 00000000 */ nop -/* 00EE0 809F41A0 46808020 */ cvt.s.w $f0, $f16 -/* 00EE4 809F41A4 46000005 */ abs.s $f0, $f0 -/* 00EE8 809F41A8 4612003C */ c.lt.s $f0, $f18 +/* 00EE0 809F41A0 46808020 */ cvt.s.w $f0, $f16 +/* 00EE4 809F41A4 46000005 */ abs.s $f0, $f0 +/* 00EE8 809F41A8 4612003C */ c.lt.s $f0, $f18 /* 00EEC 809F41AC 00000000 */ nop -/* 00EF0 809F41B0 45000004 */ bc1f .L809F41C4 +/* 00EF0 809F41B0 45000004 */ bc1f .L809F41C4 /* 00EF4 809F41B4 00000000 */ nop /* 00EF8 809F41B8 44812000 */ mtc1 $at, $f4 ## $f4 = 1.00 /* 00EFC 809F41BC 00000000 */ nop /* 00F00 809F41C0 E6040068 */ swc1 $f4, 0x0068($s0) ## 00000068 .L809F41C4: -/* 00F04 809F41C4 0C0295B2 */ jal func_800A56C8 +/* 00F04 809F41C4 0C0295B2 */ jal func_800A56C8 /* 00F08 809F41C8 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 -/* 00F0C 809F41CC 14400004 */ bne $v0, $zero, .L809F41E0 +/* 00F0C 809F41CC 14400004 */ bne $v0, $zero, .L809F41E0 /* 00F10 809F41D0 02202025 */ or $a0, $s1, $zero ## $a0 = 0000014C -/* 00F14 809F41D4 0C0295B2 */ jal func_800A56C8 +/* 00F14 809F41D4 0C0295B2 */ jal func_800A56C8 /* 00F18 809F41D8 3C0540C0 */ lui $a1, 0x40C0 ## $a1 = 40C00000 -/* 00F1C 809F41DC 10400003 */ beq $v0, $zero, .L809F41EC +/* 00F1C 809F41DC 10400003 */ beq $v0, $zero, .L809F41EC .L809F41E0: /* 00F20 809F41E0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 00F24 809F41E4 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 00F28 809F41E8 2405387F */ addiu $a1, $zero, 0x387F ## $a1 = 0000387F .L809F41EC: /* 00F2C 809F41EC 3C01C32C */ lui $at, 0xC32C ## $at = C32C0000 @@ -80,36 +80,36 @@ glabel func_809F40D4 /* 00F34 809F41F4 C606002C */ lwc1 $f6, 0x002C($s0) ## 0000002C /* 00F38 809F41F8 860B00B6 */ lh $t3, 0x00B6($s0) ## 000000B6 /* 00F3C 809F41FC 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 -/* 00F40 809F4200 4608303C */ c.lt.s $f6, $f8 +/* 00F40 809F4200 4608303C */ c.lt.s $f6, $f8 /* 00F44 809F4204 A60B0032 */ sh $t3, 0x0032($s0) ## 00000032 -/* 00F48 809F4208 45020022 */ bc1fl .L809F4294 -/* 00F4C 809F420C 8FBF002C */ lw $ra, 0x002C($sp) +/* 00F48 809F4208 45020022 */ bc1fl .L809F4294 +/* 00F4C 809F420C 8FBF002C */ lw $ra, 0x002C($sp) /* 00F50 809F4210 0C028800 */ jal SkelAnime_GetFrameCount - + /* 00F54 809F4214 248424CC */ addiu $a0, $a0, 0x24CC ## $a0 = 060024CC /* 00F58 809F4218 44825000 */ mtc1 $v0, $f10 ## $f10 = 0.00 /* 00F5C 809F421C 3C01C120 */ lui $at, 0xC120 ## $at = C1200000 /* 00F60 809F4220 44814000 */ mtc1 $at, $f8 ## $f8 = -10.00 -/* 00F64 809F4224 46805420 */ cvt.s.w $f16, $f10 +/* 00F64 809F4224 46805420 */ cvt.s.w $f16, $f10 /* 00F68 809F4228 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 00F6C 809F422C 24180002 */ addiu $t8, $zero, 0x0002 ## $t8 = 00000002 /* 00F70 809F4230 24A524CC */ addiu $a1, $a1, 0x24CC ## $a1 = 060024CC /* 00F74 809F4234 02202025 */ or $a0, $s1, $zero ## $a0 = 0000014C /* 00F78 809F4238 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 00F7C 809F423C 4600848D */ trunc.w.s $f18, $f16 +/* 00F7C 809F423C 4600848D */ trunc.w.s $f18, $f16 /* 00F80 809F4240 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 00F84 809F4244 440D9000 */ mfc1 $t5, $f18 +/* 00F84 809F4244 440D9000 */ mfc1 $t5, $f18 /* 00F88 809F4248 00000000 */ nop /* 00F8C 809F424C A60D026E */ sh $t5, 0x026E($s0) ## 0000026E /* 00F90 809F4250 860E026E */ lh $t6, 0x026E($s0) ## 0000026E -/* 00F94 809F4254 AFB80014 */ sw $t8, 0x0014($sp) -/* 00F98 809F4258 E7A80018 */ swc1 $f8, 0x0018($sp) +/* 00F94 809F4254 AFB80014 */ sw $t8, 0x0014($sp) +/* 00F98 809F4258 E7A80018 */ swc1 $f8, 0x0018($sp) /* 00F9C 809F425C 448E2000 */ mtc1 $t6, $f4 ## $f4 = 0.00 /* 00FA0 809F4260 00000000 */ nop -/* 00FA4 809F4264 468021A0 */ cvt.s.w $f6, $f4 -/* 00FA8 809F4268 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 00FAC 809F426C E7A60010 */ swc1 $f6, 0x0010($sp) +/* 00FA4 809F4264 468021A0 */ cvt.s.w $f6, $f4 +/* 00FA8 809F4268 0C029468 */ jal SkelAnime_ChangeAnim + +/* 00FAC 809F426C E7A60010 */ swc1 $f6, 0x0010($sp) /* 00FB0 809F4270 3C01C32D */ lui $at, 0xC32D ## $at = C32D0000 /* 00FB4 809F4274 44815000 */ mtc1 $at, $f10 ## $f10 = -173.00 /* 00FB8 809F4278 44808000 */ mtc1 $zero, $f16 ## $f16 = 0.00 @@ -118,11 +118,11 @@ glabel func_809F40D4 /* 00FC4 809F4284 AE190214 */ sw $t9, 0x0214($s0) ## 00000214 /* 00FC8 809F4288 E60A002C */ swc1 $f10, 0x002C($s0) ## 0000002C /* 00FCC 809F428C E6100068 */ swc1 $f16, 0x0068($s0) ## 00000068 -/* 00FD0 809F4290 8FBF002C */ lw $ra, 0x002C($sp) +/* 00FD0 809F4290 8FBF002C */ lw $ra, 0x002C($sp) .L809F4294: -/* 00FD4 809F4294 8FB00024 */ lw $s0, 0x0024($sp) -/* 00FD8 809F4298 8FB10028 */ lw $s1, 0x0028($sp) -/* 00FDC 809F429C 03E00008 */ jr $ra +/* 00FD4 809F4294 8FB00024 */ lw $s0, 0x0024($sp) +/* 00FD8 809F4298 8FB10028 */ lw $s1, 0x0028($sp) +/* 00FDC 809F429C 03E00008 */ jr $ra /* 00FE0 809F42A0 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F4310.s b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F4310.s index 32e4aee6a8..f1a555455b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F4310.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F4310.s @@ -1,40 +1,40 @@ glabel func_809F4310 /* 01050 809F4310 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 01054 809F4314 AFBF002C */ sw $ra, 0x002C($sp) -/* 01058 809F4318 AFB00028 */ sw $s0, 0x0028($sp) -/* 0105C 809F431C AFA50034 */ sw $a1, 0x0034($sp) +/* 01054 809F4314 AFBF002C */ sw $ra, 0x002C($sp) +/* 01058 809F4318 AFB00028 */ sw $s0, 0x0028($sp) +/* 0105C 809F431C AFA50034 */ sw $a1, 0x0034($sp) /* 01060 809F4320 848E0264 */ lh $t6, 0x0264($a0) ## 00000264 /* 01064 809F4324 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 01068 809F4328 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 -/* 0106C 809F432C 55C00022 */ bnel $t6, $zero, .L809F43B8 -/* 01070 809F4330 8FBF002C */ lw $ra, 0x002C($sp) +/* 0106C 809F432C 55C00022 */ bnel $t6, $zero, .L809F43B8 +/* 01070 809F4330 8FBF002C */ lw $ra, 0x002C($sp) /* 01074 809F4334 0C028800 */ jal SkelAnime_GetFrameCount - + /* 01078 809F4338 24840430 */ addiu $a0, $a0, 0x0430 ## $a0 = 06000430 /* 0107C 809F433C 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 01080 809F4340 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 /* 01084 809F4344 3C01C120 */ lui $at, 0xC120 ## $at = C1200000 -/* 01088 809F4348 468021A0 */ cvt.s.w $f6, $f4 +/* 01088 809F4348 468021A0 */ cvt.s.w $f6, $f4 /* 0108C 809F434C 44819000 */ mtc1 $at, $f18 ## $f18 = -10.00 /* 01090 809F4350 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 01094 809F4354 24080002 */ addiu $t0, $zero, 0x0002 ## $t0 = 00000002 -/* 01098 809F4358 44060000 */ mfc1 $a2, $f0 -/* 0109C 809F435C 44070000 */ mfc1 $a3, $f0 -/* 010A0 809F4360 4600320D */ trunc.w.s $f8, $f6 +/* 01098 809F4358 44060000 */ mfc1 $a2, $f0 +/* 0109C 809F435C 44070000 */ mfc1 $a3, $f0 +/* 010A0 809F4360 4600320D */ trunc.w.s $f8, $f6 /* 010A4 809F4364 24A50430 */ addiu $a1, $a1, 0x0430 ## $a1 = 06000430 /* 010A8 809F4368 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C -/* 010AC 809F436C 44184000 */ mfc1 $t8, $f8 +/* 010AC 809F436C 44184000 */ mfc1 $t8, $f8 /* 010B0 809F4370 00000000 */ nop /* 010B4 809F4374 A618026E */ sh $t8, 0x026E($s0) ## 0000026E /* 010B8 809F4378 8619026E */ lh $t9, 0x026E($s0) ## 0000026E -/* 010BC 809F437C AFA80014 */ sw $t0, 0x0014($sp) -/* 010C0 809F4380 E7B20018 */ swc1 $f18, 0x0018($sp) +/* 010BC 809F437C AFA80014 */ sw $t0, 0x0014($sp) +/* 010C0 809F4380 E7B20018 */ swc1 $f18, 0x0018($sp) /* 010C4 809F4384 44995000 */ mtc1 $t9, $f10 ## $f10 = 0.00 /* 010C8 809F4388 00000000 */ nop -/* 010CC 809F438C 46805420 */ cvt.s.w $f16, $f10 -/* 010D0 809F4390 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 010D4 809F4394 E7B00010 */ swc1 $f16, 0x0010($sp) +/* 010CC 809F438C 46805420 */ cvt.s.w $f16, $f10 +/* 010D0 809F4390 0C029468 */ jal SkelAnime_ChangeAnim + +/* 010D4 809F4394 E7B00010 */ swc1 $f16, 0x0010($sp) /* 010D8 809F4398 3C014100 */ lui $at, 0x4100 ## $at = 41000000 /* 010DC 809F439C 44812000 */ mtc1 $at, $f4 ## $f4 = 8.00 /* 010E0 809F43A0 3C09809F */ lui $t1, %hi(func_809F43C8) ## $t1 = 809F0000 @@ -42,11 +42,11 @@ glabel func_809F4310 /* 010E8 809F43A8 A2000218 */ sb $zero, 0x0218($s0) ## 00000218 /* 010EC 809F43AC AE090214 */ sw $t1, 0x0214($s0) ## 00000214 /* 010F0 809F43B0 E6040164 */ swc1 $f4, 0x0164($s0) ## 00000164 -/* 010F4 809F43B4 8FBF002C */ lw $ra, 0x002C($sp) +/* 010F4 809F43B4 8FBF002C */ lw $ra, 0x002C($sp) .L809F43B8: -/* 010F8 809F43B8 8FB00028 */ lw $s0, 0x0028($sp) +/* 010F8 809F43B8 8FB00028 */ lw $s0, 0x0028($sp) /* 010FC 809F43BC 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 01100 809F43C0 03E00008 */ jr $ra +/* 01100 809F43C0 03E00008 */ jr $ra /* 01104 809F43C4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F43F0.s b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F43F0.s index 423ad54496..35801116d3 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F43F0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F43F0.s @@ -1,43 +1,43 @@ glabel func_809F43F0 /* 01130 809F43F0 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 01134 809F43F4 AFBF0034 */ sw $ra, 0x0034($sp) -/* 01138 809F43F8 AFB00030 */ sw $s0, 0x0030($sp) -/* 0113C 809F43FC AFA5003C */ sw $a1, 0x003C($sp) +/* 01134 809F43F4 AFBF0034 */ sw $ra, 0x0034($sp) +/* 01138 809F43F8 AFB00030 */ sw $s0, 0x0030($sp) +/* 0113C 809F43FC AFA5003C */ sw $a1, 0x003C($sp) /* 01140 809F4400 848E0264 */ lh $t6, 0x0264($a0) ## 00000264 /* 01144 809F4404 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 01148 809F4408 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 -/* 0114C 809F440C 55C00037 */ bnel $t6, $zero, .L809F44EC -/* 01150 809F4410 8FBF0034 */ lw $ra, 0x0034($sp) +/* 0114C 809F440C 55C00037 */ bnel $t6, $zero, .L809F44EC +/* 01150 809F4410 8FBF0034 */ lw $ra, 0x0034($sp) /* 01154 809F4414 0C028800 */ jal SkelAnime_GetFrameCount - + /* 01158 809F4418 24840B70 */ addiu $a0, $a0, 0x0B70 ## $a0 = 06000B70 /* 0115C 809F441C 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 01160 809F4420 3C01C120 */ lui $at, 0xC120 ## $at = C1200000 /* 01164 809F4424 44819000 */ mtc1 $at, $f18 ## $f18 = -10.00 -/* 01168 809F4428 468021A0 */ cvt.s.w $f6, $f4 +/* 01168 809F4428 468021A0 */ cvt.s.w $f6, $f4 /* 0116C 809F442C 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 01170 809F4430 24080002 */ addiu $t0, $zero, 0x0002 ## $t0 = 00000002 /* 01174 809F4434 24A50B70 */ addiu $a1, $a1, 0x0B70 ## $a1 = 06000B70 /* 01178 809F4438 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C /* 0117C 809F443C 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 01180 809F4440 4600320D */ trunc.w.s $f8, $f6 +/* 01180 809F4440 4600320D */ trunc.w.s $f8, $f6 /* 01184 809F4444 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 01188 809F4448 44184000 */ mfc1 $t8, $f8 +/* 01188 809F4448 44184000 */ mfc1 $t8, $f8 /* 0118C 809F444C 00000000 */ nop /* 01190 809F4450 A618026E */ sh $t8, 0x026E($s0) ## 0000026E /* 01194 809F4454 8619026E */ lh $t9, 0x026E($s0) ## 0000026E -/* 01198 809F4458 AFA80014 */ sw $t0, 0x0014($sp) -/* 0119C 809F445C E7B20018 */ swc1 $f18, 0x0018($sp) +/* 01198 809F4458 AFA80014 */ sw $t0, 0x0014($sp) +/* 0119C 809F445C E7B20018 */ swc1 $f18, 0x0018($sp) /* 011A0 809F4460 44995000 */ mtc1 $t9, $f10 ## $f10 = 0.00 /* 011A4 809F4464 00000000 */ nop -/* 011A8 809F4468 46805420 */ cvt.s.w $f16, $f10 -/* 011AC 809F446C 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 011B0 809F4470 E7B00010 */ swc1 $f16, 0x0010($sp) +/* 011A8 809F4468 46805420 */ cvt.s.w $f16, $f10 +/* 011AC 809F446C 0C029468 */ jal SkelAnime_ChangeAnim + +/* 011B0 809F4470 E7B00010 */ swc1 $f16, 0x0010($sp) /* 011B4 809F4474 86090274 */ lh $t1, 0x0274($s0) ## 00000274 /* 011B8 809F4478 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 /* 011BC 809F447C 26050024 */ addiu $a1, $s0, 0x0024 ## $a1 = 00000024 -/* 011C0 809F4480 11210003 */ beq $t1, $at, .L809F4490 +/* 011C0 809F4480 11210003 */ beq $t1, $at, .L809F4490 /* 011C4 809F4484 3C064080 */ lui $a2, 0x4080 ## $a2 = 40800000 /* 011C8 809F4488 240AFFFF */ addiu $t2, $zero, 0xFFFF ## $t2 = FFFFFFFF /* 011CC 809F448C A60A0272 */ sh $t2, 0x0272($s0) ## 00000272 @@ -47,29 +47,29 @@ glabel func_809F43F0 /* 011D8 809F4498 240D000F */ addiu $t5, $zero, 0x000F ## $t5 = 0000000F /* 011DC 809F449C 240EFFFF */ addiu $t6, $zero, 0xFFFF ## $t6 = FFFFFFFF /* 011E0 809F44A0 240F000A */ addiu $t7, $zero, 0x000A ## $t7 = 0000000A -/* 011E4 809F44A4 AFAF0020 */ sw $t7, 0x0020($sp) -/* 011E8 809F44A8 AFAE001C */ sw $t6, 0x001C($sp) -/* 011EC 809F44AC AFAD0018 */ sw $t5, 0x0018($sp) -/* 011F0 809F44B0 AFAC0014 */ sw $t4, 0x0014($sp) -/* 011F4 809F44B4 AFAB0010 */ sw $t3, 0x0010($sp) -/* 011F8 809F44B8 8FA4003C */ lw $a0, 0x003C($sp) +/* 011E4 809F44A4 AFAF0020 */ sw $t7, 0x0020($sp) +/* 011E8 809F44A8 AFAE001C */ sw $t6, 0x001C($sp) +/* 011EC 809F44AC AFAD0018 */ sw $t5, 0x0018($sp) +/* 011F0 809F44B0 AFAC0014 */ sw $t4, 0x0014($sp) +/* 011F4 809F44B4 AFAB0010 */ sw $t3, 0x0010($sp) +/* 011F8 809F44B8 8FA4003C */ lw $a0, 0x003C($sp) /* 011FC 809F44BC 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 01200 809F44C0 0C00A5E9 */ jal func_800297A4 -/* 01204 809F44C4 AFA00024 */ sw $zero, 0x0024($sp) +/* 01200 809F44C0 0C00A5E9 */ jal func_800297A4 +/* 01204 809F44C4 AFA00024 */ sw $zero, 0x0024($sp) /* 01208 809F44C8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 0120C 809F44CC 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 01210 809F44D0 2405387C */ addiu $a1, $zero, 0x387C ## $a1 = 0000387C /* 01214 809F44D4 3C19809F */ lui $t9, %hi(func_809F44FC) ## $t9 = 809F0000 /* 01218 809F44D8 24180001 */ addiu $t8, $zero, 0x0001 ## $t8 = 00000001 /* 0121C 809F44DC 273944FC */ addiu $t9, $t9, %lo(func_809F44FC) ## $t9 = 809F44FC /* 01220 809F44E0 A2180218 */ sb $t8, 0x0218($s0) ## 00000218 /* 01224 809F44E4 AE190214 */ sw $t9, 0x0214($s0) ## 00000214 -/* 01228 809F44E8 8FBF0034 */ lw $ra, 0x0034($sp) +/* 01228 809F44E8 8FBF0034 */ lw $ra, 0x0034($sp) .L809F44EC: -/* 0122C 809F44EC 8FB00030 */ lw $s0, 0x0030($sp) +/* 0122C 809F44EC 8FB00030 */ lw $s0, 0x0030($sp) /* 01230 809F44F0 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 -/* 01234 809F44F4 03E00008 */ jr $ra +/* 01234 809F44F4 03E00008 */ jr $ra /* 01238 809F44F8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F44FC.s b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F44FC.s index 6bf301467d..4e2e720108 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F44FC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F44FC.s @@ -49,7 +49,7 @@ glabel func_809F44FC /* 012E4 809F45A4 C6040290 */ lwc1 $f4, 0x0290($s0) ## 00000290 /* 012E8 809F45A8 C608002C */ lwc1 $f8, 0x002C($s0) ## 0000002C /* 012EC 809F45AC 46128301 */ sub.s $f12, $f16, $f18 -/* 012F0 809F45B0 0C03F494 */ jal func_800FD250 +/* 012F0 809F45B0 0C03F494 */ jal Math_atan2f /* 012F4 809F45B4 46082381 */ sub.s $f14, $f4, $f8 /* 012F8 809F45B8 3C01809F */ lui $at, %hi(D_809F604C) ## $at = 809F0000 /* 012FC 809F45BC C426604C */ lwc1 $f6, %lo(D_809F604C)($at) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F4730.s b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F4730.s index 1cd71cfd79..60f5c69386 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F4730.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F4730.s @@ -1,68 +1,68 @@ glabel func_809F4730 /* 01470 809F4730 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 01474 809F4734 AFBF0034 */ sw $ra, 0x0034($sp) -/* 01478 809F4738 AFB00030 */ sw $s0, 0x0030($sp) -/* 0147C 809F473C AFA5003C */ sw $a1, 0x003C($sp) +/* 01474 809F4734 AFBF0034 */ sw $ra, 0x0034($sp) +/* 01478 809F4738 AFB00030 */ sw $s0, 0x0030($sp) +/* 0147C 809F473C AFA5003C */ sw $a1, 0x003C($sp) /* 01480 809F4740 848E0264 */ lh $t6, 0x0264($a0) ## 00000264 /* 01484 809F4744 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 01488 809F4748 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 -/* 0148C 809F474C 55C00031 */ bnel $t6, $zero, .L809F4814 -/* 01490 809F4750 8FBF0034 */ lw $ra, 0x0034($sp) +/* 0148C 809F474C 55C00031 */ bnel $t6, $zero, .L809F4814 +/* 01490 809F4750 8FBF0034 */ lw $ra, 0x0034($sp) /* 01494 809F4754 0C028800 */ jal SkelAnime_GetFrameCount - + /* 01498 809F4758 24840894 */ addiu $a0, $a0, 0x0894 ## $a0 = 06000894 /* 0149C 809F475C 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 014A0 809F4760 3C01C120 */ lui $at, 0xC120 ## $at = C1200000 /* 014A4 809F4764 44819000 */ mtc1 $at, $f18 ## $f18 = -10.00 -/* 014A8 809F4768 468021A0 */ cvt.s.w $f6, $f4 +/* 014A8 809F4768 468021A0 */ cvt.s.w $f6, $f4 /* 014AC 809F476C 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 014B0 809F4770 24080002 */ addiu $t0, $zero, 0x0002 ## $t0 = 00000002 /* 014B4 809F4774 24A50894 */ addiu $a1, $a1, 0x0894 ## $a1 = 06000894 /* 014B8 809F4778 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C /* 014BC 809F477C 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 014C0 809F4780 4600320D */ trunc.w.s $f8, $f6 +/* 014C0 809F4780 4600320D */ trunc.w.s $f8, $f6 /* 014C4 809F4784 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 014C8 809F4788 44184000 */ mfc1 $t8, $f8 +/* 014C8 809F4788 44184000 */ mfc1 $t8, $f8 /* 014CC 809F478C 00000000 */ nop /* 014D0 809F4790 A618026E */ sh $t8, 0x026E($s0) ## 0000026E /* 014D4 809F4794 8619026E */ lh $t9, 0x026E($s0) ## 0000026E -/* 014D8 809F4798 AFA80014 */ sw $t0, 0x0014($sp) -/* 014DC 809F479C E7B20018 */ swc1 $f18, 0x0018($sp) +/* 014D8 809F4798 AFA80014 */ sw $t0, 0x0014($sp) +/* 014DC 809F479C E7B20018 */ swc1 $f18, 0x0018($sp) /* 014E0 809F47A0 44995000 */ mtc1 $t9, $f10 ## $f10 = 0.00 /* 014E4 809F47A4 00000000 */ nop -/* 014E8 809F47A8 46805420 */ cvt.s.w $f16, $f10 -/* 014EC 809F47AC 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 014F0 809F47B0 E7B00010 */ swc1 $f16, 0x0010($sp) +/* 014E8 809F47A8 46805420 */ cvt.s.w $f16, $f10 +/* 014EC 809F47AC 0C029468 */ jal SkelAnime_ChangeAnim + +/* 014F0 809F47B0 E7B00010 */ swc1 $f16, 0x0010($sp) /* 014F4 809F47B4 A2000218 */ sb $zero, 0x0218($s0) ## 00000218 /* 014F8 809F47B8 2409000A */ addiu $t1, $zero, 0x000A ## $t1 = 0000000A /* 014FC 809F47BC 240A0003 */ addiu $t2, $zero, 0x0003 ## $t2 = 00000003 /* 01500 809F47C0 240B000F */ addiu $t3, $zero, 0x000F ## $t3 = 0000000F /* 01504 809F47C4 240CFFFF */ addiu $t4, $zero, 0xFFFF ## $t4 = FFFFFFFF /* 01508 809F47C8 240D000A */ addiu $t5, $zero, 0x000A ## $t5 = 0000000A -/* 0150C 809F47CC AFAD0020 */ sw $t5, 0x0020($sp) -/* 01510 809F47D0 AFAC001C */ sw $t4, 0x001C($sp) -/* 01514 809F47D4 AFAB0018 */ sw $t3, 0x0018($sp) -/* 01518 809F47D8 AFAA0014 */ sw $t2, 0x0014($sp) -/* 0151C 809F47DC AFA90010 */ sw $t1, 0x0010($sp) -/* 01520 809F47E0 AFA00024 */ sw $zero, 0x0024($sp) -/* 01524 809F47E4 8FA4003C */ lw $a0, 0x003C($sp) +/* 0150C 809F47CC AFAD0020 */ sw $t5, 0x0020($sp) +/* 01510 809F47D0 AFAC001C */ sw $t4, 0x001C($sp) +/* 01514 809F47D4 AFAB0018 */ sw $t3, 0x0018($sp) +/* 01518 809F47D8 AFAA0014 */ sw $t2, 0x0014($sp) +/* 0151C 809F47DC AFA90010 */ sw $t1, 0x0010($sp) +/* 01520 809F47E0 AFA00024 */ sw $zero, 0x0024($sp) +/* 01524 809F47E4 8FA4003C */ lw $a0, 0x003C($sp) /* 01528 809F47E8 26050024 */ addiu $a1, $s0, 0x0024 ## $a1 = 00000024 /* 0152C 809F47EC 3C064080 */ lui $a2, 0x4080 ## $a2 = 40800000 -/* 01530 809F47F0 0C00A5E9 */ jal func_800297A4 +/* 01530 809F47F0 0C00A5E9 */ jal func_800297A4 /* 01534 809F47F4 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 /* 01538 809F47F8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 0153C 809F47FC 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 01540 809F4800 2405387C */ addiu $a1, $zero, 0x387C ## $a1 = 0000387C /* 01544 809F4804 3C0E809F */ lui $t6, %hi(func_809F4824) ## $t6 = 809F0000 /* 01548 809F4808 25CE4824 */ addiu $t6, $t6, %lo(func_809F4824) ## $t6 = 809F4824 /* 0154C 809F480C AE0E0214 */ sw $t6, 0x0214($s0) ## 00000214 -/* 01550 809F4810 8FBF0034 */ lw $ra, 0x0034($sp) +/* 01550 809F4810 8FBF0034 */ lw $ra, 0x0034($sp) .L809F4814: -/* 01554 809F4814 8FB00030 */ lw $s0, 0x0030($sp) +/* 01554 809F4814 8FB00030 */ lw $s0, 0x0030($sp) /* 01558 809F4818 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 -/* 0155C 809F481C 03E00008 */ jr $ra +/* 0155C 809F481C 03E00008 */ jr $ra /* 01560 809F4820 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F48FC.s b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F48FC.s index 24a8c1e95e..8e2f1d3bce 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F48FC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F48FC.s @@ -1,35 +1,35 @@ glabel func_809F48FC /* 0163C 809F48FC 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 01640 809F4900 AFB00028 */ sw $s0, 0x0028($sp) +/* 01640 809F4900 AFB00028 */ sw $s0, 0x0028($sp) /* 01644 809F4904 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 01648 809F4908 AFBF002C */ sw $ra, 0x002C($sp) +/* 01648 809F4908 AFBF002C */ sw $ra, 0x002C($sp) /* 0164C 809F490C 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 -/* 01650 809F4910 AFA50034 */ sw $a1, 0x0034($sp) +/* 01650 809F4910 AFA50034 */ sw $a1, 0x0034($sp) /* 01654 809F4914 0C028800 */ jal SkelAnime_GetFrameCount - + /* 01658 809F4918 24842E1C */ addiu $a0, $a0, 0x2E1C ## $a0 = 06002E1C /* 0165C 809F491C 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 01660 809F4920 3C01C120 */ lui $at, 0xC120 ## $at = C1200000 /* 01664 809F4924 44819000 */ mtc1 $at, $f18 ## $f18 = -10.00 -/* 01668 809F4928 468021A0 */ cvt.s.w $f6, $f4 +/* 01668 809F4928 468021A0 */ cvt.s.w $f6, $f4 /* 0166C 809F492C 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 01670 809F4930 24A52E1C */ addiu $a1, $a1, 0x2E1C ## $a1 = 06002E1C /* 01674 809F4934 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C /* 01678 809F4938 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 0167C 809F493C 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 01680 809F4940 4600320D */ trunc.w.s $f8, $f6 -/* 01684 809F4944 440F4000 */ mfc1 $t7, $f8 +/* 01680 809F4940 4600320D */ trunc.w.s $f8, $f6 +/* 01684 809F4944 440F4000 */ mfc1 $t7, $f8 /* 01688 809F4948 00000000 */ nop /* 0168C 809F494C A60F026E */ sh $t7, 0x026E($s0) ## 0000026E /* 01690 809F4950 8618026E */ lh $t8, 0x026E($s0) ## 0000026E -/* 01694 809F4954 AFA00014 */ sw $zero, 0x0014($sp) -/* 01698 809F4958 E7B20018 */ swc1 $f18, 0x0018($sp) +/* 01694 809F4954 AFA00014 */ sw $zero, 0x0014($sp) +/* 01698 809F4958 E7B20018 */ swc1 $f18, 0x0018($sp) /* 0169C 809F495C 44985000 */ mtc1 $t8, $f10 ## $f10 = 0.00 /* 016A0 809F4960 00000000 */ nop -/* 016A4 809F4964 46805420 */ cvt.s.w $f16, $f10 -/* 016A8 809F4968 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 016AC 809F496C E7B00010 */ swc1 $f16, 0x0010($sp) +/* 016A4 809F4964 46805420 */ cvt.s.w $f16, $f10 +/* 016A8 809F4968 0C029468 */ jal SkelAnime_ChangeAnim + +/* 016AC 809F496C E7B00010 */ swc1 $f16, 0x0010($sp) /* 016B0 809F4970 3C014040 */ lui $at, 0x4040 ## $at = 40400000 /* 016B4 809F4974 44812000 */ mtc1 $at, $f4 ## $f4 = 3.00 /* 016B8 809F4978 3C08809F */ lui $t0, %hi(func_809F49A4) ## $t0 = 809F0000 @@ -38,10 +38,10 @@ glabel func_809F48FC /* 016C4 809F4984 A2190218 */ sb $t9, 0x0218($s0) ## 00000218 /* 016C8 809F4988 AE080214 */ sw $t0, 0x0214($s0) ## 00000214 /* 016CC 809F498C E6040068 */ swc1 $f4, 0x0068($s0) ## 00000068 -/* 016D0 809F4990 8FBF002C */ lw $ra, 0x002C($sp) -/* 016D4 809F4994 8FB00028 */ lw $s0, 0x0028($sp) +/* 016D0 809F4990 8FBF002C */ lw $ra, 0x002C($sp) +/* 016D4 809F4994 8FB00028 */ lw $s0, 0x0028($sp) /* 016D8 809F4998 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 016DC 809F499C 03E00008 */ jr $ra +/* 016DC 809F499C 03E00008 */ jr $ra /* 016E0 809F49A0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F49A4.s b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F49A4.s index a76939933a..59524f1a0c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F49A4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F49A4.s @@ -48,7 +48,7 @@ glabel func_809F49A4 /* 01798 809F4A58 1000004D */ beq $zero, $zero, .L809F4B90 /* 0179C 809F4A5C E6100068 */ swc1 $f16, 0x0068($s0) ## 00000068 .L809F4A60: -/* 017A0 809F4A60 0C03F494 */ jal func_800FD250 +/* 017A0 809F4A60 0C03F494 */ jal Math_atan2f /* 017A4 809F4A64 00000000 */ nop /* 017A8 809F4A68 3C01809F */ lui $at, %hi(D_809F6050) ## $at = 809F0000 /* 017AC 809F4A6C C4326050 */ lwc1 $f18, %lo(D_809F6050)($at) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F4BA4.s b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F4BA4.s index 708f3e2cda..54717a0b6b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F4BA4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F4BA4.s @@ -1,76 +1,76 @@ glabel func_809F4BA4 /* 018E4 809F4BA4 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 018E8 809F4BA8 AFB00028 */ sw $s0, 0x0028($sp) +/* 018E8 809F4BA8 AFB00028 */ sw $s0, 0x0028($sp) /* 018EC 809F4BAC 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 018F0 809F4BB0 AFBF002C */ sw $ra, 0x002C($sp) +/* 018F0 809F4BB0 AFBF002C */ sw $ra, 0x002C($sp) /* 018F4 809F4BB4 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 -/* 018F8 809F4BB8 AFA50034 */ sw $a1, 0x0034($sp) +/* 018F8 809F4BB8 AFA50034 */ sw $a1, 0x0034($sp) /* 018FC 809F4BBC 0C028800 */ jal SkelAnime_GetFrameCount - + /* 01900 809F4BC0 248406CC */ addiu $a0, $a0, 0x06CC ## $a0 = 060006CC /* 01904 809F4BC4 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 01908 809F4BC8 3C01C120 */ lui $at, 0xC120 ## $at = C1200000 /* 0190C 809F4BCC 44819000 */ mtc1 $at, $f18 ## $f18 = -10.00 -/* 01910 809F4BD0 468021A0 */ cvt.s.w $f6, $f4 +/* 01910 809F4BD0 468021A0 */ cvt.s.w $f6, $f4 /* 01914 809F4BD4 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 01918 809F4BD8 24A506CC */ addiu $a1, $a1, 0x06CC ## $a1 = 060006CC /* 0191C 809F4BDC 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C /* 01920 809F4BE0 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 01924 809F4BE4 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 01928 809F4BE8 4600320D */ trunc.w.s $f8, $f6 -/* 0192C 809F4BEC 440F4000 */ mfc1 $t7, $f8 +/* 01928 809F4BE8 4600320D */ trunc.w.s $f8, $f6 +/* 0192C 809F4BEC 440F4000 */ mfc1 $t7, $f8 /* 01930 809F4BF0 00000000 */ nop /* 01934 809F4BF4 A60F026E */ sh $t7, 0x026E($s0) ## 0000026E /* 01938 809F4BF8 8618026E */ lh $t8, 0x026E($s0) ## 0000026E -/* 0193C 809F4BFC AFA00014 */ sw $zero, 0x0014($sp) -/* 01940 809F4C00 E7B20018 */ swc1 $f18, 0x0018($sp) +/* 0193C 809F4BFC AFA00014 */ sw $zero, 0x0014($sp) +/* 01940 809F4C00 E7B20018 */ swc1 $f18, 0x0018($sp) /* 01944 809F4C04 44985000 */ mtc1 $t8, $f10 ## $f10 = 0.00 /* 01948 809F4C08 00000000 */ nop -/* 0194C 809F4C0C 46805420 */ cvt.s.w $f16, $f10 -/* 01950 809F4C10 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 01954 809F4C14 E7B00010 */ swc1 $f16, 0x0010($sp) +/* 0194C 809F4C0C 46805420 */ cvt.s.w $f16, $f10 +/* 01950 809F4C10 0C029468 */ jal SkelAnime_ChangeAnim + +/* 01954 809F4C14 E7B00010 */ swc1 $f16, 0x0010($sp) /* 01958 809F4C18 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 /* 0195C 809F4C1C 24190001 */ addiu $t9, $zero, 0x0001 ## $t9 = 00000001 /* 01960 809F4C20 44816000 */ mtc1 $at, $f12 ## $f12 = 20.00 /* 01964 809F4C24 0C00CFBE */ jal Math_Rand_ZeroFloat - + /* 01968 809F4C28 A2190218 */ sb $t9, 0x0218($s0) ## 00000218 -/* 0196C 809F4C2C 4600010D */ trunc.w.s $f4, $f0 +/* 0196C 809F4C2C 4600010D */ trunc.w.s $f4, $f0 /* 01970 809F4C30 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 /* 01974 809F4C34 44815000 */ mtc1 $at, $f10 ## $f10 = 20.00 /* 01978 809F4C38 240EFFFF */ addiu $t6, $zero, 0xFFFF ## $t6 = FFFFFFFF -/* 0197C 809F4C3C 44092000 */ mfc1 $t1, $f4 +/* 0197C 809F4C3C 44092000 */ mfc1 $t1, $f4 /* 01980 809F4C40 A60E0272 */ sh $t6, 0x0272($s0) ## 00000272 /* 01984 809F4C44 3C01809F */ lui $at, %hi(D_809F6054) ## $at = 809F0000 -/* 01988 809F4C48 00095400 */ sll $t2, $t1, 16 -/* 0198C 809F4C4C 000A5C03 */ sra $t3, $t2, 16 +/* 01988 809F4C48 00095400 */ sll $t2, $t1, 16 +/* 0198C 809F4C4C 000A5C03 */ sra $t3, $t2, 16 /* 01990 809F4C50 448B3000 */ mtc1 $t3, $f6 ## $f6 = 0.00 /* 01994 809F4C54 00000000 */ nop -/* 01998 809F4C58 46803220 */ cvt.s.w $f8, $f6 -/* 0199C 809F4C5C 460A4400 */ add.s $f16, $f8, $f10 -/* 019A0 809F4C60 4600848D */ trunc.w.s $f18, $f16 -/* 019A4 809F4C64 440D9000 */ mfc1 $t5, $f18 +/* 01998 809F4C58 46803220 */ cvt.s.w $f8, $f6 +/* 0199C 809F4C5C 460A4400 */ add.s $f16, $f8, $f10 +/* 019A0 809F4C60 4600848D */ trunc.w.s $f18, $f16 +/* 019A4 809F4C64 440D9000 */ mfc1 $t5, $f18 /* 019A8 809F4C68 00000000 */ nop /* 019AC 809F4C6C A60D0264 */ sh $t5, 0x0264($s0) ## 00000264 /* 019B0 809F4C70 0C00CFBE */ jal Math_Rand_ZeroFloat - -/* 019B4 809F4C74 C42C6054 */ lwc1 $f12, %lo(D_809F6054)($at) + +/* 019B4 809F4C74 C42C6054 */ lwc1 $f12, %lo(D_809F6054)($at) /* 019B8 809F4C78 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 /* 019BC 809F4C7C 44812000 */ mtc1 $at, $f4 ## $f4 = 1.00 /* 019C0 809F4C80 3C18809F */ lui $t8, %hi(func_809F4CB4) ## $t8 = 809F0000 /* 019C4 809F4C84 240F0001 */ addiu $t7, $zero, 0x0001 ## $t7 = 00000001 -/* 019C8 809F4C88 4604003C */ c.lt.s $f0, $f4 +/* 019C8 809F4C88 4604003C */ c.lt.s $f0, $f4 /* 019CC 809F4C8C 27184CB4 */ addiu $t8, $t8, %lo(func_809F4CB4) ## $t8 = 809F4CB4 -/* 019D0 809F4C90 45020003 */ bc1fl .L809F4CA0 +/* 019D0 809F4C90 45020003 */ bc1fl .L809F4CA0 /* 019D4 809F4C94 AE180214 */ sw $t8, 0x0214($s0) ## 00000214 /* 019D8 809F4C98 A60F0272 */ sh $t7, 0x0272($s0) ## 00000272 /* 019DC 809F4C9C AE180214 */ sw $t8, 0x0214($s0) ## 00000214 .L809F4CA0: -/* 019E0 809F4CA0 8FBF002C */ lw $ra, 0x002C($sp) -/* 019E4 809F4CA4 8FB00028 */ lw $s0, 0x0028($sp) +/* 019E0 809F4CA0 8FBF002C */ lw $ra, 0x002C($sp) +/* 019E4 809F4CA4 8FB00028 */ lw $s0, 0x0028($sp) /* 019E8 809F4CA8 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 019EC 809F4CAC 03E00008 */ jr $ra +/* 019EC 809F4CAC 03E00008 */ jr $ra /* 019F0 809F4CB0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F4E18.s b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F4E18.s index 653d9e436c..b5df94ec00 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F4E18.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F4E18.s @@ -1,63 +1,63 @@ glabel func_809F4E18 /* 01B58 809F4E18 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 01B5C 809F4E1C AFBF002C */ sw $ra, 0x002C($sp) -/* 01B60 809F4E20 AFB00028 */ sw $s0, 0x0028($sp) -/* 01B64 809F4E24 AFA50034 */ sw $a1, 0x0034($sp) +/* 01B5C 809F4E1C AFBF002C */ sw $ra, 0x002C($sp) +/* 01B60 809F4E20 AFB00028 */ sw $s0, 0x0028($sp) +/* 01B64 809F4E24 AFA50034 */ sw $a1, 0x0034($sp) /* 01B68 809F4E28 84820264 */ lh $v0, 0x0264($a0) ## 00000264 /* 01B6C 809F4E2C 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 01B70 809F4E30 24030001 */ addiu $v1, $zero, 0x0001 ## $v1 = 00000001 -/* 01B74 809F4E34 1040000A */ beq $v0, $zero, .L809F4E60 +/* 01B74 809F4E34 1040000A */ beq $v0, $zero, .L809F4E60 /* 01B78 809F4E38 00000000 */ nop -/* 01B7C 809F4E3C 54620029 */ bnel $v1, $v0, .L809F4EE4 -/* 01B80 809F4E40 8FBF002C */ lw $ra, 0x002C($sp) +/* 01B7C 809F4E3C 54620029 */ bnel $v1, $v0, .L809F4EE4 +/* 01B80 809F4E40 8FBF002C */ lw $ra, 0x002C($sp) /* 01B84 809F4E44 908E0276 */ lbu $t6, 0x0276($a0) ## 00000276 -/* 01B88 809F4E48 546E0026 */ bnel $v1, $t6, .L809F4EE4 -/* 01B8C 809F4E4C 8FBF002C */ lw $ra, 0x002C($sp) -/* 01B90 809F4E50 0C01E221 */ jal func_80078884 +/* 01B88 809F4E48 546E0026 */ bnel $v1, $t6, .L809F4EE4 +/* 01B8C 809F4E4C 8FBF002C */ lw $ra, 0x002C($sp) +/* 01B90 809F4E50 0C01E221 */ jal func_80078884 /* 01B94 809F4E54 24044806 */ addiu $a0, $zero, 0x4806 ## $a0 = 00004806 -/* 01B98 809F4E58 10000022 */ beq $zero, $zero, .L809F4EE4 -/* 01B9C 809F4E5C 8FBF002C */ lw $ra, 0x002C($sp) +/* 01B98 809F4E58 10000022 */ beq $zero, $zero, .L809F4EE4 +/* 01B9C 809F4E5C 8FBF002C */ lw $ra, 0x002C($sp) .L809F4E60: /* 01BA0 809F4E60 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 /* 01BA4 809F4E64 0C028800 */ jal SkelAnime_GetFrameCount - + /* 01BA8 809F4E68 24840430 */ addiu $a0, $a0, 0x0430 ## $a0 = 06000430 /* 01BAC 809F4E6C 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 01BB0 809F4E70 3C01C120 */ lui $at, 0xC120 ## $at = C1200000 /* 01BB4 809F4E74 44819000 */ mtc1 $at, $f18 ## $f18 = -10.00 -/* 01BB8 809F4E78 468021A0 */ cvt.s.w $f6, $f4 +/* 01BB8 809F4E78 468021A0 */ cvt.s.w $f6, $f4 /* 01BBC 809F4E7C 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 01BC0 809F4E80 24080002 */ addiu $t0, $zero, 0x0002 ## $t0 = 00000002 /* 01BC4 809F4E84 24A50430 */ addiu $a1, $a1, 0x0430 ## $a1 = 06000430 /* 01BC8 809F4E88 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C /* 01BCC 809F4E8C 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 01BD0 809F4E90 4600320D */ trunc.w.s $f8, $f6 +/* 01BD0 809F4E90 4600320D */ trunc.w.s $f8, $f6 /* 01BD4 809F4E94 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 01BD8 809F4E98 44184000 */ mfc1 $t8, $f8 +/* 01BD8 809F4E98 44184000 */ mfc1 $t8, $f8 /* 01BDC 809F4E9C 00000000 */ nop /* 01BE0 809F4EA0 A618026E */ sh $t8, 0x026E($s0) ## 0000026E /* 01BE4 809F4EA4 8619026E */ lh $t9, 0x026E($s0) ## 0000026E -/* 01BE8 809F4EA8 AFA80014 */ sw $t0, 0x0014($sp) -/* 01BEC 809F4EAC E7B20018 */ swc1 $f18, 0x0018($sp) +/* 01BE8 809F4EA8 AFA80014 */ sw $t0, 0x0014($sp) +/* 01BEC 809F4EAC E7B20018 */ swc1 $f18, 0x0018($sp) /* 01BF0 809F4EB0 44995000 */ mtc1 $t9, $f10 ## $f10 = 0.00 /* 01BF4 809F4EB4 00000000 */ nop -/* 01BF8 809F4EB8 46805420 */ cvt.s.w $f16, $f10 -/* 01BFC 809F4EBC 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 01C00 809F4EC0 E7B00010 */ swc1 $f16, 0x0010($sp) +/* 01BF8 809F4EB8 46805420 */ cvt.s.w $f16, $f10 +/* 01BFC 809F4EBC 0C029468 */ jal SkelAnime_ChangeAnim + +/* 01C00 809F4EC0 E7B00010 */ swc1 $f16, 0x0010($sp) /* 01C04 809F4EC4 A2000218 */ sb $zero, 0x0218($s0) ## 00000218 /* 01C08 809F4EC8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 01C0C 809F4ECC 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 01C10 809F4ED0 2405387D */ addiu $a1, $zero, 0x387D ## $a1 = 0000387D /* 01C14 809F4ED4 3C09809F */ lui $t1, %hi(func_809F4EF4) ## $t1 = 809F0000 /* 01C18 809F4ED8 25294EF4 */ addiu $t1, $t1, %lo(func_809F4EF4) ## $t1 = 809F4EF4 /* 01C1C 809F4EDC AE090214 */ sw $t1, 0x0214($s0) ## 00000214 -/* 01C20 809F4EE0 8FBF002C */ lw $ra, 0x002C($sp) +/* 01C20 809F4EE0 8FBF002C */ lw $ra, 0x002C($sp) .L809F4EE4: -/* 01C24 809F4EE4 8FB00028 */ lw $s0, 0x0028($sp) +/* 01C24 809F4EE4 8FB00028 */ lw $s0, 0x0028($sp) /* 01C28 809F4EE8 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 01C2C 809F4EEC 03E00008 */ jr $ra +/* 01C2C 809F4EEC 03E00008 */ jr $ra /* 01C30 809F4EF0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F50EC.s b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F50EC.s index b549aa65b5..87f5cb03a6 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F50EC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F50EC.s @@ -1,40 +1,40 @@ glabel func_809F50EC /* 01E2C 809F50EC 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 01E30 809F50F0 AFBF002C */ sw $ra, 0x002C($sp) -/* 01E34 809F50F4 AFB00028 */ sw $s0, 0x0028($sp) -/* 01E38 809F50F8 AFA50034 */ sw $a1, 0x0034($sp) +/* 01E30 809F50F0 AFBF002C */ sw $ra, 0x002C($sp) +/* 01E34 809F50F4 AFB00028 */ sw $s0, 0x0028($sp) +/* 01E38 809F50F8 AFA50034 */ sw $a1, 0x0034($sp) /* 01E3C 809F50FC 848E0264 */ lh $t6, 0x0264($a0) ## 00000264 /* 01E40 809F5100 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 01E44 809F5104 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 -/* 01E48 809F5108 55C00027 */ bnel $t6, $zero, .L809F51A8 -/* 01E4C 809F510C 8FBF002C */ lw $ra, 0x002C($sp) +/* 01E48 809F5108 55C00027 */ bnel $t6, $zero, .L809F51A8 +/* 01E4C 809F510C 8FBF002C */ lw $ra, 0x002C($sp) /* 01E50 809F5110 0C028800 */ jal SkelAnime_GetFrameCount - + /* 01E54 809F5114 2484031C */ addiu $a0, $a0, 0x031C ## $a0 = 0600031C /* 01E58 809F5118 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 01E5C 809F511C 3C01C120 */ lui $at, 0xC120 ## $at = C1200000 /* 01E60 809F5120 44819000 */ mtc1 $at, $f18 ## $f18 = -10.00 -/* 01E64 809F5124 468021A0 */ cvt.s.w $f6, $f4 +/* 01E64 809F5124 468021A0 */ cvt.s.w $f6, $f4 /* 01E68 809F5128 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 01E6C 809F512C 24080002 */ addiu $t0, $zero, 0x0002 ## $t0 = 00000002 /* 01E70 809F5130 24A5031C */ addiu $a1, $a1, 0x031C ## $a1 = 0600031C /* 01E74 809F5134 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C /* 01E78 809F5138 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 01E7C 809F513C 4600320D */ trunc.w.s $f8, $f6 +/* 01E7C 809F513C 4600320D */ trunc.w.s $f8, $f6 /* 01E80 809F5140 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 01E84 809F5144 44184000 */ mfc1 $t8, $f8 +/* 01E84 809F5144 44184000 */ mfc1 $t8, $f8 /* 01E88 809F5148 00000000 */ nop /* 01E8C 809F514C A618026E */ sh $t8, 0x026E($s0) ## 0000026E /* 01E90 809F5150 8619026E */ lh $t9, 0x026E($s0) ## 0000026E -/* 01E94 809F5154 AFA80014 */ sw $t0, 0x0014($sp) -/* 01E98 809F5158 E7B20018 */ swc1 $f18, 0x0018($sp) +/* 01E94 809F5154 AFA80014 */ sw $t0, 0x0014($sp) +/* 01E98 809F5158 E7B20018 */ swc1 $f18, 0x0018($sp) /* 01E9C 809F515C 44995000 */ mtc1 $t9, $f10 ## $f10 = 0.00 /* 01EA0 809F5160 00000000 */ nop -/* 01EA4 809F5164 46805420 */ cvt.s.w $f16, $f10 -/* 01EA8 809F5168 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 01EAC 809F516C E7B00010 */ swc1 $f16, 0x0010($sp) -/* 01EB0 809F5170 8FA40034 */ lw $a0, 0x0034($sp) +/* 01EA4 809F5164 46805420 */ cvt.s.w $f16, $f10 +/* 01EA8 809F5168 0C029468 */ jal SkelAnime_ChangeAnim + +/* 01EAC 809F516C E7B00010 */ swc1 $f16, 0x0010($sp) +/* 01EB0 809F5170 8FA40034 */ lw $a0, 0x0034($sp) /* 01EB4 809F5174 240900FF */ addiu $t1, $zero, 0x00FF ## $t1 = 000000FF /* 01EB8 809F5178 240A0001 */ addiu $t2, $zero, 0x0001 ## $t2 = 00000001 /* 01EBC 809F517C A20900AE */ sb $t1, 0x00AE($s0) ## 000000AE @@ -43,16 +43,16 @@ glabel func_809F50EC /* 01EC8 809F5188 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 01ECC 809F518C 24070005 */ addiu $a3, $zero, 0x0005 ## $a3 = 00000005 /* 01ED0 809F5190 0C00CDD2 */ jal Actor_ChangeType - + /* 01ED4 809F5194 24851C24 */ addiu $a1, $a0, 0x1C24 ## $a1 = 00001C24 /* 01ED8 809F5198 3C0B809F */ lui $t3, %hi(func_809F51B8) ## $t3 = 809F0000 /* 01EDC 809F519C 256B51B8 */ addiu $t3, $t3, %lo(func_809F51B8) ## $t3 = 809F51B8 /* 01EE0 809F51A0 AE0B0214 */ sw $t3, 0x0214($s0) ## 00000214 -/* 01EE4 809F51A4 8FBF002C */ lw $ra, 0x002C($sp) +/* 01EE4 809F51A4 8FBF002C */ lw $ra, 0x002C($sp) .L809F51A8: -/* 01EE8 809F51A8 8FB00028 */ lw $s0, 0x0028($sp) +/* 01EE8 809F51A8 8FB00028 */ lw $s0, 0x0028($sp) /* 01EEC 809F51AC 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 01EF0 809F51B0 03E00008 */ jr $ra +/* 01EF0 809F51B0 03E00008 */ jr $ra /* 01EF4 809F51B4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F51B8.s b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F51B8.s index 5171576699..1f4d5844a8 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F51B8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F51B8.s @@ -34,7 +34,7 @@ glabel func_809F51B8 /* 01F70 809F5230 46062301 */ sub.s $f12, $f4, $f6 /* 01F74 809F5234 46108102 */ mul.s $f4, $f16, $f16 /* 01F78 809F5238 46049000 */ add.s $f0, $f18, $f4 -/* 01F7C 809F523C 0C03F494 */ jal func_800FD250 +/* 01F7C 809F523C 0C03F494 */ jal Math_atan2f /* 01F80 809F5240 46000384 */ sqrt.s $f14, $f0 /* 01F84 809F5244 3C01809F */ lui $at, %hi(D_809F605C) ## $at = 809F0000 /* 01F88 809F5248 C426605C */ lwc1 $f6, %lo(D_809F605C)($at) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F5478.s b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F5478.s index d3832b38bb..29d6d50963 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F5478.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F5478.s @@ -1,35 +1,35 @@ glabel func_809F5478 /* 021B8 809F5478 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 021BC 809F547C AFB00028 */ sw $s0, 0x0028($sp) +/* 021BC 809F547C AFB00028 */ sw $s0, 0x0028($sp) /* 021C0 809F5480 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 021C4 809F5484 AFBF002C */ sw $ra, 0x002C($sp) +/* 021C4 809F5484 AFBF002C */ sw $ra, 0x002C($sp) /* 021C8 809F5488 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 -/* 021CC 809F548C AFA50034 */ sw $a1, 0x0034($sp) +/* 021CC 809F548C AFA50034 */ sw $a1, 0x0034($sp) /* 021D0 809F5490 0C028800 */ jal SkelAnime_GetFrameCount - + /* 021D4 809F5494 24842E1C */ addiu $a0, $a0, 0x2E1C ## $a0 = 06002E1C /* 021D8 809F5498 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 021DC 809F549C 3C01C120 */ lui $at, 0xC120 ## $at = C1200000 /* 021E0 809F54A0 44819000 */ mtc1 $at, $f18 ## $f18 = -10.00 -/* 021E4 809F54A4 468021A0 */ cvt.s.w $f6, $f4 +/* 021E4 809F54A4 468021A0 */ cvt.s.w $f6, $f4 /* 021E8 809F54A8 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 021EC 809F54AC 24A52E1C */ addiu $a1, $a1, 0x2E1C ## $a1 = 06002E1C /* 021F0 809F54B0 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C /* 021F4 809F54B4 3C063FC0 */ lui $a2, 0x3FC0 ## $a2 = 3FC00000 /* 021F8 809F54B8 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 021FC 809F54BC 4600320D */ trunc.w.s $f8, $f6 -/* 02200 809F54C0 440F4000 */ mfc1 $t7, $f8 +/* 021FC 809F54BC 4600320D */ trunc.w.s $f8, $f6 +/* 02200 809F54C0 440F4000 */ mfc1 $t7, $f8 /* 02204 809F54C4 00000000 */ nop /* 02208 809F54C8 A60F026E */ sh $t7, 0x026E($s0) ## 0000026E /* 0220C 809F54CC 8618026E */ lh $t8, 0x026E($s0) ## 0000026E -/* 02210 809F54D0 AFA00014 */ sw $zero, 0x0014($sp) -/* 02214 809F54D4 E7B20018 */ swc1 $f18, 0x0018($sp) +/* 02210 809F54D0 AFA00014 */ sw $zero, 0x0014($sp) +/* 02214 809F54D4 E7B20018 */ swc1 $f18, 0x0018($sp) /* 02218 809F54D8 44985000 */ mtc1 $t8, $f10 ## $f10 = 0.00 /* 0221C 809F54DC 00000000 */ nop -/* 02220 809F54E0 46805420 */ cvt.s.w $f16, $f10 -/* 02224 809F54E4 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 02228 809F54E8 E7B00010 */ swc1 $f16, 0x0010($sp) +/* 02220 809F54E0 46805420 */ cvt.s.w $f16, $f10 +/* 02224 809F54E4 0C029468 */ jal SkelAnime_ChangeAnim + +/* 02228 809F54E8 E7B00010 */ swc1 $f16, 0x0010($sp) /* 0222C 809F54EC 3C014080 */ lui $at, 0x4080 ## $at = 40800000 /* 02230 809F54F0 44812000 */ mtc1 $at, $f4 ## $f4 = 4.00 /* 02234 809F54F4 3C19809F */ lui $t9, %hi(func_809F551C) ## $t9 = 809F0000 @@ -37,10 +37,10 @@ glabel func_809F5478 /* 0223C 809F54FC A2000218 */ sb $zero, 0x0218($s0) ## 00000218 /* 02240 809F5500 AE190214 */ sw $t9, 0x0214($s0) ## 00000214 /* 02244 809F5504 E6040068 */ swc1 $f4, 0x0068($s0) ## 00000068 -/* 02248 809F5508 8FBF002C */ lw $ra, 0x002C($sp) -/* 0224C 809F550C 8FB00028 */ lw $s0, 0x0028($sp) +/* 02248 809F5508 8FBF002C */ lw $ra, 0x002C($sp) +/* 0224C 809F550C 8FB00028 */ lw $s0, 0x0028($sp) /* 02250 809F5510 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 02254 809F5514 03E00008 */ jr $ra +/* 02254 809F5514 03E00008 */ jr $ra /* 02258 809F5518 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F551C.s b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F551C.s index 0c979b681d..50451e6230 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F551C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F551C.s @@ -14,7 +14,7 @@ glabel func_809F551C /* 02288 809F5548 46062301 */ sub.s $f12, $f4, $f6 /* 0228C 809F554C 460A4381 */ sub.s $f14, $f8, $f10 /* 02290 809F5550 E7AC002C */ swc1 $f12, 0x002C($sp) -/* 02294 809F5554 0C03F494 */ jal func_800FD250 +/* 02294 809F5554 0C03F494 */ jal Math_atan2f /* 02298 809F5558 E7AE0028 */ swc1 $f14, 0x0028($sp) /* 0229C 809F555C 3C01809F */ lui $at, %hi(D_809F6068) ## $at = 809F0000 /* 022A0 809F5560 C4306068 */ lwc1 $f16, %lo(D_809F6068)($at) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F58E4.s b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F58E4.s index 2717672810..c5b6e90e63 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F58E4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F58E4.s @@ -22,7 +22,7 @@ glabel func_809F58E4 /* 02670 809F5930 8DC50000 */ lw $a1, 0x0000($t6) ## 00000000 /* 02674 809F5934 27A40028 */ addiu $a0, $sp, 0x0028 ## $a0 = FFFFFFE8 /* 02678 809F5938 240706C5 */ addiu $a3, $zero, 0x06C5 ## $a3 = 000006C5 -/* 0267C 809F593C 0C031AB1 */ jal func_800C6AC4 +/* 0267C 809F593C 0C031AB1 */ jal Graph_OpenDisps /* 02680 809F5940 AFA50038 */ sw $a1, 0x0038($sp) /* 02684 809F5944 8FA80038 */ lw $t0, 0x0038($sp) /* 02688 809F5948 3C18E700 */ lui $t8, 0xE700 ## $t8 = E7000000 @@ -57,7 +57,7 @@ glabel func_809F58E4 /* 026FC 809F59BC 35F900FF */ ori $t9, $t7, 0x00FF ## $t9 = E70000FF /* 02700 809F59C0 AC790004 */ sw $t9, 0x0004($v1) ## 00000004 /* 02704 809F59C4 8FA90040 */ lw $t1, 0x0040($sp) -/* 02708 809F59C8 0C031AD5 */ jal func_800C6B54 +/* 02708 809F59C8 0C031AD5 */ jal Graph_CloseDisps /* 0270C 809F59CC 8D250000 */ lw $a1, 0x0000($t1) ## FB000000 /* 02710 809F59D0 8FBF0014 */ lw $ra, 0x0014($sp) .L809F59D4: diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F5A6C.s b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F5A6C.s index d2a5d699c0..4a28bd9d6b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F5A6C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F5A6C.s @@ -20,7 +20,7 @@ glabel func_809F5A6C /* 027F4 809F5AB4 24C65FBC */ addiu $a2, $a2, %lo(D_809F5FBC) ## $a2 = 809F5FBC /* 027F8 809F5AB8 27A40048 */ addiu $a0, $sp, 0x0048 ## $a0 = FFFFFFD8 /* 027FC 809F5ABC 240706FE */ addiu $a3, $zero, 0x06FE ## $a3 = 000006FE -/* 02800 809F5AC0 0C031AB1 */ jal func_800C6AC4 +/* 02800 809F5AC0 0C031AB1 */ jal Graph_OpenDisps /* 02804 809F5AC4 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 /* 02808 809F5AC8 0C024F46 */ jal func_80093D18 /* 0280C 809F5ACC 8E440000 */ lw $a0, 0x0000($s2) ## 00000000 @@ -122,7 +122,7 @@ glabel func_809F5A6C /* 02988 809F5C48 8E450000 */ lw $a1, 0x0000($s2) ## 00000000 /* 0298C 809F5C4C 24C65FE4 */ addiu $a2, $a2, %lo(D_809F5FE4) ## $a2 = 809F5FE4 /* 02990 809F5C50 27A40048 */ addiu $a0, $sp, 0x0048 ## $a0 = FFFFFFD8 -/* 02994 809F5C54 0C031AD5 */ jal func_800C6B54 +/* 02994 809F5C54 0C031AD5 */ jal Graph_CloseDisps /* 02998 809F5C58 24070719 */ addiu $a3, $zero, 0x0719 ## $a3 = 00000719 /* 0299C 809F5C5C 8E2E0214 */ lw $t6, 0x0214($s1) ## 00000214 /* 029A0 809F5C60 3C0C809F */ lui $t4, %hi(func_809F49A4) ## $t4 = 809F0000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F5C98.s b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F5C98.s index 13b177b92d..60acf0d0c5 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F5C98.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dnt_Nomal/func_809F5C98.s @@ -11,7 +11,7 @@ glabel func_809F5C98 /* 029FC 809F5CBC 24C65FF8 */ addiu $a2, $a2, %lo(D_809F5FF8) ## $a2 = 809F5FF8 /* 02A00 809F5CC0 27A40040 */ addiu $a0, $sp, 0x0040 ## $a0 = FFFFFFE8 /* 02A04 809F5CC4 24070729 */ addiu $a3, $zero, 0x0729 ## $a3 = 00000729 -/* 02A08 809F5CC8 0C031AB1 */ jal func_800C6AC4 +/* 02A08 809F5CC8 0C031AB1 */ jal Graph_OpenDisps /* 02A0C 809F5CCC 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 /* 02A10 809F5CD0 0C024F46 */ jal func_80093D18 /* 02A14 809F5CD4 8E440000 */ lw $a0, 0x0000($s2) ## 00000000 @@ -61,7 +61,7 @@ glabel func_809F5C98 /* 02AC0 809F5D80 8E450000 */ lw $a1, 0x0000($s2) ## 00000000 /* 02AC4 809F5D84 24C66020 */ addiu $a2, $a2, %lo(D_809F6020) ## $a2 = 809F6020 /* 02AC8 809F5D88 27A40040 */ addiu $a0, $sp, 0x0040 ## $a0 = FFFFFFE8 -/* 02ACC 809F5D8C 0C031AD5 */ jal func_800C6B54 +/* 02ACC 809F5D8C 0C031AD5 */ jal Graph_CloseDisps /* 02AD0 809F5D90 2407073B */ addiu $a3, $zero, 0x073B ## $a3 = 0000073B /* 02AD4 809F5D94 8FBF002C */ lw $ra, 0x002C($sp) /* 02AD8 809F5D98 8FB00020 */ lw $s0, 0x0020($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F6994.s b/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F6994.s index a9f3774ac0..701d6b8224 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F6994.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F6994.s @@ -1,40 +1,40 @@ glabel func_809F6994 /* 005D4 809F6994 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 005D8 809F6998 AFA40028 */ sw $a0, 0x0028($sp) -/* 005DC 809F699C AFBF0024 */ sw $ra, 0x0024($sp) +/* 005D8 809F6998 AFA40028 */ sw $a0, 0x0028($sp) +/* 005DC 809F699C AFBF0024 */ sw $ra, 0x0024($sp) /* 005E0 809F69A0 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 /* 005E4 809F69A4 0C028800 */ jal SkelAnime_GetFrameCount - + /* 005E8 809F69A8 24840860 */ addiu $a0, $a0, 0x0860 ## $a0 = 06000860 /* 005EC 809F69AC 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 005F0 809F69B0 3C01C120 */ lui $at, 0xC120 ## $at = C1200000 -/* 005F4 809F69B4 8FA30028 */ lw $v1, 0x0028($sp) -/* 005F8 809F69B8 468021A0 */ cvt.s.w $f6, $f4 +/* 005F4 809F69B4 8FA30028 */ lw $v1, 0x0028($sp) +/* 005F8 809F69B8 468021A0 */ cvt.s.w $f6, $f4 /* 005FC 809F69BC 44814000 */ mtc1 $at, $f8 ## $f8 = -10.00 /* 00600 809F69C0 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 00604 809F69C4 3C063FE6 */ lui $a2, 0x3FE6 ## $a2 = 3FE60000 /* 00608 809F69C8 240E0001 */ addiu $t6, $zero, 0x0001 ## $t6 = 00000001 -/* 0060C 809F69CC AFAE0014 */ sw $t6, 0x0014($sp) +/* 0060C 809F69CC AFAE0014 */ sw $t6, 0x0014($sp) /* 00610 809F69D0 34C66666 */ ori $a2, $a2, 0x6666 ## $a2 = 3FE66666 /* 00614 809F69D4 24A50860 */ addiu $a1, $a1, 0x0860 ## $a1 = 06000860 -/* 00618 809F69D8 E7A60010 */ swc1 $f6, 0x0010($sp) +/* 00618 809F69D8 E7A60010 */ swc1 $f6, 0x0010($sp) /* 0061C 809F69DC 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 /* 00620 809F69E0 2464014C */ addiu $a0, $v1, 0x014C ## $a0 = 0000014C -/* 00624 809F69E4 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 00628 809F69E8 E7A80018 */ swc1 $f8, 0x0018($sp) -/* 0062C 809F69EC 8FA30028 */ lw $v1, 0x0028($sp) +/* 00624 809F69E4 0C029468 */ jal SkelAnime_ChangeAnim + +/* 00628 809F69E8 E7A80018 */ swc1 $f8, 0x0018($sp) +/* 0062C 809F69EC 8FA30028 */ lw $v1, 0x0028($sp) /* 00630 809F69F0 44805000 */ mtc1 $zero, $f10 ## $f10 = 0.00 /* 00634 809F69F4 3C01809F */ lui $at, %hi(D_809F7F70) ## $at = 809F0000 /* 00638 809F69F8 E46A0060 */ swc1 $f10, 0x0060($v1) ## 00000060 -/* 0063C 809F69FC C4307F70 */ lwc1 $f16, %lo(D_809F7F70)($at) +/* 0063C 809F69FC C4307F70 */ lwc1 $f16, %lo(D_809F7F70)($at) /* 00640 809F6A00 3C01809F */ lui $at, %hi(D_809F7F74) ## $at = 809F0000 /* 00644 809F6A04 E4700068 */ swc1 $f16, 0x0068($v1) ## 00000068 -/* 00648 809F6A08 C4327F74 */ lwc1 $f18, %lo(D_809F7F74)($at) +/* 00648 809F6A08 C4327F74 */ lwc1 $f18, %lo(D_809F7F74)($at) /* 0064C 809F6A0C E472006C */ swc1 $f18, 0x006C($v1) ## 0000006C -/* 00650 809F6A10 8FBF0024 */ lw $ra, 0x0024($sp) +/* 00650 809F6A10 8FBF0024 */ lw $ra, 0x0024($sp) /* 00654 809F6A14 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 00658 809F6A18 03E00008 */ jr $ra +/* 00658 809F6A18 03E00008 */ jr $ra /* 0065C 809F6A1C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F6A20.s b/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F6A20.s index cfd3cf2ee9..d57a7cc05c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F6A20.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F6A20.s @@ -1,47 +1,47 @@ glabel func_809F6A20 /* 00660 809F6A20 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 00664 809F6A24 AFB00028 */ sw $s0, 0x0028($sp) +/* 00664 809F6A24 AFB00028 */ sw $s0, 0x0028($sp) /* 00668 809F6A28 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 0066C 809F6A2C AFBF002C */ sw $ra, 0x002C($sp) +/* 0066C 809F6A2C AFBF002C */ sw $ra, 0x002C($sp) /* 00670 809F6A30 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 /* 00674 809F6A34 0C028800 */ jal SkelAnime_GetFrameCount - + /* 00678 809F6A38 248404A0 */ addiu $a0, $a0, 0x04A0 ## $a0 = 060004A0 /* 0067C 809F6A3C 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 00680 809F6A40 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 /* 00684 809F6A44 3C01C120 */ lui $at, 0xC120 ## $at = C1200000 -/* 00688 809F6A48 468021A0 */ cvt.s.w $f6, $f4 +/* 00688 809F6A48 468021A0 */ cvt.s.w $f6, $f4 /* 0068C 809F6A4C 44814000 */ mtc1 $at, $f8 ## $f8 = -10.00 /* 00690 809F6A50 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 00694 809F6A54 240E0002 */ addiu $t6, $zero, 0x0002 ## $t6 = 00000002 -/* 00698 809F6A58 44070000 */ mfc1 $a3, $f0 -/* 0069C 809F6A5C AFAE0014 */ sw $t6, 0x0014($sp) +/* 00698 809F6A58 44070000 */ mfc1 $a3, $f0 +/* 0069C 809F6A5C AFAE0014 */ sw $t6, 0x0014($sp) /* 006A0 809F6A60 24A504A0 */ addiu $a1, $a1, 0x04A0 ## $a1 = 060004A0 -/* 006A4 809F6A64 E7A60010 */ swc1 $f6, 0x0010($sp) +/* 006A4 809F6A64 E7A60010 */ swc1 $f6, 0x0010($sp) /* 006A8 809F6A68 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C /* 006AC 809F6A6C 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 006B0 809F6A70 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 006B4 809F6A74 E7A80018 */ swc1 $f8, 0x0018($sp) +/* 006B0 809F6A70 0C029468 */ jal SkelAnime_ChangeAnim + +/* 006B4 809F6A74 E7A80018 */ swc1 $f8, 0x0018($sp) /* 006B8 809F6A78 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 /* 006BC 809F6A7C 860F01FC */ lh $t7, 0x01FC($s0) ## 000001FC /* 006C0 809F6A80 3C01809F */ lui $at, %hi(D_809F7F78) ## $at = 809F0000 /* 006C4 809F6A84 E6000068 */ swc1 $f0, 0x0068($s0) ## 00000068 /* 006C8 809F6A88 E600005C */ swc1 $f0, 0x005C($s0) ## 0000005C /* 006CC 809F6A8C E6000064 */ swc1 $f0, 0x0064($s0) ## 00000064 -/* 006D0 809F6A90 C42A7F78 */ lwc1 $f10, %lo(D_809F7F78)($at) +/* 006D0 809F6A90 C42A7F78 */ lwc1 $f10, %lo(D_809F7F78)($at) /* 006D4 809F6A94 3C014120 */ lui $at, 0x4120 ## $at = 41200000 -/* 006D8 809F6A98 15E00005 */ bne $t7, $zero, .L809F6AB0 +/* 006D8 809F6A98 15E00005 */ bne $t7, $zero, .L809F6AB0 /* 006DC 809F6A9C E60A006C */ swc1 $f10, 0x006C($s0) ## 0000006C /* 006E0 809F6AA0 44818000 */ mtc1 $at, $f16 ## $f16 = 10.00 /* 006E4 809F6AA4 24180003 */ addiu $t8, $zero, 0x0003 ## $t8 = 00000003 /* 006E8 809F6AA8 A61801FC */ sh $t8, 0x01FC($s0) ## 000001FC /* 006EC 809F6AAC E6100060 */ swc1 $f16, 0x0060($s0) ## 00000060 .L809F6AB0: -/* 006F0 809F6AB0 8FBF002C */ lw $ra, 0x002C($sp) -/* 006F4 809F6AB4 8FB00028 */ lw $s0, 0x0028($sp) +/* 006F0 809F6AB0 8FBF002C */ lw $ra, 0x002C($sp) +/* 006F4 809F6AB4 8FB00028 */ lw $s0, 0x0028($sp) /* 006F8 809F6AB8 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 006FC 809F6ABC 03E00008 */ jr $ra +/* 006FC 809F6ABC 03E00008 */ jr $ra /* 00700 809F6AC0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F6AC4.s b/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F6AC4.s index df3f7edc39..20457c5aa6 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F6AC4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F6AC4.s @@ -1,34 +1,34 @@ glabel func_809F6AC4 /* 00704 809F6AC4 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 00708 809F6AC8 AFA40028 */ sw $a0, 0x0028($sp) -/* 0070C 809F6ACC AFBF0024 */ sw $ra, 0x0024($sp) +/* 00708 809F6AC8 AFA40028 */ sw $a0, 0x0028($sp) +/* 0070C 809F6ACC AFBF0024 */ sw $ra, 0x0024($sp) /* 00710 809F6AD0 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 /* 00714 809F6AD4 0C028800 */ jal SkelAnime_GetFrameCount - + /* 00718 809F6AD8 248405F0 */ addiu $a0, $a0, 0x05F0 ## $a0 = 060005F0 /* 0071C 809F6ADC 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 00720 809F6AE0 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 00724 809F6AE4 8FA40028 */ lw $a0, 0x0028($sp) -/* 00728 809F6AE8 468021A0 */ cvt.s.w $f6, $f4 +/* 00724 809F6AE4 8FA40028 */ lw $a0, 0x0028($sp) +/* 00728 809F6AE8 468021A0 */ cvt.s.w $f6, $f4 /* 0072C 809F6AEC 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 00730 809F6AF0 44070000 */ mfc1 $a3, $f0 +/* 00730 809F6AF0 44070000 */ mfc1 $a3, $f0 /* 00734 809F6AF4 24A505F0 */ addiu $a1, $a1, 0x05F0 ## $a1 = 060005F0 /* 00738 809F6AF8 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 0073C 809F6AFC AFA00014 */ sw $zero, 0x0014($sp) -/* 00740 809F6B00 E7A60010 */ swc1 $f6, 0x0010($sp) +/* 0073C 809F6AFC AFA00014 */ sw $zero, 0x0014($sp) +/* 00740 809F6B00 E7A60010 */ swc1 $f6, 0x0010($sp) /* 00744 809F6B04 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 00748 809F6B08 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 0074C 809F6B0C E7A00018 */ swc1 $f0, 0x0018($sp) -/* 00750 809F6B10 8FA20028 */ lw $v0, 0x0028($sp) +/* 00748 809F6B08 0C029468 */ jal SkelAnime_ChangeAnim + +/* 0074C 809F6B0C E7A00018 */ swc1 $f0, 0x0018($sp) +/* 00750 809F6B10 8FA20028 */ lw $v0, 0x0028($sp) /* 00754 809F6B14 44804000 */ mtc1 $zero, $f8 ## $f8 = 0.00 /* 00758 809F6B18 3C01809F */ lui $at, %hi(D_809F7F7C) ## $at = 809F0000 /* 0075C 809F6B1C E4480060 */ swc1 $f8, 0x0060($v0) ## 00000060 -/* 00760 809F6B20 C42A7F7C */ lwc1 $f10, %lo(D_809F7F7C)($at) +/* 00760 809F6B20 C42A7F7C */ lwc1 $f10, %lo(D_809F7F7C)($at) /* 00764 809F6B24 E44A006C */ swc1 $f10, 0x006C($v0) ## 0000006C -/* 00768 809F6B28 8FBF0024 */ lw $ra, 0x0024($sp) +/* 00768 809F6B28 8FBF0024 */ lw $ra, 0x0024($sp) /* 0076C 809F6B2C 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 00770 809F6B30 03E00008 */ jr $ra +/* 00770 809F6B30 03E00008 */ jr $ra /* 00774 809F6B34 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F6B38.s b/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F6B38.s index 9c179d4fa3..b03d56ec9a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F6B38.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F6B38.s @@ -1,38 +1,38 @@ glabel func_809F6B38 /* 00778 809F6B38 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 0077C 809F6B3C AFA40028 */ sw $a0, 0x0028($sp) -/* 00780 809F6B40 AFBF0024 */ sw $ra, 0x0024($sp) +/* 0077C 809F6B3C AFA40028 */ sw $a0, 0x0028($sp) +/* 00780 809F6B40 AFBF0024 */ sw $ra, 0x0024($sp) /* 00784 809F6B44 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 /* 00788 809F6B48 0C028800 */ jal SkelAnime_GetFrameCount - + /* 0078C 809F6B4C 24840724 */ addiu $a0, $a0, 0x0724 ## $a0 = 06000724 /* 00790 809F6B50 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 00794 809F6B54 3C01C120 */ lui $at, 0xC120 ## $at = C1200000 -/* 00798 809F6B58 8FA30028 */ lw $v1, 0x0028($sp) -/* 0079C 809F6B5C 468021A0 */ cvt.s.w $f6, $f4 +/* 00798 809F6B58 8FA30028 */ lw $v1, 0x0028($sp) +/* 0079C 809F6B5C 468021A0 */ cvt.s.w $f6, $f4 /* 007A0 809F6B60 44814000 */ mtc1 $at, $f8 ## $f8 = -10.00 /* 007A4 809F6B64 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 007A8 809F6B68 24A50724 */ addiu $a1, $a1, 0x0724 ## $a1 = 06000724 /* 007AC 809F6B6C 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 007B0 809F6B70 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 007B4 809F6B74 E7A60010 */ swc1 $f6, 0x0010($sp) -/* 007B8 809F6B78 AFA00014 */ sw $zero, 0x0014($sp) +/* 007B4 809F6B74 E7A60010 */ swc1 $f6, 0x0010($sp) +/* 007B8 809F6B78 AFA00014 */ sw $zero, 0x0014($sp) /* 007BC 809F6B7C 2464014C */ addiu $a0, $v1, 0x014C ## $a0 = 0000014C -/* 007C0 809F6B80 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 007C4 809F6B84 E7A80018 */ swc1 $f8, 0x0018($sp) +/* 007C0 809F6B80 0C029468 */ jal SkelAnime_ChangeAnim + +/* 007C4 809F6B84 E7A80018 */ swc1 $f8, 0x0018($sp) /* 007C8 809F6B88 3C01809F */ lui $at, %hi(D_809F7F80) ## $at = 809F0000 -/* 007CC 809F6B8C 8FA30028 */ lw $v1, 0x0028($sp) -/* 007D0 809F6B90 C42A7F80 */ lwc1 $f10, %lo(D_809F7F80)($at) +/* 007CC 809F6B8C 8FA30028 */ lw $v1, 0x0028($sp) +/* 007D0 809F6B90 C42A7F80 */ lwc1 $f10, %lo(D_809F7F80)($at) /* 007D4 809F6B94 3C014120 */ lui $at, 0x4120 ## $at = 41200000 /* 007D8 809F6B98 44818000 */ mtc1 $at, $f16 ## $f16 = 10.00 /* 007DC 809F6B9C 240E0003 */ addiu $t6, $zero, 0x0003 ## $t6 = 00000003 /* 007E0 809F6BA0 A46E01FC */ sh $t6, 0x01FC($v1) ## 000001FC /* 007E4 809F6BA4 E46A006C */ swc1 $f10, 0x006C($v1) ## 0000006C /* 007E8 809F6BA8 E4700060 */ swc1 $f16, 0x0060($v1) ## 00000060 -/* 007EC 809F6BAC 8FBF0024 */ lw $ra, 0x0024($sp) +/* 007EC 809F6BAC 8FBF0024 */ lw $ra, 0x0024($sp) /* 007F0 809F6BB0 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 007F4 809F6BB4 03E00008 */ jr $ra +/* 007F4 809F6BB4 03E00008 */ jr $ra /* 007F8 809F6BB8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F6C24.s b/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F6C24.s index efbaa92b0c..4698bfb039 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F6C24.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F6C24.s @@ -3,35 +3,35 @@ glabel func_809F6C24 /* 00868 809F6C28 3C014140 */ lui $at, 0x4140 ## $at = 41400000 /* 0086C 809F6C2C 44812000 */ mtc1 $at, $f4 ## $f4 = 12.00 /* 00870 809F6C30 44803000 */ mtc1 $zero, $f6 ## $f6 = 0.00 -/* 00874 809F6C34 AFB00028 */ sw $s0, 0x0028($sp) +/* 00874 809F6C34 AFB00028 */ sw $s0, 0x0028($sp) /* 00878 809F6C38 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 0087C 809F6C3C AFBF002C */ sw $ra, 0x002C($sp) +/* 0087C 809F6C3C AFBF002C */ sw $ra, 0x002C($sp) /* 00880 809F6C40 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 00884 809F6C44 240E0002 */ addiu $t6, $zero, 0x0002 ## $t6 = 00000002 -/* 00888 809F6C48 AFAE0014 */ sw $t6, 0x0014($sp) +/* 00888 809F6C48 AFAE0014 */ sw $t6, 0x0014($sp) /* 0088C 809F6C4C 24A50724 */ addiu $a1, $a1, 0x0724 ## $a1 = 06000724 /* 00890 809F6C50 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C /* 00894 809F6C54 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 00898 809F6C58 3C074100 */ lui $a3, 0x4100 ## $a3 = 41000000 -/* 0089C 809F6C5C E7A40010 */ swc1 $f4, 0x0010($sp) -/* 008A0 809F6C60 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 008A4 809F6C64 E7A60018 */ swc1 $f6, 0x0018($sp) +/* 0089C 809F6C5C E7A40010 */ swc1 $f4, 0x0010($sp) +/* 008A0 809F6C60 0C029468 */ jal SkelAnime_ChangeAnim + +/* 008A4 809F6C64 E7A60018 */ swc1 $f6, 0x0018($sp) /* 008A8 809F6C68 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 008AC 809F6C6C 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 008B0 809F6C70 24053826 */ addiu $a1, $zero, 0x3826 ## $a1 = 00003826 /* 008B4 809F6C74 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 /* 008B8 809F6C78 3C01809F */ lui $at, %hi(D_809F7F88) ## $at = 809F0000 /* 008BC 809F6C7C E6000068 */ swc1 $f0, 0x0068($s0) ## 00000068 /* 008C0 809F6C80 E600005C */ swc1 $f0, 0x005C($s0) ## 0000005C /* 008C4 809F6C84 E6000064 */ swc1 $f0, 0x0064($s0) ## 00000064 -/* 008C8 809F6C88 C4287F88 */ lwc1 $f8, %lo(D_809F7F88)($at) +/* 008C8 809F6C88 C4287F88 */ lwc1 $f8, %lo(D_809F7F88)($at) /* 008CC 809F6C8C E608006C */ swc1 $f8, 0x006C($s0) ## 0000006C -/* 008D0 809F6C90 8FBF002C */ lw $ra, 0x002C($sp) -/* 008D4 809F6C94 8FB00028 */ lw $s0, 0x0028($sp) +/* 008D0 809F6C90 8FBF002C */ lw $ra, 0x002C($sp) +/* 008D4 809F6C94 8FB00028 */ lw $s0, 0x0028($sp) /* 008D8 809F6C98 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 008DC 809F6C9C 03E00008 */ jr $ra +/* 008DC 809F6C9C 03E00008 */ jr $ra /* 008E0 809F6CA0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F73AC.s b/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F73AC.s index a3acf16020..32cd3047d3 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F73AC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dodojr/func_809F73AC.s @@ -1,54 +1,54 @@ glabel func_809F73AC /* 00FEC 809F73AC 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 00FF0 809F73B0 AFB00028 */ sw $s0, 0x0028($sp) +/* 00FF0 809F73B0 AFB00028 */ sw $s0, 0x0028($sp) /* 00FF4 809F73B4 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00FF8 809F73B8 AFBF002C */ sw $ra, 0x002C($sp) +/* 00FF8 809F73B8 AFBF002C */ sw $ra, 0x002C($sp) /* 00FFC 809F73BC 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 -/* 01000 809F73C0 AFA50034 */ sw $a1, 0x0034($sp) +/* 01000 809F73C0 AFA50034 */ sw $a1, 0x0034($sp) /* 01004 809F73C4 0C028800 */ jal SkelAnime_GetFrameCount - + /* 01008 809F73C8 24840860 */ addiu $a0, $a0, 0x0860 ## $a0 = 06000860 /* 0100C 809F73CC 3C0143A0 */ lui $at, 0x43A0 ## $at = 43A00000 /* 01010 809F73D0 44814000 */ mtc1 $at, $f8 ## $f8 = 320.00 /* 01014 809F73D4 C6060090 */ lwc1 $f6, 0x0090($s0) ## 00000090 /* 01018 809F73D8 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 -/* 0101C 809F73DC 8FAE0034 */ lw $t6, 0x0034($sp) -/* 01020 809F73E0 4606403E */ c.le.s $f8, $f6 -/* 01024 809F73E4 468020A0 */ cvt.s.w $f2, $f4 +/* 0101C 809F73DC 8FAE0034 */ lw $t6, 0x0034($sp) +/* 01020 809F73E0 4606403E */ c.le.s $f8, $f6 +/* 01024 809F73E4 468020A0 */ cvt.s.w $f2, $f4 /* 01028 809F73E8 8DC31C44 */ lw $v1, 0x1C44($t6) ## 00001C44 -/* 0102C 809F73EC 45030031 */ bc1tl .L809F74B4 -/* 01030 809F73F0 8FBF002C */ lw $ra, 0x002C($sp) +/* 0102C 809F73EC 45030031 */ bc1tl .L809F74B4 +/* 01030 809F73F0 8FBF002C */ lw $ra, 0x002C($sp) /* 01034 809F73F4 C60A0028 */ lwc1 $f10, 0x0028($s0) ## 00000028 /* 01038 809F73F8 C4700028 */ lwc1 $f16, 0x0028($v1) ## 00000028 /* 0103C 809F73FC 3C014220 */ lui $at, 0x4220 ## $at = 42200000 /* 01040 809F7400 44819000 */ mtc1 $at, $f18 ## $f18 = 40.00 -/* 01044 809F7404 46105001 */ sub.s $f0, $f10, $f16 +/* 01044 809F7404 46105001 */ sub.s $f0, $f10, $f16 /* 01048 809F7408 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 0104C 809F740C 3C063FE6 */ lui $a2, 0x3FE6 ## $a2 = 3FE60000 /* 01050 809F7410 34C66666 */ ori $a2, $a2, 0x6666 ## $a2 = 3FE66666 -/* 01054 809F7414 4600903E */ c.le.s $f18, $f0 +/* 01054 809F7414 4600903E */ c.le.s $f18, $f0 /* 01058 809F7418 24A50860 */ addiu $a1, $a1, 0x0860 ## $a1 = 06000860 /* 0105C 809F741C 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C /* 01060 809F7420 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 01064 809F7424 45010022 */ bc1t .L809F74B0 +/* 01064 809F7424 45010022 */ bc1t .L809F74B0 /* 01068 809F7428 240F0001 */ addiu $t7, $zero, 0x0001 ## $t7 = 00000001 /* 0106C 809F742C 3C01C120 */ lui $at, 0xC120 ## $at = C1200000 /* 01070 809F7430 44812000 */ mtc1 $at, $f4 ## $f4 = -10.00 -/* 01074 809F7434 E7A20010 */ swc1 $f2, 0x0010($sp) -/* 01078 809F7438 AFAF0014 */ sw $t7, 0x0014($sp) -/* 0107C 809F743C 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 01080 809F7440 E7A40018 */ swc1 $f4, 0x0018($sp) +/* 01074 809F7434 E7A20010 */ swc1 $f2, 0x0010($sp) +/* 01078 809F7438 AFAF0014 */ sw $t7, 0x0014($sp) +/* 0107C 809F743C 0C029468 */ jal SkelAnime_ChangeAnim + +/* 01080 809F7440 E7A40018 */ swc1 $f4, 0x0018($sp) /* 01084 809F7444 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 01088 809F7448 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 0108C 809F744C 24053824 */ addiu $a1, $zero, 0x3824 ## $a1 = 00003824 /* 01090 809F7450 3C014270 */ lui $at, 0x4270 ## $at = 42700000 /* 01094 809F7454 44814000 */ mtc1 $at, $f8 ## $f8 = 60.00 /* 01098 809F7458 C6060028 */ lwc1 $f6, 0x0028($s0) ## 00000028 /* 0109C 809F745C 86080030 */ lh $t0, 0x0030($s0) ## 00000030 /* 010A0 809F7460 8E0C0024 */ lw $t4, 0x0024($s0) ## 00000024 -/* 010A4 809F7464 46083281 */ sub.s $f10, $f6, $f8 +/* 010A4 809F7464 46083281 */ sub.s $f10, $f6, $f8 /* 010A8 809F7468 2509C000 */ addiu $t1, $t0, 0xC000 ## $t1 = FFFFC000 /* 010AC 809F746C 8E180004 */ lw $t8, 0x0004($s0) ## 00000004 /* 010B0 809F7470 A6090030 */ sh $t1, 0x0030($s0) ## 00000030 @@ -68,11 +68,11 @@ glabel func_809F73AC /* 010E8 809F74A8 AE0C01F8 */ sw $t4, 0x01F8($s0) ## 000001F8 /* 010EC 809F74AC E61001F4 */ swc1 $f16, 0x01F4($s0) ## 000001F4 .L809F74B0: -/* 010F0 809F74B0 8FBF002C */ lw $ra, 0x002C($sp) +/* 010F0 809F74B0 8FBF002C */ lw $ra, 0x002C($sp) .L809F74B4: -/* 010F4 809F74B4 8FB00028 */ lw $s0, 0x0028($sp) +/* 010F4 809F74B4 8FB00028 */ lw $s0, 0x0028($sp) /* 010F8 809F74B8 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 010FC 809F74BC 03E00008 */ jr $ra +/* 010FC 809F74BC 03E00008 */ jr $ra /* 01100 809F74C0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dodongo/func_809F89CC.s b/asm/non_matchings/overlays/actors/ovl_En_Dodongo/func_809F89CC.s index 02fb5edd20..afede657dd 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dodongo/func_809F89CC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dodongo/func_809F89CC.s @@ -1,30 +1,30 @@ glabel func_809F89CC /* 0077C 809F89CC 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00780 809F89D0 AFBF0014 */ sw $ra, 0x0014($sp) +/* 00780 809F89D0 AFBF0014 */ sw $ra, 0x0014($sp) /* 00784 809F89D4 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 /* 00788 809F89D8 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 0078C 809F89DC 24A54C20 */ addiu $a1, $a1, 0x4C20 ## $a1 = 06004C20 -/* 00790 809F89E0 AFA70018 */ sw $a3, 0x0018($sp) +/* 00790 809F89E0 AFA70018 */ sw $a3, 0x0018($sp) /* 00794 809F89E4 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 00798 809F89E8 0C0294D3 */ jal func_800A534C +/* 00798 809F89E8 0C0294D3 */ jal SkelAnime_ChangeAnimTransitionRepeat /* 0079C 809F89EC 3C06C080 */ lui $a2, 0xC080 ## $a2 = C0800000 -/* 007A0 809F89F0 8FA70018 */ lw $a3, 0x0018($sp) +/* 007A0 809F89F0 8FA70018 */ lw $a3, 0x0018($sp) /* 007A4 809F89F4 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 /* 007A8 809F89F8 2404001E */ addiu $a0, $zero, 0x001E ## $a0 = 0000001E /* 007AC 809F89FC 24050032 */ addiu $a1, $zero, 0x0032 ## $a1 = 00000032 /* 007B0 809F8A00 0C01DF64 */ jal Math_Rand_S16Offset - + /* 007B4 809F8A04 E4E40068 */ swc1 $f4, 0x0068($a3) ## 00000068 -/* 007B8 809F8A08 8FA40018 */ lw $a0, 0x0018($sp) +/* 007B8 809F8A08 8FA40018 */ lw $a0, 0x0018($sp) /* 007BC 809F8A0C 240E0004 */ addiu $t6, $zero, 0x0004 ## $t6 = 00000004 /* 007C0 809F8A10 3C0580A0 */ lui $a1, %hi(func_809F8C94) ## $a1 = 80A00000 /* 007C4 809F8A14 24A58C94 */ addiu $a1, $a1, %lo(func_809F8C94) ## $a1 = 809F8C94 /* 007C8 809F8A18 A482030C */ sh $v0, 0x030C($a0) ## 0000030C -/* 007CC 809F8A1C 0C27E094 */ jal func_809F8250 +/* 007CC 809F8A1C 0C27E094 */ jal func_809F8250 /* 007D0 809F8A20 AC8E0304 */ sw $t6, 0x0304($a0) ## 00000304 -/* 007D4 809F8A24 8FBF0014 */ lw $ra, 0x0014($sp) +/* 007D4 809F8A24 8FBF0014 */ lw $ra, 0x0014($sp) /* 007D8 809F8A28 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 007DC 809F8A2C 03E00008 */ jr $ra +/* 007DC 809F8A2C 03E00008 */ jr $ra /* 007E0 809F8A30 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dodongo/func_809F8A34.s b/asm/non_matchings/overlays/actors/ovl_En_Dodongo/func_809F8A34.s index f28c82b1f9..58ce759861 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dodongo/func_809F8A34.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dodongo/func_809F8A34.s @@ -1,33 +1,33 @@ glabel func_809F8A34 /* 007E4 809F8A34 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 007E8 809F8A38 AFB00028 */ sw $s0, 0x0028($sp) +/* 007E8 809F8A38 AFB00028 */ sw $s0, 0x0028($sp) /* 007EC 809F8A3C 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 007F0 809F8A40 AFBF002C */ sw $ra, 0x002C($sp) +/* 007F0 809F8A40 AFBF002C */ sw $ra, 0x002C($sp) /* 007F4 809F8A44 3C040601 */ lui $a0, 0x0601 ## $a0 = 06010000 /* 007F8 809F8A48 0C028800 */ jal SkelAnime_GetFrameCount - + /* 007FC 809F8A4C 24848B1C */ addiu $a0, $a0, 0x8B1C ## $a0 = 06008B1C /* 00800 809F8A50 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 00804 809F8A54 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 /* 00808 809F8A58 3C01C080 */ lui $at, 0xC080 ## $at = C0800000 -/* 0080C 809F8A5C 468021A0 */ cvt.s.w $f6, $f4 +/* 0080C 809F8A5C 468021A0 */ cvt.s.w $f6, $f4 /* 00810 809F8A60 44814000 */ mtc1 $at, $f8 ## $f8 = -4.00 /* 00814 809F8A64 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 -/* 00818 809F8A68 44060000 */ mfc1 $a2, $f0 -/* 0081C 809F8A6C 44070000 */ mfc1 $a3, $f0 +/* 00818 809F8A68 44060000 */ mfc1 $a2, $f0 +/* 0081C 809F8A6C 44070000 */ mfc1 $a3, $f0 /* 00820 809F8A70 24A58B1C */ addiu $a1, $a1, 0x8B1C ## $a1 = 06008B1C -/* 00824 809F8A74 E7A60010 */ swc1 $f6, 0x0010($sp) +/* 00824 809F8A74 E7A60010 */ swc1 $f6, 0x0010($sp) /* 00828 809F8A78 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C -/* 0082C 809F8A7C AFA00014 */ sw $zero, 0x0014($sp) -/* 00830 809F8A80 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 00834 809F8A84 E7A80018 */ swc1 $f8, 0x0018($sp) +/* 0082C 809F8A7C AFA00014 */ sw $zero, 0x0014($sp) +/* 00830 809F8A80 0C029468 */ jal SkelAnime_ChangeAnim + +/* 00834 809F8A84 E7A80018 */ swc1 $f8, 0x0018($sp) /* 00838 809F8A88 3C013FC0 */ lui $at, 0x3FC0 ## $at = 3FC00000 /* 0083C 809F8A8C 44815000 */ mtc1 $at, $f10 ## $f10 = 1.50 /* 00840 809F8A90 24040032 */ addiu $a0, $zero, 0x0032 ## $a0 = 00000032 /* 00844 809F8A94 24050046 */ addiu $a1, $zero, 0x0046 ## $a1 = 00000046 /* 00848 809F8A98 0C01DF64 */ jal Math_Rand_S16Offset - + /* 0084C 809F8A9C E60A0068 */ swc1 $f10, 0x0068($s0) ## 00000068 /* 00850 809F8AA0 240E0001 */ addiu $t6, $zero, 0x0001 ## $t6 = 00000001 /* 00854 809F8AA4 240F0008 */ addiu $t7, $zero, 0x0008 ## $t7 = 00000008 @@ -36,12 +36,12 @@ glabel func_809F8A34 /* 00860 809F8AB0 A60E0316 */ sh $t6, 0x0316($s0) ## 00000316 /* 00864 809F8AB4 AE0F0304 */ sw $t7, 0x0304($s0) ## 00000304 /* 00868 809F8AB8 24A59424 */ addiu $a1, $a1, %lo(func_809F9424) ## $a1 = 809F9424 -/* 0086C 809F8ABC 0C27E094 */ jal func_809F8250 +/* 0086C 809F8ABC 0C27E094 */ jal func_809F8250 /* 00870 809F8AC0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00874 809F8AC4 8FBF002C */ lw $ra, 0x002C($sp) -/* 00878 809F8AC8 8FB00028 */ lw $s0, 0x0028($sp) +/* 00874 809F8AC4 8FBF002C */ lw $ra, 0x002C($sp) +/* 00878 809F8AC8 8FB00028 */ lw $s0, 0x0028($sp) /* 0087C 809F8ACC 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 00880 809F8AD0 03E00008 */ jr $ra +/* 00880 809F8AD0 03E00008 */ jr $ra /* 00884 809F8AD4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dodongo/func_809F8AD8.s b/asm/non_matchings/overlays/actors/ovl_En_Dodongo/func_809F8AD8.s index a1a0dd8b0c..273a6a8487 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dodongo/func_809F8AD8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dodongo/func_809F8AD8.s @@ -1,24 +1,24 @@ glabel func_809F8AD8 /* 00888 809F8AD8 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 0088C 809F8ADC AFBF0014 */ sw $ra, 0x0014($sp) +/* 0088C 809F8ADC AFBF0014 */ sw $ra, 0x0014($sp) /* 00890 809F8AE0 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 /* 00894 809F8AE4 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 00898 809F8AE8 24A528F0 */ addiu $a1, $a1, 0x28F0 ## $a1 = 060028F0 -/* 0089C 809F8AEC AFA70018 */ sw $a3, 0x0018($sp) +/* 0089C 809F8AEC AFA70018 */ sw $a3, 0x0018($sp) /* 008A0 809F8AF0 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 008A4 809F8AF4 0C029490 */ jal func_800A5240 +/* 008A4 809F8AF4 0C029490 */ jal SkelAnime_ChangeAnimTransitionStop /* 008A8 809F8AF8 3C06C080 */ lui $a2, 0xC080 ## $a2 = C0800000 -/* 008AC 809F8AFC 8FA40018 */ lw $a0, 0x0018($sp) +/* 008AC 809F8AFC 8FA40018 */ lw $a0, 0x0018($sp) /* 008B0 809F8B00 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 /* 008B4 809F8B04 240E0003 */ addiu $t6, $zero, 0x0003 ## $t6 = 00000003 /* 008B8 809F8B08 3C0580A0 */ lui $a1, %hi(func_809F8D58) ## $a1 = 80A00000 /* 008BC 809F8B0C 24A58D58 */ addiu $a1, $a1, %lo(func_809F8D58) ## $a1 = 809F8D58 /* 008C0 809F8B10 AC8E0304 */ sw $t6, 0x0304($a0) ## 00000304 -/* 008C4 809F8B14 0C27E094 */ jal func_809F8250 +/* 008C4 809F8B14 0C27E094 */ jal func_809F8250 /* 008C8 809F8B18 E4840068 */ swc1 $f4, 0x0068($a0) ## 00000068 -/* 008CC 809F8B1C 8FBF0014 */ lw $ra, 0x0014($sp) +/* 008CC 809F8B1C 8FBF0014 */ lw $ra, 0x0014($sp) /* 008D0 809F8B20 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 008D4 809F8B24 03E00008 */ jr $ra +/* 008D4 809F8B24 03E00008 */ jr $ra /* 008D8 809F8B28 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dodongo/func_809F8B2C.s b/asm/non_matchings/overlays/actors/ovl_En_Dodongo/func_809F8B2C.s index bbdb3f1a13..e714078bdb 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dodongo/func_809F8B2C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dodongo/func_809F8B2C.s @@ -1,23 +1,23 @@ glabel func_809F8B2C /* 008DC 809F8B2C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 008E0 809F8B30 AFBF0014 */ sw $ra, 0x0014($sp) +/* 008E0 809F8B30 AFBF0014 */ sw $ra, 0x0014($sp) /* 008E4 809F8B34 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 /* 008E8 809F8B38 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 008EC 809F8B3C 24A53088 */ addiu $a1, $a1, 0x3088 ## $a1 = 06003088 -/* 008F0 809F8B40 AFA60018 */ sw $a2, 0x0018($sp) -/* 008F4 809F8B44 0C02947A */ jal func_800A51E8 +/* 008F0 809F8B40 AFA60018 */ sw $a2, 0x0018($sp) +/* 008F4 809F8B44 0C02947A */ jal SkelAnime_ChangeAnimDefaultStop /* 008F8 809F8B48 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 008FC 809F8B4C 8FA40018 */ lw $a0, 0x0018($sp) +/* 008FC 809F8B4C 8FA40018 */ lw $a0, 0x0018($sp) /* 00900 809F8B50 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 /* 00904 809F8B54 240E0005 */ addiu $t6, $zero, 0x0005 ## $t6 = 00000005 /* 00908 809F8B58 3C0580A0 */ lui $a1, %hi(func_809F8D0C) ## $a1 = 80A00000 /* 0090C 809F8B5C 24A58D0C */ addiu $a1, $a1, %lo(func_809F8D0C) ## $a1 = 809F8D0C /* 00910 809F8B60 AC8E0304 */ sw $t6, 0x0304($a0) ## 00000304 -/* 00914 809F8B64 0C27E094 */ jal func_809F8250 +/* 00914 809F8B64 0C27E094 */ jal func_809F8250 /* 00918 809F8B68 E4840068 */ swc1 $f4, 0x0068($a0) ## 00000068 -/* 0091C 809F8B6C 8FBF0014 */ lw $ra, 0x0014($sp) +/* 0091C 809F8B6C 8FBF0014 */ lw $ra, 0x0014($sp) /* 00920 809F8B70 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00924 809F8B74 03E00008 */ jr $ra +/* 00924 809F8B74 03E00008 */ jr $ra /* 00928 809F8B78 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dodongo/func_809F8B7C.s b/asm/non_matchings/overlays/actors/ovl_En_Dodongo/func_809F8B7C.s index 4b32b0fa01..d363280790 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dodongo/func_809F8B7C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dodongo/func_809F8B7C.s @@ -3,20 +3,20 @@ glabel func_809F8B7C /* 00930 809F8B80 3C01C080 */ lui $at, 0xC080 ## $at = C0800000 /* 00934 809F8B84 44813000 */ mtc1 $at, $f6 ## $f6 = -4.00 /* 00938 809F8B88 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 -/* 0093C 809F8B8C AFB00028 */ sw $s0, 0x0028($sp) +/* 0093C 809F8B8C AFB00028 */ sw $s0, 0x0028($sp) /* 00940 809F8B90 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00944 809F8B94 AFBF002C */ sw $ra, 0x002C($sp) +/* 00944 809F8B94 AFBF002C */ sw $ra, 0x002C($sp) /* 00948 809F8B98 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 0094C 809F8B9C 240E0002 */ addiu $t6, $zero, 0x0002 ## $t6 = 00000002 -/* 00950 809F8BA0 AFAE0014 */ sw $t6, 0x0014($sp) +/* 00950 809F8BA0 AFAE0014 */ sw $t6, 0x0014($sp) /* 00954 809F8BA4 24A528F0 */ addiu $a1, $a1, 0x28F0 ## $a1 = 060028F0 /* 00958 809F8BA8 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C /* 0095C 809F8BAC 3C06BF80 */ lui $a2, 0xBF80 ## $a2 = BF800000 /* 00960 809F8BB0 3C07420C */ lui $a3, 0x420C ## $a3 = 420C0000 -/* 00964 809F8BB4 E7A60018 */ swc1 $f6, 0x0018($sp) -/* 00968 809F8BB8 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 0096C 809F8BBC E7A40010 */ swc1 $f4, 0x0010($sp) +/* 00964 809F8BB4 E7A60018 */ swc1 $f6, 0x0018($sp) +/* 00968 809F8BB8 0C029468 */ jal SkelAnime_ChangeAnim + +/* 0096C 809F8BBC E7A40010 */ swc1 $f4, 0x0010($sp) /* 00970 809F8BC0 44804000 */ mtc1 $zero, $f8 ## $f8 = 0.00 /* 00974 809F8BC4 240F0001 */ addiu $t7, $zero, 0x0001 ## $t7 = 00000001 /* 00978 809F8BC8 24180019 */ addiu $t8, $zero, 0x0019 ## $t8 = 00000019 @@ -25,12 +25,12 @@ glabel func_809F8B7C /* 00984 809F8BD4 A618030C */ sh $t8, 0x030C($s0) ## 0000030C /* 00988 809F8BD8 24A58F2C */ addiu $a1, $a1, %lo(func_809F8F2C) ## $a1 = 809F8F2C /* 0098C 809F8BDC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00990 809F8BE0 0C27E094 */ jal func_809F8250 +/* 00990 809F8BE0 0C27E094 */ jal func_809F8250 /* 00994 809F8BE4 E6080068 */ swc1 $f8, 0x0068($s0) ## 00000068 -/* 00998 809F8BE8 8FBF002C */ lw $ra, 0x002C($sp) -/* 0099C 809F8BEC 8FB00028 */ lw $s0, 0x0028($sp) +/* 00998 809F8BE8 8FBF002C */ lw $ra, 0x002C($sp) +/* 0099C 809F8BEC 8FB00028 */ lw $s0, 0x0028($sp) /* 009A0 809F8BF0 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 009A4 809F8BF4 03E00008 */ jr $ra +/* 009A4 809F8BF4 03E00008 */ jr $ra /* 009A8 809F8BF8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dodongo/func_809F8BFC.s b/asm/non_matchings/overlays/actors/ovl_En_Dodongo/func_809F8BFC.s index 72a6518a28..f6431fa2cc 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dodongo/func_809F8BFC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dodongo/func_809F8BFC.s @@ -3,42 +3,42 @@ glabel func_809F8BFC /* 009B0 809F8C00 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 /* 009B4 809F8C04 3C01C080 */ lui $at, 0xC080 ## $at = C0800000 /* 009B8 809F8C08 44812000 */ mtc1 $at, $f4 ## $f4 = -4.00 -/* 009BC 809F8C0C AFB00028 */ sw $s0, 0x0028($sp) +/* 009BC 809F8C0C AFB00028 */ sw $s0, 0x0028($sp) /* 009C0 809F8C10 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 009C4 809F8C14 AFBF002C */ sw $ra, 0x002C($sp) +/* 009C4 809F8C14 AFBF002C */ sw $ra, 0x002C($sp) /* 009C8 809F8C18 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 009CC 809F8C1C 240E0002 */ addiu $t6, $zero, 0x0002 ## $t6 = 00000002 -/* 009D0 809F8C20 44060000 */ mfc1 $a2, $f0 -/* 009D4 809F8C24 AFAE0014 */ sw $t6, 0x0014($sp) +/* 009D0 809F8C20 44060000 */ mfc1 $a2, $f0 +/* 009D4 809F8C24 AFAE0014 */ sw $t6, 0x0014($sp) /* 009D8 809F8C28 24A528F0 */ addiu $a1, $a1, 0x28F0 ## $a1 = 060028F0 /* 009DC 809F8C2C 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C /* 009E0 809F8C30 3C0741C8 */ lui $a3, 0x41C8 ## $a3 = 41C80000 -/* 009E4 809F8C34 E7A00010 */ swc1 $f0, 0x0010($sp) -/* 009E8 809F8C38 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 009EC 809F8C3C E7A40018 */ swc1 $f4, 0x0018($sp) +/* 009E4 809F8C34 E7A00010 */ swc1 $f0, 0x0010($sp) +/* 009E8 809F8C38 0C029468 */ jal SkelAnime_ChangeAnim + +/* 009EC 809F8C3C E7A40018 */ swc1 $f4, 0x0018($sp) /* 009F0 809F8C40 921803CC */ lbu $t8, 0x03CC($s0) ## 000003CC /* 009F4 809F8C44 44803000 */ mtc1 $zero, $f6 ## $f6 = 0.00 /* 009F8 809F8C48 240F0007 */ addiu $t7, $zero, 0x0007 ## $t7 = 00000007 /* 009FC 809F8C4C 2401000F */ addiu $at, $zero, 0x000F ## $at = 0000000F /* 00A00 809F8C50 AE0F0304 */ sw $t7, 0x0304($s0) ## 00000304 -/* 00A04 809F8C54 17010003 */ bne $t8, $at, .L809F8C64 +/* 00A04 809F8C54 17010003 */ bne $t8, $at, .L809F8C64 /* 00A08 809F8C58 E6060068 */ swc1 $f6, 0x0068($s0) ## 00000068 /* 00A0C 809F8C5C 24190024 */ addiu $t9, $zero, 0x0024 ## $t9 = 00000024 /* 00A10 809F8C60 A6190312 */ sh $t9, 0x0312($s0) ## 00000312 .L809F8C64: /* 00A14 809F8C64 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 00A18 809F8C68 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 00A1C 809F8C6C 2405389E */ addiu $a1, $zero, 0x389E ## $a1 = 0000389E /* 00A20 809F8C70 3C0580A0 */ lui $a1, %hi(func_809F9C3C) ## $a1 = 80A00000 /* 00A24 809F8C74 24A59C3C */ addiu $a1, $a1, %lo(func_809F9C3C) ## $a1 = 809F9C3C -/* 00A28 809F8C78 0C27E094 */ jal func_809F8250 +/* 00A28 809F8C78 0C27E094 */ jal func_809F8250 /* 00A2C 809F8C7C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00A30 809F8C80 8FBF002C */ lw $ra, 0x002C($sp) -/* 00A34 809F8C84 8FB00028 */ lw $s0, 0x0028($sp) +/* 00A30 809F8C80 8FBF002C */ lw $ra, 0x002C($sp) +/* 00A34 809F8C84 8FB00028 */ lw $s0, 0x0028($sp) /* 00A38 809F8C88 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 00A3C 809F8C8C 03E00008 */ jr $ra +/* 00A3C 809F8C8C 03E00008 */ jr $ra /* 00A40 809F8C90 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dodongo/func_809F9760.s b/asm/non_matchings/overlays/actors/ovl_En_Dodongo/func_809F9760.s index aeb63f9130..4711e272cb 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dodongo/func_809F9760.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dodongo/func_809F9760.s @@ -1,28 +1,28 @@ glabel func_809F9760 /* 01510 809F9760 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 01514 809F9764 AFBF0014 */ sw $ra, 0x0014($sp) +/* 01514 809F9764 AFBF0014 */ sw $ra, 0x0014($sp) /* 01518 809F9768 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 /* 0151C 809F976C 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 01520 809F9770 24A51A44 */ addiu $a1, $a1, 0x1A44 ## $a1 = 06001A44 -/* 01524 809F9774 AFA70018 */ sw $a3, 0x0018($sp) +/* 01524 809F9774 AFA70018 */ sw $a3, 0x0018($sp) /* 01528 809F9778 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 0152C 809F977C 0C029490 */ jal func_800A5240 +/* 0152C 809F977C 0C029490 */ jal SkelAnime_ChangeAnimTransitionStop /* 01530 809F9780 3C06C080 */ lui $a2, 0xC080 ## $a2 = C0800000 -/* 01534 809F9784 8FA40018 */ lw $a0, 0x0018($sp) +/* 01534 809F9784 8FA40018 */ lw $a0, 0x0018($sp) /* 01538 809F9788 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 0153C 809F978C 24053803 */ addiu $a1, $zero, 0x3803 ## $a1 = 00003803 -/* 01540 809F9790 8FA40018 */ lw $a0, 0x0018($sp) +/* 01540 809F9790 8FA40018 */ lw $a0, 0x0018($sp) /* 01544 809F9794 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 /* 01548 809F9798 3C0580A0 */ lui $a1, %hi(func_809F97C0) ## $a1 = 80A00000 /* 0154C 809F979C 24A597C0 */ addiu $a1, $a1, %lo(func_809F97C0) ## $a1 = 809F97C0 /* 01550 809F97A0 AC800304 */ sw $zero, 0x0304($a0) ## 00000304 /* 01554 809F97A4 A480030C */ sh $zero, 0x030C($a0) ## 0000030C -/* 01558 809F97A8 0C27E094 */ jal func_809F8250 +/* 01558 809F97A8 0C27E094 */ jal func_809F8250 /* 0155C 809F97AC E4840068 */ swc1 $f4, 0x0068($a0) ## 00000068 -/* 01560 809F97B0 8FBF0014 */ lw $ra, 0x0014($sp) +/* 01560 809F97B0 8FBF0014 */ lw $ra, 0x0014($sp) /* 01564 809F97B4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 01568 809F97B8 03E00008 */ jr $ra +/* 01568 809F97B8 03E00008 */ jr $ra /* 0156C 809F97BC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dodongo/func_809F97C0.s b/asm/non_matchings/overlays/actors/ovl_En_Dodongo/func_809F97C0.s index 98d2b92e1d..cff26824a9 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dodongo/func_809F97C0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dodongo/func_809F97C0.s @@ -1,32 +1,32 @@ glabel func_809F97C0 /* 01570 809F97C0 27BDFFA0 */ addiu $sp, $sp, 0xFFA0 ## $sp = FFFFFFA0 -/* 01574 809F97C4 AFBF0034 */ sw $ra, 0x0034($sp) -/* 01578 809F97C8 AFB00030 */ sw $s0, 0x0030($sp) -/* 0157C 809F97CC AFA50064 */ sw $a1, 0x0064($sp) +/* 01574 809F97C4 AFBF0034 */ sw $ra, 0x0034($sp) +/* 01578 809F97C8 AFB00030 */ sw $s0, 0x0030($sp) +/* 0157C 809F97CC AFA50064 */ sw $a1, 0x0064($sp) /* 01580 809F97D0 848F00B6 */ lh $t7, 0x00B6($a0) ## 000000B6 /* 01584 809F97D4 848E008A */ lh $t6, 0x008A($a0) ## 0000008A /* 01588 809F97D8 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 0158C 809F97DC 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 01590 809F97E0 01CF1823 */ subu $v1, $t6, $t7 -/* 01594 809F97E4 00031C00 */ sll $v1, $v1, 16 -/* 01598 809F97E8 00031C03 */ sra $v1, $v1, 16 -/* 0159C 809F97EC A7A3005E */ sh $v1, 0x005E($sp) +/* 01590 809F97E0 01CF1823 */ subu $v1, $t6, $t7 +/* 01594 809F97E4 00031C00 */ sll $v1, $v1, 16 +/* 01598 809F97E8 00031C03 */ sra $v1, $v1, 16 +/* 0159C 809F97EC A7A3005E */ sh $v1, 0x005E($sp) /* 015A0 809F97F0 0C02927F */ jal SkelAnime_FrameUpdateMatrix - -/* 015A4 809F97F4 AFA40038 */ sw $a0, 0x0038($sp) -/* 015A8 809F97F8 10400048 */ beq $v0, $zero, .L809F991C -/* 015AC 809F97FC 87A3005E */ lh $v1, 0x005E($sp) + +/* 015A4 809F97F4 AFA40038 */ sw $a0, 0x0038($sp) +/* 015A8 809F97F8 10400048 */ beq $v0, $zero, .L809F991C +/* 015AC 809F97FC 87A3005E */ lh $v1, 0x005E($sp) /* 015B0 809F9800 8618030C */ lh $t8, 0x030C($s0) ## 0000030C /* 015B4 809F9804 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 015B8 809F9808 57000009 */ bnel $t8, $zero, .L809F9830 +/* 015B8 809F9808 57000009 */ bnel $t8, $zero, .L809F9830 /* 015BC 809F980C A200063D */ sb $zero, 0x063D($s0) ## 0000063D -/* 015C0 809F9810 04600003 */ bltz $v1, .L809F9820 -/* 015C4 809F9814 00031023 */ subu $v0, $zero, $v1 -/* 015C8 809F9818 10000001 */ beq $zero, $zero, .L809F9820 +/* 015C0 809F9810 04600003 */ bltz $v1, .L809F9820 +/* 015C4 809F9814 00031023 */ subu $v0, $zero, $v1 +/* 015C8 809F9818 10000001 */ beq $zero, $zero, .L809F9820 /* 015CC 809F981C 00601025 */ or $v0, $v1, $zero ## $v0 = 00000000 .L809F9820: -/* 015D0 809F9820 28414000 */ slti $at, $v0, 0x4000 -/* 015D4 809F9824 1020000E */ beq $at, $zero, .L809F9860 +/* 015D0 809F9820 28414000 */ slti $at, $v0, 0x4000 +/* 015D4 809F9824 1020000E */ beq $at, $zero, .L809F9860 /* 015D8 809F9828 3409FFFF */ ori $t1, $zero, 0xFFFF ## $t1 = 0000FFFF /* 015DC 809F982C A200063D */ sb $zero, 0x063D($s0) ## 0000063D .L809F9830: @@ -35,40 +35,40 @@ glabel func_809F97C0 /* 015E8 809F9838 AE000628 */ sw $zero, 0x0628($s0) ## 00000628 /* 015EC 809F983C AE0005E8 */ sw $zero, 0x05E8($s0) ## 000005E8 /* 015F0 809F9840 A200062D */ sb $zero, 0x062D($s0) ## 0000062D -/* 015F4 809F9844 0C27E2B6 */ jal func_809F8AD8 +/* 015F4 809F9844 0C27E2B6 */ jal func_809F8AD8 /* 015F8 809F9848 A20005ED */ sb $zero, 0x05ED($s0) ## 000005ED /* 015FC 809F984C 24040005 */ addiu $a0, $zero, 0x0005 ## $a0 = 00000005 /* 01600 809F9850 0C01DF64 */ jal Math_Rand_S16Offset - + /* 01604 809F9854 2405000A */ addiu $a1, $zero, 0x000A ## $a1 = 0000000A -/* 01608 809F9858 10000084 */ beq $zero, $zero, .L809F9A6C +/* 01608 809F9858 10000084 */ beq $zero, $zero, .L809F9A6C /* 0160C 809F985C A602030C */ sh $v0, 0x030C($s0) ## 0000030C .L809F9860: /* 01610 809F9860 8619008A */ lh $t9, 0x008A($s0) ## 0000008A /* 01614 809F9864 860800B6 */ lh $t0, 0x00B6($s0) ## 000000B6 /* 01618 809F9868 2401000F */ addiu $at, $zero, 0x000F ## $at = 0000000F /* 0161C 809F986C 24053859 */ addiu $a1, $zero, 0x3859 ## $a1 = 00003859 -/* 01620 809F9870 03282023 */ subu $a0, $t9, $t0 -/* 01624 809F9874 00041C00 */ sll $v1, $a0, 16 -/* 01628 809F9878 00031C03 */ sra $v1, $v1, 16 -/* 0162C 809F987C 04600003 */ bltz $v1, .L809F988C -/* 01630 809F9880 00046400 */ sll $t4, $a0, 16 -/* 01634 809F9884 10000002 */ beq $zero, $zero, .L809F9890 +/* 01620 809F9870 03282023 */ subu $a0, $t9, $t0 +/* 01624 809F9874 00041C00 */ sll $v1, $a0, 16 +/* 01628 809F9878 00031C03 */ sra $v1, $v1, 16 +/* 0162C 809F987C 04600003 */ bltz $v1, .L809F988C +/* 01630 809F9880 00046400 */ sll $t4, $a0, 16 +/* 01634 809F9884 10000002 */ beq $zero, $zero, .L809F9890 /* 01638 809F9888 00601025 */ or $v0, $v1, $zero ## $v0 = 00000000 .L809F988C: -/* 0163C 809F988C 00031023 */ subu $v0, $zero, $v1 +/* 0163C 809F988C 00031023 */ subu $v0, $zero, $v1 .L809F9890: -/* 01640 809F9890 01225023 */ subu $t2, $t1, $v0 -/* 01644 809F9894 0141001A */ div $zero, $t2, $at -/* 01648 809F9898 00005812 */ mflo $t3 -/* 0164C 809F989C 000C6C03 */ sra $t5, $t4, 16 -/* 01650 809F98A0 05A00007 */ bltz $t5, .L809F98C0 +/* 01640 809F9890 01225023 */ subu $t2, $t1, $v0 +/* 01644 809F9894 0141001A */ div $zero, $t2, $at +/* 01648 809F9898 00005812 */ mflo $t3 +/* 0164C 809F989C 000C6C03 */ sra $t5, $t4, 16 +/* 01650 809F98A0 05A00007 */ bltz $t5, .L809F98C0 /* 01654 809F98A4 A60B0310 */ sh $t3, 0x0310($s0) ## 00000310 /* 01658 809F98A8 860E0310 */ lh $t6, 0x0310($s0) ## 00000310 /* 0165C 809F98AC 3C070600 */ lui $a3, 0x0600 ## $a3 = 06000000 /* 01660 809F98B0 24E742C4 */ addiu $a3, $a3, 0x42C4 ## $a3 = 060042C4 -/* 01664 809F98B4 000E7823 */ subu $t7, $zero, $t6 -/* 01668 809F98B8 10000003 */ beq $zero, $zero, .L809F98C8 +/* 01664 809F98B4 000E7823 */ subu $t7, $zero, $t6 +/* 01668 809F98B8 10000003 */ beq $zero, $zero, .L809F98C8 /* 0166C 809F98BC A60F0310 */ sh $t7, 0x0310($s0) ## 00000310 .L809F98C0: /* 01670 809F98C0 3C070600 */ lui $a3, 0x0600 ## $a3 = 06000000 @@ -76,11 +76,11 @@ glabel func_809F97C0 .L809F98C8: /* 01678 809F98C8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 0167C 809F98CC 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 01680 809F98D0 AFA70058 */ sw $a3, 0x0058($sp) -/* 01684 809F98D4 8FA50058 */ lw $a1, 0x0058($sp) -/* 01688 809F98D8 8FA40038 */ lw $a0, 0x0038($sp) -/* 0168C 809F98DC 0C0294A7 */ jal func_800A529C + +/* 01680 809F98D0 AFA70058 */ sw $a3, 0x0058($sp) +/* 01684 809F98D4 8FA50058 */ lw $a1, 0x0058($sp) +/* 01688 809F98D8 8FA40038 */ lw $a0, 0x0038($sp) +/* 0168C 809F98DC 0C0294A7 */ jal SkelAnime_ChangeAnimPlaybackStop /* 01690 809F98E0 3C064000 */ lui $a2, 0x4000 ## $a2 = 40000000 /* 01694 809F98E4 3C03FFCF */ lui $v1, 0xFFCF ## $v1 = FFCF0000 /* 01698 809F98E8 24020011 */ addiu $v0, $zero, 0x0011 ## $v0 = 00000011 @@ -94,102 +94,102 @@ glabel func_809F97C0 /* 016B8 809F9908 AE030628 */ sw $v1, 0x0628($s0) ## 00000628 /* 016BC 809F990C AE0305E8 */ sw $v1, 0x05E8($s0) ## 000005E8 /* 016C0 809F9910 A209062D */ sb $t1, 0x062D($s0) ## 0000062D -/* 016C4 809F9914 10000055 */ beq $zero, $zero, .L809F9A6C +/* 016C4 809F9914 10000055 */ beq $zero, $zero, .L809F9A6C /* 016C8 809F9918 A20905ED */ sb $t1, 0x05ED($s0) ## 000005ED .L809F991C: /* 016CC 809F991C 8602030C */ lh $v0, 0x030C($s0) ## 0000030C -/* 016D0 809F9920 28410002 */ slti $at, $v0, 0x0002 -/* 016D4 809F9924 54200052 */ bnel $at, $zero, .L809F9A70 -/* 016D8 809F9928 8FBF0034 */ lw $ra, 0x0034($sp) +/* 016D0 809F9920 28410002 */ slti $at, $v0, 0x0002 +/* 016D4 809F9924 54200052 */ bnel $at, $zero, .L809F9A70 +/* 016D8 809F9928 8FBF0034 */ lw $ra, 0x0034($sp) /* 016DC 809F992C 860F0618 */ lh $t7, 0x0618($s0) ## 00000618 /* 016E0 809F9930 860B0032 */ lh $t3, 0x0032($s0) ## 00000032 /* 016E4 809F9934 860C0310 */ lh $t4, 0x0310($s0) ## 00000310 /* 016E8 809F9938 448F2000 */ mtc1 $t7, $f4 ## $f4 = 0.00 /* 016EC 809F993C 244AFFFF */ addiu $t2, $v0, 0xFFFF ## $t2 = 00000010 -/* 016F0 809F9940 016C6821 */ addu $t5, $t3, $t4 -/* 016F4 809F9944 468021A0 */ cvt.s.w $f6, $f4 +/* 016F0 809F9940 016C6821 */ addu $t5, $t3, $t4 +/* 016F4 809F9944 468021A0 */ cvt.s.w $f6, $f4 /* 016F8 809F9948 A60D0032 */ sh $t5, 0x0032($s0) ## 00000032 /* 016FC 809F994C 860E0032 */ lh $t6, 0x0032($s0) ## 00000032 /* 01700 809F9950 A60A030C */ sh $t2, 0x030C($s0) ## 0000030C /* 01704 809F9954 3C014000 */ lui $at, 0x4000 ## $at = 40000000 /* 01708 809F9958 A60E00B6 */ sh $t6, 0x00B6($s0) ## 000000B6 -/* 0170C 809F995C E7A6004C */ swc1 $f6, 0x004C($sp) +/* 0170C 809F995C E7A6004C */ swc1 $f6, 0x004C($sp) /* 01710 809F9960 8618061A */ lh $t8, 0x061A($s0) ## 0000061A /* 01714 809F9964 44812000 */ mtc1 $at, $f4 ## $f4 = 2.00 /* 01718 809F9968 240A000F */ addiu $t2, $zero, 0x000F ## $t2 = 0000000F /* 0171C 809F996C 44984000 */ mtc1 $t8, $f8 ## $f8 = 0.00 /* 01720 809F9970 24080002 */ addiu $t0, $zero, 0x0002 ## $t0 = 00000002 /* 01724 809F9974 24090064 */ addiu $t1, $zero, 0x0064 ## $t1 = 00000064 -/* 01728 809F9978 468042A0 */ cvt.s.w $f10, $f8 -/* 0172C 809F997C 8FA40064 */ lw $a0, 0x0064($sp) +/* 01728 809F9978 468042A0 */ cvt.s.w $f10, $f8 +/* 0172C 809F997C 8FA40064 */ lw $a0, 0x0064($sp) /* 01730 809F9980 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 01734 809F9984 27A6004C */ addiu $a2, $sp, 0x004C ## $a2 = FFFFFFEC /* 01738 809F9988 3C0740A0 */ lui $a3, 0x40A0 ## $a3 = 40A00000 -/* 0173C 809F998C E7AA0050 */ swc1 $f10, 0x0050($sp) +/* 0173C 809F998C E7AA0050 */ swc1 $f10, 0x0050($sp) /* 01740 809F9990 8619061C */ lh $t9, 0x061C($s0) ## 0000061C -/* 01744 809F9994 AFA00020 */ sw $zero, 0x0020($sp) -/* 01748 809F9998 AFAA001C */ sw $t2, 0x001C($sp) +/* 01744 809F9994 AFA00020 */ sw $zero, 0x0020($sp) +/* 01748 809F9998 AFAA001C */ sw $t2, 0x001C($sp) /* 0174C 809F999C 44998000 */ mtc1 $t9, $f16 ## $f16 = 0.00 -/* 01750 809F99A0 AFA90018 */ sw $t1, 0x0018($sp) -/* 01754 809F99A4 AFA80010 */ sw $t0, 0x0010($sp) -/* 01758 809F99A8 468084A0 */ cvt.s.w $f18, $f16 -/* 0175C 809F99AC E7A40014 */ swc1 $f4, 0x0014($sp) -/* 01760 809F99B0 0C00CC98 */ jal func_80033260 -/* 01764 809F99B4 E7B20054 */ swc1 $f18, 0x0054($sp) +/* 01750 809F99A0 AFA90018 */ sw $t1, 0x0018($sp) +/* 01754 809F99A4 AFA80010 */ sw $t0, 0x0010($sp) +/* 01758 809F99A8 468084A0 */ cvt.s.w $f18, $f16 +/* 0175C 809F99AC E7A40014 */ swc1 $f4, 0x0014($sp) +/* 01760 809F99B0 0C00CC98 */ jal func_80033260 +/* 01764 809F99B4 E7B20054 */ swc1 $f18, 0x0054($sp) /* 01768 809F99B8 860B0658 */ lh $t3, 0x0658($s0) ## 00000658 /* 0176C 809F99BC 3C014000 */ lui $at, 0x4000 ## $at = 40000000 /* 01770 809F99C0 240E0002 */ addiu $t6, $zero, 0x0002 ## $t6 = 00000002 /* 01774 809F99C4 448B3000 */ mtc1 $t3, $f6 ## $f6 = 0.00 /* 01778 809F99C8 240F0064 */ addiu $t7, $zero, 0x0064 ## $t7 = 00000064 /* 0177C 809F99CC 2418000F */ addiu $t8, $zero, 0x000F ## $t8 = 0000000F -/* 01780 809F99D0 46803220 */ cvt.s.w $f8, $f6 +/* 01780 809F99D0 46803220 */ cvt.s.w $f8, $f6 /* 01784 809F99D4 44813000 */ mtc1 $at, $f6 ## $f6 = 2.00 -/* 01788 809F99D8 8FA40064 */ lw $a0, 0x0064($sp) +/* 01788 809F99D8 8FA40064 */ lw $a0, 0x0064($sp) /* 0178C 809F99DC 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 01790 809F99E0 27A6004C */ addiu $a2, $sp, 0x004C ## $a2 = FFFFFFEC /* 01794 809F99E4 3C0740A0 */ lui $a3, 0x40A0 ## $a3 = 40A00000 -/* 01798 809F99E8 E7A8004C */ swc1 $f8, 0x004C($sp) +/* 01798 809F99E8 E7A8004C */ swc1 $f8, 0x004C($sp) /* 0179C 809F99EC 860C065A */ lh $t4, 0x065A($s0) ## 0000065A /* 017A0 809F99F0 448C5000 */ mtc1 $t4, $f10 ## $f10 = 0.00 /* 017A4 809F99F4 00000000 */ nop -/* 017A8 809F99F8 46805420 */ cvt.s.w $f16, $f10 -/* 017AC 809F99FC E7B00050 */ swc1 $f16, 0x0050($sp) +/* 017A8 809F99F8 46805420 */ cvt.s.w $f16, $f10 +/* 017AC 809F99FC E7B00050 */ swc1 $f16, 0x0050($sp) /* 017B0 809F9A00 860D065C */ lh $t5, 0x065C($s0) ## 0000065C -/* 017B4 809F9A04 AFA00020 */ sw $zero, 0x0020($sp) -/* 017B8 809F9A08 AFB8001C */ sw $t8, 0x001C($sp) +/* 017B4 809F9A04 AFA00020 */ sw $zero, 0x0020($sp) +/* 017B8 809F9A08 AFB8001C */ sw $t8, 0x001C($sp) /* 017BC 809F9A0C 448D9000 */ mtc1 $t5, $f18 ## $f18 = 0.00 -/* 017C0 809F9A10 AFAF0018 */ sw $t7, 0x0018($sp) -/* 017C4 809F9A14 AFAE0010 */ sw $t6, 0x0010($sp) -/* 017C8 809F9A18 46809120 */ cvt.s.w $f4, $f18 -/* 017CC 809F9A1C E7A60014 */ swc1 $f6, 0x0014($sp) -/* 017D0 809F9A20 0C00CC98 */ jal func_80033260 -/* 017D4 809F9A24 E7A40054 */ swc1 $f4, 0x0054($sp) +/* 017C0 809F9A10 AFAF0018 */ sw $t7, 0x0018($sp) +/* 017C4 809F9A14 AFAE0010 */ sw $t6, 0x0010($sp) +/* 017C8 809F9A18 46809120 */ cvt.s.w $f4, $f18 +/* 017CC 809F9A1C E7A60014 */ swc1 $f6, 0x0014($sp) +/* 017D0 809F9A20 0C00CC98 */ jal func_80033260 +/* 017D4 809F9A24 E7A40054 */ swc1 $f4, 0x0054($sp) /* 017D8 809F9A28 92190598 */ lbu $t9, 0x0598($s0) ## 00000598 -/* 017DC 809F9A2C 8FA70064 */ lw $a3, 0x0064($sp) +/* 017DC 809F9A2C 8FA70064 */ lw $a3, 0x0064($sp) /* 017E0 809F9A30 33280002 */ andi $t0, $t9, 0x0002 ## $t0 = 00000000 -/* 017E4 809F9A34 51000008 */ beql $t0, $zero, .L809F9A58 -/* 017E8 809F9A38 8FA40064 */ lw $a0, 0x0064($sp) +/* 017E4 809F9A34 51000008 */ beql $t0, $zero, .L809F9A58 +/* 017E8 809F9A38 8FA40064 */ lw $a0, 0x0064($sp) /* 017EC 809F9A3C 8CE41C44 */ lw $a0, 0x1C44($a3) ## 00001C44 /* 017F0 809F9A40 8E09058C */ lw $t1, 0x058C($s0) ## 0000058C -/* 017F4 809F9A44 54890004 */ bnel $a0, $t1, .L809F9A58 -/* 017F8 809F9A48 8FA40064 */ lw $a0, 0x0064($sp) +/* 017F4 809F9A44 54890004 */ bnel $a0, $t1, .L809F9A58 +/* 017F8 809F9A48 8FA40064 */ lw $a0, 0x0064($sp) /* 017FC 809F9A4C 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 01800 809F9A50 2405083E */ addiu $a1, $zero, 0x083E ## $a1 = 0000083E -/* 01804 809F9A54 8FA40064 */ lw $a0, 0x0064($sp) +/* 01804 809F9A54 8FA40064 */ lw $a0, 0x0064($sp) .L809F9A58: /* 01808 809F9A58 3C010001 */ lui $at, 0x0001 ## $at = 00010000 /* 0180C 809F9A5C 34211E60 */ ori $at, $at, 0x1E60 ## $at = 00011E60 /* 01810 809F9A60 26060588 */ addiu $a2, $s0, 0x0588 ## $a2 = 00000588 /* 01814 809F9A64 0C0175E7 */ jal Actor_CollisionCheck_SetAT ## CollisionCheck_setAT -/* 01818 809F9A68 00812821 */ addu $a1, $a0, $at +/* 01818 809F9A68 00812821 */ addu $a1, $a0, $at .L809F9A6C: -/* 0181C 809F9A6C 8FBF0034 */ lw $ra, 0x0034($sp) +/* 0181C 809F9A6C 8FBF0034 */ lw $ra, 0x0034($sp) .L809F9A70: -/* 01820 809F9A70 8FB00030 */ lw $s0, 0x0030($sp) +/* 01820 809F9A70 8FB00030 */ lw $s0, 0x0030($sp) /* 01824 809F9A74 27BD0060 */ addiu $sp, $sp, 0x0060 ## $sp = 00000000 -/* 01828 809F9A78 03E00008 */ jr $ra +/* 01828 809F9A78 03E00008 */ jr $ra /* 0182C 809F9A7C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dodongo/func_809F9A80.s b/asm/non_matchings/overlays/actors/ovl_En_Dodongo/func_809F9A80.s index 7aaaa11360..d1e9240312 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dodongo/func_809F9A80.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dodongo/func_809F9A80.s @@ -1,34 +1,34 @@ glabel func_809F9A80 /* 01830 809F9A80 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 01834 809F9A84 AFA5001C */ sw $a1, 0x001C($sp) -/* 01838 809F9A88 AFBF0014 */ sw $ra, 0x0014($sp) +/* 01834 809F9A84 AFA5001C */ sw $a1, 0x001C($sp) +/* 01838 809F9A88 AFBF0014 */ sw $ra, 0x0014($sp) /* 0183C 809F9A8C 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 /* 01840 809F9A90 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 01844 809F9A94 24A513C4 */ addiu $a1, $a1, 0x13C4 ## $a1 = 060013C4 -/* 01848 809F9A98 AFA70018 */ sw $a3, 0x0018($sp) +/* 01848 809F9A98 AFA70018 */ sw $a3, 0x0018($sp) /* 0184C 809F9A9C 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 01850 809F9AA0 0C029490 */ jal func_800A5240 +/* 01850 809F9AA0 0C029490 */ jal SkelAnime_ChangeAnimTransitionStop /* 01854 809F9AA4 3C06C100 */ lui $a2, 0xC100 ## $a2 = C1000000 -/* 01858 809F9AA8 8FA40018 */ lw $a0, 0x0018($sp) +/* 01858 809F9AA8 8FA40018 */ lw $a0, 0x0018($sp) /* 0185C 809F9AAC 24053804 */ addiu $a1, $zero, 0x3804 ## $a1 = 00003804 /* 01860 809F9AB0 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 01864 809F9AB4 A480030C */ sh $zero, 0x030C($a0) ## 0000030C -/* 01868 809F9AB8 8FA40018 */ lw $a0, 0x0018($sp) +/* 01868 809F9AB8 8FA40018 */ lw $a0, 0x0018($sp) /* 0186C 809F9ABC 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 /* 01870 809F9AC0 2401FFFE */ addiu $at, $zero, 0xFFFE ## $at = FFFFFFFE /* 01874 809F9AC4 8C8F0004 */ lw $t7, 0x0004($a0) ## 00000004 /* 01878 809F9AC8 240E0002 */ addiu $t6, $zero, 0x0002 ## $t6 = 00000002 /* 0187C 809F9ACC 3C0580A0 */ lui $a1, %hi(func_809F9AF8) ## $a1 = 80A00000 -/* 01880 809F9AD0 01E1C024 */ and $t8, $t7, $at +/* 01880 809F9AD0 01E1C024 */ and $t8, $t7, $at /* 01884 809F9AD4 24A59AF8 */ addiu $a1, $a1, %lo(func_809F9AF8) ## $a1 = 809F9AF8 /* 01888 809F9AD8 AC8E0304 */ sw $t6, 0x0304($a0) ## 00000304 /* 0188C 809F9ADC AC980004 */ sw $t8, 0x0004($a0) ## 00000004 -/* 01890 809F9AE0 0C27E094 */ jal func_809F8250 +/* 01890 809F9AE0 0C27E094 */ jal func_809F8250 /* 01894 809F9AE4 E4840068 */ swc1 $f4, 0x0068($a0) ## 00000068 -/* 01898 809F9AE8 8FBF0014 */ lw $ra, 0x0014($sp) +/* 01898 809F9AE8 8FBF0014 */ lw $ra, 0x0014($sp) /* 0189C 809F9AEC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 018A0 809F9AF0 03E00008 */ jr $ra +/* 018A0 809F9AF0 03E00008 */ jr $ra /* 018A4 809F9AF4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dog/EnDog_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Dog/EnDog_Destroy.s deleted file mode 100644 index 410b49f92e..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Dog/EnDog_Destroy.s +++ /dev/null @@ -1,14 +0,0 @@ -glabel EnDog_Destroy -/* 006CC 809FB69C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 006D0 809FB6A0 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 -/* 006D4 809FB6A4 AFBF0014 */ sw $ra, 0x0014($sp) -/* 006D8 809FB6A8 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 006DC 809FB6AC 0C0170EB */ jal ActorCollider_FreeCylinder - -/* 006E0 809FB6B0 24C50194 */ addiu $a1, $a2, 0x0194 ## $a1 = 00000194 -/* 006E4 809FB6B4 8FBF0014 */ lw $ra, 0x0014($sp) -/* 006E8 809FB6B8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 006EC 809FB6BC 03E00008 */ jr $ra -/* 006F0 809FB6C0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dog/EnDog_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Dog/EnDog_Draw.s deleted file mode 100644 index dd247f6f87..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Dog/EnDog_Draw.s +++ /dev/null @@ -1,80 +0,0 @@ -glabel EnDog_Draw -/* 00DE8 809FBDB8 27BDFFA0 */ addiu $sp, $sp, 0xFFA0 ## $sp = FFFFFFA0 -/* 00DEC 809FBDBC 3C0F80A0 */ lui $t7, %hi(D_809FC020) ## $t7 = 80A00000 -/* 00DF0 809FBDC0 AFBF002C */ sw $ra, 0x002C($sp) -/* 00DF4 809FBDC4 AFB00028 */ sw $s0, 0x0028($sp) -/* 00DF8 809FBDC8 AFA50064 */ sw $a1, 0x0064($sp) -/* 00DFC 809FBDCC 25EFC020 */ addiu $t7, $t7, %lo(D_809FC020) ## $t7 = 809FC020 -/* 00E00 809FBDD0 8DF90000 */ lw $t9, 0x0000($t7) ## 809FC020 -/* 00E04 809FBDD4 8DF80004 */ lw $t8, 0x0004($t7) ## 809FC024 -/* 00E08 809FBDD8 27AE0054 */ addiu $t6, $sp, 0x0054 ## $t6 = FFFFFFF4 -/* 00E0C 809FBDDC ADD90000 */ sw $t9, 0x0000($t6) ## FFFFFFF4 -/* 00E10 809FBDE0 ADD80004 */ sw $t8, 0x0004($t6) ## FFFFFFF8 -/* 00E14 809FBDE4 8FA90064 */ lw $t1, 0x0064($sp) -/* 00E18 809FBDE8 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00E1C 809FBDEC 3C0680A0 */ lui $a2, %hi(D_809FC030) ## $a2 = 80A00000 -/* 00E20 809FBDF0 8D250000 */ lw $a1, 0x0000($t1) ## 00000000 -/* 00E24 809FBDF4 24C6C030 */ addiu $a2, $a2, %lo(D_809FC030) ## $a2 = 809FC030 -/* 00E28 809FBDF8 27A40040 */ addiu $a0, $sp, 0x0040 ## $a0 = FFFFFFE0 -/* 00E2C 809FBDFC 240703CC */ addiu $a3, $zero, 0x03CC ## $a3 = 000003CC -/* 00E30 809FBE00 0C031AB1 */ jal func_800C6AC4 -/* 00E34 809FBE04 AFA50050 */ sw $a1, 0x0050($sp) -/* 00E38 809FBE08 8FAA0064 */ lw $t2, 0x0064($sp) -/* 00E3C 809FBE0C 0C024F46 */ jal func_80093D18 -/* 00E40 809FBE10 8D440000 */ lw $a0, 0x0000($t2) ## 00000000 -/* 00E44 809FBE14 8FA80050 */ lw $t0, 0x0050($sp) -/* 00E48 809FBE18 3C0CE700 */ lui $t4, 0xE700 ## $t4 = E7000000 -/* 00E4C 809FBE1C 3C0EFB00 */ lui $t6, 0xFB00 ## $t6 = FB000000 -/* 00E50 809FBE20 8D0302C0 */ lw $v1, 0x02C0($t0) ## 000002C0 -/* 00E54 809FBE24 27A90054 */ addiu $t1, $sp, 0x0054 ## $t1 = FFFFFFF4 -/* 00E58 809FBE28 246B0008 */ addiu $t3, $v1, 0x0008 ## $t3 = 00000008 -/* 00E5C 809FBE2C AD0B02C0 */ sw $t3, 0x02C0($t0) ## 000002C0 -/* 00E60 809FBE30 AC600004 */ sw $zero, 0x0004($v1) ## 00000004 -/* 00E64 809FBE34 AC6C0000 */ sw $t4, 0x0000($v1) ## 00000000 -/* 00E68 809FBE38 8D0302C0 */ lw $v1, 0x02C0($t0) ## 000002C0 -/* 00E6C 809FBE3C 246D0008 */ addiu $t5, $v1, 0x0008 ## $t5 = 00000008 -/* 00E70 809FBE40 AD0D02C0 */ sw $t5, 0x02C0($t0) ## 000002C0 -/* 00E74 809FBE44 AC6E0000 */ sw $t6, 0x0000($v1) ## 00000000 -/* 00E78 809FBE48 860F001C */ lh $t7, 0x001C($s0) ## 0000001C -/* 00E7C 809FBE4C 31F8000F */ andi $t8, $t7, 0x000F ## $t8 = 00000000 -/* 00E80 809FBE50 0018C880 */ sll $t9, $t8, 2 -/* 00E84 809FBE54 03291021 */ addu $v0, $t9, $t1 -/* 00E88 809FBE58 904D0000 */ lbu $t5, 0x0000($v0) ## 00000000 -/* 00E8C 809FBE5C 904B0003 */ lbu $t3, 0x0003($v0) ## 00000003 -/* 00E90 809FBE60 90590001 */ lbu $t9, 0x0001($v0) ## 00000001 -/* 00E94 809FBE64 000D7600 */ sll $t6, $t5, 24 -/* 00E98 809FBE68 904D0002 */ lbu $t5, 0x0002($v0) ## 00000002 -/* 00E9C 809FBE6C 016E7825 */ or $t7, $t3, $t6 ## $t7 = FB000008 -/* 00EA0 809FBE70 00194C00 */ sll $t1, $t9, 16 -/* 00EA4 809FBE74 01E95025 */ or $t2, $t7, $t1 ## $t2 = FFFFFFFC -/* 00EA8 809FBE78 000D5A00 */ sll $t3, $t5, 8 -/* 00EAC 809FBE7C 014B7025 */ or $t6, $t2, $t3 ## $t6 = FFFFFFFC -/* 00EB0 809FBE80 AC6E0004 */ sw $t6, 0x0004($v1) ## 00000004 -/* 00EB4 809FBE84 9207014E */ lbu $a3, 0x014E($s0) ## 0000014E -/* 00EB8 809FBE88 8E06016C */ lw $a2, 0x016C($s0) ## 0000016C -/* 00EBC 809FBE8C 8E050150 */ lw $a1, 0x0150($s0) ## 00000150 -/* 00EC0 809FBE90 3C1980A0 */ lui $t9, %hi(func_809FBDA4) ## $t9 = 80A00000 -/* 00EC4 809FBE94 3C1880A0 */ lui $t8, %hi(func_809FBD8C) ## $t8 = 80A00000 -/* 00EC8 809FBE98 2718BD8C */ addiu $t8, $t8, %lo(func_809FBD8C) ## $t8 = 809FBD8C -/* 00ECC 809FBE9C 2739BDA4 */ addiu $t9, $t9, %lo(func_809FBDA4) ## $t9 = 809FBDA4 -/* 00ED0 809FBEA0 AFB90014 */ sw $t9, 0x0014($sp) -/* 00ED4 809FBEA4 AFB80010 */ sw $t8, 0x0010($sp) -/* 00ED8 809FBEA8 AFB00018 */ sw $s0, 0x0018($sp) -/* 00EDC 809FBEAC 0C0286B2 */ jal func_800A1AC8 -/* 00EE0 809FBEB0 8FA40064 */ lw $a0, 0x0064($sp) -/* 00EE4 809FBEB4 8FAF0064 */ lw $t7, 0x0064($sp) -/* 00EE8 809FBEB8 3C0680A0 */ lui $a2, %hi(D_809FC040) ## $a2 = 80A00000 -/* 00EEC 809FBEBC 24C6C040 */ addiu $a2, $a2, %lo(D_809FC040) ## $a2 = 809FC040 -/* 00EF0 809FBEC0 27A40040 */ addiu $a0, $sp, 0x0040 ## $a0 = FFFFFFE0 -/* 00EF4 809FBEC4 240703E2 */ addiu $a3, $zero, 0x03E2 ## $a3 = 000003E2 -/* 00EF8 809FBEC8 0C031AD5 */ jal func_800C6B54 -/* 00EFC 809FBECC 8DE50000 */ lw $a1, 0x0000($t7) ## 00000000 -/* 00F00 809FBED0 8FBF002C */ lw $ra, 0x002C($sp) -/* 00F04 809FBED4 8FB00028 */ lw $s0, 0x0028($sp) -/* 00F08 809FBED8 27BD0060 */ addiu $sp, $sp, 0x0060 ## $sp = 00000000 -/* 00F0C 809FBEDC 03E00008 */ jr $ra -/* 00F10 809FBEE0 00000000 */ nop -/* 00F14 809FBEE4 00000000 */ nop -/* 00F18 809FBEE8 00000000 */ nop -/* 00F1C 809FBEEC 00000000 */ nop - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dog/EnDog_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Dog/EnDog_Init.s deleted file mode 100644 index 55ec87bf00..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Dog/EnDog_Init.s +++ /dev/null @@ -1,169 +0,0 @@ -glabel EnDog_Init -/* 0047C 809FB44C 27BDFFB8 */ addiu $sp, $sp, 0xFFB8 ## $sp = FFFFFFB8 -/* 00480 809FB450 AFB00028 */ sw $s0, 0x0028($sp) -/* 00484 809FB454 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00488 809FB458 AFBF002C */ sw $ra, 0x002C($sp) -/* 0048C 809FB45C AFA5004C */ sw $a1, 0x004C($sp) -/* 00490 809FB460 3C068003 */ lui $a2, 0x8003 ## $a2 = 80030000 -/* 00494 809FB464 24C6B5EC */ addiu $a2, $a2, 0xB5EC ## $a2 = 8002B5EC -/* 00498 809FB468 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 -/* 0049C 809FB46C 248400B4 */ addiu $a0, $a0, 0x00B4 ## $a0 = 000000B4 -/* 004A0 809FB470 0C00AC78 */ jal ActorShape_Init - -/* 004A4 809FB474 3C0741C0 */ lui $a3, 0x41C0 ## $a3 = 41C00000 -/* 004A8 809FB478 2605014C */ addiu $a1, $s0, 0x014C ## $a1 = 0000014C -/* 004AC 809FB47C 3C060600 */ lui $a2, 0x0600 ## $a2 = 06000000 -/* 004B0 809FB480 260E01F4 */ addiu $t6, $s0, 0x01F4 ## $t6 = 000001F4 -/* 004B4 809FB484 260F0242 */ addiu $t7, $s0, 0x0242 ## $t7 = 00000242 -/* 004B8 809FB488 2418000D */ addiu $t8, $zero, 0x000D ## $t8 = 0000000D -/* 004BC 809FB48C AFB80018 */ sw $t8, 0x0018($sp) -/* 004C0 809FB490 AFAF0014 */ sw $t7, 0x0014($sp) -/* 004C4 809FB494 AFAE0010 */ sw $t6, 0x0010($sp) -/* 004C8 809FB498 24C67290 */ addiu $a2, $a2, 0x7290 ## $a2 = 06007290 -/* 004CC 809FB49C AFA50034 */ sw $a1, 0x0034($sp) -/* 004D0 809FB4A0 8FA4004C */ lw $a0, 0x004C($sp) -/* 004D4 809FB4A4 0C0291BE */ jal func_800A46F8 -/* 004D8 809FB4A8 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 004DC 809FB4AC 3C0580A0 */ lui $a1, %hi(D_809FBF48) ## $a1 = 80A00000 -/* 004E0 809FB4B0 24A5BF48 */ addiu $a1, $a1, %lo(D_809FBF48) ## $a1 = 809FBF48 -/* 004E4 809FB4B4 8FA40034 */ lw $a0, 0x0034($sp) -/* 004E8 809FB4B8 0C00D3B0 */ jal func_80034EC0 -/* 004EC 809FB4BC 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 004F0 809FB4C0 8602001C */ lh $v0, 0x001C($s0) ## 0000001C -/* 004F4 809FB4C4 3C038016 */ lui $v1, 0x8016 ## $v1 = 80160000 -/* 004F8 809FB4C8 26050194 */ addiu $a1, $s0, 0x0194 ## $a1 = 00000194 -/* 004FC 809FB4CC 30598000 */ andi $t9, $v0, 0x8000 ## $t9 = 00000000 -/* 00500 809FB4D0 17200008 */ bne $t9, $zero, .L809FB4F4 -/* 00504 809FB4D4 3048F0FF */ andi $t0, $v0, 0xF0FF ## $t0 = 00000000 -/* 00508 809FB4D8 30490F00 */ andi $t1, $v0, 0x0F00 ## $t1 = 00000000 -/* 0050C 809FB4DC 00095203 */ sra $t2, $t1, 8 -/* 00510 809FB4E0 254B0001 */ addiu $t3, $t2, 0x0001 ## $t3 = 00000001 -/* 00514 809FB4E4 000B6200 */ sll $t4, $t3, 8 -/* 00518 809FB4E8 010C6825 */ or $t5, $t0, $t4 ## $t5 = 00000000 -/* 0051C 809FB4EC A60D001C */ sh $t5, 0x001C($s0) ## 0000001C -/* 00520 809FB4F0 8602001C */ lh $v0, 0x001C($s0) ## 0000001C -.L809FB4F4: -/* 00524 809FB4F4 8463FA24 */ lh $v1, -0x05DC($v1) ## 8015FA24 -/* 00528 809FB4F8 304E0F00 */ andi $t6, $v0, 0x0F00 ## $t6 = 00000000 -/* 0052C 809FB4FC 000E7A03 */ sra $t7, $t6, 8 -/* 00530 809FB500 30630F00 */ andi $v1, $v1, 0x0F00 ## $v1 = 00000000 -/* 00534 809FB504 00031A03 */ sra $v1, $v1, 8 -/* 00538 809FB508 00031C00 */ sll $v1, $v1, 16 -/* 0053C 809FB50C 00031C03 */ sra $v1, $v1, 16 -/* 00540 809FB510 146F0007 */ bne $v1, $t7, .L809FB530 -/* 00544 809FB514 30588000 */ andi $t8, $v0, 0x8000 ## $t8 = 00000000 -/* 00548 809FB518 57000006 */ bnel $t8, $zero, .L809FB534 -/* 0054C 809FB51C 8FA4004C */ lw $a0, 0x004C($sp) -/* 00550 809FB520 0C00B55C */ jal Actor_Kill - -/* 00554 809FB524 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00558 809FB528 10000058 */ beq $zero, $zero, .L809FB68C -/* 0055C 809FB52C 8FBF002C */ lw $ra, 0x002C($sp) -.L809FB530: -/* 00560 809FB530 8FA4004C */ lw $a0, 0x004C($sp) -.L809FB534: -/* 00564 809FB534 0C0170D9 */ jal ActorCollider_AllocCylinder - -/* 00568 809FB538 AFA50034 */ sw $a1, 0x0034($sp) -/* 0056C 809FB53C 3C0780A0 */ lui $a3, %hi(D_809FBF10) ## $a3 = 80A00000 -/* 00570 809FB540 8FA50034 */ lw $a1, 0x0034($sp) -/* 00574 809FB544 24E7BF10 */ addiu $a3, $a3, %lo(D_809FBF10) ## $a3 = 809FBF10 -/* 00578 809FB548 8FA4004C */ lw $a0, 0x004C($sp) -/* 0057C 809FB54C 0C01712B */ jal ActorCollider_InitCylinder - -/* 00580 809FB550 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 -/* 00584 809FB554 3C0680A0 */ lui $a2, %hi(D_809FBF3C) ## $a2 = 80A00000 -/* 00588 809FB558 24C6BF3C */ addiu $a2, $a2, %lo(D_809FBF3C) ## $a2 = 809FBF3C -/* 0058C 809FB55C 26040098 */ addiu $a0, $s0, 0x0098 ## $a0 = 00000098 -/* 00590 809FB560 0C0187BF */ jal func_80061EFC -/* 00594 809FB564 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 00598 809FB568 3C053BF5 */ lui $a1, 0x3BF5 ## $a1 = 3BF50000 -/* 0059C 809FB56C 34A5C28F */ ori $a1, $a1, 0xC28F ## $a1 = 3BF5C28F -/* 005A0 809FB570 0C00B58B */ jal Actor_SetScale - -/* 005A4 809FB574 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 005A8 809FB578 8605001C */ lh $a1, 0x001C($s0) ## 0000001C -/* 005AC 809FB57C 3C01BF80 */ lui $at, 0xBF80 ## $at = BF800000 -/* 005B0 809FB580 44812000 */ mtc1 $at, $f4 ## $f4 = -1.00 -/* 005B4 809FB584 30A500F0 */ andi $a1, $a1, 0x00F0 ## $a1 = 00000000 -/* 005B8 809FB588 00052903 */ sra $a1, $a1, 4 -/* 005BC 809FB58C A60001E6 */ sh $zero, 0x01E6($s0) ## 000001E6 -/* 005C0 809FB590 00052C00 */ sll $a1, $a1, 16 -/* 005C4 809FB594 E604006C */ swc1 $f4, 0x006C($s0) ## 0000006C -/* 005C8 809FB598 8FA4004C */ lw $a0, 0x004C($sp) -/* 005CC 809FB59C 00052C03 */ sra $a1, $a1, 16 -/* 005D0 809FB5A0 0C023938 */ jal func_8008E4E0 -/* 005D4 809FB5A4 2406000F */ addiu $a2, $zero, 0x000F ## $a2 = 0000000F -/* 005D8 809FB5A8 AE0201E0 */ sw $v0, 0x01E0($s0) ## 000001E0 -/* 005DC 809FB5AC 8FB9004C */ lw $t9, 0x004C($sp) -/* 005E0 809FB5B0 24010021 */ addiu $at, $zero, 0x0021 ## $at = 00000021 -/* 005E4 809FB5B4 3C098016 */ lui $t1, 0x8016 ## $t1 = 80160000 -/* 005E8 809FB5B8 872300A4 */ lh $v1, 0x00A4($t9) ## 000000A4 -/* 005EC 809FB5BC 10610006 */ beq $v1, $at, .L809FB5D8 -/* 005F0 809FB5C0 24010035 */ addiu $at, $zero, 0x0035 ## $at = 00000035 -/* 005F4 809FB5C4 50610013 */ beql $v1, $at, .L809FB614 -/* 005F8 809FB5C8 8602001C */ lh $v0, 0x001C($s0) ## 0000001C -/* 005FC 809FB5CC 8602001C */ lh $v0, 0x001C($s0) ## 0000001C -/* 00600 809FB5D0 10000022 */ beq $zero, $zero, .L809FB65C -/* 00604 809FB5D4 30428000 */ andi $v0, $v0, 0x8000 ## $v0 = 00000000 -.L809FB5D8: -/* 00608 809FB5D8 9129FA7C */ lbu $t1, -0x0584($t1) ## 8015FA7C -/* 0060C 809FB5DC 5520000A */ bnel $t1, $zero, .L809FB608 -/* 00610 809FB5E0 8602001C */ lh $v0, 0x001C($s0) ## 0000001C -/* 00614 809FB5E4 860A001C */ lh $t2, 0x001C($s0) ## 0000001C -/* 00618 809FB5E8 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 0061C 809FB5EC 314B0F00 */ andi $t3, $t2, 0x0F00 ## $t3 = 00000000 -/* 00620 809FB5F0 000B4203 */ sra $t0, $t3, 8 -/* 00624 809FB5F4 55010004 */ bnel $t0, $at, .L809FB608 -/* 00628 809FB5F8 8602001C */ lh $v0, 0x001C($s0) ## 0000001C -/* 0062C 809FB5FC 0C00B55C */ jal Actor_Kill - -/* 00630 809FB600 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00634 809FB604 8602001C */ lh $v0, 0x001C($s0) ## 0000001C -.L809FB608: -/* 00638 809FB608 10000014 */ beq $zero, $zero, .L809FB65C -/* 0063C 809FB60C 30428000 */ andi $v0, $v0, 0x8000 ## $v0 = 00000000 -/* 00640 809FB610 8602001C */ lh $v0, 0x001C($s0) ## 0000001C -.L809FB614: -/* 00644 809FB614 3C0C8016 */ lui $t4, 0x8016 ## $t4 = 80160000 -/* 00648 809FB618 30428000 */ andi $v0, $v0, 0x8000 ## $v0 = 00000000 -/* 0064C 809FB61C 1440000F */ bne $v0, $zero, .L809FB65C -/* 00650 809FB620 00000000 */ nop -/* 00654 809FB624 918CFA7C */ lbu $t4, -0x0584($t4) ## 8015FA7C -/* 00658 809FB628 3C0E80A0 */ lui $t6, %hi(func_809FBC6C) ## $t6 = 80A00000 -/* 0065C 809FB62C 240D0003 */ addiu $t5, $zero, 0x0003 ## $t5 = 00000003 -/* 00660 809FB630 15800006 */ bne $t4, $zero, .L809FB64C -/* 00664 809FB634 25CEBC6C */ addiu $t6, $t6, %lo(func_809FBC6C) ## $t6 = 809FBC6C -/* 00668 809FB638 44803000 */ mtc1 $zero, $f6 ## $f6 = 0.00 -/* 0066C 809FB63C A60D01F0 */ sh $t5, 0x01F0($s0) ## 000001F0 -/* 00670 809FB640 AE0E0190 */ sw $t6, 0x0190($s0) ## 00000190 -/* 00674 809FB644 10000010 */ beq $zero, $zero, .L809FB688 -/* 00678 809FB648 E6060068 */ swc1 $f6, 0x0068($s0) ## 00000068 -.L809FB64C: -/* 0067C 809FB64C 0C00B55C */ jal Actor_Kill - -/* 00680 809FB650 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00684 809FB654 1000000D */ beq $zero, $zero, .L809FB68C -/* 00688 809FB658 8FBF002C */ lw $ra, 0x002C($sp) -.L809FB65C: -/* 0068C 809FB65C 10400006 */ beq $v0, $zero, .L809FB678 -/* 00690 809FB660 24180003 */ addiu $t8, $zero, 0x0003 ## $t8 = 00000003 -/* 00694 809FB664 3C0F80A0 */ lui $t7, %hi(func_809FB940) ## $t7 = 80A00000 -/* 00698 809FB668 25EFB940 */ addiu $t7, $t7, %lo(func_809FB940) ## $t7 = 809FB940 -/* 0069C 809FB66C A60001F0 */ sh $zero, 0x01F0($s0) ## 000001F0 -/* 006A0 809FB670 10000005 */ beq $zero, $zero, .L809FB688 -/* 006A4 809FB674 AE0F0190 */ sw $t7, 0x0190($s0) ## 00000190 -.L809FB678: -/* 006A8 809FB678 3C1980A0 */ lui $t9, %hi(func_809FB858) ## $t9 = 80A00000 -/* 006AC 809FB67C 2739B858 */ addiu $t9, $t9, %lo(func_809FB858) ## $t9 = 809FB858 -/* 006B0 809FB680 A61801F0 */ sh $t8, 0x01F0($s0) ## 000001F0 -/* 006B4 809FB684 AE190190 */ sw $t9, 0x0190($s0) ## 00000190 -.L809FB688: -/* 006B8 809FB688 8FBF002C */ lw $ra, 0x002C($sp) -.L809FB68C: -/* 006BC 809FB68C 8FB00028 */ lw $s0, 0x0028($sp) -/* 006C0 809FB690 27BD0048 */ addiu $sp, $sp, 0x0048 ## $sp = 00000000 -/* 006C4 809FB694 03E00008 */ jr $ra -/* 006C8 809FB698 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dog/EnDog_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Dog/EnDog_Update.s deleted file mode 100644 index 4d107716d6..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Dog/EnDog_Update.s +++ /dev/null @@ -1,57 +0,0 @@ -glabel EnDog_Update -/* 00CF4 809FBCC4 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 00CF8 809FBCC8 AFBF0024 */ sw $ra, 0x0024($sp) -/* 00CFC 809FBCCC AFB00020 */ sw $s0, 0x0020($sp) -/* 00D00 809FBCD0 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00D04 809FBCD4 0C27EC42 */ jal func_809FB108 -/* 00D08 809FBCD8 AFA5003C */ sw $a1, 0x003C($sp) -/* 00D0C 809FBCDC 0C02927F */ jal SkelAnime_FrameUpdateMatrix - -/* 00D10 809FBCE0 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C -/* 00D14 809FBCE4 860F01D6 */ lh $t7, 0x01D6($s0) ## 000001D6 -/* 00D18 809FBCE8 860E01D4 */ lh $t6, 0x01D4($s0) ## 000001D4 -/* 00D1C 809FBCEC 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 -/* 00D20 809FBCF0 448F3000 */ mtc1 $t7, $f6 ## $f6 = 0.00 -/* 00D24 809FBCF4 44815000 */ mtc1 $at, $f10 ## $f10 = 0.50 -/* 00D28 809FBCF8 448E2000 */ mtc1 $t6, $f4 ## $f4 = 0.00 -/* 00D2C 809FBCFC 46803220 */ cvt.s.w $f8, $f6 -/* 00D30 809FBD00 44809000 */ mtc1 $zero, $f18 ## $f18 = 0.00 -/* 00D34 809FBD04 24180005 */ addiu $t8, $zero, 0x0005 ## $t8 = 00000005 -/* 00D38 809FBD08 AFB80014 */ sw $t8, 0x0014($sp) -/* 00D3C 809FBD0C 8FA4003C */ lw $a0, 0x003C($sp) -/* 00D40 809FBD10 46802120 */ cvt.s.w $f4, $f4 -/* 00D44 809FBD14 460A4402 */ mul.s $f16, $f8, $f10 -/* 00D48 809FBD18 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 00D4C 809FBD1C E7B20010 */ swc1 $f18, 0x0010($sp) -/* 00D50 809FBD20 44062000 */ mfc1 $a2, $f4 -/* 00D54 809FBD24 44078000 */ mfc1 $a3, $f16 -/* 00D58 809FBD28 0C00B92D */ jal func_8002E4B4 -/* 00D5C 809FBD2C 00000000 */ nop -/* 00D60 809FBD30 0C00B638 */ jal Actor_MoveForward - -/* 00D64 809FBD34 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00D68 809FBD38 8E190190 */ lw $t9, 0x0190($s0) ## 00000190 -/* 00D6C 809FBD3C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00D70 809FBD40 8FA5003C */ lw $a1, 0x003C($sp) -/* 00D74 809FBD44 0320F809 */ jalr $ra, $t9 -/* 00D78 809FBD48 00000000 */ nop -/* 00D7C 809FBD4C 26060194 */ addiu $a2, $s0, 0x0194 ## $a2 = 00000194 -/* 00D80 809FBD50 00C02825 */ or $a1, $a2, $zero ## $a1 = 00000194 -/* 00D84 809FBD54 AFA6002C */ sw $a2, 0x002C($sp) -/* 00D88 809FBD58 0C0189B7 */ jal ActorCollider_Cylinder_Update - -/* 00D8C 809FBD5C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00D90 809FBD60 8FA4003C */ lw $a0, 0x003C($sp) -/* 00D94 809FBD64 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 00D98 809FBD68 34211E60 */ ori $at, $at, 0x1E60 ## $at = 00011E60 -/* 00D9C 809FBD6C 8FA6002C */ lw $a2, 0x002C($sp) -/* 00DA0 809FBD70 0C017713 */ jal Actor_CollisionCheck_SetOT - ## CollisionCheck_setOT -/* 00DA4 809FBD74 00812821 */ addu $a1, $a0, $at -/* 00DA8 809FBD78 8FBF0024 */ lw $ra, 0x0024($sp) -/* 00DAC 809FBD7C 8FB00020 */ lw $s0, 0x0020($sp) -/* 00DB0 809FBD80 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 -/* 00DB4 809FBD84 03E00008 */ jr $ra -/* 00DB8 809FBD88 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dog/func_809FAFD0.s b/asm/non_matchings/overlays/actors/ovl_En_Dog/func_809FAFD0.s deleted file mode 100644 index 7002666548..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Dog/func_809FAFD0.s +++ /dev/null @@ -1,33 +0,0 @@ -glabel func_809FAFD0 -/* 00000 809FAFD0 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00004 809FAFD4 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00008 809FAFD8 8C8F0154 */ lw $t7, 0x0154($a0) ## 00000154 -/* 0000C 809FAFDC 3C0E0600 */ lui $t6, 0x0600 ## $t6 = 06000000 -/* 00010 809FAFE0 25CE1368 */ addiu $t6, $t6, 0x1368 ## $t6 = 06001368 -/* 00014 809FAFE4 15CF0010 */ bne $t6, $t7, .L809FB028 -/* 00018 809FAFE8 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 0001C 809FAFEC C4800164 */ lwc1 $f0, 0x0164($a0) ## 00000164 -/* 00020 809FAFF0 44812000 */ mtc1 $at, $f4 ## $f4 = 1.00 -/* 00024 809FAFF4 3C0140E0 */ lui $at, 0x40E0 ## $at = 40E00000 -/* 00028 809FAFF8 46002032 */ c.eq.s $f4, $f0 -/* 0002C 809FAFFC 00000000 */ nop -/* 00030 809FB000 45010007 */ bc1t .L809FB020 -/* 00034 809FB004 00000000 */ nop -/* 00038 809FB008 44813000 */ mtc1 $at, $f6 ## $f6 = 7.00 -/* 0003C 809FB00C 00000000 */ nop -/* 00040 809FB010 46003032 */ c.eq.s $f6, $f0 -/* 00044 809FB014 00000000 */ nop -/* 00048 809FB018 45020004 */ bc1fl .L809FB02C -/* 0004C 809FB01C 8FBF0014 */ lw $ra, 0x0014($sp) -.L809FB020: -/* 00050 809FB020 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 00054 809FB024 240528EF */ addiu $a1, $zero, 0x28EF ## $a1 = 000028EF -.L809FB028: -/* 00058 809FB028 8FBF0014 */ lw $ra, 0x0014($sp) -.L809FB02C: -/* 0005C 809FB02C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00060 809FB030 03E00008 */ jr $ra -/* 00064 809FB034 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dog/func_809FB038.s b/asm/non_matchings/overlays/actors/ovl_En_Dog/func_809FB038.s deleted file mode 100644 index 5d30f37616..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Dog/func_809FB038.s +++ /dev/null @@ -1,33 +0,0 @@ -glabel func_809FB038 -/* 00068 809FB038 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 0006C 809FB03C AFBF0014 */ sw $ra, 0x0014($sp) -/* 00070 809FB040 8C8F0154 */ lw $t7, 0x0154($a0) ## 00000154 -/* 00074 809FB044 3C0E0600 */ lui $t6, 0x0600 ## $t6 = 06000000 -/* 00078 809FB048 25CE0D78 */ addiu $t6, $t6, 0x0D78 ## $t6 = 06000D78 -/* 0007C 809FB04C 15CF0010 */ bne $t6, $t7, .L809FB090 -/* 00080 809FB050 3C014000 */ lui $at, 0x4000 ## $at = 40000000 -/* 00084 809FB054 C4800164 */ lwc1 $f0, 0x0164($a0) ## 00000164 -/* 00088 809FB058 44812000 */ mtc1 $at, $f4 ## $f4 = 2.00 -/* 0008C 809FB05C 3C014080 */ lui $at, 0x4080 ## $at = 40800000 -/* 00090 809FB060 46002032 */ c.eq.s $f4, $f0 -/* 00094 809FB064 00000000 */ nop -/* 00098 809FB068 45010007 */ bc1t .L809FB088 -/* 0009C 809FB06C 00000000 */ nop -/* 000A0 809FB070 44813000 */ mtc1 $at, $f6 ## $f6 = 4.00 -/* 000A4 809FB074 00000000 */ nop -/* 000A8 809FB078 46003032 */ c.eq.s $f6, $f0 -/* 000AC 809FB07C 00000000 */ nop -/* 000B0 809FB080 45020004 */ bc1fl .L809FB094 -/* 000B4 809FB084 8FBF0014 */ lw $ra, 0x0014($sp) -.L809FB088: -/* 000B8 809FB088 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 000BC 809FB08C 240528EF */ addiu $a1, $zero, 0x28EF ## $a1 = 000028EF -.L809FB090: -/* 000C0 809FB090 8FBF0014 */ lw $ra, 0x0014($sp) -.L809FB094: -/* 000C4 809FB094 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 000C8 809FB098 03E00008 */ jr $ra -/* 000CC 809FB09C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dog/func_809FB0A0.s b/asm/non_matchings/overlays/actors/ovl_En_Dog/func_809FB0A0.s deleted file mode 100644 index 741dcf0e3c..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Dog/func_809FB0A0.s +++ /dev/null @@ -1,33 +0,0 @@ -glabel func_809FB0A0 -/* 000D0 809FB0A0 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 000D4 809FB0A4 AFBF0014 */ sw $ra, 0x0014($sp) -/* 000D8 809FB0A8 8C8F0154 */ lw $t7, 0x0154($a0) ## 00000154 -/* 000DC 809FB0AC 3C0E0600 */ lui $t6, 0x0600 ## $t6 = 06000000 -/* 000E0 809FB0B0 25CE0278 */ addiu $t6, $t6, 0x0278 ## $t6 = 06000278 -/* 000E4 809FB0B4 15CF0010 */ bne $t6, $t7, .L809FB0F8 -/* 000E8 809FB0B8 3C014150 */ lui $at, 0x4150 ## $at = 41500000 -/* 000EC 809FB0BC C4800164 */ lwc1 $f0, 0x0164($a0) ## 00000164 -/* 000F0 809FB0C0 44812000 */ mtc1 $at, $f4 ## $f4 = 13.00 -/* 000F4 809FB0C4 3C014198 */ lui $at, 0x4198 ## $at = 41980000 -/* 000F8 809FB0C8 46002032 */ c.eq.s $f4, $f0 -/* 000FC 809FB0CC 00000000 */ nop -/* 00100 809FB0D0 45010007 */ bc1t .L809FB0F0 -/* 00104 809FB0D4 00000000 */ nop -/* 00108 809FB0D8 44813000 */ mtc1 $at, $f6 ## $f6 = 19.00 -/* 0010C 809FB0DC 00000000 */ nop -/* 00110 809FB0E0 46003032 */ c.eq.s $f6, $f0 -/* 00114 809FB0E4 00000000 */ nop -/* 00118 809FB0E8 45020004 */ bc1fl .L809FB0FC -/* 0011C 809FB0EC 8FBF0014 */ lw $ra, 0x0014($sp) -.L809FB0F0: -/* 00120 809FB0F0 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 00124 809FB0F4 240528D8 */ addiu $a1, $zero, 0x28D8 ## $a1 = 000028D8 -.L809FB0F8: -/* 00128 809FB0F8 8FBF0014 */ lw $ra, 0x0014($sp) -.L809FB0FC: -/* 0012C 809FB0FC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00130 809FB100 03E00008 */ jr $ra -/* 00134 809FB104 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dog/func_809FB108.s b/asm/non_matchings/overlays/actors/ovl_En_Dog/func_809FB108.s deleted file mode 100644 index 4c9e5ebf2a..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Dog/func_809FB108.s +++ /dev/null @@ -1,122 +0,0 @@ -glabel func_809FB108 -/* 00138 809FB108 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 0013C 809FB10C AFBF001C */ sw $ra, 0x001C($sp) -/* 00140 809FB110 AFB00018 */ sw $s0, 0x0018($sp) -/* 00144 809FB114 848301F2 */ lh $v1, 0x01F2($a0) ## 000001F2 -/* 00148 809FB118 848201F0 */ lh $v0, 0x01F0($a0) ## 000001F0 -/* 0014C 809FB11C 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00150 809FB120 24010004 */ addiu $at, $zero, 0x0004 ## $at = 00000004 -/* 00154 809FB124 50430029 */ beql $v0, $v1, .L809FB1CC -/* 00158 809FB128 2C610006 */ sltiu $at, $v1, 0x0006 -/* 0015C 809FB12C 14410003 */ bne $v0, $at, .L809FB13C -/* 00160 809FB130 240E0003 */ addiu $t6, $zero, 0x0003 ## $t6 = 00000003 -/* 00164 809FB134 A48E01F0 */ sh $t6, 0x01F0($a0) ## 000001F0 -/* 00168 809FB138 848201F0 */ lh $v0, 0x01F0($a0) ## 000001F0 -.L809FB13C: -/* 0016C 809FB13C 24010006 */ addiu $at, $zero, 0x0006 ## $at = 00000006 -/* 00170 809FB140 14410003 */ bne $v0, $at, .L809FB150 -/* 00174 809FB144 240F0005 */ addiu $t7, $zero, 0x0005 ## $t7 = 00000005 -/* 00178 809FB148 A60F01F0 */ sh $t7, 0x01F0($s0) ## 000001F0 -/* 0017C 809FB14C 860201F0 */ lh $v0, 0x01F0($s0) ## 000001F0 -.L809FB150: -/* 00180 809FB150 3058FFFF */ andi $t8, $v0, 0xFFFF ## $t8 = 00000000 -/* 00184 809FB154 2F010006 */ sltiu $at, $t8, 0x0006 -/* 00188 809FB158 10200015 */ beq $at, $zero, .L809FB1B0 -/* 0018C 809FB15C A60201F2 */ sh $v0, 0x01F2($s0) ## 000001F2 -/* 00190 809FB160 0018C080 */ sll $t8, $t8, 2 -/* 00194 809FB164 3C0180A0 */ lui $at, %hi(jtbl_809FC050) ## $at = 80A00000 -/* 00198 809FB168 00380821 */ addu $at, $at, $t8 -/* 0019C 809FB16C 8C38C050 */ lw $t8, %lo(jtbl_809FC050)($at) -/* 001A0 809FB170 03000008 */ jr $t8 -/* 001A4 809FB174 00000000 */ nop -glabel L809FB178 -/* 001A8 809FB178 24190001 */ addiu $t9, $zero, 0x0001 ## $t9 = 00000001 -/* 001AC 809FB17C 1000000C */ beq $zero, $zero, .L809FB1B0 -/* 001B0 809FB180 AFB90024 */ sw $t9, 0x0024($sp) -glabel L809FB184 -/* 001B4 809FB184 24080002 */ addiu $t0, $zero, 0x0002 ## $t0 = 00000002 -/* 001B8 809FB188 10000009 */ beq $zero, $zero, .L809FB1B0 -/* 001BC 809FB18C AFA80024 */ sw $t0, 0x0024($sp) -glabel L809FB190 -/* 001C0 809FB190 24090003 */ addiu $t1, $zero, 0x0003 ## $t1 = 00000003 -/* 001C4 809FB194 10000006 */ beq $zero, $zero, .L809FB1B0 -/* 001C8 809FB198 AFA90024 */ sw $t1, 0x0024($sp) -glabel L809FB19C -/* 001CC 809FB19C 240A0004 */ addiu $t2, $zero, 0x0004 ## $t2 = 00000004 -/* 001D0 809FB1A0 10000003 */ beq $zero, $zero, .L809FB1B0 -/* 001D4 809FB1A4 AFAA0024 */ sw $t2, 0x0024($sp) -glabel L809FB1A8 -/* 001D8 809FB1A8 240B0006 */ addiu $t3, $zero, 0x0006 ## $t3 = 00000006 -/* 001DC 809FB1AC AFAB0024 */ sw $t3, 0x0024($sp) -glabel L809FB1B0 -.L809FB1B0: -/* 001E0 809FB1B0 3C0580A0 */ lui $a1, %hi(D_809FBF48) ## $a1 = 80A00000 -/* 001E4 809FB1B4 24A5BF48 */ addiu $a1, $a1, %lo(D_809FBF48) ## $a1 = 809FBF48 -/* 001E8 809FB1B8 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C -/* 001EC 809FB1BC 0C00D3B0 */ jal func_80034EC0 -/* 001F0 809FB1C0 8FA60024 */ lw $a2, 0x0024($sp) -/* 001F4 809FB1C4 860301F2 */ lh $v1, 0x01F2($s0) ## 000001F2 -/* 001F8 809FB1C8 2C610006 */ sltiu $at, $v1, 0x0006 -.L809FB1CC: -/* 001FC 809FB1CC 1020002E */ beq $at, $zero, .L809FB288 -/* 00200 809FB1D0 00036080 */ sll $t4, $v1, 2 -/* 00204 809FB1D4 3C0180A0 */ lui $at, %hi(jtbl_809FC068) ## $at = 80A00000 -/* 00208 809FB1D8 002C0821 */ addu $at, $at, $t4 -/* 0020C 809FB1DC 8C2CC068 */ lw $t4, %lo(jtbl_809FC068)($at) -/* 00210 809FB1E0 01800008 */ jr $t4 -/* 00214 809FB1E4 00000000 */ nop -glabel L809FB1E8 -/* 00218 809FB1E8 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C -/* 0021C 809FB1EC 8E05015C */ lw $a1, 0x015C($s0) ## 0000015C -/* 00220 809FB1F0 0C0295B2 */ jal func_800A56C8 -/* 00224 809FB1F4 AFA40020 */ sw $a0, 0x0020($sp) -/* 00228 809FB1F8 10400023 */ beq $v0, $zero, .L809FB288 -/* 0022C 809FB1FC 8FA40020 */ lw $a0, 0x0020($sp) -/* 00230 809FB200 3C0580A0 */ lui $a1, %hi(D_809FBF48) ## $a1 = 80A00000 -/* 00234 809FB204 24A5BF48 */ addiu $a1, $a1, %lo(D_809FBF48) ## $a1 = 809FBF48 -/* 00238 809FB208 0C00D3B0 */ jal func_80034EC0 -/* 0023C 809FB20C 24060005 */ addiu $a2, $zero, 0x0005 ## $a2 = 00000005 -/* 00240 809FB210 240D0004 */ addiu $t5, $zero, 0x0004 ## $t5 = 00000004 -/* 00244 809FB214 A60D01F0 */ sh $t5, 0x01F0($s0) ## 000001F0 -/* 00248 809FB218 860E01F0 */ lh $t6, 0x01F0($s0) ## 000001F0 -/* 0024C 809FB21C 1000001A */ beq $zero, $zero, .L809FB288 -/* 00250 809FB220 A60E01F2 */ sh $t6, 0x01F2($s0) ## 000001F2 -glabel L809FB224 -/* 00254 809FB224 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C -/* 00258 809FB228 8E05015C */ lw $a1, 0x015C($s0) ## 0000015C -/* 0025C 809FB22C 0C0295B2 */ jal func_800A56C8 -/* 00260 809FB230 AFA40020 */ sw $a0, 0x0020($sp) -/* 00264 809FB234 10400014 */ beq $v0, $zero, .L809FB288 -/* 00268 809FB238 8FA40020 */ lw $a0, 0x0020($sp) -/* 0026C 809FB23C 3C0580A0 */ lui $a1, %hi(D_809FBF48) ## $a1 = 80A00000 -/* 00270 809FB240 24A5BF48 */ addiu $a1, $a1, %lo(D_809FBF48) ## $a1 = 809FBF48 -/* 00274 809FB244 0C00D3B0 */ jal func_80034EC0 -/* 00278 809FB248 24060007 */ addiu $a2, $zero, 0x0007 ## $a2 = 00000007 -/* 0027C 809FB24C 240F0006 */ addiu $t7, $zero, 0x0006 ## $t7 = 00000006 -/* 00280 809FB250 A60F01F0 */ sh $t7, 0x01F0($s0) ## 000001F0 -/* 00284 809FB254 861801F0 */ lh $t8, 0x01F0($s0) ## 000001F0 -/* 00288 809FB258 1000000B */ beq $zero, $zero, .L809FB288 -/* 0028C 809FB25C A61801F2 */ sh $t8, 0x01F2($s0) ## 000001F2 -glabel L809FB260 -/* 00290 809FB260 0C27EBF4 */ jal func_809FAFD0 -/* 00294 809FB264 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00298 809FB268 10000008 */ beq $zero, $zero, .L809FB28C -/* 0029C 809FB26C 8FBF001C */ lw $ra, 0x001C($sp) -glabel L809FB270 -/* 002A0 809FB270 0C27EC0E */ jal func_809FB038 -/* 002A4 809FB274 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 002A8 809FB278 10000004 */ beq $zero, $zero, .L809FB28C -/* 002AC 809FB27C 8FBF001C */ lw $ra, 0x001C($sp) -glabel L809FB280 -/* 002B0 809FB280 0C27EC28 */ jal func_809FB0A0 -/* 002B4 809FB284 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -glabel L809FB288 -.L809FB288: -/* 002B8 809FB288 8FBF001C */ lw $ra, 0x001C($sp) -.L809FB28C: -/* 002BC 809FB28C 8FB00018 */ lw $s0, 0x0018($sp) -/* 002C0 809FB290 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 002C4 809FB294 03E00008 */ jr $ra -/* 002C8 809FB298 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dog/func_809FB29C.s b/asm/non_matchings/overlays/actors/ovl_En_Dog/func_809FB29C.s deleted file mode 100644 index edddd5a147..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Dog/func_809FB29C.s +++ /dev/null @@ -1,42 +0,0 @@ -glabel func_809FB29C -/* 002CC 809FB29C 908301A5 */ lbu $v1, 0x01A5($a0) ## 000001A5 -/* 002D0 809FB2A0 24020002 */ addiu $v0, $zero, 0x0002 ## $v0 = 00000002 -/* 002D4 809FB2A4 306E0002 */ andi $t6, $v1, 0x0002 ## $t6 = 00000000 -/* 002D8 809FB2A8 11C00003 */ beq $t6, $zero, .L809FB2B8 -/* 002DC 809FB2AC 306FFFFD */ andi $t7, $v1, 0xFFFD ## $t7 = 00000000 -/* 002E0 809FB2B0 03E00008 */ jr $ra -/* 002E4 809FB2B4 A08F01A5 */ sb $t7, 0x01A5($a0) ## 000001A5 -.L809FB2B8: -/* 002E8 809FB2B8 84B800A4 */ lh $t8, 0x00A4($a1) ## 000000A4 -/* 002EC 809FB2BC 24010020 */ addiu $at, $zero, 0x0020 ## $at = 00000020 -/* 002F0 809FB2C0 57010004 */ bnel $t8, $at, .L809FB2D4 -/* 002F4 809FB2C4 908201A7 */ lbu $v0, 0x01A7($a0) ## 000001A7 -/* 002F8 809FB2C8 03E00008 */ jr $ra -/* 002FC 809FB2CC 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -.L809FB2D0: -/* 00300 809FB2D0 908201A7 */ lbu $v0, 0x01A7($a0) ## 000001A7 -.L809FB2D4: -/* 00304 809FB2D4 3C038016 */ lui $v1, 0x8016 ## $v1 = 80160000 -/* 00308 809FB2D8 2463E660 */ addiu $v1, $v1, 0xE660 ## $v1 = 8015E660 -/* 0030C 809FB2DC 30590001 */ andi $t9, $v0, 0x0001 ## $t9 = 00000000 -/* 00310 809FB2E0 1320000C */ beq $t9, $zero, .L809FB314 -/* 00314 809FB2E4 3048FFFE */ andi $t0, $v0, 0xFFFE ## $t0 = 00000000 -/* 00318 809FB2E8 A08801A7 */ sb $t0, 0x01A7($a0) ## 000001A7 -/* 0031C 809FB2EC 846913C4 */ lh $t1, 0x13C4($v1) ## 8015FA24 -/* 00320 809FB2F0 51200004 */ beql $t1, $zero, .L809FB304 -/* 00324 809FB2F4 848A001C */ lh $t2, 0x001C($a0) ## 0000001C -/* 00328 809FB2F8 03E00008 */ jr $ra -/* 0032C 809FB2FC 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -.L809FB300: -/* 00330 809FB300 848A001C */ lh $t2, 0x001C($a0) ## 0000001C -.L809FB304: -/* 00334 809FB304 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -/* 00338 809FB308 314B7FFF */ andi $t3, $t2, 0x7FFF ## $t3 = 00000000 -/* 0033C 809FB30C 03E00008 */ jr $ra -/* 00340 809FB310 A46B13C4 */ sh $t3, 0x13C4($v1) ## 8015FA24 -.L809FB314: -/* 00344 809FB314 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 00348 809FB318 03E00008 */ jr $ra -/* 0034C 809FB31C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dog/func_809FB320.s b/asm/non_matchings/overlays/actors/ovl_En_Dog/func_809FB320.s deleted file mode 100644 index 7cc95a07d6..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Dog/func_809FB320.s +++ /dev/null @@ -1,44 +0,0 @@ -glabel func_809FB320 -/* 00350 809FB320 AFA50004 */ sw $a1, 0x0004($sp) -/* 00354 809FB324 8C8E01E0 */ lw $t6, 0x01E0($a0) ## 000001E0 -/* 00358 809FB328 55C00004 */ bnel $t6, $zero, .L809FB33C -/* 0035C 809FB32C 908201E4 */ lbu $v0, 0x01E4($a0) ## 000001E4 -/* 00360 809FB330 03E00008 */ jr $ra -/* 00364 809FB334 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -.L809FB338: -/* 00368 809FB338 908201E4 */ lbu $v0, 0x01E4($a0) ## 000001E4 -.L809FB33C: -/* 0036C 809FB33C 24030001 */ addiu $v1, $zero, 0x0001 ## $v1 = 00000001 -/* 00370 809FB340 10400003 */ beq $v0, $zero, .L809FB350 -/* 00374 809FB344 00000000 */ nop -/* 00378 809FB348 10000001 */ beq $zero, $zero, .L809FB350 -/* 0037C 809FB34C 2403FFFF */ addiu $v1, $zero, 0xFFFF ## $v1 = FFFFFFFF -.L809FB350: -/* 00380 809FB350 848F01E6 */ lh $t7, 0x01E6($a0) ## 000001E6 -/* 00384 809FB354 01E3C021 */ addu $t8, $t7, $v1 -/* 00388 809FB358 10400009 */ beq $v0, $zero, .L809FB380 -/* 0038C 809FB35C A49801E6 */ sh $t8, 0x01E6($a0) ## 000001E6 -/* 00390 809FB360 849901E6 */ lh $t9, 0x01E6($a0) ## 000001E6 -/* 00394 809FB364 0723000F */ bgezl $t9, .L809FB3A4 -/* 00398 809FB368 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -/* 0039C 809FB36C 8C8801E0 */ lw $t0, 0x01E0($a0) ## 000001E0 -/* 003A0 809FB370 91090000 */ lbu $t1, 0x0000($t0) ## 00000000 -/* 003A4 809FB374 252AFFFF */ addiu $t2, $t1, 0xFFFF ## $t2 = FFFFFFFF -/* 003A8 809FB378 10000009 */ beq $zero, $zero, .L809FB3A0 -/* 003AC 809FB37C A48A01E6 */ sh $t2, 0x01E6($a0) ## 000001E6 -.L809FB380: -/* 003B0 809FB380 8C8C01E0 */ lw $t4, 0x01E0($a0) ## 000001E0 -/* 003B4 809FB384 848B01E6 */ lh $t3, 0x01E6($a0) ## 000001E6 -/* 003B8 809FB388 918D0000 */ lbu $t5, 0x0000($t4) ## 00000000 -/* 003BC 809FB38C 25AEFFFF */ addiu $t6, $t5, 0xFFFF ## $t6 = FFFFFFFF -/* 003C0 809FB390 01CB082A */ slt $at, $t6, $t3 -/* 003C4 809FB394 50200003 */ beql $at, $zero, .L809FB3A4 -/* 003C8 809FB398 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -/* 003CC 809FB39C A48001E6 */ sh $zero, 0x01E6($a0) ## 000001E6 -.L809FB3A0: -/* 003D0 809FB3A0 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -.L809FB3A4: -/* 003D4 809FB3A4 03E00008 */ jr $ra -/* 003D8 809FB3A8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dog/func_809FB3AC.s b/asm/non_matchings/overlays/actors/ovl_En_Dog/func_809FB3AC.s deleted file mode 100644 index 8c0209f238..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Dog/func_809FB3AC.s +++ /dev/null @@ -1,46 +0,0 @@ -glabel func_809FB3AC -/* 003DC 809FB3AC 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 003E0 809FB3B0 AFBF0024 */ sw $ra, 0x0024($sp) -/* 003E4 809FB3B4 AFB00020 */ sw $s0, 0x0020($sp) -/* 003E8 809FB3B8 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 003EC 809FB3BC AFA50034 */ sw $a1, 0x0034($sp) -/* 003F0 809FB3C0 860601E6 */ lh $a2, 0x01E6($s0) ## 000001E6 -/* 003F4 809FB3C4 8E0501E0 */ lw $a1, 0x01E0($s0) ## 000001E0 -/* 003F8 809FB3C8 0C023948 */ jal func_8008E520 -/* 003FC 809FB3CC 27A7002E */ addiu $a3, $sp, 0x002E ## $a3 = FFFFFFFE -/* 00400 809FB3D0 240E0001 */ addiu $t6, $zero, 0x0001 ## $t6 = 00000001 -/* 00404 809FB3D4 AFAE0010 */ sw $t6, 0x0010($sp) -/* 00408 809FB3D8 26040032 */ addiu $a0, $s0, 0x0032 ## $a0 = 00000032 -/* 0040C 809FB3DC 87A5002E */ lh $a1, 0x002E($sp) -/* 00410 809FB3E0 2406000A */ addiu $a2, $zero, 0x000A ## $a2 = 0000000A -/* 00414 809FB3E4 240703E8 */ addiu $a3, $zero, 0x03E8 ## $a3 = 000003E8 -/* 00418 809FB3E8 0C01E1A7 */ jal Math_SmoothScaleMaxMinS - -/* 0041C 809FB3EC E7A00028 */ swc1 $f0, 0x0028($sp) -/* 00420 809FB3F0 C7A20028 */ lwc1 $f2, 0x0028($sp) -/* 00424 809FB3F4 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 -/* 00428 809FB3F8 3C01447A */ lui $at, 0x447A ## $at = 447A0000 -/* 0042C 809FB3FC 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 00430 809FB400 4602203C */ c.lt.s $f4, $f2 -/* 00434 809FB404 00000000 */ nop -/* 00438 809FB408 4500000B */ bc1f .L809FB438 -/* 0043C 809FB40C 00000000 */ nop -/* 00440 809FB410 44813000 */ mtc1 $at, $f6 ## $f6 = 1000.00 -/* 00444 809FB414 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00448 809FB418 4606103C */ c.lt.s $f2, $f6 -/* 0044C 809FB41C 00000000 */ nop -/* 00450 809FB420 45000005 */ bc1f .L809FB438 -/* 00454 809FB424 00000000 */ nop -/* 00458 809FB428 0C27ECC8 */ jal func_809FB320 -/* 0045C 809FB42C 8FA50034 */ lw $a1, 0x0034($sp) -/* 00460 809FB430 10000002 */ beq $zero, $zero, .L809FB43C -/* 00464 809FB434 8FBF0024 */ lw $ra, 0x0024($sp) -.L809FB438: -/* 00468 809FB438 8FBF0024 */ lw $ra, 0x0024($sp) -.L809FB43C: -/* 0046C 809FB43C 8FB00020 */ lw $s0, 0x0020($sp) -/* 00470 809FB440 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 00474 809FB444 03E00008 */ jr $ra -/* 00478 809FB448 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dog/func_809FB6C4.s b/asm/non_matchings/overlays/actors/ovl_En_Dog/func_809FB6C4.s deleted file mode 100644 index f9edc470b3..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Dog/func_809FB6C4.s +++ /dev/null @@ -1,114 +0,0 @@ -glabel func_809FB6C4 -/* 006F4 809FB6C4 27BDFFB0 */ addiu $sp, $sp, 0xFFB0 ## $sp = FFFFFFB0 -/* 006F8 809FB6C8 3C0F80A0 */ lui $t7, %hi(D_809FC008) ## $t7 = 80A00000 -/* 006FC 809FB6CC AFBF0024 */ sw $ra, 0x0024($sp) -/* 00700 809FB6D0 AFB00020 */ sw $s0, 0x0020($sp) -/* 00704 809FB6D4 AFA50054 */ sw $a1, 0x0054($sp) -/* 00708 809FB6D8 25EFC008 */ addiu $t7, $t7, %lo(D_809FC008) ## $t7 = 809FC008 -/* 0070C 809FB6DC 8DF90000 */ lw $t9, 0x0000($t7) ## 809FC008 -/* 00710 809FB6E0 27AE0044 */ addiu $t6, $sp, 0x0044 ## $t6 = FFFFFFF4 -/* 00714 809FB6E4 8DF80004 */ lw $t8, 0x0004($t7) ## 809FC00C -/* 00718 809FB6E8 ADD90000 */ sw $t9, 0x0000($t6) ## FFFFFFF4 -/* 0071C 809FB6EC 8DF90008 */ lw $t9, 0x0008($t7) ## 809FC010 -/* 00720 809FB6F0 3C0980A0 */ lui $t1, %hi(D_809FC014) ## $t1 = 80A00000 -/* 00724 809FB6F4 2529C014 */ addiu $t1, $t1, %lo(D_809FC014) ## $t1 = 809FC014 -/* 00728 809FB6F8 ADD80004 */ sw $t8, 0x0004($t6) ## FFFFFFF8 -/* 0072C 809FB6FC ADD90008 */ sw $t9, 0x0008($t6) ## FFFFFFFC -/* 00730 809FB700 8D2B0000 */ lw $t3, 0x0000($t1) ## 809FC014 -/* 00734 809FB704 27A80038 */ addiu $t0, $sp, 0x0038 ## $t0 = FFFFFFE8 -/* 00738 809FB708 8D2A0004 */ lw $t2, 0x0004($t1) ## 809FC018 -/* 0073C 809FB70C AD0B0000 */ sw $t3, 0x0000($t0) ## FFFFFFE8 -/* 00740 809FB710 8D2B0008 */ lw $t3, 0x0008($t1) ## 809FC01C -/* 00744 809FB714 AD0A0004 */ sw $t2, 0x0004($t0) ## FFFFFFEC -/* 00748 809FB718 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 0074C 809FB71C AD0B0008 */ sw $t3, 0x0008($t0) ## FFFFFFF0 -/* 00750 809FB720 0C27ECA7 */ jal func_809FB29C -/* 00754 809FB724 8FA50054 */ lw $a1, 0x0054($sp) -/* 00758 809FB728 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 0075C 809FB72C 14410003 */ bne $v0, $at, .L809FB73C -/* 00760 809FB730 3C0C80A0 */ lui $t4, %hi(func_809FB940) ## $t4 = 80A00000 -/* 00764 809FB734 258CB940 */ addiu $t4, $t4, %lo(func_809FB940) ## $t4 = 809FB940 -/* 00768 809FB738 AE0C0190 */ sw $t4, 0x0190($s0) ## 00000190 -.L809FB73C: -/* 0076C 809FB73C 860201EC */ lh $v0, 0x01EC($s0) ## 000001EC -/* 00770 809FB740 26040068 */ addiu $a0, $s0, 0x0068 ## $a0 = 00000068 -/* 00774 809FB744 3C063ECC */ lui $a2, 0x3ECC ## $a2 = 3ECC0000 -/* 00778 809FB748 14400003 */ bne $v0, $zero, .L809FB758 -/* 0077C 809FB74C 244DFFFF */ addiu $t5, $v0, 0xFFFF ## $t5 = FFFFFFFF -/* 00780 809FB750 10000003 */ beq $zero, $zero, .L809FB760 -/* 00784 809FB754 00001825 */ or $v1, $zero, $zero ## $v1 = 00000000 -.L809FB758: -/* 00788 809FB758 A60D01EC */ sh $t5, 0x01EC($s0) ## 000001EC -/* 0078C 809FB75C 860301EC */ lh $v1, 0x01EC($s0) ## 000001EC -.L809FB760: -/* 00790 809FB760 10600028 */ beq $v1, $zero, .L809FB804 -/* 00794 809FB764 8FAC0054 */ lw $t4, 0x0054($sp) -/* 00798 809FB768 860E01F0 */ lh $t6, 0x01F0($s0) ## 000001F0 -/* 0079C 809FB76C 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 -/* 007A0 809FB770 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3ECCCCCD -/* 007A4 809FB774 15C00005 */ bne $t6, $zero, .L809FB78C -/* 007A8 809FB778 3C073F80 */ lui $a3, 0x3F80 ## $a3 = 3F800000 -/* 007AC 809FB77C 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 007B0 809FB780 44810000 */ mtc1 $at, $f0 ## $f0 = 1.00 -/* 007B4 809FB784 10000005 */ beq $zero, $zero, .L809FB79C -/* 007B8 809FB788 44050000 */ mfc1 $a1, $f0 -.L809FB78C: -/* 007BC 809FB78C 3C014080 */ lui $at, 0x4080 ## $at = 40800000 -/* 007C0 809FB790 44810000 */ mtc1 $at, $f0 ## $f0 = 4.00 -/* 007C4 809FB794 00000000 */ nop -/* 007C8 809FB798 44050000 */ mfc1 $a1, $f0 -.L809FB79C: -/* 007CC 809FB79C 0C01E0C4 */ jal Math_SmoothScaleMaxMinF - -/* 007D0 809FB7A0 E7A40010 */ swc1 $f4, 0x0010($sp) -/* 007D4 809FB7A4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 007D8 809FB7A8 0C27ECEB */ jal func_809FB3AC -/* 007DC 809FB7AC 8FA50054 */ lw $a1, 0x0054($sp) -/* 007E0 809FB7B0 8A180030 */ lwl $t8, 0x0030($s0) ## 00000030 -/* 007E4 809FB7B4 9A180033 */ lwr $t8, 0x0033($s0) ## 00000033 -/* 007E8 809FB7B8 861901E6 */ lh $t9, 0x01E6($s0) ## 000001E6 -/* 007EC 809FB7BC 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 007F0 809FB7C0 AA1800B4 */ swl $t8, 0x00B4($s0) ## 000000B4 -/* 007F4 809FB7C4 BA1800B7 */ swr $t8, 0x00B7($s0) ## 000000B7 -/* 007F8 809FB7C8 96180034 */ lhu $t8, 0x0034($s0) ## 00000034 -/* 007FC 809FB7CC 2B210009 */ slti $at, $t9, 0x0009 -/* 00800 809FB7D0 10200007 */ beq $at, $zero, .L809FB7F0 -/* 00804 809FB7D4 A61800B8 */ sh $t8, 0x00B8($s0) ## 000000B8 -/* 00808 809FB7D8 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 0080C 809FB7DC 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 -/* 00810 809FB7E0 94481400 */ lhu $t0, 0x1400($v0) ## 8015FA60 -/* 00814 809FB7E4 35090001 */ ori $t1, $t0, 0x0001 ## $t1 = 00000001 -/* 00818 809FB7E8 10000016 */ beq $zero, $zero, .L809FB844 -/* 0081C 809FB7EC A4491400 */ sh $t1, 0x1400($v0) ## 8015FA60 -.L809FB7F0: -/* 00820 809FB7F0 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015CCC0 -/* 00824 809FB7F4 944A1400 */ lhu $t2, 0x1400($v0) ## 8015E0C0 -/* 00828 809FB7F8 314BFFFE */ andi $t3, $t2, 0xFFFE ## $t3 = 00000000 -/* 0082C 809FB7FC 10000011 */ beq $zero, $zero, .L809FB844 -/* 00830 809FB800 A44B1400 */ sh $t3, 0x1400($v0) ## 8015E0C0 -.L809FB804: -/* 00834 809FB804 8D83009C */ lw $v1, 0x009C($t4) ## 0000009C -/* 00838 809FB808 24010003 */ addiu $at, $zero, 0x0003 ## $at = 00000003 -/* 0083C 809FB80C 27AE0044 */ addiu $t6, $sp, 0x0044 ## $t6 = FFFFFFF4 -/* 00840 809FB810 0061001B */ divu $zero, $v1, $at -/* 00844 809FB814 00001810 */ mfhi $v1 -/* 00848 809FB818 00036880 */ sll $t5, $v1, 2 -/* 0084C 809FB81C 01AE1021 */ addu $v0, $t5, $t6 -/* 00850 809FB820 8C4F0000 */ lw $t7, 0x0000($v0) ## 8015CCC0 -/* 00854 809FB824 2404003C */ addiu $a0, $zero, 0x003C ## $a0 = 0000003C -/* 00858 809FB828 A60F01F0 */ sh $t7, 0x01F0($s0) ## 000001F0 -/* 0085C 809FB82C 0C01DF64 */ jal Math_Rand_S16Offset - -/* 00860 809FB830 84450002 */ lh $a1, 0x0002($v0) ## 8015CCC2 -/* 00864 809FB834 3C1880A0 */ lui $t8, %hi(func_809FB858) ## $t8 = 80A00000 -/* 00868 809FB838 2718B858 */ addiu $t8, $t8, %lo(func_809FB858) ## $t8 = 809FB858 -/* 0086C 809FB83C A60201EC */ sh $v0, 0x01EC($s0) ## 000001EC -/* 00870 809FB840 AE180190 */ sw $t8, 0x0190($s0) ## 00000190 -.L809FB844: -/* 00874 809FB844 8FBF0024 */ lw $ra, 0x0024($sp) -/* 00878 809FB848 8FB00020 */ lw $s0, 0x0020($sp) -/* 0087C 809FB84C 27BD0050 */ addiu $sp, $sp, 0x0050 ## $sp = 00000000 -/* 00880 809FB850 03E00008 */ jr $ra -/* 00884 809FB854 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dog/func_809FB858.s b/asm/non_matchings/overlays/actors/ovl_En_Dog/func_809FB858.s deleted file mode 100644 index 3e8286c1e1..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Dog/func_809FB858.s +++ /dev/null @@ -1,70 +0,0 @@ -glabel func_809FB858 -/* 00888 809FB858 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 0088C 809FB85C AFBF0024 */ sw $ra, 0x0024($sp) -/* 00890 809FB860 AFB00020 */ sw $s0, 0x0020($sp) -/* 00894 809FB864 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00898 809FB868 0C27ECA7 */ jal func_809FB29C -/* 0089C 809FB86C AFA5002C */ sw $a1, 0x002C($sp) -/* 008A0 809FB870 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 -/* 008A4 809FB874 14460003 */ bne $v0, $a2, .L809FB884 -/* 008A8 809FB878 3C0E80A0 */ lui $t6, %hi(func_809FB940) ## $t6 = 80A00000 -/* 008AC 809FB87C 25CEB940 */ addiu $t6, $t6, %lo(func_809FB940) ## $t6 = 809FB940 -/* 008B0 809FB880 AE0E0190 */ sw $t6, 0x0190($s0) ## 00000190 -.L809FB884: -/* 008B4 809FB884 860201EC */ lh $v0, 0x01EC($s0) ## 000001EC -/* 008B8 809FB888 240400C8 */ addiu $a0, $zero, 0x00C8 ## $a0 = 000000C8 -/* 008BC 809FB88C 14400003 */ bne $v0, $zero, .L809FB89C -/* 008C0 809FB890 244FFFFF */ addiu $t7, $v0, 0xFFFF ## $t7 = FFFFFFFF -/* 008C4 809FB894 10000003 */ beq $zero, $zero, .L809FB8A4 -/* 008C8 809FB898 00001825 */ or $v1, $zero, $zero ## $v1 = 00000000 -.L809FB89C: -/* 008CC 809FB89C A60F01EC */ sh $t7, 0x01EC($s0) ## 000001EC -/* 008D0 809FB8A0 860301EC */ lh $v1, 0x01EC($s0) ## 000001EC -.L809FB8A4: -/* 008D4 809FB8A4 5460001A */ bnel $v1, $zero, .L809FB910 -/* 008D8 809FB8A8 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 008DC 809FB8AC 0C01DF64 */ jal Math_Rand_S16Offset - -/* 008E0 809FB8B0 24050064 */ addiu $a1, $zero, 0x0064 ## $a1 = 00000064 -/* 008E4 809FB8B4 A60201EC */ sh $v0, 0x01EC($s0) ## 000001EC -/* 008E8 809FB8B8 8FB8002C */ lw $t8, 0x002C($sp) -/* 008EC 809FB8BC 3C0C80A0 */ lui $t4, %hi(func_809FB6C4) ## $t4 = 80A00000 -/* 008F0 809FB8C0 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 -/* 008F4 809FB8C4 8F19009C */ lw $t9, 0x009C($t8) ## 0000009C -/* 008F8 809FB8C8 258CB6C4 */ addiu $t4, $t4, %lo(func_809FB6C4) ## $t4 = 809FB6C4 -/* 008FC 809FB8CC 33280001 */ andi $t0, $t9, 0x0001 ## $t0 = 00000000 -/* 00900 809FB8D0 51000004 */ beql $t0, $zero, .L809FB8E4 -/* 00904 809FB8D4 A60601F0 */ sh $a2, 0x01F0($s0) ## 000001F0 -/* 00908 809FB8D8 10000002 */ beq $zero, $zero, .L809FB8E4 -/* 0090C 809FB8DC A60001F0 */ sh $zero, 0x01F0($s0) ## 000001F0 -/* 00910 809FB8E0 A60601F0 */ sh $a2, 0x01F0($s0) ## 000001F0 -.L809FB8E4: -/* 00914 809FB8E4 860901F0 */ lh $t1, 0x01F0($s0) ## 000001F0 -/* 00918 809FB8E8 54C90008 */ bnel $a2, $t1, .L809FB90C -/* 0091C 809FB8EC AE0C0190 */ sw $t4, 0x0190($s0) ## 00000190 -/* 00920 809FB8F0 860A01EC */ lh $t2, 0x01EC($s0) ## 000001EC -/* 00924 809FB8F4 05410003 */ bgez $t2, .L809FB904 -/* 00928 809FB8F8 000A5843 */ sra $t3, $t2, 1 -/* 0092C 809FB8FC 25410001 */ addiu $at, $t2, 0x0001 ## $at = 00000001 -/* 00930 809FB900 00015843 */ sra $t3, $at, 1 -.L809FB904: -/* 00934 809FB904 A60B01EC */ sh $t3, 0x01EC($s0) ## 000001EC -/* 00938 809FB908 AE0C0190 */ sw $t4, 0x0190($s0) ## 00000190 -.L809FB90C: -/* 0093C 809FB90C 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -.L809FB910: -/* 00940 809FB910 3C063ECC */ lui $a2, 0x3ECC ## $a2 = 3ECC0000 -/* 00944 809FB914 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3ECCCCCD -/* 00948 809FB918 44050000 */ mfc1 $a1, $f0 -/* 0094C 809FB91C 26040068 */ addiu $a0, $s0, 0x0068 ## $a0 = 00000068 -/* 00950 809FB920 3C073F80 */ lui $a3, 0x3F80 ## $a3 = 3F800000 -/* 00954 809FB924 0C01E0C4 */ jal Math_SmoothScaleMaxMinF - -/* 00958 809FB928 E7A00010 */ swc1 $f0, 0x0010($sp) -/* 0095C 809FB92C 8FBF0024 */ lw $ra, 0x0024($sp) -/* 00960 809FB930 8FB00020 */ lw $s0, 0x0020($sp) -/* 00964 809FB934 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 00968 809FB938 03E00008 */ jr $ra -/* 0096C 809FB93C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dog/func_809FB940.s b/asm/non_matchings/overlays/actors/ovl_En_Dog/func_809FB940.s deleted file mode 100644 index 3f03f49370..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Dog/func_809FB940.s +++ /dev/null @@ -1,110 +0,0 @@ -glabel func_809FB940 -/* 00970 809FB940 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 00974 809FB944 AFA5002C */ sw $a1, 0x002C($sp) -/* 00978 809FB948 3C058016 */ lui $a1, 0x8016 ## $a1 = 80160000 -/* 0097C 809FB94C 24A5E660 */ addiu $a1, $a1, 0xE660 ## $a1 = 8015E660 -/* 00980 809FB950 84AE13C4 */ lh $t6, 0x13C4($a1) ## 8015FA24 -/* 00984 809FB954 AFB00020 */ sw $s0, 0x0020($sp) -/* 00988 809FB958 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 0098C 809FB95C 15C00009 */ bne $t6, $zero, .L809FB984 -/* 00990 809FB960 AFBF0024 */ sw $ra, 0x0024($sp) -/* 00994 809FB964 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 -/* 00998 809FB968 3C1880A0 */ lui $t8, %hi(func_809FBC6C) ## $t8 = 80A00000 -/* 0099C 809FB96C 240F0003 */ addiu $t7, $zero, 0x0003 ## $t7 = 00000003 -/* 009A0 809FB970 2718BC6C */ addiu $t8, $t8, %lo(func_809FBC6C) ## $t8 = 809FBC6C -/* 009A4 809FB974 A48F01F0 */ sh $t7, 0x01F0($a0) ## 000001F0 -/* 009A8 809FB978 AC980190 */ sw $t8, 0x0190($a0) ## 00000190 -/* 009AC 809FB97C 1000004A */ beq $zero, $zero, .L809FBAA8 -/* 009B0 809FB980 E4840068 */ swc1 $f4, 0x0068($a0) ## 00000068 -.L809FB984: -/* 009B4 809FB984 3C0143C8 */ lui $at, 0x43C8 ## $at = 43C80000 -/* 009B8 809FB988 44813000 */ mtc1 $at, $f6 ## $f6 = 400.00 -/* 009BC 809FB98C C6000090 */ lwc1 $f0, 0x0090($s0) ## 00000090 -/* 009C0 809FB990 4600303C */ c.lt.s $f6, $f0 -/* 009C4 809FB994 00000000 */ nop -/* 009C8 809FB998 4502000C */ bc1fl .L809FB9CC -/* 009CC 809FB99C 3C0142C8 */ lui $at, 0x42C8 ## $at = 42C80000 -/* 009D0 809FB9A0 860201F0 */ lh $v0, 0x01F0($s0) ## 000001F0 -/* 009D4 809FB9A4 24010003 */ addiu $at, $zero, 0x0003 ## $at = 00000003 -/* 009D8 809FB9A8 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 009DC 809FB9AC 10410004 */ beq $v0, $at, .L809FB9C0 -/* 009E0 809FB9B0 24010004 */ addiu $at, $zero, 0x0004 ## $at = 00000004 -/* 009E4 809FB9B4 10410002 */ beq $v0, $at, .L809FB9C0 -/* 009E8 809FB9B8 24030005 */ addiu $v1, $zero, 0x0005 ## $v1 = 00000005 -/* 009EC 809FB9BC A60301F0 */ sh $v1, 0x01F0($s0) ## 000001F0 -.L809FB9C0: -/* 009F0 809FB9C0 1000001F */ beq $zero, $zero, .L809FBA40 -/* 009F4 809FB9C4 A4A013C4 */ sh $zero, 0x13C4($a1) ## 8015FA24 -/* 009F8 809FB9C8 3C0142C8 */ lui $at, 0x42C8 ## $at = 42C80000 -.L809FB9CC: -/* 009FC 809FB9CC 44814000 */ mtc1 $at, $f8 ## $f8 = 100.00 -/* 00A00 809FB9D0 00000000 */ nop -/* 00A04 809FB9D4 4600403C */ c.lt.s $f8, $f0 -/* 00A08 809FB9D8 00000000 */ nop -/* 00A0C 809FB9DC 45000005 */ bc1f .L809FB9F4 -/* 00A10 809FB9E0 3C014080 */ lui $at, 0x4080 ## $at = 40800000 -/* 00A14 809FB9E4 24190001 */ addiu $t9, $zero, 0x0001 ## $t9 = 00000001 -/* 00A18 809FB9E8 44810000 */ mtc1 $at, $f0 ## $f0 = 4.00 -/* 00A1C 809FB9EC 10000014 */ beq $zero, $zero, .L809FBA40 -/* 00A20 809FB9F0 A61901F0 */ sh $t9, 0x01F0($s0) ## 000001F0 -.L809FB9F4: -/* 00A24 809FB9F4 3C014220 */ lui $at, 0x4220 ## $at = 42200000 -/* 00A28 809FB9F8 44815000 */ mtc1 $at, $f10 ## $f10 = 40.00 -/* 00A2C 809FB9FC 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 00A30 809FBA00 460A003C */ c.lt.s $f0, $f10 -/* 00A34 809FBA04 00000000 */ nop -/* 00A38 809FBA08 4502000C */ bc1fl .L809FBA3C -/* 00A3C 809FBA0C 44810000 */ mtc1 $at, $f0 ## $f0 = 1.00 -/* 00A40 809FBA10 860201F0 */ lh $v0, 0x01F0($s0) ## 000001F0 -/* 00A44 809FBA14 24030005 */ addiu $v1, $zero, 0x0005 ## $v1 = 00000005 -/* 00A48 809FBA18 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 00A4C 809FBA1C 10620004 */ beq $v1, $v0, .L809FBA30 -/* 00A50 809FBA20 24010006 */ addiu $at, $zero, 0x0006 ## $at = 00000006 -/* 00A54 809FBA24 10410002 */ beq $v0, $at, .L809FBA30 -/* 00A58 809FBA28 00000000 */ nop -/* 00A5C 809FBA2C A60301F0 */ sh $v1, 0x01F0($s0) ## 000001F0 -.L809FBA30: -/* 00A60 809FBA30 10000004 */ beq $zero, $zero, .L809FBA44 -/* 00A64 809FBA34 44050000 */ mfc1 $a1, $f0 -/* 00A68 809FBA38 44810000 */ mtc1 $at, $f0 ## $f0 = 0.00 -.L809FBA3C: -/* 00A6C 809FBA3C A60001F0 */ sh $zero, 0x01F0($s0) ## 000001F0 -.L809FBA40: -/* 00A70 809FBA40 44050000 */ mfc1 $a1, $f0 -.L809FBA44: -/* 00A74 809FBA44 3C063F19 */ lui $a2, 0x3F19 ## $a2 = 3F190000 -/* 00A78 809FBA48 34C6999A */ ori $a2, $a2, 0x999A ## $a2 = 3F19999A -/* 00A7C 809FBA4C 26040068 */ addiu $a0, $s0, 0x0068 ## $a0 = 00000068 -/* 00A80 809FBA50 0C01E107 */ jal Math_SmoothScaleMaxF - -/* 00A84 809FBA54 3C073F80 */ lui $a3, 0x3F80 ## $a3 = 3F800000 -/* 00A88 809FBA58 3C0143C8 */ lui $at, 0x43C8 ## $at = 43C80000 -/* 00A8C 809FBA5C 44818000 */ mtc1 $at, $f16 ## $f16 = 400.00 -/* 00A90 809FBA60 C6120090 */ lwc1 $f18, 0x0090($s0) ## 00000090 -/* 00A94 809FBA64 4612803C */ c.lt.s $f16, $f18 -/* 00A98 809FBA68 00000000 */ nop -/* 00A9C 809FBA6C 4503000F */ bc1tl .L809FBAAC -/* 00AA0 809FBA70 8FBF0024 */ lw $ra, 0x0024($sp) -/* 00AA4 809FBA74 8605008A */ lh $a1, 0x008A($s0) ## 0000008A -/* 00AA8 809FBA78 24080001 */ addiu $t0, $zero, 0x0001 ## $t0 = 00000001 -/* 00AAC 809FBA7C AFA80010 */ sw $t0, 0x0010($sp) -/* 00AB0 809FBA80 26040032 */ addiu $a0, $s0, 0x0032 ## $a0 = 00000032 -/* 00AB4 809FBA84 2406000A */ addiu $a2, $zero, 0x000A ## $a2 = 0000000A -/* 00AB8 809FBA88 0C01E1A7 */ jal Math_SmoothScaleMaxMinS - -/* 00ABC 809FBA8C 240703E8 */ addiu $a3, $zero, 0x03E8 ## $a3 = 000003E8 -/* 00AC0 809FBA90 8A0A0030 */ lwl $t2, 0x0030($s0) ## 00000030 -/* 00AC4 809FBA94 9A0A0033 */ lwr $t2, 0x0033($s0) ## 00000033 -/* 00AC8 809FBA98 AA0A00B4 */ swl $t2, 0x00B4($s0) ## 000000B4 -/* 00ACC 809FBA9C BA0A00B7 */ swr $t2, 0x00B7($s0) ## 000000B7 -/* 00AD0 809FBAA0 960A0034 */ lhu $t2, 0x0034($s0) ## 00000034 -/* 00AD4 809FBAA4 A60A00B8 */ sh $t2, 0x00B8($s0) ## 000000B8 -.L809FBAA8: -/* 00AD8 809FBAA8 8FBF0024 */ lw $ra, 0x0024($sp) -.L809FBAAC: -/* 00ADC 809FBAAC 8FB00020 */ lw $s0, 0x0020($sp) -/* 00AE0 809FBAB0 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 00AE4 809FBAB4 03E00008 */ jr $ra -/* 00AE8 809FBAB8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dog/func_809FBABC.s b/asm/non_matchings/overlays/actors/ovl_En_Dog/func_809FBABC.s deleted file mode 100644 index 86e6943552..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Dog/func_809FBABC.s +++ /dev/null @@ -1,49 +0,0 @@ -glabel func_809FBABC -/* 00AEC 809FBABC 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 00AF0 809FBAC0 AFBF0024 */ sw $ra, 0x0024($sp) -/* 00AF4 809FBAC4 AFB00020 */ sw $s0, 0x0020($sp) -/* 00AF8 809FBAC8 AFA5002C */ sw $a1, 0x002C($sp) -/* 00AFC 809FBACC 3C014348 */ lui $at, 0x4348 ## $at = 43480000 -/* 00B00 809FBAD0 44813000 */ mtc1 $at, $f6 ## $f6 = 200.00 -/* 00B04 809FBAD4 C4840090 */ lwc1 $f4, 0x0090($a0) ## 00000090 -/* 00B08 809FBAD8 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00B0C 809FBADC 3C0F80A0 */ lui $t7, %hi(func_809FBB64) ## $t7 = 80A00000 -/* 00B10 809FBAE0 4606203C */ c.lt.s $f4, $f6 -/* 00B14 809FBAE4 24840068 */ addiu $a0, $a0, 0x0068 ## $a0 = 00000068 -/* 00B18 809FBAE8 3C054080 */ lui $a1, 0x4080 ## $a1 = 40800000 -/* 00B1C 809FBAEC 3C063F19 */ lui $a2, 0x3F19 ## $a2 = 3F190000 -/* 00B20 809FBAF0 45000010 */ bc1f .L809FBB34 -/* 00B24 809FBAF4 25EFBB64 */ addiu $t7, $t7, %lo(func_809FBB64) ## $t7 = 809FBB64 -/* 00B28 809FBAF8 34C6999A */ ori $a2, $a2, 0x999A ## $a2 = 3F19999A -/* 00B2C 809FBAFC 0C01E107 */ jal Math_SmoothScaleMaxF - -/* 00B30 809FBB00 3C073F80 */ lui $a3, 0x3F80 ## $a3 = 3F800000 -/* 00B34 809FBB04 8605008A */ lh $a1, 0x008A($s0) ## 0000008A -/* 00B38 809FBB08 240E0001 */ addiu $t6, $zero, 0x0001 ## $t6 = 00000001 -/* 00B3C 809FBB0C AFAE0010 */ sw $t6, 0x0010($sp) -/* 00B40 809FBB10 38A58000 */ xori $a1, $a1, 0x8000 ## $a1 = FFFF8000 -/* 00B44 809FBB14 00052C00 */ sll $a1, $a1, 16 -/* 00B48 809FBB18 00052C03 */ sra $a1, $a1, 16 -/* 00B4C 809FBB1C 26040032 */ addiu $a0, $s0, 0x0032 ## $a0 = 00000032 -/* 00B50 809FBB20 2406000A */ addiu $a2, $zero, 0x000A ## $a2 = 0000000A -/* 00B54 809FBB24 0C01E1A7 */ jal Math_SmoothScaleMaxMinS - -/* 00B58 809FBB28 240703E8 */ addiu $a3, $zero, 0x03E8 ## $a3 = 000003E8 -/* 00B5C 809FBB2C 10000003 */ beq $zero, $zero, .L809FBB3C -/* 00B60 809FBB30 8A190030 */ lwl $t9, 0x0030($s0) ## 00000030 -.L809FBB34: -/* 00B64 809FBB34 AE0F0190 */ sw $t7, 0x0190($s0) ## 00000190 -/* 00B68 809FBB38 8A190030 */ lwl $t9, 0x0030($s0) ## 00000030 -.L809FBB3C: -/* 00B6C 809FBB3C 9A190033 */ lwr $t9, 0x0033($s0) ## 00000033 -/* 00B70 809FBB40 AA1900B4 */ swl $t9, 0x00B4($s0) ## 000000B4 -/* 00B74 809FBB44 BA1900B7 */ swr $t9, 0x00B7($s0) ## 000000B7 -/* 00B78 809FBB48 96190034 */ lhu $t9, 0x0034($s0) ## 00000034 -/* 00B7C 809FBB4C A61900B8 */ sh $t9, 0x00B8($s0) ## 000000B8 -/* 00B80 809FBB50 8FBF0024 */ lw $ra, 0x0024($sp) -/* 00B84 809FBB54 8FB00020 */ lw $s0, 0x0020($sp) -/* 00B88 809FBB58 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 00B8C 809FBB5C 03E00008 */ jr $ra -/* 00B90 809FBB60 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dog/func_809FBB64.s b/asm/non_matchings/overlays/actors/ovl_En_Dog/func_809FBB64.s deleted file mode 100644 index 5b164aad12..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Dog/func_809FBB64.s +++ /dev/null @@ -1,74 +0,0 @@ -glabel func_809FBB64 -/* 00B94 809FBB64 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 00B98 809FBB68 AFBF0024 */ sw $ra, 0x0024($sp) -/* 00B9C 809FBB6C AFB00020 */ sw $s0, 0x0020($sp) -/* 00BA0 809FBB70 AFA50034 */ sw $a1, 0x0034($sp) -/* 00BA4 809FBB74 3C014348 */ lui $at, 0x4348 ## $at = 43480000 -/* 00BA8 809FBB78 44813000 */ mtc1 $at, $f6 ## $f6 = 200.00 -/* 00BAC 809FBB7C C4840090 */ lwc1 $f4, 0x0090($a0) ## 00000090 -/* 00BB0 809FBB80 3C0B80A0 */ lui $t3, %hi(func_809FBABC) ## $t3 = 80A00000 -/* 00BB4 809FBB84 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00BB8 809FBB88 4604303E */ c.le.s $f6, $f4 -/* 00BBC 809FBB8C 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 00BC0 809FBB90 3C063F19 */ lui $a2, 0x3F19 ## $a2 = 3F190000 -/* 00BC4 809FBB94 240A0001 */ addiu $t2, $zero, 0x0001 ## $t2 = 00000001 -/* 00BC8 809FBB98 45000027 */ bc1f .L809FBC38 -/* 00BCC 809FBB9C 256BBABC */ addiu $t3, $t3, %lo(func_809FBABC) ## $t3 = 809FBABC -/* 00BD0 809FBBA0 44810000 */ mtc1 $at, $f0 ## $f0 = 1.00 -/* 00BD4 809FBBA4 A48001F0 */ sh $zero, 0x01F0($a0) ## 000001F0 -/* 00BD8 809FBBA8 24840068 */ addiu $a0, $a0, 0x0068 ## $a0 = 00000068 -/* 00BDC 809FBBAC 44050000 */ mfc1 $a1, $f0 -/* 00BE0 809FBBB0 44070000 */ mfc1 $a3, $f0 -/* 00BE4 809FBBB4 0C01E107 */ jal Math_SmoothScaleMaxF - -/* 00BE8 809FBBB8 34C6999A */ ori $a2, $a2, 0x999A ## $a2 = 3F19999A -/* 00BEC 809FBBBC 860E0032 */ lh $t6, 0x0032($s0) ## 00000032 -/* 00BF0 809FBBC0 8605008A */ lh $a1, 0x008A($s0) ## 0000008A -/* 00BF4 809FBBC4 240F0001 */ addiu $t7, $zero, 0x0001 ## $t7 = 00000001 -/* 00BF8 809FBBC8 AFAF0010 */ sw $t7, 0x0010($sp) -/* 00BFC 809FBBCC 26040032 */ addiu $a0, $s0, 0x0032 ## $a0 = 00000032 -/* 00C00 809FBBD0 2406000A */ addiu $a2, $zero, 0x000A ## $a2 = 0000000A -/* 00C04 809FBBD4 240703E8 */ addiu $a3, $zero, 0x03E8 ## $a3 = 000003E8 -/* 00C08 809FBBD8 0C01E1A7 */ jal Math_SmoothScaleMaxMinS - -/* 00C0C 809FBBDC A7AE002C */ sh $t6, 0x002C($sp) -/* 00C10 809FBBE0 86180032 */ lh $t8, 0x0032($s0) ## 00000032 -/* 00C14 809FBBE4 87B9002C */ lh $t9, 0x002C($sp) -/* 00C18 809FBBE8 3C014348 */ lui $at, 0x4348 ## $at = 43480000 -/* 00C1C 809FBBEC 44984000 */ mtc1 $t8, $f8 ## $f8 = 0.00 -/* 00C20 809FBBF0 44995000 */ mtc1 $t9, $f10 ## $f10 = 0.00 -/* 00C24 809FBBF4 44819000 */ mtc1 $at, $f18 ## $f18 = 200.00 -/* 00C28 809FBBF8 468040A0 */ cvt.s.w $f2, $f8 -/* 00C2C 809FBBFC 3C0980A0 */ lui $t1, %hi(func_809FBC6C) ## $t1 = 80A00000 -/* 00C30 809FBC00 24080003 */ addiu $t0, $zero, 0x0003 ## $t0 = 00000003 -/* 00C34 809FBC04 2529BC6C */ addiu $t1, $t1, %lo(func_809FBC6C) ## $t1 = 809FBC6C -/* 00C38 809FBC08 46805420 */ cvt.s.w $f16, $f10 -/* 00C3C 809FBC0C 46101081 */ sub.s $f2, $f2, $f16 -/* 00C40 809FBC10 46001005 */ abs.s $f0, $f2 -/* 00C44 809FBC14 4612003C */ c.lt.s $f0, $f18 -/* 00C48 809FBC18 00000000 */ nop -/* 00C4C 809FBC1C 45020009 */ bc1fl .L809FBC44 -/* 00C50 809FBC20 8A0D0030 */ lwl $t5, 0x0030($s0) ## 00000030 -/* 00C54 809FBC24 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 -/* 00C58 809FBC28 A60801F0 */ sh $t0, 0x01F0($s0) ## 000001F0 -/* 00C5C 809FBC2C AE090190 */ sw $t1, 0x0190($s0) ## 00000190 -/* 00C60 809FBC30 10000003 */ beq $zero, $zero, .L809FBC40 -/* 00C64 809FBC34 E6040068 */ swc1 $f4, 0x0068($s0) ## 00000068 -.L809FBC38: -/* 00C68 809FBC38 A60A01F0 */ sh $t2, 0x01F0($s0) ## 000001F0 -/* 00C6C 809FBC3C AE0B0190 */ sw $t3, 0x0190($s0) ## 00000190 -.L809FBC40: -/* 00C70 809FBC40 8A0D0030 */ lwl $t5, 0x0030($s0) ## 00000030 -.L809FBC44: -/* 00C74 809FBC44 9A0D0033 */ lwr $t5, 0x0033($s0) ## 00000033 -/* 00C78 809FBC48 AA0D00B4 */ swl $t5, 0x00B4($s0) ## 000000B4 -/* 00C7C 809FBC4C BA0D00B7 */ swr $t5, 0x00B7($s0) ## 000000B7 -/* 00C80 809FBC50 960D0034 */ lhu $t5, 0x0034($s0) ## 00000034 -/* 00C84 809FBC54 A60D00B8 */ sh $t5, 0x00B8($s0) ## 000000B8 -/* 00C88 809FBC58 8FBF0024 */ lw $ra, 0x0024($sp) -/* 00C8C 809FBC5C 8FB00020 */ lw $s0, 0x0020($sp) -/* 00C90 809FBC60 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 00C94 809FBC64 03E00008 */ jr $ra -/* 00C98 809FBC68 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dog/func_809FBC6C.s b/asm/non_matchings/overlays/actors/ovl_En_Dog/func_809FBC6C.s deleted file mode 100644 index 7fe8e3c2a0..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Dog/func_809FBC6C.s +++ /dev/null @@ -1,26 +0,0 @@ -glabel func_809FBC6C -/* 00C9C 809FBC6C AFA50004 */ sw $a1, 0x0004($sp) -/* 00CA0 809FBC70 848F00B6 */ lh $t7, 0x00B6($a0) ## 000000B6 -/* 00CA4 809FBC74 848E008A */ lh $t6, 0x008A($a0) ## 0000008A -/* 00CA8 809FBC78 3C198016 */ lui $t9, 0x8016 ## $t9 = 80160000 -/* 00CAC 809FBC7C 3C014348 */ lui $at, 0x4348 ## $at = 43480000 -/* 00CB0 809FBC80 01CFC023 */ subu $t8, $t6, $t7 -/* 00CB4 809FBC84 A49801E8 */ sh $t8, 0x01E8($a0) ## 000001E8 -/* 00CB8 809FBC88 8739FA24 */ lh $t9, -0x05DC($t9) ## 8015FA24 -/* 00CBC 809FBC8C 1320000B */ beq $t9, $zero, .L809FBCBC -/* 00CC0 809FBC90 00000000 */ nop -/* 00CC4 809FBC94 C4840090 */ lwc1 $f4, 0x0090($a0) ## 00000090 -/* 00CC8 809FBC98 44813000 */ mtc1 $at, $f6 ## $f6 = 200.00 -/* 00CCC 809FBC9C 3C0980A0 */ lui $t1, %hi(func_809FBABC) ## $t1 = 80A00000 -/* 00CD0 809FBCA0 24080001 */ addiu $t0, $zero, 0x0001 ## $t0 = 00000001 -/* 00CD4 809FBCA4 4606203C */ c.lt.s $f4, $f6 -/* 00CD8 809FBCA8 2529BABC */ addiu $t1, $t1, %lo(func_809FBABC) ## $t1 = 809FBABC -/* 00CDC 809FBCAC 45000003 */ bc1f .L809FBCBC -/* 00CE0 809FBCB0 00000000 */ nop -/* 00CE4 809FBCB4 A48801F0 */ sh $t0, 0x01F0($a0) ## 000001F0 -/* 00CE8 809FBCB8 AC890190 */ sw $t1, 0x0190($a0) ## 00000190 -.L809FBCBC: -/* 00CEC 809FBCBC 03E00008 */ jr $ra -/* 00CF0 809FBCC0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dog/func_809FBD8C.s b/asm/non_matchings/overlays/actors/ovl_En_Dog/func_809FBD8C.s deleted file mode 100644 index bd35721abc..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Dog/func_809FBD8C.s +++ /dev/null @@ -1,9 +0,0 @@ -glabel func_809FBD8C -/* 00DBC 809FBD8C AFA40000 */ sw $a0, 0x0000($sp) -/* 00DC0 809FBD90 AFA50004 */ sw $a1, 0x0004($sp) -/* 00DC4 809FBD94 AFA60008 */ sw $a2, 0x0008($sp) -/* 00DC8 809FBD98 AFA7000C */ sw $a3, 0x000C($sp) -/* 00DCC 809FBD9C 03E00008 */ jr $ra -/* 00DD0 809FBDA0 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dog/func_809FBDA4.s b/asm/non_matchings/overlays/actors/ovl_En_Dog/func_809FBDA4.s deleted file mode 100644 index 62d9896a91..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Dog/func_809FBDA4.s +++ /dev/null @@ -1,8 +0,0 @@ -glabel func_809FBDA4 -/* 00DD4 809FBDA4 AFA40000 */ sw $a0, 0x0000($sp) -/* 00DD8 809FBDA8 AFA50004 */ sw $a1, 0x0004($sp) -/* 00DDC 809FBDAC AFA60008 */ sw $a2, 0x0008($sp) -/* 00DE0 809FBDB0 03E00008 */ jr $ra -/* 00DE4 809FBDB4 AFA7000C */ sw $a3, 0x000C($sp) - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Door/EnDoor_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Door/EnDoor_Draw.s index fb824dffb0..3555dec3a6 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Door/EnDoor_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Door/EnDoor_Draw.s @@ -12,7 +12,7 @@ glabel EnDoor_Draw /* 00BC4 809FCD94 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 /* 00BC8 809FCD98 24C6CF10 */ addiu $a2, $a2, %lo(D_809FCF10) ## $a2 = 809FCF10 /* 00BCC 809FCD9C 2407038E */ addiu $a3, $zero, 0x038E ## $a3 = 0000038E -/* 00BD0 809FCDA0 0C031AB1 */ jal func_800C6AC4 +/* 00BD0 809FCDA0 0C031AB1 */ jal Graph_OpenDisps /* 00BD4 809FCDA4 AFA50048 */ sw $a1, 0x0048($sp) /* 00BD8 809FCDA8 8FB90054 */ lw $t9, 0x0054($sp) /* 00BDC 809FCDAC 0C024F46 */ jal func_80093D18 @@ -63,7 +63,7 @@ glabel EnDoor_Draw /* 00C7C 809FCE4C 24C6CF20 */ addiu $a2, $a2, %lo(D_809FCF20) ## $a2 = 809FCF20 /* 00C80 809FCE50 27A40038 */ addiu $a0, $sp, 0x0038 ## $a0 = FFFFFFE8 /* 00C84 809FCE54 240703AD */ addiu $a3, $zero, 0x03AD ## $a3 = 000003AD -/* 00C88 809FCE58 0C031AD5 */ jal func_800C6B54 +/* 00C88 809FCE58 0C031AD5 */ jal Graph_CloseDisps /* 00C8C 809FCE5C 8DE50000 */ lw $a1, 0x0000($t7) ## 00000000 .L809FCE60: /* 00C90 809FCE60 8FBF0024 */ lw $ra, 0x0024($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Door/func_809FC5D0.s b/asm/non_matchings/overlays/actors/ovl_En_Door/func_809FC5D0.s index 5a79d485fa..86edd0606e 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Door/func_809FC5D0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Door/func_809FC5D0.s @@ -1,189 +1,189 @@ glabel func_809FC5D0 /* 00400 809FC5D0 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 -/* 00404 809FC5D4 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00408 809FC5D8 AFA50044 */ sw $a1, 0x0044($sp) +/* 00404 809FC5D4 AFBF0014 */ sw $ra, 0x0014($sp) +/* 00408 809FC5D8 AFA50044 */ sw $a1, 0x0044($sp) /* 0040C 809FC5DC 848F001C */ lh $t7, 0x001C($a0) ## 0000001C /* 00410 809FC5E0 8CA81C44 */ lw $t0, 0x1C44($a1) ## 00001C44 -/* 00414 809FC5E4 AFA40040 */ sw $a0, 0x0040($sp) -/* 00418 809FC5E8 000FC1C3 */ sra $t8, $t7, 7 +/* 00414 809FC5E4 AFA40040 */ sw $a0, 0x0040($sp) +/* 00418 809FC5E8 000FC1C3 */ sra $t8, $t7, 7 /* 0041C 809FC5EC 33190007 */ andi $t9, $t8, 0x0007 ## $t9 = 00000000 -/* 00420 809FC5F0 AFB90038 */ sw $t9, 0x0038($sp) +/* 00420 809FC5F0 AFB90038 */ sw $t9, 0x0038($sp) /* 00424 809FC5F4 27A5002C */ addiu $a1, $sp, 0x002C ## $a1 = FFFFFFEC /* 00428 809FC5F8 25060024 */ addiu $a2, $t0, 0x0024 ## $a2 = 00000024 -/* 0042C 809FC5FC 0C00B6F4 */ jal func_8002DBD0 -/* 00430 809FC600 AFA8003C */ sw $t0, 0x003C($sp) -/* 00434 809FC604 8FA70040 */ lw $a3, 0x0040($sp) +/* 0042C 809FC5FC 0C00B6F4 */ jal func_8002DBD0 +/* 00430 809FC600 AFA8003C */ sw $t0, 0x003C($sp) +/* 00434 809FC604 8FA70040 */ lw $a3, 0x0040($sp) /* 00438 809FC608 3C0A80A0 */ lui $t2, %hi(func_809FC9DC) ## $t2 = 80A00000 -/* 0043C 809FC60C 8FA8003C */ lw $t0, 0x003C($sp) +/* 0043C 809FC60C 8FA8003C */ lw $t0, 0x003C($sp) /* 00440 809FC610 90E90191 */ lbu $t1, 0x0191($a3) ## 00000191 /* 00444 809FC614 254AC9DC */ addiu $t2, $t2, %lo(func_809FC9DC) ## $t2 = 809FC9DC /* 00448 809FC618 3C0580A0 */ lui $a1, %hi(D_809FCECC) ## $a1 = 80A00000 -/* 0044C 809FC61C 1120002A */ beq $t1, $zero, .L809FC6C8 -/* 00450 809FC620 8FA40044 */ lw $a0, 0x0044($sp) +/* 0044C 809FC61C 1120002A */ beq $t1, $zero, .L809FC6C8 +/* 00450 809FC620 8FA40044 */ lw $a0, 0x0044($sp) /* 00454 809FC624 ACEA01D4 */ sw $t2, 0x01D4($a3) ## 000001D4 /* 00458 809FC628 8D0B067C */ lw $t3, 0x067C($t0) ## 0000067C /* 0045C 809FC62C 24E4014C */ addiu $a0, $a3, 0x014C ## $a0 = 0000014C /* 00460 809FC630 3C013FC0 */ lui $at, 0x3FC0 ## $at = 3FC00000 -/* 00464 809FC634 000B6100 */ sll $t4, $t3, 4 -/* 00468 809FC638 05830006 */ bgezl $t4, .L809FC654 +/* 00464 809FC634 000B6100 */ sll $t4, $t3, 4 +/* 00468 809FC638 05830006 */ bgezl $t4, .L809FC654 /* 0046C 809FC63C 44810000 */ mtc1 $at, $f0 ## $f0 = 1.50 /* 00470 809FC640 3C013F40 */ lui $at, 0x3F40 ## $at = 3F400000 /* 00474 809FC644 44810000 */ mtc1 $at, $f0 ## $f0 = 0.75 -/* 00478 809FC648 10000004 */ beq $zero, $zero, .L809FC65C +/* 00478 809FC648 10000004 */ beq $zero, $zero, .L809FC65C /* 0047C 809FC64C 90ED0190 */ lbu $t5, 0x0190($a3) ## 00000190 /* 00480 809FC650 44810000 */ mtc1 $at, $f0 ## $f0 = 0.75 .L809FC654: /* 00484 809FC654 00000000 */ nop /* 00488 809FC658 90ED0190 */ lbu $t5, 0x0190($a3) ## 00000190 .L809FC65C: -/* 0048C 809FC65C 44060000 */ mfc1 $a2, $f0 -/* 00490 809FC660 AFA70040 */ sw $a3, 0x0040($sp) -/* 00494 809FC664 000D7080 */ sll $t6, $t5, 2 -/* 00498 809FC668 00AE2821 */ addu $a1, $a1, $t6 -/* 0049C 809FC66C 0C0294A7 */ jal func_800A529C -/* 004A0 809FC670 8CA5CECC */ lw $a1, %lo(D_809FCECC)($a1) -/* 004A4 809FC674 8FA70040 */ lw $a3, 0x0040($sp) +/* 0048C 809FC65C 44060000 */ mfc1 $a2, $f0 +/* 00490 809FC660 AFA70040 */ sw $a3, 0x0040($sp) +/* 00494 809FC664 000D7080 */ sll $t6, $t5, 2 +/* 00498 809FC668 00AE2821 */ addu $a1, $a1, $t6 +/* 0049C 809FC66C 0C0294A7 */ jal SkelAnime_ChangeAnimPlaybackStop +/* 004A0 809FC670 8CA5CECC */ lw $a1, %lo(D_809FCECC)($a1) +/* 004A4 809FC674 8FA70040 */ lw $a3, 0x0040($sp) /* 004A8 809FC678 3C038016 */ lui $v1, 0x8016 ## $v1 = 80160000 /* 004AC 809FC67C 2463E660 */ addiu $v1, $v1, 0xE660 ## $v1 = 8015E660 /* 004B0 809FC680 84EF0196 */ lh $t7, 0x0196($a3) ## 00000196 -/* 004B4 809FC684 51E00079 */ beql $t7, $zero, .L809FC86C -/* 004B8 809FC688 8FBF0014 */ lw $ra, 0x0014($sp) +/* 004B4 809FC684 51E00079 */ beql $t7, $zero, .L809FC86C +/* 004B8 809FC688 8FBF0014 */ lw $ra, 0x0014($sp) /* 004BC 809FC68C 94781402 */ lhu $t8, 0x1402($v1) ## 8015FA62 -/* 004C0 809FC690 8FA40044 */ lw $a0, 0x0044($sp) -/* 004C4 809FC694 00781021 */ addu $v0, $v1, $t8 +/* 004C0 809FC690 8FA40044 */ lw $a0, 0x0044($sp) +/* 004C4 809FC694 00781021 */ addu $v0, $v1, $t8 /* 004C8 809FC698 805900BC */ lb $t9, 0x00BC($v0) ## 000000BC /* 004CC 809FC69C 2729FFFF */ addiu $t1, $t9, 0xFFFF ## $t1 = FFFFFFFF /* 004D0 809FC6A0 A04900BC */ sb $t1, 0x00BC($v0) ## 000000BC /* 004D4 809FC6A4 84E5001C */ lh $a1, 0x001C($a3) ## 0000001C -/* 004D8 809FC6A8 AFA70040 */ sw $a3, 0x0040($sp) +/* 004D8 809FC6A8 AFA70040 */ sw $a3, 0x0040($sp) /* 004DC 809FC6AC 0C00B2DD */ jal Flags_SetSwitch - + /* 004E0 809FC6B0 30A5003F */ andi $a1, $a1, 0x003F ## $a1 = 00000000 -/* 004E4 809FC6B4 8FA40040 */ lw $a0, 0x0040($sp) +/* 004E4 809FC6B4 8FA40040 */ lw $a0, 0x0040($sp) /* 004E8 809FC6B8 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 004EC 809FC6BC 2405287C */ addiu $a1, $zero, 0x287C ## $a1 = 0000287C -/* 004F0 809FC6C0 1000006A */ beq $zero, $zero, .L809FC86C -/* 004F4 809FC6C4 8FBF0014 */ lw $ra, 0x0014($sp) +/* 004F0 809FC6C0 1000006A */ beq $zero, $zero, .L809FC86C +/* 004F4 809FC6C4 8FBF0014 */ lw $ra, 0x0014($sp) .L809FC6C8: -/* 004F8 809FC6C8 AFA70040 */ sw $a3, 0x0040($sp) -/* 004FC 809FC6CC 0C023A62 */ jal func_8008E988 -/* 00500 809FC6D0 AFA8003C */ sw $t0, 0x003C($sp) -/* 00504 809FC6D4 8FA70040 */ lw $a3, 0x0040($sp) -/* 00508 809FC6D8 14400063 */ bne $v0, $zero, .L809FC868 -/* 0050C 809FC6DC 8FA8003C */ lw $t0, 0x003C($sp) -/* 00510 809FC6E0 C7A00030 */ lwc1 $f0, 0x0030($sp) +/* 004F8 809FC6C8 AFA70040 */ sw $a3, 0x0040($sp) +/* 004FC 809FC6CC 0C023A62 */ jal func_8008E988 +/* 00500 809FC6D0 AFA8003C */ sw $t0, 0x003C($sp) +/* 00504 809FC6D4 8FA70040 */ lw $a3, 0x0040($sp) +/* 00508 809FC6D8 14400063 */ bne $v0, $zero, .L809FC868 +/* 0050C 809FC6DC 8FA8003C */ lw $t0, 0x003C($sp) +/* 00510 809FC6E0 C7A00030 */ lwc1 $f0, 0x0030($sp) /* 00514 809FC6E4 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 /* 00518 809FC6E8 44811000 */ mtc1 $at, $f2 ## $f2 = 20.00 -/* 0051C 809FC6EC 46000005 */ abs.s $f0, $f0 -/* 00520 809FC6F0 8FA90038 */ lw $t1, 0x0038($sp) -/* 00524 809FC6F4 4602003C */ c.lt.s $f0, $f2 -/* 00528 809FC6F8 C7A0002C */ lwc1 $f0, 0x002C($sp) -/* 0052C 809FC6FC 4502004F */ bc1fl .L809FC83C +/* 0051C 809FC6EC 46000005 */ abs.s $f0, $f0 +/* 00520 809FC6F0 8FA90038 */ lw $t1, 0x0038($sp) +/* 00524 809FC6F4 4602003C */ c.lt.s $f0, $f2 +/* 00528 809FC6F8 C7A0002C */ lwc1 $f0, 0x002C($sp) +/* 0052C 809FC6FC 4502004F */ bc1fl .L809FC83C /* 00530 809FC700 24010004 */ addiu $at, $zero, 0x0004 ## $at = 00000004 -/* 00534 809FC704 46000005 */ abs.s $f0, $f0 -/* 00538 809FC708 C7A40034 */ lwc1 $f4, 0x0034($sp) -/* 0053C 809FC70C 4602003C */ c.lt.s $f0, $f2 +/* 00534 809FC704 46000005 */ abs.s $f0, $f0 +/* 00538 809FC708 C7A40034 */ lwc1 $f4, 0x0034($sp) +/* 0053C 809FC70C 4602003C */ c.lt.s $f0, $f2 /* 00540 809FC710 3C014248 */ lui $at, 0x4248 ## $at = 42480000 -/* 00544 809FC714 45020049 */ bc1fl .L809FC83C +/* 00544 809FC714 45020049 */ bc1fl .L809FC83C /* 00548 809FC718 24010004 */ addiu $at, $zero, 0x0004 ## $at = 00000004 /* 0054C 809FC71C 44813000 */ mtc1 $at, $f6 ## $f6 = 0.00 -/* 00550 809FC720 46002005 */ abs.s $f0, $f4 -/* 00554 809FC724 4606003C */ c.lt.s $f0, $f6 +/* 00550 809FC720 46002005 */ abs.s $f0, $f4 +/* 00554 809FC724 4606003C */ c.lt.s $f0, $f6 /* 00558 809FC728 00000000 */ nop -/* 0055C 809FC72C 45020043 */ bc1fl .L809FC83C +/* 0055C 809FC72C 45020043 */ bc1fl .L809FC83C /* 00560 809FC730 24010004 */ addiu $at, $zero, 0x0004 ## $at = 00000004 /* 00564 809FC734 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 /* 00568 809FC738 850A00B6 */ lh $t2, 0x00B6($t0) ## 000000B6 /* 0056C 809FC73C 84EB00B6 */ lh $t3, 0x00B6($a3) ## 000000B6 -/* 00570 809FC740 4604003C */ c.lt.s $f0, $f4 +/* 00570 809FC740 4604003C */ c.lt.s $f0, $f4 /* 00574 809FC744 340C8000 */ ori $t4, $zero, 0x8000 ## $t4 = 00008000 -/* 00578 809FC748 014B1023 */ subu $v0, $t2, $t3 -/* 0057C 809FC74C 00021400 */ sll $v0, $v0, 16 -/* 00580 809FC750 45000004 */ bc1f .L809FC764 -/* 00584 809FC754 00021403 */ sra $v0, $v0, 16 -/* 00588 809FC758 01821023 */ subu $v0, $t4, $v0 -/* 0058C 809FC75C 00021400 */ sll $v0, $v0, 16 -/* 00590 809FC760 00021403 */ sra $v0, $v0, 16 +/* 00578 809FC748 014B1023 */ subu $v0, $t2, $t3 +/* 0057C 809FC74C 00021400 */ sll $v0, $v0, 16 +/* 00580 809FC750 45000004 */ bc1f .L809FC764 +/* 00584 809FC754 00021403 */ sra $v0, $v0, 16 +/* 00588 809FC758 01821023 */ subu $v0, $t4, $v0 +/* 0058C 809FC75C 00021400 */ sll $v0, $v0, 16 +/* 00590 809FC760 00021403 */ sra $v0, $v0, 16 .L809FC764: -/* 00594 809FC764 04400003 */ bltz $v0, .L809FC774 -/* 00598 809FC768 00021823 */ subu $v1, $zero, $v0 -/* 0059C 809FC76C 10000001 */ beq $zero, $zero, .L809FC774 +/* 00594 809FC764 04400003 */ bltz $v0, .L809FC774 +/* 00598 809FC768 00021823 */ subu $v1, $zero, $v0 +/* 0059C 809FC76C 10000001 */ beq $zero, $zero, .L809FC774 /* 005A0 809FC770 00401825 */ or $v1, $v0, $zero ## $v1 = 00000000 .L809FC774: -/* 005A4 809FC774 28613000 */ slti $at, $v1, 0x3000 -/* 005A8 809FC778 5020003C */ beql $at, $zero, .L809FC86C -/* 005AC 809FC77C 8FBF0014 */ lw $ra, 0x0014($sp) +/* 005A4 809FC774 28613000 */ slti $at, $v1, 0x3000 +/* 005A8 809FC778 5020003C */ beql $at, $zero, .L809FC86C +/* 005AC 809FC77C 8FBF0014 */ lw $ra, 0x0014($sp) /* 005B0 809FC780 84ED0196 */ lh $t5, 0x0196($a3) ## 00000196 /* 005B4 809FC784 3C038016 */ lui $v1, 0x8016 ## $v1 = 80160000 /* 005B8 809FC788 2463E660 */ addiu $v1, $v1, 0xE660 ## $v1 = 8015E660 -/* 005BC 809FC78C 51A0000E */ beql $t5, $zero, .L809FC7C8 -/* 005C0 809FC790 8FAB0038 */ lw $t3, 0x0038($sp) +/* 005BC 809FC78C 51A0000E */ beql $t5, $zero, .L809FC7C8 +/* 005C0 809FC790 8FAB0038 */ lw $t3, 0x0038($sp) /* 005C4 809FC794 946E1402 */ lhu $t6, 0x1402($v1) ## 8015FA62 -/* 005C8 809FC798 8FB90044 */ lw $t9, 0x0044($sp) +/* 005C8 809FC798 8FB90044 */ lw $t9, 0x0044($sp) /* 005CC 809FC79C 240A000A */ addiu $t2, $zero, 0x000A ## $t2 = 0000000A -/* 005D0 809FC7A0 006E7821 */ addu $t7, $v1, $t6 +/* 005D0 809FC7A0 006E7821 */ addu $t7, $v1, $t6 /* 005D4 809FC7A4 81F800BC */ lb $t8, 0x00BC($t7) ## 000000BC -/* 005D8 809FC7A8 5F000006 */ bgtzl $t8, .L809FC7C4 +/* 005D8 809FC7A8 5F000006 */ bgtzl $t8, .L809FC7C4 /* 005DC 809FC7AC A50A042E */ sh $t2, 0x042E($t0) ## 0000042E /* 005E0 809FC7B0 8F221C44 */ lw $v0, 0x1C44($t9) ## 00001C44 /* 005E4 809FC7B4 2409FDFD */ addiu $t1, $zero, 0xFDFD ## $t1 = FFFFFDFD -/* 005E8 809FC7B8 1000002B */ beq $zero, $zero, .L809FC868 +/* 005E8 809FC7B8 1000002B */ beq $zero, $zero, .L809FC868 /* 005EC 809FC7BC A4490690 */ sh $t1, 0x0690($v0) ## 00000690 /* 005F0 809FC7C0 A50A042E */ sh $t2, 0x042E($t0) ## 0000042E .L809FC7C4: -/* 005F4 809FC7C4 8FAB0038 */ lw $t3, 0x0038($sp) +/* 005F4 809FC7C4 8FAB0038 */ lw $t3, 0x0038($sp) .L809FC7C8: /* 005F8 809FC7C8 24010004 */ addiu $at, $zero, 0x0004 ## $at = 00000004 /* 005FC 809FC7CC 240D0001 */ addiu $t5, $zero, 0x0001 ## $t5 = 00000001 -/* 00600 809FC7D0 15610003 */ bne $t3, $at, .L809FC7E0 +/* 00600 809FC7D0 15610003 */ bne $t3, $at, .L809FC7E0 /* 00604 809FC7D4 240CFFFF */ addiu $t4, $zero, 0xFFFF ## $t4 = FFFFFFFF -/* 00608 809FC7D8 10000002 */ beq $zero, $zero, .L809FC7E4 +/* 00608 809FC7D8 10000002 */ beq $zero, $zero, .L809FC7E4 /* 0060C 809FC7DC A10C042C */ sb $t4, 0x042C($t0) ## 0000042C .L809FC7E0: /* 00610 809FC7E0 A10D042C */ sb $t5, 0x042C($t0) ## 0000042C .L809FC7E4: -/* 00614 809FC7E4 C7A80034 */ lwc1 $f8, 0x0034($sp) +/* 00614 809FC7E4 C7A80034 */ lwc1 $f8, 0x0034($sp) /* 00618 809FC7E8 3C01BF80 */ lui $at, 0xBF80 ## $at = BF800000 -/* 0061C 809FC7EC 4608003E */ c.le.s $f0, $f8 +/* 0061C 809FC7EC 4608003E */ c.le.s $f0, $f8 /* 00620 809FC7F0 00000000 */ nop -/* 00624 809FC7F4 45020009 */ bc1fl .L809FC81C +/* 00624 809FC7F4 45020009 */ bc1fl .L809FC81C /* 00628 809FC7F8 44819000 */ mtc1 $at, $f18 ## $f18 = -1.00 /* 0062C 809FC7FC 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 /* 00630 809FC800 44815000 */ mtc1 $at, $f10 ## $f10 = 1.00 /* 00634 809FC804 00000000 */ nop -/* 00638 809FC808 4600540D */ trunc.w.s $f16, $f10 -/* 0063C 809FC80C 440F8000 */ mfc1 $t7, $f16 -/* 00640 809FC810 10000007 */ beq $zero, $zero, .L809FC830 +/* 00638 809FC808 4600540D */ trunc.w.s $f16, $f10 +/* 0063C 809FC80C 440F8000 */ mfc1 $t7, $f16 +/* 00640 809FC810 10000007 */ beq $zero, $zero, .L809FC830 /* 00644 809FC814 A10F042D */ sb $t7, 0x042D($t0) ## 0000042D /* 00648 809FC818 44819000 */ mtc1 $at, $f18 ## $f18 = 1.00 .L809FC81C: /* 0064C 809FC81C 00000000 */ nop -/* 00650 809FC820 4600918D */ trunc.w.s $f6, $f18 -/* 00654 809FC824 44193000 */ mfc1 $t9, $f6 +/* 00650 809FC820 4600918D */ trunc.w.s $f6, $f18 +/* 00654 809FC824 44193000 */ mfc1 $t9, $f6 /* 00658 809FC828 00000000 */ nop /* 0065C 809FC82C A119042D */ sb $t9, 0x042D($t0) ## 0000042D .L809FC830: -/* 00660 809FC830 1000000D */ beq $zero, $zero, .L809FC868 +/* 00660 809FC830 1000000D */ beq $zero, $zero, .L809FC868 /* 00664 809FC834 AD070430 */ sw $a3, 0x0430($t0) ## 00000430 /* 00668 809FC838 24010004 */ addiu $at, $zero, 0x0004 ## $at = 00000004 .L809FC83C: -/* 0066C 809FC83C 1521000A */ bne $t1, $at, .L809FC868 +/* 0066C 809FC83C 1521000A */ bne $t1, $at, .L809FC868 /* 00670 809FC840 3C014370 */ lui $at, 0x4370 ## $at = 43700000 /* 00674 809FC844 44812000 */ mtc1 $at, $f4 ## $f4 = 240.00 /* 00678 809FC848 C4E80090 */ lwc1 $f8, 0x0090($a3) ## 00000090 /* 0067C 809FC84C 3C0A80A0 */ lui $t2, %hi(func_809FC928) ## $t2 = 80A00000 /* 00680 809FC850 254AC928 */ addiu $t2, $t2, %lo(func_809FC928) ## $t2 = 809FC928 -/* 00684 809FC854 4608203C */ c.lt.s $f4, $f8 +/* 00684 809FC854 4608203C */ c.lt.s $f4, $f8 /* 00688 809FC858 00000000 */ nop -/* 0068C 809FC85C 45020003 */ bc1fl .L809FC86C -/* 00690 809FC860 8FBF0014 */ lw $ra, 0x0014($sp) +/* 0068C 809FC85C 45020003 */ bc1fl .L809FC86C +/* 00690 809FC860 8FBF0014 */ lw $ra, 0x0014($sp) /* 00694 809FC864 ACEA01D4 */ sw $t2, 0x01D4($a3) ## 000001D4 .L809FC868: -/* 00698 809FC868 8FBF0014 */ lw $ra, 0x0014($sp) +/* 00698 809FC868 8FBF0014 */ lw $ra, 0x0014($sp) .L809FC86C: /* 0069C 809FC86C 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 -/* 006A0 809FC870 03E00008 */ jr $ra +/* 006A0 809FC870 03E00008 */ jr $ra /* 006A4 809FC874 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ds/EnDs_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Ds/EnDs_Destroy.s deleted file mode 100644 index ad0db85ec6..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ds/EnDs_Destroy.s +++ /dev/null @@ -1,6 +0,0 @@ -glabel EnDs_Destroy -/* 000D0 809FD100 AFA40000 */ sw $a0, 0x0000($sp) -/* 000D4 809FD104 03E00008 */ jr $ra -/* 000D8 809FD108 AFA50004 */ sw $a1, 0x0004($sp) - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ds/EnDs_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Ds/EnDs_Draw.s deleted file mode 100644 index e1f7b0fe80..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ds/EnDs_Draw.s +++ /dev/null @@ -1,27 +0,0 @@ -glabel EnDs_Draw -/* 00A8C 809FDABC 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 00A90 809FDAC0 AFBF0024 */ sw $ra, 0x0024($sp) -/* 00A94 809FDAC4 AFA40028 */ sw $a0, 0x0028($sp) -/* 00A98 809FDAC8 AFA5002C */ sw $a1, 0x002C($sp) -/* 00A9C 809FDACC 0C0250F2 */ jal func_800943C8 -/* 00AA0 809FDAD0 8CA40000 */ lw $a0, 0x0000($a1) ## 00000000 -/* 00AA4 809FDAD4 8FA20028 */ lw $v0, 0x0028($sp) -/* 00AA8 809FDAD8 3C0F80A0 */ lui $t7, %hi(func_809FDA38) ## $t7 = 80A00000 -/* 00AAC 809FDADC 3C1880A0 */ lui $t8, %hi(func_809FDA7C) ## $t8 = 80A00000 -/* 00AB0 809FDAE0 8C450150 */ lw $a1, 0x0150($v0) ## 00000150 -/* 00AB4 809FDAE4 8C46016C */ lw $a2, 0x016C($v0) ## 0000016C -/* 00AB8 809FDAE8 9047014E */ lbu $a3, 0x014E($v0) ## 0000014E -/* 00ABC 809FDAEC 2718DA7C */ addiu $t8, $t8, %lo(func_809FDA7C) ## $t8 = 809FDA7C -/* 00AC0 809FDAF0 25EFDA38 */ addiu $t7, $t7, %lo(func_809FDA38) ## $t7 = 809FDA38 -/* 00AC4 809FDAF4 AFAF0010 */ sw $t7, 0x0010($sp) -/* 00AC8 809FDAF8 AFB80014 */ sw $t8, 0x0014($sp) -/* 00ACC 809FDAFC 8FA4002C */ lw $a0, 0x002C($sp) -/* 00AD0 809FDB00 0C0286B2 */ jal func_800A1AC8 -/* 00AD4 809FDB04 AFA20018 */ sw $v0, 0x0018($sp) -/* 00AD8 809FDB08 8FBF0024 */ lw $ra, 0x0024($sp) -/* 00ADC 809FDB0C 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 00AE0 809FDB10 03E00008 */ jr $ra -/* 00AE4 809FDB14 00000000 */ nop -/* 00AE8 809FDB18 00000000 */ nop -/* 00AEC 809FDB1C 00000000 */ nop - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ds/EnDs_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Ds/EnDs_Init.s deleted file mode 100644 index eda442f9cb..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ds/EnDs_Init.s +++ /dev/null @@ -1,57 +0,0 @@ -glabel EnDs_Init -/* 00000 809FD030 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 00004 809FD034 AFB00028 */ sw $s0, 0x0028($sp) -/* 00008 809FD038 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 0000C 809FD03C AFBF002C */ sw $ra, 0x002C($sp) -/* 00010 809FD040 AFA5003C */ sw $a1, 0x003C($sp) -/* 00014 809FD044 3C068003 */ lui $a2, 0x8003 ## $a2 = 80030000 -/* 00018 809FD048 24C6B5EC */ addiu $a2, $a2, 0xB5EC ## $a2 = 8002B5EC -/* 0001C 809FD04C 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 -/* 00020 809FD050 248400B4 */ addiu $a0, $a0, 0x00B4 ## $a0 = 000000B4 -/* 00024 809FD054 0C00AC78 */ jal ActorShape_Init - -/* 00028 809FD058 3C074210 */ lui $a3, 0x4210 ## $a3 = 42100000 -/* 0002C 809FD05C 2605014C */ addiu $a1, $s0, 0x014C ## $a1 = 0000014C -/* 00030 809FD060 3C060600 */ lui $a2, 0x0600 ## $a2 = 06000000 -/* 00034 809FD064 3C070600 */ lui $a3, 0x0600 ## $a3 = 06000000 -/* 00038 809FD068 260E0190 */ addiu $t6, $s0, 0x0190 ## $t6 = 00000190 -/* 0003C 809FD06C 260F01B4 */ addiu $t7, $s0, 0x01B4 ## $t7 = 000001B4 -/* 00040 809FD070 24180006 */ addiu $t8, $zero, 0x0006 ## $t8 = 00000006 -/* 00044 809FD074 AFB80018 */ sw $t8, 0x0018($sp) -/* 00048 809FD078 AFAF0014 */ sw $t7, 0x0014($sp) -/* 0004C 809FD07C AFAE0010 */ sw $t6, 0x0010($sp) -/* 00050 809FD080 24E7039C */ addiu $a3, $a3, 0x039C ## $a3 = 0600039C -/* 00054 809FD084 24C64768 */ addiu $a2, $a2, 0x4768 ## $a2 = 06004768 -/* 00058 809FD088 AFA50030 */ sw $a1, 0x0030($sp) -/* 0005C 809FD08C 0C0291BE */ jal func_800A46F8 -/* 00060 809FD090 8FA4003C */ lw $a0, 0x003C($sp) -/* 00064 809FD094 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 00068 809FD098 24A5039C */ addiu $a1, $a1, 0x039C ## $a1 = 0600039C -/* 0006C 809FD09C 0C02947A */ jal func_800A51E8 -/* 00070 809FD0A0 8FA40030 */ lw $a0, 0x0030($sp) -/* 00074 809FD0A4 241900FF */ addiu $t9, $zero, 0x00FF ## $t9 = 000000FF -/* 00078 809FD0A8 3C053C54 */ lui $a1, 0x3C54 ## $a1 = 3C540000 -/* 0007C 809FD0AC A21900AE */ sb $t9, 0x00AE($s0) ## 000000AE -/* 00080 809FD0B0 34A5FDF4 */ ori $a1, $a1, 0xFDF4 ## $a1 = 3C54FDF4 -/* 00084 809FD0B4 0C00B58B */ jal Actor_SetScale - -/* 00088 809FD0B8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0008C 809FD0BC 8E0A0004 */ lw $t2, 0x0004($s0) ## 00000004 -/* 00090 809FD0C0 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 -/* 00094 809FD0C4 3C0880A0 */ lui $t0, %hi(func_809FD7B4) ## $t0 = 80A00000 -/* 00098 809FD0C8 2401FFFE */ addiu $at, $zero, 0xFFFE ## $at = FFFFFFFE -/* 0009C 809FD0CC 2508D7B4 */ addiu $t0, $t0, %lo(func_809FD7B4) ## $t0 = 809FD7B4 -/* 000A0 809FD0D0 24090001 */ addiu $t1, $zero, 0x0001 ## $t1 = 00000001 -/* 000A4 809FD0D4 01415824 */ and $t3, $t2, $at -/* 000A8 809FD0D8 AE0801EC */ sw $t0, 0x01EC($s0) ## 000001EC -/* 000AC 809FD0DC A209001F */ sb $t1, 0x001F($s0) ## 0000001F -/* 000B0 809FD0E0 A60001E8 */ sh $zero, 0x01E8($s0) ## 000001E8 -/* 000B4 809FD0E4 AE0B0004 */ sw $t3, 0x0004($s0) ## 00000004 -/* 000B8 809FD0E8 E60401E4 */ swc1 $f4, 0x01E4($s0) ## 000001E4 -/* 000BC 809FD0EC 8FBF002C */ lw $ra, 0x002C($sp) -/* 000C0 809FD0F0 8FB00028 */ lw $s0, 0x0028($sp) -/* 000C4 809FD0F4 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 -/* 000C8 809FD0F8 03E00008 */ jr $ra -/* 000CC 809FD0FC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ds/EnDs_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Ds/EnDs_Update.s deleted file mode 100644 index df02d4f5b6..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ds/EnDs_Update.s +++ /dev/null @@ -1,77 +0,0 @@ -glabel EnDs_Update -/* 00900 809FD930 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 00904 809FD934 AFB00028 */ sw $s0, 0x0028($sp) -/* 00908 809FD938 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 0090C 809FD93C AFBF002C */ sw $ra, 0x002C($sp) -/* 00910 809FD940 AFA50034 */ sw $a1, 0x0034($sp) -/* 00914 809FD944 0C02927F */ jal SkelAnime_FrameUpdateMatrix - -/* 00918 809FD948 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 0091C 809FD94C 50400005 */ beql $v0, $zero, .L809FD964 -/* 00920 809FD950 8E1901EC */ lw $t9, 0x01EC($s0) ## 000001EC -/* 00924 809FD954 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 -/* 00928 809FD958 00000000 */ nop -/* 0092C 809FD95C E6040164 */ swc1 $f4, 0x0164($s0) ## 00000164 -/* 00930 809FD960 8E1901EC */ lw $t9, 0x01EC($s0) ## 000001EC -.L809FD964: -/* 00934 809FD964 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00938 809FD968 8FA50034 */ lw $a1, 0x0034($sp) -/* 0093C 809FD96C 0320F809 */ jalr $ra, $t9 -/* 00940 809FD970 00000000 */ nop -/* 00944 809FD974 960E01E8 */ lhu $t6, 0x01E8($s0) ## 000001E8 -/* 00948 809FD978 260401D8 */ addiu $a0, $s0, 0x01D8 ## $a0 = 000001D8 -/* 0094C 809FD97C 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 00950 809FD980 31CF0001 */ andi $t7, $t6, 0x0001 ## $t7 = 00000000 -/* 00954 809FD984 11E0000E */ beq $t7, $zero, .L809FD9C0 -/* 00958 809FD988 24060006 */ addiu $a2, $zero, 0x0006 ## $a2 = 00000006 -/* 0095C 809FD98C 8E080038 */ lw $t0, 0x0038($s0) ## 00000038 -/* 00960 809FD990 8FA40034 */ lw $a0, 0x0034($sp) -/* 00964 809FD994 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 00968 809FD998 AFA80010 */ sw $t0, 0x0010($sp) -/* 0096C 809FD99C 8E18003C */ lw $t8, 0x003C($s0) ## 0000003C -/* 00970 809FD9A0 260601D8 */ addiu $a2, $s0, 0x01D8 ## $a2 = 000001D8 -/* 00974 809FD9A4 260701DE */ addiu $a3, $s0, 0x01DE ## $a3 = 000001DE -/* 00978 809FD9A8 AFB80014 */ sw $t8, 0x0014($sp) -/* 0097C 809FD9AC 8E080040 */ lw $t0, 0x0040($s0) ## 00000040 -/* 00980 809FD9B0 0C00E0A4 */ jal func_80038290 -/* 00984 809FD9B4 AFA80018 */ sw $t0, 0x0018($sp) -/* 00988 809FD9B8 1000001B */ beq $zero, $zero, .L809FDA28 -/* 0098C 809FD9BC 8FBF002C */ lw $ra, 0x002C($sp) -.L809FD9C0: -/* 00990 809FD9C0 24090064 */ addiu $t1, $zero, 0x0064 ## $t1 = 00000064 -/* 00994 809FD9C4 AFA90010 */ sw $t1, 0x0010($sp) -/* 00998 809FD9C8 0C01E1A7 */ jal Math_SmoothScaleMaxMinS - -/* 0099C 809FD9CC 24071838 */ addiu $a3, $zero, 0x1838 ## $a3 = 00001838 -/* 009A0 809FD9D0 240A0064 */ addiu $t2, $zero, 0x0064 ## $t2 = 00000064 -/* 009A4 809FD9D4 AFAA0010 */ sw $t2, 0x0010($sp) -/* 009A8 809FD9D8 260401DA */ addiu $a0, $s0, 0x01DA ## $a0 = 000001DA -/* 009AC 809FD9DC 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 009B0 809FD9E0 24060006 */ addiu $a2, $zero, 0x0006 ## $a2 = 00000006 -/* 009B4 809FD9E4 0C01E1A7 */ jal Math_SmoothScaleMaxMinS - -/* 009B8 809FD9E8 24071838 */ addiu $a3, $zero, 0x1838 ## $a3 = 00001838 -/* 009BC 809FD9EC 240B0064 */ addiu $t3, $zero, 0x0064 ## $t3 = 00000064 -/* 009C0 809FD9F0 AFAB0010 */ sw $t3, 0x0010($sp) -/* 009C4 809FD9F4 260401DE */ addiu $a0, $s0, 0x01DE ## $a0 = 000001DE -/* 009C8 809FD9F8 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 009CC 809FD9FC 24060006 */ addiu $a2, $zero, 0x0006 ## $a2 = 00000006 -/* 009D0 809FDA00 0C01E1A7 */ jal Math_SmoothScaleMaxMinS - -/* 009D4 809FDA04 24071838 */ addiu $a3, $zero, 0x1838 ## $a3 = 00001838 -/* 009D8 809FDA08 240C0064 */ addiu $t4, $zero, 0x0064 ## $t4 = 00000064 -/* 009DC 809FDA0C AFAC0010 */ sw $t4, 0x0010($sp) -/* 009E0 809FDA10 260401E0 */ addiu $a0, $s0, 0x01E0 ## $a0 = 000001E0 -/* 009E4 809FDA14 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 009E8 809FDA18 24060006 */ addiu $a2, $zero, 0x0006 ## $a2 = 00000006 -/* 009EC 809FDA1C 0C01E1A7 */ jal Math_SmoothScaleMaxMinS - -/* 009F0 809FDA20 24071838 */ addiu $a3, $zero, 0x1838 ## $a3 = 00001838 -/* 009F4 809FDA24 8FBF002C */ lw $ra, 0x002C($sp) -.L809FDA28: -/* 009F8 809FDA28 8FB00028 */ lw $s0, 0x0028($sp) -/* 009FC 809FDA2C 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 00A00 809FDA30 03E00008 */ jr $ra -/* 00A04 809FDA34 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ds/func_809FD10C.s b/asm/non_matchings/overlays/actors/ovl_En_Ds/func_809FD10C.s deleted file mode 100644 index 5ed3725ce8..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ds/func_809FD10C.s +++ /dev/null @@ -1,25 +0,0 @@ -glabel func_809FD10C -/* 000DC 809FD10C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 000E0 809FD110 AFBF0014 */ sw $ra, 0x0014($sp) -/* 000E4 809FD114 0C00BCCD */ jal func_8002F334 -/* 000E8 809FD118 AFA40018 */ sw $a0, 0x0018($sp) -/* 000EC 809FD11C 10400009 */ beq $v0, $zero, .L809FD144 -/* 000F0 809FD120 8FA40018 */ lw $a0, 0x0018($sp) -/* 000F4 809FD124 8C8F0004 */ lw $t7, 0x0004($a0) ## 00000004 -/* 000F8 809FD128 3C01FFFE */ lui $at, 0xFFFE ## $at = FFFE0000 -/* 000FC 809FD12C 3C0E80A0 */ lui $t6, %hi(func_809FD7B4) ## $t6 = 80A00000 -/* 00100 809FD130 3421FFFF */ ori $at, $at, 0xFFFF ## $at = FFFEFFFF -/* 00104 809FD134 25CED7B4 */ addiu $t6, $t6, %lo(func_809FD7B4) ## $t6 = 809FD7B4 -/* 00108 809FD138 01E1C024 */ and $t8, $t7, $at -/* 0010C 809FD13C AC8E01EC */ sw $t6, 0x01EC($a0) ## 000001EC -/* 00110 809FD140 AC980004 */ sw $t8, 0x0004($a0) ## 00000004 -.L809FD144: -/* 00114 809FD144 949901E8 */ lhu $t9, 0x01E8($a0) ## 000001E8 -/* 00118 809FD148 37280001 */ ori $t0, $t9, 0x0001 ## $t0 = 00000001 -/* 0011C 809FD14C A48801E8 */ sh $t0, 0x01E8($a0) ## 000001E8 -/* 00120 809FD150 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00124 809FD154 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00128 809FD158 03E00008 */ jr $ra -/* 0012C 809FD15C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ds/func_809FD160.s b/asm/non_matchings/overlays/actors/ovl_En_Ds/func_809FD160.s deleted file mode 100644 index 8126cd21f6..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ds/func_809FD160.s +++ /dev/null @@ -1,31 +0,0 @@ -glabel func_809FD160 -/* 00130 809FD160 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00134 809FD164 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00138 809FD168 AFA40018 */ sw $a0, 0x0018($sp) -/* 0013C 809FD16C AFA5001C */ sw $a1, 0x001C($sp) -/* 00140 809FD170 0C042F6F */ jal func_8010BDBC -/* 00144 809FD174 24A420D8 */ addiu $a0, $a1, 0x20D8 ## $a0 = 000020D8 -/* 00148 809FD178 24010005 */ addiu $at, $zero, 0x0005 ## $at = 00000005 -/* 0014C 809FD17C 5441000C */ bnel $v0, $at, .L809FD1B0 -/* 00150 809FD180 8FA20018 */ lw $v0, 0x0018($sp) -/* 00154 809FD184 0C041AF2 */ jal func_80106BC8 -/* 00158 809FD188 8FA4001C */ lw $a0, 0x001C($sp) -/* 0015C 809FD18C 50400008 */ beql $v0, $zero, .L809FD1B0 -/* 00160 809FD190 8FA20018 */ lw $v0, 0x0018($sp) -/* 00164 809FD194 0C041B33 */ jal func_80106CCC -/* 00168 809FD198 8FA4001C */ lw $a0, 0x001C($sp) -/* 0016C 809FD19C 8FA20018 */ lw $v0, 0x0018($sp) -/* 00170 809FD1A0 3C0E80A0 */ lui $t6, %hi(func_809FD7B4) ## $t6 = 80A00000 -/* 00174 809FD1A4 25CED7B4 */ addiu $t6, $t6, %lo(func_809FD7B4) ## $t6 = 809FD7B4 -/* 00178 809FD1A8 AC4E01EC */ sw $t6, 0x01EC($v0) ## 000001EC -/* 0017C 809FD1AC 8FA20018 */ lw $v0, 0x0018($sp) -.L809FD1B0: -/* 00180 809FD1B0 944F01E8 */ lhu $t7, 0x01E8($v0) ## 000001E8 -/* 00184 809FD1B4 35F80001 */ ori $t8, $t7, 0x0001 ## $t8 = 00000001 -/* 00188 809FD1B8 A45801E8 */ sh $t8, 0x01E8($v0) ## 000001E8 -/* 0018C 809FD1BC 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00190 809FD1C0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00194 809FD1C4 03E00008 */ jr $ra -/* 00198 809FD1C8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ds/func_809FD1CC.s b/asm/non_matchings/overlays/actors/ovl_En_Ds/func_809FD1CC.s deleted file mode 100644 index 401d81c1b0..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ds/func_809FD1CC.s +++ /dev/null @@ -1,27 +0,0 @@ -glabel func_809FD1CC -/* 0019C 809FD1CC 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 001A0 809FD1D0 AFBF0014 */ sw $ra, 0x0014($sp) -/* 001A4 809FD1D4 AFA5001C */ sw $a1, 0x001C($sp) -/* 001A8 809FD1D8 0C00BC65 */ jal func_8002F194 -/* 001AC 809FD1DC AFA40018 */ sw $a0, 0x0018($sp) -/* 001B0 809FD1E0 10400005 */ beq $v0, $zero, .L809FD1F8 -/* 001B4 809FD1E4 8FA40018 */ lw $a0, 0x0018($sp) -/* 001B8 809FD1E8 3C0E80A0 */ lui $t6, %hi(func_809FD10C) ## $t6 = 80A00000 -/* 001BC 809FD1EC 25CED10C */ addiu $t6, $t6, %lo(func_809FD10C) ## $t6 = 809FD10C -/* 001C0 809FD1F0 10000008 */ beq $zero, $zero, .L809FD214 -/* 001C4 809FD1F4 AC8E01EC */ sw $t6, 0x01EC($a0) ## 000001EC -.L809FD1F8: -/* 001C8 809FD1F8 8C8F0004 */ lw $t7, 0x0004($a0) ## 00000004 -/* 001CC 809FD1FC 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 001D0 809FD200 3C06447A */ lui $a2, 0x447A ## $a2 = 447A0000 -/* 001D4 809FD204 01E1C025 */ or $t8, $t7, $at ## $t8 = 00010000 -/* 001D8 809FD208 AC980004 */ sw $t8, 0x0004($a0) ## 00000004 -/* 001DC 809FD20C 0C00BCB3 */ jal func_8002F2CC -/* 001E0 809FD210 8FA5001C */ lw $a1, 0x001C($sp) -.L809FD214: -/* 001E4 809FD214 8FBF0014 */ lw $ra, 0x0014($sp) -/* 001E8 809FD218 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 001EC 809FD21C 03E00008 */ jr $ra -/* 001F0 809FD220 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ds/func_809FD224.s b/asm/non_matchings/overlays/actors/ovl_En_Ds/func_809FD224.s deleted file mode 100644 index c2d26d0249..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ds/func_809FD224.s +++ /dev/null @@ -1,28 +0,0 @@ -glabel func_809FD224 -/* 001F4 809FD224 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 001F8 809FD228 AFBF0014 */ sw $ra, 0x0014($sp) -/* 001FC 809FD22C 0C00BCCD */ jal func_8002F334 -/* 00200 809FD230 AFA40018 */ sw $a0, 0x0018($sp) -/* 00204 809FD234 1040000F */ beq $v0, $zero, .L809FD274 -/* 00208 809FD238 8FA40018 */ lw $a0, 0x0018($sp) -/* 0020C 809FD23C 8C980004 */ lw $t8, 0x0004($a0) ## 00000004 -/* 00210 809FD240 3C0F80A0 */ lui $t7, %hi(func_809FD1CC) ## $t7 = 80A00000 -/* 00214 809FD244 2401FEFF */ addiu $at, $zero, 0xFEFF ## $at = FFFFFEFF -/* 00218 809FD248 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 0021C 809FD24C 240E504F */ addiu $t6, $zero, 0x504F ## $t6 = 0000504F -/* 00220 809FD250 25EFD1CC */ addiu $t7, $t7, %lo(func_809FD1CC) ## $t7 = 809FD1CC -/* 00224 809FD254 0301C824 */ and $t9, $t8, $at -/* 00228 809FD258 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 -/* 0022C 809FD25C A48E010E */ sh $t6, 0x010E($a0) ## 0000010E -/* 00230 809FD260 AC8F01EC */ sw $t7, 0x01EC($a0) ## 000001EC -/* 00234 809FD264 AC990004 */ sw $t9, 0x0004($a0) ## 00000004 -/* 00238 809FD268 94480EF6 */ lhu $t0, 0x0EF6($v0) ## 8015F556 -/* 0023C 809FD26C 35090001 */ ori $t1, $t0, 0x0001 ## $t1 = 00000001 -/* 00240 809FD270 A4490EF6 */ sh $t1, 0x0EF6($v0) ## 8015F556 -.L809FD274: -/* 00244 809FD274 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00248 809FD278 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 0024C 809FD27C 03E00008 */ jr $ra -/* 00250 809FD280 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ds/func_809FD284.s b/asm/non_matchings/overlays/actors/ovl_En_Ds/func_809FD284.s deleted file mode 100644 index ecb6f96883..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ds/func_809FD284.s +++ /dev/null @@ -1,31 +0,0 @@ -glabel func_809FD284 -/* 00254 809FD284 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 00258 809FD288 AFBF001C */ sw $ra, 0x001C($sp) -/* 0025C 809FD28C AFA50024 */ sw $a1, 0x0024($sp) -/* 00260 809FD290 0C00BD04 */ jal func_8002F410 -/* 00264 809FD294 AFA40020 */ sw $a0, 0x0020($sp) -/* 00268 809FD298 10400008 */ beq $v0, $zero, .L809FD2BC -/* 0026C 809FD29C 8FA40020 */ lw $a0, 0x0020($sp) -/* 00270 809FD2A0 3C0E80A0 */ lui $t6, %hi(func_809FD224) ## $t6 = 80A00000 -/* 00274 809FD2A4 25CED224 */ addiu $t6, $t6, %lo(func_809FD224) ## $t6 = 809FD224 -/* 00278 809FD2A8 AC800118 */ sw $zero, 0x0118($a0) ## 00000118 -/* 0027C 809FD2AC AC8E01EC */ sw $t6, 0x01EC($a0) ## 000001EC -/* 00280 809FD2B0 3C018016 */ lui $at, 0x8016 ## $at = 80160000 -/* 00284 809FD2B4 10000009 */ beq $zero, $zero, .L809FD2DC -/* 00288 809FD2B8 A420FA32 */ sh $zero, -0x05CE($at) ## 8015FA32 -.L809FD2BC: -/* 0028C 809FD2BC 3C014248 */ lui $at, 0x4248 ## $at = 42480000 -/* 00290 809FD2C0 44812000 */ mtc1 $at, $f4 ## $f4 = 50.00 -/* 00294 809FD2C4 3C07461C */ lui $a3, 0x461C ## $a3 = 461C0000 -/* 00298 809FD2C8 34E74000 */ ori $a3, $a3, 0x4000 ## $a3 = 461C4000 -/* 0029C 809FD2CC 8FA50024 */ lw $a1, 0x0024($sp) -/* 002A0 809FD2D0 24060020 */ addiu $a2, $zero, 0x0020 ## $a2 = 00000020 -/* 002A4 809FD2D4 0C00BD0D */ jal func_8002F434 -/* 002A8 809FD2D8 E7A40010 */ swc1 $f4, 0x0010($sp) -.L809FD2DC: -/* 002AC 809FD2DC 8FBF001C */ lw $ra, 0x001C($sp) -/* 002B0 809FD2E0 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 002B4 809FD2E4 03E00008 */ jr $ra -/* 002B8 809FD2E8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ds/func_809FD2EC.s b/asm/non_matchings/overlays/actors/ovl_En_Ds/func_809FD2EC.s deleted file mode 100644 index 14adfa57be..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ds/func_809FD2EC.s +++ /dev/null @@ -1,35 +0,0 @@ -glabel func_809FD2EC -/* 002BC 809FD2EC 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 002C0 809FD2F0 AFBF001C */ sw $ra, 0x001C($sp) -/* 002C4 809FD2F4 AFA40020 */ sw $a0, 0x0020($sp) -/* 002C8 809FD2F8 AFA50024 */ sw $a1, 0x0024($sp) -/* 002CC 809FD2FC 0C042F6F */ jal func_8010BDBC -/* 002D0 809FD300 24A420D8 */ addiu $a0, $a1, 0x20D8 ## $a0 = 000020D8 -/* 002D4 809FD304 24010005 */ addiu $at, $zero, 0x0005 ## $at = 00000005 -/* 002D8 809FD308 54410014 */ bnel $v0, $at, .L809FD35C -/* 002DC 809FD30C 8FBF001C */ lw $ra, 0x001C($sp) -/* 002E0 809FD310 0C041AF2 */ jal func_80106BC8 -/* 002E4 809FD314 8FA40024 */ lw $a0, 0x0024($sp) -/* 002E8 809FD318 50400010 */ beql $v0, $zero, .L809FD35C -/* 002EC 809FD31C 8FBF001C */ lw $ra, 0x001C($sp) -/* 002F0 809FD320 0C041B33 */ jal func_80106CCC -/* 002F4 809FD324 8FA40024 */ lw $a0, 0x0024($sp) -/* 002F8 809FD328 8FA40020 */ lw $a0, 0x0020($sp) -/* 002FC 809FD32C 3C0E80A0 */ lui $t6, %hi(func_809FD284) ## $t6 = 80A00000 -/* 00300 809FD330 3C014248 */ lui $at, 0x4248 ## $at = 42480000 -/* 00304 809FD334 44812000 */ mtc1 $at, $f4 ## $f4 = 50.00 -/* 00308 809FD338 25CED284 */ addiu $t6, $t6, %lo(func_809FD284) ## $t6 = 809FD284 -/* 0030C 809FD33C 3C07461C */ lui $a3, 0x461C ## $a3 = 461C0000 -/* 00310 809FD340 AC8E01EC */ sw $t6, 0x01EC($a0) ## 000001EC -/* 00314 809FD344 8FA50024 */ lw $a1, 0x0024($sp) -/* 00318 809FD348 34E74000 */ ori $a3, $a3, 0x4000 ## $a3 = 461C4000 -/* 0031C 809FD34C 24060020 */ addiu $a2, $zero, 0x0020 ## $a2 = 00000020 -/* 00320 809FD350 0C00BD0D */ jal func_8002F434 -/* 00324 809FD354 E7A40010 */ swc1 $f4, 0x0010($sp) -/* 00328 809FD358 8FBF001C */ lw $ra, 0x001C($sp) -.L809FD35C: -/* 0032C 809FD35C 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 00330 809FD360 03E00008 */ jr $ra -/* 00334 809FD364 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ds/func_809FD368.s b/asm/non_matchings/overlays/actors/ovl_En_Ds/func_809FD368.s deleted file mode 100644 index 2dae152659..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ds/func_809FD368.s +++ /dev/null @@ -1,47 +0,0 @@ -glabel func_809FD368 -/* 00338 809FD368 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 0033C 809FD36C AFBF0024 */ sw $ra, 0x0024($sp) -/* 00340 809FD370 AFB00020 */ sw $s0, 0x0020($sp) -/* 00344 809FD374 AFA5002C */ sw $a1, 0x002C($sp) -/* 00348 809FD378 948201EA */ lhu $v0, 0x01EA($a0) ## 000001EA -/* 0034C 809FD37C 3C0F80A0 */ lui $t7, %hi(func_809FD2EC) ## $t7 = 80A00000 -/* 00350 809FD380 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00354 809FD384 18400004 */ blez $v0, .L809FD398 -/* 00358 809FD388 25EFD2EC */ addiu $t7, $t7, %lo(func_809FD2EC) ## $t7 = 809FD2EC -/* 0035C 809FD38C 244EFFFF */ addiu $t6, $v0, 0xFFFF ## $t6 = FFFFFFFF -/* 00360 809FD390 10000005 */ beq $zero, $zero, .L809FD3A8 -/* 00364 809FD394 A48E01EA */ sh $t6, 0x01EA($a0) ## 000001EA -.L809FD398: -/* 00368 809FD398 AE0F01EC */ sw $t7, 0x01EC($s0) ## 000001EC -/* 0036C 809FD39C 8FA4002C */ lw $a0, 0x002C($sp) -/* 00370 809FD3A0 0C042DC8 */ jal func_8010B720 -/* 00374 809FD3A4 2405504D */ addiu $a1, $zero, 0x504D ## $a1 = 0000504D -.L809FD3A8: -/* 00378 809FD3A8 3C063CF5 */ lui $a2, 0x3CF5 ## $a2 = 3CF50000 -/* 0037C 809FD3AC 34C6C28F */ ori $a2, $a2, 0xC28F ## $a2 = 3CF5C28F -/* 00380 809FD3B0 260401E4 */ addiu $a0, $s0, 0x01E4 ## $a0 = 000001E4 -/* 00384 809FD3B4 0C01DE80 */ jal Math_ApproxF - -/* 00388 809FD3B8 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 -/* 0038C 809FD3BC 3C014000 */ lui $at, 0x4000 ## $at = 40000000 -/* 00390 809FD3C0 44812000 */ mtc1 $at, $f4 ## $f4 = 2.00 -/* 00394 809FD3C4 C60001E4 */ lwc1 $f0, 0x01E4($s0) ## 000001E4 -/* 00398 809FD3C8 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 0039C 809FD3CC 44815000 */ mtc1 $at, $f10 ## $f10 = 1.00 -/* 003A0 809FD3D0 46002181 */ sub.s $f6, $f4, $f0 -/* 003A4 809FD3D4 3C073DCC */ lui $a3, 0x3DCC ## $a3 = 3DCC0000 -/* 003A8 809FD3D8 34E7CCCD */ ori $a3, $a3, 0xCCCD ## $a3 = 3DCCCCCD -/* 003AC 809FD3DC 8FA4002C */ lw $a0, 0x002C($sp) -/* 003B0 809FD3E0 46060202 */ mul.s $f8, $f0, $f6 -/* 003B4 809FD3E4 24060000 */ addiu $a2, $zero, 0x0000 ## $a2 = 00000000 -/* 003B8 809FD3E8 E7AA0010 */ swc1 $f10, 0x0010($sp) -/* 003BC 809FD3EC 44054000 */ mfc1 $a1, $f8 -/* 003C0 809FD3F0 0C01DCEA */ jal func_800773A8 -/* 003C4 809FD3F4 00000000 */ nop -/* 003C8 809FD3F8 8FBF0024 */ lw $ra, 0x0024($sp) -/* 003CC 809FD3FC 8FB00020 */ lw $s0, 0x0020($sp) -/* 003D0 809FD400 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 003D4 809FD404 03E00008 */ jr $ra -/* 003D8 809FD408 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ds/func_809FD40C.s b/asm/non_matchings/overlays/actors/ovl_En_Ds/func_809FD40C.s deleted file mode 100644 index 695c3f9dab..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ds/func_809FD40C.s +++ /dev/null @@ -1,27 +0,0 @@ -glabel func_809FD40C -/* 003DC 809FD40C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 003E0 809FD410 AFBF0014 */ sw $ra, 0x0014($sp) -/* 003E4 809FD414 948201EA */ lhu $v0, 0x01EA($a0) ## 000001EA -/* 003E8 809FD418 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 -/* 003EC 809FD41C 00A03825 */ or $a3, $a1, $zero ## $a3 = 00000000 -/* 003F0 809FD420 18400004 */ blez $v0, .L809FD434 -/* 003F4 809FD424 3C0F80A0 */ lui $t7, %hi(func_809FD368) ## $t7 = 80A00000 -/* 003F8 809FD428 244EFFFF */ addiu $t6, $v0, 0xFFFF ## $t6 = FFFFFFFF -/* 003FC 809FD42C 10000008 */ beq $zero, $zero, .L809FD450 -/* 00400 809FD430 A48E01EA */ sh $t6, 0x01EA($a0) ## 000001EA -.L809FD434: -/* 00404 809FD434 25EFD368 */ addiu $t7, $t7, %lo(func_809FD368) ## $t7 = 809FD368 -/* 00408 809FD438 2418003C */ addiu $t8, $zero, 0x003C ## $t8 = 0000003C -/* 0040C 809FD43C ACCF01EC */ sw $t7, 0x01EC($a2) ## 000001EC -/* 00410 809FD440 A4D801EA */ sh $t8, 0x01EA($a2) ## 000001EA -/* 00414 809FD444 00E02025 */ or $a0, $a3, $zero ## $a0 = 00000000 -/* 00418 809FD448 0C00B2ED */ jal Flags_UnsetSwitch - -/* 0041C 809FD44C 2405003F */ addiu $a1, $zero, 0x003F ## $a1 = 0000003F -.L809FD450: -/* 00420 809FD450 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00424 809FD454 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00428 809FD458 03E00008 */ jr $ra -/* 0042C 809FD45C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ds/func_809FD460.s b/asm/non_matchings/overlays/actors/ovl_En_Ds/func_809FD460.s deleted file mode 100644 index fd9b127e81..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ds/func_809FD460.s +++ /dev/null @@ -1,46 +0,0 @@ -glabel func_809FD460 -/* 00430 809FD460 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 00434 809FD464 AFBF0024 */ sw $ra, 0x0024($sp) -/* 00438 809FD468 AFB00020 */ sw $s0, 0x0020($sp) -/* 0043C 809FD46C AFA5002C */ sw $a1, 0x002C($sp) -/* 00440 809FD470 948201EA */ lhu $v0, 0x01EA($a0) ## 000001EA -/* 00444 809FD474 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00448 809FD478 3C053F80 */ lui $a1, 0x3F80 ## $a1 = 3F800000 -/* 0044C 809FD47C 18400004 */ blez $v0, .L809FD490 -/* 00450 809FD480 3C063C23 */ lui $a2, 0x3C23 ## $a2 = 3C230000 -/* 00454 809FD484 244EFFFF */ addiu $t6, $v0, 0xFFFF ## $t6 = FFFFFFFF -/* 00458 809FD488 10000006 */ beq $zero, $zero, .L809FD4A4 -/* 0045C 809FD48C A48E01EA */ sh $t6, 0x01EA($a0) ## 000001EA -.L809FD490: -/* 00460 809FD490 3C0F80A0 */ lui $t7, %hi(func_809FD40C) ## $t7 = 80A00000 -/* 00464 809FD494 25EFD40C */ addiu $t7, $t7, %lo(func_809FD40C) ## $t7 = 809FD40C -/* 00468 809FD498 24180014 */ addiu $t8, $zero, 0x0014 ## $t8 = 00000014 -/* 0046C 809FD49C AE0F01EC */ sw $t7, 0x01EC($s0) ## 000001EC -/* 00470 809FD4A0 A61801EA */ sh $t8, 0x01EA($s0) ## 000001EA -.L809FD4A4: -/* 00474 809FD4A4 260401E4 */ addiu $a0, $s0, 0x01E4 ## $a0 = 000001E4 -/* 00478 809FD4A8 0C01DE80 */ jal Math_ApproxF - -/* 0047C 809FD4AC 34C6D70A */ ori $a2, $a2, 0xD70A ## $a2 = 3C23D70A -/* 00480 809FD4B0 3C014000 */ lui $at, 0x4000 ## $at = 40000000 -/* 00484 809FD4B4 44812000 */ mtc1 $at, $f4 ## $f4 = 2.00 -/* 00488 809FD4B8 C60001E4 */ lwc1 $f0, 0x01E4($s0) ## 000001E4 -/* 0048C 809FD4BC 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 00490 809FD4C0 44815000 */ mtc1 $at, $f10 ## $f10 = 1.00 -/* 00494 809FD4C4 46002181 */ sub.s $f6, $f4, $f0 -/* 00498 809FD4C8 3C073DCC */ lui $a3, 0x3DCC ## $a3 = 3DCC0000 -/* 0049C 809FD4CC 34E7CCCD */ ori $a3, $a3, 0xCCCD ## $a3 = 3DCCCCCD -/* 004A0 809FD4D0 8FA4002C */ lw $a0, 0x002C($sp) -/* 004A4 809FD4D4 46060202 */ mul.s $f8, $f0, $f6 -/* 004A8 809FD4D8 24060000 */ addiu $a2, $zero, 0x0000 ## $a2 = 00000000 -/* 004AC 809FD4DC E7AA0010 */ swc1 $f10, 0x0010($sp) -/* 004B0 809FD4E0 44054000 */ mfc1 $a1, $f8 -/* 004B4 809FD4E4 0C01DCEA */ jal func_800773A8 -/* 004B8 809FD4E8 00000000 */ nop -/* 004BC 809FD4EC 8FBF0024 */ lw $ra, 0x0024($sp) -/* 004C0 809FD4F0 8FB00020 */ lw $s0, 0x0020($sp) -/* 004C4 809FD4F4 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 004C8 809FD4F8 03E00008 */ jr $ra -/* 004CC 809FD4FC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ds/func_809FD500.s b/asm/non_matchings/overlays/actors/ovl_En_Ds/func_809FD500.s deleted file mode 100644 index 94b6d15111..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ds/func_809FD500.s +++ /dev/null @@ -1,59 +0,0 @@ -glabel func_809FD500 -/* 004D0 809FD500 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 004D4 809FD504 AFBF001C */ sw $ra, 0x001C($sp) -/* 004D8 809FD508 AFB00018 */ sw $s0, 0x0018($sp) -/* 004DC 809FD50C AFA40028 */ sw $a0, 0x0028($sp) -/* 004E0 809FD510 8CAE1C44 */ lw $t6, 0x1C44($a1) ## 00001C44 -/* 004E4 809FD514 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 -/* 004E8 809FD518 24A420D8 */ addiu $a0, $a1, 0x20D8 ## $a0 = 000020D8 -/* 004EC 809FD51C 0C042F6F */ jal func_8010BDBC -/* 004F0 809FD520 AFAE0024 */ sw $t6, 0x0024($sp) -/* 004F4 809FD524 24010004 */ addiu $at, $zero, 0x0004 ## $at = 00000004 -/* 004F8 809FD528 54410024 */ bnel $v0, $at, .L809FD5BC -/* 004FC 809FD52C 8FBF001C */ lw $ra, 0x001C($sp) -/* 00500 809FD530 0C041AF2 */ jal func_80106BC8 -/* 00504 809FD534 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00508 809FD538 1040001F */ beq $v0, $zero, .L809FD5B8 -/* 0050C 809FD53C 3C020001 */ lui $v0, 0x0001 ## $v0 = 00010000 -/* 00510 809FD540 00501021 */ addu $v0, $v0, $s0 -/* 00514 809FD544 904204BD */ lbu $v0, 0x04BD($v0) ## 000104BD -/* 00518 809FD548 3C0F80A0 */ lui $t7, %hi(func_809FD460) ## $t7 = 80A00000 -/* 0051C 809FD54C 25EFD460 */ addiu $t7, $t7, %lo(func_809FD460) ## $t7 = 809FD460 -/* 00520 809FD550 10400006 */ beq $v0, $zero, .L809FD56C -/* 00524 809FD554 2418003C */ addiu $t8, $zero, 0x003C ## $t8 = 0000003C -/* 00528 809FD558 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 0052C 809FD55C 10410010 */ beq $v0, $at, .L809FD5A0 -/* 00530 809FD560 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00534 809FD564 10000015 */ beq $zero, $zero, .L809FD5BC -/* 00538 809FD568 8FBF001C */ lw $ra, 0x001C($sp) -.L809FD56C: -/* 0053C 809FD56C 8FA20028 */ lw $v0, 0x0028($sp) -/* 00540 809FD570 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00544 809FD574 2405003F */ addiu $a1, $zero, 0x003F ## $a1 = 0000003F -/* 00548 809FD578 AC4F01EC */ sw $t7, 0x01EC($v0) ## 000101EC -/* 0054C 809FD57C 0C00B2DD */ jal Flags_SetSwitch - -/* 00550 809FD580 A45801EA */ sh $t8, 0x01EA($v0) ## 000101EA -/* 00554 809FD584 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 00558 809FD588 00300821 */ addu $at, $at, $s0 -/* 0055C 809FD58C 24190037 */ addiu $t9, $zero, 0x0037 ## $t9 = 00000037 -/* 00560 809FD590 A03903DC */ sb $t9, 0x03DC($at) ## 000103DC -/* 00564 809FD594 8FA80024 */ lw $t0, 0x0024($sp) -/* 00568 809FD598 10000007 */ beq $zero, $zero, .L809FD5B8 -/* 0056C 809FD59C A1000693 */ sb $zero, 0x0693($t0) ## 00000693 -.L809FD5A0: -/* 00570 809FD5A0 0C042DC8 */ jal func_8010B720 -/* 00574 809FD5A4 2405504C */ addiu $a1, $zero, 0x504C ## $a1 = 0000504C -/* 00578 809FD5A8 8FAA0028 */ lw $t2, 0x0028($sp) -/* 0057C 809FD5AC 3C0980A0 */ lui $t1, %hi(func_809FD10C) ## $t1 = 80A00000 -/* 00580 809FD5B0 2529D10C */ addiu $t1, $t1, %lo(func_809FD10C) ## $t1 = 809FD10C -/* 00584 809FD5B4 AD4901EC */ sw $t1, 0x01EC($t2) ## 000001EC -.L809FD5B8: -/* 00588 809FD5B8 8FBF001C */ lw $ra, 0x001C($sp) -.L809FD5BC: -/* 0058C 809FD5BC 8FB00018 */ lw $s0, 0x0018($sp) -/* 00590 809FD5C0 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 00594 809FD5C4 03E00008 */ jr $ra -/* 00598 809FD5C8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ds/func_809FD5CC.s b/asm/non_matchings/overlays/actors/ovl_En_Ds/func_809FD5CC.s deleted file mode 100644 index 425238aa39..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ds/func_809FD5CC.s +++ /dev/null @@ -1,25 +0,0 @@ -glabel func_809FD5CC -/* 0059C 809FD5CC 3C0E8016 */ lui $t6, 0x8016 ## $t6 = 80160000 -/* 005A0 809FD5D0 85CEE694 */ lh $t6, -0x196C($t6) ## 8015E694 -/* 005A4 809FD5D4 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 005A8 809FD5D8 AFBF0014 */ sw $ra, 0x0014($sp) -/* 005AC 809FD5DC 29C10064 */ slti $at, $t6, 0x0064 -/* 005B0 809FD5E0 10200003 */ beq $at, $zero, .L809FD5F0 -/* 005B4 809FD5E4 00000000 */ nop -/* 005B8 809FD5E8 10000008 */ beq $zero, $zero, .L809FD60C -/* 005BC 809FD5EC 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -.L809FD5F0: -/* 005C0 809FD5F0 0C021AAF */ jal Inventory_HasEmptyBottle -/* 005C4 809FD5F4 00000000 */ nop -/* 005C8 809FD5F8 54400004 */ bnel $v0, $zero, .L809FD60C -/* 005CC 809FD5FC 24020002 */ addiu $v0, $zero, 0x0002 ## $v0 = 00000002 -/* 005D0 809FD600 10000002 */ beq $zero, $zero, .L809FD60C -/* 005D4 809FD604 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -/* 005D8 809FD608 24020002 */ addiu $v0, $zero, 0x0002 ## $v0 = 00000002 -.L809FD60C: -/* 005DC 809FD60C 8FBF0014 */ lw $ra, 0x0014($sp) -/* 005E0 809FD610 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 005E4 809FD614 03E00008 */ jr $ra -/* 005E8 809FD618 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ds/func_809FD61C.s b/asm/non_matchings/overlays/actors/ovl_En_Ds/func_809FD61C.s deleted file mode 100644 index e5fd4bcca4..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ds/func_809FD61C.s +++ /dev/null @@ -1,29 +0,0 @@ -glabel func_809FD61C -/* 005EC 809FD61C 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 005F0 809FD620 AFBF001C */ sw $ra, 0x001C($sp) -/* 005F4 809FD624 AFA50024 */ sw $a1, 0x0024($sp) -/* 005F8 809FD628 0C00BD04 */ jal func_8002F410 -/* 005FC 809FD62C AFA40020 */ sw $a0, 0x0020($sp) -/* 00600 809FD630 10400006 */ beq $v0, $zero, .L809FD64C -/* 00604 809FD634 8FA40020 */ lw $a0, 0x0020($sp) -/* 00608 809FD638 3C0E80A0 */ lui $t6, %hi(func_809FD10C) ## $t6 = 80A00000 -/* 0060C 809FD63C 25CED10C */ addiu $t6, $t6, %lo(func_809FD10C) ## $t6 = 809FD10C -/* 00610 809FD640 AC800118 */ sw $zero, 0x0118($a0) ## 00000118 -/* 00614 809FD644 10000009 */ beq $zero, $zero, .L809FD66C -/* 00618 809FD648 AC8E01EC */ sw $t6, 0x01EC($a0) ## 000001EC -.L809FD64C: -/* 0061C 809FD64C 3C014248 */ lui $at, 0x4248 ## $at = 42480000 -/* 00620 809FD650 44812000 */ mtc1 $at, $f4 ## $f4 = 50.00 -/* 00624 809FD654 3C07461C */ lui $a3, 0x461C ## $a3 = 461C0000 -/* 00628 809FD658 34E74000 */ ori $a3, $a3, 0x4000 ## $a3 = 461C4000 -/* 0062C 809FD65C 8FA50024 */ lw $a1, 0x0024($sp) -/* 00630 809FD660 24060012 */ addiu $a2, $zero, 0x0012 ## $a2 = 00000012 -/* 00634 809FD664 0C00BD0D */ jal func_8002F434 -/* 00638 809FD668 E7A40010 */ swc1 $f4, 0x0010($sp) -.L809FD66C: -/* 0063C 809FD66C 8FBF001C */ lw $ra, 0x001C($sp) -/* 00640 809FD670 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 00644 809FD674 03E00008 */ jr $ra -/* 00648 809FD678 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ds/func_809FD67C.s b/asm/non_matchings/overlays/actors/ovl_En_Ds/func_809FD67C.s deleted file mode 100644 index 130f7fbb65..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ds/func_809FD67C.s +++ /dev/null @@ -1,89 +0,0 @@ -glabel func_809FD67C -/* 0064C 809FD67C 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 00650 809FD680 AFBF0024 */ sw $ra, 0x0024($sp) -/* 00654 809FD684 AFB00020 */ sw $s0, 0x0020($sp) -/* 00658 809FD688 AFA40028 */ sw $a0, 0x0028($sp) -/* 0065C 809FD68C 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 -/* 00660 809FD690 0C042F6F */ jal func_8010BDBC -/* 00664 809FD694 24A420D8 */ addiu $a0, $a1, 0x20D8 ## $a0 = 000020D8 -/* 00668 809FD698 24010004 */ addiu $at, $zero, 0x0004 ## $at = 00000004 -/* 0066C 809FD69C 54410041 */ bnel $v0, $at, .L809FD7A4 -/* 00670 809FD6A0 8FBF0024 */ lw $ra, 0x0024($sp) -/* 00674 809FD6A4 0C041AF2 */ jal func_80106BC8 -/* 00678 809FD6A8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0067C 809FD6AC 1040003C */ beq $v0, $zero, .L809FD7A0 -/* 00680 809FD6B0 3C020001 */ lui $v0, 0x0001 ## $v0 = 00010000 -/* 00684 809FD6B4 00501021 */ addu $v0, $v0, $s0 -/* 00688 809FD6B8 904204BD */ lbu $v0, 0x04BD($v0) ## 000104BD -/* 0068C 809FD6BC 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 00690 809FD6C0 10400005 */ beq $v0, $zero, .L809FD6D8 -/* 00694 809FD6C4 00000000 */ nop -/* 00698 809FD6C8 1041002F */ beq $v0, $at, .L809FD788 -/* 0069C 809FD6CC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 006A0 809FD6D0 10000030 */ beq $zero, $zero, .L809FD794 -/* 006A4 809FD6D4 8FAB0028 */ lw $t3, 0x0028($sp) -.L809FD6D8: -/* 006A8 809FD6D8 0C27F573 */ jal func_809FD5CC -/* 006AC 809FD6DC 00000000 */ nop -/* 006B0 809FD6E0 10400009 */ beq $v0, $zero, .L809FD708 -/* 006B4 809FD6E4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 006B8 809FD6E8 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 006BC 809FD6EC 1041000A */ beq $v0, $at, .L809FD718 -/* 006C0 809FD6F0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 006C4 809FD6F4 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 006C8 809FD6F8 1041000E */ beq $v0, $at, .L809FD734 -/* 006CC 809FD6FC 00000000 */ nop -/* 006D0 809FD700 10000024 */ beq $zero, $zero, .L809FD794 -/* 006D4 809FD704 8FAB0028 */ lw $t3, 0x0028($sp) -.L809FD708: -/* 006D8 809FD708 0C042DC8 */ jal func_8010B720 -/* 006DC 809FD70C 2405500E */ addiu $a1, $zero, 0x500E ## $a1 = 0000500E -/* 006E0 809FD710 10000020 */ beq $zero, $zero, .L809FD794 -/* 006E4 809FD714 8FAB0028 */ lw $t3, 0x0028($sp) -.L809FD718: -/* 006E8 809FD718 0C042DC8 */ jal func_8010B720 -/* 006EC 809FD71C 24050096 */ addiu $a1, $zero, 0x0096 ## $a1 = 00000096 -/* 006F0 809FD720 8FAF0028 */ lw $t7, 0x0028($sp) -/* 006F4 809FD724 3C0E80A0 */ lui $t6, %hi(func_809FD160) ## $t6 = 80A00000 -/* 006F8 809FD728 25CED160 */ addiu $t6, $t6, %lo(func_809FD160) ## $t6 = 809FD160 -/* 006FC 809FD72C 1000001C */ beq $zero, $zero, .L809FD7A0 -/* 00700 809FD730 ADEE01EC */ sw $t6, 0x01EC($t7) ## 000001EC -.L809FD734: -/* 00704 809FD734 0C021CC3 */ jal Rupees_ChangeBy -/* 00708 809FD738 2404FF9C */ addiu $a0, $zero, 0xFF9C ## $a0 = FFFFFF9C -/* 0070C 809FD73C 8FA40028 */ lw $a0, 0x0028($sp) -/* 00710 809FD740 3C01FFFE */ lui $at, 0xFFFE ## $at = FFFE0000 -/* 00714 809FD744 3421FFFF */ ori $at, $at, 0xFFFF ## $at = FFFEFFFF -/* 00718 809FD748 8C980004 */ lw $t8, 0x0004($a0) ## 00000004 -/* 0071C 809FD74C 3C07461C */ lui $a3, 0x461C ## $a3 = 461C0000 -/* 00720 809FD750 34E74000 */ ori $a3, $a3, 0x4000 ## $a3 = 461C4000 -/* 00724 809FD754 0301C824 */ and $t9, $t8, $at -/* 00728 809FD758 3C014248 */ lui $at, 0x4248 ## $at = 42480000 -/* 0072C 809FD75C 44812000 */ mtc1 $at, $f4 ## $f4 = 50.00 -/* 00730 809FD760 AC990004 */ sw $t9, 0x0004($a0) ## 00000004 -/* 00734 809FD764 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 00738 809FD768 24060012 */ addiu $a2, $zero, 0x0012 ## $a2 = 00000012 -/* 0073C 809FD76C 0C00BD0D */ jal func_8002F434 -/* 00740 809FD770 E7A40010 */ swc1 $f4, 0x0010($sp) -/* 00744 809FD774 8FA90028 */ lw $t1, 0x0028($sp) -/* 00748 809FD778 3C0880A0 */ lui $t0, %hi(func_809FD61C) ## $t0 = 80A00000 -/* 0074C 809FD77C 2508D61C */ addiu $t0, $t0, %lo(func_809FD61C) ## $t0 = 809FD61C -/* 00750 809FD780 10000007 */ beq $zero, $zero, .L809FD7A0 -/* 00754 809FD784 AD2801EC */ sw $t0, 0x01EC($t1) ## 000001EC -.L809FD788: -/* 00758 809FD788 0C042DC8 */ jal func_8010B720 -/* 0075C 809FD78C 2405500D */ addiu $a1, $zero, 0x500D ## $a1 = 0000500D -/* 00760 809FD790 8FAB0028 */ lw $t3, 0x0028($sp) -.L809FD794: -/* 00764 809FD794 3C0A80A0 */ lui $t2, %hi(func_809FD10C) ## $t2 = 80A00000 -/* 00768 809FD798 254AD10C */ addiu $t2, $t2, %lo(func_809FD10C) ## $t2 = 809FD10C -/* 0076C 809FD79C AD6A01EC */ sw $t2, 0x01EC($t3) ## 000001EC -.L809FD7A0: -/* 00770 809FD7A0 8FBF0024 */ lw $ra, 0x0024($sp) -.L809FD7A4: -/* 00774 809FD7A4 8FB00020 */ lw $s0, 0x0020($sp) -/* 00778 809FD7A8 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 0077C 809FD7AC 03E00008 */ jr $ra -/* 00780 809FD7B0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ds/func_809FD7B4.s b/asm/non_matchings/overlays/actors/ovl_En_Ds/func_809FD7B4.s deleted file mode 100644 index bd5e8c3484..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ds/func_809FD7B4.s +++ /dev/null @@ -1,106 +0,0 @@ -glabel func_809FD7B4 -/* 00784 809FD7B4 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 00788 809FD7B8 AFBF0024 */ sw $ra, 0x0024($sp) -/* 0078C 809FD7BC AFB00020 */ sw $s0, 0x0020($sp) -/* 00790 809FD7C0 8CA31C44 */ lw $v1, 0x1C44($a1) ## 00001C44 -/* 00794 809FD7C4 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00798 809FD7C8 AFA50034 */ sw $a1, 0x0034($sp) -/* 0079C 809FD7CC 0C00BC65 */ jal func_8002F194 -/* 007A0 809FD7D0 AFA3002C */ sw $v1, 0x002C($sp) -/* 007A4 809FD7D4 8FA3002C */ lw $v1, 0x002C($sp) -/* 007A8 809FD7D8 10400035 */ beq $v0, $zero, .L809FD8B0 -/* 007AC 809FD7DC 8FA50034 */ lw $a1, 0x0034($sp) -/* 007B0 809FD7E0 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 007B4 809FD7E4 0C00BCDA */ jal func_8002F368 -/* 007B8 809FD7E8 AFA3002C */ sw $v1, 0x002C($sp) -/* 007BC 809FD7EC 24010008 */ addiu $at, $zero, 0x0008 ## $at = 00000008 -/* 007C0 809FD7F0 14410014 */ bne $v0, $at, .L809FD844 -/* 007C4 809FD7F4 8FA3002C */ lw $v1, 0x002C($sp) -/* 007C8 809FD7F8 3C078013 */ lui $a3, 0x8013 ## $a3 = 80130000 -/* 007CC 809FD7FC 3C0E8013 */ lui $t6, 0x8013 ## $t6 = 80130000 -/* 007D0 809FD800 24E733E0 */ addiu $a3, $a3, 0x33E0 ## $a3 = 801333E0 -/* 007D4 809FD804 25CE33E8 */ addiu $t6, $t6, 0x33E8 ## $t6 = 801333E8 -/* 007D8 809FD808 3C058013 */ lui $a1, 0x8013 ## $a1 = 80130000 -/* 007DC 809FD80C 24A533D4 */ addiu $a1, $a1, 0x33D4 ## $a1 = 801333D4 -/* 007E0 809FD810 AFAE0014 */ sw $t6, 0x0014($sp) -/* 007E4 809FD814 AFA70010 */ sw $a3, 0x0010($sp) -/* 007E8 809FD818 24044807 */ addiu $a0, $zero, 0x4807 ## $a0 = 00004807 -/* 007EC 809FD81C 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 -/* 007F0 809FD820 0C03DCE3 */ jal Audio_PlaySoundGeneral - -/* 007F4 809FD824 AFA3002C */ sw $v1, 0x002C($sp) -/* 007F8 809FD828 8FA3002C */ lw $v1, 0x002C($sp) -/* 007FC 809FD82C 240F504A */ addiu $t7, $zero, 0x504A ## $t7 = 0000504A -/* 00800 809FD830 3C1880A0 */ lui $t8, %hi(func_809FD500) ## $t8 = 80A00000 -/* 00804 809FD834 2718D500 */ addiu $t8, $t8, %lo(func_809FD500) ## $t8 = 809FD500 -/* 00808 809FD838 A46F010E */ sh $t7, 0x010E($v1) ## 0000010E -/* 0080C 809FD83C 10000037 */ beq $zero, $zero, .L809FD91C -/* 00810 809FD840 AE1801EC */ sw $t8, 0x01EC($s0) ## 000001EC -.L809FD844: -/* 00814 809FD844 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 00818 809FD848 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 -/* 0081C 809FD84C 94590EF6 */ lhu $t9, 0x0EF6($v0) ## 8015F556 -/* 00820 809FD850 3C1880A0 */ lui $t8, %hi(func_809FD10C) ## $t8 = 80A00000 -/* 00824 809FD854 3C0B8012 */ lui $t3, 0x8012 ## $t3 = 80120000 -/* 00828 809FD858 33280001 */ andi $t0, $t9, 0x0001 ## $t0 = 00000000 -/* 0082C 809FD85C 11000007 */ beq $t0, $zero, .L809FD87C -/* 00830 809FD860 2718D10C */ addiu $t8, $t8, %lo(func_809FD10C) ## $t8 = 809FD10C -/* 00834 809FD864 2409500C */ addiu $t1, $zero, 0x500C ## $t1 = 0000500C -/* 00838 809FD868 3C0A80A0 */ lui $t2, %hi(func_809FD67C) ## $t2 = 80A00000 -/* 0083C 809FD86C A469010E */ sh $t1, 0x010E($v1) ## 0000010E -/* 00840 809FD870 254AD67C */ addiu $t2, $t2, %lo(func_809FD67C) ## $t2 = 809FD67C -/* 00844 809FD874 10000029 */ beq $zero, $zero, .L809FD91C -/* 00848 809FD878 AE0A01EC */ sw $t2, 0x01EC($s0) ## 000001EC -.L809FD87C: -/* 0084C 809FD87C 916B7494 */ lbu $t3, 0x7494($t3) ## 80127494 -/* 00850 809FD880 24010030 */ addiu $at, $zero, 0x0030 ## $at = 00000030 -/* 00854 809FD884 240E5049 */ addiu $t6, $zero, 0x5049 ## $t6 = 00005049 -/* 00858 809FD888 004B6021 */ addu $t4, $v0, $t3 -/* 0085C 809FD88C 918D0074 */ lbu $t5, 0x0074($t4) ## 00000074 -/* 00860 809FD890 240F5048 */ addiu $t7, $zero, 0x5048 ## $t7 = 00005048 -/* 00864 809FD894 55A10004 */ bnel $t5, $at, .L809FD8A8 -/* 00868 809FD898 A46F010E */ sh $t7, 0x010E($v1) ## 0000010E -/* 0086C 809FD89C 10000002 */ beq $zero, $zero, .L809FD8A8 -/* 00870 809FD8A0 A46E010E */ sh $t6, 0x010E($v1) ## 0000010E -/* 00874 809FD8A4 A46F010E */ sh $t7, 0x010E($v1) ## 0000010E -.L809FD8A8: -/* 00878 809FD8A8 1000001C */ beq $zero, $zero, .L809FD91C -/* 0087C 809FD8AC AE1801EC */ sw $t8, 0x01EC($s0) ## 000001EC -.L809FD8B0: -/* 00880 809FD8B0 8619008A */ lh $t9, 0x008A($s0) ## 0000008A -/* 00884 809FD8B4 860800B6 */ lh $t0, 0x00B6($s0) ## 000000B6 -/* 00888 809FD8B8 24095048 */ addiu $t1, $zero, 0x5048 ## $t1 = 00005048 -/* 0088C 809FD8BC A609010E */ sh $t1, 0x010E($s0) ## 0000010E -/* 00890 809FD8C0 03281023 */ subu $v0, $t9, $t0 -/* 00894 809FD8C4 00021400 */ sll $v0, $v0, 16 -/* 00898 809FD8C8 00021403 */ sra $v0, $v0, 16 -/* 0089C 809FD8CC 04400003 */ bltz $v0, .L809FD8DC -/* 008A0 809FD8D0 00021823 */ subu $v1, $zero, $v0 -/* 008A4 809FD8D4 10000001 */ beq $zero, $zero, .L809FD8DC -/* 008A8 809FD8D8 00401825 */ or $v1, $v0, $zero ## $v1 = 8015E660 -.L809FD8DC: -/* 008AC 809FD8DC 28612151 */ slti $at, $v1, 0x2151 -/* 008B0 809FD8E0 1020000E */ beq $at, $zero, .L809FD91C -/* 008B4 809FD8E4 3C014348 */ lui $at, 0x4348 ## $at = 43480000 -/* 008B8 809FD8E8 44813000 */ mtc1 $at, $f6 ## $f6 = 200.00 -/* 008BC 809FD8EC C6040090 */ lwc1 $f4, 0x0090($s0) ## 00000090 -/* 008C0 809FD8F0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 008C4 809FD8F4 3C0642C8 */ lui $a2, 0x42C8 ## $a2 = 42C80000 -/* 008C8 809FD8F8 4606203C */ c.lt.s $f4, $f6 -/* 008CC 809FD8FC 00000000 */ nop -/* 008D0 809FD900 45020007 */ bc1fl .L809FD920 -/* 008D4 809FD904 8FBF0024 */ lw $ra, 0x0024($sp) -/* 008D8 809FD908 0C00BCA6 */ jal func_8002F298 -/* 008DC 809FD90C 24070008 */ addiu $a3, $zero, 0x0008 ## $a3 = 00000008 -/* 008E0 809FD910 960A01E8 */ lhu $t2, 0x01E8($s0) ## 000001E8 -/* 008E4 809FD914 354B0001 */ ori $t3, $t2, 0x0001 ## $t3 = 00000001 -/* 008E8 809FD918 A60B01E8 */ sh $t3, 0x01E8($s0) ## 000001E8 -.L809FD91C: -/* 008EC 809FD91C 8FBF0024 */ lw $ra, 0x0024($sp) -.L809FD920: -/* 008F0 809FD920 8FB00020 */ lw $s0, 0x0020($sp) -/* 008F4 809FD924 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 008F8 809FD928 03E00008 */ jr $ra -/* 008FC 809FD92C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ds/func_809FDA38.s b/asm/non_matchings/overlays/actors/ovl_En_Ds/func_809FDA38.s deleted file mode 100644 index 737128a909..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ds/func_809FDA38.s +++ /dev/null @@ -1,21 +0,0 @@ -glabel func_809FDA38 -/* 00A08 809FDA38 24010005 */ addiu $at, $zero, 0x0005 ## $at = 00000005 -/* 00A0C 809FDA3C AFA40000 */ sw $a0, 0x0000($sp) -/* 00A10 809FDA40 AFA60008 */ sw $a2, 0x0008($sp) -/* 00A14 809FDA44 14A1000B */ bne $a1, $at, .L809FDA74 -/* 00A18 809FDA48 AFA7000C */ sw $a3, 0x000C($sp) -/* 00A1C 809FDA4C 8FA20014 */ lw $v0, 0x0014($sp) -/* 00A20 809FDA50 8FA30010 */ lw $v1, 0x0010($sp) -/* 00A24 809FDA54 844F01DA */ lh $t7, 0x01DA($v0) ## 000001DA -/* 00A28 809FDA58 846E0000 */ lh $t6, 0x0000($v1) ## 00000000 -/* 00A2C 809FDA5C 84790004 */ lh $t9, 0x0004($v1) ## 00000004 -/* 00A30 809FDA60 01CFC021 */ addu $t8, $t6, $t7 -/* 00A34 809FDA64 A4780000 */ sh $t8, 0x0000($v1) ## 00000000 -/* 00A38 809FDA68 844801D8 */ lh $t0, 0x01D8($v0) ## 000001D8 -/* 00A3C 809FDA6C 03284821 */ addu $t1, $t9, $t0 -/* 00A40 809FDA70 A4690004 */ sh $t1, 0x0004($v1) ## 00000004 -.L809FDA74: -/* 00A44 809FDA74 03E00008 */ jr $ra -/* 00A48 809FDA78 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ds/func_809FDA7C.s b/asm/non_matchings/overlays/actors/ovl_En_Ds/func_809FDA7C.s deleted file mode 100644 index b05e34c9b5..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ds/func_809FDA7C.s +++ /dev/null @@ -1,20 +0,0 @@ -glabel func_809FDA7C -/* 00A4C 809FDA7C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00A50 809FDA80 24010005 */ addiu $at, $zero, 0x0005 ## $at = 00000005 -/* 00A54 809FDA84 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00A58 809FDA88 AFA40018 */ sw $a0, 0x0018($sp) -/* 00A5C 809FDA8C AFA60020 */ sw $a2, 0x0020($sp) -/* 00A60 809FDA90 14A10006 */ bne $a1, $at, .L809FDAAC -/* 00A64 809FDA94 AFA70024 */ sw $a3, 0x0024($sp) -/* 00A68 809FDA98 8FA50028 */ lw $a1, 0x0028($sp) -/* 00A6C 809FDA9C 3C0480A0 */ lui $a0, %hi(D_809FDB40) ## $a0 = 80A00000 -/* 00A70 809FDAA0 2484DB40 */ addiu $a0, $a0, %lo(D_809FDB40) ## $a0 = 809FDB40 -/* 00A74 809FDAA4 0C0346BD */ jal Matrix_MultVec3f -/* 00A78 809FDAA8 24A50038 */ addiu $a1, $a1, 0x0038 ## $a1 = 00000038 -.L809FDAAC: -/* 00A7C 809FDAAC 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00A80 809FDAB0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00A84 809FDAB4 03E00008 */ jr $ra -/* 00A88 809FDAB8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Du/EnDu_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Du/EnDu_Destroy.s index 3a8bccd96a..ffe7e0b9c4 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Du/EnDu_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Du/EnDu_Destroy.s @@ -1,18 +1,18 @@ glabel EnDu_Destroy /* 0074C 809FE37C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00750 809FE380 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00754 809FE384 AFA40018 */ sw $a0, 0x0018($sp) -/* 00758 809FE388 AFA5001C */ sw $a1, 0x001C($sp) -/* 0075C 809FE38C 0C0295BC */ jal func_800A56F0 +/* 00750 809FE380 AFBF0014 */ sw $ra, 0x0014($sp) +/* 00754 809FE384 AFA40018 */ sw $a0, 0x0018($sp) +/* 00758 809FE388 AFA5001C */ sw $a1, 0x001C($sp) +/* 0075C 809FE38C 0C0295BC */ jal SkelAnime_Free /* 00760 809FE390 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 00764 809FE394 8FA50018 */ lw $a1, 0x0018($sp) -/* 00768 809FE398 8FA4001C */ lw $a0, 0x001C($sp) +/* 00764 809FE394 8FA50018 */ lw $a1, 0x0018($sp) +/* 00768 809FE398 8FA4001C */ lw $a0, 0x001C($sp) /* 0076C 809FE39C 0C0170EB */ jal ActorCollider_FreeCylinder - + /* 00770 809FE3A0 24A50194 */ addiu $a1, $a1, 0x0194 ## $a1 = 00000194 -/* 00774 809FE3A4 8FBF0014 */ lw $ra, 0x0014($sp) +/* 00774 809FE3A4 8FBF0014 */ lw $ra, 0x0014($sp) /* 00778 809FE3A8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 0077C 809FE3AC 03E00008 */ jr $ra +/* 0077C 809FE3AC 03E00008 */ jr $ra /* 00780 809FE3B0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Du/EnDu_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Du/EnDu_Draw.s index c7ac77b0e0..c8f0f9709a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Du/EnDu_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Du/EnDu_Draw.s @@ -9,7 +9,7 @@ glabel EnDu_Draw /* 01460 809FF090 24C6F440 */ addiu $a2, $a2, %lo(D_809FF440) ## $a2 = 809FF440 /* 01464 809FF094 27A40038 */ addiu $a0, $sp, 0x0038 ## $a0 = FFFFFFE8 /* 01468 809FF098 240705BE */ addiu $a3, $zero, 0x05BE ## $a3 = 000005BE -/* 0146C 809FF09C 0C031AB1 */ jal func_800C6AC4 +/* 0146C 809FF09C 0C031AB1 */ jal Graph_OpenDisps /* 01470 809FF0A0 AFA50048 */ sw $a1, 0x0048($sp) /* 01474 809FF0A4 8FA80048 */ lw $t0, 0x0048($sp) /* 01478 809FF0A8 3C18DB06 */ lui $t8, 0xDB06 ## $t8 = DB060000 @@ -92,7 +92,7 @@ glabel EnDu_Draw /* 015AC 809FF1DC 24C6F450 */ addiu $a2, $a2, %lo(D_809FF450) ## $a2 = 809FF450 /* 015B0 809FF1E0 27A40038 */ addiu $a0, $sp, 0x0038 ## $a0 = FFFFFFE8 /* 015B4 809FF1E4 240705CF */ addiu $a3, $zero, 0x05CF ## $a3 = 000005CF -/* 015B8 809FF1E8 0C031AD5 */ jal func_800C6B54 +/* 015B8 809FF1E8 0C031AD5 */ jal Graph_CloseDisps /* 015BC 809FF1EC 8DC50000 */ lw $a1, 0x0000($t6) ## 00000000 /* 015C0 809FF1F0 8FBF0024 */ lw $ra, 0x0024($sp) /* 015C4 809FF1F4 8FB00020 */ lw $s0, 0x0020($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Du/EnDu_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Du/EnDu_Init.s index c746593904..5688b34b71 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Du/EnDu_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Du/EnDu_Init.s @@ -1,65 +1,65 @@ glabel EnDu_Init /* 0057C 809FE1AC 27BDFFB8 */ addiu $sp, $sp, 0xFFB8 ## $sp = FFFFFFB8 -/* 00580 809FE1B0 AFB00028 */ sw $s0, 0x0028($sp) +/* 00580 809FE1B0 AFB00028 */ sw $s0, 0x0028($sp) /* 00584 809FE1B4 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00588 809FE1B8 AFBF002C */ sw $ra, 0x002C($sp) -/* 0058C 809FE1BC AFA5004C */ sw $a1, 0x004C($sp) +/* 00588 809FE1B8 AFBF002C */ sw $ra, 0x002C($sp) +/* 0058C 809FE1BC AFA5004C */ sw $a1, 0x004C($sp) /* 00590 809FE1C0 3C068003 */ lui $a2, 0x8003 ## $a2 = 80030000 /* 00594 809FE1C4 24C6B5EC */ addiu $a2, $a2, 0xB5EC ## $a2 = 8002B5EC /* 00598 809FE1C8 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 /* 0059C 809FE1CC 248400B4 */ addiu $a0, $a0, 0x00B4 ## $a0 = 000000B4 /* 005A0 809FE1D0 0C00AC78 */ jal ActorShape_Init - + /* 005A4 809FE1D4 3C0741F0 */ lui $a3, 0x41F0 ## $a3 = 41F00000 /* 005A8 809FE1D8 2605014C */ addiu $a1, $s0, 0x014C ## $a1 = 0000014C /* 005AC 809FE1DC 3C060601 */ lui $a2, 0x0601 ## $a2 = 06010000 /* 005B0 809FE1E0 24C61CA8 */ addiu $a2, $a2, 0x1CA8 ## $a2 = 06011CA8 -/* 005B4 809FE1E4 AFA50038 */ sw $a1, 0x0038($sp) -/* 005B8 809FE1E8 8FA4004C */ lw $a0, 0x004C($sp) +/* 005B4 809FE1E4 AFA50038 */ sw $a1, 0x0038($sp) +/* 005B8 809FE1E8 8FA4004C */ lw $a0, 0x004C($sp) /* 005BC 809FE1EC 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 005C0 809FE1F0 AFA00010 */ sw $zero, 0x0010($sp) -/* 005C4 809FE1F4 AFA00014 */ sw $zero, 0x0014($sp) -/* 005C8 809FE1F8 0C0291BE */ jal func_800A46F8 -/* 005CC 809FE1FC AFA00018 */ sw $zero, 0x0018($sp) +/* 005C0 809FE1F0 AFA00010 */ sw $zero, 0x0010($sp) +/* 005C4 809FE1F4 AFA00014 */ sw $zero, 0x0014($sp) +/* 005C8 809FE1F8 0C0291BE */ jal SkelAnime_InitSV +/* 005CC 809FE1FC AFA00018 */ sw $zero, 0x0018($sp) /* 005D0 809FE200 26050194 */ addiu $a1, $s0, 0x0194 ## $a1 = 00000194 -/* 005D4 809FE204 AFA50034 */ sw $a1, 0x0034($sp) +/* 005D4 809FE204 AFA50034 */ sw $a1, 0x0034($sp) /* 005D8 809FE208 0C0170D9 */ jal ActorCollider_AllocCylinder - -/* 005DC 809FE20C 8FA4004C */ lw $a0, 0x004C($sp) + +/* 005DC 809FE20C 8FA4004C */ lw $a0, 0x004C($sp) /* 005E0 809FE210 3C0780A0 */ lui $a3, %hi(D_809FF230) ## $a3 = 80A00000 -/* 005E4 809FE214 8FA50034 */ lw $a1, 0x0034($sp) +/* 005E4 809FE214 8FA50034 */ lw $a1, 0x0034($sp) /* 005E8 809FE218 24E7F230 */ addiu $a3, $a3, %lo(D_809FF230) ## $a3 = 809FF230 -/* 005EC 809FE21C 8FA4004C */ lw $a0, 0x004C($sp) +/* 005EC 809FE21C 8FA4004C */ lw $a0, 0x004C($sp) /* 005F0 809FE220 0C01712B */ jal ActorCollider_InitCylinder - + /* 005F4 809FE224 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 005F8 809FE228 0C016C80 */ jal CollisionBtlTbl_Get - + /* 005FC 809FE22C 24040016 */ addiu $a0, $zero, 0x0016 ## $a0 = 00000016 /* 00600 809FE230 3C0680A0 */ lui $a2, %hi(D_809FF25C) ## $a2 = 80A00000 /* 00604 809FE234 24C6F25C */ addiu $a2, $a2, %lo(D_809FF25C) ## $a2 = 809FF25C /* 00608 809FE238 26040098 */ addiu $a0, $s0, 0x0098 ## $a0 = 00000098 -/* 0060C 809FE23C 0C0187BF */ jal func_80061EFC +/* 0060C 809FE23C 0C0187BF */ jal func_80061EFC /* 00610 809FE240 00402825 */ or $a1, $v0, $zero ## $a1 = 00000000 /* 00614 809FE244 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00618 809FE248 0C27F76D */ jal func_809FDDB4 -/* 0061C 809FE24C 8FA5004C */ lw $a1, 0x004C($sp) -/* 00620 809FE250 14400005 */ bne $v0, $zero, .L809FE268 -/* 00624 809FE254 8FA40038 */ lw $a0, 0x0038($sp) +/* 00618 809FE248 0C27F76D */ jal func_809FDDB4 +/* 0061C 809FE24C 8FA5004C */ lw $a1, 0x004C($sp) +/* 00620 809FE250 14400005 */ bne $v0, $zero, .L809FE268 +/* 00624 809FE254 8FA40038 */ lw $a0, 0x0038($sp) /* 00628 809FE258 0C00B55C */ jal Actor_Kill - + /* 0062C 809FE25C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00630 809FE260 10000042 */ beq $zero, $zero, .L809FE36C -/* 00634 809FE264 8FBF002C */ lw $ra, 0x002C($sp) +/* 00630 809FE260 10000042 */ beq $zero, $zero, .L809FE36C +/* 00634 809FE264 8FBF002C */ lw $ra, 0x002C($sp) .L809FE268: /* 00638 809FE268 3C0580A0 */ lui $a1, %hi(D_809FF268) ## $a1 = 80A00000 /* 0063C 809FE26C 24A5F268 */ addiu $a1, $a1, %lo(D_809FF268) ## $a1 = 809FF268 -/* 00640 809FE270 0C00D3B0 */ jal func_80034EC0 +/* 00640 809FE270 0C00D3B0 */ jal func_80034EC0 /* 00644 809FE274 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 /* 00648 809FE278 3C053C23 */ lui $a1, 0x3C23 ## $a1 = 3C230000 /* 0064C 809FE27C 34A5D70A */ ori $a1, $a1, 0xD70A ## $a1 = 3C23D70A /* 00650 809FE280 0C00B58B */ jal Actor_SetScale - + /* 00654 809FE284 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 00658 809FE288 3C038016 */ lui $v1, 0x8016 ## $v1 = 80160000 /* 0065C 809FE28C 240E0001 */ addiu $t6, $zero, 0x0001 ## $t6 = 00000001 @@ -69,62 +69,62 @@ glabel EnDu_Init /* 0066C 809FE29C 8C6F0008 */ lw $t7, 0x0008($v1) ## 8015E668 /* 00670 809FE2A0 3401FFF0 */ ori $at, $zero, 0xFFF0 ## $at = 0000FFF0 /* 00674 809FE2A4 3C020200 */ lui $v0, 0x0200 ## $v0 = 02000000 -/* 00678 809FE2A8 01E1082A */ slt $at, $t7, $at -/* 0067C 809FE2AC 14200018 */ bne $at, $zero, .L809FE310 -/* 00680 809FE2B0 8FAF004C */ lw $t7, 0x004C($sp) +/* 00678 809FE2A8 01E1082A */ slt $at, $t7, $at +/* 0067C 809FE2AC 14200018 */ bne $at, $zero, .L809FE310 +/* 00680 809FE2B0 8FAF004C */ lw $t7, 0x004C($sp) /* 00684 809FE2B4 24426930 */ addiu $v0, $v0, 0x6930 ## $v0 = 02006930 -/* 00688 809FE2B8 0002C100 */ sll $t8, $v0, 4 -/* 0068C 809FE2BC 0018CF02 */ srl $t9, $t8, 28 -/* 00690 809FE2C0 00194080 */ sll $t0, $t9, 2 +/* 00688 809FE2B8 0002C100 */ sll $t8, $v0, 4 +/* 0068C 809FE2BC 0018CF02 */ srl $t9, $t8, 28 +/* 00690 809FE2C0 00194080 */ sll $t0, $t9, 2 /* 00694 809FE2C4 3C098016 */ lui $t1, 0x8016 ## $t1 = 80160000 -/* 00698 809FE2C8 01284821 */ addu $t1, $t1, $t0 +/* 00698 809FE2C8 01284821 */ addu $t1, $t1, $t0 /* 0069C 809FE2CC 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 /* 006A0 809FE2D0 8D296FA8 */ lw $t1, 0x6FA8($t1) ## 80166FA8 /* 006A4 809FE2D4 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF -/* 006A8 809FE2D8 00415024 */ and $t2, $v0, $at -/* 006AC 809FE2DC 8FAD004C */ lw $t5, 0x004C($sp) +/* 006A8 809FE2D8 00415024 */ and $t2, $v0, $at +/* 006AC 809FE2DC 8FAD004C */ lw $t5, 0x004C($sp) /* 006B0 809FE2E0 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 006B4 809FE2E4 012A5821 */ addu $t3, $t1, $t2 -/* 006B8 809FE2E8 01616021 */ addu $t4, $t3, $at +/* 006B4 809FE2E4 012A5821 */ addu $t3, $t1, $t2 +/* 006B8 809FE2E8 01616021 */ addu $t4, $t3, $at /* 006BC 809FE2EC 240E0001 */ addiu $t6, $zero, 0x0001 ## $t6 = 00000001 /* 006C0 809FE2F0 3C0580A0 */ lui $a1, %hi(func_809FE890) ## $a1 = 80A00000 /* 006C4 809FE2F4 ADAC1D68 */ sw $t4, 0x1D68($t5) ## 00001D68 /* 006C8 809FE2F8 A06E1414 */ sb $t6, 0x1414($v1) ## 8015FA74 /* 006CC 809FE2FC 24A5E890 */ addiu $a1, $a1, %lo(func_809FE890) ## $a1 = 809FE890 -/* 006D0 809FE300 0C27F70C */ jal func_809FDC30 +/* 006D0 809FE300 0C27F70C */ jal func_809FDC30 /* 006D4 809FE304 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 006D8 809FE308 10000018 */ beq $zero, $zero, .L809FE36C -/* 006DC 809FE30C 8FBF002C */ lw $ra, 0x002C($sp) +/* 006D8 809FE308 10000018 */ beq $zero, $zero, .L809FE36C +/* 006DC 809FE30C 8FBF002C */ lw $ra, 0x002C($sp) .L809FE310: /* 006E0 809FE310 85F800A4 */ lh $t8, 0x00A4($t7) ## 000000A4 /* 006E4 809FE314 24010004 */ addiu $at, $zero, 0x0004 ## $at = 00000004 /* 006E8 809FE318 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 006EC 809FE31C 17010005 */ bne $t8, $at, .L809FE334 +/* 006EC 809FE31C 17010005 */ bne $t8, $at, .L809FE334 /* 006F0 809FE320 3C0580A0 */ lui $a1, %hi(func_809FE638) ## $a1 = 80A00000 -/* 006F4 809FE324 0C27F70C */ jal func_809FDC30 +/* 006F4 809FE324 0C27F70C */ jal func_809FDC30 /* 006F8 809FE328 24A5E638 */ addiu $a1, $a1, %lo(func_809FE638) ## $a1 = 809FE638 -/* 006FC 809FE32C 1000000F */ beq $zero, $zero, .L809FE36C -/* 00700 809FE330 8FBF002C */ lw $ra, 0x002C($sp) +/* 006FC 809FE32C 1000000F */ beq $zero, $zero, .L809FE36C +/* 00700 809FE330 8FBF002C */ lw $ra, 0x002C($sp) .L809FE334: /* 00704 809FE334 8C790004 */ lw $t9, 0x0004($v1) ## 00000004 /* 00708 809FE338 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 0070C 809FE33C 3C0580A0 */ lui $a1, %hi(func_809FE3B4) ## $a1 = 80A00000 -/* 00710 809FE340 13200007 */ beq $t9, $zero, .L809FE360 +/* 00710 809FE340 13200007 */ beq $t9, $zero, .L809FE360 /* 00714 809FE344 00000000 */ nop /* 00718 809FE348 3C0580A0 */ lui $a1, %hi(func_809FE3C0) ## $a1 = 80A00000 /* 0071C 809FE34C 24A5E3C0 */ addiu $a1, $a1, %lo(func_809FE3C0) ## $a1 = 809FE3C0 -/* 00720 809FE350 0C27F70C */ jal func_809FDC30 +/* 00720 809FE350 0C27F70C */ jal func_809FDC30 /* 00724 809FE354 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00728 809FE358 10000004 */ beq $zero, $zero, .L809FE36C -/* 0072C 809FE35C 8FBF002C */ lw $ra, 0x002C($sp) +/* 00728 809FE358 10000004 */ beq $zero, $zero, .L809FE36C +/* 0072C 809FE35C 8FBF002C */ lw $ra, 0x002C($sp) .L809FE360: -/* 00730 809FE360 0C27F70C */ jal func_809FDC30 +/* 00730 809FE360 0C27F70C */ jal func_809FDC30 /* 00734 809FE364 24A5E3B4 */ addiu $a1, $a1, %lo(func_809FE3B4) ## $a1 = FFFFE3B4 -/* 00738 809FE368 8FBF002C */ lw $ra, 0x002C($sp) +/* 00738 809FE368 8FBF002C */ lw $ra, 0x002C($sp) .L809FE36C: -/* 0073C 809FE36C 8FB00028 */ lw $s0, 0x0028($sp) +/* 0073C 809FE36C 8FB00028 */ lw $s0, 0x0028($sp) /* 00740 809FE370 27BD0048 */ addiu $sp, $sp, 0x0048 ## $sp = 00000000 -/* 00744 809FE374 03E00008 */ jr $ra +/* 00744 809FE374 03E00008 */ jr $ra /* 00748 809FE378 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Du/func_809FDC38.s b/asm/non_matchings/overlays/actors/ovl_En_Du/func_809FDC38.s index 40c29089d9..d953409013 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Du/func_809FDC38.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Du/func_809FDC38.s @@ -2,7 +2,7 @@ glabel func_809FDC38 /* 00008 809FDC38 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 0000C 809FDC3C AFBF0014 */ sw $ra, 0x0014($sp) /* 00010 809FDC40 AFA5001C */ sw $a1, 0x001C($sp) -/* 00014 809FDC44 0C01B0D8 */ jal func_8006C360 +/* 00014 809FDC44 0C01B0D8 */ jal Text_GetFaceReaction /* 00018 809FDC48 24050021 */ addiu $a1, $zero, 0x0021 ## $a1 = 00000021 /* 0001C 809FDC4C 10400003 */ beq $v0, $zero, .L809FDC5C /* 00020 809FDC50 3043FFFF */ andi $v1, $v0, 0xFFFF ## $v1 = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Dy_Extra/EnDyExtra_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Dy_Extra/EnDyExtra_Draw.s index 9fa07ae3ff..9ac1a88bd8 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Dy_Extra/EnDyExtra_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Dy_Extra/EnDyExtra_Draw.s @@ -57,7 +57,7 @@ glabel EnDyExtra_Draw /* 00348 809FFA38 24C6FCA4 */ addiu $a2, $a2, %lo(D_809FFCA4) ## $a2 = 809FFCA4 /* 0034C 809FFA3C 27A40064 */ addiu $a0, $sp, 0x0064 ## $a0 = FFFFFFD4 /* 00350 809FFA40 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 00354 809FFA44 0C031AB1 */ jal func_800C6AC4 +/* 00354 809FFA44 0C031AB1 */ jal Graph_OpenDisps /* 00358 809FFA48 24070126 */ addiu $a3, $zero, 0x0126 ## $a3 = 00000126 /* 0035C 809FFA4C 8FAE0094 */ lw $t6, 0x0094($sp) /* 00360 809FFA50 0C024F61 */ jal func_80093D84 @@ -88,7 +88,7 @@ glabel EnDyExtra_Draw /* 003C4 809FFAB4 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 /* 003C8 809FFAB8 AFA20060 */ sw $v0, 0x0060($sp) /* 003CC 809FFABC AFA3001C */ sw $v1, 0x001C($sp) -/* 003D0 809FFAC0 0C0253D0 */ jal Draw_TwoTexScroll +/* 003D0 809FFAC0 0C0253D0 */ jal Gfx_TwoTexScroll /* 003D4 809FFAC4 00033040 */ sll $a2, $v1, 1 /* 003D8 809FFAC8 8FA80060 */ lw $t0, 0x0060($sp) /* 003DC 809FFACC 3C0FE700 */ lui $t7, 0xE700 ## $t7 = E7000000 @@ -167,7 +167,7 @@ glabel EnDyExtra_Draw /* 00500 809FFBF0 27A40064 */ addiu $a0, $sp, 0x0064 ## $a0 = FFFFFFD4 /* 00504 809FFBF4 24070145 */ addiu $a3, $zero, 0x0145 ## $a3 = 00000145 /* 00508 809FFBF8 AC4F0000 */ sw $t7, 0x0000($v0) ## 00000000 -/* 0050C 809FFBFC 0C031AD5 */ jal func_800C6B54 +/* 0050C 809FFBFC 0C031AD5 */ jal Graph_CloseDisps /* 00510 809FFC00 AC4C0004 */ sw $t4, 0x0004($v0) ## 00000004 /* 00514 809FFC04 8FBF003C */ lw $ra, 0x003C($sp) /* 00518 809FFC08 8FB00038 */ lw $s0, 0x0038($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Eiyer/EnEiyer_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Eiyer/EnEiyer_Draw.s index a00141bf1c..226326c8c6 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Eiyer/EnEiyer_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Eiyer/EnEiyer_Draw.s @@ -1,24 +1,24 @@ glabel EnEiyer_Draw /* 0183C 80A017DC 27BDFF98 */ addiu $sp, $sp, 0xFF98 ## $sp = FFFFFF98 -/* 01840 80A017E0 AFB20030 */ sw $s2, 0x0030($sp) +/* 01840 80A017E0 AFB20030 */ sw $s2, 0x0030($sp) /* 01844 80A017E4 00A09025 */ or $s2, $a1, $zero ## $s2 = 00000000 -/* 01848 80A017E8 AFBF0034 */ sw $ra, 0x0034($sp) -/* 0184C 80A017EC AFB1002C */ sw $s1, 0x002C($sp) -/* 01850 80A017F0 AFB00028 */ sw $s0, 0x0028($sp) +/* 01848 80A017E8 AFBF0034 */ sw $ra, 0x0034($sp) +/* 0184C 80A017EC AFB1002C */ sw $s1, 0x002C($sp) +/* 01850 80A017F0 AFB00028 */ sw $s0, 0x0028($sp) /* 01854 80A017F4 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 /* 01858 80A017F8 00808825 */ or $s1, $a0, $zero ## $s1 = 00000000 /* 0185C 80A017FC 3C0680A0 */ lui $a2, %hi(D_80A019D0) ## $a2 = 80A00000 /* 01860 80A01800 24C619D0 */ addiu $a2, $a2, %lo(D_80A019D0) ## $a2 = 80A019D0 /* 01864 80A01804 27A40050 */ addiu $a0, $sp, 0x0050 ## $a0 = FFFFFFE8 /* 01868 80A01808 240705D6 */ addiu $a3, $zero, 0x05D6 ## $a3 = 000005D6 -/* 0186C 80A0180C 0C031AB1 */ jal func_800C6AC4 +/* 0186C 80A0180C 0C031AB1 */ jal Graph_OpenDisps /* 01870 80A01810 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 /* 01874 80A01814 8E2F0190 */ lw $t7, 0x0190($s1) ## 00000190 /* 01878 80A01818 3C0E80A0 */ lui $t6, %hi(func_80A012F4) ## $t6 = 80A00000 /* 0187C 80A0181C 25CE12F4 */ addiu $t6, $t6, %lo(func_80A012F4) ## $t6 = 80A012F4 -/* 01880 80A01820 11CF001F */ beq $t6, $t7, .L80A018A0 +/* 01880 80A01820 11CF001F */ beq $t6, $t7, .L80A018A0 /* 01884 80A01824 00000000 */ nop -/* 01888 80A01828 0C024F46 */ jal func_80093D18 +/* 01888 80A01828 0C024F46 */ jal func_80093D18 /* 0188C 80A0182C 8E440000 */ lw $a0, 0x0000($s2) ## 00000000 /* 01890 80A01830 8E0302C0 */ lw $v1, 0x02C0($s0) ## 000002C0 /* 01894 80A01834 3C19DB06 */ lui $t9, 0xDB06 ## $t9 = DB060000 @@ -38,18 +38,18 @@ glabel EnEiyer_Draw /* 018CC 80A0186C AC6A0000 */ sw $t2, 0x0000($v1) ## 00000000 /* 018D0 80A01870 8E26016C */ lw $a2, 0x016C($s1) ## 0000016C /* 018D4 80A01874 8E250150 */ lw $a1, 0x0150($s1) ## 00000150 -/* 018D8 80A01878 AFB10014 */ sw $s1, 0x0014($sp) -/* 018DC 80A0187C AFA00010 */ sw $zero, 0x0010($sp) +/* 018D8 80A01878 AFB10014 */ sw $s1, 0x0014($sp) +/* 018DC 80A0187C AFA00010 */ sw $zero, 0x0010($sp) /* 018E0 80A01880 8E0C02C0 */ lw $t4, 0x02C0($s0) ## 000002C0 /* 018E4 80A01884 3C0780A0 */ lui $a3, %hi(func_80A0178C) ## $a3 = 80A00000 /* 018E8 80A01888 24E7178C */ addiu $a3, $a3, %lo(func_80A0178C) ## $a3 = 80A0178C /* 018EC 80A0188C 02402025 */ or $a0, $s2, $zero ## $a0 = 00000000 -/* 018F0 80A01890 0C0288A2 */ jal func_800A2288 -/* 018F4 80A01894 AFAC0018 */ sw $t4, 0x0018($sp) -/* 018F8 80A01898 10000020 */ beq $zero, $zero, .L80A0191C +/* 018F0 80A01890 0C0288A2 */ jal SkelAnime_Draw2 +/* 018F4 80A01894 AFAC0018 */ sw $t4, 0x0018($sp) +/* 018F8 80A01898 10000020 */ beq $zero, $zero, .L80A0191C /* 018FC 80A0189C AE0202C0 */ sw $v0, 0x02C0($s0) ## 000002C0 .L80A018A0: -/* 01900 80A018A0 0C024F61 */ jal func_80093D84 +/* 01900 80A018A0 0C024F61 */ jal func_80093D84 /* 01904 80A018A4 8E440000 */ lw $a0, 0x0000($s2) ## 00000000 /* 01908 80A018A8 8E0302D0 */ lw $v1, 0x02D0($s0) ## 000002D0 /* 0190C 80A018AC 3C0EDB06 */ lui $t6, 0xDB06 ## $t6 = DB060000 @@ -73,25 +73,25 @@ glabel EnEiyer_Draw /* 01954 80A018F4 AC6A0004 */ sw $t2, 0x0004($v1) ## 00000004 /* 01958 80A018F8 8E26016C */ lw $a2, 0x016C($s1) ## 0000016C /* 0195C 80A018FC 8E250150 */ lw $a1, 0x0150($s1) ## 00000150 -/* 01960 80A01900 AFB10014 */ sw $s1, 0x0014($sp) -/* 01964 80A01904 AFA00010 */ sw $zero, 0x0010($sp) +/* 01960 80A01900 AFB10014 */ sw $s1, 0x0014($sp) +/* 01964 80A01904 AFA00010 */ sw $zero, 0x0010($sp) /* 01968 80A01908 8E0B02D0 */ lw $t3, 0x02D0($s0) ## 000002D0 /* 0196C 80A0190C 02402025 */ or $a0, $s2, $zero ## $a0 = 00000000 -/* 01970 80A01910 0C0288A2 */ jal func_800A2288 -/* 01974 80A01914 AFAB0018 */ sw $t3, 0x0018($sp) +/* 01970 80A01910 0C0288A2 */ jal SkelAnime_Draw2 +/* 01974 80A01914 AFAB0018 */ sw $t3, 0x0018($sp) /* 01978 80A01918 AE0202D0 */ sw $v0, 0x02D0($s0) ## 000002D0 .L80A0191C: /* 0197C 80A0191C 3C0680A0 */ lui $a2, %hi(D_80A019E0) ## $a2 = 80A00000 /* 01980 80A01920 24C619E0 */ addiu $a2, $a2, %lo(D_80A019E0) ## $a2 = 80A019E0 /* 01984 80A01924 27A40050 */ addiu $a0, $sp, 0x0050 ## $a0 = FFFFFFE8 /* 01988 80A01928 8E450000 */ lw $a1, 0x0000($s2) ## 00000000 -/* 0198C 80A0192C 0C031AD5 */ jal func_800C6B54 +/* 0198C 80A0192C 0C031AD5 */ jal Graph_CloseDisps /* 01990 80A01930 24070605 */ addiu $a3, $zero, 0x0605 ## $a3 = 00000605 -/* 01994 80A01934 8FBF0034 */ lw $ra, 0x0034($sp) -/* 01998 80A01938 8FB00028 */ lw $s0, 0x0028($sp) -/* 0199C 80A0193C 8FB1002C */ lw $s1, 0x002C($sp) -/* 019A0 80A01940 8FB20030 */ lw $s2, 0x0030($sp) -/* 019A4 80A01944 03E00008 */ jr $ra +/* 01994 80A01934 8FBF0034 */ lw $ra, 0x0034($sp) +/* 01998 80A01938 8FB00028 */ lw $s0, 0x0028($sp) +/* 0199C 80A0193C 8FB1002C */ lw $s1, 0x002C($sp) +/* 019A0 80A01940 8FB20030 */ lw $s2, 0x0030($sp) +/* 019A4 80A01944 03E00008 */ jr $ra /* 019A8 80A01948 27BD0068 */ addiu $sp, $sp, 0x0068 ## $sp = 00000000 /* 019AC 80A0194C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Eiyer/func_80A00218.s b/asm/non_matchings/overlays/actors/ovl_En_Eiyer/func_80A00218.s index 5ea8058cf1..4e1a7d9142 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Eiyer/func_80A00218.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Eiyer/func_80A00218.s @@ -1,13 +1,13 @@ glabel func_80A00218 /* 00278 80A00218 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 0027C 80A0021C AFB00018 */ sw $s0, 0x0018($sp) +/* 0027C 80A0021C AFB00018 */ sw $s0, 0x0018($sp) /* 00280 80A00220 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00284 80A00224 AFBF001C */ sw $ra, 0x001C($sp) +/* 00284 80A00224 AFBF001C */ sw $ra, 0x001C($sp) /* 00288 80A00228 240E0019 */ addiu $t6, $zero, 0x0019 ## $t6 = 00000019 /* 0028C 80A0022C 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 00290 80A00230 AC8E02A8 */ sw $t6, 0x02A8($a0) ## 000002A8 /* 00294 80A00234 24A512AC */ addiu $a1, $a1, 0x12AC ## $a1 = 060012AC -/* 00298 80A00238 0C0294BE */ jal func_800A52F8 +/* 00298 80A00238 0C0294BE */ jal SkelAnime_ChangeAnimDefaultRepeat /* 0029C 80A0023C 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C /* 002A0 80A00240 3C014220 */ lui $at, 0x4220 ## $at = 42200000 /* 002A4 80A00244 C6040008 */ lwc1 $f4, 0x0008($s0) ## 00000008 @@ -15,7 +15,7 @@ glabel func_80A00218 /* 002AC 80A0024C C606000C */ lwc1 $f6, 0x000C($s0) ## 0000000C /* 002B0 80A00250 8602001C */ lh $v0, 0x001C($s0) ## 0000001C /* 002B4 80A00254 E6040024 */ swc1 $f4, 0x0024($s0) ## 00000024 -/* 002B8 80A00258 46083281 */ sub.s $f10, $f6, $f8 +/* 002B8 80A00258 46083281 */ sub.s $f10, $f6, $f8 /* 002BC 80A0025C C6100010 */ lwc1 $f16, 0x0010($s0) ## 00000010 /* 002C0 80A00260 44809000 */ mtc1 $zero, $f18 ## $f18 = 0.00 /* 002C4 80A00264 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 @@ -23,9 +23,9 @@ glabel func_80A00218 /* 002CC 80A0026C E60A0028 */ swc1 $f10, 0x0028($s0) ## 00000028 /* 002D0 80A00270 E610002C */ swc1 $f16, 0x002C($s0) ## 0000002C /* 002D4 80A00274 E6120060 */ swc1 $f18, 0x0060($s0) ## 00000060 -/* 002D8 80A00278 10410016 */ beq $v0, $at, .L80A002D4 +/* 002D8 80A00278 10410016 */ beq $v0, $at, .L80A002D4 /* 002DC 80A0027C E6040068 */ swc1 $f4, 0x0068($s0) ## 00000068 -/* 002E0 80A00280 5440000C */ bnel $v0, $zero, .L80A002B4 +/* 002E0 80A00280 5440000C */ bnel $v0, $zero, .L80A002B4 /* 002E4 80A00284 8E190118 */ lw $t9, 0x0118($s0) ## 00000118 /* 002E8 80A00288 0C03F66B */ jal Math_Rand_ZeroOne ## Rand.Next() float @@ -33,21 +33,21 @@ glabel func_80A00218 /* 002F0 80A00290 3C014780 */ lui $at, 0x4780 ## $at = 47800000 /* 002F4 80A00294 44813000 */ mtc1 $at, $f6 ## $f6 = 65536.00 /* 002F8 80A00298 00000000 */ nop -/* 002FC 80A0029C 46060202 */ mul.s $f8, $f0, $f6 -/* 00300 80A002A0 4600428D */ trunc.w.s $f10, $f8 -/* 00304 80A002A4 44185000 */ mfc1 $t8, $f10 -/* 00308 80A002A8 10000006 */ beq $zero, $zero, .L80A002C4 +/* 002FC 80A0029C 46060202 */ mul.s $f8, $f0, $f6 +/* 00300 80A002A0 4600428D */ trunc.w.s $f10, $f8 +/* 00304 80A002A4 44185000 */ mfc1 $t8, $f10 +/* 00308 80A002A8 10000006 */ beq $zero, $zero, .L80A002C4 /* 0030C 80A002AC A6180032 */ sh $t8, 0x0032($s0) ## 00000032 /* 00310 80A002B0 8E190118 */ lw $t9, 0x0118($s0) ## 00000118 .L80A002B4: -/* 00314 80A002B4 00024B80 */ sll $t1, $v0, 14 +/* 00314 80A002B4 00024B80 */ sll $t1, $v0, 14 /* 00318 80A002B8 87280032 */ lh $t0, 0x0032($t9) ## 00000032 -/* 0031C 80A002BC 01095021 */ addu $t2, $t0, $t1 +/* 0031C 80A002BC 01095021 */ addu $t2, $t0, $t1 /* 00320 80A002C0 A60A0032 */ sh $t2, 0x0032($s0) ## 00000032 .L80A002C4: -/* 00324 80A002C4 0C280069 */ jal func_80A001A4 +/* 00324 80A002C4 0C280069 */ jal func_80A001A4 /* 00328 80A002C8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0032C 80A002CC 1000000D */ beq $zero, $zero, .L80A00304 +/* 0032C 80A002CC 1000000D */ beq $zero, $zero, .L80A00304 /* 00330 80A002D0 920C0298 */ lbu $t4, 0x0298($s0) ## 00000298 .L80A002D4: /* 00334 80A002D4 0C03F66B */ jal Math_Rand_ZeroOne @@ -56,9 +56,9 @@ glabel func_80A00218 /* 0033C 80A002DC 3C014780 */ lui $at, 0x4780 ## $at = 47800000 /* 00340 80A002E0 44818000 */ mtc1 $at, $f16 ## $f16 = 65536.00 /* 00344 80A002E4 00000000 */ nop -/* 00348 80A002E8 46100482 */ mul.s $f18, $f0, $f16 -/* 0034C 80A002EC 4600910D */ trunc.w.s $f4, $f18 -/* 00350 80A002F0 44022000 */ mfc1 $v0, $f4 +/* 00348 80A002E8 46100482 */ mul.s $f18, $f0, $f16 +/* 0034C 80A002EC 4600910D */ trunc.w.s $f4, $f18 +/* 00350 80A002F0 44022000 */ mfc1 $v0, $f4 /* 00354 80A002F4 00000000 */ nop /* 00358 80A002F8 A60200B6 */ sh $v0, 0x00B6($s0) ## 000000B6 /* 0035C 80A002FC A6020032 */ sh $v0, 0x0032($s0) ## 00000032 @@ -73,17 +73,17 @@ glabel func_80A00218 /* 0037C 80A0031C 25080858 */ addiu $t0, $t0, %lo(func_80A00858) ## $t0 = 80A00858 /* 00380 80A00320 318DFFFE */ andi $t5, $t4, 0xFFFE ## $t5 = 00000000 /* 00384 80A00324 31CFFFFE */ andi $t7, $t6, 0xFFFE ## $t7 = 00000000 -/* 00388 80A00328 0301C824 */ and $t9, $t8, $at +/* 00388 80A00328 0301C824 */ and $t9, $t8, $at /* 0038C 80A0032C A20D0298 */ sb $t5, 0x0298($s0) ## 00000298 /* 00390 80A00330 A20F0299 */ sb $t7, 0x0299($s0) ## 00000299 /* 00394 80A00334 AE190004 */ sw $t9, 0x0004($s0) ## 00000004 /* 00398 80A00338 AE080190 */ sw $t0, 0x0190($s0) ## 00000190 /* 0039C 80A0033C E60600C4 */ swc1 $f6, 0x00C4($s0) ## 000000C4 /* 003A0 80A00340 E60800BC */ swc1 $f8, 0x00BC($s0) ## 000000BC -/* 003A4 80A00344 8FBF001C */ lw $ra, 0x001C($sp) -/* 003A8 80A00348 8FB00018 */ lw $s0, 0x0018($sp) +/* 003A4 80A00344 8FBF001C */ lw $ra, 0x001C($sp) +/* 003A8 80A00348 8FB00018 */ lw $s0, 0x0018($sp) /* 003AC 80A0034C 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 003B0 80A00350 03E00008 */ jr $ra +/* 003B0 80A00350 03E00008 */ jr $ra /* 003B4 80A00354 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Eiyer/func_80A003DC.s b/asm/non_matchings/overlays/actors/ovl_En_Eiyer/func_80A003DC.s index 2d9d198a6c..d8dd88c611 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Eiyer/func_80A003DC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Eiyer/func_80A003DC.s @@ -1,14 +1,14 @@ glabel func_80A003DC /* 0043C 80A003DC 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 /* 00440 80A003E0 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 -/* 00444 80A003E4 AFB00020 */ sw $s0, 0x0020($sp) -/* 00448 80A003E8 AFA50034 */ sw $a1, 0x0034($sp) +/* 00444 80A003E4 AFB00020 */ sw $s0, 0x0020($sp) +/* 00448 80A003E8 AFA50034 */ sw $a1, 0x0034($sp) /* 0044C 80A003EC 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00450 80A003F0 AFBF0024 */ sw $ra, 0x0024($sp) +/* 00450 80A003F0 AFBF0024 */ sw $ra, 0x0024($sp) /* 00454 80A003F4 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 00458 80A003F8 24A50704 */ addiu $a1, $a1, 0x0704 ## $a1 = 06000704 /* 0045C 80A003FC 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 00460 80A00400 0C02947A */ jal func_800A51E8 +/* 00460 80A00400 0C02947A */ jal SkelAnime_ChangeAnimDefaultStop /* 00464 80A00404 E484FF1C */ swc1 $f4, -0x00E4($a0) ## 00000068 /* 00468 80A00408 3C0EFFCF */ lui $t6, 0xFFCF ## $t6 = FFCF0000 /* 0046C 80A0040C 35CEFFFF */ ori $t6, $t6, 0xFFFF ## $t6 = FFCFFFFF @@ -34,27 +34,27 @@ glabel func_80A003DC /* 004BC 80A0045C AE180284 */ sw $t8, 0x0284($s0) ## 00000284 /* 004C0 80A00460 A6190032 */ sh $t9, 0x0032($s0) ## 00000032 /* 004C4 80A00464 E60800BC */ swc1 $f8, 0x00BC($s0) ## 000000BC -/* 004C8 80A00468 AFA2002C */ sw $v0, 0x002C($sp) +/* 004C8 80A00468 AFA2002C */ sw $v0, 0x002C($sp) /* 004CC 80A0046C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 004D0 80A00470 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 004D4 80A00474 240538C2 */ addiu $a1, $zero, 0x38C2 ## $a1 = 000038C2 /* 004D8 80A00478 240C0001 */ addiu $t4, $zero, 0x0001 ## $t4 = 00000001 /* 004DC 80A0047C 240D02BC */ addiu $t5, $zero, 0x02BC ## $t5 = 000002BC -/* 004E0 80A00480 AFAD0014 */ sw $t5, 0x0014($sp) -/* 004E4 80A00484 AFAC0010 */ sw $t4, 0x0010($sp) -/* 004E8 80A00488 8FA40034 */ lw $a0, 0x0034($sp) -/* 004EC 80A0048C 8FA5002C */ lw $a1, 0x002C($sp) +/* 004E0 80A00480 AFAD0014 */ sw $t5, 0x0014($sp) +/* 004E4 80A00484 AFAC0010 */ sw $t4, 0x0010($sp) +/* 004E8 80A00488 8FA40034 */ lw $a0, 0x0034($sp) +/* 004EC 80A0048C 8FA5002C */ lw $a1, 0x002C($sp) /* 004F0 80A00490 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 004F4 80A00494 0C00A527 */ jal func_8002949C +/* 004F4 80A00494 0C00A527 */ jal func_8002949C /* 004F8 80A00498 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 /* 004FC 80A0049C 3C0E80A0 */ lui $t6, %hi(func_80A00B18) ## $t6 = 80A00000 /* 00500 80A004A0 25CE0B18 */ addiu $t6, $t6, %lo(func_80A00B18) ## $t6 = 80A00B18 /* 00504 80A004A4 AE0E0190 */ sw $t6, 0x0190($s0) ## 00000190 -/* 00508 80A004A8 8FBF0024 */ lw $ra, 0x0024($sp) -/* 0050C 80A004AC 8FB00020 */ lw $s0, 0x0020($sp) +/* 00508 80A004A8 8FBF0024 */ lw $ra, 0x0024($sp) +/* 0050C 80A004AC 8FB00020 */ lw $s0, 0x0020($sp) /* 00510 80A004B0 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 00514 80A004B4 03E00008 */ jr $ra +/* 00514 80A004B4 03E00008 */ jr $ra /* 00518 80A004B8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Eiyer/func_80A004BC.s b/asm/non_matchings/overlays/actors/ovl_En_Eiyer/func_80A004BC.s index ff0a2adb0d..0310dfee90 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Eiyer/func_80A004BC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Eiyer/func_80A004BC.s @@ -1,34 +1,34 @@ glabel func_80A004BC /* 0051C 80A004BC 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00520 80A004C0 AFBF0014 */ sw $ra, 0x0014($sp) +/* 00520 80A004C0 AFBF0014 */ sw $ra, 0x0014($sp) /* 00524 80A004C4 848E00B6 */ lh $t6, 0x00B6($a0) ## 000000B6 /* 00528 80A004C8 3C0180A0 */ lui $at, %hi(D_80A019F0) ## $at = 80A00000 /* 0052C 80A004CC A48E0196 */ sh $t6, 0x0196($a0) ## 00000196 -/* 00530 80A004D0 AFA40018 */ sw $a0, 0x0018($sp) +/* 00530 80A004D0 AFA40018 */ sw $a0, 0x0018($sp) /* 00534 80A004D4 0C041184 */ jal cosf - -/* 00538 80A004D8 C42C19F0 */ lwc1 $f12, %lo(D_80A019F0)($at) + +/* 00538 80A004D8 C42C19F0 */ lwc1 $f12, %lo(D_80A019F0)($at) /* 0053C 80A004DC 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 /* 00540 80A004E0 44812000 */ mtc1 $at, $f4 ## $f4 = 5.00 -/* 00544 80A004E4 8FA70018 */ lw $a3, 0x0018($sp) +/* 00544 80A004E4 8FA70018 */ lw $a3, 0x0018($sp) /* 00548 80A004E8 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 0054C 80A004EC 46040182 */ mul.s $f6, $f0, $f4 +/* 0054C 80A004EC 46040182 */ mul.s $f6, $f0, $f4 /* 00550 80A004F0 C4E80028 */ lwc1 $f8, 0x0028($a3) ## 00000028 /* 00554 80A004F4 24A50FC0 */ addiu $a1, $a1, 0x0FC0 ## $a1 = 06000FC0 /* 00558 80A004F8 3C06C0A0 */ lui $a2, 0xC0A0 ## $a2 = C0A00000 /* 0055C 80A004FC 24E4014C */ addiu $a0, $a3, 0x014C ## $a0 = 0000014C -/* 00560 80A00500 46083280 */ add.s $f10, $f6, $f8 -/* 00564 80A00504 0C0294D3 */ jal func_800A534C +/* 00560 80A00500 46083280 */ add.s $f10, $f6, $f8 +/* 00564 80A00504 0C0294D3 */ jal SkelAnime_ChangeAnimTransitionRepeat /* 00568 80A00508 E4EA0280 */ swc1 $f10, 0x0280($a3) ## 00000280 -/* 0056C 80A0050C 8FA70018 */ lw $a3, 0x0018($sp) +/* 0056C 80A0050C 8FA70018 */ lw $a3, 0x0018($sp) /* 00570 80A00510 3C1880A0 */ lui $t8, %hi(func_80A00C70) ## $t8 = 80A00000 /* 00574 80A00514 240F003C */ addiu $t7, $zero, 0x003C ## $t7 = 0000003C /* 00578 80A00518 27180C70 */ addiu $t8, $t8, %lo(func_80A00C70) ## $t8 = 80A00C70 /* 0057C 80A0051C A4EF0194 */ sh $t7, 0x0194($a3) ## 00000194 /* 00580 80A00520 ACF80190 */ sw $t8, 0x0190($a3) ## 00000190 -/* 00584 80A00524 8FBF0014 */ lw $ra, 0x0014($sp) +/* 00584 80A00524 8FBF0014 */ lw $ra, 0x0014($sp) /* 00588 80A00528 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 0058C 80A0052C 03E00008 */ jr $ra +/* 0058C 80A0052C 03E00008 */ jr $ra /* 00590 80A00530 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Eiyer/func_80A00588.s b/asm/non_matchings/overlays/actors/ovl_En_Eiyer/func_80A00588.s index 5c9eda3452..642c0c0aff 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Eiyer/func_80A00588.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Eiyer/func_80A00588.s @@ -1,14 +1,14 @@ glabel func_80A00588 /* 005E8 80A00588 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 005EC 80A0058C AFBF0014 */ sw $ra, 0x0014($sp) +/* 005EC 80A0058C AFBF0014 */ sw $ra, 0x0014($sp) /* 005F0 80A00590 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 /* 005F4 80A00594 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 005F8 80A00598 24A504C4 */ addiu $a1, $a1, 0x04C4 ## $a1 = 060004C4 -/* 005FC 80A0059C AFA70018 */ sw $a3, 0x0018($sp) +/* 005FC 80A0059C AFA70018 */ sw $a3, 0x0018($sp) /* 00600 80A005A0 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 00604 80A005A4 0C029490 */ jal func_800A5240 +/* 00604 80A005A4 0C029490 */ jal SkelAnime_ChangeAnimTransitionStop /* 00608 80A005A8 3C06C040 */ lui $a2, 0xC040 ## $a2 = C0400000 -/* 0060C 80A005AC 8FA70018 */ lw $a3, 0x0018($sp) +/* 0060C 80A005AC 8FA70018 */ lw $a3, 0x0018($sp) /* 00610 80A005B0 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 /* 00614 80A005B4 2408FFFF */ addiu $t0, $zero, 0xFFFF ## $t0 = FFFFFFFF /* 00618 80A005B8 90EE0298 */ lbu $t6, 0x0298($a3) ## 00000298 @@ -20,14 +20,14 @@ glabel func_80A00588 /* 00630 80A005D0 ACF90004 */ sw $t9, 0x0004($a3) ## 00000004 /* 00634 80A005D4 A4E80194 */ sh $t0, 0x0194($a3) ## 00000194 /* 00638 80A005D8 E4E4006C */ swc1 $f4, 0x006C($a3) ## 0000006C -/* 0063C 80A005DC 85291992 */ lh $t1, %lo(D_80A01992)($t1) +/* 0063C 80A005DC 85291992 */ lh $t1, %lo(D_80A01992)($t1) /* 00640 80A005E0 3C0A80A0 */ lui $t2, %hi(func_80A01010) ## $t2 = 80A00000 /* 00644 80A005E4 254A1010 */ addiu $t2, $t2, %lo(func_80A01010) ## $t2 = 80A01010 /* 00648 80A005E8 ACEA0190 */ sw $t2, 0x0190($a3) ## 00000190 /* 0064C 80A005EC A4E902CA */ sh $t1, 0x02CA($a3) ## 000002CA -/* 00650 80A005F0 8FBF0014 */ lw $ra, 0x0014($sp) +/* 00650 80A005F0 8FBF0014 */ lw $ra, 0x0014($sp) /* 00654 80A005F4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00658 80A005F8 03E00008 */ jr $ra +/* 00658 80A005F8 03E00008 */ jr $ra /* 0065C 80A005FC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Eiyer/func_80A00600.s b/asm/non_matchings/overlays/actors/ovl_En_Eiyer/func_80A00600.s index db58a444d6..b985adb8d5 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Eiyer/func_80A00600.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Eiyer/func_80A00600.s @@ -1,7 +1,7 @@ glabel func_80A00600 /* 00660 80A00600 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 00664 80A00604 AFBF002C */ sw $ra, 0x002C($sp) -/* 00668 80A00608 AFB00028 */ sw $s0, 0x0028($sp) +/* 00664 80A00604 AFBF002C */ sw $ra, 0x002C($sp) +/* 00668 80A00608 AFB00028 */ sw $s0, 0x0028($sp) /* 0066C 80A0060C C4840028 */ lwc1 $f4, 0x0028($a0) ## 00000028 /* 00670 80A00610 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 /* 00674 80A00614 3C01C040 */ lui $at, 0xC040 ## $at = C0400000 @@ -9,15 +9,15 @@ glabel func_80A00600 /* 0067C 80A0061C E4840280 */ swc1 $f4, 0x0280($a0) ## 00000280 /* 00680 80A00620 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 00684 80A00624 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 00688 80A00628 44070000 */ mfc1 $a3, $f0 +/* 00688 80A00628 44070000 */ mfc1 $a3, $f0 /* 0068C 80A0062C 24A50FC0 */ addiu $a1, $a1, 0x0FC0 ## $a1 = 06000FC0 /* 00690 80A00630 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 00694 80A00634 AFA00014 */ sw $zero, 0x0014($sp) +/* 00694 80A00634 AFA00014 */ sw $zero, 0x0014($sp) /* 00698 80A00638 3C064000 */ lui $a2, 0x4000 ## $a2 = 40000000 -/* 0069C 80A0063C E7A00010 */ swc1 $f0, 0x0010($sp) -/* 006A0 80A00640 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 006A4 80A00644 E7A60018 */ swc1 $f6, 0x0018($sp) +/* 0069C 80A0063C E7A00010 */ swc1 $f0, 0x0010($sp) +/* 006A0 80A00640 0C029468 */ jal SkelAnime_ChangeAnim + +/* 006A4 80A00644 E7A60018 */ swc1 $f6, 0x0018($sp) /* 006A8 80A00648 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 /* 006AC 80A0064C 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 /* 006B0 80A00650 44814000 */ mtc1 $at, $f8 ## $f8 = 5.00 @@ -27,11 +27,11 @@ glabel func_80A00600 /* 006C0 80A00660 E600006C */ swc1 $f0, 0x006C($s0) ## 0000006C /* 006C4 80A00664 E6000060 */ swc1 $f0, 0x0060($s0) ## 00000060 /* 006C8 80A00668 E6080068 */ swc1 $f8, 0x0068($s0) ## 00000068 -/* 006CC 80A0066C AFAF0010 */ sw $t7, 0x0010($sp) +/* 006CC 80A0066C AFAF0010 */ sw $t7, 0x0010($sp) /* 006D0 80A00670 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 006D4 80A00674 24054000 */ addiu $a1, $zero, 0x4000 ## $a1 = 00004000 /* 006D8 80A00678 240600C8 */ addiu $a2, $zero, 0x00C8 ## $a2 = 000000C8 -/* 006DC 80A0067C 0C00D09B */ jal func_8003426C +/* 006DC 80A0067C 0C00D09B */ jal func_8003426C /* 006E0 80A00680 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 /* 006E4 80A00684 92180299 */ lbu $t8, 0x0299($s0) ## 00000299 /* 006E8 80A00688 3C0880A0 */ lui $t0, %hi(func_80A01104) ## $t0 = 80A00000 @@ -39,10 +39,10 @@ glabel func_80A00600 /* 006F0 80A00690 3319FFFE */ andi $t9, $t8, 0xFFFE ## $t9 = 00000000 /* 006F4 80A00694 A2190299 */ sb $t9, 0x0299($s0) ## 00000299 /* 006F8 80A00698 AE080190 */ sw $t0, 0x0190($s0) ## 00000190 -/* 006FC 80A0069C 8FBF002C */ lw $ra, 0x002C($sp) -/* 00700 80A006A0 8FB00028 */ lw $s0, 0x0028($sp) +/* 006FC 80A0069C 8FBF002C */ lw $ra, 0x002C($sp) +/* 00700 80A006A0 8FB00028 */ lw $s0, 0x0028($sp) /* 00704 80A006A4 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 00708 80A006A8 03E00008 */ jr $ra +/* 00708 80A006A8 03E00008 */ jr $ra /* 0070C 80A006AC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Eiyer/func_80A006B0.s b/asm/non_matchings/overlays/actors/ovl_En_Eiyer/func_80A006B0.s index 9e2319719f..c273b83170 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Eiyer/func_80A006B0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Eiyer/func_80A006B0.s @@ -1,34 +1,34 @@ glabel func_80A006B0 /* 00710 80A006B0 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 00714 80A006B4 AFBF0024 */ sw $ra, 0x0024($sp) -/* 00718 80A006B8 AFB00020 */ sw $s0, 0x0020($sp) +/* 00714 80A006B4 AFBF0024 */ sw $ra, 0x0024($sp) +/* 00718 80A006B8 AFB00020 */ sw $s0, 0x0020($sp) /* 0071C 80A006BC 240E0014 */ addiu $t6, $zero, 0x0014 ## $t6 = 00000014 /* 00720 80A006C0 A48E0194 */ sh $t6, 0x0194($a0) ## 00000194 /* 00724 80A006C4 240F0028 */ addiu $t7, $zero, 0x0028 ## $t7 = 00000028 /* 00728 80A006C8 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 0072C 80A006CC AFAF0010 */ sw $t7, 0x0010($sp) +/* 0072C 80A006CC AFAF0010 */ sw $t7, 0x0010($sp) /* 00730 80A006D0 24054000 */ addiu $a1, $zero, 0x4000 ## $a1 = 00004000 /* 00734 80A006D4 240600C8 */ addiu $a2, $zero, 0x00C8 ## $a2 = 000000C8 -/* 00738 80A006D8 0C00D09B */ jal func_8003426C +/* 00738 80A006D8 0C00D09B */ jal func_8003426C /* 0073C 80A006DC 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 /* 00740 80A006E0 8E1802A8 */ lw $t8, 0x02A8($s0) ## 000002A8 /* 00744 80A006E4 24010019 */ addiu $at, $zero, 0x0019 ## $at = 00000019 /* 00748 80A006E8 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C -/* 0074C 80A006EC 13010009 */ beq $t8, $at, .L80A00714 +/* 0074C 80A006EC 13010009 */ beq $t8, $at, .L80A00714 /* 00750 80A006F0 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 00754 80A006F4 3C0140C0 */ lui $at, 0x40C0 ## $at = 40C00000 /* 00758 80A006F8 44812000 */ mtc1 $at, $f4 ## $f4 = 6.00 /* 0075C 80A006FC 24A50FC0 */ addiu $a1, $a1, 0x0FC0 ## $a1 = 06000FC0 /* 00760 80A00700 3C06C040 */ lui $a2, 0xC040 ## $a2 = C0400000 -/* 00764 80A00704 0C0294D3 */ jal func_800A534C +/* 00764 80A00704 0C0294D3 */ jal SkelAnime_ChangeAnimTransitionRepeat /* 00768 80A00708 E6040068 */ swc1 $f4, 0x0068($s0) ## 00000068 -/* 0076C 80A0070C 10000007 */ beq $zero, $zero, .L80A0072C +/* 0076C 80A0070C 10000007 */ beq $zero, $zero, .L80A0072C /* 00770 80A00710 92080298 */ lbu $t0, 0x0298($s0) ## 00000298 .L80A00714: /* 00774 80A00714 3C0140C0 */ lui $at, 0x40C0 ## $at = 40C00000 /* 00778 80A00718 44814000 */ mtc1 $at, $f8 ## $f8 = 6.00 /* 0077C 80A0071C C6060068 */ lwc1 $f6, 0x0068($s0) ## 00000068 -/* 00780 80A00720 46083281 */ sub.s $f10, $f6, $f8 +/* 00780 80A00720 46083281 */ sub.s $f10, $f6, $f8 /* 00784 80A00724 E60A0068 */ swc1 $f10, 0x0068($s0) ## 00000068 /* 00788 80A00728 92080298 */ lbu $t0, 0x0298($s0) ## 00000298 .L80A0072C: @@ -43,10 +43,10 @@ glabel func_80A006B0 /* 007AC 80A0074C A2090298 */ sb $t1, 0x0298($s0) ## 00000298 /* 007B0 80A00750 A20B0299 */ sb $t3, 0x0299($s0) ## 00000299 /* 007B4 80A00754 AE0C0190 */ sw $t4, 0x0190($s0) ## 00000190 -/* 007B8 80A00758 8FBF0024 */ lw $ra, 0x0024($sp) -/* 007BC 80A0075C 8FB00020 */ lw $s0, 0x0020($sp) +/* 007B8 80A00758 8FBF0024 */ lw $ra, 0x0024($sp) +/* 007BC 80A0075C 8FB00020 */ lw $s0, 0x0020($sp) /* 007C0 80A00760 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 007C4 80A00764 03E00008 */ jr $ra +/* 007C4 80A00764 03E00008 */ jr $ra /* 007C8 80A00768 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Eiyer/func_80A00794.s b/asm/non_matchings/overlays/actors/ovl_En_Eiyer/func_80A00794.s index 22b02bec6a..7a8d9b5442 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Eiyer/func_80A00794.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Eiyer/func_80A00794.s @@ -3,19 +3,19 @@ glabel func_80A00794 /* 007F8 80A00798 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 /* 007FC 80A0079C 3C01C100 */ lui $at, 0xC100 ## $at = C1000000 /* 00800 80A007A0 44812000 */ mtc1 $at, $f4 ## $f4 = -8.00 -/* 00804 80A007A4 AFB00028 */ sw $s0, 0x0028($sp) +/* 00804 80A007A4 AFB00028 */ sw $s0, 0x0028($sp) /* 00808 80A007A8 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 0080C 80A007AC AFBF002C */ sw $ra, 0x002C($sp) +/* 0080C 80A007AC AFBF002C */ sw $ra, 0x002C($sp) /* 00810 80A007B0 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 00814 80A007B4 44070000 */ mfc1 $a3, $f0 +/* 00814 80A007B4 44070000 */ mfc1 $a3, $f0 /* 00818 80A007B8 24A50288 */ addiu $a1, $a1, 0x0288 ## $a1 = 06000288 /* 0081C 80A007BC 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 00820 80A007C0 AFA00014 */ sw $zero, 0x0014($sp) +/* 00820 80A007C0 AFA00014 */ sw $zero, 0x0014($sp) /* 00824 80A007C4 3C064000 */ lui $a2, 0x4000 ## $a2 = 40000000 -/* 00828 80A007C8 E7A00010 */ swc1 $f0, 0x0010($sp) -/* 0082C 80A007CC 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 00830 80A007D0 E7A40018 */ swc1 $f4, 0x0018($sp) +/* 00828 80A007C8 E7A00010 */ swc1 $f0, 0x0010($sp) +/* 0082C 80A007CC 0C029468 */ jal SkelAnime_ChangeAnim + +/* 00830 80A007D0 E7A40018 */ swc1 $f4, 0x0018($sp) /* 00834 80A007D4 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 /* 00838 80A007D8 3C01BF80 */ lui $at, 0xBF80 ## $at = BF800000 /* 0083C 80A007DC 44813000 */ mtc1 $at, $f6 ## $f6 = -1.00 @@ -25,30 +25,30 @@ glabel func_80A00794 /* 0084C 80A007EC E6000068 */ swc1 $f0, 0x0068($s0) ## 00000068 /* 00850 80A007F0 E6000060 */ swc1 $f0, 0x0060($s0) ## 00000060 /* 00854 80A007F4 E606006C */ swc1 $f6, 0x006C($s0) ## 0000006C -/* 00858 80A007F8 85EF1992 */ lh $t7, %lo(D_80A01992)($t7) +/* 00858 80A007F8 85EF1992 */ lh $t7, %lo(D_80A01992)($t7) /* 0085C 80A007FC 24190050 */ addiu $t9, $zero, 0x0050 ## $t9 = 00000050 /* 00860 80A00800 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 00864 80A00804 25F80008 */ addiu $t8, $t7, 0x0008 ## $t8 = 80A00008 /* 00868 80A00808 A61802CA */ sh $t8, 0x02CA($s0) ## 000002CA -/* 0086C 80A0080C AFB90010 */ sw $t9, 0x0010($sp) +/* 0086C 80A0080C AFB90010 */ sw $t9, 0x0010($sp) /* 00870 80A00810 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 00874 80A00814 240600C8 */ addiu $a2, $zero, 0x00C8 ## $a2 = 000000C8 -/* 00878 80A00818 0C00D09B */ jal func_8003426C +/* 00878 80A00818 0C00D09B */ jal func_8003426C /* 0087C 80A0081C 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 /* 00880 80A00820 92080298 */ lbu $t0, 0x0298($s0) ## 00000298 /* 00884 80A00824 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 00888 80A00828 2405389E */ addiu $a1, $zero, 0x389E ## $a1 = 0000389E /* 0088C 80A0082C 3109FFFE */ andi $t1, $t0, 0xFFFE ## $t1 = 00000000 /* 00890 80A00830 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 00894 80A00834 A2090298 */ sb $t1, 0x0298($s0) ## 00000298 /* 00898 80A00838 3C0A80A0 */ lui $t2, %hi(func_80A01374) ## $t2 = 80A00000 /* 0089C 80A0083C 254A1374 */ addiu $t2, $t2, %lo(func_80A01374) ## $t2 = 80A01374 /* 008A0 80A00840 AE0A0190 */ sw $t2, 0x0190($s0) ## 00000190 -/* 008A4 80A00844 8FBF002C */ lw $ra, 0x002C($sp) -/* 008A8 80A00848 8FB00028 */ lw $s0, 0x0028($sp) +/* 008A4 80A00844 8FBF002C */ lw $ra, 0x002C($sp) +/* 008A8 80A00848 8FB00028 */ lw $s0, 0x0028($sp) /* 008AC 80A0084C 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 008B0 80A00850 03E00008 */ jr $ra +/* 008B0 80A00850 03E00008 */ jr $ra /* 008B4 80A00854 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 index 2b2d241d5a..4cd4bc52cd 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Elf/EnElf_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Elf/EnElf_Draw.s @@ -1,80 +1,80 @@ 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) +/* 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 +/* 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) +/* 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, 0x8016 ## $t3 = 80160000 /* 03C64 80A05894 24050020 */ addiu $a1, $zero, 0x0020 ## $a1 = 00000020 -/* 03C68 80A05898 001952C0 */ sll $t2, $t9, 11 -/* 03C6C 80A0589C 0543000C */ bgezl $t2, .L80A058D0 +/* 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, -0x0570($t3) ## 8015FA90 /* 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 +/* 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) +/* 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) + +/* 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) +/* 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 func_800C6AC4 -/* 03CC8 80A058F8 AFA50060 */ sw $a1, 0x0060($sp) -/* 03CCC 80A058FC 8FAE0084 */ lw $t6, 0x0084($sp) -/* 03CD0 80A05900 0C0252D6 */ jal func_80094B58 +/* 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 +/* 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 +/* 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 +/* 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 +/* 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 +/* 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 +/* 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 @@ -98,72 +98,72 @@ glabel EnElf_Draw /* 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 +/* 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 +/* 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 +/* 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 +/* 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 +/* 03DE0 80A05A10 15A00005 */ bne $t5, $zero, .L80A05A28 /* 03DE4 80A05A14 00000000 */ nop -/* 03DE8 80A05A18 440D5000 */ mfc1 $t5, $f10 +/* 03DE8 80A05A18 440D5000 */ mfc1 $t5, $f10 /* 03DEC 80A05A1C 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 03DF0 80A05A20 10000007 */ beq $zero, $zero, .L80A05A40 +/* 03DF0 80A05A20 10000007 */ beq $zero, $zero, .L80A05A40 /* 03DF4 80A05A24 01A16825 */ or $t5, $t5, $at ## $t5 = 80000000 .L80A05A28: -/* 03DF8 80A05A28 10000005 */ beq $zero, $zero, .L80A05A40 +/* 03DF8 80A05A28 10000005 */ beq $zero, $zero, .L80A05A40 /* 03DFC 80A05A2C 240DFFFF */ addiu $t5, $zero, 0xFFFF ## $t5 = FFFFFFFF .L80A05A30: -/* 03E00 80A05A30 440D5000 */ mfc1 $t5, $f10 +/* 03E00 80A05A30 440D5000 */ mfc1 $t5, $f10 /* 03E04 80A05A34 00000000 */ nop -/* 03E08 80A05A38 05A0FFFB */ bltz $t5, .L80A05A28 +/* 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 +/* 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 +/* 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 +/* 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 +/* 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 +/* 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 +/* 03E68 80A05A98 15400005 */ bne $t2, $zero, .L80A05AB0 /* 03E6C 80A05A9C 00000000 */ nop -/* 03E70 80A05AA0 440A9000 */ mfc1 $t2, $f18 +/* 03E70 80A05AA0 440A9000 */ mfc1 $t2, $f18 /* 03E74 80A05AA4 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 03E78 80A05AA8 10000007 */ beq $zero, $zero, .L80A05AC8 +/* 03E78 80A05AA8 10000007 */ beq $zero, $zero, .L80A05AC8 /* 03E7C 80A05AAC 01415025 */ or $t2, $t2, $at ## $t2 = 80000000 .L80A05AB0: -/* 03E80 80A05AB0 10000005 */ beq $zero, $zero, .L80A05AC8 +/* 03E80 80A05AB0 10000005 */ beq $zero, $zero, .L80A05AC8 /* 03E84 80A05AB4 240AFFFF */ addiu $t2, $zero, 0xFFFF ## $t2 = FFFFFFFF -/* 03E88 80A05AB8 440A9000 */ mfc1 $t2, $f18 +/* 03E88 80A05AB8 440A9000 */ mfc1 $t2, $f18 .L80A05ABC: /* 03E8C 80A05ABC 00000000 */ nop -/* 03E90 80A05AC0 0540FFFB */ bltz $t2, .L80A05AB0 +/* 03E90 80A05AC0 0540FFFB */ bltz $t2, .L80A05AB0 /* 03E94 80A05AC4 00000000 */ nop .L80A05AC8: /* 03E98 80A05AC8 44D9F800 */ ctc1 $t9, $31 @@ -172,45 +172,45 @@ glabel EnElf_Draw /* 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 +/* 03EB0 80A05AE0 000C6C00 */ sll $t5, $t4, 16 /* 03EB4 80A05AE4 030D7025 */ or $t6, $t8, $t5 ## $t6 = FFFFFFFF -/* 03EB8 80A05AE8 460021A4 */ cvt.w.s $f6, $f4 +/* 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 +/* 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 +/* 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 +/* 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 +/* 03EF8 80A05B28 17200005 */ bne $t9, $zero, .L80A05B40 /* 03EFC 80A05B2C 00000000 */ nop -/* 03F00 80A05B30 44193000 */ mfc1 $t9, $f6 +/* 03F00 80A05B30 44193000 */ mfc1 $t9, $f6 /* 03F04 80A05B34 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 03F08 80A05B38 10000007 */ beq $zero, $zero, .L80A05B58 +/* 03F08 80A05B38 10000007 */ beq $zero, $zero, .L80A05B58 /* 03F0C 80A05B3C 0321C825 */ or $t9, $t9, $at ## $t9 = 80000000 .L80A05B40: -/* 03F10 80A05B40 10000005 */ beq $zero, $zero, .L80A05B58 +/* 03F10 80A05B40 10000005 */ beq $zero, $zero, .L80A05B58 /* 03F14 80A05B44 2419FFFF */ addiu $t9, $zero, 0xFFFF ## $t9 = FFFFFFFF -/* 03F18 80A05B48 44193000 */ mfc1 $t9, $f6 +/* 03F18 80A05B48 44193000 */ mfc1 $t9, $f6 .L80A05B4C: /* 03F1C 80A05B4C 00000000 */ nop -/* 03F20 80A05B50 0720FFFB */ bltz $t9, .L80A05B40 +/* 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 +/* 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 @@ -218,34 +218,34 @@ glabel EnElf_Draw /* 03F50 80A05B80 444DF800 */ cfc1 $t5, $31 /* 03F54 80A05B84 44CFF800 */ ctc1 $t7, $31 /* 03F58 80A05B88 00000000 */ nop -/* 03F5C 80A05B8C 46005424 */ cvt.w.s $f16, $f10 +/* 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 +/* 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 +/* 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 +/* 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 +/* 03F98 80A05BC8 15E00005 */ bne $t7, $zero, .L80A05BE0 /* 03F9C 80A05BCC 00000000 */ nop -/* 03FA0 80A05BD0 440F8000 */ mfc1 $t7, $f16 +/* 03FA0 80A05BD0 440F8000 */ mfc1 $t7, $f16 /* 03FA4 80A05BD4 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 03FA8 80A05BD8 10000007 */ beq $zero, $zero, .L80A05BF8 +/* 03FA8 80A05BD8 10000007 */ beq $zero, $zero, .L80A05BF8 /* 03FAC 80A05BDC 01E17825 */ or $t7, $t7, $at ## $t7 = 80000000 .L80A05BE0: -/* 03FB0 80A05BE0 10000005 */ beq $zero, $zero, .L80A05BF8 +/* 03FB0 80A05BE0 10000005 */ beq $zero, $zero, .L80A05BF8 /* 03FB4 80A05BE4 240FFFFF */ addiu $t7, $zero, 0xFFFF ## $t7 = FFFFFFFF -/* 03FB8 80A05BE8 440F8000 */ mfc1 $t7, $f16 +/* 03FB8 80A05BE8 440F8000 */ mfc1 $t7, $f16 .L80A05BEC: /* 03FBC 80A05BEC 00000000 */ nop -/* 03FC0 80A05BF0 05E0FFFB */ bltz $t7, .L80A05BE0 +/* 03FC0 80A05BF0 05E0FFFB */ bltz $t7, .L80A05BE0 /* 03FC4 80A05BF4 00000000 */ nop .L80A05BF8: /* 03FC8 80A05BF8 31EA00FF */ andi $t2, $t7, 0x00FF ## $t2 = 000000FF @@ -255,7 +255,7 @@ glabel EnElf_Draw /* 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 +/* 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 @@ -264,7 +264,7 @@ glabel EnElf_Draw /* 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 +/* 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 @@ -285,71 +285,71 @@ glabel EnElf_Draw /* 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 +/* 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 +/* 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 +/* 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 +/* 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 +/* 04090 80A05CC0 15A00005 */ bne $t5, $zero, .L80A05CD8 /* 04094 80A05CC4 00000000 */ nop -/* 04098 80A05CC8 440D2000 */ mfc1 $t5, $f4 +/* 04098 80A05CC8 440D2000 */ mfc1 $t5, $f4 /* 0409C 80A05CCC 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 040A0 80A05CD0 10000007 */ beq $zero, $zero, .L80A05CF0 +/* 040A0 80A05CD0 10000007 */ beq $zero, $zero, .L80A05CF0 /* 040A4 80A05CD4 01A16825 */ or $t5, $t5, $at ## $t5 = 80000000 .L80A05CD8: -/* 040A8 80A05CD8 10000005 */ beq $zero, $zero, .L80A05CF0 +/* 040A8 80A05CD8 10000005 */ beq $zero, $zero, .L80A05CF0 /* 040AC 80A05CDC 240DFFFF */ addiu $t5, $zero, 0xFFFF ## $t5 = FFFFFFFF -/* 040B0 80A05CE0 440D2000 */ mfc1 $t5, $f4 +/* 040B0 80A05CE0 440D2000 */ mfc1 $t5, $f4 .L80A05CE4: /* 040B4 80A05CE4 00000000 */ nop -/* 040B8 80A05CE8 05A0FFFB */ bltz $t5, .L80A05CD8 +/* 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 +/* 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 +/* 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 +/* 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 +/* 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 +/* 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 +/* 04118 80A05D48 15600005 */ bne $t3, $zero, .L80A05D60 /* 0411C 80A05D4C 00000000 */ nop -/* 04120 80A05D50 440B4000 */ mfc1 $t3, $f8 +/* 04120 80A05D50 440B4000 */ mfc1 $t3, $f8 /* 04124 80A05D54 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 04128 80A05D58 10000007 */ beq $zero, $zero, .L80A05D78 +/* 04128 80A05D58 10000007 */ beq $zero, $zero, .L80A05D78 /* 0412C 80A05D5C 01615825 */ or $t3, $t3, $at ## $t3 = 80000000 .L80A05D60: -/* 04130 80A05D60 10000005 */ beq $zero, $zero, .L80A05D78 +/* 04130 80A05D60 10000005 */ beq $zero, $zero, .L80A05D78 /* 04134 80A05D64 240BFFFF */ addiu $t3, $zero, 0xFFFF ## $t3 = FFFFFFFF -/* 04138 80A05D68 440B4000 */ mfc1 $t3, $f8 +/* 04138 80A05D68 440B4000 */ mfc1 $t3, $f8 .L80A05D6C: /* 0413C 80A05D6C 00000000 */ nop -/* 04140 80A05D70 0560FFFB */ bltz $t3, .L80A05D60 +/* 04140 80A05D70 0560FFFB */ bltz $t3, .L80A05D60 /* 04144 80A05D74 00000000 */ nop .L80A05D78: /* 04148 80A05D78 44CAF800 */ ctc1 $t2, $31 @@ -358,79 +358,79 @@ glabel EnElf_Draw /* 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 +/* 04160 80A05D90 000C6C00 */ sll $t5, $t4, 16 /* 04164 80A05D94 030D7825 */ or $t7, $t8, $t5 ## $t7 = FFFFFFFF -/* 04168 80A05D98 46005424 */ cvt.w.s $f16, $f10 +/* 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 +/* 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 +/* 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 +/* 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 +/* 041A8 80A05DD8 15400005 */ bne $t2, $zero, .L80A05DF0 /* 041AC 80A05DDC 00000000 */ nop -/* 041B0 80A05DE0 440A8000 */ mfc1 $t2, $f16 +/* 041B0 80A05DE0 440A8000 */ mfc1 $t2, $f16 /* 041B4 80A05DE4 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 041B8 80A05DE8 10000007 */ beq $zero, $zero, .L80A05E08 +/* 041B8 80A05DE8 10000007 */ beq $zero, $zero, .L80A05E08 /* 041BC 80A05DEC 01415025 */ or $t2, $t2, $at ## $t2 = 80000000 .L80A05DF0: -/* 041C0 80A05DF0 10000005 */ beq $zero, $zero, .L80A05E08 +/* 041C0 80A05DF0 10000005 */ beq $zero, $zero, .L80A05E08 /* 041C4 80A05DF4 240AFFFF */ addiu $t2, $zero, 0xFFFF ## $t2 = FFFFFFFF -/* 041C8 80A05DF8 440A8000 */ mfc1 $t2, $f16 +/* 041C8 80A05DF8 440A8000 */ mfc1 $t2, $f16 .L80A05DFC: /* 041CC 80A05DFC 00000000 */ nop -/* 041D0 80A05E00 0540FFFB */ bltz $t2, .L80A05DF0 +/* 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 +/* 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 +/* 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 +/* 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 +/* 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 +/* 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 +/* 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 +/* 04244 80A05E74 17200005 */ bne $t9, $zero, .L80A05E8C /* 04248 80A05E78 00000000 */ nop -/* 0424C 80A05E7C 44194000 */ mfc1 $t9, $f8 +/* 0424C 80A05E7C 44194000 */ mfc1 $t9, $f8 /* 04250 80A05E80 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 04254 80A05E84 10000007 */ beq $zero, $zero, .L80A05EA4 +/* 04254 80A05E84 10000007 */ beq $zero, $zero, .L80A05EA4 /* 04258 80A05E88 0321C825 */ or $t9, $t9, $at ## $t9 = 80000000 .L80A05E8C: -/* 0425C 80A05E8C 10000005 */ beq $zero, $zero, .L80A05EA4 +/* 0425C 80A05E8C 10000005 */ beq $zero, $zero, .L80A05EA4 /* 04260 80A05E90 2419FFFF */ addiu $t9, $zero, 0xFFFF ## $t9 = FFFFFFFF -/* 04264 80A05E94 44194000 */ mfc1 $t9, $f8 +/* 04264 80A05E94 44194000 */ mfc1 $t9, $f8 .L80A05E98: /* 04268 80A05E98 00000000 */ nop -/* 0426C 80A05E9C 0720FFFB */ bltz $t9, .L80A05E8C +/* 0426C 80A05E9C 0720FFFB */ bltz $t9, .L80A05E8C /* 04270 80A05EA0 00000000 */ nop .L80A05EA4: /* 04274 80A05EA4 332B00FF */ andi $t3, $t9, 0x00FF ## $t3 = 000000FF @@ -438,29 +438,29 @@ glabel EnElf_Draw /* 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) +/* 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 func_800A2288 -/* 042A4 80A05ED4 AFAF0018 */ sw $t7, 0x0018($sp) -/* 042A8 80A05ED8 8FA90060 */ lw $t1, 0x0060($sp) +/* 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) +/* 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 func_800C6B54 +/* 042C4 80A05EF4 0C031AD5 */ jal Graph_CloseDisps /* 042C8 80A05EF8 8D850000 */ lw $a1, 0x0000($t4) ## 00000000 .L80A05EFC: -/* 042CC 80A05EFC 8FBF002C */ lw $ra, 0x002C($sp) +/* 042CC 80A05EFC 8FBF002C */ lw $ra, 0x002C($sp) .L80A05F00: -/* 042D0 80A05F00 8FB00028 */ lw $s0, 0x0028($sp) +/* 042D0 80A05F00 8FB00028 */ lw $s0, 0x0028($sp) /* 042D4 80A05F04 27BD0080 */ addiu $sp, $sp, 0x0080 ## $sp = 00000000 -/* 042D8 80A05F08 03E00008 */ jr $ra +/* 042D8 80A05F08 03E00008 */ jr $ra /* 042DC 80A05F0C 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 index 3ff5a00dfc..98cad4d3c3 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A05040.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A05040.s @@ -25,7 +25,7 @@ glabel func_80A05040 /* 0346C 80A0509C 10000016 */ beq $zero, $zero, .L80A050F8 /* 03470 80A050A0 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 .L80A050A4: -/* 03474 80A050A4 0C01B0AC */ jal func_8006C2B0 +/* 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 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 index 43fb335086..9be1706cce 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A05188.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A05188.s @@ -14,7 +14,7 @@ glabel func_80A05188 /* 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 func_8006C2B0 +/* 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 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 index 3591cf30b6..71cbb064cd 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A05208.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A05208.s @@ -25,7 +25,7 @@ glabel func_80A05208 /* 03634 80A05264 1000001C */ beq $zero, $zero, .L80A052D8 /* 03638 80A05268 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 .L80A0526C: -/* 0363C 80A0526C 0C01B0C6 */ jal func_8006C318 +/* 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 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 index 79339d9553..35c9df9098 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A053F0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Elf/func_80A053F0.s @@ -26,7 +26,7 @@ glabel func_80A053F0 /* 0381C 80A0544C 51000012 */ beql $t0, $zero, .L80A05498 /* 03820 80A05450 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 .L80A05454: -/* 03824 80A05454 0C01B0C6 */ jal func_8006C318 +/* 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 @@ -60,7 +60,7 @@ glabel func_80A053F0 /* 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 func_8006C318 +/* 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 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Encount2/func_80A07A4C.s b/asm/non_matchings/overlays/actors/ovl_En_Encount2/func_80A07A4C.s index feb6cc0c99..6ccf4c161b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Encount2/func_80A07A4C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Encount2/func_80A07A4C.s @@ -113,21 +113,21 @@ glabel func_80A07A4C /* 0025C 80A07BEC 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 /* 00260 80A07BF0 000E7880 */ sll $t7, $t6, 2 /* 00264 80A07BF4 00CFC021 */ addu $t8, $a2, $t7 -/* 00268 80A07BF8 0C024BE2 */ jal func_80092F88 +/* 00268 80A07BF8 0C024BE2 */ jal Quake_Add /* 0026C 80A07BFC 8F040790 */ lw $a0, 0x0790($t8) ## 00000790 /* 00270 80A07C00 00022400 */ sll $a0, $v0, 16 /* 00274 80A07C04 A7A2002A */ sh $v0, 0x002A($sp) /* 00278 80A07C08 00042403 */ sra $a0, $a0, 16 -/* 0027C 80A07C0C 0C024B6B */ jal func_80092DAC +/* 0027C 80A07C0C 0C024B6B */ jal Quake_SetSpeed /* 00280 80A07C10 24057FFF */ addiu $a1, $zero, 0x7FFF ## $a1 = 00007FFF /* 00284 80A07C14 87A4002A */ lh $a0, 0x002A($sp) /* 00288 80A07C18 24050032 */ addiu $a1, $zero, 0x0032 ## $a1 = 00000032 /* 0028C 80A07C1C 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 /* 00290 80A07C20 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 00294 80A07C24 0C024B9C */ jal func_80092E70 +/* 00294 80A07C24 0C024B9C */ jal Quake_SetQuakeValues /* 00298 80A07C28 AFA00010 */ sw $zero, 0x0010($sp) /* 0029C 80A07C2C 87A4002A */ lh $a0, 0x002A($sp) -/* 002A0 80A07C30 0C024B7C */ jal func_80092DF0 +/* 002A0 80A07C30 0C024B7C */ jal Quake_SetCountdown /* 002A4 80A07C34 2405012C */ addiu $a1, $zero, 0x012C ## $a1 = 0000012C /* 002A8 80A07C38 24080000 */ addiu $t0, $zero, 0x0000 ## $t0 = 00000000 /* 002AC 80A07C3C 24090001 */ addiu $t1, $zero, 0x0001 ## $t1 = 00000001 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Encount2/func_80A0891C.s b/asm/non_matchings/overlays/actors/ovl_En_Encount2/func_80A0891C.s index 3d68b2c61b..b25c4089b4 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Encount2/func_80A0891C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Encount2/func_80A0891C.s @@ -18,7 +18,7 @@ glabel func_80A0891C /* 00FCC 80A0895C 24C68D10 */ addiu $a2, $a2, %lo(D_80A08D10) ## $a2 = 80A08D10 /* 00FD0 80A08960 27A40068 */ addiu $a0, $sp, 0x0068 ## $a0 = FFFFFFD8 /* 00FD4 80A08964 24070282 */ addiu $a3, $zero, 0x0282 ## $a3 = 00000282 -/* 00FD8 80A08968 0C031AB1 */ jal func_800C6AC4 +/* 00FD8 80A08968 0C031AB1 */ jal Graph_OpenDisps /* 00FDC 80A0896C 02402825 */ or $a1, $s2, $zero ## $a1 = 00000000 /* 00FE0 80A08970 8FA40094 */ lw $a0, 0x0094($sp) /* 00FE4 80A08974 3C010001 */ lui $at, 0x0001 ## $at = 00010000 @@ -129,7 +129,7 @@ glabel func_80A0891C /* 01178 80A08B08 24C68D38 */ addiu $a2, $a2, %lo(D_80A08D38) ## $a2 = 80A08D38 /* 0117C 80A08B0C 27A40068 */ addiu $a0, $sp, 0x0068 ## $a0 = FFFFFFD8 /* 01180 80A08B10 02402825 */ or $a1, $s2, $zero ## $a1 = 00000000 -/* 01184 80A08B14 0C031AD5 */ jal func_800C6B54 +/* 01184 80A08B14 0C031AD5 */ jal Graph_CloseDisps /* 01188 80A08B18 240702A6 */ addiu $a3, $zero, 0x02A6 ## $a3 = 000002A6 /* 0118C 80A08B1C 8FBF0044 */ lw $ra, 0x0044($sp) /* 01190 80A08B20 D7B40018 */ ldc1 $f20, 0x0018($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ex_Item/func_80A09C40.s b/asm/non_matchings/overlays/actors/ovl_En_Ex_Item/func_80A09C40.s index 81638479bb..1903379dd5 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ex_Item/func_80A09C40.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ex_Item/func_80A09C40.s @@ -10,7 +10,7 @@ glabel func_80A09C40 /* 00DC0 80A09C60 24C6A048 */ addiu $a2, $a2, %lo(D_80A0A048) ## $a2 = 80A0A048 /* 00DC4 80A09C64 27A40034 */ addiu $a0, $sp, 0x0034 ## $a0 = FFFFFFEC /* 00DC8 80A09C68 24070370 */ addiu $a3, $zero, 0x0370 ## $a3 = 00000370 -/* 00DCC 80A09C6C 0C031AB1 */ jal func_800C6AC4 +/* 00DCC 80A09C6C 0C031AB1 */ jal Graph_OpenDisps /* 00DD0 80A09C70 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 /* 00DD4 80A09C74 8FAF004C */ lw $t7, 0x004C($sp) /* 00DD8 80A09C78 0C025183 */ jal func_8009460C @@ -67,7 +67,7 @@ glabel func_80A09C40 /* 00EA4 80A09D44 24C6A070 */ addiu $a2, $a2, %lo(D_80A0A070) ## $a2 = 80A0A070 /* 00EA8 80A09D48 27A40034 */ addiu $a0, $sp, 0x0034 ## $a0 = FFFFFFEC /* 00EAC 80A09D4C 2407037D */ addiu $a3, $zero, 0x037D ## $a3 = 0000037D -/* 00EB0 80A09D50 0C031AD5 */ jal func_800C6B54 +/* 00EB0 80A09D50 0C031AD5 */ jal Graph_CloseDisps /* 00EB4 80A09D54 8DC50000 */ lw $a1, 0x0000($t6) ## 00000000 /* 00EB8 80A09D58 8FBF001C */ lw $ra, 0x001C($sp) /* 00EBC 80A09D5C 8FB00018 */ lw $s0, 0x0018($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ex_Ruppy/EnExRuppy_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Ex_Ruppy/EnExRuppy_Draw.s index b5ed3756f2..a2265aab60 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ex_Ruppy/EnExRuppy_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ex_Ruppy/EnExRuppy_Draw.s @@ -12,7 +12,7 @@ glabel EnExRuppy_Draw /* 00DF4 80A0B204 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 /* 00DF8 80A0B208 24C6B4D0 */ addiu $a2, $a2, %lo(D_80A0B4D0) ## $a2 = 80A0B4D0 /* 00DFC 80A0B20C 24070306 */ addiu $a3, $zero, 0x0306 ## $a3 = 00000306 -/* 00E00 80A0B210 0C031AB1 */ jal func_800C6AC4 +/* 00E00 80A0B210 0C031AB1 */ jal Graph_OpenDisps /* 00E04 80A0B214 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 /* 00E08 80A0B218 0C024F46 */ jal func_80093D18 /* 00E0C 80A0B21C 8E240000 */ lw $a0, 0x0000($s1) ## 00000000 @@ -71,7 +71,7 @@ glabel EnExRuppy_Draw /* 00EE0 80A0B2F0 AC4C0004 */ sw $t4, 0x0004($v0) ## 00000004 /* 00EE4 80A0B2F4 AC4B0000 */ sw $t3, 0x0000($v0) ## 00000000 /* 00EE8 80A0B2F8 8E250000 */ lw $a1, 0x0000($s1) ## 00000000 -/* 00EEC 80A0B2FC 0C031AD5 */ jal func_800C6B54 +/* 00EEC 80A0B2FC 0C031AD5 */ jal Graph_CloseDisps /* 00EF0 80A0B300 24070310 */ addiu $a3, $zero, 0x0310 ## $a3 = 00000310 .L80A0B304: /* 00EF4 80A0B304 8FBF001C */ lw $ra, 0x001C($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fd/EnFd_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Fd/EnFd_Draw.s index 42e30d077f..fb3a2fa162 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Fd/EnFd_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Fd/EnFd_Draw.s @@ -1,10 +1,10 @@ glabel EnFd_Draw /* 0195C 80A0D01C 27BDFF60 */ addiu $sp, $sp, 0xFF60 ## $sp = FFFFFF60 /* 01960 80A0D020 3C0F80A1 */ lui $t7, %hi(D_80A0E0D0) ## $t7 = 80A10000 -/* 01964 80A0D024 AFBF003C */ sw $ra, 0x003C($sp) -/* 01968 80A0D028 AFB10038 */ sw $s1, 0x0038($sp) -/* 0196C 80A0D02C AFB00034 */ sw $s0, 0x0034($sp) -/* 01970 80A0D030 AFA500A4 */ sw $a1, 0x00A4($sp) +/* 01964 80A0D024 AFBF003C */ sw $ra, 0x003C($sp) +/* 01968 80A0D028 AFB10038 */ sw $s1, 0x0038($sp) +/* 0196C 80A0D02C AFB00034 */ sw $s0, 0x0034($sp) +/* 01970 80A0D030 AFA500A4 */ sw $a1, 0x00A4($sp) /* 01974 80A0D034 25EFE0D0 */ addiu $t7, $t7, %lo(D_80A0E0D0) ## $t7 = 80A0E0D0 /* 01978 80A0D038 8DF90000 */ lw $t9, 0x0000($t7) ## 80A0E0D0 /* 0197C 80A0D03C 27AE008C */ addiu $t6, $sp, 0x008C ## $t6 = FFFFFFEC @@ -23,53 +23,53 @@ glabel EnFd_Draw /* 019B0 80A0D070 AD0A0004 */ sw $t2, 0x0004($t0) ## FFFFFFE4 /* 019B4 80A0D074 00808825 */ or $s1, $a0, $zero ## $s1 = 00000000 /* 019B8 80A0D078 AD0B0008 */ sw $t3, 0x0008($t0) ## FFFFFFE8 -/* 019BC 80A0D07C 8FAC00A4 */ lw $t4, 0x00A4($sp) +/* 019BC 80A0D07C 8FAC00A4 */ lw $t4, 0x00A4($sp) /* 019C0 80A0D080 3C0680A1 */ lui $a2, %hi(D_80A0E120) ## $a2 = 80A10000 /* 019C4 80A0D084 24C6E120 */ addiu $a2, $a2, %lo(D_80A0E120) ## $a2 = 80A0E120 /* 019C8 80A0D088 8D8D009C */ lw $t5, 0x009C($t4) ## 0000009C /* 019CC 80A0D08C 27A40064 */ addiu $a0, $sp, 0x0064 ## $a0 = FFFFFFC4 /* 019D0 80A0D090 240706D7 */ addiu $a3, $zero, 0x06D7 ## $a3 = 000006D7 -/* 019D4 80A0D094 AFAD007C */ sw $t5, 0x007C($sp) +/* 019D4 80A0D094 AFAD007C */ sw $t5, 0x007C($sp) /* 019D8 80A0D098 8D850000 */ lw $a1, 0x0000($t4) ## 00000000 -/* 019DC 80A0D09C 0C031AB1 */ jal func_800C6AC4 +/* 019DC 80A0D09C 0C031AB1 */ jal Graph_OpenDisps /* 019E0 80A0D0A0 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 -/* 019E4 80A0D0A4 0C034213 */ jal Matrix_Push +/* 019E4 80A0D0A4 0C034213 */ jal Matrix_Push /* 019E8 80A0D0A8 00000000 */ nop /* 019EC 80A0D0AC 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 019F0 80A0D0B0 0C2836D1 */ jal func_80A0DB44 -/* 019F4 80A0D0B4 8FA500A4 */ lw $a1, 0x00A4($sp) +/* 019F0 80A0D0B0 0C2836D1 */ jal func_80A0DB44 +/* 019F4 80A0D0B4 8FA500A4 */ lw $a1, 0x00A4($sp) /* 019F8 80A0D0B8 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 019FC 80A0D0BC 0C2835CC */ jal func_80A0D730 -/* 01A00 80A0D0C0 8FA500A4 */ lw $a1, 0x00A4($sp) -/* 01A04 80A0D0C4 0C034221 */ jal Matrix_Pull +/* 019FC 80A0D0BC 0C2835CC */ jal func_80A0D730 +/* 01A00 80A0D0C0 8FA500A4 */ lw $a1, 0x00A4($sp) +/* 01A04 80A0D0C4 0C034221 */ jal Matrix_Pull /* 01A08 80A0D0C8 00000000 */ nop /* 01A0C 80A0D0CC 8E2F0190 */ lw $t7, 0x0190($s1) ## 00000190 /* 01A10 80A0D0D0 3C0E80A1 */ lui $t6, %hi(func_80A0C310) ## $t6 = 80A10000 /* 01A14 80A0D0D4 25CEC310 */ addiu $t6, $t6, %lo(func_80A0C310) ## $t6 = 80A0C310 -/* 01A18 80A0D0D8 11CF00C0 */ beq $t6, $t7, .L80A0D3DC +/* 01A18 80A0D0D8 11CF00C0 */ beq $t6, $t7, .L80A0D3DC /* 01A1C 80A0D0DC 3C0180A1 */ lui $at, %hi(D_80A0E1D8) ## $at = 80A10000 /* 01A20 80A0D0E0 C62404CC */ lwc1 $f4, 0x04CC($s1) ## 000004CC -/* 01A24 80A0D0E4 C426E1D8 */ lwc1 $f6, %lo(D_80A0E1D8)($at) -/* 01A28 80A0D0E8 8FB800A4 */ lw $t8, 0x00A4($sp) -/* 01A2C 80A0D0EC 4606203C */ c.lt.s $f4, $f6 +/* 01A24 80A0D0E4 C426E1D8 */ lwc1 $f6, %lo(D_80A0E1D8)($at) +/* 01A28 80A0D0E8 8FB800A4 */ lw $t8, 0x00A4($sp) +/* 01A2C 80A0D0EC 4606203C */ c.lt.s $f4, $f6 /* 01A30 80A0D0F0 00000000 */ nop -/* 01A34 80A0D0F4 450300BA */ bc1tl .L80A0D3E0 -/* 01A38 80A0D0F8 8FA800A4 */ lw $t0, 0x00A4($sp) -/* 01A3C 80A0D0FC 0C024F61 */ jal func_80093D84 +/* 01A34 80A0D0F4 450300BA */ bc1tl .L80A0D3E0 +/* 01A38 80A0D0F8 8FA800A4 */ lw $t0, 0x00A4($sp) +/* 01A3C 80A0D0FC 0C024F61 */ jal func_80093D84 /* 01A40 80A0D100 8F040000 */ lw $a0, 0x0000($t8) ## 00000000 /* 01A44 80A0D104 922200AF */ lbu $v0, 0x00AF($s1) ## 000000AF /* 01A48 80A0D108 3C08FA00 */ lui $t0, 0xFA00 ## $t0 = FA000000 /* 01A4C 80A0D10C 35080080 */ ori $t0, $t0, 0x0080 ## $t0 = FA000080 /* 01A50 80A0D110 2442FFFF */ addiu $v0, $v0, 0xFFFF ## $v0 = FFFFFFFF -/* 01A54 80A0D114 04410003 */ bgez $v0, .L80A0D124 +/* 01A54 80A0D114 04410003 */ bgez $v0, .L80A0D124 /* 01A58 80A0D118 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 01A5C 80A0D11C 10000007 */ beq $zero, $zero, .L80A0D13C +/* 01A5C 80A0D11C 10000007 */ beq $zero, $zero, .L80A0D13C /* 01A60 80A0D120 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 .L80A0D124: -/* 01A64 80A0D124 28410018 */ slti $at, $v0, 0x0018 -/* 01A68 80A0D128 14200003 */ bne $at, $zero, .L80A0D138 +/* 01A64 80A0D124 28410018 */ slti $at, $v0, 0x0018 +/* 01A68 80A0D128 14200003 */ bne $at, $zero, .L80A0D138 /* 01A6C 80A0D12C 00401825 */ or $v1, $v0, $zero ## $v1 = FFFFFFFF -/* 01A70 80A0D130 10000001 */ beq $zero, $zero, .L80A0D138 +/* 01A70 80A0D130 10000001 */ beq $zero, $zero, .L80A0D138 /* 01A74 80A0D134 24030017 */ addiu $v1, $zero, 0x0017 ## $v1 = 00000017 .L80A0D138: /* 01A78 80A0D138 00602825 */ or $a1, $v1, $zero ## $a1 = 00000017 @@ -82,53 +82,53 @@ glabel EnFd_Draw /* 01A90 80A0D150 AC480000 */ sw $t0, 0x0000($v0) ## FFFFFFFF /* 01A94 80A0D154 C62804CC */ lwc1 $f8, 0x04CC($s1) ## 000004CC /* 01A98 80A0D158 00402025 */ or $a0, $v0, $zero ## $a0 = FFFFFFFF -/* 01A9C 80A0D15C 04A10003 */ bgez $a1, .L80A0D16C -/* 01AA0 80A0D160 000530C3 */ sra $a2, $a1, 3 +/* 01A9C 80A0D15C 04A10003 */ bgez $a1, .L80A0D16C +/* 01AA0 80A0D160 000530C3 */ sra $a2, $a1, 3 /* 01AA4 80A0D164 24A10007 */ addiu $at, $a1, 0x0007 ## $at = 0000001E -/* 01AA8 80A0D168 000130C3 */ sra $a2, $at, 3 +/* 01AA8 80A0D168 000130C3 */ sra $a2, $at, 3 .L80A0D16C: -/* 01AAC 80A0D16C 00063080 */ sll $a2, $a2, 2 -/* 01AB0 80A0D170 00C91821 */ addu $v1, $a2, $t1 +/* 01AAC 80A0D16C 00063080 */ sll $a2, $a2, 2 +/* 01AB0 80A0D170 00C91821 */ addu $v1, $a2, $t1 /* 01AB4 80A0D174 906B0002 */ lbu $t3, 0x0002($v1) ## 00000019 /* 01AB8 80A0D178 906E0000 */ lbu $t6, 0x0000($v1) ## 00000017 /* 01ABC 80A0D17C 90680001 */ lbu $t0, 0x0001($v1) ## 00000018 -/* 01AC0 80A0D180 000B6A00 */ sll $t5, $t3, 8 +/* 01AC0 80A0D180 000B6A00 */ sll $t5, $t3, 8 /* 01AC4 80A0D184 444BF800 */ cfc1 $t3, $31 /* 01AC8 80A0D188 44CCF800 */ ctc1 $t4, $31 -/* 01ACC 80A0D18C 000E7E00 */ sll $t7, $t6, 24 +/* 01ACC 80A0D18C 000E7E00 */ sll $t7, $t6, 24 /* 01AD0 80A0D190 01AFC025 */ or $t8, $t5, $t7 ## $t8 = 00000000 -/* 01AD4 80A0D194 460042A4 */ cvt.w.s $f10, $f8 -/* 01AD8 80A0D198 00084C00 */ sll $t1, $t0, 16 +/* 01AD4 80A0D194 460042A4 */ cvt.w.s $f10, $f8 +/* 01AD8 80A0D198 00084C00 */ sll $t1, $t0, 16 /* 01ADC 80A0D19C 03095025 */ or $t2, $t8, $t1 ## $t2 = FFFFFFEC /* 01AE0 80A0D1A0 3C014F00 */ lui $at, 0x4F00 ## $at = 4F000000 /* 01AE4 80A0D1A4 444CF800 */ cfc1 $t4, $31 /* 01AE8 80A0D1A8 27B80080 */ addiu $t8, $sp, 0x0080 ## $t8 = FFFFFFE0 /* 01AEC 80A0D1AC 3C08FB00 */ lui $t0, 0xFB00 ## $t0 = FB000000 /* 01AF0 80A0D1B0 318C0078 */ andi $t4, $t4, 0x0078 ## $t4 = 00000000 -/* 01AF4 80A0D1B4 11800012 */ beq $t4, $zero, .L80A0D200 +/* 01AF4 80A0D1B4 11800012 */ beq $t4, $zero, .L80A0D200 /* 01AF8 80A0D1B8 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 01AFC 80A0D1BC 44815000 */ mtc1 $at, $f10 ## $f10 = 2147483648.00 /* 01B00 80A0D1C0 240C0001 */ addiu $t4, $zero, 0x0001 ## $t4 = 00000001 -/* 01B04 80A0D1C4 460A4281 */ sub.s $f10, $f8, $f10 +/* 01B04 80A0D1C4 460A4281 */ sub.s $f10, $f8, $f10 /* 01B08 80A0D1C8 44CCF800 */ ctc1 $t4, $31 /* 01B0C 80A0D1CC 00000000 */ nop -/* 01B10 80A0D1D0 460052A4 */ cvt.w.s $f10, $f10 +/* 01B10 80A0D1D0 460052A4 */ cvt.w.s $f10, $f10 /* 01B14 80A0D1D4 444CF800 */ cfc1 $t4, $31 /* 01B18 80A0D1D8 00000000 */ nop /* 01B1C 80A0D1DC 318C0078 */ andi $t4, $t4, 0x0078 ## $t4 = 00000000 -/* 01B20 80A0D1E0 15800005 */ bne $t4, $zero, .L80A0D1F8 +/* 01B20 80A0D1E0 15800005 */ bne $t4, $zero, .L80A0D1F8 /* 01B24 80A0D1E4 00000000 */ nop -/* 01B28 80A0D1E8 440C5000 */ mfc1 $t4, $f10 +/* 01B28 80A0D1E8 440C5000 */ mfc1 $t4, $f10 /* 01B2C 80A0D1EC 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 01B30 80A0D1F0 10000007 */ beq $zero, $zero, .L80A0D210 +/* 01B30 80A0D1F0 10000007 */ beq $zero, $zero, .L80A0D210 /* 01B34 80A0D1F4 01816025 */ or $t4, $t4, $at ## $t4 = 80000000 .L80A0D1F8: -/* 01B38 80A0D1F8 10000005 */ beq $zero, $zero, .L80A0D210 +/* 01B38 80A0D1F8 10000005 */ beq $zero, $zero, .L80A0D210 /* 01B3C 80A0D1FC 240CFFFF */ addiu $t4, $zero, 0xFFFF ## $t4 = FFFFFFFF .L80A0D200: -/* 01B40 80A0D200 440C5000 */ mfc1 $t4, $f10 +/* 01B40 80A0D200 440C5000 */ mfc1 $t4, $f10 /* 01B44 80A0D204 00000000 */ nop -/* 01B48 80A0D208 0580FFFB */ bltz $t4, .L80A0D1F8 +/* 01B48 80A0D208 0580FFFB */ bltz $t4, .L80A0D1F8 /* 01B4C 80A0D20C 00000000 */ nop .L80A0D210: /* 01B50 80A0D210 01807025 */ or $t6, $t4, $zero ## $t6 = FFFFFFFF @@ -137,51 +137,51 @@ glabel EnFd_Draw /* 01B5C 80A0D21C AC8F0004 */ sw $t7, 0x0004($a0) ## 00000003 /* 01B60 80A0D220 8E0402D0 */ lw $a0, 0x02D0($s0) ## 000002D0 /* 01B64 80A0D224 44CBF800 */ ctc1 $t3, $31 -/* 01B68 80A0D228 00D81821 */ addu $v1, $a2, $t8 +/* 01B68 80A0D228 00D81821 */ addu $v1, $a2, $t8 /* 01B6C 80A0D22C 24990008 */ addiu $t9, $a0, 0x0008 ## $t9 = 00000007 /* 01B70 80A0D230 AE1902D0 */ sw $t9, 0x02D0($s0) ## 000002D0 /* 01B74 80A0D234 AC880000 */ sw $t0, 0x0000($a0) ## FFFFFFFF /* 01B78 80A0D238 906B0002 */ lbu $t3, 0x0002($v1) ## 00000019 /* 01B7C 80A0D23C 240E0001 */ addiu $t6, $zero, 0x0001 ## $t6 = 00000001 /* 01B80 80A0D240 C63004CC */ lwc1 $f16, 0x04CC($s1) ## 000004CC -/* 01B84 80A0D244 000B6200 */ sll $t4, $t3, 8 +/* 01B84 80A0D244 000B6200 */ sll $t4, $t3, 8 /* 01B88 80A0D248 444BF800 */ cfc1 $t3, $31 /* 01B8C 80A0D24C 44CEF800 */ ctc1 $t6, $31 /* 01B90 80A0D250 90680001 */ lbu $t0, 0x0001($v1) ## 00000018 /* 01B94 80A0D254 906A0000 */ lbu $t2, 0x0000($v1) ## 00000017 -/* 01B98 80A0D258 460084A4 */ cvt.w.s $f18, $f16 -/* 01B9C 80A0D25C 0008C400 */ sll $t8, $t0, 16 -/* 01BA0 80A0D260 000A6E00 */ sll $t5, $t2, 24 +/* 01B98 80A0D258 460084A4 */ cvt.w.s $f18, $f16 +/* 01B9C 80A0D25C 0008C400 */ sll $t8, $t0, 16 +/* 01BA0 80A0D260 000A6E00 */ sll $t5, $t2, 24 /* 01BA4 80A0D264 018D7825 */ or $t7, $t4, $t5 ## $t7 = FFFFFFFF /* 01BA8 80A0D268 444EF800 */ cfc1 $t6, $31 /* 01BAC 80A0D26C 3C08DB06 */ lui $t0, 0xDB06 ## $t0 = DB060000 /* 01BB0 80A0D270 01F84825 */ or $t1, $t7, $t8 ## $t1 = FFFFFFFF /* 01BB4 80A0D274 31CE0078 */ andi $t6, $t6, 0x0078 ## $t6 = 00000000 -/* 01BB8 80A0D278 11C00013 */ beq $t6, $zero, .L80A0D2C8 +/* 01BB8 80A0D278 11C00013 */ beq $t6, $zero, .L80A0D2C8 /* 01BBC 80A0D27C 35080020 */ ori $t0, $t0, 0x0020 ## $t0 = DB060020 /* 01BC0 80A0D280 3C014F00 */ lui $at, 0x4F00 ## $at = 4F000000 /* 01BC4 80A0D284 44819000 */ mtc1 $at, $f18 ## $f18 = 2147483648.00 /* 01BC8 80A0D288 240E0001 */ addiu $t6, $zero, 0x0001 ## $t6 = 00000001 -/* 01BCC 80A0D28C 46128481 */ sub.s $f18, $f16, $f18 +/* 01BCC 80A0D28C 46128481 */ sub.s $f18, $f16, $f18 /* 01BD0 80A0D290 44CEF800 */ ctc1 $t6, $31 /* 01BD4 80A0D294 00000000 */ nop -/* 01BD8 80A0D298 460094A4 */ cvt.w.s $f18, $f18 +/* 01BD8 80A0D298 460094A4 */ cvt.w.s $f18, $f18 /* 01BDC 80A0D29C 444EF800 */ cfc1 $t6, $31 /* 01BE0 80A0D2A0 00000000 */ nop /* 01BE4 80A0D2A4 31CE0078 */ andi $t6, $t6, 0x0078 ## $t6 = 00000000 -/* 01BE8 80A0D2A8 15C00005 */ bne $t6, $zero, .L80A0D2C0 +/* 01BE8 80A0D2A8 15C00005 */ bne $t6, $zero, .L80A0D2C0 /* 01BEC 80A0D2AC 00000000 */ nop -/* 01BF0 80A0D2B0 440E9000 */ mfc1 $t6, $f18 +/* 01BF0 80A0D2B0 440E9000 */ mfc1 $t6, $f18 /* 01BF4 80A0D2B4 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 01BF8 80A0D2B8 10000007 */ beq $zero, $zero, .L80A0D2D8 +/* 01BF8 80A0D2B8 10000007 */ beq $zero, $zero, .L80A0D2D8 /* 01BFC 80A0D2BC 01C17025 */ or $t6, $t6, $at ## $t6 = 80000000 .L80A0D2C0: -/* 01C00 80A0D2C0 10000005 */ beq $zero, $zero, .L80A0D2D8 +/* 01C00 80A0D2C0 10000005 */ beq $zero, $zero, .L80A0D2D8 /* 01C04 80A0D2C4 240EFFFF */ addiu $t6, $zero, 0xFFFF ## $t6 = FFFFFFFF .L80A0D2C8: -/* 01C08 80A0D2C8 440E9000 */ mfc1 $t6, $f18 +/* 01C08 80A0D2C8 440E9000 */ mfc1 $t6, $f18 /* 01C0C 80A0D2CC 00000000 */ nop -/* 01C10 80A0D2D0 05C0FFFB */ bltz $t6, .L80A0D2C0 +/* 01C10 80A0D2D0 05C0FFFB */ bltz $t6, .L80A0D2C0 /* 01C14 80A0D2D4 00000000 */ nop .L80A0D2D8: /* 01C18 80A0D2D8 01C05025 */ or $t2, $t6, $zero ## $t2 = FFFFFFFF @@ -194,30 +194,30 @@ glabel EnFd_Draw /* 01C34 80A0D2F4 24590008 */ addiu $t9, $v0, 0x0008 ## $t9 = 00000007 /* 01C38 80A0D2F8 AE1902D0 */ sw $t9, 0x02D0($s0) ## 000002D0 /* 01C3C 80A0D2FC AC480000 */ sw $t0, 0x0000($v0) ## FFFFFFFF -/* 01C40 80A0D300 8FAF00A4 */ lw $t7, 0x00A4($sp) -/* 01C44 80A0D304 8FAA007C */ lw $t2, 0x007C($sp) +/* 01C40 80A0D300 8FAF00A4 */ lw $t7, 0x00A4($sp) +/* 01C44 80A0D304 8FAA007C */ lw $t2, 0x007C($sp) /* 01C48 80A0D308 24080008 */ addiu $t0, $zero, 0x0008 ## $t0 = 00000008 /* 01C4C 80A0D30C 8DE40000 */ lw $a0, 0x0000($t7) ## FFFFFFFF -/* 01C50 80A0D310 000A4880 */ sll $t1, $t2, 2 -/* 01C54 80A0D314 012A4823 */ subu $t1, $t1, $t2 -/* 01C58 80A0D318 00094840 */ sll $t1, $t1, 1 +/* 01C50 80A0D310 000A4880 */ sll $t1, $t2, 2 +/* 01C54 80A0D314 012A4823 */ subu $t1, $t1, $t2 +/* 01C58 80A0D318 00094840 */ sll $t1, $t1, 1 /* 01C5C 80A0D31C 312C00FF */ andi $t4, $t1, 0x00FF ## $t4 = 000000FF -/* 01C60 80A0D320 01ACC823 */ subu $t9, $t5, $t4 +/* 01C60 80A0D320 01ACC823 */ subu $t9, $t5, $t4 /* 01C64 80A0D324 240F0040 */ addiu $t7, $zero, 0x0040 ## $t7 = 00000040 /* 01C68 80A0D328 240B0040 */ addiu $t3, $zero, 0x0040 ## $t3 = 00000040 /* 01C6C 80A0D32C 240E0001 */ addiu $t6, $zero, 0x0001 ## $t6 = 00000001 /* 01C70 80A0D330 24180020 */ addiu $t8, $zero, 0x0020 ## $t8 = 00000020 -/* 01C74 80A0D334 AFB80010 */ sw $t8, 0x0010($sp) -/* 01C78 80A0D338 AFAE0018 */ sw $t6, 0x0018($sp) -/* 01C7C 80A0D33C AFAB0014 */ sw $t3, 0x0014($sp) -/* 01C80 80A0D340 AFAF0028 */ sw $t7, 0x0028($sp) -/* 01C84 80A0D344 AFB90020 */ sw $t9, 0x0020($sp) -/* 01C88 80A0D348 AFA80024 */ sw $t0, 0x0024($sp) -/* 01C8C 80A0D34C AFA0001C */ sw $zero, 0x001C($sp) +/* 01C74 80A0D334 AFB80010 */ sw $t8, 0x0010($sp) +/* 01C78 80A0D338 AFAE0018 */ sw $t6, 0x0018($sp) +/* 01C7C 80A0D33C AFAB0014 */ sw $t3, 0x0014($sp) +/* 01C80 80A0D340 AFAF0028 */ sw $t7, 0x0028($sp) +/* 01C84 80A0D344 AFB90020 */ sw $t9, 0x0020($sp) +/* 01C88 80A0D348 AFA80024 */ sw $t0, 0x0024($sp) +/* 01C8C 80A0D34C AFA0001C */ sw $zero, 0x001C($sp) /* 01C90 80A0D350 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 01C94 80A0D354 0C0253D0 */ jal Draw_TwoTexScroll -/* 01C98 80A0D358 AFA20058 */ sw $v0, 0x0058($sp) -/* 01C9C 80A0D35C 8FA30058 */ lw $v1, 0x0058($sp) +/* 01C94 80A0D354 0C0253D0 */ jal Gfx_TwoTexScroll +/* 01C98 80A0D358 AFA20058 */ sw $v0, 0x0058($sp) +/* 01C9C 80A0D35C 8FA30058 */ lw $v1, 0x0058($sp) /* 01CA0 80A0D360 3C0BE700 */ lui $t3, 0xE700 ## $t3 = E7000000 /* 01CA4 80A0D364 3C0ADB06 */ lui $t2, 0xDB06 ## $t2 = DB060000 /* 01CA8 80A0D368 AC620004 */ sw $v0, 0x0004($v1) ## 00000004 @@ -241,27 +241,27 @@ glabel EnFd_Draw /* 01CF0 80A0D3B0 3C0C80A1 */ lui $t4, %hi(func_80A0CCF0) ## $t4 = 80A10000 /* 01CF4 80A0D3B4 258CCCF0 */ addiu $t4, $t4, %lo(func_80A0CCF0) ## $t4 = 80A0CCF0 /* 01CF8 80A0D3B8 25ADCCB8 */ addiu $t5, $t5, %lo(func_80A0CCB8) ## $t5 = 80A0CCB8 -/* 01CFC 80A0D3BC AFAD0010 */ sw $t5, 0x0010($sp) -/* 01D00 80A0D3C0 AFAC0014 */ sw $t4, 0x0014($sp) -/* 01D04 80A0D3C4 AFB10018 */ sw $s1, 0x0018($sp) +/* 01CFC 80A0D3BC AFAD0010 */ sw $t5, 0x0010($sp) +/* 01D00 80A0D3C0 AFAC0014 */ sw $t4, 0x0014($sp) +/* 01D04 80A0D3C4 AFB10018 */ sw $s1, 0x0018($sp) /* 01D08 80A0D3C8 8E1902D0 */ lw $t9, 0x02D0($s0) ## 000002D0 -/* 01D0C 80A0D3CC 8FA400A4 */ lw $a0, 0x00A4($sp) -/* 01D10 80A0D3D0 0C0289CF */ jal func_800A273C -/* 01D14 80A0D3D4 AFB9001C */ sw $t9, 0x001C($sp) +/* 01D0C 80A0D3CC 8FA400A4 */ lw $a0, 0x00A4($sp) +/* 01D10 80A0D3D0 0C0289CF */ jal SkelAnime_DrawSV2 +/* 01D14 80A0D3D4 AFB9001C */ sw $t9, 0x001C($sp) /* 01D18 80A0D3D8 AE0202D0 */ sw $v0, 0x02D0($s0) ## 000002D0 .L80A0D3DC: -/* 01D1C 80A0D3DC 8FA800A4 */ lw $t0, 0x00A4($sp) +/* 01D1C 80A0D3DC 8FA800A4 */ lw $t0, 0x00A4($sp) .L80A0D3E0: /* 01D20 80A0D3E0 3C0680A1 */ lui $a2, %hi(D_80A0E130) ## $a2 = 80A10000 /* 01D24 80A0D3E4 24C6E130 */ addiu $a2, $a2, %lo(D_80A0E130) ## $a2 = 80A0E130 /* 01D28 80A0D3E8 27A40064 */ addiu $a0, $sp, 0x0064 ## $a0 = FFFFFFC4 /* 01D2C 80A0D3EC 2407071E */ addiu $a3, $zero, 0x071E ## $a3 = 0000071E -/* 01D30 80A0D3F0 0C031AD5 */ jal func_800C6B54 +/* 01D30 80A0D3F0 0C031AD5 */ jal Graph_CloseDisps /* 01D34 80A0D3F4 8D050000 */ lw $a1, 0x0000($t0) ## 00000000 -/* 01D38 80A0D3F8 8FBF003C */ lw $ra, 0x003C($sp) -/* 01D3C 80A0D3FC 8FB00034 */ lw $s0, 0x0034($sp) -/* 01D40 80A0D400 8FB10038 */ lw $s1, 0x0038($sp) -/* 01D44 80A0D404 03E00008 */ jr $ra +/* 01D38 80A0D3F8 8FBF003C */ lw $ra, 0x003C($sp) +/* 01D3C 80A0D3FC 8FB00034 */ lw $s0, 0x0034($sp) +/* 01D40 80A0D400 8FB10038 */ lw $s1, 0x0038($sp) +/* 01D44 80A0D404 03E00008 */ jr $ra /* 01D48 80A0D408 27BD00A0 */ addiu $sp, $sp, 0x00A0 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fd/EnFd_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Fd/EnFd_Init.s index faf23917dd..33f60c136f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Fd/EnFd_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Fd/EnFd_Init.s @@ -1,59 +1,59 @@ glabel EnFd_Init /* 00AEC 80A0C1AC 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 -/* 00AF0 80A0C1B0 AFB00028 */ sw $s0, 0x0028($sp) +/* 00AF0 80A0C1B0 AFB00028 */ sw $s0, 0x0028($sp) /* 00AF4 80A0C1B4 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00AF8 80A0C1B8 AFBF002C */ sw $ra, 0x002C($sp) -/* 00AFC 80A0C1BC AFA50044 */ sw $a1, 0x0044($sp) +/* 00AF8 80A0C1B8 AFBF002C */ sw $ra, 0x002C($sp) +/* 00AFC 80A0C1BC AFA50044 */ sw $a1, 0x0044($sp) /* 00B00 80A0C1C0 260E04DC */ addiu $t6, $s0, 0x04DC ## $t6 = 000004DC /* 00B04 80A0C1C4 260F057E */ addiu $t7, $s0, 0x057E ## $t7 = 0000057E /* 00B08 80A0C1C8 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 /* 00B0C 80A0C1CC 3C060600 */ lui $a2, 0x0600 ## $a2 = 06000000 /* 00B10 80A0C1D0 2418001B */ addiu $t8, $zero, 0x001B ## $t8 = 0000001B -/* 00B14 80A0C1D4 AFB80018 */ sw $t8, 0x0018($sp) +/* 00B14 80A0C1D4 AFB80018 */ sw $t8, 0x0018($sp) /* 00B18 80A0C1D8 24C65810 */ addiu $a2, $a2, 0x5810 ## $a2 = 06005810 /* 00B1C 80A0C1DC 2605014C */ addiu $a1, $s0, 0x014C ## $a1 = 0000014C -/* 00B20 80A0C1E0 AFAF0014 */ sw $t7, 0x0014($sp) -/* 00B24 80A0C1E4 AFAE0010 */ sw $t6, 0x0010($sp) -/* 00B28 80A0C1E8 0C0291BE */ jal func_800A46F8 +/* 00B20 80A0C1E0 AFAF0014 */ sw $t7, 0x0014($sp) +/* 00B24 80A0C1E4 AFAE0010 */ sw $t6, 0x0010($sp) +/* 00B28 80A0C1E8 0C0291BE */ jal SkelAnime_InitSV /* 00B2C 80A0C1EC 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 /* 00B30 80A0C1F0 3C068003 */ lui $a2, 0x8003 ## $a2 = 80030000 /* 00B34 80A0C1F4 24C6B5EC */ addiu $a2, $a2, 0xB5EC ## $a2 = 8002B5EC /* 00B38 80A0C1F8 260400B4 */ addiu $a0, $s0, 0x00B4 ## $a0 = 000000B4 /* 00B3C 80A0C1FC 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 /* 00B40 80A0C200 0C00AC78 */ jal ActorShape_Init - + /* 00B44 80A0C204 3C074200 */ lui $a3, 0x4200 ## $a3 = 42000000 /* 00B48 80A0C208 26050194 */ addiu $a1, $s0, 0x0194 ## $a1 = 00000194 -/* 00B4C 80A0C20C AFA50034 */ sw $a1, 0x0034($sp) -/* 00B50 80A0C210 0C016EFE */ jal func_8005BBF8 -/* 00B54 80A0C214 8FA40044 */ lw $a0, 0x0044($sp) +/* 00B4C 80A0C20C AFA50034 */ sw $a1, 0x0034($sp) +/* 00B50 80A0C210 0C016EFE */ jal func_8005BBF8 +/* 00B54 80A0C214 8FA40044 */ lw $a0, 0x0044($sp) /* 00B58 80A0C218 3C0780A1 */ lui $a3, %hi(D_80A0DFD0) ## $a3 = 80A10000 /* 00B5C 80A0C21C 261901B4 */ addiu $t9, $s0, 0x01B4 ## $t9 = 000001B4 -/* 00B60 80A0C220 8FA50034 */ lw $a1, 0x0034($sp) -/* 00B64 80A0C224 AFB90010 */ sw $t9, 0x0010($sp) +/* 00B60 80A0C220 8FA50034 */ lw $a1, 0x0034($sp) +/* 00B64 80A0C224 AFB90010 */ sw $t9, 0x0010($sp) /* 00B68 80A0C228 24E7DFD0 */ addiu $a3, $a3, %lo(D_80A0DFD0) ## $a3 = 80A0DFD0 -/* 00B6C 80A0C22C 8FA40044 */ lw $a0, 0x0044($sp) -/* 00B70 80A0C230 0C017014 */ jal func_8005C050 +/* 00B6C 80A0C22C 8FA40044 */ lw $a0, 0x0044($sp) +/* 00B70 80A0C230 0C017014 */ jal func_8005C050 /* 00B74 80A0C234 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 00B78 80A0C238 0C016C80 */ jal CollisionBtlTbl_Get - + /* 00B7C 80A0C23C 2404000F */ addiu $a0, $zero, 0x000F ## $a0 = 0000000F /* 00B80 80A0C240 3C0680A1 */ lui $a2, %hi(D_80A0DFE0) ## $a2 = 80A10000 /* 00B84 80A0C244 24C6DFE0 */ addiu $a2, $a2, %lo(D_80A0DFE0) ## $a2 = 80A0DFE0 /* 00B88 80A0C248 26040098 */ addiu $a0, $s0, 0x0098 ## $a0 = 00000098 -/* 00B8C 80A0C24C 0C0187BF */ jal func_80061EFC +/* 00B8C 80A0C24C 0C0187BF */ jal func_80061EFC /* 00B90 80A0C250 00402825 */ or $a1, $v0, $zero ## $a1 = 00000000 /* 00B94 80A0C254 8E080004 */ lw $t0, 0x0004($s0) ## 00000004 /* 00B98 80A0C258 2401FFFE */ addiu $at, $zero, 0xFFFE ## $at = FFFFFFFE /* 00B9C 80A0C25C 3C053C23 */ lui $a1, 0x3C23 ## $a1 = 3C230000 -/* 00BA0 80A0C260 01014824 */ and $t1, $t0, $at +/* 00BA0 80A0C260 01014824 */ and $t1, $t0, $at /* 00BA4 80A0C264 3C010100 */ lui $at, 0x0100 ## $at = 01000000 /* 00BA8 80A0C268 AE090004 */ sw $t1, 0x0004($s0) ## 00000004 /* 00BAC 80A0C26C 01215825 */ or $t3, $t1, $at ## $t3 = 01000000 /* 00BB0 80A0C270 AE0B0004 */ sw $t3, 0x0004($s0) ## 00000004 /* 00BB4 80A0C274 34A5D70A */ ori $a1, $a1, 0xD70A ## $a1 = 3C23D70A /* 00BB8 80A0C278 0C00B58B */ jal Actor_SetScale - + /* 00BBC 80A0C27C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 00BC0 80A0C280 3C01BF80 */ lui $at, 0xBF80 ## $at = BF800000 /* 00BC4 80A0C284 44812000 */ mtc1 $at, $f4 ## $f4 = -1.00 @@ -66,22 +66,22 @@ glabel EnFd_Init /* 00BDC 80A0C29C 44813000 */ mtc1 $at, $f6 ## $f6 = 0.50 /* 00BE0 80A0C2A0 3C1880A1 */ lui $t8, %hi(func_80A0C310) ## $t8 = 80A10000 /* 00BE4 80A0C2A4 240E0001 */ addiu $t6, $zero, 0x0001 ## $t6 = 00000001 -/* 00BE8 80A0C2A8 4606003C */ c.lt.s $f0, $f6 +/* 00BE8 80A0C2A8 4606003C */ c.lt.s $f0, $f6 /* 00BEC 80A0C2AC 240DFFFF */ addiu $t5, $zero, 0xFFFF ## $t5 = FFFFFFFF /* 00BF0 80A0C2B0 240F0022 */ addiu $t7, $zero, 0x0022 ## $t7 = 00000022 /* 00BF4 80A0C2B4 2718C310 */ addiu $t8, $t8, %lo(func_80A0C310) ## $t8 = 80A0C310 -/* 00BF8 80A0C2B8 45020004 */ bc1fl .L80A0C2CC +/* 00BF8 80A0C2B8 45020004 */ bc1fl .L80A0C2CC /* 00BFC 80A0C2BC A60E04BA */ sh $t6, 0x04BA($s0) ## 000004BA -/* 00C00 80A0C2C0 10000002 */ beq $zero, $zero, .L80A0C2CC +/* 00C00 80A0C2C0 10000002 */ beq $zero, $zero, .L80A0C2CC /* 00C04 80A0C2C4 A60D04BA */ sh $t5, 0x04BA($s0) ## 000004BA /* 00C08 80A0C2C8 A60E04BA */ sh $t6, 0x04BA($s0) ## 000004BA .L80A0C2CC: /* 00C0C 80A0C2CC A20F0117 */ sb $t7, 0x0117($s0) ## 00000117 /* 00C10 80A0C2D0 AE180190 */ sw $t8, 0x0190($s0) ## 00000190 -/* 00C14 80A0C2D4 8FBF002C */ lw $ra, 0x002C($sp) -/* 00C18 80A0C2D8 8FB00028 */ lw $s0, 0x0028($sp) +/* 00C14 80A0C2D4 8FBF002C */ lw $ra, 0x002C($sp) +/* 00C18 80A0C2D8 8FB00028 */ lw $s0, 0x0028($sp) /* 00C1C 80A0C2DC 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 -/* 00C20 80A0C2E0 03E00008 */ jr $ra +/* 00C20 80A0C2E0 03E00008 */ jr $ra /* 00C24 80A0C2E4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fd/func_80A0C4F0.s b/asm/non_matchings/overlays/actors/ovl_En_Fd/func_80A0C4F0.s index d551e5e082..23be35d824 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Fd/func_80A0C4F0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Fd/func_80A0C4F0.s @@ -36,7 +36,7 @@ glabel func_80A0C4F0 /* 00EAC 80A0C56C 0C282FA8 */ jal func_80A0BEA0 /* 00EB0 80A0C570 860704BA */ lh $a3, 0x04BA($s0) ## 000004BA /* 00EB4 80A0C574 C7AC002C */ lwc1 $f12, 0x002C($sp) -/* 00EB8 80A0C578 0C03F494 */ jal func_800FD250 +/* 00EB8 80A0C578 0C03F494 */ jal Math_atan2f /* 00EBC 80A0C57C C7AE0034 */ lwc1 $f14, 0x0034($sp) /* 00EC0 80A0C580 3C0180A1 */ lui $at, %hi(D_80A0E1C0) ## $at = 80A10000 /* 00EC4 80A0C584 C426E1C0 */ lwc1 $f6, %lo(D_80A0E1C0)($at) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fd/func_80A0C7EC.s b/asm/non_matchings/overlays/actors/ovl_En_Fd/func_80A0C7EC.s index b00fdb3e15..ba241de404 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Fd/func_80A0C7EC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Fd/func_80A0C7EC.s @@ -99,7 +99,7 @@ glabel func_80A0C7EC /* 01284 80A0C944 0C282FA8 */ jal func_80A0BEA0 /* 01288 80A0C948 860704BA */ lh $a3, 0x04BA($s0) ## 000004BA /* 0128C 80A0C94C C7AC0030 */ lwc1 $f12, 0x0030($sp) -/* 01290 80A0C950 0C03F494 */ jal func_800FD250 +/* 01290 80A0C950 0C03F494 */ jal Math_atan2f /* 01294 80A0C954 C7AE0038 */ lwc1 $f14, 0x0038($sp) /* 01298 80A0C958 3C0180A1 */ lui $at, %hi(D_80A0E1C4) ## $at = 80A10000 /* 0129C 80A0C95C C42AE1C4 */ lwc1 $f10, %lo(D_80A0E1C4)($at) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fd/func_80A0D730.s b/asm/non_matchings/overlays/actors/ovl_En_Fd/func_80A0D730.s index 676a955568..ef4f56e189 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Fd/func_80A0D730.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Fd/func_80A0D730.s @@ -22,7 +22,7 @@ glabel func_80A0D730 /* 020C0 80A0D780 24C6E140 */ addiu $a2, $a2, %lo(D_80A0E140) ## $a2 = 80A0E140 /* 020C4 80A0D784 27A40090 */ addiu $a0, $sp, 0x0090 ## $a0 = FFFFFFE0 /* 020C8 80A0D788 240707B1 */ addiu $a3, $zero, 0x07B1 ## $a3 = 000007B1 -/* 020CC 80A0D78C 0C031AB1 */ jal func_800C6AC4 +/* 020CC 80A0D78C 0C031AB1 */ jal Graph_OpenDisps /* 020D0 80A0D790 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 /* 020D4 80A0D794 8FAF00B4 */ lw $t7, 0x00B4($sp) /* 020D8 80A0D798 0000F025 */ or $s8, $zero, $zero ## $s8 = 00000000 @@ -52,7 +52,7 @@ glabel func_80A0D730 /* 02134 80A0D7F4 26317928 */ addiu $s1, $s1, 0x7928 ## $s1 = 06007928 /* 02138 80A0D7F8 8E0402D0 */ lw $a0, 0x02D0($s0) ## 000002D0 /* 0213C 80A0D7FC 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 02140 80A0D800 0C024DDD */ jal func_80093774 +/* 02140 80A0D800 0C024DDD */ jal Gfx_CallSetupDL /* 02144 80A0D804 241E0001 */ addiu $s8, $zero, 0x0001 ## $s8 = 00000001 /* 02148 80A0D808 AE0202D0 */ sw $v0, 0x02D0($s0) ## 000002D0 /* 0214C 80A0D80C 24590008 */ addiu $t9, $v0, 0x0008 ## $t9 = 00000008 @@ -253,7 +253,7 @@ glabel func_80A0D730 /* 02430 80A0DAF0 24C6E160 */ addiu $a2, $a2, %lo(D_80A0E160) ## $a2 = 80A0E160 /* 02434 80A0DAF4 27A40090 */ addiu $a0, $sp, 0x0090 ## $a0 = FFFFFFE0 /* 02438 80A0DAF8 240707E4 */ addiu $a3, $zero, 0x07E4 ## $a3 = 000007E4 -/* 0243C 80A0DAFC 0C031AD5 */ jal func_800C6B54 +/* 0243C 80A0DAFC 0C031AD5 */ jal Graph_CloseDisps /* 02440 80A0DB00 8D650000 */ lw $a1, 0x0000($t3) ## DB060020 /* 02444 80A0DB04 8FBF005C */ lw $ra, 0x005C($sp) /* 02448 80A0DB08 D7B40018 */ ldc1 $f20, 0x0018($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fd/func_80A0DB44.s b/asm/non_matchings/overlays/actors/ovl_En_Fd/func_80A0DB44.s index c118a8181b..218bc627b5 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Fd/func_80A0DB44.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Fd/func_80A0DB44.s @@ -20,7 +20,7 @@ glabel func_80A0DB44 /* 024CC 80A0DB8C 24C6E170 */ addiu $a2, $a2, %lo(D_80A0E170) ## $a2 = 80A0E170 /* 024D0 80A0DB90 27A40074 */ addiu $a0, $sp, 0x0074 ## $a0 = FFFFFFE4 /* 024D4 80A0DB94 240707F2 */ addiu $a3, $zero, 0x07F2 ## $a3 = 000007F2 -/* 024D8 80A0DB98 0C031AB1 */ jal func_800C6AC4 +/* 024D8 80A0DB98 0C031AB1 */ jal Graph_OpenDisps /* 024DC 80A0DB9C 00A09025 */ or $s2, $a1, $zero ## $s2 = 00000000 /* 024E0 80A0DBA0 0000F025 */ or $s8, $zero, $zero ## $s8 = 00000000 /* 024E4 80A0DBA4 0C024F61 */ jal func_80093D84 @@ -164,7 +164,7 @@ glabel func_80A0DB44 /* 026F0 80A0DDB0 24C6E190 */ addiu $a2, $a2, %lo(D_80A0E190) ## $a2 = 80A0E190 /* 026F4 80A0DDB4 27A40074 */ addiu $a0, $sp, 0x0074 ## $a0 = FFFFFFE4 /* 026F8 80A0DDB8 8EA50000 */ lw $a1, 0x0000($s5) ## 00000000 -/* 026FC 80A0DDBC 0C031AD5 */ jal func_800C6B54 +/* 026FC 80A0DDBC 0C031AD5 */ jal Graph_CloseDisps /* 02700 80A0DDC0 24070817 */ addiu $a3, $zero, 0x0817 ## $a3 = 00000817 /* 02704 80A0DDC4 8FBF004C */ lw $ra, 0x004C($sp) /* 02708 80A0DDC8 D7B40018 */ ldc1 $f20, 0x0018($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fd_Fire/EnFdFire_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Fd_Fire/EnFdFire_Draw.s index 4e37ba8f1d..328a5dc018 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Fd_Fire/EnFdFire_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Fd_Fire/EnFdFire_Draw.s @@ -42,7 +42,7 @@ glabel EnFdFire_Draw /* 007D0 80A0EC80 24C6F0F0 */ addiu $a2, $a2, %lo(D_80A0F0F0) ## $a2 = 80A0F0F0 /* 007D4 80A0EC84 27A4006C */ addiu $a0, $sp, 0x006C ## $a0 = FFFFFFAC /* 007D8 80A0EC88 2407023C */ addiu $a3, $zero, 0x023C ## $a3 = 0000023C -/* 007DC 80A0EC8C 0C031AB1 */ jal func_800C6AC4 +/* 007DC 80A0EC8C 0C031AB1 */ jal Graph_OpenDisps /* 007E0 80A0EC90 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 /* 007E4 80A0EC94 8FA200C0 */ lw $v0, 0x00C0($sp) /* 007E8 80A0EC98 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 @@ -194,7 +194,7 @@ glabel EnFdFire_Draw /* 00A1C 80A0EECC AFA20064 */ sw $v0, 0x0064($sp) /* 00A20 80A0EED0 00005812 */ mflo $t3 /* 00A24 80A0EED4 AFAB0020 */ sw $t3, 0x0020($sp) -/* 00A28 80A0EED8 0C0253D0 */ jal Draw_TwoTexScroll +/* 00A28 80A0EED8 0C0253D0 */ jal Gfx_TwoTexScroll /* 00A2C 80A0EEDC 00000000 */ nop /* 00A30 80A0EEE0 8FA30064 */ lw $v1, 0x0064($sp) /* 00A34 80A0EEE4 3C0FFA00 */ lui $t7, 0xFA00 ## $t7 = FA000000 @@ -263,7 +263,7 @@ glabel EnFdFire_Draw /* 00B30 80A0EFE0 AE0C02D0 */ sw $t4, 0x02D0($s0) ## 000002D0 /* 00B34 80A0EFE4 AC4E0004 */ sw $t6, 0x0004($v0) ## 00000004 /* 00B38 80A0EFE8 AC590000 */ sw $t9, 0x0000($v0) ## 00000000 -/* 00B3C 80A0EFEC 0C031AD5 */ jal func_800C6B54 +/* 00B3C 80A0EFEC 0C031AD5 */ jal Graph_CloseDisps /* 00B40 80A0EFF0 8E250000 */ lw $a1, 0x0000($s1) ## 00000000 /* 00B44 80A0EFF4 8FBF003C */ lw $ra, 0x003C($sp) /* 00B48 80A0EFF8 8FB00034 */ lw $s0, 0x0034($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fhg_Fire/EnFhgFire_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Fhg_Fire/EnFhgFire_Draw.s index e73df81e9d..dbddfe353a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Fhg_Fire/EnFhgFire_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Fhg_Fire/EnFhgFire_Draw.s @@ -9,7 +9,7 @@ glabel EnFhgFire_Draw /* 01EF4 80A11154 24C61920 */ addiu $a2, $a2, %lo(D_80A11920) ## $a2 = 80A11920 /* 01EF8 80A11158 27A4009C */ addiu $a0, $sp, 0x009C ## $a0 = FFFFFFE4 /* 01EFC 80A1115C 240706BB */ addiu $a3, $zero, 0x06BB ## $a3 = 000006BB -/* 01F00 80A11160 0C031AB1 */ jal func_800C6AC4 +/* 01F00 80A11160 0C031AB1 */ jal Graph_OpenDisps /* 01F04 80A11164 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 /* 01F08 80A11168 8FA800B8 */ lw $t0, 0x00B8($sp) /* 01F0C 80A1116C 24010024 */ addiu $at, $zero, 0x0024 ## $at = 00000024 @@ -316,7 +316,7 @@ glabel EnFhgFire_Draw /* 02398 80A115F8 AFA2005C */ sw $v0, 0x005C($sp) /* 0239C 80A115FC 00095400 */ sll $t2, $t1, 16 /* 023A0 80A11600 000A5C03 */ sra $t3, $t2, 16 -/* 023A4 80A11604 0C0253D0 */ jal Draw_TwoTexScroll +/* 023A4 80A11604 0C0253D0 */ jal Gfx_TwoTexScroll /* 023A8 80A11608 AFAB0020 */ sw $t3, 0x0020($sp) /* 023AC 80A1160C 8FA3005C */ lw $v1, 0x005C($sp) /* 023B0 80A11610 3C180601 */ lui $t8, 0x0601 ## $t8 = 06010000 @@ -402,7 +402,7 @@ glabel EnFhgFire_Draw /* 024E0 80A11740 24C619B0 */ addiu $a2, $a2, %lo(D_80A119B0) ## $a2 = 80A119B0 /* 024E4 80A11744 27A4009C */ addiu $a0, $sp, 0x009C ## $a0 = FFFFFFE4 /* 024E8 80A11748 2407076C */ addiu $a3, $zero, 0x076C ## $a3 = 0000076C -/* 024EC 80A1174C 0C031AD5 */ jal func_800C6B54 +/* 024EC 80A1174C 0C031AD5 */ jal Graph_CloseDisps /* 024F0 80A11750 8D450000 */ lw $a1, 0x0000($t2) ## 00000000 /* 024F4 80A11754 8FBF003C */ lw $ra, 0x003C($sp) /* 024F8 80A11758 8FB00038 */ lw $s0, 0x0038($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fhg_Fire/EnFhgFire_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Fhg_Fire/EnFhgFire_Init.s index 5577d9faca..2390aaf8a0 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Fhg_Fire/EnFhgFire_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Fhg_Fire/EnFhgFire_Init.s @@ -219,7 +219,7 @@ glabel EnFhgFire_Init /* 00310 80A0F570 C452002C */ lwc1 $f18, 0x002C($v0) ## 0000002C /* 00314 80A0F574 E7AC0048 */ swc1 $f12, 0x0048($sp) /* 00318 80A0F578 46049381 */ sub.s $f14, $f18, $f4 -/* 0031C 80A0F57C 0C03F494 */ jal func_800FD250 +/* 0031C 80A0F57C 0C03F494 */ jal Math_atan2f /* 00320 80A0F580 E7AE0040 */ swc1 $f14, 0x0040($sp) /* 00324 80A0F584 3C0180A1 */ lui $at, %hi(D_80A119C8) ## $at = 80A10000 /* 00328 80A0F588 C42619C8 */ lwc1 $f6, %lo(D_80A119C8)($at) @@ -236,7 +236,7 @@ glabel EnFhgFire_Init /* 00354 80A0F5B4 00000000 */ nop /* 00358 80A0F5B8 A60D0032 */ sh $t5, 0x0032($s0) ## 00000032 /* 0035C 80A0F5BC 46000384 */ sqrt.s $f14, $f0 -/* 00360 80A0F5C0 0C03F494 */ jal func_800FD250 +/* 00360 80A0F5C0 0C03F494 */ jal Math_atan2f /* 00364 80A0F5C4 C7AC0044 */ lwc1 $f12, 0x0044($sp) /* 00368 80A0F5C8 3C0180A1 */ lui $at, %hi(D_80A119CC) ## $at = 80A10000 /* 0036C 80A0F5CC C42619CC */ lwc1 $f6, %lo(D_80A119CC)($at) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fhg_Fire/func_80A10220.s b/asm/non_matchings/overlays/actors/ovl_En_Fhg_Fire/func_80A10220.s index c2a0948f21..31e226a05c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Fhg_Fire/func_80A10220.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Fhg_Fire/func_80A10220.s @@ -372,7 +372,7 @@ glabel func_80A10220 .L80A10760: /* 01500 80A10760 C7AC00FC */ lwc1 $f12, 0x00FC($sp) /* 01504 80A10764 C7AE00F4 */ lwc1 $f14, 0x00F4($sp) -/* 01508 80A10768 0C03F494 */ jal func_800FD250 +/* 01508 80A10768 0C03F494 */ jal Math_atan2f /* 0150C 80A1076C A7A30098 */ sh $v1, 0x0098($sp) /* 01510 80A10770 3C0180A1 */ lui $at, %hi(D_80A119E4) ## $at = 80A10000 /* 01514 80A10774 C42819E4 */ lwc1 $f8, %lo(D_80A119E4)($at) @@ -390,7 +390,7 @@ glabel func_80A10220 /* 01544 80A107A4 00000000 */ nop /* 01548 80A107A8 460A5102 */ mul.s $f4, $f10, $f10 /* 0154C 80A107AC 46044000 */ add.s $f0, $f8, $f4 -/* 01550 80A107B0 0C03F494 */ jal func_800FD250 +/* 01550 80A107B0 0C03F494 */ jal Math_atan2f /* 01554 80A107B4 46000384 */ sqrt.s $f14, $f0 /* 01558 80A107B8 3C0180A1 */ lui $at, %hi(D_80A119E8) ## $at = 80A10000 /* 0155C 80A107BC C42619E8 */ lwc1 $f6, %lo(D_80A119E8)($at) @@ -481,7 +481,7 @@ glabel func_80A10220 /* 01694 80A108F4 29C10064 */ slti $at, $t6, 0x0064 /* 01698 80A108F8 50200024 */ beql $at, $zero, .L80A1098C /* 0169C 80A108FC 8608015A */ lh $t0, 0x015A($s0) ## 0000015A -/* 016A0 80A10900 0C03F494 */ jal func_800FD250 +/* 016A0 80A10900 0C03F494 */ jal Math_atan2f /* 016A4 80A10904 C7AE00F4 */ lwc1 $f14, 0x00F4($sp) /* 016A8 80A10908 3C0180A1 */ lui $at, %hi(D_80A119EC) ## $at = 80A10000 /* 016AC 80A1090C C42A19EC */ lwc1 $f10, %lo(D_80A119EC)($at) @@ -539,7 +539,7 @@ glabel func_80A10220 /* 01778 80A109D8 A16C01CA */ sb $t4, 0x01CA($t3) ## 000001CA .L80A109DC: /* 0177C 80A109DC E7A20050 */ swc1 $f2, 0x0050($sp) -/* 01780 80A109E0 0C03F494 */ jal func_800FD250 +/* 01780 80A109E0 0C03F494 */ jal Math_atan2f /* 01784 80A109E4 E7B0004C */ swc1 $f16, 0x004C($sp) /* 01788 80A109E8 3C0180A1 */ lui $at, %hi(D_80A119F0) ## $at = 80A10000 /* 0178C 80A109EC C42819F0 */ lwc1 $f8, %lo(D_80A119F0)($at) @@ -552,7 +552,7 @@ glabel func_80A10220 /* 017A8 80A10A08 440F5000 */ mfc1 $t7, $f10 /* 017AC 80A10A0C 00000000 */ nop /* 017B0 80A10A10 A60F0032 */ sh $t7, 0x0032($s0) ## 00000032 -/* 017B4 80A10A14 0C03F494 */ jal func_800FD250 +/* 017B4 80A10A14 0C03F494 */ jal Math_atan2f /* 017B8 80A10A18 C7AC00F8 */ lwc1 $f12, 0x00F8($sp) /* 017BC 80A10A1C 3C0180A1 */ lui $at, %hi(D_80A119F4) ## $at = 80A10000 /* 017C0 80A10A20 C42619F4 */ lwc1 $f6, %lo(D_80A119F4)($at) @@ -668,7 +668,7 @@ glabel func_80A10220 /* 01950 80A10BB0 1420FFE0 */ bne $at, $zero, .L80A10B34 /* 01954 80A10BB4 A7A20096 */ sh $v0, 0x0096($sp) /* 01958 80A10BB8 C7AC010C */ lwc1 $f12, 0x010C($sp) -/* 0195C 80A10BBC 0C03F494 */ jal func_800FD250 +/* 0195C 80A10BBC 0C03F494 */ jal Math_atan2f /* 01960 80A10BC0 C7AE0104 */ lwc1 $f14, 0x0104($sp) /* 01964 80A10BC4 3C0180A1 */ lui $at, %hi(D_80A119F8) ## $at = 80A10000 /* 01968 80A10BC8 C42A19F8 */ lwc1 $f10, %lo(D_80A119F8)($at) @@ -685,7 +685,7 @@ glabel func_80A10220 /* 01994 80A10BF4 00000000 */ nop /* 01998 80A10BF8 A6180032 */ sh $t8, 0x0032($s0) ## 00000032 /* 0199C 80A10BFC 46000384 */ sqrt.s $f14, $f0 -/* 019A0 80A10C00 0C03F494 */ jal func_800FD250 +/* 019A0 80A10C00 0C03F494 */ jal Math_atan2f /* 019A4 80A10C04 C7AC0108 */ lwc1 $f12, 0x0108($sp) /* 019A8 80A10C08 3C0180A1 */ lui $at, %hi(D_80A119FC) ## $at = 80A10000 /* 019AC 80A10C0C C42619FC */ lwc1 $f6, %lo(D_80A119FC)($at) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fire_Rock/EnFireRock_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Fire_Rock/EnFireRock_Draw.s index 089002e554..044dc803bd 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Fire_Rock/EnFireRock_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Fire_Rock/EnFireRock_Draw.s @@ -10,7 +10,7 @@ glabel EnFireRock_Draw /* 00ED0 80A12AF0 24C62E58 */ addiu $a2, $a2, %lo(D_80A12E58) ## $a2 = 80A12E58 /* 00ED4 80A12AF4 27A40034 */ addiu $a0, $sp, 0x0034 ## $a0 = FFFFFFE4 /* 00ED8 80A12AF8 240702EB */ addiu $a3, $zero, 0x02EB ## $a3 = 000002EB -/* 00EDC 80A12AFC 0C031AB1 */ jal func_800C6AC4 +/* 00EDC 80A12AFC 0C031AB1 */ jal Graph_OpenDisps /* 00EE0 80A12B00 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 /* 00EE4 80A12B04 C6040024 */ lwc1 $f4, 0x0024($s0) ## 00000024 /* 00EE8 80A12B08 C6060170 */ lwc1 $f6, 0x0170($s0) ## 00000170 @@ -97,7 +97,7 @@ glabel EnFireRock_Draw /* 0102C 80A12C4C 24C62E80 */ addiu $a2, $a2, %lo(D_80A12E80) ## $a2 = 80A12E80 /* 01030 80A12C50 27A40034 */ addiu $a0, $sp, 0x0034 ## $a0 = FFFFFFE4 /* 01034 80A12C54 24070305 */ addiu $a3, $zero, 0x0305 ## $a3 = 00000305 -/* 01038 80A12C58 0C031AD5 */ jal func_800C6B54 +/* 01038 80A12C58 0C031AD5 */ jal Graph_CloseDisps /* 0103C 80A12C5C 8D050000 */ lw $a1, 0x0000($t0) ## 00000000 /* 01040 80A12C60 8FBF001C */ lw $ra, 0x001C($sp) /* 01044 80A12C64 8FB00014 */ lw $s0, 0x0014($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Firefly/EnFirefly_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Firefly/EnFirefly_Draw.s index 1043a7e328..347d94f1e6 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Firefly/EnFirefly_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Firefly/EnFirefly_Draw.s @@ -1,33 +1,33 @@ glabel EnFirefly_Draw /* 01CD0 80A14D40 27BDFFA8 */ addiu $sp, $sp, 0xFFA8 ## $sp = FFFFFFA8 -/* 01CD4 80A14D44 AFBF002C */ sw $ra, 0x002C($sp) -/* 01CD8 80A14D48 AFB00028 */ sw $s0, 0x0028($sp) -/* 01CDC 80A14D4C AFA40058 */ sw $a0, 0x0058($sp) -/* 01CE0 80A14D50 AFA5005C */ sw $a1, 0x005C($sp) +/* 01CD4 80A14D44 AFBF002C */ sw $ra, 0x002C($sp) +/* 01CD8 80A14D48 AFB00028 */ sw $s0, 0x0028($sp) +/* 01CDC 80A14D4C AFA40058 */ sw $a0, 0x0058($sp) +/* 01CE0 80A14D50 AFA5005C */ sw $a1, 0x005C($sp) /* 01CE4 80A14D54 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 /* 01CE8 80A14D58 3C0680A1 */ lui $a2, %hi(D_80A14FE0) ## $a2 = 80A10000 /* 01CEC 80A14D5C 24C64FE0 */ addiu $a2, $a2, %lo(D_80A14FE0) ## $a2 = 80A14FE0 /* 01CF0 80A14D60 27A40040 */ addiu $a0, $sp, 0x0040 ## $a0 = FFFFFFE8 /* 01CF4 80A14D64 240706C5 */ addiu $a3, $zero, 0x06C5 ## $a3 = 000006C5 -/* 01CF8 80A14D68 0C031AB1 */ jal func_800C6AC4 +/* 01CF8 80A14D68 0C031AB1 */ jal Graph_OpenDisps /* 01CFC 80A14D6C 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 -/* 01D00 80A14D70 8FAF005C */ lw $t7, 0x005C($sp) -/* 01D04 80A14D74 0C024F46 */ jal func_80093D18 +/* 01D00 80A14D70 8FAF005C */ lw $t7, 0x005C($sp) +/* 01D04 80A14D74 0C024F46 */ jal func_80093D18 /* 01D08 80A14D78 8DE40000 */ lw $a0, 0x0000($t7) ## 00000000 -/* 01D0C 80A14D7C 8FA80058 */ lw $t0, 0x0058($sp) +/* 01D0C 80A14D7C 8FA80058 */ lw $t0, 0x0058($sp) /* 01D10 80A14D80 3C0780A1 */ lui $a3, %hi(func_80A14960) ## $a3 = 80A10000 /* 01D14 80A14D84 3C0D80A1 */ lui $t5, %hi(func_80A149B4) ## $t5 = 80A10000 /* 01D18 80A14D88 911801B9 */ lbu $t8, 0x01B9($t0) ## 000001B9 /* 01D1C 80A14D8C 25AD49B4 */ addiu $t5, $t5, %lo(func_80A149B4) ## $t5 = 80A149B4 /* 01D20 80A14D90 24E74960 */ addiu $a3, $a3, %lo(func_80A14960) ## $a3 = 80A14960 -/* 01D24 80A14D94 53000009 */ beql $t8, $zero, .L80A14DBC +/* 01D24 80A14D94 53000009 */ beql $t8, $zero, .L80A14DBC /* 01D28 80A14D98 8E0302C0 */ lw $v1, 0x02C0($s0) ## 000002C0 /* 01D2C 80A14D9C 8E0302C0 */ lw $v1, 0x02C0($s0) ## 000002C0 /* 01D30 80A14DA0 3C09FB00 */ lui $t1, 0xFB00 ## $t1 = FB000000 /* 01D34 80A14DA4 24790008 */ addiu $t9, $v1, 0x0008 ## $t9 = 00000008 /* 01D38 80A14DA8 AE1902C0 */ sw $t9, 0x02C0($s0) ## 000002C0 /* 01D3C 80A14DAC AC600004 */ sw $zero, 0x0004($v1) ## 00000004 -/* 01D40 80A14DB0 10000008 */ beq $zero, $zero, .L80A14DD4 +/* 01D40 80A14DB0 10000008 */ beq $zero, $zero, .L80A14DD4 /* 01D44 80A14DB4 AC690000 */ sw $t1, 0x0000($v1) ## 00000000 /* 01D48 80A14DB8 8E0302C0 */ lw $v1, 0x02C0($s0) ## 000002C0 .L80A14DBC: @@ -40,24 +40,24 @@ glabel EnFirefly_Draw .L80A14DD4: /* 01D64 80A14DD4 8D050174 */ lw $a1, 0x0174($t0) ## 00000174 /* 01D68 80A14DD8 8D060190 */ lw $a2, 0x0190($t0) ## 00000190 -/* 01D6C 80A14DDC AFA80014 */ sw $t0, 0x0014($sp) -/* 01D70 80A14DE0 AFAD0010 */ sw $t5, 0x0010($sp) +/* 01D6C 80A14DDC AFA80014 */ sw $t0, 0x0014($sp) +/* 01D70 80A14DE0 AFAD0010 */ sw $t5, 0x0010($sp) /* 01D74 80A14DE4 8E0E02C0 */ lw $t6, 0x02C0($s0) ## 000002C0 -/* 01D78 80A14DE8 8FA4005C */ lw $a0, 0x005C($sp) -/* 01D7C 80A14DEC 0C0288A2 */ jal func_800A2288 -/* 01D80 80A14DF0 AFAE0018 */ sw $t6, 0x0018($sp) +/* 01D78 80A14DE8 8FA4005C */ lw $a0, 0x005C($sp) +/* 01D7C 80A14DEC 0C0288A2 */ jal SkelAnime_Draw2 +/* 01D80 80A14DF0 AFAE0018 */ sw $t6, 0x0018($sp) /* 01D84 80A14DF4 AE0202C0 */ sw $v0, 0x02C0($s0) ## 000002C0 -/* 01D88 80A14DF8 8FAF005C */ lw $t7, 0x005C($sp) +/* 01D88 80A14DF8 8FAF005C */ lw $t7, 0x005C($sp) /* 01D8C 80A14DFC 3C0680A1 */ lui $a2, %hi(D_80A14FF4) ## $a2 = 80A10000 /* 01D90 80A14E00 24C64FF4 */ addiu $a2, $a2, %lo(D_80A14FF4) ## $a2 = 80A14FF4 /* 01D94 80A14E04 27A40040 */ addiu $a0, $sp, 0x0040 ## $a0 = FFFFFFE8 /* 01D98 80A14E08 240706E3 */ addiu $a3, $zero, 0x06E3 ## $a3 = 000006E3 -/* 01D9C 80A14E0C 0C031AD5 */ jal func_800C6B54 +/* 01D9C 80A14E0C 0C031AD5 */ jal Graph_CloseDisps /* 01DA0 80A14E10 8DE50000 */ lw $a1, 0x0000($t7) ## 00000000 -/* 01DA4 80A14E14 8FBF002C */ lw $ra, 0x002C($sp) -/* 01DA8 80A14E18 8FB00028 */ lw $s0, 0x0028($sp) +/* 01DA4 80A14E14 8FBF002C */ lw $ra, 0x002C($sp) +/* 01DA8 80A14E18 8FB00028 */ lw $s0, 0x0028($sp) /* 01DAC 80A14E1C 27BD0058 */ addiu $sp, $sp, 0x0058 ## $sp = 00000000 -/* 01DB0 80A14E20 03E00008 */ jr $ra +/* 01DB0 80A14E20 03E00008 */ jr $ra /* 01DB4 80A14E24 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Firefly/func_80A133A0.s b/asm/non_matchings/overlays/actors/ovl_En_Firefly/func_80A133A0.s index f23040d923..dd28398c5f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Firefly/func_80A133A0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Firefly/func_80A133A0.s @@ -1,8 +1,8 @@ glabel func_80A133A0 /* 00330 80A133A0 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 /* 00334 80A133A4 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 00338 80A133A8 AFBF002C */ sw $ra, 0x002C($sp) -/* 0033C 80A133AC AFB00028 */ sw $s0, 0x0028($sp) +/* 00338 80A133A8 AFBF002C */ sw $ra, 0x002C($sp) +/* 0033C 80A133AC AFB00028 */ sw $s0, 0x0028($sp) /* 00340 80A133B0 240E0028 */ addiu $t6, $zero, 0x0028 ## $t6 = 00000028 /* 00344 80A133B4 3C01C040 */ lui $at, 0xC040 ## $at = C0400000 /* 00348 80A133B8 44812000 */ mtc1 $at, $f4 ## $f4 = -3.00 @@ -11,36 +11,36 @@ glabel func_80A133A0 /* 00354 80A133C4 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 00358 80A133C8 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 0035C 80A133CC 240F0001 */ addiu $t7, $zero, 0x0001 ## $t7 = 00000001 -/* 00360 80A133D0 44070000 */ mfc1 $a3, $f0 -/* 00364 80A133D4 AFAF0014 */ sw $t7, 0x0014($sp) +/* 00360 80A133D0 44070000 */ mfc1 $a3, $f0 +/* 00364 80A133D4 AFAF0014 */ sw $t7, 0x0014($sp) /* 00368 80A133D8 24A5017C */ addiu $a1, $a1, 0x017C ## $a1 = 0600017C /* 0036C 80A133DC 24840170 */ addiu $a0, $a0, 0x0170 ## $a0 = 00000170 /* 00370 80A133E0 3C063F00 */ lui $a2, 0x3F00 ## $a2 = 3F000000 -/* 00374 80A133E4 E7A00010 */ swc1 $f0, 0x0010($sp) -/* 00378 80A133E8 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 0037C 80A133EC E7A40018 */ swc1 $f4, 0x0018($sp) +/* 00374 80A133E4 E7A00010 */ swc1 $f0, 0x0010($sp) +/* 00378 80A133E8 0C029468 */ jal SkelAnime_ChangeAnim + +/* 0037C 80A133EC E7A40018 */ swc1 $f4, 0x0018($sp) /* 00380 80A133F0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 00384 80A133F4 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 00388 80A133F8 24053842 */ addiu $a1, $zero, 0x3842 ## $a1 = 00003842 /* 0038C 80A133FC 8E180004 */ lw $t8, 0x0004($s0) ## 00000004 /* 00390 80A13400 24080028 */ addiu $t0, $zero, 0x0028 ## $t0 = 00000028 /* 00394 80A13404 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 00398 80A13408 37190010 */ ori $t9, $t8, 0x0010 ## $t9 = 00000010 /* 0039C 80A1340C AE190004 */ sw $t9, 0x0004($s0) ## 00000004 -/* 003A0 80A13410 AFA80010 */ sw $t0, 0x0010($sp) +/* 003A0 80A13410 AFA80010 */ sw $t0, 0x0010($sp) /* 003A4 80A13414 24054000 */ addiu $a1, $zero, 0x4000 ## $a1 = 00004000 /* 003A8 80A13418 240600FF */ addiu $a2, $zero, 0x00FF ## $a2 = 000000FF -/* 003AC 80A1341C 0C00D09B */ jal func_8003426C +/* 003AC 80A1341C 0C00D09B */ jal func_8003426C /* 003B0 80A13420 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 /* 003B4 80A13424 3C0980A1 */ lui $t1, %hi(func_80A13C98) ## $t1 = 80A10000 /* 003B8 80A13428 25293C98 */ addiu $t1, $t1, %lo(func_80A13C98) ## $t1 = 80A13C98 /* 003BC 80A1342C AE0901B4 */ sw $t1, 0x01B4($s0) ## 000001B4 -/* 003C0 80A13430 8FBF002C */ lw $ra, 0x002C($sp) -/* 003C4 80A13434 8FB00028 */ lw $s0, 0x0028($sp) +/* 003C0 80A13430 8FBF002C */ lw $ra, 0x002C($sp) +/* 003C4 80A13434 8FB00028 */ lw $s0, 0x0028($sp) /* 003C8 80A13438 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 003CC 80A1343C 03E00008 */ jr $ra +/* 003CC 80A1343C 03E00008 */ jr $ra /* 003D0 80A13440 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Firefly/func_80A14E28.s b/asm/non_matchings/overlays/actors/ovl_En_Firefly/func_80A14E28.s index fb3850a2fc..b00bf1885c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Firefly/func_80A14E28.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Firefly/func_80A14E28.s @@ -1,33 +1,33 @@ glabel func_80A14E28 /* 01DB8 80A14E28 27BDFFA8 */ addiu $sp, $sp, 0xFFA8 ## $sp = FFFFFFA8 -/* 01DBC 80A14E2C AFBF002C */ sw $ra, 0x002C($sp) -/* 01DC0 80A14E30 AFB00028 */ sw $s0, 0x0028($sp) -/* 01DC4 80A14E34 AFA40058 */ sw $a0, 0x0058($sp) -/* 01DC8 80A14E38 AFA5005C */ sw $a1, 0x005C($sp) +/* 01DBC 80A14E2C AFBF002C */ sw $ra, 0x002C($sp) +/* 01DC0 80A14E30 AFB00028 */ sw $s0, 0x0028($sp) +/* 01DC4 80A14E34 AFA40058 */ sw $a0, 0x0058($sp) +/* 01DC8 80A14E38 AFA5005C */ sw $a1, 0x005C($sp) /* 01DCC 80A14E3C 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 /* 01DD0 80A14E40 3C0680A1 */ lui $a2, %hi(D_80A15008) ## $a2 = 80A10000 /* 01DD4 80A14E44 24C65008 */ addiu $a2, $a2, %lo(D_80A15008) ## $a2 = 80A15008 /* 01DD8 80A14E48 27A40040 */ addiu $a0, $sp, 0x0040 ## $a0 = FFFFFFE8 /* 01DDC 80A14E4C 240706EF */ addiu $a3, $zero, 0x06EF ## $a3 = 000006EF -/* 01DE0 80A14E50 0C031AB1 */ jal func_800C6AC4 +/* 01DE0 80A14E50 0C031AB1 */ jal Graph_OpenDisps /* 01DE4 80A14E54 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 -/* 01DE8 80A14E58 8FAF005C */ lw $t7, 0x005C($sp) -/* 01DEC 80A14E5C 0C024F61 */ jal func_80093D84 +/* 01DE8 80A14E58 8FAF005C */ lw $t7, 0x005C($sp) +/* 01DEC 80A14E5C 0C024F61 */ jal func_80093D84 /* 01DF0 80A14E60 8DE40000 */ lw $a0, 0x0000($t7) ## 00000000 -/* 01DF4 80A14E64 8FA80058 */ lw $t0, 0x0058($sp) +/* 01DF4 80A14E64 8FA80058 */ lw $t0, 0x0058($sp) /* 01DF8 80A14E68 3C0780A1 */ lui $a3, %hi(func_80A14960) ## $a3 = 80A10000 /* 01DFC 80A14E6C 3C0D80A1 */ lui $t5, %hi(func_80A149B4) ## $t5 = 80A10000 /* 01E00 80A14E70 911801B9 */ lbu $t8, 0x01B9($t0) ## 000001B9 /* 01E04 80A14E74 25AD49B4 */ addiu $t5, $t5, %lo(func_80A149B4) ## $t5 = 80A149B4 /* 01E08 80A14E78 24E74960 */ addiu $a3, $a3, %lo(func_80A14960) ## $a3 = 80A14960 -/* 01E0C 80A14E7C 53000009 */ beql $t8, $zero, .L80A14EA4 +/* 01E0C 80A14E7C 53000009 */ beql $t8, $zero, .L80A14EA4 /* 01E10 80A14E80 8E0302D0 */ lw $v1, 0x02D0($s0) ## 000002D0 /* 01E14 80A14E84 8E0302D0 */ lw $v1, 0x02D0($s0) ## 000002D0 /* 01E18 80A14E88 3C09FB00 */ lui $t1, 0xFB00 ## $t1 = FB000000 /* 01E1C 80A14E8C 24790008 */ addiu $t9, $v1, 0x0008 ## $t9 = 00000008 /* 01E20 80A14E90 AE1902D0 */ sw $t9, 0x02D0($s0) ## 000002D0 /* 01E24 80A14E94 AC600004 */ sw $zero, 0x0004($v1) ## 00000004 -/* 01E28 80A14E98 10000008 */ beq $zero, $zero, .L80A14EBC +/* 01E28 80A14E98 10000008 */ beq $zero, $zero, .L80A14EBC /* 01E2C 80A14E9C AC690000 */ sw $t1, 0x0000($v1) ## 00000000 /* 01E30 80A14EA0 8E0302D0 */ lw $v1, 0x02D0($s0) ## 000002D0 .L80A14EA4: @@ -40,23 +40,23 @@ glabel func_80A14E28 .L80A14EBC: /* 01E4C 80A14EBC 8D050174 */ lw $a1, 0x0174($t0) ## 00000174 /* 01E50 80A14EC0 8D060190 */ lw $a2, 0x0190($t0) ## 00000190 -/* 01E54 80A14EC4 AFA80014 */ sw $t0, 0x0014($sp) -/* 01E58 80A14EC8 AFAD0010 */ sw $t5, 0x0010($sp) +/* 01E54 80A14EC4 AFA80014 */ sw $t0, 0x0014($sp) +/* 01E58 80A14EC8 AFAD0010 */ sw $t5, 0x0010($sp) /* 01E5C 80A14ECC 8E0E02D0 */ lw $t6, 0x02D0($s0) ## 000002D0 -/* 01E60 80A14ED0 8FA4005C */ lw $a0, 0x005C($sp) -/* 01E64 80A14ED4 0C0288A2 */ jal func_800A2288 -/* 01E68 80A14ED8 AFAE0018 */ sw $t6, 0x0018($sp) +/* 01E60 80A14ED0 8FA4005C */ lw $a0, 0x005C($sp) +/* 01E64 80A14ED4 0C0288A2 */ jal SkelAnime_Draw2 +/* 01E68 80A14ED8 AFAE0018 */ sw $t6, 0x0018($sp) /* 01E6C 80A14EDC AE0202D0 */ sw $v0, 0x02D0($s0) ## 000002D0 -/* 01E70 80A14EE0 8FAF005C */ lw $t7, 0x005C($sp) +/* 01E70 80A14EE0 8FAF005C */ lw $t7, 0x005C($sp) /* 01E74 80A14EE4 3C0680A1 */ lui $a2, %hi(D_80A1501C) ## $a2 = 80A10000 /* 01E78 80A14EE8 24C6501C */ addiu $a2, $a2, %lo(D_80A1501C) ## $a2 = 80A1501C /* 01E7C 80A14EEC 27A40040 */ addiu $a0, $sp, 0x0040 ## $a0 = FFFFFFE8 /* 01E80 80A14EF0 2407070D */ addiu $a3, $zero, 0x070D ## $a3 = 0000070D -/* 01E84 80A14EF4 0C031AD5 */ jal func_800C6B54 +/* 01E84 80A14EF4 0C031AD5 */ jal Graph_CloseDisps /* 01E88 80A14EF8 8DE50000 */ lw $a1, 0x0000($t7) ## 00000000 -/* 01E8C 80A14EFC 8FBF002C */ lw $ra, 0x002C($sp) -/* 01E90 80A14F00 8FB00028 */ lw $s0, 0x0028($sp) +/* 01E8C 80A14EFC 8FBF002C */ lw $ra, 0x002C($sp) +/* 01E90 80A14F00 8FB00028 */ lw $s0, 0x0028($sp) /* 01E94 80A14F04 27BD0058 */ addiu $sp, $sp, 0x0058 ## $sp = 00000000 -/* 01E98 80A14F08 03E00008 */ jr $ra +/* 01E98 80A14F08 03E00008 */ jr $ra /* 01E9C 80A14F0C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fish/EnFish_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Fish/EnFish_Draw.s index 901d4c8cbf..dcf7ca467f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Fish/EnFish_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Fish/EnFish_Draw.s @@ -1,26 +1,26 @@ glabel EnFish_Draw /* 01D2C 80A16FAC 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 01D30 80A16FB0 AFBF0024 */ sw $ra, 0x0024($sp) -/* 01D34 80A16FB4 AFA40028 */ sw $a0, 0x0028($sp) -/* 01D38 80A16FB8 AFA5002C */ sw $a1, 0x002C($sp) -/* 01D3C 80A16FBC 0C024F46 */ jal func_80093D18 +/* 01D30 80A16FB0 AFBF0024 */ sw $ra, 0x0024($sp) +/* 01D34 80A16FB4 AFA40028 */ sw $a0, 0x0028($sp) +/* 01D38 80A16FB8 AFA5002C */ sw $a1, 0x002C($sp) +/* 01D3C 80A16FBC 0C024F46 */ jal func_80093D18 /* 01D40 80A16FC0 8CA40000 */ lw $a0, 0x0000($a1) ## 00000000 -/* 01D44 80A16FC4 8FA20028 */ lw $v0, 0x0028($sp) -/* 01D48 80A16FC8 8FA4002C */ lw $a0, 0x002C($sp) +/* 01D44 80A16FC4 8FA20028 */ lw $v0, 0x0028($sp) +/* 01D48 80A16FC8 8FA4002C */ lw $a0, 0x002C($sp) /* 01D4C 80A16FCC 8C4501B0 */ lw $a1, 0x01B0($v0) ## 000001B0 /* 01D50 80A16FD0 8C4601CC */ lw $a2, 0x01CC($v0) ## 000001CC /* 01D54 80A16FD4 904701AE */ lbu $a3, 0x01AE($v0) ## 000001AE -/* 01D58 80A16FD8 AFA00018 */ sw $zero, 0x0018($sp) -/* 01D5C 80A16FDC AFA00014 */ sw $zero, 0x0014($sp) -/* 01D60 80A16FE0 0C0286B2 */ jal func_800A1AC8 -/* 01D64 80A16FE4 AFA00010 */ sw $zero, 0x0010($sp) -/* 01D68 80A16FE8 8FA20028 */ lw $v0, 0x0028($sp) +/* 01D58 80A16FD8 AFA00018 */ sw $zero, 0x0018($sp) +/* 01D5C 80A16FDC AFA00014 */ sw $zero, 0x0014($sp) +/* 01D60 80A16FE0 0C0286B2 */ jal SkelAnime_DrawSV +/* 01D64 80A16FE4 AFA00010 */ sw $zero, 0x0010($sp) +/* 01D68 80A16FE8 8FA20028 */ lw $v0, 0x0028($sp) /* 01D6C 80A16FEC 00002025 */ or $a0, $zero, $zero ## $a0 = 00000000 -/* 01D70 80A16FF0 0C018A29 */ jal func_800628A4 +/* 01D70 80A16FF0 0C018A29 */ jal func_800628A4 /* 01D74 80A16FF4 2445014C */ addiu $a1, $v0, 0x014C ## $a1 = 0000014C -/* 01D78 80A16FF8 8FBF0024 */ lw $ra, 0x0024($sp) +/* 01D78 80A16FF8 8FBF0024 */ lw $ra, 0x0024($sp) /* 01D7C 80A16FFC 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 01D80 80A17000 03E00008 */ jr $ra +/* 01D80 80A17000 03E00008 */ jr $ra /* 01D84 80A17004 00000000 */ nop /* 01D88 80A17008 00000000 */ nop /* 01D8C 80A1700C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fish/EnFish_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Fish/EnFish_Init.s index 3ee4c1a789..6628950a41 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Fish/EnFish_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Fish/EnFish_Init.s @@ -1,90 +1,90 @@ glabel EnFish_Init /* 001E8 80A15468 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 -/* 001EC 80A1546C AFBF002C */ sw $ra, 0x002C($sp) -/* 001F0 80A15470 AFB00028 */ sw $s0, 0x0028($sp) -/* 001F4 80A15474 AFA50044 */ sw $a1, 0x0044($sp) +/* 001EC 80A1546C AFBF002C */ sw $ra, 0x002C($sp) +/* 001F0 80A15470 AFB00028 */ sw $s0, 0x0028($sp) +/* 001F4 80A15474 AFA50044 */ sw $a1, 0x0044($sp) /* 001F8 80A15478 848E001C */ lh $t6, 0x001C($a0) ## 0000001C /* 001FC 80A1547C 3C0580A1 */ lui $a1, %hi(D_80A17070) ## $a1 = 80A10000 /* 00200 80A15480 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 00204 80A15484 24A57070 */ addiu $a1, $a1, %lo(D_80A17070) ## $a1 = 80A17070 /* 00208 80A15488 0C01E037 */ jal Actor_ProcessInitChain - -/* 0020C 80A1548C A7AE003A */ sh $t6, 0x003A($sp) + +/* 0020C 80A1548C A7AE003A */ sh $t6, 0x003A($sp) /* 00210 80A15490 3C060402 */ lui $a2, 0x0402 ## $a2 = 04020000 /* 00214 80A15494 3C070402 */ lui $a3, 0x0402 ## $a3 = 04020000 /* 00218 80A15498 260F01F0 */ addiu $t7, $s0, 0x01F0 ## $t7 = 000001F0 /* 0021C 80A1549C 2618021A */ addiu $t8, $s0, 0x021A ## $t8 = 0000021A /* 00220 80A154A0 24190007 */ addiu $t9, $zero, 0x0007 ## $t9 = 00000007 -/* 00224 80A154A4 AFB90018 */ sw $t9, 0x0018($sp) -/* 00228 80A154A8 AFB80014 */ sw $t8, 0x0014($sp) -/* 0022C 80A154AC AFAF0010 */ sw $t7, 0x0010($sp) +/* 00224 80A154A4 AFB90018 */ sw $t9, 0x0018($sp) +/* 00228 80A154A8 AFB80014 */ sw $t8, 0x0014($sp) +/* 0022C 80A154AC AFAF0010 */ sw $t7, 0x0010($sp) /* 00230 80A154B0 24E7909C */ addiu $a3, $a3, 0x909C ## $a3 = 0401909C /* 00234 80A154B4 24C68FE0 */ addiu $a2, $a2, 0x8FE0 ## $a2 = 04018FE0 -/* 00238 80A154B8 8FA40044 */ lw $a0, 0x0044($sp) -/* 0023C 80A154BC 0C0291BE */ jal func_800A46F8 +/* 00238 80A154B8 8FA40044 */ lw $a0, 0x0044($sp) +/* 0023C 80A154BC 0C0291BE */ jal SkelAnime_InitSV /* 00240 80A154C0 260501AC */ addiu $a1, $s0, 0x01AC ## $a1 = 000001AC /* 00244 80A154C4 2605014C */ addiu $a1, $s0, 0x014C ## $a1 = 0000014C -/* 00248 80A154C8 AFA50034 */ sw $a1, 0x0034($sp) -/* 0024C 80A154CC 0C016EFE */ jal func_8005BBF8 -/* 00250 80A154D0 8FA40044 */ lw $a0, 0x0044($sp) +/* 00248 80A154C8 AFA50034 */ sw $a1, 0x0034($sp) +/* 0024C 80A154CC 0C016EFE */ jal func_8005BBF8 +/* 00250 80A154D0 8FA40044 */ lw $a0, 0x0044($sp) /* 00254 80A154D4 3C0780A1 */ lui $a3, %hi(D_80A17040) ## $a3 = 80A10000 /* 00258 80A154D8 2608016C */ addiu $t0, $s0, 0x016C ## $t0 = 0000016C -/* 0025C 80A154DC 8FA50034 */ lw $a1, 0x0034($sp) -/* 00260 80A154E0 AFA80010 */ sw $t0, 0x0010($sp) +/* 0025C 80A154DC 8FA50034 */ lw $a1, 0x0034($sp) +/* 00260 80A154E0 AFA80010 */ sw $t0, 0x0010($sp) /* 00264 80A154E4 24E77040 */ addiu $a3, $a3, %lo(D_80A17040) ## $a3 = 80A17040 -/* 00268 80A154E8 8FA40044 */ lw $a0, 0x0044($sp) -/* 0026C 80A154EC 0C017014 */ jal func_8005C050 +/* 00268 80A154E8 8FA40044 */ lw $a0, 0x0044($sp) +/* 0026C 80A154EC 0C017014 */ jal func_8005C050 /* 00270 80A154F0 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 00274 80A154F4 24090032 */ addiu $t1, $zero, 0x0032 ## $t1 = 00000032 /* 00278 80A154F8 0C03F66B */ jal Math_Rand_ZeroOne ## Rand.Next() float /* 0027C 80A154FC A20900AE */ sb $t1, 0x00AE($s0) ## 000000AE /* 00280 80A15500 3C0180A1 */ lui $at, %hi(D_80A17194) ## $at = 80A10000 -/* 00284 80A15504 C4247194 */ lwc1 $f4, %lo(D_80A17194)($at) -/* 00288 80A15508 46040182 */ mul.s $f6, $f0, $f4 -/* 0028C 80A1550C 4600320D */ trunc.w.s $f8, $f6 -/* 00290 80A15510 440B4000 */ mfc1 $t3, $f8 +/* 00284 80A15504 C4247194 */ lwc1 $f4, %lo(D_80A17194)($at) +/* 00288 80A15508 46040182 */ mul.s $f6, $f0, $f4 +/* 0028C 80A1550C 4600320D */ trunc.w.s $f8, $f6 +/* 00290 80A15510 440B4000 */ mfc1 $t3, $f8 /* 00294 80A15514 0C03F66B */ jal Math_Rand_ZeroOne ## Rand.Next() float /* 00298 80A15518 A60B024C */ sh $t3, 0x024C($s0) ## 0000024C /* 0029C 80A1551C 3C0180A1 */ lui $at, %hi(D_80A17198) ## $at = 80A10000 -/* 002A0 80A15520 C42A7198 */ lwc1 $f10, %lo(D_80A17198)($at) -/* 002A4 80A15524 87A2003A */ lh $v0, 0x003A($sp) +/* 002A0 80A15520 C42A7198 */ lwc1 $f10, %lo(D_80A17198)($at) +/* 002A4 80A15524 87A2003A */ lh $v0, 0x003A($sp) /* 002A8 80A15528 260400B4 */ addiu $a0, $s0, 0x00B4 ## $a0 = 000000B4 -/* 002AC 80A1552C 460A0402 */ mul.s $f16, $f0, $f10 +/* 002AC 80A1552C 460A0402 */ mul.s $f16, $f0, $f10 /* 002B0 80A15530 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 /* 002B4 80A15534 3C068003 */ lui $a2, 0x8003 ## $a2 = 80030000 /* 002B8 80A15538 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 002BC 80A1553C 4600848D */ trunc.w.s $f18, $f16 -/* 002C0 80A15540 440D9000 */ mfc1 $t5, $f18 -/* 002C4 80A15544 1440000B */ bne $v0, $zero, .L80A15574 +/* 002BC 80A1553C 4600848D */ trunc.w.s $f18, $f16 +/* 002C0 80A15540 440D9000 */ mfc1 $t5, $f18 +/* 002C4 80A15544 1440000B */ bne $v0, $zero, .L80A15574 /* 002C8 80A15548 A60D024E */ sh $t5, 0x024E($s0) ## 0000024E /* 002CC 80A1554C 8E0E0004 */ lw $t6, 0x0004($s0) ## 00000004 /* 002D0 80A15550 24C6B5EC */ addiu $a2, $a2, 0xB5EC ## $a2 = 8002B5EC /* 002D4 80A15554 3C074100 */ lui $a3, 0x4100 ## $a3 = 41000000 /* 002D8 80A15558 35CF0010 */ ori $t7, $t6, 0x0010 ## $t7 = 00000010 /* 002DC 80A1555C 0C00AC78 */ jal ActorShape_Init - + /* 002E0 80A15560 AE0F0004 */ sw $t7, 0x0004($s0) ## 00000004 -/* 002E4 80A15564 0C2857C9 */ jal func_80A15F24 +/* 002E4 80A15564 0C2857C9 */ jal func_80A15F24 /* 002E8 80A15568 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 002EC 80A1556C 1000000A */ beq $zero, $zero, .L80A15598 -/* 002F0 80A15570 8FBF002C */ lw $ra, 0x002C($sp) +/* 002EC 80A1556C 1000000A */ beq $zero, $zero, .L80A15598 +/* 002F0 80A15570 8FBF002C */ lw $ra, 0x002C($sp) .L80A15574: -/* 002F4 80A15574 14410005 */ bne $v0, $at, .L80A1558C +/* 002F4 80A15574 14410005 */ bne $v0, $at, .L80A1558C /* 002F8 80A15578 00000000 */ nop -/* 002FC 80A1557C 0C285986 */ jal func_80A16618 +/* 002FC 80A1557C 0C285986 */ jal func_80A16618 /* 00300 80A15580 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00304 80A15584 10000004 */ beq $zero, $zero, .L80A15598 -/* 00308 80A15588 8FBF002C */ lw $ra, 0x002C($sp) +/* 00304 80A15584 10000004 */ beq $zero, $zero, .L80A15598 +/* 00308 80A15588 8FBF002C */ lw $ra, 0x002C($sp) .L80A1558C: -/* 0030C 80A1558C 0C2855E9 */ jal func_80A157A4 +/* 0030C 80A1558C 0C2855E9 */ jal func_80A157A4 /* 00310 80A15590 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00314 80A15594 8FBF002C */ lw $ra, 0x002C($sp) +/* 00314 80A15594 8FBF002C */ lw $ra, 0x002C($sp) .L80A15598: -/* 00318 80A15598 8FB00028 */ lw $s0, 0x0028($sp) +/* 00318 80A15598 8FB00028 */ lw $s0, 0x0028($sp) /* 0031C 80A1559C 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 -/* 00320 80A155A0 03E00008 */ jr $ra +/* 00320 80A155A0 03E00008 */ jr $ra /* 00324 80A155A4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fish/func_80A152AC.s b/asm/non_matchings/overlays/actors/ovl_En_Fish/func_80A152AC.s index d99b04a627..b956e0d83c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Fish/func_80A152AC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Fish/func_80A152AC.s @@ -1,30 +1,30 @@ glabel func_80A152AC /* 0002C 80A152AC 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 00030 80A152B0 AFA40028 */ sw $a0, 0x0028($sp) -/* 00034 80A152B4 AFBF0024 */ sw $ra, 0x0024($sp) +/* 00030 80A152B0 AFA40028 */ sw $a0, 0x0028($sp) +/* 00034 80A152B4 AFBF0024 */ sw $ra, 0x0024($sp) /* 00038 80A152B8 3C040402 */ lui $a0, 0x0402 ## $a0 = 04020000 /* 0003C 80A152BC 0C028800 */ jal SkelAnime_GetFrameCount - + /* 00040 80A152C0 2484909C */ addiu $a0, $a0, 0x909C ## $a0 = 0401909C /* 00044 80A152C4 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 00048 80A152C8 3C014000 */ lui $at, 0x4000 ## $at = 40000000 /* 0004C 80A152CC 44814000 */ mtc1 $at, $f8 ## $f8 = 2.00 -/* 00050 80A152D0 468021A0 */ cvt.s.w $f6, $f4 -/* 00054 80A152D4 8FA40028 */ lw $a0, 0x0028($sp) +/* 00050 80A152D0 468021A0 */ cvt.s.w $f6, $f4 +/* 00054 80A152D4 8FA40028 */ lw $a0, 0x0028($sp) /* 00058 80A152D8 3C050402 */ lui $a1, 0x0402 ## $a1 = 04020000 /* 0005C 80A152DC 240E0001 */ addiu $t6, $zero, 0x0001 ## $t6 = 00000001 -/* 00060 80A152E0 AFAE0014 */ sw $t6, 0x0014($sp) +/* 00060 80A152E0 AFAE0014 */ sw $t6, 0x0014($sp) /* 00064 80A152E4 24A5909C */ addiu $a1, $a1, 0x909C ## $a1 = 0401909C -/* 00068 80A152E8 E7A60010 */ swc1 $f6, 0x0010($sp) +/* 00068 80A152E8 E7A60010 */ swc1 $f6, 0x0010($sp) /* 0006C 80A152EC 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 00070 80A152F0 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 00074 80A152F4 E7A80018 */ swc1 $f8, 0x0018($sp) -/* 00078 80A152F8 0C029468 */ jal SkelAnime_ChangeAnimation - +/* 00074 80A152F4 E7A80018 */ swc1 $f8, 0x0018($sp) +/* 00078 80A152F8 0C029468 */ jal SkelAnime_ChangeAnim + /* 0007C 80A152FC 248401AC */ addiu $a0, $a0, 0x01AC ## $a0 = 000001AC -/* 00080 80A15300 8FBF0024 */ lw $ra, 0x0024($sp) +/* 00080 80A15300 8FBF0024 */ lw $ra, 0x0024($sp) /* 00084 80A15304 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 00088 80A15308 03E00008 */ jr $ra +/* 00088 80A15308 03E00008 */ jr $ra /* 0008C 80A1530C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fish/func_80A15310.s b/asm/non_matchings/overlays/actors/ovl_En_Fish/func_80A15310.s index 3a13994831..d6cea708b1 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Fish/func_80A15310.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Fish/func_80A15310.s @@ -1,30 +1,30 @@ glabel func_80A15310 /* 00090 80A15310 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 00094 80A15314 AFA40028 */ sw $a0, 0x0028($sp) -/* 00098 80A15318 AFBF0024 */ sw $ra, 0x0024($sp) +/* 00094 80A15314 AFA40028 */ sw $a0, 0x0028($sp) +/* 00098 80A15318 AFBF0024 */ sw $ra, 0x0024($sp) /* 0009C 80A1531C 3C040402 */ lui $a0, 0x0402 ## $a0 = 04020000 /* 000A0 80A15320 0C028800 */ jal SkelAnime_GetFrameCount - + /* 000A4 80A15324 248485FC */ addiu $a0, $a0, 0x85FC ## $a0 = 040185FC /* 000A8 80A15328 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 000AC 80A1532C 3C014000 */ lui $at, 0x4000 ## $at = 40000000 /* 000B0 80A15330 44814000 */ mtc1 $at, $f8 ## $f8 = 2.00 -/* 000B4 80A15334 468021A0 */ cvt.s.w $f6, $f4 -/* 000B8 80A15338 8FA40028 */ lw $a0, 0x0028($sp) +/* 000B4 80A15334 468021A0 */ cvt.s.w $f6, $f4 +/* 000B8 80A15338 8FA40028 */ lw $a0, 0x0028($sp) /* 000BC 80A1533C 3C050402 */ lui $a1, 0x0402 ## $a1 = 04020000 /* 000C0 80A15340 240E0001 */ addiu $t6, $zero, 0x0001 ## $t6 = 00000001 -/* 000C4 80A15344 AFAE0014 */ sw $t6, 0x0014($sp) +/* 000C4 80A15344 AFAE0014 */ sw $t6, 0x0014($sp) /* 000C8 80A15348 24A585FC */ addiu $a1, $a1, 0x85FC ## $a1 = 040185FC -/* 000CC 80A1534C E7A60010 */ swc1 $f6, 0x0010($sp) +/* 000CC 80A1534C E7A60010 */ swc1 $f6, 0x0010($sp) /* 000D0 80A15350 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 000D4 80A15354 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 000D8 80A15358 E7A80018 */ swc1 $f8, 0x0018($sp) -/* 000DC 80A1535C 0C029468 */ jal SkelAnime_ChangeAnimation - +/* 000D8 80A15358 E7A80018 */ swc1 $f8, 0x0018($sp) +/* 000DC 80A1535C 0C029468 */ jal SkelAnime_ChangeAnim + /* 000E0 80A15360 248401AC */ addiu $a0, $a0, 0x01AC ## $a0 = 000001AC -/* 000E4 80A15364 8FBF0024 */ lw $ra, 0x0024($sp) +/* 000E4 80A15364 8FBF0024 */ lw $ra, 0x0024($sp) /* 000E8 80A15368 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 000EC 80A1536C 03E00008 */ jr $ra +/* 000EC 80A1536C 03E00008 */ jr $ra /* 000F0 80A15370 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Floormas/EnFloormas_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Floormas/EnFloormas_Draw.s index eb25b0f8fe..4378a440bd 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Floormas/EnFloormas_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Floormas/EnFloormas_Draw.s @@ -1,68 +1,68 @@ glabel EnFloormas_Draw /* 02D44 80A1A254 27BDFFB0 */ addiu $sp, $sp, 0xFFB0 ## $sp = FFFFFFB0 -/* 02D48 80A1A258 AFB10028 */ sw $s1, 0x0028($sp) +/* 02D48 80A1A258 AFB10028 */ sw $s1, 0x0028($sp) /* 02D4C 80A1A25C 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 -/* 02D50 80A1A260 AFBF002C */ sw $ra, 0x002C($sp) -/* 02D54 80A1A264 AFB00024 */ sw $s0, 0x0024($sp) +/* 02D50 80A1A260 AFBF002C */ sw $ra, 0x002C($sp) +/* 02D54 80A1A264 AFB00024 */ sw $s0, 0x0024($sp) /* 02D58 80A1A268 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 /* 02D5C 80A1A26C 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 02D60 80A1A270 3C0680A2 */ lui $a2, %hi(D_80A1A514) ## $a2 = 80A20000 /* 02D64 80A1A274 24C6A514 */ addiu $a2, $a2, %lo(D_80A1A514) ## $a2 = 80A1A514 /* 02D68 80A1A278 27A40038 */ addiu $a0, $sp, 0x0038 ## $a0 = FFFFFFE8 /* 02D6C 80A1A27C 2407090E */ addiu $a3, $zero, 0x090E ## $a3 = 0000090E -/* 02D70 80A1A280 0C031AB1 */ jal func_800C6AC4 -/* 02D74 80A1A284 AFA50048 */ sw $a1, 0x0048($sp) -/* 02D78 80A1A288 0C024F46 */ jal func_80093D18 +/* 02D70 80A1A280 0C031AB1 */ jal Graph_OpenDisps +/* 02D74 80A1A284 AFA50048 */ sw $a1, 0x0048($sp) +/* 02D78 80A1A288 0C024F46 */ jal func_80093D18 /* 02D7C 80A1A28C 8E240000 */ lw $a0, 0x0000($s1) ## 00000000 /* 02D80 80A1A290 920E02DC */ lbu $t6, 0x02DC($s0) ## 000002DC /* 02D84 80A1A294 2401000C */ addiu $at, $zero, 0x000C ## $at = 0000000C /* 02D88 80A1A298 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 02D8C 80A1A29C 15C1000A */ bne $t6, $at, .L80A1A2C8 +/* 02D8C 80A1A29C 15C1000A */ bne $t6, $at, .L80A1A2C8 /* 02D90 80A1A2A0 3C0580A2 */ lui $a1, %hi(D_80A1A4F4) ## $a1 = 80A20000 /* 02D94 80A1A2A4 86060196 */ lh $a2, 0x0196($s0) ## 00000196 /* 02D98 80A1A2A8 24010028 */ addiu $at, $zero, 0x0028 ## $at = 00000028 /* 02D9C 80A1A2AC 24A5A4F4 */ addiu $a1, $a1, %lo(D_80A1A4F4) ## $a1 = 80A1A4F4 -/* 02DA0 80A1A2B0 00C1001A */ div $zero, $a2, $at -/* 02DA4 80A1A2B4 00003010 */ mfhi $a2 -/* 02DA8 80A1A2B8 00063400 */ sll $a2, $a2, 16 -/* 02DAC 80A1A2BC 00063403 */ sra $a2, $a2, 16 -/* 02DB0 80A1A2C0 0C00988C */ jal func_80026230 +/* 02DA0 80A1A2B0 00C1001A */ div $zero, $a2, $at +/* 02DA4 80A1A2B4 00003010 */ mfhi $a2 +/* 02DA8 80A1A2B8 00063400 */ sll $a2, $a2, 16 +/* 02DAC 80A1A2BC 00063403 */ sra $a2, $a2, 16 +/* 02DB0 80A1A2C0 0C00988C */ jal func_80026230 /* 02DB4 80A1A2C4 24070028 */ addiu $a3, $zero, 0x0028 ## $a3 = 00000028 .L80A1A2C8: /* 02DB8 80A1A2C8 8E050150 */ lw $a1, 0x0150($s0) ## 00000150 /* 02DBC 80A1A2CC 8E06016C */ lw $a2, 0x016C($s0) ## 0000016C /* 02DC0 80A1A2D0 9207014E */ lbu $a3, 0x014E($s0) ## 0000014E -/* 02DC4 80A1A2D4 8FB90048 */ lw $t9, 0x0048($sp) +/* 02DC4 80A1A2D4 8FB90048 */ lw $t9, 0x0048($sp) /* 02DC8 80A1A2D8 3C0F80A2 */ lui $t7, %hi(func_80A1A128) ## $t7 = 80A20000 /* 02DCC 80A1A2DC 3C1880A2 */ lui $t8, %hi(func_80A1A160) ## $t8 = 80A20000 /* 02DD0 80A1A2E0 2718A160 */ addiu $t8, $t8, %lo(func_80A1A160) ## $t8 = 80A1A160 /* 02DD4 80A1A2E4 25EFA128 */ addiu $t7, $t7, %lo(func_80A1A128) ## $t7 = 80A1A128 -/* 02DD8 80A1A2E8 AFAF0010 */ sw $t7, 0x0010($sp) -/* 02DDC 80A1A2EC AFB80014 */ sw $t8, 0x0014($sp) -/* 02DE0 80A1A2F0 AFB00018 */ sw $s0, 0x0018($sp) +/* 02DD8 80A1A2E8 AFAF0010 */ sw $t7, 0x0010($sp) +/* 02DDC 80A1A2EC AFB80014 */ sw $t8, 0x0014($sp) +/* 02DE0 80A1A2F0 AFB00018 */ sw $s0, 0x0018($sp) /* 02DE4 80A1A2F4 8F2802C0 */ lw $t0, 0x02C0($t9) ## 000002C0 /* 02DE8 80A1A2F8 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 02DEC 80A1A2FC 0C0289CF */ jal func_800A273C -/* 02DF0 80A1A300 AFA8001C */ sw $t0, 0x001C($sp) -/* 02DF4 80A1A304 8FA90048 */ lw $t1, 0x0048($sp) +/* 02DEC 80A1A2FC 0C0289CF */ jal SkelAnime_DrawSV2 +/* 02DF0 80A1A300 AFA8001C */ sw $t0, 0x001C($sp) +/* 02DF4 80A1A304 8FA90048 */ lw $t1, 0x0048($sp) /* 02DF8 80A1A308 2401000C */ addiu $at, $zero, 0x000C ## $at = 0000000C /* 02DFC 80A1A30C AD2202C0 */ sw $v0, 0x02C0($t1) ## 000002C0 /* 02E00 80A1A310 920A02DC */ lbu $t2, 0x02DC($s0) ## 000002DC -/* 02E04 80A1A314 15410003 */ bne $t2, $at, .L80A1A324 +/* 02E04 80A1A314 15410003 */ bne $t2, $at, .L80A1A324 /* 02E08 80A1A318 00000000 */ nop -/* 02E0C 80A1A31C 0C009982 */ jal func_80026608 +/* 02E0C 80A1A31C 0C009982 */ jal func_80026608 /* 02E10 80A1A320 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 .L80A1A324: /* 02E14 80A1A324 3C0680A2 */ lui $a2, %hi(D_80A1A528) ## $a2 = 80A20000 /* 02E18 80A1A328 24C6A528 */ addiu $a2, $a2, %lo(D_80A1A528) ## $a2 = 80A1A528 /* 02E1C 80A1A32C 27A40038 */ addiu $a0, $sp, 0x0038 ## $a0 = FFFFFFE8 /* 02E20 80A1A330 8E250000 */ lw $a1, 0x0000($s1) ## 00000000 -/* 02E24 80A1A334 0C031AD5 */ jal func_800C6B54 +/* 02E24 80A1A334 0C031AD5 */ jal Graph_CloseDisps /* 02E28 80A1A338 24070924 */ addiu $a3, $zero, 0x0924 ## $a3 = 00000924 -/* 02E2C 80A1A33C 8FBF002C */ lw $ra, 0x002C($sp) -/* 02E30 80A1A340 8FB00024 */ lw $s0, 0x0024($sp) -/* 02E34 80A1A344 8FB10028 */ lw $s1, 0x0028($sp) -/* 02E38 80A1A348 03E00008 */ jr $ra +/* 02E2C 80A1A33C 8FBF002C */ lw $ra, 0x002C($sp) +/* 02E30 80A1A340 8FB00024 */ lw $s0, 0x0024($sp) +/* 02E34 80A1A344 8FB10028 */ lw $s1, 0x0028($sp) +/* 02E38 80A1A348 03E00008 */ jr $ra /* 02E3C 80A1A34C 27BD0050 */ addiu $sp, $sp, 0x0050 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Floormas/EnFloormas_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Floormas/EnFloormas_Init.s index bcc83e12b2..a6fb262a8e 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Floormas/EnFloormas_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Floormas/EnFloormas_Init.s @@ -1,58 +1,58 @@ glabel EnFloormas_Init /* 00000 80A17510 27BDFFB0 */ addiu $sp, $sp, 0xFFB0 ## $sp = FFFFFFB0 -/* 00004 80A17514 AFB10030 */ sw $s1, 0x0030($sp) +/* 00004 80A17514 AFB10030 */ sw $s1, 0x0030($sp) /* 00008 80A17518 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 -/* 0000C 80A1751C AFBF0034 */ sw $ra, 0x0034($sp) -/* 00010 80A17520 AFB0002C */ sw $s0, 0x002C($sp) +/* 0000C 80A1751C AFBF0034 */ sw $ra, 0x0034($sp) +/* 00010 80A17520 AFB0002C */ sw $s0, 0x002C($sp) /* 00014 80A17524 3C0580A2 */ lui $a1, %hi(D_80A1A4C4) ## $a1 = 80A20000 /* 00018 80A17528 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 0001C 80A1752C 0C01E037 */ jal Actor_ProcessInitChain - + /* 00020 80A17530 24A5A4C4 */ addiu $a1, $a1, %lo(D_80A1A4C4) ## $a1 = 80A1A4C4 /* 00024 80A17534 3C068003 */ lui $a2, 0x8003 ## $a2 = 80030000 /* 00028 80A17538 24C6B5EC */ addiu $a2, $a2, 0xB5EC ## $a2 = 8002B5EC /* 0002C 80A1753C 260400B4 */ addiu $a0, $s0, 0x00B4 ## $a0 = 000000B4 /* 00030 80A17540 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 /* 00034 80A17544 0C00AC78 */ jal ActorShape_Init - + /* 00038 80A17548 3C074248 */ lui $a3, 0x4248 ## $a3 = 42480000 /* 0003C 80A1754C 3C060601 */ lui $a2, 0x0601 ## $a2 = 06010000 /* 00040 80A17550 3C070601 */ lui $a3, 0x0601 ## $a3 = 06010000 /* 00044 80A17554 260E019C */ addiu $t6, $s0, 0x019C ## $t6 = 0000019C /* 00048 80A17558 260F0232 */ addiu $t7, $s0, 0x0232 ## $t7 = 00000232 /* 0004C 80A1755C 24180019 */ addiu $t8, $zero, 0x0019 ## $t8 = 00000019 -/* 00050 80A17560 AFB80018 */ sw $t8, 0x0018($sp) -/* 00054 80A17564 AFAF0014 */ sw $t7, 0x0014($sp) -/* 00058 80A17568 AFAE0010 */ sw $t6, 0x0010($sp) +/* 00050 80A17560 AFB80018 */ sw $t8, 0x0018($sp) +/* 00054 80A17564 AFAF0014 */ sw $t7, 0x0014($sp) +/* 00058 80A17568 AFAE0010 */ sw $t6, 0x0010($sp) /* 0005C 80A1756C 24E79DB0 */ addiu $a3, $a3, 0x9DB0 ## $a3 = 06009DB0 /* 00060 80A17570 24C68FB0 */ addiu $a2, $a2, 0x8FB0 ## $a2 = 06008FB0 /* 00064 80A17574 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 00068 80A17578 0C0291BE */ jal func_800A46F8 +/* 00068 80A17578 0C0291BE */ jal SkelAnime_InitSV /* 0006C 80A1757C 2605014C */ addiu $a1, $s0, 0x014C ## $a1 = 0000014C /* 00070 80A17580 260502C8 */ addiu $a1, $s0, 0x02C8 ## $a1 = 000002C8 -/* 00074 80A17584 AFA5003C */ sw $a1, 0x003C($sp) +/* 00074 80A17584 AFA5003C */ sw $a1, 0x003C($sp) /* 00078 80A17588 0C0170D9 */ jal ActorCollider_AllocCylinder - + /* 0007C 80A1758C 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 00080 80A17590 3C0780A2 */ lui $a3, %hi(D_80A1A470) ## $a3 = 80A20000 -/* 00084 80A17594 8FA5003C */ lw $a1, 0x003C($sp) +/* 00084 80A17594 8FA5003C */ lw $a1, 0x003C($sp) /* 00088 80A17598 24E7A470 */ addiu $a3, $a3, %lo(D_80A1A470) ## $a3 = 80A1A470 /* 0008C 80A1759C 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 00090 80A175A0 0C01712B */ jal ActorCollider_InitCylinder - + /* 00094 80A175A4 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 00098 80A175A8 3C0580A2 */ lui $a1, %hi(D_80A1A4A4) ## $a1 = 80A20000 /* 0009C 80A175AC 3C0680A2 */ lui $a2, %hi(D_80A1A49C) ## $a2 = 80A20000 /* 000A0 80A175B0 24C6A49C */ addiu $a2, $a2, %lo(D_80A1A49C) ## $a2 = 80A1A49C /* 000A4 80A175B4 24A5A4A4 */ addiu $a1, $a1, %lo(D_80A1A4A4) ## $a1 = 80A1A4A4 -/* 000A8 80A175B8 0C0187B5 */ jal func_80061ED4 +/* 000A8 80A175B8 0C0187B5 */ jal func_80061ED4 /* 000AC 80A175BC 26040098 */ addiu $a0, $s0, 0x0098 ## $a0 = 00000098 /* 000B0 80A175C0 8602001C */ lh $v0, 0x001C($s0) ## 0000001C /* 000B4 80A175C4 2419F9C0 */ addiu $t9, $zero, 0xF9C0 ## $t9 = FFFFF9C0 /* 000B8 80A175C8 A6190198 */ sh $t9, 0x0198($s0) ## 00000198 /* 000BC 80A175CC 30438000 */ andi $v1, $v0, 0x8000 ## $v1 = 00000000 /* 000C0 80A175D0 30497FFF */ andi $t1, $v0, 0x7FFF ## $t1 = 00000000 -/* 000C4 80A175D4 10600007 */ beq $v1, $zero, .L80A175F4 +/* 000C4 80A175D4 10600007 */ beq $v1, $zero, .L80A175F4 /* 000C8 80A175D8 A609001C */ sh $t1, 0x001C($s0) ## 0000001C /* 000CC 80A175DC 8E0A0004 */ lw $t2, 0x0004($s0) ## 00000004 /* 000D0 80A175E0 3C0C80A2 */ lui $t4, %hi(func_80A1A350) ## $t4 = 80A20000 @@ -64,68 +64,68 @@ glabel EnFloormas_Init /* 000E4 80A175F4 860D001C */ lh $t5, 0x001C($s0) ## 0000001C /* 000E8 80A175F8 24010010 */ addiu $at, $zero, 0x0010 ## $at = 00000010 /* 000EC 80A175FC 26241C24 */ addiu $a0, $s1, 0x1C24 ## $a0 = 00001C24 -/* 000F0 80A17600 15A1000A */ bne $t5, $at, .L80A1762C +/* 000F0 80A17600 15A1000A */ bne $t5, $at, .L80A1762C /* 000F4 80A17604 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 /* 000F8 80A17608 8E0E0004 */ lw $t6, 0x0004($s0) ## 00000004 /* 000FC 80A1760C 2401FFFE */ addiu $at, $zero, 0xFFFE ## $at = FFFFFFFE /* 00100 80A17610 3C1880A2 */ lui $t8, %hi(func_80A19B9C) ## $t8 = 80A20000 /* 00104 80A17614 27189B9C */ addiu $t8, $t8, %lo(func_80A19B9C) ## $t8 = 80A19B9C -/* 00108 80A17618 01C17824 */ and $t7, $t6, $at +/* 00108 80A17618 01C17824 */ and $t7, $t6, $at /* 0010C 80A1761C AE000134 */ sw $zero, 0x0134($s0) ## 00000134 /* 00110 80A17620 AE0F0004 */ sw $t7, 0x0004($s0) ## 00000004 -/* 00114 80A17624 10000039 */ beq $zero, $zero, .L80A1770C +/* 00114 80A17624 10000039 */ beq $zero, $zero, .L80A1770C /* 00118 80A17628 AE180190 */ sw $t8, 0x0190($s0) ## 00000190 .L80A1762C: /* 0011C 80A1762C C6040028 */ lwc1 $f4, 0x0028($s0) ## 00000028 /* 00120 80A17630 8E070024 */ lw $a3, 0x0024($s0) ## 00000024 /* 00124 80A17634 24680010 */ addiu $t0, $v1, 0x0010 ## $t0 = 00000010 -/* 00128 80A17638 E7A40010 */ swc1 $f4, 0x0010($sp) +/* 00128 80A17638 E7A40010 */ swc1 $f4, 0x0010($sp) /* 0012C 80A1763C C606002C */ lwc1 $f6, 0x002C($s0) ## 0000002C -/* 00130 80A17640 00084400 */ sll $t0, $t0, 16 -/* 00134 80A17644 00084403 */ sra $t0, $t0, 16 -/* 00138 80A17648 AFA80024 */ sw $t0, 0x0024($sp) -/* 0013C 80A1764C AFA8003C */ sw $t0, 0x003C($sp) -/* 00140 80A17650 AFA40038 */ sw $a0, 0x0038($sp) -/* 00144 80A17654 AFA00020 */ sw $zero, 0x0020($sp) -/* 00148 80A17658 AFA0001C */ sw $zero, 0x001C($sp) -/* 0014C 80A1765C AFA00018 */ sw $zero, 0x0018($sp) +/* 00130 80A17640 00084400 */ sll $t0, $t0, 16 +/* 00134 80A17644 00084403 */ sra $t0, $t0, 16 +/* 00138 80A17648 AFA80024 */ sw $t0, 0x0024($sp) +/* 0013C 80A1764C AFA8003C */ sw $t0, 0x003C($sp) +/* 00140 80A17650 AFA40038 */ sw $a0, 0x0038($sp) +/* 00144 80A17654 AFA00020 */ sw $zero, 0x0020($sp) +/* 00148 80A17658 AFA0001C */ sw $zero, 0x001C($sp) +/* 0014C 80A1765C AFA00018 */ sw $zero, 0x0018($sp) /* 00150 80A17660 2406008E */ addiu $a2, $zero, 0x008E ## $a2 = 0000008E /* 00154 80A17664 0C00C7D4 */ jal Actor_Spawn ## ActorSpawn -/* 00158 80A17668 E7A60014 */ swc1 $f6, 0x0014($sp) -/* 0015C 80A1766C 8FA40038 */ lw $a0, 0x0038($sp) -/* 00160 80A17670 8FA8003C */ lw $t0, 0x003C($sp) -/* 00164 80A17674 14400005 */ bne $v0, $zero, .L80A1768C +/* 00158 80A17668 E7A60014 */ swc1 $f6, 0x0014($sp) +/* 0015C 80A1766C 8FA40038 */ lw $a0, 0x0038($sp) +/* 00160 80A17670 8FA8003C */ lw $t0, 0x003C($sp) +/* 00164 80A17674 14400005 */ bne $v0, $zero, .L80A1768C /* 00168 80A17678 AE020118 */ sw $v0, 0x0118($s0) ## 00000118 /* 0016C 80A1767C 0C00B55C */ jal Actor_Kill - + /* 00170 80A17680 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00174 80A17684 10000022 */ beq $zero, $zero, .L80A17710 -/* 00178 80A17688 8FBF0034 */ lw $ra, 0x0034($sp) +/* 00174 80A17684 10000022 */ beq $zero, $zero, .L80A17710 +/* 00178 80A17688 8FBF0034 */ lw $ra, 0x0034($sp) .L80A1768C: /* 0017C 80A1768C C6080028 */ lwc1 $f8, 0x0028($s0) ## 00000028 /* 00180 80A17690 8E070024 */ lw $a3, 0x0024($s0) ## 00000024 /* 00184 80A17694 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 00188 80A17698 E7A80010 */ swc1 $f8, 0x0010($sp) +/* 00188 80A17698 E7A80010 */ swc1 $f8, 0x0010($sp) /* 0018C 80A1769C C60A002C */ lwc1 $f10, 0x002C($s0) ## 0000002C -/* 00190 80A176A0 AFA80024 */ sw $t0, 0x0024($sp) -/* 00194 80A176A4 AFA00020 */ sw $zero, 0x0020($sp) -/* 00198 80A176A8 AFA0001C */ sw $zero, 0x001C($sp) -/* 0019C 80A176AC AFA00018 */ sw $zero, 0x0018($sp) +/* 00190 80A176A0 AFA80024 */ sw $t0, 0x0024($sp) +/* 00194 80A176A4 AFA00020 */ sw $zero, 0x0020($sp) +/* 00198 80A176A8 AFA0001C */ sw $zero, 0x001C($sp) +/* 0019C 80A176AC AFA00018 */ sw $zero, 0x0018($sp) /* 001A0 80A176B0 2406008E */ addiu $a2, $zero, 0x008E ## $a2 = 0000008E /* 001A4 80A176B4 0C00C7D4 */ jal Actor_Spawn ## ActorSpawn -/* 001A8 80A176B8 E7AA0014 */ swc1 $f10, 0x0014($sp) -/* 001AC 80A176BC 14400007 */ bne $v0, $zero, .L80A176DC +/* 001A8 80A176B8 E7AA0014 */ swc1 $f10, 0x0014($sp) +/* 001AC 80A176BC 14400007 */ bne $v0, $zero, .L80A176DC /* 001B0 80A176C0 AE02011C */ sw $v0, 0x011C($s0) ## 0000011C /* 001B4 80A176C4 0C00B55C */ jal Actor_Kill - + /* 001B8 80A176C8 8E040118 */ lw $a0, 0x0118($s0) ## 00000118 /* 001BC 80A176CC 0C00B55C */ jal Actor_Kill - + /* 001C0 80A176D0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 001C4 80A176D4 1000000E */ beq $zero, $zero, .L80A17710 -/* 001C8 80A176D8 8FBF0034 */ lw $ra, 0x0034($sp) +/* 001C4 80A176D4 1000000E */ beq $zero, $zero, .L80A17710 +/* 001C8 80A176D8 8FBF0034 */ lw $ra, 0x0034($sp) .L80A176DC: /* 001CC 80A176DC 8E190118 */ lw $t9, 0x0118($s0) ## 00000118 /* 001D0 80A176E0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 @@ -137,14 +137,14 @@ glabel EnFloormas_Init /* 001E8 80A176F8 AD700118 */ sw $s0, 0x0118($t3) ## 00000118 /* 001EC 80A176FC 8E0D011C */ lw $t5, 0x011C($s0) ## 0000011C /* 001F0 80A17700 8E0C0118 */ lw $t4, 0x0118($s0) ## 00000118 -/* 001F4 80A17704 0C285DE0 */ jal func_80A17780 +/* 001F4 80A17704 0C285DE0 */ jal func_80A17780 /* 001F8 80A17708 ADAC011C */ sw $t4, 0x011C($t5) ## 0000011C .L80A1770C: -/* 001FC 80A1770C 8FBF0034 */ lw $ra, 0x0034($sp) +/* 001FC 80A1770C 8FBF0034 */ lw $ra, 0x0034($sp) .L80A17710: -/* 00200 80A17710 8FB0002C */ lw $s0, 0x002C($sp) -/* 00204 80A17714 8FB10030 */ lw $s1, 0x0030($sp) -/* 00208 80A17718 03E00008 */ jr $ra +/* 00200 80A17710 8FB0002C */ lw $s0, 0x002C($sp) +/* 00204 80A17714 8FB10030 */ lw $s1, 0x0030($sp) +/* 00208 80A17718 03E00008 */ jr $ra /* 0020C 80A1771C 27BD0050 */ addiu $sp, $sp, 0x0050 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A17780.s b/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A17780.s index 50860e761b..0e38da5d10 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A17780.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A17780.s @@ -1,21 +1,21 @@ glabel func_80A17780 /* 00270 80A17780 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00274 80A17784 AFBF0014 */ sw $ra, 0x0014($sp) +/* 00274 80A17784 AFBF0014 */ sw $ra, 0x0014($sp) /* 00278 80A17788 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 /* 0027C 80A1778C 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 /* 00280 80A17790 24A59DB0 */ addiu $a1, $a1, 0x9DB0 ## $a1 = 06009DB0 -/* 00284 80A17794 AFA60018 */ sw $a2, 0x0018($sp) -/* 00288 80A17798 0C02947A */ jal func_800A51E8 +/* 00284 80A17794 AFA60018 */ sw $a2, 0x0018($sp) +/* 00288 80A17798 0C02947A */ jal SkelAnime_ChangeAnimDefaultStop /* 0028C 80A1779C 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 00290 80A177A0 8FA60018 */ lw $a2, 0x0018($sp) +/* 00290 80A177A0 8FA60018 */ lw $a2, 0x0018($sp) /* 00294 80A177A4 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 /* 00298 80A177A8 3C0E80A2 */ lui $t6, %hi(func_80A18500) ## $t6 = 80A20000 /* 0029C 80A177AC 25CE8500 */ addiu $t6, $t6, %lo(func_80A18500) ## $t6 = 80A18500 /* 002A0 80A177B0 ACCE0190 */ sw $t6, 0x0190($a2) ## 00000190 /* 002A4 80A177B4 E4C40068 */ swc1 $f4, 0x0068($a2) ## 00000068 -/* 002A8 80A177B8 8FBF0014 */ lw $ra, 0x0014($sp) +/* 002A8 80A177B8 8FBF0014 */ lw $ra, 0x0014($sp) /* 002AC 80A177BC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 002B0 80A177C0 03E00008 */ jr $ra +/* 002B0 80A177C0 03E00008 */ jr $ra /* 002B4 80A177C4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A177C8.s b/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A177C8.s index 02bfeaf0b4..9d467de615 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A177C8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A177C8.s @@ -1,19 +1,19 @@ glabel func_80A177C8 /* 002B8 80A177C8 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 002BC 80A177CC AFBF0014 */ sw $ra, 0x0014($sp) -/* 002C0 80A177D0 AFA40018 */ sw $a0, 0x0018($sp) +/* 002BC 80A177CC AFBF0014 */ sw $ra, 0x0014($sp) +/* 002C0 80A177D0 AFA40018 */ sw $a0, 0x0018($sp) /* 002C4 80A177D4 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 /* 002C8 80A177D8 24A5A054 */ addiu $a1, $a1, 0xA054 ## $a1 = 0600A054 /* 002CC 80A177DC 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 002D0 80A177E0 0C029490 */ jal func_800A5240 +/* 002D0 80A177E0 0C029490 */ jal SkelAnime_ChangeAnimTransitionStop /* 002D4 80A177E4 3C06C040 */ lui $a2, 0xC040 ## $a2 = C0400000 -/* 002D8 80A177E8 8FAF0018 */ lw $t7, 0x0018($sp) +/* 002D8 80A177E8 8FAF0018 */ lw $t7, 0x0018($sp) /* 002DC 80A177EC 3C0E80A2 */ lui $t6, %hi(func_80A185C4) ## $t6 = 80A20000 /* 002E0 80A177F0 25CE85C4 */ addiu $t6, $t6, %lo(func_80A185C4) ## $t6 = 80A185C4 /* 002E4 80A177F4 ADEE0190 */ sw $t6, 0x0190($t7) ## 00000190 -/* 002E8 80A177F8 8FBF0014 */ lw $ra, 0x0014($sp) +/* 002E8 80A177F8 8FBF0014 */ lw $ra, 0x0014($sp) /* 002EC 80A177FC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 002F0 80A17800 03E00008 */ jr $ra +/* 002F0 80A17800 03E00008 */ jr $ra /* 002F4 80A17804 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A17808.s b/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A17808.s index e615cf5d34..6e69bd4083 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A17808.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A17808.s @@ -1,19 +1,19 @@ glabel func_80A17808 /* 002F8 80A17808 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 002FC 80A1780C AFBF0014 */ sw $ra, 0x0014($sp) +/* 002FC 80A1780C AFBF0014 */ sw $ra, 0x0014($sp) /* 00300 80A17810 8C8F0190 */ lw $t7, 0x0190($a0) ## 00000190 /* 00304 80A17814 3C0E80A2 */ lui $t6, %hi(func_80A187E4) ## $t6 = 80A20000 /* 00308 80A17818 25CE87E4 */ addiu $t6, $t6, %lo(func_80A187E4) ## $t6 = 80A187E4 -/* 0030C 80A1781C 11CF0009 */ beq $t6, $t7, .L80A17844 +/* 0030C 80A1781C 11CF0009 */ beq $t6, $t7, .L80A17844 /* 00310 80A17820 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 /* 00314 80A17824 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 00318 80A17828 24A541F4 */ addiu $a1, $a1, 0x41F4 ## $a1 = 060041F4 /* 0031C 80A1782C 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C /* 00320 80A17830 3C063FC0 */ lui $a2, 0x3FC0 ## $a2 = 3FC00000 -/* 00324 80A17834 0C0294E1 */ jal func_800A5384 -/* 00328 80A17838 AFA70018 */ sw $a3, 0x0018($sp) -/* 0032C 80A1783C 10000005 */ beq $zero, $zero, .L80A17854 -/* 00330 80A17840 8FA70018 */ lw $a3, 0x0018($sp) +/* 00324 80A17834 0C0294E1 */ jal SkelAnime_ChangeAnimPlaybackRepeat +/* 00328 80A17838 AFA70018 */ sw $a3, 0x0018($sp) +/* 0032C 80A1783C 10000005 */ beq $zero, $zero, .L80A17854 +/* 00330 80A17840 8FA70018 */ lw $a3, 0x0018($sp) .L80A17844: /* 00334 80A17844 3C013FC0 */ lui $at, 0x3FC0 ## $at = 3FC00000 /* 00338 80A17848 44812000 */ mtc1 $at, $f4 ## $f4 = 1.50 @@ -23,9 +23,9 @@ glabel func_80A17808 /* 00344 80A17854 24040002 */ addiu $a0, $zero, 0x0002 ## $a0 = 00000002 /* 00348 80A17858 24050004 */ addiu $a1, $zero, 0x0004 ## $a1 = 00000004 /* 0034C 80A1785C 0C01DF64 */ jal Math_Rand_S16Offset - -/* 00350 80A17860 AFA70018 */ sw $a3, 0x0018($sp) -/* 00354 80A17864 8FA70018 */ lw $a3, 0x0018($sp) + +/* 00350 80A17860 AFA70018 */ sw $a3, 0x0018($sp) +/* 00354 80A17864 8FA70018 */ lw $a3, 0x0018($sp) /* 00358 80A17868 3C013FC0 */ lui $at, 0x3FC0 ## $at = 3FC00000 /* 0035C 80A1786C 44813000 */ mtc1 $at, $f6 ## $f6 = 1.50 /* 00360 80A17870 3C1880A2 */ lui $t8, %hi(func_80A18650) ## $t8 = 80A20000 @@ -33,9 +33,9 @@ glabel func_80A17808 /* 00368 80A17878 A4E20194 */ sh $v0, 0x0194($a3) ## 00000194 /* 0036C 80A1787C ACF80190 */ sw $t8, 0x0190($a3) ## 00000190 /* 00370 80A17880 E4E60068 */ swc1 $f6, 0x0068($a3) ## 00000068 -/* 00374 80A17884 8FBF0014 */ lw $ra, 0x0014($sp) +/* 00374 80A17884 8FBF0014 */ lw $ra, 0x0014($sp) /* 00378 80A17888 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 0037C 80A1788C 03E00008 */ jr $ra +/* 0037C 80A1788C 03E00008 */ jr $ra /* 00380 80A17890 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A17894.s b/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A17894.s index 7637068277..a9977f3445 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A17894.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A17894.s @@ -1,21 +1,21 @@ glabel func_80A17894 /* 00384 80A17894 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00388 80A17898 AFBF0014 */ sw $ra, 0x0014($sp) +/* 00388 80A17898 AFBF0014 */ sw $ra, 0x0014($sp) /* 0038C 80A1789C 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 /* 00390 80A178A0 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 /* 00394 80A178A4 24A59244 */ addiu $a1, $a1, 0x9244 ## $a1 = 06009244 -/* 00398 80A178A8 AFA60018 */ sw $a2, 0x0018($sp) -/* 0039C 80A178AC 0C02947A */ jal func_800A51E8 +/* 00398 80A178A8 AFA60018 */ sw $a2, 0x0018($sp) +/* 0039C 80A178AC 0C02947A */ jal SkelAnime_ChangeAnimDefaultStop /* 003A0 80A178B0 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 003A4 80A178B4 8FA60018 */ lw $a2, 0x0018($sp) +/* 003A4 80A178B4 8FA60018 */ lw $a2, 0x0018($sp) /* 003A8 80A178B8 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 /* 003AC 80A178BC 3C0E80A2 */ lui $t6, %hi(func_80A187AC) ## $t6 = 80A20000 /* 003B0 80A178C0 25CE87AC */ addiu $t6, $t6, %lo(func_80A187AC) ## $t6 = 80A187AC /* 003B4 80A178C4 ACCE0190 */ sw $t6, 0x0190($a2) ## 00000190 /* 003B8 80A178C8 E4C40068 */ swc1 $f4, 0x0068($a2) ## 00000068 -/* 003BC 80A178CC 8FBF0014 */ lw $ra, 0x0014($sp) +/* 003BC 80A178CC 8FBF0014 */ lw $ra, 0x0014($sp) /* 003C0 80A178D0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 003C4 80A178D4 03E00008 */ jr $ra +/* 003C4 80A178D4 03E00008 */ jr $ra /* 003C8 80A178D8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A17908.s b/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A17908.s index c38725dd96..02cb4f0e17 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A17908.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A17908.s @@ -1,85 +1,85 @@ glabel func_80A17908 /* 003F8 80A17908 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 003FC 80A1790C AFBF002C */ sw $ra, 0x002C($sp) -/* 00400 80A17910 AFB00028 */ sw $s0, 0x0028($sp) +/* 003FC 80A1790C AFBF002C */ sw $ra, 0x002C($sp) +/* 00400 80A17910 AFB00028 */ sw $s0, 0x0028($sp) /* 00404 80A17914 848F00B6 */ lh $t7, 0x00B6($a0) ## 000000B6 /* 00408 80A17918 848E0196 */ lh $t6, 0x0196($a0) ## 00000196 /* 0040C 80A1791C 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 /* 00410 80A17920 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00414 80A17924 01CF1823 */ subu $v1, $t6, $t7 -/* 00418 80A17928 00031C00 */ sll $v1, $v1, 16 -/* 0041C 80A1792C 00031C03 */ sra $v1, $v1, 16 -/* 00420 80A17930 18600009 */ blez $v1, .L80A17958 +/* 00414 80A17924 01CF1823 */ subu $v1, $t6, $t7 +/* 00418 80A17928 00031C00 */ sll $v1, $v1, 16 +/* 0041C 80A1792C 00031C03 */ sra $v1, $v1, 16 +/* 00420 80A17930 18600009 */ blez $v1, .L80A17958 /* 00424 80A17934 E4840068 */ swc1 $f4, 0x0068($a0) ## 00000068 /* 00428 80A17938 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 0042C 80A1793C 24A52158 */ addiu $a1, $a1, 0x2158 ## $a1 = 06002158 /* 00430 80A17940 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C /* 00434 80A17944 3C06C040 */ lui $a2, 0xC040 ## $a2 = C0400000 -/* 00438 80A17948 0C029490 */ jal func_800A5240 -/* 0043C 80A1794C A7A30036 */ sh $v1, 0x0036($sp) -/* 00440 80A17950 10000015 */ beq $zero, $zero, .L80A179A8 -/* 00444 80A17954 87A30036 */ lh $v1, 0x0036($sp) +/* 00438 80A17948 0C029490 */ jal SkelAnime_ChangeAnimTransitionStop +/* 0043C 80A1794C A7A30036 */ sh $v1, 0x0036($sp) +/* 00440 80A17950 10000015 */ beq $zero, $zero, .L80A179A8 +/* 00444 80A17954 87A30036 */ lh $v1, 0x0036($sp) .L80A17958: /* 00448 80A17958 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 /* 0044C 80A1795C 24842158 */ addiu $a0, $a0, 0x2158 ## $a0 = 06002158 /* 00450 80A17960 0C028800 */ jal SkelAnime_GetFrameCount - -/* 00454 80A17964 A7A30036 */ sh $v1, 0x0036($sp) + +/* 00454 80A17964 A7A30036 */ sh $v1, 0x0036($sp) /* 00458 80A17968 44823000 */ mtc1 $v0, $f6 ## $f6 = 0.00 /* 0045C 80A1796C 3C01C040 */ lui $at, 0xC040 ## $at = C0400000 /* 00460 80A17970 44815000 */ mtc1 $at, $f10 ## $f10 = -3.00 -/* 00464 80A17974 468031A0 */ cvt.s.w $f6, $f6 +/* 00464 80A17974 468031A0 */ cvt.s.w $f6, $f6 /* 00468 80A17978 44804000 */ mtc1 $zero, $f8 ## $f8 = 0.00 /* 0046C 80A1797C 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 00470 80A17980 24180002 */ addiu $t8, $zero, 0x0002 ## $t8 = 00000002 -/* 00474 80A17984 AFB80014 */ sw $t8, 0x0014($sp) +/* 00474 80A17984 AFB80014 */ sw $t8, 0x0014($sp) /* 00478 80A17988 24A52158 */ addiu $a1, $a1, 0x2158 ## $a1 = 06002158 -/* 0047C 80A1798C 44073000 */ mfc1 $a3, $f6 +/* 0047C 80A1798C 44073000 */ mfc1 $a3, $f6 /* 00480 80A17990 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C /* 00484 80A17994 3C06BF80 */ lui $a2, 0xBF80 ## $a2 = BF800000 -/* 00488 80A17998 E7AA0018 */ swc1 $f10, 0x0018($sp) -/* 0048C 80A1799C 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 00490 80A179A0 E7A80010 */ swc1 $f8, 0x0010($sp) -/* 00494 80A179A4 87A30036 */ lh $v1, 0x0036($sp) +/* 00488 80A17998 E7AA0018 */ swc1 $f10, 0x0018($sp) +/* 0048C 80A1799C 0C029468 */ jal SkelAnime_ChangeAnim + +/* 00490 80A179A0 E7A80010 */ swc1 $f8, 0x0010($sp) +/* 00494 80A179A4 87A30036 */ lh $v1, 0x0036($sp) .L80A179A8: /* 00498 80A179A8 3C0180A2 */ lui $at, %hi(D_80A1A564) ## $at = 80A20000 -/* 0049C 80A179AC C430A564 */ lwc1 $f16, %lo(D_80A1A564)($at) +/* 0049C 80A179AC C430A564 */ lwc1 $f16, %lo(D_80A1A564)($at) /* 004A0 80A179B0 C6120050 */ lwc1 $f18, 0x0050($s0) ## 00000050 /* 004A4 80A179B4 3C0B80A2 */ lui $t3, %hi(func_80A188F0) ## $t3 = 80A20000 /* 004A8 80A179B8 256B88F0 */ addiu $t3, $t3, %lo(func_80A188F0) ## $t3 = 80A188F0 -/* 004AC 80A179BC 4612803C */ c.lt.s $f16, $f18 +/* 004AC 80A179BC 4612803C */ c.lt.s $f16, $f18 /* 004B0 80A179C0 00000000 */ nop -/* 004B4 80A179C4 4502000B */ bc1fl .L80A179F4 +/* 004B4 80A179C4 4502000B */ bc1fl .L80A179F4 /* 004B8 80A179C8 C6000168 */ lwc1 $f0, 0x0168($s0) ## 00000168 /* 004BC 80A179CC 44832000 */ mtc1 $v1, $f4 ## $f4 = 0.00 /* 004C0 80A179D0 3C0180A2 */ lui $at, %hi(D_80A1A568) ## $at = 80A20000 -/* 004C4 80A179D4 C428A568 */ lwc1 $f8, %lo(D_80A1A568)($at) -/* 004C8 80A179D8 468021A0 */ cvt.s.w $f6, $f4 -/* 004CC 80A179DC 46083282 */ mul.s $f10, $f6, $f8 -/* 004D0 80A179E0 4600540D */ trunc.w.s $f16, $f10 -/* 004D4 80A179E4 44088000 */ mfc1 $t0, $f16 -/* 004D8 80A179E8 1000000D */ beq $zero, $zero, .L80A17A20 +/* 004C4 80A179D4 C428A568 */ lwc1 $f8, %lo(D_80A1A568)($at) +/* 004C8 80A179D8 468021A0 */ cvt.s.w $f6, $f4 +/* 004CC 80A179DC 46083282 */ mul.s $f10, $f6, $f8 +/* 004D0 80A179E0 4600540D */ trunc.w.s $f16, $f10 +/* 004D4 80A179E4 44088000 */ mfc1 $t0, $f16 +/* 004D8 80A179E8 1000000D */ beq $zero, $zero, .L80A17A20 /* 004DC 80A179EC A6080196 */ sh $t0, 0x0196($s0) ## 00000196 /* 004E0 80A179F0 C6000168 */ lwc1 $f0, 0x0168($s0) ## 00000168 .L80A179F4: /* 004E4 80A179F4 44832000 */ mtc1 $v1, $f4 ## $f4 = 0.00 /* 004E8 80A179F8 3C0180A2 */ lui $at, %hi(D_80A1A56C) ## $at = 80A20000 -/* 004EC 80A179FC 46000480 */ add.s $f18, $f0, $f0 -/* 004F0 80A17A00 468021A0 */ cvt.s.w $f6, $f4 +/* 004EC 80A179FC 46000480 */ add.s $f18, $f0, $f0 +/* 004F0 80A17A00 468021A0 */ cvt.s.w $f6, $f4 /* 004F4 80A17A04 E6120168 */ swc1 $f18, 0x0168($s0) ## 00000168 -/* 004F8 80A17A08 C428A56C */ lwc1 $f8, %lo(D_80A1A56C)($at) -/* 004FC 80A17A0C 46083282 */ mul.s $f10, $f6, $f8 -/* 00500 80A17A10 4600540D */ trunc.w.s $f16, $f10 -/* 00504 80A17A14 440A8000 */ mfc1 $t2, $f16 +/* 004F8 80A17A08 C428A56C */ lwc1 $f8, %lo(D_80A1A56C)($at) +/* 004FC 80A17A0C 46083282 */ mul.s $f10, $f6, $f8 +/* 00500 80A17A10 4600540D */ trunc.w.s $f16, $f10 +/* 00504 80A17A14 440A8000 */ mfc1 $t2, $f16 /* 00508 80A17A18 00000000 */ nop /* 0050C 80A17A1C A60A0196 */ sh $t2, 0x0196($s0) ## 00000196 .L80A17A20: /* 00510 80A17A20 AE0B0190 */ sw $t3, 0x0190($s0) ## 00000190 -/* 00514 80A17A24 8FBF002C */ lw $ra, 0x002C($sp) -/* 00518 80A17A28 8FB00028 */ lw $s0, 0x0028($sp) +/* 00514 80A17A24 8FBF002C */ lw $ra, 0x002C($sp) +/* 00518 80A17A28 8FB00028 */ lw $s0, 0x0028($sp) /* 0051C 80A17A2C 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 -/* 00520 80A17A30 03E00008 */ jr $ra +/* 00520 80A17A30 03E00008 */ jr $ra /* 00524 80A17A34 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A17A38.s b/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A17A38.s index 9852fa234b..45f5d484dc 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A17A38.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A17A38.s @@ -1,32 +1,32 @@ glabel func_80A17A38 /* 00528 80A17A38 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 0052C 80A17A3C AFB00030 */ sw $s0, 0x0030($sp) +/* 0052C 80A17A3C AFB00030 */ sw $s0, 0x0030($sp) /* 00530 80A17A40 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00534 80A17A44 AFBF0034 */ sw $ra, 0x0034($sp) +/* 00534 80A17A44 AFBF0034 */ sw $ra, 0x0034($sp) /* 00538 80A17A48 3C040601 */ lui $a0, 0x0601 ## $a0 = 06010000 -/* 0053C 80A17A4C AFA5003C */ sw $a1, 0x003C($sp) +/* 0053C 80A17A4C AFA5003C */ sw $a1, 0x003C($sp) /* 00540 80A17A50 0C028800 */ jal SkelAnime_GetFrameCount - + /* 00544 80A17A54 24849520 */ addiu $a0, $a0, 0x9520 ## $a0 = 06009520 /* 00548 80A17A58 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 0054C 80A17A5C 3C01C040 */ lui $at, 0xC040 ## $at = C0400000 /* 00550 80A17A60 44814000 */ mtc1 $at, $f8 ## $f8 = -3.00 -/* 00554 80A17A64 468021A0 */ cvt.s.w $f6, $f4 +/* 00554 80A17A64 468021A0 */ cvt.s.w $f6, $f4 /* 00558 80A17A68 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 /* 0055C 80A17A6C 240E0002 */ addiu $t6, $zero, 0x0002 ## $t6 = 00000002 -/* 00560 80A17A70 AFAE0014 */ sw $t6, 0x0014($sp) +/* 00560 80A17A70 AFAE0014 */ sw $t6, 0x0014($sp) /* 00564 80A17A74 24A59520 */ addiu $a1, $a1, 0x9520 ## $a1 = 06009520 /* 00568 80A17A78 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C -/* 0056C 80A17A7C E7A60010 */ swc1 $f6, 0x0010($sp) +/* 0056C 80A17A7C E7A60010 */ swc1 $f6, 0x0010($sp) /* 00570 80A17A80 3C064040 */ lui $a2, 0x4040 ## $a2 = 40400000 /* 00574 80A17A84 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 00578 80A17A88 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 0057C 80A17A8C E7A80018 */ swc1 $f8, 0x0018($sp) +/* 00578 80A17A88 0C029468 */ jal SkelAnime_ChangeAnim + +/* 0057C 80A17A8C E7A80018 */ swc1 $f8, 0x0018($sp) /* 00580 80A17A90 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 /* 00584 80A17A94 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 00588 80A17A98 E6000068 */ swc1 $f0, 0x0068($s0) ## 00000068 -/* 0058C 80A17A9C 0C285DD2 */ jal func_80A17748 +/* 0058C 80A17A9C 0C285DD2 */ jal func_80A17748 /* 00590 80A17AA0 E600006C */ swc1 $f0, 0x006C($s0) ## 0000006C /* 00594 80A17AA4 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 /* 00598 80A17AA8 44815000 */ mtc1 $at, $f10 ## $f10 = 20.00 @@ -34,27 +34,27 @@ glabel func_80A17A38 /* 005A0 80A17AB0 2418012C */ addiu $t8, $zero, 0x012C ## $t8 = 0000012C /* 005A4 80A17AB4 24190064 */ addiu $t9, $zero, 0x0064 ## $t9 = 00000064 /* 005A8 80A17AB8 24080001 */ addiu $t0, $zero, 0x0001 ## $t0 = 00000001 -/* 005AC 80A17ABC AFA80020 */ sw $t0, 0x0020($sp) -/* 005B0 80A17AC0 AFB9001C */ sw $t9, 0x001C($sp) -/* 005B4 80A17AC4 AFB80018 */ sw $t8, 0x0018($sp) -/* 005B8 80A17AC8 AFAF0010 */ sw $t7, 0x0010($sp) -/* 005BC 80A17ACC 8FA4003C */ lw $a0, 0x003C($sp) +/* 005AC 80A17ABC AFA80020 */ sw $t0, 0x0020($sp) +/* 005B0 80A17AC0 AFB9001C */ sw $t9, 0x001C($sp) +/* 005B4 80A17AC4 AFB80018 */ sw $t8, 0x0018($sp) +/* 005B8 80A17AC8 AFAF0010 */ sw $t7, 0x0010($sp) +/* 005BC 80A17ACC 8FA4003C */ lw $a0, 0x003C($sp) /* 005C0 80A17AD0 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 005C4 80A17AD4 26060024 */ addiu $a2, $s0, 0x0024 ## $a2 = 00000024 /* 005C8 80A17AD8 3C074170 */ lui $a3, 0x4170 ## $a3 = 41700000 -/* 005CC 80A17ADC 0C00CC98 */ jal func_80033260 -/* 005D0 80A17AE0 E7AA0014 */ swc1 $f10, 0x0014($sp) +/* 005CC 80A17ADC 0C00CC98 */ jal func_80033260 +/* 005D0 80A17AE0 E7AA0014 */ swc1 $f10, 0x0014($sp) /* 005D4 80A17AE4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 005D8 80A17AE8 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 005DC 80A17AEC 24053930 */ addiu $a1, $zero, 0x3930 ## $a1 = 00003930 /* 005E0 80A17AF0 3C0980A2 */ lui $t1, %hi(func_80A18AB4) ## $t1 = 80A20000 /* 005E4 80A17AF4 25298AB4 */ addiu $t1, $t1, %lo(func_80A18AB4) ## $t1 = 80A18AB4 /* 005E8 80A17AF8 AE090190 */ sw $t1, 0x0190($s0) ## 00000190 -/* 005EC 80A17AFC 8FBF0034 */ lw $ra, 0x0034($sp) -/* 005F0 80A17B00 8FB00030 */ lw $s0, 0x0030($sp) +/* 005EC 80A17AFC 8FBF0034 */ lw $ra, 0x0034($sp) +/* 005F0 80A17B00 8FB00030 */ lw $s0, 0x0030($sp) /* 005F4 80A17B04 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 -/* 005F8 80A17B08 03E00008 */ jr $ra +/* 005F8 80A17B08 03E00008 */ jr $ra /* 005FC 80A17B0C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A17B40.s b/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A17B40.s index e0891521de..b00d50fbfe 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A17B40.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A17B40.s @@ -4,47 +4,47 @@ glabel func_80A17B40 /* 00638 80A17B48 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 /* 0063C 80A17B4C 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 /* 00640 80A17B50 44813000 */ mtc1 $at, $f6 ## $f6 = 5.00 -/* 00644 80A17B54 AFB00028 */ sw $s0, 0x0028($sp) +/* 00644 80A17B54 AFB00028 */ sw $s0, 0x0028($sp) /* 00648 80A17B58 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 0064C 80A17B5C AFBF002C */ sw $ra, 0x002C($sp) +/* 0064C 80A17B5C AFBF002C */ sw $ra, 0x002C($sp) /* 00650 80A17B60 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 00654 80A17B64 240E0002 */ addiu $t6, $zero, 0x0002 ## $t6 = 00000002 -/* 00658 80A17B68 AFAE0014 */ sw $t6, 0x0014($sp) +/* 00658 80A17B68 AFAE0014 */ sw $t6, 0x0014($sp) /* 0065C 80A17B6C 24A519CC */ addiu $a1, $a1, 0x19CC ## $a1 = 060019CC /* 00660 80A17B70 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C /* 00664 80A17B74 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 00668 80A17B78 3C074224 */ lui $a3, 0x4224 ## $a3 = 42240000 -/* 0066C 80A17B7C E7A40010 */ swc1 $f4, 0x0010($sp) -/* 00670 80A17B80 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 00674 80A17B84 E7A60018 */ swc1 $f6, 0x0018($sp) +/* 0066C 80A17B7C E7A40010 */ swc1 $f4, 0x0010($sp) +/* 00670 80A17B80 0C029468 */ jal SkelAnime_ChangeAnim + +/* 00674 80A17B84 E7A60018 */ swc1 $f6, 0x0018($sp) /* 00678 80A17B88 C6080068 */ lwc1 $f8, 0x0068($s0) ## 00000068 /* 0067C 80A17B8C 44805000 */ mtc1 $zero, $f10 ## $f10 = 0.00 /* 00680 80A17B90 3C01BF80 */ lui $at, 0xBF80 ## $at = BF800000 /* 00684 80A17B94 44818000 */ mtc1 $at, $f16 ## $f16 = -1.00 -/* 00688 80A17B98 460A403C */ c.lt.s $f8, $f10 +/* 00688 80A17B98 460A403C */ c.lt.s $f8, $f10 /* 0068C 80A17B9C 3C0980A2 */ lui $t1, %hi(func_80A18D68) ## $t1 = 80A20000 /* 00690 80A17BA0 2419001E */ addiu $t9, $zero, 0x001E ## $t9 = 0000001E /* 00694 80A17BA4 25298D68 */ addiu $t1, $t1, %lo(func_80A18D68) ## $t1 = 80A18D68 -/* 00698 80A17BA8 45010006 */ bc1t .L80A17BC4 +/* 00698 80A17BA8 45010006 */ bc1t .L80A17BC4 /* 0069C 80A17BAC 00000000 */ nop /* 006A0 80A17BB0 8E180190 */ lw $t8, 0x0190($s0) ## 00000190 /* 006A4 80A17BB4 3C0F80A2 */ lui $t7, %hi(func_80A18C78) ## $t7 = 80A20000 /* 006A8 80A17BB8 25EF8C78 */ addiu $t7, $t7, %lo(func_80A18C78) ## $t7 = 80A18C78 -/* 006AC 80A17BBC 11F80003 */ beq $t7, $t8, .L80A17BCC +/* 006AC 80A17BBC 11F80003 */ beq $t7, $t8, .L80A17BCC /* 006B0 80A17BC0 2408002D */ addiu $t0, $zero, 0x002D ## $t0 = 0000002D .L80A17BC4: -/* 006B4 80A17BC4 10000002 */ beq $zero, $zero, .L80A17BD0 +/* 006B4 80A17BC4 10000002 */ beq $zero, $zero, .L80A17BD0 /* 006B8 80A17BC8 A6190194 */ sh $t9, 0x0194($s0) ## 00000194 .L80A17BCC: /* 006BC 80A17BCC A6080194 */ sh $t0, 0x0194($s0) ## 00000194 .L80A17BD0: /* 006C0 80A17BD0 E610006C */ swc1 $f16, 0x006C($s0) ## 0000006C /* 006C4 80A17BD4 AE090190 */ sw $t1, 0x0190($s0) ## 00000190 -/* 006C8 80A17BD8 8FBF002C */ lw $ra, 0x002C($sp) -/* 006CC 80A17BDC 8FB00028 */ lw $s0, 0x0028($sp) +/* 006C8 80A17BD8 8FBF002C */ lw $ra, 0x002C($sp) +/* 006CC 80A17BDC 8FB00028 */ lw $s0, 0x0028($sp) /* 006D0 80A17BE0 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 006D4 80A17BE4 03E00008 */ jr $ra +/* 006D4 80A17BE4 03E00008 */ jr $ra /* 006D8 80A17BE8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A17BEC.s b/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A17BEC.s index 31b06926fa..d786f2dad3 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A17BEC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A17BEC.s @@ -1,22 +1,22 @@ glabel func_80A17BEC /* 006DC 80A17BEC 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 006E0 80A17BF0 AFBF002C */ sw $ra, 0x002C($sp) -/* 006E4 80A17BF4 AFB00028 */ sw $s0, 0x0028($sp) +/* 006E0 80A17BF0 AFBF002C */ sw $ra, 0x002C($sp) +/* 006E4 80A17BF4 AFB00028 */ sw $s0, 0x0028($sp) /* 006E8 80A17BF8 3C053B83 */ lui $a1, 0x3B83 ## $a1 = 3B830000 /* 006EC 80A17BFC 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 006F0 80A17C00 0C00B58B */ jal Actor_SetScale - + /* 006F4 80A17C04 34A5126F */ ori $a1, $a1, 0x126F ## $a1 = 3B83126F /* 006F8 80A17C08 8E0E0004 */ lw $t6, 0x0004($s0) ## 00000004 /* 006FC 80A17C0C 24010080 */ addiu $at, $zero, 0x0080 ## $at = 00000080 /* 00700 80A17C10 3C0980A2 */ lui $t1, %hi(EnFloormas_Draw) ## $t1 = 80A20000 /* 00704 80A17C14 35CF0010 */ ori $t7, $t6, 0x0010 ## $t7 = 00000010 /* 00708 80A17C18 31F90080 */ andi $t9, $t7, 0x0080 ## $t9 = 00000000 -/* 0070C 80A17C1C 17210005 */ bne $t9, $at, .L80A17C34 +/* 0070C 80A17C1C 17210005 */ bne $t9, $at, .L80A17C34 /* 00710 80A17C20 AE0F0004 */ sw $t7, 0x0004($s0) ## 00000004 /* 00714 80A17C24 3C0880A2 */ lui $t0, %hi(func_80A1A350) ## $t0 = 80A20000 /* 00718 80A17C28 2508A350 */ addiu $t0, $t0, %lo(func_80A1A350) ## $t0 = 80A1A350 -/* 0071C 80A17C2C 10000003 */ beq $zero, $zero, .L80A17C3C +/* 0071C 80A17C2C 10000003 */ beq $zero, $zero, .L80A17C3C /* 00720 80A17C30 AE080134 */ sw $t0, 0x0134($s0) ## 00000134 .L80A17C34: /* 00724 80A17C34 2529A254 */ addiu $t1, $t1, %lo(EnFloormas_Draw) ## $t1 = 80A1A254 @@ -36,40 +36,40 @@ glabel func_80A17BEC /* 00758 80A17C68 8C4D002C */ lw $t5, 0x002C($v0) ## 0000002C /* 0075C 80A17C6C A60E001C */ sh $t6, 0x001C($s0) ## 0000001C /* 00760 80A17C70 0C028800 */ jal SkelAnime_GetFrameCount - + /* 00764 80A17C74 AE0D002C */ sw $t5, 0x002C($s0) ## 0000002C /* 00768 80A17C78 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 0076C 80A17C7C 44804000 */ mtc1 $zero, $f8 ## $f8 = 0.00 /* 00770 80A17C80 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 00774 80A17C84 468021A0 */ cvt.s.w $f6, $f4 +/* 00774 80A17C84 468021A0 */ cvt.s.w $f6, $f4 /* 00778 80A17C88 240F0002 */ addiu $t7, $zero, 0x0002 ## $t7 = 00000002 -/* 0077C 80A17C8C AFAF0014 */ sw $t7, 0x0014($sp) +/* 0077C 80A17C8C AFAF0014 */ sw $t7, 0x0014($sp) /* 00780 80A17C90 24A519CC */ addiu $a1, $a1, 0x19CC ## $a1 = 060019CC /* 00784 80A17C94 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C /* 00788 80A17C98 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 0078C 80A17C9C E7A60010 */ swc1 $f6, 0x0010($sp) +/* 0078C 80A17C9C E7A60010 */ swc1 $f6, 0x0010($sp) /* 00790 80A17CA0 3C074224 */ lui $a3, 0x4224 ## $a3 = 42240000 -/* 00794 80A17CA4 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 00798 80A17CA8 E7A80018 */ swc1 $f8, 0x0018($sp) +/* 00794 80A17CA4 0C029468 */ jal SkelAnime_ChangeAnim + +/* 00798 80A17CA8 E7A80018 */ swc1 $f8, 0x0018($sp) /* 0079C 80A17CAC 3C0280A2 */ lui $v0, %hi(D_80A1A470) ## $v0 = 80A20000 /* 007A0 80A17CB0 2442A470 */ addiu $v0, $v0, %lo(D_80A1A470) ## $v0 = 80A1A470 /* 007A4 80A17CB4 84580020 */ lh $t8, 0x0020($v0) ## 80A1A490 /* 007A8 80A17CB8 3C0180A2 */ lui $at, %hi(D_80A1A574) ## $at = 80A20000 -/* 007AC 80A17CBC C420A574 */ lwc1 $f0, %lo(D_80A1A574)($at) +/* 007AC 80A17CBC C420A574 */ lwc1 $f0, %lo(D_80A1A574)($at) /* 007B0 80A17CC0 44985000 */ mtc1 $t8, $f10 ## $f10 = 0.00 /* 007B4 80A17CC4 3C014080 */ lui $at, 0x4080 ## $at = 40800000 /* 007B8 80A17CC8 920C02F6 */ lbu $t4, 0x02F6($s0) ## 000002F6 -/* 007BC 80A17CCC 46805420 */ cvt.s.w $f16, $f10 +/* 007BC 80A17CCC 46805420 */ cvt.s.w $f16, $f10 /* 007C0 80A17CD0 3C0E80A2 */ lui $t6, %hi(D_80A1A49C) ## $t6 = 80A20000 /* 007C4 80A17CD4 318DFFFB */ andi $t5, $t4, 0xFFFB ## $t5 = 00000000 /* 007C8 80A17CD8 3C1880A2 */ lui $t8, %hi(func_80A18F50) ## $t8 = 80A20000 /* 007CC 80A17CDC 27188F50 */ addiu $t8, $t8, %lo(func_80A18F50) ## $t8 = 80A18F50 -/* 007D0 80A17CE0 46008482 */ mul.s $f18, $f16, $f0 -/* 007D4 80A17CE4 4600910D */ trunc.w.s $f4, $f18 +/* 007D0 80A17CE0 46008482 */ mul.s $f18, $f16, $f0 +/* 007D4 80A17CE4 4600910D */ trunc.w.s $f4, $f18 /* 007D8 80A17CE8 44819000 */ mtc1 $at, $f18 ## $f18 = 4.00 /* 007DC 80A17CEC 3C0140E0 */ lui $at, 0x40E0 ## $at = 40E00000 -/* 007E0 80A17CF0 44082000 */ mfc1 $t0, $f4 +/* 007E0 80A17CF0 44082000 */ mfc1 $t0, $f4 /* 007E4 80A17CF4 44812000 */ mtc1 $at, $f4 ## $f4 = 7.00 /* 007E8 80A17CF8 A6080308 */ sh $t0, 0x0308($s0) ## 00000308 /* 007EC 80A17CFC 84490022 */ lh $t1, 0x0022($v0) ## 80A1A492 @@ -77,20 +77,20 @@ glabel func_80A17BEC /* 007F4 80A17D04 E6120068 */ swc1 $f18, 0x0068($s0) ## 00000068 /* 007F8 80A17D08 44893000 */ mtc1 $t1, $f6 ## $f6 = 0.00 /* 007FC 80A17D0C E6040060 */ swc1 $f4, 0x0060($s0) ## 00000060 -/* 00800 80A17D10 46803220 */ cvt.s.w $f8, $f6 -/* 00804 80A17D14 46004282 */ mul.s $f10, $f8, $f0 -/* 00808 80A17D18 4600540D */ trunc.w.s $f16, $f10 -/* 0080C 80A17D1C 440B8000 */ mfc1 $t3, $f16 +/* 00800 80A17D10 46803220 */ cvt.s.w $f8, $f6 +/* 00804 80A17D14 46004282 */ mul.s $f10, $f8, $f0 +/* 00808 80A17D18 4600540D */ trunc.w.s $f16, $f10 +/* 0080C 80A17D1C 440B8000 */ mfc1 $t3, $f16 /* 00810 80A17D20 00000000 */ nop /* 00814 80A17D24 A60B030A */ sh $t3, 0x030A($s0) ## 0000030A -/* 00818 80A17D28 91CEA49C */ lbu $t6, %lo(D_80A1A49C)($t6) +/* 00818 80A17D28 91CEA49C */ lbu $t6, %lo(D_80A1A49C)($t6) /* 0081C 80A17D2C AE180190 */ sw $t8, 0x0190($s0) ## 00000190 -/* 00820 80A17D30 000E7843 */ sra $t7, $t6, 1 +/* 00820 80A17D30 000E7843 */ sra $t7, $t6, 1 /* 00824 80A17D34 A20F00AF */ sb $t7, 0x00AF($s0) ## 000000AF -/* 00828 80A17D38 8FBF002C */ lw $ra, 0x002C($sp) -/* 0082C 80A17D3C 8FB00028 */ lw $s0, 0x0028($sp) +/* 00828 80A17D38 8FBF002C */ lw $ra, 0x002C($sp) +/* 0082C 80A17D3C 8FB00028 */ lw $s0, 0x0028($sp) /* 00830 80A17D40 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 00834 80A17D44 03E00008 */ jr $ra +/* 00834 80A17D44 03E00008 */ jr $ra /* 00838 80A17D48 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A17D4C.s b/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A17D4C.s index 0819aa8f5d..8608a330d9 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A17D4C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A17D4C.s @@ -1,23 +1,23 @@ glabel func_80A17D4C /* 0083C 80A17D4C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00840 80A17D50 AFBF0014 */ sw $ra, 0x0014($sp) +/* 00840 80A17D50 AFBF0014 */ sw $ra, 0x0014($sp) /* 00844 80A17D54 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 /* 00848 80A17D58 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 0084C 80A17D5C 24A541F4 */ addiu $a1, $a1, 0x41F4 ## $a1 = 060041F4 -/* 00850 80A17D60 AFA70018 */ sw $a3, 0x0018($sp) +/* 00850 80A17D60 AFA70018 */ sw $a3, 0x0018($sp) /* 00854 80A17D64 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 00858 80A17D68 0C0294E1 */ jal func_800A5384 +/* 00858 80A17D68 0C0294E1 */ jal SkelAnime_ChangeAnimPlaybackRepeat /* 0085C 80A17D6C 3C064090 */ lui $a2, 0x4090 ## $a2 = 40900000 -/* 00860 80A17D70 8FA70018 */ lw $a3, 0x0018($sp) +/* 00860 80A17D70 8FA70018 */ lw $a3, 0x0018($sp) /* 00864 80A17D74 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 /* 00868 80A17D78 44812000 */ mtc1 $at, $f4 ## $f4 = 5.00 /* 0086C 80A17D7C 3C0E80A2 */ lui $t6, %hi(func_80A18FD8) ## $t6 = 80A20000 /* 00870 80A17D80 25CE8FD8 */ addiu $t6, $t6, %lo(func_80A18FD8) ## $t6 = 80A18FD8 /* 00874 80A17D84 ACEE0190 */ sw $t6, 0x0190($a3) ## 00000190 /* 00878 80A17D88 E4E40068 */ swc1 $f4, 0x0068($a3) ## 00000068 -/* 0087C 80A17D8C 8FBF0014 */ lw $ra, 0x0014($sp) +/* 0087C 80A17D8C 8FBF0014 */ lw $ra, 0x0014($sp) /* 00880 80A17D90 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00884 80A17D94 03E00008 */ jr $ra +/* 00884 80A17D94 03E00008 */ jr $ra /* 00888 80A17D98 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A17D9C.s b/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A17D9C.s index f10c327e2b..a14133b207 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A17D9C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A17D9C.s @@ -1,18 +1,18 @@ glabel func_80A17D9C /* 0088C 80A17D9C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00890 80A17DA0 AFBF0014 */ sw $ra, 0x0014($sp) +/* 00890 80A17DA0 AFBF0014 */ sw $ra, 0x0014($sp) /* 00894 80A17DA4 8C8F0190 */ lw $t7, 0x0190($a0) ## 00000190 /* 00898 80A17DA8 3C0E80A2 */ lui $t6, %hi(func_80A18FD8) ## $t6 = 80A20000 /* 0089C 80A17DAC 25CE8FD8 */ addiu $t6, $t6, %lo(func_80A18FD8) ## $t6 = 80A18FD8 -/* 008A0 80A17DB0 11CF0008 */ beq $t6, $t7, .L80A17DD4 +/* 008A0 80A17DB0 11CF0008 */ beq $t6, $t7, .L80A17DD4 /* 008A4 80A17DB4 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 /* 008A8 80A17DB8 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 008AC 80A17DBC 24A541F4 */ addiu $a1, $a1, 0x41F4 ## $a1 = 060041F4 /* 008B0 80A17DC0 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C /* 008B4 80A17DC4 3C064090 */ lui $a2, 0x4090 ## $a2 = 40900000 -/* 008B8 80A17DC8 0C0294E1 */ jal func_800A5384 -/* 008BC 80A17DCC AFA70018 */ sw $a3, 0x0018($sp) -/* 008C0 80A17DD0 8FA70018 */ lw $a3, 0x0018($sp) +/* 008B8 80A17DC8 0C0294E1 */ jal SkelAnime_ChangeAnimPlaybackRepeat +/* 008BC 80A17DCC AFA70018 */ sw $a3, 0x0018($sp) +/* 008C0 80A17DD0 8FA70018 */ lw $a3, 0x0018($sp) .L80A17DD4: /* 008C4 80A17DD4 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 /* 008C8 80A17DD8 44812000 */ mtc1 $at, $f4 ## $f4 = 5.00 @@ -20,9 +20,9 @@ glabel func_80A17D9C /* 008D0 80A17DE0 271890C8 */ addiu $t8, $t8, %lo(func_80A190C8) ## $t8 = 80A190C8 /* 008D4 80A17DE4 ACF80190 */ sw $t8, 0x0190($a3) ## 00000190 /* 008D8 80A17DE8 E4E40068 */ swc1 $f4, 0x0068($a3) ## 00000068 -/* 008DC 80A17DEC 8FBF0014 */ lw $ra, 0x0014($sp) +/* 008DC 80A17DEC 8FBF0014 */ lw $ra, 0x0014($sp) /* 008E0 80A17DF0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 008E4 80A17DF4 03E00008 */ jr $ra +/* 008E4 80A17DF4 03E00008 */ jr $ra /* 008E8 80A17DF8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A17ED4.s b/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A17ED4.s index 43c7214e22..2b7afb3bf1 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A17ED4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A17ED4.s @@ -3,28 +3,28 @@ glabel func_80A17ED4 /* 009C8 80A17ED8 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 /* 009CC 80A17EDC 3C014224 */ lui $at, 0x4224 ## $at = 42240000 /* 009D0 80A17EE0 44812000 */ mtc1 $at, $f4 ## $f4 = 41.00 -/* 009D4 80A17EE4 AFBF0024 */ sw $ra, 0x0024($sp) -/* 009D8 80A17EE8 AFA40028 */ sw $a0, 0x0028($sp) +/* 009D4 80A17EE4 AFBF0024 */ sw $ra, 0x0024($sp) +/* 009D8 80A17EE8 AFA40028 */ sw $a0, 0x0028($sp) /* 009DC 80A17EEC 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 009E0 80A17EF0 240E0002 */ addiu $t6, $zero, 0x0002 ## $t6 = 00000002 -/* 009E4 80A17EF4 44070000 */ mfc1 $a3, $f0 -/* 009E8 80A17EF8 AFAE0014 */ sw $t6, 0x0014($sp) +/* 009E4 80A17EF4 44070000 */ mfc1 $a3, $f0 +/* 009E8 80A17EF8 AFAE0014 */ sw $t6, 0x0014($sp) /* 009EC 80A17EFC 24A519CC */ addiu $a1, $a1, 0x19CC ## $a1 = 060019CC /* 009F0 80A17F00 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C /* 009F4 80A17F04 3C064000 */ lui $a2, 0x4000 ## $a2 = 40000000 -/* 009F8 80A17F08 E7A00018 */ swc1 $f0, 0x0018($sp) -/* 009FC 80A17F0C 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 00A00 80A17F10 E7A40010 */ swc1 $f4, 0x0010($sp) -/* 00A04 80A17F14 8FA20028 */ lw $v0, 0x0028($sp) +/* 009F8 80A17F08 E7A00018 */ swc1 $f0, 0x0018($sp) +/* 009FC 80A17F0C 0C029468 */ jal SkelAnime_ChangeAnim + +/* 00A00 80A17F10 E7A40010 */ swc1 $f4, 0x0010($sp) +/* 00A04 80A17F14 8FA20028 */ lw $v0, 0x0028($sp) /* 00A08 80A17F18 44803000 */ mtc1 $zero, $f6 ## $f6 = 0.00 /* 00A0C 80A17F1C 3C0F80A2 */ lui $t7, %hi(func_80A196DC) ## $t7 = 80A20000 /* 00A10 80A17F20 25EF96DC */ addiu $t7, $t7, %lo(func_80A196DC) ## $t7 = 80A196DC /* 00A14 80A17F24 AC4F0190 */ sw $t7, 0x0190($v0) ## 00000190 /* 00A18 80A17F28 E4460068 */ swc1 $f6, 0x0068($v0) ## 00000068 -/* 00A1C 80A17F2C 8FBF0024 */ lw $ra, 0x0024($sp) +/* 00A1C 80A17F2C 8FBF0024 */ lw $ra, 0x0024($sp) /* 00A20 80A17F30 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 00A24 80A17F34 03E00008 */ jr $ra +/* 00A24 80A17F34 03E00008 */ jr $ra /* 00A28 80A17F38 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A17F3C.s b/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A17F3C.s index 5b659b7d00..cdf02fdd20 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A17F3C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A17F3C.s @@ -3,28 +3,28 @@ glabel func_80A17F3C /* 00A30 80A17F40 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 /* 00A34 80A17F44 3C014224 */ lui $at, 0x4224 ## $at = 42240000 /* 00A38 80A17F48 44812000 */ mtc1 $at, $f4 ## $f4 = 41.00 -/* 00A3C 80A17F4C AFBF0024 */ sw $ra, 0x0024($sp) -/* 00A40 80A17F50 AFA40028 */ sw $a0, 0x0028($sp) +/* 00A3C 80A17F4C AFBF0024 */ sw $ra, 0x0024($sp) +/* 00A40 80A17F50 AFA40028 */ sw $a0, 0x0028($sp) /* 00A44 80A17F54 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 00A48 80A17F58 240E0002 */ addiu $t6, $zero, 0x0002 ## $t6 = 00000002 -/* 00A4C 80A17F5C 44070000 */ mfc1 $a3, $f0 -/* 00A50 80A17F60 AFAE0014 */ sw $t6, 0x0014($sp) +/* 00A4C 80A17F5C 44070000 */ mfc1 $a3, $f0 +/* 00A50 80A17F60 AFAE0014 */ sw $t6, 0x0014($sp) /* 00A54 80A17F64 24A519CC */ addiu $a1, $a1, 0x19CC ## $a1 = 060019CC /* 00A58 80A17F68 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C /* 00A5C 80A17F6C 3C064000 */ lui $a2, 0x4000 ## $a2 = 40000000 -/* 00A60 80A17F70 E7A00018 */ swc1 $f0, 0x0018($sp) -/* 00A64 80A17F74 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 00A68 80A17F78 E7A40010 */ swc1 $f4, 0x0010($sp) -/* 00A6C 80A17F7C 8FA20028 */ lw $v0, 0x0028($sp) +/* 00A60 80A17F70 E7A00018 */ swc1 $f0, 0x0018($sp) +/* 00A64 80A17F74 0C029468 */ jal SkelAnime_ChangeAnim + +/* 00A68 80A17F78 E7A40010 */ swc1 $f4, 0x0010($sp) +/* 00A6C 80A17F7C 8FA20028 */ lw $v0, 0x0028($sp) /* 00A70 80A17F80 44803000 */ mtc1 $zero, $f6 ## $f6 = 0.00 /* 00A74 80A17F84 3C0F80A2 */ lui $t7, %hi(func_80A1928C) ## $t7 = 80A20000 /* 00A78 80A17F88 25EF928C */ addiu $t7, $t7, %lo(func_80A1928C) ## $t7 = 80A1928C /* 00A7C 80A17F8C AC4F0190 */ sw $t7, 0x0190($v0) ## 00000190 /* 00A80 80A17F90 E4460068 */ swc1 $f6, 0x0068($v0) ## 00000068 -/* 00A84 80A17F94 8FBF0024 */ lw $ra, 0x0024($sp) +/* 00A84 80A17F94 8FBF0024 */ lw $ra, 0x0024($sp) /* 00A88 80A17F98 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 00A8C 80A17F9C 03E00008 */ jr $ra +/* 00A8C 80A17F9C 03E00008 */ jr $ra /* 00A90 80A17FA0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A17FA4.s b/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A17FA4.s index b7b007ed70..894db06fe4 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A17FA4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A17FA4.s @@ -4,88 +4,88 @@ glabel func_80A17FA4 /* 00A9C 80A17FAC 44812000 */ mtc1 $at, $f4 ## $f4 = 45.00 /* 00AA0 80A17FB0 3C01C040 */ lui $at, 0xC040 ## $at = C0400000 /* 00AA4 80A17FB4 44813000 */ mtc1 $at, $f6 ## $f6 = -3.00 -/* 00AA8 80A17FB8 AFB00028 */ sw $s0, 0x0028($sp) -/* 00AAC 80A17FBC AFA50044 */ sw $a1, 0x0044($sp) +/* 00AA8 80A17FB8 AFB00028 */ sw $s0, 0x0028($sp) +/* 00AAC 80A17FBC AFA50044 */ sw $a1, 0x0044($sp) /* 00AB0 80A17FC0 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00AB4 80A17FC4 AFBF002C */ sw $ra, 0x002C($sp) +/* 00AB4 80A17FC4 AFBF002C */ sw $ra, 0x002C($sp) /* 00AB8 80A17FC8 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 00ABC 80A17FCC 240E0002 */ addiu $t6, $zero, 0x0002 ## $t6 = 00000002 -/* 00AC0 80A17FD0 AFAE0014 */ sw $t6, 0x0014($sp) +/* 00AC0 80A17FD0 AFAE0014 */ sw $t6, 0x0014($sp) /* 00AC4 80A17FD4 24A519CC */ addiu $a1, $a1, 0x19CC ## $a1 = 060019CC /* 00AC8 80A17FD8 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C /* 00ACC 80A17FDC 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 00AD0 80A17FE0 3C074210 */ lui $a3, 0x4210 ## $a3 = 42100000 -/* 00AD4 80A17FE4 E7A40010 */ swc1 $f4, 0x0010($sp) -/* 00AD8 80A17FE8 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 00ADC 80A17FEC E7A60018 */ swc1 $f6, 0x0018($sp) +/* 00AD4 80A17FE4 E7A40010 */ swc1 $f4, 0x0010($sp) +/* 00AD8 80A17FE8 0C029468 */ jal SkelAnime_ChangeAnim + +/* 00ADC 80A17FEC E7A60018 */ swc1 $f6, 0x0018($sp) /* 00AE0 80A17FF0 8E0F0004 */ lw $t7, 0x0004($s0) ## 00000004 /* 00AE4 80A17FF4 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 /* 00AE8 80A17FF8 2401FFFE */ addiu $at, $zero, 0xFFFE ## $at = FFFFFFFE -/* 00AEC 80A17FFC 01E1C024 */ and $t8, $t7, $at +/* 00AEC 80A17FFC 01E1C024 */ and $t8, $t7, $at /* 00AF0 80A18000 AE180004 */ sw $t8, 0x0004($s0) ## 00000004 /* 00AF4 80A18004 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 00AF8 80A18008 E6000068 */ swc1 $f0, 0x0068($s0) ## 00000068 -/* 00AFC 80A1800C 0C285DD2 */ jal func_80A17748 +/* 00AFC 80A1800C 0C285DD2 */ jal func_80A17748 /* 00B00 80A18010 E6000060 */ swc1 $f0, 0x0060($s0) ## 00000060 /* 00B04 80A18014 3C198016 */ lui $t9, 0x8016 ## $t9 = 80160000 /* 00B08 80A18018 8F39E664 */ lw $t9, -0x199C($t9) ## 8015E664 -/* 00B0C 80A1801C 8FA80044 */ lw $t0, 0x0044($sp) -/* 00B10 80A18020 5320001D */ beql $t9, $zero, .L80A18098 +/* 00B0C 80A1801C 8FA80044 */ lw $t0, 0x0044($sp) +/* 00B10 80A18020 5320001D */ beql $t9, $zero, .L80A18098 /* 00B14 80A18024 C6000094 */ lwc1 $f0, 0x0094($s0) ## 00000094 /* 00B18 80A18028 C6000094 */ lwc1 $f0, 0x0094($s0) ## 00000094 /* 00B1C 80A1802C 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 /* 00B20 80A18030 44811000 */ mtc1 $at, $f2 ## $f2 = 20.00 -/* 00B24 80A18034 46000007 */ neg.s $f0, $f0 +/* 00B24 80A18034 46000007 */ neg.s $f0, $f0 /* 00B28 80A18038 3C0141F0 */ lui $at, 0x41F0 ## $at = 41F00000 -/* 00B2C 80A1803C 4602003C */ c.lt.s $f0, $f2 +/* 00B2C 80A1803C 4602003C */ c.lt.s $f0, $f2 /* 00B30 80A18040 00000000 */ nop -/* 00B34 80A18044 45020007 */ bc1fl .L80A18064 +/* 00B34 80A18044 45020007 */ bc1fl .L80A18064 /* 00B38 80A18048 44816000 */ mtc1 $at, $f12 ## $f12 = 30.00 -/* 00B3C 80A1804C 46001006 */ mov.s $f0, $f2 +/* 00B3C 80A1804C 46001006 */ mov.s $f0, $f2 /* 00B40 80A18050 3C01C120 */ lui $at, 0xC120 ## $at = C1200000 /* 00B44 80A18054 44811000 */ mtc1 $at, $f2 ## $f2 = -10.00 -/* 00B48 80A18058 10000027 */ beq $zero, $zero, .L80A180F8 +/* 00B48 80A18058 10000027 */ beq $zero, $zero, .L80A180F8 /* 00B4C 80A1805C C5080028 */ lwc1 $f8, 0x0028($t0) ## 00000028 /* 00B50 80A18060 44816000 */ mtc1 $at, $f12 ## $f12 = -10.00 .L80A18064: /* 00B54 80A18064 3C01C120 */ lui $at, 0xC120 ## $at = C1200000 -/* 00B58 80A18068 4600603C */ c.lt.s $f12, $f0 +/* 00B58 80A18068 4600603C */ c.lt.s $f12, $f0 /* 00B5C 80A1806C 00000000 */ nop -/* 00B60 80A18070 45020004 */ bc1fl .L80A18084 -/* 00B64 80A18074 46000086 */ mov.s $f2, $f0 -/* 00B68 80A18078 10000002 */ beq $zero, $zero, .L80A18084 -/* 00B6C 80A1807C 46006086 */ mov.s $f2, $f12 -/* 00B70 80A18080 46000086 */ mov.s $f2, $f0 +/* 00B60 80A18070 45020004 */ bc1fl .L80A18084 +/* 00B64 80A18074 46000086 */ mov.s $f2, $f0 +/* 00B68 80A18078 10000002 */ beq $zero, $zero, .L80A18084 +/* 00B6C 80A1807C 46006086 */ mov.s $f2, $f12 +/* 00B70 80A18080 46000086 */ mov.s $f2, $f0 .L80A18084: -/* 00B74 80A18084 46001006 */ mov.s $f0, $f2 +/* 00B74 80A18084 46001006 */ mov.s $f0, $f2 /* 00B78 80A18088 44811000 */ mtc1 $at, $f2 ## $f2 = -10.00 -/* 00B7C 80A1808C 1000001A */ beq $zero, $zero, .L80A180F8 +/* 00B7C 80A1808C 1000001A */ beq $zero, $zero, .L80A180F8 /* 00B80 80A18090 C5080028 */ lwc1 $f8, 0x0028($t0) ## 00000028 /* 00B84 80A18094 C6000094 */ lwc1 $f0, 0x0094($s0) ## 00000094 .L80A18098: /* 00B88 80A18098 3C0141C8 */ lui $at, 0x41C8 ## $at = 41C80000 /* 00B8C 80A1809C 44811000 */ mtc1 $at, $f2 ## $f2 = 25.00 -/* 00B90 80A180A0 46000007 */ neg.s $f0, $f0 +/* 00B90 80A180A0 46000007 */ neg.s $f0, $f0 /* 00B94 80A180A4 3C014234 */ lui $at, 0x4234 ## $at = 42340000 -/* 00B98 80A180A8 4602003C */ c.lt.s $f0, $f2 +/* 00B98 80A180A8 4602003C */ c.lt.s $f0, $f2 /* 00B9C 80A180AC 00000000 */ nop -/* 00BA0 80A180B0 45020004 */ bc1fl .L80A180C4 +/* 00BA0 80A180B0 45020004 */ bc1fl .L80A180C4 /* 00BA4 80A180B4 44816000 */ mtc1 $at, $f12 ## $f12 = 45.00 -/* 00BA8 80A180B8 1000000B */ beq $zero, $zero, .L80A180E8 -/* 00BAC 80A180BC 46001006 */ mov.s $f0, $f2 +/* 00BA8 80A180B8 1000000B */ beq $zero, $zero, .L80A180E8 +/* 00BAC 80A180BC 46001006 */ mov.s $f0, $f2 /* 00BB0 80A180C0 44816000 */ mtc1 $at, $f12 ## $f12 = 45.00 .L80A180C4: /* 00BB4 80A180C4 00000000 */ nop -/* 00BB8 80A180C8 4600603C */ c.lt.s $f12, $f0 +/* 00BB8 80A180C8 4600603C */ c.lt.s $f12, $f0 /* 00BBC 80A180CC 00000000 */ nop -/* 00BC0 80A180D0 45020004 */ bc1fl .L80A180E4 -/* 00BC4 80A180D4 46000086 */ mov.s $f2, $f0 -/* 00BC8 80A180D8 10000002 */ beq $zero, $zero, .L80A180E4 -/* 00BCC 80A180DC 46006086 */ mov.s $f2, $f12 -/* 00BD0 80A180E0 46000086 */ mov.s $f2, $f0 +/* 00BC0 80A180D0 45020004 */ bc1fl .L80A180E4 +/* 00BC4 80A180D4 46000086 */ mov.s $f2, $f0 +/* 00BC8 80A180D8 10000002 */ beq $zero, $zero, .L80A180E4 +/* 00BCC 80A180DC 46006086 */ mov.s $f2, $f12 +/* 00BD0 80A180E0 46000086 */ mov.s $f2, $f0 .L80A180E4: -/* 00BD4 80A180E4 46001006 */ mov.s $f0, $f2 +/* 00BD4 80A180E4 46001006 */ mov.s $f0, $f2 .L80A180E8: /* 00BD8 80A180E8 3C01C28C */ lui $at, 0xC28C ## $at = C28C0000 /* 00BDC 80A180EC 44811000 */ mtc1 $at, $f2 ## $f2 = -70.00 @@ -93,39 +93,39 @@ glabel func_80A17FA4 /* 00BE4 80A180F4 C5080028 */ lwc1 $f8, 0x0028($t0) ## 00000028 .L80A180F8: /* 00BE8 80A180F8 860400B6 */ lh $a0, 0x00B6($s0) ## 000000B6 -/* 00BEC 80A180FC 46004280 */ add.s $f10, $f8, $f0 +/* 00BEC 80A180FC 46004280 */ add.s $f10, $f8, $f0 /* 00BF0 80A18100 E60A0028 */ swc1 $f10, 0x0028($s0) ## 00000028 /* 00BF4 80A18104 0C01DE1C */ jal Math_Sins ## sins? -/* 00BF8 80A18108 E7A20038 */ swc1 $f2, 0x0038($sp) +/* 00BF8 80A18108 E7A20038 */ swc1 $f2, 0x0038($sp) /* 00BFC 80A1810C 3C0180A2 */ lui $at, %hi(D_80A1A578) ## $at = 80A20000 -/* 00C00 80A18110 C430A578 */ lwc1 $f16, %lo(D_80A1A578)($at) -/* 00C04 80A18114 C7A20038 */ lwc1 $f2, 0x0038($sp) -/* 00C08 80A18118 8FA90044 */ lw $t1, 0x0044($sp) +/* 00C00 80A18110 C430A578 */ lwc1 $f16, %lo(D_80A1A578)($at) +/* 00C04 80A18114 C7A20038 */ lwc1 $f2, 0x0038($sp) +/* 00C08 80A18118 8FA90044 */ lw $t1, 0x0044($sp) /* 00C0C 80A1811C 860400B6 */ lh $a0, 0x00B6($s0) ## 000000B6 -/* 00C10 80A18120 46101302 */ mul.s $f12, $f2, $f16 +/* 00C10 80A18120 46101302 */ mul.s $f12, $f2, $f16 /* 00C14 80A18124 C5240024 */ lwc1 $f4, 0x0024($t1) ## 00000024 -/* 00C18 80A18128 460C0482 */ mul.s $f18, $f0, $f12 -/* 00C1C 80A1812C 46049180 */ add.s $f6, $f18, $f4 +/* 00C18 80A18128 460C0482 */ mul.s $f18, $f0, $f12 +/* 00C1C 80A1812C 46049180 */ add.s $f6, $f18, $f4 /* 00C20 80A18130 E6060024 */ swc1 $f6, 0x0024($s0) ## 00000024 /* 00C24 80A18134 0C01DE0D */ jal Math_Coss ## coss? -/* 00C28 80A18138 E7AC0030 */ swc1 $f12, 0x0030($sp) -/* 00C2C 80A1813C C7AC0030 */ lwc1 $f12, 0x0030($sp) -/* 00C30 80A18140 8FAA0044 */ lw $t2, 0x0044($sp) +/* 00C28 80A18138 E7AC0030 */ swc1 $f12, 0x0030($sp) +/* 00C2C 80A1813C C7AC0030 */ lwc1 $f12, 0x0030($sp) +/* 00C30 80A18140 8FAA0044 */ lw $t2, 0x0044($sp) /* 00C34 80A18144 3C0C80A2 */ lui $t4, %hi(func_80A193C4) ## $t4 = 80A20000 -/* 00C38 80A18148 460C0202 */ mul.s $f8, $f0, $f12 +/* 00C38 80A18148 460C0202 */ mul.s $f8, $f0, $f12 /* 00C3C 80A1814C C54A002C */ lwc1 $f10, 0x002C($t2) ## 0000002C /* 00C40 80A18150 240BB320 */ addiu $t3, $zero, 0xB320 ## $t3 = FFFFB320 /* 00C44 80A18154 258C93C4 */ addiu $t4, $t4, %lo(func_80A193C4) ## $t4 = 80A193C4 /* 00C48 80A18158 A60B00B4 */ sh $t3, 0x00B4($s0) ## 000000B4 /* 00C4C 80A1815C AE0C0190 */ sw $t4, 0x0190($s0) ## 00000190 -/* 00C50 80A18160 460A4400 */ add.s $f16, $f8, $f10 +/* 00C50 80A18160 460A4400 */ add.s $f16, $f8, $f10 /* 00C54 80A18164 E610002C */ swc1 $f16, 0x002C($s0) ## 0000002C -/* 00C58 80A18168 8FBF002C */ lw $ra, 0x002C($sp) -/* 00C5C 80A1816C 8FB00028 */ lw $s0, 0x0028($sp) +/* 00C58 80A18168 8FBF002C */ lw $ra, 0x002C($sp) +/* 00C5C 80A1816C 8FB00028 */ lw $s0, 0x0028($sp) /* 00C60 80A18170 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 -/* 00C64 80A18174 03E00008 */ jr $ra +/* 00C64 80A18174 03E00008 */ jr $ra /* 00C68 80A18178 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A1817C.s b/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A1817C.s index 45b5777c8b..b1677a05f6 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A1817C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A1817C.s @@ -1,25 +1,25 @@ glabel func_80A1817C /* 00C6C 80A1817C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00C70 80A18180 AFBF0014 */ sw $ra, 0x0014($sp) +/* 00C70 80A18180 AFBF0014 */ sw $ra, 0x0014($sp) /* 00C74 80A18184 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 /* 00C78 80A18188 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 /* 00C7C 80A1818C 24A59DB0 */ addiu $a1, $a1, 0x9DB0 ## $a1 = 06009DB0 -/* 00C80 80A18190 AFA60018 */ sw $a2, 0x0018($sp) -/* 00C84 80A18194 0C02947A */ jal func_800A51E8 +/* 00C80 80A18190 AFA60018 */ sw $a2, 0x0018($sp) +/* 00C84 80A18194 0C02947A */ jal SkelAnime_ChangeAnimDefaultStop /* 00C88 80A18198 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 00C8C 80A1819C 8FA40018 */ lw $a0, 0x0018($sp) +/* 00C8C 80A1819C 8FA40018 */ lw $a0, 0x0018($sp) /* 00C90 80A181A0 848E019A */ lh $t6, 0x019A($a0) ## 0000019A /* 00C94 80A181A4 A4800194 */ sh $zero, 0x0194($a0) ## 00000194 /* 00C98 80A181A8 25CF05DC */ addiu $t7, $t6, 0x05DC ## $t7 = 000005DC -/* 00C9C 80A181AC 0C285DD2 */ jal func_80A17748 +/* 00C9C 80A181AC 0C285DD2 */ jal func_80A17748 /* 00CA0 80A181B0 A48F019A */ sh $t7, 0x019A($a0) ## 0000019A -/* 00CA4 80A181B4 8FA60018 */ lw $a2, 0x0018($sp) +/* 00CA4 80A181B4 8FA60018 */ lw $a2, 0x0018($sp) /* 00CA8 80A181B8 3C1880A2 */ lui $t8, %hi(func_80A198EC) ## $t8 = 80A20000 /* 00CAC 80A181BC 271898EC */ addiu $t8, $t8, %lo(func_80A198EC) ## $t8 = 80A198EC /* 00CB0 80A181C0 ACD80190 */ sw $t8, 0x0190($a2) ## 00000190 -/* 00CB4 80A181C4 8FBF0014 */ lw $ra, 0x0014($sp) +/* 00CB4 80A181C4 8FBF0014 */ lw $ra, 0x0014($sp) /* 00CB8 80A181C8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00CBC 80A181CC 03E00008 */ jr $ra +/* 00CBC 80A181CC 03E00008 */ jr $ra /* 00CC0 80A181D0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A18254.s b/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A18254.s index 8b3bb5d8d1..bf3618cd75 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A18254.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A18254.s @@ -1,38 +1,38 @@ glabel func_80A18254 /* 00D44 80A18254 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 00D48 80A18258 AFB00020 */ sw $s0, 0x0020($sp) +/* 00D48 80A18258 AFB00020 */ sw $s0, 0x0020($sp) /* 00D4C 80A1825C 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00D50 80A18260 AFBF0024 */ sw $ra, 0x0024($sp) +/* 00D50 80A18260 AFBF0024 */ sw $ra, 0x0024($sp) /* 00D54 80A18264 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 00D58 80A18268 24A50590 */ addiu $a1, $a1, 0x0590 ## $a1 = 06000590 /* 00D5C 80A1826C 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 00D60 80A18270 0C029490 */ jal func_800A5240 +/* 00D60 80A18270 0C029490 */ jal SkelAnime_ChangeAnimTransitionStop /* 00D64 80A18274 3C06C040 */ lui $a2, 0xC040 ## $a2 = C0400000 /* 00D68 80A18278 8E0E0304 */ lw $t6, 0x0304($s0) ## 00000304 /* 00D6C 80A1827C 3C010001 */ lui $at, 0x0001 ## $at = 00010000 /* 00D70 80A18280 3421F824 */ ori $at, $at, 0xF824 ## $at = 0001F824 /* 00D74 80A18284 8DCF0000 */ lw $t7, 0x0000($t6) ## 00000000 /* 00D78 80A18288 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00D7C 80A1828C 01E1C024 */ and $t8, $t7, $at -/* 00D80 80A18290 13000005 */ beq $t8, $zero, .L80A182A8 +/* 00D7C 80A1828C 01E1C024 */ and $t8, $t7, $at +/* 00D80 80A18290 13000005 */ beq $t8, $zero, .L80A182A8 /* 00D84 80A18294 00000000 */ nop /* 00D88 80A18298 8E1902D0 */ lw $t9, 0x02D0($s0) ## 000002D0 /* 00D8C 80A1829C 87280032 */ lh $t0, 0x0032($t9) ## 00000032 -/* 00D90 80A182A0 10000006 */ beq $zero, $zero, .L80A182BC +/* 00D90 80A182A0 10000006 */ beq $zero, $zero, .L80A182BC /* 00D94 80A182A4 A6080032 */ sh $t0, 0x0032($s0) ## 00000032 .L80A182A8: -/* 00D98 80A182A8 0C00B69E */ jal func_8002DA78 +/* 00D98 80A182A8 0C00B69E */ jal func_8002DA78 /* 00D9C 80A182AC 8E0502D0 */ lw $a1, 0x02D0($s0) ## 000002D0 /* 00DA0 80A182B0 34018000 */ ori $at, $zero, 0x8000 ## $at = 00008000 -/* 00DA4 80A182B4 00414821 */ addu $t1, $v0, $at +/* 00DA4 80A182B4 00414821 */ addu $t1, $v0, $at /* 00DA8 80A182B8 A6090032 */ sh $t1, 0x0032($s0) ## 00000032 .L80A182BC: /* 00DAC 80A182BC 240A0014 */ addiu $t2, $zero, 0x0014 ## $t2 = 00000014 -/* 00DB0 80A182C0 AFAA0010 */ sw $t2, 0x0010($sp) +/* 00DB0 80A182C0 AFAA0010 */ sw $t2, 0x0010($sp) /* 00DB4 80A182C4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 00DB8 80A182C8 24054000 */ addiu $a1, $zero, 0x4000 ## $a1 = 00004000 /* 00DBC 80A182CC 240600FF */ addiu $a2, $zero, 0x00FF ## $a2 = 000000FF -/* 00DC0 80A182D0 0C00D09B */ jal func_8003426C +/* 00DC0 80A182D0 0C00D09B */ jal func_8003426C /* 00DC4 80A182D4 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 /* 00DC8 80A182D8 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 /* 00DCC 80A182DC 44812000 */ mtc1 $at, $f4 ## $f4 = 5.00 @@ -43,10 +43,10 @@ glabel func_80A18254 /* 00DE0 80A182F0 AE0B0190 */ sw $t3, 0x0190($s0) ## 00000190 /* 00DE4 80A182F4 E6040068 */ swc1 $f4, 0x0068($s0) ## 00000068 /* 00DE8 80A182F8 E6060060 */ swc1 $f6, 0x0060($s0) ## 00000060 -/* 00DEC 80A182FC 8FBF0024 */ lw $ra, 0x0024($sp) -/* 00DF0 80A18300 8FB00020 */ lw $s0, 0x0020($sp) +/* 00DEC 80A182FC 8FBF0024 */ lw $ra, 0x0024($sp) +/* 00DF0 80A18300 8FB00020 */ lw $s0, 0x0020($sp) /* 00DF4 80A18304 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 00DF8 80A18308 03E00008 */ jr $ra +/* 00DF8 80A18308 03E00008 */ jr $ra /* 00DFC 80A1830C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A18310.s b/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A18310.s index 4d289f3858..1f89ba882c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A18310.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A18310.s @@ -1,13 +1,13 @@ glabel func_80A18310 /* 00E00 80A18310 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00E04 80A18314 AFBF0014 */ sw $ra, 0x0014($sp) +/* 00E04 80A18314 AFBF0014 */ sw $ra, 0x0014($sp) /* 00E08 80A18318 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 /* 00E0C 80A1831C 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 00E10 80A18320 24A50EA4 */ addiu $a1, $a1, 0x0EA4 ## $a1 = 06000EA4 -/* 00E14 80A18324 AFA60018 */ sw $a2, 0x0018($sp) -/* 00E18 80A18328 0C02947A */ jal func_800A51E8 +/* 00E14 80A18324 AFA60018 */ sw $a2, 0x0018($sp) +/* 00E18 80A18328 0C02947A */ jal SkelAnime_ChangeAnimDefaultStop /* 00E1C 80A1832C 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 00E20 80A18330 8FA60018 */ lw $a2, 0x0018($sp) +/* 00E20 80A18330 8FA60018 */ lw $a2, 0x0018($sp) /* 00E24 80A18334 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 /* 00E28 80A18338 3C0F80A2 */ lui $t7, %hi(func_80A19C6C) ## $t7 = 80A20000 /* 00E2C 80A1833C 84CE00B6 */ lh $t6, 0x00B6($a2) ## 000000B6 @@ -16,9 +16,9 @@ glabel func_80A18310 /* 00E38 80A18348 E4C00068 */ swc1 $f0, 0x0068($a2) ## 00000068 /* 00E3C 80A1834C E4C00060 */ swc1 $f0, 0x0060($a2) ## 00000060 /* 00E40 80A18350 A4CE0032 */ sh $t6, 0x0032($a2) ## 00000032 -/* 00E44 80A18354 8FBF0014 */ lw $ra, 0x0014($sp) +/* 00E44 80A18354 8FBF0014 */ lw $ra, 0x0014($sp) /* 00E48 80A18358 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00E4C 80A1835C 03E00008 */ jr $ra +/* 00E4C 80A1835C 03E00008 */ jr $ra /* 00E50 80A18360 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A18364.s b/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A18364.s index 29f9babe9c..1dbb8f7e7d 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A18364.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A18364.s @@ -4,59 +4,59 @@ glabel func_80A18364 /* 00E5C 80A1836C 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 /* 00E60 80A18370 3C01C040 */ lui $at, 0xC040 ## $at = C0400000 /* 00E64 80A18374 44813000 */ mtc1 $at, $f6 ## $f6 = -3.00 -/* 00E68 80A18378 AFB00028 */ sw $s0, 0x0028($sp) +/* 00E68 80A18378 AFB00028 */ sw $s0, 0x0028($sp) /* 00E6C 80A1837C 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00E70 80A18380 AFBF002C */ sw $ra, 0x002C($sp) +/* 00E70 80A18380 AFBF002C */ sw $ra, 0x002C($sp) /* 00E74 80A18384 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 00E78 80A18388 240E0002 */ addiu $t6, $zero, 0x0002 ## $t6 = 00000002 -/* 00E7C 80A1838C AFAE0014 */ sw $t6, 0x0014($sp) +/* 00E7C 80A1838C AFAE0014 */ sw $t6, 0x0014($sp) /* 00E80 80A18390 24A519CC */ addiu $a1, $a1, 0x19CC ## $a1 = 060019CC /* 00E84 80A18394 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C /* 00E88 80A18398 3C063FC0 */ lui $a2, 0x3FC0 ## $a2 = 3FC00000 /* 00E8C 80A1839C 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 00E90 80A183A0 E7A40010 */ swc1 $f4, 0x0010($sp) -/* 00E94 80A183A4 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 00E98 80A183A8 E7A60018 */ swc1 $f6, 0x0018($sp) +/* 00E90 80A183A0 E7A40010 */ swc1 $f4, 0x0010($sp) +/* 00E94 80A183A4 0C029468 */ jal SkelAnime_ChangeAnim + +/* 00E98 80A183A8 E7A60018 */ swc1 $f6, 0x0018($sp) /* 00E9C 80A183AC 920F00B1 */ lbu $t7, 0x00B1($s0) ## 000000B1 /* 00EA0 80A183B0 44804000 */ mtc1 $zero, $f8 ## $f8 = 0.00 /* 00EA4 80A183B4 24010004 */ addiu $at, $zero, 0x0004 ## $at = 00000004 -/* 00EA8 80A183B8 15E1000A */ bne $t7, $at, .L80A183E4 +/* 00EA8 80A183B8 15E1000A */ bne $t7, $at, .L80A183E4 /* 00EAC 80A183BC E6080068 */ swc1 $f8, 0x0068($s0) ## 00000068 /* 00EB0 80A183C0 24180050 */ addiu $t8, $zero, 0x0050 ## $t8 = 00000050 -/* 00EB4 80A183C4 AFB80010 */ sw $t8, 0x0010($sp) +/* 00EB4 80A183C4 AFB80010 */ sw $t8, 0x0010($sp) /* 00EB8 80A183C8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 00EBC 80A183CC 24058000 */ addiu $a1, $zero, 0x8000 ## $a1 = FFFF8000 /* 00EC0 80A183D0 240600FF */ addiu $a2, $zero, 0x00FF ## $a2 = 000000FF -/* 00EC4 80A183D4 0C00D09B */ jal func_8003426C +/* 00EC4 80A183D4 0C00D09B */ jal func_8003426C /* 00EC8 80A183D8 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 00ECC 80A183DC 10000017 */ beq $zero, $zero, .L80A1843C +/* 00ECC 80A183DC 10000017 */ beq $zero, $zero, .L80A1843C /* 00ED0 80A183E0 00000000 */ nop .L80A183E4: /* 00ED4 80A183E4 24190050 */ addiu $t9, $zero, 0x0050 ## $t9 = 00000050 -/* 00ED8 80A183E8 AFB90010 */ sw $t9, 0x0010($sp) +/* 00ED8 80A183E8 AFB90010 */ sw $t9, 0x0010($sp) /* 00EDC 80A183EC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 00EE0 80A183F0 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 00EE4 80A183F4 240600FF */ addiu $a2, $zero, 0x00FF ## $a2 = 000000FF -/* 00EE8 80A183F8 0C00D09B */ jal func_8003426C +/* 00EE8 80A183F8 0C00D09B */ jal func_8003426C /* 00EEC 80A183FC 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 /* 00EF0 80A18400 3C0180A2 */ lui $at, %hi(D_80A1A57C) ## $at = 80A20000 -/* 00EF4 80A18404 C42AA57C */ lwc1 $f10, %lo(D_80A1A57C)($at) +/* 00EF4 80A18404 C42AA57C */ lwc1 $f10, %lo(D_80A1A57C)($at) /* 00EF8 80A18408 C6100050 */ lwc1 $f16, 0x0050($s0) ## 00000050 /* 00EFC 80A1840C 2405389E */ addiu $a1, $zero, 0x389E ## $a1 = 0000389E /* 00F00 80A18410 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00F04 80A18414 4610503C */ c.lt.s $f10, $f16 +/* 00F04 80A18414 4610503C */ c.lt.s $f10, $f16 /* 00F08 80A18418 00000000 */ nop -/* 00F0C 80A1841C 45000005 */ bc1f .L80A18434 +/* 00F0C 80A1841C 45000005 */ bc1f .L80A18434 /* 00F10 80A18420 00000000 */ nop /* 00F14 80A18424 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 00F18 80A18428 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00F1C 80A1842C 10000003 */ beq $zero, $zero, .L80A1843C +/* 00F1C 80A1842C 10000003 */ beq $zero, $zero, .L80A1843C /* 00F20 80A18430 00000000 */ nop .L80A18434: /* 00F24 80A18434 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 00F28 80A18438 2405389E */ addiu $a1, $zero, 0x389E ## $a1 = 0000389E .L80A1843C: /* 00F2C 80A1843C 3C0980A2 */ lui $t1, %hi(func_80A19CA4) ## $t1 = 80A20000 @@ -64,10 +64,10 @@ glabel func_80A18364 /* 00F34 80A18444 25299CA4 */ addiu $t1, $t1, %lo(func_80A19CA4) ## $t1 = 80A19CA4 /* 00F38 80A18448 A6080194 */ sh $t0, 0x0194($s0) ## 00000194 /* 00F3C 80A1844C AE090190 */ sw $t1, 0x0190($s0) ## 00000190 -/* 00F40 80A18450 8FBF002C */ lw $ra, 0x002C($sp) -/* 00F44 80A18454 8FB00028 */ lw $s0, 0x0028($sp) +/* 00F40 80A18450 8FBF002C */ lw $ra, 0x002C($sp) +/* 00F44 80A18454 8FB00028 */ lw $s0, 0x0028($sp) /* 00F48 80A18458 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 00F4C 80A1845C 03E00008 */ jr $ra +/* 00F4C 80A1845C 03E00008 */ jr $ra /* 00F50 80A18460 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A198EC.s b/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A198EC.s index 222fd53494..ff44e6082c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A198EC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A198EC.s @@ -1,49 +1,49 @@ glabel func_80A198EC /* 023DC 80A198EC 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 -/* 023E0 80A198F0 AFBF001C */ sw $ra, 0x001C($sp) -/* 023E4 80A198F4 AFB00018 */ sw $s0, 0x0018($sp) -/* 023E8 80A198F8 AFA50044 */ sw $a1, 0x0044($sp) +/* 023E0 80A198F0 AFBF001C */ sw $ra, 0x001C($sp) +/* 023E4 80A198F4 AFB00018 */ sw $s0, 0x0018($sp) +/* 023E8 80A198F8 AFA50044 */ sw $a1, 0x0044($sp) /* 023EC 80A198FC 8482019A */ lh $v0, 0x019A($a0) ## 0000019A /* 023F0 80A19900 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 023F4 80A19904 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 023F8 80A19908 10400003 */ beq $v0, $zero, .L80A19918 +/* 023F8 80A19908 10400003 */ beq $v0, $zero, .L80A19918 /* 023FC 80A1990C 244EFFFF */ addiu $t6, $v0, 0xFFFF ## $t6 = FFFFFFFF /* 02400 80A19910 A48E019A */ sh $t6, 0x019A($a0) ## 0000019A /* 02404 80A19914 8482019A */ lh $v0, 0x019A($a0) ## 0000019A .L80A19918: /* 02408 80A19918 8E040118 */ lw $a0, 0x0118($s0) ## 00000118 -/* 0240C 80A1991C 14400016 */ bne $v0, $zero, .L80A19978 +/* 0240C 80A1991C 14400016 */ bne $v0, $zero, .L80A19978 /* 02410 80A19920 8E07011C */ lw $a3, 0x011C($s0) ## 0000011C /* 02414 80A19924 8C8F0190 */ lw $t7, 0x0190($a0) ## 00000190 /* 02418 80A19928 3C0280A2 */ lui $v0, %hi(func_80A19B9C) ## $v0 = 80A20000 /* 0241C 80A1992C 24429B9C */ addiu $v0, $v0, %lo(func_80A19B9C) ## $v0 = 80A19B9C -/* 02420 80A19930 104F0008 */ beq $v0, $t7, .L80A19954 -/* 02424 80A19934 8FA50044 */ lw $a1, 0x0044($sp) -/* 02428 80A19938 AFA20028 */ sw $v0, 0x0028($sp) -/* 0242C 80A1993C AFA60034 */ sw $a2, 0x0034($sp) -/* 02430 80A19940 0C285F7F */ jal func_80A17DFC -/* 02434 80A19944 AFA70038 */ sw $a3, 0x0038($sp) -/* 02438 80A19948 8FA20028 */ lw $v0, 0x0028($sp) -/* 0243C 80A1994C 8FA60034 */ lw $a2, 0x0034($sp) -/* 02440 80A19950 8FA70038 */ lw $a3, 0x0038($sp) +/* 02420 80A19930 104F0008 */ beq $v0, $t7, .L80A19954 +/* 02424 80A19934 8FA50044 */ lw $a1, 0x0044($sp) +/* 02428 80A19938 AFA20028 */ sw $v0, 0x0028($sp) +/* 0242C 80A1993C AFA60034 */ sw $a2, 0x0034($sp) +/* 02430 80A19940 0C285F7F */ jal func_80A17DFC +/* 02434 80A19944 AFA70038 */ sw $a3, 0x0038($sp) +/* 02438 80A19948 8FA20028 */ lw $v0, 0x0028($sp) +/* 0243C 80A1994C 8FA60034 */ lw $a2, 0x0034($sp) +/* 02440 80A19950 8FA70038 */ lw $a3, 0x0038($sp) .L80A19954: /* 02444 80A19954 8CF80190 */ lw $t8, 0x0190($a3) ## 00000190 /* 02448 80A19958 00E02025 */ or $a0, $a3, $zero ## $a0 = 00000000 -/* 0244C 80A1995C 8FA50044 */ lw $a1, 0x0044($sp) -/* 02450 80A19960 50580017 */ beql $v0, $t8, .L80A199C0 +/* 0244C 80A1995C 8FA50044 */ lw $a1, 0x0044($sp) +/* 02450 80A19960 50580017 */ beql $v0, $t8, .L80A199C0 /* 02454 80A19964 C6020050 */ lwc1 $f2, 0x0050($s0) ## 00000050 -/* 02458 80A19968 0C285F7F */ jal func_80A17DFC -/* 0245C 80A1996C AFA60034 */ sw $a2, 0x0034($sp) -/* 02460 80A19970 10000012 */ beq $zero, $zero, .L80A199BC -/* 02464 80A19974 8FA60034 */ lw $a2, 0x0034($sp) +/* 02458 80A19968 0C285F7F */ jal func_80A17DFC +/* 0245C 80A1996C AFA60034 */ sw $a2, 0x0034($sp) +/* 02460 80A19970 10000012 */ beq $zero, $zero, .L80A199BC +/* 02464 80A19974 8FA60034 */ lw $a2, 0x0034($sp) .L80A19978: /* 02468 80A19978 8C830190 */ lw $v1, 0x0190($a0) ## 00000190 /* 0246C 80A1997C 3C0280A2 */ lui $v0, %hi(func_80A19B9C) ## $v0 = 80A20000 /* 02470 80A19980 24429B9C */ addiu $v0, $v0, %lo(func_80A19B9C) ## $v0 = 80A19B9C -/* 02474 80A19984 10430005 */ beq $v0, $v1, .L80A1999C +/* 02474 80A19984 10430005 */ beq $v0, $v1, .L80A1999C /* 02478 80A19988 3C1980A2 */ lui $t9, %hi(func_80A19230) ## $t9 = 80A20000 /* 0247C 80A1998C 27399230 */ addiu $t9, $t9, %lo(func_80A19230) ## $t9 = 80A19230 -/* 02480 80A19990 53230003 */ beql $t9, $v1, .L80A199A0 +/* 02480 80A19990 53230003 */ beql $t9, $v1, .L80A199A0 /* 02484 80A19994 8CE30190 */ lw $v1, 0x0190($a3) ## 00000190 /* 02488 80A19998 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 .L80A1999C: @@ -51,62 +51,62 @@ glabel func_80A198EC .L80A199A0: /* 02490 80A199A0 3C0880A2 */ lui $t0, %hi(func_80A19230) ## $t0 = 80A20000 /* 02494 80A199A4 25089230 */ addiu $t0, $t0, %lo(func_80A19230) ## $t0 = 80A19230 -/* 02498 80A199A8 50430005 */ beql $v0, $v1, .L80A199C0 +/* 02498 80A199A8 50430005 */ beql $v0, $v1, .L80A199C0 /* 0249C 80A199AC C6020050 */ lwc1 $f2, 0x0050($s0) ## 00000050 -/* 024A0 80A199B0 51030003 */ beql $t0, $v1, .L80A199C0 +/* 024A0 80A199B0 51030003 */ beql $t0, $v1, .L80A199C0 /* 024A4 80A199B4 C6020050 */ lwc1 $f2, 0x0050($s0) ## 00000050 /* 024A8 80A199B8 24C60001 */ addiu $a2, $a2, 0x0001 ## $a2 = 00000002 .L80A199BC: /* 024AC 80A199BC C6020050 */ lwc1 $f2, 0x0050($s0) ## 00000050 .L80A199C0: /* 024B0 80A199C0 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 024B4 80A199C4 14C1000B */ bne $a2, $at, .L80A199F4 -/* 024B8 80A199C8 46001306 */ mov.s $f12, $f2 +/* 024B4 80A199C4 14C1000B */ bne $a2, $at, .L80A199F4 +/* 024B8 80A199C8 46001306 */ mov.s $f12, $f2 /* 024BC 80A199CC 3C053BE5 */ lui $a1, 0x3BE5 ## $a1 = 3BE50000 /* 024C0 80A199D0 3C063A03 */ lui $a2, 0x3A03 ## $a2 = 3A030000 /* 024C4 80A199D4 34C6126F */ ori $a2, $a2, 0x126F ## $a2 = 3A03126F /* 024C8 80A199D8 34A56042 */ ori $a1, $a1, 0x6042 ## $a1 = 3BE56042 /* 024CC 80A199DC 26040050 */ addiu $a0, $s0, 0x0050 ## $a0 = 00000050 /* 024D0 80A199E0 0C01DE80 */ jal Math_ApproxF - -/* 024D4 80A199E4 E7AC0030 */ swc1 $f12, 0x0030($sp) -/* 024D8 80A199E8 C7AC0030 */ lwc1 $f12, 0x0030($sp) -/* 024DC 80A199EC 1000000B */ beq $zero, $zero, .L80A19A1C + +/* 024D4 80A199E4 E7AC0030 */ swc1 $f12, 0x0030($sp) +/* 024D8 80A199E8 C7AC0030 */ lwc1 $f12, 0x0030($sp) +/* 024DC 80A199EC 1000000B */ beq $zero, $zero, .L80A19A1C /* 024E0 80A199F0 C6020050 */ lwc1 $f2, 0x0050($s0) ## 00000050 .L80A199F4: -/* 024E4 80A199F4 14C00009 */ bne $a2, $zero, .L80A19A1C +/* 024E4 80A199F4 14C00009 */ bne $a2, $zero, .L80A19A1C /* 024E8 80A199F8 26040050 */ addiu $a0, $s0, 0x0050 ## $a0 = 00000050 /* 024EC 80A199FC 3C053C23 */ lui $a1, 0x3C23 ## $a1 = 3C230000 /* 024F0 80A19A00 3C063A03 */ lui $a2, 0x3A03 ## $a2 = 3A030000 /* 024F4 80A19A04 34C6126F */ ori $a2, $a2, 0x126F ## $a2 = 3A03126F /* 024F8 80A19A08 34A5D70A */ ori $a1, $a1, 0xD70A ## $a1 = 3C23D70A /* 024FC 80A19A0C 0C01DE80 */ jal Math_ApproxF - -/* 02500 80A19A10 E7AC0030 */ swc1 $f12, 0x0030($sp) -/* 02504 80A19A14 C7AC0030 */ lwc1 $f12, 0x0030($sp) + +/* 02500 80A19A10 E7AC0030 */ swc1 $f12, 0x0030($sp) +/* 02504 80A19A14 C7AC0030 */ lwc1 $f12, 0x0030($sp) /* 02508 80A19A18 C6020050 */ lwc1 $f2, 0x0050($s0) ## 00000050 .L80A19A1C: /* 0250C 80A19A1C E6020058 */ swc1 $f2, 0x0058($s0) ## 00000058 /* 02510 80A19A20 E6020054 */ swc1 $f2, 0x0054($s0) ## 00000054 /* 02514 80A19A24 3C0180A2 */ lui $at, %hi(D_80A1A5A0) ## $at = 80A20000 -/* 02518 80A19A28 C424A5A0 */ lwc1 $f4, %lo(D_80A1A5A0)($at) +/* 02518 80A19A28 C424A5A0 */ lwc1 $f4, %lo(D_80A1A5A0)($at) /* 0251C 80A19A2C 3C0180A2 */ lui $at, %hi(D_80A1A5A4) ## $at = 80A20000 -/* 02520 80A19A30 46046032 */ c.eq.s $f12, $f4 +/* 02520 80A19A30 46046032 */ c.eq.s $f12, $f4 /* 02524 80A19A34 00000000 */ nop -/* 02528 80A19A38 45030007 */ bc1tl .L80A19A58 -/* 0252C 80A19A3C 46026032 */ c.eq.s $f12, $f2 -/* 02530 80A19A40 C426A5A4 */ lwc1 $f6, %lo(D_80A1A5A4)($at) -/* 02534 80A19A44 46066032 */ c.eq.s $f12, $f6 +/* 02528 80A19A38 45030007 */ bc1tl .L80A19A58 +/* 0252C 80A19A3C 46026032 */ c.eq.s $f12, $f2 +/* 02530 80A19A40 C426A5A4 */ lwc1 $f6, %lo(D_80A1A5A4)($at) +/* 02534 80A19A44 46066032 */ c.eq.s $f12, $f6 /* 02538 80A19A48 00000000 */ nop -/* 0253C 80A19A4C 45000008 */ bc1f .L80A19A70 +/* 0253C 80A19A4C 45000008 */ bc1f .L80A19A70 /* 02540 80A19A50 00000000 */ nop -/* 02544 80A19A54 46026032 */ c.eq.s $f12, $f2 +/* 02544 80A19A54 46026032 */ c.eq.s $f12, $f2 .L80A19A58: /* 02548 80A19A58 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0254C 80A19A5C 45010004 */ bc1t .L80A19A70 +/* 0254C 80A19A5C 45010004 */ bc1t .L80A19A70 /* 02550 80A19A60 00000000 */ nop /* 02554 80A19A64 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 02558 80A19A68 24053934 */ addiu $a1, $zero, 0x3934 ## $a1 = 00003934 /* 0255C 80A19A6C C6020050 */ lwc1 $f2, 0x0050($s0) ## 00000050 .L80A19A70: @@ -117,78 +117,78 @@ glabel func_80A198EC /* 02570 80A19A80 44810000 */ mtc1 $at, $f0 ## $f0 = 100.00 /* 02574 80A19A84 44894000 */ mtc1 $t1, $f8 ## $f8 = 0.00 /* 02578 80A19A88 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C -/* 0257C 80A19A8C 468042A0 */ cvt.s.w $f10, $f8 -/* 02580 80A19A90 46005402 */ mul.s $f16, $f10, $f0 +/* 0257C 80A19A8C 468042A0 */ cvt.s.w $f10, $f8 +/* 02580 80A19A90 46005402 */ mul.s $f16, $f10, $f0 /* 02584 80A19A94 00000000 */ nop -/* 02588 80A19A98 46028482 */ mul.s $f18, $f16, $f2 -/* 0258C 80A19A9C 4600910D */ trunc.w.s $f4, $f18 -/* 02590 80A19AA0 440B2000 */ mfc1 $t3, $f4 +/* 02588 80A19A98 46028482 */ mul.s $f18, $f16, $f2 +/* 0258C 80A19A9C 4600910D */ trunc.w.s $f4, $f18 +/* 02590 80A19AA0 440B2000 */ mfc1 $t3, $f4 /* 02594 80A19AA4 00000000 */ nop /* 02598 80A19AA8 A60B0308 */ sh $t3, 0x0308($s0) ## 00000308 /* 0259C 80A19AAC 844C0022 */ lh $t4, 0x0022($v0) ## 80A1A492 /* 025A0 80A19AB0 448C3000 */ mtc1 $t4, $f6 ## $f6 = 0.00 /* 025A4 80A19AB4 00000000 */ nop -/* 025A8 80A19AB8 46803220 */ cvt.s.w $f8, $f6 -/* 025AC 80A19ABC 46004282 */ mul.s $f10, $f8, $f0 +/* 025A8 80A19AB8 46803220 */ cvt.s.w $f8, $f6 +/* 025AC 80A19ABC 46004282 */ mul.s $f10, $f8, $f0 /* 025B0 80A19AC0 00000000 */ nop -/* 025B4 80A19AC4 46025402 */ mul.s $f16, $f10, $f2 -/* 025B8 80A19AC8 4600848D */ trunc.w.s $f18, $f16 -/* 025BC 80A19ACC 440E9000 */ mfc1 $t6, $f18 +/* 025B4 80A19AC4 46025402 */ mul.s $f16, $f10, $f2 +/* 025B8 80A19AC8 4600848D */ trunc.w.s $f18, $f16 +/* 025BC 80A19ACC 440E9000 */ mfc1 $t6, $f18 /* 025C0 80A19AD0 00000000 */ nop /* 025C4 80A19AD4 A60E030A */ sh $t6, 0x030A($s0) ## 0000030A /* 025C8 80A19AD8 0C02927F */ jal SkelAnime_FrameUpdateMatrix - -/* 025CC 80A19ADC AFA40024 */ sw $a0, 0x0024($sp) -/* 025D0 80A19AE0 10400026 */ beq $v0, $zero, .L80A19B7C -/* 025D4 80A19AE4 8FA40024 */ lw $a0, 0x0024($sp) + +/* 025CC 80A19ADC AFA40024 */ sw $a0, 0x0024($sp) +/* 025D0 80A19AE0 10400026 */ beq $v0, $zero, .L80A19B7C +/* 025D4 80A19AE4 8FA40024 */ lw $a0, 0x0024($sp) /* 025D8 80A19AE8 3C0180A2 */ lui $at, %hi(D_80A1A5A8) ## $at = 80A20000 -/* 025DC 80A19AEC C426A5A8 */ lwc1 $f6, %lo(D_80A1A5A8)($at) +/* 025DC 80A19AEC C426A5A8 */ lwc1 $f6, %lo(D_80A1A5A8)($at) /* 025E0 80A19AF0 C6040050 */ lwc1 $f4, 0x0050($s0) ## 00000050 -/* 025E4 80A19AF4 4604303E */ c.le.s $f6, $f4 +/* 025E4 80A19AF4 4604303E */ c.le.s $f6, $f4 /* 025E8 80A19AF8 00000000 */ nop -/* 025EC 80A19AFC 45020013 */ bc1fl .L80A19B4C +/* 025EC 80A19AFC 45020013 */ bc1fl .L80A19B4C /* 025F0 80A19B00 860A0194 */ lh $t2, 0x0194($s0) ## 00000194 /* 025F4 80A19B04 8E0F0004 */ lw $t7, 0x0004($s0) ## 00000004 /* 025F8 80A19B08 2401FFEF */ addiu $at, $zero, 0xFFEF ## $at = FFFFFFEF /* 025FC 80A19B0C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02600 80A19B10 01E1C024 */ and $t8, $t7, $at -/* 02604 80A19B14 0C285DDA */ jal func_80A17768 +/* 02600 80A19B10 01E1C024 */ and $t8, $t7, $at +/* 02604 80A19B14 0C285DDA */ jal func_80A17768 /* 02608 80A19B18 AE180004 */ sw $t8, 0x0004($s0) ## 00000004 /* 0260C 80A19B1C 921902F6 */ lbu $t9, 0x02F6($s0) ## 000002F6 /* 02610 80A19B20 A600001C */ sh $zero, 0x001C($s0) ## 0000001C /* 02614 80A19B24 3C0980A2 */ lui $t1, %hi(D_80A1A49C) ## $t1 = 80A20000 /* 02618 80A19B28 37280004 */ ori $t0, $t9, 0x0004 ## $t0 = 00000004 /* 0261C 80A19B2C A20802F6 */ sb $t0, 0x02F6($s0) ## 000002F6 -/* 02620 80A19B30 9129A49C */ lbu $t1, %lo(D_80A1A49C)($t1) +/* 02620 80A19B30 9129A49C */ lbu $t1, %lo(D_80A1A49C)($t1) /* 02624 80A19B34 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02628 80A19B38 0C285DF2 */ jal func_80A177C8 +/* 02628 80A19B38 0C285DF2 */ jal func_80A177C8 /* 0262C 80A19B3C A20900AF */ sb $t1, 0x00AF($s0) ## 000000AF -/* 02630 80A19B40 1000000F */ beq $zero, $zero, .L80A19B80 +/* 02630 80A19B40 1000000F */ beq $zero, $zero, .L80A19B80 /* 02634 80A19B44 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 02638 80A19B48 860A0194 */ lh $t2, 0x0194($s0) ## 00000194 .L80A19B4C: /* 0263C 80A19B4C 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 -/* 02640 80A19B50 15400007 */ bne $t2, $zero, .L80A19B70 +/* 02640 80A19B50 15400007 */ bne $t2, $zero, .L80A19B70 /* 02644 80A19B54 00000000 */ nop /* 02648 80A19B58 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 0264C 80A19B5C 0C02947A */ jal func_800A51E8 +/* 0264C 80A19B5C 0C02947A */ jal SkelAnime_ChangeAnimDefaultStop /* 02650 80A19B60 24A539B0 */ addiu $a1, $a1, 0x39B0 ## $a1 = 060039B0 /* 02654 80A19B64 240B0001 */ addiu $t3, $zero, 0x0001 ## $t3 = 00000001 -/* 02658 80A19B68 10000004 */ beq $zero, $zero, .L80A19B7C +/* 02658 80A19B68 10000004 */ beq $zero, $zero, .L80A19B7C /* 0265C 80A19B6C A60B0194 */ sh $t3, 0x0194($s0) ## 00000194 .L80A19B70: -/* 02660 80A19B70 0C02947A */ jal func_800A51E8 +/* 02660 80A19B70 0C02947A */ jal SkelAnime_ChangeAnimDefaultStop /* 02664 80A19B74 24A59DB0 */ addiu $a1, $a1, 0x9DB0 ## $a1 = FFFF9DB0 /* 02668 80A19B78 A6000194 */ sh $zero, 0x0194($s0) ## 00000194 .L80A19B7C: /* 0266C 80A19B7C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 .L80A19B80: -/* 02670 80A19B80 0C00BE5D */ jal func_8002F974 +/* 02670 80A19B80 0C00BE5D */ jal func_8002F974 /* 02674 80A19B84 24053133 */ addiu $a1, $zero, 0x3133 ## $a1 = 00003133 -/* 02678 80A19B88 8FBF001C */ lw $ra, 0x001C($sp) -/* 0267C 80A19B8C 8FB00018 */ lw $s0, 0x0018($sp) +/* 02678 80A19B88 8FBF001C */ lw $ra, 0x001C($sp) +/* 0267C 80A19B8C 8FB00018 */ lw $s0, 0x0018($sp) /* 02680 80A19B90 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 -/* 02684 80A19B94 03E00008 */ jr $ra +/* 02684 80A19B94 03E00008 */ jr $ra /* 02688 80A19B98 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A1A350.s b/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A1A350.s index 91c9eda4e1..6291db7113 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A1A350.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Floormas/func_80A1A350.s @@ -1,68 +1,68 @@ glabel func_80A1A350 /* 02E40 80A1A350 27BDFFB0 */ addiu $sp, $sp, 0xFFB0 ## $sp = FFFFFFB0 -/* 02E44 80A1A354 AFB10028 */ sw $s1, 0x0028($sp) +/* 02E44 80A1A354 AFB10028 */ sw $s1, 0x0028($sp) /* 02E48 80A1A358 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 -/* 02E4C 80A1A35C AFBF002C */ sw $ra, 0x002C($sp) -/* 02E50 80A1A360 AFB00024 */ sw $s0, 0x0024($sp) +/* 02E4C 80A1A35C AFBF002C */ sw $ra, 0x002C($sp) +/* 02E50 80A1A360 AFB00024 */ sw $s0, 0x0024($sp) /* 02E54 80A1A364 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 /* 02E58 80A1A368 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 02E5C 80A1A36C 3C0680A2 */ lui $a2, %hi(D_80A1A53C) ## $a2 = 80A20000 /* 02E60 80A1A370 24C6A53C */ addiu $a2, $a2, %lo(D_80A1A53C) ## $a2 = 80A1A53C /* 02E64 80A1A374 27A40038 */ addiu $a0, $sp, 0x0038 ## $a0 = FFFFFFE8 /* 02E68 80A1A378 24070930 */ addiu $a3, $zero, 0x0930 ## $a3 = 00000930 -/* 02E6C 80A1A37C 0C031AB1 */ jal func_800C6AC4 -/* 02E70 80A1A380 AFA50048 */ sw $a1, 0x0048($sp) -/* 02E74 80A1A384 0C024F61 */ jal func_80093D84 +/* 02E6C 80A1A37C 0C031AB1 */ jal Graph_OpenDisps +/* 02E70 80A1A380 AFA50048 */ sw $a1, 0x0048($sp) +/* 02E74 80A1A384 0C024F61 */ jal func_80093D84 /* 02E78 80A1A388 8E240000 */ lw $a0, 0x0000($s1) ## 00000000 /* 02E7C 80A1A38C 920E02DC */ lbu $t6, 0x02DC($s0) ## 000002DC /* 02E80 80A1A390 2401000C */ addiu $at, $zero, 0x000C ## $at = 0000000C /* 02E84 80A1A394 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 02E88 80A1A398 15C1000A */ bne $t6, $at, .L80A1A3C4 +/* 02E88 80A1A398 15C1000A */ bne $t6, $at, .L80A1A3C4 /* 02E8C 80A1A39C 3C0580A2 */ lui $a1, %hi(D_80A1A4F4) ## $a1 = 80A20000 /* 02E90 80A1A3A0 86060196 */ lh $a2, 0x0196($s0) ## 00000196 /* 02E94 80A1A3A4 24010028 */ addiu $at, $zero, 0x0028 ## $at = 00000028 /* 02E98 80A1A3A8 24A5A4F4 */ addiu $a1, $a1, %lo(D_80A1A4F4) ## $a1 = 80A1A4F4 -/* 02E9C 80A1A3AC 00C1001A */ div $zero, $a2, $at -/* 02EA0 80A1A3B0 00003010 */ mfhi $a2 -/* 02EA4 80A1A3B4 00063400 */ sll $a2, $a2, 16 -/* 02EA8 80A1A3B8 00063403 */ sra $a2, $a2, 16 -/* 02EAC 80A1A3BC 0C0099A4 */ jal func_80026690 +/* 02E9C 80A1A3AC 00C1001A */ div $zero, $a2, $at +/* 02EA0 80A1A3B0 00003010 */ mfhi $a2 +/* 02EA4 80A1A3B4 00063400 */ sll $a2, $a2, 16 +/* 02EA8 80A1A3B8 00063403 */ sra $a2, $a2, 16 +/* 02EAC 80A1A3BC 0C0099A4 */ jal func_80026690 /* 02EB0 80A1A3C0 24070028 */ addiu $a3, $zero, 0x0028 ## $a3 = 00000028 .L80A1A3C4: /* 02EB4 80A1A3C4 8E050150 */ lw $a1, 0x0150($s0) ## 00000150 /* 02EB8 80A1A3C8 8E06016C */ lw $a2, 0x016C($s0) ## 0000016C /* 02EBC 80A1A3CC 9207014E */ lbu $a3, 0x014E($s0) ## 0000014E -/* 02EC0 80A1A3D0 8FB90048 */ lw $t9, 0x0048($sp) +/* 02EC0 80A1A3D0 8FB90048 */ lw $t9, 0x0048($sp) /* 02EC4 80A1A3D4 3C0F80A2 */ lui $t7, %hi(func_80A1A128) ## $t7 = 80A20000 /* 02EC8 80A1A3D8 3C1880A2 */ lui $t8, %hi(func_80A1A160) ## $t8 = 80A20000 /* 02ECC 80A1A3DC 2718A160 */ addiu $t8, $t8, %lo(func_80A1A160) ## $t8 = 80A1A160 /* 02ED0 80A1A3E0 25EFA128 */ addiu $t7, $t7, %lo(func_80A1A128) ## $t7 = 80A1A128 -/* 02ED4 80A1A3E4 AFAF0010 */ sw $t7, 0x0010($sp) -/* 02ED8 80A1A3E8 AFB80014 */ sw $t8, 0x0014($sp) -/* 02EDC 80A1A3EC AFB00018 */ sw $s0, 0x0018($sp) +/* 02ED4 80A1A3E4 AFAF0010 */ sw $t7, 0x0010($sp) +/* 02ED8 80A1A3E8 AFB80014 */ sw $t8, 0x0014($sp) +/* 02EDC 80A1A3EC AFB00018 */ sw $s0, 0x0018($sp) /* 02EE0 80A1A3F0 8F2802D0 */ lw $t0, 0x02D0($t9) ## 000002D0 /* 02EE4 80A1A3F4 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 02EE8 80A1A3F8 0C0289CF */ jal func_800A273C -/* 02EEC 80A1A3FC AFA8001C */ sw $t0, 0x001C($sp) -/* 02EF0 80A1A400 8FA90048 */ lw $t1, 0x0048($sp) +/* 02EE8 80A1A3F8 0C0289CF */ jal SkelAnime_DrawSV2 +/* 02EEC 80A1A3FC AFA8001C */ sw $t0, 0x001C($sp) +/* 02EF0 80A1A400 8FA90048 */ lw $t1, 0x0048($sp) /* 02EF4 80A1A404 2401000C */ addiu $at, $zero, 0x000C ## $at = 0000000C /* 02EF8 80A1A408 AD2202D0 */ sw $v0, 0x02D0($t1) ## 000002D0 /* 02EFC 80A1A40C 920A02DC */ lbu $t2, 0x02DC($s0) ## 000002DC -/* 02F00 80A1A410 15410003 */ bne $t2, $at, .L80A1A420 +/* 02F00 80A1A410 15410003 */ bne $t2, $at, .L80A1A420 /* 02F04 80A1A414 00000000 */ nop -/* 02F08 80A1A418 0C009A9B */ jal func_80026A6C +/* 02F08 80A1A418 0C009A9B */ jal func_80026A6C /* 02F0C 80A1A41C 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 .L80A1A420: /* 02F10 80A1A420 3C0680A2 */ lui $a2, %hi(D_80A1A550) ## $a2 = 80A20000 /* 02F14 80A1A424 24C6A550 */ addiu $a2, $a2, %lo(D_80A1A550) ## $a2 = 80A1A550 /* 02F18 80A1A428 27A40038 */ addiu $a0, $sp, 0x0038 ## $a0 = FFFFFFE8 /* 02F1C 80A1A42C 8E250000 */ lw $a1, 0x0000($s1) ## 00000000 -/* 02F20 80A1A430 0C031AD5 */ jal func_800C6B54 +/* 02F20 80A1A430 0C031AD5 */ jal Graph_CloseDisps /* 02F24 80A1A434 24070946 */ addiu $a3, $zero, 0x0946 ## $a3 = 00000946 -/* 02F28 80A1A438 8FBF002C */ lw $ra, 0x002C($sp) -/* 02F2C 80A1A43C 8FB00024 */ lw $s0, 0x0024($sp) -/* 02F30 80A1A440 8FB10028 */ lw $s1, 0x0028($sp) -/* 02F34 80A1A444 03E00008 */ jr $ra +/* 02F28 80A1A438 8FBF002C */ lw $ra, 0x002C($sp) +/* 02F2C 80A1A43C 8FB00024 */ lw $s0, 0x0024($sp) +/* 02F30 80A1A440 8FB10028 */ lw $s1, 0x0028($sp) +/* 02F34 80A1A444 03E00008 */ jr $ra /* 02F38 80A1A448 27BD0050 */ addiu $sp, $sp, 0x0050 ## $sp = 00000000 /* 02F3C 80A1A44C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fr/EnFr_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Fr/EnFr_Update.s index abbce08957..42cfe0e635 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Fr/EnFr_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Fr/EnFr_Update.s @@ -1,110 +1,110 @@ glabel EnFr_Update /* 002A4 80A1AC44 27BDFFB8 */ addiu $sp, $sp, 0xFFB8 ## $sp = FFFFFFB8 -/* 002A8 80A1AC48 AFB00024 */ sw $s0, 0x0024($sp) +/* 002A8 80A1AC48 AFB00024 */ sw $s0, 0x0024($sp) /* 002AC 80A1AC4C 3C010001 */ lui $at, 0x0001 ## $at = 00010000 /* 002B0 80A1AC50 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 002B4 80A1AC54 AFB10028 */ sw $s1, 0x0028($sp) +/* 002B4 80A1AC54 AFB10028 */ sw $s1, 0x0028($sp) /* 002B8 80A1AC58 342117A4 */ ori $at, $at, 0x17A4 ## $at = 000117A4 /* 002BC 80A1AC5C 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 -/* 002C0 80A1AC60 AFBF002C */ sw $ra, 0x002C($sp) -/* 002C4 80A1AC64 00A12021 */ addu $a0, $a1, $at +/* 002C0 80A1AC60 AFBF002C */ sw $ra, 0x002C($sp) +/* 002C4 80A1AC64 00A12021 */ addu $a0, $a1, $at /* 002C8 80A1AC68 0C026062 */ jal Object_IsLoaded - + /* 002CC 80A1AC6C 8205036A */ lb $a1, 0x036A($s0) ## 0000036A -/* 002D0 80A1AC70 104000AD */ beq $v0, $zero, .L80A1AF28 +/* 002D0 80A1AC70 104000AD */ beq $v0, $zero, .L80A1AF28 /* 002D4 80A1AC74 2401FFEF */ addiu $at, $zero, 0xFFEF ## $at = FFFFFFEF /* 002D8 80A1AC78 8E0E0004 */ lw $t6, 0x0004($s0) ## 00000004 /* 002DC 80A1AC7C 8602001C */ lh $v0, 0x001C($s0) ## 0000001C /* 002E0 80A1AC80 3C0580A2 */ lui $a1, %hi(D_80A1D0BC) ## $a1 = 80A20000 -/* 002E4 80A1AC84 01C17824 */ and $t7, $t6, $at +/* 002E4 80A1AC84 01C17824 */ and $t7, $t6, $at /* 002E8 80A1AC88 2442FFFF */ addiu $v0, $v0, 0xFFFF ## $v0 = FFFFFFFF -/* 002EC 80A1AC8C 0002C080 */ sll $t8, $v0, 2 +/* 002EC 80A1AC8C 0002C080 */ sll $t8, $v0, 2 /* 002F0 80A1AC90 3C0180A2 */ lui $at, %hi(D_80A1CFF4) ## $at = 80A20000 /* 002F4 80A1AC94 AE0F0004 */ sw $t7, 0x0004($s0) ## 00000004 -/* 002F8 80A1AC98 00380821 */ addu $at, $at, $t8 -/* 002FC 80A1AC9C AC30CFF4 */ sw $s0, %lo(D_80A1CFF4)($at) -/* 00300 80A1ACA0 AFA2003C */ sw $v0, 0x003C($sp) +/* 002F8 80A1AC98 00380821 */ addu $at, $at, $t8 +/* 002FC 80A1AC9C AC30CFF4 */ sw $s0, %lo(D_80A1CFF4)($at) +/* 00300 80A1ACA0 AFA2003C */ sw $v0, 0x003C($sp) /* 00304 80A1ACA4 24A5D0BC */ addiu $a1, $a1, %lo(D_80A1D0BC) ## $a1 = 80A1D0BC /* 00308 80A1ACA8 0C01E037 */ jal Actor_ProcessInitChain - + /* 0030C 80A1ACAC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 00310 80A1ACB0 3C060601 */ lui $a2, 0x0601 ## $a2 = 06010000 /* 00314 80A1ACB4 3C070600 */ lui $a3, 0x0600 ## $a3 = 06000000 /* 00318 80A1ACB8 26190190 */ addiu $t9, $s0, 0x0190 ## $t9 = 00000190 /* 0031C 80A1ACBC 26080220 */ addiu $t0, $s0, 0x0220 ## $t0 = 00000220 /* 00320 80A1ACC0 24090018 */ addiu $t1, $zero, 0x0018 ## $t1 = 00000018 -/* 00324 80A1ACC4 AFA90018 */ sw $t1, 0x0018($sp) -/* 00328 80A1ACC8 AFA80014 */ sw $t0, 0x0014($sp) -/* 0032C 80A1ACCC AFB90010 */ sw $t9, 0x0010($sp) +/* 00324 80A1ACC4 AFA90018 */ sw $t1, 0x0018($sp) +/* 00328 80A1ACC8 AFA80014 */ sw $t0, 0x0014($sp) +/* 0032C 80A1ACCC AFB90010 */ sw $t9, 0x0010($sp) /* 00330 80A1ACD0 24E71534 */ addiu $a3, $a3, 0x1534 ## $a3 = 06001534 /* 00334 80A1ACD4 24C6B498 */ addiu $a2, $a2, 0xB498 ## $a2 = 0600B498 /* 00338 80A1ACD8 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 0033C 80A1ACDC 0C0291BE */ jal func_800A46F8 +/* 0033C 80A1ACDC 0C0291BE */ jal SkelAnime_InitSV /* 00340 80A1ACE0 2605014C */ addiu $a1, $s0, 0x014C ## $a1 = 0000014C /* 00344 80A1ACE4 3C060500 */ lui $a2, 0x0500 ## $a2 = 05000000 /* 00348 80A1ACE8 3C070500 */ lui $a3, 0x0500 ## $a3 = 05000000 /* 0034C 80A1ACEC 260A02F4 */ addiu $t2, $s0, 0x02F4 ## $t2 = 000002F4 /* 00350 80A1ACF0 260B0324 */ addiu $t3, $s0, 0x0324 ## $t3 = 00000324 /* 00354 80A1ACF4 240C0008 */ addiu $t4, $zero, 0x0008 ## $t4 = 00000008 -/* 00358 80A1ACF8 AFAC0018 */ sw $t4, 0x0018($sp) -/* 0035C 80A1ACFC AFAB0014 */ sw $t3, 0x0014($sp) -/* 00360 80A1AD00 AFAA0010 */ sw $t2, 0x0010($sp) +/* 00358 80A1ACF8 AFAC0018 */ sw $t4, 0x0018($sp) +/* 0035C 80A1ACFC AFAB0014 */ sw $t3, 0x0014($sp) +/* 00360 80A1AD00 AFAA0010 */ sw $t2, 0x0010($sp) /* 00364 80A1AD04 24E72470 */ addiu $a3, $a3, 0x2470 ## $a3 = 05002470 /* 00368 80A1AD08 24C636F0 */ addiu $a2, $a2, 0x36F0 ## $a2 = 050036F0 /* 0036C 80A1AD0C 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 00370 80A1AD10 0C02915F */ jal SkelAnime_Init - + /* 00374 80A1AD14 260502B0 */ addiu $a1, $s0, 0x02B0 ## $a1 = 000002B0 /* 00378 80A1AD18 2606035C */ addiu $a2, $s0, 0x035C ## $a2 = 0000035C -/* 0037C 80A1AD1C AFA60030 */ sw $a2, 0x0030($sp) +/* 0037C 80A1AD1C AFA60030 */ sw $a2, 0x0030($sp) /* 00380 80A1AD20 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 00384 80A1AD24 0C01E9D9 */ jal Lights_Insert - + /* 00388 80A1AD28 262507A8 */ addiu $a1, $s1, 0x07A8 ## $a1 = 000007A8 /* 0038C 80A1AD2C C6040008 */ lwc1 $f4, 0x0008($s0) ## 00000008 /* 00390 80A1AD30 C608000C */ lwc1 $f8, 0x000C($s0) ## 0000000C /* 00394 80A1AD34 C6100010 */ lwc1 $f16, 0x0010($s0) ## 00000010 -/* 00398 80A1AD38 4600218D */ trunc.w.s $f6, $f4 +/* 00398 80A1AD38 4600218D */ trunc.w.s $f6, $f4 /* 0039C 80A1AD3C AE020358 */ sw $v0, 0x0358($s0) ## 00000358 /* 003A0 80A1AD40 241800FF */ addiu $t8, $zero, 0x00FF ## $t8 = 000000FF -/* 003A4 80A1AD44 4600428D */ trunc.w.s $f10, $f8 -/* 003A8 80A1AD48 44053000 */ mfc1 $a1, $f6 +/* 003A4 80A1AD44 4600428D */ trunc.w.s $f10, $f8 +/* 003A8 80A1AD48 44053000 */ mfc1 $a1, $f6 /* 003AC 80A1AD4C 241900FF */ addiu $t9, $zero, 0x00FF ## $t9 = 000000FF -/* 003B0 80A1AD50 4600848D */ trunc.w.s $f18, $f16 -/* 003B4 80A1AD54 44065000 */ mfc1 $a2, $f10 +/* 003B0 80A1AD50 4600848D */ trunc.w.s $f18, $f16 +/* 003B4 80A1AD54 44065000 */ mfc1 $a2, $f10 /* 003B8 80A1AD58 240800FF */ addiu $t0, $zero, 0x00FF ## $t0 = 000000FF /* 003BC 80A1AD5C 2409FFFF */ addiu $t1, $zero, 0xFFFF ## $t1 = FFFFFFFF -/* 003C0 80A1AD60 44079000 */ mfc1 $a3, $f18 -/* 003C4 80A1AD64 00052C00 */ sll $a1, $a1, 16 -/* 003C8 80A1AD68 00063400 */ sll $a2, $a2, 16 -/* 003CC 80A1AD6C 00073C00 */ sll $a3, $a3, 16 -/* 003D0 80A1AD70 00073C03 */ sra $a3, $a3, 16 -/* 003D4 80A1AD74 00063403 */ sra $a2, $a2, 16 -/* 003D8 80A1AD78 00052C03 */ sra $a1, $a1, 16 -/* 003DC 80A1AD7C AFA9001C */ sw $t1, 0x001C($sp) -/* 003E0 80A1AD80 AFA80018 */ sw $t0, 0x0018($sp) -/* 003E4 80A1AD84 AFB90014 */ sw $t9, 0x0014($sp) -/* 003E8 80A1AD88 AFB80010 */ sw $t8, 0x0010($sp) +/* 003C0 80A1AD60 44079000 */ mfc1 $a3, $f18 +/* 003C4 80A1AD64 00052C00 */ sll $a1, $a1, 16 +/* 003C8 80A1AD68 00063400 */ sll $a2, $a2, 16 +/* 003CC 80A1AD6C 00073C00 */ sll $a3, $a3, 16 +/* 003D0 80A1AD70 00073C03 */ sra $a3, $a3, 16 +/* 003D4 80A1AD74 00063403 */ sra $a2, $a2, 16 +/* 003D8 80A1AD78 00052C03 */ sra $a1, $a1, 16 +/* 003DC 80A1AD7C AFA9001C */ sw $t1, 0x001C($sp) +/* 003E0 80A1AD80 AFA80018 */ sw $t0, 0x0018($sp) +/* 003E4 80A1AD84 AFB90014 */ sw $t9, 0x0014($sp) +/* 003E8 80A1AD88 AFB80010 */ sw $t8, 0x0010($sp) /* 003EC 80A1AD8C 0C01E763 */ jal Lights_InitType0PositionalLight - -/* 003F0 80A1AD90 8FA40030 */ lw $a0, 0x0030($sp) -/* 003F4 80A1AD94 8FAA003C */ lw $t2, 0x003C($sp) + +/* 003F0 80A1AD90 8FA40030 */ lw $a0, 0x0030($sp) +/* 003F4 80A1AD94 8FAA003C */ lw $t2, 0x003C($sp) /* 003F8 80A1AD98 3C0B80A2 */ lui $t3, %hi(D_80A1D018) ## $t3 = 80A20000 /* 003FC 80A1AD9C 3C0D80A2 */ lui $t5, %hi(D_80A1D008) ## $t5 = 80A20000 -/* 00400 80A1ADA0 016A5821 */ addu $t3, $t3, $t2 -/* 00404 80A1ADA4 916BD018 */ lbu $t3, %lo(D_80A1D018)($t3) +/* 00400 80A1ADA0 016A5821 */ addu $t3, $t3, $t2 +/* 00404 80A1ADA4 916BD018 */ lbu $t3, %lo(D_80A1D018)($t3) /* 00408 80A1ADA8 3C0E8016 */ lui $t6, 0x8016 ## $t6 = 80160000 /* 0040C 80A1ADAC 95CEF54E */ lhu $t6, -0x0AB2($t6) ## 8015F54E -/* 00410 80A1ADB0 000B6040 */ sll $t4, $t3, 1 -/* 00414 80A1ADB4 01AC6821 */ addu $t5, $t5, $t4 -/* 00418 80A1ADB8 95ADD008 */ lhu $t5, %lo(D_80A1D008)($t5) +/* 00410 80A1ADB0 000B6040 */ sll $t4, $t3, 1 +/* 00414 80A1ADB4 01AC6821 */ addu $t5, $t5, $t4 +/* 00418 80A1ADB8 95ADD008 */ lhu $t5, %lo(D_80A1D008)($t5) /* 0041C 80A1ADBC 3C014316 */ lui $at, 0x4316 ## $at = 43160000 -/* 00420 80A1ADC0 01AE7824 */ and $t7, $t5, $t6 -/* 00424 80A1ADC4 51E00006 */ beql $t7, $zero, .L80A1ADE0 +/* 00420 80A1ADC0 01AE7824 */ and $t7, $t5, $t6 +/* 00424 80A1ADC4 51E00006 */ beql $t7, $zero, .L80A1ADE0 /* 00428 80A1ADC8 44813000 */ mtc1 $at, $f6 ## $f6 = 150.00 /* 0042C 80A1ADCC 3C014387 */ lui $at, 0x4387 ## $at = 43870000 /* 00430 80A1ADD0 44812000 */ mtc1 $at, $f4 ## $f4 = 270.00 -/* 00434 80A1ADD4 10000004 */ beq $zero, $zero, .L80A1ADE8 +/* 00434 80A1ADD4 10000004 */ beq $zero, $zero, .L80A1ADE8 /* 00438 80A1ADD8 E60403A0 */ swc1 $f4, 0x03A0($s0) ## 000003A0 /* 0043C 80A1ADDC 44813000 */ mtc1 $at, $f6 ## $f6 = 270.00 .L80A1ADE0: @@ -112,44 +112,44 @@ glabel EnFr_Update /* 00444 80A1ADE4 E60603A0 */ swc1 $f6, 0x03A0($s0) ## 000003A0 .L80A1ADE8: /* 00448 80A1ADE8 3C0180A2 */ lui $at, %hi(D_80A1D28C) ## $at = 80A20000 -/* 0044C 80A1ADEC C42AD28C */ lwc1 $f10, %lo(D_80A1D28C)($at) +/* 0044C 80A1ADEC C42AD28C */ lwc1 $f10, %lo(D_80A1D28C)($at) /* 00450 80A1ADF0 C60803A0 */ lwc1 $f8, 0x03A0($s0) ## 000003A0 /* 00454 80A1ADF4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00458 80A1ADF8 460A4402 */ mul.s $f16, $f8, $f10 -/* 0045C 80A1ADFC 44058000 */ mfc1 $a1, $f16 +/* 00458 80A1ADF8 460A4402 */ mul.s $f16, $f8, $f10 +/* 0045C 80A1ADFC 44058000 */ mfc1 $a1, $f16 /* 00460 80A1AE00 0C00B58B */ jal Actor_SetScale - + /* 00464 80A1AE04 00000000 */ nop /* 00468 80A1AE08 3C0180A2 */ lui $at, %hi(D_80A1D290) ## $at = 80A20000 -/* 0046C 80A1AE0C C432D290 */ lwc1 $f18, %lo(D_80A1D290)($at) +/* 0046C 80A1AE0C C432D290 */ lwc1 $f18, %lo(D_80A1D290)($at) /* 00470 80A1AE10 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 00474 80A1AE14 3C054120 */ lui $a1, 0x4120 ## $a1 = 41200000 /* 00478 80A1AE18 0C00B56E */ jal Actor_SetHeight - + /* 0047C 80A1AE1C E6120070 */ swc1 $f18, 0x0070($s0) ## 00000070 /* 00480 80A1AE20 3C014270 */ lui $at, 0x4270 ## $at = 42700000 /* 00484 80A1AE24 24180001 */ addiu $t8, $zero, 0x0001 ## $t8 = 00000001 /* 00488 80A1AE28 44816000 */ mtc1 $at, $f12 ## $f12 = 60.00 /* 0048C 80A1AE2C 0C00CFBE */ jal Math_Rand_ZeroFloat - + /* 00490 80A1AE30 A2180378 */ sb $t8, 0x0378($s0) ## 00000378 /* 00494 80A1AE34 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 /* 00498 80A1AE38 44812000 */ mtc1 $at, $f4 ## $f4 = 20.00 /* 0049C 80A1AE3C 8E0E0024 */ lw $t6, 0x0024($s0) ## 00000024 /* 004A0 80A1AE40 8E0D0028 */ lw $t5, 0x0028($s0) ## 00000028 -/* 004A4 80A1AE44 46040180 */ add.s $f6, $f0, $f4 +/* 004A4 80A1AE44 46040180 */ add.s $f6, $f0, $f4 /* 004A8 80A1AE48 AE0E038C */ sw $t6, 0x038C($s0) ## 0000038C /* 004AC 80A1AE4C 8E0E002C */ lw $t6, 0x002C($s0) ## 0000002C /* 004B0 80A1AE50 3C0B80A2 */ lui $t3, %hi(func_80A1B19C) ## $t3 = 80A20000 -/* 004B4 80A1AE54 4600320D */ trunc.w.s $f8, $f6 +/* 004B4 80A1AE54 4600320D */ trunc.w.s $f8, $f6 /* 004B8 80A1AE58 3C0F80A2 */ lui $t7, %hi(func_80A1B22C) ## $t7 = 80A20000 /* 004BC 80A1AE5C 256BB19C */ addiu $t3, $t3, %lo(func_80A1B19C) ## $t3 = 80A1B19C /* 004C0 80A1AE60 25EFB22C */ addiu $t7, $t7, %lo(func_80A1B22C) ## $t7 = 80A1B22C -/* 004C4 80A1AE64 44084000 */ mfc1 $t0, $f8 +/* 004C4 80A1AE64 44084000 */ mfc1 $t0, $f8 /* 004C8 80A1AE68 24180007 */ addiu $t8, $zero, 0x0007 ## $t8 = 00000007 /* 004CC 80A1AE6C AE0B0374 */ sw $t3, 0x0374($s0) ## 00000374 -/* 004D0 80A1AE70 00084C00 */ sll $t1, $t0, 16 -/* 004D4 80A1AE74 00095403 */ sra $t2, $t1, 16 +/* 004D0 80A1AE70 00084C00 */ sll $t1, $t0, 16 +/* 004D4 80A1AE74 00095403 */ sra $t2, $t1, 16 /* 004D8 80A1AE78 AE0A0370 */ sw $t2, 0x0370($s0) ## 00000370 /* 004DC 80A1AE7C A200037A */ sb $zero, 0x037A($s0) ## 0000037A /* 004E0 80A1AE80 A200037B */ sb $zero, 0x037B($s0) ## 0000037B @@ -163,9 +163,9 @@ glabel EnFr_Update /* 00500 80A1AEA0 AE0003A4 */ sw $zero, 0x03A4($s0) ## 000003A4 /* 00504 80A1AEA4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 00508 80A1AEA8 AE0D0390 */ sw $t5, 0x0390($s0) ## 00000390 -/* 0050C 80A1AEAC 0C286A68 */ jal func_80A1A9A0 +/* 0050C 80A1AEAC 0C286A68 */ jal func_80A1A9A0 /* 00510 80A1AEB0 AE0E0394 */ sw $t6, 0x0394($s0) ## 00000394 -/* 00514 80A1AEB4 0C286B03 */ jal func_80A1AC0C +/* 00514 80A1AEB4 0C286B03 */ jal func_80A1AC0C /* 00518 80A1AEB8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 0051C 80A1AEBC 3C1980A2 */ lui $t9, %hi(func_80A1BB34) ## $t9 = 80A20000 /* 00520 80A1AEC0 3C01437F */ lui $at, 0x437F ## $at = 437F0000 @@ -173,7 +173,7 @@ glabel EnFr_Update /* 00528 80A1AEC8 44816000 */ mtc1 $at, $f12 ## $f12 = 255.00 /* 0052C 80A1AECC AE190130 */ sw $t9, 0x0130($s0) ## 00000130 /* 00530 80A1AED0 0C00CFBE */ jal Math_Rand_ZeroFloat - + /* 00534 80A1AED4 A20003A8 */ sb $zero, 0x03A8($s0) ## 000003A8 /* 00538 80A1AED8 C602038C */ lwc1 $f2, 0x038C($s0) ## 0000038C /* 0053C 80A1AEDC 3C014248 */ lui $at, 0x4248 ## $at = 42480000 @@ -181,25 +181,25 @@ glabel EnFr_Update /* 00544 80A1AEE4 C6100390 */ lwc1 $f16, 0x0390($s0) ## 00000390 /* 00548 80A1AEE8 E60203AC */ swc1 $f2, 0x03AC($s0) ## 000003AC /* 0054C 80A1AEEC E60203B8 */ swc1 $f2, 0x03B8($s0) ## 000003B8 -/* 00550 80A1AEF0 46128080 */ add.s $f2, $f16, $f18 +/* 00550 80A1AEF0 46128080 */ add.s $f2, $f16, $f18 /* 00554 80A1AEF4 8E0D0004 */ lw $t5, 0x0004($s0) ## 00000004 /* 00558 80A1AEF8 2401FFFE */ addiu $at, $zero, 0xFFFE ## $at = FFFFFFFE -/* 0055C 80A1AEFC 4600028D */ trunc.w.s $f10, $f0 +/* 0055C 80A1AEFC 4600028D */ trunc.w.s $f10, $f0 /* 00560 80A1AF00 E60203B0 */ swc1 $f2, 0x03B0($s0) ## 000003B0 /* 00564 80A1AF04 E60203BC */ swc1 $f2, 0x03BC($s0) ## 000003BC /* 00568 80A1AF08 C6020394 */ lwc1 $f2, 0x0394($s0) ## 00000394 -/* 0056C 80A1AF0C 440B5000 */ mfc1 $t3, $f10 -/* 00570 80A1AF10 01A17024 */ and $t6, $t5, $at +/* 0056C 80A1AF0C 440B5000 */ mfc1 $t3, $f10 +/* 00570 80A1AF10 01A17024 */ and $t6, $t5, $at /* 00574 80A1AF14 AE0E0004 */ sw $t6, 0x0004($s0) ## 00000004 -/* 00578 80A1AF18 000B6300 */ sll $t4, $t3, 12 +/* 00578 80A1AF18 000B6300 */ sll $t4, $t3, 12 /* 0057C 80A1AF1C A60C03AA */ sh $t4, 0x03AA($s0) ## 000003AA /* 00580 80A1AF20 E60203B4 */ swc1 $f2, 0x03B4($s0) ## 000003B4 /* 00584 80A1AF24 E60203C0 */ swc1 $f2, 0x03C0($s0) ## 000003C0 .L80A1AF28: -/* 00588 80A1AF28 8FBF002C */ lw $ra, 0x002C($sp) -/* 0058C 80A1AF2C 8FB00024 */ lw $s0, 0x0024($sp) -/* 00590 80A1AF30 8FB10028 */ lw $s1, 0x0028($sp) -/* 00594 80A1AF34 03E00008 */ jr $ra +/* 00588 80A1AF28 8FBF002C */ lw $ra, 0x002C($sp) +/* 0058C 80A1AF2C 8FB00024 */ lw $s0, 0x0024($sp) +/* 00590 80A1AF30 8FB10028 */ lw $s1, 0x0028($sp) +/* 00594 80A1AF34 03E00008 */ jr $ra /* 00598 80A1AF38 27BD0048 */ addiu $sp, $sp, 0x0048 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1B22C.s b/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1B22C.s index d819bad52a..2ee646bd02 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1B22C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1B22C.s @@ -1,45 +1,45 @@ glabel func_80A1B22C /* 0088C 80A1B22C 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 00890 80A1B230 AFBF0024 */ sw $ra, 0x0024($sp) -/* 00894 80A1B234 AFA40028 */ sw $a0, 0x0028($sp) -/* 00898 80A1B238 AFA5002C */ sw $a1, 0x002C($sp) +/* 00890 80A1B230 AFBF0024 */ sw $ra, 0x0024($sp) +/* 00894 80A1B234 AFA40028 */ sw $a0, 0x0028($sp) +/* 00898 80A1B238 AFA5002C */ sw $a1, 0x002C($sp) /* 0089C 80A1B23C 8498001C */ lh $t8, 0x001C($a0) ## 0000001C /* 008A0 80A1B240 3C1980A2 */ lui $t9, %hi(D_80A1D0C3) ## $t9 = 80A20000 /* 008A4 80A1B244 3C0E80A2 */ lui $t6, %hi(D_80A1CFF0) ## $t6 = 80A20000 -/* 008A8 80A1B248 0338C821 */ addu $t9, $t9, $t8 -/* 008AC 80A1B24C 9339D0C3 */ lbu $t9, %lo(D_80A1D0C3)($t9) -/* 008B0 80A1B250 91CECFF0 */ lbu $t6, %lo(D_80A1CFF0)($t6) +/* 008A8 80A1B248 0338C821 */ addu $t9, $t9, $t8 +/* 008AC 80A1B24C 9339D0C3 */ lbu $t9, %lo(D_80A1D0C3)($t9) +/* 008B0 80A1B250 91CECFF0 */ lbu $t6, %lo(D_80A1CFF0)($t6) /* 008B4 80A1B254 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 -/* 008B8 80A1B258 55D90018 */ bnel $t6, $t9, .L80A1B2BC -/* 008BC 80A1B25C 8FBF0024 */ lw $ra, 0x0024($sp) +/* 008B8 80A1B258 55D90018 */ bnel $t6, $t9, .L80A1B2BC +/* 008BC 80A1B25C 8FBF0024 */ lw $ra, 0x0024($sp) /* 008C0 80A1B260 0C028800 */ jal SkelAnime_GetFrameCount - + /* 008C4 80A1B264 248407BC */ addiu $a0, $a0, 0x07BC ## $a0 = 060007BC /* 008C8 80A1B268 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 008CC 80A1B26C 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 008D0 80A1B270 8FA40028 */ lw $a0, 0x0028($sp) -/* 008D4 80A1B274 468021A0 */ cvt.s.w $f6, $f4 +/* 008D0 80A1B270 8FA40028 */ lw $a0, 0x0028($sp) +/* 008D4 80A1B274 468021A0 */ cvt.s.w $f6, $f4 /* 008D8 80A1B278 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 008DC 80A1B27C 24080002 */ addiu $t0, $zero, 0x0002 ## $t0 = 00000002 -/* 008E0 80A1B280 44070000 */ mfc1 $a3, $f0 -/* 008E4 80A1B284 AFA80014 */ sw $t0, 0x0014($sp) +/* 008E0 80A1B280 44070000 */ mfc1 $a3, $f0 +/* 008E4 80A1B284 AFA80014 */ sw $t0, 0x0014($sp) /* 008E8 80A1B288 24A507BC */ addiu $a1, $a1, 0x07BC ## $a1 = 060007BC -/* 008EC 80A1B28C E7A60010 */ swc1 $f6, 0x0010($sp) +/* 008EC 80A1B28C E7A60010 */ swc1 $f6, 0x0010($sp) /* 008F0 80A1B290 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 008F4 80A1B294 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 008F8 80A1B298 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 008FC 80A1B29C E7A00018 */ swc1 $f0, 0x0018($sp) -/* 00900 80A1B2A0 0C286B0D */ jal func_80A1AC34 -/* 00904 80A1B2A4 8FA40028 */ lw $a0, 0x0028($sp) -/* 00908 80A1B2A8 8FAA0028 */ lw $t2, 0x0028($sp) +/* 008F8 80A1B298 0C029468 */ jal SkelAnime_ChangeAnim + +/* 008FC 80A1B29C E7A00018 */ swc1 $f0, 0x0018($sp) +/* 00900 80A1B2A0 0C286B0D */ jal func_80A1AC34 +/* 00904 80A1B2A4 8FA40028 */ lw $a0, 0x0028($sp) +/* 00908 80A1B2A8 8FAA0028 */ lw $t2, 0x0028($sp) /* 0090C 80A1B2AC 3C0980A2 */ lui $t1, %hi(func_80A1B2C8) ## $t1 = 80A20000 /* 00910 80A1B2B0 2529B2C8 */ addiu $t1, $t1, %lo(func_80A1B2C8) ## $t1 = 80A1B2C8 /* 00914 80A1B2B4 AD490354 */ sw $t1, 0x0354($t2) ## 00000354 -/* 00918 80A1B2B8 8FBF0024 */ lw $ra, 0x0024($sp) +/* 00918 80A1B2B8 8FBF0024 */ lw $ra, 0x0024($sp) .L80A1B2BC: /* 0091C 80A1B2BC 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 00920 80A1B2C0 03E00008 */ jr $ra +/* 00920 80A1B2C0 03E00008 */ jr $ra /* 00924 80A1B2C4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1B464.s b/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1B464.s index 488447af4d..ddd8b64e81 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1B464.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1B464.s @@ -1,56 +1,56 @@ glabel func_80A1B464 /* 00AC4 80A1B464 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 00AC8 80A1B468 AFB00028 */ sw $s0, 0x0028($sp) +/* 00AC8 80A1B468 AFB00028 */ sw $s0, 0x0028($sp) /* 00ACC 80A1B46C 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00AD0 80A1B470 AFBF002C */ sw $ra, 0x002C($sp) -/* 00AD4 80A1B474 AFA50034 */ sw $a1, 0x0034($sp) +/* 00AD0 80A1B470 AFBF002C */ sw $ra, 0x002C($sp) +/* 00AD4 80A1B474 AFA50034 */ sw $a1, 0x0034($sp) /* 00AD8 80A1B478 8605008A */ lh $a1, 0x008A($s0) ## 0000008A /* 00ADC 80A1B47C 240E0064 */ addiu $t6, $zero, 0x0064 ## $t6 = 00000064 -/* 00AE0 80A1B480 AFAE0010 */ sw $t6, 0x0010($sp) +/* 00AE0 80A1B480 AFAE0010 */ sw $t6, 0x0010($sp) /* 00AE4 80A1B484 248400B6 */ addiu $a0, $a0, 0x00B6 ## $a0 = 000000B6 /* 00AE8 80A1B488 24060002 */ addiu $a2, $zero, 0x0002 ## $a2 = 00000002 /* 00AEC 80A1B48C 0C01E1A7 */ jal Math_SmoothScaleMaxMinS - + /* 00AF0 80A1B490 24072710 */ addiu $a3, $zero, 0x2710 ## $a3 = 00002710 /* 00AF4 80A1B494 860F00B6 */ lh $t7, 0x00B6($s0) ## 000000B6 -/* 00AF8 80A1B498 1440001D */ bne $v0, $zero, .L80A1B510 +/* 00AF8 80A1B498 1440001D */ bne $v0, $zero, .L80A1B510 /* 00AFC 80A1B49C A60F0032 */ sh $t7, 0x0032($s0) ## 00000032 /* 00B00 80A1B4A0 C604015C */ lwc1 $f4, 0x015C($s0) ## 0000015C /* 00B04 80A1B4A4 C6060164 */ lwc1 $f6, 0x0164($s0) ## 00000164 /* 00B08 80A1B4A8 3C0280A2 */ lui $v0, %hi(D_80A1CFF0) ## $v0 = 80A20000 /* 00B0C 80A1B4AC 3C0880A2 */ lui $t0, %hi(func_80A1B524) ## $t0 = 80A20000 -/* 00B10 80A1B4B0 46062032 */ c.eq.s $f4, $f6 +/* 00B10 80A1B4B0 46062032 */ c.eq.s $f4, $f6 /* 00B14 80A1B4B4 2442CFF0 */ addiu $v0, $v0, %lo(D_80A1CFF0) ## $v0 = 80A1CFF0 /* 00B18 80A1B4B8 2508B524 */ addiu $t0, $t0, %lo(func_80A1B524) ## $t0 = 80A1B524 -/* 00B1C 80A1B4BC 45020015 */ bc1fl .L80A1B514 -/* 00B20 80A1B4C0 8FBF002C */ lw $ra, 0x002C($sp) +/* 00B1C 80A1B4BC 45020015 */ bc1fl .L80A1B514 +/* 00B20 80A1B4C0 8FBF002C */ lw $ra, 0x002C($sp) /* 00B24 80A1B4C4 90580000 */ lbu $t8, 0x0000($v0) ## 80A1CFF0 /* 00B28 80A1B4C8 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 /* 00B2C 80A1B4CC 24841534 */ addiu $a0, $a0, 0x1534 ## $a0 = 06001534 /* 00B30 80A1B4D0 27190001 */ addiu $t9, $t8, 0x0001 ## $t9 = 00000001 /* 00B34 80A1B4D4 A0590000 */ sb $t9, 0x0000($v0) ## 80A1CFF0 /* 00B38 80A1B4D8 0C028800 */ jal SkelAnime_GetFrameCount - + /* 00B3C 80A1B4DC AE080354 */ sw $t0, 0x0354($s0) ## 00000354 /* 00B40 80A1B4E0 44824000 */ mtc1 $v0, $f8 ## $f8 = 0.00 /* 00B44 80A1B4E4 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 /* 00B48 80A1B4E8 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 00B4C 80A1B4EC 468042A0 */ cvt.s.w $f10, $f8 -/* 00B50 80A1B4F0 44070000 */ mfc1 $a3, $f0 +/* 00B4C 80A1B4EC 468042A0 */ cvt.s.w $f10, $f8 +/* 00B50 80A1B4F0 44070000 */ mfc1 $a3, $f0 /* 00B54 80A1B4F4 24A51534 */ addiu $a1, $a1, 0x1534 ## $a1 = 06001534 /* 00B58 80A1B4F8 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C /* 00B5C 80A1B4FC 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 00B60 80A1B500 AFA00014 */ sw $zero, 0x0014($sp) -/* 00B64 80A1B504 E7AA0010 */ swc1 $f10, 0x0010($sp) -/* 00B68 80A1B508 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 00B6C 80A1B50C E7A00018 */ swc1 $f0, 0x0018($sp) +/* 00B60 80A1B500 AFA00014 */ sw $zero, 0x0014($sp) +/* 00B64 80A1B504 E7AA0010 */ swc1 $f10, 0x0010($sp) +/* 00B68 80A1B508 0C029468 */ jal SkelAnime_ChangeAnim + +/* 00B6C 80A1B50C E7A00018 */ swc1 $f0, 0x0018($sp) .L80A1B510: -/* 00B70 80A1B510 8FBF002C */ lw $ra, 0x002C($sp) +/* 00B70 80A1B510 8FBF002C */ lw $ra, 0x002C($sp) .L80A1B514: -/* 00B74 80A1B514 8FB00028 */ lw $s0, 0x0028($sp) +/* 00B74 80A1B514 8FB00028 */ lw $s0, 0x0028($sp) /* 00B78 80A1B518 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 00B7C 80A1B51C 03E00008 */ jr $ra +/* 00B7C 80A1B51C 03E00008 */ jr $ra /* 00B80 80A1B520 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1B524.s b/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1B524.s index fe51889702..35185d0856 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1B524.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1B524.s @@ -1,79 +1,79 @@ glabel func_80A1B524 /* 00B84 80A1B524 3C0E80A2 */ lui $t6, %hi(D_80A1CFF0) ## $t6 = 80A20000 -/* 00B88 80A1B528 91CECFF0 */ lbu $t6, %lo(D_80A1CFF0)($t6) +/* 00B88 80A1B528 91CECFF0 */ lbu $t6, %lo(D_80A1CFF0)($t6) /* 00B8C 80A1B52C 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 00B90 80A1B530 AFB00028 */ sw $s0, 0x0028($sp) +/* 00B90 80A1B530 AFB00028 */ sw $s0, 0x0028($sp) /* 00B94 80A1B534 2402000C */ addiu $v0, $zero, 0x000C ## $v0 = 0000000C /* 00B98 80A1B538 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00B9C 80A1B53C AFBF002C */ sw $ra, 0x002C($sp) -/* 00BA0 80A1B540 144E0022 */ bne $v0, $t6, .L80A1B5CC -/* 00BA4 80A1B544 AFA50034 */ sw $a1, 0x0034($sp) +/* 00B9C 80A1B53C AFBF002C */ sw $ra, 0x002C($sp) +/* 00BA0 80A1B540 144E0022 */ bne $v0, $t6, .L80A1B5CC +/* 00BA4 80A1B544 AFA50034 */ sw $a1, 0x0034($sp) /* 00BA8 80A1B548 848F001C */ lh $t7, 0x001C($a0) ## 0000001C /* 00BAC 80A1B54C 3C0180A2 */ lui $at, %hi(D_80A1D06C) ## $at = 80A20000 -/* 00BB0 80A1B550 01E20019 */ multu $t7, $v0 -/* 00BB4 80A1B554 0000C012 */ mflo $t8 -/* 00BB8 80A1B558 00380821 */ addu $at, $at, $t8 -/* 00BBC 80A1B55C C424D06C */ lwc1 $f4, %lo(D_80A1D06C)($at) +/* 00BB0 80A1B550 01E20019 */ multu $t7, $v0 +/* 00BB4 80A1B554 0000C012 */ mflo $t8 +/* 00BB8 80A1B558 00380821 */ addu $at, $at, $t8 +/* 00BBC 80A1B55C C424D06C */ lwc1 $f4, %lo(D_80A1D06C)($at) /* 00BC0 80A1B560 3C0180A2 */ lui $at, %hi(D_80A1D298) ## $at = 80A20000 -/* 00BC4 80A1B564 C426D298 */ lwc1 $f6, %lo(D_80A1D298)($at) -/* 00BC8 80A1B568 46062202 */ mul.s $f8, $f4, $f6 -/* 00BCC 80A1B56C 4600428D */ trunc.w.s $f10, $f8 -/* 00BD0 80A1B570 44085000 */ mfc1 $t0, $f10 +/* 00BC4 80A1B564 C426D298 */ lwc1 $f6, %lo(D_80A1D298)($at) +/* 00BC8 80A1B568 46062202 */ mul.s $f8, $f4, $f6 +/* 00BCC 80A1B56C 4600428D */ trunc.w.s $f10, $f8 +/* 00BD0 80A1B570 44085000 */ mfc1 $t0, $f10 /* 00BD4 80A1B574 00000000 */ nop /* 00BD8 80A1B578 A4880032 */ sh $t0, 0x0032($a0) ## 00000032 /* 00BDC 80A1B57C 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 /* 00BE0 80A1B580 0C028800 */ jal SkelAnime_GetFrameCount - + /* 00BE4 80A1B584 248407BC */ addiu $a0, $a0, 0x07BC ## $a0 = 060007BC /* 00BE8 80A1B588 44828000 */ mtc1 $v0, $f16 ## $f16 = 0.00 /* 00BEC 80A1B58C 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 /* 00BF0 80A1B590 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 00BF4 80A1B594 468084A0 */ cvt.s.w $f18, $f16 +/* 00BF4 80A1B594 468084A0 */ cvt.s.w $f18, $f16 /* 00BF8 80A1B598 24090002 */ addiu $t1, $zero, 0x0002 ## $t1 = 00000002 -/* 00BFC 80A1B59C 44070000 */ mfc1 $a3, $f0 -/* 00C00 80A1B5A0 AFA90014 */ sw $t1, 0x0014($sp) +/* 00BFC 80A1B59C 44070000 */ mfc1 $a3, $f0 +/* 00C00 80A1B5A0 AFA90014 */ sw $t1, 0x0014($sp) /* 00C04 80A1B5A4 24A507BC */ addiu $a1, $a1, 0x07BC ## $a1 = 060007BC /* 00C08 80A1B5A8 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C -/* 00C0C 80A1B5AC E7B20010 */ swc1 $f18, 0x0010($sp) +/* 00C0C 80A1B5AC E7B20010 */ swc1 $f18, 0x0010($sp) /* 00C10 80A1B5B0 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 00C14 80A1B5B4 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 00C18 80A1B5B8 E7A00018 */ swc1 $f0, 0x0018($sp) +/* 00C14 80A1B5B4 0C029468 */ jal SkelAnime_ChangeAnim + +/* 00C18 80A1B5B8 E7A00018 */ swc1 $f0, 0x0018($sp) /* 00C1C 80A1B5BC 3C0A80A2 */ lui $t2, %hi(func_80A1B778) ## $t2 = 80A20000 /* 00C20 80A1B5C0 254AB778 */ addiu $t2, $t2, %lo(func_80A1B778) ## $t2 = 80A1B778 -/* 00C24 80A1B5C4 10000017 */ beq $zero, $zero, .L80A1B624 +/* 00C24 80A1B5C4 10000017 */ beq $zero, $zero, .L80A1B624 /* 00C28 80A1B5C8 AE0A0354 */ sw $t2, 0x0354($s0) ## 00000354 .L80A1B5CC: /* 00C2C 80A1B5CC 920B0379 */ lbu $t3, 0x0379($s0) ## 00000379 /* 00C30 80A1B5D0 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 -/* 00C34 80A1B5D4 51600014 */ beql $t3, $zero, .L80A1B628 -/* 00C38 80A1B5D8 8FBF002C */ lw $ra, 0x002C($sp) +/* 00C34 80A1B5D4 51600014 */ beql $t3, $zero, .L80A1B628 +/* 00C38 80A1B5D8 8FBF002C */ lw $ra, 0x002C($sp) /* 00C3C 80A1B5DC 0C028800 */ jal SkelAnime_GetFrameCount - + /* 00C40 80A1B5E0 248407BC */ addiu $a0, $a0, 0x07BC ## $a0 = 060007BC /* 00C44 80A1B5E4 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 00C48 80A1B5E8 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 /* 00C4C 80A1B5EC 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 00C50 80A1B5F0 468021A0 */ cvt.s.w $f6, $f4 +/* 00C50 80A1B5F0 468021A0 */ cvt.s.w $f6, $f4 /* 00C54 80A1B5F4 240C0002 */ addiu $t4, $zero, 0x0002 ## $t4 = 00000002 -/* 00C58 80A1B5F8 44070000 */ mfc1 $a3, $f0 -/* 00C5C 80A1B5FC AFAC0014 */ sw $t4, 0x0014($sp) +/* 00C58 80A1B5F8 44070000 */ mfc1 $a3, $f0 +/* 00C5C 80A1B5FC AFAC0014 */ sw $t4, 0x0014($sp) /* 00C60 80A1B600 24A507BC */ addiu $a1, $a1, 0x07BC ## $a1 = 060007BC /* 00C64 80A1B604 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C -/* 00C68 80A1B608 E7A60010 */ swc1 $f6, 0x0010($sp) +/* 00C68 80A1B608 E7A60010 */ swc1 $f6, 0x0010($sp) /* 00C6C 80A1B60C 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 00C70 80A1B610 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 00C74 80A1B614 E7A00018 */ swc1 $f0, 0x0018($sp) +/* 00C70 80A1B610 0C029468 */ jal SkelAnime_ChangeAnim + +/* 00C74 80A1B614 E7A00018 */ swc1 $f0, 0x0018($sp) /* 00C78 80A1B618 3C0D80A2 */ lui $t5, %hi(func_80A1B638) ## $t5 = 80A20000 /* 00C7C 80A1B61C 25ADB638 */ addiu $t5, $t5, %lo(func_80A1B638) ## $t5 = 80A1B638 /* 00C80 80A1B620 AE0D0354 */ sw $t5, 0x0354($s0) ## 00000354 .L80A1B624: -/* 00C84 80A1B624 8FBF002C */ lw $ra, 0x002C($sp) +/* 00C84 80A1B624 8FBF002C */ lw $ra, 0x002C($sp) .L80A1B628: -/* 00C88 80A1B628 8FB00028 */ lw $s0, 0x0028($sp) +/* 00C88 80A1B628 8FB00028 */ lw $s0, 0x0028($sp) /* 00C8C 80A1B62C 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 00C90 80A1B630 03E00008 */ jr $ra +/* 00C90 80A1B630 03E00008 */ jr $ra /* 00C94 80A1B634 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1B638.s b/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1B638.s index d37fa60dad..fff8f26c1d 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1B638.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1B638.s @@ -1,92 +1,92 @@ glabel func_80A1B638 /* 00C98 80A1B638 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 -/* 00C9C 80A1B63C AFBF002C */ sw $ra, 0x002C($sp) -/* 00CA0 80A1B640 AFB00028 */ sw $s0, 0x0028($sp) -/* 00CA4 80A1B644 AFA50044 */ sw $a1, 0x0044($sp) +/* 00C9C 80A1B63C AFBF002C */ sw $ra, 0x002C($sp) +/* 00CA0 80A1B640 AFB00028 */ sw $s0, 0x0028($sp) +/* 00CA4 80A1B644 AFA50044 */ sw $a1, 0x0044($sp) /* 00CA8 80A1B648 3C0140C0 */ lui $at, 0x40C0 ## $at = 40C00000 /* 00CAC 80A1B64C 44812000 */ mtc1 $at, $f4 ## $f4 = 6.00 /* 00CB0 80A1B650 C4800164 */ lwc1 $f0, 0x0164($a0) ## 00000164 /* 00CB4 80A1B654 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 00CB8 80A1B658 3C014040 */ lui $at, 0x4040 ## $at = 40400000 -/* 00CBC 80A1B65C 46002032 */ c.eq.s $f4, $f0 +/* 00CBC 80A1B65C 46002032 */ c.eq.s $f4, $f0 /* 00CC0 80A1B660 00000000 */ nop -/* 00CC4 80A1B664 45020005 */ bc1fl .L80A1B67C +/* 00CC4 80A1B664 45020005 */ bc1fl .L80A1B67C /* 00CC8 80A1B668 44814000 */ mtc1 $at, $f8 ## $f8 = 3.00 /* 00CCC 80A1B66C 44803000 */ mtc1 $zero, $f6 ## $f6 = 0.00 -/* 00CD0 80A1B670 10000012 */ beq $zero, $zero, .L80A1B6BC +/* 00CD0 80A1B670 10000012 */ beq $zero, $zero, .L80A1B6BC /* 00CD4 80A1B674 E4860168 */ swc1 $f6, 0x0168($a0) ## 00000168 /* 00CD8 80A1B678 44814000 */ mtc1 $at, $f8 ## $f8 = 3.00 .L80A1B67C: /* 00CDC 80A1B67C 3C01C120 */ lui $at, 0xC120 ## $at = C1200000 -/* 00CE0 80A1B680 46004032 */ c.eq.s $f8, $f0 +/* 00CE0 80A1B680 46004032 */ c.eq.s $f8, $f0 /* 00CE4 80A1B684 00000000 */ nop -/* 00CE8 80A1B688 4502000D */ bc1fl .L80A1B6C0 +/* 00CE8 80A1B688 4502000D */ bc1fl .L80A1B6C0 /* 00CEC 80A1B68C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 00CF0 80A1B690 44815000 */ mtc1 $at, $f10 ## $f10 = -10.00 /* 00CF4 80A1B694 920E0383 */ lbu $t6, 0x0383($s0) ## 00000383 /* 00CF8 80A1B698 3C0141C8 */ lui $at, 0x41C8 ## $at = 41C80000 /* 00CFC 80A1B69C 44818000 */ mtc1 $at, $f16 ## $f16 = 25.00 /* 00D00 80A1B6A0 E60A006C */ swc1 $f10, 0x006C($s0) ## 0000006C -/* 00D04 80A1B6A4 11C00005 */ beq $t6, $zero, .L80A1B6BC +/* 00D04 80A1B6A4 11C00005 */ beq $t6, $zero, .L80A1B6BC /* 00D08 80A1B6A8 E6100060 */ swc1 $f16, 0x0060($s0) ## 00000060 /* 00D0C 80A1B6AC A2000383 */ sb $zero, 0x0383($s0) ## 00000383 /* 00D10 80A1B6B0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 00D14 80A1B6B4 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 00D18 80A1B6B8 24053826 */ addiu $a1, $zero, 0x3826 ## $a1 = 00003826 .L80A1B6BC: /* 00D1C 80A1B6BC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 .L80A1B6C0: -/* 00D20 80A1B6C0 0C286C27 */ jal func_80A1B09C +/* 00D20 80A1B6C0 0C286C27 */ jal func_80A1B09C /* 00D24 80A1B6C4 27A5003C */ addiu $a1, $sp, 0x003C ## $a1 = FFFFFFFC /* 00D28 80A1B6C8 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 00D2C 80A1B6CC 10400015 */ beq $v0, $zero, .L80A1B724 +/* 00D2C 80A1B6CC 10400015 */ beq $v0, $zero, .L80A1B724 /* 00D30 80A1B6D0 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 /* 00D34 80A1B6D4 A2000379 */ sb $zero, 0x0379($s0) ## 00000379 /* 00D38 80A1B6D8 E600006C */ swc1 $f0, 0x006C($s0) ## 0000006C /* 00D3C 80A1B6DC 0C028800 */ jal SkelAnime_GetFrameCount - + /* 00D40 80A1B6E0 248411C0 */ addiu $a0, $a0, 0x11C0 ## $a0 = 060011C0 /* 00D44 80A1B6E4 44829000 */ mtc1 $v0, $f18 ## $f18 = 0.00 /* 00D48 80A1B6E8 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 /* 00D4C 80A1B6EC 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 00D50 80A1B6F0 46809120 */ cvt.s.w $f4, $f18 -/* 00D54 80A1B6F4 44070000 */ mfc1 $a3, $f0 +/* 00D50 80A1B6F0 46809120 */ cvt.s.w $f4, $f18 +/* 00D54 80A1B6F4 44070000 */ mfc1 $a3, $f0 /* 00D58 80A1B6F8 24A511C0 */ addiu $a1, $a1, 0x11C0 ## $a1 = 060011C0 /* 00D5C 80A1B6FC 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C /* 00D60 80A1B700 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 00D64 80A1B704 AFA00014 */ sw $zero, 0x0014($sp) -/* 00D68 80A1B708 E7A40010 */ swc1 $f4, 0x0010($sp) -/* 00D6C 80A1B70C 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 00D70 80A1B710 E7A00018 */ swc1 $f0, 0x0018($sp) +/* 00D64 80A1B704 AFA00014 */ sw $zero, 0x0014($sp) +/* 00D68 80A1B708 E7A40010 */ swc1 $f4, 0x0010($sp) +/* 00D6C 80A1B70C 0C029468 */ jal SkelAnime_ChangeAnim + +/* 00D70 80A1B710 E7A00018 */ swc1 $f0, 0x0018($sp) /* 00D74 80A1B714 3C0F80A2 */ lui $t7, %hi(func_80A1B524) ## $t7 = 80A20000 /* 00D78 80A1B718 25EFB524 */ addiu $t7, $t7, %lo(func_80A1B524) ## $t7 = 80A1B524 -/* 00D7C 80A1B71C 10000011 */ beq $zero, $zero, .L80A1B764 +/* 00D7C 80A1B71C 10000011 */ beq $zero, $zero, .L80A1B764 /* 00D80 80A1B720 AE0F0354 */ sw $t7, 0x0354($s0) ## 00000354 .L80A1B724: /* 00D84 80A1B724 C6060060 */ lwc1 $f6, 0x0060($s0) ## 00000060 -/* 00D88 80A1B728 C7A8003C */ lwc1 $f8, 0x003C($sp) +/* 00D88 80A1B728 C7A8003C */ lwc1 $f8, 0x003C($sp) /* 00D8C 80A1B72C 3C014220 */ lui $at, 0x4220 ## $at = 42200000 -/* 00D90 80A1B730 4600303E */ c.le.s $f6, $f0 +/* 00D90 80A1B730 4600303E */ c.le.s $f6, $f0 /* 00D94 80A1B734 00000000 */ nop -/* 00D98 80A1B738 4502000B */ bc1fl .L80A1B768 -/* 00D9C 80A1B73C 8FBF002C */ lw $ra, 0x002C($sp) +/* 00D98 80A1B738 4502000B */ bc1fl .L80A1B768 +/* 00D9C 80A1B73C 8FBF002C */ lw $ra, 0x002C($sp) /* 00DA0 80A1B740 44815000 */ mtc1 $at, $f10 ## $f10 = 40.00 /* 00DA4 80A1B744 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 00DA8 80A1B748 460A403C */ c.lt.s $f8, $f10 +/* 00DA8 80A1B748 460A403C */ c.lt.s $f8, $f10 /* 00DAC 80A1B74C 00000000 */ nop -/* 00DB0 80A1B750 45020005 */ bc1fl .L80A1B768 -/* 00DB4 80A1B754 8FBF002C */ lw $ra, 0x002C($sp) +/* 00DB0 80A1B750 45020005 */ bc1fl .L80A1B768 +/* 00DB4 80A1B754 8FBF002C */ lw $ra, 0x002C($sp) /* 00DB8 80A1B758 44818000 */ mtc1 $at, $f16 ## $f16 = 1.00 /* 00DBC 80A1B75C 00000000 */ nop /* 00DC0 80A1B760 E6100168 */ swc1 $f16, 0x0168($s0) ## 00000168 .L80A1B764: -/* 00DC4 80A1B764 8FBF002C */ lw $ra, 0x002C($sp) +/* 00DC4 80A1B764 8FBF002C */ lw $ra, 0x002C($sp) .L80A1B768: -/* 00DC8 80A1B768 8FB00028 */ lw $s0, 0x0028($sp) +/* 00DC8 80A1B768 8FB00028 */ lw $s0, 0x0028($sp) /* 00DCC 80A1B76C 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 -/* 00DD0 80A1B770 03E00008 */ jr $ra +/* 00DD0 80A1B770 03E00008 */ jr $ra /* 00DD4 80A1B774 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1B778.s b/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1B778.s index 00a1ab9d74..e531dd61e8 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1B778.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1B778.s @@ -1,44 +1,44 @@ glabel func_80A1B778 /* 00DD8 80A1B778 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 00DDC 80A1B77C AFBF002C */ sw $ra, 0x002C($sp) -/* 00DE0 80A1B780 AFB00028 */ sw $s0, 0x0028($sp) -/* 00DE4 80A1B784 AFA5003C */ sw $a1, 0x003C($sp) +/* 00DDC 80A1B77C AFBF002C */ sw $ra, 0x002C($sp) +/* 00DE0 80A1B780 AFB00028 */ sw $s0, 0x0028($sp) +/* 00DE4 80A1B784 AFA5003C */ sw $a1, 0x003C($sp) /* 00DE8 80A1B788 848E001C */ lh $t6, 0x001C($a0) ## 0000001C /* 00DEC 80A1B78C 3C0180A2 */ lui $at, %hi(D_80A1D070) ## $at = 80A20000 /* 00DF0 80A1B790 C4860390 */ lwc1 $f6, 0x0390($a0) ## 00000390 -/* 00DF4 80A1B794 000E7880 */ sll $t7, $t6, 2 -/* 00DF8 80A1B798 01EE7823 */ subu $t7, $t7, $t6 -/* 00DFC 80A1B79C 000F7880 */ sll $t7, $t7, 2 -/* 00E00 80A1B7A0 002F0821 */ addu $at, $at, $t7 -/* 00E04 80A1B7A4 C424D070 */ lwc1 $f4, %lo(D_80A1D070)($at) +/* 00DF4 80A1B794 000E7880 */ sll $t7, $t6, 2 +/* 00DF8 80A1B798 01EE7823 */ subu $t7, $t7, $t6 +/* 00DFC 80A1B79C 000F7880 */ sll $t7, $t7, 2 +/* 00E00 80A1B7A0 002F0821 */ addu $at, $at, $t7 +/* 00E04 80A1B7A4 C424D070 */ lwc1 $f4, %lo(D_80A1D070)($at) /* 00E08 80A1B7A8 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 00E0C 80A1B7AC 24180064 */ addiu $t8, $zero, 0x0064 ## $t8 = 00000064 -/* 00E10 80A1B7B0 46062200 */ add.s $f8, $f4, $f6 +/* 00E10 80A1B7B0 46062200 */ add.s $f8, $f4, $f6 /* 00E14 80A1B7B4 248400B6 */ addiu $a0, $a0, 0x00B6 ## $a0 = 000000B6 /* 00E18 80A1B7B8 24060002 */ addiu $a2, $zero, 0x0002 ## $a2 = 00000002 /* 00E1C 80A1B7BC 24072710 */ addiu $a3, $zero, 0x2710 ## $a3 = 00002710 -/* 00E20 80A1B7C0 E7A80034 */ swc1 $f8, 0x0034($sp) +/* 00E20 80A1B7C0 E7A80034 */ swc1 $f8, 0x0034($sp) /* 00E24 80A1B7C4 86050032 */ lh $a1, 0x0032($s0) ## 00000032 /* 00E28 80A1B7C8 0C01E1A7 */ jal Math_SmoothScaleMaxMinS - -/* 00E2C 80A1B7CC AFB80010 */ sw $t8, 0x0010($sp) + +/* 00E2C 80A1B7CC AFB80010 */ sw $t8, 0x0010($sp) /* 00E30 80A1B7D0 3C0140C0 */ lui $at, 0x40C0 ## $at = 40C00000 /* 00E34 80A1B7D4 44811000 */ mtc1 $at, $f2 ## $f2 = 6.00 /* 00E38 80A1B7D8 C6000164 */ lwc1 $f0, 0x0164($s0) ## 00000164 /* 00E3C 80A1B7DC 3C014040 */ lui $at, 0x4040 ## $at = 40400000 -/* 00E40 80A1B7E0 46001032 */ c.eq.s $f2, $f0 +/* 00E40 80A1B7E0 46001032 */ c.eq.s $f2, $f0 /* 00E44 80A1B7E4 00000000 */ nop -/* 00E48 80A1B7E8 45020005 */ bc1fl .L80A1B800 +/* 00E48 80A1B7E8 45020005 */ bc1fl .L80A1B800 /* 00E4C 80A1B7EC 44815000 */ mtc1 $at, $f10 ## $f10 = 3.00 /* 00E50 80A1B7F0 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 00E54 80A1B7F4 1000000D */ beq $zero, $zero, .L80A1B82C +/* 00E54 80A1B7F4 1000000D */ beq $zero, $zero, .L80A1B82C /* 00E58 80A1B7F8 E6000168 */ swc1 $f0, 0x0168($s0) ## 00000168 /* 00E5C 80A1B7FC 44815000 */ mtc1 $at, $f10 ## $f10 = 3.00 .L80A1B800: /* 00E60 80A1B800 3C01C120 */ lui $at, 0xC120 ## $at = C1200000 -/* 00E64 80A1B804 46005032 */ c.eq.s $f10, $f0 +/* 00E64 80A1B804 46005032 */ c.eq.s $f10, $f0 /* 00E68 80A1B808 00000000 */ nop -/* 00E6C 80A1B80C 45020008 */ bc1fl .L80A1B830 +/* 00E6C 80A1B80C 45020008 */ bc1fl .L80A1B830 /* 00E70 80A1B810 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 /* 00E74 80A1B814 44818000 */ mtc1 $at, $f16 ## $f16 = -10.00 /* 00E78 80A1B818 3C0141C8 */ lui $at, 0x41C8 ## $at = 41C80000 @@ -50,47 +50,47 @@ glabel func_80A1B778 /* 00E8C 80A1B82C 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 .L80A1B830: /* 00E90 80A1B830 C6040060 */ lwc1 $f4, 0x0060($s0) ## 00000060 -/* 00E94 80A1B834 C7A80034 */ lwc1 $f8, 0x0034($sp) -/* 00E98 80A1B838 4600203C */ c.lt.s $f4, $f0 +/* 00E94 80A1B834 C7A80034 */ lwc1 $f8, 0x0034($sp) +/* 00E98 80A1B838 4600203C */ c.lt.s $f4, $f0 /* 00E9C 80A1B83C 00000000 */ nop -/* 00EA0 80A1B840 4502001F */ bc1fl .L80A1B8C0 -/* 00EA4 80A1B844 8FBF002C */ lw $ra, 0x002C($sp) +/* 00EA0 80A1B840 4502001F */ bc1fl .L80A1B8C0 +/* 00EA4 80A1B844 8FBF002C */ lw $ra, 0x002C($sp) /* 00EA8 80A1B848 C6060028 */ lwc1 $f6, 0x0028($s0) ## 00000028 /* 00EAC 80A1B84C 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 -/* 00EB0 80A1B850 4608303C */ c.lt.s $f6, $f8 +/* 00EB0 80A1B850 4608303C */ c.lt.s $f6, $f8 /* 00EB4 80A1B854 00000000 */ nop -/* 00EB8 80A1B858 45020019 */ bc1fl .L80A1B8C0 -/* 00EBC 80A1B85C 8FBF002C */ lw $ra, 0x002C($sp) +/* 00EB8 80A1B858 45020019 */ bc1fl .L80A1B8C0 +/* 00EBC 80A1B85C 8FBF002C */ lw $ra, 0x002C($sp) /* 00EC0 80A1B860 0C028800 */ jal SkelAnime_GetFrameCount - + /* 00EC4 80A1B864 24841534 */ addiu $a0, $a0, 0x1534 ## $a0 = 06001534 /* 00EC8 80A1B868 44825000 */ mtc1 $v0, $f10 ## $f10 = 0.00 /* 00ECC 80A1B86C 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 /* 00ED0 80A1B870 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 00ED4 80A1B874 46805420 */ cvt.s.w $f16, $f10 -/* 00ED8 80A1B878 44070000 */ mfc1 $a3, $f0 +/* 00ED4 80A1B874 46805420 */ cvt.s.w $f16, $f10 +/* 00ED8 80A1B878 44070000 */ mfc1 $a3, $f0 /* 00EDC 80A1B87C 24A51534 */ addiu $a1, $a1, 0x1534 ## $a1 = 06001534 /* 00EE0 80A1B880 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C /* 00EE4 80A1B884 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 00EE8 80A1B888 AFA00014 */ sw $zero, 0x0014($sp) -/* 00EEC 80A1B88C E7B00010 */ swc1 $f16, 0x0010($sp) -/* 00EF0 80A1B890 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 00EF4 80A1B894 E7A00018 */ swc1 $f0, 0x0018($sp) +/* 00EE8 80A1B888 AFA00014 */ sw $zero, 0x0014($sp) +/* 00EEC 80A1B88C E7B00010 */ swc1 $f16, 0x0010($sp) +/* 00EF0 80A1B890 0C029468 */ jal SkelAnime_ChangeAnim + +/* 00EF4 80A1B894 E7A00018 */ swc1 $f0, 0x0018($sp) /* 00EF8 80A1B898 3C1980A2 */ lui $t9, %hi(func_80A1B22C) ## $t9 = 80A20000 /* 00EFC 80A1B89C 2739B22C */ addiu $t9, $t9, %lo(func_80A1B22C) ## $t9 = 80A1B22C /* 00F00 80A1B8A0 AE190354 */ sw $t9, 0x0354($s0) ## 00000354 -/* 00F04 80A1B8A4 0C286B03 */ jal func_80A1AC0C +/* 00F04 80A1B8A4 0C286B03 */ jal func_80A1AC0C /* 00F08 80A1B8A8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 00F0C 80A1B8AC 24080001 */ addiu $t0, $zero, 0x0001 ## $t0 = 00000001 /* 00F10 80A1B8B0 A208037C */ sb $t0, 0x037C($s0) ## 0000037C -/* 00F14 80A1B8B4 0C286A68 */ jal func_80A1A9A0 +/* 00F14 80A1B8B4 0C286A68 */ jal func_80A1A9A0 /* 00F18 80A1B8B8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00F1C 80A1B8BC 8FBF002C */ lw $ra, 0x002C($sp) +/* 00F1C 80A1B8BC 8FBF002C */ lw $ra, 0x002C($sp) .L80A1B8C0: -/* 00F20 80A1B8C0 8FB00028 */ lw $s0, 0x0028($sp) +/* 00F20 80A1B8C0 8FB00028 */ lw $s0, 0x0028($sp) /* 00F24 80A1B8C4 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 -/* 00F28 80A1B8C8 03E00008 */ jr $ra +/* 00F28 80A1B8C8 03E00008 */ jr $ra /* 00F2C 80A1B8CC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1B9D8.s b/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1B9D8.s index 4b37460a64..658566ed54 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1B9D8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1B9D8.s @@ -1,78 +1,78 @@ glabel func_80A1B9D8 /* 01038 80A1B9D8 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 -/* 0103C 80A1B9DC AFBF001C */ sw $ra, 0x001C($sp) -/* 01040 80A1B9E0 AFB00018 */ sw $s0, 0x0018($sp) -/* 01044 80A1B9E4 AFA50044 */ sw $a1, 0x0044($sp) +/* 0103C 80A1B9DC AFBF001C */ sw $ra, 0x001C($sp) +/* 01040 80A1B9E0 AFB00018 */ sw $s0, 0x0018($sp) +/* 01044 80A1B9E4 AFA50044 */ sw $a1, 0x0044($sp) /* 01048 80A1B9E8 848E00B6 */ lh $t6, 0x00B6($a0) ## 000000B6 /* 0104C 80A1B9EC 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 01050 80A1B9F0 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 01054 80A1B9F4 A7AE003E */ sh $t6, 0x003E($sp) +/* 01054 80A1B9F4 A7AE003E */ sh $t6, 0x003E($sp) /* 01058 80A1B9F8 848F03AA */ lh $t7, 0x03AA($a0) ## 000003AA /* 0105C 80A1B9FC 8C86002C */ lw $a2, 0x002C($a0) ## 0000002C /* 01060 80A1BA00 C48E0028 */ lwc1 $f14, 0x0028($a0) ## 00000028 /* 01064 80A1BA04 25F81000 */ addiu $t8, $t7, 0x1000 ## $t8 = 00001000 /* 01068 80A1BA08 A49803AA */ sh $t8, 0x03AA($a0) ## 000003AA -/* 0106C 80A1BA0C 0C034261 */ jal Matrix_Translate +/* 0106C 80A1BA0C 0C034261 */ jal Matrix_Translate /* 01070 80A1BA10 C48C0024 */ lwc1 $f12, 0x0024($a0) ## 00000024 /* 01074 80A1BA14 86040030 */ lh $a0, 0x0030($s0) ## 00000030 /* 01078 80A1BA18 86050032 */ lh $a1, 0x0032($s0) ## 00000032 /* 0107C 80A1BA1C 86060034 */ lh $a2, 0x0034($s0) ## 00000034 -/* 01080 80A1BA20 0C034421 */ jal Matrix_RotateXYZ +/* 01080 80A1BA20 0C034421 */ jal Matrix_RotateZYX /* 01084 80A1BA24 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 /* 01088 80A1BA28 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 /* 0108C 80A1BA2C 3C0141C8 */ lui $at, 0x41C8 ## $at = 41C80000 /* 01090 80A1BA30 44812000 */ mtc1 $at, $f4 ## $f4 = 25.00 /* 01094 80A1BA34 27A4002C */ addiu $a0, $sp, 0x002C ## $a0 = FFFFFFEC /* 01098 80A1BA38 27A50020 */ addiu $a1, $sp, 0x0020 ## $a1 = FFFFFFE0 -/* 0109C 80A1BA3C E7A00030 */ swc1 $f0, 0x0030($sp) -/* 010A0 80A1BA40 E7A0002C */ swc1 $f0, 0x002C($sp) -/* 010A4 80A1BA44 0C0346BD */ jal Matrix_MultVec3f -/* 010A8 80A1BA48 E7A40034 */ swc1 $f4, 0x0034($sp) +/* 0109C 80A1BA3C E7A00030 */ swc1 $f0, 0x0030($sp) +/* 010A0 80A1BA40 E7A0002C */ swc1 $f0, 0x002C($sp) +/* 010A4 80A1BA44 0C0346BD */ jal Matrix_MultVec3f +/* 010A8 80A1BA48 E7A40034 */ swc1 $f4, 0x0034($sp) /* 010AC 80A1BA4C 860403AA */ lh $a0, 0x03AA($s0) ## 000003AA -/* 010B0 80A1BA50 00042040 */ sll $a0, $a0, 1 -/* 010B4 80A1BA54 00042400 */ sll $a0, $a0, 16 +/* 010B0 80A1BA50 00042040 */ sll $a0, $a0, 1 +/* 010B4 80A1BA54 00042400 */ sll $a0, $a0, 16 /* 010B8 80A1BA58 0C01DE1C */ jal Math_Sins ## sins? -/* 010BC 80A1BA5C 00042403 */ sra $a0, $a0, 16 +/* 010BC 80A1BA5C 00042403 */ sra $a0, $a0, 16 /* 010C0 80A1BA60 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 /* 010C4 80A1BA64 44813000 */ mtc1 $at, $f6 ## $f6 = 5.00 -/* 010C8 80A1BA68 87A4003E */ lh $a0, 0x003E($sp) -/* 010CC 80A1BA6C 46060202 */ mul.s $f8, $f0, $f6 +/* 010C8 80A1BA68 87A4003E */ lh $a0, 0x003E($sp) +/* 010CC 80A1BA6C 46060202 */ mul.s $f8, $f0, $f6 /* 010D0 80A1BA70 0C01DE1C */ jal Math_Sins ## sins? -/* 010D4 80A1BA74 E7A80038 */ swc1 $f8, 0x0038($sp) -/* 010D8 80A1BA78 C7AA0038 */ lwc1 $f10, 0x0038($sp) -/* 010DC 80A1BA7C C7B20020 */ lwc1 $f18, 0x0020($sp) +/* 010D4 80A1BA74 E7A80038 */ swc1 $f8, 0x0038($sp) +/* 010D8 80A1BA78 C7AA0038 */ lwc1 $f10, 0x0038($sp) +/* 010DC 80A1BA7C C7B20020 */ lwc1 $f18, 0x0020($sp) /* 010E0 80A1BA80 860403AA */ lh $a0, 0x03AA($s0) ## 000003AA -/* 010E4 80A1BA84 460A0402 */ mul.s $f16, $f0, $f10 -/* 010E8 80A1BA88 46128100 */ add.s $f4, $f16, $f18 +/* 010E4 80A1BA84 460A0402 */ mul.s $f16, $f0, $f10 +/* 010E8 80A1BA88 46128100 */ add.s $f4, $f16, $f18 /* 010EC 80A1BA8C 0C01DE0D */ jal Math_Coss ## coss? /* 010F0 80A1BA90 E60403AC */ swc1 $f4, 0x03AC($s0) ## 000003AC /* 010F4 80A1BA94 3C014248 */ lui $at, 0x4248 ## $at = 42480000 /* 010F8 80A1BA98 44814000 */ mtc1 $at, $f8 ## $f8 = 50.00 /* 010FC 80A1BA9C C6060390 */ lwc1 $f6, 0x0390($s0) ## 00000390 -/* 01100 80A1BAA0 46000400 */ add.s $f16, $f0, $f0 -/* 01104 80A1BAA4 46083280 */ add.s $f10, $f6, $f8 -/* 01108 80A1BAA8 460A8480 */ add.s $f18, $f16, $f10 +/* 01100 80A1BAA0 46000400 */ add.s $f16, $f0, $f0 +/* 01104 80A1BAA4 46083280 */ add.s $f10, $f6, $f8 +/* 01108 80A1BAA8 460A8480 */ add.s $f18, $f16, $f10 /* 0110C 80A1BAAC E61203B0 */ swc1 $f18, 0x03B0($s0) ## 000003B0 /* 01110 80A1BAB0 0C01DE0D */ jal Math_Coss ## coss? -/* 01114 80A1BAB4 87A4003E */ lh $a0, 0x003E($sp) -/* 01118 80A1BAB8 C7A40038 */ lwc1 $f4, 0x0038($sp) -/* 0111C 80A1BABC C7A80028 */ lwc1 $f8, 0x0028($sp) +/* 01114 80A1BAB4 87A4003E */ lh $a0, 0x003E($sp) +/* 01118 80A1BAB8 C7A40038 */ lwc1 $f4, 0x0038($sp) +/* 0111C 80A1BABC C7A80028 */ lwc1 $f8, 0x0028($sp) /* 01120 80A1BAC0 C60C03AC */ lwc1 $f12, 0x03AC($s0) ## 000003AC -/* 01124 80A1BAC4 46040182 */ mul.s $f6, $f0, $f4 +/* 01124 80A1BAC4 46040182 */ mul.s $f6, $f0, $f4 /* 01128 80A1BAC8 C60E03B0 */ lwc1 $f14, 0x03B0($s0) ## 000003B0 /* 0112C 80A1BACC 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 01130 80A1BAD0 46083400 */ add.s $f16, $f6, $f8 +/* 01130 80A1BAD0 46083400 */ add.s $f16, $f6, $f8 /* 01134 80A1BAD4 E61003B4 */ swc1 $f16, 0x03B4($s0) ## 000003B4 -/* 01138 80A1BAD8 0C034261 */ jal Matrix_Translate +/* 01138 80A1BAD8 0C034261 */ jal Matrix_Translate /* 0113C 80A1BADC 8E0603B4 */ lw $a2, 0x03B4($s0) ## 000003B4 /* 01140 80A1BAE0 86040030 */ lh $a0, 0x0030($s0) ## 00000030 /* 01144 80A1BAE4 86050032 */ lh $a1, 0x0032($s0) ## 00000032 /* 01148 80A1BAE8 86060034 */ lh $a2, 0x0034($s0) ## 00000034 -/* 0114C 80A1BAEC 0C034421 */ jal Matrix_RotateXYZ +/* 0114C 80A1BAEC 0C034421 */ jal Matrix_RotateZYX /* 01150 80A1BAF0 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 /* 01154 80A1BAF4 3C01C170 */ lui $at, 0xC170 ## $at = C1700000 /* 01158 80A1BAF8 44819000 */ mtc1 $at, $f18 ## $f18 = -15.00 @@ -81,14 +81,14 @@ glabel func_80A1B9D8 /* 01164 80A1BB04 44812000 */ mtc1 $at, $f4 ## $f4 = 20.00 /* 01168 80A1BB08 27A4002C */ addiu $a0, $sp, 0x002C ## $a0 = FFFFFFEC /* 0116C 80A1BB0C 260503B8 */ addiu $a1, $s0, 0x03B8 ## $a1 = 000003B8 -/* 01170 80A1BB10 E7B20030 */ swc1 $f18, 0x0030($sp) -/* 01174 80A1BB14 E7AA002C */ swc1 $f10, 0x002C($sp) -/* 01178 80A1BB18 0C0346BD */ jal Matrix_MultVec3f -/* 0117C 80A1BB1C E7A40034 */ swc1 $f4, 0x0034($sp) -/* 01180 80A1BB20 8FBF001C */ lw $ra, 0x001C($sp) -/* 01184 80A1BB24 8FB00018 */ lw $s0, 0x0018($sp) +/* 01170 80A1BB10 E7B20030 */ swc1 $f18, 0x0030($sp) +/* 01174 80A1BB14 E7AA002C */ swc1 $f10, 0x002C($sp) +/* 01178 80A1BB18 0C0346BD */ jal Matrix_MultVec3f +/* 0117C 80A1BB1C E7A40034 */ swc1 $f4, 0x0034($sp) +/* 01180 80A1BB20 8FBF001C */ lw $ra, 0x001C($sp) +/* 01184 80A1BB24 8FB00018 */ lw $s0, 0x0018($sp) /* 01188 80A1BB28 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 -/* 0118C 80A1BB2C 03E00008 */ jr $ra +/* 0118C 80A1BB2C 03E00008 */ jr $ra /* 01190 80A1BB30 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1CC2C.s b/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1CC2C.s index 6ebae3c342..54545d4a5d 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1CC2C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1CC2C.s @@ -17,7 +17,7 @@ glabel func_80A1CC2C /* 022C4 80A1CC64 8DC50000 */ lw $a1, 0x0000($t6) ## 00000000 /* 022C8 80A1CC68 27A40030 */ addiu $a0, $sp, 0x0030 ## $a0 = FFFFFFE8 /* 022CC 80A1CC6C 240706C7 */ addiu $a3, $zero, 0x06C7 ## $a3 = 000006C7 -/* 022D0 80A1CC70 0C031AB1 */ jal func_800C6AC4 +/* 022D0 80A1CC70 0C031AB1 */ jal Graph_OpenDisps /* 022D4 80A1CC74 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 /* 022D8 80A1CC78 0C034213 */ jal Matrix_Push /* 022DC 80A1CC7C 00000000 */ nop @@ -55,7 +55,7 @@ glabel func_80A1CC2C /* 0235C 80A1CCFC 24C6D258 */ addiu $a2, $a2, %lo(D_80A1D258) ## $a2 = 80A1D258 /* 02360 80A1CD00 27A40030 */ addiu $a0, $sp, 0x0030 ## $a0 = FFFFFFE8 /* 02364 80A1CD04 240706CD */ addiu $a3, $zero, 0x06CD ## $a3 = 000006CD -/* 02368 80A1CD08 0C031AD5 */ jal func_800C6B54 +/* 02368 80A1CD08 0C031AD5 */ jal Graph_CloseDisps /* 0236C 80A1CD0C 8D850000 */ lw $a1, 0x0000($t4) ## 00000000 /* 02370 80A1CD10 8FBF001C */ lw $ra, 0x001C($sp) .L80A1CD14: diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1CD24.s b/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1CD24.s index a0de3320cd..04d5a21c2b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1CD24.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Fr/func_80A1CD24.s @@ -1,28 +1,28 @@ glabel func_80A1CD24 /* 02384 80A1CD24 27BDFF98 */ addiu $sp, $sp, 0xFF98 ## $sp = FFFFFF98 -/* 02388 80A1CD28 AFBF002C */ sw $ra, 0x002C($sp) -/* 0238C 80A1CD2C AFB00028 */ sw $s0, 0x0028($sp) -/* 02390 80A1CD30 AFA5006C */ sw $a1, 0x006C($sp) +/* 02388 80A1CD28 AFBF002C */ sw $ra, 0x002C($sp) +/* 0238C 80A1CD2C AFB00028 */ sw $s0, 0x0028($sp) +/* 02390 80A1CD30 AFA5006C */ sw $a1, 0x006C($sp) /* 02394 80A1CD34 848E001C */ lh $t6, 0x001C($a0) ## 0000001C /* 02398 80A1CD38 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 0239C 80A1CD3C 3C0680A2 */ lui $a2, %hi(D_80A1D268) ## $a2 = 80A20000 /* 023A0 80A1CD40 25CFFFFF */ addiu $t7, $t6, 0xFFFF ## $t7 = FFFFFFFF -/* 023A4 80A1CD44 A7AF005E */ sh $t7, 0x005E($sp) +/* 023A4 80A1CD44 A7AF005E */ sh $t7, 0x005E($sp) /* 023A8 80A1CD48 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 /* 023AC 80A1CD4C 24C6D268 */ addiu $a2, $a2, %lo(D_80A1D268) ## $a2 = 80A1D268 /* 023B0 80A1CD50 27A40048 */ addiu $a0, $sp, 0x0048 ## $a0 = FFFFFFE0 /* 023B4 80A1CD54 240706DA */ addiu $a3, $zero, 0x06DA ## $a3 = 000006DA -/* 023B8 80A1CD58 0C031AB1 */ jal func_800C6AC4 -/* 023BC 80A1CD5C AFA50058 */ sw $a1, 0x0058($sp) -/* 023C0 80A1CD60 8FB9006C */ lw $t9, 0x006C($sp) -/* 023C4 80A1CD64 0C024F46 */ jal func_80093D18 +/* 023B8 80A1CD58 0C031AB1 */ jal Graph_OpenDisps +/* 023BC 80A1CD5C AFA50058 */ sw $a1, 0x0058($sp) +/* 023C0 80A1CD60 8FB9006C */ lw $t9, 0x006C($sp) +/* 023C4 80A1CD64 0C024F46 */ jal func_80093D18 /* 023C8 80A1CD68 8F240000 */ lw $a0, 0x0000($t9) ## 00000000 /* 023CC 80A1CD6C 920A03A8 */ lbu $t2, 0x03A8($s0) ## 000003A8 -/* 023D0 80A1CD70 8FA80058 */ lw $t0, 0x0058($sp) +/* 023D0 80A1CD70 8FA80058 */ lw $t0, 0x0058($sp) /* 023D4 80A1CD74 3C0CE700 */ lui $t4, 0xE700 ## $t4 = E7000000 -/* 023D8 80A1CD78 11400003 */ beq $t2, $zero, .L80A1CD88 +/* 023D8 80A1CD78 11400003 */ beq $t2, $zero, .L80A1CD88 /* 023DC 80A1CD7C 3C0EFB00 */ lui $t6, 0xFB00 ## $t6 = FB000000 -/* 023E0 80A1CD80 10000002 */ beq $zero, $zero, .L80A1CD8C +/* 023E0 80A1CD80 10000002 */ beq $zero, $zero, .L80A1CD8C /* 023E4 80A1CD84 2409005F */ addiu $t1, $zero, 0x005F ## $t1 = 0000005F .L80A1CD88: /* 023E8 80A1CD88 2409FFFF */ addiu $t1, $zero, 0xFFFF ## $t1 = FFFFFFFF @@ -44,27 +44,27 @@ glabel func_80A1CD24 /* 02424 80A1CDC4 C61003C0 */ lwc1 $f16, 0x03C0($s0) ## 000003C0 /* 02428 80A1CDC8 C60803BC */ lwc1 $f8, 0x03BC($s0) ## 000003BC /* 0242C 80A1CDCC C60403B8 */ lwc1 $f4, 0x03B8($s0) ## 000003B8 -/* 02430 80A1CDD0 4600848D */ trunc.w.s $f18, $f16 +/* 02430 80A1CDD0 4600848D */ trunc.w.s $f18, $f16 /* 02434 80A1CDD4 240D00FF */ addiu $t5, $zero, 0x00FF ## $t5 = 000000FF -/* 02438 80A1CDD8 AFAD0018 */ sw $t5, 0x0018($sp) -/* 0243C 80A1CDDC 4600428D */ trunc.w.s $f10, $f8 -/* 02440 80A1CDE0 44079000 */ mfc1 $a3, $f18 -/* 02444 80A1CDE4 AFA80058 */ sw $t0, 0x0058($sp) -/* 02448 80A1CDE8 4600218D */ trunc.w.s $f6, $f4 -/* 0244C 80A1CDEC 44065000 */ mfc1 $a2, $f10 -/* 02450 80A1CDF0 00073C00 */ sll $a3, $a3, 16 -/* 02454 80A1CDF4 00073C03 */ sra $a3, $a3, 16 -/* 02458 80A1CDF8 44053000 */ mfc1 $a1, $f6 -/* 0245C 80A1CDFC 00063400 */ sll $a2, $a2, 16 -/* 02460 80A1CE00 00063403 */ sra $a2, $a2, 16 -/* 02464 80A1CE04 00052C00 */ sll $a1, $a1, 16 -/* 02468 80A1CE08 00052C03 */ sra $a1, $a1, 16 -/* 0246C 80A1CE0C AFA9001C */ sw $t1, 0x001C($sp) -/* 02470 80A1CE10 AFAC0014 */ sw $t4, 0x0014($sp) +/* 02438 80A1CDD8 AFAD0018 */ sw $t5, 0x0018($sp) +/* 0243C 80A1CDDC 4600428D */ trunc.w.s $f10, $f8 +/* 02440 80A1CDE0 44079000 */ mfc1 $a3, $f18 +/* 02444 80A1CDE4 AFA80058 */ sw $t0, 0x0058($sp) +/* 02448 80A1CDE8 4600218D */ trunc.w.s $f6, $f4 +/* 0244C 80A1CDEC 44065000 */ mfc1 $a2, $f10 +/* 02450 80A1CDF0 00073C00 */ sll $a3, $a3, 16 +/* 02454 80A1CDF4 00073C03 */ sra $a3, $a3, 16 +/* 02458 80A1CDF8 44053000 */ mfc1 $a1, $f6 +/* 0245C 80A1CDFC 00063400 */ sll $a2, $a2, 16 +/* 02460 80A1CE00 00063403 */ sra $a2, $a2, 16 +/* 02464 80A1CE04 00052C00 */ sll $a1, $a1, 16 +/* 02468 80A1CE08 00052C03 */ sra $a1, $a1, 16 +/* 0246C 80A1CE0C AFA9001C */ sw $t1, 0x001C($sp) +/* 02470 80A1CE10 AFAC0014 */ sw $t4, 0x0014($sp) /* 02474 80A1CE14 0C01E763 */ jal Lights_InitType0PositionalLight - -/* 02478 80A1CE18 AFAB0010 */ sw $t3, 0x0010($sp) -/* 0247C 80A1CE1C 8FA80058 */ lw $t0, 0x0058($sp) + +/* 02478 80A1CE18 AFAB0010 */ sw $t3, 0x0010($sp) +/* 0247C 80A1CE1C 8FA80058 */ lw $t0, 0x0058($sp) /* 02480 80A1CE20 3C0FFB00 */ lui $t7, 0xFB00 ## $t7 = FB000000 /* 02484 80A1CE24 3C0A80A2 */ lui $t2, %hi(D_80A1D054) ## $t2 = 80A20000 /* 02488 80A1CE28 8D0202C0 */ lw $v0, 0x02C0($t0) ## 000002C0 @@ -73,18 +73,18 @@ glabel func_80A1CD24 /* 02494 80A1CE34 244E0008 */ addiu $t6, $v0, 0x0008 ## $t6 = 00000008 /* 02498 80A1CE38 AD0E02C0 */ sw $t6, 0x02C0($t0) ## 000002C0 /* 0249C 80A1CE3C AC4F0000 */ sw $t7, 0x0000($v0) ## 00000000 -/* 024A0 80A1CE40 87B8005E */ lh $t8, 0x005E($sp) +/* 024A0 80A1CE40 87B8005E */ lh $t8, 0x005E($sp) /* 024A4 80A1CE44 24A5D0FC */ addiu $a1, $a1, %lo(D_80A1D0FC) ## $a1 = 80A1D0FC /* 024A8 80A1CE48 3C078016 */ lui $a3, 0x8016 ## $a3 = 80160000 -/* 024AC 80A1CE4C 0018C880 */ sll $t9, $t8, 2 -/* 024B0 80A1CE50 032A1821 */ addu $v1, $t9, $t2 +/* 024AC 80A1CE4C 0018C880 */ sll $t9, $t8, 2 +/* 024B0 80A1CE50 032A1821 */ addu $v1, $t9, $t2 /* 024B4 80A1CE54 906C0002 */ lbu $t4, 0x0002($v1) ## 00000002 /* 024B8 80A1CE58 906F0000 */ lbu $t7, 0x0000($v1) ## 00000000 /* 024BC 80A1CE5C 906B0001 */ lbu $t3, 0x0001($v1) ## 00000001 -/* 024C0 80A1CE60 000C6A00 */ sll $t5, $t4, 8 -/* 024C4 80A1CE64 000FC600 */ sll $t8, $t7, 24 +/* 024C0 80A1CE60 000C6A00 */ sll $t5, $t4, 8 +/* 024C4 80A1CE64 000FC600 */ sll $t8, $t7, 24 /* 024C8 80A1CE68 01B8C825 */ or $t9, $t5, $t8 ## $t9 = 00000000 -/* 024CC 80A1CE6C 000B6400 */ sll $t4, $t3, 16 +/* 024CC 80A1CE6C 000B6400 */ sll $t4, $t3, 16 /* 024D0 80A1CE70 032C7025 */ or $t6, $t9, $t4 ## $t6 = 00000000 /* 024D4 80A1CE74 35CF00FF */ ori $t7, $t6, 0x00FF ## $t7 = 000000FF /* 024D8 80A1CE78 AC4F0004 */ sw $t7, 0x0004($v0) ## 00000004 @@ -97,20 +97,20 @@ glabel func_80A1CD24 /* 024F4 80A1CE94 920A0378 */ lbu $t2, 0x0378($s0) ## 00000378 /* 024F8 80A1CE98 24E76FA8 */ addiu $a3, $a3, 0x6FA8 ## $a3 = 80166FA8 /* 024FC 80A1CE9C 3C0600FF */ lui $a2, 0x00FF ## $a2 = 00FF0000 -/* 02500 80A1CEA0 000A5880 */ sll $t3, $t2, 2 -/* 02504 80A1CEA4 00ABC821 */ addu $t9, $a1, $t3 +/* 02500 80A1CEA0 000A5880 */ sll $t3, $t2, 2 +/* 02504 80A1CEA4 00ABC821 */ addu $t9, $a1, $t3 /* 02508 80A1CEA8 8F240000 */ lw $a0, 0x0000($t9) ## 00000000 /* 0250C 80A1CEAC 34C6FFFF */ ori $a2, $a2, 0xFFFF ## $a2 = 00FFFFFF /* 02510 80A1CEB0 3C098000 */ lui $t1, 0x8000 ## $t1 = 80000000 -/* 02514 80A1CEB4 00047100 */ sll $t6, $a0, 4 -/* 02518 80A1CEB8 000E7F02 */ srl $t7, $t6, 28 -/* 0251C 80A1CEBC 000F6880 */ sll $t5, $t7, 2 -/* 02520 80A1CEC0 00EDC021 */ addu $t8, $a3, $t5 +/* 02514 80A1CEB4 00047100 */ sll $t6, $a0, 4 +/* 02518 80A1CEB8 000E7F02 */ srl $t7, $t6, 28 +/* 0251C 80A1CEBC 000F6880 */ sll $t5, $t7, 2 +/* 02520 80A1CEC0 00EDC021 */ addu $t8, $a3, $t5 /* 02524 80A1CEC4 8F0A0000 */ lw $t2, 0x0000($t8) ## DB060020 -/* 02528 80A1CEC8 00866024 */ and $t4, $a0, $a2 +/* 02528 80A1CEC8 00866024 */ and $t4, $a0, $a2 /* 0252C 80A1CECC 3C0FDB06 */ lui $t7, 0xDB06 ## $t7 = DB060000 -/* 02530 80A1CED0 018A5821 */ addu $t3, $t4, $t2 -/* 02534 80A1CED4 0169C821 */ addu $t9, $t3, $t1 +/* 02530 80A1CED0 018A5821 */ addu $t3, $t4, $t2 +/* 02534 80A1CED4 0169C821 */ addu $t9, $t3, $t1 /* 02538 80A1CED8 AC590004 */ sw $t9, 0x0004($v0) ## 00000004 /* 0253C 80A1CEDC 8D0202C0 */ lw $v0, 0x02C0($t0) ## 000002C0 /* 02540 80A1CEE0 35EF0024 */ ori $t7, $t7, 0x0024 ## $t7 = DB060024 @@ -118,18 +118,18 @@ glabel func_80A1CD24 /* 02548 80A1CEE8 AD0E02C0 */ sw $t6, 0x02C0($t0) ## 000002C0 /* 0254C 80A1CEEC AC4F0000 */ sw $t7, 0x0000($v0) ## 00000000 /* 02550 80A1CEF0 920D0378 */ lbu $t5, 0x0378($s0) ## 00000378 -/* 02554 80A1CEF4 000DC080 */ sll $t8, $t5, 2 -/* 02558 80A1CEF8 00B86021 */ addu $t4, $a1, $t8 +/* 02554 80A1CEF4 000DC080 */ sll $t8, $t5, 2 +/* 02558 80A1CEF8 00B86021 */ addu $t4, $a1, $t8 /* 0255C 80A1CEFC 8D840000 */ lw $a0, 0x0000($t4) ## 00000000 -/* 02560 80A1CF00 00045900 */ sll $t3, $a0, 4 -/* 02564 80A1CF04 000BCF02 */ srl $t9, $t3, 28 -/* 02568 80A1CF08 00197080 */ sll $t6, $t9, 2 -/* 0256C 80A1CF0C 00EE7821 */ addu $t7, $a3, $t6 +/* 02560 80A1CF00 00045900 */ sll $t3, $a0, 4 +/* 02564 80A1CF04 000BCF02 */ srl $t9, $t3, 28 +/* 02568 80A1CF08 00197080 */ sll $t6, $t9, 2 +/* 0256C 80A1CF0C 00EE7821 */ addu $t7, $a3, $t6 /* 02570 80A1CF10 8DED0000 */ lw $t5, 0x0000($t7) ## DB060024 -/* 02574 80A1CF14 00865024 */ and $t2, $a0, $a2 +/* 02574 80A1CF14 00865024 */ and $t2, $a0, $a2 /* 02578 80A1CF18 3C1980A2 */ lui $t9, %hi(func_80A1CC2C) ## $t9 = 80A20000 -/* 0257C 80A1CF1C 014DC021 */ addu $t8, $t2, $t5 -/* 02580 80A1CF20 03096021 */ addu $t4, $t8, $t1 +/* 0257C 80A1CF1C 014DC021 */ addu $t8, $t2, $t5 +/* 02580 80A1CF20 03096021 */ addu $t4, $t8, $t1 /* 02584 80A1CF24 AC4C0004 */ sw $t4, 0x0004($v0) ## 00000004 /* 02588 80A1CF28 9207014E */ lbu $a3, 0x014E($s0) ## 0000014E /* 0258C 80A1CF2C 8E06016C */ lw $a2, 0x016C($s0) ## 0000016C @@ -137,50 +137,50 @@ glabel func_80A1CD24 /* 02594 80A1CF34 3C0B80A2 */ lui $t3, %hi(func_80A1CC04) ## $t3 = 80A20000 /* 02598 80A1CF38 256BCC04 */ addiu $t3, $t3, %lo(func_80A1CC04) ## $t3 = 80A1CC04 /* 0259C 80A1CF3C 2739CC2C */ addiu $t9, $t9, %lo(func_80A1CC2C) ## $t9 = 80A1CC2C -/* 025A0 80A1CF40 AFB90014 */ sw $t9, 0x0014($sp) -/* 025A4 80A1CF44 AFAB0010 */ sw $t3, 0x0010($sp) -/* 025A8 80A1CF48 AFB00018 */ sw $s0, 0x0018($sp) -/* 025AC 80A1CF4C 0C0286B2 */ jal func_800A1AC8 -/* 025B0 80A1CF50 8FA4006C */ lw $a0, 0x006C($sp) +/* 025A0 80A1CF40 AFB90014 */ sw $t9, 0x0014($sp) +/* 025A4 80A1CF44 AFAB0010 */ sw $t3, 0x0010($sp) +/* 025A8 80A1CF48 AFB00018 */ sw $s0, 0x0018($sp) +/* 025AC 80A1CF4C 0C0286B2 */ jal SkelAnime_DrawSV +/* 025B0 80A1CF50 8FA4006C */ lw $a0, 0x006C($sp) /* 025B4 80A1CF54 920E03A8 */ lbu $t6, 0x03A8($s0) ## 000003A8 /* 025B8 80A1CF58 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 025BC 80A1CF5C 51C00018 */ beql $t6, $zero, .L80A1CFC0 -/* 025C0 80A1CF60 8FAF006C */ lw $t7, 0x006C($sp) +/* 025BC 80A1CF5C 51C00018 */ beql $t6, $zero, .L80A1CFC0 +/* 025C0 80A1CF60 8FAF006C */ lw $t7, 0x006C($sp) /* 025C4 80A1CF64 C60C03AC */ lwc1 $f12, 0x03AC($s0) ## 000003AC /* 025C8 80A1CF68 C60E03B0 */ lwc1 $f14, 0x03B0($s0) ## 000003B0 -/* 025CC 80A1CF6C 0C034261 */ jal Matrix_Translate +/* 025CC 80A1CF6C 0C034261 */ jal Matrix_Translate /* 025D0 80A1CF70 8E0603B4 */ lw $a2, 0x03B4($s0) ## 000003B4 /* 025D4 80A1CF74 3C0180A2 */ lui $at, %hi(D_80A1D304) ## $at = 80A20000 -/* 025D8 80A1CF78 C42CD304 */ lwc1 $f12, %lo(D_80A1D304)($at) +/* 025D8 80A1CF78 C42CD304 */ lwc1 $f12, %lo(D_80A1D304)($at) /* 025DC 80A1CF7C 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 025E0 80A1CF80 44066000 */ mfc1 $a2, $f12 -/* 025E4 80A1CF84 0C0342A3 */ jal Matrix_Scale -/* 025E8 80A1CF88 46006386 */ mov.s $f14, $f12 +/* 025E0 80A1CF80 44066000 */ mfc1 $a2, $f12 +/* 025E4 80A1CF84 0C0342A3 */ jal Matrix_Scale +/* 025E8 80A1CF88 46006386 */ mov.s $f14, $f12 /* 025EC 80A1CF8C 860400B4 */ lh $a0, 0x00B4($s0) ## 000000B4 /* 025F0 80A1CF90 860500B6 */ lh $a1, 0x00B6($s0) ## 000000B6 /* 025F4 80A1CF94 860600B8 */ lh $a2, 0x00B8($s0) ## 000000B8 -/* 025F8 80A1CF98 0C034421 */ jal Matrix_RotateXYZ +/* 025F8 80A1CF98 0C034421 */ jal Matrix_RotateZYX /* 025FC 80A1CF9C 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 /* 02600 80A1CFA0 8E0502B4 */ lw $a1, 0x02B4($s0) ## 000002B4 /* 02604 80A1CFA4 8E0602D0 */ lw $a2, 0x02D0($s0) ## 000002D0 -/* 02608 80A1CFA8 AFA00014 */ sw $zero, 0x0014($sp) -/* 0260C 80A1CFAC AFA00010 */ sw $zero, 0x0010($sp) -/* 02610 80A1CFB0 8FA4006C */ lw $a0, 0x006C($sp) +/* 02608 80A1CFA8 AFA00014 */ sw $zero, 0x0014($sp) +/* 0260C 80A1CFAC AFA00010 */ sw $zero, 0x0010($sp) +/* 02610 80A1CFB0 8FA4006C */ lw $a0, 0x006C($sp) /* 02614 80A1CFB4 0C028572 */ jal SkelAnime_Draw - + /* 02618 80A1CFB8 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 0261C 80A1CFBC 8FAF006C */ lw $t7, 0x006C($sp) +/* 0261C 80A1CFBC 8FAF006C */ lw $t7, 0x006C($sp) .L80A1CFC0: /* 02620 80A1CFC0 3C0680A2 */ lui $a2, %hi(D_80A1D278) ## $a2 = 80A20000 /* 02624 80A1CFC4 24C6D278 */ addiu $a2, $a2, %lo(D_80A1D278) ## $a2 = 80A1D278 /* 02628 80A1CFC8 27A40048 */ addiu $a0, $sp, 0x0048 ## $a0 = FFFFFFE0 /* 0262C 80A1CFCC 24070718 */ addiu $a3, $zero, 0x0718 ## $a3 = 00000718 -/* 02630 80A1CFD0 0C031AD5 */ jal func_800C6B54 +/* 02630 80A1CFD0 0C031AD5 */ jal Graph_CloseDisps /* 02634 80A1CFD4 8DE50000 */ lw $a1, 0x0000($t7) ## 00000000 -/* 02638 80A1CFD8 8FBF002C */ lw $ra, 0x002C($sp) -/* 0263C 80A1CFDC 8FB00028 */ lw $s0, 0x0028($sp) +/* 02638 80A1CFD8 8FBF002C */ lw $ra, 0x002C($sp) +/* 0263C 80A1CFDC 8FB00028 */ lw $s0, 0x0028($sp) /* 02640 80A1CFE0 27BD0068 */ addiu $sp, $sp, 0x0068 ## $sp = 00000000 -/* 02644 80A1CFE4 03E00008 */ jr $ra +/* 02644 80A1CFE4 03E00008 */ jr $ra /* 02648 80A1CFE8 00000000 */ nop /* 0264C 80A1CFEC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fu/EnFu_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Fu/EnFu_Draw.s index 2b3be3f20c..e66e950310 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Fu/EnFu_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Fu/EnFu_Draw.s @@ -1,20 +1,20 @@ glabel EnFu_Draw /* 00A9C 80A1E2AC 27BDFFA8 */ addiu $sp, $sp, 0xFFA8 ## $sp = FFFFFFA8 -/* 00AA0 80A1E2B0 AFBF002C */ sw $ra, 0x002C($sp) -/* 00AA4 80A1E2B4 AFB00028 */ sw $s0, 0x0028($sp) -/* 00AA8 80A1E2B8 AFA5005C */ sw $a1, 0x005C($sp) +/* 00AA0 80A1E2B0 AFBF002C */ sw $ra, 0x002C($sp) +/* 00AA4 80A1E2B4 AFB00028 */ sw $s0, 0x0028($sp) +/* 00AA8 80A1E2B8 AFA5005C */ sw $a1, 0x005C($sp) /* 00AAC 80A1E2BC 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 /* 00AB0 80A1E2C0 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 00AB4 80A1E2C4 3C0680A2 */ lui $a2, %hi(D_80A1E470) ## $a2 = 80A20000 /* 00AB8 80A1E2C8 24C6E470 */ addiu $a2, $a2, %lo(D_80A1E470) ## $a2 = 80A1E470 /* 00ABC 80A1E2CC 27A4003C */ addiu $a0, $sp, 0x003C ## $a0 = FFFFFFE4 /* 00AC0 80A1E2D0 24070305 */ addiu $a3, $zero, 0x0305 ## $a3 = 00000305 -/* 00AC4 80A1E2D4 0C031AB1 */ jal func_800C6AC4 -/* 00AC8 80A1E2D8 AFA5004C */ sw $a1, 0x004C($sp) -/* 00ACC 80A1E2DC 8FAF005C */ lw $t7, 0x005C($sp) -/* 00AD0 80A1E2E0 0C0250F2 */ jal func_800943C8 +/* 00AC4 80A1E2D4 0C031AB1 */ jal Graph_OpenDisps +/* 00AC8 80A1E2D8 AFA5004C */ sw $a1, 0x004C($sp) +/* 00ACC 80A1E2DC 8FAF005C */ lw $t7, 0x005C($sp) +/* 00AD0 80A1E2E0 0C0250F2 */ jal func_800943C8 /* 00AD4 80A1E2E4 8DE40000 */ lw $a0, 0x0000($t7) ## 00000000 -/* 00AD8 80A1E2E8 8FA8004C */ lw $t0, 0x004C($sp) +/* 00AD8 80A1E2E8 8FA8004C */ lw $t0, 0x004C($sp) /* 00ADC 80A1E2EC 3C19DB06 */ lui $t9, 0xDB06 ## $t9 = DB060000 /* 00AE0 80A1E2F0 37390020 */ ori $t9, $t9, 0x0020 ## $t9 = DB060020 /* 00AE4 80A1E2F4 8D0302C0 */ lw $v1, 0x02C0($t0) ## 000002C0 @@ -26,20 +26,20 @@ glabel EnFu_Draw /* 00AFC 80A1E30C 960902AA */ lhu $t1, 0x02AA($s0) ## 000002AA /* 00B00 80A1E310 24C66FA8 */ addiu $a2, $a2, 0x6FA8 ## $a2 = 80166FA8 /* 00B04 80A1E314 3C0500FF */ lui $a1, 0x00FF ## $a1 = 00FF0000 -/* 00B08 80A1E318 00095080 */ sll $t2, $t1, 2 -/* 00B0C 80A1E31C 008A2021 */ addu $a0, $a0, $t2 -/* 00B10 80A1E320 8C84E458 */ lw $a0, %lo(D_80A1E458)($a0) +/* 00B08 80A1E318 00095080 */ sll $t2, $t1, 2 +/* 00B0C 80A1E31C 008A2021 */ addu $a0, $a0, $t2 +/* 00B10 80A1E320 8C84E458 */ lw $a0, %lo(D_80A1E458)($a0) /* 00B14 80A1E324 34A5FFFF */ ori $a1, $a1, 0xFFFF ## $a1 = 00FFFFFF /* 00B18 80A1E328 3C078000 */ lui $a3, 0x8000 ## $a3 = 80000000 -/* 00B1C 80A1E32C 00046100 */ sll $t4, $a0, 4 -/* 00B20 80A1E330 000C6F02 */ srl $t5, $t4, 28 -/* 00B24 80A1E334 000D7080 */ sll $t6, $t5, 2 -/* 00B28 80A1E338 00CE7821 */ addu $t7, $a2, $t6 +/* 00B1C 80A1E32C 00046100 */ sll $t4, $a0, 4 +/* 00B20 80A1E330 000C6F02 */ srl $t5, $t4, 28 +/* 00B24 80A1E334 000D7080 */ sll $t6, $t5, 2 +/* 00B28 80A1E338 00CE7821 */ addu $t7, $a2, $t6 /* 00B2C 80A1E33C 8DF80000 */ lw $t8, 0x0000($t7) ## 00000000 -/* 00B30 80A1E340 00855824 */ and $t3, $a0, $a1 +/* 00B30 80A1E340 00855824 */ and $t3, $a0, $a1 /* 00B34 80A1E344 3C0CDB06 */ lui $t4, 0xDB06 ## $t4 = DB060000 -/* 00B38 80A1E348 0178C821 */ addu $t9, $t3, $t8 -/* 00B3C 80A1E34C 03274821 */ addu $t1, $t9, $a3 +/* 00B38 80A1E348 0178C821 */ addu $t9, $t3, $t8 +/* 00B3C 80A1E34C 03274821 */ addu $t1, $t9, $a3 /* 00B40 80A1E350 AC690004 */ sw $t1, 0x0004($v1) ## 00000004 /* 00B44 80A1E354 8D0302C0 */ lw $v1, 0x02C0($t0) ## 000002C0 /* 00B48 80A1E358 358C0024 */ ori $t4, $t4, 0x0024 ## $t4 = DB060024 @@ -48,40 +48,40 @@ glabel EnFu_Draw /* 00B54 80A1E364 AD0A02C0 */ sw $t2, 0x02C0($t0) ## 000002C0 /* 00B58 80A1E368 AC6C0000 */ sw $t4, 0x0000($v1) ## 00000000 /* 00B5C 80A1E36C 960D02AA */ lhu $t5, 0x02AA($s0) ## 000002AA -/* 00B60 80A1E370 000D7080 */ sll $t6, $t5, 2 -/* 00B64 80A1E374 008E2021 */ addu $a0, $a0, $t6 -/* 00B68 80A1E378 8C84E460 */ lw $a0, %lo(D_80A1E460)($a0) +/* 00B60 80A1E370 000D7080 */ sll $t6, $t5, 2 +/* 00B64 80A1E374 008E2021 */ addu $a0, $a0, $t6 +/* 00B68 80A1E378 8C84E460 */ lw $a0, %lo(D_80A1E460)($a0) /* 00B6C 80A1E37C 3C0E80A2 */ lui $t6, %hi(func_80A1E110) ## $t6 = 80A20000 /* 00B70 80A1E380 25CEE110 */ addiu $t6, $t6, %lo(func_80A1E110) ## $t6 = 80A1E110 -/* 00B74 80A1E384 00045900 */ sll $t3, $a0, 4 -/* 00B78 80A1E388 000BC702 */ srl $t8, $t3, 28 -/* 00B7C 80A1E38C 0018C880 */ sll $t9, $t8, 2 -/* 00B80 80A1E390 00D94821 */ addu $t1, $a2, $t9 +/* 00B74 80A1E384 00045900 */ sll $t3, $a0, 4 +/* 00B78 80A1E388 000BC702 */ srl $t8, $t3, 28 +/* 00B7C 80A1E38C 0018C880 */ sll $t9, $t8, 2 +/* 00B80 80A1E390 00D94821 */ addu $t1, $a2, $t9 /* 00B84 80A1E394 8D2A0000 */ lw $t2, 0x0000($t1) ## 00000000 -/* 00B88 80A1E398 00857824 */ and $t7, $a0, $a1 +/* 00B88 80A1E398 00857824 */ and $t7, $a0, $a1 /* 00B8C 80A1E39C 3C0B80A2 */ lui $t3, %hi(func_80A1E26C) ## $t3 = 80A20000 -/* 00B90 80A1E3A0 01EA6021 */ addu $t4, $t7, $t2 -/* 00B94 80A1E3A4 01876821 */ addu $t5, $t4, $a3 +/* 00B90 80A1E3A0 01EA6021 */ addu $t4, $t7, $t2 +/* 00B94 80A1E3A4 01876821 */ addu $t5, $t4, $a3 /* 00B98 80A1E3A8 AC6D0004 */ sw $t5, 0x0004($v1) ## 00000004 /* 00B9C 80A1E3AC 9207019A */ lbu $a3, 0x019A($s0) ## 0000019A /* 00BA0 80A1E3B0 8E0601B8 */ lw $a2, 0x01B8($s0) ## 000001B8 /* 00BA4 80A1E3B4 8E05019C */ lw $a1, 0x019C($s0) ## 0000019C /* 00BA8 80A1E3B8 256BE26C */ addiu $t3, $t3, %lo(func_80A1E26C) ## $t3 = 80A1E26C -/* 00BAC 80A1E3BC AFAB0014 */ sw $t3, 0x0014($sp) -/* 00BB0 80A1E3C0 AFB00018 */ sw $s0, 0x0018($sp) -/* 00BB4 80A1E3C4 AFAE0010 */ sw $t6, 0x0010($sp) -/* 00BB8 80A1E3C8 0C0286B2 */ jal func_800A1AC8 -/* 00BBC 80A1E3CC 8FA4005C */ lw $a0, 0x005C($sp) -/* 00BC0 80A1E3D0 8FB8005C */ lw $t8, 0x005C($sp) +/* 00BAC 80A1E3BC AFAB0014 */ sw $t3, 0x0014($sp) +/* 00BB0 80A1E3C0 AFB00018 */ sw $s0, 0x0018($sp) +/* 00BB4 80A1E3C4 AFAE0010 */ sw $t6, 0x0010($sp) +/* 00BB8 80A1E3C8 0C0286B2 */ jal SkelAnime_DrawSV +/* 00BBC 80A1E3CC 8FA4005C */ lw $a0, 0x005C($sp) +/* 00BC0 80A1E3D0 8FB8005C */ lw $t8, 0x005C($sp) /* 00BC4 80A1E3D4 3C0680A2 */ lui $a2, %hi(D_80A1E480) ## $a2 = 80A20000 /* 00BC8 80A1E3D8 24C6E480 */ addiu $a2, $a2, %lo(D_80A1E480) ## $a2 = 80A1E480 /* 00BCC 80A1E3DC 27A4003C */ addiu $a0, $sp, 0x003C ## $a0 = FFFFFFE4 /* 00BD0 80A1E3E0 24070317 */ addiu $a3, $zero, 0x0317 ## $a3 = 00000317 -/* 00BD4 80A1E3E4 0C031AD5 */ jal func_800C6B54 +/* 00BD4 80A1E3E4 0C031AD5 */ jal Graph_CloseDisps /* 00BD8 80A1E3E8 8F050000 */ lw $a1, 0x0000($t8) ## 00000000 -/* 00BDC 80A1E3EC 8FBF002C */ lw $ra, 0x002C($sp) -/* 00BE0 80A1E3F0 8FB00028 */ lw $s0, 0x0028($sp) +/* 00BDC 80A1E3EC 8FBF002C */ lw $ra, 0x002C($sp) +/* 00BE0 80A1E3F0 8FB00028 */ lw $s0, 0x0028($sp) /* 00BE4 80A1E3F4 27BD0058 */ addiu $sp, $sp, 0x0058 ## $sp = 00000000 -/* 00BE8 80A1E3F8 03E00008 */ jr $ra +/* 00BE8 80A1E3F8 03E00008 */ jr $ra /* 00BEC 80A1E3FC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fu/EnFu_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Fu/EnFu_Init.s index cce2e834d2..bb4f7b787d 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Fu/EnFu_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Fu/EnFu_Init.s @@ -1,15 +1,15 @@ glabel EnFu_Init /* 00000 80A1D810 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 -/* 00004 80A1D814 AFB00028 */ sw $s0, 0x0028($sp) +/* 00004 80A1D814 AFB00028 */ sw $s0, 0x0028($sp) /* 00008 80A1D818 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 0000C 80A1D81C AFBF002C */ sw $ra, 0x002C($sp) -/* 00010 80A1D820 AFA50044 */ sw $a1, 0x0044($sp) +/* 0000C 80A1D81C AFBF002C */ sw $ra, 0x002C($sp) +/* 00010 80A1D820 AFA50044 */ sw $a1, 0x0044($sp) /* 00014 80A1D824 3C068003 */ lui $a2, 0x8003 ## $a2 = 80030000 /* 00018 80A1D828 24C6B5EC */ addiu $a2, $a2, 0xB5EC ## $a2 = 8002B5EC /* 0001C 80A1D82C 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 /* 00020 80A1D830 248400B4 */ addiu $a0, $a0, 0x00B4 ## $a0 = 000000B4 /* 00024 80A1D834 0C00AC78 */ jal ActorShape_Init - + /* 00028 80A1D838 3C074210 */ lui $a3, 0x4210 ## $a3 = 42100000 /* 0002C 80A1D83C 26050198 */ addiu $a1, $s0, 0x0198 ## $a1 = 00000198 /* 00030 80A1D840 3C060600 */ lui $a2, 0x0600 ## $a2 = 06000000 @@ -17,47 +17,47 @@ glabel EnFu_Init /* 00038 80A1D848 260E01DC */ addiu $t6, $s0, 0x01DC ## $t6 = 000001DC /* 0003C 80A1D84C 260F023C */ addiu $t7, $s0, 0x023C ## $t7 = 0000023C /* 00040 80A1D850 24180010 */ addiu $t8, $zero, 0x0010 ## $t8 = 00000010 -/* 00044 80A1D854 AFB80018 */ sw $t8, 0x0018($sp) -/* 00048 80A1D858 AFAF0014 */ sw $t7, 0x0014($sp) -/* 0004C 80A1D85C AFAE0010 */ sw $t6, 0x0010($sp) +/* 00044 80A1D854 AFB80018 */ sw $t8, 0x0018($sp) +/* 00048 80A1D858 AFAF0014 */ sw $t7, 0x0014($sp) +/* 0004C 80A1D85C AFAE0010 */ sw $t6, 0x0010($sp) /* 00050 80A1D860 24E70B04 */ addiu $a3, $a3, 0x0B04 ## $a3 = 06000B04 /* 00054 80A1D864 24C66C90 */ addiu $a2, $a2, 0x6C90 ## $a2 = 06006C90 -/* 00058 80A1D868 AFA50034 */ sw $a1, 0x0034($sp) -/* 0005C 80A1D86C 0C0291BE */ jal func_800A46F8 -/* 00060 80A1D870 8FA40044 */ lw $a0, 0x0044($sp) +/* 00058 80A1D868 AFA50034 */ sw $a1, 0x0034($sp) +/* 0005C 80A1D86C 0C0291BE */ jal SkelAnime_InitSV +/* 00060 80A1D870 8FA40044 */ lw $a0, 0x0044($sp) /* 00064 80A1D874 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 00068 80A1D878 24A50B04 */ addiu $a1, $a1, 0x0B04 ## $a1 = 06000B04 -/* 0006C 80A1D87C 0C0294BE */ jal func_800A52F8 -/* 00070 80A1D880 8FA40034 */ lw $a0, 0x0034($sp) +/* 0006C 80A1D87C 0C0294BE */ jal SkelAnime_ChangeAnimDefaultRepeat +/* 00070 80A1D880 8FA40034 */ lw $a0, 0x0034($sp) /* 00074 80A1D884 2605014C */ addiu $a1, $s0, 0x014C ## $a1 = 0000014C -/* 00078 80A1D888 AFA50034 */ sw $a1, 0x0034($sp) +/* 00078 80A1D888 AFA50034 */ sw $a1, 0x0034($sp) /* 0007C 80A1D88C 0C0170D9 */ jal ActorCollider_AllocCylinder - -/* 00080 80A1D890 8FA40044 */ lw $a0, 0x0044($sp) + +/* 00080 80A1D890 8FA40044 */ lw $a0, 0x0044($sp) /* 00084 80A1D894 3C0780A2 */ lui $a3, %hi(D_80A1E420) ## $a3 = 80A20000 -/* 00088 80A1D898 8FA50034 */ lw $a1, 0x0034($sp) +/* 00088 80A1D898 8FA50034 */ lw $a1, 0x0034($sp) /* 0008C 80A1D89C 24E7E420 */ addiu $a3, $a3, %lo(D_80A1E420) ## $a3 = 80A1E420 -/* 00090 80A1D8A0 8FA40044 */ lw $a0, 0x0044($sp) +/* 00090 80A1D8A0 8FA40044 */ lw $a0, 0x0044($sp) /* 00094 80A1D8A4 0C01712B */ jal ActorCollider_InitCylinder - + /* 00098 80A1D8A8 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 0009C 80A1D8AC 241900FF */ addiu $t9, $zero, 0x00FF ## $t9 = 000000FF /* 000A0 80A1D8B0 3C053C23 */ lui $a1, 0x3C23 ## $a1 = 3C230000 /* 000A4 80A1D8B4 A21900AE */ sb $t9, 0x00AE($s0) ## 000000AE /* 000A8 80A1D8B8 34A5D70A */ ori $a1, $a1, 0xD70A ## $a1 = 3C23D70A /* 000AC 80A1D8BC 0C00B58B */ jal Actor_SetScale - + /* 000B0 80A1D8C0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 000B4 80A1D8C4 3C088016 */ lui $t0, 0x8016 ## $t0 = 80160000 /* 000B8 80A1D8C8 8D08E664 */ lw $t0, -0x199C($t0) ## 8015E664 /* 000BC 80A1D8CC 3C0A80A2 */ lui $t2, %hi(func_80A1DE24) ## $t2 = 80A20000 /* 000C0 80A1D8D0 254ADE24 */ addiu $t2, $t2, %lo(func_80A1DE24) ## $t2 = 80A1DE24 -/* 000C4 80A1D8D4 11000006 */ beq $t0, $zero, .L80A1D8F0 +/* 000C4 80A1D8D4 11000006 */ beq $t0, $zero, .L80A1D8F0 /* 000C8 80A1D8D8 240C0006 */ addiu $t4, $zero, 0x0006 ## $t4 = 00000006 /* 000CC 80A1D8DC 3C0980A2 */ lui $t1, %hi(func_80A1DA9C) ## $t1 = 80A20000 /* 000D0 80A1D8E0 2529DA9C */ addiu $t1, $t1, %lo(func_80A1DA9C) ## $t1 = 80A1DA9C /* 000D4 80A1D8E4 AE0902AC */ sw $t1, 0x02AC($s0) ## 000002AC -/* 000D8 80A1D8E8 10000007 */ beq $zero, $zero, .L80A1D908 +/* 000D8 80A1D8E8 10000007 */ beq $zero, $zero, .L80A1D908 /* 000DC 80A1D8EC A60002AA */ sh $zero, 0x02AA($s0) ## 000002AA .L80A1D8F0: /* 000E0 80A1D8F0 3C014000 */ lui $at, 0x4000 ## $at = 40000000 @@ -69,10 +69,10 @@ glabel EnFu_Init .L80A1D908: /* 000F8 80A1D908 A60002A8 */ sh $zero, 0x02A8($s0) ## 000002A8 /* 000FC 80A1D90C A20C001F */ sb $t4, 0x001F($s0) ## 0000001F -/* 00100 80A1D910 8FBF002C */ lw $ra, 0x002C($sp) -/* 00104 80A1D914 8FB00028 */ lw $s0, 0x0028($sp) +/* 00100 80A1D910 8FBF002C */ lw $ra, 0x002C($sp) +/* 00104 80A1D914 8FB00028 */ lw $s0, 0x0028($sp) /* 00108 80A1D918 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 -/* 0010C 80A1D91C 03E00008 */ jr $ra +/* 0010C 80A1D91C 03E00008 */ jr $ra /* 00110 80A1D920 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fu/EnFu_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Fu/EnFu_Update.s index 8190597167..1e3fb76e44 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Fu/EnFu_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Fu/EnFu_Update.s @@ -1,121 +1,121 @@ glabel EnFu_Update /* 0075C 80A1DF6C 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 -/* 00760 80A1DF70 AFB00028 */ sw $s0, 0x0028($sp) +/* 00760 80A1DF70 AFB00028 */ sw $s0, 0x0028($sp) /* 00764 80A1DF74 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00768 80A1DF78 AFBF002C */ sw $ra, 0x002C($sp) -/* 0076C 80A1DF7C AFA50044 */ sw $a1, 0x0044($sp) +/* 00768 80A1DF78 AFBF002C */ sw $ra, 0x002C($sp) +/* 0076C 80A1DF7C AFA50044 */ sw $a1, 0x0044($sp) /* 00770 80A1DF80 2606014C */ addiu $a2, $s0, 0x014C ## $a2 = 0000014C /* 00774 80A1DF84 00C02825 */ or $a1, $a2, $zero ## $a1 = 0000014C /* 00778 80A1DF88 0C0189B7 */ jal ActorCollider_Cylinder_Update - -/* 0077C 80A1DF8C AFA60030 */ sw $a2, 0x0030($sp) -/* 00780 80A1DF90 8FA40044 */ lw $a0, 0x0044($sp) + +/* 0077C 80A1DF8C AFA60030 */ sw $a2, 0x0030($sp) +/* 00780 80A1DF90 8FA40044 */ lw $a0, 0x0044($sp) /* 00784 80A1DF94 3C010001 */ lui $at, 0x0001 ## $at = 00010000 /* 00788 80A1DF98 34211E60 */ ori $at, $at, 0x1E60 ## $at = 00011E60 -/* 0078C 80A1DF9C 8FA60030 */ lw $a2, 0x0030($sp) +/* 0078C 80A1DF9C 8FA60030 */ lw $a2, 0x0030($sp) /* 00790 80A1DFA0 0C017713 */ jal Actor_CollisionCheck_SetOT ## CollisionCheck_setOT -/* 00794 80A1DFA4 00812821 */ addu $a1, $a0, $at +/* 00794 80A1DFA4 00812821 */ addu $a1, $a0, $at /* 00798 80A1DFA8 0C00B638 */ jal Actor_MoveForward - + /* 0079C 80A1DFAC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 007A0 80A1DFB0 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 /* 007A4 80A1DFB4 240E0004 */ addiu $t6, $zero, 0x0004 ## $t6 = 00000004 -/* 007A8 80A1DFB8 AFAE0014 */ sw $t6, 0x0014($sp) -/* 007AC 80A1DFBC 44060000 */ mfc1 $a2, $f0 -/* 007B0 80A1DFC0 44070000 */ mfc1 $a3, $f0 -/* 007B4 80A1DFC4 8FA40044 */ lw $a0, 0x0044($sp) +/* 007A8 80A1DFB8 AFAE0014 */ sw $t6, 0x0014($sp) +/* 007AC 80A1DFBC 44060000 */ mfc1 $a2, $f0 +/* 007B0 80A1DFC0 44070000 */ mfc1 $a3, $f0 +/* 007B4 80A1DFC4 8FA40044 */ lw $a0, 0x0044($sp) /* 007B8 80A1DFC8 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 007BC 80A1DFCC 0C00B92D */ jal func_8002E4B4 -/* 007C0 80A1DFD0 E7A00010 */ swc1 $f0, 0x0010($sp) +/* 007BC 80A1DFCC 0C00B92D */ jal func_8002E4B4 +/* 007C0 80A1DFD0 E7A00010 */ swc1 $f0, 0x0010($sp) /* 007C4 80A1DFD4 960F02A8 */ lhu $t7, 0x02A8($s0) ## 000002A8 /* 007C8 80A1DFD8 26040198 */ addiu $a0, $s0, 0x0198 ## $a0 = 00000198 /* 007CC 80A1DFDC 31F80002 */ andi $t8, $t7, 0x0002 ## $t8 = 00000000 -/* 007D0 80A1DFE0 57000014 */ bnel $t8, $zero, .L80A1E034 +/* 007D0 80A1DFE0 57000014 */ bnel $t8, $zero, .L80A1E034 /* 007D4 80A1DFE4 8E1902AC */ lw $t9, 0x02AC($s0) ## 000002AC /* 007D8 80A1DFE8 0C02927F */ jal SkelAnime_FrameUpdateMatrix - -/* 007DC 80A1DFEC AFA40030 */ sw $a0, 0x0030($sp) -/* 007E0 80A1DFF0 50400010 */ beql $v0, $zero, .L80A1E034 + +/* 007DC 80A1DFEC AFA40030 */ sw $a0, 0x0030($sp) +/* 007E0 80A1DFF0 50400010 */ beql $v0, $zero, .L80A1E034 /* 007E4 80A1DFF4 8E1902AC */ lw $t9, 0x02AC($s0) ## 000002AC /* 007E8 80A1DFF8 0C028800 */ jal SkelAnime_GetFrameCount - + /* 007EC 80A1DFFC 8E0401A0 */ lw $a0, 0x01A0($s0) ## 000001A0 /* 007F0 80A1E000 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 007F4 80A1E004 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 /* 007F8 80A1E008 8E0501A0 */ lw $a1, 0x01A0($s0) ## 000001A0 -/* 007FC 80A1E00C 468021A0 */ cvt.s.w $f6, $f4 +/* 007FC 80A1E00C 468021A0 */ cvt.s.w $f6, $f4 /* 00800 80A1E010 24190002 */ addiu $t9, $zero, 0x0002 ## $t9 = 00000002 -/* 00804 80A1E014 44070000 */ mfc1 $a3, $f0 -/* 00808 80A1E018 AFB90014 */ sw $t9, 0x0014($sp) -/* 0080C 80A1E01C 8FA40030 */ lw $a0, 0x0030($sp) +/* 00804 80A1E014 44070000 */ mfc1 $a3, $f0 +/* 00808 80A1E018 AFB90014 */ sw $t9, 0x0014($sp) +/* 0080C 80A1E01C 8FA40030 */ lw $a0, 0x0030($sp) /* 00810 80A1E020 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 00814 80A1E024 E7A60010 */ swc1 $f6, 0x0010($sp) -/* 00818 80A1E028 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 0081C 80A1E02C E7A00018 */ swc1 $f0, 0x0018($sp) +/* 00814 80A1E024 E7A60010 */ swc1 $f6, 0x0010($sp) +/* 00818 80A1E028 0C029468 */ jal SkelAnime_ChangeAnim + +/* 0081C 80A1E02C E7A00018 */ swc1 $f0, 0x0018($sp) /* 00820 80A1E030 8E1902AC */ lw $t9, 0x02AC($s0) ## 000002AC .L80A1E034: /* 00824 80A1E034 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00828 80A1E038 8FA50044 */ lw $a1, 0x0044($sp) -/* 0082C 80A1E03C 0320F809 */ jalr $ra, $t9 +/* 00828 80A1E038 8FA50044 */ lw $a1, 0x0044($sp) +/* 0082C 80A1E03C 0320F809 */ jalr $ra, $t9 /* 00830 80A1E040 00000000 */ nop /* 00834 80A1E044 960802A8 */ lhu $t0, 0x02A8($s0) ## 000002A8 /* 00838 80A1E048 2604029C */ addiu $a0, $s0, 0x029C ## $a0 = 0000029C /* 0083C 80A1E04C 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 00840 80A1E050 31090001 */ andi $t1, $t0, 0x0001 ## $t1 = 00000000 -/* 00844 80A1E054 1120001E */ beq $t1, $zero, .L80A1E0D0 +/* 00844 80A1E054 1120001E */ beq $t1, $zero, .L80A1E0D0 /* 00848 80A1E058 24060006 */ addiu $a2, $zero, 0x0006 ## $a2 = 00000006 /* 0084C 80A1E05C 240A0064 */ addiu $t2, $zero, 0x0064 ## $t2 = 00000064 -/* 00850 80A1E060 AFAA0010 */ sw $t2, 0x0010($sp) +/* 00850 80A1E060 AFAA0010 */ sw $t2, 0x0010($sp) /* 00854 80A1E064 0C01E1A7 */ jal Math_SmoothScaleMaxMinS - + /* 00858 80A1E068 24071838 */ addiu $a3, $zero, 0x1838 ## $a3 = 00001838 /* 0085C 80A1E06C 240B0064 */ addiu $t3, $zero, 0x0064 ## $t3 = 00000064 -/* 00860 80A1E070 AFAB0010 */ sw $t3, 0x0010($sp) +/* 00860 80A1E070 AFAB0010 */ sw $t3, 0x0010($sp) /* 00864 80A1E074 2604029E */ addiu $a0, $s0, 0x029E ## $a0 = 0000029E /* 00868 80A1E078 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 0086C 80A1E07C 24060006 */ addiu $a2, $zero, 0x0006 ## $a2 = 00000006 /* 00870 80A1E080 0C01E1A7 */ jal Math_SmoothScaleMaxMinS - + /* 00874 80A1E084 24071838 */ addiu $a3, $zero, 0x1838 ## $a3 = 00001838 /* 00878 80A1E088 240C0064 */ addiu $t4, $zero, 0x0064 ## $t4 = 00000064 -/* 0087C 80A1E08C AFAC0010 */ sw $t4, 0x0010($sp) +/* 0087C 80A1E08C AFAC0010 */ sw $t4, 0x0010($sp) /* 00880 80A1E090 260402A2 */ addiu $a0, $s0, 0x02A2 ## $a0 = 000002A2 /* 00884 80A1E094 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 00888 80A1E098 24060006 */ addiu $a2, $zero, 0x0006 ## $a2 = 00000006 /* 0088C 80A1E09C 0C01E1A7 */ jal Math_SmoothScaleMaxMinS - + /* 00890 80A1E0A0 24071838 */ addiu $a3, $zero, 0x1838 ## $a3 = 00001838 /* 00894 80A1E0A4 240D0064 */ addiu $t5, $zero, 0x0064 ## $t5 = 00000064 -/* 00898 80A1E0A8 AFAD0010 */ sw $t5, 0x0010($sp) +/* 00898 80A1E0A8 AFAD0010 */ sw $t5, 0x0010($sp) /* 0089C 80A1E0AC 260402A4 */ addiu $a0, $s0, 0x02A4 ## $a0 = 000002A4 /* 008A0 80A1E0B0 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 008A4 80A1E0B4 24060006 */ addiu $a2, $zero, 0x0006 ## $a2 = 00000006 /* 008A8 80A1E0B8 0C01E1A7 */ jal Math_SmoothScaleMaxMinS - + /* 008AC 80A1E0BC 24071838 */ addiu $a3, $zero, 0x1838 ## $a3 = 00001838 /* 008B0 80A1E0C0 960E02A8 */ lhu $t6, 0x02A8($s0) ## 000002A8 /* 008B4 80A1E0C4 31CFFFFE */ andi $t7, $t6, 0xFFFE ## $t7 = 00000000 -/* 008B8 80A1E0C8 1000000C */ beq $zero, $zero, .L80A1E0FC +/* 008B8 80A1E0C8 1000000C */ beq $zero, $zero, .L80A1E0FC /* 008BC 80A1E0CC A60F02A8 */ sh $t7, 0x02A8($s0) ## 000002A8 .L80A1E0D0: /* 008C0 80A1E0D0 8E190038 */ lw $t9, 0x0038($s0) ## 00000038 -/* 008C4 80A1E0D4 8FA40044 */ lw $a0, 0x0044($sp) +/* 008C4 80A1E0D4 8FA40044 */ lw $a0, 0x0044($sp) /* 008C8 80A1E0D8 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 008CC 80A1E0DC AFB90010 */ sw $t9, 0x0010($sp) +/* 008CC 80A1E0DC AFB90010 */ sw $t9, 0x0010($sp) /* 008D0 80A1E0E0 8E18003C */ lw $t8, 0x003C($s0) ## 0000003C /* 008D4 80A1E0E4 2606029C */ addiu $a2, $s0, 0x029C ## $a2 = 0000029C /* 008D8 80A1E0E8 260702A2 */ addiu $a3, $s0, 0x02A2 ## $a3 = 000002A2 -/* 008DC 80A1E0EC AFB80014 */ sw $t8, 0x0014($sp) +/* 008DC 80A1E0EC AFB80014 */ sw $t8, 0x0014($sp) /* 008E0 80A1E0F0 8E190040 */ lw $t9, 0x0040($s0) ## 00000040 -/* 008E4 80A1E0F4 0C00E0A4 */ jal func_80038290 -/* 008E8 80A1E0F8 AFB90018 */ sw $t9, 0x0018($sp) +/* 008E4 80A1E0F4 0C00E0A4 */ jal func_80038290 +/* 008E8 80A1E0F8 AFB90018 */ sw $t9, 0x0018($sp) .L80A1E0FC: -/* 008EC 80A1E0FC 8FBF002C */ lw $ra, 0x002C($sp) -/* 008F0 80A1E100 8FB00028 */ lw $s0, 0x0028($sp) +/* 008EC 80A1E0FC 8FBF002C */ lw $ra, 0x002C($sp) +/* 008F0 80A1E100 8FB00028 */ lw $s0, 0x0028($sp) /* 008F4 80A1E104 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 -/* 008F8 80A1E108 03E00008 */ jr $ra +/* 008F8 80A1E108 03E00008 */ jr $ra /* 008FC 80A1E10C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fu/func_80A1DA04.s b/asm/non_matchings/overlays/actors/ovl_En_Fu/func_80A1DA04.s index 6826186fe9..e0a3ac6e62 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Fu/func_80A1DA04.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Fu/func_80A1DA04.s @@ -1,10 +1,10 @@ glabel func_80A1DA04 /* 001F4 80A1DA04 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 001F8 80A1DA08 AFBF002C */ sw $ra, 0x002C($sp) -/* 001FC 80A1DA0C AFB00028 */ sw $s0, 0x0028($sp) -/* 00200 80A1DA10 0C00BCCD */ jal func_8002F334 +/* 001F8 80A1DA08 AFBF002C */ sw $ra, 0x002C($sp) +/* 001FC 80A1DA0C AFB00028 */ sw $s0, 0x0028($sp) +/* 00200 80A1DA10 0C00BCCD */ jal func_8002F334 /* 00204 80A1DA14 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00208 80A1DA18 1040001B */ beq $v0, $zero, .L80A1DA88 +/* 00208 80A1DA18 1040001B */ beq $v0, $zero, .L80A1DA88 /* 0020C 80A1DA1C 3C1880A2 */ lui $t8, %hi(func_80A1DA9C) ## $t8 = 80A20000 /* 00210 80A1DA20 960E02A8 */ lhu $t6, 0x02A8($s0) ## 000002A8 /* 00214 80A1DA24 8E0801A0 */ lw $t0, 0x01A0($s0) ## 000001A0 @@ -13,32 +13,32 @@ glabel func_80A1DA04 /* 00220 80A1DA30 2739057C */ addiu $t9, $t9, 0x057C ## $t9 = 0600057C /* 00224 80A1DA34 31CFFFFD */ andi $t7, $t6, 0xFFFD ## $t7 = 00000000 /* 00228 80A1DA38 A60F02A8 */ sh $t7, 0x02A8($s0) ## 000002A8 -/* 0022C 80A1DA3C 17280012 */ bne $t9, $t0, .L80A1DA88 +/* 0022C 80A1DA3C 17280012 */ bne $t9, $t0, .L80A1DA88 /* 00230 80A1DA40 AE1802AC */ sw $t8, 0x02AC($s0) ## 000002AC /* 00234 80A1DA44 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 /* 00238 80A1DA48 0C028800 */ jal SkelAnime_GetFrameCount - + /* 0023C 80A1DA4C 24840B04 */ addiu $a0, $a0, 0x0B04 ## $a0 = 06000B04 /* 00240 80A1DA50 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 00244 80A1DA54 3C01C080 */ lui $at, 0xC080 ## $at = C0800000 /* 00248 80A1DA58 44814000 */ mtc1 $at, $f8 ## $f8 = -4.00 -/* 0024C 80A1DA5C 468021A0 */ cvt.s.w $f6, $f4 +/* 0024C 80A1DA5C 468021A0 */ cvt.s.w $f6, $f4 /* 00250 80A1DA60 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 00254 80A1DA64 24090002 */ addiu $t1, $zero, 0x0002 ## $t1 = 00000002 -/* 00258 80A1DA68 AFA90014 */ sw $t1, 0x0014($sp) +/* 00258 80A1DA68 AFA90014 */ sw $t1, 0x0014($sp) /* 0025C 80A1DA6C 24A50B04 */ addiu $a1, $a1, 0x0B04 ## $a1 = 06000B04 /* 00260 80A1DA70 26040198 */ addiu $a0, $s0, 0x0198 ## $a0 = 00000198 -/* 00264 80A1DA74 E7A60010 */ swc1 $f6, 0x0010($sp) +/* 00264 80A1DA74 E7A60010 */ swc1 $f6, 0x0010($sp) /* 00268 80A1DA78 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 0026C 80A1DA7C 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 00270 80A1DA80 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 00274 80A1DA84 E7A80018 */ swc1 $f8, 0x0018($sp) +/* 00270 80A1DA80 0C029468 */ jal SkelAnime_ChangeAnim + +/* 00274 80A1DA84 E7A80018 */ swc1 $f8, 0x0018($sp) .L80A1DA88: -/* 00278 80A1DA88 8FBF002C */ lw $ra, 0x002C($sp) -/* 0027C 80A1DA8C 8FB00028 */ lw $s0, 0x0028($sp) +/* 00278 80A1DA88 8FBF002C */ lw $ra, 0x002C($sp) +/* 0027C 80A1DA8C 8FB00028 */ lw $s0, 0x0028($sp) /* 00280 80A1DA90 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 00284 80A1DA94 03E00008 */ jr $ra +/* 00284 80A1DA94 03E00008 */ jr $ra /* 00288 80A1DA98 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fu/func_80A1DA9C.s b/asm/non_matchings/overlays/actors/ovl_En_Fu/func_80A1DA9C.s index 49bbe72246..8ae5a3df41 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Fu/func_80A1DA9C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Fu/func_80A1DA9C.s @@ -1,56 +1,56 @@ glabel func_80A1DA9C /* 0028C 80A1DA9C 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 00290 80A1DAA0 AFA40030 */ sw $a0, 0x0030($sp) -/* 00294 80A1DAA4 AFBF0024 */ sw $ra, 0x0024($sp) -/* 00298 80A1DAA8 AFA50034 */ sw $a1, 0x0034($sp) +/* 00290 80A1DAA0 AFA40030 */ sw $a0, 0x0030($sp) +/* 00294 80A1DAA4 AFBF0024 */ sw $ra, 0x0024($sp) +/* 00298 80A1DAA8 AFA50034 */ sw $a1, 0x0034($sp) /* 0029C 80A1DAAC 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 002A0 80A1DAB0 0C01B0D8 */ jal func_8006C360 +/* 002A0 80A1DAB0 0C01B0D8 */ jal Text_GetFaceReaction /* 002A4 80A1DAB4 2405000B */ addiu $a1, $zero, 0x000B ## $a1 = 0000000B -/* 002A8 80A1DAB8 14400009 */ bne $v0, $zero, .L80A1DAE0 +/* 002A8 80A1DAB8 14400009 */ bne $v0, $zero, .L80A1DAE0 /* 002AC 80A1DABC 3046FFFF */ andi $a2, $v0, 0xFFFF ## $a2 = 00000000 /* 002B0 80A1DAC0 3C0E8016 */ lui $t6, 0x8016 ## $t6 = 80160000 /* 002B4 80A1DAC4 95CEF540 */ lhu $t6, -0x0AC0($t6) ## 8015F540 /* 002B8 80A1DAC8 24065032 */ addiu $a2, $zero, 0x5032 ## $a2 = 00005032 /* 002BC 80A1DACC 31CF0080 */ andi $t7, $t6, 0x0080 ## $t7 = 00000000 -/* 002C0 80A1DAD0 11E00003 */ beq $t7, $zero, .L80A1DAE0 +/* 002C0 80A1DAD0 11E00003 */ beq $t7, $zero, .L80A1DAE0 /* 002C4 80A1DAD4 00000000 */ nop -/* 002C8 80A1DAD8 10000001 */ beq $zero, $zero, .L80A1DAE0 +/* 002C8 80A1DAD8 10000001 */ beq $zero, $zero, .L80A1DAE0 /* 002CC 80A1DADC 24065033 */ addiu $a2, $zero, 0x5033 ## $a2 = 00005033 .L80A1DAE0: /* 002D0 80A1DAE0 3C0780A2 */ lui $a3, %hi(func_80A1DA04) ## $a3 = 80A20000 /* 002D4 80A1DAE4 24E7DA04 */ addiu $a3, $a3, %lo(func_80A1DA04) ## $a3 = 80A1DA04 -/* 002D8 80A1DAE8 8FA40030 */ lw $a0, 0x0030($sp) -/* 002DC 80A1DAEC 8FA50034 */ lw $a1, 0x0034($sp) -/* 002E0 80A1DAF0 0C287653 */ jal func_80A1D94C -/* 002E4 80A1DAF4 A7A6002E */ sh $a2, 0x002E($sp) -/* 002E8 80A1DAF8 10400015 */ beq $v0, $zero, .L80A1DB50 -/* 002EC 80A1DAFC 97A6002E */ lhu $a2, 0x002E($sp) +/* 002D8 80A1DAE8 8FA40030 */ lw $a0, 0x0030($sp) +/* 002DC 80A1DAEC 8FA50034 */ lw $a1, 0x0034($sp) +/* 002E0 80A1DAF0 0C287653 */ jal func_80A1D94C +/* 002E4 80A1DAF4 A7A6002E */ sh $a2, 0x002E($sp) +/* 002E8 80A1DAF8 10400015 */ beq $v0, $zero, .L80A1DB50 +/* 002EC 80A1DAFC 97A6002E */ lhu $a2, 0x002E($sp) /* 002F0 80A1DB00 24015033 */ addiu $at, $zero, 0x5033 ## $at = 00005033 -/* 002F4 80A1DB04 14C10012 */ bne $a2, $at, .L80A1DB50 +/* 002F4 80A1DB04 14C10012 */ bne $a2, $at, .L80A1DB50 /* 002F8 80A1DB08 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 /* 002FC 80A1DB0C 0C028800 */ jal SkelAnime_GetFrameCount - + /* 00300 80A1DB10 2484057C */ addiu $a0, $a0, 0x057C ## $a0 = 0600057C /* 00304 80A1DB14 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 00308 80A1DB18 3C01C080 */ lui $at, 0xC080 ## $at = C0800000 /* 0030C 80A1DB1C 44814000 */ mtc1 $at, $f8 ## $f8 = -4.00 -/* 00310 80A1DB20 468021A0 */ cvt.s.w $f6, $f4 -/* 00314 80A1DB24 8FA40030 */ lw $a0, 0x0030($sp) +/* 00310 80A1DB20 468021A0 */ cvt.s.w $f6, $f4 +/* 00314 80A1DB24 8FA40030 */ lw $a0, 0x0030($sp) /* 00318 80A1DB28 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 0031C 80A1DB2C 24180002 */ addiu $t8, $zero, 0x0002 ## $t8 = 00000002 -/* 00320 80A1DB30 AFB80014 */ sw $t8, 0x0014($sp) +/* 00320 80A1DB30 AFB80014 */ sw $t8, 0x0014($sp) /* 00324 80A1DB34 24A5057C */ addiu $a1, $a1, 0x057C ## $a1 = 0600057C -/* 00328 80A1DB38 E7A60010 */ swc1 $f6, 0x0010($sp) +/* 00328 80A1DB38 E7A60010 */ swc1 $f6, 0x0010($sp) /* 0032C 80A1DB3C 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 00330 80A1DB40 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 00334 80A1DB44 E7A80018 */ swc1 $f8, 0x0018($sp) -/* 00338 80A1DB48 0C029468 */ jal SkelAnime_ChangeAnimation - +/* 00334 80A1DB44 E7A80018 */ swc1 $f8, 0x0018($sp) +/* 00338 80A1DB48 0C029468 */ jal SkelAnime_ChangeAnim + /* 0033C 80A1DB4C 24840198 */ addiu $a0, $a0, 0x0198 ## $a0 = 00000198 .L80A1DB50: -/* 00340 80A1DB50 8FBF0024 */ lw $ra, 0x0024($sp) +/* 00340 80A1DB50 8FBF0024 */ lw $ra, 0x0024($sp) /* 00344 80A1DB54 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 00348 80A1DB58 03E00008 */ jr $ra +/* 00348 80A1DB58 03E00008 */ jr $ra /* 0034C 80A1DB5C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fw/EnFw_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Fw/EnFw_Draw.s index 5cff89c738..be0a35094a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Fw/EnFw_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Fw/EnFw_Draw.s @@ -1,19 +1,19 @@ glabel EnFw_Draw /* 01040 80A1F5E0 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 01044 80A1F5E4 AFBF002C */ sw $ra, 0x002C($sp) -/* 01048 80A1F5E8 AFB00028 */ sw $s0, 0x0028($sp) +/* 01044 80A1F5E4 AFBF002C */ sw $ra, 0x002C($sp) +/* 01048 80A1F5E8 AFB00028 */ sw $s0, 0x0028($sp) /* 0104C 80A1F5EC 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 01050 80A1F5F0 0C287DC2 */ jal func_80A1F708 -/* 01054 80A1F5F4 AFA50034 */ sw $a1, 0x0034($sp) -/* 01058 80A1F5F8 0C034213 */ jal Matrix_Push +/* 01050 80A1F5F0 0C287DC2 */ jal func_80A1F708 +/* 01054 80A1F5F4 AFA50034 */ sw $a1, 0x0034($sp) +/* 01058 80A1F5F8 0C034213 */ jal Matrix_Push /* 0105C 80A1F5FC 00000000 */ nop /* 01060 80A1F600 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01064 80A1F604 0C287E05 */ jal func_80A1F814 -/* 01068 80A1F608 8FA50034 */ lw $a1, 0x0034($sp) -/* 0106C 80A1F60C 0C034221 */ jal Matrix_Pull +/* 01064 80A1F604 0C287E05 */ jal func_80A1F814 +/* 01068 80A1F608 8FA50034 */ lw $a1, 0x0034($sp) +/* 0106C 80A1F60C 0C034221 */ jal Matrix_Pull /* 01070 80A1F610 00000000 */ nop -/* 01074 80A1F614 8FAE0034 */ lw $t6, 0x0034($sp) -/* 01078 80A1F618 0C024F46 */ jal func_80093D18 +/* 01074 80A1F614 8FAE0034 */ lw $t6, 0x0034($sp) +/* 01078 80A1F618 0C024F46 */ jal func_80093D18 /* 0107C 80A1F61C 8DC40000 */ lw $a0, 0x0000($t6) ## 00000000 /* 01080 80A1F620 8E050150 */ lw $a1, 0x0150($s0) ## 00000150 /* 01084 80A1F624 8E06016C */ lw $a2, 0x016C($s0) ## 0000016C @@ -22,15 +22,15 @@ glabel EnFw_Draw /* 01090 80A1F630 3C1880A2 */ lui $t8, %hi(func_80A1F544) ## $t8 = 80A20000 /* 01094 80A1F634 2718F544 */ addiu $t8, $t8, %lo(func_80A1F544) ## $t8 = 80A1F544 /* 01098 80A1F638 25EFF52C */ addiu $t7, $t7, %lo(func_80A1F52C) ## $t7 = 80A1F52C -/* 0109C 80A1F63C AFAF0010 */ sw $t7, 0x0010($sp) -/* 010A0 80A1F640 AFB80014 */ sw $t8, 0x0014($sp) -/* 010A4 80A1F644 AFB00018 */ sw $s0, 0x0018($sp) -/* 010A8 80A1F648 0C0286B2 */ jal func_800A1AC8 -/* 010AC 80A1F64C 8FA40034 */ lw $a0, 0x0034($sp) -/* 010B0 80A1F650 8FBF002C */ lw $ra, 0x002C($sp) -/* 010B4 80A1F654 8FB00028 */ lw $s0, 0x0028($sp) +/* 0109C 80A1F63C AFAF0010 */ sw $t7, 0x0010($sp) +/* 010A0 80A1F640 AFB80014 */ sw $t8, 0x0014($sp) +/* 010A4 80A1F644 AFB00018 */ sw $s0, 0x0018($sp) +/* 010A8 80A1F648 0C0286B2 */ jal SkelAnime_DrawSV +/* 010AC 80A1F64C 8FA40034 */ lw $a0, 0x0034($sp) +/* 010B0 80A1F650 8FBF002C */ lw $ra, 0x002C($sp) +/* 010B4 80A1F654 8FB00028 */ lw $s0, 0x0028($sp) /* 010B8 80A1F658 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 010BC 80A1F65C 03E00008 */ jr $ra +/* 010BC 80A1F65C 03E00008 */ jr $ra /* 010C0 80A1F660 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fw/EnFw_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Fw/EnFw_Init.s index ae961564de..265297deca 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Fw/EnFw_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Fw/EnFw_Init.s @@ -1,72 +1,72 @@ glabel EnFw_Init /* 005A0 80A1EB40 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 -/* 005A4 80A1EB44 AFB00028 */ sw $s0, 0x0028($sp) +/* 005A4 80A1EB44 AFB00028 */ sw $s0, 0x0028($sp) /* 005A8 80A1EB48 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 005AC 80A1EB4C AFA50044 */ sw $a1, 0x0044($sp) +/* 005AC 80A1EB4C AFA50044 */ sw $a1, 0x0044($sp) /* 005B0 80A1EB50 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 005B4 80A1EB54 AFBF002C */ sw $ra, 0x002C($sp) +/* 005B4 80A1EB54 AFBF002C */ sw $ra, 0x002C($sp) /* 005B8 80A1EB58 2605014C */ addiu $a1, $s0, 0x014C ## $a1 = 0000014C /* 005BC 80A1EB5C 260E021C */ addiu $t6, $s0, 0x021C ## $t6 = 0000021C /* 005C0 80A1EB60 260F025E */ addiu $t7, $s0, 0x025E ## $t7 = 0000025E /* 005C4 80A1EB64 3C060600 */ lui $a2, 0x0600 ## $a2 = 06000000 /* 005C8 80A1EB68 2418000B */ addiu $t8, $zero, 0x000B ## $t8 = 0000000B -/* 005CC 80A1EB6C AFB80018 */ sw $t8, 0x0018($sp) +/* 005CC 80A1EB6C AFB80018 */ sw $t8, 0x0018($sp) /* 005D0 80A1EB70 24C67C30 */ addiu $a2, $a2, 0x7C30 ## $a2 = 06007C30 -/* 005D4 80A1EB74 AFAF0014 */ sw $t7, 0x0014($sp) -/* 005D8 80A1EB78 AFAE0010 */ sw $t6, 0x0010($sp) -/* 005DC 80A1EB7C AFA50034 */ sw $a1, 0x0034($sp) -/* 005E0 80A1EB80 0C0291BE */ jal func_800A46F8 +/* 005D4 80A1EB74 AFAF0014 */ sw $t7, 0x0014($sp) +/* 005D8 80A1EB78 AFAE0010 */ sw $t6, 0x0010($sp) +/* 005DC 80A1EB7C AFA50034 */ sw $a1, 0x0034($sp) +/* 005E0 80A1EB80 0C0291BE */ jal SkelAnime_InitSV /* 005E4 80A1EB84 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 /* 005E8 80A1EB88 3C0580A2 */ lui $a1, %hi(D_80A1FBA0) ## $a1 = 80A20000 /* 005EC 80A1EB8C 24A5FBA0 */ addiu $a1, $a1, %lo(D_80A1FBA0) ## $a1 = 80A1FBA0 -/* 005F0 80A1EB90 8FA40034 */ lw $a0, 0x0034($sp) -/* 005F4 80A1EB94 0C00D3B0 */ jal func_80034EC0 +/* 005F0 80A1EB90 8FA40034 */ lw $a0, 0x0034($sp) +/* 005F4 80A1EB94 0C00D3B0 */ jal func_80034EC0 /* 005F8 80A1EB98 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 /* 005FC 80A1EB9C 3C068003 */ lui $a2, 0x8003 ## $a2 = 80030000 /* 00600 80A1EBA0 24C6B5EC */ addiu $a2, $a2, 0xB5EC ## $a2 = 8002B5EC /* 00604 80A1EBA4 260400B4 */ addiu $a0, $s0, 0x00B4 ## $a0 = 000000B4 /* 00608 80A1EBA8 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 /* 0060C 80A1EBAC 0C00AC78 */ jal ActorShape_Init - + /* 00610 80A1EBB0 3C0741A0 */ lui $a3, 0x41A0 ## $a3 = 41A00000 /* 00614 80A1EBB4 26050194 */ addiu $a1, $s0, 0x0194 ## $a1 = 00000194 -/* 00618 80A1EBB8 AFA50034 */ sw $a1, 0x0034($sp) -/* 0061C 80A1EBBC 0C016EFE */ jal func_8005BBF8 -/* 00620 80A1EBC0 8FA40044 */ lw $a0, 0x0044($sp) +/* 00618 80A1EBB8 AFA50034 */ sw $a1, 0x0034($sp) +/* 0061C 80A1EBBC 0C016EFE */ jal func_8005BBF8 +/* 00620 80A1EBC0 8FA40044 */ lw $a0, 0x0044($sp) /* 00624 80A1EBC4 3C0780A2 */ lui $a3, %hi(D_80A1FB84) ## $a3 = 80A20000 /* 00628 80A1EBC8 261901B4 */ addiu $t9, $s0, 0x01B4 ## $t9 = 000001B4 -/* 0062C 80A1EBCC 8FA50034 */ lw $a1, 0x0034($sp) -/* 00630 80A1EBD0 AFB90010 */ sw $t9, 0x0010($sp) +/* 0062C 80A1EBCC 8FA50034 */ lw $a1, 0x0034($sp) +/* 00630 80A1EBD0 AFB90010 */ sw $t9, 0x0010($sp) /* 00634 80A1EBD4 24E7FB84 */ addiu $a3, $a3, %lo(D_80A1FB84) ## $a3 = 80A1FB84 -/* 00638 80A1EBD8 8FA40044 */ lw $a0, 0x0044($sp) -/* 0063C 80A1EBDC 0C017014 */ jal func_8005C050 +/* 00638 80A1EBD8 8FA40044 */ lw $a0, 0x0044($sp) +/* 0063C 80A1EBDC 0C017014 */ jal func_8005C050 /* 00640 80A1EBE0 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 00644 80A1EBE4 0C016C80 */ jal CollisionBtlTbl_Get - + /* 00648 80A1EBE8 24040010 */ addiu $a0, $zero, 0x0010 ## $a0 = 00000010 /* 0064C 80A1EBEC 3C0680A2 */ lui $a2, %hi(D_80A1FB94) ## $a2 = 80A20000 /* 00650 80A1EBF0 24C6FB94 */ addiu $a2, $a2, %lo(D_80A1FB94) ## $a2 = 80A1FB94 /* 00654 80A1EBF4 26040098 */ addiu $a0, $s0, 0x0098 ## $a0 = 00000098 -/* 00658 80A1EBF8 0C0187BF */ jal func_80061EFC +/* 00658 80A1EBF8 0C0187BF */ jal func_80061EFC /* 0065C 80A1EBFC 00402825 */ or $a1, $v0, $zero ## $a1 = 00000000 /* 00660 80A1EC00 3C053C23 */ lui $a1, 0x3C23 ## $a1 = 3C230000 /* 00664 80A1EC04 34A5D70A */ ori $a1, $a1, 0xD70A ## $a1 = 3C23D70A /* 00668 80A1EC08 0C00B58B */ jal Actor_SetScale - + /* 0066C 80A1EC0C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 00670 80A1EC10 8608001C */ lh $t0, 0x001C($s0) ## 0000001C /* 00674 80A1EC14 3C01BF80 */ lui $at, 0xBF80 ## $at = BF800000 /* 00678 80A1EC18 44812000 */ mtc1 $at, $f4 ## $f4 = -1.00 /* 0067C 80A1EC1C 3C0A80A2 */ lui $t2, %hi(func_80A1EC70) ## $t2 = 80A20000 /* 00680 80A1EC20 254AEC70 */ addiu $t2, $t2, %lo(func_80A1EC70) ## $t2 = 80A1EC70 -/* 00684 80A1EC24 00084823 */ subu $t1, $zero, $t0 +/* 00684 80A1EC24 00084823 */ subu $t1, $zero, $t0 /* 00688 80A1EC28 A6090202 */ sh $t1, 0x0202($s0) ## 00000202 /* 0068C 80A1EC2C AE0A0190 */ sw $t2, 0x0190($s0) ## 00000190 /* 00690 80A1EC30 E604006C */ swc1 $f4, 0x006C($s0) ## 0000006C -/* 00694 80A1EC34 8FBF002C */ lw $ra, 0x002C($sp) -/* 00698 80A1EC38 8FB00028 */ lw $s0, 0x0028($sp) +/* 00694 80A1EC34 8FBF002C */ lw $ra, 0x002C($sp) +/* 00698 80A1EC38 8FB00028 */ lw $s0, 0x0028($sp) /* 0069C 80A1EC3C 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 -/* 006A0 80A1EC40 03E00008 */ jr $ra +/* 006A0 80A1EC40 03E00008 */ jr $ra /* 006A4 80A1EC44 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fw/func_80A1ECD4.s b/asm/non_matchings/overlays/actors/ovl_En_Fw/func_80A1ECD4.s index 6b87704c49..6bcc4b02df 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Fw/func_80A1ECD4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Fw/func_80A1ECD4.s @@ -257,7 +257,7 @@ glabel func_80A1ECD4 /* 00AC4 80A1F064 0C2879D8 */ jal func_80A1E760 /* 00AC8 80A1F068 86070202 */ lh $a3, 0x0202($s0) ## 00000202 /* 00ACC 80A1F06C C7AC0048 */ lwc1 $f12, 0x0048($sp) -/* 00AD0 80A1F070 0C03F494 */ jal func_800FD250 +/* 00AD0 80A1F070 0C03F494 */ jal Math_atan2f /* 00AD4 80A1F074 C7AE0050 */ lwc1 $f14, 0x0050($sp) /* 00AD8 80A1F078 3C0180A2 */ lui $at, %hi(D_80A1FC78) ## $at = 80A20000 /* 00ADC 80A1F07C C42AFC78 */ lwc1 $f10, %lo(D_80A1FC78)($at) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fw/func_80A1F814.s b/asm/non_matchings/overlays/actors/ovl_En_Fw/func_80A1F814.s index e0935c7ffd..36ad2e3f54 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Fw/func_80A1F814.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Fw/func_80A1F814.s @@ -20,7 +20,7 @@ glabel func_80A1F814 /* 012BC 80A1F85C 24C6FC40 */ addiu $a2, $a2, %lo(D_80A1FC40) ## $a2 = 80A1FC40 /* 012C0 80A1F860 27A40088 */ addiu $a0, $sp, 0x0088 ## $a0 = FFFFFFE0 /* 012C4 80A1F864 240704A7 */ addiu $a3, $zero, 0x04A7 ## $a3 = 000004A7 -/* 012C8 80A1F868 0C031AB1 */ jal func_800C6AC4 +/* 012C8 80A1F868 0C031AB1 */ jal Graph_OpenDisps /* 012CC 80A1F86C 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 /* 012D0 80A1F870 0000B825 */ or $s7, $zero, $zero ## $s7 = 00000000 /* 012D4 80A1F874 0C024F61 */ jal func_80093D84 @@ -46,7 +46,7 @@ glabel func_80A1F814 /* 01320 80A1F8C0 26317928 */ addiu $s1, $s1, 0x7928 ## $s1 = 06007928 /* 01324 80A1F8C4 8E0402D0 */ lw $a0, 0x02D0($s0) ## 000002D0 /* 01328 80A1F8C8 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 0132C 80A1F8CC 0C024DDD */ jal func_80093774 +/* 0132C 80A1F8CC 0C024DDD */ jal Gfx_CallSetupDL /* 01330 80A1F8D0 24170001 */ addiu $s7, $zero, 0x0001 ## $s7 = 00000001 /* 01334 80A1F8D4 AE0202D0 */ sw $v0, 0x02D0($s0) ## 000002D0 /* 01338 80A1F8D8 244F0008 */ addiu $t7, $v0, 0x0008 ## $t7 = 00000008 @@ -192,7 +192,7 @@ glabel func_80A1F814 /* 01550 80A1FAF0 24C6FC60 */ addiu $a2, $a2, %lo(D_80A1FC60) ## $a2 = 80A1FC60 /* 01554 80A1FAF4 27A40088 */ addiu $a0, $sp, 0x0088 ## $a0 = FFFFFFE0 /* 01558 80A1FAF8 8FC50000 */ lw $a1, 0x0000($s8) ## 00000000 -/* 0155C 80A1FAFC 0C031AD5 */ jal func_800C6B54 +/* 0155C 80A1FAFC 0C031AD5 */ jal Graph_CloseDisps /* 01560 80A1FB00 240704DB */ addiu $a3, $zero, 0x04DB ## $a3 = 000004DB /* 01564 80A1FB04 8FBF0054 */ lw $ra, 0x0054($sp) /* 01568 80A1FB08 D7B40018 */ ldc1 $f20, 0x0018($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fz/EnFz_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Fz/EnFz_Draw.s index 6e075c0c9d..a0d0ed2018 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Fz/EnFz_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Fz/EnFz_Draw.s @@ -15,7 +15,7 @@ glabel EnFz_Draw /* 014C0 80A21280 24C61C60 */ addiu $a2, $a2, %lo(D_80A21C60) ## $a2 = 80A21C60 /* 014C4 80A21284 27A40060 */ addiu $a0, $sp, 0x0060 ## $a0 = FFFFFFE0 /* 014C8 80A21288 2407048F */ addiu $a3, $zero, 0x048F ## $a3 = 0000048F -/* 014CC 80A2128C 0C031AB1 */ jal func_800C6AC4 +/* 014CC 80A2128C 0C031AB1 */ jal Graph_OpenDisps /* 014D0 80A21290 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 /* 014D4 80A21294 8FAA0080 */ lw $t2, 0x0080($sp) /* 014D8 80A21298 240C0002 */ addiu $t4, $zero, 0x0002 ## $t4 = 00000002 @@ -59,7 +59,7 @@ glabel EnFz_Draw /* 0156C 80A2132C 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 01570 80A21330 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 /* 01574 80A21334 AFA2005C */ sw $v0, 0x005C($sp) -/* 01578 80A21338 0C0253D0 */ jal Draw_TwoTexScroll +/* 01578 80A21338 0C0253D0 */ jal Gfx_TwoTexScroll /* 0157C 80A2133C 3067007F */ andi $a3, $v1, 0x007F ## $a3 = 00000000 /* 01580 80A21340 8FA8005C */ lw $t0, 0x005C($sp) /* 01584 80A21344 3C0FDA38 */ lui $t7, 0xDA38 ## $t7 = DA380000 @@ -123,7 +123,7 @@ glabel EnFz_Draw /* 01668 80A21428 24C61C80 */ addiu $a2, $a2, %lo(D_80A21C80) ## $a2 = 80A21C80 /* 0166C 80A2142C 27A40060 */ addiu $a0, $sp, 0x0060 ## $a0 = FFFFFFE0 /* 01670 80A21430 8E250000 */ lw $a1, 0x0000($s1) ## 00000000 -/* 01674 80A21434 0C031AD5 */ jal func_800C6B54 +/* 01674 80A21434 0C031AD5 */ jal Graph_CloseDisps /* 01678 80A21438 240704B0 */ addiu $a3, $zero, 0x04B0 ## $a3 = 000004B0 /* 0167C 80A2143C 8FA40080 */ lw $a0, 0x0080($sp) /* 01680 80A21440 0C28862A */ jal func_80A218A8 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fz/func_80A1FF8C.s b/asm/non_matchings/overlays/actors/ovl_En_Fz/func_80A1FF8C.s index 2ee617a79a..e8e1a83805 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Fz/func_80A1FF8C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Fz/func_80A1FF8C.s @@ -1,78 +1,78 @@ glabel func_80A1FF8C /* 001CC 80A1FF8C 27BDFF98 */ addiu $sp, $sp, 0xFF98 ## $sp = FFFFFF98 -/* 001D0 80A1FF90 AFBF0034 */ sw $ra, 0x0034($sp) -/* 001D4 80A1FF94 AFB00030 */ sw $s0, 0x0030($sp) -/* 001D8 80A1FF98 AFA5006C */ sw $a1, 0x006C($sp) +/* 001D0 80A1FF90 AFBF0034 */ sw $ra, 0x0034($sp) +/* 001D4 80A1FF94 AFB00030 */ sw $s0, 0x0030($sp) +/* 001D8 80A1FF98 AFA5006C */ sw $a1, 0x006C($sp) /* 001DC 80A1FF9C C4840024 */ lwc1 $f4, 0x0024($a0) ## 00000024 /* 001E0 80A1FFA0 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 /* 001E4 80A1FFA4 44814000 */ mtc1 $at, $f8 ## $f8 = 20.00 -/* 001E8 80A1FFA8 E7A4005C */ swc1 $f4, 0x005C($sp) +/* 001E8 80A1FFA8 E7A4005C */ swc1 $f4, 0x005C($sp) /* 001EC 80A1FFAC C4860028 */ lwc1 $f6, 0x0028($a0) ## 00000028 /* 001F0 80A1FFB0 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 001F4 80A1FFB4 C7AC005C */ lwc1 $f12, 0x005C($sp) -/* 001F8 80A1FFB8 46083280 */ add.s $f10, $f6, $f8 +/* 001F4 80A1FFB4 C7AC005C */ lwc1 $f12, 0x005C($sp) +/* 001F8 80A1FFB8 46083280 */ add.s $f10, $f6, $f8 /* 001FC 80A1FFBC 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 00200 80A1FFC0 E7AA0060 */ swc1 $f10, 0x0060($sp) +/* 00200 80A1FFC0 E7AA0060 */ swc1 $f10, 0x0060($sp) /* 00204 80A1FFC4 C490002C */ lwc1 $f16, 0x002C($a0) ## 0000002C -/* 00208 80A1FFC8 C7AE0060 */ lwc1 $f14, 0x0060($sp) -/* 0020C 80A1FFCC E7B00064 */ swc1 $f16, 0x0064($sp) -/* 00210 80A1FFD0 0C034261 */ jal Matrix_Translate -/* 00214 80A1FFD4 8FA60064 */ lw $a2, 0x0064($sp) +/* 00208 80A1FFC8 C7AE0060 */ lwc1 $f14, 0x0060($sp) +/* 0020C 80A1FFCC E7B00064 */ swc1 $f16, 0x0064($sp) +/* 00210 80A1FFD0 0C034261 */ jal Matrix_Translate +/* 00214 80A1FFD4 8FA60064 */ lw $a2, 0x0064($sp) /* 00218 80A1FFD8 860400B4 */ lh $a0, 0x00B4($s0) ## 000000B4 /* 0021C 80A1FFDC 860500B6 */ lh $a1, 0x00B6($s0) ## 000000B6 /* 00220 80A1FFE0 860600B8 */ lh $a2, 0x00B8($s0) ## 000000B8 -/* 00224 80A1FFE4 0C034421 */ jal Matrix_RotateXYZ +/* 00224 80A1FFE4 0C034421 */ jal Matrix_RotateZYX /* 00228 80A1FFE8 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 /* 0022C 80A1FFEC 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 /* 00230 80A1FFF0 3C01435C */ lui $at, 0x435C ## $at = 435C0000 /* 00234 80A1FFF4 44819000 */ mtc1 $at, $f18 ## $f18 = 220.00 /* 00238 80A1FFF8 26050264 */ addiu $a1, $s0, 0x0264 ## $a1 = 00000264 -/* 0023C 80A1FFFC AFA50038 */ sw $a1, 0x0038($sp) +/* 0023C 80A1FFFC AFA50038 */ sw $a1, 0x0038($sp) /* 00240 80A20000 27A40044 */ addiu $a0, $sp, 0x0044 ## $a0 = FFFFFFDC -/* 00244 80A20004 E7A00048 */ swc1 $f0, 0x0048($sp) -/* 00248 80A20008 E7A00044 */ swc1 $f0, 0x0044($sp) -/* 0024C 80A2000C 0C0346BD */ jal Matrix_MultVec3f -/* 00250 80A20010 E7B2004C */ swc1 $f18, 0x004C($sp) -/* 00254 80A20014 8FA4006C */ lw $a0, 0x006C($sp) +/* 00244 80A20004 E7A00048 */ swc1 $f0, 0x0048($sp) +/* 00248 80A20008 E7A00044 */ swc1 $f0, 0x0044($sp) +/* 0024C 80A2000C 0C0346BD */ jal Matrix_MultVec3f +/* 00250 80A20010 E7B2004C */ swc1 $f18, 0x004C($sp) +/* 00254 80A20014 8FA4006C */ lw $a0, 0x006C($sp) /* 00258 80A20018 27AE003C */ addiu $t6, $sp, 0x003C ## $t6 = FFFFFFD4 /* 0025C 80A2001C 240F0001 */ addiu $t7, $zero, 0x0001 ## $t7 = 00000001 /* 00260 80A20020 24180001 */ addiu $t8, $zero, 0x0001 ## $t8 = 00000001 /* 00264 80A20024 27B90040 */ addiu $t9, $sp, 0x0040 ## $t9 = FFFFFFD8 -/* 00268 80A20028 AFB90024 */ sw $t9, 0x0024($sp) -/* 0026C 80A2002C AFB80020 */ sw $t8, 0x0020($sp) -/* 00270 80A20030 AFAF0014 */ sw $t7, 0x0014($sp) -/* 00274 80A20034 AFAE0010 */ sw $t6, 0x0010($sp) +/* 00268 80A20028 AFB90024 */ sw $t9, 0x0024($sp) +/* 0026C 80A2002C AFB80020 */ sw $t8, 0x0020($sp) +/* 00270 80A20030 AFAF0014 */ sw $t7, 0x0014($sp) +/* 00274 80A20034 AFAE0010 */ sw $t6, 0x0010($sp) /* 00278 80A20038 27A5005C */ addiu $a1, $sp, 0x005C ## $a1 = FFFFFFF4 -/* 0027C 80A2003C 8FA60038 */ lw $a2, 0x0038($sp) +/* 0027C 80A2003C 8FA60038 */ lw $a2, 0x0038($sp) /* 00280 80A20040 27A70050 */ addiu $a3, $sp, 0x0050 ## $a3 = FFFFFFE8 -/* 00284 80A20044 AFA00018 */ sw $zero, 0x0018($sp) -/* 00288 80A20048 AFA0001C */ sw $zero, 0x001C($sp) -/* 0028C 80A2004C 0C00F7A1 */ jal func_8003DE84 +/* 00284 80A20044 AFA00018 */ sw $zero, 0x0018($sp) +/* 00288 80A20048 AFA0001C */ sw $zero, 0x001C($sp) +/* 0028C 80A2004C 0C00F7A1 */ jal func_8003DE84 /* 00290 80A20050 248407C0 */ addiu $a0, $a0, 0x07C0 ## $a0 = 000007C0 -/* 00294 80A20054 10400003 */ beq $v0, $zero, .L80A20064 -/* 00298 80A20058 8FA40038 */ lw $a0, 0x0038($sp) +/* 00294 80A20054 10400003 */ beq $v0, $zero, .L80A20064 +/* 00298 80A20058 8FA40038 */ lw $a0, 0x0038($sp) /* 0029C 80A2005C 0C01DF90 */ jal Math_Vec3f_Copy ## Vec3f_Copy /* 002A0 80A20060 27A50050 */ addiu $a1, $sp, 0x0050 ## $a1 = FFFFFFE8 .L80A20064: /* 002A4 80A20064 C6040024 */ lwc1 $f4, 0x0024($s0) ## 00000024 /* 002A8 80A20068 C6060264 */ lwc1 $f6, 0x0264($s0) ## 00000264 -/* 002AC 80A2006C 46062201 */ sub.s $f8, $f4, $f6 -/* 002B0 80A20070 E7A8005C */ swc1 $f8, 0x005C($sp) +/* 002AC 80A2006C 46062201 */ sub.s $f8, $f4, $f6 +/* 002B0 80A20070 E7A8005C */ swc1 $f8, 0x005C($sp) /* 002B4 80A20074 C610026C */ lwc1 $f16, 0x026C($s0) ## 0000026C /* 002B8 80A20078 C60A002C */ lwc1 $f10, 0x002C($s0) ## 0000002C -/* 002BC 80A2007C C7A4005C */ lwc1 $f4, 0x005C($sp) -/* 002C0 80A20080 46105481 */ sub.s $f18, $f10, $f16 -/* 002C4 80A20084 46042182 */ mul.s $f6, $f4, $f4 -/* 002C8 80A20088 E7B20064 */ swc1 $f18, 0x0064($sp) -/* 002CC 80A2008C C7A80064 */ lwc1 $f8, 0x0064($sp) -/* 002D0 80A20090 46084282 */ mul.s $f10, $f8, $f8 -/* 002D4 80A20094 460A3400 */ add.s $f16, $f6, $f10 +/* 002BC 80A2007C C7A4005C */ lwc1 $f4, 0x005C($sp) +/* 002C0 80A20080 46105481 */ sub.s $f18, $f10, $f16 +/* 002C4 80A20084 46042182 */ mul.s $f6, $f4, $f4 +/* 002C8 80A20088 E7B20064 */ swc1 $f18, 0x0064($sp) +/* 002CC 80A2008C C7A80064 */ lwc1 $f8, 0x0064($sp) +/* 002D0 80A20090 46084282 */ mul.s $f10, $f8, $f8 +/* 002D4 80A20094 460A3400 */ add.s $f16, $f6, $f10 /* 002D8 80A20098 E6100270 */ swc1 $f16, 0x0270($s0) ## 00000270 -/* 002DC 80A2009C 8FBF0034 */ lw $ra, 0x0034($sp) -/* 002E0 80A200A0 8FB00030 */ lw $s0, 0x0030($sp) +/* 002DC 80A2009C 8FBF0034 */ lw $ra, 0x0034($sp) +/* 002E0 80A200A0 8FB00030 */ lw $s0, 0x0030($sp) /* 002E4 80A200A4 27BD0068 */ addiu $sp, $sp, 0x0068 ## $sp = 00000000 -/* 002E8 80A200A8 03E00008 */ jr $ra +/* 002E8 80A200A8 03E00008 */ jr $ra /* 002EC 80A200AC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Fz/func_80A218A8.s b/asm/non_matchings/overlays/actors/ovl_En_Fz/func_80A218A8.s index cac68667eb..66dbd6594a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Fz/func_80A218A8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Fz/func_80A218A8.s @@ -19,7 +19,7 @@ glabel func_80A218A8 /* 01B2C 80A218EC 24C61C90 */ addiu $a2, $a2, %lo(D_80A21C90) ## $a2 = 80A21C90 /* 01B30 80A218F0 27A4009C */ addiu $a0, $sp, 0x009C ## $a0 = FFFFFFDC /* 01B34 80A218F4 24070568 */ addiu $a3, $zero, 0x0568 ## $a3 = 00000568 -/* 01B38 80A218F8 0C031AB1 */ jal func_800C6AC4 +/* 01B38 80A218F8 0C031AB1 */ jal Graph_OpenDisps /* 01B3C 80A218FC 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 01B40 80A21900 8FAF00C4 */ lw $t7, 0x00C4($sp) /* 01B44 80A21904 0C024F61 */ jal func_80093D84 @@ -117,7 +117,7 @@ glabel func_80A218A8 /* 01CAC 80A21A6C AFA00020 */ sw $zero, 0x0020($sp) /* 01CB0 80A21A70 AFA0001C */ sw $zero, 0x001C($sp) /* 01CB4 80A21A74 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 01CB8 80A21A78 0C0253D0 */ jal Draw_TwoTexScroll +/* 01CB8 80A21A78 0C0253D0 */ jal Gfx_TwoTexScroll /* 01CBC 80A21A7C 00408825 */ or $s1, $v0, $zero ## $s1 = 060030A0 /* 01CC0 80A21A80 AE220004 */ sw $v0, 0x0004($s1) ## 060030A4 /* 01CC4 80A21A84 8E46000C */ lw $a2, 0x000C($s2) ## 00000280 @@ -165,7 +165,7 @@ glabel func_80A218A8 /* 01D68 80A21B28 24C61CB0 */ addiu $a2, $a2, %lo(D_80A21CB0) ## $a2 = 80A21CB0 /* 01D6C 80A21B2C 27A4009C */ addiu $a0, $sp, 0x009C ## $a0 = FFFFFFDC /* 01D70 80A21B30 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 01D74 80A21B34 0C031AD5 */ jal func_800C6B54 +/* 01D74 80A21B34 0C031AD5 */ jal Graph_CloseDisps /* 01D78 80A21B38 24070596 */ addiu $a3, $zero, 0x0596 ## $a3 = 00000596 /* 01D7C 80A21B3C 8FBF0064 */ lw $ra, 0x0064($sp) /* 01D80 80A21B40 D7B40038 */ ldc1 $f20, 0x0038($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_G_Switch/func_80A22FDC.s b/asm/non_matchings/overlays/actors/ovl_En_G_Switch/func_80A22FDC.s index 07da995226..2bb4b25fcc 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_G_Switch/func_80A22FDC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_G_Switch/func_80A22FDC.s @@ -10,7 +10,7 @@ glabel func_80A22FDC /* 0113C 80A22FFC 27A4002C */ addiu $a0, $sp, 0x002C ## $a0 = FFFFFFE4 /* 01140 80A23000 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 /* 01144 80A23004 24070396 */ addiu $a3, $zero, 0x0396 ## $a3 = 00000396 -/* 01148 80A23008 0C031AB1 */ jal func_800C6AC4 +/* 01148 80A23008 0C031AB1 */ jal Graph_OpenDisps /* 0114C 80A2300C 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 /* 01150 80A23010 8FB8004C */ lw $t8, 0x004C($sp) /* 01154 80A23014 0C024F46 */ jal func_80093D18 @@ -43,7 +43,7 @@ glabel func_80A22FDC /* 011C0 80A23080 24C63A78 */ addiu $a2, $a2, %lo(D_80A23A78) ## $a2 = 80A23A78 /* 011C4 80A23084 27A4002C */ addiu $a0, $sp, 0x002C ## $a0 = FFFFFFE4 /* 011C8 80A23088 240703A0 */ addiu $a3, $zero, 0x03A0 ## $a3 = 000003A0 -/* 011CC 80A2308C 0C031AD5 */ jal func_800C6B54 +/* 011CC 80A2308C 0C031AD5 */ jal Graph_CloseDisps /* 011D0 80A23090 8DA50000 */ lw $a1, 0x0000($t5) ## 00000000 .L80A23094: /* 011D4 80A23094 8FBF001C */ lw $ra, 0x001C($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_G_Switch/func_80A230A8.s b/asm/non_matchings/overlays/actors/ovl_En_G_Switch/func_80A230A8.s index 897da94461..5eca74acd8 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_G_Switch/func_80A230A8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_G_Switch/func_80A230A8.s @@ -12,7 +12,7 @@ glabel func_80A230A8 /* 01210 80A230D0 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 /* 01214 80A230D4 24C63A8C */ addiu $a2, $a2, %lo(D_80A23A8C) ## $a2 = 80A23A8C /* 01218 80A230D8 240703B7 */ addiu $a3, $zero, 0x03B7 ## $a3 = 000003B7 -/* 0121C 80A230DC 0C031AB1 */ jal func_800C6AC4 +/* 0121C 80A230DC 0C031AB1 */ jal Graph_OpenDisps /* 01220 80A230E0 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 /* 01224 80A230E4 0C024F46 */ jal func_80093D18 /* 01228 80A230E8 8E240000 */ lw $a0, 0x0000($s1) ## 00000000 @@ -71,7 +71,7 @@ glabel func_80A230A8 /* 012FC 80A231BC AC4C0004 */ sw $t4, 0x0004($v0) ## 00000004 /* 01300 80A231C0 AC4B0000 */ sw $t3, 0x0000($v0) ## 00000000 /* 01304 80A231C4 8E250000 */ lw $a1, 0x0000($s1) ## 00000000 -/* 01308 80A231C8 0C031AD5 */ jal func_800C6B54 +/* 01308 80A231C8 0C031AD5 */ jal Graph_CloseDisps /* 0130C 80A231CC 240703C1 */ addiu $a3, $zero, 0x03C1 ## $a3 = 000003C1 .L80A231D0: /* 01310 80A231D0 8FAE0050 */ lw $t6, 0x0050($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_G_Switch/func_80A234D4.s b/asm/non_matchings/overlays/actors/ovl_En_G_Switch/func_80A234D4.s index ecf986f110..5c5a6d9693 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_G_Switch/func_80A234D4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_G_Switch/func_80A234D4.s @@ -20,7 +20,7 @@ glabel func_80A234D4 /* 0165C 80A2351C 24C63AC8 */ addiu $a2, $a2, %lo(D_80A23AC8) ## $a2 = 80A23AC8 /* 01660 80A23520 27A40068 */ addiu $a0, $sp, 0x0068 ## $a0 = FFFFFFD8 /* 01664 80A23524 24070431 */ addiu $a3, $zero, 0x0431 ## $a3 = 00000431 -/* 01668 80A23528 0C031AB1 */ jal func_800C6AC4 +/* 01668 80A23528 0C031AB1 */ jal Graph_OpenDisps /* 0166C 80A2352C 02402825 */ or $a1, $s2, $zero ## $a1 = 00000000 /* 01670 80A23530 0C024F46 */ jal func_80093D18 /* 01674 80A23534 8EA40000 */ lw $a0, 0x0000($s5) ## 00000000 @@ -115,7 +115,7 @@ glabel func_80A234D4 /* 017CC 80A2368C 24C63AF0 */ addiu $a2, $a2, %lo(D_80A23AF0) ## $a2 = 80A23AF0 /* 017D0 80A23690 27A40068 */ addiu $a0, $sp, 0x0068 ## $a0 = FFFFFFD8 /* 017D4 80A23694 02402825 */ or $a1, $s2, $zero ## $a1 = 00000000 -/* 017D8 80A23698 0C031AD5 */ jal func_800C6B54 +/* 017D8 80A23698 0C031AD5 */ jal Graph_CloseDisps /* 017DC 80A2369C 24070447 */ addiu $a3, $zero, 0x0447 ## $a3 = 00000447 /* 017E0 80A236A0 8FBF004C */ lw $ra, 0x004C($sp) /* 017E4 80A236A4 D7B40018 */ ldc1 $f20, 0x0018($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ganon_Mant/func_80A24884.s b/asm/non_matchings/overlays/actors/ovl_En_Ganon_Mant/func_80A24884.s index d65f78adf8..58824df67f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ganon_Mant/func_80A24884.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ganon_Mant/func_80A24884.s @@ -9,7 +9,7 @@ glabel func_80A24884 /* 00B40 80A248A0 24C67E80 */ addiu $a2, $a2, %lo(D_80A27E80) ## $a2 = 80A27E80 /* 00B44 80A248A4 27A40038 */ addiu $a0, $sp, 0x0038 ## $a0 = FFFFFFE8 /* 00B48 80A248A8 24070234 */ addiu $a3, $zero, 0x0234 ## $a3 = 00000234 -/* 00B4C 80A248AC 0C031AB1 */ jal func_800C6AC4 +/* 00B4C 80A248AC 0C031AB1 */ jal Graph_OpenDisps /* 00B50 80A248B0 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 /* 00B54 80A248B4 44806000 */ mtc1 $zero, $f12 ## $f12 = 0.00 /* 00B58 80A248B8 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 @@ -76,7 +76,7 @@ glabel func_80A24884 /* 00C44 80A249A4 AC440000 */ sw $a0, 0x0000($v0) ## 00000000 /* 00C48 80A249A8 8FAB0050 */ lw $t3, 0x0050($sp) /* 00C4C 80A249AC 27A40038 */ addiu $a0, $sp, 0x0038 ## $a0 = FFFFFFE8 -/* 00C50 80A249B0 0C031AD5 */ jal func_800C6B54 +/* 00C50 80A249B0 0C031AD5 */ jal Graph_CloseDisps /* 00C54 80A249B4 8D650000 */ lw $a1, 0x0000($t3) ## 00000000 /* 00C58 80A249B8 8FBF001C */ lw $ra, 0x001C($sp) /* 00C5C 80A249BC 8FB00018 */ lw $s0, 0x0018($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Gb/EnGb_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Gb/EnGb_Draw.s index 711c128e4b..5899608c1d 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Gb/EnGb_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Gb/EnGb_Draw.s @@ -1,20 +1,20 @@ glabel EnGb_Draw /* 00D2C 80A2FEAC 27BDFFA8 */ addiu $sp, $sp, 0xFFA8 ## $sp = FFFFFFA8 -/* 00D30 80A2FEB0 AFB10028 */ sw $s1, 0x0028($sp) +/* 00D30 80A2FEB0 AFB10028 */ sw $s1, 0x0028($sp) /* 00D34 80A2FEB4 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 -/* 00D38 80A2FEB8 AFBF002C */ sw $ra, 0x002C($sp) -/* 00D3C 80A2FEBC AFB00024 */ sw $s0, 0x0024($sp) +/* 00D38 80A2FEB8 AFBF002C */ sw $ra, 0x002C($sp) +/* 00D3C 80A2FEBC AFB00024 */ sw $s0, 0x0024($sp) /* 00D40 80A2FEC0 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 /* 00D44 80A2FEC4 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 00D48 80A2FEC8 3C0680A3 */ lui $a2, %hi(D_80A307A0) ## $a2 = 80A30000 /* 00D4C 80A2FECC 24C607A0 */ addiu $a2, $a2, %lo(D_80A307A0) ## $a2 = 80A307A0 /* 00D50 80A2FED0 27A4003C */ addiu $a0, $sp, 0x003C ## $a0 = FFFFFFE4 /* 00D54 80A2FED4 240702FB */ addiu $a3, $zero, 0x02FB ## $a3 = 000002FB -/* 00D58 80A2FED8 0C031AB1 */ jal func_800C6AC4 -/* 00D5C 80A2FEDC AFA5004C */ sw $a1, 0x004C($sp) -/* 00D60 80A2FEE0 0C024F46 */ jal func_80093D18 +/* 00D58 80A2FED8 0C031AB1 */ jal Graph_OpenDisps +/* 00D5C 80A2FEDC AFA5004C */ sw $a1, 0x004C($sp) +/* 00D60 80A2FEE0 0C024F46 */ jal func_80093D18 /* 00D64 80A2FEE4 8E240000 */ lw $a0, 0x0000($s1) ## 00000000 -/* 00D68 80A2FEE8 8FA8004C */ lw $t0, 0x004C($sp) +/* 00D68 80A2FEE8 8FA8004C */ lw $t0, 0x004C($sp) /* 00D6C 80A2FEEC 3C0FE700 */ lui $t7, 0xE700 ## $t7 = E7000000 /* 00D70 80A2FEF0 3C19FB00 */ lui $t9, 0xFB00 ## $t9 = FB000000 /* 00D74 80A2FEF4 8D0302C0 */ lw $v1, 0x02C0($t0) ## 000002C0 @@ -30,10 +30,10 @@ glabel EnGb_Draw /* 00D9C 80A2FF1C 920D0385 */ lbu $t5, 0x0385($s0) ## 00000385 /* 00DA0 80A2FF20 920A0384 */ lbu $t2, 0x0384($s0) ## 00000384 /* 00DA4 80A2FF24 92190386 */ lbu $t9, 0x0386($s0) ## 00000386 -/* 00DA8 80A2FF28 000D7400 */ sll $t6, $t5, 16 -/* 00DAC 80A2FF2C 000A5E00 */ sll $t3, $t2, 24 +/* 00DA8 80A2FF28 000D7400 */ sll $t6, $t5, 16 +/* 00DAC 80A2FF2C 000A5E00 */ sll $t3, $t2, 24 /* 00DB0 80A2FF30 016E7825 */ or $t7, $t3, $t6 ## $t7 = 00000008 -/* 00DB4 80A2FF34 00194A00 */ sll $t1, $t9, 8 +/* 00DB4 80A2FF34 00194A00 */ sll $t1, $t9, 8 /* 00DB8 80A2FF38 01E95025 */ or $t2, $t7, $t1 ## $t2 = 00000008 /* 00DBC 80A2FF3C 354C00FF */ ori $t4, $t2, 0x00FF ## $t4 = 000000FF /* 00DC0 80A2FF40 AC6C0004 */ sw $t4, 0x0004($v1) ## 00000004 @@ -41,48 +41,48 @@ glabel EnGb_Draw /* 00DC8 80A2FF48 C610002C */ lwc1 $f16, 0x002C($s0) ## 0000002C /* 00DCC 80A2FF4C C6080028 */ lwc1 $f8, 0x0028($s0) ## 00000028 /* 00DD0 80A2FF50 C6040024 */ lwc1 $f4, 0x0024($s0) ## 00000024 -/* 00DD4 80A2FF54 AFB80010 */ sw $t8, 0x0010($sp) +/* 00DD4 80A2FF54 AFB80010 */ sw $t8, 0x0010($sp) /* 00DD8 80A2FF58 92190385 */ lbu $t9, 0x0385($s0) ## 00000385 -/* 00DDC 80A2FF5C 4600848D */ trunc.w.s $f18, $f16 -/* 00DE0 80A2FF60 AFB90014 */ sw $t9, 0x0014($sp) -/* 00DE4 80A2FF64 4600428D */ trunc.w.s $f10, $f8 +/* 00DDC 80A2FF5C 4600848D */ trunc.w.s $f18, $f16 +/* 00DE0 80A2FF60 AFB90014 */ sw $t9, 0x0014($sp) +/* 00DE4 80A2FF64 4600428D */ trunc.w.s $f10, $f8 /* 00DE8 80A2FF68 920F0386 */ lbu $t7, 0x0386($s0) ## 00000386 -/* 00DEC 80A2FF6C 44079000 */ mfc1 $a3, $f18 -/* 00DF0 80A2FF70 4600218D */ trunc.w.s $f6, $f4 -/* 00DF4 80A2FF74 44065000 */ mfc1 $a2, $f10 -/* 00DF8 80A2FF78 AFAF0018 */ sw $t7, 0x0018($sp) +/* 00DEC 80A2FF6C 44079000 */ mfc1 $a3, $f18 +/* 00DF0 80A2FF70 4600218D */ trunc.w.s $f6, $f4 +/* 00DF4 80A2FF74 44065000 */ mfc1 $a2, $f10 +/* 00DF8 80A2FF78 AFAF0018 */ sw $t7, 0x0018($sp) /* 00DFC 80A2FF7C 92090387 */ lbu $t1, 0x0387($s0) ## 00000387 -/* 00E00 80A2FF80 44053000 */ mfc1 $a1, $f6 -/* 00E04 80A2FF84 00073C00 */ sll $a3, $a3, 16 -/* 00E08 80A2FF88 00063400 */ sll $a2, $a2, 16 -/* 00E0C 80A2FF8C 00052C00 */ sll $a1, $a1, 16 -/* 00E10 80A2FF90 00052C03 */ sra $a1, $a1, 16 -/* 00E14 80A2FF94 00063403 */ sra $a2, $a2, 16 -/* 00E18 80A2FF98 00073C03 */ sra $a3, $a3, 16 +/* 00E00 80A2FF80 44053000 */ mfc1 $a1, $f6 +/* 00E04 80A2FF84 00073C00 */ sll $a3, $a3, 16 +/* 00E08 80A2FF88 00063400 */ sll $a2, $a2, 16 +/* 00E0C 80A2FF8C 00052C00 */ sll $a1, $a1, 16 +/* 00E10 80A2FF90 00052C03 */ sra $a1, $a1, 16 +/* 00E14 80A2FF94 00063403 */ sra $a2, $a2, 16 +/* 00E18 80A2FF98 00073C03 */ sra $a3, $a3, 16 /* 00E1C 80A2FF9C 0C01E763 */ jal Lights_InitType0PositionalLight - -/* 00E20 80A2FFA0 AFA9001C */ sw $t1, 0x001C($sp) + +/* 00E20 80A2FFA0 AFA9001C */ sw $t1, 0x001C($sp) /* 00E24 80A2FFA4 8E050168 */ lw $a1, 0x0168($s0) ## 00000168 /* 00E28 80A2FFA8 8E060184 */ lw $a2, 0x0184($s0) ## 00000184 /* 00E2C 80A2FFAC 92070166 */ lbu $a3, 0x0166($s0) ## 00000166 -/* 00E30 80A2FFB0 AFB00018 */ sw $s0, 0x0018($sp) -/* 00E34 80A2FFB4 AFA00014 */ sw $zero, 0x0014($sp) -/* 00E38 80A2FFB8 AFA00010 */ sw $zero, 0x0010($sp) -/* 00E3C 80A2FFBC 0C0286B2 */ jal func_800A1AC8 +/* 00E30 80A2FFB0 AFB00018 */ sw $s0, 0x0018($sp) +/* 00E34 80A2FFB4 AFA00014 */ sw $zero, 0x0014($sp) +/* 00E38 80A2FFB8 AFA00010 */ sw $zero, 0x0010($sp) +/* 00E3C 80A2FFBC 0C0286B2 */ jal SkelAnime_DrawSV /* 00E40 80A2FFC0 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 00E44 80A2FFC4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00E48 80A2FFC8 0C28C0D4 */ jal func_80A30350 +/* 00E48 80A2FFC8 0C28C0D4 */ jal func_80A30350 /* 00E4C 80A2FFCC 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 /* 00E50 80A2FFD0 3C0680A3 */ lui $a2, %hi(D_80A307B0) ## $a2 = 80A30000 /* 00E54 80A2FFD4 24C607B0 */ addiu $a2, $a2, %lo(D_80A307B0) ## $a2 = 80A307B0 /* 00E58 80A2FFD8 27A4003C */ addiu $a0, $sp, 0x003C ## $a0 = FFFFFFE4 /* 00E5C 80A2FFDC 8E250000 */ lw $a1, 0x0000($s1) ## 00000000 -/* 00E60 80A2FFE0 0C031AD5 */ jal func_800C6B54 +/* 00E60 80A2FFE0 0C031AD5 */ jal Graph_CloseDisps /* 00E64 80A2FFE4 2407031C */ addiu $a3, $zero, 0x031C ## $a3 = 0000031C -/* 00E68 80A2FFE8 8FBF002C */ lw $ra, 0x002C($sp) -/* 00E6C 80A2FFEC 8FB00024 */ lw $s0, 0x0024($sp) -/* 00E70 80A2FFF0 8FB10028 */ lw $s1, 0x0028($sp) -/* 00E74 80A2FFF4 03E00008 */ jr $ra +/* 00E68 80A2FFE8 8FBF002C */ lw $ra, 0x002C($sp) +/* 00E6C 80A2FFEC 8FB00024 */ lw $s0, 0x0024($sp) +/* 00E70 80A2FFF0 8FB10028 */ lw $s1, 0x0028($sp) +/* 00E74 80A2FFF4 03E00008 */ jr $ra /* 00E78 80A2FFF8 27BD0058 */ addiu $sp, $sp, 0x0058 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Gb/EnGb_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Gb/EnGb_Init.s index 95bca3c1ec..5719db4a97 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Gb/EnGb_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Gb/EnGb_Init.s @@ -1,62 +1,62 @@ glabel EnGb_Init /* 00030 80A2F1B0 27BDFF70 */ addiu $sp, $sp, 0xFF70 ## $sp = FFFFFF70 -/* 00034 80A2F1B4 AFB30050 */ sw $s3, 0x0050($sp) +/* 00034 80A2F1B4 AFB30050 */ sw $s3, 0x0050($sp) /* 00038 80A2F1B8 00A09825 */ or $s3, $a1, $zero ## $s3 = 00000000 -/* 0003C 80A2F1BC AFBF005C */ sw $ra, 0x005C($sp) -/* 00040 80A2F1C0 AFB2004C */ sw $s2, 0x004C($sp) +/* 0003C 80A2F1BC AFBF005C */ sw $ra, 0x005C($sp) +/* 00040 80A2F1C0 AFB2004C */ sw $s2, 0x004C($sp) /* 00044 80A2F1C4 3C0580A3 */ lui $a1, %hi(D_80A30740) ## $a1 = 80A30000 /* 00048 80A2F1C8 00809025 */ or $s2, $a0, $zero ## $s2 = 00000000 -/* 0004C 80A2F1CC AFB50058 */ sw $s5, 0x0058($sp) -/* 00050 80A2F1D0 AFB40054 */ sw $s4, 0x0054($sp) -/* 00054 80A2F1D4 AFB10048 */ sw $s1, 0x0048($sp) -/* 00058 80A2F1D8 AFB00044 */ sw $s0, 0x0044($sp) -/* 0005C 80A2F1DC F7BA0038 */ sdc1 $f26, 0x0038($sp) -/* 00060 80A2F1E0 F7B80030 */ sdc1 $f24, 0x0030($sp) -/* 00064 80A2F1E4 F7B60028 */ sdc1 $f22, 0x0028($sp) -/* 00068 80A2F1E8 F7B40020 */ sdc1 $f20, 0x0020($sp) -/* 0006C 80A2F1EC AFA00084 */ sw $zero, 0x0084($sp) +/* 0004C 80A2F1CC AFB50058 */ sw $s5, 0x0058($sp) +/* 00050 80A2F1D0 AFB40054 */ sw $s4, 0x0054($sp) +/* 00054 80A2F1D4 AFB10048 */ sw $s1, 0x0048($sp) +/* 00058 80A2F1D8 AFB00044 */ sw $s0, 0x0044($sp) +/* 0005C 80A2F1DC F7BA0038 */ sdc1 $f26, 0x0038($sp) +/* 00060 80A2F1E0 F7B80030 */ sdc1 $f24, 0x0030($sp) +/* 00064 80A2F1E4 F7B60028 */ sdc1 $f22, 0x0028($sp) +/* 00068 80A2F1E8 F7B40020 */ sdc1 $f20, 0x0020($sp) +/* 0006C 80A2F1EC AFA00084 */ sw $zero, 0x0084($sp) /* 00070 80A2F1F0 0C01E037 */ jal Actor_ProcessInitChain - + /* 00074 80A2F1F4 24A50740 */ addiu $a1, $a1, %lo(D_80A30740) ## $a1 = 80A30740 /* 00078 80A2F1F8 02402025 */ or $a0, $s2, $zero ## $a0 = 00000000 /* 0007C 80A2F1FC 0C010D20 */ jal DynaPolyInfo_SetActorMove - + /* 00080 80A2F200 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 00084 80A2F204 3C040601 */ lui $a0, 0x0601 ## $a0 = 06010000 /* 00088 80A2F208 2484C2D0 */ addiu $a0, $a0, 0xC2D0 ## $a0 = 0600C2D0 /* 0008C 80A2F20C 0C010620 */ jal DynaPolyInfo_Alloc - + /* 00090 80A2F210 27A50084 */ addiu $a1, $sp, 0x0084 ## $a1 = FFFFFFF4 /* 00094 80A2F214 02602025 */ or $a0, $s3, $zero ## $a0 = 00000000 /* 00098 80A2F218 26650810 */ addiu $a1, $s3, 0x0810 ## $a1 = 00000810 /* 0009C 80A2F21C 02403025 */ or $a2, $s2, $zero ## $a2 = 00000000 /* 000A0 80A2F220 0C00FA9D */ jal DynaPolyInfo_RegisterActor ## DynaPolyInfo_setActor -/* 000A4 80A2F224 8FA70084 */ lw $a3, 0x0084($sp) +/* 000A4 80A2F224 8FA70084 */ lw $a3, 0x0084($sp) /* 000A8 80A2F228 AE42014C */ sw $v0, 0x014C($s2) ## 0000014C /* 000AC 80A2F22C 3C060601 */ lui $a2, 0x0601 ## $a2 = 06010000 /* 000B0 80A2F230 3C070600 */ lui $a3, 0x0600 ## $a3 = 06000000 /* 000B4 80A2F234 264E01A8 */ addiu $t6, $s2, 0x01A8 ## $t6 = 000001A8 /* 000B8 80A2F238 264F01F0 */ addiu $t7, $s2, 0x01F0 ## $t7 = 000001F0 /* 000BC 80A2F23C 2418000C */ addiu $t8, $zero, 0x000C ## $t8 = 0000000C -/* 000C0 80A2F240 AFB80018 */ sw $t8, 0x0018($sp) -/* 000C4 80A2F244 AFAF0014 */ sw $t7, 0x0014($sp) -/* 000C8 80A2F248 AFAE0010 */ sw $t6, 0x0010($sp) +/* 000C0 80A2F240 AFB80018 */ sw $t8, 0x0018($sp) +/* 000C4 80A2F244 AFAF0014 */ sw $t7, 0x0014($sp) +/* 000C8 80A2F248 AFAE0010 */ sw $t6, 0x0010($sp) /* 000CC 80A2F24C 24E7049C */ addiu $a3, $a3, 0x049C ## $a3 = 0600049C /* 000D0 80A2F250 24C6C220 */ addiu $a2, $a2, 0xC220 ## $a2 = 0600C220 /* 000D4 80A2F254 02602025 */ or $a0, $s3, $zero ## $a0 = 00000000 -/* 000D8 80A2F258 0C0291BE */ jal func_800A46F8 +/* 000D8 80A2F258 0C0291BE */ jal SkelAnime_InitSV /* 000DC 80A2F25C 26450164 */ addiu $a1, $s2, 0x0164 ## $a1 = 00000164 /* 000E0 80A2F260 2650023C */ addiu $s0, $s2, 0x023C ## $s0 = 0000023C /* 000E4 80A2F264 02002825 */ or $a1, $s0, $zero ## $a1 = 0000023C /* 000E8 80A2F268 0C0170D9 */ jal ActorCollider_AllocCylinder - + /* 000EC 80A2F26C 02602025 */ or $a0, $s3, $zero ## $a0 = 00000000 /* 000F0 80A2F270 3C0780A3 */ lui $a3, %hi(D_80A30690) ## $a3 = 80A30000 /* 000F4 80A2F274 24E70690 */ addiu $a3, $a3, %lo(D_80A30690) ## $a3 = 80A30690 /* 000F8 80A2F278 02602025 */ or $a0, $s3, $zero ## $a0 = 00000000 /* 000FC 80A2F27C 02002825 */ or $a1, $s0, $zero ## $a1 = 0000023C -/* 00100 80A2F280 0C017114 */ jal func_8005C450 +/* 00100 80A2F280 0C017114 */ jal func_8005C450 /* 00104 80A2F284 02403025 */ or $a2, $s2, $zero ## $a2 = 00000000 /* 00108 80A2F288 3C1080A3 */ lui $s0, %hi(D_80A306BC) ## $s0 = 80A30000 /* 0010C 80A2F28C 3C1480A3 */ lui $s4, %hi(D_80A30740) ## $s4 = 80A30000 @@ -66,62 +66,62 @@ glabel EnGb_Init .L80A2F29C: /* 0011C 80A2F29C 02602025 */ or $a0, $s3, $zero ## $a0 = 00000000 /* 00120 80A2F2A0 0C0170D9 */ jal ActorCollider_AllocCylinder - + /* 00124 80A2F2A4 02202825 */ or $a1, $s1, $zero ## $a1 = 00000288 /* 00128 80A2F2A8 02602025 */ or $a0, $s3, $zero ## $a0 = 00000000 /* 0012C 80A2F2AC 02202825 */ or $a1, $s1, $zero ## $a1 = 00000288 /* 00130 80A2F2B0 02403025 */ or $a2, $s2, $zero ## $a2 = 00000000 -/* 00134 80A2F2B4 0C017114 */ jal func_8005C450 +/* 00134 80A2F2B4 0C017114 */ jal func_8005C450 /* 00138 80A2F2B8 02003825 */ or $a3, $s0, $zero ## $a3 = 80A306BC /* 0013C 80A2F2BC 2610002C */ addiu $s0, $s0, 0x002C ## $s0 = 80A306E8 -/* 00140 80A2F2C0 0214082B */ sltu $at, $s0, $s4 -/* 00144 80A2F2C4 1420FFF5 */ bne $at, $zero, .L80A2F29C +/* 00140 80A2F2C0 0214082B */ sltu $at, $s0, $s4 +/* 00144 80A2F2C4 1420FFF5 */ bne $at, $zero, .L80A2F29C /* 00148 80A2F2C8 2631004C */ addiu $s1, $s1, 0x004C ## $s1 = 000002D4 /* 0014C 80A2F2CC 26500370 */ addiu $s0, $s2, 0x0370 ## $s0 = 00000370 /* 00150 80A2F2D0 02003025 */ or $a2, $s0, $zero ## $a2 = 00000370 /* 00154 80A2F2D4 02602025 */ or $a0, $s3, $zero ## $a0 = 00000000 /* 00158 80A2F2D8 0C01E9D9 */ jal Lights_Insert - + /* 0015C 80A2F2DC 266507A8 */ addiu $a1, $s3, 0x07A8 ## $a1 = 000007A8 /* 00160 80A2F2E0 C6440008 */ lwc1 $f4, 0x0008($s2) ## 00000008 /* 00164 80A2F2E4 C648000C */ lwc1 $f8, 0x000C($s2) ## 0000000C /* 00168 80A2F2E8 C6500010 */ lwc1 $f16, 0x0010($s2) ## 00000010 -/* 0016C 80A2F2EC 4600218D */ trunc.w.s $f6, $f4 +/* 0016C 80A2F2EC 4600218D */ trunc.w.s $f6, $f4 /* 00170 80A2F2F0 AE42036C */ sw $v0, 0x036C($s2) ## 0000036C /* 00174 80A2F2F4 240A00FF */ addiu $t2, $zero, 0x00FF ## $t2 = 000000FF -/* 00178 80A2F2F8 4600428D */ trunc.w.s $f10, $f8 -/* 0017C 80A2F2FC 44053000 */ mfc1 $a1, $f6 +/* 00178 80A2F2F8 4600428D */ trunc.w.s $f10, $f8 +/* 0017C 80A2F2FC 44053000 */ mfc1 $a1, $f6 /* 00180 80A2F300 240B00FF */ addiu $t3, $zero, 0x00FF ## $t3 = 000000FF -/* 00184 80A2F304 4600848D */ trunc.w.s $f18, $f16 -/* 00188 80A2F308 44065000 */ mfc1 $a2, $f10 +/* 00184 80A2F304 4600848D */ trunc.w.s $f18, $f16 +/* 00188 80A2F308 44065000 */ mfc1 $a2, $f10 /* 0018C 80A2F30C 240C00FF */ addiu $t4, $zero, 0x00FF ## $t4 = 000000FF /* 00190 80A2F310 240D00C8 */ addiu $t5, $zero, 0x00C8 ## $t5 = 000000C8 -/* 00194 80A2F314 44079000 */ mfc1 $a3, $f18 -/* 00198 80A2F318 00052C00 */ sll $a1, $a1, 16 -/* 0019C 80A2F31C 00063400 */ sll $a2, $a2, 16 -/* 001A0 80A2F320 00073C00 */ sll $a3, $a3, 16 -/* 001A4 80A2F324 00073C03 */ sra $a3, $a3, 16 -/* 001A8 80A2F328 00063403 */ sra $a2, $a2, 16 -/* 001AC 80A2F32C 00052C03 */ sra $a1, $a1, 16 -/* 001B0 80A2F330 AFAD001C */ sw $t5, 0x001C($sp) -/* 001B4 80A2F334 AFAC0018 */ sw $t4, 0x0018($sp) -/* 001B8 80A2F338 AFAB0014 */ sw $t3, 0x0014($sp) -/* 001BC 80A2F33C AFAA0010 */ sw $t2, 0x0010($sp) +/* 00194 80A2F314 44079000 */ mfc1 $a3, $f18 +/* 00198 80A2F318 00052C00 */ sll $a1, $a1, 16 +/* 0019C 80A2F31C 00063400 */ sll $a2, $a2, 16 +/* 001A0 80A2F320 00073C00 */ sll $a3, $a3, 16 +/* 001A4 80A2F324 00073C03 */ sra $a3, $a3, 16 +/* 001A8 80A2F328 00063403 */ sra $a2, $a2, 16 +/* 001AC 80A2F32C 00052C03 */ sra $a1, $a1, 16 +/* 001B0 80A2F330 AFAD001C */ sw $t5, 0x001C($sp) +/* 001B4 80A2F334 AFAC0018 */ sw $t4, 0x0018($sp) +/* 001B8 80A2F338 AFAB0014 */ sw $t3, 0x0014($sp) +/* 001BC 80A2F33C AFAA0010 */ sw $t2, 0x0010($sp) /* 001C0 80A2F340 0C01E763 */ jal Lights_InitType0PositionalLight - + /* 001C4 80A2F344 02002025 */ or $a0, $s0, $zero ## $a0 = 00000370 /* 001C8 80A2F348 4480C000 */ mtc1 $zero, $f24 ## $f24 = 0.00 /* 001CC 80A2F34C 3C068003 */ lui $a2, 0x8003 ## $a2 = 80030000 /* 001D0 80A2F350 24C6B5EC */ addiu $a2, $a2, 0xB5EC ## $a2 = 8002B5EC -/* 001D4 80A2F354 4405C000 */ mfc1 $a1, $f24 +/* 001D4 80A2F354 4405C000 */ mfc1 $a1, $f24 /* 001D8 80A2F358 264400B4 */ addiu $a0, $s2, 0x00B4 ## $a0 = 000000B4 /* 001DC 80A2F35C 0C00AC78 */ jal ActorShape_Init - + /* 001E0 80A2F360 3C07420C */ lui $a3, 0x420C ## $a3 = 420C0000 /* 001E4 80A2F364 3C053C23 */ lui $a1, 0x3C23 ## $a1 = 3C230000 /* 001E8 80A2F368 34A5D70A */ ori $a1, $a1, 0xD70A ## $a1 = 3C23D70A /* 001EC 80A2F36C 0C00B58B */ jal Actor_SetScale - + /* 001F0 80A2F370 02402025 */ or $a0, $s2, $zero ## $a0 = 00000000 /* 001F4 80A2F374 3C01BF80 */ lui $at, 0xBF80 ## $at = BF800000 /* 001F8 80A2F378 44812000 */ mtc1 $at, $f4 ## $f4 = -1.00 @@ -132,18 +132,18 @@ glabel EnGb_Init /* 0020C 80A2F38C E6580068 */ swc1 $f24, 0x0068($s2) ## 00000068 /* 00210 80A2F390 E6580060 */ swc1 $f24, 0x0060($s2) ## 00000060 /* 00214 80A2F394 0C00CFBE */ jal Math_Rand_ZeroFloat - + /* 00218 80A2F398 E644006C */ swc1 $f4, 0x006C($s2) ## 0000006C -/* 0021C 80A2F39C 4600018D */ trunc.w.s $f6, $f0 +/* 0021C 80A2F39C 4600018D */ trunc.w.s $f6, $f0 /* 00220 80A2F3A0 3C0141F0 */ lui $at, 0x41F0 ## $at = 41F00000 /* 00224 80A2F3A4 4481D000 */ mtc1 $at, $f26 ## $f26 = 30.00 /* 00228 80A2F3A8 3C0180A3 */ lui $at, %hi(D_80A307F0) ## $at = 80A30000 -/* 0022C 80A2F3AC 44083000 */ mfc1 $t0, $f6 +/* 0022C 80A2F3AC 44083000 */ mfc1 $t0, $f6 /* 00230 80A2F3B0 3C1180A3 */ lui $s1, %hi(D_80A30748) ## $s1 = 80A30000 /* 00234 80A2F3B4 3C1580A3 */ lui $s5, %hi(D_80A30778) ## $s5 = 80A30000 /* 00238 80A2F3B8 25090064 */ addiu $t1, $t0, 0x0064 ## $t1 = 00000064 /* 0023C 80A2F3BC A6490382 */ sh $t1, 0x0382($s2) ## 00000382 -/* 00240 80A2F3C0 C43607F0 */ lwc1 $f22, %lo(D_80A307F0)($at) +/* 00240 80A2F3C0 C43607F0 */ lwc1 $f22, %lo(D_80A307F0)($at) /* 00244 80A2F3C4 3C014220 */ lui $at, 0x4220 ## $at = 42200000 /* 00248 80A2F3C8 4481A000 */ mtc1 $at, $f20 ## $f20 = 40.00 /* 0024C 80A2F3CC 26B50778 */ addiu $s5, $s5, %lo(D_80A30778) ## $s5 = 80A30778 @@ -153,124 +153,124 @@ glabel EnGb_Init /* 0025C 80A2F3DC 24130003 */ addiu $s3, $zero, 0x0003 ## $s3 = 00000003 .L80A2F3E0: /* 00260 80A2F3E0 0C00CFBE */ jal Math_Rand_ZeroFloat - -/* 00264 80A2F3E4 4600D306 */ mov.s $f12, $f26 -/* 00268 80A2F3E8 4600020D */ trunc.w.s $f8, $f0 + +/* 00264 80A2F3E4 4600D306 */ mov.s $f12, $f26 +/* 00268 80A2F3E8 4600020D */ trunc.w.s $f8, $f0 /* 0026C 80A2F3EC 00006825 */ or $t5, $zero, $zero ## $t5 = 00000000 -/* 00270 80A2F3F0 4600A306 */ mov.s $f12, $f20 -/* 00274 80A2F3F4 440B4000 */ mfc1 $t3, $f8 +/* 00270 80A2F3F0 4600A306 */ mov.s $f12, $f20 +/* 00274 80A2F3F4 440B4000 */ mfc1 $t3, $f8 /* 00278 80A2F3F8 00000000 */ nop -/* 0027C 80A2F3FC 0173001A */ div $zero, $t3, $s3 -/* 00280 80A2F400 00006010 */ mfhi $t4 +/* 0027C 80A2F3FC 0173001A */ div $zero, $t3, $s3 +/* 00280 80A2F400 00006010 */ mfhi $t4 /* 00284 80A2F404 A20C0388 */ sb $t4, 0x0388($s0) ## 00000388 /* 00288 80A2F408 C6500024 */ lwc1 $f16, 0x0024($s2) ## 00000024 /* 0028C 80A2F40C C62A0000 */ lwc1 $f10, 0x0000($s1) ## 80A30748 -/* 00290 80A2F410 16600002 */ bne $s3, $zero, .L80A2F41C +/* 00290 80A2F410 16600002 */ bne $s3, $zero, .L80A2F41C /* 00294 80A2F414 00000000 */ nop /* 00298 80A2F418 0007000D */ break 7 .L80A2F41C: /* 0029C 80A2F41C 2401FFFF */ addiu $at, $zero, 0xFFFF ## $at = FFFFFFFF -/* 002A0 80A2F420 16610004 */ bne $s3, $at, .L80A2F434 +/* 002A0 80A2F420 16610004 */ bne $s3, $at, .L80A2F434 /* 002A4 80A2F424 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 002A8 80A2F428 15610002 */ bne $t3, $at, .L80A2F434 +/* 002A8 80A2F428 15610002 */ bne $t3, $at, .L80A2F434 /* 002AC 80A2F42C 00000000 */ nop /* 002B0 80A2F430 0006000D */ break 6 .L80A2F434: -/* 002B4 80A2F434 46105080 */ add.s $f2, $f10, $f16 +/* 002B4 80A2F434 46105080 */ add.s $f2, $f10, $f16 /* 002B8 80A2F438 E6020390 */ swc1 $f2, 0x0390($s0) ## 00000390 /* 002BC 80A2F43C E602039C */ swc1 $f2, 0x039C($s0) ## 0000039C /* 002C0 80A2F440 C6440028 */ lwc1 $f4, 0x0028($s2) ## 00000028 /* 002C4 80A2F444 C6320004 */ lwc1 $f18, 0x0004($s1) ## 80A3074C -/* 002C8 80A2F448 46049080 */ add.s $f2, $f18, $f4 +/* 002C8 80A2F448 46049080 */ add.s $f2, $f18, $f4 /* 002CC 80A2F44C E6020394 */ swc1 $f2, 0x0394($s0) ## 00000394 /* 002D0 80A2F450 E60203A0 */ swc1 $f2, 0x03A0($s0) ## 000003A0 /* 002D4 80A2F454 C648002C */ lwc1 $f8, 0x002C($s2) ## 0000002C /* 002D8 80A2F458 C6260008 */ lwc1 $f6, 0x0008($s1) ## 80A30750 /* 002DC 80A2F45C A2140389 */ sb $s4, 0x0389($s0) ## 00000389 /* 002E0 80A2F460 A20D038B */ sb $t5, 0x038B($s0) ## 0000038B -/* 002E4 80A2F464 46083080 */ add.s $f2, $f6, $f8 +/* 002E4 80A2F464 46083080 */ add.s $f2, $f6, $f8 /* 002E8 80A2F468 A200038A */ sb $zero, 0x038A($s0) ## 0000038A /* 002EC 80A2F46C E61803A8 */ swc1 $f24, 0x03A8($s0) ## 000003A8 /* 002F0 80A2F470 E61803AC */ swc1 $f24, 0x03AC($s0) ## 000003AC /* 002F4 80A2F474 E6020398 */ swc1 $f2, 0x0398($s0) ## 00000398 /* 002F8 80A2F478 0C00CFBE */ jal Math_Rand_ZeroFloat - + /* 002FC 80A2F47C E60203A4 */ swc1 $f2, 0x03A4($s0) ## 000003A4 -/* 00300 80A2F480 4600028D */ trunc.w.s $f10, $f0 +/* 00300 80A2F480 4600028D */ trunc.w.s $f10, $f0 /* 00304 80A2F484 2631000C */ addiu $s1, $s1, 0x000C ## $s1 = 80A30754 /* 00308 80A2F488 2610002C */ addiu $s0, $s0, 0x002C ## $s0 = 0000002C /* 0030C 80A2F48C E6160384 */ swc1 $f22, 0x0384($s0) ## 000003B0 -/* 00310 80A2F490 440F5000 */ mfc1 $t7, $f10 +/* 00310 80A2F490 440F5000 */ mfc1 $t7, $f10 /* 00314 80A2F494 00000000 */ nop /* 00318 80A2F498 A60F0362 */ sh $t7, 0x0362($s0) ## 0000038E /* 0031C 80A2F49C 86180362 */ lh $t8, 0x0362($s0) ## 0000038E /* 00320 80A2F4A0 33190001 */ andi $t9, $t8, 0x0001 ## $t9 = 00000000 -/* 00324 80A2F4A4 1635FFCE */ bne $s1, $s5, .L80A2F3E0 +/* 00324 80A2F4A4 1635FFCE */ bne $s1, $s5, .L80A2F3E0 /* 00328 80A2F4A8 A2190360 */ sb $t9, 0x0360($s0) ## 0000038C /* 0032C 80A2F4AC 0C03F66B */ jal Math_Rand_ZeroOne ## Rand.Next() float /* 00330 80A2F4B0 00000000 */ nop -/* 00334 80A2F4B4 461A0402 */ mul.s $f16, $f0, $f26 +/* 00334 80A2F4B4 461A0402 */ mul.s $f16, $f0, $f26 /* 00338 80A2F4B8 3C0142C8 */ lui $at, 0x42C8 ## $at = 42C80000 /* 0033C 80A2F4BC 44812000 */ mtc1 $at, $f4 ## $f4 = 100.00 /* 00340 80A2F4C0 3C014320 */ lui $at, 0x4320 ## $at = 43200000 /* 00344 80A2F4C4 44815000 */ mtc1 $at, $f10 ## $f10 = 160.00 -/* 00348 80A2F4C8 46040182 */ mul.s $f6, $f0, $f4 +/* 00348 80A2F4C8 46040182 */ mul.s $f6, $f0, $f4 /* 0034C 80A2F4CC 240D00C8 */ addiu $t5, $zero, 0x00C8 ## $t5 = 000000C8 /* 00350 80A2F4D0 A24D0387 */ sb $t5, 0x0387($s2) ## 00000387 /* 00354 80A2F4D4 C64C0024 */ lwc1 $f12, 0x0024($s2) ## 00000024 /* 00358 80A2F4D8 C64E0028 */ lwc1 $f14, 0x0028($s2) ## 00000028 /* 0035C 80A2F4DC 8E46002C */ lw $a2, 0x002C($s2) ## 0000002C -/* 00360 80A2F4E0 4600848D */ trunc.w.s $f18, $f16 -/* 00364 80A2F4E4 460A0402 */ mul.s $f16, $f0, $f10 +/* 00360 80A2F4E0 4600848D */ trunc.w.s $f18, $f16 +/* 00364 80A2F4E4 460A0402 */ mul.s $f16, $f0, $f10 /* 00368 80A2F4E8 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 0036C 80A2F4EC 440B9000 */ mfc1 $t3, $f18 -/* 00370 80A2F4F0 4600320D */ trunc.w.s $f8, $f6 +/* 0036C 80A2F4EC 440B9000 */ mfc1 $t3, $f18 +/* 00370 80A2F4F0 4600320D */ trunc.w.s $f8, $f6 /* 00374 80A2F4F4 256C00E1 */ addiu $t4, $t3, 0x00E1 ## $t4 = 000000E1 /* 00378 80A2F4F8 A24C0384 */ sb $t4, 0x0384($s2) ## 00000384 -/* 0037C 80A2F4FC 4600848D */ trunc.w.s $f18, $f16 -/* 00380 80A2F500 44184000 */ mfc1 $t8, $f8 -/* 00384 80A2F504 440B9000 */ mfc1 $t3, $f18 +/* 0037C 80A2F4FC 4600848D */ trunc.w.s $f18, $f16 +/* 00380 80A2F500 44184000 */ mfc1 $t8, $f8 +/* 00384 80A2F504 440B9000 */ mfc1 $t3, $f18 /* 00388 80A2F508 2719009B */ addiu $t9, $t8, 0x009B ## $t9 = 0000009B /* 0038C 80A2F50C A2590385 */ sb $t9, 0x0385($s2) ## 00000385 /* 00390 80A2F510 256C005F */ addiu $t4, $t3, 0x005F ## $t4 = 0000005F -/* 00394 80A2F514 0C034261 */ jal Matrix_Translate +/* 00394 80A2F514 0C034261 */ jal Matrix_Translate /* 00398 80A2F518 A24C0386 */ sb $t4, 0x0386($s2) ## 00000386 /* 0039C 80A2F51C 86440030 */ lh $a0, 0x0030($s2) ## 00000030 /* 003A0 80A2F520 86450032 */ lh $a1, 0x0032($s2) ## 00000032 /* 003A4 80A2F524 86460034 */ lh $a2, 0x0034($s2) ## 00000034 -/* 003A8 80A2F528 0C034421 */ jal Matrix_RotateXYZ +/* 003A8 80A2F528 0C034421 */ jal Matrix_RotateZYX /* 003AC 80A2F52C 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 /* 003B0 80A2F530 3C014230 */ lui $at, 0x4230 ## $at = 42300000 /* 003B4 80A2F534 44812000 */ mtc1 $at, $f4 ## $f4 = 44.00 -/* 003B8 80A2F538 E7B80074 */ swc1 $f24, 0x0074($sp) -/* 003BC 80A2F53C E7B80070 */ swc1 $f24, 0x0070($sp) +/* 003B8 80A2F538 E7B80074 */ swc1 $f24, 0x0074($sp) +/* 003BC 80A2F53C E7B80070 */ swc1 $f24, 0x0070($sp) /* 003C0 80A2F540 27A40070 */ addiu $a0, $sp, 0x0070 ## $a0 = FFFFFFE0 /* 003C4 80A2F544 26450038 */ addiu $a1, $s2, 0x0038 ## $a1 = 00000038 -/* 003C8 80A2F548 0C0346BD */ jal Matrix_MultVec3f -/* 003CC 80A2F54C E7A40078 */ swc1 $f4, 0x0078($sp) +/* 003C8 80A2F548 0C0346BD */ jal Matrix_MultVec3f +/* 003CC 80A2F54C E7A40078 */ swc1 $f4, 0x0078($sp) /* 003D0 80A2F550 3C01427A */ lui $at, 0x427A ## $at = 427A0000 /* 003D4 80A2F554 44814000 */ mtc1 $at, $f8 ## $f8 = 62.50 /* 003D8 80A2F558 C646003C */ lwc1 $f6, 0x003C($s2) ## 0000003C /* 003DC 80A2F55C 02402025 */ or $a0, $s2, $zero ## $a0 = 00000000 -/* 003E0 80A2F560 46083280 */ add.s $f10, $f6, $f8 -/* 003E4 80A2F564 0C28BC60 */ jal func_80A2F180 +/* 003E0 80A2F560 46083280 */ add.s $f10, $f6, $f8 +/* 003E4 80A2F564 0C28BC60 */ jal func_80A2F180 /* 003E8 80A2F568 E64A003C */ swc1 $f10, 0x003C($s2) ## 0000003C /* 003EC 80A2F56C 3C0E80A3 */ lui $t6, %hi(func_80A2F83C) ## $t6 = 80A30000 /* 003F0 80A2F570 25CEF83C */ addiu $t6, $t6, %lo(func_80A2F83C) ## $t6 = 80A2F83C /* 003F4 80A2F574 AE4E0238 */ sw $t6, 0x0238($s2) ## 00000238 -/* 003F8 80A2F578 8FBF005C */ lw $ra, 0x005C($sp) -/* 003FC 80A2F57C 8FB50058 */ lw $s5, 0x0058($sp) -/* 00400 80A2F580 8FB40054 */ lw $s4, 0x0054($sp) -/* 00404 80A2F584 8FB30050 */ lw $s3, 0x0050($sp) -/* 00408 80A2F588 8FB2004C */ lw $s2, 0x004C($sp) -/* 0040C 80A2F58C 8FB10048 */ lw $s1, 0x0048($sp) -/* 00410 80A2F590 8FB00044 */ lw $s0, 0x0044($sp) -/* 00414 80A2F594 D7BA0038 */ ldc1 $f26, 0x0038($sp) -/* 00418 80A2F598 D7B80030 */ ldc1 $f24, 0x0030($sp) -/* 0041C 80A2F59C D7B60028 */ ldc1 $f22, 0x0028($sp) -/* 00420 80A2F5A0 D7B40020 */ ldc1 $f20, 0x0020($sp) -/* 00424 80A2F5A4 03E00008 */ jr $ra +/* 003F8 80A2F578 8FBF005C */ lw $ra, 0x005C($sp) +/* 003FC 80A2F57C 8FB50058 */ lw $s5, 0x0058($sp) +/* 00400 80A2F580 8FB40054 */ lw $s4, 0x0054($sp) +/* 00404 80A2F584 8FB30050 */ lw $s3, 0x0050($sp) +/* 00408 80A2F588 8FB2004C */ lw $s2, 0x004C($sp) +/* 0040C 80A2F58C 8FB10048 */ lw $s1, 0x0048($sp) +/* 00410 80A2F590 8FB00044 */ lw $s0, 0x0044($sp) +/* 00414 80A2F594 D7BA0038 */ ldc1 $f26, 0x0038($sp) +/* 00418 80A2F598 D7B80030 */ ldc1 $f24, 0x0030($sp) +/* 0041C 80A2F59C D7B60028 */ ldc1 $f22, 0x0028($sp) +/* 00420 80A2F5A0 D7B40020 */ ldc1 $f20, 0x0020($sp) +/* 00424 80A2F5A4 03E00008 */ jr $ra /* 00428 80A2F5A8 27BD0090 */ addiu $sp, $sp, 0x0090 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Gb/func_80A2F608.s b/asm/non_matchings/overlays/actors/ovl_En_Gb/func_80A2F608.s index c9e7bb4a57..f721750c1a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Gb/func_80A2F608.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Gb/func_80A2F608.s @@ -1,21 +1,21 @@ glabel func_80A2F608 /* 00488 80A2F608 27BDFFA8 */ addiu $sp, $sp, 0xFFA8 ## $sp = FFFFFFA8 -/* 0048C 80A2F60C AFBF002C */ sw $ra, 0x002C($sp) -/* 00490 80A2F610 AFB1001C */ sw $s1, 0x001C($sp) -/* 00494 80A2F614 AFB40028 */ sw $s4, 0x0028($sp) -/* 00498 80A2F618 AFB30024 */ sw $s3, 0x0024($sp) -/* 0049C 80A2F61C AFB20020 */ sw $s2, 0x0020($sp) -/* 004A0 80A2F620 AFB00018 */ sw $s0, 0x0018($sp) +/* 0048C 80A2F60C AFBF002C */ sw $ra, 0x002C($sp) +/* 00490 80A2F610 AFB1001C */ sw $s1, 0x001C($sp) +/* 00494 80A2F614 AFB40028 */ sw $s4, 0x0028($sp) +/* 00498 80A2F618 AFB30024 */ sw $s3, 0x0024($sp) +/* 0049C 80A2F61C AFB20020 */ sw $s2, 0x0020($sp) +/* 004A0 80A2F620 AFB00018 */ sw $s0, 0x0018($sp) /* 004A4 80A2F624 00808825 */ or $s1, $a0, $zero ## $s1 = 00000000 /* 004A8 80A2F628 8C86002C */ lw $a2, 0x002C($a0) ## 0000002C /* 004AC 80A2F62C C48E0028 */ lwc1 $f14, 0x0028($a0) ## 00000028 /* 004B0 80A2F630 C48C0024 */ lwc1 $f12, 0x0024($a0) ## 00000024 -/* 004B4 80A2F634 0C034261 */ jal Matrix_Translate +/* 004B4 80A2F634 0C034261 */ jal Matrix_Translate /* 004B8 80A2F638 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 /* 004BC 80A2F63C 86240030 */ lh $a0, 0x0030($s1) ## 00000030 /* 004C0 80A2F640 86250032 */ lh $a1, 0x0032($s1) ## 00000032 /* 004C4 80A2F644 86260034 */ lh $a2, 0x0034($s1) ## 00000034 -/* 004C8 80A2F648 0C034421 */ jal Matrix_RotateXYZ +/* 004C8 80A2F648 0C034421 */ jal Matrix_RotateZYX /* 004CC 80A2F64C 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 /* 004D0 80A2F650 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 /* 004D4 80A2F654 3C0141C8 */ lui $at, 0x41C8 ## $at = 41C80000 @@ -23,68 +23,68 @@ glabel func_80A2F608 /* 004DC 80A2F65C 27B4003C */ addiu $s4, $sp, 0x003C ## $s4 = FFFFFFE4 /* 004E0 80A2F660 02802825 */ or $a1, $s4, $zero ## $a1 = FFFFFFE4 /* 004E4 80A2F664 27A40048 */ addiu $a0, $sp, 0x0048 ## $a0 = FFFFFFF0 -/* 004E8 80A2F668 E7A0004C */ swc1 $f0, 0x004C($sp) -/* 004EC 80A2F66C E7A00048 */ swc1 $f0, 0x0048($sp) -/* 004F0 80A2F670 0C0346BD */ jal Matrix_MultVec3f -/* 004F4 80A2F674 E7A40050 */ swc1 $f4, 0x0050($sp) -/* 004F8 80A2F678 C7A6003C */ lwc1 $f6, 0x003C($sp) +/* 004E8 80A2F668 E7A0004C */ swc1 $f0, 0x004C($sp) +/* 004EC 80A2F66C E7A00048 */ swc1 $f0, 0x0048($sp) +/* 004F0 80A2F670 0C0346BD */ jal Matrix_MultVec3f +/* 004F4 80A2F674 E7A40050 */ swc1 $f4, 0x0050($sp) +/* 004F8 80A2F678 C7A6003C */ lwc1 $f6, 0x003C($sp) /* 004FC 80A2F67C 3C1280A3 */ lui $s2, %hi(D_80A30778) ## $s2 = 80A30000 /* 00500 80A2F680 3C1380A3 */ lui $s3, %hi(D_80A3079C) ## $s3 = 80A30000 -/* 00504 80A2F684 4600320D */ trunc.w.s $f8, $f6 +/* 00504 80A2F684 4600320D */ trunc.w.s $f8, $f6 /* 00508 80A2F688 2673079C */ addiu $s3, $s3, %lo(D_80A3079C) ## $s3 = 80A3079C /* 0050C 80A2F68C 26520778 */ addiu $s2, $s2, %lo(D_80A30778) ## $s2 = 80A30778 /* 00510 80A2F690 02208025 */ or $s0, $s1, $zero ## $s0 = 00000000 -/* 00514 80A2F694 440F4000 */ mfc1 $t7, $f8 +/* 00514 80A2F694 440F4000 */ mfc1 $t7, $f8 /* 00518 80A2F698 00000000 */ nop /* 0051C 80A2F69C A62F0282 */ sh $t7, 0x0282($s1) ## 00000282 -/* 00520 80A2F6A0 C7AA0040 */ lwc1 $f10, 0x0040($sp) -/* 00524 80A2F6A4 4600540D */ trunc.w.s $f16, $f10 -/* 00528 80A2F6A8 44198000 */ mfc1 $t9, $f16 +/* 00520 80A2F6A0 C7AA0040 */ lwc1 $f10, 0x0040($sp) +/* 00524 80A2F6A4 4600540D */ trunc.w.s $f16, $f10 +/* 00528 80A2F6A8 44198000 */ mfc1 $t9, $f16 /* 0052C 80A2F6AC 00000000 */ nop /* 00530 80A2F6B0 A6390284 */ sh $t9, 0x0284($s1) ## 00000284 -/* 00534 80A2F6B4 C7B20044 */ lwc1 $f18, 0x0044($sp) -/* 00538 80A2F6B8 4600910D */ trunc.w.s $f4, $f18 -/* 0053C 80A2F6BC 44092000 */ mfc1 $t1, $f4 +/* 00534 80A2F6B4 C7B20044 */ lwc1 $f18, 0x0044($sp) +/* 00538 80A2F6B8 4600910D */ trunc.w.s $f4, $f18 +/* 0053C 80A2F6BC 44092000 */ mfc1 $t1, $f4 /* 00540 80A2F6C0 00000000 */ nop /* 00544 80A2F6C4 A6290286 */ sh $t1, 0x0286($s1) ## 00000286 .L80A2F6C8: /* 00548 80A2F6C8 C62C0024 */ lwc1 $f12, 0x0024($s1) ## 00000024 /* 0054C 80A2F6CC C62E0028 */ lwc1 $f14, 0x0028($s1) ## 00000028 /* 00550 80A2F6D0 8E26002C */ lw $a2, 0x002C($s1) ## 0000002C -/* 00554 80A2F6D4 0C034261 */ jal Matrix_Translate +/* 00554 80A2F6D4 0C034261 */ jal Matrix_Translate /* 00558 80A2F6D8 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 /* 0055C 80A2F6DC 86240030 */ lh $a0, 0x0030($s1) ## 00000030 /* 00560 80A2F6E0 86250032 */ lh $a1, 0x0032($s1) ## 00000032 /* 00564 80A2F6E4 86260034 */ lh $a2, 0x0034($s1) ## 00000034 -/* 00568 80A2F6E8 0C034421 */ jal Matrix_RotateXYZ +/* 00568 80A2F6E8 0C034421 */ jal Matrix_RotateZYX /* 0056C 80A2F6EC 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 /* 00570 80A2F6F0 02402025 */ or $a0, $s2, $zero ## $a0 = 80A30778 -/* 00574 80A2F6F4 0C0346BD */ jal Matrix_MultVec3f +/* 00574 80A2F6F4 0C0346BD */ jal Matrix_MultVec3f /* 00578 80A2F6F8 02802825 */ or $a1, $s4, $zero ## $a1 = FFFFFFE4 -/* 0057C 80A2F6FC C7A6003C */ lwc1 $f6, 0x003C($sp) +/* 0057C 80A2F6FC C7A6003C */ lwc1 $f6, 0x003C($sp) /* 00580 80A2F700 2652000C */ addiu $s2, $s2, 0x000C ## $s2 = 80A30784 /* 00584 80A2F704 2610004C */ addiu $s0, $s0, 0x004C ## $s0 = 0000004C -/* 00588 80A2F708 4600320D */ trunc.w.s $f8, $f6 -/* 0058C 80A2F70C 440B4000 */ mfc1 $t3, $f8 +/* 00588 80A2F708 4600320D */ trunc.w.s $f8, $f6 +/* 0058C 80A2F70C 440B4000 */ mfc1 $t3, $f8 /* 00590 80A2F710 00000000 */ nop /* 00594 80A2F714 A60B0282 */ sh $t3, 0x0282($s0) ## 000002CE -/* 00598 80A2F718 C7AA0040 */ lwc1 $f10, 0x0040($sp) -/* 0059C 80A2F71C 4600540D */ trunc.w.s $f16, $f10 -/* 005A0 80A2F720 440D8000 */ mfc1 $t5, $f16 +/* 00598 80A2F718 C7AA0040 */ lwc1 $f10, 0x0040($sp) +/* 0059C 80A2F71C 4600540D */ trunc.w.s $f16, $f10 +/* 005A0 80A2F720 440D8000 */ mfc1 $t5, $f16 /* 005A4 80A2F724 00000000 */ nop /* 005A8 80A2F728 A60D0284 */ sh $t5, 0x0284($s0) ## 000002D0 -/* 005AC 80A2F72C C7B20044 */ lwc1 $f18, 0x0044($sp) -/* 005B0 80A2F730 4600910D */ trunc.w.s $f4, $f18 -/* 005B4 80A2F734 440F2000 */ mfc1 $t7, $f4 -/* 005B8 80A2F738 1653FFE3 */ bne $s2, $s3, .L80A2F6C8 +/* 005AC 80A2F72C C7B20044 */ lwc1 $f18, 0x0044($sp) +/* 005B0 80A2F730 4600910D */ trunc.w.s $f4, $f18 +/* 005B4 80A2F734 440F2000 */ mfc1 $t7, $f4 +/* 005B8 80A2F738 1653FFE3 */ bne $s2, $s3, .L80A2F6C8 /* 005BC 80A2F73C A60F0286 */ sh $t7, 0x0286($s0) ## 000002D2 -/* 005C0 80A2F740 8FBF002C */ lw $ra, 0x002C($sp) -/* 005C4 80A2F744 8FB00018 */ lw $s0, 0x0018($sp) -/* 005C8 80A2F748 8FB1001C */ lw $s1, 0x001C($sp) -/* 005CC 80A2F74C 8FB20020 */ lw $s2, 0x0020($sp) -/* 005D0 80A2F750 8FB30024 */ lw $s3, 0x0024($sp) -/* 005D4 80A2F754 8FB40028 */ lw $s4, 0x0028($sp) -/* 005D8 80A2F758 03E00008 */ jr $ra +/* 005C0 80A2F740 8FBF002C */ lw $ra, 0x002C($sp) +/* 005C4 80A2F744 8FB00018 */ lw $s0, 0x0018($sp) +/* 005C8 80A2F748 8FB1001C */ lw $s1, 0x001C($sp) +/* 005CC 80A2F74C 8FB20020 */ lw $s2, 0x0020($sp) +/* 005D0 80A2F750 8FB30024 */ lw $s3, 0x0024($sp) +/* 005D4 80A2F754 8FB40028 */ lw $s4, 0x0028($sp) +/* 005D8 80A2F758 03E00008 */ jr $ra /* 005DC 80A2F75C 27BD0058 */ addiu $sp, $sp, 0x0058 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Gb/func_80A2F7C0.s b/asm/non_matchings/overlays/actors/ovl_En_Gb/func_80A2F7C0.s index 1583a90fff..fcd9c381fc 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Gb/func_80A2F7C0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Gb/func_80A2F7C0.s @@ -1,37 +1,37 @@ glabel func_80A2F7C0 /* 00640 80A2F7C0 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 00644 80A2F7C4 AFA40028 */ sw $a0, 0x0028($sp) -/* 00648 80A2F7C8 AFBF0024 */ sw $ra, 0x0024($sp) +/* 00644 80A2F7C4 AFA40028 */ sw $a0, 0x0028($sp) +/* 00648 80A2F7C8 AFBF0024 */ sw $ra, 0x0024($sp) /* 0064C 80A2F7CC 3C040601 */ lui $a0, 0x0601 ## $a0 = 06010000 /* 00650 80A2F7D0 0C028800 */ jal SkelAnime_GetFrameCount - + /* 00654 80A2F7D4 2484C8EC */ addiu $a0, $a0, 0xC8EC ## $a0 = 0600C8EC /* 00658 80A2F7D8 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 0065C 80A2F7DC 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 00660 80A2F7E0 8FA40028 */ lw $a0, 0x0028($sp) -/* 00664 80A2F7E4 468021A0 */ cvt.s.w $f6, $f4 +/* 00660 80A2F7E0 8FA40028 */ lw $a0, 0x0028($sp) +/* 00664 80A2F7E4 468021A0 */ cvt.s.w $f6, $f4 /* 00668 80A2F7E8 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 /* 0066C 80A2F7EC 240E0002 */ addiu $t6, $zero, 0x0002 ## $t6 = 00000002 -/* 00670 80A2F7F0 44070000 */ mfc1 $a3, $f0 -/* 00674 80A2F7F4 AFAE0014 */ sw $t6, 0x0014($sp) +/* 00670 80A2F7F0 44070000 */ mfc1 $a3, $f0 +/* 00674 80A2F7F4 AFAE0014 */ sw $t6, 0x0014($sp) /* 00678 80A2F7F8 24A5C8EC */ addiu $a1, $a1, 0xC8EC ## $a1 = 0600C8EC -/* 0067C 80A2F7FC E7A60010 */ swc1 $f6, 0x0010($sp) +/* 0067C 80A2F7FC E7A60010 */ swc1 $f6, 0x0010($sp) /* 00680 80A2F800 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 00684 80A2F804 24840164 */ addiu $a0, $a0, 0x0164 ## $a0 = 00000164 -/* 00688 80A2F808 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 0068C 80A2F80C E7A00018 */ swc1 $f0, 0x0018($sp) -/* 00690 80A2F810 8FA40028 */ lw $a0, 0x0028($sp) +/* 00688 80A2F808 0C029468 */ jal SkelAnime_ChangeAnim + +/* 0068C 80A2F80C E7A00018 */ swc1 $f0, 0x0018($sp) +/* 00690 80A2F810 8FA40028 */ lw $a0, 0x0028($sp) /* 00694 80A2F814 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 00698 80A2F818 240528B0 */ addiu $a1, $zero, 0x28B0 ## $a1 = 000028B0 -/* 0069C 80A2F81C 8FB80028 */ lw $t8, 0x0028($sp) +/* 0069C 80A2F81C 8FB80028 */ lw $t8, 0x0028($sp) /* 006A0 80A2F820 3C0F80A3 */ lui $t7, %hi(func_80A2FC70) ## $t7 = 80A30000 /* 006A4 80A2F824 25EFFC70 */ addiu $t7, $t7, %lo(func_80A2FC70) ## $t7 = 80A2FC70 /* 006A8 80A2F828 AF0F0238 */ sw $t7, 0x0238($t8) ## 00000238 -/* 006AC 80A2F82C 8FBF0024 */ lw $ra, 0x0024($sp) +/* 006AC 80A2F82C 8FBF0024 */ lw $ra, 0x0024($sp) /* 006B0 80A2F830 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 006B4 80A2F834 03E00008 */ jr $ra +/* 006B4 80A2F834 03E00008 */ jr $ra /* 006B8 80A2F838 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Gb/func_80A2FC70.s b/asm/non_matchings/overlays/actors/ovl_En_Gb/func_80A2FC70.s index 0afff11a35..5f75bacfd0 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Gb/func_80A2FC70.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Gb/func_80A2FC70.s @@ -1,50 +1,50 @@ glabel func_80A2FC70 /* 00AF0 80A2FC70 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 00AF4 80A2FC74 AFB00028 */ sw $s0, 0x0028($sp) +/* 00AF4 80A2FC74 AFB00028 */ sw $s0, 0x0028($sp) /* 00AF8 80A2FC78 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00AFC 80A2FC7C AFBF002C */ sw $ra, 0x002C($sp) +/* 00AFC 80A2FC7C AFBF002C */ sw $ra, 0x002C($sp) /* 00B00 80A2FC80 3C040601 */ lui $a0, 0x0601 ## $a0 = 06010000 -/* 00B04 80A2FC84 AFA50034 */ sw $a1, 0x0034($sp) +/* 00B04 80A2FC84 AFA50034 */ sw $a1, 0x0034($sp) /* 00B08 80A2FC88 0C028800 */ jal SkelAnime_GetFrameCount - + /* 00B0C 80A2FC8C 2484C8EC */ addiu $a0, $a0, 0xC8EC ## $a0 = 0600C8EC /* 00B10 80A2FC90 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 00B14 80A2FC94 C600017C */ lwc1 $f0, 0x017C($s0) ## 0000017C /* 00B18 80A2FC98 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 -/* 00B1C 80A2FC9C 468021A0 */ cvt.s.w $f6, $f4 +/* 00B1C 80A2FC9C 468021A0 */ cvt.s.w $f6, $f4 /* 00B20 80A2FCA0 3C014190 */ lui $at, 0x4190 ## $at = 41900000 -/* 00B24 80A2FCA4 46060032 */ c.eq.s $f0, $f6 +/* 00B24 80A2FCA4 46060032 */ c.eq.s $f0, $f6 /* 00B28 80A2FCA8 00000000 */ nop -/* 00B2C 80A2FCAC 45020014 */ bc1fl .L80A2FD00 +/* 00B2C 80A2FCAC 45020014 */ bc1fl .L80A2FD00 /* 00B30 80A2FCB0 44818000 */ mtc1 $at, $f16 ## $f16 = 18.00 /* 00B34 80A2FCB4 0C028800 */ jal SkelAnime_GetFrameCount - + /* 00B38 80A2FCB8 2484049C */ addiu $a0, $a0, 0x049C ## $a0 = 0600049C /* 00B3C 80A2FCBC 44824000 */ mtc1 $v0, $f8 ## $f8 = 0.00 /* 00B40 80A2FCC0 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 /* 00B44 80A2FCC4 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 00B48 80A2FCC8 468042A0 */ cvt.s.w $f10, $f8 -/* 00B4C 80A2FCCC 44070000 */ mfc1 $a3, $f0 +/* 00B48 80A2FCC8 468042A0 */ cvt.s.w $f10, $f8 +/* 00B4C 80A2FCCC 44070000 */ mfc1 $a3, $f0 /* 00B50 80A2FCD0 24A5049C */ addiu $a1, $a1, 0x049C ## $a1 = 0600049C /* 00B54 80A2FCD4 26040164 */ addiu $a0, $s0, 0x0164 ## $a0 = 00000164 /* 00B58 80A2FCD8 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 00B5C 80A2FCDC AFA00014 */ sw $zero, 0x0014($sp) -/* 00B60 80A2FCE0 E7AA0010 */ swc1 $f10, 0x0010($sp) -/* 00B64 80A2FCE4 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 00B68 80A2FCE8 E7A00018 */ swc1 $f0, 0x0018($sp) +/* 00B5C 80A2FCDC AFA00014 */ sw $zero, 0x0014($sp) +/* 00B60 80A2FCE0 E7AA0010 */ swc1 $f10, 0x0010($sp) +/* 00B64 80A2FCE4 0C029468 */ jal SkelAnime_ChangeAnim + +/* 00B68 80A2FCE8 E7A00018 */ swc1 $f0, 0x0018($sp) /* 00B6C 80A2FCEC 3C0E80A3 */ lui $t6, %hi(func_80A2F83C) ## $t6 = 80A30000 /* 00B70 80A2FCF0 25CEF83C */ addiu $t6, $t6, %lo(func_80A2F83C) ## $t6 = 80A2F83C -/* 00B74 80A2FCF4 1000001A */ beq $zero, $zero, .L80A2FD60 +/* 00B74 80A2FCF4 1000001A */ beq $zero, $zero, .L80A2FD60 /* 00B78 80A2FCF8 AE0E0238 */ sw $t6, 0x0238($s0) ## 00000238 /* 00B7C 80A2FCFC 44818000 */ mtc1 $at, $f16 ## $f16 = 0.00 .L80A2FD00: /* 00B80 80A2FD00 24030003 */ addiu $v1, $zero, 0x0003 ## $v1 = 00000003 /* 00B84 80A2FD04 24040001 */ addiu $a0, $zero, 0x0001 ## $a0 = 00000001 -/* 00B88 80A2FD08 46008032 */ c.eq.s $f16, $f0 +/* 00B88 80A2FD08 46008032 */ c.eq.s $f16, $f0 /* 00B8C 80A2FD0C 3C014416 */ lui $at, 0x4416 ## $at = 44160000 -/* 00B90 80A2FD10 45020014 */ bc1fl .L80A2FD64 -/* 00B94 80A2FD14 8FBF002C */ lw $ra, 0x002C($sp) +/* 00B90 80A2FD10 45020014 */ bc1fl .L80A2FD64 +/* 00B94 80A2FD14 8FBF002C */ lw $ra, 0x002C($sp) /* 00B98 80A2FD18 44816000 */ mtc1 $at, $f12 ## $f12 = 600.00 /* 00B9C 80A2FD1C A20303B5 */ sb $v1, 0x03B5($s0) ## 000003B5 /* 00BA0 80A2FD20 A20403B7 */ sb $a0, 0x03B7($s0) ## 000003B7 @@ -54,23 +54,23 @@ glabel func_80A2FC70 /* 00BB0 80A2FD30 A204040F */ sb $a0, 0x040F($s0) ## 0000040F /* 00BB4 80A2FD34 A2030389 */ sb $v1, 0x0389($s0) ## 00000389 /* 00BB8 80A2FD38 0C00CFBE */ jal Math_Rand_ZeroFloat - + /* 00BBC 80A2FD3C A204038B */ sb $a0, 0x038B($s0) ## 0000038B -/* 00BC0 80A2FD40 4600048D */ trunc.w.s $f18, $f0 +/* 00BC0 80A2FD40 4600048D */ trunc.w.s $f18, $f0 /* 00BC4 80A2FD44 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 00BC8 80A2FD48 24052873 */ addiu $a1, $zero, 0x2873 ## $a1 = 00002873 -/* 00BCC 80A2FD4C 44089000 */ mfc1 $t0, $f18 +/* 00BCC 80A2FD4C 44089000 */ mfc1 $t0, $f18 /* 00BD0 80A2FD50 00000000 */ nop /* 00BD4 80A2FD54 25090258 */ addiu $t1, $t0, 0x0258 ## $t1 = 00000258 /* 00BD8 80A2FD58 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 00BDC 80A2FD5C A6090382 */ sh $t1, 0x0382($s0) ## 00000382 .L80A2FD60: -/* 00BE0 80A2FD60 8FBF002C */ lw $ra, 0x002C($sp) +/* 00BE0 80A2FD60 8FBF002C */ lw $ra, 0x002C($sp) .L80A2FD64: -/* 00BE4 80A2FD64 8FB00028 */ lw $s0, 0x0028($sp) +/* 00BE4 80A2FD64 8FB00028 */ lw $s0, 0x0028($sp) /* 00BE8 80A2FD68 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 00BEC 80A2FD6C 03E00008 */ jr $ra +/* 00BEC 80A2FD6C 03E00008 */ jr $ra /* 00BF0 80A2FD70 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Gb/func_80A30350.s b/asm/non_matchings/overlays/actors/ovl_En_Gb/func_80A30350.s index bf395ff513..85821aaef6 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Gb/func_80A30350.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Gb/func_80A30350.s @@ -1,44 +1,44 @@ glabel func_80A30350 /* 011D0 80A30350 27BDFF40 */ addiu $sp, $sp, 0xFF40 ## $sp = FFFFFF40 -/* 011D4 80A30354 AFB5005C */ sw $s5, 0x005C($sp) +/* 011D4 80A30354 AFB5005C */ sw $s5, 0x005C($sp) /* 011D8 80A30358 00A0A825 */ or $s5, $a1, $zero ## $s5 = 00000000 -/* 011DC 80A3035C AFBF006C */ sw $ra, 0x006C($sp) -/* 011E0 80A30360 AFBE0068 */ sw $s8, 0x0068($sp) -/* 011E4 80A30364 AFB70064 */ sw $s7, 0x0064($sp) -/* 011E8 80A30368 AFB60060 */ sw $s6, 0x0060($sp) -/* 011EC 80A3036C AFB40058 */ sw $s4, 0x0058($sp) -/* 011F0 80A30370 AFB30054 */ sw $s3, 0x0054($sp) -/* 011F4 80A30374 AFB20050 */ sw $s2, 0x0050($sp) -/* 011F8 80A30378 AFB1004C */ sw $s1, 0x004C($sp) -/* 011FC 80A3037C AFB00048 */ sw $s0, 0x0048($sp) -/* 01200 80A30380 F7B60040 */ sdc1 $f22, 0x0040($sp) -/* 01204 80A30384 F7B40038 */ sdc1 $f20, 0x0038($sp) -/* 01208 80A30388 AFA400C0 */ sw $a0, 0x00C0($sp) +/* 011DC 80A3035C AFBF006C */ sw $ra, 0x006C($sp) +/* 011E0 80A30360 AFBE0068 */ sw $s8, 0x0068($sp) +/* 011E4 80A30364 AFB70064 */ sw $s7, 0x0064($sp) +/* 011E8 80A30368 AFB60060 */ sw $s6, 0x0060($sp) +/* 011EC 80A3036C AFB40058 */ sw $s4, 0x0058($sp) +/* 011F0 80A30370 AFB30054 */ sw $s3, 0x0054($sp) +/* 011F4 80A30374 AFB20050 */ sw $s2, 0x0050($sp) +/* 011F8 80A30378 AFB1004C */ sw $s1, 0x004C($sp) +/* 011FC 80A3037C AFB00048 */ sw $s0, 0x0048($sp) +/* 01200 80A30380 F7B60040 */ sdc1 $f22, 0x0040($sp) +/* 01204 80A30384 F7B40038 */ sdc1 $f20, 0x0038($sp) +/* 01208 80A30388 AFA400C0 */ sw $a0, 0x00C0($sp) /* 0120C 80A3038C 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 /* 01210 80A30390 3C0680A3 */ lui $a2, %hi(D_80A307C0) ## $a2 = 80A30000 /* 01214 80A30394 24C607C0 */ addiu $a2, $a2, %lo(D_80A307C0) ## $a2 = 80A307C0 /* 01218 80A30398 27A400A4 */ addiu $a0, $sp, 0x00A4 ## $a0 = FFFFFFE4 /* 0121C 80A3039C 24070392 */ addiu $a3, $zero, 0x0392 ## $a3 = 00000392 -/* 01220 80A303A0 0C031AB1 */ jal func_800C6AC4 +/* 01220 80A303A0 0C031AB1 */ jal Graph_OpenDisps /* 01224 80A303A4 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 -/* 01228 80A303A8 0C024F61 */ jal func_80093D84 +/* 01228 80A303A8 0C024F61 */ jal func_80093D84 /* 0122C 80A303AC 8EA40000 */ lw $a0, 0x0000($s5) ## 00000000 /* 01230 80A303B0 3C010001 */ lui $at, 0x0001 ## $at = 00010000 /* 01234 80A303B4 34211DA0 */ ori $at, $at, 0x1DA0 ## $at = 00011DA0 -/* 01238 80A303B8 02A1B021 */ addu $s6, $s5, $at +/* 01238 80A303B8 02A1B021 */ addu $s6, $s5, $at /* 0123C 80A303BC 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 /* 01240 80A303C0 4481B000 */ mtc1 $at, $f22 ## $f22 = 1.00 /* 01244 80A303C4 3C0180A3 */ lui $at, %hi(D_80A30800) ## $at = 80A30000 /* 01248 80A303C8 3C170601 */ lui $s7, 0x0601 ## $s7 = 06010000 /* 0124C 80A303CC 3C1EDB06 */ lui $s8, 0xDB06 ## $s8 = DB060000 -/* 01250 80A303D0 8FB300C0 */ lw $s3, 0x00C0($sp) +/* 01250 80A303D0 8FB300C0 */ lw $s3, 0x00C0($sp) /* 01254 80A303D4 37DE0020 */ ori $s8, $s8, 0x0020 ## $s8 = DB060020 /* 01258 80A303D8 26F7C0B0 */ addiu $s7, $s7, 0xC0B0 ## $s7 = 0600C0B0 -/* 0125C 80A303DC C4340800 */ lwc1 $f20, %lo(D_80A30800)($at) +/* 0125C 80A303DC C4340800 */ lwc1 $f20, %lo(D_80A30800)($at) /* 01260 80A303E0 0000A025 */ or $s4, $zero, $zero ## $s4 = 00000000 .L80A303E4: /* 01264 80A303E4 8E2202D0 */ lw $v0, 0x02D0($s1) ## 000002D0 -/* 01268 80A303E8 8FA800C0 */ lw $t0, 0x00C0($sp) +/* 01268 80A303E8 8FA800C0 */ lw $t0, 0x00C0($sp) /* 0126C 80A303EC 92630388 */ lbu $v1, 0x0388($s3) ## 00000388 /* 01270 80A303F0 244E0008 */ addiu $t6, $v0, 0x0008 ## $t6 = 00000008 /* 01274 80A303F4 AE2E02D0 */ sw $t6, 0x02D0($s1) ## 000002D0 @@ -49,26 +49,26 @@ glabel func_80A30350 /* 01288 80A30408 240F0020 */ addiu $t7, $zero, 0x0020 ## $t7 = 00000020 /* 0128C 80A3040C 24180040 */ addiu $t8, $zero, 0x0040 ## $t8 = 00000040 /* 01290 80A30410 24190001 */ addiu $t9, $zero, 0x0001 ## $t9 = 00000001 -/* 01294 80A30414 00034900 */ sll $t1, $v1, 4 -/* 01298 80A30418 012A8021 */ addu $s0, $t1, $t2 -/* 0129C 80A3041C AFB90018 */ sw $t9, 0x0018($sp) -/* 012A0 80A30420 AFB80014 */ sw $t8, 0x0014($sp) -/* 012A4 80A30424 AFAF0010 */ sw $t7, 0x0010($sp) -/* 012A8 80A30428 AFA0001C */ sw $zero, 0x001C($sp) +/* 01294 80A30414 00034900 */ sll $t1, $v1, 4 +/* 01298 80A30418 012A8021 */ addu $s0, $t1, $t2 +/* 0129C 80A3041C AFB90018 */ sw $t9, 0x0018($sp) +/* 012A0 80A30420 AFB80014 */ sw $t8, 0x0014($sp) +/* 012A4 80A30424 AFAF0010 */ sw $t7, 0x0010($sp) +/* 012A8 80A30428 AFA0001C */ sw $zero, 0x001C($sp) /* 012AC 80A3042C 860B000C */ lh $t3, 0x000C($s0) ## 0000000C /* 012B0 80A30430 850C0380 */ lh $t4, 0x0380($t0) ## 00000380 /* 012B4 80A30434 24180080 */ addiu $t8, $zero, 0x0080 ## $t8 = 00000080 -/* 012B8 80A30438 AFB80028 */ sw $t8, 0x0028($sp) -/* 012BC 80A3043C 016C0019 */ multu $t3, $t4 -/* 012C0 80A30440 AFAF0024 */ sw $t7, 0x0024($sp) +/* 012B8 80A30438 AFB80028 */ sw $t8, 0x0028($sp) +/* 012BC 80A3043C 016C0019 */ multu $t3, $t4 +/* 012C0 80A30440 AFAF0024 */ sw $t7, 0x0024($sp) /* 012C4 80A30444 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 012C8 80A30448 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 /* 012CC 80A3044C 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 /* 012D0 80A30450 00409025 */ or $s2, $v0, $zero ## $s2 = 00000000 -/* 012D4 80A30454 00006812 */ mflo $t5 +/* 012D4 80A30454 00006812 */ mflo $t5 /* 012D8 80A30458 31AE01FF */ andi $t6, $t5, 0x01FF ## $t6 = 00000000 -/* 012DC 80A3045C 0C0253D0 */ jal Draw_TwoTexScroll -/* 012E0 80A30460 AFAE0020 */ sw $t6, 0x0020($sp) +/* 012DC 80A3045C 0C0253D0 */ jal Gfx_TwoTexScroll +/* 012E0 80A30460 AFAE0020 */ sw $t6, 0x0020($sp) /* 012E4 80A30464 AE420004 */ sw $v0, 0x0004($s2) ## 00000004 /* 012E8 80A30468 8E2202D0 */ lw $v0, 0x02D0($s1) ## 000002D0 /* 012EC 80A3046C 3C09DB06 */ lui $t1, 0xDB06 ## $t1 = DB060000 @@ -79,16 +79,16 @@ glabel func_80A30350 /* 01300 80A30480 8E040008 */ lw $a0, 0x0008($s0) ## 00000008 /* 01304 80A30484 3C0E8016 */ lui $t6, 0x8016 ## $t6 = 80160000 /* 01308 80A30488 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 -/* 0130C 80A3048C 00045900 */ sll $t3, $a0, 4 -/* 01310 80A30490 000B6702 */ srl $t4, $t3, 28 -/* 01314 80A30494 000C6880 */ sll $t5, $t4, 2 -/* 01318 80A30498 01CD7021 */ addu $t6, $t6, $t5 +/* 0130C 80A3048C 00045900 */ sll $t3, $a0, 4 +/* 01310 80A30490 000B6702 */ srl $t4, $t3, 28 +/* 01314 80A30494 000C6880 */ sll $t5, $t4, 2 +/* 01318 80A30498 01CD7021 */ addu $t6, $t6, $t5 /* 0131C 80A3049C 8DCE6FA8 */ lw $t6, 0x6FA8($t6) ## 80166FA8 /* 01320 80A304A0 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF -/* 01324 80A304A4 00815024 */ and $t2, $a0, $at +/* 01324 80A304A4 00815024 */ and $t2, $a0, $at /* 01328 80A304A8 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 0132C 80A304AC 014E7821 */ addu $t7, $t2, $t6 -/* 01330 80A304B0 01E1C021 */ addu $t8, $t7, $at +/* 0132C 80A304AC 014E7821 */ addu $t7, $t2, $t6 +/* 01330 80A304B0 01E1C021 */ addu $t8, $t7, $at /* 01334 80A304B4 AC580004 */ sw $t8, 0x0004($v0) ## 00000004 /* 01338 80A304B8 8E2202D0 */ lw $v0, 0x02D0($s1) ## 000002D0 /* 0133C 80A304BC 3C09FA00 */ lui $t1, 0xFA00 ## $t1 = FA000000 @@ -99,12 +99,12 @@ glabel func_80A30350 /* 01350 80A304D0 920A0000 */ lbu $t2, 0x0000($s0) ## 00000000 /* 01354 80A304D4 920C0003 */ lbu $t4, 0x0003($s0) ## 00000003 /* 01358 80A304D8 92190001 */ lbu $t9, 0x0001($s0) ## 00000001 -/* 0135C 80A304DC 000A7600 */ sll $t6, $t2, 24 +/* 0135C 80A304DC 000A7600 */ sll $t6, $t2, 24 /* 01360 80A304E0 920A0002 */ lbu $t2, 0x0002($s0) ## 00000002 /* 01364 80A304E4 018E7825 */ or $t7, $t4, $t6 ## $t7 = 80160000 -/* 01368 80A304E8 00194C00 */ sll $t1, $t9, 16 +/* 01368 80A304E8 00194C00 */ sll $t1, $t9, 16 /* 0136C 80A304EC 01E95825 */ or $t3, $t7, $t1 ## $t3 = FA168080 -/* 01370 80A304F0 000A6200 */ sll $t4, $t2, 8 +/* 01370 80A304F0 000A6200 */ sll $t4, $t2, 8 /* 01374 80A304F4 016C7025 */ or $t6, $t3, $t4 ## $t6 = FA168080 /* 01378 80A304F8 AC4E0004 */ sw $t6, 0x0004($v0) ## 00000004 /* 0137C 80A304FC 8E2202D0 */ lw $v0, 0x02D0($s1) ## 000002D0 @@ -115,34 +115,34 @@ glabel func_80A30350 /* 01390 80A30510 920A0004 */ lbu $t2, 0x0004($s0) ## 00000004 /* 01394 80A30514 92090007 */ lbu $t1, 0x0007($s0) ## 00000007 /* 01398 80A30518 92180005 */ lbu $t8, 0x0005($s0) ## 00000005 -/* 0139C 80A3051C 000A5E00 */ sll $t3, $t2, 24 +/* 0139C 80A3051C 000A5E00 */ sll $t3, $t2, 24 /* 013A0 80A30520 920A0006 */ lbu $t2, 0x0006($s0) ## 00000006 /* 013A4 80A30524 012B6025 */ or $t4, $t1, $t3 ## $t4 = FA168080 -/* 013A8 80A30528 0018CC00 */ sll $t9, $t8, 16 +/* 013A8 80A30528 0018CC00 */ sll $t9, $t8, 16 /* 013AC 80A3052C 01997825 */ or $t7, $t4, $t9 ## $t7 = FB168080 -/* 013B0 80A30530 000A4A00 */ sll $t1, $t2, 8 +/* 013B0 80A30530 000A4A00 */ sll $t1, $t2, 8 /* 013B4 80A30534 01E95825 */ or $t3, $t7, $t1 ## $t3 = FB168080 -/* 013B8 80A30538 0C034213 */ jal Matrix_Push +/* 013B8 80A30538 0C034213 */ jal Matrix_Push /* 013BC 80A3053C AC4B0004 */ sw $t3, 0x0004($v0) ## 00000004 /* 013C0 80A30540 C66C0390 */ lwc1 $f12, 0x0390($s3) ## 00000390 /* 013C4 80A30544 C66E0394 */ lwc1 $f14, 0x0394($s3) ## 00000394 /* 013C8 80A30548 8E660398 */ lw $a2, 0x0398($s3) ## 00000398 -/* 013CC 80A3054C 0C034261 */ jal Matrix_Translate +/* 013CC 80A3054C 0C034261 */ jal Matrix_Translate /* 013D0 80A30550 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 013D4 80A30554 0C0347F5 */ jal func_800D1FD4 +/* 013D4 80A30554 0C0347F5 */ jal func_800D1FD4 /* 013D8 80A30558 02C02025 */ or $a0, $s6, $zero ## $a0 = 00000000 /* 013DC 80A3055C 926E038C */ lbu $t6, 0x038C($s3) ## 0000038C /* 013E0 80A30560 00002025 */ or $a0, $zero, $zero ## $a0 = 00000000 /* 013E4 80A30564 24058000 */ addiu $a1, $zero, 0x8000 ## $a1 = FFFF8000 -/* 013E8 80A30568 11C00003 */ beq $t6, $zero, .L80A30578 +/* 013E8 80A30568 11C00003 */ beq $t6, $zero, .L80A30578 /* 013EC 80A3056C 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 013F0 80A30570 0C034421 */ jal Matrix_RotateXYZ +/* 013F0 80A30570 0C034421 */ jal Matrix_RotateZYX /* 013F4 80A30574 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 .L80A30578: -/* 013F8 80A30578 4406B000 */ mfc1 $a2, $f22 -/* 013FC 80A3057C 4600A306 */ mov.s $f12, $f20 -/* 01400 80A30580 4600A386 */ mov.s $f14, $f20 -/* 01404 80A30584 0C0342A3 */ jal Matrix_Scale +/* 013F8 80A30578 4406B000 */ mfc1 $a2, $f22 +/* 013FC 80A3057C 4600A306 */ mov.s $f12, $f20 +/* 01400 80A30580 4600A386 */ mov.s $f14, $f20 +/* 01404 80A30584 0C0342A3 */ jal Matrix_Scale /* 01408 80A30588 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 /* 0140C 80A3058C 8E2202D0 */ lw $v0, 0x02D0($s1) ## 000002D0 /* 01410 80A30590 3C0CDA38 */ lui $t4, 0xDA38 ## $t4 = DA380000 @@ -154,7 +154,7 @@ glabel func_80A30350 /* 01428 80A305A8 8EA40000 */ lw $a0, 0x0000($s5) ## 00000000 /* 0142C 80A305AC 24A507D0 */ addiu $a1, $a1, %lo(D_80A307D0) ## $a1 = 80A307D0 /* 01430 80A305B0 240603BB */ addiu $a2, $zero, 0x03BB ## $a2 = 000003BB -/* 01434 80A305B4 0C0346A2 */ jal Matrix_NewMtx +/* 01434 80A305B4 0C0346A2 */ jal Matrix_NewMtx /* 01438 80A305B8 00408025 */ or $s0, $v0, $zero ## $s0 = 00000000 /* 0143C 80A305BC AE020004 */ sw $v0, 0x0004($s0) ## 00000004 /* 01440 80A305C0 8E2202D0 */ lw $v0, 0x02D0($s1) ## 000002D0 @@ -162,31 +162,31 @@ glabel func_80A30350 /* 01448 80A305C8 24590008 */ addiu $t9, $v0, 0x0008 ## $t9 = 00000008 /* 0144C 80A305CC AE3902D0 */ sw $t9, 0x02D0($s1) ## 000002D0 /* 01450 80A305D0 AC570004 */ sw $s7, 0x0004($v0) ## 00000004 -/* 01454 80A305D4 0C034221 */ jal Matrix_Pull +/* 01454 80A305D4 0C034221 */ jal Matrix_Pull /* 01458 80A305D8 AC4D0000 */ sw $t5, 0x0000($v0) ## 00000000 /* 0145C 80A305DC 2694002C */ addiu $s4, $s4, 0x002C ## $s4 = 0000002C /* 01460 80A305E0 240100B0 */ addiu $at, $zero, 0x00B0 ## $at = 000000B0 -/* 01464 80A305E4 1681FF7F */ bne $s4, $at, .L80A303E4 +/* 01464 80A305E4 1681FF7F */ bne $s4, $at, .L80A303E4 /* 01468 80A305E8 2673002C */ addiu $s3, $s3, 0x002C ## $s3 = 0000002C /* 0146C 80A305EC 3C0680A3 */ lui $a2, %hi(D_80A307E0) ## $a2 = 80A30000 /* 01470 80A305F0 24C607E0 */ addiu $a2, $a2, %lo(D_80A307E0) ## $a2 = 80A307E0 /* 01474 80A305F4 27A400A4 */ addiu $a0, $sp, 0x00A4 ## $a0 = FFFFFFE4 /* 01478 80A305F8 8EA50000 */ lw $a1, 0x0000($s5) ## 00000000 -/* 0147C 80A305FC 0C031AD5 */ jal func_800C6B54 +/* 0147C 80A305FC 0C031AD5 */ jal Graph_CloseDisps /* 01480 80A30600 240703C2 */ addiu $a3, $zero, 0x03C2 ## $a3 = 000003C2 -/* 01484 80A30604 8FBF006C */ lw $ra, 0x006C($sp) -/* 01488 80A30608 D7B40038 */ ldc1 $f20, 0x0038($sp) -/* 0148C 80A3060C D7B60040 */ ldc1 $f22, 0x0040($sp) -/* 01490 80A30610 8FB00048 */ lw $s0, 0x0048($sp) -/* 01494 80A30614 8FB1004C */ lw $s1, 0x004C($sp) -/* 01498 80A30618 8FB20050 */ lw $s2, 0x0050($sp) -/* 0149C 80A3061C 8FB30054 */ lw $s3, 0x0054($sp) -/* 014A0 80A30620 8FB40058 */ lw $s4, 0x0058($sp) -/* 014A4 80A30624 8FB5005C */ lw $s5, 0x005C($sp) -/* 014A8 80A30628 8FB60060 */ lw $s6, 0x0060($sp) -/* 014AC 80A3062C 8FB70064 */ lw $s7, 0x0064($sp) -/* 014B0 80A30630 8FBE0068 */ lw $s8, 0x0068($sp) -/* 014B4 80A30634 03E00008 */ jr $ra +/* 01484 80A30604 8FBF006C */ lw $ra, 0x006C($sp) +/* 01488 80A30608 D7B40038 */ ldc1 $f20, 0x0038($sp) +/* 0148C 80A3060C D7B60040 */ ldc1 $f22, 0x0040($sp) +/* 01490 80A30610 8FB00048 */ lw $s0, 0x0048($sp) +/* 01494 80A30614 8FB1004C */ lw $s1, 0x004C($sp) +/* 01498 80A30618 8FB20050 */ lw $s2, 0x0050($sp) +/* 0149C 80A3061C 8FB30054 */ lw $s3, 0x0054($sp) +/* 014A0 80A30620 8FB40058 */ lw $s4, 0x0058($sp) +/* 014A4 80A30624 8FB5005C */ lw $s5, 0x005C($sp) +/* 014A8 80A30628 8FB60060 */ lw $s6, 0x0060($sp) +/* 014AC 80A3062C 8FB70064 */ lw $s7, 0x0064($sp) +/* 014B0 80A30630 8FBE0068 */ lw $s8, 0x0068($sp) +/* 014B4 80A30634 03E00008 */ jr $ra /* 014B8 80A30638 27BD00C0 */ addiu $sp, $sp, 0x00C0 ## $sp = 00000000 /* 014BC 80A3063C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ge1/EnGe1_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Ge1/EnGe1_Draw.s index a490069686..a7bb8a689d 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ge1/EnGe1_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ge1/EnGe1_Draw.s @@ -1,20 +1,20 @@ glabel EnGe1_Draw /* 01CD8 80A32648 27BDFFA8 */ addiu $sp, $sp, 0xFFA8 ## $sp = FFFFFFA8 -/* 01CDC 80A3264C AFBF002C */ sw $ra, 0x002C($sp) -/* 01CE0 80A32650 AFB00028 */ sw $s0, 0x0028($sp) -/* 01CE4 80A32654 AFA5005C */ sw $a1, 0x005C($sp) +/* 01CDC 80A3264C AFBF002C */ sw $ra, 0x002C($sp) +/* 01CE0 80A32650 AFB00028 */ sw $s0, 0x0028($sp) +/* 01CE4 80A32654 AFA5005C */ sw $a1, 0x005C($sp) /* 01CE8 80A32658 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 /* 01CEC 80A3265C 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 01CF0 80A32660 3C0680A3 */ lui $a2, %hi(D_80A328A8) ## $a2 = 80A30000 /* 01CF4 80A32664 24C628A8 */ addiu $a2, $a2, %lo(D_80A328A8) ## $a2 = 80A328A8 /* 01CF8 80A32668 27A4003C */ addiu $a0, $sp, 0x003C ## $a0 = FFFFFFE4 /* 01CFC 80A3266C 240705A2 */ addiu $a3, $zero, 0x05A2 ## $a3 = 000005A2 -/* 01D00 80A32670 0C031AB1 */ jal func_800C6AC4 -/* 01D04 80A32674 AFA5004C */ sw $a1, 0x004C($sp) -/* 01D08 80A32678 8FAF005C */ lw $t7, 0x005C($sp) -/* 01D0C 80A3267C 0C0250F2 */ jal func_800943C8 +/* 01D00 80A32670 0C031AB1 */ jal Graph_OpenDisps +/* 01D04 80A32674 AFA5004C */ sw $a1, 0x004C($sp) +/* 01D08 80A32678 8FAF005C */ lw $t7, 0x005C($sp) +/* 01D0C 80A3267C 0C0250F2 */ jal func_800943C8 /* 01D10 80A32680 8DE40000 */ lw $a0, 0x0000($t7) ## 00000000 -/* 01D14 80A32684 8FA5004C */ lw $a1, 0x004C($sp) +/* 01D14 80A32684 8FA5004C */ lw $a1, 0x004C($sp) /* 01D18 80A32688 3C19DB06 */ lui $t9, 0xDB06 ## $t9 = DB060000 /* 01D1C 80A3268C 37390020 */ ori $t9, $t9, 0x0020 ## $t9 = DB060020 /* 01D20 80A32690 8CA302C0 */ lw $v1, 0x02C0($a1) ## 000002C0 @@ -26,42 +26,42 @@ glabel EnGe1_Draw /* 01D38 80A326A8 860802A8 */ lh $t0, 0x02A8($s0) ## 000002A8 /* 01D3C 80A326AC 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 /* 01D40 80A326B0 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF -/* 01D44 80A326B4 00084880 */ sll $t1, $t0, 2 -/* 01D48 80A326B8 00892021 */ addu $a0, $a0, $t1 -/* 01D4C 80A326BC 8C8427B4 */ lw $a0, %lo(D_80A327B4)($a0) +/* 01D44 80A326B4 00084880 */ sll $t1, $t0, 2 +/* 01D48 80A326B8 00892021 */ addu $a0, $a0, $t1 +/* 01D4C 80A326BC 8C8427B4 */ lw $a0, %lo(D_80A327B4)($a0) /* 01D50 80A326C0 3C0880A3 */ lui $t0, %hi(func_80A32598) ## $t0 = 80A30000 /* 01D54 80A326C4 3C1980A3 */ lui $t9, %hi(func_80A32444) ## $t9 = 80A30000 -/* 01D58 80A326C8 00045900 */ sll $t3, $a0, 4 -/* 01D5C 80A326CC 000B6702 */ srl $t4, $t3, 28 -/* 01D60 80A326D0 000C6880 */ sll $t5, $t4, 2 -/* 01D64 80A326D4 01CD7021 */ addu $t6, $t6, $t5 +/* 01D58 80A326C8 00045900 */ sll $t3, $a0, 4 +/* 01D5C 80A326CC 000B6702 */ srl $t4, $t3, 28 +/* 01D60 80A326D0 000C6880 */ sll $t5, $t4, 2 +/* 01D64 80A326D4 01CD7021 */ addu $t6, $t6, $t5 /* 01D68 80A326D8 8DCE6FA8 */ lw $t6, 0x6FA8($t6) ## 80166FA8 -/* 01D6C 80A326DC 00815024 */ and $t2, $a0, $at +/* 01D6C 80A326DC 00815024 */ and $t2, $a0, $at /* 01D70 80A326E0 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 01D74 80A326E4 014E7821 */ addu $t7, $t2, $t6 -/* 01D78 80A326E8 01E1C021 */ addu $t8, $t7, $at +/* 01D74 80A326E4 014E7821 */ addu $t7, $t2, $t6 +/* 01D78 80A326E8 01E1C021 */ addu $t8, $t7, $at /* 01D7C 80A326EC AC780004 */ sw $t8, 0x0004($v1) ## 00000004 /* 01D80 80A326F0 9207019A */ lbu $a3, 0x019A($s0) ## 0000019A /* 01D84 80A326F4 8E0601B8 */ lw $a2, 0x01B8($s0) ## 000001B8 /* 01D88 80A326F8 8E05019C */ lw $a1, 0x019C($s0) ## 0000019C /* 01D8C 80A326FC 27392444 */ addiu $t9, $t9, %lo(func_80A32444) ## $t9 = 80A32444 /* 01D90 80A32700 25082598 */ addiu $t0, $t0, %lo(func_80A32598) ## $t0 = 80A32598 -/* 01D94 80A32704 AFA80014 */ sw $t0, 0x0014($sp) -/* 01D98 80A32708 AFB90010 */ sw $t9, 0x0010($sp) -/* 01D9C 80A3270C AFB00018 */ sw $s0, 0x0018($sp) -/* 01DA0 80A32710 0C0286B2 */ jal func_800A1AC8 -/* 01DA4 80A32714 8FA4005C */ lw $a0, 0x005C($sp) -/* 01DA8 80A32718 8FA9005C */ lw $t1, 0x005C($sp) +/* 01D94 80A32704 AFA80014 */ sw $t0, 0x0014($sp) +/* 01D98 80A32708 AFB90010 */ sw $t9, 0x0010($sp) +/* 01D9C 80A3270C AFB00018 */ sw $s0, 0x0018($sp) +/* 01DA0 80A32710 0C0286B2 */ jal SkelAnime_DrawSV +/* 01DA4 80A32714 8FA4005C */ lw $a0, 0x005C($sp) +/* 01DA8 80A32718 8FA9005C */ lw $t1, 0x005C($sp) /* 01DAC 80A3271C 3C0680A3 */ lui $a2, %hi(D_80A328B8) ## $a2 = 80A30000 /* 01DB0 80A32720 24C628B8 */ addiu $a2, $a2, %lo(D_80A328B8) ## $a2 = 80A328B8 /* 01DB4 80A32724 27A4003C */ addiu $a0, $sp, 0x003C ## $a0 = FFFFFFE4 /* 01DB8 80A32728 240705B3 */ addiu $a3, $zero, 0x05B3 ## $a3 = 000005B3 -/* 01DBC 80A3272C 0C031AD5 */ jal func_800C6B54 +/* 01DBC 80A3272C 0C031AD5 */ jal Graph_CloseDisps /* 01DC0 80A32730 8D250000 */ lw $a1, 0x0000($t1) ## 00000000 -/* 01DC4 80A32734 8FBF002C */ lw $ra, 0x002C($sp) -/* 01DC8 80A32738 8FB00028 */ lw $s0, 0x0028($sp) +/* 01DC4 80A32734 8FBF002C */ lw $ra, 0x002C($sp) +/* 01DC8 80A32738 8FB00028 */ lw $s0, 0x0028($sp) /* 01DCC 80A3273C 27BD0058 */ addiu $sp, $sp, 0x0058 ## $sp = 00000000 -/* 01DD0 80A32740 03E00008 */ jr $ra +/* 01DD0 80A32740 03E00008 */ jr $ra /* 01DD4 80A32744 00000000 */ nop /* 01DD8 80A32748 00000000 */ nop /* 01DDC 80A3274C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ge1/EnGe1_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Ge1/EnGe1_Init.s index 62500eccb2..7ff16b2da0 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ge1/EnGe1_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ge1/EnGe1_Init.s @@ -1,15 +1,15 @@ glabel EnGe1_Init /* 00000 80A30970 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 -/* 00004 80A30974 AFB00028 */ sw $s0, 0x0028($sp) +/* 00004 80A30974 AFB00028 */ sw $s0, 0x0028($sp) /* 00008 80A30978 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 0000C 80A3097C AFBF002C */ sw $ra, 0x002C($sp) -/* 00010 80A30980 AFA50044 */ sw $a1, 0x0044($sp) +/* 0000C 80A3097C AFBF002C */ sw $ra, 0x002C($sp) +/* 00010 80A30980 AFA50044 */ sw $a1, 0x0044($sp) /* 00014 80A30984 3C068003 */ lui $a2, 0x8003 ## $a2 = 80030000 /* 00018 80A30988 24C6B5EC */ addiu $a2, $a2, 0xB5EC ## $a2 = 8002B5EC /* 0001C 80A3098C 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 /* 00020 80A30990 248400B4 */ addiu $a0, $a0, 0x00B4 ## $a0 = 000000B4 /* 00024 80A30994 0C00AC78 */ jal ActorShape_Init - + /* 00028 80A30998 3C0741F0 */ lui $a3, 0x41F0 ## $a3 = 41F00000 /* 0002C 80A3099C 26050198 */ addiu $a1, $s0, 0x0198 ## $a1 = 00000198 /* 00030 80A309A0 3C060600 */ lui $a2, 0x0600 ## $a2 = 06000000 @@ -17,29 +17,29 @@ glabel EnGe1_Init /* 00038 80A309A8 260E01DC */ addiu $t6, $s0, 0x01DC ## $t6 = 000001DC /* 0003C 80A309AC 260F023C */ addiu $t7, $s0, 0x023C ## $t7 = 0000023C /* 00040 80A309B0 24180010 */ addiu $t8, $zero, 0x0010 ## $t8 = 00000010 -/* 00044 80A309B4 AFB80018 */ sw $t8, 0x0018($sp) -/* 00048 80A309B8 AFAF0014 */ sw $t7, 0x0014($sp) -/* 0004C 80A309BC AFAE0010 */ sw $t6, 0x0010($sp) +/* 00044 80A309B4 AFB80018 */ sw $t8, 0x0018($sp) +/* 00048 80A309B8 AFAF0014 */ sw $t7, 0x0014($sp) +/* 0004C 80A309BC AFAE0010 */ sw $t6, 0x0010($sp) /* 00050 80A309C0 24E70228 */ addiu $a3, $a3, 0x0228 ## $a3 = 06000228 /* 00054 80A309C4 24C60330 */ addiu $a2, $a2, 0x0330 ## $a2 = 06000330 -/* 00058 80A309C8 AFA50030 */ sw $a1, 0x0030($sp) -/* 0005C 80A309CC 0C0291BE */ jal func_800A46F8 -/* 00060 80A309D0 8FA40044 */ lw $a0, 0x0044($sp) +/* 00058 80A309C8 AFA50030 */ sw $a1, 0x0030($sp) +/* 0005C 80A309CC 0C0291BE */ jal SkelAnime_InitSV +/* 00060 80A309D0 8FA40044 */ lw $a0, 0x0044($sp) /* 00064 80A309D4 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 00068 80A309D8 24A50228 */ addiu $a1, $a1, 0x0228 ## $a1 = 06000228 -/* 0006C 80A309DC 0C02947A */ jal func_800A51E8 -/* 00070 80A309E0 8FA40030 */ lw $a0, 0x0030($sp) +/* 0006C 80A309DC 0C02947A */ jal SkelAnime_ChangeAnimDefaultStop +/* 00070 80A309E0 8FA40030 */ lw $a0, 0x0030($sp) /* 00074 80A309E4 2605014C */ addiu $a1, $s0, 0x014C ## $a1 = 0000014C -/* 00078 80A309E8 AFA50030 */ sw $a1, 0x0030($sp) +/* 00078 80A309E8 AFA50030 */ sw $a1, 0x0030($sp) /* 0007C 80A309EC 0C0170D9 */ jal ActorCollider_AllocCylinder - -/* 00080 80A309F0 8FA40044 */ lw $a0, 0x0044($sp) + +/* 00080 80A309F0 8FA40044 */ lw $a0, 0x0044($sp) /* 00084 80A309F4 3C0780A3 */ lui $a3, %hi(D_80A32770) ## $a3 = 80A30000 -/* 00088 80A309F8 8FA50030 */ lw $a1, 0x0030($sp) +/* 00088 80A309F8 8FA50030 */ lw $a1, 0x0030($sp) /* 0008C 80A309FC 24E72770 */ addiu $a3, $a3, %lo(D_80A32770) ## $a3 = 80A32770 -/* 00090 80A30A00 8FA40044 */ lw $a0, 0x0044($sp) +/* 00090 80A30A00 8FA40044 */ lw $a0, 0x0044($sp) /* 00094 80A30A04 0C01712B */ jal ActorCollider_InitCylinder - + /* 00098 80A30A08 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 0009C 80A30A0C 3C080600 */ lui $t0, 0x0600 ## $t0 = 06000000 /* 000A0 80A30A10 3C0980A3 */ lui $t1, %hi(func_80A323B0) ## $t1 = 80A30000 @@ -54,18 +54,18 @@ glabel EnGe1_Init /* 000C4 80A30A34 A20A001F */ sb $t2, 0x001F($s0) ## 0000001F /* 000C8 80A30A38 34A5D70A */ ori $a1, $a1, 0xD70A ## $a1 = 3C23D70A /* 000CC 80A30A3C 0C00B58B */ jal Actor_SetScale - + /* 000D0 80A30A40 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 000D4 80A30A44 8FAB0044 */ lw $t3, 0x0044($sp) +/* 000D4 80A30A44 8FAB0044 */ lw $t3, 0x0044($sp) /* 000D8 80A30A48 2401005A */ addiu $at, $zero, 0x005A ## $at = 0000005A /* 000DC 80A30A4C 3C0E80A3 */ lui $t6, %hi(func_80A31880) ## $t6 = 80A30000 /* 000E0 80A30A50 856C00A4 */ lh $t4, 0x00A4($t3) ## 000000A4 /* 000E4 80A30A54 240D0002 */ addiu $t5, $zero, 0x0002 ## $t5 = 00000002 /* 000E8 80A30A58 25CE1880 */ addiu $t6, $t6, %lo(func_80A31880) ## $t6 = 80A31880 -/* 000EC 80A30A5C 15810004 */ bne $t4, $at, .L80A30A70 +/* 000EC 80A30A5C 15810004 */ bne $t4, $at, .L80A30A70 /* 000F0 80A30A60 3C01447A */ lui $at, 0x447A ## $at = 447A0000 /* 000F4 80A30A64 44812000 */ mtc1 $at, $f4 ## $f4 = 1000.00 -/* 000F8 80A30A68 10000005 */ beq $zero, $zero, .L80A30A80 +/* 000F8 80A30A68 10000005 */ beq $zero, $zero, .L80A30A80 /* 000FC 80A30A6C E60400F4 */ swc1 $f4, 0x00F4($s0) ## 000000F4 .L80A30A70: /* 00100 80A30A70 3C014496 */ lui $at, 0x4496 ## $at = 44960000 @@ -76,124 +76,124 @@ glabel EnGe1_Init /* 00110 80A30A80 8602001C */ lh $v0, 0x001C($s0) ## 0000001C /* 00114 80A30A84 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 /* 00118 80A30A88 304200FF */ andi $v0, $v0, 0x00FF ## $v0 = 00000000 -/* 0011C 80A30A8C 50400012 */ beql $v0, $zero, .L80A30AD8 +/* 0011C 80A30A8C 50400012 */ beql $v0, $zero, .L80A30AD8 /* 00120 80A30A90 A20D02AE */ sb $t5, 0x02AE($s0) ## 000002AE -/* 00124 80A30A94 10410012 */ beq $v0, $at, .L80A30AE0 +/* 00124 80A30A94 10410012 */ beq $v0, $at, .L80A30AE0 /* 00128 80A30A98 240F0001 */ addiu $t7, $zero, 0x0001 ## $t7 = 00000001 /* 0012C 80A30A9C 24010004 */ addiu $at, $zero, 0x0004 ## $at = 00000004 -/* 00130 80A30AA0 1041001A */ beq $v0, $at, .L80A30B0C +/* 00130 80A30AA0 1041001A */ beq $v0, $at, .L80A30B0C /* 00134 80A30AA4 24080001 */ addiu $t0, $zero, 0x0001 ## $t0 = 00000001 /* 00138 80A30AA8 24010005 */ addiu $at, $zero, 0x0005 ## $at = 00000005 -/* 0013C 80A30AAC 10410022 */ beq $v0, $at, .L80A30B38 +/* 0013C 80A30AAC 10410022 */ beq $v0, $at, .L80A30B38 /* 00140 80A30AB0 3C0B8016 */ lui $t3, 0x8016 ## $t3 = 80160000 /* 00144 80A30AB4 24010045 */ addiu $at, $zero, 0x0045 ## $at = 00000045 -/* 00148 80A30AB8 1041002D */ beq $v0, $at, .L80A30B70 +/* 00148 80A30AB8 1041002D */ beq $v0, $at, .L80A30B70 /* 0014C 80A30ABC 3C0D8012 */ lui $t5, 0x8012 ## $t5 = 80120000 /* 00150 80A30AC0 24010046 */ addiu $at, $zero, 0x0046 ## $at = 00000046 -/* 00154 80A30AC4 10410050 */ beq $v0, $at, .L80A30C08 +/* 00154 80A30AC4 10410050 */ beq $v0, $at, .L80A30C08 /* 00158 80A30AC8 240C0001 */ addiu $t4, $zero, 0x0001 ## $t4 = 00000001 -/* 0015C 80A30ACC 10000059 */ beq $zero, $zero, .L80A30C34 +/* 0015C 80A30ACC 10000059 */ beq $zero, $zero, .L80A30C34 /* 00160 80A30AD0 A60002AC */ sh $zero, 0x02AC($s0) ## 000002AC /* 00164 80A30AD4 A20D02AE */ sb $t5, 0x02AE($s0) ## 000002AE .L80A30AD8: -/* 00168 80A30AD8 10000055 */ beq $zero, $zero, .L80A30C30 +/* 00168 80A30AD8 10000055 */ beq $zero, $zero, .L80A30C30 /* 0016C 80A30ADC AE0E02B4 */ sw $t6, 0x02B4($s0) ## 000002B4 .L80A30AE0: -/* 00170 80A30AE0 0C28C373 */ jal func_80A30DCC +/* 00170 80A30AE0 0C28C373 */ jal func_80A30DCC /* 00174 80A30AE4 A20F02AE */ sb $t7, 0x02AE($s0) ## 000002AE -/* 00178 80A30AE8 10400005 */ beq $v0, $zero, .L80A30B00 +/* 00178 80A30AE8 10400005 */ beq $v0, $zero, .L80A30B00 /* 0017C 80A30AEC 3C1980A3 */ lui $t9, %hi(func_80A30F48) ## $t9 = 80A30000 /* 00180 80A30AF0 3C1880A3 */ lui $t8, %hi(func_80A317C0) ## $t8 = 80A30000 /* 00184 80A30AF4 271817C0 */ addiu $t8, $t8, %lo(func_80A317C0) ## $t8 = 80A317C0 -/* 00188 80A30AF8 1000004D */ beq $zero, $zero, .L80A30C30 +/* 00188 80A30AF8 1000004D */ beq $zero, $zero, .L80A30C30 /* 0018C 80A30AFC AE1802B4 */ sw $t8, 0x02B4($s0) ## 000002B4 .L80A30B00: /* 00190 80A30B00 27390F48 */ addiu $t9, $t9, %lo(func_80A30F48) ## $t9 = 80A30F48 -/* 00194 80A30B04 1000004A */ beq $zero, $zero, .L80A30C30 +/* 00194 80A30B04 1000004A */ beq $zero, $zero, .L80A30C30 /* 00198 80A30B08 AE1902B4 */ sw $t9, 0x02B4($s0) ## 000002B4 .L80A30B0C: -/* 0019C 80A30B0C 0C28C373 */ jal func_80A30DCC +/* 0019C 80A30B0C 0C28C373 */ jal func_80A30DCC /* 001A0 80A30B10 A20802AE */ sb $t0, 0x02AE($s0) ## 000002AE -/* 001A4 80A30B14 10400005 */ beq $v0, $zero, .L80A30B2C +/* 001A4 80A30B14 10400005 */ beq $v0, $zero, .L80A30B2C /* 001A8 80A30B18 3C0A80A3 */ lui $t2, %hi(func_80A310C4) ## $t2 = 80A30000 /* 001AC 80A30B1C 3C0980A3 */ lui $t1, %hi(func_80A31094) ## $t1 = 80A30000 /* 001B0 80A30B20 25291094 */ addiu $t1, $t1, %lo(func_80A31094) ## $t1 = 80A31094 -/* 001B4 80A30B24 10000042 */ beq $zero, $zero, .L80A30C30 +/* 001B4 80A30B24 10000042 */ beq $zero, $zero, .L80A30C30 /* 001B8 80A30B28 AE0902B4 */ sw $t1, 0x02B4($s0) ## 000002B4 .L80A30B2C: /* 001BC 80A30B2C 254A10C4 */ addiu $t2, $t2, %lo(func_80A310C4) ## $t2 = 80A310C4 -/* 001C0 80A30B30 1000003F */ beq $zero, $zero, .L80A30C30 +/* 001C0 80A30B30 1000003F */ beq $zero, $zero, .L80A30C30 /* 001C4 80A30B34 AE0A02B4 */ sw $t2, 0x02B4($s0) ## 000002B4 .L80A30B38: /* 001C8 80A30B38 8D6BE664 */ lw $t3, -0x199C($t3) ## FFFFE664 /* 001CC 80A30B3C 3C0C80A3 */ lui $t4, %hi(func_80A3118C) ## $t4 = 80A30000 /* 001D0 80A30B40 3C0480A3 */ lui $a0, %hi(D_80A327C0) ## $a0 = 80A30000 -/* 001D4 80A30B44 15600007 */ bne $t3, $zero, .L80A30B64 +/* 001D4 80A30B44 15600007 */ bne $t3, $zero, .L80A30B64 /* 001D8 80A30B48 258C118C */ addiu $t4, $t4, %lo(func_80A3118C) ## $t4 = 80A3118C /* 001DC 80A30B4C 0C00084C */ jal osSyncPrintf - + /* 001E0 80A30B50 248427C0 */ addiu $a0, $a0, %lo(D_80A327C0) ## $a0 = 80A327C0 /* 001E4 80A30B54 0C00B55C */ jal Actor_Kill - + /* 001E8 80A30B58 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 001EC 80A30B5C 10000036 */ beq $zero, $zero, .L80A30C38 -/* 001F0 80A30B60 8FBF002C */ lw $ra, 0x002C($sp) +/* 001EC 80A30B5C 10000036 */ beq $zero, $zero, .L80A30C38 +/* 001F0 80A30B60 8FBF002C */ lw $ra, 0x002C($sp) .L80A30B64: /* 001F4 80A30B64 A20002AE */ sb $zero, 0x02AE($s0) ## 000002AE -/* 001F8 80A30B68 10000031 */ beq $zero, $zero, .L80A30C30 +/* 001F8 80A30B68 10000031 */ beq $zero, $zero, .L80A30C30 /* 001FC 80A30B6C AE0C02B4 */ sw $t4, 0x02B4($s0) ## 000002B4 .L80A30B70: /* 00200 80A30B70 91AD7467 */ lbu $t5, 0x7467($t5) ## 00007467 /* 00204 80A30B74 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 /* 00208 80A30B78 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 -/* 0020C 80A30B7C 004D7021 */ addu $t6, $v0, $t5 +/* 0020C 80A30B7C 004D7021 */ addu $t6, $v0, $t5 /* 00210 80A30B80 91CF0074 */ lbu $t7, 0x0074($t6) ## 00000074 /* 00214 80A30B84 240100FF */ addiu $at, $zero, 0x00FF ## $at = 000000FF /* 00218 80A30B88 24180003 */ addiu $t8, $zero, 0x0003 ## $t8 = 00000003 -/* 0021C 80A30B8C 15E10005 */ bne $t7, $at, .L80A30BA4 +/* 0021C 80A30B8C 15E10005 */ bne $t7, $at, .L80A30BA4 /* 00220 80A30B90 3C0480A3 */ lui $a0, %hi(D_80A327DC) ## $a0 = 80A30000 /* 00224 80A30B94 0C00B55C */ jal Actor_Kill - + /* 00228 80A30B98 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0022C 80A30B9C 10000026 */ beq $zero, $zero, .L80A30C38 -/* 00230 80A30BA0 8FBF002C */ lw $ra, 0x002C($sp) +/* 0022C 80A30B9C 10000026 */ beq $zero, $zero, .L80A30C38 +/* 00230 80A30BA0 8FBF002C */ lw $ra, 0x002C($sp) .L80A30BA4: /* 00234 80A30BA4 A218001F */ sb $t8, 0x001F($s0) ## 0000001F /* 00238 80A30BA8 A20002AE */ sb $zero, 0x02AE($s0) ## 000002AE /* 0023C 80A30BAC 944513FA */ lhu $a1, 0x13FA($v0) ## 000013FA /* 00240 80A30BB0 0C00084C */ jal osSyncPrintf - + /* 00244 80A30BB4 248427DC */ addiu $a0, $a0, %lo(D_80A327DC) ## $a0 = 000027DC /* 00248 80A30BB8 3C198016 */ lui $t9, 0x8016 ## $t9 = 80160000 /* 0024C 80A30BBC 9739FA5A */ lhu $t9, -0x05A6($t9) ## 8015FA5A /* 00250 80A30BC0 3C0980A3 */ lui $t1, %hi(func_80A31E2C) ## $t1 = 80A30000 /* 00254 80A30BC4 25291E2C */ addiu $t1, $t1, %lo(func_80A31E2C) ## $t1 = 80A31E2C /* 00258 80A30BC8 33280100 */ andi $t0, $t9, 0x0100 ## $t0 = 00000000 -/* 0025C 80A30BCC 11000003 */ beq $t0, $zero, .L80A30BDC +/* 0025C 80A30BCC 11000003 */ beq $t0, $zero, .L80A30BDC /* 00260 80A30BD0 00000000 */ nop -/* 00264 80A30BD4 10000016 */ beq $zero, $zero, .L80A30C30 +/* 00264 80A30BD4 10000016 */ beq $zero, $zero, .L80A30C30 /* 00268 80A30BD8 AE0902B4 */ sw $t1, 0x02B4($s0) ## 000002B4 .L80A30BDC: -/* 0026C 80A30BDC 0C28C373 */ jal func_80A30DCC +/* 0026C 80A30BDC 0C28C373 */ jal func_80A30DCC /* 00270 80A30BE0 00000000 */ nop -/* 00274 80A30BE4 10400005 */ beq $v0, $zero, .L80A30BFC +/* 00274 80A30BE4 10400005 */ beq $v0, $zero, .L80A30BFC /* 00278 80A30BE8 3C0B80A3 */ lui $t3, %hi(func_80A30F48) ## $t3 = 80A30000 /* 0027C 80A30BEC 3C0A80A3 */ lui $t2, %hi(func_80A31FE0) ## $t2 = 80A30000 /* 00280 80A30BF0 254A1FE0 */ addiu $t2, $t2, %lo(func_80A31FE0) ## $t2 = 80A31FE0 -/* 00284 80A30BF4 1000000E */ beq $zero, $zero, .L80A30C30 +/* 00284 80A30BF4 1000000E */ beq $zero, $zero, .L80A30C30 /* 00288 80A30BF8 AE0A02B4 */ sw $t2, 0x02B4($s0) ## 000002B4 .L80A30BFC: /* 0028C 80A30BFC 256B0F48 */ addiu $t3, $t3, %lo(func_80A30F48) ## $t3 = 80A30F48 -/* 00290 80A30C00 1000000B */ beq $zero, $zero, .L80A30C30 +/* 00290 80A30C00 1000000B */ beq $zero, $zero, .L80A30C30 /* 00294 80A30C04 AE0B02B4 */ sw $t3, 0x02B4($s0) ## 000002B4 .L80A30C08: -/* 00298 80A30C08 0C28C373 */ jal func_80A30DCC +/* 00298 80A30C08 0C28C373 */ jal func_80A30DCC /* 0029C 80A30C0C A20C02AE */ sb $t4, 0x02AE($s0) ## 000002AE -/* 002A0 80A30C10 10400005 */ beq $v0, $zero, .L80A30C28 +/* 002A0 80A30C10 10400005 */ beq $v0, $zero, .L80A30C28 /* 002A4 80A30C14 3C0E80A3 */ lui $t6, %hi(func_80A30F48) ## $t6 = 80A30000 /* 002A8 80A30C18 3C0D80A3 */ lui $t5, %hi(func_80A31514) ## $t5 = 80A30000 /* 002AC 80A30C1C 25AD1514 */ addiu $t5, $t5, %lo(func_80A31514) ## $t5 = 80A31514 -/* 002B0 80A30C20 10000003 */ beq $zero, $zero, .L80A30C30 +/* 002B0 80A30C20 10000003 */ beq $zero, $zero, .L80A30C30 /* 002B4 80A30C24 AE0D02B4 */ sw $t5, 0x02B4($s0) ## 000002B4 .L80A30C28: /* 002B8 80A30C28 25CE0F48 */ addiu $t6, $t6, %lo(func_80A30F48) ## $t6 = 80A30F48 @@ -201,11 +201,11 @@ glabel EnGe1_Init .L80A30C30: /* 002C0 80A30C30 A60002AC */ sh $zero, 0x02AC($s0) ## 000002AC .L80A30C34: -/* 002C4 80A30C34 8FBF002C */ lw $ra, 0x002C($sp) +/* 002C4 80A30C34 8FBF002C */ lw $ra, 0x002C($sp) .L80A30C38: -/* 002C8 80A30C38 8FB00028 */ lw $s0, 0x0028($sp) +/* 002C8 80A30C38 8FB00028 */ lw $s0, 0x0028($sp) /* 002CC 80A30C3C 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 -/* 002D0 80A30C40 03E00008 */ jr $ra +/* 002D0 80A30C40 03E00008 */ jr $ra /* 002D4 80A30C44 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ge1/func_80A30C70.s b/asm/non_matchings/overlays/actors/ovl_En_Ge1/func_80A30C70.s index d24cfc17db..99c69f9e96 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ge1/func_80A30C70.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ge1/func_80A30C70.s @@ -1,16 +1,16 @@ glabel func_80A30C70 /* 00300 80A30C70 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 00304 80A30C74 AFBF002C */ sw $ra, 0x002C($sp) -/* 00308 80A30C78 AFB00028 */ sw $s0, 0x0028($sp) +/* 00304 80A30C74 AFBF002C */ sw $ra, 0x002C($sp) +/* 00308 80A30C78 AFB00028 */ sw $s0, 0x0028($sp) /* 0030C 80A30C7C 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00310 80A30C80 AFA50034 */ sw $a1, 0x0034($sp) -/* 00314 80A30C84 AFA60038 */ sw $a2, 0x0038($sp) -/* 00318 80A30C88 0C00BC65 */ jal func_8002F194 -/* 0031C 80A30C8C AFA7003C */ sw $a3, 0x003C($sp) -/* 00320 80A30C90 1040001D */ beq $v0, $zero, .L80A30D08 -/* 00324 80A30C94 C7A0003C */ lwc1 $f0, 0x003C($sp) +/* 00310 80A30C80 AFA50034 */ sw $a1, 0x0034($sp) +/* 00314 80A30C84 AFA60038 */ sw $a2, 0x0038($sp) +/* 00318 80A30C88 0C00BC65 */ jal func_8002F194 +/* 0031C 80A30C8C AFA7003C */ sw $a3, 0x003C($sp) +/* 00320 80A30C90 1040001D */ beq $v0, $zero, .L80A30D08 +/* 00324 80A30C94 C7A0003C */ lwc1 $f0, 0x003C($sp) /* 00328 80A30C98 961802AC */ lhu $t8, 0x02AC($s0) ## 000002AC -/* 0032C 80A30C9C 8FAE0040 */ lw $t6, 0x0040($sp) +/* 0032C 80A30C9C 8FAE0040 */ lw $t6, 0x0040($sp) /* 00330 80A30CA0 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 /* 00334 80A30CA4 3C0F80A3 */ lui $t7, %hi(func_80A323EC) ## $t7 = 80A30000 /* 00338 80A30CA8 24840228 */ addiu $a0, $a0, 0x0228 ## $a0 = 06000228 @@ -20,42 +20,42 @@ glabel func_80A30C70 /* 00348 80A30CB8 A61902AC */ sh $t9, 0x02AC($s0) ## 000002AC /* 0034C 80A30CBC AE0402B0 */ sw $a0, 0x02B0($s0) ## 000002B0 /* 00350 80A30CC0 0C028800 */ jal SkelAnime_GetFrameCount - + /* 00354 80A30CC4 AE0E02B4 */ sw $t6, 0x02B4($s0) ## 000002B4 /* 00358 80A30CC8 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 0035C 80A30CCC 3C01C100 */ lui $at, 0xC100 ## $at = C1000000 /* 00360 80A30CD0 44814000 */ mtc1 $at, $f8 ## $f8 = -8.00 -/* 00364 80A30CD4 468021A0 */ cvt.s.w $f6, $f4 +/* 00364 80A30CD4 468021A0 */ cvt.s.w $f6, $f4 /* 00368 80A30CD8 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 0036C 80A30CDC 24080002 */ addiu $t0, $zero, 0x0002 ## $t0 = 00000002 -/* 00370 80A30CE0 AFA80014 */ sw $t0, 0x0014($sp) +/* 00370 80A30CE0 AFA80014 */ sw $t0, 0x0014($sp) /* 00374 80A30CE4 24A50228 */ addiu $a1, $a1, 0x0228 ## $a1 = 06000228 /* 00378 80A30CE8 26040198 */ addiu $a0, $s0, 0x0198 ## $a0 = 00000198 -/* 0037C 80A30CEC E7A60010 */ swc1 $f6, 0x0010($sp) +/* 0037C 80A30CEC E7A60010 */ swc1 $f6, 0x0010($sp) /* 00380 80A30CF0 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 00384 80A30CF4 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 00388 80A30CF8 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 0038C 80A30CFC E7A80018 */ swc1 $f8, 0x0018($sp) -/* 00390 80A30D00 1000000C */ beq $zero, $zero, .L80A30D34 +/* 00388 80A30CF8 0C029468 */ jal SkelAnime_ChangeAnim + +/* 0038C 80A30CFC E7A80018 */ swc1 $f8, 0x0018($sp) +/* 00390 80A30D00 1000000C */ beq $zero, $zero, .L80A30D34 /* 00394 80A30D04 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 .L80A30D08: /* 00398 80A30D08 C60A0090 */ lwc1 $f10, 0x0090($s0) ## 00000090 -/* 0039C 80A30D0C 97A9003A */ lhu $t1, 0x003A($sp) +/* 0039C 80A30D0C 97A9003A */ lhu $t1, 0x003A($sp) /* 003A0 80A30D10 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 003A4 80A30D14 4600503C */ c.lt.s $f10, $f0 +/* 003A4 80A30D14 4600503C */ c.lt.s $f10, $f0 /* 003A8 80A30D18 A609010E */ sh $t1, 0x010E($s0) ## 0000010E -/* 003AC 80A30D1C 45020005 */ bc1fl .L80A30D34 +/* 003AC 80A30D1C 45020005 */ bc1fl .L80A30D34 /* 003B0 80A30D20 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 003B4 80A30D24 44060000 */ mfc1 $a2, $f0 -/* 003B8 80A30D28 0C00BCB3 */ jal func_8002F2CC -/* 003BC 80A30D2C 8FA50034 */ lw $a1, 0x0034($sp) +/* 003B4 80A30D24 44060000 */ mfc1 $a2, $f0 +/* 003B8 80A30D28 0C00BCB3 */ jal func_8002F2CC +/* 003BC 80A30D2C 8FA50034 */ lw $a1, 0x0034($sp) /* 003C0 80A30D30 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 .L80A30D34: -/* 003C4 80A30D34 8FBF002C */ lw $ra, 0x002C($sp) -/* 003C8 80A30D38 8FB00028 */ lw $s0, 0x0028($sp) +/* 003C4 80A30D34 8FBF002C */ lw $ra, 0x002C($sp) +/* 003C8 80A30D38 8FB00028 */ lw $s0, 0x0028($sp) /* 003CC 80A30D3C 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 003D0 80A30D40 03E00008 */ jr $ra +/* 003D0 80A30D40 03E00008 */ jr $ra /* 003D4 80A30D44 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ge1/func_80A30D48.s b/asm/non_matchings/overlays/actors/ovl_En_Ge1/func_80A30D48.s index b444c02b45..6f268666dd 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ge1/func_80A30D48.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ge1/func_80A30D48.s @@ -1,38 +1,38 @@ glabel func_80A30D48 /* 003D8 80A30D48 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 003DC 80A30D4C AFA40028 */ sw $a0, 0x0028($sp) -/* 003E0 80A30D50 AFBF0024 */ sw $ra, 0x0024($sp) +/* 003DC 80A30D4C AFA40028 */ sw $a0, 0x0028($sp) +/* 003E0 80A30D50 AFBF0024 */ sw $ra, 0x0024($sp) /* 003E4 80A30D54 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 /* 003E8 80A30D58 0C028800 */ jal SkelAnime_GetFrameCount - + /* 003EC 80A30D5C 24840228 */ addiu $a0, $a0, 0x0228 ## $a0 = 06000228 /* 003F0 80A30D60 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 003F4 80A30D64 3C014100 */ lui $at, 0x4100 ## $at = 41000000 /* 003F8 80A30D68 44814000 */ mtc1 $at, $f8 ## $f8 = 8.00 -/* 003FC 80A30D6C 46802120 */ cvt.s.w $f4, $f4 -/* 00400 80A30D70 8FA40028 */ lw $a0, 0x0028($sp) +/* 003FC 80A30D6C 46802120 */ cvt.s.w $f4, $f4 +/* 00400 80A30D70 8FA40028 */ lw $a0, 0x0028($sp) /* 00404 80A30D74 44803000 */ mtc1 $zero, $f6 ## $f6 = 0.00 /* 00408 80A30D78 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 0040C 80A30D7C 240E0002 */ addiu $t6, $zero, 0x0002 ## $t6 = 00000002 -/* 00410 80A30D80 AFAE0014 */ sw $t6, 0x0014($sp) -/* 00414 80A30D84 44072000 */ mfc1 $a3, $f4 +/* 00410 80A30D80 AFAE0014 */ sw $t6, 0x0014($sp) +/* 00414 80A30D84 44072000 */ mfc1 $a3, $f4 /* 00418 80A30D88 24A50228 */ addiu $a1, $a1, 0x0228 ## $a1 = 06000228 /* 0041C 80A30D8C 3C06BF80 */ lui $a2, 0xBF80 ## $a2 = BF800000 -/* 00420 80A30D90 E7A80018 */ swc1 $f8, 0x0018($sp) +/* 00420 80A30D90 E7A80018 */ swc1 $f8, 0x0018($sp) /* 00424 80A30D94 24840198 */ addiu $a0, $a0, 0x0198 ## $a0 = 00000198 -/* 00428 80A30D98 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 0042C 80A30D9C E7A60010 */ swc1 $f6, 0x0010($sp) -/* 00430 80A30DA0 8FA20028 */ lw $v0, 0x0028($sp) +/* 00428 80A30D98 0C029468 */ jal SkelAnime_ChangeAnim + +/* 0042C 80A30D9C E7A60010 */ swc1 $f6, 0x0010($sp) +/* 00430 80A30DA0 8FA20028 */ lw $v0, 0x0028($sp) /* 00434 80A30DA4 3C0F0600 */ lui $t7, 0x0600 ## $t7 = 06000000 /* 00438 80A30DA8 3C1880A3 */ lui $t8, %hi(func_80A323B0) ## $t8 = 80A30000 /* 0043C 80A30DAC 25EF0228 */ addiu $t7, $t7, 0x0228 ## $t7 = 06000228 /* 00440 80A30DB0 271823B0 */ addiu $t8, $t8, %lo(func_80A323B0) ## $t8 = 80A323B0 /* 00444 80A30DB4 AC4F02B0 */ sw $t7, 0x02B0($v0) ## 000002B0 /* 00448 80A30DB8 AC5802B8 */ sw $t8, 0x02B8($v0) ## 000002B8 -/* 0044C 80A30DBC 8FBF0024 */ lw $ra, 0x0024($sp) +/* 0044C 80A30DBC 8FBF0024 */ lw $ra, 0x0024($sp) /* 00450 80A30DC0 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 00454 80A30DC4 03E00008 */ jr $ra +/* 00454 80A30DC4 03E00008 */ jr $ra /* 00458 80A30DC8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ge1/func_80A3118C.s b/asm/non_matchings/overlays/actors/ovl_En_Ge1/func_80A3118C.s index ed4f5fbcb9..e0bed1afab 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ge1/func_80A3118C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ge1/func_80A3118C.s @@ -4,7 +4,7 @@ glabel func_80A3118C /* 00824 80A31194 AFBF001C */ sw $ra, 0x001C($sp) /* 00828 80A31198 AFA50024 */ sw $a1, 0x0024($sp) /* 0082C 80A3119C 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 00830 80A311A0 0C01B0D8 */ jal func_8006C360 +/* 00830 80A311A0 0C01B0D8 */ jal Text_GetFaceReaction /* 00834 80A311A4 24050022 */ addiu $a1, $zero, 0x0022 ## $a1 = 00000022 /* 00838 80A311A8 14400002 */ bne $v0, $zero, .L80A311B4 /* 0083C 80A311AC 3046FFFF */ andi $a2, $v0, 0xFFFF ## $a2 = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ge1/func_80A312E4.s b/asm/non_matchings/overlays/actors/ovl_En_Ge1/func_80A312E4.s index 5aa6718261..2a53b8defa 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ge1/func_80A312E4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ge1/func_80A312E4.s @@ -1,39 +1,39 @@ glabel func_80A312E4 /* 00974 80A312E4 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 00978 80A312E8 AFB00028 */ sw $s0, 0x0028($sp) +/* 00978 80A312E8 AFB00028 */ sw $s0, 0x0028($sp) /* 0097C 80A312EC 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00980 80A312F0 AFBF002C */ sw $ra, 0x002C($sp) -/* 00984 80A312F4 AFA50034 */ sw $a1, 0x0034($sp) -/* 00988 80A312F8 0C042F6F */ jal func_8010BDBC +/* 00980 80A312F0 AFBF002C */ sw $ra, 0x002C($sp) +/* 00984 80A312F4 AFA50034 */ sw $a1, 0x0034($sp) +/* 00988 80A312F8 0C042F6F */ jal func_8010BDBC /* 0098C 80A312FC 24A420D8 */ addiu $a0, $a1, 0x20D8 ## $a0 = 000020D8 /* 00990 80A31300 24010005 */ addiu $at, $zero, 0x0005 ## $at = 00000005 -/* 00994 80A31304 54410022 */ bnel $v0, $at, .L80A31390 -/* 00998 80A31308 8FBF002C */ lw $ra, 0x002C($sp) -/* 0099C 80A3130C 0C041AF2 */ jal func_80106BC8 -/* 009A0 80A31310 8FA40034 */ lw $a0, 0x0034($sp) -/* 009A4 80A31314 1040001D */ beq $v0, $zero, .L80A3138C +/* 00994 80A31304 54410022 */ bnel $v0, $at, .L80A31390 +/* 00998 80A31308 8FBF002C */ lw $ra, 0x002C($sp) +/* 0099C 80A3130C 0C041AF2 */ jal func_80106BC8 +/* 009A0 80A31310 8FA40034 */ lw $a0, 0x0034($sp) +/* 009A4 80A31314 1040001D */ beq $v0, $zero, .L80A3138C /* 009A8 80A31318 3C0E80A3 */ lui $t6, %hi(func_80A31234) ## $t6 = 80A30000 /* 009AC 80A3131C 25CE1234 */ addiu $t6, $t6, %lo(func_80A31234) ## $t6 = 80A31234 /* 009B0 80A31320 3C040601 */ lui $a0, 0x0601 ## $a0 = 06010000 /* 009B4 80A31324 AE0E02B4 */ sw $t6, 0x02B4($s0) ## 000002B4 /* 009B8 80A31328 0C028800 */ jal SkelAnime_GetFrameCount - + /* 009BC 80A3132C 2484A048 */ addiu $a0, $a0, 0xA048 ## $a0 = 0600A048 /* 009C0 80A31330 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 009C4 80A31334 3C01C040 */ lui $at, 0xC040 ## $at = C0400000 /* 009C8 80A31338 44814000 */ mtc1 $at, $f8 ## $f8 = -3.00 -/* 009CC 80A3133C 468021A0 */ cvt.s.w $f6, $f4 +/* 009CC 80A3133C 468021A0 */ cvt.s.w $f6, $f4 /* 009D0 80A31340 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 /* 009D4 80A31344 240F0002 */ addiu $t7, $zero, 0x0002 ## $t7 = 00000002 -/* 009D8 80A31348 AFAF0014 */ sw $t7, 0x0014($sp) +/* 009D8 80A31348 AFAF0014 */ sw $t7, 0x0014($sp) /* 009DC 80A3134C 24A5A048 */ addiu $a1, $a1, 0xA048 ## $a1 = 0600A048 /* 009E0 80A31350 26040198 */ addiu $a0, $s0, 0x0198 ## $a0 = 00000198 -/* 009E4 80A31354 E7A60010 */ swc1 $f6, 0x0010($sp) +/* 009E4 80A31354 E7A60010 */ swc1 $f6, 0x0010($sp) /* 009E8 80A31358 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 009EC 80A3135C 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 009F0 80A31360 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 009F4 80A31364 E7A80018 */ swc1 $f8, 0x0018($sp) +/* 009F0 80A31360 0C029468 */ jal SkelAnime_ChangeAnim + +/* 009F4 80A31364 E7A80018 */ swc1 $f8, 0x0018($sp) /* 009F8 80A31368 960802AC */ lhu $t0, 0x02AC($s0) ## 000002AC /* 009FC 80A3136C 3C180601 */ lui $t8, 0x0601 ## $t8 = 06010000 /* 00A00 80A31370 3C1980A3 */ lui $t9, %hi(func_80A323EC) ## $t9 = 80A30000 @@ -44,11 +44,11 @@ glabel func_80A312E4 /* 00A14 80A31384 AE1902B8 */ sw $t9, 0x02B8($s0) ## 000002B8 /* 00A18 80A31388 A60902AC */ sh $t1, 0x02AC($s0) ## 000002AC .L80A3138C: -/* 00A1C 80A3138C 8FBF002C */ lw $ra, 0x002C($sp) +/* 00A1C 80A3138C 8FBF002C */ lw $ra, 0x002C($sp) .L80A31390: -/* 00A20 80A31390 8FB00028 */ lw $s0, 0x0028($sp) +/* 00A20 80A31390 8FB00028 */ lw $s0, 0x0028($sp) /* 00A24 80A31394 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 00A28 80A31398 03E00008 */ jr $ra +/* 00A28 80A31398 03E00008 */ jr $ra /* 00A2C 80A3139C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ge1/func_80A316F4.s b/asm/non_matchings/overlays/actors/ovl_En_Ge1/func_80A316F4.s index 3b058024cd..eebc17b992 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ge1/func_80A316F4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ge1/func_80A316F4.s @@ -1,43 +1,43 @@ glabel func_80A316F4 /* 00D84 80A316F4 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 00D88 80A316F8 AFBF002C */ sw $ra, 0x002C($sp) -/* 00D8C 80A316FC AFB00028 */ sw $s0, 0x0028($sp) -/* 00D90 80A31700 AFA50034 */ sw $a1, 0x0034($sp) +/* 00D88 80A316F8 AFBF002C */ sw $ra, 0x002C($sp) +/* 00D8C 80A316FC AFB00028 */ sw $s0, 0x0028($sp) +/* 00D90 80A31700 AFA50034 */ sw $a1, 0x0034($sp) /* 00D94 80A31704 948E02AC */ lhu $t6, 0x02AC($a0) ## 000002AC /* 00D98 80A31708 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 00D9C 80A3170C 35CF0001 */ ori $t7, $t6, 0x0001 ## $t7 = 00000001 /* 00DA0 80A31710 A48F02AC */ sh $t7, 0x02AC($a0) ## 000002AC -/* 00DA4 80A31714 8FA40034 */ lw $a0, 0x0034($sp) -/* 00DA8 80A31718 0C042F6F */ jal func_8010BDBC +/* 00DA4 80A31714 8FA40034 */ lw $a0, 0x0034($sp) +/* 00DA8 80A31718 0C042F6F */ jal func_8010BDBC /* 00DAC 80A3171C 248420D8 */ addiu $a0, $a0, 0x20D8 ## $a0 = 000020D8 /* 00DB0 80A31720 24010005 */ addiu $at, $zero, 0x0005 ## $at = 00000005 -/* 00DB4 80A31724 54410022 */ bnel $v0, $at, .L80A317B0 -/* 00DB8 80A31728 8FBF002C */ lw $ra, 0x002C($sp) -/* 00DBC 80A3172C 0C041AF2 */ jal func_80106BC8 -/* 00DC0 80A31730 8FA40034 */ lw $a0, 0x0034($sp) -/* 00DC4 80A31734 1040001D */ beq $v0, $zero, .L80A317AC +/* 00DB4 80A31724 54410022 */ bnel $v0, $at, .L80A317B0 +/* 00DB8 80A31728 8FBF002C */ lw $ra, 0x002C($sp) +/* 00DBC 80A3172C 0C041AF2 */ jal func_80106BC8 +/* 00DC0 80A31730 8FA40034 */ lw $a0, 0x0034($sp) +/* 00DC4 80A31734 1040001D */ beq $v0, $zero, .L80A317AC /* 00DC8 80A31738 3C1880A3 */ lui $t8, %hi(func_80A31644) ## $t8 = 80A30000 /* 00DCC 80A3173C 27181644 */ addiu $t8, $t8, %lo(func_80A31644) ## $t8 = 80A31644 /* 00DD0 80A31740 3C040601 */ lui $a0, 0x0601 ## $a0 = 06010000 /* 00DD4 80A31744 AE1802B4 */ sw $t8, 0x02B4($s0) ## 000002B4 /* 00DD8 80A31748 0C028800 */ jal SkelAnime_GetFrameCount - + /* 00DDC 80A3174C 2484A048 */ addiu $a0, $a0, 0xA048 ## $a0 = 0600A048 /* 00DE0 80A31750 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 00DE4 80A31754 3C01C040 */ lui $at, 0xC040 ## $at = C0400000 /* 00DE8 80A31758 44814000 */ mtc1 $at, $f8 ## $f8 = -3.00 -/* 00DEC 80A3175C 468021A0 */ cvt.s.w $f6, $f4 +/* 00DEC 80A3175C 468021A0 */ cvt.s.w $f6, $f4 /* 00DF0 80A31760 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 /* 00DF4 80A31764 24190002 */ addiu $t9, $zero, 0x0002 ## $t9 = 00000002 -/* 00DF8 80A31768 AFB90014 */ sw $t9, 0x0014($sp) +/* 00DF8 80A31768 AFB90014 */ sw $t9, 0x0014($sp) /* 00DFC 80A3176C 24A5A048 */ addiu $a1, $a1, 0xA048 ## $a1 = 0600A048 /* 00E00 80A31770 26040198 */ addiu $a0, $s0, 0x0198 ## $a0 = 00000198 -/* 00E04 80A31774 E7A60010 */ swc1 $f6, 0x0010($sp) +/* 00E04 80A31774 E7A60010 */ swc1 $f6, 0x0010($sp) /* 00E08 80A31778 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 00E0C 80A3177C 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 00E10 80A31780 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 00E14 80A31784 E7A80018 */ swc1 $f8, 0x0018($sp) +/* 00E10 80A31780 0C029468 */ jal SkelAnime_ChangeAnim + +/* 00E14 80A31784 E7A80018 */ swc1 $f8, 0x0018($sp) /* 00E18 80A31788 960A02AC */ lhu $t2, 0x02AC($s0) ## 000002AC /* 00E1C 80A3178C 3C080601 */ lui $t0, 0x0601 ## $t0 = 06010000 /* 00E20 80A31790 3C0980A3 */ lui $t1, %hi(func_80A323EC) ## $t1 = 80A30000 @@ -48,11 +48,11 @@ glabel func_80A316F4 /* 00E34 80A317A4 AE0902B8 */ sw $t1, 0x02B8($s0) ## 000002B8 /* 00E38 80A317A8 A60B02AC */ sh $t3, 0x02AC($s0) ## 000002AC .L80A317AC: -/* 00E3C 80A317AC 8FBF002C */ lw $ra, 0x002C($sp) +/* 00E3C 80A317AC 8FBF002C */ lw $ra, 0x002C($sp) .L80A317B0: -/* 00E40 80A317B0 8FB00028 */ lw $s0, 0x0028($sp) +/* 00E40 80A317B0 8FB00028 */ lw $s0, 0x0028($sp) /* 00E44 80A317B4 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 00E48 80A317B8 03E00008 */ jr $ra +/* 00E48 80A317B8 03E00008 */ jr $ra /* 00E4C 80A317BC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ge1/func_80A31880.s b/asm/non_matchings/overlays/actors/ovl_En_Ge1/func_80A31880.s index f55101192a..938fbb4438 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ge1/func_80A31880.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ge1/func_80A31880.s @@ -1,52 +1,52 @@ glabel func_80A31880 /* 00F10 80A31880 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 00F14 80A31884 AFA40028 */ sw $a0, 0x0028($sp) -/* 00F18 80A31888 AFBF0024 */ sw $ra, 0x0024($sp) -/* 00F1C 80A3188C AFA5002C */ sw $a1, 0x002C($sp) +/* 00F14 80A31884 AFA40028 */ sw $a0, 0x0028($sp) +/* 00F18 80A31888 AFBF0024 */ sw $ra, 0x0024($sp) +/* 00F1C 80A3188C AFA5002C */ sw $a1, 0x002C($sp) /* 00F20 80A31890 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 00F24 80A31894 0C01B0D8 */ jal func_8006C360 +/* 00F24 80A31894 0C01B0D8 */ jal Text_GetFaceReaction /* 00F28 80A31898 24050022 */ addiu $a1, $zero, 0x0022 ## $a1 = 00000022 -/* 00F2C 80A3189C 14400002 */ bne $v0, $zero, .L80A318A8 +/* 00F2C 80A3189C 14400002 */ bne $v0, $zero, .L80A318A8 /* 00F30 80A318A0 3046FFFF */ andi $a2, $v0, 0xFFFF ## $a2 = 00000000 /* 00F34 80A318A4 24066069 */ addiu $a2, $zero, 0x6069 ## $a2 = 00006069 .L80A318A8: /* 00F38 80A318A8 3C0E80A3 */ lui $t6, %hi(func_80A3183C) ## $t6 = 80A30000 /* 00F3C 80A318AC 25CE183C */ addiu $t6, $t6, %lo(func_80A3183C) ## $t6 = 80A3183C -/* 00F40 80A318B0 AFAE0010 */ sw $t6, 0x0010($sp) -/* 00F44 80A318B4 8FA40028 */ lw $a0, 0x0028($sp) -/* 00F48 80A318B8 8FA5002C */ lw $a1, 0x002C($sp) -/* 00F4C 80A318BC 0C28C31C */ jal func_80A30C70 +/* 00F40 80A318B0 AFAE0010 */ sw $t6, 0x0010($sp) +/* 00F44 80A318B4 8FA40028 */ lw $a0, 0x0028($sp) +/* 00F48 80A318B8 8FA5002C */ lw $a1, 0x002C($sp) +/* 00F4C 80A318BC 0C28C31C */ jal func_80A30C70 /* 00F50 80A318C0 3C0742C8 */ lui $a3, 0x42C8 ## $a3 = 42C80000 -/* 00F54 80A318C4 10400017 */ beq $v0, $zero, .L80A31924 +/* 00F54 80A318C4 10400017 */ beq $v0, $zero, .L80A31924 /* 00F58 80A318C8 3C040601 */ lui $a0, 0x0601 ## $a0 = 06010000 -/* 00F5C 80A318CC 8FA20028 */ lw $v0, 0x0028($sp) +/* 00F5C 80A318CC 8FA20028 */ lw $v0, 0x0028($sp) /* 00F60 80A318D0 3C0F80A3 */ lui $t7, %hi(func_80A323B0) ## $t7 = 80A30000 /* 00F64 80A318D4 2484A498 */ addiu $a0, $a0, 0xA498 ## $a0 = 0600A498 /* 00F68 80A318D8 25EF23B0 */ addiu $t7, $t7, %lo(func_80A323B0) ## $t7 = 80A323B0 /* 00F6C 80A318DC AC4F02B8 */ sw $t7, 0x02B8($v0) ## 000002B8 /* 00F70 80A318E0 0C028800 */ jal SkelAnime_GetFrameCount - + /* 00F74 80A318E4 AC4402B0 */ sw $a0, 0x02B0($v0) ## 000002B0 /* 00F78 80A318E8 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 00F7C 80A318EC 3C01C100 */ lui $at, 0xC100 ## $at = C1000000 /* 00F80 80A318F0 44814000 */ mtc1 $at, $f8 ## $f8 = -8.00 -/* 00F84 80A318F4 468021A0 */ cvt.s.w $f6, $f4 -/* 00F88 80A318F8 8FA40028 */ lw $a0, 0x0028($sp) +/* 00F84 80A318F4 468021A0 */ cvt.s.w $f6, $f4 +/* 00F88 80A318F8 8FA40028 */ lw $a0, 0x0028($sp) /* 00F8C 80A318FC 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 /* 00F90 80A31900 24180002 */ addiu $t8, $zero, 0x0002 ## $t8 = 00000002 -/* 00F94 80A31904 AFB80014 */ sw $t8, 0x0014($sp) +/* 00F94 80A31904 AFB80014 */ sw $t8, 0x0014($sp) /* 00F98 80A31908 24A5A498 */ addiu $a1, $a1, 0xA498 ## $a1 = 0600A498 -/* 00F9C 80A3190C E7A60010 */ swc1 $f6, 0x0010($sp) +/* 00F9C 80A3190C E7A60010 */ swc1 $f6, 0x0010($sp) /* 00FA0 80A31910 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 00FA4 80A31914 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 00FA8 80A31918 E7A80018 */ swc1 $f8, 0x0018($sp) -/* 00FAC 80A3191C 0C029468 */ jal SkelAnime_ChangeAnimation - +/* 00FA8 80A31918 E7A80018 */ swc1 $f8, 0x0018($sp) +/* 00FAC 80A3191C 0C029468 */ jal SkelAnime_ChangeAnim + /* 00FB0 80A31920 24840198 */ addiu $a0, $a0, 0x0198 ## $a0 = 00000198 .L80A31924: -/* 00FB4 80A31924 8FBF0024 */ lw $ra, 0x0024($sp) +/* 00FB4 80A31924 8FBF0024 */ lw $ra, 0x0024($sp) /* 00FB8 80A31928 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 00FBC 80A3192C 03E00008 */ jr $ra +/* 00FBC 80A3192C 03E00008 */ jr $ra /* 00FC0 80A31930 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ge1/func_80A323B0.s b/asm/non_matchings/overlays/actors/ovl_En_Ge1/func_80A323B0.s index 62de9111f0..f4ed8ba0a0 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ge1/func_80A323B0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ge1/func_80A323B0.s @@ -1,20 +1,20 @@ glabel func_80A323B0 /* 01A40 80A323B0 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 01A44 80A323B4 AFA40020 */ sw $a0, 0x0020($sp) -/* 01A48 80A323B8 AFBF0014 */ sw $ra, 0x0014($sp) +/* 01A44 80A323B4 AFA40020 */ sw $a0, 0x0020($sp) +/* 01A48 80A323B8 AFBF0014 */ sw $ra, 0x0014($sp) /* 01A4C 80A323BC 24840198 */ addiu $a0, $a0, 0x0198 ## $a0 = 00000198 /* 01A50 80A323C0 0C02927F */ jal SkelAnime_FrameUpdateMatrix - -/* 01A54 80A323C4 AFA4001C */ sw $a0, 0x001C($sp) -/* 01A58 80A323C8 10400004 */ beq $v0, $zero, .L80A323DC -/* 01A5C 80A323CC 8FA4001C */ lw $a0, 0x001C($sp) -/* 01A60 80A323D0 8FAE0020 */ lw $t6, 0x0020($sp) -/* 01A64 80A323D4 0C02947A */ jal func_800A51E8 + +/* 01A54 80A323C4 AFA4001C */ sw $a0, 0x001C($sp) +/* 01A58 80A323C8 10400004 */ beq $v0, $zero, .L80A323DC +/* 01A5C 80A323CC 8FA4001C */ lw $a0, 0x001C($sp) +/* 01A60 80A323D0 8FAE0020 */ lw $t6, 0x0020($sp) +/* 01A64 80A323D4 0C02947A */ jal SkelAnime_ChangeAnimDefaultStop /* 01A68 80A323D8 8DC502B0 */ lw $a1, 0x02B0($t6) ## 000002B0 .L80A323DC: -/* 01A6C 80A323DC 8FBF0014 */ lw $ra, 0x0014($sp) +/* 01A6C 80A323DC 8FBF0014 */ lw $ra, 0x0014($sp) /* 01A70 80A323E0 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 01A74 80A323E4 03E00008 */ jr $ra +/* 01A74 80A323E4 03E00008 */ jr $ra /* 01A78 80A323E8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ge1/func_80A32598.s b/asm/non_matchings/overlays/actors/ovl_En_Ge1/func_80A32598.s index 6619f26c94..df1f86d9e1 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ge1/func_80A32598.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ge1/func_80A32598.s @@ -10,7 +10,7 @@ glabel func_80A32598 /* 01C48 80A325B8 24C62888 */ addiu $a2, $a2, %lo(D_80A32888) ## $a2 = 80A32888 /* 01C4C 80A325BC 27A40020 */ addiu $a0, $sp, 0x0020 ## $a0 = FFFFFFE8 /* 01C50 80A325C0 2407058B */ addiu $a3, $zero, 0x058B ## $a3 = 0000058B -/* 01C54 80A325C4 0C031AB1 */ jal func_800C6AC4 +/* 01C54 80A325C4 0C031AB1 */ jal Graph_OpenDisps /* 01C58 80A325C8 AFA50030 */ sw $a1, 0x0030($sp) /* 01C5C 80A325CC 8FAF003C */ lw $t7, 0x003C($sp) /* 01C60 80A325D0 2401000F */ addiu $at, $zero, 0x000F ## $at = 0000000F @@ -38,7 +38,7 @@ glabel func_80A32598 /* 01CB4 80A32624 24C62898 */ addiu $a2, $a2, %lo(D_80A32898) ## $a2 = 80A32898 /* 01CB8 80A32628 27A40020 */ addiu $a0, $sp, 0x0020 ## $a0 = FFFFFFE8 /* 01CBC 80A3262C 24070593 */ addiu $a3, $zero, 0x0593 ## $a3 = 00000593 -/* 01CC0 80A32630 0C031AD5 */ jal func_800C6B54 +/* 01CC0 80A32630 0C031AD5 */ jal Graph_CloseDisps /* 01CC4 80A32634 8D850000 */ lw $a1, 0x0000($t4) ## 00000000 /* 01CC8 80A32638 8FBF0014 */ lw $ra, 0x0014($sp) /* 01CCC 80A3263C 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ge2/EnGe2_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Ge2/EnGe2_Draw.s index 6e3984cc97..f9b76260c7 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ge2/EnGe2_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ge2/EnGe2_Draw.s @@ -1,20 +1,20 @@ glabel EnGe2_Draw /* 01610 80A341E0 27BDFFA8 */ addiu $sp, $sp, 0xFFA8 ## $sp = FFFFFFA8 -/* 01614 80A341E4 AFB10028 */ sw $s1, 0x0028($sp) +/* 01614 80A341E4 AFB10028 */ sw $s1, 0x0028($sp) /* 01618 80A341E8 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 -/* 0161C 80A341EC AFBF002C */ sw $ra, 0x002C($sp) -/* 01620 80A341F0 AFB00024 */ sw $s0, 0x0024($sp) +/* 0161C 80A341EC AFBF002C */ sw $ra, 0x002C($sp) +/* 01620 80A341F0 AFB00024 */ sw $s0, 0x0024($sp) /* 01624 80A341F4 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 /* 01628 80A341F8 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 0162C 80A341FC 3C0680A3 */ lui $a2, %hi(D_80A3441C) ## $a2 = 80A30000 /* 01630 80A34200 24C6441C */ addiu $a2, $a2, %lo(D_80A3441C) ## $a2 = 80A3441C /* 01634 80A34204 27A4003C */ addiu $a0, $sp, 0x003C ## $a0 = FFFFFFE4 /* 01638 80A34208 240704FA */ addiu $a3, $zero, 0x04FA ## $a3 = 000004FA -/* 0163C 80A3420C 0C031AB1 */ jal func_800C6AC4 -/* 01640 80A34210 AFA5004C */ sw $a1, 0x004C($sp) -/* 01644 80A34214 0C0250F2 */ jal func_800943C8 +/* 0163C 80A3420C 0C031AB1 */ jal Graph_OpenDisps +/* 01640 80A34210 AFA5004C */ sw $a1, 0x004C($sp) +/* 01644 80A34214 0C0250F2 */ jal func_800943C8 /* 01648 80A34218 8E240000 */ lw $a0, 0x0000($s1) ## 00000000 -/* 0164C 80A3421C 8FA5004C */ lw $a1, 0x004C($sp) +/* 0164C 80A3421C 8FA5004C */ lw $a1, 0x004C($sp) /* 01650 80A34220 3C0FDB06 */ lui $t7, 0xDB06 ## $t7 = DB060000 /* 01654 80A34224 35EF0020 */ ori $t7, $t7, 0x0020 ## $t7 = DB060020 /* 01658 80A34228 8CA302C0 */ lw $v1, 0x02C0($a1) ## 000002C0 @@ -26,22 +26,22 @@ glabel EnGe2_Draw /* 01670 80A34240 861802E4 */ lh $t8, 0x02E4($s0) ## 000002E4 /* 01674 80A34244 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 /* 01678 80A34248 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF -/* 0167C 80A3424C 0018C880 */ sll $t9, $t8, 2 -/* 01680 80A34250 00992021 */ addu $a0, $a0, $t9 -/* 01684 80A34254 8C8443BC */ lw $a0, %lo(D_80A343BC)($a0) +/* 0167C 80A3424C 0018C880 */ sll $t9, $t8, 2 +/* 01680 80A34250 00992021 */ addu $a0, $a0, $t9 +/* 01684 80A34254 8C8443BC */ lw $a0, %lo(D_80A343BC)($a0) /* 01688 80A34258 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 /* 0168C 80A3425C 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 01690 80A34260 00044900 */ sll $t1, $a0, 4 -/* 01694 80A34264 00095702 */ srl $t2, $t1, 28 -/* 01698 80A34268 000A5880 */ sll $t3, $t2, 2 -/* 0169C 80A3426C 018B6021 */ addu $t4, $t4, $t3 +/* 01690 80A34260 00044900 */ sll $t1, $a0, 4 +/* 01694 80A34264 00095702 */ srl $t2, $t1, 28 +/* 01698 80A34268 000A5880 */ sll $t3, $t2, 2 +/* 0169C 80A3426C 018B6021 */ addu $t4, $t4, $t3 /* 016A0 80A34270 8D8C6FA8 */ lw $t4, 0x6FA8($t4) ## 80166FA8 -/* 016A4 80A34274 00814024 */ and $t0, $a0, $at +/* 016A4 80A34274 00814024 */ and $t0, $a0, $at /* 016A8 80A34278 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 016AC 80A3427C 010C6821 */ addu $t5, $t0, $t4 -/* 016B0 80A34280 01A17021 */ addu $t6, $t5, $at +/* 016AC 80A3427C 010C6821 */ addu $t5, $t0, $t4 +/* 016B0 80A34280 01A17021 */ addu $t6, $t5, $at /* 016B4 80A34284 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 016B8 80A34288 0C00BAF3 */ jal func_8002EBCC +/* 016B8 80A34288 0C00BAF3 */ jal func_8002EBCC /* 016BC 80A3428C AC6E0004 */ sw $t6, 0x0004($v1) ## 00000004 /* 016C0 80A34290 8E05019C */ lw $a1, 0x019C($s0) ## 0000019C /* 016C4 80A34294 8E0601B8 */ lw $a2, 0x01B8($s0) ## 000001B8 @@ -50,21 +50,21 @@ glabel EnGe2_Draw /* 016D0 80A342A0 3C1880A3 */ lui $t8, %hi(func_80A341A0) ## $t8 = 80A30000 /* 016D4 80A342A4 271841A0 */ addiu $t8, $t8, %lo(func_80A341A0) ## $t8 = 80A341A0 /* 016D8 80A342A8 25EF415C */ addiu $t7, $t7, %lo(func_80A3415C) ## $t7 = 80A3415C -/* 016DC 80A342AC AFAF0010 */ sw $t7, 0x0010($sp) -/* 016E0 80A342B0 AFB80014 */ sw $t8, 0x0014($sp) -/* 016E4 80A342B4 AFB00018 */ sw $s0, 0x0018($sp) -/* 016E8 80A342B8 0C0286B2 */ jal func_800A1AC8 +/* 016DC 80A342AC AFAF0010 */ sw $t7, 0x0010($sp) +/* 016E0 80A342B0 AFB80014 */ sw $t8, 0x0014($sp) +/* 016E4 80A342B4 AFB00018 */ sw $s0, 0x0018($sp) +/* 016E8 80A342B8 0C0286B2 */ jal SkelAnime_DrawSV /* 016EC 80A342BC 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 016F0 80A342C0 3C0680A3 */ lui $a2, %hi(D_80A3442C) ## $a2 = 80A30000 /* 016F4 80A342C4 24C6442C */ addiu $a2, $a2, %lo(D_80A3442C) ## $a2 = 80A3442C /* 016F8 80A342C8 27A4003C */ addiu $a0, $sp, 0x003C ## $a0 = FFFFFFE4 /* 016FC 80A342CC 8E250000 */ lw $a1, 0x0000($s1) ## 00000000 -/* 01700 80A342D0 0C031AD5 */ jal func_800C6B54 +/* 01700 80A342D0 0C031AD5 */ jal Graph_CloseDisps /* 01704 80A342D4 2407050B */ addiu $a3, $zero, 0x050B ## $a3 = 0000050B -/* 01708 80A342D8 8FBF002C */ lw $ra, 0x002C($sp) -/* 0170C 80A342DC 8FB00024 */ lw $s0, 0x0024($sp) -/* 01710 80A342E0 8FB10028 */ lw $s1, 0x0028($sp) -/* 01714 80A342E4 03E00008 */ jr $ra +/* 01708 80A342D8 8FBF002C */ lw $ra, 0x002C($sp) +/* 0170C 80A342DC 8FB00024 */ lw $s0, 0x0024($sp) +/* 01710 80A342E0 8FB10028 */ lw $s1, 0x0028($sp) +/* 01714 80A342E4 03E00008 */ jr $ra /* 01718 80A342E8 27BD0058 */ addiu $sp, $sp, 0x0058 ## $sp = 00000000 /* 0171C 80A342EC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ge2/EnGe2_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Ge2/EnGe2_Init.s index 099dd0f82a..ef3f027b75 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ge2/EnGe2_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ge2/EnGe2_Init.s @@ -1,60 +1,60 @@ glabel EnGe2_Init /* 000A4 80A32C74 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 -/* 000A8 80A32C78 AFB00028 */ sw $s0, 0x0028($sp) +/* 000A8 80A32C78 AFB00028 */ sw $s0, 0x0028($sp) /* 000AC 80A32C7C 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 000B0 80A32C80 AFBF002C */ sw $ra, 0x002C($sp) -/* 000B4 80A32C84 AFA50044 */ sw $a1, 0x0044($sp) +/* 000B0 80A32C80 AFBF002C */ sw $ra, 0x002C($sp) +/* 000B4 80A32C84 AFA50044 */ sw $a1, 0x0044($sp) /* 000B8 80A32C88 3C068003 */ lui $a2, 0x8003 ## $a2 = 80030000 /* 000BC 80A32C8C 24C6B5EC */ addiu $a2, $a2, 0xB5EC ## $a2 = 8002B5EC /* 000C0 80A32C90 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 /* 000C4 80A32C94 248400B4 */ addiu $a0, $a0, 0x00B4 ## $a0 = 000000B4 /* 000C8 80A32C98 0C00AC78 */ jal ActorShape_Init - + /* 000CC 80A32C9C 3C074210 */ lui $a3, 0x4210 ## $a3 = 42100000 /* 000D0 80A32CA0 26050198 */ addiu $a1, $s0, 0x0198 ## $a1 = 00000198 /* 000D4 80A32CA4 3C060601 */ lui $a2, 0x0601 ## $a2 = 06010000 /* 000D8 80A32CA8 260E01DC */ addiu $t6, $s0, 0x01DC ## $t6 = 000001DC /* 000DC 80A32CAC 260F0260 */ addiu $t7, $s0, 0x0260 ## $t7 = 00000260 /* 000E0 80A32CB0 24180016 */ addiu $t8, $zero, 0x0016 ## $t8 = 00000016 -/* 000E4 80A32CB4 AFB80018 */ sw $t8, 0x0018($sp) -/* 000E8 80A32CB8 AFAF0014 */ sw $t7, 0x0014($sp) -/* 000EC 80A32CBC AFAE0010 */ sw $t6, 0x0010($sp) +/* 000E4 80A32CB4 AFB80018 */ sw $t8, 0x0018($sp) +/* 000E8 80A32CB8 AFAF0014 */ sw $t7, 0x0014($sp) +/* 000EC 80A32CBC AFAE0010 */ sw $t6, 0x0010($sp) /* 000F0 80A32CC0 24C68968 */ addiu $a2, $a2, 0x8968 ## $a2 = 06008968 -/* 000F4 80A32CC4 AFA50030 */ sw $a1, 0x0030($sp) -/* 000F8 80A32CC8 8FA40044 */ lw $a0, 0x0044($sp) -/* 000FC 80A32CCC 0C0291BE */ jal func_800A46F8 +/* 000F4 80A32CC4 AFA50030 */ sw $a1, 0x0030($sp) +/* 000F8 80A32CC8 8FA40044 */ lw $a0, 0x0044($sp) +/* 000FC 80A32CCC 0C0291BE */ jal SkelAnime_InitSV /* 00100 80A32CD0 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 /* 00104 80A32CD4 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 /* 00108 80A32CD8 24A59ED4 */ addiu $a1, $a1, 0x9ED4 ## $a1 = 06009ED4 -/* 0010C 80A32CDC 0C0294BE */ jal func_800A52F8 -/* 00110 80A32CE0 8FA40030 */ lw $a0, 0x0030($sp) +/* 0010C 80A32CDC 0C0294BE */ jal SkelAnime_ChangeAnimDefaultRepeat +/* 00110 80A32CE0 8FA40030 */ lw $a0, 0x0030($sp) /* 00114 80A32CE4 2605014C */ addiu $a1, $s0, 0x014C ## $a1 = 0000014C -/* 00118 80A32CE8 AFA50030 */ sw $a1, 0x0030($sp) +/* 00118 80A32CE8 AFA50030 */ sw $a1, 0x0030($sp) /* 0011C 80A32CEC 0C0170D9 */ jal ActorCollider_AllocCylinder - -/* 00120 80A32CF0 8FA40044 */ lw $a0, 0x0044($sp) + +/* 00120 80A32CF0 8FA40044 */ lw $a0, 0x0044($sp) /* 00124 80A32CF4 3C0780A3 */ lui $a3, %hi(D_80A34310) ## $a3 = 80A30000 -/* 00128 80A32CF8 8FA50030 */ lw $a1, 0x0030($sp) +/* 00128 80A32CF8 8FA50030 */ lw $a1, 0x0030($sp) /* 0012C 80A32CFC 24E74310 */ addiu $a3, $a3, %lo(D_80A34310) ## $a3 = 80A34310 -/* 00130 80A32D00 8FA40044 */ lw $a0, 0x0044($sp) +/* 00130 80A32D00 8FA40044 */ lw $a0, 0x0044($sp) /* 00134 80A32D04 0C01712B */ jal ActorCollider_InitCylinder - + /* 00138 80A32D08 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 0013C 80A32D0C 241900FF */ addiu $t9, $zero, 0x00FF ## $t9 = 000000FF /* 00140 80A32D10 3C053C23 */ lui $a1, 0x3C23 ## $a1 = 3C230000 /* 00144 80A32D14 A21900AE */ sb $t9, 0x00AE($s0) ## 000000AE /* 00148 80A32D18 34A5D70A */ ori $a1, $a1, 0xD70A ## $a1 = 3C23D70A /* 0014C 80A32D1C 0C00B58B */ jal Actor_SetScale - + /* 00150 80A32D20 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00154 80A32D24 8FA80044 */ lw $t0, 0x0044($sp) +/* 00154 80A32D24 8FA80044 */ lw $t0, 0x0044($sp) /* 00158 80A32D28 2401005A */ addiu $at, $zero, 0x005A ## $at = 0000005A /* 0015C 80A32D2C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 00160 80A32D30 850900A4 */ lh $t1, 0x00A4($t0) ## 000000A4 -/* 00164 80A32D34 15210004 */ bne $t1, $at, .L80A32D48 +/* 00164 80A32D34 15210004 */ bne $t1, $at, .L80A32D48 /* 00168 80A32D38 3C01447A */ lui $at, 0x447A ## $at = 447A0000 /* 0016C 80A32D3C 44812000 */ mtc1 $at, $f4 ## $f4 = 1000.00 -/* 00170 80A32D40 10000005 */ beq $zero, $zero, .L80A32D58 +/* 00170 80A32D40 10000005 */ beq $zero, $zero, .L80A32D58 /* 00174 80A32D44 E60400F4 */ swc1 $f4, 0x00F4($s0) ## 000000F4 .L80A32D48: /* 00178 80A32D48 3C014496 */ lui $at, 0x4496 ## $at = 44960000 @@ -69,46 +69,46 @@ glabel EnGe2_Init /* 00198 80A32D68 448B4000 */ mtc1 $t3, $f8 ## $f8 = 0.00 /* 0019C 80A32D6C 8602001C */ lh $v0, 0x001C($s0) ## 0000001C /* 001A0 80A32D70 A6000034 */ sh $zero, 0x0034($s0) ## 00000034 -/* 001A4 80A32D74 468042A0 */ cvt.s.w $f10, $f8 +/* 001A4 80A32D74 468042A0 */ cvt.s.w $f10, $f8 /* 001A8 80A32D78 304200FF */ andi $v0, $v0, 0x00FF ## $v0 = 00000000 /* 001AC 80A32D7C A60000B8 */ sh $zero, 0x00B8($s0) ## 000000B8 /* 001B0 80A32D80 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 001B4 80A32D84 46105482 */ mul.s $f18, $f10, $f16 -/* 001B8 80A32D88 10400008 */ beq $v0, $zero, .L80A32DAC +/* 001B4 80A32D84 46105482 */ mul.s $f18, $f10, $f16 +/* 001B8 80A32D88 10400008 */ beq $v0, $zero, .L80A32DAC /* 001BC 80A32D8C E61202FC */ swc1 $f18, 0x02FC($s0) ## 000002FC -/* 001C0 80A32D90 10410011 */ beq $v0, $at, .L80A32DD8 +/* 001C0 80A32D90 10410011 */ beq $v0, $at, .L80A32DD8 /* 001C4 80A32D94 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 001C8 80A32D98 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 001CC 80A32D9C 10410019 */ beq $v0, $at, .L80A32E04 +/* 001CC 80A32D9C 10410019 */ beq $v0, $at, .L80A32E04 /* 001D0 80A32DA0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 001D4 80A32DA4 10000022 */ beq $zero, $zero, .L80A32E30 +/* 001D4 80A32DA4 10000022 */ beq $zero, $zero, .L80A32E30 /* 001D8 80A32DA8 3C0480A3 */ lui $a0, %hi(D_80A343D0) ## $a0 = 80A30000 .L80A32DAC: -/* 001DC 80A32DAC 0C28CAF4 */ jal func_80A32BD0 +/* 001DC 80A32DAC 0C28CAF4 */ jal func_80A32BD0 /* 001E0 80A32DB0 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 001E4 80A32DB4 0C28CC28 */ jal func_80A330A0 +/* 001E4 80A32DB4 0C28CC28 */ jal func_80A330A0 /* 001E8 80A32DB8 00000000 */ nop -/* 001EC 80A32DBC 10400021 */ beq $v0, $zero, .L80A32E44 +/* 001EC 80A32DBC 10400021 */ beq $v0, $zero, .L80A32E44 /* 001F0 80A32DC0 3C0C80A3 */ lui $t4, %hi(func_80A33D10) ## $t4 = 80A30000 /* 001F4 80A32DC4 258C3D10 */ addiu $t4, $t4, %lo(func_80A33D10) ## $t4 = 80A33D10 /* 001F8 80A32DC8 240D0006 */ addiu $t5, $zero, 0x0006 ## $t5 = 00000006 /* 001FC 80A32DCC AE0C0130 */ sw $t4, 0x0130($s0) ## 00000130 -/* 00200 80A32DD0 1000001C */ beq $zero, $zero, .L80A32E44 +/* 00200 80A32DD0 1000001C */ beq $zero, $zero, .L80A32E44 /* 00204 80A32DD4 A20D001F */ sb $t5, 0x001F($s0) ## 0000001F .L80A32DD8: -/* 00208 80A32DD8 0C28CAF4 */ jal func_80A32BD0 +/* 00208 80A32DD8 0C28CAF4 */ jal func_80A32BD0 /* 0020C 80A32DDC 24050007 */ addiu $a1, $zero, 0x0007 ## $a1 = 00000007 -/* 00210 80A32DE0 0C28CC28 */ jal func_80A330A0 +/* 00210 80A32DE0 0C28CC28 */ jal func_80A330A0 /* 00214 80A32DE4 00000000 */ nop -/* 00218 80A32DE8 10400016 */ beq $v0, $zero, .L80A32E44 +/* 00218 80A32DE8 10400016 */ beq $v0, $zero, .L80A32E44 /* 0021C 80A32DEC 3C0E80A3 */ lui $t6, %hi(func_80A33D10) ## $t6 = 80A30000 /* 00220 80A32DF0 25CE3D10 */ addiu $t6, $t6, %lo(func_80A33D10) ## $t6 = 80A33D10 /* 00224 80A32DF4 240F0006 */ addiu $t7, $zero, 0x0006 ## $t7 = 00000006 /* 00228 80A32DF8 AE0E0130 */ sw $t6, 0x0130($s0) ## 00000130 -/* 0022C 80A32DFC 10000011 */ beq $zero, $zero, .L80A32E44 +/* 0022C 80A32DFC 10000011 */ beq $zero, $zero, .L80A32E44 /* 00230 80A32E00 A20F001F */ sb $t7, 0x001F($s0) ## 0000001F .L80A32E04: -/* 00234 80A32E04 0C28CAF4 */ jal func_80A32BD0 +/* 00234 80A32E04 0C28CAF4 */ jal func_80A32BD0 /* 00238 80A32E08 24050008 */ addiu $a1, $zero, 0x0008 ## $a1 = 00000008 /* 0023C 80A32E0C 3C1880A3 */ lui $t8, %hi(func_80A33DE0) ## $t8 = 80A30000 /* 00240 80A32E10 3C1980A3 */ lui $t9, %hi(func_80A33AFC) ## $t9 = 80A30000 @@ -117,14 +117,14 @@ glabel EnGe2_Init /* 0024C 80A32E1C 24080006 */ addiu $t0, $zero, 0x0006 ## $t0 = 00000006 /* 00250 80A32E20 AE180130 */ sw $t8, 0x0130($s0) ## 00000130 /* 00254 80A32E24 AE190308 */ sw $t9, 0x0308($s0) ## 00000308 -/* 00258 80A32E28 10000006 */ beq $zero, $zero, .L80A32E44 +/* 00258 80A32E28 10000006 */ beq $zero, $zero, .L80A32E44 /* 0025C 80A32E2C A208001F */ sb $t0, 0x001F($s0) ## 0000001F .L80A32E30: /* 00260 80A32E30 3C0580A3 */ lui $a1, %hi(D_80A343D4) ## $a1 = 80A30000 /* 00264 80A32E34 24A543D4 */ addiu $a1, $a1, %lo(D_80A343D4) ## $a1 = 80A343D4 /* 00268 80A32E38 248443D0 */ addiu $a0, $a0, %lo(D_80A343D0) ## $a0 = 000043D0 /* 0026C 80A32E3C 0C0007FC */ jal __assert - + /* 00270 80A32E40 240601A2 */ addiu $a2, $zero, 0x01A2 ## $a2 = 000001A2 .L80A32E44: /* 00274 80A32E44 860A001C */ lh $t2, 0x001C($s0) ## 0000001C @@ -132,12 +132,12 @@ glabel EnGe2_Init /* 0027C 80A32E4C 44812000 */ mtc1 $at, $f4 ## $f4 = -4.00 /* 00280 80A32E50 314BFF00 */ andi $t3, $t2, 0xFF00 ## $t3 = 00000000 /* 00284 80A32E54 3C01BF80 */ lui $at, 0xBF80 ## $at = BF800000 -/* 00288 80A32E58 000B6203 */ sra $t4, $t3, 8 +/* 00288 80A32E58 000B6203 */ sra $t4, $t3, 8 /* 0028C 80A32E5C 44813000 */ mtc1 $at, $f6 ## $f6 = -1.00 /* 00290 80A32E60 86090032 */ lh $t1, 0x0032($s0) ## 00000032 -/* 00294 80A32E64 000C6880 */ sll $t5, $t4, 2 -/* 00298 80A32E68 01AC6821 */ addu $t5, $t5, $t4 -/* 0029C 80A32E6C 000D6840 */ sll $t5, $t5, 1 +/* 00294 80A32E64 000C6880 */ sll $t5, $t4, 2 +/* 00298 80A32E68 01AC6821 */ addu $t5, $t5, $t4 +/* 0029C 80A32E6C 000D6840 */ sll $t5, $t5, 1 /* 002A0 80A32E70 A60002F4 */ sh $zero, 0x02F4($s0) ## 000002F4 /* 002A4 80A32E74 A2000304 */ sb $zero, 0x0304($s0) ## 00000304 /* 002A8 80A32E78 A6000302 */ sh $zero, 0x0302($s0) ## 00000302 @@ -146,10 +146,10 @@ glabel EnGe2_Init /* 002B4 80A32E84 E6040070 */ swc1 $f4, 0x0070($s0) ## 00000070 /* 002B8 80A32E88 E606006C */ swc1 $f6, 0x006C($s0) ## 0000006C /* 002BC 80A32E8C A60902F6 */ sh $t1, 0x02F6($s0) ## 000002F6 -/* 002C0 80A32E90 8FBF002C */ lw $ra, 0x002C($sp) -/* 002C4 80A32E94 8FB00028 */ lw $s0, 0x0028($sp) +/* 002C0 80A32E90 8FBF002C */ lw $ra, 0x002C($sp) +/* 002C4 80A32E94 8FB00028 */ lw $s0, 0x0028($sp) /* 002C8 80A32E98 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 -/* 002CC 80A32E9C 03E00008 */ jr $ra +/* 002CC 80A32E9C 03E00008 */ jr $ra /* 002D0 80A32EA0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ge2/func_80A32BD0.s b/asm/non_matchings/overlays/actors/ovl_En_Ge2/func_80A32BD0.s index 26312ae8ee..82a9ffa57b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ge2/func_80A32BD0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ge2/func_80A32BD0.s @@ -1,46 +1,46 @@ glabel func_80A32BD0 -/* 00000 80A32BD0 00051080 */ sll $v0, $a1, 2 +/* 00000 80A32BD0 00051080 */ sll $v0, $a1, 2 /* 00004 80A32BD4 3C0E80A3 */ lui $t6, %hi(D_80A3433C) ## $t6 = 80A30000 /* 00008 80A32BD8 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 0000C 80A32BDC 01C27021 */ addu $t6, $t6, $v0 -/* 00010 80A32BE0 8DCE433C */ lw $t6, %lo(D_80A3433C)($t6) +/* 0000C 80A32BDC 01C27021 */ addu $t6, $t6, $v0 +/* 00010 80A32BE0 8DCE433C */ lw $t6, %lo(D_80A3433C)($t6) /* 00014 80A32BE4 3C1880A3 */ lui $t8, %hi(D_80A34360) ## $t8 = 80A30000 -/* 00018 80A32BE8 AFBF0024 */ sw $ra, 0x0024($sp) -/* 0001C 80A32BEC AFA40030 */ sw $a0, 0x0030($sp) -/* 00020 80A32BF0 AFA50034 */ sw $a1, 0x0034($sp) +/* 00018 80A32BE8 AFBF0024 */ sw $ra, 0x0024($sp) +/* 0001C 80A32BEC AFA40030 */ sw $a0, 0x0030($sp) +/* 00020 80A32BF0 AFA50034 */ sw $a1, 0x0034($sp) /* 00024 80A32BF4 27184360 */ addiu $t8, $t8, %lo(D_80A34360) ## $t8 = 80A34360 -/* 00028 80A32BF8 00581821 */ addu $v1, $v0, $t8 +/* 00028 80A32BF8 00581821 */ addu $v1, $v0, $t8 /* 0002C 80A32BFC AC8E0308 */ sw $t6, 0x0308($a0) ## 00000308 -/* 00030 80A32C00 AFA30028 */ sw $v1, 0x0028($sp) +/* 00030 80A32C00 AFA30028 */ sw $v1, 0x0028($sp) /* 00034 80A32C04 0C028800 */ jal SkelAnime_GetFrameCount - + /* 00038 80A32C08 8C640000 */ lw $a0, 0x0000($v1) ## 00000000 /* 0003C 80A32C0C 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 -/* 00040 80A32C10 8FB90034 */ lw $t9, 0x0034($sp) +/* 00040 80A32C10 8FB90034 */ lw $t9, 0x0034($sp) /* 00044 80A32C14 3C0880A3 */ lui $t0, %hi(D_80A34384) ## $t0 = 80A30000 -/* 00048 80A32C18 468021A0 */ cvt.s.w $f6, $f4 +/* 00048 80A32C18 468021A0 */ cvt.s.w $f6, $f4 /* 0004C 80A32C1C 3C01C100 */ lui $at, 0xC100 ## $at = C1000000 -/* 00050 80A32C20 01194021 */ addu $t0, $t0, $t9 -/* 00054 80A32C24 91084384 */ lbu $t0, %lo(D_80A34384)($t0) +/* 00050 80A32C20 01194021 */ addu $t0, $t0, $t9 +/* 00054 80A32C24 91084384 */ lbu $t0, %lo(D_80A34384)($t0) /* 00058 80A32C28 44814000 */ mtc1 $at, $f8 ## $f8 = -8.00 -/* 0005C 80A32C2C 8FA30028 */ lw $v1, 0x0028($sp) -/* 00060 80A32C30 8FA40030 */ lw $a0, 0x0030($sp) -/* 00064 80A32C34 E7A60010 */ swc1 $f6, 0x0010($sp) +/* 0005C 80A32C2C 8FA30028 */ lw $v1, 0x0028($sp) +/* 00060 80A32C30 8FA40030 */ lw $a0, 0x0030($sp) +/* 00064 80A32C34 E7A60010 */ swc1 $f6, 0x0010($sp) /* 00068 80A32C38 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 0006C 80A32C3C 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 00070 80A32C40 AFA80014 */ sw $t0, 0x0014($sp) +/* 00070 80A32C40 AFA80014 */ sw $t0, 0x0014($sp) /* 00074 80A32C44 8C650000 */ lw $a1, 0x0000($v1) ## 00000000 -/* 00078 80A32C48 E7A80018 */ swc1 $f8, 0x0018($sp) -/* 0007C 80A32C4C 0C029468 */ jal SkelAnime_ChangeAnimation - +/* 00078 80A32C48 E7A80018 */ swc1 $f8, 0x0018($sp) +/* 0007C 80A32C4C 0C029468 */ jal SkelAnime_ChangeAnim + /* 00080 80A32C50 24840198 */ addiu $a0, $a0, 0x0198 ## $a0 = 00000198 -/* 00084 80A32C54 8FA20030 */ lw $v0, 0x0030($sp) +/* 00084 80A32C54 8FA20030 */ lw $v0, 0x0030($sp) /* 00088 80A32C58 944902F4 */ lhu $t1, 0x02F4($v0) ## 000002F4 /* 0008C 80A32C5C 312AFFFD */ andi $t2, $t1, 0xFFFD ## $t2 = 00000000 /* 00090 80A32C60 A44A02F4 */ sh $t2, 0x02F4($v0) ## 000002F4 -/* 00094 80A32C64 8FBF0024 */ lw $ra, 0x0024($sp) +/* 00094 80A32C64 8FBF0024 */ lw $ra, 0x0024($sp) /* 00098 80A32C68 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 0009C 80A32C6C 03E00008 */ jr $ra +/* 0009C 80A32C6C 03E00008 */ jr $ra /* 000A0 80A32C70 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ge3/EnGe3_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Ge3/EnGe3_Draw.s index a3b087d5ae..d40698ea31 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ge3/EnGe3_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ge3/EnGe3_Draw.s @@ -1,20 +1,20 @@ glabel EnGe3_Draw /* 00A40 80A35060 27BDFFA8 */ addiu $sp, $sp, 0xFFA8 ## $sp = FFFFFFA8 -/* 00A44 80A35064 AFB10028 */ sw $s1, 0x0028($sp) +/* 00A44 80A35064 AFB10028 */ sw $s1, 0x0028($sp) /* 00A48 80A35068 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 -/* 00A4C 80A3506C AFBF002C */ sw $ra, 0x002C($sp) -/* 00A50 80A35070 AFB00024 */ sw $s0, 0x0024($sp) +/* 00A4C 80A3506C AFBF002C */ sw $ra, 0x002C($sp) +/* 00A50 80A35070 AFB00024 */ sw $s0, 0x0024($sp) /* 00A54 80A35074 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 /* 00A58 80A35078 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 00A5C 80A3507C 3C0680A3 */ lui $a2, %hi(D_80A35200) ## $a2 = 80A30000 /* 00A60 80A35080 24C65200 */ addiu $a2, $a2, %lo(D_80A35200) ## $a2 = 80A35200 /* 00A64 80A35084 27A4003C */ addiu $a0, $sp, 0x003C ## $a0 = FFFFFFE4 /* 00A68 80A35088 24070266 */ addiu $a3, $zero, 0x0266 ## $a3 = 00000266 -/* 00A6C 80A3508C 0C031AB1 */ jal func_800C6AC4 -/* 00A70 80A35090 AFA5004C */ sw $a1, 0x004C($sp) -/* 00A74 80A35094 0C0250F2 */ jal func_800943C8 +/* 00A6C 80A3508C 0C031AB1 */ jal Graph_OpenDisps +/* 00A70 80A35090 AFA5004C */ sw $a1, 0x004C($sp) +/* 00A74 80A35094 0C0250F2 */ jal func_800943C8 /* 00A78 80A35098 8E240000 */ lw $a0, 0x0000($s1) ## 00000000 -/* 00A7C 80A3509C 8FA5004C */ lw $a1, 0x004C($sp) +/* 00A7C 80A3509C 8FA5004C */ lw $a1, 0x004C($sp) /* 00A80 80A350A0 3C0FDB06 */ lui $t7, 0xDB06 ## $t7 = DB060000 /* 00A84 80A350A4 35EF0020 */ ori $t7, $t7, 0x0020 ## $t7 = DB060020 /* 00A88 80A350A8 8CA302C0 */ lw $v1, 0x02C0($a1) ## 000002C0 @@ -26,22 +26,22 @@ glabel EnGe3_Draw /* 00AA0 80A350C0 861802FC */ lh $t8, 0x02FC($s0) ## 000002FC /* 00AA4 80A350C4 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 /* 00AA8 80A350C8 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF -/* 00AAC 80A350CC 0018C880 */ sll $t9, $t8, 2 -/* 00AB0 80A350D0 00992021 */ addu $a0, $a0, $t9 -/* 00AB4 80A350D4 8C8451D4 */ lw $a0, %lo(D_80A351D4)($a0) +/* 00AAC 80A350CC 0018C880 */ sll $t9, $t8, 2 +/* 00AB0 80A350D0 00992021 */ addu $a0, $a0, $t9 +/* 00AB4 80A350D4 8C8451D4 */ lw $a0, %lo(D_80A351D4)($a0) /* 00AB8 80A350D8 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 /* 00ABC 80A350DC 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 00AC0 80A350E0 00044900 */ sll $t1, $a0, 4 -/* 00AC4 80A350E4 00095702 */ srl $t2, $t1, 28 -/* 00AC8 80A350E8 000A5880 */ sll $t3, $t2, 2 -/* 00ACC 80A350EC 018B6021 */ addu $t4, $t4, $t3 +/* 00AC0 80A350E0 00044900 */ sll $t1, $a0, 4 +/* 00AC4 80A350E4 00095702 */ srl $t2, $t1, 28 +/* 00AC8 80A350E8 000A5880 */ sll $t3, $t2, 2 +/* 00ACC 80A350EC 018B6021 */ addu $t4, $t4, $t3 /* 00AD0 80A350F0 8D8C6FA8 */ lw $t4, 0x6FA8($t4) ## 80166FA8 -/* 00AD4 80A350F4 00814024 */ and $t0, $a0, $at +/* 00AD4 80A350F4 00814024 */ and $t0, $a0, $at /* 00AD8 80A350F8 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 00ADC 80A350FC 010C6821 */ addu $t5, $t0, $t4 -/* 00AE0 80A35100 01A17021 */ addu $t6, $t5, $at +/* 00ADC 80A350FC 010C6821 */ addu $t5, $t0, $t4 +/* 00AE0 80A35100 01A17021 */ addu $t6, $t5, $at /* 00AE4 80A35104 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00AE8 80A35108 0C00BAF3 */ jal func_8002EBCC +/* 00AE8 80A35108 0C00BAF3 */ jal func_8002EBCC /* 00AEC 80A3510C AC6E0004 */ sw $t6, 0x0004($v1) ## 00000004 /* 00AF0 80A35110 8E05019C */ lw $a1, 0x019C($s0) ## 0000019C /* 00AF4 80A35114 8E0601B8 */ lw $a2, 0x01B8($s0) ## 000001B8 @@ -50,21 +50,21 @@ glabel EnGe3_Draw /* 00B00 80A35120 3C1880A3 */ lui $t8, %hi(func_80A35004) ## $t8 = 80A30000 /* 00B04 80A35124 27185004 */ addiu $t8, $t8, %lo(func_80A35004) ## $t8 = 80A35004 /* 00B08 80A35128 25EF4E58 */ addiu $t7, $t7, %lo(func_80A34E58) ## $t7 = 80A34E58 -/* 00B0C 80A3512C AFAF0010 */ sw $t7, 0x0010($sp) -/* 00B10 80A35130 AFB80014 */ sw $t8, 0x0014($sp) -/* 00B14 80A35134 AFB00018 */ sw $s0, 0x0018($sp) -/* 00B18 80A35138 0C0286B2 */ jal func_800A1AC8 +/* 00B0C 80A3512C AFAF0010 */ sw $t7, 0x0010($sp) +/* 00B10 80A35130 AFB80014 */ sw $t8, 0x0014($sp) +/* 00B14 80A35134 AFB00018 */ sw $s0, 0x0018($sp) +/* 00B18 80A35138 0C0286B2 */ jal SkelAnime_DrawSV /* 00B1C 80A3513C 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 00B20 80A35140 3C0680A3 */ lui $a2, %hi(D_80A35210) ## $a2 = 80A30000 /* 00B24 80A35144 24C65210 */ addiu $a2, $a2, %lo(D_80A35210) ## $a2 = 80A35210 /* 00B28 80A35148 27A4003C */ addiu $a0, $sp, 0x003C ## $a0 = FFFFFFE4 /* 00B2C 80A3514C 8E250000 */ lw $a1, 0x0000($s1) ## 00000000 -/* 00B30 80A35150 0C031AD5 */ jal func_800C6B54 +/* 00B30 80A35150 0C031AD5 */ jal Graph_CloseDisps /* 00B34 80A35154 24070277 */ addiu $a3, $zero, 0x0277 ## $a3 = 00000277 -/* 00B38 80A35158 8FBF002C */ lw $ra, 0x002C($sp) -/* 00B3C 80A3515C 8FB00024 */ lw $s0, 0x0024($sp) -/* 00B40 80A35160 8FB10028 */ lw $s1, 0x0028($sp) -/* 00B44 80A35164 03E00008 */ jr $ra +/* 00B38 80A35158 8FBF002C */ lw $ra, 0x002C($sp) +/* 00B3C 80A3515C 8FB00024 */ lw $s0, 0x0024($sp) +/* 00B40 80A35160 8FB10028 */ lw $s1, 0x0028($sp) +/* 00B44 80A35164 03E00008 */ jr $ra /* 00B48 80A35168 27BD0058 */ addiu $sp, $sp, 0x0058 ## $sp = 00000000 /* 00B4C 80A3516C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ge3/EnGe3_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Ge3/EnGe3_Init.s index 16e91ee1bf..54bfc1a9f2 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ge3/EnGe3_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ge3/EnGe3_Init.s @@ -1,56 +1,56 @@ glabel EnGe3_Init /* 000A4 80A346C4 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 -/* 000A8 80A346C8 AFB00028 */ sw $s0, 0x0028($sp) +/* 000A8 80A346C8 AFB00028 */ sw $s0, 0x0028($sp) /* 000AC 80A346CC 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 000B0 80A346D0 AFBF002C */ sw $ra, 0x002C($sp) -/* 000B4 80A346D4 AFA50044 */ sw $a1, 0x0044($sp) +/* 000B0 80A346D0 AFBF002C */ sw $ra, 0x002C($sp) +/* 000B4 80A346D4 AFA50044 */ sw $a1, 0x0044($sp) /* 000B8 80A346D8 3C068003 */ lui $a2, 0x8003 ## $a2 = 80030000 /* 000BC 80A346DC 24C6B5EC */ addiu $a2, $a2, 0xB5EC ## $a2 = 8002B5EC /* 000C0 80A346E0 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 /* 000C4 80A346E4 248400B4 */ addiu $a0, $a0, 0x00B4 ## $a0 = 000000B4 /* 000C8 80A346E8 0C00AC78 */ jal ActorShape_Init - + /* 000CC 80A346EC 3C074210 */ lui $a3, 0x4210 ## $a3 = 42100000 /* 000D0 80A346F0 26050198 */ addiu $a1, $s0, 0x0198 ## $a1 = 00000198 /* 000D4 80A346F4 3C060601 */ lui $a2, 0x0601 ## $a2 = 06010000 /* 000D8 80A346F8 260E01DC */ addiu $t6, $s0, 0x01DC ## $t6 = 000001DC /* 000DC 80A346FC 260F026C */ addiu $t7, $s0, 0x026C ## $t7 = 0000026C /* 000E0 80A34700 24180018 */ addiu $t8, $zero, 0x0018 ## $t8 = 00000018 -/* 000E4 80A34704 AFB80018 */ sw $t8, 0x0018($sp) -/* 000E8 80A34708 AFAF0014 */ sw $t7, 0x0014($sp) -/* 000EC 80A3470C AFAE0010 */ sw $t6, 0x0010($sp) +/* 000E4 80A34704 AFB80018 */ sw $t8, 0x0018($sp) +/* 000E8 80A34708 AFAF0014 */ sw $t7, 0x0014($sp) +/* 000EC 80A3470C AFAE0010 */ sw $t6, 0x0010($sp) /* 000F0 80A34710 24C6A458 */ addiu $a2, $a2, 0xA458 ## $a2 = 0600A458 -/* 000F4 80A34714 AFA50034 */ sw $a1, 0x0034($sp) -/* 000F8 80A34718 8FA40044 */ lw $a0, 0x0044($sp) -/* 000FC 80A3471C 0C0291BE */ jal func_800A46F8 +/* 000F4 80A34714 AFA50034 */ sw $a1, 0x0034($sp) +/* 000F8 80A34718 8FA40044 */ lw $a0, 0x0044($sp) +/* 000FC 80A3471C 0C0291BE */ jal SkelAnime_InitSV /* 00100 80A34720 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 /* 00104 80A34724 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 /* 00108 80A34728 24A5B07C */ addiu $a1, $a1, 0xB07C ## $a1 = 0600B07C -/* 0010C 80A3472C 0C0294BE */ jal func_800A52F8 -/* 00110 80A34730 8FA40034 */ lw $a0, 0x0034($sp) +/* 0010C 80A3472C 0C0294BE */ jal SkelAnime_ChangeAnimDefaultRepeat +/* 00110 80A34730 8FA40034 */ lw $a0, 0x0034($sp) /* 00114 80A34734 2605014C */ addiu $a1, $s0, 0x014C ## $a1 = 0000014C -/* 00118 80A34738 AFA50034 */ sw $a1, 0x0034($sp) +/* 00118 80A34738 AFA50034 */ sw $a1, 0x0034($sp) /* 0011C 80A3473C 0C0170D9 */ jal ActorCollider_AllocCylinder - -/* 00120 80A34740 8FA40044 */ lw $a0, 0x0044($sp) + +/* 00120 80A34740 8FA40044 */ lw $a0, 0x0044($sp) /* 00124 80A34744 3C0780A3 */ lui $a3, %hi(D_80A35190) ## $a3 = 80A30000 -/* 00128 80A34748 8FA50034 */ lw $a1, 0x0034($sp) +/* 00128 80A34748 8FA50034 */ lw $a1, 0x0034($sp) /* 0012C 80A3474C 24E75190 */ addiu $a3, $a3, %lo(D_80A35190) ## $a3 = 80A35190 -/* 00130 80A34750 8FA40044 */ lw $a0, 0x0044($sp) +/* 00130 80A34750 8FA40044 */ lw $a0, 0x0044($sp) /* 00134 80A34754 0C01712B */ jal ActorCollider_InitCylinder - + /* 00138 80A34758 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 0013C 80A3475C 241900FF */ addiu $t9, $zero, 0x00FF ## $t9 = 000000FF /* 00140 80A34760 3C053C23 */ lui $a1, 0x3C23 ## $a1 = 3C230000 /* 00144 80A34764 A21900AE */ sb $t9, 0x00AE($s0) ## 000000AE /* 00148 80A34768 34A5D70A */ ori $a1, $a1, 0xD70A ## $a1 = 3C23D70A /* 0014C 80A3476C 0C00B58B */ jal Actor_SetScale - + /* 00150 80A34770 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 00154 80A34774 A6000034 */ sh $zero, 0x0034($s0) ## 00000034 /* 00158 80A34778 A60000B8 */ sh $zero, 0x00B8($s0) ## 000000B8 /* 0015C 80A3477C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00160 80A34780 0C28D188 */ jal func_80A34620 +/* 00160 80A34780 0C28D188 */ jal func_80A34620 /* 00164 80A34784 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 00168 80A34788 3C01C080 */ lui $at, 0xC080 ## $at = C0800000 /* 0016C 80A3478C 44812000 */ mtc1 $at, $f4 ## $f4 = -4.00 @@ -64,10 +64,10 @@ glabel EnGe3_Init /* 0018C 80A347AC A209001F */ sb $t1, 0x001F($s0) ## 0000001F /* 00190 80A347B0 E6040070 */ swc1 $f4, 0x0070($s0) ## 00000070 /* 00194 80A347B4 E606006C */ swc1 $f6, 0x006C($s0) ## 0000006C -/* 00198 80A347B8 8FBF002C */ lw $ra, 0x002C($sp) -/* 0019C 80A347BC 8FB00028 */ lw $s0, 0x0028($sp) +/* 00198 80A347B8 8FBF002C */ lw $ra, 0x002C($sp) +/* 0019C 80A347BC 8FB00028 */ lw $s0, 0x0028($sp) /* 001A0 80A347C0 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 -/* 001A4 80A347C4 03E00008 */ jr $ra +/* 001A4 80A347C4 03E00008 */ jr $ra /* 001A8 80A347C8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ge3/func_80A34620.s b/asm/non_matchings/overlays/actors/ovl_En_Ge3/func_80A34620.s index 8068d3528b..fb136beab4 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ge3/func_80A34620.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ge3/func_80A34620.s @@ -1,46 +1,46 @@ glabel func_80A34620 -/* 00000 80A34620 00051080 */ sll $v0, $a1, 2 +/* 00000 80A34620 00051080 */ sll $v0, $a1, 2 /* 00004 80A34624 3C0E80A3 */ lui $t6, %hi(D_80A351BC) ## $t6 = 80A30000 /* 00008 80A34628 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 0000C 80A3462C 01C27021 */ addu $t6, $t6, $v0 -/* 00010 80A34630 8DCE51BC */ lw $t6, %lo(D_80A351BC)($t6) +/* 0000C 80A3462C 01C27021 */ addu $t6, $t6, $v0 +/* 00010 80A34630 8DCE51BC */ lw $t6, %lo(D_80A351BC)($t6) /* 00014 80A34634 3C1880A3 */ lui $t8, %hi(D_80A351C0) ## $t8 = 80A30000 -/* 00018 80A34638 AFBF0024 */ sw $ra, 0x0024($sp) -/* 0001C 80A3463C AFA40030 */ sw $a0, 0x0030($sp) -/* 00020 80A34640 AFA50034 */ sw $a1, 0x0034($sp) +/* 00018 80A34638 AFBF0024 */ sw $ra, 0x0024($sp) +/* 0001C 80A3463C AFA40030 */ sw $a0, 0x0030($sp) +/* 00020 80A34640 AFA50034 */ sw $a1, 0x0034($sp) /* 00024 80A34644 271851C0 */ addiu $t8, $t8, %lo(D_80A351C0) ## $t8 = 80A351C0 -/* 00028 80A34648 00581821 */ addu $v1, $v0, $t8 +/* 00028 80A34648 00581821 */ addu $v1, $v0, $t8 /* 0002C 80A3464C AC8E0310 */ sw $t6, 0x0310($a0) ## 00000310 -/* 00030 80A34650 AFA30028 */ sw $v1, 0x0028($sp) +/* 00030 80A34650 AFA30028 */ sw $v1, 0x0028($sp) /* 00034 80A34654 0C028800 */ jal SkelAnime_GetFrameCount - + /* 00038 80A34658 8C640000 */ lw $a0, 0x0000($v1) ## 00000000 /* 0003C 80A3465C 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 -/* 00040 80A34660 8FB90034 */ lw $t9, 0x0034($sp) +/* 00040 80A34660 8FB90034 */ lw $t9, 0x0034($sp) /* 00044 80A34664 3C0880A3 */ lui $t0, %hi(D_80A351C4) ## $t0 = 80A30000 -/* 00048 80A34668 468021A0 */ cvt.s.w $f6, $f4 +/* 00048 80A34668 468021A0 */ cvt.s.w $f6, $f4 /* 0004C 80A3466C 3C01C100 */ lui $at, 0xC100 ## $at = C1000000 -/* 00050 80A34670 01194021 */ addu $t0, $t0, $t9 -/* 00054 80A34674 910851C4 */ lbu $t0, %lo(D_80A351C4)($t0) +/* 00050 80A34670 01194021 */ addu $t0, $t0, $t9 +/* 00054 80A34674 910851C4 */ lbu $t0, %lo(D_80A351C4)($t0) /* 00058 80A34678 44814000 */ mtc1 $at, $f8 ## $f8 = -8.00 -/* 0005C 80A3467C 8FA30028 */ lw $v1, 0x0028($sp) -/* 00060 80A34680 8FA40030 */ lw $a0, 0x0030($sp) -/* 00064 80A34684 E7A60010 */ swc1 $f6, 0x0010($sp) +/* 0005C 80A3467C 8FA30028 */ lw $v1, 0x0028($sp) +/* 00060 80A34680 8FA40030 */ lw $a0, 0x0030($sp) +/* 00064 80A34684 E7A60010 */ swc1 $f6, 0x0010($sp) /* 00068 80A34688 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 0006C 80A3468C 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 00070 80A34690 AFA80014 */ sw $t0, 0x0014($sp) +/* 00070 80A34690 AFA80014 */ sw $t0, 0x0014($sp) /* 00074 80A34694 8C650000 */ lw $a1, 0x0000($v1) ## 00000000 -/* 00078 80A34698 E7A80018 */ swc1 $f8, 0x0018($sp) -/* 0007C 80A3469C 0C029468 */ jal SkelAnime_ChangeAnimation - +/* 00078 80A34698 E7A80018 */ swc1 $f8, 0x0018($sp) +/* 0007C 80A3469C 0C029468 */ jal SkelAnime_ChangeAnim + /* 00080 80A346A0 24840198 */ addiu $a0, $a0, 0x0198 ## $a0 = 00000198 -/* 00084 80A346A4 8FA20030 */ lw $v0, 0x0030($sp) +/* 00084 80A346A4 8FA20030 */ lw $v0, 0x0030($sp) /* 00088 80A346A8 9449030C */ lhu $t1, 0x030C($v0) ## 0000030C /* 0008C 80A346AC 312AFFFD */ andi $t2, $t1, 0xFFFD ## $t2 = 00000000 /* 00090 80A346B0 A44A030C */ sh $t2, 0x030C($v0) ## 0000030C -/* 00094 80A346B4 8FBF0024 */ lw $ra, 0x0024($sp) +/* 00094 80A346B4 8FBF0024 */ lw $ra, 0x0024($sp) /* 00098 80A346B8 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 0009C 80A346BC 03E00008 */ jr $ra +/* 0009C 80A346BC 03E00008 */ jr $ra /* 000A0 80A346C0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ge3/func_80A34E58.s b/asm/non_matchings/overlays/actors/ovl_En_Ge3/func_80A34E58.s index 61ffd4d864..b6db670923 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ge3/func_80A34E58.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ge3/func_80A34E58.s @@ -31,7 +31,7 @@ glabel func_80A34E58 /* 008A0 80A34EC0 24C651E0 */ addiu $a2, $a2, %lo(D_80A351E0) ## $a2 = 80A351E0 /* 008A4 80A34EC4 8D450000 */ lw $a1, 0x0000($t2) ## 00000000 /* 008A8 80A34EC8 24070223 */ addiu $a3, $zero, 0x0223 ## $a3 = 00000223 -/* 008AC 80A34ECC 0C031AB1 */ jal func_800C6AC4 +/* 008AC 80A34ECC 0C031AB1 */ jal Graph_OpenDisps /* 008B0 80A34ED0 AFA50050 */ sw $a1, 0x0050($sp) /* 008B4 80A34ED4 8FA2005C */ lw $v0, 0x005C($sp) /* 008B8 80A34ED8 24010003 */ addiu $at, $zero, 0x0003 ## $at = 00000003 @@ -107,7 +107,7 @@ glabel func_80A34E58 /* 009BC 80A34FDC 3C0680A3 */ lui $a2, %hi(D_80A351F0) ## $a2 = 80A30000 /* 009C0 80A34FE0 24C651F0 */ addiu $a2, $a2, %lo(D_80A351F0) ## $a2 = 80A351F0 /* 009C4 80A34FE4 24070236 */ addiu $a3, $zero, 0x0236 ## $a3 = 00000236 -/* 009C8 80A34FE8 0C031AD5 */ jal func_800C6B54 +/* 009C8 80A34FE8 0C031AD5 */ jal Graph_CloseDisps /* 009CC 80A34FEC 8D650000 */ lw $a1, 0x0000($t3) ## 8CAAE6FF /* 009D0 80A34FF0 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 .L80A34FF4: diff --git a/asm/non_matchings/overlays/actors/ovl_En_GeldB/EnGeldB_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_GeldB/EnGeldB_Draw.s index c6f968589a..f3a2e267a2 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_GeldB/EnGeldB_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_GeldB/EnGeldB_Draw.s @@ -1,118 +1,118 @@ glabel EnGeldB_Draw /* 04788 80A39A98 27BDFF28 */ addiu $sp, $sp, 0xFF28 ## $sp = FFFFFF28 -/* 0478C 80A39A9C AFBF004C */ sw $ra, 0x004C($sp) -/* 04790 80A39AA0 AFB40048 */ sw $s4, 0x0048($sp) -/* 04794 80A39AA4 AFB30044 */ sw $s3, 0x0044($sp) -/* 04798 80A39AA8 AFB20040 */ sw $s2, 0x0040($sp) -/* 0479C 80A39AAC AFB1003C */ sw $s1, 0x003C($sp) -/* 047A0 80A39AB0 AFB00038 */ sw $s0, 0x0038($sp) -/* 047A4 80A39AB4 AFA500DC */ sw $a1, 0x00DC($sp) +/* 0478C 80A39A9C AFBF004C */ sw $ra, 0x004C($sp) +/* 04790 80A39AA0 AFB40048 */ sw $s4, 0x0048($sp) +/* 04794 80A39AA4 AFB30044 */ sw $s3, 0x0044($sp) +/* 04798 80A39AA8 AFB20040 */ sw $s2, 0x0040($sp) +/* 0479C 80A39AAC AFB1003C */ sw $s1, 0x003C($sp) +/* 047A0 80A39AB0 AFB00038 */ sw $s0, 0x0038($sp) +/* 047A4 80A39AB4 AFA500DC */ sw $a1, 0x00DC($sp) /* 047A8 80A39AB8 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 /* 047AC 80A39ABC 0080A025 */ or $s4, $a0, $zero ## $s4 = 00000000 /* 047B0 80A39AC0 3C0680A4 */ lui $a2, %hi(D_80A3A200) ## $a2 = 80A40000 /* 047B4 80A39AC4 24C6A200 */ addiu $a2, $a2, %lo(D_80A3A200) ## $a2 = 80A3A200 /* 047B8 80A39AC8 27A400BC */ addiu $a0, $sp, 0x00BC ## $a0 = FFFFFFE4 /* 047BC 80A39ACC 24070A70 */ addiu $a3, $zero, 0x0A70 ## $a3 = 00000A70 -/* 047C0 80A39AD0 0C031AB1 */ jal func_800C6AC4 +/* 047C0 80A39AD0 0C031AB1 */ jal Graph_OpenDisps /* 047C4 80A39AD4 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 /* 047C8 80A39AD8 868F0312 */ lh $t7, 0x0312($s4) ## 00000312 /* 047CC 80A39ADC 26900188 */ addiu $s0, $s4, 0x0188 ## $s0 = 00000188 -/* 047D0 80A39AE0 29E10002 */ slti $at, $t7, 0x0002 -/* 047D4 80A39AE4 5420004D */ bnel $at, $zero, .L80A39C1C +/* 047D0 80A39AE0 29E10002 */ slti $at, $t7, 0x0002 +/* 047D4 80A39AE4 5420004D */ bnel $at, $zero, .L80A39C1C /* 047D8 80A39AE8 8E8B02EC */ lw $t3, 0x02EC($s4) ## 000002EC /* 047DC 80A39AEC 0C02927F */ jal SkelAnime_FrameUpdateMatrix - + /* 047E0 80A39AF0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000188 -/* 047E4 80A39AF4 50400049 */ beql $v0, $zero, .L80A39C1C +/* 047E4 80A39AF4 50400049 */ beql $v0, $zero, .L80A39C1C /* 047E8 80A39AF8 8E8B02EC */ lw $t3, 0x02EC($s4) ## 000002EC /* 047EC 80A39AFC 86980312 */ lh $t8, 0x0312($s4) ## 00000312 /* 047F0 80A39B00 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 /* 047F4 80A39B04 02002025 */ or $a0, $s0, $zero ## $a0 = 00000188 -/* 047F8 80A39B08 17010014 */ bne $t8, $at, .L80A39B5C +/* 047F8 80A39B08 17010014 */ bne $t8, $at, .L80A39B5C /* 047FC 80A39B0C 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 04800 80A39B10 3C014140 */ lui $at, 0x4140 ## $at = 41400000 /* 04804 80A39B14 44812000 */ mtc1 $at, $f4 ## $f4 = 12.00 /* 04808 80A39B18 3C014080 */ lui $at, 0x4080 ## $at = 40800000 /* 0480C 80A39B1C 44813000 */ mtc1 $at, $f6 ## $f6 = 4.00 /* 04810 80A39B20 24190003 */ addiu $t9, $zero, 0x0003 ## $t9 = 00000003 -/* 04814 80A39B24 AFB90014 */ sw $t9, 0x0014($sp) +/* 04814 80A39B24 AFB90014 */ sw $t9, 0x0014($sp) /* 04818 80A39B28 24A50F5C */ addiu $a1, $a1, 0x0F5C ## $a1 = 06000F5C /* 0481C 80A39B2C 3C063F00 */ lui $a2, 0x3F00 ## $a2 = 3F000000 /* 04820 80A39B30 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 04824 80A39B34 E7A40010 */ swc1 $f4, 0x0010($sp) -/* 04828 80A39B38 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 0482C 80A39B3C E7A60018 */ swc1 $f6, 0x0018($sp) +/* 04824 80A39B34 E7A40010 */ swc1 $f4, 0x0010($sp) +/* 04828 80A39B38 0C029468 */ jal SkelAnime_ChangeAnim + +/* 0482C 80A39B3C E7A60018 */ swc1 $f6, 0x0018($sp) /* 04830 80A39B40 86880312 */ lh $t0, 0x0312($s4) ## 00000312 /* 04834 80A39B44 8682008A */ lh $v0, 0x008A($s4) ## 0000008A /* 04838 80A39B48 25090001 */ addiu $t1, $t0, 0x0001 ## $t1 = 00000001 /* 0483C 80A39B4C A6890312 */ sh $t1, 0x0312($s4) ## 00000312 /* 04840 80A39B50 A68200B6 */ sh $v0, 0x00B6($s4) ## 000000B6 -/* 04844 80A39B54 10000030 */ beq $zero, $zero, .L80A39C18 +/* 04844 80A39B54 10000030 */ beq $zero, $zero, .L80A39C18 /* 04848 80A39B58 A6820032 */ sh $v0, 0x0032($s4) ## 00000032 .L80A39B5C: /* 0484C 80A39B5C 8E8A0300 */ lw $t2, 0x0300($s4) ## 00000300 /* 04850 80A39B60 3C048012 */ lui $a0, 0x8012 ## $a0 = 80120000 /* 04854 80A39B64 24847464 */ addiu $a0, $a0, 0x7464 ## $a0 = 80127464 /* 04858 80A39B68 254BFFFF */ addiu $t3, $t2, 0xFFFF ## $t3 = FFFFFFFF -/* 0485C 80A39B6C 1560002A */ bne $t3, $zero, .L80A39C18 +/* 0485C 80A39B6C 1560002A */ bne $t3, $zero, .L80A39C18 /* 04860 80A39B70 AE8B0300 */ sw $t3, 0x0300($s4) ## 00000300 /* 04864 80A39B74 908D000A */ lbu $t5, 0x000A($a0) ## 8012746E /* 04868 80A39B78 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 /* 0486C 80A39B7C 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 -/* 04870 80A39B80 004D7021 */ addu $t6, $v0, $t5 +/* 04870 80A39B80 004D7021 */ addu $t6, $v0, $t5 /* 04874 80A39B84 91CF0074 */ lbu $t7, 0x0074($t6) ## 00000074 /* 04878 80A39B88 240300FF */ addiu $v1, $zero, 0x00FF ## $v1 = 000000FF -/* 0487C 80A39B8C 8FAA00DC */ lw $t2, 0x00DC($sp) -/* 04880 80A39B90 106F0005 */ beq $v1, $t7, .L80A39BA8 +/* 0487C 80A39B8C 8FAA00DC */ lw $t2, 0x00DC($sp) +/* 04880 80A39B90 106F0005 */ beq $v1, $t7, .L80A39BA8 /* 04884 80A39B94 3C010001 */ lui $at, 0x0001 ## $at = 00010000 /* 04888 80A39B98 9098000B */ lbu $t8, 0x000B($a0) ## 8012746F -/* 0488C 80A39B9C 0058C821 */ addu $t9, $v0, $t8 +/* 0488C 80A39B9C 0058C821 */ addu $t9, $v0, $t8 /* 04890 80A39BA0 93280074 */ lbu $t0, 0x0074($t9) ## 00000074 -/* 04894 80A39BA4 14680004 */ bne $v1, $t0, .L80A39BB8 +/* 04894 80A39BA4 14680004 */ bne $v1, $t0, .L80A39BB8 .L80A39BA8: /* 04898 80A39BA8 240901A5 */ addiu $t1, $zero, 0x01A5 ## $t1 = 000001A5 -/* 0489C 80A39BAC 002A0821 */ addu $at, $at, $t2 -/* 048A0 80A39BB0 1000000F */ beq $zero, $zero, .L80A39BF0 +/* 0489C 80A39BAC 002A0821 */ addu $at, $at, $t2 +/* 048A0 80A39BB0 1000000F */ beq $zero, $zero, .L80A39BF0 /* 048A4 80A39BB4 A4291E1A */ sh $t1, 0x1E1A($at) ## 00011E1A .L80A39BB8: /* 048A8 80A39BB8 944B0EEC */ lhu $t3, 0x0EEC($v0) ## 8015F54C -/* 048AC 80A39BBC 8FB800DC */ lw $t8, 0x00DC($sp) +/* 048AC 80A39BBC 8FB800DC */ lw $t8, 0x00DC($sp) /* 048B0 80A39BC0 3C010001 */ lui $at, 0x0001 ## $at = 00010000 /* 048B4 80A39BC4 316C0080 */ andi $t4, $t3, 0x0080 ## $t4 = 00000080 -/* 048B8 80A39BC8 11800007 */ beq $t4, $zero, .L80A39BE8 -/* 048BC 80A39BCC 00380821 */ addu $at, $at, $t8 -/* 048C0 80A39BD0 8FAE00DC */ lw $t6, 0x00DC($sp) +/* 048B8 80A39BC8 11800007 */ beq $t4, $zero, .L80A39BE8 +/* 048BC 80A39BCC 00380821 */ addu $at, $at, $t8 +/* 048C0 80A39BD0 8FAE00DC */ lw $t6, 0x00DC($sp) /* 048C4 80A39BD4 3C010001 */ lui $at, 0x0001 ## $at = 00010000 /* 048C8 80A39BD8 240D05F8 */ addiu $t5, $zero, 0x05F8 ## $t5 = 000005F8 -/* 048CC 80A39BDC 002E0821 */ addu $at, $at, $t6 -/* 048D0 80A39BE0 10000003 */ beq $zero, $zero, .L80A39BF0 +/* 048CC 80A39BDC 002E0821 */ addu $at, $at, $t6 +/* 048D0 80A39BE0 10000003 */ beq $zero, $zero, .L80A39BF0 /* 048D4 80A39BE4 A42D1E1A */ sh $t5, 0x1E1A($at) ## 00011E1A .L80A39BE8: /* 048D8 80A39BE8 240F03B4 */ addiu $t7, $zero, 0x03B4 ## $t7 = 000003B4 /* 048DC 80A39BEC A42F1E1A */ sh $t7, 0x1E1A($at) ## 00011E1A .L80A39BF0: -/* 048E0 80A39BF0 8FA800DC */ lw $t0, 0x00DC($sp) +/* 048E0 80A39BF0 8FA800DC */ lw $t0, 0x00DC($sp) /* 048E4 80A39BF4 3C010001 */ lui $at, 0x0001 ## $at = 00010000 /* 048E8 80A39BF8 24190026 */ addiu $t9, $zero, 0x0026 ## $t9 = 00000026 -/* 048EC 80A39BFC 00280821 */ addu $at, $at, $t0 +/* 048EC 80A39BFC 00280821 */ addu $at, $at, $t0 /* 048F0 80A39C00 A0391E5E */ sb $t9, 0x1E5E($at) ## 00011E5E -/* 048F4 80A39C04 8FAA00DC */ lw $t2, 0x00DC($sp) +/* 048F4 80A39C04 8FAA00DC */ lw $t2, 0x00DC($sp) /* 048F8 80A39C08 3C010001 */ lui $at, 0x0001 ## $at = 00010000 /* 048FC 80A39C0C 24090014 */ addiu $t1, $zero, 0x0014 ## $t1 = 00000014 -/* 04900 80A39C10 002A0821 */ addu $at, $at, $t2 +/* 04900 80A39C10 002A0821 */ addu $at, $at, $t2 /* 04904 80A39C14 A0291E15 */ sb $t1, 0x1E15($at) ## 00011E15 .L80A39C18: /* 04908 80A39C18 8E8B02EC */ lw $t3, 0x02EC($s4) ## 000002EC .L80A39C1C: -/* 0490C 80A39C1C 8FAD00DC */ lw $t5, 0x00DC($sp) -/* 04910 80A39C20 15600004 */ bne $t3, $zero, .L80A39C34 +/* 0490C 80A39C1C 8FAD00DC */ lw $t5, 0x00DC($sp) +/* 04910 80A39C20 15600004 */ bne $t3, $zero, .L80A39C34 /* 04914 80A39C24 00000000 */ nop /* 04918 80A39C28 868C0318 */ lh $t4, 0x0318($s4) ## 00000318 -/* 0491C 80A39C2C 55800071 */ bnel $t4, $zero, .L80A39DF4 -/* 04920 80A39C30 8FAE00DC */ lw $t6, 0x00DC($sp) +/* 0491C 80A39C2C 55800071 */ bnel $t4, $zero, .L80A39DF4 +/* 04920 80A39C30 8FAE00DC */ lw $t6, 0x00DC($sp) .L80A39C34: -/* 04924 80A39C34 0C024F46 */ jal func_80093D18 +/* 04924 80A39C34 0C024F46 */ jal func_80093D18 /* 04928 80A39C38 8DA40000 */ lw $a0, 0x0000($t5) ## 000005F8 /* 0492C 80A39C3C 8E2302C0 */ lw $v1, 0x02C0($s1) ## 000002C0 /* 04930 80A39C40 3C0FDB06 */ lui $t7, 0xDB06 ## $t7 = DB060000 @@ -123,20 +123,20 @@ glabel EnGeldB_Draw /* 04944 80A39C54 9298031A */ lbu $t8, 0x031A($s4) ## 0000031A /* 04948 80A39C58 3C0480A4 */ lui $a0, %hi(D_80A3A1C4) ## $a0 = 80A40000 /* 0494C 80A39C5C 3C0C8016 */ lui $t4, 0x8016 ## $t4 = 80160000 -/* 04950 80A39C60 0018C880 */ sll $t9, $t8, 2 -/* 04954 80A39C64 00992021 */ addu $a0, $a0, $t9 -/* 04958 80A39C68 8C84A1C4 */ lw $a0, %lo(D_80A3A1C4)($a0) +/* 04950 80A39C60 0018C880 */ sll $t9, $t8, 2 +/* 04954 80A39C64 00992021 */ addu $a0, $a0, $t9 +/* 04958 80A39C68 8C84A1C4 */ lw $a0, %lo(D_80A3A1C4)($a0) /* 0495C 80A39C6C 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 /* 04960 80A39C70 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF -/* 04964 80A39C74 00044900 */ sll $t1, $a0, 4 -/* 04968 80A39C78 00095702 */ srl $t2, $t1, 28 -/* 0496C 80A39C7C 000A5880 */ sll $t3, $t2, 2 -/* 04970 80A39C80 018B6021 */ addu $t4, $t4, $t3 +/* 04964 80A39C74 00044900 */ sll $t1, $a0, 4 +/* 04968 80A39C78 00095702 */ srl $t2, $t1, 28 +/* 0496C 80A39C7C 000A5880 */ sll $t3, $t2, 2 +/* 04970 80A39C80 018B6021 */ addu $t4, $t4, $t3 /* 04974 80A39C84 8D8C6FA8 */ lw $t4, 0x6FA8($t4) ## 80166FA8 -/* 04978 80A39C88 00814024 */ and $t0, $a0, $at +/* 04978 80A39C88 00814024 */ and $t0, $a0, $at /* 0497C 80A39C8C 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 04980 80A39C90 010C6821 */ addu $t5, $t0, $t4 -/* 04984 80A39C94 01A17021 */ addu $t6, $t5, $at +/* 04980 80A39C90 010C6821 */ addu $t5, $t0, $t4 +/* 04984 80A39C94 01A17021 */ addu $t6, $t5, $at /* 04988 80A39C98 AC6E0004 */ sw $t6, 0x0004($v1) ## 00000004 /* 0498C 80A39C9C 9287018A */ lbu $a3, 0x018A($s4) ## 0000018A /* 04990 80A39CA0 8E8601A8 */ lw $a2, 0x01A8($s4) ## 000001A8 @@ -145,15 +145,15 @@ glabel EnGeldB_Draw /* 0499C 80A39CAC 3C0F80A4 */ lui $t7, %hi(func_80A39688) ## $t7 = 80A40000 /* 049A0 80A39CB0 25EF9688 */ addiu $t7, $t7, %lo(func_80A39688) ## $t7 = 80A39688 /* 049A4 80A39CB4 27189824 */ addiu $t8, $t8, %lo(func_80A39824) ## $t8 = 80A39824 -/* 049A8 80A39CB8 AFB80014 */ sw $t8, 0x0014($sp) -/* 049AC 80A39CBC AFAF0010 */ sw $t7, 0x0010($sp) -/* 049B0 80A39CC0 AFB40018 */ sw $s4, 0x0018($sp) -/* 049B4 80A39CC4 0C0286B2 */ jal func_800A1AC8 -/* 049B8 80A39CC8 8FA400DC */ lw $a0, 0x00DC($sp) +/* 049A8 80A39CB8 AFB80014 */ sw $t8, 0x0014($sp) +/* 049AC 80A39CBC AFAF0010 */ sw $t7, 0x0010($sp) +/* 049B0 80A39CC0 AFB40018 */ sw $s4, 0x0018($sp) +/* 049B4 80A39CC4 0C0286B2 */ jal SkelAnime_DrawSV +/* 049B8 80A39CC8 8FA400DC */ lw $a0, 0x00DC($sp) /* 049BC 80A39CCC 8E9902EC */ lw $t9, 0x02EC($s4) ## 000002EC /* 049C0 80A39CD0 24010006 */ addiu $at, $zero, 0x0006 ## $at = 00000006 /* 049C4 80A39CD4 3C1180A4 */ lui $s1, %hi(D_80A3A17C) ## $s1 = 80A40000 -/* 049C8 80A39CD8 17210020 */ bne $t9, $at, .L80A39D5C +/* 049C8 80A39CD8 17210020 */ bne $t9, $at, .L80A39D5C /* 049CC 80A39CDC 2631A17C */ addiu $s1, $s1, %lo(D_80A3A17C) ## $s1 = 80A3A17C /* 049D0 80A39CE0 3C1380A4 */ lui $s3, %hi(D_80A3A1A0) ## $s3 = 80A40000 /* 049D4 80A39CE4 2673A1A0 */ addiu $s3, $s3, %lo(D_80A3A1A0) ## $s3 = 80A3A1A0 @@ -161,36 +161,36 @@ glabel EnGeldB_Draw /* 049DC 80A39CEC 27B0006C */ addiu $s0, $sp, 0x006C ## $s0 = FFFFFF94 .L80A39CF0: /* 049E0 80A39CF0 02202025 */ or $a0, $s1, $zero ## $a0 = 80A3A17C -/* 049E4 80A39CF4 0C0346BD */ jal Matrix_MultVec3f +/* 049E4 80A39CF4 0C0346BD */ jal Matrix_MultVec3f /* 049E8 80A39CF8 02402825 */ or $a1, $s2, $zero ## $a1 = FFFFFFB8 /* 049EC 80A39CFC 02602025 */ or $a0, $s3, $zero ## $a0 = 80A3A1A0 -/* 049F0 80A39D00 0C0346BD */ jal Matrix_MultVec3f +/* 049F0 80A39D00 0C0346BD */ jal Matrix_MultVec3f /* 049F4 80A39D04 02002825 */ or $a1, $s0, $zero ## $a1 = FFFFFF94 /* 049F8 80A39D08 2610000C */ addiu $s0, $s0, 0x000C ## $s0 = FFFFFFA0 /* 049FC 80A39D0C 27A90090 */ addiu $t1, $sp, 0x0090 ## $t1 = FFFFFFB8 /* 04A00 80A39D10 2631000C */ addiu $s1, $s1, 0x000C ## $s1 = 80A3A188 /* 04A04 80A39D14 2652000C */ addiu $s2, $s2, 0x000C ## $s2 = FFFFFFC4 -/* 04A08 80A39D18 1609FFF5 */ bne $s0, $t1, .L80A39CF0 +/* 04A08 80A39D18 1609FFF5 */ bne $s0, $t1, .L80A39CF0 /* 04A0C 80A39D1C 2673000C */ addiu $s3, $s3, 0x000C ## $s3 = 80A3A1AC /* 04A10 80A39D20 269003EC */ addiu $s0, $s4, 0x03EC ## $s0 = 000003EC /* 04A14 80A39D24 27AA00A8 */ addiu $t2, $sp, 0x00A8 ## $t2 = FFFFFFD0 -/* 04A18 80A39D28 AFAA0010 */ sw $t2, 0x0010($sp) +/* 04A18 80A39D28 AFAA0010 */ sw $t2, 0x0010($sp) /* 04A1C 80A39D2C 02002025 */ or $a0, $s0, $zero ## $a0 = 000003EC /* 04A20 80A39D30 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 04A24 80A39D34 27A60090 */ addiu $a2, $sp, 0x0090 ## $a2 = FFFFFFB8 -/* 04A28 80A39D38 0C0189E8 */ jal func_800627A0 +/* 04A28 80A39D38 0C0189E8 */ jal func_800627A0 /* 04A2C 80A39D3C 27A7009C */ addiu $a3, $sp, 0x009C ## $a3 = FFFFFFC4 /* 04A30 80A39D40 27AB0084 */ addiu $t3, $sp, 0x0084 ## $t3 = FFFFFFAC -/* 04A34 80A39D44 AFAB0010 */ sw $t3, 0x0010($sp) +/* 04A34 80A39D44 AFAB0010 */ sw $t3, 0x0010($sp) /* 04A38 80A39D48 02002025 */ or $a0, $s0, $zero ## $a0 = 000003EC /* 04A3C 80A39D4C 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 /* 04A40 80A39D50 27A6006C */ addiu $a2, $sp, 0x006C ## $a2 = FFFFFF94 -/* 04A44 80A39D54 0C0189E8 */ jal func_800627A0 +/* 04A44 80A39D54 0C0189E8 */ jal func_800627A0 /* 04A48 80A39D58 27A70078 */ addiu $a3, $sp, 0x0078 ## $a3 = FFFFFFA0 .L80A39D5C: /* 04A4C 80A39D5C 868802FC */ lh $t0, 0x02FC($s4) ## 000002FC -/* 04A50 80A39D60 51000024 */ beql $t0, $zero, .L80A39DF4 -/* 04A54 80A39D64 8FAE00DC */ lw $t6, 0x00DC($sp) +/* 04A50 80A39D60 51000024 */ beql $t0, $zero, .L80A39DF4 +/* 04A54 80A39D64 8FAE00DC */ lw $t6, 0x00DC($sp) /* 04A58 80A39D68 868E02FC */ lh $t6, 0x02FC($s4) ## 000002FC /* 04A5C 80A39D6C 928C0114 */ lbu $t4, 0x0114($s4) ## 00000114 /* 04A60 80A39D70 02802825 */ or $a1, $s4, $zero ## $a1 = 00000000 @@ -200,47 +200,47 @@ glabel EnGeldB_Draw /* 04A70 80A39D80 258D0001 */ addiu $t5, $t4, 0x0001 ## $t5 = 00000001 /* 04A74 80A39D84 A28D0114 */ sb $t5, 0x0114($s4) ## 00000114 /* 04A78 80A39D88 30780003 */ andi $t8, $v1, 0x0003 ## $t8 = 00000000 -/* 04A7C 80A39D8C 17000018 */ bne $t8, $zero, .L80A39DF0 -/* 04A80 80A39D90 00031083 */ sra $v0, $v1, 2 -/* 04A84 80A39D94 0002C880 */ sll $t9, $v0, 2 -/* 04A88 80A39D98 0322C823 */ subu $t9, $t9, $v0 +/* 04A7C 80A39D8C 17000018 */ bne $t8, $zero, .L80A39DF0 +/* 04A80 80A39D90 00031083 */ sra $v0, $v1, 2 +/* 04A84 80A39D94 0002C880 */ sll $t9, $v0, 2 +/* 04A88 80A39D98 0322C823 */ subu $t9, $t9, $v0 /* 04A8C 80A39D9C 3C013FC0 */ lui $at, 0x3FC0 ## $at = 3FC00000 /* 04A90 80A39DA0 44814000 */ mtc1 $at, $f8 ## $f8 = 1.50 -/* 04A94 80A39DA4 0019C840 */ sll $t9, $t9, 1 -/* 04A98 80A39DA8 02993021 */ addu $a2, $s4, $t9 +/* 04A94 80A39DA4 0019C840 */ sll $t9, $t9, 1 +/* 04A98 80A39DA8 02993021 */ addu $a2, $s4, $t9 /* 04A9C 80A39DAC 24090096 */ addiu $t1, $zero, 0x0096 ## $t1 = 00000096 /* 04AA0 80A39DB0 240A0096 */ addiu $t2, $zero, 0x0096 ## $t2 = 00000096 /* 04AA4 80A39DB4 240B00FA */ addiu $t3, $zero, 0x00FA ## $t3 = 000000FA /* 04AA8 80A39DB8 240800EB */ addiu $t0, $zero, 0x00EB ## $t0 = 000000EB /* 04AAC 80A39DBC 240C00F5 */ addiu $t4, $zero, 0x00F5 ## $t4 = 000000F5 /* 04AB0 80A39DC0 240D00FF */ addiu $t5, $zero, 0x00FF ## $t5 = 000000FF -/* 04AB4 80A39DC4 AFAD0024 */ sw $t5, 0x0024($sp) -/* 04AB8 80A39DC8 AFAC0020 */ sw $t4, 0x0020($sp) -/* 04ABC 80A39DCC AFA8001C */ sw $t0, 0x001C($sp) -/* 04AC0 80A39DD0 AFAB0018 */ sw $t3, 0x0018($sp) -/* 04AC4 80A39DD4 AFAA0014 */ sw $t2, 0x0014($sp) -/* 04AC8 80A39DD8 AFA90010 */ sw $t1, 0x0010($sp) +/* 04AB4 80A39DC4 AFAD0024 */ sw $t5, 0x0024($sp) +/* 04AB8 80A39DC8 AFAC0020 */ sw $t4, 0x0020($sp) +/* 04ABC 80A39DCC AFA8001C */ sw $t0, 0x001C($sp) +/* 04AC0 80A39DD0 AFAB0018 */ sw $t3, 0x0018($sp) +/* 04AC4 80A39DD4 AFAA0014 */ sw $t2, 0x0014($sp) +/* 04AC8 80A39DD8 AFA90010 */ sw $t1, 0x0010($sp) /* 04ACC 80A39DDC 24C6014C */ addiu $a2, $a2, 0x014C ## $a2 = 0000014C -/* 04AD0 80A39DE0 8FA400DC */ lw $a0, 0x00DC($sp) +/* 04AD0 80A39DE0 8FA400DC */ lw $a0, 0x00DC($sp) /* 04AD4 80A39DE4 24070096 */ addiu $a3, $zero, 0x0096 ## $a3 = 00000096 -/* 04AD8 80A39DE8 0C00A877 */ jal func_8002A1DC -/* 04ADC 80A39DEC E7A80028 */ swc1 $f8, 0x0028($sp) +/* 04AD8 80A39DE8 0C00A877 */ jal func_8002A1DC +/* 04ADC 80A39DEC E7A80028 */ swc1 $f8, 0x0028($sp) .L80A39DF0: -/* 04AE0 80A39DF0 8FAE00DC */ lw $t6, 0x00DC($sp) +/* 04AE0 80A39DF0 8FAE00DC */ lw $t6, 0x00DC($sp) .L80A39DF4: /* 04AE4 80A39DF4 3C0680A4 */ lui $a2, %hi(D_80A3A210) ## $a2 = 80A40000 /* 04AE8 80A39DF8 24C6A210 */ addiu $a2, $a2, %lo(D_80A3A210) ## $a2 = 80A3A210 /* 04AEC 80A39DFC 27A400BC */ addiu $a0, $sp, 0x00BC ## $a0 = FFFFFFE4 /* 04AF0 80A39E00 24070AB8 */ addiu $a3, $zero, 0x0AB8 ## $a3 = 00000AB8 -/* 04AF4 80A39E04 0C031AD5 */ jal func_800C6B54 +/* 04AF4 80A39E04 0C031AD5 */ jal Graph_CloseDisps /* 04AF8 80A39E08 8DC50000 */ lw $a1, 0x0000($t6) ## 00000000 -/* 04AFC 80A39E0C 8FBF004C */ lw $ra, 0x004C($sp) -/* 04B00 80A39E10 8FB00038 */ lw $s0, 0x0038($sp) -/* 04B04 80A39E14 8FB1003C */ lw $s1, 0x003C($sp) -/* 04B08 80A39E18 8FB20040 */ lw $s2, 0x0040($sp) -/* 04B0C 80A39E1C 8FB30044 */ lw $s3, 0x0044($sp) -/* 04B10 80A39E20 8FB40048 */ lw $s4, 0x0048($sp) -/* 04B14 80A39E24 03E00008 */ jr $ra +/* 04AFC 80A39E0C 8FBF004C */ lw $ra, 0x004C($sp) +/* 04B00 80A39E10 8FB00038 */ lw $s0, 0x0038($sp) +/* 04B04 80A39E14 8FB1003C */ lw $s1, 0x003C($sp) +/* 04B08 80A39E18 8FB20040 */ lw $s2, 0x0040($sp) +/* 04B0C 80A39E1C 8FB30044 */ lw $s3, 0x0044($sp) +/* 04B10 80A39E20 8FB40048 */ lw $s4, 0x0048($sp) +/* 04B14 80A39E24 03E00008 */ jr $ra /* 04B18 80A39E28 27BD00D8 */ addiu $sp, $sp, 0x00D8 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_GeldB/EnGeldB_Init.s b/asm/non_matchings/overlays/actors/ovl_En_GeldB/EnGeldB_Init.s index 7400585cf3..5fcfc7351d 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_GeldB/EnGeldB_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_GeldB/EnGeldB_Init.s @@ -1,24 +1,24 @@ glabel EnGeldB_Init /* 00008 80A35318 27BDFE18 */ addiu $sp, $sp, 0xFE18 ## $sp = FFFFFE18 -/* 0000C 80A3531C AFB10028 */ sw $s1, 0x0028($sp) +/* 0000C 80A3531C AFB10028 */ sw $s1, 0x0028($sp) /* 00010 80A35320 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 -/* 00014 80A35324 AFBF002C */ sw $ra, 0x002C($sp) -/* 00018 80A35328 AFB00024 */ sw $s0, 0x0024($sp) +/* 00014 80A35324 AFBF002C */ sw $ra, 0x002C($sp) +/* 00018 80A35328 AFB00024 */ sw $s0, 0x0024($sp) /* 0001C 80A3532C 3C0580A4 */ lui $a1, %hi(D_80A3A104) ## $a1 = 80A40000 /* 00020 80A35330 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 00024 80A35334 0C01E037 */ jal Actor_ProcessInitChain - + /* 00028 80A35338 24A5A104 */ addiu $a1, $a1, %lo(D_80A3A104) ## $a1 = 80A3A104 /* 0002C 80A3533C 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 /* 00030 80A35340 3C0E80A4 */ lui $t6, %hi(D_80A3A0E4) ## $t6 = 80A40000 /* 00034 80A35344 25CEA0E4 */ addiu $t6, $t6, %lo(D_80A3A0E4) ## $t6 = 80A3A0E4 /* 00038 80A35348 3C068003 */ lui $a2, 0x8003 ## $a2 = 80030000 -/* 0003C 80A3534C 44050000 */ mfc1 $a1, $f0 -/* 00040 80A35350 44070000 */ mfc1 $a3, $f0 +/* 0003C 80A3534C 44050000 */ mfc1 $a1, $f0 +/* 00040 80A35350 44070000 */ mfc1 $a3, $f0 /* 00044 80A35354 AE0E0098 */ sw $t6, 0x0098($s0) ## 00000098 /* 00048 80A35358 24C6B8C4 */ addiu $a2, $a2, 0xB8C4 ## $a2 = 8002B8C4 /* 0004C 80A3535C 0C00AC78 */ jal ActorShape_Init - + /* 00050 80A35360 260400B4 */ addiu $a0, $s0, 0x00B4 ## $a0 = 000000B4 /* 00054 80A35364 860C001C */ lh $t4, 0x001C($s0) ## 0000001C /* 00058 80A35368 860E001C */ lh $t6, 0x001C($s0) ## 0000001C @@ -47,102 +47,102 @@ glabel EnGeldB_Init /* 000B4 80A353C4 3C070601 */ lui $a3, 0x0601 ## $a3 = 06010000 /* 000B8 80A353C8 24E7B6D4 */ addiu $a3, $a3, 0xB6D4 ## $a3 = 0600B6D4 /* 000BC 80A353CC 24C6A458 */ addiu $a2, $a2, 0xA458 ## $a2 = 0600A458 -/* 000C0 80A353D0 AFB80010 */ sw $t8, 0x0010($sp) -/* 000C4 80A353D4 AFB90014 */ sw $t9, 0x0014($sp) -/* 000C8 80A353D8 AFAA0018 */ sw $t2, 0x0018($sp) +/* 000C0 80A353D0 AFB80010 */ sw $t8, 0x0010($sp) +/* 000C4 80A353D4 AFB90014 */ sw $t9, 0x0014($sp) +/* 000C8 80A353D8 AFAA0018 */ sw $t2, 0x0018($sp) /* 000CC 80A353DC 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 000D0 80A353E0 0C0291BE */ jal func_800A46F8 +/* 000D0 80A353E0 0C0291BE */ jal SkelAnime_InitSV /* 000D4 80A353E4 26050188 */ addiu $a1, $s0, 0x0188 ## $a1 = 00000188 /* 000D8 80A353E8 26050320 */ addiu $a1, $s0, 0x0320 ## $a1 = 00000320 -/* 000DC 80A353EC AFA50030 */ sw $a1, 0x0030($sp) +/* 000DC 80A353EC AFA50030 */ sw $a1, 0x0030($sp) /* 000E0 80A353F0 0C0170D9 */ jal ActorCollider_AllocCylinder - + /* 000E4 80A353F4 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 000E8 80A353F8 3C0780A4 */ lui $a3, %hi(D_80A39FE0) ## $a3 = 80A40000 -/* 000EC 80A353FC 8FA50030 */ lw $a1, 0x0030($sp) +/* 000EC 80A353FC 8FA50030 */ lw $a1, 0x0030($sp) /* 000F0 80A35400 24E79FE0 */ addiu $a3, $a3, %lo(D_80A39FE0) ## $a3 = 80A39FE0 /* 000F4 80A35404 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 000F8 80A35408 0C01712B */ jal ActorCollider_InitCylinder - + /* 000FC 80A3540C 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 00100 80A35410 260503EC */ addiu $a1, $s0, 0x03EC ## $a1 = 000003EC -/* 00104 80A35414 AFA50030 */ sw $a1, 0x0030($sp) -/* 00108 80A35418 0C0171F8 */ jal func_8005C7E0 +/* 00104 80A35414 AFA50030 */ sw $a1, 0x0030($sp) +/* 00108 80A35418 0C0171F8 */ jal func_8005C7E0 /* 0010C 80A3541C 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 00110 80A35420 3C0780A4 */ lui $a3, %hi(D_80A3A084) ## $a3 = 80A40000 /* 00114 80A35424 260B040C */ addiu $t3, $s0, 0x040C ## $t3 = 0000040C -/* 00118 80A35428 8FA50030 */ lw $a1, 0x0030($sp) -/* 0011C 80A3542C AFAB0010 */ sw $t3, 0x0010($sp) +/* 00118 80A35428 8FA50030 */ lw $a1, 0x0030($sp) +/* 0011C 80A3542C AFAB0010 */ sw $t3, 0x0010($sp) /* 00120 80A35430 24E7A084 */ addiu $a3, $a3, %lo(D_80A3A084) ## $a3 = 80A3A084 /* 00124 80A35434 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 00128 80A35438 0C0172EB */ jal func_8005CBAC +/* 00128 80A35438 0C0172EB */ jal func_8005CBAC /* 0012C 80A3543C 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 00130 80A35440 2605036C */ addiu $a1, $s0, 0x036C ## $a1 = 0000036C -/* 00134 80A35444 AFA50030 */ sw $a1, 0x0030($sp) -/* 00138 80A35448 0C017406 */ jal func_8005D018 +/* 00134 80A35444 AFA50030 */ sw $a1, 0x0030($sp) +/* 00138 80A35448 0C017406 */ jal func_8005D018 /* 0013C 80A3544C 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 00140 80A35450 3C0780A4 */ lui $a3, %hi(D_80A3A094) ## $a3 = 80A40000 -/* 00144 80A35454 8FA50030 */ lw $a1, 0x0030($sp) +/* 00144 80A35454 8FA50030 */ lw $a1, 0x0030($sp) /* 00148 80A35458 24E7A094 */ addiu $a3, $a3, %lo(D_80A3A094) ## $a3 = 80A3A094 /* 0014C 80A3545C 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 00150 80A35460 0C017441 */ jal func_8005D104 +/* 00150 80A35460 0C017441 */ jal func_8005D104 /* 00154 80A35464 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 00158 80A35468 240300FF */ addiu $v1, $zero, 0x00FF ## $v1 = 000000FF /* 0015C 80A3546C 240C0040 */ addiu $t4, $zero, 0x0040 ## $t4 = 00000040 /* 00160 80A35470 240D0008 */ addiu $t5, $zero, 0x0008 ## $t5 = 00000008 /* 00164 80A35474 240E0002 */ addiu $t6, $zero, 0x0002 ## $t6 = 00000002 /* 00168 80A35478 27AF0044 */ addiu $t7, $sp, 0x0044 ## $t7 = FFFFFE5C -/* 0016C 80A3547C A3A301D5 */ sb $v1, 0x01D5($sp) -/* 00170 80A35480 A3A301D4 */ sb $v1, 0x01D4($sp) -/* 00174 80A35484 A3A301D2 */ sb $v1, 0x01D2($sp) -/* 00178 80A35488 A3A301D1 */ sb $v1, 0x01D1($sp) -/* 0017C 80A3548C A3A301D0 */ sb $v1, 0x01D0($sp) -/* 00180 80A35490 A3A301CE */ sb $v1, 0x01CE($sp) -/* 00184 80A35494 A3A301CD */ sb $v1, 0x01CD($sp) -/* 00188 80A35498 A3A301CC */ sb $v1, 0x01CC($sp) -/* 0018C 80A3549C A3A301CB */ sb $v1, 0x01CB($sp) -/* 00190 80A354A0 A3A301CA */ sb $v1, 0x01CA($sp) -/* 00194 80A354A4 A3A301C9 */ sb $v1, 0x01C9($sp) -/* 00198 80A354A8 A3A301C8 */ sb $v1, 0x01C8($sp) -/* 0019C 80A354AC A3AC01CF */ sb $t4, 0x01CF($sp) -/* 001A0 80A354B0 A3A001D3 */ sb $zero, 0x01D3($sp) -/* 001A4 80A354B4 AFAD01D8 */ sw $t5, 0x01D8($sp) -/* 001A8 80A354B8 AFA001DC */ sw $zero, 0x01DC($sp) -/* 001AC 80A354BC AFAE01E0 */ sw $t6, 0x01E0($sp) -/* 001B0 80A354C0 AFAF0014 */ sw $t7, 0x0014($sp) -/* 001B4 80A354C4 A3A301D6 */ sb $v1, 0x01D6($sp) +/* 0016C 80A3547C A3A301D5 */ sb $v1, 0x01D5($sp) +/* 00170 80A35480 A3A301D4 */ sb $v1, 0x01D4($sp) +/* 00174 80A35484 A3A301D2 */ sb $v1, 0x01D2($sp) +/* 00178 80A35488 A3A301D1 */ sb $v1, 0x01D1($sp) +/* 0017C 80A3548C A3A301D0 */ sb $v1, 0x01D0($sp) +/* 00180 80A35490 A3A301CE */ sb $v1, 0x01CE($sp) +/* 00184 80A35494 A3A301CD */ sb $v1, 0x01CD($sp) +/* 00188 80A35498 A3A301CC */ sb $v1, 0x01CC($sp) +/* 0018C 80A3549C A3A301CB */ sb $v1, 0x01CB($sp) +/* 00190 80A354A0 A3A301CA */ sb $v1, 0x01CA($sp) +/* 00194 80A354A4 A3A301C9 */ sb $v1, 0x01C9($sp) +/* 00198 80A354A8 A3A301C8 */ sb $v1, 0x01C8($sp) +/* 0019C 80A354AC A3AC01CF */ sb $t4, 0x01CF($sp) +/* 001A0 80A354B0 A3A001D3 */ sb $zero, 0x01D3($sp) +/* 001A4 80A354B4 AFAD01D8 */ sw $t5, 0x01D8($sp) +/* 001A8 80A354B8 AFA001DC */ sw $zero, 0x01DC($sp) +/* 001AC 80A354BC AFAE01E0 */ sw $t6, 0x01E0($sp) +/* 001B0 80A354C0 AFAF0014 */ sw $t7, 0x0014($sp) +/* 001B4 80A354C4 A3A301D6 */ sb $v1, 0x01D6($sp) /* 001B8 80A354C8 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 001BC 80A354CC 2605031C */ addiu $a1, $s0, 0x031C ## $a1 = 0000031C /* 001C0 80A354D0 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 /* 001C4 80A354D4 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 001C8 80A354D8 AFA00010 */ sw $zero, 0x0010($sp) +/* 001C8 80A354D8 AFA00010 */ sw $zero, 0x0010($sp) /* 001CC 80A354DC 0C009B35 */ jal Effect_Add ## Effect_Add -/* 001D0 80A354E0 A3A001D7 */ sb $zero, 0x01D7($sp) +/* 001D0 80A354E0 A3A001D7 */ sb $zero, 0x01D7($sp) /* 001D4 80A354E4 3C053C4C */ lui $a1, 0x3C4C ## $a1 = 3C4C0000 /* 001D8 80A354E8 34A5CCCC */ ori $a1, $a1, 0xCCCC ## $a1 = 3C4CCCCC /* 001DC 80A354EC 0C00B58B */ jal Actor_SetScale - + /* 001E0 80A354F0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 001E4 80A354F4 0C28D65D */ jal func_80A35974 +/* 001E4 80A354F4 0C28D65D */ jal func_80A35974 /* 001E8 80A354F8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 001EC 80A354FC 86020314 */ lh $v0, 0x0314($s0) ## 00000314 /* 001F0 80A35500 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 001F4 80A35504 50400008 */ beql $v0, $zero, .L80A35528 -/* 001F8 80A35508 8FBF002C */ lw $ra, 0x002C($sp) +/* 001F4 80A35504 50400008 */ beql $v0, $zero, .L80A35528 +/* 001F8 80A35508 8FBF002C */ lw $ra, 0x002C($sp) /* 001FC 80A3550C 0C00B35B */ jal Flags_GetCollectible - -/* 00200 80A35510 00022A03 */ sra $a1, $v0, 8 -/* 00204 80A35514 50400004 */ beql $v0, $zero, .L80A35528 -/* 00208 80A35518 8FBF002C */ lw $ra, 0x002C($sp) + +/* 00200 80A35510 00022A03 */ sra $a1, $v0, 8 +/* 00204 80A35514 50400004 */ beql $v0, $zero, .L80A35528 +/* 00208 80A35518 8FBF002C */ lw $ra, 0x002C($sp) /* 0020C 80A3551C 0C00B55C */ jal Actor_Kill - + /* 00210 80A35520 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00214 80A35524 8FBF002C */ lw $ra, 0x002C($sp) +/* 00214 80A35524 8FBF002C */ lw $ra, 0x002C($sp) .L80A35528: -/* 00218 80A35528 8FB00024 */ lw $s0, 0x0024($sp) -/* 0021C 80A3552C 8FB10028 */ lw $s1, 0x0028($sp) -/* 00220 80A35530 03E00008 */ jr $ra +/* 00218 80A35528 8FB00024 */ lw $s0, 0x0024($sp) +/* 0021C 80A3552C 8FB10028 */ lw $s1, 0x0028($sp) +/* 00220 80A35530 03E00008 */ jr $ra /* 00224 80A35534 27BD01E8 */ addiu $sp, $sp, 0x01E8 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_GeldB/func_80A35974.s b/asm/non_matchings/overlays/actors/ovl_En_GeldB/func_80A35974.s index 5d4b9db5e0..866db50056 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_GeldB/func_80A35974.s +++ b/asm/non_matchings/overlays/actors/ovl_En_GeldB/func_80A35974.s @@ -1,28 +1,28 @@ glabel func_80A35974 /* 00664 80A35974 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00668 80A35978 AFBF0014 */ sw $ra, 0x0014($sp) +/* 00668 80A35978 AFBF0014 */ sw $ra, 0x0014($sp) /* 0066C 80A3597C 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 /* 00670 80A35980 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 /* 00674 80A35984 24A5ADF8 */ addiu $a1, $a1, 0xADF8 ## $a1 = 0600ADF8 -/* 00678 80A35988 AFA70018 */ sw $a3, 0x0018($sp) +/* 00678 80A35988 AFA70018 */ sw $a3, 0x0018($sp) /* 0067C 80A3598C 24840188 */ addiu $a0, $a0, 0x0188 ## $a0 = 00000188 -/* 00680 80A35990 0C0294A7 */ jal func_800A529C +/* 00680 80A35990 0C0294A7 */ jal SkelAnime_ChangeAnimPlaybackStop /* 00684 80A35994 24060000 */ addiu $a2, $zero, 0x0000 ## $a2 = 00000000 -/* 00688 80A35998 8FA40018 */ lw $a0, 0x0018($sp) +/* 00688 80A35998 8FA40018 */ lw $a0, 0x0018($sp) /* 0068C 80A3599C 3C0142F0 */ lui $at, 0x42F0 ## $at = 42F00000 /* 00690 80A359A0 44813000 */ mtc1 $at, $f6 ## $f6 = 120.00 /* 00694 80A359A4 C484000C */ lwc1 $f4, 0x000C($a0) ## 0000000C /* 00698 80A359A8 94980088 */ lhu $t8, 0x0088($a0) ## 00000088 /* 0069C 80A359AC 8C880004 */ lw $t0, 0x0004($a0) ## 00000004 /* 006A0 80A359B0 3C01C000 */ lui $at, 0xC000 ## $at = C0000000 -/* 006A4 80A359B4 46062200 */ add.s $f8, $f4, $f6 +/* 006A4 80A359B4 46062200 */ add.s $f8, $f4, $f6 /* 006A8 80A359B8 44815000 */ mtc1 $at, $f10 ## $f10 = -2.00 /* 006AC 80A359BC 2401FFFE */ addiu $at, $zero, 0xFFFE ## $at = FFFFFFFE /* 006B0 80A359C0 240E000A */ addiu $t6, $zero, 0x000A ## $t6 = 0000000A /* 006B4 80A359C4 240F0001 */ addiu $t7, $zero, 0x0001 ## $t7 = 00000001 /* 006B8 80A359C8 3C0580A3 */ lui $a1, %hi(func_80A35A08) ## $a1 = 80A30000 /* 006BC 80A359CC 3319FFFC */ andi $t9, $t8, 0xFFFC ## $t9 = 00000000 -/* 006C0 80A359D0 01014824 */ and $t1, $t0, $at +/* 006C0 80A359D0 01014824 */ and $t1, $t0, $at /* 006C4 80A359D4 24A55A08 */ addiu $a1, $a1, %lo(func_80A35A08) ## $a1 = 80A35A08 /* 006C8 80A359D8 E4880028 */ swc1 $f8, 0x0028($a0) ## 00000028 /* 006CC 80A359DC AC8E0300 */ sw $t6, 0x0300($a0) ## 00000300 @@ -30,11 +30,11 @@ glabel func_80A35974 /* 006D4 80A359E4 AC8002EC */ sw $zero, 0x02EC($a0) ## 000002EC /* 006D8 80A359E8 A4990088 */ sh $t9, 0x0088($a0) ## 00000088 /* 006DC 80A359EC AC890004 */ sw $t1, 0x0004($a0) ## 00000004 -/* 006E0 80A359F0 0C28D4C4 */ jal func_80A35310 +/* 006E0 80A359F0 0C28D4C4 */ jal func_80A35310 /* 006E4 80A359F4 E48A006C */ swc1 $f10, 0x006C($a0) ## 0000006C -/* 006E8 80A359F8 8FBF0014 */ lw $ra, 0x0014($sp) +/* 006E8 80A359F8 8FBF0014 */ lw $ra, 0x0014($sp) /* 006EC 80A359FC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 006F0 80A35A00 03E00008 */ jr $ra +/* 006F0 80A35A00 03E00008 */ jr $ra /* 006F4 80A35A04 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_GeldB/func_80A35B8C.s b/asm/non_matchings/overlays/actors/ovl_En_GeldB/func_80A35B8C.s index 17828b0b70..c278e50403 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_GeldB/func_80A35B8C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_GeldB/func_80A35B8C.s @@ -1,28 +1,28 @@ glabel func_80A35B8C /* 0087C 80A35B8C 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 00880 80A35B90 AFB00028 */ sw $s0, 0x0028($sp) +/* 00880 80A35B90 AFB00028 */ sw $s0, 0x0028($sp) /* 00884 80A35B94 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00888 80A35B98 AFBF002C */ sw $ra, 0x002C($sp) +/* 00888 80A35B98 AFBF002C */ sw $ra, 0x002C($sp) /* 0088C 80A35B9C 3C040601 */ lui $a0, 0x0601 ## $a0 = 06010000 /* 00890 80A35BA0 0C028800 */ jal SkelAnime_GetFrameCount - + /* 00894 80A35BA4 2484ADF8 */ addiu $a0, $a0, 0xADF8 ## $a0 = 0600ADF8 /* 00898 80A35BA8 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 0089C 80A35BAC 3C01C080 */ lui $at, 0xC080 ## $at = C0800000 /* 008A0 80A35BB0 44814000 */ mtc1 $at, $f8 ## $f8 = -4.00 -/* 008A4 80A35BB4 46802120 */ cvt.s.w $f4, $f4 +/* 008A4 80A35BB4 46802120 */ cvt.s.w $f4, $f4 /* 008A8 80A35BB8 44803000 */ mtc1 $zero, $f6 ## $f6 = 0.00 /* 008AC 80A35BBC 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 /* 008B0 80A35BC0 240E0003 */ addiu $t6, $zero, 0x0003 ## $t6 = 00000003 -/* 008B4 80A35BC4 AFAE0014 */ sw $t6, 0x0014($sp) +/* 008B4 80A35BC4 AFAE0014 */ sw $t6, 0x0014($sp) /* 008B8 80A35BC8 24A5ADF8 */ addiu $a1, $a1, 0xADF8 ## $a1 = 0600ADF8 -/* 008BC 80A35BCC 44072000 */ mfc1 $a3, $f4 +/* 008BC 80A35BCC 44072000 */ mfc1 $a3, $f4 /* 008C0 80A35BD0 26040188 */ addiu $a0, $s0, 0x0188 ## $a0 = 00000188 /* 008C4 80A35BD4 3C06C000 */ lui $a2, 0xC000 ## $a2 = C0000000 -/* 008C8 80A35BD8 E7A80018 */ swc1 $f8, 0x0018($sp) -/* 008CC 80A35BDC 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 008D0 80A35BE0 E7A60010 */ swc1 $f6, 0x0010($sp) +/* 008C8 80A35BD8 E7A80018 */ swc1 $f8, 0x0018($sp) +/* 008CC 80A35BDC 0C029468 */ jal SkelAnime_ChangeAnim + +/* 008D0 80A35BE0 E7A60010 */ swc1 $f6, 0x0010($sp) /* 008D4 80A35BE4 8602008A */ lh $v0, 0x008A($s0) ## 0000008A /* 008D8 80A35BE8 240F0014 */ addiu $t7, $zero, 0x0014 ## $t7 = 00000014 /* 008DC 80A35BEC 3C0580A3 */ lui $a1, %hi(func_80A35C24) ## $a1 = 80A30000 @@ -32,12 +32,12 @@ glabel func_80A35B8C /* 008EC 80A35BFC 24A55C24 */ addiu $a1, $a1, %lo(func_80A35C24) ## $a1 = 80A35C24 /* 008F0 80A35C00 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 008F4 80A35C04 A6020032 */ sh $v0, 0x0032($s0) ## 00000032 -/* 008F8 80A35C08 0C28D4C4 */ jal func_80A35310 +/* 008F8 80A35C08 0C28D4C4 */ jal func_80A35310 /* 008FC 80A35C0C A60200B6 */ sh $v0, 0x00B6($s0) ## 000000B6 -/* 00900 80A35C10 8FBF002C */ lw $ra, 0x002C($sp) -/* 00904 80A35C14 8FB00028 */ lw $s0, 0x0028($sp) +/* 00900 80A35C10 8FBF002C */ lw $ra, 0x002C($sp) +/* 00904 80A35C14 8FB00028 */ lw $s0, 0x0028($sp) /* 00908 80A35C18 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 0090C 80A35C1C 03E00008 */ jr $ra +/* 0090C 80A35C1C 03E00008 */ jr $ra /* 00910 80A35C20 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_GeldB/func_80A35D48.s b/asm/non_matchings/overlays/actors/ovl_En_GeldB/func_80A35D48.s index b53f1f84e3..459df99fde 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_GeldB/func_80A35D48.s +++ b/asm/non_matchings/overlays/actors/ovl_En_GeldB/func_80A35D48.s @@ -1,14 +1,14 @@ glabel func_80A35D48 /* 00A38 80A35D48 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00A3C 80A35D4C AFBF0014 */ sw $ra, 0x0014($sp) +/* 00A3C 80A35D4C AFBF0014 */ sw $ra, 0x0014($sp) /* 00A40 80A35D50 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 /* 00A44 80A35D54 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 /* 00A48 80A35D58 24A5B6D4 */ addiu $a1, $a1, 0xB6D4 ## $a1 = 0600B6D4 -/* 00A4C 80A35D5C AFA70018 */ sw $a3, 0x0018($sp) +/* 00A4C 80A35D5C AFA70018 */ sw $a3, 0x0018($sp) /* 00A50 80A35D60 24840188 */ addiu $a0, $a0, 0x0188 ## $a0 = 00000188 -/* 00A54 80A35D64 0C0294D3 */ jal func_800A534C +/* 00A54 80A35D64 0C0294D3 */ jal SkelAnime_ChangeAnimTransitionRepeat /* 00A58 80A35D68 3C06C080 */ lui $a2, 0xC080 ## $a2 = C0800000 -/* 00A5C 80A35D6C 8FA70018 */ lw $a3, 0x0018($sp) +/* 00A5C 80A35D6C 8FA70018 */ lw $a3, 0x0018($sp) /* 00A60 80A35D70 240E0005 */ addiu $t6, $zero, 0x0005 ## $t6 = 00000005 /* 00A64 80A35D74 0C03F66B */ jal Math_Rand_ZeroOne ## Rand.Next() float @@ -17,22 +17,22 @@ glabel func_80A35D48 /* 00A70 80A35D80 44812000 */ mtc1 $at, $f4 ## $f4 = 10.00 /* 00A74 80A35D84 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 /* 00A78 80A35D88 44814000 */ mtc1 $at, $f8 ## $f8 = 5.00 -/* 00A7C 80A35D8C 46040182 */ mul.s $f6, $f0, $f4 -/* 00A80 80A35D90 8FA40018 */ lw $a0, 0x0018($sp) +/* 00A7C 80A35D8C 46040182 */ mul.s $f6, $f0, $f4 +/* 00A80 80A35D90 8FA40018 */ lw $a0, 0x0018($sp) /* 00A84 80A35D94 44809000 */ mtc1 $zero, $f18 ## $f18 = 0.00 /* 00A88 80A35D98 3C0580A3 */ lui $a1, %hi(func_80A35DD0) ## $a1 = 80A30000 /* 00A8C 80A35D9C 849900B6 */ lh $t9, 0x00B6($a0) ## 000000B6 /* 00A90 80A35DA0 24A55DD0 */ addiu $a1, $a1, %lo(func_80A35DD0) ## $a1 = 80A35DD0 /* 00A94 80A35DA4 E4920068 */ swc1 $f18, 0x0068($a0) ## 00000068 -/* 00A98 80A35DA8 46083280 */ add.s $f10, $f6, $f8 +/* 00A98 80A35DA8 46083280 */ add.s $f10, $f6, $f8 /* 00A9C 80A35DAC A4990032 */ sh $t9, 0x0032($a0) ## 00000032 -/* 00AA0 80A35DB0 4600540D */ trunc.w.s $f16, $f10 -/* 00AA4 80A35DB4 44188000 */ mfc1 $t8, $f16 -/* 00AA8 80A35DB8 0C28D4C4 */ jal func_80A35310 +/* 00AA0 80A35DB0 4600540D */ trunc.w.s $f16, $f10 +/* 00AA4 80A35DB4 44188000 */ mfc1 $t8, $f16 +/* 00AA8 80A35DB8 0C28D4C4 */ jal func_80A35310 /* 00AAC 80A35DBC AC980300 */ sw $t8, 0x0300($a0) ## 00000300 -/* 00AB0 80A35DC0 8FBF0014 */ lw $ra, 0x0014($sp) +/* 00AB0 80A35DC0 8FBF0014 */ lw $ra, 0x0014($sp) /* 00AB4 80A35DC4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00AB8 80A35DC8 03E00008 */ jr $ra +/* 00AB8 80A35DC8 03E00008 */ jr $ra /* 00ABC 80A35DCC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_GeldB/func_80A360B0.s b/asm/non_matchings/overlays/actors/ovl_En_GeldB/func_80A360B0.s index ff06410a5f..e780b949fa 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_GeldB/func_80A360B0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_GeldB/func_80A360B0.s @@ -1,37 +1,37 @@ glabel func_80A360B0 /* 00DA0 80A360B0 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 00DA4 80A360B4 AFA40028 */ sw $a0, 0x0028($sp) -/* 00DA8 80A360B8 AFBF0024 */ sw $ra, 0x0024($sp) +/* 00DA4 80A360B4 AFA40028 */ sw $a0, 0x0028($sp) +/* 00DA8 80A360B8 AFBF0024 */ sw $ra, 0x0024($sp) /* 00DAC 80A360BC 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 -/* 00DB0 80A360C0 AFA5002C */ sw $a1, 0x002C($sp) +/* 00DB0 80A360C0 AFA5002C */ sw $a1, 0x002C($sp) /* 00DB4 80A360C4 0C028800 */ jal SkelAnime_GetFrameCount - + /* 00DB8 80A360C8 248424E8 */ addiu $a0, $a0, 0x24E8 ## $a0 = 060024E8 /* 00DBC 80A360CC 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 00DC0 80A360D0 3C01C080 */ lui $at, 0xC080 ## $at = C0800000 /* 00DC4 80A360D4 44814000 */ mtc1 $at, $f8 ## $f8 = -4.00 -/* 00DC8 80A360D8 468021A0 */ cvt.s.w $f6, $f4 -/* 00DCC 80A360DC 8FA40028 */ lw $a0, 0x0028($sp) +/* 00DC8 80A360D8 468021A0 */ cvt.s.w $f6, $f4 +/* 00DCC 80A360DC 8FA40028 */ lw $a0, 0x0028($sp) /* 00DD0 80A360E0 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 00DD4 80A360E4 240E0001 */ addiu $t6, $zero, 0x0001 ## $t6 = 00000001 -/* 00DD8 80A360E8 AFAE0014 */ sw $t6, 0x0014($sp) +/* 00DD8 80A360E8 AFAE0014 */ sw $t6, 0x0014($sp) /* 00DDC 80A360EC 24A524E8 */ addiu $a1, $a1, 0x24E8 ## $a1 = 060024E8 -/* 00DE0 80A360F0 E7A60010 */ swc1 $f6, 0x0010($sp) +/* 00DE0 80A360F0 E7A60010 */ swc1 $f6, 0x0010($sp) /* 00DE4 80A360F4 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 00DE8 80A360F8 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 00DEC 80A360FC E7A80018 */ swc1 $f8, 0x0018($sp) -/* 00DF0 80A36100 0C029468 */ jal SkelAnime_ChangeAnimation - +/* 00DEC 80A360FC E7A80018 */ swc1 $f8, 0x0018($sp) +/* 00DF0 80A36100 0C029468 */ jal SkelAnime_ChangeAnim + /* 00DF4 80A36104 24840188 */ addiu $a0, $a0, 0x0188 ## $a0 = 00000188 -/* 00DF8 80A36108 8FA40028 */ lw $a0, 0x0028($sp) +/* 00DF8 80A36108 8FA40028 */ lw $a0, 0x0028($sp) /* 00DFC 80A3610C 240F0008 */ addiu $t7, $zero, 0x0008 ## $t7 = 00000008 /* 00E00 80A36110 3C0580A3 */ lui $a1, %hi(func_80A36130) ## $a1 = 80A30000 /* 00E04 80A36114 24A56130 */ addiu $a1, $a1, %lo(func_80A36130) ## $a1 = 80A36130 -/* 00E08 80A36118 0C28D4C4 */ jal func_80A35310 +/* 00E08 80A36118 0C28D4C4 */ jal func_80A35310 /* 00E0C 80A3611C AC8F02EC */ sw $t7, 0x02EC($a0) ## 000002EC -/* 00E10 80A36120 8FBF0024 */ lw $ra, 0x0024($sp) +/* 00E10 80A36120 8FBF0024 */ lw $ra, 0x0024($sp) /* 00E14 80A36124 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 00E18 80A36128 03E00008 */ jr $ra +/* 00E18 80A36128 03E00008 */ jr $ra /* 00E1C 80A3612C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_GeldB/func_80A365DC.s b/asm/non_matchings/overlays/actors/ovl_En_GeldB/func_80A365DC.s index 589339c38d..46138e605f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_GeldB/func_80A365DC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_GeldB/func_80A365DC.s @@ -1,28 +1,28 @@ glabel func_80A365DC /* 012CC 80A365DC 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 012D0 80A365E0 AFB00028 */ sw $s0, 0x0028($sp) +/* 012D0 80A365E0 AFB00028 */ sw $s0, 0x0028($sp) /* 012D4 80A365E4 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 012D8 80A365E8 AFBF002C */ sw $ra, 0x002C($sp) +/* 012D8 80A365E8 AFBF002C */ sw $ra, 0x002C($sp) /* 012DC 80A365EC 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 /* 012E0 80A365F0 0C028800 */ jal SkelAnime_GetFrameCount - + /* 012E4 80A365F4 24841390 */ addiu $a0, $a0, 0x1390 ## $a0 = 06001390 /* 012E8 80A365F8 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 012EC 80A365FC 3C01C040 */ lui $at, 0xC040 ## $at = C0400000 /* 012F0 80A36600 44814000 */ mtc1 $at, $f8 ## $f8 = -3.00 -/* 012F4 80A36604 46802120 */ cvt.s.w $f4, $f4 +/* 012F4 80A36604 46802120 */ cvt.s.w $f4, $f4 /* 012F8 80A36608 44803000 */ mtc1 $zero, $f6 ## $f6 = 0.00 /* 012FC 80A3660C 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 01300 80A36610 240E0002 */ addiu $t6, $zero, 0x0002 ## $t6 = 00000002 -/* 01304 80A36614 AFAE0014 */ sw $t6, 0x0014($sp) +/* 01304 80A36614 AFAE0014 */ sw $t6, 0x0014($sp) /* 01308 80A36618 24A51390 */ addiu $a1, $a1, 0x1390 ## $a1 = 06001390 -/* 0130C 80A3661C 44072000 */ mfc1 $a3, $f4 +/* 0130C 80A3661C 44072000 */ mfc1 $a3, $f4 /* 01310 80A36620 26040188 */ addiu $a0, $s0, 0x0188 ## $a0 = 00000188 /* 01314 80A36624 3C06BF80 */ lui $a2, 0xBF80 ## $a2 = BF800000 -/* 01318 80A36628 E7A80018 */ swc1 $f8, 0x0018($sp) -/* 0131C 80A3662C 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 01320 80A36630 E7A60010 */ swc1 $f6, 0x0010($sp) +/* 01318 80A36628 E7A80018 */ swc1 $f8, 0x0018($sp) +/* 0131C 80A3662C 0C029468 */ jal SkelAnime_ChangeAnim + +/* 01320 80A36630 E7A60010 */ swc1 $f6, 0x0010($sp) /* 01324 80A36634 8602008A */ lh $v0, 0x008A($s0) ## 0000008A /* 01328 80A36638 3C014120 */ lui $at, 0x4120 ## $at = 41200000 /* 0132C 80A3663C 44815000 */ mtc1 $at, $f10 ## $f10 = 10.00 @@ -36,16 +36,16 @@ glabel func_80A365DC /* 0134C 80A3665C A60200B6 */ sh $v0, 0x00B6($s0) ## 000000B6 /* 01350 80A36660 A6020032 */ sh $v0, 0x0032($s0) ## 00000032 /* 01354 80A36664 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 01358 80A36668 E60A0068 */ swc1 $f10, 0x0068($s0) ## 00000068 /* 0135C 80A3666C 3C0580A3 */ lui $a1, %hi(func_80A36690) ## $a1 = 80A30000 /* 01360 80A36670 24A56690 */ addiu $a1, $a1, %lo(func_80A36690) ## $a1 = 80A36690 -/* 01364 80A36674 0C28D4C4 */ jal func_80A35310 +/* 01364 80A36674 0C28D4C4 */ jal func_80A35310 /* 01368 80A36678 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0136C 80A3667C 8FBF002C */ lw $ra, 0x002C($sp) -/* 01370 80A36680 8FB00028 */ lw $s0, 0x0028($sp) +/* 0136C 80A3667C 8FBF002C */ lw $ra, 0x002C($sp) +/* 01370 80A36680 8FB00028 */ lw $s0, 0x0028($sp) /* 01374 80A36684 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 01378 80A36688 03E00008 */ jr $ra +/* 01378 80A36688 03E00008 */ jr $ra /* 0137C 80A3668C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_GeldB/func_80A367E4.s b/asm/non_matchings/overlays/actors/ovl_En_GeldB/func_80A367E4.s index c55741b085..d6f6dcd5e4 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_GeldB/func_80A367E4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_GeldB/func_80A367E4.s @@ -1,22 +1,22 @@ glabel func_80A367E4 /* 014D4 80A367E4 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 014D8 80A367E8 AFBF0014 */ sw $ra, 0x0014($sp) +/* 014D8 80A367E8 AFBF0014 */ sw $ra, 0x0014($sp) /* 014DC 80A367EC 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 /* 014E0 80A367F0 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 /* 014E4 80A367F4 24A5A814 */ addiu $a1, $a1, 0xA814 ## $a1 = 0600A814 -/* 014E8 80A367F8 AFA70018 */ sw $a3, 0x0018($sp) +/* 014E8 80A367F8 AFA70018 */ sw $a3, 0x0018($sp) /* 014EC 80A367FC 24840188 */ addiu $a0, $a0, 0x0188 ## $a0 = 00000188 -/* 014F0 80A36800 0C0294D3 */ jal func_800A534C +/* 014F0 80A36800 0C0294D3 */ jal SkelAnime_ChangeAnimTransitionRepeat /* 014F4 80A36804 3C06C080 */ lui $a2, 0xC080 ## $a2 = C0800000 -/* 014F8 80A36808 8FA40018 */ lw $a0, 0x0018($sp) +/* 014F8 80A36808 8FA40018 */ lw $a0, 0x0018($sp) /* 014FC 80A3680C 240E0009 */ addiu $t6, $zero, 0x0009 ## $t6 = 00000009 /* 01500 80A36810 3C0580A3 */ lui $a1, %hi(func_80A36830) ## $a1 = 80A30000 /* 01504 80A36814 24A56830 */ addiu $a1, $a1, %lo(func_80A36830) ## $a1 = 80A36830 -/* 01508 80A36818 0C28D4C4 */ jal func_80A35310 +/* 01508 80A36818 0C28D4C4 */ jal func_80A35310 /* 0150C 80A3681C AC8E02EC */ sw $t6, 0x02EC($a0) ## 000002EC -/* 01510 80A36820 8FBF0014 */ lw $ra, 0x0014($sp) +/* 01510 80A36820 8FBF0014 */ lw $ra, 0x0014($sp) /* 01514 80A36824 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 01518 80A36828 03E00008 */ jr $ra +/* 01518 80A36828 03E00008 */ jr $ra /* 0151C 80A3682C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_GeldB/func_80A36A10.s b/asm/non_matchings/overlays/actors/ovl_En_GeldB/func_80A36A10.s index 7d53a043ab..67a6bd56b4 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_GeldB/func_80A36A10.s +++ b/asm/non_matchings/overlays/actors/ovl_En_GeldB/func_80A36A10.s @@ -1,36 +1,36 @@ glabel func_80A36A10 /* 01700 80A36A10 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 01704 80A36A14 AFB00028 */ sw $s0, 0x0028($sp) +/* 01704 80A36A14 AFB00028 */ sw $s0, 0x0028($sp) /* 01708 80A36A18 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 0170C 80A36A1C AFBF002C */ sw $ra, 0x002C($sp) +/* 0170C 80A36A1C AFBF002C */ sw $ra, 0x002C($sp) /* 01710 80A36A20 3C040601 */ lui $a0, 0x0601 ## $a0 = 06010000 /* 01714 80A36A24 0C028800 */ jal SkelAnime_GetFrameCount - + /* 01718 80A36A28 2484A814 */ addiu $a0, $a0, 0xA814 ## $a0 = 0600A814 /* 0171C 80A36A2C 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 01720 80A36A30 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 /* 01724 80A36A34 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 -/* 01728 80A36A38 468021A0 */ cvt.s.w $f6, $f4 +/* 01728 80A36A38 468021A0 */ cvt.s.w $f6, $f4 /* 0172C 80A36A3C 240E0001 */ addiu $t6, $zero, 0x0001 ## $t6 = 00000001 -/* 01730 80A36A40 44070000 */ mfc1 $a3, $f0 -/* 01734 80A36A44 AFAE0014 */ sw $t6, 0x0014($sp) +/* 01730 80A36A40 44070000 */ mfc1 $a3, $f0 +/* 01734 80A36A44 AFAE0014 */ sw $t6, 0x0014($sp) /* 01738 80A36A48 24A5A814 */ addiu $a1, $a1, 0xA814 ## $a1 = 0600A814 /* 0173C 80A36A4C 26040188 */ addiu $a0, $s0, 0x0188 ## $a0 = 00000188 -/* 01740 80A36A50 E7A60010 */ swc1 $f6, 0x0010($sp) +/* 01740 80A36A50 E7A60010 */ swc1 $f6, 0x0010($sp) /* 01744 80A36A54 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 01748 80A36A58 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 0174C 80A36A5C E7A00018 */ swc1 $f0, 0x0018($sp) +/* 01748 80A36A58 0C029468 */ jal SkelAnime_ChangeAnim + +/* 0174C 80A36A5C E7A00018 */ swc1 $f0, 0x0018($sp) /* 01750 80A36A60 3C014140 */ lui $at, 0x4140 ## $at = 41400000 /* 01754 80A36A64 44816000 */ mtc1 $at, $f12 ## $f12 = 12.00 /* 01758 80A36A68 0C00CFC8 */ jal Math_Rand_CenteredFloat - + /* 0175C 80A36A6C 00000000 */ nop /* 01760 80A36A70 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 /* 01764 80A36A74 44815000 */ mtc1 $at, $f10 ## $f10 = 0.50 -/* 01768 80A36A78 46000207 */ neg.s $f8, $f0 +/* 01768 80A36A78 46000207 */ neg.s $f8, $f0 /* 0176C 80A36A7C 860F00B6 */ lh $t7, 0x00B6($s0) ## 000000B6 -/* 01770 80A36A80 460A4402 */ mul.s $f16, $f8, $f10 +/* 01770 80A36A80 460A4402 */ mul.s $f16, $f8, $f10 /* 01774 80A36A84 E6000068 */ swc1 $f0, 0x0068($s0) ## 00000068 /* 01778 80A36A88 A60F0032 */ sh $t7, 0x0032($s0) ## 00000032 /* 0177C 80A36A8C 0C03F66B */ jal Math_Rand_ZeroOne @@ -40,21 +40,21 @@ glabel func_80A36A10 /* 01788 80A36A98 44811000 */ mtc1 $at, $f2 ## $f2 = 30.00 /* 0178C 80A36A9C 44804000 */ mtc1 $zero, $f8 ## $f8 = 0.00 /* 01790 80A36AA0 2408000A */ addiu $t0, $zero, 0x000A ## $t0 = 0000000A -/* 01794 80A36AA4 46020482 */ mul.s $f18, $f0, $f2 +/* 01794 80A36AA4 46020482 */ mul.s $f18, $f0, $f2 /* 01798 80A36AA8 3C0580A3 */ lui $a1, %hi(func_80A36AE4) ## $a1 = 80A30000 /* 0179C 80A36AAC AE0802EC */ sw $t0, 0x02EC($s0) ## 000002EC /* 017A0 80A36AB0 24A56AE4 */ addiu $a1, $a1, %lo(func_80A36AE4) ## $a1 = 80A36AE4 /* 017A4 80A36AB4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 017A8 80A36AB8 E6080304 */ swc1 $f8, 0x0304($s0) ## 00000304 -/* 017AC 80A36ABC 46029100 */ add.s $f4, $f18, $f2 -/* 017B0 80A36AC0 4600218D */ trunc.w.s $f6, $f4 -/* 017B4 80A36AC4 44193000 */ mfc1 $t9, $f6 -/* 017B8 80A36AC8 0C28D4C4 */ jal func_80A35310 +/* 017AC 80A36ABC 46029100 */ add.s $f4, $f18, $f2 +/* 017B0 80A36AC0 4600218D */ trunc.w.s $f6, $f4 +/* 017B4 80A36AC4 44193000 */ mfc1 $t9, $f6 +/* 017B8 80A36AC8 0C28D4C4 */ jal func_80A35310 /* 017BC 80A36ACC AE190300 */ sw $t9, 0x0300($s0) ## 00000300 -/* 017C0 80A36AD0 8FBF002C */ lw $ra, 0x002C($sp) -/* 017C4 80A36AD4 8FB00028 */ lw $s0, 0x0028($sp) +/* 017C0 80A36AD0 8FBF002C */ lw $ra, 0x002C($sp) +/* 017C4 80A36AD4 8FB00028 */ lw $s0, 0x0028($sp) /* 017C8 80A36AD8 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 017CC 80A36ADC 03E00008 */ jr $ra +/* 017CC 80A36ADC 03E00008 */ jr $ra /* 017D0 80A36AE0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_GeldB/func_80A370BC.s b/asm/non_matchings/overlays/actors/ovl_En_GeldB/func_80A370BC.s index 63244fc9b7..1d964c4350 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_GeldB/func_80A370BC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_GeldB/func_80A370BC.s @@ -1,59 +1,59 @@ glabel func_80A370BC /* 01DAC 80A370BC 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 -/* 01DB0 80A370C0 AFB00030 */ sw $s0, 0x0030($sp) -/* 01DB4 80A370C4 AFBF0034 */ sw $ra, 0x0034($sp) -/* 01DB8 80A370C8 F7B40028 */ sdc1 $f20, 0x0028($sp) +/* 01DB0 80A370C0 AFB00030 */ sw $s0, 0x0030($sp) +/* 01DB4 80A370C4 AFBF0034 */ sw $ra, 0x0034($sp) +/* 01DB8 80A370C8 F7B40028 */ sdc1 $f20, 0x0028($sp) /* 01DBC 80A370CC 8CAE1C44 */ lw $t6, 0x1C44($a1) ## 00001C44 /* 01DC0 80A370D0 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 01DC4 80A370D4 3C040601 */ lui $a0, 0x0601 ## $a0 = 06010000 /* 01DC8 80A370D8 2484A814 */ addiu $a0, $a0, 0xA814 ## $a0 = 0600A814 /* 01DCC 80A370DC 0C028800 */ jal SkelAnime_GetFrameCount - -/* 01DD0 80A370E0 AFAE0038 */ sw $t6, 0x0038($sp) + +/* 01DD0 80A370E0 AFAE0038 */ sw $t6, 0x0038($sp) /* 01DD4 80A370E4 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 01DD8 80A370E8 4480A000 */ mtc1 $zero, $f20 ## $f20 = 0.00 /* 01DDC 80A370EC 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 -/* 01DE0 80A370F0 468021A0 */ cvt.s.w $f6, $f4 +/* 01DE0 80A370F0 468021A0 */ cvt.s.w $f6, $f4 /* 01DE4 80A370F4 240F0001 */ addiu $t7, $zero, 0x0001 ## $t7 = 00000001 -/* 01DE8 80A370F8 4407A000 */ mfc1 $a3, $f20 -/* 01DEC 80A370FC AFAF0014 */ sw $t7, 0x0014($sp) +/* 01DE8 80A370F8 4407A000 */ mfc1 $a3, $f20 +/* 01DEC 80A370FC AFAF0014 */ sw $t7, 0x0014($sp) /* 01DF0 80A37100 24A5A814 */ addiu $a1, $a1, 0xA814 ## $a1 = 0600A814 /* 01DF4 80A37104 26040188 */ addiu $a0, $s0, 0x0188 ## $a0 = 00000188 -/* 01DF8 80A37108 E7A60010 */ swc1 $f6, 0x0010($sp) +/* 01DF8 80A37108 E7A60010 */ swc1 $f6, 0x0010($sp) /* 01DFC 80A3710C 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 01E00 80A37110 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 01E04 80A37114 E7B40018 */ swc1 $f20, 0x0018($sp) -/* 01E08 80A37118 8FB80038 */ lw $t8, 0x0038($sp) +/* 01E00 80A37110 0C029468 */ jal SkelAnime_ChangeAnim + +/* 01E04 80A37114 E7B40018 */ swc1 $f20, 0x0018($sp) +/* 01E08 80A37118 8FB80038 */ lw $t8, 0x0038($sp) /* 01E0C 80A3711C 861900B6 */ lh $t9, 0x00B6($s0) ## 000000B6 /* 01E10 80A37120 870200B6 */ lh $v0, 0x00B6($t8) ## 000000B6 -/* 01E14 80A37124 00592023 */ subu $a0, $v0, $t9 -/* 01E18 80A37128 00042400 */ sll $a0, $a0, 16 -/* 01E1C 80A3712C 00042403 */ sra $a0, $a0, 16 +/* 01E14 80A37124 00592023 */ subu $a0, $v0, $t9 +/* 01E18 80A37128 00042400 */ sll $a0, $a0, 16 +/* 01E1C 80A3712C 00042403 */ sra $a0, $a0, 16 /* 01E20 80A37130 0C01DE1C */ jal Math_Sins ## sins? -/* 01E24 80A37134 A7A2003E */ sh $v0, 0x003E($sp) -/* 01E28 80A37138 4600A03C */ c.lt.s $f20, $f0 -/* 01E2C 80A3713C 87A2003E */ lh $v0, 0x003E($sp) +/* 01E24 80A37134 A7A2003E */ sh $v0, 0x003E($sp) +/* 01E28 80A37138 4600A03C */ c.lt.s $f20, $f0 +/* 01E2C 80A3713C 87A2003E */ lh $v0, 0x003E($sp) /* 01E30 80A37140 3C01C120 */ lui $at, 0xC120 ## $at = C1200000 -/* 01E34 80A37144 45020005 */ bc1fl .L80A3715C +/* 01E34 80A37144 45020005 */ bc1fl .L80A3715C /* 01E38 80A37148 860800B6 */ lh $t0, 0x00B6($s0) ## 000000B6 /* 01E3C 80A3714C 44814000 */ mtc1 $at, $f8 ## $f8 = -10.00 -/* 01E40 80A37150 1000001D */ beq $zero, $zero, .L80A371C8 +/* 01E40 80A37150 1000001D */ beq $zero, $zero, .L80A371C8 /* 01E44 80A37154 E6080068 */ swc1 $f8, 0x0068($s0) ## 00000068 /* 01E48 80A37158 860800B6 */ lh $t0, 0x00B6($s0) ## 000000B6 .L80A3715C: -/* 01E4C 80A3715C 00482023 */ subu $a0, $v0, $t0 -/* 01E50 80A37160 00042400 */ sll $a0, $a0, 16 +/* 01E4C 80A3715C 00482023 */ subu $a0, $v0, $t0 +/* 01E50 80A37160 00042400 */ sll $a0, $a0, 16 /* 01E54 80A37164 0C01DE1C */ jal Math_Sins ## sins? -/* 01E58 80A37168 00042403 */ sra $a0, $a0, 16 -/* 01E5C 80A3716C 4614003C */ c.lt.s $f0, $f20 +/* 01E58 80A37168 00042403 */ sra $a0, $a0, 16 +/* 01E5C 80A3716C 4614003C */ c.lt.s $f0, $f20 /* 01E60 80A37170 3C014120 */ lui $at, 0x4120 ## $at = 41200000 -/* 01E64 80A37174 45000004 */ bc1f .L80A37188 +/* 01E64 80A37174 45000004 */ bc1f .L80A37188 /* 01E68 80A37178 00000000 */ nop /* 01E6C 80A3717C 44815000 */ mtc1 $at, $f10 ## $f10 = 10.00 -/* 01E70 80A37180 10000011 */ beq $zero, $zero, .L80A371C8 +/* 01E70 80A37180 10000011 */ beq $zero, $zero, .L80A371C8 /* 01E74 80A37184 E60A0068 */ swc1 $f10, 0x0068($s0) ## 00000068 .L80A37188: /* 01E78 80A37188 0C03F66B */ jal Math_Rand_ZeroOne @@ -62,13 +62,13 @@ glabel func_80A370BC /* 01E80 80A37190 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 /* 01E84 80A37194 44818000 */ mtc1 $at, $f16 ## $f16 = 0.50 /* 01E88 80A37198 3C01C120 */ lui $at, 0xC120 ## $at = C1200000 -/* 01E8C 80A3719C 4600803C */ c.lt.s $f16, $f0 +/* 01E8C 80A3719C 4600803C */ c.lt.s $f16, $f0 /* 01E90 80A371A0 00000000 */ nop -/* 01E94 80A371A4 45020006 */ bc1fl .L80A371C0 +/* 01E94 80A371A4 45020006 */ bc1fl .L80A371C0 /* 01E98 80A371A8 44812000 */ mtc1 $at, $f4 ## $f4 = -10.00 /* 01E9C 80A371AC 3C014120 */ lui $at, 0x4120 ## $at = 41200000 /* 01EA0 80A371B0 44819000 */ mtc1 $at, $f18 ## $f18 = 10.00 -/* 01EA4 80A371B4 10000004 */ beq $zero, $zero, .L80A371C8 +/* 01EA4 80A371B4 10000004 */ beq $zero, $zero, .L80A371C8 /* 01EA8 80A371B8 E6120068 */ swc1 $f18, 0x0068($s0) ## 00000068 /* 01EAC 80A371BC 44812000 */ mtc1 $at, $f4 ## $f4 = 10.00 .L80A371C0: @@ -78,9 +78,9 @@ glabel func_80A370BC /* 01EB8 80A371C8 C6060068 */ lwc1 $f6, 0x0068($s0) ## 00000068 /* 01EBC 80A371CC 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 /* 01EC0 80A371D0 44815000 */ mtc1 $at, $f10 ## $f10 = 0.50 -/* 01EC4 80A371D4 46003207 */ neg.s $f8, $f6 +/* 01EC4 80A371D4 46003207 */ neg.s $f8, $f6 /* 01EC8 80A371D8 860900B6 */ lh $t1, 0x00B6($s0) ## 000000B6 -/* 01ECC 80A371DC 460A4402 */ mul.s $f16, $f8, $f10 +/* 01ECC 80A371DC 460A4402 */ mul.s $f16, $f8, $f10 /* 01ED0 80A371E0 240A0006 */ addiu $t2, $zero, 0x0006 ## $t2 = 00000006 /* 01ED4 80A371E4 240B0010 */ addiu $t3, $zero, 0x0010 ## $t3 = 00000010 /* 01ED8 80A371E8 3C0580A3 */ lui $a1, %hi(func_80A37224) ## $a1 = 80A30000 @@ -91,12 +91,12 @@ glabel func_80A370BC /* 01EEC 80A371FC AE0B02EC */ sw $t3, 0x02EC($s0) ## 000002EC /* 01EF0 80A37200 24A57224 */ addiu $a1, $a1, %lo(func_80A37224) ## $a1 = 80A37224 /* 01EF4 80A37204 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01EF8 80A37208 0C28D4C4 */ jal func_80A35310 +/* 01EF8 80A37208 0C28D4C4 */ jal func_80A35310 /* 01EFC 80A3720C A6090032 */ sh $t1, 0x0032($s0) ## 00000032 -/* 01F00 80A37210 8FBF0034 */ lw $ra, 0x0034($sp) -/* 01F04 80A37214 D7B40028 */ ldc1 $f20, 0x0028($sp) -/* 01F08 80A37218 8FB00030 */ lw $s0, 0x0030($sp) -/* 01F0C 80A3721C 03E00008 */ jr $ra +/* 01F00 80A37210 8FBF0034 */ lw $ra, 0x0034($sp) +/* 01F04 80A37214 D7B40028 */ ldc1 $f20, 0x0028($sp) +/* 01F08 80A37218 8FB00030 */ lw $s0, 0x0030($sp) +/* 01F0C 80A3721C 03E00008 */ jr $ra /* 01F10 80A37220 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_GeldB/func_80A37670.s b/asm/non_matchings/overlays/actors/ovl_En_GeldB/func_80A37670.s index 46ca1a03a2..a5e1e84e51 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_GeldB/func_80A37670.s +++ b/asm/non_matchings/overlays/actors/ovl_En_GeldB/func_80A37670.s @@ -1,13 +1,13 @@ glabel func_80A37670 /* 02360 80A37670 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 02364 80A37674 AFBF0014 */ sw $ra, 0x0014($sp) +/* 02364 80A37674 AFBF0014 */ sw $ra, 0x0014($sp) /* 02368 80A37678 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 /* 0236C 80A3767C 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 02370 80A37680 24A503CC */ addiu $a1, $a1, 0x03CC ## $a1 = 060003CC -/* 02374 80A37684 AFA60018 */ sw $a2, 0x0018($sp) -/* 02378 80A37688 0C02947A */ jal func_800A51E8 +/* 02374 80A37684 AFA60018 */ sw $a2, 0x0018($sp) +/* 02378 80A37688 0C02947A */ jal SkelAnime_ChangeAnimDefaultStop /* 0237C 80A3768C 24840188 */ addiu $a0, $a0, 0x0188 ## $a0 = 00000188 -/* 02380 80A37690 8FA60018 */ lw $a2, 0x0018($sp) +/* 02380 80A37690 8FA60018 */ lw $a2, 0x0018($sp) /* 02384 80A37694 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 /* 02388 80A37698 24180007 */ addiu $t8, $zero, 0x0007 ## $t8 = 00000007 /* 0238C 80A3769C 90CE037C */ lbu $t6, 0x037C($a2) ## 0000037C @@ -17,15 +17,15 @@ glabel func_80A37670 /* 0239C 80A376AC A0CF037C */ sb $t7, 0x037C($a2) ## 0000037C /* 023A0 80A376B0 A4C00312 */ sh $zero, 0x0312($a2) ## 00000312 /* 023A4 80A376B4 24C400E4 */ addiu $a0, $a2, 0x00E4 ## $a0 = 000000E4 -/* 023A8 80A376B8 0C03E291 */ jal func_800F8A44 +/* 023A8 80A376B8 0C03E291 */ jal func_800F8A44 /* 023AC 80A376BC E4C40068 */ swc1 $f4, 0x0068($a2) ## 00000068 /* 023B0 80A376C0 3C0580A3 */ lui $a1, %hi(func_80A376E0) ## $a1 = 80A30000 -/* 023B4 80A376C4 8FA40018 */ lw $a0, 0x0018($sp) -/* 023B8 80A376C8 0C28D4C4 */ jal func_80A35310 +/* 023B4 80A376C4 8FA40018 */ lw $a0, 0x0018($sp) +/* 023B8 80A376C8 0C28D4C4 */ jal func_80A35310 /* 023BC 80A376CC 24A576E0 */ addiu $a1, $a1, %lo(func_80A376E0) ## $a1 = 80A376E0 -/* 023C0 80A376D0 8FBF0014 */ lw $ra, 0x0014($sp) +/* 023C0 80A376D0 8FBF0014 */ lw $ra, 0x0014($sp) /* 023C4 80A376D4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 023C8 80A376D8 03E00008 */ jr $ra +/* 023C8 80A376D8 03E00008 */ jr $ra /* 023CC 80A376DC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_GeldB/func_80A3792C.s b/asm/non_matchings/overlays/actors/ovl_En_GeldB/func_80A3792C.s index 8136c12d99..890c74dc8a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_GeldB/func_80A3792C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_GeldB/func_80A3792C.s @@ -1,26 +1,26 @@ glabel func_80A3792C /* 0261C 80A3792C 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 02620 80A37930 AFB00028 */ sw $s0, 0x0028($sp) +/* 02620 80A37930 AFB00028 */ sw $s0, 0x0028($sp) /* 02624 80A37934 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 02628 80A37938 AFBF002C */ sw $ra, 0x002C($sp) +/* 02628 80A37938 AFBF002C */ sw $ra, 0x002C($sp) /* 0262C 80A3793C 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 /* 02630 80A37940 0C028800 */ jal SkelAnime_GetFrameCount - + /* 02634 80A37944 24840F5C */ addiu $a0, $a0, 0x0F5C ## $a0 = 06000F5C /* 02638 80A37948 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 0263C 80A3794C 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 /* 02640 80A37950 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 02644 80A37954 468021A0 */ cvt.s.w $f6, $f4 +/* 02644 80A37954 468021A0 */ cvt.s.w $f6, $f4 /* 02648 80A37958 240E0003 */ addiu $t6, $zero, 0x0003 ## $t6 = 00000003 -/* 0264C 80A3795C 44070000 */ mfc1 $a3, $f0 -/* 02650 80A37960 AFAE0014 */ sw $t6, 0x0014($sp) +/* 0264C 80A3795C 44070000 */ mfc1 $a3, $f0 +/* 02650 80A37960 AFAE0014 */ sw $t6, 0x0014($sp) /* 02654 80A37964 24A50F5C */ addiu $a1, $a1, 0x0F5C ## $a1 = 06000F5C /* 02658 80A37968 26040188 */ addiu $a0, $s0, 0x0188 ## $a0 = 00000188 -/* 0265C 80A3796C E7A60010 */ swc1 $f6, 0x0010($sp) +/* 0265C 80A3796C E7A60010 */ swc1 $f6, 0x0010($sp) /* 02660 80A37970 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 02664 80A37974 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 02668 80A37978 E7A00018 */ swc1 $f0, 0x0018($sp) +/* 02664 80A37974 0C029468 */ jal SkelAnime_ChangeAnim + +/* 02668 80A37978 E7A00018 */ swc1 $f0, 0x0018($sp) /* 0266C 80A3797C 920F037C */ lbu $t7, 0x037C($s0) ## 0000037C /* 02670 80A37980 44804000 */ mtc1 $zero, $f8 ## $f8 = 0.00 /* 02674 80A37984 2419000C */ addiu $t9, $zero, 0x000C ## $t9 = 0000000C @@ -31,12 +31,12 @@ glabel func_80A3792C /* 02688 80A37998 A6000312 */ sh $zero, 0x0312($s0) ## 00000312 /* 0268C 80A3799C 24A579C0 */ addiu $a1, $a1, %lo(func_80A379C0) ## $a1 = 80A379C0 /* 02690 80A379A0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02694 80A379A4 0C28D4C4 */ jal func_80A35310 +/* 02694 80A379A4 0C28D4C4 */ jal func_80A35310 /* 02698 80A379A8 E6080068 */ swc1 $f8, 0x0068($s0) ## 00000068 -/* 0269C 80A379AC 8FBF002C */ lw $ra, 0x002C($sp) -/* 026A0 80A379B0 8FB00028 */ lw $s0, 0x0028($sp) +/* 0269C 80A379AC 8FBF002C */ lw $ra, 0x002C($sp) +/* 026A0 80A379B0 8FB00028 */ lw $s0, 0x0028($sp) /* 026A4 80A379B4 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 026A8 80A379B8 03E00008 */ jr $ra +/* 026A8 80A379B8 03E00008 */ jr $ra /* 026AC 80A379BC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_GeldB/func_80A37D70.s b/asm/non_matchings/overlays/actors/ovl_En_GeldB/func_80A37D70.s index 53990442db..84f9da715a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_GeldB/func_80A37D70.s +++ b/asm/non_matchings/overlays/actors/ovl_En_GeldB/func_80A37D70.s @@ -1,14 +1,14 @@ glabel func_80A37D70 /* 02A60 80A37D70 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 02A64 80A37D74 AFBF0014 */ sw $ra, 0x0014($sp) +/* 02A64 80A37D74 AFBF0014 */ sw $ra, 0x0014($sp) /* 02A68 80A37D78 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 /* 02A6C 80A37D7C 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 02A70 80A37D80 24A51390 */ addiu $a1, $a1, 0x1390 ## $a1 = 06001390 -/* 02A74 80A37D84 AFA70018 */ sw $a3, 0x0018($sp) +/* 02A74 80A37D84 AFA70018 */ sw $a3, 0x0018($sp) /* 02A78 80A37D88 24840188 */ addiu $a0, $a0, 0x0188 ## $a0 = 00000188 -/* 02A7C 80A37D8C 0C029490 */ jal func_800A5240 +/* 02A7C 80A37D8C 0C029490 */ jal SkelAnime_ChangeAnimTransitionStop /* 02A80 80A37D90 3C06C040 */ lui $a2, 0xC040 ## $a2 = C0400000 -/* 02A84 80A37D94 8FA40018 */ lw $a0, 0x0018($sp) +/* 02A84 80A37D94 8FA40018 */ lw $a0, 0x0018($sp) /* 02A88 80A37D98 3C01C100 */ lui $at, 0xC100 ## $at = C1000000 /* 02A8C 80A37D9C 44812000 */ mtc1 $at, $f4 ## $f4 = -8.00 /* 02A90 80A37DA0 240E0001 */ addiu $t6, $zero, 0x0001 ## $t6 = 00000001 @@ -18,18 +18,18 @@ glabel func_80A37D70 /* 02AA0 80A37DB0 A48E0318 */ sh $t6, 0x0318($a0) ## 00000318 /* 02AA4 80A37DB4 AC8F02EC */ sw $t7, 0x02EC($a0) ## 000002EC /* 02AA8 80A37DB8 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 02AAC 80A37DBC E4840068 */ swc1 $f4, 0x0068($a0) ## 00000068 -/* 02AB0 80A37DC0 8FA40018 */ lw $a0, 0x0018($sp) +/* 02AB0 80A37DC0 8FA40018 */ lw $a0, 0x0018($sp) /* 02AB4 80A37DC4 3C0580A3 */ lui $a1, %hi(func_80A37DEC) ## $a1 = 80A30000 /* 02AB8 80A37DC8 24A57DEC */ addiu $a1, $a1, %lo(func_80A37DEC) ## $a1 = 80A37DEC /* 02ABC 80A37DCC 8482008A */ lh $v0, 0x008A($a0) ## 0000008A /* 02AC0 80A37DD0 A4820032 */ sh $v0, 0x0032($a0) ## 00000032 -/* 02AC4 80A37DD4 0C28D4C4 */ jal func_80A35310 +/* 02AC4 80A37DD4 0C28D4C4 */ jal func_80A35310 /* 02AC8 80A37DD8 A48200B6 */ sh $v0, 0x00B6($a0) ## 000000B6 -/* 02ACC 80A37DDC 8FBF0014 */ lw $ra, 0x0014($sp) +/* 02ACC 80A37DDC 8FBF0014 */ lw $ra, 0x0014($sp) /* 02AD0 80A37DE0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 02AD4 80A37DE4 03E00008 */ jr $ra +/* 02AD4 80A37DE4 03E00008 */ jr $ra /* 02AD8 80A37DE8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_GeldB/func_80A37EF0.s b/asm/non_matchings/overlays/actors/ovl_En_GeldB/func_80A37EF0.s index ef8da270e5..127f272122 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_GeldB/func_80A37EF0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_GeldB/func_80A37EF0.s @@ -1,11 +1,11 @@ glabel func_80A37EF0 /* 02BE0 80A37EF0 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 02BE4 80A37EF4 AFBF0014 */ sw $ra, 0x0014($sp) +/* 02BE4 80A37EF4 AFBF0014 */ sw $ra, 0x0014($sp) /* 02BE8 80A37EF8 948E0088 */ lhu $t6, 0x0088($a0) ## 00000088 /* 02BEC 80A37EFC 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 02BF0 80A37F00 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 /* 02BF4 80A37F04 31CF0001 */ andi $t7, $t6, 0x0001 ## $t7 = 00000000 -/* 02BF8 80A37F08 11E00004 */ beq $t7, $zero, .L80A37F1C +/* 02BF8 80A37F08 11E00004 */ beq $t7, $zero, .L80A37F1C /* 02BFC 80A37F0C 24A52280 */ addiu $a1, $a1, 0x2280 ## $a1 = 06002280 /* 02C00 80A37F10 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 /* 02C04 80A37F14 00000000 */ nop @@ -14,37 +14,37 @@ glabel func_80A37EF0 /* 02C0C 80A37F1C 90E202FE */ lbu $v0, 0x02FE($a3) ## 000002FE /* 02C10 80A37F20 2401000F */ addiu $at, $zero, 0x000F ## $at = 0000000F /* 02C14 80A37F24 24E40188 */ addiu $a0, $a3, 0x0188 ## $a0 = 00000188 -/* 02C18 80A37F28 14410005 */ bne $v0, $at, .L80A37F40 +/* 02C18 80A37F28 14410005 */ bne $v0, $at, .L80A37F40 /* 02C1C 80A37F2C 24060000 */ addiu $a2, $zero, 0x0000 ## $a2 = 00000000 /* 02C20 80A37F30 8CF802EC */ lw $t8, 0x02EC($a3) ## 000002EC /* 02C24 80A37F34 2401000C */ addiu $at, $zero, 0x000C ## $at = 0000000C -/* 02C28 80A37F38 57010006 */ bnel $t8, $at, .L80A37F54 +/* 02C28 80A37F38 57010006 */ bnel $t8, $at, .L80A37F54 /* 02C2C 80A37F3C 2401000F */ addiu $at, $zero, 0x000F ## $at = 0000000F .L80A37F40: -/* 02C30 80A37F40 0C0294A7 */ jal func_800A529C -/* 02C34 80A37F44 AFA70018 */ sw $a3, 0x0018($sp) -/* 02C38 80A37F48 8FA70018 */ lw $a3, 0x0018($sp) +/* 02C30 80A37F40 0C0294A7 */ jal SkelAnime_ChangeAnimPlaybackStop +/* 02C34 80A37F44 AFA70018 */ sw $a3, 0x0018($sp) +/* 02C38 80A37F48 8FA70018 */ lw $a3, 0x0018($sp) /* 02C3C 80A37F4C 90E202FE */ lbu $v0, 0x02FE($a3) ## 000002FE /* 02C40 80A37F50 2401000F */ addiu $at, $zero, 0x000F ## $at = 0000000F .L80A37F54: -/* 02C44 80A37F54 14410003 */ bne $v0, $at, .L80A37F64 +/* 02C44 80A37F54 14410003 */ bne $v0, $at, .L80A37F64 /* 02C48 80A37F58 00E02025 */ or $a0, $a3, $zero ## $a0 = 00000000 /* 02C4C 80A37F5C 24190024 */ addiu $t9, $zero, 0x0024 ## $t9 = 00000024 /* 02C50 80A37F60 A4F902FC */ sh $t9, 0x02FC($a3) ## 000002FC .L80A37F64: /* 02C54 80A37F64 2405389E */ addiu $a1, $zero, 0x389E ## $a1 = 0000389E /* 02C58 80A37F68 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 02C5C 80A37F6C AFA70018 */ sw $a3, 0x0018($sp) -/* 02C60 80A37F70 8FA40018 */ lw $a0, 0x0018($sp) + +/* 02C5C 80A37F6C AFA70018 */ sw $a3, 0x0018($sp) +/* 02C60 80A37F70 8FA40018 */ lw $a0, 0x0018($sp) /* 02C64 80A37F74 2408000F */ addiu $t0, $zero, 0x000F ## $t0 = 0000000F /* 02C68 80A37F78 3C0580A3 */ lui $a1, %hi(func_80A37F98) ## $a1 = 80A30000 /* 02C6C 80A37F7C 24A57F98 */ addiu $a1, $a1, %lo(func_80A37F98) ## $a1 = 80A37F98 -/* 02C70 80A37F80 0C28D4C4 */ jal func_80A35310 +/* 02C70 80A37F80 0C28D4C4 */ jal func_80A35310 /* 02C74 80A37F84 AC8802EC */ sw $t0, 0x02EC($a0) ## 000002EC -/* 02C78 80A37F88 8FBF0014 */ lw $ra, 0x0014($sp) +/* 02C78 80A37F88 8FBF0014 */ lw $ra, 0x0014($sp) /* 02C7C 80A37F8C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 02C80 80A37F90 03E00008 */ jr $ra +/* 02C80 80A37F90 03E00008 */ jr $ra /* 02C84 80A37F94 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_GeldB/func_80A38054.s b/asm/non_matchings/overlays/actors/ovl_En_GeldB/func_80A38054.s index 7f98a30044..28af3b1470 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_GeldB/func_80A38054.s +++ b/asm/non_matchings/overlays/actors/ovl_En_GeldB/func_80A38054.s @@ -1,24 +1,24 @@ glabel func_80A38054 /* 02D44 80A38054 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 02D48 80A38058 AFBF0014 */ sw $ra, 0x0014($sp) +/* 02D48 80A38058 AFBF0014 */ sw $ra, 0x0014($sp) /* 02D4C 80A3805C 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 /* 02D50 80A38060 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 02D54 80A38064 24A52280 */ addiu $a1, $a1, 0x2280 ## $a1 = 06002280 -/* 02D58 80A38068 AFA70018 */ sw $a3, 0x0018($sp) +/* 02D58 80A38068 AFA70018 */ sw $a3, 0x0018($sp) /* 02D5C 80A3806C 24840188 */ addiu $a0, $a0, 0x0188 ## $a0 = 00000188 -/* 02D60 80A38070 0C029490 */ jal func_800A5240 +/* 02D60 80A38070 0C029490 */ jal SkelAnime_ChangeAnimTransitionStop /* 02D64 80A38074 3C06C080 */ lui $a2, 0xC080 ## $a2 = C0800000 -/* 02D68 80A38078 8FA70018 */ lw $a3, 0x0018($sp) +/* 02D68 80A38078 8FA70018 */ lw $a3, 0x0018($sp) /* 02D6C 80A3807C 3C01C080 */ lui $at, 0xC080 ## $at = C0800000 /* 02D70 80A38080 24180001 */ addiu $t8, $zero, 0x0001 ## $t8 = 00000001 /* 02D74 80A38084 94EE0088 */ lhu $t6, 0x0088($a3) ## 00000088 /* 02D78 80A38088 00E02025 */ or $a0, $a3, $zero ## $a0 = 00000000 /* 02D7C 80A3808C 31CF0001 */ andi $t7, $t6, 0x0001 ## $t7 = 00000000 -/* 02D80 80A38090 51E00006 */ beql $t7, $zero, .L80A380AC +/* 02D80 80A38090 51E00006 */ beql $t7, $zero, .L80A380AC /* 02D84 80A38094 A4F80318 */ sh $t8, 0x0318($a3) ## 00000318 /* 02D88 80A38098 44812000 */ mtc1 $at, $f4 ## $f4 = -4.00 /* 02D8C 80A3809C A4E00318 */ sh $zero, 0x0318($a3) ## 00000318 -/* 02D90 80A380A0 10000002 */ beq $zero, $zero, .L80A380AC +/* 02D90 80A380A0 10000002 */ beq $zero, $zero, .L80A380AC /* 02D94 80A380A4 E4E40068 */ swc1 $f4, 0x0068($a3) ## 00000068 /* 02D98 80A380A8 A4F80318 */ sh $t8, 0x0318($a3) ## 00000318 .L80A380AC: @@ -27,17 +27,17 @@ glabel func_80A38054 /* 02DA4 80A380B4 24053999 */ addiu $a1, $zero, 0x3999 ## $a1 = 00003999 /* 02DA8 80A380B8 A4F90032 */ sh $t9, 0x0032($a3) ## 00000032 /* 02DAC 80A380BC 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 02DB0 80A380C0 AFA70018 */ sw $a3, 0x0018($sp) -/* 02DB4 80A380C4 8FA40018 */ lw $a0, 0x0018($sp) + +/* 02DB0 80A380C0 AFA70018 */ sw $a3, 0x0018($sp) +/* 02DB4 80A380C4 8FA40018 */ lw $a0, 0x0018($sp) /* 02DB8 80A380C8 24080002 */ addiu $t0, $zero, 0x0002 ## $t0 = 00000002 /* 02DBC 80A380CC 3C0580A4 */ lui $a1, %hi(func_80A380EC) ## $a1 = 80A40000 /* 02DC0 80A380D0 24A580EC */ addiu $a1, $a1, %lo(func_80A380EC) ## $a1 = 80A380EC -/* 02DC4 80A380D4 0C28D4C4 */ jal func_80A35310 +/* 02DC4 80A380D4 0C28D4C4 */ jal func_80A35310 /* 02DC8 80A380D8 AC8802EC */ sw $t0, 0x02EC($a0) ## 000002EC -/* 02DCC 80A380DC 8FBF0014 */ lw $ra, 0x0014($sp) +/* 02DCC 80A380DC 8FBF0014 */ lw $ra, 0x0014($sp) /* 02DD0 80A380E0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 02DD4 80A380E4 03E00008 */ jr $ra +/* 02DD4 80A380E4 03E00008 */ jr $ra /* 02DD8 80A380E8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_GeldB/func_80A38290.s b/asm/non_matchings/overlays/actors/ovl_En_GeldB/func_80A38290.s index 220bc23b89..6130905145 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_GeldB/func_80A38290.s +++ b/asm/non_matchings/overlays/actors/ovl_En_GeldB/func_80A38290.s @@ -1,28 +1,28 @@ glabel func_80A38290 /* 02F80 80A38290 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 02F84 80A38294 AFB00028 */ sw $s0, 0x0028($sp) +/* 02F84 80A38294 AFB00028 */ sw $s0, 0x0028($sp) /* 02F88 80A38298 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 02F8C 80A3829C AFBF002C */ sw $ra, 0x002C($sp) +/* 02F8C 80A3829C AFBF002C */ sw $ra, 0x002C($sp) /* 02F90 80A382A0 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 /* 02F94 80A382A4 0C028800 */ jal SkelAnime_GetFrameCount - + /* 02F98 80A382A8 24841390 */ addiu $a0, $a0, 0x1390 ## $a0 = 06001390 /* 02F9C 80A382AC 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 02FA0 80A382B0 3C01C040 */ lui $at, 0xC040 ## $at = C0400000 /* 02FA4 80A382B4 44814000 */ mtc1 $at, $f8 ## $f8 = -3.00 -/* 02FA8 80A382B8 46802120 */ cvt.s.w $f4, $f4 +/* 02FA8 80A382B8 46802120 */ cvt.s.w $f4, $f4 /* 02FAC 80A382BC 44803000 */ mtc1 $zero, $f6 ## $f6 = 0.00 /* 02FB0 80A382C0 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 02FB4 80A382C4 240E0002 */ addiu $t6, $zero, 0x0002 ## $t6 = 00000002 -/* 02FB8 80A382C8 AFAE0014 */ sw $t6, 0x0014($sp) +/* 02FB8 80A382C8 AFAE0014 */ sw $t6, 0x0014($sp) /* 02FBC 80A382CC 24A51390 */ addiu $a1, $a1, 0x1390 ## $a1 = 06001390 -/* 02FC0 80A382D0 44072000 */ mfc1 $a3, $f4 +/* 02FC0 80A382D0 44072000 */ mfc1 $a3, $f4 /* 02FC4 80A382D4 26040188 */ addiu $a0, $s0, 0x0188 ## $a0 = 00000188 /* 02FC8 80A382D8 3C06BF80 */ lui $a2, 0xBF80 ## $a2 = BF800000 -/* 02FCC 80A382DC E7A80018 */ swc1 $f8, 0x0018($sp) -/* 02FD0 80A382E0 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 02FD4 80A382E4 E7A60010 */ swc1 $f6, 0x0010($sp) +/* 02FCC 80A382DC E7A80018 */ swc1 $f8, 0x0018($sp) +/* 02FD0 80A382E0 0C029468 */ jal SkelAnime_ChangeAnim + +/* 02FD4 80A382E4 E7A60010 */ swc1 $f6, 0x0010($sp) /* 02FD8 80A382E8 3C0140D0 */ lui $at, 0x40D0 ## $at = 40D00000 /* 02FDC 80A382EC 44815000 */ mtc1 $at, $f10 ## $f10 = 6.50 /* 02FE0 80A382F0 3C014170 */ lui $at, 0x4170 ## $at = 41700000 @@ -35,18 +35,18 @@ glabel func_80A38290 /* 02FFC 80A3830C 2405386C */ addiu $a1, $zero, 0x386C ## $a1 = 0000386C /* 03000 80A38310 E60A0068 */ swc1 $f10, 0x0068($s0) ## 00000068 /* 03004 80A38314 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 03008 80A38318 E6100060 */ swc1 $f16, 0x0060($s0) ## 00000060 /* 0300C 80A3831C 861800B6 */ lh $t8, 0x00B6($s0) ## 000000B6 /* 03010 80A38320 3C0580A4 */ lui $a1, %hi(func_80A38348) ## $a1 = 80A40000 /* 03014 80A38324 24A58348 */ addiu $a1, $a1, %lo(func_80A38348) ## $a1 = 80A38348 /* 03018 80A38328 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0301C 80A3832C 0C28D4C4 */ jal func_80A35310 +/* 0301C 80A3832C 0C28D4C4 */ jal func_80A35310 /* 03020 80A38330 A6180032 */ sh $t8, 0x0032($s0) ## 00000032 -/* 03024 80A38334 8FBF002C */ lw $ra, 0x002C($sp) -/* 03028 80A38338 8FB00028 */ lw $s0, 0x0028($sp) +/* 03024 80A38334 8FBF002C */ lw $ra, 0x002C($sp) +/* 03028 80A38338 8FB00028 */ lw $s0, 0x0028($sp) /* 0302C 80A3833C 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 03030 80A38340 03E00008 */ jr $ra +/* 03030 80A38340 03E00008 */ jr $ra /* 03034 80A38344 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_GeldB/func_80A38430.s b/asm/non_matchings/overlays/actors/ovl_En_GeldB/func_80A38430.s index 4522a4ba1f..abfad8e096 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_GeldB/func_80A38430.s +++ b/asm/non_matchings/overlays/actors/ovl_En_GeldB/func_80A38430.s @@ -1,17 +1,17 @@ glabel func_80A38430 /* 03120 80A38430 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 03124 80A38434 AFB00028 */ sw $s0, 0x0028($sp) +/* 03124 80A38434 AFB00028 */ sw $s0, 0x0028($sp) /* 03128 80A38438 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 0312C 80A3843C AFBF002C */ sw $ra, 0x002C($sp) +/* 0312C 80A3843C AFBF002C */ sw $ra, 0x002C($sp) /* 03130 80A38440 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 /* 03134 80A38444 0C028800 */ jal SkelAnime_GetFrameCount - + /* 03138 80A38448 24841578 */ addiu $a0, $a0, 0x1578 ## $a0 = 06001578 /* 0313C 80A3844C 860E0310 */ lh $t6, 0x0310($s0) ## 00000310 /* 03140 80A38450 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 03144 80A38454 44801000 */ mtc1 $zero, $f2 ## $f2 = 0.00 -/* 03148 80A38458 11C00003 */ beq $t6, $zero, .L80A38468 -/* 0314C 80A3845C 468023A0 */ cvt.s.w $f14, $f4 +/* 03148 80A38458 11C00003 */ beq $t6, $zero, .L80A38468 +/* 0314C 80A3845C 468023A0 */ cvt.s.w $f14, $f4 /* 03150 80A38460 240FFFFF */ addiu $t7, $zero, 0xFFFF ## $t7 = FFFFFFFF /* 03154 80A38464 A60F0310 */ sh $t7, 0x0310($s0) ## 00000310 .L80A38468: @@ -21,33 +21,33 @@ glabel func_80A38430 /* 03164 80A38474 AE1802EC */ sw $t8, 0x02EC($s0) ## 000002EC /* 03168 80A38478 44816000 */ mtc1 $at, $f12 ## $f12 = 10.00 /* 0316C 80A3847C 0C00CFC8 */ jal Math_Rand_CenteredFloat - -/* 03170 80A38480 E7AE0034 */ swc1 $f14, 0x0034($sp) -/* 03174 80A38484 4600018D */ trunc.w.s $f6, $f0 + +/* 03170 80A38480 E7AE0034 */ swc1 $f14, 0x0034($sp) +/* 03174 80A38484 4600018D */ trunc.w.s $f6, $f0 /* 03178 80A38488 44801000 */ mtc1 $zero, $f2 ## $f2 = 0.00 -/* 0317C 80A3848C C7AE0034 */ lwc1 $f14, 0x0034($sp) +/* 0317C 80A3848C C7AE0034 */ lwc1 $f14, 0x0034($sp) /* 03180 80A38490 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 03184 80A38494 44083000 */ mfc1 $t0, $f6 +/* 03184 80A38494 44083000 */ mfc1 $t0, $f6 /* 03188 80A38498 240A0002 */ addiu $t2, $zero, 0x0002 ## $t2 = 00000002 -/* 0318C 80A3849C 44061000 */ mfc1 $a2, $f2 +/* 0318C 80A3849C 44061000 */ mfc1 $a2, $f2 /* 03190 80A384A0 2509000A */ addiu $t1, $t0, 0x000A ## $t1 = 0000000A /* 03194 80A384A4 AE090300 */ sw $t1, 0x0300($s0) ## 00000300 -/* 03198 80A384A8 44071000 */ mfc1 $a3, $f2 -/* 0319C 80A384AC AFAA0014 */ sw $t2, 0x0014($sp) +/* 03198 80A384A8 44071000 */ mfc1 $a3, $f2 +/* 0319C 80A384AC AFAA0014 */ sw $t2, 0x0014($sp) /* 031A0 80A384B0 24A51578 */ addiu $a1, $a1, 0x1578 ## $a1 = 06001578 /* 031A4 80A384B4 26040188 */ addiu $a0, $s0, 0x0188 ## $a0 = 00000188 -/* 031A8 80A384B8 E7A20018 */ swc1 $f2, 0x0018($sp) -/* 031AC 80A384BC 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 031B0 80A384C0 E7AE0010 */ swc1 $f14, 0x0010($sp) +/* 031A8 80A384B8 E7A20018 */ swc1 $f2, 0x0018($sp) +/* 031AC 80A384BC 0C029468 */ jal SkelAnime_ChangeAnim + +/* 031B0 80A384C0 E7AE0010 */ swc1 $f14, 0x0010($sp) /* 031B4 80A384C4 3C0580A4 */ lui $a1, %hi(func_80A384E8) ## $a1 = 80A40000 /* 031B8 80A384C8 24A584E8 */ addiu $a1, $a1, %lo(func_80A384E8) ## $a1 = 80A384E8 -/* 031BC 80A384CC 0C28D4C4 */ jal func_80A35310 +/* 031BC 80A384CC 0C28D4C4 */ jal func_80A35310 /* 031C0 80A384D0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 031C4 80A384D4 8FBF002C */ lw $ra, 0x002C($sp) -/* 031C8 80A384D8 8FB00028 */ lw $s0, 0x0028($sp) +/* 031C4 80A384D4 8FBF002C */ lw $ra, 0x002C($sp) +/* 031C8 80A384D8 8FB00028 */ lw $s0, 0x0028($sp) /* 031CC 80A384DC 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 -/* 031D0 80A384E0 03E00008 */ jr $ra +/* 031D0 80A384E0 03E00008 */ jr $ra /* 031D4 80A384E4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_GeldB/func_80A387D0.s b/asm/non_matchings/overlays/actors/ovl_En_GeldB/func_80A387D0.s index b4ee1af6ad..7dca162303 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_GeldB/func_80A387D0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_GeldB/func_80A387D0.s @@ -1,87 +1,87 @@ glabel func_80A387D0 /* 034C0 80A387D0 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 034C4 80A387D4 AFB00028 */ sw $s0, 0x0028($sp) +/* 034C4 80A387D4 AFB00028 */ sw $s0, 0x0028($sp) /* 034C8 80A387D8 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 034CC 80A387DC AFBF002C */ sw $ra, 0x002C($sp) +/* 034CC 80A387DC AFBF002C */ sw $ra, 0x002C($sp) /* 034D0 80A387E0 3C040601 */ lui $a0, 0x0601 ## $a0 = 06010000 -/* 034D4 80A387E4 AFA5003C */ sw $a1, 0x003C($sp) +/* 034D4 80A387E4 AFA5003C */ sw $a1, 0x003C($sp) /* 034D8 80A387E8 0C028800 */ jal SkelAnime_GetFrameCount - + /* 034DC 80A387EC 2484A814 */ addiu $a0, $a0, 0xA814 ## $a0 = 0600A814 /* 034E0 80A387F0 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 034E4 80A387F4 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 /* 034E8 80A387F8 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 -/* 034EC 80A387FC 468021A0 */ cvt.s.w $f6, $f4 +/* 034EC 80A387FC 468021A0 */ cvt.s.w $f6, $f4 /* 034F0 80A38800 240E0001 */ addiu $t6, $zero, 0x0001 ## $t6 = 00000001 -/* 034F4 80A38804 44070000 */ mfc1 $a3, $f0 -/* 034F8 80A38808 AFAE0014 */ sw $t6, 0x0014($sp) +/* 034F4 80A38804 44070000 */ mfc1 $a3, $f0 +/* 034F8 80A38808 AFAE0014 */ sw $t6, 0x0014($sp) /* 034FC 80A3880C 24A5A814 */ addiu $a1, $a1, 0xA814 ## $a1 = 0600A814 /* 03500 80A38810 26040188 */ addiu $a0, $s0, 0x0188 ## $a0 = 00000188 -/* 03504 80A38814 E7A60010 */ swc1 $f6, 0x0010($sp) +/* 03504 80A38814 E7A60010 */ swc1 $f6, 0x0010($sp) /* 03508 80A38818 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 0350C 80A3881C 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 03510 80A38820 E7A00018 */ swc1 $f0, 0x0018($sp) -/* 03514 80A38824 8FAF003C */ lw $t7, 0x003C($sp) +/* 0350C 80A3881C 0C029468 */ jal SkelAnime_ChangeAnim + +/* 03510 80A38820 E7A00018 */ swc1 $f0, 0x0018($sp) +/* 03514 80A38824 8FAF003C */ lw $t7, 0x003C($sp) /* 03518 80A38828 24190001 */ addiu $t9, $zero, 0x0001 ## $t9 = 00000001 /* 0351C 80A3882C 260400B6 */ addiu $a0, $s0, 0x00B6 ## $a0 = 000000B6 /* 03520 80A38830 8DF81C44 */ lw $t8, 0x1C44($t7) ## 00001C44 /* 03524 80A38834 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 /* 03528 80A38838 24070FA0 */ addiu $a3, $zero, 0x0FA0 ## $a3 = 00000FA0 -/* 0352C 80A3883C AFB80030 */ sw $t8, 0x0030($sp) +/* 0352C 80A3883C AFB80030 */ sw $t8, 0x0030($sp) /* 03530 80A38840 8605008A */ lh $a1, 0x008A($s0) ## 0000008A /* 03534 80A38844 0C01E1A7 */ jal Math_SmoothScaleMaxMinS - -/* 03538 80A38848 AFB90010 */ sw $t9, 0x0010($sp) -/* 0353C 80A3884C 8FA80030 */ lw $t0, 0x0030($sp) + +/* 03538 80A38848 AFB90010 */ sw $t9, 0x0010($sp) +/* 0353C 80A3884C 8FA80030 */ lw $t0, 0x0030($sp) /* 03540 80A38850 860900B6 */ lh $t1, 0x00B6($s0) ## 000000B6 /* 03544 80A38854 850300B6 */ lh $v1, 0x00B6($t0) ## 000000B6 -/* 03548 80A38858 00692023 */ subu $a0, $v1, $t1 -/* 0354C 80A3885C 00042400 */ sll $a0, $a0, 16 -/* 03550 80A38860 00042403 */ sra $a0, $a0, 16 +/* 03548 80A38858 00692023 */ subu $a0, $v1, $t1 +/* 0354C 80A3885C 00042400 */ sll $a0, $a0, 16 +/* 03550 80A38860 00042403 */ sra $a0, $a0, 16 /* 03554 80A38864 0C01DE1C */ jal Math_Sins ## sins? -/* 03558 80A38868 A7A30036 */ sh $v1, 0x0036($sp) +/* 03558 80A38868 A7A30036 */ sh $v1, 0x0036($sp) /* 0355C 80A3886C 44804000 */ mtc1 $zero, $f8 ## $f8 = 0.00 -/* 03560 80A38870 87A30036 */ lh $v1, 0x0036($sp) +/* 03560 80A38870 87A30036 */ lh $v1, 0x0036($sp) /* 03564 80A38874 3C01C0C0 */ lui $at, 0xC0C0 ## $at = C0C00000 -/* 03568 80A38878 4600403C */ c.lt.s $f8, $f0 +/* 03568 80A38878 4600403C */ c.lt.s $f8, $f0 /* 0356C 80A3887C 00000000 */ nop -/* 03570 80A38880 45020005 */ bc1fl .L80A38898 +/* 03570 80A38880 45020005 */ bc1fl .L80A38898 /* 03574 80A38884 860A00B6 */ lh $t2, 0x00B6($s0) ## 000000B6 /* 03578 80A38888 44815000 */ mtc1 $at, $f10 ## $f10 = -6.00 -/* 0357C 80A3888C 10000014 */ beq $zero, $zero, .L80A388E0 +/* 0357C 80A3888C 10000014 */ beq $zero, $zero, .L80A388E0 /* 03580 80A38890 E60A0068 */ swc1 $f10, 0x0068($s0) ## 00000068 /* 03584 80A38894 860A00B6 */ lh $t2, 0x00B6($s0) ## 000000B6 .L80A38898: -/* 03588 80A38898 006A2023 */ subu $a0, $v1, $t2 -/* 0358C 80A3889C 00042400 */ sll $a0, $a0, 16 +/* 03588 80A38898 006A2023 */ subu $a0, $v1, $t2 +/* 0358C 80A3889C 00042400 */ sll $a0, $a0, 16 /* 03590 80A388A0 0C01DE1C */ jal Math_Sins ## sins? -/* 03594 80A388A4 00042403 */ sra $a0, $a0, 16 +/* 03594 80A388A4 00042403 */ sra $a0, $a0, 16 /* 03598 80A388A8 44808000 */ mtc1 $zero, $f16 ## $f16 = 0.00 /* 0359C 80A388AC 3C014140 */ lui $at, 0x4140 ## $at = 41400000 -/* 035A0 80A388B0 4610003C */ c.lt.s $f0, $f16 +/* 035A0 80A388B0 4610003C */ c.lt.s $f0, $f16 /* 035A4 80A388B4 00000000 */ nop -/* 035A8 80A388B8 45020006 */ bc1fl .L80A388D4 +/* 035A8 80A388B8 45020006 */ bc1fl .L80A388D4 /* 035AC 80A388BC 44816000 */ mtc1 $at, $f12 ## $f12 = 12.00 /* 035B0 80A388C0 3C0140C0 */ lui $at, 0x40C0 ## $at = 40C00000 /* 035B4 80A388C4 44819000 */ mtc1 $at, $f18 ## $f18 = 6.00 -/* 035B8 80A388C8 10000005 */ beq $zero, $zero, .L80A388E0 +/* 035B8 80A388C8 10000005 */ beq $zero, $zero, .L80A388E0 /* 035BC 80A388CC E6120068 */ swc1 $f18, 0x0068($s0) ## 00000068 /* 035C0 80A388D0 44816000 */ mtc1 $at, $f12 ## $f12 = 6.00 .L80A388D4: /* 035C4 80A388D4 0C00CFC8 */ jal Math_Rand_CenteredFloat - + /* 035C8 80A388D8 00000000 */ nop /* 035CC 80A388DC E6000068 */ swc1 $f0, 0x0068($s0) ## 00000068 .L80A388E0: /* 035D0 80A388E0 C6040068 */ lwc1 $f4, 0x0068($s0) ## 00000068 /* 035D4 80A388E4 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 /* 035D8 80A388E8 44814000 */ mtc1 $at, $f8 ## $f8 = 0.50 -/* 035DC 80A388EC 46002187 */ neg.s $f6, $f4 +/* 035DC 80A388EC 46002187 */ neg.s $f6, $f4 /* 035E0 80A388F0 860B00B6 */ lh $t3, 0x00B6($s0) ## 000000B6 -/* 035E4 80A388F4 46083282 */ mul.s $f10, $f6, $f8 +/* 035E4 80A388F4 46083282 */ mul.s $f10, $f6, $f8 /* 035E8 80A388F8 44808000 */ mtc1 $zero, $f16 ## $f16 = 0.00 /* 035EC 80A388FC 256C3FFF */ addiu $t4, $t3, 0x3FFF ## $t4 = 00003FFF /* 035F0 80A38900 A60C0032 */ sh $t4, 0x0032($s0) ## 00000032 @@ -93,21 +93,21 @@ glabel func_80A387D0 /* 03604 80A38914 44819000 */ mtc1 $at, $f18 ## $f18 = 10.00 /* 03608 80A38918 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 /* 0360C 80A3891C 44813000 */ mtc1 $at, $f6 ## $f6 = 5.00 -/* 03610 80A38920 46120102 */ mul.s $f4, $f0, $f18 +/* 03610 80A38920 46120102 */ mul.s $f4, $f0, $f18 /* 03614 80A38924 240F000D */ addiu $t7, $zero, 0x000D ## $t7 = 0000000D /* 03618 80A38928 3C0580A4 */ lui $a1, %hi(func_80A38960) ## $a1 = 80A40000 /* 0361C 80A3892C AE0F02EC */ sw $t7, 0x02EC($s0) ## 000002EC /* 03620 80A38930 24A58960 */ addiu $a1, $a1, %lo(func_80A38960) ## $a1 = 80A38960 /* 03624 80A38934 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 03628 80A38938 46062200 */ add.s $f8, $f4, $f6 -/* 0362C 80A3893C 4600428D */ trunc.w.s $f10, $f8 -/* 03630 80A38940 440E5000 */ mfc1 $t6, $f10 -/* 03634 80A38944 0C28D4C4 */ jal func_80A35310 +/* 03628 80A38938 46062200 */ add.s $f8, $f4, $f6 +/* 0362C 80A3893C 4600428D */ trunc.w.s $f10, $f8 +/* 03630 80A38940 440E5000 */ mfc1 $t6, $f10 +/* 03634 80A38944 0C28D4C4 */ jal func_80A35310 /* 03638 80A38948 AE0E0300 */ sw $t6, 0x0300($s0) ## 00000300 -/* 0363C 80A3894C 8FBF002C */ lw $ra, 0x002C($sp) -/* 03640 80A38950 8FB00028 */ lw $s0, 0x0028($sp) +/* 0363C 80A3894C 8FBF002C */ lw $ra, 0x002C($sp) +/* 03640 80A38950 8FB00028 */ lw $s0, 0x0028($sp) /* 03644 80A38954 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 -/* 03648 80A38958 03E00008 */ jr $ra +/* 03648 80A38958 03E00008 */ jr $ra /* 0364C 80A3895C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_GeldB/func_80A3907C.s b/asm/non_matchings/overlays/actors/ovl_En_GeldB/func_80A3907C.s index 5ed7312298..2d70fb23f7 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_GeldB/func_80A3907C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_GeldB/func_80A3907C.s @@ -1,14 +1,14 @@ glabel func_80A3907C /* 03D6C 80A3907C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 03D70 80A39080 AFBF0014 */ sw $ra, 0x0014($sp) +/* 03D70 80A39080 AFBF0014 */ sw $ra, 0x0014($sp) /* 03D74 80A39084 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 /* 03D78 80A39088 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 03D7C 80A3908C 24A51E10 */ addiu $a1, $a1, 0x1E10 ## $a1 = 06001E10 -/* 03D80 80A39090 AFA70018 */ sw $a3, 0x0018($sp) +/* 03D80 80A39090 AFA70018 */ sw $a3, 0x0018($sp) /* 03D84 80A39094 24840188 */ addiu $a0, $a0, 0x0188 ## $a0 = 00000188 -/* 03D88 80A39098 0C029490 */ jal func_800A5240 +/* 03D88 80A39098 0C029490 */ jal SkelAnime_ChangeAnimTransitionStop /* 03D8C 80A3909C 3C06C080 */ lui $a2, 0xC080 ## $a2 = C0800000 -/* 03D90 80A390A0 8FA70018 */ lw $a3, 0x0018($sp) +/* 03D90 80A390A0 8FA70018 */ lw $a3, 0x0018($sp) /* 03D94 80A390A4 24190001 */ addiu $t9, $zero, 0x0001 ## $t9 = 00000001 /* 03D98 80A390A8 2405399A */ addiu $a1, $zero, 0x399A ## $a1 = 0000399A /* 03D9C 80A390AC 94EE0088 */ lhu $t6, 0x0088($a3) ## 00000088 @@ -16,12 +16,12 @@ glabel func_80A3907C /* 03DA4 80A390B4 00E02025 */ or $a0, $a3, $zero ## $a0 = 00000000 /* 03DA8 80A390B8 31CF0001 */ andi $t7, $t6, 0x0001 ## $t7 = 00000000 /* 03DAC 80A390BC A4E200B6 */ sh $v0, 0x00B6($a3) ## 000000B6 -/* 03DB0 80A390C0 11E00006 */ beq $t7, $zero, .L80A390DC +/* 03DB0 80A390C0 11E00006 */ beq $t7, $zero, .L80A390DC /* 03DB4 80A390C4 A4E20032 */ sh $v0, 0x0032($a3) ## 00000032 /* 03DB8 80A390C8 3C01C0C0 */ lui $at, 0xC0C0 ## $at = C0C00000 /* 03DBC 80A390CC 44812000 */ mtc1 $at, $f4 ## $f4 = -6.00 /* 03DC0 80A390D0 A4E00318 */ sh $zero, 0x0318($a3) ## 00000318 -/* 03DC4 80A390D4 10000003 */ beq $zero, $zero, .L80A390E4 +/* 03DC4 80A390D4 10000003 */ beq $zero, $zero, .L80A390E4 /* 03DC8 80A390D8 E4E40068 */ swc1 $f4, 0x0068($a3) ## 00000068 .L80A390DC: /* 03DCC 80A390DC 24180001 */ addiu $t8, $zero, 0x0001 ## $t8 = 00000001 @@ -30,18 +30,18 @@ glabel func_80A3907C /* 03DD4 80A390E4 8CE80004 */ lw $t0, 0x0004($a3) ## 00000004 /* 03DD8 80A390E8 2401FFFE */ addiu $at, $zero, 0xFFFE ## $at = FFFFFFFE /* 03DDC 80A390EC ACF902EC */ sw $t9, 0x02EC($a3) ## 000002EC -/* 03DE0 80A390F0 01014824 */ and $t1, $t0, $at +/* 03DE0 80A390F0 01014824 */ and $t1, $t0, $at /* 03DE4 80A390F4 ACE90004 */ sw $t1, 0x0004($a3) ## 00000004 /* 03DE8 80A390F8 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 03DEC 80A390FC AFA70018 */ sw $a3, 0x0018($sp) + +/* 03DEC 80A390FC AFA70018 */ sw $a3, 0x0018($sp) /* 03DF0 80A39100 3C0580A4 */ lui $a1, %hi(func_80A39120) ## $a1 = 80A40000 -/* 03DF4 80A39104 8FA40018 */ lw $a0, 0x0018($sp) -/* 03DF8 80A39108 0C28D4C4 */ jal func_80A35310 +/* 03DF4 80A39104 8FA40018 */ lw $a0, 0x0018($sp) +/* 03DF8 80A39108 0C28D4C4 */ jal func_80A35310 /* 03DFC 80A3910C 24A59120 */ addiu $a1, $a1, %lo(func_80A39120) ## $a1 = 80A39120 -/* 03E00 80A39110 8FBF0014 */ lw $ra, 0x0014($sp) +/* 03E00 80A39110 8FBF0014 */ lw $ra, 0x0014($sp) /* 03E04 80A39114 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 03E08 80A39118 03E00008 */ jr $ra +/* 03E08 80A39118 03E00008 */ jr $ra /* 03E0C 80A3911C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_GeldB/func_80A39688.s b/asm/non_matchings/overlays/actors/ovl_En_GeldB/func_80A39688.s index b2166457d3..4af14feccc 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_GeldB/func_80A39688.s +++ b/asm/non_matchings/overlays/actors/ovl_En_GeldB/func_80A39688.s @@ -10,7 +10,7 @@ glabel func_80A39688 /* 04398 80A396A8 24C6A1E0 */ addiu $a2, $a2, %lo(D_80A3A1E0) ## $a2 = 80A3A1E0 /* 0439C 80A396AC 27A40038 */ addiu $a0, $sp, 0x0038 ## $a0 = FFFFFFE8 /* 043A0 80A396B0 240709CB */ addiu $a3, $zero, 0x09CB ## $a3 = 000009CB -/* 043A4 80A396B4 0C031AB1 */ jal func_800C6AC4 +/* 043A4 80A396B4 0C031AB1 */ jal Graph_OpenDisps /* 043A8 80A396B8 AFA50048 */ sw $a1, 0x0048($sp) /* 043AC 80A396BC 8FA20054 */ lw $v0, 0x0054($sp) /* 043B0 80A396C0 24010003 */ addiu $at, $zero, 0x0003 ## $at = 00000003 @@ -100,7 +100,7 @@ glabel func_80A39688 /* 044EC 80A397FC 3C0680A4 */ lui $a2, %hi(D_80A3A1F0) ## $a2 = 80A40000 /* 044F0 80A39800 24C6A1F0 */ addiu $a2, $a2, %lo(D_80A3A1F0) ## $a2 = 80A3A1F0 /* 044F4 80A39804 240709E1 */ addiu $a3, $zero, 0x09E1 ## $a3 = 000009E1 -/* 044F8 80A39808 0C031AD5 */ jal func_800C6B54 +/* 044F8 80A39808 0C031AD5 */ jal Graph_CloseDisps /* 044FC 80A3980C 8DE50000 */ lw $a1, 0x0000($t7) ## 8CAAE6FF /* 04500 80A39810 8FBF0014 */ lw $ra, 0x0014($sp) /* 04504 80A39814 27BD0050 */ addiu $sp, $sp, 0x0050 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_GirlA/EnGirlA_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_GirlA/EnGirlA_Destroy.s index 7be21923a1..d9a621439c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_GirlA/EnGirlA_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_En_GirlA/EnGirlA_Destroy.s @@ -1,15 +1,15 @@ glabel EnGirlA_Destroy /* 0032C 80A3AA7C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00330 80A3AA80 AFBF0014 */ sw $ra, 0x0014($sp) +/* 00330 80A3AA80 AFBF0014 */ sw $ra, 0x0014($sp) /* 00334 80A3AA84 8C8E019C */ lw $t6, 0x019C($a0) ## 0000019C -/* 00338 80A3AA88 51C00004 */ beql $t6, $zero, .L80A3AA9C -/* 0033C 80A3AA8C 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00340 80A3AA90 0C0295BC */ jal func_800A56F0 +/* 00338 80A3AA88 51C00004 */ beql $t6, $zero, .L80A3AA9C +/* 0033C 80A3AA8C 8FBF0014 */ lw $ra, 0x0014($sp) +/* 00340 80A3AA90 0C0295BC */ jal SkelAnime_Free /* 00344 80A3AA94 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 00348 80A3AA98 8FBF0014 */ lw $ra, 0x0014($sp) +/* 00348 80A3AA98 8FBF0014 */ lw $ra, 0x0014($sp) .L80A3AA9C: /* 0034C 80A3AA9C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00350 80A3AAA0 03E00008 */ jr $ra +/* 00350 80A3AAA0 03E00008 */ jr $ra /* 00354 80A3AAA4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Gm/func_80A3D838.s b/asm/non_matchings/overlays/actors/ovl_En_Gm/func_80A3D838.s index d39ee9688f..a2a80c34ea 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Gm/func_80A3D838.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Gm/func_80A3D838.s @@ -1,88 +1,88 @@ glabel func_80A3D838 /* 00158 80A3D838 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 0015C 80A3D83C AFB00024 */ sw $s0, 0x0024($sp) +/* 0015C 80A3D83C AFB00024 */ sw $s0, 0x0024($sp) /* 00160 80A3D840 3C010001 */ lui $at, 0x0001 ## $at = 00010000 /* 00164 80A3D844 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00168 80A3D848 AFB10028 */ sw $s1, 0x0028($sp) +/* 00168 80A3D848 AFB10028 */ sw $s1, 0x0028($sp) /* 0016C 80A3D84C 342117A4 */ ori $at, $at, 0x17A4 ## $at = 000117A4 /* 00170 80A3D850 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 -/* 00174 80A3D854 AFBF002C */ sw $ra, 0x002C($sp) -/* 00178 80A3D858 00A12021 */ addu $a0, $a1, $at +/* 00174 80A3D854 AFBF002C */ sw $ra, 0x002C($sp) +/* 00178 80A3D858 00A12021 */ addu $a0, $a1, $at /* 0017C 80A3D85C 0C026062 */ jal Object_IsLoaded - + /* 00180 80A3D860 820502BC */ lb $a1, 0x02BC($s0) ## 000002BC -/* 00184 80A3D864 10400057 */ beq $v0, $zero, .L80A3D9C4 +/* 00184 80A3D864 10400057 */ beq $v0, $zero, .L80A3D9C4 /* 00188 80A3D868 2401FFEF */ addiu $at, $zero, 0xFFEF ## $at = FFFFFFEF /* 0018C 80A3D86C 8E0E0004 */ lw $t6, 0x0004($s0) ## 00000004 /* 00190 80A3D870 2605014C */ addiu $a1, $s0, 0x014C ## $a1 = 0000014C /* 00194 80A3D874 3C060601 */ lui $a2, 0x0601 ## $a2 = 06010000 -/* 00198 80A3D878 01C17824 */ and $t7, $t6, $at +/* 00198 80A3D878 01C17824 */ and $t7, $t6, $at /* 0019C 80A3D87C AE0F0004 */ sw $t7, 0x0004($s0) ## 00000004 /* 001A0 80A3D880 26180190 */ addiu $t8, $s0, 0x0190 ## $t8 = 00000190 /* 001A4 80A3D884 261901FC */ addiu $t9, $s0, 0x01FC ## $t9 = 000001FC /* 001A8 80A3D888 24080012 */ addiu $t0, $zero, 0x0012 ## $t0 = 00000012 -/* 001AC 80A3D88C AFA80018 */ sw $t0, 0x0018($sp) -/* 001B0 80A3D890 AFB90014 */ sw $t9, 0x0014($sp) -/* 001B4 80A3D894 AFB80010 */ sw $t8, 0x0010($sp) -/* 001B8 80A3D898 AFA50030 */ sw $a1, 0x0030($sp) +/* 001AC 80A3D88C AFA80018 */ sw $t0, 0x0018($sp) +/* 001B0 80A3D890 AFB90014 */ sw $t9, 0x0014($sp) +/* 001B4 80A3D894 AFB80010 */ sw $t8, 0x0010($sp) +/* 001B8 80A3D898 AFA50030 */ sw $a1, 0x0030($sp) /* 001BC 80A3D89C 24C6FEF0 */ addiu $a2, $a2, 0xFEF0 ## $a2 = 0600FEF0 /* 001C0 80A3D8A0 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 001C4 80A3D8A4 0C0291BE */ jal func_800A46F8 +/* 001C4 80A3D8A4 0C0291BE */ jal SkelAnime_InitSV /* 001C8 80A3D8A8 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 /* 001CC 80A3D8AC 820902BC */ lb $t1, 0x02BC($s0) ## 000002BC /* 001D0 80A3D8B0 3C0C0001 */ lui $t4, 0x0001 ## $t4 = 00010000 /* 001D4 80A3D8B4 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 001D8 80A3D8B8 00095100 */ sll $t2, $t1, 4 -/* 001DC 80A3D8BC 01495021 */ addu $t2, $t2, $t1 -/* 001E0 80A3D8C0 000A5080 */ sll $t2, $t2, 2 -/* 001E4 80A3D8C4 022A5821 */ addu $t3, $s1, $t2 -/* 001E8 80A3D8C8 018B6021 */ addu $t4, $t4, $t3 +/* 001D8 80A3D8B8 00095100 */ sll $t2, $t1, 4 +/* 001DC 80A3D8BC 01495021 */ addu $t2, $t2, $t1 +/* 001E0 80A3D8C0 000A5080 */ sll $t2, $t2, 2 +/* 001E4 80A3D8C4 022A5821 */ addu $t3, $s1, $t2 +/* 001E8 80A3D8C8 018B6021 */ addu $t4, $t4, $t3 /* 001EC 80A3D8CC 8D8C17B4 */ lw $t4, 0x17B4($t4) ## 000117B4 /* 001F0 80A3D8D0 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 /* 001F4 80A3D8D4 248402B8 */ addiu $a0, $a0, 0x02B8 ## $a0 = 060002B8 -/* 001F8 80A3D8D8 01816821 */ addu $t5, $t4, $at +/* 001F8 80A3D8D8 01816821 */ addu $t5, $t4, $at /* 001FC 80A3D8DC 3C018016 */ lui $at, 0x8016 ## $at = 80160000 /* 00200 80A3D8E0 0C028800 */ jal SkelAnime_GetFrameCount - + /* 00204 80A3D8E4 AC2D6FC0 */ sw $t5, 0x6FC0($at) ## 80166FC0 /* 00208 80A3D8E8 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 0020C 80A3D8EC 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 /* 00210 80A3D8F0 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 00214 80A3D8F4 468021A0 */ cvt.s.w $f6, $f4 -/* 00218 80A3D8F8 44070000 */ mfc1 $a3, $f0 +/* 00214 80A3D8F4 468021A0 */ cvt.s.w $f6, $f4 +/* 00218 80A3D8F8 44070000 */ mfc1 $a3, $f0 /* 0021C 80A3D8FC 24A502B8 */ addiu $a1, $a1, 0x02B8 ## $a1 = 060002B8 -/* 00220 80A3D900 8FA40030 */ lw $a0, 0x0030($sp) +/* 00220 80A3D900 8FA40030 */ lw $a0, 0x0030($sp) /* 00224 80A3D904 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 00228 80A3D908 AFA00014 */ sw $zero, 0x0014($sp) -/* 0022C 80A3D90C E7A60010 */ swc1 $f6, 0x0010($sp) -/* 00230 80A3D910 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 00234 80A3D914 E7A00018 */ swc1 $f0, 0x0018($sp) +/* 00228 80A3D908 AFA00014 */ sw $zero, 0x0014($sp) +/* 0022C 80A3D90C E7A60010 */ swc1 $f6, 0x0010($sp) +/* 00230 80A3D910 0C029468 */ jal SkelAnime_ChangeAnim + +/* 00234 80A3D914 E7A00018 */ swc1 $f0, 0x0018($sp) /* 00238 80A3D918 3C0E80A4 */ lui $t6, %hi(func_80A3E1EC) ## $t6 = 80A40000 /* 0023C 80A3D91C 25CEE1EC */ addiu $t6, $t6, %lo(func_80A3E1EC) ## $t6 = 80A3E1EC /* 00240 80A3D920 AE0E0134 */ sw $t6, 0x0134($s0) ## 00000134 /* 00244 80A3D924 26050270 */ addiu $a1, $s0, 0x0270 ## $a1 = 00000270 -/* 00248 80A3D928 AFA50030 */ sw $a1, 0x0030($sp) +/* 00248 80A3D928 AFA50030 */ sw $a1, 0x0030($sp) /* 0024C 80A3D92C 0C0170D9 */ jal ActorCollider_AllocCylinder - + /* 00250 80A3D930 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 00254 80A3D934 3C0780A4 */ lui $a3, %hi(D_80A3E350) ## $a3 = 80A40000 -/* 00258 80A3D938 8FA50030 */ lw $a1, 0x0030($sp) +/* 00258 80A3D938 8FA50030 */ lw $a1, 0x0030($sp) /* 0025C 80A3D93C 24E7E350 */ addiu $a3, $a3, %lo(D_80A3E350) ## $a3 = 80A3E350 /* 00260 80A3D940 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 00264 80A3D944 0C017114 */ jal func_8005C450 +/* 00264 80A3D944 0C017114 */ jal func_8005C450 /* 00268 80A3D948 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 0026C 80A3D94C 3C068003 */ lui $a2, 0x8003 ## $a2 = 80030000 /* 00270 80A3D950 24C6B5EC */ addiu $a2, $a2, 0xB5EC ## $a2 = 8002B5EC /* 00274 80A3D954 260400B4 */ addiu $a0, $s0, 0x00B4 ## $a0 = 000000B4 /* 00278 80A3D958 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 /* 0027C 80A3D95C 0C00AC78 */ jal ActorShape_Init - + /* 00280 80A3D960 3C07420C */ lui $a3, 0x420C ## $a3 = 420C0000 /* 00284 80A3D964 3C053D4C */ lui $a1, 0x3D4C ## $a1 = 3D4C0000 /* 00288 80A3D968 34A5CCCD */ ori $a1, $a1, 0xCCCD ## $a1 = 3D4CCCCD /* 0028C 80A3D96C 0C00B58B */ jal Actor_SetScale - + /* 00290 80A3D970 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 00294 80A3D974 3C01BF80 */ lui $at, 0xBF80 ## $at = BF800000 /* 00298 80A3D978 44804000 */ mtc1 $zero, $f8 ## $f8 = 0.00 @@ -105,10 +105,10 @@ glabel func_80A3D838 /* 002DC 80A3D9BC E60A006C */ swc1 $f10, 0x006C($s0) ## 0000006C /* 002E0 80A3D9C0 E6100060 */ swc1 $f16, 0x0060($s0) ## 00000060 .L80A3D9C4: -/* 002E4 80A3D9C4 8FBF002C */ lw $ra, 0x002C($sp) -/* 002E8 80A3D9C8 8FB00024 */ lw $s0, 0x0024($sp) -/* 002EC 80A3D9CC 8FB10028 */ lw $s1, 0x0028($sp) -/* 002F0 80A3D9D0 03E00008 */ jr $ra +/* 002E4 80A3D9C4 8FBF002C */ lw $ra, 0x002C($sp) +/* 002E8 80A3D9C8 8FB00024 */ lw $s0, 0x0024($sp) +/* 002EC 80A3D9CC 8FB10028 */ lw $s1, 0x0028($sp) +/* 002F0 80A3D9D0 03E00008 */ jr $ra /* 002F4 80A3D9D4 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Gm/func_80A3E090.s b/asm/non_matchings/overlays/actors/ovl_En_Gm/func_80A3E090.s index b04df2ce6d..c251734a2f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Gm/func_80A3E090.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Gm/func_80A3E090.s @@ -1,90 +1,90 @@ glabel func_80A3E090 /* 009B0 80A3E090 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 -/* 009B4 80A3E094 AFBF0024 */ sw $ra, 0x0024($sp) -/* 009B8 80A3E098 AFB00020 */ sw $s0, 0x0020($sp) +/* 009B4 80A3E094 AFBF0024 */ sw $ra, 0x0024($sp) +/* 009B8 80A3E098 AFB00020 */ sw $s0, 0x0020($sp) /* 009BC 80A3E09C 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 009C0 80A3E0A0 0C034213 */ jal Matrix_Push -/* 009C4 80A3E0A4 F7B40018 */ sdc1 $f20, 0x0018($sp) +/* 009C0 80A3E0A0 0C034213 */ jal Matrix_Push +/* 009C4 80A3E0A4 F7B40018 */ sdc1 $f20, 0x0018($sp) /* 009C8 80A3E0A8 4480A000 */ mtc1 $zero, $f20 ## $f20 = 0.00 /* 009CC 80A3E0AC 3C064522 */ lui $a2, 0x4522 ## $a2 = 45220000 /* 009D0 80A3E0B0 34C68000 */ ori $a2, $a2, 0x8000 ## $a2 = 45228000 /* 009D4 80A3E0B4 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 009D8 80A3E0B8 4600A306 */ mov.s $f12, $f20 -/* 009DC 80A3E0BC 0C034261 */ jal Matrix_Translate -/* 009E0 80A3E0C0 4600A386 */ mov.s $f14, $f20 +/* 009D8 80A3E0B8 4600A306 */ mov.s $f12, $f20 +/* 009DC 80A3E0BC 0C034261 */ jal Matrix_Translate +/* 009E0 80A3E0C0 4600A386 */ mov.s $f14, $f20 /* 009E4 80A3E0C4 86040030 */ lh $a0, 0x0030($s0) ## 00000030 /* 009E8 80A3E0C8 86050032 */ lh $a1, 0x0032($s0) ## 00000032 /* 009EC 80A3E0CC 86060034 */ lh $a2, 0x0034($s0) ## 00000034 -/* 009F0 80A3E0D0 0C034421 */ jal Matrix_RotateXYZ +/* 009F0 80A3E0D0 0C034421 */ jal Matrix_RotateZYX /* 009F4 80A3E0D4 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 009F8 80A3E0D8 E7B4003C */ swc1 $f20, 0x003C($sp) -/* 009FC 80A3E0DC E7B40038 */ swc1 $f20, 0x0038($sp) -/* 00A00 80A3E0E0 E7B40034 */ swc1 $f20, 0x0034($sp) +/* 009F8 80A3E0D8 E7B4003C */ swc1 $f20, 0x003C($sp) +/* 009FC 80A3E0DC E7B40038 */ swc1 $f20, 0x0038($sp) +/* 00A00 80A3E0E0 E7B40034 */ swc1 $f20, 0x0034($sp) /* 00A04 80A3E0E4 27A40034 */ addiu $a0, $sp, 0x0034 ## $a0 = FFFFFFF4 -/* 00A08 80A3E0E8 0C0346BD */ jal Matrix_MultVec3f +/* 00A08 80A3E0E8 0C0346BD */ jal Matrix_MultVec3f /* 00A0C 80A3E0EC 27A50028 */ addiu $a1, $sp, 0x0028 ## $a1 = FFFFFFE8 -/* 00A10 80A3E0F0 C7A40028 */ lwc1 $f4, 0x0028($sp) -/* 00A14 80A3E0F4 4600218D */ trunc.w.s $f6, $f4 -/* 00A18 80A3E0F8 440F3000 */ mfc1 $t7, $f6 +/* 00A10 80A3E0F0 C7A40028 */ lwc1 $f4, 0x0028($sp) +/* 00A14 80A3E0F4 4600218D */ trunc.w.s $f6, $f4 +/* 00A18 80A3E0F8 440F3000 */ mfc1 $t7, $f6 /* 00A1C 80A3E0FC 00000000 */ nop /* 00A20 80A3E100 A60F02B6 */ sh $t7, 0x02B6($s0) ## 000002B6 -/* 00A24 80A3E104 C7A8002C */ lwc1 $f8, 0x002C($sp) -/* 00A28 80A3E108 4600428D */ trunc.w.s $f10, $f8 -/* 00A2C 80A3E10C 44195000 */ mfc1 $t9, $f10 +/* 00A24 80A3E104 C7A8002C */ lwc1 $f8, 0x002C($sp) +/* 00A28 80A3E108 4600428D */ trunc.w.s $f10, $f8 +/* 00A2C 80A3E10C 44195000 */ mfc1 $t9, $f10 /* 00A30 80A3E110 00000000 */ nop /* 00A34 80A3E114 A61902B8 */ sh $t9, 0x02B8($s0) ## 000002B8 -/* 00A38 80A3E118 C7B00030 */ lwc1 $f16, 0x0030($sp) -/* 00A3C 80A3E11C 4600848D */ trunc.w.s $f18, $f16 -/* 00A40 80A3E120 44099000 */ mfc1 $t1, $f18 -/* 00A44 80A3E124 0C034221 */ jal Matrix_Pull +/* 00A38 80A3E118 C7B00030 */ lwc1 $f16, 0x0030($sp) +/* 00A3C 80A3E11C 4600848D */ trunc.w.s $f18, $f16 +/* 00A40 80A3E120 44099000 */ mfc1 $t1, $f18 +/* 00A44 80A3E124 0C034221 */ jal Matrix_Pull /* 00A48 80A3E128 A60902BA */ sh $t1, 0x02BA($s0) ## 000002BA -/* 00A4C 80A3E12C 0C034213 */ jal Matrix_Push +/* 00A4C 80A3E12C 0C034213 */ jal Matrix_Push /* 00A50 80A3E130 00000000 */ nop /* 00A54 80A3E134 3C064586 */ lui $a2, 0x4586 ## $a2 = 45860000 /* 00A58 80A3E138 34C66000 */ ori $a2, $a2, 0x6000 ## $a2 = 45866000 -/* 00A5C 80A3E13C 4600A306 */ mov.s $f12, $f20 -/* 00A60 80A3E140 4600A386 */ mov.s $f14, $f20 -/* 00A64 80A3E144 0C034261 */ jal Matrix_Translate +/* 00A5C 80A3E13C 4600A306 */ mov.s $f12, $f20 +/* 00A60 80A3E140 4600A386 */ mov.s $f14, $f20 +/* 00A64 80A3E144 0C034261 */ jal Matrix_Translate /* 00A68 80A3E148 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 /* 00A6C 80A3E14C 86040030 */ lh $a0, 0x0030($s0) ## 00000030 /* 00A70 80A3E150 86050032 */ lh $a1, 0x0032($s0) ## 00000032 /* 00A74 80A3E154 86060034 */ lh $a2, 0x0034($s0) ## 00000034 -/* 00A78 80A3E158 0C034421 */ jal Matrix_RotateXYZ +/* 00A78 80A3E158 0C034421 */ jal Matrix_RotateZYX /* 00A7C 80A3E15C 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 00A80 80A3E160 E7B4003C */ swc1 $f20, 0x003C($sp) -/* 00A84 80A3E164 E7B40038 */ swc1 $f20, 0x0038($sp) -/* 00A88 80A3E168 E7B40034 */ swc1 $f20, 0x0034($sp) +/* 00A80 80A3E160 E7B4003C */ swc1 $f20, 0x003C($sp) +/* 00A84 80A3E164 E7B40038 */ swc1 $f20, 0x0038($sp) +/* 00A88 80A3E168 E7B40034 */ swc1 $f20, 0x0034($sp) /* 00A8C 80A3E16C 27A40034 */ addiu $a0, $sp, 0x0034 ## $a0 = FFFFFFF4 -/* 00A90 80A3E170 0C0346BD */ jal Matrix_MultVec3f +/* 00A90 80A3E170 0C0346BD */ jal Matrix_MultVec3f /* 00A94 80A3E174 260502C4 */ addiu $a1, $s0, 0x02C4 ## $a1 = 000002C4 -/* 00A98 80A3E178 0C034221 */ jal Matrix_Pull +/* 00A98 80A3E178 0C034221 */ jal Matrix_Pull /* 00A9C 80A3E17C 00000000 */ nop /* 00AA0 80A3E180 3C06456D */ lui $a2, 0x456D ## $a2 = 456D0000 /* 00AA4 80A3E184 34C68000 */ ori $a2, $a2, 0x8000 ## $a2 = 456D8000 -/* 00AA8 80A3E188 4600A306 */ mov.s $f12, $f20 -/* 00AAC 80A3E18C 4600A386 */ mov.s $f14, $f20 -/* 00AB0 80A3E190 0C034261 */ jal Matrix_Translate +/* 00AA8 80A3E188 4600A306 */ mov.s $f12, $f20 +/* 00AAC 80A3E18C 4600A386 */ mov.s $f14, $f20 +/* 00AB0 80A3E190 0C034261 */ jal Matrix_Translate /* 00AB4 80A3E194 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 /* 00AB8 80A3E198 86040030 */ lh $a0, 0x0030($s0) ## 00000030 /* 00ABC 80A3E19C 86050032 */ lh $a1, 0x0032($s0) ## 00000032 /* 00AC0 80A3E1A0 86060034 */ lh $a2, 0x0034($s0) ## 00000034 -/* 00AC4 80A3E1A4 0C034421 */ jal Matrix_RotateXYZ +/* 00AC4 80A3E1A4 0C034421 */ jal Matrix_RotateZYX /* 00AC8 80A3E1A8 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 00ACC 80A3E1AC E7B4003C */ swc1 $f20, 0x003C($sp) -/* 00AD0 80A3E1B0 E7B40038 */ swc1 $f20, 0x0038($sp) -/* 00AD4 80A3E1B4 E7B40034 */ swc1 $f20, 0x0034($sp) +/* 00ACC 80A3E1AC E7B4003C */ swc1 $f20, 0x003C($sp) +/* 00AD0 80A3E1B0 E7B40038 */ swc1 $f20, 0x0038($sp) +/* 00AD4 80A3E1B4 E7B40034 */ swc1 $f20, 0x0034($sp) /* 00AD8 80A3E1B8 27A40034 */ addiu $a0, $sp, 0x0034 ## $a0 = FFFFFFF4 -/* 00ADC 80A3E1BC 0C0346BD */ jal Matrix_MultVec3f +/* 00ADC 80A3E1BC 0C0346BD */ jal Matrix_MultVec3f /* 00AE0 80A3E1C0 26050038 */ addiu $a1, $s0, 0x0038 ## $a1 = 00000038 /* 00AE4 80A3E1C4 3C0142C8 */ lui $at, 0x42C8 ## $at = 42C80000 /* 00AE8 80A3E1C8 44813000 */ mtc1 $at, $f6 ## $f6 = 100.00 /* 00AEC 80A3E1CC C604003C */ lwc1 $f4, 0x003C($s0) ## 0000003C -/* 00AF0 80A3E1D0 46062200 */ add.s $f8, $f4, $f6 +/* 00AF0 80A3E1D0 46062200 */ add.s $f8, $f4, $f6 /* 00AF4 80A3E1D4 E608003C */ swc1 $f8, 0x003C($s0) ## 0000003C -/* 00AF8 80A3E1D8 8FBF0024 */ lw $ra, 0x0024($sp) -/* 00AFC 80A3E1DC 8FB00020 */ lw $s0, 0x0020($sp) -/* 00B00 80A3E1E0 D7B40018 */ ldc1 $f20, 0x0018($sp) -/* 00B04 80A3E1E4 03E00008 */ jr $ra +/* 00AF8 80A3E1D8 8FBF0024 */ lw $ra, 0x0024($sp) +/* 00AFC 80A3E1DC 8FB00020 */ lw $s0, 0x0020($sp) +/* 00B00 80A3E1E0 D7B40018 */ ldc1 $f20, 0x0018($sp) +/* 00B04 80A3E1E4 03E00008 */ jr $ra /* 00B08 80A3E1E8 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Gm/func_80A3E1EC.s b/asm/non_matchings/overlays/actors/ovl_En_Gm/func_80A3E1EC.s index 41781e7509..05ecb99b04 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Gm/func_80A3E1EC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Gm/func_80A3E1EC.s @@ -1,20 +1,20 @@ glabel func_80A3E1EC /* 00B0C 80A3E1EC 27BDFFA8 */ addiu $sp, $sp, 0xFFA8 ## $sp = FFFFFFA8 -/* 00B10 80A3E1F0 AFBF002C */ sw $ra, 0x002C($sp) -/* 00B14 80A3E1F4 AFB00028 */ sw $s0, 0x0028($sp) -/* 00B18 80A3E1F8 AFA5005C */ sw $a1, 0x005C($sp) +/* 00B10 80A3E1F0 AFBF002C */ sw $ra, 0x002C($sp) +/* 00B14 80A3E1F4 AFB00028 */ sw $s0, 0x0028($sp) +/* 00B18 80A3E1F8 AFA5005C */ sw $a1, 0x005C($sp) /* 00B1C 80A3E1FC 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 /* 00B20 80A3E200 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 00B24 80A3E204 3C0680A4 */ lui $a2, %hi(D_80A3E40C) ## $a2 = 80A40000 /* 00B28 80A3E208 24C6E40C */ addiu $a2, $a2, %lo(D_80A3E40C) ## $a2 = 80A3E40C /* 00B2C 80A3E20C 27A4003C */ addiu $a0, $sp, 0x003C ## $a0 = FFFFFFE4 /* 00B30 80A3E210 24070265 */ addiu $a3, $zero, 0x0265 ## $a3 = 00000265 -/* 00B34 80A3E214 0C031AB1 */ jal func_800C6AC4 -/* 00B38 80A3E218 AFA5004C */ sw $a1, 0x004C($sp) -/* 00B3C 80A3E21C 8FAF005C */ lw $t7, 0x005C($sp) -/* 00B40 80A3E220 0C024F46 */ jal func_80093D18 +/* 00B34 80A3E214 0C031AB1 */ jal Graph_OpenDisps +/* 00B38 80A3E218 AFA5004C */ sw $a1, 0x004C($sp) +/* 00B3C 80A3E21C 8FAF005C */ lw $t7, 0x005C($sp) +/* 00B40 80A3E220 0C024F46 */ jal func_80093D18 /* 00B44 80A3E224 8DE40000 */ lw $a0, 0x0000($t7) ## 00000000 -/* 00B48 80A3E228 8FA8004C */ lw $t0, 0x004C($sp) +/* 00B48 80A3E228 8FA8004C */ lw $t0, 0x004C($sp) /* 00B4C 80A3E22C 3C19DB06 */ lui $t9, 0xDB06 ## $t9 = DB060000 /* 00B50 80A3E230 37390020 */ ori $t9, $t9, 0x0020 ## $t9 = DB060020 /* 00B54 80A3E234 8D0302C0 */ lw $v1, 0x02C0($t0) ## 000002C0 @@ -26,58 +26,58 @@ glabel func_80A3E1EC /* 00B6C 80A3E24C 920902C2 */ lbu $t1, 0x02C2($s0) ## 000002C2 /* 00B70 80A3E250 24C66FA8 */ addiu $a2, $a2, 0x6FA8 ## $a2 = 80166FA8 /* 00B74 80A3E254 3C0500FF */ lui $a1, 0x00FF ## $a1 = 00FF0000 -/* 00B78 80A3E258 00095080 */ sll $t2, $t1, 2 -/* 00B7C 80A3E25C 008A2021 */ addu $a0, $a0, $t2 -/* 00B80 80A3E260 8C84E384 */ lw $a0, %lo(D_80A3E384)($a0) +/* 00B78 80A3E258 00095080 */ sll $t2, $t1, 2 +/* 00B7C 80A3E25C 008A2021 */ addu $a0, $a0, $t2 +/* 00B80 80A3E260 8C84E384 */ lw $a0, %lo(D_80A3E384)($a0) /* 00B84 80A3E264 34A5FFFF */ ori $a1, $a1, 0xFFFF ## $a1 = 00FFFFFF /* 00B88 80A3E268 3C078000 */ lui $a3, 0x8000 ## $a3 = 80000000 -/* 00B8C 80A3E26C 00046100 */ sll $t4, $a0, 4 -/* 00B90 80A3E270 000C6F02 */ srl $t5, $t4, 28 -/* 00B94 80A3E274 000D7080 */ sll $t6, $t5, 2 -/* 00B98 80A3E278 00CE7821 */ addu $t7, $a2, $t6 +/* 00B8C 80A3E26C 00046100 */ sll $t4, $a0, 4 +/* 00B90 80A3E270 000C6F02 */ srl $t5, $t4, 28 +/* 00B94 80A3E274 000D7080 */ sll $t6, $t5, 2 +/* 00B98 80A3E278 00CE7821 */ addu $t7, $a2, $t6 /* 00B9C 80A3E27C 8DF80000 */ lw $t8, 0x0000($t7) ## 00000000 -/* 00BA0 80A3E280 00855824 */ and $t3, $a0, $a1 +/* 00BA0 80A3E280 00855824 */ and $t3, $a0, $a1 /* 00BA4 80A3E284 3C040601 */ lui $a0, 0x0601 ## $a0 = 06010000 -/* 00BA8 80A3E288 0178C821 */ addu $t9, $t3, $t8 -/* 00BAC 80A3E28C 03274821 */ addu $t1, $t9, $a3 +/* 00BA8 80A3E288 0178C821 */ addu $t9, $t3, $t8 +/* 00BAC 80A3E28C 03274821 */ addu $t1, $t9, $a3 /* 00BB0 80A3E290 AC690004 */ sw $t1, 0x0004($v1) ## 00000004 /* 00BB4 80A3E294 8D0302C0 */ lw $v1, 0x02C0($t0) ## 000002C0 /* 00BB8 80A3E298 2484DE80 */ addiu $a0, $a0, 0xDE80 ## $a0 = 0600DE80 -/* 00BBC 80A3E29C 00046900 */ sll $t5, $a0, 4 -/* 00BC0 80A3E2A0 000D7702 */ srl $t6, $t5, 28 +/* 00BBC 80A3E29C 00046900 */ sll $t5, $a0, 4 +/* 00BC0 80A3E2A0 000D7702 */ srl $t6, $t5, 28 /* 00BC4 80A3E2A4 3C0CDB06 */ lui $t4, 0xDB06 ## $t4 = DB060000 /* 00BC8 80A3E2A8 246A0008 */ addiu $t2, $v1, 0x0008 ## $t2 = 00000008 /* 00BCC 80A3E2AC 358C0024 */ ori $t4, $t4, 0x0024 ## $t4 = DB060024 -/* 00BD0 80A3E2B0 000E7880 */ sll $t7, $t6, 2 +/* 00BD0 80A3E2B0 000E7880 */ sll $t7, $t6, 2 /* 00BD4 80A3E2B4 AD0A02C0 */ sw $t2, 0x02C0($t0) ## 000002C0 -/* 00BD8 80A3E2B8 00CF5821 */ addu $t3, $a2, $t7 +/* 00BD8 80A3E2B8 00CF5821 */ addu $t3, $a2, $t7 /* 00BDC 80A3E2BC AC6C0000 */ sw $t4, 0x0000($v1) ## 00000000 /* 00BE0 80A3E2C0 8D780000 */ lw $t8, 0x0000($t3) ## 00000000 -/* 00BE4 80A3E2C4 0085C824 */ and $t9, $a0, $a1 -/* 00BE8 80A3E2C8 03194821 */ addu $t1, $t8, $t9 -/* 00BEC 80A3E2CC 01275021 */ addu $t2, $t1, $a3 +/* 00BE4 80A3E2C4 0085C824 */ and $t9, $a0, $a1 +/* 00BE8 80A3E2C8 03194821 */ addu $t1, $t8, $t9 +/* 00BEC 80A3E2CC 01275021 */ addu $t2, $t1, $a3 /* 00BF0 80A3E2D0 AC6A0004 */ sw $t2, 0x0004($v1) ## 00000004 /* 00BF4 80A3E2D4 9207014E */ lbu $a3, 0x014E($s0) ## 0000014E /* 00BF8 80A3E2D8 8E06016C */ lw $a2, 0x016C($s0) ## 0000016C /* 00BFC 80A3E2DC 8E050150 */ lw $a1, 0x0150($s0) ## 00000150 -/* 00C00 80A3E2E0 AFB00018 */ sw $s0, 0x0018($sp) -/* 00C04 80A3E2E4 AFA00014 */ sw $zero, 0x0014($sp) -/* 00C08 80A3E2E8 AFA00010 */ sw $zero, 0x0010($sp) -/* 00C0C 80A3E2EC 0C0286B2 */ jal func_800A1AC8 -/* 00C10 80A3E2F0 8FA4005C */ lw $a0, 0x005C($sp) -/* 00C14 80A3E2F4 8FAC005C */ lw $t4, 0x005C($sp) +/* 00C00 80A3E2E0 AFB00018 */ sw $s0, 0x0018($sp) +/* 00C04 80A3E2E4 AFA00014 */ sw $zero, 0x0014($sp) +/* 00C08 80A3E2E8 AFA00010 */ sw $zero, 0x0010($sp) +/* 00C0C 80A3E2EC 0C0286B2 */ jal SkelAnime_DrawSV +/* 00C10 80A3E2F0 8FA4005C */ lw $a0, 0x005C($sp) +/* 00C14 80A3E2F4 8FAC005C */ lw $t4, 0x005C($sp) /* 00C18 80A3E2F8 3C0680A4 */ lui $a2, %hi(D_80A3E41C) ## $a2 = 80A40000 /* 00C1C 80A3E2FC 24C6E41C */ addiu $a2, $a2, %lo(D_80A3E41C) ## $a2 = 80A3E41C /* 00C20 80A3E300 27A4003C */ addiu $a0, $sp, 0x003C ## $a0 = FFFFFFE4 /* 00C24 80A3E304 24070275 */ addiu $a3, $zero, 0x0275 ## $a3 = 00000275 -/* 00C28 80A3E308 0C031AD5 */ jal func_800C6B54 +/* 00C28 80A3E308 0C031AD5 */ jal Graph_CloseDisps /* 00C2C 80A3E30C 8D850000 */ lw $a1, 0x0000($t4) ## 00000000 -/* 00C30 80A3E310 0C28F824 */ jal func_80A3E090 +/* 00C30 80A3E310 0C28F824 */ jal func_80A3E090 /* 00C34 80A3E314 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00C38 80A3E318 8FBF002C */ lw $ra, 0x002C($sp) -/* 00C3C 80A3E31C 8FB00028 */ lw $s0, 0x0028($sp) +/* 00C38 80A3E318 8FBF002C */ lw $ra, 0x002C($sp) +/* 00C3C 80A3E31C 8FB00028 */ lw $s0, 0x0028($sp) /* 00C40 80A3E320 27BD0058 */ addiu $sp, $sp, 0x0058 ## $sp = 00000000 -/* 00C44 80A3E324 03E00008 */ jr $ra +/* 00C44 80A3E324 03E00008 */ jr $ra /* 00C48 80A3E328 00000000 */ nop /* 00C4C 80A3E32C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go/EnGo_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Go/EnGo_Destroy.s index 6d959c40fe..9b200911ca 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Go/EnGo_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Go/EnGo_Destroy.s @@ -1,18 +1,18 @@ glabel EnGo_Destroy /* 0190C 80A3FE7C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 01910 80A3FE80 AFBF0014 */ sw $ra, 0x0014($sp) -/* 01914 80A3FE84 AFA40018 */ sw $a0, 0x0018($sp) -/* 01918 80A3FE88 AFA5001C */ sw $a1, 0x001C($sp) -/* 0191C 80A3FE8C 0C0295BC */ jal func_800A56F0 +/* 01910 80A3FE80 AFBF0014 */ sw $ra, 0x0014($sp) +/* 01914 80A3FE84 AFA40018 */ sw $a0, 0x0018($sp) +/* 01918 80A3FE88 AFA5001C */ sw $a1, 0x001C($sp) +/* 0191C 80A3FE8C 0C0295BC */ jal SkelAnime_Free /* 01920 80A3FE90 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 01924 80A3FE94 8FA50018 */ lw $a1, 0x0018($sp) -/* 01928 80A3FE98 8FA4001C */ lw $a0, 0x001C($sp) +/* 01924 80A3FE94 8FA50018 */ lw $a1, 0x0018($sp) +/* 01928 80A3FE98 8FA4001C */ lw $a0, 0x001C($sp) /* 0192C 80A3FE9C 0C0170EB */ jal ActorCollider_FreeCylinder - + /* 01930 80A3FEA0 24A50194 */ addiu $a1, $a1, 0x0194 ## $a1 = 00000194 -/* 01934 80A3FEA4 8FBF0014 */ lw $ra, 0x0014($sp) +/* 01934 80A3FEA4 8FBF0014 */ lw $ra, 0x0014($sp) /* 01938 80A3FEA8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 0193C 80A3FEAC 03E00008 */ jr $ra +/* 0193C 80A3FEAC 03E00008 */ jr $ra /* 01940 80A3FEB0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go/EnGo_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Go/EnGo_Draw.s index 5fa37e7e4c..879d53bd80 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Go/EnGo_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Go/EnGo_Draw.s @@ -1,97 +1,97 @@ glabel EnGo_Draw /* 02EC8 80A41438 27BDFFA8 */ addiu $sp, $sp, 0xFFA8 ## $sp = FFFFFFA8 -/* 02ECC 80A4143C AFB10028 */ sw $s1, 0x0028($sp) +/* 02ECC 80A4143C AFB10028 */ sw $s1, 0x0028($sp) /* 02ED0 80A41440 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 -/* 02ED4 80A41444 AFBF002C */ sw $ra, 0x002C($sp) -/* 02ED8 80A41448 AFB00024 */ sw $s0, 0x0024($sp) +/* 02ED4 80A41444 AFBF002C */ sw $ra, 0x002C($sp) +/* 02ED8 80A41448 AFB00024 */ sw $s0, 0x0024($sp) /* 02EDC 80A4144C 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 /* 02EE0 80A41450 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 02EE4 80A41454 3C0680A4 */ lui $a2, %hi(D_80A41C60) ## $a2 = 80A40000 /* 02EE8 80A41458 24C61C60 */ addiu $a2, $a2, %lo(D_80A41C60) ## $a2 = 80A41C60 /* 02EEC 80A4145C 27A40040 */ addiu $a0, $sp, 0x0040 ## $a0 = FFFFFFE8 /* 02EF0 80A41460 240709AF */ addiu $a3, $zero, 0x09AF ## $a3 = 000009AF -/* 02EF4 80A41464 0C031AB1 */ jal func_800C6AC4 -/* 02EF8 80A41468 AFA50050 */ sw $a1, 0x0050($sp) -/* 02EFC 80A4146C 0C2905AA */ jal func_80A416A8 +/* 02EF4 80A41464 0C031AB1 */ jal Graph_OpenDisps +/* 02EF8 80A41468 AFA50050 */ sw $a1, 0x0050($sp) +/* 02EFC 80A4146C 0C2905AA */ jal func_80A416A8 /* 02F00 80A41470 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02F04 80A41474 0C034213 */ jal Matrix_Push +/* 02F04 80A41474 0C034213 */ jal Matrix_Push /* 02F08 80A41478 00000000 */ nop /* 02F0C 80A4147C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02F10 80A41480 0C2905ED */ jal func_80A417B4 +/* 02F10 80A41480 0C2905ED */ jal func_80A417B4 /* 02F14 80A41484 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 02F18 80A41488 0C034221 */ jal Matrix_Pull +/* 02F18 80A41488 0C034221 */ jal Matrix_Pull /* 02F1C 80A4148C 00000000 */ nop /* 02F20 80A41490 8E020190 */ lw $v0, 0x0190($s0) ## 00000190 /* 02F24 80A41494 3C0E80A4 */ lui $t6, %hi(func_80A40218) ## $t6 = 80A40000 /* 02F28 80A41498 25CE0218 */ addiu $t6, $t6, %lo(func_80A40218) ## $t6 = 80A40218 -/* 02F2C 80A4149C 15C20006 */ bne $t6, $v0, .L80A414B8 +/* 02F2C 80A4149C 15C20006 */ bne $t6, $v0, .L80A414B8 /* 02F30 80A414A0 3C0F80A4 */ lui $t7, %hi(func_80A4011C) ## $t7 = 80A40000 /* 02F34 80A414A4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02F38 80A414A8 0C2903D6 */ jal func_80A40F58 +/* 02F38 80A414A8 0C2903D6 */ jal func_80A40F58 /* 02F3C 80A414AC 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 02F40 80A414B0 10000050 */ beq $zero, $zero, .L80A415F4 -/* 02F44 80A414B4 8FBF002C */ lw $ra, 0x002C($sp) +/* 02F40 80A414B0 10000050 */ beq $zero, $zero, .L80A415F4 +/* 02F44 80A414B4 8FBF002C */ lw $ra, 0x002C($sp) .L80A414B8: /* 02F48 80A414B8 25EF011C */ addiu $t7, $t7, %lo(func_80A4011C) ## $t7 = 0000011C -/* 02F4C 80A414BC 11E20008 */ beq $t7, $v0, .L80A414E0 +/* 02F4C 80A414BC 11E20008 */ beq $t7, $v0, .L80A414E0 /* 02F50 80A414C0 3C0380A4 */ lui $v1, %hi(func_80A3FEB4) ## $v1 = 80A40000 /* 02F54 80A414C4 2463FEB4 */ addiu $v1, $v1, %lo(func_80A3FEB4) ## $v1 = 80A3FEB4 -/* 02F58 80A414C8 10620005 */ beq $v1, $v0, .L80A414E0 +/* 02F58 80A414C8 10620005 */ beq $v1, $v0, .L80A414E0 /* 02F5C 80A414CC 3C1880A4 */ lui $t8, %hi(func_80A3FEF8) ## $t8 = 80A40000 /* 02F60 80A414D0 2718FEF8 */ addiu $t8, $t8, %lo(func_80A3FEF8) ## $t8 = 80A3FEF8 -/* 02F64 80A414D4 53020003 */ beql $t8, $v0, .L80A414E4 +/* 02F64 80A414D4 53020003 */ beql $t8, $v0, .L80A414E4 /* 02F68 80A414D8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02F6C 80A414DC 14620005 */ bne $v1, $v0, .L80A414F4 +/* 02F6C 80A414DC 14620005 */ bne $v1, $v0, .L80A414F4 .L80A414E0: /* 02F70 80A414E0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 .L80A414E4: -/* 02F74 80A414E4 0C29041A */ jal func_80A41068 +/* 02F74 80A414E4 0C29041A */ jal func_80A41068 /* 02F78 80A414E8 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 02F7C 80A414EC 10000041 */ beq $zero, $zero, .L80A415F4 -/* 02F80 80A414F0 8FBF002C */ lw $ra, 0x002C($sp) +/* 02F7C 80A414EC 10000041 */ beq $zero, $zero, .L80A415F4 +/* 02F80 80A414F0 8FBF002C */ lw $ra, 0x002C($sp) .L80A414F4: -/* 02F84 80A414F4 0C0250F2 */ jal func_800943C8 +/* 02F84 80A414F4 0C0250F2 */ jal func_800943C8 /* 02F88 80A414F8 8E240000 */ lw $a0, 0x0000($s1) ## 00000000 -/* 02F8C 80A414FC 8FA50050 */ lw $a1, 0x0050($sp) +/* 02F8C 80A414FC 8FA50050 */ lw $a1, 0x0050($sp) /* 02F90 80A41500 3C040601 */ lui $a0, 0x0601 ## $a0 = 06010000 /* 02F94 80A41504 2484CE80 */ addiu $a0, $a0, 0xCE80 ## $a0 = 0600CE80 /* 02F98 80A41508 8CA302C0 */ lw $v1, 0x02C0($a1) ## 000002C0 -/* 02F9C 80A4150C 00045100 */ sll $t2, $a0, 4 -/* 02FA0 80A41510 000A5F02 */ srl $t3, $t2, 28 +/* 02F9C 80A4150C 00045100 */ sll $t2, $a0, 4 +/* 02FA0 80A41510 000A5F02 */ srl $t3, $t2, 28 /* 02FA4 80A41514 3C068016 */ lui $a2, 0x8016 ## $a2 = 80160000 /* 02FA8 80A41518 3C09DB06 */ lui $t1, 0xDB06 ## $t1 = DB060000 /* 02FAC 80A4151C 24790008 */ addiu $t9, $v1, 0x0008 ## $t9 = 00000008 /* 02FB0 80A41520 35290020 */ ori $t1, $t1, 0x0020 ## $t1 = DB060020 /* 02FB4 80A41524 24C66FA8 */ addiu $a2, $a2, 0x6FA8 ## $a2 = 80166FA8 -/* 02FB8 80A41528 000B6080 */ sll $t4, $t3, 2 +/* 02FB8 80A41528 000B6080 */ sll $t4, $t3, 2 /* 02FBC 80A4152C ACB902C0 */ sw $t9, 0x02C0($a1) ## 000002C0 -/* 02FC0 80A41530 00CC6821 */ addu $t5, $a2, $t4 +/* 02FC0 80A41530 00CC6821 */ addu $t5, $a2, $t4 /* 02FC4 80A41534 AC690000 */ sw $t1, 0x0000($v1) ## 00000000 /* 02FC8 80A41538 8DAE0000 */ lw $t6, 0x0000($t5) ## 00000000 /* 02FCC 80A4153C 3C0700FF */ lui $a3, 0x00FF ## $a3 = 00FF0000 /* 02FD0 80A41540 34E7FFFF */ ori $a3, $a3, 0xFFFF ## $a3 = 00FFFFFF -/* 02FD4 80A41544 00877824 */ and $t7, $a0, $a3 +/* 02FD4 80A41544 00877824 */ and $t7, $a0, $a3 /* 02FD8 80A41548 3C088000 */ lui $t0, 0x8000 ## $t0 = 80000000 -/* 02FDC 80A4154C 01CFC021 */ addu $t8, $t6, $t7 -/* 02FE0 80A41550 0308C821 */ addu $t9, $t8, $t0 +/* 02FDC 80A4154C 01CFC021 */ addu $t8, $t6, $t7 +/* 02FE0 80A41550 0308C821 */ addu $t9, $t8, $t0 /* 02FE4 80A41554 AC790004 */ sw $t9, 0x0004($v1) ## 00000004 /* 02FE8 80A41558 8CA302C0 */ lw $v1, 0x02C0($a1) ## 000002C0 /* 02FEC 80A4155C 3C040601 */ lui $a0, 0x0601 ## $a0 = 06010000 /* 02FF0 80A41560 2484DE80 */ addiu $a0, $a0, 0xDE80 ## $a0 = 0600DE80 -/* 02FF4 80A41564 00045900 */ sll $t3, $a0, 4 -/* 02FF8 80A41568 000B6702 */ srl $t4, $t3, 28 +/* 02FF4 80A41564 00045900 */ sll $t3, $a0, 4 +/* 02FF8 80A41568 000B6702 */ srl $t4, $t3, 28 /* 02FFC 80A4156C 3C0ADB06 */ lui $t2, 0xDB06 ## $t2 = DB060000 /* 03000 80A41570 24690008 */ addiu $t1, $v1, 0x0008 ## $t1 = 00000008 /* 03004 80A41574 354A0024 */ ori $t2, $t2, 0x0024 ## $t2 = DB060024 -/* 03008 80A41578 000C6880 */ sll $t5, $t4, 2 +/* 03008 80A41578 000C6880 */ sll $t5, $t4, 2 /* 0300C 80A4157C ACA902C0 */ sw $t1, 0x02C0($a1) ## 000002C0 -/* 03010 80A41580 00CD7021 */ addu $t6, $a2, $t5 +/* 03010 80A41580 00CD7021 */ addu $t6, $a2, $t5 /* 03014 80A41584 AC6A0000 */ sw $t2, 0x0000($v1) ## 00000000 /* 03018 80A41588 8DCF0000 */ lw $t7, 0x0000($t6) ## 00000000 -/* 0301C 80A4158C 0087C024 */ and $t8, $a0, $a3 +/* 0301C 80A4158C 0087C024 */ and $t8, $a0, $a3 /* 03020 80A41590 3C0A80A4 */ lui $t2, %hi(func_80A411C8) ## $t2 = 80A40000 -/* 03024 80A41594 01F8C821 */ addu $t9, $t7, $t8 -/* 03028 80A41598 03284821 */ addu $t1, $t9, $t0 +/* 03024 80A41594 01F8C821 */ addu $t9, $t7, $t8 +/* 03028 80A41598 03284821 */ addu $t1, $t9, $t0 /* 0302C 80A4159C AC690004 */ sw $t1, 0x0004($v1) ## 00000004 /* 03030 80A415A0 9207014E */ lbu $a3, 0x014E($s0) ## 0000014E /* 03034 80A415A4 8E06016C */ lw $a2, 0x016C($s0) ## 0000016C @@ -99,25 +99,25 @@ glabel EnGo_Draw /* 0303C 80A415AC 3C0B80A4 */ lui $t3, %hi(func_80A413DC) ## $t3 = 80A40000 /* 03040 80A415B0 256B13DC */ addiu $t3, $t3, %lo(func_80A413DC) ## $t3 = 80A413DC /* 03044 80A415B4 254A11C8 */ addiu $t2, $t2, %lo(func_80A411C8) ## $t2 = 80A411C8 -/* 03048 80A415B8 AFAA0010 */ sw $t2, 0x0010($sp) -/* 0304C 80A415BC AFAB0014 */ sw $t3, 0x0014($sp) -/* 03050 80A415C0 AFB00018 */ sw $s0, 0x0018($sp) -/* 03054 80A415C4 0C0286B2 */ jal func_800A1AC8 +/* 03048 80A415B8 AFAA0010 */ sw $t2, 0x0010($sp) +/* 0304C 80A415BC AFAB0014 */ sw $t3, 0x0014($sp) +/* 03050 80A415C0 AFB00018 */ sw $s0, 0x0018($sp) +/* 03054 80A415C4 0C0286B2 */ jal SkelAnime_DrawSV /* 03058 80A415C8 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 0305C 80A415CC 3C0680A4 */ lui $a2, %hi(D_80A41C70) ## $a2 = 80A40000 /* 03060 80A415D0 24C61C70 */ addiu $a2, $a2, %lo(D_80A41C70) ## $a2 = 80A41C70 /* 03064 80A415D4 27A40040 */ addiu $a0, $sp, 0x0040 ## $a0 = FFFFFFE8 /* 03068 80A415D8 8E250000 */ lw $a1, 0x0000($s1) ## 00000000 -/* 0306C 80A415DC 0C031AD5 */ jal func_800C6B54 +/* 0306C 80A415DC 0C031AD5 */ jal Graph_CloseDisps /* 03070 80A415E0 240709DD */ addiu $a3, $zero, 0x09DD ## $a3 = 000009DD /* 03074 80A415E4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 03078 80A415E8 0C2905ED */ jal func_80A417B4 +/* 03078 80A415E8 0C2905ED */ jal func_80A417B4 /* 0307C 80A415EC 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 03080 80A415F0 8FBF002C */ lw $ra, 0x002C($sp) +/* 03080 80A415F0 8FBF002C */ lw $ra, 0x002C($sp) .L80A415F4: -/* 03084 80A415F4 8FB00024 */ lw $s0, 0x0024($sp) -/* 03088 80A415F8 8FB10028 */ lw $s1, 0x0028($sp) -/* 0308C 80A415FC 03E00008 */ jr $ra +/* 03084 80A415F4 8FB00024 */ lw $s0, 0x0024($sp) +/* 03088 80A415F8 8FB10028 */ lw $s1, 0x0028($sp) +/* 0308C 80A415FC 03E00008 */ jr $ra /* 03090 80A41600 27BD0058 */ addiu $sp, $sp, 0x0058 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go/EnGo_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Go/EnGo_Init.s index d08d46d0df..11f5318a3c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Go/EnGo_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Go/EnGo_Init.s @@ -1,9 +1,9 @@ glabel EnGo_Init /* 015BC 80A3FB2C 27BDFFA8 */ addiu $sp, $sp, 0xFFA8 ## $sp = FFFFFFA8 /* 015C0 80A3FB30 3C0F80A4 */ lui $t7, %hi(D_80A41B9C) ## $t7 = 80A40000 -/* 015C4 80A3FB34 AFBF002C */ sw $ra, 0x002C($sp) -/* 015C8 80A3FB38 AFB00028 */ sw $s0, 0x0028($sp) -/* 015CC 80A3FB3C AFA5005C */ sw $a1, 0x005C($sp) +/* 015C4 80A3FB34 AFBF002C */ sw $ra, 0x002C($sp) +/* 015C8 80A3FB38 AFB00028 */ sw $s0, 0x0028($sp) +/* 015CC 80A3FB3C AFA5005C */ sw $a1, 0x005C($sp) /* 015D0 80A3FB40 25EF1B9C */ addiu $t7, $t7, %lo(D_80A41B9C) ## $t7 = 80A41B9C /* 015D4 80A3FB44 8DF90000 */ lw $t9, 0x0000($t7) ## 80A41B9C /* 015D8 80A3FB48 27AE0044 */ addiu $t6, $sp, 0x0044 ## $t6 = FFFFFFEC @@ -27,94 +27,94 @@ glabel EnGo_Init /* 01620 80A3FB90 3C0741F0 */ lui $a3, 0x41F0 ## $a3 = 41F00000 /* 01624 80A3FB94 AD0A0004 */ sw $t2, 0x0004($t0) ## FFFFFFE4 /* 01628 80A3FB98 0C00AC78 */ jal ActorShape_Init - + /* 0162C 80A3FB9C AD0B0008 */ sw $t3, 0x0008($t0) ## FFFFFFE8 /* 01630 80A3FBA0 3C060601 */ lui $a2, 0x0601 ## $a2 = 06010000 /* 01634 80A3FBA4 24C6FEF0 */ addiu $a2, $a2, 0xFEF0 ## $a2 = 0600FEF0 -/* 01638 80A3FBA8 8FA4005C */ lw $a0, 0x005C($sp) +/* 01638 80A3FBA8 8FA4005C */ lw $a0, 0x005C($sp) /* 0163C 80A3FBAC 2605014C */ addiu $a1, $s0, 0x014C ## $a1 = 0000014C /* 01640 80A3FBB0 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 01644 80A3FBB4 AFA00010 */ sw $zero, 0x0010($sp) -/* 01648 80A3FBB8 AFA00014 */ sw $zero, 0x0014($sp) -/* 0164C 80A3FBBC 0C0291BE */ jal func_800A46F8 -/* 01650 80A3FBC0 AFA00018 */ sw $zero, 0x0018($sp) +/* 01644 80A3FBB4 AFA00010 */ sw $zero, 0x0010($sp) +/* 01648 80A3FBB8 AFA00014 */ sw $zero, 0x0014($sp) +/* 0164C 80A3FBBC 0C0291BE */ jal SkelAnime_InitSV +/* 01650 80A3FBC0 AFA00018 */ sw $zero, 0x0018($sp) /* 01654 80A3FBC4 26050194 */ addiu $a1, $s0, 0x0194 ## $a1 = 00000194 -/* 01658 80A3FBC8 AFA50030 */ sw $a1, 0x0030($sp) +/* 01658 80A3FBC8 AFA50030 */ sw $a1, 0x0030($sp) /* 0165C 80A3FBCC 0C0170D9 */ jal ActorCollider_AllocCylinder - -/* 01660 80A3FBD0 8FA4005C */ lw $a0, 0x005C($sp) + +/* 01660 80A3FBD0 8FA4005C */ lw $a0, 0x005C($sp) /* 01664 80A3FBD4 3C0780A4 */ lui $a3, %hi(D_80A41B00) ## $a3 = 80A40000 -/* 01668 80A3FBD8 8FA50030 */ lw $a1, 0x0030($sp) +/* 01668 80A3FBD8 8FA50030 */ lw $a1, 0x0030($sp) /* 0166C 80A3FBDC 24E71B00 */ addiu $a3, $a3, %lo(D_80A41B00) ## $a3 = 80A41B00 -/* 01670 80A3FBE0 8FA4005C */ lw $a0, 0x005C($sp) +/* 01670 80A3FBE0 8FA4005C */ lw $a0, 0x005C($sp) /* 01674 80A3FBE4 0C01712B */ jal ActorCollider_InitCylinder - + /* 01678 80A3FBE8 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 0167C 80A3FBEC 0C016C80 */ jal CollisionBtlTbl_Get - + /* 01680 80A3FBF0 24040016 */ addiu $a0, $zero, 0x0016 ## $a0 = 00000016 /* 01684 80A3FBF4 3C0680A4 */ lui $a2, %hi(D_80A41B2C) ## $a2 = 80A40000 /* 01688 80A3FBF8 24C61B2C */ addiu $a2, $a2, %lo(D_80A41B2C) ## $a2 = 80A41B2C /* 0168C 80A3FBFC 26040098 */ addiu $a0, $s0, 0x0098 ## $a0 = 00000098 -/* 01690 80A3FC00 0C0187BF */ jal func_80061EFC +/* 01690 80A3FC00 0C0187BF */ jal func_80061EFC /* 01694 80A3FC04 00402825 */ or $a1, $v0, $zero ## $a1 = 00000000 /* 01698 80A3FC08 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0169C 80A3FC0C 0C28FBA3 */ jal func_80A3EE8C -/* 016A0 80A3FC10 8FA5005C */ lw $a1, 0x005C($sp) -/* 016A4 80A3FC14 14400005 */ bne $v0, $zero, .L80A3FC2C +/* 0169C 80A3FC0C 0C28FBA3 */ jal func_80A3EE8C +/* 016A0 80A3FC10 8FA5005C */ lw $a1, 0x005C($sp) +/* 016A4 80A3FC14 14400005 */ bne $v0, $zero, .L80A3FC2C /* 016A8 80A3FC18 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 016AC 80A3FC1C 0C00B55C */ jal Actor_Kill - + /* 016B0 80A3FC20 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 016B4 80A3FC24 10000091 */ beq $zero, $zero, .L80A3FE6C -/* 016B8 80A3FC28 8FBF002C */ lw $ra, 0x002C($sp) +/* 016B4 80A3FC24 10000091 */ beq $zero, $zero, .L80A3FE6C +/* 016B8 80A3FC28 8FBF002C */ lw $ra, 0x002C($sp) .L80A3FC2C: /* 016BC 80A3FC2C 8602001C */ lh $v0, 0x001C($s0) ## 0000001C /* 016C0 80A3FC30 24010090 */ addiu $at, $zero, 0x0090 ## $at = 00000090 /* 016C4 80A3FC34 304200F0 */ andi $v0, $v0, 0x00F0 ## $v0 = 00000000 -/* 016C8 80A3FC38 1040000A */ beq $v0, $zero, .L80A3FC64 +/* 016C8 80A3FC38 1040000A */ beq $v0, $zero, .L80A3FC64 /* 016CC 80A3FC3C 00000000 */ nop -/* 016D0 80A3FC40 10410008 */ beq $v0, $at, .L80A3FC64 +/* 016D0 80A3FC40 10410008 */ beq $v0, $at, .L80A3FC64 /* 016D4 80A3FC44 00000000 */ nop /* 016D8 80A3FC48 8E0C0004 */ lw $t4, 0x0004($s0) ## 00000004 /* 016DC 80A3FC4C 2401FFEF */ addiu $at, $zero, 0xFFEF ## $at = FFFFFFEF -/* 016E0 80A3FC50 01816824 */ and $t5, $t4, $at +/* 016E0 80A3FC50 01816824 */ and $t5, $t4, $at /* 016E4 80A3FC54 2401FFDF */ addiu $at, $zero, 0xFFDF ## $at = FFFFFFDF /* 016E8 80A3FC58 AE0D0004 */ sw $t5, 0x0004($s0) ## 00000004 -/* 016EC 80A3FC5C 01A17824 */ and $t7, $t5, $at +/* 016EC 80A3FC5C 01A17824 */ and $t7, $t5, $at /* 016F0 80A3FC60 AE0F0004 */ sw $t7, 0x0004($s0) ## 00000004 .L80A3FC64: -/* 016F4 80A3FC64 0C28FB78 */ jal func_80A3EDE0 +/* 016F4 80A3FC64 0C28FB78 */ jal func_80A3EDE0 /* 016F8 80A3FC68 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 016FC 80A3FC6C 8602001C */ lh $v0, 0x001C($s0) ## 0000001C /* 01700 80A3FC70 3C01BF80 */ lui $at, 0xBF80 ## $at = BF800000 /* 01704 80A3FC74 44812000 */ mtc1 $at, $f4 ## $f4 = -1.00 /* 01708 80A3FC78 304200F0 */ andi $v0, $v0, 0x00F0 ## $v0 = 00000000 /* 0170C 80A3FC7C 24180006 */ addiu $t8, $zero, 0x0006 ## $t8 = 00000006 -/* 01710 80A3FC80 28410071 */ slti $at, $v0, 0x0071 +/* 01710 80A3FC80 28410071 */ slti $at, $v0, 0x0071 /* 01714 80A3FC84 A218001F */ sb $t8, 0x001F($s0) ## 0000001F /* 01718 80A3FC88 A60001E0 */ sh $zero, 0x01E0($s0) ## 000001E0 -/* 0171C 80A3FC8C 14200006 */ bne $at, $zero, .L80A3FCA8 +/* 0171C 80A3FC8C 14200006 */ bne $at, $zero, .L80A3FCA8 /* 01720 80A3FC90 E604006C */ swc1 $f4, 0x006C($s0) ## 0000006C /* 01724 80A3FC94 24010090 */ addiu $at, $zero, 0x0090 ## $at = 00000090 -/* 01728 80A3FC98 1041005C */ beq $v0, $at, .L80A3FE0C +/* 01728 80A3FC98 1041005C */ beq $v0, $at, .L80A3FE0C /* 0172C 80A3FC9C 240F0005 */ addiu $t7, $zero, 0x0005 ## $t7 = 00000005 -/* 01730 80A3FCA0 1000006F */ beq $zero, $zero, .L80A3FE60 +/* 01730 80A3FCA0 1000006F */ beq $zero, $zero, .L80A3FE60 /* 01734 80A3FCA4 00000000 */ nop .L80A3FCA8: -/* 01738 80A3FCA8 2C410071 */ sltiu $at, $v0, 0x0071 -/* 0173C 80A3FCAC 1020006C */ beq $at, $zero, .L80A3FE60 -/* 01740 80A3FCB0 0002C880 */ sll $t9, $v0, 2 +/* 01738 80A3FCA8 2C410071 */ sltiu $at, $v0, 0x0071 +/* 0173C 80A3FCAC 1020006C */ beq $at, $zero, .L80A3FE60 +/* 01740 80A3FCB0 0002C880 */ sll $t9, $v0, 2 /* 01744 80A3FCB4 3C0180A4 */ lui $at, %hi(jtbl_80A420E4) ## $at = 80A40000 -/* 01748 80A3FCB8 00390821 */ addu $at, $at, $t9 -/* 0174C 80A3FCBC 8C3920E4 */ lw $t9, %lo(jtbl_80A420E4)($at) -/* 01750 80A3FCC0 03200008 */ jr $t9 +/* 01748 80A3FCB8 00390821 */ addu $at, $at, $t9 +/* 0174C 80A3FCBC 8C3920E4 */ lw $t9, %lo(jtbl_80A420E4)($at) +/* 01750 80A3FCC0 03200008 */ jr $t9 /* 01754 80A3FCC4 00000000 */ nop glabel L80A3FCC8 /* 01758 80A3FCC8 3C053C03 */ lui $a1, 0x3C03 ## $a1 = 3C030000 /* 0175C 80A3FCCC 34A5126F */ ori $a1, $a1, 0x126F ## $a1 = 3C03126F /* 01760 80A3FCD0 0C00B58B */ jal Actor_SetScale - + /* 01764 80A3FCD4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 01768 80A3FCD8 3C088012 */ lui $t0, 0x8012 ## $t0 = 80120000 /* 0176C 80A3FCDC 3C098012 */ lui $t1, 0x8012 ## $t1 = 80120000 @@ -122,20 +122,20 @@ glabel L80A3FCC8 /* 01774 80A3FCE4 8D087124 */ lw $t0, 0x7124($t0) ## 80127124 /* 01778 80A3FCE8 3C0B8016 */ lui $t3, 0x8016 ## $t3 = 80160000 /* 0177C 80A3FCEC 956BE6FC */ lhu $t3, -0x1904($t3) ## 8015E6FC -/* 01780 80A3FCF0 01285004 */ sllv $t2, $t0, $t1 +/* 01780 80A3FCF0 01285004 */ sllv $t2, $t0, $t1 /* 01784 80A3FCF4 3C0144AF */ lui $at, 0x44AF ## $at = 44AF0000 -/* 01788 80A3FCF8 014B6024 */ and $t4, $t2, $t3 -/* 0178C 80A3FCFC 1180000A */ beq $t4, $zero, .L80A3FD28 +/* 01788 80A3FCF8 014B6024 */ and $t4, $t2, $t3 +/* 0178C 80A3FCFC 1180000A */ beq $t4, $zero, .L80A3FD28 /* 01790 80A3FD00 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 01794 80A3FD04 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01798 80A3FD08 0C28FD2F */ jal func_80A3F4BC -/* 0179C 80A3FD0C 8FA5005C */ lw $a1, 0x005C($sp) +/* 01798 80A3FD08 0C28FD2F */ jal func_80A3F4BC +/* 0179C 80A3FD0C 8FA5005C */ lw $a1, 0x005C($sp) /* 017A0 80A3FD10 3C0580A4 */ lui $a1, %hi(func_80A40218) ## $a1 = 80A40000 /* 017A4 80A3FD14 24A50218 */ addiu $a1, $a1, %lo(func_80A40218) ## $a1 = 80A40218 -/* 017A8 80A3FD18 0C28F95C */ jal func_80A3E570 +/* 017A8 80A3FD18 0C28F95C */ jal func_80A3E570 /* 017AC 80A3FD1C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 017B0 80A3FD20 10000052 */ beq $zero, $zero, .L80A3FE6C -/* 017B4 80A3FD24 8FBF002C */ lw $ra, 0x002C($sp) +/* 017B0 80A3FD20 10000052 */ beq $zero, $zero, .L80A3FE6C +/* 017B4 80A3FD24 8FBF002C */ lw $ra, 0x002C($sp) .L80A3FD28: /* 017B8 80A3FD28 44813000 */ mtc1 $at, $f6 ## $f6 = 0.00 /* 017BC 80A3FD2C 3C014040 */ lui $at, 0x4040 ## $at = 40400000 @@ -143,50 +143,50 @@ glabel L80A3FCC8 /* 017C4 80A3FD34 3C0580A4 */ lui $a1, %hi(func_80A4011C) ## $a1 = 80A40000 /* 017C8 80A3FD38 24A5011C */ addiu $a1, $a1, %lo(func_80A4011C) ## $a1 = 80A4011C /* 017CC 80A3FD3C E60600BC */ swc1 $f6, 0x00BC($s0) ## 000000BC -/* 017D0 80A3FD40 0C28F95C */ jal func_80A3E570 +/* 017D0 80A3FD40 0C28F95C */ jal func_80A3E570 /* 017D4 80A3FD44 E6080068 */ swc1 $f8, 0x0068($s0) ## 00000068 -/* 017D8 80A3FD48 10000048 */ beq $zero, $zero, .L80A3FE6C -/* 017DC 80A3FD4C 8FBF002C */ lw $ra, 0x002C($sp) +/* 017D8 80A3FD48 10000048 */ beq $zero, $zero, .L80A3FE6C +/* 017DC 80A3FD4C 8FBF002C */ lw $ra, 0x002C($sp) glabel L80A3FD50 /* 017E0 80A3FD50 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 /* 017E4 80A3FD54 0C028800 */ jal SkelAnime_GetFrameCount - + /* 017E8 80A3FD58 24844930 */ addiu $a0, $a0, 0x4930 ## $a0 = 06004930 /* 017EC 80A3FD5C 44825000 */ mtc1 $v0, $f10 ## $f10 = 0.00 /* 017F0 80A3FD60 3C053C23 */ lui $a1, 0x3C23 ## $a1 = 3C230000 /* 017F4 80A3FD64 34A5D70A */ ori $a1, $a1, 0xD70A ## $a1 = 3C23D70A -/* 017F8 80A3FD68 46805420 */ cvt.s.w $f16, $f10 +/* 017F8 80A3FD68 46805420 */ cvt.s.w $f16, $f10 /* 017FC 80A3FD6C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 01800 80A3FD70 0C00B58B */ jal Actor_SetScale - + /* 01804 80A3FD74 E6100164 */ swc1 $f16, 0x0164($s0) ## 00000164 /* 01808 80A3FD78 3C0580A4 */ lui $a1, %hi(func_80A4020C) ## $a1 = 80A40000 /* 0180C 80A3FD7C 24A5020C */ addiu $a1, $a1, %lo(func_80A4020C) ## $a1 = 80A4020C -/* 01810 80A3FD80 0C28F95C */ jal func_80A3E570 +/* 01810 80A3FD80 0C28F95C */ jal func_80A3E570 /* 01814 80A3FD84 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01818 80A3FD88 10000038 */ beq $zero, $zero, .L80A3FE6C -/* 0181C 80A3FD8C 8FBF002C */ lw $ra, 0x002C($sp) +/* 01818 80A3FD88 10000038 */ beq $zero, $zero, .L80A3FE6C +/* 0181C 80A3FD8C 8FBF002C */ lw $ra, 0x002C($sp) glabel L80A3FD90 /* 01820 80A3FD90 3C0D8016 */ lui $t5, 0x8016 ## $t5 = 80160000 /* 01824 80A3FD94 95ADF574 */ lhu $t5, -0x0A8C($t5) ## 8015F574 /* 01828 80A3FD98 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 0182C 80A3FD9C 31AE0800 */ andi $t6, $t5, 0x0800 ## $t6 = 00000000 -/* 01830 80A3FDA0 51C00004 */ beql $t6, $zero, .L80A3FDB4 +/* 01830 80A3FDA0 51C00004 */ beql $t6, $zero, .L80A3FDB4 /* 01834 80A3FDA4 3C053C75 */ lui $a1, 0x3C75 ## $a1 = 3C750000 -/* 01838 80A3FDA8 0C28FD2F */ jal func_80A3F4BC -/* 0183C 80A3FDAC 8FA5005C */ lw $a1, 0x005C($sp) +/* 01838 80A3FDA8 0C28FD2F */ jal func_80A3F4BC +/* 0183C 80A3FDAC 8FA5005C */ lw $a1, 0x005C($sp) /* 01840 80A3FDB0 3C053C75 */ lui $a1, 0x3C75 ## $a1 = 3C750000 .L80A3FDB4: /* 01844 80A3FDB4 34A5C28F */ ori $a1, $a1, 0xC28F ## $a1 = 3C75C28F /* 01848 80A3FDB8 0C00B58B */ jal Actor_SetScale - + /* 0184C 80A3FDBC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 01850 80A3FDC0 3C0580A4 */ lui $a1, %hi(func_80A40218) ## $a1 = 80A40000 /* 01854 80A3FDC4 24A50218 */ addiu $a1, $a1, %lo(func_80A40218) ## $a1 = 80A40218 -/* 01858 80A3FDC8 0C28F95C */ jal func_80A3E570 +/* 01858 80A3FDC8 0C28F95C */ jal func_80A3E570 /* 0185C 80A3FDCC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01860 80A3FDD0 10000026 */ beq $zero, $zero, .L80A3FE6C -/* 01864 80A3FDD4 8FBF002C */ lw $ra, 0x002C($sp) +/* 01860 80A3FDD0 10000026 */ beq $zero, $zero, .L80A3FE6C +/* 01864 80A3FDD4 8FBF002C */ lw $ra, 0x002C($sp) glabel L80A3FDD8 /* 01868 80A3FDD8 3C0144AF */ lui $at, 0x44AF ## $at = 44AF0000 /* 0186C 80A3FDDC 44819000 */ mtc1 $at, $f18 ## $f18 = 1400.00 @@ -194,49 +194,49 @@ glabel L80A3FDD8 /* 01874 80A3FDE4 34A5D70A */ ori $a1, $a1, 0xD70A ## $a1 = 3C23D70A /* 01878 80A3FDE8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 0187C 80A3FDEC 0C00B58B */ jal Actor_SetScale - + /* 01880 80A3FDF0 E61200BC */ swc1 $f18, 0x00BC($s0) ## 000000BC /* 01884 80A3FDF4 3C0580A4 */ lui $a1, %hi(func_80A3FEB4) ## $a1 = 80A40000 /* 01888 80A3FDF8 24A5FEB4 */ addiu $a1, $a1, %lo(func_80A3FEB4) ## $a1 = 80A3FEB4 -/* 0188C 80A3FDFC 0C28F95C */ jal func_80A3E570 +/* 0188C 80A3FDFC 0C28F95C */ jal func_80A3E570 /* 01890 80A3FE00 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01894 80A3FE04 10000019 */ beq $zero, $zero, .L80A3FE6C -/* 01898 80A3FE08 8FBF002C */ lw $ra, 0x002C($sp) +/* 01894 80A3FE04 10000019 */ beq $zero, $zero, .L80A3FE6C +/* 01898 80A3FE08 8FBF002C */ lw $ra, 0x002C($sp) .L80A3FE0C: /* 0189C 80A3FE0C 3C053E23 */ lui $a1, 0x3E23 ## $a1 = 3E230000 /* 018A0 80A3FE10 A20F001F */ sb $t7, 0x001F($s0) ## 0000001F /* 018A4 80A3FE14 34A5D70A */ ori $a1, $a1, 0xD70A ## $a1 = 3E23D70A /* 018A8 80A3FE18 0C00B58B */ jal Actor_SetScale - + /* 018AC 80A3FE1C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 018B0 80A3FE20 3C0580A4 */ lui $a1, %hi(func_80A40218) ## $a1 = 80A40000 /* 018B4 80A3FE24 24A50218 */ addiu $a1, $a1, %lo(func_80A40218) ## $a1 = 80A40218 -/* 018B8 80A3FE28 0C28F95C */ jal func_80A3E570 +/* 018B8 80A3FE28 0C28F95C */ jal func_80A3E570 /* 018BC 80A3FE2C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 018C0 80A3FE30 1000000E */ beq $zero, $zero, .L80A3FE6C -/* 018C4 80A3FE34 8FBF002C */ lw $ra, 0x002C($sp) +/* 018C0 80A3FE30 1000000E */ beq $zero, $zero, .L80A3FE6C +/* 018C4 80A3FE34 8FBF002C */ lw $ra, 0x002C($sp) glabel L80A3FE38 /* 018C8 80A3FE38 3C053C23 */ lui $a1, 0x3C23 ## $a1 = 3C230000 /* 018CC 80A3FE3C 34A5D70A */ ori $a1, $a1, 0xD70A ## $a1 = 3C23D70A /* 018D0 80A3FE40 0C00B58B */ jal Actor_SetScale - + /* 018D4 80A3FE44 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 018D8 80A3FE48 3C0580A4 */ lui $a1, %hi(func_80A40218) ## $a1 = 80A40000 /* 018DC 80A3FE4C 24A50218 */ addiu $a1, $a1, %lo(func_80A40218) ## $a1 = 80A40218 -/* 018E0 80A3FE50 0C28F95C */ jal func_80A3E570 +/* 018E0 80A3FE50 0C28F95C */ jal func_80A3E570 /* 018E4 80A3FE54 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 018E8 80A3FE58 10000004 */ beq $zero, $zero, .L80A3FE6C -/* 018EC 80A3FE5C 8FBF002C */ lw $ra, 0x002C($sp) +/* 018E8 80A3FE58 10000004 */ beq $zero, $zero, .L80A3FE6C +/* 018EC 80A3FE5C 8FBF002C */ lw $ra, 0x002C($sp) glabel L80A3FE60 .L80A3FE60: /* 018F0 80A3FE60 0C00B55C */ jal Actor_Kill - + /* 018F4 80A3FE64 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 018F8 80A3FE68 8FBF002C */ lw $ra, 0x002C($sp) +/* 018F8 80A3FE68 8FBF002C */ lw $ra, 0x002C($sp) .L80A3FE6C: -/* 018FC 80A3FE6C 8FB00028 */ lw $s0, 0x0028($sp) +/* 018FC 80A3FE6C 8FB00028 */ lw $s0, 0x0028($sp) /* 01900 80A3FE70 27BD0058 */ addiu $sp, $sp, 0x0058 ## $sp = 00000000 -/* 01904 80A3FE74 03E00008 */ jr $ra +/* 01904 80A3FE74 03E00008 */ jr $ra /* 01908 80A3FE78 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A3EDE0.s b/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A3EDE0.s index 699aa24163..01beaff0d3 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A3EDE0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A3EDE0.s @@ -1,16 +1,16 @@ glabel func_80A3EDE0 /* 00870 80A3EDE0 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 00874 80A3EDE4 AFBF0024 */ sw $ra, 0x0024($sp) -/* 00878 80A3EDE8 AFA40038 */ sw $a0, 0x0038($sp) +/* 00874 80A3EDE4 AFBF0024 */ sw $ra, 0x0024($sp) +/* 00878 80A3EDE8 AFA40038 */ sw $a0, 0x0038($sp) /* 0087C 80A3EDEC 848F001C */ lh $t7, 0x001C($a0) ## 0000001C /* 00880 80A3EDF0 24010090 */ addiu $at, $zero, 0x0090 ## $at = 00000090 -/* 00884 80A3EDF4 0005C900 */ sll $t9, $a1, 4 +/* 00884 80A3EDF4 0005C900 */ sll $t9, $a1, 4 /* 00888 80A3EDF8 31F800F0 */ andi $t8, $t7, 0x00F0 ## $t8 = 00000000 -/* 0088C 80A3EDFC 17010005 */ bne $t8, $at, .L80A3EE14 +/* 0088C 80A3EDFC 17010005 */ bne $t8, $at, .L80A3EE14 /* 00890 80A3EE00 3C0880A4 */ lui $t0, %hi(D_80A41B38) ## $t0 = 80A40000 /* 00894 80A3EE04 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 /* 00898 80A3EE08 44810000 */ mtc1 $at, $f0 ## $f0 = 0.50 -/* 0089C 80A3EE0C 10000004 */ beq $zero, $zero, .L80A3EE20 +/* 0089C 80A3EE0C 10000004 */ beq $zero, $zero, .L80A3EE20 /* 008A0 80A3EE10 00000000 */ nop .L80A3EE14: /* 008A4 80A3EE14 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 @@ -18,33 +18,33 @@ glabel func_80A3EDE0 /* 008AC 80A3EE1C 00000000 */ nop .L80A3EE20: /* 008B0 80A3EE20 25081B38 */ addiu $t0, $t0, %lo(D_80A41B38) ## $t0 = 80A41B38 -/* 008B4 80A3EE24 03281821 */ addu $v1, $t9, $t0 +/* 008B4 80A3EE24 03281821 */ addu $v1, $t9, $t0 /* 008B8 80A3EE28 8C640000 */ lw $a0, 0x0000($v1) ## 00000000 -/* 008BC 80A3EE2C AFA3002C */ sw $v1, 0x002C($sp) +/* 008BC 80A3EE2C AFA3002C */ sw $v1, 0x002C($sp) /* 008C0 80A3EE30 0C028800 */ jal SkelAnime_GetFrameCount - -/* 008C4 80A3EE34 E7A00030 */ swc1 $f0, 0x0030($sp) -/* 008C8 80A3EE38 8FA3002C */ lw $v1, 0x002C($sp) -/* 008CC 80A3EE3C C7A00030 */ lwc1 $f0, 0x0030($sp) + +/* 008C4 80A3EE34 E7A00030 */ swc1 $f0, 0x0030($sp) +/* 008C8 80A3EE38 8FA3002C */ lw $v1, 0x002C($sp) +/* 008CC 80A3EE3C C7A00030 */ lwc1 $f0, 0x0030($sp) /* 008D0 80A3EE40 44824000 */ mtc1 $v0, $f8 ## $f8 = 0.00 /* 008D4 80A3EE44 C4640004 */ lwc1 $f4, 0x0004($v1) ## 00000004 -/* 008D8 80A3EE48 8FA40038 */ lw $a0, 0x0038($sp) -/* 008DC 80A3EE4C 468042A0 */ cvt.s.w $f10, $f8 -/* 008E0 80A3EE50 46040182 */ mul.s $f6, $f0, $f4 +/* 008D8 80A3EE48 8FA40038 */ lw $a0, 0x0038($sp) +/* 008DC 80A3EE4C 468042A0 */ cvt.s.w $f10, $f8 +/* 008E0 80A3EE50 46040182 */ mul.s $f6, $f0, $f4 /* 008E4 80A3EE54 90690008 */ lbu $t1, 0x0008($v1) ## 00000008 /* 008E8 80A3EE58 C470000C */ lwc1 $f16, 0x000C($v1) ## 0000000C /* 008EC 80A3EE5C 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 /* 008F0 80A3EE60 8C650000 */ lw $a1, 0x0000($v1) ## 00000000 -/* 008F4 80A3EE64 E7AA0010 */ swc1 $f10, 0x0010($sp) +/* 008F4 80A3EE64 E7AA0010 */ swc1 $f10, 0x0010($sp) /* 008F8 80A3EE68 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 008FC 80A3EE6C 44063000 */ mfc1 $a2, $f6 -/* 00900 80A3EE70 AFA90014 */ sw $t1, 0x0014($sp) -/* 00904 80A3EE74 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 00908 80A3EE78 E7B00018 */ swc1 $f16, 0x0018($sp) -/* 0090C 80A3EE7C 8FBF0024 */ lw $ra, 0x0024($sp) +/* 008FC 80A3EE6C 44063000 */ mfc1 $a2, $f6 +/* 00900 80A3EE70 AFA90014 */ sw $t1, 0x0014($sp) +/* 00904 80A3EE74 0C029468 */ jal SkelAnime_ChangeAnim + +/* 00908 80A3EE78 E7B00018 */ swc1 $f16, 0x0018($sp) +/* 0090C 80A3EE7C 8FBF0024 */ lw $ra, 0x0024($sp) /* 00910 80A3EE80 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 -/* 00914 80A3EE84 03E00008 */ jr $ra +/* 00914 80A3EE84 03E00008 */ jr $ra /* 00918 80A3EE88 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A3F300.s b/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A3F300.s index da9d224773..0cd15b0b4c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A3F300.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A3F300.s @@ -47,7 +47,7 @@ glabel func_80A3F300 /* 00E40 80A3F3B0 46083301 */ sub.s $f12, $f6, $f8 /* 00E44 80A3F3B4 46128381 */ sub.s $f14, $f16, $f18 /* 00E48 80A3F3B8 E7AC002C */ swc1 $f12, 0x002C($sp) -/* 00E4C 80A3F3BC 0C03F494 */ jal func_800FD250 +/* 00E4C 80A3F3BC 0C03F494 */ jal Math_atan2f /* 00E50 80A3F3C0 E7AE0028 */ swc1 $f14, 0x0028($sp) /* 00E54 80A3F3C4 3C0180A4 */ lui $at, %hi(D_80A420D8) ## $at = 80A40000 /* 00E58 80A3F3C8 C42420D8 */ lwc1 $f4, %lo(D_80A420D8)($at) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A40F58.s b/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A40F58.s index fcbc45c31b..f0dba1721f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A40F58.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A40F58.s @@ -19,7 +19,7 @@ glabel func_80A40F58 /* 02A2C 80A40F9C 27A40030 */ addiu $a0, $sp, 0x0030 ## $a0 = FFFFFFE0 /* 02A30 80A40FA0 8D050000 */ lw $a1, 0x0000($t0) ## 00000000 /* 02A34 80A40FA4 24070910 */ addiu $a3, $zero, 0x0910 ## $a3 = 00000910 -/* 02A38 80A40FA8 0C031AB1 */ jal func_800C6AC4 +/* 02A38 80A40FA8 0C031AB1 */ jal Graph_OpenDisps /* 02A3C 80A40FAC 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 /* 02A40 80A40FB0 0C034213 */ jal Matrix_Push /* 02A44 80A40FB4 00000000 */ nop @@ -60,7 +60,7 @@ glabel func_80A40F58 /* 02AD0 80A41040 24C61C20 */ addiu $a2, $a2, %lo(D_80A41C20) ## $a2 = 80A41C20 /* 02AD4 80A41044 27A40030 */ addiu $a0, $sp, 0x0030 ## $a0 = FFFFFFE0 /* 02AD8 80A41048 24070925 */ addiu $a3, $zero, 0x0925 ## $a3 = 00000925 -/* 02ADC 80A4104C 0C031AD5 */ jal func_800C6B54 +/* 02ADC 80A4104C 0C031AD5 */ jal Graph_CloseDisps /* 02AE0 80A41050 8F050000 */ lw $a1, 0x0000($t8) ## 00000000 /* 02AE4 80A41054 8FBF001C */ lw $ra, 0x001C($sp) /* 02AE8 80A41058 8FB00018 */ lw $s0, 0x0018($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A41068.s b/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A41068.s index 47bf37ac49..576592a62d 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A41068.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A41068.s @@ -1,10 +1,10 @@ glabel func_80A41068 /* 02AF8 80A41068 27BDFFB0 */ addiu $sp, $sp, 0xFFB0 ## $sp = FFFFFFB0 /* 02AFC 80A4106C 3C0F80A4 */ lui $t7, %hi(D_80A41BC0) ## $t7 = 80A40000 -/* 02B00 80A41070 AFBF001C */ sw $ra, 0x001C($sp) -/* 02B04 80A41074 AFB10018 */ sw $s1, 0x0018($sp) -/* 02B08 80A41078 AFB00014 */ sw $s0, 0x0014($sp) -/* 02B0C 80A4107C AFA40050 */ sw $a0, 0x0050($sp) +/* 02B00 80A41070 AFBF001C */ sw $ra, 0x001C($sp) +/* 02B04 80A41074 AFB10018 */ sw $s1, 0x0018($sp) +/* 02B08 80A41078 AFB00014 */ sw $s0, 0x0014($sp) +/* 02B0C 80A4107C AFA40050 */ sw $a0, 0x0050($sp) /* 02B10 80A41080 25EF1BC0 */ addiu $t7, $t7, %lo(D_80A41BC0) ## $t7 = 80A41BC0 /* 02B14 80A41084 8DF90000 */ lw $t9, 0x0000($t7) ## 80A41BC0 /* 02B18 80A41088 27AE0044 */ addiu $t6, $sp, 0x0044 ## $t6 = FFFFFFF4 @@ -19,35 +19,35 @@ glabel func_80A41068 /* 02B3C 80A410AC 24C61C30 */ addiu $a2, $a2, %lo(D_80A41C30) ## $a2 = 80A41C30 /* 02B40 80A410B0 27A40030 */ addiu $a0, $sp, 0x0030 ## $a0 = FFFFFFE0 /* 02B44 80A410B4 24070933 */ addiu $a3, $zero, 0x0933 ## $a3 = 00000933 -/* 02B48 80A410B8 0C031AB1 */ jal func_800C6AC4 +/* 02B48 80A410B8 0C031AB1 */ jal Graph_OpenDisps /* 02B4C 80A410BC 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 -/* 02B50 80A410C0 0C034213 */ jal Matrix_Push +/* 02B50 80A410C0 0C034213 */ jal Matrix_Push /* 02B54 80A410C4 00000000 */ nop -/* 02B58 80A410C8 0C024F46 */ jal func_80093D18 +/* 02B58 80A410C8 0C024F46 */ jal func_80093D18 /* 02B5C 80A410CC 8E240000 */ lw $a0, 0x0000($s1) ## 00000000 -/* 02B60 80A410D0 8FA20050 */ lw $v0, 0x0050($sp) +/* 02B60 80A410D0 8FA20050 */ lw $v0, 0x0050($sp) /* 02B64 80A410D4 8E28009C */ lw $t0, 0x009C($s1) ## 0000009C /* 02B68 80A410D8 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 02B6C 80A410DC C4440068 */ lwc1 $f4, 0x0068($v0) ## 00000068 /* 02B70 80A410E0 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 /* 02B74 80A410E4 844600B8 */ lh $a2, 0x00B8($v0) ## 000000B8 -/* 02B78 80A410E8 4600218D */ trunc.w.s $f6, $f4 -/* 02B7C 80A410EC 440A3000 */ mfc1 $t2, $f6 +/* 02B78 80A410E8 4600218D */ trunc.w.s $f6, $f4 +/* 02B7C 80A410EC 440A3000 */ mfc1 $t2, $f6 /* 02B80 80A410F0 00000000 */ nop -/* 02B84 80A410F4 000A5C00 */ sll $t3, $t2, 16 -/* 02B88 80A410F8 000B6403 */ sra $t4, $t3, 16 -/* 02B8C 80A410FC 000C6880 */ sll $t5, $t4, 2 -/* 02B90 80A41100 01AC6823 */ subu $t5, $t5, $t4 -/* 02B94 80A41104 000D6880 */ sll $t5, $t5, 2 -/* 02B98 80A41108 01AC6823 */ subu $t5, $t5, $t4 -/* 02B9C 80A4110C 000D6900 */ sll $t5, $t5, 4 -/* 02BA0 80A41110 01AC6823 */ subu $t5, $t5, $t4 -/* 02BA4 80A41114 000D68C0 */ sll $t5, $t5, 3 -/* 02BA8 80A41118 010D0019 */ multu $t0, $t5 -/* 02BAC 80A4111C 00002012 */ mflo $a0 -/* 02BB0 80A41120 00042400 */ sll $a0, $a0, 16 -/* 02BB4 80A41124 0C034421 */ jal Matrix_RotateXYZ -/* 02BB8 80A41128 00042403 */ sra $a0, $a0, 16 +/* 02B84 80A410F4 000A5C00 */ sll $t3, $t2, 16 +/* 02B88 80A410F8 000B6403 */ sra $t4, $t3, 16 +/* 02B8C 80A410FC 000C6880 */ sll $t5, $t4, 2 +/* 02B90 80A41100 01AC6823 */ subu $t5, $t5, $t4 +/* 02B94 80A41104 000D6880 */ sll $t5, $t5, 2 +/* 02B98 80A41108 01AC6823 */ subu $t5, $t5, $t4 +/* 02B9C 80A4110C 000D6900 */ sll $t5, $t5, 4 +/* 02BA0 80A41110 01AC6823 */ subu $t5, $t5, $t4 +/* 02BA4 80A41114 000D68C0 */ sll $t5, $t5, 3 +/* 02BA8 80A41118 010D0019 */ multu $t0, $t5 +/* 02BAC 80A4111C 00002012 */ mflo $a0 +/* 02BB0 80A41120 00042400 */ sll $a0, $a0, 16 +/* 02BB4 80A41124 0C034421 */ jal Matrix_RotateZYX +/* 02BB8 80A41128 00042403 */ sra $a0, $a0, 16 /* 02BBC 80A4112C 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 /* 02BC0 80A41130 3C0FDA38 */ lui $t7, 0xDA38 ## $t7 = DA380000 /* 02BC4 80A41134 35EF0003 */ ori $t7, $t7, 0x0003 ## $t7 = DA380003 @@ -58,9 +58,9 @@ glabel func_80A41068 /* 02BD8 80A41148 3C0580A4 */ lui $a1, %hi(D_80A41C40) ## $a1 = 80A40000 /* 02BDC 80A4114C 24A51C40 */ addiu $a1, $a1, %lo(D_80A41C40) ## $a1 = 80A41C40 /* 02BE0 80A41150 24060940 */ addiu $a2, $zero, 0x0940 ## $a2 = 00000940 -/* 02BE4 80A41154 0C0346A2 */ jal Matrix_NewMtx -/* 02BE8 80A41158 AFA2002C */ sw $v0, 0x002C($sp) -/* 02BEC 80A4115C 8FA3002C */ lw $v1, 0x002C($sp) +/* 02BE4 80A41154 0C0346A2 */ jal Matrix_NewMtx +/* 02BE8 80A41158 AFA2002C */ sw $v0, 0x002C($sp) +/* 02BEC 80A4115C 8FA3002C */ lw $v1, 0x002C($sp) /* 02BF0 80A41160 3C090601 */ lui $t1, 0x0601 ## $t1 = 06010000 /* 02BF4 80A41164 2529C140 */ addiu $t1, $t1, 0xC140 ## $t1 = 0600C140 /* 02BF8 80A41168 AC620004 */ sw $v0, 0x0004($v1) ## 00000004 @@ -71,21 +71,21 @@ glabel func_80A41068 /* 02C0C 80A4117C AE1802C0 */ sw $t8, 0x02C0($s0) ## 000002C0 /* 02C10 80A41180 AC490004 */ sw $t1, 0x0004($v0) ## 00000004 /* 02C14 80A41184 AC590000 */ sw $t9, 0x0000($v0) ## 00000000 -/* 02C18 80A41188 8FA50050 */ lw $a1, 0x0050($sp) -/* 02C1C 80A4118C 0C0346BD */ jal Matrix_MultVec3f +/* 02C18 80A41188 8FA50050 */ lw $a1, 0x0050($sp) +/* 02C1C 80A4118C 0C0346BD */ jal Matrix_MultVec3f /* 02C20 80A41190 24A50038 */ addiu $a1, $a1, 0x0038 ## $a1 = 00000038 -/* 02C24 80A41194 0C034221 */ jal Matrix_Pull +/* 02C24 80A41194 0C034221 */ jal Matrix_Pull /* 02C28 80A41198 00000000 */ nop /* 02C2C 80A4119C 3C0680A4 */ lui $a2, %hi(D_80A41C50) ## $a2 = 80A40000 /* 02C30 80A411A0 24C61C50 */ addiu $a2, $a2, %lo(D_80A41C50) ## $a2 = 80A41C50 /* 02C34 80A411A4 27A40030 */ addiu $a0, $sp, 0x0030 ## $a0 = FFFFFFE0 /* 02C38 80A411A8 8E250000 */ lw $a1, 0x0000($s1) ## 00000000 -/* 02C3C 80A411AC 0C031AD5 */ jal func_800C6B54 +/* 02C3C 80A411AC 0C031AD5 */ jal Graph_CloseDisps /* 02C40 80A411B0 2407094F */ addiu $a3, $zero, 0x094F ## $a3 = 0000094F -/* 02C44 80A411B4 8FBF001C */ lw $ra, 0x001C($sp) -/* 02C48 80A411B8 8FB00014 */ lw $s0, 0x0014($sp) -/* 02C4C 80A411BC 8FB10018 */ lw $s1, 0x0018($sp) -/* 02C50 80A411C0 03E00008 */ jr $ra +/* 02C44 80A411B4 8FBF001C */ lw $ra, 0x001C($sp) +/* 02C48 80A411B8 8FB00014 */ lw $s0, 0x0014($sp) +/* 02C4C 80A411BC 8FB10018 */ lw $s1, 0x0018($sp) +/* 02C50 80A411C0 03E00008 */ jr $ra /* 02C54 80A411C4 27BD0050 */ addiu $sp, $sp, 0x0050 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A417B4.s b/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A417B4.s index 0d9bf2deea..18b276d794 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A417B4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Go/func_80A417B4.s @@ -20,7 +20,7 @@ glabel func_80A417B4 /* 0328C 80A417FC 24C61C80 */ addiu $a2, $a2, %lo(D_80A41C80) ## $a2 = 80A41C80 /* 03290 80A41800 27A40088 */ addiu $a0, $sp, 0x0088 ## $a0 = FFFFFFE0 /* 03294 80A41804 24070A42 */ addiu $a3, $zero, 0x0A42 ## $a3 = 00000A42 -/* 03298 80A41808 0C031AB1 */ jal func_800C6AC4 +/* 03298 80A41808 0C031AB1 */ jal Graph_OpenDisps /* 0329C 80A4180C 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 /* 032A0 80A41810 0000B825 */ or $s7, $zero, $zero ## $s7 = 00000000 /* 032A4 80A41814 0C024F61 */ jal func_80093D84 @@ -46,7 +46,7 @@ glabel func_80A417B4 /* 032F0 80A41860 2631FD40 */ addiu $s1, $s1, 0xFD40 ## $s1 = 0600FD40 /* 032F4 80A41864 8E0402D0 */ lw $a0, 0x02D0($s0) ## 000002D0 /* 032F8 80A41868 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 032FC 80A4186C 0C024DDD */ jal func_80093774 +/* 032FC 80A4186C 0C024DDD */ jal Gfx_CallSetupDL /* 03300 80A41870 24170001 */ addiu $s7, $zero, 0x0001 ## $s7 = 00000001 /* 03304 80A41874 AE0202D0 */ sw $v0, 0x02D0($s0) ## 000002D0 /* 03308 80A41878 244F0008 */ addiu $t7, $v0, 0x0008 ## $t7 = 00000008 @@ -192,7 +192,7 @@ glabel func_80A417B4 /* 03520 80A41A90 24C61CA0 */ addiu $a2, $a2, %lo(D_80A41CA0) ## $a2 = 80A41CA0 /* 03524 80A41A94 27A40088 */ addiu $a0, $sp, 0x0088 ## $a0 = FFFFFFE0 /* 03528 80A41A98 8FC50000 */ lw $a1, 0x0000($s8) ## 00000000 -/* 0352C 80A41A9C 0C031AD5 */ jal func_800C6B54 +/* 0352C 80A41A9C 0C031AD5 */ jal Graph_CloseDisps /* 03530 80A41AA0 24070A76 */ addiu $a3, $zero, 0x0A76 ## $a3 = 00000A76 /* 03534 80A41AA4 8FBF0054 */ lw $ra, 0x0054($sp) /* 03538 80A41AA8 D7B40018 */ ldc1 $f20, 0x0018($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go2/EnGo2_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Go2/EnGo2_Draw.s index a629478a13..651bd8123e 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Go2/EnGo2_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Go2/EnGo2_Draw.s @@ -1,9 +1,9 @@ glabel EnGo2_Draw /* 05160 80A47E90 27BDFF90 */ addiu $sp, $sp, 0xFF90 ## $sp = FFFFFF90 /* 05164 80A47E94 3C0F80A5 */ lui $t7, %hi(D_80A48578) ## $t7 = 80A50000 -/* 05168 80A47E98 AFBF002C */ sw $ra, 0x002C($sp) -/* 0516C 80A47E9C AFB00028 */ sw $s0, 0x0028($sp) -/* 05170 80A47EA0 AFA50074 */ sw $a1, 0x0074($sp) +/* 05168 80A47E98 AFBF002C */ sw $ra, 0x002C($sp) +/* 0516C 80A47E9C AFB00028 */ sw $s0, 0x0028($sp) +/* 05170 80A47EA0 AFA50074 */ sw $a1, 0x0074($sp) /* 05174 80A47EA4 25EF8578 */ addiu $t7, $t7, %lo(D_80A48578) ## $t7 = 80A48578 /* 05178 80A47EA8 8DF90000 */ lw $t9, 0x0000($t7) ## 80A48578 /* 0517C 80A47EAC 8DF80004 */ lw $t8, 0x0004($t7) ## 80A4857C @@ -21,64 +21,64 @@ glabel EnGo2_Draw /* 051AC 80A47EDC 27A90054 */ addiu $t1, $sp, 0x0054 ## $t1 = FFFFFFE4 /* 051B0 80A47EE0 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 051B4 80A47EE4 AD2B0004 */ sw $t3, 0x0004($t1) ## FFFFFFE8 -/* 051B8 80A47EE8 0C290B75 */ jal func_80A42DD4 +/* 051B8 80A47EE8 0C290B75 */ jal func_80A42DD4 /* 051BC 80A47EEC AD2C0000 */ sw $t4, 0x0000($t1) ## FFFFFFE4 -/* 051C0 80A47EF0 0C034213 */ jal Matrix_Push +/* 051C0 80A47EF0 0C034213 */ jal Matrix_Push /* 051C4 80A47EF4 00000000 */ nop /* 051C8 80A47EF8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 051CC 80A47EFC 0C290BB8 */ jal func_80A42EE0 -/* 051D0 80A47F00 8FA50074 */ lw $a1, 0x0074($sp) -/* 051D4 80A47F04 0C034221 */ jal Matrix_Pull +/* 051CC 80A47EFC 0C290BB8 */ jal func_80A42EE0 +/* 051D0 80A47F00 8FA50074 */ lw $a1, 0x0074($sp) +/* 051D4 80A47F04 0C034221 */ jal Matrix_Pull /* 051D8 80A47F08 00000000 */ nop /* 051DC 80A47F0C 8E020190 */ lw $v0, 0x0190($s0) ## 00000190 /* 051E0 80A47F10 3C0D80A4 */ lui $t5, %hi(func_80A4696C) ## $t5 = 80A40000 /* 051E4 80A47F14 25AD696C */ addiu $t5, $t5, %lo(func_80A4696C) ## $t5 = 80A4696C -/* 051E8 80A47F18 15A20011 */ bne $t5, $v0, .L80A47F60 +/* 051E8 80A47F18 15A20011 */ bne $t5, $v0, .L80A47F60 /* 051EC 80A47F1C 3C0E80A4 */ lui $t6, %hi(func_80A46E54) ## $t6 = 80A40000 /* 051F0 80A47F20 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 /* 051F4 80A47F24 C6040168 */ lwc1 $f4, 0x0168($s0) ## 00000168 -/* 051F8 80A47F28 46040032 */ c.eq.s $f0, $f4 +/* 051F8 80A47F28 46040032 */ c.eq.s $f0, $f4 /* 051FC 80A47F2C 00000000 */ nop -/* 05200 80A47F30 4500000B */ bc1f .L80A47F60 +/* 05200 80A47F30 4500000B */ bc1f .L80A47F60 /* 05204 80A47F34 00000000 */ nop /* 05208 80A47F38 C6060164 */ lwc1 $f6, 0x0164($s0) ## 00000164 /* 0520C 80A47F3C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 05210 80A47F40 46060032 */ c.eq.s $f0, $f6 +/* 05210 80A47F40 46060032 */ c.eq.s $f0, $f6 /* 05214 80A47F44 00000000 */ nop -/* 05218 80A47F48 45000005 */ bc1f .L80A47F60 +/* 05218 80A47F48 45000005 */ bc1f .L80A47F60 /* 0521C 80A47F4C 00000000 */ nop -/* 05220 80A47F50 0C291E6C */ jal func_80A479B0 -/* 05224 80A47F54 8FA50074 */ lw $a1, 0x0074($sp) -/* 05228 80A47F58 10000059 */ beq $zero, $zero, .L80A480C0 -/* 0522C 80A47F5C 8FBF002C */ lw $ra, 0x002C($sp) +/* 05220 80A47F50 0C291E6C */ jal func_80A479B0 +/* 05224 80A47F54 8FA50074 */ lw $a1, 0x0074($sp) +/* 05228 80A47F58 10000059 */ beq $zero, $zero, .L80A480C0 +/* 0522C 80A47F5C 8FBF002C */ lw $ra, 0x002C($sp) .L80A47F60: /* 05230 80A47F60 25CE6E54 */ addiu $t6, $t6, %lo(func_80A46E54) ## $t6 = 00006E54 -/* 05234 80A47F64 11C20007 */ beq $t6, $v0, .L80A47F84 +/* 05234 80A47F64 11C20007 */ beq $t6, $v0, .L80A47F84 /* 05238 80A47F68 3C0F80A4 */ lui $t7, %hi(func_80A47024) ## $t7 = 80A40000 /* 0523C 80A47F6C 25EF7024 */ addiu $t7, $t7, %lo(func_80A47024) ## $t7 = 80A47024 -/* 05240 80A47F70 11E20004 */ beq $t7, $v0, .L80A47F84 +/* 05240 80A47F70 11E20004 */ beq $t7, $v0, .L80A47F84 /* 05244 80A47F74 3C1880A4 */ lui $t8, %hi(func_80A46DBC) ## $t8 = 80A40000 /* 05248 80A47F78 27186DBC */ addiu $t8, $t8, %lo(func_80A46DBC) ## $t8 = 80A46DBC -/* 0524C 80A47F7C 17020006 */ bne $t8, $v0, .L80A47F98 -/* 05250 80A47F80 8FB90074 */ lw $t9, 0x0074($sp) +/* 0524C 80A47F7C 17020006 */ bne $t8, $v0, .L80A47F98 +/* 05250 80A47F80 8FB90074 */ lw $t9, 0x0074($sp) .L80A47F84: /* 05254 80A47F84 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 05258 80A47F88 0C291EAC */ jal func_80A47AB0 -/* 0525C 80A47F8C 8FA50074 */ lw $a1, 0x0074($sp) -/* 05260 80A47F90 1000004B */ beq $zero, $zero, .L80A480C0 -/* 05264 80A47F94 8FBF002C */ lw $ra, 0x002C($sp) +/* 05258 80A47F88 0C291EAC */ jal func_80A47AB0 +/* 0525C 80A47F8C 8FA50074 */ lw $a1, 0x0074($sp) +/* 05260 80A47F90 1000004B */ beq $zero, $zero, .L80A480C0 +/* 05264 80A47F94 8FBF002C */ lw $ra, 0x002C($sp) .L80A47F98: /* 05268 80A47F98 8F250000 */ lw $a1, 0x0000($t9) ## 00000000 /* 0526C 80A47F9C 3C0680A5 */ lui $a2, %hi(D_80A4862C) ## $a2 = 80A50000 /* 05270 80A47FA0 24C6862C */ addiu $a2, $a2, %lo(D_80A4862C) ## $a2 = 80A4862C /* 05274 80A47FA4 27A40040 */ addiu $a0, $sp, 0x0040 ## $a0 = FFFFFFD0 /* 05278 80A47FA8 24070BF7 */ addiu $a3, $zero, 0x0BF7 ## $a3 = 00000BF7 -/* 0527C 80A47FAC 0C031AB1 */ jal func_800C6AC4 -/* 05280 80A47FB0 AFA50050 */ sw $a1, 0x0050($sp) -/* 05284 80A47FB4 8FA90074 */ lw $t1, 0x0074($sp) -/* 05288 80A47FB8 0C024F46 */ jal func_80093D18 +/* 0527C 80A47FAC 0C031AB1 */ jal Graph_OpenDisps +/* 05280 80A47FB0 AFA50050 */ sw $a1, 0x0050($sp) +/* 05284 80A47FB4 8FA90074 */ lw $t1, 0x0074($sp) +/* 05288 80A47FB8 0C024F46 */ jal func_80093D18 /* 0528C 80A47FBC 8D240000 */ lw $a0, 0x0000($t1) ## 00000000 -/* 05290 80A47FC0 8FA80050 */ lw $t0, 0x0050($sp) +/* 05290 80A47FC0 8FA80050 */ lw $t0, 0x0050($sp) /* 05294 80A47FC4 3C0BDB06 */ lui $t3, 0xDB06 ## $t3 = DB060000 /* 05298 80A47FC8 356B0020 */ ori $t3, $t3, 0x0020 ## $t3 = DB060020 /* 0529C 80A47FCC 8D0302C0 */ lw $v1, 0x02C0($t0) ## 000002C0 @@ -90,19 +90,19 @@ glabel EnGo2_Draw /* 052B4 80A47FE4 920C0214 */ lbu $t4, 0x0214($s0) ## 00000214 /* 052B8 80A47FE8 3C0500FF */ lui $a1, 0x00FF ## $a1 = 00FF0000 /* 052BC 80A47FEC 34A5FFFF */ ori $a1, $a1, 0xFFFF ## $a1 = 00FFFFFF -/* 052C0 80A47FF0 000C6880 */ sll $t5, $t4, 2 -/* 052C4 80A47FF4 03AD2021 */ addu $a0, $sp, $t5 +/* 052C0 80A47FF0 000C6880 */ sll $t5, $t4, 2 +/* 052C4 80A47FF4 03AD2021 */ addu $a0, $sp, $t5 /* 052C8 80A47FF8 8C84005C */ lw $a0, 0x005C($a0) ## 0000005C /* 052CC 80A47FFC 3C078000 */ lui $a3, 0x8000 ## $a3 = 80000000 -/* 052D0 80A48000 00047900 */ sll $t7, $a0, 4 -/* 052D4 80A48004 000FC702 */ srl $t8, $t7, 28 -/* 052D8 80A48008 0018C880 */ sll $t9, $t8, 2 -/* 052DC 80A4800C 00D94821 */ addu $t1, $a2, $t9 +/* 052D0 80A48000 00047900 */ sll $t7, $a0, 4 +/* 052D4 80A48004 000FC702 */ srl $t8, $t7, 28 +/* 052D8 80A48008 0018C880 */ sll $t9, $t8, 2 +/* 052DC 80A4800C 00D94821 */ addu $t1, $a2, $t9 /* 052E0 80A48010 8D2A0000 */ lw $t2, 0x0000($t1) ## 00000000 -/* 052E4 80A48014 00857024 */ and $t6, $a0, $a1 +/* 052E4 80A48014 00857024 */ and $t6, $a0, $a1 /* 052E8 80A48018 3C0FDB06 */ lui $t7, 0xDB06 ## $t7 = DB060000 -/* 052EC 80A4801C 01CA5821 */ addu $t3, $t6, $t2 -/* 052F0 80A48020 01676021 */ addu $t4, $t3, $a3 +/* 052EC 80A4801C 01CA5821 */ addu $t3, $t6, $t2 +/* 052F0 80A48020 01676021 */ addu $t4, $t3, $a3 /* 052F4 80A48024 AC6C0004 */ sw $t4, 0x0004($v1) ## 00000004 /* 052F8 80A48028 8D0302C0 */ lw $v1, 0x02C0($t0) ## 000002C0 /* 052FC 80A4802C 35EF0024 */ ori $t7, $t7, 0x0024 ## $t7 = DB060024 @@ -110,41 +110,41 @@ glabel EnGo2_Draw /* 05304 80A48034 AD0D02C0 */ sw $t5, 0x02C0($t0) ## 000002C0 /* 05308 80A48038 AC6F0000 */ sw $t7, 0x0000($v1) ## 00000000 /* 0530C 80A4803C 92180215 */ lbu $t8, 0x0215($s0) ## 00000215 -/* 05310 80A48040 0018C880 */ sll $t9, $t8, 2 -/* 05314 80A48044 03B92021 */ addu $a0, $sp, $t9 +/* 05310 80A48040 0018C880 */ sll $t9, $t8, 2 +/* 05314 80A48044 03B92021 */ addu $a0, $sp, $t9 /* 05318 80A48048 8C840054 */ lw $a0, 0x0054($a0) ## 00000054 /* 0531C 80A4804C 3C1980A4 */ lui $t9, %hi(func_80A47C20) ## $t9 = 80A40000 /* 05320 80A48050 27397C20 */ addiu $t9, $t9, %lo(func_80A47C20) ## $t9 = 80A47C20 -/* 05324 80A48054 00047100 */ sll $t6, $a0, 4 -/* 05328 80A48058 000E5702 */ srl $t2, $t6, 28 -/* 0532C 80A4805C 000A5880 */ sll $t3, $t2, 2 -/* 05330 80A48060 00CB6021 */ addu $t4, $a2, $t3 +/* 05324 80A48054 00047100 */ sll $t6, $a0, 4 +/* 05328 80A48058 000E5702 */ srl $t2, $t6, 28 +/* 0532C 80A4805C 000A5880 */ sll $t3, $t2, 2 +/* 05330 80A48060 00CB6021 */ addu $t4, $a2, $t3 /* 05334 80A48064 8D8D0000 */ lw $t5, 0x0000($t4) ## 00000000 -/* 05338 80A48068 00854824 */ and $t1, $a0, $a1 +/* 05338 80A48068 00854824 */ and $t1, $a0, $a1 /* 0533C 80A4806C 3C0E80A4 */ lui $t6, %hi(func_80A47E34) ## $t6 = 80A40000 -/* 05340 80A48070 012D7821 */ addu $t7, $t1, $t5 -/* 05344 80A48074 01E7C021 */ addu $t8, $t7, $a3 +/* 05340 80A48070 012D7821 */ addu $t7, $t1, $t5 +/* 05344 80A48074 01E7C021 */ addu $t8, $t7, $a3 /* 05348 80A48078 AC780004 */ sw $t8, 0x0004($v1) ## 00000004 /* 0534C 80A4807C 9207014E */ lbu $a3, 0x014E($s0) ## 0000014E /* 05350 80A48080 8E06016C */ lw $a2, 0x016C($s0) ## 0000016C /* 05354 80A48084 8E050150 */ lw $a1, 0x0150($s0) ## 00000150 /* 05358 80A48088 25CE7E34 */ addiu $t6, $t6, %lo(func_80A47E34) ## $t6 = 80A47E34 -/* 0535C 80A4808C AFAE0014 */ sw $t6, 0x0014($sp) -/* 05360 80A48090 AFB00018 */ sw $s0, 0x0018($sp) -/* 05364 80A48094 AFB90010 */ sw $t9, 0x0010($sp) -/* 05368 80A48098 0C0286B2 */ jal func_800A1AC8 -/* 0536C 80A4809C 8FA40074 */ lw $a0, 0x0074($sp) -/* 05370 80A480A0 8FAA0074 */ lw $t2, 0x0074($sp) +/* 0535C 80A4808C AFAE0014 */ sw $t6, 0x0014($sp) +/* 05360 80A48090 AFB00018 */ sw $s0, 0x0018($sp) +/* 05364 80A48094 AFB90010 */ sw $t9, 0x0010($sp) +/* 05368 80A48098 0C0286B2 */ jal SkelAnime_DrawSV +/* 0536C 80A4809C 8FA40074 */ lw $a0, 0x0074($sp) +/* 05370 80A480A0 8FAA0074 */ lw $t2, 0x0074($sp) /* 05374 80A480A4 3C0680A5 */ lui $a2, %hi(D_80A4863C) ## $a2 = 80A50000 /* 05378 80A480A8 24C6863C */ addiu $a2, $a2, %lo(D_80A4863C) ## $a2 = 80A4863C /* 0537C 80A480AC 27A40040 */ addiu $a0, $sp, 0x0040 ## $a0 = FFFFFFD0 /* 05380 80A480B0 24070C09 */ addiu $a3, $zero, 0x0C09 ## $a3 = 00000C09 -/* 05384 80A480B4 0C031AD5 */ jal func_800C6B54 +/* 05384 80A480B4 0C031AD5 */ jal Graph_CloseDisps /* 05388 80A480B8 8D450000 */ lw $a1, 0x0000($t2) ## 00000000 -/* 0538C 80A480BC 8FBF002C */ lw $ra, 0x002C($sp) +/* 0538C 80A480BC 8FBF002C */ lw $ra, 0x002C($sp) .L80A480C0: -/* 05390 80A480C0 8FB00028 */ lw $s0, 0x0028($sp) +/* 05390 80A480C0 8FB00028 */ lw $s0, 0x0028($sp) /* 05394 80A480C4 27BD0070 */ addiu $sp, $sp, 0x0070 ## $sp = 00000000 -/* 05398 80A480C8 03E00008 */ jr $ra +/* 05398 80A480C8 03E00008 */ jr $ra /* 0539C 80A480CC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go2/EnGo2_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Go2/EnGo2_Init.s index d97761a761..8acd371999 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Go2/EnGo2_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Go2/EnGo2_Init.s @@ -1,74 +1,74 @@ glabel EnGo2_Init /* 0379C 80A464CC 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 -/* 037A0 80A464D0 AFB00028 */ sw $s0, 0x0028($sp) +/* 037A0 80A464D0 AFB00028 */ sw $s0, 0x0028($sp) /* 037A4 80A464D4 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 037A8 80A464D8 AFBF002C */ sw $ra, 0x002C($sp) -/* 037AC 80A464DC AFA50044 */ sw $a1, 0x0044($sp) +/* 037A8 80A464D8 AFBF002C */ sw $ra, 0x002C($sp) +/* 037AC 80A464DC AFA50044 */ sw $a1, 0x0044($sp) /* 037B0 80A464E0 3C068003 */ lui $a2, 0x8003 ## $a2 = 80030000 /* 037B4 80A464E4 24C6B5EC */ addiu $a2, $a2, 0xB5EC ## $a2 = 8002B5EC /* 037B8 80A464E8 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 /* 037BC 80A464EC 248400B4 */ addiu $a0, $a0, 0x00B4 ## $a0 = 000000B4 /* 037C0 80A464F0 0C00AC78 */ jal ActorShape_Init - + /* 037C4 80A464F4 3C0741E0 */ lui $a3, 0x41E0 ## $a3 = 41E00000 /* 037C8 80A464F8 2605014C */ addiu $a1, $s0, 0x014C ## $a1 = 0000014C /* 037CC 80A464FC 3C060601 */ lui $a2, 0x0601 ## $a2 = 06010000 /* 037D0 80A46500 260E04B8 */ addiu $t6, $s0, 0x04B8 ## $t6 = 000004B8 /* 037D4 80A46504 260F0524 */ addiu $t7, $s0, 0x0524 ## $t7 = 00000524 /* 037D8 80A46508 24180012 */ addiu $t8, $zero, 0x0012 ## $t8 = 00000012 -/* 037DC 80A4650C AFB80018 */ sw $t8, 0x0018($sp) -/* 037E0 80A46510 AFAF0014 */ sw $t7, 0x0014($sp) -/* 037E4 80A46514 AFAE0010 */ sw $t6, 0x0010($sp) +/* 037DC 80A4650C AFB80018 */ sw $t8, 0x0018($sp) +/* 037E0 80A46510 AFAF0014 */ sw $t7, 0x0014($sp) +/* 037E4 80A46514 AFAE0010 */ sw $t6, 0x0010($sp) /* 037E8 80A46518 24C6FEF0 */ addiu $a2, $a2, 0xFEF0 ## $a2 = 0600FEF0 -/* 037EC 80A4651C AFA50034 */ sw $a1, 0x0034($sp) -/* 037F0 80A46520 8FA40044 */ lw $a0, 0x0044($sp) -/* 037F4 80A46524 0C0291BE */ jal func_800A46F8 +/* 037EC 80A4651C AFA50034 */ sw $a1, 0x0034($sp) +/* 037F0 80A46520 8FA40044 */ lw $a0, 0x0044($sp) +/* 037F4 80A46524 0C0291BE */ jal SkelAnime_InitSV /* 037F8 80A46528 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 /* 037FC 80A4652C 260501BC */ addiu $a1, $s0, 0x01BC ## $a1 = 000001BC -/* 03800 80A46530 AFA50030 */ sw $a1, 0x0030($sp) +/* 03800 80A46530 AFA50030 */ sw $a1, 0x0030($sp) /* 03804 80A46534 0C0170D9 */ jal ActorCollider_AllocCylinder - -/* 03808 80A46538 8FA40044 */ lw $a0, 0x0044($sp) + +/* 03808 80A46538 8FA40044 */ lw $a0, 0x0044($sp) /* 0380C 80A4653C 3C0780A5 */ lui $a3, %hi(D_80A48114) ## $a3 = 80A50000 -/* 03810 80A46540 8FA50030 */ lw $a1, 0x0030($sp) +/* 03810 80A46540 8FA50030 */ lw $a1, 0x0030($sp) /* 03814 80A46544 24E78114 */ addiu $a3, $a3, %lo(D_80A48114) ## $a3 = 80A48114 -/* 03818 80A46548 8FA40044 */ lw $a0, 0x0044($sp) +/* 03818 80A46548 8FA40044 */ lw $a0, 0x0044($sp) /* 0381C 80A4654C 0C01712B */ jal ActorCollider_InitCylinder - + /* 03820 80A46550 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 03824 80A46554 3C0680A5 */ lui $a2, %hi(D_80A48140) ## $a2 = 80A50000 /* 03828 80A46558 24C68140 */ addiu $a2, $a2, %lo(D_80A48140) ## $a2 = 80A48140 /* 0382C 80A4655C 26040098 */ addiu $a0, $s0, 0x0098 ## $a0 = 00000098 -/* 03830 80A46560 0C0187BF */ jal func_80061EFC +/* 03830 80A46560 0C0187BF */ jal func_80061EFC /* 03834 80A46564 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 03838 80A46568 8619001C */ lh $t9, 0x001C($s0) ## 0000001C /* 0383C 80A4656C 3328001F */ andi $t0, $t9, 0x001F ## $t0 = 00000000 /* 03840 80A46570 2509FFFD */ addiu $t1, $t0, 0xFFFD ## $t1 = FFFFFFFD -/* 03844 80A46574 2D21000B */ sltiu $at, $t1, 0x000B -/* 03848 80A46578 1020000D */ beq $at, $zero, .L80A465B0 -/* 0384C 80A4657C 00094880 */ sll $t1, $t1, 2 +/* 03844 80A46574 2D21000B */ sltiu $at, $t1, 0x000B +/* 03848 80A46578 1020000D */ beq $at, $zero, .L80A465B0 +/* 0384C 80A4657C 00094880 */ sll $t1, $t1, 2 /* 03850 80A46580 3C0180A5 */ lui $at, %hi(jtbl_80A4872C) ## $at = 80A50000 -/* 03854 80A46584 00290821 */ addu $at, $at, $t1 -/* 03858 80A46588 8C29872C */ lw $t1, %lo(jtbl_80A4872C)($at) -/* 0385C 80A4658C 01200008 */ jr $t1 +/* 03854 80A46584 00290821 */ addu $at, $at, $t1 +/* 03858 80A46588 8C29872C */ lw $t1, %lo(jtbl_80A4872C)($at) +/* 0385C 80A4658C 01200008 */ jr $t1 /* 03860 80A46590 00000000 */ nop glabel L80A46594 /* 03864 80A46594 8E0A0004 */ lw $t2, 0x0004($s0) ## 00000004 /* 03868 80A46598 2401FFEF */ addiu $at, $zero, 0xFFEF ## $at = FFFFFFEF -/* 0386C 80A4659C 01415824 */ and $t3, $t2, $at +/* 0386C 80A4659C 01415824 */ and $t3, $t2, $at /* 03870 80A465A0 2401FFDF */ addiu $at, $zero, 0xFFDF ## $at = FFFFFFDF /* 03874 80A465A4 AE0B0004 */ sw $t3, 0x0004($s0) ## 00000004 -/* 03878 80A465A8 01616824 */ and $t5, $t3, $at +/* 03878 80A465A8 01616824 */ and $t5, $t3, $at /* 0387C 80A465AC AE0D0004 */ sw $t5, 0x0004($s0) ## 00000004 .L80A465B0: -/* 03880 80A465B0 0C291223 */ jal func_80A4488C +/* 03880 80A465B0 0C291223 */ jal func_80A4488C /* 03884 80A465B4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 03888 80A465B8 0C291231 */ jal func_80A448C4 +/* 03888 80A465B8 0C291231 */ jal func_80A448C4 /* 0388C 80A465BC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 03890 80A465C0 3C0580A5 */ lui $a1, %hi(D_80A48348) ## $a1 = 80A50000 /* 03894 80A465C4 24A58348 */ addiu $a1, $a1, %lo(D_80A48348) ## $a1 = 80A48348 -/* 03898 80A465C8 8FA40034 */ lw $a0, 0x0034($sp) -/* 0389C 80A465CC 0C00D3B0 */ jal func_80034EC0 +/* 03898 80A465C8 8FA40034 */ lw $a0, 0x0034($sp) +/* 0389C 80A465CC 0C00D3B0 */ jal func_80034EC0 /* 038A0 80A465D0 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 /* 038A4 80A465D4 3C01BF80 */ lui $at, 0xBF80 ## $at = BF800000 /* 038A8 80A465D8 300E00FF */ andi $t6, $zero, 0x00FF ## $t6 = 00000000 @@ -76,18 +76,18 @@ glabel L80A46594 /* 038B0 80A465E0 448E3000 */ mtc1 $t6, $f6 ## $f6 = 0.00 /* 038B4 80A465E4 A20000C8 */ sb $zero, 0x00C8($s0) ## 000000C8 /* 038B8 80A465E8 E604006C */ swc1 $f4, 0x006C($s0) ## 0000006C -/* 038BC 80A465EC 05C10005 */ bgez $t6, .L80A46604 -/* 038C0 80A465F0 46803220 */ cvt.s.w $f8, $f6 +/* 038BC 80A465EC 05C10005 */ bgez $t6, .L80A46604 +/* 038C0 80A465F0 46803220 */ cvt.s.w $f8, $f6 /* 038C4 80A465F4 3C014F80 */ lui $at, 0x4F80 ## $at = 4F800000 /* 038C8 80A465F8 44815000 */ mtc1 $at, $f10 ## $f10 = 4294967296.00 /* 038CC 80A465FC 00000000 */ nop -/* 038D0 80A46600 460A4200 */ add.s $f8, $f8, $f10 +/* 038D0 80A46600 460A4200 */ add.s $f8, $f8, $f10 .L80A46604: /* 038D4 80A46604 8605001C */ lh $a1, 0x001C($s0) ## 0000001C /* 038D8 80A46608 860F00B8 */ lh $t7, 0x00B8($s0) ## 000000B8 /* 038DC 80A4660C 24180001 */ addiu $t8, $zero, 0x0001 ## $t8 = 00000001 /* 038E0 80A46610 30A503E0 */ andi $a1, $a1, 0x03E0 ## $a1 = 00000000 -/* 038E4 80A46614 00052943 */ sra $a1, $a1, 5 +/* 038E4 80A46614 00052943 */ sra $a1, $a1, 5 /* 038E8 80A46618 E6080220 */ swc1 $f8, 0x0220($s0) ## 00000220 /* 038EC 80A4661C A200020E */ sb $zero, 0x020E($s0) ## 0000020E /* 038F0 80A46620 A200020F */ sb $zero, 0x020F($s0) ## 0000020F @@ -95,22 +95,22 @@ glabel L80A46594 /* 038F8 80A46628 A2000212 */ sb $zero, 0x0212($s0) ## 00000212 /* 038FC 80A4662C A2000210 */ sb $zero, 0x0210($s0) ## 00000210 /* 03900 80A46630 A618026E */ sh $t8, 0x026E($s0) ## 0000026E -/* 03904 80A46634 00052C00 */ sll $a1, $a1, 16 +/* 03904 80A46634 00052C00 */ sll $a1, $a1, 16 /* 03908 80A46638 A20F0216 */ sb $t7, 0x0216($s0) ## 00000216 -/* 0390C 80A4663C 8FA40044 */ lw $a0, 0x0044($sp) -/* 03910 80A46640 00052C03 */ sra $a1, $a1, 16 -/* 03914 80A46644 0C023938 */ jal func_8008E4E0 +/* 0390C 80A4663C 8FA40044 */ lw $a0, 0x0044($sp) +/* 03910 80A46640 00052C03 */ sra $a1, $a1, 16 +/* 03914 80A46644 0C023938 */ jal Path_GetByIndex /* 03918 80A46648 2406001F */ addiu $a2, $zero, 0x001F ## $a2 = 0000001F /* 0391C 80A4664C 8603001C */ lh $v1, 0x001C($s0) ## 0000001C /* 03920 80A46650 AE020208 */ sw $v0, 0x0208($s0) ## 00000208 /* 03924 80A46654 3066001F */ andi $a2, $v1, 0x001F ## $a2 = 00000000 -/* 03928 80A46658 2CC1000E */ sltiu $at, $a2, 0x000E -/* 0392C 80A4665C 102000B8 */ beq $at, $zero, .L80A46940 -/* 03930 80A46660 0006C880 */ sll $t9, $a2, 2 +/* 03928 80A46658 2CC1000E */ sltiu $at, $a2, 0x000E +/* 0392C 80A4665C 102000B8 */ beq $at, $zero, .L80A46940 +/* 03930 80A46660 0006C880 */ sll $t9, $a2, 2 /* 03934 80A46664 3C0180A5 */ lui $at, %hi(jtbl_80A48758) ## $at = 80A50000 -/* 03938 80A46668 00390821 */ addu $at, $at, $t9 -/* 0393C 80A4666C 8C398758 */ lw $t9, %lo(jtbl_80A48758)($at) -/* 03940 80A46670 03200008 */ jr $t9 +/* 03938 80A46668 00390821 */ addu $at, $at, $t9 +/* 0393C 80A4666C 8C398758 */ lw $t9, %lo(jtbl_80A48758)($at) +/* 03940 80A46670 03200008 */ jr $t9 /* 03944 80A46674 00000000 */ nop glabel L80A46678 /* 03948 80A46678 3C038016 */ lui $v1, 0x8016 ## $v1 = 80160000 @@ -118,54 +118,54 @@ glabel L80A46678 /* 03950 80A46680 3C088012 */ lui $t0, 0x8012 ## $t0 = 80120000 /* 03954 80A46684 8D087124 */ lw $t0, 0x7124($t0) ## 80127124 /* 03958 80A46688 8C6900A4 */ lw $t1, 0x00A4($v1) ## 8015E704 -/* 0395C 80A4668C 01095024 */ and $t2, $t0, $t1 -/* 03960 80A46690 15400006 */ bne $t2, $zero, .L80A466AC +/* 0395C 80A4668C 01095024 */ and $t2, $t0, $t1 +/* 03960 80A46690 15400006 */ bne $t2, $zero, .L80A466AC /* 03964 80A46694 00000000 */ nop /* 03968 80A46698 8C6B0004 */ lw $t3, 0x0004($v1) ## 8015E664 -/* 0396C 80A4669C 15600003 */ bne $t3, $zero, .L80A466AC +/* 0396C 80A4669C 15600003 */ bne $t3, $zero, .L80A466AC /* 03970 80A466A0 00000000 */ nop /* 03974 80A466A4 0C00B55C */ jal Actor_Kill - + /* 03978 80A466A8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 .L80A466AC: /* 0397C 80A466AC 3C0C80A4 */ lui $t4, %hi(func_80A4696C) ## $t4 = 80A40000 /* 03980 80A466B0 258C696C */ addiu $t4, $t4, %lo(func_80A4696C) ## $t4 = 80A4696C -/* 03984 80A466B4 100000A5 */ beq $zero, $zero, .L80A4694C +/* 03984 80A466B4 100000A5 */ beq $zero, $zero, .L80A4694C /* 03988 80A466B8 AE0C0190 */ sw $t4, 0x0190($s0) ## 00000190 glabel L80A466BC /* 0398C 80A466BC 3C038016 */ lui $v1, 0x8016 ## $v1 = 80160000 /* 03990 80A466C0 2463E660 */ addiu $v1, $v1, 0xE660 ## $v1 = 8015E660 /* 03994 80A466C4 8C6D0004 */ lw $t5, 0x0004($v1) ## 8015E664 /* 03998 80A466C8 3C0E8012 */ lui $t6, 0x8012 ## $t6 = 80120000 -/* 0399C 80A466CC 11A00006 */ beq $t5, $zero, .L80A466E8 +/* 0399C 80A466CC 11A00006 */ beq $t5, $zero, .L80A466E8 /* 039A0 80A466D0 00000000 */ nop /* 039A4 80A466D4 8DCE716C */ lw $t6, 0x716C($t6) ## 8012716C /* 039A8 80A466D8 8C6F00A4 */ lw $t7, 0x00A4($v1) ## 8015E704 -/* 039AC 80A466DC 01CFC024 */ and $t8, $t6, $t7 -/* 039B0 80A466E0 57000004 */ bnel $t8, $zero, .L80A466F4 +/* 039AC 80A466DC 01CFC024 */ and $t8, $t6, $t7 +/* 039B0 80A466E0 57000004 */ bnel $t8, $zero, .L80A466F4 /* 039B4 80A466E4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 .L80A466E8: /* 039B8 80A466E8 0C00B55C */ jal Actor_Kill - + /* 039BC 80A466EC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 039C0 80A466F0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 .L80A466F4: -/* 039C4 80A466F4 0C291750 */ jal func_80A45D40 -/* 039C8 80A466F8 8FA50044 */ lw $a1, 0x0044($sp) -/* 039CC 80A466FC 10000094 */ beq $zero, $zero, .L80A46950 -/* 039D0 80A46700 8FBF002C */ lw $ra, 0x002C($sp) +/* 039C4 80A466F4 0C291750 */ jal func_80A45D40 +/* 039C8 80A466F8 8FA50044 */ lw $a1, 0x0044($sp) +/* 039CC 80A466FC 10000094 */ beq $zero, $zero, .L80A46950 +/* 039D0 80A46700 8FBF002C */ lw $ra, 0x002C($sp) glabel L80A46704 /* 039D4 80A46704 3C038016 */ lui $v1, 0x8016 ## $v1 = 80160000 /* 039D8 80A46708 2463E660 */ addiu $v1, $v1, 0xE660 ## $v1 = 8015E660 /* 039DC 80A4670C 94620F18 */ lhu $v0, 0x0F18($v1) ## 8015F578 /* 039E0 80A46710 26050024 */ addiu $a1, $s0, 0x0024 ## $a1 = 00000024 /* 039E4 80A46714 30590200 */ andi $t9, $v0, 0x0200 ## $t9 = 00000000 -/* 039E8 80A46718 53200024 */ beql $t9, $zero, .L80A467AC +/* 039E8 80A46718 53200024 */ beql $t9, $zero, .L80A467AC /* 039EC 80A4671C 3059EFFF */ andi $t9, $v0, 0xEFFF ## $t9 = 00000000 /* 039F0 80A46720 8E040208 */ lw $a0, 0x0208($s0) ## 00000208 -/* 039F4 80A46724 0C023983 */ jal func_8008E60C -/* 039F8 80A46728 AFA50030 */ sw $a1, 0x0030($sp) -/* 039FC 80A4672C 8FA50030 */ lw $a1, 0x0030($sp) +/* 039F4 80A46724 0C023983 */ jal Path_CopyLastPoint +/* 039F8 80A46728 AFA50030 */ sw $a1, 0x0030($sp) +/* 039FC 80A4672C 8FA50030 */ lw $a1, 0x0030($sp) /* 03A00 80A46730 3C038016 */ lui $v1, 0x8016 ## $v1 = 80160000 /* 03A04 80A46734 2463E660 */ addiu $v1, $v1, 0xE660 ## $v1 = 8015E660 /* 03A08 80A46738 8CA90000 */ lw $t1, 0x0000($a1) ## 00000000 @@ -180,22 +180,22 @@ glabel L80A46704 /* 03A2C 80A4675C AE090010 */ sw $t1, 0x0010($s0) ## 00000010 /* 03A30 80A46760 8C6A00A4 */ lw $t2, 0x00A4($v1) ## 8015E704 /* 03A34 80A46764 8C427124 */ lw $v0, 0x7124($v0) ## 80127124 -/* 03A38 80A46768 004A5824 */ and $t3, $v0, $t2 -/* 03A3C 80A4676C 1560000C */ bne $t3, $zero, .L80A467A0 +/* 03A38 80A46768 004A5824 */ and $t3, $v0, $t2 +/* 03A3C 80A4676C 1560000C */ bne $t3, $zero, .L80A467A0 /* 03A40 80A46770 00000000 */ nop /* 03A44 80A46774 918C71F2 */ lbu $t4, 0x71F2($t4) ## 801271F2 /* 03A48 80A46778 946E009C */ lhu $t6, 0x009C($v1) ## 8015E6FC /* 03A4C 80A4677C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 03A50 80A46780 01826804 */ sllv $t5, $v0, $t4 -/* 03A54 80A46784 01AE7824 */ and $t7, $t5, $t6 -/* 03A58 80A46788 11E00005 */ beq $t7, $zero, .L80A467A0 +/* 03A50 80A46780 01826804 */ sllv $t5, $v0, $t4 +/* 03A54 80A46784 01AE7824 */ and $t7, $t5, $t6 +/* 03A58 80A46788 11E00005 */ beq $t7, $zero, .L80A467A0 /* 03A5C 80A4678C 00000000 */ nop -/* 03A60 80A46790 0C291750 */ jal func_80A45D40 -/* 03A64 80A46794 8FA50044 */ lw $a1, 0x0044($sp) -/* 03A68 80A46798 1000006D */ beq $zero, $zero, .L80A46950 -/* 03A6C 80A4679C 8FBF002C */ lw $ra, 0x002C($sp) +/* 03A60 80A46790 0C291750 */ jal func_80A45D40 +/* 03A64 80A46794 8FA50044 */ lw $a1, 0x0044($sp) +/* 03A68 80A46798 1000006D */ beq $zero, $zero, .L80A46950 +/* 03A6C 80A4679C 8FBF002C */ lw $ra, 0x002C($sp) .L80A467A0: -/* 03A70 80A467A0 1000006A */ beq $zero, $zero, .L80A4694C +/* 03A70 80A467A0 1000006A */ beq $zero, $zero, .L80A4694C /* 03A74 80A467A4 AE180190 */ sw $t8, 0x0190($s0) ## 00000190 /* 03A78 80A467A8 3059EFFF */ andi $t9, $v0, 0xEFFF ## $t9 = 00000000 .L80A467AC: @@ -204,91 +204,91 @@ glabel L80A46704 /* 03A84 80A467B4 3C0B80A5 */ lui $t3, %hi(D_80A48174) ## $t3 = 80A50000 /* 03A88 80A467B8 3C0180A5 */ lui $at, %hi(D_80A48790) ## $at = 80A50000 /* 03A8C 80A467BC 3109001F */ andi $t1, $t0, 0x001F ## $t1 = 00000000 -/* 03A90 80A467C0 00095080 */ sll $t2, $t1, 2 -/* 03A94 80A467C4 01495021 */ addu $t2, $t2, $t1 -/* 03A98 80A467C8 000A5040 */ sll $t2, $t2, 1 -/* 03A9C 80A467CC 016A5821 */ addu $t3, $t3, $t2 -/* 03AA0 80A467D0 856B8174 */ lh $t3, %lo(D_80A48174)($t3) -/* 03AA4 80A467D4 C4248790 */ lwc1 $f4, %lo(D_80A48790)($at) +/* 03A90 80A467C0 00095080 */ sll $t2, $t1, 2 +/* 03A94 80A467C4 01495021 */ addu $t2, $t2, $t1 +/* 03A98 80A467C8 000A5040 */ sll $t2, $t2, 1 +/* 03A9C 80A467CC 016A5821 */ addu $t3, $t3, $t2 +/* 03AA0 80A467D0 856B8174 */ lh $t3, %lo(D_80A48174)($t3) +/* 03AA4 80A467D4 C4248790 */ lwc1 $f4, %lo(D_80A48790)($at) /* 03AA8 80A467D8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 03AAC 80A467DC 448B8000 */ mtc1 $t3, $f16 ## $f16 = -0.00 /* 03AB0 80A467E0 00000000 */ nop -/* 03AB4 80A467E4 468084A0 */ cvt.s.w $f18, $f16 -/* 03AB8 80A467E8 46049182 */ mul.s $f6, $f18, $f4 -/* 03ABC 80A467EC 4600328D */ trunc.w.s $f10, $f6 -/* 03AC0 80A467F0 440D5000 */ mfc1 $t5, $f10 +/* 03AB4 80A467E4 468084A0 */ cvt.s.w $f18, $f16 +/* 03AB8 80A467E8 46049182 */ mul.s $f6, $f18, $f4 +/* 03ABC 80A467EC 4600328D */ trunc.w.s $f10, $f6 +/* 03AC0 80A467F0 440D5000 */ mfc1 $t5, $f10 /* 03AC4 80A467F4 00000000 */ nop /* 03AC8 80A467F8 A60D01FE */ sh $t5, 0x01FE($s0) ## 000001FE -/* 03ACC 80A467FC 0C291769 */ jal func_80A45DA4 -/* 03AD0 80A46800 8FA50044 */ lw $a1, 0x0044($sp) +/* 03ACC 80A467FC 0C291769 */ jal func_80A45DA4 +/* 03AD0 80A46800 8FA50044 */ lw $a1, 0x0044($sp) /* 03AD4 80A46804 240E0001 */ addiu $t6, $zero, 0x0001 ## $t6 = 00000001 -/* 03AD8 80A46808 10000050 */ beq $zero, $zero, .L80A4694C +/* 03AD8 80A46808 10000050 */ beq $zero, $zero, .L80A4694C /* 03ADC 80A4680C A20E020F */ sb $t6, 0x020F($s0) ## 0000020F glabel L80A46810 -/* 03AE0 80A46810 00067880 */ sll $t7, $a2, 2 -/* 03AE4 80A46814 01E67821 */ addu $t7, $t7, $a2 -/* 03AE8 80A46818 000F7840 */ sll $t7, $t7, 1 +/* 03AE0 80A46810 00067880 */ sll $t7, $a2, 2 +/* 03AE4 80A46814 01E67821 */ addu $t7, $t7, $a2 +/* 03AE8 80A46818 000F7840 */ sll $t7, $t7, 1 /* 03AEC 80A4681C 3C1880A5 */ lui $t8, %hi(D_80A48174) ## $t8 = 80A50000 -/* 03AF0 80A46820 030FC021 */ addu $t8, $t8, $t7 -/* 03AF4 80A46824 87188174 */ lh $t8, %lo(D_80A48174)($t8) +/* 03AF0 80A46820 030FC021 */ addu $t8, $t8, $t7 +/* 03AF4 80A46824 87188174 */ lh $t8, %lo(D_80A48174)($t8) /* 03AF8 80A46828 3C0180A5 */ lui $at, %hi(D_80A48794) ## $at = 80A50000 -/* 03AFC 80A4682C C4328794 */ lwc1 $f18, %lo(D_80A48794)($at) +/* 03AFC 80A4682C C4328794 */ lwc1 $f18, %lo(D_80A48794)($at) /* 03B00 80A46830 44984000 */ mtc1 $t8, $f8 ## $f8 = -0.00 /* 03B04 80A46834 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 03B08 80A46838 46804420 */ cvt.s.w $f16, $f8 -/* 03B0C 80A4683C 46128102 */ mul.s $f4, $f16, $f18 -/* 03B10 80A46840 4600218D */ trunc.w.s $f6, $f4 -/* 03B14 80A46844 44083000 */ mfc1 $t0, $f6 +/* 03B08 80A46838 46804420 */ cvt.s.w $f16, $f8 +/* 03B0C 80A4683C 46128102 */ mul.s $f4, $f16, $f18 +/* 03B10 80A46840 4600218D */ trunc.w.s $f6, $f4 +/* 03B14 80A46844 44083000 */ mfc1 $t0, $f6 /* 03B18 80A46848 00000000 */ nop /* 03B1C 80A4684C A60801FE */ sh $t0, 0x01FE($s0) ## 000001FE -/* 03B20 80A46850 0C291769 */ jal func_80A45DA4 -/* 03B24 80A46854 8FA50044 */ lw $a1, 0x0044($sp) -/* 03B28 80A46858 1000003D */ beq $zero, $zero, .L80A46950 -/* 03B2C 80A4685C 8FBF002C */ lw $ra, 0x002C($sp) +/* 03B20 80A46850 0C291769 */ jal func_80A45DA4 +/* 03B24 80A46854 8FA50044 */ lw $a1, 0x0044($sp) +/* 03B28 80A46858 1000003D */ beq $zero, $zero, .L80A46950 +/* 03B2C 80A4685C 8FBF002C */ lw $ra, 0x002C($sp) glabel L80A46860 /* 03B30 80A46860 3065FC00 */ andi $a1, $v1, 0xFC00 ## $a1 = 00000000 -/* 03B34 80A46864 00052A83 */ sra $a1, $a1, 10 +/* 03B34 80A46864 00052A83 */ sra $a1, $a1, 10 /* 03B38 80A46868 0C00B2D0 */ jal Flags_GetSwitch - -/* 03B3C 80A4686C 8FA40044 */ lw $a0, 0x0044($sp) -/* 03B40 80A46870 10400005 */ beq $v0, $zero, .L80A46888 + +/* 03B3C 80A4686C 8FA40044 */ lw $a0, 0x0044($sp) +/* 03B40 80A46870 10400005 */ beq $v0, $zero, .L80A46888 /* 03B44 80A46874 24090001 */ addiu $t1, $zero, 0x0001 ## $t1 = 00000001 /* 03B48 80A46878 0C00B55C */ jal Actor_Kill - + /* 03B4C 80A4687C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 03B50 80A46880 10000033 */ beq $zero, $zero, .L80A46950 -/* 03B54 80A46884 8FBF002C */ lw $ra, 0x002C($sp) +/* 03B50 80A46880 10000033 */ beq $zero, $zero, .L80A46950 +/* 03B54 80A46884 8FBF002C */ lw $ra, 0x002C($sp) .L80A46888: /* 03B58 80A46888 3C0A80A4 */ lui $t2, %hi(func_80A4696C) ## $t2 = 80A40000 /* 03B5C 80A4688C 254A696C */ addiu $t2, $t2, %lo(func_80A4696C) ## $t2 = 80A4696C /* 03B60 80A46890 A209020F */ sb $t1, 0x020F($s0) ## 0000020F -/* 03B64 80A46894 1000002D */ beq $zero, $zero, .L80A4694C +/* 03B64 80A46894 1000002D */ beq $zero, $zero, .L80A4694C /* 03B68 80A46898 AE0A0190 */ sw $t2, 0x0190($s0) ## 00000190 glabel L80A4689C /* 03B6C 80A4689C 8E0B0004 */ lw $t3, 0x0004($s0) ## 00000004 /* 03B70 80A468A0 2401FFFE */ addiu $at, $zero, 0xFFFE ## $at = FFFFFFFE /* 03B74 80A468A4 AE0000C0 */ sw $zero, 0x00C0($s0) ## 000000C0 -/* 03B78 80A468A8 01616024 */ and $t4, $t3, $at +/* 03B78 80A468A8 01616024 */ and $t4, $t3, $at /* 03B7C 80A468AC AE0C0004 */ sw $t4, 0x0004($s0) ## 00000004 /* 03B80 80A468B0 3C0D8012 */ lui $t5, 0x8012 ## $t5 = 80120000 /* 03B84 80A468B4 91AD7491 */ lbu $t5, 0x7491($t5) ## 80127491 /* 03B88 80A468B8 3C038016 */ lui $v1, 0x8016 ## $v1 = 80160000 /* 03B8C 80A468BC 2463E660 */ addiu $v1, $v1, 0xE660 ## $v1 = 8015E660 -/* 03B90 80A468C0 006D7021 */ addu $t6, $v1, $t5 +/* 03B90 80A468C0 006D7021 */ addu $t6, $v1, $t5 /* 03B94 80A468C4 91C20074 */ lbu $v0, 0x0074($t6) ## 00000074 /* 03B98 80A468C8 3C1980A4 */ lui $t9, %hi(func_80A4696C) ## $t9 = 80A40000 /* 03B9C 80A468CC 2418000D */ addiu $t8, $zero, 0x000D ## $t8 = 0000000D -/* 03BA0 80A468D0 28410033 */ slti $at, $v0, 0x0033 -/* 03BA4 80A468D4 14200005 */ bne $at, $zero, .L80A468EC +/* 03BA0 80A468D0 28410033 */ slti $at, $v0, 0x0033 +/* 03BA4 80A468D4 14200005 */ bne $at, $zero, .L80A468EC /* 03BA8 80A468D8 2739696C */ addiu $t9, $t9, %lo(func_80A4696C) ## $t9 = 80A4696C -/* 03BAC 80A468DC 28410037 */ slti $at, $v0, 0x0037 -/* 03BB0 80A468E0 10200002 */ beq $at, $zero, .L80A468EC +/* 03BAC 80A468DC 28410037 */ slti $at, $v0, 0x0037 +/* 03BB0 80A468E0 10200002 */ beq $at, $zero, .L80A468EC /* 03BB4 80A468E4 240F0001 */ addiu $t7, $zero, 0x0001 ## $t7 = 00000001 /* 03BB8 80A468E8 A20F0213 */ sb $t7, 0x0213($s0) ## 00000213 .L80A468EC: /* 03BBC 80A468EC A20001CD */ sb $zero, 0x01CD($s0) ## 000001CD /* 03BC0 80A468F0 A21801CE */ sb $t8, 0x01CE($s0) ## 000001CE -/* 03BC4 80A468F4 10000015 */ beq $zero, $zero, .L80A4694C +/* 03BC4 80A468F4 10000015 */ beq $zero, $zero, .L80A4694C /* 03BC8 80A468F8 AE190190 */ sw $t9, 0x0190($s0) ## 00000190 glabel L80A468FC /* 03BCC 80A468FC 3C038016 */ lui $v1, 0x8016 ## $v1 = 80160000 @@ -296,12 +296,12 @@ glabel L80A468FC /* 03BD4 80A46904 94680F14 */ lhu $t0, 0x0F14($v1) ## 8015F574 /* 03BD8 80A46908 26050024 */ addiu $a1, $s0, 0x0024 ## $a1 = 00000024 /* 03BDC 80A4690C 31090800 */ andi $t1, $t0, 0x0800 ## $t1 = 00000000 -/* 03BE0 80A46910 1120000B */ beq $t1, $zero, .L80A46940 +/* 03BE0 80A46910 1120000B */ beq $t1, $zero, .L80A46940 /* 03BE4 80A46914 00000000 */ nop /* 03BE8 80A46918 8E040208 */ lw $a0, 0x0208($s0) ## 00000208 -/* 03BEC 80A4691C 0C023983 */ jal func_8008E60C -/* 03BF0 80A46920 AFA50030 */ sw $a1, 0x0030($sp) -/* 03BF4 80A46924 8FA50030 */ lw $a1, 0x0030($sp) +/* 03BEC 80A4691C 0C023983 */ jal Path_CopyLastPoint +/* 03BF0 80A46920 AFA50030 */ sw $a1, 0x0030($sp) +/* 03BF4 80A46924 8FA50030 */ lw $a1, 0x0030($sp) /* 03BF8 80A46928 8CAB0000 */ lw $t3, 0x0000($a1) ## 00000000 /* 03BFC 80A4692C AE0B0008 */ sw $t3, 0x0008($s0) ## 00000008 /* 03C00 80A46930 8CAA0004 */ lw $t2, 0x0004($a1) ## 00000004 @@ -314,11 +314,11 @@ glabel L80A46940 /* 03C14 80A46944 258C696C */ addiu $t4, $t4, %lo(func_80A4696C) ## $t4 = 80A4696C /* 03C18 80A46948 AE0C0190 */ sw $t4, 0x0190($s0) ## 00000190 .L80A4694C: -/* 03C1C 80A4694C 8FBF002C */ lw $ra, 0x002C($sp) +/* 03C1C 80A4694C 8FBF002C */ lw $ra, 0x002C($sp) .L80A46950: -/* 03C20 80A46950 8FB00028 */ lw $s0, 0x0028($sp) +/* 03C20 80A46950 8FB00028 */ lw $s0, 0x0028($sp) /* 03C24 80A46954 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 -/* 03C28 80A46958 03E00008 */ jr $ra +/* 03C28 80A46958 03E00008 */ jr $ra /* 03C2C 80A4695C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A42EE0.s b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A42EE0.s index d3d702b6c8..85bd1e7a0b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A42EE0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A42EE0.s @@ -20,7 +20,7 @@ glabel func_80A42EE0 /* 001F8 80A42F28 24C68590 */ addiu $a2, $a2, %lo(D_80A48590) ## $a2 = 80A48590 /* 001FC 80A42F2C 27A40088 */ addiu $a0, $sp, 0x0088 ## $a0 = FFFFFFE0 /* 00200 80A42F30 2407006F */ addiu $a3, $zero, 0x006F ## $a3 = 0000006F -/* 00204 80A42F34 0C031AB1 */ jal func_800C6AC4 +/* 00204 80A42F34 0C031AB1 */ jal Graph_OpenDisps /* 00208 80A42F38 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 /* 0020C 80A42F3C 0000B825 */ or $s7, $zero, $zero ## $s7 = 00000000 /* 00210 80A42F40 0C024F61 */ jal func_80093D84 @@ -46,7 +46,7 @@ glabel func_80A42EE0 /* 0025C 80A42F8C 2631FD40 */ addiu $s1, $s1, 0xFD40 ## $s1 = 0600FD40 /* 00260 80A42F90 8E0402D0 */ lw $a0, 0x02D0($s0) ## 000002D0 /* 00264 80A42F94 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 00268 80A42F98 0C024DDD */ jal func_80093774 +/* 00268 80A42F98 0C024DDD */ jal Gfx_CallSetupDL /* 0026C 80A42F9C 24170001 */ addiu $s7, $zero, 0x0001 ## $s7 = 00000001 /* 00270 80A42FA0 AE0202D0 */ sw $v0, 0x02D0($s0) ## 000002D0 /* 00274 80A42FA4 244F0008 */ addiu $t7, $v0, 0x0008 ## $t7 = 00000008 @@ -192,7 +192,7 @@ glabel func_80A42EE0 /* 0048C 80A431BC 24C685B8 */ addiu $a2, $a2, %lo(D_80A485B8) ## $a2 = 80A485B8 /* 00490 80A431C0 27A40088 */ addiu $a0, $sp, 0x0088 ## $a0 = FFFFFFE0 /* 00494 80A431C4 8FC50000 */ lw $a1, 0x0000($s8) ## 00000000 -/* 00498 80A431C8 0C031AD5 */ jal func_800C6B54 +/* 00498 80A431C8 0C031AD5 */ jal Graph_CloseDisps /* 0049C 80A431CC 24070097 */ addiu $a3, $zero, 0x0097 ## $a3 = 00000097 /* 004A0 80A431D0 8FBF0054 */ lw $ra, 0x0054($sp) /* 004A4 80A431D4 D7B40018 */ ldc1 $f20, 0x0018($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A44534.s b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A44534.s index ef1c644677..5ea3206311 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A44534.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A44534.s @@ -4,7 +4,7 @@ glabel func_80A44534 /* 0180C 80A4453C 00A03025 */ or $a2, $a1, $zero ## $a2 = 00000000 /* 01810 80A44540 AFA6001C */ sw $a2, 0x001C($sp) /* 01814 80A44544 24050020 */ addiu $a1, $zero, 0x0020 ## $a1 = 00000020 -/* 01818 80A44548 0C01B0D8 */ jal func_8006C360 +/* 01818 80A44548 0C01B0D8 */ jal Text_GetFaceReaction /* 0181C 80A4454C AFA40018 */ sw $a0, 0x0018($sp) /* 01820 80A44550 8FA40018 */ lw $a0, 0x0018($sp) /* 01824 80A44554 8FA6001C */ lw $a2, 0x001C($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A44CE4.s b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A44CE4.s index d96f5c0c85..9d49909f94 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A44CE4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A44CE4.s @@ -6,7 +6,7 @@ glabel func_80A44CE4 /* 01FC4 80A44CF4 AFA50034 */ sw $a1, 0x0034($sp) /* 01FC8 80A44CF8 82060210 */ lb $a2, 0x0210($s0) ## 00000210 /* 01FCC 80A44CFC 8E050208 */ lw $a1, 0x0208($s0) ## 00000208 -/* 01FD0 80A44D00 0C023948 */ jal func_8008E520 +/* 01FD0 80A44D00 0C023948 */ jal Path_OrientAndGetDistSq /* 01FD4 80A44D04 27A7002E */ addiu $a3, $sp, 0x002E ## $a3 = FFFFFFFE /* 01FD8 80A44D08 240E0001 */ addiu $t6, $zero, 0x0001 ## $t6 = 00000001 /* 01FDC 80A44D0C AFAE0010 */ sw $t6, 0x0010($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A44D84.s b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A44D84.s index 052d649445..beeb0ef6ec 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A44D84.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A44D84.s @@ -4,7 +4,7 @@ glabel func_80A44D84 /* 0205C 80A44D8C 80860210 */ lb $a2, 0x0210($a0) ## 00000210 /* 02060 80A44D90 8C850208 */ lw $a1, 0x0208($a0) ## 00000208 /* 02064 80A44D94 AFA40020 */ sw $a0, 0x0020($sp) -/* 02068 80A44D98 0C023948 */ jal func_8008E520 +/* 02068 80A44D98 0C023948 */ jal Path_OrientAndGetDistSq /* 0206C 80A44D9C 27A7001E */ addiu $a3, $sp, 0x001E ## $a3 = FFFFFFFE /* 02070 80A44DA0 8FA40020 */ lw $a0, 0x0020($sp) /* 02074 80A44DA4 87AE001E */ lh $t6, 0x001E($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A462D8.s b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A462D8.s index 103d1fe5c8..3446757b4f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A462D8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A462D8.s @@ -17,7 +17,7 @@ glabel func_80A462D8 /* 035E4 80A46314 24060007 */ addiu $a2, $zero, 0x0007 ## $a2 = 00000007 /* 035E8 80A46318 8E040208 */ lw $a0, 0x0208($s0) ## 00000208 /* 035EC 80A4631C 260504AC */ addiu $a1, $s0, 0x04AC ## $a1 = 000004AC -/* 035F0 80A46320 0C023983 */ jal func_8008E60C +/* 035F0 80A46320 0C023983 */ jal Path_CopyLastPoint /* 035F4 80A46324 AFA50020 */ sw $a1, 0x0020($sp) /* 035F8 80A46328 26040024 */ addiu $a0, $s0, 0x0024 ## $a0 = 00000024 /* 035FC 80A4632C 0C01E01A */ jal Math_Vec3f_Yaw diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A4696C.s b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A4696C.s index f3c9edfe03..7eaf2d880c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A4696C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A4696C.s @@ -22,22 +22,22 @@ glabel func_80A4696C /* 03C8C 80A469BC 24050003 */ addiu $a1, $zero, 0x0003 ## $a1 = 00000003 /* 03C90 80A469C0 00084880 */ sll $t1, $t0, 2 /* 03C94 80A469C4 00495021 */ addu $t2, $v0, $t1 -/* 03C98 80A469C8 0C024BE2 */ jal func_80092F88 +/* 03C98 80A469C8 0C024BE2 */ jal Quake_Add /* 03C9C 80A469CC 8D440790 */ lw $a0, 0x0790($t2) ## 00000790 /* 03CA0 80A469D0 00022400 */ sll $a0, $v0, 16 /* 03CA4 80A469D4 AFA20030 */ sw $v0, 0x0030($sp) /* 03CA8 80A469D8 00042403 */ sra $a0, $a0, 16 -/* 03CAC 80A469DC 0C024B6B */ jal func_80092DAC +/* 03CAC 80A469DC 0C024B6B */ jal Quake_SetSpeed /* 03CB0 80A469E0 2405C350 */ addiu $a1, $zero, 0xC350 ## $a1 = FFFFC350 /* 03CB4 80A469E4 87A40032 */ lh $a0, 0x0032($sp) /* 03CB8 80A469E8 24050008 */ addiu $a1, $zero, 0x0008 ## $a1 = 00000008 /* 03CBC 80A469EC 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 /* 03CC0 80A469F0 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 /* 03CC4 80A469F4 AFA00010 */ sw $zero, 0x0010($sp) -/* 03CC8 80A469F8 0C024B9C */ jal func_80092E70 +/* 03CC8 80A469F8 0C024B9C */ jal Quake_SetQuakeValues /* 03CCC 80A469FC AFA4002C */ sw $a0, 0x002C($sp) /* 03CD0 80A46A00 8FA4002C */ lw $a0, 0x002C($sp) -/* 03CD4 80A46A04 0C024B7C */ jal func_80092DF0 +/* 03CD4 80A46A04 0C024B7C */ jal Quake_SetCountdown /* 03CD8 80A46A08 24050010 */ addiu $a1, $zero, 0x0010 ## $a1 = 00000010 /* 03CDC 80A46A0C 10000004 */ beq $zero, $zero, .L80A46A20 /* 03CE0 80A46A10 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A479B0.s b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A479B0.s index a2963690e2..1246dc00f7 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A479B0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A479B0.s @@ -19,7 +19,7 @@ glabel func_80A479B0 /* 04CC4 80A479F4 27A40030 */ addiu $a0, $sp, 0x0030 ## $a0 = FFFFFFE0 /* 04CC8 80A479F8 8D050000 */ lw $a1, 0x0000($t0) ## 00000000 /* 04CCC 80A479FC 24070B41 */ addiu $a3, $zero, 0x0B41 ## $a3 = 00000B41 -/* 04CD0 80A47A00 0C031AB1 */ jal func_800C6AC4 +/* 04CD0 80A47A00 0C031AB1 */ jal Graph_OpenDisps /* 04CD4 80A47A04 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 /* 04CD8 80A47A08 8FA90054 */ lw $t1, 0x0054($sp) /* 04CDC 80A47A0C 0C024F46 */ jal func_80093D18 @@ -52,7 +52,7 @@ glabel func_80A479B0 /* 04D48 80A47A78 24C685EC */ addiu $a2, $a2, %lo(D_80A485EC) ## $a2 = 80A485EC /* 04D4C 80A47A7C 27A40030 */ addiu $a0, $sp, 0x0030 ## $a0 = FFFFFFE0 /* 04D50 80A47A80 24070B49 */ addiu $a3, $zero, 0x0B49 ## $a3 = 00000B49 -/* 04D54 80A47A84 0C031AD5 */ jal func_800C6B54 +/* 04D54 80A47A84 0C031AD5 */ jal Graph_CloseDisps /* 04D58 80A47A88 8F050000 */ lw $a1, 0x0000($t8) ## 00000000 /* 04D5C 80A47A8C 8FA50050 */ lw $a1, 0x0050($sp) /* 04D60 80A47A90 27A40044 */ addiu $a0, $sp, 0x0044 ## $a0 = FFFFFFF4 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A47AB0.s b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A47AB0.s index ad3db466a2..e9d939ea0f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A47AB0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Go2/func_80A47AB0.s @@ -1,10 +1,10 @@ glabel func_80A47AB0 /* 04D80 80A47AB0 27BDFFA8 */ addiu $sp, $sp, 0xFFA8 ## $sp = FFFFFFA8 /* 04D84 80A47AB4 3C0F80A5 */ lui $t7, %hi(D_80A48560) ## $t7 = 80A50000 -/* 04D88 80A47AB8 AFBF001C */ sw $ra, 0x001C($sp) -/* 04D8C 80A47ABC AFB10018 */ sw $s1, 0x0018($sp) -/* 04D90 80A47AC0 AFB00014 */ sw $s0, 0x0014($sp) -/* 04D94 80A47AC4 AFA40058 */ sw $a0, 0x0058($sp) +/* 04D88 80A47AB8 AFBF001C */ sw $ra, 0x001C($sp) +/* 04D8C 80A47ABC AFB10018 */ sw $s1, 0x0018($sp) +/* 04D90 80A47AC0 AFB00014 */ sw $s0, 0x0014($sp) +/* 04D94 80A47AC4 AFA40058 */ sw $a0, 0x0058($sp) /* 04D98 80A47AC8 25EF8560 */ addiu $t7, $t7, %lo(D_80A48560) ## $t7 = 80A48560 /* 04D9C 80A47ACC 8DF90000 */ lw $t9, 0x0000($t7) ## 80A48560 /* 04DA0 80A47AD0 27AE0048 */ addiu $t6, $sp, 0x0048 ## $t6 = FFFFFFF0 @@ -19,42 +19,42 @@ glabel func_80A47AB0 /* 04DC4 80A47AF4 24C685FC */ addiu $a2, $a2, %lo(D_80A485FC) ## $a2 = 80A485FC /* 04DC8 80A47AF8 27A40030 */ addiu $a0, $sp, 0x0030 ## $a0 = FFFFFFD8 /* 04DCC 80A47AFC 24070B62 */ addiu $a3, $zero, 0x0B62 ## $a3 = 00000B62 -/* 04DD0 80A47B00 0C031AB1 */ jal func_800C6AC4 +/* 04DD0 80A47B00 0C031AB1 */ jal Graph_OpenDisps /* 04DD4 80A47B04 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 -/* 04DD8 80A47B08 0C024F46 */ jal func_80093D18 +/* 04DD8 80A47B08 0C024F46 */ jal func_80093D18 /* 04DDC 80A47B0C 8E240000 */ lw $a0, 0x0000($s1) ## 00000000 -/* 04DE0 80A47B10 8FA20058 */ lw $v0, 0x0058($sp) +/* 04DE0 80A47B10 8FA20058 */ lw $v0, 0x0058($sp) /* 04DE4 80A47B14 3C0880A4 */ lui $t0, %hi(func_80A47024) ## $t0 = 80A40000 /* 04DE8 80A47B18 25087024 */ addiu $t0, $t0, %lo(func_80A47024) ## $t0 = 80A47024 /* 04DEC 80A47B1C 8C490190 */ lw $t1, 0x0190($v0) ## 00000190 -/* 04DF0 80A47B20 55090005 */ bnel $t0, $t1, .L80A47B38 +/* 04DF0 80A47B20 55090005 */ bnel $t0, $t1, .L80A47B38 /* 04DF4 80A47B24 C4400068 */ lwc1 $f0, 0x0068($v0) ## 00000068 /* 04DF8 80A47B28 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 04DFC 80A47B2C 10000003 */ beq $zero, $zero, .L80A47B3C -/* 04E00 80A47B30 4600010D */ trunc.w.s $f4, $f0 +/* 04DFC 80A47B2C 10000003 */ beq $zero, $zero, .L80A47B3C +/* 04E00 80A47B30 4600010D */ trunc.w.s $f4, $f0 /* 04E04 80A47B34 C4400068 */ lwc1 $f0, 0x0068($v0) ## 00000068 .L80A47B38: -/* 04E08 80A47B38 4600010D */ trunc.w.s $f4, $f0 +/* 04E08 80A47B38 4600010D */ trunc.w.s $f4, $f0 .L80A47B3C: /* 04E0C 80A47B3C 8E2A009C */ lw $t2, 0x009C($s1) ## 0000009C /* 04E10 80A47B40 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 04E14 80A47B44 844600B8 */ lh $a2, 0x00B8($v0) ## 000000B8 -/* 04E18 80A47B48 440C2000 */ mfc1 $t4, $f4 +/* 04E18 80A47B48 440C2000 */ mfc1 $t4, $f4 /* 04E1C 80A47B4C 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 04E20 80A47B50 000C6C00 */ sll $t5, $t4, 16 -/* 04E24 80A47B54 000D7403 */ sra $t6, $t5, 16 -/* 04E28 80A47B58 000E7880 */ sll $t7, $t6, 2 -/* 04E2C 80A47B5C 01EE7823 */ subu $t7, $t7, $t6 -/* 04E30 80A47B60 000F7880 */ sll $t7, $t7, 2 -/* 04E34 80A47B64 01EE7823 */ subu $t7, $t7, $t6 -/* 04E38 80A47B68 000F7900 */ sll $t7, $t7, 4 -/* 04E3C 80A47B6C 01EE7823 */ subu $t7, $t7, $t6 -/* 04E40 80A47B70 000F78C0 */ sll $t7, $t7, 3 -/* 04E44 80A47B74 014F0019 */ multu $t2, $t7 -/* 04E48 80A47B78 00002012 */ mflo $a0 -/* 04E4C 80A47B7C 00042400 */ sll $a0, $a0, 16 -/* 04E50 80A47B80 0C034421 */ jal Matrix_RotateXYZ -/* 04E54 80A47B84 00042403 */ sra $a0, $a0, 16 +/* 04E20 80A47B50 000C6C00 */ sll $t5, $t4, 16 +/* 04E24 80A47B54 000D7403 */ sra $t6, $t5, 16 +/* 04E28 80A47B58 000E7880 */ sll $t7, $t6, 2 +/* 04E2C 80A47B5C 01EE7823 */ subu $t7, $t7, $t6 +/* 04E30 80A47B60 000F7880 */ sll $t7, $t7, 2 +/* 04E34 80A47B64 01EE7823 */ subu $t7, $t7, $t6 +/* 04E38 80A47B68 000F7900 */ sll $t7, $t7, 4 +/* 04E3C 80A47B6C 01EE7823 */ subu $t7, $t7, $t6 +/* 04E40 80A47B70 000F78C0 */ sll $t7, $t7, 3 +/* 04E44 80A47B74 014F0019 */ multu $t2, $t7 +/* 04E48 80A47B78 00002012 */ mflo $a0 +/* 04E4C 80A47B7C 00042400 */ sll $a0, $a0, 16 +/* 04E50 80A47B80 0C034421 */ jal Matrix_RotateZYX +/* 04E54 80A47B84 00042403 */ sra $a0, $a0, 16 /* 04E58 80A47B88 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 /* 04E5C 80A47B8C 3C19DA38 */ lui $t9, 0xDA38 ## $t9 = DA380000 /* 04E60 80A47B90 37390003 */ ori $t9, $t9, 0x0003 ## $t9 = DA380003 @@ -65,9 +65,9 @@ glabel func_80A47AB0 /* 04E74 80A47BA4 3C0580A5 */ lui $a1, %hi(D_80A4860C) ## $a1 = 80A50000 /* 04E78 80A47BA8 24A5860C */ addiu $a1, $a1, %lo(D_80A4860C) ## $a1 = 80A4860C /* 04E7C 80A47BAC 24060B6E */ addiu $a2, $zero, 0x0B6E ## $a2 = 00000B6E -/* 04E80 80A47BB0 0C0346A2 */ jal Matrix_NewMtx -/* 04E84 80A47BB4 AFA2002C */ sw $v0, 0x002C($sp) -/* 04E88 80A47BB8 8FA3002C */ lw $v1, 0x002C($sp) +/* 04E80 80A47BB0 0C0346A2 */ jal Matrix_NewMtx +/* 04E84 80A47BB4 AFA2002C */ sw $v0, 0x002C($sp) +/* 04E88 80A47BB8 8FA3002C */ lw $v1, 0x002C($sp) /* 04E8C 80A47BBC 3C0B0601 */ lui $t3, 0x0601 ## $t3 = 06010000 /* 04E90 80A47BC0 256BC140 */ addiu $t3, $t3, 0xC140 ## $t3 = 0600C140 /* 04E94 80A47BC4 AC620004 */ sw $v0, 0x0004($v1) ## 00000004 @@ -81,17 +81,17 @@ glabel func_80A47AB0 /* 04EB4 80A47BE4 8E250000 */ lw $a1, 0x0000($s1) ## 00000000 /* 04EB8 80A47BE8 24C6861C */ addiu $a2, $a2, %lo(D_80A4861C) ## $a2 = 80A4861C /* 04EBC 80A47BEC 27A40030 */ addiu $a0, $sp, 0x0030 ## $a0 = FFFFFFD8 -/* 04EC0 80A47BF0 0C031AD5 */ jal func_800C6B54 +/* 04EC0 80A47BF0 0C031AD5 */ jal Graph_CloseDisps /* 04EC4 80A47BF4 24070B72 */ addiu $a3, $zero, 0x0B72 ## $a3 = 00000B72 -/* 04EC8 80A47BF8 8FA50058 */ lw $a1, 0x0058($sp) +/* 04EC8 80A47BF8 8FA50058 */ lw $a1, 0x0058($sp) /* 04ECC 80A47BFC 27A40048 */ addiu $a0, $sp, 0x0048 ## $a0 = FFFFFFF0 -/* 04ED0 80A47C00 0C0346BD */ jal Matrix_MultVec3f +/* 04ED0 80A47C00 0C0346BD */ jal Matrix_MultVec3f /* 04ED4 80A47C04 24A50038 */ addiu $a1, $a1, 0x0038 ## $a1 = 00000038 -/* 04ED8 80A47C08 8FBF001C */ lw $ra, 0x001C($sp) -/* 04EDC 80A47C0C 8FB00014 */ lw $s0, 0x0014($sp) -/* 04EE0 80A47C10 8FB10018 */ lw $s1, 0x0018($sp) +/* 04ED8 80A47C08 8FBF001C */ lw $ra, 0x001C($sp) +/* 04EDC 80A47C0C 8FB00014 */ lw $s0, 0x0014($sp) +/* 04EE0 80A47C10 8FB10018 */ lw $s1, 0x0018($sp) /* 04EE4 80A47C14 27BD0058 */ addiu $sp, $sp, 0x0058 ## $sp = 00000000 -/* 04EE8 80A47C18 03E00008 */ jr $ra +/* 04EE8 80A47C18 03E00008 */ jr $ra /* 04EEC 80A47C1C 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Goma/EnGoma_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Goma/EnGoma_Draw.s index 9437cd0761..f1fb55dd08 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Goma/EnGoma_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Goma/EnGoma_Draw.s @@ -10,7 +10,7 @@ glabel EnGoma_Draw /* 02038 80A4AEF8 24C6B8A0 */ addiu $a2, $a2, %lo(D_80A4B8A0) ## $a2 = 80A4B8A0 /* 0203C 80A4AEFC 27A40058 */ addiu $a0, $sp, 0x0058 ## $a0 = FFFFFFE0 /* 02040 80A4AF00 240707F8 */ addiu $a3, $zero, 0x07F8 ## $a3 = 000007F8 -/* 02044 80A4AF04 0C031AB1 */ jal func_800C6AC4 +/* 02044 80A4AF04 0C031AB1 */ jal Graph_OpenDisps /* 02048 80A4AF08 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 /* 0204C 80A4AF0C 8FAF007C */ lw $t7, 0x007C($sp) /* 02050 80A4AF10 0C024F46 */ jal func_80093D18 @@ -309,7 +309,7 @@ glabel EnGoma_Draw /* 024C4 80A4B384 24C6B8E0 */ addiu $a2, $a2, %lo(D_80A4B8E0) ## $a2 = 80A4B8E0 /* 024C8 80A4B388 27A40058 */ addiu $a0, $sp, 0x0058 ## $a0 = FFFFFFE0 /* 024CC 80A4B38C 24070847 */ addiu $a3, $zero, 0x0847 ## $a3 = 00000847 -/* 024D0 80A4B390 0C031AD5 */ jal func_800C6B54 +/* 024D0 80A4B390 0C031AD5 */ jal Graph_CloseDisps /* 024D4 80A4B394 8D650000 */ lw $a1, 0x0000($t3) ## 00000000 /* 024D8 80A4B398 8FBF0024 */ lw $ra, 0x0024($sp) /* 024DC 80A4B39C 8FB0001C */ lw $s0, 0x001C($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Goma/EnGoma_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Goma/EnGoma_Init.s index 89ff947d8d..18facb88f5 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Goma/EnGoma_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Goma/EnGoma_Init.s @@ -1,66 +1,66 @@ glabel EnGoma_Init /* 00000 80A48EC0 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 -/* 00004 80A48EC4 AFBF002C */ sw $ra, 0x002C($sp) -/* 00008 80A48EC8 AFB00028 */ sw $s0, 0x0028($sp) +/* 00004 80A48EC4 AFBF002C */ sw $ra, 0x002C($sp) +/* 00008 80A48EC8 AFB00028 */ sw $s0, 0x0028($sp) /* 0000C 80A48ECC 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 00010 80A48ED0 0C03F66B */ jal Math_Rand_ZeroOne ## Rand.Next() float -/* 00014 80A48ED4 AFA50044 */ sw $a1, 0x0044($sp) +/* 00014 80A48ED4 AFA50044 */ sw $a1, 0x0044($sp) /* 00018 80A48ED8 3C014348 */ lui $at, 0x4348 ## $at = 43480000 /* 0001C 80A48EDC 44812000 */ mtc1 $at, $f4 ## $f4 = 200.00 /* 00020 80A48EE0 3C0580A5 */ lui $a1, %hi(D_80A4B808) ## $a1 = 80A50000 /* 00024 80A48EE4 24A5B808 */ addiu $a1, $a1, %lo(D_80A4B808) ## $a1 = 80A4B808 -/* 00028 80A48EE8 46040182 */ mul.s $f6, $f0, $f4 +/* 00028 80A48EE8 46040182 */ mul.s $f6, $f0, $f4 /* 0002C 80A48EEC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00030 80A48EF0 4600320D */ trunc.w.s $f8, $f6 -/* 00034 80A48EF4 440F4000 */ mfc1 $t7, $f8 +/* 00030 80A48EF0 4600320D */ trunc.w.s $f8, $f6 +/* 00034 80A48EF4 440F4000 */ mfc1 $t7, $f8 /* 00038 80A48EF8 0C01E037 */ jal Actor_ProcessInitChain - + /* 0003C 80A48EFC A60F02C0 */ sh $t7, 0x02C0($s0) ## 000002C0 /* 00040 80A48F00 3C053C23 */ lui $a1, 0x3C23 ## $a1 = 3C230000 /* 00044 80A48F04 34A5D70A */ ori $a1, $a1, 0xD70A ## $a1 = 3C23D70A /* 00048 80A48F08 0C00B58B */ jal Actor_SetScale - + /* 0004C 80A48F0C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 00050 80A48F10 8602001C */ lh $v0, 0x001C($s0) ## 0000001C -/* 00054 80A48F14 8FA40044 */ lw $a0, 0x0044($sp) +/* 00054 80A48F14 8FA40044 */ lw $a0, 0x0044($sp) /* 00058 80A48F18 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 -/* 0005C 80A48F1C 28410064 */ slti $at, $v0, 0x0064 -/* 00060 80A48F20 14200017 */ bne $at, $zero, .L80A48F80 +/* 0005C 80A48F1C 28410064 */ slti $at, $v0, 0x0064 +/* 00060 80A48F20 14200017 */ bne $at, $zero, .L80A48F80 /* 00064 80A48F24 24851C24 */ addiu $a1, $a0, 0x1C24 ## $a1 = 00001C24 /* 00068 80A48F28 0C00CDD2 */ jal Actor_ChangeType - + /* 0006C 80A48F2C 24070009 */ addiu $a3, $zero, 0x0009 ## $a3 = 00000009 /* 00070 80A48F30 44801000 */ mtc1 $zero, $f2 ## $f2 = 0.00 /* 00074 80A48F34 3C1880A5 */ lui $t8, %hi(func_80A4B554) ## $t8 = 80A50000 /* 00078 80A48F38 2718B554 */ addiu $t8, $t8, %lo(func_80A4B554) ## $t8 = 80A4B554 /* 0007C 80A48F3C 24190003 */ addiu $t9, $zero, 0x0003 ## $t9 = 00000003 /* 00080 80A48F40 3C068003 */ lui $a2, 0x8003 ## $a2 = 80030000 -/* 00084 80A48F44 44051000 */ mfc1 $a1, $f2 -/* 00088 80A48F48 44071000 */ mfc1 $a3, $f2 +/* 00084 80A48F44 44051000 */ mfc1 $a1, $f2 +/* 00088 80A48F48 44071000 */ mfc1 $a3, $f2 /* 0008C 80A48F4C AE1802B0 */ sw $t8, 0x02B0($s0) ## 000002B0 /* 00090 80A48F50 A61902B8 */ sh $t9, 0x02B8($s0) ## 000002B8 /* 00094 80A48F54 24C6B5EC */ addiu $a2, $a2, 0xB5EC ## $a2 = 8002B5EC /* 00098 80A48F58 0C00AC78 */ jal ActorShape_Init - + /* 0009C 80A48F5C 260400B4 */ addiu $a0, $s0, 0x00B4 ## $a0 = 000000B4 /* 000A0 80A48F60 8608001C */ lh $t0, 0x001C($s0) ## 0000001C /* 000A4 80A48F64 8E0A0004 */ lw $t2, 0x0004($s0) ## 00000004 /* 000A8 80A48F68 2401FFFE */ addiu $at, $zero, 0xFFFE ## $at = FFFFFFFE /* 000AC 80A48F6C 25090096 */ addiu $t1, $t0, 0x0096 ## $t1 = 00000096 -/* 000B0 80A48F70 01415824 */ and $t3, $t2, $at +/* 000B0 80A48F70 01415824 */ and $t3, $t2, $at /* 000B4 80A48F74 A60902CC */ sh $t1, 0x02CC($s0) ## 000002CC -/* 000B8 80A48F78 100000AE */ beq $zero, $zero, .L80A49234 +/* 000B8 80A48F78 100000AE */ beq $zero, $zero, .L80A49234 /* 000BC 80A48F7C AE0B0004 */ sw $t3, 0x0004($s0) ## 00000004 .L80A48F80: -/* 000C0 80A48F80 2841000A */ slti $at, $v0, 0x000A -/* 000C4 80A48F84 14200043 */ bne $at, $zero, .L80A49094 +/* 000C0 80A48F80 2841000A */ slti $at, $v0, 0x000A +/* 000C4 80A48F84 14200043 */ bne $at, $zero, .L80A49094 /* 000C8 80A48F88 260400B4 */ addiu $a0, $s0, 0x00B4 ## $a0 = 000000B4 /* 000CC 80A48F8C 8E0C0004 */ lw $t4, 0x0004($s0) ## 00000004 /* 000D0 80A48F90 3C0180A5 */ lui $at, %hi(D_80A4B8F0) ## $at = 80A50000 -/* 000D4 80A48F94 C42AB8F0 */ lwc1 $f10, %lo(D_80A4B8F0)($at) +/* 000D4 80A48F94 C42AB8F0 */ lwc1 $f10, %lo(D_80A4B8F0)($at) /* 000D8 80A48F98 2401FFFE */ addiu $at, $zero, 0xFFFE ## $at = FFFFFFFE -/* 000DC 80A48F9C 01816824 */ and $t5, $t4, $at +/* 000DC 80A48F9C 01816824 */ and $t5, $t4, $at /* 000E0 80A48FA0 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 /* 000E4 80A48FA4 44818000 */ mtc1 $at, $f16 ## $f16 = 1.00 /* 000E8 80A48FA8 240E0032 */ addiu $t6, $zero, 0x0032 ## $t6 = 00000032 @@ -76,65 +76,65 @@ glabel EnGoma_Init /* 0010C 80A48FCC 44811000 */ mtc1 $at, $f2 ## $f2 = 5.00 /* 00110 80A48FD0 3C1880A5 */ lui $t8, %hi(func_80A4B3AC) ## $t8 = 80A50000 /* 00114 80A48FD4 2718B3AC */ addiu $t8, $t8, %lo(func_80A4B3AC) ## $t8 = 80A4B3AC -/* 00118 80A48FD8 46020482 */ mul.s $f18, $f0, $f2 +/* 00118 80A48FD8 46020482 */ mul.s $f18, $f0, $f2 /* 0011C 80A48FDC AE1802B0 */ sw $t8, 0x02B0($s0) ## 000002B0 -/* 00120 80A48FE0 46029100 */ add.s $f4, $f18, $f2 +/* 00120 80A48FE0 46029100 */ add.s $f4, $f18, $f2 /* 00124 80A48FE4 0C03F66B */ jal Math_Rand_ZeroOne ## Rand.Next() float /* 00128 80A48FE8 E6040060 */ swc1 $f4, 0x0060($s0) ## 00000060 /* 0012C 80A48FEC 3C0180A5 */ lui $at, %hi(D_80A4B8F4) ## $at = 80A50000 -/* 00130 80A48FF0 C426B8F4 */ lwc1 $f6, %lo(D_80A4B8F4)($at) +/* 00130 80A48FF0 C426B8F4 */ lwc1 $f6, %lo(D_80A4B8F4)($at) /* 00134 80A48FF4 3C013FC0 */ lui $at, 0x3FC0 ## $at = 3FC00000 /* 00138 80A48FF8 44815000 */ mtc1 $at, $f10 ## $f10 = 1.50 -/* 0013C 80A48FFC 46060202 */ mul.s $f8, $f0, $f6 +/* 0013C 80A48FFC 46060202 */ mul.s $f8, $f0, $f6 /* 00140 80A49000 2419001E */ addiu $t9, $zero, 0x001E ## $t9 = 0000001E /* 00144 80A49004 A61902CC */ sh $t9, 0x02CC($s0) ## 000002CC -/* 00148 80A49008 460A4400 */ add.s $f16, $f8, $f10 +/* 00148 80A49008 460A4400 */ add.s $f16, $f8, $f10 /* 0014C 80A4900C 0C03F66B */ jal Math_Rand_ZeroOne ## Rand.Next() float /* 00150 80A49010 E6100068 */ swc1 $f16, 0x0068($s0) ## 00000068 /* 00154 80A49014 3C0180A5 */ lui $at, %hi(D_80A4B8F8) ## $at = 80A50000 -/* 00158 80A49018 C432B8F8 */ lwc1 $f18, %lo(D_80A4B8F8)($at) +/* 00158 80A49018 C432B8F8 */ lwc1 $f18, %lo(D_80A4B8F8)($at) /* 0015C 80A4901C 3C0180A5 */ lui $at, %hi(D_80A4B8FC) ## $at = 80A50000 -/* 00160 80A49020 C426B8FC */ lwc1 $f6, %lo(D_80A4B8FC)($at) -/* 00164 80A49024 46120102 */ mul.s $f4, $f0, $f18 -/* 00168 80A49028 46062200 */ add.s $f8, $f4, $f6 +/* 00160 80A49020 C426B8FC */ lwc1 $f6, %lo(D_80A4B8FC)($at) +/* 00164 80A49024 46120102 */ mul.s $f4, $f0, $f18 +/* 00168 80A49028 46062200 */ add.s $f8, $f4, $f6 /* 0016C 80A4902C 0C03F66B */ jal Math_Rand_ZeroOne ## Rand.Next() float /* 00170 80A49030 E6080050 */ swc1 $f8, 0x0050($s0) ## 00000050 /* 00174 80A49034 3C0180A5 */ lui $at, %hi(D_80A4B900) ## $at = 80A50000 -/* 00178 80A49038 C42AB900 */ lwc1 $f10, %lo(D_80A4B900)($at) +/* 00178 80A49038 C42AB900 */ lwc1 $f10, %lo(D_80A4B900)($at) /* 0017C 80A4903C 3C0180A5 */ lui $at, %hi(D_80A4B904) ## $at = 80A50000 -/* 00180 80A49040 C432B904 */ lwc1 $f18, %lo(D_80A4B904)($at) -/* 00184 80A49044 460A0402 */ mul.s $f16, $f0, $f10 -/* 00188 80A49048 46128100 */ add.s $f4, $f16, $f18 +/* 00180 80A49040 C432B904 */ lwc1 $f18, %lo(D_80A4B904)($at) +/* 00184 80A49044 460A0402 */ mul.s $f16, $f0, $f10 +/* 00188 80A49048 46128100 */ add.s $f4, $f16, $f18 /* 0018C 80A4904C 0C03F66B */ jal Math_Rand_ZeroOne ## Rand.Next() float /* 00190 80A49050 E6040054 */ swc1 $f4, 0x0054($s0) ## 00000054 /* 00194 80A49054 3C0180A5 */ lui $at, %hi(D_80A4B908) ## $at = 80A50000 -/* 00198 80A49058 C426B908 */ lwc1 $f6, %lo(D_80A4B908)($at) +/* 00198 80A49058 C426B908 */ lwc1 $f6, %lo(D_80A4B908)($at) /* 0019C 80A4905C 3C0180A5 */ lui $at, %hi(D_80A4B90C) ## $at = 80A50000 -/* 001A0 80A49060 C42AB90C */ lwc1 $f10, %lo(D_80A4B90C)($at) -/* 001A4 80A49064 46060202 */ mul.s $f8, $f0, $f6 +/* 001A0 80A49060 C42AB90C */ lwc1 $f10, %lo(D_80A4B90C)($at) +/* 001A4 80A49064 46060202 */ mul.s $f8, $f0, $f6 /* 001A8 80A49068 44801000 */ mtc1 $zero, $f2 ## $f2 = 0.00 /* 001AC 80A4906C 3C068003 */ lui $a2, 0x8003 ## $a2 = 80030000 /* 001B0 80A49070 24C6B5EC */ addiu $a2, $a2, 0xB5EC ## $a2 = 8002B5EC -/* 001B4 80A49074 44051000 */ mfc1 $a1, $f2 -/* 001B8 80A49078 44071000 */ mfc1 $a3, $f2 +/* 001B4 80A49074 44051000 */ mfc1 $a1, $f2 +/* 001B8 80A49078 44071000 */ mfc1 $a3, $f2 /* 001BC 80A4907C 260400B4 */ addiu $a0, $s0, 0x00B4 ## $a0 = 000000B4 -/* 001C0 80A49080 460A4400 */ add.s $f16, $f8, $f10 +/* 001C0 80A49080 460A4400 */ add.s $f16, $f8, $f10 /* 001C4 80A49084 0C00AC78 */ jal ActorShape_Init - + /* 001C8 80A49088 E6100058 */ swc1 $f16, 0x0058($s0) ## 00000058 -/* 001CC 80A4908C 1000006A */ beq $zero, $zero, .L80A49238 -/* 001D0 80A49090 8FBF002C */ lw $ra, 0x002C($sp) +/* 001CC 80A4908C 1000006A */ beq $zero, $zero, .L80A49238 +/* 001D0 80A49090 8FBF002C */ lw $ra, 0x002C($sp) .L80A49094: /* 001D4 80A49094 44801000 */ mtc1 $zero, $f2 ## $f2 = 0.00 /* 001D8 80A49098 3C068003 */ lui $a2, 0x8003 ## $a2 = 80030000 /* 001DC 80A4909C 24C6B5EC */ addiu $a2, $a2, 0xB5EC ## $a2 = 8002B5EC -/* 001E0 80A490A0 44051000 */ mfc1 $a1, $f2 +/* 001E0 80A490A0 44051000 */ mfc1 $a1, $f2 /* 001E4 80A490A4 0C00AC78 */ jal ActorShape_Init - + /* 001E8 80A490A8 3C074220 */ lui $a3, 0x4220 ## $a3 = 42200000 /* 001EC 80A490AC 2605014C */ addiu $a1, $s0, 0x014C ## $a1 = 0000014C /* 001F0 80A490B0 3C060600 */ lui $a2, 0x0600 ## $a2 = 06000000 @@ -142,24 +142,24 @@ glabel EnGoma_Init /* 001F8 80A490B8 26080190 */ addiu $t0, $s0, 0x0190 ## $t0 = 00000190 /* 001FC 80A490BC 26090220 */ addiu $t1, $s0, 0x0220 ## $t1 = 00000220 /* 00200 80A490C0 240A0018 */ addiu $t2, $zero, 0x0018 ## $t2 = 00000018 -/* 00204 80A490C4 AFAA0018 */ sw $t2, 0x0018($sp) -/* 00208 80A490C8 AFA90014 */ sw $t1, 0x0014($sp) -/* 0020C 80A490CC AFA80010 */ sw $t0, 0x0010($sp) +/* 00204 80A490C4 AFAA0018 */ sw $t2, 0x0018($sp) +/* 00208 80A490C8 AFA90014 */ sw $t1, 0x0014($sp) +/* 0020C 80A490CC AFA80010 */ sw $t0, 0x0010($sp) /* 00210 80A490D0 24E71548 */ addiu $a3, $a3, 0x1548 ## $a3 = 06001548 /* 00214 80A490D4 24C63B40 */ addiu $a2, $a2, 0x3B40 ## $a2 = 06003B40 -/* 00218 80A490D8 AFA50034 */ sw $a1, 0x0034($sp) +/* 00218 80A490D8 AFA50034 */ sw $a1, 0x0034($sp) /* 0021C 80A490DC 0C02915F */ jal SkelAnime_Init - -/* 00220 80A490E0 8FA40044 */ lw $a0, 0x0044($sp) + +/* 00220 80A490E0 8FA40044 */ lw $a0, 0x0044($sp) /* 00224 80A490E4 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 00228 80A490E8 24A51548 */ addiu $a1, $a1, 0x1548 ## $a1 = 06001548 -/* 0022C 80A490EC 0C0294BE */ jal func_800A52F8 -/* 00230 80A490F0 8FA40034 */ lw $a0, 0x0034($sp) +/* 0022C 80A490EC 0C0294BE */ jal SkelAnime_ChangeAnimDefaultRepeat +/* 00230 80A490F0 8FA40034 */ lw $a0, 0x0034($sp) /* 00234 80A490F4 8602001C */ lh $v0, 0x001C($s0) ## 0000001C /* 00238 80A490F8 240B0002 */ addiu $t3, $zero, 0x0002 ## $t3 = 00000002 /* 0023C 80A490FC A20B00AF */ sb $t3, 0x00AF($s0) ## 000000AF -/* 00240 80A49100 28410003 */ slti $at, $v0, 0x0003 -/* 00244 80A49104 1020000A */ beq $at, $zero, .L80A49130 +/* 00240 80A49100 28410003 */ slti $at, $v0, 0x0003 +/* 00244 80A49104 1020000A */ beq $at, $zero, .L80A49130 /* 00248 80A49108 3C0C80A5 */ lui $t4, %hi(func_80A493D8) ## $t4 = 80A50000 /* 0024C 80A4910C 3C013FC0 */ lui $at, 0x3FC0 ## $at = 3FC00000 /* 00250 80A49110 44819000 */ mtc1 $at, $f18 ## $f18 = 1.50 @@ -168,14 +168,14 @@ glabel EnGoma_Init /* 0025C 80A4911C AE0C02B0 */ sw $t4, 0x02B0($s0) ## 000002B0 /* 00260 80A49120 A60D02CA */ sh $t5, 0x02CA($s0) ## 000002CA /* 00264 80A49124 8602001C */ lh $v0, 0x001C($s0) ## 0000001C -/* 00268 80A49128 10000019 */ beq $zero, $zero, .L80A49190 +/* 00268 80A49128 10000019 */ beq $zero, $zero, .L80A49190 /* 0026C 80A4912C E6120068 */ swc1 $f18, 0x0068($s0) ## 00000068 .L80A49130: /* 00270 80A49130 24010008 */ addiu $at, $zero, 0x0008 ## $at = 00000008 -/* 00274 80A49134 10410003 */ beq $v0, $at, .L80A49144 +/* 00274 80A49134 10410003 */ beq $v0, $at, .L80A49144 /* 00278 80A49138 3C0380A5 */ lui $v1, %hi(D_80A4B7F8) ## $v1 = 80A50000 /* 0027C 80A4913C 24010006 */ addiu $at, $zero, 0x0006 ## $at = 00000006 -/* 00280 80A49140 1441000B */ bne $v0, $at, .L80A49170 +/* 00280 80A49140 1441000B */ bne $v0, $at, .L80A49170 .L80A49144: /* 00284 80A49144 3C0E80A5 */ lui $t6, %hi(func_80A49668) ## $t6 = 80A50000 /* 00288 80A49148 25CE9668 */ addiu $t6, $t6, %lo(func_80A49668) ## $t6 = 80A49668 @@ -186,29 +186,29 @@ glabel EnGoma_Init /* 0029C 80A4915C 90780000 */ lbu $t8, 0x0000($v1) ## 80A4B7F8 /* 002A0 80A49160 27190001 */ addiu $t9, $t8, 0x0001 ## $t9 = 00000001 /* 002A4 80A49164 A0790000 */ sb $t9, 0x0000($v1) ## 80A4B7F8 -/* 002A8 80A49168 10000009 */ beq $zero, $zero, .L80A49190 +/* 002A8 80A49168 10000009 */ beq $zero, $zero, .L80A49190 /* 002AC 80A4916C 8602001C */ lh $v0, 0x001C($s0) ## 0000001C .L80A49170: /* 002B0 80A49170 24010009 */ addiu $at, $zero, 0x0009 ## $at = 00000009 -/* 002B4 80A49174 10410002 */ beq $v0, $at, .L80A49180 +/* 002B4 80A49174 10410002 */ beq $v0, $at, .L80A49180 /* 002B8 80A49178 24010007 */ addiu $at, $zero, 0x0007 ## $at = 00000007 -/* 002BC 80A4917C 14410004 */ bne $v0, $at, .L80A49190 +/* 002BC 80A4917C 14410004 */ bne $v0, $at, .L80A49190 .L80A49180: /* 002C0 80A49180 3C0880A5 */ lui $t0, %hi(func_80A49668) ## $t0 = 80A50000 /* 002C4 80A49184 25089668 */ addiu $t0, $t0, %lo(func_80A49668) ## $t0 = 80A49668 /* 002C8 80A49188 AE0802B0 */ sw $t0, 0x02B0($s0) ## 000002B0 /* 002CC 80A4918C 8602001C */ lh $v0, 0x001C($s0) ## 0000001C .L80A49190: -/* 002D0 80A49190 28410008 */ slti $at, $v0, 0x0008 -/* 002D4 80A49194 14200005 */ bne $at, $zero, .L80A491AC +/* 002D0 80A49190 28410008 */ slti $at, $v0, 0x0008 +/* 002D4 80A49194 14200005 */ bne $at, $zero, .L80A491AC /* 002D8 80A49198 24090001 */ addiu $t1, $zero, 0x0001 ## $t1 = 00000001 /* 002DC 80A4919C 3C0180A5 */ lui $at, %hi(D_80A4B910) ## $at = 80A50000 -/* 002E0 80A491A0 C424B910 */ lwc1 $f4, %lo(D_80A4B910)($at) -/* 002E4 80A491A4 10000004 */ beq $zero, $zero, .L80A491B8 +/* 002E0 80A491A0 C424B910 */ lwc1 $f4, %lo(D_80A4B910)($at) +/* 002E4 80A491A4 10000004 */ beq $zero, $zero, .L80A491B8 /* 002E8 80A491A8 E60402F0 */ swc1 $f4, 0x02F0($s0) ## 000002F0 .L80A491AC: /* 002EC 80A491AC 3C0180A5 */ lui $at, %hi(D_80A4B914) ## $at = 80A50000 -/* 002F0 80A491B0 C426B914 */ lwc1 $f6, %lo(D_80A4B914)($at) +/* 002F0 80A491B0 C426B914 */ lwc1 $f6, %lo(D_80A4B914)($at) /* 002F4 80A491B4 E60602F0 */ swc1 $f6, 0x02F0($s0) ## 000002F0 .L80A491B8: /* 002F8 80A491B8 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 @@ -221,38 +221,38 @@ glabel EnGoma_Init /* 00310 80A491D0 44815000 */ mtc1 $at, $f10 ## $f10 = 1000.00 /* 00314 80A491D4 240A0032 */ addiu $t2, $zero, 0x0032 ## $t2 = 00000032 /* 00318 80A491D8 A60A02CC */ sh $t2, 0x02CC($s0) ## 000002CC -/* 0031C 80A491DC 460A0402 */ mul.s $f16, $f0, $f10 +/* 0031C 80A491DC 460A0402 */ mul.s $f16, $f0, $f10 /* 00320 80A491E0 2605030C */ addiu $a1, $s0, 0x030C ## $a1 = 0000030C /* 00324 80A491E4 E61002D8 */ swc1 $f16, 0x02D8($s0) ## 000002D8 -/* 00328 80A491E8 AFA50034 */ sw $a1, 0x0034($sp) +/* 00328 80A491E8 AFA50034 */ sw $a1, 0x0034($sp) /* 0032C 80A491EC 0C0170D9 */ jal ActorCollider_AllocCylinder - -/* 00330 80A491F0 8FA40044 */ lw $a0, 0x0044($sp) + +/* 00330 80A491F0 8FA40044 */ lw $a0, 0x0044($sp) /* 00334 80A491F4 3C0780A5 */ lui $a3, %hi(D_80A4B7A0) ## $a3 = 80A50000 -/* 00338 80A491F8 8FA50034 */ lw $a1, 0x0034($sp) +/* 00338 80A491F8 8FA50034 */ lw $a1, 0x0034($sp) /* 0033C 80A491FC 24E7B7A0 */ addiu $a3, $a3, %lo(D_80A4B7A0) ## $a3 = 80A4B7A0 -/* 00340 80A49200 8FA40044 */ lw $a0, 0x0044($sp) +/* 00340 80A49200 8FA40044 */ lw $a0, 0x0044($sp) /* 00344 80A49204 0C01712B */ jal ActorCollider_InitCylinder - + /* 00348 80A49208 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 0034C 80A4920C 26050358 */ addiu $a1, $s0, 0x0358 ## $a1 = 00000358 -/* 00350 80A49210 AFA50034 */ sw $a1, 0x0034($sp) +/* 00350 80A49210 AFA50034 */ sw $a1, 0x0034($sp) /* 00354 80A49214 0C0170D9 */ jal ActorCollider_AllocCylinder - -/* 00358 80A49218 8FA40044 */ lw $a0, 0x0044($sp) + +/* 00358 80A49218 8FA40044 */ lw $a0, 0x0044($sp) /* 0035C 80A4921C 3C0780A5 */ lui $a3, %hi(D_80A4B7CC) ## $a3 = 80A50000 -/* 00360 80A49220 8FA50034 */ lw $a1, 0x0034($sp) +/* 00360 80A49220 8FA50034 */ lw $a1, 0x0034($sp) /* 00364 80A49224 24E7B7CC */ addiu $a3, $a3, %lo(D_80A4B7CC) ## $a3 = 80A4B7CC -/* 00368 80A49228 8FA40044 */ lw $a0, 0x0044($sp) +/* 00368 80A49228 8FA40044 */ lw $a0, 0x0044($sp) /* 0036C 80A4922C 0C01712B */ jal ActorCollider_InitCylinder - + /* 00370 80A49230 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 .L80A49234: -/* 00374 80A49234 8FBF002C */ lw $ra, 0x002C($sp) +/* 00374 80A49234 8FBF002C */ lw $ra, 0x002C($sp) .L80A49238: -/* 00378 80A49238 8FB00028 */ lw $s0, 0x0028($sp) +/* 00378 80A49238 8FB00028 */ lw $s0, 0x0028($sp) /* 0037C 80A4923C 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 -/* 00380 80A49240 03E00008 */ jr $ra +/* 00380 80A49240 03E00008 */ jr $ra /* 00384 80A49244 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Goma/func_80A49294.s b/asm/non_matchings/overlays/actors/ovl_En_Goma/func_80A49294.s index 3186be2383..54c7e0a018 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Goma/func_80A49294.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Goma/func_80A49294.s @@ -1,50 +1,50 @@ glabel func_80A49294 /* 003D4 80A49294 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 003D8 80A49298 AFB00028 */ sw $s0, 0x0028($sp) +/* 003D8 80A49298 AFB00028 */ sw $s0, 0x0028($sp) /* 003DC 80A4929C 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 003E0 80A492A0 AFBF002C */ sw $ra, 0x002C($sp) +/* 003E0 80A492A0 AFBF002C */ sw $ra, 0x002C($sp) /* 003E4 80A492A4 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 /* 003E8 80A492A8 0C028800 */ jal SkelAnime_GetFrameCount - + /* 003EC 80A492AC 24843D78 */ addiu $a0, $a0, 0x3D78 ## $a0 = 06003D78 /* 003F0 80A492B0 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 003F4 80A492B4 3C01C000 */ lui $at, 0xC000 ## $at = C0000000 /* 003F8 80A492B8 44814000 */ mtc1 $at, $f8 ## $f8 = -2.00 -/* 003FC 80A492BC 468021A0 */ cvt.s.w $f6, $f4 +/* 003FC 80A492BC 468021A0 */ cvt.s.w $f6, $f4 /* 00400 80A492C0 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 00404 80A492C4 24A53D78 */ addiu $a1, $a1, 0x3D78 ## $a1 = 06003D78 /* 00408 80A492C8 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C /* 0040C 80A492CC 3C064000 */ lui $a2, 0x4000 ## $a2 = 40000000 /* 00410 80A492D0 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 00414 80A492D4 E7A60010 */ swc1 $f6, 0x0010($sp) -/* 00418 80A492D8 AFA00014 */ sw $zero, 0x0014($sp) -/* 0041C 80A492DC 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 00420 80A492E0 E7A80018 */ swc1 $f8, 0x0018($sp) +/* 00414 80A492D4 E7A60010 */ swc1 $f6, 0x0010($sp) +/* 00418 80A492D8 AFA00014 */ sw $zero, 0x0014($sp) +/* 0041C 80A492DC 0C029468 */ jal SkelAnime_ChangeAnim + +/* 00420 80A492E0 E7A80018 */ swc1 $f8, 0x0018($sp) /* 00424 80A492E4 8618001C */ lh $t8, 0x001C($s0) ## 0000001C /* 00428 80A492E8 3C0E80A5 */ lui $t6, %hi(func_80A49338) ## $t6 = 80A50000 /* 0042C 80A492EC 25CE9338 */ addiu $t6, $t6, %lo(func_80A49338) ## $t6 = 80A49338 /* 00430 80A492F0 240F0014 */ addiu $t7, $zero, 0x0014 ## $t7 = 00000014 -/* 00434 80A492F4 2B010006 */ slti $at, $t8, 0x0006 +/* 00434 80A492F4 2B010006 */ slti $at, $t8, 0x0006 /* 00438 80A492F8 AE0E02B0 */ sw $t6, 0x02B0($s0) ## 000002B0 -/* 0043C 80A492FC 10200006 */ beq $at, $zero, .L80A49318 +/* 0043C 80A492FC 10200006 */ beq $at, $zero, .L80A49318 /* 00440 80A49300 A60F02CC */ sh $t7, 0x02CC($s0) ## 000002CC /* 00444 80A49304 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 00448 80A49308 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 0044C 80A4930C 24053819 */ addiu $a1, $zero, 0x3819 ## $a1 = 00003819 -/* 00450 80A49310 10000005 */ beq $zero, $zero, .L80A49328 -/* 00454 80A49314 8FBF002C */ lw $ra, 0x002C($sp) +/* 00450 80A49310 10000005 */ beq $zero, $zero, .L80A49328 +/* 00454 80A49314 8FBF002C */ lw $ra, 0x002C($sp) .L80A49318: /* 00458 80A49318 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 0045C 80A4931C 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 00460 80A49320 2405395F */ addiu $a1, $zero, 0x395F ## $a1 = 0000395F -/* 00464 80A49324 8FBF002C */ lw $ra, 0x002C($sp) +/* 00464 80A49324 8FBF002C */ lw $ra, 0x002C($sp) .L80A49328: -/* 00468 80A49328 8FB00028 */ lw $s0, 0x0028($sp) +/* 00468 80A49328 8FB00028 */ lw $s0, 0x0028($sp) /* 0046C 80A4932C 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 00470 80A49330 03E00008 */ jr $ra +/* 00470 80A49330 03E00008 */ jr $ra /* 00474 80A49334 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Goma/func_80A498A8.s b/asm/non_matchings/overlays/actors/ovl_En_Goma/func_80A498A8.s index 7c3fd74be9..de4d71db43 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Goma/func_80A498A8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Goma/func_80A498A8.s @@ -1,57 +1,57 @@ glabel func_80A498A8 /* 009E8 80A498A8 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 009EC 80A498AC AFB00028 */ sw $s0, 0x0028($sp) +/* 009EC 80A498AC AFB00028 */ sw $s0, 0x0028($sp) /* 009F0 80A498B0 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 009F4 80A498B4 AFBF002C */ sw $ra, 0x002C($sp) +/* 009F4 80A498B4 AFBF002C */ sw $ra, 0x002C($sp) /* 009F8 80A498B8 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 -/* 009FC 80A498BC AFA50034 */ sw $a1, 0x0034($sp) +/* 009FC 80A498BC AFA50034 */ sw $a1, 0x0034($sp) /* 00A00 80A498C0 0C028800 */ jal SkelAnime_GetFrameCount - + /* 00A04 80A498C4 24840544 */ addiu $a0, $a0, 0x0544 ## $a0 = 06000544 /* 00A08 80A498C8 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 00A0C 80A498CC 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 /* 00A10 80A498D0 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 00A14 80A498D4 468021A0 */ cvt.s.w $f6, $f4 +/* 00A14 80A498D4 468021A0 */ cvt.s.w $f6, $f4 /* 00A18 80A498D8 240E0002 */ addiu $t6, $zero, 0x0002 ## $t6 = 00000002 -/* 00A1C 80A498DC 44070000 */ mfc1 $a3, $f0 -/* 00A20 80A498E0 AFAE0014 */ sw $t6, 0x0014($sp) +/* 00A1C 80A498DC 44070000 */ mfc1 $a3, $f0 +/* 00A20 80A498E0 AFAE0014 */ sw $t6, 0x0014($sp) /* 00A24 80A498E4 24A50544 */ addiu $a1, $a1, 0x0544 ## $a1 = 06000544 /* 00A28 80A498E8 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C -/* 00A2C 80A498EC E7A60010 */ swc1 $f6, 0x0010($sp) +/* 00A2C 80A498EC E7A60010 */ swc1 $f6, 0x0010($sp) /* 00A30 80A498F0 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 00A34 80A498F4 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 00A38 80A498F8 E7A00018 */ swc1 $f0, 0x0018($sp) +/* 00A34 80A498F4 0C029468 */ jal SkelAnime_ChangeAnim + +/* 00A38 80A498F8 E7A00018 */ swc1 $f0, 0x0018($sp) /* 00A3C 80A498FC 3C0F80A5 */ lui $t7, %hi(func_80A49974) ## $t7 = 80A50000 /* 00A40 80A49900 25EF9974 */ addiu $t7, $t7, %lo(func_80A49974) ## $t7 = 80A49974 /* 00A44 80A49904 3C053BA3 */ lui $a1, 0x3BA3 ## $a1 = 3BA30000 /* 00A48 80A49908 AE0F02B0 */ sw $t7, 0x02B0($s0) ## 000002B0 /* 00A4C 80A4990C 34A5D70A */ ori $a1, $a1, 0xD70A ## $a1 = 3BA3D70A /* 00A50 80A49910 0C00B58B */ jal Actor_SetScale - + /* 00A54 80A49914 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 00A58 80A49918 24180005 */ addiu $t8, $zero, 0x0005 ## $t8 = 00000005 /* 00A5C 80A4991C A60002B8 */ sh $zero, 0x02B8($s0) ## 000002B8 /* 00A60 80A49920 A61802CC */ sh $t8, 0x02CC($s0) ## 000002CC -/* 00A64 80A49924 8FB90034 */ lw $t9, 0x0034($sp) +/* 00A64 80A49924 8FB90034 */ lw $t9, 0x0034($sp) /* 00A68 80A49928 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00A6C 80A4992C 0C00B69E */ jal func_8002DA78 +/* 00A6C 80A4992C 0C00B69E */ jal func_8002DA78 /* 00A70 80A49930 8F251C44 */ lw $a1, 0x1C44($t9) ## 00001C44 /* 00A74 80A49934 A60200B6 */ sh $v0, 0x00B6($s0) ## 000000B6 /* 00A78 80A49938 860800B6 */ lh $t0, 0x00B6($s0) ## 000000B6 /* 00A7C 80A4993C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 00A80 80A49940 A6080032 */ sh $t0, 0x0032($s0) ## 00000032 -/* 00A84 80A49944 0C292CFC */ jal func_80A4B3F0 -/* 00A88 80A49948 8FA50034 */ lw $a1, 0x0034($sp) +/* 00A84 80A49944 0C292CFC */ jal func_80A4B3F0 +/* 00A88 80A49948 8FA50034 */ lw $a1, 0x0034($sp) /* 00A8C 80A4994C 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 /* 00A90 80A49950 44814000 */ mtc1 $at, $f8 ## $f8 = 1.00 /* 00A94 80A49954 44805000 */ mtc1 $zero, $f10 ## $f10 = 0.00 /* 00A98 80A49958 E60802D0 */ swc1 $f8, 0x02D0($s0) ## 000002D0 /* 00A9C 80A4995C E60A0068 */ swc1 $f10, 0x0068($s0) ## 00000068 -/* 00AA0 80A49960 8FBF002C */ lw $ra, 0x002C($sp) -/* 00AA4 80A49964 8FB00028 */ lw $s0, 0x0028($sp) +/* 00AA0 80A49960 8FBF002C */ lw $ra, 0x002C($sp) +/* 00AA4 80A49964 8FB00028 */ lw $s0, 0x0028($sp) /* 00AA8 80A49968 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 00AAC 80A4996C 03E00008 */ jr $ra +/* 00AAC 80A4996C 03E00008 */ jr $ra /* 00AB0 80A49970 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Goma/func_80A499BC.s b/asm/non_matchings/overlays/actors/ovl_En_Goma/func_80A499BC.s index 6a28a66dbf..0b8914b3ad 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Goma/func_80A499BC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Goma/func_80A499BC.s @@ -1,39 +1,39 @@ glabel func_80A499BC /* 00AFC 80A499BC 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 00B00 80A499C0 AFB00028 */ sw $s0, 0x0028($sp) +/* 00B00 80A499C0 AFB00028 */ sw $s0, 0x0028($sp) /* 00B04 80A499C4 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00B08 80A499C8 AFBF002C */ sw $ra, 0x002C($sp) +/* 00B08 80A499C8 AFBF002C */ sw $ra, 0x002C($sp) /* 00B0C 80A499CC 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 -/* 00B10 80A499D0 AFA50034 */ sw $a1, 0x0034($sp) +/* 00B10 80A499D0 AFA50034 */ sw $a1, 0x0034($sp) /* 00B14 80A499D4 0C028800 */ jal SkelAnime_GetFrameCount - + /* 00B18 80A499D8 24840838 */ addiu $a0, $a0, 0x0838 ## $a0 = 06000838 /* 00B1C 80A499DC 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 00B20 80A499E0 3C01C000 */ lui $at, 0xC000 ## $at = C0000000 /* 00B24 80A499E4 44814000 */ mtc1 $at, $f8 ## $f8 = -2.00 -/* 00B28 80A499E8 468021A0 */ cvt.s.w $f6, $f4 +/* 00B28 80A499E8 468021A0 */ cvt.s.w $f6, $f4 /* 00B2C 80A499EC 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 00B30 80A499F0 240E0002 */ addiu $t6, $zero, 0x0002 ## $t6 = 00000002 -/* 00B34 80A499F4 AFAE0014 */ sw $t6, 0x0014($sp) +/* 00B34 80A499F4 AFAE0014 */ sw $t6, 0x0014($sp) /* 00B38 80A499F8 24A50838 */ addiu $a1, $a1, 0x0838 ## $a1 = 06000838 /* 00B3C 80A499FC 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C -/* 00B40 80A49A00 E7A60010 */ swc1 $f6, 0x0010($sp) +/* 00B40 80A49A00 E7A60010 */ swc1 $f6, 0x0010($sp) /* 00B44 80A49A04 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 00B48 80A49A08 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 00B4C 80A49A0C 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 00B50 80A49A10 E7A80018 */ swc1 $f8, 0x0018($sp) +/* 00B4C 80A49A0C 0C029468 */ jal SkelAnime_ChangeAnim + +/* 00B50 80A49A10 E7A80018 */ swc1 $f8, 0x0018($sp) /* 00B54 80A49A14 821800AF */ lb $t8, 0x00AF($s0) ## 000000AF /* 00B58 80A49A18 3C0F80A5 */ lui $t7, %hi(func_80A49AA8) ## $t7 = 80A50000 /* 00B5C 80A49A1C 25EF9AA8 */ addiu $t7, $t7, %lo(func_80A49AA8) ## $t7 = 80A49AA8 -/* 00B60 80A49A20 1F000008 */ bgtz $t8, .L80A49A44 +/* 00B60 80A49A20 1F000008 */ bgtz $t8, .L80A49A44 /* 00B64 80A49A24 AE0F02B0 */ sw $t7, 0x02B0($s0) ## 000002B0 /* 00B68 80A49A28 24190005 */ addiu $t9, $zero, 0x0005 ## $t9 = 00000005 /* 00B6C 80A49A2C A61902CC */ sh $t9, 0x02CC($s0) ## 000002CC -/* 00B70 80A49A30 8FA40034 */ lw $a0, 0x0034($sp) -/* 00B74 80A49A34 0C00CB1F */ jal func_80032C7C +/* 00B70 80A49A30 8FA40034 */ lw $a0, 0x0034($sp) +/* 00B74 80A49A34 0C00CB1F */ jal func_80032C7C /* 00B78 80A49A38 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 00B7C 80A49A3C 10000004 */ beq $zero, $zero, .L80A49A50 +/* 00B7C 80A49A3C 10000004 */ beq $zero, $zero, .L80A49A50 /* 00B80 80A49A40 8609008A */ lh $t1, 0x008A($s0) ## 0000008A .L80A49A44: /* 00B84 80A49A44 2408000A */ addiu $t0, $zero, 0x000A ## $t0 = 0000000A @@ -44,27 +44,27 @@ glabel func_80A499BC /* 00B94 80A49A54 44815000 */ mtc1 $at, $f10 ## $f10 = 20.00 /* 00B98 80A49A58 860B001C */ lh $t3, 0x001C($s0) ## 0000001C /* 00B9C 80A49A5C 34018000 */ ori $at, $zero, 0x8000 ## $at = 00008000 -/* 00BA0 80A49A60 01215021 */ addu $t2, $t1, $at -/* 00BA4 80A49A64 29610006 */ slti $at, $t3, 0x0006 +/* 00BA0 80A49A60 01215021 */ addu $t2, $t1, $at +/* 00BA4 80A49A64 29610006 */ slti $at, $t3, 0x0006 /* 00BA8 80A49A68 A60A0032 */ sh $t2, 0x0032($s0) ## 00000032 -/* 00BAC 80A49A6C 10200006 */ beq $at, $zero, .L80A49A88 +/* 00BAC 80A49A6C 10200006 */ beq $at, $zero, .L80A49A88 /* 00BB0 80A49A70 E60A0068 */ swc1 $f10, 0x0068($s0) ## 00000068 /* 00BB4 80A49A74 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 00BB8 80A49A78 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 00BBC 80A49A7C 24053818 */ addiu $a1, $zero, 0x3818 ## $a1 = 00003818 -/* 00BC0 80A49A80 10000005 */ beq $zero, $zero, .L80A49A98 -/* 00BC4 80A49A84 8FBF002C */ lw $ra, 0x002C($sp) +/* 00BC0 80A49A80 10000005 */ beq $zero, $zero, .L80A49A98 +/* 00BC4 80A49A84 8FBF002C */ lw $ra, 0x002C($sp) .L80A49A88: /* 00BC8 80A49A88 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 00BCC 80A49A8C 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 00BD0 80A49A90 2405395E */ addiu $a1, $zero, 0x395E ## $a1 = 0000395E -/* 00BD4 80A49A94 8FBF002C */ lw $ra, 0x002C($sp) +/* 00BD4 80A49A94 8FBF002C */ lw $ra, 0x002C($sp) .L80A49A98: -/* 00BD8 80A49A98 8FB00028 */ lw $s0, 0x0028($sp) +/* 00BD8 80A49A98 8FB00028 */ lw $s0, 0x0028($sp) /* 00BDC 80A49A9C 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 00BE0 80A49AA0 03E00008 */ jr $ra +/* 00BE0 80A49AA0 03E00008 */ jr $ra /* 00BE4 80A49AA4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Goma/func_80A49B30.s b/asm/non_matchings/overlays/actors/ovl_En_Goma/func_80A49B30.s index c423fddd79..43bc550c2d 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Goma/func_80A49B30.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Goma/func_80A49B30.s @@ -1,57 +1,57 @@ glabel func_80A49B30 /* 00C70 80A49B30 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 00C74 80A49B34 AFB00028 */ sw $s0, 0x0028($sp) +/* 00C74 80A49B34 AFB00028 */ sw $s0, 0x0028($sp) /* 00C78 80A49B38 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00C7C 80A49B3C AFBF002C */ sw $ra, 0x002C($sp) +/* 00C7C 80A49B3C AFBF002C */ sw $ra, 0x002C($sp) /* 00C80 80A49B40 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 /* 00C84 80A49B44 0C028800 */ jal SkelAnime_GetFrameCount - + /* 00C88 80A49B48 24840B78 */ addiu $a0, $a0, 0x0B78 ## $a0 = 06000B78 /* 00C8C 80A49B4C 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 00C90 80A49B50 3C01C000 */ lui $at, 0xC000 ## $at = C0000000 /* 00C94 80A49B54 44814000 */ mtc1 $at, $f8 ## $f8 = -2.00 -/* 00C98 80A49B58 468021A0 */ cvt.s.w $f6, $f4 +/* 00C98 80A49B58 468021A0 */ cvt.s.w $f6, $f4 /* 00C9C 80A49B5C 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 00CA0 80A49B60 240E0002 */ addiu $t6, $zero, 0x0002 ## $t6 = 00000002 -/* 00CA4 80A49B64 AFAE0014 */ sw $t6, 0x0014($sp) +/* 00CA4 80A49B64 AFAE0014 */ sw $t6, 0x0014($sp) /* 00CA8 80A49B68 24A50B78 */ addiu $a1, $a1, 0x0B78 ## $a1 = 06000B78 /* 00CAC 80A49B6C 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C -/* 00CB0 80A49B70 E7A60010 */ swc1 $f6, 0x0010($sp) +/* 00CB0 80A49B70 E7A60010 */ swc1 $f6, 0x0010($sp) /* 00CB4 80A49B74 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 00CB8 80A49B78 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 00CBC 80A49B7C 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 00CC0 80A49B80 E7A80018 */ swc1 $f8, 0x0018($sp) +/* 00CBC 80A49B7C 0C029468 */ jal SkelAnime_ChangeAnim + +/* 00CC0 80A49B80 E7A80018 */ swc1 $f8, 0x0018($sp) /* 00CC4 80A49B84 8619001C */ lh $t9, 0x001C($s0) ## 0000001C /* 00CC8 80A49B88 3C0F80A5 */ lui $t7, %hi(func_80A49BF0) ## $t7 = 80A50000 /* 00CCC 80A49B8C 25EF9BF0 */ addiu $t7, $t7, %lo(func_80A49BF0) ## $t7 = 80A49BF0 /* 00CD0 80A49B90 2418001E */ addiu $t8, $zero, 0x001E ## $t8 = 0000001E -/* 00CD4 80A49B94 2B210006 */ slti $at, $t9, 0x0006 +/* 00CD4 80A49B94 2B210006 */ slti $at, $t9, 0x0006 /* 00CD8 80A49B98 AE0F02B0 */ sw $t7, 0x02B0($s0) ## 000002B0 -/* 00CDC 80A49B9C 10200006 */ beq $at, $zero, .L80A49BB8 +/* 00CDC 80A49B9C 10200006 */ beq $at, $zero, .L80A49BB8 /* 00CE0 80A49BA0 A61802CC */ sh $t8, 0x02CC($s0) ## 000002CC /* 00CE4 80A49BA4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 00CE8 80A49BA8 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 00CEC 80A49BAC 2405381A */ addiu $a1, $zero, 0x381A ## $a1 = 0000381A -/* 00CF0 80A49BB0 10000005 */ beq $zero, $zero, .L80A49BC8 +/* 00CF0 80A49BB0 10000005 */ beq $zero, $zero, .L80A49BC8 /* 00CF4 80A49BB4 8E090004 */ lw $t1, 0x0004($s0) ## 00000004 .L80A49BB8: /* 00CF8 80A49BB8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 00CFC 80A49BBC 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 00D00 80A49BC0 24053960 */ addiu $a1, $zero, 0x3960 ## $a1 = 00003960 /* 00D04 80A49BC4 8E090004 */ lw $t1, 0x0004($s0) ## 00000004 .L80A49BC8: /* 00D08 80A49BC8 2401FFFE */ addiu $at, $zero, 0xFFFE ## $at = FFFFFFFE /* 00D0C 80A49BCC 24080064 */ addiu $t0, $zero, 0x0064 ## $t0 = 00000064 -/* 00D10 80A49BD0 01215024 */ and $t2, $t1, $at +/* 00D10 80A49BD0 01215024 */ and $t2, $t1, $at /* 00D14 80A49BD4 A60802CA */ sh $t0, 0x02CA($s0) ## 000002CA /* 00D18 80A49BD8 AE0A0004 */ sw $t2, 0x0004($s0) ## 00000004 -/* 00D1C 80A49BDC 8FBF002C */ lw $ra, 0x002C($sp) -/* 00D20 80A49BE0 8FB00028 */ lw $s0, 0x0028($sp) +/* 00D1C 80A49BDC 8FBF002C */ lw $ra, 0x002C($sp) +/* 00D20 80A49BE0 8FB00028 */ lw $s0, 0x0028($sp) /* 00D24 80A49BE4 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 00D28 80A49BE8 03E00008 */ jr $ra +/* 00D28 80A49BE8 03E00008 */ jr $ra /* 00D2C 80A49BEC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Goma/func_80A49C94.s b/asm/non_matchings/overlays/actors/ovl_En_Goma/func_80A49C94.s index 612f9b1725..6059cfab48 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Goma/func_80A49C94.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Goma/func_80A49C94.s @@ -1,35 +1,35 @@ glabel func_80A49C94 /* 00DD4 80A49C94 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 00DD8 80A49C98 AFA40028 */ sw $a0, 0x0028($sp) -/* 00DDC 80A49C9C AFBF0024 */ sw $ra, 0x0024($sp) +/* 00DD8 80A49C98 AFA40028 */ sw $a0, 0x0028($sp) +/* 00DDC 80A49C9C AFBF0024 */ sw $ra, 0x0024($sp) /* 00DE0 80A49CA0 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 /* 00DE4 80A49CA4 0C028800 */ jal SkelAnime_GetFrameCount - + /* 00DE8 80A49CA8 24840334 */ addiu $a0, $a0, 0x0334 ## $a0 = 06000334 /* 00DEC 80A49CAC 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 00DF0 80A49CB0 3C01C000 */ lui $at, 0xC000 ## $at = C0000000 /* 00DF4 80A49CB4 44814000 */ mtc1 $at, $f8 ## $f8 = -2.00 -/* 00DF8 80A49CB8 468021A0 */ cvt.s.w $f6, $f4 -/* 00DFC 80A49CBC 8FA40028 */ lw $a0, 0x0028($sp) +/* 00DF8 80A49CB8 468021A0 */ cvt.s.w $f6, $f4 +/* 00DFC 80A49CBC 8FA40028 */ lw $a0, 0x0028($sp) /* 00E00 80A49CC0 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 00E04 80A49CC4 24A50334 */ addiu $a1, $a1, 0x0334 ## $a1 = 06000334 /* 00E08 80A49CC8 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 00E0C 80A49CCC 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 00E10 80A49CD0 E7A60010 */ swc1 $f6, 0x0010($sp) -/* 00E14 80A49CD4 AFA00014 */ sw $zero, 0x0014($sp) -/* 00E18 80A49CD8 E7A80018 */ swc1 $f8, 0x0018($sp) -/* 00E1C 80A49CDC 0C029468 */ jal SkelAnime_ChangeAnimation - +/* 00E10 80A49CD0 E7A60010 */ swc1 $f6, 0x0010($sp) +/* 00E14 80A49CD4 AFA00014 */ sw $zero, 0x0014($sp) +/* 00E18 80A49CD8 E7A80018 */ swc1 $f8, 0x0018($sp) +/* 00E1C 80A49CDC 0C029468 */ jal SkelAnime_ChangeAnim + /* 00E20 80A49CE0 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 00E24 80A49CE4 8FA20028 */ lw $v0, 0x0028($sp) +/* 00E24 80A49CE4 8FA20028 */ lw $v0, 0x0028($sp) /* 00E28 80A49CE8 3C0E80A5 */ lui $t6, %hi(func_80A49D0C) ## $t6 = 80A50000 /* 00E2C 80A49CEC 25CE9D0C */ addiu $t6, $t6, %lo(func_80A49D0C) ## $t6 = 80A49D0C /* 00E30 80A49CF0 240F0003 */ addiu $t7, $zero, 0x0003 ## $t7 = 00000003 /* 00E34 80A49CF4 AC4E02B0 */ sw $t6, 0x02B0($v0) ## 000002B0 /* 00E38 80A49CF8 A44F02CC */ sh $t7, 0x02CC($v0) ## 000002CC -/* 00E3C 80A49CFC 8FBF0024 */ lw $ra, 0x0024($sp) +/* 00E3C 80A49CFC 8FBF0024 */ lw $ra, 0x0024($sp) /* 00E40 80A49D00 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 00E44 80A49D04 03E00008 */ jr $ra +/* 00E44 80A49D04 03E00008 */ jr $ra /* 00E48 80A49D08 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Goma/func_80A49E80.s b/asm/non_matchings/overlays/actors/ovl_En_Goma/func_80A49E80.s index 6d99f8b1bf..d18cf4f76c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Goma/func_80A49E80.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Goma/func_80A49E80.s @@ -1,42 +1,42 @@ glabel func_80A49E80 /* 00FC0 80A49E80 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 00FC4 80A49E84 AFA40030 */ sw $a0, 0x0030($sp) -/* 00FC8 80A49E88 AFBF0024 */ sw $ra, 0x0024($sp) +/* 00FC4 80A49E84 AFA40030 */ sw $a0, 0x0030($sp) +/* 00FC8 80A49E88 AFBF0024 */ sw $ra, 0x0024($sp) /* 00FCC 80A49E8C 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 /* 00FD0 80A49E90 0C028800 */ jal SkelAnime_GetFrameCount - + /* 00FD4 80A49E94 24841548 */ addiu $a0, $a0, 0x1548 ## $a0 = 06001548 /* 00FD8 80A49E98 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 00FDC 80A49E9C 2404000A */ addiu $a0, $zero, 0x000A ## $a0 = 0000000A /* 00FE0 80A49EA0 2405001E */ addiu $a1, $zero, 0x001E ## $a1 = 0000001E -/* 00FE4 80A49EA4 468021A0 */ cvt.s.w $f6, $f4 +/* 00FE4 80A49EA4 468021A0 */ cvt.s.w $f6, $f4 /* 00FE8 80A49EA8 0C01DF64 */ jal Math_Rand_S16Offset - -/* 00FEC 80A49EAC E7A6002C */ swc1 $f6, 0x002C($sp) -/* 00FF0 80A49EB0 8FA30030 */ lw $v1, 0x0030($sp) + +/* 00FEC 80A49EAC E7A6002C */ swc1 $f6, 0x002C($sp) +/* 00FF0 80A49EB0 8FA30030 */ lw $v1, 0x0030($sp) /* 00FF4 80A49EB4 3C01C0A0 */ lui $at, 0xC0A0 ## $at = C0A00000 /* 00FF8 80A49EB8 44815000 */ mtc1 $at, $f10 ## $f10 = -5.00 /* 00FFC 80A49EBC A46202CC */ sh $v0, 0x02CC($v1) ## 000002CC -/* 01000 80A49EC0 C7A8002C */ lwc1 $f8, 0x002C($sp) +/* 01000 80A49EC0 C7A8002C */ lwc1 $f8, 0x002C($sp) /* 01004 80A49EC4 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 01008 80A49EC8 24A51548 */ addiu $a1, $a1, 0x1548 ## $a1 = 06001548 -/* 0100C 80A49ECC AFA00014 */ sw $zero, 0x0014($sp) +/* 0100C 80A49ECC AFA00014 */ sw $zero, 0x0014($sp) /* 01010 80A49ED0 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 01014 80A49ED4 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 /* 01018 80A49ED8 2464014C */ addiu $a0, $v1, 0x014C ## $a0 = 0000014C -/* 0101C 80A49EDC E7AA0018 */ swc1 $f10, 0x0018($sp) -/* 01020 80A49EE0 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 01024 80A49EE4 E7A80010 */ swc1 $f8, 0x0010($sp) -/* 01028 80A49EE8 8FAF0030 */ lw $t7, 0x0030($sp) +/* 0101C 80A49EDC E7AA0018 */ swc1 $f10, 0x0018($sp) +/* 01020 80A49EE0 0C029468 */ jal SkelAnime_ChangeAnim + +/* 01024 80A49EE4 E7A80010 */ swc1 $f8, 0x0010($sp) +/* 01028 80A49EE8 8FAF0030 */ lw $t7, 0x0030($sp) /* 0102C 80A49EEC 3C0E80A5 */ lui $t6, %hi(func_80A4A2EC) ## $t6 = 80A50000 /* 01030 80A49EF0 25CEA2EC */ addiu $t6, $t6, %lo(func_80A4A2EC) ## $t6 = 80A4A2EC /* 01034 80A49EF4 ADEE02B0 */ sw $t6, 0x02B0($t7) ## 000002B0 -/* 01038 80A49EF8 8FB80030 */ lw $t8, 0x0030($sp) +/* 01038 80A49EF8 8FB80030 */ lw $t8, 0x0030($sp) /* 0103C 80A49EFC A70002B8 */ sh $zero, 0x02B8($t8) ## 000002B8 -/* 01040 80A49F00 8FBF0024 */ lw $ra, 0x0024($sp) +/* 01040 80A49F00 8FBF0024 */ lw $ra, 0x0024($sp) /* 01044 80A49F04 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 01048 80A49F08 03E00008 */ jr $ra +/* 01048 80A49F08 03E00008 */ jr $ra /* 0104C 80A49F0C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Goma/func_80A49F10.s b/asm/non_matchings/overlays/actors/ovl_En_Goma/func_80A49F10.s index 9c5587c582..3660543cfe 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Goma/func_80A49F10.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Goma/func_80A49F10.s @@ -1,39 +1,39 @@ glabel func_80A49F10 /* 01050 80A49F10 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 01054 80A49F14 AFA40028 */ sw $a0, 0x0028($sp) -/* 01058 80A49F18 AFBF0024 */ sw $ra, 0x0024($sp) +/* 01054 80A49F14 AFA40028 */ sw $a0, 0x0028($sp) +/* 01058 80A49F18 AFBF0024 */ sw $ra, 0x0024($sp) /* 0105C 80A49F1C 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 /* 01060 80A49F20 0C028800 */ jal SkelAnime_GetFrameCount - + /* 01064 80A49F24 24843D78 */ addiu $a0, $a0, 0x3D78 ## $a0 = 06003D78 /* 01068 80A49F28 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 0106C 80A49F2C 3C01C0A0 */ lui $at, 0xC0A0 ## $at = C0A00000 /* 01070 80A49F30 44814000 */ mtc1 $at, $f8 ## $f8 = -5.00 -/* 01074 80A49F34 468021A0 */ cvt.s.w $f6, $f4 -/* 01078 80A49F38 8FA40028 */ lw $a0, 0x0028($sp) +/* 01074 80A49F34 468021A0 */ cvt.s.w $f6, $f4 +/* 01078 80A49F38 8FA40028 */ lw $a0, 0x0028($sp) /* 0107C 80A49F3C 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 01080 80A49F40 24A53D78 */ addiu $a1, $a1, 0x3D78 ## $a1 = 06003D78 /* 01084 80A49F44 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 01088 80A49F48 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 0108C 80A49F4C E7A60010 */ swc1 $f6, 0x0010($sp) -/* 01090 80A49F50 AFA00014 */ sw $zero, 0x0014($sp) -/* 01094 80A49F54 E7A80018 */ swc1 $f8, 0x0018($sp) -/* 01098 80A49F58 0C029468 */ jal SkelAnime_ChangeAnimation - +/* 0108C 80A49F4C E7A60010 */ swc1 $f6, 0x0010($sp) +/* 01090 80A49F50 AFA00014 */ sw $zero, 0x0014($sp) +/* 01094 80A49F54 E7A80018 */ swc1 $f8, 0x0018($sp) +/* 01098 80A49F58 0C029468 */ jal SkelAnime_ChangeAnim + /* 0109C 80A49F5C 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 010A0 80A49F60 8FAF0028 */ lw $t7, 0x0028($sp) +/* 010A0 80A49F60 8FAF0028 */ lw $t7, 0x0028($sp) /* 010A4 80A49F64 3C0E80A5 */ lui $t6, %hi(func_80A4A368) ## $t6 = 80A50000 /* 010A8 80A49F68 25CEA368 */ addiu $t6, $t6, %lo(func_80A4A368) ## $t6 = 80A4A368 /* 010AC 80A49F6C 24040046 */ addiu $a0, $zero, 0x0046 ## $a0 = 00000046 /* 010B0 80A49F70 2405006E */ addiu $a1, $zero, 0x006E ## $a1 = 0000006E /* 010B4 80A49F74 0C01DF64 */ jal Math_Rand_S16Offset - + /* 010B8 80A49F78 ADEE02B0 */ sw $t6, 0x02B0($t7) ## 000002B0 -/* 010BC 80A49F7C 8FB80028 */ lw $t8, 0x0028($sp) +/* 010BC 80A49F7C 8FB80028 */ lw $t8, 0x0028($sp) /* 010C0 80A49F80 A70202CC */ sh $v0, 0x02CC($t8) ## 000002CC -/* 010C4 80A49F84 8FBF0024 */ lw $ra, 0x0024($sp) +/* 010C4 80A49F84 8FBF0024 */ lw $ra, 0x0024($sp) /* 010C8 80A49F88 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 010CC 80A49F8C 03E00008 */ jr $ra +/* 010CC 80A49F8C 03E00008 */ jr $ra /* 010D0 80A49F90 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Goma/func_80A49F94.s b/asm/non_matchings/overlays/actors/ovl_En_Goma/func_80A49F94.s index cb30819f12..e64d6be681 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Goma/func_80A49F94.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Goma/func_80A49F94.s @@ -1,36 +1,36 @@ glabel func_80A49F94 /* 010D4 80A49F94 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 010D8 80A49F98 AFA40028 */ sw $a0, 0x0028($sp) -/* 010DC 80A49F9C AFBF0024 */ sw $ra, 0x0024($sp) +/* 010D8 80A49F98 AFA40028 */ sw $a0, 0x0028($sp) +/* 010DC 80A49F9C AFBF0024 */ sw $ra, 0x0024($sp) /* 010E0 80A49FA0 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 /* 010E4 80A49FA4 0C028800 */ jal SkelAnime_GetFrameCount - + /* 010E8 80A49FA8 24840E4C */ addiu $a0, $a0, 0x0E4C ## $a0 = 06000E4C /* 010EC 80A49FAC 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 010F0 80A49FB0 3C01C0A0 */ lui $at, 0xC0A0 ## $at = C0A00000 /* 010F4 80A49FB4 44814000 */ mtc1 $at, $f8 ## $f8 = -5.00 -/* 010F8 80A49FB8 468021A0 */ cvt.s.w $f6, $f4 -/* 010FC 80A49FBC 8FA40028 */ lw $a0, 0x0028($sp) +/* 010F8 80A49FB8 468021A0 */ cvt.s.w $f6, $f4 +/* 010FC 80A49FBC 8FA40028 */ lw $a0, 0x0028($sp) /* 01100 80A49FC0 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 01104 80A49FC4 240E0002 */ addiu $t6, $zero, 0x0002 ## $t6 = 00000002 -/* 01108 80A49FC8 AFAE0014 */ sw $t6, 0x0014($sp) +/* 01108 80A49FC8 AFAE0014 */ sw $t6, 0x0014($sp) /* 0110C 80A49FCC 24A50E4C */ addiu $a1, $a1, 0x0E4C ## $a1 = 06000E4C -/* 01110 80A49FD0 E7A60010 */ swc1 $f6, 0x0010($sp) +/* 01110 80A49FD0 E7A60010 */ swc1 $f6, 0x0010($sp) /* 01114 80A49FD4 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 01118 80A49FD8 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 0111C 80A49FDC E7A80018 */ swc1 $f8, 0x0018($sp) -/* 01120 80A49FE0 0C029468 */ jal SkelAnime_ChangeAnimation - +/* 0111C 80A49FDC E7A80018 */ swc1 $f8, 0x0018($sp) +/* 01120 80A49FE0 0C029468 */ jal SkelAnime_ChangeAnim + /* 01124 80A49FE4 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 01128 80A49FE8 8FA20028 */ lw $v0, 0x0028($sp) +/* 01128 80A49FE8 8FA20028 */ lw $v0, 0x0028($sp) /* 0112C 80A49FEC 3C0F80A5 */ lui $t7, %hi(func_80A4A010) ## $t7 = 80A50000 /* 01130 80A49FF0 25EFA010 */ addiu $t7, $t7, %lo(func_80A4A010) ## $t7 = 80A4A010 /* 01134 80A49FF4 2418001E */ addiu $t8, $zero, 0x001E ## $t8 = 0000001E /* 01138 80A49FF8 AC4F02B0 */ sw $t7, 0x02B0($v0) ## 000002B0 /* 0113C 80A49FFC A45802CC */ sh $t8, 0x02CC($v0) ## 000002CC -/* 01140 80A4A000 8FBF0024 */ lw $ra, 0x0024($sp) +/* 01140 80A4A000 8FBF0024 */ lw $ra, 0x0024($sp) /* 01144 80A4A004 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 01148 80A4A008 03E00008 */ jr $ra +/* 01148 80A4A008 03E00008 */ jr $ra /* 0114C 80A4A00C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Goma/func_80A4A0A8.s b/asm/non_matchings/overlays/actors/ovl_En_Goma/func_80A4A0A8.s index f2e73bc9ad..ecbd39c2f1 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Goma/func_80A4A0A8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Goma/func_80A4A0A8.s @@ -1,35 +1,35 @@ glabel func_80A4A0A8 /* 011E8 80A4A0A8 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 011EC 80A4A0AC AFA40028 */ sw $a0, 0x0028($sp) -/* 011F0 80A4A0B0 AFBF0024 */ sw $ra, 0x0024($sp) +/* 011EC 80A4A0AC AFA40028 */ sw $a0, 0x0028($sp) +/* 011F0 80A4A0B0 AFBF0024 */ sw $ra, 0x0024($sp) /* 011F4 80A4A0B4 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 /* 011F8 80A4A0B8 0C028800 */ jal SkelAnime_GetFrameCount - + /* 011FC 80A4A0BC 2484017C */ addiu $a0, $a0, 0x017C ## $a0 = 0600017C /* 01200 80A4A0C0 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 01204 80A4A0C4 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 01208 80A4A0C8 8FA40028 */ lw $a0, 0x0028($sp) -/* 0120C 80A4A0CC 468021A0 */ cvt.s.w $f6, $f4 +/* 01208 80A4A0C8 8FA40028 */ lw $a0, 0x0028($sp) +/* 0120C 80A4A0CC 468021A0 */ cvt.s.w $f6, $f4 /* 01210 80A4A0D0 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 01214 80A4A0D4 240E0002 */ addiu $t6, $zero, 0x0002 ## $t6 = 00000002 -/* 01218 80A4A0D8 44070000 */ mfc1 $a3, $f0 -/* 0121C 80A4A0DC AFAE0014 */ sw $t6, 0x0014($sp) +/* 01218 80A4A0D8 44070000 */ mfc1 $a3, $f0 +/* 0121C 80A4A0DC AFAE0014 */ sw $t6, 0x0014($sp) /* 01220 80A4A0E0 24A5017C */ addiu $a1, $a1, 0x017C ## $a1 = 0600017C -/* 01224 80A4A0E4 E7A60010 */ swc1 $f6, 0x0010($sp) +/* 01224 80A4A0E4 E7A60010 */ swc1 $f6, 0x0010($sp) /* 01228 80A4A0E8 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 0122C 80A4A0EC 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 01230 80A4A0F0 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 01234 80A4A0F4 E7A00018 */ swc1 $f0, 0x0018($sp) -/* 01238 80A4A0F8 8FA20028 */ lw $v0, 0x0028($sp) +/* 01230 80A4A0F0 0C029468 */ jal SkelAnime_ChangeAnim + +/* 01234 80A4A0F4 E7A00018 */ swc1 $f0, 0x0018($sp) +/* 01238 80A4A0F8 8FA20028 */ lw $v0, 0x0028($sp) /* 0123C 80A4A0FC 3C0F80A5 */ lui $t7, %hi(func_80A4A120) ## $t7 = 80A50000 /* 01240 80A4A100 25EFA120 */ addiu $t7, $t7, %lo(func_80A4A120) ## $t7 = 80A4A120 /* 01244 80A4A104 2418000A */ addiu $t8, $zero, 0x000A ## $t8 = 0000000A /* 01248 80A4A108 AC4F02B0 */ sw $t7, 0x02B0($v0) ## 000002B0 /* 0124C 80A4A10C A45802CC */ sh $t8, 0x02CC($v0) ## 000002CC -/* 01250 80A4A110 8FBF0024 */ lw $ra, 0x0024($sp) +/* 01250 80A4A110 8FBF0024 */ lw $ra, 0x0024($sp) /* 01254 80A4A114 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 01258 80A4A118 03E00008 */ jr $ra +/* 01258 80A4A118 03E00008 */ jr $ra /* 0125C 80A4A11C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Goma/func_80A4A18C.s b/asm/non_matchings/overlays/actors/ovl_En_Goma/func_80A4A18C.s index 32cff086dd..e425296222 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Goma/func_80A4A18C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Goma/func_80A4A18C.s @@ -1,51 +1,51 @@ glabel func_80A4A18C /* 012CC 80A4A18C 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 012D0 80A4A190 AFB00028 */ sw $s0, 0x0028($sp) +/* 012D0 80A4A190 AFB00028 */ sw $s0, 0x0028($sp) /* 012D4 80A4A194 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 012D8 80A4A198 AFBF002C */ sw $ra, 0x002C($sp) +/* 012D8 80A4A198 AFBF002C */ sw $ra, 0x002C($sp) /* 012DC 80A4A19C 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 /* 012E0 80A4A1A0 0C028800 */ jal SkelAnime_GetFrameCount - + /* 012E4 80A4A1A4 24840544 */ addiu $a0, $a0, 0x0544 ## $a0 = 06000544 /* 012E8 80A4A1A8 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 012EC 80A4A1AC 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 /* 012F0 80A4A1B0 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 012F4 80A4A1B4 468021A0 */ cvt.s.w $f6, $f4 +/* 012F4 80A4A1B4 468021A0 */ cvt.s.w $f6, $f4 /* 012F8 80A4A1B8 240E0002 */ addiu $t6, $zero, 0x0002 ## $t6 = 00000002 -/* 012FC 80A4A1BC 44070000 */ mfc1 $a3, $f0 -/* 01300 80A4A1C0 AFAE0014 */ sw $t6, 0x0014($sp) +/* 012FC 80A4A1BC 44070000 */ mfc1 $a3, $f0 +/* 01300 80A4A1C0 AFAE0014 */ sw $t6, 0x0014($sp) /* 01304 80A4A1C4 24A50544 */ addiu $a1, $a1, 0x0544 ## $a1 = 06000544 /* 01308 80A4A1C8 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C -/* 0130C 80A4A1CC E7A60010 */ swc1 $f6, 0x0010($sp) +/* 0130C 80A4A1CC E7A60010 */ swc1 $f6, 0x0010($sp) /* 01310 80A4A1D0 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 01314 80A4A1D4 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 01318 80A4A1D8 E7A00018 */ swc1 $f0, 0x0018($sp) +/* 01314 80A4A1D4 0C029468 */ jal SkelAnime_ChangeAnim + +/* 01318 80A4A1D8 E7A00018 */ swc1 $f0, 0x0018($sp) /* 0131C 80A4A1DC 8618001C */ lh $t8, 0x001C($s0) ## 0000001C /* 01320 80A4A1E0 3C014100 */ lui $at, 0x4100 ## $at = 41000000 /* 01324 80A4A1E4 44814000 */ mtc1 $at, $f8 ## $f8 = 8.00 /* 01328 80A4A1E8 3C0F80A5 */ lui $t7, %hi(func_80A4A234) ## $t7 = 80A50000 /* 0132C 80A4A1EC 25EFA234 */ addiu $t7, $t7, %lo(func_80A4A234) ## $t7 = 80A4A234 -/* 01330 80A4A1F0 2B010006 */ slti $at, $t8, 0x0006 +/* 01330 80A4A1F0 2B010006 */ slti $at, $t8, 0x0006 /* 01334 80A4A1F4 AE0F02B0 */ sw $t7, 0x02B0($s0) ## 000002B0 -/* 01338 80A4A1F8 10200006 */ beq $at, $zero, .L80A4A214 +/* 01338 80A4A1F8 10200006 */ beq $at, $zero, .L80A4A214 /* 0133C 80A4A1FC E6080060 */ swc1 $f8, 0x0060($s0) ## 00000060 /* 01340 80A4A200 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 01344 80A4A204 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 01348 80A4A208 24053817 */ addiu $a1, $zero, 0x3817 ## $a1 = 00003817 -/* 0134C 80A4A20C 10000005 */ beq $zero, $zero, .L80A4A224 -/* 01350 80A4A210 8FBF002C */ lw $ra, 0x002C($sp) +/* 0134C 80A4A20C 10000005 */ beq $zero, $zero, .L80A4A224 +/* 01350 80A4A210 8FBF002C */ lw $ra, 0x002C($sp) .L80A4A214: /* 01354 80A4A214 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 01358 80A4A218 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 0135C 80A4A21C 2405395D */ addiu $a1, $zero, 0x395D ## $a1 = 0000395D -/* 01360 80A4A220 8FBF002C */ lw $ra, 0x002C($sp) +/* 01360 80A4A220 8FBF002C */ lw $ra, 0x002C($sp) .L80A4A224: -/* 01364 80A4A224 8FB00028 */ lw $s0, 0x0028($sp) +/* 01364 80A4A224 8FB00028 */ lw $s0, 0x0028($sp) /* 01368 80A4A228 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 0136C 80A4A22C 03E00008 */ jr $ra +/* 0136C 80A4A22C 03E00008 */ jr $ra /* 01370 80A4A230 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Goma/func_80A4A470.s b/asm/non_matchings/overlays/actors/ovl_En_Goma/func_80A4A470.s index c21b271dd9..1046276bcc 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Goma/func_80A4A470.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Goma/func_80A4A470.s @@ -1,7 +1,7 @@ glabel func_80A4A470 /* 015B0 80A4A470 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 015B4 80A4A474 AFA5001C */ sw $a1, 0x001C($sp) -/* 015B8 80A4A478 AFBF0014 */ sw $ra, 0x0014($sp) +/* 015B4 80A4A474 AFA5001C */ sw $a1, 0x001C($sp) +/* 015B8 80A4A478 AFBF0014 */ sw $ra, 0x0014($sp) /* 015BC 80A4A47C 3C0E80A5 */ lui $t6, %hi(func_80A4A50C) ## $t6 = 80A50000 /* 015C0 80A4A480 25CEA50C */ addiu $t6, $t6, %lo(func_80A4A50C) ## $t6 = 80A4A50C /* 015C4 80A4A484 240F0064 */ addiu $t7, $zero, 0x0064 ## $t7 = 00000064 @@ -10,38 +10,38 @@ glabel func_80A4A470 /* 015D0 80A4A490 A48F02F8 */ sh $t7, 0x02F8($a0) ## 000002F8 /* 015D4 80A4A494 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 015D8 80A4A498 24A51548 */ addiu $a1, $a1, 0x1548 ## $a1 = 06001548 -/* 015DC 80A4A49C AFA70018 */ sw $a3, 0x0018($sp) +/* 015DC 80A4A49C AFA70018 */ sw $a3, 0x0018($sp) /* 015E0 80A4A4A0 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 015E4 80A4A4A4 0C0294D3 */ jal func_800A534C +/* 015E4 80A4A4A4 0C0294D3 */ jal SkelAnime_ChangeAnimTransitionRepeat /* 015E8 80A4A4A8 3C06C0A0 */ lui $a2, 0xC0A0 ## $a2 = C0A00000 /* 015EC 80A4A4AC 3C014170 */ lui $at, 0x4170 ## $at = 41700000 /* 015F0 80A4A4B0 44816000 */ mtc1 $at, $f12 ## $f12 = 15.00 /* 015F4 80A4A4B4 0C00CFBE */ jal Math_Rand_ZeroFloat - + /* 015F8 80A4A4B8 00000000 */ nop -/* 015FC 80A4A4BC 4600010D */ trunc.w.s $f4, $f0 -/* 01600 80A4A4C0 8FA70018 */ lw $a3, 0x0018($sp) +/* 015FC 80A4A4BC 4600010D */ trunc.w.s $f4, $f0 +/* 01600 80A4A4C0 8FA70018 */ lw $a3, 0x0018($sp) /* 01604 80A4A4C4 2405381F */ addiu $a1, $zero, 0x381F ## $a1 = 0000381F -/* 01608 80A4A4C8 44092000 */ mfc1 $t1, $f4 +/* 01608 80A4A4C8 44092000 */ mfc1 $t1, $f4 /* 0160C 80A4A4CC 84EB001C */ lh $t3, 0x001C($a3) ## 0000001C /* 01610 80A4A4D0 00E02025 */ or $a0, $a3, $zero ## $a0 = 00000000 /* 01614 80A4A4D4 252A0003 */ addiu $t2, $t1, 0x0003 ## $t2 = 00000003 -/* 01618 80A4A4D8 29610006 */ slti $at, $t3, 0x0006 -/* 0161C 80A4A4DC 10200005 */ beq $at, $zero, .L80A4A4F4 +/* 01618 80A4A4D8 29610006 */ slti $at, $t3, 0x0006 +/* 0161C 80A4A4DC 10200005 */ beq $at, $zero, .L80A4A4F4 /* 01620 80A4A4E0 A4EA02CC */ sh $t2, 0x02CC($a3) ## 000002CC /* 01624 80A4A4E4 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 01628 80A4A4E8 00E02025 */ or $a0, $a3, $zero ## $a0 = 00000000 -/* 0162C 80A4A4EC 10000004 */ beq $zero, $zero, .L80A4A500 -/* 01630 80A4A4F0 8FBF0014 */ lw $ra, 0x0014($sp) +/* 0162C 80A4A4EC 10000004 */ beq $zero, $zero, .L80A4A500 +/* 01630 80A4A4F0 8FBF0014 */ lw $ra, 0x0014($sp) .L80A4A4F4: /* 01634 80A4A4F4 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 01638 80A4A4F8 2405389E */ addiu $a1, $zero, 0x389E ## $a1 = 0000389E -/* 0163C 80A4A4FC 8FBF0014 */ lw $ra, 0x0014($sp) +/* 0163C 80A4A4FC 8FBF0014 */ lw $ra, 0x0014($sp) .L80A4A500: /* 01640 80A4A500 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 01644 80A4A504 03E00008 */ jr $ra +/* 01644 80A4A504 03E00008 */ jr $ra /* 01648 80A4A508 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Goma/func_80A4A964.s b/asm/non_matchings/overlays/actors/ovl_En_Goma/func_80A4A964.s index 8af3ec1bee..7028518d91 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Goma/func_80A4A964.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Goma/func_80A4A964.s @@ -26,7 +26,7 @@ glabel func_80A4A964 /* 01B04 80A4A9C4 E7B00018 */ swc1 $f16, 0x0018($sp) /* 01B08 80A4A9C8 46000207 */ neg.s $f8, $f0 /* 01B0C 80A4A9CC 46104302 */ mul.s $f12, $f8, $f16 -/* 01B10 80A4A9D0 0C03F494 */ jal func_800FD250 +/* 01B10 80A4A9D0 0C03F494 */ jal Math_atan2f /* 01B14 80A4A9D4 00000000 */ nop /* 01B18 80A4A9D8 3C0180A5 */ lui $at, %hi(D_80A4B938) ## $at = 80A50000 /* 01B1C 80A4A9DC C432B938 */ lwc1 $f18, %lo(D_80A4B938)($at) @@ -49,7 +49,7 @@ glabel func_80A4A964 /* 01B5C 80A4AA1C 46004287 */ neg.s $f10, $f8 /* 01B60 80A4AA20 44817000 */ mtc1 $at, $f14 ## $f14 = 1.00 /* 01B64 80A4AA24 46125302 */ mul.s $f12, $f10, $f18 -/* 01B68 80A4AA28 0C03F494 */ jal func_800FD250 +/* 01B68 80A4AA28 0C03F494 */ jal Math_atan2f /* 01B6C 80A4AA2C 00000000 */ nop /* 01B70 80A4AA30 3C0180A5 */ lui $at, %hi(D_80A4B93C) ## $at = 80A50000 /* 01B74 80A4AA34 C424B93C */ lwc1 $f4, %lo(D_80A4B93C)($at) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Goma/func_80A4ACC0.s b/asm/non_matchings/overlays/actors/ovl_En_Goma/func_80A4ACC0.s index 487e83eea6..dc06c3f8c5 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Goma/func_80A4ACC0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Goma/func_80A4ACC0.s @@ -10,7 +10,7 @@ glabel func_80A4ACC0 /* 01E20 80A4ACE0 24C6B880 */ addiu $a2, $a2, %lo(D_80A4B880) ## $a2 = 80A4B880 /* 01E24 80A4ACE4 27A40030 */ addiu $a0, $sp, 0x0030 ## $a0 = FFFFFFE8 /* 01E28 80A4ACE8 240707B8 */ addiu $a3, $zero, 0x07B8 ## $a3 = 000007B8 -/* 01E2C 80A4ACEC 0C031AB1 */ jal func_800C6AC4 +/* 01E2C 80A4ACEC 0C031AB1 */ jal Graph_OpenDisps /* 01E30 80A4ACF0 AFA50040 */ sw $a1, 0x0040($sp) /* 01E34 80A4ACF4 8FA80040 */ lw $t0, 0x0040($sp) /* 01E38 80A4ACF8 8FA4005C */ lw $a0, 0x005C($sp) @@ -102,7 +102,7 @@ glabel func_80A4ACC0 /* 01F78 80A4AE38 24C6B890 */ addiu $a2, $a2, %lo(D_80A4B890) ## $a2 = 80A4B890 /* 01F7C 80A4AE3C 27A40030 */ addiu $a0, $sp, 0x0030 ## $a0 = FFFFFFE8 /* 01F80 80A4AE40 240707DB */ addiu $a3, $zero, 0x07DB ## $a3 = 000007DB -/* 01F84 80A4AE44 0C031AD5 */ jal func_800C6B54 +/* 01F84 80A4AE44 0C031AD5 */ jal Graph_CloseDisps /* 01F88 80A4AE48 8D450000 */ lw $a1, 0x0000($t2) ## 00000000 /* 01F8C 80A4AE4C 8FBF0014 */ lw $ra, 0x0014($sp) /* 01F90 80A4AE50 27BD0048 */ addiu $sp, $sp, 0x0048 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Goroiwa/EnGoroiwa_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Goroiwa/EnGoroiwa_Draw.s index 53264aab0e..0a3bd0142a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Goroiwa/EnGoroiwa_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Goroiwa/EnGoroiwa_Draw.s @@ -4,7 +4,7 @@ glabel EnGoroiwa_Draw /* 02190 80A4DE30 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 /* 02194 80A4DE34 AFBF0014 */ sw $ra, 0x0014($sp) /* 02198 80A4DE38 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 0219C 80A4DE3C 0C00D498 */ jal Draw_DListOpa +/* 0219C 80A4DE3C 0C00D498 */ jal Gfx_DrawDListOpa /* 021A0 80A4DE40 24A506B0 */ addiu $a1, $a1, 0x06B0 ## $a1 = 060006B0 /* 021A4 80A4DE44 8FBF0014 */ lw $ra, 0x0014($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Goroiwa/func_80A4CB78.s b/asm/non_matchings/overlays/actors/ovl_En_Goroiwa/func_80A4CB78.s index 4363f46031..e544acf2ac 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Goroiwa/func_80A4CB78.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Goroiwa/func_80A4CB78.s @@ -80,22 +80,22 @@ glabel func_80A4CB78 /* 0100C 80A4CCAC 24050003 */ addiu $a1, $zero, 0x0003 ## $a1 = 00000003 /* 01010 80A4CCB0 000A5880 */ sll $t3, $t2, 2 /* 01014 80A4CCB4 022B6021 */ addu $t4, $s1, $t3 -/* 01018 80A4CCB8 0C024BE2 */ jal func_80092F88 +/* 01018 80A4CCB8 0C024BE2 */ jal Quake_Add /* 0101C 80A4CCBC 8D840790 */ lw $a0, 0x0790($t4) ## 00000790 /* 01020 80A4CCC0 00022400 */ sll $a0, $v0, 16 /* 01024 80A4CCC4 AFA2006C */ sw $v0, 0x006C($sp) /* 01028 80A4CCC8 00042403 */ sra $a0, $a0, 16 -/* 0102C 80A4CCCC 0C024B6B */ jal func_80092DAC +/* 0102C 80A4CCCC 0C024B6B */ jal Quake_SetSpeed /* 01030 80A4CCD0 2405C350 */ addiu $a1, $zero, 0xC350 ## $a1 = FFFFC350 /* 01034 80A4CCD4 87A4006E */ lh $a0, 0x006E($sp) /* 01038 80A4CCD8 24050003 */ addiu $a1, $zero, 0x0003 ## $a1 = 00000003 /* 0103C 80A4CCDC 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 /* 01040 80A4CCE0 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 /* 01044 80A4CCE4 AFA00010 */ sw $zero, 0x0010($sp) -/* 01048 80A4CCE8 0C024B9C */ jal func_80092E70 +/* 01048 80A4CCE8 0C024B9C */ jal Quake_SetQuakeValues /* 0104C 80A4CCEC AFA4002C */ sw $a0, 0x002C($sp) /* 01050 80A4CCF0 8FA4002C */ lw $a0, 0x002C($sp) -/* 01054 80A4CCF4 0C024B7C */ jal func_80092DF0 +/* 01054 80A4CCF4 0C024B7C */ jal Quake_SetCountdown /* 01058 80A4CCF8 24050007 */ addiu $a1, $zero, 0x0007 ## $a1 = 00000007 /* 0105C 80A4CCFC 920F01D3 */ lbu $t7, 0x01D3($s0) ## 000001D3 .L80A4CD00: diff --git a/asm/non_matchings/overlays/actors/ovl_En_Gs/EnGs_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Gs/EnGs_Draw.s index 603719a358..0a4145454a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Gs/EnGs_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Gs/EnGs_Draw.s @@ -13,7 +13,7 @@ glabel EnGs_Draw /* 01694 80A4F9B4 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 /* 01698 80A4F9B8 24C6FE50 */ addiu $a2, $a2, %lo(D_80A4FE50) ## $a2 = 80A4FE50 /* 0169C 80A4F9BC 24070416 */ addiu $a3, $zero, 0x0416 ## $a3 = 00000416 -/* 016A0 80A4F9C0 0C031AB1 */ jal func_800C6AC4 +/* 016A0 80A4F9C0 0C031AB1 */ jal Graph_OpenDisps /* 016A4 80A4F9C4 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 /* 016A8 80A4F9C8 8FA20094 */ lw $v0, 0x0094($sp) /* 016AC 80A4F9CC 3C190001 */ lui $t9, 0x0001 ## $t9 = 00010000 @@ -217,7 +217,7 @@ glabel EnGs_Draw /* 019B8 80A4FCD8 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 019BC 80A4FCDC 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 /* 019C0 80A4FCE0 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 019C4 80A4FCE4 0C0253D0 */ jal Draw_TwoTexScroll +/* 019C4 80A4FCE4 0C0253D0 */ jal Gfx_TwoTexScroll /* 019C8 80A4FCE8 00408825 */ or $s1, $v0, $zero ## $s1 = 00000000 /* 019CC 80A4FCEC AE220004 */ sw $v0, 0x0004($s1) ## 00000004 /* 019D0 80A4FCF0 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 @@ -250,7 +250,7 @@ glabel EnGs_Draw /* 01A38 80A4FD58 24C6FE80 */ addiu $a2, $a2, %lo(D_80A4FE80) ## $a2 = 80A4FE80 /* 01A3C 80A4FD5C 27A40070 */ addiu $a0, $sp, 0x0070 ## $a0 = FFFFFFE0 /* 01A40 80A4FD60 2407044D */ addiu $a3, $zero, 0x044D ## $a3 = 0000044D -/* 01A44 80A4FD64 0C031AD5 */ jal func_800C6B54 +/* 01A44 80A4FD64 0C031AD5 */ jal Graph_CloseDisps /* 01A48 80A4FD68 8DA50000 */ lw $a1, 0x0000($t5) ## 00000000 .L80A4FD6C: /* 01A4C 80A4FD6C 8FBF003C */ lw $ra, 0x003C($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Guest/EnGuest_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Guest/EnGuest_Update.s index 7a09d39a22..542dd8c74a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Guest/EnGuest_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Guest/EnGuest_Update.s @@ -1,68 +1,68 @@ glabel EnGuest_Update /* 000DC 80A502FC 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 -/* 000E0 80A50300 AFB00024 */ sw $s0, 0x0024($sp) +/* 000E0 80A50300 AFB00024 */ sw $s0, 0x0024($sp) /* 000E4 80A50304 3C010001 */ lui $at, 0x0001 ## $at = 00010000 /* 000E8 80A50308 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 000EC 80A5030C AFB10028 */ sw $s1, 0x0028($sp) +/* 000EC 80A5030C AFB10028 */ sw $s1, 0x0028($sp) /* 000F0 80A50310 342117A4 */ ori $at, $at, 0x17A4 ## $at = 000117A4 /* 000F4 80A50314 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 -/* 000F8 80A50318 AFBF002C */ sw $ra, 0x002C($sp) -/* 000FC 80A5031C 00A12021 */ addu $a0, $a1, $at +/* 000F8 80A50318 AFBF002C */ sw $ra, 0x002C($sp) +/* 000FC 80A5031C 00A12021 */ addu $a0, $a1, $at /* 00100 80A50320 0C026062 */ jal Object_IsLoaded - + /* 00104 80A50324 8205030C */ lb $a1, 0x030C($s0) ## 0000030C -/* 00108 80A50328 1040004B */ beq $v0, $zero, .L80A50458 +/* 00108 80A50328 1040004B */ beq $v0, $zero, .L80A50458 /* 0010C 80A5032C 2401FFEF */ addiu $at, $zero, 0xFFEF ## $at = FFFFFFEF /* 00110 80A50330 8E0E0004 */ lw $t6, 0x0004($s0) ## 00000004 /* 00114 80A50334 3C0580A5 */ lui $a1, %hi(D_80A50B9C) ## $a1 = 80A50000 /* 00118 80A50338 24A50B9C */ addiu $a1, $a1, %lo(D_80A50B9C) ## $a1 = 80A50B9C -/* 0011C 80A5033C 01C17824 */ and $t7, $t6, $at +/* 0011C 80A5033C 01C17824 */ and $t7, $t6, $at /* 00120 80A50340 AE0F0004 */ sw $t7, 0x0004($s0) ## 00000004 /* 00124 80A50344 0C01E037 */ jal Actor_ProcessInitChain - + /* 00128 80A50348 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 0012C 80A5034C 2605014C */ addiu $a1, $s0, 0x014C ## $a1 = 0000014C /* 00130 80A50350 3C060600 */ lui $a2, 0x0600 ## $a2 = 06000000 /* 00134 80A50354 26180190 */ addiu $t8, $s0, 0x0190 ## $t8 = 00000190 /* 00138 80A50358 261901F0 */ addiu $t9, $s0, 0x01F0 ## $t9 = 000001F0 /* 0013C 80A5035C 24080010 */ addiu $t0, $zero, 0x0010 ## $t0 = 00000010 -/* 00140 80A50360 AFA80018 */ sw $t0, 0x0018($sp) -/* 00144 80A50364 AFB90014 */ sw $t9, 0x0014($sp) -/* 00148 80A50368 AFB80010 */ sw $t8, 0x0010($sp) +/* 00140 80A50360 AFA80018 */ sw $t0, 0x0018($sp) +/* 00144 80A50364 AFB90014 */ sw $t9, 0x0014($sp) +/* 00148 80A50368 AFB80010 */ sw $t8, 0x0010($sp) /* 0014C 80A5036C 24C600F0 */ addiu $a2, $a2, 0x00F0 ## $a2 = 060000F0 -/* 00150 80A50370 AFA50030 */ sw $a1, 0x0030($sp) +/* 00150 80A50370 AFA50030 */ sw $a1, 0x0030($sp) /* 00154 80A50374 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 00158 80A50378 0C0291BE */ jal func_800A46F8 +/* 00158 80A50378 0C0291BE */ jal SkelAnime_InitSV /* 0015C 80A5037C 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 /* 00160 80A50380 8209030C */ lb $t1, 0x030C($s0) ## 0000030C /* 00164 80A50384 3C0C0001 */ lui $t4, 0x0001 ## $t4 = 00010000 /* 00168 80A50388 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 0016C 80A5038C 00095100 */ sll $t2, $t1, 4 -/* 00170 80A50390 01495021 */ addu $t2, $t2, $t1 -/* 00174 80A50394 000A5080 */ sll $t2, $t2, 2 -/* 00178 80A50398 022A5821 */ addu $t3, $s1, $t2 -/* 0017C 80A5039C 018B6021 */ addu $t4, $t4, $t3 +/* 0016C 80A5038C 00095100 */ sll $t2, $t1, 4 +/* 00170 80A50390 01495021 */ addu $t2, $t2, $t1 +/* 00174 80A50394 000A5080 */ sll $t2, $t2, 2 +/* 00178 80A50398 022A5821 */ addu $t3, $s1, $t2 +/* 0017C 80A5039C 018B6021 */ addu $t4, $t4, $t3 /* 00180 80A503A0 8D8C17B4 */ lw $t4, 0x17B4($t4) ## 000117B4 /* 00184 80A503A4 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 /* 00188 80A503A8 248442AC */ addiu $a0, $a0, 0x42AC ## $a0 = 060042AC -/* 0018C 80A503AC 01816821 */ addu $t5, $t4, $at +/* 0018C 80A503AC 01816821 */ addu $t5, $t4, $at /* 00190 80A503B0 3C018016 */ lui $at, 0x8016 ## $at = 80160000 /* 00194 80A503B4 0C028800 */ jal SkelAnime_GetFrameCount - + /* 00198 80A503B8 AC2D6FC0 */ sw $t5, 0x6FC0($at) ## 80166FC0 /* 0019C 80A503BC 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 001A0 80A503C0 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 /* 001A4 80A503C4 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 001A8 80A503C8 468021A0 */ cvt.s.w $f6, $f4 -/* 001AC 80A503CC 44070000 */ mfc1 $a3, $f0 +/* 001A8 80A503C8 468021A0 */ cvt.s.w $f6, $f4 +/* 001AC 80A503CC 44070000 */ mfc1 $a3, $f0 /* 001B0 80A503D0 24A542AC */ addiu $a1, $a1, 0x42AC ## $a1 = 060042AC -/* 001B4 80A503D4 8FA40030 */ lw $a0, 0x0030($sp) +/* 001B4 80A503D4 8FA40030 */ lw $a0, 0x0030($sp) /* 001B8 80A503D8 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 001BC 80A503DC AFA00014 */ sw $zero, 0x0014($sp) -/* 001C0 80A503E0 E7A60010 */ swc1 $f6, 0x0010($sp) -/* 001C4 80A503E4 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 001C8 80A503E8 E7A00018 */ swc1 $f0, 0x0018($sp) +/* 001BC 80A503DC AFA00014 */ sw $zero, 0x0014($sp) +/* 001C0 80A503E0 E7A60010 */ swc1 $f6, 0x0010($sp) +/* 001C4 80A503E4 0C029468 */ jal SkelAnime_ChangeAnim + +/* 001C8 80A503E8 E7A00018 */ swc1 $f0, 0x0018($sp) /* 001CC 80A503EC 3C0E80A5 */ lui $t6, %hi(func_80A509D4) ## $t6 = 80A50000 /* 001D0 80A503F0 3C0F80A5 */ lui $t7, %hi(func_80A505CC) ## $t7 = 80A50000 /* 001D4 80A503F4 25CE09D4 */ addiu $t6, $t6, %lo(func_80A509D4) ## $t6 = 80A509D4 @@ -70,19 +70,19 @@ glabel EnGuest_Update /* 001DC 80A503FC AE0E0134 */ sw $t6, 0x0134($s0) ## 00000134 /* 001E0 80A50400 AE0F0130 */ sw $t7, 0x0130($s0) ## 00000130 /* 001E4 80A50404 26050254 */ addiu $a1, $s0, 0x0254 ## $a1 = 00000254 -/* 001E8 80A50408 AFA50030 */ sw $a1, 0x0030($sp) +/* 001E8 80A50408 AFA50030 */ sw $a1, 0x0030($sp) /* 001EC 80A5040C 0C0170D9 */ jal ActorCollider_AllocCylinder - + /* 001F0 80A50410 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 001F4 80A50414 3C0780A5 */ lui $a3, %hi(D_80A50B70) ## $a3 = 80A50000 -/* 001F8 80A50418 8FA50030 */ lw $a1, 0x0030($sp) +/* 001F8 80A50418 8FA50030 */ lw $a1, 0x0030($sp) /* 001FC 80A5041C 24E70B70 */ addiu $a3, $a3, %lo(D_80A50B70) ## $a3 = 80A50B70 /* 00200 80A50420 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 00204 80A50424 0C017114 */ jal func_8005C450 +/* 00204 80A50424 0C017114 */ jal func_8005C450 /* 00208 80A50428 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 0020C 80A5042C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 00210 80A50430 0C00B56E */ jal Actor_SetHeight - + /* 00214 80A50434 3C054270 */ lui $a1, 0x4270 ## $a1 = 42700000 /* 00218 80A50438 3C1980A5 */ lui $t9, %hi(func_80A50518) ## $t9 = 80A50000 /* 0021C 80A5043C 2418700D */ addiu $t8, $zero, 0x700D ## $t8 = 0000700D @@ -93,10 +93,10 @@ glabel EnGuest_Update /* 00230 80A50450 A618010E */ sh $t8, 0x010E($s0) ## 0000010E /* 00234 80A50454 AE190250 */ sw $t9, 0x0250($s0) ## 00000250 .L80A50458: -/* 00238 80A50458 8FBF002C */ lw $ra, 0x002C($sp) -/* 0023C 80A5045C 8FB00024 */ lw $s0, 0x0024($sp) -/* 00240 80A50460 8FB10028 */ lw $s1, 0x0028($sp) -/* 00244 80A50464 03E00008 */ jr $ra +/* 00238 80A50458 8FBF002C */ lw $ra, 0x002C($sp) +/* 0023C 80A5045C 8FB00024 */ lw $s0, 0x0024($sp) +/* 00240 80A50460 8FB10028 */ lw $s1, 0x0028($sp) +/* 00244 80A50464 03E00008 */ jr $ra /* 00248 80A50468 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Guest/func_80A50774.s b/asm/non_matchings/overlays/actors/ovl_En_Guest/func_80A50774.s index 1d8ebf0355..2d737b006d 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Guest/func_80A50774.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Guest/func_80A50774.s @@ -11,7 +11,7 @@ glabel func_80A50774 /* 00578 80A50798 24C60C04 */ addiu $a2, $a2, %lo(D_80A50C04) ## $a2 = 80A50C04 /* 0057C 80A5079C 24070160 */ addiu $a3, $zero, 0x0160 ## $a3 = 00000160 /* 00580 80A507A0 27A40028 */ addiu $a0, $sp, 0x0028 ## $a0 = FFFFFFE0 -/* 00584 80A507A4 0C031AB1 */ jal func_800C6AC4 +/* 00584 80A507A4 0C031AB1 */ jal Graph_OpenDisps /* 00588 80A507A8 8DC50000 */ lw $a1, 0x0000($t6) ## 00000000 /* 0058C 80A507AC 2401000F */ addiu $at, $zero, 0x000F ## $at = 0000000F /* 00590 80A507B0 16010030 */ bne $s0, $at, .L80A50874 @@ -150,7 +150,7 @@ glabel func_80A50774 /* 0078C 80A509AC 24C60C14 */ addiu $a2, $a2, %lo(D_80A50C14) ## $a2 = 80A50C14 /* 00790 80A509B0 27A40028 */ addiu $a0, $sp, 0x0028 ## $a0 = FFFFFFE0 /* 00794 80A509B4 24070184 */ addiu $a3, $zero, 0x0184 ## $a3 = 00000184 -/* 00798 80A509B8 0C031AD5 */ jal func_800C6B54 +/* 00798 80A509B8 0C031AD5 */ jal Graph_CloseDisps /* 0079C 80A509BC 8D050000 */ lw $a1, 0x0000($t0) ## 00000000 /* 007A0 80A509C0 8FBF001C */ lw $ra, 0x001C($sp) /* 007A4 80A509C4 8FB00018 */ lw $s0, 0x0018($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Guest/func_80A509D4.s b/asm/non_matchings/overlays/actors/ovl_En_Guest/func_80A509D4.s index aabb929870..d605e81bfe 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Guest/func_80A509D4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Guest/func_80A509D4.s @@ -1,19 +1,19 @@ glabel func_80A509D4 /* 007B4 80A509D4 27BDFF98 */ addiu $sp, $sp, 0xFF98 ## $sp = FFFFFF98 -/* 007B8 80A509D8 AFB1002C */ sw $s1, 0x002C($sp) +/* 007B8 80A509D8 AFB1002C */ sw $s1, 0x002C($sp) /* 007BC 80A509DC 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 -/* 007C0 80A509E0 AFBF0034 */ sw $ra, 0x0034($sp) -/* 007C4 80A509E4 AFB20030 */ sw $s2, 0x0030($sp) -/* 007C8 80A509E8 AFB00028 */ sw $s0, 0x0028($sp) +/* 007C0 80A509E0 AFBF0034 */ sw $ra, 0x0034($sp) +/* 007C4 80A509E4 AFB20030 */ sw $s2, 0x0030($sp) +/* 007C8 80A509E8 AFB00028 */ sw $s0, 0x0028($sp) /* 007CC 80A509EC 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 /* 007D0 80A509F0 00809025 */ or $s2, $a0, $zero ## $s2 = 00000000 /* 007D4 80A509F4 3C0680A5 */ lui $a2, %hi(D_80A50C24) ## $a2 = 80A50000 /* 007D8 80A509F8 24C60C24 */ addiu $a2, $a2, %lo(D_80A50C24) ## $a2 = 80A50C24 /* 007DC 80A509FC 27A4004C */ addiu $a0, $sp, 0x004C ## $a0 = FFFFFFE4 /* 007E0 80A50A00 24070194 */ addiu $a3, $zero, 0x0194 ## $a3 = 00000194 -/* 007E4 80A50A04 0C031AB1 */ jal func_800C6AC4 +/* 007E4 80A50A04 0C031AB1 */ jal Graph_OpenDisps /* 007E8 80A50A08 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 -/* 007EC 80A50A0C 0C024F46 */ jal func_80093D18 +/* 007EC 80A50A0C 0C024F46 */ jal func_80093D18 /* 007F0 80A50A10 8E240000 */ lw $a0, 0x0000($s1) ## 00000000 /* 007F4 80A50A14 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 /* 007F8 80A50A18 3C0FDB06 */ lui $t7, 0xDB06 ## $t7 = DB060000 @@ -23,13 +23,13 @@ glabel func_80A509D4 /* 00808 80A50A28 AC4F0000 */ sw $t7, 0x0000($v0) ## 00000000 /* 0080C 80A50A2C 8E240000 */ lw $a0, 0x0000($s1) ## 00000000 /* 00810 80A50A30 241800FF */ addiu $t8, $zero, 0x00FF ## $t8 = 000000FF -/* 00814 80A50A34 AFB80010 */ sw $t8, 0x0010($sp) +/* 00814 80A50A34 AFB80010 */ sw $t8, 0x0010($sp) /* 00818 80A50A38 240500FF */ addiu $a1, $zero, 0x00FF ## $a1 = 000000FF /* 0081C 80A50A3C 240600FF */ addiu $a2, $zero, 0x00FF ## $a2 = 000000FF /* 00820 80A50A40 240700FF */ addiu $a3, $zero, 0x00FF ## $a3 = 000000FF -/* 00824 80A50A44 0C2941C2 */ jal func_80A50708 -/* 00828 80A50A48 AFA20048 */ sw $v0, 0x0048($sp) -/* 0082C 80A50A4C 8FA30048 */ lw $v1, 0x0048($sp) +/* 00824 80A50A44 0C2941C2 */ jal func_80A50708 +/* 00828 80A50A48 AFA20048 */ sw $v0, 0x0048($sp) +/* 0082C 80A50A4C 8FA30048 */ lw $v1, 0x0048($sp) /* 00830 80A50A50 3C08DB06 */ lui $t0, 0xDB06 ## $t0 = DB060000 /* 00834 80A50A54 35080024 */ ori $t0, $t0, 0x0024 ## $t0 = DB060024 /* 00838 80A50A58 AC620004 */ sw $v0, 0x0004($v1) ## 00000004 @@ -40,12 +40,12 @@ glabel func_80A509D4 /* 0084C 80A50A6C AE1902C0 */ sw $t9, 0x02C0($s0) ## 000002C0 /* 00850 80A50A70 AC480000 */ sw $t0, 0x0000($v0) ## 00000000 /* 00854 80A50A74 8E240000 */ lw $a0, 0x0000($s1) ## 00000000 -/* 00858 80A50A78 AFA90010 */ sw $t1, 0x0010($sp) +/* 00858 80A50A78 AFA90010 */ sw $t1, 0x0010($sp) /* 0085C 80A50A7C 2406003C */ addiu $a2, $zero, 0x003C ## $a2 = 0000003C /* 00860 80A50A80 240700DC */ addiu $a3, $zero, 0x00DC ## $a3 = 000000DC -/* 00864 80A50A84 0C2941C2 */ jal func_80A50708 -/* 00868 80A50A88 AFA20044 */ sw $v0, 0x0044($sp) -/* 0086C 80A50A8C 8FA30044 */ lw $v1, 0x0044($sp) +/* 00864 80A50A84 0C2941C2 */ jal func_80A50708 +/* 00868 80A50A88 AFA20044 */ sw $v0, 0x0044($sp) +/* 0086C 80A50A8C 8FA30044 */ lw $v1, 0x0044($sp) /* 00870 80A50A90 3C0BDB06 */ lui $t3, 0xDB06 ## $t3 = DB060000 /* 00874 80A50A94 356B0028 */ ori $t3, $t3, 0x0028 ## $t3 = DB060028 /* 00878 80A50A98 AC620004 */ sw $v0, 0x0004($v1) ## 00000004 @@ -58,40 +58,40 @@ glabel func_80A509D4 /* 00894 80A50AB4 924C030E */ lbu $t4, 0x030E($s2) ## 0000030E /* 00898 80A50AB8 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 /* 0089C 80A50ABC 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF -/* 008A0 80A50AC0 000C6880 */ sll $t5, $t4, 2 -/* 008A4 80A50AC4 008D2021 */ addu $a0, $a0, $t5 -/* 008A8 80A50AC8 8C840BA4 */ lw $a0, %lo(D_80A50BA4)($a0) +/* 008A0 80A50AC0 000C6880 */ sll $t5, $t4, 2 +/* 008A4 80A50AC4 008D2021 */ addu $a0, $a0, $t5 +/* 008A8 80A50AC8 8C840BA4 */ lw $a0, %lo(D_80A50BA4)($a0) /* 008AC 80A50ACC 3C0B80A5 */ lui $t3, %hi(func_80A50774) ## $t3 = 80A50000 /* 008B0 80A50AD0 256B0774 */ addiu $t3, $t3, %lo(func_80A50774) ## $t3 = 80A50774 -/* 008B4 80A50AD4 00047900 */ sll $t7, $a0, 4 -/* 008B8 80A50AD8 000FC702 */ srl $t8, $t7, 28 -/* 008BC 80A50ADC 0018C880 */ sll $t9, $t8, 2 -/* 008C0 80A50AE0 01194021 */ addu $t0, $t0, $t9 +/* 008B4 80A50AD4 00047900 */ sll $t7, $a0, 4 +/* 008B8 80A50AD8 000FC702 */ srl $t8, $t7, 28 +/* 008BC 80A50ADC 0018C880 */ sll $t9, $t8, 2 +/* 008C0 80A50AE0 01194021 */ addu $t0, $t0, $t9 /* 008C4 80A50AE4 8D086FA8 */ lw $t0, 0x6FA8($t0) ## 80166FA8 -/* 008C8 80A50AE8 00817024 */ and $t6, $a0, $at +/* 008C8 80A50AE8 00817024 */ and $t6, $a0, $at /* 008CC 80A50AEC 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 008D0 80A50AF0 01C84821 */ addu $t1, $t6, $t0 -/* 008D4 80A50AF4 01215021 */ addu $t2, $t1, $at +/* 008D0 80A50AF0 01C84821 */ addu $t1, $t6, $t0 +/* 008D4 80A50AF4 01215021 */ addu $t2, $t1, $at /* 008D8 80A50AF8 AC4A0004 */ sw $t2, 0x0004($v0) ## 00000004 /* 008DC 80A50AFC 9247014E */ lbu $a3, 0x014E($s2) ## 0000014E /* 008E0 80A50B00 8E46016C */ lw $a2, 0x016C($s2) ## 0000016C /* 008E4 80A50B04 8E450150 */ lw $a1, 0x0150($s2) ## 00000150 -/* 008E8 80A50B08 AFB20018 */ sw $s2, 0x0018($sp) -/* 008EC 80A50B0C AFA00014 */ sw $zero, 0x0014($sp) -/* 008F0 80A50B10 AFAB0010 */ sw $t3, 0x0010($sp) -/* 008F4 80A50B14 0C0286B2 */ jal func_800A1AC8 +/* 008E8 80A50B08 AFB20018 */ sw $s2, 0x0018($sp) +/* 008EC 80A50B0C AFA00014 */ sw $zero, 0x0014($sp) +/* 008F0 80A50B10 AFAB0010 */ sw $t3, 0x0010($sp) +/* 008F4 80A50B14 0C0286B2 */ jal SkelAnime_DrawSV /* 008F8 80A50B18 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 008FC 80A50B1C 3C0680A5 */ lui $a2, %hi(D_80A50C34) ## $a2 = 80A50000 /* 00900 80A50B20 24C60C34 */ addiu $a2, $a2, %lo(D_80A50C34) ## $a2 = 80A50C34 /* 00904 80A50B24 27A4004C */ addiu $a0, $sp, 0x004C ## $a0 = FFFFFFE4 /* 00908 80A50B28 8E250000 */ lw $a1, 0x0000($s1) ## 00000000 -/* 0090C 80A50B2C 0C031AD5 */ jal func_800C6B54 +/* 0090C 80A50B2C 0C031AD5 */ jal Graph_CloseDisps /* 00910 80A50B30 240701A5 */ addiu $a3, $zero, 0x01A5 ## $a3 = 000001A5 -/* 00914 80A50B34 8FBF0034 */ lw $ra, 0x0034($sp) -/* 00918 80A50B38 8FB00028 */ lw $s0, 0x0028($sp) -/* 0091C 80A50B3C 8FB1002C */ lw $s1, 0x002C($sp) -/* 00920 80A50B40 8FB20030 */ lw $s2, 0x0030($sp) -/* 00924 80A50B44 03E00008 */ jr $ra +/* 00914 80A50B34 8FBF0034 */ lw $ra, 0x0034($sp) +/* 00918 80A50B38 8FB00028 */ lw $s0, 0x0028($sp) +/* 0091C 80A50B3C 8FB1002C */ lw $s1, 0x002C($sp) +/* 00920 80A50B40 8FB20030 */ lw $s2, 0x0030($sp) +/* 00924 80A50B44 03E00008 */ jr $ra /* 00928 80A50B48 27BD0068 */ addiu $sp, $sp, 0x0068 ## $sp = 00000000 /* 0092C 80A50B4C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Hata/EnHata_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Hata/EnHata_Destroy.s index afe8027293..a60ad7d2ae 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Hata/EnHata_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Hata/EnHata_Destroy.s @@ -1,19 +1,19 @@ glabel EnHata_Destroy /* 0013C 80A50E8C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00140 80A50E90 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00144 80A50E94 AFA40018 */ sw $a0, 0x0018($sp) +/* 00140 80A50E90 AFBF0014 */ sw $ra, 0x0014($sp) +/* 00144 80A50E94 AFA40018 */ sw $a0, 0x0018($sp) /* 00148 80A50E98 24840164 */ addiu $a0, $a0, 0x0164 ## $a0 = 00000164 -/* 0014C 80A50E9C 0C0295BC */ jal func_800A56F0 -/* 00150 80A50EA0 AFA5001C */ sw $a1, 0x001C($sp) -/* 00154 80A50EA4 8FA4001C */ lw $a0, 0x001C($sp) -/* 00158 80A50EA8 8FAE0018 */ lw $t6, 0x0018($sp) +/* 0014C 80A50E9C 0C0295BC */ jal SkelAnime_Free +/* 00150 80A50EA0 AFA5001C */ sw $a1, 0x001C($sp) +/* 00154 80A50EA4 8FA4001C */ lw $a0, 0x001C($sp) +/* 00158 80A50EA8 8FAE0018 */ lw $t6, 0x0018($sp) /* 0015C 80A50EAC 24850810 */ addiu $a1, $a0, 0x0810 ## $a1 = 00000810 /* 00160 80A50EB0 0C00FB56 */ jal DynaPolyInfo_Free ## DynaPolyInfo_delReserve /* 00164 80A50EB4 8DC6014C */ lw $a2, 0x014C($t6) ## 0000014C -/* 00168 80A50EB8 8FBF0014 */ lw $ra, 0x0014($sp) +/* 00168 80A50EB8 8FBF0014 */ lw $ra, 0x0014($sp) /* 0016C 80A50EBC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00170 80A50EC0 03E00008 */ jr $ra +/* 00170 80A50EC0 03E00008 */ jr $ra /* 00174 80A50EC4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Hata/EnHata_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Hata/EnHata_Init.s index ef58195882..3419d7cee2 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Hata/EnHata_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Hata/EnHata_Init.s @@ -1,58 +1,58 @@ glabel EnHata_Init /* 00000 80A50D50 27BDFFB8 */ addiu $sp, $sp, 0xFFB8 ## $sp = FFFFFFB8 -/* 00004 80A50D54 AFB00028 */ sw $s0, 0x0028($sp) +/* 00004 80A50D54 AFB00028 */ sw $s0, 0x0028($sp) /* 00008 80A50D58 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 0000C 80A50D5C AFBF002C */ sw $ra, 0x002C($sp) +/* 0000C 80A50D5C AFBF002C */ sw $ra, 0x002C($sp) /* 00010 80A50D60 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 -/* 00014 80A50D64 AFA5004C */ sw $a1, 0x004C($sp) -/* 00018 80A50D68 AFA0003C */ sw $zero, 0x003C($sp) +/* 00014 80A50D64 AFA5004C */ sw $a1, 0x004C($sp) +/* 00018 80A50D68 AFA0003C */ sw $zero, 0x003C($sp) /* 0001C 80A50D6C 0C028800 */ jal SkelAnime_GetFrameCount - + /* 00020 80A50D70 24840444 */ addiu $a0, $a0, 0x0444 ## $a0 = 06000444 /* 00024 80A50D74 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 00028 80A50D78 3C053C5A */ lui $a1, 0x3C5A ## $a1 = 3C5A0000 /* 0002C 80A50D7C 34A5740E */ ori $a1, $a1, 0x740E ## $a1 = 3C5A740E -/* 00030 80A50D80 468021A0 */ cvt.s.w $f6, $f4 +/* 00030 80A50D80 468021A0 */ cvt.s.w $f6, $f4 /* 00034 80A50D84 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 00038 80A50D88 0C00B58B */ jal Actor_SetScale - -/* 0003C 80A50D8C E7A60038 */ swc1 $f6, 0x0038($sp) + +/* 0003C 80A50D8C E7A60038 */ swc1 $f6, 0x0038($sp) /* 00040 80A50D90 26050164 */ addiu $a1, $s0, 0x0164 ## $a1 = 00000164 /* 00044 80A50D94 3C060600 */ lui $a2, 0x0600 ## $a2 = 06000000 /* 00048 80A50D98 3C070600 */ lui $a3, 0x0600 ## $a3 = 06000000 /* 0004C 80A50D9C 24E70444 */ addiu $a3, $a3, 0x0444 ## $a3 = 06000444 /* 00050 80A50DA0 24C62FD0 */ addiu $a2, $a2, 0x2FD0 ## $a2 = 06002FD0 -/* 00054 80A50DA4 AFA50034 */ sw $a1, 0x0034($sp) -/* 00058 80A50DA8 8FA4004C */ lw $a0, 0x004C($sp) -/* 0005C 80A50DAC AFA00010 */ sw $zero, 0x0010($sp) -/* 00060 80A50DB0 AFA00014 */ sw $zero, 0x0014($sp) +/* 00054 80A50DA4 AFA50034 */ sw $a1, 0x0034($sp) +/* 00058 80A50DA8 8FA4004C */ lw $a0, 0x004C($sp) +/* 0005C 80A50DAC AFA00010 */ sw $zero, 0x0010($sp) +/* 00060 80A50DB0 AFA00014 */ sw $zero, 0x0014($sp) /* 00064 80A50DB4 0C02915F */ jal SkelAnime_Init - -/* 00068 80A50DB8 AFA00018 */ sw $zero, 0x0018($sp) + +/* 00068 80A50DB8 AFA00018 */ sw $zero, 0x0018($sp) /* 0006C 80A50DBC 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 00070 80A50DC0 C7A80038 */ lwc1 $f8, 0x0038($sp) +/* 00070 80A50DC0 C7A80038 */ lwc1 $f8, 0x0038($sp) /* 00074 80A50DC4 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 00078 80A50DC8 44070000 */ mfc1 $a3, $f0 +/* 00078 80A50DC8 44070000 */ mfc1 $a3, $f0 /* 0007C 80A50DCC 24A50444 */ addiu $a1, $a1, 0x0444 ## $a1 = 06000444 -/* 00080 80A50DD0 8FA40034 */ lw $a0, 0x0034($sp) +/* 00080 80A50DD0 8FA40034 */ lw $a0, 0x0034($sp) /* 00084 80A50DD4 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 00088 80A50DD8 AFA00014 */ sw $zero, 0x0014($sp) -/* 0008C 80A50DDC E7A80010 */ swc1 $f8, 0x0010($sp) -/* 00090 80A50DE0 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 00094 80A50DE4 E7A00018 */ swc1 $f0, 0x0018($sp) +/* 00088 80A50DD8 AFA00014 */ sw $zero, 0x0014($sp) +/* 0008C 80A50DDC E7A80010 */ swc1 $f8, 0x0010($sp) +/* 00090 80A50DE0 0C029468 */ jal SkelAnime_ChangeAnim + +/* 00094 80A50DE4 E7A00018 */ swc1 $f0, 0x0018($sp) /* 00098 80A50DE8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 0009C 80A50DEC 0C010D20 */ jal DynaPolyInfo_SetActorMove - + /* 000A0 80A50DF0 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 000A4 80A50DF4 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 /* 000A8 80A50DF8 248400C0 */ addiu $a0, $a0, 0x00C0 ## $a0 = 060000C0 /* 000AC 80A50DFC 0C010620 */ jal DynaPolyInfo_Alloc - + /* 000B0 80A50E00 27A5003C */ addiu $a1, $sp, 0x003C ## $a1 = FFFFFFF4 -/* 000B4 80A50E04 8FA4004C */ lw $a0, 0x004C($sp) +/* 000B4 80A50E04 8FA4004C */ lw $a0, 0x004C($sp) /* 000B8 80A50E08 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 -/* 000BC 80A50E0C 8FA7003C */ lw $a3, 0x003C($sp) +/* 000BC 80A50E0C 8FA7003C */ lw $a3, 0x003C($sp) /* 000C0 80A50E10 0C00FA9D */ jal DynaPolyInfo_RegisterActor ## DynaPolyInfo_setActor /* 000C4 80A50E14 24850810 */ addiu $a1, $a0, 0x0810 ## $a1 = 00000810 @@ -61,11 +61,11 @@ glabel EnHata_Init /* 000D0 80A50E20 AE02014C */ sw $v0, 0x014C($s0) ## 0000014C /* 000D4 80A50E24 3C0180A5 */ lui $at, %hi(D_80A51260) ## $at = 80A50000 /* 000D8 80A50E28 E60A00F8 */ swc1 $f10, 0x00F8($s0) ## 000000F8 -/* 000DC 80A50E2C C4301260 */ lwc1 $f16, %lo(D_80A51260)($at) +/* 000DC 80A50E2C C4301260 */ lwc1 $f16, %lo(D_80A51260)($at) /* 000E0 80A50E30 3C0180A5 */ lui $at, %hi(D_80A51264) ## $at = 80A50000 /* 000E4 80A50E34 240F0006 */ addiu $t7, $zero, 0x0006 ## $t7 = 00000006 /* 000E8 80A50E38 E61000FC */ swc1 $f16, 0x00FC($s0) ## 000000FC -/* 000EC 80A50E3C C4321264 */ lwc1 $f18, %lo(D_80A51264)($at) +/* 000EC 80A50E3C C4321264 */ lwc1 $f18, %lo(D_80A51264)($at) /* 000F0 80A50E40 241803E8 */ addiu $t8, $zero, 0x03E8 ## $t8 = 000003E8 /* 000F4 80A50E44 24190001 */ addiu $t9, $zero, 0x0001 ## $t9 = 00000001 /* 000F8 80A50E48 A60F0272 */ sh $t7, 0x0272($s0) ## 00000272 @@ -75,16 +75,16 @@ glabel EnHata_Init ## Rand.Next() float /* 00108 80A50E58 E61200F4 */ swc1 $f18, 0x00F4($s0) ## 000000F4 /* 0010C 80A50E5C 3C0180A5 */ lui $at, %hi(D_80A51268) ## $at = 80A50000 -/* 00110 80A50E60 C4241268 */ lwc1 $f4, %lo(D_80A51268)($at) -/* 00114 80A50E64 46040182 */ mul.s $f6, $f0, $f4 -/* 00118 80A50E68 4600320D */ trunc.w.s $f8, $f6 -/* 0011C 80A50E6C 44094000 */ mfc1 $t1, $f8 +/* 00110 80A50E60 C4241268 */ lwc1 $f4, %lo(D_80A51268)($at) +/* 00114 80A50E64 46040182 */ mul.s $f6, $f0, $f4 +/* 00118 80A50E68 4600320D */ trunc.w.s $f8, $f6 +/* 0011C 80A50E6C 44094000 */ mfc1 $t1, $f8 /* 00120 80A50E70 00000000 */ nop /* 00124 80A50E74 A6090278 */ sh $t1, 0x0278($s0) ## 00000278 -/* 00128 80A50E78 8FBF002C */ lw $ra, 0x002C($sp) -/* 0012C 80A50E7C 8FB00028 */ lw $s0, 0x0028($sp) +/* 00128 80A50E78 8FBF002C */ lw $ra, 0x002C($sp) +/* 0012C 80A50E7C 8FB00028 */ lw $s0, 0x0028($sp) /* 00130 80A50E80 27BD0048 */ addiu $sp, $sp, 0x0048 ## $sp = 00000000 -/* 00134 80A50E84 03E00008 */ jr $ra +/* 00134 80A50E84 03E00008 */ jr $ra /* 00138 80A50E88 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Heishi1/func_80A5162C.s b/asm/non_matchings/overlays/actors/ovl_En_Heishi1/func_80A5162C.s index 6a3b221aee..34d56be0bd 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Heishi1/func_80A5162C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Heishi1/func_80A5162C.s @@ -1,52 +1,52 @@ glabel func_80A5162C /* 0035C 80A5162C 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 00360 80A51630 AFB00028 */ sw $s0, 0x0028($sp) +/* 00360 80A51630 AFB00028 */ sw $s0, 0x0028($sp) /* 00364 80A51634 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00368 80A51638 AFBF002C */ sw $ra, 0x002C($sp) +/* 00368 80A51638 AFBF002C */ sw $ra, 0x002C($sp) /* 0036C 80A5163C 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 -/* 00370 80A51640 AFA50034 */ sw $a1, 0x0034($sp) +/* 00370 80A51640 AFA50034 */ sw $a1, 0x0034($sp) /* 00374 80A51644 0C028800 */ jal SkelAnime_GetFrameCount - + /* 00378 80A51648 24845880 */ addiu $a0, $a0, 0x5880 ## $a0 = 06005880 /* 0037C 80A5164C 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 00380 80A51650 8E060284 */ lw $a2, 0x0284($s0) ## 00000284 -/* 00384 80A51654 AFA00014 */ sw $zero, 0x0014($sp) -/* 00388 80A51658 468021A0 */ cvt.s.w $f6, $f4 +/* 00384 80A51654 AFA00014 */ sw $zero, 0x0014($sp) +/* 00388 80A51658 468021A0 */ cvt.s.w $f6, $f4 /* 0038C 80A5165C 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 00390 80A51660 24A55880 */ addiu $a1, $a1, 0x5880 ## $a1 = 06005880 /* 00394 80A51664 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C /* 00398 80A51668 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 0039C 80A5166C 4600320D */ trunc.w.s $f8, $f6 -/* 003A0 80A51670 440F4000 */ mfc1 $t7, $f8 +/* 0039C 80A5166C 4600320D */ trunc.w.s $f8, $f6 +/* 003A0 80A51670 440F4000 */ mfc1 $t7, $f8 /* 003A4 80A51674 00000000 */ nop -/* 003A8 80A51678 000FC400 */ sll $t8, $t7, 16 -/* 003AC 80A5167C 0018CC03 */ sra $t9, $t8, 16 +/* 003A8 80A51678 000FC400 */ sll $t8, $t7, 16 +/* 003AC 80A5167C 0018CC03 */ sra $t9, $t8, 16 /* 003B0 80A51680 44995000 */ mtc1 $t9, $f10 ## $f10 = 0.00 /* 003B4 80A51684 00000000 */ nop -/* 003B8 80A51688 46805420 */ cvt.s.w $f16, $f10 -/* 003BC 80A5168C E7B00010 */ swc1 $f16, 0x0010($sp) +/* 003B8 80A51688 46805420 */ cvt.s.w $f16, $f10 +/* 003BC 80A5168C E7B00010 */ swc1 $f16, 0x0010($sp) /* 003C0 80A51690 C6120288 */ lwc1 $f18, 0x0288($s0) ## 00000288 -/* 003C4 80A51694 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 003C8 80A51698 E7B20018 */ swc1 $f18, 0x0018($sp) +/* 003C4 80A51694 0C029468 */ jal SkelAnime_ChangeAnim + +/* 003C8 80A51698 E7B20018 */ swc1 $f18, 0x0018($sp) /* 003CC 80A5169C 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 /* 003D0 80A516A0 3C0180A5 */ lui $at, %hi(D_80A52C28) ## $at = 80A50000 /* 003D4 80A516A4 E6000278 */ swc1 $f0, 0x0278($s0) ## 00000278 /* 003D8 80A516A8 E6000274 */ swc1 $f0, 0x0274($s0) ## 00000274 /* 003DC 80A516AC 0C00CFBE */ jal Math_Rand_ZeroFloat - -/* 003E0 80A516B0 C42C2C28 */ lwc1 $f12, %lo(D_80A52C28)($at) -/* 003E4 80A516B4 4600010D */ trunc.w.s $f4, $f0 + +/* 003E0 80A516B0 C42C2C28 */ lwc1 $f12, %lo(D_80A52C28)($at) +/* 003E4 80A516B4 4600010D */ trunc.w.s $f4, $f0 /* 003E8 80A516B8 3C0A80A5 */ lui $t2, %hi(func_80A516E4) ## $t2 = 80A50000 /* 003EC 80A516BC 254A16E4 */ addiu $t2, $t2, %lo(func_80A516E4) ## $t2 = 80A516E4 /* 003F0 80A516C0 AE0A025C */ sw $t2, 0x025C($s0) ## 0000025C -/* 003F4 80A516C4 44092000 */ mfc1 $t1, $f4 +/* 003F4 80A516C4 44092000 */ mfc1 $t1, $f4 /* 003F8 80A516C8 00000000 */ nop /* 003FC 80A516CC A6090262 */ sh $t1, 0x0262($s0) ## 00000262 -/* 00400 80A516D0 8FBF002C */ lw $ra, 0x002C($sp) -/* 00404 80A516D4 8FB00028 */ lw $s0, 0x0028($sp) +/* 00400 80A516D0 8FBF002C */ lw $ra, 0x002C($sp) +/* 00404 80A516D4 8FB00028 */ lw $s0, 0x0028($sp) /* 00408 80A516D8 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 0040C 80A516DC 03E00008 */ jr $ra +/* 0040C 80A516DC 03E00008 */ jr $ra /* 00410 80A516E0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Heishi1/func_80A516E4.s b/asm/non_matchings/overlays/actors/ovl_En_Heishi1/func_80A516E4.s index 513311652f..46b1752f34 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Heishi1/func_80A516E4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Heishi1/func_80A516E4.s @@ -92,7 +92,7 @@ glabel func_80A516E4 /* 00560 80A51830 46105301 */ sub.s $f12, $f10, $f16 /* 00564 80A51834 46062381 */ sub.s $f14, $f4, $f6 /* 00568 80A51838 E7AC003C */ swc1 $f12, 0x003C($sp) -/* 0056C 80A5183C 0C03F494 */ jal func_800FD250 +/* 0056C 80A5183C 0C03F494 */ jal Math_atan2f /* 00570 80A51840 E7AE0038 */ swc1 $f14, 0x0038($sp) /* 00574 80A51844 3C0180A5 */ lui $at, %hi(D_80A52C2C) ## $at = 80A50000 /* 00578 80A51848 C4282C2C */ lwc1 $f8, %lo(D_80A52C2C)($at) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Heishi1/func_80A51A98.s b/asm/non_matchings/overlays/actors/ovl_En_Heishi1/func_80A51A98.s index bdf14760b6..63fe3a7aa8 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Heishi1/func_80A51A98.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Heishi1/func_80A51A98.s @@ -1,52 +1,52 @@ glabel func_80A51A98 /* 007C8 80A51A98 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 007CC 80A51A9C AFB00028 */ sw $s0, 0x0028($sp) +/* 007CC 80A51A9C AFB00028 */ sw $s0, 0x0028($sp) /* 007D0 80A51AA0 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 007D4 80A51AA4 AFBF002C */ sw $ra, 0x002C($sp) +/* 007D4 80A51AA4 AFBF002C */ sw $ra, 0x002C($sp) /* 007D8 80A51AA8 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 -/* 007DC 80A51AAC AFA50034 */ sw $a1, 0x0034($sp) +/* 007DC 80A51AAC AFA50034 */ sw $a1, 0x0034($sp) /* 007E0 80A51AB0 0C028800 */ jal SkelAnime_GetFrameCount - + /* 007E4 80A51AB4 24845880 */ addiu $a0, $a0, 0x5880 ## $a0 = 06005880 /* 007E8 80A51AB8 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 007EC 80A51ABC 3C01C040 */ lui $at, 0xC040 ## $at = C0400000 /* 007F0 80A51AC0 44819000 */ mtc1 $at, $f18 ## $f18 = -3.00 -/* 007F4 80A51AC4 468021A0 */ cvt.s.w $f6, $f4 +/* 007F4 80A51AC4 468021A0 */ cvt.s.w $f6, $f4 /* 007F8 80A51AC8 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 007FC 80A51ACC 24A55880 */ addiu $a1, $a1, 0x5880 ## $a1 = 06005880 /* 00800 80A51AD0 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C /* 00804 80A51AD4 3C064040 */ lui $a2, 0x4040 ## $a2 = 40400000 /* 00808 80A51AD8 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 0080C 80A51ADC 4600320D */ trunc.w.s $f8, $f6 -/* 00810 80A51AE0 AFA00014 */ sw $zero, 0x0014($sp) -/* 00814 80A51AE4 E7B20018 */ swc1 $f18, 0x0018($sp) -/* 00818 80A51AE8 440F4000 */ mfc1 $t7, $f8 +/* 0080C 80A51ADC 4600320D */ trunc.w.s $f8, $f6 +/* 00810 80A51AE0 AFA00014 */ sw $zero, 0x0014($sp) +/* 00814 80A51AE4 E7B20018 */ swc1 $f18, 0x0018($sp) +/* 00818 80A51AE8 440F4000 */ mfc1 $t7, $f8 /* 0081C 80A51AEC 00000000 */ nop -/* 00820 80A51AF0 000FC400 */ sll $t8, $t7, 16 -/* 00824 80A51AF4 0018CC03 */ sra $t9, $t8, 16 +/* 00820 80A51AF0 000FC400 */ sll $t8, $t7, 16 +/* 00824 80A51AF4 0018CC03 */ sra $t9, $t8, 16 /* 00828 80A51AF8 44995000 */ mtc1 $t9, $f10 ## $f10 = 0.00 /* 0082C 80A51AFC 00000000 */ nop -/* 00830 80A51B00 46805420 */ cvt.s.w $f16, $f10 -/* 00834 80A51B04 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 00838 80A51B08 E7B00010 */ swc1 $f16, 0x0010($sp) +/* 00830 80A51B00 46805420 */ cvt.s.w $f16, $f10 +/* 00834 80A51B04 0C029468 */ jal SkelAnime_ChangeAnim + +/* 00838 80A51B08 E7B00010 */ swc1 $f16, 0x0010($sp) /* 0083C 80A51B0C 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 /* 00840 80A51B10 2405702D */ addiu $a1, $zero, 0x702D ## $a1 = 0000702D /* 00844 80A51B14 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 00848 80A51B18 E6000278 */ swc1 $f0, 0x0278($s0) ## 00000278 /* 0084C 80A51B1C E6000274 */ swc1 $f0, 0x0274($s0) ## 00000274 -/* 00850 80A51B20 0C042DA0 */ jal func_8010B680 -/* 00854 80A51B24 8FA40034 */ lw $a0, 0x0034($sp) -/* 00858 80A51B28 8FA40034 */ lw $a0, 0x0034($sp) -/* 0085C 80A51B2C 0C021BC0 */ jal Interface_SetDoAction +/* 00850 80A51B20 0C042DA0 */ jal func_8010B680 +/* 00854 80A51B24 8FA40034 */ lw $a0, 0x0034($sp) +/* 00858 80A51B28 8FA40034 */ lw $a0, 0x0034($sp) +/* 0085C 80A51B2C 0C021BC0 */ jal Interface_SetDoAction /* 00860 80A51B30 24050012 */ addiu $a1, $zero, 0x0012 ## $a1 = 00000012 /* 00864 80A51B34 3C0880A5 */ lui $t0, %hi(func_80A51B54) ## $t0 = 80A50000 /* 00868 80A51B38 25081B54 */ addiu $t0, $t0, %lo(func_80A51B54) ## $t0 = 80A51B54 /* 0086C 80A51B3C AE08025C */ sw $t0, 0x025C($s0) ## 0000025C -/* 00870 80A51B40 8FBF002C */ lw $ra, 0x002C($sp) -/* 00874 80A51B44 8FB00028 */ lw $s0, 0x0028($sp) +/* 00870 80A51B40 8FBF002C */ lw $ra, 0x002C($sp) +/* 00874 80A51B44 8FB00028 */ lw $s0, 0x0028($sp) /* 00878 80A51B48 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 0087C 80A51B4C 03E00008 */ jr $ra +/* 0087C 80A51B4C 03E00008 */ jr $ra /* 00880 80A51B50 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Heishi1/func_80A51C4C.s b/asm/non_matchings/overlays/actors/ovl_En_Heishi1/func_80A51C4C.s index 7a02b50ba0..786de4a345 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Heishi1/func_80A51C4C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Heishi1/func_80A51C4C.s @@ -1,58 +1,58 @@ glabel func_80A51C4C /* 0097C 80A51C4C 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 00980 80A51C50 AFB00028 */ sw $s0, 0x0028($sp) +/* 00980 80A51C50 AFB00028 */ sw $s0, 0x0028($sp) /* 00984 80A51C54 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00988 80A51C58 AFBF002C */ sw $ra, 0x002C($sp) +/* 00988 80A51C58 AFBF002C */ sw $ra, 0x002C($sp) /* 0098C 80A51C5C 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 -/* 00990 80A51C60 AFA50034 */ sw $a1, 0x0034($sp) +/* 00990 80A51C60 AFA50034 */ sw $a1, 0x0034($sp) /* 00994 80A51C64 0C028800 */ jal SkelAnime_GetFrameCount - + /* 00998 80A51C68 24845C30 */ addiu $a0, $a0, 0x5C30 ## $a0 = 06005C30 /* 0099C 80A51C6C 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 009A0 80A51C70 8E060284 */ lw $a2, 0x0284($s0) ## 00000284 -/* 009A4 80A51C74 AFA00014 */ sw $zero, 0x0014($sp) -/* 009A8 80A51C78 468021A0 */ cvt.s.w $f6, $f4 +/* 009A4 80A51C74 AFA00014 */ sw $zero, 0x0014($sp) +/* 009A8 80A51C78 468021A0 */ cvt.s.w $f6, $f4 /* 009AC 80A51C7C 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 009B0 80A51C80 24A55C30 */ addiu $a1, $a1, 0x5C30 ## $a1 = 06005C30 /* 009B4 80A51C84 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C /* 009B8 80A51C88 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 009BC 80A51C8C 4600320D */ trunc.w.s $f8, $f6 -/* 009C0 80A51C90 440F4000 */ mfc1 $t7, $f8 +/* 009BC 80A51C8C 4600320D */ trunc.w.s $f8, $f6 +/* 009C0 80A51C90 440F4000 */ mfc1 $t7, $f8 /* 009C4 80A51C94 00000000 */ nop -/* 009C8 80A51C98 000FC400 */ sll $t8, $t7, 16 -/* 009CC 80A51C9C 0018CC03 */ sra $t9, $t8, 16 +/* 009C8 80A51C98 000FC400 */ sll $t8, $t7, 16 +/* 009CC 80A51C9C 0018CC03 */ sra $t9, $t8, 16 /* 009D0 80A51CA0 44995000 */ mtc1 $t9, $f10 ## $f10 = 0.00 /* 009D4 80A51CA4 00000000 */ nop -/* 009D8 80A51CA8 46805420 */ cvt.s.w $f16, $f10 -/* 009DC 80A51CAC E7B00010 */ swc1 $f16, 0x0010($sp) +/* 009D8 80A51CA8 46805420 */ cvt.s.w $f16, $f10 +/* 009DC 80A51CAC E7B00010 */ swc1 $f16, 0x0010($sp) /* 009E0 80A51CB0 C6120288 */ lwc1 $f18, 0x0288($s0) ## 00000288 -/* 009E4 80A51CB4 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 009E8 80A51CB8 E7B20018 */ swc1 $f18, 0x0018($sp) +/* 009E4 80A51CB4 0C029468 */ jal SkelAnime_ChangeAnim + +/* 009E8 80A51CB8 E7B20018 */ swc1 $f18, 0x0018($sp) /* 009EC 80A51CBC A6000264 */ sh $zero, 0x0264($s0) ## 00000264 /* 009F0 80A51CC0 3C0180A5 */ lui $at, %hi(D_80A52C34) ## $at = 80A50000 /* 009F4 80A51CC4 0C00CFBE */ jal Math_Rand_ZeroFloat - -/* 009F8 80A51CC8 C42C2C34 */ lwc1 $f12, %lo(D_80A52C34)($at) -/* 009FC 80A51CCC 4600010D */ trunc.w.s $f4, $f0 + +/* 009F8 80A51CC8 C42C2C34 */ lwc1 $f12, %lo(D_80A52C34)($at) +/* 009FC 80A51CCC 4600010D */ trunc.w.s $f4, $f0 /* 00A00 80A51CD0 3C014248 */ lui $at, 0x4248 ## $at = 42480000 /* 00A04 80A51CD4 44816000 */ mtc1 $at, $f12 ## $f12 = 50.00 -/* 00A08 80A51CD8 44092000 */ mfc1 $t1, $f4 +/* 00A08 80A51CD8 44092000 */ mfc1 $t1, $f4 /* 00A0C 80A51CDC 0C00CFBE */ jal Math_Rand_ZeroFloat - + /* 00A10 80A51CE0 A6090262 */ sh $t1, 0x0262($s0) ## 00000262 -/* 00A14 80A51CE4 4600018D */ trunc.w.s $f6, $f0 +/* 00A14 80A51CE4 4600018D */ trunc.w.s $f6, $f0 /* 00A18 80A51CE8 3C0F80A5 */ lui $t7, %hi(func_80A51D18) ## $t7 = 80A50000 /* 00A1C 80A51CEC 25EF1D18 */ addiu $t7, $t7, %lo(func_80A51D18) ## $t7 = 80A51D18 /* 00A20 80A51CF0 AE0F025C */ sw $t7, 0x025C($s0) ## 0000025C -/* 00A24 80A51CF4 440D3000 */ mfc1 $t5, $f6 +/* 00A24 80A51CF4 440D3000 */ mfc1 $t5, $f6 /* 00A28 80A51CF8 00000000 */ nop /* 00A2C 80A51CFC 25AE0032 */ addiu $t6, $t5, 0x0032 ## $t6 = 00000032 /* 00A30 80A51D00 A60E02A6 */ sh $t6, 0x02A6($s0) ## 000002A6 -/* 00A34 80A51D04 8FBF002C */ lw $ra, 0x002C($sp) -/* 00A38 80A51D08 8FB00028 */ lw $s0, 0x0028($sp) +/* 00A34 80A51D04 8FBF002C */ lw $ra, 0x002C($sp) +/* 00A38 80A51D08 8FB00028 */ lw $s0, 0x0028($sp) /* 00A3C 80A51D0C 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 00A40 80A51D10 03E00008 */ jr $ra +/* 00A40 80A51D10 03E00008 */ jr $ra /* 00A44 80A51D14 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Heishi1/func_80A51F50.s b/asm/non_matchings/overlays/actors/ovl_En_Heishi1/func_80A51F50.s index b8aedff865..4ae77676c3 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Heishi1/func_80A51F50.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Heishi1/func_80A51F50.s @@ -1,44 +1,44 @@ glabel func_80A51F50 /* 00C80 80A51F50 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 00C84 80A51F54 AFA40028 */ sw $a0, 0x0028($sp) -/* 00C88 80A51F58 AFBF0024 */ sw $ra, 0x0024($sp) +/* 00C84 80A51F54 AFA40028 */ sw $a0, 0x0028($sp) +/* 00C88 80A51F58 AFBF0024 */ sw $ra, 0x0024($sp) /* 00C8C 80A51F5C 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 -/* 00C90 80A51F60 AFA5002C */ sw $a1, 0x002C($sp) +/* 00C90 80A51F60 AFA5002C */ sw $a1, 0x002C($sp) /* 00C94 80A51F64 0C028800 */ jal SkelAnime_GetFrameCount - + /* 00C98 80A51F68 24845C30 */ addiu $a0, $a0, 0x5C30 ## $a0 = 06005C30 /* 00C9C 80A51F6C 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 00CA0 80A51F70 3C01C120 */ lui $at, 0xC120 ## $at = C1200000 /* 00CA4 80A51F74 44819000 */ mtc1 $at, $f18 ## $f18 = -10.00 -/* 00CA8 80A51F78 468021A0 */ cvt.s.w $f6, $f4 -/* 00CAC 80A51F7C 8FA40028 */ lw $a0, 0x0028($sp) +/* 00CA8 80A51F78 468021A0 */ cvt.s.w $f6, $f4 +/* 00CAC 80A51F7C 8FA40028 */ lw $a0, 0x0028($sp) /* 00CB0 80A51F80 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 00CB4 80A51F84 24A55C30 */ addiu $a1, $a1, 0x5C30 ## $a1 = 06005C30 /* 00CB8 80A51F88 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 00CBC 80A51F8C 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 00CC0 80A51F90 4600320D */ trunc.w.s $f8, $f6 -/* 00CC4 80A51F94 AFA00014 */ sw $zero, 0x0014($sp) -/* 00CC8 80A51F98 E7B20018 */ swc1 $f18, 0x0018($sp) +/* 00CC0 80A51F90 4600320D */ trunc.w.s $f8, $f6 +/* 00CC4 80A51F94 AFA00014 */ sw $zero, 0x0014($sp) +/* 00CC8 80A51F98 E7B20018 */ swc1 $f18, 0x0018($sp) /* 00CCC 80A51F9C 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 00CD0 80A51FA0 440F4000 */ mfc1 $t7, $f8 +/* 00CD0 80A51FA0 440F4000 */ mfc1 $t7, $f8 /* 00CD4 80A51FA4 00000000 */ nop -/* 00CD8 80A51FA8 000FC400 */ sll $t8, $t7, 16 -/* 00CDC 80A51FAC 0018CC03 */ sra $t9, $t8, 16 +/* 00CD8 80A51FA8 000FC400 */ sll $t8, $t7, 16 +/* 00CDC 80A51FAC 0018CC03 */ sra $t9, $t8, 16 /* 00CE0 80A51FB0 44995000 */ mtc1 $t9, $f10 ## $f10 = 0.00 /* 00CE4 80A51FB4 00000000 */ nop -/* 00CE8 80A51FB8 46805420 */ cvt.s.w $f16, $f10 -/* 00CEC 80A51FBC 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 00CF0 80A51FC0 E7B00010 */ swc1 $f16, 0x0010($sp) -/* 00CF4 80A51FC4 8FA20028 */ lw $v0, 0x0028($sp) +/* 00CE8 80A51FB8 46805420 */ cvt.s.w $f16, $f10 +/* 00CEC 80A51FBC 0C029468 */ jal SkelAnime_ChangeAnim + +/* 00CF0 80A51FC0 E7B00010 */ swc1 $f16, 0x0010($sp) +/* 00CF4 80A51FC4 8FA20028 */ lw $v0, 0x0028($sp) /* 00CF8 80A51FC8 3C0980A5 */ lui $t1, %hi(func_80A51FEC) ## $t1 = 80A50000 /* 00CFC 80A51FCC 2408001E */ addiu $t0, $zero, 0x001E ## $t0 = 0000001E /* 00D00 80A51FD0 25291FEC */ addiu $t1, $t1, %lo(func_80A51FEC) ## $t1 = 80A51FEC /* 00D04 80A51FD4 A44802A8 */ sh $t0, 0x02A8($v0) ## 000002A8 /* 00D08 80A51FD8 AC49025C */ sw $t1, 0x025C($v0) ## 0000025C -/* 00D0C 80A51FDC 8FBF0024 */ lw $ra, 0x0024($sp) +/* 00D0C 80A51FDC 8FBF0024 */ lw $ra, 0x0024($sp) /* 00D10 80A51FE0 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 00D14 80A51FE4 03E00008 */ jr $ra +/* 00D14 80A51FE4 03E00008 */ jr $ra /* 00D18 80A51FE8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Heishi1/func_80A52098.s b/asm/non_matchings/overlays/actors/ovl_En_Heishi1/func_80A52098.s index 0b21867476..2c1ee94536 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Heishi1/func_80A52098.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Heishi1/func_80A52098.s @@ -1,42 +1,42 @@ glabel func_80A52098 /* 00DC8 80A52098 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 00DCC 80A5209C AFA40028 */ sw $a0, 0x0028($sp) -/* 00DD0 80A520A0 AFBF0024 */ sw $ra, 0x0024($sp) +/* 00DCC 80A5209C AFA40028 */ sw $a0, 0x0028($sp) +/* 00DD0 80A520A0 AFBF0024 */ sw $ra, 0x0024($sp) /* 00DD4 80A520A4 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 -/* 00DD8 80A520A8 AFA5002C */ sw $a1, 0x002C($sp) +/* 00DD8 80A520A8 AFA5002C */ sw $a1, 0x002C($sp) /* 00DDC 80A520AC 0C028800 */ jal SkelAnime_GetFrameCount - + /* 00DE0 80A520B0 24845C30 */ addiu $a0, $a0, 0x5C30 ## $a0 = 06005C30 /* 00DE4 80A520B4 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 00DE8 80A520B8 3C01C120 */ lui $at, 0xC120 ## $at = C1200000 /* 00DEC 80A520BC 44819000 */ mtc1 $at, $f18 ## $f18 = -10.00 -/* 00DF0 80A520C0 468021A0 */ cvt.s.w $f6, $f4 -/* 00DF4 80A520C4 8FA40028 */ lw $a0, 0x0028($sp) +/* 00DF0 80A520C0 468021A0 */ cvt.s.w $f6, $f4 +/* 00DF4 80A520C4 8FA40028 */ lw $a0, 0x0028($sp) /* 00DF8 80A520C8 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 00DFC 80A520CC 24A55C30 */ addiu $a1, $a1, 0x5C30 ## $a1 = 06005C30 /* 00E00 80A520D0 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 00E04 80A520D4 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 00E08 80A520D8 4600320D */ trunc.w.s $f8, $f6 -/* 00E0C 80A520DC AFA00014 */ sw $zero, 0x0014($sp) -/* 00E10 80A520E0 E7B20018 */ swc1 $f18, 0x0018($sp) +/* 00E08 80A520D8 4600320D */ trunc.w.s $f8, $f6 +/* 00E0C 80A520DC AFA00014 */ sw $zero, 0x0014($sp) +/* 00E10 80A520E0 E7B20018 */ swc1 $f18, 0x0018($sp) /* 00E14 80A520E4 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 00E18 80A520E8 440F4000 */ mfc1 $t7, $f8 +/* 00E18 80A520E8 440F4000 */ mfc1 $t7, $f8 /* 00E1C 80A520EC 00000000 */ nop -/* 00E20 80A520F0 000FC400 */ sll $t8, $t7, 16 -/* 00E24 80A520F4 0018CC03 */ sra $t9, $t8, 16 +/* 00E20 80A520F0 000FC400 */ sll $t8, $t7, 16 +/* 00E24 80A520F4 0018CC03 */ sra $t9, $t8, 16 /* 00E28 80A520F8 44995000 */ mtc1 $t9, $f10 ## $f10 = 0.00 /* 00E2C 80A520FC 00000000 */ nop -/* 00E30 80A52100 46805420 */ cvt.s.w $f16, $f10 -/* 00E34 80A52104 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 00E38 80A52108 E7B00010 */ swc1 $f16, 0x0010($sp) -/* 00E3C 80A5210C 8FA90028 */ lw $t1, 0x0028($sp) +/* 00E30 80A52100 46805420 */ cvt.s.w $f16, $f10 +/* 00E34 80A52104 0C029468 */ jal SkelAnime_ChangeAnim + +/* 00E38 80A52108 E7B00010 */ swc1 $f16, 0x0010($sp) +/* 00E3C 80A5210C 8FA90028 */ lw $t1, 0x0028($sp) /* 00E40 80A52110 3C0880A5 */ lui $t0, %hi(func_80A5212C) ## $t0 = 80A50000 /* 00E44 80A52114 2508212C */ addiu $t0, $t0, %lo(func_80A5212C) ## $t0 = 80A5212C /* 00E48 80A52118 AD28025C */ sw $t0, 0x025C($t1) ## 0000025C -/* 00E4C 80A5211C 8FBF0024 */ lw $ra, 0x0024($sp) +/* 00E4C 80A5211C 8FBF0024 */ lw $ra, 0x0024($sp) /* 00E50 80A52120 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 00E54 80A52124 03E00008 */ jr $ra +/* 00E54 80A52124 03E00008 */ jr $ra /* 00E58 80A52128 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Heishi1/func_80A521FC.s b/asm/non_matchings/overlays/actors/ovl_En_Heishi1/func_80A521FC.s index edfe3cdcaa..8078dad49a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Heishi1/func_80A521FC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Heishi1/func_80A521FC.s @@ -1,42 +1,42 @@ glabel func_80A521FC /* 00F2C 80A521FC 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 00F30 80A52200 AFA40028 */ sw $a0, 0x0028($sp) -/* 00F34 80A52204 AFBF0024 */ sw $ra, 0x0024($sp) +/* 00F30 80A52200 AFA40028 */ sw $a0, 0x0028($sp) +/* 00F34 80A52204 AFBF0024 */ sw $ra, 0x0024($sp) /* 00F38 80A52208 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 -/* 00F3C 80A5220C AFA5002C */ sw $a1, 0x002C($sp) +/* 00F3C 80A5220C AFA5002C */ sw $a1, 0x002C($sp) /* 00F40 80A52210 0C028800 */ jal SkelAnime_GetFrameCount - + /* 00F44 80A52214 24845C30 */ addiu $a0, $a0, 0x5C30 ## $a0 = 06005C30 /* 00F48 80A52218 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 00F4C 80A5221C 3C01C120 */ lui $at, 0xC120 ## $at = C1200000 /* 00F50 80A52220 44819000 */ mtc1 $at, $f18 ## $f18 = -10.00 -/* 00F54 80A52224 468021A0 */ cvt.s.w $f6, $f4 -/* 00F58 80A52228 8FA40028 */ lw $a0, 0x0028($sp) +/* 00F54 80A52224 468021A0 */ cvt.s.w $f6, $f4 +/* 00F58 80A52228 8FA40028 */ lw $a0, 0x0028($sp) /* 00F5C 80A5222C 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 00F60 80A52230 24A55C30 */ addiu $a1, $a1, 0x5C30 ## $a1 = 06005C30 /* 00F64 80A52234 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 00F68 80A52238 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 00F6C 80A5223C 4600320D */ trunc.w.s $f8, $f6 -/* 00F70 80A52240 AFA00014 */ sw $zero, 0x0014($sp) -/* 00F74 80A52244 E7B20018 */ swc1 $f18, 0x0018($sp) +/* 00F6C 80A5223C 4600320D */ trunc.w.s $f8, $f6 +/* 00F70 80A52240 AFA00014 */ sw $zero, 0x0014($sp) +/* 00F74 80A52244 E7B20018 */ swc1 $f18, 0x0018($sp) /* 00F78 80A52248 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 00F7C 80A5224C 440F4000 */ mfc1 $t7, $f8 +/* 00F7C 80A5224C 440F4000 */ mfc1 $t7, $f8 /* 00F80 80A52250 00000000 */ nop -/* 00F84 80A52254 000FC400 */ sll $t8, $t7, 16 -/* 00F88 80A52258 0018CC03 */ sra $t9, $t8, 16 +/* 00F84 80A52254 000FC400 */ sll $t8, $t7, 16 +/* 00F88 80A52258 0018CC03 */ sra $t9, $t8, 16 /* 00F8C 80A5225C 44995000 */ mtc1 $t9, $f10 ## $f10 = 0.00 /* 00F90 80A52260 00000000 */ nop -/* 00F94 80A52264 46805420 */ cvt.s.w $f16, $f10 -/* 00F98 80A52268 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 00F9C 80A5226C E7B00010 */ swc1 $f16, 0x0010($sp) -/* 00FA0 80A52270 8FA90028 */ lw $t1, 0x0028($sp) +/* 00F94 80A52264 46805420 */ cvt.s.w $f16, $f10 +/* 00F98 80A52268 0C029468 */ jal SkelAnime_ChangeAnim + +/* 00F9C 80A5226C E7B00010 */ swc1 $f16, 0x0010($sp) +/* 00FA0 80A52270 8FA90028 */ lw $t1, 0x0028($sp) /* 00FA4 80A52274 3C0880A5 */ lui $t0, %hi(func_80A52290) ## $t0 = 80A50000 /* 00FA8 80A52278 25082290 */ addiu $t0, $t0, %lo(func_80A52290) ## $t0 = 80A52290 /* 00FAC 80A5227C AD28025C */ sw $t0, 0x025C($t1) ## 0000025C -/* 00FB0 80A52280 8FBF0024 */ lw $ra, 0x0024($sp) +/* 00FB0 80A52280 8FBF0024 */ lw $ra, 0x0024($sp) /* 00FB4 80A52284 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 00FB8 80A52288 03E00008 */ jr $ra +/* 00FB8 80A52288 03E00008 */ jr $ra /* 00FBC 80A5228C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Heishi2/EnHeishi2_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Heishi2/EnHeishi2_Draw.s index 0f98506f6c..7ff45b836a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Heishi2/EnHeishi2_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Heishi2/EnHeishi2_Draw.s @@ -11,7 +11,7 @@ glabel EnHeishi2_Draw /* 01EB0 80A54D50 24C65294 */ addiu $a2, $a2, %lo(D_80A55294) ## $a2 = 80A55294 /* 01EB4 80A54D54 27A40048 */ addiu $a0, $sp, 0x0048 ## $a0 = FFFFFFE0 /* 01EB8 80A54D58 24070700 */ addiu $a3, $zero, 0x0700 ## $a3 = 00000700 -/* 01EBC 80A54D5C 0C031AB1 */ jal func_800C6AC4 +/* 01EBC 80A54D5C 0C031AB1 */ jal Graph_OpenDisps /* 01EC0 80A54D60 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 /* 01EC4 80A54D64 0C024F46 */ jal func_80093D18 /* 01EC8 80A54D68 8E240000 */ lw $a0, 0x0000($s1) ## 00000000 @@ -106,7 +106,7 @@ glabel EnHeishi2_Draw /* 02020 80A54EC0 24C652BC */ addiu $a2, $a2, %lo(D_80A552BC) ## $a2 = 80A552BC /* 02024 80A54EC4 27A40048 */ addiu $a0, $sp, 0x0048 ## $a0 = FFFFFFE0 /* 02028 80A54EC8 8E250000 */ lw $a1, 0x0000($s1) ## 00000000 -/* 0202C 80A54ECC 0C031AD5 */ jal func_800C6B54 +/* 0202C 80A54ECC 0C031AD5 */ jal Graph_CloseDisps /* 02030 80A54ED0 2407072A */ addiu $a3, $zero, 0x072A ## $a3 = 0000072A /* 02034 80A54ED4 8FBF002C */ lw $ra, 0x002C($sp) /* 02038 80A54ED8 8FB00020 */ lw $s0, 0x0020($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A531E4.s b/asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A531E4.s index 3029653e7a..f28c1c848f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A531E4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A531E4.s @@ -1,42 +1,42 @@ glabel func_80A531E4 /* 00344 80A531E4 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 00348 80A531E8 AFA40028 */ sw $a0, 0x0028($sp) -/* 0034C 80A531EC AFBF0024 */ sw $ra, 0x0024($sp) +/* 00348 80A531E8 AFA40028 */ sw $a0, 0x0028($sp) +/* 0034C 80A531EC AFBF0024 */ sw $ra, 0x0024($sp) /* 00350 80A531F0 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 -/* 00354 80A531F4 AFA5002C */ sw $a1, 0x002C($sp) +/* 00354 80A531F4 AFA5002C */ sw $a1, 0x002C($sp) /* 00358 80A531F8 0C028800 */ jal SkelAnime_GetFrameCount - + /* 0035C 80A531FC 24845C30 */ addiu $a0, $a0, 0x5C30 ## $a0 = 06005C30 /* 00360 80A53200 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 00364 80A53204 3C01C120 */ lui $at, 0xC120 ## $at = C1200000 /* 00368 80A53208 44819000 */ mtc1 $at, $f18 ## $f18 = -10.00 -/* 0036C 80A5320C 468021A0 */ cvt.s.w $f6, $f4 -/* 00370 80A53210 8FA40028 */ lw $a0, 0x0028($sp) +/* 0036C 80A5320C 468021A0 */ cvt.s.w $f6, $f4 +/* 00370 80A53210 8FA40028 */ lw $a0, 0x0028($sp) /* 00374 80A53214 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 00378 80A53218 24A55C30 */ addiu $a1, $a1, 0x5C30 ## $a1 = 06005C30 /* 0037C 80A5321C 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 00380 80A53220 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 00384 80A53224 4600320D */ trunc.w.s $f8, $f6 -/* 00388 80A53228 AFA00014 */ sw $zero, 0x0014($sp) -/* 0038C 80A5322C E7B20018 */ swc1 $f18, 0x0018($sp) +/* 00384 80A53224 4600320D */ trunc.w.s $f8, $f6 +/* 00388 80A53228 AFA00014 */ sw $zero, 0x0014($sp) +/* 0038C 80A5322C E7B20018 */ swc1 $f18, 0x0018($sp) /* 00390 80A53230 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 00394 80A53234 440F4000 */ mfc1 $t7, $f8 +/* 00394 80A53234 440F4000 */ mfc1 $t7, $f8 /* 00398 80A53238 00000000 */ nop -/* 0039C 80A5323C 000FC400 */ sll $t8, $t7, 16 -/* 003A0 80A53240 0018CC03 */ sra $t9, $t8, 16 +/* 0039C 80A5323C 000FC400 */ sll $t8, $t7, 16 +/* 003A0 80A53240 0018CC03 */ sra $t9, $t8, 16 /* 003A4 80A53244 44995000 */ mtc1 $t9, $f10 ## $f10 = 0.00 /* 003A8 80A53248 00000000 */ nop -/* 003AC 80A5324C 46805420 */ cvt.s.w $f16, $f10 -/* 003B0 80A53250 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 003B4 80A53254 E7B00010 */ swc1 $f16, 0x0010($sp) -/* 003B8 80A53258 8FA90028 */ lw $t1, 0x0028($sp) +/* 003AC 80A5324C 46805420 */ cvt.s.w $f16, $f10 +/* 003B0 80A53250 0C029468 */ jal SkelAnime_ChangeAnim + +/* 003B4 80A53254 E7B00010 */ swc1 $f16, 0x0010($sp) +/* 003B8 80A53258 8FA90028 */ lw $t1, 0x0028($sp) /* 003BC 80A5325C 3C0880A5 */ lui $t0, %hi(func_80A53278) ## $t0 = 80A50000 /* 003C0 80A53260 25083278 */ addiu $t0, $t0, %lo(func_80A53278) ## $t0 = 80A53278 /* 003C4 80A53264 AD28025C */ sw $t0, 0x025C($t1) ## 0000025C -/* 003C8 80A53268 8FBF0024 */ lw $ra, 0x0024($sp) +/* 003C8 80A53268 8FBF0024 */ lw $ra, 0x0024($sp) /* 003CC 80A5326C 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 003D0 80A53270 03E00008 */ jr $ra +/* 003D0 80A53270 03E00008 */ jr $ra /* 003D4 80A53274 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A53278.s b/asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A53278.s index 574b2e5d73..22bed00708 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A53278.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A53278.s @@ -7,11 +7,11 @@ glabel func_80A53278 /* 003EC 80A5328C A080030B */ sb $zero, 0x030B($a0) ## 0000030B /* 003F0 80A53290 A480030E */ sh $zero, 0x030E($a0) ## 0000030E /* 003F4 80A53294 8FA40024 */ lw $a0, 0x0024($sp) -/* 003F8 80A53298 0C01B0D8 */ jal func_8006C360 +/* 003F8 80A53298 0C01B0D8 */ jal Text_GetFaceReaction /* 003FC 80A5329C 24050005 */ addiu $a1, $zero, 0x0005 ## $a1 = 00000005 /* 00400 80A532A0 1040000C */ beq $v0, $zero, .L80A532D4 /* 00404 80A532A4 8FA40024 */ lw $a0, 0x0024($sp) -/* 00408 80A532A8 0C01B0D8 */ jal func_8006C360 +/* 00408 80A532A8 0C01B0D8 */ jal Text_GetFaceReaction /* 0040C 80A532AC 24050005 */ addiu $a1, $zero, 0x0005 ## $a1 = 00000005 /* 00410 80A532B0 3C1880A5 */ lui $t8, %hi(func_80A5475C) ## $t8 = 80A50000 /* 00414 80A532B4 240E0001 */ addiu $t6, $zero, 0x0001 ## $t6 = 00000001 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A535BC.s b/asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A535BC.s index 6899fe7d8c..75cd939119 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A535BC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A535BC.s @@ -1,36 +1,36 @@ glabel func_80A535BC /* 0071C 80A535BC 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 00720 80A535C0 AFA40028 */ sw $a0, 0x0028($sp) -/* 00724 80A535C4 AFBF0024 */ sw $ra, 0x0024($sp) +/* 00720 80A535C0 AFA40028 */ sw $a0, 0x0028($sp) +/* 00724 80A535C4 AFBF0024 */ sw $ra, 0x0024($sp) /* 00728 80A535C8 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 -/* 0072C 80A535CC AFA5002C */ sw $a1, 0x002C($sp) +/* 0072C 80A535CC AFA5002C */ sw $a1, 0x002C($sp) /* 00730 80A535D0 0C028800 */ jal SkelAnime_GetFrameCount - + /* 00734 80A535D4 24845500 */ addiu $a0, $a0, 0x5500 ## $a0 = 06005500 /* 00738 80A535D8 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 -/* 0073C 80A535DC 8FA30028 */ lw $v1, 0x0028($sp) +/* 0073C 80A535DC 8FA30028 */ lw $v1, 0x0028($sp) /* 00740 80A535E0 3C01C120 */ lui $at, 0xC120 ## $at = C1200000 -/* 00744 80A535E4 46802020 */ cvt.s.w $f0, $f4 +/* 00744 80A535E4 46802020 */ cvt.s.w $f0, $f4 /* 00748 80A535E8 44813000 */ mtc1 $at, $f6 ## $f6 = -10.00 /* 0074C 80A535EC 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 00750 80A535F0 240E0002 */ addiu $t6, $zero, 0x0002 ## $t6 = 00000002 /* 00754 80A535F4 24A55500 */ addiu $a1, $a1, 0x5500 ## $a1 = 06005500 /* 00758 80A535F8 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 0075C 80A535FC E46002EC */ swc1 $f0, 0x02EC($v1) ## 000002EC -/* 00760 80A53600 AFAE0014 */ sw $t6, 0x0014($sp) -/* 00764 80A53604 E7A00010 */ swc1 $f0, 0x0010($sp) +/* 00760 80A53600 AFAE0014 */ sw $t6, 0x0014($sp) +/* 00764 80A53604 E7A00010 */ swc1 $f0, 0x0010($sp) /* 00768 80A53608 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 /* 0076C 80A5360C 2464014C */ addiu $a0, $v1, 0x014C ## $a0 = 0000014C -/* 00770 80A53610 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 00774 80A53614 E7A60018 */ swc1 $f6, 0x0018($sp) -/* 00778 80A53618 8FB80028 */ lw $t8, 0x0028($sp) +/* 00770 80A53610 0C029468 */ jal SkelAnime_ChangeAnim + +/* 00774 80A53614 E7A60018 */ swc1 $f6, 0x0018($sp) +/* 00778 80A53618 8FB80028 */ lw $t8, 0x0028($sp) /* 0077C 80A5361C 3C0F80A5 */ lui $t7, %hi(func_80A53638) ## $t7 = 80A50000 /* 00780 80A53620 25EF3638 */ addiu $t7, $t7, %lo(func_80A53638) ## $t7 = 80A53638 /* 00784 80A53624 AF0F025C */ sw $t7, 0x025C($t8) ## 0000025C -/* 00788 80A53628 8FBF0024 */ lw $ra, 0x0024($sp) +/* 00788 80A53628 8FBF0024 */ lw $ra, 0x0024($sp) /* 0078C 80A5362C 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 00790 80A53630 03E00008 */ jr $ra +/* 00790 80A53630 03E00008 */ jr $ra /* 00794 80A53634 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A5372C.s b/asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A5372C.s index 4dda3f27cc..b05f51ab4b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A5372C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A5372C.s @@ -1,78 +1,78 @@ glabel func_80A5372C /* 0088C 80A5372C 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 00890 80A53730 AFB00028 */ sw $s0, 0x0028($sp) +/* 00890 80A53730 AFB00028 */ sw $s0, 0x0028($sp) /* 00894 80A53734 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00898 80A53738 AFBF002C */ sw $ra, 0x002C($sp) +/* 00898 80A53738 AFBF002C */ sw $ra, 0x002C($sp) /* 0089C 80A5373C 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 -/* 008A0 80A53740 AFA50034 */ sw $a1, 0x0034($sp) +/* 008A0 80A53740 AFA50034 */ sw $a1, 0x0034($sp) /* 008A4 80A53744 0C028800 */ jal SkelAnime_GetFrameCount - + /* 008A8 80A53748 24845C30 */ addiu $a0, $a0, 0x5C30 ## $a0 = 06005C30 /* 008AC 80A5374C 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 008B0 80A53750 3C01C120 */ lui $at, 0xC120 ## $at = C1200000 /* 008B4 80A53754 44819000 */ mtc1 $at, $f18 ## $f18 = -10.00 -/* 008B8 80A53758 468021A0 */ cvt.s.w $f6, $f4 +/* 008B8 80A53758 468021A0 */ cvt.s.w $f6, $f4 /* 008BC 80A5375C 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 008C0 80A53760 24A55C30 */ addiu $a1, $a1, 0x5C30 ## $a1 = 06005C30 /* 008C4 80A53764 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C /* 008C8 80A53768 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 008CC 80A5376C 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 008D0 80A53770 4600320D */ trunc.w.s $f8, $f6 -/* 008D4 80A53774 AFA00014 */ sw $zero, 0x0014($sp) -/* 008D8 80A53778 E7B20018 */ swc1 $f18, 0x0018($sp) -/* 008DC 80A5377C 440F4000 */ mfc1 $t7, $f8 +/* 008D0 80A53770 4600320D */ trunc.w.s $f8, $f6 +/* 008D4 80A53774 AFA00014 */ sw $zero, 0x0014($sp) +/* 008D8 80A53778 E7B20018 */ swc1 $f18, 0x0018($sp) +/* 008DC 80A5377C 440F4000 */ mfc1 $t7, $f8 /* 008E0 80A53780 00000000 */ nop -/* 008E4 80A53784 000FC400 */ sll $t8, $t7, 16 -/* 008E8 80A53788 0018CC03 */ sra $t9, $t8, 16 +/* 008E4 80A53784 000FC400 */ sll $t8, $t7, 16 +/* 008E8 80A53788 0018CC03 */ sra $t9, $t8, 16 /* 008EC 80A5378C 44995000 */ mtc1 $t9, $f10 ## $f10 = 0.00 /* 008F0 80A53790 00000000 */ nop -/* 008F4 80A53794 46805420 */ cvt.s.w $f16, $f10 -/* 008F8 80A53798 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 008FC 80A5379C E7B00010 */ swc1 $f16, 0x0010($sp) +/* 008F4 80A53794 46805420 */ cvt.s.w $f16, $f10 +/* 008F8 80A53798 0C029468 */ jal SkelAnime_ChangeAnim + +/* 008FC 80A5379C E7B00010 */ swc1 $f16, 0x0010($sp) /* 00900 80A537A0 240800C8 */ addiu $t0, $zero, 0x00C8 ## $t0 = 000000C8 /* 00904 80A537A4 A60802F2 */ sh $t0, 0x02F2($s0) ## 000002F2 -/* 00908 80A537A8 0C03008C */ jal func_800C0230 -/* 0090C 80A537AC 8FA40034 */ lw $a0, 0x0034($sp) +/* 00908 80A537A8 0C03008C */ jal func_800C0230 +/* 0090C 80A537AC 8FA40034 */ lw $a0, 0x0034($sp) /* 00910 80A537B0 A6020310 */ sh $v0, 0x0310($s0) ## 00000310 -/* 00914 80A537B4 8FA40034 */ lw $a0, 0x0034($sp) +/* 00914 80A537B4 8FA40034 */ lw $a0, 0x0034($sp) /* 00918 80A537B8 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 0091C 80A537BC 0C0300C5 */ jal func_800C0314 +/* 0091C 80A537BC 0C0300C5 */ jal func_800C0314 /* 00920 80A537C0 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 -/* 00924 80A537C4 8FA40034 */ lw $a0, 0x0034($sp) +/* 00924 80A537C4 8FA40034 */ lw $a0, 0x0034($sp) /* 00928 80A537C8 86050310 */ lh $a1, 0x0310($s0) ## 00000310 -/* 0092C 80A537CC 0C0300C5 */ jal func_800C0314 +/* 0092C 80A537CC 0C0300C5 */ jal func_800C0314 /* 00930 80A537D0 24060007 */ addiu $a2, $zero, 0x0007 ## $a2 = 00000007 /* 00934 80A537D4 3C0180A5 */ lui $at, %hi(D_80A552D0) ## $at = 80A50000 -/* 00938 80A537D8 C42452D0 */ lwc1 $f4, %lo(D_80A552D0)($at) +/* 00938 80A537D8 C42452D0 */ lwc1 $f4, %lo(D_80A552D0)($at) /* 0093C 80A537DC 3C0180A5 */ lui $at, %hi(D_80A552D4) ## $at = 80A50000 /* 00940 80A537E0 86050310 */ lh $a1, 0x0310($s0) ## 00000310 /* 00944 80A537E4 E6040280 */ swc1 $f4, 0x0280($s0) ## 00000280 -/* 00948 80A537E8 C42652D4 */ lwc1 $f6, %lo(D_80A552D4)($at) +/* 00948 80A537E8 C42652D4 */ lwc1 $f6, %lo(D_80A552D4)($at) /* 0094C 80A537EC 3C0180A5 */ lui $at, %hi(D_80A552D8) ## $at = 80A50000 /* 00950 80A537F0 26060280 */ addiu $a2, $s0, 0x0280 ## $a2 = 00000280 /* 00954 80A537F4 E6060284 */ swc1 $f6, 0x0284($s0) ## 00000284 -/* 00958 80A537F8 C42852D8 */ lwc1 $f8, %lo(D_80A552D8)($at) +/* 00958 80A537F8 C42852D8 */ lwc1 $f8, %lo(D_80A552D8)($at) /* 0095C 80A537FC 3C0180A5 */ lui $at, %hi(D_80A552DC) ## $at = 80A50000 /* 00960 80A53800 2607028C */ addiu $a3, $s0, 0x028C ## $a3 = 0000028C /* 00964 80A53804 E6080288 */ swc1 $f8, 0x0288($s0) ## 00000288 -/* 00968 80A53808 C42A52DC */ lwc1 $f10, %lo(D_80A552DC)($at) +/* 00968 80A53808 C42A52DC */ lwc1 $f10, %lo(D_80A552DC)($at) /* 0096C 80A5380C 3C0180A5 */ lui $at, %hi(D_80A552E0) ## $at = 80A50000 /* 00970 80A53810 E60A028C */ swc1 $f10, 0x028C($s0) ## 0000028C -/* 00974 80A53814 C43052E0 */ lwc1 $f16, %lo(D_80A552E0)($at) +/* 00974 80A53814 C43052E0 */ lwc1 $f16, %lo(D_80A552E0)($at) /* 00978 80A53818 3C0180A5 */ lui $at, %hi(D_80A552E4) ## $at = 80A50000 /* 0097C 80A5381C E6100290 */ swc1 $f16, 0x0290($s0) ## 00000290 -/* 00980 80A53820 C43252E4 */ lwc1 $f18, %lo(D_80A552E4)($at) +/* 00980 80A53820 C43252E4 */ lwc1 $f18, %lo(D_80A552E4)($at) /* 00984 80A53824 E6120294 */ swc1 $f18, 0x0294($s0) ## 00000294 -/* 00988 80A53828 0C030136 */ jal func_800C04D8 -/* 0098C 80A5382C 8FA40034 */ lw $a0, 0x0034($sp) +/* 00988 80A53828 0C030136 */ jal func_800C04D8 +/* 0098C 80A5382C 8FA40034 */ lw $a0, 0x0034($sp) /* 00990 80A53830 3C0980A5 */ lui $t1, %hi(func_80A53850) ## $t1 = 80A50000 /* 00994 80A53834 25293850 */ addiu $t1, $t1, %lo(func_80A53850) ## $t1 = 80A53850 /* 00998 80A53838 AE09025C */ sw $t1, 0x025C($s0) ## 0000025C -/* 0099C 80A5383C 8FBF002C */ lw $ra, 0x002C($sp) -/* 009A0 80A53840 8FB00028 */ lw $s0, 0x0028($sp) +/* 0099C 80A5383C 8FBF002C */ lw $ra, 0x002C($sp) +/* 009A0 80A53840 8FB00028 */ lw $s0, 0x0028($sp) /* 009A4 80A53844 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 009A8 80A53848 03E00008 */ jr $ra +/* 009A8 80A53848 03E00008 */ jr $ra /* 009AC 80A5384C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A53908.s b/asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A53908.s index e8f43a5c48..75b1264618 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A53908.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A53908.s @@ -1,42 +1,42 @@ glabel func_80A53908 /* 00A68 80A53908 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 00A6C 80A5390C AFA40028 */ sw $a0, 0x0028($sp) -/* 00A70 80A53910 AFBF0024 */ sw $ra, 0x0024($sp) +/* 00A6C 80A5390C AFA40028 */ sw $a0, 0x0028($sp) +/* 00A70 80A53910 AFBF0024 */ sw $ra, 0x0024($sp) /* 00A74 80A53914 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 -/* 00A78 80A53918 AFA5002C */ sw $a1, 0x002C($sp) +/* 00A78 80A53918 AFA5002C */ sw $a1, 0x002C($sp) /* 00A7C 80A5391C 0C028800 */ jal SkelAnime_GetFrameCount - + /* 00A80 80A53920 24845C30 */ addiu $a0, $a0, 0x5C30 ## $a0 = 06005C30 /* 00A84 80A53924 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 00A88 80A53928 3C01C120 */ lui $at, 0xC120 ## $at = C1200000 /* 00A8C 80A5392C 44819000 */ mtc1 $at, $f18 ## $f18 = -10.00 -/* 00A90 80A53930 468021A0 */ cvt.s.w $f6, $f4 -/* 00A94 80A53934 8FA40028 */ lw $a0, 0x0028($sp) +/* 00A90 80A53930 468021A0 */ cvt.s.w $f6, $f4 +/* 00A94 80A53934 8FA40028 */ lw $a0, 0x0028($sp) /* 00A98 80A53938 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 00A9C 80A5393C 24A55C30 */ addiu $a1, $a1, 0x5C30 ## $a1 = 06005C30 /* 00AA0 80A53940 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 00AA4 80A53944 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 00AA8 80A53948 4600320D */ trunc.w.s $f8, $f6 -/* 00AAC 80A5394C AFA00014 */ sw $zero, 0x0014($sp) -/* 00AB0 80A53950 E7B20018 */ swc1 $f18, 0x0018($sp) +/* 00AA8 80A53948 4600320D */ trunc.w.s $f8, $f6 +/* 00AAC 80A5394C AFA00014 */ sw $zero, 0x0014($sp) +/* 00AB0 80A53950 E7B20018 */ swc1 $f18, 0x0018($sp) /* 00AB4 80A53954 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 00AB8 80A53958 440F4000 */ mfc1 $t7, $f8 +/* 00AB8 80A53958 440F4000 */ mfc1 $t7, $f8 /* 00ABC 80A5395C 00000000 */ nop -/* 00AC0 80A53960 000FC400 */ sll $t8, $t7, 16 -/* 00AC4 80A53964 0018CC03 */ sra $t9, $t8, 16 +/* 00AC0 80A53960 000FC400 */ sll $t8, $t7, 16 +/* 00AC4 80A53964 0018CC03 */ sra $t9, $t8, 16 /* 00AC8 80A53968 44995000 */ mtc1 $t9, $f10 ## $f10 = 0.00 /* 00ACC 80A5396C 00000000 */ nop -/* 00AD0 80A53970 46805420 */ cvt.s.w $f16, $f10 -/* 00AD4 80A53974 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 00AD8 80A53978 E7B00010 */ swc1 $f16, 0x0010($sp) -/* 00ADC 80A5397C 8FA90028 */ lw $t1, 0x0028($sp) +/* 00AD0 80A53970 46805420 */ cvt.s.w $f16, $f10 +/* 00AD4 80A53974 0C029468 */ jal SkelAnime_ChangeAnim + +/* 00AD8 80A53978 E7B00010 */ swc1 $f16, 0x0010($sp) +/* 00ADC 80A5397C 8FA90028 */ lw $t1, 0x0028($sp) /* 00AE0 80A53980 3C0880A5 */ lui $t0, %hi(func_80A5399C) ## $t0 = 80A50000 /* 00AE4 80A53984 2508399C */ addiu $t0, $t0, %lo(func_80A5399C) ## $t0 = 80A5399C /* 00AE8 80A53988 AD28025C */ sw $t0, 0x025C($t1) ## 0000025C -/* 00AEC 80A5398C 8FBF0024 */ lw $ra, 0x0024($sp) +/* 00AEC 80A5398C 8FBF0024 */ lw $ra, 0x0024($sp) /* 00AF0 80A53990 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 00AF4 80A53994 03E00008 */ jr $ra +/* 00AF4 80A53994 03E00008 */ jr $ra /* 00AF8 80A53998 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A5399C.s b/asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A5399C.s index 48be10da98..a159461618 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A5399C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A5399C.s @@ -50,7 +50,7 @@ glabel func_80A5399C /* 00BA8 80A53A48 8FA40024 */ lw $a0, 0x0024($sp) /* 00BAC 80A53A4C 24050005 */ addiu $a1, $zero, 0x0005 ## $a1 = 00000005 /* 00BB0 80A53A50 A7A3001E */ sh $v1, 0x001E($sp) -/* 00BB4 80A53A54 0C01B0D8 */ jal func_8006C360 +/* 00BB4 80A53A54 0C01B0D8 */ jal Text_GetFaceReaction /* 00BB8 80A53A58 AFA60020 */ sw $a2, 0x0020($sp) /* 00BBC 80A53A5C 87A3001E */ lh $v1, 0x001E($sp) /* 00BC0 80A53A60 1040000D */ beq $v0, $zero, .L80A53A98 @@ -58,7 +58,7 @@ glabel func_80A5399C /* 00BC8 80A53A68 1460000B */ bne $v1, $zero, .L80A53A98 /* 00BCC 80A53A6C 8FA40024 */ lw $a0, 0x0024($sp) /* 00BD0 80A53A70 24050005 */ addiu $a1, $zero, 0x0005 ## $a1 = 00000005 -/* 00BD4 80A53A74 0C01B0D8 */ jal func_8006C360 +/* 00BD4 80A53A74 0C01B0D8 */ jal Text_GetFaceReaction /* 00BD8 80A53A78 AFA60020 */ sw $a2, 0x0020($sp) /* 00BDC 80A53A7C 8FA60020 */ lw $a2, 0x0020($sp) /* 00BE0 80A53A80 240F0001 */ addiu $t7, $zero, 0x0001 ## $t7 = 00000001 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A53AD4.s b/asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A53AD4.s index 5d62254cad..a38ad8bf2f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A53AD4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A53AD4.s @@ -10,12 +10,12 @@ glabel func_80A53AD4 /* 00C54 80A53AF4 AFAF0024 */ sw $t7, 0x0024($sp) /* 00C58 80A53AF8 8FA4002C */ lw $a0, 0x002C($sp) -/* 00C5C 80A53AFC 0C01B0D8 */ jal func_8006C360 +/* 00C5C 80A53AFC 0C01B0D8 */ jal Text_GetFaceReaction /* 00C60 80A53B00 24050005 */ addiu $a1, $zero, 0x0005 ## $a1 = 00000005 /* 00C64 80A53B04 10400006 */ beq $v0, $zero, .L80A53B20 /* 00C68 80A53B08 2418200E */ addiu $t8, $zero, 0x200E ## $t8 = 0000200E /* 00C6C 80A53B0C 8FA4002C */ lw $a0, 0x002C($sp) -/* 00C70 80A53B10 0C01B0D8 */ jal func_8006C360 +/* 00C70 80A53B10 0C01B0D8 */ jal Text_GetFaceReaction /* 00C74 80A53B14 24050005 */ addiu $a1, $zero, 0x0005 ## $a1 = 00000005 /* 00C78 80A53B18 10000002 */ beq $zero, $zero, .L80A53B24 /* 00C7C 80A53B1C A602010E */ sh $v0, 0x010E($s0) ## 0000010E diff --git a/asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A53C90.s b/asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A53C90.s index 1d4656059e..09298f61c1 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A53C90.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A53C90.s @@ -1,36 +1,36 @@ glabel func_80A53C90 /* 00DF0 80A53C90 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 00DF4 80A53C94 AFA40028 */ sw $a0, 0x0028($sp) -/* 00DF8 80A53C98 AFBF0024 */ sw $ra, 0x0024($sp) +/* 00DF4 80A53C94 AFA40028 */ sw $a0, 0x0028($sp) +/* 00DF8 80A53C98 AFBF0024 */ sw $ra, 0x0024($sp) /* 00DFC 80A53C9C 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 -/* 00E00 80A53CA0 AFA5002C */ sw $a1, 0x002C($sp) +/* 00E00 80A53CA0 AFA5002C */ sw $a1, 0x002C($sp) /* 00E04 80A53CA4 0C028800 */ jal SkelAnime_GetFrameCount - + /* 00E08 80A53CA8 24845500 */ addiu $a0, $a0, 0x5500 ## $a0 = 06005500 /* 00E0C 80A53CAC 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 -/* 00E10 80A53CB0 8FA30028 */ lw $v1, 0x0028($sp) +/* 00E10 80A53CB0 8FA30028 */ lw $v1, 0x0028($sp) /* 00E14 80A53CB4 3C01C120 */ lui $at, 0xC120 ## $at = C1200000 -/* 00E18 80A53CB8 46802020 */ cvt.s.w $f0, $f4 +/* 00E18 80A53CB8 46802020 */ cvt.s.w $f0, $f4 /* 00E1C 80A53CBC 44813000 */ mtc1 $at, $f6 ## $f6 = -10.00 /* 00E20 80A53CC0 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 00E24 80A53CC4 240E0002 */ addiu $t6, $zero, 0x0002 ## $t6 = 00000002 /* 00E28 80A53CC8 24A55500 */ addiu $a1, $a1, 0x5500 ## $a1 = 06005500 /* 00E2C 80A53CCC 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 00E30 80A53CD0 E46002EC */ swc1 $f0, 0x02EC($v1) ## 000002EC -/* 00E34 80A53CD4 AFAE0014 */ sw $t6, 0x0014($sp) -/* 00E38 80A53CD8 E7A00010 */ swc1 $f0, 0x0010($sp) +/* 00E34 80A53CD4 AFAE0014 */ sw $t6, 0x0014($sp) +/* 00E38 80A53CD8 E7A00010 */ swc1 $f0, 0x0010($sp) /* 00E3C 80A53CDC 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 /* 00E40 80A53CE0 2464014C */ addiu $a0, $v1, 0x014C ## $a0 = 0000014C -/* 00E44 80A53CE4 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 00E48 80A53CE8 E7A60018 */ swc1 $f6, 0x0018($sp) -/* 00E4C 80A53CEC 8FB80028 */ lw $t8, 0x0028($sp) +/* 00E44 80A53CE4 0C029468 */ jal SkelAnime_ChangeAnim + +/* 00E48 80A53CE8 E7A60018 */ swc1 $f6, 0x0018($sp) +/* 00E4C 80A53CEC 8FB80028 */ lw $t8, 0x0028($sp) /* 00E50 80A53CF0 3C0F80A5 */ lui $t7, %hi(func_80A53D0C) ## $t7 = 80A50000 /* 00E54 80A53CF4 25EF3D0C */ addiu $t7, $t7, %lo(func_80A53D0C) ## $t7 = 80A53D0C /* 00E58 80A53CF8 AF0F025C */ sw $t7, 0x025C($t8) ## 0000025C -/* 00E5C 80A53CFC 8FBF0024 */ lw $ra, 0x0024($sp) +/* 00E5C 80A53CFC 8FBF0024 */ lw $ra, 0x0024($sp) /* 00E60 80A53D00 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 00E64 80A53D04 03E00008 */ jr $ra +/* 00E64 80A53D04 03E00008 */ jr $ra /* 00E68 80A53D08 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A53DF8.s b/asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A53DF8.s index 9de115e8a8..af5983642c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A53DF8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A53DF8.s @@ -1,59 +1,59 @@ glabel func_80A53DF8 /* 00F58 80A53DF8 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 00F5C 80A53DFC AFB00028 */ sw $s0, 0x0028($sp) +/* 00F5C 80A53DFC AFB00028 */ sw $s0, 0x0028($sp) /* 00F60 80A53E00 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00F64 80A53E04 AFBF002C */ sw $ra, 0x002C($sp) +/* 00F64 80A53E04 AFBF002C */ sw $ra, 0x002C($sp) /* 00F68 80A53E08 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 -/* 00F6C 80A53E0C AFA50034 */ sw $a1, 0x0034($sp) +/* 00F6C 80A53E0C AFA50034 */ sw $a1, 0x0034($sp) /* 00F70 80A53E10 0C028800 */ jal SkelAnime_GetFrameCount - + /* 00F74 80A53E14 24845C30 */ addiu $a0, $a0, 0x5C30 ## $a0 = 06005C30 /* 00F78 80A53E18 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 00F7C 80A53E1C 3C01C120 */ lui $at, 0xC120 ## $at = C1200000 /* 00F80 80A53E20 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 00F84 80A53E24 468021A0 */ cvt.s.w $f6, $f4 +/* 00F84 80A53E24 468021A0 */ cvt.s.w $f6, $f4 /* 00F88 80A53E28 24A55C30 */ addiu $a1, $a1, 0x5C30 ## $a1 = 06005C30 /* 00F8C 80A53E2C 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C /* 00F90 80A53E30 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 00F94 80A53E34 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 00F98 80A53E38 AFA00014 */ sw $zero, 0x0014($sp) -/* 00F9C 80A53E3C 4600320D */ trunc.w.s $f8, $f6 +/* 00F98 80A53E38 AFA00014 */ sw $zero, 0x0014($sp) +/* 00F9C 80A53E3C 4600320D */ trunc.w.s $f8, $f6 /* 00FA0 80A53E40 44813000 */ mtc1 $at, $f6 ## $f6 = -10.00 -/* 00FA4 80A53E44 440F4000 */ mfc1 $t7, $f8 -/* 00FA8 80A53E48 E7A60018 */ swc1 $f6, 0x0018($sp) -/* 00FAC 80A53E4C 000FC400 */ sll $t8, $t7, 16 -/* 00FB0 80A53E50 0018CC03 */ sra $t9, $t8, 16 +/* 00FA4 80A53E44 440F4000 */ mfc1 $t7, $f8 +/* 00FA8 80A53E48 E7A60018 */ swc1 $f6, 0x0018($sp) +/* 00FAC 80A53E4C 000FC400 */ sll $t8, $t7, 16 +/* 00FB0 80A53E50 0018CC03 */ sra $t9, $t8, 16 /* 00FB4 80A53E54 44995000 */ mtc1 $t9, $f10 ## $f10 = 0.00 /* 00FB8 80A53E58 00000000 */ nop -/* 00FBC 80A53E5C 46805120 */ cvt.s.w $f4, $f10 -/* 00FC0 80A53E60 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 00FC4 80A53E64 E7A40010 */ swc1 $f4, 0x0010($sp) +/* 00FBC 80A53E5C 46805120 */ cvt.s.w $f4, $f10 +/* 00FC0 80A53E60 0C029468 */ jal SkelAnime_ChangeAnim + +/* 00FC4 80A53E64 E7A40010 */ swc1 $f4, 0x0010($sp) /* 00FC8 80A53E68 240800C8 */ addiu $t0, $zero, 0x00C8 ## $t0 = 000000C8 /* 00FCC 80A53E6C A60802F2 */ sh $t0, 0x02F2($s0) ## 000002F2 -/* 00FD0 80A53E70 0C03008C */ jal func_800C0230 -/* 00FD4 80A53E74 8FA40034 */ lw $a0, 0x0034($sp) +/* 00FD0 80A53E70 0C03008C */ jal func_800C0230 +/* 00FD4 80A53E74 8FA40034 */ lw $a0, 0x0034($sp) /* 00FD8 80A53E78 A6020310 */ sh $v0, 0x0310($s0) ## 00000310 -/* 00FDC 80A53E7C 8FA40034 */ lw $a0, 0x0034($sp) +/* 00FDC 80A53E7C 8FA40034 */ lw $a0, 0x0034($sp) /* 00FE0 80A53E80 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 00FE4 80A53E84 0C0300C5 */ jal func_800C0314 +/* 00FE4 80A53E84 0C0300C5 */ jal func_800C0314 /* 00FE8 80A53E88 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 -/* 00FEC 80A53E8C 8FA40034 */ lw $a0, 0x0034($sp) +/* 00FEC 80A53E8C 8FA40034 */ lw $a0, 0x0034($sp) /* 00FF0 80A53E90 86050310 */ lh $a1, 0x0310($s0) ## 00000310 -/* 00FF4 80A53E94 0C0300C5 */ jal func_800C0314 +/* 00FF4 80A53E94 0C0300C5 */ jal func_800C0314 /* 00FF8 80A53E98 24060007 */ addiu $a2, $zero, 0x0007 ## $a2 = 00000007 /* 00FFC 80A53E9C 3C01C28E */ lui $at, 0xC28E ## $at = C28E0000 /* 01000 80A53EA0 44810000 */ mtc1 $at, $f0 ## $f0 = -71.00 /* 01004 80A53EA4 3C0180A5 */ lui $at, %hi(D_80A552E8) ## $at = 80A50000 -/* 01008 80A53EA8 C42252E8 */ lwc1 $f2, %lo(D_80A552E8)($at) +/* 01008 80A53EA8 C42252E8 */ lwc1 $f2, %lo(D_80A552E8)($at) /* 0100C 80A53EAC 3C0180A5 */ lui $at, %hi(D_80A552EC) ## $at = 80A50000 -/* 01010 80A53EB0 C42C52EC */ lwc1 $f12, %lo(D_80A552EC)($at) +/* 01010 80A53EB0 C42C52EC */ lwc1 $f12, %lo(D_80A552EC)($at) /* 01014 80A53EB4 3C014335 */ lui $at, 0x4335 ## $at = 43350000 /* 01018 80A53EB8 44817000 */ mtc1 $at, $f14 ## $f14 = 181.00 /* 0101C 80A53EBC 3C0180A5 */ lui $at, %hi(D_80A552F0) ## $at = 80A50000 -/* 01020 80A53EC0 C43052F0 */ lwc1 $f16, %lo(D_80A552F0)($at) +/* 01020 80A53EC0 C43052F0 */ lwc1 $f16, %lo(D_80A552F0)($at) /* 01024 80A53EC4 3C0180A5 */ lui $at, %hi(D_80A552F4) ## $at = 80A50000 -/* 01028 80A53EC8 C43252F4 */ lwc1 $f18, %lo(D_80A552F4)($at) +/* 01028 80A53EC8 C43252F4 */ lwc1 $f18, %lo(D_80A552F4)($at) /* 0102C 80A53ECC E60002BC */ swc1 $f0, 0x02BC($s0) ## 000002BC /* 01030 80A53ED0 E6000280 */ swc1 $f0, 0x0280($s0) ## 00000280 /* 01034 80A53ED4 E60202C0 */ swc1 $f2, 0x02C0($s0) ## 000002C0 @@ -66,18 +66,18 @@ glabel func_80A53DF8 /* 01050 80A53EF0 E6100290 */ swc1 $f16, 0x0290($s0) ## 00000290 /* 01054 80A53EF4 E61202A0 */ swc1 $f18, 0x02A0($s0) ## 000002A0 /* 01058 80A53EF8 E6120294 */ swc1 $f18, 0x0294($s0) ## 00000294 -/* 0105C 80A53EFC 8FA40034 */ lw $a0, 0x0034($sp) +/* 0105C 80A53EFC 8FA40034 */ lw $a0, 0x0034($sp) /* 01060 80A53F00 86050310 */ lh $a1, 0x0310($s0) ## 00000310 /* 01064 80A53F04 26060280 */ addiu $a2, $s0, 0x0280 ## $a2 = 00000280 -/* 01068 80A53F08 0C030136 */ jal func_800C04D8 +/* 01068 80A53F08 0C030136 */ jal func_800C04D8 /* 0106C 80A53F0C 2607028C */ addiu $a3, $s0, 0x028C ## $a3 = 0000028C /* 01070 80A53F10 3C0980A5 */ lui $t1, %hi(func_80A53F30) ## $t1 = 80A50000 /* 01074 80A53F14 25293F30 */ addiu $t1, $t1, %lo(func_80A53F30) ## $t1 = 80A53F30 /* 01078 80A53F18 AE09025C */ sw $t1, 0x025C($s0) ## 0000025C -/* 0107C 80A53F1C 8FBF002C */ lw $ra, 0x002C($sp) -/* 01080 80A53F20 8FB00028 */ lw $s0, 0x0028($sp) +/* 0107C 80A53F1C 8FBF002C */ lw $ra, 0x002C($sp) +/* 01080 80A53F20 8FB00028 */ lw $s0, 0x0028($sp) /* 01084 80A53F24 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 01088 80A53F28 03E00008 */ jr $ra +/* 01088 80A53F28 03E00008 */ jr $ra /* 0108C 80A53F2C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A54320.s b/asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A54320.s index 2e1d82137b..b7c2354e22 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A54320.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A54320.s @@ -1,37 +1,37 @@ glabel func_80A54320 /* 01480 80A54320 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 01484 80A54324 AFA40028 */ sw $a0, 0x0028($sp) -/* 01488 80A54328 AFBF0024 */ sw $ra, 0x0024($sp) +/* 01484 80A54324 AFA40028 */ sw $a0, 0x0028($sp) +/* 01488 80A54328 AFBF0024 */ sw $ra, 0x0024($sp) /* 0148C 80A5432C 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 -/* 01490 80A54330 AFA5002C */ sw $a1, 0x002C($sp) +/* 01490 80A54330 AFA5002C */ sw $a1, 0x002C($sp) /* 01494 80A54334 0C028800 */ jal SkelAnime_GetFrameCount - + /* 01498 80A54338 24845500 */ addiu $a0, $a0, 0x5500 ## $a0 = 06005500 /* 0149C 80A5433C 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 -/* 014A0 80A54340 8FA30028 */ lw $v1, 0x0028($sp) +/* 014A0 80A54340 8FA30028 */ lw $v1, 0x0028($sp) /* 014A4 80A54344 3C01C120 */ lui $at, 0xC120 ## $at = C1200000 -/* 014A8 80A54348 46802020 */ cvt.s.w $f0, $f4 +/* 014A8 80A54348 46802020 */ cvt.s.w $f0, $f4 /* 014AC 80A5434C 44813000 */ mtc1 $at, $f6 ## $f6 = -10.00 /* 014B0 80A54350 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 014B4 80A54354 240E0002 */ addiu $t6, $zero, 0x0002 ## $t6 = 00000002 /* 014B8 80A54358 24A55500 */ addiu $a1, $a1, 0x5500 ## $a1 = 06005500 /* 014BC 80A5435C 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 014C0 80A54360 E46002EC */ swc1 $f0, 0x02EC($v1) ## 000002EC -/* 014C4 80A54364 AFAE0014 */ sw $t6, 0x0014($sp) -/* 014C8 80A54368 E7A00010 */ swc1 $f0, 0x0010($sp) +/* 014C4 80A54364 AFAE0014 */ sw $t6, 0x0014($sp) +/* 014C8 80A54368 E7A00010 */ swc1 $f0, 0x0010($sp) /* 014CC 80A5436C 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 /* 014D0 80A54370 2464014C */ addiu $a0, $v1, 0x014C ## $a0 = 0000014C -/* 014D4 80A54374 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 014D8 80A54378 E7A60018 */ swc1 $f6, 0x0018($sp) -/* 014DC 80A5437C 8FA30028 */ lw $v1, 0x0028($sp) +/* 014D4 80A54374 0C029468 */ jal SkelAnime_ChangeAnim + +/* 014D8 80A54378 E7A60018 */ swc1 $f6, 0x0018($sp) +/* 014DC 80A5437C 8FA30028 */ lw $v1, 0x0028($sp) /* 014E0 80A54380 3C0F80A5 */ lui $t7, %hi(func_80A543A0) ## $t7 = 80A50000 /* 014E4 80A54384 25EF43A0 */ addiu $t7, $t7, %lo(func_80A543A0) ## $t7 = 80A543A0 /* 014E8 80A54388 A0600308 */ sb $zero, 0x0308($v1) ## 00000308 /* 014EC 80A5438C AC6F025C */ sw $t7, 0x025C($v1) ## 0000025C -/* 014F0 80A54390 8FBF0024 */ lw $ra, 0x0024($sp) +/* 014F0 80A54390 8FBF0024 */ lw $ra, 0x0024($sp) /* 014F4 80A54394 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 014F8 80A54398 03E00008 */ jr $ra +/* 014F8 80A54398 03E00008 */ jr $ra /* 014FC 80A5439C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A5475C.s b/asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A5475C.s index 27e18d209e..e8317b0999 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A5475C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A5475C.s @@ -8,7 +8,7 @@ glabel func_80A5475C /* 018D4 80A54774 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C /* 018D8 80A54778 8FA4001C */ lw $a0, 0x001C($sp) -/* 018DC 80A5477C 0C01B0D8 */ jal func_8006C360 +/* 018DC 80A5477C 0C01B0D8 */ jal Text_GetFaceReaction /* 018E0 80A54780 24050005 */ addiu $a1, $zero, 0x0005 ## $a1 = 00000005 /* 018E4 80A54784 10400011 */ beq $v0, $zero, .L80A547CC /* 018E8 80A54788 8FA60018 */ lw $a2, 0x0018($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A54954.s b/asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A54954.s index cb1405230b..36b2108d1f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A54954.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A54954.s @@ -1,42 +1,42 @@ glabel func_80A54954 /* 01AB4 80A54954 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 01AB8 80A54958 AFA40028 */ sw $a0, 0x0028($sp) -/* 01ABC 80A5495C AFBF0024 */ sw $ra, 0x0024($sp) +/* 01AB8 80A54958 AFA40028 */ sw $a0, 0x0028($sp) +/* 01ABC 80A5495C AFBF0024 */ sw $ra, 0x0024($sp) /* 01AC0 80A54960 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 -/* 01AC4 80A54964 AFA5002C */ sw $a1, 0x002C($sp) +/* 01AC4 80A54964 AFA5002C */ sw $a1, 0x002C($sp) /* 01AC8 80A54968 0C028800 */ jal SkelAnime_GetFrameCount - + /* 01ACC 80A5496C 24845C30 */ addiu $a0, $a0, 0x5C30 ## $a0 = 06005C30 /* 01AD0 80A54970 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 01AD4 80A54974 3C01C120 */ lui $at, 0xC120 ## $at = C1200000 /* 01AD8 80A54978 44819000 */ mtc1 $at, $f18 ## $f18 = -10.00 -/* 01ADC 80A5497C 468021A0 */ cvt.s.w $f6, $f4 -/* 01AE0 80A54980 8FA40028 */ lw $a0, 0x0028($sp) +/* 01ADC 80A5497C 468021A0 */ cvt.s.w $f6, $f4 +/* 01AE0 80A54980 8FA40028 */ lw $a0, 0x0028($sp) /* 01AE4 80A54984 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 01AE8 80A54988 24A55C30 */ addiu $a1, $a1, 0x5C30 ## $a1 = 06005C30 /* 01AEC 80A5498C 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 01AF0 80A54990 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 01AF4 80A54994 4600320D */ trunc.w.s $f8, $f6 -/* 01AF8 80A54998 AFA00014 */ sw $zero, 0x0014($sp) -/* 01AFC 80A5499C E7B20018 */ swc1 $f18, 0x0018($sp) +/* 01AF4 80A54994 4600320D */ trunc.w.s $f8, $f6 +/* 01AF8 80A54998 AFA00014 */ sw $zero, 0x0014($sp) +/* 01AFC 80A5499C E7B20018 */ swc1 $f18, 0x0018($sp) /* 01B00 80A549A0 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 01B04 80A549A4 440F4000 */ mfc1 $t7, $f8 +/* 01B04 80A549A4 440F4000 */ mfc1 $t7, $f8 /* 01B08 80A549A8 00000000 */ nop -/* 01B0C 80A549AC 000FC400 */ sll $t8, $t7, 16 -/* 01B10 80A549B0 0018CC03 */ sra $t9, $t8, 16 +/* 01B0C 80A549AC 000FC400 */ sll $t8, $t7, 16 +/* 01B10 80A549B0 0018CC03 */ sra $t9, $t8, 16 /* 01B14 80A549B4 44995000 */ mtc1 $t9, $f10 ## $f10 = 0.00 /* 01B18 80A549B8 00000000 */ nop -/* 01B1C 80A549BC 46805420 */ cvt.s.w $f16, $f10 -/* 01B20 80A549C0 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 01B24 80A549C4 E7B00010 */ swc1 $f16, 0x0010($sp) -/* 01B28 80A549C8 8FA90028 */ lw $t1, 0x0028($sp) +/* 01B1C 80A549BC 46805420 */ cvt.s.w $f16, $f10 +/* 01B20 80A549C0 0C029468 */ jal SkelAnime_ChangeAnim + +/* 01B24 80A549C4 E7B00010 */ swc1 $f16, 0x0010($sp) +/* 01B28 80A549C8 8FA90028 */ lw $t1, 0x0028($sp) /* 01B2C 80A549CC 3C0880A5 */ lui $t0, %hi(func_80A549E8) ## $t0 = 80A50000 /* 01B30 80A549D0 250849E8 */ addiu $t0, $t0, %lo(func_80A549E8) ## $t0 = 80A549E8 /* 01B34 80A549D4 AD28025C */ sw $t0, 0x025C($t1) ## 0000025C -/* 01B38 80A549D8 8FBF0024 */ lw $ra, 0x0024($sp) +/* 01B38 80A549D8 8FBF0024 */ lw $ra, 0x0024($sp) /* 01B3C 80A549DC 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 01B40 80A549E0 03E00008 */ jr $ra +/* 01B40 80A549E0 03E00008 */ jr $ra /* 01B44 80A549E4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A54C6C.s b/asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A54C6C.s index 8332bf1d91..1b7fa29d37 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A54C6C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Heishi2/func_80A54C6C.s @@ -8,7 +8,7 @@ glabel func_80A54C6C /* 01DE4 80A54C84 24C65258 */ addiu $a2, $a2, %lo(D_80A55258) ## $a2 = 80A55258 /* 01DE8 80A54C88 27A40024 */ addiu $a0, $sp, 0x0024 ## $a0 = FFFFFFEC /* 01DEC 80A54C8C 240706EC */ addiu $a3, $zero, 0x06EC ## $a3 = 000006EC -/* 01DF0 80A54C90 0C031AB1 */ jal func_800C6AC4 +/* 01DF0 80A54C90 0C031AB1 */ jal Graph_OpenDisps /* 01DF4 80A54C94 AFA50034 */ sw $a1, 0x0034($sp) /* 01DF8 80A54C98 8FA80034 */ lw $t0, 0x0034($sp) /* 01DFC 80A54C9C 3C18DA38 */ lui $t8, 0xDA38 ## $t8 = DA380000 @@ -41,7 +41,7 @@ glabel func_80A54C6C /* 01E68 80A54D08 24C65280 */ addiu $a2, $a2, %lo(D_80A55280) ## $a2 = 80A55280 /* 01E6C 80A54D0C 27A40024 */ addiu $a0, $sp, 0x0024 ## $a0 = FFFFFFEC /* 01E70 80A54D10 240706F1 */ addiu $a3, $zero, 0x06F1 ## $a3 = 000006F1 -/* 01E74 80A54D14 0C031AD5 */ jal func_800C6B54 +/* 01E74 80A54D14 0C031AD5 */ jal Graph_CloseDisps /* 01E78 80A54D18 8D850000 */ lw $a1, 0x0000($t4) ## 00000000 /* 01E7C 80A54D1C 8FBF0014 */ lw $ra, 0x0014($sp) /* 01E80 80A54D20 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Heishi3/func_80A557A0.s b/asm/non_matchings/overlays/actors/ovl_En_Heishi3/func_80A557A0.s index 89b4214ea9..010978cdc2 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Heishi3/func_80A557A0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Heishi3/func_80A557A0.s @@ -1,50 +1,50 @@ glabel func_80A557A0 /* 00160 80A557A0 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 00164 80A557A4 AFA40028 */ sw $a0, 0x0028($sp) -/* 00168 80A557A8 AFBF0024 */ sw $ra, 0x0024($sp) +/* 00164 80A557A4 AFA40028 */ sw $a0, 0x0028($sp) +/* 00168 80A557A8 AFBF0024 */ sw $ra, 0x0024($sp) /* 0016C 80A557AC 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 -/* 00170 80A557B0 AFA5002C */ sw $a1, 0x002C($sp) +/* 00170 80A557B0 AFA5002C */ sw $a1, 0x002C($sp) /* 00174 80A557B4 0C028800 */ jal SkelAnime_GetFrameCount - + /* 00178 80A557B8 24845C30 */ addiu $a0, $a0, 0x5C30 ## $a0 = 06005C30 /* 0017C 80A557BC 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 00180 80A557C0 3C01C120 */ lui $at, 0xC120 ## $at = C1200000 -/* 00184 80A557C4 8FA30028 */ lw $v1, 0x0028($sp) -/* 00188 80A557C8 468021A0 */ cvt.s.w $f6, $f4 +/* 00184 80A557C4 8FA30028 */ lw $v1, 0x0028($sp) +/* 00188 80A557C8 468021A0 */ cvt.s.w $f6, $f4 /* 0018C 80A557CC 44819000 */ mtc1 $at, $f18 ## $f18 = -10.00 /* 00190 80A557D0 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 00194 80A557D4 24A55C30 */ addiu $a1, $a1, 0x5C30 ## $a1 = 06005C30 /* 00198 80A557D8 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 0019C 80A557DC 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 001A0 80A557E0 4600320D */ trunc.w.s $f8, $f6 -/* 001A4 80A557E4 AFA00014 */ sw $zero, 0x0014($sp) +/* 001A0 80A557E0 4600320D */ trunc.w.s $f8, $f6 +/* 001A4 80A557E4 AFA00014 */ sw $zero, 0x0014($sp) /* 001A8 80A557E8 2464014C */ addiu $a0, $v1, 0x014C ## $a0 = 0000014C -/* 001AC 80A557EC E7B20018 */ swc1 $f18, 0x0018($sp) -/* 001B0 80A557F0 440F4000 */ mfc1 $t7, $f8 +/* 001AC 80A557EC E7B20018 */ swc1 $f18, 0x0018($sp) +/* 001B0 80A557F0 440F4000 */ mfc1 $t7, $f8 /* 001B4 80A557F4 00000000 */ nop -/* 001B8 80A557F8 000FC400 */ sll $t8, $t7, 16 -/* 001BC 80A557FC 0018CC03 */ sra $t9, $t8, 16 +/* 001B8 80A557F8 000FC400 */ sll $t8, $t7, 16 +/* 001BC 80A557FC 0018CC03 */ sra $t9, $t8, 16 /* 001C0 80A55800 44995000 */ mtc1 $t9, $f10 ## $f10 = 0.00 /* 001C4 80A55804 00000000 */ nop -/* 001C8 80A55808 46805420 */ cvt.s.w $f16, $f10 -/* 001CC 80A5580C 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 001D0 80A55810 E7B00010 */ swc1 $f16, 0x0010($sp) -/* 001D4 80A55814 8FA30028 */ lw $v1, 0x0028($sp) +/* 001C8 80A55808 46805420 */ cvt.s.w $f16, $f10 +/* 001CC 80A5580C 0C029468 */ jal SkelAnime_ChangeAnim + +/* 001D0 80A55810 E7B00010 */ swc1 $f16, 0x0010($sp) +/* 001D4 80A55814 8FA30028 */ lw $v1, 0x0028($sp) /* 001D8 80A55818 3C0980A5 */ lui $t1, %hi(func_80A55850) ## $t1 = 80A50000 /* 001DC 80A5581C 3C0A80A5 */ lui $t2, %hi(func_80A559B4) ## $t2 = 80A50000 /* 001E0 80A55820 84680278 */ lh $t0, 0x0278($v1) ## 00000278 /* 001E4 80A55824 25295850 */ addiu $t1, $t1, %lo(func_80A55850) ## $t1 = 80A55850 /* 001E8 80A55828 254A59B4 */ addiu $t2, $t2, %lo(func_80A559B4) ## $t2 = 80A559B4 -/* 001EC 80A5582C 55000004 */ bnel $t0, $zero, .L80A55840 +/* 001EC 80A5582C 55000004 */ bnel $t0, $zero, .L80A55840 /* 001F0 80A55830 AC6A025C */ sw $t2, 0x025C($v1) ## 0000025C -/* 001F4 80A55834 10000002 */ beq $zero, $zero, .L80A55840 +/* 001F4 80A55834 10000002 */ beq $zero, $zero, .L80A55840 /* 001F8 80A55838 AC69025C */ sw $t1, 0x025C($v1) ## 0000025C /* 001FC 80A5583C AC6A025C */ sw $t2, 0x025C($v1) ## 0000025C .L80A55840: -/* 00200 80A55840 8FBF0024 */ lw $ra, 0x0024($sp) +/* 00200 80A55840 8FBF0024 */ lw $ra, 0x0024($sp) /* 00204 80A55844 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 00208 80A55848 03E00008 */ jr $ra +/* 00208 80A55848 03E00008 */ jr $ra /* 0020C 80A5584C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Heishi3/func_80A55B2C.s b/asm/non_matchings/overlays/actors/ovl_En_Heishi3/func_80A55B2C.s index a3e683e2f0..0563e7ad67 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Heishi3/func_80A55B2C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Heishi3/func_80A55B2C.s @@ -1,36 +1,36 @@ glabel func_80A55B2C /* 004EC 80A55B2C 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 004F0 80A55B30 AFA40028 */ sw $a0, 0x0028($sp) -/* 004F4 80A55B34 AFBF0024 */ sw $ra, 0x0024($sp) +/* 004F0 80A55B30 AFA40028 */ sw $a0, 0x0028($sp) +/* 004F4 80A55B34 AFBF0024 */ sw $ra, 0x0024($sp) /* 004F8 80A55B38 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 -/* 004FC 80A55B3C AFA5002C */ sw $a1, 0x002C($sp) +/* 004FC 80A55B3C AFA5002C */ sw $a1, 0x002C($sp) /* 00500 80A55B40 0C028800 */ jal SkelAnime_GetFrameCount - + /* 00504 80A55B44 24845880 */ addiu $a0, $a0, 0x5880 ## $a0 = 06005880 /* 00508 80A55B48 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 0050C 80A55B4C 3C01C120 */ lui $at, 0xC120 ## $at = C1200000 -/* 00510 80A55B50 8FA30028 */ lw $v1, 0x0028($sp) -/* 00514 80A55B54 468021A0 */ cvt.s.w $f6, $f4 +/* 00510 80A55B50 8FA30028 */ lw $v1, 0x0028($sp) +/* 00514 80A55B54 468021A0 */ cvt.s.w $f6, $f4 /* 00518 80A55B58 44819000 */ mtc1 $at, $f18 ## $f18 = -10.00 /* 0051C 80A55B5C 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 00520 80A55B60 24A55880 */ addiu $a1, $a1, 0x5880 ## $a1 = 06005880 /* 00524 80A55B64 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 00528 80A55B68 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 0052C 80A55B6C 4600320D */ trunc.w.s $f8, $f6 -/* 00530 80A55B70 AFA00014 */ sw $zero, 0x0014($sp) +/* 0052C 80A55B6C 4600320D */ trunc.w.s $f8, $f6 +/* 00530 80A55B70 AFA00014 */ sw $zero, 0x0014($sp) /* 00534 80A55B74 2464014C */ addiu $a0, $v1, 0x014C ## $a0 = 0000014C -/* 00538 80A55B78 E7B20018 */ swc1 $f18, 0x0018($sp) -/* 0053C 80A55B7C 440F4000 */ mfc1 $t7, $f8 +/* 00538 80A55B78 E7B20018 */ swc1 $f18, 0x0018($sp) +/* 0053C 80A55B7C 440F4000 */ mfc1 $t7, $f8 /* 00540 80A55B80 00000000 */ nop -/* 00544 80A55B84 000FC400 */ sll $t8, $t7, 16 -/* 00548 80A55B88 0018CC03 */ sra $t9, $t8, 16 +/* 00544 80A55B84 000FC400 */ sll $t8, $t7, 16 +/* 00548 80A55B88 0018CC03 */ sra $t9, $t8, 16 /* 0054C 80A55B8C 44995000 */ mtc1 $t9, $f10 ## $f10 = 0.00 /* 00550 80A55B90 00000000 */ nop -/* 00554 80A55B94 46805420 */ cvt.s.w $f16, $f10 -/* 00558 80A55B98 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 0055C 80A55B9C E7B00010 */ swc1 $f16, 0x0010($sp) -/* 00560 80A55BA0 8FA30028 */ lw $v1, 0x0028($sp) +/* 00554 80A55B94 46805420 */ cvt.s.w $f16, $f10 +/* 00558 80A55B98 0C029468 */ jal SkelAnime_ChangeAnim + +/* 0055C 80A55B9C E7B00010 */ swc1 $f16, 0x0010($sp) +/* 00560 80A55BA0 8FA30028 */ lw $v1, 0x0028($sp) /* 00564 80A55BA4 3C014020 */ lui $at, 0x4020 ## $at = 40200000 /* 00568 80A55BA8 44812000 */ mtc1 $at, $f4 ## $f4 = 2.50 /* 0056C 80A55BAC 3C0980A5 */ lui $t1, %hi(func_80A55BD4) ## $t1 = 80A50000 @@ -39,9 +39,9 @@ glabel func_80A55B2C /* 00578 80A55BB8 A4680272 */ sh $t0, 0x0272($v1) ## 00000272 /* 0057C 80A55BBC AC69025C */ sw $t1, 0x025C($v1) ## 0000025C /* 00580 80A55BC0 E4640068 */ swc1 $f4, 0x0068($v1) ## 00000068 -/* 00584 80A55BC4 8FBF0024 */ lw $ra, 0x0024($sp) +/* 00584 80A55BC4 8FBF0024 */ lw $ra, 0x0024($sp) /* 00588 80A55BC8 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 0058C 80A55BCC 03E00008 */ jr $ra +/* 0058C 80A55BCC 03E00008 */ jr $ra /* 00590 80A55BD0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Heishi3/func_80A55C6C.s b/asm/non_matchings/overlays/actors/ovl_En_Heishi3/func_80A55C6C.s index 726109b48e..5ca1abaefb 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Heishi3/func_80A55C6C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Heishi3/func_80A55C6C.s @@ -1,42 +1,42 @@ glabel func_80A55C6C /* 0062C 80A55C6C 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 00630 80A55C70 AFA40028 */ sw $a0, 0x0028($sp) -/* 00634 80A55C74 AFBF0024 */ sw $ra, 0x0024($sp) +/* 00630 80A55C70 AFA40028 */ sw $a0, 0x0028($sp) +/* 00634 80A55C74 AFBF0024 */ sw $ra, 0x0024($sp) /* 00638 80A55C78 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 -/* 0063C 80A55C7C AFA5002C */ sw $a1, 0x002C($sp) +/* 0063C 80A55C7C AFA5002C */ sw $a1, 0x002C($sp) /* 00640 80A55C80 0C028800 */ jal SkelAnime_GetFrameCount - + /* 00644 80A55C84 24845C30 */ addiu $a0, $a0, 0x5C30 ## $a0 = 06005C30 /* 00648 80A55C88 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 0064C 80A55C8C 3C01C120 */ lui $at, 0xC120 ## $at = C1200000 /* 00650 80A55C90 44819000 */ mtc1 $at, $f18 ## $f18 = -10.00 -/* 00654 80A55C94 468021A0 */ cvt.s.w $f6, $f4 -/* 00658 80A55C98 8FA40028 */ lw $a0, 0x0028($sp) +/* 00654 80A55C94 468021A0 */ cvt.s.w $f6, $f4 +/* 00658 80A55C98 8FA40028 */ lw $a0, 0x0028($sp) /* 0065C 80A55C9C 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 00660 80A55CA0 24A55C30 */ addiu $a1, $a1, 0x5C30 ## $a1 = 06005C30 /* 00664 80A55CA4 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 00668 80A55CA8 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 0066C 80A55CAC 4600320D */ trunc.w.s $f8, $f6 -/* 00670 80A55CB0 AFA00014 */ sw $zero, 0x0014($sp) -/* 00674 80A55CB4 E7B20018 */ swc1 $f18, 0x0018($sp) +/* 0066C 80A55CAC 4600320D */ trunc.w.s $f8, $f6 +/* 00670 80A55CB0 AFA00014 */ sw $zero, 0x0014($sp) +/* 00674 80A55CB4 E7B20018 */ swc1 $f18, 0x0018($sp) /* 00678 80A55CB8 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 0067C 80A55CBC 440F4000 */ mfc1 $t7, $f8 +/* 0067C 80A55CBC 440F4000 */ mfc1 $t7, $f8 /* 00680 80A55CC0 00000000 */ nop -/* 00684 80A55CC4 000FC400 */ sll $t8, $t7, 16 -/* 00688 80A55CC8 0018CC03 */ sra $t9, $t8, 16 +/* 00684 80A55CC4 000FC400 */ sll $t8, $t7, 16 +/* 00688 80A55CC8 0018CC03 */ sra $t9, $t8, 16 /* 0068C 80A55CCC 44995000 */ mtc1 $t9, $f10 ## $f10 = 0.00 /* 00690 80A55CD0 00000000 */ nop -/* 00694 80A55CD4 46805420 */ cvt.s.w $f16, $f10 -/* 00698 80A55CD8 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 0069C 80A55CDC E7B00010 */ swc1 $f16, 0x0010($sp) -/* 006A0 80A55CE0 8FA90028 */ lw $t1, 0x0028($sp) +/* 00694 80A55CD4 46805420 */ cvt.s.w $f16, $f10 +/* 00698 80A55CD8 0C029468 */ jal SkelAnime_ChangeAnim + +/* 0069C 80A55CDC E7B00010 */ swc1 $f16, 0x0010($sp) +/* 006A0 80A55CE0 8FA90028 */ lw $t1, 0x0028($sp) /* 006A4 80A55CE4 3C0880A5 */ lui $t0, %hi(func_80A55D00) ## $t0 = 80A50000 /* 006A8 80A55CE8 25085D00 */ addiu $t0, $t0, %lo(func_80A55D00) ## $t0 = 80A55D00 /* 006AC 80A55CEC AD28025C */ sw $t0, 0x025C($t1) ## 0000025C -/* 006B0 80A55CF0 8FBF0024 */ lw $ra, 0x0024($sp) +/* 006B0 80A55CF0 8FBF0024 */ lw $ra, 0x0024($sp) /* 006B4 80A55CF4 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 006B8 80A55CF8 03E00008 */ jr $ra +/* 006B8 80A55CF8 03E00008 */ jr $ra /* 006BC 80A55CFC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Heishi4/func_80A56328.s b/asm/non_matchings/overlays/actors/ovl_En_Heishi4/func_80A56328.s index 200c5c2bc2..4ebe2500de 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Heishi4/func_80A56328.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Heishi4/func_80A56328.s @@ -1,42 +1,42 @@ glabel func_80A56328 /* 00258 80A56328 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 0025C 80A5632C AFA40028 */ sw $a0, 0x0028($sp) -/* 00260 80A56330 AFBF0024 */ sw $ra, 0x0024($sp) +/* 0025C 80A5632C AFA40028 */ sw $a0, 0x0028($sp) +/* 00260 80A56330 AFBF0024 */ sw $ra, 0x0024($sp) /* 00264 80A56334 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 -/* 00268 80A56338 AFA5002C */ sw $a1, 0x002C($sp) +/* 00268 80A56338 AFA5002C */ sw $a1, 0x002C($sp) /* 0026C 80A5633C 0C028800 */ jal SkelAnime_GetFrameCount - + /* 00270 80A56340 24845C30 */ addiu $a0, $a0, 0x5C30 ## $a0 = 06005C30 /* 00274 80A56344 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 00278 80A56348 3C01C120 */ lui $at, 0xC120 ## $at = C1200000 /* 0027C 80A5634C 44819000 */ mtc1 $at, $f18 ## $f18 = -10.00 -/* 00280 80A56350 468021A0 */ cvt.s.w $f6, $f4 -/* 00284 80A56354 8FA40028 */ lw $a0, 0x0028($sp) +/* 00280 80A56350 468021A0 */ cvt.s.w $f6, $f4 +/* 00284 80A56354 8FA40028 */ lw $a0, 0x0028($sp) /* 00288 80A56358 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 0028C 80A5635C 24A55C30 */ addiu $a1, $a1, 0x5C30 ## $a1 = 06005C30 /* 00290 80A56360 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 00294 80A56364 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 00298 80A56368 4600320D */ trunc.w.s $f8, $f6 -/* 0029C 80A5636C AFA00014 */ sw $zero, 0x0014($sp) -/* 002A0 80A56370 E7B20018 */ swc1 $f18, 0x0018($sp) +/* 00298 80A56368 4600320D */ trunc.w.s $f8, $f6 +/* 0029C 80A5636C AFA00014 */ sw $zero, 0x0014($sp) +/* 002A0 80A56370 E7B20018 */ swc1 $f18, 0x0018($sp) /* 002A4 80A56374 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 002A8 80A56378 440F4000 */ mfc1 $t7, $f8 +/* 002A8 80A56378 440F4000 */ mfc1 $t7, $f8 /* 002AC 80A5637C 00000000 */ nop -/* 002B0 80A56380 000FC400 */ sll $t8, $t7, 16 -/* 002B4 80A56384 0018CC03 */ sra $t9, $t8, 16 +/* 002B0 80A56380 000FC400 */ sll $t8, $t7, 16 +/* 002B4 80A56384 0018CC03 */ sra $t9, $t8, 16 /* 002B8 80A56388 44995000 */ mtc1 $t9, $f10 ## $f10 = 0.00 /* 002BC 80A5638C 00000000 */ nop -/* 002C0 80A56390 46805420 */ cvt.s.w $f16, $f10 -/* 002C4 80A56394 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 002C8 80A56398 E7B00010 */ swc1 $f16, 0x0010($sp) -/* 002CC 80A5639C 8FA90028 */ lw $t1, 0x0028($sp) +/* 002C0 80A56390 46805420 */ cvt.s.w $f16, $f10 +/* 002C4 80A56394 0C029468 */ jal SkelAnime_ChangeAnim + +/* 002C8 80A56398 E7B00010 */ swc1 $f16, 0x0010($sp) +/* 002CC 80A5639C 8FA90028 */ lw $t1, 0x0028($sp) /* 002D0 80A563A0 3C0880A5 */ lui $t0, %hi(func_80A563BC) ## $t0 = 80A50000 /* 002D4 80A563A4 250863BC */ addiu $t0, $t0, %lo(func_80A563BC) ## $t0 = 80A563BC /* 002D8 80A563A8 AD28025C */ sw $t0, 0x025C($t1) ## 0000025C -/* 002DC 80A563AC 8FBF0024 */ lw $ra, 0x0024($sp) +/* 002DC 80A563AC 8FBF0024 */ lw $ra, 0x0024($sp) /* 002E0 80A563B0 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 002E4 80A563B4 03E00008 */ jr $ra +/* 002E4 80A563B4 03E00008 */ jr $ra /* 002E8 80A563B8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Heishi4/func_80A563BC.s b/asm/non_matchings/overlays/actors/ovl_En_Heishi4/func_80A563BC.s index 88e37ab2e9..961f8bc7d2 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Heishi4/func_80A563BC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Heishi4/func_80A563BC.s @@ -22,14 +22,14 @@ glabel func_80A563BC /* 00334 80A56404 01CF1821 */ addu $v1, $t6, $t7 /* 00338 80A56408 8C650000 */ lw $a1, 0x0000($v1) ## 00000000 /* 0033C 80A5640C AFA30018 */ sw $v1, 0x0018($sp) -/* 00340 80A56410 0C01B0D8 */ jal func_8006C360 +/* 00340 80A56410 0C01B0D8 */ jal Text_GetFaceReaction /* 00344 80A56414 AFA60020 */ sw $a2, 0x0020($sp) /* 00348 80A56418 8FA30018 */ lw $v1, 0x0018($sp) /* 0034C 80A5641C 1040000D */ beq $v0, $zero, .L80A56454 /* 00350 80A56420 8FA60020 */ lw $a2, 0x0020($sp) /* 00354 80A56424 8FA40024 */ lw $a0, 0x0024($sp) /* 00358 80A56428 8C650000 */ lw $a1, 0x0000($v1) ## 00000000 -/* 0035C 80A5642C 0C01B0D8 */ jal func_8006C360 +/* 0035C 80A5642C 0C01B0D8 */ jal Text_GetFaceReaction /* 00360 80A56430 AFA60020 */ sw $a2, 0x0020($sp) /* 00364 80A56434 8FA60020 */ lw $a2, 0x0020($sp) /* 00368 80A56438 3C1980A5 */ lui $t9, %hi(func_80A56B40) ## $t9 = 80A50000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Heishi4/func_80A56544.s b/asm/non_matchings/overlays/actors/ovl_En_Heishi4/func_80A56544.s index 5014c05cb8..655c17b874 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Heishi4/func_80A56544.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Heishi4/func_80A56544.s @@ -1,62 +1,62 @@ glabel func_80A56544 /* 00474 80A56544 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 00478 80A56548 AFA40028 */ sw $a0, 0x0028($sp) -/* 0047C 80A5654C AFBF0024 */ sw $ra, 0x0024($sp) +/* 00478 80A56548 AFA40028 */ sw $a0, 0x0028($sp) +/* 0047C 80A5654C AFBF0024 */ sw $ra, 0x0024($sp) /* 00480 80A56550 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 -/* 00484 80A56554 AFA5002C */ sw $a1, 0x002C($sp) +/* 00484 80A56554 AFA5002C */ sw $a1, 0x002C($sp) /* 00488 80A56558 0C028800 */ jal SkelAnime_GetFrameCount - + /* 0048C 80A5655C 24845C30 */ addiu $a0, $a0, 0x5C30 ## $a0 = 06005C30 /* 00490 80A56560 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 00494 80A56564 3C01C120 */ lui $at, 0xC120 ## $at = C1200000 /* 00498 80A56568 44819000 */ mtc1 $at, $f18 ## $f18 = -10.00 -/* 0049C 80A5656C 468021A0 */ cvt.s.w $f6, $f4 -/* 004A0 80A56570 8FA40028 */ lw $a0, 0x0028($sp) +/* 0049C 80A5656C 468021A0 */ cvt.s.w $f6, $f4 +/* 004A0 80A56570 8FA40028 */ lw $a0, 0x0028($sp) /* 004A4 80A56574 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 004A8 80A56578 24A55C30 */ addiu $a1, $a1, 0x5C30 ## $a1 = 06005C30 /* 004AC 80A5657C 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 004B0 80A56580 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 004B4 80A56584 4600320D */ trunc.w.s $f8, $f6 -/* 004B8 80A56588 AFA00014 */ sw $zero, 0x0014($sp) -/* 004BC 80A5658C E7B20018 */ swc1 $f18, 0x0018($sp) +/* 004B4 80A56584 4600320D */ trunc.w.s $f8, $f6 +/* 004B8 80A56588 AFA00014 */ sw $zero, 0x0014($sp) +/* 004BC 80A5658C E7B20018 */ swc1 $f18, 0x0018($sp) /* 004C0 80A56590 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 004C4 80A56594 440F4000 */ mfc1 $t7, $f8 +/* 004C4 80A56594 440F4000 */ mfc1 $t7, $f8 /* 004C8 80A56598 00000000 */ nop -/* 004CC 80A5659C 000FC400 */ sll $t8, $t7, 16 -/* 004D0 80A565A0 0018CC03 */ sra $t9, $t8, 16 +/* 004CC 80A5659C 000FC400 */ sll $t8, $t7, 16 +/* 004D0 80A565A0 0018CC03 */ sra $t9, $t8, 16 /* 004D4 80A565A4 44995000 */ mtc1 $t9, $f10 ## $f10 = 0.00 /* 004D8 80A565A8 00000000 */ nop -/* 004DC 80A565AC 46805420 */ cvt.s.w $f16, $f10 -/* 004E0 80A565B0 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 004E4 80A565B4 E7B00010 */ swc1 $f16, 0x0010($sp) +/* 004DC 80A565AC 46805420 */ cvt.s.w $f16, $f10 +/* 004E0 80A565B0 0C029468 */ jal SkelAnime_ChangeAnim + +/* 004E4 80A565B4 E7B00010 */ swc1 $f16, 0x0010($sp) /* 004E8 80A565B8 3C088016 */ lui $t0, 0x8016 ## $t0 = 80160000 /* 004EC 80A565BC 8D08E664 */ lw $t0, -0x199C($t0) ## 8015E664 /* 004F0 80A565C0 24010005 */ addiu $at, $zero, 0x0005 ## $at = 00000005 /* 004F4 80A565C4 24020011 */ addiu $v0, $zero, 0x0011 ## $v0 = 00000011 -/* 004F8 80A565C8 11000003 */ beq $t0, $zero, .L80A565D8 -/* 004FC 80A565CC 8FAA0028 */ lw $t2, 0x0028($sp) -/* 00500 80A565D0 10000001 */ beq $zero, $zero, .L80A565D8 +/* 004F8 80A565C8 11000003 */ beq $t0, $zero, .L80A565D8 +/* 004FC 80A565CC 8FAA0028 */ lw $t2, 0x0028($sp) +/* 00500 80A565D0 10000001 */ beq $zero, $zero, .L80A565D8 /* 00504 80A565D4 24020005 */ addiu $v0, $zero, 0x0005 ## $v0 = 00000005 .L80A565D8: -/* 00508 80A565D8 10410008 */ beq $v0, $at, .L80A565FC +/* 00508 80A565D8 10410008 */ beq $v0, $at, .L80A565FC /* 0050C 80A565DC 3C0980A5 */ lui $t1, %hi(func_80A56614) ## $t1 = 80A50000 /* 00510 80A565E0 3C0480A5 */ lui $a0, %hi(D_80A56FDC) ## $a0 = 80A50000 /* 00514 80A565E4 0C00084C */ jal osSyncPrintf - + /* 00518 80A565E8 24846FDC */ addiu $a0, $a0, %lo(D_80A56FDC) ## $a0 = 80A56FDC /* 0051C 80A565EC 0C00B55C */ jal Actor_Kill - -/* 00520 80A565F0 8FA40028 */ lw $a0, 0x0028($sp) -/* 00524 80A565F4 10000004 */ beq $zero, $zero, .L80A56608 -/* 00528 80A565F8 8FBF0024 */ lw $ra, 0x0024($sp) + +/* 00520 80A565F0 8FA40028 */ lw $a0, 0x0028($sp) +/* 00524 80A565F4 10000004 */ beq $zero, $zero, .L80A56608 +/* 00528 80A565F8 8FBF0024 */ lw $ra, 0x0024($sp) .L80A565FC: /* 0052C 80A565FC 25296614 */ addiu $t1, $t1, %lo(func_80A56614) ## $t1 = 00006614 /* 00530 80A56600 AD49025C */ sw $t1, 0x025C($t2) ## 0000025C -/* 00534 80A56604 8FBF0024 */ lw $ra, 0x0024($sp) +/* 00534 80A56604 8FBF0024 */ lw $ra, 0x0024($sp) .L80A56608: /* 00538 80A56608 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 0053C 80A5660C 03E00008 */ jr $ra +/* 0053C 80A5660C 03E00008 */ jr $ra /* 00540 80A56610 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Heishi4/func_80A56614.s b/asm/non_matchings/overlays/actors/ovl_En_Heishi4/func_80A56614.s index 66cff601e5..01e1132e50 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Heishi4/func_80A56614.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Heishi4/func_80A56614.s @@ -23,7 +23,7 @@ glabel func_80A56614 /* 00590 80A56660 8C650000 */ lw $a1, 0x0000($v1) ## 00000000 /* 00594 80A56664 AFA30018 */ sw $v1, 0x0018($sp) /* 00598 80A56668 AFA60020 */ sw $a2, 0x0020($sp) -/* 0059C 80A5666C 0C01B0D8 */ jal func_8006C360 +/* 0059C 80A5666C 0C01B0D8 */ jal Text_GetFaceReaction /* 005A0 80A56670 AFA70024 */ sw $a3, 0x0024($sp) /* 005A4 80A56674 8FA30018 */ lw $v1, 0x0018($sp) /* 005A8 80A56678 8FA60020 */ lw $a2, 0x0020($sp) @@ -31,7 +31,7 @@ glabel func_80A56614 /* 005B0 80A56680 8FA70024 */ lw $a3, 0x0024($sp) /* 005B4 80A56684 00E02025 */ or $a0, $a3, $zero ## $a0 = 00000000 /* 005B8 80A56688 8C650000 */ lw $a1, 0x0000($v1) ## 00000000 -/* 005BC 80A5668C 0C01B0D8 */ jal func_8006C360 +/* 005BC 80A5668C 0C01B0D8 */ jal Text_GetFaceReaction /* 005C0 80A56690 AFA60020 */ sw $a2, 0x0020($sp) /* 005C4 80A56694 8FA60020 */ lw $a2, 0x0020($sp) /* 005C8 80A56698 3C1980A5 */ lui $t9, %hi(func_80A56B40) ## $t9 = 80A50000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Heishi4/func_80A5673C.s b/asm/non_matchings/overlays/actors/ovl_En_Heishi4/func_80A5673C.s index ed2f2e6a53..fa784dc8ce 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Heishi4/func_80A5673C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Heishi4/func_80A5673C.s @@ -3,59 +3,59 @@ glabel func_80A5673C /* 00670 80A56740 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 /* 00674 80A56744 944E0EDC */ lhu $t6, 0x0EDC($v0) ## 8015F53C /* 00678 80A56748 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 0067C 80A5674C AFB00028 */ sw $s0, 0x0028($sp) +/* 0067C 80A5674C AFB00028 */ sw $s0, 0x0028($sp) /* 00680 80A56750 31CF0020 */ andi $t7, $t6, 0x0020 ## $t7 = 00000000 /* 00684 80A56754 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00688 80A56758 AFBF002C */ sw $ra, 0x002C($sp) -/* 0068C 80A5675C 11E00008 */ beq $t7, $zero, .L80A56780 -/* 00690 80A56760 AFA50034 */ sw $a1, 0x0034($sp) +/* 00688 80A56758 AFBF002C */ sw $ra, 0x002C($sp) +/* 0068C 80A5675C 11E00008 */ beq $t7, $zero, .L80A56780 +/* 00690 80A56760 AFA50034 */ sw $a1, 0x0034($sp) /* 00694 80A56764 3C0480A5 */ lui $a0, %hi(D_80A57010) ## $a0 = 80A50000 /* 00698 80A56768 0C00084C */ jal osSyncPrintf - + /* 0069C 80A5676C 24847010 */ addiu $a0, $a0, %lo(D_80A57010) ## $a0 = 80A57010 /* 006A0 80A56770 0C00B55C */ jal Actor_Kill - + /* 006A4 80A56774 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 006A8 80A56778 1000003A */ beq $zero, $zero, .L80A56864 -/* 006AC 80A5677C 8FBF002C */ lw $ra, 0x002C($sp) +/* 006A8 80A56778 1000003A */ beq $zero, $zero, .L80A56864 +/* 006AC 80A5677C 8FBF002C */ lw $ra, 0x002C($sp) .L80A56780: /* 006B0 80A56780 A6000284 */ sh $zero, 0x0284($s0) ## 00000284 /* 006B4 80A56784 94580EE4 */ lhu $t8, 0x0EE4($v0) ## 00000EE4 /* 006B8 80A56788 33190001 */ andi $t9, $t8, 0x0001 ## $t9 = 00000000 -/* 006BC 80A5678C 13200032 */ beq $t9, $zero, .L80A56858 +/* 006BC 80A5678C 13200032 */ beq $t9, $zero, .L80A56858 /* 006C0 80A56790 00000000 */ nop /* 006C4 80A56794 94480F04 */ lhu $t0, 0x0F04($v0) ## 00000F04 /* 006C8 80A56798 24197008 */ addiu $t9, $zero, 0x7008 ## $t9 = 00007008 /* 006CC 80A5679C 3C0480A5 */ lui $a0, %hi(D_80A57074) ## $a0 = 80A50000 /* 006D0 80A567A0 31091000 */ andi $t1, $t0, 0x1000 ## $t1 = 00000000 -/* 006D4 80A567A4 15200024 */ bne $t1, $zero, .L80A56838 +/* 006D4 80A567A4 15200024 */ bne $t1, $zero, .L80A56838 /* 006D8 80A567A8 24080006 */ addiu $t0, $zero, 0x0006 ## $t0 = 00000006 /* 006DC 80A567AC 3C040601 */ lui $a0, 0x0601 ## $a0 = 06010000 /* 006E0 80A567B0 0C028800 */ jal SkelAnime_GetFrameCount - + /* 006E4 80A567B4 2484C444 */ addiu $a0, $a0, 0xC444 ## $a0 = 0600C444 /* 006E8 80A567B8 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 006EC 80A567BC 3C01C120 */ lui $at, 0xC120 ## $at = C1200000 /* 006F0 80A567C0 44819000 */ mtc1 $at, $f18 ## $f18 = -10.00 -/* 006F4 80A567C4 468021A0 */ cvt.s.w $f6, $f4 +/* 006F4 80A567C4 468021A0 */ cvt.s.w $f6, $f4 /* 006F8 80A567C8 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 /* 006FC 80A567CC 24A5C444 */ addiu $a1, $a1, 0xC444 ## $a1 = 0600C444 /* 00700 80A567D0 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C /* 00704 80A567D4 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 00708 80A567D8 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 0070C 80A567DC 4600320D */ trunc.w.s $f8, $f6 -/* 00710 80A567E0 AFA00014 */ sw $zero, 0x0014($sp) -/* 00714 80A567E4 E7B20018 */ swc1 $f18, 0x0018($sp) -/* 00718 80A567E8 440B4000 */ mfc1 $t3, $f8 +/* 0070C 80A567DC 4600320D */ trunc.w.s $f8, $f6 +/* 00710 80A567E0 AFA00014 */ sw $zero, 0x0014($sp) +/* 00714 80A567E4 E7B20018 */ swc1 $f18, 0x0018($sp) +/* 00718 80A567E8 440B4000 */ mfc1 $t3, $f8 /* 0071C 80A567EC 00000000 */ nop -/* 00720 80A567F0 000B6400 */ sll $t4, $t3, 16 -/* 00724 80A567F4 000C6C03 */ sra $t5, $t4, 16 +/* 00720 80A567F0 000B6400 */ sll $t4, $t3, 16 +/* 00724 80A567F4 000C6C03 */ sra $t5, $t4, 16 /* 00728 80A567F8 448D5000 */ mtc1 $t5, $f10 ## $f10 = 0.00 /* 0072C 80A567FC 00000000 */ nop -/* 00730 80A56800 46805420 */ cvt.s.w $f16, $f10 -/* 00734 80A56804 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 00738 80A56808 E7B00010 */ swc1 $f16, 0x0010($sp) +/* 00730 80A56800 46805420 */ cvt.s.w $f16, $f10 +/* 00734 80A56804 0C029468 */ jal SkelAnime_ChangeAnim + +/* 00738 80A56808 E7B00010 */ swc1 $f16, 0x0010($sp) /* 0073C 80A5680C 240E7007 */ addiu $t6, $zero, 0x7007 ## $t6 = 00007007 /* 00740 80A56810 240F0005 */ addiu $t7, $zero, 0x0005 ## $t7 = 00000005 /* 00744 80A56814 24180001 */ addiu $t8, $zero, 0x0001 ## $t8 = 00000001 @@ -64,31 +64,31 @@ glabel func_80A5673C /* 00750 80A56820 A60F0282 */ sh $t7, 0x0282($s0) ## 00000282 /* 00754 80A56824 A6180284 */ sh $t8, 0x0284($s0) ## 00000284 /* 00758 80A56828 0C00084C */ jal osSyncPrintf - + /* 0075C 80A5682C 24847048 */ addiu $a0, $a0, %lo(D_80A57048) ## $a0 = 80A57048 -/* 00760 80A56830 10000005 */ beq $zero, $zero, .L80A56848 +/* 00760 80A56830 10000005 */ beq $zero, $zero, .L80A56848 /* 00764 80A56834 00000000 */ nop .L80A56838: /* 00768 80A56838 A619010E */ sh $t9, 0x010E($s0) ## 0000010E /* 0076C 80A5683C A6080282 */ sh $t0, 0x0282($s0) ## 00000282 /* 00770 80A56840 0C00084C */ jal osSyncPrintf - + /* 00774 80A56844 24847074 */ addiu $a0, $a0, %lo(D_80A57074) ## $a0 = 00007074 .L80A56848: /* 00778 80A56848 3C0980A5 */ lui $t1, %hi(func_80A56874) ## $t1 = 80A50000 /* 0077C 80A5684C 25296874 */ addiu $t1, $t1, %lo(func_80A56874) ## $t1 = 80A56874 -/* 00780 80A56850 10000003 */ beq $zero, $zero, .L80A56860 +/* 00780 80A56850 10000003 */ beq $zero, $zero, .L80A56860 /* 00784 80A56854 AE09025C */ sw $t1, 0x025C($s0) ## 0000025C .L80A56858: /* 00788 80A56858 0C00B55C */ jal Actor_Kill - + /* 0078C 80A5685C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 .L80A56860: -/* 00790 80A56860 8FBF002C */ lw $ra, 0x002C($sp) +/* 00790 80A56860 8FBF002C */ lw $ra, 0x002C($sp) .L80A56864: -/* 00794 80A56864 8FB00028 */ lw $s0, 0x0028($sp) +/* 00794 80A56864 8FB00028 */ lw $s0, 0x0028($sp) /* 00798 80A56868 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 0079C 80A5686C 03E00008 */ jr $ra +/* 0079C 80A5686C 03E00008 */ jr $ra /* 007A0 80A56870 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Heishi4/func_80A56900.s b/asm/non_matchings/overlays/actors/ovl_En_Heishi4/func_80A56900.s index d6c83c2bc5..51a9237816 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Heishi4/func_80A56900.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Heishi4/func_80A56900.s @@ -1,42 +1,42 @@ glabel func_80A56900 /* 00830 80A56900 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 00834 80A56904 AFA40028 */ sw $a0, 0x0028($sp) -/* 00838 80A56908 AFBF0024 */ sw $ra, 0x0024($sp) +/* 00834 80A56904 AFA40028 */ sw $a0, 0x0028($sp) +/* 00838 80A56908 AFBF0024 */ sw $ra, 0x0024($sp) /* 0083C 80A5690C 3C040601 */ lui $a0, 0x0601 ## $a0 = 06010000 -/* 00840 80A56910 AFA5002C */ sw $a1, 0x002C($sp) +/* 00840 80A56910 AFA5002C */ sw $a1, 0x002C($sp) /* 00844 80A56914 0C028800 */ jal SkelAnime_GetFrameCount - + /* 00848 80A56918 2484C6C8 */ addiu $a0, $a0, 0xC6C8 ## $a0 = 0600C6C8 /* 0084C 80A5691C 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 00850 80A56920 3C01C120 */ lui $at, 0xC120 ## $at = C1200000 /* 00854 80A56924 44819000 */ mtc1 $at, $f18 ## $f18 = -10.00 -/* 00858 80A56928 468021A0 */ cvt.s.w $f6, $f4 -/* 0085C 80A5692C 8FA40028 */ lw $a0, 0x0028($sp) +/* 00858 80A56928 468021A0 */ cvt.s.w $f6, $f4 +/* 0085C 80A5692C 8FA40028 */ lw $a0, 0x0028($sp) /* 00860 80A56930 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 /* 00864 80A56934 24A5C6C8 */ addiu $a1, $a1, 0xC6C8 ## $a1 = 0600C6C8 /* 00868 80A56938 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 0086C 80A5693C 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 00870 80A56940 4600320D */ trunc.w.s $f8, $f6 -/* 00874 80A56944 AFA00014 */ sw $zero, 0x0014($sp) -/* 00878 80A56948 E7B20018 */ swc1 $f18, 0x0018($sp) +/* 00870 80A56940 4600320D */ trunc.w.s $f8, $f6 +/* 00874 80A56944 AFA00014 */ sw $zero, 0x0014($sp) +/* 00878 80A56948 E7B20018 */ swc1 $f18, 0x0018($sp) /* 0087C 80A5694C 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 00880 80A56950 440F4000 */ mfc1 $t7, $f8 +/* 00880 80A56950 440F4000 */ mfc1 $t7, $f8 /* 00884 80A56954 00000000 */ nop -/* 00888 80A56958 000FC400 */ sll $t8, $t7, 16 -/* 0088C 80A5695C 0018CC03 */ sra $t9, $t8, 16 +/* 00888 80A56958 000FC400 */ sll $t8, $t7, 16 +/* 0088C 80A5695C 0018CC03 */ sra $t9, $t8, 16 /* 00890 80A56960 44995000 */ mtc1 $t9, $f10 ## $f10 = 0.00 /* 00894 80A56964 00000000 */ nop -/* 00898 80A56968 46805420 */ cvt.s.w $f16, $f10 -/* 0089C 80A5696C 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 008A0 80A56970 E7B00010 */ swc1 $f16, 0x0010($sp) -/* 008A4 80A56974 8FA90028 */ lw $t1, 0x0028($sp) +/* 00898 80A56968 46805420 */ cvt.s.w $f16, $f10 +/* 0089C 80A5696C 0C029468 */ jal SkelAnime_ChangeAnim + +/* 008A0 80A56970 E7B00010 */ swc1 $f16, 0x0010($sp) +/* 008A4 80A56974 8FA90028 */ lw $t1, 0x0028($sp) /* 008A8 80A56978 3C0880A5 */ lui $t0, %hi(func_80A56994) ## $t0 = 80A50000 /* 008AC 80A5697C 25086994 */ addiu $t0, $t0, %lo(func_80A56994) ## $t0 = 80A56994 /* 008B0 80A56980 AD28025C */ sw $t0, 0x025C($t1) ## 0000025C -/* 008B4 80A56984 8FBF0024 */ lw $ra, 0x0024($sp) +/* 008B4 80A56984 8FBF0024 */ lw $ra, 0x0024($sp) /* 008B8 80A56988 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 008BC 80A5698C 03E00008 */ jr $ra +/* 008BC 80A5698C 03E00008 */ jr $ra /* 008C0 80A56990 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Heishi4/func_80A56A50.s b/asm/non_matchings/overlays/actors/ovl_En_Heishi4/func_80A56A50.s index fa04000b61..7f89070609 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Heishi4/func_80A56A50.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Heishi4/func_80A56A50.s @@ -1,36 +1,36 @@ glabel func_80A56A50 /* 00980 80A56A50 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 00984 80A56A54 AFA40028 */ sw $a0, 0x0028($sp) -/* 00988 80A56A58 AFBF0024 */ sw $ra, 0x0024($sp) +/* 00984 80A56A54 AFA40028 */ sw $a0, 0x0028($sp) +/* 00988 80A56A58 AFBF0024 */ sw $ra, 0x0024($sp) /* 0098C 80A56A5C 3C040601 */ lui $a0, 0x0601 ## $a0 = 06010000 -/* 00990 80A56A60 AFA5002C */ sw $a1, 0x002C($sp) +/* 00990 80A56A60 AFA5002C */ sw $a1, 0x002C($sp) /* 00994 80A56A64 0C028800 */ jal SkelAnime_GetFrameCount - + /* 00998 80A56A68 2484C374 */ addiu $a0, $a0, 0xC374 ## $a0 = 0600C374 /* 0099C 80A56A6C 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 -/* 009A0 80A56A70 8FA30028 */ lw $v1, 0x0028($sp) +/* 009A0 80A56A70 8FA30028 */ lw $v1, 0x0028($sp) /* 009A4 80A56A74 3C01C120 */ lui $at, 0xC120 ## $at = C1200000 -/* 009A8 80A56A78 46802020 */ cvt.s.w $f0, $f4 +/* 009A8 80A56A78 46802020 */ cvt.s.w $f0, $f4 /* 009AC 80A56A7C 44813000 */ mtc1 $at, $f6 ## $f6 = -10.00 /* 009B0 80A56A80 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 /* 009B4 80A56A84 240E0002 */ addiu $t6, $zero, 0x0002 ## $t6 = 00000002 /* 009B8 80A56A88 24A5C374 */ addiu $a1, $a1, 0xC374 ## $a1 = 0600C374 /* 009BC 80A56A8C 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 009C0 80A56A90 E4600288 */ swc1 $f0, 0x0288($v1) ## 00000288 -/* 009C4 80A56A94 AFAE0014 */ sw $t6, 0x0014($sp) -/* 009C8 80A56A98 E7A00010 */ swc1 $f0, 0x0010($sp) +/* 009C4 80A56A94 AFAE0014 */ sw $t6, 0x0014($sp) +/* 009C8 80A56A98 E7A00010 */ swc1 $f0, 0x0010($sp) /* 009CC 80A56A9C 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 /* 009D0 80A56AA0 2464014C */ addiu $a0, $v1, 0x014C ## $a0 = 0000014C -/* 009D4 80A56AA4 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 009D8 80A56AA8 E7A60018 */ swc1 $f6, 0x0018($sp) -/* 009DC 80A56AAC 8FB80028 */ lw $t8, 0x0028($sp) +/* 009D4 80A56AA4 0C029468 */ jal SkelAnime_ChangeAnim + +/* 009D8 80A56AA8 E7A60018 */ swc1 $f6, 0x0018($sp) +/* 009DC 80A56AAC 8FB80028 */ lw $t8, 0x0028($sp) /* 009E0 80A56AB0 3C0F80A5 */ lui $t7, %hi(func_80A56ACC) ## $t7 = 80A50000 /* 009E4 80A56AB4 25EF6ACC */ addiu $t7, $t7, %lo(func_80A56ACC) ## $t7 = 80A56ACC /* 009E8 80A56AB8 AF0F025C */ sw $t7, 0x025C($t8) ## 0000025C -/* 009EC 80A56ABC 8FBF0024 */ lw $ra, 0x0024($sp) +/* 009EC 80A56ABC 8FBF0024 */ lw $ra, 0x0024($sp) /* 009F0 80A56AC0 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 009F4 80A56AC4 03E00008 */ jr $ra +/* 009F4 80A56AC4 03E00008 */ jr $ra /* 009F8 80A56AC8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Heishi4/func_80A56B40.s b/asm/non_matchings/overlays/actors/ovl_En_Heishi4/func_80A56B40.s index 7a71cf7104..bc71e115a1 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Heishi4/func_80A56B40.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Heishi4/func_80A56B40.s @@ -26,7 +26,7 @@ glabel func_80A56B40 .L80A56B98: /* 00AC8 80A56B98 00AE2821 */ addu $a1, $a1, $t6 /* 00ACC 80A56B9C 8CA56EF0 */ lw $a1, %lo(D_80A56EF0)($a1) -/* 00AD0 80A56BA0 0C01B0D8 */ jal func_8006C360 +/* 00AD0 80A56BA0 0C01B0D8 */ jal Text_GetFaceReaction /* 00AD4 80A56BA4 AFA60018 */ sw $a2, 0x0018($sp) /* 00AD8 80A56BA8 10400013 */ beq $v0, $zero, .L80A56BF8 /* 00ADC 80A56BAC 8FA60018 */ lw $a2, 0x0018($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Hintnuts/EnHintnuts_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Hintnuts/EnHintnuts_Draw.s index b7c66fc64a..7788cab051 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Hintnuts/EnHintnuts_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Hintnuts/EnHintnuts_Draw.s @@ -10,7 +10,7 @@ glabel EnHintnuts_Draw /* 01790 80A58990 8FB80020 */ lw $t8, 0x0020($sp) /* 01794 80A58994 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 /* 01798 80A58998 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 0179C 80A5899C 0C00D498 */ jal Draw_DListOpa +/* 0179C 80A5899C 0C00D498 */ jal Gfx_DrawDListOpa /* 017A0 80A589A0 24A514E0 */ addiu $a1, $a1, 0x14E0 ## $a1 = 060014E0 /* 017A4 80A589A4 10000009 */ beq $zero, $zero, .L80A589CC diff --git a/asm/non_matchings/overlays/actors/ovl_En_Hintnuts/func_80A57454.s b/asm/non_matchings/overlays/actors/ovl_En_Hintnuts/func_80A57454.s index 38c9e99634..e0a0a64f07 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Hintnuts/func_80A57454.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Hintnuts/func_80A57454.s @@ -1,18 +1,18 @@ glabel func_80A57454 /* 00254 80A57454 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00258 80A57458 AFBF0014 */ sw $ra, 0x0014($sp) +/* 00258 80A57458 AFBF0014 */ sw $ra, 0x0014($sp) /* 0025C 80A5745C 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 /* 00260 80A57460 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 00264 80A57464 24A52B90 */ addiu $a1, $a1, 0x2B90 ## $a1 = 06002B90 -/* 00268 80A57468 AFA70018 */ sw $a3, 0x0018($sp) +/* 00268 80A57468 AFA70018 */ sw $a3, 0x0018($sp) /* 0026C 80A5746C 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 00270 80A57470 0C0294A7 */ jal func_800A529C +/* 00270 80A57470 0C0294A7 */ jal SkelAnime_ChangeAnimPlaybackStop /* 00274 80A57474 24060000 */ addiu $a2, $zero, 0x0000 ## $a2 = 00000000 /* 00278 80A57478 24040064 */ addiu $a0, $zero, 0x0064 ## $a0 = 00000064 /* 0027C 80A5747C 0C01DF64 */ jal Math_Rand_S16Offset - + /* 00280 80A57480 24050032 */ addiu $a1, $zero, 0x0032 ## $a1 = 00000032 -/* 00284 80A57484 8FA70018 */ lw $a3, 0x0018($sp) +/* 00284 80A57484 8FA70018 */ lw $a3, 0x0018($sp) /* 00288 80A57488 3C0980A5 */ lui $t1, %hi(func_80A578FC) ## $t1 = 80A50000 /* 0028C 80A5748C 240E0005 */ addiu $t6, $zero, 0x0005 ## $t6 = 00000005 /* 00290 80A57490 8CF80008 */ lw $t8, 0x0008($a3) ## 00000008 @@ -28,9 +28,9 @@ glabel func_80A57454 /* 002B8 80A574B8 ACE90190 */ sw $t1, 0x0190($a3) ## 00000190 /* 002BC 80A574BC ACEF0028 */ sw $t7, 0x0028($a3) ## 00000028 /* 002C0 80A574C0 ACF8002C */ sw $t8, 0x002C($a3) ## 0000002C -/* 002C4 80A574C4 8FBF0014 */ lw $ra, 0x0014($sp) +/* 002C4 80A574C4 8FBF0014 */ lw $ra, 0x0014($sp) /* 002C8 80A574C8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 002CC 80A574CC 03E00008 */ jr $ra +/* 002CC 80A574CC 03E00008 */ jr $ra /* 002D0 80A574D0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Hintnuts/func_80A574D4.s b/asm/non_matchings/overlays/actors/ovl_En_Hintnuts/func_80A574D4.s index 436827b0d4..1813649ffa 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Hintnuts/func_80A574D4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Hintnuts/func_80A574D4.s @@ -1,21 +1,21 @@ glabel func_80A574D4 /* 002D4 80A574D4 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 002D8 80A574D8 AFBF0014 */ sw $ra, 0x0014($sp) +/* 002D8 80A574D8 AFBF0014 */ sw $ra, 0x0014($sp) /* 002DC 80A574DC 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 /* 002E0 80A574E0 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 002E4 80A574E4 24A52894 */ addiu $a1, $a1, 0x2894 ## $a1 = 06002894 -/* 002E8 80A574E8 AFA60018 */ sw $a2, 0x0018($sp) -/* 002EC 80A574EC 0C0294BE */ jal func_800A52F8 +/* 002E8 80A574E8 AFA60018 */ sw $a2, 0x0018($sp) +/* 002EC 80A574EC 0C0294BE */ jal SkelAnime_ChangeAnimDefaultRepeat /* 002F0 80A574F0 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 002F4 80A574F4 8FA60018 */ lw $a2, 0x0018($sp) +/* 002F4 80A574F4 8FA60018 */ lw $a2, 0x0018($sp) /* 002F8 80A574F8 3C0F80A5 */ lui $t7, %hi(func_80A57B60) ## $t7 = 80A50000 /* 002FC 80A574FC 240E0002 */ addiu $t6, $zero, 0x0002 ## $t6 = 00000002 /* 00300 80A57500 25EF7B60 */ addiu $t7, $t7, %lo(func_80A57B60) ## $t7 = 80A57B60 /* 00304 80A57504 A4CE0194 */ sh $t6, 0x0194($a2) ## 00000194 /* 00308 80A57508 ACCF0190 */ sw $t7, 0x0190($a2) ## 00000190 -/* 0030C 80A5750C 8FBF0014 */ lw $ra, 0x0014($sp) +/* 0030C 80A5750C 8FBF0014 */ lw $ra, 0x0014($sp) /* 00310 80A57510 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00314 80A57514 03E00008 */ jr $ra +/* 00314 80A57514 03E00008 */ jr $ra /* 00318 80A57518 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Hintnuts/func_80A5751C.s b/asm/non_matchings/overlays/actors/ovl_En_Hintnuts/func_80A5751C.s index 71a727a5c9..8c474dd878 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Hintnuts/func_80A5751C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Hintnuts/func_80A5751C.s @@ -1,18 +1,18 @@ glabel func_80A5751C /* 0031C 80A5751C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00320 80A57520 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00324 80A57524 AFA40018 */ sw $a0, 0x0018($sp) +/* 00320 80A57520 AFBF0014 */ sw $ra, 0x0014($sp) +/* 00324 80A57524 AFA40018 */ sw $a0, 0x0018($sp) /* 00328 80A57528 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 0032C 80A5752C 24A50168 */ addiu $a1, $a1, 0x0168 ## $a1 = 06000168 -/* 00330 80A57530 0C02947A */ jal func_800A51E8 +/* 00330 80A57530 0C02947A */ jal SkelAnime_ChangeAnimDefaultStop /* 00334 80A57534 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 00338 80A57538 8FAF0018 */ lw $t7, 0x0018($sp) +/* 00338 80A57538 8FAF0018 */ lw $t7, 0x0018($sp) /* 0033C 80A5753C 3C0E80A5 */ lui $t6, %hi(func_80A57CA8) ## $t6 = 80A50000 /* 00340 80A57540 25CE7CA8 */ addiu $t6, $t6, %lo(func_80A57CA8) ## $t6 = 80A57CA8 /* 00344 80A57544 ADEE0190 */ sw $t6, 0x0190($t7) ## 00000190 -/* 00348 80A57548 8FBF0014 */ lw $ra, 0x0014($sp) +/* 00348 80A57548 8FBF0014 */ lw $ra, 0x0014($sp) /* 0034C 80A5754C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00350 80A57550 03E00008 */ jr $ra +/* 00350 80A57550 03E00008 */ jr $ra /* 00354 80A57554 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Hintnuts/func_80A57558.s b/asm/non_matchings/overlays/actors/ovl_En_Hintnuts/func_80A57558.s index 4779098744..e0cf19782a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Hintnuts/func_80A57558.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Hintnuts/func_80A57558.s @@ -1,31 +1,31 @@ glabel func_80A57558 /* 00358 80A57558 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 0035C 80A5755C AFBF0014 */ sw $ra, 0x0014($sp) +/* 0035C 80A5755C AFBF0014 */ sw $ra, 0x0014($sp) /* 00360 80A57560 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 /* 00364 80A57564 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 00368 80A57568 24A52F7C */ addiu $a1, $a1, 0x2F7C ## $a1 = 06002F7C -/* 0036C 80A5756C AFA70018 */ sw $a3, 0x0018($sp) +/* 0036C 80A5756C AFA70018 */ sw $a3, 0x0018($sp) /* 00370 80A57570 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 00374 80A57574 0C0294D3 */ jal func_800A534C +/* 00374 80A57574 0C0294D3 */ jal SkelAnime_ChangeAnimTransitionRepeat /* 00378 80A57578 3C06C040 */ lui $a2, 0xC040 ## $a2 = C0400000 -/* 0037C 80A5757C 8FA70018 */ lw $a3, 0x0018($sp) +/* 0037C 80A5757C 8FA70018 */ lw $a3, 0x0018($sp) /* 00380 80A57580 3C0E80A5 */ lui $t6, %hi(func_80A57CA8) ## $t6 = 80A50000 /* 00384 80A57584 25CE7CA8 */ addiu $t6, $t6, %lo(func_80A57CA8) ## $t6 = 80A57CA8 /* 00388 80A57588 8CEF0190 */ lw $t7, 0x0190($a3) ## 00000190 /* 0038C 80A5758C 3C0880A5 */ lui $t0, %hi(func_80A57BE4) ## $t0 = 80A50000 /* 00390 80A57590 24190001 */ addiu $t9, $zero, 0x0001 ## $t9 = 00000001 -/* 00394 80A57594 15CF0004 */ bne $t6, $t7, .L80A575A8 +/* 00394 80A57594 15CF0004 */ bne $t6, $t7, .L80A575A8 /* 00398 80A57598 25087BE4 */ addiu $t0, $t0, %lo(func_80A57BE4) ## $t0 = 80A57BE4 /* 0039C 80A5759C 24181002 */ addiu $t8, $zero, 0x1002 ## $t8 = 00001002 -/* 003A0 80A575A0 10000002 */ beq $zero, $zero, .L80A575AC +/* 003A0 80A575A0 10000002 */ beq $zero, $zero, .L80A575AC /* 003A4 80A575A4 A4F80194 */ sh $t8, 0x0194($a3) ## 00000194 .L80A575A8: /* 003A8 80A575A8 A4F90194 */ sh $t9, 0x0194($a3) ## 00000194 .L80A575AC: /* 003AC 80A575AC ACE80190 */ sw $t0, 0x0190($a3) ## 00000190 -/* 003B0 80A575B0 8FBF0014 */ lw $ra, 0x0014($sp) +/* 003B0 80A575B0 8FBF0014 */ lw $ra, 0x0014($sp) /* 003B4 80A575B4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 003B8 80A575B8 03E00008 */ jr $ra +/* 003B8 80A575B8 03E00008 */ jr $ra /* 003BC 80A575BC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Hintnuts/func_80A575C0.s b/asm/non_matchings/overlays/actors/ovl_En_Hintnuts/func_80A575C0.s index ff3c7d94e6..33c37d663c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Hintnuts/func_80A575C0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Hintnuts/func_80A575C0.s @@ -1,23 +1,23 @@ glabel func_80A575C0 /* 003C0 80A575C0 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 003C4 80A575C4 AFBF0014 */ sw $ra, 0x0014($sp) -/* 003C8 80A575C8 AFA40018 */ sw $a0, 0x0018($sp) +/* 003C4 80A575C4 AFBF0014 */ sw $ra, 0x0014($sp) +/* 003C8 80A575C8 AFA40018 */ sw $a0, 0x0018($sp) /* 003CC 80A575CC 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 003D0 80A575D0 24A524CC */ addiu $a1, $a1, 0x24CC ## $a1 = 060024CC /* 003D4 80A575D4 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 003D8 80A575D8 0C029490 */ jal func_800A5240 +/* 003D8 80A575D8 0C029490 */ jal SkelAnime_ChangeAnimTransitionStop /* 003DC 80A575DC 3C06C0A0 */ lui $a2, 0xC0A0 ## $a2 = C0A00000 -/* 003E0 80A575E0 8FA40018 */ lw $a0, 0x0018($sp) +/* 003E0 80A575E0 8FA40018 */ lw $a0, 0x0018($sp) /* 003E4 80A575E4 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 003E8 80A575E8 2405387D */ addiu $a1, $zero, 0x387D ## $a1 = 0000387D -/* 003EC 80A575EC 8FAF0018 */ lw $t7, 0x0018($sp) +/* 003EC 80A575EC 8FAF0018 */ lw $t7, 0x0018($sp) /* 003F0 80A575F0 3C0E80A5 */ lui $t6, %hi(func_80A57DE4) ## $t6 = 80A50000 /* 003F4 80A575F4 25CE7DE4 */ addiu $t6, $t6, %lo(func_80A57DE4) ## $t6 = 80A57DE4 /* 003F8 80A575F8 ADEE0190 */ sw $t6, 0x0190($t7) ## 00000190 -/* 003FC 80A575FC 8FBF0014 */ lw $ra, 0x0014($sp) +/* 003FC 80A575FC 8FBF0014 */ lw $ra, 0x0014($sp) /* 00400 80A57600 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00404 80A57604 03E00008 */ jr $ra +/* 00404 80A57604 03E00008 */ jr $ra /* 00408 80A57608 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Hintnuts/func_80A5760C.s b/asm/non_matchings/overlays/actors/ovl_En_Hintnuts/func_80A5760C.s index 1abf173fb7..d23c5f28e7 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Hintnuts/func_80A5760C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Hintnuts/func_80A5760C.s @@ -1,52 +1,52 @@ glabel func_80A5760C /* 0040C 80A5760C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00410 80A57610 AFBF0014 */ sw $ra, 0x0014($sp) +/* 00410 80A57610 AFBF0014 */ sw $ra, 0x0014($sp) /* 00414 80A57614 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 /* 00418 80A57618 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 0041C 80A5761C 24A526C4 */ addiu $a1, $a1, 0x26C4 ## $a1 = 060026C4 -/* 00420 80A57620 AFA70018 */ sw $a3, 0x0018($sp) +/* 00420 80A57620 AFA70018 */ sw $a3, 0x0018($sp) /* 00424 80A57624 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 00428 80A57628 0C029490 */ jal func_800A5240 +/* 00428 80A57628 0C029490 */ jal SkelAnime_ChangeAnimTransitionStop /* 0042C 80A5762C 3C06C040 */ lui $a2, 0xC040 ## $a2 = C0400000 -/* 00430 80A57630 8FA40018 */ lw $a0, 0x0018($sp) +/* 00430 80A57630 8FA40018 */ lw $a0, 0x0018($sp) /* 00434 80A57634 240E0025 */ addiu $t6, $zero, 0x0025 ## $t6 = 00000025 /* 00438 80A57638 24053880 */ addiu $a1, $zero, 0x3880 ## $a1 = 00003880 /* 0043C 80A5763C 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 00440 80A57640 A48E0256 */ sh $t6, 0x0256($a0) ## 00000256 -/* 00444 80A57644 8FA70018 */ lw $a3, 0x0018($sp) +/* 00444 80A57644 8FA70018 */ lw $a3, 0x0018($sp) /* 00448 80A57648 3C0D80A5 */ lui $t5, %hi(func_80A57EF8) ## $t5 = 80A50000 /* 0044C 80A5764C 25AD7EF8 */ addiu $t5, $t5, %lo(func_80A57EF8) ## $t5 = 80A57EF8 /* 00450 80A57650 90EF0225 */ lbu $t7, 0x0225($a3) ## 00000225 /* 00454 80A57654 84E3001C */ lh $v1, 0x001C($a3) ## 0000001C /* 00458 80A57658 31F8FFFE */ andi $t8, $t7, 0xFFFE ## $t8 = 00000000 -/* 0045C 80A5765C 18600022 */ blez $v1, .L80A576E8 +/* 0045C 80A5765C 18600022 */ blez $v1, .L80A576E8 /* 00460 80A57660 A0F80225 */ sb $t8, 0x0225($a3) ## 00000225 -/* 00464 80A57664 28610004 */ slti $at, $v1, 0x0004 -/* 00468 80A57668 50200020 */ beql $at, $zero, .L80A576EC +/* 00464 80A57664 28610004 */ slti $at, $v1, 0x0004 +/* 00468 80A57668 50200020 */ beql $at, $zero, .L80A576EC /* 0046C 80A5766C ACED0190 */ sw $t5, 0x0190($a3) ## 00000190 /* 00470 80A57670 90F90002 */ lbu $t9, 0x0002($a3) ## 00000002 /* 00474 80A57674 24010005 */ addiu $at, $zero, 0x0005 ## $at = 00000005 /* 00478 80A57678 3C0580A6 */ lui $a1, %hi(D_80A58A34) ## $a1 = 80A60000 -/* 0047C 80A5767C 1721001A */ bne $t9, $at, .L80A576E8 +/* 0047C 80A5767C 1721001A */ bne $t9, $at, .L80A576E8 /* 00480 80A57680 24A58A34 */ addiu $a1, $a1, %lo(D_80A58A34) ## $a1 = 80A58A34 /* 00484 80A57684 84A20000 */ lh $v0, 0x0000($a1) ## 80A58A34 /* 00488 80A57688 2401FFFC */ addiu $at, $zero, 0xFFFC ## $at = FFFFFFFC /* 0048C 80A5768C 3C0C80A5 */ lui $t4, %hi(func_80A57F5C) ## $t4 = 80A50000 -/* 00490 80A57690 54410005 */ bnel $v0, $at, .L80A576A8 +/* 00490 80A57690 54410005 */ bnel $v0, $at, .L80A576A8 /* 00494 80A57694 24440001 */ addiu $a0, $v0, 0x0001 ## $a0 = 00000001 /* 00498 80A57698 A4A00000 */ sh $zero, 0x0000($a1) ## 80A58A34 /* 0049C 80A5769C 84A20000 */ lh $v0, 0x0000($a1) ## 80A58A34 /* 004A0 80A576A0 84E3001C */ lh $v1, 0x001C($a3) ## 0000001C /* 004A4 80A576A4 24440001 */ addiu $a0, $v0, 0x0001 ## $a0 = 00000001 .L80A576A8: -/* 004A8 80A576A8 14830003 */ bne $a0, $v1, .L80A576B8 +/* 004A8 80A576A8 14830003 */ bne $a0, $v1, .L80A576B8 /* 004AC 80A576AC 00000000 */ nop -/* 004B0 80A576B0 10000007 */ beq $zero, $zero, .L80A576D0 +/* 004B0 80A576B0 10000007 */ beq $zero, $zero, .L80A576D0 /* 004B4 80A576B4 A4A40000 */ sh $a0, 0x0000($a1) ## 80A58A34 .L80A576B8: -/* 004B8 80A576B8 18400003 */ blez $v0, .L80A576C8 -/* 004BC 80A576BC 00024023 */ subu $t0, $zero, $v0 +/* 004B8 80A576B8 18400003 */ blez $v0, .L80A576C8 +/* 004BC 80A576BC 00024023 */ subu $t0, $zero, $v0 /* 004C0 80A576C0 A4A80000 */ sh $t0, 0x0000($a1) ## 80A58A34 /* 004C4 80A576C4 84A20000 */ lh $v0, 0x0000($a1) ## 80A58A34 .L80A576C8: @@ -57,14 +57,14 @@ glabel func_80A5760C /* 004D4 80A576D4 258C7F5C */ addiu $t4, $t4, %lo(func_80A57F5C) ## $t4 = 80A57F5C /* 004D8 80A576D8 ACEC0190 */ sw $t4, 0x0190($a3) ## 00000190 /* 004DC 80A576DC 354B0010 */ ori $t3, $t2, 0x0010 ## $t3 = 00000010 -/* 004E0 80A576E0 10000002 */ beq $zero, $zero, .L80A576EC +/* 004E0 80A576E0 10000002 */ beq $zero, $zero, .L80A576EC /* 004E4 80A576E4 ACEB0004 */ sw $t3, 0x0004($a3) ## 00000004 .L80A576E8: /* 004E8 80A576E8 ACED0190 */ sw $t5, 0x0190($a3) ## 00000190 .L80A576EC: -/* 004EC 80A576EC 8FBF0014 */ lw $ra, 0x0014($sp) +/* 004EC 80A576EC 8FBF0014 */ lw $ra, 0x0014($sp) /* 004F0 80A576F0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 004F4 80A576F4 03E00008 */ jr $ra +/* 004F4 80A576F4 03E00008 */ jr $ra /* 004F8 80A576F8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Hintnuts/func_80A576FC.s b/asm/non_matchings/overlays/actors/ovl_En_Hintnuts/func_80A576FC.s index 7111062ecd..3a8a07ec07 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Hintnuts/func_80A576FC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Hintnuts/func_80A576FC.s @@ -1,21 +1,21 @@ glabel func_80A576FC /* 004FC 80A576FC 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00500 80A57700 AFBF0014 */ sw $ra, 0x0014($sp) +/* 00500 80A57700 AFBF0014 */ sw $ra, 0x0014($sp) /* 00504 80A57704 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 /* 00508 80A57708 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 0050C 80A5770C 24A53128 */ addiu $a1, $a1, 0x3128 ## $a1 = 06003128 -/* 00510 80A57710 AFA60018 */ sw $a2, 0x0018($sp) -/* 00514 80A57714 0C0294BE */ jal func_800A52F8 +/* 00510 80A57710 AFA60018 */ sw $a2, 0x0018($sp) +/* 00514 80A57714 0C0294BE */ jal SkelAnime_ChangeAnimDefaultRepeat /* 00518 80A57718 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 0051C 80A5771C 8FA60018 */ lw $a2, 0x0018($sp) +/* 0051C 80A5771C 8FA60018 */ lw $a2, 0x0018($sp) /* 00520 80A57720 3C0F80A6 */ lui $t7, %hi(func_80A58028) ## $t7 = 80A60000 /* 00524 80A57724 240E0005 */ addiu $t6, $zero, 0x0005 ## $t6 = 00000005 /* 00528 80A57728 25EF8028 */ addiu $t7, $t7, %lo(func_80A58028) ## $t7 = 80A58028 /* 0052C 80A5772C A4CE0194 */ sh $t6, 0x0194($a2) ## 00000194 /* 00530 80A57730 ACCF0190 */ sw $t7, 0x0190($a2) ## 00000190 -/* 00534 80A57734 8FBF0014 */ lw $ra, 0x0014($sp) +/* 00534 80A57734 8FBF0014 */ lw $ra, 0x0014($sp) /* 00538 80A57738 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 0053C 80A5773C 03E00008 */ jr $ra +/* 0053C 80A5773C 03E00008 */ jr $ra /* 00540 80A57740 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Hintnuts/func_80A57744.s b/asm/non_matchings/overlays/actors/ovl_En_Hintnuts/func_80A57744.s index b9a9613159..00d8f35147 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Hintnuts/func_80A57744.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Hintnuts/func_80A57744.s @@ -1,22 +1,22 @@ glabel func_80A57744 /* 00544 80A57744 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00548 80A57748 AFBF0014 */ sw $ra, 0x0014($sp) +/* 00548 80A57748 AFBF0014 */ sw $ra, 0x0014($sp) /* 0054C 80A5774C 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 /* 00550 80A57750 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 00554 80A57754 24A52E84 */ addiu $a1, $a1, 0x2E84 ## $a1 = 06002E84 -/* 00558 80A57758 AFA70018 */ sw $a3, 0x0018($sp) +/* 00558 80A57758 AFA70018 */ sw $a3, 0x0018($sp) /* 0055C 80A5775C 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 00560 80A57760 0C0294D3 */ jal func_800A534C +/* 00560 80A57760 0C0294D3 */ jal SkelAnime_ChangeAnimTransitionRepeat /* 00564 80A57764 3C06C0A0 */ lui $a2, 0xC0A0 ## $a2 = C0A00000 -/* 00568 80A57768 8FA70018 */ lw $a3, 0x0018($sp) +/* 00568 80A57768 8FA70018 */ lw $a3, 0x0018($sp) /* 0056C 80A5776C 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 /* 00570 80A57770 3C0E80A6 */ lui $t6, %hi(func_80A582B8) ## $t6 = 80A60000 /* 00574 80A57774 25CE82B8 */ addiu $t6, $t6, %lo(func_80A582B8) ## $t6 = 80A582B8 /* 00578 80A57778 ACEE0190 */ sw $t6, 0x0190($a3) ## 00000190 /* 0057C 80A5777C E4E40068 */ swc1 $f4, 0x0068($a3) ## 00000068 -/* 00580 80A57780 8FBF0014 */ lw $ra, 0x0014($sp) +/* 00580 80A57780 8FBF0014 */ lw $ra, 0x0014($sp) /* 00584 80A57784 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00588 80A57788 03E00008 */ jr $ra +/* 00588 80A57788 03E00008 */ jr $ra /* 0058C 80A5778C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Hintnuts/func_80A57790.s b/asm/non_matchings/overlays/actors/ovl_En_Hintnuts/func_80A57790.s index e3ab550bb8..a693c25c5d 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Hintnuts/func_80A57790.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Hintnuts/func_80A57790.s @@ -1,13 +1,13 @@ glabel func_80A57790 /* 00590 80A57790 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 00594 80A57794 AFB00030 */ sw $s0, 0x0030($sp) -/* 00598 80A57798 AFA5003C */ sw $a1, 0x003C($sp) +/* 00594 80A57794 AFB00030 */ sw $s0, 0x0030($sp) +/* 00598 80A57798 AFA5003C */ sw $a1, 0x003C($sp) /* 0059C 80A5779C 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 005A0 80A577A0 AFBF0034 */ sw $ra, 0x0034($sp) +/* 005A0 80A577A0 AFBF0034 */ sw $ra, 0x0034($sp) /* 005A4 80A577A4 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 005A8 80A577A8 24A53128 */ addiu $a1, $a1, 0x3128 ## $a1 = 06003128 /* 005AC 80A577AC 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 005B0 80A577B0 0C0294D3 */ jal func_800A534C +/* 005B0 80A577B0 0C0294D3 */ jal SkelAnime_ChangeAnimTransitionRepeat /* 005B4 80A577B4 3C06C0A0 */ lui $a2, 0xC0A0 ## $a2 = C0A00000 /* 005B8 80A577B8 92180226 */ lbu $t8, 0x0226($s0) ## 00000226 /* 005BC 80A577BC 8E080004 */ lw $t0, 0x0004($s0) ## 00000004 @@ -24,30 +24,30 @@ glabel func_80A57790 /* 005E8 80A577E8 24053880 */ addiu $a1, $zero, 0x3880 ## $a1 = 00003880 /* 005EC 80A577EC E6040068 */ swc1 $f4, 0x0068($s0) ## 00000068 /* 005F0 80A577F0 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 005F4 80A577F4 A60F0032 */ sh $t7, 0x0032($s0) ## 00000032 /* 005F8 80A577F8 C6060028 */ lwc1 $f6, 0x0028($s0) ## 00000028 /* 005FC 80A577FC 8E070024 */ lw $a3, 0x0024($s0) ## 00000024 -/* 00600 80A57800 8FA5003C */ lw $a1, 0x003C($sp) -/* 00604 80A57804 E7A60010 */ swc1 $f6, 0x0010($sp) +/* 00600 80A57800 8FA5003C */ lw $a1, 0x003C($sp) +/* 00604 80A57804 E7A60010 */ swc1 $f6, 0x0010($sp) /* 00608 80A57808 C608002C */ lwc1 $f8, 0x002C($s0) ## 0000002C /* 0060C 80A5780C 240A0003 */ addiu $t2, $zero, 0x0003 ## $t2 = 00000003 -/* 00610 80A57810 AFAA0024 */ sw $t2, 0x0024($sp) -/* 00614 80A57814 AFA00020 */ sw $zero, 0x0020($sp) -/* 00618 80A57818 AFA0001C */ sw $zero, 0x001C($sp) -/* 0061C 80A5781C AFA00018 */ sw $zero, 0x0018($sp) +/* 00610 80A57810 AFAA0024 */ sw $t2, 0x0024($sp) +/* 00614 80A57814 AFA00020 */ sw $zero, 0x0020($sp) +/* 00618 80A57818 AFA0001C */ sw $zero, 0x001C($sp) +/* 0061C 80A5781C AFA00018 */ sw $zero, 0x0018($sp) /* 00620 80A57820 24060015 */ addiu $a2, $zero, 0x0015 ## $a2 = 00000015 /* 00624 80A57824 24A41C24 */ addiu $a0, $a1, 0x1C24 ## $a0 = 00001C24 /* 00628 80A57828 0C00C7D4 */ jal Actor_Spawn ## ActorSpawn -/* 0062C 80A5782C E7A80014 */ swc1 $f8, 0x0014($sp) +/* 0062C 80A5782C E7A80014 */ swc1 $f8, 0x0014($sp) /* 00630 80A57830 3C0B80A6 */ lui $t3, %hi(func_80A58320) ## $t3 = 80A60000 /* 00634 80A57834 256B8320 */ addiu $t3, $t3, %lo(func_80A58320) ## $t3 = 80A58320 /* 00638 80A57838 AE0B0190 */ sw $t3, 0x0190($s0) ## 00000190 -/* 0063C 80A5783C 8FBF0034 */ lw $ra, 0x0034($sp) -/* 00640 80A57840 8FB00030 */ lw $s0, 0x0030($sp) +/* 0063C 80A5783C 8FBF0034 */ lw $ra, 0x0034($sp) +/* 00640 80A57840 8FB00030 */ lw $s0, 0x0030($sp) /* 00644 80A57844 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 -/* 00648 80A57848 03E00008 */ jr $ra +/* 00648 80A57848 03E00008 */ jr $ra /* 0064C 80A5784C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Hintnuts/func_80A57850.s b/asm/non_matchings/overlays/actors/ovl_En_Hintnuts/func_80A57850.s index 0ab612be35..7604535a80 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Hintnuts/func_80A57850.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Hintnuts/func_80A57850.s @@ -1,48 +1,48 @@ glabel func_80A57850 /* 00650 80A57850 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 00654 80A57854 AFB00020 */ sw $s0, 0x0020($sp) +/* 00654 80A57854 AFB00020 */ sw $s0, 0x0020($sp) /* 00658 80A57858 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 0065C 80A5785C AFBF0024 */ sw $ra, 0x0024($sp) +/* 0065C 80A5785C AFBF0024 */ sw $ra, 0x0024($sp) /* 00660 80A57860 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 00664 80A57864 24A529BC */ addiu $a1, $a1, 0x29BC ## $a1 = 060029BC -/* 00668 80A57868 0C0294BE */ jal func_800A52F8 +/* 00668 80A57868 0C0294BE */ jal SkelAnime_ChangeAnimDefaultRepeat /* 0066C 80A5786C 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C /* 00670 80A57870 8E0E0004 */ lw $t6, 0x0004($s0) ## 00000004 /* 00674 80A57874 2401FFFE */ addiu $at, $zero, 0xFFFE ## $at = FFFFFFFE /* 00678 80A57878 24180064 */ addiu $t8, $zero, 0x0064 ## $t8 = 00000064 -/* 0067C 80A5787C 01C17824 */ and $t7, $t6, $at +/* 0067C 80A5787C 01C17824 */ and $t7, $t6, $at /* 00680 80A57880 AE0F0004 */ sw $t7, 0x0004($s0) ## 00000004 -/* 00684 80A57884 AFB80010 */ sw $t8, 0x0010($sp) +/* 00684 80A57884 AFB80010 */ sw $t8, 0x0010($sp) /* 00688 80A57888 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 0068C 80A5788C 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 00690 80A57890 240600FF */ addiu $a2, $zero, 0x00FF ## $a2 = 000000FF -/* 00694 80A57894 0C00D09B */ jal func_8003426C +/* 00694 80A57894 0C00D09B */ jal func_8003426C /* 00698 80A57898 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 /* 0069C 80A5789C 24190001 */ addiu $t9, $zero, 0x0001 ## $t9 = 00000001 /* 006A0 80A578A0 A2190114 */ sb $t9, 0x0114($s0) ## 00000114 /* 006A4 80A578A4 A6000194 */ sh $zero, 0x0194($s0) ## 00000194 /* 006A8 80A578A8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 006AC 80A578AC 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 006B0 80A578B0 24053882 */ addiu $a1, $zero, 0x3882 ## $a1 = 00003882 /* 006B4 80A578B4 3C0880A6 */ lui $t0, %hi(D_80A58A34) ## $t0 = 80A60000 -/* 006B8 80A578B8 85088A34 */ lh $t0, %lo(D_80A58A34)($t0) +/* 006B8 80A578B8 85088A34 */ lh $t0, %lo(D_80A58A34)($t0) /* 006BC 80A578BC 2401FFFD */ addiu $at, $zero, 0xFFFD ## $at = FFFFFFFD -/* 006C0 80A578C0 15010006 */ bne $t0, $at, .L80A578DC +/* 006C0 80A578C0 15010006 */ bne $t0, $at, .L80A578DC /* 006C4 80A578C4 00000000 */ nop -/* 006C8 80A578C8 0C01E221 */ jal func_80078884 +/* 006C8 80A578C8 0C01E221 */ jal func_80078884 /* 006CC 80A578CC 24044806 */ addiu $a0, $zero, 0x4806 ## $a0 = 00004806 /* 006D0 80A578D0 2409FFFC */ addiu $t1, $zero, 0xFFFC ## $t1 = FFFFFFFC /* 006D4 80A578D4 3C0180A6 */ lui $at, %hi(D_80A58A34) ## $at = 80A60000 -/* 006D8 80A578D8 A4298A34 */ sh $t1, %lo(D_80A58A34)($at) +/* 006D8 80A578D8 A4298A34 */ sh $t1, %lo(D_80A58A34)($at) .L80A578DC: /* 006DC 80A578DC 3C0A80A6 */ lui $t2, %hi(func_80A584DC) ## $t2 = 80A60000 /* 006E0 80A578E0 254A84DC */ addiu $t2, $t2, %lo(func_80A584DC) ## $t2 = 80A584DC /* 006E4 80A578E4 AE0A0190 */ sw $t2, 0x0190($s0) ## 00000190 -/* 006E8 80A578E8 8FBF0024 */ lw $ra, 0x0024($sp) -/* 006EC 80A578EC 8FB00020 */ lw $s0, 0x0020($sp) +/* 006E8 80A578E8 8FBF0024 */ lw $ra, 0x0024($sp) +/* 006EC 80A578EC 8FB00020 */ lw $s0, 0x0020($sp) /* 006F0 80A578F0 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 006F4 80A578F4 03E00008 */ jr $ra +/* 006F4 80A578F4 03E00008 */ jr $ra /* 006F8 80A578F8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Holl/EnHoll_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Holl/EnHoll_Draw.s index 9ea1e334d0..e6e09c564a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Holl/EnHoll_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Holl/EnHoll_Draw.s @@ -10,7 +10,7 @@ glabel EnHoll_Draw /* 00CD0 80A598E0 27A40028 */ addiu $a0, $sp, 0x0028 ## $a0 = FFFFFFE0 /* 00CD4 80A598E4 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 /* 00CD8 80A598E8 24070325 */ addiu $a3, $zero, 0x0325 ## $a3 = 00000325 -/* 00CDC 80A598EC 0C031AB1 */ jal func_800C6AC4 +/* 00CDC 80A598EC 0C031AB1 */ jal Graph_OpenDisps /* 00CE0 80A598F0 AFA50038 */ sw $a1, 0x0038($sp) /* 00CE4 80A598F4 8FB90048 */ lw $t9, 0x0048($sp) /* 00CE8 80A598F8 240100FF */ addiu $at, $zero, 0x00FF ## $at = 000000FF @@ -25,7 +25,7 @@ glabel EnHoll_Draw /* 00D0C 80A5991C 24050025 */ addiu $a1, $zero, 0x0025 ## $a1 = 00000025 /* 00D10 80A59920 8D4702D0 */ lw $a3, 0x02D0($t2) ## 000002D0 .L80A59924: -/* 00D14 80A59924 0C024DDD */ jal func_80093774 +/* 00D14 80A59924 0C024DDD */ jal Gfx_CallSetupDL /* 00D18 80A59928 00E02025 */ or $a0, $a3, $zero ## $a0 = 00000000 /* 00D1C 80A5992C 8FAB0048 */ lw $t3, 0x0048($sp) /* 00D20 80A59930 00403825 */ or $a3, $v0, $zero ## $a3 = 00000000 @@ -85,7 +85,7 @@ glabel EnHoll_Draw .L80A59A00: /* 00DF0 80A59A00 8FAF004C */ lw $t7, 0x004C($sp) /* 00DF4 80A59A04 2407033F */ addiu $a3, $zero, 0x033F ## $a3 = 0000033F -/* 00DF8 80A59A08 0C031AD5 */ jal func_800C6B54 +/* 00DF8 80A59A08 0C031AD5 */ jal Graph_CloseDisps /* 00DFC 80A59A0C 8DE50000 */ lw $a1, 0x0000($t7) ## FA000000 .L80A59A10: /* 00E00 80A59A10 8FBF0014 */ lw $ra, 0x0014($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Honotrap/func_80A5ABFC.s b/asm/non_matchings/overlays/actors/ovl_En_Honotrap/func_80A5ABFC.s index bf449836ad..7d3823cab7 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Honotrap/func_80A5ABFC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Honotrap/func_80A5ABFC.s @@ -9,7 +9,7 @@ glabel func_80A5ABFC /* 00FE8 80A5AC18 24C6B0A8 */ addiu $a2, $a2, %lo(D_80A5B0A8) ## $a2 = 80A5B0A8 /* 00FEC 80A5AC1C 27A40030 */ addiu $a0, $sp, 0x0030 ## $a0 = FFFFFFE8 /* 00FF0 80A5AC20 240703D6 */ addiu $a3, $zero, 0x03D6 ## $a3 = 000003D6 -/* 00FF4 80A5AC24 0C031AB1 */ jal func_800C6AC4 +/* 00FF4 80A5AC24 0C031AB1 */ jal Graph_OpenDisps /* 00FF8 80A5AC28 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 /* 00FFC 80A5AC2C 8FAF004C */ lw $t7, 0x004C($sp) /* 01000 80A5AC30 0C024F46 */ jal func_80093D18 @@ -67,7 +67,7 @@ glabel func_80A5ABFC /* 010D0 80A5AD00 24C6B0D0 */ addiu $a2, $a2, %lo(D_80A5B0D0) ## $a2 = 80A5B0D0 /* 010D4 80A5AD04 27A40030 */ addiu $a0, $sp, 0x0030 ## $a0 = FFFFFFE8 /* 010D8 80A5AD08 240703DF */ addiu $a3, $zero, 0x03DF ## $a3 = 000003DF -/* 010DC 80A5AD0C 0C031AD5 */ jal func_800C6B54 +/* 010DC 80A5AD0C 0C031AD5 */ jal Graph_CloseDisps /* 010E0 80A5AD10 8D650000 */ lw $a1, 0x0000($t3) ## 00000000 /* 010E4 80A5AD14 8FBF001C */ lw $ra, 0x001C($sp) /* 010E8 80A5AD18 8FB00018 */ lw $s0, 0x0018($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Honotrap/func_80A5AD28.s b/asm/non_matchings/overlays/actors/ovl_En_Honotrap/func_80A5AD28.s index 14146a25ee..ee355a29dc 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Honotrap/func_80A5AD28.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Honotrap/func_80A5AD28.s @@ -11,7 +11,7 @@ glabel func_80A5AD28 /* 0111C 80A5AD4C 24C6B0E4 */ addiu $a2, $a2, %lo(D_80A5B0E4) ## $a2 = 80A5B0E4 /* 01120 80A5AD50 27A40064 */ addiu $a0, $sp, 0x0064 ## $a0 = FFFFFFE4 /* 01124 80A5AD54 240703E8 */ addiu $a3, $zero, 0x03E8 ## $a3 = 000003E8 -/* 01128 80A5AD58 0C031AB1 */ jal func_800C6AC4 +/* 01128 80A5AD58 0C031AB1 */ jal Graph_OpenDisps /* 0112C 80A5AD5C 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 /* 01130 80A5AD60 0C024F61 */ jal func_80093D84 /* 01134 80A5AD64 8E440000 */ lw $a0, 0x0000($s2) ## 00000000 @@ -44,7 +44,7 @@ glabel func_80A5AD28 /* 011A0 80A5ADD0 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 /* 011A4 80A5ADD4 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 /* 011A8 80A5ADD8 AFA20060 */ sw $v0, 0x0060($sp) -/* 011AC 80A5ADDC 0C0253D0 */ jal Draw_TwoTexScroll +/* 011AC 80A5ADDC 0C0253D0 */ jal Gfx_TwoTexScroll /* 011B0 80A5ADE0 AFAD0020 */ sw $t5, 0x0020($sp) /* 011B4 80A5ADE4 8FA30060 */ lw $v1, 0x0060($sp) /* 011B8 80A5ADE8 3C19FA00 */ lui $t9, 0xFA00 ## $t9 = FA000000 @@ -108,7 +108,7 @@ glabel func_80A5AD28 /* 012A0 80A5AED0 8E450000 */ lw $a1, 0x0000($s2) ## 00000000 /* 012A4 80A5AED4 24C6B10C */ addiu $a2, $a2, %lo(D_80A5B10C) ## $a2 = 80A5B10C /* 012A8 80A5AED8 27A40064 */ addiu $a0, $sp, 0x0064 ## $a0 = FFFFFFE4 -/* 012AC 80A5AEDC 0C031AD5 */ jal func_800C6B54 +/* 012AC 80A5AEDC 0C031AD5 */ jal Graph_CloseDisps /* 012B0 80A5AEE0 24070404 */ addiu $a3, $zero, 0x0404 ## $a3 = 00000404 /* 012B4 80A5AEE4 8FBF0044 */ lw $ra, 0x0044($sp) /* 012B8 80A5AEE8 8FB00038 */ lw $s0, 0x0038($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse/EnHorse_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Horse/EnHorse_Init.s index 5e1257ea18..1e31bb9e0a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse/EnHorse_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse/EnHorse_Init.s @@ -1,25 +1,25 @@ glabel EnHorse_Init /* 00DE0 80A5C0D0 27BDFFA8 */ addiu $sp, $sp, 0xFFA8 ## $sp = FFFFFFA8 -/* 00DE4 80A5C0D4 AFB10030 */ sw $s1, 0x0030($sp) +/* 00DE4 80A5C0D4 AFB10030 */ sw $s1, 0x0030($sp) /* 00DE8 80A5C0D8 3C0E8016 */ lui $t6, 0x8016 ## $t6 = 80160000 /* 00DEC 80A5C0DC 8DCEFA90 */ lw $t6, -0x0570($t6) ## 8015FA90 /* 00DF0 80A5C0E0 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 -/* 00DF4 80A5C0E4 AFBF0034 */ sw $ra, 0x0034($sp) -/* 00DF8 80A5C0E8 AFB0002C */ sw $s0, 0x002C($sp) +/* 00DF4 80A5C0E4 AFBF0034 */ sw $ra, 0x0034($sp) +/* 00DF8 80A5C0E8 AFB0002C */ sw $s0, 0x002C($sp) /* 00DFC 80A5C0EC 3C0580A6 */ lui $a1, %hi(D_80A66664) ## $a1 = 80A60000 /* 00E00 80A5C0F0 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 00E04 80A5C0F4 24A56664 */ addiu $a1, $a1, %lo(D_80A66664) ## $a1 = 80A66664 /* 00E08 80A5C0F8 0C01E037 */ jal Actor_ProcessInitChain - + /* 00E0C 80A5C0FC A5C00E60 */ sh $zero, 0x0E60($t6) ## 80160E60 -/* 00E10 80A5C100 0C297032 */ jal func_80A5C0C8 +/* 00E10 80A5C100 0C297032 */ jal func_80A5C0C8 /* 00E14 80A5C104 260403C8 */ addiu $a0, $s0, 0x03C8 ## $a0 = 000003C8 /* 00E18 80A5C108 3C0F8016 */ lui $t7, 0x8016 ## $t7 = 80160000 /* 00E1C 80A5C10C 8DEFFA90 */ lw $t7, -0x0570($t7) ## 8015FA90 /* 00E20 80A5C110 26180024 */ addiu $t8, $s0, 0x0024 ## $t8 = 00000024 /* 00E24 80A5C114 3C01428C */ lui $at, 0x428C ## $at = 428C0000 /* 00E28 80A5C118 A5E005BE */ sh $zero, 0x05BE($t7) ## 801605BE -/* 00E2C 80A5C11C AFB8003C */ sw $t8, 0x003C($sp) +/* 00E2C 80A5C11C AFB8003C */ sw $t8, 0x003C($sp) /* 00E30 80A5C120 8F090000 */ lw $t1, 0x0000($t8) ## 00000024 /* 00E34 80A5C124 44813000 */ mtc1 $at, $f6 ## $f6 = 70.00 /* 00E38 80A5C128 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 @@ -29,57 +29,57 @@ glabel EnHorse_Init /* 00E48 80A5C138 C604025C */ lwc1 $f4, 0x025C($s0) ## 0000025C /* 00E4C 80A5C13C 8F090008 */ lw $t1, 0x0008($t8) ## 0000002C /* 00E50 80A5C140 AE000150 */ sw $zero, 0x0150($s0) ## 00000150 -/* 00E54 80A5C144 46062200 */ add.s $f8, $f4, $f6 +/* 00E54 80A5C144 46062200 */ add.s $f8, $f4, $f6 /* 00E58 80A5C148 AE000154 */ sw $zero, 0x0154($s0) ## 00000154 /* 00E5C 80A5C14C AE090260 */ sw $t1, 0x0260($s0) ## 00000260 /* 00E60 80A5C150 E608025C */ swc1 $f8, 0x025C($s0) ## 0000025C /* 00E64 80A5C154 8C42FA90 */ lw $v0, -0x0570($v0) ## 8015FA90 /* 00E68 80A5C158 844A055C */ lh $t2, 0x055C($v0) ## 8016055C -/* 00E6C 80A5C15C 15400002 */ bne $t2, $zero, .L80A5C168 +/* 00E6C 80A5C15C 15400002 */ bne $t2, $zero, .L80A5C168 /* 00E70 80A5C160 240B0046 */ addiu $t3, $zero, 0x0046 ## $t3 = 00000046 /* 00E74 80A5C164 A44B055C */ sh $t3, 0x055C($v0) ## 8016055C .L80A5C168: /* 00E78 80A5C168 8602001C */ lh $v0, 0x001C($s0) ## 0000001C /* 00E7C 80A5C16C 304C8000 */ andi $t4, $v0, 0x8000 ## $t4 = 00000000 -/* 00E80 80A5C170 11800021 */ beq $t4, $zero, .L80A5C1F8 +/* 00E80 80A5C170 11800021 */ beq $t4, $zero, .L80A5C1F8 /* 00E84 80A5C174 3C01FFFF */ lui $at, 0xFFFF ## $at = FFFF0000 /* 00E88 80A5C178 34217FFF */ ori $at, $at, 0x7FFF ## $at = FFFF7FFF -/* 00E8C 80A5C17C 00416824 */ and $t5, $v0, $at +/* 00E8C 80A5C17C 00416824 */ and $t5, $v0, $at /* 00E90 80A5C180 3C010001 */ lui $at, 0x0001 ## $at = 00010000 /* 00E94 80A5C184 240E0001 */ addiu $t6, $zero, 0x0001 ## $t6 = 00000001 /* 00E98 80A5C188 342117A4 */ ori $at, $at, 0x17A4 ## $at = 000117A4 /* 00E9C 80A5C18C A60D001C */ sh $t5, 0x001C($s0) ## 0000001C /* 00EA0 80A5C190 AE0E0158 */ sw $t6, 0x0158($s0) ## 00000158 -/* 00EA4 80A5C194 02212021 */ addu $a0, $s1, $at -/* 00EA8 80A5C198 AFA40038 */ sw $a0, 0x0038($sp) +/* 00EA4 80A5C194 02212021 */ addu $a0, $s1, $at +/* 00EA8 80A5C198 AFA40038 */ sw $a0, 0x0038($sp) /* 00EAC 80A5C19C 0C02604B */ jal Object_GetIndex ## ObjectIndex /* 00EB0 80A5C1A0 240500D2 */ addiu $a1, $zero, 0x00D2 ## $a1 = 000000D2 -/* 00EB4 80A5C1A4 00027E00 */ sll $t7, $v0, 24 -/* 00EB8 80A5C1A8 000FC603 */ sra $t8, $t7, 24 -/* 00EBC 80A5C1AC 07010005 */ bgez $t8, .L80A5C1C4 +/* 00EB4 80A5C1A4 00027E00 */ sll $t7, $v0, 24 +/* 00EB8 80A5C1A8 000FC603 */ sra $t8, $t7, 24 +/* 00EBC 80A5C1AC 07010005 */ bgez $t8, .L80A5C1C4 /* 00EC0 80A5C1B0 A202015C */ sb $v0, 0x015C($s0) ## 0000015C /* 00EC4 80A5C1B4 0C00B55C */ jal Actor_Kill - + /* 00EC8 80A5C1B8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00ECC 80A5C1BC 10000192 */ beq $zero, $zero, .L80A5C808 -/* 00ED0 80A5C1C0 8FBF0034 */ lw $ra, 0x0034($sp) +/* 00ECC 80A5C1BC 10000192 */ beq $zero, $zero, .L80A5C808 +/* 00ED0 80A5C1C0 8FBF0034 */ lw $ra, 0x0034($sp) .L80A5C1C4: -/* 00ED4 80A5C1C4 8FA40038 */ lw $a0, 0x0038($sp) +/* 00ED4 80A5C1C4 8FA40038 */ lw $a0, 0x0038($sp) .L80A5C1C8: /* 00ED8 80A5C1C8 0C026062 */ jal Object_IsLoaded - + /* 00EDC 80A5C1CC 8205015C */ lb $a1, 0x015C($s0) ## 0000015C -/* 00EE0 80A5C1D0 5040FFFD */ beql $v0, $zero, .L80A5C1C8 -/* 00EE4 80A5C1D4 8FA40038 */ lw $a0, 0x0038($sp) +/* 00EE0 80A5C1D0 5040FFFD */ beql $v0, $zero, .L80A5C1C8 +/* 00EE4 80A5C1D4 8FA40038 */ lw $a0, 0x0038($sp) /* 00EE8 80A5C1D8 8219015C */ lb $t9, 0x015C($s0) ## 0000015C /* 00EEC 80A5C1DC 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 00EF0 80A5C1E0 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 00EF4 80A5C1E4 0C00B591 */ jal Actor_SetObjectDependency - + /* 00EF8 80A5C1E8 A219001E */ sb $t9, 0x001E($s0) ## 0000001E /* 00EFC 80A5C1EC 2408000C */ addiu $t0, $zero, 0x000C ## $t0 = 0000000C -/* 00F00 80A5C1F0 10000004 */ beq $zero, $zero, .L80A5C204 +/* 00F00 80A5C1F0 10000004 */ beq $zero, $zero, .L80A5C204 /* 00F04 80A5C1F4 AE080208 */ sw $t0, 0x0208($s0) ## 00000208 .L80A5C1F8: /* 00F08 80A5C1F8 2409000E */ addiu $t1, $zero, 0x000E ## $t1 = 0000000E @@ -88,79 +88,79 @@ glabel EnHorse_Init .L80A5C204: /* 00F14 80A5C204 860A001C */ lh $t2, 0x001C($s0) ## 0000001C /* 00F18 80A5C208 24017FFF */ addiu $at, $zero, 0x7FFF ## $at = 00007FFF -/* 00F1C 80A5C20C 15410002 */ bne $t2, $at, .L80A5C218 +/* 00F1C 80A5C20C 15410002 */ bne $t2, $at, .L80A5C218 /* 00F20 80A5C210 240B0001 */ addiu $t3, $zero, 0x0001 ## $t3 = 00000001 /* 00F24 80A5C214 A60B001C */ sh $t3, 0x001C($s0) ## 0000001C .L80A5C218: /* 00F28 80A5C218 862200A4 */ lh $v0, 0x00A4($s1) ## 000000A4 /* 00F2C 80A5C21C 2401004C */ addiu $at, $zero, 0x004C ## $at = 0000004C -/* 00F30 80A5C220 14410003 */ bne $v0, $at, .L80A5C230 +/* 00F30 80A5C220 14410003 */ bne $v0, $at, .L80A5C230 /* 00F34 80A5C224 3C0C0001 */ lui $t4, 0x0001 ## $t4 = 00010000 -/* 00F38 80A5C228 1000003B */ beq $zero, $zero, .L80A5C318 +/* 00F38 80A5C228 1000003B */ beq $zero, $zero, .L80A5C318 /* 00F3C 80A5C22C AE0C01F0 */ sw $t4, 0x01F0($s0) ## 000001F0 .L80A5C230: /* 00F40 80A5C230 2401005D */ addiu $at, $zero, 0x005D ## $at = 0000005D -/* 00F44 80A5C234 54410009 */ bnel $v0, $at, .L80A5C25C +/* 00F44 80A5C234 54410009 */ bnel $v0, $at, .L80A5C25C /* 00F48 80A5C238 8602001C */ lh $v0, 0x001C($s0) ## 0000001C /* 00F4C 80A5C23C 8E0D0158 */ lw $t5, 0x0158($s0) ## 00000158 /* 00F50 80A5C240 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 /* 00F54 80A5C244 3C0E0005 */ lui $t6, 0x0005 ## $t6 = 00050000 -/* 00F58 80A5C248 55A10004 */ bnel $t5, $at, .L80A5C25C +/* 00F58 80A5C248 55A10004 */ bnel $t5, $at, .L80A5C25C /* 00F5C 80A5C24C 8602001C */ lh $v0, 0x001C($s0) ## 0000001C -/* 00F60 80A5C250 10000031 */ beq $zero, $zero, .L80A5C318 +/* 00F60 80A5C250 10000031 */ beq $zero, $zero, .L80A5C318 /* 00F64 80A5C254 AE0E01F0 */ sw $t6, 0x01F0($s0) ## 000001F0 /* 00F68 80A5C258 8602001C */ lh $v0, 0x001C($s0) ## 0000001C .L80A5C25C: /* 00F6C 80A5C25C 24010003 */ addiu $at, $zero, 0x0003 ## $at = 00000003 /* 00F70 80A5C260 3C0F000B */ lui $t7, 0x000B ## $t7 = 000B0000 -/* 00F74 80A5C264 54410004 */ bnel $v0, $at, .L80A5C278 +/* 00F74 80A5C264 54410004 */ bnel $v0, $at, .L80A5C278 /* 00F78 80A5C268 24010006 */ addiu $at, $zero, 0x0006 ## $at = 00000006 -/* 00F7C 80A5C26C 1000002A */ beq $zero, $zero, .L80A5C318 +/* 00F7C 80A5C26C 1000002A */ beq $zero, $zero, .L80A5C318 /* 00F80 80A5C270 AE0F01F0 */ sw $t7, 0x01F0($s0) ## 000001F0 /* 00F84 80A5C274 24010006 */ addiu $at, $zero, 0x0006 ## $at = 00000006 .L80A5C278: -/* 00F88 80A5C278 14410021 */ bne $v0, $at, .L80A5C300 +/* 00F88 80A5C278 14410021 */ bne $v0, $at, .L80A5C300 /* 00F8C 80A5C27C 3C18000A */ lui $t8, 0x000A ## $t8 = 000A0000 /* 00F90 80A5C280 AE1801F0 */ sw $t8, 0x01F0($s0) ## 000001F0 /* 00F94 80A5C284 0C00D6D3 */ jal Flags_GetEventChkInf - + /* 00F98 80A5C288 24040018 */ addiu $a0, $zero, 0x0018 ## $a0 = 00000018 -/* 00F9C 80A5C28C 14400006 */ bne $v0, $zero, .L80A5C2A8 +/* 00F9C 80A5C28C 14400006 */ bne $v0, $zero, .L80A5C2A8 /* 00FA0 80A5C290 3C198016 */ lui $t9, 0x8016 ## $t9 = 80160000 /* 00FA4 80A5C294 8F39FA90 */ lw $t9, -0x0570($t9) ## 8015FA90 /* 00FA8 80A5C298 3C0D8016 */ lui $t5, 0x8016 ## $t5 = 80160000 /* 00FAC 80A5C29C 87280556 */ lh $t0, 0x0556($t9) ## 80160556 -/* 00FB0 80A5C2A0 1100000A */ beq $t0, $zero, .L80A5C2CC +/* 00FB0 80A5C2A0 1100000A */ beq $t0, $zero, .L80A5C2CC /* 00FB4 80A5C2A4 00000000 */ nop .L80A5C2A8: /* 00FB8 80A5C2A8 8E0901F0 */ lw $t1, 0x01F0($s0) ## 000001F0 /* 00FBC 80A5C2AC 3C01FFFD */ lui $at, 0xFFFD ## $at = FFFD0000 /* 00FC0 80A5C2B0 3421FFFF */ ori $at, $at, 0xFFFF ## $at = FFFDFFFF -/* 00FC4 80A5C2B4 01215024 */ and $t2, $t1, $at +/* 00FC4 80A5C2B4 01215024 */ and $t2, $t1, $at /* 00FC8 80A5C2B8 3C010400 */ lui $at, 0x0400 ## $at = 04000000 /* 00FCC 80A5C2BC AE0A01F0 */ sw $t2, 0x01F0($s0) ## 000001F0 /* 00FD0 80A5C2C0 01416025 */ or $t4, $t2, $at ## $t4 = 04000000 -/* 00FD4 80A5C2C4 10000014 */ beq $zero, $zero, .L80A5C318 +/* 00FD4 80A5C2C4 10000014 */ beq $zero, $zero, .L80A5C318 /* 00FD8 80A5C2C8 AE0C01F0 */ sw $t4, 0x01F0($s0) ## 000001F0 .L80A5C2CC: /* 00FDC 80A5C2CC 95ADFA5A */ lhu $t5, -0x05A6($t5) ## 8015FA5A /* 00FE0 80A5C2D0 31AE0040 */ andi $t6, $t5, 0x0040 ## $t6 = 00000000 -/* 00FE4 80A5C2D4 51C00011 */ beql $t6, $zero, .L80A5C31C +/* 00FE4 80A5C2D4 51C00011 */ beql $t6, $zero, .L80A5C31C /* 00FE8 80A5C2D8 862900A4 */ lh $t1, 0x00A4($s1) ## 000000A4 /* 00FEC 80A5C2DC 8E0F0158 */ lw $t7, 0x0158($s0) ## 00000158 /* 00FF0 80A5C2E0 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 00FF4 80A5C2E4 55E1000D */ bnel $t7, $at, .L80A5C31C +/* 00FF4 80A5C2E4 55E1000D */ bnel $t7, $at, .L80A5C31C /* 00FF8 80A5C2E8 862900A4 */ lh $t1, 0x00A4($s1) ## 000000A4 /* 00FFC 80A5C2EC 8E1801F0 */ lw $t8, 0x01F0($s0) ## 000001F0 /* 01000 80A5C2F0 3C010030 */ lui $at, 0x0030 ## $at = 00300000 /* 01004 80A5C2F4 0301C825 */ or $t9, $t8, $at ## $t9 = 00300000 -/* 01008 80A5C2F8 10000007 */ beq $zero, $zero, .L80A5C318 +/* 01008 80A5C2F8 10000007 */ beq $zero, $zero, .L80A5C318 /* 0100C 80A5C2FC AE1901F0 */ sw $t9, 0x01F0($s0) ## 000001F0 .L80A5C300: /* 01010 80A5C300 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 01014 80A5C304 14410003 */ bne $v0, $at, .L80A5C314 +/* 01014 80A5C304 14410003 */ bne $v0, $at, .L80A5C314 /* 01018 80A5C308 24080080 */ addiu $t0, $zero, 0x0080 ## $t0 = 00000080 -/* 0101C 80A5C30C 10000002 */ beq $zero, $zero, .L80A5C318 +/* 0101C 80A5C30C 10000002 */ beq $zero, $zero, .L80A5C318 /* 01020 80A5C310 AE0801F0 */ sw $t0, 0x01F0($s0) ## 000001F0 .L80A5C314: /* 01024 80A5C314 AE0001F0 */ sw $zero, 0x01F0($s0) ## 000001F0 @@ -168,21 +168,21 @@ glabel EnHorse_Init /* 01028 80A5C318 862900A4 */ lh $t1, 0x00A4($s1) ## 000000A4 .L80A5C31C: /* 0102C 80A5C31C 24010063 */ addiu $at, $zero, 0x0063 ## $at = 00000063 -/* 01030 80A5C320 15210012 */ bne $t1, $at, .L80A5C36C +/* 01030 80A5C320 15210012 */ bne $t1, $at, .L80A5C36C /* 01034 80A5C324 3C0A8016 */ lui $t2, 0x8016 ## $t2 = 80160000 /* 01038 80A5C328 954AFA5A */ lhu $t2, -0x05A6($t2) ## 8015FA5A /* 0103C 80A5C32C 24010006 */ addiu $at, $zero, 0x0006 ## $at = 00000006 /* 01040 80A5C330 314B000F */ andi $t3, $t2, 0x000F ## $t3 = 00000000 -/* 01044 80A5C334 5561000E */ bnel $t3, $at, .L80A5C370 +/* 01044 80A5C334 5561000E */ bnel $t3, $at, .L80A5C370 /* 01048 80A5C338 3C053C23 */ lui $a1, 0x3C23 ## $a1 = 3C230000 /* 0104C 80A5C33C 0C00D6D3 */ jal Flags_GetEventChkInf - + /* 01050 80A5C340 24040018 */ addiu $a0, $zero, 0x0018 ## $a0 = 00000018 -/* 01054 80A5C344 14400009 */ bne $v0, $zero, .L80A5C36C +/* 01054 80A5C344 14400009 */ bne $v0, $zero, .L80A5C36C /* 01058 80A5C348 3C0C8016 */ lui $t4, 0x8016 ## $t4 = 80160000 /* 0105C 80A5C34C 8D8CFA90 */ lw $t4, -0x0570($t4) ## 8015FA90 /* 01060 80A5C350 858D0556 */ lh $t5, 0x0556($t4) ## 80160556 -/* 01064 80A5C354 55A00006 */ bnel $t5, $zero, .L80A5C370 +/* 01064 80A5C354 55A00006 */ bnel $t5, $zero, .L80A5C370 /* 01068 80A5C358 3C053C23 */ lui $a1, 0x3C23 ## $a1 = 3C230000 /* 0106C 80A5C35C 8E0E01F0 */ lw $t6, 0x01F0($s0) ## 000001F0 /* 01070 80A5C360 3C010200 */ lui $at, 0x0200 ## $at = 02000000 @@ -193,7 +193,7 @@ glabel EnHorse_Init .L80A5C370: /* 01080 80A5C370 34A5D70A */ ori $a1, $a1, 0xD70A ## $a1 = 3C23D70A /* 01084 80A5C374 0C00B58B */ jal Actor_SetScale - + /* 01088 80A5C378 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 0108C 80A5C37C 3C01C060 */ lui $at, 0xC060 ## $at = C0600000 /* 01090 80A5C380 44815000 */ mtc1 $at, $f10 ## $f10 = -3.50 @@ -203,57 +203,57 @@ glabel EnHorse_Init /* 010A0 80A5C390 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 /* 010A4 80A5C394 3C0741A0 */ lui $a3, 0x41A0 ## $a3 = 41A00000 /* 010A8 80A5C398 0C00AC78 */ jal ActorShape_Init - + /* 010AC 80A5C39C E60A006C */ swc1 $f10, 0x006C($s0) ## 0000006C /* 010B0 80A5C3A0 44808000 */ mtc1 $zero, $f16 ## $f16 = 0.00 /* 010B4 80A5C3A4 24180002 */ addiu $t8, $zero, 0x0002 ## $t8 = 00000002 /* 010B8 80A5C3A8 AE18014C */ sw $t8, 0x014C($s0) ## 0000014C /* 010BC 80A5C3AC 26050278 */ addiu $a1, $s0, 0x0278 ## $a1 = 00000278 /* 010C0 80A5C3B0 E6100068 */ swc1 $f16, 0x0068($s0) ## 00000068 -/* 010C4 80A5C3B4 AFA50040 */ sw $a1, 0x0040($sp) +/* 010C4 80A5C3B4 AFA50040 */ sw $a1, 0x0040($sp) /* 010C8 80A5C3B8 0C0170D9 */ jal ActorCollider_AllocCylinder - + /* 010CC 80A5C3BC 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 010D0 80A5C3C0 3C0780A6 */ lui $a3, %hi(D_80A65EAC) ## $a3 = 80A60000 -/* 010D4 80A5C3C4 8FA50040 */ lw $a1, 0x0040($sp) +/* 010D4 80A5C3C4 8FA50040 */ lw $a1, 0x0040($sp) /* 010D8 80A5C3C8 24E75EAC */ addiu $a3, $a3, %lo(D_80A65EAC) ## $a3 = 80A65EAC /* 010DC 80A5C3CC 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 010E0 80A5C3D0 0C01712B */ jal ActorCollider_InitCylinder - + /* 010E4 80A5C3D4 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 010E8 80A5C3D8 260502C4 */ addiu $a1, $s0, 0x02C4 ## $a1 = 000002C4 -/* 010EC 80A5C3DC AFA50040 */ sw $a1, 0x0040($sp) +/* 010EC 80A5C3DC AFA50040 */ sw $a1, 0x0040($sp) /* 010F0 80A5C3E0 0C0170D9 */ jal ActorCollider_AllocCylinder - + /* 010F4 80A5C3E4 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 010F8 80A5C3E8 3C0780A6 */ lui $a3, %hi(D_80A65ED8) ## $a3 = 80A60000 -/* 010FC 80A5C3EC 8FA50040 */ lw $a1, 0x0040($sp) +/* 010FC 80A5C3EC 8FA50040 */ lw $a1, 0x0040($sp) /* 01100 80A5C3F0 24E75ED8 */ addiu $a3, $a3, %lo(D_80A65ED8) ## $a3 = 80A65ED8 /* 01104 80A5C3F4 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 01108 80A5C3F8 0C01712B */ jal ActorCollider_InitCylinder - + /* 0110C 80A5C3FC 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 01110 80A5C400 26050310 */ addiu $a1, $s0, 0x0310 ## $a1 = 00000310 -/* 01114 80A5C404 AFA50040 */ sw $a1, 0x0040($sp) -/* 01118 80A5C408 0C016EFE */ jal func_8005BBF8 +/* 01114 80A5C404 AFA50040 */ sw $a1, 0x0040($sp) +/* 01118 80A5C408 0C016EFE */ jal func_8005BBF8 /* 0111C 80A5C40C 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 01120 80A5C410 3C0780A6 */ lui $a3, %hi(D_80A65F28) ## $a3 = 80A60000 /* 01124 80A5C414 26190330 */ addiu $t9, $s0, 0x0330 ## $t9 = 00000330 -/* 01128 80A5C418 8FA50040 */ lw $a1, 0x0040($sp) -/* 0112C 80A5C41C AFB90010 */ sw $t9, 0x0010($sp) +/* 01128 80A5C418 8FA50040 */ lw $a1, 0x0040($sp) +/* 0112C 80A5C41C AFB90010 */ sw $t9, 0x0010($sp) /* 01130 80A5C420 24E75F28 */ addiu $a3, $a3, %lo(D_80A65F28) ## $a3 = 80A65F28 /* 01134 80A5C424 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 01138 80A5C428 0C017014 */ jal func_8005C050 +/* 01138 80A5C428 0C017014 */ jal func_8005C050 /* 0113C 80A5C42C 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 01140 80A5C430 0C016C80 */ jal CollisionBtlTbl_Get - + /* 01144 80A5C434 2404000B */ addiu $a0, $zero, 0x000B ## $a0 = 0000000B /* 01148 80A5C438 3C0680A6 */ lui $a2, %hi(D_80A65F38) ## $a2 = 80A60000 /* 0114C 80A5C43C 24C65F38 */ addiu $a2, $a2, %lo(D_80A65F38) ## $a2 = 80A65F38 /* 01150 80A5C440 26040098 */ addiu $a0, $s0, 0x0098 ## $a0 = 00000098 -/* 01154 80A5C444 0C0187B5 */ jal func_80061ED4 +/* 01154 80A5C444 0C0187B5 */ jal func_80061ED4 /* 01158 80A5C448 00402825 */ or $a1, $v0, $zero ## $a1 = 00000000 -/* 0115C 80A5C44C 8FA8003C */ lw $t0, 0x003C($sp) +/* 0115C 80A5C44C 8FA8003C */ lw $t0, 0x003C($sp) /* 01160 80A5C450 3C01428C */ lui $at, 0x428C ## $at = 428C0000 /* 01164 80A5C454 44812000 */ mtc1 $at, $f4 ## $f4 = 70.00 /* 01168 80A5C458 8D0A0000 */ lw $t2, 0x0000($t0) ## 00000000 @@ -265,99 +265,99 @@ glabel EnHorse_Init /* 01180 80A5C470 C612003C */ lwc1 $f18, 0x003C($s0) ## 0000003C /* 01184 80A5C474 8D0A0008 */ lw $t2, 0x0008($t0) ## 00000008 /* 01188 80A5C478 AE00020C */ sw $zero, 0x020C($s0) ## 0000020C -/* 0118C 80A5C47C 46049180 */ add.s $f6, $f18, $f4 +/* 0118C 80A5C47C 46049180 */ add.s $f6, $f18, $f4 /* 01190 80A5C480 AE0A0040 */ sw $t2, 0x0040($s0) ## 00000040 /* 01194 80A5C484 E606003C */ swc1 $f6, 0x003C($s0) ## 0000003C /* 01198 80A5C488 862200A4 */ lh $v0, 0x00A4($s1) ## 000000A4 -/* 0119C 80A5C48C 54410035 */ bnel $v0, $at, .L80A5C564 +/* 0119C 80A5C48C 54410035 */ bnel $v0, $at, .L80A5C564 /* 011A0 80A5C490 24010036 */ addiu $at, $zero, 0x0036 ## $at = 00000036 /* 011A4 80A5C494 8D6BF9C0 */ lw $t3, -0x0640($t3) ## 8015F9C0 -/* 011A8 80A5C498 29610004 */ slti $at, $t3, 0x0004 -/* 011AC 80A5C49C 50200031 */ beql $at, $zero, .L80A5C564 +/* 011A8 80A5C498 29610004 */ slti $at, $t3, 0x0004 +/* 011AC 80A5C49C 50200031 */ beql $at, $zero, .L80A5C564 /* 011B0 80A5C4A0 24010036 */ addiu $at, $zero, 0x0036 ## $at = 00000036 /* 011B4 80A5C4A4 8E0C0158 */ lw $t4, 0x0158($s0) ## 00000158 /* 011B8 80A5C4A8 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 011BC 80A5C4AC 1581001C */ bne $t4, $at, .L80A5C520 +/* 011BC 80A5C4AC 1581001C */ bne $t4, $at, .L80A5C520 /* 011C0 80A5C4B0 00000000 */ nop /* 011C4 80A5C4B4 860D0034 */ lh $t5, 0x0034($s0) ## 00000034 /* 011C8 80A5C4B8 3C0E8016 */ lui $t6, 0x8016 ## $t6 = 80160000 -/* 011CC 80A5C4BC 11A00004 */ beq $t5, $zero, .L80A5C4D0 +/* 011CC 80A5C4BC 11A00004 */ beq $t5, $zero, .L80A5C4D0 /* 011D0 80A5C4C0 00000000 */ nop /* 011D4 80A5C4C4 8DCEE670 */ lw $t6, -0x1990($t6) ## 8015E670 -/* 011D8 80A5C4C8 11C00005 */ beq $t6, $zero, .L80A5C4E0 +/* 011D8 80A5C4C8 11C00005 */ beq $t6, $zero, .L80A5C4E0 /* 011DC 80A5C4CC 00000000 */ nop .L80A5C4D0: /* 011E0 80A5C4D0 0C00B55C */ jal Actor_Kill - + /* 011E4 80A5C4D4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 011E8 80A5C4D8 100000CB */ beq $zero, $zero, .L80A5C808 -/* 011EC 80A5C4DC 8FBF0034 */ lw $ra, 0x0034($sp) +/* 011E8 80A5C4D8 100000CB */ beq $zero, $zero, .L80A5C808 +/* 011EC 80A5C4DC 8FBF0034 */ lw $ra, 0x0034($sp) .L80A5C4E0: /* 011F0 80A5C4E0 0C00D6D3 */ jal Flags_GetEventChkInf - + /* 011F4 80A5C4E4 24040018 */ addiu $a0, $zero, 0x0018 ## $a0 = 00000018 -/* 011F8 80A5C4E8 50400006 */ beql $v0, $zero, .L80A5C504 +/* 011F8 80A5C4E8 50400006 */ beql $v0, $zero, .L80A5C504 /* 011FC 80A5C4EC 860F0034 */ lh $t7, 0x0034($s0) ## 00000034 /* 01200 80A5C4F0 0C00B55C */ jal Actor_Kill - + /* 01204 80A5C4F4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01208 80A5C4F8 100000C3 */ beq $zero, $zero, .L80A5C808 -/* 0120C 80A5C4FC 8FBF0034 */ lw $ra, 0x0034($sp) +/* 01208 80A5C4F8 100000C3 */ beq $zero, $zero, .L80A5C808 +/* 0120C 80A5C4FC 8FBF0034 */ lw $ra, 0x0034($sp) /* 01210 80A5C500 860F0034 */ lh $t7, 0x0034($s0) ## 00000034 .L80A5C504: /* 01214 80A5C504 24010005 */ addiu $at, $zero, 0x0005 ## $at = 00000005 -/* 01218 80A5C508 51E10030 */ beql $t7, $at, .L80A5C5CC +/* 01218 80A5C508 51E10030 */ beql $t7, $at, .L80A5C5CC /* 0121C 80A5C50C 8E020158 */ lw $v0, 0x0158($s0) ## 00000158 /* 01220 80A5C510 0C00B55C */ jal Actor_Kill - + /* 01224 80A5C514 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01228 80A5C518 100000BB */ beq $zero, $zero, .L80A5C808 -/* 0122C 80A5C51C 8FBF0034 */ lw $ra, 0x0034($sp) +/* 01228 80A5C518 100000BB */ beq $zero, $zero, .L80A5C808 +/* 0122C 80A5C51C 8FBF0034 */ lw $ra, 0x0034($sp) .L80A5C520: /* 01230 80A5C520 0C00D6D3 */ jal Flags_GetEventChkInf - + /* 01234 80A5C524 24040018 */ addiu $a0, $zero, 0x0018 ## $a0 = 00000018 -/* 01238 80A5C528 14400027 */ bne $v0, $zero, .L80A5C5C8 +/* 01238 80A5C528 14400027 */ bne $v0, $zero, .L80A5C5C8 /* 0123C 80A5C52C 3C188016 */ lui $t8, 0x8016 ## $t8 = 80160000 /* 01240 80A5C530 8F18FA90 */ lw $t8, -0x0570($t8) ## 8015FA90 /* 01244 80A5C534 3C088016 */ lui $t0, 0x8016 ## $t0 = 80160000 /* 01248 80A5C538 87190556 */ lh $t9, 0x0556($t8) ## 80160556 -/* 0124C 80A5C53C 57200023 */ bnel $t9, $zero, .L80A5C5CC +/* 0124C 80A5C53C 57200023 */ bnel $t9, $zero, .L80A5C5CC /* 01250 80A5C540 8E020158 */ lw $v0, 0x0158($s0) ## 00000158 /* 01254 80A5C544 8D08E670 */ lw $t0, -0x1990($t0) ## 8015E670 -/* 01258 80A5C548 51000020 */ beql $t0, $zero, .L80A5C5CC +/* 01258 80A5C548 51000020 */ beql $t0, $zero, .L80A5C5CC /* 0125C 80A5C54C 8E020158 */ lw $v0, 0x0158($s0) ## 00000158 /* 01260 80A5C550 0C00B55C */ jal Actor_Kill - + /* 01264 80A5C554 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01268 80A5C558 100000AB */ beq $zero, $zero, .L80A5C808 -/* 0126C 80A5C55C 8FBF0034 */ lw $ra, 0x0034($sp) +/* 01268 80A5C558 100000AB */ beq $zero, $zero, .L80A5C808 +/* 0126C 80A5C55C 8FBF0034 */ lw $ra, 0x0034($sp) /* 01270 80A5C560 24010036 */ addiu $at, $zero, 0x0036 ## $at = 00000036 .L80A5C564: -/* 01274 80A5C564 14410018 */ bne $v0, $at, .L80A5C5C8 +/* 01274 80A5C564 14410018 */ bne $v0, $at, .L80A5C5C8 /* 01278 80A5C568 3C098016 */ lui $t1, 0x8016 ## $t1 = 80160000 /* 0127C 80A5C56C 8D29E670 */ lw $t1, -0x1990($t1) ## 8015E670 -/* 01280 80A5C570 1120000D */ beq $t1, $zero, .L80A5C5A8 +/* 01280 80A5C570 1120000D */ beq $t1, $zero, .L80A5C5A8 /* 01284 80A5C574 00000000 */ nop /* 01288 80A5C578 0C00D6D3 */ jal Flags_GetEventChkInf - + /* 0128C 80A5C57C 24040018 */ addiu $a0, $zero, 0x0018 ## $a0 = 00000018 -/* 01290 80A5C580 14400009 */ bne $v0, $zero, .L80A5C5A8 +/* 01290 80A5C580 14400009 */ bne $v0, $zero, .L80A5C5A8 /* 01294 80A5C584 3C0A8016 */ lui $t2, 0x8016 ## $t2 = 80160000 /* 01298 80A5C588 8D4AFA90 */ lw $t2, -0x0570($t2) ## 8015FA90 /* 0129C 80A5C58C 3C0C8016 */ lui $t4, 0x8016 ## $t4 = 80160000 /* 012A0 80A5C590 854B0556 */ lh $t3, 0x0556($t2) ## 80160556 -/* 012A4 80A5C594 15600004 */ bne $t3, $zero, .L80A5C5A8 +/* 012A4 80A5C594 15600004 */ bne $t3, $zero, .L80A5C5A8 /* 012A8 80A5C598 00000000 */ nop /* 012AC 80A5C59C 8D8CE664 */ lw $t4, -0x199C($t4) ## 8015E664 -/* 012B0 80A5C5A0 51800006 */ beql $t4, $zero, .L80A5C5BC +/* 012B0 80A5C5A0 51800006 */ beql $t4, $zero, .L80A5C5BC /* 012B4 80A5C5A4 8E0D01F0 */ lw $t5, 0x01F0($s0) ## 000001F0 .L80A5C5A8: /* 012B8 80A5C5A8 0C00B55C */ jal Actor_Kill - + /* 012BC 80A5C5AC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 012C0 80A5C5B0 10000095 */ beq $zero, $zero, .L80A5C808 -/* 012C4 80A5C5B4 8FBF0034 */ lw $ra, 0x0034($sp) +/* 012C0 80A5C5B0 10000095 */ beq $zero, $zero, .L80A5C808 +/* 012C4 80A5C5B4 8FBF0034 */ lw $ra, 0x0034($sp) /* 012C8 80A5C5B8 8E0D01F0 */ lw $t5, 0x01F0($s0) ## 000001F0 .L80A5C5BC: /* 012CC 80A5C5BC 3C010001 */ lui $at, 0x0001 ## $at = 00010000 @@ -368,23 +368,23 @@ glabel EnHorse_Init .L80A5C5CC: /* 012DC 80A5C5CC 3C0F80A6 */ lui $t7, %hi(D_80A65E58) ## $t7 = 80A60000 /* 012E0 80A5C5D0 3C0680A6 */ lui $a2, %hi(D_80A65E84) ## $a2 = 80A60000 -/* 012E4 80A5C5D4 00021080 */ sll $v0, $v0, 2 -/* 012E8 80A5C5D8 01E27821 */ addu $t7, $t7, $v0 -/* 012EC 80A5C5DC 8DEF5E58 */ lw $t7, %lo(D_80A65E58)($t7) -/* 012F0 80A5C5E0 00C23021 */ addu $a2, $a2, $v0 -/* 012F4 80A5C5E4 8CC65E84 */ lw $a2, %lo(D_80A65E84)($a2) +/* 012E4 80A5C5D4 00021080 */ sll $v0, $v0, 2 +/* 012E8 80A5C5D8 01E27821 */ addu $t7, $t7, $v0 +/* 012EC 80A5C5DC 8DEF5E58 */ lw $t7, %lo(D_80A65E58)($t7) +/* 012F0 80A5C5E0 00C23021 */ addu $a2, $a2, $v0 +/* 012F4 80A5C5E4 8CC65E84 */ lw $a2, %lo(D_80A65E84)($a2) /* 012F8 80A5C5E8 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 012FC 80A5C5EC 26050160 */ addiu $a1, $s0, 0x0160 ## $a1 = 00000160 -/* 01300 80A5C5F0 0C02998F */ jal func_800A663C +/* 01300 80A5C5F0 0C02998F */ jal func_800A663C /* 01304 80A5C5F4 8DE70000 */ lw $a3, 0x0000($t7) ## 80A60000 /* 01308 80A5C5F8 8E180158 */ lw $t8, 0x0158($s0) ## 00000158 /* 0130C 80A5C5FC 3C0880A6 */ lui $t0, %hi(D_80A65E58) ## $t0 = 80A60000 /* 01310 80A5C600 AE000210 */ sw $zero, 0x0210($s0) ## 00000210 -/* 01314 80A5C604 0018C880 */ sll $t9, $t8, 2 -/* 01318 80A5C608 01194021 */ addu $t0, $t0, $t9 -/* 0131C 80A5C60C 8D085E58 */ lw $t0, %lo(D_80A65E58)($t0) +/* 01314 80A5C604 0018C880 */ sll $t9, $t8, 2 +/* 01318 80A5C608 01194021 */ addu $t0, $t0, $t9 +/* 0131C 80A5C60C 8D085E58 */ lw $t0, %lo(D_80A65E58)($t0) /* 01320 80A5C610 260401AC */ addiu $a0, $s0, 0x01AC ## $a0 = 000001AC -/* 01324 80A5C614 0C02947A */ jal func_800A51E8 +/* 01324 80A5C614 0C02947A */ jal SkelAnime_ChangeAnimDefaultStop /* 01328 80A5C618 8D050000 */ lw $a1, 0x0000($t0) ## 80A60000 /* 0132C 80A5C61C 24090006 */ addiu $t1, $zero, 0x0006 ## $t1 = 00000006 /* 01330 80A5C620 A2090238 */ sb $t1, 0x0238($s0) ## 00000238 @@ -392,130 +392,130 @@ glabel EnHorse_Init /* 01338 80A5C628 AE000244 */ sw $zero, 0x0244($s0) ## 00000244 /* 0133C 80A5C62C A200037A */ sb $zero, 0x037A($s0) ## 0000037A /* 01340 80A5C630 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01344 80A5C634 0C296FF6 */ jal func_80A5BFD8 +/* 01344 80A5C634 0C296FF6 */ jal func_80A5BFD8 /* 01348 80A5C638 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 /* 0134C 80A5C63C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01350 80A5C640 0C296FFB */ jal func_80A5BFEC +/* 01350 80A5C640 0C296FFB */ jal func_80A5BFEC /* 01354 80A5C644 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 /* 01358 80A5C648 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0135C 80A5C64C 0C29702D */ jal func_80A5C0B4 +/* 0135C 80A5C64C 0C29702D */ jal func_80A5C0B4 /* 01360 80A5C650 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 /* 01364 80A5C654 8602001C */ lh $v0, 0x001C($s0) ## 0000001C /* 01368 80A5C658 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 0136C 80A5C65C 54410006 */ bnel $v0, $at, .L80A5C678 +/* 0136C 80A5C65C 54410006 */ bnel $v0, $at, .L80A5C678 /* 01370 80A5C660 24010003 */ addiu $at, $zero, 0x0003 ## $at = 00000003 -/* 01374 80A5C664 0C297C11 */ jal func_80A5F044 +/* 01374 80A5C664 0C297C11 */ jal func_80A5F044 /* 01378 80A5C668 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0137C 80A5C66C 10000062 */ beq $zero, $zero, .L80A5C7F8 +/* 0137C 80A5C66C 10000062 */ beq $zero, $zero, .L80A5C7F8 /* 01380 80A5C670 A60000B8 */ sh $zero, 0x00B8($s0) ## 000000B8 /* 01384 80A5C674 24010003 */ addiu $at, $zero, 0x0003 ## $at = 00000003 .L80A5C678: -/* 01388 80A5C678 5441002A */ bnel $v0, $at, .L80A5C724 +/* 01388 80A5C678 5441002A */ bnel $v0, $at, .L80A5C724 /* 0138C 80A5C67C 24010007 */ addiu $at, $zero, 0x0007 ## $at = 00000007 -/* 01390 80A5C680 0C297F2B */ jal func_80A5FCAC +/* 01390 80A5C680 0C297F2B */ jal func_80A5FCAC /* 01394 80A5C684 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 01398 80A5C688 C6080028 */ lwc1 $f8, 0x0028($s0) ## 00000028 /* 0139C 80A5C68C 8E070024 */ lw $a3, 0x0024($s0) ## 00000024 /* 013A0 80A5C690 240C0001 */ addiu $t4, $zero, 0x0001 ## $t4 = 00000001 -/* 013A4 80A5C694 E7A80010 */ swc1 $f8, 0x0010($sp) +/* 013A4 80A5C694 E7A80010 */ swc1 $f8, 0x0010($sp) /* 013A8 80A5C698 C60A002C */ lwc1 $f10, 0x002C($s0) ## 0000002C /* 013AC 80A5C69C 240D0001 */ addiu $t5, $zero, 0x0001 ## $t5 = 00000001 /* 013B0 80A5C6A0 26241C24 */ addiu $a0, $s1, 0x1C24 ## $a0 = 00001C24 -/* 013B4 80A5C6A4 E7AA0014 */ swc1 $f10, 0x0014($sp) +/* 013B4 80A5C6A4 E7AA0014 */ swc1 $f10, 0x0014($sp) /* 013B8 80A5C6A8 860A00B4 */ lh $t2, 0x00B4($s0) ## 000000B4 /* 013BC 80A5C6AC 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 /* 013C0 80A5C6B0 240600CB */ addiu $a2, $zero, 0x00CB ## $a2 = 000000CB -/* 013C4 80A5C6B4 AFAA0018 */ sw $t2, 0x0018($sp) +/* 013C4 80A5C6B4 AFAA0018 */ sw $t2, 0x0018($sp) /* 013C8 80A5C6B8 860B00B6 */ lh $t3, 0x00B6($s0) ## 000000B6 -/* 013CC 80A5C6BC AFAD0024 */ sw $t5, 0x0024($sp) -/* 013D0 80A5C6C0 AFAC0020 */ sw $t4, 0x0020($sp) +/* 013CC 80A5C6BC AFAD0024 */ sw $t5, 0x0024($sp) +/* 013D0 80A5C6C0 AFAC0020 */ sw $t4, 0x0020($sp) /* 013D4 80A5C6C4 0C00C7D4 */ jal Actor_Spawn ## ActorSpawn -/* 013D8 80A5C6C8 AFAB001C */ sw $t3, 0x001C($sp) -/* 013DC 80A5C6CC 14400007 */ bne $v0, $zero, .L80A5C6EC +/* 013D8 80A5C6C8 AFAB001C */ sw $t3, 0x001C($sp) +/* 013DC 80A5C6CC 14400007 */ bne $v0, $zero, .L80A5C6EC /* 013E0 80A5C6D0 AE02038C */ sw $v0, 0x038C($s0) ## 0000038C /* 013E4 80A5C6D4 3C0480A6 */ lui $a0, %hi(D_80A66800) ## $a0 = 80A60000 /* 013E8 80A5C6D8 3C0580A6 */ lui $a1, %hi(D_80A6681C) ## $a1 = 80A60000 /* 013EC 80A5C6DC 24A5681C */ addiu $a1, $a1, %lo(D_80A6681C) ## $a1 = 80A6681C /* 013F0 80A5C6E0 24846800 */ addiu $a0, $a0, %lo(D_80A66800) ## $a0 = 80A66800 /* 013F4 80A5C6E4 0C0007FC */ jal __assert - + /* 013F8 80A5C6E8 24060C05 */ addiu $a2, $zero, 0x0C05 ## $a2 = 00000C05 .L80A5C6EC: /* 013FC 80A5C6EC 3C0E8016 */ lui $t6, 0x8016 ## $t6 = 80160000 /* 01400 80A5C6F0 95CEFA5A */ lhu $t6, -0x05A6($t6) ## 8015FA5A /* 01404 80A5C6F4 3C01414A */ lui $at, 0x414A ## $at = 414A0000 /* 01408 80A5C6F8 31CF0040 */ andi $t7, $t6, 0x0040 ## $t7 = 00000000 -/* 0140C 80A5C6FC 55E00006 */ bnel $t7, $zero, .L80A5C718 +/* 0140C 80A5C6FC 55E00006 */ bnel $t7, $zero, .L80A5C718 /* 01410 80A5C700 44819000 */ mtc1 $at, $f18 ## $f18 = 12.62 /* 01414 80A5C704 3C0180A6 */ lui $at, %hi(D_80A6687C) ## $at = 80A60000 -/* 01418 80A5C708 C430687C */ lwc1 $f16, %lo(D_80A6687C)($at) -/* 0141C 80A5C70C 10000039 */ beq $zero, $zero, .L80A5C7F4 +/* 01418 80A5C708 C430687C */ lwc1 $f16, %lo(D_80A6687C)($at) +/* 0141C 80A5C70C 10000039 */ beq $zero, $zero, .L80A5C7F4 /* 01420 80A5C710 E6100398 */ swc1 $f16, 0x0398($s0) ## 00000398 /* 01424 80A5C714 44819000 */ mtc1 $at, $f18 ## $f18 = -0.00 .L80A5C718: -/* 01428 80A5C718 10000036 */ beq $zero, $zero, .L80A5C7F4 +/* 01428 80A5C718 10000036 */ beq $zero, $zero, .L80A5C7F4 /* 0142C 80A5C71C E6120398 */ swc1 $f18, 0x0398($s0) ## 00000398 /* 01430 80A5C720 24010007 */ addiu $at, $zero, 0x0007 ## $at = 00000007 .L80A5C724: -/* 01434 80A5C724 14410005 */ bne $v0, $at, .L80A5C73C +/* 01434 80A5C724 14410005 */ bne $v0, $at, .L80A5C73C /* 01438 80A5C728 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0143C 80A5C72C 0C298416 */ jal func_80A61058 +/* 0143C 80A5C72C 0C298416 */ jal func_80A61058 /* 01440 80A5C730 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 01444 80A5C734 10000030 */ beq $zero, $zero, .L80A5C7F8 +/* 01444 80A5C734 10000030 */ beq $zero, $zero, .L80A5C7F8 /* 01448 80A5C738 A60000B8 */ sh $zero, 0x00B8($s0) ## 000000B8 .L80A5C73C: /* 0144C 80A5C73C 24010008 */ addiu $at, $zero, 0x0008 ## $at = 00000008 -/* 01450 80A5C740 54410008 */ bnel $v0, $at, .L80A5C764 +/* 01450 80A5C740 54410008 */ bnel $v0, $at, .L80A5C764 /* 01454 80A5C744 863800A4 */ lh $t8, 0x00A4($s1) ## 000000A4 -/* 01458 80A5C748 0C298503 */ jal func_80A6140C +/* 01458 80A5C748 0C298503 */ jal func_80A6140C /* 0145C 80A5C74C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01460 80A5C750 0C02126A */ jal Interface_InitHorsebackArchery +/* 01460 80A5C750 0C02126A */ jal Interface_InitHorsebackArchery /* 01464 80A5C754 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 01468 80A5C758 10000027 */ beq $zero, $zero, .L80A5C7F8 +/* 01468 80A5C758 10000027 */ beq $zero, $zero, .L80A5C7F8 /* 0146C 80A5C75C A60000B8 */ sh $zero, 0x00B8($s0) ## 000000B8 /* 01470 80A5C760 863800A4 */ lh $t8, 0x00A4($s1) ## 000000A4 .L80A5C764: /* 01474 80A5C764 24010063 */ addiu $at, $zero, 0x0063 ## $at = 00000063 -/* 01478 80A5C768 5701000E */ bnel $t8, $at, .L80A5C7A4 +/* 01478 80A5C768 5701000E */ bnel $t8, $at, .L80A5C7A4 /* 0147C 80A5C76C 862200A4 */ lh $v0, 0x00A4($s1) ## 000000A4 /* 01480 80A5C770 0C00D6D3 */ jal Flags_GetEventChkInf - + /* 01484 80A5C774 24040018 */ addiu $a0, $zero, 0x0018 ## $a0 = 00000018 -/* 01488 80A5C778 14400009 */ bne $v0, $zero, .L80A5C7A0 +/* 01488 80A5C778 14400009 */ bne $v0, $zero, .L80A5C7A0 /* 0148C 80A5C77C 3C198016 */ lui $t9, 0x8016 ## $t9 = 80160000 /* 01490 80A5C780 8F39FA90 */ lw $t9, -0x0570($t9) ## 8015FA90 /* 01494 80A5C784 87280556 */ lh $t0, 0x0556($t9) ## 80160556 -/* 01498 80A5C788 55000006 */ bnel $t0, $zero, .L80A5C7A4 +/* 01498 80A5C788 55000006 */ bnel $t0, $zero, .L80A5C7A4 /* 0149C 80A5C78C 862200A4 */ lh $v0, 0x00A4($s1) ## 000000A4 -/* 014A0 80A5C790 0C298681 */ jal func_80A61A04 +/* 014A0 80A5C790 0C298681 */ jal func_80A61A04 /* 014A4 80A5C794 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 014A8 80A5C798 10000017 */ beq $zero, $zero, .L80A5C7F8 +/* 014A8 80A5C798 10000017 */ beq $zero, $zero, .L80A5C7F8 /* 014AC 80A5C79C A60000B8 */ sh $zero, 0x00B8($s0) ## 000000B8 .L80A5C7A0: /* 014B0 80A5C7A0 862200A4 */ lh $v0, 0x00A4($s1) ## 000000A4 .L80A5C7A4: /* 014B4 80A5C7A4 2401004C */ addiu $at, $zero, 0x004C ## $at = 0000004C -/* 014B8 80A5C7A8 54410006 */ bnel $v0, $at, .L80A5C7C4 +/* 014B8 80A5C7A8 54410006 */ bnel $v0, $at, .L80A5C7C4 /* 014BC 80A5C7AC 2401005D */ addiu $at, $zero, 0x005D ## $at = 0000005D -/* 014C0 80A5C7B0 0C297CEA */ jal func_80A5F3A8 +/* 014C0 80A5C7B0 0C297CEA */ jal func_80A5F3A8 /* 014C4 80A5C7B4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 014C8 80A5C7B8 1000000F */ beq $zero, $zero, .L80A5C7F8 +/* 014C8 80A5C7B8 1000000F */ beq $zero, $zero, .L80A5C7F8 /* 014CC 80A5C7BC A60000B8 */ sh $zero, 0x00B8($s0) ## 000000B8 /* 014D0 80A5C7C0 2401005D */ addiu $at, $zero, 0x005D ## $at = 0000005D .L80A5C7C4: -/* 014D4 80A5C7C4 14410009 */ bne $v0, $at, .L80A5C7EC +/* 014D4 80A5C7C4 14410009 */ bne $v0, $at, .L80A5C7EC /* 014D8 80A5C7C8 00000000 */ nop /* 014DC 80A5C7CC 8E090158 */ lw $t1, 0x0158($s0) ## 00000158 /* 014E0 80A5C7D0 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 014E4 80A5C7D4 15210005 */ bne $t1, $at, .L80A5C7EC +/* 014E4 80A5C7D4 15210005 */ bne $t1, $at, .L80A5C7EC /* 014E8 80A5C7D8 00000000 */ nop -/* 014EC 80A5C7DC 0C297CEA */ jal func_80A5F3A8 +/* 014EC 80A5C7DC 0C297CEA */ jal func_80A5F3A8 /* 014F0 80A5C7E0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 014F4 80A5C7E4 10000004 */ beq $zero, $zero, .L80A5C7F8 +/* 014F4 80A5C7E4 10000004 */ beq $zero, $zero, .L80A5C7F8 /* 014F8 80A5C7E8 A60000B8 */ sh $zero, 0x00B8($s0) ## 000000B8 .L80A5C7EC: -/* 014FC 80A5C7EC 0C297CF7 */ jal func_80A5F3DC +/* 014FC 80A5C7EC 0C297CF7 */ jal func_80A5F3DC /* 01500 80A5C7F0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 .L80A5C7F4: /* 01504 80A5C7F4 A60000B8 */ sh $zero, 0x00B8($s0) ## 000000B8 @@ -523,11 +523,11 @@ glabel EnHorse_Init /* 01508 80A5C7F8 860200B8 */ lh $v0, 0x00B8($s0) ## 000000B8 /* 0150C 80A5C7FC A6020034 */ sh $v0, 0x0034($s0) ## 00000034 /* 01510 80A5C800 A6020018 */ sh $v0, 0x0018($s0) ## 00000018 -/* 01514 80A5C804 8FBF0034 */ lw $ra, 0x0034($sp) +/* 01514 80A5C804 8FBF0034 */ lw $ra, 0x0034($sp) .L80A5C808: -/* 01518 80A5C808 8FB0002C */ lw $s0, 0x002C($sp) -/* 0151C 80A5C80C 8FB10030 */ lw $s1, 0x0030($sp) -/* 01520 80A5C810 03E00008 */ jr $ra +/* 01518 80A5C808 8FB0002C */ lw $s0, 0x002C($sp) +/* 0151C 80A5C80C 8FB10030 */ lw $s1, 0x0030($sp) +/* 01520 80A5C810 03E00008 */ jr $ra /* 01524 80A5C814 27BD0058 */ addiu $sp, $sp, 0x0058 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5CF64.s b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5CF64.s index ca0404179b..5cc0b2e239 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5CF64.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5CF64.s @@ -1,89 +1,89 @@ glabel func_80A5CF64 /* 01C74 80A5CF64 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 01C78 80A5CF68 AFBF002C */ sw $ra, 0x002C($sp) -/* 01C7C 80A5CF6C AFB00028 */ sw $s0, 0x0028($sp) +/* 01C78 80A5CF68 AFBF002C */ sw $ra, 0x002C($sp) +/* 01C7C 80A5CF6C AFB00028 */ sw $s0, 0x0028($sp) /* 01C80 80A5CF70 3C01420C */ lui $at, 0x420C ## $at = 420C0000 /* 01C84 80A5CF74 44812000 */ mtc1 $at, $f4 ## $f4 = 35.00 /* 01C88 80A5CF78 C4800214 */ lwc1 $f0, 0x0214($a0) ## 00000214 /* 01C8C 80A5CF7C 240E0005 */ addiu $t6, $zero, 0x0005 ## $t6 = 00000005 /* 01C90 80A5CF80 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 01C94 80A5CF84 4600203C */ c.lt.s $f4, $f0 +/* 01C94 80A5CF84 4600203C */ c.lt.s $f4, $f0 /* 01C98 80A5CF88 AC8E014C */ sw $t6, 0x014C($a0) ## 0000014C /* 01C9C 80A5CF8C AC800210 */ sw $zero, 0x0210($a0) ## 00000210 /* 01CA0 80A5CF90 3C0141E0 */ lui $at, 0x41E0 ## $at = 41E00000 -/* 01CA4 80A5CF94 45020005 */ bc1fl .L80A5CFAC +/* 01CA4 80A5CF94 45020005 */ bc1fl .L80A5CFAC /* 01CA8 80A5CF98 44813000 */ mtc1 $at, $f6 ## $f6 = 28.00 /* 01CAC 80A5CF9C 8C820158 */ lw $v0, 0x0158($a0) ## 00000158 -/* 01CB0 80A5CFA0 5040000B */ beql $v0, $zero, .L80A5CFD0 +/* 01CB0 80A5CFA0 5040000B */ beql $v0, $zero, .L80A5CFD0 /* 01CB4 80A5CFA4 8E0301F0 */ lw $v1, 0x01F0($s0) ## 000001F0 /* 01CB8 80A5CFA8 44813000 */ mtc1 $at, $f6 ## $f6 = 28.00 .L80A5CFAC: /* 01CBC 80A5CFAC 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 /* 01CC0 80A5CFB0 8E020158 */ lw $v0, 0x0158($s0) ## 00000158 -/* 01CC4 80A5CFB4 4600303C */ c.lt.s $f6, $f0 +/* 01CC4 80A5CFB4 4600303C */ c.lt.s $f6, $f0 /* 01CC8 80A5CFB8 00000000 */ nop -/* 01CCC 80A5CFBC 45020014 */ bc1fl .L80A5D010 +/* 01CCC 80A5CFBC 45020014 */ bc1fl .L80A5D010 /* 01CD0 80A5CFC0 C60801C4 */ lwc1 $f8, 0x01C4($s0) ## 000001C4 -/* 01CD4 80A5CFC4 54410012 */ bnel $v0, $at, .L80A5D010 +/* 01CD4 80A5CFC4 54410012 */ bnel $v0, $at, .L80A5D010 /* 01CD8 80A5CFC8 C60801C4 */ lwc1 $f8, 0x01C4($s0) ## 000001C4 /* 01CDC 80A5CFCC 8E0301F0 */ lw $v1, 0x01F0($s0) ## 000001F0 .L80A5CFD0: /* 01CE0 80A5CFD0 3C078013 */ lui $a3, 0x8013 ## $a3 = 80130000 /* 01CE4 80A5CFD4 24E733E0 */ addiu $a3, $a3, 0x33E0 ## $a3 = 801333E0 /* 01CE8 80A5CFD8 306F1000 */ andi $t7, $v1, 0x1000 ## $t7 = 00000000 -/* 01CEC 80A5CFDC 15E0000B */ bne $t7, $zero, .L80A5D00C +/* 01CEC 80A5CFDC 15E0000B */ bne $t7, $zero, .L80A5D00C /* 01CF0 80A5CFE0 34781000 */ ori $t8, $v1, 0x1000 ## $t8 = 00001000 /* 01CF4 80A5CFE4 3C198013 */ lui $t9, 0x8013 ## $t9 = 80130000 /* 01CF8 80A5CFE8 AE1801F0 */ sw $t8, 0x01F0($s0) ## 000001F0 /* 01CFC 80A5CFEC 273933E8 */ addiu $t9, $t9, 0x33E8 ## $t9 = 801333E8 -/* 01D00 80A5CFF0 AFB90014 */ sw $t9, 0x0014($sp) -/* 01D04 80A5CFF4 AFA70010 */ sw $a3, 0x0010($sp) +/* 01D00 80A5CFF0 AFB90014 */ sw $t9, 0x0014($sp) +/* 01D04 80A5CFF4 AFA70010 */ sw $a3, 0x0010($sp) /* 01D08 80A5CFF8 2404282C */ addiu $a0, $zero, 0x282C ## $a0 = 0000282C /* 01D0C 80A5CFFC 260500E4 */ addiu $a1, $s0, 0x00E4 ## $a1 = 000000E4 /* 01D10 80A5D000 0C03DCE3 */ jal Audio_PlaySoundGeneral - + /* 01D14 80A5D004 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 /* 01D18 80A5D008 8E020158 */ lw $v0, 0x0158($s0) ## 00000158 .L80A5D00C: /* 01D1C 80A5D00C C60801C4 */ lwc1 $f8, 0x01C4($s0) ## 000001C4 .L80A5D010: -/* 01D20 80A5D010 00024080 */ sll $t0, $v0, 2 +/* 01D20 80A5D010 00024080 */ sll $t0, $v0, 2 /* 01D24 80A5D014 3C0980A6 */ lui $t1, %hi(D_80A65E58) ## $t1 = 80A60000 -/* 01D28 80A5D018 E7A80034 */ swc1 $f8, 0x0034($sp) +/* 01D28 80A5D018 E7A80034 */ swc1 $f8, 0x0034($sp) /* 01D2C 80A5D01C 8E0A0210 */ lw $t2, 0x0210($s0) ## 00000210 -/* 01D30 80A5D020 01284821 */ addu $t1, $t1, $t0 -/* 01D34 80A5D024 8D295E58 */ lw $t1, %lo(D_80A65E58)($t1) -/* 01D38 80A5D028 000A5880 */ sll $t3, $t2, 2 -/* 01D3C 80A5D02C 012B6021 */ addu $t4, $t1, $t3 +/* 01D30 80A5D020 01284821 */ addu $t1, $t1, $t0 +/* 01D34 80A5D024 8D295E58 */ lw $t1, %lo(D_80A65E58)($t1) +/* 01D38 80A5D028 000A5880 */ sll $t3, $t2, 2 +/* 01D3C 80A5D02C 012B6021 */ addu $t4, $t1, $t3 /* 01D40 80A5D030 0C028800 */ jal SkelAnime_GetFrameCount - + /* 01D44 80A5D034 8D840000 */ lw $a0, 0x0000($t4) ## 00000000 /* 01D48 80A5D038 8E0D0158 */ lw $t5, 0x0158($s0) ## 00000158 /* 01D4C 80A5D03C 44825000 */ mtc1 $v0, $f10 ## $f10 = 0.00 /* 01D50 80A5D040 3C0F80A6 */ lui $t7, %hi(D_80A65E58) ## $t7 = 80A60000 -/* 01D54 80A5D044 000D7080 */ sll $t6, $t5, 2 +/* 01D54 80A5D044 000D7080 */ sll $t6, $t5, 2 /* 01D58 80A5D048 8E180210 */ lw $t8, 0x0210($s0) ## 00000210 -/* 01D5C 80A5D04C 01EE7821 */ addu $t7, $t7, $t6 -/* 01D60 80A5D050 8DEF5E58 */ lw $t7, %lo(D_80A65E58)($t7) -/* 01D64 80A5D054 46805420 */ cvt.s.w $f16, $f10 -/* 01D68 80A5D058 0018C880 */ sll $t9, $t8, 2 +/* 01D5C 80A5D04C 01EE7821 */ addu $t7, $t7, $t6 +/* 01D60 80A5D050 8DEF5E58 */ lw $t7, %lo(D_80A65E58)($t7) +/* 01D64 80A5D054 46805420 */ cvt.s.w $f16, $f10 +/* 01D68 80A5D058 0018C880 */ sll $t9, $t8, 2 /* 01D6C 80A5D05C 3C01C040 */ lui $at, 0xC040 ## $at = C0400000 -/* 01D70 80A5D060 01F94021 */ addu $t0, $t7, $t9 +/* 01D70 80A5D060 01F94021 */ addu $t0, $t7, $t9 /* 01D74 80A5D064 44819000 */ mtc1 $at, $f18 ## $f18 = -3.00 /* 01D78 80A5D068 8D050000 */ lw $a1, 0x0000($t0) ## 00000000 /* 01D7C 80A5D06C 240A0002 */ addiu $t2, $zero, 0x0002 ## $t2 = 00000002 -/* 01D80 80A5D070 AFAA0014 */ sw $t2, 0x0014($sp) -/* 01D84 80A5D074 E7B00010 */ swc1 $f16, 0x0010($sp) +/* 01D80 80A5D070 AFAA0014 */ sw $t2, 0x0014($sp) +/* 01D84 80A5D074 E7B00010 */ swc1 $f16, 0x0010($sp) /* 01D88 80A5D078 260401AC */ addiu $a0, $s0, 0x01AC ## $a0 = 000001AC /* 01D8C 80A5D07C 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 01D90 80A5D080 8FA70034 */ lw $a3, 0x0034($sp) -/* 01D94 80A5D084 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 01D98 80A5D088 E7B20018 */ swc1 $f18, 0x0018($sp) -/* 01D9C 80A5D08C 8FBF002C */ lw $ra, 0x002C($sp) -/* 01DA0 80A5D090 8FB00028 */ lw $s0, 0x0028($sp) +/* 01D90 80A5D080 8FA70034 */ lw $a3, 0x0034($sp) +/* 01D94 80A5D084 0C029468 */ jal SkelAnime_ChangeAnim + +/* 01D98 80A5D088 E7B20018 */ swc1 $f18, 0x0018($sp) +/* 01D9C 80A5D08C 8FBF002C */ lw $ra, 0x002C($sp) +/* 01DA0 80A5D090 8FB00028 */ lw $s0, 0x0028($sp) /* 01DA4 80A5D094 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 -/* 01DA8 80A5D098 03E00008 */ jr $ra +/* 01DA8 80A5D098 03E00008 */ jr $ra /* 01DAC 80A5D09C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5D1C4.s b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5D1C4.s index 6eb6ece442..d7832e4520 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5D1C4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5D1C4.s @@ -1,44 +1,44 @@ glabel func_80A5D1C4 /* 01ED4 80A5D1C4 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 01ED8 80A5D1C8 AFBF002C */ sw $ra, 0x002C($sp) -/* 01EDC 80A5D1CC AFB00028 */ sw $s0, 0x0028($sp) +/* 01ED8 80A5D1C8 AFBF002C */ sw $ra, 0x002C($sp) +/* 01EDC 80A5D1CC AFB00028 */ sw $s0, 0x0028($sp) /* 01EE0 80A5D1D0 C48401C4 */ lwc1 $f4, 0x01C4($a0) ## 000001C4 /* 01EE4 80A5D1D4 240E0006 */ addiu $t6, $zero, 0x0006 ## $t6 = 00000006 /* 01EE8 80A5D1D8 240F0001 */ addiu $t7, $zero, 0x0001 ## $t7 = 00000001 /* 01EEC 80A5D1DC AC8E014C */ sw $t6, 0x014C($a0) ## 0000014C /* 01EF0 80A5D1E0 AC8F0210 */ sw $t7, 0x0210($a0) ## 00000210 -/* 01EF4 80A5D1E4 E7A40034 */ swc1 $f4, 0x0034($sp) +/* 01EF4 80A5D1E4 E7A40034 */ swc1 $f4, 0x0034($sp) /* 01EF8 80A5D1E8 8C980158 */ lw $t8, 0x0158($a0) ## 00000158 /* 01EFC 80A5D1EC 3C0880A6 */ lui $t0, %hi(D_80A65E58) ## $t0 = 80A60000 /* 01F00 80A5D1F0 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 01F04 80A5D1F4 0018C880 */ sll $t9, $t8, 2 -/* 01F08 80A5D1F8 01194021 */ addu $t0, $t0, $t9 -/* 01F0C 80A5D1FC 8D085E58 */ lw $t0, %lo(D_80A65E58)($t0) +/* 01F04 80A5D1F4 0018C880 */ sll $t9, $t8, 2 +/* 01F08 80A5D1F8 01194021 */ addu $t0, $t0, $t9 +/* 01F0C 80A5D1FC 8D085E58 */ lw $t0, %lo(D_80A65E58)($t0) /* 01F10 80A5D200 0C028800 */ jal SkelAnime_GetFrameCount - + /* 01F14 80A5D204 8D040004 */ lw $a0, 0x0004($t0) ## 80A60004 /* 01F18 80A5D208 8E090158 */ lw $t1, 0x0158($s0) ## 00000158 /* 01F1C 80A5D20C 44823000 */ mtc1 $v0, $f6 ## $f6 = 0.00 /* 01F20 80A5D210 3C0B80A6 */ lui $t3, %hi(D_80A65E58) ## $t3 = 80A60000 -/* 01F24 80A5D214 00095080 */ sll $t2, $t1, 2 +/* 01F24 80A5D214 00095080 */ sll $t2, $t1, 2 /* 01F28 80A5D218 8E0C0210 */ lw $t4, 0x0210($s0) ## 00000210 -/* 01F2C 80A5D21C 016A5821 */ addu $t3, $t3, $t2 -/* 01F30 80A5D220 8D6B5E58 */ lw $t3, %lo(D_80A65E58)($t3) -/* 01F34 80A5D224 46803220 */ cvt.s.w $f8, $f6 -/* 01F38 80A5D228 000C6880 */ sll $t5, $t4, 2 +/* 01F2C 80A5D21C 016A5821 */ addu $t3, $t3, $t2 +/* 01F30 80A5D220 8D6B5E58 */ lw $t3, %lo(D_80A65E58)($t3) +/* 01F34 80A5D224 46803220 */ cvt.s.w $f8, $f6 +/* 01F38 80A5D228 000C6880 */ sll $t5, $t4, 2 /* 01F3C 80A5D22C 3C01C040 */ lui $at, 0xC040 ## $at = C0400000 -/* 01F40 80A5D230 016D7021 */ addu $t6, $t3, $t5 +/* 01F40 80A5D230 016D7021 */ addu $t6, $t3, $t5 /* 01F44 80A5D234 44815000 */ mtc1 $at, $f10 ## $f10 = -3.00 /* 01F48 80A5D238 8DC50000 */ lw $a1, 0x0000($t6) ## 00000000 /* 01F4C 80A5D23C 240F0002 */ addiu $t7, $zero, 0x0002 ## $t7 = 00000002 -/* 01F50 80A5D240 AFAF0014 */ sw $t7, 0x0014($sp) -/* 01F54 80A5D244 E7A80010 */ swc1 $f8, 0x0010($sp) +/* 01F50 80A5D240 AFAF0014 */ sw $t7, 0x0014($sp) +/* 01F54 80A5D244 E7A80010 */ swc1 $f8, 0x0010($sp) /* 01F58 80A5D248 260401AC */ addiu $a0, $s0, 0x01AC ## $a0 = 000001AC /* 01F5C 80A5D24C 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 01F60 80A5D250 8FA70034 */ lw $a3, 0x0034($sp) -/* 01F64 80A5D254 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 01F68 80A5D258 E7AA0018 */ swc1 $f10, 0x0018($sp) +/* 01F60 80A5D250 8FA70034 */ lw $a3, 0x0034($sp) +/* 01F64 80A5D254 0C029468 */ jal SkelAnime_ChangeAnim + +/* 01F68 80A5D258 E7AA0018 */ swc1 $f10, 0x0018($sp) /* 01F6C 80A5D25C 8E190228 */ lw $t9, 0x0228($s0) ## 00000228 /* 01F70 80A5D260 2605021C */ addiu $a1, $s0, 0x021C ## $a1 = 0000021C /* 01F74 80A5D264 3C078013 */ lui $a3, 0x8013 ## $a3 = 80130000 @@ -53,18 +53,18 @@ glabel func_80A5D1C4 /* 01F98 80A5D288 ACB90008 */ sw $t9, 0x0008($a1) ## 00000224 /* 01F9C 80A5D28C 8E0801F0 */ lw $t0, 0x01F0($s0) ## 000001F0 /* 01FA0 80A5D290 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 -/* 01FA4 80A5D294 00084900 */ sll $t1, $t0, 4 -/* 01FA8 80A5D298 05230005 */ bgezl $t1, .L80A5D2B0 -/* 01FAC 80A5D29C 8FBF002C */ lw $ra, 0x002C($sp) -/* 01FB0 80A5D2A0 AFA70010 */ sw $a3, 0x0010($sp) +/* 01FA4 80A5D294 00084900 */ sll $t1, $t0, 4 +/* 01FA8 80A5D298 05230005 */ bgezl $t1, .L80A5D2B0 +/* 01FAC 80A5D29C 8FBF002C */ lw $ra, 0x002C($sp) +/* 01FB0 80A5D2A0 AFA70010 */ sw $a3, 0x0010($sp) /* 01FB4 80A5D2A4 0C03DCE3 */ jal Audio_PlaySoundGeneral - -/* 01FB8 80A5D2A8 AFAA0014 */ sw $t2, 0x0014($sp) -/* 01FBC 80A5D2AC 8FBF002C */ lw $ra, 0x002C($sp) + +/* 01FB8 80A5D2A8 AFAA0014 */ sw $t2, 0x0014($sp) +/* 01FBC 80A5D2AC 8FBF002C */ lw $ra, 0x002C($sp) .L80A5D2B0: -/* 01FC0 80A5D2B0 8FB00028 */ lw $s0, 0x0028($sp) +/* 01FC0 80A5D2B0 8FB00028 */ lw $s0, 0x0028($sp) /* 01FC4 80A5D2B4 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 -/* 01FC8 80A5D2B8 03E00008 */ jr $ra +/* 01FC8 80A5D2B8 03E00008 */ jr $ra /* 01FCC 80A5D2BC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5D3C0.s b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5D3C0.s index bebd3cd353..8390366a91 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5D3C0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5D3C0.s @@ -1,47 +1,47 @@ glabel func_80A5D3C0 /* 020D0 80A5D3C0 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 020D4 80A5D3C4 AFBF002C */ sw $ra, 0x002C($sp) -/* 020D8 80A5D3C8 AFB00028 */ sw $s0, 0x0028($sp) +/* 020D4 80A5D3C4 AFBF002C */ sw $ra, 0x002C($sp) +/* 020D8 80A5D3C8 AFB00028 */ sw $s0, 0x0028($sp) /* 020DC 80A5D3CC 8C980158 */ lw $t8, 0x0158($a0) ## 00000158 /* 020E0 80A5D3D0 240E0007 */ addiu $t6, $zero, 0x0007 ## $t6 = 00000007 /* 020E4 80A5D3D4 240F0004 */ addiu $t7, $zero, 0x0004 ## $t7 = 00000004 /* 020E8 80A5D3D8 3C0880A6 */ lui $t0, %hi(D_80A65E58) ## $t0 = 80A60000 -/* 020EC 80A5D3DC 0018C880 */ sll $t9, $t8, 2 +/* 020EC 80A5D3DC 0018C880 */ sll $t9, $t8, 2 /* 020F0 80A5D3E0 AC8E014C */ sw $t6, 0x014C($a0) ## 0000014C /* 020F4 80A5D3E4 AC800218 */ sw $zero, 0x0218($a0) ## 00000218 /* 020F8 80A5D3E8 AC8F0210 */ sw $t7, 0x0210($a0) ## 00000210 -/* 020FC 80A5D3EC 01194021 */ addu $t0, $t0, $t9 -/* 02100 80A5D3F0 8D085E58 */ lw $t0, %lo(D_80A65E58)($t0) +/* 020FC 80A5D3EC 01194021 */ addu $t0, $t0, $t9 +/* 02100 80A5D3F0 8D085E58 */ lw $t0, %lo(D_80A65E58)($t0) /* 02104 80A5D3F4 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 02108 80A5D3F8 0C028800 */ jal SkelAnime_GetFrameCount - + /* 0210C 80A5D3FC 8D040010 */ lw $a0, 0x0010($t0) ## 80A60010 /* 02110 80A5D400 8E090158 */ lw $t1, 0x0158($s0) ## 00000158 /* 02114 80A5D404 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 02118 80A5D408 3C0B80A6 */ lui $t3, %hi(D_80A65E58) ## $t3 = 80A60000 -/* 0211C 80A5D40C 00095080 */ sll $t2, $t1, 2 +/* 0211C 80A5D40C 00095080 */ sll $t2, $t1, 2 /* 02120 80A5D410 8E0C0210 */ lw $t4, 0x0210($s0) ## 00000210 -/* 02124 80A5D414 016A5821 */ addu $t3, $t3, $t2 -/* 02128 80A5D418 8D6B5E58 */ lw $t3, %lo(D_80A65E58)($t3) -/* 0212C 80A5D41C 468021A0 */ cvt.s.w $f6, $f4 -/* 02130 80A5D420 000C6880 */ sll $t5, $t4, 2 +/* 02124 80A5D414 016A5821 */ addu $t3, $t3, $t2 +/* 02128 80A5D418 8D6B5E58 */ lw $t3, %lo(D_80A65E58)($t3) +/* 0212C 80A5D41C 468021A0 */ cvt.s.w $f6, $f4 +/* 02130 80A5D420 000C6880 */ sll $t5, $t4, 2 /* 02134 80A5D424 3C01C040 */ lui $at, 0xC040 ## $at = C0400000 -/* 02138 80A5D428 016D7021 */ addu $t6, $t3, $t5 +/* 02138 80A5D428 016D7021 */ addu $t6, $t3, $t5 /* 0213C 80A5D42C 44814000 */ mtc1 $at, $f8 ## $f8 = -3.00 /* 02140 80A5D430 8DC50000 */ lw $a1, 0x0000($t6) ## 00000000 /* 02144 80A5D434 240F0002 */ addiu $t7, $zero, 0x0002 ## $t7 = 00000002 -/* 02148 80A5D438 AFAF0014 */ sw $t7, 0x0014($sp) -/* 0214C 80A5D43C E7A60010 */ swc1 $f6, 0x0010($sp) +/* 02148 80A5D438 AFAF0014 */ sw $t7, 0x0014($sp) +/* 0214C 80A5D43C E7A60010 */ swc1 $f6, 0x0010($sp) /* 02150 80A5D440 260401AC */ addiu $a0, $s0, 0x01AC ## $a0 = 000001AC /* 02154 80A5D444 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 02158 80A5D448 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 0215C 80A5D44C 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 02160 80A5D450 E7A80018 */ swc1 $f8, 0x0018($sp) -/* 02164 80A5D454 8FBF002C */ lw $ra, 0x002C($sp) -/* 02168 80A5D458 8FB00028 */ lw $s0, 0x0028($sp) +/* 0215C 80A5D44C 0C029468 */ jal SkelAnime_ChangeAnim + +/* 02160 80A5D450 E7A80018 */ swc1 $f8, 0x0018($sp) +/* 02164 80A5D454 8FBF002C */ lw $ra, 0x002C($sp) +/* 02168 80A5D458 8FB00028 */ lw $s0, 0x0028($sp) /* 0216C 80A5D45C 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 02170 80A5D460 03E00008 */ jr $ra +/* 02170 80A5D460 03E00008 */ jr $ra /* 02174 80A5D464 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5D69C.s b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5D69C.s index f24ed752a2..b292d9d437 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5D69C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5D69C.s @@ -1,48 +1,48 @@ glabel func_80A5D69C /* 023AC 80A5D69C 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 023B0 80A5D6A0 AFBF002C */ sw $ra, 0x002C($sp) -/* 023B4 80A5D6A4 AFB00028 */ sw $s0, 0x0028($sp) +/* 023B0 80A5D6A0 AFBF002C */ sw $ra, 0x002C($sp) +/* 023B4 80A5D6A4 AFB00028 */ sw $s0, 0x0028($sp) /* 023B8 80A5D6A8 8C980158 */ lw $t8, 0x0158($a0) ## 00000158 /* 023BC 80A5D6AC 240E0008 */ addiu $t6, $zero, 0x0008 ## $t6 = 00000008 /* 023C0 80A5D6B0 240F0004 */ addiu $t7, $zero, 0x0004 ## $t7 = 00000004 /* 023C4 80A5D6B4 3C0880A6 */ lui $t0, %hi(D_80A65E58) ## $t0 = 80A60000 -/* 023C8 80A5D6B8 0018C880 */ sll $t9, $t8, 2 +/* 023C8 80A5D6B8 0018C880 */ sll $t9, $t8, 2 /* 023CC 80A5D6BC AC8E014C */ sw $t6, 0x014C($a0) ## 0000014C /* 023D0 80A5D6C0 AC800218 */ sw $zero, 0x0218($a0) ## 00000218 /* 023D4 80A5D6C4 AC8F0210 */ sw $t7, 0x0210($a0) ## 00000210 /* 023D8 80A5D6C8 A480037C */ sh $zero, 0x037C($a0) ## 0000037C -/* 023DC 80A5D6CC 01194021 */ addu $t0, $t0, $t9 -/* 023E0 80A5D6D0 8D085E58 */ lw $t0, %lo(D_80A65E58)($t0) +/* 023DC 80A5D6CC 01194021 */ addu $t0, $t0, $t9 +/* 023E0 80A5D6D0 8D085E58 */ lw $t0, %lo(D_80A65E58)($t0) /* 023E4 80A5D6D4 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 023E8 80A5D6D8 0C028800 */ jal SkelAnime_GetFrameCount - + /* 023EC 80A5D6DC 8D040010 */ lw $a0, 0x0010($t0) ## 80A60010 /* 023F0 80A5D6E0 8E090158 */ lw $t1, 0x0158($s0) ## 00000158 /* 023F4 80A5D6E4 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 023F8 80A5D6E8 3C0B80A6 */ lui $t3, %hi(D_80A65E58) ## $t3 = 80A60000 -/* 023FC 80A5D6EC 00095080 */ sll $t2, $t1, 2 +/* 023FC 80A5D6EC 00095080 */ sll $t2, $t1, 2 /* 02400 80A5D6F0 8E0C0210 */ lw $t4, 0x0210($s0) ## 00000210 -/* 02404 80A5D6F4 016A5821 */ addu $t3, $t3, $t2 -/* 02408 80A5D6F8 8D6B5E58 */ lw $t3, %lo(D_80A65E58)($t3) -/* 0240C 80A5D6FC 468021A0 */ cvt.s.w $f6, $f4 -/* 02410 80A5D700 000C6880 */ sll $t5, $t4, 2 +/* 02404 80A5D6F4 016A5821 */ addu $t3, $t3, $t2 +/* 02408 80A5D6F8 8D6B5E58 */ lw $t3, %lo(D_80A65E58)($t3) +/* 0240C 80A5D6FC 468021A0 */ cvt.s.w $f6, $f4 +/* 02410 80A5D700 000C6880 */ sll $t5, $t4, 2 /* 02414 80A5D704 3C01C040 */ lui $at, 0xC040 ## $at = C0400000 -/* 02418 80A5D708 016D7021 */ addu $t6, $t3, $t5 +/* 02418 80A5D708 016D7021 */ addu $t6, $t3, $t5 /* 0241C 80A5D70C 44814000 */ mtc1 $at, $f8 ## $f8 = -3.00 /* 02420 80A5D710 8DC50000 */ lw $a1, 0x0000($t6) ## 00000000 /* 02424 80A5D714 240F0002 */ addiu $t7, $zero, 0x0002 ## $t7 = 00000002 -/* 02428 80A5D718 AFAF0014 */ sw $t7, 0x0014($sp) -/* 0242C 80A5D71C E7A60010 */ swc1 $f6, 0x0010($sp) +/* 02428 80A5D718 AFAF0014 */ sw $t7, 0x0014($sp) +/* 0242C 80A5D71C E7A60010 */ swc1 $f6, 0x0010($sp) /* 02430 80A5D720 260401AC */ addiu $a0, $s0, 0x01AC ## $a0 = 000001AC /* 02434 80A5D724 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 02438 80A5D728 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 0243C 80A5D72C 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 02440 80A5D730 E7A80018 */ swc1 $f8, 0x0018($sp) -/* 02444 80A5D734 8FBF002C */ lw $ra, 0x002C($sp) -/* 02448 80A5D738 8FB00028 */ lw $s0, 0x0028($sp) +/* 0243C 80A5D72C 0C029468 */ jal SkelAnime_ChangeAnim + +/* 02440 80A5D730 E7A80018 */ swc1 $f8, 0x0018($sp) +/* 02444 80A5D734 8FBF002C */ lw $ra, 0x002C($sp) +/* 02448 80A5D738 8FB00028 */ lw $s0, 0x0028($sp) /* 0244C 80A5D73C 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 02450 80A5D740 03E00008 */ jr $ra +/* 02450 80A5D740 03E00008 */ jr $ra /* 02454 80A5D744 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5D748.s b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5D748.s index d0af29255b..4cb220458b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5D748.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5D748.s @@ -1,6 +1,6 @@ glabel func_80A5D748 /* 02458 80A5D748 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 0245C 80A5D74C AFBF0014 */ sw $ra, 0x0014($sp) +/* 0245C 80A5D74C AFBF0014 */ sw $ra, 0x0014($sp) /* 02460 80A5D750 240E0008 */ addiu $t6, $zero, 0x0008 ## $t6 = 00000008 /* 02464 80A5D754 240F0004 */ addiu $t7, $zero, 0x0004 ## $t7 = 00000004 /* 02468 80A5D758 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 @@ -11,14 +11,14 @@ glabel func_80A5D748 /* 0247C 80A5D76C 8CD80158 */ lw $t8, 0x0158($a2) ## 00000158 /* 02480 80A5D770 3C0880A6 */ lui $t0, %hi(D_80A65E58) ## $t0 = 80A60000 /* 02484 80A5D774 248401AC */ addiu $a0, $a0, 0x01AC ## $a0 = 000001AC -/* 02488 80A5D778 0018C880 */ sll $t9, $t8, 2 -/* 0248C 80A5D77C 01194021 */ addu $t0, $t0, $t9 -/* 02490 80A5D780 8D085E58 */ lw $t0, %lo(D_80A65E58)($t0) -/* 02494 80A5D784 0C02947A */ jal func_800A51E8 +/* 02488 80A5D778 0018C880 */ sll $t9, $t8, 2 +/* 0248C 80A5D77C 01194021 */ addu $t0, $t0, $t9 +/* 02490 80A5D780 8D085E58 */ lw $t0, %lo(D_80A65E58)($t0) +/* 02494 80A5D784 0C02947A */ jal SkelAnime_ChangeAnimDefaultStop /* 02498 80A5D788 8D050010 */ lw $a1, 0x0010($t0) ## 80A60010 -/* 0249C 80A5D78C 8FBF0014 */ lw $ra, 0x0014($sp) +/* 0249C 80A5D78C 8FBF0014 */ lw $ra, 0x0014($sp) /* 024A0 80A5D790 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 024A4 80A5D794 03E00008 */ jr $ra +/* 024A4 80A5D794 03E00008 */ jr $ra /* 024A8 80A5D798 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5DA68.s b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5DA68.s index fe0d86fd19..5d5943305b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5DA68.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5DA68.s @@ -1,46 +1,46 @@ glabel func_80A5DA68 /* 02778 80A5DA68 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 0277C 80A5DA6C AFBF002C */ sw $ra, 0x002C($sp) -/* 02780 80A5DA70 AFB00028 */ sw $s0, 0x0028($sp) +/* 0277C 80A5DA6C AFBF002C */ sw $ra, 0x002C($sp) +/* 02780 80A5DA70 AFB00028 */ sw $s0, 0x0028($sp) /* 02784 80A5DA74 8C980158 */ lw $t8, 0x0158($a0) ## 00000158 /* 02788 80A5DA78 240E0009 */ addiu $t6, $zero, 0x0009 ## $t6 = 00000009 /* 0278C 80A5DA7C 240F0005 */ addiu $t7, $zero, 0x0005 ## $t7 = 00000005 /* 02790 80A5DA80 3C0880A6 */ lui $t0, %hi(D_80A65E58) ## $t0 = 80A60000 -/* 02794 80A5DA84 0018C880 */ sll $t9, $t8, 2 +/* 02794 80A5DA84 0018C880 */ sll $t9, $t8, 2 /* 02798 80A5DA88 AC8E014C */ sw $t6, 0x014C($a0) ## 0000014C /* 0279C 80A5DA8C AC8F0210 */ sw $t7, 0x0210($a0) ## 00000210 -/* 027A0 80A5DA90 01194021 */ addu $t0, $t0, $t9 -/* 027A4 80A5DA94 8D085E58 */ lw $t0, %lo(D_80A65E58)($t0) +/* 027A0 80A5DA90 01194021 */ addu $t0, $t0, $t9 +/* 027A4 80A5DA94 8D085E58 */ lw $t0, %lo(D_80A65E58)($t0) /* 027A8 80A5DA98 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 027AC 80A5DA9C 0C028800 */ jal SkelAnime_GetFrameCount - + /* 027B0 80A5DAA0 8D040014 */ lw $a0, 0x0014($t0) ## 80A60014 /* 027B4 80A5DAA4 8E090158 */ lw $t1, 0x0158($s0) ## 00000158 /* 027B8 80A5DAA8 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 027BC 80A5DAAC 3C0B80A6 */ lui $t3, %hi(D_80A65E58) ## $t3 = 80A60000 -/* 027C0 80A5DAB0 00095080 */ sll $t2, $t1, 2 +/* 027C0 80A5DAB0 00095080 */ sll $t2, $t1, 2 /* 027C4 80A5DAB4 8E0C0210 */ lw $t4, 0x0210($s0) ## 00000210 -/* 027C8 80A5DAB8 016A5821 */ addu $t3, $t3, $t2 -/* 027CC 80A5DABC 8D6B5E58 */ lw $t3, %lo(D_80A65E58)($t3) -/* 027D0 80A5DAC0 468021A0 */ cvt.s.w $f6, $f4 -/* 027D4 80A5DAC4 000C6880 */ sll $t5, $t4, 2 +/* 027C8 80A5DAB8 016A5821 */ addu $t3, $t3, $t2 +/* 027CC 80A5DABC 8D6B5E58 */ lw $t3, %lo(D_80A65E58)($t3) +/* 027D0 80A5DAC0 468021A0 */ cvt.s.w $f6, $f4 +/* 027D4 80A5DAC4 000C6880 */ sll $t5, $t4, 2 /* 027D8 80A5DAC8 3C01C040 */ lui $at, 0xC040 ## $at = C0400000 -/* 027DC 80A5DACC 016D7021 */ addu $t6, $t3, $t5 +/* 027DC 80A5DACC 016D7021 */ addu $t6, $t3, $t5 /* 027E0 80A5DAD0 44814000 */ mtc1 $at, $f8 ## $f8 = -3.00 /* 027E4 80A5DAD4 8DC50000 */ lw $a1, 0x0000($t6) ## 00000000 /* 027E8 80A5DAD8 240F0002 */ addiu $t7, $zero, 0x0002 ## $t7 = 00000002 -/* 027EC 80A5DADC AFAF0014 */ sw $t7, 0x0014($sp) -/* 027F0 80A5DAE0 E7A60010 */ swc1 $f6, 0x0010($sp) +/* 027EC 80A5DADC AFAF0014 */ sw $t7, 0x0014($sp) +/* 027F0 80A5DAE0 E7A60010 */ swc1 $f6, 0x0010($sp) /* 027F4 80A5DAE4 260401AC */ addiu $a0, $s0, 0x01AC ## $a0 = 000001AC /* 027F8 80A5DAE8 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 027FC 80A5DAEC 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 02800 80A5DAF0 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 02804 80A5DAF4 E7A80018 */ swc1 $f8, 0x0018($sp) -/* 02808 80A5DAF8 8FBF002C */ lw $ra, 0x002C($sp) -/* 0280C 80A5DAFC 8FB00028 */ lw $s0, 0x0028($sp) +/* 02800 80A5DAF0 0C029468 */ jal SkelAnime_ChangeAnim + +/* 02804 80A5DAF4 E7A80018 */ swc1 $f8, 0x0018($sp) +/* 02808 80A5DAF8 8FBF002C */ lw $ra, 0x002C($sp) +/* 0280C 80A5DAFC 8FB00028 */ lw $s0, 0x0028($sp) /* 02810 80A5DB00 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 02814 80A5DB04 03E00008 */ jr $ra +/* 02814 80A5DB04 03E00008 */ jr $ra /* 02818 80A5DB08 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5DB0C.s b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5DB0C.s index b699365347..5a4dfa60d0 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5DB0C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5DB0C.s @@ -1,6 +1,6 @@ glabel func_80A5DB0C /* 0281C 80A5DB0C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 02820 80A5DB10 AFBF0014 */ sw $ra, 0x0014($sp) +/* 02820 80A5DB10 AFBF0014 */ sw $ra, 0x0014($sp) /* 02824 80A5DB14 240E0009 */ addiu $t6, $zero, 0x0009 ## $t6 = 00000009 /* 02828 80A5DB18 240F0005 */ addiu $t7, $zero, 0x0005 ## $t7 = 00000005 /* 0282C 80A5DB1C 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 @@ -9,14 +9,14 @@ glabel func_80A5DB0C /* 02838 80A5DB28 8CD80158 */ lw $t8, 0x0158($a2) ## 00000158 /* 0283C 80A5DB2C 3C0880A6 */ lui $t0, %hi(D_80A65E58) ## $t0 = 80A60000 /* 02840 80A5DB30 248401AC */ addiu $a0, $a0, 0x01AC ## $a0 = 000001AC -/* 02844 80A5DB34 0018C880 */ sll $t9, $t8, 2 -/* 02848 80A5DB38 01194021 */ addu $t0, $t0, $t9 -/* 0284C 80A5DB3C 8D085E58 */ lw $t0, %lo(D_80A65E58)($t0) -/* 02850 80A5DB40 0C02947A */ jal func_800A51E8 +/* 02844 80A5DB34 0018C880 */ sll $t9, $t8, 2 +/* 02848 80A5DB38 01194021 */ addu $t0, $t0, $t9 +/* 0284C 80A5DB3C 8D085E58 */ lw $t0, %lo(D_80A65E58)($t0) +/* 02850 80A5DB40 0C02947A */ jal SkelAnime_ChangeAnimDefaultStop /* 02854 80A5DB44 8D050014 */ lw $a1, 0x0014($t0) ## 80A60014 -/* 02858 80A5DB48 8FBF0014 */ lw $ra, 0x0014($sp) +/* 02858 80A5DB48 8FBF0014 */ lw $ra, 0x0014($sp) /* 0285C 80A5DB4C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 02860 80A5DB50 03E00008 */ jr $ra +/* 02860 80A5DB50 03E00008 */ jr $ra /* 02864 80A5DB54 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5DCB0.s b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5DCB0.s index d30a35d46d..b5aba5add3 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5DCB0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5DCB0.s @@ -1,47 +1,47 @@ glabel func_80A5DCB0 /* 029C0 80A5DCB0 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 029C4 80A5DCB4 AFBF002C */ sw $ra, 0x002C($sp) -/* 029C8 80A5DCB8 AFB00028 */ sw $s0, 0x0028($sp) +/* 029C4 80A5DCB4 AFBF002C */ sw $ra, 0x002C($sp) +/* 029C8 80A5DCB8 AFB00028 */ sw $s0, 0x0028($sp) /* 029CC 80A5DCBC 8C980158 */ lw $t8, 0x0158($a0) ## 00000158 /* 029D0 80A5DCC0 240E000A */ addiu $t6, $zero, 0x000A ## $t6 = 0000000A /* 029D4 80A5DCC4 240F0006 */ addiu $t7, $zero, 0x0006 ## $t7 = 00000006 /* 029D8 80A5DCC8 3C0880A6 */ lui $t0, %hi(D_80A65E58) ## $t0 = 80A60000 -/* 029DC 80A5DCCC 0018C880 */ sll $t9, $t8, 2 +/* 029DC 80A5DCCC 0018C880 */ sll $t9, $t8, 2 /* 029E0 80A5DCD0 AC8E014C */ sw $t6, 0x014C($a0) ## 0000014C /* 029E4 80A5DCD4 AC8F0210 */ sw $t7, 0x0210($a0) ## 00000210 /* 029E8 80A5DCD8 AC800234 */ sw $zero, 0x0234($a0) ## 00000234 -/* 029EC 80A5DCDC 01194021 */ addu $t0, $t0, $t9 -/* 029F0 80A5DCE0 8D085E58 */ lw $t0, %lo(D_80A65E58)($t0) +/* 029EC 80A5DCDC 01194021 */ addu $t0, $t0, $t9 +/* 029F0 80A5DCE0 8D085E58 */ lw $t0, %lo(D_80A65E58)($t0) /* 029F4 80A5DCE4 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 029F8 80A5DCE8 0C028800 */ jal SkelAnime_GetFrameCount - + /* 029FC 80A5DCEC 8D040018 */ lw $a0, 0x0018($t0) ## 80A60018 /* 02A00 80A5DCF0 8E090158 */ lw $t1, 0x0158($s0) ## 00000158 /* 02A04 80A5DCF4 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 02A08 80A5DCF8 3C0B80A6 */ lui $t3, %hi(D_80A65E58) ## $t3 = 80A60000 -/* 02A0C 80A5DCFC 00095080 */ sll $t2, $t1, 2 +/* 02A0C 80A5DCFC 00095080 */ sll $t2, $t1, 2 /* 02A10 80A5DD00 8E0C0210 */ lw $t4, 0x0210($s0) ## 00000210 -/* 02A14 80A5DD04 016A5821 */ addu $t3, $t3, $t2 -/* 02A18 80A5DD08 8D6B5E58 */ lw $t3, %lo(D_80A65E58)($t3) -/* 02A1C 80A5DD0C 468021A0 */ cvt.s.w $f6, $f4 -/* 02A20 80A5DD10 000C6880 */ sll $t5, $t4, 2 +/* 02A14 80A5DD04 016A5821 */ addu $t3, $t3, $t2 +/* 02A18 80A5DD08 8D6B5E58 */ lw $t3, %lo(D_80A65E58)($t3) +/* 02A1C 80A5DD0C 468021A0 */ cvt.s.w $f6, $f4 +/* 02A20 80A5DD10 000C6880 */ sll $t5, $t4, 2 /* 02A24 80A5DD14 3C01C040 */ lui $at, 0xC040 ## $at = C0400000 -/* 02A28 80A5DD18 016D7021 */ addu $t6, $t3, $t5 +/* 02A28 80A5DD18 016D7021 */ addu $t6, $t3, $t5 /* 02A2C 80A5DD1C 44814000 */ mtc1 $at, $f8 ## $f8 = -3.00 /* 02A30 80A5DD20 8DC50000 */ lw $a1, 0x0000($t6) ## 00000000 /* 02A34 80A5DD24 240F0002 */ addiu $t7, $zero, 0x0002 ## $t7 = 00000002 -/* 02A38 80A5DD28 AFAF0014 */ sw $t7, 0x0014($sp) -/* 02A3C 80A5DD2C E7A60010 */ swc1 $f6, 0x0010($sp) +/* 02A38 80A5DD28 AFAF0014 */ sw $t7, 0x0014($sp) +/* 02A3C 80A5DD2C E7A60010 */ swc1 $f6, 0x0010($sp) /* 02A40 80A5DD30 260401AC */ addiu $a0, $s0, 0x01AC ## $a0 = 000001AC /* 02A44 80A5DD34 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 02A48 80A5DD38 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 02A4C 80A5DD3C 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 02A50 80A5DD40 E7A80018 */ swc1 $f8, 0x0018($sp) -/* 02A54 80A5DD44 8FBF002C */ lw $ra, 0x002C($sp) -/* 02A58 80A5DD48 8FB00028 */ lw $s0, 0x0028($sp) +/* 02A4C 80A5DD3C 0C029468 */ jal SkelAnime_ChangeAnim + +/* 02A50 80A5DD40 E7A80018 */ swc1 $f8, 0x0018($sp) +/* 02A54 80A5DD44 8FBF002C */ lw $ra, 0x002C($sp) +/* 02A58 80A5DD48 8FB00028 */ lw $s0, 0x0028($sp) /* 02A5C 80A5DD4C 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 02A60 80A5DD50 03E00008 */ jr $ra +/* 02A60 80A5DD50 03E00008 */ jr $ra /* 02A64 80A5DD54 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5DD58.s b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5DD58.s index 05bda3093d..20ee508ee7 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5DD58.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5DD58.s @@ -1,6 +1,6 @@ glabel func_80A5DD58 /* 02A68 80A5DD58 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 02A6C 80A5DD5C AFBF0014 */ sw $ra, 0x0014($sp) +/* 02A6C 80A5DD5C AFBF0014 */ sw $ra, 0x0014($sp) /* 02A70 80A5DD60 240E000A */ addiu $t6, $zero, 0x000A ## $t6 = 0000000A /* 02A74 80A5DD64 240F0006 */ addiu $t7, $zero, 0x0006 ## $t7 = 00000006 /* 02A78 80A5DD68 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 @@ -12,14 +12,14 @@ glabel func_80A5DD58 /* 02A90 80A5DD80 8CD80158 */ lw $t8, 0x0158($a2) ## 00000158 /* 02A94 80A5DD84 3C0880A6 */ lui $t0, %hi(D_80A65E58) ## $t0 = 80A60000 /* 02A98 80A5DD88 248401AC */ addiu $a0, $a0, 0x01AC ## $a0 = 000001AC -/* 02A9C 80A5DD8C 0018C880 */ sll $t9, $t8, 2 -/* 02AA0 80A5DD90 01194021 */ addu $t0, $t0, $t9 -/* 02AA4 80A5DD94 8D085E58 */ lw $t0, %lo(D_80A65E58)($t0) -/* 02AA8 80A5DD98 0C02947A */ jal func_800A51E8 +/* 02A9C 80A5DD8C 0018C880 */ sll $t9, $t8, 2 +/* 02AA0 80A5DD90 01194021 */ addu $t0, $t0, $t9 +/* 02AA4 80A5DD94 8D085E58 */ lw $t0, %lo(D_80A65E58)($t0) +/* 02AA8 80A5DD98 0C02947A */ jal SkelAnime_ChangeAnimDefaultStop /* 02AAC 80A5DD9C 8D050018 */ lw $a1, 0x0018($t0) ## 80A60018 -/* 02AB0 80A5DDA0 8FBF0014 */ lw $ra, 0x0014($sp) +/* 02AB0 80A5DDA0 8FBF0014 */ lw $ra, 0x0014($sp) /* 02AB4 80A5DDA4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 02AB8 80A5DDA8 03E00008 */ jr $ra +/* 02AB8 80A5DDA8 03E00008 */ jr $ra /* 02ABC 80A5DDAC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5DDB0.s b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5DDB0.s index 1ef445772b..92b14bb3ef 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5DDB0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5DDB0.s @@ -1,7 +1,7 @@ glabel func_80A5DDB0 /* 02AC0 80A5DDB0 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 02AC4 80A5DDB4 AFBF0014 */ sw $ra, 0x0014($sp) -/* 02AC8 80A5DDB8 AFA5001C */ sw $a1, 0x001C($sp) +/* 02AC4 80A5DDB4 AFBF0014 */ sw $ra, 0x0014($sp) +/* 02AC8 80A5DDB8 AFA5001C */ sw $a1, 0x001C($sp) /* 02ACC 80A5DDBC 240E000A */ addiu $t6, $zero, 0x000A ## $t6 = 0000000A /* 02AD0 80A5DDC0 240F0006 */ addiu $t7, $zero, 0x0006 ## $t7 = 00000006 /* 02AD4 80A5DDC4 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 @@ -10,28 +10,28 @@ glabel func_80A5DDB0 /* 02AE0 80A5DDD0 8CD80158 */ lw $t8, 0x0158($a2) ## 00000158 /* 02AE4 80A5DDD4 3C0880A6 */ lui $t0, %hi(D_80A65E58) ## $t0 = 80A60000 /* 02AE8 80A5DDD8 248401AC */ addiu $a0, $a0, 0x01AC ## $a0 = 000001AC -/* 02AEC 80A5DDDC 0018C880 */ sll $t9, $t8, 2 -/* 02AF0 80A5DDE0 01194021 */ addu $t0, $t0, $t9 -/* 02AF4 80A5DDE4 8D085E58 */ lw $t0, %lo(D_80A65E58)($t0) +/* 02AEC 80A5DDDC 0018C880 */ sll $t9, $t8, 2 +/* 02AF0 80A5DDE0 01194021 */ addu $t0, $t0, $t9 +/* 02AF4 80A5DDE4 8D085E58 */ lw $t0, %lo(D_80A65E58)($t0) /* 02AF8 80A5DDE8 8D050018 */ lw $a1, 0x0018($t0) ## 80A60018 -/* 02AFC 80A5DDEC 0C02947A */ jal func_800A51E8 -/* 02B00 80A5DDF0 AFA60018 */ sw $a2, 0x0018($sp) -/* 02B04 80A5DDF4 8FA60018 */ lw $a2, 0x0018($sp) +/* 02AFC 80A5DDEC 0C02947A */ jal SkelAnime_ChangeAnimDefaultStop +/* 02B00 80A5DDF0 AFA60018 */ sw $a2, 0x0018($sp) +/* 02B04 80A5DDF4 8FA60018 */ lw $a2, 0x0018($sp) /* 02B08 80A5DDF8 3C0180A6 */ lui $at, %hi(D_80A668C0) ## $at = 80A60000 -/* 02B0C 80A5DDFC C42868C0 */ lwc1 $f8, %lo(D_80A668C0)($at) +/* 02B0C 80A5DDFC C42868C0 */ lwc1 $f8, %lo(D_80A668C0)($at) /* 02B10 80A5DE00 8CC201CC */ lw $v0, 0x01CC($a2) ## 000001CC /* 02B14 80A5DE04 C4C6025C */ lwc1 $f6, 0x025C($a2) ## 0000025C /* 02B18 80A5DE08 84490002 */ lh $t1, 0x0002($v0) ## 00000002 /* 02B1C 80A5DE0C ACC00244 */ sw $zero, 0x0244($a2) ## 00000244 /* 02B20 80A5DE10 44892000 */ mtc1 $t1, $f4 ## $f4 = 0.00 /* 02B24 80A5DE14 00000000 */ nop -/* 02B28 80A5DE18 46802020 */ cvt.s.w $f0, $f4 -/* 02B2C 80A5DE1C 46080282 */ mul.s $f10, $f0, $f8 -/* 02B30 80A5DE20 460A3400 */ add.s $f16, $f6, $f10 +/* 02B28 80A5DE18 46802020 */ cvt.s.w $f0, $f4 +/* 02B2C 80A5DE1C 46080282 */ mul.s $f10, $f0, $f8 +/* 02B30 80A5DE20 460A3400 */ add.s $f16, $f6, $f10 /* 02B34 80A5DE24 E4D0025C */ swc1 $f16, 0x025C($a2) ## 0000025C -/* 02B38 80A5DE28 8FBF0014 */ lw $ra, 0x0014($sp) +/* 02B38 80A5DE28 8FBF0014 */ lw $ra, 0x0014($sp) /* 02B3C 80A5DE2C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 02B40 80A5DE30 03E00008 */ jr $ra +/* 02B40 80A5DE30 03E00008 */ jr $ra /* 02B44 80A5DE34 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5E00C.s b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5E00C.s index 19388ff139..f3d13f0335 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5E00C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5E00C.s @@ -1,13 +1,13 @@ glabel func_80A5E00C /* 02D1C 80A5E00C 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 02D20 80A5E010 AFBF002C */ sw $ra, 0x002C($sp) -/* 02D24 80A5E014 AFB00028 */ sw $s0, 0x0028($sp) +/* 02D20 80A5E010 AFBF002C */ sw $ra, 0x002C($sp) +/* 02D24 80A5E014 AFB00028 */ sw $s0, 0x0028($sp) /* 02D28 80A5E018 8C9801F0 */ lw $t8, 0x01F0($a0) ## 000001F0 /* 02D2C 80A5E01C 8C890228 */ lw $t1, 0x0228($a0) ## 00000228 /* 02D30 80A5E020 2401F7FF */ addiu $at, $zero, 0xF7FF ## $at = FFFFF7FF /* 02D34 80A5E024 240E000B */ addiu $t6, $zero, 0x000B ## $t6 = 0000000B /* 02D38 80A5E028 240F0003 */ addiu $t7, $zero, 0x0003 ## $t7 = 00000003 -/* 02D3C 80A5E02C 0301C824 */ and $t9, $t8, $at +/* 02D3C 80A5E02C 0301C824 */ and $t9, $t8, $at /* 02D40 80A5E030 AC8E014C */ sw $t6, 0x014C($a0) ## 0000014C /* 02D44 80A5E034 AC8F0210 */ sw $t7, 0x0210($a0) ## 00000210 /* 02D48 80A5E038 AC9901F0 */ sw $t9, 0x01F0($a0) ## 000001F0 @@ -24,56 +24,56 @@ glabel func_80A5E00C /* 02D74 80A5E064 8C8A01F0 */ lw $t2, 0x01F0($a0) ## 000001F0 /* 02D78 80A5E068 24042805 */ addiu $a0, $zero, 0x2805 ## $a0 = 00002805 /* 02D7C 80A5E06C 258C33E8 */ addiu $t4, $t4, 0x33E8 ## $t4 = 801333E8 -/* 02D80 80A5E070 000A5900 */ sll $t3, $t2, 4 -/* 02D84 80A5E074 05610004 */ bgez $t3, .L80A5E088 +/* 02D80 80A5E070 000A5900 */ sll $t3, $t2, 4 +/* 02D84 80A5E074 05610004 */ bgez $t3, .L80A5E088 /* 02D88 80A5E078 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 -/* 02D8C 80A5E07C AFA70010 */ sw $a3, 0x0010($sp) +/* 02D8C 80A5E07C AFA70010 */ sw $a3, 0x0010($sp) /* 02D90 80A5E080 0C03DCE3 */ jal Audio_PlaySoundGeneral - -/* 02D94 80A5E084 AFAC0014 */ sw $t4, 0x0014($sp) + +/* 02D94 80A5E084 AFAC0014 */ sw $t4, 0x0014($sp) .L80A5E088: /* 02D98 80A5E088 44806000 */ mtc1 $zero, $f12 ## $f12 = 0.00 /* 02D9C 80A5E08C 240500B4 */ addiu $a1, $zero, 0x00B4 ## $a1 = 000000B4 /* 02DA0 80A5E090 24060014 */ addiu $a2, $zero, 0x0014 ## $a2 = 00000014 -/* 02DA4 80A5E094 0C02A800 */ jal func_800AA000 +/* 02DA4 80A5E094 0C02A800 */ jal func_800AA000 /* 02DA8 80A5E098 24070064 */ addiu $a3, $zero, 0x0064 ## $a3 = 00000064 /* 02DAC 80A5E09C 8E0D0158 */ lw $t5, 0x0158($s0) ## 00000158 /* 02DB0 80A5E0A0 3C0F80A6 */ lui $t7, %hi(D_80A65E58) ## $t7 = 80A60000 /* 02DB4 80A5E0A4 8E180210 */ lw $t8, 0x0210($s0) ## 00000210 -/* 02DB8 80A5E0A8 000D7080 */ sll $t6, $t5, 2 -/* 02DBC 80A5E0AC 01EE7821 */ addu $t7, $t7, $t6 -/* 02DC0 80A5E0B0 8DEF5E58 */ lw $t7, %lo(D_80A65E58)($t7) -/* 02DC4 80A5E0B4 0018C880 */ sll $t9, $t8, 2 -/* 02DC8 80A5E0B8 01F94021 */ addu $t0, $t7, $t9 +/* 02DB8 80A5E0A8 000D7080 */ sll $t6, $t5, 2 +/* 02DBC 80A5E0AC 01EE7821 */ addu $t7, $t7, $t6 +/* 02DC0 80A5E0B0 8DEF5E58 */ lw $t7, %lo(D_80A65E58)($t7) +/* 02DC4 80A5E0B4 0018C880 */ sll $t9, $t8, 2 +/* 02DC8 80A5E0B8 01F94021 */ addu $t0, $t7, $t9 /* 02DCC 80A5E0BC 0C028800 */ jal SkelAnime_GetFrameCount - + /* 02DD0 80A5E0C0 8D040000 */ lw $a0, 0x0000($t0) ## 00000000 /* 02DD4 80A5E0C4 8E090158 */ lw $t1, 0x0158($s0) ## 00000158 /* 02DD8 80A5E0C8 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 02DDC 80A5E0CC 3C0B80A6 */ lui $t3, %hi(D_80A65E58) ## $t3 = 80A60000 -/* 02DE0 80A5E0D0 00095080 */ sll $t2, $t1, 2 +/* 02DE0 80A5E0D0 00095080 */ sll $t2, $t1, 2 /* 02DE4 80A5E0D4 8E0C0210 */ lw $t4, 0x0210($s0) ## 00000210 -/* 02DE8 80A5E0D8 016A5821 */ addu $t3, $t3, $t2 -/* 02DEC 80A5E0DC 8D6B5E58 */ lw $t3, %lo(D_80A65E58)($t3) -/* 02DF0 80A5E0E0 468021A0 */ cvt.s.w $f6, $f4 -/* 02DF4 80A5E0E4 000C6880 */ sll $t5, $t4, 2 +/* 02DE8 80A5E0D8 016A5821 */ addu $t3, $t3, $t2 +/* 02DEC 80A5E0DC 8D6B5E58 */ lw $t3, %lo(D_80A65E58)($t3) +/* 02DF0 80A5E0E0 468021A0 */ cvt.s.w $f6, $f4 +/* 02DF4 80A5E0E4 000C6880 */ sll $t5, $t4, 2 /* 02DF8 80A5E0E8 3C01C040 */ lui $at, 0xC040 ## $at = C0400000 -/* 02DFC 80A5E0EC 016D7021 */ addu $t6, $t3, $t5 +/* 02DFC 80A5E0EC 016D7021 */ addu $t6, $t3, $t5 /* 02E00 80A5E0F0 44814000 */ mtc1 $at, $f8 ## $f8 = -3.00 /* 02E04 80A5E0F4 8DC50000 */ lw $a1, 0x0000($t6) ## 00000000 /* 02E08 80A5E0F8 24180002 */ addiu $t8, $zero, 0x0002 ## $t8 = 00000002 -/* 02E0C 80A5E0FC AFB80014 */ sw $t8, 0x0014($sp) -/* 02E10 80A5E100 E7A60010 */ swc1 $f6, 0x0010($sp) +/* 02E0C 80A5E0FC AFB80014 */ sw $t8, 0x0014($sp) +/* 02E10 80A5E100 E7A60010 */ swc1 $f6, 0x0010($sp) /* 02E14 80A5E104 260401AC */ addiu $a0, $s0, 0x01AC ## $a0 = 000001AC /* 02E18 80A5E108 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 02E1C 80A5E10C 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 02E20 80A5E110 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 02E24 80A5E114 E7A80018 */ swc1 $f8, 0x0018($sp) -/* 02E28 80A5E118 8FBF002C */ lw $ra, 0x002C($sp) -/* 02E2C 80A5E11C 8FB00028 */ lw $s0, 0x0028($sp) +/* 02E20 80A5E110 0C029468 */ jal SkelAnime_ChangeAnim + +/* 02E24 80A5E114 E7A80018 */ swc1 $f8, 0x0018($sp) +/* 02E28 80A5E118 8FBF002C */ lw $ra, 0x002C($sp) +/* 02E2C 80A5E11C 8FB00028 */ lw $s0, 0x0028($sp) /* 02E30 80A5E120 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 02E34 80A5E124 03E00008 */ jr $ra +/* 02E34 80A5E124 03E00008 */ jr $ra /* 02E38 80A5E128 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5E2A8.s b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5E2A8.s index cd04d247b8..3a9d8926a1 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5E2A8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5E2A8.s @@ -1,8 +1,8 @@ glabel func_80A5E2A8 /* 02FB8 80A5E2A8 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 02FBC 80A5E2AC AFBF002C */ sw $ra, 0x002C($sp) -/* 02FC0 80A5E2B0 AFB00028 */ sw $s0, 0x0028($sp) -/* 02FC4 80A5E2B4 AFA50034 */ sw $a1, 0x0034($sp) +/* 02FBC 80A5E2AC AFBF002C */ sw $ra, 0x002C($sp) +/* 02FC0 80A5E2B0 AFB00028 */ sw $s0, 0x0028($sp) +/* 02FC4 80A5E2B4 AFA50034 */ sw $a1, 0x0034($sp) /* 02FC8 80A5E2B8 240E000C */ addiu $t6, $zero, 0x000C ## $t6 = 0000000C /* 02FCC 80A5E2BC 240F0002 */ addiu $t7, $zero, 0x0002 ## $t7 = 00000002 /* 02FD0 80A5E2C0 3C078013 */ lui $a3, 0x8013 ## $a3 = 80130000 @@ -12,56 +12,56 @@ glabel func_80A5E2A8 /* 02FE0 80A5E2D0 24E733E0 */ addiu $a3, $a3, 0x33E0 ## $a3 = 801333E0 /* 02FE4 80A5E2D4 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 02FE8 80A5E2D8 271833E8 */ addiu $t8, $t8, 0x33E8 ## $t8 = 801333E8 -/* 02FEC 80A5E2DC AFB80014 */ sw $t8, 0x0014($sp) +/* 02FEC 80A5E2DC AFB80014 */ sw $t8, 0x0014($sp) /* 02FF0 80A5E2E0 260500E4 */ addiu $a1, $s0, 0x00E4 ## $a1 = 000000E4 /* 02FF4 80A5E2E4 2404281A */ addiu $a0, $zero, 0x281A ## $a0 = 0000281A -/* 02FF8 80A5E2E8 AFA70010 */ sw $a3, 0x0010($sp) +/* 02FF8 80A5E2E8 AFA70010 */ sw $a3, 0x0010($sp) /* 02FFC 80A5E2EC 0C03DCE3 */ jal Audio_PlaySoundGeneral - + /* 03000 80A5E2F0 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 /* 03004 80A5E2F4 8E190158 */ lw $t9, 0x0158($s0) ## 00000158 /* 03008 80A5E2F8 3C0980A6 */ lui $t1, %hi(D_80A65E58) ## $t1 = 80A60000 /* 0300C 80A5E2FC 8E0A0210 */ lw $t2, 0x0210($s0) ## 00000210 -/* 03010 80A5E300 00194080 */ sll $t0, $t9, 2 -/* 03014 80A5E304 01284821 */ addu $t1, $t1, $t0 -/* 03018 80A5E308 8D295E58 */ lw $t1, %lo(D_80A65E58)($t1) -/* 0301C 80A5E30C 000A5880 */ sll $t3, $t2, 2 -/* 03020 80A5E310 012B6021 */ addu $t4, $t1, $t3 +/* 03010 80A5E300 00194080 */ sll $t0, $t9, 2 +/* 03014 80A5E304 01284821 */ addu $t1, $t1, $t0 +/* 03018 80A5E308 8D295E58 */ lw $t1, %lo(D_80A65E58)($t1) +/* 0301C 80A5E30C 000A5880 */ sll $t3, $t2, 2 +/* 03020 80A5E310 012B6021 */ addu $t4, $t1, $t3 /* 03024 80A5E314 0C028800 */ jal SkelAnime_GetFrameCount - + /* 03028 80A5E318 8D840000 */ lw $a0, 0x0000($t4) ## 00000000 /* 0302C 80A5E31C 8E0D0158 */ lw $t5, 0x0158($s0) ## 00000158 /* 03030 80A5E320 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 03034 80A5E324 3C0F80A6 */ lui $t7, %hi(D_80A65E58) ## $t7 = 80A60000 -/* 03038 80A5E328 000D7080 */ sll $t6, $t5, 2 +/* 03038 80A5E328 000D7080 */ sll $t6, $t5, 2 /* 0303C 80A5E32C 8E180210 */ lw $t8, 0x0210($s0) ## 00000210 -/* 03040 80A5E330 01EE7821 */ addu $t7, $t7, $t6 -/* 03044 80A5E334 8DEF5E58 */ lw $t7, %lo(D_80A65E58)($t7) -/* 03048 80A5E338 468021A0 */ cvt.s.w $f6, $f4 -/* 0304C 80A5E33C 0018C880 */ sll $t9, $t8, 2 +/* 03040 80A5E330 01EE7821 */ addu $t7, $t7, $t6 +/* 03044 80A5E334 8DEF5E58 */ lw $t7, %lo(D_80A65E58)($t7) +/* 03048 80A5E338 468021A0 */ cvt.s.w $f6, $f4 +/* 0304C 80A5E33C 0018C880 */ sll $t9, $t8, 2 /* 03050 80A5E340 3C01C040 */ lui $at, 0xC040 ## $at = C0400000 -/* 03054 80A5E344 01F94021 */ addu $t0, $t7, $t9 +/* 03054 80A5E344 01F94021 */ addu $t0, $t7, $t9 /* 03058 80A5E348 44814000 */ mtc1 $at, $f8 ## $f8 = -3.00 /* 0305C 80A5E34C 8D050000 */ lw $a1, 0x0000($t0) ## 00000000 /* 03060 80A5E350 240A0002 */ addiu $t2, $zero, 0x0002 ## $t2 = 00000002 -/* 03064 80A5E354 AFAA0014 */ sw $t2, 0x0014($sp) -/* 03068 80A5E358 E7A60010 */ swc1 $f6, 0x0010($sp) +/* 03064 80A5E354 AFAA0014 */ sw $t2, 0x0014($sp) +/* 03068 80A5E358 E7A60010 */ swc1 $f6, 0x0010($sp) /* 0306C 80A5E35C 260401AC */ addiu $a0, $s0, 0x01AC ## $a0 = 000001AC /* 03070 80A5E360 3C063FC0 */ lui $a2, 0x3FC0 ## $a2 = 3FC00000 /* 03074 80A5E364 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 03078 80A5E368 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 0307C 80A5E36C E7A80018 */ swc1 $f8, 0x0018($sp) +/* 03078 80A5E368 0C029468 */ jal SkelAnime_ChangeAnim + +/* 0307C 80A5E36C E7A80018 */ swc1 $f8, 0x0018($sp) /* 03080 80A5E370 8E0901F0 */ lw $t1, 0x01F0($s0) ## 000001F0 /* 03084 80A5E374 2401FFFE */ addiu $at, $zero, 0xFFFE ## $at = FFFFFFFE /* 03088 80A5E378 352B0400 */ ori $t3, $t1, 0x0400 ## $t3 = 00000400 /* 0308C 80A5E37C AE0B01F0 */ sw $t3, 0x01F0($s0) ## 000001F0 -/* 03090 80A5E380 01616824 */ and $t5, $t3, $at +/* 03090 80A5E380 01616824 */ and $t5, $t3, $at /* 03094 80A5E384 AE0D01F0 */ sw $t5, 0x01F0($s0) ## 000001F0 -/* 03098 80A5E388 8FBF002C */ lw $ra, 0x002C($sp) -/* 0309C 80A5E38C 8FB00028 */ lw $s0, 0x0028($sp) +/* 03098 80A5E388 8FBF002C */ lw $ra, 0x002C($sp) +/* 0309C 80A5E38C 8FB00028 */ lw $s0, 0x0028($sp) /* 030A0 80A5E390 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 030A4 80A5E394 03E00008 */ jr $ra +/* 030A4 80A5E394 03E00008 */ jr $ra /* 030A8 80A5E398 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5E5AC.s b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5E5AC.s index 133c4f3179..81056c7529 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5E5AC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5E5AC.s @@ -1,46 +1,46 @@ glabel func_80A5E5AC /* 032BC 80A5E5AC 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 032C0 80A5E5B0 AFBF002C */ sw $ra, 0x002C($sp) -/* 032C4 80A5E5B4 AFB00028 */ sw $s0, 0x0028($sp) +/* 032C0 80A5E5B0 AFBF002C */ sw $ra, 0x002C($sp) +/* 032C4 80A5E5B4 AFB00028 */ sw $s0, 0x0028($sp) /* 032C8 80A5E5B8 8C980158 */ lw $t8, 0x0158($a0) ## 00000158 /* 032CC 80A5E5BC 240E000D */ addiu $t6, $zero, 0x000D ## $t6 = 0000000D /* 032D0 80A5E5C0 240F0004 */ addiu $t7, $zero, 0x0004 ## $t7 = 00000004 /* 032D4 80A5E5C4 3C0880A6 */ lui $t0, %hi(D_80A65E58) ## $t0 = 80A60000 -/* 032D8 80A5E5C8 0018C880 */ sll $t9, $t8, 2 +/* 032D8 80A5E5C8 0018C880 */ sll $t9, $t8, 2 /* 032DC 80A5E5CC AC8E014C */ sw $t6, 0x014C($a0) ## 0000014C /* 032E0 80A5E5D0 AC8F0210 */ sw $t7, 0x0210($a0) ## 00000210 /* 032E4 80A5E5D4 AC800218 */ sw $zero, 0x0218($a0) ## 00000218 -/* 032E8 80A5E5D8 01194021 */ addu $t0, $t0, $t9 -/* 032EC 80A5E5DC 8D085E58 */ lw $t0, %lo(D_80A65E58)($t0) +/* 032E8 80A5E5D8 01194021 */ addu $t0, $t0, $t9 +/* 032EC 80A5E5DC 8D085E58 */ lw $t0, %lo(D_80A65E58)($t0) /* 032F0 80A5E5E0 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 032F4 80A5E5E4 0C028800 */ jal SkelAnime_GetFrameCount - + /* 032F8 80A5E5E8 8D040010 */ lw $a0, 0x0010($t0) ## 80A60010 /* 032FC 80A5E5EC 8E090158 */ lw $t1, 0x0158($s0) ## 00000158 /* 03300 80A5E5F0 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 03304 80A5E5F4 3C0B80A6 */ lui $t3, %hi(D_80A65E58) ## $t3 = 80A60000 -/* 03308 80A5E5F8 00095080 */ sll $t2, $t1, 2 +/* 03308 80A5E5F8 00095080 */ sll $t2, $t1, 2 /* 0330C 80A5E5FC 8E0C0210 */ lw $t4, 0x0210($s0) ## 00000210 -/* 03310 80A5E600 016A5821 */ addu $t3, $t3, $t2 -/* 03314 80A5E604 8D6B5E58 */ lw $t3, %lo(D_80A65E58)($t3) -/* 03318 80A5E608 468021A0 */ cvt.s.w $f6, $f4 -/* 0331C 80A5E60C 000C6880 */ sll $t5, $t4, 2 +/* 03310 80A5E600 016A5821 */ addu $t3, $t3, $t2 +/* 03314 80A5E604 8D6B5E58 */ lw $t3, %lo(D_80A65E58)($t3) +/* 03318 80A5E608 468021A0 */ cvt.s.w $f6, $f4 +/* 0331C 80A5E60C 000C6880 */ sll $t5, $t4, 2 /* 03320 80A5E610 3C01C040 */ lui $at, 0xC040 ## $at = C0400000 -/* 03324 80A5E614 016D7021 */ addu $t6, $t3, $t5 +/* 03324 80A5E614 016D7021 */ addu $t6, $t3, $t5 /* 03328 80A5E618 44814000 */ mtc1 $at, $f8 ## $f8 = -3.00 /* 0332C 80A5E61C 8DC50000 */ lw $a1, 0x0000($t6) ## 00000000 -/* 03330 80A5E620 AFA00014 */ sw $zero, 0x0014($sp) -/* 03334 80A5E624 E7A60010 */ swc1 $f6, 0x0010($sp) +/* 03330 80A5E620 AFA00014 */ sw $zero, 0x0014($sp) +/* 03334 80A5E624 E7A60010 */ swc1 $f6, 0x0010($sp) /* 03338 80A5E628 260401AC */ addiu $a0, $s0, 0x01AC ## $a0 = 000001AC /* 0333C 80A5E62C 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 03340 80A5E630 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 03344 80A5E634 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 03348 80A5E638 E7A80018 */ swc1 $f8, 0x0018($sp) -/* 0334C 80A5E63C 8FBF002C */ lw $ra, 0x002C($sp) -/* 03350 80A5E640 8FB00028 */ lw $s0, 0x0028($sp) +/* 03344 80A5E634 0C029468 */ jal SkelAnime_ChangeAnim + +/* 03348 80A5E638 E7A80018 */ swc1 $f8, 0x0018($sp) +/* 0334C 80A5E63C 8FBF002C */ lw $ra, 0x002C($sp) +/* 03350 80A5E640 8FB00028 */ lw $s0, 0x0028($sp) /* 03354 80A5E644 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 03358 80A5E648 03E00008 */ jr $ra +/* 03358 80A5E648 03E00008 */ jr $ra /* 0335C 80A5E64C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5EA1C.s b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5EA1C.s index fdaf1d8355..51943f6a7a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5EA1C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5EA1C.s @@ -1,45 +1,45 @@ glabel func_80A5EA1C /* 0372C 80A5EA1C 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 03730 80A5EA20 AFBF002C */ sw $ra, 0x002C($sp) -/* 03734 80A5EA24 AFB00028 */ sw $s0, 0x0028($sp) -/* 03738 80A5EA28 AFA5003C */ sw $a1, 0x003C($sp) +/* 03730 80A5EA20 AFBF002C */ sw $ra, 0x002C($sp) +/* 03734 80A5EA24 AFB00028 */ sw $s0, 0x0028($sp) +/* 03738 80A5EA28 AFA5003C */ sw $a1, 0x003C($sp) /* 0373C 80A5EA2C C48401C4 */ lwc1 $f4, 0x01C4($a0) ## 000001C4 /* 03740 80A5EA30 240E000E */ addiu $t6, $zero, 0x000E ## $t6 = 0000000E /* 03744 80A5EA34 240F0007 */ addiu $t7, $zero, 0x0007 ## $t7 = 00000007 /* 03748 80A5EA38 AC8E014C */ sw $t6, 0x014C($a0) ## 0000014C /* 0374C 80A5EA3C AC8F0210 */ sw $t7, 0x0210($a0) ## 00000210 -/* 03750 80A5EA40 E7A40034 */ swc1 $f4, 0x0034($sp) +/* 03750 80A5EA40 E7A40034 */ swc1 $f4, 0x0034($sp) /* 03754 80A5EA44 8C980158 */ lw $t8, 0x0158($a0) ## 00000158 /* 03758 80A5EA48 3C0880A6 */ lui $t0, %hi(D_80A65E58) ## $t0 = 80A60000 /* 0375C 80A5EA4C 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 03760 80A5EA50 0018C880 */ sll $t9, $t8, 2 -/* 03764 80A5EA54 01194021 */ addu $t0, $t0, $t9 -/* 03768 80A5EA58 8D085E58 */ lw $t0, %lo(D_80A65E58)($t0) +/* 03760 80A5EA50 0018C880 */ sll $t9, $t8, 2 +/* 03764 80A5EA54 01194021 */ addu $t0, $t0, $t9 +/* 03768 80A5EA58 8D085E58 */ lw $t0, %lo(D_80A65E58)($t0) /* 0376C 80A5EA5C 0C028800 */ jal SkelAnime_GetFrameCount - + /* 03770 80A5EA60 8D04001C */ lw $a0, 0x001C($t0) ## 80A6001C /* 03774 80A5EA64 8E090158 */ lw $t1, 0x0158($s0) ## 00000158 /* 03778 80A5EA68 44823000 */ mtc1 $v0, $f6 ## $f6 = 0.00 /* 0377C 80A5EA6C 3C0B80A6 */ lui $t3, %hi(D_80A65E58) ## $t3 = 80A60000 -/* 03780 80A5EA70 00095080 */ sll $t2, $t1, 2 +/* 03780 80A5EA70 00095080 */ sll $t2, $t1, 2 /* 03784 80A5EA74 8E0C0210 */ lw $t4, 0x0210($s0) ## 00000210 -/* 03788 80A5EA78 016A5821 */ addu $t3, $t3, $t2 -/* 0378C 80A5EA7C 8D6B5E58 */ lw $t3, %lo(D_80A65E58)($t3) -/* 03790 80A5EA80 46803220 */ cvt.s.w $f8, $f6 -/* 03794 80A5EA84 000C6880 */ sll $t5, $t4, 2 +/* 03788 80A5EA78 016A5821 */ addu $t3, $t3, $t2 +/* 0378C 80A5EA7C 8D6B5E58 */ lw $t3, %lo(D_80A65E58)($t3) +/* 03790 80A5EA80 46803220 */ cvt.s.w $f8, $f6 +/* 03794 80A5EA84 000C6880 */ sll $t5, $t4, 2 /* 03798 80A5EA88 3C01C040 */ lui $at, 0xC040 ## $at = C0400000 -/* 0379C 80A5EA8C 016D7021 */ addu $t6, $t3, $t5 +/* 0379C 80A5EA8C 016D7021 */ addu $t6, $t3, $t5 /* 037A0 80A5EA90 44815000 */ mtc1 $at, $f10 ## $f10 = -3.00 /* 037A4 80A5EA94 8DC50000 */ lw $a1, 0x0000($t6) ## 00000000 /* 037A8 80A5EA98 240F0002 */ addiu $t7, $zero, 0x0002 ## $t7 = 00000002 -/* 037AC 80A5EA9C AFAF0014 */ sw $t7, 0x0014($sp) -/* 037B0 80A5EAA0 E7A80010 */ swc1 $f8, 0x0010($sp) +/* 037AC 80A5EA9C AFAF0014 */ sw $t7, 0x0014($sp) +/* 037B0 80A5EAA0 E7A80010 */ swc1 $f8, 0x0010($sp) /* 037B4 80A5EAA4 260401AC */ addiu $a0, $s0, 0x01AC ## $a0 = 000001AC /* 037B8 80A5EAA8 3C063FC0 */ lui $a2, 0x3FC0 ## $a2 = 3FC00000 -/* 037BC 80A5EAAC 8FA70034 */ lw $a3, 0x0034($sp) -/* 037C0 80A5EAB0 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 037C4 80A5EAB4 E7AA0018 */ swc1 $f10, 0x0018($sp) +/* 037BC 80A5EAAC 8FA70034 */ lw $a3, 0x0034($sp) +/* 037C0 80A5EAB0 0C029468 */ jal SkelAnime_ChangeAnim + +/* 037C4 80A5EAB4 E7AA0018 */ swc1 $f10, 0x0018($sp) /* 037C8 80A5EAB8 C6100028 */ lwc1 $f16, 0x0028($s0) ## 00000028 /* 037CC 80A5EABC 44809000 */ mtc1 $zero, $f18 ## $f18 = 0.00 /* 037D0 80A5EAC0 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 @@ -50,33 +50,33 @@ glabel func_80A5EA1C /* 037E4 80A5EAD4 E6040060 */ swc1 $f4, 0x0060($s0) ## 00000060 /* 037E8 80A5EAD8 84580002 */ lh $t8, 0x0002($v0) ## 00000002 /* 037EC 80A5EADC 3C0180A6 */ lui $at, %hi(D_80A668D0) ## $at = 80A60000 -/* 037F0 80A5EAE0 C42A68D0 */ lwc1 $f10, %lo(D_80A668D0)($at) +/* 037F0 80A5EAE0 C42A68D0 */ lwc1 $f10, %lo(D_80A668D0)($at) /* 037F4 80A5EAE4 44983000 */ mtc1 $t8, $f6 ## $f6 = 0.00 /* 037F8 80A5EAE8 C608025C */ lwc1 $f8, 0x025C($s0) ## 0000025C /* 037FC 80A5EAEC 3C078013 */ lui $a3, 0x8013 ## $a3 = 80130000 -/* 03800 80A5EAF0 46803020 */ cvt.s.w $f0, $f6 +/* 03800 80A5EAF0 46803020 */ cvt.s.w $f0, $f6 /* 03804 80A5EAF4 3C198013 */ lui $t9, 0x8013 ## $t9 = 80130000 /* 03808 80A5EAF8 24E733E0 */ addiu $a3, $a3, 0x33E0 ## $a3 = 801333E0 /* 0380C 80A5EAFC 273933E8 */ addiu $t9, $t9, 0x33E8 ## $t9 = 801333E8 /* 03810 80A5EB00 24042818 */ addiu $a0, $zero, 0x2818 ## $a0 = 00002818 /* 03814 80A5EB04 260500E4 */ addiu $a1, $s0, 0x00E4 ## $a1 = 000000E4 -/* 03818 80A5EB08 460A0402 */ mul.s $f16, $f0, $f10 +/* 03818 80A5EB08 460A0402 */ mul.s $f16, $f0, $f10 /* 0381C 80A5EB0C 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 -/* 03820 80A5EB10 46104481 */ sub.s $f18, $f8, $f16 +/* 03820 80A5EB10 46104481 */ sub.s $f18, $f8, $f16 /* 03824 80A5EB14 E612025C */ swc1 $f18, 0x025C($s0) ## 0000025C -/* 03828 80A5EB18 AFB90014 */ sw $t9, 0x0014($sp) +/* 03828 80A5EB18 AFB90014 */ sw $t9, 0x0014($sp) /* 0382C 80A5EB1C 0C03DCE3 */ jal Audio_PlaySoundGeneral - -/* 03830 80A5EB20 AFA70010 */ sw $a3, 0x0010($sp) + +/* 03830 80A5EB20 AFA70010 */ sw $a3, 0x0010($sp) /* 03834 80A5EB24 44806000 */ mtc1 $zero, $f12 ## $f12 = 0.00 /* 03838 80A5EB28 240500AA */ addiu $a1, $zero, 0x00AA ## $a1 = 000000AA /* 0383C 80A5EB2C 2406000A */ addiu $a2, $zero, 0x000A ## $a2 = 0000000A -/* 03840 80A5EB30 0C02A800 */ jal func_800AA000 +/* 03840 80A5EB30 0C02A800 */ jal func_800AA000 /* 03844 80A5EB34 2407000A */ addiu $a3, $zero, 0x000A ## $a3 = 0000000A -/* 03848 80A5EB38 8FBF002C */ lw $ra, 0x002C($sp) -/* 0384C 80A5EB3C 8FB00028 */ lw $s0, 0x0028($sp) +/* 03848 80A5EB38 8FBF002C */ lw $ra, 0x002C($sp) +/* 0384C 80A5EB3C 8FB00028 */ lw $s0, 0x0028($sp) /* 03850 80A5EB40 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 -/* 03854 80A5EB44 03E00008 */ jr $ra +/* 03854 80A5EB44 03E00008 */ jr $ra /* 03858 80A5EB48 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5ED3C.s b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5ED3C.s index 0e30770c57..c5bd5ffb2f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5ED3C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5ED3C.s @@ -1,45 +1,45 @@ glabel func_80A5ED3C /* 03A4C 80A5ED3C 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 03A50 80A5ED40 AFBF002C */ sw $ra, 0x002C($sp) -/* 03A54 80A5ED44 AFB00028 */ sw $s0, 0x0028($sp) -/* 03A58 80A5ED48 AFA5003C */ sw $a1, 0x003C($sp) +/* 03A50 80A5ED40 AFBF002C */ sw $ra, 0x002C($sp) +/* 03A54 80A5ED44 AFB00028 */ sw $s0, 0x0028($sp) +/* 03A58 80A5ED48 AFA5003C */ sw $a1, 0x003C($sp) /* 03A5C 80A5ED4C C48401C4 */ lwc1 $f4, 0x01C4($a0) ## 000001C4 /* 03A60 80A5ED50 240E000F */ addiu $t6, $zero, 0x000F ## $t6 = 0000000F /* 03A64 80A5ED54 240F0008 */ addiu $t7, $zero, 0x0008 ## $t7 = 00000008 /* 03A68 80A5ED58 AC8E014C */ sw $t6, 0x014C($a0) ## 0000014C /* 03A6C 80A5ED5C AC8F0210 */ sw $t7, 0x0210($a0) ## 00000210 -/* 03A70 80A5ED60 E7A40034 */ swc1 $f4, 0x0034($sp) +/* 03A70 80A5ED60 E7A40034 */ swc1 $f4, 0x0034($sp) /* 03A74 80A5ED64 8C980158 */ lw $t8, 0x0158($a0) ## 00000158 /* 03A78 80A5ED68 3C0880A6 */ lui $t0, %hi(D_80A65E58) ## $t0 = 80A60000 /* 03A7C 80A5ED6C 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 03A80 80A5ED70 0018C880 */ sll $t9, $t8, 2 -/* 03A84 80A5ED74 01194021 */ addu $t0, $t0, $t9 -/* 03A88 80A5ED78 8D085E58 */ lw $t0, %lo(D_80A65E58)($t0) +/* 03A80 80A5ED70 0018C880 */ sll $t9, $t8, 2 +/* 03A84 80A5ED74 01194021 */ addu $t0, $t0, $t9 +/* 03A88 80A5ED78 8D085E58 */ lw $t0, %lo(D_80A65E58)($t0) /* 03A8C 80A5ED7C 0C028800 */ jal SkelAnime_GetFrameCount - + /* 03A90 80A5ED80 8D040020 */ lw $a0, 0x0020($t0) ## 80A60020 /* 03A94 80A5ED84 8E090158 */ lw $t1, 0x0158($s0) ## 00000158 /* 03A98 80A5ED88 44823000 */ mtc1 $v0, $f6 ## $f6 = 0.00 /* 03A9C 80A5ED8C 3C0B80A6 */ lui $t3, %hi(D_80A65E58) ## $t3 = 80A60000 -/* 03AA0 80A5ED90 00095080 */ sll $t2, $t1, 2 +/* 03AA0 80A5ED90 00095080 */ sll $t2, $t1, 2 /* 03AA4 80A5ED94 8E0C0210 */ lw $t4, 0x0210($s0) ## 00000210 -/* 03AA8 80A5ED98 016A5821 */ addu $t3, $t3, $t2 -/* 03AAC 80A5ED9C 8D6B5E58 */ lw $t3, %lo(D_80A65E58)($t3) -/* 03AB0 80A5EDA0 46803220 */ cvt.s.w $f8, $f6 -/* 03AB4 80A5EDA4 000C6880 */ sll $t5, $t4, 2 +/* 03AA8 80A5ED98 016A5821 */ addu $t3, $t3, $t2 +/* 03AAC 80A5ED9C 8D6B5E58 */ lw $t3, %lo(D_80A65E58)($t3) +/* 03AB0 80A5EDA0 46803220 */ cvt.s.w $f8, $f6 +/* 03AB4 80A5EDA4 000C6880 */ sll $t5, $t4, 2 /* 03AB8 80A5EDA8 3C01C040 */ lui $at, 0xC040 ## $at = C0400000 -/* 03ABC 80A5EDAC 016D7021 */ addu $t6, $t3, $t5 +/* 03ABC 80A5EDAC 016D7021 */ addu $t6, $t3, $t5 /* 03AC0 80A5EDB0 44815000 */ mtc1 $at, $f10 ## $f10 = -3.00 /* 03AC4 80A5EDB4 8DC50000 */ lw $a1, 0x0000($t6) ## 00000000 /* 03AC8 80A5EDB8 240F0002 */ addiu $t7, $zero, 0x0002 ## $t7 = 00000002 -/* 03ACC 80A5EDBC AFAF0014 */ sw $t7, 0x0014($sp) -/* 03AD0 80A5EDC0 E7A80010 */ swc1 $f8, 0x0010($sp) +/* 03ACC 80A5EDBC AFAF0014 */ sw $t7, 0x0014($sp) +/* 03AD0 80A5EDC0 E7A80010 */ swc1 $f8, 0x0010($sp) /* 03AD4 80A5EDC4 260401AC */ addiu $a0, $s0, 0x01AC ## $a0 = 000001AC /* 03AD8 80A5EDC8 3C063FC0 */ lui $a2, 0x3FC0 ## $a2 = 3FC00000 -/* 03ADC 80A5EDCC 8FA70034 */ lw $a3, 0x0034($sp) -/* 03AE0 80A5EDD0 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 03AE4 80A5EDD4 E7AA0018 */ swc1 $f10, 0x0018($sp) +/* 03ADC 80A5EDCC 8FA70034 */ lw $a3, 0x0034($sp) +/* 03AE0 80A5EDD0 0C029468 */ jal SkelAnime_ChangeAnim + +/* 03AE4 80A5EDD4 E7AA0018 */ swc1 $f10, 0x0018($sp) /* 03AE8 80A5EDD8 C6100028 */ lwc1 $f16, 0x0028($s0) ## 00000028 /* 03AEC 80A5EDDC 44809000 */ mtc1 $zero, $f18 ## $f18 = 0.00 /* 03AF0 80A5EDE0 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 @@ -50,36 +50,36 @@ glabel func_80A5ED3C /* 03B04 80A5EDF4 E6040060 */ swc1 $f4, 0x0060($s0) ## 00000060 /* 03B08 80A5EDF8 84580002 */ lh $t8, 0x0002($v0) ## 00000002 /* 03B0C 80A5EDFC 3C0180A6 */ lui $at, %hi(D_80A668D8) ## $at = 80A60000 -/* 03B10 80A5EE00 C42A68D8 */ lwc1 $f10, %lo(D_80A668D8)($at) +/* 03B10 80A5EE00 C42A68D8 */ lwc1 $f10, %lo(D_80A668D8)($at) /* 03B14 80A5EE04 44983000 */ mtc1 $t8, $f6 ## $f6 = 0.00 /* 03B18 80A5EE08 C608025C */ lwc1 $f8, 0x025C($s0) ## 0000025C /* 03B1C 80A5EE0C 8E1901F0 */ lw $t9, 0x01F0($s0) ## 000001F0 -/* 03B20 80A5EE10 46803020 */ cvt.s.w $f0, $f6 +/* 03B20 80A5EE10 46803020 */ cvt.s.w $f0, $f6 /* 03B24 80A5EE14 3C078013 */ lui $a3, 0x8013 ## $a3 = 80130000 /* 03B28 80A5EE18 3C098013 */ lui $t1, 0x8013 ## $t1 = 80130000 /* 03B2C 80A5EE1C 37280008 */ ori $t0, $t9, 0x0008 ## $t0 = 00000008 /* 03B30 80A5EE20 24E733E0 */ addiu $a3, $a3, 0x33E0 ## $a3 = 801333E0 /* 03B34 80A5EE24 AE0801F0 */ sw $t0, 0x01F0($s0) ## 000001F0 -/* 03B38 80A5EE28 460A0402 */ mul.s $f16, $f0, $f10 +/* 03B38 80A5EE28 460A0402 */ mul.s $f16, $f0, $f10 /* 03B3C 80A5EE2C 252933E8 */ addiu $t1, $t1, 0x33E8 ## $t1 = 801333E8 /* 03B40 80A5EE30 24042818 */ addiu $a0, $zero, 0x2818 ## $a0 = 00002818 /* 03B44 80A5EE34 260500E4 */ addiu $a1, $s0, 0x00E4 ## $a1 = 000000E4 /* 03B48 80A5EE38 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 -/* 03B4C 80A5EE3C 46104481 */ sub.s $f18, $f8, $f16 +/* 03B4C 80A5EE3C 46104481 */ sub.s $f18, $f8, $f16 /* 03B50 80A5EE40 E612025C */ swc1 $f18, 0x025C($s0) ## 0000025C -/* 03B54 80A5EE44 AFA90014 */ sw $t1, 0x0014($sp) +/* 03B54 80A5EE44 AFA90014 */ sw $t1, 0x0014($sp) /* 03B58 80A5EE48 0C03DCE3 */ jal Audio_PlaySoundGeneral - -/* 03B5C 80A5EE4C AFA70010 */ sw $a3, 0x0010($sp) + +/* 03B5C 80A5EE4C AFA70010 */ sw $a3, 0x0010($sp) /* 03B60 80A5EE50 44806000 */ mtc1 $zero, $f12 ## $f12 = 0.00 /* 03B64 80A5EE54 240500AA */ addiu $a1, $zero, 0x00AA ## $a1 = 000000AA /* 03B68 80A5EE58 2406000A */ addiu $a2, $zero, 0x000A ## $a2 = 0000000A -/* 03B6C 80A5EE5C 0C02A800 */ jal func_800AA000 +/* 03B6C 80A5EE5C 0C02A800 */ jal func_800AA000 /* 03B70 80A5EE60 2407000A */ addiu $a3, $zero, 0x000A ## $a3 = 0000000A -/* 03B74 80A5EE64 8FBF002C */ lw $ra, 0x002C($sp) -/* 03B78 80A5EE68 8FB00028 */ lw $s0, 0x0028($sp) +/* 03B74 80A5EE64 8FBF002C */ lw $ra, 0x002C($sp) +/* 03B78 80A5EE68 8FB00028 */ lw $s0, 0x0028($sp) /* 03B7C 80A5EE6C 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 -/* 03B80 80A5EE70 03E00008 */ jr $ra +/* 03B80 80A5EE70 03E00008 */ jr $ra /* 03B84 80A5EE74 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5F1B0.s b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5F1B0.s index 55c9dd4e96..870b802135 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5F1B0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5F1B0.s @@ -1,38 +1,38 @@ glabel func_80A5F1B0 /* 03EC0 80A5F1B0 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 /* 03EC4 80A5F1B4 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 -/* 03EC8 80A5F1B8 AFB00028 */ sw $s0, 0x0028($sp) -/* 03ECC 80A5F1BC AFBF002C */ sw $ra, 0x002C($sp) -/* 03ED0 80A5F1C0 AFA60038 */ sw $a2, 0x0038($sp) -/* 03ED4 80A5F1C4 AFA7003C */ sw $a3, 0x003C($sp) +/* 03EC8 80A5F1B8 AFB00028 */ sw $s0, 0x0028($sp) +/* 03ECC 80A5F1BC AFBF002C */ sw $ra, 0x002C($sp) +/* 03ED0 80A5F1C0 AFA60038 */ sw $a2, 0x0038($sp) +/* 03ED4 80A5F1C4 AFA7003C */ sw $a3, 0x003C($sp) /* 03ED8 80A5F1C8 240E0002 */ addiu $t6, $zero, 0x0002 ## $t6 = 00000002 /* 03EDC 80A5F1CC 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 03EE0 80A5F1D0 AC8E014C */ sw $t6, 0x014C($a0) ## 0000014C -/* 03EE4 80A5F1D4 10A00007 */ beq $a1, $zero, .L80A5F1F4 +/* 03EE4 80A5F1D4 10A00007 */ beq $a1, $zero, .L80A5F1F4 /* 03EE8 80A5F1D8 E4840068 */ swc1 $f4, 0x0068($a0) ## 00000068 /* 03EEC 80A5F1DC 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 03EF0 80A5F1E0 10A10004 */ beq $a1, $at, .L80A5F1F4 +/* 03EF0 80A5F1E0 10A10004 */ beq $a1, $at, .L80A5F1F4 /* 03EF4 80A5F1E4 24010003 */ addiu $at, $zero, 0x0003 ## $at = 00000003 -/* 03EF8 80A5F1E8 50A10003 */ beql $a1, $at, .L80A5F1F8 +/* 03EF8 80A5F1E8 50A10003 */ beql $a1, $at, .L80A5F1F8 /* 03EFC 80A5F1EC 8E0F0210 */ lw $t7, 0x0210($s0) ## 00000210 /* 03F00 80A5F1F0 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 .L80A5F1F4: /* 03F04 80A5F1F4 8E0F0210 */ lw $t7, 0x0210($s0) ## 00000210 .L80A5F1F8: -/* 03F08 80A5F1F8 50AF005D */ beql $a1, $t7, .L80A5F370 -/* 03F0C 80A5F1FC 8FBF002C */ lw $ra, 0x002C($sp) -/* 03F10 80A5F200 14A00007 */ bne $a1, $zero, .L80A5F220 +/* 03F08 80A5F1F8 50AF005D */ beql $a1, $t7, .L80A5F370 +/* 03F0C 80A5F1FC 8FBF002C */ lw $ra, 0x002C($sp) +/* 03F10 80A5F200 14A00007 */ bne $a1, $zero, .L80A5F220 /* 03F14 80A5F204 AE050210 */ sw $a1, 0x0210($s0) ## 00000210 /* 03F18 80A5F208 8E1801F0 */ lw $t8, 0x01F0($s0) ## 000001F0 /* 03F1C 80A5F20C 2401EFFF */ addiu $at, $zero, 0xEFFF ## $at = FFFFEFFF /* 03F20 80A5F210 00A01025 */ or $v0, $a1, $zero ## $v0 = 00000000 -/* 03F24 80A5F214 0301C824 */ and $t9, $t8, $at -/* 03F28 80A5F218 10000037 */ beq $zero, $zero, .L80A5F2F8 +/* 03F24 80A5F214 0301C824 */ and $t9, $t8, $at +/* 03F28 80A5F218 10000037 */ beq $zero, $zero, .L80A5F2F8 /* 03F2C 80A5F21C AE1901F0 */ sw $t9, 0x01F0($s0) ## 000001F0 .L80A5F220: /* 03F30 80A5F220 8E020210 */ lw $v0, 0x0210($s0) ## 00000210 /* 03F34 80A5F224 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 03F38 80A5F228 54410018 */ bnel $v0, $at, .L80A5F28C +/* 03F38 80A5F228 54410018 */ bnel $v0, $at, .L80A5F28C /* 03F3C 80A5F22C 24010003 */ addiu $at, $zero, 0x0003 ## $at = 00000003 /* 03F40 80A5F230 8E090228 */ lw $t1, 0x0228($s0) ## 00000228 /* 03F44 80A5F234 2605021C */ addiu $a1, $s0, 0x021C ## $a1 = 0000021C @@ -48,19 +48,19 @@ glabel func_80A5F1B0 /* 03F6C 80A5F25C ACA90008 */ sw $t1, 0x0008($a1) ## 00000224 /* 03F70 80A5F260 8E0A01F0 */ lw $t2, 0x01F0($s0) ## 000001F0 /* 03F74 80A5F264 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 -/* 03F78 80A5F268 000A5900 */ sll $t3, $t2, 4 -/* 03F7C 80A5F26C 05610004 */ bgez $t3, .L80A5F280 +/* 03F78 80A5F268 000A5900 */ sll $t3, $t2, 4 +/* 03F7C 80A5F26C 05610004 */ bgez $t3, .L80A5F280 /* 03F80 80A5F270 00000000 */ nop -/* 03F84 80A5F274 AFA70010 */ sw $a3, 0x0010($sp) +/* 03F84 80A5F274 AFA70010 */ sw $a3, 0x0010($sp) /* 03F88 80A5F278 0C03DCE3 */ jal Audio_PlaySoundGeneral - -/* 03F8C 80A5F27C AFAC0014 */ sw $t4, 0x0014($sp) + +/* 03F8C 80A5F27C AFAC0014 */ sw $t4, 0x0014($sp) .L80A5F280: -/* 03F90 80A5F280 1000001D */ beq $zero, $zero, .L80A5F2F8 +/* 03F90 80A5F280 1000001D */ beq $zero, $zero, .L80A5F2F8 /* 03F94 80A5F284 8E020210 */ lw $v0, 0x0210($s0) ## 00000210 /* 03F98 80A5F288 24010003 */ addiu $at, $zero, 0x0003 ## $at = 00000003 .L80A5F28C: -/* 03F9C 80A5F28C 5441001B */ bnel $v0, $at, .L80A5F2FC +/* 03F9C 80A5F28C 5441001B */ bnel $v0, $at, .L80A5F2FC /* 03FA0 80A5F290 8E080158 */ lw $t0, 0x0158($s0) ## 00000158 /* 03FA4 80A5F294 8E0E0228 */ lw $t6, 0x0228($s0) ## 00000228 /* 03FA8 80A5F298 2605021C */ addiu $a1, $s0, 0x021C ## $a1 = 0000021C @@ -76,57 +76,57 @@ glabel func_80A5F1B0 /* 03FD0 80A5F2C0 ACAE0008 */ sw $t6, 0x0008($a1) ## 00000224 /* 03FD4 80A5F2C4 8E0301F0 */ lw $v1, 0x01F0($s0) ## 000001F0 /* 03FD8 80A5F2C8 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 -/* 03FDC 80A5F2CC 00037900 */ sll $t7, $v1, 4 -/* 03FE0 80A5F2D0 05E30006 */ bgezl $t7, .L80A5F2EC +/* 03FDC 80A5F2CC 00037900 */ sll $t7, $v1, 4 +/* 03FE0 80A5F2D0 05E30006 */ bgezl $t7, .L80A5F2EC /* 03FE4 80A5F2D4 2401F7FF */ addiu $at, $zero, 0xF7FF ## $at = FFFFF7FF -/* 03FE8 80A5F2D8 AFA70010 */ sw $a3, 0x0010($sp) +/* 03FE8 80A5F2D8 AFA70010 */ sw $a3, 0x0010($sp) /* 03FEC 80A5F2DC 0C03DCE3 */ jal Audio_PlaySoundGeneral - -/* 03FF0 80A5F2E0 AFB80014 */ sw $t8, 0x0014($sp) + +/* 03FF0 80A5F2E0 AFB80014 */ sw $t8, 0x0014($sp) /* 03FF4 80A5F2E4 8E0301F0 */ lw $v1, 0x01F0($s0) ## 000001F0 /* 03FF8 80A5F2E8 2401F7FF */ addiu $at, $zero, 0xF7FF ## $at = FFFFF7FF .L80A5F2EC: -/* 03FFC 80A5F2EC 0061C824 */ and $t9, $v1, $at +/* 03FFC 80A5F2EC 0061C824 */ and $t9, $v1, $at /* 04000 80A5F2F0 AE1901F0 */ sw $t9, 0x01F0($s0) ## 000001F0 /* 04004 80A5F2F4 8E020210 */ lw $v0, 0x0210($s0) ## 00000210 .L80A5F2F8: /* 04008 80A5F2F8 8E080158 */ lw $t0, 0x0158($s0) ## 00000158 .L80A5F2FC: /* 0400C 80A5F2FC 3C0A80A6 */ lui $t2, %hi(D_80A65E58) ## $t2 = 80A60000 -/* 04010 80A5F300 00025880 */ sll $t3, $v0, 2 -/* 04014 80A5F304 00084880 */ sll $t1, $t0, 2 -/* 04018 80A5F308 01495021 */ addu $t2, $t2, $t1 -/* 0401C 80A5F30C 8D4A5E58 */ lw $t2, %lo(D_80A65E58)($t2) -/* 04020 80A5F310 014B6021 */ addu $t4, $t2, $t3 +/* 04010 80A5F300 00025880 */ sll $t3, $v0, 2 +/* 04014 80A5F304 00084880 */ sll $t1, $t0, 2 +/* 04018 80A5F308 01495021 */ addu $t2, $t2, $t1 +/* 0401C 80A5F30C 8D4A5E58 */ lw $t2, %lo(D_80A65E58)($t2) +/* 04020 80A5F310 014B6021 */ addu $t4, $t2, $t3 /* 04024 80A5F314 0C028800 */ jal SkelAnime_GetFrameCount - + /* 04028 80A5F318 8D840000 */ lw $a0, 0x0000($t4) ## 00000000 /* 0402C 80A5F31C 8E0D0158 */ lw $t5, 0x0158($s0) ## 00000158 /* 04030 80A5F320 44823000 */ mtc1 $v0, $f6 ## $f6 = 0.00 /* 04034 80A5F324 3C0F80A6 */ lui $t7, %hi(D_80A65E58) ## $t7 = 80A60000 -/* 04038 80A5F328 000D7080 */ sll $t6, $t5, 2 +/* 04038 80A5F328 000D7080 */ sll $t6, $t5, 2 /* 0403C 80A5F32C 8E180210 */ lw $t8, 0x0210($s0) ## 00000210 -/* 04040 80A5F330 01EE7821 */ addu $t7, $t7, $t6 -/* 04044 80A5F334 8DEF5E58 */ lw $t7, %lo(D_80A65E58)($t7) -/* 04048 80A5F338 46803220 */ cvt.s.w $f8, $f6 -/* 0404C 80A5F33C 0018C880 */ sll $t9, $t8, 2 -/* 04050 80A5F340 01F94021 */ addu $t0, $t7, $t9 -/* 04054 80A5F344 C7AA0038 */ lwc1 $f10, 0x0038($sp) +/* 04040 80A5F330 01EE7821 */ addu $t7, $t7, $t6 +/* 04044 80A5F334 8DEF5E58 */ lw $t7, %lo(D_80A65E58)($t7) +/* 04048 80A5F338 46803220 */ cvt.s.w $f8, $f6 +/* 0404C 80A5F33C 0018C880 */ sll $t9, $t8, 2 +/* 04050 80A5F340 01F94021 */ addu $t0, $t7, $t9 +/* 04054 80A5F344 C7AA0038 */ lwc1 $f10, 0x0038($sp) /* 04058 80A5F348 8D050000 */ lw $a1, 0x0000($t0) ## 00000000 /* 0405C 80A5F34C 24090002 */ addiu $t1, $zero, 0x0002 ## $t1 = 00000002 -/* 04060 80A5F350 AFA90014 */ sw $t1, 0x0014($sp) -/* 04064 80A5F354 E7A80010 */ swc1 $f8, 0x0010($sp) +/* 04060 80A5F350 AFA90014 */ sw $t1, 0x0014($sp) +/* 04064 80A5F354 E7A80010 */ swc1 $f8, 0x0010($sp) /* 04068 80A5F358 260401AC */ addiu $a0, $s0, 0x01AC ## $a0 = 000001AC /* 0406C 80A5F35C 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 04070 80A5F360 8FA7003C */ lw $a3, 0x003C($sp) -/* 04074 80A5F364 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 04078 80A5F368 E7AA0018 */ swc1 $f10, 0x0018($sp) -/* 0407C 80A5F36C 8FBF002C */ lw $ra, 0x002C($sp) +/* 04070 80A5F360 8FA7003C */ lw $a3, 0x003C($sp) +/* 04074 80A5F364 0C029468 */ jal SkelAnime_ChangeAnim + +/* 04078 80A5F368 E7AA0018 */ swc1 $f10, 0x0018($sp) +/* 0407C 80A5F36C 8FBF002C */ lw $ra, 0x002C($sp) .L80A5F370: -/* 04080 80A5F370 8FB00028 */ lw $s0, 0x0028($sp) +/* 04080 80A5F370 8FB00028 */ lw $s0, 0x0028($sp) /* 04084 80A5F374 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 04088 80A5F378 03E00008 */ jr $ra +/* 04088 80A5F378 03E00008 */ jr $ra /* 0408C 80A5F37C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5F5F8.s b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5F5F8.s index c027cfae75..03c7210d71 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5F5F8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5F5F8.s @@ -1,101 +1,101 @@ glabel func_80A5F5F8 /* 04308 80A5F5F8 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 0430C 80A5F5FC AFBF002C */ sw $ra, 0x002C($sp) -/* 04310 80A5F600 AFB00028 */ sw $s0, 0x0028($sp) -/* 04314 80A5F604 AFA60038 */ sw $a2, 0x0038($sp) -/* 04318 80A5F608 AFA7003C */ sw $a3, 0x003C($sp) +/* 0430C 80A5F5FC AFBF002C */ sw $ra, 0x002C($sp) +/* 04310 80A5F600 AFB00028 */ sw $s0, 0x0028($sp) +/* 04314 80A5F604 AFA60038 */ sw $a2, 0x0038($sp) +/* 04318 80A5F608 AFA7003C */ sw $a3, 0x003C($sp) /* 0431C 80A5F60C 8C8F01F0 */ lw $t7, 0x01F0($a0) ## 000001F0 /* 04320 80A5F610 3C01FFFF */ lui $at, 0xFFFF ## $at = FFFF0000 /* 04324 80A5F614 34217FFF */ ori $at, $at, 0x7FFF ## $at = FFFF7FFF -/* 04328 80A5F618 01E1C024 */ and $t8, $t7, $at +/* 04328 80A5F618 01E1C024 */ and $t8, $t7, $at /* 0432C 80A5F61C 240E0003 */ addiu $t6, $zero, 0x0003 ## $t6 = 00000003 /* 04330 80A5F620 24010005 */ addiu $at, $zero, 0x0005 ## $at = 00000005 /* 04334 80A5F624 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 04338 80A5F628 AC8E014C */ sw $t6, 0x014C($a0) ## 0000014C -/* 0433C 80A5F62C 10A10007 */ beq $a1, $at, .L80A5F64C +/* 0433C 80A5F62C 10A10007 */ beq $a1, $at, .L80A5F64C /* 04340 80A5F630 AC9801F0 */ sw $t8, 0x01F0($a0) ## 000001F0 /* 04344 80A5F634 24010006 */ addiu $at, $zero, 0x0006 ## $at = 00000006 -/* 04348 80A5F638 10A10004 */ beq $a1, $at, .L80A5F64C +/* 04348 80A5F638 10A10004 */ beq $a1, $at, .L80A5F64C /* 0434C 80A5F63C 24010004 */ addiu $at, $zero, 0x0004 ## $at = 00000004 -/* 04350 80A5F640 50A10003 */ beql $a1, $at, .L80A5F650 +/* 04350 80A5F640 50A10003 */ beql $a1, $at, .L80A5F650 /* 04354 80A5F644 8E020210 */ lw $v0, 0x0210($s0) ## 00000210 /* 04358 80A5F648 24050004 */ addiu $a1, $zero, 0x0004 ## $a1 = 00000004 .L80A5F64C: /* 0435C 80A5F64C 8E020210 */ lw $v0, 0x0210($s0) ## 00000210 .L80A5F650: -/* 04360 80A5F650 50A20022 */ beql $a1, $v0, .L80A5F6DC +/* 04360 80A5F650 50A20022 */ beql $a1, $v0, .L80A5F6DC /* 04364 80A5F654 8E090158 */ lw $t1, 0x0158($s0) ## 00000158 /* 04368 80A5F658 8E190158 */ lw $t9, 0x0158($s0) ## 00000158 /* 0436C 80A5F65C 3C0980A6 */ lui $t1, %hi(D_80A65E58) ## $t1 = 80A60000 /* 04370 80A5F660 AE050210 */ sw $a1, 0x0210($s0) ## 00000210 -/* 04374 80A5F664 00194080 */ sll $t0, $t9, 2 -/* 04378 80A5F668 01284821 */ addu $t1, $t1, $t0 -/* 0437C 80A5F66C 8D295E58 */ lw $t1, %lo(D_80A65E58)($t1) -/* 04380 80A5F670 00055080 */ sll $t2, $a1, 2 -/* 04384 80A5F674 012A5821 */ addu $t3, $t1, $t2 +/* 04374 80A5F664 00194080 */ sll $t0, $t9, 2 +/* 04378 80A5F668 01284821 */ addu $t1, $t1, $t0 +/* 0437C 80A5F66C 8D295E58 */ lw $t1, %lo(D_80A65E58)($t1) +/* 04380 80A5F670 00055080 */ sll $t2, $a1, 2 +/* 04384 80A5F674 012A5821 */ addu $t3, $t1, $t2 /* 04388 80A5F678 0C028800 */ jal SkelAnime_GetFrameCount - + /* 0438C 80A5F67C 8D640000 */ lw $a0, 0x0000($t3) ## 00000000 /* 04390 80A5F680 8E0C0158 */ lw $t4, 0x0158($s0) ## 00000158 /* 04394 80A5F684 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 04398 80A5F688 3C0E80A6 */ lui $t6, %hi(D_80A65E58) ## $t6 = 80A60000 -/* 0439C 80A5F68C 000C6880 */ sll $t5, $t4, 2 +/* 0439C 80A5F68C 000C6880 */ sll $t5, $t4, 2 /* 043A0 80A5F690 8E0F0210 */ lw $t7, 0x0210($s0) ## 00000210 -/* 043A4 80A5F694 01CD7021 */ addu $t6, $t6, $t5 -/* 043A8 80A5F698 8DCE5E58 */ lw $t6, %lo(D_80A65E58)($t6) -/* 043AC 80A5F69C 468021A0 */ cvt.s.w $f6, $f4 -/* 043B0 80A5F6A0 000FC080 */ sll $t8, $t7, 2 -/* 043B4 80A5F6A4 01D8C821 */ addu $t9, $t6, $t8 -/* 043B8 80A5F6A8 C7A80038 */ lwc1 $f8, 0x0038($sp) +/* 043A4 80A5F694 01CD7021 */ addu $t6, $t6, $t5 +/* 043A8 80A5F698 8DCE5E58 */ lw $t6, %lo(D_80A65E58)($t6) +/* 043AC 80A5F69C 468021A0 */ cvt.s.w $f6, $f4 +/* 043B0 80A5F6A0 000FC080 */ sll $t8, $t7, 2 +/* 043B4 80A5F6A4 01D8C821 */ addu $t9, $t6, $t8 +/* 043B8 80A5F6A8 C7A80038 */ lwc1 $f8, 0x0038($sp) /* 043BC 80A5F6AC 8F250000 */ lw $a1, 0x0000($t9) ## 00000000 /* 043C0 80A5F6B0 24080002 */ addiu $t0, $zero, 0x0002 ## $t0 = 00000002 -/* 043C4 80A5F6B4 AFA80014 */ sw $t0, 0x0014($sp) -/* 043C8 80A5F6B8 E7A60010 */ swc1 $f6, 0x0010($sp) +/* 043C4 80A5F6B4 AFA80014 */ sw $t0, 0x0014($sp) +/* 043C8 80A5F6B8 E7A60010 */ swc1 $f6, 0x0010($sp) /* 043CC 80A5F6BC 260401AC */ addiu $a0, $s0, 0x01AC ## $a0 = 000001AC /* 043D0 80A5F6C0 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 043D4 80A5F6C4 8FA7003C */ lw $a3, 0x003C($sp) -/* 043D8 80A5F6C8 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 043DC 80A5F6CC E7A80018 */ swc1 $f8, 0x0018($sp) -/* 043E0 80A5F6D0 1000001F */ beq $zero, $zero, .L80A5F750 -/* 043E4 80A5F6D4 8FBF002C */ lw $ra, 0x002C($sp) +/* 043D4 80A5F6C4 8FA7003C */ lw $a3, 0x003C($sp) +/* 043D8 80A5F6C8 0C029468 */ jal SkelAnime_ChangeAnim + +/* 043DC 80A5F6CC E7A80018 */ swc1 $f8, 0x0018($sp) +/* 043E0 80A5F6D0 1000001F */ beq $zero, $zero, .L80A5F750 +/* 043E4 80A5F6D4 8FBF002C */ lw $ra, 0x002C($sp) /* 043E8 80A5F6D8 8E090158 */ lw $t1, 0x0158($s0) ## 00000158 .L80A5F6DC: /* 043EC 80A5F6DC 3C0B80A6 */ lui $t3, %hi(D_80A65E58) ## $t3 = 80A60000 -/* 043F0 80A5F6E0 00026080 */ sll $t4, $v0, 2 -/* 043F4 80A5F6E4 00095080 */ sll $t2, $t1, 2 -/* 043F8 80A5F6E8 016A5821 */ addu $t3, $t3, $t2 -/* 043FC 80A5F6EC 8D6B5E58 */ lw $t3, %lo(D_80A65E58)($t3) -/* 04400 80A5F6F0 016C6821 */ addu $t5, $t3, $t4 +/* 043F0 80A5F6E0 00026080 */ sll $t4, $v0, 2 +/* 043F4 80A5F6E4 00095080 */ sll $t2, $t1, 2 +/* 043F8 80A5F6E8 016A5821 */ addu $t3, $t3, $t2 +/* 043FC 80A5F6EC 8D6B5E58 */ lw $t3, %lo(D_80A65E58)($t3) +/* 04400 80A5F6F0 016C6821 */ addu $t5, $t3, $t4 /* 04404 80A5F6F4 0C028800 */ jal SkelAnime_GetFrameCount - + /* 04408 80A5F6F8 8DA40000 */ lw $a0, 0x0000($t5) ## 00000000 /* 0440C 80A5F6FC 8E0F0158 */ lw $t7, 0x0158($s0) ## 00000158 /* 04410 80A5F700 44825000 */ mtc1 $v0, $f10 ## $f10 = 0.00 /* 04414 80A5F704 3C1880A6 */ lui $t8, %hi(D_80A65E58) ## $t8 = 80A60000 -/* 04418 80A5F708 000F7080 */ sll $t6, $t7, 2 +/* 04418 80A5F708 000F7080 */ sll $t6, $t7, 2 /* 0441C 80A5F70C 8E190210 */ lw $t9, 0x0210($s0) ## 00000210 -/* 04420 80A5F710 030EC021 */ addu $t8, $t8, $t6 -/* 04424 80A5F714 8F185E58 */ lw $t8, %lo(D_80A65E58)($t8) -/* 04428 80A5F718 46805420 */ cvt.s.w $f16, $f10 -/* 0442C 80A5F71C 00194080 */ sll $t0, $t9, 2 -/* 04430 80A5F720 03084821 */ addu $t1, $t8, $t0 +/* 04420 80A5F710 030EC021 */ addu $t8, $t8, $t6 +/* 04424 80A5F714 8F185E58 */ lw $t8, %lo(D_80A65E58)($t8) +/* 04428 80A5F718 46805420 */ cvt.s.w $f16, $f10 +/* 0442C 80A5F71C 00194080 */ sll $t0, $t9, 2 +/* 04430 80A5F720 03084821 */ addu $t1, $t8, $t0 /* 04434 80A5F724 44809000 */ mtc1 $zero, $f18 ## $f18 = 0.00 /* 04438 80A5F728 8D250000 */ lw $a1, 0x0000($t1) ## 00000000 /* 0443C 80A5F72C 240A0002 */ addiu $t2, $zero, 0x0002 ## $t2 = 00000002 -/* 04440 80A5F730 AFAA0014 */ sw $t2, 0x0014($sp) -/* 04444 80A5F734 E7B00010 */ swc1 $f16, 0x0010($sp) +/* 04440 80A5F730 AFAA0014 */ sw $t2, 0x0014($sp) +/* 04444 80A5F734 E7B00010 */ swc1 $f16, 0x0010($sp) /* 04448 80A5F738 260401AC */ addiu $a0, $s0, 0x01AC ## $a0 = 000001AC /* 0444C 80A5F73C 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 04450 80A5F740 8FA7003C */ lw $a3, 0x003C($sp) -/* 04454 80A5F744 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 04458 80A5F748 E7B20018 */ swc1 $f18, 0x0018($sp) -/* 0445C 80A5F74C 8FBF002C */ lw $ra, 0x002C($sp) +/* 04450 80A5F740 8FA7003C */ lw $a3, 0x003C($sp) +/* 04454 80A5F744 0C029468 */ jal SkelAnime_ChangeAnim + +/* 04458 80A5F748 E7B20018 */ swc1 $f18, 0x0018($sp) +/* 0445C 80A5F74C 8FBF002C */ lw $ra, 0x002C($sp) .L80A5F750: -/* 04460 80A5F750 8FB00028 */ lw $s0, 0x0028($sp) +/* 04460 80A5F750 8FB00028 */ lw $s0, 0x0028($sp) /* 04464 80A5F754 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 04468 80A5F758 03E00008 */ jr $ra +/* 04468 80A5F758 03E00008 */ jr $ra /* 0446C 80A5F75C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5F890.s b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5F890.s index d6305f09af..4ed75bf0c8 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5F890.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5F890.s @@ -2,38 +2,38 @@ glabel func_80A5F890 /* 045A0 80A5F890 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 /* 045A4 80A5F894 3C0E8016 */ lui $t6, 0x8016 ## $t6 = 80160000 /* 045A8 80A5F898 8DCEFA90 */ lw $t6, -0x0570($t6) ## 8015FA90 -/* 045AC 80A5F89C AFBF0024 */ sw $ra, 0x0024($sp) -/* 045B0 80A5F8A0 AFB00020 */ sw $s0, 0x0020($sp) -/* 045B4 80A5F8A4 AFA50044 */ sw $a1, 0x0044($sp) +/* 045AC 80A5F89C AFBF0024 */ sw $ra, 0x0024($sp) +/* 045B0 80A5F8A0 AFB00020 */ sw $s0, 0x0020($sp) +/* 045B4 80A5F8A4 AFA50044 */ sw $a1, 0x0044($sp) /* 045B8 80A5F8A8 A5C005BE */ sh $zero, 0x05BE($t6) ## 801605BE -/* 045BC 80A5F8AC 8FAF0044 */ lw $t7, 0x0044($sp) +/* 045BC 80A5F8AC 8FAF0044 */ lw $t7, 0x0044($sp) /* 045C0 80A5F8B0 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 045C4 80A5F8B4 0C00B6E3 */ jal func_8002DB8C +/* 045C4 80A5F8B4 0C00B6E3 */ jal func_8002DB8C /* 045C8 80A5F8B8 8DE51C44 */ lw $a1, 0x1C44($t7) ## 00001C44 -/* 045CC 80A5F8BC E7A0003C */ swc1 $f0, 0x003C($sp) +/* 045CC 80A5F8BC E7A0003C */ swc1 $f0, 0x003C($sp) /* 045D0 80A5F8C0 8E020370 */ lw $v0, 0x0370($s0) ## 00000370 /* 045D4 80A5F8C4 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 045D8 80A5F8C8 10410002 */ beq $v0, $at, .L80A5F8D4 +/* 045D8 80A5F8C8 10410002 */ beq $v0, $at, .L80A5F8D4 /* 045DC 80A5F8CC 24010003 */ addiu $at, $zero, 0x0003 ## $at = 00000003 -/* 045E0 80A5F8D0 1441005A */ bne $v0, $at, .L80A5FA3C +/* 045E0 80A5F8D0 1441005A */ bne $v0, $at, .L80A5FA3C .L80A5F8D4: /* 045E4 80A5F8D4 3C014396 */ lui $at, 0x4396 ## $at = 43960000 /* 045E8 80A5F8D8 44812000 */ mtc1 $at, $f4 ## $f4 = 300.00 /* 045EC 80A5F8DC 00000000 */ nop -/* 045F0 80A5F8E0 4600203C */ c.lt.s $f4, $f0 +/* 045F0 80A5F8E0 4600203C */ c.lt.s $f4, $f0 /* 045F4 80A5F8E4 00000000 */ nop -/* 045F8 80A5F8E8 45020055 */ bc1fl .L80A5FA40 +/* 045F8 80A5F8E8 45020055 */ bc1fl .L80A5FA40 /* 045FC 80A5F8EC 8E0A01F0 */ lw $t2, 0x01F0($s0) ## 000001F0 /* 04600 80A5F8F0 8E0201F0 */ lw $v0, 0x01F0($s0) ## 000001F0 /* 04604 80A5F8F4 24190003 */ addiu $t9, $zero, 0x0003 ## $t9 = 00000003 /* 04608 80A5F8F8 30588000 */ andi $t8, $v0, 0x8000 ## $t8 = 00000000 -/* 0460C 80A5F8FC 1700004F */ bne $t8, $zero, .L80A5FA3C +/* 0460C 80A5F8FC 1700004F */ bne $t8, $zero, .L80A5FA3C /* 04610 80A5F900 34488000 */ ori $t0, $v0, 0x8000 ## $t0 = 00008000 /* 04614 80A5F904 AE190210 */ sw $t9, 0x0210($s0) ## 00000210 /* 04618 80A5F908 AE0801F0 */ sw $t0, 0x01F0($s0) ## 000001F0 -/* 0461C 80A5F90C 8FA90044 */ lw $t1, 0x0044($sp) +/* 0461C 80A5F90C 8FA90044 */ lw $t1, 0x0044($sp) /* 04620 80A5F910 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 04624 80A5F914 0C00B69E */ jal func_8002DA78 +/* 04624 80A5F914 0C00B69E */ jal func_8002DA78 /* 04628 80A5F918 8D251C44 */ lw $a1, 0x1C44($t1) ## 00001C44 /* 0462C 80A5F91C A6020376 */ sh $v0, 0x0376($s0) ## 00000376 /* 04630 80A5F920 860A0376 */ lh $t2, 0x0376($s0) ## 00000376 @@ -41,62 +41,62 @@ glabel func_80A5F890 /* 04638 80A5F928 3C0180A6 */ lui $at, %hi(D_80A668E0) ## $at = 80A60000 /* 0463C 80A5F92C 448A3000 */ mtc1 $t2, $f6 ## $f6 = 0.00 /* 04640 80A5F930 448B5000 */ mtc1 $t3, $f10 ## $f10 = 0.00 -/* 04644 80A5F934 C43268E0 */ lwc1 $f18, %lo(D_80A668E0)($at) -/* 04648 80A5F938 46803220 */ cvt.s.w $f8, $f6 +/* 04644 80A5F934 C43268E0 */ lwc1 $f18, %lo(D_80A668E0)($at) +/* 04648 80A5F938 46803220 */ cvt.s.w $f8, $f6 /* 0464C 80A5F93C 3C0180A6 */ lui $at, %hi(D_80A668E8) ## $at = 80A60000 -/* 04650 80A5F940 46805420 */ cvt.s.w $f16, $f10 -/* 04654 80A5F944 46104001 */ sub.s $f0, $f8, $f16 -/* 04658 80A5F948 4600903C */ c.lt.s $f18, $f0 +/* 04650 80A5F940 46805420 */ cvt.s.w $f16, $f10 +/* 04654 80A5F944 46104001 */ sub.s $f0, $f8, $f16 +/* 04658 80A5F948 4600903C */ c.lt.s $f18, $f0 /* 0465C 80A5F94C 00000000 */ nop -/* 04660 80A5F950 45000005 */ bc1f .L80A5F968 +/* 04660 80A5F950 45000005 */ bc1f .L80A5F968 /* 04664 80A5F954 00000000 */ nop /* 04668 80A5F958 3C0180A6 */ lui $at, %hi(D_80A668E4) ## $at = 80A60000 -/* 0466C 80A5F95C C42468E4 */ lwc1 $f4, %lo(D_80A668E4)($at) -/* 04670 80A5F960 10000009 */ beq $zero, $zero, .L80A5F988 -/* 04674 80A5F964 46040001 */ sub.s $f0, $f0, $f4 +/* 0466C 80A5F95C C42468E4 */ lwc1 $f4, %lo(D_80A668E4)($at) +/* 04670 80A5F960 10000009 */ beq $zero, $zero, .L80A5F988 +/* 04674 80A5F964 46040001 */ sub.s $f0, $f0, $f4 .L80A5F968: -/* 04678 80A5F968 C42668E8 */ lwc1 $f6, %lo(D_80A668E8)($at) +/* 04678 80A5F968 C42668E8 */ lwc1 $f6, %lo(D_80A668E8)($at) /* 0467C 80A5F96C 3C0180A6 */ lui $at, %hi(D_80A668EC) ## $at = 80A60000 -/* 04680 80A5F970 4606003C */ c.lt.s $f0, $f6 +/* 04680 80A5F970 4606003C */ c.lt.s $f0, $f6 /* 04684 80A5F974 00000000 */ nop -/* 04688 80A5F978 45020004 */ bc1fl .L80A5F98C +/* 04688 80A5F978 45020004 */ bc1fl .L80A5F98C /* 0468C 80A5F97C 8E0C0158 */ lw $t4, 0x0158($s0) ## 00000158 -/* 04690 80A5F980 C42A68EC */ lwc1 $f10, %lo(D_80A668EC)($at) -/* 04694 80A5F984 460A0000 */ add.s $f0, $f0, $f10 +/* 04690 80A5F980 C42A68EC */ lwc1 $f10, %lo(D_80A668EC)($at) +/* 04694 80A5F984 460A0000 */ add.s $f0, $f0, $f10 .L80A5F988: /* 04698 80A5F988 8E0C0158 */ lw $t4, 0x0158($s0) ## 00000158 .L80A5F98C: /* 0469C 80A5F98C 3C0E80A6 */ lui $t6, %hi(D_80A65E58) ## $t6 = 80A60000 /* 046A0 80A5F990 8E0F0210 */ lw $t7, 0x0210($s0) ## 00000210 -/* 046A4 80A5F994 000C6880 */ sll $t5, $t4, 2 -/* 046A8 80A5F998 01CD7021 */ addu $t6, $t6, $t5 -/* 046AC 80A5F99C 8DCE5E58 */ lw $t6, %lo(D_80A65E58)($t6) -/* 046B0 80A5F9A0 000FC080 */ sll $t8, $t7, 2 -/* 046B4 80A5F9A4 01D8C821 */ addu $t9, $t6, $t8 +/* 046A4 80A5F994 000C6880 */ sll $t5, $t4, 2 +/* 046A8 80A5F998 01CD7021 */ addu $t6, $t6, $t5 +/* 046AC 80A5F99C 8DCE5E58 */ lw $t6, %lo(D_80A65E58)($t6) +/* 046B0 80A5F9A0 000FC080 */ sll $t8, $t7, 2 +/* 046B4 80A5F9A4 01D8C821 */ addu $t9, $t6, $t8 /* 046B8 80A5F9A8 8F240000 */ lw $a0, 0x0000($t9) ## 00000000 /* 046BC 80A5F9AC 0C028800 */ jal SkelAnime_GetFrameCount - -/* 046C0 80A5F9B0 E7A00038 */ swc1 $f0, 0x0038($sp) + +/* 046C0 80A5F9B0 E7A00038 */ swc1 $f0, 0x0038($sp) /* 046C4 80A5F9B4 44824000 */ mtc1 $v0, $f8 ## $f8 = 0.00 -/* 046C8 80A5F9B8 C7A00038 */ lwc1 $f0, 0x0038($sp) +/* 046C8 80A5F9B8 C7A00038 */ lwc1 $f0, 0x0038($sp) /* 046CC 80A5F9BC 8E0A0158 */ lw $t2, 0x0158($s0) ## 00000158 -/* 046D0 80A5F9C0 46804420 */ cvt.s.w $f16, $f8 +/* 046D0 80A5F9C0 46804420 */ cvt.s.w $f16, $f8 /* 046D4 80A5F9C4 3C0C80A6 */ lui $t4, %hi(D_80A65E58) ## $t4 = 80A60000 -/* 046D8 80A5F9C8 000A5880 */ sll $t3, $t2, 2 +/* 046D8 80A5F9C8 000A5880 */ sll $t3, $t2, 2 /* 046DC 80A5F9CC 8E0D0210 */ lw $t5, 0x0210($s0) ## 00000210 -/* 046E0 80A5F9D0 018B6021 */ addu $t4, $t4, $t3 +/* 046E0 80A5F9D0 018B6021 */ addu $t4, $t4, $t3 /* 046E4 80A5F9D4 260401AC */ addiu $a0, $s0, 0x01AC ## $a0 = 000001AC -/* 046E8 80A5F9D8 46100483 */ div.s $f18, $f0, $f16 -/* 046EC 80A5F9DC 000D7880 */ sll $t7, $t5, 2 -/* 046F0 80A5F9E0 4600910D */ trunc.w.s $f4, $f18 -/* 046F4 80A5F9E4 44092000 */ mfc1 $t1, $f4 +/* 046E8 80A5F9D8 46100483 */ div.s $f18, $f0, $f16 +/* 046EC 80A5F9DC 000D7880 */ sll $t7, $t5, 2 +/* 046F0 80A5F9E0 4600910D */ trunc.w.s $f4, $f18 +/* 046F4 80A5F9E4 44092000 */ mfc1 $t1, $f4 /* 046F8 80A5F9E8 00000000 */ nop /* 046FC 80A5F9EC A6090378 */ sh $t1, 0x0378($s0) ## 00000378 -/* 04700 80A5F9F0 8D8C5E58 */ lw $t4, %lo(D_80A65E58)($t4) -/* 04704 80A5F9F4 018F7021 */ addu $t6, $t4, $t7 +/* 04700 80A5F9F0 8D8C5E58 */ lw $t4, %lo(D_80A65E58)($t4) +/* 04704 80A5F9F4 018F7021 */ addu $t6, $t4, $t7 /* 04708 80A5F9F8 8DC50000 */ lw $a1, 0x0000($t6) ## 00000000 -/* 0470C 80A5F9FC 0C02947A */ jal func_800A51E8 -/* 04710 80A5FA00 AFA40030 */ sw $a0, 0x0030($sp) +/* 0470C 80A5F9FC 0C02947A */ jal SkelAnime_ChangeAnimDefaultStop +/* 04710 80A5FA00 AFA40030 */ sw $a0, 0x0030($sp) /* 04714 80A5FA04 8E090228 */ lw $t1, 0x0228($s0) ## 00000228 /* 04718 80A5FA08 8E1801F0 */ lw $t8, 0x01F0($s0) ## 000001F0 /* 0471C 80A5FA0C 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 @@ -105,11 +105,11 @@ glabel func_80A5F890 /* 04728 80A5FA18 8E090230 */ lw $t1, 0x0230($s0) ## 00000230 /* 0472C 80A5FA1C 8E08022C */ lw $t0, 0x022C($s0) ## 0000022C /* 04730 80A5FA20 2401F7FF */ addiu $at, $zero, 0xF7FF ## $at = FFFFF7FF -/* 04734 80A5FA24 0301C824 */ and $t9, $t8, $at +/* 04734 80A5FA24 0301C824 */ and $t9, $t8, $at /* 04738 80A5FA28 AE1901F0 */ sw $t9, 0x01F0($s0) ## 000001F0 /* 0473C 80A5FA2C E60601C8 */ swc1 $f6, 0x01C8($s0) ## 000001C8 /* 04740 80A5FA30 AE090224 */ sw $t1, 0x0224($s0) ## 00000224 -/* 04744 80A5FA34 10000027 */ beq $zero, $zero, .L80A5FAD4 +/* 04744 80A5FA34 10000027 */ beq $zero, $zero, .L80A5FAD4 /* 04748 80A5FA38 AE080220 */ sw $t0, 0x0220($s0) ## 00000220 .L80A5FA3C: /* 0474C 80A5FA3C 8E0A01F0 */ lw $t2, 0x01F0($s0) ## 000001F0 @@ -117,79 +117,79 @@ glabel func_80A5F890 /* 04750 80A5FA40 3C0141C8 */ lui $at, 0x41C8 ## $at = 41C80000 /* 04754 80A5FA44 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 04758 80A5FA48 314B8000 */ andi $t3, $t2, 0x8000 ## $t3 = 00000000 -/* 0475C 80A5FA4C 1160001D */ beq $t3, $zero, .L80A5FAC4 +/* 0475C 80A5FA4C 1160001D */ beq $t3, $zero, .L80A5FAC4 /* 04760 80A5FA50 00000000 */ nop /* 04764 80A5FA54 860D0032 */ lh $t5, 0x0032($s0) ## 00000032 /* 04768 80A5FA58 860C0378 */ lh $t4, 0x0378($s0) ## 00000378 /* 0476C 80A5FA5C 44815000 */ mtc1 $at, $f10 ## $f10 = 25.00 /* 04770 80A5FA60 C6080214 */ lwc1 $f8, 0x0214($s0) ## 00000214 -/* 04774 80A5FA64 01AC7821 */ addu $t7, $t5, $t4 +/* 04774 80A5FA64 01AC7821 */ addu $t7, $t5, $t4 /* 04778 80A5FA68 A60F0032 */ sh $t7, 0x0032($s0) ## 00000032 -/* 0477C 80A5FA6C 4608503C */ c.lt.s $f10, $f8 +/* 0477C 80A5FA6C 4608503C */ c.lt.s $f10, $f8 /* 04780 80A5FA70 860E0032 */ lh $t6, 0x0032($s0) ## 00000032 -/* 04784 80A5FA74 45000010 */ bc1f .L80A5FAB8 +/* 04784 80A5FA74 45000010 */ bc1f .L80A5FAB8 /* 04788 80A5FA78 A60E00B6 */ sh $t6, 0x00B6($s0) ## 000000B6 /* 0478C 80A5FA7C 8E0201F0 */ lw $v0, 0x01F0($s0) ## 000001F0 /* 04790 80A5FA80 2404282B */ addiu $a0, $zero, 0x282B ## $a0 = 0000282B /* 04794 80A5FA84 260500E4 */ addiu $a1, $s0, 0x00E4 ## $a1 = 000000E4 /* 04798 80A5FA88 30580800 */ andi $t8, $v0, 0x0800 ## $t8 = 00000000 -/* 0479C 80A5FA8C 1700000A */ bne $t8, $zero, .L80A5FAB8 +/* 0479C 80A5FA8C 1700000A */ bne $t8, $zero, .L80A5FAB8 /* 047A0 80A5FA90 34590800 */ ori $t9, $v0, 0x0800 ## $t9 = 00000800 /* 047A4 80A5FA94 3C088013 */ lui $t0, 0x8013 ## $t0 = 80130000 /* 047A8 80A5FA98 3C098013 */ lui $t1, 0x8013 ## $t1 = 80130000 /* 047AC 80A5FA9C AE1901F0 */ sw $t9, 0x01F0($s0) ## 000001F0 /* 047B0 80A5FAA0 252933E8 */ addiu $t1, $t1, 0x33E8 ## $t1 = 801333E8 /* 047B4 80A5FAA4 250733E0 */ addiu $a3, $t0, 0x33E0 ## $a3 = 801333E0 -/* 047B8 80A5FAA8 AFA70010 */ sw $a3, 0x0010($sp) -/* 047BC 80A5FAAC AFA90014 */ sw $t1, 0x0014($sp) +/* 047B8 80A5FAA8 AFA70010 */ sw $a3, 0x0010($sp) +/* 047BC 80A5FAAC AFA90014 */ sw $t1, 0x0014($sp) /* 047C0 80A5FAB0 0C03DCE3 */ jal Audio_PlaySoundGeneral - + /* 047C4 80A5FAB4 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 .L80A5FAB8: /* 047C8 80A5FAB8 260A01AC */ addiu $t2, $s0, 0x01AC ## $t2 = 000001AC -/* 047CC 80A5FABC 10000005 */ beq $zero, $zero, .L80A5FAD4 -/* 047D0 80A5FAC0 AFAA0030 */ sw $t2, 0x0030($sp) +/* 047CC 80A5FABC 10000005 */ beq $zero, $zero, .L80A5FAD4 +/* 047D0 80A5FAC0 AFAA0030 */ sw $t2, 0x0030($sp) .L80A5FAC4: -/* 047D4 80A5FAC4 0C297222 */ jal func_80A5C888 -/* 047D8 80A5FAC8 8FA50044 */ lw $a1, 0x0044($sp) +/* 047D4 80A5FAC4 0C297222 */ jal func_80A5C888 +/* 047D8 80A5FAC8 8FA50044 */ lw $a1, 0x0044($sp) /* 047DC 80A5FACC 260B01AC */ addiu $t3, $s0, 0x01AC ## $t3 = 000001AC -/* 047E0 80A5FAD0 AFAB0030 */ sw $t3, 0x0030($sp) +/* 047E0 80A5FAD0 AFAB0030 */ sw $t3, 0x0030($sp) .L80A5FAD4: /* 047E4 80A5FAD4 8E020210 */ lw $v0, 0x0210($s0) ## 00000210 /* 047E8 80A5FAD8 24010006 */ addiu $at, $zero, 0x0006 ## $at = 00000006 -/* 047EC 80A5FADC 14410008 */ bne $v0, $at, .L80A5FB00 +/* 047EC 80A5FADC 14410008 */ bne $v0, $at, .L80A5FB00 /* 047F0 80A5FAE0 3C014100 */ lui $at, 0x4100 ## $at = 41000000 /* 047F4 80A5FAE4 44810000 */ mtc1 $at, $f0 ## $f0 = 8.00 /* 047F8 80A5FAE8 3C0180A6 */ lui $at, %hi(D_80A668F0) ## $at = 80A60000 /* 047FC 80A5FAEC E6000068 */ swc1 $f0, 0x0068($s0) ## 00000068 -/* 04800 80A5FAF0 C43068F0 */ lwc1 $f16, %lo(D_80A668F0)($at) -/* 04804 80A5FAF4 46100482 */ mul.s $f18, $f0, $f16 -/* 04808 80A5FAF8 1000001D */ beq $zero, $zero, .L80A5FB70 +/* 04800 80A5FAF0 C43068F0 */ lwc1 $f16, %lo(D_80A668F0)($at) +/* 04804 80A5FAF4 46100482 */ mul.s $f18, $f0, $f16 +/* 04808 80A5FAF8 1000001D */ beq $zero, $zero, .L80A5FB70 /* 0480C 80A5FAFC E61201C8 */ swc1 $f18, 0x01C8($s0) ## 000001C8 .L80A5FB00: /* 04810 80A5FB00 24010005 */ addiu $at, $zero, 0x0005 ## $at = 00000005 -/* 04814 80A5FB04 14410008 */ bne $v0, $at, .L80A5FB28 +/* 04814 80A5FB04 14410008 */ bne $v0, $at, .L80A5FB28 /* 04818 80A5FB08 3C0140C0 */ lui $at, 0x40C0 ## $at = 40C00000 /* 0481C 80A5FB0C 44810000 */ mtc1 $at, $f0 ## $f0 = 6.00 /* 04820 80A5FB10 3C013EC0 */ lui $at, 0x3EC0 ## $at = 3EC00000 /* 04824 80A5FB14 44812000 */ mtc1 $at, $f4 ## $f4 = 0.38 /* 04828 80A5FB18 E6000068 */ swc1 $f0, 0x0068($s0) ## 00000068 -/* 0482C 80A5FB1C 46040182 */ mul.s $f6, $f0, $f4 -/* 04830 80A5FB20 10000013 */ beq $zero, $zero, .L80A5FB70 +/* 0482C 80A5FB1C 46040182 */ mul.s $f6, $f0, $f4 +/* 04830 80A5FB20 10000013 */ beq $zero, $zero, .L80A5FB70 /* 04834 80A5FB24 E60601C8 */ swc1 $f6, 0x01C8($s0) ## 000001C8 .L80A5FB28: /* 04838 80A5FB28 24010004 */ addiu $at, $zero, 0x0004 ## $at = 00000004 -/* 0483C 80A5FB2C 1441000B */ bne $v0, $at, .L80A5FB5C +/* 0483C 80A5FB2C 1441000B */ bne $v0, $at, .L80A5FB5C /* 04840 80A5FB30 3C014040 */ lui $at, 0x4040 ## $at = 40400000 /* 04844 80A5FB34 44815000 */ mtc1 $at, $f10 ## $f10 = 3.00 /* 04848 80A5FB38 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0484C 80A5FB3C 0C296E72 */ jal func_80A5B9C8 +/* 0484C 80A5FB3C 0C296E72 */ jal func_80A5B9C8 /* 04850 80A5FB40 E60A0068 */ swc1 $f10, 0x0068($s0) ## 00000068 /* 04854 80A5FB44 3C013F40 */ lui $at, 0x3F40 ## $at = 3F400000 /* 04858 80A5FB48 44818000 */ mtc1 $at, $f16 ## $f16 = 0.75 /* 0485C 80A5FB4C C6080068 */ lwc1 $f8, 0x0068($s0) ## 00000068 -/* 04860 80A5FB50 46104482 */ mul.s $f18, $f8, $f16 -/* 04864 80A5FB54 10000006 */ beq $zero, $zero, .L80A5FB70 +/* 04860 80A5FB50 46104482 */ mul.s $f18, $f8, $f16 +/* 04864 80A5FB54 10000006 */ beq $zero, $zero, .L80A5FB70 /* 04868 80A5FB58 E61201C8 */ swc1 $f18, 0x01C8($s0) ## 000001C8 .L80A5FB5C: /* 0486C 80A5FB5C 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 @@ -200,7 +200,7 @@ glabel func_80A5F890 .L80A5FB70: /* 04880 80A5FB70 8E0D01F0 */ lw $t5, 0x01F0($s0) ## 000001F0 /* 04884 80A5FB74 31AC8000 */ andi $t4, $t5, 0x8000 ## $t4 = 00000000 -/* 04888 80A5FB78 15800023 */ bne $t4, $zero, .L80A5FC08 +/* 04888 80A5FB78 15800023 */ bne $t4, $zero, .L80A5FC08 /* 0488C 80A5FB7C 00000000 */ nop /* 04890 80A5FB80 860F0250 */ lh $t7, 0x0250($s0) ## 00000250 /* 04894 80A5FB84 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 @@ -209,14 +209,14 @@ glabel func_80A5F890 /* 048A0 80A5FB90 A60E0250 */ sh $t6, 0x0250($s0) ## 00000250 /* 048A4 80A5FB94 86180250 */ lh $t8, 0x0250($s0) ## 00000250 /* 048A8 80A5FB98 26190228 */ addiu $t9, $s0, 0x0228 ## $t9 = 00000228 -/* 048AC 80A5FB9C 2B01012D */ slti $at, $t8, 0x012D -/* 048B0 80A5FBA0 14200019 */ bne $at, $zero, .L80A5FC08 +/* 048AC 80A5FB9C 2B01012D */ slti $at, $t8, 0x012D +/* 048B0 80A5FBA0 14200019 */ bne $at, $zero, .L80A5FC08 /* 048B4 80A5FBA4 00000000 */ nop -/* 048B8 80A5FBA8 AFB9002C */ sw $t9, 0x002C($sp) -/* 048BC 80A5FBAC 0C297CF7 */ jal func_80A5F3DC -/* 048C0 80A5FBB0 AFA50034 */ sw $a1, 0x0034($sp) -/* 048C4 80A5FBB4 8FA8002C */ lw $t0, 0x002C($sp) -/* 048C8 80A5FBB8 8FA50034 */ lw $a1, 0x0034($sp) +/* 048B8 80A5FBA8 AFB9002C */ sw $t9, 0x002C($sp) +/* 048BC 80A5FBAC 0C297CF7 */ jal func_80A5F3DC +/* 048C0 80A5FBB0 AFA50034 */ sw $a1, 0x0034($sp) +/* 048C4 80A5FBB4 8FA8002C */ lw $t0, 0x002C($sp) +/* 048C8 80A5FBB8 8FA50034 */ lw $a1, 0x0034($sp) /* 048CC 80A5FBBC 3C078013 */ lui $a3, 0x8013 ## $a3 = 80130000 /* 048D0 80A5FBC0 8D0A0000 */ lw $t2, 0x0000($t0) ## 00000000 /* 048D4 80A5FBC4 3C0C8013 */ lui $t4, 0x8013 ## $t4 = 80130000 @@ -230,59 +230,59 @@ glabel func_80A5F890 /* 048F4 80A5FBE4 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 /* 048F8 80A5FBE8 ACAA0008 */ sw $t2, 0x0008($a1) ## 00000008 /* 048FC 80A5FBEC 8E0B01F0 */ lw $t3, 0x01F0($s0) ## 000001F0 -/* 04900 80A5FBF0 000B6900 */ sll $t5, $t3, 4 -/* 04904 80A5FBF4 05A10004 */ bgez $t5, .L80A5FC08 +/* 04900 80A5FBF0 000B6900 */ sll $t5, $t3, 4 +/* 04904 80A5FBF4 05A10004 */ bgez $t5, .L80A5FC08 /* 04908 80A5FBF8 00000000 */ nop -/* 0490C 80A5FBFC AFA70010 */ sw $a3, 0x0010($sp) +/* 0490C 80A5FBFC AFA70010 */ sw $a3, 0x0010($sp) /* 04910 80A5FC00 0C03DCE3 */ jal Audio_PlaySoundGeneral - -/* 04914 80A5FC04 AFAC0014 */ sw $t4, 0x0014($sp) + +/* 04914 80A5FC04 AFAC0014 */ sw $t4, 0x0014($sp) .L80A5FC08: /* 04918 80A5FC08 0C02927F */ jal SkelAnime_FrameUpdateMatrix - -/* 0491C 80A5FC0C 8FA40030 */ lw $a0, 0x0030($sp) -/* 04920 80A5FC10 50400022 */ beql $v0, $zero, .L80A5FC9C -/* 04924 80A5FC14 8FBF0024 */ lw $ra, 0x0024($sp) + +/* 0491C 80A5FC0C 8FA40030 */ lw $a0, 0x0030($sp) +/* 04920 80A5FC10 50400022 */ beql $v0, $zero, .L80A5FC9C +/* 04924 80A5FC14 8FBF0024 */ lw $ra, 0x0024($sp) /* 04928 80A5FC18 8E020210 */ lw $v0, 0x0210($s0) ## 00000210 /* 0492C 80A5FC1C 24010006 */ addiu $at, $zero, 0x0006 ## $at = 00000006 -/* 04930 80A5FC20 54410006 */ bnel $v0, $at, .L80A5FC3C +/* 04930 80A5FC20 54410006 */ bnel $v0, $at, .L80A5FC3C /* 04934 80A5FC24 24010005 */ addiu $at, $zero, 0x0005 ## $at = 00000005 -/* 04938 80A5FC28 0C296EB3 */ jal func_80A5BACC +/* 04938 80A5FC28 0C296EB3 */ jal func_80A5BACC /* 0493C 80A5FC2C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 04940 80A5FC30 10000007 */ beq $zero, $zero, .L80A5FC50 +/* 04940 80A5FC30 10000007 */ beq $zero, $zero, .L80A5FC50 /* 04944 80A5FC34 8E0F01F0 */ lw $t7, 0x01F0($s0) ## 000001F0 /* 04948 80A5FC38 24010005 */ addiu $at, $zero, 0x0005 ## $at = 00000005 .L80A5FC3C: -/* 0494C 80A5FC3C 54410004 */ bnel $v0, $at, .L80A5FC50 +/* 0494C 80A5FC3C 54410004 */ bnel $v0, $at, .L80A5FC50 /* 04950 80A5FC40 8E0F01F0 */ lw $t7, 0x01F0($s0) ## 000001F0 -/* 04954 80A5FC44 0C296EA1 */ jal func_80A5BA84 +/* 04954 80A5FC44 0C296EA1 */ jal func_80A5BA84 /* 04958 80A5FC48 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 0495C 80A5FC4C 8E0F01F0 */ lw $t7, 0x01F0($s0) ## 000001F0 .L80A5FC50: /* 04960 80A5FC50 3C01FFFF */ lui $at, 0xFFFF ## $at = FFFF0000 /* 04964 80A5FC54 34217FFF */ ori $at, $at, 0x7FFF ## $at = FFFF7FFF -/* 04968 80A5FC58 01E17024 */ and $t6, $t7, $at +/* 04968 80A5FC58 01E17024 */ and $t6, $t7, $at /* 0496C 80A5FC5C AE0E01F0 */ sw $t6, 0x01F0($s0) ## 000001F0 /* 04970 80A5FC60 3C0142C8 */ lui $at, 0x42C8 ## $at = 42C80000 /* 04974 80A5FC64 44814000 */ mtc1 $at, $f8 ## $f8 = 100.00 -/* 04978 80A5FC68 C7AA003C */ lwc1 $f10, 0x003C($sp) +/* 04978 80A5FC68 C7AA003C */ lwc1 $f10, 0x003C($sp) /* 0497C 80A5FC6C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 04980 80A5FC70 4608503C */ c.lt.s $f10, $f8 +/* 04980 80A5FC70 4608503C */ c.lt.s $f10, $f8 /* 04984 80A5FC74 00000000 */ nop -/* 04988 80A5FC78 45000005 */ bc1f .L80A5FC90 +/* 04988 80A5FC78 45000005 */ bc1f .L80A5FC90 /* 0498C 80A5FC7C 00000000 */ nop -/* 04990 80A5FC80 0C297CF7 */ jal func_80A5F3DC +/* 04990 80A5FC80 0C297CF7 */ jal func_80A5F3DC /* 04994 80A5FC84 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 04998 80A5FC88 10000004 */ beq $zero, $zero, .L80A5FC9C -/* 0499C 80A5FC8C 8FBF0024 */ lw $ra, 0x0024($sp) +/* 04998 80A5FC88 10000004 */ beq $zero, $zero, .L80A5FC9C +/* 0499C 80A5FC8C 8FBF0024 */ lw $ra, 0x0024($sp) .L80A5FC90: -/* 049A0 80A5FC90 0C297DD8 */ jal func_80A5F760 -/* 049A4 80A5FC94 8FA50044 */ lw $a1, 0x0044($sp) -/* 049A8 80A5FC98 8FBF0024 */ lw $ra, 0x0024($sp) +/* 049A0 80A5FC90 0C297DD8 */ jal func_80A5F760 +/* 049A4 80A5FC94 8FA50044 */ lw $a1, 0x0044($sp) +/* 049A8 80A5FC98 8FBF0024 */ lw $ra, 0x0024($sp) .L80A5FC9C: -/* 049AC 80A5FC9C 8FB00020 */ lw $s0, 0x0020($sp) +/* 049AC 80A5FC9C 8FB00020 */ lw $s0, 0x0020($sp) /* 049B0 80A5FCA0 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 -/* 049B4 80A5FCA4 03E00008 */ jr $ra +/* 049B4 80A5FCA4 03E00008 */ jr $ra /* 049B8 80A5FCA8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5FDD4.s b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5FDD4.s index 271ba7750a..c8945c6158 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5FDD4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A5FDD4.s @@ -1,219 +1,219 @@ glabel func_80A5FDD4 /* 04AE4 80A5FDD4 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 04AE8 80A5FDD8 AFBF002C */ sw $ra, 0x002C($sp) -/* 04AEC 80A5FDDC AFB00028 */ sw $s0, 0x0028($sp) +/* 04AE8 80A5FDD8 AFBF002C */ sw $ra, 0x002C($sp) +/* 04AEC 80A5FDDC AFB00028 */ sw $s0, 0x0028($sp) /* 04AF0 80A5FDE0 C4800068 */ lwc1 $f0, 0x0068($a0) ## 00000068 /* 04AF4 80A5FDE4 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 /* 04AF8 80A5FDE8 8C8E01F0 */ lw $t6, 0x01F0($a0) ## 000001F0 /* 04AFC 80A5FDEC 2401EFFF */ addiu $at, $zero, 0xEFFF ## $at = FFFFEFFF -/* 04B00 80A5FDF0 46002032 */ c.eq.s $f4, $f0 +/* 04B00 80A5FDF0 46002032 */ c.eq.s $f4, $f0 /* 04B04 80A5FDF4 24050004 */ addiu $a1, $zero, 0x0004 ## $a1 = 00000004 -/* 04B08 80A5FDF8 01C17824 */ and $t7, $t6, $at +/* 04B08 80A5FDF8 01C17824 */ and $t7, $t6, $at /* 04B0C 80A5FDFC 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 04B10 80A5FE00 00001825 */ or $v1, $zero, $zero ## $v1 = 00000000 /* 04B14 80A5FE04 AC85014C */ sw $a1, 0x014C($a0) ## 0000014C -/* 04B18 80A5FE08 45000009 */ bc1f .L80A5FE30 +/* 04B18 80A5FE08 45000009 */ bc1f .L80A5FE30 /* 04B1C 80A5FE0C AC8F01F0 */ sw $t7, 0x01F0($a0) ## 000001F0 /* 04B20 80A5FE10 8C980210 */ lw $t8, 0x0210($a0) ## 00000210 /* 04B24 80A5FE14 24040005 */ addiu $a0, $zero, 0x0005 ## $a0 = 00000005 /* 04B28 80A5FE18 24060006 */ addiu $a2, $zero, 0x0006 ## $a2 = 00000006 -/* 04B2C 80A5FE1C 13000002 */ beq $t8, $zero, .L80A5FE28 +/* 04B2C 80A5FE1C 13000002 */ beq $t8, $zero, .L80A5FE28 /* 04B30 80A5FE20 00000000 */ nop /* 04B34 80A5FE24 24030001 */ addiu $v1, $zero, 0x0001 ## $v1 = 00000001 .L80A5FE28: -/* 04B38 80A5FE28 10000023 */ beq $zero, $zero, .L80A5FEB8 +/* 04B38 80A5FE28 10000023 */ beq $zero, $zero, .L80A5FEB8 /* 04B3C 80A5FE2C AE000210 */ sw $zero, 0x0210($s0) ## 00000210 .L80A5FE30: /* 04B40 80A5FE30 3C014040 */ lui $at, 0x4040 ## $at = 40400000 /* 04B44 80A5FE34 44813000 */ mtc1 $at, $f6 ## $f6 = 3.00 /* 04B48 80A5FE38 24060006 */ addiu $a2, $zero, 0x0006 ## $a2 = 00000006 /* 04B4C 80A5FE3C 24040005 */ addiu $a0, $zero, 0x0005 ## $a0 = 00000005 -/* 04B50 80A5FE40 4606003E */ c.le.s $f0, $f6 +/* 04B50 80A5FE40 4606003E */ c.le.s $f0, $f6 /* 04B54 80A5FE44 3C0140C0 */ lui $at, 0x40C0 ## $at = 40C00000 -/* 04B58 80A5FE48 45020008 */ bc1fl .L80A5FE6C +/* 04B58 80A5FE48 45020008 */ bc1fl .L80A5FE6C /* 04B5C 80A5FE4C 44814000 */ mtc1 $at, $f8 ## $f8 = 6.00 /* 04B60 80A5FE50 8E190210 */ lw $t9, 0x0210($s0) ## 00000210 -/* 04B64 80A5FE54 10B90002 */ beq $a1, $t9, .L80A5FE60 +/* 04B64 80A5FE54 10B90002 */ beq $a1, $t9, .L80A5FE60 /* 04B68 80A5FE58 00000000 */ nop /* 04B6C 80A5FE5C 24030001 */ addiu $v1, $zero, 0x0001 ## $v1 = 00000001 .L80A5FE60: -/* 04B70 80A5FE60 10000015 */ beq $zero, $zero, .L80A5FEB8 +/* 04B70 80A5FE60 10000015 */ beq $zero, $zero, .L80A5FEB8 /* 04B74 80A5FE64 AE050210 */ sw $a1, 0x0210($s0) ## 00000210 /* 04B78 80A5FE68 44814000 */ mtc1 $at, $f8 ## $f8 = 6.00 .L80A5FE6C: /* 04B7C 80A5FE6C 24060006 */ addiu $a2, $zero, 0x0006 ## $a2 = 00000006 /* 04B80 80A5FE70 24040005 */ addiu $a0, $zero, 0x0005 ## $a0 = 00000005 -/* 04B84 80A5FE74 4608003E */ c.le.s $f0, $f8 +/* 04B84 80A5FE74 4608003E */ c.le.s $f0, $f8 /* 04B88 80A5FE78 00000000 */ nop -/* 04B8C 80A5FE7C 45020009 */ bc1fl .L80A5FEA4 +/* 04B8C 80A5FE7C 45020009 */ bc1fl .L80A5FEA4 /* 04B90 80A5FE80 8E090210 */ lw $t1, 0x0210($s0) ## 00000210 /* 04B94 80A5FE84 8E080210 */ lw $t0, 0x0210($s0) ## 00000210 /* 04B98 80A5FE88 24040005 */ addiu $a0, $zero, 0x0005 ## $a0 = 00000005 -/* 04B9C 80A5FE8C 10880002 */ beq $a0, $t0, .L80A5FE98 +/* 04B9C 80A5FE8C 10880002 */ beq $a0, $t0, .L80A5FE98 /* 04BA0 80A5FE90 00000000 */ nop /* 04BA4 80A5FE94 24030001 */ addiu $v1, $zero, 0x0001 ## $v1 = 00000001 .L80A5FE98: -/* 04BA8 80A5FE98 10000007 */ beq $zero, $zero, .L80A5FEB8 +/* 04BA8 80A5FE98 10000007 */ beq $zero, $zero, .L80A5FEB8 /* 04BAC 80A5FE9C AE040210 */ sw $a0, 0x0210($s0) ## 00000210 /* 04BB0 80A5FEA0 8E090210 */ lw $t1, 0x0210($s0) ## 00000210 .L80A5FEA4: /* 04BB4 80A5FEA4 24060006 */ addiu $a2, $zero, 0x0006 ## $a2 = 00000006 -/* 04BB8 80A5FEA8 50C90003 */ beql $a2, $t1, .L80A5FEB8 +/* 04BB8 80A5FEA8 50C90003 */ beql $a2, $t1, .L80A5FEB8 /* 04BBC 80A5FEAC AE060210 */ sw $a2, 0x0210($s0) ## 00000210 /* 04BC0 80A5FEB0 24030001 */ addiu $v1, $zero, 0x0001 ## $v1 = 00000001 /* 04BC4 80A5FEB4 AE060210 */ sw $a2, 0x0210($s0) ## 00000210 .L80A5FEB8: /* 04BC8 80A5FEB8 8E020210 */ lw $v0, 0x0210($s0) ## 00000210 /* 04BCC 80A5FEBC 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 -/* 04BD0 80A5FEC0 14A20007 */ bne $a1, $v0, .L80A5FEE0 +/* 04BD0 80A5FEC0 14A20007 */ bne $a1, $v0, .L80A5FEE0 /* 04BD4 80A5FEC4 00000000 */ nop /* 04BD8 80A5FEC8 C60A0068 */ lwc1 $f10, 0x0068($s0) ## 00000068 /* 04BDC 80A5FECC 44818000 */ mtc1 $at, $f16 ## $f16 = 0.50 /* 04BE0 80A5FED0 00000000 */ nop -/* 04BE4 80A5FED4 46105482 */ mul.s $f18, $f10, $f16 -/* 04BE8 80A5FED8 1000002D */ beq $zero, $zero, .L80A5FF90 -/* 04BEC 80A5FEDC E7B20030 */ swc1 $f18, 0x0030($sp) +/* 04BE4 80A5FED4 46105482 */ mul.s $f18, $f10, $f16 +/* 04BE8 80A5FED8 1000002D */ beq $zero, $zero, .L80A5FF90 +/* 04BEC 80A5FEDC E7B20030 */ swc1 $f18, 0x0030($sp) .L80A5FEE0: -/* 04BF0 80A5FEE0 14820013 */ bne $a0, $v0, .L80A5FF30 +/* 04BF0 80A5FEE0 14820013 */ bne $a0, $v0, .L80A5FF30 /* 04BF4 80A5FEE4 3C078013 */ lui $a3, 0x8013 ## $a3 = 80130000 /* 04BF8 80A5FEE8 3C013E80 */ lui $at, 0x3E80 ## $at = 3E800000 /* 04BFC 80A5FEEC 44813000 */ mtc1 $at, $f6 ## $f6 = 0.25 /* 04C00 80A5FEF0 C6040068 */ lwc1 $f4, 0x0068($s0) ## 00000068 /* 04C04 80A5FEF4 3C0A8013 */ lui $t2, 0x8013 ## $t2 = 80130000 /* 04C08 80A5FEF8 24E733E0 */ addiu $a3, $a3, 0x33E0 ## $a3 = 801333E0 -/* 04C0C 80A5FEFC 46062202 */ mul.s $f8, $f4, $f6 +/* 04C0C 80A5FEFC 46062202 */ mul.s $f8, $f4, $f6 /* 04C10 80A5FF00 254A33E8 */ addiu $t2, $t2, 0x33E8 ## $t2 = 801333E8 -/* 04C14 80A5FF04 AFAA0014 */ sw $t2, 0x0014($sp) -/* 04C18 80A5FF08 AFA70010 */ sw $a3, 0x0010($sp) -/* 04C1C 80A5FF0C AFA30034 */ sw $v1, 0x0034($sp) +/* 04C14 80A5FF04 AFAA0014 */ sw $t2, 0x0014($sp) +/* 04C18 80A5FF08 AFA70010 */ sw $a3, 0x0010($sp) +/* 04C1C 80A5FF0C AFA30034 */ sw $v1, 0x0034($sp) /* 04C20 80A5FF10 24042804 */ addiu $a0, $zero, 0x2804 ## $a0 = 00002804 /* 04C24 80A5FF14 260500E4 */ addiu $a1, $s0, 0x00E4 ## $a1 = 000000E4 -/* 04C28 80A5FF18 E7A80030 */ swc1 $f8, 0x0030($sp) +/* 04C28 80A5FF18 E7A80030 */ swc1 $f8, 0x0030($sp) /* 04C2C 80A5FF1C 0C03DCE3 */ jal Audio_PlaySoundGeneral - + /* 04C30 80A5FF20 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 -/* 04C34 80A5FF24 8FA30034 */ lw $v1, 0x0034($sp) -/* 04C38 80A5FF28 10000019 */ beq $zero, $zero, .L80A5FF90 +/* 04C34 80A5FF24 8FA30034 */ lw $v1, 0x0034($sp) +/* 04C38 80A5FF28 10000019 */ beq $zero, $zero, .L80A5FF90 /* 04C3C 80A5FF2C 8E020210 */ lw $v0, 0x0210($s0) ## 00000210 .L80A5FF30: -/* 04C40 80A5FF30 14C20014 */ bne $a2, $v0, .L80A5FF84 +/* 04C40 80A5FF30 14C20014 */ bne $a2, $v0, .L80A5FF84 /* 04C44 80A5FF34 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 /* 04C48 80A5FF38 3C0180A6 */ lui $at, %hi(D_80A668F4) ## $at = 80A60000 -/* 04C4C 80A5FF3C C43068F4 */ lwc1 $f16, %lo(D_80A668F4)($at) +/* 04C4C 80A5FF3C C43068F4 */ lwc1 $f16, %lo(D_80A668F4)($at) /* 04C50 80A5FF40 C60A0068 */ lwc1 $f10, 0x0068($s0) ## 00000068 /* 04C54 80A5FF44 3C078013 */ lui $a3, 0x8013 ## $a3 = 80130000 /* 04C58 80A5FF48 3C0B8013 */ lui $t3, 0x8013 ## $t3 = 80130000 -/* 04C5C 80A5FF4C 46105482 */ mul.s $f18, $f10, $f16 +/* 04C5C 80A5FF4C 46105482 */ mul.s $f18, $f10, $f16 /* 04C60 80A5FF50 24E733E0 */ addiu $a3, $a3, 0x33E0 ## $a3 = 801333E0 /* 04C64 80A5FF54 256B33E8 */ addiu $t3, $t3, 0x33E8 ## $t3 = 801333E8 -/* 04C68 80A5FF58 AFAB0014 */ sw $t3, 0x0014($sp) -/* 04C6C 80A5FF5C AFA70010 */ sw $a3, 0x0010($sp) -/* 04C70 80A5FF60 AFA30034 */ sw $v1, 0x0034($sp) +/* 04C68 80A5FF58 AFAB0014 */ sw $t3, 0x0014($sp) +/* 04C6C 80A5FF5C AFA70010 */ sw $a3, 0x0010($sp) +/* 04C70 80A5FF60 AFA30034 */ sw $v1, 0x0034($sp) /* 04C74 80A5FF64 24042804 */ addiu $a0, $zero, 0x2804 ## $a0 = 00002804 -/* 04C78 80A5FF68 E7B20030 */ swc1 $f18, 0x0030($sp) +/* 04C78 80A5FF68 E7B20030 */ swc1 $f18, 0x0030($sp) /* 04C7C 80A5FF6C 260500E4 */ addiu $a1, $s0, 0x00E4 ## $a1 = 000000E4 /* 04C80 80A5FF70 0C03DCE3 */ jal Audio_PlaySoundGeneral - + /* 04C84 80A5FF74 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 -/* 04C88 80A5FF78 8FA30034 */ lw $v1, 0x0034($sp) -/* 04C8C 80A5FF7C 10000004 */ beq $zero, $zero, .L80A5FF90 +/* 04C88 80A5FF78 8FA30034 */ lw $v1, 0x0034($sp) +/* 04C8C 80A5FF7C 10000004 */ beq $zero, $zero, .L80A5FF90 /* 04C90 80A5FF80 8E020210 */ lw $v0, 0x0210($s0) ## 00000210 .L80A5FF84: /* 04C94 80A5FF84 44812000 */ mtc1 $at, $f4 ## $f4 = 0.00 /* 04C98 80A5FF88 00000000 */ nop -/* 04C9C 80A5FF8C E7A40030 */ swc1 $f4, 0x0030($sp) +/* 04C9C 80A5FF8C E7A40030 */ swc1 $f4, 0x0030($sp) .L80A5FF90: /* 04CA0 80A5FF90 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 04CA4 80A5FF94 5461002B */ bnel $v1, $at, .L80A60044 +/* 04CA4 80A5FF94 5461002B */ bnel $v1, $at, .L80A60044 /* 04CA8 80A5FF98 8E0C0158 */ lw $t4, 0x0158($s0) ## 00000158 /* 04CAC 80A5FF9C 8E0C0158 */ lw $t4, 0x0158($s0) ## 00000158 /* 04CB0 80A5FFA0 3C0E80A6 */ lui $t6, %hi(D_80A65E58) ## $t6 = 80A60000 -/* 04CB4 80A5FFA4 00027880 */ sll $t7, $v0, 2 -/* 04CB8 80A5FFA8 000C6880 */ sll $t5, $t4, 2 -/* 04CBC 80A5FFAC 01CD7021 */ addu $t6, $t6, $t5 -/* 04CC0 80A5FFB0 8DCE5E58 */ lw $t6, %lo(D_80A65E58)($t6) -/* 04CC4 80A5FFB4 01CFC021 */ addu $t8, $t6, $t7 +/* 04CB4 80A5FFA4 00027880 */ sll $t7, $v0, 2 +/* 04CB8 80A5FFA8 000C6880 */ sll $t5, $t4, 2 +/* 04CBC 80A5FFAC 01CD7021 */ addu $t6, $t6, $t5 +/* 04CC0 80A5FFB0 8DCE5E58 */ lw $t6, %lo(D_80A65E58)($t6) +/* 04CC4 80A5FFB4 01CFC021 */ addu $t8, $t6, $t7 /* 04CC8 80A5FFB8 0C028800 */ jal SkelAnime_GetFrameCount - + /* 04CCC 80A5FFBC 8F040000 */ lw $a0, 0x0000($t8) ## 00000000 /* 04CD0 80A5FFC0 8E030210 */ lw $v1, 0x0210($s0) ## 00000210 /* 04CD4 80A5FFC4 3C0180A6 */ lui $at, %hi(D_80A65E60) ## $at = 80A60000 -/* 04CD8 80A5FFC8 C7A80030 */ lwc1 $f8, 0x0030($sp) -/* 04CDC 80A5FFCC 00031880 */ sll $v1, $v1, 2 -/* 04CE0 80A5FFD0 00230821 */ addu $at, $at, $v1 -/* 04CE4 80A5FFD4 C4265E60 */ lwc1 $f6, %lo(D_80A65E60)($at) +/* 04CD8 80A5FFC8 C7A80030 */ lwc1 $f8, 0x0030($sp) +/* 04CDC 80A5FFCC 00031880 */ sll $v1, $v1, 2 +/* 04CE0 80A5FFD0 00230821 */ addu $at, $at, $v1 +/* 04CE4 80A5FFD4 C4265E60 */ lwc1 $f6, %lo(D_80A65E60)($at) /* 04CE8 80A5FFD8 3C013FC0 */ lui $at, 0x3FC0 ## $at = 3FC00000 /* 04CEC 80A5FFDC 44818000 */ mtc1 $at, $f16 ## $f16 = 1.50 -/* 04CF0 80A5FFE0 46083282 */ mul.s $f10, $f6, $f8 +/* 04CF0 80A5FFE0 46083282 */ mul.s $f10, $f6, $f8 /* 04CF4 80A5FFE4 8E190158 */ lw $t9, 0x0158($s0) ## 00000158 /* 04CF8 80A5FFE8 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 04CFC 80A5FFEC 3C0980A6 */ lui $t1, %hi(D_80A65E58) ## $t1 = 80A60000 -/* 04D00 80A5FFF0 00194080 */ sll $t0, $t9, 2 -/* 04D04 80A5FFF4 01284821 */ addu $t1, $t1, $t0 -/* 04D08 80A5FFF8 8D295E58 */ lw $t1, %lo(D_80A65E58)($t1) -/* 04D0C 80A5FFFC 46105482 */ mul.s $f18, $f10, $f16 +/* 04D00 80A5FFF0 00194080 */ sll $t0, $t9, 2 +/* 04D04 80A5FFF4 01284821 */ addu $t1, $t1, $t0 +/* 04D08 80A5FFF8 8D295E58 */ lw $t1, %lo(D_80A65E58)($t1) +/* 04D0C 80A5FFFC 46105482 */ mul.s $f18, $f10, $f16 /* 04D10 80A60000 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 /* 04D14 80A60004 3C01C040 */ lui $at, 0xC040 ## $at = C0400000 -/* 04D18 80A60008 01235021 */ addu $t2, $t1, $v1 +/* 04D18 80A60008 01235021 */ addu $t2, $t1, $v1 /* 04D1C 80A6000C 44814000 */ mtc1 $at, $f8 ## $f8 = -3.00 /* 04D20 80A60010 8D450000 */ lw $a1, 0x0000($t2) ## 00000000 -/* 04D24 80A60014 468021A0 */ cvt.s.w $f6, $f4 -/* 04D28 80A60018 44069000 */ mfc1 $a2, $f18 +/* 04D24 80A60014 468021A0 */ cvt.s.w $f6, $f4 +/* 04D28 80A60018 44069000 */ mfc1 $a2, $f18 /* 04D2C 80A6001C 240B0002 */ addiu $t3, $zero, 0x0002 ## $t3 = 00000002 -/* 04D30 80A60020 44070000 */ mfc1 $a3, $f0 -/* 04D34 80A60024 AFAB0014 */ sw $t3, 0x0014($sp) +/* 04D30 80A60020 44070000 */ mfc1 $a3, $f0 +/* 04D34 80A60024 AFAB0014 */ sw $t3, 0x0014($sp) /* 04D38 80A60028 260401AC */ addiu $a0, $s0, 0x01AC ## $a0 = 000001AC -/* 04D3C 80A6002C E7A60010 */ swc1 $f6, 0x0010($sp) -/* 04D40 80A60030 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 04D44 80A60034 E7A80018 */ swc1 $f8, 0x0018($sp) -/* 04D48 80A60038 10000027 */ beq $zero, $zero, .L80A600D8 -/* 04D4C 80A6003C 8FBF002C */ lw $ra, 0x002C($sp) +/* 04D3C 80A6002C E7A60010 */ swc1 $f6, 0x0010($sp) +/* 04D40 80A60030 0C029468 */ jal SkelAnime_ChangeAnim + +/* 04D44 80A60034 E7A80018 */ swc1 $f8, 0x0018($sp) +/* 04D48 80A60038 10000027 */ beq $zero, $zero, .L80A600D8 +/* 04D4C 80A6003C 8FBF002C */ lw $ra, 0x002C($sp) /* 04D50 80A60040 8E0C0158 */ lw $t4, 0x0158($s0) ## 00000158 .L80A60044: /* 04D54 80A60044 3C0E80A6 */ lui $t6, %hi(D_80A65E58) ## $t6 = 80A60000 -/* 04D58 80A60048 00027880 */ sll $t7, $v0, 2 -/* 04D5C 80A6004C 000C6880 */ sll $t5, $t4, 2 -/* 04D60 80A60050 01CD7021 */ addu $t6, $t6, $t5 -/* 04D64 80A60054 8DCE5E58 */ lw $t6, %lo(D_80A65E58)($t6) -/* 04D68 80A60058 01CFC021 */ addu $t8, $t6, $t7 +/* 04D58 80A60048 00027880 */ sll $t7, $v0, 2 +/* 04D5C 80A6004C 000C6880 */ sll $t5, $t4, 2 +/* 04D60 80A60050 01CD7021 */ addu $t6, $t6, $t5 +/* 04D64 80A60054 8DCE5E58 */ lw $t6, %lo(D_80A65E58)($t6) +/* 04D68 80A60058 01CFC021 */ addu $t8, $t6, $t7 /* 04D6C 80A6005C 0C028800 */ jal SkelAnime_GetFrameCount - + /* 04D70 80A60060 8F040000 */ lw $a0, 0x0000($t8) ## 00000000 /* 04D74 80A60064 8E030210 */ lw $v1, 0x0210($s0) ## 00000210 /* 04D78 80A60068 3C0180A6 */ lui $at, %hi(D_80A65E60) ## $at = 80A60000 -/* 04D7C 80A6006C C7B00030 */ lwc1 $f16, 0x0030($sp) -/* 04D80 80A60070 00031880 */ sll $v1, $v1, 2 -/* 04D84 80A60074 00230821 */ addu $at, $at, $v1 -/* 04D88 80A60078 C42A5E60 */ lwc1 $f10, %lo(D_80A65E60)($at) +/* 04D7C 80A6006C C7B00030 */ lwc1 $f16, 0x0030($sp) +/* 04D80 80A60070 00031880 */ sll $v1, $v1, 2 +/* 04D84 80A60074 00230821 */ addu $at, $at, $v1 +/* 04D88 80A60078 C42A5E60 */ lwc1 $f10, %lo(D_80A65E60)($at) /* 04D8C 80A6007C 3C013FC0 */ lui $at, 0x3FC0 ## $at = 3FC00000 /* 04D90 80A60080 44812000 */ mtc1 $at, $f4 ## $f4 = 1.50 -/* 04D94 80A60084 46105482 */ mul.s $f18, $f10, $f16 +/* 04D94 80A60084 46105482 */ mul.s $f18, $f10, $f16 /* 04D98 80A60088 8E190158 */ lw $t9, 0x0158($s0) ## 00000158 /* 04D9C 80A6008C 44824000 */ mtc1 $v0, $f8 ## $f8 = 0.00 /* 04DA0 80A60090 3C0980A6 */ lui $t1, %hi(D_80A65E58) ## $t1 = 80A60000 -/* 04DA4 80A60094 00194080 */ sll $t0, $t9, 2 -/* 04DA8 80A60098 01284821 */ addu $t1, $t1, $t0 -/* 04DAC 80A6009C 8D295E58 */ lw $t1, %lo(D_80A65E58)($t1) -/* 04DB0 80A600A0 46049182 */ mul.s $f6, $f18, $f4 +/* 04DA4 80A60094 00194080 */ sll $t0, $t9, 2 +/* 04DA8 80A60098 01284821 */ addu $t1, $t1, $t0 +/* 04DAC 80A6009C 8D295E58 */ lw $t1, %lo(D_80A65E58)($t1) +/* 04DB0 80A600A0 46049182 */ mul.s $f6, $f18, $f4 /* 04DB4 80A600A4 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 04DB8 80A600A8 01235021 */ addu $t2, $t1, $v1 +/* 04DB8 80A600A8 01235021 */ addu $t2, $t1, $v1 /* 04DBC 80A600AC 8D450000 */ lw $a1, 0x0000($t2) ## 00000000 /* 04DC0 80A600B0 240B0002 */ addiu $t3, $zero, 0x0002 ## $t3 = 00000002 -/* 04DC4 80A600B4 44070000 */ mfc1 $a3, $f0 -/* 04DC8 80A600B8 468042A0 */ cvt.s.w $f10, $f8 -/* 04DCC 80A600BC 44063000 */ mfc1 $a2, $f6 -/* 04DD0 80A600C0 AFAB0014 */ sw $t3, 0x0014($sp) +/* 04DC4 80A600B4 44070000 */ mfc1 $a3, $f0 +/* 04DC8 80A600B8 468042A0 */ cvt.s.w $f10, $f8 +/* 04DCC 80A600BC 44063000 */ mfc1 $a2, $f6 +/* 04DD0 80A600C0 AFAB0014 */ sw $t3, 0x0014($sp) /* 04DD4 80A600C4 260401AC */ addiu $a0, $s0, 0x01AC ## $a0 = 000001AC -/* 04DD8 80A600C8 E7A00018 */ swc1 $f0, 0x0018($sp) -/* 04DDC 80A600CC 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 04DE0 80A600D0 E7AA0010 */ swc1 $f10, 0x0010($sp) -/* 04DE4 80A600D4 8FBF002C */ lw $ra, 0x002C($sp) +/* 04DD8 80A600C8 E7A00018 */ swc1 $f0, 0x0018($sp) +/* 04DDC 80A600CC 0C029468 */ jal SkelAnime_ChangeAnim + +/* 04DE0 80A600D0 E7AA0010 */ swc1 $f10, 0x0010($sp) +/* 04DE4 80A600D4 8FBF002C */ lw $ra, 0x002C($sp) .L80A600D8: -/* 04DE8 80A600D8 8FB00028 */ lw $s0, 0x0028($sp) +/* 04DE8 80A600D8 8FB00028 */ lw $s0, 0x0028($sp) /* 04DEC 80A600DC 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 -/* 04DF0 80A600E0 03E00008 */ jr $ra +/* 04DF0 80A600E0 03E00008 */ jr $ra /* 04DF4 80A600E4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A60294.s b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A60294.s index 5080502a34..6b09abd57f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A60294.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A60294.s @@ -1,30 +1,30 @@ glabel func_80A60294 /* 04FA4 80A60294 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 04FA8 80A60298 AFBF0014 */ sw $ra, 0x0014($sp) -/* 04FAC 80A6029C AFA5001C */ sw $a1, 0x001C($sp) -/* 04FB0 80A602A0 AFA60020 */ sw $a2, 0x0020($sp) +/* 04FA8 80A60298 AFBF0014 */ sw $ra, 0x0014($sp) +/* 04FAC 80A6029C AFA5001C */ sw $a1, 0x001C($sp) +/* 04FB0 80A602A0 AFA60020 */ sw $a2, 0x0020($sp) /* 04FB4 80A602A4 240E0006 */ addiu $t6, $zero, 0x0006 ## $t6 = 00000006 /* 04FB8 80A602A8 240F0001 */ addiu $t7, $zero, 0x0001 ## $t7 = 00000001 /* 04FBC 80A602AC AC8E0210 */ sw $t6, 0x0210($a0) ## 00000210 /* 04FC0 80A602B0 AC8F0380 */ sw $t7, 0x0380($a0) ## 00000380 /* 04FC4 80A602B4 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 /* 04FC8 80A602B8 3C0180A6 */ lui $at, %hi(D_80A668FC) ## $at = 80A60000 -/* 04FCC 80A602BC C42668FC */ lwc1 $f6, %lo(D_80A668FC)($at) +/* 04FCC 80A602BC C42668FC */ lwc1 $f6, %lo(D_80A668FC)($at) /* 04FD0 80A602C0 C4E40068 */ lwc1 $f4, 0x0068($a3) ## 00000068 /* 04FD4 80A602C4 8CF80158 */ lw $t8, 0x0158($a3) ## 00000158 /* 04FD8 80A602C8 3C0880A6 */ lui $t0, %hi(D_80A65E58) ## $t0 = 80A60000 -/* 04FDC 80A602CC 46062202 */ mul.s $f8, $f4, $f6 -/* 04FE0 80A602D0 0018C880 */ sll $t9, $t8, 2 -/* 04FE4 80A602D4 01194021 */ addu $t0, $t0, $t9 -/* 04FE8 80A602D8 8D085E58 */ lw $t0, %lo(D_80A65E58)($t0) +/* 04FDC 80A602CC 46062202 */ mul.s $f8, $f4, $f6 +/* 04FE0 80A602D0 0018C880 */ sll $t9, $t8, 2 +/* 04FE4 80A602D4 01194021 */ addu $t0, $t0, $t9 +/* 04FE8 80A602D8 8D085E58 */ lw $t0, %lo(D_80A65E58)($t0) /* 04FEC 80A602DC 248401AC */ addiu $a0, $a0, 0x01AC ## $a0 = 000001AC /* 04FF0 80A602E0 8D050018 */ lw $a1, 0x0018($t0) ## 80A60018 -/* 04FF4 80A602E4 44064000 */ mfc1 $a2, $f8 -/* 04FF8 80A602E8 0C0294A7 */ jal func_800A529C +/* 04FF4 80A602E4 44064000 */ mfc1 $a2, $f8 +/* 04FF8 80A602E8 0C0294A7 */ jal SkelAnime_ChangeAnimPlaybackStop /* 04FFC 80A602EC 00000000 */ nop -/* 05000 80A602F0 8FBF0014 */ lw $ra, 0x0014($sp) +/* 05000 80A602F0 8FBF0014 */ lw $ra, 0x0014($sp) /* 05004 80A602F4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 05008 80A602F8 03E00008 */ jr $ra +/* 05008 80A602F8 03E00008 */ jr $ra /* 0500C 80A602FC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A60300.s b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A60300.s index 87df6361ea..8bfb06bf34 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A60300.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A60300.s @@ -1,45 +1,45 @@ glabel func_80A60300 /* 05010 80A60300 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 05014 80A60304 AFBF001C */ sw $ra, 0x001C($sp) -/* 05018 80A60308 AFB00018 */ sw $s0, 0x0018($sp) -/* 0501C 80A6030C AFA5003C */ sw $a1, 0x003C($sp) +/* 05014 80A60304 AFBF001C */ sw $ra, 0x001C($sp) +/* 05018 80A60308 AFB00018 */ sw $s0, 0x0018($sp) +/* 0501C 80A6030C AFA5003C */ sw $a1, 0x003C($sp) /* 05020 80A60310 8CCE0018 */ lw $t6, 0x0018($a2) ## 00000018 /* 05024 80A60314 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 05028 80A60318 26050024 */ addiu $a1, $s0, 0x0024 ## $a1 = 00000024 /* 0502C 80A6031C 448E2000 */ mtc1 $t6, $f4 ## $f4 = 0.00 /* 05030 80A60320 27A4002C */ addiu $a0, $sp, 0x002C ## $a0 = FFFFFFF4 -/* 05034 80A60324 468021A0 */ cvt.s.w $f6, $f4 -/* 05038 80A60328 E7A6002C */ swc1 $f6, 0x002C($sp) +/* 05034 80A60324 468021A0 */ cvt.s.w $f6, $f4 +/* 05038 80A60328 E7A6002C */ swc1 $f6, 0x002C($sp) /* 0503C 80A6032C 8CCF001C */ lw $t7, 0x001C($a2) ## 0000001C /* 05040 80A60330 448F4000 */ mtc1 $t7, $f8 ## $f8 = 0.00 /* 05044 80A60334 00000000 */ nop -/* 05048 80A60338 468042A0 */ cvt.s.w $f10, $f8 -/* 0504C 80A6033C E7AA0030 */ swc1 $f10, 0x0030($sp) +/* 05048 80A60338 468042A0 */ cvt.s.w $f10, $f8 +/* 0504C 80A6033C E7AA0030 */ swc1 $f10, 0x0030($sp) /* 05050 80A60340 8CD80020 */ lw $t8, 0x0020($a2) ## 00000020 -/* 05054 80A60344 AFA50024 */ sw $a1, 0x0024($sp) +/* 05054 80A60344 AFA50024 */ sw $a1, 0x0024($sp) /* 05058 80A60348 44988000 */ mtc1 $t8, $f16 ## $f16 = 0.00 /* 0505C 80A6034C 00000000 */ nop -/* 05060 80A60350 468084A0 */ cvt.s.w $f18, $f16 -/* 05064 80A60354 0C032D9E */ jal func_800CB678 -/* 05068 80A60358 E7B20034 */ swc1 $f18, 0x0034($sp) +/* 05060 80A60350 468084A0 */ cvt.s.w $f18, $f16 +/* 05064 80A60354 0C032D9E */ jal func_800CB678 +/* 05068 80A60358 E7B20034 */ swc1 $f18, 0x0034($sp) /* 0506C 80A6035C 3C014100 */ lui $at, 0x4100 ## $at = 41000000 /* 05070 80A60360 44811000 */ mtc1 $at, $f2 ## $f2 = 8.00 -/* 05074 80A60364 8FA50024 */ lw $a1, 0x0024($sp) +/* 05074 80A60364 8FA50024 */ lw $a1, 0x0024($sp) /* 05078 80A60368 27A6002C */ addiu $a2, $sp, 0x002C ## $a2 = FFFFFFF4 -/* 0507C 80A6036C 4600103C */ c.lt.s $f2, $f0 +/* 0507C 80A6036C 4600103C */ c.lt.s $f2, $f0 /* 05080 80A60370 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 05084 80A60374 24070190 */ addiu $a3, $zero, 0x0190 ## $a3 = 00000190 -/* 05088 80A60378 4502000C */ bc1fl .L80A603AC +/* 05088 80A60378 4502000C */ bc1fl .L80A603AC /* 0508C 80A6037C 8CC80000 */ lw $t0, 0x0000($a2) ## FFFFFFF4 -/* 05090 80A60380 0C296D78 */ jal func_80A5B5E0 -/* 05094 80A60384 8FA5003C */ lw $a1, 0x003C($sp) +/* 05090 80A60380 0C296D78 */ jal func_80A5B5E0 +/* 05094 80A60384 8FA5003C */ lw $a1, 0x003C($sp) /* 05098 80A60388 3C014100 */ lui $at, 0x4100 ## $at = 41000000 /* 0509C 80A6038C 44811000 */ mtc1 $at, $f2 ## $f2 = 8.00 /* 050A0 80A60390 3C0180A6 */ lui $at, %hi(D_80A66900) ## $at = 80A60000 /* 050A4 80A60394 E6020068 */ swc1 $f2, 0x0068($s0) ## 00000068 -/* 050A8 80A60398 C4246900 */ lwc1 $f4, %lo(D_80A66900)($at) -/* 050AC 80A6039C 46041182 */ mul.s $f6, $f2, $f4 -/* 050B0 80A603A0 10000009 */ beq $zero, $zero, .L80A603C8 +/* 050A8 80A60398 C4246900 */ lwc1 $f4, %lo(D_80A66900)($at) +/* 050AC 80A6039C 46041182 */ mul.s $f6, $f2, $f4 +/* 050B0 80A603A0 10000009 */ beq $zero, $zero, .L80A603C8 /* 050B4 80A603A4 E60601C8 */ swc1 $f6, 0x01C8($s0) ## 000001C8 /* 050B8 80A603A8 8CC80000 */ lw $t0, 0x0000($a2) ## 00000000 .L80A603AC: @@ -53,38 +53,38 @@ glabel func_80A60300 .L80A603C8: /* 050D8 80A603C8 260401AC */ addiu $a0, $s0, 0x01AC ## $a0 = 000001AC /* 050DC 80A603CC 0C02927F */ jal SkelAnime_FrameUpdateMatrix - -/* 050E0 80A603D0 AFA40024 */ sw $a0, 0x0024($sp) -/* 050E4 80A603D4 50400019 */ beql $v0, $zero, .L80A6043C -/* 050E8 80A603D8 8FBF001C */ lw $ra, 0x001C($sp) -/* 050EC 80A603DC 0C296EB3 */ jal func_80A5BACC + +/* 050E0 80A603D0 AFA40024 */ sw $a0, 0x0024($sp) +/* 050E4 80A603D4 50400019 */ beql $v0, $zero, .L80A6043C +/* 050E8 80A603D8 8FBF001C */ lw $ra, 0x001C($sp) +/* 050EC 80A603DC 0C296EB3 */ jal func_80A5BACC /* 050F0 80A603E0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 050F4 80A603E4 44806000 */ mtc1 $zero, $f12 ## $f12 = 0.00 /* 050F8 80A603E8 24050078 */ addiu $a1, $zero, 0x0078 ## $a1 = 00000078 /* 050FC 80A603EC 24060008 */ addiu $a2, $zero, 0x0008 ## $a2 = 00000008 -/* 05100 80A603F0 0C02A800 */ jal func_800AA000 +/* 05100 80A603F0 0C02A800 */ jal func_800AA000 /* 05104 80A603F4 240700FF */ addiu $a3, $zero, 0x00FF ## $a3 = 000000FF /* 05108 80A603F8 3C0180A6 */ lui $at, %hi(D_80A66904) ## $at = 80A60000 -/* 0510C 80A603FC C4306904 */ lwc1 $f16, %lo(D_80A66904)($at) +/* 0510C 80A603FC C4306904 */ lwc1 $f16, %lo(D_80A66904)($at) /* 05110 80A60400 C60A0068 */ lwc1 $f10, 0x0068($s0) ## 00000068 /* 05114 80A60404 8E090158 */ lw $t1, 0x0158($s0) ## 00000158 /* 05118 80A60408 3C0B80A6 */ lui $t3, %hi(D_80A65E58) ## $t3 = 80A60000 -/* 0511C 80A6040C 46105482 */ mul.s $f18, $f10, $f16 -/* 05120 80A60410 00095080 */ sll $t2, $t1, 2 +/* 0511C 80A6040C 46105482 */ mul.s $f18, $f10, $f16 +/* 05120 80A60410 00095080 */ sll $t2, $t1, 2 /* 05124 80A60414 8E0C0210 */ lw $t4, 0x0210($s0) ## 00000210 -/* 05128 80A60418 016A5821 */ addu $t3, $t3, $t2 -/* 0512C 80A6041C 8D6B5E58 */ lw $t3, %lo(D_80A65E58)($t3) -/* 05130 80A60420 000C6880 */ sll $t5, $t4, 2 -/* 05134 80A60424 8FA40024 */ lw $a0, 0x0024($sp) -/* 05138 80A60428 44069000 */ mfc1 $a2, $f18 -/* 0513C 80A6042C 016D7021 */ addu $t6, $t3, $t5 -/* 05140 80A60430 0C0294A7 */ jal func_800A529C +/* 05128 80A60418 016A5821 */ addu $t3, $t3, $t2 +/* 0512C 80A6041C 8D6B5E58 */ lw $t3, %lo(D_80A65E58)($t3) +/* 05130 80A60420 000C6880 */ sll $t5, $t4, 2 +/* 05134 80A60424 8FA40024 */ lw $a0, 0x0024($sp) +/* 05138 80A60428 44069000 */ mfc1 $a2, $f18 +/* 0513C 80A6042C 016D7021 */ addu $t6, $t3, $t5 +/* 05140 80A60430 0C0294A7 */ jal SkelAnime_ChangeAnimPlaybackStop /* 05144 80A60434 8DC50000 */ lw $a1, 0x0000($t6) ## 00000000 -/* 05148 80A60438 8FBF001C */ lw $ra, 0x001C($sp) +/* 05148 80A60438 8FBF001C */ lw $ra, 0x001C($sp) .L80A6043C: -/* 0514C 80A6043C 8FB00018 */ lw $s0, 0x0018($sp) +/* 0514C 80A6043C 8FB00018 */ lw $s0, 0x0018($sp) /* 05150 80A60440 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 -/* 05154 80A60444 03E00008 */ jr $ra +/* 05154 80A60444 03E00008 */ jr $ra /* 05158 80A60448 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A60470.s b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A60470.s index 6072a93053..5168437cb2 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A60470.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A60470.s @@ -1,43 +1,43 @@ glabel func_80A60470 /* 05180 80A60470 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 05184 80A60474 AFBF002C */ sw $ra, 0x002C($sp) -/* 05188 80A60478 AFB00028 */ sw $s0, 0x0028($sp) -/* 0518C 80A6047C AFA5003C */ sw $a1, 0x003C($sp) +/* 05184 80A60474 AFBF002C */ sw $ra, 0x002C($sp) +/* 05188 80A60478 AFB00028 */ sw $s0, 0x0028($sp) +/* 0518C 80A6047C AFA5003C */ sw $a1, 0x003C($sp) /* 05190 80A60480 C48401C4 */ lwc1 $f4, 0x01C4($a0) ## 000001C4 /* 05194 80A60484 240E0008 */ addiu $t6, $zero, 0x0008 ## $t6 = 00000008 /* 05198 80A60488 AC8E0210 */ sw $t6, 0x0210($a0) ## 00000210 -/* 0519C 80A6048C E7A40034 */ swc1 $f4, 0x0034($sp) +/* 0519C 80A6048C E7A40034 */ swc1 $f4, 0x0034($sp) /* 051A0 80A60490 8C8F0158 */ lw $t7, 0x0158($a0) ## 00000158 /* 051A4 80A60494 3C1980A6 */ lui $t9, %hi(D_80A65E58) ## $t9 = 80A60000 /* 051A8 80A60498 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 051AC 80A6049C 000FC080 */ sll $t8, $t7, 2 -/* 051B0 80A604A0 0338C821 */ addu $t9, $t9, $t8 -/* 051B4 80A604A4 8F395E58 */ lw $t9, %lo(D_80A65E58)($t9) +/* 051AC 80A6049C 000FC080 */ sll $t8, $t7, 2 +/* 051B0 80A604A0 0338C821 */ addu $t9, $t9, $t8 +/* 051B4 80A604A4 8F395E58 */ lw $t9, %lo(D_80A65E58)($t9) /* 051B8 80A604A8 0C028800 */ jal SkelAnime_GetFrameCount - + /* 051BC 80A604AC 8F240020 */ lw $a0, 0x0020($t9) ## 80A60020 /* 051C0 80A604B0 8E080158 */ lw $t0, 0x0158($s0) ## 00000158 /* 051C4 80A604B4 44823000 */ mtc1 $v0, $f6 ## $f6 = 0.00 /* 051C8 80A604B8 3C0A80A6 */ lui $t2, %hi(D_80A65E58) ## $t2 = 80A60000 -/* 051CC 80A604BC 00084880 */ sll $t1, $t0, 2 +/* 051CC 80A604BC 00084880 */ sll $t1, $t0, 2 /* 051D0 80A604C0 8E0B0210 */ lw $t3, 0x0210($s0) ## 00000210 -/* 051D4 80A604C4 01495021 */ addu $t2, $t2, $t1 -/* 051D8 80A604C8 8D4A5E58 */ lw $t2, %lo(D_80A65E58)($t2) -/* 051DC 80A604CC 46803220 */ cvt.s.w $f8, $f6 -/* 051E0 80A604D0 000B6080 */ sll $t4, $t3, 2 +/* 051D4 80A604C4 01495021 */ addu $t2, $t2, $t1 +/* 051D8 80A604C8 8D4A5E58 */ lw $t2, %lo(D_80A65E58)($t2) +/* 051DC 80A604CC 46803220 */ cvt.s.w $f8, $f6 +/* 051E0 80A604D0 000B6080 */ sll $t4, $t3, 2 /* 051E4 80A604D4 3C01C040 */ lui $at, 0xC040 ## $at = C0400000 -/* 051E8 80A604D8 014C6821 */ addu $t5, $t2, $t4 +/* 051E8 80A604D8 014C6821 */ addu $t5, $t2, $t4 /* 051EC 80A604DC 44815000 */ mtc1 $at, $f10 ## $f10 = -3.00 /* 051F0 80A604E0 8DA50000 */ lw $a1, 0x0000($t5) ## 00000000 /* 051F4 80A604E4 240E0002 */ addiu $t6, $zero, 0x0002 ## $t6 = 00000002 -/* 051F8 80A604E8 AFAE0014 */ sw $t6, 0x0014($sp) -/* 051FC 80A604EC E7A80010 */ swc1 $f8, 0x0010($sp) +/* 051F8 80A604E8 AFAE0014 */ sw $t6, 0x0014($sp) +/* 051FC 80A604EC E7A80010 */ swc1 $f8, 0x0010($sp) /* 05200 80A604F0 260401AC */ addiu $a0, $s0, 0x01AC ## $a0 = 000001AC /* 05204 80A604F4 3C063FC0 */ lui $a2, 0x3FC0 ## $a2 = 3FC00000 -/* 05208 80A604F8 8FA70034 */ lw $a3, 0x0034($sp) -/* 0520C 80A604FC 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 05210 80A60500 E7AA0018 */ swc1 $f10, 0x0018($sp) +/* 05208 80A604F8 8FA70034 */ lw $a3, 0x0034($sp) +/* 0520C 80A604FC 0C029468 */ jal SkelAnime_ChangeAnim + +/* 05210 80A60500 E7AA0018 */ swc1 $f10, 0x0018($sp) /* 05214 80A60504 C6100028 */ lwc1 $f16, 0x0028($s0) ## 00000028 /* 05218 80A60508 44809000 */ mtc1 $zero, $f18 ## $f18 = 0.00 /* 0521C 80A6050C 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 @@ -48,36 +48,36 @@ glabel func_80A60470 /* 05230 80A60520 E6040060 */ swc1 $f4, 0x0060($s0) ## 00000060 /* 05234 80A60524 844F0002 */ lh $t7, 0x0002($v0) ## 00000002 /* 05238 80A60528 3C0180A6 */ lui $at, %hi(D_80A66908) ## $at = 80A60000 -/* 0523C 80A6052C C42A6908 */ lwc1 $f10, %lo(D_80A66908)($at) +/* 0523C 80A6052C C42A6908 */ lwc1 $f10, %lo(D_80A66908)($at) /* 05240 80A60530 448F3000 */ mtc1 $t7, $f6 ## $f6 = 0.00 /* 05244 80A60534 C608025C */ lwc1 $f8, 0x025C($s0) ## 0000025C /* 05248 80A60538 8E1801F0 */ lw $t8, 0x01F0($s0) ## 000001F0 -/* 0524C 80A6053C 46803020 */ cvt.s.w $f0, $f6 +/* 0524C 80A6053C 46803020 */ cvt.s.w $f0, $f6 /* 05250 80A60540 3C078013 */ lui $a3, 0x8013 ## $a3 = 80130000 /* 05254 80A60544 3C088013 */ lui $t0, 0x8013 ## $t0 = 80130000 /* 05258 80A60548 37190008 */ ori $t9, $t8, 0x0008 ## $t9 = 00000008 /* 0525C 80A6054C 24E733E0 */ addiu $a3, $a3, 0x33E0 ## $a3 = 801333E0 /* 05260 80A60550 AE1901F0 */ sw $t9, 0x01F0($s0) ## 000001F0 -/* 05264 80A60554 460A0402 */ mul.s $f16, $f0, $f10 +/* 05264 80A60554 460A0402 */ mul.s $f16, $f0, $f10 /* 05268 80A60558 250833E8 */ addiu $t0, $t0, 0x33E8 ## $t0 = 801333E8 /* 0526C 80A6055C 24042818 */ addiu $a0, $zero, 0x2818 ## $a0 = 00002818 /* 05270 80A60560 260500E4 */ addiu $a1, $s0, 0x00E4 ## $a1 = 000000E4 /* 05274 80A60564 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 -/* 05278 80A60568 46104481 */ sub.s $f18, $f8, $f16 +/* 05278 80A60568 46104481 */ sub.s $f18, $f8, $f16 /* 0527C 80A6056C E612025C */ swc1 $f18, 0x025C($s0) ## 0000025C -/* 05280 80A60570 AFA80014 */ sw $t0, 0x0014($sp) +/* 05280 80A60570 AFA80014 */ sw $t0, 0x0014($sp) /* 05284 80A60574 0C03DCE3 */ jal Audio_PlaySoundGeneral - -/* 05288 80A60578 AFA70010 */ sw $a3, 0x0010($sp) + +/* 05288 80A60578 AFA70010 */ sw $a3, 0x0010($sp) /* 0528C 80A6057C 44806000 */ mtc1 $zero, $f12 ## $f12 = 0.00 /* 05290 80A60580 240500AA */ addiu $a1, $zero, 0x00AA ## $a1 = 000000AA /* 05294 80A60584 2406000A */ addiu $a2, $zero, 0x000A ## $a2 = 0000000A -/* 05298 80A60588 0C02A800 */ jal func_800AA000 +/* 05298 80A60588 0C02A800 */ jal func_800AA000 /* 0529C 80A6058C 2407000A */ addiu $a3, $zero, 0x000A ## $a3 = 0000000A -/* 052A0 80A60590 8FBF002C */ lw $ra, 0x002C($sp) -/* 052A4 80A60594 8FB00028 */ lw $s0, 0x0028($sp) +/* 052A0 80A60590 8FBF002C */ lw $ra, 0x002C($sp) +/* 052A4 80A60594 8FB00028 */ lw $s0, 0x0028($sp) /* 052A8 80A60598 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 -/* 052AC 80A6059C 03E00008 */ jr $ra +/* 052AC 80A6059C 03E00008 */ jr $ra /* 052B0 80A605A0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A605E0.s b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A605E0.s index bb00f5462a..09214e6785 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A605E0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A605E0.s @@ -1,18 +1,18 @@ glabel func_80A605E0 /* 052F0 80A605E0 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 -/* 052F4 80A605E4 AFBF0024 */ sw $ra, 0x0024($sp) -/* 052F8 80A605E8 AFB00020 */ sw $s0, 0x0020($sp) -/* 052FC 80A605EC AFA50044 */ sw $a1, 0x0044($sp) +/* 052F4 80A605E4 AFBF0024 */ sw $ra, 0x0024($sp) +/* 052F8 80A605E8 AFB00020 */ sw $s0, 0x0020($sp) +/* 052FC 80A605EC AFA50044 */ sw $a1, 0x0044($sp) /* 05300 80A605F0 948E0384 */ lhu $t6, 0x0384($a0) ## 00000384 /* 05304 80A605F4 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 05308 80A605F8 3C014150 */ lui $at, 0x4150 ## $at = 41500000 /* 0530C 80A605FC 31CF0001 */ andi $t7, $t6, 0x0001 ## $t7 = 00000000 -/* 05310 80A60600 51E00006 */ beql $t7, $zero, .L80A6061C +/* 05310 80A60600 51E00006 */ beql $t7, $zero, .L80A6061C /* 05314 80A60604 44812000 */ mtc1 $at, $f4 ## $f4 = 13.00 -/* 05318 80A60608 0C2980C0 */ jal func_80A60300 +/* 05318 80A60608 0C2980C0 */ jal func_80A60300 /* 0531C 80A6060C 00000000 */ nop -/* 05320 80A60610 10000085 */ beq $zero, $zero, .L80A60828 -/* 05324 80A60614 8FBF0024 */ lw $ra, 0x0024($sp) +/* 05320 80A60610 10000085 */ beq $zero, $zero, .L80A60828 +/* 05324 80A60614 8FBF0024 */ lw $ra, 0x0024($sp) /* 05328 80A60618 44812000 */ mtc1 $at, $f4 ## $f4 = 0.00 .L80A6061C: /* 0532C 80A6061C 3C014198 */ lui $at, 0x4198 ## $at = 41980000 @@ -20,20 +20,20 @@ glabel func_80A605E0 /* 05334 80A60624 44813000 */ mtc1 $at, $f6 ## $f6 = 19.00 /* 05338 80A60628 8E1801F0 */ lw $t8, 0x01F0($s0) ## 000001F0 /* 0533C 80A6062C 260401AC */ addiu $a0, $s0, 0x01AC ## $a0 = 000001AC -/* 05340 80A60630 4602303C */ c.lt.s $f6, $f2 +/* 05340 80A60630 4602303C */ c.lt.s $f6, $f2 /* 05344 80A60634 37190004 */ ori $t9, $t8, 0x0004 ## $t9 = 00000004 /* 05348 80A60638 AE1901F0 */ sw $t9, 0x01F0($s0) ## 000001F0 /* 0534C 80A6063C E6040068 */ swc1 $f4, 0x0068($s0) ## 00000068 -/* 05350 80A60640 4502001E */ bc1fl .L80A606BC +/* 05350 80A60640 4502001E */ bc1fl .L80A606BC /* 05354 80A60644 8E0201CC */ lw $v0, 0x01CC($s0) ## 000001CC /* 05358 80A60648 44805000 */ mtc1 $zero, $f10 ## $f10 = 0.00 /* 0535C 80A6064C C6100060 */ lwc1 $f16, 0x0060($s0) ## 00000060 /* 05360 80A60650 3C01C060 */ lui $at, 0xC060 ## $at = C0600000 /* 05364 80A60654 44814000 */ mtc1 $at, $f8 ## $f8 = -3.50 -/* 05368 80A60658 46105032 */ c.eq.s $f10, $f16 +/* 05368 80A60658 46105032 */ c.eq.s $f10, $f16 /* 0536C 80A6065C 3C01C128 */ lui $at, 0xC128 ## $at = C1280000 /* 05370 80A60660 E608006C */ swc1 $f8, 0x006C($s0) ## 0000006C -/* 05374 80A60664 45020005 */ bc1fl .L80A6067C +/* 05374 80A60664 45020005 */ bc1fl .L80A6067C /* 05378 80A60668 3C0142B4 */ lui $at, 0x42B4 ## $at = 42B40000 /* 0537C 80A6066C 44819000 */ mtc1 $at, $f18 ## $f18 = 90.00 /* 05380 80A60670 00000000 */ nop @@ -44,55 +44,55 @@ glabel func_80A605E0 /* 05390 80A60680 C6060080 */ lwc1 $f6, 0x0080($s0) ## 00000080 /* 05394 80A60684 C6040028 */ lwc1 $f4, 0x0028($s0) ## 00000028 /* 05398 80A60688 3C013FC0 */ lui $at, 0x3FC0 ## $at = 3FC00000 -/* 0539C 80A6068C 46083280 */ add.s $f10, $f6, $f8 -/* 053A0 80A60690 460A203C */ c.lt.s $f4, $f10 +/* 0539C 80A6068C 46083280 */ add.s $f10, $f6, $f8 +/* 053A0 80A60690 460A203C */ c.lt.s $f4, $f10 /* 053A4 80A60694 00000000 */ nop -/* 053A8 80A60698 45020005 */ bc1fl .L80A606B0 +/* 053A8 80A60698 45020005 */ bc1fl .L80A606B0 /* 053AC 80A6069C 44809000 */ mtc1 $zero, $f18 ## $f18 = 0.00 /* 053B0 80A606A0 44818000 */ mtc1 $at, $f16 ## $f16 = 1.50 -/* 053B4 80A606A4 1000000F */ beq $zero, $zero, .L80A606E4 +/* 053B4 80A606A4 1000000F */ beq $zero, $zero, .L80A606E4 /* 053B8 80A606A8 E61001C8 */ swc1 $f16, 0x01C8($s0) ## 000001C8 /* 053BC 80A606AC 44809000 */ mtc1 $zero, $f18 ## $f18 = 0.00 .L80A606B0: -/* 053C0 80A606B0 1000000C */ beq $zero, $zero, .L80A606E4 +/* 053C0 80A606B0 1000000C */ beq $zero, $zero, .L80A606E4 /* 053C4 80A606B4 E61201C8 */ swc1 $f18, 0x01C8($s0) ## 000001C8 /* 053C8 80A606B8 8E0201CC */ lw $v0, 0x01CC($s0) ## 000001CC .L80A606BC: /* 053CC 80A606BC 3C0180A6 */ lui $at, %hi(D_80A6690C) ## $at = 80A60000 -/* 053D0 80A606C0 C424690C */ lwc1 $f4, %lo(D_80A6690C)($at) +/* 053D0 80A606C0 C424690C */ lwc1 $f4, %lo(D_80A6690C)($at) /* 053D4 80A606C4 84480002 */ lh $t0, 0x0002($v0) ## 00000002 /* 053D8 80A606C8 C6080274 */ lwc1 $f8, 0x0274($s0) ## 00000274 /* 053DC 80A606CC 44883000 */ mtc1 $t0, $f6 ## $f6 = 0.00 /* 053E0 80A606D0 00000000 */ nop -/* 053E4 80A606D4 46803020 */ cvt.s.w $f0, $f6 -/* 053E8 80A606D8 46040282 */ mul.s $f10, $f0, $f4 -/* 053EC 80A606DC 460A4400 */ add.s $f16, $f8, $f10 +/* 053E4 80A606D4 46803020 */ cvt.s.w $f0, $f6 +/* 053E8 80A606D8 46040282 */ mul.s $f10, $f0, $f4 +/* 053EC 80A606DC 460A4400 */ add.s $f16, $f8, $f10 /* 053F0 80A606E0 E6100028 */ swc1 $f16, 0x0028($s0) ## 00000028 .L80A606E4: -/* 053F4 80A606E4 AFA40028 */ sw $a0, 0x0028($sp) +/* 053F4 80A606E4 AFA40028 */ sw $a0, 0x0028($sp) /* 053F8 80A606E8 0C02927F */ jal SkelAnime_FrameUpdateMatrix - -/* 053FC 80A606EC E7A2003C */ swc1 $f2, 0x003C($sp) -/* 05400 80A606F0 14400013 */ bne $v0, $zero, .L80A60740 -/* 05404 80A606F4 C7A2003C */ lwc1 $f2, 0x003C($sp) + +/* 053FC 80A606EC E7A2003C */ swc1 $f2, 0x003C($sp) +/* 05400 80A606F0 14400013 */ bne $v0, $zero, .L80A60740 +/* 05404 80A606F4 C7A2003C */ lwc1 $f2, 0x003C($sp) /* 05408 80A606F8 3C014198 */ lui $at, 0x4198 ## $at = 41980000 /* 0540C 80A606FC 44819000 */ mtc1 $at, $f18 ## $f18 = 19.00 /* 05410 80A60700 00000000 */ nop -/* 05414 80A60704 4602903C */ c.lt.s $f18, $f2 +/* 05414 80A60704 4602903C */ c.lt.s $f18, $f2 /* 05418 80A60708 00000000 */ nop -/* 0541C 80A6070C 45020046 */ bc1fl .L80A60828 -/* 05420 80A60710 8FBF0024 */ lw $ra, 0x0024($sp) +/* 0541C 80A6070C 45020046 */ bc1fl .L80A60828 +/* 05420 80A60710 8FBF0024 */ lw $ra, 0x0024($sp) /* 05424 80A60714 C6040080 */ lwc1 $f4, 0x0080($s0) ## 00000080 /* 05428 80A60718 C6080060 */ lwc1 $f8, 0x0060($s0) ## 00000060 /* 0542C 80A6071C 3C0142A0 */ lui $at, 0x42A0 ## $at = 42A00000 /* 05430 80A60720 44818000 */ mtc1 $at, $f16 ## $f16 = 80.00 -/* 05434 80A60724 46082281 */ sub.s $f10, $f4, $f8 +/* 05434 80A60724 46082281 */ sub.s $f10, $f4, $f8 /* 05438 80A60728 C6060028 */ lwc1 $f6, 0x0028($s0) ## 00000028 -/* 0543C 80A6072C 46105480 */ add.s $f18, $f10, $f16 -/* 05440 80A60730 4612303C */ c.lt.s $f6, $f18 +/* 0543C 80A6072C 46105480 */ add.s $f18, $f10, $f16 +/* 05440 80A60730 4612303C */ c.lt.s $f6, $f18 /* 05444 80A60734 00000000 */ nop -/* 05448 80A60738 4502003B */ bc1fl .L80A60828 -/* 0544C 80A6073C 8FBF0024 */ lw $ra, 0x0024($sp) +/* 05448 80A60738 4502003B */ bc1fl .L80A60828 +/* 0544C 80A6073C 8FBF0024 */ lw $ra, 0x0024($sp) .L80A60740: /* 05450 80A60740 96090384 */ lhu $t1, 0x0384($s0) ## 00000384 /* 05454 80A60744 3C078013 */ lui $a3, 0x8013 ## $a3 = 80130000 @@ -101,22 +101,22 @@ glabel func_80A605E0 /* 05460 80A60750 24E733E0 */ addiu $a3, $a3, 0x33E0 ## $a3 = 801333E0 /* 05464 80A60754 A60A0384 */ sh $t2, 0x0384($s0) ## 00000384 /* 05468 80A60758 256B33E8 */ addiu $t3, $t3, 0x33E8 ## $t3 = 801333E8 -/* 0546C 80A6075C AFAB0014 */ sw $t3, 0x0014($sp) -/* 05470 80A60760 AFA70010 */ sw $a3, 0x0010($sp) +/* 0546C 80A6075C AFAB0014 */ sw $t3, 0x0014($sp) +/* 05470 80A60760 AFA70010 */ sw $a3, 0x0010($sp) /* 05474 80A60764 24042819 */ addiu $a0, $zero, 0x2819 ## $a0 = 00002819 /* 05478 80A60768 260500E4 */ addiu $a1, $s0, 0x00E4 ## $a1 = 000000E4 /* 0547C 80A6076C 0C03DCE3 */ jal Audio_PlaySoundGeneral - + /* 05480 80A60770 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 /* 05484 80A60774 44806000 */ mtc1 $zero, $f12 ## $f12 = 0.00 /* 05488 80A60778 240500FF */ addiu $a1, $zero, 0x00FF ## $a1 = 000000FF /* 0548C 80A6077C 2406000A */ addiu $a2, $zero, 0x000A ## $a2 = 0000000A -/* 05490 80A60780 0C02A800 */ jal func_800AA000 +/* 05490 80A60780 0C02A800 */ jal func_800AA000 /* 05494 80A60784 24070050 */ addiu $a3, $zero, 0x0050 ## $a3 = 00000050 /* 05498 80A60788 8E0C01F0 */ lw $t4, 0x01F0($s0) ## 000001F0 /* 0549C 80A6078C 2401FFFB */ addiu $at, $zero, 0xFFFB ## $at = FFFFFFFB /* 054A0 80A60790 44804000 */ mtc1 $zero, $f8 ## $f8 = 0.00 -/* 054A4 80A60794 01816824 */ and $t5, $t4, $at +/* 054A4 80A60794 01816824 */ and $t5, $t4, $at /* 054A8 80A60798 3C01C060 */ lui $at, 0xC060 ## $at = C0600000 /* 054AC 80A6079C 44812000 */ mtc1 $at, $f4 ## $f4 = -3.50 /* 054B0 80A607A0 C60A0080 */ lwc1 $f10, 0x0080($s0) ## 00000080 @@ -124,39 +124,39 @@ glabel func_80A605E0 /* 054B8 80A607A8 E6080060 */ swc1 $f8, 0x0060($s0) ## 00000060 /* 054BC 80A607AC E604006C */ swc1 $f4, 0x006C($s0) ## 0000006C /* 054C0 80A607B0 E60A0028 */ swc1 $f10, 0x0028($s0) ## 00000028 -/* 054C4 80A607B4 8FA40044 */ lw $a0, 0x0044($sp) +/* 054C4 80A607B4 8FA40044 */ lw $a0, 0x0044($sp) /* 054C8 80A607B8 3C0541C8 */ lui $a1, 0x41C8 ## $a1 = 41C80000 -/* 054CC 80A607BC 0C00A295 */ jal func_80028A54 +/* 054CC 80A607BC 0C00A295 */ jal func_80028A54 /* 054D0 80A607C0 26060024 */ addiu $a2, $s0, 0x0024 ## $a2 = 00000024 /* 054D4 80A607C4 8E0F0158 */ lw $t7, 0x0158($s0) ## 00000158 /* 054D8 80A607C8 240E0006 */ addiu $t6, $zero, 0x0006 ## $t6 = 00000006 /* 054DC 80A607CC 3C1980A6 */ lui $t9, %hi(D_80A65E58) ## $t9 = 80A60000 -/* 054E0 80A607D0 000FC080 */ sll $t8, $t7, 2 +/* 054E0 80A607D0 000FC080 */ sll $t8, $t7, 2 /* 054E4 80A607D4 AE0E0210 */ sw $t6, 0x0210($s0) ## 00000210 -/* 054E8 80A607D8 0338C821 */ addu $t9, $t9, $t8 -/* 054EC 80A607DC 8F395E58 */ lw $t9, %lo(D_80A65E58)($t9) +/* 054E8 80A607D8 0338C821 */ addu $t9, $t9, $t8 +/* 054EC 80A607DC 8F395E58 */ lw $t9, %lo(D_80A65E58)($t9) /* 054F0 80A607E0 3C0680A6 */ lui $a2, %hi(D_80A65E78) ## $a2 = 80A60000 -/* 054F4 80A607E4 8CC65E78 */ lw $a2, %lo(D_80A65E78)($a2) -/* 054F8 80A607E8 8FA40028 */ lw $a0, 0x0028($sp) -/* 054FC 80A607EC 0C0294A7 */ jal func_800A529C +/* 054F4 80A607E4 8CC65E78 */ lw $a2, %lo(D_80A65E78)($a2) +/* 054F8 80A607E8 8FA40028 */ lw $a0, 0x0028($sp) +/* 054FC 80A607EC 0C0294A7 */ jal SkelAnime_ChangeAnimPlaybackStop /* 05500 80A607F0 8F250018 */ lw $a1, 0x0018($t9) ## 80A60018 /* 05504 80A607F4 8E0201CC */ lw $v0, 0x01CC($s0) ## 000001CC /* 05508 80A607F8 3C0180A6 */ lui $at, %hi(D_80A66910) ## $at = 80A60000 -/* 0550C 80A607FC C4326910 */ lwc1 $f18, %lo(D_80A66910)($at) +/* 0550C 80A607FC C4326910 */ lwc1 $f18, %lo(D_80A66910)($at) /* 05510 80A60800 84480002 */ lh $t0, 0x0002($v0) ## 00000002 /* 05514 80A60804 C606025C */ lwc1 $f6, 0x025C($s0) ## 0000025C /* 05518 80A60808 AE000244 */ sw $zero, 0x0244($s0) ## 00000244 /* 0551C 80A6080C 44888000 */ mtc1 $t0, $f16 ## $f16 = 0.00 /* 05520 80A60810 00000000 */ nop -/* 05524 80A60814 46808020 */ cvt.s.w $f0, $f16 -/* 05528 80A60818 46120102 */ mul.s $f4, $f0, $f18 -/* 0552C 80A6081C 46043200 */ add.s $f8, $f6, $f4 +/* 05524 80A60814 46808020 */ cvt.s.w $f0, $f16 +/* 05528 80A60818 46120102 */ mul.s $f4, $f0, $f18 +/* 0552C 80A6081C 46043200 */ add.s $f8, $f6, $f4 /* 05530 80A60820 E608025C */ swc1 $f8, 0x025C($s0) ## 0000025C -/* 05534 80A60824 8FBF0024 */ lw $ra, 0x0024($sp) +/* 05534 80A60824 8FBF0024 */ lw $ra, 0x0024($sp) .L80A60828: -/* 05538 80A60828 8FB00020 */ lw $s0, 0x0020($sp) +/* 05538 80A60828 8FB00020 */ lw $s0, 0x0020($sp) /* 0553C 80A6082C 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 -/* 05540 80A60830 03E00008 */ jr $ra +/* 05540 80A60830 03E00008 */ jr $ra /* 05544 80A60834 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A60838.s b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A60838.s index a0f8316652..e87ee121c4 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A60838.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A60838.s @@ -1,16 +1,16 @@ glabel func_80A60838 /* 05548 80A60838 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 0554C 80A6083C AFA50034 */ sw $a1, 0x0034($sp) -/* 05550 80A60840 AFBF002C */ sw $ra, 0x002C($sp) -/* 05554 80A60844 AFB00028 */ sw $s0, 0x0028($sp) -/* 05558 80A60848 AFA60038 */ sw $a2, 0x0038($sp) +/* 0554C 80A6083C AFA50034 */ sw $a1, 0x0034($sp) +/* 05550 80A60840 AFBF002C */ sw $ra, 0x002C($sp) +/* 05554 80A60844 AFB00028 */ sw $s0, 0x0028($sp) +/* 05558 80A60848 AFA60038 */ sw $a2, 0x0038($sp) /* 0555C 80A6084C 948E0384 */ lhu $t6, 0x0384($a0) ## 00000384 /* 05560 80A60850 8C9801F0 */ lw $t8, 0x01F0($a0) ## 000001F0 /* 05564 80A60854 8C890228 */ lw $t1, 0x0228($a0) ## 00000228 /* 05568 80A60858 24020003 */ addiu $v0, $zero, 0x0003 ## $v0 = 00000003 /* 0556C 80A6085C 2401F7FF */ addiu $at, $zero, 0xF7FF ## $at = FFFFF7FF /* 05570 80A60860 31CFFFFB */ andi $t7, $t6, 0xFFFB ## $t7 = 00000000 -/* 05574 80A60864 0301C824 */ and $t9, $t8, $at +/* 05574 80A60864 0301C824 */ and $t9, $t8, $at /* 05578 80A60868 AC820210 */ sw $v0, 0x0210($a0) ## 00000210 /* 0557C 80A6086C AC820380 */ sw $v0, 0x0380($a0) ## 00000380 /* 05580 80A60870 A48F0384 */ sh $t7, 0x0384($a0) ## 00000384 @@ -28,51 +28,51 @@ glabel func_80A60838 /* 055B0 80A608A0 8C8A01F0 */ lw $t2, 0x01F0($a0) ## 000001F0 /* 055B4 80A608A4 24042805 */ addiu $a0, $zero, 0x2805 ## $a0 = 00002805 /* 055B8 80A608A8 258C33E8 */ addiu $t4, $t4, 0x33E8 ## $t4 = 801333E8 -/* 055BC 80A608AC 000A5900 */ sll $t3, $t2, 4 -/* 055C0 80A608B0 05610004 */ bgez $t3, .L80A608C4 +/* 055BC 80A608AC 000A5900 */ sll $t3, $t2, 4 +/* 055C0 80A608B0 05610004 */ bgez $t3, .L80A608C4 /* 055C4 80A608B4 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 -/* 055C8 80A608B8 AFA70010 */ sw $a3, 0x0010($sp) +/* 055C8 80A608B8 AFA70010 */ sw $a3, 0x0010($sp) /* 055CC 80A608BC 0C03DCE3 */ jal Audio_PlaySoundGeneral - -/* 055D0 80A608C0 AFAC0014 */ sw $t4, 0x0014($sp) + +/* 055D0 80A608C0 AFAC0014 */ sw $t4, 0x0014($sp) .L80A608C4: /* 055D4 80A608C4 8E0D0158 */ lw $t5, 0x0158($s0) ## 00000158 /* 055D8 80A608C8 3C0F80A6 */ lui $t7, %hi(D_80A65E58) ## $t7 = 80A60000 /* 055DC 80A608CC 8E180210 */ lw $t8, 0x0210($s0) ## 00000210 -/* 055E0 80A608D0 000D7080 */ sll $t6, $t5, 2 -/* 055E4 80A608D4 01EE7821 */ addu $t7, $t7, $t6 -/* 055E8 80A608D8 8DEF5E58 */ lw $t7, %lo(D_80A65E58)($t7) -/* 055EC 80A608DC 0018C880 */ sll $t9, $t8, 2 -/* 055F0 80A608E0 01F94021 */ addu $t0, $t7, $t9 +/* 055E0 80A608D0 000D7080 */ sll $t6, $t5, 2 +/* 055E4 80A608D4 01EE7821 */ addu $t7, $t7, $t6 +/* 055E8 80A608D8 8DEF5E58 */ lw $t7, %lo(D_80A65E58)($t7) +/* 055EC 80A608DC 0018C880 */ sll $t9, $t8, 2 +/* 055F0 80A608E0 01F94021 */ addu $t0, $t7, $t9 /* 055F4 80A608E4 0C028800 */ jal SkelAnime_GetFrameCount - + /* 055F8 80A608E8 8D040000 */ lw $a0, 0x0000($t0) ## 00000000 /* 055FC 80A608EC 8E090158 */ lw $t1, 0x0158($s0) ## 00000158 /* 05600 80A608F0 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 05604 80A608F4 3C0B80A6 */ lui $t3, %hi(D_80A65E58) ## $t3 = 80A60000 -/* 05608 80A608F8 00095080 */ sll $t2, $t1, 2 +/* 05608 80A608F8 00095080 */ sll $t2, $t1, 2 /* 0560C 80A608FC 8E0C0210 */ lw $t4, 0x0210($s0) ## 00000210 -/* 05610 80A60900 016A5821 */ addu $t3, $t3, $t2 -/* 05614 80A60904 8D6B5E58 */ lw $t3, %lo(D_80A65E58)($t3) -/* 05618 80A60908 468021A0 */ cvt.s.w $f6, $f4 -/* 0561C 80A6090C 000C6880 */ sll $t5, $t4, 2 +/* 05610 80A60900 016A5821 */ addu $t3, $t3, $t2 +/* 05614 80A60904 8D6B5E58 */ lw $t3, %lo(D_80A65E58)($t3) +/* 05618 80A60908 468021A0 */ cvt.s.w $f6, $f4 +/* 0561C 80A6090C 000C6880 */ sll $t5, $t4, 2 /* 05620 80A60910 3C01C040 */ lui $at, 0xC040 ## $at = C0400000 -/* 05624 80A60914 016D7021 */ addu $t6, $t3, $t5 +/* 05624 80A60914 016D7021 */ addu $t6, $t3, $t5 /* 05628 80A60918 44814000 */ mtc1 $at, $f8 ## $f8 = -3.00 /* 0562C 80A6091C 8DC50000 */ lw $a1, 0x0000($t6) ## 00000000 /* 05630 80A60920 24180002 */ addiu $t8, $zero, 0x0002 ## $t8 = 00000002 -/* 05634 80A60924 AFB80014 */ sw $t8, 0x0014($sp) -/* 05638 80A60928 E7A60010 */ swc1 $f6, 0x0010($sp) +/* 05634 80A60924 AFB80014 */ sw $t8, 0x0014($sp) +/* 05638 80A60928 E7A60010 */ swc1 $f6, 0x0010($sp) /* 0563C 80A6092C 260401AC */ addiu $a0, $s0, 0x01AC ## $a0 = 000001AC /* 05640 80A60930 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 05644 80A60934 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 05648 80A60938 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 0564C 80A6093C E7A80018 */ swc1 $f8, 0x0018($sp) -/* 05650 80A60940 8FBF002C */ lw $ra, 0x002C($sp) -/* 05654 80A60944 8FB00028 */ lw $s0, 0x0028($sp) +/* 05648 80A60938 0C029468 */ jal SkelAnime_ChangeAnim + +/* 0564C 80A6093C E7A80018 */ swc1 $f8, 0x0018($sp) +/* 05650 80A60940 8FBF002C */ lw $ra, 0x002C($sp) +/* 05654 80A60944 8FB00028 */ lw $s0, 0x0028($sp) /* 05658 80A60948 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 0565C 80A6094C 03E00008 */ jr $ra +/* 0565C 80A6094C 03E00008 */ jr $ra /* 05660 80A60950 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A60954.s b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A60954.s index 12b1481a55..63be830b27 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A60954.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A60954.s @@ -1,119 +1,119 @@ glabel func_80A60954 /* 05664 80A60954 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 05668 80A60958 AFBF002C */ sw $ra, 0x002C($sp) -/* 0566C 80A6095C AFB00028 */ sw $s0, 0x0028($sp) -/* 05670 80A60960 AFA5003C */ sw $a1, 0x003C($sp) -/* 05674 80A60964 AFA60040 */ sw $a2, 0x0040($sp) +/* 05668 80A60958 AFBF002C */ sw $ra, 0x002C($sp) +/* 0566C 80A6095C AFB00028 */ sw $s0, 0x0028($sp) +/* 05670 80A60960 AFA5003C */ sw $a1, 0x003C($sp) +/* 05674 80A60964 AFA60040 */ sw $a2, 0x0040($sp) /* 05678 80A60968 3C0141C8 */ lui $at, 0x41C8 ## $at = 41C80000 /* 0567C 80A6096C 44813000 */ mtc1 $at, $f6 ## $f6 = 25.00 /* 05680 80A60970 C4880214 */ lwc1 $f8, 0x0214($a0) ## 00000214 /* 05684 80A60974 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 /* 05688 80A60978 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 0568C 80A6097C 4608303C */ c.lt.s $f6, $f8 +/* 0568C 80A6097C 4608303C */ c.lt.s $f6, $f8 /* 05690 80A60980 E4840068 */ swc1 $f4, 0x0068($a0) ## 00000068 -/* 05694 80A60984 45020011 */ bc1fl .L80A609CC +/* 05694 80A60984 45020011 */ bc1fl .L80A609CC /* 05698 80A60988 260401AC */ addiu $a0, $s0, 0x01AC ## $a0 = 000001AC /* 0569C 80A6098C 8C8201F0 */ lw $v0, 0x01F0($a0) ## 0000039C /* 056A0 80A60990 3C078013 */ lui $a3, 0x8013 ## $a3 = 80130000 /* 056A4 80A60994 24E733E0 */ addiu $a3, $a3, 0x33E0 ## $a3 = 801333E0 /* 056A8 80A60998 304E0800 */ andi $t6, $v0, 0x0800 ## $t6 = 00000000 -/* 056AC 80A6099C 15C0000A */ bne $t6, $zero, .L80A609C8 +/* 056AC 80A6099C 15C0000A */ bne $t6, $zero, .L80A609C8 /* 056B0 80A609A0 344F0800 */ ori $t7, $v0, 0x0800 ## $t7 = 00000800 /* 056B4 80A609A4 AC8F01F0 */ sw $t7, 0x01F0($a0) ## 0000039C /* 056B8 80A609A8 3C188013 */ lui $t8, 0x8013 ## $t8 = 80130000 /* 056BC 80A609AC 271833E8 */ addiu $t8, $t8, 0x33E8 ## $t8 = 801333E8 -/* 056C0 80A609B0 AFB80014 */ sw $t8, 0x0014($sp) -/* 056C4 80A609B4 AFA70010 */ sw $a3, 0x0010($sp) +/* 056C0 80A609B0 AFB80014 */ sw $t8, 0x0014($sp) +/* 056C4 80A609B4 AFA70010 */ sw $a3, 0x0010($sp) /* 056C8 80A609B8 2404282B */ addiu $a0, $zero, 0x282B ## $a0 = 0000282B /* 056CC 80A609BC 260500E4 */ addiu $a1, $s0, 0x00E4 ## $a1 = 000000E4 /* 056D0 80A609C0 0C03DCE3 */ jal Audio_PlaySoundGeneral - + /* 056D4 80A609C4 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 .L80A609C8: /* 056D8 80A609C8 260401AC */ addiu $a0, $s0, 0x01AC ## $a0 = 000001AC .L80A609CC: /* 056DC 80A609CC 0C02927F */ jal SkelAnime_FrameUpdateMatrix - -/* 056E0 80A609D0 AFA40030 */ sw $a0, 0x0030($sp) -/* 056E4 80A609D4 50400045 */ beql $v0, $zero, .L80A60AEC -/* 056E8 80A609D8 8FBF002C */ lw $ra, 0x002C($sp) + +/* 056E0 80A609D0 AFA40030 */ sw $a0, 0x0030($sp) +/* 056E4 80A609D4 50400045 */ beql $v0, $zero, .L80A60AEC +/* 056E8 80A609D8 8FBF002C */ lw $ra, 0x002C($sp) /* 056EC 80A609DC 96020384 */ lhu $v0, 0x0384($s0) ## 00000384 /* 056F0 80A609E0 AE000210 */ sw $zero, 0x0210($s0) ## 00000210 /* 056F4 80A609E4 30590004 */ andi $t9, $v0, 0x0004 ## $t9 = 00000000 -/* 056F8 80A609E8 17200022 */ bne $t9, $zero, .L80A60A74 +/* 056F8 80A609E8 17200022 */ bne $t9, $zero, .L80A60A74 /* 056FC 80A609EC 34480004 */ ori $t0, $v0, 0x0004 ## $t0 = 00000004 /* 05700 80A609F0 8E090158 */ lw $t1, 0x0158($s0) ## 00000158 /* 05704 80A609F4 3C0B80A6 */ lui $t3, %hi(D_80A65E58) ## $t3 = 80A60000 /* 05708 80A609F8 A6080384 */ sh $t0, 0x0384($s0) ## 00000384 -/* 0570C 80A609FC 00095080 */ sll $t2, $t1, 2 -/* 05710 80A60A00 016A5821 */ addu $t3, $t3, $t2 -/* 05714 80A60A04 8D6B5E58 */ lw $t3, %lo(D_80A65E58)($t3) -/* 05718 80A60A08 00006880 */ sll $t5, $zero, 2 -/* 0571C 80A60A0C 016D7021 */ addu $t6, $t3, $t5 +/* 0570C 80A609FC 00095080 */ sll $t2, $t1, 2 +/* 05710 80A60A00 016A5821 */ addu $t3, $t3, $t2 +/* 05714 80A60A04 8D6B5E58 */ lw $t3, %lo(D_80A65E58)($t3) +/* 05718 80A60A08 00006880 */ sll $t5, $zero, 2 +/* 0571C 80A60A0C 016D7021 */ addu $t6, $t3, $t5 /* 05720 80A60A10 0C028800 */ jal SkelAnime_GetFrameCount - + /* 05724 80A60A14 8DC40000 */ lw $a0, 0x0000($t6) ## 00000000 /* 05728 80A60A18 8E0F0158 */ lw $t7, 0x0158($s0) ## 00000158 /* 0572C 80A60A1C 44825000 */ mtc1 $v0, $f10 ## $f10 = 0.00 /* 05730 80A60A20 3C1980A6 */ lui $t9, %hi(D_80A65E58) ## $t9 = 80A60000 -/* 05734 80A60A24 000FC080 */ sll $t8, $t7, 2 +/* 05734 80A60A24 000FC080 */ sll $t8, $t7, 2 /* 05738 80A60A28 8E080210 */ lw $t0, 0x0210($s0) ## 00000210 -/* 0573C 80A60A2C 0338C821 */ addu $t9, $t9, $t8 -/* 05740 80A60A30 8F395E58 */ lw $t9, %lo(D_80A65E58)($t9) -/* 05744 80A60A34 46805420 */ cvt.s.w $f16, $f10 -/* 05748 80A60A38 00084880 */ sll $t1, $t0, 2 +/* 0573C 80A60A2C 0338C821 */ addu $t9, $t9, $t8 +/* 05740 80A60A30 8F395E58 */ lw $t9, %lo(D_80A65E58)($t9) +/* 05744 80A60A34 46805420 */ cvt.s.w $f16, $f10 +/* 05748 80A60A38 00084880 */ sll $t1, $t0, 2 /* 0574C 80A60A3C 3C01C040 */ lui $at, 0xC040 ## $at = C0400000 -/* 05750 80A60A40 03295021 */ addu $t2, $t9, $t1 +/* 05750 80A60A40 03295021 */ addu $t2, $t9, $t1 /* 05754 80A60A44 44819000 */ mtc1 $at, $f18 ## $f18 = -3.00 /* 05758 80A60A48 8D450000 */ lw $a1, 0x0000($t2) ## 00000000 /* 0575C 80A60A4C 240C0002 */ addiu $t4, $zero, 0x0002 ## $t4 = 00000002 -/* 05760 80A60A50 AFAC0014 */ sw $t4, 0x0014($sp) -/* 05764 80A60A54 E7B00010 */ swc1 $f16, 0x0010($sp) -/* 05768 80A60A58 8FA40030 */ lw $a0, 0x0030($sp) +/* 05760 80A60A50 AFAC0014 */ sw $t4, 0x0014($sp) +/* 05764 80A60A54 E7B00010 */ swc1 $f16, 0x0010($sp) +/* 05768 80A60A58 8FA40030 */ lw $a0, 0x0030($sp) /* 0576C 80A60A5C 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 05770 80A60A60 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 05774 80A60A64 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 05778 80A60A68 E7B20018 */ swc1 $f18, 0x0018($sp) -/* 0577C 80A60A6C 1000001F */ beq $zero, $zero, .L80A60AEC -/* 05780 80A60A70 8FBF002C */ lw $ra, 0x002C($sp) +/* 05774 80A60A64 0C029468 */ jal SkelAnime_ChangeAnim + +/* 05778 80A60A68 E7B20018 */ swc1 $f18, 0x0018($sp) +/* 0577C 80A60A6C 1000001F */ beq $zero, $zero, .L80A60AEC +/* 05780 80A60A70 8FBF002C */ lw $ra, 0x002C($sp) .L80A60A74: /* 05784 80A60A74 8E0B0158 */ lw $t3, 0x0158($s0) ## 00000158 /* 05788 80A60A78 3C0E80A6 */ lui $t6, %hi(D_80A65E58) ## $t6 = 80A60000 /* 0578C 80A60A7C 8E0F0210 */ lw $t7, 0x0210($s0) ## 00000210 -/* 05790 80A60A80 000B6880 */ sll $t5, $t3, 2 -/* 05794 80A60A84 01CD7021 */ addu $t6, $t6, $t5 -/* 05798 80A60A88 8DCE5E58 */ lw $t6, %lo(D_80A65E58)($t6) -/* 0579C 80A60A8C 000FC080 */ sll $t8, $t7, 2 -/* 057A0 80A60A90 01D84021 */ addu $t0, $t6, $t8 +/* 05790 80A60A80 000B6880 */ sll $t5, $t3, 2 +/* 05794 80A60A84 01CD7021 */ addu $t6, $t6, $t5 +/* 05798 80A60A88 8DCE5E58 */ lw $t6, %lo(D_80A65E58)($t6) +/* 0579C 80A60A8C 000FC080 */ sll $t8, $t7, 2 +/* 057A0 80A60A90 01D84021 */ addu $t0, $t6, $t8 /* 057A4 80A60A94 0C028800 */ jal SkelAnime_GetFrameCount - + /* 057A8 80A60A98 8D040000 */ lw $a0, 0x0000($t0) ## 00000000 /* 057AC 80A60A9C 8E190158 */ lw $t9, 0x0158($s0) ## 00000158 /* 057B0 80A60AA0 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 057B4 80A60AA4 3C0A80A6 */ lui $t2, %hi(D_80A65E58) ## $t2 = 80A60000 -/* 057B8 80A60AA8 00194880 */ sll $t1, $t9, 2 +/* 057B8 80A60AA8 00194880 */ sll $t1, $t9, 2 /* 057BC 80A60AAC 8E0C0210 */ lw $t4, 0x0210($s0) ## 00000210 -/* 057C0 80A60AB0 01495021 */ addu $t2, $t2, $t1 -/* 057C4 80A60AB4 8D4A5E58 */ lw $t2, %lo(D_80A65E58)($t2) -/* 057C8 80A60AB8 468021A0 */ cvt.s.w $f6, $f4 -/* 057CC 80A60ABC 000C5880 */ sll $t3, $t4, 2 -/* 057D0 80A60AC0 014B6821 */ addu $t5, $t2, $t3 +/* 057C0 80A60AB0 01495021 */ addu $t2, $t2, $t1 +/* 057C4 80A60AB4 8D4A5E58 */ lw $t2, %lo(D_80A65E58)($t2) +/* 057C8 80A60AB8 468021A0 */ cvt.s.w $f6, $f4 +/* 057CC 80A60ABC 000C5880 */ sll $t3, $t4, 2 +/* 057D0 80A60AC0 014B6821 */ addu $t5, $t2, $t3 /* 057D4 80A60AC4 44804000 */ mtc1 $zero, $f8 ## $f8 = 0.00 /* 057D8 80A60AC8 8DA50000 */ lw $a1, 0x0000($t5) ## 00000000 -/* 057DC 80A60ACC AFA00014 */ sw $zero, 0x0014($sp) -/* 057E0 80A60AD0 E7A60010 */ swc1 $f6, 0x0010($sp) -/* 057E4 80A60AD4 8FA40030 */ lw $a0, 0x0030($sp) +/* 057DC 80A60ACC AFA00014 */ sw $zero, 0x0014($sp) +/* 057E0 80A60AD0 E7A60010 */ swc1 $f6, 0x0010($sp) +/* 057E4 80A60AD4 8FA40030 */ lw $a0, 0x0030($sp) /* 057E8 80A60AD8 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 057EC 80A60ADC 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 057F0 80A60AE0 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 057F4 80A60AE4 E7A80018 */ swc1 $f8, 0x0018($sp) -/* 057F8 80A60AE8 8FBF002C */ lw $ra, 0x002C($sp) +/* 057F0 80A60AE0 0C029468 */ jal SkelAnime_ChangeAnim + +/* 057F4 80A60AE4 E7A80018 */ swc1 $f8, 0x0018($sp) +/* 057F8 80A60AE8 8FBF002C */ lw $ra, 0x002C($sp) .L80A60AEC: -/* 057FC 80A60AEC 8FB00028 */ lw $s0, 0x0028($sp) +/* 057FC 80A60AEC 8FB00028 */ lw $s0, 0x0028($sp) /* 05800 80A60AF0 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 -/* 05804 80A60AF4 03E00008 */ jr $ra +/* 05804 80A60AF4 03E00008 */ jr $ra /* 05808 80A60AF8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A60AFC.s b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A60AFC.s index 28dad16603..8b20141fd7 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A60AFC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A60AFC.s @@ -1,35 +1,35 @@ glabel func_80A60AFC /* 0580C 80A60AFC 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 05810 80A60B00 AFBF0014 */ sw $ra, 0x0014($sp) -/* 05814 80A60B04 AFA5001C */ sw $a1, 0x001C($sp) -/* 05818 80A60B08 AFA60020 */ sw $a2, 0x0020($sp) +/* 05810 80A60B00 AFBF0014 */ sw $ra, 0x0014($sp) +/* 05814 80A60B04 AFA5001C */ sw $a1, 0x001C($sp) +/* 05818 80A60B08 AFA60020 */ sw $a2, 0x0020($sp) /* 0581C 80A60B0C 8CCF000C */ lw $t7, 0x000C($a2) ## 0000000C /* 05820 80A60B10 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 /* 05824 80A60B14 3C0180A6 */ lui $at, %hi(D_80A66914) ## $at = 80A60000 /* 05828 80A60B18 448F2000 */ mtc1 $t7, $f4 ## $f4 = 0.00 /* 0582C 80A60B1C 248401AC */ addiu $a0, $a0, 0x01AC ## $a0 = 000001AC -/* 05830 80A60B20 468021A0 */ cvt.s.w $f6, $f4 +/* 05830 80A60B20 468021A0 */ cvt.s.w $f6, $f4 /* 05834 80A60B24 E486FE78 */ swc1 $f6, -0x0188($a0) ## 00000024 -/* 05838 80A60B28 8FB80020 */ lw $t8, 0x0020($sp) +/* 05838 80A60B28 8FB80020 */ lw $t8, 0x0020($sp) /* 0583C 80A60B2C 8C8BFE78 */ lw $t3, -0x0188($a0) ## 00000024 /* 05840 80A60B30 8F190010 */ lw $t9, 0x0010($t8) ## 00000010 /* 05844 80A60B34 24180006 */ addiu $t8, $zero, 0x0006 ## $t8 = 00000006 /* 05848 80A60B38 44994000 */ mtc1 $t9, $f8 ## $f8 = 0.00 /* 0584C 80A60B3C 24190004 */ addiu $t9, $zero, 0x0004 ## $t9 = 00000004 -/* 05850 80A60B40 468042A0 */ cvt.s.w $f10, $f8 +/* 05850 80A60B40 468042A0 */ cvt.s.w $f10, $f8 /* 05854 80A60B44 E48AFE7C */ swc1 $f10, -0x0184($a0) ## 00000028 -/* 05858 80A60B48 8FA80020 */ lw $t0, 0x0020($sp) +/* 05858 80A60B48 8FA80020 */ lw $t0, 0x0020($sp) /* 0585C 80A60B4C 8C8AFE7C */ lw $t2, -0x0184($a0) ## 00000028 /* 05860 80A60B50 8D090014 */ lw $t1, 0x0014($t0) ## 00000014 /* 05864 80A60B54 AC8BFF54 */ sw $t3, -0x00AC($a0) ## 00000100 /* 05868 80A60B58 AC8AFF58 */ sw $t2, -0x00A8($a0) ## 00000104 /* 0586C 80A60B5C 44898000 */ mtc1 $t1, $f16 ## $f16 = 0.00 /* 05870 80A60B60 3C0A80A6 */ lui $t2, %hi(D_80A65E58) ## $t2 = 80A60000 -/* 05874 80A60B64 468084A0 */ cvt.s.w $f18, $f16 +/* 05874 80A60B64 468084A0 */ cvt.s.w $f18, $f16 /* 05878 80A60B68 E492FE80 */ swc1 $f18, -0x0180($a0) ## 0000002C /* 0587C 80A60B6C 8C8BFE80 */ lw $t3, -0x0180($a0) ## 0000002C /* 05880 80A60B70 AC8BFF5C */ sw $t3, -0x00A4($a0) ## 00000108 -/* 05884 80A60B74 8FAC0020 */ lw $t4, 0x0020($sp) +/* 05884 80A60B74 8FAC0020 */ lw $t4, 0x0020($sp) /* 05888 80A60B78 958D0008 */ lhu $t5, 0x0008($t4) ## 00000008 /* 0588C 80A60B7C AC980064 */ sw $t8, 0x0064($a0) ## 00000210 /* 05890 80A60B80 AC9901D4 */ sw $t9, 0x01D4($a0) ## 00000380 @@ -40,20 +40,20 @@ glabel func_80A60AFC /* 058A4 80A60B94 B88FFF0B */ swr $t7, -0x00F5($a0) ## 000000B7 /* 058A8 80A60B98 948FFE88 */ lhu $t7, -0x0178($a0) ## 00000034 /* 058AC 80A60B9C A48FFF0C */ sh $t7, -0x00F4($a0) ## 000000B8 -/* 058B0 80A60BA0 C4266914 */ lwc1 $f6, %lo(D_80A66914)($at) +/* 058B0 80A60BA0 C4266914 */ lwc1 $f6, %lo(D_80A66914)($at) /* 058B4 80A60BA4 C4E40068 */ lwc1 $f4, 0x0068($a3) ## 00000068 /* 058B8 80A60BA8 8CE80158 */ lw $t0, 0x0158($a3) ## 00000158 -/* 058BC 80A60BAC 46062202 */ mul.s $f8, $f4, $f6 -/* 058C0 80A60BB0 00084880 */ sll $t1, $t0, 2 -/* 058C4 80A60BB4 01495021 */ addu $t2, $t2, $t1 -/* 058C8 80A60BB8 8D4A5E58 */ lw $t2, %lo(D_80A65E58)($t2) +/* 058BC 80A60BAC 46062202 */ mul.s $f8, $f4, $f6 +/* 058C0 80A60BB0 00084880 */ sll $t1, $t0, 2 +/* 058C4 80A60BB4 01495021 */ addu $t2, $t2, $t1 +/* 058C8 80A60BB8 8D4A5E58 */ lw $t2, %lo(D_80A65E58)($t2) /* 058CC 80A60BBC 8D450018 */ lw $a1, 0x0018($t2) ## 80A60018 -/* 058D0 80A60BC0 44064000 */ mfc1 $a2, $f8 -/* 058D4 80A60BC4 0C0294A7 */ jal func_800A529C +/* 058D0 80A60BC0 44064000 */ mfc1 $a2, $f8 +/* 058D4 80A60BC4 0C0294A7 */ jal SkelAnime_ChangeAnimPlaybackStop /* 058D8 80A60BC8 00000000 */ nop -/* 058DC 80A60BCC 8FBF0014 */ lw $ra, 0x0014($sp) +/* 058DC 80A60BCC 8FBF0014 */ lw $ra, 0x0014($sp) /* 058E0 80A60BD0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 058E4 80A60BD4 03E00008 */ jr $ra +/* 058E4 80A60BD4 03E00008 */ jr $ra /* 058E8 80A60BD8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A60BDC.s b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A60BDC.s index 1540640f1e..fe3e8c962c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A60BDC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A60BDC.s @@ -1,45 +1,45 @@ glabel func_80A60BDC /* 058EC 80A60BDC 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 058F0 80A60BE0 AFBF001C */ sw $ra, 0x001C($sp) -/* 058F4 80A60BE4 AFB00018 */ sw $s0, 0x0018($sp) -/* 058F8 80A60BE8 AFA5003C */ sw $a1, 0x003C($sp) +/* 058F0 80A60BE0 AFBF001C */ sw $ra, 0x001C($sp) +/* 058F4 80A60BE4 AFB00018 */ sw $s0, 0x0018($sp) +/* 058F8 80A60BE8 AFA5003C */ sw $a1, 0x003C($sp) /* 058FC 80A60BEC 8CCE0018 */ lw $t6, 0x0018($a2) ## 00000018 /* 05900 80A60BF0 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 05904 80A60BF4 26050024 */ addiu $a1, $s0, 0x0024 ## $a1 = 00000024 /* 05908 80A60BF8 448E2000 */ mtc1 $t6, $f4 ## $f4 = 0.00 /* 0590C 80A60BFC 27A4002C */ addiu $a0, $sp, 0x002C ## $a0 = FFFFFFF4 -/* 05910 80A60C00 468021A0 */ cvt.s.w $f6, $f4 -/* 05914 80A60C04 E7A6002C */ swc1 $f6, 0x002C($sp) +/* 05910 80A60C00 468021A0 */ cvt.s.w $f6, $f4 +/* 05914 80A60C04 E7A6002C */ swc1 $f6, 0x002C($sp) /* 05918 80A60C08 8CCF001C */ lw $t7, 0x001C($a2) ## 0000001C /* 0591C 80A60C0C 448F4000 */ mtc1 $t7, $f8 ## $f8 = 0.00 /* 05920 80A60C10 00000000 */ nop -/* 05924 80A60C14 468042A0 */ cvt.s.w $f10, $f8 -/* 05928 80A60C18 E7AA0030 */ swc1 $f10, 0x0030($sp) +/* 05924 80A60C14 468042A0 */ cvt.s.w $f10, $f8 +/* 05928 80A60C18 E7AA0030 */ swc1 $f10, 0x0030($sp) /* 0592C 80A60C1C 8CD80020 */ lw $t8, 0x0020($a2) ## 00000020 -/* 05930 80A60C20 AFA50024 */ sw $a1, 0x0024($sp) +/* 05930 80A60C20 AFA50024 */ sw $a1, 0x0024($sp) /* 05934 80A60C24 44988000 */ mtc1 $t8, $f16 ## $f16 = 0.00 /* 05938 80A60C28 00000000 */ nop -/* 0593C 80A60C2C 468084A0 */ cvt.s.w $f18, $f16 -/* 05940 80A60C30 0C032D9E */ jal func_800CB678 -/* 05944 80A60C34 E7B20034 */ swc1 $f18, 0x0034($sp) +/* 0593C 80A60C2C 468084A0 */ cvt.s.w $f18, $f16 +/* 05940 80A60C30 0C032D9E */ jal func_800CB678 +/* 05944 80A60C34 E7B20034 */ swc1 $f18, 0x0034($sp) /* 05948 80A60C38 3C014100 */ lui $at, 0x4100 ## $at = 41000000 /* 0594C 80A60C3C 44811000 */ mtc1 $at, $f2 ## $f2 = 8.00 -/* 05950 80A60C40 8FA50024 */ lw $a1, 0x0024($sp) +/* 05950 80A60C40 8FA50024 */ lw $a1, 0x0024($sp) /* 05954 80A60C44 27A6002C */ addiu $a2, $sp, 0x002C ## $a2 = FFFFFFF4 -/* 05958 80A60C48 4600103C */ c.lt.s $f2, $f0 +/* 05958 80A60C48 4600103C */ c.lt.s $f2, $f0 /* 0595C 80A60C4C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 05960 80A60C50 24070190 */ addiu $a3, $zero, 0x0190 ## $a3 = 00000190 -/* 05964 80A60C54 4502000C */ bc1fl .L80A60C88 +/* 05964 80A60C54 4502000C */ bc1fl .L80A60C88 /* 05968 80A60C58 8CC80000 */ lw $t0, 0x0000($a2) ## FFFFFFF4 -/* 0596C 80A60C5C 0C296D78 */ jal func_80A5B5E0 -/* 05970 80A60C60 8FA5003C */ lw $a1, 0x003C($sp) +/* 0596C 80A60C5C 0C296D78 */ jal func_80A5B5E0 +/* 05970 80A60C60 8FA5003C */ lw $a1, 0x003C($sp) /* 05974 80A60C64 3C014100 */ lui $at, 0x4100 ## $at = 41000000 /* 05978 80A60C68 44811000 */ mtc1 $at, $f2 ## $f2 = 8.00 /* 0597C 80A60C6C 3C0180A6 */ lui $at, %hi(D_80A66918) ## $at = 80A60000 /* 05980 80A60C70 E6020068 */ swc1 $f2, 0x0068($s0) ## 00000068 -/* 05984 80A60C74 C4246918 */ lwc1 $f4, %lo(D_80A66918)($at) -/* 05988 80A60C78 46041182 */ mul.s $f6, $f2, $f4 -/* 0598C 80A60C7C 10000009 */ beq $zero, $zero, .L80A60CA4 +/* 05984 80A60C74 C4246918 */ lwc1 $f4, %lo(D_80A66918)($at) +/* 05988 80A60C78 46041182 */ mul.s $f6, $f2, $f4 +/* 0598C 80A60C7C 10000009 */ beq $zero, $zero, .L80A60CA4 /* 05990 80A60C80 E60601C8 */ swc1 $f6, 0x01C8($s0) ## 000001C8 /* 05994 80A60C84 8CC80000 */ lw $t0, 0x0000($a2) ## 00000000 .L80A60C88: @@ -53,38 +53,38 @@ glabel func_80A60BDC .L80A60CA4: /* 059B4 80A60CA4 260401AC */ addiu $a0, $s0, 0x01AC ## $a0 = 000001AC /* 059B8 80A60CA8 0C02927F */ jal SkelAnime_FrameUpdateMatrix - -/* 059BC 80A60CAC AFA40024 */ sw $a0, 0x0024($sp) -/* 059C0 80A60CB0 50400019 */ beql $v0, $zero, .L80A60D18 -/* 059C4 80A60CB4 8FBF001C */ lw $ra, 0x001C($sp) -/* 059C8 80A60CB8 0C296EB3 */ jal func_80A5BACC + +/* 059BC 80A60CAC AFA40024 */ sw $a0, 0x0024($sp) +/* 059C0 80A60CB0 50400019 */ beql $v0, $zero, .L80A60D18 +/* 059C4 80A60CB4 8FBF001C */ lw $ra, 0x001C($sp) +/* 059C8 80A60CB8 0C296EB3 */ jal func_80A5BACC /* 059CC 80A60CBC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 059D0 80A60CC0 44806000 */ mtc1 $zero, $f12 ## $f12 = 0.00 /* 059D4 80A60CC4 24050078 */ addiu $a1, $zero, 0x0078 ## $a1 = 00000078 /* 059D8 80A60CC8 24060008 */ addiu $a2, $zero, 0x0008 ## $a2 = 00000008 -/* 059DC 80A60CCC 0C02A800 */ jal func_800AA000 +/* 059DC 80A60CCC 0C02A800 */ jal func_800AA000 /* 059E0 80A60CD0 240700FF */ addiu $a3, $zero, 0x00FF ## $a3 = 000000FF /* 059E4 80A60CD4 3C0180A6 */ lui $at, %hi(D_80A6691C) ## $at = 80A60000 -/* 059E8 80A60CD8 C430691C */ lwc1 $f16, %lo(D_80A6691C)($at) +/* 059E8 80A60CD8 C430691C */ lwc1 $f16, %lo(D_80A6691C)($at) /* 059EC 80A60CDC C60A0068 */ lwc1 $f10, 0x0068($s0) ## 00000068 /* 059F0 80A60CE0 8E090158 */ lw $t1, 0x0158($s0) ## 00000158 /* 059F4 80A60CE4 3C0B80A6 */ lui $t3, %hi(D_80A65E58) ## $t3 = 80A60000 -/* 059F8 80A60CE8 46105482 */ mul.s $f18, $f10, $f16 -/* 059FC 80A60CEC 00095080 */ sll $t2, $t1, 2 +/* 059F8 80A60CE8 46105482 */ mul.s $f18, $f10, $f16 +/* 059FC 80A60CEC 00095080 */ sll $t2, $t1, 2 /* 05A00 80A60CF0 8E0C0210 */ lw $t4, 0x0210($s0) ## 00000210 -/* 05A04 80A60CF4 016A5821 */ addu $t3, $t3, $t2 -/* 05A08 80A60CF8 8D6B5E58 */ lw $t3, %lo(D_80A65E58)($t3) -/* 05A0C 80A60CFC 000C6880 */ sll $t5, $t4, 2 -/* 05A10 80A60D00 8FA40024 */ lw $a0, 0x0024($sp) -/* 05A14 80A60D04 44069000 */ mfc1 $a2, $f18 -/* 05A18 80A60D08 016D7021 */ addu $t6, $t3, $t5 -/* 05A1C 80A60D0C 0C0294A7 */ jal func_800A529C +/* 05A04 80A60CF4 016A5821 */ addu $t3, $t3, $t2 +/* 05A08 80A60CF8 8D6B5E58 */ lw $t3, %lo(D_80A65E58)($t3) +/* 05A0C 80A60CFC 000C6880 */ sll $t5, $t4, 2 +/* 05A10 80A60D00 8FA40024 */ lw $a0, 0x0024($sp) +/* 05A14 80A60D04 44069000 */ mfc1 $a2, $f18 +/* 05A18 80A60D08 016D7021 */ addu $t6, $t3, $t5 +/* 05A1C 80A60D0C 0C0294A7 */ jal SkelAnime_ChangeAnimPlaybackStop /* 05A20 80A60D10 8DC50000 */ lw $a1, 0x0000($t6) ## 00000000 -/* 05A24 80A60D14 8FBF001C */ lw $ra, 0x001C($sp) +/* 05A24 80A60D14 8FBF001C */ lw $ra, 0x001C($sp) .L80A60D18: -/* 05A28 80A60D18 8FB00018 */ lw $s0, 0x0018($sp) +/* 05A28 80A60D18 8FB00018 */ lw $s0, 0x0018($sp) /* 05A2C 80A60D1C 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 -/* 05A30 80A60D20 03E00008 */ jr $ra +/* 05A30 80A60D20 03E00008 */ jr $ra /* 05A34 80A60D24 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A60D28.s b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A60D28.s index be8d3afd46..f4462bcc9b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A60D28.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A60D28.s @@ -1,15 +1,15 @@ glabel func_80A60D28 /* 05A38 80A60D28 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 05A3C 80A60D2C AFBF002C */ sw $ra, 0x002C($sp) -/* 05A40 80A60D30 AFB00028 */ sw $s0, 0x0028($sp) -/* 05A44 80A60D34 AFA50034 */ sw $a1, 0x0034($sp) +/* 05A3C 80A60D2C AFBF002C */ sw $ra, 0x002C($sp) +/* 05A40 80A60D30 AFB00028 */ sw $s0, 0x0028($sp) +/* 05A44 80A60D34 AFA50034 */ sw $a1, 0x0034($sp) /* 05A48 80A60D38 8CCE000C */ lw $t6, 0x000C($a2) ## 0000000C /* 05A4C 80A60D3C 2401F7FF */ addiu $at, $zero, 0xF7FF ## $at = FFFFF7FF /* 05A50 80A60D40 240C0003 */ addiu $t4, $zero, 0x0003 ## $t4 = 00000003 /* 05A54 80A60D44 448E2000 */ mtc1 $t6, $f4 ## $f4 = 0.00 /* 05A58 80A60D48 948E0384 */ lhu $t6, 0x0384($a0) ## 00000384 /* 05A5C 80A60D4C 240D0005 */ addiu $t5, $zero, 0x0005 ## $t5 = 00000005 -/* 05A60 80A60D50 468021A0 */ cvt.s.w $f6, $f4 +/* 05A60 80A60D50 468021A0 */ cvt.s.w $f6, $f4 /* 05A64 80A60D54 2485021C */ addiu $a1, $a0, 0x021C ## $a1 = 0000021C /* 05A68 80A60D58 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 05A6C 80A60D5C 3C078013 */ lui $a3, 0x8013 ## $a3 = 80130000 @@ -19,7 +19,7 @@ glabel func_80A60D28 /* 05A7C 80A60D6C 8C880024 */ lw $t0, 0x0024($a0) ## 00000024 /* 05A80 80A60D70 448F4000 */ mtc1 $t7, $f8 ## $f8 = 0.00 /* 05A84 80A60D74 31CFFFFB */ andi $t7, $t6, 0xFFFB ## $t7 = 00000000 -/* 05A88 80A60D78 468042A0 */ cvt.s.w $f10, $f8 +/* 05A88 80A60D78 468042A0 */ cvt.s.w $f10, $f8 /* 05A8C 80A60D7C E48A0028 */ swc1 $f10, 0x0028($a0) ## 00000028 /* 05A90 80A60D80 8CD80014 */ lw $t8, 0x0014($a2) ## 00000014 /* 05A94 80A60D84 AC880100 */ sw $t0, 0x0100($a0) ## 00000100 @@ -27,8 +27,8 @@ glabel func_80A60D28 /* 05A9C 80A60D8C 44988000 */ mtc1 $t8, $f16 ## $f16 = 0.00 /* 05AA0 80A60D90 8C9801F0 */ lw $t8, 0x01F0($a0) ## 000001F0 /* 05AA4 80A60D94 AC990104 */ sw $t9, 0x0104($a0) ## 00000104 -/* 05AA8 80A60D98 468084A0 */ cvt.s.w $f18, $f16 -/* 05AAC 80A60D9C 0301C824 */ and $t9, $t8, $at +/* 05AA8 80A60D98 468084A0 */ cvt.s.w $f18, $f16 +/* 05AAC 80A60D9C 0301C824 */ and $t9, $t8, $at /* 05AB0 80A60DA0 E492002C */ swc1 $f18, 0x002C($a0) ## 0000002C /* 05AB4 80A60DA4 8C88002C */ lw $t0, 0x002C($a0) ## 0000002C /* 05AB8 80A60DA8 AC880108 */ sw $t0, 0x0108($a0) ## 00000108 @@ -55,51 +55,51 @@ glabel func_80A60D28 /* 05B0C 80A60DFC ACA90008 */ sw $t1, 0x0008($a1) ## 00000224 /* 05B10 80A60E00 8C8A01F0 */ lw $t2, 0x01F0($a0) ## 000001F0 /* 05B14 80A60E04 24042805 */ addiu $a0, $zero, 0x2805 ## $a0 = 00002805 -/* 05B18 80A60E08 000A5900 */ sll $t3, $t2, 4 -/* 05B1C 80A60E0C 05630005 */ bgezl $t3, .L80A60E24 +/* 05B18 80A60E08 000A5900 */ sll $t3, $t2, 4 +/* 05B1C 80A60E0C 05630005 */ bgezl $t3, .L80A60E24 /* 05B20 80A60E10 8E0D0158 */ lw $t5, 0x0158($s0) ## 00000158 -/* 05B24 80A60E14 AFA70010 */ sw $a3, 0x0010($sp) +/* 05B24 80A60E14 AFA70010 */ sw $a3, 0x0010($sp) /* 05B28 80A60E18 0C03DCE3 */ jal Audio_PlaySoundGeneral - -/* 05B2C 80A60E1C AFAC0014 */ sw $t4, 0x0014($sp) + +/* 05B2C 80A60E1C AFAC0014 */ sw $t4, 0x0014($sp) /* 05B30 80A60E20 8E0D0158 */ lw $t5, 0x0158($s0) ## 00000158 .L80A60E24: /* 05B34 80A60E24 3C0F80A6 */ lui $t7, %hi(D_80A65E58) ## $t7 = 80A60000 /* 05B38 80A60E28 8E180210 */ lw $t8, 0x0210($s0) ## 00000210 -/* 05B3C 80A60E2C 000D7080 */ sll $t6, $t5, 2 -/* 05B40 80A60E30 01EE7821 */ addu $t7, $t7, $t6 -/* 05B44 80A60E34 8DEF5E58 */ lw $t7, %lo(D_80A65E58)($t7) -/* 05B48 80A60E38 0018C880 */ sll $t9, $t8, 2 -/* 05B4C 80A60E3C 01F94021 */ addu $t0, $t7, $t9 +/* 05B3C 80A60E2C 000D7080 */ sll $t6, $t5, 2 +/* 05B40 80A60E30 01EE7821 */ addu $t7, $t7, $t6 +/* 05B44 80A60E34 8DEF5E58 */ lw $t7, %lo(D_80A65E58)($t7) +/* 05B48 80A60E38 0018C880 */ sll $t9, $t8, 2 +/* 05B4C 80A60E3C 01F94021 */ addu $t0, $t7, $t9 /* 05B50 80A60E40 0C028800 */ jal SkelAnime_GetFrameCount - + /* 05B54 80A60E44 8D040000 */ lw $a0, 0x0000($t0) ## 00000000 /* 05B58 80A60E48 8E090158 */ lw $t1, 0x0158($s0) ## 00000158 /* 05B5C 80A60E4C 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 05B60 80A60E50 3C0B80A6 */ lui $t3, %hi(D_80A65E58) ## $t3 = 80A60000 -/* 05B64 80A60E54 00095080 */ sll $t2, $t1, 2 +/* 05B64 80A60E54 00095080 */ sll $t2, $t1, 2 /* 05B68 80A60E58 8E0C0210 */ lw $t4, 0x0210($s0) ## 00000210 -/* 05B6C 80A60E5C 016A5821 */ addu $t3, $t3, $t2 -/* 05B70 80A60E60 8D6B5E58 */ lw $t3, %lo(D_80A65E58)($t3) -/* 05B74 80A60E64 468021A0 */ cvt.s.w $f6, $f4 -/* 05B78 80A60E68 000C6880 */ sll $t5, $t4, 2 +/* 05B6C 80A60E5C 016A5821 */ addu $t3, $t3, $t2 +/* 05B70 80A60E60 8D6B5E58 */ lw $t3, %lo(D_80A65E58)($t3) +/* 05B74 80A60E64 468021A0 */ cvt.s.w $f6, $f4 +/* 05B78 80A60E68 000C6880 */ sll $t5, $t4, 2 /* 05B7C 80A60E6C 3C01C040 */ lui $at, 0xC040 ## $at = C0400000 -/* 05B80 80A60E70 016D7021 */ addu $t6, $t3, $t5 +/* 05B80 80A60E70 016D7021 */ addu $t6, $t3, $t5 /* 05B84 80A60E74 44814000 */ mtc1 $at, $f8 ## $f8 = -3.00 /* 05B88 80A60E78 8DC50000 */ lw $a1, 0x0000($t6) ## 00000000 /* 05B8C 80A60E7C 24180002 */ addiu $t8, $zero, 0x0002 ## $t8 = 00000002 -/* 05B90 80A60E80 AFB80014 */ sw $t8, 0x0014($sp) -/* 05B94 80A60E84 E7A60010 */ swc1 $f6, 0x0010($sp) +/* 05B90 80A60E80 AFB80014 */ sw $t8, 0x0014($sp) +/* 05B94 80A60E84 E7A60010 */ swc1 $f6, 0x0010($sp) /* 05B98 80A60E88 260401AC */ addiu $a0, $s0, 0x01AC ## $a0 = 000001AC /* 05B9C 80A60E8C 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 05BA0 80A60E90 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 05BA4 80A60E94 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 05BA8 80A60E98 E7A80018 */ swc1 $f8, 0x0018($sp) -/* 05BAC 80A60E9C 8FBF002C */ lw $ra, 0x002C($sp) -/* 05BB0 80A60EA0 8FB00028 */ lw $s0, 0x0028($sp) +/* 05BA4 80A60E94 0C029468 */ jal SkelAnime_ChangeAnim + +/* 05BA8 80A60E98 E7A80018 */ swc1 $f8, 0x0018($sp) +/* 05BAC 80A60E9C 8FBF002C */ lw $ra, 0x002C($sp) +/* 05BB0 80A60EA0 8FB00028 */ lw $s0, 0x0028($sp) /* 05BB4 80A60EA4 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 05BB8 80A60EA8 03E00008 */ jr $ra +/* 05BB8 80A60EA8 03E00008 */ jr $ra /* 05BBC 80A60EAC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A60EB0.s b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A60EB0.s index 6ba2b49662..f150b43c0a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A60EB0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A60EB0.s @@ -1,119 +1,119 @@ glabel func_80A60EB0 /* 05BC0 80A60EB0 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 05BC4 80A60EB4 AFBF002C */ sw $ra, 0x002C($sp) -/* 05BC8 80A60EB8 AFB00028 */ sw $s0, 0x0028($sp) -/* 05BCC 80A60EBC AFA5003C */ sw $a1, 0x003C($sp) -/* 05BD0 80A60EC0 AFA60040 */ sw $a2, 0x0040($sp) +/* 05BC4 80A60EB4 AFBF002C */ sw $ra, 0x002C($sp) +/* 05BC8 80A60EB8 AFB00028 */ sw $s0, 0x0028($sp) +/* 05BCC 80A60EBC AFA5003C */ sw $a1, 0x003C($sp) +/* 05BD0 80A60EC0 AFA60040 */ sw $a2, 0x0040($sp) /* 05BD4 80A60EC4 3C0141C8 */ lui $at, 0x41C8 ## $at = 41C80000 /* 05BD8 80A60EC8 44813000 */ mtc1 $at, $f6 ## $f6 = 25.00 /* 05BDC 80A60ECC C4880214 */ lwc1 $f8, 0x0214($a0) ## 00000214 /* 05BE0 80A60ED0 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 /* 05BE4 80A60ED4 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 05BE8 80A60ED8 4608303C */ c.lt.s $f6, $f8 +/* 05BE8 80A60ED8 4608303C */ c.lt.s $f6, $f8 /* 05BEC 80A60EDC E4840068 */ swc1 $f4, 0x0068($a0) ## 00000068 -/* 05BF0 80A60EE0 45020011 */ bc1fl .L80A60F28 +/* 05BF0 80A60EE0 45020011 */ bc1fl .L80A60F28 /* 05BF4 80A60EE4 260401AC */ addiu $a0, $s0, 0x01AC ## $a0 = 000001AC /* 05BF8 80A60EE8 8C8201F0 */ lw $v0, 0x01F0($a0) ## 0000039C /* 05BFC 80A60EEC 3C078013 */ lui $a3, 0x8013 ## $a3 = 80130000 /* 05C00 80A60EF0 24E733E0 */ addiu $a3, $a3, 0x33E0 ## $a3 = 801333E0 /* 05C04 80A60EF4 304E0800 */ andi $t6, $v0, 0x0800 ## $t6 = 00000000 -/* 05C08 80A60EF8 15C0000A */ bne $t6, $zero, .L80A60F24 +/* 05C08 80A60EF8 15C0000A */ bne $t6, $zero, .L80A60F24 /* 05C0C 80A60EFC 344F0800 */ ori $t7, $v0, 0x0800 ## $t7 = 00000800 /* 05C10 80A60F00 AC8F01F0 */ sw $t7, 0x01F0($a0) ## 0000039C /* 05C14 80A60F04 3C188013 */ lui $t8, 0x8013 ## $t8 = 80130000 /* 05C18 80A60F08 271833E8 */ addiu $t8, $t8, 0x33E8 ## $t8 = 801333E8 -/* 05C1C 80A60F0C AFB80014 */ sw $t8, 0x0014($sp) -/* 05C20 80A60F10 AFA70010 */ sw $a3, 0x0010($sp) +/* 05C1C 80A60F0C AFB80014 */ sw $t8, 0x0014($sp) +/* 05C20 80A60F10 AFA70010 */ sw $a3, 0x0010($sp) /* 05C24 80A60F14 2404282B */ addiu $a0, $zero, 0x282B ## $a0 = 0000282B /* 05C28 80A60F18 260500E4 */ addiu $a1, $s0, 0x00E4 ## $a1 = 000000E4 /* 05C2C 80A60F1C 0C03DCE3 */ jal Audio_PlaySoundGeneral - + /* 05C30 80A60F20 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 .L80A60F24: /* 05C34 80A60F24 260401AC */ addiu $a0, $s0, 0x01AC ## $a0 = 000001AC .L80A60F28: /* 05C38 80A60F28 0C02927F */ jal SkelAnime_FrameUpdateMatrix - -/* 05C3C 80A60F2C AFA40030 */ sw $a0, 0x0030($sp) -/* 05C40 80A60F30 50400045 */ beql $v0, $zero, .L80A61048 -/* 05C44 80A60F34 8FBF002C */ lw $ra, 0x002C($sp) + +/* 05C3C 80A60F2C AFA40030 */ sw $a0, 0x0030($sp) +/* 05C40 80A60F30 50400045 */ beql $v0, $zero, .L80A61048 +/* 05C44 80A60F34 8FBF002C */ lw $ra, 0x002C($sp) /* 05C48 80A60F38 96020384 */ lhu $v0, 0x0384($s0) ## 00000384 /* 05C4C 80A60F3C AE000210 */ sw $zero, 0x0210($s0) ## 00000210 /* 05C50 80A60F40 30590004 */ andi $t9, $v0, 0x0004 ## $t9 = 00000000 -/* 05C54 80A60F44 17200022 */ bne $t9, $zero, .L80A60FD0 +/* 05C54 80A60F44 17200022 */ bne $t9, $zero, .L80A60FD0 /* 05C58 80A60F48 34480004 */ ori $t0, $v0, 0x0004 ## $t0 = 00000004 /* 05C5C 80A60F4C 8E090158 */ lw $t1, 0x0158($s0) ## 00000158 /* 05C60 80A60F50 3C0B80A6 */ lui $t3, %hi(D_80A65E58) ## $t3 = 80A60000 /* 05C64 80A60F54 A6080384 */ sh $t0, 0x0384($s0) ## 00000384 -/* 05C68 80A60F58 00095080 */ sll $t2, $t1, 2 -/* 05C6C 80A60F5C 016A5821 */ addu $t3, $t3, $t2 -/* 05C70 80A60F60 8D6B5E58 */ lw $t3, %lo(D_80A65E58)($t3) -/* 05C74 80A60F64 00006880 */ sll $t5, $zero, 2 -/* 05C78 80A60F68 016D7021 */ addu $t6, $t3, $t5 +/* 05C68 80A60F58 00095080 */ sll $t2, $t1, 2 +/* 05C6C 80A60F5C 016A5821 */ addu $t3, $t3, $t2 +/* 05C70 80A60F60 8D6B5E58 */ lw $t3, %lo(D_80A65E58)($t3) +/* 05C74 80A60F64 00006880 */ sll $t5, $zero, 2 +/* 05C78 80A60F68 016D7021 */ addu $t6, $t3, $t5 /* 05C7C 80A60F6C 0C028800 */ jal SkelAnime_GetFrameCount - + /* 05C80 80A60F70 8DC40000 */ lw $a0, 0x0000($t6) ## 00000000 /* 05C84 80A60F74 8E0F0158 */ lw $t7, 0x0158($s0) ## 00000158 /* 05C88 80A60F78 44825000 */ mtc1 $v0, $f10 ## $f10 = 0.00 /* 05C8C 80A60F7C 3C1980A6 */ lui $t9, %hi(D_80A65E58) ## $t9 = 80A60000 -/* 05C90 80A60F80 000FC080 */ sll $t8, $t7, 2 +/* 05C90 80A60F80 000FC080 */ sll $t8, $t7, 2 /* 05C94 80A60F84 8E080210 */ lw $t0, 0x0210($s0) ## 00000210 -/* 05C98 80A60F88 0338C821 */ addu $t9, $t9, $t8 -/* 05C9C 80A60F8C 8F395E58 */ lw $t9, %lo(D_80A65E58)($t9) -/* 05CA0 80A60F90 46805420 */ cvt.s.w $f16, $f10 -/* 05CA4 80A60F94 00084880 */ sll $t1, $t0, 2 +/* 05C98 80A60F88 0338C821 */ addu $t9, $t9, $t8 +/* 05C9C 80A60F8C 8F395E58 */ lw $t9, %lo(D_80A65E58)($t9) +/* 05CA0 80A60F90 46805420 */ cvt.s.w $f16, $f10 +/* 05CA4 80A60F94 00084880 */ sll $t1, $t0, 2 /* 05CA8 80A60F98 3C01C040 */ lui $at, 0xC040 ## $at = C0400000 -/* 05CAC 80A60F9C 03295021 */ addu $t2, $t9, $t1 +/* 05CAC 80A60F9C 03295021 */ addu $t2, $t9, $t1 /* 05CB0 80A60FA0 44819000 */ mtc1 $at, $f18 ## $f18 = -3.00 /* 05CB4 80A60FA4 8D450000 */ lw $a1, 0x0000($t2) ## 00000000 /* 05CB8 80A60FA8 240C0002 */ addiu $t4, $zero, 0x0002 ## $t4 = 00000002 -/* 05CBC 80A60FAC AFAC0014 */ sw $t4, 0x0014($sp) -/* 05CC0 80A60FB0 E7B00010 */ swc1 $f16, 0x0010($sp) -/* 05CC4 80A60FB4 8FA40030 */ lw $a0, 0x0030($sp) +/* 05CBC 80A60FAC AFAC0014 */ sw $t4, 0x0014($sp) +/* 05CC0 80A60FB0 E7B00010 */ swc1 $f16, 0x0010($sp) +/* 05CC4 80A60FB4 8FA40030 */ lw $a0, 0x0030($sp) /* 05CC8 80A60FB8 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 05CCC 80A60FBC 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 05CD0 80A60FC0 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 05CD4 80A60FC4 E7B20018 */ swc1 $f18, 0x0018($sp) -/* 05CD8 80A60FC8 1000001F */ beq $zero, $zero, .L80A61048 -/* 05CDC 80A60FCC 8FBF002C */ lw $ra, 0x002C($sp) +/* 05CD0 80A60FC0 0C029468 */ jal SkelAnime_ChangeAnim + +/* 05CD4 80A60FC4 E7B20018 */ swc1 $f18, 0x0018($sp) +/* 05CD8 80A60FC8 1000001F */ beq $zero, $zero, .L80A61048 +/* 05CDC 80A60FCC 8FBF002C */ lw $ra, 0x002C($sp) .L80A60FD0: /* 05CE0 80A60FD0 8E0B0158 */ lw $t3, 0x0158($s0) ## 00000158 /* 05CE4 80A60FD4 3C0E80A6 */ lui $t6, %hi(D_80A65E58) ## $t6 = 80A60000 /* 05CE8 80A60FD8 8E0F0210 */ lw $t7, 0x0210($s0) ## 00000210 -/* 05CEC 80A60FDC 000B6880 */ sll $t5, $t3, 2 -/* 05CF0 80A60FE0 01CD7021 */ addu $t6, $t6, $t5 -/* 05CF4 80A60FE4 8DCE5E58 */ lw $t6, %lo(D_80A65E58)($t6) -/* 05CF8 80A60FE8 000FC080 */ sll $t8, $t7, 2 -/* 05CFC 80A60FEC 01D84021 */ addu $t0, $t6, $t8 +/* 05CEC 80A60FDC 000B6880 */ sll $t5, $t3, 2 +/* 05CF0 80A60FE0 01CD7021 */ addu $t6, $t6, $t5 +/* 05CF4 80A60FE4 8DCE5E58 */ lw $t6, %lo(D_80A65E58)($t6) +/* 05CF8 80A60FE8 000FC080 */ sll $t8, $t7, 2 +/* 05CFC 80A60FEC 01D84021 */ addu $t0, $t6, $t8 /* 05D00 80A60FF0 0C028800 */ jal SkelAnime_GetFrameCount - + /* 05D04 80A60FF4 8D040000 */ lw $a0, 0x0000($t0) ## 00000000 /* 05D08 80A60FF8 8E190158 */ lw $t9, 0x0158($s0) ## 00000158 /* 05D0C 80A60FFC 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 05D10 80A61000 3C0A80A6 */ lui $t2, %hi(D_80A65E58) ## $t2 = 80A60000 -/* 05D14 80A61004 00194880 */ sll $t1, $t9, 2 +/* 05D14 80A61004 00194880 */ sll $t1, $t9, 2 /* 05D18 80A61008 8E0C0210 */ lw $t4, 0x0210($s0) ## 00000210 -/* 05D1C 80A6100C 01495021 */ addu $t2, $t2, $t1 -/* 05D20 80A61010 8D4A5E58 */ lw $t2, %lo(D_80A65E58)($t2) -/* 05D24 80A61014 468021A0 */ cvt.s.w $f6, $f4 -/* 05D28 80A61018 000C5880 */ sll $t3, $t4, 2 -/* 05D2C 80A6101C 014B6821 */ addu $t5, $t2, $t3 +/* 05D1C 80A6100C 01495021 */ addu $t2, $t2, $t1 +/* 05D20 80A61010 8D4A5E58 */ lw $t2, %lo(D_80A65E58)($t2) +/* 05D24 80A61014 468021A0 */ cvt.s.w $f6, $f4 +/* 05D28 80A61018 000C5880 */ sll $t3, $t4, 2 +/* 05D2C 80A6101C 014B6821 */ addu $t5, $t2, $t3 /* 05D30 80A61020 44804000 */ mtc1 $zero, $f8 ## $f8 = 0.00 /* 05D34 80A61024 8DA50000 */ lw $a1, 0x0000($t5) ## 00000000 -/* 05D38 80A61028 AFA00014 */ sw $zero, 0x0014($sp) -/* 05D3C 80A6102C E7A60010 */ swc1 $f6, 0x0010($sp) -/* 05D40 80A61030 8FA40030 */ lw $a0, 0x0030($sp) +/* 05D38 80A61028 AFA00014 */ sw $zero, 0x0014($sp) +/* 05D3C 80A6102C E7A60010 */ swc1 $f6, 0x0010($sp) +/* 05D40 80A61030 8FA40030 */ lw $a0, 0x0030($sp) /* 05D44 80A61034 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 05D48 80A61038 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 05D4C 80A6103C 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 05D50 80A61040 E7A80018 */ swc1 $f8, 0x0018($sp) -/* 05D54 80A61044 8FBF002C */ lw $ra, 0x002C($sp) +/* 05D4C 80A6103C 0C029468 */ jal SkelAnime_ChangeAnim + +/* 05D50 80A61040 E7A80018 */ swc1 $f8, 0x0018($sp) +/* 05D54 80A61044 8FBF002C */ lw $ra, 0x002C($sp) .L80A61048: -/* 05D58 80A61048 8FB00028 */ lw $s0, 0x0028($sp) +/* 05D58 80A61048 8FB00028 */ lw $s0, 0x0028($sp) /* 05D5C 80A6104C 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 -/* 05D60 80A61050 03E00008 */ jr $ra +/* 05D60 80A61050 03E00008 */ jr $ra /* 05D64 80A61054 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A61440.s b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A61440.s index 065d5c1f1d..64a973f60c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A61440.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A61440.s @@ -1,228 +1,228 @@ glabel func_80A61440 /* 06150 80A61440 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 06154 80A61444 AFBF002C */ sw $ra, 0x002C($sp) -/* 06158 80A61448 AFB00028 */ sw $s0, 0x0028($sp) +/* 06154 80A61444 AFBF002C */ sw $ra, 0x002C($sp) +/* 06158 80A61448 AFB00028 */ sw $s0, 0x0028($sp) /* 0615C 80A6144C C4800068 */ lwc1 $f0, 0x0068($a0) ## 00000068 /* 06160 80A61450 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 /* 06164 80A61454 240E0012 */ addiu $t6, $zero, 0x0012 ## $t6 = 00000012 /* 06168 80A61458 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 0616C 80A6145C 46002032 */ c.eq.s $f4, $f0 +/* 0616C 80A6145C 46002032 */ c.eq.s $f4, $f0 /* 06170 80A61460 00001825 */ or $v1, $zero, $zero ## $v1 = 00000000 /* 06174 80A61464 AC8E014C */ sw $t6, 0x014C($a0) ## 0000014C /* 06178 80A61468 24060006 */ addiu $a2, $zero, 0x0006 ## $a2 = 00000006 -/* 0617C 80A6146C 45000009 */ bc1f .L80A61494 +/* 0617C 80A6146C 45000009 */ bc1f .L80A61494 /* 06180 80A61470 3C014040 */ lui $at, 0x4040 ## $at = 40400000 /* 06184 80A61474 8C8F0210 */ lw $t7, 0x0210($a0) ## 00000210 /* 06188 80A61478 24040004 */ addiu $a0, $zero, 0x0004 ## $a0 = 00000004 /* 0618C 80A6147C 24050005 */ addiu $a1, $zero, 0x0005 ## $a1 = 00000005 -/* 06190 80A61480 11E00002 */ beq $t7, $zero, .L80A6148C +/* 06190 80A61480 11E00002 */ beq $t7, $zero, .L80A6148C /* 06194 80A61484 00000000 */ nop /* 06198 80A61488 24030001 */ addiu $v1, $zero, 0x0001 ## $v1 = 00000001 .L80A6148C: -/* 0619C 80A6148C 10000024 */ beq $zero, $zero, .L80A61520 +/* 0619C 80A6148C 10000024 */ beq $zero, $zero, .L80A61520 /* 061A0 80A61490 AE000210 */ sw $zero, 0x0210($s0) ## 00000210 .L80A61494: /* 061A4 80A61494 44813000 */ mtc1 $at, $f6 ## $f6 = 3.00 /* 061A8 80A61498 24060006 */ addiu $a2, $zero, 0x0006 ## $a2 = 00000006 /* 061AC 80A6149C 24050005 */ addiu $a1, $zero, 0x0005 ## $a1 = 00000005 -/* 061B0 80A614A0 4606003E */ c.le.s $f0, $f6 +/* 061B0 80A614A0 4606003E */ c.le.s $f0, $f6 /* 061B4 80A614A4 3C0140C0 */ lui $at, 0x40C0 ## $at = 40C00000 -/* 061B8 80A614A8 45020009 */ bc1fl .L80A614D0 +/* 061B8 80A614A8 45020009 */ bc1fl .L80A614D0 /* 061BC 80A614AC 44814000 */ mtc1 $at, $f8 ## $f8 = 6.00 /* 061C0 80A614B0 8E180210 */ lw $t8, 0x0210($s0) ## 00000210 /* 061C4 80A614B4 24040004 */ addiu $a0, $zero, 0x0004 ## $a0 = 00000004 -/* 061C8 80A614B8 10980002 */ beq $a0, $t8, .L80A614C4 +/* 061C8 80A614B8 10980002 */ beq $a0, $t8, .L80A614C4 /* 061CC 80A614BC 00000000 */ nop /* 061D0 80A614C0 24030001 */ addiu $v1, $zero, 0x0001 ## $v1 = 00000001 .L80A614C4: -/* 061D4 80A614C4 10000016 */ beq $zero, $zero, .L80A61520 +/* 061D4 80A614C4 10000016 */ beq $zero, $zero, .L80A61520 /* 061D8 80A614C8 AE040210 */ sw $a0, 0x0210($s0) ## 00000210 /* 061DC 80A614CC 44814000 */ mtc1 $at, $f8 ## $f8 = 6.00 .L80A614D0: /* 061E0 80A614D0 24060006 */ addiu $a2, $zero, 0x0006 ## $a2 = 00000006 /* 061E4 80A614D4 24050005 */ addiu $a1, $zero, 0x0005 ## $a1 = 00000005 -/* 061E8 80A614D8 4608003E */ c.le.s $f0, $f8 +/* 061E8 80A614D8 4608003E */ c.le.s $f0, $f8 /* 061EC 80A614DC 24040004 */ addiu $a0, $zero, 0x0004 ## $a0 = 00000004 -/* 061F0 80A614E0 4502000A */ bc1fl .L80A6150C +/* 061F0 80A614E0 4502000A */ bc1fl .L80A6150C /* 061F4 80A614E4 8E080210 */ lw $t0, 0x0210($s0) ## 00000210 /* 061F8 80A614E8 8E190210 */ lw $t9, 0x0210($s0) ## 00000210 /* 061FC 80A614EC 24050005 */ addiu $a1, $zero, 0x0005 ## $a1 = 00000005 /* 06200 80A614F0 24040004 */ addiu $a0, $zero, 0x0004 ## $a0 = 00000004 -/* 06204 80A614F4 10B90002 */ beq $a1, $t9, .L80A61500 +/* 06204 80A614F4 10B90002 */ beq $a1, $t9, .L80A61500 /* 06208 80A614F8 00000000 */ nop /* 0620C 80A614FC 24030001 */ addiu $v1, $zero, 0x0001 ## $v1 = 00000001 .L80A61500: -/* 06210 80A61500 10000007 */ beq $zero, $zero, .L80A61520 +/* 06210 80A61500 10000007 */ beq $zero, $zero, .L80A61520 /* 06214 80A61504 AE050210 */ sw $a1, 0x0210($s0) ## 00000210 /* 06218 80A61508 8E080210 */ lw $t0, 0x0210($s0) ## 00000210 .L80A6150C: /* 0621C 80A6150C 24060006 */ addiu $a2, $zero, 0x0006 ## $a2 = 00000006 -/* 06220 80A61510 50C80003 */ beql $a2, $t0, .L80A61520 +/* 06220 80A61510 50C80003 */ beql $a2, $t0, .L80A61520 /* 06224 80A61514 AE060210 */ sw $a2, 0x0210($s0) ## 00000210 /* 06228 80A61518 24030001 */ addiu $v1, $zero, 0x0001 ## $v1 = 00000001 /* 0622C 80A6151C AE060210 */ sw $a2, 0x0210($s0) ## 00000210 .L80A61520: /* 06230 80A61520 8E020210 */ lw $v0, 0x0210($s0) ## 00000210 /* 06234 80A61524 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 -/* 06238 80A61528 14820007 */ bne $a0, $v0, .L80A61548 +/* 06238 80A61528 14820007 */ bne $a0, $v0, .L80A61548 /* 0623C 80A6152C 00000000 */ nop /* 06240 80A61530 C60A0068 */ lwc1 $f10, 0x0068($s0) ## 00000068 /* 06244 80A61534 44818000 */ mtc1 $at, $f16 ## $f16 = 0.50 /* 06248 80A61538 00000000 */ nop -/* 0624C 80A6153C 46105482 */ mul.s $f18, $f10, $f16 -/* 06250 80A61540 10000037 */ beq $zero, $zero, .L80A61620 -/* 06254 80A61544 E7B20030 */ swc1 $f18, 0x0030($sp) +/* 0624C 80A6153C 46105482 */ mul.s $f18, $f10, $f16 +/* 06250 80A61540 10000037 */ beq $zero, $zero, .L80A61620 +/* 06254 80A61544 E7B20030 */ swc1 $f18, 0x0030($sp) .L80A61548: -/* 06258 80A61548 14A20018 */ bne $a1, $v0, .L80A615AC +/* 06258 80A61548 14A20018 */ bne $a1, $v0, .L80A615AC /* 0625C 80A6154C 3C078013 */ lui $a3, 0x8013 ## $a3 = 80130000 /* 06260 80A61550 3C013E80 */ lui $at, 0x3E80 ## $at = 3E800000 /* 06264 80A61554 44813000 */ mtc1 $at, $f6 ## $f6 = 0.25 /* 06268 80A61558 C6040068 */ lwc1 $f4, 0x0068($s0) ## 00000068 /* 0626C 80A6155C 3C098013 */ lui $t1, 0x8013 ## $t1 = 80130000 /* 06270 80A61560 24E733E0 */ addiu $a3, $a3, 0x33E0 ## $a3 = 801333E0 -/* 06274 80A61564 46062202 */ mul.s $f8, $f4, $f6 +/* 06274 80A61564 46062202 */ mul.s $f8, $f4, $f6 /* 06278 80A61568 252933E8 */ addiu $t1, $t1, 0x33E8 ## $t1 = 801333E8 -/* 0627C 80A6156C AFA90014 */ sw $t1, 0x0014($sp) -/* 06280 80A61570 AFA70010 */ sw $a3, 0x0010($sp) -/* 06284 80A61574 AFA30034 */ sw $v1, 0x0034($sp) +/* 0627C 80A6156C AFA90014 */ sw $t1, 0x0014($sp) +/* 06280 80A61570 AFA70010 */ sw $a3, 0x0010($sp) +/* 06284 80A61574 AFA30034 */ sw $v1, 0x0034($sp) /* 06288 80A61578 24042804 */ addiu $a0, $zero, 0x2804 ## $a0 = 00002804 /* 0628C 80A6157C 260500E4 */ addiu $a1, $s0, 0x00E4 ## $a1 = 000000E4 -/* 06290 80A61580 E7A80030 */ swc1 $f8, 0x0030($sp) +/* 06290 80A61580 E7A80030 */ swc1 $f8, 0x0030($sp) /* 06294 80A61584 0C03DCE3 */ jal Audio_PlaySoundGeneral - + /* 06298 80A61588 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 /* 0629C 80A6158C 44806000 */ mtc1 $zero, $f12 ## $f12 = 0.00 /* 062A0 80A61590 2405003C */ addiu $a1, $zero, 0x003C ## $a1 = 0000003C /* 062A4 80A61594 24060008 */ addiu $a2, $zero, 0x0008 ## $a2 = 00000008 -/* 062A8 80A61598 0C02A800 */ jal func_800AA000 +/* 062A8 80A61598 0C02A800 */ jal func_800AA000 /* 062AC 80A6159C 240700FF */ addiu $a3, $zero, 0x00FF ## $a3 = 000000FF -/* 062B0 80A615A0 8FA30034 */ lw $v1, 0x0034($sp) -/* 062B4 80A615A4 1000001E */ beq $zero, $zero, .L80A61620 +/* 062B0 80A615A0 8FA30034 */ lw $v1, 0x0034($sp) +/* 062B4 80A615A4 1000001E */ beq $zero, $zero, .L80A61620 /* 062B8 80A615A8 8E020210 */ lw $v0, 0x0210($s0) ## 00000210 .L80A615AC: -/* 062BC 80A615AC 14C20019 */ bne $a2, $v0, .L80A61614 +/* 062BC 80A615AC 14C20019 */ bne $a2, $v0, .L80A61614 /* 062C0 80A615B0 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 /* 062C4 80A615B4 3C0180A6 */ lui $at, %hi(D_80A66928) ## $at = 80A60000 -/* 062C8 80A615B8 C4306928 */ lwc1 $f16, %lo(D_80A66928)($at) +/* 062C8 80A615B8 C4306928 */ lwc1 $f16, %lo(D_80A66928)($at) /* 062CC 80A615BC C60A0068 */ lwc1 $f10, 0x0068($s0) ## 00000068 /* 062D0 80A615C0 3C078013 */ lui $a3, 0x8013 ## $a3 = 80130000 /* 062D4 80A615C4 3C0A8013 */ lui $t2, 0x8013 ## $t2 = 80130000 -/* 062D8 80A615C8 46105482 */ mul.s $f18, $f10, $f16 +/* 062D8 80A615C8 46105482 */ mul.s $f18, $f10, $f16 /* 062DC 80A615CC 24E733E0 */ addiu $a3, $a3, 0x33E0 ## $a3 = 801333E0 /* 062E0 80A615D0 254A33E8 */ addiu $t2, $t2, 0x33E8 ## $t2 = 801333E8 -/* 062E4 80A615D4 AFAA0014 */ sw $t2, 0x0014($sp) -/* 062E8 80A615D8 AFA70010 */ sw $a3, 0x0010($sp) -/* 062EC 80A615DC AFA30034 */ sw $v1, 0x0034($sp) +/* 062E4 80A615D4 AFAA0014 */ sw $t2, 0x0014($sp) +/* 062E8 80A615D8 AFA70010 */ sw $a3, 0x0010($sp) +/* 062EC 80A615DC AFA30034 */ sw $v1, 0x0034($sp) /* 062F0 80A615E0 24042804 */ addiu $a0, $zero, 0x2804 ## $a0 = 00002804 -/* 062F4 80A615E4 E7B20030 */ swc1 $f18, 0x0030($sp) +/* 062F4 80A615E4 E7B20030 */ swc1 $f18, 0x0030($sp) /* 062F8 80A615E8 260500E4 */ addiu $a1, $s0, 0x00E4 ## $a1 = 000000E4 /* 062FC 80A615EC 0C03DCE3 */ jal Audio_PlaySoundGeneral - + /* 06300 80A615F0 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 /* 06304 80A615F4 44806000 */ mtc1 $zero, $f12 ## $f12 = 0.00 /* 06308 80A615F8 24050078 */ addiu $a1, $zero, 0x0078 ## $a1 = 00000078 /* 0630C 80A615FC 24060008 */ addiu $a2, $zero, 0x0008 ## $a2 = 00000008 -/* 06310 80A61600 0C02A800 */ jal func_800AA000 +/* 06310 80A61600 0C02A800 */ jal func_800AA000 /* 06314 80A61604 240700FF */ addiu $a3, $zero, 0x00FF ## $a3 = 000000FF -/* 06318 80A61608 8FA30034 */ lw $v1, 0x0034($sp) -/* 0631C 80A6160C 10000004 */ beq $zero, $zero, .L80A61620 +/* 06318 80A61608 8FA30034 */ lw $v1, 0x0034($sp) +/* 0631C 80A6160C 10000004 */ beq $zero, $zero, .L80A61620 /* 06320 80A61610 8E020210 */ lw $v0, 0x0210($s0) ## 00000210 .L80A61614: /* 06324 80A61614 44812000 */ mtc1 $at, $f4 ## $f4 = 0.00 /* 06328 80A61618 00000000 */ nop -/* 0632C 80A6161C E7A40030 */ swc1 $f4, 0x0030($sp) +/* 0632C 80A6161C E7A40030 */ swc1 $f4, 0x0030($sp) .L80A61620: /* 06330 80A61620 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 06334 80A61624 5461002B */ bnel $v1, $at, .L80A616D4 +/* 06334 80A61624 5461002B */ bnel $v1, $at, .L80A616D4 /* 06338 80A61628 8E0B0158 */ lw $t3, 0x0158($s0) ## 00000158 /* 0633C 80A6162C 8E0B0158 */ lw $t3, 0x0158($s0) ## 00000158 /* 06340 80A61630 3C0D80A6 */ lui $t5, %hi(D_80A65E58) ## $t5 = 80A60000 -/* 06344 80A61634 00027080 */ sll $t6, $v0, 2 -/* 06348 80A61638 000B6080 */ sll $t4, $t3, 2 -/* 0634C 80A6163C 01AC6821 */ addu $t5, $t5, $t4 -/* 06350 80A61640 8DAD5E58 */ lw $t5, %lo(D_80A65E58)($t5) -/* 06354 80A61644 01AE7821 */ addu $t7, $t5, $t6 +/* 06344 80A61634 00027080 */ sll $t6, $v0, 2 +/* 06348 80A61638 000B6080 */ sll $t4, $t3, 2 +/* 0634C 80A6163C 01AC6821 */ addu $t5, $t5, $t4 +/* 06350 80A61640 8DAD5E58 */ lw $t5, %lo(D_80A65E58)($t5) +/* 06354 80A61644 01AE7821 */ addu $t7, $t5, $t6 /* 06358 80A61648 0C028800 */ jal SkelAnime_GetFrameCount - + /* 0635C 80A6164C 8DE40000 */ lw $a0, 0x0000($t7) ## 00000000 /* 06360 80A61650 8E030210 */ lw $v1, 0x0210($s0) ## 00000210 /* 06364 80A61654 3C0180A6 */ lui $at, %hi(D_80A65E60) ## $at = 80A60000 -/* 06368 80A61658 C7A80030 */ lwc1 $f8, 0x0030($sp) -/* 0636C 80A6165C 00031880 */ sll $v1, $v1, 2 -/* 06370 80A61660 00230821 */ addu $at, $at, $v1 -/* 06374 80A61664 C4265E60 */ lwc1 $f6, %lo(D_80A65E60)($at) +/* 06368 80A61658 C7A80030 */ lwc1 $f8, 0x0030($sp) +/* 0636C 80A6165C 00031880 */ sll $v1, $v1, 2 +/* 06370 80A61660 00230821 */ addu $at, $at, $v1 +/* 06374 80A61664 C4265E60 */ lwc1 $f6, %lo(D_80A65E60)($at) /* 06378 80A61668 3C013FC0 */ lui $at, 0x3FC0 ## $at = 3FC00000 /* 0637C 80A6166C 44818000 */ mtc1 $at, $f16 ## $f16 = 1.50 -/* 06380 80A61670 46083282 */ mul.s $f10, $f6, $f8 +/* 06380 80A61670 46083282 */ mul.s $f10, $f6, $f8 /* 06384 80A61674 8E180158 */ lw $t8, 0x0158($s0) ## 00000158 /* 06388 80A61678 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 0638C 80A6167C 3C0880A6 */ lui $t0, %hi(D_80A65E58) ## $t0 = 80A60000 -/* 06390 80A61680 0018C880 */ sll $t9, $t8, 2 -/* 06394 80A61684 01194021 */ addu $t0, $t0, $t9 -/* 06398 80A61688 8D085E58 */ lw $t0, %lo(D_80A65E58)($t0) -/* 0639C 80A6168C 46105482 */ mul.s $f18, $f10, $f16 +/* 06390 80A61680 0018C880 */ sll $t9, $t8, 2 +/* 06394 80A61684 01194021 */ addu $t0, $t0, $t9 +/* 06398 80A61688 8D085E58 */ lw $t0, %lo(D_80A65E58)($t0) +/* 0639C 80A6168C 46105482 */ mul.s $f18, $f10, $f16 /* 063A0 80A61690 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 /* 063A4 80A61694 3C01C040 */ lui $at, 0xC040 ## $at = C0400000 -/* 063A8 80A61698 01034821 */ addu $t1, $t0, $v1 +/* 063A8 80A61698 01034821 */ addu $t1, $t0, $v1 /* 063AC 80A6169C 44814000 */ mtc1 $at, $f8 ## $f8 = -3.00 /* 063B0 80A616A0 8D250000 */ lw $a1, 0x0000($t1) ## 00000000 -/* 063B4 80A616A4 468021A0 */ cvt.s.w $f6, $f4 -/* 063B8 80A616A8 44069000 */ mfc1 $a2, $f18 +/* 063B4 80A616A4 468021A0 */ cvt.s.w $f6, $f4 +/* 063B8 80A616A8 44069000 */ mfc1 $a2, $f18 /* 063BC 80A616AC 240A0002 */ addiu $t2, $zero, 0x0002 ## $t2 = 00000002 -/* 063C0 80A616B0 44070000 */ mfc1 $a3, $f0 -/* 063C4 80A616B4 AFAA0014 */ sw $t2, 0x0014($sp) +/* 063C0 80A616B0 44070000 */ mfc1 $a3, $f0 +/* 063C4 80A616B4 AFAA0014 */ sw $t2, 0x0014($sp) /* 063C8 80A616B8 260401AC */ addiu $a0, $s0, 0x01AC ## $a0 = 000001AC -/* 063CC 80A616BC E7A60010 */ swc1 $f6, 0x0010($sp) -/* 063D0 80A616C0 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 063D4 80A616C4 E7A80018 */ swc1 $f8, 0x0018($sp) -/* 063D8 80A616C8 10000027 */ beq $zero, $zero, .L80A61768 -/* 063DC 80A616CC 8FBF002C */ lw $ra, 0x002C($sp) +/* 063CC 80A616BC E7A60010 */ swc1 $f6, 0x0010($sp) +/* 063D0 80A616C0 0C029468 */ jal SkelAnime_ChangeAnim + +/* 063D4 80A616C4 E7A80018 */ swc1 $f8, 0x0018($sp) +/* 063D8 80A616C8 10000027 */ beq $zero, $zero, .L80A61768 +/* 063DC 80A616CC 8FBF002C */ lw $ra, 0x002C($sp) /* 063E0 80A616D0 8E0B0158 */ lw $t3, 0x0158($s0) ## 00000158 .L80A616D4: /* 063E4 80A616D4 3C0D80A6 */ lui $t5, %hi(D_80A65E58) ## $t5 = 80A60000 -/* 063E8 80A616D8 00027080 */ sll $t6, $v0, 2 -/* 063EC 80A616DC 000B6080 */ sll $t4, $t3, 2 -/* 063F0 80A616E0 01AC6821 */ addu $t5, $t5, $t4 -/* 063F4 80A616E4 8DAD5E58 */ lw $t5, %lo(D_80A65E58)($t5) -/* 063F8 80A616E8 01AE7821 */ addu $t7, $t5, $t6 +/* 063E8 80A616D8 00027080 */ sll $t6, $v0, 2 +/* 063EC 80A616DC 000B6080 */ sll $t4, $t3, 2 +/* 063F0 80A616E0 01AC6821 */ addu $t5, $t5, $t4 +/* 063F4 80A616E4 8DAD5E58 */ lw $t5, %lo(D_80A65E58)($t5) +/* 063F8 80A616E8 01AE7821 */ addu $t7, $t5, $t6 /* 063FC 80A616EC 0C028800 */ jal SkelAnime_GetFrameCount - + /* 06400 80A616F0 8DE40000 */ lw $a0, 0x0000($t7) ## 00000000 /* 06404 80A616F4 8E030210 */ lw $v1, 0x0210($s0) ## 00000210 /* 06408 80A616F8 3C0180A6 */ lui $at, %hi(D_80A65E60) ## $at = 80A60000 -/* 0640C 80A616FC C7B00030 */ lwc1 $f16, 0x0030($sp) -/* 06410 80A61700 00031880 */ sll $v1, $v1, 2 -/* 06414 80A61704 00230821 */ addu $at, $at, $v1 -/* 06418 80A61708 C42A5E60 */ lwc1 $f10, %lo(D_80A65E60)($at) +/* 0640C 80A616FC C7B00030 */ lwc1 $f16, 0x0030($sp) +/* 06410 80A61700 00031880 */ sll $v1, $v1, 2 +/* 06414 80A61704 00230821 */ addu $at, $at, $v1 +/* 06418 80A61708 C42A5E60 */ lwc1 $f10, %lo(D_80A65E60)($at) /* 0641C 80A6170C 3C013FC0 */ lui $at, 0x3FC0 ## $at = 3FC00000 /* 06420 80A61710 44812000 */ mtc1 $at, $f4 ## $f4 = 1.50 -/* 06424 80A61714 46105482 */ mul.s $f18, $f10, $f16 +/* 06424 80A61714 46105482 */ mul.s $f18, $f10, $f16 /* 06428 80A61718 8E180158 */ lw $t8, 0x0158($s0) ## 00000158 /* 0642C 80A6171C 44824000 */ mtc1 $v0, $f8 ## $f8 = 0.00 /* 06430 80A61720 3C0880A6 */ lui $t0, %hi(D_80A65E58) ## $t0 = 80A60000 -/* 06434 80A61724 0018C880 */ sll $t9, $t8, 2 -/* 06438 80A61728 01194021 */ addu $t0, $t0, $t9 -/* 0643C 80A6172C 8D085E58 */ lw $t0, %lo(D_80A65E58)($t0) -/* 06440 80A61730 46049182 */ mul.s $f6, $f18, $f4 +/* 06434 80A61724 0018C880 */ sll $t9, $t8, 2 +/* 06438 80A61728 01194021 */ addu $t0, $t0, $t9 +/* 0643C 80A6172C 8D085E58 */ lw $t0, %lo(D_80A65E58)($t0) +/* 06440 80A61730 46049182 */ mul.s $f6, $f18, $f4 /* 06444 80A61734 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 06448 80A61738 01034821 */ addu $t1, $t0, $v1 +/* 06448 80A61738 01034821 */ addu $t1, $t0, $v1 /* 0644C 80A6173C 8D250000 */ lw $a1, 0x0000($t1) ## 00000000 /* 06450 80A61740 240A0002 */ addiu $t2, $zero, 0x0002 ## $t2 = 00000002 -/* 06454 80A61744 44070000 */ mfc1 $a3, $f0 -/* 06458 80A61748 468042A0 */ cvt.s.w $f10, $f8 -/* 0645C 80A6174C 44063000 */ mfc1 $a2, $f6 -/* 06460 80A61750 AFAA0014 */ sw $t2, 0x0014($sp) +/* 06454 80A61744 44070000 */ mfc1 $a3, $f0 +/* 06458 80A61748 468042A0 */ cvt.s.w $f10, $f8 +/* 0645C 80A6174C 44063000 */ mfc1 $a2, $f6 +/* 06460 80A61750 AFAA0014 */ sw $t2, 0x0014($sp) /* 06464 80A61754 260401AC */ addiu $a0, $s0, 0x01AC ## $a0 = 000001AC -/* 06468 80A61758 E7A00018 */ swc1 $f0, 0x0018($sp) -/* 0646C 80A6175C 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 06470 80A61760 E7AA0010 */ swc1 $f10, 0x0010($sp) -/* 06474 80A61764 8FBF002C */ lw $ra, 0x002C($sp) +/* 06468 80A61758 E7A00018 */ swc1 $f0, 0x0018($sp) +/* 0646C 80A6175C 0C029468 */ jal SkelAnime_ChangeAnim + +/* 06470 80A61760 E7AA0010 */ swc1 $f10, 0x0010($sp) +/* 06474 80A61764 8FBF002C */ lw $ra, 0x002C($sp) .L80A61768: -/* 06478 80A61768 8FB00028 */ lw $s0, 0x0028($sp) +/* 06478 80A61768 8FB00028 */ lw $s0, 0x0028($sp) /* 0647C 80A6176C 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 -/* 06480 80A61770 03E00008 */ jr $ra +/* 06480 80A61770 03E00008 */ jr $ra /* 06484 80A61774 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A61A28.s b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A61A28.s index a5e610467c..d353c633e3 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A61A28.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A61A28.s @@ -1,126 +1,126 @@ glabel func_80A61A28 /* 06738 80A61A28 27BDFFA0 */ addiu $sp, $sp, 0xFFA0 ## $sp = FFFFFFA0 -/* 0673C 80A61A2C AFBF002C */ sw $ra, 0x002C($sp) -/* 06740 80A61A30 AFB00028 */ sw $s0, 0x0028($sp) -/* 06744 80A61A34 AFA50064 */ sw $a1, 0x0064($sp) +/* 0673C 80A61A2C AFBF002C */ sw $ra, 0x002C($sp) +/* 06740 80A61A30 AFB00028 */ sw $s0, 0x0028($sp) +/* 06744 80A61A34 AFA50064 */ sw $a1, 0x0064($sp) /* 06748 80A61A38 8CAF1C44 */ lw $t7, 0x1C44($a1) ## 00001C44 /* 0674C 80A61A3C 3C188016 */ lui $t8, 0x8016 ## $t8 = 80160000 /* 06750 80A61A40 8F18FA90 */ lw $t8, -0x0570($t8) ## 8015FA90 -/* 06754 80A61A44 AFAF005C */ sw $t7, 0x005C($sp) +/* 06754 80A61A44 AFAF005C */ sw $t7, 0x005C($sp) /* 06758 80A61A48 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 0675C 80A61A4C 871905BE */ lh $t9, 0x05BE($t8) ## 801605BE -/* 06760 80A61A50 17200005 */ bne $t9, $zero, .L80A61A68 +/* 06760 80A61A50 17200005 */ bne $t9, $zero, .L80A61A68 /* 06764 80A61A54 00000000 */ nop /* 06768 80A61A58 8C880158 */ lw $t0, 0x0158($a0) ## 00000158 /* 0676C 80A61A5C 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 06770 80A61A60 5501000E */ bnel $t0, $at, .L80A61A9C +/* 06770 80A61A60 5501000E */ bnel $t0, $at, .L80A61A9C /* 06774 80A61A64 26040008 */ addiu $a0, $s0, 0x0008 ## $a0 = 00000008 .L80A61A68: -/* 06778 80A61A68 0C297CF7 */ jal func_80A5F3DC +/* 06778 80A61A68 0C297CF7 */ jal func_80A5F3DC /* 0677C 80A61A6C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 06780 80A61A70 3C078013 */ lui $a3, 0x8013 ## $a3 = 80130000 /* 06784 80A61A74 3C098013 */ lui $t1, 0x8013 ## $t1 = 80130000 /* 06788 80A61A78 24E733E0 */ addiu $a3, $a3, 0x33E0 ## $a3 = 801333E0 /* 0678C 80A61A7C 252933E8 */ addiu $t1, $t1, 0x33E8 ## $t1 = 801333E8 -/* 06790 80A61A80 AFA90014 */ sw $t1, 0x0014($sp) -/* 06794 80A61A84 AFA70010 */ sw $a3, 0x0010($sp) +/* 06790 80A61A80 AFA90014 */ sw $t1, 0x0014($sp) +/* 06794 80A61A84 AFA70010 */ sw $a3, 0x0010($sp) /* 06798 80A61A88 24042805 */ addiu $a0, $zero, 0x2805 ## $a0 = 00002805 /* 0679C 80A61A8C 260500E4 */ addiu $a1, $s0, 0x00E4 ## $a1 = 000000E4 /* 067A0 80A61A90 0C03DCE3 */ jal Audio_PlaySoundGeneral - + /* 067A4 80A61A94 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 /* 067A8 80A61A98 26040008 */ addiu $a0, $s0, 0x0008 ## $a0 = 00000008 .L80A61A9C: /* 067AC 80A61A9C 26050024 */ addiu $a1, $s0, 0x0024 ## $a1 = 00000024 -/* 067B0 80A61AA0 AFA50034 */ sw $a1, 0x0034($sp) -/* 067B4 80A61AA4 0C032D9E */ jal func_800CB678 -/* 067B8 80A61AA8 AFA40038 */ sw $a0, 0x0038($sp) -/* 067BC 80A61AAC 8FA4005C */ lw $a0, 0x005C($sp) -/* 067C0 80A61AB0 E7A00058 */ swc1 $f0, 0x0058($sp) -/* 067C4 80A61AB4 8FA50038 */ lw $a1, 0x0038($sp) +/* 067B0 80A61AA0 AFA50034 */ sw $a1, 0x0034($sp) +/* 067B4 80A61AA4 0C032D9E */ jal func_800CB678 +/* 067B8 80A61AA8 AFA40038 */ sw $a0, 0x0038($sp) +/* 067BC 80A61AAC 8FA4005C */ lw $a0, 0x005C($sp) +/* 067C0 80A61AB0 E7A00058 */ swc1 $f0, 0x0058($sp) +/* 067C4 80A61AB4 8FA50038 */ lw $a1, 0x0038($sp) /* 067C8 80A61AB8 24840024 */ addiu $a0, $a0, 0x0024 ## $a0 = 00000024 -/* 067CC 80A61ABC 0C032D9E */ jal func_800CB678 -/* 067D0 80A61AC0 AFA40030 */ sw $a0, 0x0030($sp) -/* 067D4 80A61AC4 8FA40030 */ lw $a0, 0x0030($sp) -/* 067D8 80A61AC8 E7A00054 */ swc1 $f0, 0x0054($sp) -/* 067DC 80A61ACC 0C032D9E */ jal func_800CB678 -/* 067E0 80A61AD0 8FA50034 */ lw $a1, 0x0034($sp) +/* 067CC 80A61ABC 0C032D9E */ jal func_800CB678 +/* 067D0 80A61AC0 AFA40030 */ sw $a0, 0x0030($sp) +/* 067D4 80A61AC4 8FA40030 */ lw $a0, 0x0030($sp) +/* 067D8 80A61AC8 E7A00054 */ swc1 $f0, 0x0054($sp) +/* 067DC 80A61ACC 0C032D9E */ jal func_800CB678 +/* 067E0 80A61AD0 8FA50034 */ lw $a1, 0x0034($sp) /* 067E4 80A61AD4 3C014396 */ lui $at, 0x4396 ## $at = 43960000 /* 067E8 80A61AD8 44816000 */ mtc1 $at, $f12 ## $f12 = 300.00 -/* 067EC 80A61ADC C7A40054 */ lwc1 $f4, 0x0054($sp) +/* 067EC 80A61ADC C7A40054 */ lwc1 $f4, 0x0054($sp) /* 067F0 80A61AE0 3C014316 */ lui $at, 0x4316 ## $at = 43160000 -/* 067F4 80A61AE4 C7A80058 */ lwc1 $f8, 0x0058($sp) -/* 067F8 80A61AE8 4604603C */ c.lt.s $f12, $f4 +/* 067F4 80A61AE4 C7A80058 */ lwc1 $f8, 0x0058($sp) +/* 067F8 80A61AE8 4604603C */ c.lt.s $f12, $f4 /* 067FC 80A61AEC 00000000 */ nop -/* 06800 80A61AF0 45020026 */ bc1fl .L80A61B8C -/* 06804 80A61AF4 460C003C */ c.lt.s $f0, $f12 +/* 06800 80A61AF0 45020026 */ bc1fl .L80A61B8C +/* 06804 80A61AF4 460C003C */ c.lt.s $f0, $f12 /* 06808 80A61AF8 44813000 */ mtc1 $at, $f6 ## $f6 = 150.00 /* 0680C 80A61AFC 3C0180A6 */ lui $at, %hi(D_80A66934) ## $at = 80A60000 -/* 06810 80A61B00 4608303C */ c.lt.s $f6, $f8 +/* 06810 80A61B00 4608303C */ c.lt.s $f6, $f8 /* 06814 80A61B04 00000000 */ nop -/* 06818 80A61B08 45020011 */ bc1fl .L80A61B50 +/* 06818 80A61B08 45020011 */ bc1fl .L80A61B50 /* 0681C 80A61B0C C6040068 */ lwc1 $f4, 0x0068($s0) ## 00000068 /* 06820 80A61B10 3C014100 */ lui $at, 0x4100 ## $at = 41000000 /* 06824 80A61B14 44811000 */ mtc1 $at, $f2 ## $f2 = 8.00 /* 06828 80A61B18 3C0180A6 */ lui $at, %hi(D_80A66930) ## $at = 80A60000 -/* 0682C 80A61B1C C4306930 */ lwc1 $f16, %lo(D_80A66930)($at) +/* 0682C 80A61B1C C4306930 */ lwc1 $f16, %lo(D_80A66930)($at) /* 06830 80A61B20 C60A0068 */ lwc1 $f10, 0x0068($s0) ## 00000068 -/* 06834 80A61B24 46105480 */ add.s $f18, $f10, $f16 +/* 06834 80A61B24 46105480 */ add.s $f18, $f10, $f16 /* 06838 80A61B28 E6120068 */ swc1 $f18, 0x0068($s0) ## 00000068 /* 0683C 80A61B2C C6000068 */ lwc1 $f0, 0x0068($s0) ## 00000068 -/* 06840 80A61B30 4600103C */ c.lt.s $f2, $f0 +/* 06840 80A61B30 4600103C */ c.lt.s $f2, $f0 /* 06844 80A61B34 00000000 */ nop -/* 06848 80A61B38 45020035 */ bc1fl .L80A61C10 +/* 06848 80A61B38 45020035 */ bc1fl .L80A61C10 /* 0684C 80A61B3C 3C0140C0 */ lui $at, 0x40C0 ## $at = 40C00000 /* 06850 80A61B40 E6020068 */ swc1 $f2, 0x0068($s0) ## 00000068 -/* 06854 80A61B44 10000031 */ beq $zero, $zero, .L80A61C0C +/* 06854 80A61B44 10000031 */ beq $zero, $zero, .L80A61C0C /* 06858 80A61B48 C6000068 */ lwc1 $f0, 0x0068($s0) ## 00000068 /* 0685C 80A61B4C C6040068 */ lwc1 $f4, 0x0068($s0) ## 00000068 .L80A61B50: -/* 06860 80A61B50 C4266934 */ lwc1 $f6, %lo(D_80A66934)($at) +/* 06860 80A61B50 C4266934 */ lwc1 $f6, %lo(D_80A66934)($at) /* 06864 80A61B54 44805000 */ mtc1 $zero, $f10 ## $f10 = 0.00 -/* 06868 80A61B58 46062201 */ sub.s $f8, $f4, $f6 +/* 06868 80A61B58 46062201 */ sub.s $f8, $f4, $f6 /* 0686C 80A61B5C E6080068 */ swc1 $f8, 0x0068($s0) ## 00000068 /* 06870 80A61B60 C6000068 */ lwc1 $f0, 0x0068($s0) ## 00000068 -/* 06874 80A61B64 460A003C */ c.lt.s $f0, $f10 +/* 06874 80A61B64 460A003C */ c.lt.s $f0, $f10 /* 06878 80A61B68 00000000 */ nop -/* 0687C 80A61B6C 45020028 */ bc1fl .L80A61C10 +/* 0687C 80A61B6C 45020028 */ bc1fl .L80A61C10 /* 06880 80A61B70 3C0140C0 */ lui $at, 0x40C0 ## $at = 40C00000 /* 06884 80A61B74 44808000 */ mtc1 $zero, $f16 ## $f16 = 0.00 /* 06888 80A61B78 00000000 */ nop /* 0688C 80A61B7C E6100068 */ swc1 $f16, 0x0068($s0) ## 00000068 -/* 06890 80A61B80 10000022 */ beq $zero, $zero, .L80A61C0C +/* 06890 80A61B80 10000022 */ beq $zero, $zero, .L80A61C0C /* 06894 80A61B84 C6000068 */ lwc1 $f0, 0x0068($s0) ## 00000068 -/* 06898 80A61B88 460C003C */ c.lt.s $f0, $f12 +/* 06898 80A61B88 460C003C */ c.lt.s $f0, $f12 .L80A61B8C: /* 0689C 80A61B8C 3C0180A6 */ lui $at, %hi(D_80A6693C) ## $at = 80A60000 -/* 068A0 80A61B90 45020011 */ bc1fl .L80A61BD8 +/* 068A0 80A61B90 45020011 */ bc1fl .L80A61BD8 /* 068A4 80A61B94 C6080068 */ lwc1 $f8, 0x0068($s0) ## 00000068 /* 068A8 80A61B98 3C014100 */ lui $at, 0x4100 ## $at = 41000000 /* 068AC 80A61B9C 44811000 */ mtc1 $at, $f2 ## $f2 = 8.00 /* 068B0 80A61BA0 3C0180A6 */ lui $at, %hi(D_80A66938) ## $at = 80A60000 -/* 068B4 80A61BA4 C4246938 */ lwc1 $f4, %lo(D_80A66938)($at) +/* 068B4 80A61BA4 C4246938 */ lwc1 $f4, %lo(D_80A66938)($at) /* 068B8 80A61BA8 C6120068 */ lwc1 $f18, 0x0068($s0) ## 00000068 -/* 068BC 80A61BAC 46049180 */ add.s $f6, $f18, $f4 +/* 068BC 80A61BAC 46049180 */ add.s $f6, $f18, $f4 /* 068C0 80A61BB0 E6060068 */ swc1 $f6, 0x0068($s0) ## 00000068 /* 068C4 80A61BB4 C6000068 */ lwc1 $f0, 0x0068($s0) ## 00000068 -/* 068C8 80A61BB8 4600103C */ c.lt.s $f2, $f0 +/* 068C8 80A61BB8 4600103C */ c.lt.s $f2, $f0 /* 068CC 80A61BBC 00000000 */ nop -/* 068D0 80A61BC0 45020013 */ bc1fl .L80A61C10 +/* 068D0 80A61BC0 45020013 */ bc1fl .L80A61C10 /* 068D4 80A61BC4 3C0140C0 */ lui $at, 0x40C0 ## $at = 40C00000 /* 068D8 80A61BC8 E6020068 */ swc1 $f2, 0x0068($s0) ## 00000068 -/* 068DC 80A61BCC 1000000F */ beq $zero, $zero, .L80A61C0C +/* 068DC 80A61BCC 1000000F */ beq $zero, $zero, .L80A61C0C /* 068E0 80A61BD0 C6000068 */ lwc1 $f0, 0x0068($s0) ## 00000068 /* 068E4 80A61BD4 C6080068 */ lwc1 $f8, 0x0068($s0) ## 00000068 .L80A61BD8: -/* 068E8 80A61BD8 C42A693C */ lwc1 $f10, %lo(D_80A6693C)($at) +/* 068E8 80A61BD8 C42A693C */ lwc1 $f10, %lo(D_80A6693C)($at) /* 068EC 80A61BDC 44809000 */ mtc1 $zero, $f18 ## $f18 = 0.00 -/* 068F0 80A61BE0 460A4401 */ sub.s $f16, $f8, $f10 +/* 068F0 80A61BE0 460A4401 */ sub.s $f16, $f8, $f10 /* 068F4 80A61BE4 E6100068 */ swc1 $f16, 0x0068($s0) ## 00000068 /* 068F8 80A61BE8 C6000068 */ lwc1 $f0, 0x0068($s0) ## 00000068 -/* 068FC 80A61BEC 4612003C */ c.lt.s $f0, $f18 +/* 068FC 80A61BEC 4612003C */ c.lt.s $f0, $f18 /* 06900 80A61BF0 00000000 */ nop -/* 06904 80A61BF4 45020006 */ bc1fl .L80A61C10 +/* 06904 80A61BF4 45020006 */ bc1fl .L80A61C10 /* 06908 80A61BF8 3C0140C0 */ lui $at, 0x40C0 ## $at = 40C00000 /* 0690C 80A61BFC 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 /* 06910 80A61C00 00000000 */ nop @@ -131,47 +131,47 @@ glabel func_80A61A28 .L80A61C10: /* 06920 80A61C10 44813000 */ mtc1 $at, $f6 ## $f6 = 6.00 /* 06924 80A61C14 3C014040 */ lui $at, 0x4040 ## $at = 40400000 -/* 06928 80A61C18 4600303E */ c.le.s $f6, $f0 +/* 06928 80A61C18 4600303E */ c.le.s $f6, $f0 /* 0692C 80A61C1C 00000000 */ nop -/* 06930 80A61C20 45020008 */ bc1fl .L80A61C44 +/* 06930 80A61C20 45020008 */ bc1fl .L80A61C44 /* 06934 80A61C24 44818000 */ mtc1 $at, $f16 ## $f16 = 3.00 /* 06938 80A61C28 3C0180A6 */ lui $at, %hi(D_80A66940) ## $at = 80A60000 -/* 0693C 80A61C2C C4286940 */ lwc1 $f8, %lo(D_80A66940)($at) +/* 0693C 80A61C2C C4286940 */ lwc1 $f8, %lo(D_80A66940)($at) /* 06940 80A61C30 24060006 */ addiu $a2, $zero, 0x0006 ## $a2 = 00000006 -/* 06944 80A61C34 46080282 */ mul.s $f10, $f0, $f8 -/* 06948 80A61C38 10000032 */ beq $zero, $zero, .L80A61D04 +/* 06944 80A61C34 46080282 */ mul.s $f10, $f0, $f8 +/* 06948 80A61C38 10000032 */ beq $zero, $zero, .L80A61D04 /* 0694C 80A61C3C E60A01C8 */ swc1 $f10, 0x01C8($s0) ## 000001C8 /* 06950 80A61C40 44818000 */ mtc1 $at, $f16 ## $f16 = -0.00 .L80A61C44: /* 06954 80A61C44 3C0180A6 */ lui $at, %hi(D_80A66944) ## $at = 80A60000 -/* 06958 80A61C48 4600803E */ c.le.s $f16, $f0 +/* 06958 80A61C48 4600803E */ c.le.s $f16, $f0 /* 0695C 80A61C4C 00000000 */ nop -/* 06960 80A61C50 45000007 */ bc1f .L80A61C70 +/* 06960 80A61C50 45000007 */ bc1f .L80A61C70 /* 06964 80A61C54 00000000 */ nop /* 06968 80A61C58 3C013EC0 */ lui $at, 0x3EC0 ## $at = 3EC00000 /* 0696C 80A61C5C 44819000 */ mtc1 $at, $f18 ## $f18 = 0.38 /* 06970 80A61C60 24060005 */ addiu $a2, $zero, 0x0005 ## $a2 = 00000005 -/* 06974 80A61C64 46120102 */ mul.s $f4, $f0, $f18 -/* 06978 80A61C68 10000026 */ beq $zero, $zero, .L80A61D04 +/* 06974 80A61C64 46120102 */ mul.s $f4, $f0, $f18 +/* 06978 80A61C68 10000026 */ beq $zero, $zero, .L80A61D04 /* 0697C 80A61C6C E60401C8 */ swc1 $f4, 0x01C8($s0) ## 000001C8 .L80A61C70: -/* 06980 80A61C70 C4266944 */ lwc1 $f6, %lo(D_80A66944)($at) +/* 06980 80A61C70 C4266944 */ lwc1 $f6, %lo(D_80A66944)($at) /* 06984 80A61C74 3C013F40 */ lui $at, 0x3F40 ## $at = 3F400000 -/* 06988 80A61C78 4600303C */ c.lt.s $f6, $f0 +/* 06988 80A61C78 4600303C */ c.lt.s $f6, $f0 /* 0698C 80A61C7C 00000000 */ nop -/* 06990 80A61C80 4500000C */ bc1f .L80A61CB4 +/* 06990 80A61C80 4500000C */ bc1f .L80A61CB4 /* 06994 80A61C84 00000000 */ nop /* 06998 80A61C88 44814000 */ mtc1 $at, $f8 ## $f8 = 0.75 /* 0699C 80A61C8C 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 /* 069A0 80A61C90 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 069A4 80A61C94 46080282 */ mul.s $f10, $f0, $f8 +/* 069A4 80A61C94 46080282 */ mul.s $f10, $f0, $f8 /* 069A8 80A61C98 E60A01C8 */ swc1 $f10, 0x01C8($s0) ## 000001C8 -/* 069AC 80A61C9C 0C296E72 */ jal func_80A5B9C8 -/* 069B0 80A61CA0 AFA6004C */ sw $a2, 0x004C($sp) +/* 069AC 80A61C9C 0C296E72 */ jal func_80A5B9C8 +/* 069B0 80A61CA0 AFA6004C */ sw $a2, 0x004C($sp) /* 069B4 80A61CA4 3C014396 */ lui $at, 0x4396 ## $at = 43960000 /* 069B8 80A61CA8 44816000 */ mtc1 $at, $f12 ## $f12 = 300.00 -/* 069BC 80A61CAC 10000015 */ beq $zero, $zero, .L80A61D04 -/* 069C0 80A61CB0 8FA6004C */ lw $a2, 0x004C($sp) +/* 069BC 80A61CAC 10000015 */ beq $zero, $zero, .L80A61D04 +/* 069C0 80A61CB0 8FA6004C */ lw $a2, 0x004C($sp) .L80A61CB4: /* 069C4 80A61CB4 0C03F66B */ jal Math_Rand_ZeroOne ## Rand.Next() float @@ -180,78 +180,78 @@ glabel func_80A61A28 /* 069D0 80A61CC0 44818000 */ mtc1 $at, $f16 ## $f16 = 0.50 /* 069D4 80A61CC4 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 /* 069D8 80A61CC8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 069DC 80A61CCC 4600803C */ c.lt.s $f16, $f0 -/* 069E0 80A61CD0 8FA50064 */ lw $a1, 0x0064($sp) -/* 069E4 80A61CD4 45000003 */ bc1f .L80A61CE4 +/* 069DC 80A61CCC 4600803C */ c.lt.s $f16, $f0 +/* 069E0 80A61CD0 8FA50064 */ lw $a1, 0x0064($sp) +/* 069E4 80A61CD4 45000003 */ bc1f .L80A61CE4 /* 069E8 80A61CD8 00000000 */ nop -/* 069EC 80A61CDC 10000001 */ beq $zero, $zero, .L80A61CE4 +/* 069EC 80A61CDC 10000001 */ beq $zero, $zero, .L80A61CE4 /* 069F0 80A61CE0 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 .L80A61CE4: -/* 069F4 80A61CE4 0C296F1A */ jal func_80A5BC68 -/* 069F8 80A61CE8 AFA6004C */ sw $a2, 0x004C($sp) +/* 069F4 80A61CE4 0C296F1A */ jal func_80A5BC68 +/* 069F8 80A61CE8 AFA6004C */ sw $a2, 0x004C($sp) /* 069FC 80A61CEC 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 /* 06A00 80A61CF0 44819000 */ mtc1 $at, $f18 ## $f18 = 1.00 /* 06A04 80A61CF4 3C014396 */ lui $at, 0x4396 ## $at = 43960000 -/* 06A08 80A61CF8 8FA6004C */ lw $a2, 0x004C($sp) +/* 06A08 80A61CF8 8FA6004C */ lw $a2, 0x004C($sp) /* 06A0C 80A61CFC 44816000 */ mtc1 $at, $f12 ## $f12 = 300.00 /* 06A10 80A61D00 E61201C8 */ swc1 $f18, 0x01C8($s0) ## 000001C8 .L80A61D04: /* 06A14 80A61D04 24010006 */ addiu $at, $zero, 0x0006 ## $at = 00000006 -/* 06A18 80A61D08 10C10006 */ beq $a2, $at, .L80A61D24 -/* 06A1C 80A61D0C C7A40054 */ lwc1 $f4, 0x0054($sp) +/* 06A18 80A61D08 10C10006 */ beq $a2, $at, .L80A61D24 +/* 06A1C 80A61D0C C7A40054 */ lwc1 $f4, 0x0054($sp) /* 06A20 80A61D10 24010005 */ addiu $at, $zero, 0x0005 ## $at = 00000005 -/* 06A24 80A61D14 10C10003 */ beq $a2, $at, .L80A61D24 +/* 06A24 80A61D14 10C10003 */ beq $a2, $at, .L80A61D24 /* 06A28 80A61D18 24010004 */ addiu $at, $zero, 0x0004 ## $at = 00000004 -/* 06A2C 80A61D1C 54C1002F */ bnel $a2, $at, .L80A61DDC +/* 06A2C 80A61D1C 54C1002F */ bnel $a2, $at, .L80A61DDC /* 06A30 80A61D20 260401AC */ addiu $a0, $s0, 0x01AC ## $a0 = 000001AC .L80A61D24: -/* 06A34 80A61D24 460C203C */ c.lt.s $f4, $f12 -/* 06A38 80A61D28 8FA40034 */ lw $a0, 0x0034($sp) -/* 06A3C 80A61D2C 8FA50038 */ lw $a1, 0x0038($sp) -/* 06A40 80A61D30 45000014 */ bc1f .L80A61D84 +/* 06A34 80A61D24 460C203C */ c.lt.s $f4, $f12 +/* 06A38 80A61D28 8FA40034 */ lw $a0, 0x0034($sp) +/* 06A3C 80A61D2C 8FA50038 */ lw $a1, 0x0038($sp) +/* 06A40 80A61D30 45000014 */ bc1f .L80A61D84 /* 06A44 80A61D34 00000000 */ nop -/* 06A48 80A61D38 8FA5005C */ lw $a1, 0x005C($sp) +/* 06A48 80A61D38 8FA5005C */ lw $a1, 0x005C($sp) /* 06A4C 80A61D3C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 06A50 80A61D40 84A300B6 */ lh $v1, 0x00B6($a1) ## 000000B6 -/* 06A54 80A61D44 AFA6004C */ sw $a2, 0x004C($sp) -/* 06A58 80A61D48 0C00B69E */ jal func_8002DA78 -/* 06A5C 80A61D4C A7A30046 */ sh $v1, 0x0046($sp) -/* 06A60 80A61D50 87A30046 */ lh $v1, 0x0046($sp) -/* 06A64 80A61D54 18400003 */ blez $v0, .L80A61D64 -/* 06A68 80A61D58 8FA6004C */ lw $a2, 0x004C($sp) -/* 06A6C 80A61D5C 10000002 */ beq $zero, $zero, .L80A61D68 +/* 06A54 80A61D44 AFA6004C */ sw $a2, 0x004C($sp) +/* 06A58 80A61D48 0C00B69E */ jal func_8002DA78 +/* 06A5C 80A61D4C A7A30046 */ sh $v1, 0x0046($sp) +/* 06A60 80A61D50 87A30046 */ lh $v1, 0x0046($sp) +/* 06A64 80A61D54 18400003 */ blez $v0, .L80A61D64 +/* 06A68 80A61D58 8FA6004C */ lw $a2, 0x004C($sp) +/* 06A6C 80A61D5C 10000002 */ beq $zero, $zero, .L80A61D68 /* 06A70 80A61D60 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 .L80A61D64: /* 06A74 80A61D64 2402FFFF */ addiu $v0, $zero, 0xFFFF ## $v0 = FFFFFFFF .L80A61D68: -/* 06A78 80A61D68 00025B80 */ sll $t3, $v0, 14 -/* 06A7C 80A61D6C 01625823 */ subu $t3, $t3, $v0 -/* 06A80 80A61D70 006B1821 */ addu $v1, $v1, $t3 -/* 06A84 80A61D74 00031C00 */ sll $v1, $v1, 16 -/* 06A88 80A61D78 00031C03 */ sra $v1, $v1, 16 -/* 06A8C 80A61D7C 10000008 */ beq $zero, $zero, .L80A61DA0 +/* 06A78 80A61D68 00025B80 */ sll $t3, $v0, 14 +/* 06A7C 80A61D6C 01625823 */ subu $t3, $t3, $v0 +/* 06A80 80A61D70 006B1821 */ addu $v1, $v1, $t3 +/* 06A84 80A61D74 00031C00 */ sll $v1, $v1, 16 +/* 06A88 80A61D78 00031C03 */ sra $v1, $v1, 16 +/* 06A8C 80A61D7C 10000008 */ beq $zero, $zero, .L80A61DA0 /* 06A90 80A61D80 86040032 */ lh $a0, 0x0032($s0) ## 00000032 .L80A61D84: /* 06A94 80A61D84 0C01E01A */ jal Math_Vec3f_Yaw - -/* 06A98 80A61D88 AFA6004C */ sw $a2, 0x004C($sp) + +/* 06A98 80A61D88 AFA6004C */ sw $a2, 0x004C($sp) /* 06A9C 80A61D8C 86040032 */ lh $a0, 0x0032($s0) ## 00000032 -/* 06AA0 80A61D90 8FA6004C */ lw $a2, 0x004C($sp) -/* 06AA4 80A61D94 00441823 */ subu $v1, $v0, $a0 -/* 06AA8 80A61D98 00031C00 */ sll $v1, $v1, 16 -/* 06AAC 80A61D9C 00031C03 */ sra $v1, $v1, 16 +/* 06AA0 80A61D90 8FA6004C */ lw $a2, 0x004C($sp) +/* 06AA4 80A61D94 00441823 */ subu $v1, $v0, $a0 +/* 06AA8 80A61D98 00031C00 */ sll $v1, $v1, 16 +/* 06AAC 80A61D9C 00031C03 */ sra $v1, $v1, 16 .L80A61DA0: -/* 06AB0 80A61DA0 28610191 */ slti $at, $v1, 0x0191 -/* 06AB4 80A61DA4 14200003 */ bne $at, $zero, .L80A61DB4 +/* 06AB0 80A61DA0 28610191 */ slti $at, $v1, 0x0191 +/* 06AB4 80A61DA4 14200003 */ bne $at, $zero, .L80A61DB4 /* 06AB8 80A61DA8 248C0190 */ addiu $t4, $a0, 0x0190 ## $t4 = 00000190 -/* 06ABC 80A61DAC 10000008 */ beq $zero, $zero, .L80A61DD0 +/* 06ABC 80A61DAC 10000008 */ beq $zero, $zero, .L80A61DD0 /* 06AC0 80A61DB0 A60C0032 */ sh $t4, 0x0032($s0) ## 00000032 .L80A61DB4: -/* 06AC4 80A61DB4 2861FE70 */ slti $at, $v1, 0xFE70 -/* 06AC8 80A61DB8 10200004 */ beq $at, $zero, .L80A61DCC -/* 06ACC 80A61DBC 00837021 */ addu $t6, $a0, $v1 +/* 06AC4 80A61DB4 2861FE70 */ slti $at, $v1, 0xFE70 +/* 06AC8 80A61DB8 10200004 */ beq $at, $zero, .L80A61DCC +/* 06ACC 80A61DBC 00837021 */ addu $t6, $a0, $v1 /* 06AD0 80A61DC0 248DFE70 */ addiu $t5, $a0, 0xFE70 ## $t5 = FFFFFE70 -/* 06AD4 80A61DC4 10000002 */ beq $zero, $zero, .L80A61DD0 +/* 06AD4 80A61DC4 10000002 */ beq $zero, $zero, .L80A61DD0 /* 06AD8 80A61DC8 A60D0032 */ sh $t5, 0x0032($s0) ## 00000032 .L80A61DCC: /* 06ADC 80A61DCC A60E0032 */ sh $t6, 0x0032($s0) ## 00000032 @@ -260,136 +260,136 @@ glabel func_80A61A28 /* 06AE4 80A61DD4 A60F00B6 */ sh $t7, 0x00B6($s0) ## 000000B6 /* 06AE8 80A61DD8 260401AC */ addiu $a0, $s0, 0x01AC ## $a0 = 000001AC .L80A61DDC: -/* 06AEC 80A61DDC AFA40034 */ sw $a0, 0x0034($sp) +/* 06AEC 80A61DDC AFA40034 */ sw $a0, 0x0034($sp) /* 06AF0 80A61DE0 0C02927F */ jal SkelAnime_FrameUpdateMatrix - -/* 06AF4 80A61DE4 AFA6004C */ sw $a2, 0x004C($sp) + +/* 06AF4 80A61DE4 AFA6004C */ sw $a2, 0x004C($sp) /* 06AF8 80A61DE8 8E030210 */ lw $v1, 0x0210($s0) ## 00000210 -/* 06AFC 80A61DEC 8FA6004C */ lw $a2, 0x004C($sp) +/* 06AFC 80A61DEC 8FA6004C */ lw $a2, 0x004C($sp) /* 06B00 80A61DF0 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 06B04 80A61DF4 50600003 */ beql $v1, $zero, .L80A61E04 +/* 06B04 80A61DF4 50600003 */ beql $v1, $zero, .L80A61E04 /* 06B08 80A61DF8 24010006 */ addiu $at, $zero, 0x0006 ## $at = 00000006 -/* 06B0C 80A61DFC 14610035 */ bne $v1, $at, .L80A61ED4 +/* 06B0C 80A61DFC 14610035 */ bne $v1, $at, .L80A61ED4 /* 06B10 80A61E00 24010006 */ addiu $at, $zero, 0x0006 ## $at = 00000006 .L80A61E04: -/* 06B14 80A61E04 10C10005 */ beq $a2, $at, .L80A61E1C +/* 06B14 80A61E04 10C10005 */ beq $a2, $at, .L80A61E1C /* 06B18 80A61E08 24010005 */ addiu $at, $zero, 0x0005 ## $at = 00000005 -/* 06B1C 80A61E0C 10C10003 */ beq $a2, $at, .L80A61E1C +/* 06B1C 80A61E0C 10C10003 */ beq $a2, $at, .L80A61E1C /* 06B20 80A61E10 24010004 */ addiu $at, $zero, 0x0004 ## $at = 00000004 -/* 06B24 80A61E14 14C1002F */ bne $a2, $at, .L80A61ED4 +/* 06B24 80A61E14 14C1002F */ bne $a2, $at, .L80A61ED4 /* 06B28 80A61E18 00000000 */ nop .L80A61E1C: /* 06B2C 80A61E1C 8E180158 */ lw $t8, 0x0158($s0) ## 00000158 /* 06B30 80A61E20 3C0880A6 */ lui $t0, %hi(D_80A65E58) ## $t0 = 80A60000 /* 06B34 80A61E24 AE060210 */ sw $a2, 0x0210($s0) ## 00000210 -/* 06B38 80A61E28 0018C880 */ sll $t9, $t8, 2 -/* 06B3C 80A61E2C 01194021 */ addu $t0, $t0, $t9 -/* 06B40 80A61E30 8D085E58 */ lw $t0, %lo(D_80A65E58)($t0) -/* 06B44 80A61E34 00064880 */ sll $t1, $a2, 2 -/* 06B48 80A61E38 01095021 */ addu $t2, $t0, $t1 +/* 06B38 80A61E28 0018C880 */ sll $t9, $t8, 2 +/* 06B3C 80A61E2C 01194021 */ addu $t0, $t0, $t9 +/* 06B40 80A61E30 8D085E58 */ lw $t0, %lo(D_80A65E58)($t0) +/* 06B44 80A61E34 00064880 */ sll $t1, $a2, 2 +/* 06B48 80A61E38 01095021 */ addu $t2, $t0, $t1 /* 06B4C 80A61E3C 0C028800 */ jal SkelAnime_GetFrameCount - + /* 06B50 80A61E40 8D440000 */ lw $a0, 0x0000($t2) ## 00000000 /* 06B54 80A61E44 8E0B0158 */ lw $t3, 0x0158($s0) ## 00000158 /* 06B58 80A61E48 44823000 */ mtc1 $v0, $f6 ## $f6 = 0.00 /* 06B5C 80A61E4C 3C0D80A6 */ lui $t5, %hi(D_80A65E58) ## $t5 = 80A60000 -/* 06B60 80A61E50 000B6080 */ sll $t4, $t3, 2 +/* 06B60 80A61E50 000B6080 */ sll $t4, $t3, 2 /* 06B64 80A61E54 8E0E0210 */ lw $t6, 0x0210($s0) ## 00000210 -/* 06B68 80A61E58 01AC6821 */ addu $t5, $t5, $t4 -/* 06B6C 80A61E5C 8DAD5E58 */ lw $t5, %lo(D_80A65E58)($t5) -/* 06B70 80A61E60 46803220 */ cvt.s.w $f8, $f6 -/* 06B74 80A61E64 000E7880 */ sll $t7, $t6, 2 +/* 06B68 80A61E58 01AC6821 */ addu $t5, $t5, $t4 +/* 06B6C 80A61E5C 8DAD5E58 */ lw $t5, %lo(D_80A65E58)($t5) +/* 06B70 80A61E60 46803220 */ cvt.s.w $f8, $f6 +/* 06B74 80A61E64 000E7880 */ sll $t7, $t6, 2 /* 06B78 80A61E68 3C01C040 */ lui $at, 0xC040 ## $at = C0400000 -/* 06B7C 80A61E6C 01AFC021 */ addu $t8, $t5, $t7 +/* 06B7C 80A61E6C 01AFC021 */ addu $t8, $t5, $t7 /* 06B80 80A61E70 44815000 */ mtc1 $at, $f10 ## $f10 = -3.00 /* 06B84 80A61E74 8F050000 */ lw $a1, 0x0000($t8) ## 00000000 /* 06B88 80A61E78 24190002 */ addiu $t9, $zero, 0x0002 ## $t9 = 00000002 -/* 06B8C 80A61E7C AFB90014 */ sw $t9, 0x0014($sp) -/* 06B90 80A61E80 E7A80010 */ swc1 $f8, 0x0010($sp) -/* 06B94 80A61E84 8FA40034 */ lw $a0, 0x0034($sp) +/* 06B8C 80A61E7C AFB90014 */ sw $t9, 0x0014($sp) +/* 06B90 80A61E80 E7A80010 */ swc1 $f8, 0x0010($sp) +/* 06B94 80A61E84 8FA40034 */ lw $a0, 0x0034($sp) /* 06B98 80A61E88 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 06B9C 80A61E8C 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 06BA0 80A61E90 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 06BA4 80A61E94 E7AA0018 */ swc1 $f10, 0x0018($sp) +/* 06BA0 80A61E90 0C029468 */ jal SkelAnime_ChangeAnim + +/* 06BA4 80A61E94 E7AA0018 */ swc1 $f10, 0x0018($sp) /* 06BA8 80A61E98 8E030210 */ lw $v1, 0x0210($s0) ## 00000210 /* 06BAC 80A61E9C 24010006 */ addiu $at, $zero, 0x0006 ## $at = 00000006 -/* 06BB0 80A61EA0 54610006 */ bnel $v1, $at, .L80A61EBC +/* 06BB0 80A61EA0 54610006 */ bnel $v1, $at, .L80A61EBC /* 06BB4 80A61EA4 24010005 */ addiu $at, $zero, 0x0005 ## $at = 00000005 -/* 06BB8 80A61EA8 0C296EB3 */ jal func_80A5BACC +/* 06BB8 80A61EA8 0C296EB3 */ jal func_80A5BACC /* 06BBC 80A61EAC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 06BC0 80A61EB0 100000ED */ beq $zero, $zero, .L80A62268 -/* 06BC4 80A61EB4 8FBF002C */ lw $ra, 0x002C($sp) +/* 06BC0 80A61EB0 100000ED */ beq $zero, $zero, .L80A62268 +/* 06BC4 80A61EB4 8FBF002C */ lw $ra, 0x002C($sp) /* 06BC8 80A61EB8 24010005 */ addiu $at, $zero, 0x0005 ## $at = 00000005 .L80A61EBC: -/* 06BCC 80A61EBC 546100EA */ bnel $v1, $at, .L80A62268 -/* 06BD0 80A61EC0 8FBF002C */ lw $ra, 0x002C($sp) -/* 06BD4 80A61EC4 0C296EA1 */ jal func_80A5BA84 +/* 06BCC 80A61EBC 546100EA */ bnel $v1, $at, .L80A62268 +/* 06BD0 80A61EC0 8FBF002C */ lw $ra, 0x002C($sp) +/* 06BD4 80A61EC4 0C296EA1 */ jal func_80A5BA84 /* 06BD8 80A61EC8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 06BDC 80A61ECC 100000E6 */ beq $zero, $zero, .L80A62268 -/* 06BE0 80A61ED0 8FBF002C */ lw $ra, 0x002C($sp) +/* 06BDC 80A61ECC 100000E6 */ beq $zero, $zero, .L80A62268 +/* 06BE0 80A61ED0 8FBF002C */ lw $ra, 0x002C($sp) .L80A61ED4: -/* 06BE4 80A61ED4 104000BE */ beq $v0, $zero, .L80A621D0 +/* 06BE4 80A61ED4 104000BE */ beq $v0, $zero, .L80A621D0 /* 06BE8 80A61ED8 24010004 */ addiu $at, $zero, 0x0004 ## $at = 00000004 /* 06BEC 80A61EDC 24010006 */ addiu $at, $zero, 0x0006 ## $at = 00000006 -/* 06BF0 80A61EE0 14C10006 */ bne $a2, $at, .L80A61EFC +/* 06BF0 80A61EE0 14C10006 */ bne $a2, $at, .L80A61EFC /* 06BF4 80A61EE4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 06BF8 80A61EE8 0C296EB3 */ jal func_80A5BACC -/* 06BFC 80A61EEC AFA6004C */ sw $a2, 0x004C($sp) -/* 06C00 80A61EF0 8FA6004C */ lw $a2, 0x004C($sp) -/* 06C04 80A61EF4 10000008 */ beq $zero, $zero, .L80A61F18 +/* 06BF8 80A61EE8 0C296EB3 */ jal func_80A5BACC +/* 06BFC 80A61EEC AFA6004C */ sw $a2, 0x004C($sp) +/* 06C00 80A61EF0 8FA6004C */ lw $a2, 0x004C($sp) +/* 06C04 80A61EF4 10000008 */ beq $zero, $zero, .L80A61F18 /* 06C08 80A61EF8 8E030210 */ lw $v1, 0x0210($s0) ## 00000210 .L80A61EFC: /* 06C0C 80A61EFC 24010005 */ addiu $at, $zero, 0x0005 ## $at = 00000005 -/* 06C10 80A61F00 14C10005 */ bne $a2, $at, .L80A61F18 +/* 06C10 80A61F00 14C10005 */ bne $a2, $at, .L80A61F18 /* 06C14 80A61F04 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 06C18 80A61F08 0C296EA1 */ jal func_80A5BA84 -/* 06C1C 80A61F0C AFA6004C */ sw $a2, 0x004C($sp) -/* 06C20 80A61F10 8FA6004C */ lw $a2, 0x004C($sp) +/* 06C18 80A61F08 0C296EA1 */ jal func_80A5BA84 +/* 06C1C 80A61F0C AFA6004C */ sw $a2, 0x004C($sp) +/* 06C20 80A61F10 8FA6004C */ lw $a2, 0x004C($sp) /* 06C24 80A61F14 8E030210 */ lw $v1, 0x0210($s0) ## 00000210 .L80A61F18: -/* 06C28 80A61F18 10600003 */ beq $v1, $zero, .L80A61F28 +/* 06C28 80A61F18 10600003 */ beq $v1, $zero, .L80A61F28 /* 06C2C 80A61F1C 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 06C30 80A61F20 14610069 */ bne $v1, $at, .L80A620C8 +/* 06C30 80A61F20 14610069 */ bne $v1, $at, .L80A620C8 /* 06C34 80A61F24 00000000 */ nop .L80A61F28: -/* 06C38 80A61F28 10C30022 */ beq $a2, $v1, .L80A61FB4 +/* 06C38 80A61F28 10C30022 */ beq $a2, $v1, .L80A61FB4 /* 06C3C 80A61F2C 00000000 */ nop /* 06C40 80A61F30 8E080158 */ lw $t0, 0x0158($s0) ## 00000158 /* 06C44 80A61F34 3C0A80A6 */ lui $t2, %hi(D_80A65E58) ## $t2 = 80A60000 /* 06C48 80A61F38 AE060210 */ sw $a2, 0x0210($s0) ## 00000210 -/* 06C4C 80A61F3C 00084880 */ sll $t1, $t0, 2 -/* 06C50 80A61F40 01495021 */ addu $t2, $t2, $t1 -/* 06C54 80A61F44 8D4A5E58 */ lw $t2, %lo(D_80A65E58)($t2) -/* 06C58 80A61F48 00065880 */ sll $t3, $a2, 2 -/* 06C5C 80A61F4C 014B6021 */ addu $t4, $t2, $t3 +/* 06C4C 80A61F3C 00084880 */ sll $t1, $t0, 2 +/* 06C50 80A61F40 01495021 */ addu $t2, $t2, $t1 +/* 06C54 80A61F44 8D4A5E58 */ lw $t2, %lo(D_80A65E58)($t2) +/* 06C58 80A61F48 00065880 */ sll $t3, $a2, 2 +/* 06C5C 80A61F4C 014B6021 */ addu $t4, $t2, $t3 /* 06C60 80A61F50 0C028800 */ jal SkelAnime_GetFrameCount - + /* 06C64 80A61F54 8D840000 */ lw $a0, 0x0000($t4) ## 00000000 /* 06C68 80A61F58 8E0E0158 */ lw $t6, 0x0158($s0) ## 00000158 /* 06C6C 80A61F5C 44828000 */ mtc1 $v0, $f16 ## $f16 = 0.00 /* 06C70 80A61F60 3C0F80A6 */ lui $t7, %hi(D_80A65E58) ## $t7 = 80A60000 -/* 06C74 80A61F64 000E6880 */ sll $t5, $t6, 2 +/* 06C74 80A61F64 000E6880 */ sll $t5, $t6, 2 /* 06C78 80A61F68 8E180210 */ lw $t8, 0x0210($s0) ## 00000210 -/* 06C7C 80A61F6C 01ED7821 */ addu $t7, $t7, $t5 -/* 06C80 80A61F70 8DEF5E58 */ lw $t7, %lo(D_80A65E58)($t7) -/* 06C84 80A61F74 468084A0 */ cvt.s.w $f18, $f16 -/* 06C88 80A61F78 0018C880 */ sll $t9, $t8, 2 +/* 06C7C 80A61F6C 01ED7821 */ addu $t7, $t7, $t5 +/* 06C80 80A61F70 8DEF5E58 */ lw $t7, %lo(D_80A65E58)($t7) +/* 06C84 80A61F74 468084A0 */ cvt.s.w $f18, $f16 +/* 06C88 80A61F78 0018C880 */ sll $t9, $t8, 2 /* 06C8C 80A61F7C 3C01C040 */ lui $at, 0xC040 ## $at = C0400000 -/* 06C90 80A61F80 01F94021 */ addu $t0, $t7, $t9 +/* 06C90 80A61F80 01F94021 */ addu $t0, $t7, $t9 /* 06C94 80A61F84 44812000 */ mtc1 $at, $f4 ## $f4 = -3.00 /* 06C98 80A61F88 8D050000 */ lw $a1, 0x0000($t0) ## 00000000 /* 06C9C 80A61F8C 24090002 */ addiu $t1, $zero, 0x0002 ## $t1 = 00000002 -/* 06CA0 80A61F90 AFA90014 */ sw $t1, 0x0014($sp) -/* 06CA4 80A61F94 E7B20010 */ swc1 $f18, 0x0010($sp) -/* 06CA8 80A61F98 8FA40034 */ lw $a0, 0x0034($sp) +/* 06CA0 80A61F90 AFA90014 */ sw $t1, 0x0014($sp) +/* 06CA4 80A61F94 E7B20010 */ swc1 $f18, 0x0010($sp) +/* 06CA8 80A61F98 8FA40034 */ lw $a0, 0x0034($sp) /* 06CAC 80A61F9C 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 06CB0 80A61FA0 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 06CB4 80A61FA4 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 06CB8 80A61FA8 E7A40018 */ swc1 $f4, 0x0018($sp) -/* 06CBC 80A61FAC 100000AE */ beq $zero, $zero, .L80A62268 -/* 06CC0 80A61FB0 8FBF002C */ lw $ra, 0x002C($sp) +/* 06CB4 80A61FA4 0C029468 */ jal SkelAnime_ChangeAnim + +/* 06CB8 80A61FA8 E7A40018 */ swc1 $f4, 0x0018($sp) +/* 06CBC 80A61FAC 100000AE */ beq $zero, $zero, .L80A62268 +/* 06CC0 80A61FB0 8FBF002C */ lw $ra, 0x002C($sp) .L80A61FB4: /* 06CC4 80A61FB4 0C03F66B */ jal Math_Rand_ZeroOne ## Rand.Next() float @@ -397,15 +397,15 @@ glabel func_80A61A28 /* 06CCC 80A61FBC 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 /* 06CD0 80A61FC0 44813000 */ mtc1 $at, $f6 ## $f6 = 0.50 /* 06CD4 80A61FC4 240C0001 */ addiu $t4, $zero, 0x0001 ## $t4 = 00000001 -/* 06CD8 80A61FC8 4600303C */ c.lt.s $f6, $f0 +/* 06CD8 80A61FC8 4600303C */ c.lt.s $f6, $f0 /* 06CDC 80A61FCC 00000000 */ nop -/* 06CE0 80A61FD0 45020008 */ bc1fl .L80A61FF4 +/* 06CE0 80A61FD0 45020008 */ bc1fl .L80A61FF4 /* 06CE4 80A61FD4 8E0D0228 */ lw $t5, 0x0228($s0) ## 00000228 /* 06CE8 80A61FD8 8E0A01F0 */ lw $t2, 0x01F0($s0) ## 000001F0 /* 06CEC 80A61FDC 2401EFFF */ addiu $at, $zero, 0xEFFF ## $at = FFFFEFFF /* 06CF0 80A61FE0 AE000210 */ sw $zero, 0x0210($s0) ## 00000210 -/* 06CF4 80A61FE4 01415824 */ and $t3, $t2, $at -/* 06CF8 80A61FE8 10000016 */ beq $zero, $zero, .L80A62044 +/* 06CF4 80A61FE4 01415824 */ and $t3, $t2, $at +/* 06CF8 80A61FE8 10000016 */ beq $zero, $zero, .L80A62044 /* 06CFC 80A61FEC AE0B01F0 */ sw $t3, 0x01F0($s0) ## 000001F0 /* 06D00 80A61FF0 8E0D0228 */ lw $t5, 0x0228($s0) ## 00000228 .L80A61FF4: @@ -423,168 +423,168 @@ glabel func_80A61A28 /* 06D30 80A62020 8E1801F0 */ lw $t8, 0x01F0($s0) ## 000001F0 /* 06D34 80A62024 24042816 */ addiu $a0, $zero, 0x2816 ## $a0 = 00002816 /* 06D38 80A62028 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 -/* 06D3C 80A6202C 00187900 */ sll $t7, $t8, 4 -/* 06D40 80A62030 05E30005 */ bgezl $t7, .L80A62048 +/* 06D3C 80A6202C 00187900 */ sll $t7, $t8, 4 +/* 06D40 80A62030 05E30005 */ bgezl $t7, .L80A62048 /* 06D44 80A62034 8E090158 */ lw $t1, 0x0158($s0) ## 00000158 -/* 06D48 80A62038 AFA70010 */ sw $a3, 0x0010($sp) +/* 06D48 80A62038 AFA70010 */ sw $a3, 0x0010($sp) /* 06D4C 80A6203C 0C03DCE3 */ jal Audio_PlaySoundGeneral - -/* 06D50 80A62040 AFA80014 */ sw $t0, 0x0014($sp) + +/* 06D50 80A62040 AFA80014 */ sw $t0, 0x0014($sp) .L80A62044: /* 06D54 80A62044 8E090158 */ lw $t1, 0x0158($s0) ## 00000158 .L80A62048: /* 06D58 80A62048 3C0B80A6 */ lui $t3, %hi(D_80A65E58) ## $t3 = 80A60000 /* 06D5C 80A6204C 8E0C0210 */ lw $t4, 0x0210($s0) ## 00000210 -/* 06D60 80A62050 00095080 */ sll $t2, $t1, 2 -/* 06D64 80A62054 016A5821 */ addu $t3, $t3, $t2 -/* 06D68 80A62058 8D6B5E58 */ lw $t3, %lo(D_80A65E58)($t3) -/* 06D6C 80A6205C 000C7080 */ sll $t6, $t4, 2 -/* 06D70 80A62060 016E6821 */ addu $t5, $t3, $t6 +/* 06D60 80A62050 00095080 */ sll $t2, $t1, 2 +/* 06D64 80A62054 016A5821 */ addu $t3, $t3, $t2 +/* 06D68 80A62058 8D6B5E58 */ lw $t3, %lo(D_80A65E58)($t3) +/* 06D6C 80A6205C 000C7080 */ sll $t6, $t4, 2 +/* 06D70 80A62060 016E6821 */ addu $t5, $t3, $t6 /* 06D74 80A62064 0C028800 */ jal SkelAnime_GetFrameCount - + /* 06D78 80A62068 8DA40000 */ lw $a0, 0x0000($t5) ## 00000000 /* 06D7C 80A6206C 8E180158 */ lw $t8, 0x0158($s0) ## 00000158 /* 06D80 80A62070 44824000 */ mtc1 $v0, $f8 ## $f8 = 0.00 /* 06D84 80A62074 3C1980A6 */ lui $t9, %hi(D_80A65E58) ## $t9 = 80A60000 -/* 06D88 80A62078 00187880 */ sll $t7, $t8, 2 +/* 06D88 80A62078 00187880 */ sll $t7, $t8, 2 /* 06D8C 80A6207C 8E080210 */ lw $t0, 0x0210($s0) ## 00000210 -/* 06D90 80A62080 032FC821 */ addu $t9, $t9, $t7 -/* 06D94 80A62084 8F395E58 */ lw $t9, %lo(D_80A65E58)($t9) -/* 06D98 80A62088 468042A0 */ cvt.s.w $f10, $f8 -/* 06D9C 80A6208C 00084880 */ sll $t1, $t0, 2 +/* 06D90 80A62080 032FC821 */ addu $t9, $t9, $t7 +/* 06D94 80A62084 8F395E58 */ lw $t9, %lo(D_80A65E58)($t9) +/* 06D98 80A62088 468042A0 */ cvt.s.w $f10, $f8 +/* 06D9C 80A6208C 00084880 */ sll $t1, $t0, 2 /* 06DA0 80A62090 3C01C040 */ lui $at, 0xC040 ## $at = C0400000 -/* 06DA4 80A62094 03295021 */ addu $t2, $t9, $t1 +/* 06DA4 80A62094 03295021 */ addu $t2, $t9, $t1 /* 06DA8 80A62098 44818000 */ mtc1 $at, $f16 ## $f16 = -3.00 /* 06DAC 80A6209C 8D450000 */ lw $a1, 0x0000($t2) ## 00000000 /* 06DB0 80A620A0 240C0002 */ addiu $t4, $zero, 0x0002 ## $t4 = 00000002 -/* 06DB4 80A620A4 AFAC0014 */ sw $t4, 0x0014($sp) -/* 06DB8 80A620A8 E7AA0010 */ swc1 $f10, 0x0010($sp) -/* 06DBC 80A620AC 8FA40034 */ lw $a0, 0x0034($sp) +/* 06DB4 80A620A4 AFAC0014 */ sw $t4, 0x0014($sp) +/* 06DB8 80A620A8 E7AA0010 */ swc1 $f10, 0x0010($sp) +/* 06DBC 80A620AC 8FA40034 */ lw $a0, 0x0034($sp) /* 06DC0 80A620B0 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 06DC4 80A620B4 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 06DC8 80A620B8 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 06DCC 80A620BC E7B00018 */ swc1 $f16, 0x0018($sp) -/* 06DD0 80A620C0 10000069 */ beq $zero, $zero, .L80A62268 -/* 06DD4 80A620C4 8FBF002C */ lw $ra, 0x002C($sp) +/* 06DC8 80A620B8 0C029468 */ jal SkelAnime_ChangeAnim + +/* 06DCC 80A620BC E7B00018 */ swc1 $f16, 0x0018($sp) +/* 06DD0 80A620C0 10000069 */ beq $zero, $zero, .L80A62268 +/* 06DD4 80A620C4 8FBF002C */ lw $ra, 0x002C($sp) .L80A620C8: -/* 06DD8 80A620C8 50C30023 */ beql $a2, $v1, .L80A62158 +/* 06DD8 80A620C8 50C30023 */ beql $a2, $v1, .L80A62158 /* 06DDC 80A620CC 8E0D0158 */ lw $t5, 0x0158($s0) ## 00000158 /* 06DE0 80A620D0 8E0B0158 */ lw $t3, 0x0158($s0) ## 00000158 /* 06DE4 80A620D4 3C0D80A6 */ lui $t5, %hi(D_80A65E58) ## $t5 = 80A60000 /* 06DE8 80A620D8 AE060210 */ sw $a2, 0x0210($s0) ## 00000210 -/* 06DEC 80A620DC 000B7080 */ sll $t6, $t3, 2 -/* 06DF0 80A620E0 01AE6821 */ addu $t5, $t5, $t6 -/* 06DF4 80A620E4 8DAD5E58 */ lw $t5, %lo(D_80A65E58)($t5) -/* 06DF8 80A620E8 0006C080 */ sll $t8, $a2, 2 -/* 06DFC 80A620EC 01B87821 */ addu $t7, $t5, $t8 +/* 06DEC 80A620DC 000B7080 */ sll $t6, $t3, 2 +/* 06DF0 80A620E0 01AE6821 */ addu $t5, $t5, $t6 +/* 06DF4 80A620E4 8DAD5E58 */ lw $t5, %lo(D_80A65E58)($t5) +/* 06DF8 80A620E8 0006C080 */ sll $t8, $a2, 2 +/* 06DFC 80A620EC 01B87821 */ addu $t7, $t5, $t8 /* 06E00 80A620F0 0C028800 */ jal SkelAnime_GetFrameCount - + /* 06E04 80A620F4 8DE40000 */ lw $a0, 0x0000($t7) ## 00000000 /* 06E08 80A620F8 8E080158 */ lw $t0, 0x0158($s0) ## 00000158 /* 06E0C 80A620FC 44829000 */ mtc1 $v0, $f18 ## $f18 = 0.00 /* 06E10 80A62100 3C0980A6 */ lui $t1, %hi(D_80A65E58) ## $t1 = 80A60000 -/* 06E14 80A62104 0008C880 */ sll $t9, $t0, 2 +/* 06E14 80A62104 0008C880 */ sll $t9, $t0, 2 /* 06E18 80A62108 8E0A0210 */ lw $t2, 0x0210($s0) ## 00000210 -/* 06E1C 80A6210C 01394821 */ addu $t1, $t1, $t9 -/* 06E20 80A62110 8D295E58 */ lw $t1, %lo(D_80A65E58)($t1) -/* 06E24 80A62114 46809120 */ cvt.s.w $f4, $f18 -/* 06E28 80A62118 000A6080 */ sll $t4, $t2, 2 +/* 06E1C 80A6210C 01394821 */ addu $t1, $t1, $t9 +/* 06E20 80A62110 8D295E58 */ lw $t1, %lo(D_80A65E58)($t1) +/* 06E24 80A62114 46809120 */ cvt.s.w $f4, $f18 +/* 06E28 80A62118 000A6080 */ sll $t4, $t2, 2 /* 06E2C 80A6211C 3C01C040 */ lui $at, 0xC040 ## $at = C0400000 -/* 06E30 80A62120 012C5821 */ addu $t3, $t1, $t4 +/* 06E30 80A62120 012C5821 */ addu $t3, $t1, $t4 /* 06E34 80A62124 44813000 */ mtc1 $at, $f6 ## $f6 = -3.00 /* 06E38 80A62128 8D650000 */ lw $a1, 0x0000($t3) ## 00000000 /* 06E3C 80A6212C 240E0002 */ addiu $t6, $zero, 0x0002 ## $t6 = 00000002 -/* 06E40 80A62130 AFAE0014 */ sw $t6, 0x0014($sp) -/* 06E44 80A62134 E7A40010 */ swc1 $f4, 0x0010($sp) -/* 06E48 80A62138 8FA40034 */ lw $a0, 0x0034($sp) +/* 06E40 80A62130 AFAE0014 */ sw $t6, 0x0014($sp) +/* 06E44 80A62134 E7A40010 */ swc1 $f4, 0x0010($sp) +/* 06E48 80A62138 8FA40034 */ lw $a0, 0x0034($sp) /* 06E4C 80A6213C 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 06E50 80A62140 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 06E54 80A62144 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 06E58 80A62148 E7A60018 */ swc1 $f6, 0x0018($sp) -/* 06E5C 80A6214C 10000046 */ beq $zero, $zero, .L80A62268 -/* 06E60 80A62150 8FBF002C */ lw $ra, 0x002C($sp) +/* 06E54 80A62144 0C029468 */ jal SkelAnime_ChangeAnim + +/* 06E58 80A62148 E7A60018 */ swc1 $f6, 0x0018($sp) +/* 06E5C 80A6214C 10000046 */ beq $zero, $zero, .L80A62268 +/* 06E60 80A62150 8FBF002C */ lw $ra, 0x002C($sp) /* 06E64 80A62154 8E0D0158 */ lw $t5, 0x0158($s0) ## 00000158 .L80A62158: /* 06E68 80A62158 3C0F80A6 */ lui $t7, %hi(D_80A65E58) ## $t7 = 80A60000 -/* 06E6C 80A6215C 00034080 */ sll $t0, $v1, 2 -/* 06E70 80A62160 000DC080 */ sll $t8, $t5, 2 -/* 06E74 80A62164 01F87821 */ addu $t7, $t7, $t8 -/* 06E78 80A62168 8DEF5E58 */ lw $t7, %lo(D_80A65E58)($t7) -/* 06E7C 80A6216C 01E8C821 */ addu $t9, $t7, $t0 +/* 06E6C 80A6215C 00034080 */ sll $t0, $v1, 2 +/* 06E70 80A62160 000DC080 */ sll $t8, $t5, 2 +/* 06E74 80A62164 01F87821 */ addu $t7, $t7, $t8 +/* 06E78 80A62168 8DEF5E58 */ lw $t7, %lo(D_80A65E58)($t7) +/* 06E7C 80A6216C 01E8C821 */ addu $t9, $t7, $t0 /* 06E80 80A62170 0C028800 */ jal SkelAnime_GetFrameCount - + /* 06E84 80A62174 8F240000 */ lw $a0, 0x0000($t9) ## 00000000 /* 06E88 80A62178 8E0A0158 */ lw $t2, 0x0158($s0) ## 00000158 /* 06E8C 80A6217C 44824000 */ mtc1 $v0, $f8 ## $f8 = 0.00 /* 06E90 80A62180 3C0C80A6 */ lui $t4, %hi(D_80A65E58) ## $t4 = 80A60000 -/* 06E94 80A62184 000A4880 */ sll $t1, $t2, 2 +/* 06E94 80A62184 000A4880 */ sll $t1, $t2, 2 /* 06E98 80A62188 8E0B0210 */ lw $t3, 0x0210($s0) ## 00000210 -/* 06E9C 80A6218C 01896021 */ addu $t4, $t4, $t1 -/* 06EA0 80A62190 8D8C5E58 */ lw $t4, %lo(D_80A65E58)($t4) -/* 06EA4 80A62194 468042A0 */ cvt.s.w $f10, $f8 +/* 06E9C 80A6218C 01896021 */ addu $t4, $t4, $t1 +/* 06EA0 80A62190 8D8C5E58 */ lw $t4, %lo(D_80A65E58)($t4) +/* 06EA4 80A62194 468042A0 */ cvt.s.w $f10, $f8 /* 06EA8 80A62198 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 06EAC 80A6219C 000B7080 */ sll $t6, $t3, 2 -/* 06EB0 80A621A0 018E6821 */ addu $t5, $t4, $t6 +/* 06EAC 80A6219C 000B7080 */ sll $t6, $t3, 2 +/* 06EB0 80A621A0 018E6821 */ addu $t5, $t4, $t6 /* 06EB4 80A621A4 8DA50000 */ lw $a1, 0x0000($t5) ## 00000000 /* 06EB8 80A621A8 24180002 */ addiu $t8, $zero, 0x0002 ## $t8 = 00000002 -/* 06EBC 80A621AC 44070000 */ mfc1 $a3, $f0 -/* 06EC0 80A621B0 AFB80014 */ sw $t8, 0x0014($sp) -/* 06EC4 80A621B4 E7AA0010 */ swc1 $f10, 0x0010($sp) -/* 06EC8 80A621B8 8FA40034 */ lw $a0, 0x0034($sp) +/* 06EBC 80A621AC 44070000 */ mfc1 $a3, $f0 +/* 06EC0 80A621B0 AFB80014 */ sw $t8, 0x0014($sp) +/* 06EC4 80A621B4 E7AA0010 */ swc1 $f10, 0x0010($sp) +/* 06EC8 80A621B8 8FA40034 */ lw $a0, 0x0034($sp) /* 06ECC 80A621BC 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 06ED0 80A621C0 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 06ED4 80A621C4 E7A00018 */ swc1 $f0, 0x0018($sp) -/* 06ED8 80A621C8 10000027 */ beq $zero, $zero, .L80A62268 -/* 06EDC 80A621CC 8FBF002C */ lw $ra, 0x002C($sp) +/* 06ED0 80A621C0 0C029468 */ jal SkelAnime_ChangeAnim + +/* 06ED4 80A621C4 E7A00018 */ swc1 $f0, 0x0018($sp) +/* 06ED8 80A621C8 10000027 */ beq $zero, $zero, .L80A62268 +/* 06EDC 80A621CC 8FBF002C */ lw $ra, 0x002C($sp) .L80A621D0: -/* 06EE0 80A621D0 54610025 */ bnel $v1, $at, .L80A62268 -/* 06EE4 80A621D4 8FBF002C */ lw $ra, 0x002C($sp) -/* 06EE8 80A621D8 10C00003 */ beq $a2, $zero, .L80A621E8 +/* 06EE0 80A621D0 54610025 */ bnel $v1, $at, .L80A62268 +/* 06EE4 80A621D4 8FBF002C */ lw $ra, 0x002C($sp) +/* 06EE8 80A621D8 10C00003 */ beq $a2, $zero, .L80A621E8 /* 06EEC 80A621DC 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 06EF0 80A621E0 54C10021 */ bnel $a2, $at, .L80A62268 -/* 06EF4 80A621E4 8FBF002C */ lw $ra, 0x002C($sp) +/* 06EF0 80A621E0 54C10021 */ bnel $a2, $at, .L80A62268 +/* 06EF4 80A621E4 8FBF002C */ lw $ra, 0x002C($sp) .L80A621E8: /* 06EF8 80A621E8 8E0F0158 */ lw $t7, 0x0158($s0) ## 00000158 /* 06EFC 80A621EC 3C1980A6 */ lui $t9, %hi(D_80A65E58) ## $t9 = 80A60000 /* 06F00 80A621F0 AE060210 */ sw $a2, 0x0210($s0) ## 00000210 -/* 06F04 80A621F4 000F4080 */ sll $t0, $t7, 2 -/* 06F08 80A621F8 0328C821 */ addu $t9, $t9, $t0 -/* 06F0C 80A621FC 8F395E58 */ lw $t9, %lo(D_80A65E58)($t9) -/* 06F10 80A62200 00065080 */ sll $t2, $a2, 2 -/* 06F14 80A62204 032A4821 */ addu $t1, $t9, $t2 +/* 06F04 80A621F4 000F4080 */ sll $t0, $t7, 2 +/* 06F08 80A621F8 0328C821 */ addu $t9, $t9, $t0 +/* 06F0C 80A621FC 8F395E58 */ lw $t9, %lo(D_80A65E58)($t9) +/* 06F10 80A62200 00065080 */ sll $t2, $a2, 2 +/* 06F14 80A62204 032A4821 */ addu $t1, $t9, $t2 /* 06F18 80A62208 0C028800 */ jal SkelAnime_GetFrameCount - + /* 06F1C 80A6220C 8D240000 */ lw $a0, 0x0000($t1) ## 00000000 /* 06F20 80A62210 8E0B0158 */ lw $t3, 0x0158($s0) ## 00000158 /* 06F24 80A62214 44828000 */ mtc1 $v0, $f16 ## $f16 = 0.00 /* 06F28 80A62218 3C0E80A6 */ lui $t6, %hi(D_80A65E58) ## $t6 = 80A60000 -/* 06F2C 80A6221C 000B6080 */ sll $t4, $t3, 2 +/* 06F2C 80A6221C 000B6080 */ sll $t4, $t3, 2 /* 06F30 80A62220 8E0D0210 */ lw $t5, 0x0210($s0) ## 00000210 -/* 06F34 80A62224 01CC7021 */ addu $t6, $t6, $t4 -/* 06F38 80A62228 8DCE5E58 */ lw $t6, %lo(D_80A65E58)($t6) -/* 06F3C 80A6222C 468084A0 */ cvt.s.w $f18, $f16 -/* 06F40 80A62230 000DC080 */ sll $t8, $t5, 2 +/* 06F34 80A62224 01CC7021 */ addu $t6, $t6, $t4 +/* 06F38 80A62228 8DCE5E58 */ lw $t6, %lo(D_80A65E58)($t6) +/* 06F3C 80A6222C 468084A0 */ cvt.s.w $f18, $f16 +/* 06F40 80A62230 000DC080 */ sll $t8, $t5, 2 /* 06F44 80A62234 3C01C040 */ lui $at, 0xC040 ## $at = C0400000 -/* 06F48 80A62238 01D87821 */ addu $t7, $t6, $t8 +/* 06F48 80A62238 01D87821 */ addu $t7, $t6, $t8 /* 06F4C 80A6223C 44812000 */ mtc1 $at, $f4 ## $f4 = -3.00 /* 06F50 80A62240 8DE50000 */ lw $a1, 0x0000($t7) ## 00000000 /* 06F54 80A62244 24080002 */ addiu $t0, $zero, 0x0002 ## $t0 = 00000002 -/* 06F58 80A62248 AFA80014 */ sw $t0, 0x0014($sp) -/* 06F5C 80A6224C E7B20010 */ swc1 $f18, 0x0010($sp) -/* 06F60 80A62250 8FA40034 */ lw $a0, 0x0034($sp) +/* 06F58 80A62248 AFA80014 */ sw $t0, 0x0014($sp) +/* 06F5C 80A6224C E7B20010 */ swc1 $f18, 0x0010($sp) +/* 06F60 80A62250 8FA40034 */ lw $a0, 0x0034($sp) /* 06F64 80A62254 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 06F68 80A62258 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 06F6C 80A6225C 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 06F70 80A62260 E7A40018 */ swc1 $f4, 0x0018($sp) -/* 06F74 80A62264 8FBF002C */ lw $ra, 0x002C($sp) +/* 06F6C 80A6225C 0C029468 */ jal SkelAnime_ChangeAnim + +/* 06F70 80A62260 E7A40018 */ swc1 $f4, 0x0018($sp) +/* 06F74 80A62264 8FBF002C */ lw $ra, 0x002C($sp) .L80A62268: -/* 06F78 80A62268 8FB00028 */ lw $s0, 0x0028($sp) +/* 06F78 80A62268 8FB00028 */ lw $s0, 0x0028($sp) /* 06F7C 80A6226C 27BD0060 */ addiu $sp, $sp, 0x0060 ## $sp = 00000000 -/* 06F80 80A62270 03E00008 */ jr $ra +/* 06F80 80A62270 03E00008 */ jr $ra /* 06F84 80A62274 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A62278.s b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A62278.s index a96fb90241..2519a69bfe 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A62278.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A62278.s @@ -1,15 +1,15 @@ glabel func_80A62278 /* 06F88 80A62278 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 -/* 06F8C 80A6227C AFB00028 */ sw $s0, 0x0028($sp) +/* 06F8C 80A6227C AFB00028 */ sw $s0, 0x0028($sp) /* 06F90 80A62280 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 06F94 80A62284 AFBF002C */ sw $ra, 0x002C($sp) +/* 06F94 80A62284 AFBF002C */ sw $ra, 0x002C($sp) /* 06F98 80A62288 26060024 */ addiu $a2, $s0, 0x0024 ## $a2 = 00000024 /* 06F9C 80A6228C 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 /* 06FA0 80A62290 3C0541C8 */ lui $a1, 0x41C8 ## $a1 = 41C80000 -/* 06FA4 80A62294 0C00A295 */ jal func_80028A54 -/* 06FA8 80A62298 AFA60034 */ sw $a2, 0x0034($sp) +/* 06FA4 80A62294 0C00A295 */ jal func_80028A54 +/* 06FA8 80A62298 AFA60034 */ sw $a2, 0x0034($sp) /* 06FAC 80A6229C 8E0F01F0 */ lw $t7, 0x01F0($s0) ## 000001F0 -/* 06FB0 80A622A0 8FA60034 */ lw $a2, 0x0034($sp) +/* 06FB0 80A622A0 8FA60034 */ lw $a2, 0x0034($sp) /* 06FB4 80A622A4 8E0801CC */ lw $t0, 0x01CC($s0) ## 000001CC /* 06FB8 80A622A8 240E0010 */ addiu $t6, $zero, 0x0010 ## $t6 = 00000010 /* 06FBC 80A622AC 24190008 */ addiu $t9, $zero, 0x0008 ## $t9 = 00000008 @@ -21,86 +21,86 @@ glabel func_80A62278 /* 06FD4 80A622C4 8CCB0000 */ lw $t3, 0x0000($a2) ## 00000000 /* 06FD8 80A622C8 3C0180A6 */ lui $at, %hi(D_80A66948) ## $at = 80A60000 /* 06FDC 80A622CC 44892000 */ mtc1 $t1, $f4 ## $f4 = 0.00 -/* 06FE0 80A622D0 C4266948 */ lwc1 $f6, %lo(D_80A66948)($at) +/* 06FE0 80A622D0 C4266948 */ lwc1 $f6, %lo(D_80A66948)($at) /* 06FE4 80A622D4 AE0B03B0 */ sw $t3, 0x03B0($s0) ## 000003B0 -/* 06FE8 80A622D8 46802020 */ cvt.s.w $f0, $f4 +/* 06FE8 80A622D8 46802020 */ cvt.s.w $f0, $f4 /* 06FEC 80A622DC 8CCA0004 */ lw $t2, 0x0004($a2) ## 00000004 /* 06FF0 80A622E0 920C03AC */ lbu $t4, 0x03AC($s0) ## 000003AC /* 06FF4 80A622E4 3C0E80A6 */ lui $t6, %hi(D_80A665DC) ## $t6 = 80A60000 /* 06FF8 80A622E8 AE0A03B4 */ sw $t2, 0x03B4($s0) ## 000003B4 /* 06FFC 80A622EC C60803B4 */ lwc1 $f8, 0x03B4($s0) ## 000003B4 -/* 07000 80A622F0 46060002 */ mul.s $f0, $f0, $f6 +/* 07000 80A622F0 46060002 */ mul.s $f0, $f0, $f6 /* 07004 80A622F4 8CCB0008 */ lw $t3, 0x0008($a2) ## 00000008 -/* 07008 80A622F8 000C6880 */ sll $t5, $t4, 2 -/* 0700C 80A622FC 01AC6821 */ addu $t5, $t5, $t4 -/* 07010 80A62300 000D6880 */ sll $t5, $t5, 2 +/* 07008 80A622F8 000C6880 */ sll $t5, $t4, 2 +/* 0700C 80A622FC 01AC6821 */ addu $t5, $t5, $t4 +/* 07010 80A62300 000D6880 */ sll $t5, $t5, 2 /* 07014 80A62304 25CE65DC */ addiu $t6, $t6, %lo(D_80A665DC) ## $t6 = 80A665DC -/* 07018 80A62308 01AE1021 */ addu $v0, $t5, $t6 -/* 0701C 80A6230C 46004280 */ add.s $f10, $f8, $f0 +/* 07018 80A62308 01AE1021 */ addu $v0, $t5, $t6 +/* 0701C 80A6230C 46004280 */ add.s $f10, $f8, $f0 /* 07020 80A62310 AE0B03B8 */ sw $t3, 0x03B8($s0) ## 000003B8 /* 07024 80A62314 3C0180A6 */ lui $at, %hi(D_80A6694C) ## $at = 80A60000 /* 07028 80A62318 37190008 */ ori $t9, $t8, 0x0008 ## $t9 = 0000000C /* 0702C 80A6231C E60A03B4 */ swc1 $f10, 0x03B4($s0) ## 000003B4 /* 07030 80A62320 844F0010 */ lh $t7, 0x0010($v0) ## 00000010 -/* 07034 80A62324 C424694C */ lwc1 $f4, %lo(D_80A6694C)($at) +/* 07034 80A62324 C424694C */ lwc1 $f4, %lo(D_80A6694C)($at) /* 07038 80A62328 C60803B4 */ lwc1 $f8, 0x03B4($s0) ## 000003B4 /* 0703C 80A6232C 448F8000 */ mtc1 $t7, $f16 ## $f16 = 0.00 /* 07040 80A62330 3C01C3B4 */ lui $at, 0xC3B4 ## $at = C3B40000 /* 07044 80A62334 AE1901F0 */ sw $t9, 0x01F0($s0) ## 000001F0 -/* 07048 80A62338 468084A0 */ cvt.s.w $f18, $f16 +/* 07048 80A62338 468084A0 */ cvt.s.w $f18, $f16 /* 0704C 80A6233C 44818000 */ mtc1 $at, $f16 ## $f16 = -360.00 /* 07050 80A62340 3C0141F0 */ lui $at, 0x41F0 ## $at = 41F00000 /* 07054 80A62344 86080032 */ lh $t0, 0x0032($s0) ## 00000032 /* 07058 80A62348 8E0B0158 */ lw $t3, 0x0158($s0) ## 00000158 /* 0705C 80A6234C 3C0D80A6 */ lui $t5, %hi(D_80A65E58) ## $t5 = 80A60000 -/* 07060 80A62350 46049180 */ add.s $f6, $f18, $f4 +/* 07060 80A62350 46049180 */ add.s $f6, $f18, $f4 /* 07064 80A62354 44812000 */ mtc1 $at, $f4 ## $f4 = 30.00 -/* 07068 80A62358 000B6080 */ sll $t4, $t3, 2 +/* 07068 80A62358 000B6080 */ sll $t4, $t3, 2 /* 0706C 80A6235C 8E0E0210 */ lw $t6, 0x0210($s0) ## 00000210 -/* 07070 80A62360 46083281 */ sub.s $f10, $f6, $f8 +/* 07070 80A62360 46083281 */ sub.s $f10, $f6, $f8 /* 07074 80A62364 C608025C */ lwc1 $f8, 0x025C($s0) ## 0000025C -/* 07078 80A62368 01AC6821 */ addu $t5, $t5, $t4 -/* 0707C 80A6236C 000E7880 */ sll $t7, $t6, 2 -/* 07080 80A62370 46105481 */ sub.s $f18, $f10, $f16 +/* 07078 80A62368 01AC6821 */ addu $t5, $t5, $t4 +/* 0707C 80A6236C 000E7880 */ sll $t7, $t6, 2 +/* 07080 80A62370 46105481 */ sub.s $f18, $f10, $f16 /* 07084 80A62374 44808000 */ mtc1 $zero, $f16 ## $f16 = 0.00 -/* 07088 80A62378 46004281 */ sub.s $f10, $f8, $f0 -/* 0708C 80A6237C 46049183 */ div.s $f6, $f18, $f4 +/* 07088 80A62378 46004281 */ sub.s $f10, $f8, $f0 +/* 0708C 80A6237C 46049183 */ div.s $f6, $f18, $f4 /* 07090 80A62380 E60A025C */ swc1 $f10, 0x025C($s0) ## 0000025C /* 07094 80A62384 44809000 */ mtc1 $zero, $f18 ## $f18 = 0.00 /* 07098 80A62388 E60603C0 */ swc1 $f6, 0x03C0($s0) ## 000003C0 /* 0709C 80A6238C 8449000A */ lh $t1, 0x000A($v0) ## 0000000A /* 070A0 80A62390 AE0003BC */ sw $zero, 0x03BC($s0) ## 000003BC /* 070A4 80A62394 E610006C */ swc1 $f16, 0x006C($s0) ## 0000006C -/* 070A8 80A62398 01095023 */ subu $t2, $t0, $t1 +/* 070A8 80A62398 01095023 */ subu $t2, $t0, $t1 /* 070AC 80A6239C A60A03C4 */ sh $t2, 0x03C4($s0) ## 000003C4 /* 070B0 80A623A0 E6120068 */ swc1 $f18, 0x0068($s0) ## 00000068 -/* 070B4 80A623A4 8DAD5E58 */ lw $t5, %lo(D_80A65E58)($t5) -/* 070B8 80A623A8 01AFC021 */ addu $t8, $t5, $t7 +/* 070B4 80A623A4 8DAD5E58 */ lw $t5, %lo(D_80A65E58)($t5) +/* 070B8 80A623A8 01AFC021 */ addu $t8, $t5, $t7 /* 070BC 80A623AC 0C028800 */ jal SkelAnime_GetFrameCount - + /* 070C0 80A623B0 8F040000 */ lw $a0, 0x0000($t8) ## 00000004 /* 070C4 80A623B4 8E190158 */ lw $t9, 0x0158($s0) ## 00000158 /* 070C8 80A623B8 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 070CC 80A623BC 3C0980A6 */ lui $t1, %hi(D_80A65E58) ## $t1 = 80A60000 -/* 070D0 80A623C0 00194080 */ sll $t0, $t9, 2 +/* 070D0 80A623C0 00194080 */ sll $t0, $t9, 2 /* 070D4 80A623C4 8E0A0210 */ lw $t2, 0x0210($s0) ## 00000210 -/* 070D8 80A623C8 01284821 */ addu $t1, $t1, $t0 -/* 070DC 80A623CC 8D295E58 */ lw $t1, %lo(D_80A65E58)($t1) -/* 070E0 80A623D0 468021A0 */ cvt.s.w $f6, $f4 -/* 070E4 80A623D4 000A5880 */ sll $t3, $t2, 2 +/* 070D8 80A623C8 01284821 */ addu $t1, $t1, $t0 +/* 070DC 80A623CC 8D295E58 */ lw $t1, %lo(D_80A65E58)($t1) +/* 070E0 80A623D0 468021A0 */ cvt.s.w $f6, $f4 +/* 070E4 80A623D4 000A5880 */ sll $t3, $t2, 2 /* 070E8 80A623D8 3C01C040 */ lui $at, 0xC040 ## $at = C0400000 -/* 070EC 80A623DC 012B6021 */ addu $t4, $t1, $t3 +/* 070EC 80A623DC 012B6021 */ addu $t4, $t1, $t3 /* 070F0 80A623E0 44814000 */ mtc1 $at, $f8 ## $f8 = -3.00 /* 070F4 80A623E4 8D850000 */ lw $a1, 0x0000($t4) ## 00000000 /* 070F8 80A623E8 240E0002 */ addiu $t6, $zero, 0x0002 ## $t6 = 00000002 -/* 070FC 80A623EC AFAE0014 */ sw $t6, 0x0014($sp) -/* 07100 80A623F0 E7A60010 */ swc1 $f6, 0x0010($sp) +/* 070FC 80A623EC AFAE0014 */ sw $t6, 0x0014($sp) +/* 07100 80A623F0 E7A60010 */ swc1 $f6, 0x0010($sp) /* 07104 80A623F4 260401AC */ addiu $a0, $s0, 0x01AC ## $a0 = 000001AC /* 07108 80A623F8 3C063FC0 */ lui $a2, 0x3FC0 ## $a2 = 3FC00000 /* 0710C 80A623FC 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 07110 80A62400 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 07114 80A62404 E7A80018 */ swc1 $f8, 0x0018($sp) +/* 07110 80A62400 0C029468 */ jal SkelAnime_ChangeAnim + +/* 07114 80A62404 E7A80018 */ swc1 $f8, 0x0018($sp) /* 07118 80A62408 8E0F0228 */ lw $t7, 0x0228($s0) ## 00000228 /* 0711C 80A6240C 2605021C */ addiu $a1, $s0, 0x021C ## $a1 = 0000021C /* 07120 80A62410 3C078013 */ lui $a3, 0x8013 ## $a3 = 80130000 @@ -115,35 +115,35 @@ glabel func_80A62278 /* 07144 80A62434 ACAF0008 */ sw $t7, 0x0008($a1) ## 00000224 /* 07148 80A62438 8E1801F0 */ lw $t8, 0x01F0($s0) ## 000001F0 /* 0714C 80A6243C 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 -/* 07150 80A62440 0018C900 */ sll $t9, $t8, 4 -/* 07154 80A62444 07210004 */ bgez $t9, .L80A62458 +/* 07150 80A62440 0018C900 */ sll $t9, $t8, 4 +/* 07154 80A62444 07210004 */ bgez $t9, .L80A62458 /* 07158 80A62448 00000000 */ nop -/* 0715C 80A6244C AFA70010 */ sw $a3, 0x0010($sp) +/* 0715C 80A6244C AFA70010 */ sw $a3, 0x0010($sp) /* 07160 80A62450 0C03DCE3 */ jal Audio_PlaySoundGeneral - -/* 07164 80A62454 AFA80014 */ sw $t0, 0x0014($sp) + +/* 07164 80A62454 AFA80014 */ sw $t0, 0x0014($sp) .L80A62458: /* 07168 80A62458 3C0A8013 */ lui $t2, 0x8013 ## $t2 = 80130000 /* 0716C 80A6245C 3C098013 */ lui $t1, 0x8013 ## $t1 = 80130000 /* 07170 80A62460 252933E8 */ addiu $t1, $t1, 0x33E8 ## $t1 = 801333E8 /* 07174 80A62464 254733E0 */ addiu $a3, $t2, 0x33E0 ## $a3 = 801333E0 -/* 07178 80A62468 AFA70010 */ sw $a3, 0x0010($sp) -/* 0717C 80A6246C AFA90014 */ sw $t1, 0x0014($sp) +/* 07178 80A62468 AFA70010 */ sw $a3, 0x0010($sp) +/* 0717C 80A6246C AFA90014 */ sw $t1, 0x0014($sp) /* 07180 80A62470 24042818 */ addiu $a0, $zero, 0x2818 ## $a0 = 00002818 /* 07184 80A62474 260500E4 */ addiu $a1, $s0, 0x00E4 ## $a1 = 000000E4 /* 07188 80A62478 0C03DCE3 */ jal Audio_PlaySoundGeneral - + /* 0718C 80A6247C 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 /* 07190 80A62480 44806000 */ mtc1 $zero, $f12 ## $f12 = 0.00 /* 07194 80A62484 240500AA */ addiu $a1, $zero, 0x00AA ## $a1 = 000000AA /* 07198 80A62488 2406000A */ addiu $a2, $zero, 0x000A ## $a2 = 0000000A -/* 0719C 80A6248C 0C02A800 */ jal func_800AA000 +/* 0719C 80A6248C 0C02A800 */ jal func_800AA000 /* 071A0 80A62490 2407000A */ addiu $a3, $zero, 0x000A ## $a3 = 0000000A /* 071A4 80A62494 AE000244 */ sw $zero, 0x0244($s0) ## 00000244 -/* 071A8 80A62498 8FBF002C */ lw $ra, 0x002C($sp) -/* 071AC 80A6249C 8FB00028 */ lw $s0, 0x0028($sp) +/* 071A8 80A62498 8FBF002C */ lw $ra, 0x002C($sp) +/* 071AC 80A6249C 8FB00028 */ lw $s0, 0x0028($sp) /* 071B0 80A624A0 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 -/* 071B4 80A624A4 03E00008 */ jr $ra +/* 071B4 80A624A4 03E00008 */ jr $ra /* 071B8 80A624A8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A62ACC.s b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A62ACC.s index 88b0dbbf2b..b12350d675 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A62ACC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A62ACC.s @@ -135,7 +135,7 @@ glabel func_80A62ACC /* 079CC 80A62CBC C6120248 */ lwc1 $f18, 0x0248($s0) ## 00000248 /* 079D0 80A62CC0 3C014270 */ lui $at, 0x4270 ## $at = 42700000 /* 079D4 80A62CC4 44817000 */ mtc1 $at, $f14 ## $f14 = 60.00 -/* 079D8 80A62CC8 0C03F494 */ jal func_800FD250 +/* 079D8 80A62CC8 0C03F494 */ jal Math_atan2f /* 079DC 80A62CCC 46128301 */ sub.s $f12, $f16, $f18 /* 079E0 80A62CD0 3C0180A6 */ lui $at, %hi(D_80A6695C) ## $at = 80A60000 /* 079E4 80A62CD4 C424695C */ lwc1 $f4, %lo(D_80A6695C)($at) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A63148.s b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A63148.s index 81a4c4391d..188fd13d70 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A63148.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A63148.s @@ -22,7 +22,7 @@ glabel func_80A63148 .L80A63194: /* 07EA4 80A63194 C48C0000 */ lwc1 $f12, 0x0000($a0) ## 00000000 /* 07EA8 80A63198 C48E0004 */ lwc1 $f14, 0x0004($a0) ## 00000004 -/* 07EAC 80A6319C 0C03F494 */ jal func_800FD250 +/* 07EAC 80A6319C 0C03F494 */ jal Math_atan2f /* 07EB0 80A631A0 46006307 */ neg.s $f12, $f12 /* 07EB4 80A631A4 3C0180A6 */ lui $at, %hi(D_80A6696C) ## $at = 80A60000 /* 07EB8 80A631A8 C42A696C */ lwc1 $f10, %lo(D_80A6696C)($at) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A63210.s b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A63210.s index fed7e4a794..dcb60229fa 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A63210.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A63210.s @@ -24,7 +24,7 @@ glabel func_80A63210 /* 07F78 80A63268 00000000 */ nop /* 07F7C 80A6326C 468083A0 */ cvt.s.w $f14, $f16 /* 07F80 80A63270 46007582 */ mul.s $f22, $f14, $f0 -/* 07F84 80A63274 0C03F494 */ jal func_800FD250 +/* 07F84 80A63274 0C03F494 */ jal Math_atan2f /* 07F88 80A63278 00000000 */ nop /* 07F8C 80A6327C 3C0180A6 */ lui $at, %hi(D_80A66974) ## $at = 80A60000 /* 07F90 80A63280 C4326974 */ lwc1 $f18, %lo(D_80A66974)($at) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A634A0.s b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A634A0.s index e2e2ad7a08..a904455757 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A634A0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A634A0.s @@ -227,7 +227,7 @@ glabel func_80A634A0 /* 08500 80A637F0 448B5000 */ mtc1 $t3, $f10 ## $f10 = 0.00 /* 08504 80A637F4 448C2000 */ mtc1 $t4, $f4 ## $f4 = 0.00 /* 08508 80A637F8 46805320 */ cvt.s.w $f12, $f10 -/* 0850C 80A637FC 0C03F494 */ jal func_800FD250 +/* 0850C 80A637FC 0C03F494 */ jal Math_atan2f /* 08510 80A63800 468023A0 */ cvt.s.w $f14, $f4 /* 08514 80A63804 3C0180A6 */ lui $at, %hi(D_80A66984) ## $at = 80A60000 /* 08518 80A63808 C4326984 */ lwc1 $f18, %lo(D_80A66984)($at) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A65C00.s b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A65C00.s index b0399fb0c2..5027d1a11c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A65C00.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse/func_80A65C00.s @@ -13,7 +13,7 @@ glabel func_80A65C00 /* 0A93C 80A65C2C 24C6682C */ addiu $a2, $a2, %lo(D_80A6682C) ## $a2 = 80A6682C /* 0A940 80A65C30 27A40034 */ addiu $a0, $sp, 0x0034 ## $a0 = FFFFFFE4 /* 0A944 80A65C34 24072186 */ addiu $a3, $zero, 0x2186 ## $a3 = 00002186 -/* 0A948 80A65C38 0C031AB1 */ jal func_800C6AC4 +/* 0A948 80A65C38 0C031AB1 */ jal Graph_OpenDisps /* 0A94C 80A65C3C AFA50044 */ sw $a1, 0x0044($sp) /* 0A950 80A65C40 8FA60058 */ lw $a2, 0x0058($sp) /* 0A954 80A65C44 2401000D */ addiu $at, $zero, 0x000D ## $at = 0000000D @@ -77,7 +77,7 @@ glabel func_80A65C00 /* 0AA2C 80A65D1C 24C6683C */ addiu $a2, $a2, %lo(D_80A6683C) ## $a2 = 80A6683C /* 0AA30 80A65D20 27A40034 */ addiu $a0, $sp, 0x0034 ## $a0 = FFFFFFE4 /* 0AA34 80A65D24 24072199 */ addiu $a3, $zero, 0x2199 ## $a3 = 00002199 -/* 0AA38 80A65D28 0C031AD5 */ jal func_800C6B54 +/* 0AA38 80A65D28 0C031AD5 */ jal Graph_CloseDisps /* 0AA3C 80A65D2C 8DE50000 */ lw $a1, 0x0000($t7) ## 00000000 /* 0AA40 80A65D30 8FBF0024 */ lw $ra, 0x0024($sp) /* 0AA44 80A65D34 8FA20048 */ lw $v0, 0x0048($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse_Ganon/EnHorseGanon_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Horse_Ganon/EnHorseGanon_Init.s index ddec1afe23..eb769b741b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse_Ganon/EnHorseGanon_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse_Ganon/EnHorseGanon_Init.s @@ -1,18 +1,18 @@ glabel EnHorseGanon_Init /* 002CC 80A6892C 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 002D0 80A68930 AFB10020 */ sw $s1, 0x0020($sp) +/* 002D0 80A68930 AFB10020 */ sw $s1, 0x0020($sp) /* 002D4 80A68934 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 -/* 002D8 80A68938 AFBF0024 */ sw $ra, 0x0024($sp) -/* 002DC 80A6893C AFB0001C */ sw $s0, 0x001C($sp) +/* 002D8 80A68938 AFBF0024 */ sw $ra, 0x0024($sp) +/* 002DC 80A6893C AFB0001C */ sw $s0, 0x001C($sp) /* 002E0 80A68940 3C0580A7 */ lui $a1, %hi(D_80A692C0) ## $a1 = 80A70000 /* 002E4 80A68944 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 002E8 80A68948 0C01E037 */ jal Actor_ProcessInitChain - + /* 002EC 80A6894C 24A592C0 */ addiu $a1, $a1, %lo(D_80A692C0) ## $a1 = 80A692C0 /* 002F0 80A68950 3C053C3C */ lui $a1, 0x3C3C ## $a1 = 3C3C0000 /* 002F4 80A68954 34A56A7F */ ori $a1, $a1, 0x6A7F ## $a1 = 3C3C6A7F /* 002F8 80A68958 0C00B58B */ jal Actor_SetScale - + /* 002FC 80A6895C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 00300 80A68960 3C01C060 */ lui $at, 0xC060 ## $at = C0600000 /* 00304 80A68964 44812000 */ mtc1 $at, $f4 ## $f4 = -3.50 @@ -22,7 +22,7 @@ glabel EnHorseGanon_Init /* 00314 80A68974 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 /* 00318 80A68978 3C0741A0 */ lui $a3, 0x41A0 ## $a3 = 41A00000 /* 0031C 80A6897C 0C00AC78 */ jal ActorShape_Init - + /* 00320 80A68980 E604006C */ swc1 $f4, 0x006C($s0) ## 0000006C /* 00324 80A68984 8E0E0028 */ lw $t6, 0x0028($s0) ## 00000028 /* 00328 80A68988 3C01428C */ lui $at, 0x428C ## $at = 428C0000 @@ -32,7 +32,7 @@ glabel EnHorseGanon_Init /* 00338 80A68998 44815000 */ mtc1 $at, $f10 ## $f10 = 70.00 /* 0033C 80A6899C AE0F0038 */ sw $t7, 0x0038($s0) ## 00000038 /* 00340 80A689A0 44803000 */ mtc1 $zero, $f6 ## $f6 = 0.00 -/* 00344 80A689A4 460A4400 */ add.s $f16, $f8, $f10 +/* 00344 80A689A4 460A4400 */ add.s $f16, $f8, $f10 /* 00348 80A689A8 8E0F002C */ lw $t7, 0x002C($s0) ## 0000002C /* 0034C 80A689AC 3C060601 */ lui $a2, 0x0601 ## $a2 = 06010000 /* 00350 80A689B0 3C070600 */ lui $a3, 0x0600 ## $a3 = 06000000 @@ -43,48 +43,48 @@ glabel EnHorseGanon_Init /* 00364 80A689C4 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 00368 80A689C8 26050154 */ addiu $a1, $s0, 0x0154 ## $a1 = 00000154 /* 0036C 80A689CC E6060068 */ swc1 $f6, 0x0068($s0) ## 00000068 -/* 00370 80A689D0 0C02998F */ jal func_800A663C +/* 00370 80A689D0 0C02998F */ jal func_800A663C /* 00374 80A689D4 AE0F0040 */ sw $t7, 0x0040($s0) ## 00000040 /* 00378 80A689D8 AE000150 */ sw $zero, 0x0150($s0) ## 00000150 /* 0037C 80A689DC 3C0580A7 */ lui $a1, %hi(D_80A691B0) ## $a1 = 80A70000 -/* 00380 80A689E0 8CA591B0 */ lw $a1, %lo(D_80A691B0)($a1) -/* 00384 80A689E4 0C02947A */ jal func_800A51E8 +/* 00380 80A689E0 8CA591B0 */ lw $a1, %lo(D_80A691B0)($a1) +/* 00384 80A689E4 0C02947A */ jal SkelAnime_ChangeAnimDefaultStop /* 00388 80A689E8 260401A0 */ addiu $a0, $s0, 0x01A0 ## $a0 = 000001A0 /* 0038C 80A689EC 260501FC */ addiu $a1, $s0, 0x01FC ## $a1 = 000001FC -/* 00390 80A689F0 AFA50028 */ sw $a1, 0x0028($sp) +/* 00390 80A689F0 AFA50028 */ sw $a1, 0x0028($sp) /* 00394 80A689F4 0C0170D9 */ jal ActorCollider_AllocCylinder - + /* 00398 80A689F8 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 0039C 80A689FC 3C0780A7 */ lui $a3, %hi(D_80A691E0) ## $a3 = 80A70000 -/* 003A0 80A68A00 8FA50028 */ lw $a1, 0x0028($sp) +/* 003A0 80A68A00 8FA50028 */ lw $a1, 0x0028($sp) /* 003A4 80A68A04 24E791E0 */ addiu $a3, $a3, %lo(D_80A691E0) ## $a3 = 80A691E0 /* 003A8 80A68A08 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 003AC 80A68A0C 0C01712B */ jal ActorCollider_InitCylinder - + /* 003B0 80A68A10 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 003B4 80A68A14 26050248 */ addiu $a1, $s0, 0x0248 ## $a1 = 00000248 -/* 003B8 80A68A18 AFA50028 */ sw $a1, 0x0028($sp) -/* 003BC 80A68A1C 0C016EFE */ jal func_8005BBF8 +/* 003B8 80A68A18 AFA50028 */ sw $a1, 0x0028($sp) +/* 003BC 80A68A1C 0C016EFE */ jal func_8005BBF8 /* 003C0 80A68A20 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 003C4 80A68A24 3C0780A7 */ lui $a3, %hi(D_80A69230) ## $a3 = 80A70000 /* 003C8 80A68A28 26180268 */ addiu $t8, $s0, 0x0268 ## $t8 = 00000268 -/* 003CC 80A68A2C 8FA50028 */ lw $a1, 0x0028($sp) -/* 003D0 80A68A30 AFB80010 */ sw $t8, 0x0010($sp) +/* 003CC 80A68A2C 8FA50028 */ lw $a1, 0x0028($sp) +/* 003D0 80A68A30 AFB80010 */ sw $t8, 0x0010($sp) /* 003D4 80A68A34 24E79230 */ addiu $a3, $a3, %lo(D_80A69230) ## $a3 = 80A69230 /* 003D8 80A68A38 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 003DC 80A68A3C 0C017014 */ jal func_8005C050 +/* 003DC 80A68A3C 0C017014 */ jal func_8005C050 /* 003E0 80A68A40 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 003E4 80A68A44 3C0680A7 */ lui $a2, %hi(D_80A69240) ## $a2 = 80A70000 /* 003E8 80A68A48 24C69240 */ addiu $a2, $a2, %lo(D_80A69240) ## $a2 = 80A69240 /* 003EC 80A68A4C 26040098 */ addiu $a0, $s0, 0x0098 ## $a0 = 00000098 -/* 003F0 80A68A50 0C0187B5 */ jal func_80061ED4 +/* 003F0 80A68A50 0C0187B5 */ jal func_80061ED4 /* 003F4 80A68A54 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 003F8 80A68A58 0C29A2B1 */ jal func_80A68AC4 +/* 003F8 80A68A58 0C29A2B1 */ jal func_80A68AC4 /* 003FC 80A68A5C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00400 80A68A60 8FBF0024 */ lw $ra, 0x0024($sp) -/* 00404 80A68A64 8FB0001C */ lw $s0, 0x001C($sp) -/* 00408 80A68A68 8FB10020 */ lw $s1, 0x0020($sp) -/* 0040C 80A68A6C 03E00008 */ jr $ra +/* 00400 80A68A60 8FBF0024 */ lw $ra, 0x0024($sp) +/* 00404 80A68A64 8FB0001C */ lw $s0, 0x001C($sp) +/* 00408 80A68A68 8FB10020 */ lw $s1, 0x0020($sp) +/* 0040C 80A68A6C 03E00008 */ jr $ra /* 00410 80A68A70 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse_Ganon/func_80A68AC4.s b/asm/non_matchings/overlays/actors/ovl_En_Horse_Ganon/func_80A68AC4.s index 3b65d5dd70..38ef1814ae 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse_Ganon/func_80A68AC4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse_Ganon/func_80A68AC4.s @@ -1,14 +1,14 @@ glabel func_80A68AC4 /* 00464 80A68AC4 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00468 80A68AC8 AFBF0014 */ sw $ra, 0x0014($sp) +/* 00468 80A68AC8 AFBF0014 */ sw $ra, 0x0014($sp) /* 0046C 80A68ACC AC80014C */ sw $zero, 0x014C($a0) ## 0000014C /* 00470 80A68AD0 3C0580A7 */ lui $a1, %hi(D_80A691C0) ## $a1 = 80A70000 -/* 00474 80A68AD4 8CA591C0 */ lw $a1, %lo(D_80A691C0)($a1) -/* 00478 80A68AD8 0C0294BE */ jal func_800A52F8 +/* 00474 80A68AD4 8CA591C0 */ lw $a1, %lo(D_80A691C0)($a1) +/* 00478 80A68AD8 0C0294BE */ jal SkelAnime_ChangeAnimDefaultRepeat /* 0047C 80A68ADC 248401A0 */ addiu $a0, $a0, 0x01A0 ## $a0 = 000001A0 -/* 00480 80A68AE0 8FBF0014 */ lw $ra, 0x0014($sp) +/* 00480 80A68AE0 8FBF0014 */ lw $ra, 0x0014($sp) /* 00484 80A68AE4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00488 80A68AE8 03E00008 */ jr $ra +/* 00488 80A68AE8 03E00008 */ jr $ra /* 0048C 80A68AEC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse_Ganon/func_80A68B20.s b/asm/non_matchings/overlays/actors/ovl_En_Horse_Ganon/func_80A68B20.s index 0201f31a5c..8414d9d839 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse_Ganon/func_80A68B20.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse_Ganon/func_80A68B20.s @@ -1,184 +1,184 @@ glabel func_80A68B20 /* 004C0 80A68B20 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 004C4 80A68B24 AFBF002C */ sw $ra, 0x002C($sp) -/* 004C8 80A68B28 AFB00028 */ sw $s0, 0x0028($sp) +/* 004C4 80A68B24 AFBF002C */ sw $ra, 0x002C($sp) +/* 004C8 80A68B28 AFB00028 */ sw $s0, 0x0028($sp) /* 004CC 80A68B2C 3C014040 */ lui $at, 0x4040 ## $at = 40400000 /* 004D0 80A68B30 44811000 */ mtc1 $at, $f2 ## $f2 = 3.00 /* 004D4 80A68B34 C4800068 */ lwc1 $f0, 0x0068($a0) ## 00000068 /* 004D8 80A68B38 240E0001 */ addiu $t6, $zero, 0x0001 ## $t6 = 00000001 /* 004DC 80A68B3C 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 004E0 80A68B40 4602003E */ c.le.s $f0, $f2 +/* 004E0 80A68B40 4602003E */ c.le.s $f0, $f2 /* 004E4 80A68B44 00001825 */ or $v1, $zero, $zero ## $v1 = 00000000 /* 004E8 80A68B48 AC8E014C */ sw $t6, 0x014C($a0) ## 0000014C /* 004EC 80A68B4C 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 -/* 004F0 80A68B50 45000009 */ bc1f .L80A68B78 +/* 004F0 80A68B50 45000009 */ bc1f .L80A68B78 /* 004F4 80A68B54 3C0140C0 */ lui $at, 0x40C0 ## $at = 40C00000 /* 004F8 80A68B58 8E0F0150 */ lw $t7, 0x0150($s0) ## 00000150 /* 004FC 80A68B5C 24040002 */ addiu $a0, $zero, 0x0002 ## $a0 = 00000002 /* 00500 80A68B60 24050003 */ addiu $a1, $zero, 0x0003 ## $a1 = 00000003 -/* 00504 80A68B64 108F0002 */ beq $a0, $t7, .L80A68B70 +/* 00504 80A68B64 108F0002 */ beq $a0, $t7, .L80A68B70 /* 00508 80A68B68 00000000 */ nop /* 0050C 80A68B6C 24030001 */ addiu $v1, $zero, 0x0001 ## $v1 = 00000001 .L80A68B70: -/* 00510 80A68B70 10000016 */ beq $zero, $zero, .L80A68BCC +/* 00510 80A68B70 10000016 */ beq $zero, $zero, .L80A68BCC /* 00514 80A68B74 AE040150 */ sw $a0, 0x0150($s0) ## 00000150 .L80A68B78: /* 00518 80A68B78 44812000 */ mtc1 $at, $f4 ## $f4 = 6.00 /* 0051C 80A68B7C 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 /* 00520 80A68B80 24050003 */ addiu $a1, $zero, 0x0003 ## $a1 = 00000003 -/* 00524 80A68B84 4604003E */ c.le.s $f0, $f4 +/* 00524 80A68B84 4604003E */ c.le.s $f0, $f4 /* 00528 80A68B88 24040002 */ addiu $a0, $zero, 0x0002 ## $a0 = 00000002 -/* 0052C 80A68B8C 4502000A */ bc1fl .L80A68BB8 +/* 0052C 80A68B8C 4502000A */ bc1fl .L80A68BB8 /* 00530 80A68B90 8E190150 */ lw $t9, 0x0150($s0) ## 00000150 /* 00534 80A68B94 8E180150 */ lw $t8, 0x0150($s0) ## 00000150 /* 00538 80A68B98 24050003 */ addiu $a1, $zero, 0x0003 ## $a1 = 00000003 /* 0053C 80A68B9C 24040002 */ addiu $a0, $zero, 0x0002 ## $a0 = 00000002 -/* 00540 80A68BA0 10B80002 */ beq $a1, $t8, .L80A68BAC +/* 00540 80A68BA0 10B80002 */ beq $a1, $t8, .L80A68BAC /* 00544 80A68BA4 00000000 */ nop /* 00548 80A68BA8 24030001 */ addiu $v1, $zero, 0x0001 ## $v1 = 00000001 .L80A68BAC: -/* 0054C 80A68BAC 10000007 */ beq $zero, $zero, .L80A68BCC +/* 0054C 80A68BAC 10000007 */ beq $zero, $zero, .L80A68BCC /* 00550 80A68BB0 AE050150 */ sw $a1, 0x0150($s0) ## 00000150 /* 00554 80A68BB4 8E190150 */ lw $t9, 0x0150($s0) ## 00000150 .L80A68BB8: /* 00558 80A68BB8 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 -/* 0055C 80A68BBC 50D90003 */ beql $a2, $t9, .L80A68BCC +/* 0055C 80A68BBC 50D90003 */ beql $a2, $t9, .L80A68BCC /* 00560 80A68BC0 AE060150 */ sw $a2, 0x0150($s0) ## 00000150 /* 00564 80A68BC4 24030001 */ addiu $v1, $zero, 0x0001 ## $v1 = 00000001 /* 00568 80A68BC8 AE060150 */ sw $a2, 0x0150($s0) ## 00000150 .L80A68BCC: /* 0056C 80A68BCC 8E020150 */ lw $v0, 0x0150($s0) ## 00000150 -/* 00570 80A68BD0 14820005 */ bne $a0, $v0, .L80A68BE8 +/* 00570 80A68BD0 14820005 */ bne $a0, $v0, .L80A68BE8 /* 00574 80A68BD4 00000000 */ nop /* 00578 80A68BD8 C6060068 */ lwc1 $f6, 0x0068($s0) ## 00000068 -/* 0057C 80A68BDC 46023203 */ div.s $f8, $f6, $f2 -/* 00580 80A68BE0 1000002D */ beq $zero, $zero, .L80A68C98 -/* 00584 80A68BE4 E7A80030 */ swc1 $f8, 0x0030($sp) +/* 0057C 80A68BDC 46023203 */ div.s $f8, $f6, $f2 +/* 00580 80A68BE0 1000002D */ beq $zero, $zero, .L80A68C98 +/* 00584 80A68BE4 E7A80030 */ swc1 $f8, 0x0030($sp) .L80A68BE8: -/* 00588 80A68BE8 14A20013 */ bne $a1, $v0, .L80A68C38 +/* 00588 80A68BE8 14A20013 */ bne $a1, $v0, .L80A68C38 /* 0058C 80A68BEC 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 /* 00590 80A68BF0 C60A0068 */ lwc1 $f10, 0x0068($s0) ## 00000068 /* 00594 80A68BF4 44818000 */ mtc1 $at, $f16 ## $f16 = 5.00 /* 00598 80A68BF8 3C078013 */ lui $a3, 0x8013 ## $a3 = 80130000 /* 0059C 80A68BFC 3C088013 */ lui $t0, 0x8013 ## $t0 = 80130000 -/* 005A0 80A68C00 46105483 */ div.s $f18, $f10, $f16 +/* 005A0 80A68C00 46105483 */ div.s $f18, $f10, $f16 /* 005A4 80A68C04 24E733E0 */ addiu $a3, $a3, 0x33E0 ## $a3 = 801333E0 /* 005A8 80A68C08 250833E8 */ addiu $t0, $t0, 0x33E8 ## $t0 = 801333E8 -/* 005AC 80A68C0C AFA80014 */ sw $t0, 0x0014($sp) -/* 005B0 80A68C10 AFA70010 */ sw $a3, 0x0010($sp) -/* 005B4 80A68C14 AFA30034 */ sw $v1, 0x0034($sp) +/* 005AC 80A68C0C AFA80014 */ sw $t0, 0x0014($sp) +/* 005B0 80A68C10 AFA70010 */ sw $a3, 0x0010($sp) +/* 005B4 80A68C14 AFA30034 */ sw $v1, 0x0034($sp) /* 005B8 80A68C18 24042804 */ addiu $a0, $zero, 0x2804 ## $a0 = 00002804 /* 005BC 80A68C1C 260500E4 */ addiu $a1, $s0, 0x00E4 ## $a1 = 000000E4 /* 005C0 80A68C20 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 /* 005C4 80A68C24 0C03DCE3 */ jal Audio_PlaySoundGeneral - -/* 005C8 80A68C28 E7B20030 */ swc1 $f18, 0x0030($sp) -/* 005CC 80A68C2C 8FA30034 */ lw $v1, 0x0034($sp) -/* 005D0 80A68C30 10000019 */ beq $zero, $zero, .L80A68C98 + +/* 005C8 80A68C28 E7B20030 */ swc1 $f18, 0x0030($sp) +/* 005CC 80A68C2C 8FA30034 */ lw $v1, 0x0034($sp) +/* 005D0 80A68C30 10000019 */ beq $zero, $zero, .L80A68C98 /* 005D4 80A68C34 8E020150 */ lw $v0, 0x0150($s0) ## 00000150 .L80A68C38: -/* 005D8 80A68C38 14C20014 */ bne $a2, $v0, .L80A68C8C +/* 005D8 80A68C38 14C20014 */ bne $a2, $v0, .L80A68C8C /* 005DC 80A68C3C 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 /* 005E0 80A68C40 3C0140E0 */ lui $at, 0x40E0 ## $at = 40E00000 /* 005E4 80A68C44 44813000 */ mtc1 $at, $f6 ## $f6 = 7.00 /* 005E8 80A68C48 C6040068 */ lwc1 $f4, 0x0068($s0) ## 00000068 /* 005EC 80A68C4C 3C078013 */ lui $a3, 0x8013 ## $a3 = 80130000 /* 005F0 80A68C50 3C098013 */ lui $t1, 0x8013 ## $t1 = 80130000 -/* 005F4 80A68C54 46062203 */ div.s $f8, $f4, $f6 +/* 005F4 80A68C54 46062203 */ div.s $f8, $f4, $f6 /* 005F8 80A68C58 24E733E0 */ addiu $a3, $a3, 0x33E0 ## $a3 = 801333E0 /* 005FC 80A68C5C 252933E8 */ addiu $t1, $t1, 0x33E8 ## $t1 = 801333E8 -/* 00600 80A68C60 AFA90014 */ sw $t1, 0x0014($sp) -/* 00604 80A68C64 AFA70010 */ sw $a3, 0x0010($sp) -/* 00608 80A68C68 AFA30034 */ sw $v1, 0x0034($sp) +/* 00600 80A68C60 AFA90014 */ sw $t1, 0x0014($sp) +/* 00604 80A68C64 AFA70010 */ sw $a3, 0x0010($sp) +/* 00608 80A68C68 AFA30034 */ sw $v1, 0x0034($sp) /* 0060C 80A68C6C 24042804 */ addiu $a0, $zero, 0x2804 ## $a0 = 00002804 /* 00610 80A68C70 260500E4 */ addiu $a1, $s0, 0x00E4 ## $a1 = 000000E4 /* 00614 80A68C74 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 /* 00618 80A68C78 0C03DCE3 */ jal Audio_PlaySoundGeneral - -/* 0061C 80A68C7C E7A80030 */ swc1 $f8, 0x0030($sp) -/* 00620 80A68C80 8FA30034 */ lw $v1, 0x0034($sp) -/* 00624 80A68C84 10000004 */ beq $zero, $zero, .L80A68C98 + +/* 0061C 80A68C7C E7A80030 */ swc1 $f8, 0x0030($sp) +/* 00620 80A68C80 8FA30034 */ lw $v1, 0x0034($sp) +/* 00624 80A68C84 10000004 */ beq $zero, $zero, .L80A68C98 /* 00628 80A68C88 8E020150 */ lw $v0, 0x0150($s0) ## 00000150 .L80A68C8C: /* 0062C 80A68C8C 44815000 */ mtc1 $at, $f10 ## $f10 = 0.00 /* 00630 80A68C90 00000000 */ nop -/* 00634 80A68C94 E7AA0030 */ swc1 $f10, 0x0030($sp) +/* 00634 80A68C94 E7AA0030 */ swc1 $f10, 0x0030($sp) .L80A68C98: /* 00638 80A68C98 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 0063C 80A68C9C 14610022 */ bne $v1, $at, .L80A68D28 -/* 00640 80A68CA0 00026080 */ sll $t4, $v0, 2 -/* 00644 80A68CA4 00025080 */ sll $t2, $v0, 2 +/* 0063C 80A68C9C 14610022 */ bne $v1, $at, .L80A68D28 +/* 00640 80A68CA0 00026080 */ sll $t4, $v0, 2 +/* 00644 80A68CA4 00025080 */ sll $t2, $v0, 2 /* 00648 80A68CA8 3C0480A7 */ lui $a0, %hi(D_80A691B0) ## $a0 = 80A70000 -/* 0064C 80A68CAC 008A2021 */ addu $a0, $a0, $t2 +/* 0064C 80A68CAC 008A2021 */ addu $a0, $a0, $t2 /* 00650 80A68CB0 0C028800 */ jal SkelAnime_GetFrameCount - -/* 00654 80A68CB4 8C8491B0 */ lw $a0, %lo(D_80A691B0)($a0) + +/* 00654 80A68CB4 8C8491B0 */ lw $a0, %lo(D_80A691B0)($a0) /* 00658 80A68CB8 8E030150 */ lw $v1, 0x0150($s0) ## 00000150 /* 0065C 80A68CBC 3C0180A7 */ lui $at, %hi(D_80A691C8) ## $at = 80A70000 -/* 00660 80A68CC0 C7B20030 */ lwc1 $f18, 0x0030($sp) -/* 00664 80A68CC4 00031880 */ sll $v1, $v1, 2 -/* 00668 80A68CC8 00230821 */ addu $at, $at, $v1 -/* 0066C 80A68CCC C43091C8 */ lwc1 $f16, %lo(D_80A691C8)($at) +/* 00660 80A68CC0 C7B20030 */ lwc1 $f18, 0x0030($sp) +/* 00664 80A68CC4 00031880 */ sll $v1, $v1, 2 +/* 00668 80A68CC8 00230821 */ addu $at, $at, $v1 +/* 0066C 80A68CCC C43091C8 */ lwc1 $f16, %lo(D_80A691C8)($at) /* 00670 80A68CD0 3C013FC0 */ lui $at, 0x3FC0 ## $at = 3FC00000 /* 00674 80A68CD4 44813000 */ mtc1 $at, $f6 ## $f6 = 1.50 -/* 00678 80A68CD8 46128102 */ mul.s $f4, $f16, $f18 +/* 00678 80A68CD8 46128102 */ mul.s $f4, $f16, $f18 /* 0067C 80A68CDC 44825000 */ mtc1 $v0, $f10 ## $f10 = 0.00 /* 00680 80A68CE0 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 /* 00684 80A68CE4 3C01C040 */ lui $at, 0xC040 ## $at = C0400000 /* 00688 80A68CE8 44819000 */ mtc1 $at, $f18 ## $f18 = -3.00 /* 0068C 80A68CEC 3C0580A7 */ lui $a1, %hi(D_80A691B0) ## $a1 = 80A70000 -/* 00690 80A68CF0 46805420 */ cvt.s.w $f16, $f10 -/* 00694 80A68CF4 46062202 */ mul.s $f8, $f4, $f6 -/* 00698 80A68CF8 00A32821 */ addu $a1, $a1, $v1 +/* 00690 80A68CF0 46805420 */ cvt.s.w $f16, $f10 +/* 00694 80A68CF4 46062202 */ mul.s $f8, $f4, $f6 +/* 00698 80A68CF8 00A32821 */ addu $a1, $a1, $v1 /* 0069C 80A68CFC 240B0002 */ addiu $t3, $zero, 0x0002 ## $t3 = 00000002 -/* 006A0 80A68D00 44070000 */ mfc1 $a3, $f0 -/* 006A4 80A68D04 AFAB0014 */ sw $t3, 0x0014($sp) -/* 006A8 80A68D08 8CA591B0 */ lw $a1, %lo(D_80A691B0)($a1) -/* 006AC 80A68D0C E7B00010 */ swc1 $f16, 0x0010($sp) -/* 006B0 80A68D10 44064000 */ mfc1 $a2, $f8 +/* 006A0 80A68D00 44070000 */ mfc1 $a3, $f0 +/* 006A4 80A68D04 AFAB0014 */ sw $t3, 0x0014($sp) +/* 006A8 80A68D08 8CA591B0 */ lw $a1, %lo(D_80A691B0)($a1) +/* 006AC 80A68D0C E7B00010 */ swc1 $f16, 0x0010($sp) +/* 006B0 80A68D10 44064000 */ mfc1 $a2, $f8 /* 006B4 80A68D14 260401A0 */ addiu $a0, $s0, 0x01A0 ## $a0 = 000001A0 -/* 006B8 80A68D18 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 006BC 80A68D1C E7B20018 */ swc1 $f18, 0x0018($sp) -/* 006C0 80A68D20 1000001F */ beq $zero, $zero, .L80A68DA0 -/* 006C4 80A68D24 8FBF002C */ lw $ra, 0x002C($sp) +/* 006B8 80A68D18 0C029468 */ jal SkelAnime_ChangeAnim + +/* 006BC 80A68D1C E7B20018 */ swc1 $f18, 0x0018($sp) +/* 006C0 80A68D20 1000001F */ beq $zero, $zero, .L80A68DA0 +/* 006C4 80A68D24 8FBF002C */ lw $ra, 0x002C($sp) .L80A68D28: /* 006C8 80A68D28 3C0480A7 */ lui $a0, %hi(D_80A691B0) ## $a0 = 80A70000 -/* 006CC 80A68D2C 008C2021 */ addu $a0, $a0, $t4 +/* 006CC 80A68D2C 008C2021 */ addu $a0, $a0, $t4 /* 006D0 80A68D30 0C028800 */ jal SkelAnime_GetFrameCount - -/* 006D4 80A68D34 8C8491B0 */ lw $a0, %lo(D_80A691B0)($a0) + +/* 006D4 80A68D34 8C8491B0 */ lw $a0, %lo(D_80A691B0)($a0) /* 006D8 80A68D38 8E030150 */ lw $v1, 0x0150($s0) ## 00000150 /* 006DC 80A68D3C 3C0180A7 */ lui $at, %hi(D_80A691C8) ## $at = 80A70000 -/* 006E0 80A68D40 C7A60030 */ lwc1 $f6, 0x0030($sp) -/* 006E4 80A68D44 00031880 */ sll $v1, $v1, 2 -/* 006E8 80A68D48 00230821 */ addu $at, $at, $v1 -/* 006EC 80A68D4C C42491C8 */ lwc1 $f4, %lo(D_80A691C8)($at) +/* 006E0 80A68D40 C7A60030 */ lwc1 $f6, 0x0030($sp) +/* 006E4 80A68D44 00031880 */ sll $v1, $v1, 2 +/* 006E8 80A68D48 00230821 */ addu $at, $at, $v1 +/* 006EC 80A68D4C C42491C8 */ lwc1 $f4, %lo(D_80A691C8)($at) /* 006F0 80A68D50 3C013FC0 */ lui $at, 0x3FC0 ## $at = 3FC00000 /* 006F4 80A68D54 44815000 */ mtc1 $at, $f10 ## $f10 = 1.50 -/* 006F8 80A68D58 46062202 */ mul.s $f8, $f4, $f6 +/* 006F8 80A68D58 46062202 */ mul.s $f8, $f4, $f6 /* 006FC 80A68D5C 44829000 */ mtc1 $v0, $f18 ## $f18 = 0.00 /* 00700 80A68D60 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 /* 00704 80A68D64 3C0580A7 */ lui $a1, %hi(D_80A691B0) ## $a1 = 80A70000 -/* 00708 80A68D68 00A32821 */ addu $a1, $a1, $v1 +/* 00708 80A68D68 00A32821 */ addu $a1, $a1, $v1 /* 0070C 80A68D6C 240D0002 */ addiu $t5, $zero, 0x0002 ## $t5 = 00000002 -/* 00710 80A68D70 46809120 */ cvt.s.w $f4, $f18 -/* 00714 80A68D74 460A4402 */ mul.s $f16, $f8, $f10 -/* 00718 80A68D78 44070000 */ mfc1 $a3, $f0 -/* 0071C 80A68D7C AFAD0014 */ sw $t5, 0x0014($sp) -/* 00720 80A68D80 8CA591B0 */ lw $a1, %lo(D_80A691B0)($a1) +/* 00710 80A68D70 46809120 */ cvt.s.w $f4, $f18 +/* 00714 80A68D74 460A4402 */ mul.s $f16, $f8, $f10 +/* 00718 80A68D78 44070000 */ mfc1 $a3, $f0 +/* 0071C 80A68D7C AFAD0014 */ sw $t5, 0x0014($sp) +/* 00720 80A68D80 8CA591B0 */ lw $a1, %lo(D_80A691B0)($a1) /* 00724 80A68D84 260401A0 */ addiu $a0, $s0, 0x01A0 ## $a0 = 000001A0 -/* 00728 80A68D88 E7A40010 */ swc1 $f4, 0x0010($sp) -/* 0072C 80A68D8C E7A00018 */ swc1 $f0, 0x0018($sp) -/* 00730 80A68D90 44068000 */ mfc1 $a2, $f16 -/* 00734 80A68D94 0C029468 */ jal SkelAnime_ChangeAnimation - +/* 00728 80A68D88 E7A40010 */ swc1 $f4, 0x0010($sp) +/* 0072C 80A68D8C E7A00018 */ swc1 $f0, 0x0018($sp) +/* 00730 80A68D90 44068000 */ mfc1 $a2, $f16 +/* 00734 80A68D94 0C029468 */ jal SkelAnime_ChangeAnim + /* 00738 80A68D98 00000000 */ nop -/* 0073C 80A68D9C 8FBF002C */ lw $ra, 0x002C($sp) +/* 0073C 80A68D9C 8FBF002C */ lw $ra, 0x002C($sp) .L80A68DA0: -/* 00740 80A68DA0 8FB00028 */ lw $s0, 0x0028($sp) +/* 00740 80A68DA0 8FB00028 */ lw $s0, 0x0028($sp) /* 00744 80A68DA4 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 -/* 00748 80A68DA8 03E00008 */ jr $ra +/* 00748 80A68DA8 03E00008 */ jr $ra /* 0074C 80A68DAC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse_Ganon/func_80A68E14.s b/asm/non_matchings/overlays/actors/ovl_En_Horse_Ganon/func_80A68E14.s index e526918178..40ec54b49c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse_Ganon/func_80A68E14.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse_Ganon/func_80A68E14.s @@ -37,7 +37,7 @@ glabel func_80A68E14 /* 00838 80A68E98 3C0141F0 */ lui $at, 0x41F0 ## $at = 41F00000 /* 0083C 80A68E9C 44817000 */ mtc1 $at, $f14 ## $f14 = 30.00 /* 00840 80A68EA0 E60001F4 */ swc1 $f0, 0x01F4($s0) ## 000001F4 -/* 00844 80A68EA4 0C03F494 */ jal func_800FD250 +/* 00844 80A68EA4 0C03F494 */ jal Math_atan2f /* 00848 80A68EA8 46009301 */ sub.s $f12, $f18, $f0 /* 0084C 80A68EAC 3C0180A7 */ lui $at, %hi(D_80A692D0) ## $at = 80A70000 /* 00850 80A68EB0 C42492D0 */ lwc1 $f4, %lo(D_80A692D0)($at) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse_Link_Child/EnHorseLinkChild_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Horse_Link_Child/EnHorseLinkChild_Init.s index 1564dabbee..16f5ce504f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse_Link_Child/EnHorseLinkChild_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse_Link_Child/EnHorseLinkChild_Init.s @@ -1,17 +1,17 @@ glabel EnHorseLinkChild_Init /* 00298 80A69668 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 0029C 80A6966C AFA5003C */ sw $a1, 0x003C($sp) -/* 002A0 80A69670 AFBF0024 */ sw $ra, 0x0024($sp) -/* 002A4 80A69674 AFB00020 */ sw $s0, 0x0020($sp) +/* 0029C 80A6966C AFA5003C */ sw $a1, 0x003C($sp) +/* 002A0 80A69670 AFBF0024 */ sw $ra, 0x0024($sp) +/* 002A4 80A69674 AFB00020 */ sw $s0, 0x0020($sp) /* 002A8 80A69678 3C0580A7 */ lui $a1, %hi(D_80A6AF78) ## $a1 = 80A70000 /* 002AC 80A6967C 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 002B0 80A69680 0C01E037 */ jal Actor_ProcessInitChain - + /* 002B4 80A69684 24A5AF78 */ addiu $a1, $a1, %lo(D_80A6AF78) ## $a1 = 80A6AF78 /* 002B8 80A69688 3C053BA3 */ lui $a1, 0x3BA3 ## $a1 = 3BA30000 /* 002BC 80A6968C 34A5D70A */ ori $a1, $a1, 0xD70A ## $a1 = 3BA3D70A /* 002C0 80A69690 0C00B58B */ jal Actor_SetScale - + /* 002C4 80A69694 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 002C8 80A69698 3C01C060 */ lui $at, 0xC060 ## $at = C0600000 /* 002CC 80A6969C 44812000 */ mtc1 $at, $f4 ## $f4 = -3.50 @@ -21,7 +21,7 @@ glabel EnHorseLinkChild_Init /* 002DC 80A696AC 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 /* 002E0 80A696B0 3C0741A0 */ lui $a3, 0x41A0 ## $a3 = 41A00000 /* 002E4 80A696B4 0C00AC78 */ jal ActorShape_Init - + /* 002E8 80A696B8 E604006C */ swc1 $f4, 0x006C($s0) ## 0000006C /* 002EC 80A696BC 8E0F0028 */ lw $t7, 0x0028($s0) ## 00000028 /* 002F0 80A696C0 3C01428C */ lui $at, 0x428C ## $at = 428C0000 @@ -31,7 +31,7 @@ glabel EnHorseLinkChild_Init /* 00300 80A696D0 44815000 */ mtc1 $at, $f10 ## $f10 = 70.00 /* 00304 80A696D4 AE180038 */ sw $t8, 0x0038($s0) ## 00000038 /* 00308 80A696D8 44803000 */ mtc1 $zero, $f6 ## $f6 = 0.00 -/* 0030C 80A696DC 460A4400 */ add.s $f16, $f8, $f10 +/* 0030C 80A696DC 460A4400 */ add.s $f16, $f8, $f10 /* 00310 80A696E0 8E18002C */ lw $t8, 0x002C($s0) ## 0000002C /* 00314 80A696E4 240E0001 */ addiu $t6, $zero, 0x0001 ## $t6 = 00000001 /* 00318 80A696E8 AE0E014C */ sw $t6, 0x014C($s0) ## 0000014C @@ -40,92 +40,92 @@ glabel EnHorseLinkChild_Init /* 00324 80A696F4 3C070600 */ lui $a3, 0x0600 ## $a3 = 06000000 /* 00328 80A696F8 E6060068 */ swc1 $f6, 0x0068($s0) ## 00000068 /* 0032C 80A696FC AE180040 */ sw $t8, 0x0040($s0) ## 00000040 -/* 00330 80A69700 8FA4003C */ lw $a0, 0x003C($sp) +/* 00330 80A69700 8FA4003C */ lw $a0, 0x003C($sp) /* 00334 80A69704 24E72F98 */ addiu $a3, $a3, 0x2F98 ## $a3 = 06002F98 /* 00338 80A69708 24C67B20 */ addiu $a2, $a2, 0x7B20 ## $a2 = 06007B20 -/* 0033C 80A6970C 0C02998F */ jal func_800A663C +/* 0033C 80A6970C 0C02998F */ jal func_800A663C /* 00340 80A69710 26050154 */ addiu $a1, $s0, 0x0154 ## $a1 = 00000154 /* 00344 80A69714 AE000150 */ sw $zero, 0x0150($s0) ## 00000150 /* 00348 80A69718 3C0580A7 */ lui $a1, %hi(D_80A6AEE0) ## $a1 = 80A70000 -/* 0034C 80A6971C 8CA5AEE0 */ lw $a1, %lo(D_80A6AEE0)($a1) -/* 00350 80A69720 0C02947A */ jal func_800A51E8 +/* 0034C 80A6971C 8CA5AEE0 */ lw $a1, %lo(D_80A6AEE0)($a1) +/* 00350 80A69720 0C02947A */ jal SkelAnime_ChangeAnimDefaultStop /* 00354 80A69724 260401A0 */ addiu $a0, $s0, 0x01A0 ## $a0 = 000001A0 /* 00358 80A69728 260501F4 */ addiu $a1, $s0, 0x01F4 ## $a1 = 000001F4 -/* 0035C 80A6972C AFA50028 */ sw $a1, 0x0028($sp) +/* 0035C 80A6972C AFA50028 */ sw $a1, 0x0028($sp) /* 00360 80A69730 0C0170D9 */ jal ActorCollider_AllocCylinder - -/* 00364 80A69734 8FA4003C */ lw $a0, 0x003C($sp) + +/* 00364 80A69734 8FA4003C */ lw $a0, 0x003C($sp) /* 00368 80A69738 3C0780A7 */ lui $a3, %hi(D_80A6AEF4) ## $a3 = 80A70000 -/* 0036C 80A6973C 8FA50028 */ lw $a1, 0x0028($sp) +/* 0036C 80A6973C 8FA50028 */ lw $a1, 0x0028($sp) /* 00370 80A69740 24E7AEF4 */ addiu $a3, $a3, %lo(D_80A6AEF4) ## $a3 = 80A6AEF4 -/* 00374 80A69744 8FA4003C */ lw $a0, 0x003C($sp) -/* 00378 80A69748 0C017114 */ jal func_8005C450 +/* 00374 80A69744 8FA4003C */ lw $a0, 0x003C($sp) +/* 00378 80A69748 0C017114 */ jal func_8005C450 /* 0037C 80A6974C 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 00380 80A69750 26050240 */ addiu $a1, $s0, 0x0240 ## $a1 = 00000240 -/* 00384 80A69754 AFA50028 */ sw $a1, 0x0028($sp) -/* 00388 80A69758 0C016EFE */ jal func_8005BBF8 -/* 0038C 80A6975C 8FA4003C */ lw $a0, 0x003C($sp) +/* 00384 80A69754 AFA50028 */ sw $a1, 0x0028($sp) +/* 00388 80A69758 0C016EFE */ jal func_8005BBF8 +/* 0038C 80A6975C 8FA4003C */ lw $a0, 0x003C($sp) /* 00390 80A69760 3C0780A7 */ lui $a3, %hi(D_80A6AF44) ## $a3 = 80A70000 /* 00394 80A69764 26190260 */ addiu $t9, $s0, 0x0260 ## $t9 = 00000260 -/* 00398 80A69768 8FA50028 */ lw $a1, 0x0028($sp) -/* 0039C 80A6976C AFB90010 */ sw $t9, 0x0010($sp) +/* 00398 80A69768 8FA50028 */ lw $a1, 0x0028($sp) +/* 0039C 80A6976C AFB90010 */ sw $t9, 0x0010($sp) /* 003A0 80A69770 24E7AF44 */ addiu $a3, $a3, %lo(D_80A6AF44) ## $a3 = 80A6AF44 -/* 003A4 80A69774 8FA4003C */ lw $a0, 0x003C($sp) -/* 003A8 80A69778 0C017014 */ jal func_8005C050 +/* 003A4 80A69774 8FA4003C */ lw $a0, 0x003C($sp) +/* 003A8 80A69778 0C017014 */ jal func_8005C050 /* 003AC 80A6977C 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 003B0 80A69780 3C0680A7 */ lui $a2, %hi(D_80A6AF54) ## $a2 = 80A70000 /* 003B4 80A69784 24C6AF54 */ addiu $a2, $a2, %lo(D_80A6AF54) ## $a2 = 80A6AF54 /* 003B8 80A69788 26040098 */ addiu $a0, $s0, 0x0098 ## $a0 = 00000098 -/* 003BC 80A6978C 0C0187B5 */ jal func_80061ED4 +/* 003BC 80A6978C 0C0187B5 */ jal func_80061ED4 /* 003C0 80A69790 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 003C4 80A69794 AE0001F0 */ sw $zero, 0x01F0($s0) ## 000001F0 /* 003C8 80A69798 A20001EC */ sb $zero, 0x01EC($s0) ## 000001EC /* 003CC 80A6979C 3C088016 */ lui $t0, 0x8016 ## $t0 = 80160000 /* 003D0 80A697A0 8D08F9C0 */ lw $t0, -0x0640($t0) ## 8015F9C0 -/* 003D4 80A697A4 8FA9003C */ lw $t1, 0x003C($sp) -/* 003D8 80A697A8 29010004 */ slti $at, $t0, 0x0004 -/* 003DC 80A697AC 54200006 */ bnel $at, $zero, .L80A697C8 +/* 003D4 80A697A4 8FA9003C */ lw $t1, 0x003C($sp) +/* 003D8 80A697A8 29010004 */ slti $at, $t0, 0x0004 +/* 003DC 80A697AC 54200006 */ bnel $at, $zero, .L80A697C8 /* 003E0 80A697B0 852A00A4 */ lh $t2, 0x00A4($t1) ## 000000A4 -/* 003E4 80A697B4 0C29A7B0 */ jal func_80A69EC0 +/* 003E4 80A697B4 0C29A7B0 */ jal func_80A69EC0 /* 003E8 80A697B8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 003EC 80A697BC 10000017 */ beq $zero, $zero, .L80A6981C +/* 003EC 80A697BC 10000017 */ beq $zero, $zero, .L80A6981C /* 003F0 80A697C0 A60000B8 */ sh $zero, 0x00B8($s0) ## 000000B8 /* 003F4 80A697C4 852A00A4 */ lh $t2, 0x00A4($t1) ## 000000A4 .L80A697C8: /* 003F8 80A697C8 24010063 */ addiu $at, $zero, 0x0063 ## $at = 00000063 -/* 003FC 80A697CC 15410010 */ bne $t2, $at, .L80A69810 +/* 003FC 80A697CC 15410010 */ bne $t2, $at, .L80A69810 /* 00400 80A697D0 00000000 */ nop /* 00404 80A697D4 0C00D6D3 */ jal Flags_GetEventChkInf - + /* 00408 80A697D8 24040014 */ addiu $a0, $zero, 0x0014 ## $a0 = 00000014 -/* 0040C 80A697DC 14400005 */ bne $v0, $zero, .L80A697F4 +/* 0040C 80A697DC 14400005 */ bne $v0, $zero, .L80A697F4 /* 00410 80A697E0 3C0B8016 */ lui $t3, 0x8016 ## $t3 = 80160000 /* 00414 80A697E4 0C00B55C */ jal Actor_Kill - + /* 00418 80A697E8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0041C 80A697EC 1000000F */ beq $zero, $zero, .L80A6982C -/* 00420 80A697F0 8FBF0024 */ lw $ra, 0x0024($sp) +/* 0041C 80A697EC 1000000F */ beq $zero, $zero, .L80A6982C +/* 00420 80A697F0 8FBF0024 */ lw $ra, 0x0024($sp) .L80A697F4: /* 00424 80A697F4 956BF536 */ lhu $t3, -0x0ACA($t3) ## FFFFF536 /* 00428 80A697F8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 0042C 80A697FC 316C0040 */ andi $t4, $t3, 0x0040 ## $t4 = 00000000 -/* 00430 80A69800 0C29A7B0 */ jal func_80A69EC0 +/* 00430 80A69800 0C29A7B0 */ jal func_80A69EC0 /* 00434 80A69804 AE0C02A0 */ sw $t4, 0x02A0($s0) ## 000002A0 -/* 00438 80A69808 10000004 */ beq $zero, $zero, .L80A6981C +/* 00438 80A69808 10000004 */ beq $zero, $zero, .L80A6981C /* 0043C 80A6980C A60000B8 */ sh $zero, 0x00B8($s0) ## 000000B8 .L80A69810: -/* 00440 80A69810 0C29A7B0 */ jal func_80A69EC0 +/* 00440 80A69810 0C29A7B0 */ jal func_80A69EC0 /* 00444 80A69814 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 00448 80A69818 A60000B8 */ sh $zero, 0x00B8($s0) ## 000000B8 .L80A6981C: /* 0044C 80A6981C 860200B8 */ lh $v0, 0x00B8($s0) ## 000000B8 /* 00450 80A69820 A6020034 */ sh $v0, 0x0034($s0) ## 00000034 /* 00454 80A69824 A6020018 */ sh $v0, 0x0018($s0) ## 00000018 -/* 00458 80A69828 8FBF0024 */ lw $ra, 0x0024($sp) +/* 00458 80A69828 8FBF0024 */ lw $ra, 0x0024($sp) .L80A6982C: -/* 0045C 80A6982C 8FB00020 */ lw $s0, 0x0020($sp) +/* 0045C 80A6982C 8FB00020 */ lw $s0, 0x0020($sp) /* 00460 80A69830 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 -/* 00464 80A69834 03E00008 */ jr $ra +/* 00464 80A69834 03E00008 */ jr $ra /* 00468 80A69838 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse_Link_Child/func_80A6988C.s b/asm/non_matchings/overlays/actors/ovl_En_Horse_Link_Child/func_80A6988C.s index ae1a842056..ae8e84241f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse_Link_Child/func_80A6988C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse_Link_Child/func_80A6988C.s @@ -1,30 +1,30 @@ glabel func_80A6988C /* 004BC 80A6988C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 004C0 80A69890 AFBF0014 */ sw $ra, 0x0014($sp) +/* 004C0 80A69890 AFBF0014 */ sw $ra, 0x0014($sp) /* 004C4 80A69894 8C8E0150 */ lw $t6, 0x0150($a0) ## 00000150 /* 004C8 80A69898 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 /* 004CC 80A6989C AC80014C */ sw $zero, 0x014C($a0) ## 0000014C /* 004D0 80A698A0 25C20001 */ addiu $v0, $t6, 0x0001 ## $v0 = 00000001 -/* 004D4 80A698A4 28410005 */ slti $at, $v0, 0x0005 -/* 004D8 80A698A8 14200003 */ bne $at, $zero, .L80A698B8 +/* 004D4 80A698A4 28410005 */ slti $at, $v0, 0x0005 +/* 004D8 80A698A8 14200003 */ bne $at, $zero, .L80A698B8 /* 004DC 80A698AC AC820150 */ sw $v0, 0x0150($a0) ## 00000150 /* 004E0 80A698B0 AC800150 */ sw $zero, 0x0150($a0) ## 00000150 /* 004E4 80A698B4 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 .L80A698B8: -/* 004E8 80A698B8 0002C080 */ sll $t8, $v0, 2 +/* 004E8 80A698B8 0002C080 */ sll $t8, $v0, 2 /* 004EC 80A698BC 3C0580A7 */ lui $a1, %hi(D_80A6AEE0) ## $a1 = 80A70000 -/* 004F0 80A698C0 00B82821 */ addu $a1, $a1, $t8 -/* 004F4 80A698C4 8CA5AEE0 */ lw $a1, %lo(D_80A6AEE0)($a1) +/* 004F0 80A698C0 00B82821 */ addu $a1, $a1, $t8 +/* 004F4 80A698C4 8CA5AEE0 */ lw $a1, %lo(D_80A6AEE0)($a1) /* 004F8 80A698C8 24C401A0 */ addiu $a0, $a2, 0x01A0 ## $a0 = 000001A0 -/* 004FC 80A698CC 0C02947A */ jal func_800A51E8 -/* 00500 80A698D0 AFA60018 */ sw $a2, 0x0018($sp) -/* 00504 80A698D4 0C29A569 */ jal func_80A695A4 -/* 00508 80A698D8 8FA40018 */ lw $a0, 0x0018($sp) -/* 0050C 80A698DC 8FA60018 */ lw $a2, 0x0018($sp) +/* 004FC 80A698CC 0C02947A */ jal SkelAnime_ChangeAnimDefaultStop +/* 00500 80A698D0 AFA60018 */ sw $a2, 0x0018($sp) +/* 00504 80A698D4 0C29A569 */ jal func_80A695A4 +/* 00508 80A698D8 8FA40018 */ lw $a0, 0x0018($sp) +/* 0050C 80A698DC 8FA60018 */ lw $a2, 0x0018($sp) /* 00510 80A698E0 E4C001BC */ swc1 $f0, 0x01BC($a2) ## 000001BC -/* 00514 80A698E4 8FBF0014 */ lw $ra, 0x0014($sp) +/* 00514 80A698E4 8FBF0014 */ lw $ra, 0x0014($sp) /* 00518 80A698E8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 0051C 80A698EC 03E00008 */ jr $ra +/* 0051C 80A698EC 03E00008 */ jr $ra /* 00520 80A698F0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse_Link_Child/func_80A6993C.s b/asm/non_matchings/overlays/actors/ovl_En_Horse_Link_Child/func_80A6993C.s index 984d098647..25ac4dae2c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse_Link_Child/func_80A6993C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse_Link_Child/func_80A6993C.s @@ -1,56 +1,56 @@ glabel func_80A6993C /* 0056C 80A6993C 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 /* 00570 80A69940 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 -/* 00574 80A69944 AFB00028 */ sw $s0, 0x0028($sp) -/* 00578 80A69948 AFBF002C */ sw $ra, 0x002C($sp) +/* 00574 80A69944 AFB00028 */ sw $s0, 0x0028($sp) +/* 00578 80A69948 AFBF002C */ sw $ra, 0x002C($sp) /* 0057C 80A6994C 240E0002 */ addiu $t6, $zero, 0x0002 ## $t6 = 00000002 /* 00580 80A69950 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 00584 80A69954 AC8E014C */ sw $t6, 0x014C($a0) ## 0000014C -/* 00588 80A69958 10A00005 */ beq $a1, $zero, .L80A69970 +/* 00588 80A69958 10A00005 */ beq $a1, $zero, .L80A69970 /* 0058C 80A6995C E4840068 */ swc1 $f4, 0x0068($a0) ## 00000068 /* 00590 80A69960 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 00594 80A69964 50A10003 */ beql $a1, $at, .L80A69974 +/* 00594 80A69964 50A10003 */ beql $a1, $at, .L80A69974 /* 00598 80A69968 8E0F0150 */ lw $t7, 0x0150($s0) ## 00000150 /* 0059C 80A6996C 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 .L80A69970: /* 005A0 80A69970 8E0F0150 */ lw $t7, 0x0150($s0) ## 00000150 .L80A69974: /* 005A4 80A69974 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 005A8 80A69978 50AF001C */ beql $a1, $t7, .L80A699EC -/* 005AC 80A6997C 8FBF002C */ lw $ra, 0x002C($sp) -/* 005B0 80A69980 0C29A569 */ jal func_80A695A4 +/* 005A8 80A69978 50AF001C */ beql $a1, $t7, .L80A699EC +/* 005AC 80A6997C 8FBF002C */ lw $ra, 0x002C($sp) +/* 005B0 80A69980 0C29A569 */ jal func_80A695A4 /* 005B4 80A69984 AE050150 */ sw $a1, 0x0150($s0) ## 00000150 -/* 005B8 80A69988 E7A00030 */ swc1 $f0, 0x0030($sp) +/* 005B8 80A69988 E7A00030 */ swc1 $f0, 0x0030($sp) /* 005BC 80A6998C 8E180150 */ lw $t8, 0x0150($s0) ## 00000150 /* 005C0 80A69990 3C0480A7 */ lui $a0, %hi(D_80A6AEE0) ## $a0 = 80A70000 -/* 005C4 80A69994 0018C880 */ sll $t9, $t8, 2 -/* 005C8 80A69998 00992021 */ addu $a0, $a0, $t9 +/* 005C4 80A69994 0018C880 */ sll $t9, $t8, 2 +/* 005C8 80A69998 00992021 */ addu $a0, $a0, $t9 /* 005CC 80A6999C 0C028800 */ jal SkelAnime_GetFrameCount - -/* 005D0 80A699A0 8C84AEE0 */ lw $a0, %lo(D_80A6AEE0)($a0) + +/* 005D0 80A699A0 8C84AEE0 */ lw $a0, %lo(D_80A6AEE0)($a0) /* 005D4 80A699A4 44823000 */ mtc1 $v0, $f6 ## $f6 = 0.00 /* 005D8 80A699A8 8E080150 */ lw $t0, 0x0150($s0) ## 00000150 /* 005DC 80A699AC 3C01C0A0 */ lui $at, 0xC0A0 ## $at = C0A00000 -/* 005E0 80A699B0 46803220 */ cvt.s.w $f8, $f6 +/* 005E0 80A699B0 46803220 */ cvt.s.w $f8, $f6 /* 005E4 80A699B4 44815000 */ mtc1 $at, $f10 ## $f10 = -5.00 /* 005E8 80A699B8 3C0580A7 */ lui $a1, %hi(D_80A6AEE0) ## $a1 = 80A70000 -/* 005EC 80A699BC 00084880 */ sll $t1, $t0, 2 -/* 005F0 80A699C0 00A92821 */ addu $a1, $a1, $t1 +/* 005EC 80A699BC 00084880 */ sll $t1, $t0, 2 +/* 005F0 80A699C0 00A92821 */ addu $a1, $a1, $t1 /* 005F4 80A699C4 240A0002 */ addiu $t2, $zero, 0x0002 ## $t2 = 00000002 -/* 005F8 80A699C8 AFAA0014 */ sw $t2, 0x0014($sp) -/* 005FC 80A699CC 8CA5AEE0 */ lw $a1, %lo(D_80A6AEE0)($a1) -/* 00600 80A699D0 E7A80010 */ swc1 $f8, 0x0010($sp) +/* 005F8 80A699C8 AFAA0014 */ sw $t2, 0x0014($sp) +/* 005FC 80A699CC 8CA5AEE0 */ lw $a1, %lo(D_80A6AEE0)($a1) +/* 00600 80A699D0 E7A80010 */ swc1 $f8, 0x0010($sp) /* 00604 80A699D4 260401A0 */ addiu $a0, $s0, 0x01A0 ## $a0 = 000001A0 -/* 00608 80A699D8 8FA60030 */ lw $a2, 0x0030($sp) +/* 00608 80A699D8 8FA60030 */ lw $a2, 0x0030($sp) /* 0060C 80A699DC 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 00610 80A699E0 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 00614 80A699E4 E7AA0018 */ swc1 $f10, 0x0018($sp) -/* 00618 80A699E8 8FBF002C */ lw $ra, 0x002C($sp) +/* 00610 80A699E0 0C029468 */ jal SkelAnime_ChangeAnim + +/* 00614 80A699E4 E7AA0018 */ swc1 $f10, 0x0018($sp) +/* 00618 80A699E8 8FBF002C */ lw $ra, 0x002C($sp) .L80A699EC: -/* 0061C 80A699EC 8FB00028 */ lw $s0, 0x0028($sp) +/* 0061C 80A699EC 8FB00028 */ lw $s0, 0x0028($sp) /* 00620 80A699F0 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 -/* 00624 80A699F4 03E00008 */ jr $ra +/* 00624 80A699F4 03E00008 */ jr $ra /* 00628 80A699F8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse_Link_Child/func_80A699FC.s b/asm/non_matchings/overlays/actors/ovl_En_Horse_Link_Child/func_80A699FC.s index b797407971..fafdc85c08 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse_Link_Child/func_80A699FC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse_Link_Child/func_80A699FC.s @@ -1,109 +1,109 @@ glabel func_80A699FC /* 0062C 80A699FC 27BDFFB8 */ addiu $sp, $sp, 0xFFB8 ## $sp = FFFFFFB8 -/* 00630 80A69A00 AFBF002C */ sw $ra, 0x002C($sp) -/* 00634 80A69A04 AFB00028 */ sw $s0, 0x0028($sp) +/* 00630 80A69A00 AFBF002C */ sw $ra, 0x002C($sp) +/* 00634 80A69A04 AFB00028 */ sw $s0, 0x0028($sp) /* 00638 80A69A08 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 0063C 80A69A0C 0C00B6E3 */ jal func_8002DB8C +/* 0063C 80A69A0C 0C00B6E3 */ jal func_8002DB8C /* 00640 80A69A10 8CA51C44 */ lw $a1, 0x1C44($a1) ## 00001C44 /* 00644 80A69A14 260401A0 */ addiu $a0, $s0, 0x01A0 ## $a0 = 000001A0 -/* 00648 80A69A18 AFA40034 */ sw $a0, 0x0034($sp) +/* 00648 80A69A18 AFA40034 */ sw $a0, 0x0034($sp) /* 0064C 80A69A1C 0C02927F */ jal SkelAnime_FrameUpdateMatrix - -/* 00650 80A69A20 E7A00044 */ swc1 $f0, 0x0044($sp) -/* 00654 80A69A24 10400050 */ beq $v0, $zero, .L80A69B68 -/* 00658 80A69A28 C7A20044 */ lwc1 $f2, 0x0044($sp) + +/* 00650 80A69A20 E7A00044 */ swc1 $f0, 0x0044($sp) +/* 00654 80A69A24 10400050 */ beq $v0, $zero, .L80A69B68 +/* 00658 80A69A28 C7A20044 */ lwc1 $f2, 0x0044($sp) /* 0065C 80A69A2C 3C01447A */ lui $at, 0x447A ## $at = 447A0000 /* 00660 80A69A30 44812000 */ mtc1 $at, $f4 ## $f4 = 1000.00 /* 00664 80A69A34 3C01428C */ lui $at, 0x428C ## $at = 428C0000 -/* 00668 80A69A38 4604103C */ c.lt.s $f2, $f4 +/* 00668 80A69A38 4604103C */ c.lt.s $f2, $f4 /* 0066C 80A69A3C 00000000 */ nop -/* 00670 80A69A40 4502000C */ bc1fl .L80A69A74 +/* 00670 80A69A40 4502000C */ bc1fl .L80A69A74 /* 00674 80A69A44 8E030150 */ lw $v1, 0x0150($s0) ## 00000150 /* 00678 80A69A48 44813000 */ mtc1 $at, $f6 ## $f6 = 70.00 /* 0067C 80A69A4C 00000000 */ nop -/* 00680 80A69A50 4602303C */ c.lt.s $f6, $f2 +/* 00680 80A69A50 4602303C */ c.lt.s $f6, $f2 /* 00684 80A69A54 00000000 */ nop -/* 00688 80A69A58 45020006 */ bc1fl .L80A69A74 +/* 00688 80A69A58 45020006 */ bc1fl .L80A69A74 /* 0068C 80A69A5C 8E030150 */ lw $v1, 0x0150($s0) ## 00000150 -/* 00690 80A69A60 0C29A6DF */ jal func_80A69B7C +/* 00690 80A69A60 0C29A6DF */ jal func_80A69B7C /* 00694 80A69A64 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00698 80A69A68 10000040 */ beq $zero, $zero, .L80A69B6C -/* 0069C 80A69A6C 8FBF002C */ lw $ra, 0x002C($sp) +/* 00698 80A69A68 10000040 */ beq $zero, $zero, .L80A69B6C +/* 0069C 80A69A6C 8FBF002C */ lw $ra, 0x002C($sp) /* 006A0 80A69A70 8E030150 */ lw $v1, 0x0150($s0) ## 00000150 .L80A69A74: /* 006A4 80A69A74 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 /* 006A8 80A69A78 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -/* 006AC 80A69A7C 14610003 */ bne $v1, $at, .L80A69A8C +/* 006AC 80A69A7C 14610003 */ bne $v1, $at, .L80A69A8C /* 006B0 80A69A80 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 006B4 80A69A84 10000001 */ beq $zero, $zero, .L80A69A8C +/* 006B4 80A69A84 10000001 */ beq $zero, $zero, .L80A69A8C /* 006B8 80A69A88 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 .L80A69A8C: -/* 006BC 80A69A8C 1043001D */ beq $v0, $v1, .L80A69B04 +/* 006BC 80A69A8C 1043001D */ beq $v0, $v1, .L80A69B04 /* 006C0 80A69A90 00000000 */ nop -/* 006C4 80A69A94 0C29A569 */ jal func_80A695A4 +/* 006C4 80A69A94 0C29A569 */ jal func_80A695A4 /* 006C8 80A69A98 AE020150 */ sw $v0, 0x0150($s0) ## 00000150 -/* 006CC 80A69A9C E7A00038 */ swc1 $f0, 0x0038($sp) +/* 006CC 80A69A9C E7A00038 */ swc1 $f0, 0x0038($sp) /* 006D0 80A69AA0 8E0E0150 */ lw $t6, 0x0150($s0) ## 00000150 /* 006D4 80A69AA4 3C0480A7 */ lui $a0, %hi(D_80A6AEE0) ## $a0 = 80A70000 -/* 006D8 80A69AA8 000E7880 */ sll $t7, $t6, 2 -/* 006DC 80A69AAC 008F2021 */ addu $a0, $a0, $t7 +/* 006D8 80A69AA8 000E7880 */ sll $t7, $t6, 2 +/* 006DC 80A69AAC 008F2021 */ addu $a0, $a0, $t7 /* 006E0 80A69AB0 0C028800 */ jal SkelAnime_GetFrameCount - -/* 006E4 80A69AB4 8C84AEE0 */ lw $a0, %lo(D_80A6AEE0)($a0) + +/* 006E4 80A69AB4 8C84AEE0 */ lw $a0, %lo(D_80A6AEE0)($a0) /* 006E8 80A69AB8 44824000 */ mtc1 $v0, $f8 ## $f8 = 0.00 /* 006EC 80A69ABC 8E180150 */ lw $t8, 0x0150($s0) ## 00000150 /* 006F0 80A69AC0 3C01C0A0 */ lui $at, 0xC0A0 ## $at = C0A00000 -/* 006F4 80A69AC4 468042A0 */ cvt.s.w $f10, $f8 +/* 006F4 80A69AC4 468042A0 */ cvt.s.w $f10, $f8 /* 006F8 80A69AC8 44818000 */ mtc1 $at, $f16 ## $f16 = -5.00 /* 006FC 80A69ACC 3C0580A7 */ lui $a1, %hi(D_80A6AEE0) ## $a1 = 80A70000 -/* 00700 80A69AD0 0018C880 */ sll $t9, $t8, 2 -/* 00704 80A69AD4 00B92821 */ addu $a1, $a1, $t9 +/* 00700 80A69AD0 0018C880 */ sll $t9, $t8, 2 +/* 00704 80A69AD4 00B92821 */ addu $a1, $a1, $t9 /* 00708 80A69AD8 24080002 */ addiu $t0, $zero, 0x0002 ## $t0 = 00000002 -/* 0070C 80A69ADC AFA80014 */ sw $t0, 0x0014($sp) -/* 00710 80A69AE0 8CA5AEE0 */ lw $a1, %lo(D_80A6AEE0)($a1) -/* 00714 80A69AE4 E7AA0010 */ swc1 $f10, 0x0010($sp) -/* 00718 80A69AE8 8FA40034 */ lw $a0, 0x0034($sp) -/* 0071C 80A69AEC 8FA60038 */ lw $a2, 0x0038($sp) +/* 0070C 80A69ADC AFA80014 */ sw $t0, 0x0014($sp) +/* 00710 80A69AE0 8CA5AEE0 */ lw $a1, %lo(D_80A6AEE0)($a1) +/* 00714 80A69AE4 E7AA0010 */ swc1 $f10, 0x0010($sp) +/* 00718 80A69AE8 8FA40034 */ lw $a0, 0x0034($sp) +/* 0071C 80A69AEC 8FA60038 */ lw $a2, 0x0038($sp) /* 00720 80A69AF0 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 00724 80A69AF4 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 00728 80A69AF8 E7B00018 */ swc1 $f16, 0x0018($sp) -/* 0072C 80A69AFC 1000001B */ beq $zero, $zero, .L80A69B6C -/* 00730 80A69B00 8FBF002C */ lw $ra, 0x002C($sp) +/* 00724 80A69AF4 0C029468 */ jal SkelAnime_ChangeAnim + +/* 00728 80A69AF8 E7B00018 */ swc1 $f16, 0x0018($sp) +/* 0072C 80A69AFC 1000001B */ beq $zero, $zero, .L80A69B6C +/* 00730 80A69B00 8FBF002C */ lw $ra, 0x002C($sp) .L80A69B04: -/* 00734 80A69B04 0C29A569 */ jal func_80A695A4 +/* 00734 80A69B04 0C29A569 */ jal func_80A695A4 /* 00738 80A69B08 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0073C 80A69B0C E7A00038 */ swc1 $f0, 0x0038($sp) +/* 0073C 80A69B0C E7A00038 */ swc1 $f0, 0x0038($sp) /* 00740 80A69B10 8E090150 */ lw $t1, 0x0150($s0) ## 00000150 /* 00744 80A69B14 3C0480A7 */ lui $a0, %hi(D_80A6AEE0) ## $a0 = 80A70000 -/* 00748 80A69B18 00095080 */ sll $t2, $t1, 2 -/* 0074C 80A69B1C 008A2021 */ addu $a0, $a0, $t2 +/* 00748 80A69B18 00095080 */ sll $t2, $t1, 2 +/* 0074C 80A69B1C 008A2021 */ addu $a0, $a0, $t2 /* 00750 80A69B20 0C028800 */ jal SkelAnime_GetFrameCount - -/* 00754 80A69B24 8C84AEE0 */ lw $a0, %lo(D_80A6AEE0)($a0) + +/* 00754 80A69B24 8C84AEE0 */ lw $a0, %lo(D_80A6AEE0)($a0) /* 00758 80A69B28 44829000 */ mtc1 $v0, $f18 ## $f18 = 0.00 /* 0075C 80A69B2C 8E0B0150 */ lw $t3, 0x0150($s0) ## 00000150 /* 00760 80A69B30 44803000 */ mtc1 $zero, $f6 ## $f6 = 0.00 -/* 00764 80A69B34 46809120 */ cvt.s.w $f4, $f18 +/* 00764 80A69B34 46809120 */ cvt.s.w $f4, $f18 /* 00768 80A69B38 3C0580A7 */ lui $a1, %hi(D_80A6AEE0) ## $a1 = 80A70000 -/* 0076C 80A69B3C 000B6080 */ sll $t4, $t3, 2 -/* 00770 80A69B40 00AC2821 */ addu $a1, $a1, $t4 +/* 0076C 80A69B3C 000B6080 */ sll $t4, $t3, 2 +/* 00770 80A69B40 00AC2821 */ addu $a1, $a1, $t4 /* 00774 80A69B44 240D0002 */ addiu $t5, $zero, 0x0002 ## $t5 = 00000002 -/* 00778 80A69B48 AFAD0014 */ sw $t5, 0x0014($sp) -/* 0077C 80A69B4C 8CA5AEE0 */ lw $a1, %lo(D_80A6AEE0)($a1) -/* 00780 80A69B50 E7A40010 */ swc1 $f4, 0x0010($sp) -/* 00784 80A69B54 8FA40034 */ lw $a0, 0x0034($sp) -/* 00788 80A69B58 8FA60038 */ lw $a2, 0x0038($sp) +/* 00778 80A69B48 AFAD0014 */ sw $t5, 0x0014($sp) +/* 0077C 80A69B4C 8CA5AEE0 */ lw $a1, %lo(D_80A6AEE0)($a1) +/* 00780 80A69B50 E7A40010 */ swc1 $f4, 0x0010($sp) +/* 00784 80A69B54 8FA40034 */ lw $a0, 0x0034($sp) +/* 00788 80A69B58 8FA60038 */ lw $a2, 0x0038($sp) /* 0078C 80A69B5C 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 00790 80A69B60 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 00794 80A69B64 E7A60018 */ swc1 $f6, 0x0018($sp) +/* 00790 80A69B60 0C029468 */ jal SkelAnime_ChangeAnim + +/* 00794 80A69B64 E7A60018 */ swc1 $f6, 0x0018($sp) .L80A69B68: -/* 00798 80A69B68 8FBF002C */ lw $ra, 0x002C($sp) +/* 00798 80A69B68 8FBF002C */ lw $ra, 0x002C($sp) .L80A69B6C: -/* 0079C 80A69B6C 8FB00028 */ lw $s0, 0x0028($sp) +/* 0079C 80A69B6C 8FB00028 */ lw $s0, 0x0028($sp) /* 007A0 80A69B70 27BD0048 */ addiu $sp, $sp, 0x0048 ## $sp = 00000000 -/* 007A4 80A69B74 03E00008 */ jr $ra +/* 007A4 80A69B74 03E00008 */ jr $ra /* 007A8 80A69B78 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse_Link_Child/func_80A69B7C.s b/asm/non_matchings/overlays/actors/ovl_En_Horse_Link_Child/func_80A69B7C.s index 0d47a4a748..17bce06c7b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse_Link_Child/func_80A69B7C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse_Link_Child/func_80A69B7C.s @@ -1,44 +1,44 @@ glabel func_80A69B7C /* 007AC 80A69B7C 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 007B0 80A69B80 AFBF002C */ sw $ra, 0x002C($sp) -/* 007B4 80A69B84 AFB00028 */ sw $s0, 0x0028($sp) +/* 007B0 80A69B80 AFBF002C */ sw $ra, 0x002C($sp) +/* 007B4 80A69B84 AFB00028 */ sw $s0, 0x0028($sp) /* 007B8 80A69B88 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 /* 007BC 80A69B8C 240E0001 */ addiu $t6, $zero, 0x0001 ## $t6 = 00000001 /* 007C0 80A69B90 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 007C4 80A69B94 AC8E014C */ sw $t6, 0x014C($a0) ## 0000014C /* 007C8 80A69B98 AC800150 */ sw $zero, 0x0150($a0) ## 00000150 -/* 007CC 80A69B9C 0C29A569 */ jal func_80A695A4 +/* 007CC 80A69B9C 0C29A569 */ jal func_80A695A4 /* 007D0 80A69BA0 E4840068 */ swc1 $f4, 0x0068($a0) ## 00000068 -/* 007D4 80A69BA4 E7A00030 */ swc1 $f0, 0x0030($sp) +/* 007D4 80A69BA4 E7A00030 */ swc1 $f0, 0x0030($sp) /* 007D8 80A69BA8 8E0F0150 */ lw $t7, 0x0150($s0) ## 00000150 /* 007DC 80A69BAC 3C0480A7 */ lui $a0, %hi(D_80A6AEE0) ## $a0 = 80A70000 -/* 007E0 80A69BB0 000FC080 */ sll $t8, $t7, 2 -/* 007E4 80A69BB4 00982021 */ addu $a0, $a0, $t8 +/* 007E0 80A69BB0 000FC080 */ sll $t8, $t7, 2 +/* 007E4 80A69BB4 00982021 */ addu $a0, $a0, $t8 /* 007E8 80A69BB8 0C028800 */ jal SkelAnime_GetFrameCount - -/* 007EC 80A69BBC 8C84AEE0 */ lw $a0, %lo(D_80A6AEE0)($a0) + +/* 007EC 80A69BBC 8C84AEE0 */ lw $a0, %lo(D_80A6AEE0)($a0) /* 007F0 80A69BC0 44823000 */ mtc1 $v0, $f6 ## $f6 = 0.00 /* 007F4 80A69BC4 8E190150 */ lw $t9, 0x0150($s0) ## 00000150 /* 007F8 80A69BC8 3C01C0A0 */ lui $at, 0xC0A0 ## $at = C0A00000 -/* 007FC 80A69BCC 46803220 */ cvt.s.w $f8, $f6 +/* 007FC 80A69BCC 46803220 */ cvt.s.w $f8, $f6 /* 00800 80A69BD0 44815000 */ mtc1 $at, $f10 ## $f10 = -5.00 /* 00804 80A69BD4 3C0580A7 */ lui $a1, %hi(D_80A6AEE0) ## $a1 = 80A70000 -/* 00808 80A69BD8 00194080 */ sll $t0, $t9, 2 -/* 0080C 80A69BDC 00A82821 */ addu $a1, $a1, $t0 +/* 00808 80A69BD8 00194080 */ sll $t0, $t9, 2 +/* 0080C 80A69BDC 00A82821 */ addu $a1, $a1, $t0 /* 00810 80A69BE0 24090002 */ addiu $t1, $zero, 0x0002 ## $t1 = 00000002 -/* 00814 80A69BE4 AFA90014 */ sw $t1, 0x0014($sp) -/* 00818 80A69BE8 8CA5AEE0 */ lw $a1, %lo(D_80A6AEE0)($a1) -/* 0081C 80A69BEC E7A80010 */ swc1 $f8, 0x0010($sp) +/* 00814 80A69BE4 AFA90014 */ sw $t1, 0x0014($sp) +/* 00818 80A69BE8 8CA5AEE0 */ lw $a1, %lo(D_80A6AEE0)($a1) +/* 0081C 80A69BEC E7A80010 */ swc1 $f8, 0x0010($sp) /* 00820 80A69BF0 260401A0 */ addiu $a0, $s0, 0x01A0 ## $a0 = 000001A0 -/* 00824 80A69BF4 8FA60030 */ lw $a2, 0x0030($sp) +/* 00824 80A69BF4 8FA60030 */ lw $a2, 0x0030($sp) /* 00828 80A69BF8 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 0082C 80A69BFC 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 00830 80A69C00 E7AA0018 */ swc1 $f10, 0x0018($sp) -/* 00834 80A69C04 8FBF002C */ lw $ra, 0x002C($sp) -/* 00838 80A69C08 8FB00028 */ lw $s0, 0x0028($sp) +/* 0082C 80A69BFC 0C029468 */ jal SkelAnime_ChangeAnim + +/* 00830 80A69C00 E7AA0018 */ swc1 $f10, 0x0018($sp) +/* 00834 80A69C04 8FBF002C */ lw $ra, 0x002C($sp) +/* 00838 80A69C08 8FB00028 */ lw $s0, 0x0028($sp) /* 0083C 80A69C0C 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 -/* 00840 80A69C10 03E00008 */ jr $ra +/* 00840 80A69C10 03E00008 */ jr $ra /* 00844 80A69C14 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse_Link_Child/func_80A69C18.s b/asm/non_matchings/overlays/actors/ovl_En_Horse_Link_Child/func_80A69C18.s index 6f28770c31..8ef24fded4 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse_Link_Child/func_80A69C18.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse_Link_Child/func_80A69C18.s @@ -1,36 +1,36 @@ glabel func_80A69C18 /* 00848 80A69C18 27BDFFB8 */ addiu $sp, $sp, 0xFFB8 ## $sp = FFFFFFB8 -/* 0084C 80A69C1C AFBF002C */ sw $ra, 0x002C($sp) -/* 00850 80A69C20 AFB00028 */ sw $s0, 0x0028($sp) -/* 00854 80A69C24 AFA5004C */ sw $a1, 0x004C($sp) +/* 0084C 80A69C1C AFBF002C */ sw $ra, 0x002C($sp) +/* 00850 80A69C20 AFB00028 */ sw $s0, 0x0028($sp) +/* 00854 80A69C24 AFA5004C */ sw $a1, 0x004C($sp) /* 00858 80A69C28 8C820150 */ lw $v0, 0x0150($a0) ## 00000150 /* 0085C 80A69C2C 24010004 */ addiu $at, $zero, 0x0004 ## $at = 00000004 /* 00860 80A69C30 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00864 80A69C34 10410005 */ beq $v0, $at, .L80A69C4C -/* 00868 80A69C38 8FAE004C */ lw $t6, 0x004C($sp) +/* 00864 80A69C34 10410005 */ beq $v0, $at, .L80A69C4C +/* 00868 80A69C38 8FAE004C */ lw $t6, 0x004C($sp) /* 0086C 80A69C3C 24010003 */ addiu $at, $zero, 0x0003 ## $at = 00000003 -/* 00870 80A69C40 10410002 */ beq $v0, $at, .L80A69C4C +/* 00870 80A69C40 10410002 */ beq $v0, $at, .L80A69C4C /* 00874 80A69C44 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 00878 80A69C48 14410015 */ bne $v0, $at, .L80A69CA0 +/* 00878 80A69C48 14410015 */ bne $v0, $at, .L80A69CA0 .L80A69C4C: /* 0087C 80A69C4C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00880 80A69C50 0C00B69E */ jal func_8002DA78 +/* 00880 80A69C50 0C00B69E */ jal func_8002DA78 /* 00884 80A69C54 8DC51C44 */ lw $a1, 0x1C44($t6) ## 00001C44 /* 00888 80A69C58 86030032 */ lh $v1, 0x0032($s0) ## 00000032 -/* 0088C 80A69C5C 00432023 */ subu $a0, $v0, $v1 -/* 00890 80A69C60 00042400 */ sll $a0, $a0, 16 -/* 00894 80A69C64 00042403 */ sra $a0, $a0, 16 -/* 00898 80A69C68 2881012D */ slti $at, $a0, 0x012D -/* 0089C 80A69C6C 14200003 */ bne $at, $zero, .L80A69C7C +/* 0088C 80A69C5C 00432023 */ subu $a0, $v0, $v1 +/* 00890 80A69C60 00042400 */ sll $a0, $a0, 16 +/* 00894 80A69C64 00042403 */ sra $a0, $a0, 16 +/* 00898 80A69C68 2881012D */ slti $at, $a0, 0x012D +/* 0089C 80A69C6C 14200003 */ bne $at, $zero, .L80A69C7C /* 008A0 80A69C70 246F012C */ addiu $t7, $v1, 0x012C ## $t7 = 0000012C -/* 008A4 80A69C74 10000008 */ beq $zero, $zero, .L80A69C98 +/* 008A4 80A69C74 10000008 */ beq $zero, $zero, .L80A69C98 /* 008A8 80A69C78 A60F0032 */ sh $t7, 0x0032($s0) ## 00000032 .L80A69C7C: -/* 008AC 80A69C7C 2881FED4 */ slti $at, $a0, 0xFED4 -/* 008B0 80A69C80 10200004 */ beq $at, $zero, .L80A69C94 -/* 008B4 80A69C84 0064C821 */ addu $t9, $v1, $a0 +/* 008AC 80A69C7C 2881FED4 */ slti $at, $a0, 0xFED4 +/* 008B0 80A69C80 10200004 */ beq $at, $zero, .L80A69C94 +/* 008B4 80A69C84 0064C821 */ addu $t9, $v1, $a0 /* 008B8 80A69C88 2478FED4 */ addiu $t8, $v1, 0xFED4 ## $t8 = FFFFFED4 -/* 008BC 80A69C8C 10000002 */ beq $zero, $zero, .L80A69C98 +/* 008BC 80A69C8C 10000002 */ beq $zero, $zero, .L80A69C98 /* 008C0 80A69C90 A6180032 */ sh $t8, 0x0032($s0) ## 00000032 .L80A69C94: /* 008C4 80A69C94 A6190032 */ sh $t9, 0x0032($s0) ## 00000032 @@ -40,152 +40,152 @@ glabel func_80A69C18 .L80A69CA0: /* 008D0 80A69CA0 260401A0 */ addiu $a0, $s0, 0x01A0 ## $a0 = 000001A0 /* 008D4 80A69CA4 0C02927F */ jal SkelAnime_FrameUpdateMatrix - -/* 008D8 80A69CA8 AFA40030 */ sw $a0, 0x0030($sp) -/* 008DC 80A69CAC 1040007F */ beq $v0, $zero, .L80A69EAC -/* 008E0 80A69CB0 8FA9004C */ lw $t1, 0x004C($sp) + +/* 008D8 80A69CA8 AFA40030 */ sw $a0, 0x0030($sp) +/* 008DC 80A69CAC 1040007F */ beq $v0, $zero, .L80A69EAC +/* 008E0 80A69CB0 8FA9004C */ lw $t1, 0x004C($sp) /* 008E4 80A69CB4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 008E8 80A69CB8 0C00B6E3 */ jal func_8002DB8C +/* 008E8 80A69CB8 0C00B6E3 */ jal func_8002DB8C /* 008EC 80A69CBC 8D251C44 */ lw $a1, 0x1C44($t1) ## 00001C44 /* 008F0 80A69CC0 3C01447A */ lui $at, 0x447A ## $at = 447A0000 /* 008F4 80A69CC4 44811000 */ mtc1 $at, $f2 ## $f2 = 1000.00 /* 008F8 80A69CC8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 008FC 80A69CCC 4600103C */ c.lt.s $f2, $f0 +/* 008FC 80A69CCC 4600103C */ c.lt.s $f2, $f0 /* 00900 80A69CD0 00000000 */ nop -/* 00904 80A69CD4 45020006 */ bc1fl .L80A69CF0 -/* 00908 80A69CD8 4602003C */ c.lt.s $f0, $f2 -/* 0090C 80A69CDC 0C29A64F */ jal func_80A6993C +/* 00904 80A69CD4 45020006 */ bc1fl .L80A69CF0 +/* 00908 80A69CD8 4602003C */ c.lt.s $f0, $f2 +/* 0090C 80A69CDC 0C29A64F */ jal func_80A6993C /* 00910 80A69CE0 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 00914 80A69CE4 10000072 */ beq $zero, $zero, .L80A69EB0 -/* 00918 80A69CE8 8FBF002C */ lw $ra, 0x002C($sp) -/* 0091C 80A69CEC 4602003C */ c.lt.s $f0, $f2 +/* 00914 80A69CE4 10000072 */ beq $zero, $zero, .L80A69EB0 +/* 00918 80A69CE8 8FBF002C */ lw $ra, 0x002C($sp) +/* 0091C 80A69CEC 4602003C */ c.lt.s $f0, $f2 .L80A69CF0: /* 00920 80A69CF0 3C014396 */ lui $at, 0x4396 ## $at = 43960000 -/* 00924 80A69CF4 4502000C */ bc1fl .L80A69D28 +/* 00924 80A69CF4 4502000C */ bc1fl .L80A69D28 /* 00928 80A69CF8 3C014396 */ lui $at, 0x4396 ## $at = 43960000 /* 0092C 80A69CFC 44812000 */ mtc1 $at, $f4 ## $f4 = 300.00 /* 00930 80A69D00 3C0140C0 */ lui $at, 0x40C0 ## $at = 40C00000 -/* 00934 80A69D04 4600203E */ c.le.s $f4, $f0 +/* 00934 80A69D04 4600203E */ c.le.s $f4, $f0 /* 00938 80A69D08 00000000 */ nop -/* 0093C 80A69D0C 45020006 */ bc1fl .L80A69D28 +/* 0093C 80A69D0C 45020006 */ bc1fl .L80A69D28 /* 00940 80A69D10 3C014396 */ lui $at, 0x4396 ## $at = 43960000 /* 00944 80A69D14 44813000 */ mtc1 $at, $f6 ## $f6 = 300.00 /* 00948 80A69D18 24020004 */ addiu $v0, $zero, 0x0004 ## $v0 = 00000004 -/* 0094C 80A69D1C 10000029 */ beq $zero, $zero, .L80A69DC4 +/* 0094C 80A69D1C 10000029 */ beq $zero, $zero, .L80A69DC4 /* 00950 80A69D20 E6060068 */ swc1 $f6, 0x0068($s0) ## 00000068 /* 00954 80A69D24 3C014396 */ lui $at, 0x4396 ## $at = 43960000 .L80A69D28: /* 00958 80A69D28 44814000 */ mtc1 $at, $f8 ## $f8 = 300.00 /* 0095C 80A69D2C 3C014316 */ lui $at, 0x4316 ## $at = 43160000 -/* 00960 80A69D30 4608003C */ c.lt.s $f0, $f8 +/* 00960 80A69D30 4608003C */ c.lt.s $f0, $f8 /* 00964 80A69D34 00000000 */ nop -/* 00968 80A69D38 4502000C */ bc1fl .L80A69D6C +/* 00968 80A69D38 4502000C */ bc1fl .L80A69D6C /* 0096C 80A69D3C 3C014316 */ lui $at, 0x4316 ## $at = 43160000 /* 00970 80A69D40 44815000 */ mtc1 $at, $f10 ## $f10 = 150.00 /* 00974 80A69D44 3C014080 */ lui $at, 0x4080 ## $at = 40800000 -/* 00978 80A69D48 4600503E */ c.le.s $f10, $f0 +/* 00978 80A69D48 4600503E */ c.le.s $f10, $f0 /* 0097C 80A69D4C 00000000 */ nop -/* 00980 80A69D50 45020006 */ bc1fl .L80A69D6C +/* 00980 80A69D50 45020006 */ bc1fl .L80A69D6C /* 00984 80A69D54 3C014316 */ lui $at, 0x4316 ## $at = 43160000 /* 00988 80A69D58 44818000 */ mtc1 $at, $f16 ## $f16 = 150.00 /* 0098C 80A69D5C 24020003 */ addiu $v0, $zero, 0x0003 ## $v0 = 00000003 -/* 00990 80A69D60 10000018 */ beq $zero, $zero, .L80A69DC4 +/* 00990 80A69D60 10000018 */ beq $zero, $zero, .L80A69DC4 /* 00994 80A69D64 E6100068 */ swc1 $f16, 0x0068($s0) ## 00000068 /* 00998 80A69D68 3C014316 */ lui $at, 0x4316 ## $at = 43160000 .L80A69D6C: /* 0099C 80A69D6C 44819000 */ mtc1 $at, $f18 ## $f18 = 150.00 /* 009A0 80A69D70 3C01428C */ lui $at, 0x428C ## $at = 428C0000 /* 009A4 80A69D74 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 009A8 80A69D78 4612003C */ c.lt.s $f0, $f18 +/* 009A8 80A69D78 4612003C */ c.lt.s $f0, $f18 /* 009AC 80A69D7C 00000000 */ nop -/* 009B0 80A69D80 4500000C */ bc1f .L80A69DB4 +/* 009B0 80A69D80 4500000C */ bc1f .L80A69DB4 /* 009B4 80A69D84 00000000 */ nop /* 009B8 80A69D88 44812000 */ mtc1 $at, $f4 ## $f4 = 70.00 /* 009BC 80A69D8C 24020002 */ addiu $v0, $zero, 0x0002 ## $v0 = 00000002 /* 009C0 80A69D90 3C014000 */ lui $at, 0x4000 ## $at = 40000000 -/* 009C4 80A69D94 4600203E */ c.le.s $f4, $f0 +/* 009C4 80A69D94 4600203E */ c.le.s $f4, $f0 /* 009C8 80A69D98 00000000 */ nop -/* 009CC 80A69D9C 45000005 */ bc1f .L80A69DB4 +/* 009CC 80A69D9C 45000005 */ bc1f .L80A69DB4 /* 009D0 80A69DA0 00000000 */ nop /* 009D4 80A69DA4 44813000 */ mtc1 $at, $f6 ## $f6 = 2.00 /* 009D8 80A69DA8 AE0001F0 */ sw $zero, 0x01F0($s0) ## 000001F0 -/* 009DC 80A69DAC 10000005 */ beq $zero, $zero, .L80A69DC4 +/* 009DC 80A69DAC 10000005 */ beq $zero, $zero, .L80A69DC4 /* 009E0 80A69DB0 E6060068 */ swc1 $f6, 0x0068($s0) ## 00000068 .L80A69DB4: -/* 009E4 80A69DB4 0C29A64F */ jal func_80A6993C +/* 009E4 80A69DB4 0C29A64F */ jal func_80A6993C /* 009E8 80A69DB8 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 -/* 009EC 80A69DBC 1000003C */ beq $zero, $zero, .L80A69EB0 -/* 009F0 80A69DC0 8FBF002C */ lw $ra, 0x002C($sp) +/* 009EC 80A69DBC 1000003C */ beq $zero, $zero, .L80A69EB0 +/* 009F0 80A69DC0 8FBF002C */ lw $ra, 0x002C($sp) .L80A69DC4: /* 009F4 80A69DC4 8E0A0150 */ lw $t2, 0x0150($s0) ## 00000150 /* 009F8 80A69DC8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 009FC 80A69DCC 104A001E */ beq $v0, $t2, .L80A69E48 +/* 009FC 80A69DCC 104A001E */ beq $v0, $t2, .L80A69E48 /* 00A00 80A69DD0 00000000 */ nop -/* 00A04 80A69DD4 0C29A569 */ jal func_80A695A4 +/* 00A04 80A69DD4 0C29A569 */ jal func_80A695A4 /* 00A08 80A69DD8 AE020150 */ sw $v0, 0x0150($s0) ## 00000150 -/* 00A0C 80A69DDC E7A00034 */ swc1 $f0, 0x0034($sp) +/* 00A0C 80A69DDC E7A00034 */ swc1 $f0, 0x0034($sp) /* 00A10 80A69DE0 8E0B0150 */ lw $t3, 0x0150($s0) ## 00000150 /* 00A14 80A69DE4 3C0480A7 */ lui $a0, %hi(D_80A6AEE0) ## $a0 = 80A70000 -/* 00A18 80A69DE8 000B6080 */ sll $t4, $t3, 2 -/* 00A1C 80A69DEC 008C2021 */ addu $a0, $a0, $t4 +/* 00A18 80A69DE8 000B6080 */ sll $t4, $t3, 2 +/* 00A1C 80A69DEC 008C2021 */ addu $a0, $a0, $t4 /* 00A20 80A69DF0 0C028800 */ jal SkelAnime_GetFrameCount - -/* 00A24 80A69DF4 8C84AEE0 */ lw $a0, %lo(D_80A6AEE0)($a0) + +/* 00A24 80A69DF4 8C84AEE0 */ lw $a0, %lo(D_80A6AEE0)($a0) /* 00A28 80A69DF8 44824000 */ mtc1 $v0, $f8 ## $f8 = 0.00 /* 00A2C 80A69DFC 8E0D0150 */ lw $t5, 0x0150($s0) ## 00000150 /* 00A30 80A69E00 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 00A34 80A69E04 468042A0 */ cvt.s.w $f10, $f8 +/* 00A34 80A69E04 468042A0 */ cvt.s.w $f10, $f8 /* 00A38 80A69E08 3C01C0A0 */ lui $at, 0xC0A0 ## $at = C0A00000 /* 00A3C 80A69E0C 44818000 */ mtc1 $at, $f16 ## $f16 = -5.00 /* 00A40 80A69E10 3C0580A7 */ lui $a1, %hi(D_80A6AEE0) ## $a1 = 80A70000 -/* 00A44 80A69E14 000D7080 */ sll $t6, $t5, 2 -/* 00A48 80A69E18 00AE2821 */ addu $a1, $a1, $t6 +/* 00A44 80A69E14 000D7080 */ sll $t6, $t5, 2 +/* 00A48 80A69E18 00AE2821 */ addu $a1, $a1, $t6 /* 00A4C 80A69E1C 240F0002 */ addiu $t7, $zero, 0x0002 ## $t7 = 00000002 -/* 00A50 80A69E20 44070000 */ mfc1 $a3, $f0 -/* 00A54 80A69E24 AFAF0014 */ sw $t7, 0x0014($sp) -/* 00A58 80A69E28 8CA5AEE0 */ lw $a1, %lo(D_80A6AEE0)($a1) -/* 00A5C 80A69E2C E7AA0010 */ swc1 $f10, 0x0010($sp) -/* 00A60 80A69E30 8FA40030 */ lw $a0, 0x0030($sp) -/* 00A64 80A69E34 8FA60034 */ lw $a2, 0x0034($sp) -/* 00A68 80A69E38 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 00A6C 80A69E3C E7B00018 */ swc1 $f16, 0x0018($sp) -/* 00A70 80A69E40 1000001B */ beq $zero, $zero, .L80A69EB0 -/* 00A74 80A69E44 8FBF002C */ lw $ra, 0x002C($sp) +/* 00A50 80A69E20 44070000 */ mfc1 $a3, $f0 +/* 00A54 80A69E24 AFAF0014 */ sw $t7, 0x0014($sp) +/* 00A58 80A69E28 8CA5AEE0 */ lw $a1, %lo(D_80A6AEE0)($a1) +/* 00A5C 80A69E2C E7AA0010 */ swc1 $f10, 0x0010($sp) +/* 00A60 80A69E30 8FA40030 */ lw $a0, 0x0030($sp) +/* 00A64 80A69E34 8FA60034 */ lw $a2, 0x0034($sp) +/* 00A68 80A69E38 0C029468 */ jal SkelAnime_ChangeAnim + +/* 00A6C 80A69E3C E7B00018 */ swc1 $f16, 0x0018($sp) +/* 00A70 80A69E40 1000001B */ beq $zero, $zero, .L80A69EB0 +/* 00A74 80A69E44 8FBF002C */ lw $ra, 0x002C($sp) .L80A69E48: -/* 00A78 80A69E48 0C29A569 */ jal func_80A695A4 +/* 00A78 80A69E48 0C29A569 */ jal func_80A695A4 /* 00A7C 80A69E4C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00A80 80A69E50 E7A00034 */ swc1 $f0, 0x0034($sp) +/* 00A80 80A69E50 E7A00034 */ swc1 $f0, 0x0034($sp) /* 00A84 80A69E54 8E180150 */ lw $t8, 0x0150($s0) ## 00000150 /* 00A88 80A69E58 3C0480A7 */ lui $a0, %hi(D_80A6AEE0) ## $a0 = 80A70000 -/* 00A8C 80A69E5C 0018C880 */ sll $t9, $t8, 2 -/* 00A90 80A69E60 00992021 */ addu $a0, $a0, $t9 +/* 00A8C 80A69E5C 0018C880 */ sll $t9, $t8, 2 +/* 00A90 80A69E60 00992021 */ addu $a0, $a0, $t9 /* 00A94 80A69E64 0C028800 */ jal SkelAnime_GetFrameCount - -/* 00A98 80A69E68 8C84AEE0 */ lw $a0, %lo(D_80A6AEE0)($a0) + +/* 00A98 80A69E68 8C84AEE0 */ lw $a0, %lo(D_80A6AEE0)($a0) /* 00A9C 80A69E6C 44829000 */ mtc1 $v0, $f18 ## $f18 = 0.00 /* 00AA0 80A69E70 8E080150 */ lw $t0, 0x0150($s0) ## 00000150 /* 00AA4 80A69E74 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 00AA8 80A69E78 46809120 */ cvt.s.w $f4, $f18 +/* 00AA8 80A69E78 46809120 */ cvt.s.w $f4, $f18 /* 00AAC 80A69E7C 3C0580A7 */ lui $a1, %hi(D_80A6AEE0) ## $a1 = 80A70000 -/* 00AB0 80A69E80 00084880 */ sll $t1, $t0, 2 -/* 00AB4 80A69E84 00A92821 */ addu $a1, $a1, $t1 +/* 00AB0 80A69E80 00084880 */ sll $t1, $t0, 2 +/* 00AB4 80A69E84 00A92821 */ addu $a1, $a1, $t1 /* 00AB8 80A69E88 240A0002 */ addiu $t2, $zero, 0x0002 ## $t2 = 00000002 -/* 00ABC 80A69E8C 44070000 */ mfc1 $a3, $f0 -/* 00AC0 80A69E90 AFAA0014 */ sw $t2, 0x0014($sp) -/* 00AC4 80A69E94 8CA5AEE0 */ lw $a1, %lo(D_80A6AEE0)($a1) -/* 00AC8 80A69E98 E7A40010 */ swc1 $f4, 0x0010($sp) -/* 00ACC 80A69E9C 8FA40030 */ lw $a0, 0x0030($sp) -/* 00AD0 80A69EA0 8FA60034 */ lw $a2, 0x0034($sp) -/* 00AD4 80A69EA4 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 00AD8 80A69EA8 E7A00018 */ swc1 $f0, 0x0018($sp) +/* 00ABC 80A69E8C 44070000 */ mfc1 $a3, $f0 +/* 00AC0 80A69E90 AFAA0014 */ sw $t2, 0x0014($sp) +/* 00AC4 80A69E94 8CA5AEE0 */ lw $a1, %lo(D_80A6AEE0)($a1) +/* 00AC8 80A69E98 E7A40010 */ swc1 $f4, 0x0010($sp) +/* 00ACC 80A69E9C 8FA40030 */ lw $a0, 0x0030($sp) +/* 00AD0 80A69EA0 8FA60034 */ lw $a2, 0x0034($sp) +/* 00AD4 80A69EA4 0C029468 */ jal SkelAnime_ChangeAnim + +/* 00AD8 80A69EA8 E7A00018 */ swc1 $f0, 0x0018($sp) .L80A69EAC: -/* 00ADC 80A69EAC 8FBF002C */ lw $ra, 0x002C($sp) +/* 00ADC 80A69EAC 8FBF002C */ lw $ra, 0x002C($sp) .L80A69EB0: -/* 00AE0 80A69EB0 8FB00028 */ lw $s0, 0x0028($sp) +/* 00AE0 80A69EB0 8FB00028 */ lw $s0, 0x0028($sp) /* 00AE4 80A69EB4 27BD0048 */ addiu $sp, $sp, 0x0048 ## $sp = 00000000 -/* 00AE8 80A69EB8 03E00008 */ jr $ra +/* 00AE8 80A69EB8 03E00008 */ jr $ra /* 00AEC 80A69EBC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse_Link_Child/func_80A69EC0.s b/asm/non_matchings/overlays/actors/ovl_En_Horse_Link_Child/func_80A69EC0.s index fcacdf70ee..8279e3549f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse_Link_Child/func_80A69EC0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse_Link_Child/func_80A69EC0.s @@ -1,44 +1,44 @@ glabel func_80A69EC0 /* 00AF0 80A69EC0 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 00AF4 80A69EC4 AFBF002C */ sw $ra, 0x002C($sp) -/* 00AF8 80A69EC8 AFB00028 */ sw $s0, 0x0028($sp) +/* 00AF4 80A69EC4 AFBF002C */ sw $ra, 0x002C($sp) +/* 00AF8 80A69EC8 AFB00028 */ sw $s0, 0x0028($sp) /* 00AFC 80A69ECC 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 /* 00B00 80A69ED0 240E0003 */ addiu $t6, $zero, 0x0003 ## $t6 = 00000003 /* 00B04 80A69ED4 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 00B08 80A69ED8 AC8E014C */ sw $t6, 0x014C($a0) ## 0000014C /* 00B0C 80A69EDC AC800150 */ sw $zero, 0x0150($a0) ## 00000150 -/* 00B10 80A69EE0 0C29A569 */ jal func_80A695A4 +/* 00B10 80A69EE0 0C29A569 */ jal func_80A695A4 /* 00B14 80A69EE4 E4840068 */ swc1 $f4, 0x0068($a0) ## 00000068 -/* 00B18 80A69EE8 E7A00030 */ swc1 $f0, 0x0030($sp) +/* 00B18 80A69EE8 E7A00030 */ swc1 $f0, 0x0030($sp) /* 00B1C 80A69EEC 8E0F0150 */ lw $t7, 0x0150($s0) ## 00000150 /* 00B20 80A69EF0 3C0480A7 */ lui $a0, %hi(D_80A6AEE0) ## $a0 = 80A70000 -/* 00B24 80A69EF4 000FC080 */ sll $t8, $t7, 2 -/* 00B28 80A69EF8 00982021 */ addu $a0, $a0, $t8 +/* 00B24 80A69EF4 000FC080 */ sll $t8, $t7, 2 +/* 00B28 80A69EF8 00982021 */ addu $a0, $a0, $t8 /* 00B2C 80A69EFC 0C028800 */ jal SkelAnime_GetFrameCount - -/* 00B30 80A69F00 8C84AEE0 */ lw $a0, %lo(D_80A6AEE0)($a0) + +/* 00B30 80A69F00 8C84AEE0 */ lw $a0, %lo(D_80A6AEE0)($a0) /* 00B34 80A69F04 44823000 */ mtc1 $v0, $f6 ## $f6 = 0.00 /* 00B38 80A69F08 8E190150 */ lw $t9, 0x0150($s0) ## 00000150 /* 00B3C 80A69F0C 3C01C0A0 */ lui $at, 0xC0A0 ## $at = C0A00000 -/* 00B40 80A69F10 46803220 */ cvt.s.w $f8, $f6 +/* 00B40 80A69F10 46803220 */ cvt.s.w $f8, $f6 /* 00B44 80A69F14 44815000 */ mtc1 $at, $f10 ## $f10 = -5.00 /* 00B48 80A69F18 3C0580A7 */ lui $a1, %hi(D_80A6AEE0) ## $a1 = 80A70000 -/* 00B4C 80A69F1C 00194080 */ sll $t0, $t9, 2 -/* 00B50 80A69F20 00A82821 */ addu $a1, $a1, $t0 +/* 00B4C 80A69F1C 00194080 */ sll $t0, $t9, 2 +/* 00B50 80A69F20 00A82821 */ addu $a1, $a1, $t0 /* 00B54 80A69F24 24090002 */ addiu $t1, $zero, 0x0002 ## $t1 = 00000002 -/* 00B58 80A69F28 AFA90014 */ sw $t1, 0x0014($sp) -/* 00B5C 80A69F2C 8CA5AEE0 */ lw $a1, %lo(D_80A6AEE0)($a1) -/* 00B60 80A69F30 E7A80010 */ swc1 $f8, 0x0010($sp) +/* 00B58 80A69F28 AFA90014 */ sw $t1, 0x0014($sp) +/* 00B5C 80A69F2C 8CA5AEE0 */ lw $a1, %lo(D_80A6AEE0)($a1) +/* 00B60 80A69F30 E7A80010 */ swc1 $f8, 0x0010($sp) /* 00B64 80A69F34 260401A0 */ addiu $a0, $s0, 0x01A0 ## $a0 = 000001A0 -/* 00B68 80A69F38 8FA60030 */ lw $a2, 0x0030($sp) +/* 00B68 80A69F38 8FA60030 */ lw $a2, 0x0030($sp) /* 00B6C 80A69F3C 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 00B70 80A69F40 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 00B74 80A69F44 E7AA0018 */ swc1 $f10, 0x0018($sp) -/* 00B78 80A69F48 8FBF002C */ lw $ra, 0x002C($sp) -/* 00B7C 80A69F4C 8FB00028 */ lw $s0, 0x0028($sp) +/* 00B70 80A69F40 0C029468 */ jal SkelAnime_ChangeAnim + +/* 00B74 80A69F44 E7AA0018 */ swc1 $f10, 0x0018($sp) +/* 00B78 80A69F48 8FBF002C */ lw $ra, 0x002C($sp) +/* 00B7C 80A69F4C 8FB00028 */ lw $s0, 0x0028($sp) /* 00B80 80A69F50 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 -/* 00B84 80A69F54 03E00008 */ jr $ra +/* 00B84 80A69F54 03E00008 */ jr $ra /* 00B88 80A69F58 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse_Link_Child/func_80A6A068.s b/asm/non_matchings/overlays/actors/ovl_En_Horse_Link_Child/func_80A6A068.s index f7c51c8235..cc7c40ad76 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse_Link_Child/func_80A6A068.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse_Link_Child/func_80A6A068.s @@ -1,80 +1,80 @@ glabel func_80A6A068 /* 00C98 80A6A068 27BDFFA8 */ addiu $sp, $sp, 0xFFA8 ## $sp = FFFFFFA8 -/* 00C9C 80A6A06C AFBF002C */ sw $ra, 0x002C($sp) -/* 00CA0 80A6A070 AFB00028 */ sw $s0, 0x0028($sp) +/* 00C9C 80A6A06C AFBF002C */ sw $ra, 0x002C($sp) +/* 00CA0 80A6A070 AFB00028 */ sw $s0, 0x0028($sp) /* 00CA4 80A6A074 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00CA8 80A6A078 0C29A7D7 */ jal func_80A69F5C -/* 00CAC 80A6A07C AFA5005C */ sw $a1, 0x005C($sp) -/* 00CB0 80A6A080 8FAE005C */ lw $t6, 0x005C($sp) +/* 00CA8 80A6A078 0C29A7D7 */ jal func_80A69F5C +/* 00CAC 80A6A07C AFA5005C */ sw $a1, 0x005C($sp) +/* 00CB0 80A6A080 8FAE005C */ lw $t6, 0x005C($sp) /* 00CB4 80A6A084 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 00CB8 80A6A088 8DC51C44 */ lw $a1, 0x1C44($t6) ## 00001C44 -/* 00CBC 80A6A08C 0C00B6E3 */ jal func_8002DB8C -/* 00CC0 80A6A090 AFA50054 */ sw $a1, 0x0054($sp) +/* 00CBC 80A6A08C 0C00B6E3 */ jal func_8002DB8C +/* 00CC0 80A6A090 AFA50054 */ sw $a1, 0x0054($sp) /* 00CC4 80A6A094 3C058016 */ lui $a1, 0x8016 ## $a1 = 80160000 /* 00CC8 80A6A098 24A5E660 */ addiu $a1, $a1, 0xE660 ## $a1 = 8015E660 /* 00CCC 80A6A09C 8CAF0000 */ lw $t7, 0x0000($a1) ## 8015E660 /* 00CD0 80A6A0A0 240102AE */ addiu $at, $zero, 0x02AE ## $at = 000002AE -/* 00CD4 80A6A0A4 E7A00050 */ swc1 $f0, 0x0050($sp) -/* 00CD8 80A6A0A8 15E1000E */ bne $t7, $at, .L80A6A0E4 +/* 00CD4 80A6A0A4 E7A00050 */ swc1 $f0, 0x0050($sp) +/* 00CD8 80A6A0A8 15E1000E */ bne $t7, $at, .L80A6A0E4 /* 00CDC 80A6A0AC 3C078013 */ lui $a3, 0x8013 ## $a3 = 80130000 /* 00CE0 80A6A0B0 3C188013 */ lui $t8, 0x8013 ## $t8 = 80130000 /* 00CE4 80A6A0B4 24E733E0 */ addiu $a3, $a3, 0x33E0 ## $a3 = 801333E0 /* 00CE8 80A6A0B8 271833E8 */ addiu $t8, $t8, 0x33E8 ## $t8 = 801333E8 -/* 00CEC 80A6A0BC AFB80014 */ sw $t8, 0x0014($sp) -/* 00CF0 80A6A0C0 AFA70010 */ sw $a3, 0x0010($sp) +/* 00CEC 80A6A0BC AFB80014 */ sw $t8, 0x0014($sp) +/* 00CF0 80A6A0C0 AFA70010 */ sw $a3, 0x0010($sp) /* 00CF4 80A6A0C4 24042844 */ addiu $a0, $zero, 0x2844 ## $a0 = 00002844 /* 00CF8 80A6A0C8 260500E4 */ addiu $a1, $s0, 0x00E4 ## $a1 = 000000E4 /* 00CFC 80A6A0CC 0C03DCE3 */ jal Audio_PlaySoundGeneral - + /* 00D00 80A6A0D0 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 -/* 00D04 80A6A0D4 0C29A9C9 */ jal func_80A6A724 +/* 00D04 80A6A0D4 0C29A9C9 */ jal func_80A6A724 /* 00D08 80A6A0D8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00D0C 80A6A0DC 100000FB */ beq $zero, $zero, .L80A6A4CC -/* 00D10 80A6A0E0 8FBF002C */ lw $ra, 0x002C($sp) +/* 00D0C 80A6A0DC 100000FB */ beq $zero, $zero, .L80A6A4CC +/* 00D10 80A6A0E0 8FBF002C */ lw $ra, 0x002C($sp) .L80A6A0E4: /* 00D14 80A6A0E4 94A20ED6 */ lhu $v0, 0x0ED6($a1) ## 00000ED6 /* 00D18 80A6A0E8 3C198016 */ lui $t9, 0x8016 ## $t9 = 80160000 -/* 00D1C 80A6A0EC 8FA9005C */ lw $t1, 0x005C($sp) +/* 00D1C 80A6A0EC 8FA9005C */ lw $t1, 0x005C($sp) /* 00D20 80A6A0F0 30420040 */ andi $v0, $v0, 0x0040 ## $v0 = 00000000 -/* 00D24 80A6A0F4 50400006 */ beql $v0, $zero, .L80A6A110 +/* 00D24 80A6A0F4 50400006 */ beql $v0, $zero, .L80A6A110 /* 00D28 80A6A0F8 852A00A4 */ lh $t2, 0x00A4($t1) ## 000000A4 /* 00D2C 80A6A0FC 8F39FA90 */ lw $t9, -0x0570($t9) ## 8015FA90 /* 00D30 80A6A100 872805BE */ lh $t0, 0x05BE($t9) ## 801605BE -/* 00D34 80A6A104 15000009 */ bne $t0, $zero, .L80A6A12C +/* 00D34 80A6A104 15000009 */ bne $t0, $zero, .L80A6A12C /* 00D38 80A6A108 00000000 */ nop /* 00D3C 80A6A10C 852A00A4 */ lh $t2, 0x00A4($t1) ## 000000A4 .L80A6A110: /* 00D40 80A6A110 24010063 */ addiu $at, $zero, 0x0063 ## $at = 00000063 -/* 00D44 80A6A114 5541000A */ bnel $t2, $at, .L80A6A140 +/* 00D44 80A6A114 5541000A */ bnel $t2, $at, .L80A6A140 /* 00D48 80A6A118 AE0202A0 */ sw $v0, 0x02A0($s0) ## 000002A0 /* 00D4C 80A6A11C 8CAB0008 */ lw $t3, 0x0008($a1) ## 00000008 /* 00D50 80A6A120 3401FFF1 */ ori $at, $zero, 0xFFF1 ## $at = 0000FFF1 -/* 00D54 80A6A124 55610006 */ bnel $t3, $at, .L80A6A140 +/* 00D54 80A6A124 55610006 */ bnel $t3, $at, .L80A6A140 /* 00D58 80A6A128 AE0202A0 */ sw $v0, 0x02A0($s0) ## 000002A0 .L80A6A12C: -/* 00D5C 80A6A12C 0C29A937 */ jal func_80A6A4DC +/* 00D5C 80A6A12C 0C29A937 */ jal func_80A6A4DC /* 00D60 80A6A130 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00D64 80A6A134 10000003 */ beq $zero, $zero, .L80A6A144 +/* 00D64 80A6A134 10000003 */ beq $zero, $zero, .L80A6A144 /* 00D68 80A6A138 8E030150 */ lw $v1, 0x0150($s0) ## 00000150 /* 00D6C 80A6A13C AE0202A0 */ sw $v0, 0x02A0($s0) ## 000002A0 .L80A6A140: /* 00D70 80A6A140 8E030150 */ lw $v1, 0x0150($s0) ## 00000150 .L80A6A144: /* 00D74 80A6A144 260401A0 */ addiu $a0, $s0, 0x01A0 ## $a0 = 000001A0 -/* 00D78 80A6A148 AFA40030 */ sw $a0, 0x0030($sp) +/* 00D78 80A6A148 AFA40030 */ sw $a0, 0x0030($sp) /* 00D7C 80A6A14C 0C02927F */ jal SkelAnime_FrameUpdateMatrix - -/* 00D80 80A6A150 AFA30048 */ sw $v1, 0x0048($sp) + +/* 00D80 80A6A150 AFA30048 */ sw $v1, 0x0048($sp) /* 00D84 80A6A154 3C058016 */ lui $a1, 0x8016 ## $a1 = 80160000 /* 00D88 80A6A158 24A5E660 */ addiu $a1, $a1, 0xE660 ## $a1 = 8015E660 -/* 00D8C 80A6A15C 8FA30048 */ lw $v1, 0x0048($sp) -/* 00D90 80A6A160 14400007 */ bne $v0, $zero, .L80A6A180 +/* 00D8C 80A6A15C 8FA30048 */ lw $v1, 0x0048($sp) +/* 00D90 80A6A160 14400007 */ bne $v0, $zero, .L80A6A180 /* 00D94 80A6A164 00403825 */ or $a3, $v0, $zero ## $a3 = 00000000 /* 00D98 80A6A168 8E040150 */ lw $a0, 0x0150($s0) ## 00000150 /* 00D9C 80A6A16C 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 -/* 00DA0 80A6A170 50C40004 */ beql $a2, $a0, .L80A6A184 +/* 00DA0 80A6A170 50C40004 */ beql $a2, $a0, .L80A6A184 /* 00DA4 80A6A174 94AC0ED6 */ lhu $t4, 0x0ED6($a1) ## 8015F536 -/* 00DA8 80A6A178 14800099 */ bne $a0, $zero, .L80A6A3E0 +/* 00DA8 80A6A178 14800099 */ bne $a0, $zero, .L80A6A3E0 /* 00DAC 80A6A17C 00000000 */ nop .L80A6A180: /* 00DB0 80A6A180 94AC0ED6 */ lhu $t4, 0x0ED6($a1) ## 8015F536 @@ -82,240 +82,240 @@ glabel func_80A6A068 /* 00DB4 80A6A184 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 /* 00DB8 80A6A188 26050008 */ addiu $a1, $s0, 0x0008 ## $a1 = 00000008 /* 00DBC 80A6A18C 318D0020 */ andi $t5, $t4, 0x0020 ## $t5 = 00000000 -/* 00DC0 80A6A190 11A00085 */ beq $t5, $zero, .L80A6A3A8 +/* 00DC0 80A6A190 11A00085 */ beq $t5, $zero, .L80A6A3A8 /* 00DC4 80A6A194 26040024 */ addiu $a0, $s0, 0x0024 ## $a0 = 00000024 -/* 00DC8 80A6A198 AFA50034 */ sw $a1, 0x0034($sp) -/* 00DCC 80A6A19C 0C032D9E */ jal func_800CB678 -/* 00DD0 80A6A1A0 AFA7004C */ sw $a3, 0x004C($sp) -/* 00DD4 80A6A1A4 8FA40054 */ lw $a0, 0x0054($sp) -/* 00DD8 80A6A1A8 8FA50034 */ lw $a1, 0x0034($sp) -/* 00DDC 80A6A1AC E7A00044 */ swc1 $f0, 0x0044($sp) -/* 00DE0 80A6A1B0 0C032D9E */ jal func_800CB678 +/* 00DC8 80A6A198 AFA50034 */ sw $a1, 0x0034($sp) +/* 00DCC 80A6A19C 0C032D9E */ jal func_800CB678 +/* 00DD0 80A6A1A0 AFA7004C */ sw $a3, 0x004C($sp) +/* 00DD4 80A6A1A4 8FA40054 */ lw $a0, 0x0054($sp) +/* 00DD8 80A6A1A8 8FA50034 */ lw $a1, 0x0034($sp) +/* 00DDC 80A6A1AC E7A00044 */ swc1 $f0, 0x0044($sp) +/* 00DE0 80A6A1B0 0C032D9E */ jal func_800CB678 /* 00DE4 80A6A1B4 24840024 */ addiu $a0, $a0, 0x0024 ## $a0 = 00000024 /* 00DE8 80A6A1B8 3C01437A */ lui $at, 0x437A ## $at = 437A0000 /* 00DEC 80A6A1BC 44812000 */ mtc1 $at, $f4 ## $f4 = 250.00 /* 00DF0 80A6A1C0 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 -/* 00DF4 80A6A1C4 8FA7004C */ lw $a3, 0x004C($sp) -/* 00DF8 80A6A1C8 4600203C */ c.lt.s $f4, $f0 -/* 00DFC 80A6A1CC C7A20044 */ lwc1 $f2, 0x0044($sp) +/* 00DF4 80A6A1C4 8FA7004C */ lw $a3, 0x004C($sp) +/* 00DF8 80A6A1C8 4600203C */ c.lt.s $f4, $f0 +/* 00DFC 80A6A1CC C7A20044 */ lwc1 $f2, 0x0044($sp) /* 00E00 80A6A1D0 3C014348 */ lui $at, 0x4348 ## $at = 43480000 -/* 00E04 80A6A1D4 45020040 */ bc1fl .L80A6A2D8 -/* 00E08 80A6A1D8 C7A20050 */ lwc1 $f2, 0x0050($sp) +/* 00E04 80A6A1D4 45020040 */ bc1fl .L80A6A2D8 +/* 00E08 80A6A1D8 C7A20050 */ lwc1 $f2, 0x0050($sp) /* 00E0C 80A6A1DC 3C014396 */ lui $at, 0x4396 ## $at = 43960000 /* 00E10 80A6A1E0 44810000 */ mtc1 $at, $f0 ## $f0 = 300.00 /* 00E14 80A6A1E4 24030004 */ addiu $v1, $zero, 0x0004 ## $v1 = 00000004 /* 00E18 80A6A1E8 3C0140C0 */ lui $at, 0x40C0 ## $at = 40C00000 -/* 00E1C 80A6A1EC 4602003E */ c.le.s $f0, $f2 +/* 00E1C 80A6A1EC 4602003E */ c.le.s $f0, $f2 /* 00E20 80A6A1F0 00000000 */ nop -/* 00E24 80A6A1F4 45020006 */ bc1fl .L80A6A210 -/* 00E28 80A6A1F8 4600103C */ c.lt.s $f2, $f0 +/* 00E24 80A6A1F4 45020006 */ bc1fl .L80A6A210 +/* 00E28 80A6A1F8 4600103C */ c.lt.s $f2, $f0 /* 00E2C 80A6A1FC 44813000 */ mtc1 $at, $f6 ## $f6 = 6.00 /* 00E30 80A6A200 8E040150 */ lw $a0, 0x0150($s0) ## 00000150 -/* 00E34 80A6A204 10000076 */ beq $zero, $zero, .L80A6A3E0 +/* 00E34 80A6A204 10000076 */ beq $zero, $zero, .L80A6A3E0 /* 00E38 80A6A208 E6060068 */ swc1 $f6, 0x0068($s0) ## 00000068 -/* 00E3C 80A6A20C 4600103C */ c.lt.s $f2, $f0 +/* 00E3C 80A6A20C 4600103C */ c.lt.s $f2, $f0 .L80A6A210: /* 00E40 80A6A210 3C014316 */ lui $at, 0x4316 ## $at = 43160000 -/* 00E44 80A6A214 4502000D */ bc1fl .L80A6A24C +/* 00E44 80A6A214 4502000D */ bc1fl .L80A6A24C /* 00E48 80A6A218 3C014316 */ lui $at, 0x4316 ## $at = 43160000 /* 00E4C 80A6A21C 44814000 */ mtc1 $at, $f8 ## $f8 = 150.00 /* 00E50 80A6A220 24030003 */ addiu $v1, $zero, 0x0003 ## $v1 = 00000003 /* 00E54 80A6A224 3C014080 */ lui $at, 0x4080 ## $at = 40800000 -/* 00E58 80A6A228 4602403E */ c.le.s $f8, $f2 +/* 00E58 80A6A228 4602403E */ c.le.s $f8, $f2 /* 00E5C 80A6A22C 00000000 */ nop -/* 00E60 80A6A230 45020006 */ bc1fl .L80A6A24C +/* 00E60 80A6A230 45020006 */ bc1fl .L80A6A24C /* 00E64 80A6A234 3C014316 */ lui $at, 0x4316 ## $at = 43160000 /* 00E68 80A6A238 44815000 */ mtc1 $at, $f10 ## $f10 = 150.00 /* 00E6C 80A6A23C 8E040150 */ lw $a0, 0x0150($s0) ## 00000150 -/* 00E70 80A6A240 10000067 */ beq $zero, $zero, .L80A6A3E0 +/* 00E70 80A6A240 10000067 */ beq $zero, $zero, .L80A6A3E0 /* 00E74 80A6A244 E60A0068 */ swc1 $f10, 0x0068($s0) ## 00000068 /* 00E78 80A6A248 3C014316 */ lui $at, 0x4316 ## $at = 43160000 .L80A6A24C: /* 00E7C 80A6A24C 44818000 */ mtc1 $at, $f16 ## $f16 = 150.00 /* 00E80 80A6A250 3C01428C */ lui $at, 0x428C ## $at = 428C0000 -/* 00E84 80A6A254 4610103C */ c.lt.s $f2, $f16 +/* 00E84 80A6A254 4610103C */ c.lt.s $f2, $f16 /* 00E88 80A6A258 00000000 */ nop -/* 00E8C 80A6A25C 4502000E */ bc1fl .L80A6A298 +/* 00E8C 80A6A25C 4502000E */ bc1fl .L80A6A298 /* 00E90 80A6A260 8E040150 */ lw $a0, 0x0150($s0) ## 00000150 /* 00E94 80A6A264 44819000 */ mtc1 $at, $f18 ## $f18 = 70.00 /* 00E98 80A6A268 24030002 */ addiu $v1, $zero, 0x0002 ## $v1 = 00000002 /* 00E9C 80A6A26C 3C014000 */ lui $at, 0x4000 ## $at = 40000000 -/* 00EA0 80A6A270 4602903E */ c.le.s $f18, $f2 +/* 00EA0 80A6A270 4602903E */ c.le.s $f18, $f2 /* 00EA4 80A6A274 00000000 */ nop -/* 00EA8 80A6A278 45020007 */ bc1fl .L80A6A298 +/* 00EA8 80A6A278 45020007 */ bc1fl .L80A6A298 /* 00EAC 80A6A27C 8E040150 */ lw $a0, 0x0150($s0) ## 00000150 /* 00EB0 80A6A280 44812000 */ mtc1 $at, $f4 ## $f4 = 2.00 /* 00EB4 80A6A284 AE0001F0 */ sw $zero, 0x01F0($s0) ## 000001F0 /* 00EB8 80A6A288 8E040150 */ lw $a0, 0x0150($s0) ## 00000150 -/* 00EBC 80A6A28C 10000054 */ beq $zero, $zero, .L80A6A3E0 +/* 00EBC 80A6A28C 10000054 */ beq $zero, $zero, .L80A6A3E0 /* 00EC0 80A6A290 E6040068 */ swc1 $f4, 0x0068($s0) ## 00000068 /* 00EC4 80A6A294 8E040150 */ lw $a0, 0x0150($s0) ## 00000150 .L80A6A298: /* 00EC8 80A6A298 44803000 */ mtc1 $zero, $f6 ## $f6 = 0.00 -/* 00ECC 80A6A29C 14800007 */ bne $a0, $zero, .L80A6A2BC +/* 00ECC 80A6A29C 14800007 */ bne $a0, $zero, .L80A6A2BC /* 00ED0 80A6A2A0 E6060068 */ swc1 $f6, 0x0068($s0) ## 00000068 -/* 00ED4 80A6A2A4 14E60003 */ bne $a3, $a2, .L80A6A2B4 +/* 00ED4 80A6A2A4 14E60003 */ bne $a3, $a2, .L80A6A2B4 /* 00ED8 80A6A2A8 00000000 */ nop -/* 00EDC 80A6A2AC 1000004C */ beq $zero, $zero, .L80A6A3E0 +/* 00EDC 80A6A2AC 1000004C */ beq $zero, $zero, .L80A6A3E0 /* 00EE0 80A6A2B0 00C01825 */ or $v1, $a2, $zero ## $v1 = 00000001 .L80A6A2B4: -/* 00EE4 80A6A2B4 1000004A */ beq $zero, $zero, .L80A6A3E0 +/* 00EE4 80A6A2B4 1000004A */ beq $zero, $zero, .L80A6A3E0 /* 00EE8 80A6A2B8 00001825 */ or $v1, $zero, $zero ## $v1 = 00000000 .L80A6A2BC: -/* 00EEC 80A6A2BC 14E60003 */ bne $a3, $a2, .L80A6A2CC +/* 00EEC 80A6A2BC 14E60003 */ bne $a3, $a2, .L80A6A2CC /* 00EF0 80A6A2C0 00000000 */ nop -/* 00EF4 80A6A2C4 10000046 */ beq $zero, $zero, .L80A6A3E0 +/* 00EF4 80A6A2C4 10000046 */ beq $zero, $zero, .L80A6A3E0 /* 00EF8 80A6A2C8 00001825 */ or $v1, $zero, $zero ## $v1 = 00000000 .L80A6A2CC: -/* 00EFC 80A6A2CC 10000044 */ beq $zero, $zero, .L80A6A3E0 +/* 00EFC 80A6A2CC 10000044 */ beq $zero, $zero, .L80A6A3E0 /* 00F00 80A6A2D0 00C01825 */ or $v1, $a2, $zero ## $v1 = 00000001 -/* 00F04 80A6A2D4 C7A20050 */ lwc1 $f2, 0x0050($sp) +/* 00F04 80A6A2D4 C7A20050 */ lwc1 $f2, 0x0050($sp) .L80A6A2D8: /* 00F08 80A6A2D8 44814000 */ mtc1 $at, $f8 ## $f8 = 2.00 /* 00F0C 80A6A2DC 24030004 */ addiu $v1, $zero, 0x0004 ## $v1 = 00000004 /* 00F10 80A6A2E0 3C014396 */ lui $at, 0x4396 ## $at = 43960000 -/* 00F14 80A6A2E4 4608103C */ c.lt.s $f2, $f8 +/* 00F14 80A6A2E4 4608103C */ c.lt.s $f2, $f8 /* 00F18 80A6A2E8 00000000 */ nop -/* 00F1C 80A6A2EC 45020007 */ bc1fl .L80A6A30C +/* 00F1C 80A6A2EC 45020007 */ bc1fl .L80A6A30C /* 00F20 80A6A2F0 44810000 */ mtc1 $at, $f0 ## $f0 = 300.00 /* 00F24 80A6A2F4 3C0140C0 */ lui $at, 0x40C0 ## $at = 40C00000 /* 00F28 80A6A2F8 44815000 */ mtc1 $at, $f10 ## $f10 = 6.00 /* 00F2C 80A6A2FC 8E040150 */ lw $a0, 0x0150($s0) ## 00000150 -/* 00F30 80A6A300 10000037 */ beq $zero, $zero, .L80A6A3E0 +/* 00F30 80A6A300 10000037 */ beq $zero, $zero, .L80A6A3E0 /* 00F34 80A6A304 E60A0068 */ swc1 $f10, 0x0068($s0) ## 00000068 /* 00F38 80A6A308 44810000 */ mtc1 $at, $f0 ## $f0 = 6.00 .L80A6A30C: /* 00F3C 80A6A30C 24030003 */ addiu $v1, $zero, 0x0003 ## $v1 = 00000003 /* 00F40 80A6A310 3C0143C8 */ lui $at, 0x43C8 ## $at = 43C80000 -/* 00F44 80A6A314 4600103C */ c.lt.s $f2, $f0 +/* 00F44 80A6A314 4600103C */ c.lt.s $f2, $f0 /* 00F48 80A6A318 00000000 */ nop -/* 00F4C 80A6A31C 45020007 */ bc1fl .L80A6A33C +/* 00F4C 80A6A31C 45020007 */ bc1fl .L80A6A33C /* 00F50 80A6A320 44819000 */ mtc1 $at, $f18 ## $f18 = 400.00 /* 00F54 80A6A324 3C014080 */ lui $at, 0x4080 ## $at = 40800000 /* 00F58 80A6A328 44818000 */ mtc1 $at, $f16 ## $f16 = 4.00 /* 00F5C 80A6A32C 8E040150 */ lw $a0, 0x0150($s0) ## 00000150 -/* 00F60 80A6A330 1000002B */ beq $zero, $zero, .L80A6A3E0 +/* 00F60 80A6A330 1000002B */ beq $zero, $zero, .L80A6A3E0 /* 00F64 80A6A334 E6100068 */ swc1 $f16, 0x0068($s0) ## 00000068 /* 00F68 80A6A338 44819000 */ mtc1 $at, $f18 ## $f18 = 4.00 .L80A6A33C: /* 00F6C 80A6A33C 24030002 */ addiu $v1, $zero, 0x0002 ## $v1 = 00000002 /* 00F70 80A6A340 3C014000 */ lui $at, 0x4000 ## $at = 40000000 -/* 00F74 80A6A344 4612103C */ c.lt.s $f2, $f18 +/* 00F74 80A6A344 4612103C */ c.lt.s $f2, $f18 /* 00F78 80A6A348 00000000 */ nop -/* 00F7C 80A6A34C 45020007 */ bc1fl .L80A6A36C +/* 00F7C 80A6A34C 45020007 */ bc1fl .L80A6A36C /* 00F80 80A6A350 8E040150 */ lw $a0, 0x0150($s0) ## 00000150 /* 00F84 80A6A354 44812000 */ mtc1 $at, $f4 ## $f4 = 2.00 /* 00F88 80A6A358 AE0001F0 */ sw $zero, 0x01F0($s0) ## 000001F0 /* 00F8C 80A6A35C 8E040150 */ lw $a0, 0x0150($s0) ## 00000150 -/* 00F90 80A6A360 1000001F */ beq $zero, $zero, .L80A6A3E0 +/* 00F90 80A6A360 1000001F */ beq $zero, $zero, .L80A6A3E0 /* 00F94 80A6A364 E6040068 */ swc1 $f4, 0x0068($s0) ## 00000068 /* 00F98 80A6A368 8E040150 */ lw $a0, 0x0150($s0) ## 00000150 .L80A6A36C: /* 00F9C 80A6A36C 44803000 */ mtc1 $zero, $f6 ## $f6 = 0.00 -/* 00FA0 80A6A370 14800007 */ bne $a0, $zero, .L80A6A390 +/* 00FA0 80A6A370 14800007 */ bne $a0, $zero, .L80A6A390 /* 00FA4 80A6A374 E6060068 */ swc1 $f6, 0x0068($s0) ## 00000068 -/* 00FA8 80A6A378 14E60003 */ bne $a3, $a2, .L80A6A388 +/* 00FA8 80A6A378 14E60003 */ bne $a3, $a2, .L80A6A388 /* 00FAC 80A6A37C 00000000 */ nop -/* 00FB0 80A6A380 10000017 */ beq $zero, $zero, .L80A6A3E0 +/* 00FB0 80A6A380 10000017 */ beq $zero, $zero, .L80A6A3E0 /* 00FB4 80A6A384 00C01825 */ or $v1, $a2, $zero ## $v1 = 00000001 .L80A6A388: -/* 00FB8 80A6A388 10000015 */ beq $zero, $zero, .L80A6A3E0 +/* 00FB8 80A6A388 10000015 */ beq $zero, $zero, .L80A6A3E0 /* 00FBC 80A6A38C 00001825 */ or $v1, $zero, $zero ## $v1 = 00000000 .L80A6A390: -/* 00FC0 80A6A390 14E60003 */ bne $a3, $a2, .L80A6A3A0 +/* 00FC0 80A6A390 14E60003 */ bne $a3, $a2, .L80A6A3A0 /* 00FC4 80A6A394 00000000 */ nop -/* 00FC8 80A6A398 10000011 */ beq $zero, $zero, .L80A6A3E0 +/* 00FC8 80A6A398 10000011 */ beq $zero, $zero, .L80A6A3E0 /* 00FCC 80A6A39C 00001825 */ or $v1, $zero, $zero ## $v1 = 00000000 .L80A6A3A0: -/* 00FD0 80A6A3A0 1000000F */ beq $zero, $zero, .L80A6A3E0 +/* 00FD0 80A6A3A0 1000000F */ beq $zero, $zero, .L80A6A3E0 /* 00FD4 80A6A3A4 00C01825 */ or $v1, $a2, $zero ## $v1 = 00000001 .L80A6A3A8: /* 00FD8 80A6A3A8 8E040150 */ lw $a0, 0x0150($s0) ## 00000150 /* 00FDC 80A6A3AC 44804000 */ mtc1 $zero, $f8 ## $f8 = 0.00 -/* 00FE0 80A6A3B0 14800007 */ bne $a0, $zero, .L80A6A3D0 +/* 00FE0 80A6A3B0 14800007 */ bne $a0, $zero, .L80A6A3D0 /* 00FE4 80A6A3B4 E6080068 */ swc1 $f8, 0x0068($s0) ## 00000068 -/* 00FE8 80A6A3B8 14460003 */ bne $v0, $a2, .L80A6A3C8 +/* 00FE8 80A6A3B8 14460003 */ bne $v0, $a2, .L80A6A3C8 /* 00FEC 80A6A3BC 00000000 */ nop -/* 00FF0 80A6A3C0 10000007 */ beq $zero, $zero, .L80A6A3E0 +/* 00FF0 80A6A3C0 10000007 */ beq $zero, $zero, .L80A6A3E0 /* 00FF4 80A6A3C4 00C01825 */ or $v1, $a2, $zero ## $v1 = 00000001 .L80A6A3C8: -/* 00FF8 80A6A3C8 10000005 */ beq $zero, $zero, .L80A6A3E0 +/* 00FF8 80A6A3C8 10000005 */ beq $zero, $zero, .L80A6A3E0 /* 00FFC 80A6A3CC 00001825 */ or $v1, $zero, $zero ## $v1 = 00000000 .L80A6A3D0: -/* 01000 80A6A3D0 14460003 */ bne $v0, $a2, .L80A6A3E0 +/* 01000 80A6A3D0 14460003 */ bne $v0, $a2, .L80A6A3E0 /* 01004 80A6A3D4 00C01825 */ or $v1, $a2, $zero ## $v1 = 00000001 -/* 01008 80A6A3D8 10000001 */ beq $zero, $zero, .L80A6A3E0 +/* 01008 80A6A3D8 10000001 */ beq $zero, $zero, .L80A6A3E0 /* 0100C 80A6A3DC 00001825 */ or $v1, $zero, $zero ## $v1 = 00000000 .L80A6A3E0: -/* 01010 80A6A3E0 54640004 */ bnel $v1, $a0, .L80A6A3F4 +/* 01010 80A6A3E0 54640004 */ bnel $v1, $a0, .L80A6A3F4 /* 01014 80A6A3E4 AE030150 */ sw $v1, 0x0150($s0) ## 00000150 -/* 01018 80A6A3E8 14E6001E */ bne $a3, $a2, .L80A6A464 +/* 01018 80A6A3E8 14E6001E */ bne $a3, $a2, .L80A6A464 /* 0101C 80A6A3EC 00000000 */ nop /* 01020 80A6A3F0 AE030150 */ sw $v1, 0x0150($s0) ## 00000150 .L80A6A3F4: -/* 01024 80A6A3F4 0C29A569 */ jal func_80A695A4 +/* 01024 80A6A3F4 0C29A569 */ jal func_80A695A4 /* 01028 80A6A3F8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0102C 80A6A3FC E7A00038 */ swc1 $f0, 0x0038($sp) +/* 0102C 80A6A3FC E7A00038 */ swc1 $f0, 0x0038($sp) /* 01030 80A6A400 8E0E0150 */ lw $t6, 0x0150($s0) ## 00000150 /* 01034 80A6A404 3C0480A7 */ lui $a0, %hi(D_80A6AEE0) ## $a0 = 80A70000 -/* 01038 80A6A408 000E7880 */ sll $t7, $t6, 2 -/* 0103C 80A6A40C 008F2021 */ addu $a0, $a0, $t7 +/* 01038 80A6A408 000E7880 */ sll $t7, $t6, 2 +/* 0103C 80A6A40C 008F2021 */ addu $a0, $a0, $t7 /* 01040 80A6A410 0C028800 */ jal SkelAnime_GetFrameCount - -/* 01044 80A6A414 8C84AEE0 */ lw $a0, %lo(D_80A6AEE0)($a0) + +/* 01044 80A6A414 8C84AEE0 */ lw $a0, %lo(D_80A6AEE0)($a0) /* 01048 80A6A418 44825000 */ mtc1 $v0, $f10 ## $f10 = 0.00 /* 0104C 80A6A41C 8E180150 */ lw $t8, 0x0150($s0) ## 00000150 /* 01050 80A6A420 3C01C0A0 */ lui $at, 0xC0A0 ## $at = C0A00000 -/* 01054 80A6A424 46805420 */ cvt.s.w $f16, $f10 +/* 01054 80A6A424 46805420 */ cvt.s.w $f16, $f10 /* 01058 80A6A428 44819000 */ mtc1 $at, $f18 ## $f18 = -5.00 /* 0105C 80A6A42C 3C0580A7 */ lui $a1, %hi(D_80A6AEE0) ## $a1 = 80A70000 -/* 01060 80A6A430 0018C880 */ sll $t9, $t8, 2 -/* 01064 80A6A434 00B92821 */ addu $a1, $a1, $t9 +/* 01060 80A6A430 0018C880 */ sll $t9, $t8, 2 +/* 01064 80A6A434 00B92821 */ addu $a1, $a1, $t9 /* 01068 80A6A438 24080002 */ addiu $t0, $zero, 0x0002 ## $t0 = 00000002 -/* 0106C 80A6A43C AFA80014 */ sw $t0, 0x0014($sp) -/* 01070 80A6A440 8CA5AEE0 */ lw $a1, %lo(D_80A6AEE0)($a1) -/* 01074 80A6A444 E7B00010 */ swc1 $f16, 0x0010($sp) -/* 01078 80A6A448 8FA40030 */ lw $a0, 0x0030($sp) -/* 0107C 80A6A44C 8FA60038 */ lw $a2, 0x0038($sp) +/* 0106C 80A6A43C AFA80014 */ sw $t0, 0x0014($sp) +/* 01070 80A6A440 8CA5AEE0 */ lw $a1, %lo(D_80A6AEE0)($a1) +/* 01074 80A6A444 E7B00010 */ swc1 $f16, 0x0010($sp) +/* 01078 80A6A448 8FA40030 */ lw $a0, 0x0030($sp) +/* 0107C 80A6A44C 8FA60038 */ lw $a2, 0x0038($sp) /* 01080 80A6A450 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 01084 80A6A454 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 01088 80A6A458 E7B20018 */ swc1 $f18, 0x0018($sp) -/* 0108C 80A6A45C 1000001B */ beq $zero, $zero, .L80A6A4CC -/* 01090 80A6A460 8FBF002C */ lw $ra, 0x002C($sp) +/* 01084 80A6A454 0C029468 */ jal SkelAnime_ChangeAnim + +/* 01088 80A6A458 E7B20018 */ swc1 $f18, 0x0018($sp) +/* 0108C 80A6A45C 1000001B */ beq $zero, $zero, .L80A6A4CC +/* 01090 80A6A460 8FBF002C */ lw $ra, 0x002C($sp) .L80A6A464: -/* 01094 80A6A464 0C29A569 */ jal func_80A695A4 +/* 01094 80A6A464 0C29A569 */ jal func_80A695A4 /* 01098 80A6A468 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0109C 80A6A46C E7A00038 */ swc1 $f0, 0x0038($sp) +/* 0109C 80A6A46C E7A00038 */ swc1 $f0, 0x0038($sp) /* 010A0 80A6A470 8E090150 */ lw $t1, 0x0150($s0) ## 00000150 /* 010A4 80A6A474 3C0480A7 */ lui $a0, %hi(D_80A6AEE0) ## $a0 = 80A70000 -/* 010A8 80A6A478 00095080 */ sll $t2, $t1, 2 -/* 010AC 80A6A47C 008A2021 */ addu $a0, $a0, $t2 +/* 010A8 80A6A478 00095080 */ sll $t2, $t1, 2 +/* 010AC 80A6A47C 008A2021 */ addu $a0, $a0, $t2 /* 010B0 80A6A480 0C028800 */ jal SkelAnime_GetFrameCount - -/* 010B4 80A6A484 8C84AEE0 */ lw $a0, %lo(D_80A6AEE0)($a0) + +/* 010B4 80A6A484 8C84AEE0 */ lw $a0, %lo(D_80A6AEE0)($a0) /* 010B8 80A6A488 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 010BC 80A6A48C 8E0B0150 */ lw $t3, 0x0150($s0) ## 00000150 /* 010C0 80A6A490 44804000 */ mtc1 $zero, $f8 ## $f8 = 0.00 -/* 010C4 80A6A494 468021A0 */ cvt.s.w $f6, $f4 +/* 010C4 80A6A494 468021A0 */ cvt.s.w $f6, $f4 /* 010C8 80A6A498 3C0580A7 */ lui $a1, %hi(D_80A6AEE0) ## $a1 = 80A70000 /* 010CC 80A6A49C 8E0701B8 */ lw $a3, 0x01B8($s0) ## 000001B8 -/* 010D0 80A6A4A0 000B6080 */ sll $t4, $t3, 2 -/* 010D4 80A6A4A4 00AC2821 */ addu $a1, $a1, $t4 +/* 010D0 80A6A4A0 000B6080 */ sll $t4, $t3, 2 +/* 010D4 80A6A4A4 00AC2821 */ addu $a1, $a1, $t4 /* 010D8 80A6A4A8 240D0002 */ addiu $t5, $zero, 0x0002 ## $t5 = 00000002 -/* 010DC 80A6A4AC AFAD0014 */ sw $t5, 0x0014($sp) -/* 010E0 80A6A4B0 8CA5AEE0 */ lw $a1, %lo(D_80A6AEE0)($a1) -/* 010E4 80A6A4B4 E7A60010 */ swc1 $f6, 0x0010($sp) -/* 010E8 80A6A4B8 8FA40030 */ lw $a0, 0x0030($sp) -/* 010EC 80A6A4BC 8FA60038 */ lw $a2, 0x0038($sp) -/* 010F0 80A6A4C0 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 010F4 80A6A4C4 E7A80018 */ swc1 $f8, 0x0018($sp) -/* 010F8 80A6A4C8 8FBF002C */ lw $ra, 0x002C($sp) +/* 010DC 80A6A4AC AFAD0014 */ sw $t5, 0x0014($sp) +/* 010E0 80A6A4B0 8CA5AEE0 */ lw $a1, %lo(D_80A6AEE0)($a1) +/* 010E4 80A6A4B4 E7A60010 */ swc1 $f6, 0x0010($sp) +/* 010E8 80A6A4B8 8FA40030 */ lw $a0, 0x0030($sp) +/* 010EC 80A6A4BC 8FA60038 */ lw $a2, 0x0038($sp) +/* 010F0 80A6A4C0 0C029468 */ jal SkelAnime_ChangeAnim + +/* 010F4 80A6A4C4 E7A80018 */ swc1 $f8, 0x0018($sp) +/* 010F8 80A6A4C8 8FBF002C */ lw $ra, 0x002C($sp) .L80A6A4CC: -/* 010FC 80A6A4CC 8FB00028 */ lw $s0, 0x0028($sp) +/* 010FC 80A6A4CC 8FB00028 */ lw $s0, 0x0028($sp) /* 01100 80A6A4D0 27BD0058 */ addiu $sp, $sp, 0x0058 ## $sp = 00000000 -/* 01104 80A6A4D4 03E00008 */ jr $ra +/* 01104 80A6A4D4 03E00008 */ jr $ra /* 01108 80A6A4D8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse_Link_Child/func_80A6A4DC.s b/asm/non_matchings/overlays/actors/ovl_En_Horse_Link_Child/func_80A6A4DC.s index 27c8c7d35b..1a718a999a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse_Link_Child/func_80A6A4DC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse_Link_Child/func_80A6A4DC.s @@ -1,7 +1,7 @@ glabel func_80A6A4DC /* 0110C 80A6A4DC 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 01110 80A6A4E0 AFBF002C */ sw $ra, 0x002C($sp) -/* 01114 80A6A4E4 AFB00028 */ sw $s0, 0x0028($sp) +/* 01110 80A6A4E0 AFBF002C */ sw $ra, 0x002C($sp) +/* 01114 80A6A4E4 AFB00028 */ sw $s0, 0x0028($sp) /* 01118 80A6A4E8 240E0005 */ addiu $t6, $zero, 0x0005 ## $t6 = 00000005 /* 0111C 80A6A4EC 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 01120 80A6A4F0 0C03F66B */ jal Math_Rand_ZeroOne @@ -11,47 +11,47 @@ glabel func_80A6A4DC /* 0112C 80A6A4FC 44812000 */ mtc1 $at, $f4 ## $f4 = 0.50 /* 01130 80A6A500 240F0001 */ addiu $t7, $zero, 0x0001 ## $t7 = 00000001 /* 01134 80A6A504 3C188016 */ lui $t8, 0x8016 ## $t8 = 80160000 -/* 01138 80A6A508 4600203C */ c.lt.s $f4, $f0 +/* 01138 80A6A508 4600203C */ c.lt.s $f4, $f0 /* 0113C 80A6A50C 00000000 */ nop -/* 01140 80A6A510 45020004 */ bc1fl .L80A6A524 +/* 01140 80A6A510 45020004 */ bc1fl .L80A6A524 /* 01144 80A6A514 AE0F0150 */ sw $t7, 0x0150($s0) ## 00000150 -/* 01148 80A6A518 10000002 */ beq $zero, $zero, .L80A6A524 +/* 01148 80A6A518 10000002 */ beq $zero, $zero, .L80A6A524 /* 0114C 80A6A51C AE000150 */ sw $zero, 0x0150($s0) ## 00000150 /* 01150 80A6A520 AE0F0150 */ sw $t7, 0x0150($s0) ## 00000150 .L80A6A524: /* 01154 80A6A524 8F18FA90 */ lw $t8, -0x0570($t8) ## 8015FA90 /* 01158 80A6A528 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0115C 80A6A52C 0C29A569 */ jal func_80A695A4 +/* 0115C 80A6A52C 0C29A569 */ jal func_80A695A4 /* 01160 80A6A530 A70005BE */ sh $zero, 0x05BE($t8) ## 801605BE -/* 01164 80A6A534 E7A00030 */ swc1 $f0, 0x0030($sp) +/* 01164 80A6A534 E7A00030 */ swc1 $f0, 0x0030($sp) /* 01168 80A6A538 8E190150 */ lw $t9, 0x0150($s0) ## 00000150 /* 0116C 80A6A53C 3C0480A7 */ lui $a0, %hi(D_80A6AEE0) ## $a0 = 80A70000 -/* 01170 80A6A540 00194080 */ sll $t0, $t9, 2 -/* 01174 80A6A544 00882021 */ addu $a0, $a0, $t0 +/* 01170 80A6A540 00194080 */ sll $t0, $t9, 2 +/* 01174 80A6A544 00882021 */ addu $a0, $a0, $t0 /* 01178 80A6A548 0C028800 */ jal SkelAnime_GetFrameCount - -/* 0117C 80A6A54C 8C84AEE0 */ lw $a0, %lo(D_80A6AEE0)($a0) + +/* 0117C 80A6A54C 8C84AEE0 */ lw $a0, %lo(D_80A6AEE0)($a0) /* 01180 80A6A550 44823000 */ mtc1 $v0, $f6 ## $f6 = 0.00 /* 01184 80A6A554 8E090150 */ lw $t1, 0x0150($s0) ## 00000150 /* 01188 80A6A558 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 0118C 80A6A55C 46803220 */ cvt.s.w $f8, $f6 +/* 0118C 80A6A55C 46803220 */ cvt.s.w $f8, $f6 /* 01190 80A6A560 3C0580A7 */ lui $a1, %hi(D_80A6AEE0) ## $a1 = 80A70000 -/* 01194 80A6A564 00095080 */ sll $t2, $t1, 2 -/* 01198 80A6A568 00AA2821 */ addu $a1, $a1, $t2 +/* 01194 80A6A564 00095080 */ sll $t2, $t1, 2 +/* 01198 80A6A568 00AA2821 */ addu $a1, $a1, $t2 /* 0119C 80A6A56C 240B0002 */ addiu $t3, $zero, 0x0002 ## $t3 = 00000002 -/* 011A0 80A6A570 44070000 */ mfc1 $a3, $f0 -/* 011A4 80A6A574 AFAB0014 */ sw $t3, 0x0014($sp) -/* 011A8 80A6A578 8CA5AEE0 */ lw $a1, %lo(D_80A6AEE0)($a1) -/* 011AC 80A6A57C E7A80010 */ swc1 $f8, 0x0010($sp) +/* 011A0 80A6A570 44070000 */ mfc1 $a3, $f0 +/* 011A4 80A6A574 AFAB0014 */ sw $t3, 0x0014($sp) +/* 011A8 80A6A578 8CA5AEE0 */ lw $a1, %lo(D_80A6AEE0)($a1) +/* 011AC 80A6A57C E7A80010 */ swc1 $f8, 0x0010($sp) /* 011B0 80A6A580 260401A0 */ addiu $a0, $s0, 0x01A0 ## $a0 = 000001A0 -/* 011B4 80A6A584 8FA60030 */ lw $a2, 0x0030($sp) -/* 011B8 80A6A588 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 011BC 80A6A58C E7A00018 */ swc1 $f0, 0x0018($sp) -/* 011C0 80A6A590 8FBF002C */ lw $ra, 0x002C($sp) -/* 011C4 80A6A594 8FB00028 */ lw $s0, 0x0028($sp) +/* 011B4 80A6A584 8FA60030 */ lw $a2, 0x0030($sp) +/* 011B8 80A6A588 0C029468 */ jal SkelAnime_ChangeAnim + +/* 011BC 80A6A58C E7A00018 */ swc1 $f0, 0x0018($sp) +/* 011C0 80A6A590 8FBF002C */ lw $ra, 0x002C($sp) +/* 011C4 80A6A594 8FB00028 */ lw $s0, 0x0028($sp) /* 011C8 80A6A598 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 -/* 011CC 80A6A59C 03E00008 */ jr $ra +/* 011CC 80A6A59C 03E00008 */ jr $ra /* 011D0 80A6A5A0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse_Link_Child/func_80A6A5A4.s b/asm/non_matchings/overlays/actors/ovl_En_Horse_Link_Child/func_80A6A5A4.s index 68d13a71de..b35170cb7e 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse_Link_Child/func_80A6A5A4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse_Link_Child/func_80A6A5A4.s @@ -2,109 +2,109 @@ glabel func_80A6A5A4 /* 011D4 80A6A5A4 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 /* 011D8 80A6A5A8 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 /* 011DC 80A6A5AC 8C42FA90 */ lw $v0, -0x0570($v0) ## 8015FA90 -/* 011E0 80A6A5B0 AFBF002C */ sw $ra, 0x002C($sp) -/* 011E4 80A6A5B4 AFB00028 */ sw $s0, 0x0028($sp) -/* 011E8 80A6A5B8 AFA5003C */ sw $a1, 0x003C($sp) +/* 011E0 80A6A5B0 AFBF002C */ sw $ra, 0x002C($sp) +/* 011E4 80A6A5B4 AFB00028 */ sw $s0, 0x0028($sp) +/* 011E8 80A6A5B8 AFA5003C */ sw $a1, 0x003C($sp) /* 011EC 80A6A5BC 844E05BE */ lh $t6, 0x05BE($v0) ## 801605BE /* 011F0 80A6A5C0 3C078013 */ lui $a3, 0x8013 ## $a3 = 80130000 /* 011F4 80A6A5C4 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 011F8 80A6A5C8 11C0000E */ beq $t6, $zero, .L80A6A604 +/* 011F8 80A6A5C8 11C0000E */ beq $t6, $zero, .L80A6A604 /* 011FC 80A6A5CC 24E733E0 */ addiu $a3, $a3, 0x33E0 ## $a3 = 801333E0 /* 01200 80A6A5D0 3C0F8013 */ lui $t7, 0x8013 ## $t7 = 80130000 /* 01204 80A6A5D4 A44005BE */ sh $zero, 0x05BE($v0) ## 801605BE /* 01208 80A6A5D8 25EF33E8 */ addiu $t7, $t7, 0x33E8 ## $t7 = 801333E8 -/* 0120C 80A6A5DC AFAF0014 */ sw $t7, 0x0014($sp) -/* 01210 80A6A5E0 AFA70010 */ sw $a3, 0x0010($sp) +/* 0120C 80A6A5DC AFAF0014 */ sw $t7, 0x0014($sp) +/* 01210 80A6A5E0 AFA70010 */ sw $a3, 0x0010($sp) /* 01214 80A6A5E4 24042844 */ addiu $a0, $zero, 0x2844 ## $a0 = 00002844 /* 01218 80A6A5E8 260500E4 */ addiu $a1, $s0, 0x00E4 ## $a1 = 000000E4 /* 0121C 80A6A5EC 0C03DCE3 */ jal Audio_PlaySoundGeneral - + /* 01220 80A6A5F0 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 -/* 01224 80A6A5F4 0C29A9C9 */ jal func_80A6A724 +/* 01224 80A6A5F4 0C29A9C9 */ jal func_80A6A724 /* 01228 80A6A5F8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0122C 80A6A5FC 10000045 */ beq $zero, $zero, .L80A6A714 -/* 01230 80A6A600 8FBF002C */ lw $ra, 0x002C($sp) +/* 0122C 80A6A5FC 10000045 */ beq $zero, $zero, .L80A6A714 +/* 01230 80A6A600 8FBF002C */ lw $ra, 0x002C($sp) .L80A6A604: /* 01234 80A6A604 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 /* 01238 80A6A608 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 0123C 80A6A60C E6040068 */ swc1 $f4, 0x0068($s0) ## 00000068 -/* 01240 80A6A610 8FB8003C */ lw $t8, 0x003C($sp) -/* 01244 80A6A614 0C00B69E */ jal func_8002DA78 +/* 01240 80A6A610 8FB8003C */ lw $t8, 0x003C($sp) +/* 01244 80A6A614 0C00B69E */ jal func_8002DA78 /* 01248 80A6A618 8F051C44 */ lw $a1, 0x1C44($t8) ## 00001C44 /* 0124C 80A6A61C 86190032 */ lh $t9, 0x0032($s0) ## 00000032 -/* 01250 80A6A620 00592023 */ subu $a0, $v0, $t9 -/* 01254 80A6A624 00042400 */ sll $a0, $a0, 16 -/* 01258 80A6A628 00042403 */ sra $a0, $a0, 16 +/* 01250 80A6A620 00592023 */ subu $a0, $v0, $t9 +/* 01254 80A6A624 00042400 */ sll $a0, $a0, 16 +/* 01258 80A6A628 00042403 */ sra $a0, $a0, 16 /* 0125C 80A6A62C 0C01DE0D */ jal Math_Coss ## coss? -/* 01260 80A6A630 A7A40036 */ sh $a0, 0x0036($sp) +/* 01260 80A6A630 A7A40036 */ sh $a0, 0x0036($sp) /* 01264 80A6A634 3C0180A7 */ lui $at, %hi(D_80A6AFF0) ## $at = 80A70000 -/* 01268 80A6A638 C426AFF0 */ lwc1 $f6, %lo(D_80A6AFF0)($at) -/* 0126C 80A6A63C 4606003C */ c.lt.s $f0, $f6 +/* 01268 80A6A638 C426AFF0 */ lwc1 $f6, %lo(D_80A6AFF0)($at) +/* 0126C 80A6A63C 4606003C */ c.lt.s $f0, $f6 /* 01270 80A6A640 00000000 */ nop -/* 01274 80A6A644 4502000B */ bc1fl .L80A6A674 +/* 01274 80A6A644 4502000B */ bc1fl .L80A6A674 /* 01278 80A6A648 260401A0 */ addiu $a0, $s0, 0x01A0 ## $a0 = 000001A0 /* 0127C 80A6A64C 8E080150 */ lw $t0, 0x0150($s0) ## 00000150 /* 01280 80A6A650 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 01284 80A6A654 8FA9003C */ lw $t1, 0x003C($sp) -/* 01288 80A6A658 15010005 */ bne $t0, $at, .L80A6A670 +/* 01284 80A6A654 8FA9003C */ lw $t1, 0x003C($sp) +/* 01288 80A6A658 15010005 */ bne $t0, $at, .L80A6A670 /* 0128C 80A6A65C 2406012C */ addiu $a2, $zero, 0x012C ## $a2 = 0000012C /* 01290 80A6A660 8D251C44 */ lw $a1, 0x1C44($t1) ## 00001C44 /* 01294 80A6A664 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01298 80A6A668 0C01B767 */ jal func_8006DD9C +/* 01298 80A6A668 0C01B767 */ jal func_8006DD9C /* 0129C 80A6A66C 24A50024 */ addiu $a1, $a1, 0x0024 ## $a1 = 00000024 .L80A6A670: /* 012A0 80A6A670 260401A0 */ addiu $a0, $s0, 0x01A0 ## $a0 = 000001A0 .L80A6A674: /* 012A4 80A6A674 0C02927F */ jal SkelAnime_FrameUpdateMatrix - -/* 012A8 80A6A678 AFA40030 */ sw $a0, 0x0030($sp) -/* 012AC 80A6A67C 50400025 */ beql $v0, $zero, .L80A6A714 -/* 012B0 80A6A680 8FBF002C */ lw $ra, 0x002C($sp) + +/* 012A8 80A6A678 AFA40030 */ sw $a0, 0x0030($sp) +/* 012AC 80A6A67C 50400025 */ beql $v0, $zero, .L80A6A714 +/* 012B0 80A6A680 8FBF002C */ lw $ra, 0x002C($sp) /* 012B4 80A6A684 0C01DE0D */ jal Math_Coss ## coss? -/* 012B8 80A6A688 87A40036 */ lh $a0, 0x0036($sp) +/* 012B8 80A6A688 87A40036 */ lh $a0, 0x0036($sp) /* 012BC 80A6A68C 44804000 */ mtc1 $zero, $f8 ## $f8 = 0.00 /* 012C0 80A6A690 240A0002 */ addiu $t2, $zero, 0x0002 ## $t2 = 00000002 /* 012C4 80A6A694 3C0480A7 */ lui $a0, %hi(D_80A6AEE8) ## $a0 = 80A70000 -/* 012C8 80A6A698 4608003C */ c.lt.s $f0, $f8 +/* 012C8 80A6A698 4608003C */ c.lt.s $f0, $f8 /* 012CC 80A6A69C 00000000 */ nop -/* 012D0 80A6A6A0 45000019 */ bc1f .L80A6A708 +/* 012D0 80A6A6A0 45000019 */ bc1f .L80A6A708 /* 012D4 80A6A6A4 00000000 */ nop /* 012D8 80A6A6A8 AE0A0150 */ sw $t2, 0x0150($s0) ## 00000150 /* 012DC 80A6A6AC 0C028800 */ jal SkelAnime_GetFrameCount - -/* 012E0 80A6A6B0 8C84AEE8 */ lw $a0, %lo(D_80A6AEE8)($a0) + +/* 012E0 80A6A6B0 8C84AEE8 */ lw $a0, %lo(D_80A6AEE8)($a0) /* 012E4 80A6A6B4 44825000 */ mtc1 $v0, $f10 ## $f10 = 0.00 /* 012E8 80A6A6B8 8E030150 */ lw $v1, 0x0150($s0) ## 00000150 /* 012EC 80A6A6BC 3C01C0A0 */ lui $at, 0xC0A0 ## $at = C0A00000 -/* 012F0 80A6A6C0 46805420 */ cvt.s.w $f16, $f10 -/* 012F4 80A6A6C4 00031880 */ sll $v1, $v1, 2 +/* 012F0 80A6A6C0 46805420 */ cvt.s.w $f16, $f10 +/* 012F4 80A6A6C4 00031880 */ sll $v1, $v1, 2 /* 012F8 80A6A6C8 44819000 */ mtc1 $at, $f18 ## $f18 = -5.00 /* 012FC 80A6A6CC 3C0580A7 */ lui $a1, %hi(D_80A6AEE0) ## $a1 = 80A70000 /* 01300 80A6A6D0 3C0680A7 */ lui $a2, %hi(D_80A6AF64) ## $a2 = 80A70000 -/* 01304 80A6A6D4 00C33021 */ addu $a2, $a2, $v1 -/* 01308 80A6A6D8 00A32821 */ addu $a1, $a1, $v1 +/* 01304 80A6A6D4 00C33021 */ addu $a2, $a2, $v1 +/* 01308 80A6A6D8 00A32821 */ addu $a1, $a1, $v1 /* 0130C 80A6A6DC 240B0002 */ addiu $t3, $zero, 0x0002 ## $t3 = 00000002 -/* 01310 80A6A6E0 AFAB0014 */ sw $t3, 0x0014($sp) -/* 01314 80A6A6E4 8CA5AEE0 */ lw $a1, %lo(D_80A6AEE0)($a1) -/* 01318 80A6A6E8 8CC6AF64 */ lw $a2, %lo(D_80A6AF64)($a2) -/* 0131C 80A6A6EC E7B00010 */ swc1 $f16, 0x0010($sp) -/* 01320 80A6A6F0 8FA40030 */ lw $a0, 0x0030($sp) +/* 01310 80A6A6E0 AFAB0014 */ sw $t3, 0x0014($sp) +/* 01314 80A6A6E4 8CA5AEE0 */ lw $a1, %lo(D_80A6AEE0)($a1) +/* 01318 80A6A6E8 8CC6AF64 */ lw $a2, %lo(D_80A6AF64)($a2) +/* 0131C 80A6A6EC E7B00010 */ swc1 $f16, 0x0010($sp) +/* 01320 80A6A6F0 8FA40030 */ lw $a0, 0x0030($sp) /* 01324 80A6A6F4 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 01328 80A6A6F8 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 0132C 80A6A6FC E7B20018 */ swc1 $f18, 0x0018($sp) -/* 01330 80A6A700 10000004 */ beq $zero, $zero, .L80A6A714 -/* 01334 80A6A704 8FBF002C */ lw $ra, 0x002C($sp) +/* 01328 80A6A6F8 0C029468 */ jal SkelAnime_ChangeAnim + +/* 0132C 80A6A6FC E7B20018 */ swc1 $f18, 0x0018($sp) +/* 01330 80A6A700 10000004 */ beq $zero, $zero, .L80A6A714 +/* 01334 80A6A704 8FBF002C */ lw $ra, 0x002C($sp) .L80A6A708: -/* 01338 80A6A708 0C29A937 */ jal func_80A6A4DC +/* 01338 80A6A708 0C29A937 */ jal func_80A6A4DC /* 0133C 80A6A70C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01340 80A6A710 8FBF002C */ lw $ra, 0x002C($sp) +/* 01340 80A6A710 8FBF002C */ lw $ra, 0x002C($sp) .L80A6A714: -/* 01344 80A6A714 8FB00028 */ lw $s0, 0x0028($sp) +/* 01344 80A6A714 8FB00028 */ lw $s0, 0x0028($sp) /* 01348 80A6A718 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 -/* 0134C 80A6A71C 03E00008 */ jr $ra +/* 0134C 80A6A71C 03E00008 */ jr $ra /* 01350 80A6A720 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse_Link_Child/func_80A6A724.s b/asm/non_matchings/overlays/actors/ovl_En_Horse_Link_Child/func_80A6A724.s index ede27d0fbe..c4877a64e8 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse_Link_Child/func_80A6A724.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse_Link_Child/func_80A6A724.s @@ -1,7 +1,7 @@ glabel func_80A6A724 /* 01354 80A6A724 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 01358 80A6A728 AFBF002C */ sw $ra, 0x002C($sp) -/* 0135C 80A6A72C AFB00028 */ sw $s0, 0x0028($sp) +/* 01358 80A6A728 AFBF002C */ sw $ra, 0x002C($sp) +/* 0135C 80A6A72C AFB00028 */ sw $s0, 0x0028($sp) /* 01360 80A6A730 3C014000 */ lui $at, 0x4000 ## $at = 40000000 /* 01364 80A6A734 44812000 */ mtc1 $at, $f4 ## $f4 = 2.00 /* 01368 80A6A738 240E0004 */ addiu $t6, $zero, 0x0004 ## $t6 = 00000004 @@ -11,38 +11,38 @@ glabel func_80A6A724 /* 01378 80A6A748 AC8E014C */ sw $t6, 0x014C($a0) ## 0000014C /* 0137C 80A6A74C AC8F0150 */ sw $t7, 0x0150($a0) ## 00000150 /* 01380 80A6A750 AC8001E8 */ sw $zero, 0x01E8($a0) ## 000001E8 -/* 01384 80A6A754 0C29A569 */ jal func_80A695A4 +/* 01384 80A6A754 0C29A569 */ jal func_80A695A4 /* 01388 80A6A758 E4840068 */ swc1 $f4, 0x0068($a0) ## 00000068 -/* 0138C 80A6A75C E7A00030 */ swc1 $f0, 0x0030($sp) +/* 0138C 80A6A75C E7A00030 */ swc1 $f0, 0x0030($sp) /* 01390 80A6A760 8E180150 */ lw $t8, 0x0150($s0) ## 00000150 /* 01394 80A6A764 3C0480A7 */ lui $a0, %hi(D_80A6AEE0) ## $a0 = 80A70000 -/* 01398 80A6A768 0018C880 */ sll $t9, $t8, 2 -/* 0139C 80A6A76C 00992021 */ addu $a0, $a0, $t9 +/* 01398 80A6A768 0018C880 */ sll $t9, $t8, 2 +/* 0139C 80A6A76C 00992021 */ addu $a0, $a0, $t9 /* 013A0 80A6A770 0C028800 */ jal SkelAnime_GetFrameCount - -/* 013A4 80A6A774 8C84AEE0 */ lw $a0, %lo(D_80A6AEE0)($a0) + +/* 013A4 80A6A774 8C84AEE0 */ lw $a0, %lo(D_80A6AEE0)($a0) /* 013A8 80A6A778 44823000 */ mtc1 $v0, $f6 ## $f6 = 0.00 /* 013AC 80A6A77C 8E080150 */ lw $t0, 0x0150($s0) ## 00000150 /* 013B0 80A6A780 3C01C0A0 */ lui $at, 0xC0A0 ## $at = C0A00000 -/* 013B4 80A6A784 46803220 */ cvt.s.w $f8, $f6 +/* 013B4 80A6A784 46803220 */ cvt.s.w $f8, $f6 /* 013B8 80A6A788 44815000 */ mtc1 $at, $f10 ## $f10 = -5.00 /* 013BC 80A6A78C 3C0580A7 */ lui $a1, %hi(D_80A6AEE0) ## $a1 = 80A70000 -/* 013C0 80A6A790 00084880 */ sll $t1, $t0, 2 -/* 013C4 80A6A794 00A92821 */ addu $a1, $a1, $t1 +/* 013C0 80A6A790 00084880 */ sll $t1, $t0, 2 +/* 013C4 80A6A794 00A92821 */ addu $a1, $a1, $t1 /* 013C8 80A6A798 240A0002 */ addiu $t2, $zero, 0x0002 ## $t2 = 00000002 -/* 013CC 80A6A79C AFAA0014 */ sw $t2, 0x0014($sp) -/* 013D0 80A6A7A0 8CA5AEE0 */ lw $a1, %lo(D_80A6AEE0)($a1) -/* 013D4 80A6A7A4 E7A80010 */ swc1 $f8, 0x0010($sp) +/* 013CC 80A6A79C AFAA0014 */ sw $t2, 0x0014($sp) +/* 013D0 80A6A7A0 8CA5AEE0 */ lw $a1, %lo(D_80A6AEE0)($a1) +/* 013D4 80A6A7A4 E7A80010 */ swc1 $f8, 0x0010($sp) /* 013D8 80A6A7A8 260401A0 */ addiu $a0, $s0, 0x01A0 ## $a0 = 000001A0 -/* 013DC 80A6A7AC 8FA60030 */ lw $a2, 0x0030($sp) +/* 013DC 80A6A7AC 8FA60030 */ lw $a2, 0x0030($sp) /* 013E0 80A6A7B0 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 013E4 80A6A7B4 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 013E8 80A6A7B8 E7AA0018 */ swc1 $f10, 0x0018($sp) -/* 013EC 80A6A7BC 8FBF002C */ lw $ra, 0x002C($sp) -/* 013F0 80A6A7C0 8FB00028 */ lw $s0, 0x0028($sp) +/* 013E4 80A6A7B4 0C029468 */ jal SkelAnime_ChangeAnim + +/* 013E8 80A6A7B8 E7AA0018 */ swc1 $f10, 0x0018($sp) +/* 013EC 80A6A7BC 8FBF002C */ lw $ra, 0x002C($sp) +/* 013F0 80A6A7C0 8FB00028 */ lw $s0, 0x0028($sp) /* 013F4 80A6A7C4 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 -/* 013F8 80A6A7C8 03E00008 */ jr $ra +/* 013F8 80A6A7C8 03E00008 */ jr $ra /* 013FC 80A6A7CC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse_Link_Child/func_80A6A7D0.s b/asm/non_matchings/overlays/actors/ovl_En_Horse_Link_Child/func_80A6A7D0.s index 25b4f9abfb..e155b74503 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse_Link_Child/func_80A6A7D0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse_Link_Child/func_80A6A7D0.s @@ -1,205 +1,205 @@ glabel func_80A6A7D0 /* 01400 80A6A7D0 27BDFFB8 */ addiu $sp, $sp, 0xFFB8 ## $sp = FFFFFFB8 -/* 01404 80A6A7D4 AFBF002C */ sw $ra, 0x002C($sp) -/* 01408 80A6A7D8 AFB00028 */ sw $s0, 0x0028($sp) -/* 0140C 80A6A7DC AFA5004C */ sw $a1, 0x004C($sp) +/* 01404 80A6A7D4 AFBF002C */ sw $ra, 0x002C($sp) +/* 01408 80A6A7D8 AFB00028 */ sw $s0, 0x0028($sp) +/* 0140C 80A6A7DC AFA5004C */ sw $a1, 0x004C($sp) /* 01410 80A6A7E0 8C8F01E4 */ lw $t7, 0x01E4($a0) ## 000001E4 /* 01414 80A6A7E4 8CA31C44 */ lw $v1, 0x1C44($a1) ## 00001C44 /* 01418 80A6A7E8 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 0141C 80A6A7EC 25F80001 */ addiu $t8, $t7, 0x0001 ## $t8 = 00000001 -/* 01420 80A6A7F0 2B01012D */ slti $at, $t8, 0x012D -/* 01424 80A6A7F4 14200003 */ bne $at, $zero, .L80A6A804 +/* 01420 80A6A7F0 2B01012D */ slti $at, $t8, 0x012D +/* 01424 80A6A7F4 14200003 */ bne $at, $zero, .L80A6A804 /* 01428 80A6A7F8 AC9801E4 */ sw $t8, 0x01E4($a0) ## 000001E4 /* 0142C 80A6A7FC 24080001 */ addiu $t0, $zero, 0x0001 ## $t0 = 00000001 /* 01430 80A6A800 AC8801E8 */ sw $t0, 0x01E8($a0) ## 000001E8 .L80A6A804: /* 01434 80A6A804 8E020150 */ lw $v0, 0x0150($s0) ## 00000150 /* 01438 80A6A808 24010004 */ addiu $at, $zero, 0x0004 ## $at = 00000004 -/* 0143C 80A6A80C 10410005 */ beq $v0, $at, .L80A6A824 +/* 0143C 80A6A80C 10410005 */ beq $v0, $at, .L80A6A824 /* 01440 80A6A810 24010003 */ addiu $at, $zero, 0x0003 ## $at = 00000003 -/* 01444 80A6A814 10410003 */ beq $v0, $at, .L80A6A824 +/* 01444 80A6A814 10410003 */ beq $v0, $at, .L80A6A824 /* 01448 80A6A818 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 0144C 80A6A81C 5441000E */ bnel $v0, $at, .L80A6A858 +/* 0144C 80A6A81C 5441000E */ bnel $v0, $at, .L80A6A858 /* 01450 80A6A820 260401A0 */ addiu $a0, $s0, 0x01A0 ## $a0 = 000001A0 .L80A6A824: /* 01454 80A6A824 8E0901E8 */ lw $t1, 0x01E8($s0) ## 000001E8 /* 01458 80A6A828 2406012C */ addiu $a2, $zero, 0x012C ## $a2 = 0000012C /* 0145C 80A6A82C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01460 80A6A830 15200006 */ bne $t1, $zero, .L80A6A84C +/* 01460 80A6A830 15200006 */ bne $t1, $zero, .L80A6A84C /* 01464 80A6A834 26050008 */ addiu $a1, $s0, 0x0008 ## $a1 = 00000008 /* 01468 80A6A838 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0146C 80A6A83C 0C01B767 */ jal func_8006DD9C +/* 0146C 80A6A83C 0C01B767 */ jal func_8006DD9C /* 01470 80A6A840 24650024 */ addiu $a1, $v1, 0x0024 ## $a1 = 00000024 -/* 01474 80A6A844 10000004 */ beq $zero, $zero, .L80A6A858 +/* 01474 80A6A844 10000004 */ beq $zero, $zero, .L80A6A858 /* 01478 80A6A848 260401A0 */ addiu $a0, $s0, 0x01A0 ## $a0 = 000001A0 .L80A6A84C: -/* 0147C 80A6A84C 0C01B767 */ jal func_8006DD9C +/* 0147C 80A6A84C 0C01B767 */ jal func_8006DD9C /* 01480 80A6A850 2406012C */ addiu $a2, $zero, 0x012C ## $a2 = 0000012C /* 01484 80A6A854 260401A0 */ addiu $a0, $s0, 0x01A0 ## $a0 = 000001A0 .L80A6A858: /* 01488 80A6A858 0C02927F */ jal SkelAnime_FrameUpdateMatrix - -/* 0148C 80A6A85C AFA40030 */ sw $a0, 0x0030($sp) -/* 01490 80A6A860 5040008D */ beql $v0, $zero, .L80A6AA98 -/* 01494 80A6A864 8FBF002C */ lw $ra, 0x002C($sp) + +/* 0148C 80A6A85C AFA40030 */ sw $a0, 0x0030($sp) +/* 01490 80A6A860 5040008D */ beql $v0, $zero, .L80A6AA98 +/* 01494 80A6A864 8FBF002C */ lw $ra, 0x002C($sp) /* 01498 80A6A868 8E0A01E8 */ lw $t2, 0x01E8($s0) ## 000001E8 -/* 0149C 80A6A86C 8FAB004C */ lw $t3, 0x004C($sp) +/* 0149C 80A6A86C 8FAB004C */ lw $t3, 0x004C($sp) /* 014A0 80A6A870 26040024 */ addiu $a0, $s0, 0x0024 ## $a0 = 00000024 -/* 014A4 80A6A874 15400006 */ bne $t2, $zero, .L80A6A890 +/* 014A4 80A6A874 15400006 */ bne $t2, $zero, .L80A6A890 /* 014A8 80A6A878 00000000 */ nop /* 014AC 80A6A87C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 014B0 80A6A880 0C00B6E3 */ jal func_8002DB8C +/* 014B0 80A6A880 0C00B6E3 */ jal func_8002DB8C /* 014B4 80A6A884 8D651C44 */ lw $a1, 0x1C44($t3) ## 00001C44 -/* 014B8 80A6A888 10000004 */ beq $zero, $zero, .L80A6A89C +/* 014B8 80A6A888 10000004 */ beq $zero, $zero, .L80A6A89C /* 014BC 80A6A88C 8E0C01E8 */ lw $t4, 0x01E8($s0) ## 000001E8 .L80A6A890: -/* 014C0 80A6A890 0C032D9E */ jal func_800CB678 +/* 014C0 80A6A890 0C032D9E */ jal func_800CB678 /* 014C4 80A6A894 26050008 */ addiu $a1, $s0, 0x0008 ## $a1 = 00000008 /* 014C8 80A6A898 8E0C01E8 */ lw $t4, 0x01E8($s0) ## 000001E8 .L80A6A89C: /* 014CC 80A6A89C 3C014396 */ lui $at, 0x4396 ## $at = 43960000 -/* 014D0 80A6A8A0 5580001E */ bnel $t4, $zero, .L80A6A91C +/* 014D0 80A6A8A0 5580001E */ bnel $t4, $zero, .L80A6A91C /* 014D4 80A6A8A4 44819000 */ mtc1 $at, $f18 ## $f18 = 300.00 /* 014D8 80A6A8A8 3C014396 */ lui $at, 0x4396 ## $at = 43960000 /* 014DC 80A6A8AC 44812000 */ mtc1 $at, $f4 ## $f4 = 300.00 /* 014E0 80A6A8B0 3C014316 */ lui $at, 0x4316 ## $at = 43160000 -/* 014E4 80A6A8B4 4600203E */ c.le.s $f4, $f0 +/* 014E4 80A6A8B4 4600203E */ c.le.s $f4, $f0 /* 014E8 80A6A8B8 00000000 */ nop -/* 014EC 80A6A8BC 45020007 */ bc1fl .L80A6A8DC +/* 014EC 80A6A8BC 45020007 */ bc1fl .L80A6A8DC /* 014F0 80A6A8C0 44814000 */ mtc1 $at, $f8 ## $f8 = 150.00 /* 014F4 80A6A8C4 3C0140C0 */ lui $at, 0x40C0 ## $at = 40C00000 /* 014F8 80A6A8C8 44813000 */ mtc1 $at, $f6 ## $f6 = 6.00 /* 014FC 80A6A8CC 24020004 */ addiu $v0, $zero, 0x0004 ## $v0 = 00000004 -/* 01500 80A6A8D0 10000036 */ beq $zero, $zero, .L80A6A9AC +/* 01500 80A6A8D0 10000036 */ beq $zero, $zero, .L80A6A9AC /* 01504 80A6A8D4 E6060068 */ swc1 $f6, 0x0068($s0) ## 00000068 /* 01508 80A6A8D8 44814000 */ mtc1 $at, $f8 ## $f8 = 6.00 .L80A6A8DC: /* 0150C 80A6A8DC 24020002 */ addiu $v0, $zero, 0x0002 ## $v0 = 00000002 /* 01510 80A6A8E0 3C014000 */ lui $at, 0x4000 ## $at = 40000000 -/* 01514 80A6A8E4 4600403E */ c.le.s $f8, $f0 +/* 01514 80A6A8E4 4600403E */ c.le.s $f8, $f0 /* 01518 80A6A8E8 00000000 */ nop -/* 0151C 80A6A8EC 45020007 */ bc1fl .L80A6A90C +/* 0151C 80A6A8EC 45020007 */ bc1fl .L80A6A90C /* 01520 80A6A8F0 44818000 */ mtc1 $at, $f16 ## $f16 = 2.00 /* 01524 80A6A8F4 3C014080 */ lui $at, 0x4080 ## $at = 40800000 /* 01528 80A6A8F8 44815000 */ mtc1 $at, $f10 ## $f10 = 4.00 /* 0152C 80A6A8FC 24020003 */ addiu $v0, $zero, 0x0003 ## $v0 = 00000003 -/* 01530 80A6A900 1000002A */ beq $zero, $zero, .L80A6A9AC +/* 01530 80A6A900 1000002A */ beq $zero, $zero, .L80A6A9AC /* 01534 80A6A904 E60A0068 */ swc1 $f10, 0x0068($s0) ## 00000068 /* 01538 80A6A908 44818000 */ mtc1 $at, $f16 ## $f16 = 4.00 .L80A6A90C: /* 0153C 80A6A90C AE0001F0 */ sw $zero, 0x01F0($s0) ## 000001F0 -/* 01540 80A6A910 10000026 */ beq $zero, $zero, .L80A6A9AC +/* 01540 80A6A910 10000026 */ beq $zero, $zero, .L80A6A9AC /* 01544 80A6A914 E6100068 */ swc1 $f16, 0x0068($s0) ## 00000068 /* 01548 80A6A918 44819000 */ mtc1 $at, $f18 ## $f18 = 4.00 .L80A6A91C: /* 0154C 80A6A91C 3C014316 */ lui $at, 0x4316 ## $at = 43160000 -/* 01550 80A6A920 4600903E */ c.le.s $f18, $f0 +/* 01550 80A6A920 4600903E */ c.le.s $f18, $f0 /* 01554 80A6A924 00000000 */ nop -/* 01558 80A6A928 45020007 */ bc1fl .L80A6A948 +/* 01558 80A6A928 45020007 */ bc1fl .L80A6A948 /* 0155C 80A6A92C 44813000 */ mtc1 $at, $f6 ## $f6 = 150.00 /* 01560 80A6A930 3C0140C0 */ lui $at, 0x40C0 ## $at = 40C00000 /* 01564 80A6A934 44812000 */ mtc1 $at, $f4 ## $f4 = 6.00 /* 01568 80A6A938 24020004 */ addiu $v0, $zero, 0x0004 ## $v0 = 00000004 -/* 0156C 80A6A93C 1000001B */ beq $zero, $zero, .L80A6A9AC +/* 0156C 80A6A93C 1000001B */ beq $zero, $zero, .L80A6A9AC /* 01570 80A6A940 E6040068 */ swc1 $f4, 0x0068($s0) ## 00000068 /* 01574 80A6A944 44813000 */ mtc1 $at, $f6 ## $f6 = 6.00 .L80A6A948: /* 01578 80A6A948 3C01428C */ lui $at, 0x428C ## $at = 428C0000 -/* 0157C 80A6A94C 4600303E */ c.le.s $f6, $f0 +/* 0157C 80A6A94C 4600303E */ c.le.s $f6, $f0 /* 01580 80A6A950 00000000 */ nop -/* 01584 80A6A954 45020007 */ bc1fl .L80A6A974 +/* 01584 80A6A954 45020007 */ bc1fl .L80A6A974 /* 01588 80A6A958 44815000 */ mtc1 $at, $f10 ## $f10 = 70.00 /* 0158C 80A6A95C 3C014080 */ lui $at, 0x4080 ## $at = 40800000 /* 01590 80A6A960 44814000 */ mtc1 $at, $f8 ## $f8 = 4.00 /* 01594 80A6A964 24020003 */ addiu $v0, $zero, 0x0003 ## $v0 = 00000003 -/* 01598 80A6A968 10000010 */ beq $zero, $zero, .L80A6A9AC +/* 01598 80A6A968 10000010 */ beq $zero, $zero, .L80A6A9AC /* 0159C 80A6A96C E6080068 */ swc1 $f8, 0x0068($s0) ## 00000068 /* 015A0 80A6A970 44815000 */ mtc1 $at, $f10 ## $f10 = 4.00 .L80A6A974: /* 015A4 80A6A974 24020002 */ addiu $v0, $zero, 0x0002 ## $v0 = 00000002 /* 015A8 80A6A978 3C014000 */ lui $at, 0x4000 ## $at = 40000000 -/* 015AC 80A6A97C 4600503E */ c.le.s $f10, $f0 +/* 015AC 80A6A97C 4600503E */ c.le.s $f10, $f0 /* 015B0 80A6A980 00000000 */ nop -/* 015B4 80A6A984 45000005 */ bc1f .L80A6A99C +/* 015B4 80A6A984 45000005 */ bc1f .L80A6A99C /* 015B8 80A6A988 00000000 */ nop /* 015BC 80A6A98C 44818000 */ mtc1 $at, $f16 ## $f16 = 2.00 /* 015C0 80A6A990 AE0001F0 */ sw $zero, 0x01F0($s0) ## 000001F0 -/* 015C4 80A6A994 10000005 */ beq $zero, $zero, .L80A6A9AC +/* 015C4 80A6A994 10000005 */ beq $zero, $zero, .L80A6A9AC /* 015C8 80A6A998 E6100068 */ swc1 $f16, 0x0068($s0) ## 00000068 .L80A6A99C: -/* 015CC 80A6A99C 0C29A937 */ jal func_80A6A4DC +/* 015CC 80A6A99C 0C29A937 */ jal func_80A6A4DC /* 015D0 80A6A9A0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 015D4 80A6A9A4 1000003C */ beq $zero, $zero, .L80A6AA98 -/* 015D8 80A6A9A8 8FBF002C */ lw $ra, 0x002C($sp) +/* 015D4 80A6A9A4 1000003C */ beq $zero, $zero, .L80A6AA98 +/* 015D8 80A6A9A8 8FBF002C */ lw $ra, 0x002C($sp) .L80A6A9AC: /* 015DC 80A6A9AC 8E0D0150 */ lw $t5, 0x0150($s0) ## 00000150 /* 015E0 80A6A9B0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 015E4 80A6A9B4 104D001E */ beq $v0, $t5, .L80A6AA30 +/* 015E4 80A6A9B4 104D001E */ beq $v0, $t5, .L80A6AA30 /* 015E8 80A6A9B8 00000000 */ nop -/* 015EC 80A6A9BC 0C29A569 */ jal func_80A695A4 +/* 015EC 80A6A9BC 0C29A569 */ jal func_80A695A4 /* 015F0 80A6A9C0 AE020150 */ sw $v0, 0x0150($s0) ## 00000150 -/* 015F4 80A6A9C4 E7A00034 */ swc1 $f0, 0x0034($sp) +/* 015F4 80A6A9C4 E7A00034 */ swc1 $f0, 0x0034($sp) /* 015F8 80A6A9C8 8E0E0150 */ lw $t6, 0x0150($s0) ## 00000150 /* 015FC 80A6A9CC 3C0480A7 */ lui $a0, %hi(D_80A6AEE0) ## $a0 = 80A70000 -/* 01600 80A6A9D0 000E7880 */ sll $t7, $t6, 2 -/* 01604 80A6A9D4 008F2021 */ addu $a0, $a0, $t7 +/* 01600 80A6A9D0 000E7880 */ sll $t7, $t6, 2 +/* 01604 80A6A9D4 008F2021 */ addu $a0, $a0, $t7 /* 01608 80A6A9D8 0C028800 */ jal SkelAnime_GetFrameCount - -/* 0160C 80A6A9DC 8C84AEE0 */ lw $a0, %lo(D_80A6AEE0)($a0) + +/* 0160C 80A6A9DC 8C84AEE0 */ lw $a0, %lo(D_80A6AEE0)($a0) /* 01610 80A6A9E0 44829000 */ mtc1 $v0, $f18 ## $f18 = 0.00 /* 01614 80A6A9E4 8E180150 */ lw $t8, 0x0150($s0) ## 00000150 /* 01618 80A6A9E8 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 0161C 80A6A9EC 46809120 */ cvt.s.w $f4, $f18 +/* 0161C 80A6A9EC 46809120 */ cvt.s.w $f4, $f18 /* 01620 80A6A9F0 3C01C0A0 */ lui $at, 0xC0A0 ## $at = C0A00000 /* 01624 80A6A9F4 44813000 */ mtc1 $at, $f6 ## $f6 = -5.00 /* 01628 80A6A9F8 3C0580A7 */ lui $a1, %hi(D_80A6AEE0) ## $a1 = 80A70000 -/* 0162C 80A6A9FC 0018C880 */ sll $t9, $t8, 2 -/* 01630 80A6AA00 00B92821 */ addu $a1, $a1, $t9 +/* 0162C 80A6A9FC 0018C880 */ sll $t9, $t8, 2 +/* 01630 80A6AA00 00B92821 */ addu $a1, $a1, $t9 /* 01634 80A6AA04 24080002 */ addiu $t0, $zero, 0x0002 ## $t0 = 00000002 -/* 01638 80A6AA08 44070000 */ mfc1 $a3, $f0 -/* 0163C 80A6AA0C AFA80014 */ sw $t0, 0x0014($sp) -/* 01640 80A6AA10 8CA5AEE0 */ lw $a1, %lo(D_80A6AEE0)($a1) -/* 01644 80A6AA14 E7A40010 */ swc1 $f4, 0x0010($sp) -/* 01648 80A6AA18 8FA40030 */ lw $a0, 0x0030($sp) -/* 0164C 80A6AA1C 8FA60034 */ lw $a2, 0x0034($sp) -/* 01650 80A6AA20 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 01654 80A6AA24 E7A60018 */ swc1 $f6, 0x0018($sp) -/* 01658 80A6AA28 1000001B */ beq $zero, $zero, .L80A6AA98 -/* 0165C 80A6AA2C 8FBF002C */ lw $ra, 0x002C($sp) +/* 01638 80A6AA08 44070000 */ mfc1 $a3, $f0 +/* 0163C 80A6AA0C AFA80014 */ sw $t0, 0x0014($sp) +/* 01640 80A6AA10 8CA5AEE0 */ lw $a1, %lo(D_80A6AEE0)($a1) +/* 01644 80A6AA14 E7A40010 */ swc1 $f4, 0x0010($sp) +/* 01648 80A6AA18 8FA40030 */ lw $a0, 0x0030($sp) +/* 0164C 80A6AA1C 8FA60034 */ lw $a2, 0x0034($sp) +/* 01650 80A6AA20 0C029468 */ jal SkelAnime_ChangeAnim + +/* 01654 80A6AA24 E7A60018 */ swc1 $f6, 0x0018($sp) +/* 01658 80A6AA28 1000001B */ beq $zero, $zero, .L80A6AA98 +/* 0165C 80A6AA2C 8FBF002C */ lw $ra, 0x002C($sp) .L80A6AA30: -/* 01660 80A6AA30 0C29A569 */ jal func_80A695A4 +/* 01660 80A6AA30 0C29A569 */ jal func_80A695A4 /* 01664 80A6AA34 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01668 80A6AA38 E7A00034 */ swc1 $f0, 0x0034($sp) +/* 01668 80A6AA38 E7A00034 */ swc1 $f0, 0x0034($sp) /* 0166C 80A6AA3C 8E090150 */ lw $t1, 0x0150($s0) ## 00000150 /* 01670 80A6AA40 3C0480A7 */ lui $a0, %hi(D_80A6AEE0) ## $a0 = 80A70000 -/* 01674 80A6AA44 00095080 */ sll $t2, $t1, 2 -/* 01678 80A6AA48 008A2021 */ addu $a0, $a0, $t2 +/* 01674 80A6AA44 00095080 */ sll $t2, $t1, 2 +/* 01678 80A6AA48 008A2021 */ addu $a0, $a0, $t2 /* 0167C 80A6AA4C 0C028800 */ jal SkelAnime_GetFrameCount - -/* 01680 80A6AA50 8C84AEE0 */ lw $a0, %lo(D_80A6AEE0)($a0) + +/* 01680 80A6AA50 8C84AEE0 */ lw $a0, %lo(D_80A6AEE0)($a0) /* 01684 80A6AA54 44824000 */ mtc1 $v0, $f8 ## $f8 = 0.00 /* 01688 80A6AA58 8E0B0150 */ lw $t3, 0x0150($s0) ## 00000150 /* 0168C 80A6AA5C 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 01690 80A6AA60 468042A0 */ cvt.s.w $f10, $f8 +/* 01690 80A6AA60 468042A0 */ cvt.s.w $f10, $f8 /* 01694 80A6AA64 3C0580A7 */ lui $a1, %hi(D_80A6AEE0) ## $a1 = 80A70000 -/* 01698 80A6AA68 000B6080 */ sll $t4, $t3, 2 -/* 0169C 80A6AA6C 00AC2821 */ addu $a1, $a1, $t4 +/* 01698 80A6AA68 000B6080 */ sll $t4, $t3, 2 +/* 0169C 80A6AA6C 00AC2821 */ addu $a1, $a1, $t4 /* 016A0 80A6AA70 240D0002 */ addiu $t5, $zero, 0x0002 ## $t5 = 00000002 -/* 016A4 80A6AA74 44070000 */ mfc1 $a3, $f0 -/* 016A8 80A6AA78 AFAD0014 */ sw $t5, 0x0014($sp) -/* 016AC 80A6AA7C 8CA5AEE0 */ lw $a1, %lo(D_80A6AEE0)($a1) -/* 016B0 80A6AA80 E7AA0010 */ swc1 $f10, 0x0010($sp) -/* 016B4 80A6AA84 8FA40030 */ lw $a0, 0x0030($sp) -/* 016B8 80A6AA88 8FA60034 */ lw $a2, 0x0034($sp) -/* 016BC 80A6AA8C 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 016C0 80A6AA90 E7A00018 */ swc1 $f0, 0x0018($sp) -/* 016C4 80A6AA94 8FBF002C */ lw $ra, 0x002C($sp) +/* 016A4 80A6AA74 44070000 */ mfc1 $a3, $f0 +/* 016A8 80A6AA78 AFAD0014 */ sw $t5, 0x0014($sp) +/* 016AC 80A6AA7C 8CA5AEE0 */ lw $a1, %lo(D_80A6AEE0)($a1) +/* 016B0 80A6AA80 E7AA0010 */ swc1 $f10, 0x0010($sp) +/* 016B4 80A6AA84 8FA40030 */ lw $a0, 0x0030($sp) +/* 016B8 80A6AA88 8FA60034 */ lw $a2, 0x0034($sp) +/* 016BC 80A6AA8C 0C029468 */ jal SkelAnime_ChangeAnim + +/* 016C0 80A6AA90 E7A00018 */ swc1 $f0, 0x0018($sp) +/* 016C4 80A6AA94 8FBF002C */ lw $ra, 0x002C($sp) .L80A6AA98: -/* 016C8 80A6AA98 8FB00028 */ lw $s0, 0x0028($sp) +/* 016C8 80A6AA98 8FB00028 */ lw $s0, 0x0028($sp) /* 016CC 80A6AA9C 27BD0048 */ addiu $sp, $sp, 0x0048 ## $sp = 00000000 -/* 016D0 80A6AAA0 03E00008 */ jr $ra +/* 016D0 80A6AAA0 03E00008 */ jr $ra /* 016D4 80A6AAA4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse_Link_Child/func_80A6AD84.s b/asm/non_matchings/overlays/actors/ovl_En_Horse_Link_Child/func_80A6AD84.s index 1e98df1715..71feb120e7 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse_Link_Child/func_80A6AD84.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse_Link_Child/func_80A6AD84.s @@ -10,7 +10,7 @@ glabel func_80A6AD84 /* 019D4 80A6ADA4 24C6AFB0 */ addiu $a2, $a2, %lo(D_80A6AFB0) ## $a2 = 80A6AFB0 /* 019D8 80A6ADA8 240705BB */ addiu $a3, $zero, 0x05BB ## $a3 = 000005BB /* 019DC 80A6ADAC 27A40028 */ addiu $a0, $sp, 0x0028 ## $a0 = FFFFFFE8 -/* 019E0 80A6ADB0 0C031AB1 */ jal func_800C6AC4 +/* 019E0 80A6ADB0 0C031AB1 */ jal Graph_OpenDisps /* 019E4 80A6ADB4 AFA50038 */ sw $a1, 0x0038($sp) /* 019E8 80A6ADB8 8FAF0048 */ lw $t7, 0x0048($sp) /* 019EC 80A6ADBC 2401000D */ addiu $at, $zero, 0x000D ## $at = 0000000D @@ -50,7 +50,7 @@ glabel func_80A6AD84 /* 01A70 80A6AE40 27A40028 */ addiu $a0, $sp, 0x0028 ## $a0 = FFFFFFE8 /* 01A74 80A6AE44 24C6AFCC */ addiu $a2, $a2, %lo(D_80A6AFCC) ## $a2 = 80A6AFCC /* 01A78 80A6AE48 240705C7 */ addiu $a3, $zero, 0x05C7 ## $a3 = 000005C7 -/* 01A7C 80A6AE4C 0C031AD5 */ jal func_800C6B54 +/* 01A7C 80A6AE4C 0C031AD5 */ jal Graph_CloseDisps /* 01A80 80A6AE50 8D450000 */ lw $a1, 0x0000($t2) ## DB060020 /* 01A84 80A6AE54 8FBF0014 */ lw $ra, 0x0014($sp) /* 01A88 80A6AE58 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse_Normal/EnHorseNormal_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Horse_Normal/EnHorseNormal_Draw.s index 6015202e0c..71c0396c2c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse_Normal/EnHorseNormal_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse_Normal/EnHorseNormal_Draw.s @@ -10,7 +10,7 @@ glabel EnHorseNormal_Draw /* 01C3C 80A6CE8C 24C6D560 */ addiu $a2, $a2, %lo(D_80A6D560) ## $a2 = 80A6D560 /* 01C40 80A6CE90 27A400B4 */ addiu $a0, $sp, 0x00B4 ## $a0 = FFFFFFE4 /* 01C44 80A6CE94 240708B0 */ addiu $a3, $zero, 0x08B0 ## $a3 = 000008B0 -/* 01C48 80A6CE98 0C031AB1 */ jal func_800C6AC4 +/* 01C48 80A6CE98 0C031AB1 */ jal Graph_OpenDisps /* 01C4C 80A6CE9C AFA500C4 */ sw $a1, 0x00C4($sp) /* 01C50 80A6CEA0 862200A4 */ lh $v0, 0x00A4($s1) ## 000000A4 /* 01C54 80A6CEA4 24010063 */ addiu $at, $zero, 0x0063 ## $at = 00000063 @@ -313,7 +313,7 @@ glabel EnHorseNormal_Draw /* 020D8 80A6D328 24C6D590 */ addiu $a2, $a2, %lo(D_80A6D590) ## $a2 = 80A6D590 /* 020DC 80A6D32C 27A400B4 */ addiu $a0, $sp, 0x00B4 ## $a0 = FFFFFFE4 /* 020E0 80A6D330 8E250000 */ lw $a1, 0x0000($s1) ## 00000000 -/* 020E4 80A6D334 0C031AD5 */ jal func_800C6B54 +/* 020E4 80A6D334 0C031AD5 */ jal Graph_CloseDisps /* 020E8 80A6D338 24070923 */ addiu $a3, $zero, 0x0923 ## $a3 = 00000923 .L80A6D33C: /* 020EC 80A6D33C 8FBF0034 */ lw $ra, 0x0034($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse_Normal/EnHorseNormal_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Horse_Normal/EnHorseNormal_Init.s index d545c442cd..7413d3492a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse_Normal/EnHorseNormal_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse_Normal/EnHorseNormal_Init.s @@ -1,17 +1,17 @@ glabel EnHorseNormal_Init /* 00180 80A6B3D0 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 00184 80A6B3D4 AFA5003C */ sw $a1, 0x003C($sp) -/* 00188 80A6B3D8 AFBF0024 */ sw $ra, 0x0024($sp) -/* 0018C 80A6B3DC AFB00020 */ sw $s0, 0x0020($sp) +/* 00184 80A6B3D4 AFA5003C */ sw $a1, 0x003C($sp) +/* 00188 80A6B3D8 AFBF0024 */ sw $ra, 0x0024($sp) +/* 0018C 80A6B3DC AFB00020 */ sw $s0, 0x0020($sp) /* 00190 80A6B3E0 3C0580A7 */ lui $a1, %hi(D_80A6D4EC) ## $a1 = 80A70000 /* 00194 80A6B3E4 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 00198 80A6B3E8 0C01E037 */ jal Actor_ProcessInitChain - + /* 0019C 80A6B3EC 24A5D4EC */ addiu $a1, $a1, %lo(D_80A6D4EC) ## $a1 = 80A6D4EC /* 001A0 80A6B3F0 3C053C23 */ lui $a1, 0x3C23 ## $a1 = 3C230000 /* 001A4 80A6B3F4 34A5D70A */ ori $a1, $a1, 0xD70A ## $a1 = 3C23D70A /* 001A8 80A6B3F8 0C00B58B */ jal Actor_SetScale - + /* 001AC 80A6B3FC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 001B0 80A6B400 3C01C060 */ lui $at, 0xC060 ## $at = C0600000 /* 001B4 80A6B404 44812000 */ mtc1 $at, $f4 ## $f4 = -3.50 @@ -21,7 +21,7 @@ glabel EnHorseNormal_Init /* 001C4 80A6B414 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 /* 001C8 80A6B418 3C0741A0 */ lui $a3, 0x41A0 ## $a3 = 41A00000 /* 001CC 80A6B41C 0C00AC78 */ jal ActorShape_Init - + /* 001D0 80A6B420 E604006C */ swc1 $f4, 0x006C($s0) ## 0000006C /* 001D4 80A6B424 8E0E0028 */ lw $t6, 0x0028($s0) ## 00000028 /* 001D8 80A6B428 3C01428C */ lui $at, 0x428C ## $at = 428C0000 @@ -31,7 +31,7 @@ glabel EnHorseNormal_Init /* 001E8 80A6B438 44815000 */ mtc1 $at, $f10 ## $f10 = 70.00 /* 001EC 80A6B43C AE0F0038 */ sw $t7, 0x0038($s0) ## 00000038 /* 001F0 80A6B440 44803000 */ mtc1 $zero, $f6 ## $f6 = 0.00 -/* 001F4 80A6B444 460A4400 */ add.s $f16, $f8, $f10 +/* 001F4 80A6B444 460A4400 */ add.s $f16, $f8, $f10 /* 001F8 80A6B448 8E0F002C */ lw $t7, 0x002C($s0) ## 0000002C /* 001FC 80A6B44C AE00014C */ sw $zero, 0x014C($s0) ## 0000014C /* 00200 80A6B450 AE000150 */ sw $zero, 0x0150($s0) ## 00000150 @@ -39,123 +39,123 @@ glabel EnHorseNormal_Init /* 00208 80A6B458 26050228 */ addiu $a1, $s0, 0x0228 ## $a1 = 00000228 /* 0020C 80A6B45C E6060068 */ swc1 $f6, 0x0068($s0) ## 00000068 /* 00210 80A6B460 AE0F0040 */ sw $t7, 0x0040($s0) ## 00000040 -/* 00214 80A6B464 AFA50028 */ sw $a1, 0x0028($sp) +/* 00214 80A6B464 AFA50028 */ sw $a1, 0x0028($sp) /* 00218 80A6B468 0C0170D9 */ jal ActorCollider_AllocCylinder - -/* 0021C 80A6B46C 8FA4003C */ lw $a0, 0x003C($sp) + +/* 0021C 80A6B46C 8FA4003C */ lw $a0, 0x003C($sp) /* 00220 80A6B470 3C0780A7 */ lui $a3, %hi(D_80A6D394) ## $a3 = 80A70000 -/* 00224 80A6B474 8FA50028 */ lw $a1, 0x0028($sp) +/* 00224 80A6B474 8FA50028 */ lw $a1, 0x0028($sp) /* 00228 80A6B478 24E7D394 */ addiu $a3, $a3, %lo(D_80A6D394) ## $a3 = 80A6D394 -/* 0022C 80A6B47C 8FA4003C */ lw $a0, 0x003C($sp) +/* 0022C 80A6B47C 8FA4003C */ lw $a0, 0x003C($sp) /* 00230 80A6B480 0C01712B */ jal ActorCollider_InitCylinder - + /* 00234 80A6B484 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 00238 80A6B488 26050274 */ addiu $a1, $s0, 0x0274 ## $a1 = 00000274 -/* 0023C 80A6B48C AFA50028 */ sw $a1, 0x0028($sp) -/* 00240 80A6B490 0C016EFE */ jal func_8005BBF8 -/* 00244 80A6B494 8FA4003C */ lw $a0, 0x003C($sp) +/* 0023C 80A6B48C AFA50028 */ sw $a1, 0x0028($sp) +/* 00240 80A6B490 0C016EFE */ jal func_8005BBF8 +/* 00244 80A6B494 8FA4003C */ lw $a0, 0x003C($sp) /* 00248 80A6B498 3C0780A7 */ lui $a3, %hi(D_80A6D410) ## $a3 = 80A70000 /* 0024C 80A6B49C 26180294 */ addiu $t8, $s0, 0x0294 ## $t8 = 00000294 -/* 00250 80A6B4A0 8FA50028 */ lw $a1, 0x0028($sp) -/* 00254 80A6B4A4 AFB80010 */ sw $t8, 0x0010($sp) +/* 00250 80A6B4A0 8FA50028 */ lw $a1, 0x0028($sp) +/* 00254 80A6B4A4 AFB80010 */ sw $t8, 0x0010($sp) /* 00258 80A6B4A8 24E7D410 */ addiu $a3, $a3, %lo(D_80A6D410) ## $a3 = 80A6D410 -/* 0025C 80A6B4AC 8FA4003C */ lw $a0, 0x003C($sp) -/* 00260 80A6B4B0 0C017014 */ jal func_8005C050 +/* 0025C 80A6B4AC 8FA4003C */ lw $a0, 0x003C($sp) +/* 00260 80A6B4B0 0C017014 */ jal func_8005C050 /* 00264 80A6B4B4 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 00268 80A6B4B8 260502D4 */ addiu $a1, $s0, 0x02D4 ## $a1 = 000002D4 -/* 0026C 80A6B4BC AFA50028 */ sw $a1, 0x0028($sp) +/* 0026C 80A6B4BC AFA50028 */ sw $a1, 0x0028($sp) /* 00270 80A6B4C0 0C0170D9 */ jal ActorCollider_AllocCylinder - -/* 00274 80A6B4C4 8FA4003C */ lw $a0, 0x003C($sp) + +/* 00274 80A6B4C4 8FA4003C */ lw $a0, 0x003C($sp) /* 00278 80A6B4C8 3C0780A7 */ lui $a3, %hi(D_80A6D3C0) ## $a3 = 80A70000 -/* 0027C 80A6B4CC 8FA50028 */ lw $a1, 0x0028($sp) +/* 0027C 80A6B4CC 8FA50028 */ lw $a1, 0x0028($sp) /* 00280 80A6B4D0 24E7D3C0 */ addiu $a3, $a3, %lo(D_80A6D3C0) ## $a3 = 80A6D3C0 -/* 00284 80A6B4D4 8FA4003C */ lw $a0, 0x003C($sp) +/* 00284 80A6B4D4 8FA4003C */ lw $a0, 0x003C($sp) /* 00288 80A6B4D8 0C01712B */ jal ActorCollider_InitCylinder - + /* 0028C 80A6B4DC 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 00290 80A6B4E0 3C0680A7 */ lui $a2, %hi(D_80A6D420) ## $a2 = 80A70000 /* 00294 80A6B4E4 24C6D420 */ addiu $a2, $a2, %lo(D_80A6D420) ## $a2 = 80A6D420 /* 00298 80A6B4E8 26040098 */ addiu $a0, $s0, 0x0098 ## $a0 = 00000098 -/* 0029C 80A6B4EC 0C0187B5 */ jal func_80061ED4 +/* 0029C 80A6B4EC 0C0187B5 */ jal func_80061ED4 /* 002A0 80A6B4F0 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 002A4 80A6B4F4 8FB9003C */ lw $t9, 0x003C($sp) +/* 002A4 80A6B4F4 8FB9003C */ lw $t9, 0x003C($sp) /* 002A8 80A6B4F8 24010063 */ addiu $at, $zero, 0x0063 ## $at = 00000063 /* 002AC 80A6B4FC 872200A4 */ lh $v0, 0x00A4($t9) ## 000000A4 -/* 002B0 80A6B500 5441007A */ bnel $v0, $at, .L80A6B6EC +/* 002B0 80A6B500 5441007A */ bnel $v0, $at, .L80A6B6EC /* 002B4 80A6B504 24010036 */ addiu $at, $zero, 0x0036 ## $at = 00000036 /* 002B8 80A6B508 86080034 */ lh $t0, 0x0034($s0) ## 00000034 /* 002BC 80A6B50C 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 /* 002C0 80A6B510 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 -/* 002C4 80A6B514 11000004 */ beq $t0, $zero, .L80A6B528 +/* 002C4 80A6B514 11000004 */ beq $t0, $zero, .L80A6B528 /* 002C8 80A6B518 00000000 */ nop /* 002CC 80A6B51C 8C490010 */ lw $t1, 0x0010($v0) ## 8015E670 -/* 002D0 80A6B520 51200006 */ beql $t1, $zero, .L80A6B53C +/* 002D0 80A6B520 51200006 */ beql $t1, $zero, .L80A6B53C /* 002D4 80A6B524 8C4A0004 */ lw $t2, 0x0004($v0) ## 8015E664 .L80A6B528: /* 002D8 80A6B528 0C00B55C */ jal Actor_Kill - + /* 002DC 80A6B52C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 002E0 80A6B530 100000DE */ beq $zero, $zero, .L80A6B8AC -/* 002E4 80A6B534 8FBF0024 */ lw $ra, 0x0024($sp) +/* 002E0 80A6B530 100000DE */ beq $zero, $zero, .L80A6B8AC +/* 002E4 80A6B534 8FBF0024 */ lw $ra, 0x0024($sp) /* 002E8 80A6B538 8C4A0004 */ lw $t2, 0x0004($v0) ## 00000004 .L80A6B53C: -/* 002EC 80A6B53C 11400015 */ beq $t2, $zero, .L80A6B594 +/* 002EC 80A6B53C 11400015 */ beq $t2, $zero, .L80A6B594 /* 002F0 80A6B540 00000000 */ nop /* 002F4 80A6B544 0C00D6D3 */ jal Flags_GetEventChkInf - + /* 002F8 80A6B548 24040014 */ addiu $a0, $zero, 0x0014 ## $a0 = 00000014 -/* 002FC 80A6B54C 5040000A */ beql $v0, $zero, .L80A6B578 +/* 002FC 80A6B54C 5040000A */ beql $v0, $zero, .L80A6B578 /* 00300 80A6B550 860C0034 */ lh $t4, 0x0034($s0) ## 00000034 /* 00304 80A6B554 860B0034 */ lh $t3, 0x0034($s0) ## 00000034 /* 00308 80A6B558 24010003 */ addiu $at, $zero, 0x0003 ## $at = 00000003 -/* 0030C 80A6B55C 51610026 */ beql $t3, $at, .L80A6B5F8 +/* 0030C 80A6B55C 51610026 */ beql $t3, $at, .L80A6B5F8 /* 00310 80A6B560 A60000B8 */ sh $zero, 0x00B8($s0) ## 000000B8 /* 00314 80A6B564 0C00B55C */ jal Actor_Kill - + /* 00318 80A6B568 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0031C 80A6B56C 100000CF */ beq $zero, $zero, .L80A6B8AC -/* 00320 80A6B570 8FBF0024 */ lw $ra, 0x0024($sp) +/* 0031C 80A6B56C 100000CF */ beq $zero, $zero, .L80A6B8AC +/* 00320 80A6B570 8FBF0024 */ lw $ra, 0x0024($sp) /* 00324 80A6B574 860C0034 */ lh $t4, 0x0034($s0) ## 00000034 .L80A6B578: /* 00328 80A6B578 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 0032C 80A6B57C 5181001E */ beql $t4, $at, .L80A6B5F8 +/* 0032C 80A6B57C 5181001E */ beql $t4, $at, .L80A6B5F8 /* 00330 80A6B580 A60000B8 */ sh $zero, 0x00B8($s0) ## 000000B8 /* 00334 80A6B584 0C00B55C */ jal Actor_Kill - + /* 00338 80A6B588 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0033C 80A6B58C 100000C7 */ beq $zero, $zero, .L80A6B8AC -/* 00340 80A6B590 8FBF0024 */ lw $ra, 0x0024($sp) +/* 0033C 80A6B58C 100000C7 */ beq $zero, $zero, .L80A6B8AC +/* 00340 80A6B590 8FBF0024 */ lw $ra, 0x0024($sp) .L80A6B594: /* 00344 80A6B594 0C00D6D3 */ jal Flags_GetEventChkInf - + /* 00348 80A6B598 24040018 */ addiu $a0, $zero, 0x0018 ## $a0 = 00000018 -/* 0034C 80A6B59C 14400005 */ bne $v0, $zero, .L80A6B5B4 +/* 0034C 80A6B59C 14400005 */ bne $v0, $zero, .L80A6B5B4 /* 00350 80A6B5A0 3C0D8016 */ lui $t5, 0x8016 ## $t5 = 80160000 /* 00354 80A6B5A4 8DADFA90 */ lw $t5, -0x0570($t5) ## 8015FA90 /* 00358 80A6B5A8 85AE0556 */ lh $t6, 0x0556($t5) ## 80160556 -/* 0035C 80A6B5AC 51C0000A */ beql $t6, $zero, .L80A6B5D8 +/* 0035C 80A6B5AC 51C0000A */ beql $t6, $zero, .L80A6B5D8 /* 00360 80A6B5B0 86180034 */ lh $t8, 0x0034($s0) ## 00000034 .L80A6B5B4: /* 00364 80A6B5B4 860F0034 */ lh $t7, 0x0034($s0) ## 00000034 /* 00368 80A6B5B8 24010007 */ addiu $at, $zero, 0x0007 ## $at = 00000007 -/* 0036C 80A6B5BC 51E1000E */ beql $t7, $at, .L80A6B5F8 +/* 0036C 80A6B5BC 51E1000E */ beql $t7, $at, .L80A6B5F8 /* 00370 80A6B5C0 A60000B8 */ sh $zero, 0x00B8($s0) ## 000000B8 /* 00374 80A6B5C4 0C00B55C */ jal Actor_Kill - + /* 00378 80A6B5C8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0037C 80A6B5CC 100000B7 */ beq $zero, $zero, .L80A6B8AC -/* 00380 80A6B5D0 8FBF0024 */ lw $ra, 0x0024($sp) +/* 0037C 80A6B5CC 100000B7 */ beq $zero, $zero, .L80A6B8AC +/* 00380 80A6B5D0 8FBF0024 */ lw $ra, 0x0024($sp) /* 00384 80A6B5D4 86180034 */ lh $t8, 0x0034($s0) ## 00000034 .L80A6B5D8: /* 00388 80A6B5D8 24010005 */ addiu $at, $zero, 0x0005 ## $at = 00000005 -/* 0038C 80A6B5DC 53010006 */ beql $t8, $at, .L80A6B5F8 +/* 0038C 80A6B5DC 53010006 */ beql $t8, $at, .L80A6B5F8 /* 00390 80A6B5E0 A60000B8 */ sh $zero, 0x00B8($s0) ## 000000B8 /* 00394 80A6B5E4 0C00B55C */ jal Actor_Kill - + /* 00398 80A6B5E8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0039C 80A6B5EC 100000AF */ beq $zero, $zero, .L80A6B8AC -/* 003A0 80A6B5F0 8FBF0024 */ lw $ra, 0x0024($sp) +/* 0039C 80A6B5EC 100000AF */ beq $zero, $zero, .L80A6B8AC +/* 003A0 80A6B5F0 8FBF0024 */ lw $ra, 0x0024($sp) /* 003A4 80A6B5F4 A60000B8 */ sh $zero, 0x00B8($s0) ## 000000B8 .L80A6B5F8: /* 003A8 80A6B5F8 860200B8 */ lh $v0, 0x00B8($s0) ## 000000B8 @@ -163,188 +163,188 @@ glabel EnHorseNormal_Init /* 003B0 80A6B600 3C070600 */ lui $a3, 0x0600 ## $a3 = 06000000 /* 003B4 80A6B604 A6020034 */ sh $v0, 0x0034($s0) ## 00000034 /* 003B8 80A6B608 A6020018 */ sh $v0, 0x0018($s0) ## 00000018 -/* 003BC 80A6B60C 8FA4003C */ lw $a0, 0x003C($sp) +/* 003BC 80A6B60C 8FA4003C */ lw $a0, 0x003C($sp) /* 003C0 80A6B610 24E74580 */ addiu $a3, $a3, 0x4580 ## $a3 = 06004580 /* 003C4 80A6B614 24C69FAC */ addiu $a2, $a2, 0x9FAC ## $a2 = 06009FAC -/* 003C8 80A6B618 0C02998F */ jal func_800A663C +/* 003C8 80A6B618 0C02998F */ jal func_800A663C /* 003CC 80A6B61C 26050154 */ addiu $a1, $s0, 0x0154 ## $a1 = 00000154 /* 003D0 80A6B620 8E190150 */ lw $t9, 0x0150($s0) ## 00000150 /* 003D4 80A6B624 3C0580A7 */ lui $a1, %hi(D_80A6D370) ## $a1 = 80A70000 /* 003D8 80A6B628 260401A0 */ addiu $a0, $s0, 0x01A0 ## $a0 = 000001A0 -/* 003DC 80A6B62C 00194080 */ sll $t0, $t9, 2 -/* 003E0 80A6B630 00A82821 */ addu $a1, $a1, $t0 -/* 003E4 80A6B634 0C02947A */ jal func_800A51E8 -/* 003E8 80A6B638 8CA5D370 */ lw $a1, %lo(D_80A6D370)($a1) +/* 003DC 80A6B62C 00194080 */ sll $t0, $t9, 2 +/* 003E0 80A6B630 00A82821 */ addu $a1, $a1, $t0 +/* 003E4 80A6B634 0C02947A */ jal SkelAnime_ChangeAnimDefaultStop +/* 003E8 80A6B638 8CA5D370 */ lw $a1, %lo(D_80A6D370)($a1) /* 003EC 80A6B63C 3C0180A7 */ lui $at, %hi(D_80A6D5B0) ## $at = 80A70000 -/* 003F0 80A6B640 C432D5B0 */ lwc1 $f18, %lo(D_80A6D5B0)($at) +/* 003F0 80A6B640 C432D5B0 */ lwc1 $f18, %lo(D_80A6D5B0)($at) /* 003F4 80A6B644 C6000024 */ lwc1 $f0, 0x0024($s0) ## 00000024 -/* 003F8 80A6B648 46009032 */ c.eq.s $f18, $f0 +/* 003F8 80A6B648 46009032 */ c.eq.s $f18, $f0 /* 003FC 80A6B64C 00000000 */ nop -/* 00400 80A6B650 4502000E */ bc1fl .L80A6B68C +/* 00400 80A6B650 4502000E */ bc1fl .L80A6B68C /* 00404 80A6B654 3C01445C */ lui $at, 0x445C ## $at = 445C0000 /* 00408 80A6B658 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 /* 0040C 80A6B65C C6060028 */ lwc1 $f6, 0x0028($s0) ## 00000028 /* 00410 80A6B660 3C0180A7 */ lui $at, %hi(D_80A6D5B4) ## $at = 80A70000 -/* 00414 80A6B664 46062032 */ c.eq.s $f4, $f6 +/* 00414 80A6B664 46062032 */ c.eq.s $f4, $f6 /* 00418 80A6B668 00000000 */ nop -/* 0041C 80A6B66C 45020007 */ bc1fl .L80A6B68C +/* 0041C 80A6B66C 45020007 */ bc1fl .L80A6B68C /* 00420 80A6B670 3C01445C */ lui $at, 0x445C ## $at = 445C0000 -/* 00424 80A6B674 C428D5B4 */ lwc1 $f8, %lo(D_80A6D5B4)($at) +/* 00424 80A6B674 C428D5B4 */ lwc1 $f8, %lo(D_80A6D5B4)($at) /* 00428 80A6B678 C60A002C */ lwc1 $f10, 0x002C($s0) ## 0000002C -/* 0042C 80A6B67C 460A4032 */ c.eq.s $f8, $f10 +/* 0042C 80A6B67C 460A4032 */ c.eq.s $f8, $f10 /* 00430 80A6B680 00000000 */ nop -/* 00434 80A6B684 45010014 */ bc1t .L80A6B6D8 +/* 00434 80A6B684 45010014 */ bc1t .L80A6B6D8 /* 00438 80A6B688 3C01445C */ lui $at, 0x445C ## $at = 445C0000 .L80A6B68C: /* 0043C 80A6B68C 44818000 */ mtc1 $at, $f16 ## $f16 = 880.00 /* 00440 80A6B690 00000000 */ nop -/* 00444 80A6B694 46008032 */ c.eq.s $f16, $f0 +/* 00444 80A6B694 46008032 */ c.eq.s $f16, $f0 /* 00448 80A6B698 00000000 */ nop -/* 0044C 80A6B69C 45020075 */ bc1fl .L80A6B874 +/* 0044C 80A6B69C 45020075 */ bc1fl .L80A6B874 /* 00450 80A6B6A0 8602001C */ lh $v0, 0x001C($s0) ## 0000001C /* 00454 80A6B6A4 44809000 */ mtc1 $zero, $f18 ## $f18 = 0.00 /* 00458 80A6B6A8 C6040028 */ lwc1 $f4, 0x0028($s0) ## 00000028 /* 0045C 80A6B6AC 3C0180A7 */ lui $at, %hi(D_80A6D5B8) ## $at = 80A70000 -/* 00460 80A6B6B0 46049032 */ c.eq.s $f18, $f4 +/* 00460 80A6B6B0 46049032 */ c.eq.s $f18, $f4 /* 00464 80A6B6B4 00000000 */ nop -/* 00468 80A6B6B8 4502006E */ bc1fl .L80A6B874 +/* 00468 80A6B6B8 4502006E */ bc1fl .L80A6B874 /* 0046C 80A6B6BC 8602001C */ lh $v0, 0x001C($s0) ## 0000001C -/* 00470 80A6B6C0 C426D5B8 */ lwc1 $f6, %lo(D_80A6D5B8)($at) +/* 00470 80A6B6C0 C426D5B8 */ lwc1 $f6, %lo(D_80A6D5B8)($at) /* 00474 80A6B6C4 C608002C */ lwc1 $f8, 0x002C($s0) ## 0000002C -/* 00478 80A6B6C8 46083032 */ c.eq.s $f6, $f8 +/* 00478 80A6B6C8 46083032 */ c.eq.s $f6, $f8 /* 0047C 80A6B6CC 00000000 */ nop -/* 00480 80A6B6D0 45020068 */ bc1fl .L80A6B874 +/* 00480 80A6B6D0 45020068 */ bc1fl .L80A6B874 /* 00484 80A6B6D4 8602001C */ lh $v0, 0x001C($s0) ## 0000001C .L80A6B6D8: -/* 00488 80A6B6D8 0C29B1AC */ jal func_80A6C6B0 +/* 00488 80A6B6D8 0C29B1AC */ jal func_80A6C6B0 /* 0048C 80A6B6DC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00490 80A6B6E0 10000072 */ beq $zero, $zero, .L80A6B8AC -/* 00494 80A6B6E4 8FBF0024 */ lw $ra, 0x0024($sp) +/* 00490 80A6B6E0 10000072 */ beq $zero, $zero, .L80A6B8AC +/* 00494 80A6B6E4 8FBF0024 */ lw $ra, 0x0024($sp) /* 00498 80A6B6E8 24010036 */ addiu $at, $zero, 0x0036 ## $at = 00000036 .L80A6B6EC: -/* 0049C 80A6B6EC 5441001C */ bnel $v0, $at, .L80A6B760 +/* 0049C 80A6B6EC 5441001C */ bnel $v0, $at, .L80A6B760 /* 004A0 80A6B6F0 2401005D */ addiu $at, $zero, 0x005D ## $at = 0000005D /* 004A4 80A6B6F4 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 /* 004A8 80A6B6F8 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 /* 004AC 80A6B6FC 8C490010 */ lw $t1, 0x0010($v0) ## 8015E670 -/* 004B0 80A6B700 8FA4003C */ lw $a0, 0x003C($sp) +/* 004B0 80A6B700 8FA4003C */ lw $a0, 0x003C($sp) /* 004B4 80A6B704 26050154 */ addiu $a1, $s0, 0x0154 ## $a1 = 00000154 -/* 004B8 80A6B708 15200005 */ bne $t1, $zero, .L80A6B720 +/* 004B8 80A6B708 15200005 */ bne $t1, $zero, .L80A6B720 /* 004BC 80A6B70C 3C060601 */ lui $a2, 0x0601 ## $a2 = 06010000 /* 004C0 80A6B710 0C00B55C */ jal Actor_Kill - + /* 004C4 80A6B714 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 004C8 80A6B718 10000064 */ beq $zero, $zero, .L80A6B8AC -/* 004CC 80A6B71C 8FBF0024 */ lw $ra, 0x0024($sp) +/* 004C8 80A6B718 10000064 */ beq $zero, $zero, .L80A6B8AC +/* 004CC 80A6B71C 8FBF0024 */ lw $ra, 0x0024($sp) .L80A6B720: /* 004D0 80A6B720 3C070600 */ lui $a3, 0x0600 ## $a3 = 06000000 /* 004D4 80A6B724 24E74580 */ addiu $a3, $a3, 0x4580 ## $a3 = 06004580 -/* 004D8 80A6B728 0C02998F */ jal func_800A663C +/* 004D8 80A6B728 0C02998F */ jal func_800A663C /* 004DC 80A6B72C 24C69FAC */ addiu $a2, $a2, 0x9FAC ## $a2 = FFFF9FAC /* 004E0 80A6B730 8E0A0150 */ lw $t2, 0x0150($s0) ## 00000150 /* 004E4 80A6B734 3C0580A7 */ lui $a1, %hi(D_80A6D370) ## $a1 = 80A70000 /* 004E8 80A6B738 260401A0 */ addiu $a0, $s0, 0x01A0 ## $a0 = 000001A0 -/* 004EC 80A6B73C 000A5880 */ sll $t3, $t2, 2 -/* 004F0 80A6B740 00AB2821 */ addu $a1, $a1, $t3 -/* 004F4 80A6B744 0C02947A */ jal func_800A51E8 -/* 004F8 80A6B748 8CA5D370 */ lw $a1, %lo(D_80A6D370)($a1) -/* 004FC 80A6B74C 0C29B1AC */ jal func_80A6C6B0 +/* 004EC 80A6B73C 000A5880 */ sll $t3, $t2, 2 +/* 004F0 80A6B740 00AB2821 */ addu $a1, $a1, $t3 +/* 004F4 80A6B744 0C02947A */ jal SkelAnime_ChangeAnimDefaultStop +/* 004F8 80A6B748 8CA5D370 */ lw $a1, %lo(D_80A6D370)($a1) +/* 004FC 80A6B74C 0C29B1AC */ jal func_80A6C6B0 /* 00500 80A6B750 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00504 80A6B754 10000055 */ beq $zero, $zero, .L80A6B8AC -/* 00508 80A6B758 8FBF0024 */ lw $ra, 0x0024($sp) +/* 00504 80A6B754 10000055 */ beq $zero, $zero, .L80A6B8AC +/* 00508 80A6B758 8FBF0024 */ lw $ra, 0x0024($sp) /* 0050C 80A6B75C 2401005D */ addiu $at, $zero, 0x005D ## $at = 0000005D .L80A6B760: -/* 00510 80A6B760 14410036 */ bne $v0, $at, .L80A6B83C -/* 00514 80A6B764 8FA4003C */ lw $a0, 0x003C($sp) +/* 00510 80A6B760 14410036 */ bne $v0, $at, .L80A6B83C +/* 00514 80A6B764 8FA4003C */ lw $a0, 0x003C($sp) /* 00518 80A6B768 3C0180A7 */ lui $at, %hi(D_80A6D5BC) ## $at = 80A70000 -/* 0051C 80A6B76C C42AD5BC */ lwc1 $f10, %lo(D_80A6D5BC)($at) +/* 0051C 80A6B76C C42AD5BC */ lwc1 $f10, %lo(D_80A6D5BC)($at) /* 00520 80A6B770 C6100024 */ lwc1 $f16, 0x0024($s0) ## 00000024 /* 00524 80A6B774 3C060601 */ lui $a2, 0x0601 ## $a2 = 06010000 /* 00528 80A6B778 3C0180A7 */ lui $at, %hi(D_80A6D5C0) ## $at = 80A70000 -/* 0052C 80A6B77C 46105032 */ c.eq.s $f10, $f16 +/* 0052C 80A6B77C 46105032 */ c.eq.s $f10, $f16 /* 00530 80A6B780 24C69FAC */ addiu $a2, $a2, 0x9FAC ## $a2 = 06009FAC -/* 00534 80A6B784 8FA4003C */ lw $a0, 0x003C($sp) +/* 00534 80A6B784 8FA4003C */ lw $a0, 0x003C($sp) /* 00538 80A6B788 26050154 */ addiu $a1, $s0, 0x0154 ## $a1 = 00000154 -/* 0053C 80A6B78C 45000020 */ bc1f .L80A6B810 +/* 0053C 80A6B78C 45000020 */ bc1f .L80A6B810 /* 00540 80A6B790 3C070600 */ lui $a3, 0x0600 ## $a3 = 06000000 -/* 00544 80A6B794 C432D5C0 */ lwc1 $f18, %lo(D_80A6D5C0)($at) +/* 00544 80A6B794 C432D5C0 */ lwc1 $f18, %lo(D_80A6D5C0)($at) /* 00548 80A6B798 C6040028 */ lwc1 $f4, 0x0028($s0) ## 00000028 /* 0054C 80A6B79C 3C0180A7 */ lui $at, %hi(D_80A6D5C4) ## $at = 80A70000 -/* 00550 80A6B7A0 46049032 */ c.eq.s $f18, $f4 +/* 00550 80A6B7A0 46049032 */ c.eq.s $f18, $f4 /* 00554 80A6B7A4 00000000 */ nop -/* 00558 80A6B7A8 45000019 */ bc1f .L80A6B810 +/* 00558 80A6B7A8 45000019 */ bc1f .L80A6B810 /* 0055C 80A6B7AC 00000000 */ nop -/* 00560 80A6B7B0 C426D5C4 */ lwc1 $f6, %lo(D_80A6D5C4)($at) +/* 00560 80A6B7B0 C426D5C4 */ lwc1 $f6, %lo(D_80A6D5C4)($at) /* 00564 80A6B7B4 C608002C */ lwc1 $f8, 0x002C($s0) ## 0000002C -/* 00568 80A6B7B8 46083032 */ c.eq.s $f6, $f8 +/* 00568 80A6B7B8 46083032 */ c.eq.s $f6, $f8 /* 0056C 80A6B7BC 00000000 */ nop -/* 00570 80A6B7C0 45000013 */ bc1f .L80A6B810 +/* 00570 80A6B7C0 45000013 */ bc1f .L80A6B810 /* 00574 80A6B7C4 00000000 */ nop /* 00578 80A6B7C8 3C060601 */ lui $a2, 0x0601 ## $a2 = 06010000 /* 0057C 80A6B7CC 3C070600 */ lui $a3, 0x0600 ## $a3 = 06000000 /* 00580 80A6B7D0 24E74580 */ addiu $a3, $a3, 0x4580 ## $a3 = 06004580 /* 00584 80A6B7D4 24C69FAC */ addiu $a2, $a2, 0x9FAC ## $a2 = 06009FAC -/* 00588 80A6B7D8 8FA4003C */ lw $a0, 0x003C($sp) -/* 0058C 80A6B7DC 0C02998F */ jal func_800A663C +/* 00588 80A6B7D8 8FA4003C */ lw $a0, 0x003C($sp) +/* 0058C 80A6B7DC 0C02998F */ jal func_800A663C /* 00590 80A6B7E0 26050154 */ addiu $a1, $s0, 0x0154 ## $a1 = 00000154 /* 00594 80A6B7E4 8E0C0150 */ lw $t4, 0x0150($s0) ## 00000150 /* 00598 80A6B7E8 3C0580A7 */ lui $a1, %hi(D_80A6D370) ## $a1 = 80A70000 /* 0059C 80A6B7EC 260401A0 */ addiu $a0, $s0, 0x01A0 ## $a0 = 000001A0 -/* 005A0 80A6B7F0 000C6880 */ sll $t5, $t4, 2 -/* 005A4 80A6B7F4 00AD2821 */ addu $a1, $a1, $t5 -/* 005A8 80A6B7F8 0C02947A */ jal func_800A51E8 -/* 005AC 80A6B7FC 8CA5D370 */ lw $a1, %lo(D_80A6D370)($a1) -/* 005B0 80A6B800 0C29B133 */ jal func_80A6C4CC +/* 005A0 80A6B7F0 000C6880 */ sll $t5, $t4, 2 +/* 005A4 80A6B7F4 00AD2821 */ addu $a1, $a1, $t5 +/* 005A8 80A6B7F8 0C02947A */ jal SkelAnime_ChangeAnimDefaultStop +/* 005AC 80A6B7FC 8CA5D370 */ lw $a1, %lo(D_80A6D370)($a1) +/* 005B0 80A6B800 0C29B133 */ jal func_80A6C4CC /* 005B4 80A6B804 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 005B8 80A6B808 10000028 */ beq $zero, $zero, .L80A6B8AC -/* 005BC 80A6B80C 8FBF0024 */ lw $ra, 0x0024($sp) +/* 005B8 80A6B808 10000028 */ beq $zero, $zero, .L80A6B8AC +/* 005BC 80A6B80C 8FBF0024 */ lw $ra, 0x0024($sp) .L80A6B810: -/* 005C0 80A6B810 0C02998F */ jal func_800A663C +/* 005C0 80A6B810 0C02998F */ jal func_800A663C /* 005C4 80A6B814 24E74580 */ addiu $a3, $a3, 0x4580 ## $a3 = 00004580 /* 005C8 80A6B818 8E0E0150 */ lw $t6, 0x0150($s0) ## 00000150 /* 005CC 80A6B81C 3C0580A7 */ lui $a1, %hi(D_80A6D370) ## $a1 = 80A70000 /* 005D0 80A6B820 260401A0 */ addiu $a0, $s0, 0x01A0 ## $a0 = 000001A0 -/* 005D4 80A6B824 000E7880 */ sll $t7, $t6, 2 -/* 005D8 80A6B828 00AF2821 */ addu $a1, $a1, $t7 -/* 005DC 80A6B82C 0C02947A */ jal func_800A51E8 -/* 005E0 80A6B830 8CA5D370 */ lw $a1, %lo(D_80A6D370)($a1) -/* 005E4 80A6B834 1000000F */ beq $zero, $zero, .L80A6B874 +/* 005D4 80A6B824 000E7880 */ sll $t7, $t6, 2 +/* 005D8 80A6B828 00AF2821 */ addu $a1, $a1, $t7 +/* 005DC 80A6B82C 0C02947A */ jal SkelAnime_ChangeAnimDefaultStop +/* 005E0 80A6B830 8CA5D370 */ lw $a1, %lo(D_80A6D370)($a1) +/* 005E4 80A6B834 1000000F */ beq $zero, $zero, .L80A6B874 /* 005E8 80A6B838 8602001C */ lh $v0, 0x001C($s0) ## 0000001C .L80A6B83C: /* 005EC 80A6B83C 3C060601 */ lui $a2, 0x0601 ## $a2 = 06010000 /* 005F0 80A6B840 3C070600 */ lui $a3, 0x0600 ## $a3 = 06000000 /* 005F4 80A6B844 24E74580 */ addiu $a3, $a3, 0x4580 ## $a3 = 06004580 /* 005F8 80A6B848 24C69FAC */ addiu $a2, $a2, 0x9FAC ## $a2 = 06009FAC -/* 005FC 80A6B84C 0C02998F */ jal func_800A663C +/* 005FC 80A6B84C 0C02998F */ jal func_800A663C /* 00600 80A6B850 26050154 */ addiu $a1, $s0, 0x0154 ## $a1 = 00000154 /* 00604 80A6B854 8E180150 */ lw $t8, 0x0150($s0) ## 00000150 /* 00608 80A6B858 3C0580A7 */ lui $a1, %hi(D_80A6D370) ## $a1 = 80A70000 /* 0060C 80A6B85C 260401A0 */ addiu $a0, $s0, 0x01A0 ## $a0 = 000001A0 -/* 00610 80A6B860 0018C880 */ sll $t9, $t8, 2 -/* 00614 80A6B864 00B92821 */ addu $a1, $a1, $t9 -/* 00618 80A6B868 0C02947A */ jal func_800A51E8 -/* 0061C 80A6B86C 8CA5D370 */ lw $a1, %lo(D_80A6D370)($a1) +/* 00610 80A6B860 0018C880 */ sll $t9, $t8, 2 +/* 00614 80A6B864 00B92821 */ addu $a1, $a1, $t9 +/* 00618 80A6B868 0C02947A */ jal SkelAnime_ChangeAnimDefaultStop +/* 0061C 80A6B86C 8CA5D370 */ lw $a1, %lo(D_80A6D370)($a1) /* 00620 80A6B870 8602001C */ lh $v0, 0x001C($s0) ## 0000001C .L80A6B874: /* 00624 80A6B874 24010010 */ addiu $at, $zero, 0x0010 ## $at = 00000010 /* 00628 80A6B878 304800F0 */ andi $t0, $v0, 0x00F0 ## $t0 = 00000000 -/* 0062C 80A6B87C 15010008 */ bne $t0, $at, .L80A6B8A0 +/* 0062C 80A6B87C 15010008 */ bne $t0, $at, .L80A6B8A0 /* 00630 80A6B880 3049000F */ andi $t1, $v0, 0x000F ## $t1 = 00000000 /* 00634 80A6B884 2401000F */ addiu $at, $zero, 0x000F ## $at = 0000000F -/* 00638 80A6B888 11210005 */ beq $t1, $at, .L80A6B8A0 +/* 00638 80A6B888 11210005 */ beq $t1, $at, .L80A6B8A0 /* 0063C 80A6B88C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00640 80A6B890 0C29AE47 */ jal func_80A6B91C -/* 00644 80A6B894 8FA5003C */ lw $a1, 0x003C($sp) -/* 00648 80A6B898 10000004 */ beq $zero, $zero, .L80A6B8AC -/* 0064C 80A6B89C 8FBF0024 */ lw $ra, 0x0024($sp) +/* 00640 80A6B890 0C29AE47 */ jal func_80A6B91C +/* 00644 80A6B894 8FA5003C */ lw $a1, 0x003C($sp) +/* 00648 80A6B898 10000004 */ beq $zero, $zero, .L80A6B8AC +/* 0064C 80A6B89C 8FBF0024 */ lw $ra, 0x0024($sp) .L80A6B8A0: -/* 00650 80A6B8A0 0C29AF12 */ jal func_80A6BC48 +/* 00650 80A6B8A0 0C29AF12 */ jal func_80A6BC48 /* 00654 80A6B8A4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00658 80A6B8A8 8FBF0024 */ lw $ra, 0x0024($sp) +/* 00658 80A6B8A8 8FBF0024 */ lw $ra, 0x0024($sp) .L80A6B8AC: -/* 0065C 80A6B8AC 8FB00020 */ lw $s0, 0x0020($sp) +/* 0065C 80A6B8AC 8FB00020 */ lw $s0, 0x0020($sp) /* 00660 80A6B8B0 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 -/* 00664 80A6B8B4 03E00008 */ jr $ra +/* 00664 80A6B8B4 03E00008 */ jr $ra /* 00668 80A6B8B8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse_Normal/func_80A6B91C.s b/asm/non_matchings/overlays/actors/ovl_En_Horse_Normal/func_80A6B91C.s index fedf1f5873..b5fc548794 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse_Normal/func_80A6B91C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse_Normal/func_80A6B91C.s @@ -1,8 +1,8 @@ glabel func_80A6B91C /* 006CC 80A6B91C 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 006D0 80A6B920 AFBF002C */ sw $ra, 0x002C($sp) -/* 006D4 80A6B924 AFB00028 */ sw $s0, 0x0028($sp) -/* 006D8 80A6B928 AFA5003C */ sw $a1, 0x003C($sp) +/* 006D0 80A6B920 AFBF002C */ sw $ra, 0x002C($sp) +/* 006D4 80A6B924 AFB00028 */ sw $s0, 0x0028($sp) +/* 006D8 80A6B928 AFA5003C */ sw $a1, 0x003C($sp) /* 006DC 80A6B92C 8C8E0004 */ lw $t6, 0x0004($a0) ## 00000004 /* 006E0 80A6B930 3C0140E0 */ lui $at, 0x40E0 ## $at = 40E00000 /* 006E4 80A6B934 44812000 */ mtc1 $at, $f4 ## $f4 = 7.00 @@ -14,37 +14,37 @@ glabel func_80A6B91C /* 006FC 80A6B94C AC98014C */ sw $t8, 0x014C($a0) ## 0000014C /* 00700 80A6B950 AC990150 */ sw $t9, 0x0150($a0) ## 00000150 /* 00704 80A6B954 AC800324 */ sw $zero, 0x0324($a0) ## 00000324 -/* 00708 80A6B958 0C29ACC3 */ jal func_80A6B30C +/* 00708 80A6B958 0C29ACC3 */ jal func_80A6B30C /* 0070C 80A6B95C E4840068 */ swc1 $f4, 0x0068($a0) ## 00000068 -/* 00710 80A6B960 E7A00030 */ swc1 $f0, 0x0030($sp) +/* 00710 80A6B960 E7A00030 */ swc1 $f0, 0x0030($sp) /* 00714 80A6B964 8E080150 */ lw $t0, 0x0150($s0) ## 00000150 /* 00718 80A6B968 3C0480A7 */ lui $a0, %hi(D_80A6D370) ## $a0 = 80A70000 -/* 0071C 80A6B96C 00084880 */ sll $t1, $t0, 2 -/* 00720 80A6B970 00892021 */ addu $a0, $a0, $t1 +/* 0071C 80A6B96C 00084880 */ sll $t1, $t0, 2 +/* 00720 80A6B970 00892021 */ addu $a0, $a0, $t1 /* 00724 80A6B974 0C028800 */ jal SkelAnime_GetFrameCount - -/* 00728 80A6B978 8C84D370 */ lw $a0, %lo(D_80A6D370)($a0) + +/* 00728 80A6B978 8C84D370 */ lw $a0, %lo(D_80A6D370)($a0) /* 0072C 80A6B97C 44823000 */ mtc1 $v0, $f6 ## $f6 = 0.00 /* 00730 80A6B980 8E0A0150 */ lw $t2, 0x0150($s0) ## 00000150 /* 00734 80A6B984 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 00738 80A6B988 46803220 */ cvt.s.w $f8, $f6 +/* 00738 80A6B988 46803220 */ cvt.s.w $f8, $f6 /* 0073C 80A6B98C 3C0580A7 */ lui $a1, %hi(D_80A6D370) ## $a1 = 80A70000 -/* 00740 80A6B990 000A5880 */ sll $t3, $t2, 2 -/* 00744 80A6B994 00AB2821 */ addu $a1, $a1, $t3 +/* 00740 80A6B990 000A5880 */ sll $t3, $t2, 2 +/* 00744 80A6B994 00AB2821 */ addu $a1, $a1, $t3 /* 00748 80A6B998 240C0002 */ addiu $t4, $zero, 0x0002 ## $t4 = 00000002 -/* 0074C 80A6B99C 44070000 */ mfc1 $a3, $f0 -/* 00750 80A6B9A0 AFAC0014 */ sw $t4, 0x0014($sp) -/* 00754 80A6B9A4 8CA5D370 */ lw $a1, %lo(D_80A6D370)($a1) -/* 00758 80A6B9A8 E7A80010 */ swc1 $f8, 0x0010($sp) +/* 0074C 80A6B99C 44070000 */ mfc1 $a3, $f0 +/* 00750 80A6B9A0 AFAC0014 */ sw $t4, 0x0014($sp) +/* 00754 80A6B9A4 8CA5D370 */ lw $a1, %lo(D_80A6D370)($a1) +/* 00758 80A6B9A8 E7A80010 */ swc1 $f8, 0x0010($sp) /* 0075C 80A6B9AC 260401A0 */ addiu $a0, $s0, 0x01A0 ## $a0 = 000001A0 -/* 00760 80A6B9B0 8FA60030 */ lw $a2, 0x0030($sp) -/* 00764 80A6B9B4 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 00768 80A6B9B8 E7A00018 */ swc1 $f0, 0x0018($sp) -/* 0076C 80A6B9BC 8FBF002C */ lw $ra, 0x002C($sp) -/* 00770 80A6B9C0 8FB00028 */ lw $s0, 0x0028($sp) +/* 00760 80A6B9B0 8FA60030 */ lw $a2, 0x0030($sp) +/* 00764 80A6B9B4 0C029468 */ jal SkelAnime_ChangeAnim + +/* 00768 80A6B9B8 E7A00018 */ swc1 $f0, 0x0018($sp) +/* 0076C 80A6B9BC 8FBF002C */ lw $ra, 0x002C($sp) +/* 00770 80A6B9C0 8FB00028 */ lw $s0, 0x0028($sp) /* 00774 80A6B9C4 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 -/* 00778 80A6B9C8 03E00008 */ jr $ra +/* 00778 80A6B9C8 03E00008 */ jr $ra /* 0077C 80A6B9CC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse_Normal/func_80A6B9D0.s b/asm/non_matchings/overlays/actors/ovl_En_Horse_Normal/func_80A6B9D0.s index 9ca767c025..606d59b896 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse_Normal/func_80A6B9D0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse_Normal/func_80A6B9D0.s @@ -1,128 +1,128 @@ glabel func_80A6B9D0 /* 00780 80A6B9D0 27BDFFB0 */ addiu $sp, $sp, 0xFFB0 ## $sp = FFFFFFB0 -/* 00784 80A6B9D4 AFBF002C */ sw $ra, 0x002C($sp) -/* 00788 80A6B9D8 AFB00028 */ sw $s0, 0x0028($sp) +/* 00784 80A6B9D4 AFBF002C */ sw $ra, 0x002C($sp) +/* 00788 80A6B9D8 AFB00028 */ sw $s0, 0x0028($sp) /* 0078C 80A6B9DC 848F001C */ lh $t7, 0x001C($a0) ## 0000001C /* 00790 80A6B9E0 3C0E0001 */ lui $t6, 0x0001 ## $t6 = 00010000 -/* 00794 80A6B9E4 01C57021 */ addu $t6, $t6, $a1 +/* 00794 80A6B9E4 01C57021 */ addu $t6, $t6, $a1 /* 00798 80A6B9E8 8DCE1E08 */ lw $t6, 0x1E08($t6) ## 00011E08 /* 0079C 80A6B9EC 31F8000F */ andi $t8, $t7, 0x000F ## $t8 = 00000000 -/* 007A0 80A6B9F0 0018C8C0 */ sll $t9, $t8, 3 -/* 007A4 80A6B9F4 01D93021 */ addu $a2, $t6, $t9 +/* 007A0 80A6B9F0 0018C8C0 */ sll $t9, $t8, 3 +/* 007A4 80A6B9F4 01D93021 */ addu $a2, $t6, $t9 /* 007A8 80A6B9F8 8CC30004 */ lw $v1, 0x0004($a2) ## 00000004 /* 007AC 80A6B9FC 3C0B8016 */ lui $t3, 0x8016 ## $t3 = 80160000 /* 007B0 80A6BA00 8C8D0324 */ lw $t5, 0x0324($a0) ## 00000324 -/* 007B4 80A6BA04 00034100 */ sll $t0, $v1, 4 -/* 007B8 80A6BA08 00084F02 */ srl $t1, $t0, 28 -/* 007BC 80A6BA0C 00095080 */ sll $t2, $t1, 2 -/* 007C0 80A6BA10 016A5821 */ addu $t3, $t3, $t2 +/* 007B4 80A6BA04 00034100 */ sll $t0, $v1, 4 +/* 007B8 80A6BA08 00084F02 */ srl $t1, $t0, 28 +/* 007BC 80A6BA0C 00095080 */ sll $t2, $t1, 2 +/* 007C0 80A6BA10 016A5821 */ addu $t3, $t3, $t2 /* 007C4 80A6BA14 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 /* 007C8 80A6BA18 8D6B6FA8 */ lw $t3, 0x6FA8($t3) ## 80166FA8 /* 007CC 80A6BA1C 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF -/* 007D0 80A6BA20 00616024 */ and $t4, $v1, $at -/* 007D4 80A6BA24 000D7880 */ sll $t7, $t5, 2 +/* 007D0 80A6BA20 00616024 */ and $t4, $v1, $at +/* 007D4 80A6BA24 000D7880 */ sll $t7, $t5, 2 /* 007D8 80A6BA28 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 007DC 80A6BA2C 01ED7823 */ subu $t7, $t7, $t5 -/* 007E0 80A6BA30 016C1021 */ addu $v0, $t3, $t4 -/* 007E4 80A6BA34 00411021 */ addu $v0, $v0, $at -/* 007E8 80A6BA38 000F7840 */ sll $t7, $t7, 1 -/* 007EC 80A6BA3C 004F1021 */ addu $v0, $v0, $t7 +/* 007DC 80A6BA2C 01ED7823 */ subu $t7, $t7, $t5 +/* 007E0 80A6BA30 016C1021 */ addu $v0, $t3, $t4 +/* 007E4 80A6BA34 00411021 */ addu $v0, $v0, $at +/* 007E8 80A6BA38 000F7840 */ sll $t7, $t7, 1 +/* 007EC 80A6BA3C 004F1021 */ addu $v0, $v0, $t7 /* 007F0 80A6BA40 84580000 */ lh $t8, 0x0000($v0) ## 00000000 /* 007F4 80A6BA44 844E0004 */ lh $t6, 0x0004($v0) ## 00000004 /* 007F8 80A6BA48 C4880024 */ lwc1 $f8, 0x0024($a0) ## 00000024 /* 007FC 80A6BA4C 44982000 */ mtc1 $t8, $f4 ## $f4 = 0.00 /* 00800 80A6BA50 448E5000 */ mtc1 $t6, $f10 ## $f10 = 0.00 /* 00804 80A6BA54 C492002C */ lwc1 $f18, 0x002C($a0) ## 0000002C -/* 00808 80A6BA58 468021A0 */ cvt.s.w $f6, $f4 +/* 00808 80A6BA58 468021A0 */ cvt.s.w $f6, $f4 /* 0080C 80A6BA5C 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00810 80A6BA60 AFA6004C */ sw $a2, 0x004C($sp) -/* 00814 80A6BA64 46805420 */ cvt.s.w $f16, $f10 -/* 00818 80A6BA68 46083301 */ sub.s $f12, $f6, $f8 -/* 0081C 80A6BA6C 46128381 */ sub.s $f14, $f16, $f18 -/* 00820 80A6BA70 E7AC0044 */ swc1 $f12, 0x0044($sp) -/* 00824 80A6BA74 0C03F494 */ jal func_800FD250 -/* 00828 80A6BA78 E7AE0040 */ swc1 $f14, 0x0040($sp) +/* 00810 80A6BA60 AFA6004C */ sw $a2, 0x004C($sp) +/* 00814 80A6BA64 46805420 */ cvt.s.w $f16, $f10 +/* 00818 80A6BA68 46083301 */ sub.s $f12, $f6, $f8 +/* 0081C 80A6BA6C 46128381 */ sub.s $f14, $f16, $f18 +/* 00820 80A6BA70 E7AC0044 */ swc1 $f12, 0x0044($sp) +/* 00824 80A6BA74 0C03F494 */ jal Math_atan2f +/* 00828 80A6BA78 E7AE0040 */ swc1 $f14, 0x0040($sp) /* 0082C 80A6BA7C 3C0180A7 */ lui $at, %hi(D_80A6D5C8) ## $at = 80A70000 -/* 00830 80A6BA80 C424D5C8 */ lwc1 $f4, %lo(D_80A6D5C8)($at) +/* 00830 80A6BA80 C424D5C8 */ lwc1 $f4, %lo(D_80A6D5C8)($at) /* 00834 80A6BA84 24080001 */ addiu $t0, $zero, 0x0001 ## $t0 = 00000001 -/* 00838 80A6BA88 AFA80010 */ sw $t0, 0x0010($sp) -/* 0083C 80A6BA8C 46040182 */ mul.s $f6, $f0, $f4 +/* 00838 80A6BA88 AFA80010 */ sw $t0, 0x0010($sp) +/* 0083C 80A6BA8C 46040182 */ mul.s $f6, $f0, $f4 /* 00840 80A6BA90 26040032 */ addiu $a0, $s0, 0x0032 ## $a0 = 00000032 /* 00844 80A6BA94 2406000A */ addiu $a2, $zero, 0x000A ## $a2 = 0000000A /* 00848 80A6BA98 240707D0 */ addiu $a3, $zero, 0x07D0 ## $a3 = 000007D0 -/* 0084C 80A6BA9C 4600320D */ trunc.w.s $f8, $f6 -/* 00850 80A6BAA0 44054000 */ mfc1 $a1, $f8 +/* 0084C 80A6BA9C 4600320D */ trunc.w.s $f8, $f6 +/* 00850 80A6BAA0 44054000 */ mfc1 $a1, $f8 /* 00854 80A6BAA4 00000000 */ nop -/* 00858 80A6BAA8 00052C00 */ sll $a1, $a1, 16 +/* 00858 80A6BAA8 00052C00 */ sll $a1, $a1, 16 /* 0085C 80A6BAAC 0C01E1A7 */ jal Math_SmoothScaleMaxMinS - -/* 00860 80A6BAB0 00052C03 */ sra $a1, $a1, 16 -/* 00864 80A6BAB4 C7AC0044 */ lwc1 $f12, 0x0044($sp) -/* 00868 80A6BAB8 C7AE0040 */ lwc1 $f14, 0x0040($sp) + +/* 00860 80A6BAB0 00052C03 */ sra $a1, $a1, 16 +/* 00864 80A6BAB4 C7AC0044 */ lwc1 $f12, 0x0044($sp) +/* 00868 80A6BAB8 C7AE0040 */ lwc1 $f14, 0x0040($sp) /* 0086C 80A6BABC 3C014416 */ lui $at, 0x4416 ## $at = 44160000 -/* 00870 80A6BAC0 460C6282 */ mul.s $f10, $f12, $f12 +/* 00870 80A6BAC0 460C6282 */ mul.s $f10, $f12, $f12 /* 00874 80A6BAC4 44812000 */ mtc1 $at, $f4 ## $f4 = 600.00 /* 00878 80A6BAC8 86090032 */ lh $t1, 0x0032($s0) ## 00000032 -/* 0087C 80A6BACC 460E7402 */ mul.s $f16, $f14, $f14 +/* 0087C 80A6BACC 460E7402 */ mul.s $f16, $f14, $f14 /* 00880 80A6BAD0 A60900B6 */ sh $t1, 0x00B6($s0) ## 000000B6 -/* 00884 80A6BAD4 46105480 */ add.s $f18, $f10, $f16 -/* 00888 80A6BAD8 4604903C */ c.lt.s $f18, $f4 +/* 00884 80A6BAD4 46105480 */ add.s $f18, $f10, $f16 +/* 00888 80A6BAD8 4604903C */ c.lt.s $f18, $f4 /* 0088C 80A6BADC 00000000 */ nop -/* 00890 80A6BAE0 4500000A */ bc1f .L80A6BB0C +/* 00890 80A6BAE0 4500000A */ bc1f .L80A6BB0C /* 00894 80A6BAE4 00000000 */ nop /* 00898 80A6BAE8 8E0A0324 */ lw $t2, 0x0324($s0) ## 00000324 /* 0089C 80A6BAEC 254B0001 */ addiu $t3, $t2, 0x0001 ## $t3 = 00000001 /* 008A0 80A6BAF0 AE0B0324 */ sw $t3, 0x0324($s0) ## 00000324 -/* 008A4 80A6BAF4 8FAD004C */ lw $t5, 0x004C($sp) +/* 008A4 80A6BAF4 8FAD004C */ lw $t5, 0x004C($sp) /* 008A8 80A6BAF8 91AF0000 */ lbu $t7, 0x0000($t5) ## 00000000 -/* 008AC 80A6BAFC 016F082A */ slt $at, $t3, $t7 -/* 008B0 80A6BB00 14200002 */ bne $at, $zero, .L80A6BB0C +/* 008AC 80A6BAFC 016F082A */ slt $at, $t3, $t7 +/* 008B0 80A6BB00 14200002 */ bne $at, $zero, .L80A6BB0C /* 008B4 80A6BB04 00000000 */ nop /* 008B8 80A6BB08 AE000324 */ sw $zero, 0x0324($s0) ## 00000324 .L80A6BB0C: -/* 008BC 80A6BB0C 0C29ACC3 */ jal func_80A6B30C +/* 008BC 80A6BB0C 0C29ACC3 */ jal func_80A6B30C /* 008C0 80A6BB10 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 008C4 80A6BB14 E60001BC */ swc1 $f0, 0x01BC($s0) ## 000001BC /* 008C8 80A6BB18 260401A0 */ addiu $a0, $s0, 0x01A0 ## $a0 = 000001A0 /* 008CC 80A6BB1C 0C02927F */ jal SkelAnime_FrameUpdateMatrix - -/* 008D0 80A6BB20 AFA40030 */ sw $a0, 0x0030($sp) -/* 008D4 80A6BB24 5040001D */ beql $v0, $zero, .L80A6BB9C -/* 008D8 80A6BB28 8FBF002C */ lw $ra, 0x002C($sp) -/* 008DC 80A6BB2C 0C29ACC3 */ jal func_80A6B30C + +/* 008D0 80A6BB20 AFA40030 */ sw $a0, 0x0030($sp) +/* 008D4 80A6BB24 5040001D */ beql $v0, $zero, .L80A6BB9C +/* 008D8 80A6BB28 8FBF002C */ lw $ra, 0x002C($sp) +/* 008DC 80A6BB2C 0C29ACC3 */ jal func_80A6B30C /* 008E0 80A6BB30 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 008E4 80A6BB34 E7A00038 */ swc1 $f0, 0x0038($sp) +/* 008E4 80A6BB34 E7A00038 */ swc1 $f0, 0x0038($sp) /* 008E8 80A6BB38 8E180150 */ lw $t8, 0x0150($s0) ## 00000150 /* 008EC 80A6BB3C 3C0480A7 */ lui $a0, %hi(D_80A6D370) ## $a0 = 80A70000 -/* 008F0 80A6BB40 00187080 */ sll $t6, $t8, 2 -/* 008F4 80A6BB44 008E2021 */ addu $a0, $a0, $t6 +/* 008F0 80A6BB40 00187080 */ sll $t6, $t8, 2 +/* 008F4 80A6BB44 008E2021 */ addu $a0, $a0, $t6 /* 008F8 80A6BB48 0C028800 */ jal SkelAnime_GetFrameCount - -/* 008FC 80A6BB4C 8C84D370 */ lw $a0, %lo(D_80A6D370)($a0) + +/* 008FC 80A6BB4C 8C84D370 */ lw $a0, %lo(D_80A6D370)($a0) /* 00900 80A6BB50 44823000 */ mtc1 $v0, $f6 ## $f6 = 0.00 /* 00904 80A6BB54 8E190150 */ lw $t9, 0x0150($s0) ## 00000150 /* 00908 80A6BB58 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 0090C 80A6BB5C 46803220 */ cvt.s.w $f8, $f6 +/* 0090C 80A6BB5C 46803220 */ cvt.s.w $f8, $f6 /* 00910 80A6BB60 3C0580A7 */ lui $a1, %hi(D_80A6D370) ## $a1 = 80A70000 -/* 00914 80A6BB64 00194080 */ sll $t0, $t9, 2 -/* 00918 80A6BB68 00A82821 */ addu $a1, $a1, $t0 +/* 00914 80A6BB64 00194080 */ sll $t0, $t9, 2 +/* 00918 80A6BB68 00A82821 */ addu $a1, $a1, $t0 /* 0091C 80A6BB6C 24090002 */ addiu $t1, $zero, 0x0002 ## $t1 = 00000002 -/* 00920 80A6BB70 44070000 */ mfc1 $a3, $f0 -/* 00924 80A6BB74 AFA90014 */ sw $t1, 0x0014($sp) -/* 00928 80A6BB78 8CA5D370 */ lw $a1, %lo(D_80A6D370)($a1) -/* 0092C 80A6BB7C E7A80010 */ swc1 $f8, 0x0010($sp) -/* 00930 80A6BB80 8FA40030 */ lw $a0, 0x0030($sp) -/* 00934 80A6BB84 8FA60038 */ lw $a2, 0x0038($sp) -/* 00938 80A6BB88 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 0093C 80A6BB8C E7A00018 */ swc1 $f0, 0x0018($sp) -/* 00940 80A6BB90 0C29AF3B */ jal func_80A6BCEC +/* 00920 80A6BB70 44070000 */ mfc1 $a3, $f0 +/* 00924 80A6BB74 AFA90014 */ sw $t1, 0x0014($sp) +/* 00928 80A6BB78 8CA5D370 */ lw $a1, %lo(D_80A6D370)($a1) +/* 0092C 80A6BB7C E7A80010 */ swc1 $f8, 0x0010($sp) +/* 00930 80A6BB80 8FA40030 */ lw $a0, 0x0030($sp) +/* 00934 80A6BB84 8FA60038 */ lw $a2, 0x0038($sp) +/* 00938 80A6BB88 0C029468 */ jal SkelAnime_ChangeAnim + +/* 0093C 80A6BB8C E7A00018 */ swc1 $f0, 0x0018($sp) +/* 00940 80A6BB90 0C29AF3B */ jal func_80A6BCEC /* 00944 80A6BB94 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00948 80A6BB98 8FBF002C */ lw $ra, 0x002C($sp) +/* 00948 80A6BB98 8FBF002C */ lw $ra, 0x002C($sp) .L80A6BB9C: -/* 0094C 80A6BB9C 8FB00028 */ lw $s0, 0x0028($sp) +/* 0094C 80A6BB9C 8FB00028 */ lw $s0, 0x0028($sp) /* 00950 80A6BBA0 27BD0050 */ addiu $sp, $sp, 0x0050 ## $sp = 00000000 -/* 00954 80A6BBA4 03E00008 */ jr $ra +/* 00954 80A6BBA4 03E00008 */ jr $ra /* 00958 80A6BBA8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse_Normal/func_80A6BBAC.s b/asm/non_matchings/overlays/actors/ovl_En_Horse_Normal/func_80A6BBAC.s index 59992dae84..abc5f8ba72 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse_Normal/func_80A6BBAC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse_Normal/func_80A6BBAC.s @@ -1,25 +1,25 @@ glabel func_80A6BBAC /* 0095C 80A6BBAC 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00960 80A6BBB0 AFBF0014 */ sw $ra, 0x0014($sp) +/* 00960 80A6BBB0 AFBF0014 */ sw $ra, 0x0014($sp) /* 00964 80A6BBB4 8C8E0150 */ lw $t6, 0x0150($a0) ## 00000150 /* 00968 80A6BBB8 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 /* 0096C 80A6BBBC AC80014C */ sw $zero, 0x014C($a0) ## 0000014C /* 00970 80A6BBC0 25C20001 */ addiu $v0, $t6, 0x0001 ## $v0 = 00000001 -/* 00974 80A6BBC4 28410009 */ slti $at, $v0, 0x0009 -/* 00978 80A6BBC8 14200003 */ bne $at, $zero, .L80A6BBD8 +/* 00974 80A6BBC4 28410009 */ slti $at, $v0, 0x0009 +/* 00978 80A6BBC8 14200003 */ bne $at, $zero, .L80A6BBD8 /* 0097C 80A6BBCC AC820150 */ sw $v0, 0x0150($a0) ## 00000150 /* 00980 80A6BBD0 AC800150 */ sw $zero, 0x0150($a0) ## 00000150 /* 00984 80A6BBD4 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 .L80A6BBD8: -/* 00988 80A6BBD8 0002C080 */ sll $t8, $v0, 2 +/* 00988 80A6BBD8 0002C080 */ sll $t8, $v0, 2 /* 0098C 80A6BBDC 3C0580A7 */ lui $a1, %hi(D_80A6D370) ## $a1 = 80A70000 -/* 00990 80A6BBE0 00B82821 */ addu $a1, $a1, $t8 -/* 00994 80A6BBE4 8CA5D370 */ lw $a1, %lo(D_80A6D370)($a1) -/* 00998 80A6BBE8 0C02947A */ jal func_800A51E8 +/* 00990 80A6BBE0 00B82821 */ addu $a1, $a1, $t8 +/* 00994 80A6BBE4 8CA5D370 */ lw $a1, %lo(D_80A6D370)($a1) +/* 00998 80A6BBE8 0C02947A */ jal SkelAnime_ChangeAnimDefaultStop /* 0099C 80A6BBEC 24C401A0 */ addiu $a0, $a2, 0x01A0 ## $a0 = 000001A0 -/* 009A0 80A6BBF0 8FBF0014 */ lw $ra, 0x0014($sp) +/* 009A0 80A6BBF0 8FBF0014 */ lw $ra, 0x0014($sp) /* 009A4 80A6BBF4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 009A8 80A6BBF8 03E00008 */ jr $ra +/* 009A8 80A6BBF8 03E00008 */ jr $ra /* 009AC 80A6BBFC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse_Normal/func_80A6BC48.s b/asm/non_matchings/overlays/actors/ovl_En_Horse_Normal/func_80A6BC48.s index c6c83eb721..947b436644 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse_Normal/func_80A6BC48.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse_Normal/func_80A6BC48.s @@ -1,7 +1,7 @@ glabel func_80A6BC48 /* 009F8 80A6BC48 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 009FC 80A6BC4C AFBF002C */ sw $ra, 0x002C($sp) -/* 00A00 80A6BC50 AFB00028 */ sw $s0, 0x0028($sp) +/* 009FC 80A6BC4C AFBF002C */ sw $ra, 0x002C($sp) +/* 00A00 80A6BC50 AFB00028 */ sw $s0, 0x0028($sp) /* 00A04 80A6BC54 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 /* 00A08 80A6BC58 240E0001 */ addiu $t6, $zero, 0x0001 ## $t6 = 00000001 /* 00A0C 80A6BC5C 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 @@ -10,37 +10,37 @@ glabel func_80A6BC48 /* 00A18 80A6BC68 A480021C */ sh $zero, 0x021C($a0) ## 0000021C /* 00A1C 80A6BC6C A480021E */ sh $zero, 0x021E($a0) ## 0000021E /* 00A20 80A6BC70 E4800068 */ swc1 $f0, 0x0068($a0) ## 00000068 -/* 00A24 80A6BC74 0C29ACC3 */ jal func_80A6B30C +/* 00A24 80A6BC74 0C29ACC3 */ jal func_80A6B30C /* 00A28 80A6BC78 E4800218 */ swc1 $f0, 0x0218($a0) ## 00000218 -/* 00A2C 80A6BC7C E7A00030 */ swc1 $f0, 0x0030($sp) +/* 00A2C 80A6BC7C E7A00030 */ swc1 $f0, 0x0030($sp) /* 00A30 80A6BC80 8E0F0150 */ lw $t7, 0x0150($s0) ## 00000150 /* 00A34 80A6BC84 3C0480A7 */ lui $a0, %hi(D_80A6D370) ## $a0 = 80A70000 -/* 00A38 80A6BC88 000FC080 */ sll $t8, $t7, 2 -/* 00A3C 80A6BC8C 00982021 */ addu $a0, $a0, $t8 +/* 00A38 80A6BC88 000FC080 */ sll $t8, $t7, 2 +/* 00A3C 80A6BC8C 00982021 */ addu $a0, $a0, $t8 /* 00A40 80A6BC90 0C028800 */ jal SkelAnime_GetFrameCount - -/* 00A44 80A6BC94 8C84D370 */ lw $a0, %lo(D_80A6D370)($a0) + +/* 00A44 80A6BC94 8C84D370 */ lw $a0, %lo(D_80A6D370)($a0) /* 00A48 80A6BC98 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 00A4C 80A6BC9C 8E190150 */ lw $t9, 0x0150($s0) ## 00000150 /* 00A50 80A6BCA0 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 00A54 80A6BCA4 468021A0 */ cvt.s.w $f6, $f4 +/* 00A54 80A6BCA4 468021A0 */ cvt.s.w $f6, $f4 /* 00A58 80A6BCA8 3C0580A7 */ lui $a1, %hi(D_80A6D370) ## $a1 = 80A70000 -/* 00A5C 80A6BCAC 00194080 */ sll $t0, $t9, 2 -/* 00A60 80A6BCB0 00A82821 */ addu $a1, $a1, $t0 +/* 00A5C 80A6BCAC 00194080 */ sll $t0, $t9, 2 +/* 00A60 80A6BCB0 00A82821 */ addu $a1, $a1, $t0 /* 00A64 80A6BCB4 24090002 */ addiu $t1, $zero, 0x0002 ## $t1 = 00000002 -/* 00A68 80A6BCB8 44070000 */ mfc1 $a3, $f0 -/* 00A6C 80A6BCBC AFA90014 */ sw $t1, 0x0014($sp) -/* 00A70 80A6BCC0 8CA5D370 */ lw $a1, %lo(D_80A6D370)($a1) -/* 00A74 80A6BCC4 E7A60010 */ swc1 $f6, 0x0010($sp) +/* 00A68 80A6BCB8 44070000 */ mfc1 $a3, $f0 +/* 00A6C 80A6BCBC AFA90014 */ sw $t1, 0x0014($sp) +/* 00A70 80A6BCC0 8CA5D370 */ lw $a1, %lo(D_80A6D370)($a1) +/* 00A74 80A6BCC4 E7A60010 */ swc1 $f6, 0x0010($sp) /* 00A78 80A6BCC8 260401A0 */ addiu $a0, $s0, 0x01A0 ## $a0 = 000001A0 -/* 00A7C 80A6BCCC 8FA60030 */ lw $a2, 0x0030($sp) -/* 00A80 80A6BCD0 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 00A84 80A6BCD4 E7A00018 */ swc1 $f0, 0x0018($sp) -/* 00A88 80A6BCD8 8FBF002C */ lw $ra, 0x002C($sp) -/* 00A8C 80A6BCDC 8FB00028 */ lw $s0, 0x0028($sp) +/* 00A7C 80A6BCCC 8FA60030 */ lw $a2, 0x0030($sp) +/* 00A80 80A6BCD0 0C029468 */ jal SkelAnime_ChangeAnim + +/* 00A84 80A6BCD4 E7A00018 */ swc1 $f0, 0x0018($sp) +/* 00A88 80A6BCD8 8FBF002C */ lw $ra, 0x002C($sp) +/* 00A8C 80A6BCDC 8FB00028 */ lw $s0, 0x0028($sp) /* 00A90 80A6BCE0 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 -/* 00A94 80A6BCE4 03E00008 */ jr $ra +/* 00A94 80A6BCE4 03E00008 */ jr $ra /* 00A98 80A6BCE8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse_Normal/func_80A6BE6C.s b/asm/non_matchings/overlays/actors/ovl_En_Horse_Normal/func_80A6BE6C.s index 71b25520f4..e6c04e777a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse_Normal/func_80A6BE6C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse_Normal/func_80A6BE6C.s @@ -1,159 +1,159 @@ glabel func_80A6BE6C /* 00C1C 80A6BE6C 27BDFFB0 */ addiu $sp, $sp, 0xFFB0 ## $sp = FFFFFFB0 -/* 00C20 80A6BE70 AFBF002C */ sw $ra, 0x002C($sp) -/* 00C24 80A6BE74 AFB00028 */ sw $s0, 0x0028($sp) -/* 00C28 80A6BE78 AFA50054 */ sw $a1, 0x0054($sp) +/* 00C20 80A6BE70 AFBF002C */ sw $ra, 0x002C($sp) +/* 00C24 80A6BE74 AFB00028 */ sw $s0, 0x0028($sp) +/* 00C28 80A6BE78 AFA50054 */ sw $a1, 0x0054($sp) /* 00C2C 80A6BE7C 8C830150 */ lw $v1, 0x0150($a0) ## 00000150 /* 00C30 80A6BE80 3C0280A7 */ lui $v0, %hi(D_80A6D510) ## $v0 = 80A70000 /* 00C34 80A6BE84 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00C38 80A6BE88 00037080 */ sll $t6, $v1, 2 -/* 00C3C 80A6BE8C 004E1021 */ addu $v0, $v0, $t6 -/* 00C40 80A6BE90 8C42D510 */ lw $v0, %lo(D_80A6D510)($v0) +/* 00C38 80A6BE88 00037080 */ sll $t6, $v1, 2 +/* 00C3C 80A6BE8C 004E1021 */ addu $v0, $v0, $t6 +/* 00C40 80A6BE90 8C42D510 */ lw $v0, %lo(D_80A6D510)($v0) /* 00C44 80A6BE94 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 /* 00C48 80A6BE98 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00C4C 80A6BE9C 10400009 */ beq $v0, $zero, .L80A6BEC4 +/* 00C4C 80A6BE9C 10400009 */ beq $v0, $zero, .L80A6BEC4 /* 00C50 80A6BEA0 00604025 */ or $t0, $v1, $zero ## $t0 = 00000000 -/* 00C54 80A6BEA4 10410010 */ beq $v0, $at, .L80A6BEE8 +/* 00C54 80A6BEA4 10410010 */ beq $v0, $at, .L80A6BEE8 /* 00C58 80A6BEA8 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 00C5C 80A6BEAC 104100AC */ beq $v0, $at, .L80A6C160 +/* 00C5C 80A6BEAC 104100AC */ beq $v0, $at, .L80A6C160 /* 00C60 80A6BEB0 24010003 */ addiu $at, $zero, 0x0003 ## $at = 00000003 -/* 00C64 80A6BEB4 104100AA */ beq $v0, $at, .L80A6C160 +/* 00C64 80A6BEB4 104100AA */ beq $v0, $at, .L80A6C160 /* 00C68 80A6BEB8 00000000 */ nop -/* 00C6C 80A6BEBC 100000A8 */ beq $zero, $zero, .L80A6C160 +/* 00C6C 80A6BEBC 100000A8 */ beq $zero, $zero, .L80A6C160 /* 00C70 80A6BEC0 00000000 */ nop .L80A6BEC4: -/* 00C74 80A6BEC4 0C29AF5F */ jal func_80A6BD7C -/* 00C78 80A6BEC8 AFA8004C */ sw $t0, 0x004C($sp) +/* 00C74 80A6BEC4 0C29AF5F */ jal func_80A6BD7C +/* 00C78 80A6BEC8 AFA8004C */ sw $t0, 0x004C($sp) /* 00C7C 80A6BECC 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 /* 00C80 80A6BED0 44803000 */ mtc1 $zero, $f6 ## $f6 = 0.00 -/* 00C84 80A6BED4 8FA8004C */ lw $t0, 0x004C($sp) +/* 00C84 80A6BED4 8FA8004C */ lw $t0, 0x004C($sp) /* 00C88 80A6BED8 8E030150 */ lw $v1, 0x0150($s0) ## 00000150 /* 00C8C 80A6BEDC E6040068 */ swc1 $f4, 0x0068($s0) ## 00000068 -/* 00C90 80A6BEE0 1000009F */ beq $zero, $zero, .L80A6C160 +/* 00C90 80A6BEE0 1000009F */ beq $zero, $zero, .L80A6C160 /* 00C94 80A6BEE4 E6060218 */ swc1 $f6, 0x0218($s0) ## 00000218 .L80A6BEE8: /* 00C98 80A6BEE8 0C03F66B */ jal Math_Rand_ZeroOne ## Rand.Next() float /* 00C9C 80A6BEEC 00000000 */ nop /* 00CA0 80A6BEF0 3C0180A7 */ lui $at, %hi(D_80A6D5CC) ## $at = 80A70000 -/* 00CA4 80A6BEF4 C428D5CC */ lwc1 $f8, %lo(D_80A6D5CC)($at) -/* 00CA8 80A6BEF8 4608003C */ c.lt.s $f0, $f8 +/* 00CA4 80A6BEF4 C428D5CC */ lwc1 $f8, %lo(D_80A6D5CC)($at) +/* 00CA8 80A6BEF8 4608003C */ c.lt.s $f0, $f8 /* 00CAC 80A6BEFC 00000000 */ nop -/* 00CB0 80A6BF00 4502000A */ bc1fl .L80A6BF2C +/* 00CB0 80A6BF00 4502000A */ bc1fl .L80A6BF2C /* 00CB4 80A6BF04 C6040068 */ lwc1 $f4, 0x0068($s0) ## 00000068 /* 00CB8 80A6BF08 0C03F66B */ jal Math_Rand_ZeroOne ## Rand.Next() float /* 00CBC 80A6BF0C 00000000 */ nop -/* 00CC0 80A6BF10 46000280 */ add.s $f10, $f0, $f0 +/* 00CC0 80A6BF10 46000280 */ add.s $f10, $f0, $f0 /* 00CC4 80A6BF14 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 /* 00CC8 80A6BF18 44818000 */ mtc1 $at, $f16 ## $f16 = 1.00 /* 00CCC 80A6BF1C 00000000 */ nop -/* 00CD0 80A6BF20 46105481 */ sub.s $f18, $f10, $f16 +/* 00CD0 80A6BF20 46105481 */ sub.s $f18, $f10, $f16 /* 00CD4 80A6BF24 E6120218 */ swc1 $f18, 0x0218($s0) ## 00000218 /* 00CD8 80A6BF28 C6040068 */ lwc1 $f4, 0x0068($s0) ## 00000068 .L80A6BF2C: /* 00CDC 80A6BF2C C6060218 */ lwc1 $f6, 0x0218($s0) ## 00000218 /* 00CE0 80A6BF30 44805000 */ mtc1 $zero, $f10 ## $f10 = 0.00 /* 00CE4 80A6BF34 3C014040 */ lui $at, 0x4040 ## $at = 40400000 -/* 00CE8 80A6BF38 46062200 */ add.s $f8, $f4, $f6 +/* 00CE8 80A6BF38 46062200 */ add.s $f8, $f4, $f6 /* 00CEC 80A6BF3C E6080068 */ swc1 $f8, 0x0068($s0) ## 00000068 /* 00CF0 80A6BF40 C6000068 */ lwc1 $f0, 0x0068($s0) ## 00000068 -/* 00CF4 80A6BF44 460A003E */ c.le.s $f0, $f10 +/* 00CF4 80A6BF44 460A003E */ c.le.s $f0, $f10 /* 00CF8 80A6BF48 00000000 */ nop -/* 00CFC 80A6BF4C 45020008 */ bc1fl .L80A6BF70 +/* 00CFC 80A6BF4C 45020008 */ bc1fl .L80A6BF70 /* 00D00 80A6BF50 44812000 */ mtc1 $at, $f4 ## $f4 = 3.00 /* 00D04 80A6BF54 44808000 */ mtc1 $zero, $f16 ## $f16 = 0.00 /* 00D08 80A6BF58 44809000 */ mtc1 $zero, $f18 ## $f18 = 0.00 /* 00D0C 80A6BF5C 00004025 */ or $t0, $zero, $zero ## $t0 = 00000000 /* 00D10 80A6BF60 E6100068 */ swc1 $f16, 0x0068($s0) ## 00000068 -/* 00D14 80A6BF64 1000001C */ beq $zero, $zero, .L80A6BFD8 +/* 00D14 80A6BF64 1000001C */ beq $zero, $zero, .L80A6BFD8 /* 00D18 80A6BF68 E6120218 */ swc1 $f18, 0x0218($s0) ## 00000218 /* 00D1C 80A6BF6C 44812000 */ mtc1 $at, $f4 ## $f4 = 3.00 .L80A6BF70: /* 00D20 80A6BF70 3C0140C0 */ lui $at, 0x40C0 ## $at = 40C00000 -/* 00D24 80A6BF74 4604003C */ c.lt.s $f0, $f4 +/* 00D24 80A6BF74 4604003C */ c.lt.s $f0, $f4 /* 00D28 80A6BF78 00000000 */ nop -/* 00D2C 80A6BF7C 45020006 */ bc1fl .L80A6BF98 +/* 00D2C 80A6BF7C 45020006 */ bc1fl .L80A6BF98 /* 00D30 80A6BF80 44813000 */ mtc1 $at, $f6 ## $f6 = 6.00 -/* 00D34 80A6BF84 0C29AC94 */ jal func_80A6B250 +/* 00D34 80A6BF84 0C29AC94 */ jal func_80A6B250 /* 00D38 80A6BF88 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00D3C 80A6BF8C 10000012 */ beq $zero, $zero, .L80A6BFD8 +/* 00D3C 80A6BF8C 10000012 */ beq $zero, $zero, .L80A6BFD8 /* 00D40 80A6BF90 24080004 */ addiu $t0, $zero, 0x0004 ## $t0 = 00000004 /* 00D44 80A6BF94 44813000 */ mtc1 $at, $f6 ## $f6 = 0.00 .L80A6BF98: /* 00D48 80A6BF98 3C014100 */ lui $at, 0x4100 ## $at = 41000000 -/* 00D4C 80A6BF9C 4606003C */ c.lt.s $f0, $f6 +/* 00D4C 80A6BF9C 4606003C */ c.lt.s $f0, $f6 /* 00D50 80A6BFA0 00000000 */ nop -/* 00D54 80A6BFA4 45020004 */ bc1fl .L80A6BFB8 +/* 00D54 80A6BFA4 45020004 */ bc1fl .L80A6BFB8 /* 00D58 80A6BFA8 44811000 */ mtc1 $at, $f2 ## $f2 = 8.00 -/* 00D5C 80A6BFAC 1000000A */ beq $zero, $zero, .L80A6BFD8 +/* 00D5C 80A6BFAC 1000000A */ beq $zero, $zero, .L80A6BFD8 /* 00D60 80A6BFB0 24080005 */ addiu $t0, $zero, 0x0005 ## $t0 = 00000005 /* 00D64 80A6BFB4 44811000 */ mtc1 $at, $f2 ## $f2 = 8.00 .L80A6BFB8: /* 00D68 80A6BFB8 24080006 */ addiu $t0, $zero, 0x0006 ## $t0 = 00000006 -/* 00D6C 80A6BFBC 4602003C */ c.lt.s $f0, $f2 +/* 00D6C 80A6BFBC 4602003C */ c.lt.s $f0, $f2 /* 00D70 80A6BFC0 00000000 */ nop -/* 00D74 80A6BFC4 45020004 */ bc1fl .L80A6BFD8 +/* 00D74 80A6BFC4 45020004 */ bc1fl .L80A6BFD8 /* 00D78 80A6BFC8 E6020068 */ swc1 $f2, 0x0068($s0) ## 00000068 -/* 00D7C 80A6BFCC 10000002 */ beq $zero, $zero, .L80A6BFD8 +/* 00D7C 80A6BFCC 10000002 */ beq $zero, $zero, .L80A6BFD8 /* 00D80 80A6BFD0 24080006 */ addiu $t0, $zero, 0x0006 ## $t0 = 00000006 /* 00D84 80A6BFD4 E6020068 */ swc1 $f2, 0x0068($s0) ## 00000068 .L80A6BFD8: /* 00D88 80A6BFD8 0C03F66B */ jal Math_Rand_ZeroOne ## Rand.Next() float -/* 00D8C 80A6BFDC AFA8004C */ sw $t0, 0x004C($sp) +/* 00D8C 80A6BFDC AFA8004C */ sw $t0, 0x004C($sp) /* 00D90 80A6BFE0 3C0180A7 */ lui $at, %hi(D_80A6D5D0) ## $at = 80A70000 -/* 00D94 80A6BFE4 C428D5D0 */ lwc1 $f8, %lo(D_80A6D5D0)($at) -/* 00D98 80A6BFE8 8FA8004C */ lw $t0, 0x004C($sp) -/* 00D9C 80A6BFEC 4608003C */ c.lt.s $f0, $f8 +/* 00D94 80A6BFE4 C428D5D0 */ lwc1 $f8, %lo(D_80A6D5D0)($at) +/* 00D98 80A6BFE8 8FA8004C */ lw $t0, 0x004C($sp) +/* 00D9C 80A6BFEC 4608003C */ c.lt.s $f0, $f8 /* 00DA0 80A6BFF0 00000000 */ nop -/* 00DA4 80A6BFF4 45010010 */ bc1t .L80A6C038 +/* 00DA4 80A6BFF4 45010010 */ bc1t .L80A6C038 /* 00DA8 80A6BFF8 00000000 */ nop /* 00DAC 80A6BFFC 8602021E */ lh $v0, 0x021E($s0) ## 0000021E -/* 00DB0 80A6C000 5440002C */ bnel $v0, $zero, .L80A6C0B4 +/* 00DB0 80A6C000 5440002C */ bnel $v0, $zero, .L80A6C0B4 /* 00DB4 80A6C004 8619021C */ lh $t9, 0x021C($s0) ## 0000021C /* 00DB8 80A6C008 960F0088 */ lhu $t7, 0x0088($s0) ## 00000088 /* 00DBC 80A6C00C 31F80008 */ andi $t8, $t7, 0x0008 ## $t8 = 00000000 -/* 00DC0 80A6C010 17000009 */ bne $t8, $zero, .L80A6C038 +/* 00DC0 80A6C010 17000009 */ bne $t8, $zero, .L80A6C038 /* 00DC4 80A6C014 00000000 */ nop /* 00DC8 80A6C018 9219023A */ lbu $t9, 0x023A($s0) ## 0000023A /* 00DCC 80A6C01C 33290002 */ andi $t1, $t9, 0x0002 ## $t1 = 00000000 -/* 00DD0 80A6C020 15200005 */ bne $t1, $zero, .L80A6C038 +/* 00DD0 80A6C020 15200005 */ bne $t1, $zero, .L80A6C038 /* 00DD4 80A6C024 00000000 */ nop /* 00DD8 80A6C028 920A0286 */ lbu $t2, 0x0286($s0) ## 00000286 /* 00DDC 80A6C02C 314B0002 */ andi $t3, $t2, 0x0002 ## $t3 = 00000000 -/* 00DE0 80A6C030 51600020 */ beql $t3, $zero, .L80A6C0B4 +/* 00DE0 80A6C030 51600020 */ beql $t3, $zero, .L80A6C0B4 /* 00DE4 80A6C034 8619021C */ lh $t9, 0x021C($s0) ## 0000021C .L80A6C038: /* 00DE8 80A6C038 0C03F66B */ jal Math_Rand_ZeroOne ## Rand.Next() float -/* 00DEC 80A6C03C AFA8004C */ sw $t0, 0x004C($sp) +/* 00DEC 80A6C03C AFA8004C */ sw $t0, 0x004C($sp) /* 00DF0 80A6C040 3C0141F0 */ lui $at, 0x41F0 ## $at = 41F00000 /* 00DF4 80A6C044 44815000 */ mtc1 $at, $f10 ## $f10 = 30.00 /* 00DF8 80A6C048 860C021E */ lh $t4, 0x021E($s0) ## 0000021E /* 00DFC 80A6C04C 3C014170 */ lui $at, 0x4170 ## $at = 41700000 -/* 00E00 80A6C050 460A0402 */ mul.s $f16, $f0, $f10 +/* 00E00 80A6C050 460A0402 */ mul.s $f16, $f0, $f10 /* 00E04 80A6C054 448C3000 */ mtc1 $t4, $f6 ## $f6 = 0.00 /* 00E08 80A6C058 44819000 */ mtc1 $at, $f18 ## $f18 = 15.00 -/* 00E0C 80A6C05C 8FA8004C */ lw $t0, 0x004C($sp) +/* 00E0C 80A6C05C 8FA8004C */ lw $t0, 0x004C($sp) /* 00E10 80A6C060 240F0032 */ addiu $t7, $zero, 0x0032 ## $t7 = 00000032 -/* 00E14 80A6C064 46803220 */ cvt.s.w $f8, $f6 -/* 00E18 80A6C068 46128101 */ sub.s $f4, $f16, $f18 -/* 00E1C 80A6C06C 46044280 */ add.s $f10, $f8, $f4 -/* 00E20 80A6C070 4600540D */ trunc.w.s $f16, $f10 -/* 00E24 80A6C074 440E8000 */ mfc1 $t6, $f16 +/* 00E14 80A6C064 46803220 */ cvt.s.w $f8, $f6 +/* 00E18 80A6C068 46128101 */ sub.s $f4, $f16, $f18 +/* 00E1C 80A6C06C 46044280 */ add.s $f10, $f8, $f4 +/* 00E20 80A6C070 4600540D */ trunc.w.s $f16, $f10 +/* 00E24 80A6C074 440E8000 */ mfc1 $t6, $f16 /* 00E28 80A6C078 00000000 */ nop /* 00E2C 80A6C07C A60E021E */ sh $t6, 0x021E($s0) ## 0000021E /* 00E30 80A6C080 8602021E */ lh $v0, 0x021E($s0) ## 0000021E -/* 00E34 80A6C084 28410033 */ slti $at, $v0, 0x0033 -/* 00E38 80A6C088 54200005 */ bnel $at, $zero, .L80A6C0A0 -/* 00E3C 80A6C08C 2841FFCE */ slti $at, $v0, 0xFFCE +/* 00E34 80A6C084 28410033 */ slti $at, $v0, 0x0033 +/* 00E38 80A6C088 54200005 */ bnel $at, $zero, .L80A6C0A0 +/* 00E3C 80A6C08C 2841FFCE */ slti $at, $v0, 0xFFCE /* 00E40 80A6C090 A60F021E */ sh $t7, 0x021E($s0) ## 0000021E -/* 00E44 80A6C094 10000006 */ beq $zero, $zero, .L80A6C0B0 +/* 00E44 80A6C094 10000006 */ beq $zero, $zero, .L80A6C0B0 /* 00E48 80A6C098 8602021E */ lh $v0, 0x021E($s0) ## 0000021E -/* 00E4C 80A6C09C 2841FFCE */ slti $at, $v0, 0xFFCE +/* 00E4C 80A6C09C 2841FFCE */ slti $at, $v0, 0xFFCE .L80A6C0A0: -/* 00E50 80A6C0A0 10200003 */ beq $at, $zero, .L80A6C0B0 +/* 00E50 80A6C0A0 10200003 */ beq $at, $zero, .L80A6C0B0 /* 00E54 80A6C0A4 2418FFCE */ addiu $t8, $zero, 0xFFCE ## $t8 = FFFFFFCE /* 00E58 80A6C0A8 A618021E */ sh $t8, 0x021E($s0) ## 0000021E /* 00E5C 80A6C0AC 8602021E */ lh $v0, 0x021E($s0) ## 0000021E @@ -161,41 +161,41 @@ glabel func_80A6BE6C /* 00E60 80A6C0B0 8619021C */ lh $t9, 0x021C($s0) ## 0000021C .L80A6C0B4: /* 00E64 80A6C0B4 240AFED4 */ addiu $t2, $zero, 0xFED4 ## $t2 = FFFFFED4 -/* 00E68 80A6C0B8 03224821 */ addu $t1, $t9, $v0 +/* 00E68 80A6C0B8 03224821 */ addu $t1, $t9, $v0 /* 00E6C 80A6C0BC A609021C */ sh $t1, 0x021C($s0) ## 0000021C /* 00E70 80A6C0C0 8603021C */ lh $v1, 0x021C($s0) ## 0000021C -/* 00E74 80A6C0C4 2861FED4 */ slti $at, $v1, 0xFED4 -/* 00E78 80A6C0C8 50200004 */ beql $at, $zero, .L80A6C0DC -/* 00E7C 80A6C0CC 2861012D */ slti $at, $v1, 0x012D -/* 00E80 80A6C0D0 1000001C */ beq $zero, $zero, .L80A6C144 +/* 00E74 80A6C0C4 2861FED4 */ slti $at, $v1, 0xFED4 +/* 00E78 80A6C0C8 50200004 */ beql $at, $zero, .L80A6C0DC +/* 00E7C 80A6C0CC 2861012D */ slti $at, $v1, 0x012D +/* 00E80 80A6C0D0 1000001C */ beq $zero, $zero, .L80A6C144 /* 00E84 80A6C0D4 A60A021C */ sh $t2, 0x021C($s0) ## 0000021C -/* 00E88 80A6C0D8 2861012D */ slti $at, $v1, 0x012D +/* 00E88 80A6C0D8 2861012D */ slti $at, $v1, 0x012D .L80A6C0DC: -/* 00E8C 80A6C0DC 14200003 */ bne $at, $zero, .L80A6C0EC +/* 00E8C 80A6C0DC 14200003 */ bne $at, $zero, .L80A6C0EC /* 00E90 80A6C0E0 240B012C */ addiu $t3, $zero, 0x012C ## $t3 = 0000012C -/* 00E94 80A6C0E4 10000017 */ beq $zero, $zero, .L80A6C144 +/* 00E94 80A6C0E4 10000017 */ beq $zero, $zero, .L80A6C144 /* 00E98 80A6C0E8 A60B021C */ sh $t3, 0x021C($s0) ## 0000021C .L80A6C0EC: /* 00E9C 80A6C0EC 0C03F66B */ jal Math_Rand_ZeroOne ## Rand.Next() float -/* 00EA0 80A6C0F0 AFA8004C */ sw $t0, 0x004C($sp) +/* 00EA0 80A6C0F0 AFA8004C */ sw $t0, 0x004C($sp) /* 00EA4 80A6C0F4 3C013E80 */ lui $at, 0x3E80 ## $at = 3E800000 /* 00EA8 80A6C0F8 44819000 */ mtc1 $at, $f18 ## $f18 = 0.25 -/* 00EAC 80A6C0FC 8FA8004C */ lw $t0, 0x004C($sp) -/* 00EB0 80A6C100 4612003C */ c.lt.s $f0, $f18 +/* 00EAC 80A6C0FC 8FA8004C */ lw $t0, 0x004C($sp) +/* 00EB0 80A6C100 4612003C */ c.lt.s $f0, $f18 /* 00EB4 80A6C104 00000000 */ nop -/* 00EB8 80A6C108 4502000F */ bc1fl .L80A6C148 +/* 00EB8 80A6C108 4502000F */ bc1fl .L80A6C148 /* 00EBC 80A6C10C 860D0032 */ lh $t5, 0x0032($s0) ## 00000032 /* 00EC0 80A6C110 860C021C */ lh $t4, 0x021C($s0) ## 0000021C /* 00EC4 80A6C114 3C0142C8 */ lui $at, 0x42C8 ## $at = 42C80000 /* 00EC8 80A6C118 44814000 */ mtc1 $at, $f8 ## $f8 = 100.00 /* 00ECC 80A6C11C 448C3000 */ mtc1 $t4, $f6 ## $f6 = 0.00 /* 00ED0 80A6C120 00000000 */ nop -/* 00ED4 80A6C124 46803020 */ cvt.s.w $f0, $f6 -/* 00ED8 80A6C128 46000005 */ abs.s $f0, $f0 -/* 00EDC 80A6C12C 4608003C */ c.lt.s $f0, $f8 +/* 00ED4 80A6C124 46803020 */ cvt.s.w $f0, $f6 +/* 00ED8 80A6C128 46000005 */ abs.s $f0, $f0 +/* 00EDC 80A6C12C 4608003C */ c.lt.s $f0, $f8 /* 00EE0 80A6C130 00000000 */ nop -/* 00EE4 80A6C134 45020004 */ bc1fl .L80A6C148 +/* 00EE4 80A6C134 45020004 */ bc1fl .L80A6C148 /* 00EE8 80A6C138 860D0032 */ lh $t5, 0x0032($s0) ## 00000032 /* 00EEC 80A6C13C A600021C */ sh $zero, 0x021C($s0) ## 0000021C /* 00EF0 80A6C140 A600021E */ sh $zero, 0x021E($s0) ## 0000021E @@ -204,109 +204,109 @@ glabel func_80A6BE6C .L80A6C148: /* 00EF8 80A6C148 860E021C */ lh $t6, 0x021C($s0) ## 0000021C /* 00EFC 80A6C14C 8E030150 */ lw $v1, 0x0150($s0) ## 00000150 -/* 00F00 80A6C150 01AE7821 */ addu $t7, $t5, $t6 +/* 00F00 80A6C150 01AE7821 */ addu $t7, $t5, $t6 /* 00F04 80A6C154 A60F0032 */ sh $t7, 0x0032($s0) ## 00000032 /* 00F08 80A6C158 86180032 */ lh $t8, 0x0032($s0) ## 00000032 /* 00F0C 80A6C15C A61800B6 */ sh $t8, 0x00B6($s0) ## 000000B6 .L80A6C160: -/* 00F10 80A6C160 15030006 */ bne $t0, $v1, .L80A6C17C +/* 00F10 80A6C160 15030006 */ bne $t0, $v1, .L80A6C17C /* 00F14 80A6C164 260401A0 */ addiu $a0, $s0, 0x01A0 ## $a0 = 000001A0 /* 00F18 80A6C168 0C02927F */ jal SkelAnime_FrameUpdateMatrix - -/* 00F1C 80A6C16C AFA8004C */ sw $t0, 0x004C($sp) -/* 00F20 80A6C170 104000D1 */ beq $v0, $zero, .L80A6C4B8 -/* 00F24 80A6C174 8FA8004C */ lw $t0, 0x004C($sp) + +/* 00F1C 80A6C16C AFA8004C */ sw $t0, 0x004C($sp) +/* 00F20 80A6C170 104000D1 */ beq $v0, $zero, .L80A6C4B8 +/* 00F24 80A6C174 8FA8004C */ lw $t0, 0x004C($sp) /* 00F28 80A6C178 8E030150 */ lw $v1, 0x0150($s0) ## 00000150 .L80A6C17C: /* 00F2C 80A6C17C 261901A0 */ addiu $t9, $s0, 0x01A0 ## $t9 = 000001A0 -/* 00F30 80A6C180 11030041 */ beq $t0, $v1, .L80A6C288 -/* 00F34 80A6C184 AFB90034 */ sw $t9, 0x0034($sp) +/* 00F30 80A6C180 11030041 */ beq $t0, $v1, .L80A6C288 +/* 00F34 80A6C184 AFB90034 */ sw $t9, 0x0034($sp) /* 00F38 80A6C188 960901E4 */ lhu $t1, 0x01E4($s0) ## 000001E4 /* 00F3C 80A6C18C 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 /* 00F40 80A6C190 AE080150 */ sw $t0, 0x0150($s0) ## 00000150 /* 00F44 80A6C194 312BFFFE */ andi $t3, $t1, 0xFFFE ## $t3 = 00000000 /* 00F48 80A6C198 A60B01E4 */ sh $t3, 0x01E4($s0) ## 000001E4 /* 00F4C 80A6C19C 316CFFFD */ andi $t4, $t3, 0xFFFD ## $t4 = 00000000 -/* 00F50 80A6C1A0 1501000D */ bne $t0, $at, .L80A6C1D8 +/* 00F50 80A6C1A0 1501000D */ bne $t0, $at, .L80A6C1D8 /* 00F54 80A6C1A4 A60C01E4 */ sh $t4, 0x01E4($s0) ## 000001E4 /* 00F58 80A6C1A8 3C078013 */ lui $a3, 0x8013 ## $a3 = 80130000 /* 00F5C 80A6C1AC 3C0D8013 */ lui $t5, 0x8013 ## $t5 = 80130000 /* 00F60 80A6C1B0 24E733E0 */ addiu $a3, $a3, 0x33E0 ## $a3 = 801333E0 /* 00F64 80A6C1B4 25AD33E8 */ addiu $t5, $t5, 0x33E8 ## $t5 = 801333E8 -/* 00F68 80A6C1B8 AFAD0014 */ sw $t5, 0x0014($sp) -/* 00F6C 80A6C1BC AFA70010 */ sw $a3, 0x0010($sp) +/* 00F68 80A6C1B8 AFAD0014 */ sw $t5, 0x0014($sp) +/* 00F6C 80A6C1BC AFA70010 */ sw $a3, 0x0010($sp) /* 00F70 80A6C1C0 24042816 */ addiu $a0, $zero, 0x2816 ## $a0 = 00002816 /* 00F74 80A6C1C4 26050204 */ addiu $a1, $s0, 0x0204 ## $a1 = 00000204 /* 00F78 80A6C1C8 0C03DCE3 */ jal Audio_PlaySoundGeneral - + /* 00F7C 80A6C1CC 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 -/* 00F80 80A6C1D0 10000011 */ beq $zero, $zero, .L80A6C218 +/* 00F80 80A6C1D0 10000011 */ beq $zero, $zero, .L80A6C218 /* 00F84 80A6C1D4 00000000 */ nop .L80A6C1D8: /* 00F88 80A6C1D8 24010003 */ addiu $at, $zero, 0x0003 ## $at = 00000003 -/* 00F8C 80A6C1DC 1501000C */ bne $t0, $at, .L80A6C210 +/* 00F8C 80A6C1DC 1501000C */ bne $t0, $at, .L80A6C210 /* 00F90 80A6C1E0 3C078013 */ lui $a3, 0x8013 ## $a3 = 80130000 /* 00F94 80A6C1E4 3C0E8013 */ lui $t6, 0x8013 ## $t6 = 80130000 /* 00F98 80A6C1E8 24E733E0 */ addiu $a3, $a3, 0x33E0 ## $a3 = 801333E0 /* 00F9C 80A6C1EC 25CE33E8 */ addiu $t6, $t6, 0x33E8 ## $t6 = 801333E8 -/* 00FA0 80A6C1F0 AFAE0014 */ sw $t6, 0x0014($sp) -/* 00FA4 80A6C1F4 AFA70010 */ sw $a3, 0x0010($sp) +/* 00FA0 80A6C1F0 AFAE0014 */ sw $t6, 0x0014($sp) +/* 00FA4 80A6C1F4 AFA70010 */ sw $a3, 0x0010($sp) /* 00FA8 80A6C1F8 24042805 */ addiu $a0, $zero, 0x2805 ## $a0 = 00002805 /* 00FAC 80A6C1FC 26050204 */ addiu $a1, $s0, 0x0204 ## $a1 = 00000204 /* 00FB0 80A6C200 0C03DCE3 */ jal Audio_PlaySoundGeneral - + /* 00FB4 80A6C204 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 -/* 00FB8 80A6C208 10000003 */ beq $zero, $zero, .L80A6C218 +/* 00FB8 80A6C208 10000003 */ beq $zero, $zero, .L80A6C218 /* 00FBC 80A6C20C 00000000 */ nop .L80A6C210: -/* 00FC0 80A6C210 0C29AF3B */ jal func_80A6BCEC +/* 00FC0 80A6C210 0C29AF3B */ jal func_80A6BCEC /* 00FC4 80A6C214 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 .L80A6C218: -/* 00FC8 80A6C218 0C29ACC3 */ jal func_80A6B30C +/* 00FC8 80A6C218 0C29ACC3 */ jal func_80A6B30C /* 00FCC 80A6C21C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00FD0 80A6C220 E7A00040 */ swc1 $f0, 0x0040($sp) +/* 00FD0 80A6C220 E7A00040 */ swc1 $f0, 0x0040($sp) /* 00FD4 80A6C224 8E0F0150 */ lw $t7, 0x0150($s0) ## 00000150 /* 00FD8 80A6C228 3C0480A7 */ lui $a0, %hi(D_80A6D370) ## $a0 = 80A70000 -/* 00FDC 80A6C22C 000FC080 */ sll $t8, $t7, 2 -/* 00FE0 80A6C230 00982021 */ addu $a0, $a0, $t8 +/* 00FDC 80A6C22C 000FC080 */ sll $t8, $t7, 2 +/* 00FE0 80A6C230 00982021 */ addu $a0, $a0, $t8 /* 00FE4 80A6C234 0C028800 */ jal SkelAnime_GetFrameCount - -/* 00FE8 80A6C238 8C84D370 */ lw $a0, %lo(D_80A6D370)($a0) + +/* 00FE8 80A6C238 8C84D370 */ lw $a0, %lo(D_80A6D370)($a0) /* 00FEC 80A6C23C 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 00FF0 80A6C240 8E190150 */ lw $t9, 0x0150($s0) ## 00000150 /* 00FF4 80A6C244 3C01C040 */ lui $at, 0xC040 ## $at = C0400000 -/* 00FF8 80A6C248 468022A0 */ cvt.s.w $f10, $f4 +/* 00FF8 80A6C248 468022A0 */ cvt.s.w $f10, $f4 /* 00FFC 80A6C24C 44818000 */ mtc1 $at, $f16 ## $f16 = -3.00 /* 01000 80A6C250 3C0580A7 */ lui $a1, %hi(D_80A6D370) ## $a1 = 80A70000 -/* 01004 80A6C254 00194880 */ sll $t1, $t9, 2 -/* 01008 80A6C258 00A92821 */ addu $a1, $a1, $t1 +/* 01004 80A6C254 00194880 */ sll $t1, $t9, 2 +/* 01008 80A6C258 00A92821 */ addu $a1, $a1, $t1 /* 0100C 80A6C25C 240A0002 */ addiu $t2, $zero, 0x0002 ## $t2 = 00000002 -/* 01010 80A6C260 AFAA0014 */ sw $t2, 0x0014($sp) -/* 01014 80A6C264 8CA5D370 */ lw $a1, %lo(D_80A6D370)($a1) -/* 01018 80A6C268 E7AA0010 */ swc1 $f10, 0x0010($sp) -/* 0101C 80A6C26C 8FA40034 */ lw $a0, 0x0034($sp) -/* 01020 80A6C270 8FA60040 */ lw $a2, 0x0040($sp) +/* 01010 80A6C260 AFAA0014 */ sw $t2, 0x0014($sp) +/* 01014 80A6C264 8CA5D370 */ lw $a1, %lo(D_80A6D370)($a1) +/* 01018 80A6C268 E7AA0010 */ swc1 $f10, 0x0010($sp) +/* 0101C 80A6C26C 8FA40034 */ lw $a0, 0x0034($sp) +/* 01020 80A6C270 8FA60040 */ lw $a2, 0x0040($sp) /* 01024 80A6C274 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 01028 80A6C278 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 0102C 80A6C27C E7B00018 */ swc1 $f16, 0x0018($sp) -/* 01030 80A6C280 1000008E */ beq $zero, $zero, .L80A6C4BC -/* 01034 80A6C284 8FBF002C */ lw $ra, 0x002C($sp) +/* 01028 80A6C278 0C029468 */ jal SkelAnime_ChangeAnim + +/* 0102C 80A6C27C E7B00018 */ swc1 $f16, 0x0018($sp) +/* 01030 80A6C280 1000008E */ beq $zero, $zero, .L80A6C4BC +/* 01034 80A6C284 8FBF002C */ lw $ra, 0x002C($sp) .L80A6C288: -/* 01038 80A6C288 00035880 */ sll $t3, $v1, 2 +/* 01038 80A6C288 00035880 */ sll $t3, $v1, 2 /* 0103C 80A6C28C 3C0280A7 */ lui $v0, %hi(D_80A6D510) ## $v0 = 80A70000 -/* 01040 80A6C290 004B1021 */ addu $v0, $v0, $t3 -/* 01044 80A6C294 8C42D510 */ lw $v0, %lo(D_80A6D510)($v0) +/* 01040 80A6C290 004B1021 */ addu $v0, $v0, $t3 +/* 01044 80A6C294 8C42D510 */ lw $v0, %lo(D_80A6D510)($v0) /* 01048 80A6C298 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 0104C 80A6C29C 10400009 */ beq $v0, $zero, .L80A6C2C4 +/* 0104C 80A6C29C 10400009 */ beq $v0, $zero, .L80A6C2C4 /* 01050 80A6C2A0 00000000 */ nop -/* 01054 80A6C2A4 10410024 */ beq $v0, $at, .L80A6C338 +/* 01054 80A6C2A4 10410024 */ beq $v0, $at, .L80A6C338 /* 01058 80A6C2A8 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 0105C 80A6C2AC 10410022 */ beq $v0, $at, .L80A6C338 +/* 0105C 80A6C2AC 10410022 */ beq $v0, $at, .L80A6C338 /* 01060 80A6C2B0 24010003 */ addiu $at, $zero, 0x0003 ## $at = 00000003 -/* 01064 80A6C2B4 50410021 */ beql $v0, $at, .L80A6C33C +/* 01064 80A6C2B4 50410021 */ beql $v0, $at, .L80A6C33C /* 01068 80A6C2B8 960F01E4 */ lhu $t7, 0x01E4($s0) ## 000001E4 -/* 0106C 80A6C2BC 1000001F */ beq $zero, $zero, .L80A6C33C +/* 0106C 80A6C2BC 1000001F */ beq $zero, $zero, .L80A6C33C /* 01070 80A6C2C0 960F01E4 */ lhu $t7, 0x01E4($s0) ## 000001E4 .L80A6C2C4: /* 01074 80A6C2C4 0C03F66B */ jal Math_Rand_ZeroOne @@ -315,13 +315,13 @@ glabel func_80A6BE6C /* 0107C 80A6C2CC 3C013E80 */ lui $at, 0x3E80 ## $at = 3E800000 /* 01080 80A6C2D0 44819000 */ mtc1 $at, $f18 ## $f18 = 0.25 /* 01084 80A6C2D4 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 01088 80A6C2D8 4612003C */ c.lt.s $f0, $f18 +/* 01088 80A6C2D8 4612003C */ c.lt.s $f0, $f18 /* 0108C 80A6C2DC 00000000 */ nop -/* 01090 80A6C2E0 45000005 */ bc1f .L80A6C2F8 +/* 01090 80A6C2E0 45000005 */ bc1f .L80A6C2F8 /* 01094 80A6C2E4 00000000 */ nop /* 01098 80A6C2E8 44813000 */ mtc1 $at, $f6 ## $f6 = 1.00 /* 0109C 80A6C2EC 24080004 */ addiu $t0, $zero, 0x0004 ## $t0 = 00000004 -/* 010A0 80A6C2F0 10000011 */ beq $zero, $zero, .L80A6C338 +/* 010A0 80A6C2F0 10000011 */ beq $zero, $zero, .L80A6C338 /* 010A4 80A6C2F4 E6060218 */ swc1 $f6, 0x0218($s0) ## 00000218 .L80A6C2F8: /* 010A8 80A6C2F8 0C03F66B */ jal Math_Rand_ZeroOne @@ -331,14 +331,14 @@ glabel func_80A6BE6C /* 010B4 80A6C304 44814000 */ mtc1 $at, $f8 ## $f8 = 2.00 /* 010B8 80A6C308 3C0880A7 */ lui $t0, %hi(D_80A6D4F4) ## $t0 = 80A70000 /* 010BC 80A6C30C 44808000 */ mtc1 $zero, $f16 ## $f16 = 0.00 -/* 010C0 80A6C310 46080102 */ mul.s $f4, $f0, $f8 +/* 010C0 80A6C310 46080102 */ mul.s $f4, $f0, $f8 /* 010C4 80A6C314 44809000 */ mtc1 $zero, $f18 ## $f18 = 0.00 -/* 010C8 80A6C318 4600228D */ trunc.w.s $f10, $f4 -/* 010CC 80A6C31C 440D5000 */ mfc1 $t5, $f10 +/* 010C8 80A6C318 4600228D */ trunc.w.s $f10, $f4 +/* 010CC 80A6C31C 440D5000 */ mfc1 $t5, $f10 /* 010D0 80A6C320 00000000 */ nop -/* 010D4 80A6C324 000D7080 */ sll $t6, $t5, 2 -/* 010D8 80A6C328 010E4021 */ addu $t0, $t0, $t6 -/* 010DC 80A6C32C 8D08D4F4 */ lw $t0, %lo(D_80A6D4F4)($t0) +/* 010D4 80A6C324 000D7080 */ sll $t6, $t5, 2 +/* 010D8 80A6C328 010E4021 */ addu $t0, $t0, $t6 +/* 010DC 80A6C32C 8D08D4F4 */ lw $t0, %lo(D_80A6D4F4)($t0) /* 010E0 80A6C330 E6100068 */ swc1 $f16, 0x0068($s0) ## 00000068 /* 010E4 80A6C334 E6120218 */ swc1 $f18, 0x0218($s0) ## 00000218 .L80A6C338: @@ -349,112 +349,112 @@ glabel func_80A6BE6C /* 010F4 80A6C344 31F9FFFE */ andi $t9, $t7, 0xFFFE ## $t9 = 00000000 /* 010F8 80A6C348 A61901E4 */ sh $t9, 0x01E4($s0) ## 000001E4 /* 010FC 80A6C34C 3329FFFD */ andi $t1, $t9, 0xFFFD ## $t1 = 00000000 -/* 01100 80A6C350 1501000D */ bne $t0, $at, .L80A6C388 +/* 01100 80A6C350 1501000D */ bne $t0, $at, .L80A6C388 /* 01104 80A6C354 A60901E4 */ sh $t1, 0x01E4($s0) ## 000001E4 /* 01108 80A6C358 3C0A8013 */ lui $t2, 0x8013 ## $t2 = 80130000 /* 0110C 80A6C35C 24E733E0 */ addiu $a3, $a3, 0x33E0 ## $a3 = 801333E0 /* 01110 80A6C360 254A33E8 */ addiu $t2, $t2, 0x33E8 ## $t2 = 801333E8 -/* 01114 80A6C364 AFAA0014 */ sw $t2, 0x0014($sp) -/* 01118 80A6C368 AFA70010 */ sw $a3, 0x0010($sp) +/* 01114 80A6C364 AFAA0014 */ sw $t2, 0x0014($sp) +/* 01118 80A6C368 AFA70010 */ sw $a3, 0x0010($sp) /* 0111C 80A6C36C 24042816 */ addiu $a0, $zero, 0x2816 ## $a0 = 00002816 /* 01120 80A6C370 26050204 */ addiu $a1, $s0, 0x0204 ## $a1 = 00000204 /* 01124 80A6C374 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 /* 01128 80A6C378 0C03DCE3 */ jal Audio_PlaySoundGeneral - -/* 0112C 80A6C37C AFA8004C */ sw $t0, 0x004C($sp) -/* 01130 80A6C380 10000014 */ beq $zero, $zero, .L80A6C3D4 -/* 01134 80A6C384 8FA8004C */ lw $t0, 0x004C($sp) + +/* 0112C 80A6C37C AFA8004C */ sw $t0, 0x004C($sp) +/* 01130 80A6C380 10000014 */ beq $zero, $zero, .L80A6C3D4 +/* 01134 80A6C384 8FA8004C */ lw $t0, 0x004C($sp) .L80A6C388: /* 01138 80A6C388 24010003 */ addiu $at, $zero, 0x0003 ## $at = 00000003 -/* 0113C 80A6C38C 1501000E */ bne $t0, $at, .L80A6C3C8 +/* 0113C 80A6C38C 1501000E */ bne $t0, $at, .L80A6C3C8 /* 01140 80A6C390 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 01144 80A6C394 3C078013 */ lui $a3, 0x8013 ## $a3 = 80130000 /* 01148 80A6C398 3C0B8013 */ lui $t3, 0x8013 ## $t3 = 80130000 /* 0114C 80A6C39C 24E733E0 */ addiu $a3, $a3, 0x33E0 ## $a3 = 801333E0 /* 01150 80A6C3A0 256B33E8 */ addiu $t3, $t3, 0x33E8 ## $t3 = 801333E8 -/* 01154 80A6C3A4 AFAB0014 */ sw $t3, 0x0014($sp) -/* 01158 80A6C3A8 AFA70010 */ sw $a3, 0x0010($sp) +/* 01154 80A6C3A4 AFAB0014 */ sw $t3, 0x0014($sp) +/* 01158 80A6C3A8 AFA70010 */ sw $a3, 0x0010($sp) /* 0115C 80A6C3AC 24042805 */ addiu $a0, $zero, 0x2805 ## $a0 = 00002805 /* 01160 80A6C3B0 26050204 */ addiu $a1, $s0, 0x0204 ## $a1 = 00000204 /* 01164 80A6C3B4 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 /* 01168 80A6C3B8 0C03DCE3 */ jal Audio_PlaySoundGeneral - -/* 0116C 80A6C3BC AFA8004C */ sw $t0, 0x004C($sp) -/* 01170 80A6C3C0 10000004 */ beq $zero, $zero, .L80A6C3D4 -/* 01174 80A6C3C4 8FA8004C */ lw $t0, 0x004C($sp) + +/* 0116C 80A6C3BC AFA8004C */ sw $t0, 0x004C($sp) +/* 01170 80A6C3C0 10000004 */ beq $zero, $zero, .L80A6C3D4 +/* 01174 80A6C3C4 8FA8004C */ lw $t0, 0x004C($sp) .L80A6C3C8: -/* 01178 80A6C3C8 0C29AF3B */ jal func_80A6BCEC -/* 0117C 80A6C3CC AFA8004C */ sw $t0, 0x004C($sp) -/* 01180 80A6C3D0 8FA8004C */ lw $t0, 0x004C($sp) +/* 01178 80A6C3C8 0C29AF3B */ jal func_80A6BCEC +/* 0117C 80A6C3CC AFA8004C */ sw $t0, 0x004C($sp) +/* 01180 80A6C3D0 8FA8004C */ lw $t0, 0x004C($sp) .L80A6C3D4: /* 01184 80A6C3D4 8E0C0150 */ lw $t4, 0x0150($s0) ## 00000150 /* 01188 80A6C3D8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0118C 80A6C3DC 110C001D */ beq $t0, $t4, .L80A6C454 +/* 0118C 80A6C3DC 110C001D */ beq $t0, $t4, .L80A6C454 /* 01190 80A6C3E0 00000000 */ nop -/* 01194 80A6C3E4 0C29ACC3 */ jal func_80A6B30C +/* 01194 80A6C3E4 0C29ACC3 */ jal func_80A6B30C /* 01198 80A6C3E8 AE080150 */ sw $t0, 0x0150($s0) ## 00000150 -/* 0119C 80A6C3EC E7A00040 */ swc1 $f0, 0x0040($sp) +/* 0119C 80A6C3EC E7A00040 */ swc1 $f0, 0x0040($sp) /* 011A0 80A6C3F0 8E0D0150 */ lw $t5, 0x0150($s0) ## 00000150 /* 011A4 80A6C3F4 3C0480A7 */ lui $a0, %hi(D_80A6D370) ## $a0 = 80A70000 -/* 011A8 80A6C3F8 000D7080 */ sll $t6, $t5, 2 -/* 011AC 80A6C3FC 008E2021 */ addu $a0, $a0, $t6 +/* 011A8 80A6C3F8 000D7080 */ sll $t6, $t5, 2 +/* 011AC 80A6C3FC 008E2021 */ addu $a0, $a0, $t6 /* 011B0 80A6C400 0C028800 */ jal SkelAnime_GetFrameCount - -/* 011B4 80A6C404 8C84D370 */ lw $a0, %lo(D_80A6D370)($a0) + +/* 011B4 80A6C404 8C84D370 */ lw $a0, %lo(D_80A6D370)($a0) /* 011B8 80A6C408 44823000 */ mtc1 $v0, $f6 ## $f6 = 0.00 /* 011BC 80A6C40C 8E0F0150 */ lw $t7, 0x0150($s0) ## 00000150 /* 011C0 80A6C410 3C01C040 */ lui $at, 0xC040 ## $at = C0400000 -/* 011C4 80A6C414 46803220 */ cvt.s.w $f8, $f6 +/* 011C4 80A6C414 46803220 */ cvt.s.w $f8, $f6 /* 011C8 80A6C418 44812000 */ mtc1 $at, $f4 ## $f4 = -3.00 /* 011CC 80A6C41C 3C0580A7 */ lui $a1, %hi(D_80A6D370) ## $a1 = 80A70000 -/* 011D0 80A6C420 000FC080 */ sll $t8, $t7, 2 -/* 011D4 80A6C424 00B82821 */ addu $a1, $a1, $t8 +/* 011D0 80A6C420 000FC080 */ sll $t8, $t7, 2 +/* 011D4 80A6C424 00B82821 */ addu $a1, $a1, $t8 /* 011D8 80A6C428 24190002 */ addiu $t9, $zero, 0x0002 ## $t9 = 00000002 -/* 011DC 80A6C42C AFB90014 */ sw $t9, 0x0014($sp) -/* 011E0 80A6C430 8CA5D370 */ lw $a1, %lo(D_80A6D370)($a1) -/* 011E4 80A6C434 E7A80010 */ swc1 $f8, 0x0010($sp) -/* 011E8 80A6C438 8FA40034 */ lw $a0, 0x0034($sp) -/* 011EC 80A6C43C 8FA60040 */ lw $a2, 0x0040($sp) +/* 011DC 80A6C42C AFB90014 */ sw $t9, 0x0014($sp) +/* 011E0 80A6C430 8CA5D370 */ lw $a1, %lo(D_80A6D370)($a1) +/* 011E4 80A6C434 E7A80010 */ swc1 $f8, 0x0010($sp) +/* 011E8 80A6C438 8FA40034 */ lw $a0, 0x0034($sp) +/* 011EC 80A6C43C 8FA60040 */ lw $a2, 0x0040($sp) /* 011F0 80A6C440 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 011F4 80A6C444 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 011F8 80A6C448 E7A40018 */ swc1 $f4, 0x0018($sp) -/* 011FC 80A6C44C 1000001B */ beq $zero, $zero, .L80A6C4BC -/* 01200 80A6C450 8FBF002C */ lw $ra, 0x002C($sp) +/* 011F4 80A6C444 0C029468 */ jal SkelAnime_ChangeAnim + +/* 011F8 80A6C448 E7A40018 */ swc1 $f4, 0x0018($sp) +/* 011FC 80A6C44C 1000001B */ beq $zero, $zero, .L80A6C4BC +/* 01200 80A6C450 8FBF002C */ lw $ra, 0x002C($sp) .L80A6C454: -/* 01204 80A6C454 0C29ACC3 */ jal func_80A6B30C +/* 01204 80A6C454 0C29ACC3 */ jal func_80A6B30C /* 01208 80A6C458 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0120C 80A6C45C E7A00040 */ swc1 $f0, 0x0040($sp) +/* 0120C 80A6C45C E7A00040 */ swc1 $f0, 0x0040($sp) /* 01210 80A6C460 8E090150 */ lw $t1, 0x0150($s0) ## 00000150 /* 01214 80A6C464 3C0480A7 */ lui $a0, %hi(D_80A6D370) ## $a0 = 80A70000 -/* 01218 80A6C468 00095080 */ sll $t2, $t1, 2 -/* 0121C 80A6C46C 008A2021 */ addu $a0, $a0, $t2 +/* 01218 80A6C468 00095080 */ sll $t2, $t1, 2 +/* 0121C 80A6C46C 008A2021 */ addu $a0, $a0, $t2 /* 01220 80A6C470 0C028800 */ jal SkelAnime_GetFrameCount - -/* 01224 80A6C474 8C84D370 */ lw $a0, %lo(D_80A6D370)($a0) + +/* 01224 80A6C474 8C84D370 */ lw $a0, %lo(D_80A6D370)($a0) /* 01228 80A6C478 44825000 */ mtc1 $v0, $f10 ## $f10 = 0.00 /* 0122C 80A6C47C 8E0B0150 */ lw $t3, 0x0150($s0) ## 00000150 /* 01230 80A6C480 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 01234 80A6C484 46805420 */ cvt.s.w $f16, $f10 +/* 01234 80A6C484 46805420 */ cvt.s.w $f16, $f10 /* 01238 80A6C488 3C0580A7 */ lui $a1, %hi(D_80A6D370) ## $a1 = 80A70000 -/* 0123C 80A6C48C 000B6080 */ sll $t4, $t3, 2 -/* 01240 80A6C490 00AC2821 */ addu $a1, $a1, $t4 +/* 0123C 80A6C48C 000B6080 */ sll $t4, $t3, 2 +/* 01240 80A6C490 00AC2821 */ addu $a1, $a1, $t4 /* 01244 80A6C494 240D0002 */ addiu $t5, $zero, 0x0002 ## $t5 = 00000002 -/* 01248 80A6C498 44070000 */ mfc1 $a3, $f0 -/* 0124C 80A6C49C AFAD0014 */ sw $t5, 0x0014($sp) -/* 01250 80A6C4A0 8CA5D370 */ lw $a1, %lo(D_80A6D370)($a1) -/* 01254 80A6C4A4 E7B00010 */ swc1 $f16, 0x0010($sp) -/* 01258 80A6C4A8 8FA40034 */ lw $a0, 0x0034($sp) -/* 0125C 80A6C4AC 8FA60040 */ lw $a2, 0x0040($sp) -/* 01260 80A6C4B0 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 01264 80A6C4B4 E7A00018 */ swc1 $f0, 0x0018($sp) +/* 01248 80A6C498 44070000 */ mfc1 $a3, $f0 +/* 0124C 80A6C49C AFAD0014 */ sw $t5, 0x0014($sp) +/* 01250 80A6C4A0 8CA5D370 */ lw $a1, %lo(D_80A6D370)($a1) +/* 01254 80A6C4A4 E7B00010 */ swc1 $f16, 0x0010($sp) +/* 01258 80A6C4A8 8FA40034 */ lw $a0, 0x0034($sp) +/* 0125C 80A6C4AC 8FA60040 */ lw $a2, 0x0040($sp) +/* 01260 80A6C4B0 0C029468 */ jal SkelAnime_ChangeAnim + +/* 01264 80A6C4B4 E7A00018 */ swc1 $f0, 0x0018($sp) .L80A6C4B8: -/* 01268 80A6C4B8 8FBF002C */ lw $ra, 0x002C($sp) +/* 01268 80A6C4B8 8FBF002C */ lw $ra, 0x002C($sp) .L80A6C4BC: -/* 0126C 80A6C4BC 8FB00028 */ lw $s0, 0x0028($sp) +/* 0126C 80A6C4BC 8FB00028 */ lw $s0, 0x0028($sp) /* 01270 80A6C4C0 27BD0050 */ addiu $sp, $sp, 0x0050 ## $sp = 00000000 -/* 01274 80A6C4C4 03E00008 */ jr $ra +/* 01274 80A6C4C4 03E00008 */ jr $ra /* 01278 80A6C4C8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse_Normal/func_80A6C4CC.s b/asm/non_matchings/overlays/actors/ovl_En_Horse_Normal/func_80A6C4CC.s index 15e685eff4..7c68f06053 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse_Normal/func_80A6C4CC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse_Normal/func_80A6C4CC.s @@ -1,7 +1,7 @@ glabel func_80A6C4CC /* 0127C 80A6C4CC 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 01280 80A6C4D0 AFBF002C */ sw $ra, 0x002C($sp) -/* 01284 80A6C4D4 AFB00028 */ sw $s0, 0x0028($sp) +/* 01280 80A6C4D0 AFBF002C */ sw $ra, 0x002C($sp) +/* 01284 80A6C4D4 AFB00028 */ sw $s0, 0x0028($sp) /* 01288 80A6C4D8 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 /* 0128C 80A6C4DC 240E0002 */ addiu $t6, $zero, 0x0002 ## $t6 = 00000002 /* 01290 80A6C4E0 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 @@ -10,37 +10,37 @@ glabel func_80A6C4CC /* 0129C 80A6C4EC A480021C */ sh $zero, 0x021C($a0) ## 0000021C /* 012A0 80A6C4F0 A480021E */ sh $zero, 0x021E($a0) ## 0000021E /* 012A4 80A6C4F4 E4800068 */ swc1 $f0, 0x0068($a0) ## 00000068 -/* 012A8 80A6C4F8 0C29ACC3 */ jal func_80A6B30C +/* 012A8 80A6C4F8 0C29ACC3 */ jal func_80A6B30C /* 012AC 80A6C4FC E4800218 */ swc1 $f0, 0x0218($a0) ## 00000218 -/* 012B0 80A6C500 E7A00030 */ swc1 $f0, 0x0030($sp) +/* 012B0 80A6C500 E7A00030 */ swc1 $f0, 0x0030($sp) /* 012B4 80A6C504 8E0F0150 */ lw $t7, 0x0150($s0) ## 00000150 /* 012B8 80A6C508 3C0480A7 */ lui $a0, %hi(D_80A6D370) ## $a0 = 80A70000 -/* 012BC 80A6C50C 000FC080 */ sll $t8, $t7, 2 -/* 012C0 80A6C510 00982021 */ addu $a0, $a0, $t8 +/* 012BC 80A6C50C 000FC080 */ sll $t8, $t7, 2 +/* 012C0 80A6C510 00982021 */ addu $a0, $a0, $t8 /* 012C4 80A6C514 0C028800 */ jal SkelAnime_GetFrameCount - -/* 012C8 80A6C518 8C84D370 */ lw $a0, %lo(D_80A6D370)($a0) + +/* 012C8 80A6C518 8C84D370 */ lw $a0, %lo(D_80A6D370)($a0) /* 012CC 80A6C51C 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 012D0 80A6C520 8E190150 */ lw $t9, 0x0150($s0) ## 00000150 /* 012D4 80A6C524 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 012D8 80A6C528 468021A0 */ cvt.s.w $f6, $f4 +/* 012D8 80A6C528 468021A0 */ cvt.s.w $f6, $f4 /* 012DC 80A6C52C 3C0580A7 */ lui $a1, %hi(D_80A6D370) ## $a1 = 80A70000 -/* 012E0 80A6C530 00194080 */ sll $t0, $t9, 2 -/* 012E4 80A6C534 00A82821 */ addu $a1, $a1, $t0 +/* 012E0 80A6C530 00194080 */ sll $t0, $t9, 2 +/* 012E4 80A6C534 00A82821 */ addu $a1, $a1, $t0 /* 012E8 80A6C538 24090002 */ addiu $t1, $zero, 0x0002 ## $t1 = 00000002 -/* 012EC 80A6C53C 44070000 */ mfc1 $a3, $f0 -/* 012F0 80A6C540 AFA90014 */ sw $t1, 0x0014($sp) -/* 012F4 80A6C544 8CA5D370 */ lw $a1, %lo(D_80A6D370)($a1) -/* 012F8 80A6C548 E7A60010 */ swc1 $f6, 0x0010($sp) +/* 012EC 80A6C53C 44070000 */ mfc1 $a3, $f0 +/* 012F0 80A6C540 AFA90014 */ sw $t1, 0x0014($sp) +/* 012F4 80A6C544 8CA5D370 */ lw $a1, %lo(D_80A6D370)($a1) +/* 012F8 80A6C548 E7A60010 */ swc1 $f6, 0x0010($sp) /* 012FC 80A6C54C 260401A0 */ addiu $a0, $s0, 0x01A0 ## $a0 = 000001A0 -/* 01300 80A6C550 8FA60030 */ lw $a2, 0x0030($sp) -/* 01304 80A6C554 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 01308 80A6C558 E7A00018 */ swc1 $f0, 0x0018($sp) -/* 0130C 80A6C55C 8FBF002C */ lw $ra, 0x002C($sp) -/* 01310 80A6C560 8FB00028 */ lw $s0, 0x0028($sp) +/* 01300 80A6C550 8FA60030 */ lw $a2, 0x0030($sp) +/* 01304 80A6C554 0C029468 */ jal SkelAnime_ChangeAnim + +/* 01308 80A6C558 E7A00018 */ swc1 $f0, 0x0018($sp) +/* 0130C 80A6C55C 8FBF002C */ lw $ra, 0x002C($sp) +/* 01310 80A6C560 8FB00028 */ lw $s0, 0x0028($sp) /* 01314 80A6C564 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 -/* 01318 80A6C568 03E00008 */ jr $ra +/* 01318 80A6C568 03E00008 */ jr $ra /* 0131C 80A6C56C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse_Normal/func_80A6C570.s b/asm/non_matchings/overlays/actors/ovl_En_Horse_Normal/func_80A6C570.s index fc5c7bf7f6..9e5c307b76 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse_Normal/func_80A6C570.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse_Normal/func_80A6C570.s @@ -1,36 +1,36 @@ glabel func_80A6C570 /* 01320 80A6C570 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 -/* 01324 80A6C574 AFB00028 */ sw $s0, 0x0028($sp) +/* 01324 80A6C574 AFB00028 */ sw $s0, 0x0028($sp) /* 01328 80A6C578 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 0132C 80A6C57C AFBF002C */ sw $ra, 0x002C($sp) +/* 0132C 80A6C57C AFBF002C */ sw $ra, 0x002C($sp) /* 01330 80A6C580 248401A0 */ addiu $a0, $a0, 0x01A0 ## $a0 = 000001A0 -/* 01334 80A6C584 AFA50044 */ sw $a1, 0x0044($sp) +/* 01334 80A6C584 AFA50044 */ sw $a1, 0x0044($sp) /* 01338 80A6C588 0C02927F */ jal SkelAnime_FrameUpdateMatrix - -/* 0133C 80A6C58C AFA40030 */ sw $a0, 0x0030($sp) -/* 01340 80A6C590 50400043 */ beql $v0, $zero, .L80A6C6A0 -/* 01344 80A6C594 8FBF002C */ lw $ra, 0x002C($sp) + +/* 0133C 80A6C58C AFA40030 */ sw $a0, 0x0030($sp) +/* 01340 80A6C590 50400043 */ beql $v0, $zero, .L80A6C6A0 +/* 01344 80A6C594 8FBF002C */ lw $ra, 0x002C($sp) /* 01348 80A6C598 0C03F66B */ jal Math_Rand_ZeroOne ## Rand.Next() float /* 0134C 80A6C59C 00000000 */ nop /* 01350 80A6C5A0 3C0180A7 */ lui $at, %hi(D_80A6D5D4) ## $at = 80A70000 -/* 01354 80A6C5A4 C424D5D4 */ lwc1 $f4, %lo(D_80A6D5D4)($at) +/* 01354 80A6C5A4 C424D5D4 */ lwc1 $f4, %lo(D_80A6D5D4)($at) /* 01358 80A6C5A8 3C0180A7 */ lui $at, %hi(D_80A6D5D8) ## $at = 80A70000 -/* 0135C 80A6C5AC 4604003C */ c.lt.s $f0, $f4 +/* 0135C 80A6C5AC 4604003C */ c.lt.s $f0, $f4 /* 01360 80A6C5B0 00000000 */ nop -/* 01364 80A6C5B4 45000003 */ bc1f .L80A6C5C4 +/* 01364 80A6C5B4 45000003 */ bc1f .L80A6C5C4 /* 01368 80A6C5B8 00000000 */ nop -/* 0136C 80A6C5BC 1000001E */ beq $zero, $zero, .L80A6C638 +/* 0136C 80A6C5BC 1000001E */ beq $zero, $zero, .L80A6C638 /* 01370 80A6C5C0 AE000150 */ sw $zero, 0x0150($s0) ## 00000150 .L80A6C5C4: -/* 01374 80A6C5C4 C426D5D8 */ lwc1 $f6, %lo(D_80A6D5D8)($at) +/* 01374 80A6C5C4 C426D5D8 */ lwc1 $f6, %lo(D_80A6D5D8)($at) /* 01378 80A6C5C8 3C078013 */ lui $a3, 0x8013 ## $a3 = 80130000 /* 0137C 80A6C5CC 24E733E0 */ addiu $a3, $a3, 0x33E0 ## $a3 = 801333E0 -/* 01380 80A6C5D0 4606003C */ c.lt.s $f0, $f6 +/* 01380 80A6C5D0 4606003C */ c.lt.s $f0, $f6 /* 01384 80A6C5D4 24180003 */ addiu $t8, $zero, 0x0003 ## $t8 = 00000003 /* 01388 80A6C5D8 24042805 */ addiu $a0, $zero, 0x2805 ## $a0 = 00002805 /* 0138C 80A6C5DC 26050204 */ addiu $a1, $s0, 0x0204 ## $a1 = 00000204 -/* 01390 80A6C5E0 4500000F */ bc1f .L80A6C620 +/* 01390 80A6C5E0 4500000F */ bc1f .L80A6C620 /* 01394 80A6C5E4 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 /* 01398 80A6C5E8 3C078013 */ lui $a3, 0x8013 ## $a3 = 80130000 /* 0139C 80A6C5EC 240E0001 */ addiu $t6, $zero, 0x0001 ## $t6 = 00000001 @@ -38,56 +38,56 @@ glabel func_80A6C570 /* 013A4 80A6C5F4 24E733E0 */ addiu $a3, $a3, 0x33E0 ## $a3 = 801333E0 /* 013A8 80A6C5F8 AE0E0150 */ sw $t6, 0x0150($s0) ## 00000150 /* 013AC 80A6C5FC 25EF33E8 */ addiu $t7, $t7, 0x33E8 ## $t7 = 801333E8 -/* 013B0 80A6C600 AFAF0014 */ sw $t7, 0x0014($sp) -/* 013B4 80A6C604 AFA70010 */ sw $a3, 0x0010($sp) +/* 013B0 80A6C600 AFAF0014 */ sw $t7, 0x0014($sp) +/* 013B4 80A6C604 AFA70010 */ sw $a3, 0x0010($sp) /* 013B8 80A6C608 24042816 */ addiu $a0, $zero, 0x2816 ## $a0 = 00002816 /* 013BC 80A6C60C 26050204 */ addiu $a1, $s0, 0x0204 ## $a1 = 00000204 /* 013C0 80A6C610 0C03DCE3 */ jal Audio_PlaySoundGeneral - + /* 013C4 80A6C614 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 -/* 013C8 80A6C618 10000007 */ beq $zero, $zero, .L80A6C638 +/* 013C8 80A6C618 10000007 */ beq $zero, $zero, .L80A6C638 /* 013CC 80A6C61C 00000000 */ nop .L80A6C620: /* 013D0 80A6C620 3C198013 */ lui $t9, 0x8013 ## $t9 = 80130000 /* 013D4 80A6C624 AE180150 */ sw $t8, 0x0150($s0) ## 00000150 /* 013D8 80A6C628 273933E8 */ addiu $t9, $t9, 0x33E8 ## $t9 = 801333E8 -/* 013DC 80A6C62C AFB90014 */ sw $t9, 0x0014($sp) +/* 013DC 80A6C62C AFB90014 */ sw $t9, 0x0014($sp) /* 013E0 80A6C630 0C03DCE3 */ jal Audio_PlaySoundGeneral - -/* 013E4 80A6C634 AFA70010 */ sw $a3, 0x0010($sp) + +/* 013E4 80A6C634 AFA70010 */ sw $a3, 0x0010($sp) .L80A6C638: -/* 013E8 80A6C638 0C29ACC3 */ jal func_80A6B30C +/* 013E8 80A6C638 0C29ACC3 */ jal func_80A6B30C /* 013EC 80A6C63C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 013F0 80A6C640 E7A00034 */ swc1 $f0, 0x0034($sp) +/* 013F0 80A6C640 E7A00034 */ swc1 $f0, 0x0034($sp) /* 013F4 80A6C644 8E080150 */ lw $t0, 0x0150($s0) ## 00000150 /* 013F8 80A6C648 3C0480A7 */ lui $a0, %hi(D_80A6D370) ## $a0 = 80A70000 -/* 013FC 80A6C64C 00084880 */ sll $t1, $t0, 2 -/* 01400 80A6C650 00892021 */ addu $a0, $a0, $t1 +/* 013FC 80A6C64C 00084880 */ sll $t1, $t0, 2 +/* 01400 80A6C650 00892021 */ addu $a0, $a0, $t1 /* 01404 80A6C654 0C028800 */ jal SkelAnime_GetFrameCount - -/* 01408 80A6C658 8C84D370 */ lw $a0, %lo(D_80A6D370)($a0) + +/* 01408 80A6C658 8C84D370 */ lw $a0, %lo(D_80A6D370)($a0) /* 0140C 80A6C65C 44824000 */ mtc1 $v0, $f8 ## $f8 = 0.00 /* 01410 80A6C660 8E0A0150 */ lw $t2, 0x0150($s0) ## 00000150 /* 01414 80A6C664 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 01418 80A6C668 468042A0 */ cvt.s.w $f10, $f8 +/* 01418 80A6C668 468042A0 */ cvt.s.w $f10, $f8 /* 0141C 80A6C66C 3C0580A7 */ lui $a1, %hi(D_80A6D370) ## $a1 = 80A70000 -/* 01420 80A6C670 000A5880 */ sll $t3, $t2, 2 -/* 01424 80A6C674 00AB2821 */ addu $a1, $a1, $t3 +/* 01420 80A6C670 000A5880 */ sll $t3, $t2, 2 +/* 01424 80A6C674 00AB2821 */ addu $a1, $a1, $t3 /* 01428 80A6C678 240C0002 */ addiu $t4, $zero, 0x0002 ## $t4 = 00000002 -/* 0142C 80A6C67C 44070000 */ mfc1 $a3, $f0 -/* 01430 80A6C680 AFAC0014 */ sw $t4, 0x0014($sp) -/* 01434 80A6C684 8CA5D370 */ lw $a1, %lo(D_80A6D370)($a1) -/* 01438 80A6C688 E7AA0010 */ swc1 $f10, 0x0010($sp) -/* 0143C 80A6C68C 8FA40030 */ lw $a0, 0x0030($sp) -/* 01440 80A6C690 8FA60034 */ lw $a2, 0x0034($sp) -/* 01444 80A6C694 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 01448 80A6C698 E7A00018 */ swc1 $f0, 0x0018($sp) -/* 0144C 80A6C69C 8FBF002C */ lw $ra, 0x002C($sp) +/* 0142C 80A6C67C 44070000 */ mfc1 $a3, $f0 +/* 01430 80A6C680 AFAC0014 */ sw $t4, 0x0014($sp) +/* 01434 80A6C684 8CA5D370 */ lw $a1, %lo(D_80A6D370)($a1) +/* 01438 80A6C688 E7AA0010 */ swc1 $f10, 0x0010($sp) +/* 0143C 80A6C68C 8FA40030 */ lw $a0, 0x0030($sp) +/* 01440 80A6C690 8FA60034 */ lw $a2, 0x0034($sp) +/* 01444 80A6C694 0C029468 */ jal SkelAnime_ChangeAnim + +/* 01448 80A6C698 E7A00018 */ swc1 $f0, 0x0018($sp) +/* 0144C 80A6C69C 8FBF002C */ lw $ra, 0x002C($sp) .L80A6C6A0: -/* 01450 80A6C6A0 8FB00028 */ lw $s0, 0x0028($sp) +/* 01450 80A6C6A0 8FB00028 */ lw $s0, 0x0028($sp) /* 01454 80A6C6A4 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 -/* 01458 80A6C6A8 03E00008 */ jr $ra +/* 01458 80A6C6A8 03E00008 */ jr $ra /* 0145C 80A6C6AC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse_Normal/func_80A6C6B0.s b/asm/non_matchings/overlays/actors/ovl_En_Horse_Normal/func_80A6C6B0.s index 152f5643b6..2fc9454ff3 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse_Normal/func_80A6C6B0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse_Normal/func_80A6C6B0.s @@ -1,7 +1,7 @@ glabel func_80A6C6B0 /* 01460 80A6C6B0 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 01464 80A6C6B4 AFBF002C */ sw $ra, 0x002C($sp) -/* 01468 80A6C6B8 AFB00028 */ sw $s0, 0x0028($sp) +/* 01464 80A6C6B4 AFBF002C */ sw $ra, 0x002C($sp) +/* 01468 80A6C6B8 AFB00028 */ sw $s0, 0x0028($sp) /* 0146C 80A6C6BC 8C8F0004 */ lw $t7, 0x0004($a0) ## 00000004 /* 01470 80A6C6C0 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 /* 01474 80A6C6C4 240E0003 */ addiu $t6, $zero, 0x0003 ## $t6 = 00000003 @@ -13,37 +13,37 @@ glabel func_80A6C6B0 /* 0148C 80A6C6DC A480021E */ sh $zero, 0x021E($a0) ## 0000021E /* 01490 80A6C6E0 AC980004 */ sw $t8, 0x0004($a0) ## 00000004 /* 01494 80A6C6E4 E4800068 */ swc1 $f0, 0x0068($a0) ## 00000068 -/* 01498 80A6C6E8 0C29ACC3 */ jal func_80A6B30C +/* 01498 80A6C6E8 0C29ACC3 */ jal func_80A6B30C /* 0149C 80A6C6EC E4800218 */ swc1 $f0, 0x0218($a0) ## 00000218 -/* 014A0 80A6C6F0 E7A00030 */ swc1 $f0, 0x0030($sp) +/* 014A0 80A6C6F0 E7A00030 */ swc1 $f0, 0x0030($sp) /* 014A4 80A6C6F4 8E190150 */ lw $t9, 0x0150($s0) ## 00000150 /* 014A8 80A6C6F8 3C0480A7 */ lui $a0, %hi(D_80A6D370) ## $a0 = 80A70000 -/* 014AC 80A6C6FC 00194080 */ sll $t0, $t9, 2 -/* 014B0 80A6C700 00882021 */ addu $a0, $a0, $t0 +/* 014AC 80A6C6FC 00194080 */ sll $t0, $t9, 2 +/* 014B0 80A6C700 00882021 */ addu $a0, $a0, $t0 /* 014B4 80A6C704 0C028800 */ jal SkelAnime_GetFrameCount - -/* 014B8 80A6C708 8C84D370 */ lw $a0, %lo(D_80A6D370)($a0) + +/* 014B8 80A6C708 8C84D370 */ lw $a0, %lo(D_80A6D370)($a0) /* 014BC 80A6C70C 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 014C0 80A6C710 8E090150 */ lw $t1, 0x0150($s0) ## 00000150 /* 014C4 80A6C714 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 014C8 80A6C718 468021A0 */ cvt.s.w $f6, $f4 +/* 014C8 80A6C718 468021A0 */ cvt.s.w $f6, $f4 /* 014CC 80A6C71C 3C0580A7 */ lui $a1, %hi(D_80A6D370) ## $a1 = 80A70000 -/* 014D0 80A6C720 00095080 */ sll $t2, $t1, 2 -/* 014D4 80A6C724 00AA2821 */ addu $a1, $a1, $t2 +/* 014D0 80A6C720 00095080 */ sll $t2, $t1, 2 +/* 014D4 80A6C724 00AA2821 */ addu $a1, $a1, $t2 /* 014D8 80A6C728 240B0002 */ addiu $t3, $zero, 0x0002 ## $t3 = 00000002 -/* 014DC 80A6C72C 44070000 */ mfc1 $a3, $f0 -/* 014E0 80A6C730 AFAB0014 */ sw $t3, 0x0014($sp) -/* 014E4 80A6C734 8CA5D370 */ lw $a1, %lo(D_80A6D370)($a1) -/* 014E8 80A6C738 E7A60010 */ swc1 $f6, 0x0010($sp) +/* 014DC 80A6C72C 44070000 */ mfc1 $a3, $f0 +/* 014E0 80A6C730 AFAB0014 */ sw $t3, 0x0014($sp) +/* 014E4 80A6C734 8CA5D370 */ lw $a1, %lo(D_80A6D370)($a1) +/* 014E8 80A6C738 E7A60010 */ swc1 $f6, 0x0010($sp) /* 014EC 80A6C73C 260401A0 */ addiu $a0, $s0, 0x01A0 ## $a0 = 000001A0 -/* 014F0 80A6C740 8FA60030 */ lw $a2, 0x0030($sp) -/* 014F4 80A6C744 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 014F8 80A6C748 E7A00018 */ swc1 $f0, 0x0018($sp) -/* 014FC 80A6C74C 8FBF002C */ lw $ra, 0x002C($sp) -/* 01500 80A6C750 8FB00028 */ lw $s0, 0x0028($sp) +/* 014F0 80A6C740 8FA60030 */ lw $a2, 0x0030($sp) +/* 014F4 80A6C744 0C029468 */ jal SkelAnime_ChangeAnim + +/* 014F8 80A6C748 E7A00018 */ swc1 $f0, 0x0018($sp) +/* 014FC 80A6C74C 8FBF002C */ lw $ra, 0x002C($sp) +/* 01500 80A6C750 8FB00028 */ lw $s0, 0x0028($sp) /* 01504 80A6C754 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 -/* 01508 80A6C758 03E00008 */ jr $ra +/* 01508 80A6C758 03E00008 */ jr $ra /* 0150C 80A6C75C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse_Normal/func_80A6C760.s b/asm/non_matchings/overlays/actors/ovl_En_Horse_Normal/func_80A6C760.s index 2e6c9268c3..cf027a4769 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse_Normal/func_80A6C760.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse_Normal/func_80A6C760.s @@ -1,37 +1,37 @@ glabel func_80A6C760 /* 01510 80A6C760 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 -/* 01514 80A6C764 AFBF002C */ sw $ra, 0x002C($sp) -/* 01518 80A6C768 AFB00028 */ sw $s0, 0x0028($sp) +/* 01514 80A6C764 AFBF002C */ sw $ra, 0x002C($sp) +/* 01518 80A6C768 AFB00028 */ sw $s0, 0x0028($sp) /* 0151C 80A6C76C 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 01520 80A6C770 0C29AF5F */ jal func_80A6BD7C -/* 01524 80A6C774 AFA50044 */ sw $a1, 0x0044($sp) +/* 01520 80A6C770 0C29AF5F */ jal func_80A6BD7C +/* 01524 80A6C774 AFA50044 */ sw $a1, 0x0044($sp) /* 01528 80A6C778 260401A0 */ addiu $a0, $s0, 0x01A0 ## $a0 = 000001A0 /* 0152C 80A6C77C 0C02927F */ jal SkelAnime_FrameUpdateMatrix - -/* 01530 80A6C780 AFA40030 */ sw $a0, 0x0030($sp) -/* 01534 80A6C784 50400052 */ beql $v0, $zero, .L80A6C8D0 -/* 01538 80A6C788 8FBF002C */ lw $ra, 0x002C($sp) + +/* 01530 80A6C780 AFA40030 */ sw $a0, 0x0030($sp) +/* 01534 80A6C784 50400052 */ beql $v0, $zero, .L80A6C8D0 +/* 01538 80A6C788 8FBF002C */ lw $ra, 0x002C($sp) /* 0153C 80A6C78C 0C03F66B */ jal Math_Rand_ZeroOne ## Rand.Next() float /* 01540 80A6C790 00000000 */ nop /* 01544 80A6C794 3C0180A7 */ lui $at, %hi(D_80A6D5DC) ## $at = 80A70000 -/* 01548 80A6C798 C424D5DC */ lwc1 $f4, %lo(D_80A6D5DC)($at) +/* 01548 80A6C798 C424D5DC */ lwc1 $f4, %lo(D_80A6D5DC)($at) /* 0154C 80A6C79C 3C0180A7 */ lui $at, %hi(D_80A6D5E0) ## $at = 80A70000 -/* 01550 80A6C7A0 4604003C */ c.lt.s $f0, $f4 +/* 01550 80A6C7A0 4604003C */ c.lt.s $f0, $f4 /* 01554 80A6C7A4 00000000 */ nop -/* 01558 80A6C7A8 45000003 */ bc1f .L80A6C7B8 +/* 01558 80A6C7A8 45000003 */ bc1f .L80A6C7B8 /* 0155C 80A6C7AC 00000000 */ nop -/* 01560 80A6C7B0 10000024 */ beq $zero, $zero, .L80A6C844 +/* 01560 80A6C7B0 10000024 */ beq $zero, $zero, .L80A6C844 /* 01564 80A6C7B4 AE000150 */ sw $zero, 0x0150($s0) ## 00000150 .L80A6C7B8: -/* 01568 80A6C7B8 C426D5E0 */ lwc1 $f6, %lo(D_80A6D5E0)($at) +/* 01568 80A6C7B8 C426D5E0 */ lwc1 $f6, %lo(D_80A6D5E0)($at) /* 0156C 80A6C7BC 3C078013 */ lui $a3, 0x8013 ## $a3 = 80130000 /* 01570 80A6C7C0 24E733E0 */ addiu $a3, $a3, 0x33E0 ## $a3 = 801333E0 -/* 01574 80A6C7C4 4606003C */ c.lt.s $f0, $f6 +/* 01574 80A6C7C4 4606003C */ c.lt.s $f0, $f6 /* 01578 80A6C7C8 24080003 */ addiu $t0, $zero, 0x0003 ## $t0 = 00000003 /* 0157C 80A6C7CC 24042805 */ addiu $a0, $zero, 0x2805 ## $a0 = 00002805 /* 01580 80A6C7D0 26050204 */ addiu $a1, $s0, 0x0204 ## $a1 = 00000204 -/* 01584 80A6C7D4 45000012 */ bc1f .L80A6C820 +/* 01584 80A6C7D4 45000012 */ bc1f .L80A6C820 /* 01588 80A6C7D8 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 /* 0158C 80A6C7DC 960F01E4 */ lhu $t7, 0x01E4($s0) ## 000001E4 /* 01590 80A6C7E0 3C078013 */ lui $a3, 0x8013 ## $a3 = 80130000 @@ -42,14 +42,14 @@ glabel func_80A6C760 /* 015A4 80A6C7F4 AE0E0150 */ sw $t6, 0x0150($s0) ## 00000150 /* 015A8 80A6C7F8 A61801E4 */ sh $t8, 0x01E4($s0) ## 000001E4 /* 015AC 80A6C7FC 273933E8 */ addiu $t9, $t9, 0x33E8 ## $t9 = 801333E8 -/* 015B0 80A6C800 AFB90014 */ sw $t9, 0x0014($sp) -/* 015B4 80A6C804 AFA70010 */ sw $a3, 0x0010($sp) +/* 015B0 80A6C800 AFB90014 */ sw $t9, 0x0014($sp) +/* 015B4 80A6C804 AFA70010 */ sw $a3, 0x0010($sp) /* 015B8 80A6C808 24042816 */ addiu $a0, $zero, 0x2816 ## $a0 = 00002816 /* 015BC 80A6C80C 26050204 */ addiu $a1, $s0, 0x0204 ## $a1 = 00000204 /* 015C0 80A6C810 0C03DCE3 */ jal Audio_PlaySoundGeneral - + /* 015C4 80A6C814 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 -/* 015C8 80A6C818 1000000A */ beq $zero, $zero, .L80A6C844 +/* 015C8 80A6C818 1000000A */ beq $zero, $zero, .L80A6C844 /* 015CC 80A6C81C 00000000 */ nop .L80A6C820: /* 015D0 80A6C820 960901E4 */ lhu $t1, 0x01E4($s0) ## 000001E4 @@ -58,38 +58,38 @@ glabel func_80A6C760 /* 015DC 80A6C82C 352A0020 */ ori $t2, $t1, 0x0020 ## $t2 = 00000020 /* 015E0 80A6C830 A60A01E4 */ sh $t2, 0x01E4($s0) ## 000001E4 /* 015E4 80A6C834 256B33E8 */ addiu $t3, $t3, 0x33E8 ## $t3 = 801333E8 -/* 015E8 80A6C838 AFAB0014 */ sw $t3, 0x0014($sp) +/* 015E8 80A6C838 AFAB0014 */ sw $t3, 0x0014($sp) /* 015EC 80A6C83C 0C03DCE3 */ jal Audio_PlaySoundGeneral - -/* 015F0 80A6C840 AFA70010 */ sw $a3, 0x0010($sp) + +/* 015F0 80A6C840 AFA70010 */ sw $a3, 0x0010($sp) .L80A6C844: -/* 015F4 80A6C844 0C29ACC3 */ jal func_80A6B30C +/* 015F4 80A6C844 0C29ACC3 */ jal func_80A6B30C /* 015F8 80A6C848 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 015FC 80A6C84C E7A00034 */ swc1 $f0, 0x0034($sp) +/* 015FC 80A6C84C E7A00034 */ swc1 $f0, 0x0034($sp) /* 01600 80A6C850 8E0C0150 */ lw $t4, 0x0150($s0) ## 00000150 /* 01604 80A6C854 3C0480A7 */ lui $a0, %hi(D_80A6D370) ## $a0 = 80A70000 -/* 01608 80A6C858 000C6880 */ sll $t5, $t4, 2 -/* 0160C 80A6C85C 008D2021 */ addu $a0, $a0, $t5 +/* 01608 80A6C858 000C6880 */ sll $t5, $t4, 2 +/* 0160C 80A6C85C 008D2021 */ addu $a0, $a0, $t5 /* 01610 80A6C860 0C028800 */ jal SkelAnime_GetFrameCount - -/* 01614 80A6C864 8C84D370 */ lw $a0, %lo(D_80A6D370)($a0) + +/* 01614 80A6C864 8C84D370 */ lw $a0, %lo(D_80A6D370)($a0) /* 01618 80A6C868 44824000 */ mtc1 $v0, $f8 ## $f8 = 0.00 /* 0161C 80A6C86C 8E0E0150 */ lw $t6, 0x0150($s0) ## 00000150 /* 01620 80A6C870 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 01624 80A6C874 468042A0 */ cvt.s.w $f10, $f8 +/* 01624 80A6C874 468042A0 */ cvt.s.w $f10, $f8 /* 01628 80A6C878 3C0580A7 */ lui $a1, %hi(D_80A6D370) ## $a1 = 80A70000 -/* 0162C 80A6C87C 000E7880 */ sll $t7, $t6, 2 -/* 01630 80A6C880 00AF2821 */ addu $a1, $a1, $t7 +/* 0162C 80A6C87C 000E7880 */ sll $t7, $t6, 2 +/* 01630 80A6C880 00AF2821 */ addu $a1, $a1, $t7 /* 01634 80A6C884 24180002 */ addiu $t8, $zero, 0x0002 ## $t8 = 00000002 -/* 01638 80A6C888 44070000 */ mfc1 $a3, $f0 -/* 0163C 80A6C88C AFB80014 */ sw $t8, 0x0014($sp) -/* 01640 80A6C890 8CA5D370 */ lw $a1, %lo(D_80A6D370)($a1) -/* 01644 80A6C894 E7AA0010 */ swc1 $f10, 0x0010($sp) -/* 01648 80A6C898 8FA40030 */ lw $a0, 0x0030($sp) -/* 0164C 80A6C89C 8FA60034 */ lw $a2, 0x0034($sp) -/* 01650 80A6C8A0 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 01654 80A6C8A4 E7A00018 */ swc1 $f0, 0x0018($sp) +/* 01638 80A6C888 44070000 */ mfc1 $a3, $f0 +/* 0163C 80A6C88C AFB80014 */ sw $t8, 0x0014($sp) +/* 01640 80A6C890 8CA5D370 */ lw $a1, %lo(D_80A6D370)($a1) +/* 01644 80A6C894 E7AA0010 */ swc1 $f10, 0x0010($sp) +/* 01648 80A6C898 8FA40030 */ lw $a0, 0x0030($sp) +/* 0164C 80A6C89C 8FA60034 */ lw $a2, 0x0034($sp) +/* 01650 80A6C8A0 0C029468 */ jal SkelAnime_ChangeAnim + +/* 01654 80A6C8A4 E7A00018 */ swc1 $f0, 0x0018($sp) /* 01658 80A6C8A8 961901E4 */ lhu $t9, 0x01E4($s0) ## 000001E4 /* 0165C 80A6C8AC 3329FFFE */ andi $t1, $t9, 0xFFFE ## $t1 = 00000000 /* 01660 80A6C8B0 312BFFFD */ andi $t3, $t1, 0xFFFD ## $t3 = 00000000 @@ -99,11 +99,11 @@ glabel func_80A6C760 /* 01670 80A6C8C0 A60D01E4 */ sh $t5, 0x01E4($s0) ## 000001E4 /* 01674 80A6C8C4 31AEFFEF */ andi $t6, $t5, 0xFFEF ## $t6 = 00000000 /* 01678 80A6C8C8 A60E01E4 */ sh $t6, 0x01E4($s0) ## 000001E4 -/* 0167C 80A6C8CC 8FBF002C */ lw $ra, 0x002C($sp) +/* 0167C 80A6C8CC 8FBF002C */ lw $ra, 0x002C($sp) .L80A6C8D0: -/* 01680 80A6C8D0 8FB00028 */ lw $s0, 0x0028($sp) +/* 01680 80A6C8D0 8FB00028 */ lw $s0, 0x0028($sp) /* 01684 80A6C8D4 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 -/* 01688 80A6C8D8 03E00008 */ jr $ra +/* 01688 80A6C8D8 03E00008 */ jr $ra /* 0168C 80A6C8DC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse_Normal/func_80A6C8E0.s b/asm/non_matchings/overlays/actors/ovl_En_Horse_Normal/func_80A6C8E0.s index 6084dd212d..89ab9c877f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse_Normal/func_80A6C8E0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse_Normal/func_80A6C8E0.s @@ -37,7 +37,7 @@ glabel func_80A6C8E0 /* 01714 80A6C964 3C0141F0 */ lui $at, 0x41F0 ## $at = 41F00000 /* 01718 80A6C968 44817000 */ mtc1 $at, $f14 ## $f14 = 30.00 /* 0171C 80A6C96C E6000220 */ swc1 $f0, 0x0220($s0) ## 00000220 -/* 01720 80A6C970 0C03F494 */ jal func_800FD250 +/* 01720 80A6C970 0C03F494 */ jal Math_atan2f /* 01724 80A6C974 46009301 */ sub.s $f12, $f18, $f0 /* 01728 80A6C978 3C0180A7 */ lui $at, %hi(D_80A6D5E4) ## $at = 80A70000 /* 0172C 80A6C97C C424D5E4 */ lwc1 $f4, %lo(D_80A6D5E4)($at) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse_Zelda/EnHorseZelda_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Horse_Zelda/EnHorseZelda_Init.s index 0864e59f66..c81f2baf23 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse_Zelda/EnHorseZelda_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse_Zelda/EnHorseZelda_Init.s @@ -1,18 +1,18 @@ glabel EnHorseZelda_Init /* 00210 80A6DAE0 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 00214 80A6DAE4 AFB10020 */ sw $s1, 0x0020($sp) +/* 00214 80A6DAE4 AFB10020 */ sw $s1, 0x0020($sp) /* 00218 80A6DAE8 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 -/* 0021C 80A6DAEC AFBF0024 */ sw $ra, 0x0024($sp) -/* 00220 80A6DAF0 AFB0001C */ sw $s0, 0x001C($sp) +/* 0021C 80A6DAEC AFBF0024 */ sw $ra, 0x0024($sp) +/* 00220 80A6DAF0 AFB0001C */ sw $s0, 0x001C($sp) /* 00224 80A6DAF4 3C0580A7 */ lui $a1, %hi(D_80A6E2B0) ## $a1 = 80A70000 /* 00228 80A6DAF8 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 0022C 80A6DAFC 0C01E037 */ jal Actor_ProcessInitChain - + /* 00230 80A6DB00 24A5E2B0 */ addiu $a1, $a1, %lo(D_80A6E2B0) ## $a1 = 80A6E2B0 /* 00234 80A6DB04 3C053C3C */ lui $a1, 0x3C3C ## $a1 = 3C3C0000 /* 00238 80A6DB08 34A56A7F */ ori $a1, $a1, 0x6A7F ## $a1 = 3C3C6A7F /* 0023C 80A6DB0C 0C00B58B */ jal Actor_SetScale - + /* 00240 80A6DB10 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 00244 80A6DB14 3C01C060 */ lui $at, 0xC060 ## $at = C0600000 /* 00248 80A6DB18 44812000 */ mtc1 $at, $f4 ## $f4 = -3.50 @@ -22,7 +22,7 @@ glabel EnHorseZelda_Init /* 00258 80A6DB28 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 /* 0025C 80A6DB2C 3C0741A0 */ lui $a3, 0x41A0 ## $a3 = 41A00000 /* 00260 80A6DB30 0C00AC78 */ jal ActorShape_Init - + /* 00264 80A6DB34 E604006C */ swc1 $f4, 0x006C($s0) ## 0000006C /* 00268 80A6DB38 8E0E0028 */ lw $t6, 0x0028($s0) ## 00000028 /* 0026C 80A6DB3C 3C01428C */ lui $at, 0x428C ## $at = 428C0000 @@ -32,7 +32,7 @@ glabel EnHorseZelda_Init /* 0027C 80A6DB4C 44815000 */ mtc1 $at, $f10 ## $f10 = 70.00 /* 00280 80A6DB50 AE0F0038 */ sw $t7, 0x0038($s0) ## 00000038 /* 00284 80A6DB54 44803000 */ mtc1 $zero, $f6 ## $f6 = 0.00 -/* 00288 80A6DB58 460A4400 */ add.s $f16, $f8, $f10 +/* 00288 80A6DB58 460A4400 */ add.s $f16, $f8, $f10 /* 0028C 80A6DB5C 8E0F002C */ lw $t7, 0x002C($s0) ## 0000002C /* 00290 80A6DB60 3C060600 */ lui $a2, 0x0600 ## $a2 = 06000000 /* 00294 80A6DB64 3C070600 */ lui $a3, 0x0600 ## $a3 = 06000000 @@ -43,48 +43,48 @@ glabel EnHorseZelda_Init /* 002A8 80A6DB78 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 002AC 80A6DB7C 26050154 */ addiu $a1, $s0, 0x0154 ## $a1 = 00000154 /* 002B0 80A6DB80 E6060068 */ swc1 $f6, 0x0068($s0) ## 00000068 -/* 002B4 80A6DB84 0C02998F */ jal func_800A663C +/* 002B4 80A6DB84 0C02998F */ jal func_800A663C /* 002B8 80A6DB88 AE0F0040 */ sw $t7, 0x0040($s0) ## 00000040 /* 002BC 80A6DB8C AE000150 */ sw $zero, 0x0150($s0) ## 00000150 /* 002C0 80A6DB90 3C0580A7 */ lui $a1, %hi(D_80A6E1D0) ## $a1 = 80A70000 -/* 002C4 80A6DB94 8CA5E1D0 */ lw $a1, %lo(D_80A6E1D0)($a1) -/* 002C8 80A6DB98 0C02947A */ jal func_800A51E8 +/* 002C4 80A6DB94 8CA5E1D0 */ lw $a1, %lo(D_80A6E1D0)($a1) +/* 002C8 80A6DB98 0C02947A */ jal SkelAnime_ChangeAnimDefaultStop /* 002CC 80A6DB9C 260401A0 */ addiu $a0, $s0, 0x01A0 ## $a0 = 000001A0 /* 002D0 80A6DBA0 260501FC */ addiu $a1, $s0, 0x01FC ## $a1 = 000001FC -/* 002D4 80A6DBA4 AFA50028 */ sw $a1, 0x0028($sp) +/* 002D4 80A6DBA4 AFA50028 */ sw $a1, 0x0028($sp) /* 002D8 80A6DBA8 0C0170D9 */ jal ActorCollider_AllocCylinder - + /* 002DC 80A6DBAC 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 002E0 80A6DBB0 3C0780A7 */ lui $a3, %hi(D_80A6E1D8) ## $a3 = 80A70000 -/* 002E4 80A6DBB4 8FA50028 */ lw $a1, 0x0028($sp) +/* 002E4 80A6DBB4 8FA50028 */ lw $a1, 0x0028($sp) /* 002E8 80A6DBB8 24E7E1D8 */ addiu $a3, $a3, %lo(D_80A6E1D8) ## $a3 = 80A6E1D8 /* 002EC 80A6DBBC 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 002F0 80A6DBC0 0C017114 */ jal func_8005C450 +/* 002F0 80A6DBC0 0C017114 */ jal func_8005C450 /* 002F4 80A6DBC4 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 002F8 80A6DBC8 26050248 */ addiu $a1, $s0, 0x0248 ## $a1 = 00000248 -/* 002FC 80A6DBCC AFA50028 */ sw $a1, 0x0028($sp) -/* 00300 80A6DBD0 0C016EFE */ jal func_8005BBF8 +/* 002FC 80A6DBCC AFA50028 */ sw $a1, 0x0028($sp) +/* 00300 80A6DBD0 0C016EFE */ jal func_8005BBF8 /* 00304 80A6DBD4 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 00308 80A6DBD8 3C0780A7 */ lui $a3, %hi(D_80A6E228) ## $a3 = 80A70000 /* 0030C 80A6DBDC 26180268 */ addiu $t8, $s0, 0x0268 ## $t8 = 00000268 -/* 00310 80A6DBE0 8FA50028 */ lw $a1, 0x0028($sp) -/* 00314 80A6DBE4 AFB80010 */ sw $t8, 0x0010($sp) +/* 00310 80A6DBE0 8FA50028 */ lw $a1, 0x0028($sp) +/* 00314 80A6DBE4 AFB80010 */ sw $t8, 0x0010($sp) /* 00318 80A6DBE8 24E7E228 */ addiu $a3, $a3, %lo(D_80A6E228) ## $a3 = 80A6E228 /* 0031C 80A6DBEC 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 00320 80A6DBF0 0C017014 */ jal func_8005C050 +/* 00320 80A6DBF0 0C017014 */ jal func_8005C050 /* 00324 80A6DBF4 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 00328 80A6DBF8 3C0680A7 */ lui $a2, %hi(D_80A6E238) ## $a2 = 80A70000 /* 0032C 80A6DBFC 24C6E238 */ addiu $a2, $a2, %lo(D_80A6E238) ## $a2 = 80A6E238 /* 00330 80A6DC00 26040098 */ addiu $a0, $s0, 0x0098 ## $a0 = 00000098 -/* 00334 80A6DC04 0C0187B5 */ jal func_80061ED4 +/* 00334 80A6DC04 0C0187B5 */ jal func_80061ED4 /* 00338 80A6DC08 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 0033C 80A6DC0C AE000150 */ sw $zero, 0x0150($s0) ## 00000150 -/* 00340 80A6DC10 0C29B71F */ jal func_80A6DC7C +/* 00340 80A6DC10 0C29B71F */ jal func_80A6DC7C /* 00344 80A6DC14 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00348 80A6DC18 8FBF0024 */ lw $ra, 0x0024($sp) -/* 0034C 80A6DC1C 8FB0001C */ lw $s0, 0x001C($sp) -/* 00350 80A6DC20 8FB10020 */ lw $s1, 0x0020($sp) -/* 00354 80A6DC24 03E00008 */ jr $ra +/* 00348 80A6DC18 8FBF0024 */ lw $ra, 0x0024($sp) +/* 0034C 80A6DC1C 8FB0001C */ lw $s0, 0x001C($sp) +/* 00350 80A6DC20 8FB10020 */ lw $s1, 0x0020($sp) +/* 00354 80A6DC24 03E00008 */ jr $ra /* 00358 80A6DC28 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse_Zelda/func_80A6DC7C.s b/asm/non_matchings/overlays/actors/ovl_En_Horse_Zelda/func_80A6DC7C.s index 9a449fc28d..6bfb4a78a4 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse_Zelda/func_80A6DC7C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse_Zelda/func_80A6DC7C.s @@ -1,24 +1,24 @@ glabel func_80A6DC7C /* 003AC 80A6DC7C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 003B0 80A6DC80 AFBF0014 */ sw $ra, 0x0014($sp) +/* 003B0 80A6DC80 AFBF0014 */ sw $ra, 0x0014($sp) /* 003B4 80A6DC84 8C8E0150 */ lw $t6, 0x0150($a0) ## 00000150 /* 003B8 80A6DC88 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 /* 003BC 80A6DC8C AC80014C */ sw $zero, 0x014C($a0) ## 0000014C /* 003C0 80A6DC90 25C20001 */ addiu $v0, $t6, 0x0001 ## $v0 = 00000001 -/* 003C4 80A6DC94 18400003 */ blez $v0, .L80A6DCA4 +/* 003C4 80A6DC94 18400003 */ blez $v0, .L80A6DCA4 /* 003C8 80A6DC98 AC820150 */ sw $v0, 0x0150($a0) ## 00000150 /* 003CC 80A6DC9C AC800150 */ sw $zero, 0x0150($a0) ## 00000150 /* 003D0 80A6DCA0 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 .L80A6DCA4: -/* 003D4 80A6DCA4 0002C080 */ sll $t8, $v0, 2 +/* 003D4 80A6DCA4 0002C080 */ sll $t8, $v0, 2 /* 003D8 80A6DCA8 3C0580A7 */ lui $a1, %hi(D_80A6E1D0) ## $a1 = 80A70000 -/* 003DC 80A6DCAC 00B82821 */ addu $a1, $a1, $t8 -/* 003E0 80A6DCB0 8CA5E1D0 */ lw $a1, %lo(D_80A6E1D0)($a1) -/* 003E4 80A6DCB4 0C02947A */ jal func_800A51E8 +/* 003DC 80A6DCAC 00B82821 */ addu $a1, $a1, $t8 +/* 003E0 80A6DCB0 8CA5E1D0 */ lw $a1, %lo(D_80A6E1D0)($a1) +/* 003E4 80A6DCB4 0C02947A */ jal SkelAnime_ChangeAnimDefaultStop /* 003E8 80A6DCB8 24C401A0 */ addiu $a0, $a2, 0x01A0 ## $a0 = 000001A0 -/* 003EC 80A6DCBC 8FBF0014 */ lw $ra, 0x0014($sp) +/* 003EC 80A6DCBC 8FBF0014 */ lw $ra, 0x0014($sp) /* 003F0 80A6DCC0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 003F4 80A6DCC4 03E00008 */ jr $ra +/* 003F4 80A6DCC4 03E00008 */ jr $ra /* 003F8 80A6DCC8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse_Zelda/func_80A6DD14.s b/asm/non_matchings/overlays/actors/ovl_En_Horse_Zelda/func_80A6DD14.s index 2c48c81e4d..857d02bd85 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse_Zelda/func_80A6DD14.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse_Zelda/func_80A6DD14.s @@ -1,64 +1,64 @@ glabel func_80A6DD14 /* 00444 80A6DD14 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 00448 80A6DD18 AFBF002C */ sw $ra, 0x002C($sp) -/* 0044C 80A6DD1C AFB00028 */ sw $s0, 0x0028($sp) +/* 00448 80A6DD18 AFBF002C */ sw $ra, 0x002C($sp) +/* 0044C 80A6DD1C AFB00028 */ sw $s0, 0x0028($sp) /* 00450 80A6DD20 3C0140C0 */ lui $at, 0x40C0 ## $at = 40C00000 /* 00454 80A6DD24 44813000 */ mtc1 $at, $f6 ## $f6 = 6.00 /* 00458 80A6DD28 C4840068 */ lwc1 $f4, 0x0068($a0) ## 00000068 /* 0045C 80A6DD2C 240E0001 */ addiu $t6, $zero, 0x0001 ## $t6 = 00000001 /* 00460 80A6DD30 AC8E014C */ sw $t6, 0x014C($a0) ## 0000014C -/* 00464 80A6DD34 46062203 */ div.s $f8, $f4, $f6 +/* 00464 80A6DD34 46062203 */ div.s $f8, $f4, $f6 /* 00468 80A6DD38 AC800150 */ sw $zero, 0x0150($a0) ## 00000150 /* 0046C 80A6DD3C 3C078013 */ lui $a3, 0x8013 ## $a3 = 80130000 /* 00470 80A6DD40 3C0F8013 */ lui $t7, 0x8013 ## $t7 = 80130000 /* 00474 80A6DD44 24E733E0 */ addiu $a3, $a3, 0x33E0 ## $a3 = 801333E0 /* 00478 80A6DD48 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 0047C 80A6DD4C 25EF33E8 */ addiu $t7, $t7, 0x33E8 ## $t7 = 801333E8 -/* 00480 80A6DD50 AFAF0014 */ sw $t7, 0x0014($sp) +/* 00480 80A6DD50 AFAF0014 */ sw $t7, 0x0014($sp) /* 00484 80A6DD54 260500E4 */ addiu $a1, $s0, 0x00E4 ## $a1 = 000000E4 /* 00488 80A6DD58 24042804 */ addiu $a0, $zero, 0x2804 ## $a0 = 00002804 -/* 0048C 80A6DD5C AFA70010 */ sw $a3, 0x0010($sp) +/* 0048C 80A6DD5C AFA70010 */ sw $a3, 0x0010($sp) /* 00490 80A6DD60 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 /* 00494 80A6DD64 0C03DCE3 */ jal Audio_PlaySoundGeneral - -/* 00498 80A6DD68 E7A80034 */ swc1 $f8, 0x0034($sp) + +/* 00498 80A6DD68 E7A80034 */ swc1 $f8, 0x0034($sp) /* 0049C 80A6DD6C 8E180150 */ lw $t8, 0x0150($s0) ## 00000150 /* 004A0 80A6DD70 3C0480A7 */ lui $a0, %hi(D_80A6E1D0) ## $a0 = 80A70000 -/* 004A4 80A6DD74 0018C880 */ sll $t9, $t8, 2 -/* 004A8 80A6DD78 00992021 */ addu $a0, $a0, $t9 +/* 004A4 80A6DD74 0018C880 */ sll $t9, $t8, 2 +/* 004A8 80A6DD78 00992021 */ addu $a0, $a0, $t9 /* 004AC 80A6DD7C 0C028800 */ jal SkelAnime_GetFrameCount - -/* 004B0 80A6DD80 8C84E1D0 */ lw $a0, %lo(D_80A6E1D0)($a0) + +/* 004B0 80A6DD80 8C84E1D0 */ lw $a0, %lo(D_80A6E1D0)($a0) /* 004B4 80A6DD84 8E030150 */ lw $v1, 0x0150($s0) ## 00000150 /* 004B8 80A6DD88 3C0180A7 */ lui $at, %hi(D_80A6E1D4) ## $at = 80A70000 -/* 004BC 80A6DD8C C7B00034 */ lwc1 $f16, 0x0034($sp) -/* 004C0 80A6DD90 00031880 */ sll $v1, $v1, 2 -/* 004C4 80A6DD94 00230821 */ addu $at, $at, $v1 -/* 004C8 80A6DD98 C42AE1D4 */ lwc1 $f10, %lo(D_80A6E1D4)($at) +/* 004BC 80A6DD8C C7B00034 */ lwc1 $f16, 0x0034($sp) +/* 004C0 80A6DD90 00031880 */ sll $v1, $v1, 2 +/* 004C4 80A6DD94 00230821 */ addu $at, $at, $v1 +/* 004C8 80A6DD98 C42AE1D4 */ lwc1 $f10, %lo(D_80A6E1D4)($at) /* 004CC 80A6DD9C 3C013FC0 */ lui $at, 0x3FC0 ## $at = 3FC00000 /* 004D0 80A6DDA0 44812000 */ mtc1 $at, $f4 ## $f4 = 1.50 -/* 004D4 80A6DDA4 46105482 */ mul.s $f18, $f10, $f16 +/* 004D4 80A6DDA4 46105482 */ mul.s $f18, $f10, $f16 /* 004D8 80A6DDA8 44824000 */ mtc1 $v0, $f8 ## $f8 = 0.00 /* 004DC 80A6DDAC 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 /* 004E0 80A6DDB0 3C0580A7 */ lui $a1, %hi(D_80A6E1D0) ## $a1 = 80A70000 -/* 004E4 80A6DDB4 00A32821 */ addu $a1, $a1, $v1 +/* 004E4 80A6DDB4 00A32821 */ addu $a1, $a1, $v1 /* 004E8 80A6DDB8 24080002 */ addiu $t0, $zero, 0x0002 ## $t0 = 00000002 -/* 004EC 80A6DDBC 468042A0 */ cvt.s.w $f10, $f8 -/* 004F0 80A6DDC0 46049182 */ mul.s $f6, $f18, $f4 -/* 004F4 80A6DDC4 44070000 */ mfc1 $a3, $f0 -/* 004F8 80A6DDC8 AFA80014 */ sw $t0, 0x0014($sp) -/* 004FC 80A6DDCC 8CA5E1D0 */ lw $a1, %lo(D_80A6E1D0)($a1) +/* 004EC 80A6DDBC 468042A0 */ cvt.s.w $f10, $f8 +/* 004F0 80A6DDC0 46049182 */ mul.s $f6, $f18, $f4 +/* 004F4 80A6DDC4 44070000 */ mfc1 $a3, $f0 +/* 004F8 80A6DDC8 AFA80014 */ sw $t0, 0x0014($sp) +/* 004FC 80A6DDCC 8CA5E1D0 */ lw $a1, %lo(D_80A6E1D0)($a1) /* 00500 80A6DDD0 260401A0 */ addiu $a0, $s0, 0x01A0 ## $a0 = 000001A0 -/* 00504 80A6DDD4 E7AA0010 */ swc1 $f10, 0x0010($sp) -/* 00508 80A6DDD8 E7A00018 */ swc1 $f0, 0x0018($sp) -/* 0050C 80A6DDDC 44063000 */ mfc1 $a2, $f6 -/* 00510 80A6DDE0 0C029468 */ jal SkelAnime_ChangeAnimation - +/* 00504 80A6DDD4 E7AA0010 */ swc1 $f10, 0x0010($sp) +/* 00508 80A6DDD8 E7A00018 */ swc1 $f0, 0x0018($sp) +/* 0050C 80A6DDDC 44063000 */ mfc1 $a2, $f6 +/* 00510 80A6DDE0 0C029468 */ jal SkelAnime_ChangeAnim + /* 00514 80A6DDE4 00000000 */ nop -/* 00518 80A6DDE8 8FBF002C */ lw $ra, 0x002C($sp) -/* 0051C 80A6DDEC 8FB00028 */ lw $s0, 0x0028($sp) +/* 00518 80A6DDE8 8FBF002C */ lw $ra, 0x002C($sp) +/* 0051C 80A6DDEC 8FB00028 */ lw $s0, 0x0028($sp) /* 00520 80A6DDF0 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 -/* 00524 80A6DDF4 03E00008 */ jr $ra +/* 00524 80A6DDF4 03E00008 */ jr $ra /* 00528 80A6DDF8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Horse_Zelda/func_80A6DE38.s b/asm/non_matchings/overlays/actors/ovl_En_Horse_Zelda/func_80A6DE38.s index e61317912e..1e8a304e7b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Horse_Zelda/func_80A6DE38.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Horse_Zelda/func_80A6DE38.s @@ -37,7 +37,7 @@ glabel func_80A6DE38 /* 005EC 80A6DEBC 3C0141F0 */ lui $at, 0x41F0 ## $at = 41F00000 /* 005F0 80A6DEC0 44817000 */ mtc1 $at, $f14 ## $f14 = 30.00 /* 005F4 80A6DEC4 E60001F4 */ swc1 $f0, 0x01F4($s0) ## 000001F4 -/* 005F8 80A6DEC8 0C03F494 */ jal func_800FD250 +/* 005F8 80A6DEC8 0C03F494 */ jal Math_atan2f /* 005FC 80A6DECC 46009301 */ sub.s $f12, $f18, $f0 /* 00600 80A6DED0 3C0180A7 */ lui $at, %hi(D_80A6E2C0) ## $at = 80A70000 /* 00604 80A6DED4 C424E2C0 */ lwc1 $f4, %lo(D_80A6E2C0)($at) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Hs/EnHs_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Hs/EnHs_Draw.s index 1326b67946..766412bd50 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Hs/EnHs_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Hs/EnHs_Draw.s @@ -1,11 +1,11 @@ glabel EnHs_Draw /* 009B4 80A6ED54 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 009B8 80A6ED58 AFBF0024 */ sw $ra, 0x0024($sp) -/* 009BC 80A6ED5C AFA40028 */ sw $a0, 0x0028($sp) -/* 009C0 80A6ED60 AFA5002C */ sw $a1, 0x002C($sp) -/* 009C4 80A6ED64 0C0250F2 */ jal func_800943C8 +/* 009B8 80A6ED58 AFBF0024 */ sw $ra, 0x0024($sp) +/* 009BC 80A6ED5C AFA40028 */ sw $a0, 0x0028($sp) +/* 009C0 80A6ED60 AFA5002C */ sw $a1, 0x002C($sp) +/* 009C4 80A6ED64 0C0250F2 */ jal func_800943C8 /* 009C8 80A6ED68 8CA40000 */ lw $a0, 0x0000($a1) ## 00000000 -/* 009CC 80A6ED6C 8FA20028 */ lw $v0, 0x0028($sp) +/* 009CC 80A6ED6C 8FA20028 */ lw $v0, 0x0028($sp) /* 009D0 80A6ED70 3C0F80A7 */ lui $t7, %hi(func_80A6EC58) ## $t7 = 80A70000 /* 009D4 80A6ED74 3C1880A7 */ lui $t8, %hi(func_80A6ED14) ## $t8 = 80A70000 /* 009D8 80A6ED78 8C45019C */ lw $a1, 0x019C($v0) ## 0000019C @@ -13,13 +13,13 @@ glabel EnHs_Draw /* 009E0 80A6ED80 9047019A */ lbu $a3, 0x019A($v0) ## 0000019A /* 009E4 80A6ED84 2718ED14 */ addiu $t8, $t8, %lo(func_80A6ED14) ## $t8 = 80A6ED14 /* 009E8 80A6ED88 25EFEC58 */ addiu $t7, $t7, %lo(func_80A6EC58) ## $t7 = 80A6EC58 -/* 009EC 80A6ED8C AFAF0010 */ sw $t7, 0x0010($sp) -/* 009F0 80A6ED90 AFB80014 */ sw $t8, 0x0014($sp) -/* 009F4 80A6ED94 8FA4002C */ lw $a0, 0x002C($sp) -/* 009F8 80A6ED98 0C0286B2 */ jal func_800A1AC8 -/* 009FC 80A6ED9C AFA20018 */ sw $v0, 0x0018($sp) -/* 00A00 80A6EDA0 8FBF0024 */ lw $ra, 0x0024($sp) +/* 009EC 80A6ED8C AFAF0010 */ sw $t7, 0x0010($sp) +/* 009F0 80A6ED90 AFB80014 */ sw $t8, 0x0014($sp) +/* 009F4 80A6ED94 8FA4002C */ lw $a0, 0x002C($sp) +/* 009F8 80A6ED98 0C0286B2 */ jal SkelAnime_DrawSV +/* 009FC 80A6ED9C AFA20018 */ sw $v0, 0x0018($sp) +/* 00A00 80A6EDA0 8FBF0024 */ lw $ra, 0x0024($sp) /* 00A04 80A6EDA4 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 00A08 80A6EDA8 03E00008 */ jr $ra +/* 00A08 80A6EDA8 03E00008 */ jr $ra /* 00A0C 80A6EDAC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Hs/EnHs_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Hs/EnHs_Init.s index 9f8fc25004..120066bbed 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Hs/EnHs_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Hs/EnHs_Init.s @@ -1,15 +1,15 @@ glabel EnHs_Init /* 00008 80A6E3A8 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 -/* 0000C 80A6E3AC AFB00028 */ sw $s0, 0x0028($sp) +/* 0000C 80A6E3AC AFB00028 */ sw $s0, 0x0028($sp) /* 00010 80A6E3B0 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00014 80A6E3B4 AFBF002C */ sw $ra, 0x002C($sp) -/* 00018 80A6E3B8 AFA50044 */ sw $a1, 0x0044($sp) +/* 00014 80A6E3B4 AFBF002C */ sw $ra, 0x002C($sp) +/* 00018 80A6E3B8 AFA50044 */ sw $a1, 0x0044($sp) /* 0001C 80A6E3BC 3C068003 */ lui $a2, 0x8003 ## $a2 = 80030000 /* 00020 80A6E3C0 24C6B5EC */ addiu $a2, $a2, 0xB5EC ## $a2 = 8002B5EC /* 00024 80A6E3C4 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 /* 00028 80A6E3C8 248400B4 */ addiu $a0, $a0, 0x00B4 ## $a0 = 000000B4 /* 0002C 80A6E3CC 0C00AC78 */ jal ActorShape_Init - + /* 00030 80A6E3D0 3C074210 */ lui $a3, 0x4210 ## $a3 = 42100000 /* 00034 80A6E3D4 26050198 */ addiu $a1, $s0, 0x0198 ## $a1 = 00000198 /* 00038 80A6E3D8 3C060600 */ lui $a2, 0x0600 ## $a2 = 06000000 @@ -17,89 +17,89 @@ glabel EnHs_Init /* 00040 80A6E3E0 260E01DC */ addiu $t6, $s0, 0x01DC ## $t6 = 000001DC /* 00044 80A6E3E4 260F023C */ addiu $t7, $s0, 0x023C ## $t7 = 0000023C /* 00048 80A6E3E8 24180010 */ addiu $t8, $zero, 0x0010 ## $t8 = 00000010 -/* 0004C 80A6E3EC AFB80018 */ sw $t8, 0x0018($sp) -/* 00050 80A6E3F0 AFAF0014 */ sw $t7, 0x0014($sp) -/* 00054 80A6E3F4 AFAE0010 */ sw $t6, 0x0010($sp) +/* 0004C 80A6E3EC AFB80018 */ sw $t8, 0x0018($sp) +/* 00050 80A6E3F0 AFAF0014 */ sw $t7, 0x0014($sp) +/* 00054 80A6E3F4 AFAE0010 */ sw $t6, 0x0010($sp) /* 00058 80A6E3F8 24E705C0 */ addiu $a3, $a3, 0x05C0 ## $a3 = 060005C0 /* 0005C 80A6E3FC 24C66260 */ addiu $a2, $a2, 0x6260 ## $a2 = 06006260 -/* 00060 80A6E400 AFA50034 */ sw $a1, 0x0034($sp) -/* 00064 80A6E404 0C0291BE */ jal func_800A46F8 -/* 00068 80A6E408 8FA40044 */ lw $a0, 0x0044($sp) +/* 00060 80A6E400 AFA50034 */ sw $a1, 0x0034($sp) +/* 00064 80A6E404 0C0291BE */ jal SkelAnime_InitSV +/* 00068 80A6E408 8FA40044 */ lw $a0, 0x0044($sp) /* 0006C 80A6E40C 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 00070 80A6E410 24A505C0 */ addiu $a1, $a1, 0x05C0 ## $a1 = 060005C0 -/* 00074 80A6E414 0C0294BE */ jal func_800A52F8 -/* 00078 80A6E418 8FA40034 */ lw $a0, 0x0034($sp) +/* 00074 80A6E414 0C0294BE */ jal SkelAnime_ChangeAnimDefaultRepeat +/* 00078 80A6E418 8FA40034 */ lw $a0, 0x0034($sp) /* 0007C 80A6E41C 2605014C */ addiu $a1, $s0, 0x014C ## $a1 = 0000014C -/* 00080 80A6E420 AFA50034 */ sw $a1, 0x0034($sp) +/* 00080 80A6E420 AFA50034 */ sw $a1, 0x0034($sp) /* 00084 80A6E424 0C0170D9 */ jal ActorCollider_AllocCylinder - -/* 00088 80A6E428 8FA40044 */ lw $a0, 0x0044($sp) + +/* 00088 80A6E428 8FA40044 */ lw $a0, 0x0044($sp) /* 0008C 80A6E42C 3C0780A7 */ lui $a3, %hi(D_80A6EDD0) ## $a3 = 80A70000 -/* 00090 80A6E430 8FA50034 */ lw $a1, 0x0034($sp) +/* 00090 80A6E430 8FA50034 */ lw $a1, 0x0034($sp) /* 00094 80A6E434 24E7EDD0 */ addiu $a3, $a3, %lo(D_80A6EDD0) ## $a3 = 80A6EDD0 -/* 00098 80A6E438 8FA40044 */ lw $a0, 0x0044($sp) +/* 00098 80A6E438 8FA40044 */ lw $a0, 0x0044($sp) /* 0009C 80A6E43C 0C01712B */ jal ActorCollider_InitCylinder - + /* 000A0 80A6E440 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 000A4 80A6E444 241900FF */ addiu $t9, $zero, 0x00FF ## $t9 = 000000FF /* 000A8 80A6E448 3C053C23 */ lui $a1, 0x3C23 ## $a1 = 3C230000 /* 000AC 80A6E44C A21900AE */ sb $t9, 0x00AE($s0) ## 000000AE /* 000B0 80A6E450 34A5D70A */ ori $a1, $a1, 0xD70A ## $a1 = 3C23D70A /* 000B4 80A6E454 0C00B58B */ jal Actor_SetScale - + /* 000B8 80A6E458 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 000BC 80A6E45C 3C088016 */ lui $t0, 0x8016 ## $t0 = 80160000 /* 000C0 80A6E460 8D08E664 */ lw $t0, -0x199C($t0) ## 8015E664 /* 000C4 80A6E464 24090001 */ addiu $t1, $zero, 0x0001 ## $t1 = 00000001 /* 000C8 80A6E468 3C0480A7 */ lui $a0, %hi(D_80A6EE48) ## $a0 = 80A70000 -/* 000CC 80A6E46C 51000004 */ beql $t0, $zero, .L80A6E480 +/* 000CC 80A6E46C 51000004 */ beql $t0, $zero, .L80A6E480 /* 000D0 80A6E470 A609001C */ sh $t1, 0x001C($s0) ## 0000001C -/* 000D4 80A6E474 10000002 */ beq $zero, $zero, .L80A6E480 +/* 000D4 80A6E474 10000002 */ beq $zero, $zero, .L80A6E480 /* 000D8 80A6E478 A600001C */ sh $zero, 0x001C($s0) ## 0000001C /* 000DC 80A6E47C A609001C */ sh $t1, 0x001C($s0) ## 0000001C .L80A6E480: /* 000E0 80A6E480 860A001C */ lh $t2, 0x001C($s0) ## 0000001C /* 000E4 80A6E484 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 000E8 80A6E488 15410014 */ bne $t2, $at, .L80A6E4DC +/* 000E8 80A6E488 15410014 */ bne $t2, $at, .L80A6E4DC /* 000EC 80A6E48C 00000000 */ nop /* 000F0 80A6E490 3C0480A7 */ lui $a0, %hi(D_80A6EE10) ## $a0 = 80A70000 /* 000F4 80A6E494 0C00084C */ jal osSyncPrintf - + /* 000F8 80A6E498 2484EE10 */ addiu $a0, $a0, %lo(D_80A6EE10) ## $a0 = 80A6EE10 /* 000FC 80A6E49C 3C0580A7 */ lui $a1, %hi(func_80A6E9AC) ## $a1 = 80A70000 /* 00100 80A6E4A0 24A5E9AC */ addiu $a1, $a1, %lo(func_80A6E9AC) ## $a1 = 80A6E9AC -/* 00104 80A6E4A4 0C29B8E8 */ jal func_80A6E3A0 +/* 00104 80A6E4A4 0C29B8E8 */ jal func_80A6E3A0 /* 00108 80A6E4A8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 0010C 80A6E4AC 3C0B8016 */ lui $t3, 0x8016 ## $t3 = 80160000 /* 00110 80A6E4B0 956BF556 */ lhu $t3, -0x0AAA($t3) ## 8015F556 /* 00114 80A6E4B4 3C0480A7 */ lui $a0, %hi(D_80A6EE30) ## $a0 = 80A70000 /* 00118 80A6E4B8 316C0001 */ andi $t4, $t3, 0x0001 ## $t4 = 00000000 -/* 0011C 80A6E4BC 5180000E */ beql $t4, $zero, .L80A6E4F8 +/* 0011C 80A6E4BC 5180000E */ beql $t4, $zero, .L80A6E4F8 /* 00120 80A6E4C0 240D0006 */ addiu $t5, $zero, 0x0006 ## $t5 = 00000006 /* 00124 80A6E4C4 0C00084C */ jal osSyncPrintf - + /* 00128 80A6E4C8 2484EE30 */ addiu $a0, $a0, %lo(D_80A6EE30) ## $a0 = 80A6EE30 /* 0012C 80A6E4CC 0C00B55C */ jal Actor_Kill - + /* 00130 80A6E4D0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00134 80A6E4D4 10000008 */ beq $zero, $zero, .L80A6E4F8 +/* 00134 80A6E4D4 10000008 */ beq $zero, $zero, .L80A6E4F8 /* 00138 80A6E4D8 240D0006 */ addiu $t5, $zero, 0x0006 ## $t5 = 00000006 .L80A6E4DC: /* 0013C 80A6E4DC 0C00084C */ jal osSyncPrintf - + /* 00140 80A6E4E0 2484EE48 */ addiu $a0, $a0, %lo(D_80A6EE48) ## $a0 = FFFFEE48 /* 00144 80A6E4E4 3C0580A7 */ lui $a1, %hi(func_80A6E9AC) ## $a1 = 80A70000 /* 00148 80A6E4E8 24A5E9AC */ addiu $a1, $a1, %lo(func_80A6E9AC) ## $a1 = 80A6E9AC -/* 0014C 80A6E4EC 0C29B8E8 */ jal func_80A6E3A0 +/* 0014C 80A6E4EC 0C29B8E8 */ jal func_80A6E3A0 /* 00150 80A6E4F0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 00154 80A6E4F4 240D0006 */ addiu $t5, $zero, 0x0006 ## $t5 = 00000006 .L80A6E4F8: /* 00158 80A6E4F8 A60002A8 */ sh $zero, 0x02A8($s0) ## 000002A8 /* 0015C 80A6E4FC A20D001F */ sb $t5, 0x001F($s0) ## 0000001F -/* 00160 80A6E500 8FBF002C */ lw $ra, 0x002C($sp) -/* 00164 80A6E504 8FB00028 */ lw $s0, 0x0028($sp) +/* 00160 80A6E500 8FBF002C */ lw $ra, 0x002C($sp) +/* 00164 80A6E504 8FB00028 */ lw $s0, 0x0028($sp) /* 00168 80A6E508 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 -/* 0016C 80A6E50C 03E00008 */ jr $ra +/* 0016C 80A6E50C 03E00008 */ jr $ra /* 00170 80A6E510 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Hs/func_80A6E7BC.s b/asm/non_matchings/overlays/actors/ovl_En_Hs/func_80A6E7BC.s index 1c8047a52e..030a6cbf41 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Hs/func_80A6E7BC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Hs/func_80A6E7BC.s @@ -1,31 +1,31 @@ glabel func_80A6E7BC /* 0041C 80A6E7BC 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 00420 80A6E7C0 AFB10028 */ sw $s1, 0x0028($sp) +/* 00420 80A6E7C0 AFB10028 */ sw $s1, 0x0028($sp) /* 00424 80A6E7C4 00808825 */ or $s1, $a0, $zero ## $s1 = 00000000 -/* 00428 80A6E7C8 AFBF002C */ sw $ra, 0x002C($sp) -/* 0042C 80A6E7CC AFB00024 */ sw $s0, 0x0024($sp) +/* 00428 80A6E7C8 AFBF002C */ sw $ra, 0x002C($sp) +/* 0042C 80A6E7CC AFB00024 */ sw $s0, 0x0024($sp) /* 00430 80A6E7D0 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 -/* 00434 80A6E7D4 0C042F6F */ jal func_8010BDBC +/* 00434 80A6E7D4 0C042F6F */ jal func_8010BDBC /* 00438 80A6E7D8 24A420D8 */ addiu $a0, $a1, 0x20D8 ## $a0 = 000020D8 /* 0043C 80A6E7DC 24010004 */ addiu $at, $zero, 0x0004 ## $at = 00000004 -/* 00440 80A6E7E0 54410033 */ bnel $v0, $at, .L80A6E8B0 +/* 00440 80A6E7E0 54410033 */ bnel $v0, $at, .L80A6E8B0 /* 00444 80A6E7E4 962E02A8 */ lhu $t6, 0x02A8($s1) ## 000002A8 -/* 00448 80A6E7E8 0C041AF2 */ jal func_80106BC8 +/* 00448 80A6E7E8 0C041AF2 */ jal func_80106BC8 /* 0044C 80A6E7EC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00450 80A6E7F0 1040002E */ beq $v0, $zero, .L80A6E8AC +/* 00450 80A6E7F0 1040002E */ beq $v0, $zero, .L80A6E8AC /* 00454 80A6E7F4 3C020001 */ lui $v0, 0x0001 ## $v0 = 00010000 -/* 00458 80A6E7F8 00501021 */ addu $v0, $v0, $s0 +/* 00458 80A6E7F8 00501021 */ addu $v0, $v0, $s0 /* 0045C 80A6E7FC 904204BD */ lbu $v0, 0x04BD($v0) ## 000104BD /* 00460 80A6E800 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 /* 00464 80A6E804 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 00468 80A6E808 10400005 */ beq $v0, $zero, .L80A6E820 +/* 00468 80A6E808 10400005 */ beq $v0, $zero, .L80A6E820 /* 0046C 80A6E80C 3C0580A7 */ lui $a1, %hi(func_80A6E740) ## $a1 = 80A70000 -/* 00470 80A6E810 10410010 */ beq $v0, $at, .L80A6E854 +/* 00470 80A6E810 10410010 */ beq $v0, $at, .L80A6E854 /* 00474 80A6E814 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00478 80A6E818 10000014 */ beq $zero, $zero, .L80A6E86C +/* 00478 80A6E818 10000014 */ beq $zero, $zero, .L80A6E86C /* 0047C 80A6E81C 00000000 */ nop .L80A6E820: -/* 00480 80A6E820 0C29B8E8 */ jal func_80A6E3A0 +/* 00480 80A6E820 0C29B8E8 */ jal func_80A6E3A0 /* 00484 80A6E824 24A5E740 */ addiu $a1, $a1, %lo(func_80A6E740) ## $a1 = 80A6E740 /* 00488 80A6E828 3C014248 */ lui $at, 0x4248 ## $at = 42480000 /* 0048C 80A6E82C 44812000 */ mtc1 $at, $f4 ## $f4 = 50.00 @@ -34,45 +34,45 @@ glabel func_80A6E7BC /* 00498 80A6E838 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 0049C 80A6E83C 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 004A0 80A6E840 2406001F */ addiu $a2, $zero, 0x001F ## $a2 = 0000001F -/* 004A4 80A6E844 0C00BD0D */ jal func_8002F434 -/* 004A8 80A6E848 E7A40010 */ swc1 $f4, 0x0010($sp) -/* 004AC 80A6E84C 10000007 */ beq $zero, $zero, .L80A6E86C +/* 004A4 80A6E844 0C00BD0D */ jal func_8002F434 +/* 004A8 80A6E848 E7A40010 */ swc1 $f4, 0x0010($sp) +/* 004AC 80A6E84C 10000007 */ beq $zero, $zero, .L80A6E86C /* 004B0 80A6E850 00000000 */ nop .L80A6E854: -/* 004B4 80A6E854 0C042DC8 */ jal func_8010B720 +/* 004B4 80A6E854 0C042DC8 */ jal func_8010B720 /* 004B8 80A6E858 240510B4 */ addiu $a1, $zero, 0x10B4 ## $a1 = 000010B4 /* 004BC 80A6E85C 3C0580A7 */ lui $a1, %hi(func_80A6E70C) ## $a1 = 80A70000 /* 004C0 80A6E860 24A5E70C */ addiu $a1, $a1, %lo(func_80A6E70C) ## $a1 = 80A6E70C -/* 004C4 80A6E864 0C29B8E8 */ jal func_80A6E3A0 +/* 004C4 80A6E864 0C29B8E8 */ jal func_80A6E3A0 /* 004C8 80A6E868 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 .L80A6E86C: /* 004CC 80A6E86C 3C100600 */ lui $s0, 0x0600 ## $s0 = 06000000 /* 004D0 80A6E870 261005C0 */ addiu $s0, $s0, 0x05C0 ## $s0 = 060005C0 /* 004D4 80A6E874 0C028800 */ jal SkelAnime_GetFrameCount - + /* 004D8 80A6E878 02002025 */ or $a0, $s0, $zero ## $a0 = 060005C0 /* 004DC 80A6E87C 44823000 */ mtc1 $v0, $f6 ## $f6 = 0.00 /* 004E0 80A6E880 3C014100 */ lui $at, 0x4100 ## $at = 41000000 /* 004E4 80A6E884 44815000 */ mtc1 $at, $f10 ## $f10 = 8.00 -/* 004E8 80A6E888 46803220 */ cvt.s.w $f8, $f6 +/* 004E8 80A6E888 46803220 */ cvt.s.w $f8, $f6 /* 004EC 80A6E88C 26240198 */ addiu $a0, $s1, 0x0198 ## $a0 = 00000198 /* 004F0 80A6E890 02002825 */ or $a1, $s0, $zero ## $a1 = 060005C0 /* 004F4 80A6E894 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 004F8 80A6E898 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 004FC 80A6E89C AFA00014 */ sw $zero, 0x0014($sp) -/* 00500 80A6E8A0 E7A80010 */ swc1 $f8, 0x0010($sp) -/* 00504 80A6E8A4 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 00508 80A6E8A8 E7AA0018 */ swc1 $f10, 0x0018($sp) +/* 004FC 80A6E89C AFA00014 */ sw $zero, 0x0014($sp) +/* 00500 80A6E8A0 E7A80010 */ swc1 $f8, 0x0010($sp) +/* 00504 80A6E8A4 0C029468 */ jal SkelAnime_ChangeAnim + +/* 00508 80A6E8A8 E7AA0018 */ swc1 $f10, 0x0018($sp) .L80A6E8AC: /* 0050C 80A6E8AC 962E02A8 */ lhu $t6, 0x02A8($s1) ## 000002A8 .L80A6E8B0: /* 00510 80A6E8B0 35CF0001 */ ori $t7, $t6, 0x0001 ## $t7 = 00000001 /* 00514 80A6E8B4 A62F02A8 */ sh $t7, 0x02A8($s1) ## 000002A8 -/* 00518 80A6E8B8 8FBF002C */ lw $ra, 0x002C($sp) -/* 0051C 80A6E8BC 8FB10028 */ lw $s1, 0x0028($sp) -/* 00520 80A6E8C0 8FB00024 */ lw $s0, 0x0024($sp) -/* 00524 80A6E8C4 03E00008 */ jr $ra +/* 00518 80A6E8B8 8FBF002C */ lw $ra, 0x002C($sp) +/* 0051C 80A6E8BC 8FB10028 */ lw $s1, 0x0028($sp) +/* 00520 80A6E8C0 8FB00024 */ lw $s0, 0x0024($sp) +/* 00524 80A6E8C4 03E00008 */ jr $ra /* 00528 80A6E8C8 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Hs/func_80A6E8CC.s b/asm/non_matchings/overlays/actors/ovl_En_Hs/func_80A6E8CC.s index 43e835365d..c1d05f8ac0 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Hs/func_80A6E8CC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Hs/func_80A6E8CC.s @@ -1,65 +1,65 @@ glabel func_80A6E8CC /* 0052C 80A6E8CC 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 00530 80A6E8D0 AFBF002C */ sw $ra, 0x002C($sp) -/* 00534 80A6E8D4 AFB00028 */ sw $s0, 0x0028($sp) +/* 00530 80A6E8D0 AFBF002C */ sw $ra, 0x002C($sp) +/* 00534 80A6E8D4 AFB00028 */ sw $s0, 0x0028($sp) /* 00538 80A6E8D8 8CAE1C44 */ lw $t6, 0x1C44($a1) ## 00001C44 /* 0053C 80A6E8DC 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 00540 80A6E8E0 24A420D8 */ addiu $a0, $a1, 0x20D8 ## $a0 = 000020D8 -/* 00544 80A6E8E4 AFA5003C */ sw $a1, 0x003C($sp) -/* 00548 80A6E8E8 0C042F6F */ jal func_8010BDBC -/* 0054C 80A6E8EC AFAE0034 */ sw $t6, 0x0034($sp) +/* 00544 80A6E8E4 AFA5003C */ sw $a1, 0x003C($sp) +/* 00548 80A6E8E8 0C042F6F */ jal func_8010BDBC +/* 0054C 80A6E8EC AFAE0034 */ sw $t6, 0x0034($sp) /* 00550 80A6E8F0 24010005 */ addiu $at, $zero, 0x0005 ## $at = 00000005 -/* 00554 80A6E8F4 5441001C */ bnel $v0, $at, .L80A6E968 +/* 00554 80A6E8F4 5441001C */ bnel $v0, $at, .L80A6E968 /* 00558 80A6E8F8 860202AA */ lh $v0, 0x02AA($s0) ## 000002AA -/* 0055C 80A6E8FC 0C041AF2 */ jal func_80106BC8 -/* 00560 80A6E900 8FA4003C */ lw $a0, 0x003C($sp) -/* 00564 80A6E904 10400017 */ beq $v0, $zero, .L80A6E964 -/* 00568 80A6E908 8FA4003C */ lw $a0, 0x003C($sp) -/* 0056C 80A6E90C 0C042DC8 */ jal func_8010B720 +/* 0055C 80A6E8FC 0C041AF2 */ jal func_80106BC8 +/* 00560 80A6E900 8FA4003C */ lw $a0, 0x003C($sp) +/* 00564 80A6E904 10400017 */ beq $v0, $zero, .L80A6E964 +/* 00568 80A6E908 8FA4003C */ lw $a0, 0x003C($sp) +/* 0056C 80A6E90C 0C042DC8 */ jal func_8010B720 /* 00570 80A6E910 240510B3 */ addiu $a1, $zero, 0x10B3 ## $a1 = 000010B3 /* 00574 80A6E914 3C0580A7 */ lui $a1, %hi(func_80A6E7BC) ## $a1 = 80A70000 /* 00578 80A6E918 24A5E7BC */ addiu $a1, $a1, %lo(func_80A6E7BC) ## $a1 = 80A6E7BC -/* 0057C 80A6E91C 0C29B8E8 */ jal func_80A6E3A0 +/* 0057C 80A6E91C 0C29B8E8 */ jal func_80A6E3A0 /* 00580 80A6E920 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 00584 80A6E924 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 /* 00588 80A6E928 0C028800 */ jal SkelAnime_GetFrameCount - + /* 0058C 80A6E92C 24840528 */ addiu $a0, $a0, 0x0528 ## $a0 = 06000528 /* 00590 80A6E930 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 00594 80A6E934 3C014100 */ lui $at, 0x4100 ## $at = 41000000 /* 00598 80A6E938 44814000 */ mtc1 $at, $f8 ## $f8 = 8.00 -/* 0059C 80A6E93C 468021A0 */ cvt.s.w $f6, $f4 +/* 0059C 80A6E93C 468021A0 */ cvt.s.w $f6, $f4 /* 005A0 80A6E940 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 005A4 80A6E944 24A50528 */ addiu $a1, $a1, 0x0528 ## $a1 = 06000528 /* 005A8 80A6E948 26040198 */ addiu $a0, $s0, 0x0198 ## $a0 = 00000198 /* 005AC 80A6E94C 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 005B0 80A6E950 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 005B4 80A6E954 E7A60010 */ swc1 $f6, 0x0010($sp) -/* 005B8 80A6E958 AFA00014 */ sw $zero, 0x0014($sp) -/* 005BC 80A6E95C 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 005C0 80A6E960 E7A80018 */ swc1 $f8, 0x0018($sp) +/* 005B4 80A6E954 E7A60010 */ swc1 $f6, 0x0010($sp) +/* 005B8 80A6E958 AFA00014 */ sw $zero, 0x0014($sp) +/* 005BC 80A6E95C 0C029468 */ jal SkelAnime_ChangeAnim + +/* 005C0 80A6E960 E7A80018 */ swc1 $f8, 0x0018($sp) .L80A6E964: /* 005C4 80A6E964 860202AA */ lh $v0, 0x02AA($s0) ## 000002AA .L80A6E968: -/* 005C8 80A6E968 18400008 */ blez $v0, .L80A6E98C +/* 005C8 80A6E968 18400008 */ blez $v0, .L80A6E98C /* 005CC 80A6E96C 244FFFFF */ addiu $t7, $v0, 0xFFFF ## $t7 = FFFFFFFF /* 005D0 80A6E970 A60F02AA */ sh $t7, 0x02AA($s0) ## 000002AA /* 005D4 80A6E974 861802AA */ lh $t8, 0x02AA($s0) ## 000002AA -/* 005D8 80A6E978 8FA40034 */ lw $a0, 0x0034($sp) -/* 005DC 80A6E97C 57000004 */ bnel $t8, $zero, .L80A6E990 +/* 005D8 80A6E978 8FA40034 */ lw $a0, 0x0034($sp) +/* 005DC 80A6E97C 57000004 */ bnel $t8, $zero, .L80A6E990 /* 005E0 80A6E980 961902A8 */ lhu $t9, 0x02A8($s0) ## 000002A8 -/* 005E4 80A6E984 0C00BDF7 */ jal func_8002F7DC +/* 005E4 80A6E984 0C00BDF7 */ jal func_8002F7DC /* 005E8 80A6E988 24052813 */ addiu $a1, $zero, 0x2813 ## $a1 = 00002813 .L80A6E98C: /* 005EC 80A6E98C 961902A8 */ lhu $t9, 0x02A8($s0) ## 000002A8 .L80A6E990: /* 005F0 80A6E990 37280001 */ ori $t0, $t9, 0x0001 ## $t0 = 00000001 /* 005F4 80A6E994 A60802A8 */ sh $t0, 0x02A8($s0) ## 000002A8 -/* 005F8 80A6E998 8FBF002C */ lw $ra, 0x002C($sp) -/* 005FC 80A6E99C 8FB00028 */ lw $s0, 0x0028($sp) +/* 005F8 80A6E998 8FBF002C */ lw $ra, 0x002C($sp) +/* 005FC 80A6E99C 8FB00028 */ lw $s0, 0x0028($sp) /* 00600 80A6E9A0 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 -/* 00604 80A6E9A4 03E00008 */ jr $ra +/* 00604 80A6E9A4 03E00008 */ jr $ra /* 00608 80A6E9A8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Hs/func_80A6E9AC.s b/asm/non_matchings/overlays/actors/ovl_En_Hs/func_80A6E9AC.s index 0113a404f1..934ec85f41 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Hs/func_80A6E9AC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Hs/func_80A6E9AC.s @@ -1,91 +1,91 @@ glabel func_80A6E9AC /* 0060C 80A6E9AC 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 00610 80A6E9B0 AFBF002C */ sw $ra, 0x002C($sp) -/* 00614 80A6E9B4 AFB00028 */ sw $s0, 0x0028($sp) +/* 00610 80A6E9B0 AFBF002C */ sw $ra, 0x002C($sp) +/* 00614 80A6E9B4 AFB00028 */ sw $s0, 0x0028($sp) /* 00618 80A6E9B8 8CAE1C44 */ lw $t6, 0x1C44($a1) ## 00001C44 /* 0061C 80A6E9BC 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00620 80A6E9C0 AFA5003C */ sw $a1, 0x003C($sp) -/* 00624 80A6E9C4 0C00BC65 */ jal func_8002F194 -/* 00628 80A6E9C8 AFAE0034 */ sw $t6, 0x0034($sp) -/* 0062C 80A6E9CC 1040002B */ beq $v0, $zero, .L80A6EA7C -/* 00630 80A6E9D0 8FA5003C */ lw $a1, 0x003C($sp) -/* 00634 80A6E9D4 0C00BCDA */ jal func_8002F368 +/* 00620 80A6E9C0 AFA5003C */ sw $a1, 0x003C($sp) +/* 00624 80A6E9C4 0C00BC65 */ jal func_8002F194 +/* 00628 80A6E9C8 AFAE0034 */ sw $t6, 0x0034($sp) +/* 0062C 80A6E9CC 1040002B */ beq $v0, $zero, .L80A6EA7C +/* 00630 80A6E9D0 8FA5003C */ lw $a1, 0x003C($sp) +/* 00634 80A6E9D4 0C00BCDA */ jal func_8002F368 /* 00638 80A6E9D8 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 /* 0063C 80A6E9DC 24010007 */ addiu $at, $zero, 0x0007 ## $at = 00000007 -/* 00640 80A6E9E0 1441001E */ bne $v0, $at, .L80A6EA5C +/* 00640 80A6E9E0 1441001E */ bne $v0, $at, .L80A6EA5C /* 00644 80A6E9E4 240810B1 */ addiu $t0, $zero, 0x10B1 ## $t0 = 000010B1 -/* 00648 80A6E9E8 8FB80034 */ lw $t8, 0x0034($sp) +/* 00648 80A6E9E8 8FB80034 */ lw $t8, 0x0034($sp) /* 0064C 80A6E9EC 240F10B2 */ addiu $t7, $zero, 0x10B2 ## $t7 = 000010B2 /* 00650 80A6E9F0 3C0580A7 */ lui $a1, %hi(func_80A6E8CC) ## $a1 = 80A70000 /* 00654 80A6E9F4 24A5E8CC */ addiu $a1, $a1, %lo(func_80A6E8CC) ## $a1 = 80A6E8CC /* 00658 80A6E9F8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0065C 80A6E9FC 0C29B8E8 */ jal func_80A6E3A0 +/* 0065C 80A6E9FC 0C29B8E8 */ jal func_80A6E3A0 /* 00660 80A6EA00 A70F010E */ sh $t7, 0x010E($t8) ## 0000010E /* 00664 80A6EA04 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 /* 00668 80A6EA08 0C028800 */ jal SkelAnime_GetFrameCount - + /* 0066C 80A6EA0C 24840304 */ addiu $a0, $a0, 0x0304 ## $a0 = 06000304 /* 00670 80A6EA10 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 00674 80A6EA14 3C014100 */ lui $at, 0x4100 ## $at = 41000000 /* 00678 80A6EA18 44814000 */ mtc1 $at, $f8 ## $f8 = 8.00 -/* 0067C 80A6EA1C 468021A0 */ cvt.s.w $f6, $f4 +/* 0067C 80A6EA1C 468021A0 */ cvt.s.w $f6, $f4 /* 00680 80A6EA20 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 00684 80A6EA24 24A50304 */ addiu $a1, $a1, 0x0304 ## $a1 = 06000304 /* 00688 80A6EA28 26040198 */ addiu $a0, $s0, 0x0198 ## $a0 = 00000198 /* 0068C 80A6EA2C 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 00690 80A6EA30 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 00694 80A6EA34 E7A60010 */ swc1 $f6, 0x0010($sp) -/* 00698 80A6EA38 AFA00014 */ sw $zero, 0x0014($sp) -/* 0069C 80A6EA3C 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 006A0 80A6EA40 E7A80018 */ swc1 $f8, 0x0018($sp) +/* 00694 80A6EA34 E7A60010 */ swc1 $f6, 0x0010($sp) +/* 00698 80A6EA38 AFA00014 */ sw $zero, 0x0014($sp) +/* 0069C 80A6EA3C 0C029468 */ jal SkelAnime_ChangeAnim + +/* 006A0 80A6EA40 E7A80018 */ swc1 $f8, 0x0018($sp) /* 006A4 80A6EA44 24190028 */ addiu $t9, $zero, 0x0028 ## $t9 = 00000028 /* 006A8 80A6EA48 A61902AA */ sh $t9, 0x02AA($s0) ## 000002AA -/* 006AC 80A6EA4C 0C01E221 */ jal func_80078884 +/* 006AC 80A6EA4C 0C01E221 */ jal func_80078884 /* 006B0 80A6EA50 24044807 */ addiu $a0, $zero, 0x4807 ## $a0 = 00004807 -/* 006B4 80A6EA54 10000022 */ beq $zero, $zero, .L80A6EAE0 -/* 006B8 80A6EA58 8FBF002C */ lw $ra, 0x002C($sp) +/* 006B4 80A6EA54 10000022 */ beq $zero, $zero, .L80A6EAE0 +/* 006B8 80A6EA58 8FBF002C */ lw $ra, 0x002C($sp) .L80A6EA5C: -/* 006BC 80A6EA5C 8FA90034 */ lw $t1, 0x0034($sp) +/* 006BC 80A6EA5C 8FA90034 */ lw $t1, 0x0034($sp) /* 006C0 80A6EA60 3C0580A7 */ lui $a1, %hi(func_80A6E6D8) ## $a1 = 80A70000 /* 006C4 80A6EA64 24A5E6D8 */ addiu $a1, $a1, %lo(func_80A6E6D8) ## $a1 = 80A6E6D8 /* 006C8 80A6EA68 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 006CC 80A6EA6C 0C29B8E8 */ jal func_80A6E3A0 +/* 006CC 80A6EA6C 0C29B8E8 */ jal func_80A6E3A0 /* 006D0 80A6EA70 A528010E */ sh $t0, 0x010E($t1) ## 0000010E -/* 006D4 80A6EA74 1000001A */ beq $zero, $zero, .L80A6EAE0 -/* 006D8 80A6EA78 8FBF002C */ lw $ra, 0x002C($sp) +/* 006D4 80A6EA74 1000001A */ beq $zero, $zero, .L80A6EAE0 +/* 006D8 80A6EA78 8FBF002C */ lw $ra, 0x002C($sp) .L80A6EA7C: /* 006DC 80A6EA7C 860A008A */ lh $t2, 0x008A($s0) ## 0000008A /* 006E0 80A6EA80 860B00B6 */ lh $t3, 0x00B6($s0) ## 000000B6 /* 006E4 80A6EA84 240C10B1 */ addiu $t4, $zero, 0x10B1 ## $t4 = 000010B1 /* 006E8 80A6EA88 A60C010E */ sh $t4, 0x010E($s0) ## 0000010E -/* 006EC 80A6EA8C 014B1023 */ subu $v0, $t2, $t3 -/* 006F0 80A6EA90 00021400 */ sll $v0, $v0, 16 -/* 006F4 80A6EA94 00021403 */ sra $v0, $v0, 16 -/* 006F8 80A6EA98 04400003 */ bltz $v0, .L80A6EAA8 -/* 006FC 80A6EA9C 00021823 */ subu $v1, $zero, $v0 -/* 00700 80A6EAA0 10000001 */ beq $zero, $zero, .L80A6EAA8 +/* 006EC 80A6EA8C 014B1023 */ subu $v0, $t2, $t3 +/* 006F0 80A6EA90 00021400 */ sll $v0, $v0, 16 +/* 006F4 80A6EA94 00021403 */ sra $v0, $v0, 16 +/* 006F8 80A6EA98 04400003 */ bltz $v0, .L80A6EAA8 +/* 006FC 80A6EA9C 00021823 */ subu $v1, $zero, $v0 +/* 00700 80A6EAA0 10000001 */ beq $zero, $zero, .L80A6EAA8 /* 00704 80A6EAA4 00401825 */ or $v1, $v0, $zero ## $v1 = 00000000 .L80A6EAA8: -/* 00708 80A6EAA8 28612151 */ slti $at, $v1, 0x2151 -/* 0070C 80A6EAAC 1020000B */ beq $at, $zero, .L80A6EADC +/* 00708 80A6EAA8 28612151 */ slti $at, $v1, 0x2151 +/* 0070C 80A6EAAC 1020000B */ beq $at, $zero, .L80A6EADC /* 00710 80A6EAB0 3C0142C8 */ lui $at, 0x42C8 ## $at = 42C80000 /* 00714 80A6EAB4 44810000 */ mtc1 $at, $f0 ## $f0 = 100.00 /* 00718 80A6EAB8 C60A0090 */ lwc1 $f10, 0x0090($s0) ## 00000090 /* 0071C 80A6EABC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00720 80A6EAC0 4600503C */ c.lt.s $f10, $f0 +/* 00720 80A6EAC0 4600503C */ c.lt.s $f10, $f0 /* 00724 80A6EAC4 00000000 */ nop -/* 00728 80A6EAC8 45020005 */ bc1fl .L80A6EAE0 -/* 0072C 80A6EACC 8FBF002C */ lw $ra, 0x002C($sp) -/* 00730 80A6EAD0 44060000 */ mfc1 $a2, $f0 -/* 00734 80A6EAD4 0C00BCA6 */ jal func_8002F298 +/* 00728 80A6EAC8 45020005 */ bc1fl .L80A6EAE0 +/* 0072C 80A6EACC 8FBF002C */ lw $ra, 0x002C($sp) +/* 00730 80A6EAD0 44060000 */ mfc1 $a2, $f0 +/* 00734 80A6EAD4 0C00BCA6 */ jal func_8002F298 /* 00738 80A6EAD8 24070007 */ addiu $a3, $zero, 0x0007 ## $a3 = 00000007 .L80A6EADC: -/* 0073C 80A6EADC 8FBF002C */ lw $ra, 0x002C($sp) +/* 0073C 80A6EADC 8FBF002C */ lw $ra, 0x002C($sp) .L80A6EAE0: -/* 00740 80A6EAE0 8FB00028 */ lw $s0, 0x0028($sp) +/* 00740 80A6EAE0 8FB00028 */ lw $s0, 0x0028($sp) /* 00744 80A6EAE4 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 -/* 00748 80A6EAE8 03E00008 */ jr $ra +/* 00748 80A6EAE8 03E00008 */ jr $ra /* 0074C 80A6EAEC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Hs2/EnHs2_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Hs2/EnHs2_Draw.s index 091298fd84..ce1dae7551 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Hs2/EnHs2_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Hs2/EnHs2_Draw.s @@ -1,11 +1,11 @@ glabel EnHs2_Draw /* 00480 80A6F420 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 00484 80A6F424 AFBF0024 */ sw $ra, 0x0024($sp) -/* 00488 80A6F428 AFA40028 */ sw $a0, 0x0028($sp) -/* 0048C 80A6F42C AFA5002C */ sw $a1, 0x002C($sp) -/* 00490 80A6F430 0C0250F2 */ jal func_800943C8 +/* 00484 80A6F424 AFBF0024 */ sw $ra, 0x0024($sp) +/* 00488 80A6F428 AFA40028 */ sw $a0, 0x0028($sp) +/* 0048C 80A6F42C AFA5002C */ sw $a1, 0x002C($sp) +/* 00490 80A6F430 0C0250F2 */ jal func_800943C8 /* 00494 80A6F434 8CA40000 */ lw $a0, 0x0000($a1) ## 00000000 -/* 00498 80A6F438 8FA20028 */ lw $v0, 0x0028($sp) +/* 00498 80A6F438 8FA20028 */ lw $v0, 0x0028($sp) /* 0049C 80A6F43C 3C0F80A7 */ lui $t7, %hi(func_80A6F358) ## $t7 = 80A70000 /* 004A0 80A6F440 3C1880A7 */ lui $t8, %hi(func_80A6F3E0) ## $t8 = 80A70000 /* 004A4 80A6F444 8C45019C */ lw $a1, 0x019C($v0) ## 0000019C @@ -13,14 +13,14 @@ glabel EnHs2_Draw /* 004AC 80A6F44C 9047019A */ lbu $a3, 0x019A($v0) ## 0000019A /* 004B0 80A6F450 2718F3E0 */ addiu $t8, $t8, %lo(func_80A6F3E0) ## $t8 = 80A6F3E0 /* 004B4 80A6F454 25EFF358 */ addiu $t7, $t7, %lo(func_80A6F358) ## $t7 = 80A6F358 -/* 004B8 80A6F458 AFAF0010 */ sw $t7, 0x0010($sp) -/* 004BC 80A6F45C AFB80014 */ sw $t8, 0x0014($sp) -/* 004C0 80A6F460 8FA4002C */ lw $a0, 0x002C($sp) -/* 004C4 80A6F464 0C0286B2 */ jal func_800A1AC8 -/* 004C8 80A6F468 AFA20018 */ sw $v0, 0x0018($sp) -/* 004CC 80A6F46C 8FBF0024 */ lw $ra, 0x0024($sp) +/* 004B8 80A6F458 AFAF0010 */ sw $t7, 0x0010($sp) +/* 004BC 80A6F45C AFB80014 */ sw $t8, 0x0014($sp) +/* 004C0 80A6F460 8FA4002C */ lw $a0, 0x002C($sp) +/* 004C4 80A6F464 0C0286B2 */ jal SkelAnime_DrawSV +/* 004C8 80A6F468 AFA20018 */ sw $v0, 0x0018($sp) +/* 004CC 80A6F46C 8FBF0024 */ lw $ra, 0x0024($sp) /* 004D0 80A6F470 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 004D4 80A6F474 03E00008 */ jr $ra +/* 004D4 80A6F474 03E00008 */ jr $ra /* 004D8 80A6F478 00000000 */ nop /* 004DC 80A6F47C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Hs2/EnHs2_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Hs2/EnHs2_Init.s index f7a5a4d79b..f6d2accc69 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Hs2/EnHs2_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Hs2/EnHs2_Init.s @@ -1,15 +1,15 @@ glabel EnHs2_Init /* 00000 80A6EFA0 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 -/* 00004 80A6EFA4 AFB00028 */ sw $s0, 0x0028($sp) +/* 00004 80A6EFA4 AFB00028 */ sw $s0, 0x0028($sp) /* 00008 80A6EFA8 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 0000C 80A6EFAC AFBF002C */ sw $ra, 0x002C($sp) -/* 00010 80A6EFB0 AFA50044 */ sw $a1, 0x0044($sp) +/* 0000C 80A6EFAC AFBF002C */ sw $ra, 0x002C($sp) +/* 00010 80A6EFB0 AFA50044 */ sw $a1, 0x0044($sp) /* 00014 80A6EFB4 3C068003 */ lui $a2, 0x8003 ## $a2 = 80030000 /* 00018 80A6EFB8 24C6B5EC */ addiu $a2, $a2, 0xB5EC ## $a2 = 8002B5EC /* 0001C 80A6EFBC 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 /* 00020 80A6EFC0 248400B4 */ addiu $a0, $a0, 0x00B4 ## $a0 = 000000B4 /* 00024 80A6EFC4 0C00AC78 */ jal ActorShape_Init - + /* 00028 80A6EFC8 3C074210 */ lui $a3, 0x4210 ## $a3 = 42100000 /* 0002C 80A6EFCC 26050198 */ addiu $a1, $s0, 0x0198 ## $a1 = 00000198 /* 00030 80A6EFD0 3C060600 */ lui $a2, 0x0600 ## $a2 = 06000000 @@ -17,40 +17,40 @@ glabel EnHs2_Init /* 00038 80A6EFD8 260E01DC */ addiu $t6, $s0, 0x01DC ## $t6 = 000001DC /* 0003C 80A6EFDC 260F023C */ addiu $t7, $s0, 0x023C ## $t7 = 0000023C /* 00040 80A6EFE0 24180010 */ addiu $t8, $zero, 0x0010 ## $t8 = 00000010 -/* 00044 80A6EFE4 AFB80018 */ sw $t8, 0x0018($sp) -/* 00048 80A6EFE8 AFAF0014 */ sw $t7, 0x0014($sp) -/* 0004C 80A6EFEC AFAE0010 */ sw $t6, 0x0010($sp) +/* 00044 80A6EFE4 AFB80018 */ sw $t8, 0x0018($sp) +/* 00048 80A6EFE8 AFAF0014 */ sw $t7, 0x0014($sp) +/* 0004C 80A6EFEC AFAE0010 */ sw $t6, 0x0010($sp) /* 00050 80A6EFF0 24E705C0 */ addiu $a3, $a3, 0x05C0 ## $a3 = 060005C0 /* 00054 80A6EFF4 24C66260 */ addiu $a2, $a2, 0x6260 ## $a2 = 06006260 -/* 00058 80A6EFF8 AFA50034 */ sw $a1, 0x0034($sp) -/* 0005C 80A6EFFC 0C0291BE */ jal func_800A46F8 -/* 00060 80A6F000 8FA40044 */ lw $a0, 0x0044($sp) +/* 00058 80A6EFF8 AFA50034 */ sw $a1, 0x0034($sp) +/* 0005C 80A6EFFC 0C0291BE */ jal SkelAnime_InitSV +/* 00060 80A6F000 8FA40044 */ lw $a0, 0x0044($sp) /* 00064 80A6F004 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 00068 80A6F008 24A505C0 */ addiu $a1, $a1, 0x05C0 ## $a1 = 060005C0 -/* 0006C 80A6F00C 0C0294BE */ jal func_800A52F8 -/* 00070 80A6F010 8FA40034 */ lw $a0, 0x0034($sp) +/* 0006C 80A6F00C 0C0294BE */ jal SkelAnime_ChangeAnimDefaultRepeat +/* 00070 80A6F010 8FA40034 */ lw $a0, 0x0034($sp) /* 00074 80A6F014 2605014C */ addiu $a1, $s0, 0x014C ## $a1 = 0000014C -/* 00078 80A6F018 AFA50034 */ sw $a1, 0x0034($sp) +/* 00078 80A6F018 AFA50034 */ sw $a1, 0x0034($sp) /* 0007C 80A6F01C 0C0170D9 */ jal ActorCollider_AllocCylinder - -/* 00080 80A6F020 8FA40044 */ lw $a0, 0x0044($sp) + +/* 00080 80A6F020 8FA40044 */ lw $a0, 0x0044($sp) /* 00084 80A6F024 3C0780A7 */ lui $a3, %hi(D_80A6F4A0) ## $a3 = 80A70000 -/* 00088 80A6F028 8FA50034 */ lw $a1, 0x0034($sp) +/* 00088 80A6F028 8FA50034 */ lw $a1, 0x0034($sp) /* 0008C 80A6F02C 24E7F4A0 */ addiu $a3, $a3, %lo(D_80A6F4A0) ## $a3 = 80A6F4A0 -/* 00090 80A6F030 8FA40044 */ lw $a0, 0x0044($sp) +/* 00090 80A6F030 8FA40044 */ lw $a0, 0x0044($sp) /* 00094 80A6F034 0C01712B */ jal ActorCollider_InitCylinder - + /* 00098 80A6F038 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 0009C 80A6F03C 241900FF */ addiu $t9, $zero, 0x00FF ## $t9 = 000000FF /* 000A0 80A6F040 3C053C23 */ lui $a1, 0x3C23 ## $a1 = 3C230000 /* 000A4 80A6F044 A21900AE */ sb $t9, 0x00AE($s0) ## 000000AE /* 000A8 80A6F048 34A5D70A */ ori $a1, $a1, 0xD70A ## $a1 = 3C23D70A /* 000AC 80A6F04C 0C00B58B */ jal Actor_SetScale - + /* 000B0 80A6F050 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 000B4 80A6F054 3C0480A7 */ lui $a0, %hi(D_80A6F4E0) ## $a0 = 80A70000 /* 000B8 80A6F058 0C00084C */ jal osSyncPrintf - + /* 000BC 80A6F05C 2484F4E0 */ addiu $a0, $a0, %lo(D_80A6F4E0) ## $a0 = 80A6F4E0 /* 000C0 80A6F060 3C0880A7 */ lui $t0, %hi(func_80A6F1A4) ## $t0 = 80A70000 /* 000C4 80A6F064 2508F1A4 */ addiu $t0, $t0, %lo(func_80A6F1A4) ## $t0 = 80A6F1A4 @@ -58,10 +58,10 @@ glabel EnHs2_Init /* 000CC 80A6F06C AE0802AC */ sw $t0, 0x02AC($s0) ## 000002AC /* 000D0 80A6F070 A60002A8 */ sh $zero, 0x02A8($s0) ## 000002A8 /* 000D4 80A6F074 A209001F */ sb $t1, 0x001F($s0) ## 0000001F -/* 000D8 80A6F078 8FBF002C */ lw $ra, 0x002C($sp) -/* 000DC 80A6F07C 8FB00028 */ lw $s0, 0x0028($sp) +/* 000D8 80A6F078 8FBF002C */ lw $ra, 0x002C($sp) +/* 000DC 80A6F07C 8FB00028 */ lw $s0, 0x0028($sp) /* 000E0 80A6F080 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 -/* 000E4 80A6F084 03E00008 */ jr $ra +/* 000E4 80A6F084 03E00008 */ jr $ra /* 000E8 80A6F088 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Hs2/func_80A6F1A4.s b/asm/non_matchings/overlays/actors/ovl_En_Hs2/func_80A6F1A4.s index 02af3b7c85..8f629cdddc 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Hs2/func_80A6F1A4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Hs2/func_80A6F1A4.s @@ -4,7 +4,7 @@ glabel func_80A6F1A4 /* 0020C 80A6F1AC AFBF0014 */ sw $ra, 0x0014($sp) /* 00210 80A6F1B0 AFA5001C */ sw $a1, 0x001C($sp) /* 00214 80A6F1B4 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 00218 80A6F1B8 0C01B0D8 */ jal func_8006C360 +/* 00218 80A6F1B8 0C01B0D8 */ jal Text_GetFaceReaction /* 0021C 80A6F1BC 24050009 */ addiu $a1, $zero, 0x0009 ## $a1 = 00000009 /* 00220 80A6F1C0 14400002 */ bne $v0, $zero, .L80A6F1CC /* 00224 80A6F1C4 3046FFFF */ andi $a2, $v0, 0xFFFF ## $a2 = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Hy/EnHy_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Hy/EnHy_Draw.s index f08dd67a94..a1bccb4e46 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Hy/EnHy_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Hy/EnHy_Draw.s @@ -1,139 +1,139 @@ glabel EnHy_Draw /* 02678 80A71C28 27BDFF98 */ addiu $sp, $sp, 0xFF98 ## $sp = FFFFFF98 -/* 0267C 80A71C2C AFBF002C */ sw $ra, 0x002C($sp) -/* 02680 80A71C30 AFB00028 */ sw $s0, 0x0028($sp) -/* 02684 80A71C34 AFA5006C */ sw $a1, 0x006C($sp) +/* 0267C 80A71C2C AFBF002C */ sw $ra, 0x002C($sp) +/* 02680 80A71C30 AFB00028 */ sw $s0, 0x0028($sp) +/* 02684 80A71C34 AFA5006C */ sw $a1, 0x006C($sp) /* 02688 80A71C38 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 /* 0268C 80A71C3C 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 02690 80A71C40 3C0680A7 */ lui $a2, %hi(D_80A72850) ## $a2 = 80A70000 /* 02694 80A71C44 24C62850 */ addiu $a2, $a2, %lo(D_80A72850) ## $a2 = 80A72850 /* 02698 80A71C48 27A40044 */ addiu $a0, $sp, 0x0044 ## $a0 = FFFFFFDC /* 0269C 80A71C4C 2407090E */ addiu $a3, $zero, 0x090E ## $a3 = 0000090E -/* 026A0 80A71C50 0C031AB1 */ jal func_800C6AC4 -/* 026A4 80A71C54 AFA50054 */ sw $a1, 0x0054($sp) +/* 026A0 80A71C50 0C031AB1 */ jal Graph_OpenDisps +/* 026A4 80A71C54 AFA50054 */ sw $a1, 0x0054($sp) /* 026A8 80A71C58 8E180190 */ lw $t8, 0x0190($s0) ## 00000190 /* 026AC 80A71C5C 3C0F80A7 */ lui $t7, %hi(func_80A70E34) ## $t7 = 80A70000 /* 026B0 80A71C60 25EF0E34 */ addiu $t7, $t7, %lo(func_80A70E34) ## $t7 = 80A70E34 -/* 026B4 80A71C64 11F80080 */ beq $t7, $t8, .L80A71E68 -/* 026B8 80A71C68 8FB9006C */ lw $t9, 0x006C($sp) -/* 026BC 80A71C6C 0C024F46 */ jal func_80093D18 +/* 026B4 80A71C64 11F80080 */ beq $t7, $t8, .L80A71E68 +/* 026B8 80A71C68 8FB9006C */ lw $t9, 0x006C($sp) +/* 026BC 80A71C6C 0C024F46 */ jal func_80093D18 /* 026C0 80A71C70 8F240000 */ lw $a0, 0x0000($t9) ## 00000000 /* 026C4 80A71C74 C60C0264 */ lwc1 $f12, 0x0264($s0) ## 00000264 /* 026C8 80A71C78 C60E0268 */ lwc1 $f14, 0x0268($s0) ## 00000268 /* 026CC 80A71C7C 8E06026C */ lw $a2, 0x026C($s0) ## 0000026C -/* 026D0 80A71C80 0C034261 */ jal Matrix_Translate +/* 026D0 80A71C80 0C034261 */ jal Matrix_Translate /* 026D4 80A71C84 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 /* 026D8 80A71C88 860A001C */ lh $t2, 0x001C($s0) ## 0000001C /* 026DC 80A71C8C 2403000C */ addiu $v1, $zero, 0x000C ## $v1 = 0000000C /* 026E0 80A71C90 3C0280A7 */ lui $v0, %hi(D_80A722D8) ## $v0 = 80A70000 /* 026E4 80A71C94 314B007F */ andi $t3, $t2, 0x007F ## $t3 = 00000000 -/* 026E8 80A71C98 01630019 */ multu $t3, $v1 +/* 026E8 80A71C98 01630019 */ multu $t3, $v1 /* 026EC 80A71C9C 244222D8 */ addiu $v0, $v0, %lo(D_80A722D8) ## $v0 = 80A722D8 /* 026F0 80A71CA0 27A90060 */ addiu $t1, $sp, 0x0060 ## $t1 = FFFFFFF8 /* 026F4 80A71CA4 27B8005C */ addiu $t8, $sp, 0x005C ## $t8 = FFFFFFF4 -/* 026F8 80A71CA8 00006012 */ mflo $t4 -/* 026FC 80A71CAC 004C6821 */ addu $t5, $v0, $t4 +/* 026F8 80A71CA8 00006012 */ mflo $t4 +/* 026FC 80A71CAC 004C6821 */ addu $t5, $v0, $t4 /* 02700 80A71CB0 89AF0002 */ lwl $t7, 0x0002($t5) ## 00000002 /* 02704 80A71CB4 99AF0005 */ lwr $t7, 0x0005($t5) ## 00000005 /* 02708 80A71CB8 AD2F0000 */ sw $t7, 0x0000($t1) ## FFFFFFF8 /* 0270C 80A71CBC 8619001C */ lh $t9, 0x001C($s0) ## 0000001C /* 02710 80A71CC0 332A007F */ andi $t2, $t9, 0x007F ## $t2 = 00000000 -/* 02714 80A71CC4 01430019 */ multu $t2, $v1 -/* 02718 80A71CC8 00005812 */ mflo $t3 -/* 0271C 80A71CCC 004B6021 */ addu $t4, $v0, $t3 +/* 02714 80A71CC4 01430019 */ multu $t2, $v1 +/* 02718 80A71CC8 00005812 */ mflo $t3 +/* 0271C 80A71CCC 004B6021 */ addu $t4, $v0, $t3 /* 02720 80A71CD0 898D0007 */ lwl $t5, 0x0007($t4) ## 00000007 /* 02724 80A71CD4 998D000A */ lwr $t5, 0x000A($t4) ## 0000000A /* 02728 80A71CD8 AF0D0000 */ sw $t5, 0x0000($t8) ## FFFFFFF4 /* 0272C 80A71CDC 860E001C */ lh $t6, 0x001C($s0) ## 0000001C /* 02730 80A71CE0 31CF007F */ andi $t7, $t6, 0x007F ## $t7 = 00000000 /* 02734 80A71CE4 25F9FFFE */ addiu $t9, $t7, 0xFFFE ## $t9 = FFFFFFFE -/* 02738 80A71CE8 2F210013 */ sltiu $at, $t9, 0x0013 -/* 0273C 80A71CEC 10200052 */ beq $at, $zero, .L80A71E38 -/* 02740 80A71CF0 0019C880 */ sll $t9, $t9, 2 +/* 02738 80A71CE8 2F210013 */ sltiu $at, $t9, 0x0013 +/* 0273C 80A71CEC 10200052 */ beq $at, $zero, .L80A71E38 +/* 02740 80A71CF0 0019C880 */ sll $t9, $t9, 2 /* 02744 80A71CF4 3C0180A7 */ lui $at, %hi(jtbl_80A72AA0) ## $at = 80A70000 -/* 02748 80A71CF8 00390821 */ addu $at, $at, $t9 -/* 0274C 80A71CFC 8C392AA0 */ lw $t9, %lo(jtbl_80A72AA0)($at) -/* 02750 80A71D00 03200008 */ jr $t9 +/* 02748 80A71CF8 00390821 */ addu $at, $at, $t9 +/* 0274C 80A71CFC 8C392AA0 */ lw $t9, %lo(jtbl_80A72AA0)($at) +/* 02750 80A71D00 03200008 */ jr $t9 /* 02754 80A71D04 00000000 */ nop glabel L80A71D08 -/* 02758 80A71D08 8FA80054 */ lw $t0, 0x0054($sp) +/* 02758 80A71D08 8FA80054 */ lw $t0, 0x0054($sp) /* 0275C 80A71D0C 3C0BDB06 */ lui $t3, 0xDB06 ## $t3 = DB060000 /* 02760 80A71D10 356B0020 */ ori $t3, $t3, 0x0020 ## $t3 = DB060020 /* 02764 80A71D14 8D0202C0 */ lw $v0, 0x02C0($t0) ## 000002C0 /* 02768 80A71D18 244A0008 */ addiu $t2, $v0, 0x0008 ## $t2 = 80A722E0 /* 0276C 80A71D1C AD0A02C0 */ sw $t2, 0x02C0($t0) ## 000002C0 /* 02770 80A71D20 AC4B0000 */ sw $t3, 0x0000($v0) ## 80A722D8 -/* 02774 80A71D24 8FB8006C */ lw $t8, 0x006C($sp) -/* 02778 80A71D28 93AC0063 */ lbu $t4, 0x0063($sp) -/* 0277C 80A71D2C 93A70062 */ lbu $a3, 0x0062($sp) +/* 02774 80A71D24 8FB8006C */ lw $t8, 0x006C($sp) +/* 02778 80A71D28 93AC0063 */ lbu $t4, 0x0063($sp) +/* 0277C 80A71D2C 93A70062 */ lbu $a3, 0x0062($sp) /* 02780 80A71D30 8F040000 */ lw $a0, 0x0000($t8) ## FFFFFFF4 -/* 02784 80A71D34 93A60061 */ lbu $a2, 0x0061($sp) -/* 02788 80A71D38 93A50060 */ lbu $a1, 0x0060($sp) -/* 0278C 80A71D3C AFA20040 */ sw $v0, 0x0040($sp) -/* 02790 80A71D40 0C29C6EF */ jal func_80A71BBC -/* 02794 80A71D44 AFAC0010 */ sw $t4, 0x0010($sp) -/* 02798 80A71D48 8FA30040 */ lw $v1, 0x0040($sp) +/* 02784 80A71D34 93A60061 */ lbu $a2, 0x0061($sp) +/* 02788 80A71D38 93A50060 */ lbu $a1, 0x0060($sp) +/* 0278C 80A71D3C AFA20040 */ sw $v0, 0x0040($sp) +/* 02790 80A71D40 0C29C6EF */ jal func_80A71BBC +/* 02794 80A71D44 AFAC0010 */ sw $t4, 0x0010($sp) +/* 02798 80A71D48 8FA30040 */ lw $v1, 0x0040($sp) /* 0279C 80A71D4C 3C0DDB06 */ lui $t5, 0xDB06 ## $t5 = DB060000 /* 027A0 80A71D50 35AD0024 */ ori $t5, $t5, 0x0024 ## $t5 = DB060024 /* 027A4 80A71D54 AC620004 */ sw $v0, 0x0004($v1) ## 00000004 -/* 027A8 80A71D58 8FA80054 */ lw $t0, 0x0054($sp) +/* 027A8 80A71D58 8FA80054 */ lw $t0, 0x0054($sp) /* 027AC 80A71D5C 8D0202C0 */ lw $v0, 0x02C0($t0) ## 000002C0 /* 027B0 80A71D60 24490008 */ addiu $t1, $v0, 0x0008 ## $t1 = 00000008 /* 027B4 80A71D64 AD0902C0 */ sw $t1, 0x02C0($t0) ## 000002C0 /* 027B8 80A71D68 AC4D0000 */ sw $t5, 0x0000($v0) ## 00000000 -/* 027BC 80A71D6C 8FAE006C */ lw $t6, 0x006C($sp) -/* 027C0 80A71D70 93AF005F */ lbu $t7, 0x005F($sp) -/* 027C4 80A71D74 93A7005E */ lbu $a3, 0x005E($sp) +/* 027BC 80A71D6C 8FAE006C */ lw $t6, 0x006C($sp) +/* 027C0 80A71D70 93AF005F */ lbu $t7, 0x005F($sp) +/* 027C4 80A71D74 93A7005E */ lbu $a3, 0x005E($sp) /* 027C8 80A71D78 8DC40000 */ lw $a0, 0x0000($t6) ## 00000000 -/* 027CC 80A71D7C 93A6005D */ lbu $a2, 0x005D($sp) -/* 027D0 80A71D80 93A5005C */ lbu $a1, 0x005C($sp) -/* 027D4 80A71D84 AFA2003C */ sw $v0, 0x003C($sp) -/* 027D8 80A71D88 0C29C6EF */ jal func_80A71BBC -/* 027DC 80A71D8C AFAF0010 */ sw $t7, 0x0010($sp) -/* 027E0 80A71D90 8FA3003C */ lw $v1, 0x003C($sp) +/* 027CC 80A71D7C 93A6005D */ lbu $a2, 0x005D($sp) +/* 027D0 80A71D80 93A5005C */ lbu $a1, 0x005C($sp) +/* 027D4 80A71D84 AFA2003C */ sw $v0, 0x003C($sp) +/* 027D8 80A71D88 0C29C6EF */ jal func_80A71BBC +/* 027DC 80A71D8C AFAF0010 */ sw $t7, 0x0010($sp) +/* 027E0 80A71D90 8FA3003C */ lw $v1, 0x003C($sp) /* 027E4 80A71D94 2401000B */ addiu $at, $zero, 0x000B ## $at = 0000000B /* 027E8 80A71D98 AC620004 */ sw $v0, 0x0004($v1) ## 00000004 /* 027EC 80A71D9C 8602001C */ lh $v0, 0x001C($s0) ## 0000001C /* 027F0 80A71DA0 24030008 */ addiu $v1, $zero, 0x0008 ## $v1 = 00000008 /* 027F4 80A71DA4 3042007F */ andi $v0, $v0, 0x007F ## $v0 = 00000000 -/* 027F8 80A71DA8 10620003 */ beq $v1, $v0, .L80A71DB8 +/* 027F8 80A71DA8 10620003 */ beq $v1, $v0, .L80A71DB8 /* 027FC 80A71DAC 00000000 */ nop -/* 02800 80A71DB0 54410022 */ bnel $v0, $at, .L80A71E3C +/* 02800 80A71DB0 54410022 */ bnel $v0, $at, .L80A71E3C /* 02804 80A71DB4 8E050150 */ lw $a1, 0x0150($s0) ## 00000150 .L80A71DB8: -/* 02808 80A71DB8 14620005 */ bne $v1, $v0, .L80A71DD0 +/* 02808 80A71DB8 14620005 */ bne $v1, $v0, .L80A71DD0 /* 0280C 80A71DBC 2401000B */ addiu $at, $zero, 0x000B ## $at = 0000000B -/* 02810 80A71DC0 8FB90060 */ lw $t9, 0x0060($sp) -/* 02814 80A71DC4 AFB90058 */ sw $t9, 0x0058($sp) +/* 02810 80A71DC0 8FB90060 */ lw $t9, 0x0060($sp) +/* 02814 80A71DC4 AFB90058 */ sw $t9, 0x0058($sp) /* 02818 80A71DC8 8602001C */ lh $v0, 0x001C($s0) ## 0000001C /* 0281C 80A71DCC 3042007F */ andi $v0, $v0, 0x007F ## $v0 = 00000000 .L80A71DD0: -/* 02820 80A71DD0 14410007 */ bne $v0, $at, .L80A71DF0 +/* 02820 80A71DD0 14410007 */ bne $v0, $at, .L80A71DF0 /* 02824 80A71DD4 240A00FF */ addiu $t2, $zero, 0x00FF ## $t2 = 000000FF /* 02828 80A71DD8 240B00FF */ addiu $t3, $zero, 0x00FF ## $t3 = 000000FF /* 0282C 80A71DDC 241800FF */ addiu $t8, $zero, 0x00FF ## $t8 = 000000FF -/* 02830 80A71DE0 A3B80058 */ sb $t8, 0x0058($sp) -/* 02834 80A71DE4 A3AB0059 */ sb $t3, 0x0059($sp) -/* 02838 80A71DE8 A3AA005A */ sb $t2, 0x005A($sp) -/* 0283C 80A71DEC A3A0005B */ sb $zero, 0x005B($sp) +/* 02830 80A71DE0 A3B80058 */ sb $t8, 0x0058($sp) +/* 02834 80A71DE4 A3AB0059 */ sb $t3, 0x0059($sp) +/* 02838 80A71DE8 A3AA005A */ sb $t2, 0x005A($sp) +/* 0283C 80A71DEC A3A0005B */ sb $zero, 0x005B($sp) .L80A71DF0: -/* 02840 80A71DF0 8FAC0054 */ lw $t4, 0x0054($sp) +/* 02840 80A71DF0 8FAC0054 */ lw $t4, 0x0054($sp) /* 02844 80A71DF4 3C0DDB06 */ lui $t5, 0xDB06 ## $t5 = DB060000 /* 02848 80A71DF8 35AD0028 */ ori $t5, $t5, 0x0028 ## $t5 = DB060028 /* 0284C 80A71DFC 8D8202C0 */ lw $v0, 0x02C0($t4) ## 000002C0 /* 02850 80A71E00 24490008 */ addiu $t1, $v0, 0x0008 ## $t1 = 00000008 /* 02854 80A71E04 AD8902C0 */ sw $t1, 0x02C0($t4) ## 000002C0 /* 02858 80A71E08 AC4D0000 */ sw $t5, 0x0000($v0) ## 00000000 -/* 0285C 80A71E0C 8FAE006C */ lw $t6, 0x006C($sp) -/* 02860 80A71E10 93AF005B */ lbu $t7, 0x005B($sp) -/* 02864 80A71E14 93A7005A */ lbu $a3, 0x005A($sp) +/* 0285C 80A71E0C 8FAE006C */ lw $t6, 0x006C($sp) +/* 02860 80A71E10 93AF005B */ lbu $t7, 0x005B($sp) +/* 02864 80A71E14 93A7005A */ lbu $a3, 0x005A($sp) /* 02868 80A71E18 8DC40000 */ lw $a0, 0x0000($t6) ## 00000000 -/* 0286C 80A71E1C 93A60059 */ lbu $a2, 0x0059($sp) -/* 02870 80A71E20 93A50058 */ lbu $a1, 0x0058($sp) -/* 02874 80A71E24 AFA20038 */ sw $v0, 0x0038($sp) -/* 02878 80A71E28 0C29C6EF */ jal func_80A71BBC -/* 0287C 80A71E2C AFAF0010 */ sw $t7, 0x0010($sp) -/* 02880 80A71E30 8FA30038 */ lw $v1, 0x0038($sp) +/* 0286C 80A71E1C 93A60059 */ lbu $a2, 0x0059($sp) +/* 02870 80A71E20 93A50058 */ lbu $a1, 0x0058($sp) +/* 02874 80A71E24 AFA20038 */ sw $v0, 0x0038($sp) +/* 02878 80A71E28 0C29C6EF */ jal func_80A71BBC +/* 0287C 80A71E2C AFAF0010 */ sw $t7, 0x0010($sp) +/* 02880 80A71E30 8FA30038 */ lw $v1, 0x0038($sp) /* 02884 80A71E34 AC620004 */ sw $v0, 0x0004($v1) ## 00000004 glabel L80A71E38 .L80A71E38: @@ -145,23 +145,23 @@ glabel L80A71E38 /* 02898 80A71E48 3C0A80A7 */ lui $t2, %hi(func_80A71A64) ## $t2 = 80A70000 /* 0289C 80A71E4C 254A1A64 */ addiu $t2, $t2, %lo(func_80A71A64) ## $t2 = 80A71A64 /* 028A0 80A71E50 273916B8 */ addiu $t9, $t9, %lo(func_80A716B8) ## $t9 = 80A716B8 -/* 028A4 80A71E54 AFB90010 */ sw $t9, 0x0010($sp) -/* 028A8 80A71E58 AFAA0014 */ sw $t2, 0x0014($sp) -/* 028AC 80A71E5C AFB00018 */ sw $s0, 0x0018($sp) -/* 028B0 80A71E60 0C0286B2 */ jal func_800A1AC8 -/* 028B4 80A71E64 8FA4006C */ lw $a0, 0x006C($sp) +/* 028A4 80A71E54 AFB90010 */ sw $t9, 0x0010($sp) +/* 028A8 80A71E58 AFAA0014 */ sw $t2, 0x0014($sp) +/* 028AC 80A71E5C AFB00018 */ sw $s0, 0x0018($sp) +/* 028B0 80A71E60 0C0286B2 */ jal SkelAnime_DrawSV +/* 028B4 80A71E64 8FA4006C */ lw $a0, 0x006C($sp) .L80A71E68: -/* 028B8 80A71E68 8FAB006C */ lw $t3, 0x006C($sp) +/* 028B8 80A71E68 8FAB006C */ lw $t3, 0x006C($sp) /* 028BC 80A71E6C 3C0680A7 */ lui $a2, %hi(D_80A72860) ## $a2 = 80A70000 /* 028C0 80A71E70 24C62860 */ addiu $a2, $a2, %lo(D_80A72860) ## $a2 = 80A72860 /* 028C4 80A71E74 27A40044 */ addiu $a0, $sp, 0x0044 ## $a0 = FFFFFFDC /* 028C8 80A71E78 24070954 */ addiu $a3, $zero, 0x0954 ## $a3 = 00000954 -/* 028CC 80A71E7C 0C031AD5 */ jal func_800C6B54 +/* 028CC 80A71E7C 0C031AD5 */ jal Graph_CloseDisps /* 028D0 80A71E80 8D650000 */ lw $a1, 0x0000($t3) ## 00000000 -/* 028D4 80A71E84 8FBF002C */ lw $ra, 0x002C($sp) -/* 028D8 80A71E88 8FB00028 */ lw $s0, 0x0028($sp) +/* 028D4 80A71E84 8FBF002C */ lw $ra, 0x002C($sp) +/* 028D8 80A71E88 8FB00028 */ lw $s0, 0x0028($sp) /* 028DC 80A71E8C 27BD0068 */ addiu $sp, $sp, 0x0068 ## $sp = 00000000 -/* 028E0 80A71E90 03E00008 */ jr $ra +/* 028E0 80A71E90 03E00008 */ jr $ra /* 028E4 80A71E94 00000000 */ nop /* 028E8 80A71E98 00000000 */ nop /* 028EC 80A71E9C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Hy/func_80A6F810.s b/asm/non_matchings/overlays/actors/ovl_En_Hy/func_80A6F810.s index 3e7a33b93c..1b13d710e8 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Hy/func_80A6F810.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Hy/func_80A6F810.s @@ -8,7 +8,7 @@ glabel func_80A6F810 /* 00278 80A6F828 30A5007F */ andi $a1, $a1, 0x007F ## $a1 = 00000000 /* 0027C 80A6F82C 24A50025 */ addiu $a1, $a1, 0x0025 ## $a1 = 00000025 /* 00280 80A6F830 AFA40020 */ sw $a0, 0x0020($sp) -/* 00284 80A6F834 0C01B0D8 */ jal func_8006C360 +/* 00284 80A6F834 0C01B0D8 */ jal Text_GetFaceReaction /* 00288 80A6F838 AFA3001C */ sw $v1, 0x001C($sp) /* 0028C 80A6F83C 8FA3001C */ lw $v1, 0x001C($sp) /* 00290 80A6F840 8FA40020 */ lw $a0, 0x0020($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Hy/func_80A70E34.s b/asm/non_matchings/overlays/actors/ovl_En_Hy/func_80A70E34.s index 26e46582d5..fbebe785ab 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Hy/func_80A70E34.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Hy/func_80A70E34.s @@ -1,16 +1,16 @@ glabel func_80A70E34 /* 01884 80A70E34 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 01888 80A70E38 AFBF002C */ sw $ra, 0x002C($sp) -/* 0188C 80A70E3C AFB00028 */ sw $s0, 0x0028($sp) +/* 01888 80A70E38 AFBF002C */ sw $ra, 0x002C($sp) +/* 0188C 80A70E3C AFB00028 */ sw $s0, 0x0028($sp) /* 01890 80A70E40 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 01894 80A70E44 0C29BDE4 */ jal func_80A6F790 -/* 01898 80A70E48 AFA5003C */ sw $a1, 0x003C($sp) -/* 0189C 80A70E4C 104000A5 */ beq $v0, $zero, .L80A710E4 +/* 01894 80A70E44 0C29BDE4 */ jal func_80A6F790 +/* 01898 80A70E48 AFA5003C */ sw $a1, 0x003C($sp) +/* 0189C 80A70E4C 104000A5 */ beq $v0, $zero, .L80A710E4 /* 018A0 80A70E50 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 018A4 80A70E54 0C29BDB0 */ jal func_80A6F6C0 -/* 018A8 80A70E58 8FA5003C */ lw $a1, 0x003C($sp) -/* 018AC 80A70E5C 104000A1 */ beq $v0, $zero, .L80A710E4 -/* 018B0 80A70E60 8FA4003C */ lw $a0, 0x003C($sp) +/* 018A4 80A70E54 0C29BDB0 */ jal func_80A6F6C0 +/* 018A8 80A70E58 8FA5003C */ lw $a1, 0x003C($sp) +/* 018AC 80A70E5C 104000A1 */ beq $v0, $zero, .L80A710E4 +/* 018B0 80A70E60 8FA4003C */ lw $a0, 0x003C($sp) /* 018B4 80A70E64 820E0198 */ lb $t6, 0x0198($s0) ## 00000198 /* 018B8 80A70E68 3C080001 */ lui $t0, 0x0001 ## $t0 = 00010000 /* 018BC 80A70E6C 3C018000 */ lui $at, 0x8000 ## $at = 80000000 @@ -18,179 +18,179 @@ glabel func_80A70E34 /* 018C4 80A70E74 820F001E */ lb $t7, 0x001E($s0) ## 0000001E /* 018C8 80A70E78 3C0D80A7 */ lui $t5, %hi(D_80A722DE) ## $t5 = 80A70000 /* 018CC 80A70E7C 3C0680A7 */ lui $a2, %hi(D_80A72014) ## $a2 = 80A70000 -/* 018D0 80A70E80 000FC100 */ sll $t8, $t7, 4 -/* 018D4 80A70E84 030FC021 */ addu $t8, $t8, $t7 -/* 018D8 80A70E88 0018C080 */ sll $t8, $t8, 2 -/* 018DC 80A70E8C 0098C821 */ addu $t9, $a0, $t8 -/* 018E0 80A70E90 01194021 */ addu $t0, $t0, $t9 +/* 018D0 80A70E80 000FC100 */ sll $t8, $t7, 4 +/* 018D4 80A70E84 030FC021 */ addu $t8, $t8, $t7 +/* 018D8 80A70E88 0018C080 */ sll $t8, $t8, 2 +/* 018DC 80A70E8C 0098C821 */ addu $t9, $a0, $t8 +/* 018E0 80A70E90 01194021 */ addu $t0, $t0, $t9 /* 018E4 80A70E94 8D0817B4 */ lw $t0, 0x17B4($t0) ## 000117B4 /* 018E8 80A70E98 24190010 */ addiu $t9, $zero, 0x0010 ## $t9 = 00000010 /* 018EC 80A70E9C 261802D0 */ addiu $t8, $s0, 0x02D0 ## $t8 = 000002D0 -/* 018F0 80A70EA0 01014821 */ addu $t1, $t0, $at +/* 018F0 80A70EA0 01014821 */ addu $t1, $t0, $at /* 018F4 80A70EA4 3C018016 */ lui $at, 0x8016 ## $at = 80160000 /* 018F8 80A70EA8 AC296FC0 */ sw $t1, 0x6FC0($at) ## 80166FC0 /* 018FC 80A70EAC 860A001C */ lh $t2, 0x001C($s0) ## 0000001C /* 01900 80A70EB0 260F0270 */ addiu $t7, $s0, 0x0270 ## $t7 = 00000270 /* 01904 80A70EB4 2605014C */ addiu $a1, $s0, 0x014C ## $a1 = 0000014C /* 01908 80A70EB8 314B007F */ andi $t3, $t2, 0x007F ## $t3 = 00000000 -/* 0190C 80A70EBC 000B6080 */ sll $t4, $t3, 2 -/* 01910 80A70EC0 018B6023 */ subu $t4, $t4, $t3 -/* 01914 80A70EC4 000C6080 */ sll $t4, $t4, 2 -/* 01918 80A70EC8 01AC6821 */ addu $t5, $t5, $t4 -/* 0191C 80A70ECC 91AD22DE */ lbu $t5, %lo(D_80A722DE)($t5) -/* 01920 80A70ED0 AFA50034 */ sw $a1, 0x0034($sp) -/* 01924 80A70ED4 AFAF0010 */ sw $t7, 0x0010($sp) -/* 01928 80A70ED8 000D70C0 */ sll $t6, $t5, 3 -/* 0192C 80A70EDC 00CE3021 */ addu $a2, $a2, $t6 -/* 01930 80A70EE0 8CC62014 */ lw $a2, %lo(D_80A72014)($a2) -/* 01934 80A70EE4 AFB90018 */ sw $t9, 0x0018($sp) -/* 01938 80A70EE8 AFB80014 */ sw $t8, 0x0014($sp) -/* 0193C 80A70EEC 0C0291BE */ jal func_800A46F8 +/* 0190C 80A70EBC 000B6080 */ sll $t4, $t3, 2 +/* 01910 80A70EC0 018B6023 */ subu $t4, $t4, $t3 +/* 01914 80A70EC4 000C6080 */ sll $t4, $t4, 2 +/* 01918 80A70EC8 01AC6821 */ addu $t5, $t5, $t4 +/* 0191C 80A70ECC 91AD22DE */ lbu $t5, %lo(D_80A722DE)($t5) +/* 01920 80A70ED0 AFA50034 */ sw $a1, 0x0034($sp) +/* 01924 80A70ED4 AFAF0010 */ sw $t7, 0x0010($sp) +/* 01928 80A70ED8 000D70C0 */ sll $t6, $t5, 3 +/* 0192C 80A70EDC 00CE3021 */ addu $a2, $a2, $t6 +/* 01930 80A70EE0 8CC62014 */ lw $a2, %lo(D_80A72014)($a2) +/* 01934 80A70EE4 AFB90018 */ sw $t9, 0x0018($sp) +/* 01938 80A70EE8 AFB80014 */ sw $t8, 0x0014($sp) +/* 0193C 80A70EEC 0C0291BE */ jal SkelAnime_InitSV /* 01940 80A70EF0 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 /* 01944 80A70EF4 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 /* 01948 80A70EF8 3C068003 */ lui $a2, 0x8003 ## $a2 = 80030000 /* 0194C 80A70EFC 24C6B5EC */ addiu $a2, $a2, 0xB5EC ## $a2 = 8002B5EC -/* 01950 80A70F00 44050000 */ mfc1 $a1, $f0 -/* 01954 80A70F04 44070000 */ mfc1 $a3, $f0 +/* 01950 80A70F00 44050000 */ mfc1 $a1, $f0 +/* 01954 80A70F04 44070000 */ mfc1 $a3, $f0 /* 01958 80A70F08 0C00AC78 */ jal ActorShape_Init - + /* 0195C 80A70F0C 260400B4 */ addiu $a0, $s0, 0x00B4 ## $a0 = 000000B4 /* 01960 80A70F10 82080199 */ lb $t0, 0x0199($s0) ## 00000199 -/* 01964 80A70F14 8FA4003C */ lw $a0, 0x003C($sp) +/* 01964 80A70F14 8FA4003C */ lw $a0, 0x003C($sp) /* 01968 80A70F18 3C0B0001 */ lui $t3, 0x0001 ## $t3 = 00010000 -/* 0196C 80A70F1C 00084900 */ sll $t1, $t0, 4 -/* 01970 80A70F20 01284821 */ addu $t1, $t1, $t0 -/* 01974 80A70F24 00094880 */ sll $t1, $t1, 2 -/* 01978 80A70F28 00895021 */ addu $t2, $a0, $t1 -/* 0197C 80A70F2C 016A5821 */ addu $t3, $t3, $t2 +/* 0196C 80A70F1C 00084900 */ sll $t1, $t0, 4 +/* 01970 80A70F20 01284821 */ addu $t1, $t1, $t0 +/* 01974 80A70F24 00094880 */ sll $t1, $t1, 2 +/* 01978 80A70F28 00895021 */ addu $t2, $a0, $t1 +/* 0197C 80A70F2C 016A5821 */ addu $t3, $t3, $t2 /* 01980 80A70F30 8D6B17B4 */ lw $t3, 0x17B4($t3) ## 000117B4 /* 01984 80A70F34 3C018000 */ lui $at, 0x8000 ## $at = 80000000 /* 01988 80A70F38 2605019C */ addiu $a1, $s0, 0x019C ## $a1 = 0000019C -/* 0198C 80A70F3C 01616021 */ addu $t4, $t3, $at +/* 0198C 80A70F3C 01616021 */ addu $t4, $t3, $at /* 01990 80A70F40 3C018016 */ lui $at, 0x8016 ## $at = 80160000 /* 01994 80A70F44 AC2C6FC0 */ sw $t4, 0x6FC0($at) ## 80166FC0 /* 01998 80A70F48 0C0170D9 */ jal ActorCollider_AllocCylinder - -/* 0199C 80A70F4C AFA50030 */ sw $a1, 0x0030($sp) + +/* 0199C 80A70F4C AFA50030 */ sw $a1, 0x0030($sp) /* 019A0 80A70F50 3C0780A7 */ lui $a3, %hi(D_80A71EC0) ## $a3 = 80A70000 -/* 019A4 80A70F54 8FA50030 */ lw $a1, 0x0030($sp) +/* 019A4 80A70F54 8FA50030 */ lw $a1, 0x0030($sp) /* 019A8 80A70F58 24E71EC0 */ addiu $a3, $a3, %lo(D_80A71EC0) ## $a3 = 80A71EC0 -/* 019AC 80A70F5C 8FA4003C */ lw $a0, 0x003C($sp) +/* 019AC 80A70F5C 8FA4003C */ lw $a0, 0x003C($sp) /* 019B0 80A70F60 0C01712B */ jal ActorCollider_InitCylinder - + /* 019B4 80A70F64 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 -/* 019B8 80A70F68 0C29C198 */ jal func_80A70660 +/* 019B8 80A70F68 0C29C198 */ jal func_80A70660 /* 019BC 80A70F6C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 019C0 80A70F70 3C0680A7 */ lui $a2, %hi(D_80A71EEC) ## $a2 = 80A70000 /* 019C4 80A70F74 24C61EEC */ addiu $a2, $a2, %lo(D_80A71EEC) ## $a2 = 80A71EEC /* 019C8 80A70F78 26040098 */ addiu $a0, $s0, 0x0098 ## $a0 = 00000098 -/* 019CC 80A70F7C 0C0187BF */ jal func_80061EFC +/* 019CC 80A70F7C 0C0187BF */ jal func_80061EFC /* 019D0 80A70F80 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 019D4 80A70F84 860D001C */ lh $t5, 0x001C($s0) ## 0000001C /* 019D8 80A70F88 3C0680A7 */ lui $a2, %hi(D_80A722E3) ## $a2 = 80A70000 /* 019DC 80A70F8C 3C0580A7 */ lui $a1, %hi(D_80A72050) ## $a1 = 80A70000 /* 019E0 80A70F90 31AE007F */ andi $t6, $t5, 0x007F ## $t6 = 00000000 -/* 019E4 80A70F94 000E7880 */ sll $t7, $t6, 2 -/* 019E8 80A70F98 01EE7823 */ subu $t7, $t7, $t6 -/* 019EC 80A70F9C 000F7880 */ sll $t7, $t7, 2 -/* 019F0 80A70FA0 00CF3021 */ addu $a2, $a2, $t7 -/* 019F4 80A70FA4 90C622E3 */ lbu $a2, %lo(D_80A722E3)($a2) +/* 019E4 80A70F94 000E7880 */ sll $t7, $t6, 2 +/* 019E8 80A70F98 01EE7823 */ subu $t7, $t7, $t6 +/* 019EC 80A70F9C 000F7880 */ sll $t7, $t7, 2 +/* 019F0 80A70FA0 00CF3021 */ addu $a2, $a2, $t7 +/* 019F4 80A70FA4 90C622E3 */ lbu $a2, %lo(D_80A722E3)($a2) /* 019F8 80A70FA8 24A52050 */ addiu $a1, $a1, %lo(D_80A72050) ## $a1 = 80A72050 -/* 019FC 80A70FAC 0C00D3B0 */ jal func_80034EC0 -/* 01A00 80A70FB0 8FA40034 */ lw $a0, 0x0034($sp) -/* 01A04 80A70FB4 8FB8003C */ lw $t8, 0x003C($sp) +/* 019FC 80A70FAC 0C00D3B0 */ jal func_80034EC0 +/* 01A00 80A70FB0 8FA40034 */ lw $a0, 0x0034($sp) +/* 01A04 80A70FB4 8FB8003C */ lw $t8, 0x003C($sp) /* 01A08 80A70FB8 2401001E */ addiu $at, $zero, 0x001E ## $at = 0000001E /* 01A0C 80A70FBC 3C0A8016 */ lui $t2, 0x8016 ## $t2 = 80160000 /* 01A10 80A70FC0 870200A4 */ lh $v0, 0x00A4($t8) ## 000000A4 -/* 01A14 80A70FC4 10410003 */ beq $v0, $at, .L80A70FD4 +/* 01A14 80A70FC4 10410003 */ beq $v0, $at, .L80A70FD4 /* 01A18 80A70FC8 24010020 */ addiu $at, $zero, 0x0020 ## $at = 00000020 -/* 01A1C 80A70FCC 5441000A */ bnel $v0, $at, .L80A70FF8 +/* 01A1C 80A70FCC 5441000A */ bnel $v0, $at, .L80A70FF8 /* 01A20 80A70FD0 2401002A */ addiu $at, $zero, 0x002A ## $at = 0000002A .L80A70FD4: /* 01A24 80A70FD4 8E190004 */ lw $t9, 0x0004($s0) ## 00000004 /* 01A28 80A70FD8 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 /* 01A2C 80A70FDC 2401FFEF */ addiu $at, $zero, 0xFFEF ## $at = FFFFFFEF -/* 01A30 80A70FE0 03214024 */ and $t0, $t9, $at +/* 01A30 80A70FE0 03214024 */ and $t0, $t9, $at /* 01A34 80A70FE4 AE080004 */ sw $t0, 0x0004($s0) ## 00000004 /* 01A38 80A70FE8 E60400F8 */ swc1 $f4, 0x00F8($s0) ## 000000F8 -/* 01A3C 80A70FEC 8FA9003C */ lw $t1, 0x003C($sp) +/* 01A3C 80A70FEC 8FA9003C */ lw $t1, 0x003C($sp) /* 01A40 80A70FF0 852200A4 */ lh $v0, 0x00A4($t1) ## 000000A4 /* 01A44 80A70FF4 2401002A */ addiu $at, $zero, 0x002A ## $at = 0000002A .L80A70FF8: -/* 01A48 80A70FF8 14410003 */ bne $v0, $at, .L80A71008 +/* 01A48 80A70FF8 14410003 */ bne $v0, $at, .L80A71008 /* 01A4C 80A70FFC 00000000 */ nop /* 01A50 80A71000 954AF540 */ lhu $t2, -0x0AC0($t2) ## 8015F540 /* 01A54 80A71004 A60A0330 */ sh $t2, 0x0330($s0) ## 00000330 .L80A71008: -/* 01A58 80A71008 0C29C1A6 */ jal func_80A70698 +/* 01A58 80A71008 0C29C1A6 */ jal func_80A70698 /* 01A5C 80A7100C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 01A60 80A71010 8605001C */ lh $a1, 0x001C($s0) ## 0000001C -/* 01A64 80A71014 8FA4003C */ lw $a0, 0x003C($sp) +/* 01A64 80A71014 8FA4003C */ lw $a0, 0x003C($sp) /* 01A68 80A71018 2406000F */ addiu $a2, $zero, 0x000F ## $a2 = 0000000F /* 01A6C 80A7101C 30A50780 */ andi $a1, $a1, 0x0780 ## $a1 = 00000000 -/* 01A70 80A71020 000529C3 */ sra $a1, $a1, 7 -/* 01A74 80A71024 00052C00 */ sll $a1, $a1, 16 -/* 01A78 80A71028 0C023938 */ jal func_8008E4E0 -/* 01A7C 80A7102C 00052C03 */ sra $a1, $a1, 16 +/* 01A70 80A71020 000529C3 */ sra $a1, $a1, 7 +/* 01A74 80A71024 00052C00 */ sll $a1, $a1, 16 +/* 01A78 80A71028 0C023938 */ jal Path_GetByIndex +/* 01A7C 80A7102C 00052C03 */ sra $a1, $a1, 16 /* 01A80 80A71030 860B001C */ lh $t3, 0x001C($s0) ## 0000001C /* 01A84 80A71034 AE020210 */ sw $v0, 0x0210($s0) ## 00000210 /* 01A88 80A71038 316C007F */ andi $t4, $t3, 0x007F ## $t4 = 00000000 -/* 01A8C 80A7103C 2D810015 */ sltiu $at, $t4, 0x0015 -/* 01A90 80A71040 10200026 */ beq $at, $zero, .L80A710DC -/* 01A94 80A71044 000C6080 */ sll $t4, $t4, 2 +/* 01A8C 80A7103C 2D810015 */ sltiu $at, $t4, 0x0015 +/* 01A90 80A71040 10200026 */ beq $at, $zero, .L80A710DC +/* 01A94 80A71044 000C6080 */ sll $t4, $t4, 2 /* 01A98 80A71048 3C0180A7 */ lui $at, %hi(jtbl_80A72A34) ## $at = 80A70000 -/* 01A9C 80A7104C 002C0821 */ addu $at, $at, $t4 -/* 01AA0 80A71050 8C2C2A34 */ lw $t4, %lo(jtbl_80A72A34)($at) -/* 01AA4 80A71054 01800008 */ jr $t4 +/* 01A9C 80A7104C 002C0821 */ addu $at, $at, $t4 +/* 01AA0 80A71050 8C2C2A34 */ lw $t4, %lo(jtbl_80A72A34)($at) +/* 01AA4 80A71054 01800008 */ jr $t4 /* 01AA8 80A71058 00000000 */ nop glabel L80A7105C /* 01AAC 80A7105C 8E0D0210 */ lw $t5, 0x0210($s0) ## 00000210 /* 01AB0 80A71060 3C0E80A7 */ lui $t6, %hi(func_80A711B4) ## $t6 = 80A70000 /* 01AB4 80A71064 3C014040 */ lui $at, 0x4040 ## $at = 40400000 -/* 01AB8 80A71068 11A00004 */ beq $t5, $zero, .L80A7107C +/* 01AB8 80A71068 11A00004 */ beq $t5, $zero, .L80A7107C /* 01ABC 80A7106C 25CE11B4 */ addiu $t6, $t6, %lo(func_80A711B4) ## $t6 = 80A711B4 /* 01AC0 80A71070 44813000 */ mtc1 $at, $f6 ## $f6 = 3.00 /* 01AC4 80A71074 00000000 */ nop /* 01AC8 80A71078 E6060068 */ swc1 $f6, 0x0068($s0) ## 00000068 .L80A7107C: -/* 01ACC 80A7107C 10000019 */ beq $zero, $zero, .L80A710E4 +/* 01ACC 80A7107C 10000019 */ beq $zero, $zero, .L80A710E4 /* 01AD0 80A71080 AE0E0190 */ sw $t6, 0x0190($s0) ## 00000190 glabel L80A71084 /* 01AD4 80A71084 3C0F80A7 */ lui $t7, %hi(func_80A712C0) ## $t7 = 80A70000 /* 01AD8 80A71088 25EF12C0 */ addiu $t7, $t7, %lo(func_80A712C0) ## $t7 = 80A712C0 /* 01ADC 80A7108C A2000195 */ sb $zero, 0x0195($s0) ## 00000195 -/* 01AE0 80A71090 10000014 */ beq $zero, $zero, .L80A710E4 +/* 01AE0 80A71090 10000014 */ beq $zero, $zero, .L80A710E4 /* 01AE4 80A71094 AE0F0190 */ sw $t7, 0x0190($s0) ## 00000190 glabel L80A71098 -/* 01AE8 80A71098 8FB8003C */ lw $t8, 0x003C($sp) +/* 01AE8 80A71098 8FB8003C */ lw $t8, 0x003C($sp) /* 01AEC 80A7109C 24010020 */ addiu $at, $zero, 0x0020 ## $at = 00000020 /* 01AF0 80A710A0 3C0880A7 */ lui $t0, %hi(func_80A710F8) ## $t0 = 80A70000 /* 01AF4 80A710A4 871900A4 */ lh $t9, 0x00A4($t8) ## 000000A4 /* 01AF8 80A710A8 250810F8 */ addiu $t0, $t0, %lo(func_80A710F8) ## $t0 = 80A710F8 -/* 01AFC 80A710AC 17210003 */ bne $t9, $at, .L80A710BC +/* 01AFC 80A710AC 17210003 */ bne $t9, $at, .L80A710BC /* 01B00 80A710B0 00000000 */ nop -/* 01B04 80A710B4 1000000B */ beq $zero, $zero, .L80A710E4 +/* 01B04 80A710B4 1000000B */ beq $zero, $zero, .L80A710E4 /* 01B08 80A710B8 AE080190 */ sw $t0, 0x0190($s0) ## 00000190 glabel L80A710BC .L80A710BC: /* 01B0C 80A710BC 3C0980A7 */ lui $t1, %hi(func_80A7127C) ## $t1 = 80A70000 /* 01B10 80A710C0 2529127C */ addiu $t1, $t1, %lo(func_80A7127C) ## $t1 = 80A7127C -/* 01B14 80A710C4 10000007 */ beq $zero, $zero, .L80A710E4 +/* 01B14 80A710C4 10000007 */ beq $zero, $zero, .L80A710E4 /* 01B18 80A710C8 AE090190 */ sw $t1, 0x0190($s0) ## 00000190 glabel L80A710CC /* 01B1C 80A710CC 3C0A80A7 */ lui $t2, %hi(func_80A712B4) ## $t2 = 80A70000 /* 01B20 80A710D0 254A12B4 */ addiu $t2, $t2, %lo(func_80A712B4) ## $t2 = 80A712B4 -/* 01B24 80A710D4 10000003 */ beq $zero, $zero, .L80A710E4 +/* 01B24 80A710D4 10000003 */ beq $zero, $zero, .L80A710E4 /* 01B28 80A710D8 AE0A0190 */ sw $t2, 0x0190($s0) ## 00000190 .L80A710DC: /* 01B2C 80A710DC 0C00B55C */ jal Actor_Kill - + /* 01B30 80A710E0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 .L80A710E4: -/* 01B34 80A710E4 8FBF002C */ lw $ra, 0x002C($sp) -/* 01B38 80A710E8 8FB00028 */ lw $s0, 0x0028($sp) +/* 01B34 80A710E4 8FBF002C */ lw $ra, 0x002C($sp) +/* 01B38 80A710E8 8FB00028 */ lw $s0, 0x0028($sp) /* 01B3C 80A710EC 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 -/* 01B40 80A710F0 03E00008 */ jr $ra +/* 01B40 80A710F0 03E00008 */ jr $ra /* 01B44 80A710F4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Hy/func_80A711B4.s b/asm/non_matchings/overlays/actors/ovl_En_Hy/func_80A711B4.s index a72d348fd8..458b26e1fa 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Hy/func_80A711B4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Hy/func_80A711B4.s @@ -6,7 +6,7 @@ glabel func_80A711B4 /* 01C14 80A711C4 AFA50034 */ sw $a1, 0x0034($sp) /* 01C18 80A711C8 82060214 */ lb $a2, 0x0214($s0) ## 00000214 /* 01C1C 80A711CC 8E050210 */ lw $a1, 0x0210($s0) ## 00000210 -/* 01C20 80A711D0 0C023948 */ jal func_8008E520 +/* 01C20 80A711D0 0C023948 */ jal Path_OrientAndGetDistSq /* 01C24 80A711D4 27A7002E */ addiu $a3, $sp, 0x002E ## $a3 = FFFFFFFE /* 01C28 80A711D8 240E0001 */ addiu $t6, $zero, 0x0001 ## $t6 = 00000001 /* 01C2C 80A711DC AFAE0010 */ sw $t6, 0x0010($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Hy/func_80A7134C.s b/asm/non_matchings/overlays/actors/ovl_En_Hy/func_80A7134C.s index fd3f3a8a67..52189d995b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Hy/func_80A7134C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Hy/func_80A7134C.s @@ -35,7 +35,7 @@ glabel func_80A7134C /* 01E18 80A713C8 8E050210 */ lw $a1, 0x0210($s0) ## 00000210 /* 01E1C 80A713CC 82060214 */ lb $a2, 0x0214($s0) ## 00000214 /* 01E20 80A713D0 27A70036 */ addiu $a3, $sp, 0x0036 ## $a3 = FFFFFFFE -/* 01E24 80A713D4 0C023948 */ jal func_8008E520 +/* 01E24 80A713D4 0C023948 */ jal Path_OrientAndGetDistSq /* 01E28 80A713D8 E6040068 */ swc1 $f4, 0x0068($s0) ## 00000068 /* 01E2C 80A713DC 24080001 */ addiu $t0, $zero, 0x0001 ## $t0 = 00000001 /* 01E30 80A713E0 AFA80010 */ sw $t0, 0x0010($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Hy/func_80A716B8.s b/asm/non_matchings/overlays/actors/ovl_En_Hy/func_80A716B8.s index 2f02135ce0..6cca25ffb4 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Hy/func_80A716B8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Hy/func_80A716B8.s @@ -10,7 +10,7 @@ glabel func_80A716B8 /* 02128 80A716D8 24C62810 */ addiu $a2, $a2, %lo(D_80A72810) ## $a2 = 80A72810 /* 0212C 80A716DC 27A4002C */ addiu $a0, $sp, 0x002C ## $a0 = FFFFFFD4 /* 02130 80A716E0 2407087A */ addiu $a3, $zero, 0x087A ## $a3 = 0000087A -/* 02134 80A716E4 0C031AB1 */ jal func_800C6AC4 +/* 02134 80A716E4 0C031AB1 */ jal Graph_OpenDisps /* 02138 80A716E8 AFA5003C */ sw $a1, 0x003C($sp) /* 0213C 80A716EC 8FA9005C */ lw $t1, 0x005C($sp) /* 02140 80A716F0 240C000F */ addiu $t4, $zero, 0x000F ## $t4 = 0000000F @@ -235,7 +235,7 @@ glabel func_80A716B8 /* 0248C 80A71A3C 24C62820 */ addiu $a2, $a2, %lo(D_80A72820) ## $a2 = 80A72820 /* 02490 80A71A40 27A4002C */ addiu $a0, $sp, 0x002C ## $a0 = FFFFFFD4 /* 02494 80A71A44 240708B4 */ addiu $a3, $zero, 0x08B4 ## $a3 = 000008B4 -/* 02498 80A71A48 0C031AD5 */ jal func_800C6B54 +/* 02498 80A71A48 0C031AD5 */ jal Graph_CloseDisps /* 0249C 80A71A4C 8F250000 */ lw $a1, 0x0000($t9) ## 00000000 /* 024A0 80A71A50 8FBF0014 */ lw $ra, 0x0014($sp) /* 024A4 80A71A54 27BD0058 */ addiu $sp, $sp, 0x0058 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Hy/func_80A71A64.s b/asm/non_matchings/overlays/actors/ovl_En_Hy/func_80A71A64.s index ff9667213e..c161174e9a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Hy/func_80A71A64.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Hy/func_80A71A64.s @@ -20,7 +20,7 @@ glabel func_80A71A64 /* 024FC 80A71AAC 240708CF */ addiu $a3, $zero, 0x08CF ## $a3 = 000008CF /* 02500 80A71AB0 8D450000 */ lw $a1, 0x0000($t2) ## 00000000 /* 02504 80A71AB4 27A40028 */ addiu $a0, $sp, 0x0028 ## $a0 = FFFFFFD8 -/* 02508 80A71AB8 0C031AB1 */ jal func_800C6AC4 +/* 02508 80A71AB8 0C031AB1 */ jal Graph_OpenDisps /* 0250C 80A71ABC AFA50038 */ sw $a1, 0x0038($sp) /* 02510 80A71AC0 8FA40054 */ lw $a0, 0x0054($sp) /* 02514 80A71AC4 24010007 */ addiu $at, $zero, 0x0007 ## $at = 00000007 @@ -82,7 +82,7 @@ glabel func_80A71A64 /* 025E8 80A71B98 24C62840 */ addiu $a2, $a2, %lo(D_80A72840) ## $a2 = 80A72840 /* 025EC 80A71B9C 27A40028 */ addiu $a0, $sp, 0x0028 ## $a0 = FFFFFFD8 /* 025F0 80A71BA0 8D250000 */ lw $a1, 0x0000($t1) ## 00000000 -/* 025F4 80A71BA4 0C031AD5 */ jal func_800C6B54 +/* 025F4 80A71BA4 0C031AD5 */ jal Graph_CloseDisps /* 025F8 80A71BA8 240708E9 */ addiu $a3, $zero, 0x08E9 ## $a3 = 000008E9 /* 025FC 80A71BAC 8FBF0014 */ lw $ra, 0x0014($sp) /* 02600 80A71BB0 27BD0050 */ addiu $sp, $sp, 0x0050 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ice_Hono/EnIceHono_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Ice_Hono/EnIceHono_Draw.s index dc210411b1..823f54f554 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ice_Hono/EnIceHono_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ice_Hono/EnIceHono_Draw.s @@ -10,7 +10,7 @@ glabel EnIceHono_Draw /* 00E3C 80A73E2C 24C640D8 */ addiu $a2, $a2, %lo(D_80A740D8) ## $a2 = 80A740D8 /* 00E40 80A73E30 27A4005C */ addiu $a0, $sp, 0x005C ## $a0 = FFFFFFE4 /* 00E44 80A73E34 240702B7 */ addiu $a3, $zero, 0x02B7 ## $a3 = 000002B7 -/* 00E48 80A73E38 0C031AB1 */ jal func_800C6AC4 +/* 00E48 80A73E38 0C031AB1 */ jal Graph_OpenDisps /* 00E4C 80A73E3C 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 /* 00E50 80A73E40 0C024F61 */ jal func_80093D84 /* 00E54 80A73E44 8E240000 */ lw $a0, 0x0000($s1) ## 00000000 @@ -42,7 +42,7 @@ glabel EnIceHono_Draw /* 00EBC 80A73EAC 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 00EC0 80A73EB0 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 /* 00EC4 80A73EB4 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 00EC8 80A73EB8 0C0253D0 */ jal Draw_TwoTexScroll +/* 00EC8 80A73EB8 0C0253D0 */ jal Gfx_TwoTexScroll /* 00ECC 80A73EBC AFA20058 */ sw $v0, 0x0058($sp) /* 00ED0 80A73EC0 8FA30058 */ lw $v1, 0x0058($sp) /* 00ED4 80A73EC4 3C0FFA00 */ lui $t7, 0xFA00 ## $t7 = FA000000 @@ -113,7 +113,7 @@ glabel EnIceHono_Draw /* 00FD8 80A73FC8 8E250000 */ lw $a1, 0x0000($s1) ## 00000000 /* 00FDC 80A73FCC 24C64100 */ addiu $a2, $a2, %lo(D_80A74100) ## $a2 = 80A74100 /* 00FE0 80A73FD0 27A4005C */ addiu $a0, $sp, 0x005C ## $a0 = FFFFFFE4 -/* 00FE4 80A73FD4 0C031AD5 */ jal func_800C6B54 +/* 00FE4 80A73FD4 0C031AD5 */ jal Graph_CloseDisps /* 00FE8 80A73FD8 240702D2 */ addiu $a3, $zero, 0x02D2 ## $a3 = 000002D2 /* 00FEC 80A73FDC 8FBF003C */ lw $ra, 0x003C($sp) /* 00FF0 80A73FE0 8FB00034 */ lw $s0, 0x0034($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ik/EnIk_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Ik/EnIk_Init.s index 915c601a53..9574b5d5b3 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ik/EnIk_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ik/EnIk_Init.s @@ -1,64 +1,64 @@ glabel EnIk_Init /* 03F50 80A78260 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 03F54 80A78264 AFBF002C */ sw $ra, 0x002C($sp) -/* 03F58 80A78268 AFB00028 */ sw $s0, 0x0028($sp) -/* 03F5C 80A7826C AFA50034 */ sw $a1, 0x0034($sp) +/* 03F54 80A78264 AFBF002C */ sw $ra, 0x002C($sp) +/* 03F58 80A78268 AFB00028 */ sw $s0, 0x0028($sp) +/* 03F5C 80A7826C AFA50034 */ sw $a1, 0x0034($sp) /* 03F60 80A78270 8482001C */ lh $v0, 0x001C($a0) ## 0000001C /* 03F64 80A78274 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 03F68 80A78278 3C0F8016 */ lui $t7, 0x8016 ## $t7 = 80160000 /* 03F6C 80A7827C 304E00FF */ andi $t6, $v0, 0x00FF ## $t6 = 00000000 -/* 03F70 80A78280 15C00005 */ bne $t6, $zero, .L80A78298 +/* 03F70 80A78280 15C00005 */ bne $t6, $zero, .L80A78298 /* 03F74 80A78284 3043FF00 */ andi $v1, $v0, 0xFF00 ## $v1 = 00000000 /* 03F78 80A78288 95EFF53A */ lhu $t7, -0x0AC6($t7) ## 8015F53A /* 03F7C 80A7828C 31F81000 */ andi $t8, $t7, 0x1000 ## $t8 = 00000000 -/* 03F80 80A78290 17000007 */ bne $t8, $zero, .L80A782B0 +/* 03F80 80A78290 17000007 */ bne $t8, $zero, .L80A782B0 /* 03F84 80A78294 00000000 */ nop .L80A78298: -/* 03F88 80A78298 10600009 */ beq $v1, $zero, .L80A782C0 -/* 03F8C 80A7829C 8FA40034 */ lw $a0, 0x0034($sp) +/* 03F88 80A78298 10600009 */ beq $v1, $zero, .L80A782C0 +/* 03F8C 80A7829C 8FA40034 */ lw $a0, 0x0034($sp) /* 03F90 80A782A0 0C00B2D0 */ jal Flags_GetSwitch - -/* 03F94 80A782A4 00032A03 */ sra $a1, $v1, 8 -/* 03F98 80A782A8 10400005 */ beq $v0, $zero, .L80A782C0 + +/* 03F94 80A782A4 00032A03 */ sra $a1, $v1, 8 +/* 03F98 80A782A8 10400005 */ beq $v0, $zero, .L80A782C0 /* 03F9C 80A782AC 00000000 */ nop .L80A782B0: /* 03FA0 80A782B0 0C00B55C */ jal Actor_Kill - + /* 03FA4 80A782B4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 03FA8 80A782B8 1000001B */ beq $zero, $zero, .L80A78328 -/* 03FAC 80A782BC 8FBF002C */ lw $ra, 0x002C($sp) +/* 03FA8 80A782B8 1000001B */ beq $zero, $zero, .L80A78328 +/* 03FAC 80A782BC 8FBF002C */ lw $ra, 0x002C($sp) .L80A782C0: /* 03FB0 80A782C0 3C068003 */ lui $a2, 0x8003 ## $a2 = 80030000 /* 03FB4 80A782C4 24C6B5EC */ addiu $a2, $a2, 0xB5EC ## $a2 = 8002B5EC /* 03FB8 80A782C8 260400B4 */ addiu $a0, $s0, 0x00B4 ## $a0 = 000000B4 /* 03FBC 80A782CC 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 /* 03FC0 80A782D0 0C00AC78 */ jal ActorShape_Init - + /* 03FC4 80A782D4 3C0741F0 */ lui $a3, 0x41F0 ## $a3 = 41F00000 /* 03FC8 80A782D8 3C060602 */ lui $a2, 0x0602 ## $a2 = 06020000 /* 03FCC 80A782DC 3C070601 */ lui $a3, 0x0601 ## $a3 = 06010000 /* 03FD0 80A782E0 26190190 */ addiu $t9, $s0, 0x0190 ## $t9 = 00000190 /* 03FD4 80A782E4 26080244 */ addiu $t0, $s0, 0x0244 ## $t0 = 00000244 /* 03FD8 80A782E8 2409001E */ addiu $t1, $zero, 0x001E ## $t1 = 0000001E -/* 03FDC 80A782EC AFA90018 */ sw $t1, 0x0018($sp) -/* 03FE0 80A782F0 AFA80014 */ sw $t0, 0x0014($sp) -/* 03FE4 80A782F4 AFB90010 */ sw $t9, 0x0010($sp) +/* 03FDC 80A782EC AFA90018 */ sw $t1, 0x0018($sp) +/* 03FE0 80A782F0 AFA80014 */ sw $t0, 0x0014($sp) +/* 03FE4 80A782F4 AFB90010 */ sw $t9, 0x0010($sp) /* 03FE8 80A782F8 24E7C114 */ addiu $a3, $a3, 0xC114 ## $a3 = 0600C114 /* 03FEC 80A782FC 24C6E178 */ addiu $a2, $a2, 0xE178 ## $a2 = 0601E178 -/* 03FF0 80A78300 8FA40034 */ lw $a0, 0x0034($sp) -/* 03FF4 80A78304 0C0291BE */ jal func_800A46F8 +/* 03FF0 80A78300 8FA40034 */ lw $a0, 0x0034($sp) +/* 03FF4 80A78304 0C0291BE */ jal SkelAnime_InitSV /* 03FF8 80A78308 2605014C */ addiu $a1, $s0, 0x014C ## $a1 = 0000014C /* 03FFC 80A7830C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 04000 80A78310 0C29D0E6 */ jal func_80A74398 -/* 04004 80A78314 8FA50034 */ lw $a1, 0x0034($sp) +/* 04000 80A78310 0C29D0E6 */ jal func_80A74398 +/* 04004 80A78314 8FA50034 */ lw $a1, 0x0034($sp) /* 04008 80A78318 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0400C 80A7831C 0C29E034 */ jal func_80A780D0 -/* 04010 80A78320 8FA50034 */ lw $a1, 0x0034($sp) -/* 04014 80A78324 8FBF002C */ lw $ra, 0x002C($sp) +/* 0400C 80A7831C 0C29E034 */ jal func_80A780D0 +/* 04010 80A78320 8FA50034 */ lw $a1, 0x0034($sp) +/* 04014 80A78324 8FBF002C */ lw $ra, 0x002C($sp) .L80A78328: -/* 04018 80A78328 8FB00028 */ lw $s0, 0x0028($sp) +/* 04018 80A78328 8FB00028 */ lw $s0, 0x0028($sp) /* 0401C 80A7832C 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 04020 80A78330 03E00008 */ jr $ra +/* 04020 80A78330 03E00008 */ jr $ra /* 04024 80A78334 00000000 */ nop /* 04028 80A78338 00000000 */ nop /* 0402C 80A7833C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A74714.s b/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A74714.s index edcbfffb99..8ccc1cf911 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A74714.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A74714.s @@ -1,50 +1,50 @@ glabel func_80A74714 /* 00404 80A74714 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 00408 80A74718 AFB00028 */ sw $s0, 0x0028($sp) +/* 00408 80A74718 AFB00028 */ sw $s0, 0x0028($sp) /* 0040C 80A7471C 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00410 80A74720 AFBF002C */ sw $ra, 0x002C($sp) +/* 00410 80A74720 AFBF002C */ sw $ra, 0x002C($sp) /* 00414 80A74724 3C040601 */ lui $a0, 0x0601 ## $a0 = 06010000 /* 00418 80A74728 0C028800 */ jal SkelAnime_GetFrameCount - + /* 0041C 80A7472C 2484CD70 */ addiu $a0, $a0, 0xCD70 ## $a0 = 0600CD70 /* 00420 80A74730 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 00424 80A74734 860E001C */ lh $t6, 0x001C($s0) ## 0000001C /* 00428 80A74738 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 -/* 0042C 80A7473C 46802020 */ cvt.s.w $f0, $f4 -/* 00430 80A74740 29C10002 */ slti $at, $t6, 0x0002 +/* 0042C 80A7473C 46802020 */ cvt.s.w $f0, $f4 +/* 00430 80A74740 29C10002 */ slti $at, $t6, 0x0002 /* 00434 80A74744 24A5CD70 */ addiu $a1, $a1, 0xCD70 ## $a1 = 0600CD70 /* 00438 80A74748 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C /* 0043C 80A7474C 240F0002 */ addiu $t7, $zero, 0x0002 ## $t7 = 00000002 -/* 00440 80A74750 14200005 */ bne $at, $zero, .L80A74768 -/* 00444 80A74754 46000306 */ mov.s $f12, $f0 +/* 00440 80A74750 14200005 */ bne $at, $zero, .L80A74768 +/* 00444 80A74754 46000306 */ mov.s $f12, $f0 /* 00448 80A74758 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 /* 0044C 80A7475C 44813000 */ mtc1 $at, $f6 ## $f6 = 1.00 -/* 00450 80A74760 10000003 */ beq $zero, $zero, .L80A74770 -/* 00454 80A74764 46060081 */ sub.s $f2, $f0, $f6 +/* 00450 80A74760 10000003 */ beq $zero, $zero, .L80A74770 +/* 00454 80A74764 46060081 */ sub.s $f2, $f0, $f6 .L80A74768: /* 00458 80A74768 44801000 */ mtc1 $zero, $f2 ## $f2 = 0.00 /* 0045C 80A7476C 00000000 */ nop .L80A74770: /* 00460 80A74770 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 00464 80A74774 44071000 */ mfc1 $a3, $f2 -/* 00468 80A74778 E7AC0010 */ swc1 $f12, 0x0010($sp) -/* 0046C 80A7477C 44060000 */ mfc1 $a2, $f0 -/* 00470 80A74780 AFAF0014 */ sw $t7, 0x0014($sp) -/* 00474 80A74784 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 00478 80A74788 E7A00018 */ swc1 $f0, 0x0018($sp) +/* 00464 80A74774 44071000 */ mfc1 $a3, $f2 +/* 00468 80A74778 E7AC0010 */ swc1 $f12, 0x0010($sp) +/* 0046C 80A7477C 44060000 */ mfc1 $a2, $f0 +/* 00470 80A74780 AFAF0014 */ sw $t7, 0x0014($sp) +/* 00474 80A74784 0C029468 */ jal SkelAnime_ChangeAnim + +/* 00478 80A74788 E7A00018 */ swc1 $f0, 0x0018($sp) /* 0047C 80A7478C 44804000 */ mtc1 $zero, $f8 ## $f8 = 0.00 /* 00480 80A74790 24180003 */ addiu $t8, $zero, 0x0003 ## $t8 = 00000003 /* 00484 80A74794 3C0580A7 */ lui $a1, %hi(func_80A747C0) ## $a1 = 80A70000 /* 00488 80A74798 A21802F8 */ sb $t8, 0x02F8($s0) ## 000002F8 /* 0048C 80A7479C 24A547C0 */ addiu $a1, $a1, %lo(func_80A747C0) ## $a1 = 80A747C0 /* 00490 80A747A0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00494 80A747A4 0C29D0E4 */ jal func_80A74390 +/* 00494 80A747A4 0C29D0E4 */ jal func_80A74390 /* 00498 80A747A8 E6080068 */ swc1 $f8, 0x0068($s0) ## 00000068 -/* 0049C 80A747AC 8FBF002C */ lw $ra, 0x002C($sp) -/* 004A0 80A747B0 8FB00028 */ lw $s0, 0x0028($sp) +/* 0049C 80A747AC 8FBF002C */ lw $ra, 0x002C($sp) +/* 004A0 80A747B0 8FB00028 */ lw $s0, 0x0028($sp) /* 004A4 80A747B4 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 004A8 80A747B8 03E00008 */ jr $ra +/* 004A8 80A747B8 03E00008 */ jr $ra /* 004AC 80A747BC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A7489C.s b/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A7489C.s index 1a7c4999f1..be3d8c8ed5 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A7489C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A7489C.s @@ -1,16 +1,16 @@ glabel func_80A7489C /* 0058C 80A7489C 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 00590 80A748A0 AFB00028 */ sw $s0, 0x0028($sp) +/* 00590 80A748A0 AFB00028 */ sw $s0, 0x0028($sp) /* 00594 80A748A4 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00598 80A748A8 AFBF002C */ sw $ra, 0x002C($sp) +/* 00598 80A748A8 AFBF002C */ sw $ra, 0x002C($sp) /* 0059C 80A748AC 3C040601 */ lui $a0, 0x0601 ## $a0 = 06010000 /* 005A0 80A748B0 0C028800 */ jal SkelAnime_GetFrameCount - + /* 005A4 80A748B4 2484DD50 */ addiu $a0, $a0, 0xDD50 ## $a0 = 0600DD50 /* 005A8 80A748B8 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 005AC 80A748BC 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 /* 005B0 80A748C0 8E0E0004 */ lw $t6, 0x0004($s0) ## 00000004 -/* 005B4 80A748C4 468021A0 */ cvt.s.w $f6, $f4 +/* 005B4 80A748C4 468021A0 */ cvt.s.w $f6, $f4 /* 005B8 80A748C8 24180004 */ addiu $t8, $zero, 0x0004 ## $t8 = 00000004 /* 005BC 80A748CC 3C014080 */ lui $at, 0x4080 ## $at = 40800000 /* 005C0 80A748D0 35CF0005 */ ori $t7, $t6, 0x0005 ## $t7 = 00000005 @@ -19,23 +19,23 @@ glabel func_80A7489C /* 005CC 80A748DC A21802F8 */ sb $t8, 0x02F8($s0) ## 000002F8 /* 005D0 80A748E0 E6000068 */ swc1 $f0, 0x0068($s0) ## 00000068 /* 005D4 80A748E4 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 -/* 005D8 80A748E8 44060000 */ mfc1 $a2, $f0 -/* 005DC 80A748EC 44070000 */ mfc1 $a3, $f0 +/* 005D8 80A748E8 44060000 */ mfc1 $a2, $f0 +/* 005DC 80A748EC 44070000 */ mfc1 $a3, $f0 /* 005E0 80A748F0 24A5DD50 */ addiu $a1, $a1, 0xDD50 ## $a1 = 0600DD50 -/* 005E4 80A748F4 AFA00014 */ sw $zero, 0x0014($sp) -/* 005E8 80A748F8 E7A60010 */ swc1 $f6, 0x0010($sp) +/* 005E4 80A748F4 AFA00014 */ sw $zero, 0x0014($sp) +/* 005E8 80A748F8 E7A60010 */ swc1 $f6, 0x0010($sp) /* 005EC 80A748FC 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C -/* 005F0 80A74900 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 005F4 80A74904 E7A80018 */ swc1 $f8, 0x0018($sp) +/* 005F0 80A74900 0C029468 */ jal SkelAnime_ChangeAnim + +/* 005F4 80A74904 E7A80018 */ swc1 $f8, 0x0018($sp) /* 005F8 80A74908 3C0580A7 */ lui $a1, %hi(func_80A7492C) ## $a1 = 80A70000 /* 005FC 80A7490C 24A5492C */ addiu $a1, $a1, %lo(func_80A7492C) ## $a1 = 80A7492C -/* 00600 80A74910 0C29D0E4 */ jal func_80A74390 +/* 00600 80A74910 0C29D0E4 */ jal func_80A74390 /* 00604 80A74914 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00608 80A74918 8FBF002C */ lw $ra, 0x002C($sp) -/* 0060C 80A7491C 8FB00028 */ lw $s0, 0x0028($sp) +/* 00608 80A74918 8FBF002C */ lw $ra, 0x002C($sp) +/* 0060C 80A7491C 8FB00028 */ lw $s0, 0x0028($sp) /* 00610 80A74920 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 00614 80A74924 03E00008 */ jr $ra +/* 00614 80A74924 03E00008 */ jr $ra /* 00618 80A74928 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A74AAC.s b/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A74AAC.s index a9fcc9fbd2..7d8ea9328f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A74AAC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A74AAC.s @@ -1,56 +1,56 @@ glabel func_80A74AAC /* 0079C 80A74AAC 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 007A0 80A74AB0 AFBF002C */ sw $ra, 0x002C($sp) -/* 007A4 80A74AB4 AFB00028 */ sw $s0, 0x0028($sp) +/* 007A0 80A74AB0 AFBF002C */ sw $ra, 0x002C($sp) +/* 007A4 80A74AB4 AFB00028 */ sw $s0, 0x0028($sp) /* 007A8 80A74AB8 908F02FB */ lbu $t7, 0x02FB($a0) ## 000002FB /* 007AC 80A74ABC 240E0005 */ addiu $t6, $zero, 0x0005 ## $t6 = 00000005 /* 007B0 80A74AC0 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 007B4 80A74AC4 15E00015 */ bne $t7, $zero, .L80A74B1C +/* 007B4 80A74AC4 15E00015 */ bne $t7, $zero, .L80A74B1C /* 007B8 80A74AC8 A08E02F8 */ sb $t6, 0x02F8($a0) ## 000002F8 /* 007BC 80A74ACC 3C040601 */ lui $a0, 0x0601 ## $a0 = 06010000 /* 007C0 80A74AD0 0C028800 */ jal SkelAnime_GetFrameCount - + /* 007C4 80A74AD4 2484ED24 */ addiu $a0, $a0, 0xED24 ## $a0 = 0600ED24 /* 007C8 80A74AD8 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 007CC 80A74ADC 3C01C080 */ lui $at, 0xC080 ## $at = C0800000 /* 007D0 80A74AE0 44814000 */ mtc1 $at, $f8 ## $f8 = -4.00 -/* 007D4 80A74AE4 468021A0 */ cvt.s.w $f6, $f4 +/* 007D4 80A74AE4 468021A0 */ cvt.s.w $f6, $f4 /* 007D8 80A74AE8 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 /* 007DC 80A74AEC 24A5ED24 */ addiu $a1, $a1, 0xED24 ## $a1 = 0600ED24 /* 007E0 80A74AF0 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C /* 007E4 80A74AF4 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 007E8 80A74AF8 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 007EC 80A74AFC E7A60010 */ swc1 $f6, 0x0010($sp) -/* 007F0 80A74B00 AFA00014 */ sw $zero, 0x0014($sp) -/* 007F4 80A74B04 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 007F8 80A74B08 E7A80018 */ swc1 $f8, 0x0018($sp) +/* 007EC 80A74AFC E7A60010 */ swc1 $f6, 0x0010($sp) +/* 007F0 80A74B00 AFA00014 */ sw $zero, 0x0014($sp) +/* 007F4 80A74B04 0C029468 */ jal SkelAnime_ChangeAnim + +/* 007F8 80A74B08 E7A80018 */ swc1 $f8, 0x0018($sp) /* 007FC 80A74B0C 3C0180A8 */ lui $at, %hi(D_80A789E0) ## $at = 80A80000 -/* 00800 80A74B10 C42A89E0 */ lwc1 $f10, %lo(D_80A789E0)($at) -/* 00804 80A74B14 10000018 */ beq $zero, $zero, .L80A74B78 +/* 00800 80A74B10 C42A89E0 */ lwc1 $f10, %lo(D_80A789E0)($at) +/* 00804 80A74B14 10000018 */ beq $zero, $zero, .L80A74B78 /* 00808 80A74B18 E60A0068 */ swc1 $f10, 0x0068($s0) ## 00000068 .L80A74B1C: /* 0080C 80A74B1C 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 /* 00810 80A74B20 0C028800 */ jal SkelAnime_GetFrameCount - + /* 00814 80A74B24 24846734 */ addiu $a0, $a0, 0x6734 ## $a0 = 06006734 /* 00818 80A74B28 44828000 */ mtc1 $v0, $f16 ## $f16 = 0.00 /* 0081C 80A74B2C 3C01C080 */ lui $at, 0xC080 ## $at = C0800000 /* 00820 80A74B30 44812000 */ mtc1 $at, $f4 ## $f4 = -4.00 -/* 00824 80A74B34 468084A0 */ cvt.s.w $f18, $f16 +/* 00824 80A74B34 468084A0 */ cvt.s.w $f18, $f16 /* 00828 80A74B38 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 0082C 80A74B3C 24A56734 */ addiu $a1, $a1, 0x6734 ## $a1 = 06006734 /* 00830 80A74B40 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C /* 00834 80A74B44 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 00838 80A74B48 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 0083C 80A74B4C E7B20010 */ swc1 $f18, 0x0010($sp) -/* 00840 80A74B50 AFA00014 */ sw $zero, 0x0014($sp) -/* 00844 80A74B54 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 00848 80A74B58 E7A40018 */ swc1 $f4, 0x0018($sp) +/* 0083C 80A74B4C E7B20010 */ swc1 $f18, 0x0010($sp) +/* 00840 80A74B50 AFA00014 */ sw $zero, 0x0014($sp) +/* 00844 80A74B54 0C029468 */ jal SkelAnime_ChangeAnim + +/* 00848 80A74B58 E7A40018 */ swc1 $f4, 0x0018($sp) /* 0084C 80A74B5C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 00850 80A74B60 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 00854 80A74B64 240539BF */ addiu $a1, $zero, 0x39BF ## $a1 = 000039BF /* 00858 80A74B68 3C014020 */ lui $at, 0x4020 ## $at = 40200000 /* 0085C 80A74B6C 44813000 */ mtc1 $at, $f6 ## $f6 = 2.50 @@ -61,12 +61,12 @@ glabel func_80A74AAC /* 0086C 80A74B7C 3C0580A7 */ lui $a1, %hi(func_80A74BA4) ## $a1 = 80A70000 /* 00870 80A74B80 24A54BA4 */ addiu $a1, $a1, %lo(func_80A74BA4) ## $a1 = 80A74BA4 /* 00874 80A74B84 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00878 80A74B88 0C29D0E4 */ jal func_80A74390 +/* 00878 80A74B88 0C29D0E4 */ jal func_80A74390 /* 0087C 80A74B8C A6180032 */ sh $t8, 0x0032($s0) ## 00000032 -/* 00880 80A74B90 8FBF002C */ lw $ra, 0x002C($sp) -/* 00884 80A74B94 8FB00028 */ lw $s0, 0x0028($sp) +/* 00880 80A74B90 8FBF002C */ lw $ra, 0x002C($sp) +/* 00884 80A74B94 8FB00028 */ lw $s0, 0x0028($sp) /* 00888 80A74B98 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 0088C 80A74B9C 03E00008 */ jr $ra +/* 0088C 80A74B9C 03E00008 */ jr $ra /* 00890 80A74BA0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A74E2C.s b/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A74E2C.s index b6414d2cf8..3bc40d3178 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A74E2C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A74E2C.s @@ -1,16 +1,16 @@ glabel func_80A74E2C /* 00B1C 80A74E2C 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 00B20 80A74E30 AFB00028 */ sw $s0, 0x0028($sp) +/* 00B20 80A74E30 AFB00028 */ sw $s0, 0x0028($sp) /* 00B24 80A74E34 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00B28 80A74E38 AFBF002C */ sw $ra, 0x002C($sp) +/* 00B28 80A74E38 AFBF002C */ sw $ra, 0x002C($sp) /* 00B2C 80A74E3C 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 /* 00B30 80A74E40 0C028800 */ jal SkelAnime_GetFrameCount - + /* 00B34 80A74E44 24841C28 */ addiu $a0, $a0, 0x1C28 ## $a0 = 06001C28 /* 00B38 80A74E48 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 00B3C 80A74E4C 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 /* 00B40 80A74E50 240E0001 */ addiu $t6, $zero, 0x0001 ## $t6 = 00000001 -/* 00B44 80A74E54 468021A0 */ cvt.s.w $f6, $f4 +/* 00B44 80A74E54 468021A0 */ cvt.s.w $f6, $f4 /* 00B48 80A74E58 240F0006 */ addiu $t7, $zero, 0x0006 ## $t7 = 00000006 /* 00B4C 80A74E5C 3C01C080 */ lui $at, 0xC080 ## $at = C0800000 /* 00B50 80A74E60 44814000 */ mtc1 $at, $f8 ## $f8 = -4.00 @@ -19,23 +19,23 @@ glabel func_80A74E2C /* 00B5C 80A74E6C E6000068 */ swc1 $f0, 0x0068($s0) ## 00000068 /* 00B60 80A74E70 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 00B64 80A74E74 24180002 */ addiu $t8, $zero, 0x0002 ## $t8 = 00000002 -/* 00B68 80A74E78 44070000 */ mfc1 $a3, $f0 -/* 00B6C 80A74E7C AFB80014 */ sw $t8, 0x0014($sp) +/* 00B68 80A74E78 44070000 */ mfc1 $a3, $f0 +/* 00B6C 80A74E7C AFB80014 */ sw $t8, 0x0014($sp) /* 00B70 80A74E80 24A51C28 */ addiu $a1, $a1, 0x1C28 ## $a1 = 06001C28 -/* 00B74 80A74E84 E7A60010 */ swc1 $f6, 0x0010($sp) +/* 00B74 80A74E84 E7A60010 */ swc1 $f6, 0x0010($sp) /* 00B78 80A74E88 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C /* 00B7C 80A74E8C 3C063FC0 */ lui $a2, 0x3FC0 ## $a2 = 3FC00000 -/* 00B80 80A74E90 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 00B84 80A74E94 E7A80018 */ swc1 $f8, 0x0018($sp) +/* 00B80 80A74E90 0C029468 */ jal SkelAnime_ChangeAnim + +/* 00B84 80A74E94 E7A80018 */ swc1 $f8, 0x0018($sp) /* 00B88 80A74E98 3C0580A7 */ lui $a1, %hi(func_80A74EBC) ## $a1 = 80A70000 /* 00B8C 80A74E9C 24A54EBC */ addiu $a1, $a1, %lo(func_80A74EBC) ## $a1 = 80A74EBC -/* 00B90 80A74EA0 0C29D0E4 */ jal func_80A74390 +/* 00B90 80A74EA0 0C29D0E4 */ jal func_80A74390 /* 00B94 80A74EA4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00B98 80A74EA8 8FBF002C */ lw $ra, 0x002C($sp) -/* 00B9C 80A74EAC 8FB00028 */ lw $s0, 0x0028($sp) +/* 00B98 80A74EA8 8FBF002C */ lw $ra, 0x002C($sp) +/* 00B9C 80A74EAC 8FB00028 */ lw $s0, 0x0028($sp) /* 00BA0 80A74EB0 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 00BA4 80A74EB4 03E00008 */ jr $ra +/* 00BA4 80A74EB4 03E00008 */ jr $ra /* 00BA8 80A74EB8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A7506C.s b/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A7506C.s index 98b527db7a..aee0546f38 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A7506C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A7506C.s @@ -1,46 +1,46 @@ glabel func_80A7506C /* 00D5C 80A7506C 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 00D60 80A75070 AFB00028 */ sw $s0, 0x0028($sp) +/* 00D60 80A75070 AFB00028 */ sw $s0, 0x0028($sp) /* 00D64 80A75074 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00D68 80A75078 AFBF002C */ sw $ra, 0x002C($sp) +/* 00D68 80A75078 AFBF002C */ sw $ra, 0x002C($sp) /* 00D6C 80A7507C 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 /* 00D70 80A75080 0C028800 */ jal SkelAnime_GetFrameCount - + /* 00D74 80A75084 248429FC */ addiu $a0, $a0, 0x29FC ## $a0 = 060029FC /* 00D78 80A75088 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 00D7C 80A7508C A20002FE */ sb $zero, 0x02FE($s0) ## 000002FE /* 00D80 80A75090 821902FE */ lb $t9, 0x02FE($s0) ## 000002FE -/* 00D84 80A75094 46802020 */ cvt.s.w $f0, $f4 +/* 00D84 80A75094 46802020 */ cvt.s.w $f0, $f4 /* 00D88 80A75098 24180007 */ addiu $t8, $zero, 0x0007 ## $t8 = 00000007 /* 00D8C 80A7509C 3C01C080 */ lui $at, 0xC080 ## $at = C0800000 /* 00D90 80A750A0 44814000 */ mtc1 $at, $f8 ## $f8 = -4.00 /* 00D94 80A750A4 A21802F8 */ sb $t8, 0x02F8($s0) ## 000002F8 /* 00D98 80A750A8 A21902FF */ sb $t9, 0x02FF($s0) ## 000002FF -/* 00D9C 80A750AC 4600018D */ trunc.w.s $f6, $f0 +/* 00D9C 80A750AC 4600018D */ trunc.w.s $f6, $f0 /* 00DA0 80A750B0 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 00DA4 80A750B4 24A529FC */ addiu $a1, $a1, 0x29FC ## $a1 = 060029FC /* 00DA8 80A750B8 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C -/* 00DAC 80A750BC 440F3000 */ mfc1 $t7, $f6 +/* 00DAC 80A750BC 440F3000 */ mfc1 $t7, $f6 /* 00DB0 80A750C0 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 00DB4 80A750C4 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 /* 00DB8 80A750C8 A20F02F9 */ sb $t7, 0x02F9($s0) ## 000002F9 -/* 00DBC 80A750CC AFA00014 */ sw $zero, 0x0014($sp) -/* 00DC0 80A750D0 E7A00010 */ swc1 $f0, 0x0010($sp) -/* 00DC4 80A750D4 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 00DC8 80A750D8 E7A80018 */ swc1 $f8, 0x0018($sp) +/* 00DBC 80A750CC AFA00014 */ sw $zero, 0x0014($sp) +/* 00DC0 80A750D0 E7A00010 */ swc1 $f0, 0x0010($sp) +/* 00DC4 80A750D4 0C029468 */ jal SkelAnime_ChangeAnim + +/* 00DC8 80A750D8 E7A80018 */ swc1 $f8, 0x0018($sp) /* 00DCC 80A750DC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 00DD0 80A750E0 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 00DD4 80A750E4 240539C1 */ addiu $a1, $zero, 0x39C1 ## $a1 = 000039C1 /* 00DD8 80A750E8 3C0580A7 */ lui $a1, %hi(func_80A7510C) ## $a1 = 80A70000 /* 00DDC 80A750EC 24A5510C */ addiu $a1, $a1, %lo(func_80A7510C) ## $a1 = 80A7510C -/* 00DE0 80A750F0 0C29D0E4 */ jal func_80A74390 +/* 00DE0 80A750F0 0C29D0E4 */ jal func_80A74390 /* 00DE4 80A750F4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00DE8 80A750F8 8FBF002C */ lw $ra, 0x002C($sp) -/* 00DEC 80A750FC 8FB00028 */ lw $s0, 0x0028($sp) +/* 00DE8 80A750F8 8FBF002C */ lw $ra, 0x002C($sp) +/* 00DEC 80A750FC 8FB00028 */ lw $s0, 0x0028($sp) /* 00DF0 80A75100 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 00DF4 80A75104 03E00008 */ jr $ra +/* 00DF4 80A75104 03E00008 */ jr $ra /* 00DF8 80A75108 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A7510C.s b/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A7510C.s index ce7e4337f9..71eb8d380e 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A7510C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A7510C.s @@ -1,57 +1,57 @@ glabel func_80A7510C /* 00DFC 80A7510C 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 00E00 80A75110 AFB00028 */ sw $s0, 0x0028($sp) +/* 00E00 80A75110 AFB00028 */ sw $s0, 0x0028($sp) /* 00E04 80A75114 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00E08 80A75118 AFBF002C */ sw $ra, 0x002C($sp) +/* 00E08 80A75118 AFBF002C */ sw $ra, 0x002C($sp) /* 00E0C 80A7511C 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 00E10 80A75120 AFA5003C */ sw $a1, 0x003C($sp) +/* 00E10 80A75120 AFA5003C */ sw $a1, 0x003C($sp) /* 00E14 80A75124 0C02927F */ jal SkelAnime_FrameUpdateMatrix - -/* 00E18 80A75128 AFA40030 */ sw $a0, 0x0030($sp) -/* 00E1C 80A7512C 54400007 */ bnel $v0, $zero, .L80A7514C + +/* 00E18 80A75128 AFA40030 */ sw $a0, 0x0030($sp) +/* 00E1C 80A7512C 54400007 */ bnel $v0, $zero, .L80A7514C /* 00E20 80A75130 921902F8 */ lbu $t9, 0x02F8($s0) ## 000002F8 /* 00E24 80A75134 920E02F9 */ lbu $t6, 0x02F9($s0) ## 000002F9 /* 00E28 80A75138 25CFFFFF */ addiu $t7, $t6, 0xFFFF ## $t7 = FFFFFFFF /* 00E2C 80A7513C 31F800FF */ andi $t8, $t7, 0x00FF ## $t8 = 000000FF -/* 00E30 80A75140 1700001C */ bne $t8, $zero, .L80A751B4 +/* 00E30 80A75140 1700001C */ bne $t8, $zero, .L80A751B4 /* 00E34 80A75144 A20F02F9 */ sb $t7, 0x02F9($s0) ## 000002F9 /* 00E38 80A75148 921902F8 */ lbu $t9, 0x02F8($s0) ## 000002F8 .L80A7514C: /* 00E3C 80A7514C 24010008 */ addiu $at, $zero, 0x0008 ## $at = 00000008 /* 00E40 80A75150 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 -/* 00E44 80A75154 17210005 */ bne $t9, $at, .L80A7516C +/* 00E44 80A75154 17210005 */ bne $t9, $at, .L80A7516C /* 00E48 80A75158 00000000 */ nop -/* 00E4C 80A7515C 0C29D227 */ jal func_80A7489C +/* 00E4C 80A7515C 0C29D227 */ jal func_80A7489C /* 00E50 80A75160 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00E54 80A75164 10000014 */ beq $zero, $zero, .L80A751B8 -/* 00E58 80A75168 8FBF002C */ lw $ra, 0x002C($sp) +/* 00E54 80A75164 10000014 */ beq $zero, $zero, .L80A751B8 +/* 00E58 80A75168 8FBF002C */ lw $ra, 0x002C($sp) .L80A7516C: /* 00E5C 80A7516C 0C028800 */ jal SkelAnime_GetFrameCount - + /* 00E60 80A75170 24842538 */ addiu $a0, $a0, 0x2538 ## $a0 = 00002538 /* 00E64 80A75174 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 00E68 80A75178 24080008 */ addiu $t0, $zero, 0x0008 ## $t0 = 00000008 /* 00E6C 80A7517C A20802F8 */ sb $t0, 0x02F8($s0) ## 000002F8 -/* 00E70 80A75180 468021A0 */ cvt.s.w $f6, $f4 +/* 00E70 80A75180 468021A0 */ cvt.s.w $f6, $f4 /* 00E74 80A75184 3C01C080 */ lui $at, 0xC080 ## $at = C0800000 /* 00E78 80A75188 44814000 */ mtc1 $at, $f8 ## $f8 = -4.00 /* 00E7C 80A7518C 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 00E80 80A75190 24090003 */ addiu $t1, $zero, 0x0003 ## $t1 = 00000003 -/* 00E84 80A75194 AFA90014 */ sw $t1, 0x0014($sp) +/* 00E84 80A75194 AFA90014 */ sw $t1, 0x0014($sp) /* 00E88 80A75198 24A52538 */ addiu $a1, $a1, 0x2538 ## $a1 = 06002538 -/* 00E8C 80A7519C E7A60010 */ swc1 $f6, 0x0010($sp) -/* 00E90 80A751A0 8FA40030 */ lw $a0, 0x0030($sp) +/* 00E8C 80A7519C E7A60010 */ swc1 $f6, 0x0010($sp) +/* 00E90 80A751A0 8FA40030 */ lw $a0, 0x0030($sp) /* 00E94 80A751A4 3C063FC0 */ lui $a2, 0x3FC0 ## $a2 = 3FC00000 /* 00E98 80A751A8 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 00E9C 80A751AC 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 00EA0 80A751B0 E7A80018 */ swc1 $f8, 0x0018($sp) +/* 00E9C 80A751AC 0C029468 */ jal SkelAnime_ChangeAnim + +/* 00EA0 80A751B0 E7A80018 */ swc1 $f8, 0x0018($sp) .L80A751B4: -/* 00EA4 80A751B4 8FBF002C */ lw $ra, 0x002C($sp) +/* 00EA4 80A751B4 8FBF002C */ lw $ra, 0x002C($sp) .L80A751B8: -/* 00EA8 80A751B8 8FB00028 */ lw $s0, 0x0028($sp) +/* 00EA8 80A751B8 8FB00028 */ lw $s0, 0x0028($sp) /* 00EAC 80A751BC 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 -/* 00EB0 80A751C0 03E00008 */ jr $ra +/* 00EB0 80A751C0 03E00008 */ jr $ra /* 00EB4 80A751C4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A751C8.s b/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A751C8.s index 7ffc689063..42ad381170 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A751C8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A751C8.s @@ -1,16 +1,16 @@ glabel func_80A751C8 /* 00EB8 80A751C8 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 00EBC 80A751CC AFB00028 */ sw $s0, 0x0028($sp) +/* 00EBC 80A751CC AFB00028 */ sw $s0, 0x0028($sp) /* 00EC0 80A751D0 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00EC4 80A751D4 AFBF002C */ sw $ra, 0x002C($sp) +/* 00EC4 80A751D4 AFBF002C */ sw $ra, 0x002C($sp) /* 00EC8 80A751D8 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 /* 00ECC 80A751DC 0C028800 */ jal SkelAnime_GetFrameCount - + /* 00ED0 80A751E0 248433C4 */ addiu $a0, $a0, 0x33C4 ## $a0 = 060033C4 /* 00ED4 80A751E4 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 00ED8 80A751E8 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 /* 00EDC 80A751EC 240E0002 */ addiu $t6, $zero, 0x0002 ## $t6 = 00000002 -/* 00EE0 80A751F0 468021A0 */ cvt.s.w $f6, $f4 +/* 00EE0 80A751F0 468021A0 */ cvt.s.w $f6, $f4 /* 00EE4 80A751F4 240F0006 */ addiu $t7, $zero, 0x0006 ## $t7 = 00000006 /* 00EE8 80A751F8 3C01C0C0 */ lui $at, 0xC0C0 ## $at = C0C00000 /* 00EEC 80A751FC 44814000 */ mtc1 $at, $f8 ## $f8 = -6.00 @@ -20,24 +20,24 @@ glabel func_80A751C8 /* 00EFC 80A7520C E6000068 */ swc1 $f0, 0x0068($s0) ## 00000068 /* 00F00 80A75210 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 00F04 80A75214 24180003 */ addiu $t8, $zero, 0x0003 ## $t8 = 00000003 -/* 00F08 80A75218 44060000 */ mfc1 $a2, $f0 -/* 00F0C 80A7521C 44070000 */ mfc1 $a3, $f0 -/* 00F10 80A75220 AFB80014 */ sw $t8, 0x0014($sp) +/* 00F08 80A75218 44060000 */ mfc1 $a2, $f0 +/* 00F0C 80A7521C 44070000 */ mfc1 $a3, $f0 +/* 00F10 80A75220 AFB80014 */ sw $t8, 0x0014($sp) /* 00F14 80A75224 24A533C4 */ addiu $a1, $a1, 0x33C4 ## $a1 = 060033C4 -/* 00F18 80A75228 E7A60010 */ swc1 $f6, 0x0010($sp) +/* 00F18 80A75228 E7A60010 */ swc1 $f6, 0x0010($sp) /* 00F1C 80A7522C 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C -/* 00F20 80A75230 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 00F24 80A75234 E7A80018 */ swc1 $f8, 0x0018($sp) +/* 00F20 80A75230 0C029468 */ jal SkelAnime_ChangeAnim + +/* 00F24 80A75234 E7A80018 */ swc1 $f8, 0x0018($sp) /* 00F28 80A75238 3C0580A7 */ lui $a1, %hi(func_80A75260) ## $a1 = 80A70000 /* 00F2C 80A7523C A20002FC */ sb $zero, 0x02FC($s0) ## 000002FC /* 00F30 80A75240 24A55260 */ addiu $a1, $a1, %lo(func_80A75260) ## $a1 = 80A75260 -/* 00F34 80A75244 0C29D0E4 */ jal func_80A74390 +/* 00F34 80A75244 0C29D0E4 */ jal func_80A74390 /* 00F38 80A75248 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00F3C 80A7524C 8FBF002C */ lw $ra, 0x002C($sp) -/* 00F40 80A75250 8FB00028 */ lw $s0, 0x0028($sp) +/* 00F3C 80A7524C 8FBF002C */ lw $ra, 0x002C($sp) +/* 00F40 80A75250 8FB00028 */ lw $s0, 0x0028($sp) /* 00F44 80A75254 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 00F48 80A75258 03E00008 */ jr $ra +/* 00F48 80A75258 03E00008 */ jr $ra /* 00F4C 80A7525C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A753D0.s b/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A753D0.s index c1dbab2e4e..283bda3a97 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A753D0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A753D0.s @@ -1,16 +1,16 @@ glabel func_80A753D0 /* 010C0 80A753D0 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 010C4 80A753D4 AFB00028 */ sw $s0, 0x0028($sp) +/* 010C4 80A753D4 AFB00028 */ sw $s0, 0x0028($sp) /* 010C8 80A753D8 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 010CC 80A753DC AFBF002C */ sw $ra, 0x002C($sp) +/* 010CC 80A753DC AFBF002C */ sw $ra, 0x002C($sp) /* 010D0 80A753E0 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 /* 010D4 80A753E4 0C028800 */ jal SkelAnime_GetFrameCount - + /* 010D8 80A753E8 24843DBC */ addiu $a0, $a0, 0x3DBC ## $a0 = 06003DBC /* 010DC 80A753EC 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 010E0 80A753F0 A20002FE */ sb $zero, 0x02FE($s0) ## 000002FE /* 010E4 80A753F4 820E02FE */ lb $t6, 0x02FE($s0) ## 000002FE -/* 010E8 80A753F8 468021A0 */ cvt.s.w $f6, $f4 +/* 010E8 80A753F8 468021A0 */ cvt.s.w $f6, $f4 /* 010EC 80A753FC 240F0008 */ addiu $t7, $zero, 0x0008 ## $t7 = 00000008 /* 010F0 80A75400 3C01C080 */ lui $at, 0xC080 ## $at = C0800000 /* 010F4 80A75404 44814000 */ mtc1 $at, $f8 ## $f8 = -4.00 @@ -18,23 +18,23 @@ glabel func_80A753D0 /* 010FC 80A7540C A20E02FF */ sb $t6, 0x02FF($s0) ## 000002FF /* 01100 80A75410 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 01104 80A75414 24180003 */ addiu $t8, $zero, 0x0003 ## $t8 = 00000003 -/* 01108 80A75418 AFB80014 */ sw $t8, 0x0014($sp) +/* 01108 80A75418 AFB80014 */ sw $t8, 0x0014($sp) /* 0110C 80A7541C 24A53DBC */ addiu $a1, $a1, 0x3DBC ## $a1 = 06003DBC -/* 01110 80A75420 E7A60010 */ swc1 $f6, 0x0010($sp) +/* 01110 80A75420 E7A60010 */ swc1 $f6, 0x0010($sp) /* 01114 80A75424 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C /* 01118 80A75428 3C063FC0 */ lui $a2, 0x3FC0 ## $a2 = 3FC00000 /* 0111C 80A7542C 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 01120 80A75430 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 01124 80A75434 E7A80018 */ swc1 $f8, 0x0018($sp) +/* 01120 80A75430 0C029468 */ jal SkelAnime_ChangeAnim + +/* 01124 80A75434 E7A80018 */ swc1 $f8, 0x0018($sp) /* 01128 80A75438 3C0580A7 */ lui $a1, %hi(func_80A7545C) ## $a1 = 80A70000 /* 0112C 80A7543C 24A5545C */ addiu $a1, $a1, %lo(func_80A7545C) ## $a1 = 80A7545C -/* 01130 80A75440 0C29D0E4 */ jal func_80A74390 +/* 01130 80A75440 0C29D0E4 */ jal func_80A74390 /* 01134 80A75444 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01138 80A75448 8FBF002C */ lw $ra, 0x002C($sp) -/* 0113C 80A7544C 8FB00028 */ lw $s0, 0x0028($sp) +/* 01138 80A75448 8FBF002C */ lw $ra, 0x002C($sp) +/* 0113C 80A7544C 8FB00028 */ lw $s0, 0x0028($sp) /* 01140 80A75450 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 01144 80A75454 03E00008 */ jr $ra +/* 01144 80A75454 03E00008 */ jr $ra /* 01148 80A75458 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A754A0.s b/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A754A0.s index c6e0d55430..aae6a330fd 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A754A0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A754A0.s @@ -1,16 +1,16 @@ glabel func_80A754A0 /* 01190 80A754A0 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 01194 80A754A4 AFB00028 */ sw $s0, 0x0028($sp) +/* 01194 80A754A4 AFB00028 */ sw $s0, 0x0028($sp) /* 01198 80A754A8 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 0119C 80A754AC AFBF002C */ sw $ra, 0x002C($sp) +/* 0119C 80A754AC AFBF002C */ sw $ra, 0x002C($sp) /* 011A0 80A754B0 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 /* 011A4 80A754B4 0C028800 */ jal SkelAnime_GetFrameCount - + /* 011A8 80A754B8 248433C4 */ addiu $a0, $a0, 0x33C4 ## $a0 = 060033C4 /* 011AC 80A754BC 44823000 */ mtc1 $v0, $f6 ## $f6 = 0.00 /* 011B0 80A754C0 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 /* 011B4 80A754C4 240E0001 */ addiu $t6, $zero, 0x0001 ## $t6 = 00000001 -/* 011B8 80A754C8 46803220 */ cvt.s.w $f8, $f6 +/* 011B8 80A754C8 46803220 */ cvt.s.w $f8, $f6 /* 011BC 80A754CC 240F0003 */ addiu $t7, $zero, 0x0003 ## $t7 = 00000003 /* 011C0 80A754D0 3C01C080 */ lui $at, 0xC080 ## $at = C0800000 /* 011C4 80A754D4 44815000 */ mtc1 $at, $f10 ## $f10 = -4.00 @@ -19,23 +19,23 @@ glabel func_80A754A0 /* 011D0 80A754E0 E6040068 */ swc1 $f4, 0x0068($s0) ## 00000068 /* 011D4 80A754E4 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 011D8 80A754E8 24180003 */ addiu $t8, $zero, 0x0003 ## $t8 = 00000003 -/* 011DC 80A754EC AFB80014 */ sw $t8, 0x0014($sp) +/* 011DC 80A754EC AFB80014 */ sw $t8, 0x0014($sp) /* 011E0 80A754F0 24A533C4 */ addiu $a1, $a1, 0x33C4 ## $a1 = 060033C4 -/* 011E4 80A754F4 E7A80010 */ swc1 $f8, 0x0010($sp) +/* 011E4 80A754F4 E7A80010 */ swc1 $f8, 0x0010($sp) /* 011E8 80A754F8 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C /* 011EC 80A754FC 3C063F00 */ lui $a2, 0x3F00 ## $a2 = 3F000000 /* 011F0 80A75500 3C074150 */ lui $a3, 0x4150 ## $a3 = 41500000 -/* 011F4 80A75504 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 011F8 80A75508 E7AA0018 */ swc1 $f10, 0x0018($sp) +/* 011F4 80A75504 0C029468 */ jal SkelAnime_ChangeAnim + +/* 011F8 80A75508 E7AA0018 */ swc1 $f10, 0x0018($sp) /* 011FC 80A7550C 3C0580A7 */ lui $a1, %hi(func_80A75530) ## $a1 = 80A70000 /* 01200 80A75510 24A55530 */ addiu $a1, $a1, %lo(func_80A75530) ## $a1 = 80A75530 -/* 01204 80A75514 0C29D0E4 */ jal func_80A74390 +/* 01204 80A75514 0C29D0E4 */ jal func_80A74390 /* 01208 80A75518 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0120C 80A7551C 8FBF002C */ lw $ra, 0x002C($sp) -/* 01210 80A75520 8FB00028 */ lw $s0, 0x0028($sp) +/* 0120C 80A7551C 8FBF002C */ lw $ra, 0x002C($sp) +/* 01210 80A75520 8FB00028 */ lw $s0, 0x0028($sp) /* 01214 80A75524 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 01218 80A75528 03E00008 */ jr $ra +/* 01218 80A75528 03E00008 */ jr $ra /* 0121C 80A7552C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A755F0.s b/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A755F0.s index 5dab3e7654..ca6ac94c95 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A755F0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A755F0.s @@ -1,16 +1,16 @@ glabel func_80A755F0 /* 012E0 80A755F0 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 012E4 80A755F4 AFB00028 */ sw $s0, 0x0028($sp) +/* 012E4 80A755F4 AFB00028 */ sw $s0, 0x0028($sp) /* 012E8 80A755F8 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 012EC 80A755FC AFBF002C */ sw $ra, 0x002C($sp) +/* 012EC 80A755FC AFBF002C */ sw $ra, 0x002C($sp) /* 012F0 80A75600 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 /* 012F4 80A75604 0C028800 */ jal SkelAnime_GetFrameCount - + /* 012F8 80A75608 2484485C */ addiu $a0, $a0, 0x485C ## $a0 = 0600485C /* 012FC 80A7560C 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 01300 80A75610 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 /* 01304 80A75614 240E0009 */ addiu $t6, $zero, 0x0009 ## $t6 = 00000009 -/* 01308 80A75618 468021A0 */ cvt.s.w $f6, $f4 +/* 01308 80A75618 468021A0 */ cvt.s.w $f6, $f4 /* 0130C 80A7561C 3C01C080 */ lui $at, 0xC080 ## $at = C0800000 /* 01310 80A75620 44814000 */ mtc1 $at, $f8 ## $f8 = -4.00 /* 01314 80A75624 A20002FE */ sb $zero, 0x02FE($s0) ## 000002FE @@ -18,23 +18,23 @@ glabel func_80A755F0 /* 0131C 80A7562C E6000068 */ swc1 $f0, 0x0068($s0) ## 00000068 /* 01320 80A75630 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 01324 80A75634 240F0003 */ addiu $t7, $zero, 0x0003 ## $t7 = 00000003 -/* 01328 80A75638 44070000 */ mfc1 $a3, $f0 -/* 0132C 80A7563C AFAF0014 */ sw $t7, 0x0014($sp) +/* 01328 80A75638 44070000 */ mfc1 $a3, $f0 +/* 0132C 80A7563C AFAF0014 */ sw $t7, 0x0014($sp) /* 01330 80A75640 24A5485C */ addiu $a1, $a1, 0x485C ## $a1 = 0600485C -/* 01334 80A75644 E7A60010 */ swc1 $f6, 0x0010($sp) +/* 01334 80A75644 E7A60010 */ swc1 $f6, 0x0010($sp) /* 01338 80A75648 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C /* 0133C 80A7564C 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 01340 80A75650 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 01344 80A75654 E7A80018 */ swc1 $f8, 0x0018($sp) +/* 01340 80A75650 0C029468 */ jal SkelAnime_ChangeAnim + +/* 01344 80A75654 E7A80018 */ swc1 $f8, 0x0018($sp) /* 01348 80A75658 3C0580A7 */ lui $a1, %hi(func_80A7567C) ## $a1 = 80A70000 /* 0134C 80A7565C 24A5567C */ addiu $a1, $a1, %lo(func_80A7567C) ## $a1 = 80A7567C -/* 01350 80A75660 0C29D0E4 */ jal func_80A74390 +/* 01350 80A75660 0C29D0E4 */ jal func_80A74390 /* 01354 80A75664 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01358 80A75668 8FBF002C */ lw $ra, 0x002C($sp) -/* 0135C 80A7566C 8FB00028 */ lw $s0, 0x0028($sp) +/* 01358 80A75668 8FBF002C */ lw $ra, 0x002C($sp) +/* 0135C 80A7566C 8FB00028 */ lw $s0, 0x0028($sp) /* 01360 80A75670 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 01364 80A75674 03E00008 */ jr $ra +/* 01364 80A75674 03E00008 */ jr $ra /* 01368 80A75678 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A75790.s b/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A75790.s index 1411504025..56a0f25e27 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A75790.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A75790.s @@ -1,69 +1,69 @@ glabel func_80A75790 /* 01480 80A75790 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 01484 80A75794 AFB00028 */ sw $s0, 0x0028($sp) +/* 01484 80A75794 AFB00028 */ sw $s0, 0x0028($sp) /* 01488 80A75798 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 0148C 80A7579C AFBF002C */ sw $ra, 0x002C($sp) +/* 0148C 80A7579C AFBF002C */ sw $ra, 0x002C($sp) /* 01490 80A757A0 8E050328 */ lw $a1, 0x0328($s0) ## 00000328 /* 01494 80A757A4 24840024 */ addiu $a0, $a0, 0x0024 ## $a0 = 00000024 /* 01498 80A757A8 0C01E01A */ jal Math_Vec3f_Yaw - + /* 0149C 80A757AC 24A50024 */ addiu $a1, $a1, 0x0024 ## $a1 = 00000024 /* 014A0 80A757B0 860E00B6 */ lh $t6, 0x00B6($s0) ## 000000B6 /* 014A4 80A757B4 A20002F8 */ sb $zero, 0x02F8($s0) ## 000002F8 /* 014A8 80A757B8 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 -/* 014AC 80A757BC 004E1823 */ subu $v1, $v0, $t6 -/* 014B0 80A757C0 00031C00 */ sll $v1, $v1, 16 -/* 014B4 80A757C4 00031C03 */ sra $v1, $v1, 16 -/* 014B8 80A757C8 04600003 */ bltz $v1, .L80A757D8 -/* 014BC 80A757CC 00031023 */ subu $v0, $zero, $v1 -/* 014C0 80A757D0 10000001 */ beq $zero, $zero, .L80A757D8 +/* 014AC 80A757BC 004E1823 */ subu $v1, $v0, $t6 +/* 014B0 80A757C0 00031C00 */ sll $v1, $v1, 16 +/* 014B4 80A757C4 00031C03 */ sra $v1, $v1, 16 +/* 014B8 80A757C8 04600003 */ bltz $v1, .L80A757D8 +/* 014BC 80A757CC 00031023 */ subu $v0, $zero, $v1 +/* 014C0 80A757D0 10000001 */ beq $zero, $zero, .L80A757D8 /* 014C4 80A757D4 00601025 */ or $v0, $v1, $zero ## $v0 = 00000000 .L80A757D8: -/* 014C8 80A757D8 28414001 */ slti $at, $v0, 0x4001 -/* 014CC 80A757DC 10200016 */ beq $at, $zero, .L80A75838 +/* 014C8 80A757D8 28414001 */ slti $at, $v0, 0x4001 +/* 014CC 80A757DC 10200016 */ beq $at, $zero, .L80A75838 /* 014D0 80A757E0 00000000 */ nop /* 014D4 80A757E4 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 /* 014D8 80A757E8 0C028800 */ jal SkelAnime_GetFrameCount - + /* 014DC 80A757EC 24846194 */ addiu $a0, $a0, 0x6194 ## $a0 = 06006194 /* 014E0 80A757F0 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 014E4 80A757F4 3C01C080 */ lui $at, 0xC080 ## $at = C0800000 /* 014E8 80A757F8 44814000 */ mtc1 $at, $f8 ## $f8 = -4.00 -/* 014EC 80A757FC 468021A0 */ cvt.s.w $f6, $f4 +/* 014EC 80A757FC 468021A0 */ cvt.s.w $f6, $f4 /* 014F0 80A75800 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 014F4 80A75804 240F0002 */ addiu $t7, $zero, 0x0002 ## $t7 = 00000002 -/* 014F8 80A75808 AFAF0014 */ sw $t7, 0x0014($sp) +/* 014F8 80A75808 AFAF0014 */ sw $t7, 0x0014($sp) /* 014FC 80A7580C 24A56194 */ addiu $a1, $a1, 0x6194 ## $a1 = 06006194 /* 01500 80A75810 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C -/* 01504 80A75814 E7A60010 */ swc1 $f6, 0x0010($sp) +/* 01504 80A75814 E7A60010 */ swc1 $f6, 0x0010($sp) /* 01508 80A75818 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 0150C 80A7581C 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 01510 80A75820 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 01514 80A75824 E7A80018 */ swc1 $f8, 0x0018($sp) +/* 01510 80A75820 0C029468 */ jal SkelAnime_ChangeAnim + +/* 01514 80A75824 E7A80018 */ swc1 $f8, 0x0018($sp) /* 01518 80A75828 3C01C0C0 */ lui $at, 0xC0C0 ## $at = C0C00000 /* 0151C 80A7582C 44815000 */ mtc1 $at, $f10 ## $f10 = -6.00 -/* 01520 80A75830 10000015 */ beq $zero, $zero, .L80A75888 +/* 01520 80A75830 10000015 */ beq $zero, $zero, .L80A75888 /* 01524 80A75834 E60A0068 */ swc1 $f10, 0x0068($s0) ## 00000068 .L80A75838: /* 01528 80A75838 0C028800 */ jal SkelAnime_GetFrameCount - + /* 0152C 80A7583C 248445BC */ addiu $a0, $a0, 0x45BC ## $a0 = 000045BC /* 01530 80A75840 44828000 */ mtc1 $v0, $f16 ## $f16 = 0.00 /* 01534 80A75844 3C01C080 */ lui $at, 0xC080 ## $at = C0800000 /* 01538 80A75848 44812000 */ mtc1 $at, $f4 ## $f4 = -4.00 -/* 0153C 80A7584C 468084A0 */ cvt.s.w $f18, $f16 +/* 0153C 80A7584C 468084A0 */ cvt.s.w $f18, $f16 /* 01540 80A75850 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 01544 80A75854 24180002 */ addiu $t8, $zero, 0x0002 ## $t8 = 00000002 -/* 01548 80A75858 AFB80014 */ sw $t8, 0x0014($sp) +/* 01548 80A75858 AFB80014 */ sw $t8, 0x0014($sp) /* 0154C 80A7585C 24A545BC */ addiu $a1, $a1, 0x45BC ## $a1 = 060045BC /* 01550 80A75860 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C -/* 01554 80A75864 E7B20010 */ swc1 $f18, 0x0010($sp) +/* 01554 80A75864 E7B20010 */ swc1 $f18, 0x0010($sp) /* 01558 80A75868 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 0155C 80A7586C 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 01560 80A75870 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 01564 80A75874 E7A40018 */ swc1 $f4, 0x0018($sp) +/* 01560 80A75870 0C029468 */ jal SkelAnime_ChangeAnim + +/* 01564 80A75874 E7A40018 */ swc1 $f4, 0x0018($sp) /* 01568 80A75878 3C0140C0 */ lui $at, 0x40C0 ## $at = 40C00000 /* 0156C 80A7587C 44813000 */ mtc1 $at, $f6 ## $f6 = 6.00 /* 01570 80A75880 00000000 */ nop @@ -72,12 +72,12 @@ glabel func_80A75790 /* 01578 80A75888 3C0580A7 */ lui $a1, %hi(func_80A758B0) ## $a1 = 80A70000 /* 0157C 80A7588C A20002FE */ sb $zero, 0x02FE($s0) ## 000002FE /* 01580 80A75890 24A558B0 */ addiu $a1, $a1, %lo(func_80A758B0) ## $a1 = 80A758B0 -/* 01584 80A75894 0C29D0E4 */ jal func_80A74390 +/* 01584 80A75894 0C29D0E4 */ jal func_80A74390 /* 01588 80A75898 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0158C 80A7589C 8FBF002C */ lw $ra, 0x002C($sp) -/* 01590 80A758A0 8FB00028 */ lw $s0, 0x0028($sp) +/* 0158C 80A7589C 8FBF002C */ lw $ra, 0x002C($sp) +/* 01590 80A758A0 8FB00028 */ lw $s0, 0x0028($sp) /* 01594 80A758A4 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 01598 80A758A8 03E00008 */ jr $ra +/* 01598 80A758A8 03E00008 */ jr $ra /* 0159C 80A758AC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A7598C.s b/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A7598C.s index 8920a1c76d..66d4c43098 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A7598C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A7598C.s @@ -1,16 +1,16 @@ glabel func_80A7598C /* 0167C 80A7598C 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 01680 80A75990 AFB00028 */ sw $s0, 0x0028($sp) +/* 01680 80A75990 AFB00028 */ sw $s0, 0x0028($sp) /* 01684 80A75994 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 01688 80A75998 AFBF002C */ sw $ra, 0x002C($sp) +/* 01688 80A75998 AFBF002C */ sw $ra, 0x002C($sp) /* 0168C 80A7599C 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 /* 01690 80A759A0 0C028800 */ jal SkelAnime_GetFrameCount - + /* 01694 80A759A4 24845944 */ addiu $a0, $a0, 0x5944 ## $a0 = 06005944 /* 01698 80A759A8 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 0169C 80A759AC 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 /* 016A0 80A759B0 240E0002 */ addiu $t6, $zero, 0x0002 ## $t6 = 00000002 -/* 016A4 80A759B4 468021A0 */ cvt.s.w $f6, $f4 +/* 016A4 80A759B4 468021A0 */ cvt.s.w $f6, $f4 /* 016A8 80A759B8 3C01C080 */ lui $at, 0xC080 ## $at = C0800000 /* 016AC 80A759BC 44814000 */ mtc1 $at, $f8 ## $f8 = -4.00 /* 016B0 80A759C0 A20002FE */ sb $zero, 0x02FE($s0) ## 000002FE @@ -18,33 +18,33 @@ glabel func_80A7598C /* 016B8 80A759C8 E6000068 */ swc1 $f0, 0x0068($s0) ## 00000068 /* 016BC 80A759CC 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 016C0 80A759D0 240F0002 */ addiu $t7, $zero, 0x0002 ## $t7 = 00000002 -/* 016C4 80A759D4 44070000 */ mfc1 $a3, $f0 -/* 016C8 80A759D8 AFAF0014 */ sw $t7, 0x0014($sp) +/* 016C4 80A759D4 44070000 */ mfc1 $a3, $f0 +/* 016C8 80A759D8 AFAF0014 */ sw $t7, 0x0014($sp) /* 016CC 80A759DC 24A55944 */ addiu $a1, $a1, 0x5944 ## $a1 = 06005944 -/* 016D0 80A759E0 E7A60010 */ swc1 $f6, 0x0010($sp) +/* 016D0 80A759E0 E7A60010 */ swc1 $f6, 0x0010($sp) /* 016D4 80A759E4 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C /* 016D8 80A759E8 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 016DC 80A759EC 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 016E0 80A759F0 E7A80018 */ swc1 $f8, 0x0018($sp) +/* 016DC 80A759EC 0C029468 */ jal SkelAnime_ChangeAnim + +/* 016E0 80A759F0 E7A80018 */ swc1 $f8, 0x0018($sp) /* 016E4 80A759F4 24180018 */ addiu $t8, $zero, 0x0018 ## $t8 = 00000018 /* 016E8 80A759F8 A21802F9 */ sb $t8, 0x02F9($s0) ## 000002F9 /* 016EC 80A759FC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 016F0 80A75A00 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 016F4 80A75A04 240539C0 */ addiu $a1, $zero, 0x39C0 ## $a1 = 000039C0 /* 016F8 80A75A08 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 016FC 80A75A0C 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 01700 80A75A10 2405393B */ addiu $a1, $zero, 0x393B ## $a1 = 0000393B /* 01704 80A75A14 3C0580A7 */ lui $a1, %hi(func_80A75A38) ## $a1 = 80A70000 /* 01708 80A75A18 24A55A38 */ addiu $a1, $a1, %lo(func_80A75A38) ## $a1 = 80A75A38 -/* 0170C 80A75A1C 0C29D0E4 */ jal func_80A74390 +/* 0170C 80A75A1C 0C29D0E4 */ jal func_80A74390 /* 01710 80A75A20 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01714 80A75A24 8FBF002C */ lw $ra, 0x002C($sp) -/* 01718 80A75A28 8FB00028 */ lw $s0, 0x0028($sp) +/* 01714 80A75A24 8FBF002C */ lw $ra, 0x002C($sp) +/* 01718 80A75A28 8FB00028 */ lw $s0, 0x0028($sp) /* 0171C 80A75A2C 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 01720 80A75A30 03E00008 */ jr $ra +/* 01720 80A75A30 03E00008 */ jr $ra /* 01724 80A75A34 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A76330.s b/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A76330.s index cc0f981716..86d4ba50e6 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A76330.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A76330.s @@ -16,7 +16,7 @@ glabel func_80A76330 /* 02058 80A76368 24C68650 */ addiu $a2, $a2, %lo(D_80A78650) ## $a2 = 80A78650 /* 0205C 80A7636C 27A400D0 */ addiu $a0, $sp, 0x00D0 ## $a0 = FFFFFFD0 /* 02060 80A76370 240704B1 */ addiu $a3, $zero, 0x04B1 ## $a3 = 000004B1 -/* 02064 80A76374 0C031AB1 */ jal func_800C6AC4 +/* 02064 80A76374 0C031AB1 */ jal Graph_OpenDisps /* 02068 80A76378 00A0A825 */ or $s5, $a1, $zero ## $s5 = 00000000 /* 0206C 80A7637C 8FB40110 */ lw $s4, 0x0110($sp) /* 02070 80A76380 8FA50104 */ lw $a1, 0x0104($sp) @@ -283,7 +283,7 @@ glabel func_80A76330 /* 02450 80A76760 24C686E0 */ addiu $a2, $a2, %lo(D_80A786E0) ## $a2 = 80A786E0 /* 02454 80A76764 27A400D0 */ addiu $a0, $sp, 0x00D0 ## $a0 = FFFFFFD0 /* 02458 80A76768 2407050E */ addiu $a3, $zero, 0x050E ## $a3 = 0000050E -/* 0245C 80A7676C 0C031AD5 */ jal func_800C6B54 +/* 0245C 80A7676C 0C031AD5 */ jal Graph_CloseDisps /* 02460 80A76770 8D650000 */ lw $a1, 0x0000($t3) ## 00000000 /* 02464 80A76774 8FBF003C */ lw $ra, 0x003C($sp) /* 02468 80A76778 8FB00024 */ lw $s0, 0x0024($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A76798.s b/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A76798.s index 1727c26274..8a200f61e7 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A76798.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A76798.s @@ -1,28 +1,28 @@ glabel func_80A76798 /* 02488 80A76798 27BDFF80 */ addiu $sp, $sp, 0xFF80 ## $sp = FFFFFF80 -/* 0248C 80A7679C AFB10028 */ sw $s1, 0x0028($sp) +/* 0248C 80A7679C AFB10028 */ sw $s1, 0x0028($sp) /* 02490 80A767A0 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 -/* 02494 80A767A4 AFBF002C */ sw $ra, 0x002C($sp) -/* 02498 80A767A8 AFB00024 */ sw $s0, 0x0024($sp) -/* 0249C 80A767AC AFA40080 */ sw $a0, 0x0080($sp) +/* 02494 80A767A4 AFBF002C */ sw $ra, 0x002C($sp) +/* 02498 80A767A8 AFB00024 */ sw $s0, 0x0024($sp) +/* 0249C 80A767AC AFA40080 */ sw $a0, 0x0080($sp) /* 024A0 80A767B0 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 /* 024A4 80A767B4 3C0680A8 */ lui $a2, %hi(D_80A786F8) ## $a2 = 80A80000 /* 024A8 80A767B8 24C686F8 */ addiu $a2, $a2, %lo(D_80A786F8) ## $a2 = 80A786F8 /* 024AC 80A767BC 27A40068 */ addiu $a0, $sp, 0x0068 ## $a0 = FFFFFFE8 /* 024B0 80A767C0 2407051D */ addiu $a3, $zero, 0x051D ## $a3 = 0000051D -/* 024B4 80A767C4 0C031AB1 */ jal func_800C6AC4 +/* 024B4 80A767C4 0C031AB1 */ jal Graph_OpenDisps /* 024B8 80A767C8 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 -/* 024BC 80A767CC 0C024F46 */ jal func_80093D18 +/* 024BC 80A767CC 0C024F46 */ jal func_80093D18 /* 024C0 80A767D0 8E240000 */ lw $a0, 0x0000($s1) ## 00000000 -/* 024C4 80A767D4 0C024F61 */ jal func_80093D84 +/* 024C4 80A767D4 0C024F61 */ jal func_80093D84 /* 024C8 80A767D8 8E240000 */ lw $a0, 0x0000($s1) ## 00000000 -/* 024CC 80A767DC 8FA80080 */ lw $t0, 0x0080($sp) +/* 024CC 80A767DC 8FA80080 */ lw $t0, 0x0080($sp) /* 024D0 80A767E0 3C0FDB06 */ lui $t7, 0xDB06 ## $t7 = DB060000 /* 024D4 80A767E4 35EF0020 */ ori $t7, $t7, 0x0020 ## $t7 = DB060020 /* 024D8 80A767E8 8502001C */ lh $v0, 0x001C($t0) ## 0000001C /* 024DC 80A767EC 240500F5 */ addiu $a1, $zero, 0x00F5 ## $a1 = 000000F5 /* 024E0 80A767F0 240600E1 */ addiu $a2, $zero, 0x00E1 ## $a2 = 000000E1 -/* 024E4 80A767F4 14400037 */ bne $v0, $zero, .L80A768D4 +/* 024E4 80A767F4 14400037 */ bne $v0, $zero, .L80A768D4 /* 024E8 80A767F8 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 /* 024EC 80A767FC 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 /* 024F0 80A76800 2418001E */ addiu $t8, $zero, 0x001E ## $t8 = 0000001E @@ -31,13 +31,13 @@ glabel func_80A76798 /* 024FC 80A7680C AE0E02C0 */ sw $t6, 0x02C0($s0) ## 000002C0 /* 02500 80A76810 AC4F0000 */ sw $t7, 0x0000($v0) ## 00000000 /* 02504 80A76814 8E240000 */ lw $a0, 0x0000($s1) ## 00000000 -/* 02508 80A76818 AFA00018 */ sw $zero, 0x0018($sp) -/* 0250C 80A7681C AFB90014 */ sw $t9, 0x0014($sp) -/* 02510 80A76820 AFB80010 */ sw $t8, 0x0010($sp) +/* 02508 80A76818 AFA00018 */ sw $zero, 0x0018($sp) +/* 0250C 80A7681C AFB90014 */ sw $t9, 0x0014($sp) +/* 02510 80A76820 AFB80010 */ sw $t8, 0x0010($sp) /* 02514 80A76824 2407009B */ addiu $a3, $zero, 0x009B ## $a3 = 0000009B -/* 02518 80A76828 0C29D86C */ jal func_80A761B0 -/* 0251C 80A7682C AFA20064 */ sw $v0, 0x0064($sp) -/* 02520 80A76830 8FA30064 */ lw $v1, 0x0064($sp) +/* 02518 80A76828 0C29D86C */ jal func_80A761B0 +/* 0251C 80A7682C AFA20064 */ sw $v0, 0x0064($sp) +/* 02520 80A76830 8FA30064 */ lw $v1, 0x0064($sp) /* 02524 80A76834 3C0ADB06 */ lui $t2, 0xDB06 ## $t2 = DB060000 /* 02528 80A76838 354A0024 */ ori $t2, $t2, 0x0024 ## $t2 = DB060024 /* 0252C 80A7683C AC620004 */ sw $v0, 0x0004($v1) ## 00000004 @@ -48,14 +48,14 @@ glabel func_80A76798 /* 02540 80A76850 AE0902C0 */ sw $t1, 0x02C0($s0) ## 000002C0 /* 02544 80A76854 AC4A0000 */ sw $t2, 0x0000($v0) ## 00000000 /* 02548 80A76858 8E240000 */ lw $a0, 0x0000($s1) ## 00000000 -/* 0254C 80A7685C AFA00018 */ sw $zero, 0x0018($sp) -/* 02550 80A76860 AFA00014 */ sw $zero, 0x0014($sp) -/* 02554 80A76864 AFAB0010 */ sw $t3, 0x0010($sp) +/* 0254C 80A7685C AFA00018 */ sw $zero, 0x0018($sp) +/* 02550 80A76860 AFA00014 */ sw $zero, 0x0014($sp) +/* 02554 80A76864 AFAB0010 */ sw $t3, 0x0010($sp) /* 02558 80A76868 24060028 */ addiu $a2, $zero, 0x0028 ## $a2 = 00000028 /* 0255C 80A7686C 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 02560 80A76870 0C29D86C */ jal func_80A761B0 -/* 02564 80A76874 AFA20060 */ sw $v0, 0x0060($sp) -/* 02568 80A76878 8FA30060 */ lw $v1, 0x0060($sp) +/* 02560 80A76870 0C29D86C */ jal func_80A761B0 +/* 02564 80A76874 AFA20060 */ sw $v0, 0x0060($sp) +/* 02568 80A76878 8FA30060 */ lw $v1, 0x0060($sp) /* 0256C 80A7687C 3C0DDB06 */ lui $t5, 0xDB06 ## $t5 = DB060000 /* 02570 80A76880 35AD0028 */ ori $t5, $t5, 0x0028 ## $t5 = DB060028 /* 02574 80A76884 AC620004 */ sw $v0, 0x0004($v1) ## 00000004 @@ -67,19 +67,19 @@ glabel func_80A76798 /* 0258C 80A7689C AC4D0000 */ sw $t5, 0x0000($v0) ## 00000000 /* 02590 80A768A0 8E240000 */ lw $a0, 0x0000($s1) ## 00000000 /* 02594 80A768A4 2418001E */ addiu $t8, $zero, 0x001E ## $t8 = 0000001E -/* 02598 80A768A8 AFB80018 */ sw $t8, 0x0018($sp) -/* 0259C 80A768AC AFAF0014 */ sw $t7, 0x0014($sp) -/* 025A0 80A768B0 AFAE0010 */ sw $t6, 0x0010($sp) +/* 02598 80A768A8 AFB80018 */ sw $t8, 0x0018($sp) +/* 0259C 80A768AC AFAF0014 */ sw $t7, 0x0014($sp) +/* 025A0 80A768B0 AFAE0010 */ sw $t6, 0x0010($sp) /* 025A4 80A768B4 240500FF */ addiu $a1, $zero, 0x00FF ## $a1 = 000000FF /* 025A8 80A768B8 240600FF */ addiu $a2, $zero, 0x00FF ## $a2 = 000000FF /* 025AC 80A768BC 240700FF */ addiu $a3, $zero, 0x00FF ## $a3 = 000000FF -/* 025B0 80A768C0 0C29D86C */ jal func_80A761B0 -/* 025B4 80A768C4 AFA2005C */ sw $v0, 0x005C($sp) -/* 025B8 80A768C8 8FA3005C */ lw $v1, 0x005C($sp) -/* 025BC 80A768CC 100000B1 */ beq $zero, $zero, .L80A76B94 +/* 025B0 80A768C0 0C29D86C */ jal func_80A761B0 +/* 025B4 80A768C4 AFA2005C */ sw $v0, 0x005C($sp) +/* 025B8 80A768C8 8FA3005C */ lw $v1, 0x005C($sp) +/* 025BC 80A768CC 100000B1 */ beq $zero, $zero, .L80A76B94 /* 025C0 80A768D0 AC620004 */ sw $v0, 0x0004($v1) ## 00000004 .L80A768D4: -/* 025C4 80A768D4 1441003B */ bne $v0, $at, .L80A769C4 +/* 025C4 80A768D4 1441003B */ bne $v0, $at, .L80A769C4 /* 025C8 80A768D8 3C09DB06 */ lui $t1, 0xDB06 ## $t1 = DB060000 /* 025CC 80A768DC 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 /* 025D0 80A768E0 35290020 */ ori $t1, $t1, 0x0020 ## $t1 = DB060020 @@ -89,15 +89,15 @@ glabel func_80A76798 /* 025E0 80A768F0 AC490000 */ sw $t1, 0x0000($v0) ## 00000000 /* 025E4 80A768F4 8E240000 */ lw $a0, 0x0000($s1) ## 00000000 /* 025E8 80A768F8 240B0023 */ addiu $t3, $zero, 0x0023 ## $t3 = 00000023 -/* 025EC 80A768FC AFAB0014 */ sw $t3, 0x0014($sp) -/* 025F0 80A76900 AFA00018 */ sw $zero, 0x0018($sp) -/* 025F4 80A76904 AFAA0010 */ sw $t2, 0x0010($sp) +/* 025EC 80A768FC AFAB0014 */ sw $t3, 0x0014($sp) +/* 025F0 80A76900 AFA00018 */ sw $zero, 0x0018($sp) +/* 025F4 80A76904 AFAA0010 */ sw $t2, 0x0010($sp) /* 025F8 80A76908 240500F5 */ addiu $a1, $zero, 0x00F5 ## $a1 = 000000F5 /* 025FC 80A7690C 240600FF */ addiu $a2, $zero, 0x00FF ## $a2 = 000000FF /* 02600 80A76910 240700CD */ addiu $a3, $zero, 0x00CD ## $a3 = 000000CD -/* 02604 80A76914 0C29D86C */ jal func_80A761B0 -/* 02608 80A76918 AFA20058 */ sw $v0, 0x0058($sp) -/* 0260C 80A7691C 8FA30058 */ lw $v1, 0x0058($sp) +/* 02604 80A76914 0C29D86C */ jal func_80A761B0 +/* 02608 80A76918 AFA20058 */ sw $v0, 0x0058($sp) +/* 0260C 80A7691C 8FA30058 */ lw $v1, 0x0058($sp) /* 02610 80A76920 3C0DDB06 */ lui $t5, 0xDB06 ## $t5 = DB060000 /* 02614 80A76924 35AD0024 */ ori $t5, $t5, 0x0024 ## $t5 = DB060024 /* 02618 80A76928 AC620004 */ sw $v0, 0x0004($v1) ## 00000004 @@ -108,15 +108,15 @@ glabel func_80A76798 /* 0262C 80A7693C AE0C02C0 */ sw $t4, 0x02C0($s0) ## 000002C0 /* 02630 80A76940 AC4D0000 */ sw $t5, 0x0000($v0) ## 00000000 /* 02634 80A76944 8E240000 */ lw $a0, 0x0000($s1) ## 00000000 -/* 02638 80A76948 AFA00018 */ sw $zero, 0x0018($sp) -/* 0263C 80A7694C AFAF0014 */ sw $t7, 0x0014($sp) -/* 02640 80A76950 AFAE0010 */ sw $t6, 0x0010($sp) +/* 02638 80A76948 AFA00018 */ sw $zero, 0x0018($sp) +/* 0263C 80A7694C AFAF0014 */ sw $t7, 0x0014($sp) +/* 02640 80A76950 AFAE0010 */ sw $t6, 0x0010($sp) /* 02644 80A76954 240500B9 */ addiu $a1, $zero, 0x00B9 ## $a1 = 000000B9 /* 02648 80A76958 24060087 */ addiu $a2, $zero, 0x0087 ## $a2 = 00000087 /* 0264C 80A7695C 24070019 */ addiu $a3, $zero, 0x0019 ## $a3 = 00000019 -/* 02650 80A76960 0C29D86C */ jal func_80A761B0 -/* 02654 80A76964 AFA20054 */ sw $v0, 0x0054($sp) -/* 02658 80A76968 8FA30054 */ lw $v1, 0x0054($sp) +/* 02650 80A76960 0C29D86C */ jal func_80A761B0 +/* 02654 80A76964 AFA20054 */ sw $v0, 0x0054($sp) +/* 02658 80A76968 8FA30054 */ lw $v1, 0x0054($sp) /* 0265C 80A7696C 3C19DB06 */ lui $t9, 0xDB06 ## $t9 = DB060000 /* 02660 80A76970 37390028 */ ori $t9, $t9, 0x0028 ## $t9 = DB060028 /* 02664 80A76974 AC620004 */ sw $v0, 0x0004($v1) ## 00000004 @@ -128,20 +128,20 @@ glabel func_80A76798 /* 0267C 80A7698C AC590000 */ sw $t9, 0x0000($v0) ## 00000000 /* 02680 80A76990 8E240000 */ lw $a0, 0x0000($s1) ## 00000000 /* 02684 80A76994 240B0014 */ addiu $t3, $zero, 0x0014 ## $t3 = 00000014 -/* 02688 80A76998 AFAB0018 */ sw $t3, 0x0018($sp) -/* 0268C 80A7699C AFAA0014 */ sw $t2, 0x0014($sp) -/* 02690 80A769A0 AFA90010 */ sw $t1, 0x0010($sp) +/* 02688 80A76998 AFAB0018 */ sw $t3, 0x0018($sp) +/* 0268C 80A7699C AFAA0014 */ sw $t2, 0x0014($sp) +/* 02690 80A769A0 AFA90010 */ sw $t1, 0x0010($sp) /* 02694 80A769A4 240500FF */ addiu $a1, $zero, 0x00FF ## $a1 = 000000FF /* 02698 80A769A8 240600FF */ addiu $a2, $zero, 0x00FF ## $a2 = 000000FF /* 0269C 80A769AC 240700FF */ addiu $a3, $zero, 0x00FF ## $a3 = 000000FF -/* 026A0 80A769B0 0C29D86C */ jal func_80A761B0 -/* 026A4 80A769B4 AFA20050 */ sw $v0, 0x0050($sp) -/* 026A8 80A769B8 8FA30050 */ lw $v1, 0x0050($sp) -/* 026AC 80A769BC 10000075 */ beq $zero, $zero, .L80A76B94 +/* 026A0 80A769B0 0C29D86C */ jal func_80A761B0 +/* 026A4 80A769B4 AFA20050 */ sw $v0, 0x0050($sp) +/* 026A8 80A769B8 8FA30050 */ lw $v1, 0x0050($sp) +/* 026AC 80A769BC 10000075 */ beq $zero, $zero, .L80A76B94 /* 026B0 80A769C0 AC620004 */ sw $v0, 0x0004($v1) ## 00000004 .L80A769C4: /* 026B4 80A769C4 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 026B8 80A769C8 14410039 */ bne $v0, $at, .L80A76AB0 +/* 026B8 80A769C8 14410039 */ bne $v0, $at, .L80A76AB0 /* 026BC 80A769CC 3C0EDB06 */ lui $t6, 0xDB06 ## $t6 = DB060000 /* 026C0 80A769D0 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 /* 026C4 80A769D4 3C0DDB06 */ lui $t5, 0xDB06 ## $t5 = DB060000 @@ -150,15 +150,15 @@ glabel func_80A76798 /* 026D0 80A769E0 AE0C02C0 */ sw $t4, 0x02C0($s0) ## 000002C0 /* 026D4 80A769E4 AC4D0000 */ sw $t5, 0x0000($v0) ## 00000000 /* 026D8 80A769E8 8E240000 */ lw $a0, 0x0000($s1) ## 00000000 -/* 026DC 80A769EC AFA00018 */ sw $zero, 0x0018($sp) -/* 026E0 80A769F0 AFA00014 */ sw $zero, 0x0014($sp) -/* 026E4 80A769F4 AFA00010 */ sw $zero, 0x0010($sp) +/* 026DC 80A769EC AFA00018 */ sw $zero, 0x0018($sp) +/* 026E0 80A769F0 AFA00014 */ sw $zero, 0x0014($sp) +/* 026E4 80A769F4 AFA00010 */ sw $zero, 0x0010($sp) /* 026E8 80A769F8 24050037 */ addiu $a1, $zero, 0x0037 ## $a1 = 00000037 /* 026EC 80A769FC 24060041 */ addiu $a2, $zero, 0x0041 ## $a2 = 00000041 /* 026F0 80A76A00 24070037 */ addiu $a3, $zero, 0x0037 ## $a3 = 00000037 -/* 026F4 80A76A04 0C29D86C */ jal func_80A761B0 -/* 026F8 80A76A08 AFA2004C */ sw $v0, 0x004C($sp) -/* 026FC 80A76A0C 8FA3004C */ lw $v1, 0x004C($sp) +/* 026F4 80A76A04 0C29D86C */ jal func_80A761B0 +/* 026F8 80A76A08 AFA2004C */ sw $v0, 0x004C($sp) +/* 026FC 80A76A0C 8FA3004C */ lw $v1, 0x004C($sp) /* 02700 80A76A10 3C0FDB06 */ lui $t7, 0xDB06 ## $t7 = DB060000 /* 02704 80A76A14 35EF0024 */ ori $t7, $t7, 0x0024 ## $t7 = DB060024 /* 02708 80A76A18 AC620004 */ sw $v0, 0x0004($v1) ## 00000004 @@ -169,15 +169,15 @@ glabel func_80A76798 /* 0271C 80A76A2C AE0E02C0 */ sw $t6, 0x02C0($s0) ## 000002C0 /* 02720 80A76A30 AC4F0000 */ sw $t7, 0x0000($v0) ## 00000000 /* 02724 80A76A34 8E240000 */ lw $a0, 0x0000($s1) ## 00000000 -/* 02728 80A76A38 AFA00018 */ sw $zero, 0x0018($sp) -/* 0272C 80A76A3C AFB90014 */ sw $t9, 0x0014($sp) -/* 02730 80A76A40 AFB80010 */ sw $t8, 0x0010($sp) +/* 02728 80A76A38 AFA00018 */ sw $zero, 0x0018($sp) +/* 0272C 80A76A3C AFB90014 */ sw $t9, 0x0014($sp) +/* 02730 80A76A40 AFB80010 */ sw $t8, 0x0010($sp) /* 02734 80A76A44 240500CD */ addiu $a1, $zero, 0x00CD ## $a1 = 000000CD /* 02738 80A76A48 240600A5 */ addiu $a2, $zero, 0x00A5 ## $a2 = 000000A5 /* 0273C 80A76A4C 2407004B */ addiu $a3, $zero, 0x004B ## $a3 = 0000004B -/* 02740 80A76A50 0C29D86C */ jal func_80A761B0 -/* 02744 80A76A54 AFA20048 */ sw $v0, 0x0048($sp) -/* 02748 80A76A58 8FA30048 */ lw $v1, 0x0048($sp) +/* 02740 80A76A50 0C29D86C */ jal func_80A761B0 +/* 02744 80A76A54 AFA20048 */ sw $v0, 0x0048($sp) +/* 02748 80A76A58 8FA30048 */ lw $v1, 0x0048($sp) /* 0274C 80A76A5C 3C0ADB06 */ lui $t2, 0xDB06 ## $t2 = DB060000 /* 02750 80A76A60 354A0028 */ ori $t2, $t2, 0x0028 ## $t2 = DB060028 /* 02754 80A76A64 AC620004 */ sw $v0, 0x0004($v1) ## 00000004 @@ -188,16 +188,16 @@ glabel func_80A76798 /* 02768 80A76A78 AE0902C0 */ sw $t1, 0x02C0($s0) ## 000002C0 /* 0276C 80A76A7C AC4A0000 */ sw $t2, 0x0000($v0) ## 00000000 /* 02770 80A76A80 8E240000 */ lw $a0, 0x0000($s1) ## 00000000 -/* 02774 80A76A84 AFA00018 */ sw $zero, 0x0018($sp) -/* 02778 80A76A88 AFAC0014 */ sw $t4, 0x0014($sp) -/* 0277C 80A76A8C AFAB0010 */ sw $t3, 0x0010($sp) +/* 02774 80A76A84 AFA00018 */ sw $zero, 0x0018($sp) +/* 02778 80A76A88 AFAC0014 */ sw $t4, 0x0014($sp) +/* 0277C 80A76A8C AFAB0010 */ sw $t3, 0x0010($sp) /* 02780 80A76A90 240500CD */ addiu $a1, $zero, 0x00CD ## $a1 = 000000CD /* 02784 80A76A94 240600A5 */ addiu $a2, $zero, 0x00A5 ## $a2 = 000000A5 /* 02788 80A76A98 2407004B */ addiu $a3, $zero, 0x004B ## $a3 = 0000004B -/* 0278C 80A76A9C 0C29D86C */ jal func_80A761B0 -/* 02790 80A76AA0 AFA20044 */ sw $v0, 0x0044($sp) -/* 02794 80A76AA4 8FA30044 */ lw $v1, 0x0044($sp) -/* 02798 80A76AA8 1000003A */ beq $zero, $zero, .L80A76B94 +/* 0278C 80A76A9C 0C29D86C */ jal func_80A761B0 +/* 02790 80A76AA0 AFA20044 */ sw $v0, 0x0044($sp) +/* 02794 80A76AA4 8FA30044 */ lw $v1, 0x0044($sp) +/* 02798 80A76AA8 1000003A */ beq $zero, $zero, .L80A76B94 /* 0279C 80A76AAC AC620004 */ sw $v0, 0x0004($v1) ## 00000004 .L80A76AB0: /* 027A0 80A76AB0 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 @@ -209,15 +209,15 @@ glabel func_80A76798 /* 027B8 80A76AC8 8E240000 */ lw $a0, 0x0000($s1) ## 00000000 /* 027BC 80A76ACC 241800B4 */ addiu $t8, $zero, 0x00B4 ## $t8 = 000000B4 /* 027C0 80A76AD0 241900B4 */ addiu $t9, $zero, 0x00B4 ## $t9 = 000000B4 -/* 027C4 80A76AD4 AFB90018 */ sw $t9, 0x0018($sp) -/* 027C8 80A76AD8 AFB80014 */ sw $t8, 0x0014($sp) -/* 027CC 80A76ADC AFAF0010 */ sw $t7, 0x0010($sp) +/* 027C4 80A76AD4 AFB90018 */ sw $t9, 0x0018($sp) +/* 027C8 80A76AD8 AFB80014 */ sw $t8, 0x0014($sp) +/* 027CC 80A76ADC AFAF0010 */ sw $t7, 0x0010($sp) /* 027D0 80A76AE0 240500FF */ addiu $a1, $zero, 0x00FF ## $a1 = 000000FF /* 027D4 80A76AE4 240600FF */ addiu $a2, $zero, 0x00FF ## $a2 = 000000FF /* 027D8 80A76AE8 240700FF */ addiu $a3, $zero, 0x00FF ## $a3 = 000000FF -/* 027DC 80A76AEC 0C29D86C */ jal func_80A761B0 -/* 027E0 80A76AF0 AFA20040 */ sw $v0, 0x0040($sp) -/* 027E4 80A76AF4 8FA30040 */ lw $v1, 0x0040($sp) +/* 027DC 80A76AEC 0C29D86C */ jal func_80A761B0 +/* 027E0 80A76AF0 AFA20040 */ sw $v0, 0x0040($sp) +/* 027E4 80A76AF4 8FA30040 */ lw $v1, 0x0040($sp) /* 027E8 80A76AF8 3C0ADB06 */ lui $t2, 0xDB06 ## $t2 = DB060000 /* 027EC 80A76AFC 354A0024 */ ori $t2, $t2, 0x0024 ## $t2 = DB060024 /* 027F0 80A76B00 AC620004 */ sw $v0, 0x0004($v1) ## 00000004 @@ -228,15 +228,15 @@ glabel func_80A76798 /* 02804 80A76B14 AE0902C0 */ sw $t1, 0x02C0($s0) ## 000002C0 /* 02808 80A76B18 AC4A0000 */ sw $t2, 0x0000($v0) ## 00000000 /* 0280C 80A76B1C 8E240000 */ lw $a0, 0x0000($s1) ## 00000000 -/* 02810 80A76B20 AFA00018 */ sw $zero, 0x0018($sp) -/* 02814 80A76B24 AFAC0014 */ sw $t4, 0x0014($sp) -/* 02818 80A76B28 AFAB0010 */ sw $t3, 0x0010($sp) +/* 02810 80A76B20 AFA00018 */ sw $zero, 0x0018($sp) +/* 02814 80A76B24 AFAC0014 */ sw $t4, 0x0014($sp) +/* 02818 80A76B28 AFAB0010 */ sw $t3, 0x0010($sp) /* 0281C 80A76B2C 240500E1 */ addiu $a1, $zero, 0x00E1 ## $a1 = 000000E1 /* 02820 80A76B30 240600CD */ addiu $a2, $zero, 0x00CD ## $a2 = 000000CD /* 02824 80A76B34 24070073 */ addiu $a3, $zero, 0x0073 ## $a3 = 00000073 -/* 02828 80A76B38 0C29D86C */ jal func_80A761B0 -/* 0282C 80A76B3C AFA2003C */ sw $v0, 0x003C($sp) -/* 02830 80A76B40 8FA3003C */ lw $v1, 0x003C($sp) +/* 02828 80A76B38 0C29D86C */ jal func_80A761B0 +/* 0282C 80A76B3C AFA2003C */ sw $v0, 0x003C($sp) +/* 02830 80A76B40 8FA3003C */ lw $v1, 0x003C($sp) /* 02834 80A76B44 3C0EDB06 */ lui $t6, 0xDB06 ## $t6 = DB060000 /* 02838 80A76B48 35CE0028 */ ori $t6, $t6, 0x0028 ## $t6 = DB060028 /* 0283C 80A76B4C AC620004 */ sw $v0, 0x0004($v1) ## 00000004 @@ -247,18 +247,18 @@ glabel func_80A76798 /* 02850 80A76B60 AE0D02C0 */ sw $t5, 0x02C0($s0) ## 000002C0 /* 02854 80A76B64 AC4E0000 */ sw $t6, 0x0000($v0) ## 00000000 /* 02858 80A76B68 8E240000 */ lw $a0, 0x0000($s1) ## 00000000 -/* 0285C 80A76B6C AFA00018 */ sw $zero, 0x0018($sp) -/* 02860 80A76B70 AFB80014 */ sw $t8, 0x0014($sp) -/* 02864 80A76B74 AFAF0010 */ sw $t7, 0x0010($sp) +/* 0285C 80A76B6C AFA00018 */ sw $zero, 0x0018($sp) +/* 02860 80A76B70 AFB80014 */ sw $t8, 0x0014($sp) +/* 02864 80A76B74 AFAF0010 */ sw $t7, 0x0010($sp) /* 02868 80A76B78 240500E1 */ addiu $a1, $zero, 0x00E1 ## $a1 = 000000E1 /* 0286C 80A76B7C 240600CD */ addiu $a2, $zero, 0x00CD ## $a2 = 000000CD /* 02870 80A76B80 24070073 */ addiu $a3, $zero, 0x0073 ## $a3 = 00000073 -/* 02874 80A76B84 0C29D86C */ jal func_80A761B0 -/* 02878 80A76B88 AFA20038 */ sw $v0, 0x0038($sp) -/* 0287C 80A76B8C 8FA30038 */ lw $v1, 0x0038($sp) +/* 02874 80A76B84 0C29D86C */ jal func_80A761B0 +/* 02878 80A76B88 AFA20038 */ sw $v0, 0x0038($sp) +/* 0287C 80A76B8C 8FA30038 */ lw $v1, 0x0038($sp) /* 02880 80A76B90 AC620004 */ sw $v0, 0x0004($v1) ## 00000004 .L80A76B94: -/* 02884 80A76B94 8FB90080 */ lw $t9, 0x0080($sp) +/* 02884 80A76B94 8FB90080 */ lw $t9, 0x0080($sp) /* 02888 80A76B98 3C0980A7 */ lui $t1, %hi(func_80A7626C) ## $t1 = 80A70000 /* 0288C 80A76B9C 3C0A80A7 */ lui $t2, %hi(func_80A76330) ## $t2 = 80A70000 /* 02890 80A76BA0 8F250150 */ lw $a1, 0x0150($t9) ## 00000150 @@ -266,21 +266,21 @@ glabel func_80A76798 /* 02898 80A76BA8 9327014E */ lbu $a3, 0x014E($t9) ## 0000014E /* 0289C 80A76BAC 254A6330 */ addiu $t2, $t2, %lo(func_80A76330) ## $t2 = 80A76330 /* 028A0 80A76BB0 2529626C */ addiu $t1, $t1, %lo(func_80A7626C) ## $t1 = 80A7626C -/* 028A4 80A76BB4 AFA90010 */ sw $t1, 0x0010($sp) -/* 028A8 80A76BB8 AFAA0014 */ sw $t2, 0x0014($sp) +/* 028A4 80A76BB4 AFA90010 */ sw $t1, 0x0010($sp) +/* 028A8 80A76BB8 AFAA0014 */ sw $t2, 0x0014($sp) /* 028AC 80A76BBC 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 028B0 80A76BC0 0C0286B2 */ jal func_800A1AC8 -/* 028B4 80A76BC4 AFB90018 */ sw $t9, 0x0018($sp) +/* 028B0 80A76BC0 0C0286B2 */ jal SkelAnime_DrawSV +/* 028B4 80A76BC4 AFB90018 */ sw $t9, 0x0018($sp) /* 028B8 80A76BC8 3C0680A8 */ lui $a2, %hi(D_80A78710) ## $a2 = 80A80000 /* 028BC 80A76BCC 24C68710 */ addiu $a2, $a2, %lo(D_80A78710) ## $a2 = 80A78710 /* 028C0 80A76BD0 27A40068 */ addiu $a0, $sp, 0x0068 ## $a0 = FFFFFFE8 /* 028C4 80A76BD4 8E250000 */ lw $a1, 0x0000($s1) ## 00000000 -/* 028C8 80A76BD8 0C031AD5 */ jal func_800C6B54 +/* 028C8 80A76BD8 0C031AD5 */ jal Graph_CloseDisps /* 028CC 80A76BDC 24070547 */ addiu $a3, $zero, 0x0547 ## $a3 = 00000547 -/* 028D0 80A76BE0 8FBF002C */ lw $ra, 0x002C($sp) -/* 028D4 80A76BE4 8FB00024 */ lw $s0, 0x0024($sp) -/* 028D8 80A76BE8 8FB10028 */ lw $s1, 0x0028($sp) -/* 028DC 80A76BEC 03E00008 */ jr $ra +/* 028D0 80A76BE0 8FBF002C */ lw $ra, 0x002C($sp) +/* 028D4 80A76BE4 8FB00024 */ lw $s0, 0x0024($sp) +/* 028D8 80A76BE8 8FB10028 */ lw $s1, 0x0028($sp) +/* 028DC 80A76BEC 03E00008 */ jr $ra /* 028E0 80A76BF0 27BD0080 */ addiu $sp, $sp, 0x0080 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A77158.s b/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A77158.s index d25d19c4d2..eaa647c72f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A77158.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A77158.s @@ -1,40 +1,40 @@ glabel func_80A77158 /* 02E48 80A77158 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 02E4C 80A7715C AFB00028 */ sw $s0, 0x0028($sp) +/* 02E4C 80A7715C AFB00028 */ sw $s0, 0x0028($sp) /* 02E50 80A77160 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 02E54 80A77164 AFBF002C */ sw $ra, 0x002C($sp) +/* 02E54 80A77164 AFBF002C */ sw $ra, 0x002C($sp) /* 02E58 80A77168 3C040601 */ lui $a0, 0x0601 ## $a0 = 06010000 -/* 02E5C 80A7716C AFA50034 */ sw $a1, 0x0034($sp) +/* 02E5C 80A7716C AFA50034 */ sw $a1, 0x0034($sp) /* 02E60 80A77170 0C028800 */ jal SkelAnime_GetFrameCount - + /* 02E64 80A77174 2484C114 */ addiu $a0, $a0, 0xC114 ## $a0 = 0600C114 /* 02E68 80A77178 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 02E6C 80A7717C 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 /* 02E70 80A77180 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 -/* 02E74 80A77184 468021A0 */ cvt.s.w $f6, $f4 +/* 02E74 80A77184 468021A0 */ cvt.s.w $f6, $f4 /* 02E78 80A77188 240E0002 */ addiu $t6, $zero, 0x0002 ## $t6 = 00000002 -/* 02E7C 80A7718C 44070000 */ mfc1 $a3, $f0 -/* 02E80 80A77190 AFAE0014 */ sw $t6, 0x0014($sp) +/* 02E7C 80A7718C 44070000 */ mfc1 $a3, $f0 +/* 02E80 80A77190 AFAE0014 */ sw $t6, 0x0014($sp) /* 02E84 80A77194 24A5C114 */ addiu $a1, $a1, 0xC114 ## $a1 = 0600C114 /* 02E88 80A77198 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C -/* 02E8C 80A7719C E7A60010 */ swc1 $f6, 0x0010($sp) +/* 02E8C 80A7719C E7A60010 */ swc1 $f6, 0x0010($sp) /* 02E90 80A771A0 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 02E94 80A771A4 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 02E98 80A771A8 E7A00018 */ swc1 $f0, 0x0018($sp) +/* 02E94 80A771A4 0C029468 */ jal SkelAnime_ChangeAnim + +/* 02E98 80A771A8 E7A00018 */ swc1 $f0, 0x0018($sp) /* 02E9C 80A771AC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02EA0 80A771B0 8FA50034 */ lw $a1, 0x0034($sp) -/* 02EA4 80A771B4 0C29DC30 */ jal func_80A770C0 +/* 02EA0 80A771B0 8FA50034 */ lw $a1, 0x0034($sp) +/* 02EA4 80A771B4 0C29DC30 */ jal func_80A770C0 /* 02EA8 80A771B8 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 /* 02EAC 80A771BC 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 /* 02EB0 80A771C0 240F00FF */ addiu $t7, $zero, 0x00FF ## $t7 = 000000FF /* 02EB4 80A771C4 AE0204C8 */ sw $v0, 0x04C8($s0) ## 000004C8 /* 02EB8 80A771C8 AE0204CC */ sw $v0, 0x04CC($s0) ## 000004CC /* 02EBC 80A771CC A20F00C8 */ sb $t7, 0x00C8($s0) ## 000000C8 -/* 02EC0 80A771D0 8FBF002C */ lw $ra, 0x002C($sp) -/* 02EC4 80A771D4 8FB00028 */ lw $s0, 0x0028($sp) +/* 02EC0 80A771D0 8FBF002C */ lw $ra, 0x002C($sp) +/* 02EC4 80A771D4 8FB00028 */ lw $s0, 0x0028($sp) /* 02EC8 80A771D8 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 02ECC 80A771DC 03E00008 */ jr $ra +/* 02ECC 80A771DC 03E00008 */ jr $ra /* 02ED0 80A771E0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A771E4.s b/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A771E4.s index 07c76bb0e6..535b71141c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A771E4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A771E4.s @@ -1,26 +1,26 @@ glabel func_80A771E4 /* 02ED4 80A771E4 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 02ED8 80A771E8 AFB00028 */ sw $s0, 0x0028($sp) +/* 02ED8 80A771E8 AFB00028 */ sw $s0, 0x0028($sp) /* 02EDC 80A771EC 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 02EE0 80A771F0 AFBF002C */ sw $ra, 0x002C($sp) +/* 02EE0 80A771F0 AFBF002C */ sw $ra, 0x002C($sp) /* 02EE4 80A771F4 3C040601 */ lui $a0, 0x0601 ## $a0 = 06010000 /* 02EE8 80A771F8 0C028800 */ jal SkelAnime_GetFrameCount - + /* 02EEC 80A771FC 2484C114 */ addiu $a0, $a0, 0xC114 ## $a0 = 0600C114 /* 02EF0 80A77200 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 02EF4 80A77204 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 /* 02EF8 80A77208 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 -/* 02EFC 80A7720C 468021A0 */ cvt.s.w $f6, $f4 +/* 02EFC 80A7720C 468021A0 */ cvt.s.w $f6, $f4 /* 02F00 80A77210 240E0002 */ addiu $t6, $zero, 0x0002 ## $t6 = 00000002 -/* 02F04 80A77214 44070000 */ mfc1 $a3, $f0 -/* 02F08 80A77218 AFAE0014 */ sw $t6, 0x0014($sp) +/* 02F04 80A77214 44070000 */ mfc1 $a3, $f0 +/* 02F08 80A77218 AFAE0014 */ sw $t6, 0x0014($sp) /* 02F0C 80A7721C 24A5C114 */ addiu $a1, $a1, 0xC114 ## $a1 = 0600C114 /* 02F10 80A77220 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C -/* 02F14 80A77224 E7A60010 */ swc1 $f6, 0x0010($sp) +/* 02F14 80A77224 E7A60010 */ swc1 $f6, 0x0010($sp) /* 02F18 80A77228 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 02F1C 80A7722C 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 02F20 80A77230 E7A00018 */ swc1 $f0, 0x0018($sp) +/* 02F1C 80A7722C 0C029468 */ jal SkelAnime_ChangeAnim + +/* 02F20 80A77230 E7A00018 */ swc1 $f0, 0x0018($sp) /* 02F24 80A77234 240F0002 */ addiu $t7, $zero, 0x0002 ## $t7 = 00000002 /* 02F28 80A77238 24180001 */ addiu $t8, $zero, 0x0001 ## $t8 = 00000001 /* 02F2C 80A7723C 241900FF */ addiu $t9, $zero, 0x00FF ## $t9 = 000000FF @@ -28,10 +28,10 @@ glabel func_80A771E4 /* 02F34 80A77244 AE1804CC */ sw $t8, 0x04CC($s0) ## 000004CC /* 02F38 80A77248 AE0004D4 */ sw $zero, 0x04D4($s0) ## 000004D4 /* 02F3C 80A7724C A21900C8 */ sb $t9, 0x00C8($s0) ## 000000C8 -/* 02F40 80A77250 8FBF002C */ lw $ra, 0x002C($sp) -/* 02F44 80A77254 8FB00028 */ lw $s0, 0x0028($sp) +/* 02F40 80A77250 8FBF002C */ lw $ra, 0x002C($sp) +/* 02F44 80A77254 8FB00028 */ lw $s0, 0x0028($sp) /* 02F48 80A77258 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 02F4C 80A7725C 03E00008 */ jr $ra +/* 02F4C 80A7725C 03E00008 */ jr $ra /* 02F50 80A77260 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A7735C.s b/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A7735C.s index 422b709fb0..8787948de3 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A7735C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A7735C.s @@ -1,59 +1,59 @@ glabel func_80A7735C /* 0304C 80A7735C 27BDFFB8 */ addiu $sp, $sp, 0xFFB8 ## $sp = FFFFFFB8 -/* 03050 80A77360 AFB00028 */ sw $s0, 0x0028($sp) +/* 03050 80A77360 AFB00028 */ sw $s0, 0x0028($sp) /* 03054 80A77364 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 03058 80A77368 AFBF002C */ sw $ra, 0x002C($sp) +/* 03058 80A77368 AFBF002C */ sw $ra, 0x002C($sp) /* 0305C 80A7736C 3C040602 */ lui $a0, 0x0602 ## $a0 = 06020000 -/* 03060 80A77370 AFA5004C */ sw $a1, 0x004C($sp) +/* 03060 80A77370 AFA5004C */ sw $a1, 0x004C($sp) /* 03064 80A77374 0C028800 */ jal SkelAnime_GetFrameCount - + /* 03068 80A77378 248403D8 */ addiu $a0, $a0, 0x03D8 ## $a0 = 060203D8 /* 0306C 80A7737C 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 03070 80A77380 2605014C */ addiu $a1, $s0, 0x014C ## $a1 = 0000014C /* 03074 80A77384 3C060602 */ lui $a2, 0x0602 ## $a2 = 06020000 -/* 03078 80A77388 468021A0 */ cvt.s.w $f6, $f4 +/* 03078 80A77388 468021A0 */ cvt.s.w $f6, $f4 /* 0307C 80A7738C 260E0190 */ addiu $t6, $s0, 0x0190 ## $t6 = 00000190 /* 03080 80A77390 260F0244 */ addiu $t7, $s0, 0x0244 ## $t7 = 00000244 /* 03084 80A77394 2418001E */ addiu $t8, $zero, 0x001E ## $t8 = 0000001E -/* 03088 80A77398 AFB80018 */ sw $t8, 0x0018($sp) -/* 0308C 80A7739C AFAF0014 */ sw $t7, 0x0014($sp) -/* 03090 80A773A0 E7A60038 */ swc1 $f6, 0x0038($sp) -/* 03094 80A773A4 AFAE0010 */ sw $t6, 0x0010($sp) +/* 03088 80A77398 AFB80018 */ sw $t8, 0x0018($sp) +/* 0308C 80A7739C AFAF0014 */ sw $t7, 0x0014($sp) +/* 03090 80A773A0 E7A60038 */ swc1 $f6, 0x0038($sp) +/* 03094 80A773A4 AFAE0010 */ sw $t6, 0x0010($sp) /* 03098 80A773A8 24C605C0 */ addiu $a2, $a2, 0x05C0 ## $a2 = 060205C0 -/* 0309C 80A773AC AFA50034 */ sw $a1, 0x0034($sp) -/* 030A0 80A773B0 8FA4004C */ lw $a0, 0x004C($sp) -/* 030A4 80A773B4 0C0291BE */ jal func_800A46F8 +/* 0309C 80A773AC AFA50034 */ sw $a1, 0x0034($sp) +/* 030A0 80A773B0 8FA4004C */ lw $a0, 0x004C($sp) +/* 030A4 80A773B4 0C0291BE */ jal SkelAnime_InitSV /* 030A8 80A773B8 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 /* 030AC 80A773BC 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 030B0 80A773C0 C7A80038 */ lwc1 $f8, 0x0038($sp) +/* 030B0 80A773C0 C7A80038 */ lwc1 $f8, 0x0038($sp) /* 030B4 80A773C4 3C050602 */ lui $a1, 0x0602 ## $a1 = 06020000 /* 030B8 80A773C8 24190002 */ addiu $t9, $zero, 0x0002 ## $t9 = 00000002 -/* 030BC 80A773CC 44070000 */ mfc1 $a3, $f0 -/* 030C0 80A773D0 AFB90014 */ sw $t9, 0x0014($sp) +/* 030BC 80A773CC 44070000 */ mfc1 $a3, $f0 +/* 030C0 80A773D0 AFB90014 */ sw $t9, 0x0014($sp) /* 030C4 80A773D4 24A503D8 */ addiu $a1, $a1, 0x03D8 ## $a1 = 060203D8 -/* 030C8 80A773D8 8FA40034 */ lw $a0, 0x0034($sp) +/* 030C8 80A773D8 8FA40034 */ lw $a0, 0x0034($sp) /* 030CC 80A773DC 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 030D0 80A773E0 E7A80010 */ swc1 $f8, 0x0010($sp) -/* 030D4 80A773E4 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 030D8 80A773E8 E7A00018 */ swc1 $f0, 0x0018($sp) +/* 030D0 80A773E0 E7A80010 */ swc1 $f8, 0x0010($sp) +/* 030D4 80A773E4 0C029468 */ jal SkelAnime_ChangeAnim + +/* 030D8 80A773E8 E7A00018 */ swc1 $f0, 0x0018($sp) /* 030DC 80A773EC 24080003 */ addiu $t0, $zero, 0x0003 ## $t0 = 00000003 /* 030E0 80A773F0 24090002 */ addiu $t1, $zero, 0x0002 ## $t1 = 00000002 /* 030E4 80A773F4 AE0804C8 */ sw $t0, 0x04C8($s0) ## 000004C8 /* 030E8 80A773F8 AE0904CC */ sw $t1, 0x04CC($s0) ## 000004CC -/* 030EC 80A773FC 8FA5004C */ lw $a1, 0x004C($sp) +/* 030EC 80A773FC 8FA5004C */ lw $a1, 0x004C($sp) /* 030F0 80A77400 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 030F4 80A77404 0C29DC30 */ jal func_80A770C0 +/* 030F4 80A77404 0C29DC30 */ jal func_80A770C0 /* 030F8 80A77408 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 /* 030FC 80A7740C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 03100 80A77410 0C29DCBB */ jal func_80A772EC -/* 03104 80A77414 8FA5004C */ lw $a1, 0x004C($sp) +/* 03100 80A77410 0C29DCBB */ jal func_80A772EC +/* 03104 80A77414 8FA5004C */ lw $a1, 0x004C($sp) /* 03108 80A77418 240A00FF */ addiu $t2, $zero, 0x00FF ## $t2 = 000000FF /* 0310C 80A7741C A20A00C8 */ sb $t2, 0x00C8($s0) ## 000000C8 -/* 03110 80A77420 8FBF002C */ lw $ra, 0x002C($sp) -/* 03114 80A77424 8FB00028 */ lw $s0, 0x0028($sp) +/* 03110 80A77420 8FBF002C */ lw $ra, 0x002C($sp) +/* 03114 80A77424 8FB00028 */ lw $s0, 0x0028($sp) /* 03118 80A77428 27BD0048 */ addiu $sp, $sp, 0x0048 ## $sp = 00000000 -/* 0311C 80A7742C 03E00008 */ jr $ra +/* 0311C 80A7742C 03E00008 */ jr $ra /* 03120 80A77430 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A7759C.s b/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A7759C.s index c863c16048..7a2c1f6ada 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A7759C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A7759C.s @@ -11,7 +11,7 @@ glabel func_80A7759C /* 032B0 80A775C0 24C68728 */ addiu $a2, $a2, %lo(D_80A78728) ## $a2 = 80A78728 /* 032B4 80A775C4 27A40058 */ addiu $a0, $sp, 0x0058 ## $a0 = FFFFFFE8 /* 032B8 80A775C8 240700CF */ addiu $a3, $zero, 0x00CF ## $a3 = 000000CF -/* 032BC 80A775CC 0C031AB1 */ jal func_800C6AC4 +/* 032BC 80A775CC 0C031AB1 */ jal Graph_OpenDisps /* 032C0 80A775D0 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 032C4 80A775D4 8FAF0074 */ lw $t7, 0x0074($sp) /* 032C8 80A775D8 25F8FFF3 */ addiu $t8, $t7, 0xFFF3 ## $t8 = FFFFFFF3 @@ -169,7 +169,7 @@ glabel L80A77818 /* 0350C 80A7781C 24C687B8 */ addiu $a2, $a2, %lo(D_80A787B8) ## $a2 = 80A787B8 /* 03510 80A77820 27A40058 */ addiu $a0, $sp, 0x0058 ## $a0 = FFFFFFE8 /* 03514 80A77824 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 03518 80A77828 0C031AD5 */ jal func_800C6B54 +/* 03518 80A77828 0C031AD5 */ jal Graph_CloseDisps /* 0351C 80A7782C 24070130 */ addiu $a3, $zero, 0x0130 ## $a3 = 00000130 /* 03520 80A77830 8FBF001C */ lw $ra, 0x001C($sp) /* 03524 80A77834 8FB00018 */ lw $s0, 0x0018($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A77844.s b/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A77844.s index 0ffd2f3da8..a263487284 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A77844.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A77844.s @@ -1,23 +1,23 @@ glabel func_80A77844 /* 03534 80A77844 27BDFF98 */ addiu $sp, $sp, 0xFF98 ## $sp = FFFFFF98 -/* 03538 80A77848 AFBF002C */ sw $ra, 0x002C($sp) -/* 0353C 80A7784C AFB00028 */ sw $s0, 0x0028($sp) -/* 03540 80A77850 AFA40068 */ sw $a0, 0x0068($sp) -/* 03544 80A77854 AFA5006C */ sw $a1, 0x006C($sp) +/* 03538 80A77848 AFBF002C */ sw $ra, 0x002C($sp) +/* 0353C 80A7784C AFB00028 */ sw $s0, 0x0028($sp) +/* 03540 80A77850 AFA40068 */ sw $a0, 0x0068($sp) +/* 03544 80A77854 AFA5006C */ sw $a1, 0x006C($sp) /* 03548 80A77858 8CB00000 */ lw $s0, 0x0000($a1) ## 00000000 /* 0354C 80A7785C 3C0680A8 */ lui $a2, %hi(D_80A787D0) ## $a2 = 80A80000 /* 03550 80A77860 24C687D0 */ addiu $a2, $a2, %lo(D_80A787D0) ## $a2 = 80A787D0 /* 03554 80A77864 27A40044 */ addiu $a0, $sp, 0x0044 ## $a0 = FFFFFFDC /* 03558 80A77868 24070142 */ addiu $a3, $zero, 0x0142 ## $a3 = 00000142 -/* 0355C 80A7786C 0C031AB1 */ jal func_800C6AC4 +/* 0355C 80A7786C 0C031AB1 */ jal Graph_OpenDisps /* 03560 80A77870 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 03564 80A77874 8FA40068 */ lw $a0, 0x0068($sp) -/* 03568 80A77878 8FA5006C */ lw $a1, 0x006C($sp) -/* 0356C 80A7787C 0C00BAF3 */ jal func_8002EBCC +/* 03564 80A77874 8FA40068 */ lw $a0, 0x0068($sp) +/* 03568 80A77878 8FA5006C */ lw $a1, 0x006C($sp) +/* 0356C 80A7787C 0C00BAF3 */ jal func_8002EBCC /* 03570 80A77880 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 03574 80A77884 0C024F46 */ jal func_80093D18 +/* 03574 80A77884 0C024F46 */ jal func_80093D18 /* 03578 80A77888 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0357C 80A7788C 0C024F61 */ jal func_80093D84 +/* 0357C 80A7788C 0C024F61 */ jal func_80093D84 /* 03580 80A77890 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 03584 80A77894 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 /* 03588 80A77898 3C18DB06 */ lui $t8, 0xDB06 ## $t8 = DB060000 @@ -27,16 +27,16 @@ glabel func_80A77844 /* 03598 80A778A8 AC580000 */ sw $t8, 0x0000($v0) ## 00000000 /* 0359C 80A778AC 2419001E */ addiu $t9, $zero, 0x001E ## $t9 = 0000001E /* 035A0 80A778B0 2408001E */ addiu $t0, $zero, 0x001E ## $t0 = 0000001E -/* 035A4 80A778B4 AFA80014 */ sw $t0, 0x0014($sp) -/* 035A8 80A778B8 AFB90010 */ sw $t9, 0x0010($sp) -/* 035AC 80A778BC AFA00018 */ sw $zero, 0x0018($sp) +/* 035A4 80A778B4 AFA80014 */ sw $t0, 0x0014($sp) +/* 035A8 80A778B8 AFB90010 */ sw $t9, 0x0010($sp) +/* 035AC 80A778BC AFA00018 */ sw $zero, 0x0018($sp) /* 035B0 80A778C0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 035B4 80A778C4 240500F5 */ addiu $a1, $zero, 0x00F5 ## $a1 = 000000F5 /* 035B8 80A778C8 240600E1 */ addiu $a2, $zero, 0x00E1 ## $a2 = 000000E1 /* 035BC 80A778CC 2407009B */ addiu $a3, $zero, 0x009B ## $a3 = 0000009B -/* 035C0 80A778D0 0C29D86C */ jal func_80A761B0 -/* 035C4 80A778D4 AFA20040 */ sw $v0, 0x0040($sp) -/* 035C8 80A778D8 8FA30040 */ lw $v1, 0x0040($sp) +/* 035C0 80A778D0 0C29D86C */ jal func_80A761B0 +/* 035C4 80A778D4 AFA20040 */ sw $v0, 0x0040($sp) +/* 035C8 80A778D8 8FA30040 */ lw $v1, 0x0040($sp) /* 035CC 80A778DC 3C0ADB06 */ lui $t2, 0xDB06 ## $t2 = DB060000 /* 035D0 80A778E0 354A0024 */ ori $t2, $t2, 0x0024 ## $t2 = DB060024 /* 035D4 80A778E4 AC620004 */ sw $v0, 0x0004($v1) ## 00000004 @@ -46,15 +46,15 @@ glabel func_80A77844 /* 035E4 80A778F4 24490008 */ addiu $t1, $v0, 0x0008 ## $t1 = 00000008 /* 035E8 80A778F8 AE0902C0 */ sw $t1, 0x02C0($s0) ## 000002C0 /* 035EC 80A778FC AC4A0000 */ sw $t2, 0x0000($v0) ## 00000000 -/* 035F0 80A77900 AFA00018 */ sw $zero, 0x0018($sp) -/* 035F4 80A77904 AFA00014 */ sw $zero, 0x0014($sp) -/* 035F8 80A77908 AFAB0010 */ sw $t3, 0x0010($sp) +/* 035F0 80A77900 AFA00018 */ sw $zero, 0x0018($sp) +/* 035F4 80A77904 AFA00014 */ sw $zero, 0x0014($sp) +/* 035F8 80A77908 AFAB0010 */ sw $t3, 0x0010($sp) /* 035FC 80A7790C 240500FF */ addiu $a1, $zero, 0x00FF ## $a1 = 000000FF /* 03600 80A77910 24060028 */ addiu $a2, $zero, 0x0028 ## $a2 = 00000028 /* 03604 80A77914 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 03608 80A77918 0C29D86C */ jal func_80A761B0 -/* 0360C 80A7791C AFA2003C */ sw $v0, 0x003C($sp) -/* 03610 80A77920 8FA3003C */ lw $v1, 0x003C($sp) +/* 03608 80A77918 0C29D86C */ jal func_80A761B0 +/* 0360C 80A7791C AFA2003C */ sw $v0, 0x003C($sp) +/* 03610 80A77920 8FA3003C */ lw $v1, 0x003C($sp) /* 03614 80A77924 3C0DDB06 */ lui $t5, 0xDB06 ## $t5 = DB060000 /* 03618 80A77928 35AD0028 */ ori $t5, $t5, 0x0028 ## $t5 = DB060028 /* 0361C 80A7792C AC620004 */ sw $v0, 0x0004($v1) ## 00000004 @@ -65,41 +65,41 @@ glabel func_80A77844 /* 03630 80A77940 AE0C02C0 */ sw $t4, 0x02C0($s0) ## 000002C0 /* 03634 80A77944 AC4D0000 */ sw $t5, 0x0000($v0) ## 00000000 /* 03638 80A77948 2418001E */ addiu $t8, $zero, 0x001E ## $t8 = 0000001E -/* 0363C 80A7794C AFB80018 */ sw $t8, 0x0018($sp) -/* 03640 80A77950 AFAF0014 */ sw $t7, 0x0014($sp) -/* 03644 80A77954 AFAE0010 */ sw $t6, 0x0010($sp) +/* 0363C 80A7794C AFB80018 */ sw $t8, 0x0018($sp) +/* 03640 80A77950 AFAF0014 */ sw $t7, 0x0014($sp) +/* 03644 80A77954 AFAE0010 */ sw $t6, 0x0010($sp) /* 03648 80A77958 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 0364C 80A7795C 240500FF */ addiu $a1, $zero, 0x00FF ## $a1 = 000000FF /* 03650 80A77960 240600FF */ addiu $a2, $zero, 0x00FF ## $a2 = 000000FF /* 03654 80A77964 240700FF */ addiu $a3, $zero, 0x00FF ## $a3 = 000000FF -/* 03658 80A77968 0C29D86C */ jal func_80A761B0 -/* 0365C 80A7796C AFA20038 */ sw $v0, 0x0038($sp) -/* 03660 80A77970 8FA30038 */ lw $v1, 0x0038($sp) +/* 03658 80A77968 0C29D86C */ jal func_80A761B0 +/* 0365C 80A7796C AFA20038 */ sw $v0, 0x0038($sp) +/* 03660 80A77970 8FA30038 */ lw $v1, 0x0038($sp) /* 03664 80A77974 3C1980A7 */ lui $t9, %hi(func_80A77530) ## $t9 = 80A70000 /* 03668 80A77978 3C0880A7 */ lui $t0, %hi(func_80A7759C) ## $t0 = 80A70000 /* 0366C 80A7797C AC620004 */ sw $v0, 0x0004($v1) ## 00000004 -/* 03670 80A77980 8FA30068 */ lw $v1, 0x0068($sp) +/* 03670 80A77980 8FA30068 */ lw $v1, 0x0068($sp) /* 03674 80A77984 2508759C */ addiu $t0, $t0, %lo(func_80A7759C) ## $t0 = 80A7759C /* 03678 80A77988 27397530 */ addiu $t9, $t9, %lo(func_80A77530) ## $t9 = 80A77530 /* 0367C 80A7798C 2462014C */ addiu $v0, $v1, 0x014C ## $v0 = 0000014C /* 03680 80A77990 8C450004 */ lw $a1, 0x0004($v0) ## 00000150 /* 03684 80A77994 8C460020 */ lw $a2, 0x0020($v0) ## 0000016C /* 03688 80A77998 90470002 */ lbu $a3, 0x0002($v0) ## 0000014E -/* 0368C 80A7799C AFA80014 */ sw $t0, 0x0014($sp) -/* 03690 80A779A0 AFB90010 */ sw $t9, 0x0010($sp) -/* 03694 80A779A4 8FA4006C */ lw $a0, 0x006C($sp) -/* 03698 80A779A8 0C0286B2 */ jal func_800A1AC8 -/* 0369C 80A779AC AFA30018 */ sw $v1, 0x0018($sp) +/* 0368C 80A7799C AFA80014 */ sw $t0, 0x0014($sp) +/* 03690 80A779A0 AFB90010 */ sw $t9, 0x0010($sp) +/* 03694 80A779A4 8FA4006C */ lw $a0, 0x006C($sp) +/* 03698 80A779A8 0C0286B2 */ jal SkelAnime_DrawSV +/* 0369C 80A779AC AFA30018 */ sw $v1, 0x0018($sp) /* 036A0 80A779B0 3C0680A8 */ lui $a2, %hi(D_80A787E8) ## $a2 = 80A80000 /* 036A4 80A779B4 24C687E8 */ addiu $a2, $a2, %lo(D_80A787E8) ## $a2 = 80A787E8 /* 036A8 80A779B8 27A40044 */ addiu $a0, $sp, 0x0044 ## $a0 = FFFFFFDC /* 036AC 80A779BC 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 036B0 80A779C0 0C031AD5 */ jal func_800C6B54 +/* 036B0 80A779C0 0C031AD5 */ jal Graph_CloseDisps /* 036B4 80A779C4 24070159 */ addiu $a3, $zero, 0x0159 ## $a3 = 00000159 -/* 036B8 80A779C8 8FBF002C */ lw $ra, 0x002C($sp) -/* 036BC 80A779CC 8FB00028 */ lw $s0, 0x0028($sp) +/* 036B8 80A779C8 8FBF002C */ lw $ra, 0x002C($sp) +/* 036BC 80A779CC 8FB00028 */ lw $s0, 0x0028($sp) /* 036C0 80A779D0 27BD0068 */ addiu $sp, $sp, 0x0068 ## $sp = 00000000 -/* 036C4 80A779D4 03E00008 */ jr $ra +/* 036C4 80A779D4 03E00008 */ jr $ra /* 036C8 80A779D8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A77C7C.s b/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A77C7C.s index 743a6d0987..5380efab95 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A77C7C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A77C7C.s @@ -11,7 +11,7 @@ glabel func_80A77C7C /* 03990 80A77CA0 24C6887C */ addiu $a2, $a2, %lo(D_80A7887C) ## $a2 = 80A7887C /* 03994 80A77CA4 27A40050 */ addiu $a0, $sp, 0x0050 ## $a0 = FFFFFFE8 /* 03998 80A77CA8 2407023B */ addiu $a3, $zero, 0x023B ## $a3 = 0000023B -/* 0399C 80A77CAC 0C031AB1 */ jal func_800C6AC4 +/* 0399C 80A77CAC 0C031AB1 */ jal Graph_OpenDisps /* 039A0 80A77CB0 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 039A4 80A77CB4 8FAF006C */ lw $t7, 0x006C($sp) /* 039A8 80A77CB8 25F8FFF4 */ addiu $t8, $t7, 0xFFF4 ## $t8 = FFFFFFF4 @@ -148,7 +148,7 @@ glabel L80A77EA4 /* 03B98 80A77EA8 24C68924 */ addiu $a2, $a2, %lo(D_80A78924) ## $a2 = 80A78924 /* 03B9C 80A77EAC 27A40050 */ addiu $a0, $sp, 0x0050 ## $a0 = FFFFFFE8 /* 03BA0 80A77EB0 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 03BA4 80A77EB4 0C031AD5 */ jal func_800C6B54 +/* 03BA4 80A77EB4 0C031AD5 */ jal Graph_CloseDisps /* 03BA8 80A77EB8 2407025C */ addiu $a3, $zero, 0x025C ## $a3 = 0000025C /* 03BAC 80A77EBC 8FBF001C */ lw $ra, 0x001C($sp) /* 03BB0 80A77EC0 8FB00018 */ lw $s0, 0x0018($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A77EDC.s b/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A77EDC.s index 54bf18764f..fa539c486e 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A77EDC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A77EDC.s @@ -1,23 +1,23 @@ glabel func_80A77EDC /* 03BCC 80A77EDC 27BDFF98 */ addiu $sp, $sp, 0xFF98 ## $sp = FFFFFF98 -/* 03BD0 80A77EE0 AFBF002C */ sw $ra, 0x002C($sp) -/* 03BD4 80A77EE4 AFB00028 */ sw $s0, 0x0028($sp) -/* 03BD8 80A77EE8 AFA40068 */ sw $a0, 0x0068($sp) -/* 03BDC 80A77EEC AFA5006C */ sw $a1, 0x006C($sp) +/* 03BD0 80A77EE0 AFBF002C */ sw $ra, 0x002C($sp) +/* 03BD4 80A77EE4 AFB00028 */ sw $s0, 0x0028($sp) +/* 03BD8 80A77EE8 AFA40068 */ sw $a0, 0x0068($sp) +/* 03BDC 80A77EEC AFA5006C */ sw $a1, 0x006C($sp) /* 03BE0 80A77EF0 8CB00000 */ lw $s0, 0x0000($a1) ## 00000000 /* 03BE4 80A77EF4 3C0680A8 */ lui $a2, %hi(D_80A78940) ## $a2 = 80A80000 /* 03BE8 80A77EF8 24C68940 */ addiu $a2, $a2, %lo(D_80A78940) ## $a2 = 80A78940 /* 03BEC 80A77EFC 27A40044 */ addiu $a0, $sp, 0x0044 ## $a0 = FFFFFFDC /* 03BF0 80A77F00 24070276 */ addiu $a3, $zero, 0x0276 ## $a3 = 00000276 -/* 03BF4 80A77F04 0C031AB1 */ jal func_800C6AC4 +/* 03BF4 80A77F04 0C031AB1 */ jal Graph_OpenDisps /* 03BF8 80A77F08 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 03BFC 80A77F0C 8FA40068 */ lw $a0, 0x0068($sp) -/* 03C00 80A77F10 8FA5006C */ lw $a1, 0x006C($sp) -/* 03C04 80A77F14 0C00BAF3 */ jal func_8002EBCC +/* 03BFC 80A77F0C 8FA40068 */ lw $a0, 0x0068($sp) +/* 03C00 80A77F10 8FA5006C */ lw $a1, 0x006C($sp) +/* 03C04 80A77F14 0C00BAF3 */ jal func_8002EBCC /* 03C08 80A77F18 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 03C0C 80A77F1C 0C024F46 */ jal func_80093D18 +/* 03C0C 80A77F1C 0C024F46 */ jal func_80093D18 /* 03C10 80A77F20 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 03C14 80A77F24 0C024F61 */ jal func_80093D84 +/* 03C14 80A77F24 0C024F61 */ jal func_80093D84 /* 03C18 80A77F28 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 03C1C 80A77F2C 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 /* 03C20 80A77F30 3C18DB06 */ lui $t8, 0xDB06 ## $t8 = DB060000 @@ -27,16 +27,16 @@ glabel func_80A77EDC /* 03C30 80A77F40 AC580000 */ sw $t8, 0x0000($v0) ## 00000000 /* 03C34 80A77F44 2419001E */ addiu $t9, $zero, 0x001E ## $t9 = 0000001E /* 03C38 80A77F48 2408001E */ addiu $t0, $zero, 0x001E ## $t0 = 0000001E -/* 03C3C 80A77F4C AFA80014 */ sw $t0, 0x0014($sp) -/* 03C40 80A77F50 AFB90010 */ sw $t9, 0x0010($sp) -/* 03C44 80A77F54 AFA00018 */ sw $zero, 0x0018($sp) +/* 03C3C 80A77F4C AFA80014 */ sw $t0, 0x0014($sp) +/* 03C40 80A77F50 AFB90010 */ sw $t9, 0x0010($sp) +/* 03C44 80A77F54 AFA00018 */ sw $zero, 0x0018($sp) /* 03C48 80A77F58 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 03C4C 80A77F5C 240500F5 */ addiu $a1, $zero, 0x00F5 ## $a1 = 000000F5 /* 03C50 80A77F60 240600E1 */ addiu $a2, $zero, 0x00E1 ## $a2 = 000000E1 /* 03C54 80A77F64 2407009B */ addiu $a3, $zero, 0x009B ## $a3 = 0000009B -/* 03C58 80A77F68 0C29D86C */ jal func_80A761B0 -/* 03C5C 80A77F6C AFA20040 */ sw $v0, 0x0040($sp) -/* 03C60 80A77F70 8FA30040 */ lw $v1, 0x0040($sp) +/* 03C58 80A77F68 0C29D86C */ jal func_80A761B0 +/* 03C5C 80A77F6C AFA20040 */ sw $v0, 0x0040($sp) +/* 03C60 80A77F70 8FA30040 */ lw $v1, 0x0040($sp) /* 03C64 80A77F74 3C0ADB06 */ lui $t2, 0xDB06 ## $t2 = DB060000 /* 03C68 80A77F78 354A0024 */ ori $t2, $t2, 0x0024 ## $t2 = DB060024 /* 03C6C 80A77F7C AC620004 */ sw $v0, 0x0004($v1) ## 00000004 @@ -46,15 +46,15 @@ glabel func_80A77EDC /* 03C7C 80A77F8C 24490008 */ addiu $t1, $v0, 0x0008 ## $t1 = 00000008 /* 03C80 80A77F90 AE0902C0 */ sw $t1, 0x02C0($s0) ## 000002C0 /* 03C84 80A77F94 AC4A0000 */ sw $t2, 0x0000($v0) ## 00000000 -/* 03C88 80A77F98 AFA00018 */ sw $zero, 0x0018($sp) -/* 03C8C 80A77F9C AFA00014 */ sw $zero, 0x0014($sp) -/* 03C90 80A77FA0 AFAB0010 */ sw $t3, 0x0010($sp) +/* 03C88 80A77F98 AFA00018 */ sw $zero, 0x0018($sp) +/* 03C8C 80A77F9C AFA00014 */ sw $zero, 0x0014($sp) +/* 03C90 80A77FA0 AFAB0010 */ sw $t3, 0x0010($sp) /* 03C94 80A77FA4 240500FF */ addiu $a1, $zero, 0x00FF ## $a1 = 000000FF /* 03C98 80A77FA8 24060028 */ addiu $a2, $zero, 0x0028 ## $a2 = 00000028 /* 03C9C 80A77FAC 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 03CA0 80A77FB0 0C29D86C */ jal func_80A761B0 -/* 03CA4 80A77FB4 AFA2003C */ sw $v0, 0x003C($sp) -/* 03CA8 80A77FB8 8FA3003C */ lw $v1, 0x003C($sp) +/* 03CA0 80A77FB0 0C29D86C */ jal func_80A761B0 +/* 03CA4 80A77FB4 AFA2003C */ sw $v0, 0x003C($sp) +/* 03CA8 80A77FB8 8FA3003C */ lw $v1, 0x003C($sp) /* 03CAC 80A77FBC 3C0DDB06 */ lui $t5, 0xDB06 ## $t5 = DB060000 /* 03CB0 80A77FC0 35AD0028 */ ori $t5, $t5, 0x0028 ## $t5 = DB060028 /* 03CB4 80A77FC4 AC620004 */ sw $v0, 0x0004($v1) ## 00000004 @@ -65,41 +65,41 @@ glabel func_80A77EDC /* 03CC8 80A77FD8 AE0C02C0 */ sw $t4, 0x02C0($s0) ## 000002C0 /* 03CCC 80A77FDC AC4D0000 */ sw $t5, 0x0000($v0) ## 00000000 /* 03CD0 80A77FE0 2418001E */ addiu $t8, $zero, 0x001E ## $t8 = 0000001E -/* 03CD4 80A77FE4 AFB80018 */ sw $t8, 0x0018($sp) -/* 03CD8 80A77FE8 AFAF0014 */ sw $t7, 0x0014($sp) -/* 03CDC 80A77FEC AFAE0010 */ sw $t6, 0x0010($sp) +/* 03CD4 80A77FE4 AFB80018 */ sw $t8, 0x0018($sp) +/* 03CD8 80A77FE8 AFAF0014 */ sw $t7, 0x0014($sp) +/* 03CDC 80A77FEC AFAE0010 */ sw $t6, 0x0010($sp) /* 03CE0 80A77FF0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 03CE4 80A77FF4 240500FF */ addiu $a1, $zero, 0x00FF ## $a1 = 000000FF /* 03CE8 80A77FF8 240600FF */ addiu $a2, $zero, 0x00FF ## $a2 = 000000FF /* 03CEC 80A77FFC 240700FF */ addiu $a3, $zero, 0x00FF ## $a3 = 000000FF -/* 03CF0 80A78000 0C29D86C */ jal func_80A761B0 -/* 03CF4 80A78004 AFA20038 */ sw $v0, 0x0038($sp) -/* 03CF8 80A78008 8FA30038 */ lw $v1, 0x0038($sp) +/* 03CF0 80A78000 0C29D86C */ jal func_80A761B0 +/* 03CF4 80A78004 AFA20038 */ sw $v0, 0x0038($sp) +/* 03CF8 80A78008 8FA30038 */ lw $v1, 0x0038($sp) /* 03CFC 80A7800C 3C1980A7 */ lui $t9, %hi(func_80A77BF8) ## $t9 = 80A70000 /* 03D00 80A78010 3C0880A7 */ lui $t0, %hi(func_80A77C7C) ## $t0 = 80A70000 /* 03D04 80A78014 AC620004 */ sw $v0, 0x0004($v1) ## 00000004 -/* 03D08 80A78018 8FA30068 */ lw $v1, 0x0068($sp) +/* 03D08 80A78018 8FA30068 */ lw $v1, 0x0068($sp) /* 03D0C 80A7801C 25087C7C */ addiu $t0, $t0, %lo(func_80A77C7C) ## $t0 = 80A77C7C /* 03D10 80A78020 27397BF8 */ addiu $t9, $t9, %lo(func_80A77BF8) ## $t9 = 80A77BF8 /* 03D14 80A78024 2462014C */ addiu $v0, $v1, 0x014C ## $v0 = 0000014C /* 03D18 80A78028 8C450004 */ lw $a1, 0x0004($v0) ## 00000150 /* 03D1C 80A7802C 8C460020 */ lw $a2, 0x0020($v0) ## 0000016C /* 03D20 80A78030 90470002 */ lbu $a3, 0x0002($v0) ## 0000014E -/* 03D24 80A78034 AFA80014 */ sw $t0, 0x0014($sp) -/* 03D28 80A78038 AFB90010 */ sw $t9, 0x0010($sp) -/* 03D2C 80A7803C 8FA4006C */ lw $a0, 0x006C($sp) -/* 03D30 80A78040 0C0286B2 */ jal func_800A1AC8 -/* 03D34 80A78044 AFA30018 */ sw $v1, 0x0018($sp) +/* 03D24 80A78034 AFA80014 */ sw $t0, 0x0014($sp) +/* 03D28 80A78038 AFB90010 */ sw $t9, 0x0010($sp) +/* 03D2C 80A7803C 8FA4006C */ lw $a0, 0x006C($sp) +/* 03D30 80A78040 0C0286B2 */ jal SkelAnime_DrawSV +/* 03D34 80A78044 AFA30018 */ sw $v1, 0x0018($sp) /* 03D38 80A78048 3C0680A8 */ lui $a2, %hi(D_80A7895C) ## $a2 = 80A80000 /* 03D3C 80A7804C 24C6895C */ addiu $a2, $a2, %lo(D_80A7895C) ## $a2 = 80A7895C /* 03D40 80A78050 27A40044 */ addiu $a0, $sp, 0x0044 ## $a0 = FFFFFFDC /* 03D44 80A78054 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 03D48 80A78058 0C031AD5 */ jal func_800C6B54 +/* 03D48 80A78058 0C031AD5 */ jal Graph_CloseDisps /* 03D4C 80A7805C 2407028D */ addiu $a3, $zero, 0x028D ## $a3 = 0000028D -/* 03D50 80A78060 8FBF002C */ lw $ra, 0x002C($sp) -/* 03D54 80A78064 8FB00028 */ lw $s0, 0x0028($sp) +/* 03D50 80A78060 8FBF002C */ lw $ra, 0x002C($sp) +/* 03D54 80A78064 8FB00028 */ lw $s0, 0x0028($sp) /* 03D58 80A78068 27BD0068 */ addiu $sp, $sp, 0x0068 ## $sp = 00000000 -/* 03D5C 80A7806C 03E00008 */ jr $ra +/* 03D5C 80A7806C 03E00008 */ jr $ra /* 03D60 80A78070 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_In/EnIn_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_In/EnIn_Draw.s index 6d9799724a..0864de5868 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_In/EnIn_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_In/EnIn_Draw.s @@ -1,26 +1,26 @@ glabel EnIn_Draw /* 02704 80A7B6B4 27BDFFA8 */ addiu $sp, $sp, 0xFFA8 ## $sp = FFFFFFA8 -/* 02708 80A7B6B8 AFBF002C */ sw $ra, 0x002C($sp) -/* 0270C 80A7B6BC AFB00028 */ sw $s0, 0x0028($sp) -/* 02710 80A7B6C0 AFA5005C */ sw $a1, 0x005C($sp) +/* 02708 80A7B6B8 AFBF002C */ sw $ra, 0x002C($sp) +/* 0270C 80A7B6BC AFB00028 */ sw $s0, 0x0028($sp) +/* 02710 80A7B6C0 AFA5005C */ sw $a1, 0x005C($sp) /* 02714 80A7B6C4 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 /* 02718 80A7B6C8 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 0271C 80A7B6CC 3C0680A8 */ lui $a2, %hi(D_80A7BA0C) ## $a2 = 80A80000 /* 02720 80A7B6D0 24C6BA0C */ addiu $a2, $a2, %lo(D_80A7BA0C) ## $a2 = 80A7BA0C /* 02724 80A7B6D4 27A40040 */ addiu $a0, $sp, 0x0040 ## $a0 = FFFFFFE8 /* 02728 80A7B6D8 24070950 */ addiu $a3, $zero, 0x0950 ## $a3 = 00000950 -/* 0272C 80A7B6DC 0C031AB1 */ jal func_800C6AC4 -/* 02730 80A7B6E0 AFA50050 */ sw $a1, 0x0050($sp) +/* 0272C 80A7B6DC 0C031AB1 */ jal Graph_OpenDisps +/* 02730 80A7B6E0 AFA50050 */ sw $a1, 0x0050($sp) /* 02734 80A7B6E4 8E180190 */ lw $t8, 0x0190($s0) ## 00000190 /* 02738 80A7B6E8 3C0F80A8 */ lui $t7, %hi(func_80A79FB0) ## $t7 = 80A80000 /* 0273C 80A7B6EC 25EF9FB0 */ addiu $t7, $t7, %lo(func_80A79FB0) ## $t7 = 80A79FB0 -/* 02740 80A7B6F0 11F8003C */ beq $t7, $t8, .L80A7B7E4 -/* 02744 80A7B6F4 8FA80050 */ lw $t0, 0x0050($sp) -/* 02748 80A7B6F8 8FB9005C */ lw $t9, 0x005C($sp) +/* 02740 80A7B6F0 11F8003C */ beq $t7, $t8, .L80A7B7E4 +/* 02744 80A7B6F4 8FA80050 */ lw $t0, 0x0050($sp) +/* 02748 80A7B6F8 8FB9005C */ lw $t9, 0x005C($sp) /* 0274C 80A7B6FC 8F240000 */ lw $a0, 0x0000($t9) ## 00000000 -/* 02750 80A7B700 0C024F46 */ jal func_80093D18 -/* 02754 80A7B704 AFA80050 */ sw $t0, 0x0050($sp) -/* 02758 80A7B708 8FA80050 */ lw $t0, 0x0050($sp) +/* 02750 80A7B700 0C024F46 */ jal func_80093D18 +/* 02754 80A7B704 AFA80050 */ sw $t0, 0x0050($sp) +/* 02758 80A7B708 8FA80050 */ lw $t0, 0x0050($sp) /* 0275C 80A7B70C 3C0ADB06 */ lui $t2, 0xDB06 ## $t2 = DB060000 /* 02760 80A7B710 354A0020 */ ori $t2, $t2, 0x0020 ## $t2 = DB060020 /* 02764 80A7B714 8D0302C0 */ lw $v1, 0x02C0($t0) ## 000002C0 @@ -32,37 +32,37 @@ glabel EnIn_Draw /* 0277C 80A7B72C 860B01EE */ lh $t3, 0x01EE($s0) ## 000001EE /* 02780 80A7B730 24C66FA8 */ addiu $a2, $a2, 0x6FA8 ## $a2 = 80166FA8 /* 02784 80A7B734 3C0500FF */ lui $a1, 0x00FF ## $a1 = 00FF0000 -/* 02788 80A7B738 000B6080 */ sll $t4, $t3, 2 -/* 0278C 80A7B73C 008C2021 */ addu $a0, $a0, $t4 -/* 02790 80A7B740 8C84B9B4 */ lw $a0, %lo(D_80A7B9B4)($a0) +/* 02788 80A7B738 000B6080 */ sll $t4, $t3, 2 +/* 0278C 80A7B73C 008C2021 */ addu $a0, $a0, $t4 +/* 02790 80A7B740 8C84B9B4 */ lw $a0, %lo(D_80A7B9B4)($a0) /* 02794 80A7B744 34A5FFFF */ ori $a1, $a1, 0xFFFF ## $a1 = 00FFFFFF /* 02798 80A7B748 3C078000 */ lui $a3, 0x8000 ## $a3 = 80000000 -/* 0279C 80A7B74C 00047100 */ sll $t6, $a0, 4 -/* 027A0 80A7B750 000E7F02 */ srl $t7, $t6, 28 -/* 027A4 80A7B754 000FC080 */ sll $t8, $t7, 2 -/* 027A8 80A7B758 00D8C821 */ addu $t9, $a2, $t8 +/* 0279C 80A7B74C 00047100 */ sll $t6, $a0, 4 +/* 027A0 80A7B750 000E7F02 */ srl $t7, $t6, 28 +/* 027A4 80A7B754 000FC080 */ sll $t8, $t7, 2 +/* 027A8 80A7B758 00D8C821 */ addu $t9, $a2, $t8 /* 027AC 80A7B75C 8F290000 */ lw $t1, 0x0000($t9) ## 00000000 -/* 027B0 80A7B760 00856824 */ and $t5, $a0, $a1 +/* 027B0 80A7B760 00856824 */ and $t5, $a0, $a1 /* 027B4 80A7B764 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 -/* 027B8 80A7B768 01A95021 */ addu $t2, $t5, $t1 -/* 027BC 80A7B76C 01475821 */ addu $t3, $t2, $a3 +/* 027B8 80A7B768 01A95021 */ addu $t2, $t5, $t1 +/* 027BC 80A7B76C 01475821 */ addu $t3, $t2, $a3 /* 027C0 80A7B770 AC6B0004 */ sw $t3, 0x0004($v1) ## 00000004 /* 027C4 80A7B774 8D0302C0 */ lw $v1, 0x02C0($t0) ## 000002C0 /* 027C8 80A7B778 248434D0 */ addiu $a0, $a0, 0x34D0 ## $a0 = 060034D0 -/* 027CC 80A7B77C 00047900 */ sll $t7, $a0, 4 -/* 027D0 80A7B780 000FC702 */ srl $t8, $t7, 28 +/* 027CC 80A7B77C 00047900 */ sll $t7, $a0, 4 +/* 027D0 80A7B780 000FC702 */ srl $t8, $t7, 28 /* 027D4 80A7B784 3C0EDB06 */ lui $t6, 0xDB06 ## $t6 = DB060000 /* 027D8 80A7B788 246C0008 */ addiu $t4, $v1, 0x0008 ## $t4 = 00000008 /* 027DC 80A7B78C 35CE0024 */ ori $t6, $t6, 0x0024 ## $t6 = DB060024 -/* 027E0 80A7B790 0018C880 */ sll $t9, $t8, 2 +/* 027E0 80A7B790 0018C880 */ sll $t9, $t8, 2 /* 027E4 80A7B794 AD0C02C0 */ sw $t4, 0x02C0($t0) ## 000002C0 -/* 027E8 80A7B798 00D96821 */ addu $t5, $a2, $t9 +/* 027E8 80A7B798 00D96821 */ addu $t5, $a2, $t9 /* 027EC 80A7B79C AC6E0000 */ sw $t6, 0x0000($v1) ## 00000000 /* 027F0 80A7B7A0 8DA90000 */ lw $t1, 0x0000($t5) ## 00000000 -/* 027F4 80A7B7A4 00855024 */ and $t2, $a0, $a1 +/* 027F4 80A7B7A4 00855024 */ and $t2, $a0, $a1 /* 027F8 80A7B7A8 3C0E80A8 */ lui $t6, %hi(func_80A7B320) ## $t6 = 80A80000 -/* 027FC 80A7B7AC 012A5821 */ addu $t3, $t1, $t2 -/* 02800 80A7B7B0 01676021 */ addu $t4, $t3, $a3 +/* 027FC 80A7B7AC 012A5821 */ addu $t3, $t1, $t2 +/* 02800 80A7B7B0 01676021 */ addu $t4, $t3, $a3 /* 02804 80A7B7B4 AC6C0004 */ sw $t4, 0x0004($v1) ## 00000004 /* 02808 80A7B7B8 9207014E */ lbu $a3, 0x014E($s0) ## 0000014E /* 0280C 80A7B7BC 8E06016C */ lw $a2, 0x016C($s0) ## 0000016C @@ -70,23 +70,23 @@ glabel EnIn_Draw /* 02814 80A7B7C4 3C0F80A8 */ lui $t7, %hi(func_80A7B570) ## $t7 = 80A80000 /* 02818 80A7B7C8 25EFB570 */ addiu $t7, $t7, %lo(func_80A7B570) ## $t7 = 80A7B570 /* 0281C 80A7B7CC 25CEB320 */ addiu $t6, $t6, %lo(func_80A7B320) ## $t6 = 80A7B320 -/* 02820 80A7B7D0 AFAE0010 */ sw $t6, 0x0010($sp) -/* 02824 80A7B7D4 AFAF0014 */ sw $t7, 0x0014($sp) -/* 02828 80A7B7D8 AFB00018 */ sw $s0, 0x0018($sp) -/* 0282C 80A7B7DC 0C0286B2 */ jal func_800A1AC8 -/* 02830 80A7B7E0 8FA4005C */ lw $a0, 0x005C($sp) +/* 02820 80A7B7D0 AFAE0010 */ sw $t6, 0x0010($sp) +/* 02824 80A7B7D4 AFAF0014 */ sw $t7, 0x0014($sp) +/* 02828 80A7B7D8 AFB00018 */ sw $s0, 0x0018($sp) +/* 0282C 80A7B7DC 0C0286B2 */ jal SkelAnime_DrawSV +/* 02830 80A7B7E0 8FA4005C */ lw $a0, 0x005C($sp) .L80A7B7E4: -/* 02834 80A7B7E4 8FB8005C */ lw $t8, 0x005C($sp) +/* 02834 80A7B7E4 8FB8005C */ lw $t8, 0x005C($sp) /* 02838 80A7B7E8 3C0680A8 */ lui $a2, %hi(D_80A7BA1C) ## $a2 = 80A80000 /* 0283C 80A7B7EC 24C6BA1C */ addiu $a2, $a2, %lo(D_80A7BA1C) ## $a2 = 80A7BA1C /* 02840 80A7B7F0 27A40040 */ addiu $a0, $sp, 0x0040 ## $a0 = FFFFFFE8 /* 02844 80A7B7F4 24070970 */ addiu $a3, $zero, 0x0970 ## $a3 = 00000970 -/* 02848 80A7B7F8 0C031AD5 */ jal func_800C6B54 +/* 02848 80A7B7F8 0C031AD5 */ jal Graph_CloseDisps /* 0284C 80A7B7FC 8F050000 */ lw $a1, 0x0000($t8) ## 00000000 -/* 02850 80A7B800 8FBF002C */ lw $ra, 0x002C($sp) -/* 02854 80A7B804 8FB00028 */ lw $s0, 0x0028($sp) +/* 02850 80A7B800 8FBF002C */ lw $ra, 0x002C($sp) +/* 02854 80A7B804 8FB00028 */ lw $s0, 0x0028($sp) /* 02858 80A7B808 27BD0058 */ addiu $sp, $sp, 0x0058 ## $sp = 00000000 -/* 0285C 80A7B80C 03E00008 */ jr $ra +/* 0285C 80A7B80C 03E00008 */ jr $ra /* 02860 80A7B810 00000000 */ nop /* 02864 80A7B814 00000000 */ nop /* 02868 80A7B818 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_In/func_80A79010.s b/asm/non_matchings/overlays/actors/ovl_En_In/func_80A79010.s index 1f1432af86..35be65abe1 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_In/func_80A79010.s +++ b/asm/non_matchings/overlays/actors/ovl_En_In/func_80A79010.s @@ -3,7 +3,7 @@ glabel func_80A79010 /* 00064 80A79014 AFBF0014 */ sw $ra, 0x0014($sp) /* 00068 80A79018 8C8E1C44 */ lw $t6, 0x1C44($a0) ## 00001C44 /* 0006C 80A7901C 24050019 */ addiu $a1, $zero, 0x0019 ## $a1 = 00000019 -/* 00070 80A79020 0C01B0D8 */ jal func_8006C360 +/* 00070 80A79020 0C01B0D8 */ jal Text_GetFaceReaction /* 00074 80A79024 AFAE001C */ sw $t6, 0x001C($sp) /* 00078 80A79028 10400003 */ beq $v0, $zero, .L80A79038 /* 0007C 80A7902C 3043FFFF */ andi $v1, $v0, 0xFFFF ## $v1 = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_In/func_80A79168.s b/asm/non_matchings/overlays/actors/ovl_En_In/func_80A79168.s index 3faff96b99..e15f2dc779 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_In/func_80A79168.s +++ b/asm/non_matchings/overlays/actors/ovl_En_In/func_80A79168.s @@ -3,7 +3,7 @@ glabel func_80A79168 /* 001BC 80A7916C AFBF0014 */ sw $ra, 0x0014($sp) /* 001C0 80A79170 AFA5001C */ sw $a1, 0x001C($sp) /* 001C4 80A79174 24050019 */ addiu $a1, $zero, 0x0019 ## $a1 = 00000019 -/* 001C8 80A79178 0C01B0D8 */ jal func_8006C360 +/* 001C8 80A79178 0C01B0D8 */ jal Text_GetFaceReaction /* 001CC 80A7917C AFA40018 */ sw $a0, 0x0018($sp) /* 001D0 80A79180 8FA40018 */ lw $a0, 0x0018($sp) /* 001D4 80A79184 10400003 */ beq $v0, $zero, .L80A79194 diff --git a/asm/non_matchings/overlays/actors/ovl_En_In/func_80A79690.s b/asm/non_matchings/overlays/actors/ovl_En_In/func_80A79690.s index 38b76ca151..9b1e611e5a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_In/func_80A79690.s +++ b/asm/non_matchings/overlays/actors/ovl_En_In/func_80A79690.s @@ -1,27 +1,27 @@ glabel func_80A79690 /* 006E0 80A79690 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 006E4 80A79694 AFBF001C */ sw $ra, 0x001C($sp) -/* 006E8 80A79698 AFB00018 */ sw $s0, 0x0018($sp) -/* 006EC 80A7969C AFA60028 */ sw $a2, 0x0028($sp) +/* 006E4 80A79694 AFBF001C */ sw $ra, 0x001C($sp) +/* 006E8 80A79698 AFB00018 */ sw $s0, 0x0018($sp) +/* 006EC 80A7969C AFA60028 */ sw $a2, 0x0028($sp) /* 006F0 80A796A0 8C8F0020 */ lw $t7, 0x0020($a0) ## 00000020 /* 006F4 80A796A4 848E0040 */ lh $t6, 0x0040($a0) ## 00000040 /* 006F8 80A796A8 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 006FC 80A796AC 85F80002 */ lh $t8, 0x0002($t7) ## 00000002 -/* 00700 80A796B0 01D8082A */ slt $at, $t6, $t8 -/* 00704 80A796B4 50200009 */ beql $at, $zero, .L80A796DC -/* 00708 80A796B8 8FBF001C */ lw $ra, 0x001C($sp) +/* 00700 80A796B0 01D8082A */ slt $at, $t6, $t8 +/* 00704 80A796B4 50200009 */ beql $at, $zero, .L80A796DC +/* 00708 80A796B8 8FBF001C */ lw $ra, 0x001C($sp) /* 0070C 80A796BC 90990035 */ lbu $t9, 0x0035($a0) ## 00000035 /* 00710 80A796C0 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 00714 80A796C4 3C073F80 */ lui $a3, 0x3F80 ## $a3 = 3F800000 /* 00718 80A796C8 37280003 */ ori $t0, $t9, 0x0003 ## $t0 = 00000003 /* 0071C 80A796CC A0880035 */ sb $t0, 0x0035($a0) ## 00000035 -/* 00720 80A796D0 0C028D88 */ jal func_800A3620 -/* 00724 80A796D4 8FA40028 */ lw $a0, 0x0028($sp) -/* 00728 80A796D8 8FBF001C */ lw $ra, 0x001C($sp) +/* 00720 80A796D0 0C028D88 */ jal SkelAnime_LoadAnimationType5 +/* 00724 80A796D4 8FA40028 */ lw $a0, 0x0028($sp) +/* 00728 80A796D8 8FBF001C */ lw $ra, 0x001C($sp) .L80A796DC: -/* 0072C 80A796DC 8FB00018 */ lw $s0, 0x0018($sp) +/* 0072C 80A796DC 8FB00018 */ lw $s0, 0x0018($sp) /* 00730 80A796E0 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 00734 80A796E4 03E00008 */ jr $ra +/* 00734 80A796E4 03E00008 */ jr $ra /* 00738 80A796E8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_In/func_80A796EC.s b/asm/non_matchings/overlays/actors/ovl_En_In/func_80A796EC.s index 6c52951681..b53711975e 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_In/func_80A796EC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_In/func_80A796EC.s @@ -2,32 +2,32 @@ glabel func_80A796EC /* 0073C 80A796EC 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 /* 00740 80A796F0 3C0F80A8 */ lui $t7, %hi(D_80A7B878) ## $t7 = 80A80000 /* 00744 80A796F4 25EFB878 */ addiu $t7, $t7, %lo(D_80A7B878) ## $t7 = 80A7B878 -/* 00748 80A796F8 00057100 */ sll $t6, $a1, 4 -/* 0074C 80A796FC AFBF0024 */ sw $ra, 0x0024($sp) -/* 00750 80A79700 AFA40030 */ sw $a0, 0x0030($sp) -/* 00754 80A79704 01CF1821 */ addu $v1, $t6, $t7 +/* 00748 80A796F8 00057100 */ sll $t6, $a1, 4 +/* 0074C 80A796FC AFBF0024 */ sw $ra, 0x0024($sp) +/* 00750 80A79700 AFA40030 */ sw $a0, 0x0030($sp) +/* 00754 80A79704 01CF1821 */ addu $v1, $t6, $t7 /* 00758 80A79708 8C640000 */ lw $a0, 0x0000($v1) ## 00000000 /* 0075C 80A7970C 0C028800 */ jal SkelAnime_GetFrameCount - -/* 00760 80A79710 AFA30028 */ sw $v1, 0x0028($sp) + +/* 00760 80A79710 AFA30028 */ sw $v1, 0x0028($sp) /* 00764 80A79714 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 -/* 00768 80A79718 8FA30028 */ lw $v1, 0x0028($sp) -/* 0076C 80A7971C 8FA40030 */ lw $a0, 0x0030($sp) -/* 00770 80A79720 468021A0 */ cvt.s.w $f6, $f4 +/* 00768 80A79718 8FA30028 */ lw $v1, 0x0028($sp) +/* 0076C 80A7971C 8FA40030 */ lw $a0, 0x0030($sp) +/* 00770 80A79720 468021A0 */ cvt.s.w $f6, $f4 /* 00774 80A79724 90780008 */ lbu $t8, 0x0008($v1) ## 00000008 /* 00778 80A79728 C468000C */ lwc1 $f8, 0x000C($v1) ## 0000000C /* 0077C 80A7972C 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 00780 80A79730 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 /* 00784 80A79734 8C650000 */ lw $a1, 0x0000($v1) ## 00000000 -/* 00788 80A79738 E7A60010 */ swc1 $f6, 0x0010($sp) +/* 00788 80A79738 E7A60010 */ swc1 $f6, 0x0010($sp) /* 0078C 80A7973C 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 00790 80A79740 AFB80014 */ sw $t8, 0x0014($sp) -/* 00794 80A79744 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 00798 80A79748 E7A80018 */ swc1 $f8, 0x0018($sp) -/* 0079C 80A7974C 8FBF0024 */ lw $ra, 0x0024($sp) +/* 00790 80A79740 AFB80014 */ sw $t8, 0x0014($sp) +/* 00794 80A79744 0C029468 */ jal SkelAnime_ChangeAnim + +/* 00798 80A79748 E7A80018 */ swc1 $f8, 0x0018($sp) +/* 0079C 80A7974C 8FBF0024 */ lw $ra, 0x0024($sp) /* 007A0 80A79750 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 007A4 80A79754 03E00008 */ jr $ra +/* 007A4 80A79754 03E00008 */ jr $ra /* 007A8 80A79758 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_In/func_80A7975C.s b/asm/non_matchings/overlays/actors/ovl_En_In/func_80A7975C.s index 73f369ca12..52f4028582 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_In/func_80A7975C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_In/func_80A7975C.s @@ -1,22 +1,22 @@ glabel func_80A7975C /* 007AC 80A7975C 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 007B0 80A79760 AFBF002C */ sw $ra, 0x002C($sp) -/* 007B4 80A79764 AFB00028 */ sw $s0, 0x0028($sp) -/* 007B8 80A79768 AFA50034 */ sw $a1, 0x0034($sp) +/* 007B0 80A79760 AFBF002C */ sw $ra, 0x002C($sp) +/* 007B4 80A79764 AFB00028 */ sw $s0, 0x0028($sp) +/* 007B8 80A79768 AFA50034 */ sw $a1, 0x0034($sp) /* 007BC 80A7976C 848E001C */ lh $t6, 0x001C($a0) ## 0000001C /* 007C0 80A79770 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 /* 007C4 80A79774 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 007C8 80A79778 144E0008 */ bne $v0, $t6, .L80A7979C +/* 007C8 80A79778 144E0008 */ bne $v0, $t6, .L80A7979C /* 007CC 80A7977C 00000000 */ nop /* 007D0 80A79780 848F00B8 */ lh $t7, 0x00B8($a0) ## 000000B8 /* 007D4 80A79784 3C188016 */ lui $t8, 0x8016 ## $t8 = 80160000 -/* 007D8 80A79788 144F0004 */ bne $v0, $t7, .L80A7979C +/* 007D8 80A79788 144F0004 */ bne $v0, $t7, .L80A7979C /* 007DC 80A7978C 00000000 */ nop /* 007E0 80A79790 8F18E664 */ lw $t8, -0x199C($t8) ## 8015E664 -/* 007E4 80A79794 53000004 */ beql $t8, $zero, .L80A797A8 +/* 007E4 80A79794 53000004 */ beql $t8, $zero, .L80A797A8 /* 007E8 80A79798 A60201E6 */ sh $v0, 0x01E6($s0) ## 000001E6 .L80A7979C: -/* 007EC 80A7979C 1000001F */ beq $zero, $zero, .L80A7981C +/* 007EC 80A7979C 1000001F */ beq $zero, $zero, .L80A7981C /* 007F0 80A797A0 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 /* 007F4 80A797A4 A60201E6 */ sh $v0, 0x01E6($s0) ## 000001E6 .L80A797A8: @@ -24,38 +24,38 @@ glabel func_80A7975C /* 007FC 80A797AC 860901E6 */ lh $t1, 0x01E6($s0) ## 000001E6 /* 00800 80A797B0 3C0480A8 */ lui $a0, %hi(D_80A7B918) ## $a0 = 80A80000 /* 00804 80A797B4 3328FFFE */ andi $t0, $t9, 0xFFFE ## $t0 = 00000000 -/* 00808 80A797B8 00095080 */ sll $t2, $t1, 2 +/* 00808 80A797B8 00095080 */ sll $t2, $t1, 2 /* 0080C 80A797BC A20801A6 */ sb $t0, 0x01A6($s0) ## 000001A6 -/* 00810 80A797C0 008A2021 */ addu $a0, $a0, $t2 +/* 00810 80A797C0 008A2021 */ addu $a0, $a0, $t2 /* 00814 80A797C4 0C028800 */ jal SkelAnime_GetFrameCount - -/* 00818 80A797C8 8C84B918 */ lw $a0, %lo(D_80A7B918)($a0) + +/* 00818 80A797C8 8C84B918 */ lw $a0, %lo(D_80A7B918)($a0) /* 0081C 80A797CC 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 00820 80A797D0 860B01E6 */ lh $t3, 0x01E6($s0) ## 000001E6 /* 00824 80A797D4 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 00828 80A797D8 468021A0 */ cvt.s.w $f6, $f4 +/* 00828 80A797D8 468021A0 */ cvt.s.w $f6, $f4 /* 0082C 80A797DC 3C0580A8 */ lui $a1, %hi(D_80A7B918) ## $a1 = 80A80000 -/* 00830 80A797E0 000B6080 */ sll $t4, $t3, 2 -/* 00834 80A797E4 00AC2821 */ addu $a1, $a1, $t4 +/* 00830 80A797E0 000B6080 */ sll $t4, $t3, 2 +/* 00834 80A797E4 00AC2821 */ addu $a1, $a1, $t4 /* 00838 80A797E8 240D0002 */ addiu $t5, $zero, 0x0002 ## $t5 = 00000002 -/* 0083C 80A797EC 44070000 */ mfc1 $a3, $f0 -/* 00840 80A797F0 AFAD0014 */ sw $t5, 0x0014($sp) -/* 00844 80A797F4 8CA5B918 */ lw $a1, %lo(D_80A7B918)($a1) -/* 00848 80A797F8 E7A60010 */ swc1 $f6, 0x0010($sp) +/* 0083C 80A797EC 44070000 */ mfc1 $a3, $f0 +/* 00840 80A797F0 AFAD0014 */ sw $t5, 0x0014($sp) +/* 00844 80A797F4 8CA5B918 */ lw $a1, %lo(D_80A7B918)($a1) +/* 00848 80A797F8 E7A60010 */ swc1 $f6, 0x0010($sp) /* 0084C 80A797FC 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C /* 00850 80A79800 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 00854 80A79804 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 00858 80A79808 E7A00018 */ swc1 $f0, 0x0018($sp) +/* 00854 80A79804 0C029468 */ jal SkelAnime_ChangeAnim + +/* 00858 80A79808 E7A00018 */ swc1 $f0, 0x0018($sp) /* 0085C 80A7980C 3C0E80A8 */ lui $t6, %hi(func_80A7A304) ## $t6 = 80A80000 /* 00860 80A79810 25CEA304 */ addiu $t6, $t6, %lo(func_80A7A304) ## $t6 = 80A7A304 /* 00864 80A79814 AE0E0190 */ sw $t6, 0x0190($s0) ## 00000190 /* 00868 80A79818 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 .L80A7981C: -/* 0086C 80A7981C 8FBF002C */ lw $ra, 0x002C($sp) -/* 00870 80A79820 8FB00028 */ lw $s0, 0x0028($sp) +/* 0086C 80A7981C 8FBF002C */ lw $ra, 0x002C($sp) +/* 00870 80A79820 8FB00028 */ lw $s0, 0x0028($sp) /* 00874 80A79824 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 00878 80A79828 03E00008 */ jr $ra +/* 00878 80A79828 03E00008 */ jr $ra /* 0087C 80A7982C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_In/func_80A79FB0.s b/asm/non_matchings/overlays/actors/ovl_En_In/func_80A79FB0.s index 28731cbcf3..19c5a5f90f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_In/func_80A79FB0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_In/func_80A79FB0.s @@ -1,74 +1,74 @@ glabel func_80A79FB0 /* 01000 80A79FB0 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 -/* 01004 80A79FB4 AFB00028 */ sw $s0, 0x0028($sp) +/* 01004 80A79FB4 AFB00028 */ sw $s0, 0x0028($sp) /* 01008 80A79FB8 3C010001 */ lui $at, 0x0001 ## $at = 00010000 /* 0100C 80A79FBC 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 01010 80A79FC0 342117A4 */ ori $at, $at, 0x17A4 ## $at = 000117A4 -/* 01014 80A79FC4 AFBF002C */ sw $ra, 0x002C($sp) -/* 01018 80A79FC8 AFA50044 */ sw $a1, 0x0044($sp) -/* 0101C 80A79FCC AFA0003C */ sw $zero, 0x003C($sp) -/* 01020 80A79FD0 00A12021 */ addu $a0, $a1, $at +/* 01014 80A79FC4 AFBF002C */ sw $ra, 0x002C($sp) +/* 01018 80A79FC8 AFA50044 */ sw $a1, 0x0044($sp) +/* 0101C 80A79FCC AFA0003C */ sw $zero, 0x003C($sp) +/* 01020 80A79FD0 00A12021 */ addu $a0, $a1, $at /* 01024 80A79FD4 0C026062 */ jal Object_IsLoaded - + /* 01028 80A79FD8 820501E4 */ lb $a1, 0x01E4($s0) ## 000001E4 -/* 0102C 80A79FDC 14400003 */ bne $v0, $zero, .L80A79FEC +/* 0102C 80A79FDC 14400003 */ bne $v0, $zero, .L80A79FEC /* 01030 80A79FE0 00000000 */ nop /* 01034 80A79FE4 860E001C */ lh $t6, 0x001C($s0) ## 0000001C -/* 01038 80A79FE8 1DC000C1 */ bgtz $t6, .L80A7A2F0 +/* 01038 80A79FE8 1DC000C1 */ bgtz $t6, .L80A7A2F0 .L80A79FEC: /* 0103C 80A79FEC 3C068003 */ lui $a2, 0x8003 ## $a2 = 80030000 /* 01040 80A79FF0 24C6B5EC */ addiu $a2, $a2, 0xB5EC ## $a2 = 8002B5EC /* 01044 80A79FF4 260400B4 */ addiu $a0, $s0, 0x00B4 ## $a0 = 000000B4 /* 01048 80A79FF8 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 /* 0104C 80A79FFC 0C00AC78 */ jal ActorShape_Init - + /* 01050 80A7A000 3C074210 */ lui $a3, 0x4210 ## $a3 = 42100000 /* 01054 80A7A004 3C060601 */ lui $a2, 0x0601 ## $a2 = 06010000 /* 01058 80A7A008 260F01FE */ addiu $t7, $s0, 0x01FE ## $t7 = 000001FE /* 0105C 80A7A00C 26180276 */ addiu $t8, $s0, 0x0276 ## $t8 = 00000276 /* 01060 80A7A010 24190014 */ addiu $t9, $zero, 0x0014 ## $t9 = 00000014 -/* 01064 80A7A014 AFB90018 */ sw $t9, 0x0018($sp) -/* 01068 80A7A018 AFB80014 */ sw $t8, 0x0014($sp) -/* 0106C 80A7A01C AFAF0010 */ sw $t7, 0x0010($sp) +/* 01064 80A7A014 AFB90018 */ sw $t9, 0x0018($sp) +/* 01068 80A7A018 AFB80014 */ sw $t8, 0x0014($sp) +/* 0106C 80A7A01C AFAF0010 */ sw $t7, 0x0010($sp) /* 01070 80A7A020 24C63B88 */ addiu $a2, $a2, 0x3B88 ## $a2 = 06013B88 -/* 01074 80A7A024 8FA40044 */ lw $a0, 0x0044($sp) +/* 01074 80A7A024 8FA40044 */ lw $a0, 0x0044($sp) /* 01078 80A7A028 2605014C */ addiu $a1, $s0, 0x014C ## $a1 = 0000014C -/* 0107C 80A7A02C 0C0291BE */ jal func_800A46F8 +/* 0107C 80A7A02C 0C0291BE */ jal SkelAnime_InitSV /* 01080 80A7A030 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 /* 01084 80A7A034 26050194 */ addiu $a1, $s0, 0x0194 ## $a1 = 00000194 -/* 01088 80A7A038 AFA50034 */ sw $a1, 0x0034($sp) +/* 01088 80A7A038 AFA50034 */ sw $a1, 0x0034($sp) /* 0108C 80A7A03C 0C0170D9 */ jal ActorCollider_AllocCylinder - -/* 01090 80A7A040 8FA40044 */ lw $a0, 0x0044($sp) + +/* 01090 80A7A040 8FA40044 */ lw $a0, 0x0044($sp) /* 01094 80A7A044 3C0780A8 */ lui $a3, %hi(D_80A7B840) ## $a3 = 80A80000 -/* 01098 80A7A048 8FA50034 */ lw $a1, 0x0034($sp) +/* 01098 80A7A048 8FA50034 */ lw $a1, 0x0034($sp) /* 0109C 80A7A04C 24E7B840 */ addiu $a3, $a3, %lo(D_80A7B840) ## $a3 = 80A7B840 -/* 010A0 80A7A050 8FA40044 */ lw $a0, 0x0044($sp) +/* 010A0 80A7A050 8FA40044 */ lw $a0, 0x0044($sp) /* 010A4 80A7A054 0C01712B */ jal ActorCollider_InitCylinder - + /* 010A8 80A7A058 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 010AC 80A7A05C 3C0680A8 */ lui $a2, %hi(D_80A7B86C) ## $a2 = 80A80000 /* 010B0 80A7A060 24C6B86C */ addiu $a2, $a2, %lo(D_80A7B86C) ## $a2 = 80A7B86C /* 010B4 80A7A064 26040098 */ addiu $a0, $s0, 0x0098 ## $a0 = 00000098 -/* 010B8 80A7A068 0C0187BF */ jal func_80061EFC +/* 010B8 80A7A068 0C0187BF */ jal func_80061EFC /* 010BC 80A7A06C 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 010C0 80A7A070 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 010C4 80A7A074 0C29E5D7 */ jal func_80A7975C -/* 010C8 80A7A078 8FA50044 */ lw $a1, 0x0044($sp) -/* 010CC 80A7A07C 10400008 */ beq $v0, $zero, .L80A7A0A0 +/* 010C4 80A7A074 0C29E5D7 */ jal func_80A7975C +/* 010C8 80A7A078 8FA50044 */ lw $a1, 0x0044($sp) +/* 010CC 80A7A07C 10400008 */ beq $v0, $zero, .L80A7A0A0 /* 010D0 80A7A080 3C068016 */ lui $a2, 0x8016 ## $a2 = 80160000 /* 010D4 80A7A084 24C6E660 */ addiu $a2, $a2, 0xE660 ## $a2 = 8015E660 /* 010D8 80A7A088 94C813FA */ lhu $t0, 0x13FA($a2) ## 8015FA5A /* 010DC 80A7A08C 3C01FFFF */ lui $at, 0xFFFF ## $at = FFFF0000 /* 010E0 80A7A090 34217FFF */ ori $at, $at, 0x7FFF ## $at = FFFF7FFF -/* 010E4 80A7A094 01014824 */ and $t1, $t0, $at -/* 010E8 80A7A098 10000095 */ beq $zero, $zero, .L80A7A2F0 +/* 010E4 80A7A094 01014824 */ and $t1, $t0, $at +/* 010E8 80A7A098 10000095 */ beq $zero, $zero, .L80A7A2F0 /* 010EC 80A7A09C A4C913FA */ sh $t1, 0x13FA($a2) ## 8015FA5A .L80A7A0A0: /* 010F0 80A7A0A0 3C053C23 */ lui $a1, 0x3C23 ## $a1 = 3C230000 /* 010F4 80A7A0A4 34A5D70A */ ori $a1, $a1, 0xD70A ## $a1 = 3C23D70A /* 010F8 80A7A0A8 0C00B58B */ jal Actor_SetScale - + /* 010FC 80A7A0AC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 01100 80A7A0B0 3C0280A8 */ lui $v0, %hi(func_80A7A4BC) ## $v0 = 80A80000 /* 01104 80A7A0B4 240A0006 */ addiu $t2, $zero, 0x0006 ## $t2 = 00000006 @@ -76,168 +76,168 @@ glabel func_80A79FB0 /* 0110C 80A7A0BC A20A001F */ sb $t2, 0x001F($s0) ## 0000001F /* 01110 80A7A0C0 A6000308 */ sh $zero, 0x0308($s0) ## 00000308 /* 01114 80A7A0C4 AE020190 */ sw $v0, 0x0190($s0) ## 00000190 -/* 01118 80A7A0C8 AFA20034 */ sw $v0, 0x0034($sp) -/* 0111C 80A7A0CC 8FA50044 */ lw $a1, 0x0044($sp) -/* 01120 80A7A0D0 0C29E60C */ jal func_80A79830 +/* 01118 80A7A0C8 AFA20034 */ sw $v0, 0x0034($sp) +/* 0111C 80A7A0CC 8FA50044 */ lw $a1, 0x0044($sp) +/* 01120 80A7A0D0 0C29E60C */ jal func_80A79830 /* 01124 80A7A0D4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01128 80A7A0D8 1040002E */ beq $v0, $zero, .L80A7A194 +/* 01128 80A7A0D8 1040002E */ beq $v0, $zero, .L80A7A194 /* 0112C 80A7A0DC 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 -/* 01130 80A7A0E0 10450011 */ beq $v0, $a1, .L80A7A128 +/* 01130 80A7A0E0 10450011 */ beq $v0, $a1, .L80A7A128 /* 01134 80A7A0E4 24030003 */ addiu $v1, $zero, 0x0003 ## $v1 = 00000003 -/* 01138 80A7A0E8 10430015 */ beq $v0, $v1, .L80A7A140 +/* 01138 80A7A0E8 10430015 */ beq $v0, $v1, .L80A7A140 /* 0113C 80A7A0EC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 01140 80A7A0F0 24040004 */ addiu $a0, $zero, 0x0004 ## $a0 = 00000004 -/* 01144 80A7A0F4 1044001F */ beq $v0, $a0, .L80A7A174 +/* 01144 80A7A0F4 1044001F */ beq $v0, $a0, .L80A7A174 /* 01148 80A7A0F8 3C068016 */ lui $a2, 0x8016 ## $a2 = 80160000 /* 0114C 80A7A0FC 24C6E660 */ addiu $a2, $a2, 0xE660 ## $a2 = 8015E660 /* 01150 80A7A100 94C213FA */ lhu $v0, 0x13FA($a2) ## 8015FA5A /* 01154 80A7A104 3042000F */ andi $v0, $v0, 0x000F ## $v0 = 00000000 -/* 01158 80A7A108 2C410008 */ sltiu $at, $v0, 0x0008 -/* 0115C 80A7A10C 10200034 */ beq $at, $zero, .L80A7A1E0 -/* 01160 80A7A110 00025880 */ sll $t3, $v0, 2 +/* 01158 80A7A108 2C410008 */ sltiu $at, $v0, 0x0008 +/* 0115C 80A7A10C 10200034 */ beq $at, $zero, .L80A7A1E0 +/* 01160 80A7A110 00025880 */ sll $t3, $v0, 2 /* 01164 80A7A114 3C0180A8 */ lui $at, %hi(jtbl_80A7BA9C) ## $at = 80A80000 -/* 01168 80A7A118 002B0821 */ addu $at, $at, $t3 -/* 0116C 80A7A11C 8C2BBA9C */ lw $t3, %lo(jtbl_80A7BA9C)($at) -/* 01170 80A7A120 01600008 */ jr $t3 +/* 01168 80A7A118 002B0821 */ addu $at, $at, $t3 +/* 0116C 80A7A11C 8C2BBA9C */ lw $t3, %lo(jtbl_80A7BA9C)($at) +/* 01170 80A7A120 01600008 */ jr $t3 /* 01174 80A7A124 00000000 */ nop .L80A7A128: /* 01178 80A7A128 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0117C 80A7A12C 0C29E5BB */ jal func_80A796EC +/* 0117C 80A7A12C 0C29E5BB */ jal func_80A796EC /* 01180 80A7A130 24050009 */ addiu $a1, $zero, 0x0009 ## $a1 = 00000009 -/* 01184 80A7A134 8FAC0034 */ lw $t4, 0x0034($sp) -/* 01188 80A7A138 1000006D */ beq $zero, $zero, .L80A7A2F0 +/* 01184 80A7A134 8FAC0034 */ lw $t4, 0x0034($sp) +/* 01188 80A7A138 1000006D */ beq $zero, $zero, .L80A7A2F0 /* 0118C 80A7A13C AE0C0190 */ sw $t4, 0x0190($s0) ## 00000190 .L80A7A140: -/* 01190 80A7A140 0C29E5BB */ jal func_80A796EC +/* 01190 80A7A140 0C29E5BB */ jal func_80A796EC /* 01194 80A7A144 24050007 */ addiu $a1, $zero, 0x0007 ## $a1 = 00000007 -/* 01198 80A7A148 8FAD0034 */ lw $t5, 0x0034($sp) +/* 01198 80A7A148 8FAD0034 */ lw $t5, 0x0034($sp) /* 0119C 80A7A14C 3C068016 */ lui $a2, 0x8016 ## $a2 = 80160000 /* 011A0 80A7A150 24C6E660 */ addiu $a2, $a2, 0xE660 ## $a2 = 8015E660 /* 011A4 80A7A154 AE0D0190 */ sw $t5, 0x0190($s0) ## 00000190 /* 011A8 80A7A158 94CE0ED6 */ lhu $t6, 0x0ED6($a2) ## 8015F536 /* 011AC 80A7A15C 24180005 */ addiu $t8, $zero, 0x0005 ## $t8 = 00000005 /* 011B0 80A7A160 31CF0100 */ andi $t7, $t6, 0x0100 ## $t7 = 00000000 -/* 011B4 80A7A164 55E00063 */ bnel $t7, $zero, .L80A7A2F4 -/* 011B8 80A7A168 8FBF002C */ lw $ra, 0x002C($sp) -/* 011BC 80A7A16C 10000060 */ beq $zero, $zero, .L80A7A2F0 +/* 011B4 80A7A164 55E00063 */ bnel $t7, $zero, .L80A7A2F4 +/* 011B8 80A7A168 8FBF002C */ lw $ra, 0x002C($sp) +/* 011BC 80A7A16C 10000060 */ beq $zero, $zero, .L80A7A2F0 /* 011C0 80A7A170 A618001C */ sh $t8, 0x001C($s0) ## 0000001C .L80A7A174: /* 011C4 80A7A174 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 011C8 80A7A178 0C29E5BB */ jal func_80A796EC +/* 011C8 80A7A178 0C29E5BB */ jal func_80A796EC /* 011CC 80A7A17C 24050008 */ addiu $a1, $zero, 0x0008 ## $a1 = 00000008 /* 011D0 80A7A180 24030003 */ addiu $v1, $zero, 0x0003 ## $v1 = 00000003 /* 011D4 80A7A184 A60301EE */ sh $v1, 0x01EE($s0) ## 000001EE -/* 011D8 80A7A188 8FB90034 */ lw $t9, 0x0034($sp) -/* 011DC 80A7A18C 10000058 */ beq $zero, $zero, .L80A7A2F0 +/* 011D8 80A7A188 8FB90034 */ lw $t9, 0x0034($sp) +/* 011DC 80A7A18C 10000058 */ beq $zero, $zero, .L80A7A2F0 /* 011E0 80A7A190 AE190190 */ sw $t9, 0x0190($s0) ## 00000190 .L80A7A194: /* 011E4 80A7A194 0C00B55C */ jal Actor_Kill - + /* 011E8 80A7A198 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 011EC 80A7A19C 10000055 */ beq $zero, $zero, .L80A7A2F4 -/* 011F0 80A7A1A0 8FBF002C */ lw $ra, 0x002C($sp) +/* 011EC 80A7A19C 10000055 */ beq $zero, $zero, .L80A7A2F4 +/* 011F0 80A7A1A0 8FBF002C */ lw $ra, 0x002C($sp) glabel L80A7A1A4 /* 011F4 80A7A1A4 8608001C */ lh $t0, 0x001C($s0) ## 0000001C /* 011F8 80A7A1A8 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 011FC 80A7A1AC 5501000D */ bnel $t0, $at, .L80A7A1E4 -/* 01200 80A7A1B0 8FAB003C */ lw $t3, 0x003C($sp) -/* 01204 80A7A1B4 1000000A */ beq $zero, $zero, .L80A7A1E0 -/* 01208 80A7A1B8 AFA5003C */ sw $a1, 0x003C($sp) +/* 011FC 80A7A1AC 5501000D */ bnel $t0, $at, .L80A7A1E4 +/* 01200 80A7A1B0 8FAB003C */ lw $t3, 0x003C($sp) +/* 01204 80A7A1B4 1000000A */ beq $zero, $zero, .L80A7A1E0 +/* 01208 80A7A1B8 AFA5003C */ sw $a1, 0x003C($sp) glabel L80A7A1BC /* 0120C 80A7A1BC 8609001C */ lh $t1, 0x001C($s0) ## 0000001C -/* 01210 80A7A1C0 54690008 */ bnel $v1, $t1, .L80A7A1E4 -/* 01214 80A7A1C4 8FAB003C */ lw $t3, 0x003C($sp) -/* 01218 80A7A1C8 10000005 */ beq $zero, $zero, .L80A7A1E0 -/* 0121C 80A7A1CC AFA5003C */ sw $a1, 0x003C($sp) +/* 01210 80A7A1C0 54690008 */ bnel $v1, $t1, .L80A7A1E4 +/* 01214 80A7A1C4 8FAB003C */ lw $t3, 0x003C($sp) +/* 01218 80A7A1C8 10000005 */ beq $zero, $zero, .L80A7A1E0 +/* 0121C 80A7A1CC AFA5003C */ sw $a1, 0x003C($sp) glabel L80A7A1D0 /* 01220 80A7A1D0 860A001C */ lh $t2, 0x001C($s0) ## 0000001C -/* 01224 80A7A1D4 548A0003 */ bnel $a0, $t2, .L80A7A1E4 -/* 01228 80A7A1D8 8FAB003C */ lw $t3, 0x003C($sp) -/* 0122C 80A7A1DC AFA5003C */ sw $a1, 0x003C($sp) +/* 01224 80A7A1D4 548A0003 */ bnel $a0, $t2, .L80A7A1E4 +/* 01228 80A7A1D8 8FAB003C */ lw $t3, 0x003C($sp) +/* 0122C 80A7A1DC AFA5003C */ sw $a1, 0x003C($sp) .L80A7A1E0: -/* 01230 80A7A1E0 8FAB003C */ lw $t3, 0x003C($sp) +/* 01230 80A7A1E0 8FAB003C */ lw $t3, 0x003C($sp) .L80A7A1E4: -/* 01234 80A7A1E4 2C410008 */ sltiu $at, $v0, 0x0008 -/* 01238 80A7A1E8 11650005 */ beq $t3, $a1, .L80A7A200 +/* 01234 80A7A1E4 2C410008 */ sltiu $at, $v0, 0x0008 +/* 01238 80A7A1E8 11650005 */ beq $t3, $a1, .L80A7A200 /* 0123C 80A7A1EC 00000000 */ nop /* 01240 80A7A1F0 0C00B55C */ jal Actor_Kill - + /* 01244 80A7A1F4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01248 80A7A1F8 1000003E */ beq $zero, $zero, .L80A7A2F4 -/* 0124C 80A7A1FC 8FBF002C */ lw $ra, 0x002C($sp) +/* 01248 80A7A1F8 1000003E */ beq $zero, $zero, .L80A7A2F4 +/* 0124C 80A7A1FC 8FBF002C */ lw $ra, 0x002C($sp) .L80A7A200: -/* 01250 80A7A200 1020003B */ beq $at, $zero, .L80A7A2F0 -/* 01254 80A7A204 00026080 */ sll $t4, $v0, 2 +/* 01250 80A7A200 1020003B */ beq $at, $zero, .L80A7A2F0 +/* 01254 80A7A204 00026080 */ sll $t4, $v0, 2 /* 01258 80A7A208 3C0180A8 */ lui $at, %hi(jtbl_80A7BABC) ## $at = 80A80000 -/* 0125C 80A7A20C 002C0821 */ addu $at, $at, $t4 -/* 01260 80A7A210 8C2CBABC */ lw $t4, %lo(jtbl_80A7BABC)($at) -/* 01264 80A7A214 01800008 */ jr $t4 +/* 0125C 80A7A20C 002C0821 */ addu $at, $at, $t4 +/* 01260 80A7A210 8C2CBABC */ lw $t4, %lo(jtbl_80A7BABC)($at) +/* 01264 80A7A214 01800008 */ jr $t4 /* 01268 80A7A218 00000000 */ nop glabel L80A7A21C /* 0126C 80A7A21C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01270 80A7A220 0C29E5BB */ jal func_80A796EC +/* 01270 80A7A220 0C29E5BB */ jal func_80A796EC /* 01274 80A7A224 24050002 */ addiu $a1, $zero, 0x0002 ## $a1 = 00000002 /* 01278 80A7A228 3C0D80A8 */ lui $t5, %hi(func_80A7A4C8) ## $t5 = 80A80000 /* 0127C 80A7A22C 3C068016 */ lui $a2, 0x8016 ## $a2 = 80160000 /* 01280 80A7A230 25ADA4C8 */ addiu $t5, $t5, %lo(func_80A7A4C8) ## $t5 = 80A7A4C8 /* 01284 80A7A234 24C6E660 */ addiu $a2, $a2, 0xE660 ## $a2 = 8015E660 /* 01288 80A7A238 AE0D0190 */ sw $t5, 0x0190($s0) ## 00000190 -/* 0128C 80A7A23C 1000002C */ beq $zero, $zero, .L80A7A2F0 +/* 0128C 80A7A23C 1000002C */ beq $zero, $zero, .L80A7A2F0 /* 01290 80A7A240 A4C013FA */ sh $zero, 0x13FA($a2) ## 8015FA5A glabel L80A7A244 /* 01294 80A7A244 A203001F */ sb $v1, 0x001F($s0) ## 0000001F /* 01298 80A7A248 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0129C 80A7A24C 0C29E5BB */ jal func_80A796EC +/* 0129C 80A7A24C 0C29E5BB */ jal func_80A796EC /* 012A0 80A7A250 24050002 */ addiu $a1, $zero, 0x0002 ## $a1 = 00000002 /* 012A4 80A7A254 3C0E80A8 */ lui $t6, %hi(func_80A7A568) ## $t6 = 80A80000 /* 012A8 80A7A258 25CEA568 */ addiu $t6, $t6, %lo(func_80A7A568) ## $t6 = 80A7A568 /* 012AC 80A7A25C AE0E0190 */ sw $t6, 0x0190($s0) ## 00000190 -/* 012B0 80A7A260 0C0222CD */ jal func_80088B34 +/* 012B0 80A7A260 0C0222CD */ jal func_80088B34 /* 012B4 80A7A264 2404003C */ addiu $a0, $zero, 0x003C ## $a0 = 0000003C -/* 012B8 80A7A268 10000022 */ beq $zero, $zero, .L80A7A2F4 -/* 012BC 80A7A26C 8FBF002C */ lw $ra, 0x002C($sp) +/* 012B8 80A7A268 10000022 */ beq $zero, $zero, .L80A7A2F4 +/* 012BC 80A7A26C 8FBF002C */ lw $ra, 0x002C($sp) glabel L80A7A270 /* 012C0 80A7A270 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 012C4 80A7A274 0C29E5BB */ jal func_80A796EC +/* 012C4 80A7A274 0C29E5BB */ jal func_80A796EC /* 012C8 80A7A278 24050004 */ addiu $a1, $zero, 0x0004 ## $a1 = 00000004 /* 012CC 80A7A27C 3C0F80A8 */ lui $t7, %hi(func_80A7A770) ## $t7 = 80A80000 /* 012D0 80A7A280 25EFA770 */ addiu $t7, $t7, %lo(func_80A7A770) ## $t7 = 80A7A770 -/* 012D4 80A7A284 1000001A */ beq $zero, $zero, .L80A7A2F0 +/* 012D4 80A7A284 1000001A */ beq $zero, $zero, .L80A7A2F0 /* 012D8 80A7A288 AE0F0190 */ sw $t7, 0x0190($s0) ## 00000190 glabel L80A7A28C /* 012DC 80A7A28C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 012E0 80A7A290 0C29E5BB */ jal func_80A796EC +/* 012E0 80A7A290 0C29E5BB */ jal func_80A796EC /* 012E4 80A7A294 24050006 */ addiu $a1, $zero, 0x0006 ## $a1 = 00000006 /* 012E8 80A7A298 3C1980A8 */ lui $t9, %hi(func_80A7A940) ## $t9 = 80A80000 /* 012EC 80A7A29C 24180008 */ addiu $t8, $zero, 0x0008 ## $t8 = 00000008 /* 012F0 80A7A2A0 2739A940 */ addiu $t9, $t9, %lo(func_80A7A940) ## $t9 = 80A7A940 /* 012F4 80A7A2A4 A61801EC */ sh $t8, 0x01EC($s0) ## 000001EC -/* 012F8 80A7A2A8 10000011 */ beq $zero, $zero, .L80A7A2F0 +/* 012F8 80A7A2A8 10000011 */ beq $zero, $zero, .L80A7A2F0 /* 012FC 80A7A2AC AE190190 */ sw $t9, 0x0190($s0) ## 00000190 glabel L80A7A2B0 /* 01300 80A7A2B0 A203001F */ sb $v1, 0x001F($s0) ## 0000001F /* 01304 80A7A2B4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01308 80A7A2B8 0C29E5BB */ jal func_80A796EC +/* 01308 80A7A2B8 0C29E5BB */ jal func_80A796EC /* 0130C 80A7A2BC 24050006 */ addiu $a1, $zero, 0x0006 ## $a1 = 00000006 /* 01310 80A7A2C0 3C0980A8 */ lui $t1, %hi(func_80A7AA40) ## $t1 = 80A80000 /* 01314 80A7A2C4 24080008 */ addiu $t0, $zero, 0x0008 ## $t0 = 00000008 /* 01318 80A7A2C8 2529AA40 */ addiu $t1, $t1, %lo(func_80A7AA40) ## $t1 = 80A7AA40 /* 0131C 80A7A2CC A60801EC */ sh $t0, 0x01EC($s0) ## 000001EC -/* 01320 80A7A2D0 10000007 */ beq $zero, $zero, .L80A7A2F0 +/* 01320 80A7A2D0 10000007 */ beq $zero, $zero, .L80A7A2F0 /* 01324 80A7A2D4 AE090190 */ sw $t1, 0x0190($s0) ## 00000190 glabel L80A7A2D8 /* 01328 80A7A2D8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0132C 80A7A2DC 0C29E5BB */ jal func_80A796EC +/* 0132C 80A7A2DC 0C29E5BB */ jal func_80A796EC /* 01330 80A7A2E0 24050002 */ addiu $a1, $zero, 0x0002 ## $a1 = 00000002 /* 01334 80A7A2E4 3C0A80A8 */ lui $t2, %hi(func_80A7A848) ## $t2 = 80A80000 /* 01338 80A7A2E8 254AA848 */ addiu $t2, $t2, %lo(func_80A7A848) ## $t2 = 80A7A848 /* 0133C 80A7A2EC AE0A0190 */ sw $t2, 0x0190($s0) ## 00000190 .L80A7A2F0: -/* 01340 80A7A2F0 8FBF002C */ lw $ra, 0x002C($sp) +/* 01340 80A7A2F0 8FBF002C */ lw $ra, 0x002C($sp) .L80A7A2F4: -/* 01344 80A7A2F4 8FB00028 */ lw $s0, 0x0028($sp) +/* 01344 80A7A2F4 8FB00028 */ lw $s0, 0x0028($sp) /* 01348 80A7A2F8 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 -/* 0134C 80A7A2FC 03E00008 */ jr $ra +/* 0134C 80A7A2FC 03E00008 */ jr $ra /* 01350 80A7A300 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_In/func_80A7A304.s b/asm/non_matchings/overlays/actors/ovl_En_In/func_80A7A304.s index e1f3036a8b..78e2039007 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_In/func_80A7A304.s +++ b/asm/non_matchings/overlays/actors/ovl_En_In/func_80A7A304.s @@ -1,58 +1,58 @@ glabel func_80A7A304 /* 01354 80A7A304 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 -/* 01358 80A7A308 AFBF002C */ sw $ra, 0x002C($sp) -/* 0135C 80A7A30C AFB00028 */ sw $s0, 0x0028($sp) -/* 01360 80A7A310 AFA50044 */ sw $a1, 0x0044($sp) +/* 01358 80A7A308 AFBF002C */ sw $ra, 0x002C($sp) +/* 0135C 80A7A30C AFB00028 */ sw $s0, 0x0028($sp) +/* 01360 80A7A310 AFA50044 */ sw $a1, 0x0044($sp) /* 01364 80A7A314 8C820154 */ lw $v0, 0x0154($a0) ## 00000154 /* 01368 80A7A318 3C0E0601 */ lui $t6, 0x0601 ## $t6 = 06010000 /* 0136C 80A7A31C 25CE5814 */ addiu $t6, $t6, 0x5814 ## $t6 = 06015814 -/* 01370 80A7A320 11C20004 */ beq $t6, $v0, .L80A7A334 +/* 01370 80A7A320 11C20004 */ beq $t6, $v0, .L80A7A334 /* 01374 80A7A324 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 01378 80A7A328 3C0F0601 */ lui $t7, 0x0601 ## $t7 = 06010000 /* 0137C 80A7A32C 25EF646C */ addiu $t7, $t7, 0x646C ## $t7 = 0601646C -/* 01380 80A7A330 15E2000C */ bne $t7, $v0, .L80A7A364 +/* 01380 80A7A330 15E2000C */ bne $t7, $v0, .L80A7A364 .L80A7A334: /* 01384 80A7A334 3C014100 */ lui $at, 0x4100 ## $at = 41000000 /* 01388 80A7A338 44812000 */ mtc1 $at, $f4 ## $f4 = 8.00 /* 0138C 80A7A33C C6060164 */ lwc1 $f6, 0x0164($s0) ## 00000164 /* 01390 80A7A340 260400E4 */ addiu $a0, $s0, 0x00E4 ## $a0 = 000000E4 /* 01394 80A7A344 24056856 */ addiu $a1, $zero, 0x6856 ## $a1 = 00006856 -/* 01398 80A7A348 46062032 */ c.eq.s $f4, $f6 +/* 01398 80A7A348 46062032 */ c.eq.s $f4, $f6 /* 0139C 80A7A34C 00000000 */ nop -/* 013A0 80A7A350 45000004 */ bc1f .L80A7A364 +/* 013A0 80A7A350 45000004 */ bc1f .L80A7A364 /* 013A4 80A7A354 00000000 */ nop -/* 013A8 80A7A358 0C03D078 */ jal func_800F41E0 +/* 013A8 80A7A358 0C03D078 */ jal func_800F41E0 /* 013AC 80A7A35C 24060002 */ addiu $a2, $zero, 0x0002 ## $a2 = 00000002 /* 013B0 80A7A360 8E020154 */ lw $v0, 0x0154($s0) ## 00000154 .L80A7A364: /* 013B4 80A7A364 3C180602 */ lui $t8, 0x0602 ## $t8 = 06020000 /* 013B8 80A7A368 27188C38 */ addiu $t8, $t8, 0x8C38 ## $t8 = 06018C38 -/* 013BC 80A7A36C 1702000A */ bne $t8, $v0, .L80A7A398 +/* 013BC 80A7A36C 1702000A */ bne $t8, $v0, .L80A7A398 /* 013C0 80A7A370 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 /* 013C4 80A7A374 44814000 */ mtc1 $at, $f8 ## $f8 = 20.00 /* 013C8 80A7A378 C60A0164 */ lwc1 $f10, 0x0164($s0) ## 00000164 /* 013CC 80A7A37C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 013D0 80A7A380 460A4032 */ c.eq.s $f8, $f10 +/* 013D0 80A7A380 460A4032 */ c.eq.s $f8, $f10 /* 013D4 80A7A384 00000000 */ nop -/* 013D8 80A7A388 45020004 */ bc1fl .L80A7A39C +/* 013D8 80A7A388 45020004 */ bc1fl .L80A7A39C /* 013DC 80A7A38C 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C /* 013E0 80A7A390 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 013E4 80A7A394 24056854 */ addiu $a1, $zero, 0x6854 ## $a1 = 00006854 .L80A7A398: /* 013E8 80A7A398 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C .L80A7A39C: /* 013EC 80A7A39C 0C02927F */ jal SkelAnime_FrameUpdateMatrix - -/* 013F0 80A7A3A0 AFA40034 */ sw $a0, 0x0034($sp) -/* 013F4 80A7A3A4 50400041 */ beql $v0, $zero, .L80A7A4AC -/* 013F8 80A7A3A8 8FBF002C */ lw $ra, 0x002C($sp) + +/* 013F0 80A7A3A0 AFA40034 */ sw $a0, 0x0034($sp) +/* 013F4 80A7A3A4 50400041 */ beql $v0, $zero, .L80A7A4AC +/* 013F8 80A7A3A8 8FBF002C */ lw $ra, 0x002C($sp) /* 013FC 80A7A3AC 861901E6 */ lh $t9, 0x01E6($s0) ## 000001E6 /* 01400 80A7A3B0 24010003 */ addiu $at, $zero, 0x0003 ## $at = 00000003 /* 01404 80A7A3B4 3C078013 */ lui $a3, 0x8013 ## $a3 = 80130000 -/* 01408 80A7A3B8 07210004 */ bgez $t9, .L80A7A3CC +/* 01408 80A7A3B8 07210004 */ bgez $t9, .L80A7A3CC /* 0140C 80A7A3BC 33280007 */ andi $t0, $t9, 0x0007 ## $t0 = 00000000 -/* 01410 80A7A3C0 11000002 */ beq $t0, $zero, .L80A7A3CC +/* 01410 80A7A3C0 11000002 */ beq $t0, $zero, .L80A7A3CC /* 01414 80A7A3C4 00000000 */ nop /* 01418 80A7A3C8 2508FFF8 */ addiu $t0, $t0, 0xFFF8 ## $t0 = FFFFFFF8 .L80A7A3CC: @@ -60,69 +60,69 @@ glabel func_80A7A304 /* 01420 80A7A3D0 860201E6 */ lh $v0, 0x01E6($s0) ## 000001E6 /* 01424 80A7A3D4 24E733E0 */ addiu $a3, $a3, 0x33E0 ## $a3 = 801333E0 /* 01428 80A7A3D8 2404181E */ addiu $a0, $zero, 0x181E ## $a0 = 0000181E -/* 0142C 80A7A3DC 10410003 */ beq $v0, $at, .L80A7A3EC +/* 0142C 80A7A3DC 10410003 */ beq $v0, $at, .L80A7A3EC /* 01430 80A7A3E0 A60201E8 */ sh $v0, 0x01E8($s0) ## 000001E8 /* 01434 80A7A3E4 24010004 */ addiu $at, $zero, 0x0004 ## $at = 00000004 -/* 01438 80A7A3E8 14410018 */ bne $v0, $at, .L80A7A44C +/* 01438 80A7A3E8 14410018 */ bne $v0, $at, .L80A7A44C .L80A7A3EC: /* 0143C 80A7A3EC 3C098013 */ lui $t1, 0x8013 ## $t1 = 80130000 /* 01440 80A7A3F0 252933E8 */ addiu $t1, $t1, 0x33E8 ## $t1 = 801333E8 /* 01444 80A7A3F4 260500E4 */ addiu $a1, $s0, 0x00E4 ## $a1 = 000000E4 -/* 01448 80A7A3F8 AFA50038 */ sw $a1, 0x0038($sp) -/* 0144C 80A7A3FC AFA90014 */ sw $t1, 0x0014($sp) +/* 01448 80A7A3F8 AFA50038 */ sw $a1, 0x0038($sp) +/* 0144C 80A7A3FC AFA90014 */ sw $t1, 0x0014($sp) /* 01450 80A7A400 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 /* 01454 80A7A404 0C03DCE3 */ jal Audio_PlaySoundGeneral - -/* 01458 80A7A408 AFA70010 */ sw $a3, 0x0010($sp) + +/* 01458 80A7A408 AFA70010 */ sw $a3, 0x0010($sp) /* 0145C 80A7A40C 0C03F66B */ jal Math_Rand_ZeroOne ## Rand.Next() float /* 01460 80A7A410 00000000 */ nop /* 01464 80A7A414 3C0180A8 */ lui $at, %hi(D_80A7BADC) ## $at = 80A80000 -/* 01468 80A7A418 C430BADC */ lwc1 $f16, %lo(D_80A7BADC)($at) +/* 01468 80A7A418 C430BADC */ lwc1 $f16, %lo(D_80A7BADC)($at) /* 0146C 80A7A41C 3C078013 */ lui $a3, 0x8013 ## $a3 = 80130000 /* 01470 80A7A420 24E733E0 */ addiu $a3, $a3, 0x33E0 ## $a3 = 801333E0 -/* 01474 80A7A424 4610003C */ c.lt.s $f0, $f16 +/* 01474 80A7A424 4610003C */ c.lt.s $f0, $f16 /* 01478 80A7A428 24041844 */ addiu $a0, $zero, 0x1844 ## $a0 = 00001844 -/* 0147C 80A7A42C 8FA50038 */ lw $a1, 0x0038($sp) +/* 0147C 80A7A42C 8FA50038 */ lw $a1, 0x0038($sp) /* 01480 80A7A430 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 -/* 01484 80A7A434 45000005 */ bc1f .L80A7A44C +/* 01484 80A7A434 45000005 */ bc1f .L80A7A44C /* 01488 80A7A438 3C0A8013 */ lui $t2, 0x8013 ## $t2 = 80130000 /* 0148C 80A7A43C 254A33E8 */ addiu $t2, $t2, 0x33E8 ## $t2 = 801333E8 -/* 01490 80A7A440 AFAA0014 */ sw $t2, 0x0014($sp) +/* 01490 80A7A440 AFAA0014 */ sw $t2, 0x0014($sp) /* 01494 80A7A444 0C03DCE3 */ jal Audio_PlaySoundGeneral - -/* 01498 80A7A448 AFA70010 */ sw $a3, 0x0010($sp) + +/* 01498 80A7A448 AFA70010 */ sw $a3, 0x0010($sp) .L80A7A44C: /* 0149C 80A7A44C 860B01E6 */ lh $t3, 0x01E6($s0) ## 000001E6 /* 014A0 80A7A450 3C0480A8 */ lui $a0, %hi(D_80A7B918) ## $a0 = 80A80000 -/* 014A4 80A7A454 000B6080 */ sll $t4, $t3, 2 -/* 014A8 80A7A458 008C2021 */ addu $a0, $a0, $t4 +/* 014A4 80A7A454 000B6080 */ sll $t4, $t3, 2 +/* 014A8 80A7A458 008C2021 */ addu $a0, $a0, $t4 /* 014AC 80A7A45C 0C028800 */ jal SkelAnime_GetFrameCount - -/* 014B0 80A7A460 8C84B918 */ lw $a0, %lo(D_80A7B918)($a0) + +/* 014B0 80A7A460 8C84B918 */ lw $a0, %lo(D_80A7B918)($a0) /* 014B4 80A7A464 44829000 */ mtc1 $v0, $f18 ## $f18 = 0.00 /* 014B8 80A7A468 860D01E6 */ lh $t5, 0x01E6($s0) ## 000001E6 /* 014BC 80A7A46C 3C01C120 */ lui $at, 0xC120 ## $at = C1200000 -/* 014C0 80A7A470 46809120 */ cvt.s.w $f4, $f18 +/* 014C0 80A7A470 46809120 */ cvt.s.w $f4, $f18 /* 014C4 80A7A474 44813000 */ mtc1 $at, $f6 ## $f6 = -10.00 /* 014C8 80A7A478 3C0580A8 */ lui $a1, %hi(D_80A7B918) ## $a1 = 80A80000 -/* 014CC 80A7A47C 000D7080 */ sll $t6, $t5, 2 -/* 014D0 80A7A480 00AE2821 */ addu $a1, $a1, $t6 +/* 014CC 80A7A47C 000D7080 */ sll $t6, $t5, 2 +/* 014D0 80A7A480 00AE2821 */ addu $a1, $a1, $t6 /* 014D4 80A7A484 240F0002 */ addiu $t7, $zero, 0x0002 ## $t7 = 00000002 -/* 014D8 80A7A488 AFAF0014 */ sw $t7, 0x0014($sp) -/* 014DC 80A7A48C 8CA5B918 */ lw $a1, %lo(D_80A7B918)($a1) -/* 014E0 80A7A490 E7A40010 */ swc1 $f4, 0x0010($sp) -/* 014E4 80A7A494 8FA40034 */ lw $a0, 0x0034($sp) +/* 014D8 80A7A488 AFAF0014 */ sw $t7, 0x0014($sp) +/* 014DC 80A7A48C 8CA5B918 */ lw $a1, %lo(D_80A7B918)($a1) +/* 014E0 80A7A490 E7A40010 */ swc1 $f4, 0x0010($sp) +/* 014E4 80A7A494 8FA40034 */ lw $a0, 0x0034($sp) /* 014E8 80A7A498 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 014EC 80A7A49C 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 014F0 80A7A4A0 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 014F4 80A7A4A4 E7A60018 */ swc1 $f6, 0x0018($sp) -/* 014F8 80A7A4A8 8FBF002C */ lw $ra, 0x002C($sp) +/* 014F0 80A7A4A0 0C029468 */ jal SkelAnime_ChangeAnim + +/* 014F4 80A7A4A4 E7A60018 */ swc1 $f6, 0x0018($sp) +/* 014F8 80A7A4A8 8FBF002C */ lw $ra, 0x002C($sp) .L80A7A4AC: -/* 014FC 80A7A4AC 8FB00028 */ lw $s0, 0x0028($sp) +/* 014FC 80A7A4AC 8FB00028 */ lw $s0, 0x0028($sp) /* 01500 80A7A4B0 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 -/* 01504 80A7A4B4 03E00008 */ jr $ra +/* 01504 80A7A4B4 03E00008 */ jr $ra /* 01508 80A7A4B8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_In/func_80A7B570.s b/asm/non_matchings/overlays/actors/ovl_En_In/func_80A7B570.s index f6feb83fcf..8cc50b6061 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_In/func_80A7B570.s +++ b/asm/non_matchings/overlays/actors/ovl_En_In/func_80A7B570.s @@ -20,7 +20,7 @@ glabel func_80A7B570 /* 02608 80A7B5B8 2407091F */ addiu $a3, $zero, 0x091F ## $a3 = 0000091F /* 0260C 80A7B5BC 8D250000 */ lw $a1, 0x0000($t1) ## 00000000 /* 02610 80A7B5C0 27A40024 */ addiu $a0, $sp, 0x0024 ## $a0 = FFFFFFDC -/* 02614 80A7B5C4 0C031AB1 */ jal func_800C6AC4 +/* 02614 80A7B5C4 0C031AB1 */ jal Graph_OpenDisps /* 02618 80A7B5C8 AFA50034 */ sw $a1, 0x0034($sp) /* 0261C 80A7B5CC 8FA7004C */ lw $a3, 0x004C($sp) /* 02620 80A7B5D0 24010010 */ addiu $at, $zero, 0x0010 ## $at = 00000010 @@ -77,7 +77,7 @@ glabel func_80A7B570 /* 026E0 80A7B690 3C0680A8 */ lui $a2, %hi(D_80A7B9FC) ## $a2 = 80A80000 /* 026E4 80A7B694 24C6B9FC */ addiu $a2, $a2, %lo(D_80A7B9FC) ## $a2 = 80A7B9FC /* 026E8 80A7B698 2407093D */ addiu $a3, $zero, 0x093D ## $a3 = 0000093D -/* 026EC 80A7B69C 0C031AD5 */ jal func_800C6B54 +/* 026EC 80A7B69C 0C031AD5 */ jal Graph_CloseDisps /* 026F0 80A7B6A0 8DA50000 */ lw $a1, 0x0000($t5) ## 00000000 /* 026F4 80A7B6A4 8FBF0014 */ lw $ra, 0x0014($sp) /* 026F8 80A7B6A8 27BD0048 */ addiu $sp, $sp, 0x0048 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Insect/func_80A7BF58.s b/asm/non_matchings/overlays/actors/ovl_En_Insect/func_80A7BF58.s index df43a75928..088010af9e 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Insect/func_80A7BF58.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Insect/func_80A7BF58.s @@ -1,22 +1,22 @@ glabel func_80A7BF58 /* 00138 80A7BF58 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 /* 0013C 80A7BF5C 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 00140 80A7BF60 AFBF0024 */ sw $ra, 0x0024($sp) -/* 00144 80A7BF64 AFA40028 */ sw $a0, 0x0028($sp) +/* 00140 80A7BF60 AFBF0024 */ sw $ra, 0x0024($sp) +/* 00144 80A7BF64 AFA40028 */ sw $a0, 0x0028($sp) /* 00148 80A7BF68 3C050403 */ lui $a1, 0x0403 ## $a1 = 04030000 /* 0014C 80A7BF6C 240E0001 */ addiu $t6, $zero, 0x0001 ## $t6 = 00000001 -/* 00150 80A7BF70 44070000 */ mfc1 $a3, $f0 -/* 00154 80A7BF74 AFAE0014 */ sw $t6, 0x0014($sp) +/* 00150 80A7BF70 44070000 */ mfc1 $a3, $f0 +/* 00154 80A7BF74 AFAE0014 */ sw $t6, 0x0014($sp) /* 00158 80A7BF78 24A541FC */ addiu $a1, $a1, 0x41FC ## $a1 = 040341FC /* 0015C 80A7BF7C 248401AC */ addiu $a0, $a0, 0x01AC ## $a0 = 000001AC /* 00160 80A7BF80 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 00164 80A7BF84 E7A00010 */ swc1 $f0, 0x0010($sp) -/* 00168 80A7BF88 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 0016C 80A7BF8C E7A00018 */ swc1 $f0, 0x0018($sp) -/* 00170 80A7BF90 8FBF0024 */ lw $ra, 0x0024($sp) +/* 00164 80A7BF84 E7A00010 */ swc1 $f0, 0x0010($sp) +/* 00168 80A7BF88 0C029468 */ jal SkelAnime_ChangeAnim + +/* 0016C 80A7BF8C E7A00018 */ swc1 $f0, 0x0018($sp) +/* 00170 80A7BF90 8FBF0024 */ lw $ra, 0x0024($sp) /* 00174 80A7BF94 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 00178 80A7BF98 03E00008 */ jr $ra +/* 00178 80A7BF98 03E00008 */ jr $ra /* 0017C 80A7BF9C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ishi/func_80A7F514.s b/asm/non_matchings/overlays/actors/ovl_En_Ishi/func_80A7F514.s index c5ebaf2eb4..f206b8d042 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ishi/func_80A7F514.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ishi/func_80A7F514.s @@ -58,12 +58,12 @@ glabel func_80A7F514 /* 0118C 80A7F5EC 24050003 */ addiu $a1, $zero, 0x0003 ## $a1 = 00000003 /* 01190 80A7F5F0 000E7880 */ sll $t7, $t6, 2 /* 01194 80A7F5F4 022FC021 */ addu $t8, $s1, $t7 -/* 01198 80A7F5F8 0C024BE2 */ jal func_80092F88 +/* 01198 80A7F5F8 0C024BE2 */ jal Quake_Add /* 0119C 80A7F5FC 8F040790 */ lw $a0, 0x0790($t8) ## 00000790 /* 011A0 80A7F600 00022400 */ sll $a0, $v0, 16 /* 011A4 80A7F604 AFA20040 */ sw $v0, 0x0040($sp) /* 011A8 80A7F608 00042403 */ sra $a0, $a0, 16 -/* 011AC 80A7F60C 0C024B6B */ jal func_80092DAC +/* 011AC 80A7F60C 0C024B6B */ jal Quake_SetSpeed /* 011B0 80A7F610 2405C350 */ addiu $a1, $zero, 0xC350 ## $a1 = FFFFC350 /* 011B4 80A7F614 87B10042 */ lh $s1, 0x0042($sp) /* 011B8 80A7F618 24050003 */ addiu $a1, $zero, 0x0003 ## $a1 = 00000003 @@ -71,11 +71,11 @@ glabel func_80A7F514 /* 011C0 80A7F620 00112400 */ sll $a0, $s1, 16 /* 011C4 80A7F624 00042403 */ sra $a0, $a0, 16 /* 011C8 80A7F628 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 011CC 80A7F62C 0C024B9C */ jal func_80092E70 +/* 011CC 80A7F62C 0C024B9C */ jal Quake_SetQuakeValues /* 011D0 80A7F630 AFA00010 */ sw $zero, 0x0010($sp) /* 011D4 80A7F634 00112400 */ sll $a0, $s1, 16 /* 011D8 80A7F638 00042403 */ sra $a0, $a0, 16 -/* 011DC 80A7F63C 0C024B7C */ jal func_80092DF0 +/* 011DC 80A7F63C 0C024B7C */ jal Quake_SetCountdown /* 011E0 80A7F640 24050007 */ addiu $a1, $zero, 0x0007 ## $a1 = 00000007 /* 011E4 80A7F644 C60C008C */ lwc1 $f12, 0x008C($s0) ## 0000008C /* 011E8 80A7F648 240500FF */ addiu $a1, $zero, 0x00FF ## $a1 = 000000FF diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ishi/func_80A7F8A0.s b/asm/non_matchings/overlays/actors/ovl_En_Ishi/func_80A7F8A0.s index 0deb3b2a16..06d303d4d2 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ishi/func_80A7F8A0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ishi/func_80A7F8A0.s @@ -4,7 +4,7 @@ glabel func_80A7F8A0 /* 01448 80A7F8A8 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 /* 0144C 80A7F8AC AFBF0014 */ sw $ra, 0x0014($sp) /* 01450 80A7F8B0 3C050501 */ lui $a1, 0x0501 ## $a1 = 05010000 -/* 01454 80A7F8B4 0C00D498 */ jal Draw_DListOpa +/* 01454 80A7F8B4 0C00D498 */ jal Gfx_DrawDListOpa /* 01458 80A7F8B8 24A5A880 */ addiu $a1, $a1, 0xA880 ## $a1 = 0500A880 /* 0145C 80A7F8BC 8FBF0014 */ lw $ra, 0x0014($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ishi/func_80A7F8CC.s b/asm/non_matchings/overlays/actors/ovl_En_Ishi/func_80A7F8CC.s index caa0a7803c..38e9152e9c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ishi/func_80A7F8CC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ishi/func_80A7F8CC.s @@ -9,7 +9,7 @@ glabel func_80A7F8CC /* 01488 80A7F8E8 24C67428 */ addiu $a2, $a2, %lo(D_80A87428) ## $a2 = 80A87428 /* 0148C 80A7F8EC 27A40034 */ addiu $a0, $sp, 0x0034 ## $a0 = FFFFFFEC /* 01490 80A7F8F0 2407041A */ addiu $a3, $zero, 0x041A ## $a3 = 0000041A -/* 01494 80A7F8F4 0C031AB1 */ jal func_800C6AC4 +/* 01494 80A7F8F4 0C031AB1 */ jal Graph_OpenDisps /* 01498 80A7F8F8 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 /* 0149C 80A7F8FC 8FAF004C */ lw $t7, 0x004C($sp) /* 014A0 80A7F900 0C024F46 */ jal func_80093D18 @@ -49,7 +49,7 @@ glabel func_80A7F8CC /* 01528 80A7F988 24C67448 */ addiu $a2, $a2, %lo(D_80A87448) ## $a2 = 80A87448 /* 0152C 80A7F98C 27A40034 */ addiu $a0, $sp, 0x0034 ## $a0 = FFFFFFEC /* 01530 80A7F990 24070426 */ addiu $a3, $zero, 0x0426 ## $a3 = 00000426 -/* 01534 80A7F994 0C031AD5 */ jal func_800C6B54 +/* 01534 80A7F994 0C031AD5 */ jal Graph_CloseDisps /* 01538 80A7F998 8DE50000 */ lw $a1, 0x0000($t7) ## 00000000 /* 0153C 80A7F99C 8FBF001C */ lw $ra, 0x001C($sp) /* 01540 80A7F9A0 8FB00018 */ lw $s0, 0x0018($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Jj/EnJj_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Jj/EnJj_Draw.s index 5314ca752d..b94b8f2980 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Jj/EnJj_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Jj/EnJj_Draw.s @@ -1,41 +1,41 @@ glabel EnJj_Draw /* 00800 80A88000 27BDFFA8 */ addiu $sp, $sp, 0xFFA8 ## $sp = FFFFFFA8 -/* 00804 80A88004 AFBF002C */ sw $ra, 0x002C($sp) -/* 00808 80A88008 AFB00028 */ sw $s0, 0x0028($sp) -/* 0080C 80A8800C AFA5005C */ sw $a1, 0x005C($sp) +/* 00804 80A88004 AFBF002C */ sw $ra, 0x002C($sp) +/* 00808 80A88008 AFB00028 */ sw $s0, 0x0028($sp) +/* 0080C 80A8800C AFA5005C */ sw $a1, 0x005C($sp) /* 00810 80A88010 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 /* 00814 80A88014 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 00818 80A88018 3C0680A9 */ lui $a2, %hi(D_80A88D10) ## $a2 = 80A90000 /* 0081C 80A8801C 24C68D10 */ addiu $a2, $a2, %lo(D_80A88D10) ## $a2 = 80A88D10 /* 00820 80A88020 27A4003C */ addiu $a0, $sp, 0x003C ## $a0 = FFFFFFE4 /* 00824 80A88024 2407036F */ addiu $a3, $zero, 0x036F ## $a3 = 0000036F -/* 00828 80A88028 0C031AB1 */ jal func_800C6AC4 -/* 0082C 80A8802C AFA5004C */ sw $a1, 0x004C($sp) -/* 00830 80A88030 8FAF005C */ lw $t7, 0x005C($sp) -/* 00834 80A88034 0C0250F2 */ jal func_800943C8 +/* 00828 80A88028 0C031AB1 */ jal Graph_OpenDisps +/* 0082C 80A8802C AFA5004C */ sw $a1, 0x004C($sp) +/* 00830 80A88030 8FAF005C */ lw $t7, 0x005C($sp) +/* 00834 80A88034 0C0250F2 */ jal func_800943C8 /* 00838 80A88038 8DE40000 */ lw $a0, 0x0000($t7) ## 00000000 /* 0083C 80A8803C 3C0180A9 */ lui $at, %hi(D_80A88D34) ## $at = 80A90000 -/* 00840 80A88040 C4268D34 */ lwc1 $f6, %lo(D_80A88D34)($at) +/* 00840 80A88040 C4268D34 */ lwc1 $f6, %lo(D_80A88D34)($at) /* 00844 80A88044 C604017C */ lwc1 $f4, 0x017C($s0) ## 0000017C -/* 00848 80A88048 46062302 */ mul.s $f12, $f4, $f6 +/* 00848 80A88048 46062302 */ mul.s $f12, $f4, $f6 /* 0084C 80A8804C 0C041184 */ jal cosf - + /* 00850 80A88050 00000000 */ nop /* 00854 80A88054 3C014120 */ lui $at, 0x4120 ## $at = 41200000 /* 00858 80A88058 44811000 */ mtc1 $at, $f2 ## $f2 = 10.00 /* 0085C 80A8805C 44806000 */ mtc1 $zero, $f12 ## $f12 = 0.00 /* 00860 80A88060 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 00864 80A88064 46020202 */ mul.s $f8, $f0, $f2 -/* 00868 80A88068 44066000 */ mfc1 $a2, $f12 -/* 0086C 80A8806C 0C034261 */ jal Matrix_Translate -/* 00870 80A88070 46024381 */ sub.s $f14, $f8, $f2 +/* 00864 80A88064 46020202 */ mul.s $f8, $f0, $f2 +/* 00868 80A88068 44066000 */ mfc1 $a2, $f12 +/* 0086C 80A8806C 0C034261 */ jal Matrix_Translate +/* 00870 80A88070 46024381 */ sub.s $f14, $f8, $f2 /* 00874 80A88074 3C014120 */ lui $at, 0x4120 ## $at = 41200000 /* 00878 80A88078 44816000 */ mtc1 $at, $f12 ## $f12 = 10.00 /* 0087C 80A8807C 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 00880 80A88080 44066000 */ mfc1 $a2, $f12 -/* 00884 80A88084 0C0342A3 */ jal Matrix_Scale -/* 00888 80A88088 46006386 */ mov.s $f14, $f12 -/* 0088C 80A8808C 8FA5004C */ lw $a1, 0x004C($sp) +/* 00880 80A88080 44066000 */ mfc1 $a2, $f12 +/* 00884 80A88084 0C0342A3 */ jal Matrix_Scale +/* 00888 80A88088 46006386 */ mov.s $f14, $f12 +/* 0088C 80A8808C 8FA5004C */ lw $a1, 0x004C($sp) /* 00890 80A88090 3C19DB06 */ lui $t9, 0xDB06 ## $t9 = DB060000 /* 00894 80A88094 37390020 */ ori $t9, $t9, 0x0020 ## $t9 = DB060020 /* 00898 80A88098 8CA302C0 */ lw $v1, 0x02C0($a1) ## 000002C0 @@ -47,37 +47,37 @@ glabel EnJj_Draw /* 008B0 80A880B0 9208030E */ lbu $t0, 0x030E($s0) ## 0000030E /* 008B4 80A880B4 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 /* 008B8 80A880B8 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF -/* 008BC 80A880BC 00084880 */ sll $t1, $t0, 2 -/* 008C0 80A880C0 00892021 */ addu $a0, $a0, $t1 -/* 008C4 80A880C4 8C848CFC */ lw $a0, %lo(D_80A88CFC)($a0) -/* 008C8 80A880C8 00045900 */ sll $t3, $a0, 4 -/* 008CC 80A880CC 000B6702 */ srl $t4, $t3, 28 -/* 008D0 80A880D0 000C6880 */ sll $t5, $t4, 2 -/* 008D4 80A880D4 01CD7021 */ addu $t6, $t6, $t5 +/* 008BC 80A880BC 00084880 */ sll $t1, $t0, 2 +/* 008C0 80A880C0 00892021 */ addu $a0, $a0, $t1 +/* 008C4 80A880C4 8C848CFC */ lw $a0, %lo(D_80A88CFC)($a0) +/* 008C8 80A880C8 00045900 */ sll $t3, $a0, 4 +/* 008CC 80A880CC 000B6702 */ srl $t4, $t3, 28 +/* 008D0 80A880D0 000C6880 */ sll $t5, $t4, 2 +/* 008D4 80A880D4 01CD7021 */ addu $t6, $t6, $t5 /* 008D8 80A880D8 8DCE6FA8 */ lw $t6, 0x6FA8($t6) ## 80166FA8 -/* 008DC 80A880DC 00815024 */ and $t2, $a0, $at +/* 008DC 80A880DC 00815024 */ and $t2, $a0, $at /* 008E0 80A880E0 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 008E4 80A880E4 014E7821 */ addu $t7, $t2, $t6 -/* 008E8 80A880E8 01E1C021 */ addu $t8, $t7, $at +/* 008E4 80A880E4 014E7821 */ addu $t7, $t2, $t6 +/* 008E8 80A880E8 01E1C021 */ addu $t8, $t7, $at /* 008EC 80A880EC AC780004 */ sw $t8, 0x0004($v1) ## 00000004 /* 008F0 80A880F0 92070166 */ lbu $a3, 0x0166($s0) ## 00000166 /* 008F4 80A880F4 8E060184 */ lw $a2, 0x0184($s0) ## 00000184 /* 008F8 80A880F8 8E050168 */ lw $a1, 0x0168($s0) ## 00000168 -/* 008FC 80A880FC AFB00018 */ sw $s0, 0x0018($sp) -/* 00900 80A88100 AFA00014 */ sw $zero, 0x0014($sp) -/* 00904 80A88104 AFA00010 */ sw $zero, 0x0010($sp) -/* 00908 80A88108 0C0286B2 */ jal func_800A1AC8 -/* 0090C 80A8810C 8FA4005C */ lw $a0, 0x005C($sp) -/* 00910 80A88110 8FB9005C */ lw $t9, 0x005C($sp) +/* 008FC 80A880FC AFB00018 */ sw $s0, 0x0018($sp) +/* 00900 80A88100 AFA00014 */ sw $zero, 0x0014($sp) +/* 00904 80A88104 AFA00010 */ sw $zero, 0x0010($sp) +/* 00908 80A88108 0C0286B2 */ jal SkelAnime_DrawSV +/* 0090C 80A8810C 8FA4005C */ lw $a0, 0x005C($sp) +/* 00910 80A88110 8FB9005C */ lw $t9, 0x005C($sp) /* 00914 80A88114 3C0680A9 */ lui $a2, %hi(D_80A88D20) ## $a2 = 80A90000 /* 00918 80A88118 24C68D20 */ addiu $a2, $a2, %lo(D_80A88D20) ## $a2 = 80A88D20 /* 0091C 80A8811C 27A4003C */ addiu $a0, $sp, 0x003C ## $a0 = FFFFFFE4 /* 00920 80A88120 24070382 */ addiu $a3, $zero, 0x0382 ## $a3 = 00000382 -/* 00924 80A88124 0C031AD5 */ jal func_800C6B54 +/* 00924 80A88124 0C031AD5 */ jal Graph_CloseDisps /* 00928 80A88128 8F250000 */ lw $a1, 0x0000($t9) ## 00000000 -/* 0092C 80A8812C 8FBF002C */ lw $ra, 0x002C($sp) -/* 00930 80A88130 8FB00028 */ lw $s0, 0x0028($sp) +/* 0092C 80A8812C 8FBF002C */ lw $ra, 0x002C($sp) +/* 00930 80A88130 8FB00028 */ lw $s0, 0x0028($sp) /* 00934 80A88134 27BD0058 */ addiu $sp, $sp, 0x0058 ## $sp = 00000000 -/* 00938 80A88138 03E00008 */ jr $ra +/* 00938 80A88138 03E00008 */ jr $ra /* 0093C 80A8813C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Jj/EnJj_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Jj/EnJj_Init.s index e476a3a127..88dc71552a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Jj/EnJj_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Jj/EnJj_Init.s @@ -1,52 +1,52 @@ glabel EnJj_Init /* 00008 80A87808 27BDFFA8 */ addiu $sp, $sp, 0xFFA8 ## $sp = FFFFFFA8 -/* 0000C 80A8780C AFB10038 */ sw $s1, 0x0038($sp) +/* 0000C 80A8780C AFB10038 */ sw $s1, 0x0038($sp) /* 00010 80A87810 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 -/* 00014 80A87814 AFBF003C */ sw $ra, 0x003C($sp) -/* 00018 80A87818 AFB00034 */ sw $s0, 0x0034($sp) +/* 00014 80A87814 AFBF003C */ sw $ra, 0x003C($sp) +/* 00018 80A87818 AFB00034 */ sw $s0, 0x0034($sp) /* 0001C 80A8781C 3C0580A9 */ lui $a1, %hi(D_80A88CE0) ## $a1 = 80A90000 /* 00020 80A87820 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00024 80A87824 AFA0004C */ sw $zero, 0x004C($sp) +/* 00024 80A87824 AFA0004C */ sw $zero, 0x004C($sp) /* 00028 80A87828 0C01E037 */ jal Actor_ProcessInitChain - + /* 0002C 80A8782C 24A58CE0 */ addiu $a1, $a1, %lo(D_80A88CE0) ## $a1 = 80A88CE0 /* 00030 80A87830 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 /* 00034 80A87834 260400B4 */ addiu $a0, $s0, 0x00B4 ## $a0 = 000000B4 /* 00038 80A87838 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 0003C 80A8783C 44050000 */ mfc1 $a1, $f0 -/* 00040 80A87840 44070000 */ mfc1 $a3, $f0 +/* 0003C 80A8783C 44050000 */ mfc1 $a1, $f0 +/* 00040 80A87840 44070000 */ mfc1 $a3, $f0 /* 00044 80A87844 0C00AC78 */ jal ActorShape_Init - + /* 00048 80A87848 00000000 */ nop /* 0004C 80A8784C 8602001C */ lh $v0, 0x001C($s0) ## 0000001C /* 00050 80A87850 2401FFFF */ addiu $at, $zero, 0xFFFF ## $at = FFFFFFFF /* 00054 80A87854 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 00058 80A87858 10410008 */ beq $v0, $at, .L80A8787C +/* 00058 80A87858 10410008 */ beq $v0, $at, .L80A8787C /* 0005C 80A8785C 26050164 */ addiu $a1, $s0, 0x0164 ## $a1 = 00000164 -/* 00060 80A87860 10400058 */ beq $v0, $zero, .L80A879C4 +/* 00060 80A87860 10400058 */ beq $v0, $zero, .L80A879C4 /* 00064 80A87864 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 00068 80A87868 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 0006C 80A8786C 10410070 */ beq $v0, $at, .L80A87A30 +/* 0006C 80A8786C 10410070 */ beq $v0, $at, .L80A87A30 /* 00070 80A87870 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00074 80A87874 10000083 */ beq $zero, $zero, .L80A87A84 -/* 00078 80A87878 8FBF003C */ lw $ra, 0x003C($sp) +/* 00074 80A87874 10000083 */ beq $zero, $zero, .L80A87A84 +/* 00078 80A87878 8FBF003C */ lw $ra, 0x003C($sp) .L80A8787C: /* 0007C 80A8787C 3C060601 */ lui $a2, 0x0601 ## $a2 = 06010000 /* 00080 80A87880 3C070600 */ lui $a3, 0x0600 ## $a3 = 06000000 /* 00084 80A87884 260E01A8 */ addiu $t6, $s0, 0x01A8 ## $t6 = 000001A8 /* 00088 80A87888 260F022C */ addiu $t7, $s0, 0x022C ## $t7 = 0000022C /* 0008C 80A8788C 24180016 */ addiu $t8, $zero, 0x0016 ## $t8 = 00000016 -/* 00090 80A87890 AFB80018 */ sw $t8, 0x0018($sp) -/* 00094 80A87894 AFAF0014 */ sw $t7, 0x0014($sp) -/* 00098 80A87898 AFAE0010 */ sw $t6, 0x0010($sp) +/* 00090 80A87890 AFB80018 */ sw $t8, 0x0018($sp) +/* 00094 80A87894 AFAF0014 */ sw $t7, 0x0014($sp) +/* 00098 80A87898 AFAE0010 */ sw $t6, 0x0010($sp) /* 0009C 80A8789C 24E71F4C */ addiu $a3, $a3, 0x1F4C ## $a3 = 06001F4C /* 000A0 80A878A0 24C6B9A8 */ addiu $a2, $a2, 0xB9A8 ## $a2 = 0600B9A8 -/* 000A4 80A878A4 0C0291BE */ jal func_800A46F8 -/* 000A8 80A878A8 AFA50044 */ sw $a1, 0x0044($sp) +/* 000A4 80A878A4 0C0291BE */ jal SkelAnime_InitSV +/* 000A8 80A878A8 AFA50044 */ sw $a1, 0x0044($sp) /* 000AC 80A878AC 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 000B0 80A878B0 24A51F4C */ addiu $a1, $a1, 0x1F4C ## $a1 = 06001F4C -/* 000B4 80A878B4 0C0294BE */ jal func_800A52F8 -/* 000B8 80A878B8 8FA40044 */ lw $a0, 0x0044($sp) +/* 000B4 80A878B4 0C0294BE */ jal SkelAnime_ChangeAnimDefaultRepeat +/* 000B8 80A878B8 8FA40044 */ lw $a0, 0x0044($sp) /* 000BC 80A878BC A600030A */ sh $zero, 0x030A($s0) ## 0000030A /* 000C0 80A878C0 A200030E */ sb $zero, 0x030E($s0) ## 0000030E /* 000C4 80A878C4 A200030F */ sb $zero, 0x030F($s0) ## 0000030F @@ -57,16 +57,16 @@ glabel EnJj_Init /* 000D8 80A878D8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 000DC 80A878DC 3C0580A8 */ lui $a1, %hi(func_80A87C30) ## $a1 = 80A80000 /* 000E0 80A878E0 33280400 */ andi $t0, $t9, 0x0400 ## $t0 = 00000000 -/* 000E4 80A878E4 11000007 */ beq $t0, $zero, .L80A87904 +/* 000E4 80A878E4 11000007 */ beq $t0, $zero, .L80A87904 /* 000E8 80A878E8 00000000 */ nop /* 000EC 80A878EC 3C0580A8 */ lui $a1, %hi(func_80A87BEC) ## $a1 = 80A80000 /* 000F0 80A878F0 24A57BEC */ addiu $a1, $a1, %lo(func_80A87BEC) ## $a1 = 80A87BEC -/* 000F4 80A878F4 0C2A1E00 */ jal func_80A87800 +/* 000F4 80A878F4 0C2A1E00 */ jal func_80A87800 /* 000F8 80A878F8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 000FC 80A878FC 10000004 */ beq $zero, $zero, .L80A87910 +/* 000FC 80A878FC 10000004 */ beq $zero, $zero, .L80A87910 /* 00100 80A87900 3C014120 */ lui $at, 0x4120 ## $at = 41200000 .L80A87904: -/* 00104 80A87904 0C2A1E00 */ jal func_80A87800 +/* 00104 80A87904 0C2A1E00 */ jal func_80A87800 /* 00108 80A87908 24A57C30 */ addiu $a1, $a1, %lo(func_80A87C30) ## $a1 = 00007C30 /* 0010C 80A8790C 3C014120 */ lui $at, 0x4120 ## $at = 41200000 .L80A87910: @@ -74,73 +74,73 @@ glabel EnJj_Init /* 00114 80A87914 C6040024 */ lwc1 $f4, 0x0024($s0) ## 00000024 /* 00118 80A87918 26241C24 */ addiu $a0, $s1, 0x1C24 ## $a0 = 00001C24 /* 0011C 80A8791C 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 00120 80A87920 46062201 */ sub.s $f8, $f4, $f6 +/* 00120 80A87920 46062201 */ sub.s $f8, $f4, $f6 /* 00124 80A87924 02203025 */ or $a2, $s1, $zero ## $a2 = 00000000 /* 00128 80A87928 2407005A */ addiu $a3, $zero, 0x005A ## $a3 = 0000005A -/* 0012C 80A8792C E7A80010 */ swc1 $f8, 0x0010($sp) +/* 0012C 80A8792C E7A80010 */ swc1 $f8, 0x0010($sp) /* 00130 80A87930 C60A0028 */ lwc1 $f10, 0x0028($s0) ## 00000028 -/* 00134 80A87934 E7AA0014 */ swc1 $f10, 0x0014($sp) +/* 00134 80A87934 E7AA0014 */ swc1 $f10, 0x0014($sp) /* 00138 80A87938 C610002C */ lwc1 $f16, 0x002C($s0) ## 0000002C -/* 0013C 80A8793C AFA0001C */ sw $zero, 0x001C($sp) -/* 00140 80A87940 E7B00018 */ swc1 $f16, 0x0018($sp) +/* 0013C 80A8793C AFA0001C */ sw $zero, 0x001C($sp) +/* 00140 80A87940 E7B00018 */ swc1 $f16, 0x0018($sp) /* 00144 80A87944 86090032 */ lh $t1, 0x0032($s0) ## 00000032 -/* 00148 80A87948 AFA00028 */ sw $zero, 0x0028($sp) -/* 0014C 80A8794C AFA00024 */ sw $zero, 0x0024($sp) +/* 00148 80A87948 AFA00028 */ sw $zero, 0x0028($sp) +/* 0014C 80A8794C AFA00024 */ sw $zero, 0x0024($sp) /* 00150 80A87950 0C00C916 */ jal Actor_SpawnAttached - -/* 00154 80A87954 AFA90020 */ sw $t1, 0x0020($sp) + +/* 00154 80A87954 AFA90020 */ sw $t1, 0x0020($sp) /* 00158 80A87958 AE020300 */ sw $v0, 0x0300($s0) ## 00000300 /* 0015C 80A8795C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 00160 80A87960 0C010D20 */ jal DynaPolyInfo_SetActorMove - + /* 00164 80A87964 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 00168 80A87968 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 /* 0016C 80A8796C 24840A1C */ addiu $a0, $a0, 0x0A1C ## $a0 = 06000A1C /* 00170 80A87970 0C010620 */ jal DynaPolyInfo_Alloc - + /* 00174 80A87974 27A5004C */ addiu $a1, $sp, 0x004C ## $a1 = FFFFFFF4 /* 00178 80A87978 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 0017C 80A8797C 26250810 */ addiu $a1, $s1, 0x0810 ## $a1 = 00000810 /* 00180 80A87980 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 00184 80A87984 0C00FA9D */ jal DynaPolyInfo_RegisterActor ## DynaPolyInfo_setActor -/* 00188 80A87988 8FA7004C */ lw $a3, 0x004C($sp) +/* 00188 80A87988 8FA7004C */ lw $a3, 0x004C($sp) /* 0018C 80A8798C AE02014C */ sw $v0, 0x014C($s0) ## 0000014C /* 00190 80A87990 260502B0 */ addiu $a1, $s0, 0x02B0 ## $a1 = 000002B0 -/* 00194 80A87994 AFA50044 */ sw $a1, 0x0044($sp) +/* 00194 80A87994 AFA50044 */ sw $a1, 0x0044($sp) /* 00198 80A87998 0C0170D9 */ jal ActorCollider_AllocCylinder - + /* 0019C 80A8799C 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 001A0 80A879A0 3C0780A9 */ lui $a3, %hi(D_80A88CB4) ## $a3 = 80A90000 -/* 001A4 80A879A4 8FA50044 */ lw $a1, 0x0044($sp) +/* 001A4 80A879A4 8FA50044 */ lw $a1, 0x0044($sp) /* 001A8 80A879A8 24E78CB4 */ addiu $a3, $a3, %lo(D_80A88CB4) ## $a3 = 80A88CB4 /* 001AC 80A879AC 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 001B0 80A879B0 0C01712B */ jal ActorCollider_InitCylinder - + /* 001B4 80A879B4 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 001B8 80A879B8 240A00FF */ addiu $t2, $zero, 0x00FF ## $t2 = 000000FF -/* 001BC 80A879BC 10000030 */ beq $zero, $zero, .L80A87A80 +/* 001BC 80A879BC 10000030 */ beq $zero, $zero, .L80A87A80 /* 001C0 80A879C0 A20A00AE */ sb $t2, 0x00AE($s0) ## 000000AE .L80A879C4: /* 001C4 80A879C4 0C010D20 */ jal DynaPolyInfo_SetActorMove - + /* 001C8 80A879C8 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 001CC 80A879CC 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 /* 001D0 80A879D0 24841830 */ addiu $a0, $a0, 0x1830 ## $a0 = 06001830 /* 001D4 80A879D4 0C010620 */ jal DynaPolyInfo_Alloc - + /* 001D8 80A879D8 27A5004C */ addiu $a1, $sp, 0x004C ## $a1 = FFFFFFF4 /* 001DC 80A879DC 26250810 */ addiu $a1, $s1, 0x0810 ## $a1 = 00000810 -/* 001E0 80A879E0 AFA50044 */ sw $a1, 0x0044($sp) +/* 001E0 80A879E0 AFA50044 */ sw $a1, 0x0044($sp) /* 001E4 80A879E4 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 001E8 80A879E8 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 001EC 80A879EC 0C00FA9D */ jal DynaPolyInfo_RegisterActor ## DynaPolyInfo_setActor -/* 001F0 80A879F0 8FA7004C */ lw $a3, 0x004C($sp) -/* 001F4 80A879F4 8FA50044 */ lw $a1, 0x0044($sp) +/* 001F0 80A879F0 8FA7004C */ lw $a3, 0x004C($sp) +/* 001F4 80A879F4 8FA50044 */ lw $a1, 0x0044($sp) /* 001F8 80A879F8 AE02014C */ sw $v0, 0x014C($s0) ## 0000014C /* 001FC 80A879FC 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 00200 80A87A00 0C00FB2A */ jal func_8003ECA8 +/* 00200 80A87A00 0C00FB2A */ jal func_8003ECA8 /* 00204 80A87A04 00403025 */ or $a2, $v0, $zero ## $a2 = 00000000 /* 00208 80A87A08 3C0B80A8 */ lui $t3, %hi(func_80A87F44) ## $t3 = 80A80000 /* 0020C 80A87A0C 256B7F44 */ addiu $t3, $t3, %lo(func_80A87F44) ## $t3 = 80A87F44 @@ -149,25 +149,25 @@ glabel EnJj_Init /* 00218 80A87A18 AE000134 */ sw $zero, 0x0134($s0) ## 00000134 /* 0021C 80A87A1C 34A52D0E */ ori $a1, $a1, 0x2D0E ## $a1 = 3DB22D0E /* 00220 80A87A20 0C00B58B */ jal Actor_SetScale - + /* 00224 80A87A24 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00228 80A87A28 10000016 */ beq $zero, $zero, .L80A87A84 -/* 0022C 80A87A2C 8FBF003C */ lw $ra, 0x003C($sp) +/* 00228 80A87A28 10000016 */ beq $zero, $zero, .L80A87A84 +/* 0022C 80A87A2C 8FBF003C */ lw $ra, 0x003C($sp) .L80A87A30: /* 00230 80A87A30 0C010D20 */ jal DynaPolyInfo_SetActorMove - + /* 00234 80A87A34 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 00238 80A87A38 3C040601 */ lui $a0, 0x0601 ## $a0 = 06010000 /* 0023C 80A87A3C 2484BA8C */ addiu $a0, $a0, 0xBA8C ## $a0 = 0600BA8C /* 00240 80A87A40 0C010620 */ jal DynaPolyInfo_Alloc - + /* 00244 80A87A44 27A5004C */ addiu $a1, $sp, 0x004C ## $a1 = FFFFFFF4 /* 00248 80A87A48 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 0024C 80A87A4C 26250810 */ addiu $a1, $s1, 0x0810 ## $a1 = 00000810 /* 00250 80A87A50 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 00254 80A87A54 0C00FA9D */ jal DynaPolyInfo_RegisterActor ## DynaPolyInfo_setActor -/* 00258 80A87A58 8FA7004C */ lw $a3, 0x004C($sp) +/* 00258 80A87A58 8FA7004C */ lw $a3, 0x004C($sp) /* 0025C 80A87A5C 3C0C80A8 */ lui $t4, %hi(func_80A87F44) ## $t4 = 80A80000 /* 00260 80A87A60 258C7F44 */ addiu $t4, $t4, %lo(func_80A87F44) ## $t4 = 80A87F44 /* 00264 80A87A64 3C053DB2 */ lui $a1, 0x3DB2 ## $a1 = 3DB20000 @@ -176,14 +176,14 @@ glabel EnJj_Init /* 00270 80A87A70 AE000134 */ sw $zero, 0x0134($s0) ## 00000134 /* 00274 80A87A74 34A52D0E */ ori $a1, $a1, 0x2D0E ## $a1 = 3DB22D0E /* 00278 80A87A78 0C00B58B */ jal Actor_SetScale - + /* 0027C 80A87A7C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 .L80A87A80: -/* 00280 80A87A80 8FBF003C */ lw $ra, 0x003C($sp) +/* 00280 80A87A80 8FBF003C */ lw $ra, 0x003C($sp) .L80A87A84: -/* 00284 80A87A84 8FB00034 */ lw $s0, 0x0034($sp) -/* 00288 80A87A88 8FB10038 */ lw $s1, 0x0038($sp) -/* 0028C 80A87A8C 03E00008 */ jr $ra +/* 00284 80A87A84 8FB00034 */ lw $s0, 0x0034($sp) +/* 00288 80A87A88 8FB10038 */ lw $s1, 0x0038($sp) +/* 0028C 80A87A8C 03E00008 */ jr $ra /* 00290 80A87A90 27BD0058 */ addiu $sp, $sp, 0x0058 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Js/EnJs_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Js/EnJs_Draw.s index 062dd55afe..42654dda55 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Js/EnJs_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Js/EnJs_Draw.s @@ -1,11 +1,11 @@ glabel EnJs_Draw /* 00824 80A89634 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 00828 80A89638 AFBF0024 */ sw $ra, 0x0024($sp) -/* 0082C 80A8963C AFA40028 */ sw $a0, 0x0028($sp) -/* 00830 80A89640 AFA5002C */ sw $a1, 0x002C($sp) -/* 00834 80A89644 0C0250F2 */ jal func_800943C8 +/* 00828 80A89638 AFBF0024 */ sw $ra, 0x0024($sp) +/* 0082C 80A8963C AFA40028 */ sw $a0, 0x0028($sp) +/* 00830 80A89640 AFA5002C */ sw $a1, 0x002C($sp) +/* 00834 80A89644 0C0250F2 */ jal func_800943C8 /* 00838 80A89648 8CA40000 */ lw $a0, 0x0000($a1) ## 00000000 -/* 0083C 80A8964C 8FA20028 */ lw $v0, 0x0028($sp) +/* 0083C 80A8964C 8FA20028 */ lw $v0, 0x0028($sp) /* 00840 80A89650 3C0F80A9 */ lui $t7, %hi(func_80A895C0) ## $t7 = 80A90000 /* 00844 80A89654 3C1880A9 */ lui $t8, %hi(func_80A895F4) ## $t8 = 80A90000 /* 00848 80A89658 8C45019C */ lw $a1, 0x019C($v0) ## 0000019C @@ -13,13 +13,13 @@ glabel EnJs_Draw /* 00850 80A89660 9047019A */ lbu $a3, 0x019A($v0) ## 0000019A /* 00854 80A89664 271895F4 */ addiu $t8, $t8, %lo(func_80A895F4) ## $t8 = 80A895F4 /* 00858 80A89668 25EF95C0 */ addiu $t7, $t7, %lo(func_80A895C0) ## $t7 = 80A895C0 -/* 0085C 80A8966C AFAF0010 */ sw $t7, 0x0010($sp) -/* 00860 80A89670 AFB80014 */ sw $t8, 0x0014($sp) -/* 00864 80A89674 8FA4002C */ lw $a0, 0x002C($sp) -/* 00868 80A89678 0C0286B2 */ jal func_800A1AC8 -/* 0086C 80A8967C AFA20018 */ sw $v0, 0x0018($sp) -/* 00870 80A89680 8FBF0024 */ lw $ra, 0x0024($sp) +/* 0085C 80A8966C AFAF0010 */ sw $t7, 0x0010($sp) +/* 00860 80A89670 AFB80014 */ sw $t8, 0x0014($sp) +/* 00864 80A89674 8FA4002C */ lw $a0, 0x002C($sp) +/* 00868 80A89678 0C0286B2 */ jal SkelAnime_DrawSV +/* 0086C 80A8967C AFA20018 */ sw $v0, 0x0018($sp) +/* 00870 80A89680 8FBF0024 */ lw $ra, 0x0024($sp) /* 00874 80A89684 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 00878 80A89688 03E00008 */ jr $ra +/* 00878 80A89688 03E00008 */ jr $ra /* 0087C 80A8968C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Js/EnJs_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Js/EnJs_Init.s index ba76a569cf..b3d975d9fa 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Js/EnJs_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Js/EnJs_Init.s @@ -1,15 +1,15 @@ glabel EnJs_Init /* 00008 80A88E18 27BDFFB0 */ addiu $sp, $sp, 0xFFB0 ## $sp = FFFFFFB0 -/* 0000C 80A88E1C AFB10038 */ sw $s1, 0x0038($sp) -/* 00010 80A88E20 AFB00034 */ sw $s0, 0x0034($sp) +/* 0000C 80A88E1C AFB10038 */ sw $s1, 0x0038($sp) +/* 00010 80A88E20 AFB00034 */ sw $s0, 0x0034($sp) /* 00014 80A88E24 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 00018 80A88E28 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 -/* 0001C 80A88E2C AFBF003C */ sw $ra, 0x003C($sp) +/* 0001C 80A88E2C AFBF003C */ sw $ra, 0x003C($sp) /* 00020 80A88E30 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 /* 00024 80A88E34 248400B4 */ addiu $a0, $a0, 0x00B4 ## $a0 = 000000B4 /* 00028 80A88E38 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 /* 0002C 80A88E3C 0C00AC78 */ jal ActorShape_Init - + /* 00030 80A88E40 3C074210 */ lui $a3, 0x4210 ## $a3 = 42100000 /* 00034 80A88E44 26050198 */ addiu $a1, $s0, 0x0198 ## $a1 = 00000198 /* 00038 80A88E48 3C060600 */ lui $a2, 0x0600 ## $a2 = 06000000 @@ -17,65 +17,65 @@ glabel EnJs_Init /* 00040 80A88E50 260E01DC */ addiu $t6, $s0, 0x01DC ## $t6 = 000001DC /* 00044 80A88E54 260F022A */ addiu $t7, $s0, 0x022A ## $t7 = 0000022A /* 00048 80A88E58 2418000D */ addiu $t8, $zero, 0x000D ## $t8 = 0000000D -/* 0004C 80A88E5C AFB80018 */ sw $t8, 0x0018($sp) -/* 00050 80A88E60 AFAF0014 */ sw $t7, 0x0014($sp) -/* 00054 80A88E64 AFAE0010 */ sw $t6, 0x0010($sp) +/* 0004C 80A88E5C AFB80018 */ sw $t8, 0x0018($sp) +/* 00050 80A88E60 AFAF0014 */ sw $t7, 0x0014($sp) +/* 00054 80A88E64 AFAE0010 */ sw $t6, 0x0010($sp) /* 00058 80A88E68 24E7045C */ addiu $a3, $a3, 0x045C ## $a3 = 0600045C /* 0005C 80A88E6C 24C65EA0 */ addiu $a2, $a2, 0x5EA0 ## $a2 = 06005EA0 -/* 00060 80A88E70 AFA50044 */ sw $a1, 0x0044($sp) -/* 00064 80A88E74 0C0291BE */ jal func_800A46F8 +/* 00060 80A88E70 AFA50044 */ sw $a1, 0x0044($sp) +/* 00064 80A88E74 0C0291BE */ jal SkelAnime_InitSV /* 00068 80A88E78 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 0006C 80A88E7C 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 00070 80A88E80 24A5045C */ addiu $a1, $a1, 0x045C ## $a1 = 0600045C -/* 00074 80A88E84 0C02947A */ jal func_800A51E8 -/* 00078 80A88E88 8FA40044 */ lw $a0, 0x0044($sp) +/* 00074 80A88E84 0C02947A */ jal SkelAnime_ChangeAnimDefaultStop +/* 00078 80A88E88 8FA40044 */ lw $a0, 0x0044($sp) /* 0007C 80A88E8C 2605014C */ addiu $a1, $s0, 0x014C ## $a1 = 0000014C -/* 00080 80A88E90 AFA50044 */ sw $a1, 0x0044($sp) +/* 00080 80A88E90 AFA50044 */ sw $a1, 0x0044($sp) /* 00084 80A88E94 0C0170D9 */ jal ActorCollider_AllocCylinder - + /* 00088 80A88E98 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 0008C 80A88E9C 3C0780A9 */ lui $a3, %hi(D_80A896B0) ## $a3 = 80A90000 -/* 00090 80A88EA0 8FA50044 */ lw $a1, 0x0044($sp) +/* 00090 80A88EA0 8FA50044 */ lw $a1, 0x0044($sp) /* 00094 80A88EA4 24E796B0 */ addiu $a3, $a3, %lo(D_80A896B0) ## $a3 = 80A896B0 /* 00098 80A88EA8 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 0009C 80A88EAC 0C01712B */ jal ActorCollider_InitCylinder - + /* 000A0 80A88EB0 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 000A4 80A88EB4 241900FF */ addiu $t9, $zero, 0x00FF ## $t9 = 000000FF /* 000A8 80A88EB8 3C053C23 */ lui $a1, 0x3C23 ## $a1 = 3C230000 /* 000AC 80A88EBC A21900AE */ sb $t9, 0x00AE($s0) ## 000000AE /* 000B0 80A88EC0 34A5D70A */ ori $a1, $a1, 0xD70A ## $a1 = 3C23D70A /* 000B4 80A88EC4 0C00B58B */ jal Actor_SetScale - + /* 000B8 80A88EC8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 000BC 80A88ECC 3C0580A9 */ lui $a1, %hi(func_80A89304) ## $a1 = 80A90000 /* 000C0 80A88ED0 24A59304 */ addiu $a1, $a1, %lo(func_80A89304) ## $a1 = 80A89304 -/* 000C4 80A88ED4 0C2A2384 */ jal func_80A88E10 +/* 000C4 80A88ED4 0C2A2384 */ jal func_80A88E10 /* 000C8 80A88ED8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 000CC 80A88EDC 3C01BF80 */ lui $at, 0xBF80 ## $at = BF800000 /* 000D0 80A88EE0 44812000 */ mtc1 $at, $f4 ## $f4 = -1.00 /* 000D4 80A88EE4 C6060024 */ lwc1 $f6, 0x0024($s0) ## 00000024 /* 000D8 80A88EE8 A6000284 */ sh $zero, 0x0284($s0) ## 00000284 /* 000DC 80A88EEC E604006C */ swc1 $f4, 0x006C($s0) ## 0000006C -/* 000E0 80A88EF0 E7A60010 */ swc1 $f6, 0x0010($sp) +/* 000E0 80A88EF0 E7A60010 */ swc1 $f6, 0x0010($sp) /* 000E4 80A88EF4 C6080028 */ lwc1 $f8, 0x0028($s0) ## 00000028 /* 000E8 80A88EF8 26241C24 */ addiu $a0, $s1, 0x1C24 ## $a0 = 00001C24 /* 000EC 80A88EFC 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 000F0 80A88F00 E7A80014 */ swc1 $f8, 0x0014($sp) +/* 000F0 80A88F00 E7A80014 */ swc1 $f8, 0x0014($sp) /* 000F4 80A88F04 C60A002C */ lwc1 $f10, 0x002C($s0) ## 0000002C -/* 000F8 80A88F08 AFA00028 */ sw $zero, 0x0028($sp) -/* 000FC 80A88F0C AFA00024 */ sw $zero, 0x0024($sp) -/* 00100 80A88F10 AFA00020 */ sw $zero, 0x0020($sp) -/* 00104 80A88F14 AFA0001C */ sw $zero, 0x001C($sp) +/* 000F8 80A88F08 AFA00028 */ sw $zero, 0x0028($sp) +/* 000FC 80A88F0C AFA00024 */ sw $zero, 0x0024($sp) +/* 00100 80A88F10 AFA00020 */ sw $zero, 0x0020($sp) +/* 00104 80A88F14 AFA0001C */ sw $zero, 0x001C($sp) /* 00108 80A88F18 02203025 */ or $a2, $s1, $zero ## $a2 = 00000000 /* 0010C 80A88F1C 2407016B */ addiu $a3, $zero, 0x016B ## $a3 = 0000016B /* 00110 80A88F20 0C00C916 */ jal Actor_SpawnAttached - -/* 00114 80A88F24 E7AA0018 */ swc1 $f10, 0x0018($sp) -/* 00118 80A88F28 8FBF003C */ lw $ra, 0x003C($sp) -/* 0011C 80A88F2C 8FB00034 */ lw $s0, 0x0034($sp) -/* 00120 80A88F30 8FB10038 */ lw $s1, 0x0038($sp) -/* 00124 80A88F34 03E00008 */ jr $ra + +/* 00114 80A88F24 E7AA0018 */ swc1 $f10, 0x0018($sp) +/* 00118 80A88F28 8FBF003C */ lw $ra, 0x003C($sp) +/* 0011C 80A88F2C 8FB00034 */ lw $s0, 0x0034($sp) +/* 00120 80A88F30 8FB10038 */ lw $s1, 0x0038($sp) +/* 00124 80A88F34 03E00008 */ jr $ra /* 00128 80A88F38 27BD0050 */ addiu $sp, $sp, 0x0050 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Js/func_80A89008.s b/asm/non_matchings/overlays/actors/ovl_En_Js/func_80A89008.s index 7e61ffe70c..8ba357a796 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Js/func_80A89008.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Js/func_80A89008.s @@ -1,33 +1,33 @@ glabel func_80A89008 /* 001F8 80A89008 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 001FC 80A8900C AFBF0024 */ sw $ra, 0x0024($sp) +/* 001FC 80A8900C AFBF0024 */ sw $ra, 0x0024($sp) /* 00200 80A89010 3C0580A9 */ lui $a1, %hi(func_80A89304) ## $a1 = 80A90000 -/* 00204 80A89014 AFA40028 */ sw $a0, 0x0028($sp) -/* 00208 80A89018 0C2A2384 */ jal func_80A88E10 +/* 00204 80A89014 AFA40028 */ sw $a0, 0x0028($sp) +/* 00208 80A89018 0C2A2384 */ jal func_80A88E10 /* 0020C 80A8901C 24A59304 */ addiu $a1, $a1, %lo(func_80A89304) ## $a1 = 80A89304 /* 00210 80A89020 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 /* 00214 80A89024 0C028800 */ jal SkelAnime_GetFrameCount - + /* 00218 80A89028 2484045C */ addiu $a0, $a0, 0x045C ## $a0 = 0600045C /* 0021C 80A8902C 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 00220 80A89030 3C01C080 */ lui $at, 0xC080 ## $at = C0800000 /* 00224 80A89034 44814000 */ mtc1 $at, $f8 ## $f8 = -4.00 -/* 00228 80A89038 468021A0 */ cvt.s.w $f6, $f4 -/* 0022C 80A8903C 8FA40028 */ lw $a0, 0x0028($sp) +/* 00228 80A89038 468021A0 */ cvt.s.w $f6, $f4 +/* 0022C 80A8903C 8FA40028 */ lw $a0, 0x0028($sp) /* 00230 80A89040 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 00234 80A89044 240E0002 */ addiu $t6, $zero, 0x0002 ## $t6 = 00000002 -/* 00238 80A89048 AFAE0014 */ sw $t6, 0x0014($sp) +/* 00238 80A89048 AFAE0014 */ sw $t6, 0x0014($sp) /* 0023C 80A8904C 24A5045C */ addiu $a1, $a1, 0x045C ## $a1 = 0600045C -/* 00240 80A89050 E7A60010 */ swc1 $f6, 0x0010($sp) +/* 00240 80A89050 E7A60010 */ swc1 $f6, 0x0010($sp) /* 00244 80A89054 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 00248 80A89058 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 0024C 80A8905C E7A80018 */ swc1 $f8, 0x0018($sp) -/* 00250 80A89060 0C029468 */ jal SkelAnime_ChangeAnimation - +/* 0024C 80A8905C E7A80018 */ swc1 $f8, 0x0018($sp) +/* 00250 80A89060 0C029468 */ jal SkelAnime_ChangeAnim + /* 00254 80A89064 24840198 */ addiu $a0, $a0, 0x0198 ## $a0 = 00000198 -/* 00258 80A89068 8FBF0024 */ lw $ra, 0x0024($sp) +/* 00258 80A89068 8FBF0024 */ lw $ra, 0x0024($sp) /* 0025C 80A8906C 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 00260 80A89070 03E00008 */ jr $ra +/* 00260 80A89070 03E00008 */ jr $ra /* 00264 80A89074 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Js/func_80A89294.s b/asm/non_matchings/overlays/actors/ovl_En_Js/func_80A89294.s index 36fe76d139..3f957146dc 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Js/func_80A89294.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Js/func_80A89294.s @@ -1,33 +1,33 @@ glabel func_80A89294 /* 00484 80A89294 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 00488 80A89298 AFBF0024 */ sw $ra, 0x0024($sp) +/* 00488 80A89298 AFBF0024 */ sw $ra, 0x0024($sp) /* 0048C 80A8929C 3C0580A9 */ lui $a1, %hi(func_80A891C4) ## $a1 = 80A90000 -/* 00490 80A892A0 AFA40028 */ sw $a0, 0x0028($sp) -/* 00494 80A892A4 0C2A2384 */ jal func_80A88E10 +/* 00490 80A892A0 AFA40028 */ sw $a0, 0x0028($sp) +/* 00494 80A892A4 0C2A2384 */ jal func_80A88E10 /* 00498 80A892A8 24A591C4 */ addiu $a1, $a1, %lo(func_80A891C4) ## $a1 = 80A891C4 /* 0049C 80A892AC 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 /* 004A0 80A892B0 0C028800 */ jal SkelAnime_GetFrameCount - + /* 004A4 80A892B4 2484018C */ addiu $a0, $a0, 0x018C ## $a0 = 0600018C /* 004A8 80A892B8 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 004AC 80A892BC 3C01C080 */ lui $at, 0xC080 ## $at = C0800000 /* 004B0 80A892C0 44814000 */ mtc1 $at, $f8 ## $f8 = -4.00 -/* 004B4 80A892C4 468021A0 */ cvt.s.w $f6, $f4 -/* 004B8 80A892C8 8FA40028 */ lw $a0, 0x0028($sp) +/* 004B4 80A892C4 468021A0 */ cvt.s.w $f6, $f4 +/* 004B8 80A892C8 8FA40028 */ lw $a0, 0x0028($sp) /* 004BC 80A892CC 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 004C0 80A892D0 240E0002 */ addiu $t6, $zero, 0x0002 ## $t6 = 00000002 -/* 004C4 80A892D4 AFAE0014 */ sw $t6, 0x0014($sp) +/* 004C4 80A892D4 AFAE0014 */ sw $t6, 0x0014($sp) /* 004C8 80A892D8 24A5018C */ addiu $a1, $a1, 0x018C ## $a1 = 0600018C -/* 004CC 80A892DC E7A60010 */ swc1 $f6, 0x0010($sp) +/* 004CC 80A892DC E7A60010 */ swc1 $f6, 0x0010($sp) /* 004D0 80A892E0 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 004D4 80A892E4 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 004D8 80A892E8 E7A80018 */ swc1 $f8, 0x0018($sp) -/* 004DC 80A892EC 0C029468 */ jal SkelAnime_ChangeAnimation - +/* 004D8 80A892E8 E7A80018 */ swc1 $f8, 0x0018($sp) +/* 004DC 80A892EC 0C029468 */ jal SkelAnime_ChangeAnim + /* 004E0 80A892F0 24840198 */ addiu $a0, $a0, 0x0198 ## $a0 = 00000198 -/* 004E4 80A892F4 8FBF0024 */ lw $ra, 0x0024($sp) +/* 004E4 80A892F4 8FBF0024 */ lw $ra, 0x0024($sp) /* 004E8 80A892F8 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 004EC 80A892FC 03E00008 */ jr $ra +/* 004EC 80A892FC 03E00008 */ jr $ra /* 004F0 80A89300 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Jsjutan/EnJsjutan_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Jsjutan/EnJsjutan_Draw.s index 68c6a1e336..e34b480889 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Jsjutan/EnJsjutan_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Jsjutan/EnJsjutan_Draw.s @@ -12,7 +12,7 @@ glabel EnJsjutan_Draw /* 00EA0 80A8A640 27A40064 */ addiu $a0, $sp, 0x0064 ## $a0 = FFFFFFDC /* 00EA4 80A8A644 240702BD */ addiu $a3, $zero, 0x02BD ## $a3 = 000002BD /* 00EA8 80A8A648 AFA20078 */ sw $v0, 0x0078($sp) -/* 00EAC 80A8A64C 0C031AB1 */ jal func_800C6AC4 +/* 00EAC 80A8A64C 0C031AB1 */ jal Graph_OpenDisps /* 00EB0 80A8A650 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 /* 00EB4 80A8A654 860F001C */ lh $t7, 0x001C($s0) ## 0000001C /* 00EB8 80A8A658 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 @@ -281,7 +281,7 @@ glabel EnJsjutan_Draw /* 012A4 80A8AA44 24070337 */ addiu $a3, $zero, 0x0337 ## $a3 = 00000337 /* 012A8 80A8AA48 AC4D0004 */ sw $t5, 0x0004($v0) ## 00000004 /* 012AC 80A8AA4C 8FAE008C */ lw $t6, 0x008C($sp) -/* 012B0 80A8AA50 0C031AD5 */ jal func_800C6B54 +/* 012B0 80A8AA50 0C031AD5 */ jal Graph_CloseDisps /* 012B4 80A8AA54 8DC50000 */ lw $a1, 0x0000($t6) ## 00000000 /* 012B8 80A8AA58 8FBF001C */ lw $ra, 0x001C($sp) /* 012BC 80A8AA5C 8FB00014 */ lw $s0, 0x0014($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Kakasi/EnKakasi_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Kakasi/EnKakasi_Draw.s index 1d040ec222..26ee637b56 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Kakasi/EnKakasi_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Kakasi/EnKakasi_Draw.s @@ -2,38 +2,38 @@ glabel EnKakasi_Draw /* 00BE0 80A8FD50 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 /* 00BE4 80A8FD54 3C0E8016 */ lui $t6, 0x8016 ## $t6 = 80160000 /* 00BE8 80A8FD58 8DCEFA90 */ lw $t6, -0x0570($t6) ## 8015FA90 -/* 00BEC 80A8FD5C AFBF0024 */ sw $ra, 0x0024($sp) -/* 00BF0 80A8FD60 AFA40028 */ sw $a0, 0x0028($sp) -/* 00BF4 80A8FD64 AFA5002C */ sw $a1, 0x002C($sp) +/* 00BEC 80A8FD5C AFBF0024 */ sw $ra, 0x0024($sp) +/* 00BF0 80A8FD60 AFA40028 */ sw $a0, 0x0028($sp) +/* 00BF4 80A8FD64 AFA5002C */ sw $a1, 0x002C($sp) /* 00BF8 80A8FD68 85CF12DA */ lh $t7, 0x12DA($t6) ## 801612DA /* 00BFC 80A8FD6C 3C0480A9 */ lui $a0, %hi(D_80A8FEB8) ## $a0 = 80A90000 -/* 00C00 80A8FD70 51E00009 */ beql $t7, $zero, .L80A8FD98 -/* 00C04 80A8FD74 8FB8002C */ lw $t8, 0x002C($sp) +/* 00C00 80A8FD70 51E00009 */ beql $t7, $zero, .L80A8FD98 +/* 00C04 80A8FD74 8FB8002C */ lw $t8, 0x002C($sp) /* 00C08 80A8FD78 0C00084C */ jal osSyncPrintf - + /* 00C0C 80A8FD7C 2484FEB8 */ addiu $a0, $a0, %lo(D_80A8FEB8) ## $a0 = 80A8FEB8 /* 00C10 80A8FD80 3C0480A9 */ lui $a0, %hi(D_80A8FEBC) ## $a0 = 80A90000 /* 00C14 80A8FD84 3C058016 */ lui $a1, 0x8016 ## $a1 = 80160000 /* 00C18 80A8FD88 90A5F5A0 */ lbu $a1, -0x0A60($a1) ## 8015F5A0 /* 00C1C 80A8FD8C 0C00084C */ jal osSyncPrintf - + /* 00C20 80A8FD90 2484FEBC */ addiu $a0, $a0, %lo(D_80A8FEBC) ## $a0 = 80A8FEBC -/* 00C24 80A8FD94 8FB8002C */ lw $t8, 0x002C($sp) +/* 00C24 80A8FD94 8FB8002C */ lw $t8, 0x002C($sp) .L80A8FD98: -/* 00C28 80A8FD98 0C024F46 */ jal func_80093D18 +/* 00C28 80A8FD98 0C024F46 */ jal func_80093D18 /* 00C2C 80A8FD9C 8F040000 */ lw $a0, 0x0000($t8) ## 00000000 -/* 00C30 80A8FDA0 8FA20028 */ lw $v0, 0x0028($sp) -/* 00C34 80A8FDA4 8FA4002C */ lw $a0, 0x002C($sp) +/* 00C30 80A8FDA0 8FA20028 */ lw $v0, 0x0028($sp) +/* 00C34 80A8FDA4 8FA4002C */ lw $a0, 0x002C($sp) /* 00C38 80A8FDA8 8C450154 */ lw $a1, 0x0154($v0) ## 00000154 /* 00C3C 80A8FDAC 8C460170 */ lw $a2, 0x0170($v0) ## 00000170 /* 00C40 80A8FDB0 90470152 */ lbu $a3, 0x0152($v0) ## 00000152 -/* 00C44 80A8FDB4 AFA00014 */ sw $zero, 0x0014($sp) -/* 00C48 80A8FDB8 AFA00010 */ sw $zero, 0x0010($sp) -/* 00C4C 80A8FDBC 0C0286B2 */ jal func_800A1AC8 -/* 00C50 80A8FDC0 AFA20018 */ sw $v0, 0x0018($sp) -/* 00C54 80A8FDC4 8FBF0024 */ lw $ra, 0x0024($sp) +/* 00C44 80A8FDB4 AFA00014 */ sw $zero, 0x0014($sp) +/* 00C48 80A8FDB8 AFA00010 */ sw $zero, 0x0010($sp) +/* 00C4C 80A8FDBC 0C0286B2 */ jal SkelAnime_DrawSV +/* 00C50 80A8FDC0 AFA20018 */ sw $v0, 0x0018($sp) +/* 00C54 80A8FDC4 8FBF0024 */ lw $ra, 0x0024($sp) /* 00C58 80A8FDC8 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 00C5C 80A8FDCC 03E00008 */ jr $ra +/* 00C5C 80A8FDCC 03E00008 */ jr $ra /* 00C60 80A8FDD0 00000000 */ nop /* 00C64 80A8FDD4 00000000 */ nop /* 00C68 80A8FDD8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Kakasi/EnKakasi_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Kakasi/EnKakasi_Init.s index f343068f0b..5adf1af452 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Kakasi/EnKakasi_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Kakasi/EnKakasi_Init.s @@ -1,33 +1,33 @@ glabel EnKakasi_Init /* 00028 80A8F198 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 0002C 80A8F19C AFB00028 */ sw $s0, 0x0028($sp) +/* 0002C 80A8F19C AFB00028 */ sw $s0, 0x0028($sp) /* 00030 80A8F1A0 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00034 80A8F1A4 AFBF002C */ sw $ra, 0x002C($sp) +/* 00034 80A8F1A4 AFBF002C */ sw $ra, 0x002C($sp) /* 00038 80A8F1A8 3C0480A9 */ lui $a0, %hi(D_80A8FE30) ## $a0 = 80A90000 -/* 0003C 80A8F1AC AFA5003C */ sw $a1, 0x003C($sp) +/* 0003C 80A8F1AC AFA5003C */ sw $a1, 0x003C($sp) /* 00040 80A8F1B0 0C00084C */ jal osSyncPrintf - + /* 00044 80A8F1B4 2484FE30 */ addiu $a0, $a0, %lo(D_80A8FE30) ## $a0 = 80A8FE30 /* 00048 80A8F1B8 C6040028 */ lwc1 $f4, 0x0028($s0) ## 00000028 /* 0004C 80A8F1BC 3C0480A9 */ lui $a0, %hi(D_80A8FE34) ## $a0 = 80A90000 /* 00050 80A8F1C0 2484FE34 */ addiu $a0, $a0, %lo(D_80A8FE34) ## $a0 = 80A8FE34 -/* 00054 80A8F1C4 460021A1 */ cvt.d.s $f6, $f4 -/* 00058 80A8F1C8 44073000 */ mfc1 $a3, $f6 -/* 0005C 80A8F1CC 44063800 */ mfc1 $a2, $f7 +/* 00054 80A8F1C4 460021A1 */ cvt.d.s $f6, $f4 +/* 00058 80A8F1C8 44073000 */ mfc1 $a3, $f6 +/* 0005C 80A8F1CC 44063800 */ mfc1 $a2, $f7 /* 00060 80A8F1D0 0C00084C */ jal osSyncPrintf - + /* 00064 80A8F1D4 00000000 */ nop /* 00068 80A8F1D8 260501BC */ addiu $a1, $s0, 0x01BC ## $a1 = 000001BC -/* 0006C 80A8F1DC AFA50030 */ sw $a1, 0x0030($sp) +/* 0006C 80A8F1DC AFA50030 */ sw $a1, 0x0030($sp) /* 00070 80A8F1E0 0C0170D9 */ jal ActorCollider_AllocCylinder - -/* 00074 80A8F1E4 8FA4003C */ lw $a0, 0x003C($sp) + +/* 00074 80A8F1E4 8FA4003C */ lw $a0, 0x003C($sp) /* 00078 80A8F1E8 3C0780A9 */ lui $a3, %hi(D_80A8FDE0) ## $a3 = 80A90000 -/* 0007C 80A8F1EC 8FA50030 */ lw $a1, 0x0030($sp) +/* 0007C 80A8F1EC 8FA50030 */ lw $a1, 0x0030($sp) /* 00080 80A8F1F0 24E7FDE0 */ addiu $a3, $a3, %lo(D_80A8FDE0) ## $a3 = 80A8FDE0 -/* 00084 80A8F1F4 8FA4003C */ lw $a0, 0x003C($sp) +/* 00084 80A8F1F4 8FA4003C */ lw $a0, 0x003C($sp) /* 00088 80A8F1F8 0C01712B */ jal ActorCollider_InitCylinder - + /* 0008C 80A8F1FC 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 00090 80A8F200 240E0006 */ addiu $t6, $zero, 0x0006 ## $t6 = 00000006 /* 00094 80A8F204 A20E001F */ sb $t6, 0x001F($s0) ## 0000001F @@ -35,11 +35,11 @@ glabel EnKakasi_Init /* 0009C 80A8F20C 3C070600 */ lui $a3, 0x0600 ## $a3 = 06000000 /* 000A0 80A8F210 24E70214 */ addiu $a3, $a3, 0x0214 ## $a3 = 06000214 /* 000A4 80A8F214 24C665B0 */ addiu $a2, $a2, 0x65B0 ## $a2 = 060065B0 -/* 000A8 80A8F218 AFA00018 */ sw $zero, 0x0018($sp) -/* 000AC 80A8F21C AFA00014 */ sw $zero, 0x0014($sp) -/* 000B0 80A8F220 AFA00010 */ sw $zero, 0x0010($sp) -/* 000B4 80A8F224 8FA4003C */ lw $a0, 0x003C($sp) -/* 000B8 80A8F228 0C0291BE */ jal func_800A46F8 +/* 000A8 80A8F218 AFA00018 */ sw $zero, 0x0018($sp) +/* 000AC 80A8F21C AFA00014 */ sw $zero, 0x0014($sp) +/* 000B0 80A8F220 AFA00010 */ sw $zero, 0x0010($sp) +/* 000B4 80A8F224 8FA4003C */ lw $a0, 0x003C($sp) +/* 000B8 80A8F228 0C0291BE */ jal SkelAnime_InitSV /* 000BC 80A8F22C 26050150 */ addiu $a1, $s0, 0x0150 ## $a1 = 00000150 /* 000C0 80A8F230 8A180030 */ lwl $t8, 0x0030($s0) ## 00000030 /* 000C4 80A8F234 9A180033 */ lwr $t8, 0x0033($s0) ## 00000033 @@ -55,15 +55,15 @@ glabel EnKakasi_Init /* 000EC 80A8F25C 34A5D70A */ ori $a1, $a1, 0xD70A ## $a1 = 3C23D70A /* 000F0 80A8F260 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 000F4 80A8F264 0C00B58B */ jal Actor_SetScale - + /* 000F8 80A8F268 A61801B2 */ sh $t8, 0x01B2($s0) ## 000001B2 /* 000FC 80A8F26C 3C0A80A9 */ lui $t2, %hi(func_80A8F660) ## $t2 = 80A90000 /* 00100 80A8F270 254AF660 */ addiu $t2, $t2, %lo(func_80A8F660) ## $t2 = 80A8F660 /* 00104 80A8F274 AE0A014C */ sw $t2, 0x014C($s0) ## 0000014C -/* 00108 80A8F278 8FBF002C */ lw $ra, 0x002C($sp) -/* 0010C 80A8F27C 8FB00028 */ lw $s0, 0x0028($sp) +/* 00108 80A8F278 8FBF002C */ lw $ra, 0x002C($sp) +/* 0010C 80A8F27C 8FB00028 */ lw $s0, 0x0028($sp) /* 00110 80A8F280 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 -/* 00114 80A8F284 03E00008 */ jr $ra +/* 00114 80A8F284 03E00008 */ jr $ra /* 00118 80A8F288 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Kakasi/func_80A8F660.s b/asm/non_matchings/overlays/actors/ovl_En_Kakasi/func_80A8F660.s index 15744d7105..a5431cdb35 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Kakasi/func_80A8F660.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Kakasi/func_80A8F660.s @@ -1,35 +1,35 @@ glabel func_80A8F660 /* 004F0 80A8F660 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 004F4 80A8F664 AFB00028 */ sw $s0, 0x0028($sp) +/* 004F4 80A8F664 AFB00028 */ sw $s0, 0x0028($sp) /* 004F8 80A8F668 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 004FC 80A8F66C AFBF002C */ sw $ra, 0x002C($sp) +/* 004FC 80A8F66C AFBF002C */ sw $ra, 0x002C($sp) /* 00500 80A8F670 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 -/* 00504 80A8F674 AFA50034 */ sw $a1, 0x0034($sp) +/* 00504 80A8F674 AFA50034 */ sw $a1, 0x0034($sp) /* 00508 80A8F678 0C028800 */ jal SkelAnime_GetFrameCount - + /* 0050C 80A8F67C 24840214 */ addiu $a0, $a0, 0x0214 ## $a0 = 06000214 /* 00510 80A8F680 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 00514 80A8F684 3C01C120 */ lui $at, 0xC120 ## $at = C1200000 /* 00518 80A8F688 44819000 */ mtc1 $at, $f18 ## $f18 = -10.00 -/* 0051C 80A8F68C 468021A0 */ cvt.s.w $f6, $f4 +/* 0051C 80A8F68C 468021A0 */ cvt.s.w $f6, $f4 /* 00520 80A8F690 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 00524 80A8F694 24A50214 */ addiu $a1, $a1, 0x0214 ## $a1 = 06000214 /* 00528 80A8F698 26040150 */ addiu $a0, $s0, 0x0150 ## $a0 = 00000150 /* 0052C 80A8F69C 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 00530 80A8F6A0 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 00534 80A8F6A4 4600320D */ trunc.w.s $f8, $f6 -/* 00538 80A8F6A8 AFA00014 */ sw $zero, 0x0014($sp) -/* 0053C 80A8F6AC E7B20018 */ swc1 $f18, 0x0018($sp) -/* 00540 80A8F6B0 440F4000 */ mfc1 $t7, $f8 +/* 00534 80A8F6A4 4600320D */ trunc.w.s $f8, $f6 +/* 00538 80A8F6A8 AFA00014 */ sw $zero, 0x0014($sp) +/* 0053C 80A8F6AC E7B20018 */ swc1 $f18, 0x0018($sp) +/* 00540 80A8F6B0 440F4000 */ mfc1 $t7, $f8 /* 00544 80A8F6B4 00000000 */ nop -/* 00548 80A8F6B8 000FC400 */ sll $t8, $t7, 16 -/* 0054C 80A8F6BC 0018CC03 */ sra $t9, $t8, 16 +/* 00548 80A8F6B8 000FC400 */ sll $t8, $t7, 16 +/* 0054C 80A8F6BC 0018CC03 */ sra $t9, $t8, 16 /* 00550 80A8F6C0 44995000 */ mtc1 $t9, $f10 ## $f10 = 0.00 /* 00554 80A8F6C4 00000000 */ nop -/* 00558 80A8F6C8 46805420 */ cvt.s.w $f16, $f10 -/* 0055C 80A8F6CC 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 00560 80A8F6D0 E7B00010 */ swc1 $f16, 0x0010($sp) +/* 00558 80A8F6C8 46805420 */ cvt.s.w $f16, $f10 +/* 0055C 80A8F6CC 0C029468 */ jal SkelAnime_ChangeAnim + +/* 00560 80A8F6D0 E7B00010 */ swc1 $f16, 0x0010($sp) /* 00564 80A8F6D4 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 /* 00568 80A8F6D8 24084076 */ addiu $t0, $zero, 0x4076 ## $t0 = 00004076 /* 0056C 80A8F6DC 24090006 */ addiu $t1, $zero, 0x0006 ## $t1 = 00000006 @@ -39,33 +39,33 @@ glabel func_80A8F660 /* 0057C 80A8F6EC 8C4A0004 */ lw $t2, 0x0004($v0) ## 8015E664 /* 00580 80A8F6F0 3C0880A9 */ lui $t0, %hi(func_80A8F75C) ## $t0 = 80A90000 /* 00584 80A8F6F4 240E0001 */ addiu $t6, $zero, 0x0001 ## $t6 = 00000001 -/* 00588 80A8F6F8 1140000A */ beq $t2, $zero, .L80A8F724 +/* 00588 80A8F6F8 1140000A */ beq $t2, $zero, .L80A8F724 /* 0058C 80A8F6FC 2508F75C */ addiu $t0, $t0, %lo(func_80A8F75C) ## $t0 = 80A8F75C /* 00590 80A8F700 A2000194 */ sb $zero, 0x0194($s0) ## 00000194 /* 00594 80A8F704 904B0F40 */ lbu $t3, 0x0F40($v0) ## 8015F5A0 /* 00598 80A8F708 240C407A */ addiu $t4, $zero, 0x407A ## $t4 = 0000407A /* 0059C 80A8F70C 240D0005 */ addiu $t5, $zero, 0x0005 ## $t5 = 00000005 -/* 005A0 80A8F710 5160000D */ beql $t3, $zero, .L80A8F748 +/* 005A0 80A8F710 5160000D */ beql $t3, $zero, .L80A8F748 /* 005A4 80A8F714 AE08014C */ sw $t0, 0x014C($s0) ## 0000014C /* 005A8 80A8F718 A60C010E */ sh $t4, 0x010E($s0) ## 0000010E -/* 005AC 80A8F71C 10000009 */ beq $zero, $zero, .L80A8F744 +/* 005AC 80A8F71C 10000009 */ beq $zero, $zero, .L80A8F744 /* 005B0 80A8F720 A60D0196 */ sh $t5, 0x0196($s0) ## 00000196 .L80A8F724: /* 005B4 80A8F724 A20E0194 */ sb $t6, 0x0194($s0) ## 00000194 /* 005B8 80A8F728 904F0F40 */ lbu $t7, 0x0F40($v0) ## 8015F5A0 /* 005BC 80A8F72C 24184079 */ addiu $t8, $zero, 0x4079 ## $t8 = 00004079 /* 005C0 80A8F730 24190005 */ addiu $t9, $zero, 0x0005 ## $t9 = 00000005 -/* 005C4 80A8F734 51E00004 */ beql $t7, $zero, .L80A8F748 +/* 005C4 80A8F734 51E00004 */ beql $t7, $zero, .L80A8F748 /* 005C8 80A8F738 AE08014C */ sw $t0, 0x014C($s0) ## 0000014C /* 005CC 80A8F73C A618010E */ sh $t8, 0x010E($s0) ## 0000010E /* 005D0 80A8F740 A6190196 */ sh $t9, 0x0196($s0) ## 00000196 .L80A8F744: /* 005D4 80A8F744 AE08014C */ sw $t0, 0x014C($s0) ## 0000014C .L80A8F748: -/* 005D8 80A8F748 8FBF002C */ lw $ra, 0x002C($sp) -/* 005DC 80A8F74C 8FB00028 */ lw $s0, 0x0028($sp) +/* 005D8 80A8F748 8FBF002C */ lw $ra, 0x002C($sp) +/* 005DC 80A8F74C 8FB00028 */ lw $s0, 0x0028($sp) /* 005E0 80A8F750 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 005E4 80A8F754 03E00008 */ jr $ra +/* 005E4 80A8F754 03E00008 */ jr $ra /* 005E8 80A8F758 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Kakasi2/EnKakasi2_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Kakasi2/EnKakasi2_Init.s index 7b679b6748..cb023daa97 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Kakasi2/EnKakasi2_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Kakasi2/EnKakasi2_Init.s @@ -1,95 +1,95 @@ glabel EnKakasi2_Init /* 00000 80A90010 27BDFFB8 */ addiu $sp, $sp, 0xFFB8 ## $sp = FFFFFFB8 -/* 00004 80A90014 AFB00028 */ sw $s0, 0x0028($sp) +/* 00004 80A90014 AFB00028 */ sw $s0, 0x0028($sp) /* 00008 80A90018 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 0000C 80A9001C AFBF002C */ sw $ra, 0x002C($sp) +/* 0000C 80A9001C AFBF002C */ sw $ra, 0x002C($sp) /* 00010 80A90020 3C0480A9 */ lui $a0, %hi(D_80A909F0) ## $a0 = 80A90000 -/* 00014 80A90024 AFA5004C */ sw $a1, 0x004C($sp) +/* 00014 80A90024 AFA5004C */ sw $a1, 0x004C($sp) /* 00018 80A90028 0C00084C */ jal osSyncPrintf - + /* 0001C 80A9002C 248409F0 */ addiu $a0, $a0, %lo(D_80A909F0) ## $a0 = 80A909F0 /* 00020 80A90030 3C0480A9 */ lui $a0, %hi(D_80A909F4) ## $a0 = 80A90000 /* 00024 80A90034 0C00084C */ jal osSyncPrintf - + /* 00028 80A90038 248409F4 */ addiu $a0, $a0, %lo(D_80A909F4) ## $a0 = 80A909F4 /* 0002C 80A9003C 8602001C */ lh $v0, 0x001C($s0) ## 0000001C /* 00030 80A90040 86190034 */ lh $t9, 0x0034($s0) ## 00000034 /* 00034 80A90044 2401003F */ addiu $at, $zero, 0x003F ## $at = 0000003F /* 00038 80A90048 304E003F */ andi $t6, $v0, 0x003F ## $t6 = 00000000 /* 0003C 80A9004C A60E0196 */ sh $t6, 0x0196($s0) ## 00000196 -/* 00040 80A90050 00027983 */ sra $t7, $v0, 6 +/* 00040 80A90050 00027983 */ sra $t7, $v0, 6 /* 00044 80A90054 86080196 */ lh $t0, 0x0196($s0) ## 00000196 /* 00048 80A90058 31F800FF */ andi $t8, $t7, 0x00FF ## $t8 = 00000000 /* 0004C 80A9005C 44982000 */ mtc1 $t8, $f4 ## $f4 = 0.00 /* 00050 80A90060 44993000 */ mtc1 $t9, $f6 ## $f6 = 0.00 /* 00054 80A90064 2409FFFF */ addiu $t1, $zero, 0xFFFF ## $t1 = FFFFFFFF -/* 00058 80A90068 468020A0 */ cvt.s.w $f2, $f4 -/* 0005C 80A9006C 15010002 */ bne $t0, $at, .L80A90078 -/* 00060 80A90070 46803320 */ cvt.s.w $f12, $f6 +/* 00058 80A90068 468020A0 */ cvt.s.w $f2, $f4 +/* 0005C 80A9006C 15010002 */ bne $t0, $at, .L80A90078 +/* 00060 80A90070 46803320 */ cvt.s.w $f12, $f6 /* 00064 80A90074 A6090196 */ sh $t1, 0x0196($s0) ## 00000196 .L80A90078: /* 00068 80A90078 3C014220 */ lui $at, 0x4220 ## $at = 42200000 /* 0006C 80A9007C 44810000 */ mtc1 $at, $f0 ## $f0 = 40.00 -/* 00070 80A90080 46001121 */ cvt.d.s $f4, $f2 +/* 00070 80A90080 46001121 */ cvt.d.s $f4, $f2 /* 00074 80A90084 240A0004 */ addiu $t2, $zero, 0x0004 ## $t2 = 00000004 -/* 00078 80A90088 46001202 */ mul.s $f8, $f2, $f0 +/* 00078 80A90088 46001202 */ mul.s $f8, $f2, $f0 /* 0007C 80A9008C A20A001F */ sb $t2, 0x001F($s0) ## 0000001F -/* 00080 80A90090 44072000 */ mfc1 $a3, $f4 -/* 00084 80A90094 46006402 */ mul.s $f16, $f12, $f0 -/* 00088 80A90098 44062800 */ mfc1 $a2, $f5 +/* 00080 80A90090 44072000 */ mfc1 $a3, $f4 +/* 00084 80A90094 46006402 */ mul.s $f16, $f12, $f0 +/* 00088 80A90098 44062800 */ mfc1 $a2, $f5 /* 0008C 80A9009C 3C0480A9 */ lui $a0, %hi(D_80A90A24) ## $a0 = 80A90000 /* 00090 80A900A0 24840A24 */ addiu $a0, $a0, %lo(D_80A90A24) ## $a0 = 80A90A24 -/* 00094 80A900A4 46004280 */ add.s $f10, $f8, $f0 -/* 00098 80A900A8 46008480 */ add.s $f18, $f16, $f0 +/* 00094 80A900A4 46004280 */ add.s $f10, $f8, $f0 +/* 00098 80A900A8 46008480 */ add.s $f18, $f16, $f0 /* 0009C 80A900AC E60A019C */ swc1 $f10, 0x019C($s0) ## 0000019C /* 000A0 80A900B0 E61201A0 */ swc1 $f18, 0x01A0($s0) ## 000001A0 /* 000A4 80A900B4 0C00084C */ jal osSyncPrintf - -/* 000A8 80A900B8 E7AC0038 */ swc1 $f12, 0x0038($sp) -/* 000AC 80A900BC C7AC0038 */ lwc1 $f12, 0x0038($sp) + +/* 000A8 80A900B8 E7AC0038 */ swc1 $f12, 0x0038($sp) +/* 000AC 80A900BC C7AC0038 */ lwc1 $f12, 0x0038($sp) /* 000B0 80A900C0 3C0480A9 */ lui $a0, %hi(D_80A90A54) ## $a0 = 80A90000 /* 000B4 80A900C4 24840A54 */ addiu $a0, $a0, %lo(D_80A90A54) ## $a0 = 80A90A54 -/* 000B8 80A900C8 460061A1 */ cvt.d.s $f6, $f12 -/* 000BC 80A900CC 44073000 */ mfc1 $a3, $f6 -/* 000C0 80A900D0 44063800 */ mfc1 $a2, $f7 +/* 000B8 80A900C8 460061A1 */ cvt.d.s $f6, $f12 +/* 000BC 80A900CC 44073000 */ mfc1 $a3, $f6 +/* 000C0 80A900D0 44063800 */ mfc1 $a2, $f7 /* 000C4 80A900D4 0C00084C */ jal osSyncPrintf - + /* 000C8 80A900D8 00000000 */ nop /* 000CC 80A900DC C608019C */ lwc1 $f8, 0x019C($s0) ## 0000019C /* 000D0 80A900E0 3C0480A9 */ lui $a0, %hi(D_80A90A84) ## $a0 = 80A90000 /* 000D4 80A900E4 24840A84 */ addiu $a0, $a0, %lo(D_80A90A84) ## $a0 = 80A90A84 -/* 000D8 80A900E8 460042A1 */ cvt.d.s $f10, $f8 -/* 000DC 80A900EC 44075000 */ mfc1 $a3, $f10 -/* 000E0 80A900F0 44065800 */ mfc1 $a2, $f11 +/* 000D8 80A900E8 460042A1 */ cvt.d.s $f10, $f8 +/* 000DC 80A900EC 44075000 */ mfc1 $a3, $f10 +/* 000E0 80A900F0 44065800 */ mfc1 $a2, $f11 /* 000E4 80A900F4 0C00084C */ jal osSyncPrintf - + /* 000E8 80A900F8 00000000 */ nop /* 000EC 80A900FC C61001A0 */ lwc1 $f16, 0x01A0($s0) ## 000001A0 /* 000F0 80A90100 3C0480A9 */ lui $a0, %hi(D_80A90AB4) ## $a0 = 80A90000 /* 000F4 80A90104 24840AB4 */ addiu $a0, $a0, %lo(D_80A90AB4) ## $a0 = 80A90AB4 -/* 000F8 80A90108 460084A1 */ cvt.d.s $f18, $f16 -/* 000FC 80A9010C 44079000 */ mfc1 $a3, $f18 -/* 00100 80A90110 44069800 */ mfc1 $a2, $f19 +/* 000F8 80A90108 460084A1 */ cvt.d.s $f18, $f16 +/* 000FC 80A9010C 44079000 */ mfc1 $a3, $f18 +/* 00100 80A90110 44069800 */ mfc1 $a2, $f19 /* 00104 80A90114 0C00084C */ jal osSyncPrintf - + /* 00108 80A90118 00000000 */ nop /* 0010C 80A9011C C60401A4 */ lwc1 $f4, 0x01A4($s0) ## 000001A4 /* 00110 80A90120 3C0480A9 */ lui $a0, %hi(D_80A90AE4) ## $a0 = 80A90000 /* 00114 80A90124 24840AE4 */ addiu $a0, $a0, %lo(D_80A90AE4) ## $a0 = 80A90AE4 -/* 00118 80A90128 460021A1 */ cvt.d.s $f6, $f4 -/* 0011C 80A9012C 44073000 */ mfc1 $a3, $f6 -/* 00120 80A90130 44063800 */ mfc1 $a2, $f7 +/* 00118 80A90128 460021A1 */ cvt.d.s $f6, $f4 +/* 0011C 80A9012C 44073000 */ mfc1 $a3, $f6 +/* 00120 80A90130 44063800 */ mfc1 $a2, $f7 /* 00124 80A90134 0C00084C */ jal osSyncPrintf - + /* 00128 80A90138 00000000 */ nop /* 0012C 80A9013C 3C0480A9 */ lui $a0, %hi(D_80A90B14) ## $a0 = 80A90000 /* 00130 80A90140 24840B14 */ addiu $a0, $a0, %lo(D_80A90B14) ## $a0 = 80A90B14 /* 00134 80A90144 0C00084C */ jal osSyncPrintf - + /* 00138 80A90148 86050196 */ lh $a1, 0x0196($s0) ## 00000196 /* 0013C 80A9014C 3C0480A9 */ lui $a0, %hi(D_80A90B44) ## $a0 = 80A90000 /* 00140 80A90150 0C00084C */ jal osSyncPrintf - + /* 00144 80A90154 24840B44 */ addiu $a0, $a0, %lo(D_80A90B44) ## $a0 = 80A90B44 /* 00148 80A90158 3C014270 */ lui $at, 0x4270 ## $at = 42700000 /* 0014C 80A9015C 44814000 */ mtc1 $at, $f8 ## $f8 = 60.00 @@ -99,47 +99,47 @@ glabel EnKakasi2_Init /* 0015C 80A9016C 34A5D70A */ ori $a1, $a1, 0xD70A ## $a1 = 3C23D70A /* 00160 80A90170 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 00164 80A90174 0C00B58B */ jal Actor_SetScale - + /* 00168 80A90178 E60801A8 */ swc1 $f8, 0x01A8($s0) ## 000001A8 /* 0016C 80A9017C 8E0C0004 */ lw $t4, 0x0004($s0) ## 00000004 /* 00170 80A90180 86050196 */ lh $a1, 0x0196($s0) ## 00000196 /* 00174 80A90184 860E00B6 */ lh $t6, 0x00B6($s0) ## 000000B6 /* 00178 80A90188 358D0400 */ ori $t5, $t4, 0x0400 ## $t5 = 00000400 /* 0017C 80A9018C AE0D0004 */ sw $t5, 0x0004($s0) ## 00000004 -/* 00180 80A90190 04A0001F */ bltz $a1, .L80A90210 +/* 00180 80A90190 04A0001F */ bltz $a1, .L80A90210 /* 00184 80A90194 A60E0198 */ sh $t6, 0x0198($s0) ## 00000198 /* 00188 80A90198 0C00B2D0 */ jal Flags_GetSwitch - -/* 0018C 80A9019C 8FA4004C */ lw $a0, 0x004C($sp) -/* 00190 80A901A0 1040001B */ beq $v0, $zero, .L80A90210 + +/* 0018C 80A9019C 8FA4004C */ lw $a0, 0x004C($sp) +/* 00190 80A901A0 1040001B */ beq $v0, $zero, .L80A90210 /* 00194 80A901A4 3C0F80A9 */ lui $t7, %hi(func_80A90948) ## $t7 = 80A90000 /* 00198 80A901A8 25EF0948 */ addiu $t7, $t7, %lo(func_80A90948) ## $t7 = 80A90948 /* 0019C 80A901AC AE0F0134 */ sw $t7, 0x0134($s0) ## 00000134 /* 001A0 80A901B0 260501AC */ addiu $a1, $s0, 0x01AC ## $a1 = 000001AC -/* 001A4 80A901B4 AFA50034 */ sw $a1, 0x0034($sp) +/* 001A4 80A901B4 AFA50034 */ sw $a1, 0x0034($sp) /* 001A8 80A901B8 0C0170D9 */ jal ActorCollider_AllocCylinder - -/* 001AC 80A901BC 8FA4004C */ lw $a0, 0x004C($sp) + +/* 001AC 80A901BC 8FA4004C */ lw $a0, 0x004C($sp) /* 001B0 80A901C0 3C0780A9 */ lui $a3, %hi(D_80A909A0) ## $a3 = 80A90000 -/* 001B4 80A901C4 8FA50034 */ lw $a1, 0x0034($sp) +/* 001B4 80A901C4 8FA50034 */ lw $a1, 0x0034($sp) /* 001B8 80A901C8 24E709A0 */ addiu $a3, $a3, %lo(D_80A909A0) ## $a3 = 80A909A0 -/* 001BC 80A901CC 8FA4004C */ lw $a0, 0x004C($sp) +/* 001BC 80A901CC 8FA4004C */ lw $a0, 0x004C($sp) /* 001C0 80A901D0 0C01712B */ jal ActorCollider_InitCylinder - + /* 001C4 80A901D4 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 001C8 80A901D8 3C060600 */ lui $a2, 0x0600 ## $a2 = 06000000 /* 001CC 80A901DC 3C070600 */ lui $a3, 0x0600 ## $a3 = 06000000 /* 001D0 80A901E0 24E70214 */ addiu $a3, $a3, 0x0214 ## $a3 = 06000214 /* 001D4 80A901E4 24C665B0 */ addiu $a2, $a2, 0x65B0 ## $a2 = 060065B0 -/* 001D8 80A901E8 8FA4004C */ lw $a0, 0x004C($sp) +/* 001D8 80A901E8 8FA4004C */ lw $a0, 0x004C($sp) /* 001DC 80A901EC 26050150 */ addiu $a1, $s0, 0x0150 ## $a1 = 00000150 -/* 001E0 80A901F0 AFA00010 */ sw $zero, 0x0010($sp) -/* 001E4 80A901F4 AFA00014 */ sw $zero, 0x0014($sp) -/* 001E8 80A901F8 0C0291BE */ jal func_800A46F8 -/* 001EC 80A901FC AFA00018 */ sw $zero, 0x0018($sp) +/* 001E0 80A901F0 AFA00010 */ sw $zero, 0x0010($sp) +/* 001E4 80A901F4 AFA00014 */ sw $zero, 0x0014($sp) +/* 001E8 80A901F8 0C0291BE */ jal SkelAnime_InitSV +/* 001EC 80A901FC AFA00018 */ sw $zero, 0x0018($sp) /* 001F0 80A90200 3C1880A9 */ lui $t8, %hi(func_80A9062C) ## $t8 = 80A90000 /* 001F4 80A90204 2718062C */ addiu $t8, $t8, %lo(func_80A9062C) ## $t8 = 80A9062C -/* 001F8 80A90208 10000007 */ beq $zero, $zero, .L80A90228 +/* 001F8 80A90208 10000007 */ beq $zero, $zero, .L80A90228 /* 001FC 80A9020C AE18014C */ sw $t8, 0x014C($s0) ## 0000014C .L80A90210: /* 00200 80A90210 3C01C5FA */ lui $at, 0xC5FA ## $at = C5FA0000 @@ -149,10 +149,10 @@ glabel EnKakasi2_Init /* 00210 80A90220 AE19014C */ sw $t9, 0x014C($s0) ## 0000014C /* 00214 80A90224 E60A00BC */ swc1 $f10, 0x00BC($s0) ## 000000BC .L80A90228: -/* 00218 80A90228 8FBF002C */ lw $ra, 0x002C($sp) -/* 0021C 80A9022C 8FB00028 */ lw $s0, 0x0028($sp) +/* 00218 80A90228 8FBF002C */ lw $ra, 0x002C($sp) +/* 0021C 80A9022C 8FB00028 */ lw $s0, 0x0028($sp) /* 00220 80A90230 27BD0048 */ addiu $sp, $sp, 0x0048 ## $sp = 00000000 -/* 00224 80A90234 03E00008 */ jr $ra +/* 00224 80A90234 03E00008 */ jr $ra /* 00228 80A90238 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Kakasi2/func_80A90264.s b/asm/non_matchings/overlays/actors/ovl_En_Kakasi2/func_80A90264.s index adee4d6f6d..bd455dddc5 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Kakasi2/func_80A90264.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Kakasi2/func_80A90264.s @@ -1,8 +1,8 @@ glabel func_80A90264 /* 00254 80A90264 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 00258 80A90268 AFBF002C */ sw $ra, 0x002C($sp) -/* 0025C 80A9026C AFB10028 */ sw $s1, 0x0028($sp) -/* 00260 80A90270 AFB00024 */ sw $s0, 0x0024($sp) +/* 00258 80A90268 AFBF002C */ sw $ra, 0x002C($sp) +/* 0025C 80A9026C AFB10028 */ sw $s1, 0x0028($sp) +/* 00260 80A90270 AFB00024 */ sw $s0, 0x0024($sp) /* 00264 80A90274 848E0194 */ lh $t6, 0x0194($a0) ## 00000194 /* 00268 80A90278 8CA21C44 */ lw $v0, 0x1C44($a1) ## 00001C44 /* 0026C 80A9027C 3C188016 */ lui $t8, 0x8016 ## $t8 = 80160000 @@ -12,37 +12,37 @@ glabel func_80A90264 /* 0027C 80A9028C 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 00280 80A90290 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 /* 00284 80A90294 871912D6 */ lh $t9, 0x12D6($t8) ## 801612D6 -/* 00288 80A90298 5320003F */ beql $t9, $zero, .L80A90398 +/* 00288 80A90298 5320003F */ beql $t9, $zero, .L80A90398 /* 0028C 80A9029C C6120090 */ lwc1 $f18, 0x0090($s0) ## 00000090 /* 00290 80A902A0 C4840090 */ lwc1 $f4, 0x0090($a0) ## 00000090 /* 00294 80A902A4 C486019C */ lwc1 $f6, 0x019C($a0) ## 0000019C -/* 00298 80A902A8 4606203C */ c.lt.s $f4, $f6 +/* 00298 80A902A8 4606203C */ c.lt.s $f4, $f6 /* 0029C 80A902AC 00000000 */ nop -/* 002A0 80A902B0 45020039 */ bc1fl .L80A90398 +/* 002A0 80A902B0 45020039 */ bc1fl .L80A90398 /* 002A4 80A902B4 C6120090 */ lwc1 $f18, 0x0090($s0) ## 00000090 /* 002A8 80A902B8 C4480028 */ lwc1 $f8, 0x0028($v0) ## 00000028 /* 002AC 80A902BC C48A0028 */ lwc1 $f10, 0x0028($a0) ## 00000028 /* 002B0 80A902C0 C49001A0 */ lwc1 $f16, 0x01A0($a0) ## 000001A0 /* 002B4 80A902C4 3C0880A9 */ lui $t0, %hi(func_80A90948) ## $t0 = 80A90000 -/* 002B8 80A902C8 460A4001 */ sub.s $f0, $f8, $f10 +/* 002B8 80A902C8 460A4001 */ sub.s $f0, $f8, $f10 /* 002BC 80A902CC 25080948 */ addiu $t0, $t0, %lo(func_80A90948) ## $t0 = 80A90948 -/* 002C0 80A902D0 46000005 */ abs.s $f0, $f0 -/* 002C4 80A902D4 4610003C */ c.lt.s $f0, $f16 +/* 002C0 80A902D0 46000005 */ abs.s $f0, $f0 +/* 002C4 80A902D4 4610003C */ c.lt.s $f0, $f16 /* 002C8 80A902D8 00000000 */ nop -/* 002CC 80A902DC 4502002E */ bc1fl .L80A90398 +/* 002CC 80A902DC 4502002E */ bc1fl .L80A90398 /* 002D0 80A902E0 C6120090 */ lwc1 $f18, 0x0090($s0) ## 00000090 /* 002D4 80A902E4 AC880134 */ sw $t0, 0x0134($a0) ## 00000134 /* 002D8 80A902E8 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 /* 002DC 80A902EC 260501AC */ addiu $a1, $s0, 0x01AC ## $a1 = 000001AC /* 002E0 80A902F0 0C0170D9 */ jal ActorCollider_AllocCylinder - -/* 002E4 80A902F4 AFA50030 */ sw $a1, 0x0030($sp) + +/* 002E4 80A902F4 AFA50030 */ sw $a1, 0x0030($sp) /* 002E8 80A902F8 3C0780A9 */ lui $a3, %hi(D_80A909A0) ## $a3 = 80A90000 -/* 002EC 80A902FC 8FA50030 */ lw $a1, 0x0030($sp) +/* 002EC 80A902FC 8FA50030 */ lw $a1, 0x0030($sp) /* 002F0 80A90300 24E709A0 */ addiu $a3, $a3, %lo(D_80A909A0) ## $a3 = 80A909A0 /* 002F4 80A90304 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 002F8 80A90308 0C01712B */ jal ActorCollider_InitCylinder - + /* 002FC 80A9030C 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 00300 80A90310 3C060600 */ lui $a2, 0x0600 ## $a2 = 06000000 /* 00304 80A90314 3C070600 */ lui $a3, 0x0600 ## $a3 = 06000000 @@ -50,94 +50,94 @@ glabel func_80A90264 /* 0030C 80A9031C 24C665B0 */ addiu $a2, $a2, 0x65B0 ## $a2 = 060065B0 /* 00310 80A90320 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 00314 80A90324 26050150 */ addiu $a1, $s0, 0x0150 ## $a1 = 00000150 -/* 00318 80A90328 AFA00010 */ sw $zero, 0x0010($sp) -/* 0031C 80A9032C AFA00014 */ sw $zero, 0x0014($sp) -/* 00320 80A90330 0C0291BE */ jal func_800A46F8 -/* 00324 80A90334 AFA00018 */ sw $zero, 0x0018($sp) +/* 00318 80A90328 AFA00010 */ sw $zero, 0x0010($sp) +/* 0031C 80A9032C AFA00014 */ sw $zero, 0x0014($sp) +/* 00320 80A90330 0C0291BE */ jal SkelAnime_InitSV +/* 00324 80A90334 AFA00018 */ sw $zero, 0x0018($sp) /* 00328 80A90338 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 0032C 80A9033C 0C020120 */ jal func_80080480 +/* 0032C 80A9033C 0C020120 */ jal func_80080480 /* 00330 80A90340 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 00334 80A90344 8E090004 */ lw $t1, 0x0004($s0) ## 00000004 /* 00338 80A90348 3C010800 */ lui $at, 0x0800 ## $at = 08000000 /* 0033C 80A9034C 34210001 */ ori $at, $at, 0x0001 ## $at = 08000001 /* 00340 80A90350 01215025 */ or $t2, $t1, $at ## $t2 = 08000001 /* 00344 80A90354 AE0A0004 */ sw $t2, 0x0004($s0) ## 00000004 -/* 00348 80A90358 0C01E221 */ jal func_80078884 +/* 00348 80A90358 0C01E221 */ jal func_80078884 /* 0034C 80A9035C 24044802 */ addiu $a0, $zero, 0x4802 ## $a0 = 00004802 /* 00350 80A90360 86050196 */ lh $a1, 0x0196($s0) ## 00000196 -/* 00354 80A90364 04A00004 */ bltz $a1, .L80A90378 +/* 00354 80A90364 04A00004 */ bltz $a1, .L80A90378 /* 00358 80A90368 00000000 */ nop /* 0035C 80A9036C 0C00B2DD */ jal Flags_SetSwitch - + /* 00360 80A90370 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 00364 80A90374 86050196 */ lh $a1, 0x0196($s0) ## 00000196 .L80A90378: /* 00368 80A90378 3C0480A9 */ lui $a0, %hi(D_80A90B48) ## $a0 = 80A90000 /* 0036C 80A9037C 0C00084C */ jal osSyncPrintf - + /* 00370 80A90380 24840B48 */ addiu $a0, $a0, %lo(D_80A90B48) ## $a0 = 80A90B48 /* 00374 80A90384 3C0B80A9 */ lui $t3, %hi(func_80A904D8) ## $t3 = 80A90000 /* 00378 80A90388 256B04D8 */ addiu $t3, $t3, %lo(func_80A904D8) ## $t3 = 80A904D8 -/* 0037C 80A9038C 1000004D */ beq $zero, $zero, .L80A904C4 +/* 0037C 80A9038C 1000004D */ beq $zero, $zero, .L80A904C4 /* 00380 80A90390 AE0B014C */ sw $t3, 0x014C($s0) ## 0000014C /* 00384 80A90394 C6120090 */ lwc1 $f18, 0x0090($s0) ## 00000090 .L80A90398: /* 00388 80A90398 C604019C */ lwc1 $f4, 0x019C($s0) ## 0000019C -/* 0038C 80A9039C 4604903C */ c.lt.s $f18, $f4 +/* 0038C 80A9039C 4604903C */ c.lt.s $f18, $f4 /* 00390 80A903A0 00000000 */ nop -/* 00394 80A903A4 45020048 */ bc1fl .L80A904C8 -/* 00398 80A903A8 8FBF002C */ lw $ra, 0x002C($sp) +/* 00394 80A903A4 45020048 */ bc1fl .L80A904C8 +/* 00398 80A903A8 8FBF002C */ lw $ra, 0x002C($sp) /* 0039C 80A903AC C4460028 */ lwc1 $f6, 0x0028($v0) ## 00000028 /* 003A0 80A903B0 C6080028 */ lwc1 $f8, 0x0028($s0) ## 00000028 /* 003A4 80A903B4 C60A01A0 */ lwc1 $f10, 0x01A0($s0) ## 000001A0 /* 003A8 80A903B8 3C0C8016 */ lui $t4, 0x8016 ## $t4 = 80160000 -/* 003AC 80A903BC 46083001 */ sub.s $f0, $f6, $f8 -/* 003B0 80A903C0 46000005 */ abs.s $f0, $f0 -/* 003B4 80A903C4 460A003C */ c.lt.s $f0, $f10 +/* 003AC 80A903BC 46083001 */ sub.s $f0, $f6, $f8 +/* 003B0 80A903C0 46000005 */ abs.s $f0, $f0 +/* 003B4 80A903C4 460A003C */ c.lt.s $f0, $f10 /* 003B8 80A903C8 00000000 */ nop -/* 003BC 80A903CC 4502003E */ bc1fl .L80A904C8 -/* 003C0 80A903D0 8FBF002C */ lw $ra, 0x002C($sp) +/* 003BC 80A903CC 4502003E */ bc1fl .L80A904C8 +/* 003C0 80A903D0 8FBF002C */ lw $ra, 0x002C($sp) /* 003C4 80A903D4 958CF546 */ lhu $t4, -0x0ABA($t4) ## 8015F546 /* 003C8 80A903D8 3C0E0001 */ lui $t6, 0x0001 ## $t6 = 00010000 -/* 003CC 80A903DC 01D17021 */ addu $t6, $t6, $s1 +/* 003CC 80A903DC 01D17021 */ addu $t6, $t6, $s1 /* 003D0 80A903E0 318D1000 */ andi $t5, $t4, 0x1000 ## $t5 = 00000000 -/* 003D4 80A903E4 51A00038 */ beql $t5, $zero, .L80A904C8 -/* 003D8 80A903E8 8FBF002C */ lw $ra, 0x002C($sp) +/* 003D4 80A903E4 51A00038 */ beql $t5, $zero, .L80A904C8 +/* 003D8 80A903E8 8FBF002C */ lw $ra, 0x002C($sp) /* 003DC 80A903EC A6000194 */ sh $zero, 0x0194($s0) ## 00000194 /* 003E0 80A903F0 95CE04C6 */ lhu $t6, 0x04C6($t6) ## 000104C6 /* 003E4 80A903F4 2401000B */ addiu $at, $zero, 0x000B ## $at = 0000000B -/* 003E8 80A903F8 55C10033 */ bnel $t6, $at, .L80A904C8 -/* 003EC 80A903FC 8FBF002C */ lw $ra, 0x002C($sp) +/* 003E8 80A903F8 55C10033 */ bnel $t6, $at, .L80A904C8 +/* 003EC 80A903FC 8FBF002C */ lw $ra, 0x002C($sp) /* 003F0 80A90400 86050196 */ lh $a1, 0x0196($s0) ## 00000196 -/* 003F4 80A90404 04A00004 */ bltz $a1, .L80A90418 +/* 003F4 80A90404 04A00004 */ bltz $a1, .L80A90418 /* 003F8 80A90408 00000000 */ nop /* 003FC 80A9040C 0C00B2DD */ jal Flags_SetSwitch - + /* 00400 80A90410 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 00404 80A90414 86050196 */ lh $a1, 0x0196($s0) ## 00000196 .L80A90418: /* 00408 80A90418 3C0480A9 */ lui $a0, %hi(D_80A90B74) ## $a0 = 80A90000 /* 0040C 80A9041C 0C00084C */ jal osSyncPrintf - + /* 00410 80A90420 24840B74 */ addiu $a0, $a0, %lo(D_80A90B74) ## $a0 = 80A90B74 /* 00414 80A90424 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 00418 80A90428 00310821 */ addu $at, $at, $s1 +/* 00418 80A90428 00310821 */ addu $at, $at, $s1 /* 0041C 80A9042C 240F0004 */ addiu $t7, $zero, 0x0004 ## $t7 = 00000004 /* 00420 80A90430 3C1880A9 */ lui $t8, %hi(func_80A90948) ## $t8 = 80A90000 /* 00424 80A90434 A42F04C6 */ sh $t7, 0x04C6($at) ## 000104C6 /* 00428 80A90438 27180948 */ addiu $t8, $t8, %lo(func_80A90948) ## $t8 = 80A90948 /* 0042C 80A9043C AE180134 */ sw $t8, 0x0134($s0) ## 00000134 /* 00430 80A90440 260501AC */ addiu $a1, $s0, 0x01AC ## $a1 = 000001AC -/* 00434 80A90444 AFA50030 */ sw $a1, 0x0030($sp) +/* 00434 80A90444 AFA50030 */ sw $a1, 0x0030($sp) /* 00438 80A90448 0C0170D9 */ jal ActorCollider_AllocCylinder - + /* 0043C 80A9044C 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 00440 80A90450 3C0780A9 */ lui $a3, %hi(D_80A909A0) ## $a3 = 80A90000 -/* 00444 80A90454 8FA50030 */ lw $a1, 0x0030($sp) +/* 00444 80A90454 8FA50030 */ lw $a1, 0x0030($sp) /* 00448 80A90458 24E709A0 */ addiu $a3, $a3, %lo(D_80A909A0) ## $a3 = 80A909A0 /* 0044C 80A9045C 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 00450 80A90460 0C01712B */ jal ActorCollider_InitCylinder - + /* 00454 80A90464 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 00458 80A90468 3C060600 */ lui $a2, 0x0600 ## $a2 = 06000000 /* 0045C 80A9046C 3C070600 */ lui $a3, 0x0600 ## $a3 = 06000000 @@ -145,14 +145,14 @@ glabel func_80A90264 /* 00464 80A90474 24C665B0 */ addiu $a2, $a2, 0x65B0 ## $a2 = 060065B0 /* 00468 80A90478 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 0046C 80A9047C 26050150 */ addiu $a1, $s0, 0x0150 ## $a1 = 00000150 -/* 00470 80A90480 AFA00010 */ sw $zero, 0x0010($sp) -/* 00474 80A90484 AFA00014 */ sw $zero, 0x0014($sp) -/* 00478 80A90488 0C0291BE */ jal func_800A46F8 -/* 0047C 80A9048C AFA00018 */ sw $zero, 0x0018($sp) +/* 00470 80A90480 AFA00010 */ sw $zero, 0x0010($sp) +/* 00474 80A90484 AFA00014 */ sw $zero, 0x0014($sp) +/* 00478 80A90488 0C0291BE */ jal SkelAnime_InitSV +/* 0047C 80A9048C AFA00018 */ sw $zero, 0x0018($sp) /* 00480 80A90490 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 00484 80A90494 0C020120 */ jal func_80080480 +/* 00484 80A90494 0C020120 */ jal func_80080480 /* 00488 80A90498 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 0048C 80A9049C 0C01E221 */ jal func_80078884 +/* 0048C 80A9049C 0C01E221 */ jal func_80078884 /* 00490 80A904A0 24044802 */ addiu $a0, $zero, 0x4802 ## $a0 = 00004802 /* 00494 80A904A4 8E190004 */ lw $t9, 0x0004($s0) ## 00000004 /* 00498 80A904A8 3C010800 */ lui $at, 0x0800 ## $at = 08000000 @@ -163,11 +163,11 @@ glabel func_80A90264 /* 004AC 80A904BC AE080004 */ sw $t0, 0x0004($s0) ## 00000004 /* 004B0 80A904C0 AE09014C */ sw $t1, 0x014C($s0) ## 0000014C .L80A904C4: -/* 004B4 80A904C4 8FBF002C */ lw $ra, 0x002C($sp) +/* 004B4 80A904C4 8FBF002C */ lw $ra, 0x002C($sp) .L80A904C8: -/* 004B8 80A904C8 8FB00024 */ lw $s0, 0x0024($sp) -/* 004BC 80A904CC 8FB10028 */ lw $s1, 0x0028($sp) -/* 004C0 80A904D0 03E00008 */ jr $ra +/* 004B8 80A904C8 8FB00024 */ lw $s0, 0x0024($sp) +/* 004BC 80A904CC 8FB10028 */ lw $s1, 0x0028($sp) +/* 004C0 80A904D0 03E00008 */ jr $ra /* 004C4 80A904D4 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Kakasi2/func_80A904D8.s b/asm/non_matchings/overlays/actors/ovl_En_Kakasi2/func_80A904D8.s index 18369ef309..9448ca5234 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Kakasi2/func_80A904D8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Kakasi2/func_80A904D8.s @@ -1,46 +1,46 @@ glabel func_80A904D8 /* 004C8 80A904D8 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 004CC 80A904DC AFA40028 */ sw $a0, 0x0028($sp) -/* 004D0 80A904E0 AFBF0024 */ sw $ra, 0x0024($sp) +/* 004CC 80A904DC AFA40028 */ sw $a0, 0x0028($sp) +/* 004D0 80A904E0 AFBF0024 */ sw $ra, 0x0024($sp) /* 004D4 80A904E4 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 -/* 004D8 80A904E8 AFA5002C */ sw $a1, 0x002C($sp) +/* 004D8 80A904E8 AFA5002C */ sw $a1, 0x002C($sp) /* 004DC 80A904EC 0C028800 */ jal SkelAnime_GetFrameCount - + /* 004E0 80A904F0 24840214 */ addiu $a0, $a0, 0x0214 ## $a0 = 06000214 /* 004E4 80A904F4 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 004E8 80A904F8 3C01C120 */ lui $at, 0xC120 ## $at = C1200000 /* 004EC 80A904FC 44819000 */ mtc1 $at, $f18 ## $f18 = -10.00 -/* 004F0 80A90500 468021A0 */ cvt.s.w $f6, $f4 -/* 004F4 80A90504 8FA40028 */ lw $a0, 0x0028($sp) +/* 004F0 80A90500 468021A0 */ cvt.s.w $f6, $f4 +/* 004F4 80A90504 8FA40028 */ lw $a0, 0x0028($sp) /* 004F8 80A90508 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 004FC 80A9050C 24A50214 */ addiu $a1, $a1, 0x0214 ## $a1 = 06000214 /* 00500 80A90510 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 00504 80A90514 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 00508 80A90518 4600320D */ trunc.w.s $f8, $f6 -/* 0050C 80A9051C AFA00014 */ sw $zero, 0x0014($sp) -/* 00510 80A90520 E7B20018 */ swc1 $f18, 0x0018($sp) +/* 00508 80A90518 4600320D */ trunc.w.s $f8, $f6 +/* 0050C 80A9051C AFA00014 */ sw $zero, 0x0014($sp) +/* 00510 80A90520 E7B20018 */ swc1 $f18, 0x0018($sp) /* 00514 80A90524 24840150 */ addiu $a0, $a0, 0x0150 ## $a0 = 00000150 -/* 00518 80A90528 440F4000 */ mfc1 $t7, $f8 +/* 00518 80A90528 440F4000 */ mfc1 $t7, $f8 /* 0051C 80A9052C 00000000 */ nop -/* 00520 80A90530 000FC400 */ sll $t8, $t7, 16 -/* 00524 80A90534 0018CC03 */ sra $t9, $t8, 16 +/* 00520 80A90530 000FC400 */ sll $t8, $t7, 16 +/* 00524 80A90534 0018CC03 */ sra $t9, $t8, 16 /* 00528 80A90538 44995000 */ mtc1 $t9, $f10 ## $f10 = 0.00 /* 0052C 80A9053C 00000000 */ nop -/* 00530 80A90540 46805420 */ cvt.s.w $f16, $f10 -/* 00534 80A90544 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 00538 80A90548 E7B00010 */ swc1 $f16, 0x0010($sp) -/* 0053C 80A9054C 8FA40028 */ lw $a0, 0x0028($sp) +/* 00530 80A90540 46805420 */ cvt.s.w $f16, $f10 +/* 00534 80A90544 0C029468 */ jal SkelAnime_ChangeAnim + +/* 00538 80A90548 E7B00010 */ swc1 $f16, 0x0010($sp) +/* 0053C 80A9054C 8FA40028 */ lw $a0, 0x0028($sp) /* 00540 80A90550 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 00544 80A90554 240528BF */ addiu $a1, $zero, 0x28BF ## $a1 = 000028BF -/* 00548 80A90558 8FA90028 */ lw $t1, 0x0028($sp) +/* 00548 80A90558 8FA90028 */ lw $t1, 0x0028($sp) /* 0054C 80A9055C 3C0880A9 */ lui $t0, %hi(func_80A90578) ## $t0 = 80A90000 /* 00550 80A90560 25080578 */ addiu $t0, $t0, %lo(func_80A90578) ## $t0 = 80A90578 /* 00554 80A90564 AD28014C */ sw $t0, 0x014C($t1) ## 0000014C -/* 00558 80A90568 8FBF0024 */ lw $ra, 0x0024($sp) +/* 00558 80A90568 8FBF0024 */ lw $ra, 0x0024($sp) /* 0055C 80A9056C 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 00560 80A90570 03E00008 */ jr $ra +/* 00560 80A90570 03E00008 */ jr $ra /* 00564 80A90574 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Kakasi2/func_80A9062C.s b/asm/non_matchings/overlays/actors/ovl_En_Kakasi2/func_80A9062C.s index bbeef92d2a..a6e0452cfe 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Kakasi2/func_80A9062C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Kakasi2/func_80A9062C.s @@ -1,43 +1,43 @@ glabel func_80A9062C /* 0061C 80A9062C 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 00620 80A90630 AFA40028 */ sw $a0, 0x0028($sp) -/* 00624 80A90634 AFBF0024 */ sw $ra, 0x0024($sp) +/* 00620 80A90630 AFA40028 */ sw $a0, 0x0028($sp) +/* 00624 80A90634 AFBF0024 */ sw $ra, 0x0024($sp) /* 00628 80A90638 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 -/* 0062C 80A9063C AFA5002C */ sw $a1, 0x002C($sp) +/* 0062C 80A9063C AFA5002C */ sw $a1, 0x002C($sp) /* 00630 80A90640 0C028800 */ jal SkelAnime_GetFrameCount - + /* 00634 80A90644 24840214 */ addiu $a0, $a0, 0x0214 ## $a0 = 06000214 /* 00638 80A90648 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 0063C 80A9064C 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 /* 00640 80A90650 3C01C120 */ lui $at, 0xC120 ## $at = C1200000 -/* 00644 80A90654 468021A0 */ cvt.s.w $f6, $f4 +/* 00644 80A90654 468021A0 */ cvt.s.w $f6, $f4 /* 00648 80A90658 44819000 */ mtc1 $at, $f18 ## $f18 = -10.00 -/* 0064C 80A9065C 8FA40028 */ lw $a0, 0x0028($sp) +/* 0064C 80A9065C 8FA40028 */ lw $a0, 0x0028($sp) /* 00650 80A90660 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 00654 80A90664 24080002 */ addiu $t0, $zero, 0x0002 ## $t0 = 00000002 -/* 00658 80A90668 44060000 */ mfc1 $a2, $f0 -/* 0065C 80A9066C 4600320D */ trunc.w.s $f8, $f6 -/* 00660 80A90670 44070000 */ mfc1 $a3, $f0 -/* 00664 80A90674 AFA80014 */ sw $t0, 0x0014($sp) +/* 00658 80A90668 44060000 */ mfc1 $a2, $f0 +/* 0065C 80A9066C 4600320D */ trunc.w.s $f8, $f6 +/* 00660 80A90670 44070000 */ mfc1 $a3, $f0 +/* 00664 80A90674 AFA80014 */ sw $t0, 0x0014($sp) /* 00668 80A90678 24A50214 */ addiu $a1, $a1, 0x0214 ## $a1 = 06000214 -/* 0066C 80A9067C 440F4000 */ mfc1 $t7, $f8 +/* 0066C 80A9067C 440F4000 */ mfc1 $t7, $f8 /* 00670 80A90680 24840150 */ addiu $a0, $a0, 0x0150 ## $a0 = 00000150 -/* 00674 80A90684 E7B20018 */ swc1 $f18, 0x0018($sp) -/* 00678 80A90688 000FC400 */ sll $t8, $t7, 16 -/* 0067C 80A9068C 0018CC03 */ sra $t9, $t8, 16 +/* 00674 80A90684 E7B20018 */ swc1 $f18, 0x0018($sp) +/* 00678 80A90688 000FC400 */ sll $t8, $t7, 16 +/* 0067C 80A9068C 0018CC03 */ sra $t9, $t8, 16 /* 00680 80A90690 44995000 */ mtc1 $t9, $f10 ## $f10 = 0.00 /* 00684 80A90694 00000000 */ nop -/* 00688 80A90698 46805420 */ cvt.s.w $f16, $f10 -/* 0068C 80A9069C 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 00690 80A906A0 E7B00010 */ swc1 $f16, 0x0010($sp) -/* 00694 80A906A4 8FAA0028 */ lw $t2, 0x0028($sp) +/* 00688 80A90698 46805420 */ cvt.s.w $f16, $f10 +/* 0068C 80A9069C 0C029468 */ jal SkelAnime_ChangeAnim + +/* 00690 80A906A0 E7B00010 */ swc1 $f16, 0x0010($sp) +/* 00694 80A906A4 8FAA0028 */ lw $t2, 0x0028($sp) /* 00698 80A906A8 3C0980A9 */ lui $t1, %hi(func_80A906C4) ## $t1 = 80A90000 /* 0069C 80A906AC 252906C4 */ addiu $t1, $t1, %lo(func_80A906C4) ## $t1 = 80A906C4 /* 006A0 80A906B0 AD49014C */ sw $t1, 0x014C($t2) ## 0000014C -/* 006A4 80A906B4 8FBF0024 */ lw $ra, 0x0024($sp) +/* 006A4 80A906B4 8FBF0024 */ lw $ra, 0x0024($sp) /* 006A8 80A906B8 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 006AC 80A906BC 03E00008 */ jr $ra +/* 006AC 80A906BC 03E00008 */ jr $ra /* 006B0 80A906C0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Kakasi2/func_80A90948.s b/asm/non_matchings/overlays/actors/ovl_En_Kakasi2/func_80A90948.s index dbd74b8c0f..f8576b8f91 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Kakasi2/func_80A90948.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Kakasi2/func_80A90948.s @@ -1,22 +1,22 @@ glabel func_80A90948 /* 00938 80A90948 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 0093C 80A9094C AFBF0024 */ sw $ra, 0x0024($sp) -/* 00940 80A90950 AFA40028 */ sw $a0, 0x0028($sp) -/* 00944 80A90954 AFA5002C */ sw $a1, 0x002C($sp) -/* 00948 80A90958 0C024F46 */ jal func_80093D18 +/* 0093C 80A9094C AFBF0024 */ sw $ra, 0x0024($sp) +/* 00940 80A90950 AFA40028 */ sw $a0, 0x0028($sp) +/* 00944 80A90954 AFA5002C */ sw $a1, 0x002C($sp) +/* 00948 80A90958 0C024F46 */ jal func_80093D18 /* 0094C 80A9095C 8CA40000 */ lw $a0, 0x0000($a1) ## 00000000 -/* 00950 80A90960 8FA20028 */ lw $v0, 0x0028($sp) -/* 00954 80A90964 8FA4002C */ lw $a0, 0x002C($sp) +/* 00950 80A90960 8FA20028 */ lw $v0, 0x0028($sp) +/* 00954 80A90964 8FA4002C */ lw $a0, 0x002C($sp) /* 00958 80A90968 8C450154 */ lw $a1, 0x0154($v0) ## 00000154 /* 0095C 80A9096C 8C460170 */ lw $a2, 0x0170($v0) ## 00000170 /* 00960 80A90970 90470152 */ lbu $a3, 0x0152($v0) ## 00000152 -/* 00964 80A90974 AFA00014 */ sw $zero, 0x0014($sp) -/* 00968 80A90978 AFA00010 */ sw $zero, 0x0010($sp) -/* 0096C 80A9097C 0C0286B2 */ jal func_800A1AC8 -/* 00970 80A90980 AFA20018 */ sw $v0, 0x0018($sp) -/* 00974 80A90984 8FBF0024 */ lw $ra, 0x0024($sp) +/* 00964 80A90974 AFA00014 */ sw $zero, 0x0014($sp) +/* 00968 80A90978 AFA00010 */ sw $zero, 0x0010($sp) +/* 0096C 80A9097C 0C0286B2 */ jal SkelAnime_DrawSV +/* 00970 80A90980 AFA20018 */ sw $v0, 0x0018($sp) +/* 00974 80A90984 8FBF0024 */ lw $ra, 0x0024($sp) /* 00978 80A90988 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 0097C 80A9098C 03E00008 */ jr $ra +/* 0097C 80A9098C 03E00008 */ jr $ra /* 00980 80A90990 00000000 */ nop /* 00984 80A90994 00000000 */ nop /* 00988 80A90998 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Kakasi3/EnKakasi3_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Kakasi3/EnKakasi3_Draw.s index 823ea30917..f07a46d4c7 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Kakasi3/EnKakasi3_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Kakasi3/EnKakasi3_Draw.s @@ -1,22 +1,22 @@ glabel EnKakasi3_Draw /* 00F98 80A91CB8 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 00F9C 80A91CBC AFBF0024 */ sw $ra, 0x0024($sp) -/* 00FA0 80A91CC0 AFA40028 */ sw $a0, 0x0028($sp) -/* 00FA4 80A91CC4 AFA5002C */ sw $a1, 0x002C($sp) -/* 00FA8 80A91CC8 0C024F46 */ jal func_80093D18 +/* 00F9C 80A91CBC AFBF0024 */ sw $ra, 0x0024($sp) +/* 00FA0 80A91CC0 AFA40028 */ sw $a0, 0x0028($sp) +/* 00FA4 80A91CC4 AFA5002C */ sw $a1, 0x002C($sp) +/* 00FA8 80A91CC8 0C024F46 */ jal func_80093D18 /* 00FAC 80A91CCC 8CA40000 */ lw $a0, 0x0000($a1) ## 00000000 -/* 00FB0 80A91CD0 8FA20028 */ lw $v0, 0x0028($sp) -/* 00FB4 80A91CD4 8FA4002C */ lw $a0, 0x002C($sp) +/* 00FB0 80A91CD0 8FA20028 */ lw $v0, 0x0028($sp) +/* 00FB4 80A91CD4 8FA4002C */ lw $a0, 0x002C($sp) /* 00FB8 80A91CD8 8C450154 */ lw $a1, 0x0154($v0) ## 00000154 /* 00FBC 80A91CDC 8C460170 */ lw $a2, 0x0170($v0) ## 00000170 /* 00FC0 80A91CE0 90470152 */ lbu $a3, 0x0152($v0) ## 00000152 -/* 00FC4 80A91CE4 AFA00014 */ sw $zero, 0x0014($sp) -/* 00FC8 80A91CE8 AFA00010 */ sw $zero, 0x0010($sp) -/* 00FCC 80A91CEC 0C0286B2 */ jal func_800A1AC8 -/* 00FD0 80A91CF0 AFA20018 */ sw $v0, 0x0018($sp) -/* 00FD4 80A91CF4 8FBF0024 */ lw $ra, 0x0024($sp) +/* 00FC4 80A91CE4 AFA00014 */ sw $zero, 0x0014($sp) +/* 00FC8 80A91CE8 AFA00010 */ sw $zero, 0x0010($sp) +/* 00FCC 80A91CEC 0C0286B2 */ jal SkelAnime_DrawSV +/* 00FD0 80A91CF0 AFA20018 */ sw $v0, 0x0018($sp) +/* 00FD4 80A91CF4 8FBF0024 */ lw $ra, 0x0024($sp) /* 00FD8 80A91CF8 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 00FDC 80A91CFC 03E00008 */ jr $ra +/* 00FDC 80A91CFC 03E00008 */ jr $ra /* 00FE0 80A91D00 00000000 */ nop /* 00FE4 80A91D04 00000000 */ nop /* 00FE8 80A91D08 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Kakasi3/EnKakasi3_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Kakasi3/EnKakasi3_Init.s index d39578841b..9fd612ab38 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Kakasi3/EnKakasi3_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Kakasi3/EnKakasi3_Init.s @@ -1,41 +1,41 @@ glabel EnKakasi3_Init /* 00028 80A90D48 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 0002C 80A90D4C AFB00028 */ sw $s0, 0x0028($sp) +/* 0002C 80A90D4C AFB00028 */ sw $s0, 0x0028($sp) /* 00030 80A90D50 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00034 80A90D54 AFBF002C */ sw $ra, 0x002C($sp) +/* 00034 80A90D54 AFBF002C */ sw $ra, 0x002C($sp) /* 00038 80A90D58 3C0480A9 */ lui $a0, %hi(D_80A91D60) ## $a0 = 80A90000 -/* 0003C 80A90D5C AFA5003C */ sw $a1, 0x003C($sp) +/* 0003C 80A90D5C AFA5003C */ sw $a1, 0x003C($sp) /* 00040 80A90D60 0C00084C */ jal osSyncPrintf - + /* 00044 80A90D64 24841D60 */ addiu $a0, $a0, %lo(D_80A91D60) ## $a0 = 80A91D60 /* 00048 80A90D68 3C0480A9 */ lui $a0, %hi(D_80A91D64) ## $a0 = 80A90000 /* 0004C 80A90D6C 0C00084C */ jal osSyncPrintf - + /* 00050 80A90D70 24841D64 */ addiu $a0, $a0, %lo(D_80A91D64) ## $a0 = 80A91D64 /* 00054 80A90D74 240E0006 */ addiu $t6, $zero, 0x0006 ## $t6 = 00000006 /* 00058 80A90D78 A20E001F */ sb $t6, 0x001F($s0) ## 0000001F /* 0005C 80A90D7C 260501BC */ addiu $a1, $s0, 0x01BC ## $a1 = 000001BC -/* 00060 80A90D80 AFA50030 */ sw $a1, 0x0030($sp) +/* 00060 80A90D80 AFA50030 */ sw $a1, 0x0030($sp) /* 00064 80A90D84 0C0170D9 */ jal ActorCollider_AllocCylinder - -/* 00068 80A90D88 8FA4003C */ lw $a0, 0x003C($sp) + +/* 00068 80A90D88 8FA4003C */ lw $a0, 0x003C($sp) /* 0006C 80A90D8C 3C0780A9 */ lui $a3, %hi(D_80A91D10) ## $a3 = 80A90000 -/* 00070 80A90D90 8FA50030 */ lw $a1, 0x0030($sp) +/* 00070 80A90D90 8FA50030 */ lw $a1, 0x0030($sp) /* 00074 80A90D94 24E71D10 */ addiu $a3, $a3, %lo(D_80A91D10) ## $a3 = 80A91D10 -/* 00078 80A90D98 8FA4003C */ lw $a0, 0x003C($sp) +/* 00078 80A90D98 8FA4003C */ lw $a0, 0x003C($sp) /* 0007C 80A90D9C 0C01712B */ jal ActorCollider_InitCylinder - + /* 00080 80A90DA0 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 00084 80A90DA4 3C060600 */ lui $a2, 0x0600 ## $a2 = 06000000 /* 00088 80A90DA8 3C070600 */ lui $a3, 0x0600 ## $a3 = 06000000 /* 0008C 80A90DAC 24E70214 */ addiu $a3, $a3, 0x0214 ## $a3 = 06000214 /* 00090 80A90DB0 24C665B0 */ addiu $a2, $a2, 0x65B0 ## $a2 = 060065B0 -/* 00094 80A90DB4 8FA4003C */ lw $a0, 0x003C($sp) +/* 00094 80A90DB4 8FA4003C */ lw $a0, 0x003C($sp) /* 00098 80A90DB8 26050150 */ addiu $a1, $s0, 0x0150 ## $a1 = 00000150 -/* 0009C 80A90DBC AFA00010 */ sw $zero, 0x0010($sp) -/* 000A0 80A90DC0 AFA00014 */ sw $zero, 0x0014($sp) -/* 000A4 80A90DC4 0C0291BE */ jal func_800A46F8 -/* 000A8 80A90DC8 AFA00018 */ sw $zero, 0x0018($sp) +/* 0009C 80A90DBC AFA00010 */ sw $zero, 0x0010($sp) +/* 000A0 80A90DC0 AFA00014 */ sw $zero, 0x0014($sp) +/* 000A4 80A90DC4 0C0291BE */ jal SkelAnime_InitSV +/* 000A8 80A90DC8 AFA00018 */ sw $zero, 0x0018($sp) /* 000AC 80A90DCC 8A080030 */ lwl $t0, 0x0030($s0) ## 00000030 /* 000B0 80A90DD0 9A080033 */ lwr $t0, 0x0033($s0) ## 00000033 /* 000B4 80A90DD4 8E0F0004 */ lw $t7, 0x0004($s0) ## 00000004 @@ -50,15 +50,15 @@ glabel EnKakasi3_Init /* 000D8 80A90DF8 34A5D70A */ ori $a1, $a1, 0xD70A ## $a1 = 3C23D70A /* 000DC 80A90DFC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 000E0 80A90E00 0C00B58B */ jal Actor_SetScale - + /* 000E4 80A90E04 A60801B4 */ sh $t0, 0x01B4($s0) ## 000001B4 /* 000E8 80A90E08 3C0A80A9 */ lui $t2, %hi(func_80A911F0) ## $t2 = 80A90000 /* 000EC 80A90E0C 254A11F0 */ addiu $t2, $t2, %lo(func_80A911F0) ## $t2 = 80A911F0 /* 000F0 80A90E10 AE0A014C */ sw $t2, 0x014C($s0) ## 0000014C -/* 000F4 80A90E14 8FBF002C */ lw $ra, 0x002C($sp) -/* 000F8 80A90E18 8FB00028 */ lw $s0, 0x0028($sp) +/* 000F4 80A90E14 8FBF002C */ lw $ra, 0x002C($sp) +/* 000F8 80A90E18 8FB00028 */ lw $s0, 0x0028($sp) /* 000FC 80A90E1C 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 -/* 00100 80A90E20 03E00008 */ jr $ra +/* 00100 80A90E20 03E00008 */ jr $ra /* 00104 80A90E24 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Kakasi3/func_80A911F0.s b/asm/non_matchings/overlays/actors/ovl_En_Kakasi3/func_80A911F0.s index b2f2272708..bf3ee6781f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Kakasi3/func_80A911F0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Kakasi3/func_80A911F0.s @@ -1,42 +1,42 @@ glabel func_80A911F0 /* 004D0 80A911F0 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 004D4 80A911F4 AFA40028 */ sw $a0, 0x0028($sp) -/* 004D8 80A911F8 AFBF0024 */ sw $ra, 0x0024($sp) +/* 004D4 80A911F4 AFA40028 */ sw $a0, 0x0028($sp) +/* 004D8 80A911F8 AFBF0024 */ sw $ra, 0x0024($sp) /* 004DC 80A911FC 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 -/* 004E0 80A91200 AFA5002C */ sw $a1, 0x002C($sp) +/* 004E0 80A91200 AFA5002C */ sw $a1, 0x002C($sp) /* 004E4 80A91204 0C028800 */ jal SkelAnime_GetFrameCount - + /* 004E8 80A91208 24840214 */ addiu $a0, $a0, 0x0214 ## $a0 = 06000214 /* 004EC 80A9120C 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 004F0 80A91210 3C01C120 */ lui $at, 0xC120 ## $at = C1200000 /* 004F4 80A91214 44819000 */ mtc1 $at, $f18 ## $f18 = -10.00 -/* 004F8 80A91218 468021A0 */ cvt.s.w $f6, $f4 -/* 004FC 80A9121C 8FA40028 */ lw $a0, 0x0028($sp) +/* 004F8 80A91218 468021A0 */ cvt.s.w $f6, $f4 +/* 004FC 80A9121C 8FA40028 */ lw $a0, 0x0028($sp) /* 00500 80A91220 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 00504 80A91224 24A50214 */ addiu $a1, $a1, 0x0214 ## $a1 = 06000214 /* 00508 80A91228 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 0050C 80A9122C 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 00510 80A91230 4600320D */ trunc.w.s $f8, $f6 -/* 00514 80A91234 AFA00014 */ sw $zero, 0x0014($sp) -/* 00518 80A91238 E7B20018 */ swc1 $f18, 0x0018($sp) +/* 00510 80A91230 4600320D */ trunc.w.s $f8, $f6 +/* 00514 80A91234 AFA00014 */ sw $zero, 0x0014($sp) +/* 00518 80A91238 E7B20018 */ swc1 $f18, 0x0018($sp) /* 0051C 80A9123C 24840150 */ addiu $a0, $a0, 0x0150 ## $a0 = 00000150 -/* 00520 80A91240 440F4000 */ mfc1 $t7, $f8 +/* 00520 80A91240 440F4000 */ mfc1 $t7, $f8 /* 00524 80A91244 00000000 */ nop -/* 00528 80A91248 000FC400 */ sll $t8, $t7, 16 -/* 0052C 80A9124C 0018CC03 */ sra $t9, $t8, 16 +/* 00528 80A91248 000FC400 */ sll $t8, $t7, 16 +/* 0052C 80A9124C 0018CC03 */ sra $t9, $t8, 16 /* 00530 80A91250 44995000 */ mtc1 $t9, $f10 ## $f10 = 0.00 /* 00534 80A91254 00000000 */ nop -/* 00538 80A91258 46805420 */ cvt.s.w $f16, $f10 -/* 0053C 80A9125C 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 00540 80A91260 E7B00010 */ swc1 $f16, 0x0010($sp) -/* 00544 80A91264 8FA90028 */ lw $t1, 0x0028($sp) +/* 00538 80A91258 46805420 */ cvt.s.w $f16, $f10 +/* 0053C 80A9125C 0C029468 */ jal SkelAnime_ChangeAnim + +/* 00540 80A91260 E7B00010 */ swc1 $f16, 0x0010($sp) +/* 00544 80A91264 8FA90028 */ lw $t1, 0x0028($sp) /* 00548 80A91268 3C0880A9 */ lui $t0, %hi(func_80A91284) ## $t0 = 80A90000 /* 0054C 80A9126C 25081284 */ addiu $t0, $t0, %lo(func_80A91284) ## $t0 = 80A91284 /* 00550 80A91270 AD28014C */ sw $t0, 0x014C($t1) ## 0000014C -/* 00554 80A91274 8FBF0024 */ lw $ra, 0x0024($sp) +/* 00554 80A91274 8FBF0024 */ lw $ra, 0x0024($sp) /* 00558 80A91278 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 0055C 80A9127C 03E00008 */ jr $ra +/* 0055C 80A9127C 03E00008 */ jr $ra /* 00560 80A91280 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Kanban/EnKanban_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Kanban/EnKanban_Draw.s index 81c3db2e50..ea2282b705 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Kanban/EnKanban_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Kanban/EnKanban_Draw.s @@ -16,7 +16,7 @@ glabel EnKanban_Draw /* 01C1C 80A93BBC 24C6504C */ addiu $a2, $a2, %lo(D_80A9504C) ## $a2 = 80A9504C /* 01C20 80A93BC0 27A40078 */ addiu $a0, $sp, 0x0078 ## $a0 = FFFFFFD8 /* 01C24 80A93BC4 2407067B */ addiu $a3, $zero, 0x067B ## $a3 = 0000067B -/* 01C28 80A93BC8 0C031AB1 */ jal func_800C6AC4 +/* 01C28 80A93BC8 0C031AB1 */ jal Graph_OpenDisps /* 01C2C 80A93BCC 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 /* 01C30 80A93BD0 8FB800A4 */ lw $t8, 0x00A4($sp) /* 01C34 80A93BD4 0C024F46 */ jal func_80093D18 @@ -583,7 +583,7 @@ glabel EnKanban_Draw /* 0249C 80A9443C 24C650B0 */ addiu $a2, $a2, %lo(D_80A950B0) ## $a2 = 80A950B0 /* 024A0 80A94440 27A40078 */ addiu $a0, $sp, 0x0078 ## $a0 = FFFFFFD8 /* 024A4 80A94444 24070741 */ addiu $a3, $zero, 0x0741 ## $a3 = 00000741 -/* 024A8 80A94448 0C031AD5 */ jal func_800C6B54 +/* 024A8 80A94448 0C031AD5 */ jal Graph_CloseDisps /* 024AC 80A9444C 8DE50000 */ lw $a1, 0x0000($t7) ## 00000000 /* 024B0 80A94450 8FBF001C */ lw $ra, 0x001C($sp) /* 024B4 80A94454 8FB00014 */ lw $s0, 0x0014($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Kanban/EnKanban_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Kanban/EnKanban_Update.s index 7f7358afec..37cc654f9a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Kanban/EnKanban_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Kanban/EnKanban_Update.s @@ -1460,7 +1460,7 @@ glabel L80A930DC /* 0174C 80A936EC 46085182 */ mul.s $f6, $f10, $f8 /* 01750 80A936F0 E7A60074 */ swc1 $f6, 0x0074($sp) /* 01754 80A936F4 A2390154 */ sb $t9, 0x0154($s1) ## 00000154 -/* 01758 80A936F8 0C03F494 */ jal func_800FD250 +/* 01758 80A936F8 0C03F494 */ jal Math_atan2f /* 0175C 80A936FC E624006C */ swc1 $f4, 0x006C($s1) ## 0000006C /* 01760 80A93700 3C0180A9 */ lui $at, %hi(D_80A95100) ## $at = 80A90000 /* 01764 80A93704 C42A5100 */ lwc1 $f10, %lo(D_80A95100)($at) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Kanban/func_80A91FA0.s b/asm/non_matchings/overlays/actors/ovl_En_Kanban/func_80A91FA0.s index d32c840f32..bee583262f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Kanban/func_80A91FA0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Kanban/func_80A91FA0.s @@ -26,7 +26,7 @@ glabel func_80A91FA0 /* 00060 80A92000 E7B00018 */ swc1 $f16, 0x0018($sp) /* 00064 80A92004 46000207 */ neg.s $f8, $f0 /* 00068 80A92008 46104302 */ mul.s $f12, $f8, $f16 -/* 0006C 80A9200C 0C03F494 */ jal func_800FD250 +/* 0006C 80A9200C 0C03F494 */ jal Math_atan2f /* 00070 80A92010 00000000 */ nop /* 00074 80A92014 8FA80020 */ lw $t0, 0x0020($sp) /* 00078 80A92018 46000287 */ neg.s $f10, $f0 @@ -37,7 +37,7 @@ glabel func_80A91FA0 /* 0008C 80A9202C 44817000 */ mtc1 $at, $f14 ## $f14 = 1.00 /* 00090 80A92030 46009107 */ neg.s $f4, $f18 /* 00094 80A92034 46102302 */ mul.s $f12, $f4, $f16 -/* 00098 80A92038 0C03F494 */ jal func_800FD250 +/* 00098 80A92038 0C03F494 */ jal Math_atan2f /* 0009C 80A9203C 00000000 */ nop /* 000A0 80A92040 8FA90020 */ lw $t1, 0x0020($sp) /* 000A4 80A92044 E5200190 */ swc1 $f0, 0x0190($t1) ## 00000190 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Karebaba/EnKarebaba_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Karebaba/EnKarebaba_Draw.s index 83d57c949a..dc2f57c169 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Karebaba/EnKarebaba_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Karebaba/EnKarebaba_Draw.s @@ -1,40 +1,40 @@ glabel EnKarebaba_Draw /* 01228 80A96578 27BDFF68 */ addiu $sp, $sp, 0xFF68 ## $sp = FFFFFF68 -/* 0122C 80A9657C AFB40038 */ sw $s4, 0x0038($sp) +/* 0122C 80A9657C AFB40038 */ sw $s4, 0x0038($sp) /* 01230 80A96580 00A0A025 */ or $s4, $a1, $zero ## $s4 = 00000000 -/* 01234 80A96584 AFBF003C */ sw $ra, 0x003C($sp) -/* 01238 80A96588 AFB30034 */ sw $s3, 0x0034($sp) -/* 0123C 80A9658C AFB20030 */ sw $s2, 0x0030($sp) -/* 01240 80A96590 AFB1002C */ sw $s1, 0x002C($sp) -/* 01244 80A96594 AFB00028 */ sw $s0, 0x0028($sp) -/* 01248 80A96598 F7B40020 */ sdc1 $f20, 0x0020($sp) +/* 01234 80A96584 AFBF003C */ sw $ra, 0x003C($sp) +/* 01238 80A96588 AFB30034 */ sw $s3, 0x0034($sp) +/* 0123C 80A9658C AFB20030 */ sw $s2, 0x0030($sp) +/* 01240 80A96590 AFB1002C */ sw $s1, 0x002C($sp) +/* 01244 80A96594 AFB00028 */ sw $s0, 0x0028($sp) +/* 01248 80A96598 F7B40020 */ sdc1 $f20, 0x0020($sp) /* 0124C 80A9659C 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 /* 01250 80A965A0 00809825 */ or $s3, $a0, $zero ## $s3 = 00000000 /* 01254 80A965A4 3C0680A9 */ lui $a2, %hi(D_80A96ACC) ## $a2 = 80A90000 /* 01258 80A965A8 24C66ACC */ addiu $a2, $a2, %lo(D_80A96ACC) ## $a2 = 80A96ACC /* 0125C 80A965AC 27A40074 */ addiu $a0, $sp, 0x0074 ## $a0 = FFFFFFDC /* 01260 80A965B0 24070420 */ addiu $a3, $zero, 0x0420 ## $a3 = 00000420 -/* 01264 80A965B4 0C031AB1 */ jal func_800C6AC4 +/* 01264 80A965B4 0C031AB1 */ jal Graph_OpenDisps /* 01268 80A965B8 00A09025 */ or $s2, $a1, $zero ## $s2 = 00000000 -/* 0126C 80A965BC 0C024F46 */ jal func_80093D18 +/* 0126C 80A965BC 0C024F46 */ jal func_80093D18 /* 01270 80A965C0 8E840000 */ lw $a0, 0x0000($s4) ## 00000000 /* 01274 80A965C4 8E620190 */ lw $v0, 0x0190($s3) ## 00000190 /* 01278 80A965C8 3C0E80A9 */ lui $t6, %hi(func_80A96048) ## $t6 = 80A90000 /* 0127C 80A965CC 25CE6048 */ addiu $t6, $t6, %lo(func_80A96048) ## $t6 = 80A96048 -/* 01280 80A965D0 15C20021 */ bne $t6, $v0, .L80A96658 +/* 01280 80A965D0 15C20021 */ bne $t6, $v0, .L80A96658 /* 01284 80A965D4 00000000 */ nop /* 01288 80A965D8 8662001C */ lh $v0, 0x001C($s3) ## 0000001C /* 0128C 80A965DC 3C064348 */ lui $a2, 0x4348 ## $a2 = 43480000 -/* 01290 80A965E0 28410029 */ slti $at, $v0, 0x0029 -/* 01294 80A965E4 10200003 */ beq $at, $zero, .L80A965F4 +/* 01290 80A965E0 28410029 */ slti $at, $v0, 0x0029 +/* 01294 80A965E4 10200003 */ beq $at, $zero, .L80A965F4 /* 01298 80A965E8 304F0001 */ andi $t7, $v0, 0x0001 ## $t7 = 00000000 -/* 0129C 80A965EC 11E00087 */ beq $t7, $zero, .L80A9680C +/* 0129C 80A965EC 11E00087 */ beq $t7, $zero, .L80A9680C /* 012A0 80A965F0 00000000 */ nop .L80A965F4: /* 012A4 80A965F4 44807000 */ mtc1 $zero, $f14 ## $f14 = 0.00 /* 012A8 80A965F8 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 012AC 80A965FC 0C034261 */ jal Matrix_Translate -/* 012B0 80A96600 46007306 */ mov.s $f12, $f14 +/* 012AC 80A965FC 0C034261 */ jal Matrix_Translate +/* 012B0 80A96600 46007306 */ mov.s $f12, $f14 /* 012B4 80A96604 8E5002C0 */ lw $s0, 0x02C0($s2) ## 000002C0 /* 012B8 80A96608 3C19DA38 */ lui $t9, 0xDA38 ## $t9 = DA380000 /* 012BC 80A9660C 37390003 */ ori $t9, $t9, 0x0003 ## $t9 = DA380003 @@ -44,7 +44,7 @@ glabel EnKarebaba_Draw /* 012CC 80A9661C AE190000 */ sw $t9, 0x0000($s0) ## 00000000 /* 012D0 80A96620 8E840000 */ lw $a0, 0x0000($s4) ## 00000000 /* 012D4 80A96624 24A56AE0 */ addiu $a1, $a1, %lo(D_80A96AE0) ## $a1 = 80A96AE0 -/* 012D8 80A96628 0C0346A2 */ jal Matrix_NewMtx +/* 012D8 80A96628 0C0346A2 */ jal Matrix_NewMtx /* 012DC 80A9662C 2406042A */ addiu $a2, $zero, 0x042A ## $a2 = 0000042A /* 012E0 80A96630 AE020004 */ sw $v0, 0x0004($s0) ## 00000004 /* 012E4 80A96634 8E4302C0 */ lw $v1, 0x02C0($s2) ## 000002C0 @@ -54,88 +54,88 @@ glabel EnKarebaba_Draw /* 012F4 80A96644 AE4802C0 */ sw $t0, 0x02C0($s2) ## 000002C0 /* 012F8 80A96648 3C09DE00 */ lui $t1, 0xDE00 ## $t1 = DE000000 /* 012FC 80A9664C AC690000 */ sw $t1, 0x0000($v1) ## 00000000 -/* 01300 80A96650 1000006E */ beq $zero, $zero, .L80A9680C +/* 01300 80A96650 1000006E */ beq $zero, $zero, .L80A9680C /* 01304 80A96654 AC6A0004 */ sw $t2, 0x0004($v1) ## 00000004 .L80A96658: /* 01308 80A96658 3C0B80A9 */ lui $t3, %hi(func_80A96184) ## $t3 = 80A90000 /* 0130C 80A9665C 256B6184 */ addiu $t3, $t3, %lo(func_80A96184) ## $t3 = 80A96184 -/* 01310 80A96660 1162006A */ beq $t3, $v0, .L80A9680C +/* 01310 80A96660 1162006A */ beq $t3, $v0, .L80A9680C /* 01314 80A96664 02802025 */ or $a0, $s4, $zero ## $a0 = 00000000 /* 01318 80A96668 3C0580A9 */ lui $a1, %hi(D_80A96A68) ## $a1 = 80A90000 /* 0131C 80A9666C 24A56A68 */ addiu $a1, $a1, %lo(D_80A96A68) ## $a1 = 80A96A68 /* 01320 80A96670 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 -/* 01324 80A96674 0C00988C */ jal func_80026230 +/* 01324 80A96674 0C00988C */ jal func_80026230 /* 01328 80A96678 24070002 */ addiu $a3, $zero, 0x0002 ## $a3 = 00000002 /* 0132C 80A9667C 8E650150 */ lw $a1, 0x0150($s3) ## 00000150 /* 01330 80A96680 8E66016C */ lw $a2, 0x016C($s3) ## 0000016C -/* 01334 80A96684 AFA00014 */ sw $zero, 0x0014($sp) -/* 01338 80A96688 AFA00010 */ sw $zero, 0x0010($sp) +/* 01334 80A96684 AFA00014 */ sw $zero, 0x0014($sp) +/* 01338 80A96688 AFA00010 */ sw $zero, 0x0010($sp) /* 0133C 80A9668C 02802025 */ or $a0, $s4, $zero ## $a0 = 00000000 /* 01340 80A96690 0C028572 */ jal SkelAnime_Draw - + /* 01344 80A96694 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 /* 01348 80A96698 C66C0024 */ lwc1 $f12, 0x0024($s3) ## 00000024 /* 0134C 80A9669C C66E0028 */ lwc1 $f14, 0x0028($s3) ## 00000028 /* 01350 80A966A0 8E66002C */ lw $a2, 0x002C($s3) ## 0000002C -/* 01354 80A966A4 0C034261 */ jal Matrix_Translate +/* 01354 80A966A4 0C034261 */ jal Matrix_Translate /* 01358 80A966A8 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 /* 0135C 80A966AC 8E620190 */ lw $v0, 0x0190($s3) ## 00000190 /* 01360 80A966B0 3C0C80A9 */ lui $t4, %hi(func_80A961DC) ## $t4 = 80A90000 /* 01364 80A966B4 258C61DC */ addiu $t4, $t4, %lo(func_80A961DC) ## $t4 = 80A961DC -/* 01368 80A966B8 11820004 */ beq $t4, $v0, .L80A966CC +/* 01368 80A966B8 11820004 */ beq $t4, $v0, .L80A966CC /* 0136C 80A966BC 3C0D80A9 */ lui $t5, %hi(func_80A95940) ## $t5 = 80A90000 /* 01370 80A966C0 25AD5940 */ addiu $t5, $t5, %lo(func_80A95940) ## $t5 = 80A95940 -/* 01374 80A966C4 15A2000A */ bne $t5, $v0, .L80A966F0 +/* 01374 80A966C4 15A2000A */ bne $t5, $v0, .L80A966F0 /* 01378 80A966C8 3C0180A9 */ lui $at, %hi(D_80A96B68) ## $at = 80A90000 .L80A966CC: /* 0137C 80A966CC 866E001C */ lh $t6, 0x001C($s3) ## 0000001C /* 01380 80A966D0 3C0180A9 */ lui $at, %hi(D_80A96B64) ## $at = 80A90000 -/* 01384 80A966D4 C4286B64 */ lwc1 $f8, %lo(D_80A96B64)($at) +/* 01384 80A966D4 C4286B64 */ lwc1 $f8, %lo(D_80A96B64)($at) /* 01388 80A966D8 448E2000 */ mtc1 $t6, $f4 ## $f4 = 0.00 /* 0138C 80A966DC 00000000 */ nop -/* 01390 80A966E0 468021A0 */ cvt.s.w $f6, $f4 -/* 01394 80A966E4 46083302 */ mul.s $f12, $f6, $f8 -/* 01398 80A966E8 10000003 */ beq $zero, $zero, .L80A966F8 -/* 0139C 80A966EC E7AC0088 */ swc1 $f12, 0x0088($sp) +/* 01390 80A966E0 468021A0 */ cvt.s.w $f6, $f4 +/* 01394 80A966E4 46083302 */ mul.s $f12, $f6, $f8 +/* 01398 80A966E8 10000003 */ beq $zero, $zero, .L80A966F8 +/* 0139C 80A966EC E7AC0088 */ swc1 $f12, 0x0088($sp) .L80A966F0: -/* 013A0 80A966F0 C42A6B68 */ lwc1 $f10, %lo(D_80A96B68)($at) -/* 013A4 80A966F4 E7AA0088 */ swc1 $f10, 0x0088($sp) +/* 013A0 80A966F0 C42A6B68 */ lwc1 $f10, %lo(D_80A96B68)($at) +/* 013A4 80A966F4 E7AA0088 */ swc1 $f10, 0x0088($sp) .L80A966F8: -/* 013A8 80A966F8 C7AC0088 */ lwc1 $f12, 0x0088($sp) +/* 013A8 80A966F8 C7AC0088 */ lwc1 $f12, 0x0088($sp) /* 013AC 80A966FC 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 013B0 80A96700 44066000 */ mfc1 $a2, $f12 -/* 013B4 80A96704 0C0342A3 */ jal Matrix_Scale -/* 013B8 80A96708 46006386 */ mov.s $f14, $f12 +/* 013B0 80A96700 44066000 */ mfc1 $a2, $f12 +/* 013B4 80A96704 0C0342A3 */ jal Matrix_Scale +/* 013B8 80A96708 46006386 */ mov.s $f14, $f12 /* 013BC 80A9670C 866400B4 */ lh $a0, 0x00B4($s3) ## 000000B4 /* 013C0 80A96710 866500B6 */ lh $a1, 0x00B6($s3) ## 000000B6 /* 013C4 80A96714 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 013C8 80A96718 0C034421 */ jal Matrix_RotateXYZ +/* 013C8 80A96718 0C034421 */ jal Matrix_RotateZYX /* 013CC 80A9671C 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 /* 013D0 80A96720 8E6F0190 */ lw $t7, 0x0190($s3) ## 00000190 /* 013D4 80A96724 3C0380A9 */ lui $v1, %hi(func_80A95D90) ## $v1 = 80A90000 /* 013D8 80A96728 24635D90 */ addiu $v1, $v1, %lo(func_80A95D90) ## $v1 = 80A95D90 -/* 013DC 80A9672C 146F0004 */ bne $v1, $t7, .L80A96740 +/* 013DC 80A9672C 146F0004 */ bne $v1, $t7, .L80A96740 /* 013E0 80A96730 24190003 */ addiu $t9, $zero, 0x0003 ## $t9 = 00000003 /* 013E4 80A96734 24180002 */ addiu $t8, $zero, 0x0002 ## $t8 = 00000002 -/* 013E8 80A96738 10000002 */ beq $zero, $zero, .L80A96744 -/* 013EC 80A9673C AFB8008C */ sw $t8, 0x008C($sp) +/* 013E8 80A96738 10000002 */ beq $zero, $zero, .L80A96744 +/* 013EC 80A9673C AFB8008C */ sw $t8, 0x008C($sp) .L80A96740: -/* 013F0 80A96740 AFB9008C */ sw $t9, 0x008C($sp) +/* 013F0 80A96740 AFB9008C */ sw $t9, 0x008C($sp) .L80A96744: -/* 013F4 80A96744 8FA8008C */ lw $t0, 0x008C($sp) +/* 013F4 80A96744 8FA8008C */ lw $t0, 0x008C($sp) /* 013F8 80A96748 3C0980A9 */ lui $t1, %hi(D_80A96A6C) ## $t1 = 80A90000 /* 013FC 80A9674C 25316A6C */ addiu $s1, $t1, %lo(D_80A96A6C) ## $s1 = 80A96A6C -/* 01400 80A96750 1900002C */ blez $t0, .L80A96804 -/* 01404 80A96754 00085080 */ sll $t2, $t0, 2 -/* 01408 80A96758 01515821 */ addu $t3, $t2, $s1 +/* 01400 80A96750 1900002C */ blez $t0, .L80A96804 +/* 01404 80A96754 00085080 */ sll $t2, $t0, 2 +/* 01408 80A96758 01515821 */ addu $t3, $t2, $s1 /* 0140C 80A9675C 4480A000 */ mtc1 $zero, $f20 ## $f20 = 0.00 -/* 01410 80A96760 AFAB0048 */ sw $t3, 0x0048($sp) -/* 01414 80A96764 AFA3004C */ sw $v1, 0x004C($sp) -/* 01418 80A96768 4600A306 */ mov.s $f12, $f20 +/* 01410 80A96760 AFAB0048 */ sw $t3, 0x0048($sp) +/* 01414 80A96764 AFA3004C */ sw $v1, 0x004C($sp) +/* 01418 80A96768 4600A306 */ mov.s $f12, $f20 .L80A9676C: -/* 0141C 80A9676C 4600A386 */ mov.s $f14, $f20 +/* 0141C 80A9676C 4600A386 */ mov.s $f14, $f20 /* 01420 80A96770 3C06C4FA */ lui $a2, 0xC4FA ## $a2 = C4FA0000 -/* 01424 80A96774 0C034261 */ jal Matrix_Translate +/* 01424 80A96774 0C034261 */ jal Matrix_Translate /* 01428 80A96778 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 /* 0142C 80A9677C 8E5002C0 */ lw $s0, 0x02C0($s2) ## 000002C0 /* 01430 80A96780 3C0DDA38 */ lui $t5, 0xDA38 ## $t5 = DA380000 @@ -146,7 +146,7 @@ glabel EnKarebaba_Draw /* 01444 80A96794 AE0D0000 */ sw $t5, 0x0000($s0) ## 00000000 /* 01448 80A96798 8E840000 */ lw $a0, 0x0000($s4) ## 00000000 /* 0144C 80A9679C 24A56AF4 */ addiu $a1, $a1, %lo(D_80A96AF4) ## $a1 = 80A96AF4 -/* 01450 80A967A0 0C0346A2 */ jal Matrix_NewMtx +/* 01450 80A967A0 0C0346A2 */ jal Matrix_NewMtx /* 01454 80A967A4 2406045C */ addiu $a2, $zero, 0x045C ## $a2 = 0000045C /* 01458 80A967A8 AE020004 */ sw $v0, 0x0004($s0) ## 00000004 /* 0145C 80A967AC 8E4302C0 */ lw $v1, 0x02C0($s2) ## 000002C0 @@ -157,24 +157,24 @@ glabel EnKarebaba_Draw /* 01470 80A967C0 AC6F0000 */ sw $t7, 0x0000($v1) ## 00000000 /* 01474 80A967C4 8E380000 */ lw $t8, 0x0000($s1) ## 80A96A6C /* 01478 80A967C8 27396A6C */ addiu $t9, $t9, %lo(D_80A96A6C) ## $t9 = 80A96A6C -/* 0147C 80A967CC 16390009 */ bne $s1, $t9, .L80A967F4 +/* 0147C 80A967CC 16390009 */ bne $s1, $t9, .L80A967F4 /* 01480 80A967D0 AC780004 */ sw $t8, 0x0004($v1) ## 00000004 -/* 01484 80A967D4 8FA8004C */ lw $t0, 0x004C($sp) +/* 01484 80A967D4 8FA8004C */ lw $t0, 0x004C($sp) /* 01488 80A967D8 8E6A0190 */ lw $t2, 0x0190($s3) ## 00000190 /* 0148C 80A967DC 3C0480A9 */ lui $a0, %hi(D_80A96A78) ## $a0 = 80A90000 /* 01490 80A967E0 24846A78 */ addiu $a0, $a0, %lo(D_80A96A78) ## $a0 = 80A96A78 -/* 01494 80A967E4 550A0004 */ bnel $t0, $t2, .L80A967F8 -/* 01498 80A967E8 8FA90048 */ lw $t1, 0x0048($sp) -/* 0149C 80A967EC 0C0346BD */ jal Matrix_MultVec3f +/* 01494 80A967E4 550A0004 */ bnel $t0, $t2, .L80A967F8 +/* 01498 80A967E8 8FA90048 */ lw $t1, 0x0048($sp) +/* 0149C 80A967EC 0C0346BD */ jal Matrix_MultVec3f /* 014A0 80A967F0 26650038 */ addiu $a1, $s3, 0x0038 ## $a1 = 00000038 .L80A967F4: -/* 014A4 80A967F4 8FA90048 */ lw $t1, 0x0048($sp) +/* 014A4 80A967F4 8FA90048 */ lw $t1, 0x0048($sp) .L80A967F8: /* 014A8 80A967F8 26310004 */ addiu $s1, $s1, 0x0004 ## $s1 = 80A96A70 -/* 014AC 80A967FC 5629FFDB */ bnel $s1, $t1, .L80A9676C -/* 014B0 80A96800 4600A306 */ mov.s $f12, $f20 +/* 014AC 80A967FC 5629FFDB */ bnel $s1, $t1, .L80A9676C +/* 014B0 80A96800 4600A306 */ mov.s $f12, $f20 .L80A96804: -/* 014B4 80A96804 0C009982 */ jal func_80026608 +/* 014B4 80A96804 0C009982 */ jal func_80026608 /* 014B8 80A96808 02802025 */ or $a0, $s4, $zero ## $a0 = 00000000 .L80A9680C: /* 014BC 80A9680C 3C0B80A9 */ lui $t3, %hi(func_80A95D90) ## $t3 = 80A90000 @@ -183,36 +183,36 @@ glabel EnKarebaba_Draw /* 014C8 80A96818 3C1080A9 */ lui $s0, %hi(func_80A95940) ## $s0 = 80A90000 /* 014CC 80A9681C 26105940 */ addiu $s0, $s0, %lo(func_80A95940) ## $s0 = 80A95940 /* 014D0 80A96820 24A56A68 */ addiu $a1, $a1, %lo(D_80A96A68) ## $a1 = 80A96A68 -/* 014D4 80A96824 AFAB004C */ sw $t3, 0x004C($sp) +/* 014D4 80A96824 AFAB004C */ sw $t3, 0x004C($sp) /* 014D8 80A96828 02802025 */ or $a0, $s4, $zero ## $a0 = 00000000 /* 014DC 80A9682C 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 -/* 014E0 80A96830 0C00988C */ jal func_80026230 +/* 014E0 80A96830 0C00988C */ jal func_80026230 /* 014E4 80A96834 24070002 */ addiu $a3, $zero, 0x0002 ## $a3 = 00000002 /* 014E8 80A96838 C66C0008 */ lwc1 $f12, 0x0008($s3) ## 00000008 /* 014EC 80A9683C C66E000C */ lwc1 $f14, 0x000C($s3) ## 0000000C /* 014F0 80A96840 8E660010 */ lw $a2, 0x0010($s3) ## 00000010 -/* 014F4 80A96844 0C034261 */ jal Matrix_Translate +/* 014F4 80A96844 0C034261 */ jal Matrix_Translate /* 014F8 80A96848 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 /* 014FC 80A9684C 8E6C0190 */ lw $t4, 0x0190($s3) ## 00000190 /* 01500 80A96850 3C0180A9 */ lui $at, %hi(D_80A96B6C) ## $at = 80A90000 -/* 01504 80A96854 520C0004 */ beql $s0, $t4, .L80A96868 -/* 01508 80A96858 C7AC0088 */ lwc1 $f12, 0x0088($sp) -/* 0150C 80A9685C C42C6B6C */ lwc1 $f12, %lo(D_80A96B6C)($at) -/* 01510 80A96860 E7AC0088 */ swc1 $f12, 0x0088($sp) -/* 01514 80A96864 C7AC0088 */ lwc1 $f12, 0x0088($sp) +/* 01504 80A96854 520C0004 */ beql $s0, $t4, .L80A96868 +/* 01508 80A96858 C7AC0088 */ lwc1 $f12, 0x0088($sp) +/* 0150C 80A9685C C42C6B6C */ lwc1 $f12, %lo(D_80A96B6C)($at) +/* 01510 80A96860 E7AC0088 */ swc1 $f12, 0x0088($sp) +/* 01514 80A96864 C7AC0088 */ lwc1 $f12, 0x0088($sp) .L80A96868: /* 01518 80A96868 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 0151C 80A9686C 44066000 */ mfc1 $a2, $f12 -/* 01520 80A96870 0C0342A3 */ jal Matrix_Scale -/* 01524 80A96874 46006386 */ mov.s $f14, $f12 +/* 0151C 80A9686C 44066000 */ mfc1 $a2, $f12 +/* 01520 80A96870 0C0342A3 */ jal Matrix_Scale +/* 01524 80A96874 46006386 */ mov.s $f14, $f12 /* 01528 80A96878 866D0016 */ lh $t5, 0x0016($s3) ## 00000016 /* 0152C 80A9687C 3C0180A9 */ lui $at, %hi(D_80A96B70) ## $at = 80A90000 -/* 01530 80A96880 C4246B70 */ lwc1 $f4, %lo(D_80A96B70)($at) +/* 01530 80A96880 C4246B70 */ lwc1 $f4, %lo(D_80A96B70)($at) /* 01534 80A96884 448D8000 */ mtc1 $t5, $f16 ## $f16 = 0.00 /* 01538 80A96888 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 -/* 0153C 80A9688C 468084A0 */ cvt.s.w $f18, $f16 -/* 01540 80A96890 46049302 */ mul.s $f12, $f18, $f4 -/* 01544 80A96894 0C034348 */ jal Matrix_RotateY +/* 0153C 80A9688C 468084A0 */ cvt.s.w $f18, $f16 +/* 01540 80A96890 46049302 */ mul.s $f12, $f18, $f4 +/* 01544 80A96894 0C034348 */ jal Matrix_RotateY /* 01548 80A96898 00000000 */ nop /* 0154C 80A9689C 8E5002C0 */ lw $s0, 0x02C0($s2) ## 000002C0 /* 01550 80A968A0 3C0FDA38 */ lui $t7, 0xDA38 ## $t7 = DA380000 @@ -223,7 +223,7 @@ glabel EnKarebaba_Draw /* 01564 80A968B4 AE0F0000 */ sw $t7, 0x0000($s0) ## 80A95940 /* 01568 80A968B8 8E840000 */ lw $a0, 0x0000($s4) ## 00000000 /* 0156C 80A968BC 24A56B08 */ addiu $a1, $a1, %lo(D_80A96B08) ## $a1 = 80A96B08 -/* 01570 80A968C0 0C0346A2 */ jal Matrix_NewMtx +/* 01570 80A968C0 0C0346A2 */ jal Matrix_NewMtx /* 01574 80A968C4 24060478 */ addiu $a2, $zero, 0x0478 ## $a2 = 00000478 /* 01578 80A968C8 AE020004 */ sw $v0, 0x0004($s0) ## 80A95944 /* 0157C 80A968CC 8E4302C0 */ lw $v1, 0x02C0($s2) ## 000002C0 @@ -235,18 +235,18 @@ glabel EnKarebaba_Draw /* 01594 80A968E4 AC790000 */ sw $t9, 0x0000($v1) ## 00000000 /* 01598 80A968E8 AC680004 */ sw $t0, 0x0004($v1) ## 00000004 /* 0159C 80A968EC 8E690190 */ lw $t1, 0x0190($s3) ## 00000190 -/* 015A0 80A968F0 8FAA004C */ lw $t2, 0x004C($sp) +/* 015A0 80A968F0 8FAA004C */ lw $t2, 0x004C($sp) /* 015A4 80A968F4 2404C000 */ addiu $a0, $zero, 0xC000 ## $a0 = FFFFC000 -/* 015A8 80A968F8 1549001D */ bne $t2, $t1, .L80A96970 +/* 015A8 80A968F8 1549001D */ bne $t2, $t1, .L80A96970 /* 015AC 80A968FC 00000000 */ nop /* 015B0 80A96900 866B00B6 */ lh $t3, 0x00B6($s3) ## 000000B6 /* 015B4 80A96904 866C0016 */ lh $t4, 0x0016($s3) ## 00000016 /* 015B8 80A96908 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 /* 015BC 80A9690C 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 015C0 80A96910 016C2823 */ subu $a1, $t3, $t4 -/* 015C4 80A96914 00052C00 */ sll $a1, $a1, 16 -/* 015C8 80A96918 0C034421 */ jal Matrix_RotateXYZ -/* 015CC 80A9691C 00052C03 */ sra $a1, $a1, 16 +/* 015C0 80A96910 016C2823 */ subu $a1, $t3, $t4 +/* 015C4 80A96914 00052C00 */ sll $a1, $a1, 16 +/* 015C8 80A96918 0C034421 */ jal Matrix_RotateZYX +/* 015CC 80A9691C 00052C03 */ sra $a1, $a1, 16 /* 015D0 80A96920 8E5002C0 */ lw $s0, 0x02C0($s2) ## 000002C0 /* 015D4 80A96924 3C0EDA38 */ lui $t6, 0xDA38 ## $t6 = DA380000 /* 015D8 80A96928 35CE0003 */ ori $t6, $t6, 0x0003 ## $t6 = DA380003 @@ -256,7 +256,7 @@ glabel EnKarebaba_Draw /* 015E8 80A96938 AE0E0000 */ sw $t6, 0x0000($s0) ## 80A95940 /* 015EC 80A9693C 8E840000 */ lw $a0, 0x0000($s4) ## 00000000 /* 015F0 80A96940 24A56B1C */ addiu $a1, $a1, %lo(D_80A96B1C) ## $a1 = 80A96B1C -/* 015F4 80A96944 0C0346A2 */ jal Matrix_NewMtx +/* 015F4 80A96944 0C0346A2 */ jal Matrix_NewMtx /* 015F8 80A96948 24060483 */ addiu $a2, $zero, 0x0483 ## $a2 = 00000483 /* 015FC 80A9694C AE020004 */ sw $v0, 0x0004($s0) ## 80A95944 /* 01600 80A96950 8E4302C0 */ lw $v1, 0x02C0($s2) ## 000002C0 @@ -268,29 +268,29 @@ glabel EnKarebaba_Draw /* 01618 80A96968 AC780000 */ sw $t8, 0x0000($v1) ## 00000000 /* 0161C 80A9696C AC790004 */ sw $t9, 0x0004($v1) ## 00000004 .L80A96970: -/* 01620 80A96970 0C009982 */ jal func_80026608 +/* 01620 80A96970 0C009982 */ jal func_80026608 /* 01624 80A96974 02802025 */ or $a0, $s4, $zero ## $a0 = 00000000 /* 01628 80A96978 3C0680A9 */ lui $a2, %hi(D_80A96B30) ## $a2 = 80A90000 /* 0162C 80A9697C 24C66B30 */ addiu $a2, $a2, %lo(D_80A96B30) ## $a2 = 80A96B30 /* 01630 80A96980 27A40074 */ addiu $a0, $sp, 0x0074 ## $a0 = FFFFFFDC /* 01634 80A96984 8E850000 */ lw $a1, 0x0000($s4) ## 00000000 -/* 01638 80A96988 0C031AD5 */ jal func_800C6B54 +/* 01638 80A96988 0C031AD5 */ jal Graph_CloseDisps /* 0163C 80A9698C 2407048B */ addiu $a3, $zero, 0x048B ## $a3 = 0000048B /* 01640 80A96990 8E6801F4 */ lw $t0, 0x01F4($s3) ## 000001F4 /* 01644 80A96994 02602025 */ or $a0, $s3, $zero ## $a0 = 00000000 -/* 01648 80A96998 51000004 */ beql $t0, $zero, .L80A969AC -/* 0164C 80A9699C 8FBF003C */ lw $ra, 0x003C($sp) -/* 01650 80A969A0 0C2A5913 */ jal func_80A9644C +/* 01648 80A96998 51000004 */ beql $t0, $zero, .L80A969AC +/* 0164C 80A9699C 8FBF003C */ lw $ra, 0x003C($sp) +/* 01650 80A969A0 0C2A5913 */ jal func_80A9644C /* 01654 80A969A4 02802825 */ or $a1, $s4, $zero ## $a1 = 00000000 -/* 01658 80A969A8 8FBF003C */ lw $ra, 0x003C($sp) +/* 01658 80A969A8 8FBF003C */ lw $ra, 0x003C($sp) .L80A969AC: -/* 0165C 80A969AC D7B40020 */ ldc1 $f20, 0x0020($sp) -/* 01660 80A969B0 8FB00028 */ lw $s0, 0x0028($sp) -/* 01664 80A969B4 8FB1002C */ lw $s1, 0x002C($sp) -/* 01668 80A969B8 8FB20030 */ lw $s2, 0x0030($sp) -/* 0166C 80A969BC 8FB30034 */ lw $s3, 0x0034($sp) -/* 01670 80A969C0 8FB40038 */ lw $s4, 0x0038($sp) -/* 01674 80A969C4 03E00008 */ jr $ra +/* 0165C 80A969AC D7B40020 */ ldc1 $f20, 0x0020($sp) +/* 01660 80A969B0 8FB00028 */ lw $s0, 0x0028($sp) +/* 01664 80A969B4 8FB1002C */ lw $s1, 0x002C($sp) +/* 01668 80A969B8 8FB20030 */ lw $s2, 0x0030($sp) +/* 0166C 80A969BC 8FB30034 */ lw $s3, 0x0034($sp) +/* 01670 80A969C0 8FB40038 */ lw $s4, 0x0038($sp) +/* 01674 80A969C4 03E00008 */ jr $ra /* 01678 80A969C8 27BD0098 */ addiu $sp, $sp, 0x0098 ## $sp = 00000000 /* 0167C 80A969CC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Karebaba/func_80A9559C.s b/asm/non_matchings/overlays/actors/ovl_En_Karebaba/func_80A9559C.s index 794955963e..88f4457db0 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Karebaba/func_80A9559C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Karebaba/func_80A9559C.s @@ -1,37 +1,37 @@ glabel func_80A9559C /* 0024C 80A9559C 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 00250 80A955A0 AFA40028 */ sw $a0, 0x0028($sp) -/* 00254 80A955A4 AFBF0024 */ sw $ra, 0x0024($sp) +/* 00250 80A955A0 AFA40028 */ sw $a0, 0x0028($sp) +/* 00254 80A955A4 AFBF0024 */ sw $ra, 0x0024($sp) /* 00258 80A955A8 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 /* 0025C 80A955AC 0C028800 */ jal SkelAnime_GetFrameCount - + /* 00260 80A955B0 248402B8 */ addiu $a0, $a0, 0x02B8 ## $a0 = 060002B8 /* 00264 80A955B4 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 00268 80A955B8 3C01C040 */ lui $at, 0xC040 ## $at = C0400000 /* 0026C 80A955BC 44814000 */ mtc1 $at, $f8 ## $f8 = -3.00 -/* 00270 80A955C0 468021A0 */ cvt.s.w $f6, $f4 -/* 00274 80A955C4 8FA40028 */ lw $a0, 0x0028($sp) +/* 00270 80A955C0 468021A0 */ cvt.s.w $f6, $f4 +/* 00274 80A955C4 8FA40028 */ lw $a0, 0x0028($sp) /* 00278 80A955C8 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 0027C 80A955CC 24A502B8 */ addiu $a1, $a1, 0x02B8 ## $a1 = 060002B8 /* 00280 80A955D0 3C064080 */ lui $a2, 0x4080 ## $a2 = 40800000 /* 00284 80A955D4 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 00288 80A955D8 E7A60010 */ swc1 $f6, 0x0010($sp) -/* 0028C 80A955DC AFA00014 */ sw $zero, 0x0014($sp) -/* 00290 80A955E0 E7A80018 */ swc1 $f8, 0x0018($sp) -/* 00294 80A955E4 0C029468 */ jal SkelAnime_ChangeAnimation - +/* 00288 80A955D8 E7A60010 */ swc1 $f6, 0x0010($sp) +/* 0028C 80A955DC AFA00014 */ sw $zero, 0x0014($sp) +/* 00290 80A955E0 E7A80018 */ swc1 $f8, 0x0018($sp) +/* 00294 80A955E4 0C029468 */ jal SkelAnime_ChangeAnim + /* 00298 80A955E8 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 0029C 80A955EC 8FA40028 */ lw $a0, 0x0028($sp) +/* 0029C 80A955EC 8FA40028 */ lw $a0, 0x0028($sp) /* 002A0 80A955F0 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 002A4 80A955F4 240539E2 */ addiu $a1, $zero, 0x39E2 ## $a1 = 000039E2 -/* 002A8 80A955F8 8FAF0028 */ lw $t7, 0x0028($sp) +/* 002A8 80A955F8 8FAF0028 */ lw $t7, 0x0028($sp) /* 002AC 80A955FC 3C0E80A9 */ lui $t6, %hi(func_80A95A38) ## $t6 = 80A90000 /* 002B0 80A95600 25CE5A38 */ addiu $t6, $t6, %lo(func_80A95A38) ## $t6 = 80A95A38 /* 002B4 80A95604 ADEE0190 */ sw $t6, 0x0190($t7) ## 00000190 -/* 002B8 80A95608 8FBF0024 */ lw $ra, 0x0024($sp) +/* 002B8 80A95608 8FBF0024 */ lw $ra, 0x0024($sp) /* 002BC 80A9560C 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 002C0 80A95610 03E00008 */ jr $ra +/* 002C0 80A95610 03E00008 */ jr $ra /* 002C4 80A95614 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Karebaba/func_80A957E0.s b/asm/non_matchings/overlays/actors/ovl_En_Karebaba/func_80A957E0.s index 7217047886..14e12bf874 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Karebaba/func_80A957E0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Karebaba/func_80A957E0.s @@ -1,37 +1,37 @@ glabel func_80A957E0 /* 00490 80A957E0 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 00494 80A957E4 AFA40028 */ sw $a0, 0x0028($sp) -/* 00498 80A957E8 AFBF0024 */ sw $ra, 0x0024($sp) +/* 00494 80A957E4 AFA40028 */ sw $a0, 0x0028($sp) +/* 00498 80A957E8 AFBF0024 */ sw $ra, 0x0024($sp) /* 0049C 80A957EC 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 /* 004A0 80A957F0 0C028800 */ jal SkelAnime_GetFrameCount - + /* 004A4 80A957F4 248402B8 */ addiu $a0, $a0, 0x02B8 ## $a0 = 060002B8 /* 004A8 80A957F8 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 004AC 80A957FC 3C01C040 */ lui $at, 0xC040 ## $at = C0400000 /* 004B0 80A95800 44810000 */ mtc1 $at, $f0 ## $f0 = -3.00 -/* 004B4 80A95804 46802120 */ cvt.s.w $f4, $f4 -/* 004B8 80A95808 8FA40028 */ lw $a0, 0x0028($sp) +/* 004B4 80A95804 46802120 */ cvt.s.w $f4, $f4 +/* 004B8 80A95808 8FA40028 */ lw $a0, 0x0028($sp) /* 004BC 80A9580C 44803000 */ mtc1 $zero, $f6 ## $f6 = 0.00 /* 004C0 80A95810 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 004C4 80A95814 240E0002 */ addiu $t6, $zero, 0x0002 ## $t6 = 00000002 -/* 004C8 80A95818 44060000 */ mfc1 $a2, $f0 -/* 004CC 80A9581C 44072000 */ mfc1 $a3, $f4 -/* 004D0 80A95820 AFAE0014 */ sw $t6, 0x0014($sp) +/* 004C8 80A95818 44060000 */ mfc1 $a2, $f0 +/* 004CC 80A9581C 44072000 */ mfc1 $a3, $f4 +/* 004D0 80A95820 AFAE0014 */ sw $t6, 0x0014($sp) /* 004D4 80A95824 24A502B8 */ addiu $a1, $a1, 0x02B8 ## $a1 = 060002B8 -/* 004D8 80A95828 E7A00018 */ swc1 $f0, 0x0018($sp) +/* 004D8 80A95828 E7A00018 */ swc1 $f0, 0x0018($sp) /* 004DC 80A9582C 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 004E0 80A95830 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 004E4 80A95834 E7A60010 */ swc1 $f6, 0x0010($sp) -/* 004E8 80A95838 0C2A5530 */ jal func_80A954C0 -/* 004EC 80A9583C 8FA40028 */ lw $a0, 0x0028($sp) -/* 004F0 80A95840 8FB80028 */ lw $t8, 0x0028($sp) +/* 004E0 80A95830 0C029468 */ jal SkelAnime_ChangeAnim + +/* 004E4 80A95834 E7A60010 */ swc1 $f6, 0x0010($sp) +/* 004E8 80A95838 0C2A5530 */ jal func_80A954C0 +/* 004EC 80A9583C 8FA40028 */ lw $a0, 0x0028($sp) +/* 004F0 80A95840 8FB80028 */ lw $t8, 0x0028($sp) /* 004F4 80A95844 3C0F80A9 */ lui $t7, %hi(func_80A960B0) ## $t7 = 80A90000 /* 004F8 80A95848 25EF60B0 */ addiu $t7, $t7, %lo(func_80A960B0) ## $t7 = 80A960B0 /* 004FC 80A9584C AF0F0190 */ sw $t7, 0x0190($t8) ## 00000190 -/* 00500 80A95850 8FBF0024 */ lw $ra, 0x0024($sp) +/* 00500 80A95850 8FBF0024 */ lw $ra, 0x0024($sp) /* 00504 80A95854 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 00508 80A95858 03E00008 */ jr $ra +/* 00508 80A95858 03E00008 */ jr $ra /* 0050C 80A9585C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Karebaba/func_80A95860.s b/asm/non_matchings/overlays/actors/ovl_En_Karebaba/func_80A95860.s index 7e0829a96e..9641fc05c1 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Karebaba/func_80A95860.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Karebaba/func_80A95860.s @@ -1,21 +1,21 @@ glabel func_80A95860 /* 00510 80A95860 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 /* 00514 80A95864 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 00518 80A95868 AFB00028 */ sw $s0, 0x0028($sp) +/* 00518 80A95868 AFB00028 */ sw $s0, 0x0028($sp) /* 0051C 80A9586C 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00520 80A95870 AFBF002C */ sw $ra, 0x002C($sp) +/* 00520 80A95870 AFBF002C */ sw $ra, 0x002C($sp) /* 00524 80A95874 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 00528 80A95878 240E0002 */ addiu $t6, $zero, 0x0002 ## $t6 = 00000002 -/* 0052C 80A9587C 44060000 */ mfc1 $a2, $f0 -/* 00530 80A95880 44070000 */ mfc1 $a3, $f0 -/* 00534 80A95884 AFAE0014 */ sw $t6, 0x0014($sp) +/* 0052C 80A9587C 44060000 */ mfc1 $a2, $f0 +/* 00530 80A95880 44070000 */ mfc1 $a3, $f0 +/* 00534 80A95884 AFAE0014 */ sw $t6, 0x0014($sp) /* 00538 80A95888 24A502B8 */ addiu $a1, $a1, 0x02B8 ## $a1 = 060002B8 /* 0053C 80A9588C 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 00540 80A95890 E7A00010 */ swc1 $f0, 0x0010($sp) -/* 00544 80A95894 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 00548 80A95898 E7A00018 */ swc1 $f0, 0x0018($sp) -/* 0054C 80A9589C 0C2A5530 */ jal func_80A954C0 +/* 00540 80A95890 E7A00010 */ swc1 $f0, 0x0010($sp) +/* 00544 80A95894 0C029468 */ jal SkelAnime_ChangeAnim + +/* 00548 80A95898 E7A00018 */ swc1 $f0, 0x0018($sp) +/* 0054C 80A9589C 0C2A5530 */ jal func_80A954C0 /* 00550 80A958A0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 00554 80A958A4 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 /* 00558 80A958A8 240FC000 */ addiu $t7, $zero, 0xC000 ## $t7 = FFFFC000 @@ -31,10 +31,10 @@ glabel func_80A95860 /* 0057C 80A958CC 3C1980A9 */ lui $t9, %hi(func_80A96184) ## $t9 = 80A90000 /* 00580 80A958D0 27396184 */ addiu $t9, $t9, %lo(func_80A96184) ## $t9 = 80A96184 /* 00584 80A958D4 AE190190 */ sw $t9, 0x0190($s0) ## 00000190 -/* 00588 80A958D8 8FBF002C */ lw $ra, 0x002C($sp) -/* 0058C 80A958DC 8FB00028 */ lw $s0, 0x0028($sp) +/* 00588 80A958D8 8FBF002C */ lw $ra, 0x002C($sp) +/* 0058C 80A958DC 8FB00028 */ lw $s0, 0x0028($sp) /* 00590 80A958E0 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 00594 80A958E4 03E00008 */ jr $ra +/* 00594 80A958E4 03E00008 */ jr $ra /* 00598 80A958E8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Karebaba/func_80A9644C.s b/asm/non_matchings/overlays/actors/ovl_En_Karebaba/func_80A9644C.s index b6dd1a329d..819b6da9d4 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Karebaba/func_80A9644C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Karebaba/func_80A9644C.s @@ -9,7 +9,7 @@ glabel func_80A9644C /* 01118 80A96468 24C66A90 */ addiu $a2, $a2, %lo(D_80A96A90) ## $a2 = 80A96A90 /* 0111C 80A9646C 27A4003C */ addiu $a0, $sp, 0x003C ## $a0 = FFFFFFAC /* 01120 80A96470 240703F5 */ addiu $a3, $zero, 0x03F5 ## $a3 = 000003F5 -/* 01124 80A96474 0C031AB1 */ jal func_800C6AC4 +/* 01124 80A96474 0C031AB1 */ jal Graph_OpenDisps /* 01128 80A96478 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 /* 0112C 80A9647C 8FAF0094 */ lw $t7, 0x0094($sp) /* 01130 80A96480 0C025011 */ jal func_80094044 @@ -67,7 +67,7 @@ glabel func_80A9644C /* 01200 80A96550 24C66AB8 */ addiu $a2, $a2, %lo(D_80A96AB8) ## $a2 = 80A96AB8 /* 01204 80A96554 27A4003C */ addiu $a0, $sp, 0x003C ## $a0 = FFFFFFAC /* 01208 80A96558 2407040A */ addiu $a3, $zero, 0x040A ## $a3 = 0000040A -/* 0120C 80A9655C 0C031AD5 */ jal func_800C6B54 +/* 0120C 80A9655C 0C031AD5 */ jal Graph_CloseDisps /* 01210 80A96560 8F250000 */ lw $a1, 0x0000($t9) ## 00000000 /* 01214 80A96564 8FBF0024 */ lw $ra, 0x0024($sp) /* 01218 80A96568 8FB00020 */ lw $s0, 0x0020($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ko/EnKo_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Ko/EnKo_Draw.s index 0b65e32f7c..3f52fcecdb 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ko/EnKo_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ko/EnKo_Draw.s @@ -69,7 +69,7 @@ glabel EnKo_Draw /* 03050 80A99E00 A20900C8 */ sb $t1, 0x00C8($s0) ## 000000C8 /* 03054 80A99E04 8E450000 */ lw $a1, 0x0000($s2) ## 00000000 /* 03058 80A99E08 44C8F800 */ ctc1 $t0, $31 -/* 0305C 80A99E0C 0C031AB1 */ jal func_800C6AC4 +/* 0305C 80A99E0C 0C031AB1 */ jal Graph_OpenDisps /* 03060 80A99E10 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 /* 03064 80A99E14 C6000220 */ lwc1 $f0, 0x0220($s0) ## 00000220 /* 03068 80A99E18 240100FF */ addiu $at, $zero, 0x00FF ## $at = 000000FF @@ -250,7 +250,7 @@ glabel EnKo_Draw /* 03304 80A9A0B4 24C6A7AC */ addiu $a2, $a2, %lo(D_80A9A7AC) ## $a2 = 80A9A7AC /* 03308 80A9A0B8 27A40048 */ addiu $a0, $sp, 0x0048 ## $a0 = FFFFFFE0 /* 0330C 80A9A0BC 8E450000 */ lw $a1, 0x0000($s2) ## 00000000 -/* 03310 80A9A0C0 0C031AD5 */ jal func_800C6B54 +/* 03310 80A9A0C0 0C031AD5 */ jal Graph_CloseDisps /* 03314 80A9A0C4 24070858 */ addiu $a3, $zero, 0x0858 ## $a3 = 00000858 /* 03318 80A9A0C8 8FBF002C */ lw $ra, 0x002C($sp) /* 0331C 80A9A0CC 8FB00020 */ lw $s0, 0x0020($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A97610.s b/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A97610.s index 3d8f7199d3..c5b77ad81c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A97610.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A97610.s @@ -21,7 +21,7 @@ glabel func_80A97610 /* 008AC 80A9765C 14610007 */ bne $v1, $at, .L80A9767C .L80A97660: /* 008B0 80A97660 24050013 */ addiu $a1, $zero, 0x0013 ## $a1 = 00000013 -/* 008B4 80A97664 0C01B0D8 */ jal func_8006C360 +/* 008B4 80A97664 0C01B0D8 */ jal Text_GetFaceReaction /* 008B8 80A97668 AFA60024 */ sw $a2, 0x0024($sp) /* 008BC 80A9766C 8FA60024 */ lw $a2, 0x0024($sp) /* 008C0 80A97670 84C3001C */ lh $v1, 0x001C($a2) ## 0000001C @@ -43,7 +43,7 @@ glabel func_80A97610 .L80A976AC: /* 008FC 80A976AC 8FA40020 */ lw $a0, 0x0020($sp) /* 00900 80A976B0 24050014 */ addiu $a1, $zero, 0x0014 ## $a1 = 00000014 -/* 00904 80A976B4 0C01B0D8 */ jal func_8006C360 +/* 00904 80A976B4 0C01B0D8 */ jal Text_GetFaceReaction /* 00908 80A976B8 AFA60024 */ sw $a2, 0x0024($sp) /* 0090C 80A976BC 8FA60024 */ lw $a2, 0x0024($sp) /* 00910 80A976C0 3044FFFF */ andi $a0, $v0, 0xFFFF ## $a0 = 00000000 @@ -54,7 +54,7 @@ glabel func_80A97610 /* 00920 80A976D0 14610006 */ bne $v1, $at, .L80A976EC /* 00924 80A976D4 24050012 */ addiu $a1, $zero, 0x0012 ## $a1 = 00000012 /* 00928 80A976D8 8FA40020 */ lw $a0, 0x0020($sp) -/* 0092C 80A976DC 0C01B0D8 */ jal func_8006C360 +/* 0092C 80A976DC 0C01B0D8 */ jal Text_GetFaceReaction /* 00930 80A976E0 AFA60024 */ sw $a2, 0x0024($sp) /* 00934 80A976E4 8FA60024 */ lw $a2, 0x0024($sp) /* 00938 80A976E8 3044FFFF */ andi $a0, $v0, 0xFFFF ## $a0 = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A99048.s b/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A99048.s index 3fbfa68fe3..aa843b1daf 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A99048.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ko/func_80A99048.s @@ -1,226 +1,226 @@ glabel func_80A99048 /* 02298 80A99048 27BDFFB8 */ addiu $sp, $sp, 0xFFB8 ## $sp = FFFFFFB8 -/* 0229C 80A9904C AFBF003C */ sw $ra, 0x003C($sp) -/* 022A0 80A99050 AFB10038 */ sw $s1, 0x0038($sp) -/* 022A4 80A99054 AFB00034 */ sw $s0, 0x0034($sp) +/* 0229C 80A9904C AFBF003C */ sw $ra, 0x003C($sp) +/* 022A0 80A99050 AFB10038 */ sw $s1, 0x0038($sp) +/* 022A4 80A99054 AFB00034 */ sw $s0, 0x0034($sp) /* 022A8 80A99058 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 022AC 80A9905C 0C2A5BE5 */ jal func_80A96F94 +/* 022AC 80A9905C 0C2A5BE5 */ jal func_80A96F94 /* 022B0 80A99060 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 -/* 022B4 80A99064 104000C2 */ beq $v0, $zero, .L80A99370 +/* 022B4 80A99064 104000C2 */ beq $v0, $zero, .L80A99370 /* 022B8 80A99068 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 022BC 80A9906C 0C2A5BB1 */ jal func_80A96EC4 +/* 022BC 80A9906C 0C2A5BB1 */ jal func_80A96EC4 /* 022C0 80A99070 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 022C4 80A99074 104000BE */ beq $v0, $zero, .L80A99370 +/* 022C4 80A99074 104000BE */ beq $v0, $zero, .L80A99370 /* 022C8 80A99078 2401FFEF */ addiu $at, $zero, 0xFFEF ## $at = FFFFFFEF /* 022CC 80A9907C 82180196 */ lb $t8, 0x0196($s0) ## 00000196 /* 022D0 80A99080 8E0E0004 */ lw $t6, 0x0004($s0) ## 00000004 /* 022D4 80A99084 3C0A0001 */ lui $t2, 0x0001 ## $t2 = 00010000 /* 022D8 80A99088 A218001E */ sb $t8, 0x001E($s0) ## 0000001E /* 022DC 80A9908C 8219001E */ lb $t9, 0x001E($s0) ## 0000001E -/* 022E0 80A99090 01C17824 */ and $t7, $t6, $at +/* 022E0 80A99090 01C17824 */ and $t7, $t6, $at /* 022E4 80A99094 AE0F0004 */ sw $t7, 0x0004($s0) ## 00000004 -/* 022E8 80A99098 00194100 */ sll $t0, $t9, 4 -/* 022EC 80A9909C 01194021 */ addu $t0, $t0, $t9 -/* 022F0 80A990A0 00084080 */ sll $t0, $t0, 2 -/* 022F4 80A990A4 02284821 */ addu $t1, $s1, $t0 -/* 022F8 80A990A8 01495021 */ addu $t2, $t2, $t1 +/* 022E8 80A99098 00194100 */ sll $t0, $t9, 4 +/* 022EC 80A9909C 01194021 */ addu $t0, $t0, $t9 +/* 022F0 80A990A0 00084080 */ sll $t0, $t0, 2 +/* 022F4 80A990A4 02284821 */ addu $t1, $s1, $t0 +/* 022F8 80A990A8 01495021 */ addu $t2, $t2, $t1 /* 022FC 80A990AC 8D4A17B4 */ lw $t2, 0x17B4($t2) ## 000117B4 /* 02300 80A990B0 3C018000 */ lui $at, 0x8000 ## $at = 80000000 /* 02304 80A990B4 3C0F80AA */ lui $t7, %hi(D_80A9A506) ## $t7 = 80AA0000 -/* 02308 80A990B8 01415821 */ addu $t3, $t2, $at +/* 02308 80A990B8 01415821 */ addu $t3, $t2, $at /* 0230C 80A990BC 3C018016 */ lui $at, 0x8016 ## $at = 80160000 /* 02310 80A990C0 AC2B6FC0 */ sw $t3, 0x6FC0($at) ## 80166FC0 /* 02314 80A990C4 860C001C */ lh $t4, 0x001C($s0) ## 0000001C /* 02318 80A990C8 3C0680AA */ lui $a2, %hi(D_80A9A180) ## $a2 = 80AA0000 /* 0231C 80A990CC 24090010 */ addiu $t1, $zero, 0x0010 ## $t1 = 00000010 /* 02320 80A990D0 318D00FF */ andi $t5, $t4, 0x00FF ## $t5 = 00000000 -/* 02324 80A990D4 000D7080 */ sll $t6, $t5, 2 -/* 02328 80A990D8 01CD7023 */ subu $t6, $t6, $t5 -/* 0232C 80A990DC 000E7080 */ sll $t6, $t6, 2 -/* 02330 80A990E0 01CD7023 */ subu $t6, $t6, $t5 -/* 02334 80A990E4 01EE7821 */ addu $t7, $t7, $t6 -/* 02338 80A990E8 91EFA506 */ lbu $t7, %lo(D_80A9A506)($t7) +/* 02324 80A990D4 000D7080 */ sll $t6, $t5, 2 +/* 02328 80A990D8 01CD7023 */ subu $t6, $t6, $t5 +/* 0232C 80A990DC 000E7080 */ sll $t6, $t6, 2 +/* 02330 80A990E0 01CD7023 */ subu $t6, $t6, $t5 +/* 02334 80A990E4 01EE7821 */ addu $t7, $t7, $t6 +/* 02338 80A990E8 91EFA506 */ lbu $t7, %lo(D_80A9A506)($t7) /* 0233C 80A990EC 26080284 */ addiu $t0, $s0, 0x0284 ## $t0 = 00000284 /* 02340 80A990F0 26190224 */ addiu $t9, $s0, 0x0224 ## $t9 = 00000224 -/* 02344 80A990F4 000FC0C0 */ sll $t8, $t7, 3 -/* 02348 80A990F8 00D83021 */ addu $a2, $a2, $t8 +/* 02344 80A990F4 000FC0C0 */ sll $t8, $t7, 3 +/* 02348 80A990F8 00D83021 */ addu $a2, $a2, $t8 /* 0234C 80A990FC 2605014C */ addiu $a1, $s0, 0x014C ## $a1 = 0000014C -/* 02350 80A99100 AFA50044 */ sw $a1, 0x0044($sp) -/* 02354 80A99104 8CC6A180 */ lw $a2, %lo(D_80A9A180)($a2) -/* 02358 80A99108 AFB90010 */ sw $t9, 0x0010($sp) -/* 0235C 80A9910C AFA80014 */ sw $t0, 0x0014($sp) -/* 02360 80A99110 AFA90018 */ sw $t1, 0x0018($sp) +/* 02350 80A99100 AFA50044 */ sw $a1, 0x0044($sp) +/* 02354 80A99104 8CC6A180 */ lw $a2, %lo(D_80A9A180)($a2) +/* 02358 80A99108 AFB90010 */ sw $t9, 0x0010($sp) +/* 0235C 80A9910C AFA80014 */ sw $t0, 0x0014($sp) +/* 02360 80A99110 AFA90018 */ sw $t1, 0x0018($sp) /* 02364 80A99114 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 02368 80A99118 0C0291BE */ jal func_800A46F8 +/* 02368 80A99118 0C0291BE */ jal SkelAnime_InitSV /* 0236C 80A9911C 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 /* 02370 80A99120 3C068003 */ lui $a2, 0x8003 ## $a2 = 80030000 /* 02374 80A99124 24C6B5EC */ addiu $a2, $a2, 0xB5EC ## $a2 = 8002B5EC /* 02378 80A99128 260400B4 */ addiu $a0, $s0, 0x00B4 ## $a0 = 000000B4 /* 0237C 80A9912C 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 /* 02380 80A99130 0C00AC78 */ jal ActorShape_Init - + /* 02384 80A99134 3C074190 */ lui $a3, 0x4190 ## $a3 = 41900000 /* 02388 80A99138 820A0197 */ lb $t2, 0x0197($s0) ## 00000197 /* 0238C 80A9913C 3C0D0001 */ lui $t5, 0x0001 ## $t5 = 00010000 /* 02390 80A99140 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 02394 80A99144 000A5900 */ sll $t3, $t2, 4 -/* 02398 80A99148 016A5821 */ addu $t3, $t3, $t2 -/* 0239C 80A9914C 000B5880 */ sll $t3, $t3, 2 -/* 023A0 80A99150 022B6021 */ addu $t4, $s1, $t3 -/* 023A4 80A99154 01AC6821 */ addu $t5, $t5, $t4 +/* 02394 80A99144 000A5900 */ sll $t3, $t2, 4 +/* 02398 80A99148 016A5821 */ addu $t3, $t3, $t2 +/* 0239C 80A9914C 000B5880 */ sll $t3, $t3, 2 +/* 023A0 80A99150 022B6021 */ addu $t4, $s1, $t3 +/* 023A4 80A99154 01AC6821 */ addu $t5, $t5, $t4 /* 023A8 80A99158 8DAD17B4 */ lw $t5, 0x17B4($t5) ## 000117B4 /* 023AC 80A9915C 26050198 */ addiu $a1, $s0, 0x0198 ## $a1 = 00000198 -/* 023B0 80A99160 AFA50040 */ sw $a1, 0x0040($sp) -/* 023B4 80A99164 01A17021 */ addu $t6, $t5, $at +/* 023B0 80A99160 AFA50040 */ sw $a1, 0x0040($sp) +/* 023B4 80A99164 01A17021 */ addu $t6, $t5, $at /* 023B8 80A99168 3C018016 */ lui $at, 0x8016 ## $at = 80160000 /* 023BC 80A9916C AC2E6FC0 */ sw $t6, 0x6FC0($at) ## 80166FC0 /* 023C0 80A99170 0C0170D9 */ jal ActorCollider_AllocCylinder - + /* 023C4 80A99174 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 023C8 80A99178 3C0780AA */ lui $a3, %hi(D_80A9A100) ## $a3 = 80AA0000 -/* 023CC 80A9917C 8FA50040 */ lw $a1, 0x0040($sp) +/* 023CC 80A9917C 8FA50040 */ lw $a1, 0x0040($sp) /* 023D0 80A99180 24E7A100 */ addiu $a3, $a3, %lo(D_80A9A100) ## $a3 = 80A9A100 /* 023D4 80A99184 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 023D8 80A99188 0C01712B */ jal ActorCollider_InitCylinder - + /* 023DC 80A9918C 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 023E0 80A99190 3C0680AA */ lui $a2, %hi(D_80A9A12C) ## $a2 = 80AA0000 /* 023E4 80A99194 24C6A12C */ addiu $a2, $a2, %lo(D_80A9A12C) ## $a2 = 80A9A12C /* 023E8 80A99198 26040098 */ addiu $a0, $s0, 0x0098 ## $a0 = 00000098 -/* 023EC 80A9919C 0C0187BF */ jal func_80061EFC +/* 023EC 80A9919C 0C0187BF */ jal func_80061EFC /* 023F0 80A991A0 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 023F4 80A991A4 860F001C */ lh $t7, 0x001C($s0) ## 0000001C /* 023F8 80A991A8 24010007 */ addiu $at, $zero, 0x0007 ## $at = 00000007 /* 023FC 80A991AC 3C0480AA */ lui $a0, %hi(D_80A9A780) ## $a0 = 80AA0000 /* 02400 80A991B0 31F800FF */ andi $t8, $t7, 0x00FF ## $t8 = 00000000 -/* 02404 80A991B4 1701001D */ bne $t8, $at, .L80A9922C +/* 02404 80A991B4 1701001D */ bne $t8, $at, .L80A9922C /* 02408 80A991B8 2484A780 */ addiu $a0, $a0, %lo(D_80A9A780) ## $a0 = 80A9A780 /* 0240C 80A991BC 0C00084C */ jal osSyncPrintf - + /* 02410 80A991C0 860500B8 */ lh $a1, 0x00B8($s0) ## 000000B8 /* 02414 80A991C4 3C198016 */ lui $t9, 0x8016 ## $t9 = 80160000 /* 02418 80A991C8 8F39E664 */ lw $t9, -0x199C($t9) ## 8015E664 /* 0241C 80A991CC 3C088012 */ lui $t0, 0x8012 ## $t0 = 80120000 /* 02420 80A991D0 3C098016 */ lui $t1, 0x8016 ## $t1 = 80160000 -/* 02424 80A991D4 5720000F */ bnel $t9, $zero, .L80A99214 +/* 02424 80A991D4 5720000F */ bnel $t9, $zero, .L80A99214 /* 02428 80A991D8 860C00B8 */ lh $t4, 0x00B8($s0) ## 000000B8 /* 0242C 80A991DC 8D087120 */ lw $t0, 0x7120($t0) ## 80127120 /* 02430 80A991E0 8D29E704 */ lw $t1, -0x18FC($t1) ## 8015E704 -/* 02434 80A991E4 01095024 */ and $t2, $t0, $t1 -/* 02438 80A991E8 5540000A */ bnel $t2, $zero, .L80A99214 +/* 02434 80A991E4 01095024 */ and $t2, $t0, $t1 +/* 02438 80A991E8 5540000A */ bnel $t2, $zero, .L80A99214 /* 0243C 80A991EC 860C00B8 */ lh $t4, 0x00B8($s0) ## 000000B8 /* 02440 80A991F0 860B00B8 */ lh $t3, 0x00B8($s0) ## 000000B8 /* 02444 80A991F4 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 02448 80A991F8 5161000D */ beql $t3, $at, .L80A99230 +/* 02448 80A991F8 5161000D */ beql $t3, $at, .L80A99230 /* 0244C 80A991FC 860D001C */ lh $t5, 0x001C($s0) ## 0000001C /* 02450 80A99200 0C00B55C */ jal Actor_Kill - + /* 02454 80A99204 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02458 80A99208 1000005A */ beq $zero, $zero, .L80A99374 -/* 0245C 80A9920C 8FBF003C */ lw $ra, 0x003C($sp) +/* 02458 80A99208 1000005A */ beq $zero, $zero, .L80A99374 +/* 0245C 80A9920C 8FBF003C */ lw $ra, 0x003C($sp) /* 02460 80A99210 860C00B8 */ lh $t4, 0x00B8($s0) ## 000000B8 .L80A99214: -/* 02464 80A99214 51800006 */ beql $t4, $zero, .L80A99230 +/* 02464 80A99214 51800006 */ beql $t4, $zero, .L80A99230 /* 02468 80A99218 860D001C */ lh $t5, 0x001C($s0) ## 0000001C /* 0246C 80A9921C 0C00B55C */ jal Actor_Kill - + /* 02470 80A99220 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02474 80A99224 10000053 */ beq $zero, $zero, .L80A99374 -/* 02478 80A99228 8FBF003C */ lw $ra, 0x003C($sp) +/* 02474 80A99224 10000053 */ beq $zero, $zero, .L80A99374 +/* 02478 80A99228 8FBF003C */ lw $ra, 0x003C($sp) .L80A9922C: /* 0247C 80A9922C 860D001C */ lh $t5, 0x001C($s0) ## 0000001C .L80A99230: /* 02480 80A99230 24010005 */ addiu $at, $zero, 0x0005 ## $at = 00000005 /* 02484 80A99234 31AE00FF */ andi $t6, $t5, 0x00FF ## $t6 = 00000000 -/* 02488 80A99238 15C10004 */ bne $t6, $at, .L80A9924C +/* 02488 80A99238 15C10004 */ bne $t6, $at, .L80A9924C /* 0248C 80A9923C 00000000 */ nop /* 02490 80A99240 920F01AA */ lbu $t7, 0x01AA($s0) ## 000001AA /* 02494 80A99244 35F80040 */ ori $t8, $t7, 0x0040 ## $t8 = 00000040 /* 02498 80A99248 A21801AA */ sb $t8, 0x01AA($s0) ## 000001AA .L80A9924C: -/* 0249C 80A9924C 0C2A634B */ jal func_80A98D2C +/* 0249C 80A9924C 0C2A634B */ jal func_80A98D2C /* 024A0 80A99250 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 024A4 80A99254 8619001C */ lh $t9, 0x001C($s0) ## 0000001C /* 024A8 80A99258 A6020212 */ sh $v0, 0x0212($s0) ## 00000212 /* 024AC 80A9925C 860A0212 */ lh $t2, 0x0212($s0) ## 00000212 /* 024B0 80A99260 332800FF */ andi $t0, $t9, 0x00FF ## $t0 = 00000000 -/* 024B4 80A99264 00084880 */ sll $t1, $t0, 2 -/* 024B8 80A99268 01284821 */ addu $t1, $t1, $t0 +/* 024B4 80A99264 00084880 */ sll $t1, $t0, 2 +/* 024B8 80A99268 01284821 */ addu $t1, $t1, $t0 /* 024BC 80A9926C 3C0680AA */ lui $a2, %hi(D_80A9A4BC) ## $a2 = 80AA0000 -/* 024C0 80A99270 012A5821 */ addu $t3, $t1, $t2 -/* 024C4 80A99274 00CB3021 */ addu $a2, $a2, $t3 +/* 024C0 80A99270 012A5821 */ addu $t3, $t1, $t2 +/* 024C4 80A99274 00CB3021 */ addu $a2, $a2, $t3 /* 024C8 80A99278 3C0580AA */ lui $a1, %hi(D_80A9A18C) ## $a1 = 80AA0000 /* 024CC 80A9927C 24A5A18C */ addiu $a1, $a1, %lo(D_80A9A18C) ## $a1 = 80A9A18C -/* 024D0 80A99280 90C6A4BC */ lbu $a2, %lo(D_80A9A4BC)($a2) -/* 024D4 80A99284 0C00D3B0 */ jal func_80034EC0 -/* 024D8 80A99288 8FA40044 */ lw $a0, 0x0044($sp) +/* 024D0 80A99280 90C6A4BC */ lbu $a2, %lo(D_80A9A4BC)($a2) +/* 024D4 80A99284 0C00D3B0 */ jal func_80034EC0 +/* 024D8 80A99288 8FA40044 */ lw $a0, 0x0044($sp) /* 024DC 80A9928C 3C053C23 */ lui $a1, 0x3C23 ## $a1 = 3C230000 /* 024E0 80A99290 34A5D70A */ ori $a1, $a1, 0xD70A ## $a1 = 3C23D70A /* 024E4 80A99294 0C00B58B */ jal Actor_SetScale - + /* 024E8 80A99298 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 024EC 80A9929C 0C2A6336 */ jal func_80A98CD8 +/* 024EC 80A9929C 0C2A6336 */ jal func_80A98CD8 /* 024F0 80A992A0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 024F4 80A992A4 8605001C */ lh $a1, 0x001C($s0) ## 0000001C /* 024F8 80A992A8 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 /* 024FC 80A992AC 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 02500 80A992B0 30A5FF00 */ andi $a1, $a1, 0xFF00 ## $a1 = 00000000 -/* 02504 80A992B4 00052A03 */ sra $a1, $a1, 8 -/* 02508 80A992B8 00052C00 */ sll $a1, $a1, 16 -/* 0250C 80A992BC 00052C03 */ sra $a1, $a1, 16 +/* 02504 80A992B4 00052A03 */ sra $a1, $a1, 8 +/* 02508 80A992B8 00052C00 */ sll $a1, $a1, 16 +/* 0250C 80A992BC 00052C03 */ sra $a1, $a1, 16 /* 02510 80A992C0 240600FF */ addiu $a2, $zero, 0x00FF ## $a2 = 000000FF -/* 02514 80A992C4 0C023938 */ jal func_8008E4E0 +/* 02514 80A992C4 0C023938 */ jal Path_GetByIndex /* 02518 80A992C8 E6040220 */ swc1 $f4, 0x0220($s0) ## 00000220 /* 0251C 80A992CC C6060024 */ lwc1 $f6, 0x0024($s0) ## 00000024 /* 02520 80A992D0 AE0201E4 */ sw $v0, 0x01E4($s0) ## 000001E4 /* 02524 80A992D4 240C0003 */ addiu $t4, $zero, 0x0003 ## $t4 = 00000003 -/* 02528 80A992D8 E7A60010 */ swc1 $f6, 0x0010($sp) +/* 02528 80A992D8 E7A60010 */ swc1 $f6, 0x0010($sp) /* 0252C 80A992DC C6080028 */ lwc1 $f8, 0x0028($s0) ## 00000028 /* 02530 80A992E0 26241C24 */ addiu $a0, $s1, 0x1C24 ## $a0 = 00001C24 /* 02534 80A992E4 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 02538 80A992E8 E7A80014 */ swc1 $f8, 0x0014($sp) +/* 02538 80A992E8 E7A80014 */ swc1 $f8, 0x0014($sp) /* 0253C 80A992EC C60A002C */ lwc1 $f10, 0x002C($s0) ## 0000002C -/* 02540 80A992F0 AFAC0028 */ sw $t4, 0x0028($sp) -/* 02544 80A992F4 AFA00024 */ sw $zero, 0x0024($sp) -/* 02548 80A992F8 AFA00020 */ sw $zero, 0x0020($sp) -/* 0254C 80A992FC AFA0001C */ sw $zero, 0x001C($sp) +/* 02540 80A992F0 AFAC0028 */ sw $t4, 0x0028($sp) +/* 02544 80A992F4 AFA00024 */ sw $zero, 0x0024($sp) +/* 02548 80A992F8 AFA00020 */ sw $zero, 0x0020($sp) +/* 0254C 80A992FC AFA0001C */ sw $zero, 0x001C($sp) /* 02550 80A99300 02203025 */ or $a2, $s1, $zero ## $a2 = 00000000 /* 02554 80A99304 24070018 */ addiu $a3, $zero, 0x0018 ## $a3 = 00000018 /* 02558 80A99308 0C00C916 */ jal Actor_SpawnAttached - -/* 0255C 80A9930C E7AA0018 */ swc1 $f10, 0x0018($sp) + +/* 0255C 80A9930C E7AA0018 */ swc1 $f10, 0x0018($sp) /* 02560 80A99310 860D001C */ lh $t5, 0x001C($s0) ## 0000001C /* 02564 80A99314 24010003 */ addiu $at, $zero, 0x0003 ## $at = 00000003 /* 02568 80A99318 3C0F8012 */ lui $t7, 0x8012 ## $t7 = 80120000 /* 0256C 80A9931C 31AE00FF */ andi $t6, $t5, 0x00FF ## $t6 = 00000000 -/* 02570 80A99320 15C10010 */ bne $t6, $at, .L80A99364 +/* 02570 80A99320 15C10010 */ bne $t6, $at, .L80A99364 /* 02574 80A99324 3C188016 */ lui $t8, 0x8016 ## $t8 = 80160000 /* 02578 80A99328 8DEF7168 */ lw $t7, 0x7168($t7) ## 80127168 /* 0257C 80A9932C 8F18E704 */ lw $t8, -0x18FC($t8) ## 8015E704 /* 02580 80A99330 3C0A80AA */ lui $t2, %hi(func_80A995CC) ## $t2 = 80AA0000 /* 02584 80A99334 26050024 */ addiu $a1, $s0, 0x0024 ## $a1 = 00000024 -/* 02588 80A99338 01F8C824 */ and $t9, $t7, $t8 -/* 0258C 80A9933C 17200007 */ bne $t9, $zero, .L80A9935C +/* 02588 80A99338 01F8C824 */ and $t9, $t7, $t8 +/* 0258C 80A9933C 17200007 */ bne $t9, $zero, .L80A9935C /* 02590 80A99340 00000000 */ nop /* 02594 80A99344 860801DA */ lh $t0, 0x01DA($s0) ## 000001DA /* 02598 80A99348 254A95CC */ addiu $t2, $t2, %lo(func_80A995CC) ## $t2 = 80A995CC /* 0259C 80A9934C AE0A0190 */ sw $t2, 0x0190($s0) ## 00000190 /* 025A0 80A99350 250900C8 */ addiu $t1, $t0, 0x00C8 ## $t1 = 000000C8 -/* 025A4 80A99354 10000006 */ beq $zero, $zero, .L80A99370 +/* 025A4 80A99354 10000006 */ beq $zero, $zero, .L80A99370 /* 025A8 80A99358 A60901DA */ sh $t1, 0x01DA($s0) ## 000001DA .L80A9935C: -/* 025AC 80A9935C 0C023983 */ jal func_8008E60C +/* 025AC 80A9935C 0C023983 */ jal Path_CopyLastPoint /* 025B0 80A99360 8E0401E4 */ lw $a0, 0x01E4($s0) ## 000001E4 .L80A99364: /* 025B4 80A99364 3C0B80AA */ lui $t3, %hi(func_80A99384) ## $t3 = 80AA0000 /* 025B8 80A99368 256B9384 */ addiu $t3, $t3, %lo(func_80A99384) ## $t3 = 80A99384 /* 025BC 80A9936C AE0B0190 */ sw $t3, 0x0190($s0) ## 00000190 .L80A99370: -/* 025C0 80A99370 8FBF003C */ lw $ra, 0x003C($sp) +/* 025C0 80A99370 8FBF003C */ lw $ra, 0x003C($sp) .L80A99374: -/* 025C4 80A99374 8FB00034 */ lw $s0, 0x0034($sp) -/* 025C8 80A99378 8FB10038 */ lw $s1, 0x0038($sp) -/* 025CC 80A9937C 03E00008 */ jr $ra +/* 025C4 80A99374 8FB00034 */ lw $s0, 0x0034($sp) +/* 025C8 80A99378 8FB10038 */ lw $s1, 0x0038($sp) +/* 025CC 80A9937C 03E00008 */ jr $ra /* 025D0 80A99380 27BD0048 */ addiu $sp, $sp, 0x0048 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Kusa/func_80A9C164.s b/asm/non_matchings/overlays/actors/ovl_En_Kusa/func_80A9C164.s index 8ff943d32c..70394704a6 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Kusa/func_80A9C164.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Kusa/func_80A9C164.s @@ -8,7 +8,7 @@ glabel func_80A9C164 /* 011DC 80A9C17C 11E00006 */ beq $t7, $zero, .L80A9C198 /* 011E0 80A9C180 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 /* 011E4 80A9C184 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 011E8 80A9C188 0C00D498 */ jal Draw_DListOpa +/* 011E8 80A9C188 0C00D498 */ jal Gfx_DrawDListOpa /* 011EC 80A9C18C 24A502E0 */ addiu $a1, $a1, 0x02E0 ## $a1 = 060002E0 /* 011F0 80A9C190 1000000A */ beq $zero, $zero, .L80A9C1BC @@ -20,7 +20,7 @@ glabel func_80A9C164 /* 01204 80A9C1A4 33190003 */ andi $t9, $t8, 0x0003 ## $t9 = 00000000 /* 01208 80A9C1A8 00194080 */ sll $t0, $t9, 2 /* 0120C 80A9C1AC 00A82821 */ addu $a1, $a1, $t0 -/* 01210 80A9C1B0 0C00D498 */ jal Draw_DListOpa +/* 01210 80A9C1B0 0C00D498 */ jal Gfx_DrawDListOpa /* 01214 80A9C1B4 8CA5C294 */ lw $a1, %lo(D_80A9C294)($a1) /* 01218 80A9C1B8 8FBF0014 */ lw $ra, 0x0014($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Kz/EnKz_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Kz/EnKz_Draw.s index 37a96d2dc2..8f68f74d58 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Kz/EnKz_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Kz/EnKz_Draw.s @@ -1,17 +1,17 @@ glabel EnKz_Draw /* 01250 80A9D7A0 27BDFFB0 */ addiu $sp, $sp, 0xFFB0 ## $sp = FFFFFFB0 -/* 01254 80A9D7A4 AFBF002C */ sw $ra, 0x002C($sp) -/* 01258 80A9D7A8 AFB00028 */ sw $s0, 0x0028($sp) -/* 0125C 80A9D7AC AFA50054 */ sw $a1, 0x0054($sp) +/* 01254 80A9D7A4 AFBF002C */ sw $ra, 0x002C($sp) +/* 01258 80A9D7A8 AFB00028 */ sw $s0, 0x0028($sp) +/* 0125C 80A9D7AC AFA50054 */ sw $a1, 0x0054($sp) /* 01260 80A9D7B0 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 /* 01264 80A9D7B4 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 01268 80A9D7B8 3C0680AA */ lui $a2, %hi(D_80A9D970) ## $a2 = 80AA0000 /* 0126C 80A9D7BC 24C6D970 */ addiu $a2, $a2, %lo(D_80A9D970) ## $a2 = 80A9D970 /* 01270 80A9D7C0 27A40038 */ addiu $a0, $sp, 0x0038 ## $a0 = FFFFFFE8 /* 01274 80A9D7C4 240704EB */ addiu $a3, $zero, 0x04EB ## $a3 = 000004EB -/* 01278 80A9D7C8 0C031AB1 */ jal func_800C6AC4 -/* 0127C 80A9D7CC AFA50048 */ sw $a1, 0x0048($sp) -/* 01280 80A9D7D0 8FA80048 */ lw $t0, 0x0048($sp) +/* 01278 80A9D7C8 0C031AB1 */ jal Graph_OpenDisps +/* 0127C 80A9D7CC AFA50048 */ sw $a1, 0x0048($sp) +/* 01280 80A9D7D0 8FA80048 */ lw $t0, 0x0048($sp) /* 01284 80A9D7D4 3C18DB06 */ lui $t8, 0xDB06 ## $t8 = DB060000 /* 01288 80A9D7D8 37180020 */ ori $t8, $t8, 0x0020 ## $t8 = DB060020 /* 0128C 80A9D7DC 8D0302C0 */ lw $v1, 0x02C0($t0) ## 000002C0 @@ -23,21 +23,21 @@ glabel EnKz_Draw /* 012A4 80A9D7F4 86190210 */ lh $t9, 0x0210($s0) ## 00000210 /* 012A8 80A9D7F8 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 /* 012AC 80A9D7FC 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF -/* 012B0 80A9D800 00194880 */ sll $t1, $t9, 2 -/* 012B4 80A9D804 00892021 */ addu $a0, $a0, $t1 -/* 012B8 80A9D808 8C84D964 */ lw $a0, %lo(D_80A9D964)($a0) -/* 012BC 80A9D80C 00045900 */ sll $t3, $a0, 4 -/* 012C0 80A9D810 000B6702 */ srl $t4, $t3, 28 -/* 012C4 80A9D814 000C6880 */ sll $t5, $t4, 2 -/* 012C8 80A9D818 01CD7021 */ addu $t6, $t6, $t5 +/* 012B0 80A9D800 00194880 */ sll $t1, $t9, 2 +/* 012B4 80A9D804 00892021 */ addu $a0, $a0, $t1 +/* 012B8 80A9D808 8C84D964 */ lw $a0, %lo(D_80A9D964)($a0) +/* 012BC 80A9D80C 00045900 */ sll $t3, $a0, 4 +/* 012C0 80A9D810 000B6702 */ srl $t4, $t3, 28 +/* 012C4 80A9D814 000C6880 */ sll $t5, $t4, 2 +/* 012C8 80A9D818 01CD7021 */ addu $t6, $t6, $t5 /* 012CC 80A9D81C 8DCE6FA8 */ lw $t6, 0x6FA8($t6) ## 80166FA8 -/* 012D0 80A9D820 00815024 */ and $t2, $a0, $at +/* 012D0 80A9D820 00815024 */ and $t2, $a0, $at /* 012D4 80A9D824 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 012D8 80A9D828 014E7821 */ addu $t7, $t2, $t6 -/* 012DC 80A9D82C 01E1C021 */ addu $t8, $t7, $at +/* 012D8 80A9D828 014E7821 */ addu $t7, $t2, $t6 +/* 012DC 80A9D82C 01E1C021 */ addu $t8, $t7, $at /* 012E0 80A9D830 AC780004 */ sw $t8, 0x0004($v1) ## 00000004 -/* 012E4 80A9D834 8FB90054 */ lw $t9, 0x0054($sp) -/* 012E8 80A9D838 0C0250F2 */ jal func_800943C8 +/* 012E4 80A9D834 8FB90054 */ lw $t9, 0x0054($sp) +/* 012E8 80A9D838 0C0250F2 */ jal func_800943C8 /* 012EC 80A9D83C 8F240000 */ lw $a0, 0x0000($t9) ## 00000000 /* 012F0 80A9D840 8E050150 */ lw $a1, 0x0150($s0) ## 00000150 /* 012F4 80A9D844 8E06016C */ lw $a2, 0x016C($s0) ## 0000016C @@ -46,21 +46,21 @@ glabel EnKz_Draw /* 01300 80A9D850 3C0B80AA */ lui $t3, %hi(func_80A9D744) ## $t3 = 80AA0000 /* 01304 80A9D854 256BD744 */ addiu $t3, $t3, %lo(func_80A9D744) ## $t3 = 80A9D744 /* 01308 80A9D858 2529D670 */ addiu $t1, $t1, %lo(func_80A9D670) ## $t1 = 80A9D670 -/* 0130C 80A9D85C AFA90010 */ sw $t1, 0x0010($sp) -/* 01310 80A9D860 AFAB0014 */ sw $t3, 0x0014($sp) -/* 01314 80A9D864 AFB00018 */ sw $s0, 0x0018($sp) -/* 01318 80A9D868 0C0286B2 */ jal func_800A1AC8 -/* 0131C 80A9D86C 8FA40054 */ lw $a0, 0x0054($sp) -/* 01320 80A9D870 8FAC0054 */ lw $t4, 0x0054($sp) +/* 0130C 80A9D85C AFA90010 */ sw $t1, 0x0010($sp) +/* 01310 80A9D860 AFAB0014 */ sw $t3, 0x0014($sp) +/* 01314 80A9D864 AFB00018 */ sw $s0, 0x0018($sp) +/* 01318 80A9D868 0C0286B2 */ jal SkelAnime_DrawSV +/* 0131C 80A9D86C 8FA40054 */ lw $a0, 0x0054($sp) +/* 01320 80A9D870 8FAC0054 */ lw $t4, 0x0054($sp) /* 01324 80A9D874 3C0680AA */ lui $a2, %hi(D_80A9D980) ## $a2 = 80AA0000 /* 01328 80A9D878 24C6D980 */ addiu $a2, $a2, %lo(D_80A9D980) ## $a2 = 80A9D980 /* 0132C 80A9D87C 27A40038 */ addiu $a0, $sp, 0x0038 ## $a0 = FFFFFFE8 /* 01330 80A9D880 24070501 */ addiu $a3, $zero, 0x0501 ## $a3 = 00000501 -/* 01334 80A9D884 0C031AD5 */ jal func_800C6B54 +/* 01334 80A9D884 0C031AD5 */ jal Graph_CloseDisps /* 01338 80A9D888 8D850000 */ lw $a1, 0x0000($t4) ## 00000000 -/* 0133C 80A9D88C 8FBF002C */ lw $ra, 0x002C($sp) -/* 01340 80A9D890 8FB00028 */ lw $s0, 0x0028($sp) +/* 0133C 80A9D88C 8FBF002C */ lw $ra, 0x002C($sp) +/* 01340 80A9D890 8FB00028 */ lw $s0, 0x0028($sp) /* 01344 80A9D894 27BD0050 */ addiu $sp, $sp, 0x0050 ## $sp = 00000000 -/* 01348 80A9D898 03E00008 */ jr $ra +/* 01348 80A9D898 03E00008 */ jr $ra /* 0134C 80A9D89C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Kz/EnKz_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Kz/EnKz_Init.s index aa54050b4a..9d26d9c488 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Kz/EnKz_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Kz/EnKz_Init.s @@ -1,69 +1,69 @@ glabel EnKz_Init /* 009BC 80A9CF0C 27BDFFB0 */ addiu $sp, $sp, 0xFFB0 ## $sp = FFFFFFB0 -/* 009C0 80A9CF10 AFB00034 */ sw $s0, 0x0034($sp) +/* 009C0 80A9CF10 AFB00034 */ sw $s0, 0x0034($sp) /* 009C4 80A9CF14 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 009C8 80A9CF18 AFB10038 */ sw $s1, 0x0038($sp) +/* 009C8 80A9CF18 AFB10038 */ sw $s1, 0x0038($sp) /* 009CC 80A9CF1C 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 /* 009D0 80A9CF20 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 009D4 80A9CF24 AFBF003C */ sw $ra, 0x003C($sp) +/* 009D4 80A9CF24 AFBF003C */ sw $ra, 0x003C($sp) /* 009D8 80A9CF28 2605014C */ addiu $a1, $s0, 0x014C ## $a1 = 0000014C /* 009DC 80A9CF2C 260E0216 */ addiu $t6, $s0, 0x0216 ## $t6 = 00000216 /* 009E0 80A9CF30 260F025E */ addiu $t7, $s0, 0x025E ## $t7 = 0000025E /* 009E4 80A9CF34 3C060601 */ lui $a2, 0x0601 ## $a2 = 06010000 /* 009E8 80A9CF38 2418000C */ addiu $t8, $zero, 0x000C ## $t8 = 0000000C -/* 009EC 80A9CF3C AFB80018 */ sw $t8, 0x0018($sp) +/* 009EC 80A9CF3C AFB80018 */ sw $t8, 0x0018($sp) /* 009F0 80A9CF40 24C686D0 */ addiu $a2, $a2, 0x86D0 ## $a2 = 060086D0 -/* 009F4 80A9CF44 AFAF0014 */ sw $t7, 0x0014($sp) -/* 009F8 80A9CF48 AFAE0010 */ sw $t6, 0x0010($sp) -/* 009FC 80A9CF4C AFA50044 */ sw $a1, 0x0044($sp) -/* 00A00 80A9CF50 0C0291BE */ jal func_800A46F8 +/* 009F4 80A9CF44 AFAF0014 */ sw $t7, 0x0014($sp) +/* 009F8 80A9CF48 AFAE0010 */ sw $t6, 0x0010($sp) +/* 009FC 80A9CF4C AFA50044 */ sw $a1, 0x0044($sp) +/* 00A00 80A9CF50 0C0291BE */ jal SkelAnime_InitSV /* 00A04 80A9CF54 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 /* 00A08 80A9CF58 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 /* 00A0C 80A9CF5C 260400B4 */ addiu $a0, $s0, 0x00B4 ## $a0 = 000000B4 /* 00A10 80A9CF60 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 00A14 80A9CF64 44050000 */ mfc1 $a1, $f0 -/* 00A18 80A9CF68 44070000 */ mfc1 $a3, $f0 +/* 00A14 80A9CF64 44050000 */ mfc1 $a1, $f0 +/* 00A18 80A9CF68 44070000 */ mfc1 $a3, $f0 /* 00A1C 80A9CF6C 0C00AC78 */ jal ActorShape_Init - + /* 00A20 80A9CF70 00000000 */ nop /* 00A24 80A9CF74 26050194 */ addiu $a1, $s0, 0x0194 ## $a1 = 00000194 -/* 00A28 80A9CF78 AFA50040 */ sw $a1, 0x0040($sp) +/* 00A28 80A9CF78 AFA50040 */ sw $a1, 0x0040($sp) /* 00A2C 80A9CF7C 0C0170D9 */ jal ActorCollider_AllocCylinder - + /* 00A30 80A9CF80 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 00A34 80A9CF84 3C0780AA */ lui $a3, %hi(D_80A9D8C0) ## $a3 = 80AA0000 -/* 00A38 80A9CF88 8FA50040 */ lw $a1, 0x0040($sp) +/* 00A38 80A9CF88 8FA50040 */ lw $a1, 0x0040($sp) /* 00A3C 80A9CF8C 24E7D8C0 */ addiu $a3, $a3, %lo(D_80A9D8C0) ## $a3 = 80A9D8C0 /* 00A40 80A9CF90 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 00A44 80A9CF94 0C01712B */ jal ActorCollider_InitCylinder - + /* 00A48 80A9CF98 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 00A4C 80A9CF9C 3C0680AA */ lui $a2, %hi(D_80A9D8EC) ## $a2 = 80AA0000 /* 00A50 80A9CFA0 24C6D8EC */ addiu $a2, $a2, %lo(D_80A9D8EC) ## $a2 = 80A9D8EC /* 00A54 80A9CFA4 26040098 */ addiu $a0, $s0, 0x0098 ## $a0 = 00000098 -/* 00A58 80A9CFA8 0C0187BF */ jal func_80061EFC +/* 00A58 80A9CFA8 0C0187BF */ jal func_80061EFC /* 00A5C 80A9CFAC 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 00A60 80A9CFB0 3C053C23 */ lui $a1, 0x3C23 ## $a1 = 3C230000 /* 00A64 80A9CFB4 34A5D70A */ ori $a1, $a1, 0xD70A ## $a1 = 3C23D70A /* 00A68 80A9CFB8 0C00B58B */ jal Actor_SetScale - + /* 00A6C 80A9CFBC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 00A70 80A9CFC0 24190003 */ addiu $t9, $zero, 0x0003 ## $t9 = 00000003 /* 00A74 80A9CFC4 A219001F */ sb $t9, 0x001F($s0) ## 0000001F /* 00A78 80A9CFC8 A60001E0 */ sh $zero, 0x01E0($s0) ## 000001E0 /* 00A7C 80A9CFCC 3C0580AA */ lui $a1, %hi(D_80A9D8F8) ## $a1 = 80AA0000 /* 00A80 80A9CFD0 24A5D8F8 */ addiu $a1, $a1, %lo(D_80A9D8F8) ## $a1 = 80A9D8F8 -/* 00A84 80A9CFD4 8FA40044 */ lw $a0, 0x0044($sp) -/* 00A88 80A9CFD8 0C00D3B0 */ jal func_80034EC0 +/* 00A84 80A9CFD4 8FA40044 */ lw $a0, 0x0044($sp) +/* 00A88 80A9CFD8 0C00D3B0 */ jal func_80034EC0 /* 00A8C 80A9CFDC 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 /* 00A90 80A9CFE0 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 /* 00A94 80A9CFE4 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 /* 00A98 80A9CFE8 94480EDA */ lhu $t0, 0x0EDA($v0) ## 8015F53A /* 00A9C 80A9CFEC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 00AA0 80A9CFF0 31090008 */ andi $t1, $t0, 0x0008 ## $t1 = 00000000 -/* 00AA4 80A9CFF4 51200006 */ beql $t1, $zero, .L80A9D010 +/* 00AA4 80A9CFF4 51200006 */ beql $t1, $zero, .L80A9D010 /* 00AA8 80A9CFF8 8C4A0004 */ lw $t2, 0x0004($v0) ## 8015E664 -/* 00AAC 80A9CFFC 0C2A7391 */ jal func_80A9CE44 +/* 00AAC 80A9CFFC 0C2A7391 */ jal func_80A9CE44 /* 00AB0 80A9D000 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 /* 00AB4 80A9D004 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 /* 00AB8 80A9D008 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 @@ -71,40 +71,40 @@ glabel EnKz_Init .L80A9D010: /* 00AC0 80A9D010 3C0F80AA */ lui $t7, %hi(func_80A9D0C0) ## $t7 = 80AA0000 /* 00AC4 80A9D014 25EFD0C0 */ addiu $t7, $t7, %lo(func_80A9D0C0) ## $t7 = 80A9D0C0 -/* 00AC8 80A9D018 5540001A */ bnel $t2, $zero, .L80A9D084 +/* 00AC8 80A9D018 5540001A */ bnel $t2, $zero, .L80A9D084 /* 00ACC 80A9D01C AE0F0190 */ sw $t7, 0x0190($s0) ## 00000190 /* 00AD0 80A9D020 944B0F1E */ lhu $t3, 0x0F1E($v0) ## 8015F57E /* 00AD4 80A9D024 26241C24 */ addiu $a0, $s1, 0x1C24 ## $a0 = 00001C24 /* 00AD8 80A9D028 316C0100 */ andi $t4, $t3, 0x0100 ## $t4 = 00000000 -/* 00ADC 80A9D02C 15800010 */ bne $t4, $zero, .L80A9D070 +/* 00ADC 80A9D02C 15800010 */ bne $t4, $zero, .L80A9D070 /* 00AE0 80A9D030 00000000 */ nop /* 00AE4 80A9D034 C6040024 */ lwc1 $f4, 0x0024($s0) ## 00000024 /* 00AE8 80A9D038 240D04FF */ addiu $t5, $zero, 0x04FF ## $t5 = 000004FF /* 00AEC 80A9D03C 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 00AF0 80A9D040 E7A40010 */ swc1 $f4, 0x0010($sp) +/* 00AF0 80A9D040 E7A40010 */ swc1 $f4, 0x0010($sp) /* 00AF4 80A9D044 C6060028 */ lwc1 $f6, 0x0028($s0) ## 00000028 /* 00AF8 80A9D048 02203025 */ or $a2, $s1, $zero ## $a2 = 00000000 /* 00AFC 80A9D04C 240700EF */ addiu $a3, $zero, 0x00EF ## $a3 = 000000EF -/* 00B00 80A9D050 E7A60014 */ swc1 $f6, 0x0014($sp) +/* 00B00 80A9D050 E7A60014 */ swc1 $f6, 0x0014($sp) /* 00B04 80A9D054 C608002C */ lwc1 $f8, 0x002C($s0) ## 0000002C -/* 00B08 80A9D058 AFAD0028 */ sw $t5, 0x0028($sp) -/* 00B0C 80A9D05C AFA00024 */ sw $zero, 0x0024($sp) -/* 00B10 80A9D060 AFA00020 */ sw $zero, 0x0020($sp) -/* 00B14 80A9D064 AFA0001C */ sw $zero, 0x001C($sp) +/* 00B08 80A9D058 AFAD0028 */ sw $t5, 0x0028($sp) +/* 00B0C 80A9D05C AFA00024 */ sw $zero, 0x0024($sp) +/* 00B10 80A9D060 AFA00020 */ sw $zero, 0x0020($sp) +/* 00B14 80A9D064 AFA0001C */ sw $zero, 0x001C($sp) /* 00B18 80A9D068 0C00C916 */ jal Actor_SpawnAttached - -/* 00B1C 80A9D06C E7A80018 */ swc1 $f8, 0x0018($sp) + +/* 00B1C 80A9D06C E7A80018 */ swc1 $f8, 0x0018($sp) .L80A9D070: /* 00B20 80A9D070 3C0E80AA */ lui $t6, %hi(func_80A9D42C) ## $t6 = 80AA0000 /* 00B24 80A9D074 25CED42C */ addiu $t6, $t6, %lo(func_80A9D42C) ## $t6 = 80A9D42C -/* 00B28 80A9D078 10000002 */ beq $zero, $zero, .L80A9D084 +/* 00B28 80A9D078 10000002 */ beq $zero, $zero, .L80A9D084 /* 00B2C 80A9D07C AE0E0190 */ sw $t6, 0x0190($s0) ## 00000190 /* 00B30 80A9D080 AE0F0190 */ sw $t7, 0x0190($s0) ## 00000190 .L80A9D084: -/* 00B34 80A9D084 8FBF003C */ lw $ra, 0x003C($sp) -/* 00B38 80A9D088 8FB00034 */ lw $s0, 0x0034($sp) -/* 00B3C 80A9D08C 8FB10038 */ lw $s1, 0x0038($sp) -/* 00B40 80A9D090 03E00008 */ jr $ra +/* 00B34 80A9D084 8FBF003C */ lw $ra, 0x003C($sp) +/* 00B38 80A9D088 8FB00034 */ lw $s0, 0x0034($sp) +/* 00B3C 80A9D08C 8FB10038 */ lw $s1, 0x0038($sp) +/* 00B40 80A9D090 03E00008 */ jr $ra /* 00B44 80A9D094 27BD0050 */ addiu $sp, $sp, 0x0050 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Kz/func_80A9C658.s b/asm/non_matchings/overlays/actors/ovl_En_Kz/func_80A9C658.s index 8673ccd1d0..e0419cfb31 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Kz/func_80A9C658.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Kz/func_80A9C658.s @@ -3,7 +3,7 @@ glabel func_80A9C658 /* 0010C 80A9C65C AFBF0014 */ sw $ra, 0x0014($sp) /* 00110 80A9C660 AFA5001C */ sw $a1, 0x001C($sp) /* 00114 80A9C664 2405001E */ addiu $a1, $zero, 0x001E ## $a1 = 0000001E -/* 00118 80A9C668 0C01B0D8 */ jal func_8006C360 +/* 00118 80A9C668 0C01B0D8 */ jal Text_GetFaceReaction /* 0011C 80A9C66C AFA40018 */ sw $a0, 0x0018($sp) /* 00120 80A9C670 8FA40018 */ lw $a0, 0x0018($sp) /* 00124 80A9C674 8FA5001C */ lw $a1, 0x001C($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Kz/func_80A9CCD8.s b/asm/non_matchings/overlays/actors/ovl_En_Kz/func_80A9CCD8.s index 5e5a394dd8..8bfe49a29a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Kz/func_80A9CCD8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Kz/func_80A9CCD8.s @@ -46,7 +46,7 @@ glabel func_80A9CCD8 /* 00834 80A9CD84 46083301 */ sub.s $f12, $f6, $f8 /* 00838 80A9CD88 46128381 */ sub.s $f14, $f16, $f18 /* 0083C 80A9CD8C E7AC002C */ swc1 $f12, 0x002C($sp) -/* 00840 80A9CD90 0C03F494 */ jal func_800FD250 +/* 00840 80A9CD90 0C03F494 */ jal Math_atan2f /* 00844 80A9CD94 E7AE0028 */ swc1 $f14, 0x0028($sp) /* 00848 80A9CD98 3C0180AA */ lui $at, %hi(D_80A9D9C0) ## $at = 80AA0000 /* 0084C 80A9CD9C C424D9C0 */ lwc1 $f4, %lo(D_80A9D9C0)($at) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Light/EnLight_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Light/EnLight_Draw.s index 6d2467d289..914f0ef65f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Light/EnLight_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Light/EnLight_Draw.s @@ -16,7 +16,7 @@ glabel EnLight_Draw /* 009A4 80A9E4E4 AFA80084 */ sw $t0, 0x0084($sp) /* 009A8 80A9E4E8 27A4006C */ addiu $a0, $sp, 0x006C ## $a0 = FFFFFFDC /* 009AC 80A9E4EC 240701B9 */ addiu $a3, $zero, 0x01B9 ## $a3 = 000001B9 -/* 009B0 80A9E4F0 0C031AB1 */ jal func_800C6AC4 +/* 009B0 80A9E4F0 0C031AB1 */ jal Graph_OpenDisps /* 009B4 80A9E4F4 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 /* 009B8 80A9E4F8 8FAC0094 */ lw $t4, 0x0094($sp) /* 009BC 80A9E4FC 0C024F61 */ jal func_80093D84 @@ -59,7 +59,7 @@ glabel EnLight_Draw /* 00A50 80A9E590 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 00A54 80A9E594 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 /* 00A58 80A9E598 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 00A5C 80A9E59C 0C0253D0 */ jal Draw_TwoTexScroll +/* 00A5C 80A9E59C 0C0253D0 */ jal Gfx_TwoTexScroll /* 00A60 80A9E5A0 AFA20068 */ sw $v0, 0x0068($sp) /* 00A64 80A9E5A4 8FA30068 */ lw $v1, 0x0068($sp) /* 00A68 80A9E5A8 8FA80084 */ lw $t0, 0x0084($sp) @@ -127,7 +127,7 @@ glabel EnLight_Draw /* 00B5C 80A9E69C AFAF001C */ sw $t7, 0x001C($sp) /* 00B60 80A9E6A0 AFB90024 */ sw $t9, 0x0024($sp) /* 00B64 80A9E6A4 AFAC0028 */ sw $t4, 0x0028($sp) -/* 00B68 80A9E6A8 0C0253D0 */ jal Draw_TwoTexScroll +/* 00B68 80A9E6A8 0C0253D0 */ jal Gfx_TwoTexScroll /* 00B6C 80A9E6AC AFA2005C */ sw $v0, 0x005C($sp) /* 00B70 80A9E6B0 8FA8005C */ lw $t0, 0x005C($sp) /* 00B74 80A9E6B4 3C0A0500 */ lui $t2, 0x0500 ## $t2 = 05000000 @@ -214,7 +214,7 @@ glabel EnLight_Draw /* 00CB0 80A9E7F0 240701EB */ addiu $a3, $zero, 0x01EB ## $a3 = 000001EB /* 00CB4 80A9E7F4 AC4A0004 */ sw $t2, 0x0004($v0) ## 00000004 /* 00CB8 80A9E7F8 8FAB0094 */ lw $t3, 0x0094($sp) -/* 00CBC 80A9E7FC 0C031AD5 */ jal func_800C6B54 +/* 00CBC 80A9E7FC 0C031AD5 */ jal Graph_CloseDisps /* 00CC0 80A9E800 8D650000 */ lw $a1, 0x0000($t3) ## 00000000 /* 00CC4 80A9E804 8FBF003C */ lw $ra, 0x003C($sp) /* 00CC8 80A9E808 8FB00038 */ lw $s0, 0x0038($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Lightbox/EnLightbox_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Lightbox/EnLightbox_Destroy.s deleted file mode 100644 index c2dede8e43..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Lightbox/EnLightbox_Destroy.s +++ /dev/null @@ -1,16 +0,0 @@ -glabel EnLightbox_Destroy -/* 0012C 80A9EAFC 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00130 80A9EB00 AFA40018 */ sw $a0, 0x0018($sp) -/* 00134 80A9EB04 8FAE0018 */ lw $t6, 0x0018($sp) -/* 00138 80A9EB08 AFBF0014 */ sw $ra, 0x0014($sp) -/* 0013C 80A9EB0C 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 00140 80A9EB10 24A50810 */ addiu $a1, $a1, 0x0810 ## $a1 = 00000810 -/* 00144 80A9EB14 0C00FB56 */ jal DynaPolyInfo_Free - ## DynaPolyInfo_delReserve -/* 00148 80A9EB18 8DC6014C */ lw $a2, 0x014C($t6) ## 0000014C -/* 0014C 80A9EB1C 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00150 80A9EB20 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00154 80A9EB24 03E00008 */ jr $ra -/* 00158 80A9EB28 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Lightbox/EnLightbox_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Lightbox/EnLightbox_Draw.s deleted file mode 100644 index 612026b121..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Lightbox/EnLightbox_Draw.s +++ /dev/null @@ -1,14 +0,0 @@ -glabel EnLightbox_Draw -/* 003E4 80A9EDB4 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 003E8 80A9EDB8 AFA40018 */ sw $a0, 0x0018($sp) -/* 003EC 80A9EDBC 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 003F0 80A9EDC0 AFBF0014 */ sw $ra, 0x0014($sp) -/* 003F4 80A9EDC4 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 003F8 80A9EDC8 0C00D498 */ jal Draw_DListOpa - -/* 003FC 80A9EDCC 24A50B70 */ addiu $a1, $a1, 0x0B70 ## $a1 = 06000B70 -/* 00400 80A9EDD0 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00404 80A9EDD4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00408 80A9EDD8 03E00008 */ jr $ra -/* 0040C 80A9EDDC 00000000 */ nop - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Lightbox/EnLightbox_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Lightbox/EnLightbox_Init.s deleted file mode 100644 index 29b877f5d7..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Lightbox/EnLightbox_Init.s +++ /dev/null @@ -1,90 +0,0 @@ -glabel EnLightbox_Init -/* 00000 80A9E9D0 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 -/* 00004 80A9E9D4 AFBF001C */ sw $ra, 0x001C($sp) -/* 00008 80A9E9D8 AFB00018 */ sw $s0, 0x0018($sp) -/* 0000C 80A9E9DC AFA50044 */ sw $a1, 0x0044($sp) -/* 00010 80A9E9E0 AFA0003C */ sw $zero, 0x003C($sp) -/* 00014 80A9E9E4 8482001C */ lh $v0, 0x001C($a0) ## 0000001C -/* 00018 80A9E9E8 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 0001C 80A9E9EC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00020 80A9E9F0 1040000C */ beq $v0, $zero, .L80A9EA24 -/* 00024 80A9E9F4 3C053CCC */ lui $a1, 0x3CCC ## $a1 = 3CCC0000 -/* 00028 80A9E9F8 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 0002C 80A9E9FC 1041000D */ beq $v0, $at, .L80A9EA34 -/* 00030 80A9EA00 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00034 80A9EA04 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 00038 80A9EA08 1041000F */ beq $v0, $at, .L80A9EA48 -/* 0003C 80A9EA0C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00040 80A9EA10 24010003 */ addiu $at, $zero, 0x0003 ## $at = 00000003 -/* 00044 80A9EA14 10410011 */ beq $v0, $at, .L80A9EA5C -/* 00048 80A9EA18 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0004C 80A9EA1C 10000013 */ beq $zero, $zero, .L80A9EA6C -/* 00050 80A9EA20 8E0F0024 */ lw $t7, 0x0024($s0) ## 00000024 -.L80A9EA24: -/* 00054 80A9EA24 0C00B58B */ jal Actor_SetScale - -/* 00058 80A9EA28 34A5CCCD */ ori $a1, $a1, 0xCCCD ## $a1 = 3CCCCCCD -/* 0005C 80A9EA2C 1000000F */ beq $zero, $zero, .L80A9EA6C -/* 00060 80A9EA30 8E0F0024 */ lw $t7, 0x0024($s0) ## 00000024 -.L80A9EA34: -/* 00064 80A9EA34 3C053D4C */ lui $a1, 0x3D4C ## $a1 = 3D4C0000 -/* 00068 80A9EA38 0C00B58B */ jal Actor_SetScale - -/* 0006C 80A9EA3C 34A5CCCD */ ori $a1, $a1, 0xCCCD ## $a1 = 3D4CCCCD -/* 00070 80A9EA40 1000000A */ beq $zero, $zero, .L80A9EA6C -/* 00074 80A9EA44 8E0F0024 */ lw $t7, 0x0024($s0) ## 00000024 -.L80A9EA48: -/* 00078 80A9EA48 3C053D99 */ lui $a1, 0x3D99 ## $a1 = 3D990000 -/* 0007C 80A9EA4C 0C00B58B */ jal Actor_SetScale - -/* 00080 80A9EA50 34A5999A */ ori $a1, $a1, 0x999A ## $a1 = 3D99999A -/* 00084 80A9EA54 10000005 */ beq $zero, $zero, .L80A9EA6C -/* 00088 80A9EA58 8E0F0024 */ lw $t7, 0x0024($s0) ## 00000024 -.L80A9EA5C: -/* 0008C 80A9EA5C 3C053DCC */ lui $a1, 0x3DCC ## $a1 = 3DCC0000 -/* 00090 80A9EA60 0C00B58B */ jal Actor_SetScale - -/* 00094 80A9EA64 34A5CCCD */ ori $a1, $a1, 0xCCCD ## $a1 = 3DCCCCCD -/* 00098 80A9EA68 8E0F0024 */ lw $t7, 0x0024($s0) ## 00000024 -.L80A9EA6C: -/* 0009C 80A9EA6C 8E0E0028 */ lw $t6, 0x0028($s0) ## 00000028 -/* 000A0 80A9EA70 2418001E */ addiu $t8, $zero, 0x001E ## $t8 = 0000001E -/* 000A4 80A9EA74 AE0F0038 */ sw $t7, 0x0038($s0) ## 00000038 -/* 000A8 80A9EA78 8E0F002C */ lw $t7, 0x002C($s0) ## 0000002C -/* 000AC 80A9EA7C 24190032 */ addiu $t9, $zero, 0x0032 ## $t9 = 00000032 -/* 000B0 80A9EA80 3C068003 */ lui $a2, 0x8003 ## $a2 = 80030000 -/* 000B4 80A9EA84 A61800A8 */ sh $t8, 0x00A8($s0) ## 000000A8 -/* 000B8 80A9EA88 A61900AA */ sh $t9, 0x00AA($s0) ## 000000AA -/* 000BC 80A9EA8C 24C6B5EC */ addiu $a2, $a2, 0xB5EC ## $a2 = 8002B5EC -/* 000C0 80A9EA90 260400B4 */ addiu $a0, $s0, 0x00B4 ## $a0 = 000000B4 -/* 000C4 80A9EA94 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 -/* 000C8 80A9EA98 3C0740C0 */ lui $a3, 0x40C0 ## $a3 = 40C00000 -/* 000CC 80A9EA9C AE0E003C */ sw $t6, 0x003C($s0) ## 0000003C -/* 000D0 80A9EAA0 0C00AC78 */ jal ActorShape_Init - -/* 000D4 80A9EAA4 AE0F0040 */ sw $t7, 0x0040($s0) ## 00000040 -/* 000D8 80A9EAA8 3C01C000 */ lui $at, 0xC000 ## $at = C0000000 -/* 000DC 80A9EAAC 44812000 */ mtc1 $at, $f4 ## $f4 = -2.00 -/* 000E0 80A9EAB0 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 -/* 000E4 80A9EAB4 A2000160 */ sb $zero, 0x0160($s0) ## 00000160 -/* 000E8 80A9EAB8 AE00015C */ sw $zero, 0x015C($s0) ## 0000015C -/* 000EC 80A9EABC A200001F */ sb $zero, 0x001F($s0) ## 0000001F -/* 000F0 80A9EAC0 24841F10 */ addiu $a0, $a0, 0x1F10 ## $a0 = 06001F10 -/* 000F4 80A9EAC4 27A5003C */ addiu $a1, $sp, 0x003C ## $a1 = FFFFFFFC -/* 000F8 80A9EAC8 0C010620 */ jal DynaPolyInfo_Alloc - -/* 000FC 80A9EACC E604006C */ swc1 $f4, 0x006C($s0) ## 0000006C -/* 00100 80A9EAD0 8FA40044 */ lw $a0, 0x0044($sp) -/* 00104 80A9EAD4 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 -/* 00108 80A9EAD8 8FA7003C */ lw $a3, 0x003C($sp) -/* 0010C 80A9EADC 0C00FA9D */ jal DynaPolyInfo_RegisterActor - ## DynaPolyInfo_setActor -/* 00110 80A9EAE0 24850810 */ addiu $a1, $a0, 0x0810 ## $a1 = 00000810 -/* 00114 80A9EAE4 AE02014C */ sw $v0, 0x014C($s0) ## 0000014C -/* 00118 80A9EAE8 8FBF001C */ lw $ra, 0x001C($sp) -/* 0011C 80A9EAEC 8FB00018 */ lw $s0, 0x0018($sp) -/* 00120 80A9EAF0 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 -/* 00124 80A9EAF4 03E00008 */ jr $ra -/* 00128 80A9EAF8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Lightbox/EnLightbox_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Lightbox/EnLightbox_Update.s deleted file mode 100644 index 75b8bc795c..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Lightbox/EnLightbox_Update.s +++ /dev/null @@ -1,177 +0,0 @@ -glabel EnLightbox_Update -/* 0015C 80A9EB2C 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 00160 80A9EB30 AFBF0024 */ sw $ra, 0x0024($sp) -/* 00164 80A9EB34 AFB00020 */ sw $s0, 0x0020($sp) -/* 00168 80A9EB38 AFA5002C */ sw $a1, 0x002C($sp) -/* 0016C 80A9EB3C 848E0162 */ lh $t6, 0x0162($a0) ## 00000162 -/* 00170 80A9EB40 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00174 80A9EB44 51C00008 */ beql $t6, $zero, .L80A9EB68 -/* 00178 80A9EB48 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0017C 80A9EB4C 0C00BD68 */ jal func_8002F5A0 -/* 00180 80A9EB50 00000000 */ nop -/* 00184 80A9EB54 1040007C */ beq $v0, $zero, .L80A9ED48 -/* 00188 80A9EB58 00000000 */ nop -/* 0018C 80A9EB5C 1000007A */ beq $zero, $zero, .L80A9ED48 -/* 00190 80A9EB60 A6000162 */ sh $zero, 0x0162($s0) ## 00000162 -/* 00194 80A9EB64 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -.L80A9EB68: -/* 00198 80A9EB68 0C00BD04 */ jal func_8002F410 -/* 0019C 80A9EB6C 8FA5002C */ lw $a1, 0x002C($sp) -/* 001A0 80A9EB70 50400006 */ beql $v0, $zero, .L80A9EB8C -/* 001A4 80A9EB74 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 001A8 80A9EB78 860F0162 */ lh $t7, 0x0162($s0) ## 00000162 -/* 001AC 80A9EB7C 25F80001 */ addiu $t8, $t7, 0x0001 ## $t8 = 00000001 -/* 001B0 80A9EB80 10000071 */ beq $zero, $zero, .L80A9ED48 -/* 001B4 80A9EB84 A6180162 */ sh $t8, 0x0162($s0) ## 00000162 -/* 001B8 80A9EB88 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -.L80A9EB8C: -/* 001BC 80A9EB8C C6040068 */ lwc1 $f4, 0x0068($s0) ## 00000068 -/* 001C0 80A9EB90 46040032 */ c.eq.s $f0, $f4 -/* 001C4 80A9EB94 00000000 */ nop -/* 001C8 80A9EB98 4503001D */ bc1tl .L80A9EC10 -/* 001CC 80A9EB9C 960F0088 */ lhu $t7, 0x0088($s0) ## 00000088 -/* 001D0 80A9EBA0 96190088 */ lhu $t9, 0x0088($s0) ## 00000088 -/* 001D4 80A9EBA4 3C078013 */ lui $a3, 0x8013 ## $a3 = 80130000 -/* 001D8 80A9EBA8 24E733E0 */ addiu $a3, $a3, 0x33E0 ## $a3 = 801333E0 -/* 001DC 80A9EBAC 33280008 */ andi $t0, $t9, 0x0008 ## $t0 = 00000000 -/* 001E0 80A9EBB0 11000016 */ beq $t0, $zero, .L80A9EC0C -/* 001E4 80A9EBB4 2404282F */ addiu $a0, $zero, 0x282F ## $a0 = 0000282F -/* 001E8 80A9EBB8 86020032 */ lh $v0, 0x0032($s0) ## 00000032 -/* 001EC 80A9EBBC 8609007E */ lh $t1, 0x007E($s0) ## 0000007E -/* 001F0 80A9EBC0 3C0C8013 */ lui $t4, 0x8013 ## $t4 = 80130000 -/* 001F4 80A9EBC4 258C33E8 */ addiu $t4, $t4, 0x33E8 ## $t4 = 801333E8 -/* 001F8 80A9EBC8 00495021 */ addu $t2, $v0, $t1 -/* 001FC 80A9EBCC 01425823 */ subu $t3, $t2, $v0 -/* 00200 80A9EBD0 A60B0032 */ sh $t3, 0x0032($s0) ## 00000032 -/* 00204 80A9EBD4 AFAC0014 */ sw $t4, 0x0014($sp) -/* 00208 80A9EBD8 AFA70010 */ sw $a3, 0x0010($sp) -/* 0020C 80A9EBDC 260500E4 */ addiu $a1, $s0, 0x00E4 ## $a1 = 000000E4 -/* 00210 80A9EBE0 0C03DCE3 */ jal Audio_PlaySoundGeneral - -/* 00214 80A9EBE4 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 -/* 00218 80A9EBE8 3C0180AA */ lui $at, %hi(D_80A9EE00) ## $at = 80AA0000 -/* 0021C 80A9EBEC C428EE00 */ lwc1 $f8, %lo(D_80A9EE00)($at) -/* 00220 80A9EBF0 C6060068 */ lwc1 $f6, 0x0068($s0) ## 00000068 -/* 00224 80A9EBF4 960D0088 */ lhu $t5, 0x0088($s0) ## 00000088 -/* 00228 80A9EBF8 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 0022C 80A9EBFC 46083282 */ mul.s $f10, $f6, $f8 -/* 00230 80A9EC00 31AEFFF7 */ andi $t6, $t5, 0xFFF7 ## $t6 = 00000000 -/* 00234 80A9EC04 A60E0088 */ sh $t6, 0x0088($s0) ## 00000088 -/* 00238 80A9EC08 E60A0068 */ swc1 $f10, 0x0068($s0) ## 00000068 -.L80A9EC0C: -/* 0023C 80A9EC0C 960F0088 */ lhu $t7, 0x0088($s0) ## 00000088 -.L80A9EC10: -/* 00240 80A9EC10 3C198016 */ lui $t9, 0x8016 ## $t9 = 80160000 -/* 00244 80A9EC14 3C098016 */ lui $t1, 0x8016 ## $t1 = 80160000 -/* 00248 80A9EC18 31F80001 */ andi $t8, $t7, 0x0001 ## $t8 = 00000000 -/* 0024C 80A9EC1C 17000010 */ bne $t8, $zero, .L80A9EC60 -/* 00250 80A9EC20 00000000 */ nop -/* 00254 80A9EC24 8F39FA90 */ lw $t9, -0x0570($t9) ## 8015FA90 -/* 00258 80A9EC28 3C0142C8 */ lui $at, 0x42C8 ## $at = 42C80000 -/* 0025C 80A9EC2C 44812000 */ mtc1 $at, $f4 ## $f4 = 100.00 -/* 00260 80A9EC30 87280746 */ lh $t0, 0x0746($t9) ## 80160746 -/* 00264 80A9EC34 44050000 */ mfc1 $a1, $f0 -/* 00268 80A9EC38 26040068 */ addiu $a0, $s0, 0x0068 ## $a0 = 00000068 -/* 0026C 80A9EC3C 44888000 */ mtc1 $t0, $f16 ## $f16 = 0.00 -/* 00270 80A9EC40 00000000 */ nop -/* 00274 80A9EC44 468084A0 */ cvt.s.w $f18, $f16 -/* 00278 80A9EC48 46049183 */ div.s $f6, $f18, $f4 -/* 0027C 80A9EC4C 44063000 */ mfc1 $a2, $f6 -/* 00280 80A9EC50 0C01DE80 */ jal Math_ApproxF - -/* 00284 80A9EC54 00000000 */ nop -/* 00288 80A9EC58 1000003B */ beq $zero, $zero, .L80A9ED48 -/* 0028C 80A9EC5C 00000000 */ nop -.L80A9EC60: -/* 00290 80A9EC60 8D29FA90 */ lw $t1, -0x0570($t1) ## FFFFFA90 -/* 00294 80A9EC64 3C0142C8 */ lui $at, 0x42C8 ## $at = 42C80000 -/* 00298 80A9EC68 44818000 */ mtc1 $at, $f16 ## $f16 = 100.00 -/* 0029C 80A9EC6C 852A0748 */ lh $t2, 0x0748($t1) ## 00000748 -/* 002A0 80A9EC70 44050000 */ mfc1 $a1, $f0 -/* 002A4 80A9EC74 26040068 */ addiu $a0, $s0, 0x0068 ## $a0 = 00000068 -/* 002A8 80A9EC78 448A4000 */ mtc1 $t2, $f8 ## $f8 = 0.00 -/* 002AC 80A9EC7C 00000000 */ nop -/* 002B0 80A9EC80 468042A0 */ cvt.s.w $f10, $f8 -/* 002B4 80A9EC84 46105483 */ div.s $f18, $f10, $f16 -/* 002B8 80A9EC88 44069000 */ mfc1 $a2, $f18 -/* 002BC 80A9EC8C 0C01DE80 */ jal Math_ApproxF - -/* 002C0 80A9EC90 00000000 */ nop -/* 002C4 80A9EC94 960B0088 */ lhu $t3, 0x0088($s0) ## 00000088 -/* 002C8 80A9EC98 3C0D8016 */ lui $t5, 0x8016 ## $t5 = 80160000 -/* 002CC 80A9EC9C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 002D0 80A9ECA0 316C0002 */ andi $t4, $t3, 0x0002 ## $t4 = 00000000 -/* 002D4 80A9ECA4 11800026 */ beq $t4, $zero, .L80A9ED40 -/* 002D8 80A9ECA8 00000000 */ nop -/* 002DC 80A9ECAC 8DADFA90 */ lw $t5, -0x0570($t5) ## 8015FA90 -/* 002E0 80A9ECB0 3C0142C8 */ lui $at, 0x42C8 ## $at = 42C80000 -/* 002E4 80A9ECB4 44815000 */ mtc1 $at, $f10 ## $f10 = 100.00 -/* 002E8 80A9ECB8 85AE074A */ lh $t6, 0x074A($t5) ## 8016074A -/* 002EC 80A9ECBC C6040060 */ lwc1 $f4, 0x0060($s0) ## 00000060 -/* 002F0 80A9ECC0 3C0F8013 */ lui $t7, 0x8013 ## $t7 = 80130000 -/* 002F4 80A9ECC4 448E3000 */ mtc1 $t6, $f6 ## $f6 = 0.00 -/* 002F8 80A9ECC8 3C188013 */ lui $t8, 0x8013 ## $t8 = 80130000 -/* 002FC 80A9ECCC 271833E8 */ addiu $t8, $t8, 0x33E8 ## $t8 = 801333E8 -/* 00300 80A9ECD0 46803220 */ cvt.s.w $f8, $f6 -/* 00304 80A9ECD4 25E733E0 */ addiu $a3, $t7, 0x33E0 ## $a3 = 801333E0 -/* 00308 80A9ECD8 260500E4 */ addiu $a1, $s0, 0x00E4 ## $a1 = 000000E4 -/* 0030C 80A9ECDC 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 -/* 00310 80A9ECE0 460A4403 */ div.s $f16, $f8, $f10 -/* 00314 80A9ECE4 4610203C */ c.lt.s $f4, $f16 -/* 00318 80A9ECE8 00000000 */ nop -/* 0031C 80A9ECEC 45000014 */ bc1f .L80A9ED40 -/* 00320 80A9ECF0 00000000 */ nop -/* 00324 80A9ECF4 2404282F */ addiu $a0, $zero, 0x282F ## $a0 = 0000282F -/* 00328 80A9ECF8 AFA70010 */ sw $a3, 0x0010($sp) -/* 0032C 80A9ECFC 0C03DCE3 */ jal Audio_PlaySoundGeneral - -/* 00330 80A9ED00 AFB80014 */ sw $t8, 0x0014($sp) -/* 00334 80A9ED04 3C198016 */ lui $t9, 0x8016 ## $t9 = 80160000 -/* 00338 80A9ED08 8F39FA90 */ lw $t9, -0x0570($t9) ## 8015FA90 -/* 0033C 80A9ED0C 3C0142C8 */ lui $at, 0x42C8 ## $at = 42C80000 -/* 00340 80A9ED10 44814000 */ mtc1 $at, $f8 ## $f8 = 100.00 -/* 00344 80A9ED14 8728074C */ lh $t0, 0x074C($t9) ## 8016074C -/* 00348 80A9ED18 C6040060 */ lwc1 $f4, 0x0060($s0) ## 00000060 -/* 0034C 80A9ED1C 96090088 */ lhu $t1, 0x0088($s0) ## 00000088 -/* 00350 80A9ED20 44889000 */ mtc1 $t0, $f18 ## $f18 = 0.00 -/* 00354 80A9ED24 312AFFFE */ andi $t2, $t1, 0xFFFE ## $t2 = 00000000 -/* 00358 80A9ED28 468091A0 */ cvt.s.w $f6, $f18 -/* 0035C 80A9ED2C A60A0088 */ sh $t2, 0x0088($s0) ## 00000088 -/* 00360 80A9ED30 46083283 */ div.s $f10, $f6, $f8 -/* 00364 80A9ED34 460A2402 */ mul.s $f16, $f4, $f10 -/* 00368 80A9ED38 10000003 */ beq $zero, $zero, .L80A9ED48 -/* 0036C 80A9ED3C E6100060 */ swc1 $f16, 0x0060($s0) ## 00000060 -.L80A9ED40: -/* 00370 80A9ED40 0C00BD60 */ jal func_8002F580 -/* 00374 80A9ED44 8FA5002C */ lw $a1, 0x002C($sp) -.L80A9ED48: -/* 00378 80A9ED48 0C00B638 */ jal Actor_MoveForward - -/* 0037C 80A9ED4C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00380 80A9ED50 860B00AA */ lh $t3, 0x00AA($s0) ## 000000AA -/* 00384 80A9ED54 860C00A8 */ lh $t4, 0x00A8($s0) ## 000000A8 -/* 00388 80A9ED58 240D001D */ addiu $t5, $zero, 0x001D ## $t5 = 0000001D -/* 0038C 80A9ED5C 448B9000 */ mtc1 $t3, $f18 ## $f18 = 0.00 -/* 00390 80A9ED60 448C3000 */ mtc1 $t4, $f6 ## $f6 = 0.00 -/* 00394 80A9ED64 AFAD0014 */ sw $t5, 0x0014($sp) -/* 00398 80A9ED68 468094A0 */ cvt.s.w $f18, $f18 -/* 0039C 80A9ED6C 8FA4002C */ lw $a0, 0x002C($sp) -/* 003A0 80A9ED70 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 003A4 80A9ED74 46803020 */ cvt.s.w $f0, $f6 -/* 003A8 80A9ED78 44069000 */ mfc1 $a2, $f18 -/* 003AC 80A9ED7C 44070000 */ mfc1 $a3, $f0 -/* 003B0 80A9ED80 0C00B92D */ jal func_8002E4B4 -/* 003B4 80A9ED84 E7A00010 */ swc1 $f0, 0x0010($sp) -/* 003B8 80A9ED88 8E0F0024 */ lw $t7, 0x0024($s0) ## 00000024 -/* 003BC 80A9ED8C 8E0E0028 */ lw $t6, 0x0028($s0) ## 00000028 -/* 003C0 80A9ED90 AE0F0038 */ sw $t7, 0x0038($s0) ## 00000038 -/* 003C4 80A9ED94 8E0F002C */ lw $t7, 0x002C($s0) ## 0000002C -/* 003C8 80A9ED98 AE0E003C */ sw $t6, 0x003C($s0) ## 0000003C -/* 003CC 80A9ED9C AE0F0040 */ sw $t7, 0x0040($s0) ## 00000040 -/* 003D0 80A9EDA0 8FBF0024 */ lw $ra, 0x0024($sp) -/* 003D4 80A9EDA4 8FB00020 */ lw $s0, 0x0020($sp) -/* 003D8 80A9EDA8 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 003DC 80A9EDAC 03E00008 */ jr $ra -/* 003E0 80A9EDB0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_M_Thunder/EnMThunder_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_M_Thunder/EnMThunder_Draw.s index 06a285efa1..13e3642cec 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_M_Thunder/EnMThunder_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_M_Thunder/EnMThunder_Draw.s @@ -11,7 +11,7 @@ glabel EnMThunder_Draw /* 00D2C 80A9FD0C 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 /* 00D30 80A9FD10 27A40088 */ addiu $a0, $sp, 0x0088 ## $a0 = FFFFFFD8 /* 00D34 80A9FD14 2407034C */ addiu $a3, $zero, 0x034C ## $a3 = 0000034C -/* 00D38 80A9FD18 0C031AB1 */ jal func_800C6AC4 +/* 00D38 80A9FD18 0C031AB1 */ jal Graph_OpenDisps /* 00D3C 80A9FD1C 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 /* 00D40 80A9FD20 8FB800B4 */ lw $t8, 0x00B4($sp) /* 00D44 80A9FD24 0C024F61 */ jal func_80093D84 @@ -82,7 +82,7 @@ glabel EnMThunder_Draw /* 00E44 80A9FE24 AFA20080 */ sw $v0, 0x0080($sp) /* 00E48 80A9FE28 31EE00FF */ andi $t6, $t7, 0x00FF ## $t6 = 00000000 /* 00E4C 80A9FE2C 010EC023 */ subu $t8, $t0, $t6 -/* 00E50 80A9FE30 0C0253D0 */ jal Draw_TwoTexScroll +/* 00E50 80A9FE30 0C0253D0 */ jal Gfx_TwoTexScroll /* 00E54 80A9FE34 AFB8001C */ sw $t8, 0x001C($sp) /* 00E58 80A9FE38 8FA30080 */ lw $v1, 0x0080($sp) /* 00E5C 80A9FE3C AC620004 */ sw $v0, 0x0004($v1) ## 00000004 @@ -446,7 +446,7 @@ glabel EnMThunder_Draw /* 013B0 80AA0390 AFAD0020 */ sw $t5, 0x0020($sp) /* 013B4 80AA0394 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 013B8 80AA0398 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 013BC 80AA039C 0C0253D0 */ jal Draw_TwoTexScroll +/* 013BC 80AA039C 0C0253D0 */ jal Gfx_TwoTexScroll /* 013C0 80AA03A0 AFA20050 */ sw $v0, 0x0050($sp) /* 013C4 80AA03A4 8FA80050 */ lw $t0, 0x0050($sp) /* 013C8 80AA03A8 3C0C0401 */ lui $t4, 0x0401 ## $t4 = 04010000 @@ -463,7 +463,7 @@ glabel EnMThunder_Draw /* 013F4 80AA03D4 24C604CC */ addiu $a2, $a2, %lo(D_80AA04CC) ## $a2 = 80AA04CC /* 013F8 80AA03D8 27A40088 */ addiu $a0, $sp, 0x0088 ## $a0 = FFFFFFD8 /* 013FC 80AA03DC 24070407 */ addiu $a3, $zero, 0x0407 ## $a3 = 00000407 -/* 01400 80AA03E0 0C031AD5 */ jal func_800C6B54 +/* 01400 80AA03E0 0C031AD5 */ jal Graph_CloseDisps /* 01404 80AA03E4 8DA50000 */ lw $a1, 0x0000($t5) ## 00000000 /* 01408 80AA03E8 8FBF003C */ lw $ra, 0x003C($sp) /* 0140C 80AA03EC 8FB00038 */ lw $s0, 0x0038($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ma1/EnMa1_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Ma1/EnMa1_Destroy.s index 166e7de057..34dd9fa10f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ma1/EnMa1_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ma1/EnMa1_Destroy.s @@ -1,18 +1,18 @@ glabel EnMa1_Destroy /* 006C0 80AA0D50 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 006C4 80AA0D54 AFBF0014 */ sw $ra, 0x0014($sp) -/* 006C8 80AA0D58 AFA40018 */ sw $a0, 0x0018($sp) -/* 006CC 80AA0D5C AFA5001C */ sw $a1, 0x001C($sp) -/* 006D0 80AA0D60 0C0295BC */ jal func_800A56F0 +/* 006C4 80AA0D54 AFBF0014 */ sw $ra, 0x0014($sp) +/* 006C8 80AA0D58 AFA40018 */ sw $a0, 0x0018($sp) +/* 006CC 80AA0D5C AFA5001C */ sw $a1, 0x001C($sp) +/* 006D0 80AA0D60 0C0295BC */ jal SkelAnime_Free /* 006D4 80AA0D64 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 006D8 80AA0D68 8FA50018 */ lw $a1, 0x0018($sp) -/* 006DC 80AA0D6C 8FA4001C */ lw $a0, 0x001C($sp) +/* 006D8 80AA0D68 8FA50018 */ lw $a1, 0x0018($sp) +/* 006DC 80AA0D6C 8FA4001C */ lw $a0, 0x001C($sp) /* 006E0 80AA0D70 0C0170EB */ jal ActorCollider_FreeCylinder - + /* 006E4 80AA0D74 24A50194 */ addiu $a1, $a1, 0x0194 ## $a1 = 00000194 -/* 006E8 80AA0D78 8FBF0014 */ lw $ra, 0x0014($sp) +/* 006E8 80AA0D78 8FBF0014 */ lw $ra, 0x0014($sp) /* 006EC 80AA0D7C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 006F0 80AA0D80 03E00008 */ jr $ra +/* 006F0 80AA0D80 03E00008 */ jr $ra /* 006F4 80AA0D84 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ma1/EnMa1_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Ma1/EnMa1_Draw.s index 8f7188e992..ea43940eb5 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ma1/EnMa1_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ma1/EnMa1_Draw.s @@ -1,30 +1,30 @@ glabel EnMa1_Draw /* 00E14 80AA14A4 27BDFF98 */ addiu $sp, $sp, 0xFF98 ## $sp = FFFFFF98 -/* 00E18 80AA14A8 AFB20030 */ sw $s2, 0x0030($sp) +/* 00E18 80AA14A8 AFB20030 */ sw $s2, 0x0030($sp) /* 00E1C 80AA14AC 00A09025 */ or $s2, $a1, $zero ## $s2 = 00000000 -/* 00E20 80AA14B0 AFBF0034 */ sw $ra, 0x0034($sp) -/* 00E24 80AA14B4 AFB1002C */ sw $s1, 0x002C($sp) -/* 00E28 80AA14B8 AFB00028 */ sw $s0, 0x0028($sp) +/* 00E20 80AA14B0 AFBF0034 */ sw $ra, 0x0034($sp) +/* 00E24 80AA14B4 AFB1002C */ sw $s1, 0x002C($sp) +/* 00E28 80AA14B8 AFB00028 */ sw $s0, 0x0028($sp) /* 00E2C 80AA14BC 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 /* 00E30 80AA14C0 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 00E34 80AA14C4 3C0680AA */ lui $a2, %hi(D_80AA16E0) ## $a2 = 80AA0000 /* 00E38 80AA14C8 24C616E0 */ addiu $a2, $a2, %lo(D_80AA16E0) ## $a2 = 80AA16E0 /* 00E3C 80AA14CC 27A40044 */ addiu $a0, $sp, 0x0044 ## $a0 = FFFFFFDC /* 00E40 80AA14D0 240704CA */ addiu $a3, $zero, 0x04CA ## $a3 = 000004CA -/* 00E44 80AA14D4 0C031AB1 */ jal func_800C6AC4 +/* 00E44 80AA14D4 0C031AB1 */ jal Graph_OpenDisps /* 00E48 80AA14D8 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 /* 00E4C 80AA14DC 864E07A0 */ lh $t6, 0x07A0($s2) ## 000007A0 /* 00E50 80AA14E0 26040024 */ addiu $a0, $s0, 0x0024 ## $a0 = 00000024 -/* 00E54 80AA14E4 000E7880 */ sll $t7, $t6, 2 -/* 00E58 80AA14E8 024FC021 */ addu $t8, $s2, $t7 +/* 00E54 80AA14E4 000E7880 */ sll $t7, $t6, 2 +/* 00E58 80AA14E8 024FC021 */ addu $t8, $s2, $t7 /* 00E5C 80AA14EC 8F020790 */ lw $v0, 0x0790($t8) ## 00000790 /* 00E60 80AA14F0 0C01E00A */ jal Math_Vec3f_DistXZ - + /* 00E64 80AA14F4 2445005C */ addiu $a1, $v0, 0x005C ## $a1 = 0000005C -/* 00E68 80AA14F8 46000306 */ mov.s $f12, $f0 -/* 00E6C 80AA14FC 0C03D89A */ jal func_800F6268 +/* 00E68 80AA14F8 46000306 */ mov.s $f12, $f0 +/* 00E6C 80AA14FC 0C03D89A */ jal func_800F6268 /* 00E70 80AA1500 2405002F */ addiu $a1, $zero, 0x002F ## $a1 = 0000002F -/* 00E74 80AA1504 0C024F46 */ jal func_80093D18 +/* 00E74 80AA1504 0C024F46 */ jal func_80093D18 /* 00E78 80AA1508 8E440000 */ lw $a0, 0x0000($s2) ## 00000000 /* 00E7C 80AA150C 8E2302C0 */ lw $v1, 0x02C0($s1) ## 000002C0 /* 00E80 80AA1510 3C08DB06 */ lui $t0, 0xDB06 ## $t0 = DB060000 @@ -35,21 +35,21 @@ glabel EnMa1_Draw /* 00E94 80AA1524 860901E6 */ lh $t1, 0x01E6($s0) ## 000001E6 /* 00E98 80AA1528 3C0480AA */ lui $a0, %hi(D_80AA16C4) ## $a0 = 80AA0000 /* 00E9C 80AA152C 3C068016 */ lui $a2, 0x8016 ## $a2 = 80160000 -/* 00EA0 80AA1530 00095080 */ sll $t2, $t1, 2 -/* 00EA4 80AA1534 008A2021 */ addu $a0, $a0, $t2 -/* 00EA8 80AA1538 8C8416C4 */ lw $a0, %lo(D_80AA16C4)($a0) +/* 00EA0 80AA1530 00095080 */ sll $t2, $t1, 2 +/* 00EA4 80AA1534 008A2021 */ addu $a0, $a0, $t2 +/* 00EA8 80AA1538 8C8416C4 */ lw $a0, %lo(D_80AA16C4)($a0) /* 00EAC 80AA153C 24C66FA8 */ addiu $a2, $a2, 0x6FA8 ## $a2 = 80166FA8 /* 00EB0 80AA1540 3C0500FF */ lui $a1, 0x00FF ## $a1 = 00FF0000 -/* 00EB4 80AA1544 00046100 */ sll $t4, $a0, 4 -/* 00EB8 80AA1548 000C6F02 */ srl $t5, $t4, 28 -/* 00EBC 80AA154C 000D7080 */ sll $t6, $t5, 2 -/* 00EC0 80AA1550 00CE7821 */ addu $t7, $a2, $t6 +/* 00EB4 80AA1544 00046100 */ sll $t4, $a0, 4 +/* 00EB8 80AA1548 000C6F02 */ srl $t5, $t4, 28 +/* 00EBC 80AA154C 000D7080 */ sll $t6, $t5, 2 +/* 00EC0 80AA1550 00CE7821 */ addu $t7, $a2, $t6 /* 00EC4 80AA1554 8DF80000 */ lw $t8, 0x0000($t7) ## 00000000 /* 00EC8 80AA1558 34A5FFFF */ ori $a1, $a1, 0xFFFF ## $a1 = 00FFFFFF -/* 00ECC 80AA155C 00855824 */ and $t3, $a0, $a1 +/* 00ECC 80AA155C 00855824 */ and $t3, $a0, $a1 /* 00ED0 80AA1560 3C078000 */ lui $a3, 0x8000 ## $a3 = 80000000 -/* 00ED4 80AA1564 0178C821 */ addu $t9, $t3, $t8 -/* 00ED8 80AA1568 03274021 */ addu $t0, $t9, $a3 +/* 00ED4 80AA1564 0178C821 */ addu $t9, $t3, $t8 +/* 00ED8 80AA1568 03274021 */ addu $t0, $t9, $a3 /* 00EDC 80AA156C AC680004 */ sw $t0, 0x0004($v1) ## 00000004 /* 00EE0 80AA1570 8E2302C0 */ lw $v1, 0x02C0($s1) ## 000002C0 /* 00EE4 80AA1574 3C0ADB06 */ lui $t2, 0xDB06 ## $t2 = DB060000 @@ -59,40 +59,40 @@ glabel EnMa1_Draw /* 00EF4 80AA1584 AC6A0000 */ sw $t2, 0x0000($v1) ## 00000000 /* 00EF8 80AA1588 860C01E4 */ lh $t4, 0x01E4($s0) ## 000001E4 /* 00EFC 80AA158C 3C0480AA */ lui $a0, %hi(D_80AA16D0) ## $a0 = 80AA0000 -/* 00F00 80AA1590 000C6880 */ sll $t5, $t4, 2 -/* 00F04 80AA1594 008D2021 */ addu $a0, $a0, $t5 -/* 00F08 80AA1598 8C8416D0 */ lw $a0, %lo(D_80AA16D0)($a0) +/* 00F00 80AA1590 000C6880 */ sll $t5, $t4, 2 +/* 00F04 80AA1594 008D2021 */ addu $a0, $a0, $t5 +/* 00F08 80AA1598 8C8416D0 */ lw $a0, %lo(D_80AA16D0)($a0) /* 00F0C 80AA159C 3C0D80AA */ lui $t5, %hi(func_80AA1448) ## $t5 = 80AA0000 /* 00F10 80AA15A0 3C0C80AA */ lui $t4, %hi(func_80AA12BC) ## $t4 = 80AA0000 -/* 00F14 80AA15A4 00047900 */ sll $t7, $a0, 4 -/* 00F18 80AA15A8 000F5F02 */ srl $t3, $t7, 28 -/* 00F1C 80AA15AC 000BC080 */ sll $t8, $t3, 2 -/* 00F20 80AA15B0 00D8C821 */ addu $t9, $a2, $t8 +/* 00F14 80AA15A4 00047900 */ sll $t7, $a0, 4 +/* 00F18 80AA15A8 000F5F02 */ srl $t3, $t7, 28 +/* 00F1C 80AA15AC 000BC080 */ sll $t8, $t3, 2 +/* 00F20 80AA15B0 00D8C821 */ addu $t9, $a2, $t8 /* 00F24 80AA15B4 8F280000 */ lw $t0, 0x0000($t9) ## 00000008 -/* 00F28 80AA15B8 00857024 */ and $t6, $a0, $a1 +/* 00F28 80AA15B8 00857024 */ and $t6, $a0, $a1 /* 00F2C 80AA15BC 258C12BC */ addiu $t4, $t4, %lo(func_80AA12BC) ## $t4 = 80AA12BC -/* 00F30 80AA15C0 01C84821 */ addu $t1, $t6, $t0 -/* 00F34 80AA15C4 01275021 */ addu $t2, $t1, $a3 +/* 00F30 80AA15C0 01C84821 */ addu $t1, $t6, $t0 +/* 00F34 80AA15C4 01275021 */ addu $t2, $t1, $a3 /* 00F38 80AA15C8 AC6A0004 */ sw $t2, 0x0004($v1) ## 00000004 /* 00F3C 80AA15CC 9207014E */ lbu $a3, 0x014E($s0) ## 0000014E /* 00F40 80AA15D0 8E06016C */ lw $a2, 0x016C($s0) ## 0000016C /* 00F44 80AA15D4 8E050150 */ lw $a1, 0x0150($s0) ## 00000150 /* 00F48 80AA15D8 25AD1448 */ addiu $t5, $t5, %lo(func_80AA1448) ## $t5 = 80AA1448 -/* 00F4C 80AA15DC AFAD0014 */ sw $t5, 0x0014($sp) -/* 00F50 80AA15E0 AFB00018 */ sw $s0, 0x0018($sp) -/* 00F54 80AA15E4 AFAC0010 */ sw $t4, 0x0010($sp) -/* 00F58 80AA15E8 0C0286B2 */ jal func_800A1AC8 +/* 00F4C 80AA15DC AFAD0014 */ sw $t5, 0x0014($sp) +/* 00F50 80AA15E0 AFB00018 */ sw $s0, 0x0018($sp) +/* 00F54 80AA15E4 AFAC0010 */ sw $t4, 0x0010($sp) +/* 00F58 80AA15E8 0C0286B2 */ jal SkelAnime_DrawSV /* 00F5C 80AA15EC 02402025 */ or $a0, $s2, $zero ## $a0 = 00000000 /* 00F60 80AA15F0 3C0680AA */ lui $a2, %hi(D_80AA16F0) ## $a2 = 80AA0000 /* 00F64 80AA15F4 24C616F0 */ addiu $a2, $a2, %lo(D_80AA16F0) ## $a2 = 80AA16F0 /* 00F68 80AA15F8 27A40044 */ addiu $a0, $sp, 0x0044 ## $a0 = FFFFFFDC /* 00F6C 80AA15FC 8E450000 */ lw $a1, 0x0000($s2) ## 00000000 -/* 00F70 80AA1600 0C031AD5 */ jal func_800C6B54 +/* 00F70 80AA1600 0C031AD5 */ jal Graph_CloseDisps /* 00F74 80AA1604 240704ED */ addiu $a3, $zero, 0x04ED ## $a3 = 000004ED -/* 00F78 80AA1608 8FBF0034 */ lw $ra, 0x0034($sp) -/* 00F7C 80AA160C 8FB00028 */ lw $s0, 0x0028($sp) -/* 00F80 80AA1610 8FB1002C */ lw $s1, 0x002C($sp) -/* 00F84 80AA1614 8FB20030 */ lw $s2, 0x0030($sp) -/* 00F88 80AA1618 03E00008 */ jr $ra +/* 00F78 80AA1608 8FBF0034 */ lw $ra, 0x0034($sp) +/* 00F7C 80AA160C 8FB00028 */ lw $s0, 0x0028($sp) +/* 00F80 80AA1610 8FB1002C */ lw $s1, 0x002C($sp) +/* 00F84 80AA1614 8FB20030 */ lw $s2, 0x0030($sp) +/* 00F88 80AA1618 03E00008 */ jr $ra /* 00F8C 80AA161C 27BD0068 */ addiu $sp, $sp, 0x0068 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ma1/EnMa1_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Ma1/EnMa1_Init.s index af19f76f4d..6087e66e66 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ma1/EnMa1_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ma1/EnMa1_Init.s @@ -1,68 +1,68 @@ glabel EnMa1_Init /* 00558 80AA0BE8 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 -/* 0055C 80AA0BEC AFB00028 */ sw $s0, 0x0028($sp) +/* 0055C 80AA0BEC AFB00028 */ sw $s0, 0x0028($sp) /* 00560 80AA0BF0 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00564 80AA0BF4 AFBF002C */ sw $ra, 0x002C($sp) -/* 00568 80AA0BF8 AFA50044 */ sw $a1, 0x0044($sp) +/* 00564 80AA0BF4 AFBF002C */ sw $ra, 0x002C($sp) +/* 00568 80AA0BF8 AFA50044 */ sw $a1, 0x0044($sp) /* 0056C 80AA0BFC 3C068003 */ lui $a2, 0x8003 ## $a2 = 80030000 /* 00570 80AA0C00 24C6B5EC */ addiu $a2, $a2, 0xB5EC ## $a2 = 8002B5EC /* 00574 80AA0C04 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 /* 00578 80AA0C08 248400B4 */ addiu $a0, $a0, 0x00B4 ## $a0 = 000000B4 /* 0057C 80AA0C0C 0C00AC78 */ jal ActorShape_Init - + /* 00580 80AA0C10 3C074190 */ lui $a3, 0x4190 ## $a3 = 41900000 /* 00584 80AA0C14 3C060601 */ lui $a2, 0x0601 ## $a2 = 06010000 /* 00588 80AA0C18 24C68460 */ addiu $a2, $a2, 0x8460 ## $a2 = 06008460 -/* 0058C 80AA0C1C 8FA40044 */ lw $a0, 0x0044($sp) +/* 0058C 80AA0C1C 8FA40044 */ lw $a0, 0x0044($sp) /* 00590 80AA0C20 2605014C */ addiu $a1, $s0, 0x014C ## $a1 = 0000014C /* 00594 80AA0C24 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 00598 80AA0C28 AFA00010 */ sw $zero, 0x0010($sp) -/* 0059C 80AA0C2C AFA00014 */ sw $zero, 0x0014($sp) -/* 005A0 80AA0C30 0C0291BE */ jal func_800A46F8 -/* 005A4 80AA0C34 AFA00018 */ sw $zero, 0x0018($sp) +/* 00598 80AA0C28 AFA00010 */ sw $zero, 0x0010($sp) +/* 0059C 80AA0C2C AFA00014 */ sw $zero, 0x0014($sp) +/* 005A0 80AA0C30 0C0291BE */ jal SkelAnime_InitSV +/* 005A4 80AA0C34 AFA00018 */ sw $zero, 0x0018($sp) /* 005A8 80AA0C38 26050194 */ addiu $a1, $s0, 0x0194 ## $a1 = 00000194 -/* 005AC 80AA0C3C AFA50030 */ sw $a1, 0x0030($sp) +/* 005AC 80AA0C3C AFA50030 */ sw $a1, 0x0030($sp) /* 005B0 80AA0C40 0C0170D9 */ jal ActorCollider_AllocCylinder - -/* 005B4 80AA0C44 8FA40044 */ lw $a0, 0x0044($sp) + +/* 005B4 80AA0C44 8FA40044 */ lw $a0, 0x0044($sp) /* 005B8 80AA0C48 3C0780AA */ lui $a3, %hi(D_80AA1640) ## $a3 = 80AA0000 -/* 005BC 80AA0C4C 8FA50030 */ lw $a1, 0x0030($sp) +/* 005BC 80AA0C4C 8FA50030 */ lw $a1, 0x0030($sp) /* 005C0 80AA0C50 24E71640 */ addiu $a3, $a3, %lo(D_80AA1640) ## $a3 = 80AA1640 -/* 005C4 80AA0C54 8FA40044 */ lw $a0, 0x0044($sp) +/* 005C4 80AA0C54 8FA40044 */ lw $a0, 0x0044($sp) /* 005C8 80AA0C58 0C01712B */ jal ActorCollider_InitCylinder - + /* 005CC 80AA0C5C 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 005D0 80AA0C60 0C016C80 */ jal CollisionBtlTbl_Get - + /* 005D4 80AA0C64 24040016 */ addiu $a0, $zero, 0x0016 ## $a0 = 00000016 /* 005D8 80AA0C68 3C0680AA */ lui $a2, %hi(D_80AA166C) ## $a2 = 80AA0000 /* 005DC 80AA0C6C 24C6166C */ addiu $a2, $a2, %lo(D_80AA166C) ## $a2 = 80AA166C /* 005E0 80AA0C70 26040098 */ addiu $a0, $s0, 0x0098 ## $a0 = 00000098 -/* 005E4 80AA0C74 0C0187BF */ jal func_80061EFC +/* 005E4 80AA0C74 0C0187BF */ jal func_80061EFC /* 005E8 80AA0C78 00402825 */ or $a1, $v0, $zero ## $a1 = 00000000 /* 005EC 80AA0C7C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 005F0 80AA0C80 0C2A8231 */ jal func_80AA08C4 -/* 005F4 80AA0C84 8FA50044 */ lw $a1, 0x0044($sp) -/* 005F8 80AA0C88 14400005 */ bne $v0, $zero, .L80AA0CA0 -/* 005FC 80AA0C8C 8FA40044 */ lw $a0, 0x0044($sp) +/* 005F0 80AA0C80 0C2A8231 */ jal func_80AA08C4 +/* 005F4 80AA0C84 8FA50044 */ lw $a1, 0x0044($sp) +/* 005F8 80AA0C88 14400005 */ bne $v0, $zero, .L80AA0CA0 +/* 005FC 80AA0C8C 8FA40044 */ lw $a0, 0x0044($sp) /* 00600 80AA0C90 0C00B55C */ jal Actor_Kill - + /* 00604 80AA0C94 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00608 80AA0C98 10000029 */ beq $zero, $zero, .L80AA0D40 -/* 0060C 80AA0C9C 8FBF002C */ lw $ra, 0x002C($sp) +/* 00608 80AA0C98 10000029 */ beq $zero, $zero, .L80AA0D40 +/* 0060C 80AA0C9C 8FBF002C */ lw $ra, 0x002C($sp) .L80AA0CA0: /* 00610 80AA0CA0 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 /* 00614 80AA0CA4 240E0004 */ addiu $t6, $zero, 0x0004 ## $t6 = 00000004 -/* 00618 80AA0CA8 AFAE0014 */ sw $t6, 0x0014($sp) -/* 0061C 80AA0CAC 44060000 */ mfc1 $a2, $f0 -/* 00620 80AA0CB0 44070000 */ mfc1 $a3, $f0 +/* 00618 80AA0CA8 AFAE0014 */ sw $t6, 0x0014($sp) +/* 0061C 80AA0CAC 44060000 */ mfc1 $a2, $f0 +/* 00620 80AA0CB0 44070000 */ mfc1 $a3, $f0 /* 00624 80AA0CB4 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 00628 80AA0CB8 0C00B92D */ jal func_8002E4B4 -/* 0062C 80AA0CBC E7A00010 */ swc1 $f0, 0x0010($sp) +/* 00628 80AA0CB8 0C00B92D */ jal func_8002E4B4 +/* 0062C 80AA0CBC E7A00010 */ swc1 $f0, 0x0010($sp) /* 00630 80AA0CC0 3C053C23 */ lui $a1, 0x3C23 ## $a1 = 3C230000 /* 00634 80AA0CC4 34A5D70A */ ori $a1, $a1, 0xD70A ## $a1 = 3C23D70A /* 00638 80AA0CC8 0C00B58B */ jal Actor_SetScale - + /* 0063C 80AA0CCC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 00640 80AA0CD0 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 /* 00644 80AA0CD4 240F0006 */ addiu $t7, $zero, 0x0006 ## $t7 = 00000006 @@ -73,31 +73,31 @@ glabel EnMa1_Init /* 00658 80AA0CE8 3C0B80AA */ lui $t3, %hi(func_80AA0D88) ## $t3 = 80AA0000 /* 0065C 80AA0CEC 3C088012 */ lui $t0, 0x8012 ## $t0 = 80120000 /* 00660 80AA0CF0 33190010 */ andi $t9, $t8, 0x0010 ## $t9 = 00000000 -/* 00664 80AA0CF4 13200008 */ beq $t9, $zero, .L80AA0D18 +/* 00664 80AA0CF4 13200008 */ beq $t9, $zero, .L80AA0D18 /* 00668 80AA0CF8 256B0D88 */ addiu $t3, $t3, %lo(func_80AA0D88) ## $t3 = 80AA0D88 /* 0066C 80AA0CFC 8D087154 */ lw $t0, 0x7154($t0) ## 80127154 /* 00670 80AA0D00 8C4900A4 */ lw $t1, 0x00A4($v0) ## 8015E704 /* 00674 80AA0D04 3C0C80AA */ lui $t4, %hi(func_80AA0F44) ## $t4 = 80AA0000 /* 00678 80AA0D08 258C0F44 */ addiu $t4, $t4, %lo(func_80AA0F44) ## $t4 = 80AA0F44 -/* 0067C 80AA0D0C 01095024 */ and $t2, $t0, $t1 -/* 00680 80AA0D10 11400007 */ beq $t2, $zero, .L80AA0D30 +/* 0067C 80AA0D0C 01095024 */ and $t2, $t0, $t1 +/* 00680 80AA0D10 11400007 */ beq $t2, $zero, .L80AA0D30 /* 00684 80AA0D14 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 .L80AA0D18: /* 00688 80AA0D18 AE0B0190 */ sw $t3, 0x0190($s0) ## 00000190 /* 0068C 80AA0D1C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00690 80AA0D20 0C2A82A1 */ jal func_80AA0A84 +/* 00690 80AA0D20 0C2A82A1 */ jal func_80AA0A84 /* 00694 80AA0D24 24050002 */ addiu $a1, $zero, 0x0002 ## $a1 = 00000002 -/* 00698 80AA0D28 10000005 */ beq $zero, $zero, .L80AA0D40 -/* 0069C 80AA0D2C 8FBF002C */ lw $ra, 0x002C($sp) +/* 00698 80AA0D28 10000005 */ beq $zero, $zero, .L80AA0D40 +/* 0069C 80AA0D2C 8FBF002C */ lw $ra, 0x002C($sp) .L80AA0D30: /* 006A0 80AA0D30 AE0C0190 */ sw $t4, 0x0190($s0) ## 00000190 -/* 006A4 80AA0D34 0C2A82A1 */ jal func_80AA0A84 +/* 006A4 80AA0D34 0C2A82A1 */ jal func_80AA0A84 /* 006A8 80AA0D38 24050002 */ addiu $a1, $zero, 0x0002 ## $a1 = 00000002 -/* 006AC 80AA0D3C 8FBF002C */ lw $ra, 0x002C($sp) +/* 006AC 80AA0D3C 8FBF002C */ lw $ra, 0x002C($sp) .L80AA0D40: -/* 006B0 80AA0D40 8FB00028 */ lw $s0, 0x0028($sp) +/* 006B0 80AA0D40 8FB00028 */ lw $s0, 0x0028($sp) /* 006B4 80AA0D44 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 -/* 006B8 80AA0D48 03E00008 */ jr $ra +/* 006B8 80AA0D48 03E00008 */ jr $ra /* 006BC 80AA0D4C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ma1/func_80AA0690.s b/asm/non_matchings/overlays/actors/ovl_En_Ma1/func_80AA0690.s index 5a0029e351..c89dc68b4e 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ma1/func_80AA0690.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ma1/func_80AA0690.s @@ -2,7 +2,7 @@ glabel func_80AA0690 /* 00000 80AA0690 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 00004 80AA0694 AFBF0014 */ sw $ra, 0x0014($sp) /* 00008 80AA0698 AFA5001C */ sw $a1, 0x001C($sp) -/* 0000C 80AA069C 0C01B0D8 */ jal func_8006C360 +/* 0000C 80AA069C 0C01B0D8 */ jal Text_GetFaceReaction /* 00010 80AA06A0 24050017 */ addiu $a1, $zero, 0x0017 ## $a1 = 00000017 /* 00014 80AA06A4 10400003 */ beq $v0, $zero, .L80AA06B4 /* 00018 80AA06A8 3043FFFF */ andi $v1, $v0, 0xFFFF ## $v1 = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ma1/func_80AA0A84.s b/asm/non_matchings/overlays/actors/ovl_En_Ma1/func_80AA0A84.s index 47e41172c3..26eab980bc 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ma1/func_80AA0A84.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ma1/func_80AA0A84.s @@ -2,32 +2,32 @@ glabel func_80AA0A84 /* 003F4 80AA0A84 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 /* 003F8 80AA0A88 3C0F80AA */ lui $t7, %hi(D_80AA1678) ## $t7 = 80AA0000 /* 003FC 80AA0A8C 25EF1678 */ addiu $t7, $t7, %lo(D_80AA1678) ## $t7 = 80AA1678 -/* 00400 80AA0A90 00057100 */ sll $t6, $a1, 4 -/* 00404 80AA0A94 AFBF0024 */ sw $ra, 0x0024($sp) -/* 00408 80AA0A98 AFA40030 */ sw $a0, 0x0030($sp) -/* 0040C 80AA0A9C 01CF1821 */ addu $v1, $t6, $t7 +/* 00400 80AA0A90 00057100 */ sll $t6, $a1, 4 +/* 00404 80AA0A94 AFBF0024 */ sw $ra, 0x0024($sp) +/* 00408 80AA0A98 AFA40030 */ sw $a0, 0x0030($sp) +/* 0040C 80AA0A9C 01CF1821 */ addu $v1, $t6, $t7 /* 00410 80AA0AA0 8C640000 */ lw $a0, 0x0000($v1) ## 00000000 /* 00414 80AA0AA4 0C028800 */ jal SkelAnime_GetFrameCount - -/* 00418 80AA0AA8 AFA30028 */ sw $v1, 0x0028($sp) + +/* 00418 80AA0AA8 AFA30028 */ sw $v1, 0x0028($sp) /* 0041C 80AA0AAC 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 -/* 00420 80AA0AB0 8FA30028 */ lw $v1, 0x0028($sp) -/* 00424 80AA0AB4 8FA40030 */ lw $a0, 0x0030($sp) -/* 00428 80AA0AB8 468021A0 */ cvt.s.w $f6, $f4 +/* 00420 80AA0AB0 8FA30028 */ lw $v1, 0x0028($sp) +/* 00424 80AA0AB4 8FA40030 */ lw $a0, 0x0030($sp) +/* 00428 80AA0AB8 468021A0 */ cvt.s.w $f6, $f4 /* 0042C 80AA0ABC 90780008 */ lbu $t8, 0x0008($v1) ## 00000008 /* 00430 80AA0AC0 C468000C */ lwc1 $f8, 0x000C($v1) ## 0000000C /* 00434 80AA0AC4 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 00438 80AA0AC8 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 /* 0043C 80AA0ACC 8C650000 */ lw $a1, 0x0000($v1) ## 00000000 -/* 00440 80AA0AD0 E7A60010 */ swc1 $f6, 0x0010($sp) +/* 00440 80AA0AD0 E7A60010 */ swc1 $f6, 0x0010($sp) /* 00444 80AA0AD4 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 00448 80AA0AD8 AFB80014 */ sw $t8, 0x0014($sp) -/* 0044C 80AA0ADC 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 00450 80AA0AE0 E7A80018 */ swc1 $f8, 0x0018($sp) -/* 00454 80AA0AE4 8FBF0024 */ lw $ra, 0x0024($sp) +/* 00448 80AA0AD8 AFB80014 */ sw $t8, 0x0014($sp) +/* 0044C 80AA0ADC 0C029468 */ jal SkelAnime_ChangeAnim + +/* 00450 80AA0AE0 E7A80018 */ swc1 $f8, 0x0018($sp) +/* 00454 80AA0AE4 8FBF0024 */ lw $ra, 0x0024($sp) /* 00458 80AA0AE8 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 0045C 80AA0AEC 03E00008 */ jr $ra +/* 0045C 80AA0AEC 03E00008 */ jr $ra /* 00460 80AA0AF0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ma2/EnMa2_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Ma2/EnMa2_Destroy.s index b15d1ef915..65e59c5c7a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ma2/EnMa2_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ma2/EnMa2_Destroy.s @@ -1,18 +1,18 @@ glabel EnMa2_Destroy /* 00640 80AA1FE0 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00644 80AA1FE4 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00648 80AA1FE8 AFA40018 */ sw $a0, 0x0018($sp) -/* 0064C 80AA1FEC AFA5001C */ sw $a1, 0x001C($sp) -/* 00650 80AA1FF0 0C0295BC */ jal func_800A56F0 +/* 00644 80AA1FE4 AFBF0014 */ sw $ra, 0x0014($sp) +/* 00648 80AA1FE8 AFA40018 */ sw $a0, 0x0018($sp) +/* 0064C 80AA1FEC AFA5001C */ sw $a1, 0x001C($sp) +/* 00650 80AA1FF0 0C0295BC */ jal SkelAnime_Free /* 00654 80AA1FF4 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 00658 80AA1FF8 8FA50018 */ lw $a1, 0x0018($sp) -/* 0065C 80AA1FFC 8FA4001C */ lw $a0, 0x001C($sp) +/* 00658 80AA1FF8 8FA50018 */ lw $a1, 0x0018($sp) +/* 0065C 80AA1FFC 8FA4001C */ lw $a0, 0x001C($sp) /* 00660 80AA2000 0C0170EB */ jal ActorCollider_FreeCylinder - + /* 00664 80AA2004 24A50194 */ addiu $a1, $a1, 0x0194 ## $a1 = 00000194 -/* 00668 80AA2008 8FBF0014 */ lw $ra, 0x0014($sp) +/* 00668 80AA2008 8FBF0014 */ lw $ra, 0x0014($sp) /* 0066C 80AA200C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00670 80AA2010 03E00008 */ jr $ra +/* 00670 80AA2010 03E00008 */ jr $ra /* 00674 80AA2014 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ma2/EnMa2_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Ma2/EnMa2_Draw.s index 00dec59ef1..14c2f09b68 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ma2/EnMa2_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ma2/EnMa2_Draw.s @@ -1,30 +1,30 @@ glabel EnMa2_Draw /* 00CDC 80AA267C 27BDFF98 */ addiu $sp, $sp, 0xFF98 ## $sp = FFFFFF98 -/* 00CE0 80AA2680 AFB20030 */ sw $s2, 0x0030($sp) +/* 00CE0 80AA2680 AFB20030 */ sw $s2, 0x0030($sp) /* 00CE4 80AA2684 00A09025 */ or $s2, $a1, $zero ## $s2 = 00000000 -/* 00CE8 80AA2688 AFBF0034 */ sw $ra, 0x0034($sp) -/* 00CEC 80AA268C AFB1002C */ sw $s1, 0x002C($sp) -/* 00CF0 80AA2690 AFB00028 */ sw $s0, 0x0028($sp) +/* 00CE8 80AA2688 AFBF0034 */ sw $ra, 0x0034($sp) +/* 00CEC 80AA268C AFB1002C */ sw $s1, 0x002C($sp) +/* 00CF0 80AA2690 AFB00028 */ sw $s0, 0x0028($sp) /* 00CF4 80AA2694 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 /* 00CF8 80AA2698 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 00CFC 80AA269C 3C0680AA */ lui $a2, %hi(D_80AA28F0) ## $a2 = 80AA0000 /* 00D00 80AA26A0 24C628F0 */ addiu $a2, $a2, %lo(D_80AA28F0) ## $a2 = 80AA28F0 /* 00D04 80AA26A4 27A40044 */ addiu $a0, $sp, 0x0044 ## $a0 = FFFFFFDC /* 00D08 80AA26A8 240703BB */ addiu $a3, $zero, 0x03BB ## $a3 = 000003BB -/* 00D0C 80AA26AC 0C031AB1 */ jal func_800C6AC4 +/* 00D0C 80AA26AC 0C031AB1 */ jal Graph_OpenDisps /* 00D10 80AA26B0 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 /* 00D14 80AA26B4 864E07A0 */ lh $t6, 0x07A0($s2) ## 000007A0 /* 00D18 80AA26B8 26040024 */ addiu $a0, $s0, 0x0024 ## $a0 = 00000024 -/* 00D1C 80AA26BC 000E7880 */ sll $t7, $t6, 2 -/* 00D20 80AA26C0 024FC021 */ addu $t8, $s2, $t7 +/* 00D1C 80AA26BC 000E7880 */ sll $t7, $t6, 2 +/* 00D20 80AA26C0 024FC021 */ addu $t8, $s2, $t7 /* 00D24 80AA26C4 8F020790 */ lw $v0, 0x0790($t8) ## 00000790 /* 00D28 80AA26C8 0C01E00A */ jal Math_Vec3f_DistXZ - + /* 00D2C 80AA26CC 2445005C */ addiu $a1, $v0, 0x005C ## $a1 = 0000005C -/* 00D30 80AA26D0 46000306 */ mov.s $f12, $f0 -/* 00D34 80AA26D4 0C03D89A */ jal func_800F6268 +/* 00D30 80AA26D0 46000306 */ mov.s $f12, $f0 +/* 00D34 80AA26D4 0C03D89A */ jal func_800F6268 /* 00D38 80AA26D8 2405002F */ addiu $a1, $zero, 0x002F ## $a1 = 0000002F -/* 00D3C 80AA26DC 0C024F46 */ jal func_80093D18 +/* 00D3C 80AA26DC 0C024F46 */ jal func_80093D18 /* 00D40 80AA26E0 8E440000 */ lw $a0, 0x0000($s2) ## 00000000 /* 00D44 80AA26E4 8E2302C0 */ lw $v1, 0x02C0($s1) ## 000002C0 /* 00D48 80AA26E8 3C08DB06 */ lui $t0, 0xDB06 ## $t0 = DB060000 @@ -35,21 +35,21 @@ glabel EnMa2_Draw /* 00D5C 80AA26FC 86090210 */ lh $t1, 0x0210($s0) ## 00000210 /* 00D60 80AA2700 3C0480AA */ lui $a0, %hi(D_80AA28B4) ## $a0 = 80AA0000 /* 00D64 80AA2704 3C068016 */ lui $a2, 0x8016 ## $a2 = 80160000 -/* 00D68 80AA2708 00095080 */ sll $t2, $t1, 2 -/* 00D6C 80AA270C 008A2021 */ addu $a0, $a0, $t2 -/* 00D70 80AA2710 8C8428B4 */ lw $a0, %lo(D_80AA28B4)($a0) +/* 00D68 80AA2708 00095080 */ sll $t2, $t1, 2 +/* 00D6C 80AA270C 008A2021 */ addu $a0, $a0, $t2 +/* 00D70 80AA2710 8C8428B4 */ lw $a0, %lo(D_80AA28B4)($a0) /* 00D74 80AA2714 24C66FA8 */ addiu $a2, $a2, 0x6FA8 ## $a2 = 80166FA8 /* 00D78 80AA2718 3C0500FF */ lui $a1, 0x00FF ## $a1 = 00FF0000 -/* 00D7C 80AA271C 00046100 */ sll $t4, $a0, 4 -/* 00D80 80AA2720 000C6F02 */ srl $t5, $t4, 28 -/* 00D84 80AA2724 000D7080 */ sll $t6, $t5, 2 -/* 00D88 80AA2728 00CE7821 */ addu $t7, $a2, $t6 +/* 00D7C 80AA271C 00046100 */ sll $t4, $a0, 4 +/* 00D80 80AA2720 000C6F02 */ srl $t5, $t4, 28 +/* 00D84 80AA2724 000D7080 */ sll $t6, $t5, 2 +/* 00D88 80AA2728 00CE7821 */ addu $t7, $a2, $t6 /* 00D8C 80AA272C 8DF80000 */ lw $t8, 0x0000($t7) ## 00000000 /* 00D90 80AA2730 34A5FFFF */ ori $a1, $a1, 0xFFFF ## $a1 = 00FFFFFF -/* 00D94 80AA2734 00855824 */ and $t3, $a0, $a1 +/* 00D94 80AA2734 00855824 */ and $t3, $a0, $a1 /* 00D98 80AA2738 3C078000 */ lui $a3, 0x8000 ## $a3 = 80000000 -/* 00D9C 80AA273C 0178C821 */ addu $t9, $t3, $t8 -/* 00DA0 80AA2740 03274021 */ addu $t0, $t9, $a3 +/* 00D9C 80AA273C 0178C821 */ addu $t9, $t3, $t8 +/* 00DA0 80AA2740 03274021 */ addu $t0, $t9, $a3 /* 00DA4 80AA2744 AC680004 */ sw $t0, 0x0004($v1) ## 00000004 /* 00DA8 80AA2748 8E2302C0 */ lw $v1, 0x02C0($s1) ## 000002C0 /* 00DAC 80AA274C 3C0ADB06 */ lui $t2, 0xDB06 ## $t2 = DB060000 @@ -59,41 +59,41 @@ glabel EnMa2_Draw /* 00DBC 80AA275C AC6A0000 */ sw $t2, 0x0000($v1) ## 00000000 /* 00DC0 80AA2760 860C020E */ lh $t4, 0x020E($s0) ## 0000020E /* 00DC4 80AA2764 3C0480AA */ lui $a0, %hi(D_80AA28C0) ## $a0 = 80AA0000 -/* 00DC8 80AA2768 000C6880 */ sll $t5, $t4, 2 -/* 00DCC 80AA276C 008D2021 */ addu $a0, $a0, $t5 -/* 00DD0 80AA2770 8C8428C0 */ lw $a0, %lo(D_80AA28C0)($a0) +/* 00DC8 80AA2768 000C6880 */ sll $t5, $t4, 2 +/* 00DCC 80AA276C 008D2021 */ addu $a0, $a0, $t5 +/* 00DD0 80AA2770 8C8428C0 */ lw $a0, %lo(D_80AA28C0)($a0) /* 00DD4 80AA2774 3C0D80AA */ lui $t5, %hi(func_80AA2590) ## $t5 = 80AA0000 /* 00DD8 80AA2778 3C0C80AA */ lui $t4, %hi(func_80AA2354) ## $t4 = 80AA0000 -/* 00DDC 80AA277C 00047900 */ sll $t7, $a0, 4 -/* 00DE0 80AA2780 000F5F02 */ srl $t3, $t7, 28 -/* 00DE4 80AA2784 000BC080 */ sll $t8, $t3, 2 -/* 00DE8 80AA2788 00D8C821 */ addu $t9, $a2, $t8 +/* 00DDC 80AA277C 00047900 */ sll $t7, $a0, 4 +/* 00DE0 80AA2780 000F5F02 */ srl $t3, $t7, 28 +/* 00DE4 80AA2784 000BC080 */ sll $t8, $t3, 2 +/* 00DE8 80AA2788 00D8C821 */ addu $t9, $a2, $t8 /* 00DEC 80AA278C 8F280000 */ lw $t0, 0x0000($t9) ## 00000008 -/* 00DF0 80AA2790 00857024 */ and $t6, $a0, $a1 +/* 00DF0 80AA2790 00857024 */ and $t6, $a0, $a1 /* 00DF4 80AA2794 258C2354 */ addiu $t4, $t4, %lo(func_80AA2354) ## $t4 = 80AA2354 -/* 00DF8 80AA2798 01C84821 */ addu $t1, $t6, $t0 -/* 00DFC 80AA279C 01275021 */ addu $t2, $t1, $a3 +/* 00DF8 80AA2798 01C84821 */ addu $t1, $t6, $t0 +/* 00DFC 80AA279C 01275021 */ addu $t2, $t1, $a3 /* 00E00 80AA27A0 AC6A0004 */ sw $t2, 0x0004($v1) ## 00000004 /* 00E04 80AA27A4 9207014E */ lbu $a3, 0x014E($s0) ## 0000014E /* 00E08 80AA27A8 8E06016C */ lw $a2, 0x016C($s0) ## 0000016C /* 00E0C 80AA27AC 8E050150 */ lw $a1, 0x0150($s0) ## 00000150 /* 00E10 80AA27B0 25AD2590 */ addiu $t5, $t5, %lo(func_80AA2590) ## $t5 = 80AA2590 -/* 00E14 80AA27B4 AFAD0014 */ sw $t5, 0x0014($sp) -/* 00E18 80AA27B8 AFB00018 */ sw $s0, 0x0018($sp) -/* 00E1C 80AA27BC AFAC0010 */ sw $t4, 0x0010($sp) -/* 00E20 80AA27C0 0C0286B2 */ jal func_800A1AC8 +/* 00E14 80AA27B4 AFAD0014 */ sw $t5, 0x0014($sp) +/* 00E18 80AA27B8 AFB00018 */ sw $s0, 0x0018($sp) +/* 00E1C 80AA27BC AFAC0010 */ sw $t4, 0x0010($sp) +/* 00E20 80AA27C0 0C0286B2 */ jal SkelAnime_DrawSV /* 00E24 80AA27C4 02402025 */ or $a0, $s2, $zero ## $a0 = 00000000 /* 00E28 80AA27C8 3C0680AA */ lui $a2, %hi(D_80AA2900) ## $a2 = 80AA0000 /* 00E2C 80AA27CC 24C62900 */ addiu $a2, $a2, %lo(D_80AA2900) ## $a2 = 80AA2900 /* 00E30 80AA27D0 27A40044 */ addiu $a0, $sp, 0x0044 ## $a0 = FFFFFFDC /* 00E34 80AA27D4 8E450000 */ lw $a1, 0x0000($s2) ## 00000000 -/* 00E38 80AA27D8 0C031AD5 */ jal func_800C6B54 +/* 00E38 80AA27D8 0C031AD5 */ jal Graph_CloseDisps /* 00E3C 80AA27DC 240703DE */ addiu $a3, $zero, 0x03DE ## $a3 = 000003DE -/* 00E40 80AA27E0 8FBF0034 */ lw $ra, 0x0034($sp) -/* 00E44 80AA27E4 8FB00028 */ lw $s0, 0x0028($sp) -/* 00E48 80AA27E8 8FB1002C */ lw $s1, 0x002C($sp) -/* 00E4C 80AA27EC 8FB20030 */ lw $s2, 0x0030($sp) -/* 00E50 80AA27F0 03E00008 */ jr $ra +/* 00E40 80AA27E0 8FBF0034 */ lw $ra, 0x0034($sp) +/* 00E44 80AA27E4 8FB00028 */ lw $s0, 0x0028($sp) +/* 00E48 80AA27E8 8FB1002C */ lw $s1, 0x002C($sp) +/* 00E4C 80AA27EC 8FB20030 */ lw $s2, 0x0030($sp) +/* 00E50 80AA27F0 03E00008 */ jr $ra /* 00E54 80AA27F4 27BD0068 */ addiu $sp, $sp, 0x0068 ## $sp = 00000000 /* 00E58 80AA27F8 00000000 */ nop /* 00E5C 80AA27FC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ma2/EnMa2_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Ma2/EnMa2_Init.s index b04c3041f1..d564306d4a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ma2/EnMa2_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ma2/EnMa2_Init.s @@ -1,123 +1,123 @@ glabel EnMa2_Init /* 0049C 80AA1E3C 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 -/* 004A0 80AA1E40 AFB00028 */ sw $s0, 0x0028($sp) +/* 004A0 80AA1E40 AFB00028 */ sw $s0, 0x0028($sp) /* 004A4 80AA1E44 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 004A8 80AA1E48 AFBF002C */ sw $ra, 0x002C($sp) -/* 004AC 80AA1E4C AFA50044 */ sw $a1, 0x0044($sp) +/* 004A8 80AA1E48 AFBF002C */ sw $ra, 0x002C($sp) +/* 004AC 80AA1E4C AFA50044 */ sw $a1, 0x0044($sp) /* 004B0 80AA1E50 3C068003 */ lui $a2, 0x8003 ## $a2 = 80030000 /* 004B4 80AA1E54 24C6B5EC */ addiu $a2, $a2, 0xB5EC ## $a2 = 8002B5EC /* 004B8 80AA1E58 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 /* 004BC 80AA1E5C 248400B4 */ addiu $a0, $a0, 0x00B4 ## $a0 = 000000B4 /* 004C0 80AA1E60 0C00AC78 */ jal ActorShape_Init - + /* 004C4 80AA1E64 3C074190 */ lui $a3, 0x4190 ## $a3 = 41900000 /* 004C8 80AA1E68 3C060601 */ lui $a2, 0x0601 ## $a2 = 06010000 /* 004CC 80AA1E6C 24C68D90 */ addiu $a2, $a2, 0x8D90 ## $a2 = 06008D90 -/* 004D0 80AA1E70 8FA40044 */ lw $a0, 0x0044($sp) +/* 004D0 80AA1E70 8FA40044 */ lw $a0, 0x0044($sp) /* 004D4 80AA1E74 2605014C */ addiu $a1, $s0, 0x014C ## $a1 = 0000014C /* 004D8 80AA1E78 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 004DC 80AA1E7C AFA00010 */ sw $zero, 0x0010($sp) -/* 004E0 80AA1E80 AFA00014 */ sw $zero, 0x0014($sp) -/* 004E4 80AA1E84 0C0291BE */ jal func_800A46F8 -/* 004E8 80AA1E88 AFA00018 */ sw $zero, 0x0018($sp) +/* 004DC 80AA1E7C AFA00010 */ sw $zero, 0x0010($sp) +/* 004E0 80AA1E80 AFA00014 */ sw $zero, 0x0014($sp) +/* 004E4 80AA1E84 0C0291BE */ jal SkelAnime_InitSV +/* 004E8 80AA1E88 AFA00018 */ sw $zero, 0x0018($sp) /* 004EC 80AA1E8C 26050194 */ addiu $a1, $s0, 0x0194 ## $a1 = 00000194 -/* 004F0 80AA1E90 AFA50030 */ sw $a1, 0x0030($sp) +/* 004F0 80AA1E90 AFA50030 */ sw $a1, 0x0030($sp) /* 004F4 80AA1E94 0C0170D9 */ jal ActorCollider_AllocCylinder - -/* 004F8 80AA1E98 8FA40044 */ lw $a0, 0x0044($sp) + +/* 004F8 80AA1E98 8FA40044 */ lw $a0, 0x0044($sp) /* 004FC 80AA1E9C 3C0780AA */ lui $a3, %hi(D_80AA2820) ## $a3 = 80AA0000 -/* 00500 80AA1EA0 8FA50030 */ lw $a1, 0x0030($sp) +/* 00500 80AA1EA0 8FA50030 */ lw $a1, 0x0030($sp) /* 00504 80AA1EA4 24E72820 */ addiu $a3, $a3, %lo(D_80AA2820) ## $a3 = 80AA2820 -/* 00508 80AA1EA8 8FA40044 */ lw $a0, 0x0044($sp) +/* 00508 80AA1EA8 8FA40044 */ lw $a0, 0x0044($sp) /* 0050C 80AA1EAC 0C01712B */ jal ActorCollider_InitCylinder - + /* 00510 80AA1EB0 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 00514 80AA1EB4 0C016C80 */ jal CollisionBtlTbl_Get - + /* 00518 80AA1EB8 24040016 */ addiu $a0, $zero, 0x0016 ## $a0 = 00000016 /* 0051C 80AA1EBC 3C0680AA */ lui $a2, %hi(D_80AA284C) ## $a2 = 80AA0000 /* 00520 80AA1EC0 24C6284C */ addiu $a2, $a2, %lo(D_80AA284C) ## $a2 = 80AA284C /* 00524 80AA1EC4 26040098 */ addiu $a0, $s0, 0x0098 ## $a0 = 00000098 -/* 00528 80AA1EC8 0C0187BF */ jal func_80061EFC +/* 00528 80AA1EC8 0C0187BF */ jal func_80061EFC /* 0052C 80AA1ECC 00402825 */ or $a1, $v0, $zero ## $a1 = 00000000 /* 00530 80AA1ED0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00534 80AA1ED4 0C2A86D6 */ jal func_80AA1B58 -/* 00538 80AA1ED8 8FA50044 */ lw $a1, 0x0044($sp) -/* 0053C 80AA1EDC 10400027 */ beq $v0, $zero, .L80AA1F7C +/* 00534 80AA1ED4 0C2A86D6 */ jal func_80AA1B58 +/* 00538 80AA1ED8 8FA50044 */ lw $a1, 0x0044($sp) +/* 0053C 80AA1EDC 10400027 */ beq $v0, $zero, .L80AA1F7C /* 00540 80AA1EE0 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 00544 80AA1EE4 10410009 */ beq $v0, $at, .L80AA1F0C +/* 00544 80AA1EE4 10410009 */ beq $v0, $at, .L80AA1F0C /* 00548 80AA1EE8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 0054C 80AA1EEC 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 00550 80AA1EF0 1041000C */ beq $v0, $at, .L80AA1F24 +/* 00550 80AA1EF0 1041000C */ beq $v0, $at, .L80AA1F24 /* 00554 80AA1EF4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 00558 80AA1EF8 24010003 */ addiu $at, $zero, 0x0003 ## $at = 00000003 -/* 0055C 80AA1EFC 1041000F */ beq $v0, $at, .L80AA1F3C +/* 0055C 80AA1EFC 1041000F */ beq $v0, $at, .L80AA1F3C /* 00560 80AA1F00 3C188016 */ lui $t8, 0x8016 ## $t8 = 80160000 -/* 00564 80AA1F04 10000022 */ beq $zero, $zero, .L80AA1F90 +/* 00564 80AA1F04 10000022 */ beq $zero, $zero, .L80AA1F90 /* 00568 80AA1F08 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 .L80AA1F0C: -/* 0056C 80AA1F0C 0C2A8751 */ jal func_80AA1D44 +/* 0056C 80AA1F0C 0C2A8751 */ jal func_80AA1D44 /* 00570 80AA1F10 24050002 */ addiu $a1, $zero, 0x0002 ## $a1 = 00000002 /* 00574 80AA1F14 3C0E80AA */ lui $t6, %hi(func_80AA2018) ## $t6 = 80AA0000 /* 00578 80AA1F18 25CE2018 */ addiu $t6, $t6, %lo(func_80AA2018) ## $t6 = 80AA2018 -/* 0057C 80AA1F1C 1000001B */ beq $zero, $zero, .L80AA1F8C +/* 0057C 80AA1F1C 1000001B */ beq $zero, $zero, .L80AA1F8C /* 00580 80AA1F20 AE0E0190 */ sw $t6, 0x0190($s0) ## 00000190 .L80AA1F24: -/* 00584 80AA1F24 0C2A8751 */ jal func_80AA1D44 +/* 00584 80AA1F24 0C2A8751 */ jal func_80AA1D44 /* 00588 80AA1F28 24050003 */ addiu $a1, $zero, 0x0003 ## $a1 = 00000003 /* 0058C 80AA1F2C 3C0F80AA */ lui $t7, %hi(func_80AA204C) ## $t7 = 80AA0000 /* 00590 80AA1F30 25EF204C */ addiu $t7, $t7, %lo(func_80AA204C) ## $t7 = 80AA204C -/* 00594 80AA1F34 10000015 */ beq $zero, $zero, .L80AA1F8C +/* 00594 80AA1F34 10000015 */ beq $zero, $zero, .L80AA1F8C /* 00598 80AA1F38 AE0F0190 */ sw $t7, 0x0190($s0) ## 00000190 .L80AA1F3C: /* 0059C 80AA1F3C 9718F568 */ lhu $t8, -0x0A98($t8) ## FFFFF568 /* 005A0 80AA1F40 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 005A4 80AA1F44 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 005A8 80AA1F48 33192000 */ andi $t9, $t8, 0x2000 ## $t9 = 00000000 -/* 005AC 80AA1F4C 13200005 */ beq $t9, $zero, .L80AA1F64 +/* 005AC 80AA1F4C 13200005 */ beq $t9, $zero, .L80AA1F64 /* 005B0 80AA1F50 00000000 */ nop -/* 005B4 80AA1F54 0C2A8751 */ jal func_80AA1D44 +/* 005B4 80AA1F54 0C2A8751 */ jal func_80AA1D44 /* 005B8 80AA1F58 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 005BC 80AA1F5C 10000003 */ beq $zero, $zero, .L80AA1F6C +/* 005BC 80AA1F5C 10000003 */ beq $zero, $zero, .L80AA1F6C /* 005C0 80AA1F60 00000000 */ nop .L80AA1F64: -/* 005C4 80AA1F64 0C2A8751 */ jal func_80AA1D44 +/* 005C4 80AA1F64 0C2A8751 */ jal func_80AA1D44 /* 005C8 80AA1F68 24050003 */ addiu $a1, $zero, 0x0003 ## $a1 = 00000003 .L80AA1F6C: /* 005CC 80AA1F6C 3C0880AA */ lui $t0, %hi(func_80AA2018) ## $t0 = 80AA0000 /* 005D0 80AA1F70 25082018 */ addiu $t0, $t0, %lo(func_80AA2018) ## $t0 = 80AA2018 -/* 005D4 80AA1F74 10000005 */ beq $zero, $zero, .L80AA1F8C +/* 005D4 80AA1F74 10000005 */ beq $zero, $zero, .L80AA1F8C /* 005D8 80AA1F78 AE080190 */ sw $t0, 0x0190($s0) ## 00000190 .L80AA1F7C: /* 005DC 80AA1F7C 0C00B55C */ jal Actor_Kill - + /* 005E0 80AA1F80 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 005E4 80AA1F84 10000012 */ beq $zero, $zero, .L80AA1FD0 -/* 005E8 80AA1F88 8FBF002C */ lw $ra, 0x002C($sp) +/* 005E4 80AA1F84 10000012 */ beq $zero, $zero, .L80AA1FD0 +/* 005E8 80AA1F88 8FBF002C */ lw $ra, 0x002C($sp) .L80AA1F8C: /* 005EC 80AA1F8C 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 .L80AA1F90: /* 005F0 80AA1F90 24090004 */ addiu $t1, $zero, 0x0004 ## $t1 = 00000004 -/* 005F4 80AA1F94 AFA90014 */ sw $t1, 0x0014($sp) -/* 005F8 80AA1F98 44060000 */ mfc1 $a2, $f0 -/* 005FC 80AA1F9C 44070000 */ mfc1 $a3, $f0 -/* 00600 80AA1FA0 8FA40044 */ lw $a0, 0x0044($sp) +/* 005F4 80AA1F94 AFA90014 */ sw $t1, 0x0014($sp) +/* 005F8 80AA1F98 44060000 */ mfc1 $a2, $f0 +/* 005FC 80AA1F9C 44070000 */ mfc1 $a3, $f0 +/* 00600 80AA1FA0 8FA40044 */ lw $a0, 0x0044($sp) /* 00604 80AA1FA4 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 00608 80AA1FA8 0C00B92D */ jal func_8002E4B4 -/* 0060C 80AA1FAC E7A00010 */ swc1 $f0, 0x0010($sp) +/* 00608 80AA1FA8 0C00B92D */ jal func_8002E4B4 +/* 0060C 80AA1FAC E7A00010 */ swc1 $f0, 0x0010($sp) /* 00610 80AA1FB0 3C053C23 */ lui $a1, 0x3C23 ## $a1 = 3C230000 /* 00614 80AA1FB4 34A5D70A */ ori $a1, $a1, 0xD70A ## $a1 = 3C23D70A /* 00618 80AA1FB8 0C00B58B */ jal Actor_SetScale - + /* 0061C 80AA1FBC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 00620 80AA1FC0 240A0006 */ addiu $t2, $zero, 0x0006 ## $t2 = 00000006 /* 00624 80AA1FC4 A20A001F */ sb $t2, 0x001F($s0) ## 0000001F /* 00628 80AA1FC8 A60001E0 */ sh $zero, 0x01E0($s0) ## 000001E0 -/* 0062C 80AA1FCC 8FBF002C */ lw $ra, 0x002C($sp) +/* 0062C 80AA1FCC 8FBF002C */ lw $ra, 0x002C($sp) .L80AA1FD0: -/* 00630 80AA1FD0 8FB00028 */ lw $s0, 0x0028($sp) +/* 00630 80AA1FD0 8FB00028 */ lw $s0, 0x0028($sp) /* 00634 80AA1FD4 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 -/* 00638 80AA1FD8 03E00008 */ jr $ra +/* 00638 80AA1FD8 03E00008 */ jr $ra /* 0063C 80AA1FDC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ma2/func_80AA19A0.s b/asm/non_matchings/overlays/actors/ovl_En_Ma2/func_80AA19A0.s index f6e577250c..937efa5d6c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ma2/func_80AA19A0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ma2/func_80AA19A0.s @@ -2,7 +2,7 @@ glabel func_80AA19A0 /* 00000 80AA19A0 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 00004 80AA19A4 AFBF0014 */ sw $ra, 0x0014($sp) /* 00008 80AA19A8 AFA5001C */ sw $a1, 0x001C($sp) -/* 0000C 80AA19AC 0C01B0D8 */ jal func_8006C360 +/* 0000C 80AA19AC 0C01B0D8 */ jal Text_GetFaceReaction /* 00010 80AA19B0 24050017 */ addiu $a1, $zero, 0x0017 ## $a1 = 00000017 /* 00014 80AA19B4 10400003 */ beq $v0, $zero, .L80AA19C4 /* 00018 80AA19B8 3043FFFF */ andi $v1, $v0, 0xFFFF ## $v1 = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ma2/func_80AA1D44.s b/asm/non_matchings/overlays/actors/ovl_En_Ma2/func_80AA1D44.s index c89ec2dd45..22a2238b2d 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ma2/func_80AA1D44.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ma2/func_80AA1D44.s @@ -2,32 +2,32 @@ glabel func_80AA1D44 /* 003A4 80AA1D44 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 /* 003A8 80AA1D48 3C0F80AA */ lui $t7, %hi(D_80AA2858) ## $t7 = 80AA0000 /* 003AC 80AA1D4C 25EF2858 */ addiu $t7, $t7, %lo(D_80AA2858) ## $t7 = 80AA2858 -/* 003B0 80AA1D50 00057100 */ sll $t6, $a1, 4 -/* 003B4 80AA1D54 AFBF0024 */ sw $ra, 0x0024($sp) -/* 003B8 80AA1D58 AFA40030 */ sw $a0, 0x0030($sp) -/* 003BC 80AA1D5C 01CF1821 */ addu $v1, $t6, $t7 +/* 003B0 80AA1D50 00057100 */ sll $t6, $a1, 4 +/* 003B4 80AA1D54 AFBF0024 */ sw $ra, 0x0024($sp) +/* 003B8 80AA1D58 AFA40030 */ sw $a0, 0x0030($sp) +/* 003BC 80AA1D5C 01CF1821 */ addu $v1, $t6, $t7 /* 003C0 80AA1D60 8C640000 */ lw $a0, 0x0000($v1) ## 00000000 /* 003C4 80AA1D64 0C028800 */ jal SkelAnime_GetFrameCount - -/* 003C8 80AA1D68 AFA30028 */ sw $v1, 0x0028($sp) + +/* 003C8 80AA1D68 AFA30028 */ sw $v1, 0x0028($sp) /* 003CC 80AA1D6C 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 -/* 003D0 80AA1D70 8FA30028 */ lw $v1, 0x0028($sp) -/* 003D4 80AA1D74 8FA40030 */ lw $a0, 0x0030($sp) -/* 003D8 80AA1D78 468021A0 */ cvt.s.w $f6, $f4 +/* 003D0 80AA1D70 8FA30028 */ lw $v1, 0x0028($sp) +/* 003D4 80AA1D74 8FA40030 */ lw $a0, 0x0030($sp) +/* 003D8 80AA1D78 468021A0 */ cvt.s.w $f6, $f4 /* 003DC 80AA1D7C 90780008 */ lbu $t8, 0x0008($v1) ## 00000008 /* 003E0 80AA1D80 C468000C */ lwc1 $f8, 0x000C($v1) ## 0000000C /* 003E4 80AA1D84 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 003E8 80AA1D88 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 /* 003EC 80AA1D8C 8C650000 */ lw $a1, 0x0000($v1) ## 00000000 -/* 003F0 80AA1D90 E7A60010 */ swc1 $f6, 0x0010($sp) +/* 003F0 80AA1D90 E7A60010 */ swc1 $f6, 0x0010($sp) /* 003F4 80AA1D94 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 003F8 80AA1D98 AFB80014 */ sw $t8, 0x0014($sp) -/* 003FC 80AA1D9C 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 00400 80AA1DA0 E7A80018 */ swc1 $f8, 0x0018($sp) -/* 00404 80AA1DA4 8FBF0024 */ lw $ra, 0x0024($sp) +/* 003F8 80AA1D98 AFB80014 */ sw $t8, 0x0014($sp) +/* 003FC 80AA1D9C 0C029468 */ jal SkelAnime_ChangeAnim + +/* 00400 80AA1DA0 E7A80018 */ swc1 $f8, 0x0018($sp) +/* 00404 80AA1DA4 8FBF0024 */ lw $ra, 0x0024($sp) /* 00408 80AA1DA8 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 0040C 80AA1DAC 03E00008 */ jr $ra +/* 0040C 80AA1DAC 03E00008 */ jr $ra /* 00410 80AA1DB0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ma2/func_80AA2590.s b/asm/non_matchings/overlays/actors/ovl_En_Ma2/func_80AA2590.s index 4f64c378e2..4ae39d33ff 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ma2/func_80AA2590.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ma2/func_80AA2590.s @@ -20,7 +20,7 @@ glabel func_80AA2590 /* 00C38 80AA25D8 24070388 */ addiu $a3, $zero, 0x0388 ## $a3 = 00000388 /* 00C3C 80AA25DC 8D050000 */ lw $a1, 0x0000($t0) ## 00000000 /* 00C40 80AA25E0 27A40024 */ addiu $a0, $sp, 0x0024 ## $a0 = FFFFFFDC -/* 00C44 80AA25E4 0C031AB1 */ jal func_800C6AC4 +/* 00C44 80AA25E4 0C031AB1 */ jal Graph_OpenDisps /* 00C48 80AA25E8 AFA50034 */ sw $a1, 0x0034($sp) /* 00C4C 80AA25EC 8FA9004C */ lw $t1, 0x004C($sp) /* 00C50 80AA25F0 8FA50058 */ lw $a1, 0x0058($sp) @@ -55,7 +55,7 @@ glabel func_80AA2590 .L80AA265C: /* 00CBC 80AA265C 27A40024 */ addiu $a0, $sp, 0x0024 ## $a0 = FFFFFFDC /* 00CC0 80AA2660 2407039F */ addiu $a3, $zero, 0x039F ## $a3 = 0000039F -/* 00CC4 80AA2664 0C031AD5 */ jal func_800C6B54 +/* 00CC4 80AA2664 0C031AD5 */ jal Graph_CloseDisps /* 00CC8 80AA2668 8F250000 */ lw $a1, 0x0000($t9) ## 00000000 /* 00CCC 80AA266C 8FBF0014 */ lw $ra, 0x0014($sp) /* 00CD0 80AA2670 27BD0048 */ addiu $sp, $sp, 0x0048 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ma3/EnMa3_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Ma3/EnMa3_Destroy.s index cffcb68aec..0f09415115 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ma3/EnMa3_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ma3/EnMa3_Destroy.s @@ -1,18 +1,18 @@ glabel EnMa3_Destroy /* 00728 80AA31C8 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 0072C 80AA31CC AFBF0014 */ sw $ra, 0x0014($sp) -/* 00730 80AA31D0 AFA40018 */ sw $a0, 0x0018($sp) -/* 00734 80AA31D4 AFA5001C */ sw $a1, 0x001C($sp) -/* 00738 80AA31D8 0C0295BC */ jal func_800A56F0 +/* 0072C 80AA31CC AFBF0014 */ sw $ra, 0x0014($sp) +/* 00730 80AA31D0 AFA40018 */ sw $a0, 0x0018($sp) +/* 00734 80AA31D4 AFA5001C */ sw $a1, 0x001C($sp) +/* 00738 80AA31D8 0C0295BC */ jal SkelAnime_Free /* 0073C 80AA31DC 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 00740 80AA31E0 8FA50018 */ lw $a1, 0x0018($sp) -/* 00744 80AA31E4 8FA4001C */ lw $a0, 0x001C($sp) +/* 00740 80AA31E0 8FA50018 */ lw $a1, 0x0018($sp) +/* 00744 80AA31E4 8FA4001C */ lw $a0, 0x001C($sp) /* 00748 80AA31E8 0C0170EB */ jal ActorCollider_FreeCylinder - + /* 0074C 80AA31EC 24A50194 */ addiu $a1, $a1, 0x0194 ## $a1 = 00000194 -/* 00750 80AA31F0 8FBF0014 */ lw $ra, 0x0014($sp) +/* 00750 80AA31F0 8FBF0014 */ lw $ra, 0x0014($sp) /* 00754 80AA31F4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00758 80AA31F8 03E00008 */ jr $ra +/* 00758 80AA31F8 03E00008 */ jr $ra /* 0075C 80AA31FC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ma3/EnMa3_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Ma3/EnMa3_Draw.s index e40265f4dc..0d2015bacf 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ma3/EnMa3_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ma3/EnMa3_Draw.s @@ -1,30 +1,30 @@ glabel EnMa3_Draw /* 00BCC 80AA366C 27BDFF98 */ addiu $sp, $sp, 0xFF98 ## $sp = FFFFFF98 -/* 00BD0 80AA3670 AFB20030 */ sw $s2, 0x0030($sp) +/* 00BD0 80AA3670 AFB20030 */ sw $s2, 0x0030($sp) /* 00BD4 80AA3674 00A09025 */ or $s2, $a1, $zero ## $s2 = 00000000 -/* 00BD8 80AA3678 AFBF0034 */ sw $ra, 0x0034($sp) -/* 00BDC 80AA367C AFB1002C */ sw $s1, 0x002C($sp) -/* 00BE0 80AA3680 AFB00028 */ sw $s0, 0x0028($sp) +/* 00BD8 80AA3678 AFBF0034 */ sw $ra, 0x0034($sp) +/* 00BDC 80AA367C AFB1002C */ sw $s1, 0x002C($sp) +/* 00BE0 80AA3680 AFB00028 */ sw $s0, 0x0028($sp) /* 00BE4 80AA3684 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 /* 00BE8 80AA3688 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 00BEC 80AA368C 3C0680AA */ lui $a2, %hi(D_80AA38E0) ## $a2 = 80AA0000 /* 00BF0 80AA3690 24C638E0 */ addiu $a2, $a2, %lo(D_80AA38E0) ## $a2 = 80AA38E0 /* 00BF4 80AA3694 27A40044 */ addiu $a0, $sp, 0x0044 ## $a0 = FFFFFFDC /* 00BF8 80AA3698 240703D2 */ addiu $a3, $zero, 0x03D2 ## $a3 = 000003D2 -/* 00BFC 80AA369C 0C031AB1 */ jal func_800C6AC4 +/* 00BFC 80AA369C 0C031AB1 */ jal Graph_OpenDisps /* 00C00 80AA36A0 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 /* 00C04 80AA36A4 864E07A0 */ lh $t6, 0x07A0($s2) ## 000007A0 /* 00C08 80AA36A8 26040024 */ addiu $a0, $s0, 0x0024 ## $a0 = 00000024 -/* 00C0C 80AA36AC 000E7880 */ sll $t7, $t6, 2 -/* 00C10 80AA36B0 024FC021 */ addu $t8, $s2, $t7 +/* 00C0C 80AA36AC 000E7880 */ sll $t7, $t6, 2 +/* 00C10 80AA36B0 024FC021 */ addu $t8, $s2, $t7 /* 00C14 80AA36B4 8F020790 */ lw $v0, 0x0790($t8) ## 00000790 /* 00C18 80AA36B8 0C01E00A */ jal Math_Vec3f_DistXZ - + /* 00C1C 80AA36BC 2445005C */ addiu $a1, $v0, 0x005C ## $a1 = 0000005C -/* 00C20 80AA36C0 46000306 */ mov.s $f12, $f0 -/* 00C24 80AA36C4 0C03D89A */ jal func_800F6268 +/* 00C20 80AA36C0 46000306 */ mov.s $f12, $f0 +/* 00C24 80AA36C4 0C03D89A */ jal func_800F6268 /* 00C28 80AA36C8 2405002F */ addiu $a1, $zero, 0x002F ## $a1 = 0000002F -/* 00C2C 80AA36CC 0C024F46 */ jal func_80093D18 +/* 00C2C 80AA36CC 0C024F46 */ jal func_80093D18 /* 00C30 80AA36D0 8E440000 */ lw $a0, 0x0000($s2) ## 00000000 /* 00C34 80AA36D4 8E2302C0 */ lw $v1, 0x02C0($s1) ## 000002C0 /* 00C38 80AA36D8 3C08DB06 */ lui $t0, 0xDB06 ## $t0 = DB060000 @@ -35,21 +35,21 @@ glabel EnMa3_Draw /* 00C4C 80AA36EC 86090210 */ lh $t1, 0x0210($s0) ## 00000210 /* 00C50 80AA36F0 3C0480AA */ lui $a0, %hi(D_80AA38A4) ## $a0 = 80AA0000 /* 00C54 80AA36F4 3C068016 */ lui $a2, 0x8016 ## $a2 = 80160000 -/* 00C58 80AA36F8 00095080 */ sll $t2, $t1, 2 -/* 00C5C 80AA36FC 008A2021 */ addu $a0, $a0, $t2 -/* 00C60 80AA3700 8C8438A4 */ lw $a0, %lo(D_80AA38A4)($a0) +/* 00C58 80AA36F8 00095080 */ sll $t2, $t1, 2 +/* 00C5C 80AA36FC 008A2021 */ addu $a0, $a0, $t2 +/* 00C60 80AA3700 8C8438A4 */ lw $a0, %lo(D_80AA38A4)($a0) /* 00C64 80AA3704 24C66FA8 */ addiu $a2, $a2, 0x6FA8 ## $a2 = 80166FA8 /* 00C68 80AA3708 3C0500FF */ lui $a1, 0x00FF ## $a1 = 00FF0000 -/* 00C6C 80AA370C 00046100 */ sll $t4, $a0, 4 -/* 00C70 80AA3710 000C6F02 */ srl $t5, $t4, 28 -/* 00C74 80AA3714 000D7080 */ sll $t6, $t5, 2 -/* 00C78 80AA3718 00CE7821 */ addu $t7, $a2, $t6 +/* 00C6C 80AA370C 00046100 */ sll $t4, $a0, 4 +/* 00C70 80AA3710 000C6F02 */ srl $t5, $t4, 28 +/* 00C74 80AA3714 000D7080 */ sll $t6, $t5, 2 +/* 00C78 80AA3718 00CE7821 */ addu $t7, $a2, $t6 /* 00C7C 80AA371C 8DF80000 */ lw $t8, 0x0000($t7) ## 00000000 /* 00C80 80AA3720 34A5FFFF */ ori $a1, $a1, 0xFFFF ## $a1 = 00FFFFFF -/* 00C84 80AA3724 00855824 */ and $t3, $a0, $a1 +/* 00C84 80AA3724 00855824 */ and $t3, $a0, $a1 /* 00C88 80AA3728 3C078000 */ lui $a3, 0x8000 ## $a3 = 80000000 -/* 00C8C 80AA372C 0178C821 */ addu $t9, $t3, $t8 -/* 00C90 80AA3730 03274021 */ addu $t0, $t9, $a3 +/* 00C8C 80AA372C 0178C821 */ addu $t9, $t3, $t8 +/* 00C90 80AA3730 03274021 */ addu $t0, $t9, $a3 /* 00C94 80AA3734 AC680004 */ sw $t0, 0x0004($v1) ## 00000004 /* 00C98 80AA3738 8E2302C0 */ lw $v1, 0x02C0($s1) ## 000002C0 /* 00C9C 80AA373C 3C0ADB06 */ lui $t2, 0xDB06 ## $t2 = DB060000 @@ -59,41 +59,41 @@ glabel EnMa3_Draw /* 00CAC 80AA374C AC6A0000 */ sw $t2, 0x0000($v1) ## 00000000 /* 00CB0 80AA3750 860C020E */ lh $t4, 0x020E($s0) ## 0000020E /* 00CB4 80AA3754 3C0480AA */ lui $a0, %hi(D_80AA38B0) ## $a0 = 80AA0000 -/* 00CB8 80AA3758 000C6880 */ sll $t5, $t4, 2 -/* 00CBC 80AA375C 008D2021 */ addu $a0, $a0, $t5 -/* 00CC0 80AA3760 8C8438B0 */ lw $a0, %lo(D_80AA38B0)($a0) +/* 00CB8 80AA3758 000C6880 */ sll $t5, $t4, 2 +/* 00CBC 80AA375C 008D2021 */ addu $a0, $a0, $t5 +/* 00CC0 80AA3760 8C8438B0 */ lw $a0, %lo(D_80AA38B0)($a0) /* 00CC4 80AA3764 3C0D80AA */ lui $t5, %hi(func_80AA3580) ## $t5 = 80AA0000 /* 00CC8 80AA3768 3C0C80AA */ lui $t4, %hi(func_80AA3344) ## $t4 = 80AA0000 -/* 00CCC 80AA376C 00047900 */ sll $t7, $a0, 4 -/* 00CD0 80AA3770 000F5F02 */ srl $t3, $t7, 28 -/* 00CD4 80AA3774 000BC080 */ sll $t8, $t3, 2 -/* 00CD8 80AA3778 00D8C821 */ addu $t9, $a2, $t8 +/* 00CCC 80AA376C 00047900 */ sll $t7, $a0, 4 +/* 00CD0 80AA3770 000F5F02 */ srl $t3, $t7, 28 +/* 00CD4 80AA3774 000BC080 */ sll $t8, $t3, 2 +/* 00CD8 80AA3778 00D8C821 */ addu $t9, $a2, $t8 /* 00CDC 80AA377C 8F280000 */ lw $t0, 0x0000($t9) ## 00000008 -/* 00CE0 80AA3780 00857024 */ and $t6, $a0, $a1 +/* 00CE0 80AA3780 00857024 */ and $t6, $a0, $a1 /* 00CE4 80AA3784 258C3344 */ addiu $t4, $t4, %lo(func_80AA3344) ## $t4 = 80AA3344 -/* 00CE8 80AA3788 01C84821 */ addu $t1, $t6, $t0 -/* 00CEC 80AA378C 01275021 */ addu $t2, $t1, $a3 +/* 00CE8 80AA3788 01C84821 */ addu $t1, $t6, $t0 +/* 00CEC 80AA378C 01275021 */ addu $t2, $t1, $a3 /* 00CF0 80AA3790 AC6A0004 */ sw $t2, 0x0004($v1) ## 00000004 /* 00CF4 80AA3794 9207014E */ lbu $a3, 0x014E($s0) ## 0000014E /* 00CF8 80AA3798 8E06016C */ lw $a2, 0x016C($s0) ## 0000016C /* 00CFC 80AA379C 8E050150 */ lw $a1, 0x0150($s0) ## 00000150 /* 00D00 80AA37A0 25AD3580 */ addiu $t5, $t5, %lo(func_80AA3580) ## $t5 = 80AA3580 -/* 00D04 80AA37A4 AFAD0014 */ sw $t5, 0x0014($sp) -/* 00D08 80AA37A8 AFB00018 */ sw $s0, 0x0018($sp) -/* 00D0C 80AA37AC AFAC0010 */ sw $t4, 0x0010($sp) -/* 00D10 80AA37B0 0C0286B2 */ jal func_800A1AC8 +/* 00D04 80AA37A4 AFAD0014 */ sw $t5, 0x0014($sp) +/* 00D08 80AA37A8 AFB00018 */ sw $s0, 0x0018($sp) +/* 00D0C 80AA37AC AFAC0010 */ sw $t4, 0x0010($sp) +/* 00D10 80AA37B0 0C0286B2 */ jal SkelAnime_DrawSV /* 00D14 80AA37B4 02402025 */ or $a0, $s2, $zero ## $a0 = 00000000 /* 00D18 80AA37B8 3C0680AA */ lui $a2, %hi(D_80AA38F0) ## $a2 = 80AA0000 /* 00D1C 80AA37BC 24C638F0 */ addiu $a2, $a2, %lo(D_80AA38F0) ## $a2 = 80AA38F0 /* 00D20 80AA37C0 27A40044 */ addiu $a0, $sp, 0x0044 ## $a0 = FFFFFFDC /* 00D24 80AA37C4 8E450000 */ lw $a1, 0x0000($s2) ## 00000000 -/* 00D28 80AA37C8 0C031AD5 */ jal func_800C6B54 +/* 00D28 80AA37C8 0C031AD5 */ jal Graph_CloseDisps /* 00D2C 80AA37CC 240703F5 */ addiu $a3, $zero, 0x03F5 ## $a3 = 000003F5 -/* 00D30 80AA37D0 8FBF0034 */ lw $ra, 0x0034($sp) -/* 00D34 80AA37D4 8FB00028 */ lw $s0, 0x0028($sp) -/* 00D38 80AA37D8 8FB1002C */ lw $s1, 0x002C($sp) -/* 00D3C 80AA37DC 8FB20030 */ lw $s2, 0x0030($sp) -/* 00D40 80AA37E0 03E00008 */ jr $ra +/* 00D30 80AA37D0 8FBF0034 */ lw $ra, 0x0034($sp) +/* 00D34 80AA37D4 8FB00028 */ lw $s0, 0x0028($sp) +/* 00D38 80AA37D8 8FB1002C */ lw $s1, 0x002C($sp) +/* 00D3C 80AA37DC 8FB20030 */ lw $s2, 0x0030($sp) +/* 00D40 80AA37E0 03E00008 */ jr $ra /* 00D44 80AA37E4 27BD0068 */ addiu $sp, $sp, 0x0068 ## $sp = 00000000 /* 00D48 80AA37E8 00000000 */ nop /* 00D4C 80AA37EC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ma3/EnMa3_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Ma3/EnMa3_Init.s index 21d11505b0..c7a11481a2 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ma3/EnMa3_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ma3/EnMa3_Init.s @@ -1,99 +1,99 @@ glabel EnMa3_Init /* 005D4 80AA3074 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 -/* 005D8 80AA3078 AFB00028 */ sw $s0, 0x0028($sp) +/* 005D8 80AA3078 AFB00028 */ sw $s0, 0x0028($sp) /* 005DC 80AA307C 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 005E0 80AA3080 AFBF002C */ sw $ra, 0x002C($sp) -/* 005E4 80AA3084 AFA50044 */ sw $a1, 0x0044($sp) +/* 005E0 80AA3080 AFBF002C */ sw $ra, 0x002C($sp) +/* 005E4 80AA3084 AFA50044 */ sw $a1, 0x0044($sp) /* 005E8 80AA3088 3C068003 */ lui $a2, 0x8003 ## $a2 = 80030000 /* 005EC 80AA308C 24C6B5EC */ addiu $a2, $a2, 0xB5EC ## $a2 = 8002B5EC /* 005F0 80AA3090 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 /* 005F4 80AA3094 248400B4 */ addiu $a0, $a0, 0x00B4 ## $a0 = 000000B4 /* 005F8 80AA3098 0C00AC78 */ jal ActorShape_Init - + /* 005FC 80AA309C 3C074190 */ lui $a3, 0x4190 ## $a3 = 41900000 /* 00600 80AA30A0 3C060601 */ lui $a2, 0x0601 ## $a2 = 06010000 /* 00604 80AA30A4 24C68D90 */ addiu $a2, $a2, 0x8D90 ## $a2 = 06008D90 -/* 00608 80AA30A8 8FA40044 */ lw $a0, 0x0044($sp) +/* 00608 80AA30A8 8FA40044 */ lw $a0, 0x0044($sp) /* 0060C 80AA30AC 2605014C */ addiu $a1, $s0, 0x014C ## $a1 = 0000014C /* 00610 80AA30B0 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 00614 80AA30B4 AFA00010 */ sw $zero, 0x0010($sp) -/* 00618 80AA30B8 AFA00014 */ sw $zero, 0x0014($sp) -/* 0061C 80AA30BC 0C0291BE */ jal func_800A46F8 -/* 00620 80AA30C0 AFA00018 */ sw $zero, 0x0018($sp) +/* 00614 80AA30B4 AFA00010 */ sw $zero, 0x0010($sp) +/* 00618 80AA30B8 AFA00014 */ sw $zero, 0x0014($sp) +/* 0061C 80AA30BC 0C0291BE */ jal SkelAnime_InitSV +/* 00620 80AA30C0 AFA00018 */ sw $zero, 0x0018($sp) /* 00624 80AA30C4 26050194 */ addiu $a1, $s0, 0x0194 ## $a1 = 00000194 -/* 00628 80AA30C8 AFA50030 */ sw $a1, 0x0030($sp) +/* 00628 80AA30C8 AFA50030 */ sw $a1, 0x0030($sp) /* 0062C 80AA30CC 0C0170D9 */ jal ActorCollider_AllocCylinder - -/* 00630 80AA30D0 8FA40044 */ lw $a0, 0x0044($sp) + +/* 00630 80AA30D0 8FA40044 */ lw $a0, 0x0044($sp) /* 00634 80AA30D4 3C0780AA */ lui $a3, %hi(D_80AA3810) ## $a3 = 80AA0000 -/* 00638 80AA30D8 8FA50030 */ lw $a1, 0x0030($sp) +/* 00638 80AA30D8 8FA50030 */ lw $a1, 0x0030($sp) /* 0063C 80AA30DC 24E73810 */ addiu $a3, $a3, %lo(D_80AA3810) ## $a3 = 80AA3810 -/* 00640 80AA30E0 8FA40044 */ lw $a0, 0x0044($sp) +/* 00640 80AA30E0 8FA40044 */ lw $a0, 0x0044($sp) /* 00644 80AA30E4 0C01712B */ jal ActorCollider_InitCylinder - + /* 00648 80AA30E8 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 0064C 80AA30EC 0C016C80 */ jal CollisionBtlTbl_Get /* 00650 80AA30F0 24040016 */ addiu $a0, $zero, 0x0016 ## $a0 = 00000016 /* 00654 80AA30F4 3C0680AA */ lui $a2, %hi(D_80AA383C) ## $a2 = 80AA0000 /* 00658 80AA30F8 24C6383C */ addiu $a2, $a2, %lo(D_80AA383C) ## $a2 = 80AA383C /* 0065C 80AA30FC 26040098 */ addiu $a0, $s0, 0x0098 ## $a0 = 00000098 -/* 00660 80AA3100 0C0187BF */ jal func_80061EFC +/* 00660 80AA3100 0C0187BF */ jal func_80061EFC /* 00664 80AA3104 00402825 */ or $a1, $v0, $zero ## $a1 = 00000000 /* 00668 80AA3108 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0066C 80AA310C 0C2A8BB2 */ jal func_80AA2EC8 -/* 00670 80AA3110 8FA50044 */ lw $a1, 0x0044($sp) -/* 00674 80AA3114 10400009 */ beq $v0, $zero, .L80AA313C +/* 0066C 80AA310C 0C2A8BB2 */ jal func_80AA2EC8 +/* 00670 80AA3110 8FA50044 */ lw $a1, 0x0044($sp) +/* 00674 80AA3114 10400009 */ beq $v0, $zero, .L80AA313C /* 00678 80AA3118 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 0067C 80AA311C 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 00680 80AA3120 1041000C */ beq $v0, $at, .L80AA3154 +/* 00680 80AA3120 1041000C */ beq $v0, $at, .L80AA3154 /* 00684 80AA3124 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 00688 80AA3128 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 0068C 80AA312C 1041000F */ beq $v0, $at, .L80AA316C +/* 0068C 80AA312C 1041000F */ beq $v0, $at, .L80AA316C /* 00690 80AA3130 00000000 */ nop -/* 00694 80AA3134 10000012 */ beq $zero, $zero, .L80AA3180 +/* 00694 80AA3134 10000012 */ beq $zero, $zero, .L80AA3180 /* 00698 80AA3138 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 .L80AA313C: -/* 0069C 80AA313C 0C2A8C01 */ jal func_80AA3004 +/* 0069C 80AA313C 0C2A8C01 */ jal func_80AA3004 /* 006A0 80AA3140 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 006A4 80AA3144 3C0E80AA */ lui $t6, %hi(func_80AA3200) ## $t6 = 80AA0000 /* 006A8 80AA3148 25CE3200 */ addiu $t6, $t6, %lo(func_80AA3200) ## $t6 = 80AA3200 -/* 006AC 80AA314C 1000000B */ beq $zero, $zero, .L80AA317C +/* 006AC 80AA314C 1000000B */ beq $zero, $zero, .L80AA317C /* 006B0 80AA3150 AE0E0190 */ sw $t6, 0x0190($s0) ## 00000190 .L80AA3154: -/* 006B4 80AA3154 0C2A8C01 */ jal func_80AA3004 +/* 006B4 80AA3154 0C2A8C01 */ jal func_80AA3004 /* 006B8 80AA3158 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 006BC 80AA315C 3C0F80AA */ lui $t7, %hi(func_80AA3200) ## $t7 = 80AA0000 /* 006C0 80AA3160 25EF3200 */ addiu $t7, $t7, %lo(func_80AA3200) ## $t7 = 80AA3200 -/* 006C4 80AA3164 10000005 */ beq $zero, $zero, .L80AA317C +/* 006C4 80AA3164 10000005 */ beq $zero, $zero, .L80AA317C /* 006C8 80AA3168 AE0F0190 */ sw $t7, 0x0190($s0) ## 00000190 .L80AA316C: /* 006CC 80AA316C 0C00B55C */ jal Actor_Kill - + /* 006D0 80AA3170 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 006D4 80AA3174 10000010 */ beq $zero, $zero, .L80AA31B8 -/* 006D8 80AA3178 8FBF002C */ lw $ra, 0x002C($sp) +/* 006D4 80AA3174 10000010 */ beq $zero, $zero, .L80AA31B8 +/* 006D8 80AA3178 8FBF002C */ lw $ra, 0x002C($sp) .L80AA317C: /* 006DC 80AA317C 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 .L80AA3180: /* 006E0 80AA3180 24180004 */ addiu $t8, $zero, 0x0004 ## $t8 = 00000004 -/* 006E4 80AA3184 AFB80014 */ sw $t8, 0x0014($sp) -/* 006E8 80AA3188 44060000 */ mfc1 $a2, $f0 -/* 006EC 80AA318C 44070000 */ mfc1 $a3, $f0 -/* 006F0 80AA3190 8FA40044 */ lw $a0, 0x0044($sp) +/* 006E4 80AA3184 AFB80014 */ sw $t8, 0x0014($sp) +/* 006E8 80AA3188 44060000 */ mfc1 $a2, $f0 +/* 006EC 80AA318C 44070000 */ mfc1 $a3, $f0 +/* 006F0 80AA3190 8FA40044 */ lw $a0, 0x0044($sp) /* 006F4 80AA3194 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 006F8 80AA3198 0C00B92D */ jal func_8002E4B4 -/* 006FC 80AA319C E7A00010 */ swc1 $f0, 0x0010($sp) +/* 006F8 80AA3198 0C00B92D */ jal func_8002E4B4 +/* 006FC 80AA319C E7A00010 */ swc1 $f0, 0x0010($sp) /* 00700 80AA31A0 3C053C23 */ lui $a1, 0x3C23 ## $a1 = 3C230000 /* 00704 80AA31A4 34A5D70A */ ori $a1, $a1, 0xD70A ## $a1 = 3C23D70A /* 00708 80AA31A8 0C00B58B */ jal Actor_SetScale - + /* 0070C 80AA31AC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 00710 80AA31B0 A60001E0 */ sh $zero, 0x01E0($s0) ## 000001E0 -/* 00714 80AA31B4 8FBF002C */ lw $ra, 0x002C($sp) +/* 00714 80AA31B4 8FBF002C */ lw $ra, 0x002C($sp) .L80AA31B8: -/* 00718 80AA31B8 8FB00028 */ lw $s0, 0x0028($sp) +/* 00718 80AA31B8 8FB00028 */ lw $s0, 0x0028($sp) /* 0071C 80AA31BC 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 -/* 00720 80AA31C0 03E00008 */ jr $ra +/* 00720 80AA31C0 03E00008 */ jr $ra /* 00724 80AA31C4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ma3/func_80AA3004.s b/asm/non_matchings/overlays/actors/ovl_En_Ma3/func_80AA3004.s index f03dfd98c0..938b6d946b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ma3/func_80AA3004.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ma3/func_80AA3004.s @@ -2,32 +2,32 @@ glabel func_80AA3004 /* 00564 80AA3004 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 /* 00568 80AA3008 3C0F80AA */ lui $t7, %hi(D_80AA3848) ## $t7 = 80AA0000 /* 0056C 80AA300C 25EF3848 */ addiu $t7, $t7, %lo(D_80AA3848) ## $t7 = 80AA3848 -/* 00570 80AA3010 00057100 */ sll $t6, $a1, 4 -/* 00574 80AA3014 AFBF0024 */ sw $ra, 0x0024($sp) -/* 00578 80AA3018 AFA40030 */ sw $a0, 0x0030($sp) -/* 0057C 80AA301C 01CF1821 */ addu $v1, $t6, $t7 +/* 00570 80AA3010 00057100 */ sll $t6, $a1, 4 +/* 00574 80AA3014 AFBF0024 */ sw $ra, 0x0024($sp) +/* 00578 80AA3018 AFA40030 */ sw $a0, 0x0030($sp) +/* 0057C 80AA301C 01CF1821 */ addu $v1, $t6, $t7 /* 00580 80AA3020 8C640000 */ lw $a0, 0x0000($v1) ## 00000000 /* 00584 80AA3024 0C028800 */ jal SkelAnime_GetFrameCount - -/* 00588 80AA3028 AFA30028 */ sw $v1, 0x0028($sp) + +/* 00588 80AA3028 AFA30028 */ sw $v1, 0x0028($sp) /* 0058C 80AA302C 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 -/* 00590 80AA3030 8FA30028 */ lw $v1, 0x0028($sp) -/* 00594 80AA3034 8FA40030 */ lw $a0, 0x0030($sp) -/* 00598 80AA3038 468021A0 */ cvt.s.w $f6, $f4 +/* 00590 80AA3030 8FA30028 */ lw $v1, 0x0028($sp) +/* 00594 80AA3034 8FA40030 */ lw $a0, 0x0030($sp) +/* 00598 80AA3038 468021A0 */ cvt.s.w $f6, $f4 /* 0059C 80AA303C 90780008 */ lbu $t8, 0x0008($v1) ## 00000008 /* 005A0 80AA3040 C468000C */ lwc1 $f8, 0x000C($v1) ## 0000000C /* 005A4 80AA3044 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 005A8 80AA3048 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 /* 005AC 80AA304C 8C650000 */ lw $a1, 0x0000($v1) ## 00000000 -/* 005B0 80AA3050 E7A60010 */ swc1 $f6, 0x0010($sp) +/* 005B0 80AA3050 E7A60010 */ swc1 $f6, 0x0010($sp) /* 005B4 80AA3054 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 005B8 80AA3058 AFB80014 */ sw $t8, 0x0014($sp) -/* 005BC 80AA305C 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 005C0 80AA3060 E7A80018 */ swc1 $f8, 0x0018($sp) -/* 005C4 80AA3064 8FBF0024 */ lw $ra, 0x0024($sp) +/* 005B8 80AA3058 AFB80014 */ sw $t8, 0x0014($sp) +/* 005BC 80AA305C 0C029468 */ jal SkelAnime_ChangeAnim + +/* 005C0 80AA3060 E7A80018 */ swc1 $f8, 0x0018($sp) +/* 005C4 80AA3064 8FBF0024 */ lw $ra, 0x0024($sp) /* 005C8 80AA3068 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 005CC 80AA306C 03E00008 */ jr $ra +/* 005CC 80AA306C 03E00008 */ jr $ra /* 005D0 80AA3070 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ma3/func_80AA3580.s b/asm/non_matchings/overlays/actors/ovl_En_Ma3/func_80AA3580.s index 340c9951bf..c50b18b63b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ma3/func_80AA3580.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ma3/func_80AA3580.s @@ -20,7 +20,7 @@ glabel func_80AA3580 /* 00B28 80AA35C8 2407039F */ addiu $a3, $zero, 0x039F ## $a3 = 0000039F /* 00B2C 80AA35CC 8D050000 */ lw $a1, 0x0000($t0) ## 00000000 /* 00B30 80AA35D0 27A40024 */ addiu $a0, $sp, 0x0024 ## $a0 = FFFFFFDC -/* 00B34 80AA35D4 0C031AB1 */ jal func_800C6AC4 +/* 00B34 80AA35D4 0C031AB1 */ jal Graph_OpenDisps /* 00B38 80AA35D8 AFA50034 */ sw $a1, 0x0034($sp) /* 00B3C 80AA35DC 8FA9004C */ lw $t1, 0x004C($sp) /* 00B40 80AA35E0 8FA50058 */ lw $a1, 0x0058($sp) @@ -55,7 +55,7 @@ glabel func_80AA3580 .L80AA364C: /* 00BAC 80AA364C 27A40024 */ addiu $a0, $sp, 0x0024 ## $a0 = FFFFFFDC /* 00BB0 80AA3650 240703B6 */ addiu $a3, $zero, 0x03B6 ## $a3 = 000003B6 -/* 00BB4 80AA3654 0C031AD5 */ jal func_800C6B54 +/* 00BB4 80AA3654 0C031AD5 */ jal Graph_CloseDisps /* 00BB8 80AA3658 8F250000 */ lw $a1, 0x0000($t9) ## 00000000 /* 00BBC 80AA365C 8FBF0014 */ lw $ra, 0x0014($sp) /* 00BC0 80AA3660 27BD0048 */ addiu $sp, $sp, 0x0048 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Mag/EnMag_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Mag/EnMag_Draw.s index 65371202a6..9554dc50ea 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Mag/EnMag_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Mag/EnMag_Draw.s @@ -9,10 +9,10 @@ glabel EnMag_Draw /* 022F0 80AA5DF0 24C65F10 */ addiu $a2, $a2, %lo(D_80AA5F10) ## $a2 = 80AA5F10 /* 022F4 80AA5DF4 27A40030 */ addiu $a0, $sp, 0x0030 ## $a0 = FFFFFFE0 /* 022F8 80AA5DF8 2407047F */ addiu $a3, $zero, 0x047F ## $a3 = 0000047F -/* 022FC 80AA5DFC 0C031AB1 */ jal func_800C6AC4 +/* 022FC 80AA5DFC 0C031AB1 */ jal Graph_OpenDisps /* 02300 80AA5E00 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 /* 02304 80AA5E04 8E0402C0 */ lw $a0, 0x02C0($s0) ## 000002C0 -/* 02308 80AA5E08 0C031B08 */ jal func_800C6C20 +/* 02308 80AA5E08 0C031B08 */ jal Graph_GfxPlusOne /* 0230C 80AA5E0C AFA40044 */ sw $a0, 0x0044($sp) /* 02310 80AA5E10 AFA20048 */ sw $v0, 0x0048($sp) /* 02314 80AA5E14 8E0302B0 */ lw $v1, 0x02B0($s0) ## 000002B0 @@ -33,7 +33,7 @@ glabel EnMag_Draw /* 02350 80AA5E50 AD000004 */ sw $zero, 0x0004($t0) ## 00000004 /* 02354 80AA5E54 AD0A0000 */ sw $t2, 0x0000($t0) ## 00000000 /* 02358 80AA5E58 8FA50048 */ lw $a1, 0x0048($sp) -/* 0235C 80AA5E5C 0C031B0A */ jal func_800C6C28 +/* 0235C 80AA5E5C 0C031B0A */ jal Graph_BranchDlist /* 02360 80AA5E60 8FA40044 */ lw $a0, 0x0044($sp) /* 02364 80AA5E64 8FAB0048 */ lw $t3, 0x0048($sp) /* 02368 80AA5E68 3C0680AA */ lui $a2, %hi(D_80AA5F20) ## $a2 = 80AA0000 @@ -42,7 +42,7 @@ glabel EnMag_Draw /* 02374 80AA5E74 8FAC0054 */ lw $t4, 0x0054($sp) /* 02378 80AA5E78 27A40030 */ addiu $a0, $sp, 0x0030 ## $a0 = FFFFFFE0 /* 0237C 80AA5E7C 24070489 */ addiu $a3, $zero, 0x0489 ## $a3 = 00000489 -/* 02380 80AA5E80 0C031AD5 */ jal func_800C6B54 +/* 02380 80AA5E80 0C031AD5 */ jal Graph_CloseDisps /* 02384 80AA5E84 8D850000 */ lw $a1, 0x0000($t4) ## 00000000 /* 02388 80AA5E88 8FBF001C */ lw $ra, 0x001C($sp) /* 0238C 80AA5E8C 8FB00018 */ lw $s0, 0x0018($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Mb/EnMb_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Mb/EnMb_Draw.s index d846f9ef3c..4bb188cd02 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Mb/EnMb_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Mb/EnMb_Draw.s @@ -1,35 +1,35 @@ glabel EnMb_Draw /* 039B8 80AA9A08 27BDFF48 */ addiu $sp, $sp, 0xFF48 ## $sp = FFFFFF48 -/* 039BC 80AA9A0C AFB50048 */ sw $s5, 0x0048($sp) +/* 039BC 80AA9A0C AFB50048 */ sw $s5, 0x0048($sp) /* 039C0 80AA9A10 0080A825 */ or $s5, $a0, $zero ## $s5 = 00000000 -/* 039C4 80AA9A14 AFBF004C */ sw $ra, 0x004C($sp) -/* 039C8 80AA9A18 AFB40044 */ sw $s4, 0x0044($sp) -/* 039CC 80AA9A1C AFB30040 */ sw $s3, 0x0040($sp) -/* 039D0 80AA9A20 AFB2003C */ sw $s2, 0x003C($sp) -/* 039D4 80AA9A24 AFB10038 */ sw $s1, 0x0038($sp) -/* 039D8 80AA9A28 AFB00034 */ sw $s0, 0x0034($sp) -/* 039DC 80AA9A2C AFA500BC */ sw $a1, 0x00BC($sp) -/* 039E0 80AA9A30 0C024F46 */ jal func_80093D18 +/* 039C4 80AA9A14 AFBF004C */ sw $ra, 0x004C($sp) +/* 039C8 80AA9A18 AFB40044 */ sw $s4, 0x0044($sp) +/* 039CC 80AA9A1C AFB30040 */ sw $s3, 0x0040($sp) +/* 039D0 80AA9A20 AFB2003C */ sw $s2, 0x003C($sp) +/* 039D4 80AA9A24 AFB10038 */ sw $s1, 0x0038($sp) +/* 039D8 80AA9A28 AFB00034 */ sw $s0, 0x0034($sp) +/* 039DC 80AA9A2C AFA500BC */ sw $a1, 0x00BC($sp) +/* 039E0 80AA9A30 0C024F46 */ jal func_80093D18 /* 039E4 80AA9A34 8CA40000 */ lw $a0, 0x0000($a1) ## 00000000 /* 039E8 80AA9A38 8EA50190 */ lw $a1, 0x0190($s5) ## 00000190 /* 039EC 80AA9A3C 8EA601AC */ lw $a2, 0x01AC($s5) ## 000001AC /* 039F0 80AA9A40 92A7018E */ lbu $a3, 0x018E($s5) ## 0000018E /* 039F4 80AA9A44 3C0F80AB */ lui $t7, %hi(func_80AA9870) ## $t7 = 80AB0000 /* 039F8 80AA9A48 25EF9870 */ addiu $t7, $t7, %lo(func_80AA9870) ## $t7 = 80AA9870 -/* 039FC 80AA9A4C AFAF0014 */ sw $t7, 0x0014($sp) -/* 03A00 80AA9A50 AFB50018 */ sw $s5, 0x0018($sp) -/* 03A04 80AA9A54 AFA00010 */ sw $zero, 0x0010($sp) -/* 03A08 80AA9A58 0C0286B2 */ jal func_800A1AC8 -/* 03A0C 80AA9A5C 8FA400BC */ lw $a0, 0x00BC($sp) +/* 039FC 80AA9A4C AFAF0014 */ sw $t7, 0x0014($sp) +/* 03A00 80AA9A50 AFB50018 */ sw $s5, 0x0018($sp) +/* 03A04 80AA9A54 AFA00010 */ sw $zero, 0x0010($sp) +/* 03A08 80AA9A58 0C0286B2 */ jal SkelAnime_DrawSV +/* 03A0C 80AA9A5C 8FA400BC */ lw $a0, 0x00BC($sp) /* 03A10 80AA9A60 86B8001C */ lh $t8, 0x001C($s5) ## 0000001C -/* 03A14 80AA9A64 53000029 */ beql $t8, $zero, .L80AA9B0C +/* 03A14 80AA9A64 53000029 */ beql $t8, $zero, .L80AA9B0C /* 03A18 80AA9A68 86AA0328 */ lh $t2, 0x0328($s5) ## 00000328 /* 03A1C 80AA9A6C 86B90334 */ lh $t9, 0x0334($s5) ## 00000334 /* 03A20 80AA9A70 02A02025 */ or $a0, $s5, $zero ## $a0 = 00000000 -/* 03A24 80AA9A74 1B200003 */ blez $t9, .L80AA9A84 +/* 03A24 80AA9A74 1B200003 */ blez $t9, .L80AA9A84 /* 03A28 80AA9A78 00000000 */ nop -/* 03A2C 80AA9A7C 0C2AA4AE */ jal func_80AA92B8 -/* 03A30 80AA9A80 8FA500BC */ lw $a1, 0x00BC($sp) +/* 03A2C 80AA9A7C 0C2AA4AE */ jal func_80AA92B8 +/* 03A30 80AA9A80 8FA500BC */ lw $a1, 0x00BC($sp) .L80AA9A84: /* 03A34 80AA9A84 3C1180AB */ lui $s1, %hi(D_80AA9E20) ## $s1 = 80AB0000 /* 03A38 80AA9A88 3C1380AB */ lui $s3, %hi(D_80AA9E44) ## $s3 = 80AB0000 @@ -40,87 +40,87 @@ glabel EnMb_Draw /* 03A4C 80AA9A9C 27B4008C */ addiu $s4, $sp, 0x008C ## $s4 = FFFFFFD4 .L80AA9AA0: /* 03A50 80AA9AA0 02202025 */ or $a0, $s1, $zero ## $a0 = 80AA9E20 -/* 03A54 80AA9AA4 0C0346BD */ jal Matrix_MultVec3f +/* 03A54 80AA9AA4 0C0346BD */ jal Matrix_MultVec3f /* 03A58 80AA9AA8 02402825 */ or $a1, $s2, $zero ## $a1 = FFFFFFD4 /* 03A5C 80AA9AAC 02602025 */ or $a0, $s3, $zero ## $a0 = 80AA9E44 -/* 03A60 80AA9AB0 0C0346BD */ jal Matrix_MultVec3f +/* 03A60 80AA9AB0 0C0346BD */ jal Matrix_MultVec3f /* 03A64 80AA9AB4 02002825 */ or $a1, $s0, $zero ## $a1 = FFFFFFB0 /* 03A68 80AA9AB8 2610000C */ addiu $s0, $s0, 0x000C ## $s0 = FFFFFFBC /* 03A6C 80AA9ABC 2631000C */ addiu $s1, $s1, 0x000C ## $s1 = 80AA9E2C /* 03A70 80AA9AC0 2652000C */ addiu $s2, $s2, 0x000C ## $s2 = FFFFFFE0 -/* 03A74 80AA9AC4 1614FFF6 */ bne $s0, $s4, .L80AA9AA0 +/* 03A74 80AA9AC4 1614FFF6 */ bne $s0, $s4, .L80AA9AA0 /* 03A78 80AA9AC8 2673000C */ addiu $s3, $s3, 0x000C ## $s3 = 80AA9E50 /* 03A7C 80AA9ACC 26B00434 */ addiu $s0, $s5, 0x0434 ## $s0 = 00000434 /* 03A80 80AA9AD0 27A800A4 */ addiu $t0, $sp, 0x00A4 ## $t0 = FFFFFFEC -/* 03A84 80AA9AD4 AFA80010 */ sw $t0, 0x0010($sp) +/* 03A84 80AA9AD4 AFA80010 */ sw $t0, 0x0010($sp) /* 03A88 80AA9AD8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000434 /* 03A8C 80AA9ADC 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 03A90 80AA9AE0 27A6008C */ addiu $a2, $sp, 0x008C ## $a2 = FFFFFFD4 -/* 03A94 80AA9AE4 0C0189E8 */ jal func_800627A0 +/* 03A94 80AA9AE4 0C0189E8 */ jal func_800627A0 /* 03A98 80AA9AE8 27A70098 */ addiu $a3, $sp, 0x0098 ## $a3 = FFFFFFE0 /* 03A9C 80AA9AEC 27A90080 */ addiu $t1, $sp, 0x0080 ## $t1 = FFFFFFC8 -/* 03AA0 80AA9AF0 AFA90010 */ sw $t1, 0x0010($sp) +/* 03AA0 80AA9AF0 AFA90010 */ sw $t1, 0x0010($sp) /* 03AA4 80AA9AF4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000434 /* 03AA8 80AA9AF8 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 /* 03AAC 80AA9AFC 27A60068 */ addiu $a2, $sp, 0x0068 ## $a2 = FFFFFFB0 -/* 03AB0 80AA9B00 0C0189E8 */ jal func_800627A0 +/* 03AB0 80AA9B00 0C0189E8 */ jal func_800627A0 /* 03AB4 80AA9B04 27A70074 */ addiu $a3, $sp, 0x0074 ## $a3 = FFFFFFBC /* 03AB8 80AA9B08 86AA0328 */ lh $t2, 0x0328($s5) ## 00000328 .L80AA9B0C: -/* 03ABC 80AA9B0C 5140002A */ beql $t2, $zero, .L80AA9BB8 -/* 03AC0 80AA9B10 8FBF004C */ lw $ra, 0x004C($sp) +/* 03ABC 80AA9B0C 5140002A */ beql $t2, $zero, .L80AA9BB8 +/* 03AC0 80AA9B10 8FBF004C */ lw $ra, 0x004C($sp) /* 03AC4 80AA9B14 92AB0114 */ lbu $t3, 0x0114($s5) ## 00000114 /* 03AC8 80AA9B18 86A30328 */ lh $v1, 0x0328($s5) ## 00000328 /* 03ACC 80AA9B1C 02A02825 */ or $a1, $s5, $zero ## $a1 = 00000000 /* 03AD0 80AA9B20 256C0001 */ addiu $t4, $t3, 0x0001 ## $t4 = 00000001 -/* 03AD4 80AA9B24 04600004 */ bltz $v1, .L80AA9B38 +/* 03AD4 80AA9B24 04600004 */ bltz $v1, .L80AA9B38 /* 03AD8 80AA9B28 A2AC0114 */ sb $t4, 0x0114($s5) ## 00000114 /* 03ADC 80AA9B2C 246DFFFF */ addiu $t5, $v1, 0xFFFF ## $t5 = FFFFFFFF /* 03AE0 80AA9B30 A6AD0328 */ sh $t5, 0x0328($s5) ## 00000328 /* 03AE4 80AA9B34 86A30328 */ lh $v1, 0x0328($s5) ## 00000328 .L80AA9B38: /* 03AE8 80AA9B38 306E0003 */ andi $t6, $v1, 0x0003 ## $t6 = 00000000 -/* 03AEC 80AA9B3C 15C0001D */ bne $t6, $zero, .L80AA9BB4 -/* 03AF0 80AA9B40 00031083 */ sra $v0, $v1, 2 +/* 03AEC 80AA9B3C 15C0001D */ bne $t6, $zero, .L80AA9BB4 +/* 03AF0 80AA9B40 00031083 */ sra $v0, $v1, 2 /* 03AF4 80AA9B44 86AF001C */ lh $t7, 0x001C($s5) ## 0000001C /* 03AF8 80AA9B48 3C014020 */ lui $at, 0x4020 ## $at = 40200000 /* 03AFC 80AA9B4C 44810000 */ mtc1 $at, $f0 ## $f0 = 2.50 -/* 03B00 80AA9B50 15E00004 */ bne $t7, $zero, .L80AA9B64 -/* 03B04 80AA9B54 8FA400BC */ lw $a0, 0x00BC($sp) +/* 03B00 80AA9B50 15E00004 */ bne $t7, $zero, .L80AA9B64 +/* 03B04 80AA9B54 8FA400BC */ lw $a0, 0x00BC($sp) /* 03B08 80AA9B58 3C014080 */ lui $at, 0x4080 ## $at = 40800000 /* 03B0C 80AA9B5C 44810000 */ mtc1 $at, $f0 ## $f0 = 4.00 /* 03B10 80AA9B60 00000000 */ nop .L80AA9B64: -/* 03B14 80AA9B64 0002C080 */ sll $t8, $v0, 2 -/* 03B18 80AA9B68 0302C023 */ subu $t8, $t8, $v0 -/* 03B1C 80AA9B6C 0018C040 */ sll $t8, $t8, 1 -/* 03B20 80AA9B70 02B83021 */ addu $a2, $s5, $t8 +/* 03B14 80AA9B64 0002C080 */ sll $t8, $v0, 2 +/* 03B18 80AA9B68 0302C023 */ subu $t8, $t8, $v0 +/* 03B1C 80AA9B6C 0018C040 */ sll $t8, $t8, 1 +/* 03B20 80AA9B70 02B83021 */ addu $a2, $s5, $t8 /* 03B24 80AA9B74 24190096 */ addiu $t9, $zero, 0x0096 ## $t9 = 00000096 /* 03B28 80AA9B78 24080096 */ addiu $t0, $zero, 0x0096 ## $t0 = 00000096 /* 03B2C 80AA9B7C 240900FA */ addiu $t1, $zero, 0x00FA ## $t1 = 000000FA /* 03B30 80AA9B80 240A00EB */ addiu $t2, $zero, 0x00EB ## $t2 = 000000EB /* 03B34 80AA9B84 240B00F5 */ addiu $t3, $zero, 0x00F5 ## $t3 = 000000F5 /* 03B38 80AA9B88 240C00FF */ addiu $t4, $zero, 0x00FF ## $t4 = 000000FF -/* 03B3C 80AA9B8C AFAC0024 */ sw $t4, 0x0024($sp) -/* 03B40 80AA9B90 AFAB0020 */ sw $t3, 0x0020($sp) -/* 03B44 80AA9B94 AFAA001C */ sw $t2, 0x001C($sp) -/* 03B48 80AA9B98 AFA90018 */ sw $t1, 0x0018($sp) -/* 03B4C 80AA9B9C AFA80014 */ sw $t0, 0x0014($sp) -/* 03B50 80AA9BA0 AFB90010 */ sw $t9, 0x0010($sp) +/* 03B3C 80AA9B8C AFAC0024 */ sw $t4, 0x0024($sp) +/* 03B40 80AA9B90 AFAB0020 */ sw $t3, 0x0020($sp) +/* 03B44 80AA9B94 AFAA001C */ sw $t2, 0x001C($sp) +/* 03B48 80AA9B98 AFA90018 */ sw $t1, 0x0018($sp) +/* 03B4C 80AA9B9C AFA80014 */ sw $t0, 0x0014($sp) +/* 03B50 80AA9BA0 AFB90010 */ sw $t9, 0x0010($sp) /* 03B54 80AA9BA4 24C6014C */ addiu $a2, $a2, 0x014C ## $a2 = 0000014C /* 03B58 80AA9BA8 24070096 */ addiu $a3, $zero, 0x0096 ## $a3 = 00000096 -/* 03B5C 80AA9BAC 0C00A877 */ jal func_8002A1DC -/* 03B60 80AA9BB0 E7A00028 */ swc1 $f0, 0x0028($sp) +/* 03B5C 80AA9BAC 0C00A877 */ jal func_8002A1DC +/* 03B60 80AA9BB0 E7A00028 */ swc1 $f0, 0x0028($sp) .L80AA9BB4: -/* 03B64 80AA9BB4 8FBF004C */ lw $ra, 0x004C($sp) +/* 03B64 80AA9BB4 8FBF004C */ lw $ra, 0x004C($sp) .L80AA9BB8: -/* 03B68 80AA9BB8 8FB00034 */ lw $s0, 0x0034($sp) -/* 03B6C 80AA9BBC 8FB10038 */ lw $s1, 0x0038($sp) -/* 03B70 80AA9BC0 8FB2003C */ lw $s2, 0x003C($sp) -/* 03B74 80AA9BC4 8FB30040 */ lw $s3, 0x0040($sp) -/* 03B78 80AA9BC8 8FB40044 */ lw $s4, 0x0044($sp) -/* 03B7C 80AA9BCC 8FB50048 */ lw $s5, 0x0048($sp) -/* 03B80 80AA9BD0 03E00008 */ jr $ra +/* 03B68 80AA9BB8 8FB00034 */ lw $s0, 0x0034($sp) +/* 03B6C 80AA9BBC 8FB10038 */ lw $s1, 0x0038($sp) +/* 03B70 80AA9BC0 8FB2003C */ lw $s2, 0x003C($sp) +/* 03B74 80AA9BC4 8FB30040 */ lw $s3, 0x0040($sp) +/* 03B78 80AA9BC8 8FB40044 */ lw $s4, 0x0044($sp) +/* 03B7C 80AA9BCC 8FB50048 */ lw $s5, 0x0048($sp) +/* 03B80 80AA9BD0 03E00008 */ jr $ra /* 03B84 80AA9BD4 27BD00B8 */ addiu $sp, $sp, 0x00B8 ## $sp = 00000000 /* 03B88 80AA9BD8 00000000 */ nop /* 03B8C 80AA9BDC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Mb/EnMb_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Mb/EnMb_Init.s index f69180d9c6..6f19421168 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Mb/EnMb_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Mb/EnMb_Init.s @@ -1,23 +1,23 @@ glabel EnMb_Init /* 00008 80AA6058 27BDFFB0 */ addiu $sp, $sp, 0xFFB0 ## $sp = FFFFFFB0 -/* 0000C 80AA605C AFBF002C */ sw $ra, 0x002C($sp) -/* 00010 80AA6060 AFB10028 */ sw $s1, 0x0028($sp) -/* 00014 80AA6064 AFB00024 */ sw $s0, 0x0024($sp) +/* 0000C 80AA605C AFBF002C */ sw $ra, 0x002C($sp) +/* 00010 80AA6060 AFB10028 */ sw $s1, 0x0028($sp) +/* 00014 80AA6064 AFB00024 */ sw $s0, 0x0024($sp) /* 00018 80AA6068 8CAE1C44 */ lw $t6, 0x1C44($a1) ## 00001C44 /* 0001C 80AA606C 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 /* 00020 80AA6070 3C0580AB */ lui $a1, %hi(D_80AA9D44) ## $a1 = 80AB0000 /* 00024 80AA6074 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 00028 80AA6078 24A59D44 */ addiu $a1, $a1, %lo(D_80AA9D44) ## $a1 = 80AA9D44 /* 0002C 80AA607C 0C01E037 */ jal Actor_ProcessInitChain - -/* 00030 80AA6080 AFAE0044 */ sw $t6, 0x0044($sp) + +/* 00030 80AA6080 AFAE0044 */ sw $t6, 0x0044($sp) /* 00034 80AA6084 260400B4 */ addiu $a0, $s0, 0x00B4 ## $a0 = 000000B4 /* 00038 80AA6088 3C068003 */ lui $a2, 0x8003 ## $a2 = 80030000 /* 0003C 80AA608C 24C6B5EC */ addiu $a2, $a2, 0xB5EC ## $a2 = 8002B5EC -/* 00040 80AA6090 AFA40034 */ sw $a0, 0x0034($sp) +/* 00040 80AA6090 AFA40034 */ sw $a0, 0x0034($sp) /* 00044 80AA6094 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 /* 00048 80AA6098 0C00AC78 */ jal ActorShape_Init - + /* 0004C 80AA609C 3C074238 */ lui $a3, 0x4238 ## $a3 = 42380000 /* 00050 80AA60A0 3C1880AB */ lui $t8, %hi(D_80AA9D04) ## $t8 = 80AB0000 /* 00054 80AA60A4 240F00FF */ addiu $t7, $zero, 0x00FF ## $t7 = 000000FF @@ -25,47 +25,47 @@ glabel EnMb_Init /* 0005C 80AA60AC A20F00AE */ sb $t7, 0x00AE($s0) ## 000000AE /* 00060 80AA60B0 AE180098 */ sw $t8, 0x0098($s0) ## 00000098 /* 00064 80AA60B4 26050368 */ addiu $a1, $s0, 0x0368 ## $a1 = 00000368 -/* 00068 80AA60B8 AFA50038 */ sw $a1, 0x0038($sp) +/* 00068 80AA60B8 AFA50038 */ sw $a1, 0x0038($sp) /* 0006C 80AA60BC 0C0170D9 */ jal ActorCollider_AllocCylinder - + /* 00070 80AA60C0 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 00074 80AA60C4 3C0780AB */ lui $a3, %hi(D_80AA9C00) ## $a3 = 80AB0000 -/* 00078 80AA60C8 8FA50038 */ lw $a1, 0x0038($sp) +/* 00078 80AA60C8 8FA50038 */ lw $a1, 0x0038($sp) /* 0007C 80AA60CC 24E79C00 */ addiu $a3, $a3, %lo(D_80AA9C00) ## $a3 = 80AA9C00 /* 00080 80AA60D0 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 00084 80AA60D4 0C01712B */ jal ActorCollider_InitCylinder - + /* 00088 80AA60D8 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 0008C 80AA60DC 26050434 */ addiu $a1, $s0, 0x0434 ## $a1 = 00000434 -/* 00090 80AA60E0 AFA50038 */ sw $a1, 0x0038($sp) -/* 00094 80AA60E4 0C0171F8 */ jal func_8005C7E0 +/* 00090 80AA60E0 AFA50038 */ sw $a1, 0x0038($sp) +/* 00094 80AA60E4 0C0171F8 */ jal func_8005C7E0 /* 00098 80AA60E8 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 0009C 80AA60EC 3C0780AB */ lui $a3, %hi(D_80AA9CA4) ## $a3 = 80AB0000 /* 000A0 80AA60F0 26190454 */ addiu $t9, $s0, 0x0454 ## $t9 = 00000454 -/* 000A4 80AA60F4 8FA50038 */ lw $a1, 0x0038($sp) -/* 000A8 80AA60F8 AFB90010 */ sw $t9, 0x0010($sp) +/* 000A4 80AA60F4 8FA50038 */ lw $a1, 0x0038($sp) +/* 000A8 80AA60F8 AFB90010 */ sw $t9, 0x0010($sp) /* 000AC 80AA60FC 24E79CA4 */ addiu $a3, $a3, %lo(D_80AA9CA4) ## $a3 = 80AA9CA4 /* 000B0 80AA6100 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 000B4 80AA6104 0C0172EB */ jal func_8005CBAC +/* 000B4 80AA6104 0C0172EB */ jal func_8005CBAC /* 000B8 80AA6108 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 000BC 80AA610C 260503B4 */ addiu $a1, $s0, 0x03B4 ## $a1 = 000003B4 -/* 000C0 80AA6110 AFA50038 */ sw $a1, 0x0038($sp) -/* 000C4 80AA6114 0C017406 */ jal func_8005D018 +/* 000C0 80AA6110 AFA50038 */ sw $a1, 0x0038($sp) +/* 000C4 80AA6114 0C017406 */ jal func_8005D018 /* 000C8 80AA6118 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 000CC 80AA611C 3C0780AB */ lui $a3, %hi(D_80AA9CB4) ## $a3 = 80AB0000 -/* 000D0 80AA6120 8FA50038 */ lw $a1, 0x0038($sp) +/* 000D0 80AA6120 8FA50038 */ lw $a1, 0x0038($sp) /* 000D4 80AA6124 24E79CB4 */ addiu $a3, $a3, %lo(D_80AA9CB4) ## $a3 = 80AA9CB4 /* 000D8 80AA6128 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 000DC 80AA612C 0C017441 */ jal func_8005D104 +/* 000DC 80AA612C 0C017441 */ jal func_8005D104 /* 000E0 80AA6130 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 000E4 80AA6134 8603001C */ lh $v1, 0x001C($s0) ## 0000001C /* 000E8 80AA6138 2401FFFF */ addiu $at, $zero, 0xFFFF ## $at = FFFFFFFF /* 000EC 80AA613C 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 000F0 80AA6140 10610005 */ beq $v1, $at, .L80AA6158 +/* 000F0 80AA6140 10610005 */ beq $v1, $at, .L80AA6158 /* 000F4 80AA6144 2605018C */ addiu $a1, $s0, 0x018C ## $a1 = 0000018C -/* 000F8 80AA6148 1060001C */ beq $v1, $zero, .L80AA61BC +/* 000F8 80AA6148 1060001C */ beq $v1, $zero, .L80AA61BC /* 000FC 80AA614C 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 00100 80AA6150 1000006C */ beq $zero, $zero, .L80AA6304 +/* 00100 80AA6150 1000006C */ beq $zero, $zero, .L80AA6304 /* 00104 80AA6154 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 .L80AA6158: /* 00108 80AA6158 3C060601 */ lui $a2, 0x0601 ## $a2 = 06010000 @@ -73,11 +73,11 @@ glabel EnMb_Init /* 00110 80AA6160 260801D0 */ addiu $t0, $s0, 0x01D0 ## $t0 = 000001D0 /* 00114 80AA6164 26090278 */ addiu $t1, $s0, 0x0278 ## $t1 = 00000278 /* 00118 80AA6168 240A001C */ addiu $t2, $zero, 0x001C ## $t2 = 0000001C -/* 0011C 80AA616C AFAA0018 */ sw $t2, 0x0018($sp) -/* 00120 80AA6170 AFA90014 */ sw $t1, 0x0014($sp) -/* 00124 80AA6174 AFA80010 */ sw $t0, 0x0010($sp) +/* 0011C 80AA616C AFAA0018 */ sw $t2, 0x0018($sp) +/* 00120 80AA6170 AFA90014 */ sw $t1, 0x0014($sp) +/* 00124 80AA6174 AFA80010 */ sw $t0, 0x0010($sp) /* 00128 80AA6178 24E728E0 */ addiu $a3, $a3, 0x28E0 ## $a3 = 060028E0 -/* 0012C 80AA617C 0C0291BE */ jal func_800A46F8 +/* 0012C 80AA617C 0C0291BE */ jal SkelAnime_InitSV /* 00130 80AA6180 24C68F38 */ addiu $a2, $a2, 0x8F38 ## $a2 = 06008F38 /* 00134 80AA6184 3C01447A */ lui $at, 0x447A ## $at = 447A0000 /* 00138 80AA6188 44812000 */ mtc1 $at, $f4 ## $f4 = 1000.00 @@ -87,24 +87,24 @@ glabel EnMb_Init /* 00148 80AA6198 A20C00AE */ sb $t4, 0x00AE($s0) ## 000000AE /* 0014C 80AA619C 3C0180AB */ lui $at, %hi(D_80AA9E70) ## $at = 80AB0000 /* 00150 80AA61A0 E6040360 */ swc1 $f4, 0x0360($s0) ## 00000360 -/* 00154 80AA61A4 C4269E70 */ lwc1 $f6, %lo(D_80AA9E70)($at) +/* 00154 80AA61A4 C4269E70 */ lwc1 $f6, %lo(D_80AA9E70)($at) /* 00158 80AA61A8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0015C 80AA61AC 0C2A9A0C */ jal func_80AA6830 +/* 0015C 80AA61AC 0C2A9A0C */ jal func_80AA6830 /* 00160 80AA61B0 E6060364 */ swc1 $f6, 0x0364($s0) ## 00000364 -/* 00164 80AA61B4 1000007C */ beq $zero, $zero, .L80AA63A8 -/* 00168 80AA61B8 8FBF002C */ lw $ra, 0x002C($sp) +/* 00164 80AA61B4 1000007C */ beq $zero, $zero, .L80AA63A8 +/* 00168 80AA61B8 8FBF002C */ lw $ra, 0x002C($sp) .L80AA61BC: /* 0016C 80AA61BC 3C060601 */ lui $a2, 0x0601 ## $a2 = 06010000 /* 00170 80AA61C0 3C070601 */ lui $a3, 0x0601 ## $a3 = 06010000 /* 00174 80AA61C4 260D01D0 */ addiu $t5, $s0, 0x01D0 ## $t5 = 000001D0 /* 00178 80AA61C8 260E0278 */ addiu $t6, $s0, 0x0278 ## $t6 = 00000278 /* 0017C 80AA61CC 240F001C */ addiu $t7, $zero, 0x001C ## $t7 = 0000001C -/* 00180 80AA61D0 AFAF0018 */ sw $t7, 0x0018($sp) -/* 00184 80AA61D4 AFAE0014 */ sw $t6, 0x0014($sp) -/* 00188 80AA61D8 AFAD0010 */ sw $t5, 0x0010($sp) +/* 00180 80AA61D0 AFAF0018 */ sw $t7, 0x0018($sp) +/* 00184 80AA61D4 AFAE0014 */ sw $t6, 0x0014($sp) +/* 00188 80AA61D8 AFAD0010 */ sw $t5, 0x0010($sp) /* 0018C 80AA61DC 24E7EBE4 */ addiu $a3, $a3, 0xEBE4 ## $a3 = 0600EBE4 /* 00190 80AA61E0 24C64190 */ addiu $a2, $a2, 0x4190 ## $a2 = 06014190 -/* 00194 80AA61E4 0C0291BE */ jal func_800A46F8 +/* 00194 80AA61E4 0C0291BE */ jal SkelAnime_InitSV /* 00198 80AA61E8 2605018C */ addiu $a1, $s0, 0x018C ## $a1 = 0000018C /* 0019C 80AA61EC 3C0880AB */ lui $t0, %hi(D_80AA9D24) ## $t0 = 80AB0000 /* 001A0 80AA61F0 24180006 */ addiu $t8, $zero, 0x0006 ## $t8 = 00000006 @@ -116,7 +116,7 @@ glabel EnMb_Init /* 001B8 80AA6208 AE080098 */ sw $t0, 0x0098($s0) ## 00000098 /* 001BC 80AA620C 34A5D70A */ ori $a1, $a1, 0xD70A ## $a1 = 3CA3D70A /* 001C0 80AA6210 0C00B58B */ jal Actor_SetScale - + /* 001C4 80AA6214 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 001C8 80AA6218 3C01457A */ lui $at, 0x457A ## $at = 457A0000 /* 001CC 80AA621C 44814000 */ mtc1 $at, $f8 ## $f8 = 4000.00 @@ -132,79 +132,79 @@ glabel EnMb_Init /* 001F4 80AA6244 E60800F4 */ swc1 $f8, 0x00F4($s0) ## 000000F4 /* 001F8 80AA6248 E60A00F8 */ swc1 $f10, 0x00F8($s0) ## 000000F8 /* 001FC 80AA624C E61000FC */ swc1 $f16, 0x00FC($s0) ## 000000FC -/* 00200 80AA6250 C4329E74 */ lwc1 $f18, %lo(D_80AA9E74)($at) +/* 00200 80AA6250 C4329E74 */ lwc1 $f18, %lo(D_80AA9E74)($at) /* 00204 80AA6254 3C0B2000 */ lui $t3, 0x2000 ## $t3 = 20000000 /* 00208 80AA6258 AE0B03CC */ sw $t3, 0x03CC($s0) ## 000003CC /* 0020C 80AA625C E6120364 */ swc1 $f18, 0x0364($s0) ## 00000364 -/* 00210 80AA6260 8FA50044 */ lw $a1, 0x0044($sp) +/* 00210 80AA6260 8FA50044 */ lw $a1, 0x0044($sp) /* 00214 80AA6264 26040024 */ addiu $a0, $s0, 0x0024 ## $a0 = 00000024 /* 00218 80AA6268 0C01E01A */ jal Math_Vec3f_Yaw - + /* 0021C 80AA626C 24A50024 */ addiu $a1, $a1, 0x0024 ## $a1 = 00000024 /* 00220 80AA6270 86050032 */ lh $a1, 0x0032($s0) ## 00000032 /* 00224 80AA6274 3C068003 */ lui $a2, 0x8003 ## $a2 = 80030000 /* 00228 80AA6278 24C6B8C4 */ addiu $a2, $a2, 0xB8C4 ## $a2 = 8002B8C4 -/* 0022C 80AA627C 00A22023 */ subu $a0, $a1, $v0 -/* 00230 80AA6280 00042400 */ sll $a0, $a0, 16 -/* 00234 80AA6284 00042403 */ sra $a0, $a0, 16 -/* 00238 80AA6288 04800003 */ bltz $a0, .L80AA6298 +/* 0022C 80AA627C 00A22023 */ subu $a0, $a1, $v0 +/* 00230 80AA6280 00042400 */ sll $a0, $a0, 16 +/* 00234 80AA6284 00042403 */ sra $a0, $a0, 16 +/* 00238 80AA6288 04800003 */ bltz $a0, .L80AA6298 /* 0023C 80AA628C 3C0742B4 */ lui $a3, 0x42B4 ## $a3 = 42B40000 -/* 00240 80AA6290 10000002 */ beq $zero, $zero, .L80AA629C +/* 00240 80AA6290 10000002 */ beq $zero, $zero, .L80AA629C /* 00244 80AA6294 00801825 */ or $v1, $a0, $zero ## $v1 = 00000000 .L80AA6298: -/* 00248 80AA6298 00041823 */ subu $v1, $zero, $a0 +/* 00248 80AA6298 00041823 */ subu $v1, $zero, $a0 .L80AA629C: -/* 0024C 80AA629C 28614001 */ slti $at, $v1, 0x4001 -/* 00250 80AA62A0 1420000A */ bne $at, $zero, .L80AA62CC +/* 0024C 80AA629C 28614001 */ slti $at, $v1, 0x4001 +/* 00250 80AA62A0 1420000A */ bne $at, $zero, .L80AA62CC /* 00254 80AA62A4 34018000 */ ori $at, $zero, 0x8000 ## $at = 00008000 -/* 00258 80AA62A8 00A16021 */ addu $t4, $a1, $at +/* 00258 80AA62A8 00A16021 */ addu $t4, $a1, $at /* 0025C 80AA62AC 3C014416 */ lui $at, 0x4416 ## $at = 44160000 /* 00260 80AA62B0 44813000 */ mtc1 $at, $f6 ## $f6 = 600.00 /* 00264 80AA62B4 C604002C */ lwc1 $f4, 0x002C($s0) ## 0000002C /* 00268 80AA62B8 A60C0032 */ sh $t4, 0x0032($s0) ## 00000032 /* 0026C 80AA62BC 860D0032 */ lh $t5, 0x0032($s0) ## 00000032 -/* 00270 80AA62C0 46062200 */ add.s $f8, $f4, $f6 +/* 00270 80AA62C0 46062200 */ add.s $f8, $f4, $f6 /* 00274 80AA62C4 A60D00B6 */ sh $t5, 0x00B6($s0) ## 000000B6 /* 00278 80AA62C8 E608002C */ swc1 $f8, 0x002C($s0) ## 0000002C .L80AA62CC: -/* 0027C 80AA62CC 8FA40034 */ lw $a0, 0x0034($sp) +/* 0027C 80AA62CC 8FA40034 */ lw $a0, 0x0034($sp) /* 00280 80AA62D0 0C00AC78 */ jal ActorShape_Init - + /* 00284 80AA62D4 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 /* 00288 80AA62D8 8E0E0004 */ lw $t6, 0x0004($s0) ## 00000004 /* 0028C 80AA62DC 92180117 */ lbu $t8, 0x0117($s0) ## 00000117 /* 00290 80AA62E0 2401FFFE */ addiu $at, $zero, 0xFFFE ## $at = FFFFFFFE -/* 00294 80AA62E4 01C17824 */ and $t7, $t6, $at +/* 00294 80AA62E4 01C17824 */ and $t7, $t6, $at /* 00298 80AA62E8 27190001 */ addiu $t9, $t8, 0x0001 ## $t9 = 00000001 /* 0029C 80AA62EC AE0F0004 */ sw $t7, 0x0004($s0) ## 00000004 /* 002A0 80AA62F0 A2190117 */ sb $t9, 0x0117($s0) ## 00000117 -/* 002A4 80AA62F4 0C2A9A26 */ jal func_80AA6898 +/* 002A4 80AA62F4 0C2A9A26 */ jal func_80AA6898 /* 002A8 80AA62F8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 002AC 80AA62FC 1000002A */ beq $zero, $zero, .L80AA63A8 -/* 002B0 80AA6300 8FBF002C */ lw $ra, 0x002C($sp) +/* 002AC 80AA62FC 1000002A */ beq $zero, $zero, .L80AA63A8 +/* 002B0 80AA6300 8FBF002C */ lw $ra, 0x002C($sp) .L80AA6304: /* 002B4 80AA6304 3C060601 */ lui $a2, 0x0601 ## $a2 = 06010000 /* 002B8 80AA6308 3C070600 */ lui $a3, 0x0600 ## $a3 = 06000000 /* 002BC 80AA630C 260801D0 */ addiu $t0, $s0, 0x01D0 ## $t0 = 000001D0 /* 002C0 80AA6310 26090278 */ addiu $t1, $s0, 0x0278 ## $t1 = 00000278 /* 002C4 80AA6314 240A001C */ addiu $t2, $zero, 0x001C ## $t2 = 0000001C -/* 002C8 80AA6318 AFAA0018 */ sw $t2, 0x0018($sp) -/* 002CC 80AA631C AFA90014 */ sw $t1, 0x0014($sp) -/* 002D0 80AA6320 AFA80010 */ sw $t0, 0x0010($sp) +/* 002C8 80AA6318 AFAA0018 */ sw $t2, 0x0018($sp) +/* 002CC 80AA631C AFA90014 */ sw $t1, 0x0014($sp) +/* 002D0 80AA6320 AFA80010 */ sw $t0, 0x0010($sp) /* 002D4 80AA6324 24E728E0 */ addiu $a3, $a3, 0x28E0 ## $a3 = 060028E0 /* 002D8 80AA6328 24C68F38 */ addiu $a2, $a2, 0x8F38 ## $a2 = 06008F38 -/* 002DC 80AA632C 0C0291BE */ jal func_800A46F8 +/* 002DC 80AA632C 0C0291BE */ jal SkelAnime_InitSV /* 002E0 80AA6330 2605018C */ addiu $a1, $s0, 0x018C ## $a1 = 0000018C /* 002E4 80AA6334 3C053C65 */ lui $a1, 0x3C65 ## $a1 = 3C650000 /* 002E8 80AA6338 34A56042 */ ori $a1, $a1, 0x6042 ## $a1 = 3C656042 /* 002EC 80AA633C 0C00B58B */ jal Actor_SetScale - + /* 002F0 80AA6340 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 002F4 80AA6344 860B001C */ lh $t3, 0x001C($s0) ## 0000001C /* 002F8 80AA6348 3C0143AF */ lui $at, 0x43AF ## $at = 43AF0000 /* 002FC 80AA634C 44815000 */ mtc1 $at, $f10 ## $f10 = 350.00 /* 00300 80AA6350 316CFF00 */ andi $t4, $t3, 0xFF00 ## $t4 = 00000000 -/* 00304 80AA6354 000C6A03 */ sra $t5, $t4, 8 +/* 00304 80AA6354 000C6A03 */ sra $t5, $t4, 8 /* 00308 80AA6358 240E0001 */ addiu $t6, $zero, 0x0001 ## $t6 = 00000001 /* 0030C 80AA635C 240F0001 */ addiu $t7, $zero, 0x0001 ## $t7 = 00000001 /* 00310 80AA6360 241800FE */ addiu $t8, $zero, 0x00FE ## $t8 = 000000FE @@ -216,19 +216,19 @@ glabel EnMb_Init /* 00328 80AA6378 A21800AE */ sb $t8, 0x00AE($s0) ## 000000AE /* 0032C 80AA637C 3C0180AB */ lui $at, %hi(D_80AA9E78) ## $at = 80AB0000 /* 00330 80AA6380 E60A0360 */ swc1 $f10, 0x0360($s0) ## 00000360 -/* 00334 80AA6384 C4309E78 */ lwc1 $f16, %lo(D_80AA9E78)($at) +/* 00334 80AA6384 C4309E78 */ lwc1 $f16, %lo(D_80AA9E78)($at) /* 00338 80AA6388 2401FFFE */ addiu $at, $zero, 0xFFFE ## $at = FFFFFFFE -/* 0033C 80AA638C 03214024 */ and $t0, $t9, $at +/* 0033C 80AA638C 03214024 */ and $t0, $t9, $at /* 00340 80AA6390 AE080004 */ sw $t0, 0x0004($s0) ## 00000004 /* 00344 80AA6394 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 00348 80AA6398 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 0034C 80AA639C 0C2A9A3F */ jal func_80AA68FC +/* 0034C 80AA639C 0C2A9A3F */ jal func_80AA68FC /* 00350 80AA63A0 E6100364 */ swc1 $f16, 0x0364($s0) ## 00000364 -/* 00354 80AA63A4 8FBF002C */ lw $ra, 0x002C($sp) +/* 00354 80AA63A4 8FBF002C */ lw $ra, 0x002C($sp) .L80AA63A8: -/* 00358 80AA63A8 8FB00024 */ lw $s0, 0x0024($sp) -/* 0035C 80AA63AC 8FB10028 */ lw $s1, 0x0028($sp) -/* 00360 80AA63B0 03E00008 */ jr $ra +/* 00358 80AA63A8 8FB00024 */ lw $s0, 0x0024($sp) +/* 0035C 80AA63AC 8FB10028 */ lw $s1, 0x0028($sp) +/* 00360 80AA63B0 03E00008 */ jr $ra /* 00364 80AA63B4 27BD0050 */ addiu $sp, $sp, 0x0050 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Mb/func_80AA6830.s b/asm/non_matchings/overlays/actors/ovl_En_Mb/func_80AA6830.s index df84e71f1c..ec1e5245d6 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Mb/func_80AA6830.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Mb/func_80AA6830.s @@ -1,30 +1,30 @@ glabel func_80AA6830 /* 007E0 80AA6830 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 007E4 80AA6834 AFBF0014 */ sw $ra, 0x0014($sp) +/* 007E4 80AA6834 AFBF0014 */ sw $ra, 0x0014($sp) /* 007E8 80AA6838 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 /* 007EC 80AA683C 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 007F0 80AA6840 24A541A8 */ addiu $a1, $a1, 0x41A8 ## $a1 = 060041A8 -/* 007F4 80AA6844 AFA70018 */ sw $a3, 0x0018($sp) +/* 007F4 80AA6844 AFA70018 */ sw $a3, 0x0018($sp) /* 007F8 80AA6848 2484018C */ addiu $a0, $a0, 0x018C ## $a0 = 0000018C -/* 007FC 80AA684C 0C0294D3 */ jal func_800A534C +/* 007FC 80AA684C 0C0294D3 */ jal SkelAnime_ChangeAnimTransitionRepeat /* 00800 80AA6850 3C06C080 */ lui $a2, 0xC080 ## $a2 = C0800000 -/* 00804 80AA6854 8FA70018 */ lw $a3, 0x0018($sp) +/* 00804 80AA6854 8FA70018 */ lw $a3, 0x0018($sp) /* 00808 80AA6858 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 /* 0080C 80AA685C 2404001E */ addiu $a0, $zero, 0x001E ## $a0 = 0000001E /* 00810 80AA6860 24050032 */ addiu $a1, $zero, 0x0032 ## $a1 = 00000032 /* 00814 80AA6864 0C01DF64 */ jal Math_Rand_S16Offset - + /* 00818 80AA6868 E4E40068 */ swc1 $f4, 0x0068($a3) ## 00000068 -/* 0081C 80AA686C 8FA40018 */ lw $a0, 0x0018($sp) +/* 0081C 80AA686C 8FA40018 */ lw $a0, 0x0018($sp) /* 00820 80AA6870 240E0006 */ addiu $t6, $zero, 0x0006 ## $t6 = 00000006 /* 00824 80AA6874 3C0580AA */ lui $a1, %hi(func_80AA7134) ## $a1 = 80AA0000 /* 00828 80AA6878 24A57134 */ addiu $a1, $a1, %lo(func_80AA7134) ## $a1 = 80AA7134 /* 0082C 80AA687C A482032A */ sh $v0, 0x032A($a0) ## 0000032A -/* 00830 80AA6880 0C2A9814 */ jal func_80AA6050 +/* 00830 80AA6880 0C2A9814 */ jal func_80AA6050 /* 00834 80AA6884 AC8E0320 */ sw $t6, 0x0320($a0) ## 00000320 -/* 00838 80AA6888 8FBF0014 */ lw $ra, 0x0014($sp) +/* 00838 80AA6888 8FBF0014 */ lw $ra, 0x0014($sp) /* 0083C 80AA688C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00840 80AA6890 03E00008 */ jr $ra +/* 00840 80AA6890 03E00008 */ jr $ra /* 00844 80AA6894 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Mb/func_80AA6898.s b/asm/non_matchings/overlays/actors/ovl_En_Mb/func_80AA6898.s index 8b16d79556..6ba6440a6f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Mb/func_80AA6898.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Mb/func_80AA6898.s @@ -1,29 +1,29 @@ glabel func_80AA6898 /* 00848 80AA6898 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 0084C 80AA689C AFBF0014 */ sw $ra, 0x0014($sp) +/* 0084C 80AA689C AFBF0014 */ sw $ra, 0x0014($sp) /* 00850 80AA68A0 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 /* 00854 80AA68A4 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 /* 00858 80AA68A8 24A5EBE4 */ addiu $a1, $a1, 0xEBE4 ## $a1 = 0600EBE4 -/* 0085C 80AA68AC AFA60018 */ sw $a2, 0x0018($sp) -/* 00860 80AA68B0 0C0294BE */ jal func_800A52F8 +/* 0085C 80AA68AC AFA60018 */ sw $a2, 0x0018($sp) +/* 00860 80AA68B0 0C0294BE */ jal SkelAnime_ChangeAnimDefaultRepeat /* 00864 80AA68B4 2484018C */ addiu $a0, $a0, 0x018C ## $a0 = 0000018C -/* 00868 80AA68B8 8FA60018 */ lw $a2, 0x0018($sp) +/* 00868 80AA68B8 8FA60018 */ lw $a2, 0x0018($sp) /* 0086C 80AA68BC 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 /* 00870 80AA68C0 2404001E */ addiu $a0, $zero, 0x001E ## $a0 = 0000001E /* 00874 80AA68C4 24050032 */ addiu $a1, $zero, 0x0032 ## $a1 = 00000032 /* 00878 80AA68C8 0C01DF64 */ jal Math_Rand_S16Offset - + /* 0087C 80AA68CC E4C40068 */ swc1 $f4, 0x0068($a2) ## 00000068 -/* 00880 80AA68D0 8FA40018 */ lw $a0, 0x0018($sp) +/* 00880 80AA68D0 8FA40018 */ lw $a0, 0x0018($sp) /* 00884 80AA68D4 240E0006 */ addiu $t6, $zero, 0x0006 ## $t6 = 00000006 /* 00888 80AA68D8 3C0580AB */ lui $a1, %hi(func_80AA8DD8) ## $a1 = 80AB0000 /* 0088C 80AA68DC 24A58DD8 */ addiu $a1, $a1, %lo(func_80AA8DD8) ## $a1 = 80AA8DD8 /* 00890 80AA68E0 A482032A */ sh $v0, 0x032A($a0) ## 0000032A -/* 00894 80AA68E4 0C2A9814 */ jal func_80AA6050 +/* 00894 80AA68E4 0C2A9814 */ jal func_80AA6050 /* 00898 80AA68E8 AC8E0320 */ sw $t6, 0x0320($a0) ## 00000320 -/* 0089C 80AA68EC 8FBF0014 */ lw $ra, 0x0014($sp) +/* 0089C 80AA68EC 8FBF0014 */ lw $ra, 0x0014($sp) /* 008A0 80AA68F0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 008A4 80AA68F4 03E00008 */ jr $ra +/* 008A4 80AA68F4 03E00008 */ jr $ra /* 008A8 80AA68F8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Mb/func_80AA68FC.s b/asm/non_matchings/overlays/actors/ovl_En_Mb/func_80AA68FC.s index 3916be2b09..3e1e41c5d3 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Mb/func_80AA68FC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Mb/func_80AA68FC.s @@ -1,34 +1,34 @@ glabel func_80AA68FC /* 008AC 80AA68FC 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 008B0 80AA6900 AFB00018 */ sw $s0, 0x0018($sp) -/* 008B4 80AA6904 AFA50024 */ sw $a1, 0x0024($sp) +/* 008B0 80AA6900 AFB00018 */ sw $s0, 0x0018($sp) +/* 008B4 80AA6904 AFA50024 */ sw $a1, 0x0024($sp) /* 008B8 80AA6908 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 008BC 80AA690C AFBF001C */ sw $ra, 0x001C($sp) +/* 008BC 80AA690C AFBF001C */ sw $ra, 0x001C($sp) /* 008C0 80AA6910 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 008C4 80AA6914 24A541A8 */ addiu $a1, $a1, 0x41A8 ## $a1 = 060041A8 /* 008C8 80AA6918 2484018C */ addiu $a0, $a0, 0x018C ## $a0 = 0000018C -/* 008CC 80AA691C 0C0294D3 */ jal func_800A534C +/* 008CC 80AA691C 0C0294D3 */ jal SkelAnime_ChangeAnimTransitionRepeat /* 008D0 80AA6920 3C06C080 */ lui $a2, 0xC080 ## $a2 = C0800000 /* 008D4 80AA6924 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 /* 008D8 80AA6928 24040028 */ addiu $a0, $zero, 0x0028 ## $a0 = 00000028 /* 008DC 80AA692C 24050050 */ addiu $a1, $zero, 0x0050 ## $a1 = 00000050 /* 008E0 80AA6930 0C01DF64 */ jal Math_Rand_S16Offset - + /* 008E4 80AA6934 E6040068 */ swc1 $f4, 0x0068($s0) ## 00000068 /* 008E8 80AA6938 240E0006 */ addiu $t6, $zero, 0x0006 ## $t6 = 00000006 /* 008EC 80AA693C A602032A */ sh $v0, 0x032A($s0) ## 0000032A /* 008F0 80AA6940 AE0E0320 */ sw $t6, 0x0320($s0) ## 00000320 -/* 008F4 80AA6944 8FA50024 */ lw $a1, 0x0024($sp) -/* 008F8 80AA6948 0C2A9911 */ jal func_80AA6444 +/* 008F4 80AA6944 8FA50024 */ lw $a1, 0x0024($sp) +/* 008F8 80AA6948 0C2A9911 */ jal func_80AA6444 /* 008FC 80AA694C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 00900 80AA6950 3C0580AA */ lui $a1, %hi(func_80AA71AC) ## $a1 = 80AA0000 /* 00904 80AA6954 24A571AC */ addiu $a1, $a1, %lo(func_80AA71AC) ## $a1 = 80AA71AC -/* 00908 80AA6958 0C2A9814 */ jal func_80AA6050 +/* 00908 80AA6958 0C2A9814 */ jal func_80AA6050 /* 0090C 80AA695C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00910 80AA6960 8FBF001C */ lw $ra, 0x001C($sp) -/* 00914 80AA6964 8FB00018 */ lw $s0, 0x0018($sp) +/* 00910 80AA6960 8FBF001C */ lw $ra, 0x001C($sp) +/* 00914 80AA6964 8FB00018 */ lw $s0, 0x0018($sp) /* 00918 80AA6968 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 0091C 80AA696C 03E00008 */ jr $ra +/* 0091C 80AA696C 03E00008 */ jr $ra /* 00920 80AA6970 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Mb/func_80AA6974.s b/asm/non_matchings/overlays/actors/ovl_En_Mb/func_80AA6974.s index 221639e29b..96af81d026 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Mb/func_80AA6974.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Mb/func_80AA6974.s @@ -1,33 +1,33 @@ glabel func_80AA6974 /* 00924 80AA6974 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 00928 80AA6978 AFB00028 */ sw $s0, 0x0028($sp) +/* 00928 80AA6978 AFB00028 */ sw $s0, 0x0028($sp) /* 0092C 80AA697C 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00930 80AA6980 AFBF002C */ sw $ra, 0x002C($sp) +/* 00930 80AA6980 AFBF002C */ sw $ra, 0x002C($sp) /* 00934 80AA6984 3C040601 */ lui $a0, 0x0601 ## $a0 = 06010000 /* 00938 80AA6988 0C028800 */ jal SkelAnime_GetFrameCount - + /* 0093C 80AA698C 24849FC0 */ addiu $a0, $a0, 0x9FC0 ## $a0 = 06009FC0 /* 00940 80AA6990 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 00944 80AA6994 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 /* 00948 80AA6998 3C01C080 */ lui $at, 0xC080 ## $at = C0800000 -/* 0094C 80AA699C 468021A0 */ cvt.s.w $f6, $f4 +/* 0094C 80AA699C 468021A0 */ cvt.s.w $f6, $f4 /* 00950 80AA69A0 44814000 */ mtc1 $at, $f8 ## $f8 = -4.00 /* 00954 80AA69A4 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 -/* 00958 80AA69A8 44060000 */ mfc1 $a2, $f0 -/* 0095C 80AA69AC 44070000 */ mfc1 $a3, $f0 +/* 00958 80AA69A8 44060000 */ mfc1 $a2, $f0 +/* 0095C 80AA69AC 44070000 */ mfc1 $a3, $f0 /* 00960 80AA69B0 24A59FC0 */ addiu $a1, $a1, 0x9FC0 ## $a1 = 06009FC0 -/* 00964 80AA69B4 E7A60010 */ swc1 $f6, 0x0010($sp) +/* 00964 80AA69B4 E7A60010 */ swc1 $f6, 0x0010($sp) /* 00968 80AA69B8 2604018C */ addiu $a0, $s0, 0x018C ## $a0 = 0000018C -/* 0096C 80AA69BC AFA00014 */ sw $zero, 0x0014($sp) -/* 00970 80AA69C0 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 00974 80AA69C4 E7A80018 */ swc1 $f8, 0x0018($sp) +/* 0096C 80AA69BC AFA00014 */ sw $zero, 0x0014($sp) +/* 00970 80AA69C0 0C029468 */ jal SkelAnime_ChangeAnim + +/* 00974 80AA69C4 E7A80018 */ swc1 $f8, 0x0018($sp) /* 00978 80AA69C8 3C0180AB */ lui $at, %hi(D_80AA9E7C) ## $at = 80AB0000 -/* 0097C 80AA69CC C42A9E7C */ lwc1 $f10, %lo(D_80AA9E7C)($at) +/* 0097C 80AA69CC C42A9E7C */ lwc1 $f10, %lo(D_80AA9E7C)($at) /* 00980 80AA69D0 24040032 */ addiu $a0, $zero, 0x0032 ## $a0 = 00000032 /* 00984 80AA69D4 24050046 */ addiu $a1, $zero, 0x0046 ## $a1 = 00000046 /* 00988 80AA69D8 0C01DF64 */ jal Math_Rand_S16Offset - + /* 0098C 80AA69DC E60A0068 */ swc1 $f10, 0x0068($s0) ## 00000068 /* 00990 80AA69E0 240E0001 */ addiu $t6, $zero, 0x0001 ## $t6 = 00000001 /* 00994 80AA69E4 240F0009 */ addiu $t7, $zero, 0x0009 ## $t7 = 00000009 @@ -36,12 +36,12 @@ glabel func_80AA6974 /* 009A0 80AA69F0 A60E0332 */ sh $t6, 0x0332($s0) ## 00000332 /* 009A4 80AA69F4 AE0F0320 */ sw $t7, 0x0320($s0) ## 00000320 /* 009A8 80AA69F8 24A587D8 */ addiu $a1, $a1, %lo(func_80AA87D8) ## $a1 = 80AA87D8 -/* 009AC 80AA69FC 0C2A9814 */ jal func_80AA6050 +/* 009AC 80AA69FC 0C2A9814 */ jal func_80AA6050 /* 009B0 80AA6A00 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 009B4 80AA6A04 8FBF002C */ lw $ra, 0x002C($sp) -/* 009B8 80AA6A08 8FB00028 */ lw $s0, 0x0028($sp) +/* 009B4 80AA6A04 8FBF002C */ lw $ra, 0x002C($sp) +/* 009B8 80AA6A08 8FB00028 */ lw $s0, 0x0028($sp) /* 009BC 80AA6A0C 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 009C0 80AA6A10 03E00008 */ jr $ra +/* 009C0 80AA6A10 03E00008 */ jr $ra /* 009C4 80AA6A14 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Mb/func_80AA6A18.s b/asm/non_matchings/overlays/actors/ovl_En_Mb/func_80AA6A18.s index ab856d3595..3203f4673a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Mb/func_80AA6A18.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Mb/func_80AA6A18.s @@ -1,21 +1,21 @@ glabel func_80AA6A18 /* 009C8 80AA6A18 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 009CC 80AA6A1C AFB00028 */ sw $s0, 0x0028($sp) +/* 009CC 80AA6A1C AFB00028 */ sw $s0, 0x0028($sp) /* 009D0 80AA6A20 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 009D4 80AA6A24 AFBF002C */ sw $ra, 0x002C($sp) +/* 009D4 80AA6A24 AFBF002C */ sw $ra, 0x002C($sp) /* 009D8 80AA6A28 3C040601 */ lui $a0, 0x0601 ## $a0 = 06010000 /* 009DC 80AA6A2C 0C028800 */ jal SkelAnime_GetFrameCount - + /* 009E0 80AA6A30 24849FC0 */ addiu $a0, $a0, 0x9FC0 ## $a0 = 06009FC0 /* 009E4 80AA6A34 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 009E8 80AA6A38 3C0180AB */ lui $at, %hi(D_80AA9E80) ## $at = 80AB0000 -/* 009EC 80AA6A3C C4289E80 */ lwc1 $f8, %lo(D_80AA9E80)($at) -/* 009F0 80AA6A40 468021A0 */ cvt.s.w $f6, $f4 +/* 009EC 80AA6A3C C4289E80 */ lwc1 $f8, %lo(D_80AA9E80)($at) +/* 009F0 80AA6A40 468021A0 */ cvt.s.w $f6, $f4 /* 009F4 80AA6A44 24040032 */ addiu $a0, $zero, 0x0032 ## $a0 = 00000032 /* 009F8 80AA6A48 24050046 */ addiu $a1, $zero, 0x0046 ## $a1 = 00000046 -/* 009FC 80AA6A4C E7A60034 */ swc1 $f6, 0x0034($sp) +/* 009FC 80AA6A4C E7A60034 */ swc1 $f6, 0x0034($sp) /* 00A00 80AA6A50 0C01DF64 */ jal Math_Rand_S16Offset - + /* 00A04 80AA6A54 E6080068 */ swc1 $f8, 0x0068($s0) ## 00000068 /* 00A08 80AA6A58 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 /* 00A0C 80AA6A5C 240E0001 */ addiu $t6, $zero, 0x0001 ## $t6 = 00000001 @@ -25,26 +25,26 @@ glabel func_80AA6A18 /* 00A1C 80AA6A6C AE0F0320 */ sw $t7, 0x0320($s0) ## 00000320 /* 00A20 80AA6A70 3C01C080 */ lui $at, 0xC080 ## $at = C0800000 /* 00A24 80AA6A74 44818000 */ mtc1 $at, $f16 ## $f16 = -4.00 -/* 00A28 80AA6A78 C7AA0034 */ lwc1 $f10, 0x0034($sp) +/* 00A28 80AA6A78 C7AA0034 */ lwc1 $f10, 0x0034($sp) /* 00A2C 80AA6A7C 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 /* 00A30 80AA6A80 24180001 */ addiu $t8, $zero, 0x0001 ## $t8 = 00000001 -/* 00A34 80AA6A84 44060000 */ mfc1 $a2, $f0 -/* 00A38 80AA6A88 44070000 */ mfc1 $a3, $f0 -/* 00A3C 80AA6A8C AFB80014 */ sw $t8, 0x0014($sp) +/* 00A34 80AA6A84 44060000 */ mfc1 $a2, $f0 +/* 00A38 80AA6A88 44070000 */ mfc1 $a3, $f0 +/* 00A3C 80AA6A8C AFB80014 */ sw $t8, 0x0014($sp) /* 00A40 80AA6A90 24A59FC0 */ addiu $a1, $a1, 0x9FC0 ## $a1 = 06009FC0 /* 00A44 80AA6A94 2604018C */ addiu $a0, $s0, 0x018C ## $a0 = 0000018C -/* 00A48 80AA6A98 E7AA0010 */ swc1 $f10, 0x0010($sp) -/* 00A4C 80AA6A9C 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 00A50 80AA6AA0 E7B00018 */ swc1 $f16, 0x0018($sp) +/* 00A48 80AA6A98 E7AA0010 */ swc1 $f10, 0x0010($sp) +/* 00A4C 80AA6A9C 0C029468 */ jal SkelAnime_ChangeAnim + +/* 00A50 80AA6AA0 E7B00018 */ swc1 $f16, 0x0018($sp) /* 00A54 80AA6AA4 3C0580AB */ lui $a1, %hi(func_80AA8AEC) ## $a1 = 80AB0000 /* 00A58 80AA6AA8 24A58AEC */ addiu $a1, $a1, %lo(func_80AA8AEC) ## $a1 = 80AA8AEC -/* 00A5C 80AA6AAC 0C2A9814 */ jal func_80AA6050 +/* 00A5C 80AA6AAC 0C2A9814 */ jal func_80AA6050 /* 00A60 80AA6AB0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00A64 80AA6AB4 8FBF002C */ lw $ra, 0x002C($sp) -/* 00A68 80AA6AB8 8FB00028 */ lw $s0, 0x0028($sp) +/* 00A64 80AA6AB4 8FBF002C */ lw $ra, 0x002C($sp) +/* 00A68 80AA6AB8 8FB00028 */ lw $s0, 0x0028($sp) /* 00A6C 80AA6ABC 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 -/* 00A70 80AA6AC0 03E00008 */ jr $ra +/* 00A70 80AA6AC0 03E00008 */ jr $ra /* 00A74 80AA6AC4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Mb/func_80AA6AC8.s b/asm/non_matchings/overlays/actors/ovl_En_Mb/func_80AA6AC8.s index 916efbfaaa..bdaf17c70f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Mb/func_80AA6AC8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Mb/func_80AA6AC8.s @@ -1,53 +1,53 @@ glabel func_80AA6AC8 /* 00A78 80AA6AC8 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 00A7C 80AA6ACC AFB00018 */ sw $s0, 0x0018($sp) +/* 00A7C 80AA6ACC AFB00018 */ sw $s0, 0x0018($sp) /* 00A80 80AA6AD0 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00A84 80AA6AD4 AFBF001C */ sw $ra, 0x001C($sp) +/* 00A84 80AA6AD4 AFBF001C */ sw $ra, 0x001C($sp) /* 00A88 80AA6AD8 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 /* 00A8C 80AA6ADC 0C028800 */ jal SkelAnime_GetFrameCount - + /* 00A90 80AA6AE0 24842C10 */ addiu $a0, $a0, 0x2C10 ## $a0 = 06002C10 /* 00A94 80AA6AE4 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 00A98 80AA6AE8 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 00A9C 80AA6AEC 24A52C10 */ addiu $a1, $a1, 0x2C10 ## $a1 = 06002C10 -/* 00AA0 80AA6AF0 468021A0 */ cvt.s.w $f6, $f4 +/* 00AA0 80AA6AF0 468021A0 */ cvt.s.w $f6, $f4 /* 00AA4 80AA6AF4 2604018C */ addiu $a0, $s0, 0x018C ## $a0 = 0000018C /* 00AA8 80AA6AF8 3C06C080 */ lui $a2, 0xC080 ## $a2 = C0800000 -/* 00AAC 80AA6AFC 0C029490 */ jal func_800A5240 -/* 00AB0 80AA6B00 E7A60024 */ swc1 $f6, 0x0024($sp) +/* 00AAC 80AA6AFC 0C029490 */ jal SkelAnime_ChangeAnimTransitionStop +/* 00AB0 80AA6B00 E7A60024 */ swc1 $f6, 0x0024($sp) /* 00AB4 80AA6B04 44804000 */ mtc1 $zero, $f8 ## $f8 = 0.00 /* 00AB8 80AA6B08 240E000A */ addiu $t6, $zero, 0x000A ## $t6 = 0000000A /* 00ABC 80AA6B0C AE0E0320 */ sw $t6, 0x0320($s0) ## 00000320 /* 00AC0 80AA6B10 E6080068 */ swc1 $f8, 0x0068($s0) ## 00000068 -/* 00AC4 80AA6B14 C7AA0024 */ lwc1 $f10, 0x0024($sp) +/* 00AC4 80AA6B14 C7AA0024 */ lwc1 $f10, 0x0024($sp) /* 00AC8 80AA6B18 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 00ACC 80AA6B1C 240538BC */ addiu $a1, $zero, 0x38BC ## $a1 = 000038BC -/* 00AD0 80AA6B20 4600540D */ trunc.w.s $f16, $f10 -/* 00AD4 80AA6B24 44088000 */ mfc1 $t0, $f16 +/* 00AD0 80AA6B20 4600540D */ trunc.w.s $f16, $f10 +/* 00AD4 80AA6B24 44088000 */ mfc1 $t0, $f16 /* 00AD8 80AA6B28 00000000 */ nop /* 00ADC 80AA6B2C 25090006 */ addiu $t1, $t0, 0x0006 ## $t1 = 00000006 /* 00AE0 80AA6B30 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 00AE4 80AA6B34 A609032E */ sh $t1, 0x032E($s0) ## 0000032E /* 00AE8 80AA6B38 860A001C */ lh $t2, 0x001C($s0) ## 0000001C /* 00AEC 80AA6B3C 2401FFFF */ addiu $at, $zero, 0xFFFF ## $at = FFFFFFFF /* 00AF0 80AA6B40 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00AF4 80AA6B44 15410007 */ bne $t2, $at, .L80AA6B64 +/* 00AF4 80AA6B44 15410007 */ bne $t2, $at, .L80AA6B64 /* 00AF8 80AA6B48 3C0580AA */ lui $a1, %hi(func_80AA7CAC) ## $a1 = 80AA0000 /* 00AFC 80AA6B4C 3C0580AA */ lui $a1, %hi(func_80AA77D0) ## $a1 = 80AA0000 /* 00B00 80AA6B50 24A577D0 */ addiu $a1, $a1, %lo(func_80AA77D0) ## $a1 = 80AA77D0 -/* 00B04 80AA6B54 0C2A9814 */ jal func_80AA6050 +/* 00B04 80AA6B54 0C2A9814 */ jal func_80AA6050 /* 00B08 80AA6B58 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00B0C 80AA6B5C 10000004 */ beq $zero, $zero, .L80AA6B70 -/* 00B10 80AA6B60 8FBF001C */ lw $ra, 0x001C($sp) +/* 00B0C 80AA6B5C 10000004 */ beq $zero, $zero, .L80AA6B70 +/* 00B10 80AA6B60 8FBF001C */ lw $ra, 0x001C($sp) .L80AA6B64: -/* 00B14 80AA6B64 0C2A9814 */ jal func_80AA6050 +/* 00B14 80AA6B64 0C2A9814 */ jal func_80AA6050 /* 00B18 80AA6B68 24A57CAC */ addiu $a1, $a1, %lo(func_80AA7CAC) ## $a1 = 00007CAC -/* 00B1C 80AA6B6C 8FBF001C */ lw $ra, 0x001C($sp) +/* 00B1C 80AA6B6C 8FBF001C */ lw $ra, 0x001C($sp) .L80AA6B70: -/* 00B20 80AA6B70 8FB00018 */ lw $s0, 0x0018($sp) +/* 00B20 80AA6B70 8FB00018 */ lw $s0, 0x0018($sp) /* 00B24 80AA6B74 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 00B28 80AA6B78 03E00008 */ jr $ra +/* 00B28 80AA6B78 03E00008 */ jr $ra /* 00B2C 80AA6B7C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Mb/func_80AA6B80.s b/asm/non_matchings/overlays/actors/ovl_En_Mb/func_80AA6B80.s index 2fae4a469a..6e3b2f121b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Mb/func_80AA6B80.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Mb/func_80AA6B80.s @@ -1,17 +1,17 @@ glabel func_80AA6B80 /* 00B30 80AA6B80 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00B34 80AA6B84 AFBF0014 */ sw $ra, 0x0014($sp) +/* 00B34 80AA6B84 AFBF0014 */ sw $ra, 0x0014($sp) /* 00B38 80AA6B88 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 /* 00B3C 80AA6B8C 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 00B40 80AA6B90 24A52F10 */ addiu $a1, $a1, 0x2F10 ## $a1 = 06002F10 -/* 00B44 80AA6B94 AFA60018 */ sw $a2, 0x0018($sp) -/* 00B48 80AA6B98 0C0294BE */ jal func_800A52F8 +/* 00B44 80AA6B94 AFA60018 */ sw $a2, 0x0018($sp) +/* 00B48 80AA6B98 0C0294BE */ jal SkelAnime_ChangeAnimDefaultRepeat /* 00B4C 80AA6B9C 2484018C */ addiu $a0, $a0, 0x018C ## $a0 = 0000018C -/* 00B50 80AA6BA0 8FA40018 */ lw $a0, 0x0018($sp) +/* 00B50 80AA6BA0 8FA40018 */ lw $a0, 0x0018($sp) /* 00B54 80AA6BA4 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 00B58 80AA6BA8 240538BA */ addiu $a1, $zero, 0x38BA ## $a1 = 000038BA -/* 00B5C 80AA6BAC 8FA40018 */ lw $a0, 0x0018($sp) +/* 00B5C 80AA6BAC 8FA40018 */ lw $a0, 0x0018($sp) /* 00B60 80AA6BB0 3C014120 */ lui $at, 0x4120 ## $at = 41200000 /* 00B64 80AA6BB4 44812000 */ mtc1 $at, $f4 ## $f4 = 10.00 /* 00B68 80AA6BB8 240E0001 */ addiu $t6, $zero, 0x0001 ## $t6 = 00000001 @@ -22,11 +22,11 @@ glabel func_80AA6B80 /* 00B7C 80AA6BCC A48E0334 */ sh $t6, 0x0334($a0) ## 00000334 /* 00B80 80AA6BD0 AC8F0320 */ sw $t7, 0x0320($a0) ## 00000320 /* 00B84 80AA6BD4 A498032E */ sh $t8, 0x032E($a0) ## 0000032E -/* 00B88 80AA6BD8 0C2A9814 */ jal func_80AA6050 +/* 00B88 80AA6BD8 0C2A9814 */ jal func_80AA6050 /* 00B8C 80AA6BDC E4840068 */ swc1 $f4, 0x0068($a0) ## 00000068 -/* 00B90 80AA6BE0 8FBF0014 */ lw $ra, 0x0014($sp) +/* 00B90 80AA6BE0 8FBF0014 */ lw $ra, 0x0014($sp) /* 00B94 80AA6BE4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00B98 80AA6BE8 03E00008 */ jr $ra +/* 00B98 80AA6BE8 03E00008 */ jr $ra /* 00B9C 80AA6BEC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Mb/func_80AA6BF0.s b/asm/non_matchings/overlays/actors/ovl_En_Mb/func_80AA6BF0.s index a390e2003d..ae0a9bf032 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Mb/func_80AA6BF0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Mb/func_80AA6BF0.s @@ -1,62 +1,62 @@ glabel func_80AA6BF0 /* 00BA0 80AA6BF0 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 00BA4 80AA6BF4 AFB00028 */ sw $s0, 0x0028($sp) +/* 00BA4 80AA6BF4 AFB00028 */ sw $s0, 0x0028($sp) /* 00BA8 80AA6BF8 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00BAC 80AA6BFC AFBF002C */ sw $ra, 0x002C($sp) +/* 00BAC 80AA6BFC AFBF002C */ sw $ra, 0x002C($sp) /* 00BB0 80AA6C00 3C040601 */ lui $a0, 0x0601 ## $a0 = 06010000 /* 00BB4 80AA6C04 0C028800 */ jal SkelAnime_GetFrameCount - + /* 00BB8 80AA6C08 2484B4BC */ addiu $a0, $a0, 0xB4BC ## $a0 = 0600B4BC /* 00BBC 80AA6C0C 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 00BC0 80AA6C10 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 /* 00BC4 80AA6C14 240E000A */ addiu $t6, $zero, 0x000A ## $t6 = 0000000A -/* 00BC8 80AA6C18 468021A0 */ cvt.s.w $f6, $f4 +/* 00BC8 80AA6C18 468021A0 */ cvt.s.w $f6, $f4 /* 00BCC 80AA6C1C AE0E0320 */ sw $t6, 0x0320($s0) ## 00000320 /* 00BD0 80AA6C20 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 /* 00BD4 80AA6C24 240F0003 */ addiu $t7, $zero, 0x0003 ## $t7 = 00000003 -/* 00BD8 80AA6C28 44070000 */ mfc1 $a3, $f0 -/* 00BDC 80AA6C2C AFAF0014 */ sw $t7, 0x0014($sp) +/* 00BD8 80AA6C28 44070000 */ mfc1 $a3, $f0 +/* 00BDC 80AA6C2C AFAF0014 */ sw $t7, 0x0014($sp) /* 00BE0 80AA6C30 24A5B4BC */ addiu $a1, $a1, 0xB4BC ## $a1 = 0600B4BC -/* 00BE4 80AA6C34 E7A60010 */ swc1 $f6, 0x0010($sp) +/* 00BE4 80AA6C34 E7A60010 */ swc1 $f6, 0x0010($sp) /* 00BE8 80AA6C38 2604018C */ addiu $a0, $s0, 0x018C ## $a0 = 0000018C /* 00BEC 80AA6C3C 3C064040 */ lui $a2, 0x4040 ## $a2 = 40400000 -/* 00BF0 80AA6C40 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 00BF4 80AA6C44 E7A00018 */ swc1 $f0, 0x0018($sp) +/* 00BF0 80AA6C40 0C029468 */ jal SkelAnime_ChangeAnim + +/* 00BF4 80AA6C44 E7A00018 */ swc1 $f0, 0x0018($sp) /* 00BF8 80AA6C48 86180032 */ lh $t8, 0x0032($s0) ## 00000032 /* 00BFC 80AA6C4C 8619008A */ lh $t9, 0x008A($s0) ## 0000008A /* 00C00 80AA6C50 24040001 */ addiu $a0, $zero, 0x0001 ## $a0 = 00000001 /* 00C04 80AA6C54 A604032E */ sh $a0, 0x032E($s0) ## 0000032E -/* 00C08 80AA6C58 03191023 */ subu $v0, $t8, $t9 -/* 00C0C 80AA6C5C 00021400 */ sll $v0, $v0, 16 -/* 00C10 80AA6C60 00021403 */ sra $v0, $v0, 16 -/* 00C14 80AA6C64 04400003 */ bltz $v0, .L80AA6C74 +/* 00C08 80AA6C58 03191023 */ subu $v0, $t8, $t9 +/* 00C0C 80AA6C5C 00021400 */ sll $v0, $v0, 16 +/* 00C10 80AA6C60 00021403 */ sra $v0, $v0, 16 +/* 00C14 80AA6C64 04400003 */ bltz $v0, .L80AA6C74 /* 00C18 80AA6C68 3C0580AA */ lui $a1, %hi(func_80AA7938) ## $a1 = 80AA0000 -/* 00C1C 80AA6C6C 10000002 */ beq $zero, $zero, .L80AA6C78 +/* 00C1C 80AA6C6C 10000002 */ beq $zero, $zero, .L80AA6C78 /* 00C20 80AA6C70 00401825 */ or $v1, $v0, $zero ## $v1 = 00000000 .L80AA6C74: -/* 00C24 80AA6C74 00021823 */ subu $v1, $zero, $v0 +/* 00C24 80AA6C74 00021823 */ subu $v1, $zero, $v0 .L80AA6C78: -/* 00C28 80AA6C78 28610259 */ slti $at, $v1, 0x0259 -/* 00C2C 80AA6C7C 10200004 */ beq $at, $zero, .L80AA6C90 +/* 00C28 80AA6C78 28610259 */ slti $at, $v1, 0x0259 +/* 00C2C 80AA6C7C 10200004 */ beq $at, $zero, .L80AA6C90 /* 00C30 80AA6C80 24A57938 */ addiu $a1, $a1, %lo(func_80AA7938) ## $a1 = 80AA7938 /* 00C34 80AA6C84 24080002 */ addiu $t0, $zero, 0x0002 ## $t0 = 00000002 -/* 00C38 80AA6C88 10000006 */ beq $zero, $zero, .L80AA6CA4 +/* 00C38 80AA6C88 10000006 */ beq $zero, $zero, .L80AA6CA4 /* 00C3C 80AA6C8C A6080334 */ sh $t0, 0x0334($s0) ## 00000334 .L80AA6C90: -/* 00C40 80AA6C90 04400003 */ bltz $v0, .L80AA6CA0 +/* 00C40 80AA6C90 04400003 */ bltz $v0, .L80AA6CA0 /* 00C44 80AA6C94 24090003 */ addiu $t1, $zero, 0x0003 ## $t1 = 00000003 -/* 00C48 80AA6C98 10000002 */ beq $zero, $zero, .L80AA6CA4 +/* 00C48 80AA6C98 10000002 */ beq $zero, $zero, .L80AA6CA4 /* 00C4C 80AA6C9C A6040334 */ sh $a0, 0x0334($s0) ## 00000334 .L80AA6CA0: /* 00C50 80AA6CA0 A6090334 */ sh $t1, 0x0334($s0) ## 00000334 .L80AA6CA4: -/* 00C54 80AA6CA4 0C2A9814 */ jal func_80AA6050 +/* 00C54 80AA6CA4 0C2A9814 */ jal func_80AA6050 /* 00C58 80AA6CA8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00C5C 80AA6CAC 8FBF002C */ lw $ra, 0x002C($sp) -/* 00C60 80AA6CB0 8FB00028 */ lw $s0, 0x0028($sp) +/* 00C5C 80AA6CAC 8FBF002C */ lw $ra, 0x002C($sp) +/* 00C60 80AA6CB0 8FB00028 */ lw $s0, 0x0028($sp) /* 00C64 80AA6CB4 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 00C68 80AA6CB8 03E00008 */ jr $ra +/* 00C68 80AA6CB8 03E00008 */ jr $ra /* 00C6C 80AA6CBC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Mb/func_80AA6CC0.s b/asm/non_matchings/overlays/actors/ovl_En_Mb/func_80AA6CC0.s index 9afc93bb1a..238e5a0de6 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Mb/func_80AA6CC0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Mb/func_80AA6CC0.s @@ -1,28 +1,28 @@ glabel func_80AA6CC0 /* 00C70 80AA6CC0 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00C74 80AA6CC4 AFBF0014 */ sw $ra, 0x0014($sp) +/* 00C74 80AA6CC4 AFBF0014 */ sw $ra, 0x0014($sp) /* 00C78 80AA6CC8 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 /* 00C7C 80AA6CCC 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 /* 00C80 80AA6CD0 24A59280 */ addiu $a1, $a1, 0x9280 ## $a1 = 06009280 -/* 00C84 80AA6CD4 AFA60018 */ sw $a2, 0x0018($sp) -/* 00C88 80AA6CD8 0C02947A */ jal func_800A51E8 +/* 00C84 80AA6CD4 AFA60018 */ sw $a2, 0x0018($sp) +/* 00C88 80AA6CD8 0C02947A */ jal SkelAnime_ChangeAnimDefaultStop /* 00C8C 80AA6CDC 2484018C */ addiu $a0, $a0, 0x018C ## $a0 = 0000018C -/* 00C90 80AA6CE0 8FA40018 */ lw $a0, 0x0018($sp) +/* 00C90 80AA6CE0 8FA40018 */ lw $a0, 0x0018($sp) /* 00C94 80AA6CE4 240E000B */ addiu $t6, $zero, 0x000B ## $t6 = 0000000B /* 00C98 80AA6CE8 240F0005 */ addiu $t7, $zero, 0x0005 ## $t7 = 00000005 /* 00C9C 80AA6CEC 240538B9 */ addiu $a1, $zero, 0x38B9 ## $a1 = 000038B9 /* 00CA0 80AA6CF0 AC8E0320 */ sw $t6, 0x0320($a0) ## 00000320 /* 00CA4 80AA6CF4 A480032A */ sh $zero, 0x032A($a0) ## 0000032A /* 00CA8 80AA6CF8 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 00CAC 80AA6CFC A48F032E */ sh $t7, 0x032E($a0) ## 0000032E /* 00CB0 80AA6D00 3C0580AA */ lui $a1, %hi(func_80AA7310) ## $a1 = 80AA0000 -/* 00CB4 80AA6D04 8FA40018 */ lw $a0, 0x0018($sp) -/* 00CB8 80AA6D08 0C2A9814 */ jal func_80AA6050 +/* 00CB4 80AA6D04 8FA40018 */ lw $a0, 0x0018($sp) +/* 00CB8 80AA6D08 0C2A9814 */ jal func_80AA6050 /* 00CBC 80AA6D0C 24A57310 */ addiu $a1, $a1, %lo(func_80AA7310) ## $a1 = 80AA7310 -/* 00CC0 80AA6D10 8FBF0014 */ lw $ra, 0x0014($sp) +/* 00CC0 80AA6D10 8FBF0014 */ lw $ra, 0x0014($sp) /* 00CC4 80AA6D14 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00CC8 80AA6D18 03E00008 */ jr $ra +/* 00CC8 80AA6D18 03E00008 */ jr $ra /* 00CCC 80AA6D1C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Mb/func_80AA6D20.s b/asm/non_matchings/overlays/actors/ovl_En_Mb/func_80AA6D20.s index cefa551c6f..e26a94bd55 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Mb/func_80AA6D20.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Mb/func_80AA6D20.s @@ -1,13 +1,13 @@ glabel func_80AA6D20 /* 00CD0 80AA6D20 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00CD4 80AA6D24 AFBF0014 */ sw $ra, 0x0014($sp) +/* 00CD4 80AA6D24 AFBF0014 */ sw $ra, 0x0014($sp) /* 00CD8 80AA6D28 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 /* 00CDC 80AA6D2C 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 /* 00CE0 80AA6D30 24A59280 */ addiu $a1, $a1, 0x9280 ## $a1 = 06009280 -/* 00CE4 80AA6D34 AFA60018 */ sw $a2, 0x0018($sp) -/* 00CE8 80AA6D38 0C02947A */ jal func_800A51E8 +/* 00CE4 80AA6D34 AFA60018 */ sw $a2, 0x0018($sp) +/* 00CE8 80AA6D38 0C02947A */ jal SkelAnime_ChangeAnimDefaultStop /* 00CEC 80AA6D3C 2484018C */ addiu $a0, $a0, 0x018C ## $a0 = 0000018C -/* 00CF0 80AA6D40 8FA40018 */ lw $a0, 0x0018($sp) +/* 00CF0 80AA6D40 8FA40018 */ lw $a0, 0x0018($sp) /* 00CF4 80AA6D44 3C01C100 */ lui $at, 0xC100 ## $at = C1000000 /* 00CF8 80AA6D48 44812000 */ mtc1 $at, $f4 ## $f4 = -8.00 /* 00CFC 80AA6D4C 948F0088 */ lhu $t7, 0x0088($a0) ## 00000088 @@ -23,15 +23,15 @@ glabel func_80AA6D20 /* 00D24 80AA6D74 A499032E */ sh $t9, 0x032E($a0) ## 0000032E /* 00D28 80AA6D78 E4840068 */ swc1 $f4, 0x0068($a0) ## 00000068 /* 00D2C 80AA6D7C 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 00D30 80AA6D80 E4860060 */ swc1 $f6, 0x0060($a0) ## 00000060 /* 00D34 80AA6D84 3C0580AA */ lui $a1, %hi(func_80AA74BC) ## $a1 = 80AA0000 -/* 00D38 80AA6D88 8FA40018 */ lw $a0, 0x0018($sp) -/* 00D3C 80AA6D8C 0C2A9814 */ jal func_80AA6050 +/* 00D38 80AA6D88 8FA40018 */ lw $a0, 0x0018($sp) +/* 00D3C 80AA6D8C 0C2A9814 */ jal func_80AA6050 /* 00D40 80AA6D90 24A574BC */ addiu $a1, $a1, %lo(func_80AA74BC) ## $a1 = 80AA74BC -/* 00D44 80AA6D94 8FBF0014 */ lw $ra, 0x0014($sp) +/* 00D44 80AA6D94 8FBF0014 */ lw $ra, 0x0014($sp) /* 00D48 80AA6D98 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00D4C 80AA6D9C 03E00008 */ jr $ra +/* 00D4C 80AA6D9C 03E00008 */ jr $ra /* 00D50 80AA6DA0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Mb/func_80AA6DA4.s b/asm/non_matchings/overlays/actors/ovl_En_Mb/func_80AA6DA4.s index 9c08e37185..49ba3c86ae 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Mb/func_80AA6DA4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Mb/func_80AA6DA4.s @@ -1,35 +1,35 @@ glabel func_80AA6DA4 /* 00D54 80AA6DA4 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 00D58 80AA6DA8 AFA40028 */ sw $a0, 0x0028($sp) -/* 00D5C 80AA6DAC AFBF0024 */ sw $ra, 0x0024($sp) +/* 00D58 80AA6DA8 AFA40028 */ sw $a0, 0x0028($sp) +/* 00D5C 80AA6DAC AFBF0024 */ sw $ra, 0x0024($sp) /* 00D60 80AA6DB0 3C040601 */ lui $a0, 0x0601 ## $a0 = 06010000 /* 00D64 80AA6DB4 0C028800 */ jal SkelAnime_GetFrameCount - + /* 00D68 80AA6DB8 2484EBE4 */ addiu $a0, $a0, 0xEBE4 ## $a0 = 0600EBE4 /* 00D6C 80AA6DBC 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 -/* 00D70 80AA6DC0 8FA30028 */ lw $v1, 0x0028($sp) +/* 00D70 80AA6DC0 8FA30028 */ lw $v1, 0x0028($sp) /* 00D74 80AA6DC4 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 00D78 80AA6DC8 468021A0 */ cvt.s.w $f6, $f4 +/* 00D78 80AA6DC8 468021A0 */ cvt.s.w $f6, $f4 /* 00D7C 80AA6DCC 240E000B */ addiu $t6, $zero, 0x000B ## $t6 = 0000000B /* 00D80 80AA6DD0 AC6E0320 */ sw $t6, 0x0320($v1) ## 00000320 /* 00D84 80AA6DD4 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 /* 00D88 80AA6DD8 240F0003 */ addiu $t7, $zero, 0x0003 ## $t7 = 00000003 -/* 00D8C 80AA6DDC 44070000 */ mfc1 $a3, $f0 -/* 00D90 80AA6DE0 AFAF0014 */ sw $t7, 0x0014($sp) +/* 00D8C 80AA6DDC 44070000 */ mfc1 $a3, $f0 +/* 00D90 80AA6DE0 AFAF0014 */ sw $t7, 0x0014($sp) /* 00D94 80AA6DE4 24A5EBE4 */ addiu $a1, $a1, 0xEBE4 ## $a1 = 0600EBE4 -/* 00D98 80AA6DE8 E7A60010 */ swc1 $f6, 0x0010($sp) +/* 00D98 80AA6DE8 E7A60010 */ swc1 $f6, 0x0010($sp) /* 00D9C 80AA6DEC 3C0640A0 */ lui $a2, 0x40A0 ## $a2 = 40A00000 /* 00DA0 80AA6DF0 2464018C */ addiu $a0, $v1, 0x018C ## $a0 = 0000018C -/* 00DA4 80AA6DF4 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 00DA8 80AA6DF8 E7A00018 */ swc1 $f0, 0x0018($sp) +/* 00DA4 80AA6DF4 0C029468 */ jal SkelAnime_ChangeAnim + +/* 00DA8 80AA6DF8 E7A00018 */ swc1 $f0, 0x0018($sp) /* 00DAC 80AA6DFC 3C0580AA */ lui $a1, %hi(func_80AA7478) ## $a1 = 80AA0000 /* 00DB0 80AA6E00 24A57478 */ addiu $a1, $a1, %lo(func_80AA7478) ## $a1 = 80AA7478 -/* 00DB4 80AA6E04 0C2A9814 */ jal func_80AA6050 -/* 00DB8 80AA6E08 8FA40028 */ lw $a0, 0x0028($sp) -/* 00DBC 80AA6E0C 8FBF0024 */ lw $ra, 0x0024($sp) +/* 00DB4 80AA6E04 0C2A9814 */ jal func_80AA6050 +/* 00DB8 80AA6E08 8FA40028 */ lw $a0, 0x0028($sp) +/* 00DBC 80AA6E0C 8FBF0024 */ lw $ra, 0x0024($sp) /* 00DC0 80AA6E10 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 00DC4 80AA6E14 03E00008 */ jr $ra +/* 00DC4 80AA6E14 03E00008 */ jr $ra /* 00DC8 80AA6E18 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Mb/func_80AA6E1C.s b/asm/non_matchings/overlays/actors/ovl_En_Mb/func_80AA6E1C.s index d8cdf5eff7..78fd723672 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Mb/func_80AA6E1C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Mb/func_80AA6E1C.s @@ -1,28 +1,28 @@ glabel func_80AA6E1C /* 00DCC 80AA6E1C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00DD0 80AA6E20 AFBF0014 */ sw $ra, 0x0014($sp) +/* 00DD0 80AA6E20 AFBF0014 */ sw $ra, 0x0014($sp) /* 00DD4 80AA6E24 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 /* 00DD8 80AA6E28 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 /* 00DDC 80AA6E2C 24A5C44C */ addiu $a1, $a1, 0xC44C ## $a1 = 0600C44C -/* 00DE0 80AA6E30 AFA60018 */ sw $a2, 0x0018($sp) -/* 00DE4 80AA6E34 0C02947A */ jal func_800A51E8 +/* 00DE0 80AA6E30 AFA60018 */ sw $a2, 0x0018($sp) +/* 00DE4 80AA6E34 0C02947A */ jal SkelAnime_ChangeAnimDefaultStop /* 00DE8 80AA6E38 2484018C */ addiu $a0, $a0, 0x018C ## $a0 = 0000018C -/* 00DEC 80AA6E3C 8FA40018 */ lw $a0, 0x0018($sp) +/* 00DEC 80AA6E3C 8FA40018 */ lw $a0, 0x0018($sp) /* 00DF0 80AA6E40 240E0003 */ addiu $t6, $zero, 0x0003 ## $t6 = 00000003 /* 00DF4 80AA6E44 240F0014 */ addiu $t7, $zero, 0x0014 ## $t7 = 00000014 /* 00DF8 80AA6E48 240538BE */ addiu $a1, $zero, 0x38BE ## $a1 = 000038BE /* 00DFC 80AA6E4C AC8E0320 */ sw $t6, 0x0320($a0) ## 00000320 /* 00E00 80AA6E50 A480032A */ sh $zero, 0x032A($a0) ## 0000032A /* 00E04 80AA6E54 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 00E08 80AA6E58 A48F032E */ sh $t7, 0x032E($a0) ## 0000032E /* 00E0C 80AA6E5C 3C0580AB */ lui $a1, %hi(func_80AA8378) ## $a1 = 80AB0000 -/* 00E10 80AA6E60 8FA40018 */ lw $a0, 0x0018($sp) -/* 00E14 80AA6E64 0C2A9814 */ jal func_80AA6050 +/* 00E10 80AA6E60 8FA40018 */ lw $a0, 0x0018($sp) +/* 00E14 80AA6E64 0C2A9814 */ jal func_80AA6050 /* 00E18 80AA6E68 24A58378 */ addiu $a1, $a1, %lo(func_80AA8378) ## $a1 = 80AA8378 -/* 00E1C 80AA6E6C 8FBF0014 */ lw $ra, 0x0014($sp) +/* 00E1C 80AA6E6C 8FBF0014 */ lw $ra, 0x0014($sp) /* 00E20 80AA6E70 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00E24 80AA6E74 03E00008 */ jr $ra +/* 00E24 80AA6E74 03E00008 */ jr $ra /* 00E28 80AA6E78 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Mb/func_80AA6E7C.s b/asm/non_matchings/overlays/actors/ovl_En_Mb/func_80AA6E7C.s index 5dae39796e..decb1c13b7 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Mb/func_80AA6E7C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Mb/func_80AA6E7C.s @@ -1,39 +1,39 @@ glabel func_80AA6E7C /* 00E2C 80AA6E7C 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 00E30 80AA6E80 AFB00028 */ sw $s0, 0x0028($sp) +/* 00E30 80AA6E80 AFB00028 */ sw $s0, 0x0028($sp) /* 00E34 80AA6E84 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00E38 80AA6E88 AFBF002C */ sw $ra, 0x002C($sp) +/* 00E38 80AA6E88 AFBF002C */ sw $ra, 0x002C($sp) /* 00E3C 80AA6E8C 3C040601 */ lui $a0, 0x0601 ## $a0 = 06010000 /* 00E40 80AA6E90 0C028800 */ jal SkelAnime_GetFrameCount - + /* 00E44 80AA6E94 2484D5D4 */ addiu $a0, $a0, 0xD5D4 ## $a0 = 0600D5D4 /* 00E48 80AA6E98 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 00E4C 80AA6E9C 240E0002 */ addiu $t6, $zero, 0x0002 ## $t6 = 00000002 /* 00E50 80AA6EA0 240F0006 */ addiu $t7, $zero, 0x0006 ## $t7 = 00000006 -/* 00E54 80AA6EA4 468021A0 */ cvt.s.w $f6, $f4 +/* 00E54 80AA6EA4 468021A0 */ cvt.s.w $f6, $f4 /* 00E58 80AA6EA8 44804000 */ mtc1 $zero, $f8 ## $f8 = 0.00 /* 00E5C 80AA6EAC AE0E0320 */ sw $t6, 0x0320($s0) ## 00000320 /* 00E60 80AA6EB0 A600032A */ sh $zero, 0x032A($s0) ## 0000032A /* 00E64 80AA6EB4 A60F032E */ sh $t7, 0x032E($s0) ## 0000032E /* 00E68 80AA6EB8 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 /* 00E6C 80AA6EBC 24180003 */ addiu $t8, $zero, 0x0003 ## $t8 = 00000003 -/* 00E70 80AA6EC0 AFB80014 */ sw $t8, 0x0014($sp) +/* 00E70 80AA6EC0 AFB80014 */ sw $t8, 0x0014($sp) /* 00E74 80AA6EC4 24A5D5D4 */ addiu $a1, $a1, 0xD5D4 ## $a1 = 0600D5D4 -/* 00E78 80AA6EC8 E7A60010 */ swc1 $f6, 0x0010($sp) +/* 00E78 80AA6EC8 E7A60010 */ swc1 $f6, 0x0010($sp) /* 00E7C 80AA6ECC 2604018C */ addiu $a0, $s0, 0x018C ## $a0 = 0000018C /* 00E80 80AA6ED0 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 00E84 80AA6ED4 3C074080 */ lui $a3, 0x4080 ## $a3 = 40800000 -/* 00E88 80AA6ED8 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 00E8C 80AA6EDC E7A80018 */ swc1 $f8, 0x0018($sp) +/* 00E88 80AA6ED8 0C029468 */ jal SkelAnime_ChangeAnim + +/* 00E8C 80AA6EDC E7A80018 */ swc1 $f8, 0x0018($sp) /* 00E90 80AA6EE0 3C0580AB */ lui $a1, %hi(func_80AA840C) ## $a1 = 80AB0000 /* 00E94 80AA6EE4 24A5840C */ addiu $a1, $a1, %lo(func_80AA840C) ## $a1 = 80AA840C -/* 00E98 80AA6EE8 0C2A9814 */ jal func_80AA6050 +/* 00E98 80AA6EE8 0C2A9814 */ jal func_80AA6050 /* 00E9C 80AA6EEC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00EA0 80AA6EF0 8FBF002C */ lw $ra, 0x002C($sp) -/* 00EA4 80AA6EF4 8FB00028 */ lw $s0, 0x0028($sp) +/* 00EA0 80AA6EF0 8FBF002C */ lw $ra, 0x002C($sp) +/* 00EA4 80AA6EF4 8FB00028 */ lw $s0, 0x0028($sp) /* 00EA8 80AA6EF8 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 00EAC 80AA6EFC 03E00008 */ jr $ra +/* 00EAC 80AA6EFC 03E00008 */ jr $ra /* 00EB0 80AA6F00 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Mb/func_80AA6F04.s b/asm/non_matchings/overlays/actors/ovl_En_Mb/func_80AA6F04.s index 2aded4b6b3..e067646c5f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Mb/func_80AA6F04.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Mb/func_80AA6F04.s @@ -1,14 +1,14 @@ glabel func_80AA6F04 /* 00EB4 80AA6F04 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00EB8 80AA6F08 AFBF0014 */ sw $ra, 0x0014($sp) +/* 00EB8 80AA6F08 AFBF0014 */ sw $ra, 0x0014($sp) /* 00EBC 80AA6F0C 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 /* 00EC0 80AA6F10 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 /* 00EC4 80AA6F14 24A5BE58 */ addiu $a1, $a1, 0xBE58 ## $a1 = 0600BE58 -/* 00EC8 80AA6F18 AFA70018 */ sw $a3, 0x0018($sp) +/* 00EC8 80AA6F18 AFA70018 */ sw $a3, 0x0018($sp) /* 00ECC 80AA6F1C 2484018C */ addiu $a0, $a0, 0x018C ## $a0 = 0000018C -/* 00ED0 80AA6F20 0C029490 */ jal func_800A5240 +/* 00ED0 80AA6F20 0C029490 */ jal SkelAnime_ChangeAnimTransitionStop /* 00ED4 80AA6F24 3C06C080 */ lui $a2, 0xC080 ## $a2 = C0800000 -/* 00ED8 80AA6F28 8FA40018 */ lw $a0, 0x0018($sp) +/* 00ED8 80AA6F28 8FA40018 */ lw $a0, 0x0018($sp) /* 00EDC 80AA6F2C 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 /* 00EE0 80AA6F30 2401FFFE */ addiu $at, $zero, 0xFFFE ## $at = FFFFFFFE /* 00EE4 80AA6F34 8C8F0004 */ lw $t7, 0x0004($a0) ## 00000004 @@ -16,7 +16,7 @@ glabel func_80AA6F04 /* 00EEC 80AA6F3C 24190050 */ addiu $t9, $zero, 0x0050 ## $t9 = 00000050 /* 00EF0 80AA6F40 2408005F */ addiu $t0, $zero, 0x005F ## $t0 = 0000005F /* 00EF4 80AA6F44 2409001E */ addiu $t1, $zero, 0x001E ## $t1 = 0000001E -/* 00EF8 80AA6F48 01E1C024 */ and $t8, $t7, $at +/* 00EF8 80AA6F48 01E1C024 */ and $t8, $t7, $at /* 00EFC 80AA6F4C 240538BE */ addiu $a1, $zero, 0x38BE ## $a1 = 000038BE /* 00F00 80AA6F50 AC8E0320 */ sw $t6, 0x0320($a0) ## 00000320 /* 00F04 80AA6F54 AC980004 */ sw $t8, 0x0004($a0) ## 00000004 @@ -24,15 +24,15 @@ glabel func_80AA6F04 /* 00F0C 80AA6F5C A48803A8 */ sh $t0, 0x03A8($a0) ## 000003A8 /* 00F10 80AA6F60 A489032A */ sh $t1, 0x032A($a0) ## 0000032A /* 00F14 80AA6F64 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 00F18 80AA6F68 E4840068 */ swc1 $f4, 0x0068($a0) ## 00000068 /* 00F1C 80AA6F6C 3C0580AB */ lui $a1, %hi(func_80AA8514) ## $a1 = 80AB0000 -/* 00F20 80AA6F70 8FA40018 */ lw $a0, 0x0018($sp) -/* 00F24 80AA6F74 0C2A9814 */ jal func_80AA6050 +/* 00F20 80AA6F70 8FA40018 */ lw $a0, 0x0018($sp) +/* 00F24 80AA6F74 0C2A9814 */ jal func_80AA6050 /* 00F28 80AA6F78 24A58514 */ addiu $a1, $a1, %lo(func_80AA8514) ## $a1 = 80AA8514 -/* 00F2C 80AA6F7C 8FBF0014 */ lw $ra, 0x0014($sp) +/* 00F2C 80AA6F7C 8FBF0014 */ lw $ra, 0x0014($sp) /* 00F30 80AA6F80 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00F34 80AA6F84 03E00008 */ jr $ra +/* 00F34 80AA6F84 03E00008 */ jr $ra /* 00F38 80AA6F88 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Mb/func_80AA6F8C.s b/asm/non_matchings/overlays/actors/ovl_En_Mb/func_80AA6F8C.s index ae2a7d8cf1..ceff5b4154 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Mb/func_80AA6F8C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Mb/func_80AA6F8C.s @@ -1,47 +1,47 @@ glabel func_80AA6F8C /* 00F3C 80AA6F8C 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 /* 00F40 80AA6F90 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 -/* 00F44 80AA6F94 AFBF0024 */ sw $ra, 0x0024($sp) -/* 00F48 80AA6F98 AFB00020 */ sw $s0, 0x0020($sp) +/* 00F44 80AA6F94 AFBF0024 */ sw $ra, 0x0024($sp) +/* 00F48 80AA6F98 AFB00020 */ sw $s0, 0x0020($sp) /* 00F4C 80AA6F9C 240E0005 */ addiu $t6, $zero, 0x0005 ## $t6 = 00000005 /* 00F50 80AA6FA0 AC8E0320 */ sw $t6, 0x0320($a0) ## 00000320 /* 00F54 80AA6FA4 240F0050 */ addiu $t7, $zero, 0x0050 ## $t7 = 00000050 /* 00F58 80AA6FA8 E4840068 */ swc1 $f4, 0x0068($a0) ## 00000068 /* 00F5C 80AA6FAC 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00F60 80AA6FB0 AFAF0010 */ sw $t7, 0x0010($sp) +/* 00F60 80AA6FB0 AFAF0010 */ sw $t7, 0x0010($sp) /* 00F64 80AA6FB4 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 00F68 80AA6FB8 24060078 */ addiu $a2, $zero, 0x0078 ## $a2 = 00000078 -/* 00F6C 80AA6FBC 0C00D09B */ jal func_8003426C +/* 00F6C 80AA6FBC 0C00D09B */ jal func_8003426C /* 00F70 80AA6FC0 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 /* 00F74 80AA6FC4 92180188 */ lbu $t8, 0x0188($s0) ## 00000188 /* 00F78 80AA6FC8 24010006 */ addiu $at, $zero, 0x0006 ## $at = 00000006 /* 00F7C 80AA6FCC 24190028 */ addiu $t9, $zero, 0x0028 ## $t9 = 00000028 -/* 00F80 80AA6FD0 57010004 */ bnel $t8, $at, .L80AA6FE4 +/* 00F80 80AA6FD0 57010004 */ bnel $t8, $at, .L80AA6FE4 /* 00F84 80AA6FD4 8608001C */ lh $t0, 0x001C($s0) ## 0000001C -/* 00F88 80AA6FD8 1000000B */ beq $zero, $zero, .L80AA7008 +/* 00F88 80AA6FD8 1000000B */ beq $zero, $zero, .L80AA7008 /* 00F8C 80AA6FDC A6190328 */ sh $t9, 0x0328($s0) ## 00000328 /* 00F90 80AA6FE0 8608001C */ lh $t0, 0x001C($s0) ## 0000001C .L80AA6FE4: /* 00F94 80AA6FE4 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 00F98 80AA6FE8 24A51950 */ addiu $a1, $a1, 0x1950 ## $a1 = 06001950 -/* 00F9C 80AA6FEC 11000003 */ beq $t0, $zero, .L80AA6FFC +/* 00F9C 80AA6FEC 11000003 */ beq $t0, $zero, .L80AA6FFC /* 00FA0 80AA6FF0 2604018C */ addiu $a0, $s0, 0x018C ## $a0 = 0000018C -/* 00FA4 80AA6FF4 0C0294A7 */ jal func_800A529C +/* 00FA4 80AA6FF4 0C0294A7 */ jal SkelAnime_ChangeAnimPlaybackStop /* 00FA8 80AA6FF8 24060000 */ addiu $a2, $zero, 0x0000 ## $a2 = 00000000 .L80AA6FFC: /* 00FAC 80AA6FFC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 00FB0 80AA7000 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 00FB4 80AA7004 2405389E */ addiu $a1, $zero, 0x389E ## $a1 = 0000389E .L80AA7008: /* 00FB8 80AA7008 3C0580AA */ lui $a1, %hi(func_80AA702C) ## $a1 = 80AA0000 /* 00FBC 80AA700C 24A5702C */ addiu $a1, $a1, %lo(func_80AA702C) ## $a1 = 80AA702C -/* 00FC0 80AA7010 0C2A9814 */ jal func_80AA6050 +/* 00FC0 80AA7010 0C2A9814 */ jal func_80AA6050 /* 00FC4 80AA7014 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00FC8 80AA7018 8FBF0024 */ lw $ra, 0x0024($sp) -/* 00FCC 80AA701C 8FB00020 */ lw $s0, 0x0020($sp) +/* 00FC8 80AA7018 8FBF0024 */ lw $ra, 0x0024($sp) +/* 00FCC 80AA701C 8FB00020 */ lw $s0, 0x0020($sp) /* 00FD0 80AA7020 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 00FD4 80AA7024 03E00008 */ jr $ra +/* 00FD4 80AA7024 03E00008 */ jr $ra /* 00FD8 80AA7028 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Mb/func_80AA7310.s b/asm/non_matchings/overlays/actors/ovl_En_Mb/func_80AA7310.s index 97ce5f3c53..b2264dd31a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Mb/func_80AA7310.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Mb/func_80AA7310.s @@ -1,103 +1,103 @@ glabel func_80AA7310 /* 012C0 80AA7310 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 /* 012C4 80AA7314 27BDFFB8 */ addiu $sp, $sp, 0xFFB8 ## $sp = FFFFFFB8 -/* 012C8 80AA7318 AFB00030 */ sw $s0, 0x0030($sp) -/* 012CC 80AA731C AFA5004C */ sw $a1, 0x004C($sp) +/* 012C8 80AA7318 AFB00030 */ sw $s0, 0x0030($sp) +/* 012CC 80AA731C AFA5004C */ sw $a1, 0x004C($sp) /* 012D0 80AA7320 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 012D4 80AA7324 AFBF0034 */ sw $ra, 0x0034($sp) -/* 012D8 80AA7328 44050000 */ mfc1 $a1, $f0 +/* 012D4 80AA7324 AFBF0034 */ sw $ra, 0x0034($sp) +/* 012D8 80AA7328 44050000 */ mfc1 $a1, $f0 /* 012DC 80AA732C 24840068 */ addiu $a0, $a0, 0x0068 ## $a0 = 00000068 /* 012E0 80AA7330 3C063F00 */ lui $a2, 0x3F00 ## $a2 = 3F000000 /* 012E4 80AA7334 3C073F80 */ lui $a3, 0x3F80 ## $a3 = 3F800000 /* 012E8 80AA7338 0C01E0C4 */ jal Math_SmoothScaleMaxMinF - -/* 012EC 80AA733C E7A00010 */ swc1 $f0, 0x0010($sp) + +/* 012EC 80AA733C E7A00010 */ swc1 $f0, 0x0010($sp) /* 012F0 80AA7340 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 /* 012F4 80AA7344 44812000 */ mtc1 $at, $f4 ## $f4 = 1.00 /* 012F8 80AA7348 C6060068 */ lwc1 $f6, 0x0068($s0) ## 00000068 /* 012FC 80AA734C 3C014080 */ lui $at, 0x4080 ## $at = 40800000 -/* 01300 80AA7350 8FA4004C */ lw $a0, 0x004C($sp) -/* 01304 80AA7354 4606203C */ c.lt.s $f4, $f6 +/* 01300 80AA7350 8FA4004C */ lw $a0, 0x004C($sp) +/* 01304 80AA7354 4606203C */ c.lt.s $f4, $f6 /* 01308 80AA7358 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 0130C 80AA735C 26060024 */ addiu $a2, $s0, 0x0024 ## $a2 = 00000024 /* 01310 80AA7360 3C0740A0 */ lui $a3, 0x40A0 ## $a3 = 40A00000 -/* 01314 80AA7364 4500000A */ bc1f .L80AA7390 +/* 01314 80AA7364 4500000A */ bc1f .L80AA7390 /* 01318 80AA7368 240E0003 */ addiu $t6, $zero, 0x0003 ## $t6 = 00000003 /* 0131C 80AA736C 44814000 */ mtc1 $at, $f8 ## $f8 = 4.00 /* 01320 80AA7370 240F0064 */ addiu $t7, $zero, 0x0064 ## $t7 = 00000064 /* 01324 80AA7374 2418000F */ addiu $t8, $zero, 0x000F ## $t8 = 0000000F -/* 01328 80AA7378 AFB8001C */ sw $t8, 0x001C($sp) -/* 0132C 80AA737C AFAF0018 */ sw $t7, 0x0018($sp) -/* 01330 80AA7380 AFAE0010 */ sw $t6, 0x0010($sp) -/* 01334 80AA7384 AFA00020 */ sw $zero, 0x0020($sp) -/* 01338 80AA7388 0C00CC98 */ jal func_80033260 -/* 0133C 80AA738C E7A80014 */ swc1 $f8, 0x0014($sp) +/* 01328 80AA7378 AFB8001C */ sw $t8, 0x001C($sp) +/* 0132C 80AA737C AFAF0018 */ sw $t7, 0x0018($sp) +/* 01330 80AA7380 AFAE0010 */ sw $t6, 0x0010($sp) +/* 01334 80AA7384 AFA00020 */ sw $zero, 0x0020($sp) +/* 01338 80AA7388 0C00CC98 */ jal func_80033260 +/* 0133C 80AA738C E7A80014 */ swc1 $f8, 0x0014($sp) .L80AA7390: /* 01340 80AA7390 2604018C */ addiu $a0, $s0, 0x018C ## $a0 = 0000018C /* 01344 80AA7394 0C02927F */ jal SkelAnime_FrameUpdateMatrix - -/* 01348 80AA7398 AFA4003C */ sw $a0, 0x003C($sp) -/* 0134C 80AA739C 50400032 */ beql $v0, $zero, .L80AA7468 -/* 01350 80AA73A0 8FBF0034 */ lw $ra, 0x0034($sp) + +/* 01348 80AA7398 AFA4003C */ sw $a0, 0x003C($sp) +/* 0134C 80AA739C 50400032 */ beql $v0, $zero, .L80AA7468 +/* 01350 80AA73A0 8FBF0034 */ lw $ra, 0x0034($sp) /* 01354 80AA73A4 8619032A */ lh $t9, 0x032A($s0) ## 0000032A -/* 01358 80AA73A8 57200021 */ bnel $t9, $zero, .L80AA7430 +/* 01358 80AA73A8 57200021 */ bnel $t9, $zero, .L80AA7430 /* 0135C 80AA73AC 860D001C */ lh $t5, 0x001C($s0) ## 0000001C /* 01360 80AA73B0 8608032E */ lh $t0, 0x032E($s0) ## 0000032E /* 01364 80AA73B4 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 /* 01368 80AA73B8 2509FFFF */ addiu $t1, $t0, 0xFFFF ## $t1 = FFFFFFFF /* 0136C 80AA73BC A609032E */ sh $t1, 0x032E($s0) ## 0000032E /* 01370 80AA73C0 860A032E */ lh $t2, 0x032E($s0) ## 0000032E -/* 01374 80AA73C4 55400028 */ bnel $t2, $zero, .L80AA7468 -/* 01378 80AA73C8 8FBF0034 */ lw $ra, 0x0034($sp) +/* 01374 80AA73C4 55400028 */ bnel $t2, $zero, .L80AA7468 +/* 01378 80AA73C8 8FBF0034 */ lw $ra, 0x0034($sp) /* 0137C 80AA73CC 0C028800 */ jal SkelAnime_GetFrameCount - + /* 01380 80AA73D0 24842C10 */ addiu $a0, $a0, 0x2C10 ## $a0 = 06002C10 /* 01384 80AA73D4 44825000 */ mtc1 $v0, $f10 ## $f10 = 0.00 /* 01388 80AA73D8 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 /* 0138C 80AA73DC 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 01390 80AA73E0 468052A0 */ cvt.s.w $f10, $f10 +/* 01390 80AA73E0 468052A0 */ cvt.s.w $f10, $f10 /* 01394 80AA73E4 240B0002 */ addiu $t3, $zero, 0x0002 ## $t3 = 00000002 -/* 01398 80AA73E8 AFAB0014 */ sw $t3, 0x0014($sp) +/* 01398 80AA73E8 AFAB0014 */ sw $t3, 0x0014($sp) /* 0139C 80AA73EC 24A52C10 */ addiu $a1, $a1, 0x2C10 ## $a1 = 06002C10 -/* 013A0 80AA73F0 8FA4003C */ lw $a0, 0x003C($sp) +/* 013A0 80AA73F0 8FA4003C */ lw $a0, 0x003C($sp) /* 013A4 80AA73F4 3C06BF80 */ lui $a2, 0xBF80 ## $a2 = BF800000 -/* 013A8 80AA73F8 44075000 */ mfc1 $a3, $f10 -/* 013AC 80AA73FC E7A00010 */ swc1 $f0, 0x0010($sp) -/* 013B0 80AA7400 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 013B4 80AA7404 E7A00018 */ swc1 $f0, 0x0018($sp) +/* 013A8 80AA73F8 44075000 */ mfc1 $a3, $f10 +/* 013AC 80AA73FC E7A00010 */ swc1 $f0, 0x0010($sp) +/* 013B0 80AA7400 0C029468 */ jal SkelAnime_ChangeAnim + +/* 013B4 80AA7404 E7A00018 */ swc1 $f0, 0x0018($sp) /* 013B8 80AA7408 44808000 */ mtc1 $zero, $f16 ## $f16 = 0.00 /* 013BC 80AA740C 240C0001 */ addiu $t4, $zero, 0x0001 ## $t4 = 00000001 /* 013C0 80AA7410 A60C032A */ sh $t4, 0x032A($s0) ## 0000032A /* 013C4 80AA7414 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 013C8 80AA7418 240538BD */ addiu $a1, $zero, 0x38BD ## $a1 = 000038BD /* 013CC 80AA741C 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 013D0 80AA7420 E6100068 */ swc1 $f16, 0x0068($s0) ## 00000068 -/* 013D4 80AA7424 10000010 */ beq $zero, $zero, .L80AA7468 -/* 013D8 80AA7428 8FBF0034 */ lw $ra, 0x0034($sp) +/* 013D4 80AA7424 10000010 */ beq $zero, $zero, .L80AA7468 +/* 013D8 80AA7428 8FBF0034 */ lw $ra, 0x0034($sp) /* 013DC 80AA742C 860D001C */ lh $t5, 0x001C($s0) ## 0000001C .L80AA7430: /* 013E0 80AA7430 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 013E4 80AA7434 05A10009 */ bgez $t5, .L80AA745C +/* 013E4 80AA7434 05A10009 */ bgez $t5, .L80AA745C /* 013E8 80AA7438 00000000 */ nop -/* 013EC 80AA743C 0C2A9A5D */ jal func_80AA6974 +/* 013EC 80AA743C 0C2A9A5D */ jal func_80AA6974 /* 013F0 80AA7440 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 013F4 80AA7444 240E0050 */ addiu $t6, $zero, 0x0050 ## $t6 = 00000050 /* 013F8 80AA7448 A60E032E */ sh $t6, 0x032E($s0) ## 0000032E /* 013FC 80AA744C 8602032E */ lh $v0, 0x032E($s0) ## 0000032E /* 01400 80AA7450 A602032C */ sh $v0, 0x032C($s0) ## 0000032C -/* 01404 80AA7454 10000003 */ beq $zero, $zero, .L80AA7464 +/* 01404 80AA7454 10000003 */ beq $zero, $zero, .L80AA7464 /* 01408 80AA7458 A602032A */ sh $v0, 0x032A($s0) ## 0000032A .L80AA745C: -/* 0140C 80AA745C 0C2A9A3F */ jal func_80AA68FC -/* 01410 80AA7460 8FA5004C */ lw $a1, 0x004C($sp) +/* 0140C 80AA745C 0C2A9A3F */ jal func_80AA68FC +/* 01410 80AA7460 8FA5004C */ lw $a1, 0x004C($sp) .L80AA7464: -/* 01414 80AA7464 8FBF0034 */ lw $ra, 0x0034($sp) +/* 01414 80AA7464 8FBF0034 */ lw $ra, 0x0034($sp) .L80AA7468: -/* 01418 80AA7468 8FB00030 */ lw $s0, 0x0030($sp) +/* 01418 80AA7468 8FB00030 */ lw $s0, 0x0030($sp) /* 0141C 80AA746C 27BD0048 */ addiu $sp, $sp, 0x0048 ## $sp = 00000000 -/* 01420 80AA7470 03E00008 */ jr $ra +/* 01420 80AA7470 03E00008 */ jr $ra /* 01424 80AA7474 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Mb/func_80AA74BC.s b/asm/non_matchings/overlays/actors/ovl_En_Mb/func_80AA74BC.s index be411c8b6f..76cb745a80 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Mb/func_80AA74BC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Mb/func_80AA74BC.s @@ -1,156 +1,156 @@ glabel func_80AA74BC /* 0146C 80AA74BC 27BDFFB0 */ addiu $sp, $sp, 0xFFB0 ## $sp = FFFFFFB0 -/* 01470 80AA74C0 AFBF0034 */ sw $ra, 0x0034($sp) -/* 01474 80AA74C4 AFB00030 */ sw $s0, 0x0030($sp) -/* 01478 80AA74C8 AFA50054 */ sw $a1, 0x0054($sp) +/* 01470 80AA74C0 AFBF0034 */ sw $ra, 0x0034($sp) +/* 01474 80AA74C4 AFB00030 */ sw $s0, 0x0030($sp) +/* 01478 80AA74C8 AFA50054 */ sw $a1, 0x0054($sp) /* 0147C 80AA74CC 8CA21C44 */ lw $v0, 0x1C44($a1) ## 00001C44 /* 01480 80AA74D0 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 01484 80AA74D4 8C430680 */ lw $v1, 0x0680($v0) ## 00000680 /* 01488 80AA74D8 306F0080 */ andi $t7, $v1, 0x0080 ## $t7 = 00000000 -/* 0148C 80AA74DC 51E00012 */ beql $t7, $zero, .L80AA7528 +/* 0148C 80AA74DC 51E00012 */ beql $t7, $zero, .L80AA7528 /* 01490 80AA74E0 96090088 */ lhu $t1, 0x0088($s0) ## 00000088 /* 01494 80AA74E4 8C580118 */ lw $t8, 0x0118($v0) ## 00000118 /* 01498 80AA74E8 3C014080 */ lui $at, 0x4080 ## $at = 40800000 /* 0149C 80AA74EC 240800C8 */ addiu $t0, $zero, 0x00C8 ## $t0 = 000000C8 -/* 014A0 80AA74F0 1498000C */ bne $a0, $t8, .L80AA7524 +/* 014A0 80AA74F0 1498000C */ bne $a0, $t8, .L80AA7524 /* 014A4 80AA74F4 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 014A8 80AA74F8 44810000 */ mtc1 $at, $f0 ## $f0 = 4.00 /* 014AC 80AA74FC 2401FF7F */ addiu $at, $zero, 0xFF7F ## $at = FFFFFF7F -/* 014B0 80AA7500 0061C824 */ and $t9, $v1, $at +/* 014B0 80AA7500 0061C824 */ and $t9, $v1, $at /* 014B4 80AA7504 AC590680 */ sw $t9, 0x0680($v0) ## 00000680 /* 014B8 80AA7508 AC400118 */ sw $zero, 0x0118($v0) ## 00000118 /* 014BC 80AA750C A4480850 */ sh $t0, 0x0850($v0) ## 00000850 /* 014C0 80AA7510 86070032 */ lh $a3, 0x0032($s0) ## 00000032 -/* 014C4 80AA7514 44060000 */ mfc1 $a2, $f0 -/* 014C8 80AA7518 8FA40054 */ lw $a0, 0x0054($sp) -/* 014CC 80AA751C 0C00BDC7 */ jal func_8002F71C -/* 014D0 80AA7520 E7A00010 */ swc1 $f0, 0x0010($sp) +/* 014C4 80AA7514 44060000 */ mfc1 $a2, $f0 +/* 014C8 80AA7518 8FA40054 */ lw $a0, 0x0054($sp) +/* 014CC 80AA751C 0C00BDC7 */ jal func_8002F71C +/* 014D0 80AA7520 E7A00010 */ swc1 $f0, 0x0010($sp) .L80AA7524: /* 014D4 80AA7524 96090088 */ lhu $t1, 0x0088($s0) ## 00000088 .L80AA7528: /* 014D8 80AA7528 26040068 */ addiu $a0, $s0, 0x0068 ## $a0 = 00000068 /* 014DC 80AA752C 312A0001 */ andi $t2, $t1, 0x0001 ## $t2 = 00000000 -/* 014E0 80AA7530 514000A3 */ beql $t2, $zero, .L80AA77C0 -/* 014E4 80AA7534 8FBF0034 */ lw $ra, 0x0034($sp) +/* 014E0 80AA7530 514000A3 */ beql $t2, $zero, .L80AA77C0 +/* 014E4 80AA7534 8FBF0034 */ lw $ra, 0x0034($sp) /* 014E8 80AA7538 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 /* 014EC 80AA753C 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 014F0 80AA7540 3C073FC0 */ lui $a3, 0x3FC0 ## $a3 = 3FC00000 -/* 014F4 80AA7544 44050000 */ mfc1 $a1, $f0 +/* 014F4 80AA7544 44050000 */ mfc1 $a1, $f0 /* 014F8 80AA7548 0C01E0C4 */ jal Math_SmoothScaleMaxMinF - -/* 014FC 80AA754C E7A00010 */ swc1 $f0, 0x0010($sp) + +/* 014FC 80AA754C E7A00010 */ swc1 $f0, 0x0010($sp) /* 01500 80AA7550 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 /* 01504 80AA7554 44812000 */ mtc1 $at, $f4 ## $f4 = 1.00 /* 01508 80AA7558 C6060068 */ lwc1 $f6, 0x0068($s0) ## 00000068 /* 0150C 80AA755C 3C014080 */ lui $at, 0x4080 ## $at = 40800000 -/* 01510 80AA7560 8FA40054 */ lw $a0, 0x0054($sp) -/* 01514 80AA7564 4606203C */ c.lt.s $f4, $f6 +/* 01510 80AA7560 8FA40054 */ lw $a0, 0x0054($sp) +/* 01514 80AA7564 4606203C */ c.lt.s $f4, $f6 /* 01518 80AA7568 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 0151C 80AA756C 26060024 */ addiu $a2, $s0, 0x0024 ## $a2 = 00000024 /* 01520 80AA7570 3C0740A0 */ lui $a3, 0x40A0 ## $a3 = 40A00000 -/* 01524 80AA7574 4500000A */ bc1f .L80AA75A0 +/* 01524 80AA7574 4500000A */ bc1f .L80AA75A0 /* 01528 80AA7578 240B0003 */ addiu $t3, $zero, 0x0003 ## $t3 = 00000003 /* 0152C 80AA757C 44814000 */ mtc1 $at, $f8 ## $f8 = 4.00 /* 01530 80AA7580 240C0064 */ addiu $t4, $zero, 0x0064 ## $t4 = 00000064 /* 01534 80AA7584 240D000F */ addiu $t5, $zero, 0x000F ## $t5 = 0000000F -/* 01538 80AA7588 AFAD001C */ sw $t5, 0x001C($sp) -/* 0153C 80AA758C AFAC0018 */ sw $t4, 0x0018($sp) -/* 01540 80AA7590 AFAB0010 */ sw $t3, 0x0010($sp) -/* 01544 80AA7594 AFA00020 */ sw $zero, 0x0020($sp) -/* 01548 80AA7598 0C00CC98 */ jal func_80033260 -/* 0154C 80AA759C E7A80014 */ swc1 $f8, 0x0014($sp) +/* 01538 80AA7588 AFAD001C */ sw $t5, 0x001C($sp) +/* 0153C 80AA758C AFAC0018 */ sw $t4, 0x0018($sp) +/* 01540 80AA7590 AFAB0010 */ sw $t3, 0x0010($sp) +/* 01544 80AA7594 AFA00020 */ sw $zero, 0x0020($sp) +/* 01548 80AA7598 0C00CC98 */ jal func_80033260 +/* 0154C 80AA759C E7A80014 */ swc1 $f8, 0x0014($sp) .L80AA75A0: /* 01550 80AA75A0 860E032A */ lh $t6, 0x032A($s0) ## 0000032A -/* 01554 80AA75A4 51C00056 */ beql $t6, $zero, .L80AA7700 +/* 01554 80AA75A4 51C00056 */ beql $t6, $zero, .L80AA7700 /* 01558 80AA75A8 2604018C */ addiu $a0, $s0, 0x018C ## $a0 = 0000018C /* 0155C 80AA75AC 860F032E */ lh $t7, 0x032E($s0) ## 0000032E /* 01560 80AA75B0 3C014320 */ lui $at, 0x4320 ## $at = 43200000 /* 01564 80AA75B4 25F8FFFF */ addiu $t8, $t7, 0xFFFF ## $t8 = FFFFFFFF /* 01568 80AA75B8 A618032E */ sh $t8, 0x032E($s0) ## 0000032E /* 0156C 80AA75BC 8619032E */ lh $t9, 0x032E($s0) ## 0000032E -/* 01570 80AA75C0 57200042 */ bnel $t9, $zero, .L80AA76CC +/* 01570 80AA75C0 57200042 */ bnel $t9, $zero, .L80AA76CC /* 01574 80AA75C4 44815000 */ mtc1 $at, $f10 ## $f10 = 160.00 /* 01578 80AA75C8 C6000094 */ lwc1 $f0, 0x0094($s0) ## 00000094 /* 0157C 80AA75CC 44805000 */ mtc1 $zero, $f10 ## $f10 = 0.00 /* 01580 80AA75D0 860800B6 */ lh $t0, 0x00B6($s0) ## 000000B6 /* 01584 80AA75D4 8609008A */ lh $t1, 0x008A($s0) ## 0000008A -/* 01588 80AA75D8 4600503E */ c.le.s $f10, $f0 +/* 01588 80AA75D8 4600503E */ c.le.s $f10, $f0 /* 0158C 80AA75DC 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 -/* 01590 80AA75E0 01091823 */ subu $v1, $t0, $t1 -/* 01594 80AA75E4 00031C00 */ sll $v1, $v1, 16 -/* 01598 80AA75E8 45000003 */ bc1f .L80AA75F8 -/* 0159C 80AA75EC 00031C03 */ sra $v1, $v1, 16 -/* 015A0 80AA75F0 10000002 */ beq $zero, $zero, .L80AA75FC -/* 015A4 80AA75F4 46000086 */ mov.s $f2, $f0 +/* 01590 80AA75E0 01091823 */ subu $v1, $t0, $t1 +/* 01594 80AA75E4 00031C00 */ sll $v1, $v1, 16 +/* 01598 80AA75E8 45000003 */ bc1f .L80AA75F8 +/* 0159C 80AA75EC 00031C03 */ sra $v1, $v1, 16 +/* 015A0 80AA75F0 10000002 */ beq $zero, $zero, .L80AA75FC +/* 015A4 80AA75F4 46000086 */ mov.s $f2, $f0 .L80AA75F8: -/* 015A8 80AA75F8 46000087 */ neg.s $f2, $f0 +/* 015A8 80AA75F8 46000087 */ neg.s $f2, $f0 .L80AA75FC: /* 015AC 80AA75FC 44818000 */ mtc1 $at, $f16 ## $f16 = 20.00 /* 015B0 80AA7600 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 015B4 80AA7604 8FA50054 */ lw $a1, 0x0054($sp) -/* 015B8 80AA7608 4610103E */ c.le.s $f2, $f16 +/* 015B4 80AA7604 8FA50054 */ lw $a1, 0x0054($sp) +/* 015B8 80AA7608 4610103E */ c.le.s $f2, $f16 /* 015BC 80AA760C 00000000 */ nop -/* 015C0 80AA7610 45000016 */ bc1f .L80AA766C +/* 015C0 80AA7610 45000016 */ bc1f .L80AA766C /* 015C4 80AA7614 00000000 */ nop -/* 015C8 80AA7618 0C2A994B */ jal func_80AA652C -/* 015CC 80AA761C A7A30046 */ sh $v1, 0x0046($sp) -/* 015D0 80AA7620 10400012 */ beq $v0, $zero, .L80AA766C -/* 015D4 80AA7624 87A30046 */ lh $v1, 0x0046($sp) -/* 015D8 80AA7628 04600003 */ bltz $v1, .L80AA7638 -/* 015DC 80AA762C 00031023 */ subu $v0, $zero, $v1 -/* 015E0 80AA7630 10000001 */ beq $zero, $zero, .L80AA7638 +/* 015C8 80AA7618 0C2A994B */ jal func_80AA652C +/* 015CC 80AA761C A7A30046 */ sh $v1, 0x0046($sp) +/* 015D0 80AA7620 10400012 */ beq $v0, $zero, .L80AA766C +/* 015D4 80AA7624 87A30046 */ lh $v1, 0x0046($sp) +/* 015D8 80AA7628 04600003 */ bltz $v1, .L80AA7638 +/* 015DC 80AA762C 00031023 */ subu $v0, $zero, $v1 +/* 015E0 80AA7630 10000001 */ beq $zero, $zero, .L80AA7638 /* 015E4 80AA7634 00601025 */ or $v0, $v1, $zero ## $v0 = 00000000 .L80AA7638: -/* 015E8 80AA7638 28414001 */ slti $at, $v0, 0x4001 -/* 015EC 80AA763C 1020000B */ beq $at, $zero, .L80AA766C +/* 015E8 80AA7638 28414001 */ slti $at, $v0, 0x4001 +/* 015EC 80AA763C 1020000B */ beq $at, $zero, .L80AA766C /* 015F0 80AA7640 3C014348 */ lui $at, 0x4348 ## $at = 43480000 /* 015F4 80AA7644 44819000 */ mtc1 $at, $f18 ## $f18 = 200.00 /* 015F8 80AA7648 C6040090 */ lwc1 $f4, 0x0090($s0) ## 00000090 -/* 015FC 80AA764C 4612203E */ c.le.s $f4, $f18 +/* 015FC 80AA764C 4612203E */ c.le.s $f4, $f18 /* 01600 80AA7650 00000000 */ nop -/* 01604 80AA7654 45000005 */ bc1f .L80AA766C +/* 01604 80AA7654 45000005 */ bc1f .L80AA766C /* 01608 80AA7658 00000000 */ nop -/* 0160C 80AA765C 0C2A9AB2 */ jal func_80AA6AC8 +/* 0160C 80AA765C 0C2A9AB2 */ jal func_80AA6AC8 /* 01610 80AA7660 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01614 80AA7664 10000026 */ beq $zero, $zero, .L80AA7700 +/* 01614 80AA7664 10000026 */ beq $zero, $zero, .L80AA7700 /* 01618 80AA7668 2604018C */ addiu $a0, $s0, 0x018C ## $a0 = 0000018C .L80AA766C: /* 0161C 80AA766C 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 /* 01620 80AA7670 0C028800 */ jal SkelAnime_GetFrameCount - + /* 01624 80AA7674 24842C10 */ addiu $a0, $a0, 0x2C10 ## $a0 = 06002C10 /* 01628 80AA7678 44823000 */ mtc1 $v0, $f6 ## $f6 = 0.00 /* 0162C 80AA767C 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 /* 01630 80AA7680 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 01634 80AA7684 468031A0 */ cvt.s.w $f6, $f6 +/* 01634 80AA7684 468031A0 */ cvt.s.w $f6, $f6 /* 01638 80AA7688 240A0002 */ addiu $t2, $zero, 0x0002 ## $t2 = 00000002 -/* 0163C 80AA768C AFAA0014 */ sw $t2, 0x0014($sp) +/* 0163C 80AA768C AFAA0014 */ sw $t2, 0x0014($sp) /* 01640 80AA7690 24A52C10 */ addiu $a1, $a1, 0x2C10 ## $a1 = 06002C10 /* 01644 80AA7694 2604018C */ addiu $a0, $s0, 0x018C ## $a0 = 0000018C /* 01648 80AA7698 3C06BF80 */ lui $a2, 0xBF80 ## $a2 = BF800000 -/* 0164C 80AA769C 44073000 */ mfc1 $a3, $f6 -/* 01650 80AA76A0 E7A00010 */ swc1 $f0, 0x0010($sp) -/* 01654 80AA76A4 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 01658 80AA76A8 E7A00018 */ swc1 $f0, 0x0018($sp) +/* 0164C 80AA769C 44073000 */ mfc1 $a3, $f6 +/* 01650 80AA76A0 E7A00010 */ swc1 $f0, 0x0010($sp) +/* 01654 80AA76A4 0C029468 */ jal SkelAnime_ChangeAnim + +/* 01658 80AA76A8 E7A00018 */ swc1 $f0, 0x0018($sp) /* 0165C 80AA76AC 44804000 */ mtc1 $zero, $f8 ## $f8 = 0.00 /* 01660 80AA76B0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 01664 80AA76B4 240538BD */ addiu $a1, $zero, 0x38BD ## $a1 = 000038BD /* 01668 80AA76B8 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 0166C 80AA76BC E6080068 */ swc1 $f8, 0x0068($s0) ## 00000068 -/* 01670 80AA76C0 1000000F */ beq $zero, $zero, .L80AA7700 +/* 01670 80AA76C0 1000000F */ beq $zero, $zero, .L80AA7700 /* 01674 80AA76C4 2604018C */ addiu $a0, $s0, 0x018C ## $a0 = 0000018C /* 01678 80AA76C8 44815000 */ mtc1 $at, $f10 ## $f10 = 0.00 .L80AA76CC: /* 0167C 80AA76CC C6100090 */ lwc1 $f16, 0x0090($s0) ## 00000090 /* 01680 80AA76D0 3C01C0A0 */ lui $at, 0xC0A0 ## $at = C0A00000 -/* 01684 80AA76D4 460A803E */ c.le.s $f16, $f10 +/* 01684 80AA76D4 460A803E */ c.le.s $f16, $f10 /* 01688 80AA76D8 00000000 */ nop -/* 0168C 80AA76DC 45020005 */ bc1fl .L80AA76F4 +/* 0168C 80AA76DC 45020005 */ bc1fl .L80AA76F4 /* 01690 80AA76E0 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 /* 01694 80AA76E4 44819000 */ mtc1 $at, $f18 ## $f18 = -5.00 -/* 01698 80AA76E8 10000004 */ beq $zero, $zero, .L80AA76FC +/* 01698 80AA76E8 10000004 */ beq $zero, $zero, .L80AA76FC /* 0169C 80AA76EC E6120068 */ swc1 $f18, 0x0068($s0) ## 00000068 /* 016A0 80AA76F0 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 .L80AA76F4: @@ -160,65 +160,65 @@ glabel func_80AA74BC /* 016AC 80AA76FC 2604018C */ addiu $a0, $s0, 0x018C ## $a0 = 0000018C .L80AA7700: /* 016B0 80AA7700 0C02927F */ jal SkelAnime_FrameUpdateMatrix - -/* 016B4 80AA7704 AFA40038 */ sw $a0, 0x0038($sp) -/* 016B8 80AA7708 5040002D */ beql $v0, $zero, .L80AA77C0 -/* 016BC 80AA770C 8FBF0034 */ lw $ra, 0x0034($sp) + +/* 016B4 80AA7704 AFA40038 */ sw $a0, 0x0038($sp) +/* 016B8 80AA7708 5040002D */ beql $v0, $zero, .L80AA77C0 +/* 016BC 80AA770C 8FBF0034 */ lw $ra, 0x0034($sp) /* 016C0 80AA7710 860B032A */ lh $t3, 0x032A($s0) ## 0000032A /* 016C4 80AA7714 26040024 */ addiu $a0, $s0, 0x0024 ## $a0 = 00000024 -/* 016C8 80AA7718 15600014 */ bne $t3, $zero, .L80AA776C +/* 016C8 80AA7718 15600014 */ bne $t3, $zero, .L80AA776C /* 016CC 80AA771C 00000000 */ nop /* 016D0 80AA7720 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 /* 016D4 80AA7724 0C028800 */ jal SkelAnime_GetFrameCount - + /* 016D8 80AA7728 24842F10 */ addiu $a0, $a0, 0x2F10 ## $a0 = 06002F10 /* 016DC 80AA772C 44823000 */ mtc1 $v0, $f6 ## $f6 = 0.00 /* 016E0 80AA7730 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 /* 016E4 80AA7734 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 016E8 80AA7738 46803220 */ cvt.s.w $f8, $f6 +/* 016E8 80AA7738 46803220 */ cvt.s.w $f8, $f6 /* 016EC 80AA773C 240C0001 */ addiu $t4, $zero, 0x0001 ## $t4 = 00000001 -/* 016F0 80AA7740 44070000 */ mfc1 $a3, $f0 -/* 016F4 80AA7744 AFAC0014 */ sw $t4, 0x0014($sp) +/* 016F0 80AA7740 44070000 */ mfc1 $a3, $f0 +/* 016F4 80AA7744 AFAC0014 */ sw $t4, 0x0014($sp) /* 016F8 80AA7748 24A52F10 */ addiu $a1, $a1, 0x2F10 ## $a1 = 06002F10 -/* 016FC 80AA774C 8FA40038 */ lw $a0, 0x0038($sp) -/* 01700 80AA7750 E7A80010 */ swc1 $f8, 0x0010($sp) +/* 016FC 80AA774C 8FA40038 */ lw $a0, 0x0038($sp) +/* 01700 80AA7750 E7A80010 */ swc1 $f8, 0x0010($sp) /* 01704 80AA7754 3C063F00 */ lui $a2, 0x3F00 ## $a2 = 3F000000 -/* 01708 80AA7758 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 0170C 80AA775C E7A00018 */ swc1 $f0, 0x0018($sp) +/* 01708 80AA7758 0C029468 */ jal SkelAnime_ChangeAnim + +/* 0170C 80AA775C E7A00018 */ swc1 $f0, 0x0018($sp) /* 01710 80AA7760 240D0001 */ addiu $t5, $zero, 0x0001 ## $t5 = 00000001 -/* 01714 80AA7764 10000015 */ beq $zero, $zero, .L80AA77BC +/* 01714 80AA7764 10000015 */ beq $zero, $zero, .L80AA77BC /* 01718 80AA7768 A60D032A */ sh $t5, 0x032A($s0) ## 0000032A .L80AA776C: /* 0171C 80AA776C 0C01E01A */ jal Math_Vec3f_Yaw - + /* 01720 80AA7770 26050344 */ addiu $a1, $s0, 0x0344 ## $a1 = 00000344 /* 01724 80AA7774 860E008A */ lh $t6, 0x008A($s0) ## 0000008A /* 01728 80AA7778 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0172C 80AA777C 004E1823 */ subu $v1, $v0, $t6 -/* 01730 80AA7780 00031C00 */ sll $v1, $v1, 16 -/* 01734 80AA7784 00031C03 */ sra $v1, $v1, 16 -/* 01738 80AA7788 04600003 */ bltz $v1, .L80AA7798 -/* 0173C 80AA778C 00031023 */ subu $v0, $zero, $v1 -/* 01740 80AA7790 10000001 */ beq $zero, $zero, .L80AA7798 +/* 0172C 80AA777C 004E1823 */ subu $v1, $v0, $t6 +/* 01730 80AA7780 00031C00 */ sll $v1, $v1, 16 +/* 01734 80AA7784 00031C03 */ sra $v1, $v1, 16 +/* 01738 80AA7788 04600003 */ bltz $v1, .L80AA7798 +/* 0173C 80AA778C 00031023 */ subu $v0, $zero, $v1 +/* 01740 80AA7790 10000001 */ beq $zero, $zero, .L80AA7798 /* 01744 80AA7794 00601025 */ or $v0, $v1, $zero ## $v0 = 00000000 .L80AA7798: -/* 01748 80AA7798 28414001 */ slti $at, $v0, 0x4001 -/* 0174C 80AA779C 10200005 */ beq $at, $zero, .L80AA77B4 +/* 01748 80AA7798 28414001 */ slti $at, $v0, 0x4001 +/* 0174C 80AA779C 10200005 */ beq $at, $zero, .L80AA77B4 /* 01750 80AA77A0 00000000 */ nop -/* 01754 80AA77A4 0C2A9A3F */ jal func_80AA68FC -/* 01758 80AA77A8 8FA50054 */ lw $a1, 0x0054($sp) -/* 0175C 80AA77AC 10000004 */ beq $zero, $zero, .L80AA77C0 -/* 01760 80AA77B0 8FBF0034 */ lw $ra, 0x0034($sp) +/* 01754 80AA77A4 0C2A9A3F */ jal func_80AA68FC +/* 01758 80AA77A8 8FA50054 */ lw $a1, 0x0054($sp) +/* 0175C 80AA77AC 10000004 */ beq $zero, $zero, .L80AA77C0 +/* 01760 80AA77B0 8FBF0034 */ lw $ra, 0x0034($sp) .L80AA77B4: -/* 01764 80AA77B4 0C2A9A86 */ jal func_80AA6A18 +/* 01764 80AA77B4 0C2A9A86 */ jal func_80AA6A18 /* 01768 80AA77B8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 .L80AA77BC: -/* 0176C 80AA77BC 8FBF0034 */ lw $ra, 0x0034($sp) +/* 0176C 80AA77BC 8FBF0034 */ lw $ra, 0x0034($sp) .L80AA77C0: -/* 01770 80AA77C0 8FB00030 */ lw $s0, 0x0030($sp) +/* 01770 80AA77C0 8FB00030 */ lw $s0, 0x0030($sp) /* 01774 80AA77C4 27BD0050 */ addiu $sp, $sp, 0x0050 ## $sp = 00000000 -/* 01778 80AA77C8 03E00008 */ jr $ra +/* 01778 80AA77C8 03E00008 */ jr $ra /* 0177C 80AA77CC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Mb/func_80AA77D0.s b/asm/non_matchings/overlays/actors/ovl_En_Mb/func_80AA77D0.s index 4b7189fab6..16832319ad 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Mb/func_80AA77D0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Mb/func_80AA77D0.s @@ -1,55 +1,55 @@ glabel func_80AA77D0 /* 01780 80AA77D0 27BDFFB8 */ addiu $sp, $sp, 0xFFB8 ## $sp = FFFFFFB8 -/* 01784 80AA77D4 AFBF0034 */ sw $ra, 0x0034($sp) -/* 01788 80AA77D8 AFB00030 */ sw $s0, 0x0030($sp) -/* 0178C 80AA77DC AFA5004C */ sw $a1, 0x004C($sp) +/* 01784 80AA77D4 AFBF0034 */ sw $ra, 0x0034($sp) +/* 01788 80AA77D8 AFB00030 */ sw $s0, 0x0030($sp) +/* 0178C 80AA77DC AFA5004C */ sw $a1, 0x004C($sp) /* 01790 80AA77E0 848F00B6 */ lh $t7, 0x00B6($a0) ## 000000B6 /* 01794 80AA77E4 848E008A */ lh $t6, 0x008A($a0) ## 0000008A /* 01798 80AA77E8 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 0179C 80AA77EC 01CF1023 */ subu $v0, $t6, $t7 -/* 017A0 80AA77F0 00021400 */ sll $v0, $v0, 16 -/* 017A4 80AA77F4 00021403 */ sra $v0, $v0, 16 -/* 017A8 80AA77F8 04430005 */ bgezl $v0, .L80AA7810 +/* 0179C 80AA77EC 01CF1023 */ subu $v0, $t6, $t7 +/* 017A0 80AA77F0 00021400 */ sll $v0, $v0, 16 +/* 017A4 80AA77F4 00021403 */ sra $v0, $v0, 16 +/* 017A8 80AA77F8 04430005 */ bgezl $v0, .L80AA7810 /* 017AC 80AA77FC C60401A4 */ lwc1 $f4, 0x01A4($s0) ## 000001A4 -/* 017B0 80AA7800 00021023 */ subu $v0, $zero, $v0 -/* 017B4 80AA7804 00021400 */ sll $v0, $v0, 16 -/* 017B8 80AA7808 00021403 */ sra $v0, $v0, 16 +/* 017B0 80AA7800 00021023 */ subu $v0, $zero, $v0 +/* 017B4 80AA7804 00021400 */ sll $v0, $v0, 16 +/* 017B8 80AA7808 00021403 */ sra $v0, $v0, 16 /* 017BC 80AA780C C60401A4 */ lwc1 $f4, 0x01A4($s0) ## 000001A4 .L80AA7810: /* 017C0 80AA7810 2604018C */ addiu $a0, $s0, 0x018C ## $a0 = 0000018C -/* 017C4 80AA7814 AFA4003C */ sw $a0, 0x003C($sp) -/* 017C8 80AA7818 4600218D */ trunc.w.s $f6, $f4 -/* 017CC 80AA781C A7A20042 */ sh $v0, 0x0042($sp) -/* 017D0 80AA7820 44193000 */ mfc1 $t9, $f6 +/* 017C4 80AA7814 AFA4003C */ sw $a0, 0x003C($sp) +/* 017C8 80AA7818 4600218D */ trunc.w.s $f6, $f4 +/* 017CC 80AA781C A7A20042 */ sh $v0, 0x0042($sp) +/* 017D0 80AA7820 44193000 */ mfc1 $t9, $f6 /* 017D4 80AA7824 0C02927F */ jal SkelAnime_FrameUpdateMatrix - -/* 017D8 80AA7828 AFB90044 */ sw $t9, 0x0044($sp) -/* 017DC 80AA782C 10400007 */ beq $v0, $zero, .L80AA784C -/* 017E0 80AA7830 8FA4003C */ lw $a0, 0x003C($sp) + +/* 017D8 80AA7828 AFB90044 */ sw $t9, 0x0044($sp) +/* 017DC 80AA782C 10400007 */ beq $v0, $zero, .L80AA784C +/* 017E0 80AA7830 8FA4003C */ lw $a0, 0x003C($sp) /* 017E4 80AA7834 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 017E8 80AA7838 0C0294BE */ jal func_800A52F8 +/* 017E8 80AA7838 0C0294BE */ jal SkelAnime_ChangeAnimDefaultRepeat /* 017EC 80AA783C 24A52F10 */ addiu $a1, $a1, 0x2F10 ## $a1 = 06002F10 /* 017F0 80AA7840 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 017F4 80AA7844 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 017F8 80AA7848 240538BA */ addiu $a1, $zero, 0x38BA ## $a1 = 000038BA .L80AA784C: /* 017FC 80AA784C 8602032E */ lh $v0, 0x032E($s0) ## 0000032E /* 01800 80AA7850 3C014120 */ lui $at, 0x4120 ## $at = 41200000 /* 01804 80AA7854 24090001 */ addiu $t1, $zero, 0x0001 ## $t1 = 00000001 -/* 01808 80AA7858 1040000B */ beq $v0, $zero, .L80AA7888 +/* 01808 80AA7858 1040000B */ beq $v0, $zero, .L80AA7888 /* 0180C 80AA785C 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 01810 80AA7860 2448FFFF */ addiu $t0, $v0, 0xFFFF ## $t0 = FFFFFFFF /* 01814 80AA7864 A608032E */ sh $t0, 0x032E($s0) ## 0000032E /* 01818 80AA7868 8605008A */ lh $a1, 0x008A($s0) ## 0000008A -/* 0181C 80AA786C AFA00010 */ sw $zero, 0x0010($sp) +/* 0181C 80AA786C AFA00010 */ sw $zero, 0x0010($sp) /* 01820 80AA7870 26040032 */ addiu $a0, $s0, 0x0032 ## $a0 = 00000032 /* 01824 80AA7874 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 /* 01828 80AA7878 0C01E1A7 */ jal Math_SmoothScaleMaxMinS - + /* 0182C 80AA787C 24070BB8 */ addiu $a3, $zero, 0x0BB8 ## $a3 = 00000BB8 -/* 01830 80AA7880 10000022 */ beq $zero, $zero, .L80AA790C -/* 01834 80AA7884 87AF0042 */ lh $t7, 0x0042($sp) +/* 01830 80AA7880 10000022 */ beq $zero, $zero, .L80AA790C +/* 01834 80AA7884 87AF0042 */ lh $t7, 0x0042($sp) .L80AA7888: /* 01838 80AA7888 44814000 */ mtc1 $at, $f8 ## $f8 = 0.00 /* 0183C 80AA788C A6090334 */ sh $t1, 0x0334($s0) ## 00000334 @@ -59,45 +59,45 @@ glabel func_80AA77D0 /* 0184C 80AA789C 240A0003 */ addiu $t2, $zero, 0x0003 ## $t2 = 00000003 /* 01850 80AA78A0 240B0064 */ addiu $t3, $zero, 0x0064 ## $t3 = 00000064 /* 01854 80AA78A4 240C000F */ addiu $t4, $zero, 0x000F ## $t4 = 0000000F -/* 01858 80AA78A8 AFAC001C */ sw $t4, 0x001C($sp) -/* 0185C 80AA78AC AFAB0018 */ sw $t3, 0x0018($sp) -/* 01860 80AA78B0 AFAA0010 */ sw $t2, 0x0010($sp) -/* 01864 80AA78B4 AFA00020 */ sw $zero, 0x0020($sp) -/* 01868 80AA78B8 8FA4004C */ lw $a0, 0x004C($sp) +/* 01858 80AA78A8 AFAC001C */ sw $t4, 0x001C($sp) +/* 0185C 80AA78AC AFAB0018 */ sw $t3, 0x0018($sp) +/* 01860 80AA78B0 AFAA0010 */ sw $t2, 0x0010($sp) +/* 01864 80AA78B4 AFA00020 */ sw $zero, 0x0020($sp) +/* 01868 80AA78B8 8FA4004C */ lw $a0, 0x004C($sp) /* 0186C 80AA78BC 26060024 */ addiu $a2, $s0, 0x0024 ## $a2 = 00000024 /* 01870 80AA78C0 3C0740A0 */ lui $a3, 0x40A0 ## $a3 = 40A00000 -/* 01874 80AA78C4 0C00CC98 */ jal func_80033260 -/* 01878 80AA78C8 E7AA0014 */ swc1 $f10, 0x0014($sp) +/* 01874 80AA78C4 0C00CC98 */ jal func_80033260 +/* 01878 80AA78C8 E7AA0014 */ swc1 $f10, 0x0014($sp) /* 0187C 80AA78CC C61001A4 */ lwc1 $f16, 0x01A4($s0) ## 000001A4 -/* 01880 80AA78D0 8FAE0044 */ lw $t6, 0x0044($sp) +/* 01880 80AA78D0 8FAE0044 */ lw $t6, 0x0044($sp) /* 01884 80AA78D4 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 01888 80AA78D8 4600848D */ trunc.w.s $f18, $f16 -/* 0188C 80AA78DC 44029000 */ mfc1 $v0, $f18 +/* 01888 80AA78D8 4600848D */ trunc.w.s $f18, $f16 +/* 0188C 80AA78DC 44029000 */ mfc1 $v0, $f18 /* 01890 80AA78E0 00000000 */ nop -/* 01894 80AA78E4 51C20009 */ beql $t6, $v0, .L80AA790C -/* 01898 80AA78E8 87AF0042 */ lh $t7, 0x0042($sp) -/* 0189C 80AA78EC 10410004 */ beq $v0, $at, .L80AA7900 +/* 01894 80AA78E4 51C20009 */ beql $t6, $v0, .L80AA790C +/* 01898 80AA78E8 87AF0042 */ lh $t7, 0x0042($sp) +/* 0189C 80AA78EC 10410004 */ beq $v0, $at, .L80AA7900 /* 018A0 80AA78F0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 018A4 80AA78F4 24010006 */ addiu $at, $zero, 0x0006 ## $at = 00000006 -/* 018A8 80AA78F8 54410004 */ bnel $v0, $at, .L80AA790C -/* 018AC 80AA78FC 87AF0042 */ lh $t7, 0x0042($sp) +/* 018A8 80AA78F8 54410004 */ bnel $v0, $at, .L80AA790C +/* 018AC 80AA78FC 87AF0042 */ lh $t7, 0x0042($sp) .L80AA7900: /* 018B0 80AA7900 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 018B4 80AA7904 240538BF */ addiu $a1, $zero, 0x38BF ## $a1 = 000038BF -/* 018B8 80AA7908 87AF0042 */ lh $t7, 0x0042($sp) +/* 018B8 80AA7908 87AF0042 */ lh $t7, 0x0042($sp) .L80AA790C: /* 018BC 80AA790C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 018C0 80AA7910 29E11389 */ slti $at, $t7, 0x1389 -/* 018C4 80AA7914 54200004 */ bnel $at, $zero, .L80AA7928 -/* 018C8 80AA7918 8FBF0034 */ lw $ra, 0x0034($sp) -/* 018CC 80AA791C 0C2A9B30 */ jal func_80AA6CC0 +/* 018C0 80AA7910 29E11389 */ slti $at, $t7, 0x1389 +/* 018C4 80AA7914 54200004 */ bnel $at, $zero, .L80AA7928 +/* 018C8 80AA7918 8FBF0034 */ lw $ra, 0x0034($sp) +/* 018CC 80AA791C 0C2A9B30 */ jal func_80AA6CC0 /* 018D0 80AA7920 A6000334 */ sh $zero, 0x0334($s0) ## 00000334 -/* 018D4 80AA7924 8FBF0034 */ lw $ra, 0x0034($sp) +/* 018D4 80AA7924 8FBF0034 */ lw $ra, 0x0034($sp) .L80AA7928: -/* 018D8 80AA7928 8FB00030 */ lw $s0, 0x0030($sp) +/* 018D8 80AA7928 8FB00030 */ lw $s0, 0x0030($sp) /* 018DC 80AA792C 27BD0048 */ addiu $sp, $sp, 0x0048 ## $sp = 00000000 -/* 018E0 80AA7930 03E00008 */ jr $ra +/* 018E0 80AA7930 03E00008 */ jr $ra /* 018E4 80AA7934 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Mb/func_80AA7938.s b/asm/non_matchings/overlays/actors/ovl_En_Mb/func_80AA7938.s index 70363a4ed9..7b97dfe51e 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Mb/func_80AA7938.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Mb/func_80AA7938.s @@ -1,9 +1,9 @@ glabel func_80AA7938 /* 018E8 80AA7938 27BDFF78 */ addiu $sp, $sp, 0xFF78 ## $sp = FFFFFF78 /* 018EC 80AA793C 3C1880AB */ lui $t8, %hi(D_80AA9D50) ## $t8 = 80AB0000 -/* 018F0 80AA7940 AFBF0034 */ sw $ra, 0x0034($sp) -/* 018F4 80AA7944 AFB00030 */ sw $s0, 0x0030($sp) -/* 018F8 80AA7948 AFA5008C */ sw $a1, 0x008C($sp) +/* 018F0 80AA7940 AFBF0034 */ sw $ra, 0x0034($sp) +/* 018F4 80AA7944 AFB00030 */ sw $s0, 0x0030($sp) +/* 018F8 80AA7948 AFA5008C */ sw $a1, 0x008C($sp) /* 018FC 80AA794C 27189D50 */ addiu $t8, $t8, %lo(D_80AA9D50) ## $t8 = 80AA9D50 /* 01900 80AA7950 8F080000 */ lw $t0, 0x0000($t8) ## 80AA9D50 /* 01904 80AA7954 8CA31C44 */ lw $v1, 0x1C44($a1) ## 00001C44 @@ -42,103 +42,103 @@ glabel func_80AA7938 /* 01988 80AA79D8 A4490004 */ sh $t1, 0x0004($v0) ## FFFFFFC8 /* 0198C 80AA79DC 860A0334 */ lh $t2, 0x0334($s0) ## 00000334 /* 01990 80AA79E0 860E0032 */ lh $t6, 0x0032($s0) ## 00000032 -/* 01994 80AA79E4 000A5840 */ sll $t3, $t2, 1 -/* 01998 80AA79E8 004B6021 */ addu $t4, $v0, $t3 +/* 01994 80AA79E4 000A5840 */ sll $t3, $t2, 1 +/* 01998 80AA79E8 004B6021 */ addu $t4, $v0, $t3 /* 0199C 80AA79EC 858DFFFE */ lh $t5, -0x0002($t4) ## FFFFFFFE -/* 019A0 80AA79F0 AFA00010 */ sw $zero, 0x0010($sp) -/* 019A4 80AA79F4 AFA30084 */ sw $v1, 0x0084($sp) -/* 019A8 80AA79F8 01AE2821 */ addu $a1, $t5, $t6 -/* 019AC 80AA79FC 00052C00 */ sll $a1, $a1, 16 +/* 019A0 80AA79F0 AFA00010 */ sw $zero, 0x0010($sp) +/* 019A4 80AA79F4 AFA30084 */ sw $v1, 0x0084($sp) +/* 019A8 80AA79F8 01AE2821 */ addu $a1, $t5, $t6 +/* 019AC 80AA79FC 00052C00 */ sll $a1, $a1, 16 /* 019B0 80AA7A00 0C01E1A7 */ jal Math_SmoothScaleMaxMinS - -/* 019B4 80AA7A04 00052C03 */ sra $a1, $a1, 16 + +/* 019B4 80AA7A04 00052C03 */ sra $a1, $a1, 16 /* 019B8 80AA7A08 920403C4 */ lbu $a0, 0x03C4($s0) ## 000003C4 -/* 019BC 80AA7A0C 8FA30084 */ lw $v1, 0x0084($sp) +/* 019BC 80AA7A0C 8FA30084 */ lw $v1, 0x0084($sp) /* 019C0 80AA7A10 308F0002 */ andi $t7, $a0, 0x0002 ## $t7 = 00000000 -/* 019C4 80AA7A14 51E00030 */ beql $t7, $zero, .L80AA7AD8 +/* 019C4 80AA7A14 51E00030 */ beql $t7, $zero, .L80AA7AD8 /* 019C8 80AA7A18 2604018C */ addiu $a0, $s0, 0x018C ## $a0 = 0000018C /* 019CC 80AA7A1C 8E1903B8 */ lw $t9, 0x03B8($s0) ## 000003B8 /* 019D0 80AA7A20 3098FFFD */ andi $t8, $a0, 0xFFFD ## $t8 = 0000018C /* 019D4 80AA7A24 A21803C4 */ sb $t8, 0x03C4($s0) ## 000003C4 -/* 019D8 80AA7A28 5479002B */ bnel $v1, $t9, .L80AA7AD8 +/* 019D8 80AA7A28 5479002B */ bnel $v1, $t9, .L80AA7AD8 /* 019DC 80AA7A2C 2604018C */ addiu $a0, $s0, 0x018C ## $a0 = 0000018C /* 019E0 80AA7A30 80620A78 */ lb $v0, 0x0A78($v1) ## 00000A78 -/* 019E4 80AA7A34 04410010 */ bgez $v0, .L80AA7A78 -/* 019E8 80AA7A38 A3A2004B */ sb $v0, 0x004B($sp) -/* 019EC 80AA7A3C 2841FFD9 */ slti $at, $v0, 0xFFD9 -/* 019F0 80AA7A40 50200004 */ beql $at, $zero, .L80AA7A54 +/* 019E4 80AA7A34 04410010 */ bgez $v0, .L80AA7A78 +/* 019E8 80AA7A38 A3A2004B */ sb $v0, 0x004B($sp) +/* 019EC 80AA7A3C 2841FFD9 */ slti $at, $v0, 0xFFD9 +/* 019F0 80AA7A40 50200004 */ beql $at, $zero, .L80AA7A54 /* 019F4 80AA7A44 A0600A78 */ sb $zero, 0x0A78($v1) ## 00000A78 -/* 019F8 80AA7A48 1000000B */ beq $zero, $zero, .L80AA7A78 +/* 019F8 80AA7A48 1000000B */ beq $zero, $zero, .L80AA7A78 /* 019FC 80AA7A4C A0600A78 */ sb $zero, 0x0A78($v1) ## 00000A78 /* 01A00 80AA7A50 A0600A78 */ sb $zero, 0x0A78($v1) ## 00000A78 .L80AA7A54: -/* 01A04 80AA7A54 8FA4008C */ lw $a0, 0x008C($sp) +/* 01A04 80AA7A54 8FA4008C */ lw $a0, 0x008C($sp) /* 01A08 80AA7A58 3C190001 */ lui $t9, 0x0001 ## $t9 = 00010000 -/* 01A0C 80AA7A5C AFA30084 */ sw $v1, 0x0084($sp) -/* 01A10 80AA7A60 0324C821 */ addu $t9, $t9, $a0 +/* 01A0C 80AA7A5C AFA30084 */ sw $v1, 0x0084($sp) +/* 01A10 80AA7A60 0324C821 */ addu $t9, $t9, $a0 /* 01A14 80AA7A64 8F391D58 */ lw $t9, 0x1D58($t9) ## 00011D58 /* 01A18 80AA7A68 2405FFF8 */ addiu $a1, $zero, 0xFFF8 ## $a1 = FFFFFFF8 -/* 01A1C 80AA7A6C 0320F809 */ jalr $ra, $t9 +/* 01A1C 80AA7A6C 0320F809 */ jalr $ra, $t9 /* 01A20 80AA7A70 00000000 */ nop -/* 01A24 80AA7A74 8FA30084 */ lw $v1, 0x0084($sp) +/* 01A24 80AA7A74 8FA30084 */ lw $v1, 0x0084($sp) .L80AA7A78: /* 01A28 80AA7A78 3C0180AB */ lui $at, %hi(D_80AA9E84) ## $at = 80AB0000 -/* 01A2C 80AA7A7C C4249E84 */ lwc1 $f4, %lo(D_80AA9E84)($at) +/* 01A2C 80AA7A7C C4249E84 */ lwc1 $f4, %lo(D_80AA9E84)($at) /* 01A30 80AA7A80 C6060090 */ lwc1 $f6, 0x0090($s0) ## 00000090 /* 01A34 80AA7A84 3C0180AB */ lui $at, %hi(D_80AA9E88) ## $at = 80AB0000 -/* 01A38 80AA7A88 C42A9E88 */ lwc1 $f10, %lo(D_80AA9E88)($at) -/* 01A3C 80AA7A8C 46062201 */ sub.s $f8, $f4, $f6 +/* 01A38 80AA7A88 C42A9E88 */ lwc1 $f10, %lo(D_80AA9E88)($at) +/* 01A3C 80AA7A8C 46062201 */ sub.s $f8, $f4, $f6 /* 01A40 80AA7A90 3C014080 */ lui $at, 0x4080 ## $at = 40800000 /* 01A44 80AA7A94 44819000 */ mtc1 $at, $f18 ## $f18 = 4.00 /* 01A48 80AA7A98 3C014100 */ lui $at, 0x4100 ## $at = 41000000 -/* 01A4C 80AA7A9C 460A4402 */ mul.s $f16, $f8, $f10 +/* 01A4C 80AA7A9C 460A4402 */ mul.s $f16, $f8, $f10 /* 01A50 80AA7AA0 44813000 */ mtc1 $at, $f6 ## $f6 = 8.00 /* 01A54 80AA7AA4 86070032 */ lh $a3, 0x0032($s0) ## 00000032 -/* 01A58 80AA7AA8 AFA30084 */ sw $v1, 0x0084($sp) -/* 01A5C 80AA7AAC 8FA4008C */ lw $a0, 0x008C($sp) +/* 01A58 80AA7AA8 AFA30084 */ sw $v1, 0x0084($sp) +/* 01A5C 80AA7AAC 8FA4008C */ lw $a0, 0x008C($sp) /* 01A60 80AA7AB0 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 01A64 80AA7AB4 E7A60010 */ swc1 $f6, 0x0010($sp) -/* 01A68 80AA7AB8 46128100 */ add.s $f4, $f16, $f18 -/* 01A6C 80AA7ABC 44062000 */ mfc1 $a2, $f4 -/* 01A70 80AA7AC0 0C00BDC7 */ jal func_8002F71C +/* 01A64 80AA7AB4 E7A60010 */ swc1 $f6, 0x0010($sp) +/* 01A68 80AA7AB8 46128100 */ add.s $f4, $f16, $f18 +/* 01A6C 80AA7ABC 44062000 */ mfc1 $a2, $f4 +/* 01A70 80AA7AC0 0C00BDC7 */ jal func_8002F71C /* 01A74 80AA7AC4 00000000 */ nop -/* 01A78 80AA7AC8 8FA30084 */ lw $v1, 0x0084($sp) -/* 01A7C 80AA7ACC 93A9004B */ lbu $t1, 0x004B($sp) +/* 01A78 80AA7AC8 8FA30084 */ lw $v1, 0x0084($sp) +/* 01A7C 80AA7ACC 93A9004B */ lbu $t1, 0x004B($sp) /* 01A80 80AA7AD0 A0690A78 */ sb $t1, 0x0A78($v1) ## 00000A78 /* 01A84 80AA7AD4 2604018C */ addiu $a0, $s0, 0x018C ## $a0 = 0000018C .L80AA7AD8: /* 01A88 80AA7AD8 0C02927F */ jal SkelAnime_FrameUpdateMatrix - -/* 01A8C 80AA7ADC AFA40040 */ sw $a0, 0x0040($sp) -/* 01A90 80AA7AE0 50400054 */ beql $v0, $zero, .L80AA7C34 + +/* 01A8C 80AA7ADC AFA40040 */ sw $a0, 0x0040($sp) +/* 01A90 80AA7AE0 50400054 */ beql $v0, $zero, .L80AA7C34 /* 01A94 80AA7AE4 8602032E */ lh $v0, 0x032E($s0) ## 0000032E /* 01A98 80AA7AE8 8602032E */ lh $v0, 0x032E($s0) ## 0000032E -/* 01A9C 80AA7AEC 10400017 */ beq $v0, $zero, .L80AA7B4C +/* 01A9C 80AA7AEC 10400017 */ beq $v0, $zero, .L80AA7B4C /* 01AA0 80AA7AF0 244AFFFF */ addiu $t2, $v0, 0xFFFF ## $t2 = FFFFFFFF /* 01AA4 80AA7AF4 A60A032E */ sh $t2, 0x032E($s0) ## 0000032E /* 01AA8 80AA7AF8 860B032E */ lh $t3, 0x032E($s0) ## 0000032E /* 01AAC 80AA7AFC 3C100601 */ lui $s0, 0x0601 ## $s0 = 06010000 /* 01AB0 80AA7B00 2610ABE0 */ addiu $s0, $s0, 0xABE0 ## $s0 = 0600ABE0 -/* 01AB4 80AA7B04 55600065 */ bnel $t3, $zero, .L80AA7C9C -/* 01AB8 80AA7B08 8FBF0034 */ lw $ra, 0x0034($sp) +/* 01AB4 80AA7B04 55600065 */ bnel $t3, $zero, .L80AA7C9C +/* 01AB8 80AA7B08 8FBF0034 */ lw $ra, 0x0034($sp) /* 01ABC 80AA7B0C 0C028800 */ jal SkelAnime_GetFrameCount - + /* 01AC0 80AA7B10 02002025 */ or $a0, $s0, $zero ## $a0 = 0600ABE0 /* 01AC4 80AA7B14 44824000 */ mtc1 $v0, $f8 ## $f8 = 0.00 /* 01AC8 80AA7B18 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 /* 01ACC 80AA7B1C 240C0003 */ addiu $t4, $zero, 0x0003 ## $t4 = 00000003 -/* 01AD0 80AA7B20 468042A0 */ cvt.s.w $f10, $f8 -/* 01AD4 80AA7B24 44070000 */ mfc1 $a3, $f0 -/* 01AD8 80AA7B28 AFAC0014 */ sw $t4, 0x0014($sp) -/* 01ADC 80AA7B2C 8FA40040 */ lw $a0, 0x0040($sp) +/* 01AD0 80AA7B20 468042A0 */ cvt.s.w $f10, $f8 +/* 01AD4 80AA7B24 44070000 */ mfc1 $a3, $f0 +/* 01AD8 80AA7B28 AFAC0014 */ sw $t4, 0x0014($sp) +/* 01ADC 80AA7B2C 8FA40040 */ lw $a0, 0x0040($sp) /* 01AE0 80AA7B30 02002825 */ or $a1, $s0, $zero ## $a1 = 0600ABE0 /* 01AE4 80AA7B34 3C063FC0 */ lui $a2, 0x3FC0 ## $a2 = 3FC00000 -/* 01AE8 80AA7B38 E7AA0010 */ swc1 $f10, 0x0010($sp) -/* 01AEC 80AA7B3C 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 01AF0 80AA7B40 E7A00018 */ swc1 $f0, 0x0018($sp) -/* 01AF4 80AA7B44 10000055 */ beq $zero, $zero, .L80AA7C9C -/* 01AF8 80AA7B48 8FBF0034 */ lw $ra, 0x0034($sp) +/* 01AE8 80AA7B38 E7AA0010 */ swc1 $f10, 0x0010($sp) +/* 01AEC 80AA7B3C 0C029468 */ jal SkelAnime_ChangeAnim + +/* 01AF0 80AA7B40 E7A00018 */ swc1 $f0, 0x0018($sp) +/* 01AF4 80AA7B44 10000055 */ beq $zero, $zero, .L80AA7C9C +/* 01AF8 80AA7B48 8FBF0034 */ lw $ra, 0x0034($sp) .L80AA7B4C: /* 01AFC 80AA7B4C 8E0F0338 */ lw $t7, 0x0338($s0) ## 0600AF18 /* 01B00 80AA7B50 27AD0074 */ addiu $t5, $sp, 0x0074 ## $t5 = FFFFFFEC @@ -151,89 +151,89 @@ glabel func_80AA7938 /* 01B1C 80AA7B6C ADAF0008 */ sw $t7, 0x0008($t5) ## FFFFFFF4 /* 01B20 80AA7B70 C6100080 */ lwc1 $f16, 0x0080($s0) ## 0600AC60 /* 01B24 80AA7B74 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 01B28 80AA7B78 E7B00078 */ swc1 $f16, 0x0078($sp) + +/* 01B28 80AA7B78 E7B00078 */ swc1 $f16, 0x0078($sp) /* 01B2C 80AA7B7C C60C0090 */ lwc1 $f12, 0x0090($s0) ## 0600AC70 /* 01B30 80AA7B80 240500FF */ addiu $a1, $zero, 0x00FF ## $a1 = 000000FF /* 01B34 80AA7B84 24060014 */ addiu $a2, $zero, 0x0014 ## $a2 = 00000014 -/* 01B38 80AA7B88 0C02A800 */ jal func_800AA000 +/* 01B38 80AA7B88 0C02A800 */ jal func_800AA000 /* 01B3C 80AA7B8C 24070096 */ addiu $a3, $zero, 0x0096 ## $a3 = 00000096 /* 01B40 80AA7B90 27A60068 */ addiu $a2, $sp, 0x0068 ## $a2 = FFFFFFE0 /* 01B44 80AA7B94 00C03825 */ or $a3, $a2, $zero ## $a3 = FFFFFFE0 -/* 01B48 80AA7B98 8FA4008C */ lw $a0, 0x008C($sp) -/* 01B4C 80AA7B9C 0C00A409 */ jal func_80029024 +/* 01B48 80AA7B98 8FA4008C */ lw $a0, 0x008C($sp) +/* 01B4C 80AA7B9C 0C00A409 */ jal func_80029024 /* 01B50 80AA7BA0 27A50074 */ addiu $a1, $sp, 0x0074 ## $a1 = FFFFFFEC /* 01B54 80AA7BA4 2418012C */ addiu $t8, $zero, 0x012C ## $t8 = 0000012C /* 01B58 80AA7BA8 240800B4 */ addiu $t0, $zero, 0x00B4 ## $t0 = 000000B4 /* 01B5C 80AA7BAC 24190001 */ addiu $t9, $zero, 0x0001 ## $t9 = 00000001 -/* 01B60 80AA7BB0 AFB90018 */ sw $t9, 0x0018($sp) -/* 01B64 80AA7BB4 AFA80014 */ sw $t0, 0x0014($sp) -/* 01B68 80AA7BB8 AFB80010 */ sw $t8, 0x0010($sp) -/* 01B6C 80AA7BBC 8FA4008C */ lw $a0, 0x008C($sp) +/* 01B60 80AA7BB0 AFB90018 */ sw $t9, 0x0018($sp) +/* 01B64 80AA7BB4 AFA80014 */ sw $t0, 0x0014($sp) +/* 01B68 80AA7BB8 AFB80010 */ sw $t8, 0x0010($sp) +/* 01B6C 80AA7BBC 8FA4008C */ lw $a0, 0x008C($sp) /* 01B70 80AA7BC0 27A50074 */ addiu $a1, $sp, 0x0074 ## $a1 = FFFFFFEC /* 01B74 80AA7BC4 3C064000 */ lui $a2, 0x4000 ## $a2 = 40000000 -/* 01B78 80AA7BC8 0C00CD20 */ jal func_80033480 +/* 01B78 80AA7BC8 0C00CD20 */ jal func_80033480 /* 01B7C 80AA7BCC 24070003 */ addiu $a3, $zero, 0x0003 ## $a3 = 00000003 -/* 01B80 80AA7BD0 8FA4008C */ lw $a0, 0x008C($sp) +/* 01B80 80AA7BD0 8FA4008C */ lw $a0, 0x008C($sp) /* 01B84 80AA7BD4 24050002 */ addiu $a1, $zero, 0x0002 ## $a1 = 00000002 /* 01B88 80AA7BD8 24060019 */ addiu $a2, $zero, 0x0019 ## $a2 = 00000019 /* 01B8C 80AA7BDC 24070005 */ addiu $a3, $zero, 0x0005 ## $a3 = 00000005 -/* 01B90 80AA7BE0 0C016A87 */ jal func_8005AA1C +/* 01B90 80AA7BE0 0C016A87 */ jal func_8005AA1C /* 01B94 80AA7BE4 248401E0 */ addiu $a0, $a0, 0x01E0 ## $a0 = 000001E0 -/* 01B98 80AA7BE8 8FAB008C */ lw $t3, 0x008C($sp) +/* 01B98 80AA7BE8 8FAB008C */ lw $t3, 0x008C($sp) /* 01B9C 80AA7BEC 24090014 */ addiu $t1, $zero, 0x0014 ## $t1 = 00000014 /* 01BA0 80AA7BF0 27AA0054 */ addiu $t2, $sp, 0x0054 ## $t2 = FFFFFFCC /* 01BA4 80AA7BF4 240CFFFF */ addiu $t4, $zero, 0xFFFF ## $t4 = FFFFFFFF -/* 01BA8 80AA7BF8 AFAC001C */ sw $t4, 0x001C($sp) -/* 01BAC 80AA7BFC AFAA0014 */ sw $t2, 0x0014($sp) -/* 01BB0 80AA7C00 AFA90010 */ sw $t1, 0x0010($sp) +/* 01BA8 80AA7BF8 AFAC001C */ sw $t4, 0x001C($sp) +/* 01BAC 80AA7BFC AFAA0014 */ sw $t2, 0x0014($sp) +/* 01BB0 80AA7C00 AFA90010 */ sw $t1, 0x0010($sp) /* 01BB4 80AA7C04 02002025 */ or $a0, $s0, $zero ## $a0 = 0600ABE0 /* 01BB8 80AA7C08 27A50074 */ addiu $a1, $sp, 0x0074 ## $a1 = FFFFFFEC /* 01BBC 80AA7C0C 26060030 */ addiu $a2, $s0, 0x0030 ## $a2 = 0600AC10 /* 01BC0 80AA7C10 27A7005C */ addiu $a3, $sp, 0x005C ## $a3 = FFFFFFD4 -/* 01BC4 80AA7C14 AFA00020 */ sw $zero, 0x0020($sp) -/* 01BC8 80AA7C18 0C00D637 */ jal func_800358DC -/* 01BCC 80AA7C1C AFAB0018 */ sw $t3, 0x0018($sp) -/* 01BD0 80AA7C20 0C2A9B69 */ jal func_80AA6DA4 +/* 01BC4 80AA7C14 AFA00020 */ sw $zero, 0x0020($sp) +/* 01BC8 80AA7C18 0C00D637 */ jal func_800358DC +/* 01BCC 80AA7C1C AFAB0018 */ sw $t3, 0x0018($sp) +/* 01BD0 80AA7C20 0C2A9B69 */ jal func_80AA6DA4 /* 01BD4 80AA7C24 02002025 */ or $a0, $s0, $zero ## $a0 = 0600ABE0 -/* 01BD8 80AA7C28 1000001C */ beq $zero, $zero, .L80AA7C9C -/* 01BDC 80AA7C2C 8FBF0034 */ lw $ra, 0x0034($sp) +/* 01BD8 80AA7C28 1000001C */ beq $zero, $zero, .L80AA7C9C +/* 01BDC 80AA7C2C 8FBF0034 */ lw $ra, 0x0034($sp) /* 01BE0 80AA7C30 8602032E */ lh $v0, 0x032E($s0) ## 0600AF0E .L80AA7C34: /* 01BE4 80AA7C34 3C0140C0 */ lui $at, 0x40C0 ## $at = 40C00000 -/* 01BE8 80AA7C38 1040000C */ beq $v0, $zero, .L80AA7C6C +/* 01BE8 80AA7C38 1040000C */ beq $v0, $zero, .L80AA7C6C /* 01BEC 80AA7C3C 00000000 */ nop /* 01BF0 80AA7C40 44819000 */ mtc1 $at, $f18 ## $f18 = 6.00 /* 01BF4 80AA7C44 C60401A4 */ lwc1 $f4, 0x01A4($s0) ## 0600AD84 /* 01BF8 80AA7C48 02002025 */ or $a0, $s0, $zero ## $a0 = 0600ABE0 -/* 01BFC 80AA7C4C 46049032 */ c.eq.s $f18, $f4 +/* 01BFC 80AA7C4C 46049032 */ c.eq.s $f18, $f4 /* 01C00 80AA7C50 00000000 */ nop -/* 01C04 80AA7C54 45000005 */ bc1f .L80AA7C6C +/* 01C04 80AA7C54 45000005 */ bc1f .L80AA7C6C /* 01C08 80AA7C58 00000000 */ nop /* 01C0C 80AA7C5C 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 01C10 80AA7C60 240538E2 */ addiu $a1, $zero, 0x38E2 ## $a1 = 000038E2 -/* 01C14 80AA7C64 1000000D */ beq $zero, $zero, .L80AA7C9C -/* 01C18 80AA7C68 8FBF0034 */ lw $ra, 0x0034($sp) +/* 01C14 80AA7C64 1000000D */ beq $zero, $zero, .L80AA7C9C +/* 01C18 80AA7C68 8FBF0034 */ lw $ra, 0x0034($sp) .L80AA7C6C: -/* 01C1C 80AA7C6C 1440000A */ bne $v0, $zero, .L80AA7C98 +/* 01C1C 80AA7C6C 1440000A */ bne $v0, $zero, .L80AA7C98 /* 01C20 80AA7C70 3C014040 */ lui $at, 0x4040 ## $at = 40400000 /* 01C24 80AA7C74 44813000 */ mtc1 $at, $f6 ## $f6 = 3.00 /* 01C28 80AA7C78 C60801A4 */ lwc1 $f8, 0x01A4($s0) ## 0600AD84 /* 01C2C 80AA7C7C 02002025 */ or $a0, $s0, $zero ## $a0 = 0600ABE0 -/* 01C30 80AA7C80 46083032 */ c.eq.s $f6, $f8 +/* 01C30 80AA7C80 46083032 */ c.eq.s $f6, $f8 /* 01C34 80AA7C84 00000000 */ nop -/* 01C38 80AA7C88 45020004 */ bc1fl .L80AA7C9C -/* 01C3C 80AA7C8C 8FBF0034 */ lw $ra, 0x0034($sp) +/* 01C38 80AA7C88 45020004 */ bc1fl .L80AA7C9C +/* 01C3C 80AA7C8C 8FBF0034 */ lw $ra, 0x0034($sp) /* 01C40 80AA7C90 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 01C44 80AA7C94 240538E1 */ addiu $a1, $zero, 0x38E1 ## $a1 = 000038E1 .L80AA7C98: -/* 01C48 80AA7C98 8FBF0034 */ lw $ra, 0x0034($sp) +/* 01C48 80AA7C98 8FBF0034 */ lw $ra, 0x0034($sp) .L80AA7C9C: -/* 01C4C 80AA7C9C 8FB00030 */ lw $s0, 0x0030($sp) +/* 01C4C 80AA7C9C 8FB00030 */ lw $s0, 0x0030($sp) /* 01C50 80AA7CA0 27BD0088 */ addiu $sp, $sp, 0x0088 ## $sp = 00000000 -/* 01C54 80AA7CA4 03E00008 */ jr $ra +/* 01C54 80AA7CA4 03E00008 */ jr $ra /* 01C58 80AA7CA8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Mb/func_80AA7CAC.s b/asm/non_matchings/overlays/actors/ovl_En_Mb/func_80AA7CAC.s index 2c06609fbf..f5594820a0 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Mb/func_80AA7CAC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Mb/func_80AA7CAC.s @@ -1,51 +1,51 @@ glabel func_80AA7CAC /* 01C5C 80AA7CAC 27BDFFA8 */ addiu $sp, $sp, 0xFFA8 ## $sp = FFFFFFA8 -/* 01C60 80AA7CB0 AFBF0034 */ sw $ra, 0x0034($sp) -/* 01C64 80AA7CB4 AFB10030 */ sw $s1, 0x0030($sp) -/* 01C68 80AA7CB8 AFB0002C */ sw $s0, 0x002C($sp) +/* 01C60 80AA7CB0 AFBF0034 */ sw $ra, 0x0034($sp) +/* 01C64 80AA7CB4 AFB10030 */ sw $s1, 0x0030($sp) +/* 01C68 80AA7CB8 AFB0002C */ sw $s0, 0x002C($sp) /* 01C6C 80AA7CBC 8CB11C44 */ lw $s1, 0x1C44($a1) ## 00001C44 /* 01C70 80AA7CC0 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 01C74 80AA7CC4 AFA0004C */ sw $zero, 0x004C($sp) +/* 01C74 80AA7CC4 AFA0004C */ sw $zero, 0x004C($sp) /* 01C78 80AA7CC8 86070032 */ lh $a3, 0x0032($s0) ## 00000032 -/* 01C7C 80AA7CCC AFA5005C */ sw $a1, 0x005C($sp) -/* 01C80 80AA7CD0 0C00CE6E */ jal func_800339B8 +/* 01C7C 80AA7CCC AFA5005C */ sw $a1, 0x005C($sp) +/* 01C80 80AA7CD0 0C00CE6E */ jal func_800339B8 /* 01C84 80AA7CD4 3C0642DC */ lui $a2, 0x42DC ## $a2 = 42DC0000 -/* 01C88 80AA7CD8 2C4E0001 */ sltiu $t6, $v0, 0x0001 -/* 01C8C 80AA7CDC AFAE0048 */ sw $t6, 0x0048($sp) +/* 01C88 80AA7CD8 2C4E0001 */ sltiu $t6, $v0, 0x0001 +/* 01C8C 80AA7CDC AFAE0048 */ sw $t6, 0x0048($sp) /* 01C90 80AA7CE0 C60401A4 */ lwc1 $f4, 0x01A4($s0) ## 000001A4 /* 01C94 80AA7CE4 2604018C */ addiu $a0, $s0, 0x018C ## $a0 = 0000018C -/* 01C98 80AA7CE8 AFA4003C */ sw $a0, 0x003C($sp) -/* 01C9C 80AA7CEC 4600218D */ trunc.w.s $f6, $f4 -/* 01CA0 80AA7CF0 44183000 */ mfc1 $t8, $f6 +/* 01C98 80AA7CE8 AFA4003C */ sw $a0, 0x003C($sp) +/* 01C9C 80AA7CEC 4600218D */ trunc.w.s $f6, $f4 +/* 01CA0 80AA7CF0 44183000 */ mfc1 $t8, $f6 /* 01CA4 80AA7CF4 0C02927F */ jal SkelAnime_FrameUpdateMatrix - -/* 01CA8 80AA7CF8 AFB80050 */ sw $t8, 0x0050($sp) -/* 01CAC 80AA7CFC 10400007 */ beq $v0, $zero, .L80AA7D1C -/* 01CB0 80AA7D00 8FA4003C */ lw $a0, 0x003C($sp) + +/* 01CA8 80AA7CF8 AFB80050 */ sw $t8, 0x0050($sp) +/* 01CAC 80AA7CFC 10400007 */ beq $v0, $zero, .L80AA7D1C +/* 01CB0 80AA7D00 8FA4003C */ lw $a0, 0x003C($sp) /* 01CB4 80AA7D04 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 01CB8 80AA7D08 0C0294BE */ jal func_800A52F8 +/* 01CB8 80AA7D08 0C0294BE */ jal SkelAnime_ChangeAnimDefaultRepeat /* 01CBC 80AA7D0C 24A52F10 */ addiu $a1, $a1, 0x2F10 ## $a1 = 06002F10 /* 01CC0 80AA7D10 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 01CC4 80AA7D14 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 01CC8 80AA7D18 240538BA */ addiu $a1, $zero, 0x38BA ## $a1 = 000038BA .L80AA7D1C: /* 01CCC 80AA7D1C 8602032E */ lh $v0, 0x032E($s0) ## 0000032E /* 01CD0 80AA7D20 3C014120 */ lui $at, 0x4120 ## $at = 41200000 /* 01CD4 80AA7D24 24080001 */ addiu $t0, $zero, 0x0001 ## $t0 = 00000001 -/* 01CD8 80AA7D28 1040000B */ beq $v0, $zero, .L80AA7D58 +/* 01CD8 80AA7D28 1040000B */ beq $v0, $zero, .L80AA7D58 /* 01CDC 80AA7D2C 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 01CE0 80AA7D30 2459FFFF */ addiu $t9, $v0, 0xFFFF ## $t9 = FFFFFFFF /* 01CE4 80AA7D34 A619032E */ sh $t9, 0x032E($s0) ## 0000032E /* 01CE8 80AA7D38 86050032 */ lh $a1, 0x0032($s0) ## 00000032 -/* 01CEC 80AA7D3C AFA00010 */ sw $zero, 0x0010($sp) +/* 01CEC 80AA7D3C AFA00010 */ sw $zero, 0x0010($sp) /* 01CF0 80AA7D40 260400B6 */ addiu $a0, $s0, 0x00B6 ## $a0 = 000000B6 /* 01CF4 80AA7D44 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 /* 01CF8 80AA7D48 0C01E1A7 */ jal Math_SmoothScaleMaxMinS - + /* 01CFC 80AA7D4C 24071F40 */ addiu $a3, $zero, 0x1F40 ## $a3 = 00001F40 -/* 01D00 80AA7D50 10000021 */ beq $zero, $zero, .L80AA7DD8 -/* 01D04 80AA7D54 AFA00048 */ sw $zero, 0x0048($sp) +/* 01D00 80AA7D50 10000021 */ beq $zero, $zero, .L80AA7DD8 +/* 01D04 80AA7D54 AFA00048 */ sw $zero, 0x0048($sp) .L80AA7D58: /* 01D08 80AA7D58 44814000 */ mtc1 $at, $f8 ## $f8 = 0.00 /* 01D0C 80AA7D5C A6080334 */ sh $t0, 0x0334($s0) ## 00000334 @@ -55,154 +55,154 @@ glabel func_80AA7CAC /* 01D1C 80AA7D6C 24090003 */ addiu $t1, $zero, 0x0003 ## $t1 = 00000003 /* 01D20 80AA7D70 240A0064 */ addiu $t2, $zero, 0x0064 ## $t2 = 00000064 /* 01D24 80AA7D74 240B000F */ addiu $t3, $zero, 0x000F ## $t3 = 0000000F -/* 01D28 80AA7D78 AFAB001C */ sw $t3, 0x001C($sp) -/* 01D2C 80AA7D7C AFAA0018 */ sw $t2, 0x0018($sp) -/* 01D30 80AA7D80 AFA90010 */ sw $t1, 0x0010($sp) -/* 01D34 80AA7D84 AFA00020 */ sw $zero, 0x0020($sp) -/* 01D38 80AA7D88 8FA4005C */ lw $a0, 0x005C($sp) +/* 01D28 80AA7D78 AFAB001C */ sw $t3, 0x001C($sp) +/* 01D2C 80AA7D7C AFAA0018 */ sw $t2, 0x0018($sp) +/* 01D30 80AA7D80 AFA90010 */ sw $t1, 0x0010($sp) +/* 01D34 80AA7D84 AFA00020 */ sw $zero, 0x0020($sp) +/* 01D38 80AA7D88 8FA4005C */ lw $a0, 0x005C($sp) /* 01D3C 80AA7D8C 26060024 */ addiu $a2, $s0, 0x0024 ## $a2 = 00000024 /* 01D40 80AA7D90 3C0740A0 */ lui $a3, 0x40A0 ## $a3 = 40A00000 -/* 01D44 80AA7D94 0C00CC98 */ jal func_80033260 -/* 01D48 80AA7D98 E7AA0014 */ swc1 $f10, 0x0014($sp) +/* 01D44 80AA7D94 0C00CC98 */ jal func_80033260 +/* 01D48 80AA7D98 E7AA0014 */ swc1 $f10, 0x0014($sp) /* 01D4C 80AA7D9C C61001A4 */ lwc1 $f16, 0x01A4($s0) ## 000001A4 -/* 01D50 80AA7DA0 8FAD0050 */ lw $t5, 0x0050($sp) +/* 01D50 80AA7DA0 8FAD0050 */ lw $t5, 0x0050($sp) /* 01D54 80AA7DA4 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 01D58 80AA7DA8 4600848D */ trunc.w.s $f18, $f16 -/* 01D5C 80AA7DAC 44029000 */ mfc1 $v0, $f18 +/* 01D58 80AA7DA8 4600848D */ trunc.w.s $f18, $f16 +/* 01D5C 80AA7DAC 44029000 */ mfc1 $v0, $f18 /* 01D60 80AA7DB0 00000000 */ nop -/* 01D64 80AA7DB4 51A20009 */ beql $t5, $v0, .L80AA7DDC +/* 01D64 80AA7DB4 51A20009 */ beql $t5, $v0, .L80AA7DDC /* 01D68 80AA7DB8 920303C4 */ lbu $v1, 0x03C4($s0) ## 000003C4 -/* 01D6C 80AA7DBC 10410004 */ beq $v0, $at, .L80AA7DD0 +/* 01D6C 80AA7DBC 10410004 */ beq $v0, $at, .L80AA7DD0 /* 01D70 80AA7DC0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 01D74 80AA7DC4 24010006 */ addiu $at, $zero, 0x0006 ## $at = 00000006 -/* 01D78 80AA7DC8 54410004 */ bnel $v0, $at, .L80AA7DDC +/* 01D78 80AA7DC8 54410004 */ bnel $v0, $at, .L80AA7DDC /* 01D7C 80AA7DCC 920303C4 */ lbu $v1, 0x03C4($s0) ## 000003C4 .L80AA7DD0: /* 01D80 80AA7DD0 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 01D84 80AA7DD4 240538BF */ addiu $a1, $zero, 0x38BF ## $a1 = 000038BF .L80AA7DD8: /* 01D88 80AA7DD8 920303C4 */ lbu $v1, 0x03C4($s0) ## 000003C4 .L80AA7DDC: /* 01D8C 80AA7DDC 306E0002 */ andi $t6, $v1, 0x0002 ## $t6 = 00000000 -/* 01D90 80AA7DE0 51C00034 */ beql $t6, $zero, .L80AA7EB4 +/* 01D90 80AA7DE0 51C00034 */ beql $t6, $zero, .L80AA7EB4 /* 01D94 80AA7DE4 8E2D0680 */ lw $t5, 0x0680($s1) ## 00000680 /* 01D98 80AA7DE8 8E0F03B8 */ lw $t7, 0x03B8($s0) ## 000003B8 -/* 01D9C 80AA7DEC 8FB80048 */ lw $t8, 0x0048($sp) +/* 01D9C 80AA7DEC 8FB80048 */ lw $t8, 0x0048($sp) /* 01DA0 80AA7DF0 306CFFFD */ andi $t4, $v1, 0xFFFD ## $t4 = 00000000 -/* 01DA4 80AA7DF4 562F002E */ bnel $s1, $t7, .L80AA7EB0 +/* 01DA4 80AA7DF4 562F002E */ bnel $s1, $t7, .L80AA7EB0 /* 01DA8 80AA7DF8 A20C03C4 */ sb $t4, 0x03C4($s0) ## 000003C4 -/* 01DAC 80AA7DFC 57000029 */ bnel $t8, $zero, .L80AA7EA4 +/* 01DAC 80AA7DFC 57000029 */ bnel $t8, $zero, .L80AA7EA4 /* 01DB0 80AA7E00 240B0001 */ addiu $t3, $zero, 0x0001 ## $t3 = 00000001 /* 01DB4 80AA7E04 8E390680 */ lw $t9, 0x0680($s1) ## 00000680 /* 01DB8 80AA7E08 33280080 */ andi $t0, $t9, 0x0080 ## $t0 = 00000000 -/* 01DBC 80AA7E0C 55000025 */ bnel $t0, $zero, .L80AA7EA4 +/* 01DBC 80AA7E0C 55000025 */ bnel $t0, $zero, .L80AA7EA4 /* 01DC0 80AA7E10 240B0001 */ addiu $t3, $zero, 0x0001 ## $t3 = 00000001 /* 01DC4 80AA7E14 82220A78 */ lb $v0, 0x0A78($s1) ## 00000A78 -/* 01DC8 80AA7E18 0441000F */ bgez $v0, .L80AA7E58 -/* 01DCC 80AA7E1C 2841FFD9 */ slti $at, $v0, 0xFFD9 -/* 01DD0 80AA7E20 50200005 */ beql $at, $zero, .L80AA7E38 +/* 01DC8 80AA7E18 0441000F */ bgez $v0, .L80AA7E58 +/* 01DCC 80AA7E1C 2841FFD9 */ slti $at, $v0, 0xFFD9 +/* 01DD0 80AA7E20 50200005 */ beql $at, $zero, .L80AA7E38 /* 01DD4 80AA7E24 A2200A78 */ sb $zero, 0x0A78($s1) ## 00000A78 /* 01DD8 80AA7E28 A2200A78 */ sb $zero, 0x0A78($s1) ## 00000A78 -/* 01DDC 80AA7E2C 1000000A */ beq $zero, $zero, .L80AA7E58 +/* 01DDC 80AA7E2C 1000000A */ beq $zero, $zero, .L80AA7E58 /* 01DE0 80AA7E30 920303C4 */ lbu $v1, 0x03C4($s0) ## 000003C4 /* 01DE4 80AA7E34 A2200A78 */ sb $zero, 0x0A78($s1) ## 00000A78 .L80AA7E38: -/* 01DE8 80AA7E38 8FA4005C */ lw $a0, 0x005C($sp) +/* 01DE8 80AA7E38 8FA4005C */ lw $a0, 0x005C($sp) /* 01DEC 80AA7E3C 3C190001 */ lui $t9, 0x0001 ## $t9 = 00010000 /* 01DF0 80AA7E40 2405FFF8 */ addiu $a1, $zero, 0xFFF8 ## $a1 = FFFFFFF8 -/* 01DF4 80AA7E44 0324C821 */ addu $t9, $t9, $a0 +/* 01DF4 80AA7E44 0324C821 */ addu $t9, $t9, $a0 /* 01DF8 80AA7E48 8F391D58 */ lw $t9, 0x1D58($t9) ## 00011D58 -/* 01DFC 80AA7E4C 0320F809 */ jalr $ra, $t9 +/* 01DFC 80AA7E4C 0320F809 */ jalr $ra, $t9 /* 01E00 80AA7E50 00000000 */ nop /* 01E04 80AA7E54 920303C4 */ lbu $v1, 0x03C4($s0) ## 000003C4 .L80AA7E58: -/* 01E08 80AA7E58 8FA2005C */ lw $v0, 0x005C($sp) +/* 01E08 80AA7E58 8FA2005C */ lw $v0, 0x005C($sp) /* 01E0C 80AA7E5C 3C010001 */ lui $at, 0x0001 ## $at = 00010000 /* 01E10 80AA7E60 306A0004 */ andi $t2, $v1, 0x0004 ## $t2 = 00000000 -/* 01E14 80AA7E64 15400006 */ bne $t2, $zero, .L80AA7E80 -/* 01E18 80AA7E68 00411021 */ addu $v0, $v0, $at +/* 01E14 80AA7E64 15400006 */ bne $t2, $zero, .L80AA7E80 +/* 01E18 80AA7E68 00411021 */ addu $v0, $v0, $at /* 01E1C 80AA7E6C 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 01E20 80AA7E70 2405083E */ addiu $a1, $zero, 0x083E ## $a1 = 0000083E /* 01E24 80AA7E74 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 01E28 80AA7E78 AFA20038 */ sw $v0, 0x0038($sp) -/* 01E2C 80AA7E7C 8FA20038 */ lw $v0, 0x0038($sp) + +/* 01E28 80AA7E78 AFA20038 */ sw $v0, 0x0038($sp) +/* 01E2C 80AA7E7C 8FA20038 */ lw $v0, 0x0038($sp) .L80AA7E80: /* 01E30 80AA7E80 8C591D4C */ lw $t9, 0x1D4C($v0) ## 00001D4C -/* 01E34 80AA7E84 8FA4005C */ lw $a0, 0x005C($sp) +/* 01E34 80AA7E84 8FA4005C */ lw $a0, 0x005C($sp) /* 01E38 80AA7E88 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 01E3C 80AA7E8C 0320F809 */ jalr $ra, $t9 +/* 01E3C 80AA7E8C 0320F809 */ jalr $ra, $t9 /* 01E40 80AA7E90 00000000 */ nop -/* 01E44 80AA7E94 50400003 */ beql $v0, $zero, .L80AA7EA4 +/* 01E44 80AA7E94 50400003 */ beql $v0, $zero, .L80AA7EA4 /* 01E48 80AA7E98 240B0001 */ addiu $t3, $zero, 0x0001 ## $t3 = 00000001 /* 01E4C 80AA7E9C AE300118 */ sw $s0, 0x0118($s1) ## 00000118 /* 01E50 80AA7EA0 240B0001 */ addiu $t3, $zero, 0x0001 ## $t3 = 00000001 .L80AA7EA4: -/* 01E54 80AA7EA4 10000002 */ beq $zero, $zero, .L80AA7EB0 -/* 01E58 80AA7EA8 AFAB004C */ sw $t3, 0x004C($sp) +/* 01E54 80AA7EA4 10000002 */ beq $zero, $zero, .L80AA7EB0 +/* 01E58 80AA7EA8 AFAB004C */ sw $t3, 0x004C($sp) /* 01E5C 80AA7EAC A20C03C4 */ sb $t4, 0x03C4($s0) ## 000003C4 .L80AA7EB0: /* 01E60 80AA7EB0 8E2D0680 */ lw $t5, 0x0680($s1) ## 00000680 .L80AA7EB4: /* 01E64 80AA7EB4 31AE0080 */ andi $t6, $t5, 0x0080 ## $t6 = 00000000 -/* 01E68 80AA7EB8 51C0002B */ beql $t6, $zero, .L80AA7F68 -/* 01E6C 80AA7EBC 8FA80048 */ lw $t0, 0x0048($sp) +/* 01E68 80AA7EB8 51C0002B */ beql $t6, $zero, .L80AA7F68 +/* 01E6C 80AA7EBC 8FA80048 */ lw $t0, 0x0048($sp) /* 01E70 80AA7EC0 8E2F0118 */ lw $t7, 0x0118($s1) ## 00000118 /* 01E74 80AA7EC4 24180001 */ addiu $t8, $zero, 0x0001 ## $t8 = 00000001 -/* 01E78 80AA7EC8 560F0027 */ bnel $s0, $t7, .L80AA7F68 -/* 01E7C 80AA7ECC 8FA80048 */ lw $t0, 0x0048($sp) +/* 01E78 80AA7EC8 560F0027 */ bnel $s0, $t7, .L80AA7F68 +/* 01E7C 80AA7ECC 8FA80048 */ lw $t0, 0x0048($sp) /* 01E80 80AA7ED0 860400B6 */ lh $a0, 0x00B6($s0) ## 000000B6 /* 01E84 80AA7ED4 0C01DE0D */ jal Math_Coss ## coss? -/* 01E88 80AA7ED8 AFB8004C */ sw $t8, 0x004C($sp) -/* 01E8C 80AA7EDC E7A00040 */ swc1 $f0, 0x0040($sp) +/* 01E88 80AA7ED8 AFB8004C */ sw $t8, 0x004C($sp) +/* 01E8C 80AA7EDC E7A00040 */ swc1 $f0, 0x0040($sp) /* 01E90 80AA7EE0 0C01DE1C */ jal Math_Sins ## sins? /* 01E94 80AA7EE4 860400B6 */ lh $a0, 0x00B6($s0) ## 000000B6 /* 01E98 80AA7EE8 3C014120 */ lui $at, 0x4120 ## $at = 41200000 /* 01E9C 80AA7EEC 44813000 */ mtc1 $at, $f6 ## $f6 = 10.00 -/* 01EA0 80AA7EF0 C7A40040 */ lwc1 $f4, 0x0040($sp) +/* 01EA0 80AA7EF0 C7A40040 */ lwc1 $f4, 0x0040($sp) /* 01EA4 80AA7EF4 3C0142B2 */ lui $at, 0x42B2 ## $at = 42B20000 /* 01EA8 80AA7EF8 44819000 */ mtc1 $at, $f18 ## $f18 = 89.00 -/* 01EAC 80AA7EFC 46062202 */ mul.s $f8, $f4, $f6 +/* 01EAC 80AA7EFC 46062202 */ mul.s $f8, $f4, $f6 /* 01EB0 80AA7F00 C60A0024 */ lwc1 $f10, 0x0024($s0) ## 00000024 -/* 01EB4 80AA7F04 46120102 */ mul.s $f4, $f0, $f18 -/* 01EB8 80AA7F08 46085400 */ add.s $f16, $f10, $f8 -/* 01EBC 80AA7F0C 46102180 */ add.s $f6, $f4, $f16 +/* 01EB4 80AA7F04 46120102 */ mul.s $f4, $f0, $f18 +/* 01EB8 80AA7F08 46085400 */ add.s $f16, $f10, $f8 +/* 01EBC 80AA7F0C 46102180 */ add.s $f6, $f4, $f16 /* 01EC0 80AA7F10 E6260024 */ swc1 $f6, 0x0024($s1) ## 00000024 /* 01EC4 80AA7F14 0C01DE1C */ jal Math_Sins ## sins? /* 01EC8 80AA7F18 860400B6 */ lh $a0, 0x00B6($s0) ## 000000B6 -/* 01ECC 80AA7F1C E7A00040 */ swc1 $f0, 0x0040($sp) +/* 01ECC 80AA7F1C E7A00040 */ swc1 $f0, 0x0040($sp) /* 01ED0 80AA7F20 0C01DE0D */ jal Math_Coss ## coss? /* 01ED4 80AA7F24 860400B6 */ lh $a0, 0x00B6($s0) ## 000000B6 /* 01ED8 80AA7F28 3C014120 */ lui $at, 0x4120 ## $at = 41200000 /* 01EDC 80AA7F2C 44814000 */ mtc1 $at, $f8 ## $f8 = 10.00 -/* 01EE0 80AA7F30 C7AA0040 */ lwc1 $f10, 0x0040($sp) +/* 01EE0 80AA7F30 C7AA0040 */ lwc1 $f10, 0x0040($sp) /* 01EE4 80AA7F34 3C0142B2 */ lui $at, 0x42B2 ## $at = 42B20000 /* 01EE8 80AA7F38 44813000 */ mtc1 $at, $f6 ## $f6 = 89.00 -/* 01EEC 80AA7F3C 46085482 */ mul.s $f18, $f10, $f8 +/* 01EEC 80AA7F3C 46085482 */ mul.s $f18, $f10, $f8 /* 01EF0 80AA7F40 C604002C */ lwc1 $f4, 0x002C($s0) ## 0000002C /* 01EF4 80AA7F44 44801000 */ mtc1 $zero, $f2 ## $f2 = 0.00 -/* 01EF8 80AA7F48 46060282 */ mul.s $f10, $f0, $f6 +/* 01EF8 80AA7F48 46060282 */ mul.s $f10, $f0, $f6 /* 01EFC 80AA7F4C A6200850 */ sh $zero, 0x0850($s1) ## 00000850 /* 01F00 80AA7F50 E6220068 */ swc1 $f2, 0x0068($s1) ## 00000068 /* 01F04 80AA7F54 E6220060 */ swc1 $f2, 0x0060($s1) ## 00000060 -/* 01F08 80AA7F58 46122400 */ add.s $f16, $f4, $f18 -/* 01F0C 80AA7F5C 46105200 */ add.s $f8, $f10, $f16 +/* 01F08 80AA7F58 46122400 */ add.s $f16, $f4, $f18 +/* 01F0C 80AA7F5C 46105200 */ add.s $f8, $f10, $f16 /* 01F10 80AA7F60 E628002C */ swc1 $f8, 0x002C($s1) ## 0000002C -/* 01F14 80AA7F64 8FA80048 */ lw $t0, 0x0048($sp) +/* 01F14 80AA7F64 8FA80048 */ lw $t0, 0x0048($sp) .L80AA7F68: -/* 01F18 80AA7F68 8FA9004C */ lw $t1, 0x004C($sp) -/* 01F1C 80AA7F6C 51000023 */ beql $t0, $zero, .L80AA7FFC -/* 01F20 80AA7F70 8FBF0034 */ lw $ra, 0x0034($sp) -/* 01F24 80AA7F74 55200006 */ bnel $t1, $zero, .L80AA7F90 +/* 01F18 80AA7F68 8FA9004C */ lw $t1, 0x004C($sp) +/* 01F1C 80AA7F6C 51000023 */ beql $t0, $zero, .L80AA7FFC +/* 01F20 80AA7F70 8FBF0034 */ lw $ra, 0x0034($sp) +/* 01F24 80AA7F74 55200006 */ bnel $t1, $zero, .L80AA7F90 /* 01F28 80AA7F78 920B03C4 */ lbu $t3, 0x03C4($s0) ## 000003C4 /* 01F2C 80AA7F7C 8E2A0680 */ lw $t2, 0x0680($s1) ## 00000680 /* 01F30 80AA7F80 31590080 */ andi $t9, $t2, 0x0080 ## $t9 = 00000000 -/* 01F34 80AA7F84 53200017 */ beql $t9, $zero, .L80AA7FE4 +/* 01F34 80AA7F84 53200017 */ beql $t9, $zero, .L80AA7FE4 /* 01F38 80AA7F88 3C01C120 */ lui $at, 0xC120 ## $at = C1200000 /* 01F3C 80AA7F8C 920B03C4 */ lbu $t3, 0x03C4($s0) ## 000003C4 .L80AA7F90: @@ -213,31 +213,31 @@ glabel func_80AA7CAC /* 01F50 80AA7FA0 8E220680 */ lw $v0, 0x0680($s1) ## 00000680 /* 01F54 80AA7FA4 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 01F58 80AA7FA8 304D0080 */ andi $t5, $v0, 0x0080 ## $t5 = 00000000 -/* 01F5C 80AA7FAC 51A0000D */ beql $t5, $zero, .L80AA7FE4 +/* 01F5C 80AA7FAC 51A0000D */ beql $t5, $zero, .L80AA7FE4 /* 01F60 80AA7FB0 3C01C120 */ lui $at, 0xC120 ## $at = C1200000 /* 01F64 80AA7FB4 44810000 */ mtc1 $at, $f0 ## $f0 = -10.00 /* 01F68 80AA7FB8 2401FF7F */ addiu $at, $zero, 0xFF7F ## $at = FFFFFF7F -/* 01F6C 80AA7FBC 00417024 */ and $t6, $v0, $at +/* 01F6C 80AA7FBC 00417024 */ and $t6, $v0, $at /* 01F70 80AA7FC0 AE2E0680 */ sw $t6, 0x0680($s1) ## 00000680 /* 01F74 80AA7FC4 AE200118 */ sw $zero, 0x0118($s1) ## 00000118 /* 01F78 80AA7FC8 A62F0850 */ sh $t7, 0x0850($s1) ## 00000850 /* 01F7C 80AA7FCC 86070032 */ lh $a3, 0x0032($s0) ## 00000032 -/* 01F80 80AA7FD0 44060000 */ mfc1 $a2, $f0 -/* 01F84 80AA7FD4 8FA4005C */ lw $a0, 0x005C($sp) -/* 01F88 80AA7FD8 0C00BDC7 */ jal func_8002F71C -/* 01F8C 80AA7FDC E7A00010 */ swc1 $f0, 0x0010($sp) +/* 01F80 80AA7FD0 44060000 */ mfc1 $a2, $f0 +/* 01F84 80AA7FD4 8FA4005C */ lw $a0, 0x005C($sp) +/* 01F88 80AA7FD8 0C00BDC7 */ jal func_8002F71C +/* 01F8C 80AA7FDC E7A00010 */ swc1 $f0, 0x0010($sp) /* 01F90 80AA7FE0 3C01C120 */ lui $at, 0xC120 ## $at = C1200000 .L80AA7FE4: /* 01F94 80AA7FE4 44812000 */ mtc1 $at, $f4 ## $f4 = -10.00 /* 01F98 80AA7FE8 A6000334 */ sh $zero, 0x0334($s0) ## 00000334 /* 01F9C 80AA7FEC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01FA0 80AA7FF0 0C2A9B48 */ jal func_80AA6D20 +/* 01FA0 80AA7FF0 0C2A9B48 */ jal func_80AA6D20 /* 01FA4 80AA7FF4 E6040068 */ swc1 $f4, 0x0068($s0) ## 00000068 -/* 01FA8 80AA7FF8 8FBF0034 */ lw $ra, 0x0034($sp) +/* 01FA8 80AA7FF8 8FBF0034 */ lw $ra, 0x0034($sp) .L80AA7FFC: -/* 01FAC 80AA7FFC 8FB0002C */ lw $s0, 0x002C($sp) -/* 01FB0 80AA8000 8FB10030 */ lw $s1, 0x0030($sp) -/* 01FB4 80AA8004 03E00008 */ jr $ra +/* 01FAC 80AA7FFC 8FB0002C */ lw $s0, 0x002C($sp) +/* 01FB0 80AA8000 8FB10030 */ lw $s1, 0x0030($sp) +/* 01FB4 80AA8004 03E00008 */ jr $ra /* 01FB8 80AA8008 27BD0058 */ addiu $sp, $sp, 0x0058 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Mb/func_80AA8378.s b/asm/non_matchings/overlays/actors/ovl_En_Mb/func_80AA8378.s index 3701229514..53cb1185a6 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Mb/func_80AA8378.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Mb/func_80AA8378.s @@ -1,44 +1,44 @@ glabel func_80AA8378 /* 02328 80AA8378 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 0232C 80AA837C AFB00018 */ sw $s0, 0x0018($sp) +/* 0232C 80AA837C AFB00018 */ sw $s0, 0x0018($sp) /* 02330 80AA8380 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 02334 80AA8384 AFBF001C */ sw $ra, 0x001C($sp) +/* 02334 80AA8384 AFBF001C */ sw $ra, 0x001C($sp) /* 02338 80AA8388 2484018C */ addiu $a0, $a0, 0x018C ## $a0 = 0000018C -/* 0233C 80AA838C AFA5002C */ sw $a1, 0x002C($sp) +/* 0233C 80AA838C AFA5002C */ sw $a1, 0x002C($sp) /* 02340 80AA8390 0C02927F */ jal SkelAnime_FrameUpdateMatrix - -/* 02344 80AA8394 AFA40024 */ sw $a0, 0x0024($sp) -/* 02348 80AA8398 10400017 */ beq $v0, $zero, .L80AA83F8 -/* 0234C 80AA839C 8FA40024 */ lw $a0, 0x0024($sp) + +/* 02344 80AA8394 AFA40024 */ sw $a0, 0x0024($sp) +/* 02348 80AA8398 10400017 */ beq $v0, $zero, .L80AA83F8 +/* 0234C 80AA839C 8FA40024 */ lw $a0, 0x0024($sp) /* 02350 80AA83A0 860E032E */ lh $t6, 0x032E($s0) ## 0000032E /* 02354 80AA83A4 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 -/* 02358 80AA83A8 11C00011 */ beq $t6, $zero, .L80AA83F0 +/* 02358 80AA83A8 11C00011 */ beq $t6, $zero, .L80AA83F0 /* 0235C 80AA83AC 00000000 */ nop -/* 02360 80AA83B0 0C02947A */ jal func_800A51E8 +/* 02360 80AA83B0 0C02947A */ jal SkelAnime_ChangeAnimDefaultStop /* 02364 80AA83B4 24A5E18C */ addiu $a1, $a1, 0xE18C ## $a1 = 0600E18C /* 02368 80AA83B8 A600032E */ sh $zero, 0x032E($s0) ## 0000032E /* 0236C 80AA83BC C60C0090 */ lwc1 $f12, 0x0090($s0) ## 00000090 /* 02370 80AA83C0 240500FF */ addiu $a1, $zero, 0x00FF ## $a1 = 000000FF /* 02374 80AA83C4 24060014 */ addiu $a2, $zero, 0x0014 ## $a2 = 00000014 -/* 02378 80AA83C8 0C02A800 */ jal func_800AA000 +/* 02378 80AA83C8 0C02A800 */ jal func_800AA000 /* 0237C 80AA83CC 24070096 */ addiu $a3, $zero, 0x0096 ## $a3 = 00000096 -/* 02380 80AA83D0 8FA4002C */ lw $a0, 0x002C($sp) +/* 02380 80AA83D0 8FA4002C */ lw $a0, 0x002C($sp) /* 02384 80AA83D4 24050002 */ addiu $a1, $zero, 0x0002 ## $a1 = 00000002 /* 02388 80AA83D8 24060019 */ addiu $a2, $zero, 0x0019 ## $a2 = 00000019 /* 0238C 80AA83DC 24070005 */ addiu $a3, $zero, 0x0005 ## $a3 = 00000005 -/* 02390 80AA83E0 0C016A87 */ jal func_8005AA1C +/* 02390 80AA83E0 0C016A87 */ jal func_8005AA1C /* 02394 80AA83E4 248401E0 */ addiu $a0, $a0, 0x01E0 ## $a0 = 000001E0 -/* 02398 80AA83E8 10000004 */ beq $zero, $zero, .L80AA83FC -/* 0239C 80AA83EC 8FBF001C */ lw $ra, 0x001C($sp) +/* 02398 80AA83E8 10000004 */ beq $zero, $zero, .L80AA83FC +/* 0239C 80AA83EC 8FBF001C */ lw $ra, 0x001C($sp) .L80AA83F0: -/* 023A0 80AA83F0 0C2A9A26 */ jal func_80AA6898 +/* 023A0 80AA83F0 0C2A9A26 */ jal func_80AA6898 /* 023A4 80AA83F4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 .L80AA83F8: -/* 023A8 80AA83F8 8FBF001C */ lw $ra, 0x001C($sp) +/* 023A8 80AA83F8 8FBF001C */ lw $ra, 0x001C($sp) .L80AA83FC: -/* 023AC 80AA83FC 8FB00018 */ lw $s0, 0x0018($sp) +/* 023AC 80AA83FC 8FB00018 */ lw $s0, 0x0018($sp) /* 023B0 80AA8400 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 023B4 80AA8404 03E00008 */ jr $ra +/* 023B4 80AA8404 03E00008 */ jr $ra /* 023B8 80AA8408 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Mb/func_80AA840C.s b/asm/non_matchings/overlays/actors/ovl_En_Mb/func_80AA840C.s index 38c7bedf6a..40b0ee5e9b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Mb/func_80AA840C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Mb/func_80AA840C.s @@ -1,78 +1,78 @@ glabel func_80AA840C /* 023BC 80AA840C 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 -/* 023C0 80AA8410 AFB00028 */ sw $s0, 0x0028($sp) +/* 023C0 80AA8410 AFB00028 */ sw $s0, 0x0028($sp) /* 023C4 80AA8414 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 023C8 80AA8418 AFBF002C */ sw $ra, 0x002C($sp) +/* 023C8 80AA8418 AFBF002C */ sw $ra, 0x002C($sp) /* 023CC 80AA841C 2484018C */ addiu $a0, $a0, 0x018C ## $a0 = 0000018C -/* 023D0 80AA8420 AFA50044 */ sw $a1, 0x0044($sp) +/* 023D0 80AA8420 AFA50044 */ sw $a1, 0x0044($sp) /* 023D4 80AA8424 0C02927F */ jal SkelAnime_FrameUpdateMatrix - -/* 023D8 80AA8428 AFA40034 */ sw $a0, 0x0034($sp) -/* 023DC 80AA842C 50400035 */ beql $v0, $zero, .L80AA8504 -/* 023E0 80AA8430 8FBF002C */ lw $ra, 0x002C($sp) + +/* 023D8 80AA8428 AFA40034 */ sw $a0, 0x0034($sp) +/* 023DC 80AA842C 50400035 */ beql $v0, $zero, .L80AA8504 +/* 023E0 80AA8430 8FBF002C */ lw $ra, 0x002C($sp) /* 023E4 80AA8434 8602032E */ lh $v0, 0x032E($s0) ## 0000032E -/* 023E8 80AA8438 1040002F */ beq $v0, $zero, .L80AA84F8 +/* 023E8 80AA8438 1040002F */ beq $v0, $zero, .L80AA84F8 /* 023EC 80AA843C 244EFFFF */ addiu $t6, $v0, 0xFFFF ## $t6 = FFFFFFFF /* 023F0 80AA8440 A60E032E */ sh $t6, 0x032E($s0) ## 0000032E /* 023F4 80AA8444 860F032E */ lh $t7, 0x032E($s0) ## 0000032E -/* 023F8 80AA8448 55E0002E */ bnel $t7, $zero, .L80AA8504 -/* 023FC 80AA844C 8FBF002C */ lw $ra, 0x002C($sp) +/* 023F8 80AA8448 55E0002E */ bnel $t7, $zero, .L80AA8504 +/* 023FC 80AA844C 8FBF002C */ lw $ra, 0x002C($sp) /* 02400 80AA8450 8618032A */ lh $t8, 0x032A($s0) ## 0000032A /* 02404 80AA8454 3C040601 */ lui $a0, 0x0601 ## $a0 = 06010000 -/* 02408 80AA8458 17000015 */ bne $t8, $zero, .L80AA84B0 +/* 02408 80AA8458 17000015 */ bne $t8, $zero, .L80AA84B0 /* 0240C 80AA845C 00000000 */ nop /* 02410 80AA8460 0C028800 */ jal SkelAnime_GetFrameCount - + /* 02414 80AA8464 2484E18C */ addiu $a0, $a0, 0xE18C ## $a0 = 0600E18C /* 02418 80AA8468 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 0241C 80AA846C 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 /* 02420 80AA8470 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 -/* 02424 80AA8474 468021A0 */ cvt.s.w $f6, $f4 +/* 02424 80AA8474 468021A0 */ cvt.s.w $f6, $f4 /* 02428 80AA8478 24190003 */ addiu $t9, $zero, 0x0003 ## $t9 = 00000003 -/* 0242C 80AA847C 44070000 */ mfc1 $a3, $f0 -/* 02430 80AA8480 AFB90014 */ sw $t9, 0x0014($sp) +/* 0242C 80AA847C 44070000 */ mfc1 $a3, $f0 +/* 02430 80AA8480 AFB90014 */ sw $t9, 0x0014($sp) /* 02434 80AA8484 24A5E18C */ addiu $a1, $a1, 0xE18C ## $a1 = 0600E18C -/* 02438 80AA8488 8FA40034 */ lw $a0, 0x0034($sp) -/* 0243C 80AA848C E7A60010 */ swc1 $f6, 0x0010($sp) +/* 02438 80AA8488 8FA40034 */ lw $a0, 0x0034($sp) +/* 0243C 80AA848C E7A60010 */ swc1 $f6, 0x0010($sp) /* 02440 80AA8490 3C064040 */ lui $a2, 0x4040 ## $a2 = 40400000 -/* 02444 80AA8494 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 02448 80AA8498 E7A00018 */ swc1 $f0, 0x0018($sp) +/* 02444 80AA8494 0C029468 */ jal SkelAnime_ChangeAnim + +/* 02448 80AA8498 E7A00018 */ swc1 $f0, 0x0018($sp) /* 0244C 80AA849C 24080001 */ addiu $t0, $zero, 0x0001 ## $t0 = 00000001 /* 02450 80AA84A0 24090006 */ addiu $t1, $zero, 0x0006 ## $t1 = 00000006 /* 02454 80AA84A4 A608032A */ sh $t0, 0x032A($s0) ## 0000032A -/* 02458 80AA84A8 10000015 */ beq $zero, $zero, .L80AA8500 +/* 02458 80AA84A8 10000015 */ beq $zero, $zero, .L80AA8500 /* 0245C 80AA84AC A609032E */ sh $t1, 0x032E($s0) ## 0000032E .L80AA84B0: /* 02460 80AA84B0 3C100601 */ lui $s0, 0x0601 ## $s0 = 06010000 /* 02464 80AA84B4 2610E18C */ addiu $s0, $s0, 0xE18C ## $s0 = 0600E18C /* 02468 80AA84B8 0C028800 */ jal SkelAnime_GetFrameCount - + /* 0246C 80AA84BC 02002025 */ or $a0, $s0, $zero ## $a0 = 0600E18C /* 02470 80AA84C0 44824000 */ mtc1 $v0, $f8 ## $f8 = 0.00 /* 02474 80AA84C4 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 /* 02478 80AA84C8 240A0003 */ addiu $t2, $zero, 0x0003 ## $t2 = 00000003 -/* 0247C 80AA84CC 468042A0 */ cvt.s.w $f10, $f8 -/* 02480 80AA84D0 44070000 */ mfc1 $a3, $f0 -/* 02484 80AA84D4 AFAA0014 */ sw $t2, 0x0014($sp) -/* 02488 80AA84D8 8FA40034 */ lw $a0, 0x0034($sp) +/* 0247C 80AA84CC 468042A0 */ cvt.s.w $f10, $f8 +/* 02480 80AA84D0 44070000 */ mfc1 $a3, $f0 +/* 02484 80AA84D4 AFAA0014 */ sw $t2, 0x0014($sp) +/* 02488 80AA84D8 8FA40034 */ lw $a0, 0x0034($sp) /* 0248C 80AA84DC 02002825 */ or $a1, $s0, $zero ## $a1 = 0600E18C /* 02490 80AA84E0 3C064040 */ lui $a2, 0x4040 ## $a2 = 40400000 -/* 02494 80AA84E4 E7AA0010 */ swc1 $f10, 0x0010($sp) -/* 02498 80AA84E8 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 0249C 80AA84EC E7A00018 */ swc1 $f0, 0x0018($sp) -/* 024A0 80AA84F0 10000004 */ beq $zero, $zero, .L80AA8504 -/* 024A4 80AA84F4 8FBF002C */ lw $ra, 0x002C($sp) +/* 02494 80AA84E4 E7AA0010 */ swc1 $f10, 0x0010($sp) +/* 02498 80AA84E8 0C029468 */ jal SkelAnime_ChangeAnim + +/* 0249C 80AA84EC E7A00018 */ swc1 $f0, 0x0018($sp) +/* 024A0 80AA84F0 10000004 */ beq $zero, $zero, .L80AA8504 +/* 024A4 80AA84F4 8FBF002C */ lw $ra, 0x002C($sp) .L80AA84F8: -/* 024A8 80AA84F8 0C2A9A26 */ jal func_80AA6898 +/* 024A8 80AA84F8 0C2A9A26 */ jal func_80AA6898 /* 024AC 80AA84FC 02002025 */ or $a0, $s0, $zero ## $a0 = 0600E18C .L80AA8500: -/* 024B0 80AA8500 8FBF002C */ lw $ra, 0x002C($sp) +/* 024B0 80AA8500 8FBF002C */ lw $ra, 0x002C($sp) .L80AA8504: -/* 024B4 80AA8504 8FB00028 */ lw $s0, 0x0028($sp) +/* 024B4 80AA8504 8FB00028 */ lw $s0, 0x0028($sp) /* 024B8 80AA8508 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 -/* 024BC 80AA850C 03E00008 */ jr $ra +/* 024BC 80AA850C 03E00008 */ jr $ra /* 024C0 80AA8510 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Mb/func_80AA8E88.s b/asm/non_matchings/overlays/actors/ovl_En_Mb/func_80AA8E88.s index 9f716340a5..9943051c8e 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Mb/func_80AA8E88.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Mb/func_80AA8E88.s @@ -1,34 +1,34 @@ glabel func_80AA8E88 /* 02E38 80AA8E88 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 02E3C 80AA8E8C AFBF001C */ sw $ra, 0x001C($sp) -/* 02E40 80AA8E90 AFB00018 */ sw $s0, 0x0018($sp) +/* 02E3C 80AA8E8C AFBF001C */ sw $ra, 0x001C($sp) +/* 02E40 80AA8E90 AFB00018 */ sw $s0, 0x0018($sp) /* 02E44 80AA8E94 848F00B6 */ lh $t7, 0x00B6($a0) ## 000000B6 /* 02E48 80AA8E98 848E008A */ lh $t6, 0x008A($a0) ## 0000008A /* 02E4C 80AA8E9C 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 02E50 80AA8EA0 2604018C */ addiu $a0, $s0, 0x018C ## $a0 = 0000018C -/* 02E54 80AA8EA4 01CF1023 */ subu $v0, $t6, $t7 -/* 02E58 80AA8EA8 00021400 */ sll $v0, $v0, 16 -/* 02E5C 80AA8EAC 00021403 */ sra $v0, $v0, 16 -/* 02E60 80AA8EB0 04400003 */ bltz $v0, .L80AA8EC0 -/* 02E64 80AA8EB4 00021823 */ subu $v1, $zero, $v0 -/* 02E68 80AA8EB8 10000001 */ beq $zero, $zero, .L80AA8EC0 +/* 02E54 80AA8EA4 01CF1023 */ subu $v0, $t6, $t7 +/* 02E58 80AA8EA8 00021400 */ sll $v0, $v0, 16 +/* 02E5C 80AA8EAC 00021403 */ sra $v0, $v0, 16 +/* 02E60 80AA8EB0 04400003 */ bltz $v0, .L80AA8EC0 +/* 02E64 80AA8EB4 00021823 */ subu $v1, $zero, $v0 +/* 02E68 80AA8EB8 10000001 */ beq $zero, $zero, .L80AA8EC0 /* 02E6C 80AA8EBC 00401825 */ or $v1, $v0, $zero ## $v1 = 00000000 .L80AA8EC0: -/* 02E70 80AA8EC0 28614001 */ slti $at, $v1, 0x4001 -/* 02E74 80AA8EC4 1020000A */ beq $at, $zero, .L80AA8EF0 +/* 02E70 80AA8EC0 28614001 */ slti $at, $v1, 0x4001 +/* 02E74 80AA8EC4 1020000A */ beq $at, $zero, .L80AA8EF0 /* 02E78 80AA8EC8 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 02E7C 80AA8ECC 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 02E80 80AA8ED0 24A51950 */ addiu $a1, $a1, 0x1950 ## $a1 = 06001950 /* 02E84 80AA8ED4 2604018C */ addiu $a0, $s0, 0x018C ## $a0 = 0000018C -/* 02E88 80AA8ED8 0C029490 */ jal func_800A5240 +/* 02E88 80AA8ED8 0C029490 */ jal SkelAnime_ChangeAnimTransitionStop /* 02E8C 80AA8EDC 3C06C080 */ lui $a2, 0xC080 ## $a2 = C0800000 /* 02E90 80AA8EE0 3C01C100 */ lui $at, 0xC100 ## $at = C1000000 /* 02E94 80AA8EE4 44812000 */ mtc1 $at, $f4 ## $f4 = -8.00 -/* 02E98 80AA8EE8 10000008 */ beq $zero, $zero, .L80AA8F0C +/* 02E98 80AA8EE8 10000008 */ beq $zero, $zero, .L80AA8F0C /* 02E9C 80AA8EEC E6040068 */ swc1 $f4, 0x0068($s0) ## 00000068 .L80AA8EF0: /* 02EA0 80AA8EF0 24A5095C */ addiu $a1, $a1, 0x095C ## $a1 = 0000095C -/* 02EA4 80AA8EF4 0C029490 */ jal func_800A5240 +/* 02EA4 80AA8EF4 0C029490 */ jal SkelAnime_ChangeAnimTransitionStop /* 02EA8 80AA8EF8 3C06C080 */ lui $a2, 0xC080 ## $a2 = C0800000 /* 02EAC 80AA8EFC 3C014100 */ lui $at, 0x4100 ## $at = 41000000 /* 02EB0 80AA8F00 44813000 */ mtc1 $at, $f6 ## $f6 = 8.00 @@ -42,16 +42,16 @@ glabel func_80AA8E88 /* 02ECC 80AA8F1C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 02ED0 80AA8F20 240538BE */ addiu $a1, $zero, 0x38BE ## $a1 = 000038BE /* 02ED4 80AA8F24 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 02ED8 80AA8F28 A61900B6 */ sh $t9, 0x00B6($s0) ## 000000B6 /* 02EDC 80AA8F2C 3C0580AB */ lui $a1, %hi(func_80AA8F50) ## $a1 = 80AB0000 /* 02EE0 80AA8F30 24A58F50 */ addiu $a1, $a1, %lo(func_80AA8F50) ## $a1 = 80AA8F50 -/* 02EE4 80AA8F34 0C2A9814 */ jal func_80AA6050 +/* 02EE4 80AA8F34 0C2A9814 */ jal func_80AA6050 /* 02EE8 80AA8F38 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02EEC 80AA8F3C 8FBF001C */ lw $ra, 0x001C($sp) -/* 02EF0 80AA8F40 8FB00018 */ lw $s0, 0x0018($sp) +/* 02EEC 80AA8F3C 8FBF001C */ lw $ra, 0x001C($sp) +/* 02EF0 80AA8F40 8FB00018 */ lw $s0, 0x0018($sp) /* 02EF4 80AA8F44 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 02EF8 80AA8F48 03E00008 */ jr $ra +/* 02EF8 80AA8F48 03E00008 */ jr $ra /* 02EFC 80AA8F4C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Mb/func_80AA8FC8.s b/asm/non_matchings/overlays/actors/ovl_En_Mb/func_80AA8FC8.s index 62caa0e296..7e01a09dae 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Mb/func_80AA8FC8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Mb/func_80AA8FC8.s @@ -1,34 +1,34 @@ glabel func_80AA8FC8 /* 02F78 80AA8FC8 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 02F7C 80AA8FCC AFBF001C */ sw $ra, 0x001C($sp) -/* 02F80 80AA8FD0 AFB00018 */ sw $s0, 0x0018($sp) +/* 02F7C 80AA8FCC AFBF001C */ sw $ra, 0x001C($sp) +/* 02F80 80AA8FD0 AFB00018 */ sw $s0, 0x0018($sp) /* 02F84 80AA8FD4 848F00B6 */ lh $t7, 0x00B6($a0) ## 000000B6 /* 02F88 80AA8FD8 848E008A */ lh $t6, 0x008A($a0) ## 0000008A /* 02F8C 80AA8FDC 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 02F90 80AA8FE0 2604018C */ addiu $a0, $s0, 0x018C ## $a0 = 0000018C -/* 02F94 80AA8FE4 01CF1023 */ subu $v0, $t6, $t7 -/* 02F98 80AA8FE8 00021400 */ sll $v0, $v0, 16 -/* 02F9C 80AA8FEC 00021403 */ sra $v0, $v0, 16 -/* 02FA0 80AA8FF0 04400003 */ bltz $v0, .L80AA9000 -/* 02FA4 80AA8FF4 00021823 */ subu $v1, $zero, $v0 -/* 02FA8 80AA8FF8 10000001 */ beq $zero, $zero, .L80AA9000 +/* 02F94 80AA8FE4 01CF1023 */ subu $v0, $t6, $t7 +/* 02F98 80AA8FE8 00021400 */ sll $v0, $v0, 16 +/* 02F9C 80AA8FEC 00021403 */ sra $v0, $v0, 16 +/* 02FA0 80AA8FF0 04400003 */ bltz $v0, .L80AA9000 +/* 02FA4 80AA8FF4 00021823 */ subu $v1, $zero, $v0 +/* 02FA8 80AA8FF8 10000001 */ beq $zero, $zero, .L80AA9000 /* 02FAC 80AA8FFC 00401825 */ or $v1, $v0, $zero ## $v1 = 00000000 .L80AA9000: -/* 02FB0 80AA9000 28614001 */ slti $at, $v1, 0x4001 -/* 02FB4 80AA9004 1020000A */ beq $at, $zero, .L80AA9030 +/* 02FB0 80AA9000 28614001 */ slti $at, $v1, 0x4001 +/* 02FB4 80AA9004 1020000A */ beq $at, $zero, .L80AA9030 /* 02FB8 80AA9008 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 02FBC 80AA900C 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 02FC0 80AA9010 24A516B4 */ addiu $a1, $a1, 0x16B4 ## $a1 = 060016B4 /* 02FC4 80AA9014 2604018C */ addiu $a0, $s0, 0x018C ## $a0 = 0000018C -/* 02FC8 80AA9018 0C029490 */ jal func_800A5240 +/* 02FC8 80AA9018 0C029490 */ jal SkelAnime_ChangeAnimTransitionStop /* 02FCC 80AA901C 3C06C080 */ lui $a2, 0xC080 ## $a2 = C0800000 /* 02FD0 80AA9020 3C01C100 */ lui $at, 0xC100 ## $at = C1000000 /* 02FD4 80AA9024 44812000 */ mtc1 $at, $f4 ## $f4 = -8.00 -/* 02FD8 80AA9028 10000008 */ beq $zero, $zero, .L80AA904C +/* 02FD8 80AA9028 10000008 */ beq $zero, $zero, .L80AA904C /* 02FDC 80AA902C E6040068 */ swc1 $f4, 0x0068($s0) ## 00000068 .L80AA9030: /* 02FE0 80AA9030 24A516B4 */ addiu $a1, $a1, 0x16B4 ## $a1 = 000016B4 -/* 02FE4 80AA9034 0C029490 */ jal func_800A5240 +/* 02FE4 80AA9034 0C029490 */ jal SkelAnime_ChangeAnimTransitionStop /* 02FE8 80AA9038 3C06C080 */ lui $a2, 0xC080 ## $a2 = C0800000 /* 02FEC 80AA903C 3C014100 */ lui $at, 0x4100 ## $at = 41000000 /* 02FF0 80AA9040 44813000 */ mtc1 $at, $f6 ## $f6 = 8.00 @@ -42,20 +42,20 @@ glabel func_80AA8FC8 /* 0300C 80AA905C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 03010 80AA9060 240538BE */ addiu $a1, $zero, 0x38BE ## $a1 = 000038BE /* 03014 80AA9064 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 03018 80AA9068 A6180032 */ sh $t8, 0x0032($s0) ## 00000032 /* 0301C 80AA906C 8E080004 */ lw $t0, 0x0004($s0) ## 00000004 /* 03020 80AA9070 2401FFFE */ addiu $at, $zero, 0xFFFE ## $at = FFFFFFFE /* 03024 80AA9074 3C0580AB */ lui $a1, %hi(func_80AA90A0) ## $a1 = 80AB0000 -/* 03028 80AA9078 01014824 */ and $t1, $t0, $at +/* 03028 80AA9078 01014824 */ and $t1, $t0, $at /* 0302C 80AA907C AE090004 */ sw $t1, 0x0004($s0) ## 00000004 /* 03030 80AA9080 24A590A0 */ addiu $a1, $a1, %lo(func_80AA90A0) ## $a1 = 80AA90A0 -/* 03034 80AA9084 0C2A9814 */ jal func_80AA6050 +/* 03034 80AA9084 0C2A9814 */ jal func_80AA6050 /* 03038 80AA9088 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0303C 80AA908C 8FBF001C */ lw $ra, 0x001C($sp) -/* 03040 80AA9090 8FB00018 */ lw $s0, 0x0018($sp) +/* 0303C 80AA908C 8FBF001C */ lw $ra, 0x001C($sp) +/* 03040 80AA9090 8FB00018 */ lw $s0, 0x0018($sp) /* 03044 80AA9094 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 03048 80AA9098 03E00008 */ jr $ra +/* 03048 80AA9098 03E00008 */ jr $ra /* 0304C 80AA909C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Md/EnMd_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Md/EnMd_Draw.s index 48ddbb3da2..cca31ef496 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Md/EnMd_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Md/EnMd_Draw.s @@ -9,7 +9,7 @@ glabel EnMd_Draw /* 01F2C 80AAC17C 24C6C4B0 */ addiu $a2, $a2, %lo(D_80AAC4B0) ## $a2 = 80AAC4B0 /* 01F30 80AAC180 27A40038 */ addiu $a0, $sp, 0x0038 ## $a0 = FFFFFFE8 /* 01F34 80AAC184 24070500 */ addiu $a3, $zero, 0x0500 ## $a3 = 00000500 -/* 01F38 80AAC188 0C031AB1 */ jal func_800C6AC4 +/* 01F38 80AAC188 0C031AB1 */ jal Graph_OpenDisps /* 01F3C 80AAC18C AFA50048 */ sw $a1, 0x0048($sp) /* 01F40 80AAC190 86020210 */ lh $v0, 0x0210($s0) ## 00000210 /* 01F44 80AAC194 240100FF */ addiu $at, $zero, 0x00FF ## $at = 000000FF @@ -94,7 +94,7 @@ glabel EnMd_Draw /* 02074 80AAC2C4 24C6C4C0 */ addiu $a2, $a2, %lo(D_80AAC4C0) ## $a2 = 80AAC4C0 /* 02078 80AAC2C8 27A40038 */ addiu $a0, $sp, 0x0038 ## $a0 = FFFFFFE8 /* 0207C 80AAC2CC 24070525 */ addiu $a3, $zero, 0x0525 ## $a3 = 00000525 -/* 02080 80AAC2D0 0C031AD5 */ jal func_800C6B54 +/* 02080 80AAC2D0 0C031AD5 */ jal Graph_CloseDisps /* 02084 80AAC2D4 8DA50000 */ lw $a1, 0x0000($t5) ## 00000000 /* 02088 80AAC2D8 8FBF0024 */ lw $ra, 0x0024($sp) /* 0208C 80AAC2DC 8FB00020 */ lw $s0, 0x0020($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Md/EnMd_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Md/EnMd_Init.s index 44fb657ad4..799059906d 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Md/EnMd_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Md/EnMd_Init.s @@ -1,117 +1,117 @@ glabel EnMd_Init /* 01400 80AAB650 27BDFFB0 */ addiu $sp, $sp, 0xFFB0 ## $sp = FFFFFFB0 -/* 01404 80AAB654 AFB10038 */ sw $s1, 0x0038($sp) -/* 01408 80AAB658 AFB00034 */ sw $s0, 0x0034($sp) +/* 01404 80AAB654 AFB10038 */ sw $s1, 0x0038($sp) +/* 01408 80AAB658 AFB00034 */ sw $s0, 0x0034($sp) /* 0140C 80AAB65C 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 01410 80AAB660 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 -/* 01414 80AAB664 AFBF003C */ sw $ra, 0x003C($sp) +/* 01414 80AAB664 AFBF003C */ sw $ra, 0x003C($sp) /* 01418 80AAB668 3C068003 */ lui $a2, 0x8003 ## $a2 = 80030000 /* 0141C 80AAB66C 24C6B5EC */ addiu $a2, $a2, 0xB5EC ## $a2 = 8002B5EC /* 01420 80AAB670 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 /* 01424 80AAB674 248400B4 */ addiu $a0, $a0, 0x00B4 ## $a0 = 000000B4 /* 01428 80AAB678 0C00AC78 */ jal ActorShape_Init - + /* 0142C 80AAB67C 3C0741C0 */ lui $a3, 0x41C0 ## $a3 = 41C00000 /* 01430 80AAB680 2605014C */ addiu $a1, $s0, 0x014C ## $a1 = 0000014C /* 01434 80AAB684 3C060600 */ lui $a2, 0x0600 ## $a2 = 06000000 /* 01438 80AAB688 260E0258 */ addiu $t6, $s0, 0x0258 ## $t6 = 00000258 /* 0143C 80AAB68C 260F02BE */ addiu $t7, $s0, 0x02BE ## $t7 = 000002BE /* 01440 80AAB690 24180011 */ addiu $t8, $zero, 0x0011 ## $t8 = 00000011 -/* 01444 80AAB694 AFB80018 */ sw $t8, 0x0018($sp) -/* 01448 80AAB698 AFAF0014 */ sw $t7, 0x0014($sp) -/* 0144C 80AAB69C AFAE0010 */ sw $t6, 0x0010($sp) +/* 01444 80AAB694 AFB80018 */ sw $t8, 0x0018($sp) +/* 01448 80AAB698 AFAF0014 */ sw $t7, 0x0014($sp) +/* 0144C 80AAB69C AFAE0010 */ sw $t6, 0x0010($sp) /* 01450 80AAB6A0 24C67FB8 */ addiu $a2, $a2, 0x7FB8 ## $a2 = 06007FB8 -/* 01454 80AAB6A4 AFA50044 */ sw $a1, 0x0044($sp) +/* 01454 80AAB6A4 AFA50044 */ sw $a1, 0x0044($sp) /* 01458 80AAB6A8 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 0145C 80AAB6AC 0C0291BE */ jal func_800A46F8 +/* 0145C 80AAB6AC 0C0291BE */ jal SkelAnime_InitSV /* 01460 80AAB6B0 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 /* 01464 80AAB6B4 26050194 */ addiu $a1, $s0, 0x0194 ## $a1 = 00000194 -/* 01468 80AAB6B8 AFA50040 */ sw $a1, 0x0040($sp) +/* 01468 80AAB6B8 AFA50040 */ sw $a1, 0x0040($sp) /* 0146C 80AAB6BC 0C0170D9 */ jal ActorCollider_AllocCylinder - + /* 01470 80AAB6C0 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 01474 80AAB6C4 3C0780AB */ lui $a3, %hi(D_80AAC310) ## $a3 = 80AB0000 -/* 01478 80AAB6C8 8FA50040 */ lw $a1, 0x0040($sp) +/* 01478 80AAB6C8 8FA50040 */ lw $a1, 0x0040($sp) /* 0147C 80AAB6CC 24E7C310 */ addiu $a3, $a3, %lo(D_80AAC310) ## $a3 = 80AAC310 /* 01480 80AAB6D0 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 01484 80AAB6D4 0C01712B */ jal ActorCollider_InitCylinder - + /* 01488 80AAB6D8 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 0148C 80AAB6DC 3C0680AB */ lui $a2, %hi(D_80AAC33C) ## $a2 = 80AB0000 /* 01490 80AAB6E0 24C6C33C */ addiu $a2, $a2, %lo(D_80AAC33C) ## $a2 = 80AAC33C /* 01494 80AAB6E4 26040098 */ addiu $a0, $s0, 0x0098 ## $a0 = 00000098 -/* 01498 80AAB6E8 0C0187BF */ jal func_80061EFC +/* 01498 80AAB6E8 0C0187BF */ jal func_80061EFC /* 0149C 80AAB6EC 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 014A0 80AAB6F0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 014A4 80AAB6F4 0C2AAC0F */ jal func_80AAB03C +/* 014A4 80AAB6F4 0C2AAC0F */ jal func_80AAB03C /* 014A8 80AAB6F8 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 014AC 80AAB6FC 14400005 */ bne $v0, $zero, .L80AAB714 -/* 014B0 80AAB700 8FA40044 */ lw $a0, 0x0044($sp) +/* 014AC 80AAB6FC 14400005 */ bne $v0, $zero, .L80AAB714 +/* 014B0 80AAB700 8FA40044 */ lw $a0, 0x0044($sp) /* 014B4 80AAB704 0C00B55C */ jal Actor_Kill - + /* 014B8 80AAB708 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 014BC 80AAB70C 1000004B */ beq $zero, $zero, .L80AAB83C -/* 014C0 80AAB710 8FBF003C */ lw $ra, 0x003C($sp) +/* 014BC 80AAB70C 1000004B */ beq $zero, $zero, .L80AAB83C +/* 014C0 80AAB710 8FBF003C */ lw $ra, 0x003C($sp) .L80AAB714: /* 014C4 80AAB714 3C0580AB */ lui $a1, %hi(D_80AAC348) ## $a1 = 80AB0000 /* 014C8 80AAB718 24A5C348 */ addiu $a1, $a1, %lo(D_80AAC348) ## $a1 = 80AAC348 -/* 014CC 80AAB71C 0C00D3B0 */ jal func_80034EC0 +/* 014CC 80AAB71C 0C00D3B0 */ jal func_80034EC0 /* 014D0 80AAB720 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 /* 014D4 80AAB724 3C053C23 */ lui $a1, 0x3C23 ## $a1 = 3C230000 /* 014D8 80AAB728 34A5D70A */ ori $a1, $a1, 0xD70A ## $a1 = 3C23D70A /* 014DC 80AAB72C 0C00B58B */ jal Actor_SetScale - + /* 014E0 80AAB730 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 014E4 80AAB734 C6040024 */ lwc1 $f4, 0x0024($s0) ## 00000024 /* 014E8 80AAB738 24190006 */ addiu $t9, $zero, 0x0006 ## $t9 = 00000006 /* 014EC 80AAB73C 240800FF */ addiu $t0, $zero, 0x00FF ## $t0 = 000000FF /* 014F0 80AAB740 A219001F */ sb $t9, 0x001F($s0) ## 0000001F /* 014F4 80AAB744 A6080210 */ sh $t0, 0x0210($s0) ## 00000210 -/* 014F8 80AAB748 E7A40010 */ swc1 $f4, 0x0010($sp) +/* 014F8 80AAB748 E7A40010 */ swc1 $f4, 0x0010($sp) /* 014FC 80AAB74C C6060028 */ lwc1 $f6, 0x0028($s0) ## 00000028 /* 01500 80AAB750 24090003 */ addiu $t1, $zero, 0x0003 ## $t1 = 00000003 /* 01504 80AAB754 26241C24 */ addiu $a0, $s1, 0x1C24 ## $a0 = 00001C24 -/* 01508 80AAB758 E7A60014 */ swc1 $f6, 0x0014($sp) +/* 01508 80AAB758 E7A60014 */ swc1 $f6, 0x0014($sp) /* 0150C 80AAB75C C608002C */ lwc1 $f8, 0x002C($s0) ## 0000002C -/* 01510 80AAB760 AFA90028 */ sw $t1, 0x0028($sp) -/* 01514 80AAB764 AFA00024 */ sw $zero, 0x0024($sp) -/* 01518 80AAB768 AFA00020 */ sw $zero, 0x0020($sp) -/* 0151C 80AAB76C AFA0001C */ sw $zero, 0x001C($sp) +/* 01510 80AAB760 AFA90028 */ sw $t1, 0x0028($sp) +/* 01514 80AAB764 AFA00024 */ sw $zero, 0x0024($sp) +/* 01518 80AAB768 AFA00020 */ sw $zero, 0x0020($sp) +/* 0151C 80AAB76C AFA0001C */ sw $zero, 0x001C($sp) /* 01520 80AAB770 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 01524 80AAB774 02203025 */ or $a2, $s1, $zero ## $a2 = 00000000 /* 01528 80AAB778 24070018 */ addiu $a3, $zero, 0x0018 ## $a3 = 00000018 /* 0152C 80AAB77C 0C00C916 */ jal Actor_SpawnAttached - -/* 01530 80AAB780 E7A80018 */ swc1 $f8, 0x0018($sp) + +/* 01530 80AAB780 E7A80018 */ swc1 $f8, 0x0018($sp) /* 01534 80AAB784 862300A4 */ lh $v1, 0x00A4($s1) ## 000000A4 /* 01538 80AAB788 24040055 */ addiu $a0, $zero, 0x0055 ## $a0 = 00000055 /* 0153C 80AAB78C 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 01540 80AAB790 14830004 */ bne $a0, $v1, .L80AAB7A4 +/* 01540 80AAB790 14830004 */ bne $a0, $v1, .L80AAB7A4 /* 01544 80AAB794 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 /* 01548 80AAB798 944A0ED4 */ lhu $t2, 0x0ED4($v0) ## 8015F534 /* 0154C 80AAB79C 314B0010 */ andi $t3, $t2, 0x0010 ## $t3 = 00000000 -/* 01550 80AAB7A0 11600013 */ beq $t3, $zero, .L80AAB7F0 +/* 01550 80AAB7A0 11600013 */ beq $t3, $zero, .L80AAB7F0 .L80AAB7A4: /* 01554 80AAB7A4 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 01558 80AAB7A8 1483000A */ bne $a0, $v1, .L80AAB7D4 +/* 01558 80AAB7A8 1483000A */ bne $a0, $v1, .L80AAB7D4 /* 0155C 80AAB7AC 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 /* 01560 80AAB7B0 944C0ED4 */ lhu $t4, 0x0ED4($v0) ## 8015F534 /* 01564 80AAB7B4 3C0E8012 */ lui $t6, 0x8012 ## $t6 = 80120000 /* 01568 80AAB7B8 318D0010 */ andi $t5, $t4, 0x0010 ## $t5 = 00000000 -/* 0156C 80AAB7BC 51A00006 */ beql $t5, $zero, .L80AAB7D8 +/* 0156C 80AAB7BC 51A00006 */ beql $t5, $zero, .L80AAB7D8 /* 01570 80AAB7C0 2401005B */ addiu $at, $zero, 0x005B ## $at = 0000005B /* 01574 80AAB7C4 8DCE7168 */ lw $t6, 0x7168($t6) ## 80127168 /* 01578 80AAB7C8 8C4F00A4 */ lw $t7, 0x00A4($v0) ## 8015E704 -/* 0157C 80AAB7CC 01CFC024 */ and $t8, $t6, $t7 -/* 01580 80AAB7D0 17000007 */ bne $t8, $zero, .L80AAB7F0 +/* 0157C 80AAB7CC 01CFC024 */ and $t8, $t6, $t7 +/* 01580 80AAB7D0 17000007 */ bne $t8, $zero, .L80AAB7F0 .L80AAB7D4: /* 01584 80AAB7D4 2401005B */ addiu $at, $zero, 0x005B ## $at = 0000005B .L80AAB7D8: -/* 01588 80AAB7D8 54610010 */ bnel $v1, $at, .L80AAB81C +/* 01588 80AAB7D8 54610010 */ bnel $v1, $at, .L80AAB81C /* 0158C 80AAB7DC 24010028 */ addiu $at, $zero, 0x0028 ## $at = 00000028 /* 01590 80AAB7E0 94590ED4 */ lhu $t9, 0x0ED4($v0) ## 8015F534 /* 01594 80AAB7E4 33280400 */ andi $t0, $t9, 0x0400 ## $t0 = 00000000 -/* 01598 80AAB7E8 5500000C */ bnel $t0, $zero, .L80AAB81C +/* 01598 80AAB7E8 5500000C */ bnel $t0, $zero, .L80AAB81C /* 0159C 80AAB7EC 24010028 */ addiu $at, $zero, 0x0028 ## $at = 00000028 .L80AAB7F0: /* 015A0 80AAB7F0 8E0A0024 */ lw $t2, 0x0024($s0) ## 00000024 @@ -122,24 +122,24 @@ glabel EnMd_Init /* 015B4 80AAB804 256BB948 */ addiu $t3, $t3, %lo(func_80AAB948) ## $t3 = 80AAB948 /* 015B8 80AAB808 AE0B0190 */ sw $t3, 0x0190($s0) ## 00000190 /* 015BC 80AAB80C AE09000C */ sw $t1, 0x000C($s0) ## 0000000C -/* 015C0 80AAB810 10000009 */ beq $zero, $zero, .L80AAB838 +/* 015C0 80AAB810 10000009 */ beq $zero, $zero, .L80AAB838 /* 015C4 80AAB814 AE0A0010 */ sw $t2, 0x0010($s0) ## 00000010 /* 015C8 80AAB818 24010028 */ addiu $at, $zero, 0x0028 ## $at = 00000028 .L80AAB81C: -/* 015CC 80AAB81C 10610003 */ beq $v1, $at, .L80AAB82C +/* 015CC 80AAB81C 10610003 */ beq $v1, $at, .L80AAB82C /* 015D0 80AAB820 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 015D4 80AAB824 0C2AAD37 */ jal func_80AAB4DC +/* 015D4 80AAB824 0C2AAD37 */ jal func_80AAB4DC /* 015D8 80AAB828 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 .L80AAB82C: /* 015DC 80AAB82C 3C0C80AB */ lui $t4, %hi(func_80AAB874) ## $t4 = 80AB0000 /* 015E0 80AAB830 258CB874 */ addiu $t4, $t4, %lo(func_80AAB874) ## $t4 = 80AAB874 /* 015E4 80AAB834 AE0C0190 */ sw $t4, 0x0190($s0) ## 00000190 .L80AAB838: -/* 015E8 80AAB838 8FBF003C */ lw $ra, 0x003C($sp) +/* 015E8 80AAB838 8FBF003C */ lw $ra, 0x003C($sp) .L80AAB83C: -/* 015EC 80AAB83C 8FB00034 */ lw $s0, 0x0034($sp) -/* 015F0 80AAB840 8FB10038 */ lw $s1, 0x0038($sp) -/* 015F4 80AAB844 03E00008 */ jr $ra +/* 015EC 80AAB83C 8FB00034 */ lw $s0, 0x0034($sp) +/* 015F0 80AAB840 8FB10038 */ lw $s1, 0x0038($sp) +/* 015F4 80AAB844 03E00008 */ jr $ra /* 015F8 80AAB848 27BD0050 */ addiu $sp, $sp, 0x0050 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Md/func_80AAACF8.s b/asm/non_matchings/overlays/actors/ovl_En_Md/func_80AAACF8.s index d5a8f5b45d..625b86f073 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Md/func_80AAACF8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Md/func_80AAACF8.s @@ -2,7 +2,7 @@ glabel func_80AAACF8 /* 00AA8 80AAACF8 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 00AAC 80AAACFC AFBF0014 */ sw $ra, 0x0014($sp) /* 00AB0 80AAAD00 AFA5001C */ sw $a1, 0x001C($sp) -/* 00AB4 80AAAD04 0C01B0D8 */ jal func_8006C360 +/* 00AB4 80AAAD04 0C01B0D8 */ jal Text_GetFaceReaction /* 00AB8 80AAAD08 24050011 */ addiu $a1, $zero, 0x0011 ## $a1 = 00000011 /* 00ABC 80AAAD0C 8FA4001C */ lw $a0, 0x001C($sp) /* 00AC0 80AAAD10 10400003 */ beq $v0, $zero, .L80AAAD20 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Md/func_80AAB370.s b/asm/non_matchings/overlays/actors/ovl_En_Md/func_80AAB370.s index a505343047..c791253fd3 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Md/func_80AAB370.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Md/func_80AAB370.s @@ -46,7 +46,7 @@ glabel func_80AAB370 /* 011CC 80AAB41C 46083301 */ sub.s $f12, $f6, $f8 /* 011D0 80AAB420 46128381 */ sub.s $f14, $f16, $f18 /* 011D4 80AAB424 E7AC002C */ swc1 $f12, 0x002C($sp) -/* 011D8 80AAB428 0C03F494 */ jal func_800FD250 +/* 011D8 80AAB428 0C03F494 */ jal Math_atan2f /* 011DC 80AAB42C E7AE0028 */ swc1 $f14, 0x0028($sp) /* 011E0 80AAB430 3C0180AB */ lui $at, %hi(D_80AAC584) ## $at = 80AB0000 /* 011E4 80AAB434 C424C584 */ lwc1 $f4, %lo(D_80AAC584)($at) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Mk/EnMk_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Mk/EnMk_Draw.s index 1194411c05..a1816b6003 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Mk/EnMk_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Mk/EnMk_Draw.s @@ -1,11 +1,11 @@ glabel EnMk_Draw /* 00C9C 80AAD59C 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 00CA0 80AAD5A0 AFBF0024 */ sw $ra, 0x0024($sp) -/* 00CA4 80AAD5A4 AFA40028 */ sw $a0, 0x0028($sp) -/* 00CA8 80AAD5A8 AFA5002C */ sw $a1, 0x002C($sp) -/* 00CAC 80AAD5AC 0C0250F2 */ jal func_800943C8 +/* 00CA0 80AAD5A0 AFBF0024 */ sw $ra, 0x0024($sp) +/* 00CA4 80AAD5A4 AFA40028 */ sw $a0, 0x0028($sp) +/* 00CA8 80AAD5A8 AFA5002C */ sw $a1, 0x002C($sp) +/* 00CAC 80AAD5AC 0C0250F2 */ jal func_800943C8 /* 00CB0 80AAD5B0 8CA40000 */ lw $a0, 0x0000($a1) ## 00000000 -/* 00CB4 80AAD5B4 8FA20028 */ lw $v0, 0x0028($sp) +/* 00CB4 80AAD5B4 8FA20028 */ lw $v0, 0x0028($sp) /* 00CB8 80AAD5B8 3C0F80AB */ lui $t7, %hi(func_80AAD518) ## $t7 = 80AB0000 /* 00CBC 80AAD5BC 3C1880AB */ lui $t8, %hi(func_80AAD55C) ## $t8 = 80AB0000 /* 00CC0 80AAD5C0 8C45019C */ lw $a1, 0x019C($v0) ## 0000019C @@ -13,14 +13,14 @@ glabel EnMk_Draw /* 00CC8 80AAD5C8 9047019A */ lbu $a3, 0x019A($v0) ## 0000019A /* 00CCC 80AAD5CC 2718D55C */ addiu $t8, $t8, %lo(func_80AAD55C) ## $t8 = 80AAD55C /* 00CD0 80AAD5D0 25EFD518 */ addiu $t7, $t7, %lo(func_80AAD518) ## $t7 = 80AAD518 -/* 00CD4 80AAD5D4 AFAF0010 */ sw $t7, 0x0010($sp) -/* 00CD8 80AAD5D8 AFB80014 */ sw $t8, 0x0014($sp) -/* 00CDC 80AAD5DC 8FA4002C */ lw $a0, 0x002C($sp) -/* 00CE0 80AAD5E0 0C0286B2 */ jal func_800A1AC8 -/* 00CE4 80AAD5E4 AFA20018 */ sw $v0, 0x0018($sp) -/* 00CE8 80AAD5E8 8FBF0024 */ lw $ra, 0x0024($sp) +/* 00CD4 80AAD5D4 AFAF0010 */ sw $t7, 0x0010($sp) +/* 00CD8 80AAD5D8 AFB80014 */ sw $t8, 0x0014($sp) +/* 00CDC 80AAD5DC 8FA4002C */ lw $a0, 0x002C($sp) +/* 00CE0 80AAD5E0 0C0286B2 */ jal SkelAnime_DrawSV +/* 00CE4 80AAD5E4 AFA20018 */ sw $v0, 0x0018($sp) +/* 00CE8 80AAD5E8 8FBF0024 */ lw $ra, 0x0024($sp) /* 00CEC 80AAD5EC 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 00CF0 80AAD5F0 03E00008 */ jr $ra +/* 00CF0 80AAD5F0 03E00008 */ jr $ra /* 00CF4 80AAD5F4 00000000 */ nop /* 00CF8 80AAD5F8 00000000 */ nop /* 00CFC 80AAD5FC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Mk/EnMk_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Mk/EnMk_Init.s index a5fb72ffaa..f938125f4e 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Mk/EnMk_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Mk/EnMk_Init.s @@ -4,9 +4,9 @@ glabel EnMk_Init /* 00008 80AAC908 44812000 */ mtc1 $at, $f4 ## $f4 = -4.00 /* 0000C 80AAC90C 3C01BF80 */ lui $at, 0xBF80 ## $at = BF800000 /* 00010 80AAC910 44813000 */ mtc1 $at, $f6 ## $f6 = -1.00 -/* 00014 80AAC914 AFBF002C */ sw $ra, 0x002C($sp) -/* 00018 80AAC918 AFB00028 */ sw $s0, 0x0028($sp) -/* 0001C 80AAC91C AFA50044 */ sw $a1, 0x0044($sp) +/* 00014 80AAC914 AFBF002C */ sw $ra, 0x002C($sp) +/* 00018 80AAC918 AFB00028 */ sw $s0, 0x0028($sp) +/* 0001C 80AAC91C AFA50044 */ sw $a1, 0x0044($sp) /* 00020 80AAC920 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 00024 80AAC924 3C068003 */ lui $a2, 0x8003 ## $a2 = 80030000 /* 00028 80AAC928 24C6B5EC */ addiu $a2, $a2, 0xB5EC ## $a2 = 8002B5EC @@ -15,7 +15,7 @@ glabel EnMk_Init /* 00034 80AAC934 3C074210 */ lui $a3, 0x4210 ## $a3 = 42100000 /* 00038 80AAC938 E484FFBC */ swc1 $f4, -0x0044($a0) ## 00000070 /* 0003C 80AAC93C 0C00AC78 */ jal ActorShape_Init - + /* 00040 80AAC940 E486FFB8 */ swc1 $f6, -0x0048($a0) ## 0000006C /* 00044 80AAC944 26050198 */ addiu $a1, $s0, 0x0198 ## $a1 = 00000198 /* 00048 80AAC948 3C060600 */ lui $a2, 0x0600 ## $a2 = 06000000 @@ -23,36 +23,36 @@ glabel EnMk_Init /* 00050 80AAC950 260E01DC */ addiu $t6, $s0, 0x01DC ## $t6 = 000001DC /* 00054 80AAC954 260F022A */ addiu $t7, $s0, 0x022A ## $t7 = 0000022A /* 00058 80AAC958 2418000D */ addiu $t8, $zero, 0x000D ## $t8 = 0000000D -/* 0005C 80AAC95C AFB80018 */ sw $t8, 0x0018($sp) -/* 00060 80AAC960 AFAF0014 */ sw $t7, 0x0014($sp) -/* 00064 80AAC964 AFAE0010 */ sw $t6, 0x0010($sp) +/* 0005C 80AAC95C AFB80018 */ sw $t8, 0x0018($sp) +/* 00060 80AAC960 AFAF0014 */ sw $t7, 0x0014($sp) +/* 00064 80AAC964 AFAE0010 */ sw $t6, 0x0010($sp) /* 00068 80AAC968 24E70D88 */ addiu $a3, $a3, 0x0D88 ## $a3 = 06000D88 /* 0006C 80AAC96C 24C65DF0 */ addiu $a2, $a2, 0x5DF0 ## $a2 = 06005DF0 -/* 00070 80AAC970 AFA50034 */ sw $a1, 0x0034($sp) -/* 00074 80AAC974 0C0291BE */ jal func_800A46F8 -/* 00078 80AAC978 8FA40044 */ lw $a0, 0x0044($sp) +/* 00070 80AAC970 AFA50034 */ sw $a1, 0x0034($sp) +/* 00074 80AAC974 0C0291BE */ jal SkelAnime_InitSV +/* 00078 80AAC978 8FA40044 */ lw $a0, 0x0044($sp) /* 0007C 80AAC97C 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 00080 80AAC980 24A50D88 */ addiu $a1, $a1, 0x0D88 ## $a1 = 06000D88 -/* 00084 80AAC984 0C0294BE */ jal func_800A52F8 -/* 00088 80AAC988 8FA40034 */ lw $a0, 0x0034($sp) +/* 00084 80AAC984 0C0294BE */ jal SkelAnime_ChangeAnimDefaultRepeat +/* 00088 80AAC988 8FA40034 */ lw $a0, 0x0034($sp) /* 0008C 80AAC98C 2605014C */ addiu $a1, $s0, 0x014C ## $a1 = 0000014C -/* 00090 80AAC990 AFA50034 */ sw $a1, 0x0034($sp) +/* 00090 80AAC990 AFA50034 */ sw $a1, 0x0034($sp) /* 00094 80AAC994 0C0170D9 */ jal ActorCollider_AllocCylinder - -/* 00098 80AAC998 8FA40044 */ lw $a0, 0x0044($sp) + +/* 00098 80AAC998 8FA40044 */ lw $a0, 0x0044($sp) /* 0009C 80AAC99C 3C0780AB */ lui $a3, %hi(D_80AAD620) ## $a3 = 80AB0000 -/* 000A0 80AAC9A0 8FA50034 */ lw $a1, 0x0034($sp) +/* 000A0 80AAC9A0 8FA50034 */ lw $a1, 0x0034($sp) /* 000A4 80AAC9A4 24E7D620 */ addiu $a3, $a3, %lo(D_80AAD620) ## $a3 = 80AAD620 -/* 000A8 80AAC9A8 8FA40044 */ lw $a0, 0x0044($sp) +/* 000A8 80AAC9A8 8FA40044 */ lw $a0, 0x0044($sp) /* 000AC 80AAC9AC 0C01712B */ jal ActorCollider_InitCylinder - + /* 000B0 80AAC9B0 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 000B4 80AAC9B4 241900FF */ addiu $t9, $zero, 0x00FF ## $t9 = 000000FF /* 000B8 80AAC9B8 3C053C23 */ lui $a1, 0x3C23 ## $a1 = 3C230000 /* 000BC 80AAC9BC A21900AE */ sb $t9, 0x00AE($s0) ## 000000AE /* 000C0 80AAC9C0 34A5D70A */ ori $a1, $a1, 0xD70A ## $a1 = 3C23D70A /* 000C4 80AAC9C4 0C00B58B */ jal Actor_SetScale - + /* 000C8 80AAC9C8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 000CC 80AAC9CC 3C0880AB */ lui $t0, %hi(func_80AAD080) ## $t0 = 80AB0000 /* 000D0 80AAC9D0 2508D080 */ addiu $t0, $t0, %lo(func_80AAD080) ## $t0 = 80AAD080 @@ -65,14 +65,14 @@ glabel EnMk_Init /* 000EC 80AAC9EC 954AF552 */ lhu $t2, -0x0AAE($t2) ## 8015F552 /* 000F0 80AAC9F0 340D0004 */ ori $t5, $zero, 0x0004 ## $t5 = 00000004 /* 000F4 80AAC9F4 314B0001 */ andi $t3, $t2, 0x0001 ## $t3 = 00000000 -/* 000F8 80AAC9F8 51600003 */ beql $t3, $zero, .L80AACA08 -/* 000FC 80AAC9FC 8FBF002C */ lw $ra, 0x002C($sp) +/* 000F8 80AAC9F8 51600003 */ beql $t3, $zero, .L80AACA08 +/* 000FC 80AAC9FC 8FBF002C */ lw $ra, 0x002C($sp) /* 00100 80AACA00 A60D027E */ sh $t5, 0x027E($s0) ## 0000027E -/* 00104 80AACA04 8FBF002C */ lw $ra, 0x002C($sp) +/* 00104 80AACA04 8FBF002C */ lw $ra, 0x002C($sp) .L80AACA08: -/* 00108 80AACA08 8FB00028 */ lw $s0, 0x0028($sp) +/* 00108 80AACA08 8FB00028 */ lw $s0, 0x0028($sp) /* 0010C 80AACA0C 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 -/* 00110 80AACA10 03E00008 */ jr $ra +/* 00110 80AACA10 03E00008 */ jr $ra /* 00114 80AACA14 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Mk/func_80AACC04.s b/asm/non_matchings/overlays/actors/ovl_En_Mk/func_80AACC04.s index c2a2b0860f..483205016d 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Mk/func_80AACC04.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Mk/func_80AACC04.s @@ -1,15 +1,15 @@ glabel func_80AACC04 /* 00304 80AACC04 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 00308 80AACC08 AFBF002C */ sw $ra, 0x002C($sp) -/* 0030C 80AACC0C AFB00028 */ sw $s0, 0x0028($sp) -/* 00310 80AACC10 AFA50034 */ sw $a1, 0x0034($sp) +/* 00308 80AACC08 AFBF002C */ sw $ra, 0x002C($sp) +/* 0030C 80AACC0C AFB00028 */ sw $s0, 0x0028($sp) +/* 00310 80AACC10 AFA50034 */ sw $a1, 0x0034($sp) /* 00314 80AACC14 94820282 */ lhu $v0, 0x0282($a0) ## 00000282 /* 00318 80AACC18 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 0031C 80AACC1C 240F0010 */ addiu $t7, $zero, 0x0010 ## $t7 = 00000010 -/* 00320 80AACC20 18400004 */ blez $v0, .L80AACC34 +/* 00320 80AACC20 18400004 */ blez $v0, .L80AACC34 /* 00324 80AACC24 3C1880AB */ lui $t8, %hi(func_80AACBAC) ## $t8 = 80AB0000 /* 00328 80AACC28 244EFFFF */ addiu $t6, $v0, 0xFFFF ## $t6 = FFFFFFFF -/* 0032C 80AACC2C 10000017 */ beq $zero, $zero, .L80AACC8C +/* 0032C 80AACC2C 10000017 */ beq $zero, $zero, .L80AACC8C /* 00330 80AACC30 A48E0282 */ sh $t6, 0x0282($a0) ## 00000282 .L80AACC34: /* 00334 80AACC34 2718CBAC */ addiu $t8, $t8, %lo(func_80AACBAC) ## $t8 = 80AACBAC @@ -17,30 +17,30 @@ glabel func_80AACC04 /* 0033C 80AACC3C A60F0282 */ sh $t7, 0x0282($s0) ## 00000282 /* 00340 80AACC40 AE180284 */ sw $t8, 0x0284($s0) ## 00000284 /* 00344 80AACC44 0C028800 */ jal SkelAnime_GetFrameCount - + /* 00348 80AACC48 24840D88 */ addiu $a0, $a0, 0x0D88 ## $a0 = 06000D88 /* 0034C 80AACC4C 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 00350 80AACC50 3C01C080 */ lui $at, 0xC080 ## $at = C0800000 /* 00354 80AACC54 44814000 */ mtc1 $at, $f8 ## $f8 = -4.00 -/* 00358 80AACC58 468021A0 */ cvt.s.w $f6, $f4 +/* 00358 80AACC58 468021A0 */ cvt.s.w $f6, $f4 /* 0035C 80AACC5C 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 00360 80AACC60 24A50D88 */ addiu $a1, $a1, 0x0D88 ## $a1 = 06000D88 /* 00364 80AACC64 26040198 */ addiu $a0, $s0, 0x0198 ## $a0 = 00000198 /* 00368 80AACC68 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 0036C 80AACC6C 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 00370 80AACC70 E7A60010 */ swc1 $f6, 0x0010($sp) -/* 00374 80AACC74 AFA00014 */ sw $zero, 0x0014($sp) -/* 00378 80AACC78 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 0037C 80AACC7C E7A80018 */ swc1 $f8, 0x0018($sp) +/* 00370 80AACC70 E7A60010 */ swc1 $f6, 0x0010($sp) +/* 00374 80AACC74 AFA00014 */ sw $zero, 0x0014($sp) +/* 00378 80AACC78 0C029468 */ jal SkelAnime_ChangeAnim + +/* 0037C 80AACC7C E7A80018 */ swc1 $f8, 0x0018($sp) /* 00380 80AACC80 9619027E */ lhu $t9, 0x027E($s0) ## 0000027E /* 00384 80AACC84 3328FFFD */ andi $t0, $t9, 0xFFFD ## $t0 = 00000000 /* 00388 80AACC88 A608027E */ sh $t0, 0x027E($s0) ## 0000027E .L80AACC8C: -/* 0038C 80AACC8C 8FBF002C */ lw $ra, 0x002C($sp) -/* 00390 80AACC90 8FB00028 */ lw $s0, 0x0028($sp) +/* 0038C 80AACC8C 8FBF002C */ lw $ra, 0x002C($sp) +/* 00390 80AACC90 8FB00028 */ lw $s0, 0x0028($sp) /* 00394 80AACC94 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 00398 80AACC98 03E00008 */ jr $ra +/* 00398 80AACC98 03E00008 */ jr $ra /* 0039C 80AACC9C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Mk/func_80AACCA0.s b/asm/non_matchings/overlays/actors/ovl_En_Mk/func_80AACCA0.s index 03b2b96077..587a004830 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Mk/func_80AACCA0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Mk/func_80AACCA0.s @@ -1,18 +1,18 @@ glabel func_80AACCA0 /* 003A0 80AACCA0 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 003A4 80AACCA4 AFBF002C */ sw $ra, 0x002C($sp) -/* 003A8 80AACCA8 AFB00028 */ sw $s0, 0x0028($sp) -/* 003AC 80AACCAC AFA50034 */ sw $a1, 0x0034($sp) +/* 003A4 80AACCA4 AFBF002C */ sw $ra, 0x002C($sp) +/* 003A8 80AACCA8 AFB00028 */ sw $s0, 0x0028($sp) +/* 003AC 80AACCAC AFA50034 */ sw $a1, 0x0034($sp) /* 003B0 80AACCB0 94820282 */ lhu $v0, 0x0282($a0) ## 00000282 /* 003B4 80AACCB4 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 003B8 80AACCB8 24190078 */ addiu $t9, $zero, 0x0078 ## $t9 = 00000078 -/* 003BC 80AACCBC 18400007 */ blez $v0, .L80AACCDC +/* 003BC 80AACCBC 18400007 */ blez $v0, .L80AACCDC /* 003C0 80AACCC0 3C0880AB */ lui $t0, %hi(func_80AACC04) ## $t0 = 80AB0000 /* 003C4 80AACCC4 848F00B6 */ lh $t7, 0x00B6($a0) ## 000000B6 /* 003C8 80AACCC8 244EFFFF */ addiu $t6, $v0, 0xFFFF ## $t6 = FFFFFFFF /* 003CC 80AACCCC A48E0282 */ sh $t6, 0x0282($a0) ## 00000282 /* 003D0 80AACCD0 25F80800 */ addiu $t8, $t7, 0x0800 ## $t8 = 00000800 -/* 003D4 80AACCD4 10000017 */ beq $zero, $zero, .L80AACD34 +/* 003D4 80AACCD4 10000017 */ beq $zero, $zero, .L80AACD34 /* 003D8 80AACCD8 A49800B6 */ sh $t8, 0x00B6($a0) ## 000000B6 .L80AACCDC: /* 003DC 80AACCDC 2508CC04 */ addiu $t0, $t0, %lo(func_80AACC04) ## $t0 = 80AACC04 @@ -20,30 +20,30 @@ glabel func_80AACCA0 /* 003E4 80AACCE4 A6190282 */ sh $t9, 0x0282($s0) ## 00000282 /* 003E8 80AACCE8 AE080284 */ sw $t0, 0x0284($s0) ## 00000284 /* 003EC 80AACCEC 0C028800 */ jal SkelAnime_GetFrameCount - + /* 003F0 80AACCF0 24840724 */ addiu $a0, $a0, 0x0724 ## $a0 = 06000724 /* 003F4 80AACCF4 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 003F8 80AACCF8 3C01C080 */ lui $at, 0xC080 ## $at = C0800000 /* 003FC 80AACCFC 44814000 */ mtc1 $at, $f8 ## $f8 = -4.00 -/* 00400 80AACD00 468021A0 */ cvt.s.w $f6, $f4 +/* 00400 80AACD00 468021A0 */ cvt.s.w $f6, $f4 /* 00404 80AACD04 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 00408 80AACD08 24A50724 */ addiu $a1, $a1, 0x0724 ## $a1 = 06000724 /* 0040C 80AACD0C 26040198 */ addiu $a0, $s0, 0x0198 ## $a0 = 00000198 /* 00410 80AACD10 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 00414 80AACD14 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 00418 80AACD18 E7A60010 */ swc1 $f6, 0x0010($sp) -/* 0041C 80AACD1C AFA00014 */ sw $zero, 0x0014($sp) -/* 00420 80AACD20 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 00424 80AACD24 E7A80018 */ swc1 $f8, 0x0018($sp) +/* 00418 80AACD18 E7A60010 */ swc1 $f6, 0x0010($sp) +/* 0041C 80AACD1C AFA00014 */ sw $zero, 0x0014($sp) +/* 00420 80AACD20 0C029468 */ jal SkelAnime_ChangeAnim + +/* 00424 80AACD24 E7A80018 */ swc1 $f8, 0x0018($sp) /* 00428 80AACD28 9609027E */ lhu $t1, 0x027E($s0) ## 0000027E /* 0042C 80AACD2C 312AFFFD */ andi $t2, $t1, 0xFFFD ## $t2 = 00000000 /* 00430 80AACD30 A60A027E */ sh $t2, 0x027E($s0) ## 0000027E .L80AACD34: -/* 00434 80AACD34 8FBF002C */ lw $ra, 0x002C($sp) -/* 00438 80AACD38 8FB00028 */ lw $s0, 0x0028($sp) +/* 00434 80AACD34 8FBF002C */ lw $ra, 0x002C($sp) +/* 00438 80AACD38 8FB00028 */ lw $s0, 0x0028($sp) /* 0043C 80AACD3C 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 00440 80AACD40 03E00008 */ jr $ra +/* 00440 80AACD40 03E00008 */ jr $ra /* 00444 80AACD44 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Mk/func_80AACD48.s b/asm/non_matchings/overlays/actors/ovl_En_Mk/func_80AACD48.s index 6b6e5ce12a..661907bd9a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Mk/func_80AACD48.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Mk/func_80AACD48.s @@ -1,52 +1,52 @@ glabel func_80AACD48 /* 00448 80AACD48 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 0044C 80AACD4C AFBF002C */ sw $ra, 0x002C($sp) -/* 00450 80AACD50 AFB10028 */ sw $s1, 0x0028($sp) -/* 00454 80AACD54 AFB00024 */ sw $s0, 0x0024($sp) +/* 0044C 80AACD4C AFBF002C */ sw $ra, 0x002C($sp) +/* 00450 80AACD50 AFB10028 */ sw $s1, 0x0028($sp) +/* 00454 80AACD54 AFB00024 */ sw $s0, 0x0024($sp) /* 00458 80AACD58 8CAE1C44 */ lw $t6, 0x1C44($a1) ## 00001C44 /* 0045C 80AACD5C 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 00460 80AACD60 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 /* 00464 80AACD64 24A420D8 */ addiu $a0, $a1, 0x20D8 ## $a0 = 000020D8 -/* 00468 80AACD68 0C042F6F */ jal func_8010BDBC -/* 0046C 80AACD6C AFAE0034 */ sw $t6, 0x0034($sp) +/* 00468 80AACD68 0C042F6F */ jal func_8010BDBC +/* 0046C 80AACD6C AFAE0034 */ sw $t6, 0x0034($sp) /* 00470 80AACD70 24010005 */ addiu $at, $zero, 0x0005 ## $at = 00000005 -/* 00474 80AACD74 54410026 */ bnel $v0, $at, .L80AACE10 +/* 00474 80AACD74 54410026 */ bnel $v0, $at, .L80AACE10 /* 00478 80AACD78 960B027E */ lhu $t3, 0x027E($s0) ## 0000027E -/* 0047C 80AACD7C 0C041AF2 */ jal func_80106BC8 +/* 0047C 80AACD7C 0C041AF2 */ jal func_80106BC8 /* 00480 80AACD80 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 00484 80AACD84 50400022 */ beql $v0, $zero, .L80AACE10 +/* 00484 80AACD84 50400022 */ beql $v0, $zero, .L80AACE10 /* 00488 80AACD88 960B027E */ lhu $t3, 0x027E($s0) ## 0000027E -/* 0048C 80AACD8C 0C041B33 */ jal func_80106CCC +/* 0048C 80AACD8C 0C041B33 */ jal func_80106CCC /* 00490 80AACD90 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 00494 80AACD94 3C0F80AB */ lui $t7, %hi(func_80AACCA0) ## $t7 = 80AB0000 /* 00498 80AACD98 25EFCCA0 */ addiu $t7, $t7, %lo(func_80AACCA0) ## $t7 = 80AACCA0 /* 0049C 80AACD9C 3C010001 */ lui $at, 0x0001 ## $at = 00010000 /* 004A0 80AACDA0 AE0F0284 */ sw $t7, 0x0284($s0) ## 00000284 -/* 004A4 80AACDA4 00310821 */ addu $at, $at, $s1 +/* 004A4 80AACDA4 00310821 */ addu $at, $at, $s1 /* 004A8 80AACDA8 24180037 */ addiu $t8, $zero, 0x0037 ## $t8 = 00000037 /* 004AC 80AACDAC A03803DC */ sb $t8, 0x03DC($at) ## 000103DC -/* 004B0 80AACDB0 8FB90034 */ lw $t9, 0x0034($sp) +/* 004B0 80AACDB0 8FB90034 */ lw $t9, 0x0034($sp) /* 004B4 80AACDB4 24080010 */ addiu $t0, $zero, 0x0010 ## $t0 = 00000010 /* 004B8 80AACDB8 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 /* 004BC 80AACDBC A3200693 */ sb $zero, 0x0693($t9) ## 00000693 /* 004C0 80AACDC0 A6080282 */ sh $t0, 0x0282($s0) ## 00000282 /* 004C4 80AACDC4 0C028800 */ jal SkelAnime_GetFrameCount - + /* 004C8 80AACDC8 24840D88 */ addiu $a0, $a0, 0x0D88 ## $a0 = 06000D88 /* 004CC 80AACDCC 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 004D0 80AACDD0 3C01C080 */ lui $at, 0xC080 ## $at = C0800000 /* 004D4 80AACDD4 44814000 */ mtc1 $at, $f8 ## $f8 = -4.00 -/* 004D8 80AACDD8 468021A0 */ cvt.s.w $f6, $f4 +/* 004D8 80AACDD8 468021A0 */ cvt.s.w $f6, $f4 /* 004DC 80AACDDC 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 004E0 80AACDE0 24A50D88 */ addiu $a1, $a1, 0x0D88 ## $a1 = 06000D88 /* 004E4 80AACDE4 26040198 */ addiu $a0, $s0, 0x0198 ## $a0 = 00000198 /* 004E8 80AACDE8 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 004EC 80AACDEC 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 004F0 80AACDF0 E7A60010 */ swc1 $f6, 0x0010($sp) -/* 004F4 80AACDF4 AFA00014 */ sw $zero, 0x0014($sp) -/* 004F8 80AACDF8 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 004FC 80AACDFC E7A80018 */ swc1 $f8, 0x0018($sp) +/* 004F0 80AACDF0 E7A60010 */ swc1 $f6, 0x0010($sp) +/* 004F4 80AACDF4 AFA00014 */ sw $zero, 0x0014($sp) +/* 004F8 80AACDF8 0C029468 */ jal SkelAnime_ChangeAnim + +/* 004FC 80AACDFC E7A80018 */ swc1 $f8, 0x0018($sp) /* 00500 80AACE00 9609027E */ lhu $t1, 0x027E($s0) ## 0000027E /* 00504 80AACE04 312AFFFD */ andi $t2, $t1, 0xFFFD ## $t2 = 00000000 /* 00508 80AACE08 A60A027E */ sh $t2, 0x027E($s0) ## 0000027E @@ -54,10 +54,10 @@ glabel func_80AACD48 .L80AACE10: /* 00510 80AACE10 356C0001 */ ori $t4, $t3, 0x0001 ## $t4 = 00000001 /* 00514 80AACE14 A60C027E */ sh $t4, 0x027E($s0) ## 0000027E -/* 00518 80AACE18 8FBF002C */ lw $ra, 0x002C($sp) -/* 0051C 80AACE1C 8FB10028 */ lw $s1, 0x0028($sp) -/* 00520 80AACE20 8FB00024 */ lw $s0, 0x0024($sp) -/* 00524 80AACE24 03E00008 */ jr $ra +/* 00518 80AACE18 8FBF002C */ lw $ra, 0x002C($sp) +/* 0051C 80AACE1C 8FB10028 */ lw $s1, 0x0028($sp) +/* 00520 80AACE20 8FB00024 */ lw $s0, 0x0024($sp) +/* 00524 80AACE24 03E00008 */ jr $ra /* 00528 80AACE28 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Mk/func_80AACE2C.s b/asm/non_matchings/overlays/actors/ovl_En_Mk/func_80AACE2C.s index fe7717b05f..852b5b5aeb 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Mk/func_80AACE2C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Mk/func_80AACE2C.s @@ -1,39 +1,39 @@ glabel func_80AACE2C /* 0052C 80AACE2C 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 00530 80AACE30 AFB00028 */ sw $s0, 0x0028($sp) +/* 00530 80AACE30 AFB00028 */ sw $s0, 0x0028($sp) /* 00534 80AACE34 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00538 80AACE38 AFBF002C */ sw $ra, 0x002C($sp) -/* 0053C 80AACE3C AFA50034 */ sw $a1, 0x0034($sp) -/* 00540 80AACE40 0C042F6F */ jal func_8010BDBC +/* 00538 80AACE38 AFBF002C */ sw $ra, 0x002C($sp) +/* 0053C 80AACE3C AFA50034 */ sw $a1, 0x0034($sp) +/* 00540 80AACE40 0C042F6F */ jal func_8010BDBC /* 00544 80AACE44 24A420D8 */ addiu $a0, $a1, 0x20D8 ## $a0 = 000020D8 /* 00548 80AACE48 24010005 */ addiu $at, $zero, 0x0005 ## $at = 00000005 -/* 0054C 80AACE4C 5441001F */ bnel $v0, $at, .L80AACECC +/* 0054C 80AACE4C 5441001F */ bnel $v0, $at, .L80AACECC /* 00550 80AACE50 9608027E */ lhu $t0, 0x027E($s0) ## 0000027E -/* 00554 80AACE54 0C041AF2 */ jal func_80106BC8 -/* 00558 80AACE58 8FA40034 */ lw $a0, 0x0034($sp) -/* 0055C 80AACE5C 1040001A */ beq $v0, $zero, .L80AACEC8 -/* 00560 80AACE60 8FA40034 */ lw $a0, 0x0034($sp) -/* 00564 80AACE64 0C042DC8 */ jal func_8010B720 +/* 00554 80AACE54 0C041AF2 */ jal func_80106BC8 +/* 00558 80AACE58 8FA40034 */ lw $a0, 0x0034($sp) +/* 0055C 80AACE5C 1040001A */ beq $v0, $zero, .L80AACEC8 +/* 00560 80AACE60 8FA40034 */ lw $a0, 0x0034($sp) +/* 00564 80AACE64 0C042DC8 */ jal func_8010B720 /* 00568 80AACE68 24054001 */ addiu $a1, $zero, 0x4001 ## $a1 = 00004001 /* 0056C 80AACE6C 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 /* 00570 80AACE70 0C028800 */ jal SkelAnime_GetFrameCount - + /* 00574 80AACE74 24840AC0 */ addiu $a0, $a0, 0x0AC0 ## $a0 = 06000AC0 /* 00578 80AACE78 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 0057C 80AACE7C 3C01C080 */ lui $at, 0xC080 ## $at = C0800000 /* 00580 80AACE80 44814000 */ mtc1 $at, $f8 ## $f8 = -4.00 -/* 00584 80AACE84 468021A0 */ cvt.s.w $f6, $f4 +/* 00584 80AACE84 468021A0 */ cvt.s.w $f6, $f4 /* 00588 80AACE88 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 0058C 80AACE8C 240E0002 */ addiu $t6, $zero, 0x0002 ## $t6 = 00000002 -/* 00590 80AACE90 AFAE0014 */ sw $t6, 0x0014($sp) +/* 00590 80AACE90 AFAE0014 */ sw $t6, 0x0014($sp) /* 00594 80AACE94 24A50AC0 */ addiu $a1, $a1, 0x0AC0 ## $a1 = 06000AC0 /* 00598 80AACE98 26040198 */ addiu $a0, $s0, 0x0198 ## $a0 = 00000198 -/* 0059C 80AACE9C E7A60010 */ swc1 $f6, 0x0010($sp) +/* 0059C 80AACE9C E7A60010 */ swc1 $f6, 0x0010($sp) /* 005A0 80AACEA0 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 005A4 80AACEA4 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 005A8 80AACEA8 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 005AC 80AACEAC E7A80018 */ swc1 $f8, 0x0018($sp) +/* 005A8 80AACEA8 0C029468 */ jal SkelAnime_ChangeAnim + +/* 005AC 80AACEAC E7A80018 */ swc1 $f8, 0x0018($sp) /* 005B0 80AACEB0 960F027E */ lhu $t7, 0x027E($s0) ## 0000027E /* 005B4 80AACEB4 3C1980AB */ lui $t9, %hi(func_80AACD48) ## $t9 = 80AB0000 /* 005B8 80AACEB8 2739CD48 */ addiu $t9, $t9, %lo(func_80AACD48) ## $t9 = 80AACD48 @@ -45,10 +45,10 @@ glabel func_80AACE2C .L80AACECC: /* 005CC 80AACECC 35090001 */ ori $t1, $t0, 0x0001 ## $t1 = 00000001 /* 005D0 80AACED0 A609027E */ sh $t1, 0x027E($s0) ## 0000027E -/* 005D4 80AACED4 8FBF002C */ lw $ra, 0x002C($sp) -/* 005D8 80AACED8 8FB00028 */ lw $s0, 0x0028($sp) +/* 005D4 80AACED4 8FBF002C */ lw $ra, 0x002C($sp) +/* 005D8 80AACED8 8FB00028 */ lw $s0, 0x0028($sp) /* 005DC 80AACEDC 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 005E0 80AACEE0 03E00008 */ jr $ra +/* 005E0 80AACEE0 03E00008 */ jr $ra /* 005E4 80AACEE4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Mk/func_80AACEE8.s b/asm/non_matchings/overlays/actors/ovl_En_Mk/func_80AACEE8.s index 2b27759461..0e5bd57db2 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Mk/func_80AACEE8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Mk/func_80AACEE8.s @@ -1,38 +1,38 @@ glabel func_80AACEE8 /* 005E8 80AACEE8 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 005EC 80AACEEC AFB00028 */ sw $s0, 0x0028($sp) +/* 005EC 80AACEEC AFB00028 */ sw $s0, 0x0028($sp) /* 005F0 80AACEF0 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 005F4 80AACEF4 AFBF002C */ sw $ra, 0x002C($sp) -/* 005F8 80AACEF8 AFA50034 */ sw $a1, 0x0034($sp) -/* 005FC 80AACEFC 0C042F6F */ jal func_8010BDBC +/* 005F4 80AACEF4 AFBF002C */ sw $ra, 0x002C($sp) +/* 005F8 80AACEF8 AFA50034 */ sw $a1, 0x0034($sp) +/* 005FC 80AACEFC 0C042F6F */ jal func_8010BDBC /* 00600 80AACF00 24A420D8 */ addiu $a0, $a1, 0x20D8 ## $a0 = 000020D8 /* 00604 80AACF04 24010005 */ addiu $at, $zero, 0x0005 ## $at = 00000005 -/* 00608 80AACF08 5441001E */ bnel $v0, $at, .L80AACF84 +/* 00608 80AACF08 5441001E */ bnel $v0, $at, .L80AACF84 /* 0060C 80AACF0C 9619027E */ lhu $t9, 0x027E($s0) ## 0000027E -/* 00610 80AACF10 0C041AF2 */ jal func_80106BC8 -/* 00614 80AACF14 8FA40034 */ lw $a0, 0x0034($sp) -/* 00618 80AACF18 10400019 */ beq $v0, $zero, .L80AACF80 -/* 0061C 80AACF1C 8FA40034 */ lw $a0, 0x0034($sp) -/* 00620 80AACF20 0C042DC8 */ jal func_8010B720 +/* 00610 80AACF10 0C041AF2 */ jal func_80106BC8 +/* 00614 80AACF14 8FA40034 */ lw $a0, 0x0034($sp) +/* 00618 80AACF18 10400019 */ beq $v0, $zero, .L80AACF80 +/* 0061C 80AACF1C 8FA40034 */ lw $a0, 0x0034($sp) +/* 00620 80AACF20 0C042DC8 */ jal func_8010B720 /* 00624 80AACF24 24054000 */ addiu $a1, $zero, 0x4000 ## $a1 = 00004000 /* 00628 80AACF28 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 /* 0062C 80AACF2C 0C028800 */ jal SkelAnime_GetFrameCount - + /* 00630 80AACF30 24840AC0 */ addiu $a0, $a0, 0x0AC0 ## $a0 = 06000AC0 /* 00634 80AACF34 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 00638 80AACF38 3C01C080 */ lui $at, 0xC080 ## $at = C0800000 /* 0063C 80AACF3C 44814000 */ mtc1 $at, $f8 ## $f8 = -4.00 -/* 00640 80AACF40 468021A0 */ cvt.s.w $f6, $f4 +/* 00640 80AACF40 468021A0 */ cvt.s.w $f6, $f4 /* 00644 80AACF44 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 00648 80AACF48 24A50AC0 */ addiu $a1, $a1, 0x0AC0 ## $a1 = 06000AC0 /* 0064C 80AACF4C 26040198 */ addiu $a0, $s0, 0x0198 ## $a0 = 00000198 /* 00650 80AACF50 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 00654 80AACF54 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 00658 80AACF58 E7A60010 */ swc1 $f6, 0x0010($sp) -/* 0065C 80AACF5C AFA00014 */ sw $zero, 0x0014($sp) -/* 00660 80AACF60 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 00664 80AACF64 E7A80018 */ swc1 $f8, 0x0018($sp) +/* 00658 80AACF58 E7A60010 */ swc1 $f6, 0x0010($sp) +/* 0065C 80AACF5C AFA00014 */ sw $zero, 0x0014($sp) +/* 00660 80AACF60 0C029468 */ jal SkelAnime_ChangeAnim + +/* 00664 80AACF64 E7A80018 */ swc1 $f8, 0x0018($sp) /* 00668 80AACF68 960E027E */ lhu $t6, 0x027E($s0) ## 0000027E /* 0066C 80AACF6C 3C1880AB */ lui $t8, %hi(func_80AACE2C) ## $t8 = 80AB0000 /* 00670 80AACF70 2718CE2C */ addiu $t8, $t8, %lo(func_80AACE2C) ## $t8 = 80AACE2C @@ -44,10 +44,10 @@ glabel func_80AACEE8 .L80AACF84: /* 00684 80AACF84 37280001 */ ori $t0, $t9, 0x0001 ## $t0 = 00000001 /* 00688 80AACF88 A608027E */ sh $t0, 0x027E($s0) ## 0000027E -/* 0068C 80AACF8C 8FBF002C */ lw $ra, 0x002C($sp) -/* 00690 80AACF90 8FB00028 */ lw $s0, 0x0028($sp) +/* 0068C 80AACF8C 8FBF002C */ lw $ra, 0x002C($sp) +/* 00690 80AACF90 8FB00028 */ lw $s0, 0x0028($sp) /* 00694 80AACF94 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 00698 80AACF98 03E00008 */ jr $ra +/* 00698 80AACF98 03E00008 */ jr $ra /* 0069C 80AACF9C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Mk/func_80AAD080.s b/asm/non_matchings/overlays/actors/ovl_En_Mk/func_80AAD080.s index dd83d12752..f7f7039308 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Mk/func_80AAD080.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Mk/func_80AAD080.s @@ -1,88 +1,88 @@ glabel func_80AAD080 /* 00780 80AAD080 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 -/* 00784 80AAD084 AFBF002C */ sw $ra, 0x002C($sp) -/* 00788 80AAD088 AFB00028 */ sw $s0, 0x0028($sp) +/* 00784 80AAD084 AFBF002C */ sw $ra, 0x002C($sp) +/* 00788 80AAD088 AFB00028 */ sw $s0, 0x0028($sp) /* 0078C 80AAD08C 8CA31C44 */ lw $v1, 0x1C44($a1) ## 00001C44 /* 00790 80AAD090 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00794 80AAD094 AFA50044 */ sw $a1, 0x0044($sp) -/* 00798 80AAD098 0C00BC65 */ jal func_8002F194 -/* 0079C 80AAD09C AFA30034 */ sw $v1, 0x0034($sp) -/* 007A0 80AAD0A0 10400064 */ beq $v0, $zero, .L80AAD234 -/* 007A4 80AAD0A4 8FA30034 */ lw $v1, 0x0034($sp) -/* 007A8 80AAD0A8 8FA40044 */ lw $a0, 0x0044($sp) -/* 007AC 80AAD0AC 0C00BCDA */ jal func_8002F368 -/* 007B0 80AAD0B0 AFA30034 */ sw $v1, 0x0034($sp) +/* 00794 80AAD094 AFA50044 */ sw $a1, 0x0044($sp) +/* 00798 80AAD098 0C00BC65 */ jal func_8002F194 +/* 0079C 80AAD09C AFA30034 */ sw $v1, 0x0034($sp) +/* 007A0 80AAD0A0 10400064 */ beq $v0, $zero, .L80AAD234 +/* 007A4 80AAD0A4 8FA30034 */ lw $v1, 0x0034($sp) +/* 007A8 80AAD0A8 8FA40044 */ lw $a0, 0x0044($sp) +/* 007AC 80AAD0AC 0C00BCDA */ jal func_8002F368 +/* 007B0 80AAD0B0 AFA30034 */ sw $v1, 0x0034($sp) /* 007B4 80AAD0B4 9604010E */ lhu $a0, 0x010E($s0) ## 0000010E /* 007B8 80AAD0B8 24014018 */ addiu $at, $zero, 0x4018 ## $at = 00004018 -/* 007BC 80AAD0BC 8FA30034 */ lw $v1, 0x0034($sp) -/* 007C0 80AAD0C0 10810006 */ beq $a0, $at, .L80AAD0DC +/* 007BC 80AAD0BC 8FA30034 */ lw $v1, 0x0034($sp) +/* 007C0 80AAD0C0 10810006 */ beq $a0, $at, .L80AAD0DC /* 007C4 80AAD0C4 3C0F8012 */ lui $t7, 0x8012 ## $t7 = 80120000 /* 007C8 80AAD0C8 3C0E80AB */ lui $t6, %hi(func_80AACA40) ## $t6 = 80AB0000 /* 007CC 80AAD0CC A464010E */ sh $a0, 0x010E($v1) ## 0000010E /* 007D0 80AAD0D0 25CECA40 */ addiu $t6, $t6, %lo(func_80AACA40) ## $t6 = 80AACA40 -/* 007D4 80AAD0D4 10000079 */ beq $zero, $zero, .L80AAD2BC +/* 007D4 80AAD0D4 10000079 */ beq $zero, $zero, .L80AAD2BC /* 007D8 80AAD0D8 AE0E0284 */ sw $t6, 0x0284($s0) ## 00000284 .L80AAD0DC: /* 007DC 80AAD0DC 91EF7494 */ lbu $t7, 0x7494($t7) ## 80127494 /* 007E0 80AAD0E0 3C058016 */ lui $a1, 0x8016 ## $a1 = 80160000 /* 007E4 80AAD0E4 24A5E660 */ addiu $a1, $a1, 0xE660 ## $a1 = 8015E660 -/* 007E8 80AAD0E8 00AFC021 */ addu $t8, $a1, $t7 +/* 007E8 80AAD0E8 00AFC021 */ addu $t8, $a1, $t7 /* 007EC 80AAD0EC 93190074 */ lbu $t9, 0x0074($t8) ## 00000074 /* 007F0 80AAD0F0 24010036 */ addiu $at, $zero, 0x0036 ## $at = 00000036 /* 007F4 80AAD0F4 24084032 */ addiu $t0, $zero, 0x4032 ## $t0 = 00004032 -/* 007F8 80AAD0F8 17210005 */ bne $t9, $at, .L80AAD110 +/* 007F8 80AAD0F8 17210005 */ bne $t9, $at, .L80AAD110 /* 007FC 80AAD0FC 3C0980AB */ lui $t1, %hi(func_80AACA40) ## $t1 = 80AB0000 /* 00800 80AAD100 A468010E */ sh $t0, 0x010E($v1) ## 0000010E /* 00804 80AAD104 2529CA40 */ addiu $t1, $t1, %lo(func_80AACA40) ## $t1 = 80AACA40 -/* 00808 80AAD108 1000006C */ beq $zero, $zero, .L80AAD2BC +/* 00808 80AAD108 1000006C */ beq $zero, $zero, .L80AAD2BC /* 0080C 80AAD10C AE090284 */ sw $t1, 0x0284($s0) ## 00000284 .L80AAD110: -/* 00810 80AAD110 10400009 */ beq $v0, $zero, .L80AAD138 +/* 00810 80AAD110 10400009 */ beq $v0, $zero, .L80AAD138 /* 00814 80AAD114 2401000D */ addiu $at, $zero, 0x000D ## $at = 0000000D -/* 00818 80AAD118 10410028 */ beq $v0, $at, .L80AAD1BC +/* 00818 80AAD118 10410028 */ beq $v0, $at, .L80AAD1BC /* 0081C 80AAD11C 240C4019 */ addiu $t4, $zero, 0x4019 ## $t4 = 00004019 /* 00820 80AAD120 240A4018 */ addiu $t2, $zero, 0x4018 ## $t2 = 00004018 /* 00824 80AAD124 3C0B80AB */ lui $t3, %hi(func_80AACA40) ## $t3 = 80AB0000 /* 00828 80AAD128 256BCA40 */ addiu $t3, $t3, %lo(func_80AACA40) ## $t3 = 80AACA40 /* 0082C 80AAD12C A46A010E */ sh $t2, 0x010E($v1) ## 0000010E -/* 00830 80AAD130 10000062 */ beq $zero, $zero, .L80AAD2BC +/* 00830 80AAD130 10000062 */ beq $zero, $zero, .L80AAD2BC /* 00834 80AAD134 AE0B0284 */ sw $t3, 0x0284($s0) ## 00000284 .L80AAD138: /* 00838 80AAD138 86020280 */ lh $v0, 0x0280($s0) ## 00000280 -/* 0083C 80AAD13C 28410008 */ slti $at, $v0, 0x0008 -/* 00840 80AAD140 14200011 */ bne $at, $zero, .L80AAD188 +/* 0083C 80AAD13C 28410008 */ slti $at, $v0, 0x0008 +/* 00840 80AAD140 14200011 */ bne $at, $zero, .L80AAD188 /* 00844 80AAD144 00000000 */ nop /* 00848 80AAD148 94AC0EF2 */ lhu $t4, 0x0EF2($a1) ## 8015F552 /* 0084C 80AAD14C 3C1980AB */ lui $t9, %hi(func_80AAD014) ## $t9 = 80AB0000 /* 00850 80AAD150 24184074 */ addiu $t8, $zero, 0x4074 ## $t8 = 00004074 /* 00854 80AAD154 318D0001 */ andi $t5, $t4, 0x0001 ## $t5 = 00000001 -/* 00858 80AAD158 11A00007 */ beq $t5, $zero, .L80AAD178 +/* 00858 80AAD158 11A00007 */ beq $t5, $zero, .L80AAD178 /* 0085C 80AAD15C 2739D014 */ addiu $t9, $t9, %lo(func_80AAD014) ## $t9 = 80AAD014 /* 00860 80AAD160 240E4075 */ addiu $t6, $zero, 0x4075 ## $t6 = 00004075 /* 00864 80AAD164 3C0F80AB */ lui $t7, %hi(func_80AACA40) ## $t7 = 80AB0000 /* 00868 80AAD168 A46E010E */ sh $t6, 0x010E($v1) ## 0000010E /* 0086C 80AAD16C 25EFCA40 */ addiu $t7, $t7, %lo(func_80AACA40) ## $t7 = 80AACA40 -/* 00870 80AAD170 10000052 */ beq $zero, $zero, .L80AAD2BC +/* 00870 80AAD170 10000052 */ beq $zero, $zero, .L80AAD2BC /* 00874 80AAD174 AE0F0284 */ sw $t7, 0x0284($s0) ## 00000284 .L80AAD178: /* 00878 80AAD178 A478010E */ sh $t8, 0x010E($v1) ## 0000010E /* 0087C 80AAD17C AE190284 */ sw $t9, 0x0284($s0) ## 00000284 -/* 00880 80AAD180 1000004E */ beq $zero, $zero, .L80AAD2BC +/* 00880 80AAD180 1000004E */ beq $zero, $zero, .L80AAD2BC /* 00884 80AAD184 A6000280 */ sh $zero, 0x0280($s0) ## 00000280 .L80AAD188: -/* 00888 80AAD188 14400007 */ bne $v0, $zero, .L80AAD1A8 +/* 00888 80AAD188 14400007 */ bne $v0, $zero, .L80AAD1A8 /* 0088C 80AAD18C 244A406C */ addiu $t2, $v0, 0x406C ## $t2 = 0000406C /* 00890 80AAD190 24084018 */ addiu $t0, $zero, 0x4018 ## $t0 = 00004018 /* 00894 80AAD194 3C0980AB */ lui $t1, %hi(func_80AACA40) ## $t1 = 80AB0000 /* 00898 80AAD198 A468010E */ sh $t0, 0x010E($v1) ## 0000010E /* 0089C 80AAD19C 2529CA40 */ addiu $t1, $t1, %lo(func_80AACA40) ## $t1 = 80AACA40 -/* 008A0 80AAD1A0 10000046 */ beq $zero, $zero, .L80AAD2BC +/* 008A0 80AAD1A0 10000046 */ beq $zero, $zero, .L80AAD2BC /* 008A4 80AAD1A4 AE090284 */ sw $t1, 0x0284($s0) ## 00000284 .L80AAD1A8: /* 008A8 80AAD1A8 3C0B80AB */ lui $t3, %hi(func_80AACA40) ## $t3 = 80AB0000 /* 008AC 80AAD1AC A46A010E */ sh $t2, 0x010E($v1) ## 0000010E /* 008B0 80AAD1B0 256BCA40 */ addiu $t3, $t3, %lo(func_80AACA40) ## $t3 = 80AACA40 -/* 008B4 80AAD1B4 10000041 */ beq $zero, $zero, .L80AAD2BC +/* 008B4 80AAD1B4 10000041 */ beq $zero, $zero, .L80AAD2BC /* 008B8 80AAD1B8 AE0B0284 */ sw $t3, 0x0284($s0) ## 00000284 .L80AAD1BC: /* 008BC 80AAD1BC 3C0D80AB */ lui $t5, %hi(func_80AACEE8) ## $t5 = 80AB0000 @@ -91,75 +91,75 @@ glabel func_80AAD080 /* 008C8 80AAD1C8 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 /* 008CC 80AAD1CC AE0D0284 */ sw $t5, 0x0284($s0) ## 00000284 /* 008D0 80AAD1D0 0C028800 */ jal SkelAnime_GetFrameCount - + /* 008D4 80AAD1D4 24840368 */ addiu $a0, $a0, 0x0368 ## $a0 = 06000368 /* 008D8 80AAD1D8 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 008DC 80AAD1DC 3C01C080 */ lui $at, 0xC080 ## $at = C0800000 /* 008E0 80AAD1E0 44814000 */ mtc1 $at, $f8 ## $f8 = -4.00 -/* 008E4 80AAD1E4 468021A0 */ cvt.s.w $f6, $f4 +/* 008E4 80AAD1E4 468021A0 */ cvt.s.w $f6, $f4 /* 008E8 80AAD1E8 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 008EC 80AAD1EC 240E0002 */ addiu $t6, $zero, 0x0002 ## $t6 = 00000002 -/* 008F0 80AAD1F0 AFAE0014 */ sw $t6, 0x0014($sp) +/* 008F0 80AAD1F0 AFAE0014 */ sw $t6, 0x0014($sp) /* 008F4 80AAD1F4 24A50368 */ addiu $a1, $a1, 0x0368 ## $a1 = 06000368 /* 008F8 80AAD1F8 26040198 */ addiu $a0, $s0, 0x0198 ## $a0 = 00000198 -/* 008FC 80AAD1FC E7A60010 */ swc1 $f6, 0x0010($sp) +/* 008FC 80AAD1FC E7A60010 */ swc1 $f6, 0x0010($sp) /* 00900 80AAD200 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 00904 80AAD204 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 00908 80AAD208 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 0090C 80AAD20C E7A80018 */ swc1 $f8, 0x0018($sp) +/* 00908 80AAD208 0C029468 */ jal SkelAnime_ChangeAnim + +/* 0090C 80AAD20C E7A80018 */ swc1 $f8, 0x0018($sp) /* 00910 80AAD210 960F027E */ lhu $t7, 0x027E($s0) ## 0000027E /* 00914 80AAD214 3C018016 */ lui $at, 0x8016 ## $at = 80160000 /* 00918 80AAD218 24044807 */ addiu $a0, $zero, 0x4807 ## $a0 = 00004807 /* 0091C 80AAD21C 31F8FFFD */ andi $t8, $t7, 0xFFFD ## $t8 = 00000000 /* 00920 80AAD220 A618027E */ sh $t8, 0x027E($s0) ## 0000027E -/* 00924 80AAD224 0C01E221 */ jal func_80078884 +/* 00924 80AAD224 0C01E221 */ jal func_80078884 /* 00928 80AAD228 A420FA32 */ sh $zero, -0x05CE($at) ## 8015FA32 -/* 0092C 80AAD22C 10000024 */ beq $zero, $zero, .L80AAD2C0 -/* 00930 80AAD230 8FBF002C */ lw $ra, 0x002C($sp) +/* 0092C 80AAD22C 10000024 */ beq $zero, $zero, .L80AAD2C0 +/* 00930 80AAD230 8FBF002C */ lw $ra, 0x002C($sp) .L80AAD234: -/* 00934 80AAD234 8FA40044 */ lw $a0, 0x0044($sp) -/* 00938 80AAD238 0C01B0D8 */ jal func_8006C360 +/* 00934 80AAD234 8FA40044 */ lw $a0, 0x0044($sp) +/* 00938 80AAD238 0C01B0D8 */ jal Text_GetFaceReaction /* 0093C 80AAD23C 2405001A */ addiu $a1, $zero, 0x001A ## $a1 = 0000001A /* 00940 80AAD240 3059FFFF */ andi $t9, $v0, 0xFFFF ## $t9 = 00000000 -/* 00944 80AAD244 17200003 */ bne $t9, $zero, .L80AAD254 +/* 00944 80AAD244 17200003 */ bne $t9, $zero, .L80AAD254 /* 00948 80AAD248 A602010E */ sh $v0, 0x010E($s0) ## 0000010E /* 0094C 80AAD24C 24084018 */ addiu $t0, $zero, 0x4018 ## $t0 = 00004018 /* 00950 80AAD250 A608010E */ sh $t0, 0x010E($s0) ## 0000010E .L80AAD254: /* 00954 80AAD254 8609008A */ lh $t1, 0x008A($s0) ## 0000008A /* 00958 80AAD258 860A00B6 */ lh $t2, 0x00B6($s0) ## 000000B6 -/* 0095C 80AAD25C 012A1023 */ subu $v0, $t1, $t2 -/* 00960 80AAD260 00021400 */ sll $v0, $v0, 16 -/* 00964 80AAD264 00021403 */ sra $v0, $v0, 16 -/* 00968 80AAD268 04400003 */ bltz $v0, .L80AAD278 -/* 0096C 80AAD26C 00021823 */ subu $v1, $zero, $v0 -/* 00970 80AAD270 10000001 */ beq $zero, $zero, .L80AAD278 +/* 0095C 80AAD25C 012A1023 */ subu $v0, $t1, $t2 +/* 00960 80AAD260 00021400 */ sll $v0, $v0, 16 +/* 00964 80AAD264 00021403 */ sra $v0, $v0, 16 +/* 00968 80AAD268 04400003 */ bltz $v0, .L80AAD278 +/* 0096C 80AAD26C 00021823 */ subu $v1, $zero, $v0 +/* 00970 80AAD270 10000001 */ beq $zero, $zero, .L80AAD278 /* 00974 80AAD274 00401825 */ or $v1, $v0, $zero ## $v1 = 00000000 .L80AAD278: -/* 00978 80AAD278 28612151 */ slti $at, $v1, 0x2151 -/* 0097C 80AAD27C 1020000F */ beq $at, $zero, .L80AAD2BC +/* 00978 80AAD278 28612151 */ slti $at, $v1, 0x2151 +/* 0097C 80AAD27C 1020000F */ beq $at, $zero, .L80AAD2BC /* 00980 80AAD280 3C0142C8 */ lui $at, 0x42C8 ## $at = 42C80000 /* 00984 80AAD284 44810000 */ mtc1 $at, $f0 ## $f0 = 100.00 /* 00988 80AAD288 C60A0090 */ lwc1 $f10, 0x0090($s0) ## 00000090 /* 0098C 80AAD28C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00990 80AAD290 8FA50044 */ lw $a1, 0x0044($sp) -/* 00994 80AAD294 4600503C */ c.lt.s $f10, $f0 +/* 00990 80AAD290 8FA50044 */ lw $a1, 0x0044($sp) +/* 00994 80AAD294 4600503C */ c.lt.s $f10, $f0 /* 00998 80AAD298 00000000 */ nop -/* 0099C 80AAD29C 45020008 */ bc1fl .L80AAD2C0 -/* 009A0 80AAD2A0 8FBF002C */ lw $ra, 0x002C($sp) -/* 009A4 80AAD2A4 44060000 */ mfc1 $a2, $f0 -/* 009A8 80AAD2A8 0C00BCA6 */ jal func_8002F298 +/* 0099C 80AAD29C 45020008 */ bc1fl .L80AAD2C0 +/* 009A0 80AAD2A0 8FBF002C */ lw $ra, 0x002C($sp) +/* 009A4 80AAD2A4 44060000 */ mfc1 $a2, $f0 +/* 009A8 80AAD2A8 0C00BCA6 */ jal func_8002F298 /* 009AC 80AAD2AC 2407000D */ addiu $a3, $zero, 0x000D ## $a3 = 0000000D /* 009B0 80AAD2B0 960B027E */ lhu $t3, 0x027E($s0) ## 0000027E /* 009B4 80AAD2B4 356C0001 */ ori $t4, $t3, 0x0001 ## $t4 = 00000001 /* 009B8 80AAD2B8 A60C027E */ sh $t4, 0x027E($s0) ## 0000027E .L80AAD2BC: -/* 009BC 80AAD2BC 8FBF002C */ lw $ra, 0x002C($sp) +/* 009BC 80AAD2BC 8FBF002C */ lw $ra, 0x002C($sp) .L80AAD2C0: -/* 009C0 80AAD2C0 8FB00028 */ lw $s0, 0x0028($sp) +/* 009C0 80AAD2C0 8FB00028 */ lw $s0, 0x0028($sp) /* 009C4 80AAD2C4 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 -/* 009C8 80AAD2C8 03E00008 */ jr $ra +/* 009C8 80AAD2C8 03E00008 */ jr $ra /* 009CC 80AAD2CC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Mm/EnMm_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Mm/EnMm_Draw.s index 3c987ac158..448c04e578 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Mm/EnMm_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Mm/EnMm_Draw.s @@ -1,21 +1,21 @@ glabel EnMm_Draw /* 00F3C 80AAE6AC 27BDFF80 */ addiu $sp, $sp, 0xFF80 ## $sp = FFFFFF80 -/* 00F40 80AAE6B0 AFB10028 */ sw $s1, 0x0028($sp) +/* 00F40 80AAE6B0 AFB10028 */ sw $s1, 0x0028($sp) /* 00F44 80AAE6B4 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 -/* 00F48 80AAE6B8 AFBF002C */ sw $ra, 0x002C($sp) -/* 00F4C 80AAE6BC AFB00024 */ sw $s0, 0x0024($sp) -/* 00F50 80AAE6C0 AFA40080 */ sw $a0, 0x0080($sp) +/* 00F48 80AAE6B8 AFBF002C */ sw $ra, 0x002C($sp) +/* 00F4C 80AAE6BC AFB00024 */ sw $s0, 0x0024($sp) +/* 00F50 80AAE6C0 AFA40080 */ sw $a0, 0x0080($sp) /* 00F54 80AAE6C4 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 /* 00F58 80AAE6C8 3C0680AB */ lui $a2, %hi(D_80AAEC00) ## $a2 = 80AB0000 /* 00F5C 80AAE6CC 24C6EC00 */ addiu $a2, $a2, %lo(D_80AAEC00) ## $a2 = 80AAEC00 /* 00F60 80AAE6D0 27A40064 */ addiu $a0, $sp, 0x0064 ## $a0 = FFFFFFE4 /* 00F64 80AAE6D4 24070429 */ addiu $a3, $zero, 0x0429 ## $a3 = 00000429 -/* 00F68 80AAE6D8 0C031AB1 */ jal func_800C6AC4 +/* 00F68 80AAE6D8 0C031AB1 */ jal Graph_OpenDisps /* 00F6C 80AAE6DC 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 -/* 00F70 80AAE6E0 0C024F46 */ jal func_80093D18 +/* 00F70 80AAE6E0 0C024F46 */ jal func_80093D18 /* 00F74 80AAE6E4 8E240000 */ lw $a0, 0x0000($s1) ## 00000000 /* 00F78 80AAE6E8 8E0302C0 */ lw $v1, 0x02C0($s0) ## 000002C0 -/* 00F7C 80AAE6EC 8FA80080 */ lw $t0, 0x0080($sp) +/* 00F7C 80AAE6EC 8FA80080 */ lw $t0, 0x0080($sp) /* 00F80 80AAE6F0 3C0FDB06 */ lui $t7, 0xDB06 ## $t7 = DB060000 /* 00F84 80AAE6F4 246E0008 */ addiu $t6, $v1, 0x0008 ## $t6 = 00000008 /* 00F88 80AAE6F8 AE0E02C0 */ sw $t6, 0x02C0($s0) ## 000002C0 @@ -24,20 +24,20 @@ glabel EnMm_Draw /* 00F94 80AAE704 8D1801E4 */ lw $t8, 0x01E4($t0) ## 000001E4 /* 00F98 80AAE708 3C0480AB */ lui $a0, %hi(D_80AAEBEC) ## $a0 = 80AB0000 /* 00F9C 80AAE70C 3C0D8016 */ lui $t5, 0x8016 ## $t5 = 80160000 -/* 00FA0 80AAE710 0018C880 */ sll $t9, $t8, 2 -/* 00FA4 80AAE714 00992021 */ addu $a0, $a0, $t9 -/* 00FA8 80AAE718 8C84EBEC */ lw $a0, %lo(D_80AAEBEC)($a0) +/* 00FA0 80AAE710 0018C880 */ sll $t9, $t8, 2 +/* 00FA4 80AAE714 00992021 */ addu $a0, $a0, $t9 +/* 00FA8 80AAE718 8C84EBEC */ lw $a0, %lo(D_80AAEBEC)($a0) /* 00FAC 80AAE71C 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 /* 00FB0 80AAE720 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF -/* 00FB4 80AAE724 00045100 */ sll $t2, $a0, 4 -/* 00FB8 80AAE728 000A5F02 */ srl $t3, $t2, 28 -/* 00FBC 80AAE72C 000B6080 */ sll $t4, $t3, 2 -/* 00FC0 80AAE730 01AC6821 */ addu $t5, $t5, $t4 +/* 00FB4 80AAE724 00045100 */ sll $t2, $a0, 4 +/* 00FB8 80AAE728 000A5F02 */ srl $t3, $t2, 28 +/* 00FBC 80AAE72C 000B6080 */ sll $t4, $t3, 2 +/* 00FC0 80AAE730 01AC6821 */ addu $t5, $t5, $t4 /* 00FC4 80AAE734 8DAD6FA8 */ lw $t5, 0x6FA8($t5) ## 80166FA8 -/* 00FC8 80AAE738 00814824 */ and $t1, $a0, $at +/* 00FC8 80AAE738 00814824 */ and $t1, $a0, $at /* 00FCC 80AAE73C 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 00FD0 80AAE740 012D7021 */ addu $t6, $t1, $t5 -/* 00FD4 80AAE744 01C17821 */ addu $t7, $t6, $at +/* 00FD0 80AAE740 012D7021 */ addu $t6, $t1, $t5 +/* 00FD4 80AAE744 01C17821 */ addu $t7, $t6, $at /* 00FD8 80AAE748 AC6F0004 */ sw $t7, 0x0004($v1) ## 00000004 /* 00FDC 80AAE74C 3C1980AB */ lui $t9, %hi(func_80AAEA10) ## $t9 = 80AB0000 /* 00FE0 80AAE750 3C1880AB */ lui $t8, %hi(func_80AAE97C) ## $t8 = 80AB0000 @@ -46,35 +46,35 @@ glabel EnMm_Draw /* 00FEC 80AAE75C 8D050150 */ lw $a1, 0x0150($t0) ## 00000150 /* 00FF0 80AAE760 2718E97C */ addiu $t8, $t8, %lo(func_80AAE97C) ## $t8 = 80AAE97C /* 00FF4 80AAE764 2739EA10 */ addiu $t9, $t9, %lo(func_80AAEA10) ## $t9 = 80AAEA10 -/* 00FF8 80AAE768 AFB90014 */ sw $t9, 0x0014($sp) -/* 00FFC 80AAE76C AFB80010 */ sw $t8, 0x0010($sp) +/* 00FF8 80AAE768 AFB90014 */ sw $t9, 0x0014($sp) +/* 00FFC 80AAE76C AFB80010 */ sw $t8, 0x0010($sp) /* 01000 80AAE770 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 01004 80AAE774 0C0286B2 */ jal func_800A1AC8 -/* 01008 80AAE778 AFA80018 */ sw $t0, 0x0018($sp) +/* 01004 80AAE774 0C0286B2 */ jal SkelAnime_DrawSV +/* 01008 80AAE778 AFA80018 */ sw $t0, 0x0018($sp) /* 0100C 80AAE77C 3C0A8016 */ lui $t2, 0x8016 ## $t2 = 80160000 /* 01010 80AAE780 954AF556 */ lhu $t2, -0x0AAA($t2) ## 8015F556 /* 01014 80AAE784 3C010001 */ lui $at, 0x0001 ## $at = 00010000 /* 01018 80AAE788 342117A4 */ ori $at, $at, 0x17A4 ## $at = 000117A4 /* 0101C 80AAE78C 314B0800 */ andi $t3, $t2, 0x0800 ## $t3 = 00000000 -/* 01020 80AAE790 1160006F */ beq $t3, $zero, .L80AAE950 -/* 01024 80AAE794 02212021 */ addu $a0, $s1, $at +/* 01020 80AAE790 1160006F */ beq $t3, $zero, .L80AAE950 +/* 01024 80AAE794 02212021 */ addu $a0, $s1, $at /* 01028 80AAE798 0C02604B */ jal Object_GetIndex ## ObjectIndex /* 0102C 80AAE79C 24050015 */ addiu $a1, $zero, 0x0015 ## $a1 = 00000015 -/* 01030 80AAE7A0 0440006B */ bltz $v0, .L80AAE950 -/* 01034 80AAE7A4 AFA2005C */ sw $v0, 0x005C($sp) +/* 01030 80AAE7A0 0440006B */ bltz $v0, .L80AAE950 +/* 01034 80AAE7A4 AFA2005C */ sw $v0, 0x005C($sp) /* 01038 80AAE7A8 8E240000 */ lw $a0, 0x0000($s1) ## 00000000 /* 0103C 80AAE7AC 0C031A73 */ jal Graph_Alloc - + /* 01040 80AAE7B0 24050080 */ addiu $a1, $zero, 0x0080 ## $a1 = 00000080 -/* 01044 80AAE7B4 8FA40080 */ lw $a0, 0x0080($sp) -/* 01048 80AAE7B8 AFA20058 */ sw $v0, 0x0058($sp) -/* 0104C 80AAE7BC 0C03423F */ jal Matrix_Put +/* 01044 80AAE7B4 8FA40080 */ lw $a0, 0x0080($sp) +/* 01048 80AAE7B8 AFA20058 */ sw $v0, 0x0058($sp) +/* 0104C 80AAE7BC 0C03423F */ jal Matrix_Put /* 01050 80AAE7C0 24840208 */ addiu $a0, $a0, 0x0208 ## $a0 = 00000208 /* 01054 80AAE7C4 3C0580AB */ lui $a1, %hi(D_80AAEC10) ## $a1 = 80AB0000 /* 01058 80AAE7C8 24A5EC10 */ addiu $a1, $a1, %lo(D_80AAEC10) ## $a1 = 80AAEC10 /* 0105C 80AAE7CC 8E240000 */ lw $a0, 0x0000($s1) ## 00000000 -/* 01060 80AAE7D0 0C0346A2 */ jal Matrix_NewMtx +/* 01060 80AAE7D0 0C0346A2 */ jal Matrix_NewMtx /* 01064 80AAE7D4 24060457 */ addiu $a2, $zero, 0x0457 ## $a2 = 00000457 /* 01068 80AAE7D8 8E0302C0 */ lw $v1, 0x02C0($s0) ## 000002C0 /* 0106C 80AAE7DC 3C09DB06 */ lui $t1, 0xDB06 ## $t1 = DB060000 @@ -82,14 +82,14 @@ glabel EnMm_Draw /* 01074 80AAE7E4 246C0008 */ addiu $t4, $v1, 0x0008 ## $t4 = 00000008 /* 01078 80AAE7E8 AE0C02C0 */ sw $t4, 0x02C0($s0) ## 000002C0 /* 0107C 80AAE7EC AC690000 */ sw $t1, 0x0000($v1) ## 00000000 -/* 01080 80AAE7F0 8FAD005C */ lw $t5, 0x005C($sp) +/* 01080 80AAE7F0 8FAD005C */ lw $t5, 0x005C($sp) /* 01084 80AAE7F4 3C180001 */ lui $t8, 0x0001 ## $t8 = 00010000 /* 01088 80AAE7F8 3C0ADB06 */ lui $t2, 0xDB06 ## $t2 = DB060000 -/* 0108C 80AAE7FC 000D7100 */ sll $t6, $t5, 4 -/* 01090 80AAE800 01CD7021 */ addu $t6, $t6, $t5 -/* 01094 80AAE804 000E7080 */ sll $t6, $t6, 2 -/* 01098 80AAE808 022E7821 */ addu $t7, $s1, $t6 -/* 0109C 80AAE80C 030FC021 */ addu $t8, $t8, $t7 +/* 0108C 80AAE7FC 000D7100 */ sll $t6, $t5, 4 +/* 01090 80AAE800 01CD7021 */ addu $t6, $t6, $t5 +/* 01094 80AAE804 000E7080 */ sll $t6, $t6, 2 +/* 01098 80AAE808 022E7821 */ addu $t7, $s1, $t6 +/* 0109C 80AAE80C 030FC021 */ addu $t8, $t8, $t7 /* 010A0 80AAE810 8F1817B4 */ lw $t8, 0x17B4($t8) ## 000117B4 /* 010A4 80AAE814 354A002C */ ori $t2, $t2, 0x002C ## $t2 = DB06002C /* 010A8 80AAE818 3C09DB06 */ lui $t1, 0xDB06 ## $t1 = DB060000 @@ -100,7 +100,7 @@ glabel EnMm_Draw /* 010BC 80AAE82C 24790008 */ addiu $t9, $v1, 0x0008 ## $t9 = 00000008 /* 010C0 80AAE830 AE1902C0 */ sw $t9, 0x02C0($s0) ## 000002C0 /* 010C4 80AAE834 AC6A0000 */ sw $t2, 0x0000($v1) ## 00000000 -/* 010C8 80AAE838 8FAB0058 */ lw $t3, 0x0058($sp) +/* 010C8 80AAE838 8FAB0058 */ lw $t3, 0x0058($sp) /* 010CC 80AAE83C 3C0142C2 */ lui $at, 0x42C2 ## $at = 42C20000 /* 010D0 80AAE840 44816000 */ mtc1 $at, $f12 ## $f12 = 97.00 /* 010D4 80AAE844 AC6B0004 */ sw $t3, 0x0004($v1) ## 00000004 @@ -113,20 +113,20 @@ glabel EnMm_Draw /* 010F0 80AAE860 AC690000 */ sw $t1, 0x0000($v1) ## 00000000 /* 010F4 80AAE864 2418CB76 */ addiu $t8, $zero, 0xCB76 ## $t8 = FFFFCB76 /* 010F8 80AAE868 3C0180AB */ lui $at, %hi(D_80AAEC88) ## $at = 80AB0000 -/* 010FC 80AAE86C A7AE0050 */ sh $t6, 0x0050($sp) -/* 01100 80AAE870 A7AF0052 */ sh $t7, 0x0052($sp) -/* 01104 80AAE874 A7B80054 */ sh $t8, 0x0054($sp) -/* 01108 80AAE878 C42EEC88 */ lwc1 $f14, %lo(D_80AAEC88)($at) +/* 010FC 80AAE86C A7AE0050 */ sh $t6, 0x0050($sp) +/* 01100 80AAE870 A7AF0052 */ sh $t7, 0x0052($sp) +/* 01104 80AAE874 A7B80054 */ sh $t8, 0x0054($sp) +/* 01108 80AAE878 C42EEC88 */ lwc1 $f14, %lo(D_80AAEC88)($at) /* 0110C 80AAE87C 3C06C370 */ lui $a2, 0xC370 ## $a2 = C3700000 -/* 01110 80AAE880 0C0345A5 */ jal func_800D1694 +/* 01110 80AAE880 0C0345A5 */ jal func_800D1694 /* 01114 80AAE884 27A70050 */ addiu $a3, $sp, 0x0050 ## $a3 = FFFFFFD0 -/* 01118 80AAE888 8FA20058 */ lw $v0, 0x0058($sp) +/* 01118 80AAE888 8FA20058 */ lw $v0, 0x0058($sp) /* 0111C 80AAE88C 3C0580AB */ lui $a1, %hi(D_80AAEC20) ## $a1 = 80AB0000 /* 01120 80AAE890 24A5EC20 */ addiu $a1, $a1, %lo(D_80AAEC20) ## $a1 = 80AAEC20 /* 01124 80AAE894 00402025 */ or $a0, $v0, $zero ## $a0 = 00000000 /* 01128 80AAE898 24420040 */ addiu $v0, $v0, 0x0040 ## $v0 = 00000040 -/* 0112C 80AAE89C AFA20058 */ sw $v0, 0x0058($sp) -/* 01130 80AAE8A0 0C034695 */ jal Matrix_ToMtx +/* 0112C 80AAE89C AFA20058 */ sw $v0, 0x0058($sp) +/* 01130 80AAE8A0 0C034695 */ jal Matrix_ToMtx /* 01134 80AAE8A4 24060464 */ addiu $a2, $zero, 0x0464 ## $a2 = 00000464 /* 01138 80AAE8A8 3C0142C2 */ lui $at, 0x42C2 ## $at = 42C20000 /* 0113C 80AAE8AC 44816000 */ mtc1 $at, $f12 ## $f12 = 97.00 @@ -134,17 +134,17 @@ glabel EnMm_Draw /* 01144 80AAE8B4 240AF242 */ addiu $t2, $zero, 0xF242 ## $t2 = FFFFF242 /* 01148 80AAE8B8 240BCB76 */ addiu $t3, $zero, 0xCB76 ## $t3 = FFFFCB76 /* 0114C 80AAE8BC 3C0180AB */ lui $at, %hi(D_80AAEC8C) ## $at = 80AB0000 -/* 01150 80AAE8C0 A7B90050 */ sh $t9, 0x0050($sp) -/* 01154 80AAE8C4 A7AA0052 */ sh $t2, 0x0052($sp) -/* 01158 80AAE8C8 A7AB0054 */ sh $t3, 0x0054($sp) -/* 0115C 80AAE8CC C42EEC8C */ lwc1 $f14, %lo(D_80AAEC8C)($at) +/* 01150 80AAE8C0 A7B90050 */ sh $t9, 0x0050($sp) +/* 01154 80AAE8C4 A7AA0052 */ sh $t2, 0x0052($sp) +/* 01158 80AAE8C8 A7AB0054 */ sh $t3, 0x0054($sp) +/* 0115C 80AAE8CC C42EEC8C */ lwc1 $f14, %lo(D_80AAEC8C)($at) /* 01160 80AAE8D0 3C064370 */ lui $a2, 0x4370 ## $a2 = 43700000 -/* 01164 80AAE8D4 0C0345A5 */ jal func_800D1694 +/* 01164 80AAE8D4 0C0345A5 */ jal func_800D1694 /* 01168 80AAE8D8 27A70050 */ addiu $a3, $sp, 0x0050 ## $a3 = FFFFFFD0 /* 0116C 80AAE8DC 3C0580AB */ lui $a1, %hi(D_80AAEC30) ## $a1 = 80AB0000 /* 01170 80AAE8E0 24A5EC30 */ addiu $a1, $a1, %lo(D_80AAEC30) ## $a1 = 80AAEC30 -/* 01174 80AAE8E4 8FA40058 */ lw $a0, 0x0058($sp) -/* 01178 80AAE8E8 0C034695 */ jal Matrix_ToMtx +/* 01174 80AAE8E4 8FA40058 */ lw $a0, 0x0058($sp) +/* 01178 80AAE8E8 0C034695 */ jal Matrix_ToMtx /* 0117C 80AAE8EC 2406046B */ addiu $a2, $zero, 0x046B ## $a2 = 0000046B /* 01180 80AAE8F0 8E0302C0 */ lw $v1, 0x02C0($s0) ## 000002C0 /* 01184 80AAE8F4 3C0D0603 */ lui $t5, 0x0603 ## $t5 = 06030000 @@ -160,14 +160,14 @@ glabel EnMm_Draw /* 011AC 80AAE91C 246E0008 */ addiu $t6, $v1, 0x0008 ## $t6 = 00000008 /* 011B0 80AAE920 AE0E02C0 */ sw $t6, 0x02C0($s0) ## 000002C0 /* 011B4 80AAE924 AC6F0000 */ sw $t7, 0x0000($v1) ## 00000000 -/* 011B8 80AAE928 8FB80080 */ lw $t8, 0x0080($sp) +/* 011B8 80AAE928 8FB80080 */ lw $t8, 0x0080($sp) /* 011BC 80AAE92C 3C0C0001 */ lui $t4, 0x0001 ## $t4 = 00010000 /* 011C0 80AAE930 8319001E */ lb $t9, 0x001E($t8) ## 0000001E -/* 011C4 80AAE934 00195100 */ sll $t2, $t9, 4 -/* 011C8 80AAE938 01595021 */ addu $t2, $t2, $t9 -/* 011CC 80AAE93C 000A5080 */ sll $t2, $t2, 2 -/* 011D0 80AAE940 022A5821 */ addu $t3, $s1, $t2 -/* 011D4 80AAE944 018B6021 */ addu $t4, $t4, $t3 +/* 011C4 80AAE934 00195100 */ sll $t2, $t9, 4 +/* 011C8 80AAE938 01595021 */ addu $t2, $t2, $t9 +/* 011CC 80AAE93C 000A5080 */ sll $t2, $t2, 2 +/* 011D0 80AAE940 022A5821 */ addu $t3, $s1, $t2 +/* 011D4 80AAE944 018B6021 */ addu $t4, $t4, $t3 /* 011D8 80AAE948 8D8C17B4 */ lw $t4, 0x17B4($t4) ## 000117B4 /* 011DC 80AAE94C AC6C0004 */ sw $t4, 0x0004($v1) ## 00000004 .L80AAE950: @@ -175,12 +175,12 @@ glabel EnMm_Draw /* 011E4 80AAE954 24C6EC40 */ addiu $a2, $a2, %lo(D_80AAEC40) ## $a2 = 80AAEC40 /* 011E8 80AAE958 27A40064 */ addiu $a0, $sp, 0x0064 ## $a0 = FFFFFFE4 /* 011EC 80AAE95C 8E250000 */ lw $a1, 0x0000($s1) ## 00000000 -/* 011F0 80AAE960 0C031AD5 */ jal func_800C6B54 +/* 011F0 80AAE960 0C031AD5 */ jal Graph_CloseDisps /* 011F4 80AAE964 24070475 */ addiu $a3, $zero, 0x0475 ## $a3 = 00000475 -/* 011F8 80AAE968 8FBF002C */ lw $ra, 0x002C($sp) -/* 011FC 80AAE96C 8FB00024 */ lw $s0, 0x0024($sp) -/* 01200 80AAE970 8FB10028 */ lw $s1, 0x0028($sp) -/* 01204 80AAE974 03E00008 */ jr $ra +/* 011F8 80AAE968 8FBF002C */ lw $ra, 0x002C($sp) +/* 011FC 80AAE96C 8FB00024 */ lw $s0, 0x0024($sp) +/* 01200 80AAE970 8FB10028 */ lw $s1, 0x0028($sp) +/* 01204 80AAE974 03E00008 */ jr $ra /* 01208 80AAE978 27BD0080 */ addiu $sp, $sp, 0x0080 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Mm/EnMm_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Mm/EnMm_Init.s index 8f25f1b993..809d40fcd9 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Mm/EnMm_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Mm/EnMm_Init.s @@ -1,80 +1,80 @@ glabel EnMm_Init /* 00120 80AAD890 27BDFFB8 */ addiu $sp, $sp, 0xFFB8 ## $sp = FFFFFFB8 -/* 00124 80AAD894 AFA5004C */ sw $a1, 0x004C($sp) -/* 00128 80AAD898 AFBF002C */ sw $ra, 0x002C($sp) -/* 0012C 80AAD89C AFB00028 */ sw $s0, 0x0028($sp) +/* 00124 80AAD894 AFA5004C */ sw $a1, 0x004C($sp) +/* 00128 80AAD898 AFBF002C */ sw $ra, 0x002C($sp) +/* 0012C 80AAD89C AFB00028 */ sw $s0, 0x0028($sp) /* 00130 80AAD8A0 3C0580AB */ lui $a1, %hi(D_80AAEBE8) ## $a1 = 80AB0000 /* 00134 80AAD8A4 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 00138 80AAD8A8 0C01E037 */ jal Actor_ProcessInitChain - + /* 0013C 80AAD8AC 24A5EBE8 */ addiu $a1, $a1, %lo(D_80AAEBE8) ## $a1 = 80AAEBE8 /* 00140 80AAD8B0 3C068003 */ lui $a2, 0x8003 ## $a2 = 80030000 /* 00144 80AAD8B4 24C6B5EC */ addiu $a2, $a2, 0xB5EC ## $a2 = 8002B5EC /* 00148 80AAD8B8 260400B4 */ addiu $a0, $s0, 0x00B4 ## $a0 = 000000B4 /* 0014C 80AAD8BC 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 /* 00150 80AAD8C0 0C00AC78 */ jal ActorShape_Init - + /* 00154 80AAD8C4 3C0741A8 */ lui $a3, 0x41A8 ## $a3 = 41A80000 /* 00158 80AAD8C8 2605014C */ addiu $a1, $s0, 0x014C ## $a1 = 0000014C /* 0015C 80AAD8CC 3C060600 */ lui $a2, 0x0600 ## $a2 = 06000000 /* 00160 80AAD8D0 260E0260 */ addiu $t6, $s0, 0x0260 ## $t6 = 00000260 /* 00164 80AAD8D4 260F02C0 */ addiu $t7, $s0, 0x02C0 ## $t7 = 000002C0 /* 00168 80AAD8D8 24180010 */ addiu $t8, $zero, 0x0010 ## $t8 = 00000010 -/* 0016C 80AAD8DC AFB80018 */ sw $t8, 0x0018($sp) -/* 00170 80AAD8E0 AFAF0014 */ sw $t7, 0x0014($sp) -/* 00174 80AAD8E4 AFAE0010 */ sw $t6, 0x0010($sp) +/* 0016C 80AAD8DC AFB80018 */ sw $t8, 0x0018($sp) +/* 00170 80AAD8E0 AFAF0014 */ sw $t7, 0x0014($sp) +/* 00174 80AAD8E4 AFAE0010 */ sw $t6, 0x0010($sp) /* 00178 80AAD8E8 24C65E18 */ addiu $a2, $a2, 0x5E18 ## $a2 = 06005E18 -/* 0017C 80AAD8EC AFA50038 */ sw $a1, 0x0038($sp) -/* 00180 80AAD8F0 8FA4004C */ lw $a0, 0x004C($sp) -/* 00184 80AAD8F4 0C0291BE */ jal func_800A46F8 +/* 0017C 80AAD8EC AFA50038 */ sw $a1, 0x0038($sp) +/* 00180 80AAD8F0 8FA4004C */ lw $a0, 0x004C($sp) +/* 00184 80AAD8F4 0C0291BE */ jal SkelAnime_InitSV /* 00188 80AAD8F8 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 /* 0018C 80AAD8FC 26050194 */ addiu $a1, $s0, 0x0194 ## $a1 = 00000194 -/* 00190 80AAD900 AFA50034 */ sw $a1, 0x0034($sp) +/* 00190 80AAD900 AFA50034 */ sw $a1, 0x0034($sp) /* 00194 80AAD904 0C0170D9 */ jal ActorCollider_AllocCylinder - -/* 00198 80AAD908 8FA4004C */ lw $a0, 0x004C($sp) + +/* 00198 80AAD908 8FA4004C */ lw $a0, 0x004C($sp) /* 0019C 80AAD90C 3C0780AB */ lui $a3, %hi(D_80AAEAE0) ## $a3 = 80AB0000 -/* 001A0 80AAD910 8FA50034 */ lw $a1, 0x0034($sp) +/* 001A0 80AAD910 8FA50034 */ lw $a1, 0x0034($sp) /* 001A4 80AAD914 24E7EAE0 */ addiu $a3, $a3, %lo(D_80AAEAE0) ## $a3 = 80AAEAE0 -/* 001A8 80AAD918 8FA4004C */ lw $a0, 0x004C($sp) +/* 001A8 80AAD918 8FA4004C */ lw $a0, 0x004C($sp) /* 001AC 80AAD91C 0C01712B */ jal ActorCollider_InitCylinder - + /* 001B0 80AAD920 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 001B4 80AAD924 3C0580AB */ lui $a1, %hi(D_80AAEB18) ## $a1 = 80AB0000 /* 001B8 80AAD928 3C0680AB */ lui $a2, %hi(D_80AAEB0C) ## $a2 = 80AB0000 /* 001BC 80AAD92C 24C6EB0C */ addiu $a2, $a2, %lo(D_80AAEB0C) ## $a2 = 80AAEB0C /* 001C0 80AAD930 24A5EB18 */ addiu $a1, $a1, %lo(D_80AAEB18) ## $a1 = 80AAEB18 -/* 001C4 80AAD934 0C0187BF */ jal func_80061EFC +/* 001C4 80AAD934 0C0187BF */ jal func_80061EFC /* 001C8 80AAD938 26040098 */ addiu $a0, $s0, 0x0098 ## $a0 = 00000098 /* 001CC 80AAD93C 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 /* 001D0 80AAD940 24190004 */ addiu $t9, $zero, 0x0004 ## $t9 = 00000004 -/* 001D4 80AAD944 AFB90014 */ sw $t9, 0x0014($sp) -/* 001D8 80AAD948 44060000 */ mfc1 $a2, $f0 -/* 001DC 80AAD94C 44070000 */ mfc1 $a3, $f0 -/* 001E0 80AAD950 8FA4004C */ lw $a0, 0x004C($sp) +/* 001D4 80AAD944 AFB90014 */ sw $t9, 0x0014($sp) +/* 001D8 80AAD948 44060000 */ mfc1 $a2, $f0 +/* 001DC 80AAD94C 44070000 */ mfc1 $a3, $f0 +/* 001E0 80AAD950 8FA4004C */ lw $a0, 0x004C($sp) /* 001E4 80AAD954 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 001E8 80AAD958 0C00B92D */ jal func_8002E4B4 -/* 001EC 80AAD95C E7A00010 */ swc1 $f0, 0x0010($sp) +/* 001E8 80AAD958 0C00B92D */ jal func_8002E4B4 +/* 001EC 80AAD95C E7A00010 */ swc1 $f0, 0x0010($sp) /* 001F0 80AAD960 3C0380AB */ lui $v1, %hi(D_80AAEB38) ## $v1 = 80AB0000 /* 001F4 80AAD964 2463EB38 */ addiu $v1, $v1, %lo(D_80AAEB38) ## $v1 = 80AAEB38 /* 001F8 80AAD968 0C028800 */ jal SkelAnime_GetFrameCount - + /* 001FC 80AAD96C 8C640000 */ lw $a0, 0x0000($v1) ## 80AAEB38 /* 00200 80AAD970 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 00204 80AAD974 3C0380AB */ lui $v1, %hi(D_80AAEB38) ## $v1 = 80AB0000 /* 00208 80AAD978 2463EB38 */ addiu $v1, $v1, %lo(D_80AAEB38) ## $v1 = 80AAEB38 -/* 0020C 80AAD97C 468021A0 */ cvt.s.w $f6, $f4 +/* 0020C 80AAD97C 468021A0 */ cvt.s.w $f6, $f4 /* 00210 80AAD980 90680008 */ lbu $t0, 0x0008($v1) ## 80AAEB40 /* 00214 80AAD984 C468000C */ lwc1 $f8, 0x000C($v1) ## 80AAEB44 /* 00218 80AAD988 8C650000 */ lw $a1, 0x0000($v1) ## 80AAEB38 -/* 0021C 80AAD98C 8FA40038 */ lw $a0, 0x0038($sp) +/* 0021C 80AAD98C 8FA40038 */ lw $a0, 0x0038($sp) /* 00220 80AAD990 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 00224 80AAD994 E7A60010 */ swc1 $f6, 0x0010($sp) +/* 00224 80AAD994 E7A60010 */ swc1 $f6, 0x0010($sp) /* 00228 80AAD998 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 0022C 80AAD99C AFA80014 */ sw $t0, 0x0014($sp) -/* 00230 80AAD9A0 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 00234 80AAD9A4 E7A80018 */ swc1 $f8, 0x0018($sp) +/* 0022C 80AAD99C AFA80014 */ sw $t0, 0x0014($sp) +/* 00230 80AAD9A0 0C029468 */ jal SkelAnime_ChangeAnim + +/* 00234 80AAD9A4 E7A80018 */ swc1 $f8, 0x0018($sp) /* 00238 80AAD9A8 3C01BF80 */ lui $at, 0xBF80 ## $at = BF800000 /* 0023C 80AAD9AC 8609001C */ lh $t1, 0x001C($s0) ## 0000001C /* 00240 80AAD9B0 44815000 */ mtc1 $at, $f10 ## $f10 = -1.00 @@ -89,33 +89,33 @@ glabel EnMm_Init /* 00264 80AAD9D4 A202001F */ sb $v0, 0x001F($s0) ## 0000001F /* 00268 80AAD9D8 E60A006C */ swc1 $f10, 0x006C($s0) ## 0000006C /* 0026C 80AAD9DC E6100200 */ swc1 $f16, 0x0200($s0) ## 00000200 -/* 00270 80AAD9E0 0C2AB69C */ jal func_80AADA70 +/* 00270 80AAD9E0 0C2AB69C */ jal func_80AADA70 /* 00274 80AAD9E4 AE0B0204 */ sw $t3, 0x0204($s0) ## 00000204 /* 00278 80AAD9E8 24030001 */ addiu $v1, $zero, 0x0001 ## $v1 = 00000001 -/* 0027C 80AAD9EC 1443000A */ bne $v0, $v1, .L80AADA18 +/* 0027C 80AAD9EC 1443000A */ bne $v0, $v1, .L80AADA18 /* 00280 80AAD9F0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 00284 80AAD9F4 AE0301E4 */ sw $v1, 0x01E4($s0) ## 000001E4 /* 00288 80AAD9F8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 0028C 80AAD9FC 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 00290 80AADA00 0C2AB5DC */ jal func_80AAD770 +/* 00290 80AADA00 0C2AB5DC */ jal func_80AAD770 /* 00294 80AADA04 26060258 */ addiu $a2, $s0, 0x0258 ## $a2 = 00000258 /* 00298 80AADA08 3C0C80AB */ lui $t4, %hi(func_80AAE598) ## $t4 = 80AB0000 /* 0029C 80AADA0C 258CE598 */ addiu $t4, $t4, %lo(func_80AAE598) ## $t4 = 80AAE598 -/* 002A0 80AADA10 10000008 */ beq $zero, $zero, .L80AADA34 +/* 002A0 80AADA10 10000008 */ beq $zero, $zero, .L80AADA34 /* 002A4 80AADA14 AE0C0190 */ sw $t4, 0x0190($s0) ## 00000190 .L80AADA18: /* 002A8 80AADA18 AE0001E4 */ sw $zero, 0x01E4($s0) ## 000001E4 /* 002AC 80AADA1C 24050002 */ addiu $a1, $zero, 0x0002 ## $a1 = 00000002 -/* 002B0 80AADA20 0C2AB5DC */ jal func_80AAD770 +/* 002B0 80AADA20 0C2AB5DC */ jal func_80AAD770 /* 002B4 80AADA24 26060258 */ addiu $a2, $s0, 0x0258 ## $a2 = 00000258 /* 002B8 80AADA28 3C0D80AB */ lui $t5, %hi(func_80AAE294) ## $t5 = 80AB0000 /* 002BC 80AADA2C 25ADE294 */ addiu $t5, $t5, %lo(func_80AAE294) ## $t5 = 80AAE294 /* 002C0 80AADA30 AE0D0190 */ sw $t5, 0x0190($s0) ## 00000190 .L80AADA34: -/* 002C4 80AADA34 8FBF002C */ lw $ra, 0x002C($sp) -/* 002C8 80AADA38 8FB00028 */ lw $s0, 0x0028($sp) +/* 002C4 80AADA34 8FBF002C */ lw $ra, 0x002C($sp) +/* 002C8 80AADA38 8FB00028 */ lw $s0, 0x0028($sp) /* 002CC 80AADA3C 27BD0048 */ addiu $sp, $sp, 0x0048 ## $sp = 00000000 -/* 002D0 80AADA40 03E00008 */ jr $ra +/* 002D0 80AADA40 03E00008 */ jr $ra /* 002D4 80AADA44 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Mm/func_80AAD770.s b/asm/non_matchings/overlays/actors/ovl_En_Mm/func_80AAD770.s index db78bd348c..899a6248e8 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Mm/func_80AAD770.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Mm/func_80AAD770.s @@ -1,84 +1,84 @@ glabel func_80AAD770 /* 00000 80AAD770 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 00004 80AAD774 AFBF0024 */ sw $ra, 0x0024($sp) -/* 00008 80AAD778 AFA40038 */ sw $a0, 0x0038($sp) -/* 0000C 80AAD77C AFA60040 */ sw $a2, 0x0040($sp) +/* 00004 80AAD774 AFBF0024 */ sw $ra, 0x0024($sp) +/* 00008 80AAD778 AFA40038 */ sw $a0, 0x0038($sp) +/* 0000C 80AAD77C AFA60040 */ sw $a2, 0x0040($sp) /* 00010 80AAD780 8CC20000 */ lw $v0, 0x0000($a2) ## 00000000 /* 00014 80AAD784 44803000 */ mtc1 $zero, $f6 ## $f6 = 0.00 -/* 00018 80AAD788 00057900 */ sll $t7, $a1, 4 -/* 0001C 80AAD78C 04400003 */ bltz $v0, .L80AAD79C +/* 00018 80AAD788 00057900 */ sll $t7, $a1, 4 +/* 0001C 80AAD78C 04400003 */ bltz $v0, .L80AAD79C /* 00020 80AAD790 3C1880AB */ lui $t8, %hi(D_80AAEB38) ## $t8 = 80AB0000 -/* 00024 80AAD794 14A20005 */ bne $a1, $v0, .L80AAD7AC -/* 00028 80AAD798 0005C900 */ sll $t9, $a1, 4 +/* 00024 80AAD794 14A20005 */ bne $a1, $v0, .L80AAD7AC +/* 00028 80AAD798 0005C900 */ sll $t9, $a1, 4 .L80AAD79C: /* 0002C 80AAD79C 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 /* 00030 80AAD7A0 2718EB38 */ addiu $t8, $t8, %lo(D_80AAEB38) ## $t8 = 80AAEB38 -/* 00034 80AAD7A4 10000005 */ beq $zero, $zero, .L80AAD7BC -/* 00038 80AAD7A8 01F81821 */ addu $v1, $t7, $t8 +/* 00034 80AAD7A4 10000005 */ beq $zero, $zero, .L80AAD7BC +/* 00038 80AAD7A8 01F81821 */ addu $v1, $t7, $t8 .L80AAD7AC: /* 0003C 80AAD7AC 3C0880AB */ lui $t0, %hi(D_80AAEB38) ## $t0 = 80AB0000 /* 00040 80AAD7B0 2508EB38 */ addiu $t0, $t0, %lo(D_80AAEB38) ## $t0 = 80AAEB38 -/* 00044 80AAD7B4 03281821 */ addu $v1, $t9, $t0 +/* 00044 80AAD7B4 03281821 */ addu $v1, $t9, $t0 /* 00048 80AAD7B8 C460000C */ lwc1 $f0, 0x000C($v1) ## 0000000C .L80AAD7BC: /* 0004C 80AAD7BC C4640004 */ lwc1 $f4, 0x0004($v1) ## 00000004 -/* 00050 80AAD7C0 4604303E */ c.le.s $f6, $f4 +/* 00050 80AAD7C0 4604303E */ c.le.s $f6, $f4 /* 00054 80AAD7C4 00000000 */ nop -/* 00058 80AAD7C8 45020017 */ bc1fl .L80AAD828 +/* 00058 80AAD7C8 45020017 */ bc1fl .L80AAD828 /* 0005C 80AAD7CC 8C640000 */ lw $a0, 0x0000($v1) ## 00000000 /* 00060 80AAD7D0 8C640000 */ lw $a0, 0x0000($v1) ## 00000000 -/* 00064 80AAD7D4 AFA3002C */ sw $v1, 0x002C($sp) -/* 00068 80AAD7D8 AFA5003C */ sw $a1, 0x003C($sp) +/* 00064 80AAD7D4 AFA3002C */ sw $v1, 0x002C($sp) +/* 00068 80AAD7D8 AFA5003C */ sw $a1, 0x003C($sp) /* 0006C 80AAD7DC 0C028800 */ jal SkelAnime_GetFrameCount - -/* 00070 80AAD7E0 E7A00034 */ swc1 $f0, 0x0034($sp) + +/* 00070 80AAD7E0 E7A00034 */ swc1 $f0, 0x0034($sp) /* 00074 80AAD7E4 44824000 */ mtc1 $v0, $f8 ## $f8 = 0.00 -/* 00078 80AAD7E8 8FA3002C */ lw $v1, 0x002C($sp) -/* 0007C 80AAD7EC C7A00034 */ lwc1 $f0, 0x0034($sp) -/* 00080 80AAD7F0 468042A0 */ cvt.s.w $f10, $f8 -/* 00084 80AAD7F4 8FA40038 */ lw $a0, 0x0038($sp) +/* 00078 80AAD7E8 8FA3002C */ lw $v1, 0x002C($sp) +/* 0007C 80AAD7EC C7A00034 */ lwc1 $f0, 0x0034($sp) +/* 00080 80AAD7F0 468042A0 */ cvt.s.w $f10, $f8 +/* 00084 80AAD7F4 8FA40038 */ lw $a0, 0x0038($sp) /* 00088 80AAD7F8 90690008 */ lbu $t1, 0x0008($v1) ## 00000008 /* 0008C 80AAD7FC 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 /* 00090 80AAD800 8C650000 */ lw $a1, 0x0000($v1) ## 00000000 /* 00094 80AAD804 8C660004 */ lw $a2, 0x0004($v1) ## 00000004 -/* 00098 80AAD808 E7AA0010 */ swc1 $f10, 0x0010($sp) -/* 0009C 80AAD80C E7A00018 */ swc1 $f0, 0x0018($sp) +/* 00098 80AAD808 E7AA0010 */ swc1 $f10, 0x0010($sp) +/* 0009C 80AAD80C E7A00018 */ swc1 $f0, 0x0018($sp) /* 000A0 80AAD810 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 000A4 80AAD814 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 000A8 80AAD818 AFA90014 */ sw $t1, 0x0014($sp) -/* 000AC 80AAD81C 10000016 */ beq $zero, $zero, .L80AAD878 -/* 000B0 80AAD820 8FAB003C */ lw $t3, 0x003C($sp) +/* 000A4 80AAD814 0C029468 */ jal SkelAnime_ChangeAnim + +/* 000A8 80AAD818 AFA90014 */ sw $t1, 0x0014($sp) +/* 000AC 80AAD81C 10000016 */ beq $zero, $zero, .L80AAD878 +/* 000B0 80AAD820 8FAB003C */ lw $t3, 0x003C($sp) /* 000B4 80AAD824 8C640000 */ lw $a0, 0x0000($v1) ## 00000000 .L80AAD828: -/* 000B8 80AAD828 AFA3002C */ sw $v1, 0x002C($sp) -/* 000BC 80AAD82C AFA5003C */ sw $a1, 0x003C($sp) +/* 000B8 80AAD828 AFA3002C */ sw $v1, 0x002C($sp) +/* 000BC 80AAD82C AFA5003C */ sw $a1, 0x003C($sp) /* 000C0 80AAD830 0C028800 */ jal SkelAnime_GetFrameCount - -/* 000C4 80AAD834 E7A00034 */ swc1 $f0, 0x0034($sp) + +/* 000C4 80AAD834 E7A00034 */ swc1 $f0, 0x0034($sp) /* 000C8 80AAD838 44828000 */ mtc1 $v0, $f16 ## $f16 = 0.00 -/* 000CC 80AAD83C 8FA3002C */ lw $v1, 0x002C($sp) -/* 000D0 80AAD840 C7A00034 */ lwc1 $f0, 0x0034($sp) -/* 000D4 80AAD844 46808420 */ cvt.s.w $f16, $f16 -/* 000D8 80AAD848 8FA40038 */ lw $a0, 0x0038($sp) +/* 000CC 80AAD83C 8FA3002C */ lw $v1, 0x002C($sp) +/* 000D0 80AAD840 C7A00034 */ lwc1 $f0, 0x0034($sp) +/* 000D4 80AAD844 46808420 */ cvt.s.w $f16, $f16 +/* 000D8 80AAD848 8FA40038 */ lw $a0, 0x0038($sp) /* 000DC 80AAD84C 44809000 */ mtc1 $zero, $f18 ## $f18 = 0.00 /* 000E0 80AAD850 906A0008 */ lbu $t2, 0x0008($v1) ## 00000008 /* 000E4 80AAD854 8C650000 */ lw $a1, 0x0000($v1) ## 00000000 /* 000E8 80AAD858 8C660004 */ lw $a2, 0x0004($v1) ## 00000004 -/* 000EC 80AAD85C 44078000 */ mfc1 $a3, $f16 -/* 000F0 80AAD860 E7A00018 */ swc1 $f0, 0x0018($sp) +/* 000EC 80AAD85C 44078000 */ mfc1 $a3, $f16 +/* 000F0 80AAD860 E7A00018 */ swc1 $f0, 0x0018($sp) /* 000F4 80AAD864 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 000F8 80AAD868 AFAA0014 */ sw $t2, 0x0014($sp) -/* 000FC 80AAD86C 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 00100 80AAD870 E7B20010 */ swc1 $f18, 0x0010($sp) -/* 00104 80AAD874 8FAB003C */ lw $t3, 0x003C($sp) +/* 000F8 80AAD868 AFAA0014 */ sw $t2, 0x0014($sp) +/* 000FC 80AAD86C 0C029468 */ jal SkelAnime_ChangeAnim + +/* 00100 80AAD870 E7B20010 */ swc1 $f18, 0x0010($sp) +/* 00104 80AAD874 8FAB003C */ lw $t3, 0x003C($sp) .L80AAD878: -/* 00108 80AAD878 8FAC0040 */ lw $t4, 0x0040($sp) +/* 00108 80AAD878 8FAC0040 */ lw $t4, 0x0040($sp) /* 0010C 80AAD87C AD8B0000 */ sw $t3, 0x0000($t4) ## 00000000 -/* 00110 80AAD880 8FBF0024 */ lw $ra, 0x0024($sp) +/* 00110 80AAD880 8FBF0024 */ lw $ra, 0x0024($sp) /* 00114 80AAD884 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 -/* 00118 80AAD888 03E00008 */ jr $ra +/* 00118 80AAD888 03E00008 */ jr $ra /* 0011C 80AAD88C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Mm/func_80AADC34.s b/asm/non_matchings/overlays/actors/ovl_En_Mm/func_80AADC34.s index f474c7f0b8..d735dd3d07 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Mm/func_80AADC34.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Mm/func_80AADC34.s @@ -5,7 +5,7 @@ glabel func_80AADC34 /* 004D0 80AADC40 8CAE1C44 */ lw $t6, 0x1C44($a1) ## 00001C44 /* 004D4 80AADC44 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 /* 004D8 80AADC48 2405001C */ addiu $a1, $zero, 0x001C ## $a1 = 0000001C -/* 004DC 80AADC4C 0C01B0D8 */ jal func_8006C360 +/* 004DC 80AADC4C 0C01B0D8 */ jal Text_GetFaceReaction /* 004E0 80AADC50 AFAE001C */ sw $t6, 0x001C($sp) /* 004E4 80AADC54 3C058016 */ lui $a1, 0x8016 ## $a1 = 80160000 /* 004E8 80AADC58 24A5E660 */ addiu $a1, $a1, 0xE660 ## $a1 = 8015E660 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Mm/func_80AADEF0.s b/asm/non_matchings/overlays/actors/ovl_En_Mm/func_80AADEF0.s index c98bf02d77..4a0e217bb6 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Mm/func_80AADEF0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Mm/func_80AADEF0.s @@ -24,7 +24,7 @@ glabel func_80AADEF0 /* 007D8 80AADF48 46062501 */ sub.s $f20, $f4, $f6 /* 007DC 80AADF4C 460A4581 */ sub.s $f22, $f8, $f10 /* 007E0 80AADF50 4600A306 */ mov.s $f12, $f20 -/* 007E4 80AADF54 0C03F494 */ jal func_800FD250 +/* 007E4 80AADF54 0C03F494 */ jal Math_atan2f /* 007E8 80AADF58 4600B386 */ mov.s $f14, $f22 /* 007EC 80AADF5C 3C0180AB */ lui $at, %hi(D_80AAEC6C) ## $at = 80AB0000 /* 007F0 80AADF60 C430EC6C */ lwc1 $f16, %lo(D_80AAEC6C)($at) @@ -149,7 +149,7 @@ glabel func_80AADEF0 /* 00994 80AAE104 46062501 */ sub.s $f20, $f4, $f6 /* 00998 80AAE108 460A4581 */ sub.s $f22, $f8, $f10 /* 0099C 80AAE10C 4600A306 */ mov.s $f12, $f20 -/* 009A0 80AAE110 0C03F494 */ jal func_800FD250 +/* 009A0 80AAE110 0C03F494 */ jal Math_atan2f /* 009A4 80AAE114 4600B386 */ mov.s $f14, $f22 /* 009A8 80AAE118 3C0180AB */ lui $at, %hi(D_80AAEC74) ## $at = 80AB0000 /* 009AC 80AAE11C C430EC74 */ lwc1 $f16, %lo(D_80AAEC74)($at) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Mm2/EnMm2_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Mm2/EnMm2_Draw.s index 921f0db573..af571d6a95 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Mm2/EnMm2_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Mm2/EnMm2_Draw.s @@ -1,20 +1,20 @@ glabel EnMm2_Draw /* 00A88 80AAF8D8 27BDFFB0 */ addiu $sp, $sp, 0xFFB0 ## $sp = FFFFFFB0 -/* 00A8C 80AAF8DC AFBF002C */ sw $ra, 0x002C($sp) -/* 00A90 80AAF8E0 AFB00028 */ sw $s0, 0x0028($sp) -/* 00A94 80AAF8E4 AFA50054 */ sw $a1, 0x0054($sp) +/* 00A8C 80AAF8DC AFBF002C */ sw $ra, 0x002C($sp) +/* 00A90 80AAF8E0 AFB00028 */ sw $s0, 0x0028($sp) +/* 00A94 80AAF8E4 AFA50054 */ sw $a1, 0x0054($sp) /* 00A98 80AAF8E8 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 /* 00A9C 80AAF8EC 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 00AA0 80AAF8F0 3C0680AB */ lui $a2, %hi(D_80AAFBE8) ## $a2 = 80AB0000 /* 00AA4 80AAF8F4 24C6FBE8 */ addiu $a2, $a2, %lo(D_80AAFBE8) ## $a2 = 80AAFBE8 /* 00AA8 80AAF8F8 27A40038 */ addiu $a0, $sp, 0x0038 ## $a0 = FFFFFFE8 /* 00AAC 80AAF8FC 2407027A */ addiu $a3, $zero, 0x027A ## $a3 = 0000027A -/* 00AB0 80AAF900 0C031AB1 */ jal func_800C6AC4 -/* 00AB4 80AAF904 AFA50048 */ sw $a1, 0x0048($sp) -/* 00AB8 80AAF908 8FAF0054 */ lw $t7, 0x0054($sp) -/* 00ABC 80AAF90C 0C024F46 */ jal func_80093D18 +/* 00AB0 80AAF900 0C031AB1 */ jal Graph_OpenDisps +/* 00AB4 80AAF904 AFA50048 */ sw $a1, 0x0048($sp) +/* 00AB8 80AAF908 8FAF0054 */ lw $t7, 0x0054($sp) +/* 00ABC 80AAF90C 0C024F46 */ jal func_80093D18 /* 00AC0 80AAF910 8DE40000 */ lw $a0, 0x0000($t7) ## 00000000 -/* 00AC4 80AAF914 8FA50048 */ lw $a1, 0x0048($sp) +/* 00AC4 80AAF914 8FA50048 */ lw $a1, 0x0048($sp) /* 00AC8 80AAF918 3C19DB06 */ lui $t9, 0xDB06 ## $t9 = DB060000 /* 00ACC 80AAF91C 37390020 */ ori $t9, $t9, 0x0020 ## $t9 = DB060020 /* 00AD0 80AAF920 8CA302C0 */ lw $v1, 0x02C0($a1) ## 000002C0 @@ -26,42 +26,42 @@ glabel EnMm2_Draw /* 00AE8 80AAF938 8E0801E0 */ lw $t0, 0x01E0($s0) ## 000001E0 /* 00AEC 80AAF93C 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 /* 00AF0 80AAF940 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF -/* 00AF4 80AAF944 00084880 */ sll $t1, $t0, 2 -/* 00AF8 80AAF948 00892021 */ addu $a0, $a0, $t1 -/* 00AFC 80AAF94C 8C84FB60 */ lw $a0, %lo(D_80AAFB60)($a0) +/* 00AF4 80AAF944 00084880 */ sll $t1, $t0, 2 +/* 00AF8 80AAF948 00892021 */ addu $a0, $a0, $t1 +/* 00AFC 80AAF94C 8C84FB60 */ lw $a0, %lo(D_80AAFB60)($a0) /* 00B00 80AAF950 3C0880AB */ lui $t0, %hi(func_80AAFA60) ## $t0 = 80AB0000 /* 00B04 80AAF954 3C1980AB */ lui $t9, %hi(func_80AAF9D8) ## $t9 = 80AB0000 -/* 00B08 80AAF958 00045900 */ sll $t3, $a0, 4 -/* 00B0C 80AAF95C 000B6702 */ srl $t4, $t3, 28 -/* 00B10 80AAF960 000C6880 */ sll $t5, $t4, 2 -/* 00B14 80AAF964 01CD7021 */ addu $t6, $t6, $t5 +/* 00B08 80AAF958 00045900 */ sll $t3, $a0, 4 +/* 00B0C 80AAF95C 000B6702 */ srl $t4, $t3, 28 +/* 00B10 80AAF960 000C6880 */ sll $t5, $t4, 2 +/* 00B14 80AAF964 01CD7021 */ addu $t6, $t6, $t5 /* 00B18 80AAF968 8DCE6FA8 */ lw $t6, 0x6FA8($t6) ## 80166FA8 -/* 00B1C 80AAF96C 00815024 */ and $t2, $a0, $at +/* 00B1C 80AAF96C 00815024 */ and $t2, $a0, $at /* 00B20 80AAF970 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 00B24 80AAF974 014E7821 */ addu $t7, $t2, $t6 -/* 00B28 80AAF978 01E1C021 */ addu $t8, $t7, $at +/* 00B24 80AAF974 014E7821 */ addu $t7, $t2, $t6 +/* 00B28 80AAF978 01E1C021 */ addu $t8, $t7, $at /* 00B2C 80AAF97C AC780004 */ sw $t8, 0x0004($v1) ## 00000004 /* 00B30 80AAF980 9207014E */ lbu $a3, 0x014E($s0) ## 0000014E /* 00B34 80AAF984 8E06016C */ lw $a2, 0x016C($s0) ## 0000016C /* 00B38 80AAF988 8E050150 */ lw $a1, 0x0150($s0) ## 00000150 /* 00B3C 80AAF98C 2739F9D8 */ addiu $t9, $t9, %lo(func_80AAF9D8) ## $t9 = 80AAF9D8 /* 00B40 80AAF990 2508FA60 */ addiu $t0, $t0, %lo(func_80AAFA60) ## $t0 = 80AAFA60 -/* 00B44 80AAF994 AFA80014 */ sw $t0, 0x0014($sp) -/* 00B48 80AAF998 AFB90010 */ sw $t9, 0x0010($sp) -/* 00B4C 80AAF99C AFB00018 */ sw $s0, 0x0018($sp) -/* 00B50 80AAF9A0 0C0286B2 */ jal func_800A1AC8 -/* 00B54 80AAF9A4 8FA40054 */ lw $a0, 0x0054($sp) -/* 00B58 80AAF9A8 8FA90054 */ lw $t1, 0x0054($sp) +/* 00B44 80AAF994 AFA80014 */ sw $t0, 0x0014($sp) +/* 00B48 80AAF998 AFB90010 */ sw $t9, 0x0010($sp) +/* 00B4C 80AAF99C AFB00018 */ sw $s0, 0x0018($sp) +/* 00B50 80AAF9A0 0C0286B2 */ jal SkelAnime_DrawSV +/* 00B54 80AAF9A4 8FA40054 */ lw $a0, 0x0054($sp) +/* 00B58 80AAF9A8 8FA90054 */ lw $t1, 0x0054($sp) /* 00B5C 80AAF9AC 3C0680AB */ lui $a2, %hi(D_80AAFBF8) ## $a2 = 80AB0000 /* 00B60 80AAF9B0 24C6FBF8 */ addiu $a2, $a2, %lo(D_80AAFBF8) ## $a2 = 80AAFBF8 /* 00B64 80AAF9B4 27A40038 */ addiu $a0, $sp, 0x0038 ## $a0 = FFFFFFE8 /* 00B68 80AAF9B8 2407028E */ addiu $a3, $zero, 0x028E ## $a3 = 0000028E -/* 00B6C 80AAF9BC 0C031AD5 */ jal func_800C6B54 +/* 00B6C 80AAF9BC 0C031AD5 */ jal Graph_CloseDisps /* 00B70 80AAF9C0 8D250000 */ lw $a1, 0x0000($t1) ## 00000000 -/* 00B74 80AAF9C4 8FBF002C */ lw $ra, 0x002C($sp) -/* 00B78 80AAF9C8 8FB00028 */ lw $s0, 0x0028($sp) +/* 00B74 80AAF9C4 8FBF002C */ lw $ra, 0x002C($sp) +/* 00B78 80AAF9C8 8FB00028 */ lw $s0, 0x0028($sp) /* 00B7C 80AAF9CC 27BD0050 */ addiu $sp, $sp, 0x0050 ## $sp = 00000000 -/* 00B80 80AAF9D0 03E00008 */ jr $ra +/* 00B80 80AAF9D0 03E00008 */ jr $ra /* 00B84 80AAF9D4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Mm2/EnMm2_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Mm2/EnMm2_Init.s index ddc3152ebc..2d54d51e40 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Mm2/EnMm2_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Mm2/EnMm2_Init.s @@ -1,66 +1,66 @@ glabel EnMm2_Init /* 001EC 80AAF03C 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 -/* 001F0 80AAF040 AFA50044 */ sw $a1, 0x0044($sp) -/* 001F4 80AAF044 AFBF002C */ sw $ra, 0x002C($sp) -/* 001F8 80AAF048 AFB00028 */ sw $s0, 0x0028($sp) +/* 001F0 80AAF040 AFA50044 */ sw $a1, 0x0044($sp) +/* 001F4 80AAF044 AFBF002C */ sw $ra, 0x002C($sp) +/* 001F8 80AAF048 AFB00028 */ sw $s0, 0x0028($sp) /* 001FC 80AAF04C 3C0580AB */ lui $a1, %hi(D_80AAFB5C) ## $a1 = 80AB0000 /* 00200 80AAF050 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 00204 80AAF054 0C01E037 */ jal Actor_ProcessInitChain - + /* 00208 80AAF058 24A5FB5C */ addiu $a1, $a1, %lo(D_80AAFB5C) ## $a1 = 80AAFB5C /* 0020C 80AAF05C 3C068003 */ lui $a2, 0x8003 ## $a2 = 80030000 /* 00210 80AAF060 24C6B5EC */ addiu $a2, $a2, 0xB5EC ## $a2 = 8002B5EC /* 00214 80AAF064 260400B4 */ addiu $a0, $s0, 0x00B4 ## $a0 = 000000B4 /* 00218 80AAF068 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 /* 0021C 80AAF06C 0C00AC78 */ jal ActorShape_Init - + /* 00220 80AAF070 3C0741A8 */ lui $a3, 0x41A8 ## $a3 = 41A80000 /* 00224 80AAF074 2605014C */ addiu $a1, $s0, 0x014C ## $a1 = 0000014C /* 00228 80AAF078 3C060600 */ lui $a2, 0x0600 ## $a2 = 06000000 /* 0022C 80AAF07C 260E01FC */ addiu $t6, $s0, 0x01FC ## $t6 = 000001FC /* 00230 80AAF080 260F025C */ addiu $t7, $s0, 0x025C ## $t7 = 0000025C /* 00234 80AAF084 24180010 */ addiu $t8, $zero, 0x0010 ## $t8 = 00000010 -/* 00238 80AAF088 AFB80018 */ sw $t8, 0x0018($sp) -/* 0023C 80AAF08C AFAF0014 */ sw $t7, 0x0014($sp) -/* 00240 80AAF090 AFAE0010 */ sw $t6, 0x0010($sp) +/* 00238 80AAF088 AFB80018 */ sw $t8, 0x0018($sp) +/* 0023C 80AAF08C AFAF0014 */ sw $t7, 0x0014($sp) +/* 00240 80AAF090 AFAE0010 */ sw $t6, 0x0010($sp) /* 00244 80AAF094 24C65E18 */ addiu $a2, $a2, 0x5E18 ## $a2 = 06005E18 -/* 00248 80AAF098 AFA50030 */ sw $a1, 0x0030($sp) -/* 0024C 80AAF09C 8FA40044 */ lw $a0, 0x0044($sp) -/* 00250 80AAF0A0 0C0291BE */ jal func_800A46F8 +/* 00248 80AAF098 AFA50030 */ sw $a1, 0x0030($sp) +/* 0024C 80AAF09C 8FA40044 */ lw $a0, 0x0044($sp) +/* 00250 80AAF0A0 0C0291BE */ jal SkelAnime_InitSV /* 00254 80AAF0A4 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 /* 00258 80AAF0A8 3C0380AB */ lui $v1, %hi(D_80AAFAEC) ## $v1 = 80AB0000 /* 0025C 80AAF0AC 2463FAEC */ addiu $v1, $v1, %lo(D_80AAFAEC) ## $v1 = 80AAFAEC /* 00260 80AAF0B0 0C028800 */ jal SkelAnime_GetFrameCount - + /* 00264 80AAF0B4 8C640020 */ lw $a0, 0x0020($v1) ## 80AAFB0C /* 00268 80AAF0B8 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 0026C 80AAF0BC 3C0380AB */ lui $v1, %hi(D_80AAFAEC) ## $v1 = 80AB0000 /* 00270 80AAF0C0 2463FAEC */ addiu $v1, $v1, %lo(D_80AAFAEC) ## $v1 = 80AAFAEC -/* 00274 80AAF0C4 468021A0 */ cvt.s.w $f6, $f4 +/* 00274 80AAF0C4 468021A0 */ cvt.s.w $f6, $f4 /* 00278 80AAF0C8 90790028 */ lbu $t9, 0x0028($v1) ## 80AAFB14 /* 0027C 80AAF0CC C468002C */ lwc1 $f8, 0x002C($v1) ## 80AAFB18 /* 00280 80AAF0D0 8C650020 */ lw $a1, 0x0020($v1) ## 80AAFB0C -/* 00284 80AAF0D4 8FA40030 */ lw $a0, 0x0030($sp) +/* 00284 80AAF0D4 8FA40030 */ lw $a0, 0x0030($sp) /* 00288 80AAF0D8 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 0028C 80AAF0DC E7A60010 */ swc1 $f6, 0x0010($sp) +/* 0028C 80AAF0DC E7A60010 */ swc1 $f6, 0x0010($sp) /* 00290 80AAF0E0 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 00294 80AAF0E4 AFB90014 */ sw $t9, 0x0014($sp) -/* 00298 80AAF0E8 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 0029C 80AAF0EC E7A80018 */ swc1 $f8, 0x0018($sp) +/* 00294 80AAF0E4 AFB90014 */ sw $t9, 0x0014($sp) +/* 00298 80AAF0E8 0C029468 */ jal SkelAnime_ChangeAnim + +/* 0029C 80AAF0EC E7A80018 */ swc1 $f8, 0x0018($sp) /* 002A0 80AAF0F0 24080002 */ addiu $t0, $zero, 0x0002 ## $t0 = 00000002 /* 002A4 80AAF0F4 AE0801F8 */ sw $t0, 0x01F8($s0) ## 000001F8 /* 002A8 80AAF0F8 26050194 */ addiu $a1, $s0, 0x0194 ## $a1 = 00000194 -/* 002AC 80AAF0FC AFA50030 */ sw $a1, 0x0030($sp) +/* 002AC 80AAF0FC AFA50030 */ sw $a1, 0x0030($sp) /* 002B0 80AAF100 0C0170D9 */ jal ActorCollider_AllocCylinder - -/* 002B4 80AAF104 8FA40044 */ lw $a0, 0x0044($sp) + +/* 002B4 80AAF104 8FA40044 */ lw $a0, 0x0044($sp) /* 002B8 80AAF108 3C0780AB */ lui $a3, %hi(D_80AAFAC0) ## $a3 = 80AB0000 -/* 002BC 80AAF10C 8FA50030 */ lw $a1, 0x0030($sp) +/* 002BC 80AAF10C 8FA50030 */ lw $a1, 0x0030($sp) /* 002C0 80AAF110 24E7FAC0 */ addiu $a3, $a3, %lo(D_80AAFAC0) ## $a3 = 80AAFAC0 -/* 002C4 80AAF114 8FA40044 */ lw $a0, 0x0044($sp) +/* 002C4 80AAF114 8FA40044 */ lw $a0, 0x0044($sp) /* 002C8 80AAF118 0C01712B */ jal ActorCollider_InitCylinder - + /* 002CC 80AAF11C 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 002D0 80AAF120 960B01F4 */ lhu $t3, 0x01F4($s0) ## 000001F4 /* 002D4 80AAF124 3C01BF80 */ lui $at, 0xBF80 ## $at = BF800000 @@ -74,16 +74,16 @@ glabel EnMm2_Init /* 002F4 80AAF144 AE0001E0 */ sw $zero, 0x01E0($s0) ## 000001E0 /* 002F8 80AAF148 A20A001F */ sb $t2, 0x001F($s0) ## 0000001F /* 002FC 80AAF14C A60C01F4 */ sh $t4, 0x01F4($s0) ## 000001F4 -/* 00300 80AAF150 15A10005 */ bne $t5, $at, .L80AAF168 +/* 00300 80AAF150 15A10005 */ bne $t5, $at, .L80AAF168 /* 00304 80AAF154 E60A006C */ swc1 $f10, 0x006C($s0) ## 0000006C /* 00308 80AAF158 3C0E80AB */ lui $t6, %hi(func_80AAF668) ## $t6 = 80AB0000 /* 0030C 80AAF15C 25CEF668 */ addiu $t6, $t6, %lo(func_80AAF668) ## $t6 = 80AAF668 -/* 00310 80AAF160 10000007 */ beq $zero, $zero, .L80AAF180 +/* 00310 80AAF160 10000007 */ beq $zero, $zero, .L80AAF180 /* 00314 80AAF164 AE0E0190 */ sw $t6, 0x0190($s0) ## 00000190 .L80AAF168: /* 00318 80AAF168 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0031C 80AAF16C 0C2ABBDC */ jal func_80AAEF70 -/* 00320 80AAF170 8FA50044 */ lw $a1, 0x0044($sp) +/* 0031C 80AAF16C 0C2ABBDC */ jal func_80AAEF70 +/* 00320 80AAF170 8FA50044 */ lw $a1, 0x0044($sp) /* 00324 80AAF174 3C0F80AB */ lui $t7, %hi(func_80AAF57C) ## $t7 = 80AB0000 /* 00328 80AAF178 25EFF57C */ addiu $t7, $t7, %lo(func_80AAF57C) ## $t7 = 80AAF57C /* 0032C 80AAF17C AE0F0190 */ sw $t7, 0x0190($s0) ## 00000190 @@ -91,39 +91,39 @@ glabel EnMm2_Init /* 00330 80AAF180 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 /* 00334 80AAF184 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 /* 00338 80AAF188 8C580004 */ lw $t8, 0x0004($v0) ## 8015E664 -/* 0033C 80AAF18C 53000006 */ beql $t8, $zero, .L80AAF1A8 +/* 0033C 80AAF18C 53000006 */ beql $t8, $zero, .L80AAF1A8 /* 00340 80AAF190 8619001C */ lh $t9, 0x001C($s0) ## 0000001C /* 00344 80AAF194 0C00B55C */ jal Actor_Kill - + /* 00348 80AAF198 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 0034C 80AAF19C 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 /* 00350 80AAF1A0 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 /* 00354 80AAF1A4 8619001C */ lh $t9, 0x001C($s0) ## 0000001C .L80AAF1A8: /* 00358 80AAF1A8 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 0035C 80AAF1AC 5721000F */ bnel $t9, $at, .L80AAF1EC -/* 00360 80AAF1B0 8FBF002C */ lw $ra, 0x002C($sp) +/* 0035C 80AAF1AC 5721000F */ bnel $t9, $at, .L80AAF1EC +/* 00360 80AAF1B0 8FBF002C */ lw $ra, 0x002C($sp) /* 00364 80AAF1B4 94480F26 */ lhu $t0, 0x0F26($v0) ## 8015F586 /* 00368 80AAF1B8 3C0480AB */ lui $a0, %hi(D_80AAFB80) ## $a0 = 80AB0000 /* 0036C 80AAF1BC 31098000 */ andi $t1, $t0, 0x8000 ## $t1 = 00000000 -/* 00370 80AAF1C0 11200005 */ beq $t1, $zero, .L80AAF1D8 +/* 00370 80AAF1C0 11200005 */ beq $t1, $zero, .L80AAF1D8 /* 00374 80AAF1C4 00000000 */ nop /* 00378 80AAF1C8 944A13FC */ lhu $t2, 0x13FC($v0) ## 8015FA5C /* 0037C 80AAF1CC 314B0001 */ andi $t3, $t2, 0x0001 ## $t3 = 00000000 -/* 00380 80AAF1D0 55600006 */ bnel $t3, $zero, .L80AAF1EC -/* 00384 80AAF1D4 8FBF002C */ lw $ra, 0x002C($sp) +/* 00380 80AAF1D0 55600006 */ bnel $t3, $zero, .L80AAF1EC +/* 00384 80AAF1D4 8FBF002C */ lw $ra, 0x002C($sp) .L80AAF1D8: /* 00388 80AAF1D8 0C00084C */ jal osSyncPrintf - + /* 0038C 80AAF1DC 2484FB80 */ addiu $a0, $a0, %lo(D_80AAFB80) ## $a0 = 80AAFB80 /* 00390 80AAF1E0 0C00B55C */ jal Actor_Kill - + /* 00394 80AAF1E4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00398 80AAF1E8 8FBF002C */ lw $ra, 0x002C($sp) +/* 00398 80AAF1E8 8FBF002C */ lw $ra, 0x002C($sp) .L80AAF1EC: -/* 0039C 80AAF1EC 8FB00028 */ lw $s0, 0x0028($sp) +/* 0039C 80AAF1EC 8FB00028 */ lw $s0, 0x0028($sp) /* 003A0 80AAF1F0 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 -/* 003A4 80AAF1F4 03E00008 */ jr $ra +/* 003A4 80AAF1F4 03E00008 */ jr $ra /* 003A8 80AAF1F8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Mm2/func_80AAEE50.s b/asm/non_matchings/overlays/actors/ovl_En_Mm2/func_80AAEE50.s index 5c46b23d02..ba82c029f0 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Mm2/func_80AAEE50.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Mm2/func_80AAEE50.s @@ -1,84 +1,84 @@ glabel func_80AAEE50 /* 00000 80AAEE50 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 00004 80AAEE54 AFBF0024 */ sw $ra, 0x0024($sp) -/* 00008 80AAEE58 AFA40038 */ sw $a0, 0x0038($sp) -/* 0000C 80AAEE5C AFA60040 */ sw $a2, 0x0040($sp) +/* 00004 80AAEE54 AFBF0024 */ sw $ra, 0x0024($sp) +/* 00008 80AAEE58 AFA40038 */ sw $a0, 0x0038($sp) +/* 0000C 80AAEE5C AFA60040 */ sw $a2, 0x0040($sp) /* 00010 80AAEE60 8CC20000 */ lw $v0, 0x0000($a2) ## 00000000 /* 00014 80AAEE64 44803000 */ mtc1 $zero, $f6 ## $f6 = 0.00 -/* 00018 80AAEE68 00057900 */ sll $t7, $a1, 4 -/* 0001C 80AAEE6C 04400003 */ bltz $v0, .L80AAEE7C +/* 00018 80AAEE68 00057900 */ sll $t7, $a1, 4 +/* 0001C 80AAEE6C 04400003 */ bltz $v0, .L80AAEE7C /* 00020 80AAEE70 3C1880AB */ lui $t8, %hi(D_80AAFAEC) ## $t8 = 80AB0000 -/* 00024 80AAEE74 14A20005 */ bne $a1, $v0, .L80AAEE8C -/* 00028 80AAEE78 0005C900 */ sll $t9, $a1, 4 +/* 00024 80AAEE74 14A20005 */ bne $a1, $v0, .L80AAEE8C +/* 00028 80AAEE78 0005C900 */ sll $t9, $a1, 4 .L80AAEE7C: /* 0002C 80AAEE7C 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 /* 00030 80AAEE80 2718FAEC */ addiu $t8, $t8, %lo(D_80AAFAEC) ## $t8 = 80AAFAEC -/* 00034 80AAEE84 10000005 */ beq $zero, $zero, .L80AAEE9C -/* 00038 80AAEE88 01F81821 */ addu $v1, $t7, $t8 +/* 00034 80AAEE84 10000005 */ beq $zero, $zero, .L80AAEE9C +/* 00038 80AAEE88 01F81821 */ addu $v1, $t7, $t8 .L80AAEE8C: /* 0003C 80AAEE8C 3C0880AB */ lui $t0, %hi(D_80AAFAEC) ## $t0 = 80AB0000 /* 00040 80AAEE90 2508FAEC */ addiu $t0, $t0, %lo(D_80AAFAEC) ## $t0 = 80AAFAEC -/* 00044 80AAEE94 03281821 */ addu $v1, $t9, $t0 +/* 00044 80AAEE94 03281821 */ addu $v1, $t9, $t0 /* 00048 80AAEE98 C460000C */ lwc1 $f0, 0x000C($v1) ## 0000000C .L80AAEE9C: /* 0004C 80AAEE9C C4640004 */ lwc1 $f4, 0x0004($v1) ## 00000004 -/* 00050 80AAEEA0 4604303E */ c.le.s $f6, $f4 +/* 00050 80AAEEA0 4604303E */ c.le.s $f6, $f4 /* 00054 80AAEEA4 00000000 */ nop -/* 00058 80AAEEA8 45020017 */ bc1fl .L80AAEF08 +/* 00058 80AAEEA8 45020017 */ bc1fl .L80AAEF08 /* 0005C 80AAEEAC 8C640000 */ lw $a0, 0x0000($v1) ## 00000000 /* 00060 80AAEEB0 8C640000 */ lw $a0, 0x0000($v1) ## 00000000 -/* 00064 80AAEEB4 AFA3002C */ sw $v1, 0x002C($sp) -/* 00068 80AAEEB8 AFA5003C */ sw $a1, 0x003C($sp) +/* 00064 80AAEEB4 AFA3002C */ sw $v1, 0x002C($sp) +/* 00068 80AAEEB8 AFA5003C */ sw $a1, 0x003C($sp) /* 0006C 80AAEEBC 0C028800 */ jal SkelAnime_GetFrameCount - -/* 00070 80AAEEC0 E7A00034 */ swc1 $f0, 0x0034($sp) + +/* 00070 80AAEEC0 E7A00034 */ swc1 $f0, 0x0034($sp) /* 00074 80AAEEC4 44824000 */ mtc1 $v0, $f8 ## $f8 = 0.00 -/* 00078 80AAEEC8 8FA3002C */ lw $v1, 0x002C($sp) -/* 0007C 80AAEECC C7A00034 */ lwc1 $f0, 0x0034($sp) -/* 00080 80AAEED0 468042A0 */ cvt.s.w $f10, $f8 -/* 00084 80AAEED4 8FA40038 */ lw $a0, 0x0038($sp) +/* 00078 80AAEEC8 8FA3002C */ lw $v1, 0x002C($sp) +/* 0007C 80AAEECC C7A00034 */ lwc1 $f0, 0x0034($sp) +/* 00080 80AAEED0 468042A0 */ cvt.s.w $f10, $f8 +/* 00084 80AAEED4 8FA40038 */ lw $a0, 0x0038($sp) /* 00088 80AAEED8 90690008 */ lbu $t1, 0x0008($v1) ## 00000008 /* 0008C 80AAEEDC 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 /* 00090 80AAEEE0 8C650000 */ lw $a1, 0x0000($v1) ## 00000000 /* 00094 80AAEEE4 8C660004 */ lw $a2, 0x0004($v1) ## 00000004 -/* 00098 80AAEEE8 E7AA0010 */ swc1 $f10, 0x0010($sp) -/* 0009C 80AAEEEC E7A00018 */ swc1 $f0, 0x0018($sp) +/* 00098 80AAEEE8 E7AA0010 */ swc1 $f10, 0x0010($sp) +/* 0009C 80AAEEEC E7A00018 */ swc1 $f0, 0x0018($sp) /* 000A0 80AAEEF0 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 000A4 80AAEEF4 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 000A8 80AAEEF8 AFA90014 */ sw $t1, 0x0014($sp) -/* 000AC 80AAEEFC 10000016 */ beq $zero, $zero, .L80AAEF58 -/* 000B0 80AAEF00 8FAB003C */ lw $t3, 0x003C($sp) +/* 000A4 80AAEEF4 0C029468 */ jal SkelAnime_ChangeAnim + +/* 000A8 80AAEEF8 AFA90014 */ sw $t1, 0x0014($sp) +/* 000AC 80AAEEFC 10000016 */ beq $zero, $zero, .L80AAEF58 +/* 000B0 80AAEF00 8FAB003C */ lw $t3, 0x003C($sp) /* 000B4 80AAEF04 8C640000 */ lw $a0, 0x0000($v1) ## 00000000 .L80AAEF08: -/* 000B8 80AAEF08 AFA3002C */ sw $v1, 0x002C($sp) -/* 000BC 80AAEF0C AFA5003C */ sw $a1, 0x003C($sp) +/* 000B8 80AAEF08 AFA3002C */ sw $v1, 0x002C($sp) +/* 000BC 80AAEF0C AFA5003C */ sw $a1, 0x003C($sp) /* 000C0 80AAEF10 0C028800 */ jal SkelAnime_GetFrameCount - -/* 000C4 80AAEF14 E7A00034 */ swc1 $f0, 0x0034($sp) + +/* 000C4 80AAEF14 E7A00034 */ swc1 $f0, 0x0034($sp) /* 000C8 80AAEF18 44828000 */ mtc1 $v0, $f16 ## $f16 = 0.00 -/* 000CC 80AAEF1C 8FA3002C */ lw $v1, 0x002C($sp) -/* 000D0 80AAEF20 C7A00034 */ lwc1 $f0, 0x0034($sp) -/* 000D4 80AAEF24 46808420 */ cvt.s.w $f16, $f16 -/* 000D8 80AAEF28 8FA40038 */ lw $a0, 0x0038($sp) +/* 000CC 80AAEF1C 8FA3002C */ lw $v1, 0x002C($sp) +/* 000D0 80AAEF20 C7A00034 */ lwc1 $f0, 0x0034($sp) +/* 000D4 80AAEF24 46808420 */ cvt.s.w $f16, $f16 +/* 000D8 80AAEF28 8FA40038 */ lw $a0, 0x0038($sp) /* 000DC 80AAEF2C 44809000 */ mtc1 $zero, $f18 ## $f18 = 0.00 /* 000E0 80AAEF30 906A0008 */ lbu $t2, 0x0008($v1) ## 00000008 /* 000E4 80AAEF34 8C650000 */ lw $a1, 0x0000($v1) ## 00000000 /* 000E8 80AAEF38 8C660004 */ lw $a2, 0x0004($v1) ## 00000004 -/* 000EC 80AAEF3C 44078000 */ mfc1 $a3, $f16 -/* 000F0 80AAEF40 E7A00018 */ swc1 $f0, 0x0018($sp) +/* 000EC 80AAEF3C 44078000 */ mfc1 $a3, $f16 +/* 000F0 80AAEF40 E7A00018 */ swc1 $f0, 0x0018($sp) /* 000F4 80AAEF44 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 000F8 80AAEF48 AFAA0014 */ sw $t2, 0x0014($sp) -/* 000FC 80AAEF4C 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 00100 80AAEF50 E7B20010 */ swc1 $f18, 0x0010($sp) -/* 00104 80AAEF54 8FAB003C */ lw $t3, 0x003C($sp) +/* 000F8 80AAEF48 AFAA0014 */ sw $t2, 0x0014($sp) +/* 000FC 80AAEF4C 0C029468 */ jal SkelAnime_ChangeAnim + +/* 00100 80AAEF50 E7B20010 */ swc1 $f18, 0x0010($sp) +/* 00104 80AAEF54 8FAB003C */ lw $t3, 0x003C($sp) .L80AAEF58: -/* 00108 80AAEF58 8FAC0040 */ lw $t4, 0x0040($sp) +/* 00108 80AAEF58 8FAC0040 */ lw $t4, 0x0040($sp) /* 0010C 80AAEF5C AD8B0000 */ sw $t3, 0x0000($t4) ## 00000000 -/* 00110 80AAEF60 8FBF0024 */ lw $ra, 0x0024($sp) +/* 00110 80AAEF60 8FBF0024 */ lw $ra, 0x0024($sp) /* 00114 80AAEF64 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 -/* 00118 80AAEF68 03E00008 */ jr $ra +/* 00118 80AAEF68 03E00008 */ jr $ra /* 0011C 80AAEF6C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Mu/EnMu_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Mu/EnMu_Destroy.s index ae2949c948..dec17fc631 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Mu/EnMu_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Mu/EnMu_Destroy.s @@ -1,11 +1,11 @@ glabel EnMu_Destroy /* 002E4 80AB0704 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 002E8 80AB0708 AFBF0014 */ sw $ra, 0x0014($sp) -/* 002EC 80AB070C 0C0295BC */ jal func_800A56F0 +/* 002E8 80AB0708 AFBF0014 */ sw $ra, 0x0014($sp) +/* 002EC 80AB070C 0C0295BC */ jal SkelAnime_Free /* 002F0 80AB0710 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 002F4 80AB0714 8FBF0014 */ lw $ra, 0x0014($sp) +/* 002F4 80AB0714 8FBF0014 */ lw $ra, 0x0014($sp) /* 002F8 80AB0718 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 002FC 80AB071C 03E00008 */ jr $ra +/* 002FC 80AB071C 03E00008 */ jr $ra /* 00300 80AB0720 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Mu/EnMu_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Mu/EnMu_Draw.s index 2688e83804..4e1527e84d 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Mu/EnMu_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Mu/EnMu_Draw.s @@ -1,20 +1,20 @@ glabel EnMu_Draw /* 005F4 80AB0A14 27BDFF50 */ addiu $sp, $sp, 0xFF50 ## $sp = FFFFFF50 -/* 005F8 80AB0A18 AFB70044 */ sw $s7, 0x0044($sp) +/* 005F8 80AB0A18 AFB70044 */ sw $s7, 0x0044($sp) /* 005FC 80AB0A1C 3C0E80AB */ lui $t6, %hi(D_80AB0C38) ## $t6 = 80AB0000 /* 00600 80AB0A20 27B70084 */ addiu $s7, $sp, 0x0084 ## $s7 = FFFFFFD4 -/* 00604 80AB0A24 AFBE0048 */ sw $s8, 0x0048($sp) -/* 00608 80AB0A28 AFB60040 */ sw $s6, 0x0040($sp) +/* 00604 80AB0A24 AFBE0048 */ sw $s8, 0x0048($sp) +/* 00608 80AB0A28 AFB60040 */ sw $s6, 0x0040($sp) /* 0060C 80AB0A2C 25CE0C38 */ addiu $t6, $t6, %lo(D_80AB0C38) ## $t6 = 80AB0C38 /* 00610 80AB0A30 0080B025 */ or $s6, $a0, $zero ## $s6 = 00000000 /* 00614 80AB0A34 00A0F025 */ or $s8, $a1, $zero ## $s8 = 00000000 -/* 00618 80AB0A38 AFBF004C */ sw $ra, 0x004C($sp) -/* 0061C 80AB0A3C AFB5003C */ sw $s5, 0x003C($sp) -/* 00620 80AB0A40 AFB40038 */ sw $s4, 0x0038($sp) -/* 00624 80AB0A44 AFB30034 */ sw $s3, 0x0034($sp) -/* 00628 80AB0A48 AFB20030 */ sw $s2, 0x0030($sp) -/* 0062C 80AB0A4C AFB1002C */ sw $s1, 0x002C($sp) -/* 00630 80AB0A50 AFB00028 */ sw $s0, 0x0028($sp) +/* 00618 80AB0A38 AFBF004C */ sw $ra, 0x004C($sp) +/* 0061C 80AB0A3C AFB5003C */ sw $s5, 0x003C($sp) +/* 00620 80AB0A40 AFB40038 */ sw $s4, 0x0038($sp) +/* 00624 80AB0A44 AFB30034 */ sw $s3, 0x0034($sp) +/* 00628 80AB0A48 AFB20030 */ sw $s2, 0x0030($sp) +/* 0062C 80AB0A4C AFB1002C */ sw $s1, 0x002C($sp) +/* 00630 80AB0A50 AFB00028 */ sw $s0, 0x0028($sp) /* 00634 80AB0A54 25C80024 */ addiu $t0, $t6, 0x0024 ## $t0 = 80AB0C5C /* 00638 80AB0A58 02E0C825 */ or $t9, $s7, $zero ## $t9 = FFFFFFD4 .L80AB0A5C: @@ -25,7 +25,7 @@ glabel EnMu_Draw /* 0064C 80AB0A6C 8DCFFFF8 */ lw $t7, -0x0008($t6) ## 80AB0C3C /* 00650 80AB0A70 AF2FFFF8 */ sw $t7, -0x0008($t9) ## FFFFFFD8 /* 00654 80AB0A74 8DD8FFFC */ lw $t8, -0x0004($t6) ## 80AB0C40 -/* 00658 80AB0A78 15C8FFF8 */ bne $t6, $t0, .L80AB0A5C +/* 00658 80AB0A78 15C8FFF8 */ bne $t6, $t0, .L80AB0A5C /* 0065C 80AB0A7C AF38FFFC */ sw $t8, -0x0004($t9) ## FFFFFFDC /* 00660 80AB0A80 8DD80000 */ lw $t8, 0x0000($t6) ## 80AB0C44 /* 00664 80AB0A84 3C0A80AB */ lui $t2, %hi(D_80AB0C60) ## $t2 = 80AB0000 @@ -41,13 +41,13 @@ glabel EnMu_Draw /* 0068C 80AB0AAC A12C0004 */ sb $t4, 0x0004($t1) ## FFFFFFD0 /* 00690 80AB0AB0 8FC50000 */ lw $a1, 0x0000($s8) ## 00000000 /* 00694 80AB0AB4 24070202 */ addiu $a3, $zero, 0x0202 ## $a3 = 00000202 -/* 00698 80AB0AB8 0C031AB1 */ jal func_800C6AC4 +/* 00698 80AB0AB8 0C031AB1 */ jal Graph_OpenDisps /* 0069C 80AB0ABC 00A09825 */ or $s3, $a1, $zero ## $s3 = 00000000 /* 006A0 80AB0AC0 3C01C496 */ lui $at, 0xC496 ## $at = C4960000 /* 006A4 80AB0AC4 44816000 */ mtc1 $at, $f12 ## $f12 = -1200.00 /* 006A8 80AB0AC8 44807000 */ mtc1 $zero, $f14 ## $f14 = 0.00 /* 006AC 80AB0ACC 3C06C4AF */ lui $a2, 0xC4AF ## $a2 = C4AF0000 -/* 006B0 80AB0AD0 0C034261 */ jal Matrix_Translate +/* 006B0 80AB0AD0 0C034261 */ jal Matrix_Translate /* 006B4 80AB0AD4 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 /* 006B8 80AB0AD8 27B1007C */ addiu $s1, $sp, 0x007C ## $s1 = FFFFFFCC /* 006BC 80AB0ADC 00008025 */ or $s0, $zero, $zero ## $s0 = 00000000 @@ -58,26 +58,26 @@ glabel EnMu_Draw /* 006CC 80AB0AEC 264D0008 */ addiu $t5, $s2, 0x0008 ## $t5 = 00000008 /* 006D0 80AB0AF0 AE6D02C0 */ sw $t5, 0x02C0($s3) ## 000002C0 /* 006D4 80AB0AF4 92280000 */ lbu $t0, 0x0000($s1) ## FFFFFFCC -/* 006D8 80AB0AF8 00087080 */ sll $t6, $t0, 2 +/* 006D8 80AB0AF8 00087080 */ sll $t6, $t0, 2 /* 006DC 80AB0AFC 31D9FFFF */ andi $t9, $t6, 0xFFFF ## $t9 = 00000000 /* 006E0 80AB0B00 03347825 */ or $t7, $t9, $s4 ## $t7 = DB060000 /* 006E4 80AB0B04 AE4F0000 */ sw $t7, 0x0000($s2) ## 00000000 /* 006E8 80AB0B08 86D8001C */ lh $t8, 0x001C($s6) ## 0000001C /* 006EC 80AB0B0C 8FC40000 */ lw $a0, 0x0000($s8) ## 00000000 -/* 006F0 80AB0B10 00184880 */ sll $t1, $t8, 2 -/* 006F4 80AB0B14 01384821 */ addu $t1, $t1, $t8 -/* 006F8 80AB0B18 00094880 */ sll $t1, $t1, 2 -/* 006FC 80AB0B1C 02E95021 */ addu $t2, $s7, $t1 -/* 00700 80AB0B20 01501021 */ addu $v0, $t2, $s0 +/* 006F0 80AB0B10 00184880 */ sll $t1, $t8, 2 +/* 006F4 80AB0B14 01384821 */ addu $t1, $t1, $t8 +/* 006F8 80AB0B18 00094880 */ sll $t1, $t1, 2 +/* 006FC 80AB0B1C 02E95021 */ addu $t2, $s7, $t1 +/* 00700 80AB0B20 01501021 */ addu $v0, $t2, $s0 /* 00704 80AB0B24 904B0003 */ lbu $t3, 0x0003($v0) ## 00000003 /* 00708 80AB0B28 90450000 */ lbu $a1, 0x0000($v0) ## 00000000 /* 0070C 80AB0B2C 90460001 */ lbu $a2, 0x0001($v0) ## 00000001 /* 00710 80AB0B30 90470002 */ lbu $a3, 0x0002($v0) ## 00000002 -/* 00714 80AB0B34 0C2AC26A */ jal func_80AB09A8 -/* 00718 80AB0B38 AFAB0010 */ sw $t3, 0x0010($sp) +/* 00714 80AB0B34 0C2AC26A */ jal func_80AB09A8 +/* 00718 80AB0B38 AFAB0010 */ sw $t3, 0x0010($sp) /* 0071C 80AB0B3C 26100004 */ addiu $s0, $s0, 0x0004 ## $s0 = 00000004 /* 00720 80AB0B40 26310001 */ addiu $s1, $s1, 0x0001 ## $s1 = FFFFFFCD -/* 00724 80AB0B44 1615FFE8 */ bne $s0, $s5, .L80AB0AE8 +/* 00724 80AB0B44 1615FFE8 */ bne $s0, $s5, .L80AB0AE8 /* 00728 80AB0B48 AE420004 */ sw $v0, 0x0004($s2) ## 00000004 /* 0072C 80AB0B4C 8EC50150 */ lw $a1, 0x0150($s6) ## 00000150 /* 00730 80AB0B50 8EC6016C */ lw $a2, 0x016C($s6) ## 0000016C @@ -86,28 +86,28 @@ glabel EnMu_Draw /* 0073C 80AB0B5C 3C0D80AB */ lui $t5, %hi(func_80AB0994) ## $t5 = 80AB0000 /* 00740 80AB0B60 25AD0994 */ addiu $t5, $t5, %lo(func_80AB0994) ## $t5 = 80AB0994 /* 00744 80AB0B64 258C08A4 */ addiu $t4, $t4, %lo(func_80AB08A4) ## $t4 = 80AB08A4 -/* 00748 80AB0B68 AFAC0010 */ sw $t4, 0x0010($sp) -/* 0074C 80AB0B6C AFAD0014 */ sw $t5, 0x0014($sp) -/* 00750 80AB0B70 AFB60018 */ sw $s6, 0x0018($sp) -/* 00754 80AB0B74 0C0286B2 */ jal func_800A1AC8 +/* 00748 80AB0B68 AFAC0010 */ sw $t4, 0x0010($sp) +/* 0074C 80AB0B6C AFAD0014 */ sw $t5, 0x0014($sp) +/* 00750 80AB0B70 AFB60018 */ sw $s6, 0x0018($sp) +/* 00754 80AB0B74 0C0286B2 */ jal SkelAnime_DrawSV /* 00758 80AB0B78 03C02025 */ or $a0, $s8, $zero ## $a0 = 00000000 /* 0075C 80AB0B7C 3C0680AB */ lui $a2, %hi(D_80AB0C80) ## $a2 = 80AB0000 /* 00760 80AB0B80 24C60C80 */ addiu $a2, $a2, %lo(D_80AB0C80) ## $a2 = 80AB0C80 /* 00764 80AB0B84 27A40064 */ addiu $a0, $sp, 0x0064 ## $a0 = FFFFFFB4 /* 00768 80AB0B88 8FC50000 */ lw $a1, 0x0000($s8) ## 00000000 -/* 0076C 80AB0B8C 0C031AD5 */ jal func_800C6B54 +/* 0076C 80AB0B8C 0C031AD5 */ jal Graph_CloseDisps /* 00770 80AB0B90 24070216 */ addiu $a3, $zero, 0x0216 ## $a3 = 00000216 -/* 00774 80AB0B94 8FBF004C */ lw $ra, 0x004C($sp) -/* 00778 80AB0B98 8FB00028 */ lw $s0, 0x0028($sp) -/* 0077C 80AB0B9C 8FB1002C */ lw $s1, 0x002C($sp) -/* 00780 80AB0BA0 8FB20030 */ lw $s2, 0x0030($sp) -/* 00784 80AB0BA4 8FB30034 */ lw $s3, 0x0034($sp) -/* 00788 80AB0BA8 8FB40038 */ lw $s4, 0x0038($sp) -/* 0078C 80AB0BAC 8FB5003C */ lw $s5, 0x003C($sp) -/* 00790 80AB0BB0 8FB60040 */ lw $s6, 0x0040($sp) -/* 00794 80AB0BB4 8FB70044 */ lw $s7, 0x0044($sp) -/* 00798 80AB0BB8 8FBE0048 */ lw $s8, 0x0048($sp) -/* 0079C 80AB0BBC 03E00008 */ jr $ra +/* 00774 80AB0B94 8FBF004C */ lw $ra, 0x004C($sp) +/* 00778 80AB0B98 8FB00028 */ lw $s0, 0x0028($sp) +/* 0077C 80AB0B9C 8FB1002C */ lw $s1, 0x002C($sp) +/* 00780 80AB0BA0 8FB20030 */ lw $s2, 0x0030($sp) +/* 00784 80AB0BA4 8FB30034 */ lw $s3, 0x0034($sp) +/* 00788 80AB0BA8 8FB40038 */ lw $s4, 0x0038($sp) +/* 0078C 80AB0BAC 8FB5003C */ lw $s5, 0x003C($sp) +/* 00790 80AB0BB0 8FB60040 */ lw $s6, 0x0040($sp) +/* 00794 80AB0BB4 8FB70044 */ lw $s7, 0x0044($sp) +/* 00798 80AB0BB8 8FBE0048 */ lw $s8, 0x0048($sp) +/* 0079C 80AB0BBC 03E00008 */ jr $ra /* 007A0 80AB0BC0 27BD00B0 */ addiu $sp, $sp, 0x00B0 ## $sp = 00000000 /* 007A4 80AB0BC4 00000000 */ nop /* 007A8 80AB0BC8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Mu/EnMu_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Mu/EnMu_Init.s index b3f5fa28f0..bb06fb3f36 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Mu/EnMu_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Mu/EnMu_Init.s @@ -1,61 +1,61 @@ glabel EnMu_Init /* 0020C 80AB062C 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 -/* 00210 80AB0630 AFB00028 */ sw $s0, 0x0028($sp) +/* 00210 80AB0630 AFB00028 */ sw $s0, 0x0028($sp) /* 00214 80AB0634 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00218 80AB0638 AFBF002C */ sw $ra, 0x002C($sp) -/* 0021C 80AB063C AFA50044 */ sw $a1, 0x0044($sp) +/* 00218 80AB0638 AFBF002C */ sw $ra, 0x002C($sp) +/* 0021C 80AB063C AFA50044 */ sw $a1, 0x0044($sp) /* 00220 80AB0640 3C068003 */ lui $a2, 0x8003 ## $a2 = 80030000 /* 00224 80AB0644 24C6B5EC */ addiu $a2, $a2, 0xB5EC ## $a2 = 8002B5EC /* 00228 80AB0648 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 /* 0022C 80AB064C 248400B4 */ addiu $a0, $a0, 0x00B4 ## $a0 = 000000B4 /* 00230 80AB0650 0C00AC78 */ jal ActorShape_Init - + /* 00234 80AB0654 3C074320 */ lui $a3, 0x4320 ## $a3 = 43200000 /* 00238 80AB0658 3C060600 */ lui $a2, 0x0600 ## $a2 = 06000000 /* 0023C 80AB065C 3C070600 */ lui $a3, 0x0600 ## $a3 = 06000000 /* 00240 80AB0660 24E703F4 */ addiu $a3, $a3, 0x03F4 ## $a3 = 060003F4 /* 00244 80AB0664 24C64F70 */ addiu $a2, $a2, 0x4F70 ## $a2 = 06004F70 -/* 00248 80AB0668 8FA40044 */ lw $a0, 0x0044($sp) +/* 00248 80AB0668 8FA40044 */ lw $a0, 0x0044($sp) /* 0024C 80AB066C 2605014C */ addiu $a1, $s0, 0x014C ## $a1 = 0000014C -/* 00250 80AB0670 AFA00010 */ sw $zero, 0x0010($sp) -/* 00254 80AB0674 AFA00014 */ sw $zero, 0x0014($sp) -/* 00258 80AB0678 0C0291BE */ jal func_800A46F8 -/* 0025C 80AB067C AFA00018 */ sw $zero, 0x0018($sp) +/* 00250 80AB0670 AFA00010 */ sw $zero, 0x0010($sp) +/* 00254 80AB0674 AFA00014 */ sw $zero, 0x0014($sp) +/* 00258 80AB0678 0C0291BE */ jal SkelAnime_InitSV +/* 0025C 80AB067C AFA00018 */ sw $zero, 0x0018($sp) /* 00260 80AB0680 26050194 */ addiu $a1, $s0, 0x0194 ## $a1 = 00000194 -/* 00264 80AB0684 AFA50034 */ sw $a1, 0x0034($sp) +/* 00264 80AB0684 AFA50034 */ sw $a1, 0x0034($sp) /* 00268 80AB0688 0C0170D9 */ jal ActorCollider_AllocCylinder - -/* 0026C 80AB068C 8FA40044 */ lw $a0, 0x0044($sp) + +/* 0026C 80AB068C 8FA40044 */ lw $a0, 0x0044($sp) /* 00270 80AB0690 3C0780AB */ lui $a3, %hi(D_80AB0BD0) ## $a3 = 80AB0000 -/* 00274 80AB0694 8FA50034 */ lw $a1, 0x0034($sp) +/* 00274 80AB0694 8FA50034 */ lw $a1, 0x0034($sp) /* 00278 80AB0698 24E70BD0 */ addiu $a3, $a3, %lo(D_80AB0BD0) ## $a3 = 80AB0BD0 -/* 0027C 80AB069C 8FA40044 */ lw $a0, 0x0044($sp) +/* 0027C 80AB069C 8FA40044 */ lw $a0, 0x0044($sp) /* 00280 80AB06A0 0C01712B */ jal ActorCollider_InitCylinder - + /* 00284 80AB06A4 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 00288 80AB06A8 3C0680AB */ lui $a2, %hi(D_80AB0BFC) ## $a2 = 80AB0000 /* 0028C 80AB06AC 24C60BFC */ addiu $a2, $a2, %lo(D_80AB0BFC) ## $a2 = 80AB0BFC /* 00290 80AB06B0 26040098 */ addiu $a0, $s0, 0x0098 ## $a0 = 00000098 -/* 00294 80AB06B4 0C0187BF */ jal func_80061EFC +/* 00294 80AB06B4 0C0187BF */ jal func_80061EFC /* 00298 80AB06B8 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 0029C 80AB06BC 240E0006 */ addiu $t6, $zero, 0x0006 ## $t6 = 00000006 /* 002A0 80AB06C0 3C053C23 */ lui $a1, 0x3C23 ## $a1 = 3C230000 /* 002A4 80AB06C4 A20E001F */ sb $t6, 0x001F($s0) ## 0000001F /* 002A8 80AB06C8 34A5D70A */ ori $a1, $a1, 0xD70A ## $a1 = 3C23D70A /* 002AC 80AB06CC 0C00B58B */ jal Actor_SetScale - + /* 002B0 80AB06D0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 002B4 80AB06D4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 002B8 80AB06D8 0C2AC10A */ jal func_80AB0428 -/* 002BC 80AB06DC 8FA50044 */ lw $a1, 0x0044($sp) +/* 002B8 80AB06D8 0C2AC10A */ jal func_80AB0428 +/* 002BC 80AB06DC 8FA50044 */ lw $a1, 0x0044($sp) /* 002C0 80AB06E0 3C0580AB */ lui $a1, %hi(func_80AB0724) ## $a1 = 80AB0000 /* 002C4 80AB06E4 24A50724 */ addiu $a1, $a1, %lo(func_80AB0724) ## $a1 = 80AB0724 -/* 002C8 80AB06E8 0C2AC108 */ jal func_80AB0420 +/* 002C8 80AB06E8 0C2AC108 */ jal func_80AB0420 /* 002CC 80AB06EC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 002D0 80AB06F0 8FBF002C */ lw $ra, 0x002C($sp) -/* 002D4 80AB06F4 8FB00028 */ lw $s0, 0x0028($sp) +/* 002D0 80AB06F0 8FBF002C */ lw $ra, 0x002C($sp) +/* 002D4 80AB06F4 8FB00028 */ lw $s0, 0x0028($sp) /* 002D8 80AB06F8 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 -/* 002DC 80AB06FC 03E00008 */ jr $ra +/* 002DC 80AB06FC 03E00008 */ jr $ra /* 002E0 80AB0700 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Mu/func_80AB0584.s b/asm/non_matchings/overlays/actors/ovl_En_Mu/func_80AB0584.s index c5d06efffc..50515fcfc3 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Mu/func_80AB0584.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Mu/func_80AB0584.s @@ -3,7 +3,7 @@ glabel func_80AB0584 /* 00168 80AB0588 AFBF0014 */ sw $ra, 0x0014($sp) /* 0016C 80AB058C AFA5001C */ sw $a1, 0x001C($sp) /* 00170 80AB0590 84A5001C */ lh $a1, 0x001C($a1) ## 0000001C -/* 00174 80AB0594 0C01B0D8 */ jal func_8006C360 +/* 00174 80AB0594 0C01B0D8 */ jal Text_GetFaceReaction /* 00178 80AB0598 24A5003A */ addiu $a1, $a1, 0x003A ## $a1 = 0000003A /* 0017C 80AB059C 10400003 */ beq $v0, $zero, .L80AB05AC /* 00180 80AB05A0 3043FFFF */ andi $v1, $v0, 0xFFFF ## $v1 = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Nb/EnNb_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Nb/EnNb_Init.s index c4f3998024..2d82452039 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Nb/EnNb_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Nb/EnNb_Init.s @@ -1,82 +1,82 @@ glabel EnNb_Init /* 0313C 80AB3ECC 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 03140 80AB3ED0 AFB10028 */ sw $s1, 0x0028($sp) -/* 03144 80AB3ED4 AFB00024 */ sw $s0, 0x0024($sp) +/* 03140 80AB3ED0 AFB10028 */ sw $s1, 0x0028($sp) +/* 03144 80AB3ED4 AFB00024 */ sw $s0, 0x0024($sp) /* 03148 80AB3ED8 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 0314C 80AB3EDC 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 -/* 03150 80AB3EE0 AFBF002C */ sw $ra, 0x002C($sp) +/* 03150 80AB3EE0 AFBF002C */ sw $ra, 0x002C($sp) /* 03154 80AB3EE4 3C068003 */ lui $a2, 0x8003 ## $a2 = 80030000 /* 03158 80AB3EE8 24C6B5EC */ addiu $a2, $a2, 0xB5EC ## $a2 = 8002B5EC /* 0315C 80AB3EEC 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 /* 03160 80AB3EF0 248400B4 */ addiu $a0, $a0, 0x00B4 ## $a0 = 000000B4 /* 03164 80AB3EF4 0C00AC78 */ jal ActorShape_Init - + /* 03168 80AB3EF8 3C0741F0 */ lui $a3, 0x41F0 ## $a3 = 41F00000 /* 0316C 80AB3EFC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 03170 80AB3F00 0C2AC3C1 */ jal func_80AB0F04 +/* 03170 80AB3F00 0C2AC3C1 */ jal func_80AB0F04 /* 03174 80AB3F04 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 /* 03178 80AB3F08 3C060602 */ lui $a2, 0x0602 ## $a2 = 06020000 /* 0317C 80AB3F0C 260E0190 */ addiu $t6, $s0, 0x0190 ## $t6 = 00000190 /* 03180 80AB3F10 260F0202 */ addiu $t7, $s0, 0x0202 ## $t7 = 00000202 /* 03184 80AB3F14 24180013 */ addiu $t8, $zero, 0x0013 ## $t8 = 00000013 -/* 03188 80AB3F18 AFB80018 */ sw $t8, 0x0018($sp) -/* 0318C 80AB3F1C AFAF0014 */ sw $t7, 0x0014($sp) -/* 03190 80AB3F20 AFAE0010 */ sw $t6, 0x0010($sp) +/* 03188 80AB3F18 AFB80018 */ sw $t8, 0x0018($sp) +/* 0318C 80AB3F1C AFAF0014 */ sw $t7, 0x0014($sp) +/* 03190 80AB3F20 AFAE0010 */ sw $t6, 0x0010($sp) /* 03194 80AB3F24 24C681C8 */ addiu $a2, $a2, 0x81C8 ## $a2 = 060181C8 /* 03198 80AB3F28 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 0319C 80AB3F2C 2605014C */ addiu $a1, $s0, 0x014C ## $a1 = 0000014C -/* 031A0 80AB3F30 0C0291BE */ jal func_800A46F8 +/* 031A0 80AB3F30 0C0291BE */ jal SkelAnime_InitSV /* 031A4 80AB3F34 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 031A8 80AB3F38 0C2AC368 */ jal func_80AB0DA0 +/* 031A8 80AB3F38 0C2AC368 */ jal func_80AB0DA0 /* 031AC 80AB3F3C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 031B0 80AB3F40 2459FFFE */ addiu $t9, $v0, 0xFFFE ## $t9 = FFFFFFFE -/* 031B4 80AB3F44 2F210005 */ sltiu $at, $t9, 0x0005 -/* 031B8 80AB3F48 1020001F */ beq $at, $zero, .L80AB3FC8 -/* 031BC 80AB3F4C 0019C880 */ sll $t9, $t9, 2 +/* 031B4 80AB3F44 2F210005 */ sltiu $at, $t9, 0x0005 +/* 031B8 80AB3F48 1020001F */ beq $at, $zero, .L80AB3FC8 +/* 031BC 80AB3F4C 0019C880 */ sll $t9, $t9, 2 /* 031C0 80AB3F50 3C0180AB */ lui $at, %hi(jtbl_80AB5244) ## $at = 80AB0000 -/* 031C4 80AB3F54 00390821 */ addu $at, $at, $t9 -/* 031C8 80AB3F58 8C395244 */ lw $t9, %lo(jtbl_80AB5244)($at) -/* 031CC 80AB3F5C 03200008 */ jr $t9 +/* 031C4 80AB3F54 00390821 */ addu $at, $at, $t9 +/* 031C8 80AB3F58 8C395244 */ lw $t9, %lo(jtbl_80AB5244)($at) +/* 031CC 80AB3F5C 03200008 */ jr $t9 /* 031D0 80AB3F60 00000000 */ nop glabel L80AB3F64 /* 031D4 80AB3F64 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 031D8 80AB3F68 0C2AC68B */ jal func_80AB1A2C +/* 031D8 80AB3F68 0C2AC68B */ jal func_80AB1A2C /* 031DC 80AB3F6C 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 031E0 80AB3F70 10000019 */ beq $zero, $zero, .L80AB3FD8 -/* 031E4 80AB3F74 8FBF002C */ lw $ra, 0x002C($sp) +/* 031E0 80AB3F70 10000019 */ beq $zero, $zero, .L80AB3FD8 +/* 031E4 80AB3F74 8FBF002C */ lw $ra, 0x002C($sp) glabel L80AB3F78 /* 031E8 80AB3F78 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 031EC 80AB3F7C 0C2AC7E9 */ jal func_80AB1FA4 +/* 031EC 80AB3F7C 0C2AC7E9 */ jal func_80AB1FA4 /* 031F0 80AB3F80 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 031F4 80AB3F84 10000014 */ beq $zero, $zero, .L80AB3FD8 -/* 031F8 80AB3F88 8FBF002C */ lw $ra, 0x002C($sp) +/* 031F4 80AB3F84 10000014 */ beq $zero, $zero, .L80AB3FD8 +/* 031F8 80AB3F88 8FBF002C */ lw $ra, 0x002C($sp) glabel L80AB3F8C /* 031FC 80AB3F8C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 03200 80AB3F90 0C2AC921 */ jal func_80AB2484 +/* 03200 80AB3F90 0C2AC921 */ jal func_80AB2484 /* 03204 80AB3F94 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 03208 80AB3F98 1000000F */ beq $zero, $zero, .L80AB3FD8 -/* 0320C 80AB3F9C 8FBF002C */ lw $ra, 0x002C($sp) +/* 03208 80AB3F98 1000000F */ beq $zero, $zero, .L80AB3FD8 +/* 0320C 80AB3F9C 8FBF002C */ lw $ra, 0x002C($sp) glabel L80AB3FA0 /* 03210 80AB3FA0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 03214 80AB3FA4 0C2ACC54 */ jal func_80AB3150 +/* 03214 80AB3FA4 0C2ACC54 */ jal func_80AB3150 /* 03218 80AB3FA8 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 0321C 80AB3FAC 1000000A */ beq $zero, $zero, .L80AB3FD8 -/* 03220 80AB3FB0 8FBF002C */ lw $ra, 0x002C($sp) +/* 0321C 80AB3FAC 1000000A */ beq $zero, $zero, .L80AB3FD8 +/* 03220 80AB3FB0 8FBF002C */ lw $ra, 0x002C($sp) glabel L80AB3FB4 /* 03224 80AB3FB4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 03228 80AB3FB8 0C2ACD2A */ jal func_80AB34A8 +/* 03228 80AB3FB8 0C2ACD2A */ jal func_80AB34A8 /* 0322C 80AB3FBC 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 03230 80AB3FC0 10000005 */ beq $zero, $zero, .L80AB3FD8 -/* 03234 80AB3FC4 8FBF002C */ lw $ra, 0x002C($sp) +/* 03230 80AB3FC0 10000005 */ beq $zero, $zero, .L80AB3FD8 +/* 03234 80AB3FC4 8FBF002C */ lw $ra, 0x002C($sp) .L80AB3FC8: /* 03238 80AB3FC8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0323C 80AB3FCC 0C2AC54C */ jal func_80AB1530 +/* 0323C 80AB3FCC 0C2AC54C */ jal func_80AB1530 /* 03240 80AB3FD0 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 03244 80AB3FD4 8FBF002C */ lw $ra, 0x002C($sp) +/* 03244 80AB3FD4 8FBF002C */ lw $ra, 0x002C($sp) .L80AB3FD8: -/* 03248 80AB3FD8 8FB00024 */ lw $s0, 0x0024($sp) -/* 0324C 80AB3FDC 8FB10028 */ lw $s1, 0x0028($sp) -/* 03250 80AB3FE0 03E00008 */ jr $ra +/* 03248 80AB3FD8 8FB00024 */ lw $s0, 0x0024($sp) +/* 0324C 80AB3FDC 8FB10028 */ lw $s1, 0x0028($sp) +/* 03250 80AB3FE0 03E00008 */ jr $ra /* 03254 80AB3FE4 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB0DAC.s b/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB0DAC.s index e37a53c950..1883cd8de6 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB0DAC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB0DAC.s @@ -62,7 +62,7 @@ glabel func_80AB0DAC /* 0010C 80AB0E9C 468084A0 */ cvt.s.w $f18, $f16 /* 00110 80AB0EA0 E4D202F8 */ swc1 $f18, 0x02F8($a2) ## 000002F8 /* 00114 80AB0EA4 C4C802F8 */ lwc1 $f8, 0x02F8($a2) ## 000002F8 -/* 00118 80AB0EA8 0C03F494 */ jal func_800FD250 +/* 00118 80AB0EA8 0C03F494 */ jal Math_atan2f /* 0011C 80AB0EAC 460A4381 */ sub.s $f14, $f8, $f10 /* 00120 80AB0EB0 3C0180AB */ lui $at, %hi(D_80AB5200) ## $at = 80AB0000 /* 00124 80AB0EB4 C4305200 */ lwc1 $f16, %lo(D_80AB5200)($at) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB14A0.s b/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB14A0.s index d35686f6d3..45604b02f0 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB14A0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB14A0.s @@ -1,43 +1,43 @@ glabel func_80AB14A0 /* 00710 80AB14A0 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 00714 80AB14A4 AFBF0024 */ sw $ra, 0x0024($sp) -/* 00718 80AB14A8 AFA40028 */ sw $a0, 0x0028($sp) -/* 0071C 80AB14AC AFA5002C */ sw $a1, 0x002C($sp) -/* 00720 80AB14B0 AFA60030 */ sw $a2, 0x0030($sp) -/* 00724 80AB14B4 AFA70034 */ sw $a3, 0x0034($sp) +/* 00714 80AB14A4 AFBF0024 */ sw $ra, 0x0024($sp) +/* 00718 80AB14A8 AFA40028 */ sw $a0, 0x0028($sp) +/* 0071C 80AB14AC AFA5002C */ sw $a1, 0x002C($sp) +/* 00720 80AB14B0 AFA60030 */ sw $a2, 0x0030($sp) +/* 00724 80AB14B4 AFA70034 */ sw $a3, 0x0034($sp) /* 00728 80AB14B8 0C028800 */ jal SkelAnime_GetFrameCount - + /* 0072C 80AB14BC 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 00730 80AB14C0 8FAE0038 */ lw $t6, 0x0038($sp) -/* 00734 80AB14C4 8FA40028 */ lw $a0, 0x0028($sp) -/* 00738 80AB14C8 8FA5002C */ lw $a1, 0x002C($sp) -/* 0073C 80AB14CC 15C00007 */ bne $t6, $zero, .L80AB14EC +/* 00730 80AB14C0 8FAE0038 */ lw $t6, 0x0038($sp) +/* 00734 80AB14C4 8FA40028 */ lw $a0, 0x0028($sp) +/* 00738 80AB14C8 8FA5002C */ lw $a1, 0x002C($sp) +/* 0073C 80AB14CC 15C00007 */ bne $t6, $zero, .L80AB14EC /* 00740 80AB14D0 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C /* 00744 80AB14D4 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 00748 80AB14D8 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 /* 0074C 80AB14DC 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 /* 00750 80AB14E0 44816000 */ mtc1 $at, $f12 ## $f12 = 1.00 -/* 00754 80AB14E4 10000006 */ beq $zero, $zero, .L80AB1500 -/* 00758 80AB14E8 468020A0 */ cvt.s.w $f2, $f4 +/* 00754 80AB14E4 10000006 */ beq $zero, $zero, .L80AB1500 +/* 00758 80AB14E8 468020A0 */ cvt.s.w $f2, $f4 .L80AB14EC: /* 0075C 80AB14EC 44823000 */ mtc1 $v0, $f6 ## $f6 = 0.00 /* 00760 80AB14F0 3C01BF80 */ lui $at, 0xBF80 ## $at = BF800000 /* 00764 80AB14F4 44801000 */ mtc1 $zero, $f2 ## $f2 = 0.00 /* 00768 80AB14F8 44816000 */ mtc1 $at, $f12 ## $f12 = -1.00 -/* 0076C 80AB14FC 46803020 */ cvt.s.w $f0, $f6 +/* 0076C 80AB14FC 46803020 */ cvt.s.w $f0, $f6 .L80AB1500: -/* 00770 80AB1500 93AF0033 */ lbu $t7, 0x0033($sp) -/* 00774 80AB1504 C7A80034 */ lwc1 $f8, 0x0034($sp) -/* 00778 80AB1508 44066000 */ mfc1 $a2, $f12 -/* 0077C 80AB150C 44070000 */ mfc1 $a3, $f0 -/* 00780 80AB1510 E7A20010 */ swc1 $f2, 0x0010($sp) -/* 00784 80AB1514 AFAF0014 */ sw $t7, 0x0014($sp) -/* 00788 80AB1518 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 0078C 80AB151C E7A80018 */ swc1 $f8, 0x0018($sp) -/* 00790 80AB1520 8FBF0024 */ lw $ra, 0x0024($sp) +/* 00770 80AB1500 93AF0033 */ lbu $t7, 0x0033($sp) +/* 00774 80AB1504 C7A80034 */ lwc1 $f8, 0x0034($sp) +/* 00778 80AB1508 44066000 */ mfc1 $a2, $f12 +/* 0077C 80AB150C 44070000 */ mfc1 $a3, $f0 +/* 00780 80AB1510 E7A20010 */ swc1 $f2, 0x0010($sp) +/* 00784 80AB1514 AFAF0014 */ sw $t7, 0x0014($sp) +/* 00788 80AB1518 0C029468 */ jal SkelAnime_ChangeAnim + +/* 0078C 80AB151C E7A80018 */ swc1 $f8, 0x0018($sp) +/* 00790 80AB1520 8FBF0024 */ lw $ra, 0x0024($sp) /* 00794 80AB1524 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 00798 80AB1528 03E00008 */ jr $ra +/* 00798 80AB1528 03E00008 */ jr $ra /* 0079C 80AB152C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB1778.s b/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB1778.s index 2945eda073..d72e52c881 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB1778.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB1778.s @@ -1,43 +1,43 @@ glabel func_80AB1778 /* 009E8 80AB1778 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 009EC 80AB177C AFBF0024 */ sw $ra, 0x0024($sp) -/* 009F0 80AB1780 AFA40028 */ sw $a0, 0x0028($sp) +/* 009EC 80AB177C AFBF0024 */ sw $ra, 0x0024($sp) +/* 009F0 80AB1780 AFA40028 */ sw $a0, 0x0028($sp) /* 009F4 80AB1784 90AE1D6C */ lbu $t6, 0x1D6C($a1) ## 00001D6C -/* 009F8 80AB1788 51C0001D */ beql $t6, $zero, .L80AB1800 -/* 009FC 80AB178C 8FBF0024 */ lw $ra, 0x0024($sp) +/* 009F8 80AB1788 51C0001D */ beql $t6, $zero, .L80AB1800 +/* 009FC 80AB178C 8FBF0024 */ lw $ra, 0x0024($sp) /* 00A00 80AB1790 8CA21D90 */ lw $v0, 0x1D90($a1) ## 00001D90 -/* 00A04 80AB1794 5040001A */ beql $v0, $zero, .L80AB1800 -/* 00A08 80AB1798 8FBF0024 */ lw $ra, 0x0024($sp) +/* 00A04 80AB1794 5040001A */ beql $v0, $zero, .L80AB1800 +/* 00A08 80AB1798 8FBF0024 */ lw $ra, 0x0024($sp) /* 00A0C 80AB179C 944F0000 */ lhu $t7, 0x0000($v0) ## 00000000 /* 00A10 80AB17A0 24010003 */ addiu $at, $zero, 0x0003 ## $at = 00000003 /* 00A14 80AB17A4 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 -/* 00A18 80AB17A8 55E10015 */ bnel $t7, $at, .L80AB1800 -/* 00A1C 80AB17AC 8FBF0024 */ lw $ra, 0x0024($sp) +/* 00A18 80AB17A8 55E10015 */ bnel $t7, $at, .L80AB1800 +/* 00A1C 80AB17AC 8FBF0024 */ lw $ra, 0x0024($sp) /* 00A20 80AB17B0 0C028800 */ jal SkelAnime_GetFrameCount - + /* 00A24 80AB17B4 2484274C */ addiu $a0, $a0, 0x274C ## $a0 = 0600274C /* 00A28 80AB17B8 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 00A2C 80AB17BC 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 00A30 80AB17C0 8FA40028 */ lw $a0, 0x0028($sp) -/* 00A34 80AB17C4 468021A0 */ cvt.s.w $f6, $f4 +/* 00A30 80AB17C0 8FA40028 */ lw $a0, 0x0028($sp) +/* 00A34 80AB17C4 468021A0 */ cvt.s.w $f6, $f4 /* 00A38 80AB17C8 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 00A3C 80AB17CC 24180002 */ addiu $t8, $zero, 0x0002 ## $t8 = 00000002 -/* 00A40 80AB17D0 44070000 */ mfc1 $a3, $f0 -/* 00A44 80AB17D4 AFB80014 */ sw $t8, 0x0014($sp) +/* 00A40 80AB17D0 44070000 */ mfc1 $a3, $f0 +/* 00A44 80AB17D4 AFB80014 */ sw $t8, 0x0014($sp) /* 00A48 80AB17D8 24A5274C */ addiu $a1, $a1, 0x274C ## $a1 = 0600274C -/* 00A4C 80AB17DC E7A60010 */ swc1 $f6, 0x0010($sp) +/* 00A4C 80AB17DC E7A60010 */ swc1 $f6, 0x0010($sp) /* 00A50 80AB17E0 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 00A54 80AB17E4 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 00A58 80AB17E8 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 00A5C 80AB17EC E7A00018 */ swc1 $f0, 0x0018($sp) -/* 00A60 80AB17F0 8FA80028 */ lw $t0, 0x0028($sp) +/* 00A58 80AB17E8 0C029468 */ jal SkelAnime_ChangeAnim + +/* 00A5C 80AB17EC E7A00018 */ swc1 $f0, 0x0018($sp) +/* 00A60 80AB17F0 8FA80028 */ lw $t0, 0x0028($sp) /* 00A64 80AB17F4 24190004 */ addiu $t9, $zero, 0x0004 ## $t9 = 00000004 /* 00A68 80AB17F8 AD190278 */ sw $t9, 0x0278($t0) ## 00000278 -/* 00A6C 80AB17FC 8FBF0024 */ lw $ra, 0x0024($sp) +/* 00A6C 80AB17FC 8FBF0024 */ lw $ra, 0x0024($sp) .L80AB1800: /* 00A70 80AB1800 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 00A74 80AB1804 03E00008 */ jr $ra +/* 00A74 80AB1804 03E00008 */ jr $ra /* 00A78 80AB1808 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB180C.s b/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB180C.s index d0a040c682..56605f2f73 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB180C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB180C.s @@ -1,33 +1,33 @@ glabel func_80AB180C /* 00A7C 80AB180C 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 00A80 80AB1810 AFBF0024 */ sw $ra, 0x0024($sp) -/* 00A84 80AB1814 10A00014 */ beq $a1, $zero, .L80AB1868 -/* 00A88 80AB1818 AFA40028 */ sw $a0, 0x0028($sp) +/* 00A80 80AB1810 AFBF0024 */ sw $ra, 0x0024($sp) +/* 00A84 80AB1814 10A00014 */ beq $a1, $zero, .L80AB1868 +/* 00A88 80AB1818 AFA40028 */ sw $a0, 0x0028($sp) /* 00A8C 80AB181C 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 /* 00A90 80AB1820 0C028800 */ jal SkelAnime_GetFrameCount - + /* 00A94 80AB1824 24842B4C */ addiu $a0, $a0, 0x2B4C ## $a0 = 06002B4C /* 00A98 80AB1828 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 00A9C 80AB182C 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 00AA0 80AB1830 8FA40028 */ lw $a0, 0x0028($sp) -/* 00AA4 80AB1834 468021A0 */ cvt.s.w $f6, $f4 +/* 00AA0 80AB1830 8FA40028 */ lw $a0, 0x0028($sp) +/* 00AA4 80AB1834 468021A0 */ cvt.s.w $f6, $f4 /* 00AA8 80AB1838 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 00AAC 80AB183C 44070000 */ mfc1 $a3, $f0 +/* 00AAC 80AB183C 44070000 */ mfc1 $a3, $f0 /* 00AB0 80AB1840 24A52B4C */ addiu $a1, $a1, 0x2B4C ## $a1 = 06002B4C /* 00AB4 80AB1844 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 00AB8 80AB1848 AFA00014 */ sw $zero, 0x0014($sp) -/* 00ABC 80AB184C E7A60010 */ swc1 $f6, 0x0010($sp) +/* 00AB8 80AB1848 AFA00014 */ sw $zero, 0x0014($sp) +/* 00ABC 80AB184C E7A60010 */ swc1 $f6, 0x0010($sp) /* 00AC0 80AB1850 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 00AC4 80AB1854 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 00AC8 80AB1858 E7A00018 */ swc1 $f0, 0x0018($sp) -/* 00ACC 80AB185C 8FAF0028 */ lw $t7, 0x0028($sp) +/* 00AC4 80AB1854 0C029468 */ jal SkelAnime_ChangeAnim + +/* 00AC8 80AB1858 E7A00018 */ swc1 $f0, 0x0018($sp) +/* 00ACC 80AB185C 8FAF0028 */ lw $t7, 0x0028($sp) /* 00AD0 80AB1860 240E0005 */ addiu $t6, $zero, 0x0005 ## $t6 = 00000005 /* 00AD4 80AB1864 ADEE0278 */ sw $t6, 0x0278($t7) ## 00000278 .L80AB1868: -/* 00AD8 80AB1868 8FBF0024 */ lw $ra, 0x0024($sp) +/* 00AD8 80AB1868 8FBF0024 */ lw $ra, 0x0024($sp) /* 00ADC 80AB186C 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 00AE0 80AB1870 03E00008 */ jr $ra +/* 00AE0 80AB1870 03E00008 */ jr $ra /* 00AE4 80AB1874 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB1E2C.s b/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB1E2C.s index 6436871088..8b105bef02 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB1E2C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB1E2C.s @@ -1,45 +1,45 @@ glabel func_80AB1E2C /* 0109C 80AB1E2C 27BDFF88 */ addiu $sp, $sp, 0xFF88 ## $sp = FFFFFF88 -/* 010A0 80AB1E30 AFBF002C */ sw $ra, 0x002C($sp) -/* 010A4 80AB1E34 AFB00028 */ sw $s0, 0x0028($sp) -/* 010A8 80AB1E38 AFA40078 */ sw $a0, 0x0078($sp) -/* 010AC 80AB1E3C AFA5007C */ sw $a1, 0x007C($sp) +/* 010A0 80AB1E30 AFBF002C */ sw $ra, 0x002C($sp) +/* 010A4 80AB1E34 AFB00028 */ sw $s0, 0x0028($sp) +/* 010A8 80AB1E38 AFA40078 */ sw $a0, 0x0078($sp) +/* 010AC 80AB1E3C AFA5007C */ sw $a1, 0x007C($sp) /* 010B0 80AB1E40 84820274 */ lh $v0, 0x0274($a0) ## 00000274 /* 010B4 80AB1E44 3C1880AB */ lui $t8, %hi(D_80AB430C) ## $t8 = 80AB0000 /* 010B8 80AB1E48 3C0680AB */ lui $a2, %hi(D_80AB5010) ## $a2 = 80AB0000 -/* 010BC 80AB1E4C 00027880 */ sll $t7, $v0, 2 -/* 010C0 80AB1E50 030FC021 */ addu $t8, $t8, $t7 -/* 010C4 80AB1E54 8F18430C */ lw $t8, %lo(D_80AB430C)($t8) +/* 010BC 80AB1E4C 00027880 */ sll $t7, $v0, 2 +/* 010C0 80AB1E50 030FC021 */ addu $t8, $t8, $t7 +/* 010C4 80AB1E54 8F18430C */ lw $t8, %lo(D_80AB430C)($t8) /* 010C8 80AB1E58 24C65010 */ addiu $a2, $a2, %lo(D_80AB5010) ## $a2 = 80AB5010 /* 010CC 80AB1E5C 27A40050 */ addiu $a0, $sp, 0x0050 ## $a0 = FFFFFFD8 -/* 010D0 80AB1E60 AFB80068 */ sw $t8, 0x0068($sp) +/* 010D0 80AB1E60 AFB80068 */ sw $t8, 0x0068($sp) /* 010D4 80AB1E64 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 /* 010D8 80AB1E68 24070107 */ addiu $a3, $zero, 0x0107 ## $a3 = 00000107 -/* 010DC 80AB1E6C 0C031AB1 */ jal func_800C6AC4 +/* 010DC 80AB1E6C 0C031AB1 */ jal Graph_OpenDisps /* 010E0 80AB1E70 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 -/* 010E4 80AB1E74 8FA9007C */ lw $t1, 0x007C($sp) -/* 010E8 80AB1E78 0C024F61 */ jal func_80093D84 +/* 010E4 80AB1E74 8FA9007C */ lw $t1, 0x007C($sp) +/* 010E8 80AB1E78 0C024F61 */ jal func_80093D84 /* 010EC 80AB1E7C 8D240000 */ lw $a0, 0x0000($t1) ## 00000000 -/* 010F0 80AB1E80 8FA70068 */ lw $a3, 0x0068($sp) +/* 010F0 80AB1E80 8FA70068 */ lw $a3, 0x0068($sp) /* 010F4 80AB1E84 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 /* 010F8 80AB1E88 3C0BDB06 */ lui $t3, 0xDB06 ## $t3 = DB060000 -/* 010FC 80AB1E8C 00076100 */ sll $t4, $a3, 4 -/* 01100 80AB1E90 000C6F02 */ srl $t5, $t4, 28 +/* 010FC 80AB1E8C 00076100 */ sll $t4, $a3, 4 +/* 01100 80AB1E90 000C6F02 */ srl $t5, $t4, 28 /* 01104 80AB1E94 3C0F8016 */ lui $t7, 0x8016 ## $t7 = 80160000 /* 01108 80AB1E98 244A0008 */ addiu $t2, $v0, 0x0008 ## $t2 = 00000008 /* 0110C 80AB1E9C AE0A02D0 */ sw $t2, 0x02D0($s0) ## 000002D0 /* 01110 80AB1EA0 25EF6FA8 */ addiu $t7, $t7, 0x6FA8 ## $t7 = 80166FA8 -/* 01114 80AB1EA4 000D7080 */ sll $t6, $t5, 2 +/* 01114 80AB1EA4 000D7080 */ sll $t6, $t5, 2 /* 01118 80AB1EA8 356B0020 */ ori $t3, $t3, 0x0020 ## $t3 = DB060020 -/* 0111C 80AB1EAC 01CF2021 */ addu $a0, $t6, $t7 +/* 0111C 80AB1EAC 01CF2021 */ addu $a0, $t6, $t7 /* 01120 80AB1EB0 AC4B0000 */ sw $t3, 0x0000($v0) ## 00000000 /* 01124 80AB1EB4 8C980000 */ lw $t8, 0x0000($a0) ## 00000000 /* 01128 80AB1EB8 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 /* 0112C 80AB1EBC 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF -/* 01130 80AB1EC0 00E12824 */ and $a1, $a3, $at +/* 01130 80AB1EC0 00E12824 */ and $a1, $a3, $at /* 01134 80AB1EC4 3C068000 */ lui $a2, 0x8000 ## $a2 = 80000000 -/* 01138 80AB1EC8 0305C821 */ addu $t9, $t8, $a1 -/* 0113C 80AB1ECC 03264821 */ addu $t1, $t9, $a2 +/* 01138 80AB1EC8 0305C821 */ addu $t9, $t8, $a1 +/* 0113C 80AB1ECC 03264821 */ addu $t1, $t9, $a2 /* 01140 80AB1ED0 AC490004 */ sw $t1, 0x0004($v0) ## 00000004 /* 01144 80AB1ED4 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 /* 01148 80AB1ED8 3C0BDB06 */ lui $t3, 0xDB06 ## $t3 = DB060000 @@ -50,11 +50,11 @@ glabel func_80AB1E2C /* 0115C 80AB1EEC 8C8C0000 */ lw $t4, 0x0000($a0) ## 00000000 /* 01160 80AB1EF0 3C18FB00 */ lui $t8, 0xFB00 ## $t8 = FB000000 /* 01164 80AB1EF4 3C0BDB06 */ lui $t3, 0xDB06 ## $t3 = DB060000 -/* 01168 80AB1EF8 01856821 */ addu $t5, $t4, $a1 -/* 0116C 80AB1EFC 01A67021 */ addu $t6, $t5, $a2 +/* 01168 80AB1EF8 01856821 */ addu $t5, $t4, $a1 +/* 0116C 80AB1EFC 01A67021 */ addu $t6, $t5, $a2 /* 01170 80AB1F00 AC4E0004 */ sw $t6, 0x0004($v0) ## 00000004 /* 01174 80AB1F04 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 01178 80AB1F08 8FA80078 */ lw $t0, 0x0078($sp) +/* 01178 80AB1F08 8FA80078 */ lw $t0, 0x0078($sp) /* 0117C 80AB1F0C 3C0C8011 */ lui $t4, 0x8011 ## $t4 = 80110000 /* 01180 80AB1F10 244F0008 */ addiu $t7, $v0, 0x0008 ## $t7 = 00000008 /* 01184 80AB1F14 AE0F02D0 */ sw $t7, 0x02D0($s0) ## 000002D0 @@ -73,25 +73,25 @@ glabel func_80AB1E2C /* 011B8 80AB1F48 8C450004 */ lw $a1, 0x0004($v0) ## 00000150 /* 011BC 80AB1F4C 8C460020 */ lw $a2, 0x0020($v0) ## 0000016C /* 011C0 80AB1F50 90470002 */ lbu $a3, 0x0002($v0) ## 0000014E -/* 011C4 80AB1F54 AFA00018 */ sw $zero, 0x0018($sp) -/* 011C8 80AB1F58 AFA00014 */ sw $zero, 0x0014($sp) -/* 011CC 80AB1F5C AFA00010 */ sw $zero, 0x0010($sp) +/* 011C4 80AB1F54 AFA00018 */ sw $zero, 0x0018($sp) +/* 011C8 80AB1F58 AFA00014 */ sw $zero, 0x0014($sp) +/* 011CC 80AB1F5C AFA00010 */ sw $zero, 0x0010($sp) /* 011D0 80AB1F60 8E0D02D0 */ lw $t5, 0x02D0($s0) ## 000002D0 -/* 011D4 80AB1F64 8FA4007C */ lw $a0, 0x007C($sp) -/* 011D8 80AB1F68 0C0289CF */ jal func_800A273C -/* 011DC 80AB1F6C AFAD001C */ sw $t5, 0x001C($sp) +/* 011D4 80AB1F64 8FA4007C */ lw $a0, 0x007C($sp) +/* 011D8 80AB1F68 0C0289CF */ jal SkelAnime_DrawSV2 +/* 011DC 80AB1F6C AFAD001C */ sw $t5, 0x001C($sp) /* 011E0 80AB1F70 AE0202D0 */ sw $v0, 0x02D0($s0) ## 000002D0 -/* 011E4 80AB1F74 8FAE007C */ lw $t6, 0x007C($sp) +/* 011E4 80AB1F74 8FAE007C */ lw $t6, 0x007C($sp) /* 011E8 80AB1F78 3C0680AB */ lui $a2, %hi(D_80AB5030) ## $a2 = 80AB0000 /* 011EC 80AB1F7C 24C65030 */ addiu $a2, $a2, %lo(D_80AB5030) ## $a2 = 80AB5030 /* 011F0 80AB1F80 27A40050 */ addiu $a0, $sp, 0x0050 ## $a0 = FFFFFFD8 /* 011F4 80AB1F84 24070122 */ addiu $a3, $zero, 0x0122 ## $a3 = 00000122 -/* 011F8 80AB1F88 0C031AD5 */ jal func_800C6B54 +/* 011F8 80AB1F88 0C031AD5 */ jal Graph_CloseDisps /* 011FC 80AB1F8C 8DC50000 */ lw $a1, 0x0000($t6) ## 00000000 -/* 01200 80AB1F90 8FBF002C */ lw $ra, 0x002C($sp) -/* 01204 80AB1F94 8FB00028 */ lw $s0, 0x0028($sp) +/* 01200 80AB1F90 8FBF002C */ lw $ra, 0x002C($sp) +/* 01204 80AB1F94 8FB00028 */ lw $s0, 0x0028($sp) /* 01208 80AB1F98 27BD0078 */ addiu $sp, $sp, 0x0078 ## $sp = 00000000 -/* 0120C 80AB1F9C 03E00008 */ jr $ra +/* 0120C 80AB1F9C 03E00008 */ jr $ra /* 01210 80AB1FA0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB2180.s b/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB2180.s index e760170aff..8d619ac7df 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB2180.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB2180.s @@ -1,30 +1,30 @@ glabel func_80AB2180 /* 013F0 80AB2180 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 013F4 80AB2184 AFBF0024 */ sw $ra, 0x0024($sp) -/* 013F8 80AB2188 10A00011 */ beq $a1, $zero, .L80AB21D0 -/* 013FC 80AB218C AFA40028 */ sw $a0, 0x0028($sp) +/* 013F4 80AB2184 AFBF0024 */ sw $ra, 0x0024($sp) +/* 013F8 80AB2188 10A00011 */ beq $a1, $zero, .L80AB21D0 +/* 013FC 80AB218C AFA40028 */ sw $a0, 0x0028($sp) /* 01400 80AB2190 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 /* 01404 80AB2194 0C028800 */ jal SkelAnime_GetFrameCount - + /* 01408 80AB2198 24841350 */ addiu $a0, $a0, 0x1350 ## $a0 = 06001350 /* 0140C 80AB219C 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 01410 80AB21A0 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 01414 80AB21A4 8FA40028 */ lw $a0, 0x0028($sp) -/* 01418 80AB21A8 468021A0 */ cvt.s.w $f6, $f4 +/* 01414 80AB21A4 8FA40028 */ lw $a0, 0x0028($sp) +/* 01418 80AB21A8 468021A0 */ cvt.s.w $f6, $f4 /* 0141C 80AB21AC 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 01420 80AB21B0 44070000 */ mfc1 $a3, $f0 +/* 01420 80AB21B0 44070000 */ mfc1 $a3, $f0 /* 01424 80AB21B4 24A51350 */ addiu $a1, $a1, 0x1350 ## $a1 = 06001350 /* 01428 80AB21B8 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 0142C 80AB21BC AFA00014 */ sw $zero, 0x0014($sp) -/* 01430 80AB21C0 E7A60010 */ swc1 $f6, 0x0010($sp) +/* 0142C 80AB21BC AFA00014 */ sw $zero, 0x0014($sp) +/* 01430 80AB21C0 E7A60010 */ swc1 $f6, 0x0010($sp) /* 01434 80AB21C4 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 01438 80AB21C8 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 0143C 80AB21CC E7A00018 */ swc1 $f0, 0x0018($sp) +/* 01438 80AB21C8 0C029468 */ jal SkelAnime_ChangeAnim + +/* 0143C 80AB21CC E7A00018 */ swc1 $f0, 0x0018($sp) .L80AB21D0: -/* 01440 80AB21D0 8FBF0024 */ lw $ra, 0x0024($sp) +/* 01440 80AB21D0 8FBF0024 */ lw $ra, 0x0024($sp) /* 01444 80AB21D4 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 01448 80AB21D8 03E00008 */ jr $ra +/* 01448 80AB21D8 03E00008 */ jr $ra /* 0144C 80AB21DC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB21E0.s b/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB21E0.s index ecf7ae0d27..a215469afc 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB21E0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB21E0.s @@ -1,34 +1,34 @@ glabel func_80AB21E0 /* 01450 80AB21E0 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 01454 80AB21E4 AFA40028 */ sw $a0, 0x0028($sp) -/* 01458 80AB21E8 AFBF0024 */ sw $ra, 0x0024($sp) +/* 01454 80AB21E4 AFA40028 */ sw $a0, 0x0028($sp) +/* 01458 80AB21E8 AFBF0024 */ sw $ra, 0x0024($sp) /* 0145C 80AB21EC 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 /* 01460 80AB21F0 0C028800 */ jal SkelAnime_GetFrameCount - + /* 01464 80AB21F4 24841E7C */ addiu $a0, $a0, 0x1E7C ## $a0 = 06001E7C /* 01468 80AB21F8 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 0146C 80AB21FC 3C01C100 */ lui $at, 0xC100 ## $at = C1000000 /* 01470 80AB2200 44814000 */ mtc1 $at, $f8 ## $f8 = -8.00 -/* 01474 80AB2204 468021A0 */ cvt.s.w $f6, $f4 -/* 01478 80AB2208 8FA40028 */ lw $a0, 0x0028($sp) +/* 01474 80AB2204 468021A0 */ cvt.s.w $f6, $f4 +/* 01478 80AB2208 8FA40028 */ lw $a0, 0x0028($sp) /* 0147C 80AB220C 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 01480 80AB2210 24A51E7C */ addiu $a1, $a1, 0x1E7C ## $a1 = 06001E7C /* 01484 80AB2214 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 01488 80AB2218 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 0148C 80AB221C E7A60010 */ swc1 $f6, 0x0010($sp) -/* 01490 80AB2220 AFA00014 */ sw $zero, 0x0014($sp) -/* 01494 80AB2224 E7A80018 */ swc1 $f8, 0x0018($sp) -/* 01498 80AB2228 0C029468 */ jal SkelAnime_ChangeAnimation - +/* 0148C 80AB221C E7A60010 */ swc1 $f6, 0x0010($sp) +/* 01490 80AB2220 AFA00014 */ sw $zero, 0x0014($sp) +/* 01494 80AB2224 E7A80018 */ swc1 $f8, 0x0018($sp) +/* 01498 80AB2228 0C029468 */ jal SkelAnime_ChangeAnim + /* 0149C 80AB222C 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 014A0 80AB2230 8FA20028 */ lw $v0, 0x0028($sp) +/* 014A0 80AB2230 8FA20028 */ lw $v0, 0x0028($sp) /* 014A4 80AB2234 240E000B */ addiu $t6, $zero, 0x000B ## $t6 = 0000000B /* 014A8 80AB2238 240F0001 */ addiu $t7, $zero, 0x0001 ## $t7 = 00000001 /* 014AC 80AB223C AC4E0278 */ sw $t6, 0x0278($v0) ## 00000278 /* 014B0 80AB2240 AC4F027C */ sw $t7, 0x027C($v0) ## 0000027C -/* 014B4 80AB2244 8FBF0024 */ lw $ra, 0x0024($sp) +/* 014B4 80AB2244 8FBF0024 */ lw $ra, 0x0024($sp) /* 014B8 80AB2248 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 014BC 80AB224C 03E00008 */ jr $ra +/* 014BC 80AB224C 03E00008 */ jr $ra /* 014C0 80AB2250 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB2254.s b/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB2254.s index 9ff79528d0..a440213222 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB2254.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB2254.s @@ -1,35 +1,35 @@ glabel func_80AB2254 /* 014C4 80AB2254 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 014C8 80AB2258 AFA40028 */ sw $a0, 0x0028($sp) -/* 014CC 80AB225C AFBF0024 */ sw $ra, 0x0024($sp) +/* 014C8 80AB2258 AFA40028 */ sw $a0, 0x0028($sp) +/* 014CC 80AB225C AFBF0024 */ sw $ra, 0x0024($sp) /* 014D0 80AB2260 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 /* 014D4 80AB2264 0C028800 */ jal SkelAnime_GetFrameCount - + /* 014D8 80AB2268 24841104 */ addiu $a0, $a0, 0x1104 ## $a0 = 06001104 /* 014DC 80AB226C 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 014E0 80AB2270 3C01C100 */ lui $at, 0xC100 ## $at = C1000000 /* 014E4 80AB2274 44814000 */ mtc1 $at, $f8 ## $f8 = -8.00 -/* 014E8 80AB2278 468021A0 */ cvt.s.w $f6, $f4 -/* 014EC 80AB227C 8FA40028 */ lw $a0, 0x0028($sp) +/* 014E8 80AB2278 468021A0 */ cvt.s.w $f6, $f4 +/* 014EC 80AB227C 8FA40028 */ lw $a0, 0x0028($sp) /* 014F0 80AB2280 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 014F4 80AB2284 240E0002 */ addiu $t6, $zero, 0x0002 ## $t6 = 00000002 -/* 014F8 80AB2288 AFAE0014 */ sw $t6, 0x0014($sp) +/* 014F8 80AB2288 AFAE0014 */ sw $t6, 0x0014($sp) /* 014FC 80AB228C 24A51104 */ addiu $a1, $a1, 0x1104 ## $a1 = 06001104 -/* 01500 80AB2290 E7A60010 */ swc1 $f6, 0x0010($sp) +/* 01500 80AB2290 E7A60010 */ swc1 $f6, 0x0010($sp) /* 01504 80AB2294 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 01508 80AB2298 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 0150C 80AB229C E7A80018 */ swc1 $f8, 0x0018($sp) -/* 01510 80AB22A0 0C029468 */ jal SkelAnime_ChangeAnimation - +/* 0150C 80AB229C E7A80018 */ swc1 $f8, 0x0018($sp) +/* 01510 80AB22A0 0C029468 */ jal SkelAnime_ChangeAnim + /* 01514 80AB22A4 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 01518 80AB22A8 8FA20028 */ lw $v0, 0x0028($sp) +/* 01518 80AB22A8 8FA20028 */ lw $v0, 0x0028($sp) /* 0151C 80AB22AC 240F000C */ addiu $t7, $zero, 0x000C ## $t7 = 0000000C /* 01520 80AB22B0 24180001 */ addiu $t8, $zero, 0x0001 ## $t8 = 00000001 /* 01524 80AB22B4 AC4F0278 */ sw $t7, 0x0278($v0) ## 00000278 /* 01528 80AB22B8 AC58027C */ sw $t8, 0x027C($v0) ## 0000027C -/* 0152C 80AB22BC 8FBF0024 */ lw $ra, 0x0024($sp) +/* 0152C 80AB22BC 8FBF0024 */ lw $ra, 0x0024($sp) /* 01530 80AB22C0 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 01534 80AB22C4 03E00008 */ jr $ra +/* 01534 80AB22C4 03E00008 */ jr $ra /* 01538 80AB22C8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB2688.s b/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB2688.s index 824108a80d..63b26dbcfb 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB2688.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB2688.s @@ -1,19 +1,19 @@ glabel func_80AB2688 /* 018F8 80AB2688 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 018FC 80AB268C AFBF0014 */ sw $ra, 0x0014($sp) -/* 01900 80AB2690 AFA40018 */ sw $a0, 0x0018($sp) -/* 01904 80AB2694 AFA5001C */ sw $a1, 0x001C($sp) +/* 018FC 80AB268C AFBF0014 */ sw $ra, 0x0014($sp) +/* 01900 80AB2690 AFA40018 */ sw $a0, 0x0018($sp) +/* 01904 80AB2694 AFA5001C */ sw $a1, 0x001C($sp) /* 01908 80AB2698 908E0181 */ lbu $t6, 0x0181($a0) ## 00000181 /* 0190C 80AB269C 00802825 */ or $a1, $a0, $zero ## $a1 = 00000000 /* 01910 80AB26A0 24A6014C */ addiu $a2, $a1, 0x014C ## $a2 = 0000014C /* 01914 80AB26A4 35CF0001 */ ori $t7, $t6, 0x0001 ## $t7 = 00000001 /* 01918 80AB26A8 A08F0181 */ sb $t7, 0x0181($a0) ## 00000181 -/* 0191C 80AB26AC 8FA4001C */ lw $a0, 0x001C($sp) -/* 01920 80AB26B0 0C028D88 */ jal func_800A3620 +/* 0191C 80AB26AC 8FA4001C */ lw $a0, 0x001C($sp) +/* 01920 80AB26B0 0C028D88 */ jal SkelAnime_LoadAnimationType5 /* 01924 80AB26B4 3C073F80 */ lui $a3, 0x3F80 ## $a3 = 3F800000 -/* 01928 80AB26B8 8FBF0014 */ lw $ra, 0x0014($sp) +/* 01928 80AB26B8 8FBF0014 */ lw $ra, 0x0014($sp) /* 0192C 80AB26BC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 01930 80AB26C0 03E00008 */ jr $ra +/* 01930 80AB26C0 03E00008 */ jr $ra /* 01934 80AB26C4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB26DC.s b/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB26DC.s index 7468fb576d..1587f7b2a3 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB26DC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB26DC.s @@ -1,43 +1,43 @@ glabel func_80AB26DC /* 0194C 80AB26DC 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 -/* 01950 80AB26E0 AFB00028 */ sw $s0, 0x0028($sp) +/* 01950 80AB26E0 AFB00028 */ sw $s0, 0x0028($sp) /* 01954 80AB26E4 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 01958 80AB26E8 AFBF002C */ sw $ra, 0x002C($sp) +/* 01958 80AB26E8 AFBF002C */ sw $ra, 0x002C($sp) /* 0195C 80AB26EC 3C040601 */ lui $a0, 0x0601 ## $a0 = 06010000 -/* 01960 80AB26F0 AFA50044 */ sw $a1, 0x0044($sp) +/* 01960 80AB26F0 AFA50044 */ sw $a1, 0x0044($sp) /* 01964 80AB26F4 0C028800 */ jal SkelAnime_GetFrameCount - + /* 01968 80AB26F8 24848BD0 */ addiu $a0, $a0, 0x8BD0 ## $a0 = 06008BD0 /* 0196C 80AB26FC 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 01970 80AB2700 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01974 80AB2704 8FA50044 */ lw $a1, 0x0044($sp) -/* 01978 80AB2708 468021A0 */ cvt.s.w $f6, $f4 +/* 01974 80AB2704 8FA50044 */ lw $a1, 0x0044($sp) +/* 01978 80AB2708 468021A0 */ cvt.s.w $f6, $f4 /* 0197C 80AB270C 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 -/* 01980 80AB2710 0C2AC4C4 */ jal func_80AB1310 -/* 01984 80AB2714 E7A60034 */ swc1 $f6, 0x0034($sp) +/* 01980 80AB2710 0C2AC4C4 */ jal func_80AB1310 +/* 01984 80AB2714 E7A60034 */ swc1 $f6, 0x0034($sp) /* 01988 80AB2718 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 0198C 80AB271C C7A80034 */ lwc1 $f8, 0x0034($sp) +/* 0198C 80AB271C C7A80034 */ lwc1 $f8, 0x0034($sp) /* 01990 80AB2720 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 /* 01994 80AB2724 240E0002 */ addiu $t6, $zero, 0x0002 ## $t6 = 00000002 -/* 01998 80AB2728 44070000 */ mfc1 $a3, $f0 -/* 0199C 80AB272C AFAE0014 */ sw $t6, 0x0014($sp) +/* 01998 80AB2728 44070000 */ mfc1 $a3, $f0 +/* 0199C 80AB272C AFAE0014 */ sw $t6, 0x0014($sp) /* 019A0 80AB2730 24A58BD0 */ addiu $a1, $a1, 0x8BD0 ## $a1 = 06008BD0 /* 019A4 80AB2734 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C /* 019A8 80AB2738 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 019AC 80AB273C E7A80010 */ swc1 $f8, 0x0010($sp) -/* 019B0 80AB2740 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 019B4 80AB2744 E7A00018 */ swc1 $f0, 0x0018($sp) +/* 019AC 80AB273C E7A80010 */ swc1 $f8, 0x0010($sp) +/* 019B0 80AB2740 0C029468 */ jal SkelAnime_ChangeAnim + +/* 019B4 80AB2744 E7A00018 */ swc1 $f0, 0x0018($sp) /* 019B8 80AB2748 240F000E */ addiu $t7, $zero, 0x000E ## $t7 = 0000000E /* 019BC 80AB274C 24180003 */ addiu $t8, $zero, 0x0003 ## $t8 = 00000003 /* 019C0 80AB2750 241900FF */ addiu $t9, $zero, 0x00FF ## $t9 = 000000FF /* 019C4 80AB2754 AE0F0278 */ sw $t7, 0x0278($s0) ## 00000278 /* 019C8 80AB2758 AE18027C */ sw $t8, 0x027C($s0) ## 0000027C /* 019CC 80AB275C A21900C8 */ sb $t9, 0x00C8($s0) ## 000000C8 -/* 019D0 80AB2760 8FBF002C */ lw $ra, 0x002C($sp) -/* 019D4 80AB2764 8FB00028 */ lw $s0, 0x0028($sp) +/* 019D0 80AB2760 8FBF002C */ lw $ra, 0x002C($sp) +/* 019D4 80AB2764 8FB00028 */ lw $s0, 0x0028($sp) /* 019D8 80AB2768 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 -/* 019DC 80AB276C 03E00008 */ jr $ra +/* 019DC 80AB276C 03E00008 */ jr $ra /* 019E0 80AB2770 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB2774.s b/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB2774.s index 310590614b..28d4ac6060 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB2774.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB2774.s @@ -1,36 +1,36 @@ glabel func_80AB2774 /* 019E4 80AB2774 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 019E8 80AB2778 AFA40028 */ sw $a0, 0x0028($sp) -/* 019EC 80AB277C AFBF0024 */ sw $ra, 0x0024($sp) +/* 019E8 80AB2778 AFA40028 */ sw $a0, 0x0028($sp) +/* 019EC 80AB277C AFBF0024 */ sw $ra, 0x0024($sp) /* 019F0 80AB2780 3C040601 */ lui $a0, 0x0601 ## $a0 = 06010000 /* 019F4 80AB2784 0C028800 */ jal SkelAnime_GetFrameCount - + /* 019F8 80AB2788 24848BD0 */ addiu $a0, $a0, 0x8BD0 ## $a0 = 06008BD0 /* 019FC 80AB278C 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 01A00 80AB2790 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 01A04 80AB2794 8FA30028 */ lw $v1, 0x0028($sp) -/* 01A08 80AB2798 468021A0 */ cvt.s.w $f6, $f4 +/* 01A04 80AB2794 8FA30028 */ lw $v1, 0x0028($sp) +/* 01A08 80AB2798 468021A0 */ cvt.s.w $f6, $f4 /* 01A0C 80AB279C 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 /* 01A10 80AB27A0 240E0002 */ addiu $t6, $zero, 0x0002 ## $t6 = 00000002 -/* 01A14 80AB27A4 44070000 */ mfc1 $a3, $f0 -/* 01A18 80AB27A8 AFAE0014 */ sw $t6, 0x0014($sp) +/* 01A14 80AB27A4 44070000 */ mfc1 $a3, $f0 +/* 01A18 80AB27A8 AFAE0014 */ sw $t6, 0x0014($sp) /* 01A1C 80AB27AC 24A58BD0 */ addiu $a1, $a1, 0x8BD0 ## $a1 = 06008BD0 -/* 01A20 80AB27B0 E7A60010 */ swc1 $f6, 0x0010($sp) +/* 01A20 80AB27B0 E7A60010 */ swc1 $f6, 0x0010($sp) /* 01A24 80AB27B4 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 01A28 80AB27B8 2464014C */ addiu $a0, $v1, 0x014C ## $a0 = 0000014C -/* 01A2C 80AB27BC 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 01A30 80AB27C0 E7A00018 */ swc1 $f0, 0x0018($sp) -/* 01A34 80AB27C4 8FA30028 */ lw $v1, 0x0028($sp) +/* 01A2C 80AB27BC 0C029468 */ jal SkelAnime_ChangeAnim + +/* 01A30 80AB27C0 E7A00018 */ swc1 $f0, 0x0018($sp) +/* 01A34 80AB27C4 8FA30028 */ lw $v1, 0x0028($sp) /* 01A38 80AB27C8 240F000F */ addiu $t7, $zero, 0x000F ## $t7 = 0000000F /* 01A3C 80AB27CC 24180003 */ addiu $t8, $zero, 0x0003 ## $t8 = 00000003 /* 01A40 80AB27D0 241900FF */ addiu $t9, $zero, 0x00FF ## $t9 = 000000FF /* 01A44 80AB27D4 AC6F0278 */ sw $t7, 0x0278($v1) ## 00000278 /* 01A48 80AB27D8 AC78027C */ sw $t8, 0x027C($v1) ## 0000027C /* 01A4C 80AB27DC A07900C8 */ sb $t9, 0x00C8($v1) ## 000000C8 -/* 01A50 80AB27E0 8FBF0024 */ lw $ra, 0x0024($sp) +/* 01A50 80AB27E0 8FBF0024 */ lw $ra, 0x0024($sp) /* 01A54 80AB27E4 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 01A58 80AB27E8 03E00008 */ jr $ra +/* 01A58 80AB27E8 03E00008 */ jr $ra /* 01A5C 80AB27EC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB27F0.s b/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB27F0.s index 9108660712..2671d7123c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB27F0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB27F0.s @@ -1,33 +1,33 @@ glabel func_80AB27F0 /* 01A60 80AB27F0 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 01A64 80AB27F4 AFBF0024 */ sw $ra, 0x0024($sp) -/* 01A68 80AB27F8 10A00014 */ beq $a1, $zero, .L80AB284C -/* 01A6C 80AB27FC AFA40028 */ sw $a0, 0x0028($sp) +/* 01A64 80AB27F4 AFBF0024 */ sw $ra, 0x0024($sp) +/* 01A68 80AB27F8 10A00014 */ beq $a1, $zero, .L80AB284C +/* 01A6C 80AB27FC AFA40028 */ sw $a0, 0x0028($sp) /* 01A70 80AB2800 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 /* 01A74 80AB2804 0C028800 */ jal SkelAnime_GetFrameCount - + /* 01A78 80AB2808 248446A8 */ addiu $a0, $a0, 0x46A8 ## $a0 = 060046A8 /* 01A7C 80AB280C 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 01A80 80AB2810 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 01A84 80AB2814 8FA40028 */ lw $a0, 0x0028($sp) -/* 01A88 80AB2818 468021A0 */ cvt.s.w $f6, $f4 +/* 01A84 80AB2814 8FA40028 */ lw $a0, 0x0028($sp) +/* 01A88 80AB2818 468021A0 */ cvt.s.w $f6, $f4 /* 01A8C 80AB281C 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 01A90 80AB2820 44070000 */ mfc1 $a3, $f0 +/* 01A90 80AB2820 44070000 */ mfc1 $a3, $f0 /* 01A94 80AB2824 24A546A8 */ addiu $a1, $a1, 0x46A8 ## $a1 = 060046A8 /* 01A98 80AB2828 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 01A9C 80AB282C AFA00014 */ sw $zero, 0x0014($sp) -/* 01AA0 80AB2830 E7A60010 */ swc1 $f6, 0x0010($sp) +/* 01A9C 80AB282C AFA00014 */ sw $zero, 0x0014($sp) +/* 01AA0 80AB2830 E7A60010 */ swc1 $f6, 0x0010($sp) /* 01AA4 80AB2834 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 01AA8 80AB2838 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 01AAC 80AB283C E7A00018 */ swc1 $f0, 0x0018($sp) -/* 01AB0 80AB2840 8FAF0028 */ lw $t7, 0x0028($sp) +/* 01AA8 80AB2838 0C029468 */ jal SkelAnime_ChangeAnim + +/* 01AAC 80AB283C E7A00018 */ swc1 $f0, 0x0018($sp) +/* 01AB0 80AB2840 8FAF0028 */ lw $t7, 0x0028($sp) /* 01AB4 80AB2844 240E0003 */ addiu $t6, $zero, 0x0003 ## $t6 = 00000003 /* 01AB8 80AB2848 ADEE027C */ sw $t6, 0x027C($t7) ## 0000027C .L80AB284C: -/* 01ABC 80AB284C 8FBF0024 */ lw $ra, 0x0024($sp) +/* 01ABC 80AB284C 8FBF0024 */ lw $ra, 0x0024($sp) /* 01AC0 80AB2850 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 01AC4 80AB2854 03E00008 */ jr $ra +/* 01AC4 80AB2854 03E00008 */ jr $ra /* 01AC8 80AB2858 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB285C.s b/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB285C.s index 5bd2be9601..b67f808636 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB285C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB285C.s @@ -1,37 +1,37 @@ glabel func_80AB285C /* 01ACC 80AB285C 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 01AD0 80AB2860 AFA40028 */ sw $a0, 0x0028($sp) -/* 01AD4 80AB2864 AFBF0024 */ sw $ra, 0x0024($sp) +/* 01AD0 80AB2860 AFA40028 */ sw $a0, 0x0028($sp) +/* 01AD4 80AB2864 AFBF0024 */ sw $ra, 0x0024($sp) /* 01AD8 80AB2868 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 /* 01ADC 80AB286C 0C028800 */ jal SkelAnime_GetFrameCount - + /* 01AE0 80AB2870 24843954 */ addiu $a0, $a0, 0x3954 ## $a0 = 06003954 /* 01AE4 80AB2874 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 01AE8 80AB2878 3C01C100 */ lui $at, 0xC100 ## $at = C1000000 -/* 01AEC 80AB287C 8FA30028 */ lw $v1, 0x0028($sp) -/* 01AF0 80AB2880 468021A0 */ cvt.s.w $f6, $f4 +/* 01AEC 80AB287C 8FA30028 */ lw $v1, 0x0028($sp) +/* 01AF0 80AB2880 468021A0 */ cvt.s.w $f6, $f4 /* 01AF4 80AB2884 44814000 */ mtc1 $at, $f8 ## $f8 = -8.00 /* 01AF8 80AB2888 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 01AFC 80AB288C 240E0002 */ addiu $t6, $zero, 0x0002 ## $t6 = 00000002 -/* 01B00 80AB2890 AFAE0014 */ sw $t6, 0x0014($sp) +/* 01B00 80AB2890 AFAE0014 */ sw $t6, 0x0014($sp) /* 01B04 80AB2894 24A53954 */ addiu $a1, $a1, 0x3954 ## $a1 = 06003954 -/* 01B08 80AB2898 E7A60010 */ swc1 $f6, 0x0010($sp) +/* 01B08 80AB2898 E7A60010 */ swc1 $f6, 0x0010($sp) /* 01B0C 80AB289C 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 01B10 80AB28A0 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 /* 01B14 80AB28A4 2464014C */ addiu $a0, $v1, 0x014C ## $a0 = 0000014C -/* 01B18 80AB28A8 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 01B1C 80AB28AC E7A80018 */ swc1 $f8, 0x0018($sp) -/* 01B20 80AB28B0 8FA30028 */ lw $v1, 0x0028($sp) +/* 01B18 80AB28A8 0C029468 */ jal SkelAnime_ChangeAnim + +/* 01B1C 80AB28AC E7A80018 */ swc1 $f8, 0x0018($sp) +/* 01B20 80AB28B0 8FA30028 */ lw $v1, 0x0028($sp) /* 01B24 80AB28B4 240F0010 */ addiu $t7, $zero, 0x0010 ## $t7 = 00000010 /* 01B28 80AB28B8 24180001 */ addiu $t8, $zero, 0x0001 ## $t8 = 00000001 /* 01B2C 80AB28BC 241900FF */ addiu $t9, $zero, 0x00FF ## $t9 = 000000FF /* 01B30 80AB28C0 AC6F0278 */ sw $t7, 0x0278($v1) ## 00000278 /* 01B34 80AB28C4 AC78027C */ sw $t8, 0x027C($v1) ## 0000027C /* 01B38 80AB28C8 A07900C8 */ sb $t9, 0x00C8($v1) ## 000000C8 -/* 01B3C 80AB28CC 8FBF0024 */ lw $ra, 0x0024($sp) +/* 01B3C 80AB28CC 8FBF0024 */ lw $ra, 0x0024($sp) /* 01B40 80AB28D0 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 01B44 80AB28D4 03E00008 */ jr $ra +/* 01B44 80AB28D4 03E00008 */ jr $ra /* 01B48 80AB28D8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB28DC.s b/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB28DC.s index 88baf24454..98a516c65c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB28DC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB28DC.s @@ -1,33 +1,33 @@ glabel func_80AB28DC /* 01B4C 80AB28DC 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 01B50 80AB28E0 AFBF0024 */ sw $ra, 0x0024($sp) -/* 01B54 80AB28E4 10A00014 */ beq $a1, $zero, .L80AB2938 -/* 01B58 80AB28E8 AFA40028 */ sw $a0, 0x0028($sp) +/* 01B50 80AB28E0 AFBF0024 */ sw $ra, 0x0024($sp) +/* 01B54 80AB28E4 10A00014 */ beq $a1, $zero, .L80AB2938 +/* 01B58 80AB28E8 AFA40028 */ sw $a0, 0x0028($sp) /* 01B5C 80AB28EC 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 /* 01B60 80AB28F0 0C028800 */ jal SkelAnime_GetFrameCount - + /* 01B64 80AB28F4 24844030 */ addiu $a0, $a0, 0x4030 ## $a0 = 06004030 /* 01B68 80AB28F8 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 01B6C 80AB28FC 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 01B70 80AB2900 8FA40028 */ lw $a0, 0x0028($sp) -/* 01B74 80AB2904 468021A0 */ cvt.s.w $f6, $f4 +/* 01B70 80AB2900 8FA40028 */ lw $a0, 0x0028($sp) +/* 01B74 80AB2904 468021A0 */ cvt.s.w $f6, $f4 /* 01B78 80AB2908 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 01B7C 80AB290C 44070000 */ mfc1 $a3, $f0 +/* 01B7C 80AB290C 44070000 */ mfc1 $a3, $f0 /* 01B80 80AB2910 24A54030 */ addiu $a1, $a1, 0x4030 ## $a1 = 06004030 /* 01B84 80AB2914 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 01B88 80AB2918 AFA00014 */ sw $zero, 0x0014($sp) -/* 01B8C 80AB291C E7A60010 */ swc1 $f6, 0x0010($sp) +/* 01B88 80AB2918 AFA00014 */ sw $zero, 0x0014($sp) +/* 01B8C 80AB291C E7A60010 */ swc1 $f6, 0x0010($sp) /* 01B90 80AB2920 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 01B94 80AB2924 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 01B98 80AB2928 E7A00018 */ swc1 $f0, 0x0018($sp) -/* 01B9C 80AB292C 8FAF0028 */ lw $t7, 0x0028($sp) +/* 01B94 80AB2924 0C029468 */ jal SkelAnime_ChangeAnim + +/* 01B98 80AB2928 E7A00018 */ swc1 $f0, 0x0018($sp) +/* 01B9C 80AB292C 8FAF0028 */ lw $t7, 0x0028($sp) /* 01BA0 80AB2930 240E0004 */ addiu $t6, $zero, 0x0004 ## $t6 = 00000004 /* 01BA4 80AB2934 ADEE027C */ sw $t6, 0x027C($t7) ## 0000027C .L80AB2938: -/* 01BA8 80AB2938 8FBF0024 */ lw $ra, 0x0024($sp) +/* 01BA8 80AB2938 8FBF0024 */ lw $ra, 0x0024($sp) /* 01BAC 80AB293C 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 01BB0 80AB2940 03E00008 */ jr $ra +/* 01BB0 80AB2940 03E00008 */ jr $ra /* 01BB4 80AB2944 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB2948.s b/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB2948.s index afbf678a36..dad22257d8 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB2948.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB2948.s @@ -1,37 +1,37 @@ glabel func_80AB2948 /* 01BB8 80AB2948 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 01BBC 80AB294C AFA40028 */ sw $a0, 0x0028($sp) -/* 01BC0 80AB2950 AFBF0024 */ sw $ra, 0x0024($sp) +/* 01BBC 80AB294C AFA40028 */ sw $a0, 0x0028($sp) +/* 01BC0 80AB2950 AFBF0024 */ sw $ra, 0x0024($sp) /* 01BC4 80AB2954 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 /* 01BC8 80AB2958 0C028800 */ jal SkelAnime_GetFrameCount - + /* 01BCC 80AB295C 24842DBC */ addiu $a0, $a0, 0x2DBC ## $a0 = 06002DBC /* 01BD0 80AB2960 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 01BD4 80AB2964 3C01C100 */ lui $at, 0xC100 ## $at = C1000000 -/* 01BD8 80AB2968 8FA30028 */ lw $v1, 0x0028($sp) -/* 01BDC 80AB296C 468021A0 */ cvt.s.w $f6, $f4 +/* 01BD8 80AB2968 8FA30028 */ lw $v1, 0x0028($sp) +/* 01BDC 80AB296C 468021A0 */ cvt.s.w $f6, $f4 /* 01BE0 80AB2970 44814000 */ mtc1 $at, $f8 ## $f8 = -8.00 /* 01BE4 80AB2974 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 01BE8 80AB2978 240E0002 */ addiu $t6, $zero, 0x0002 ## $t6 = 00000002 -/* 01BEC 80AB297C AFAE0014 */ sw $t6, 0x0014($sp) +/* 01BEC 80AB297C AFAE0014 */ sw $t6, 0x0014($sp) /* 01BF0 80AB2980 24A52DBC */ addiu $a1, $a1, 0x2DBC ## $a1 = 06002DBC -/* 01BF4 80AB2984 E7A60010 */ swc1 $f6, 0x0010($sp) +/* 01BF4 80AB2984 E7A60010 */ swc1 $f6, 0x0010($sp) /* 01BF8 80AB2988 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 01BFC 80AB298C 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 /* 01C00 80AB2990 2464014C */ addiu $a0, $v1, 0x014C ## $a0 = 0000014C -/* 01C04 80AB2994 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 01C08 80AB2998 E7A80018 */ swc1 $f8, 0x0018($sp) -/* 01C0C 80AB299C 8FA30028 */ lw $v1, 0x0028($sp) +/* 01C04 80AB2994 0C029468 */ jal SkelAnime_ChangeAnim + +/* 01C08 80AB2998 E7A80018 */ swc1 $f8, 0x0018($sp) +/* 01C0C 80AB299C 8FA30028 */ lw $v1, 0x0028($sp) /* 01C10 80AB29A0 240F0011 */ addiu $t7, $zero, 0x0011 ## $t7 = 00000011 /* 01C14 80AB29A4 24180004 */ addiu $t8, $zero, 0x0004 ## $t8 = 00000004 /* 01C18 80AB29A8 241900FF */ addiu $t9, $zero, 0x00FF ## $t9 = 000000FF /* 01C1C 80AB29AC AC6F0278 */ sw $t7, 0x0278($v1) ## 00000278 /* 01C20 80AB29B0 AC78027C */ sw $t8, 0x027C($v1) ## 0000027C /* 01C24 80AB29B4 A07900C8 */ sb $t9, 0x00C8($v1) ## 000000C8 -/* 01C28 80AB29B8 8FBF0024 */ lw $ra, 0x0024($sp) +/* 01C28 80AB29B8 8FBF0024 */ lw $ra, 0x0024($sp) /* 01C2C 80AB29BC 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 01C30 80AB29C0 03E00008 */ jr $ra +/* 01C30 80AB29C0 03E00008 */ jr $ra /* 01C34 80AB29C4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB29C8.s b/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB29C8.s index 830e1afec8..30d0d019a7 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB29C8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB29C8.s @@ -1,30 +1,30 @@ glabel func_80AB29C8 /* 01C38 80AB29C8 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 01C3C 80AB29CC AFBF0024 */ sw $ra, 0x0024($sp) -/* 01C40 80AB29D0 10A00011 */ beq $a1, $zero, .L80AB2A18 -/* 01C44 80AB29D4 AFA40028 */ sw $a0, 0x0028($sp) +/* 01C3C 80AB29CC AFBF0024 */ sw $ra, 0x0024($sp) +/* 01C40 80AB29D0 10A00011 */ beq $a1, $zero, .L80AB2A18 +/* 01C44 80AB29D4 AFA40028 */ sw $a0, 0x0028($sp) /* 01C48 80AB29D8 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 /* 01C4C 80AB29DC 0C028800 */ jal SkelAnime_GetFrameCount - + /* 01C50 80AB29E0 248435A8 */ addiu $a0, $a0, 0x35A8 ## $a0 = 060035A8 /* 01C54 80AB29E4 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 01C58 80AB29E8 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 01C5C 80AB29EC 8FA40028 */ lw $a0, 0x0028($sp) -/* 01C60 80AB29F0 468021A0 */ cvt.s.w $f6, $f4 +/* 01C5C 80AB29EC 8FA40028 */ lw $a0, 0x0028($sp) +/* 01C60 80AB29F0 468021A0 */ cvt.s.w $f6, $f4 /* 01C64 80AB29F4 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 01C68 80AB29F8 44070000 */ mfc1 $a3, $f0 +/* 01C68 80AB29F8 44070000 */ mfc1 $a3, $f0 /* 01C6C 80AB29FC 24A535A8 */ addiu $a1, $a1, 0x35A8 ## $a1 = 060035A8 /* 01C70 80AB2A00 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 01C74 80AB2A04 AFA00014 */ sw $zero, 0x0014($sp) -/* 01C78 80AB2A08 E7A60010 */ swc1 $f6, 0x0010($sp) +/* 01C74 80AB2A04 AFA00014 */ sw $zero, 0x0014($sp) +/* 01C78 80AB2A08 E7A60010 */ swc1 $f6, 0x0010($sp) /* 01C7C 80AB2A0C 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 01C80 80AB2A10 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 01C84 80AB2A14 E7A00018 */ swc1 $f0, 0x0018($sp) +/* 01C80 80AB2A10 0C029468 */ jal SkelAnime_ChangeAnim + +/* 01C84 80AB2A14 E7A00018 */ swc1 $f0, 0x0018($sp) .L80AB2A18: -/* 01C88 80AB2A18 8FBF0024 */ lw $ra, 0x0024($sp) +/* 01C88 80AB2A18 8FBF0024 */ lw $ra, 0x0024($sp) /* 01C8C 80AB2A1C 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 01C90 80AB2A20 03E00008 */ jr $ra +/* 01C90 80AB2A20 03E00008 */ jr $ra /* 01C94 80AB2A24 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB2A68.s b/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB2A68.s index 098e05c5ef..3023b97bde 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB2A68.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB2A68.s @@ -1,37 +1,37 @@ glabel func_80AB2A68 /* 01CD8 80AB2A68 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 01CDC 80AB2A6C AFA40028 */ sw $a0, 0x0028($sp) -/* 01CE0 80AB2A70 AFBF0024 */ sw $ra, 0x0024($sp) +/* 01CDC 80AB2A6C AFA40028 */ sw $a0, 0x0028($sp) +/* 01CE0 80AB2A70 AFBF0024 */ sw $ra, 0x0024($sp) /* 01CE4 80AB2A74 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 /* 01CE8 80AB2A78 0C028800 */ jal SkelAnime_GetFrameCount - + /* 01CEC 80AB2A7C 24846320 */ addiu $a0, $a0, 0x6320 ## $a0 = 06006320 /* 01CF0 80AB2A80 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 01CF4 80AB2A84 3C01C100 */ lui $at, 0xC100 ## $at = C1000000 -/* 01CF8 80AB2A88 8FA30028 */ lw $v1, 0x0028($sp) -/* 01CFC 80AB2A8C 468021A0 */ cvt.s.w $f6, $f4 +/* 01CF8 80AB2A88 8FA30028 */ lw $v1, 0x0028($sp) +/* 01CFC 80AB2A8C 468021A0 */ cvt.s.w $f6, $f4 /* 01D00 80AB2A90 44814000 */ mtc1 $at, $f8 ## $f8 = -8.00 /* 01D04 80AB2A94 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 01D08 80AB2A98 240E0002 */ addiu $t6, $zero, 0x0002 ## $t6 = 00000002 -/* 01D0C 80AB2A9C AFAE0014 */ sw $t6, 0x0014($sp) +/* 01D0C 80AB2A9C AFAE0014 */ sw $t6, 0x0014($sp) /* 01D10 80AB2AA0 24A56320 */ addiu $a1, $a1, 0x6320 ## $a1 = 06006320 -/* 01D14 80AB2AA4 E7A60010 */ swc1 $f6, 0x0010($sp) +/* 01D14 80AB2AA4 E7A60010 */ swc1 $f6, 0x0010($sp) /* 01D18 80AB2AA8 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 01D1C 80AB2AAC 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 /* 01D20 80AB2AB0 2464014C */ addiu $a0, $v1, 0x014C ## $a0 = 0000014C -/* 01D24 80AB2AB4 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 01D28 80AB2AB8 E7A80018 */ swc1 $f8, 0x0018($sp) -/* 01D2C 80AB2ABC 8FA30028 */ lw $v1, 0x0028($sp) +/* 01D24 80AB2AB4 0C029468 */ jal SkelAnime_ChangeAnim + +/* 01D28 80AB2AB8 E7A80018 */ swc1 $f8, 0x0018($sp) +/* 01D2C 80AB2ABC 8FA30028 */ lw $v1, 0x0028($sp) /* 01D30 80AB2AC0 240F0012 */ addiu $t7, $zero, 0x0012 ## $t7 = 00000012 /* 01D34 80AB2AC4 24180004 */ addiu $t8, $zero, 0x0004 ## $t8 = 00000004 /* 01D38 80AB2AC8 241900FF */ addiu $t9, $zero, 0x00FF ## $t9 = 000000FF /* 01D3C 80AB2ACC AC6F0278 */ sw $t7, 0x0278($v1) ## 00000278 /* 01D40 80AB2AD0 AC78027C */ sw $t8, 0x027C($v1) ## 0000027C /* 01D44 80AB2AD4 A07900C8 */ sb $t9, 0x00C8($v1) ## 000000C8 -/* 01D48 80AB2AD8 8FBF0024 */ lw $ra, 0x0024($sp) +/* 01D48 80AB2AD8 8FBF0024 */ lw $ra, 0x0024($sp) /* 01D4C 80AB2ADC 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 01D50 80AB2AE0 03E00008 */ jr $ra +/* 01D50 80AB2AE0 03E00008 */ jr $ra /* 01D54 80AB2AE4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB2E70.s b/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB2E70.s index dfbada4e54..3743d1c5c9 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB2E70.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB2E70.s @@ -1,40 +1,40 @@ glabel func_80AB2E70 /* 020E0 80AB2E70 27BDFFA0 */ addiu $sp, $sp, 0xFFA0 ## $sp = FFFFFFA0 -/* 020E4 80AB2E74 AFBF0024 */ sw $ra, 0x0024($sp) -/* 020E8 80AB2E78 AFA40060 */ sw $a0, 0x0060($sp) -/* 020EC 80AB2E7C AFA50064 */ sw $a1, 0x0064($sp) +/* 020E4 80AB2E74 AFBF0024 */ sw $ra, 0x0024($sp) +/* 020E8 80AB2E78 AFA40060 */ sw $a0, 0x0060($sp) +/* 020EC 80AB2E7C AFA50064 */ sw $a1, 0x0064($sp) /* 020F0 80AB2E80 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 /* 020F4 80AB2E84 3C0680AB */ lui $a2, %hi(D_80AB50C4) ## $a2 = 80AB0000 /* 020F8 80AB2E88 24C650C4 */ addiu $a2, $a2, %lo(D_80AB50C4) ## $a2 = 80AB50C4 /* 020FC 80AB2E8C 27A40044 */ addiu $a0, $sp, 0x0044 ## $a0 = FFFFFFE4 /* 02100 80AB2E90 2407023C */ addiu $a3, $zero, 0x023C ## $a3 = 0000023C -/* 02104 80AB2E94 0C031AB1 */ jal func_800C6AC4 -/* 02108 80AB2E98 AFA50054 */ sw $a1, 0x0054($sp) -/* 0210C 80AB2E9C 8FAF0064 */ lw $t7, 0x0064($sp) -/* 02110 80AB2EA0 0C024F46 */ jal func_80093D18 +/* 02104 80AB2E94 0C031AB1 */ jal Graph_OpenDisps +/* 02108 80AB2E98 AFA50054 */ sw $a1, 0x0054($sp) +/* 0210C 80AB2E9C 8FAF0064 */ lw $t7, 0x0064($sp) +/* 02110 80AB2EA0 0C024F46 */ jal func_80093D18 /* 02114 80AB2EA4 8DE40000 */ lw $a0, 0x0000($t7) ## 00000000 -/* 02118 80AB2EA8 8FA80054 */ lw $t0, 0x0054($sp) +/* 02118 80AB2EA8 8FA80054 */ lw $t0, 0x0054($sp) /* 0211C 80AB2EAC 3C040601 */ lui $a0, 0x0601 ## $a0 = 06010000 /* 02120 80AB2EB0 2484D8E8 */ addiu $a0, $a0, 0xD8E8 ## $a0 = 0600D8E8 /* 02124 80AB2EB4 8D0202C0 */ lw $v0, 0x02C0($t0) ## 000002C0 -/* 02128 80AB2EB8 00044900 */ sll $t1, $a0, 4 -/* 0212C 80AB2EBC 00095702 */ srl $t2, $t1, 28 +/* 02128 80AB2EB8 00044900 */ sll $t1, $a0, 4 +/* 0212C 80AB2EBC 00095702 */ srl $t2, $t1, 28 /* 02130 80AB2EC0 3C19DB06 */ lui $t9, 0xDB06 ## $t9 = DB060000 /* 02134 80AB2EC4 3C0C8016 */ lui $t4, 0x8016 ## $t4 = 80160000 /* 02138 80AB2EC8 24580008 */ addiu $t8, $v0, 0x0008 ## $t8 = 00000008 /* 0213C 80AB2ECC 258C6FA8 */ addiu $t4, $t4, 0x6FA8 ## $t4 = 80166FA8 /* 02140 80AB2ED0 37390020 */ ori $t9, $t9, 0x0020 ## $t9 = DB060020 -/* 02144 80AB2ED4 000A5880 */ sll $t3, $t2, 2 +/* 02144 80AB2ED4 000A5880 */ sll $t3, $t2, 2 /* 02148 80AB2ED8 AD1802C0 */ sw $t8, 0x02C0($t0) ## 000002C0 -/* 0214C 80AB2EDC 016C2821 */ addu $a1, $t3, $t4 +/* 0214C 80AB2EDC 016C2821 */ addu $a1, $t3, $t4 /* 02150 80AB2EE0 AC590000 */ sw $t9, 0x0000($v0) ## 00000000 /* 02154 80AB2EE4 8CAD0000 */ lw $t5, 0x0000($a1) ## 00000000 /* 02158 80AB2EE8 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 /* 0215C 80AB2EEC 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF -/* 02160 80AB2EF0 00813024 */ and $a2, $a0, $at +/* 02160 80AB2EF0 00813024 */ and $a2, $a0, $at /* 02164 80AB2EF4 3C078000 */ lui $a3, 0x8000 ## $a3 = 80000000 -/* 02168 80AB2EF8 01A67021 */ addu $t6, $t5, $a2 -/* 0216C 80AB2EFC 01C77821 */ addu $t7, $t6, $a3 +/* 02168 80AB2EF8 01A67021 */ addu $t6, $t5, $a2 +/* 0216C 80AB2EFC 01C77821 */ addu $t7, $t6, $a3 /* 02170 80AB2F00 AC4F0004 */ sw $t7, 0x0004($v0) ## 00000004 /* 02174 80AB2F04 8D0202C0 */ lw $v0, 0x02C0($t0) ## 000002C0 /* 02178 80AB2F08 3C19DB06 */ lui $t9, 0xDB06 ## $t9 = DB060000 @@ -45,8 +45,8 @@ glabel func_80AB2E70 /* 0218C 80AB2F1C 8CA90000 */ lw $t1, 0x0000($a1) ## 00000000 /* 02190 80AB2F20 240E00FF */ addiu $t6, $zero, 0x00FF ## $t6 = 000000FF /* 02194 80AB2F24 3C0DFB00 */ lui $t5, 0xFB00 ## $t5 = FB000000 -/* 02198 80AB2F28 01265021 */ addu $t2, $t1, $a2 -/* 0219C 80AB2F2C 01475821 */ addu $t3, $t2, $a3 +/* 02198 80AB2F28 01265021 */ addu $t2, $t1, $a2 +/* 0219C 80AB2F2C 01475821 */ addu $t3, $t2, $a3 /* 021A0 80AB2F30 AC4B0004 */ sw $t3, 0x0004($v0) ## 00000004 /* 021A4 80AB2F34 8D0202C0 */ lw $v0, 0x02C0($t0) ## 000002C0 /* 021A8 80AB2F38 3C198011 */ lui $t9, 0x8011 ## $t9 = 80110000 @@ -62,26 +62,26 @@ glabel func_80AB2E70 /* 021D0 80AB2F60 AD0F02C0 */ sw $t7, 0x02C0($t0) ## 000002C0 /* 021D4 80AB2F64 AC590004 */ sw $t9, 0x0004($v0) ## 00000004 /* 021D8 80AB2F68 AC580000 */ sw $t8, 0x0000($v0) ## 00000000 -/* 021DC 80AB2F6C 8FA30060 */ lw $v1, 0x0060($sp) -/* 021E0 80AB2F70 8FA40064 */ lw $a0, 0x0064($sp) +/* 021DC 80AB2F6C 8FA30060 */ lw $v1, 0x0060($sp) +/* 021E0 80AB2F70 8FA40064 */ lw $a0, 0x0064($sp) /* 021E4 80AB2F74 2462014C */ addiu $v0, $v1, 0x014C ## $v0 = 0000014C /* 021E8 80AB2F78 8C450004 */ lw $a1, 0x0004($v0) ## 00000150 /* 021EC 80AB2F7C 8C460020 */ lw $a2, 0x0020($v0) ## 0000016C /* 021F0 80AB2F80 90470002 */ lbu $a3, 0x0002($v0) ## 0000014E -/* 021F4 80AB2F84 AFA00014 */ sw $zero, 0x0014($sp) -/* 021F8 80AB2F88 AFA00010 */ sw $zero, 0x0010($sp) -/* 021FC 80AB2F8C 0C0286B2 */ jal func_800A1AC8 -/* 02200 80AB2F90 AFA30018 */ sw $v1, 0x0018($sp) -/* 02204 80AB2F94 8FA90064 */ lw $t1, 0x0064($sp) +/* 021F4 80AB2F84 AFA00014 */ sw $zero, 0x0014($sp) +/* 021F8 80AB2F88 AFA00010 */ sw $zero, 0x0010($sp) +/* 021FC 80AB2F8C 0C0286B2 */ jal SkelAnime_DrawSV +/* 02200 80AB2F90 AFA30018 */ sw $v1, 0x0018($sp) +/* 02204 80AB2F94 8FA90064 */ lw $t1, 0x0064($sp) /* 02208 80AB2F98 3C0680AB */ lui $a2, %hi(D_80AB50E0) ## $a2 = 80AB0000 /* 0220C 80AB2F9C 24C650E0 */ addiu $a2, $a2, %lo(D_80AB50E0) ## $a2 = 80AB50E0 /* 02210 80AB2FA0 27A40044 */ addiu $a0, $sp, 0x0044 ## $a0 = FFFFFFE4 /* 02214 80AB2FA4 24070251 */ addiu $a3, $zero, 0x0251 ## $a3 = 00000251 -/* 02218 80AB2FA8 0C031AD5 */ jal func_800C6B54 +/* 02218 80AB2FA8 0C031AD5 */ jal Graph_CloseDisps /* 0221C 80AB2FAC 8D250000 */ lw $a1, 0x0000($t1) ## 00000000 -/* 02220 80AB2FB0 8FBF0024 */ lw $ra, 0x0024($sp) +/* 02220 80AB2FB0 8FBF0024 */ lw $ra, 0x0024($sp) /* 02224 80AB2FB4 27BD0060 */ addiu $sp, $sp, 0x0060 ## $sp = 00000000 -/* 02228 80AB2FB8 03E00008 */ jr $ra +/* 02228 80AB2FB8 03E00008 */ jr $ra /* 0222C 80AB2FBC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB2FE4.s b/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB2FE4.s index 461958e0ce..3c5656a8b1 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB2FE4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB2FE4.s @@ -1,45 +1,45 @@ glabel func_80AB2FE4 /* 02254 80AB2FE4 27BDFF90 */ addiu $sp, $sp, 0xFF90 ## $sp = FFFFFF90 -/* 02258 80AB2FE8 AFBF0024 */ sw $ra, 0x0024($sp) -/* 0225C 80AB2FEC AFA40070 */ sw $a0, 0x0070($sp) -/* 02260 80AB2FF0 AFA50074 */ sw $a1, 0x0074($sp) +/* 02258 80AB2FE8 AFBF0024 */ sw $ra, 0x0024($sp) +/* 0225C 80AB2FEC AFA40070 */ sw $a0, 0x0070($sp) +/* 02260 80AB2FF0 AFA50074 */ sw $a1, 0x0074($sp) /* 02264 80AB2FF4 84820274 */ lh $v0, 0x0274($a0) ## 00000274 /* 02268 80AB2FF8 3C1880AB */ lui $t8, %hi(D_80AB430C) ## $t8 = 80AB0000 /* 0226C 80AB2FFC 3C0680AB */ lui $a2, %hi(D_80AB50FC) ## $a2 = 80AB0000 -/* 02270 80AB3000 00027880 */ sll $t7, $v0, 2 -/* 02274 80AB3004 030FC021 */ addu $t8, $t8, $t7 -/* 02278 80AB3008 8F18430C */ lw $t8, %lo(D_80AB430C)($t8) +/* 02270 80AB3000 00027880 */ sll $t7, $v0, 2 +/* 02274 80AB3004 030FC021 */ addu $t8, $t8, $t7 +/* 02278 80AB3008 8F18430C */ lw $t8, %lo(D_80AB430C)($t8) /* 0227C 80AB300C 24C650FC */ addiu $a2, $a2, %lo(D_80AB50FC) ## $a2 = 80AB50FC /* 02280 80AB3010 27A40048 */ addiu $a0, $sp, 0x0048 ## $a0 = FFFFFFD8 -/* 02284 80AB3014 AFB80060 */ sw $t8, 0x0060($sp) +/* 02284 80AB3014 AFB80060 */ sw $t8, 0x0060($sp) /* 02288 80AB3018 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 /* 0228C 80AB301C 2407026F */ addiu $a3, $zero, 0x026F ## $a3 = 0000026F -/* 02290 80AB3020 0C031AB1 */ jal func_800C6AC4 -/* 02294 80AB3024 AFA50058 */ sw $a1, 0x0058($sp) -/* 02298 80AB3028 8FA90074 */ lw $t1, 0x0074($sp) -/* 0229C 80AB302C 0C024F46 */ jal func_80093D18 +/* 02290 80AB3020 0C031AB1 */ jal Graph_OpenDisps +/* 02294 80AB3024 AFA50058 */ sw $a1, 0x0058($sp) +/* 02298 80AB3028 8FA90074 */ lw $t1, 0x0074($sp) +/* 0229C 80AB302C 0C024F46 */ jal func_80093D18 /* 022A0 80AB3030 8D240000 */ lw $a0, 0x0000($t1) ## 00000000 -/* 022A4 80AB3034 8FA80058 */ lw $t0, 0x0058($sp) -/* 022A8 80AB3038 8FA70060 */ lw $a3, 0x0060($sp) +/* 022A4 80AB3034 8FA80058 */ lw $t0, 0x0058($sp) +/* 022A8 80AB3038 8FA70060 */ lw $a3, 0x0060($sp) /* 022AC 80AB303C 3C0BDB06 */ lui $t3, 0xDB06 ## $t3 = DB060000 /* 022B0 80AB3040 8D0202C0 */ lw $v0, 0x02C0($t0) ## 000002C0 -/* 022B4 80AB3044 00076100 */ sll $t4, $a3, 4 -/* 022B8 80AB3048 000C6F02 */ srl $t5, $t4, 28 +/* 022B4 80AB3044 00076100 */ sll $t4, $a3, 4 +/* 022B8 80AB3048 000C6F02 */ srl $t5, $t4, 28 /* 022BC 80AB304C 3C0F8016 */ lui $t7, 0x8016 ## $t7 = 80160000 /* 022C0 80AB3050 244A0008 */ addiu $t2, $v0, 0x0008 ## $t2 = 00000008 /* 022C4 80AB3054 25EF6FA8 */ addiu $t7, $t7, 0x6FA8 ## $t7 = 80166FA8 -/* 022C8 80AB3058 000D7080 */ sll $t6, $t5, 2 +/* 022C8 80AB3058 000D7080 */ sll $t6, $t5, 2 /* 022CC 80AB305C 356B0020 */ ori $t3, $t3, 0x0020 ## $t3 = DB060020 /* 022D0 80AB3060 AD0A02C0 */ sw $t2, 0x02C0($t0) ## 000002C0 -/* 022D4 80AB3064 01CF2021 */ addu $a0, $t6, $t7 +/* 022D4 80AB3064 01CF2021 */ addu $a0, $t6, $t7 /* 022D8 80AB3068 AC4B0000 */ sw $t3, 0x0000($v0) ## 00000000 /* 022DC 80AB306C 8C980000 */ lw $t8, 0x0000($a0) ## 00000000 /* 022E0 80AB3070 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 /* 022E4 80AB3074 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF -/* 022E8 80AB3078 00E12824 */ and $a1, $a3, $at +/* 022E8 80AB3078 00E12824 */ and $a1, $a3, $at /* 022EC 80AB307C 3C068000 */ lui $a2, 0x8000 ## $a2 = 80000000 -/* 022F0 80AB3080 0305C821 */ addu $t9, $t8, $a1 -/* 022F4 80AB3084 03264821 */ addu $t1, $t9, $a2 +/* 022F0 80AB3080 0305C821 */ addu $t9, $t8, $a1 +/* 022F4 80AB3084 03264821 */ addu $t1, $t9, $a2 /* 022F8 80AB3088 AC490004 */ sw $t1, 0x0004($v0) ## 00000004 /* 022FC 80AB308C 8D0202C0 */ lw $v0, 0x02C0($t0) ## 000002C0 /* 02300 80AB3090 3C0BDB06 */ lui $t3, 0xDB06 ## $t3 = DB060000 @@ -50,8 +50,8 @@ glabel func_80AB2FE4 /* 02314 80AB30A4 8C8C0000 */ lw $t4, 0x0000($a0) ## 00000000 /* 02318 80AB30A8 241900FF */ addiu $t9, $zero, 0x00FF ## $t9 = 000000FF /* 0231C 80AB30AC 3C18FB00 */ lui $t8, 0xFB00 ## $t8 = FB000000 -/* 02320 80AB30B0 01856821 */ addu $t5, $t4, $a1 -/* 02324 80AB30B4 01A67021 */ addu $t6, $t5, $a2 +/* 02320 80AB30B0 01856821 */ addu $t5, $t4, $a1 +/* 02324 80AB30B4 01A67021 */ addu $t6, $t5, $a2 /* 02328 80AB30B8 AC4E0004 */ sw $t6, 0x0004($v0) ## 00000004 /* 0232C 80AB30BC 8D0202C0 */ lw $v0, 0x02C0($t0) ## 000002C0 /* 02330 80AB30C0 3C0B8011 */ lui $t3, 0x8011 ## $t3 = 80110000 @@ -67,28 +67,28 @@ glabel func_80AB2FE4 /* 02358 80AB30E8 AD0902C0 */ sw $t1, 0x02C0($t0) ## 000002C0 /* 0235C 80AB30EC AC4B0004 */ sw $t3, 0x0004($v0) ## 00000004 /* 02360 80AB30F0 AC4A0000 */ sw $t2, 0x0000($v0) ## 00000000 -/* 02364 80AB30F4 8FA30070 */ lw $v1, 0x0070($sp) +/* 02364 80AB30F4 8FA30070 */ lw $v1, 0x0070($sp) /* 02368 80AB30F8 3C0C80AB */ lui $t4, %hi(func_80AB2FC0) ## $t4 = 80AB0000 /* 0236C 80AB30FC 258C2FC0 */ addiu $t4, $t4, %lo(func_80AB2FC0) ## $t4 = 80AB2FC0 /* 02370 80AB3100 2462014C */ addiu $v0, $v1, 0x014C ## $v0 = 0000014C /* 02374 80AB3104 8C450004 */ lw $a1, 0x0004($v0) ## 00000150 /* 02378 80AB3108 8C460020 */ lw $a2, 0x0020($v0) ## 0000016C /* 0237C 80AB310C 90470002 */ lbu $a3, 0x0002($v0) ## 0000014E -/* 02380 80AB3110 AFA00014 */ sw $zero, 0x0014($sp) -/* 02384 80AB3114 AFAC0010 */ sw $t4, 0x0010($sp) -/* 02388 80AB3118 8FA40074 */ lw $a0, 0x0074($sp) -/* 0238C 80AB311C 0C0286B2 */ jal func_800A1AC8 -/* 02390 80AB3120 AFA30018 */ sw $v1, 0x0018($sp) -/* 02394 80AB3124 8FAD0074 */ lw $t5, 0x0074($sp) +/* 02380 80AB3110 AFA00014 */ sw $zero, 0x0014($sp) +/* 02384 80AB3114 AFAC0010 */ sw $t4, 0x0010($sp) +/* 02388 80AB3118 8FA40074 */ lw $a0, 0x0074($sp) +/* 0238C 80AB311C 0C0286B2 */ jal SkelAnime_DrawSV +/* 02390 80AB3120 AFA30018 */ sw $v1, 0x0018($sp) +/* 02394 80AB3124 8FAD0074 */ lw $t5, 0x0074($sp) /* 02398 80AB3128 3C0680AB */ lui $a2, %hi(D_80AB5118) ## $a2 = 80AB0000 /* 0239C 80AB312C 24C65118 */ addiu $a2, $a2, %lo(D_80AB5118) ## $a2 = 80AB5118 /* 023A0 80AB3130 27A40048 */ addiu $a0, $sp, 0x0048 ## $a0 = FFFFFFD8 /* 023A4 80AB3134 24070284 */ addiu $a3, $zero, 0x0284 ## $a3 = 00000284 -/* 023A8 80AB3138 0C031AD5 */ jal func_800C6B54 +/* 023A8 80AB3138 0C031AD5 */ jal Graph_CloseDisps /* 023AC 80AB313C 8DA50000 */ lw $a1, 0x0000($t5) ## 00000000 -/* 023B0 80AB3140 8FBF0024 */ lw $ra, 0x0024($sp) +/* 023B0 80AB3140 8FBF0024 */ lw $ra, 0x0024($sp) /* 023B4 80AB3144 27BD0070 */ addiu $sp, $sp, 0x0070 ## $sp = 00000000 -/* 023B8 80AB3148 03E00008 */ jr $ra +/* 023B8 80AB3148 03E00008 */ jr $ra /* 023BC 80AB314C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB3B04.s b/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB3B04.s index 85e137154f..77c9bb9cfa 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB3B04.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB3B04.s @@ -15,7 +15,7 @@ glabel func_80AB3B04 /* 02DA4 80AB3B34 35F80009 */ ori $t8, $t7, 0x0009 ## $t8 = 00000009 /* 02DA8 80AB3B38 ACD80004 */ sw $t8, 0x0004($a2) ## 00000004 /* 02DAC 80AB3B3C AFA60018 */ sw $a2, 0x0018($sp) -/* 02DB0 80AB3B40 0C01B0D8 */ jal func_8006C360 +/* 02DB0 80AB3B40 0C01B0D8 */ jal Text_GetFaceReaction /* 02DB4 80AB3B44 8FA4001C */ lw $a0, 0x001C($sp) /* 02DB8 80AB3B48 8FA60018 */ lw $a2, 0x0018($sp) /* 02DBC 80AB3B4C 3059FFFF */ andi $t9, $v0, 0xFFFF ## $t9 = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB410C.s b/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB410C.s index 983e6e6ee3..19ffcc4800 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB410C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Nb/func_80AB410C.s @@ -1,45 +1,45 @@ glabel func_80AB410C /* 0337C 80AB410C 27BDFF90 */ addiu $sp, $sp, 0xFF90 ## $sp = FFFFFF90 -/* 03380 80AB4110 AFBF0024 */ sw $ra, 0x0024($sp) -/* 03384 80AB4114 AFA40070 */ sw $a0, 0x0070($sp) -/* 03388 80AB4118 AFA50074 */ sw $a1, 0x0074($sp) +/* 03380 80AB4110 AFBF0024 */ sw $ra, 0x0024($sp) +/* 03384 80AB4114 AFA40070 */ sw $a0, 0x0070($sp) +/* 03388 80AB4118 AFA50074 */ sw $a1, 0x0074($sp) /* 0338C 80AB411C 84820274 */ lh $v0, 0x0274($a0) ## 00000274 /* 03390 80AB4120 3C1880AB */ lui $t8, %hi(D_80AB430C) ## $t8 = 80AB0000 /* 03394 80AB4124 3C0680AB */ lui $a2, %hi(D_80AB51A8) ## $a2 = 80AB0000 -/* 03398 80AB4128 00027880 */ sll $t7, $v0, 2 -/* 0339C 80AB412C 030FC021 */ addu $t8, $t8, $t7 -/* 033A0 80AB4130 8F18430C */ lw $t8, %lo(D_80AB430C)($t8) +/* 03398 80AB4128 00027880 */ sll $t7, $v0, 2 +/* 0339C 80AB412C 030FC021 */ addu $t8, $t8, $t7 +/* 033A0 80AB4130 8F18430C */ lw $t8, %lo(D_80AB430C)($t8) /* 033A4 80AB4134 24C651A8 */ addiu $a2, $a2, %lo(D_80AB51A8) ## $a2 = 80AB51A8 /* 033A8 80AB4138 27A40048 */ addiu $a0, $sp, 0x0048 ## $a0 = FFFFFFD8 -/* 033AC 80AB413C AFB80060 */ sw $t8, 0x0060($sp) +/* 033AC 80AB413C AFB80060 */ sw $t8, 0x0060($sp) /* 033B0 80AB4140 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 /* 033B4 80AB4144 240703E0 */ addiu $a3, $zero, 0x03E0 ## $a3 = 000003E0 -/* 033B8 80AB4148 0C031AB1 */ jal func_800C6AC4 -/* 033BC 80AB414C AFA50058 */ sw $a1, 0x0058($sp) -/* 033C0 80AB4150 8FA90074 */ lw $t1, 0x0074($sp) -/* 033C4 80AB4154 0C024F46 */ jal func_80093D18 +/* 033B8 80AB4148 0C031AB1 */ jal Graph_OpenDisps +/* 033BC 80AB414C AFA50058 */ sw $a1, 0x0058($sp) +/* 033C0 80AB4150 8FA90074 */ lw $t1, 0x0074($sp) +/* 033C4 80AB4154 0C024F46 */ jal func_80093D18 /* 033C8 80AB4158 8D240000 */ lw $a0, 0x0000($t1) ## 00000000 -/* 033CC 80AB415C 8FA80058 */ lw $t0, 0x0058($sp) -/* 033D0 80AB4160 8FA70060 */ lw $a3, 0x0060($sp) +/* 033CC 80AB415C 8FA80058 */ lw $t0, 0x0058($sp) +/* 033D0 80AB4160 8FA70060 */ lw $a3, 0x0060($sp) /* 033D4 80AB4164 3C0BDB06 */ lui $t3, 0xDB06 ## $t3 = DB060000 /* 033D8 80AB4168 8D0202C0 */ lw $v0, 0x02C0($t0) ## 000002C0 -/* 033DC 80AB416C 00076100 */ sll $t4, $a3, 4 -/* 033E0 80AB4170 000C6F02 */ srl $t5, $t4, 28 +/* 033DC 80AB416C 00076100 */ sll $t4, $a3, 4 +/* 033E0 80AB4170 000C6F02 */ srl $t5, $t4, 28 /* 033E4 80AB4174 3C0F8016 */ lui $t7, 0x8016 ## $t7 = 80160000 /* 033E8 80AB4178 244A0008 */ addiu $t2, $v0, 0x0008 ## $t2 = 00000008 /* 033EC 80AB417C 25EF6FA8 */ addiu $t7, $t7, 0x6FA8 ## $t7 = 80166FA8 -/* 033F0 80AB4180 000D7080 */ sll $t6, $t5, 2 +/* 033F0 80AB4180 000D7080 */ sll $t6, $t5, 2 /* 033F4 80AB4184 356B0020 */ ori $t3, $t3, 0x0020 ## $t3 = DB060020 /* 033F8 80AB4188 AD0A02C0 */ sw $t2, 0x02C0($t0) ## 000002C0 -/* 033FC 80AB418C 01CF2021 */ addu $a0, $t6, $t7 +/* 033FC 80AB418C 01CF2021 */ addu $a0, $t6, $t7 /* 03400 80AB4190 AC4B0000 */ sw $t3, 0x0000($v0) ## 00000000 /* 03404 80AB4194 8C980000 */ lw $t8, 0x0000($a0) ## 00000000 /* 03408 80AB4198 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 /* 0340C 80AB419C 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF -/* 03410 80AB41A0 00E12824 */ and $a1, $a3, $at +/* 03410 80AB41A0 00E12824 */ and $a1, $a3, $at /* 03414 80AB41A4 3C068000 */ lui $a2, 0x8000 ## $a2 = 80000000 -/* 03418 80AB41A8 0305C821 */ addu $t9, $t8, $a1 -/* 0341C 80AB41AC 03264821 */ addu $t1, $t9, $a2 +/* 03418 80AB41A8 0305C821 */ addu $t9, $t8, $a1 +/* 0341C 80AB41AC 03264821 */ addu $t1, $t9, $a2 /* 03420 80AB41B0 AC490004 */ sw $t1, 0x0004($v0) ## 00000004 /* 03424 80AB41B4 8D0202C0 */ lw $v0, 0x02C0($t0) ## 000002C0 /* 03428 80AB41B8 3C0BDB06 */ lui $t3, 0xDB06 ## $t3 = DB060000 @@ -50,8 +50,8 @@ glabel func_80AB410C /* 0343C 80AB41CC 8C8C0000 */ lw $t4, 0x0000($a0) ## 00000000 /* 03440 80AB41D0 241900FF */ addiu $t9, $zero, 0x00FF ## $t9 = 000000FF /* 03444 80AB41D4 3C18FB00 */ lui $t8, 0xFB00 ## $t8 = FB000000 -/* 03448 80AB41D8 01856821 */ addu $t5, $t4, $a1 -/* 0344C 80AB41DC 01A67021 */ addu $t6, $t5, $a2 +/* 03448 80AB41D8 01856821 */ addu $t5, $t4, $a1 +/* 0344C 80AB41DC 01A67021 */ addu $t6, $t5, $a2 /* 03450 80AB41E0 AC4E0004 */ sw $t6, 0x0004($v0) ## 00000004 /* 03454 80AB41E4 8D0202C0 */ lw $v0, 0x02C0($t0) ## 000002C0 /* 03458 80AB41E8 3C0B8011 */ lui $t3, 0x8011 ## $t3 = 80110000 @@ -67,7 +67,7 @@ glabel func_80AB410C /* 03480 80AB4210 AD0902C0 */ sw $t1, 0x02C0($t0) ## 000002C0 /* 03484 80AB4214 AC4B0004 */ sw $t3, 0x0004($v0) ## 00000004 /* 03488 80AB4218 AC4A0000 */ sw $t2, 0x0000($v0) ## 00000000 -/* 0348C 80AB421C 8FA30070 */ lw $v1, 0x0070($sp) +/* 0348C 80AB421C 8FA30070 */ lw $v1, 0x0070($sp) /* 03490 80AB4220 3C0D80AB */ lui $t5, %hi(func_80AB4074) ## $t5 = 80AB0000 /* 03494 80AB4224 3C0C80AB */ lui $t4, %hi(func_80AB3FE8) ## $t4 = 80AB0000 /* 03498 80AB4228 2462014C */ addiu $v0, $v1, 0x014C ## $v0 = 0000014C @@ -76,21 +76,21 @@ glabel func_80AB410C /* 034A4 80AB4234 90470002 */ lbu $a3, 0x0002($v0) ## 0000014E /* 034A8 80AB4238 258C3FE8 */ addiu $t4, $t4, %lo(func_80AB3FE8) ## $t4 = 80AB3FE8 /* 034AC 80AB423C 25AD4074 */ addiu $t5, $t5, %lo(func_80AB4074) ## $t5 = 80AB4074 -/* 034B0 80AB4240 AFAD0014 */ sw $t5, 0x0014($sp) -/* 034B4 80AB4244 AFAC0010 */ sw $t4, 0x0010($sp) -/* 034B8 80AB4248 8FA40074 */ lw $a0, 0x0074($sp) -/* 034BC 80AB424C 0C0286B2 */ jal func_800A1AC8 -/* 034C0 80AB4250 AFA30018 */ sw $v1, 0x0018($sp) -/* 034C4 80AB4254 8FAE0074 */ lw $t6, 0x0074($sp) +/* 034B0 80AB4240 AFAD0014 */ sw $t5, 0x0014($sp) +/* 034B4 80AB4244 AFAC0010 */ sw $t4, 0x0010($sp) +/* 034B8 80AB4248 8FA40074 */ lw $a0, 0x0074($sp) +/* 034BC 80AB424C 0C0286B2 */ jal SkelAnime_DrawSV +/* 034C0 80AB4250 AFA30018 */ sw $v1, 0x0018($sp) +/* 034C4 80AB4254 8FAE0074 */ lw $t6, 0x0074($sp) /* 034C8 80AB4258 3C0680AB */ lui $a2, %hi(D_80AB51B8) ## $a2 = 80AB0000 /* 034CC 80AB425C 24C651B8 */ addiu $a2, $a2, %lo(D_80AB51B8) ## $a2 = 80AB51B8 /* 034D0 80AB4260 27A40048 */ addiu $a0, $sp, 0x0048 ## $a0 = FFFFFFD8 /* 034D4 80AB4264 240703F5 */ addiu $a3, $zero, 0x03F5 ## $a3 = 000003F5 -/* 034D8 80AB4268 0C031AD5 */ jal func_800C6B54 +/* 034D8 80AB4268 0C031AD5 */ jal Graph_CloseDisps /* 034DC 80AB426C 8DC50000 */ lw $a1, 0x0000($t6) ## 00000000 -/* 034E0 80AB4270 8FBF0024 */ lw $ra, 0x0024($sp) +/* 034E0 80AB4270 8FBF0024 */ lw $ra, 0x0024($sp) /* 034E4 80AB4274 27BD0070 */ addiu $sp, $sp, 0x0070 ## $sp = 00000000 -/* 034E8 80AB4278 03E00008 */ jr $ra +/* 034E8 80AB4278 03E00008 */ jr $ra /* 034EC 80AB427C 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 index 1f022044ca..74830c28ed 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Niw/EnNiw_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Niw/EnNiw_Draw.s @@ -1,9 +1,9 @@ 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) +/* 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 @@ -13,36 +13,36 @@ glabel EnNiw_Draw /* 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 +/* 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 func_800A1AC8 -/* 029A0 80AB8120 8FA4004C */ lw $a0, 0x004C($sp) +/* 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 +/* 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) +/* 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) +/* 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 +/* 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 index b5848d3d6f..2907ab0578 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Niw/EnNiw_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Niw/EnNiw_Init.s @@ -1,65 +1,65 @@ 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) +/* 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 +/* 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 +/* 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 +/* 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) +/* 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 +/* 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 +/* 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) +/* 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, 0x8003 ## $a2 = 80030000 @@ -69,66 +69,66 @@ glabel EnNiw_Init /* 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) +/* 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 func_800A46F8 +/* 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) +/* 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 +/* 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 +/* 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 +/* 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 +/* 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 +/* 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 +/* 00194 80AB5914 4602003C */ c.lt.s $f0, $f2 /* 00198 80AB5918 00000000 */ nop -/* 0019C 80AB591C 45020018 */ bc1fl .L80AB5980 +/* 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) + +/* 001B0 80AB5930 AFA2003C */ sw $v0, 0x003C($sp) /* 001B4 80AB5934 3C0A8016 */ lui $t2, 0x8016 ## $t2 = 80160000 /* 001B8 80AB5938 954AF58A */ lhu $t2, -0x0A76($t2) ## 8015F58A /* 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) +/* 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 @@ -136,14 +136,14 @@ glabel EnNiw_Init /* 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) +/* 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 +/* 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 @@ -163,81 +163,81 @@ glabel EnNiw_Init /* 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 + +/* 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 +/* 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 +/* 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 +/* 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 +/* 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 +/* 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 +/* 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 +/* 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 +/* 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 +/* 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 +/* 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 +/* 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 +/* 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 +/* 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 +/* 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 @@ -247,8 +247,8 @@ 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 +/* 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 @@ -260,19 +260,19 @@ glabel L80AB5AF4 .L80AB5AF8: /* 00378 80AB5AF8 02002825 */ or $a1, $s0, $zero ## $a1 = 0000030C /* 0037C 80AB5AFC 0C0170D9 */ jal ActorCollider_AllocCylinder - -/* 00380 80AB5B00 8FA40054 */ lw $a0, 0x0054($sp) + +/* 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 +/* 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 +/* 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 +/* 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 @@ -281,47 +281,47 @@ glabel L80AB5AF4 /* 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 ActorCollider_InitCylinder - -/* 003C8 80AB5B48 8FA40054 */ lw $a0, 0x0054($sp) -/* 003CC 80AB5B4C 8FAD0054 */ lw $t5, 0x0054($sp) + +/* 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 +/* 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 +/* 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 +/* 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 ActorCollider_InitCylinder - + /* 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) +/* 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 +/* 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/func_80AB627C.s b/asm/non_matchings/overlays/actors/ovl_En_Niw/func_80AB627C.s index f54eeb0e9e..8ff24c1b91 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Niw/func_80AB627C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Niw/func_80AB627C.s @@ -1,50 +1,50 @@ glabel func_80AB627C /* 00AFC 80AB627C 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 00B00 80AB6280 AFB00028 */ sw $s0, 0x0028($sp) +/* 00B00 80AB6280 AFB00028 */ sw $s0, 0x0028($sp) /* 00B04 80AB6284 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00B08 80AB6288 AFBF002C */ sw $ra, 0x002C($sp) +/* 00B08 80AB6288 AFBF002C */ sw $ra, 0x002C($sp) /* 00B0C 80AB628C 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 -/* 00B10 80AB6290 AFA50034 */ sw $a1, 0x0034($sp) +/* 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 +/* 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_ChangeAnimation - -/* 00B4C 80AB62CC E7A80018 */ swc1 $f8, 0x0018($sp) +/* 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 +/* 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 +/* 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 +/* 00B78 80AB62F8 10000005 */ beq $zero, $zero, .L80AB6310 /* 00B7C 80AB62FC AE0E0250 */ sw $t6, 0x0250($s0) ## 00000250 .L80AB6300: -/* 00B80 80AB6300 10000003 */ beq $zero, $zero, .L80AB6310 +/* 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) +/* 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 +/* 00B9C 80AB631C 03E00008 */ jr $ra /* 00BA0 80AB6320 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 index e00f727897..bb8d3ea06e 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Niw/func_80AB6570.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Niw/func_80AB6570.s @@ -307,7 +307,7 @@ glabel func_80AB6570 /* 01228 80AB69A8 A600025A */ sh $zero, 0x025A($s0) ## 0000025A /* 0122C 80AB69AC A60E029E */ sh $t6, 0x029E($s0) ## 0000029E .L80AB69B0: -/* 01230 80AB69B0 0C03F494 */ jal func_800FD250 +/* 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) 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 index 7947ca1e0e..4d822bd897 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Niw/func_80AB6A38.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Niw/func_80AB6A38.s @@ -69,7 +69,7 @@ glabel func_80AB6A38 /* 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 func_800FD250 +/* 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) 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 index 5070004233..99aec75a24 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Niw/func_80AB7290.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Niw/func_80AB7290.s @@ -1,44 +1,44 @@ 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) +/* 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) +/* 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) +/* 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_ChangeAnimation - +/* 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) + +/* 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 +/* 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) +/* 01B98 80AB7318 8FBF0024 */ lw $ra, 0x0024($sp) /* 01B9C 80AB731C 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 01BA0 80AB7320 03E00008 */ jr $ra +/* 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 index 6e60a57452..d75bb2f170 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Niw/func_80AB7328.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Niw/func_80AB7328.s @@ -42,7 +42,7 @@ glabel func_80AB7328 /* 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 func_800FD250 +/* 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) 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 index ec24e0bb07..9a0701b15b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Niw/func_80AB840C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Niw/func_80AB840C.s @@ -21,7 +21,7 @@ glabel func_80AB840C /* 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 func_800C6AC4 +/* 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 @@ -101,7 +101,7 @@ glabel func_80AB840C /* 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 func_800C6B54 +/* 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) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Niw_Girl/EnNiwGirl_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Niw_Girl/EnNiwGirl_Draw.s index a7c26a443a..5b21b6d45c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Niw_Girl/EnNiwGirl_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Niw_Girl/EnNiwGirl_Draw.s @@ -1,9 +1,9 @@ glabel EnNiwGirl_Draw /* 008C8 80AB9848 27BDFFA0 */ addiu $sp, $sp, 0xFFA0 ## $sp = FFFFFFA0 /* 008CC 80AB984C 3C0F80AC */ lui $t7, %hi(D_80AB99CC) ## $t7 = 80AC0000 -/* 008D0 80AB9850 AFBF002C */ sw $ra, 0x002C($sp) -/* 008D4 80AB9854 AFB10028 */ sw $s1, 0x0028($sp) -/* 008D8 80AB9858 AFB00024 */ sw $s0, 0x0024($sp) +/* 008D0 80AB9850 AFBF002C */ sw $ra, 0x002C($sp) +/* 008D4 80AB9854 AFB10028 */ sw $s1, 0x0028($sp) +/* 008D8 80AB9858 AFB00024 */ sw $s0, 0x0024($sp) /* 008DC 80AB985C 25EF99CC */ addiu $t7, $t7, %lo(D_80AB99CC) ## $t7 = 80AB99CC /* 008E0 80AB9860 8DF90000 */ lw $t9, 0x0000($t7) ## 80AB99CC /* 008E4 80AB9864 27AE004C */ addiu $t6, $sp, 0x004C ## $t6 = FFFFFFEC @@ -19,11 +19,11 @@ glabel EnNiwGirl_Draw /* 0090C 80AB988C 24C69AEC */ addiu $a2, $a2, %lo(D_80AB9AEC) ## $a2 = 80AB9AEC /* 00910 80AB9890 27A40038 */ addiu $a0, $sp, 0x0038 ## $a0 = FFFFFFD8 /* 00914 80AB9894 2407023D */ addiu $a3, $zero, 0x023D ## $a3 = 0000023D -/* 00918 80AB9898 0C031AB1 */ jal func_800C6AC4 -/* 0091C 80AB989C AFA50048 */ sw $a1, 0x0048($sp) -/* 00920 80AB98A0 0C024F46 */ jal func_80093D18 +/* 00918 80AB9898 0C031AB1 */ jal Graph_OpenDisps +/* 0091C 80AB989C AFA50048 */ sw $a1, 0x0048($sp) +/* 00920 80AB98A0 0C024F46 */ jal func_80093D18 /* 00924 80AB98A4 8E240000 */ lw $a0, 0x0000($s1) ## 00000000 -/* 00928 80AB98A8 8FA50048 */ lw $a1, 0x0048($sp) +/* 00928 80AB98A8 8FA50048 */ lw $a1, 0x0048($sp) /* 0092C 80AB98AC 3C09DB06 */ lui $t1, 0xDB06 ## $t1 = DB060000 /* 00930 80AB98B0 35290020 */ ori $t1, $t1, 0x0020 ## $t1 = DB060020 /* 00934 80AB98B4 8CA302C0 */ lw $v1, 0x02C0($a1) ## 000002C0 @@ -35,44 +35,44 @@ glabel EnNiwGirl_Draw /* 0094C 80AB98CC 860A0272 */ lh $t2, 0x0272($s0) ## 00000272 /* 00950 80AB98D0 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 /* 00954 80AB98D4 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF -/* 00958 80AB98D8 000A5880 */ sll $t3, $t2, 2 -/* 0095C 80AB98DC 008B2021 */ addu $a0, $a0, $t3 -/* 00960 80AB98E0 8C8499D8 */ lw $a0, %lo(D_80AB99D8)($a0) +/* 00958 80AB98D8 000A5880 */ sll $t3, $t2, 2 +/* 0095C 80AB98DC 008B2021 */ addu $a0, $a0, $t3 +/* 00960 80AB98E0 8C8499D8 */ lw $a0, %lo(D_80AB99D8)($a0) /* 00964 80AB98E4 3C0980AC */ lui $t1, %hi(func_80AB97E4) ## $t1 = 80AC0000 /* 00968 80AB98E8 252997E4 */ addiu $t1, $t1, %lo(func_80AB97E4) ## $t1 = 80AB97E4 -/* 0096C 80AB98EC 00046900 */ sll $t5, $a0, 4 -/* 00970 80AB98F0 000D7702 */ srl $t6, $t5, 28 -/* 00974 80AB98F4 000E7880 */ sll $t7, $t6, 2 -/* 00978 80AB98F8 030FC021 */ addu $t8, $t8, $t7 +/* 0096C 80AB98EC 00046900 */ sll $t5, $a0, 4 +/* 00970 80AB98F0 000D7702 */ srl $t6, $t5, 28 +/* 00974 80AB98F4 000E7880 */ sll $t7, $t6, 2 +/* 00978 80AB98F8 030FC021 */ addu $t8, $t8, $t7 /* 0097C 80AB98FC 8F186FA8 */ lw $t8, 0x6FA8($t8) ## 80166FA8 -/* 00980 80AB9900 00816024 */ and $t4, $a0, $at +/* 00980 80AB9900 00816024 */ and $t4, $a0, $at /* 00984 80AB9904 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 00988 80AB9908 0198C821 */ addu $t9, $t4, $t8 -/* 0098C 80AB990C 03214021 */ addu $t0, $t9, $at +/* 00988 80AB9908 0198C821 */ addu $t9, $t4, $t8 +/* 0098C 80AB990C 03214021 */ addu $t0, $t9, $at /* 00990 80AB9910 AC680004 */ sw $t0, 0x0004($v1) ## 00000004 /* 00994 80AB9914 9207014E */ lbu $a3, 0x014E($s0) ## 0000014E /* 00998 80AB9918 8E06016C */ lw $a2, 0x016C($s0) ## 0000016C /* 0099C 80AB991C 8E050150 */ lw $a1, 0x0150($s0) ## 00000150 -/* 009A0 80AB9920 AFB00018 */ sw $s0, 0x0018($sp) -/* 009A4 80AB9924 AFA00014 */ sw $zero, 0x0014($sp) -/* 009A8 80AB9928 AFA90010 */ sw $t1, 0x0010($sp) -/* 009AC 80AB992C 0C0286B2 */ jal func_800A1AC8 +/* 009A0 80AB9920 AFB00018 */ sw $s0, 0x0018($sp) +/* 009A4 80AB9924 AFA00014 */ sw $zero, 0x0014($sp) +/* 009A8 80AB9928 AFA90010 */ sw $t1, 0x0010($sp) +/* 009AC 80AB992C 0C0286B2 */ jal SkelAnime_DrawSV /* 009B0 80AB9930 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 009B4 80AB9934 26040024 */ addiu $a0, $s0, 0x0024 ## $a0 = 00000024 /* 009B8 80AB9938 27A5004C */ addiu $a1, $sp, 0x004C ## $a1 = FFFFFFEC /* 009BC 80AB993C 240600FF */ addiu $a2, $zero, 0x00FF ## $a2 = 000000FF -/* 009C0 80AB9940 0C00CF0C */ jal func_80033C30 +/* 009C0 80AB9940 0C00CF0C */ jal func_80033C30 /* 009C4 80AB9944 02203825 */ or $a3, $s1, $zero ## $a3 = 00000000 /* 009C8 80AB9948 3C0680AC */ lui $a2, %hi(D_80AB9B00) ## $a2 = 80AC0000 /* 009CC 80AB994C 24C69B00 */ addiu $a2, $a2, %lo(D_80AB9B00) ## $a2 = 80AB9B00 /* 009D0 80AB9950 27A40038 */ addiu $a0, $sp, 0x0038 ## $a0 = FFFFFFD8 /* 009D4 80AB9954 8E250000 */ lw $a1, 0x0000($s1) ## 00000000 -/* 009D8 80AB9958 0C031AD5 */ jal func_800C6B54 +/* 009D8 80AB9958 0C031AD5 */ jal Graph_CloseDisps /* 009DC 80AB995C 24070250 */ addiu $a3, $zero, 0x0250 ## $a3 = 00000250 -/* 009E0 80AB9960 8FBF002C */ lw $ra, 0x002C($sp) -/* 009E4 80AB9964 8FB00024 */ lw $s0, 0x0024($sp) -/* 009E8 80AB9968 8FB10028 */ lw $s1, 0x0028($sp) -/* 009EC 80AB996C 03E00008 */ jr $ra +/* 009E0 80AB9960 8FBF002C */ lw $ra, 0x002C($sp) +/* 009E4 80AB9964 8FB00024 */ lw $s0, 0x0024($sp) +/* 009E8 80AB9968 8FB10028 */ lw $s1, 0x0028($sp) +/* 009EC 80AB996C 03E00008 */ jr $ra /* 009F0 80AB9970 27BD0060 */ addiu $sp, $sp, 0x0060 ## $sp = 00000000 /* 009F4 80AB9974 00000000 */ nop /* 009F8 80AB9978 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Niw_Girl/EnNiwGirl_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Niw_Girl/EnNiwGirl_Init.s index 349c7aa77f..5920760c84 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Niw_Girl/EnNiwGirl_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Niw_Girl/EnNiwGirl_Init.s @@ -1,38 +1,38 @@ glabel EnNiwGirl_Init /* 00000 80AB8F80 27BDFF98 */ addiu $sp, $sp, 0xFF98 ## $sp = FFFFFF98 -/* 00004 80AB8F84 AFB00038 */ sw $s0, 0x0038($sp) +/* 00004 80AB8F84 AFB00038 */ sw $s0, 0x0038($sp) /* 00008 80AB8F88 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 0000C 80AB8F8C AFBF003C */ sw $ra, 0x003C($sp) -/* 00010 80AB8F90 AFA5006C */ sw $a1, 0x006C($sp) +/* 0000C 80AB8F8C AFBF003C */ sw $ra, 0x003C($sp) +/* 00010 80AB8F90 AFA5006C */ sw $a1, 0x006C($sp) /* 00014 80AB8F94 260E0190 */ addiu $t6, $s0, 0x0190 ## $t6 = 00000190 /* 00018 80AB8F98 260F01F6 */ addiu $t7, $s0, 0x01F6 ## $t7 = 000001F6 /* 0001C 80AB8F9C 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 /* 00020 80AB8FA0 3C060601 */ lui $a2, 0x0601 ## $a2 = 06010000 /* 00024 80AB8FA4 3C070600 */ lui $a3, 0x0600 ## $a3 = 06000000 /* 00028 80AB8FA8 24180011 */ addiu $t8, $zero, 0x0011 ## $t8 = 00000011 -/* 0002C 80AB8FAC AFB80018 */ sw $t8, 0x0018($sp) +/* 0002C 80AB8FAC AFB80018 */ sw $t8, 0x0018($sp) /* 00030 80AB8FB0 24E70378 */ addiu $a3, $a3, 0x0378 ## $a3 = 06000378 /* 00034 80AB8FB4 24C69948 */ addiu $a2, $a2, 0x9948 ## $a2 = 06009948 /* 00038 80AB8FB8 2605014C */ addiu $a1, $s0, 0x014C ## $a1 = 0000014C -/* 0003C 80AB8FBC AFAF0014 */ sw $t7, 0x0014($sp) -/* 00040 80AB8FC0 0C0291BE */ jal func_800A46F8 -/* 00044 80AB8FC4 AFAE0010 */ sw $t6, 0x0010($sp) +/* 0003C 80AB8FBC AFAF0014 */ sw $t7, 0x0014($sp) +/* 00040 80AB8FC0 0C0291BE */ jal SkelAnime_InitSV +/* 00044 80AB8FC4 AFAE0010 */ sw $t6, 0x0010($sp) /* 00048 80AB8FC8 26050288 */ addiu $a1, $s0, 0x0288 ## $a1 = 00000288 -/* 0004C 80AB8FCC AFA50040 */ sw $a1, 0x0040($sp) +/* 0004C 80AB8FCC AFA50040 */ sw $a1, 0x0040($sp) /* 00050 80AB8FD0 0C0170D9 */ jal ActorCollider_AllocCylinder - -/* 00054 80AB8FD4 8FA4006C */ lw $a0, 0x006C($sp) + +/* 00054 80AB8FD4 8FA4006C */ lw $a0, 0x006C($sp) /* 00058 80AB8FD8 3C0780AC */ lui $a3, %hi(D_80AB99A0) ## $a3 = 80AC0000 -/* 0005C 80AB8FDC 8FA50040 */ lw $a1, 0x0040($sp) +/* 0005C 80AB8FDC 8FA50040 */ lw $a1, 0x0040($sp) /* 00060 80AB8FE0 24E799A0 */ addiu $a3, $a3, %lo(D_80AB99A0) ## $a3 = 80AB99A0 -/* 00064 80AB8FE4 8FA4006C */ lw $a0, 0x006C($sp) +/* 00064 80AB8FE4 8FA4006C */ lw $a0, 0x006C($sp) /* 00068 80AB8FE8 0C01712B */ jal ActorCollider_InitCylinder - + /* 0006C 80AB8FEC 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 00070 80AB8FF0 8603001C */ lh $v1, 0x001C($s0) ## 0000001C /* 00074 80AB8FF4 24190006 */ addiu $t9, $zero, 0x0006 ## $t9 = 00000006 /* 00078 80AB8FF8 A219001F */ sb $t9, 0x001F($s0) ## 0000001F -/* 0007C 80AB8FFC 04630004 */ bgezl $v1, .L80AB9010 +/* 0007C 80AB8FFC 04630004 */ bgezl $v1, .L80AB9010 /* 00080 80AB9000 860A00B6 */ lh $t2, 0x00B6($s0) ## 000000B6 /* 00084 80AB9004 A600001C */ sh $zero, 0x001C($s0) ## 0000001C /* 00088 80AB9008 8603001C */ lh $v1, 0x001C($s0) ## 0000001C @@ -43,103 +43,103 @@ glabel EnNiwGirl_Init /* 00098 80AB9018 448A3000 */ mtc1 $t2, $f6 ## $f6 = 0.00 /* 0009C 80AB901C 3C014700 */ lui $at, 0x4700 ## $at = 47000000 /* 000A0 80AB9020 44815000 */ mtc1 $at, $f10 ## $f10 = 32768.00 -/* 000A4 80AB9024 46803220 */ cvt.s.w $f8, $f6 -/* 000A8 80AB9028 00034203 */ sra $t0, $v1, 8 +/* 000A4 80AB9024 46803220 */ cvt.s.w $f8, $f6 +/* 000A8 80AB9028 00034203 */ sra $t0, $v1, 8 /* 000AC 80AB902C 310900FF */ andi $t1, $t0, 0x00FF ## $t1 = 00000000 /* 000B0 80AB9030 A6090276 */ sh $t1, 0x0276($s0) ## 00000276 /* 000B4 80AB9034 3C0180AC */ lui $at, %hi(D_80AB9B14) ## $at = 80AC0000 /* 000B8 80AB9038 E604006C */ swc1 $f4, 0x006C($s0) ## 0000006C -/* 000BC 80AB903C 460A4403 */ div.s $f16, $f8, $f10 -/* 000C0 80AB9040 C4329B14 */ lwc1 $f18, %lo(D_80AB9B14)($at) +/* 000BC 80AB903C 460A4403 */ div.s $f16, $f8, $f10 +/* 000C0 80AB9040 C4329B14 */ lwc1 $f18, %lo(D_80AB9B14)($at) /* 000C4 80AB9044 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 000C8 80AB9048 46128302 */ mul.s $f12, $f16, $f18 -/* 000CC 80AB904C 0C034348 */ jal Matrix_RotateY +/* 000C8 80AB9048 46128302 */ mul.s $f12, $f16, $f18 +/* 000CC 80AB904C 0C034348 */ jal Matrix_RotateY /* 000D0 80AB9050 00000000 */ nop /* 000D4 80AB9054 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 /* 000D8 80AB9058 3C014248 */ lui $at, 0x4248 ## $at = 42480000 /* 000DC 80AB905C 44812000 */ mtc1 $at, $f4 ## $f4 = 50.00 /* 000E0 80AB9060 27A40054 */ addiu $a0, $sp, 0x0054 ## $a0 = FFFFFFEC /* 000E4 80AB9064 27A50048 */ addiu $a1, $sp, 0x0048 ## $a1 = FFFFFFE0 -/* 000E8 80AB9068 E7A00050 */ swc1 $f0, 0x0050($sp) -/* 000EC 80AB906C E7A0004C */ swc1 $f0, 0x004C($sp) -/* 000F0 80AB9070 E7A00048 */ swc1 $f0, 0x0048($sp) -/* 000F4 80AB9074 E7A00058 */ swc1 $f0, 0x0058($sp) -/* 000F8 80AB9078 E7A00054 */ swc1 $f0, 0x0054($sp) -/* 000FC 80AB907C 0C0346BD */ jal Matrix_MultVec3f -/* 00100 80AB9080 E7A4005C */ swc1 $f4, 0x005C($sp) +/* 000E8 80AB9068 E7A00050 */ swc1 $f0, 0x0050($sp) +/* 000EC 80AB906C E7A0004C */ swc1 $f0, 0x004C($sp) +/* 000F0 80AB9070 E7A00048 */ swc1 $f0, 0x0048($sp) +/* 000F4 80AB9074 E7A00058 */ swc1 $f0, 0x0058($sp) +/* 000F8 80AB9078 E7A00054 */ swc1 $f0, 0x0054($sp) +/* 000FC 80AB907C 0C0346BD */ jal Matrix_MultVec3f +/* 00100 80AB9080 E7A4005C */ swc1 $f4, 0x005C($sp) /* 00104 80AB9084 C6060024 */ lwc1 $f6, 0x0024($s0) ## 00000024 -/* 00108 80AB9088 C7A80048 */ lwc1 $f8, 0x0048($sp) -/* 0010C 80AB908C C7B2004C */ lwc1 $f18, 0x004C($sp) -/* 00110 80AB9090 8FA6006C */ lw $a2, 0x006C($sp) -/* 00114 80AB9094 46083280 */ add.s $f10, $f6, $f8 -/* 00118 80AB9098 C7A80050 */ lwc1 $f8, 0x0050($sp) +/* 00108 80AB9088 C7A80048 */ lwc1 $f8, 0x0048($sp) +/* 0010C 80AB908C C7B2004C */ lwc1 $f18, 0x004C($sp) +/* 00110 80AB9090 8FA6006C */ lw $a2, 0x006C($sp) +/* 00114 80AB9094 46083280 */ add.s $f10, $f6, $f8 +/* 00118 80AB9098 C7A80050 */ lwc1 $f8, 0x0050($sp) /* 0011C 80AB909C 240C000A */ addiu $t4, $zero, 0x000A ## $t4 = 0000000A /* 00120 80AB90A0 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 00124 80AB90A4 E7AA0010 */ swc1 $f10, 0x0010($sp) +/* 00124 80AB90A4 E7AA0010 */ swc1 $f10, 0x0010($sp) /* 00128 80AB90A8 C6100028 */ lwc1 $f16, 0x0028($s0) ## 00000028 /* 0012C 80AB90AC 24070019 */ addiu $a3, $zero, 0x0019 ## $a3 = 00000019 /* 00130 80AB90B0 24C41C24 */ addiu $a0, $a2, 0x1C24 ## $a0 = 00001C24 -/* 00134 80AB90B4 46128100 */ add.s $f4, $f16, $f18 -/* 00138 80AB90B8 E7A40014 */ swc1 $f4, 0x0014($sp) +/* 00134 80AB90B4 46128100 */ add.s $f4, $f16, $f18 +/* 00138 80AB90B8 E7A40014 */ swc1 $f4, 0x0014($sp) /* 0013C 80AB90BC C606002C */ lwc1 $f6, 0x002C($s0) ## 0000002C -/* 00140 80AB90C0 AFA0001C */ sw $zero, 0x001C($sp) -/* 00144 80AB90C4 46083280 */ add.s $f10, $f6, $f8 -/* 00148 80AB90C8 E7AA0018 */ swc1 $f10, 0x0018($sp) +/* 00140 80AB90C0 AFA0001C */ sw $zero, 0x001C($sp) +/* 00144 80AB90C4 46083280 */ add.s $f10, $f6, $f8 +/* 00148 80AB90C8 E7AA0018 */ swc1 $f10, 0x0018($sp) /* 0014C 80AB90CC 860B0032 */ lh $t3, 0x0032($s0) ## 00000032 -/* 00150 80AB90D0 AFAC0028 */ sw $t4, 0x0028($sp) -/* 00154 80AB90D4 AFA00024 */ sw $zero, 0x0024($sp) +/* 00150 80AB90D0 AFAC0028 */ sw $t4, 0x0028($sp) +/* 00154 80AB90D4 AFA00024 */ sw $zero, 0x0024($sp) /* 00158 80AB90D8 0C00C916 */ jal Actor_SpawnAttached - -/* 0015C 80AB90DC AFAB0020 */ sw $t3, 0x0020($sp) -/* 00160 80AB90E0 10400012 */ beq $v0, $zero, .L80AB912C + +/* 0015C 80AB90DC AFAB0020 */ sw $t3, 0x0020($sp) +/* 00160 80AB90E0 10400012 */ beq $v0, $zero, .L80AB912C /* 00164 80AB90E4 AE020284 */ sw $v0, 0x0284($s0) ## 00000284 /* 00168 80AB90E8 3C0480AC */ lui $a0, %hi(D_80AB99F0) ## $a0 = 80AC0000 /* 0016C 80AB90EC 248499F0 */ addiu $a0, $a0, %lo(D_80AB99F0) ## $a0 = 80AB99F0 /* 00170 80AB90F0 0C00084C */ jal osSyncPrintf - + /* 00174 80AB90F4 8605001C */ lh $a1, 0x001C($s0) ## 0000001C /* 00178 80AB90F8 3C0480AC */ lui $a0, %hi(D_80AB9A34) ## $a0 = 80AC0000 /* 0017C 80AB90FC 24849A34 */ addiu $a0, $a0, %lo(D_80AB9A34) ## $a0 = 80AB9A34 /* 00180 80AB9100 0C00084C */ jal osSyncPrintf - + /* 00184 80AB9104 86050276 */ lh $a1, 0x0276($s0) ## 00000276 /* 00188 80AB9108 3C0480AC */ lui $a0, %hi(D_80AB9A70) ## $a0 = 80AC0000 /* 0018C 80AB910C 0C00084C */ jal osSyncPrintf - + /* 00190 80AB9110 24849A70 */ addiu $a0, $a0, %lo(D_80AB9A70) ## $a0 = 80AB9A70 /* 00194 80AB9114 3C0E80AC */ lui $t6, %hi(func_80AB93C0) ## $t6 = 80AC0000 /* 00198 80AB9118 240D00FF */ addiu $t5, $zero, 0x00FF ## $t5 = 000000FF /* 0019C 80AB911C 25CE93C0 */ addiu $t6, $t6, %lo(func_80AB93C0) ## $t6 = 80AB93C0 /* 001A0 80AB9120 A20D00AE */ sb $t5, 0x00AE($s0) ## 000000AE -/* 001A4 80AB9124 10000011 */ beq $zero, $zero, .L80AB916C +/* 001A4 80AB9124 10000011 */ beq $zero, $zero, .L80AB916C /* 001A8 80AB9128 AE0E025C */ sw $t6, 0x025C($s0) ## 0000025C .L80AB912C: /* 001AC 80AB912C 3C0480AC */ lui $a0, %hi(D_80AB9A74) ## $a0 = 80AC0000 /* 001B0 80AB9130 0C00084C */ jal osSyncPrintf - + /* 001B4 80AB9134 24849A74 */ addiu $a0, $a0, %lo(D_80AB9A74) ## $a0 = 80AB9A74 /* 001B8 80AB9138 3C0480AC */ lui $a0, %hi(D_80AB9A78) ## $a0 = 80AC0000 /* 001BC 80AB913C 24849A78 */ addiu $a0, $a0, %lo(D_80AB9A78) ## $a0 = 80AB9A78 /* 001C0 80AB9140 0C00084C */ jal osSyncPrintf - + /* 001C4 80AB9144 8605001C */ lh $a1, 0x001C($s0) ## 0000001C /* 001C8 80AB9148 3C0480AC */ lui $a0, %hi(D_80AB9AB8) ## $a0 = 80AC0000 /* 001CC 80AB914C 24849AB8 */ addiu $a0, $a0, %lo(D_80AB9AB8) ## $a0 = 80AB9AB8 /* 001D0 80AB9150 0C00084C */ jal osSyncPrintf - + /* 001D4 80AB9154 86050276 */ lh $a1, 0x0276($s0) ## 00000276 /* 001D8 80AB9158 3C0480AC */ lui $a0, %hi(D_80AB9AE8) ## $a0 = 80AC0000 /* 001DC 80AB915C 0C00084C */ jal osSyncPrintf - + /* 001E0 80AB9160 24849AE8 */ addiu $a0, $a0, %lo(D_80AB9AE8) ## $a0 = 80AB9AE8 /* 001E4 80AB9164 0C00B55C */ jal Actor_Kill - + /* 001E8 80AB9168 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 .L80AB916C: -/* 001EC 80AB916C 8FBF003C */ lw $ra, 0x003C($sp) -/* 001F0 80AB9170 8FB00038 */ lw $s0, 0x0038($sp) +/* 001EC 80AB916C 8FBF003C */ lw $ra, 0x003C($sp) +/* 001F0 80AB9170 8FB00038 */ lw $s0, 0x0038($sp) /* 001F4 80AB9174 27BD0068 */ addiu $sp, $sp, 0x0068 ## $sp = 00000000 -/* 001F8 80AB9178 03E00008 */ jr $ra +/* 001F8 80AB9178 03E00008 */ jr $ra /* 001FC 80AB917C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Niw_Girl/func_80AB918C.s b/asm/non_matchings/overlays/actors/ovl_En_Niw_Girl/func_80AB918C.s index 11e4995c75..ad6874648a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Niw_Girl/func_80AB918C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Niw_Girl/func_80AB918C.s @@ -1,38 +1,38 @@ glabel func_80AB918C /* 0020C 80AB918C 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 00210 80AB9190 AFA40028 */ sw $a0, 0x0028($sp) -/* 00214 80AB9194 AFBF0024 */ sw $ra, 0x0024($sp) +/* 00210 80AB9190 AFA40028 */ sw $a0, 0x0028($sp) +/* 00214 80AB9194 AFBF0024 */ sw $ra, 0x0024($sp) /* 00218 80AB9198 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 -/* 0021C 80AB919C AFA5002C */ sw $a1, 0x002C($sp) +/* 0021C 80AB919C AFA5002C */ sw $a1, 0x002C($sp) /* 00220 80AB91A0 0C028800 */ jal SkelAnime_GetFrameCount - + /* 00224 80AB91A4 24840378 */ addiu $a0, $a0, 0x0378 ## $a0 = 06000378 /* 00228 80AB91A8 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 0022C 80AB91AC 3C01C120 */ lui $at, 0xC120 ## $at = C1200000 -/* 00230 80AB91B0 8FA30028 */ lw $v1, 0x0028($sp) -/* 00234 80AB91B4 468021A0 */ cvt.s.w $f6, $f4 +/* 00230 80AB91B0 8FA30028 */ lw $v1, 0x0028($sp) +/* 00234 80AB91B4 468021A0 */ cvt.s.w $f6, $f4 /* 00238 80AB91B8 44814000 */ mtc1 $at, $f8 ## $f8 = -10.00 /* 0023C 80AB91BC 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 00240 80AB91C0 24A50378 */ addiu $a1, $a1, 0x0378 ## $a1 = 06000378 /* 00244 80AB91C4 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 00248 80AB91C8 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 0024C 80AB91CC E7A60010 */ swc1 $f6, 0x0010($sp) -/* 00250 80AB91D0 AFA00014 */ sw $zero, 0x0014($sp) +/* 0024C 80AB91CC E7A60010 */ swc1 $f6, 0x0010($sp) +/* 00250 80AB91D0 AFA00014 */ sw $zero, 0x0014($sp) /* 00254 80AB91D4 2464014C */ addiu $a0, $v1, 0x014C ## $a0 = 0000014C -/* 00258 80AB91D8 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 0025C 80AB91DC E7A80018 */ swc1 $f8, 0x0018($sp) -/* 00260 80AB91E0 8FA30028 */ lw $v1, 0x0028($sp) +/* 00258 80AB91D8 0C029468 */ jal SkelAnime_ChangeAnim + +/* 0025C 80AB91DC E7A80018 */ swc1 $f8, 0x0018($sp) +/* 00260 80AB91E0 8FA30028 */ lw $v1, 0x0028($sp) /* 00264 80AB91E4 2401FFFE */ addiu $at, $zero, 0xFFFE ## $at = FFFFFFFE /* 00268 80AB91E8 3C1880AC */ lui $t8, %hi(func_80AB9210) ## $t8 = 80AC0000 /* 0026C 80AB91EC 8C6E0004 */ lw $t6, 0x0004($v1) ## 00000004 /* 00270 80AB91F0 27189210 */ addiu $t8, $t8, %lo(func_80AB9210) ## $t8 = 80AB9210 /* 00274 80AB91F4 AC78025C */ sw $t8, 0x025C($v1) ## 0000025C -/* 00278 80AB91F8 01C17824 */ and $t7, $t6, $at +/* 00278 80AB91F8 01C17824 */ and $t7, $t6, $at /* 0027C 80AB91FC AC6F0004 */ sw $t7, 0x0004($v1) ## 00000004 -/* 00280 80AB9200 8FBF0024 */ lw $ra, 0x0024($sp) +/* 00280 80AB9200 8FBF0024 */ lw $ra, 0x0024($sp) /* 00284 80AB9204 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 00288 80AB9208 03E00008 */ jr $ra +/* 00288 80AB9208 03E00008 */ jr $ra /* 0028C 80AB920C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Niw_Girl/func_80AB9210.s b/asm/non_matchings/overlays/actors/ovl_En_Niw_Girl/func_80AB9210.s index 98a607c5a5..094c5a7961 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Niw_Girl/func_80AB9210.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Niw_Girl/func_80AB9210.s @@ -70,7 +70,7 @@ glabel func_80AB9210 /* 00390 80AB9310 8E0F0284 */ lw $t7, 0x0284($s0) ## 00000284 /* 00394 80AB9314 A5E002E8 */ sh $zero, 0x02E8($t7) ## 000002E8 .L80AB9318: -/* 00398 80AB9318 0C03F494 */ jal func_800FD250 +/* 00398 80AB9318 0C03F494 */ jal Math_atan2f /* 0039C 80AB931C 00000000 */ nop /* 003A0 80AB9320 3C0180AC */ lui $at, %hi(D_80AB9B18) ## $at = 80AC0000 /* 003A4 80AB9324 C4289B18 */ lwc1 $f8, %lo(D_80AB9B18)($at) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Niw_Girl/func_80AB93C0.s b/asm/non_matchings/overlays/actors/ovl_En_Niw_Girl/func_80AB93C0.s index d66a9b90a8..e12f3cc9c5 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Niw_Girl/func_80AB93C0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Niw_Girl/func_80AB93C0.s @@ -1,27 +1,27 @@ glabel func_80AB93C0 /* 00440 80AB93C0 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 00444 80AB93C4 AFB00028 */ sw $s0, 0x0028($sp) +/* 00444 80AB93C4 AFB00028 */ sw $s0, 0x0028($sp) /* 00448 80AB93C8 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 0044C 80AB93CC AFBF002C */ sw $ra, 0x002C($sp) +/* 0044C 80AB93CC AFBF002C */ sw $ra, 0x002C($sp) /* 00450 80AB93D0 3C040601 */ lui $a0, 0x0601 ## $a0 = 06010000 -/* 00454 80AB93D4 AFA50034 */ sw $a1, 0x0034($sp) +/* 00454 80AB93D4 AFA50034 */ sw $a1, 0x0034($sp) /* 00458 80AB93D8 0C028800 */ jal SkelAnime_GetFrameCount - + /* 0045C 80AB93DC 24849C78 */ addiu $a0, $a0, 0x9C78 ## $a0 = 06009C78 /* 00460 80AB93E0 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 00464 80AB93E4 3C01C120 */ lui $at, 0xC120 ## $at = C1200000 /* 00468 80AB93E8 44814000 */ mtc1 $at, $f8 ## $f8 = -10.00 -/* 0046C 80AB93EC 468021A0 */ cvt.s.w $f6, $f4 +/* 0046C 80AB93EC 468021A0 */ cvt.s.w $f6, $f4 /* 00470 80AB93F0 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 /* 00474 80AB93F4 24A59C78 */ addiu $a1, $a1, 0x9C78 ## $a1 = 06009C78 /* 00478 80AB93F8 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C /* 0047C 80AB93FC 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 00480 80AB9400 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 00484 80AB9404 E7A60010 */ swc1 $f6, 0x0010($sp) -/* 00488 80AB9408 AFA00014 */ sw $zero, 0x0014($sp) -/* 0048C 80AB940C 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 00490 80AB9410 E7A80018 */ swc1 $f8, 0x0018($sp) +/* 00484 80AB9404 E7A60010 */ swc1 $f6, 0x0010($sp) +/* 00488 80AB9408 AFA00014 */ sw $zero, 0x0014($sp) +/* 0048C 80AB940C 0C029468 */ jal SkelAnime_ChangeAnim + +/* 00490 80AB9410 E7A80018 */ swc1 $f8, 0x0018($sp) /* 00494 80AB9414 8E0E0004 */ lw $t6, 0x0004($s0) ## 00000004 /* 00498 80AB9418 24187000 */ addiu $t8, $zero, 0x7000 ## $t8 = 00007000 /* 0049C 80AB941C A618010E */ sh $t8, 0x010E($s0) ## 0000010E @@ -30,36 +30,36 @@ glabel func_80AB93C0 /* 004A8 80AB9428 3C198016 */ lui $t9, 0x8016 ## $t9 = 80160000 /* 004AC 80AB942C 9739F544 */ lhu $t9, -0x0ABC($t9) ## 8015F544 /* 004B0 80AB9430 33280001 */ andi $t0, $t9, 0x0001 ## $t0 = 00000000 -/* 004B4 80AB9434 11000006 */ beq $t0, $zero, .L80AB9450 +/* 004B4 80AB9434 11000006 */ beq $t0, $zero, .L80AB9450 /* 004B8 80AB9438 00000000 */ nop /* 004BC 80AB943C 8609027A */ lh $t1, 0x027A($s0) ## 0000027A /* 004C0 80AB9440 240A70EA */ addiu $t2, $zero, 0x70EA ## $t2 = 000070EA -/* 004C4 80AB9444 15200002 */ bne $t1, $zero, .L80AB9450 +/* 004C4 80AB9444 15200002 */ bne $t1, $zero, .L80AB9450 /* 004C8 80AB9448 00000000 */ nop /* 004CC 80AB944C A60A010E */ sh $t2, 0x010E($s0) ## 0000010E .L80AB9450: -/* 004D0 80AB9450 0C023C20 */ jal func_8008F080 -/* 004D4 80AB9454 8FA40034 */ lw $a0, 0x0034($sp) +/* 004D0 80AB9450 0C023C20 */ jal func_8008F080 +/* 004D4 80AB9454 8FA40034 */ lw $a0, 0x0034($sp) /* 004D8 80AB9458 244BFFFF */ addiu $t3, $v0, 0xFFFF ## $t3 = FFFFFFFF -/* 004DC 80AB945C 2D610008 */ sltiu $at, $t3, 0x0008 -/* 004E0 80AB9460 10200011 */ beq $at, $zero, .L80AB94A8 -/* 004E4 80AB9464 000B5880 */ sll $t3, $t3, 2 +/* 004DC 80AB945C 2D610008 */ sltiu $at, $t3, 0x0008 +/* 004E0 80AB9460 10200011 */ beq $at, $zero, .L80AB94A8 +/* 004E4 80AB9464 000B5880 */ sll $t3, $t3, 2 /* 004E8 80AB9468 3C0180AC */ lui $at, %hi(jtbl_80AB9B1C) ## $at = 80AC0000 -/* 004EC 80AB946C 002B0821 */ addu $at, $at, $t3 -/* 004F0 80AB9470 8C2B9B1C */ lw $t3, %lo(jtbl_80AB9B1C)($at) -/* 004F4 80AB9474 01600008 */ jr $t3 +/* 004EC 80AB946C 002B0821 */ addu $at, $at, $t3 +/* 004F0 80AB9470 8C2B9B1C */ lw $t3, %lo(jtbl_80AB9B1C)($at) +/* 004F4 80AB9474 01600008 */ jr $t3 /* 004F8 80AB9478 00000000 */ nop glabel L80AB947C /* 004FC 80AB947C 240C7118 */ addiu $t4, $zero, 0x7118 ## $t4 = 00007118 -/* 00500 80AB9480 10000009 */ beq $zero, $zero, .L80AB94A8 +/* 00500 80AB9480 10000009 */ beq $zero, $zero, .L80AB94A8 /* 00504 80AB9484 A60C010E */ sh $t4, 0x010E($s0) ## 0000010E glabel L80AB9488 /* 00508 80AB9488 240D7119 */ addiu $t5, $zero, 0x7119 ## $t5 = 00007119 -/* 0050C 80AB948C 10000006 */ beq $zero, $zero, .L80AB94A8 +/* 0050C 80AB948C 10000006 */ beq $zero, $zero, .L80AB94A8 /* 00510 80AB9490 A60D010E */ sh $t5, 0x010E($s0) ## 0000010E glabel L80AB9494 /* 00514 80AB9494 240E711A */ addiu $t6, $zero, 0x711A ## $t6 = 0000711A -/* 00518 80AB9498 10000003 */ beq $zero, $zero, .L80AB94A8 +/* 00518 80AB9498 10000003 */ beq $zero, $zero, .L80AB94A8 /* 0051C 80AB949C A60E010E */ sh $t6, 0x010E($s0) ## 0000010E glabel L80AB94A0 /* 00520 80AB94A0 240F711B */ addiu $t7, $zero, 0x711B ## $t7 = 0000711B @@ -70,10 +70,10 @@ glabel L80AB94A0 /* 00530 80AB94B0 273994D0 */ addiu $t9, $t9, %lo(func_80AB94D0) ## $t9 = 80AB94D0 /* 00534 80AB94B4 A6180270 */ sh $t8, 0x0270($s0) ## 00000270 /* 00538 80AB94B8 AE19025C */ sw $t9, 0x025C($s0) ## 0000025C -/* 0053C 80AB94BC 8FBF002C */ lw $ra, 0x002C($sp) -/* 00540 80AB94C0 8FB00028 */ lw $s0, 0x0028($sp) +/* 0053C 80AB94BC 8FBF002C */ lw $ra, 0x002C($sp) +/* 00540 80AB94C0 8FB00028 */ lw $s0, 0x0028($sp) /* 00544 80AB94C4 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 00548 80AB94C8 03E00008 */ jr $ra +/* 00548 80AB94C8 03E00008 */ jr $ra /* 0054C 80AB94CC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Niw_Lady/func_80AB9D60.s b/asm/non_matchings/overlays/actors/ovl_En_Niw_Lady/func_80AB9D60.s index 20e44fe6a3..04e8f6bae1 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Niw_Lady/func_80AB9D60.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Niw_Lady/func_80AB9D60.s @@ -1,134 +1,134 @@ glabel func_80AB9D60 /* 00120 80AB9D60 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 00124 80AB9D64 AFA40028 */ sw $a0, 0x0028($sp) -/* 00128 80AB9D68 AFBF0024 */ sw $ra, 0x0024($sp) +/* 00124 80AB9D64 AFA40028 */ sw $a0, 0x0028($sp) +/* 00128 80AB9D68 AFBF0024 */ sw $ra, 0x0024($sp) /* 0012C 80AB9D6C 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 /* 00130 80AB9D70 24050008 */ addiu $a1, $zero, 0x0008 ## $a1 = 00000008 -/* 00134 80AB9D74 0C01B0D8 */ jal func_8006C360 -/* 00138 80AB9D78 AFA60030 */ sw $a2, 0x0030($sp) -/* 0013C 80AB9D7C 8FA30028 */ lw $v1, 0x0028($sp) -/* 00140 80AB9D80 10400002 */ beq $v0, $zero, .L80AB9D8C -/* 00144 80AB9D84 8FA60030 */ lw $a2, 0x0030($sp) +/* 00134 80AB9D74 0C01B0D8 */ jal Text_GetFaceReaction +/* 00138 80AB9D78 AFA60030 */ sw $a2, 0x0030($sp) +/* 0013C 80AB9D7C 8FA30028 */ lw $v1, 0x0028($sp) +/* 00140 80AB9D80 10400002 */ beq $v0, $zero, .L80AB9D8C +/* 00144 80AB9D84 8FA60030 */ lw $a2, 0x0030($sp) /* 00148 80AB9D88 24060008 */ addiu $a2, $zero, 0x0008 ## $a2 = 00000008 .L80AB9D8C: /* 0014C 80AB9D8C 846E0270 */ lh $t6, 0x0270($v1) ## 00000270 /* 00150 80AB9D90 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -/* 00154 80AB9D94 28C1001E */ slti $at, $a2, 0x001E -/* 00158 80AB9D98 50CE005F */ beql $a2, $t6, .L80AB9F18 -/* 0015C 80AB9D9C 8FBF0024 */ lw $ra, 0x0024($sp) +/* 00154 80AB9D94 28C1001E */ slti $at, $a2, 0x001E +/* 00158 80AB9D98 50CE005F */ beql $a2, $t6, .L80AB9F18 +/* 0015C 80AB9D9C 8FBF0024 */ lw $ra, 0x0024($sp) /* 00160 80AB9DA0 A0600275 */ sb $zero, 0x0275($v1) ## 00000275 /* 00164 80AB9DA4 A0620276 */ sb $v0, 0x0276($v1) ## 00000276 -/* 00168 80AB9DA8 14200006 */ bne $at, $zero, .L80AB9DC4 +/* 00168 80AB9DA8 14200006 */ bne $at, $zero, .L80AB9DC4 /* 0016C 80AB9DAC A4660270 */ sh $a2, 0x0270($v1) ## 00000270 /* 00170 80AB9DB0 24010064 */ addiu $at, $zero, 0x0064 ## $at = 00000064 -/* 00174 80AB9DB4 10C10045 */ beq $a2, $at, .L80AB9ECC +/* 00174 80AB9DB4 10C10045 */ beq $a2, $at, .L80AB9ECC /* 00178 80AB9DB8 3C040601 */ lui $a0, 0x0601 ## $a0 = 06010000 -/* 0017C 80AB9DBC 10000056 */ beq $zero, $zero, .L80AB9F18 -/* 00180 80AB9DC0 8FBF0024 */ lw $ra, 0x0024($sp) +/* 0017C 80AB9DBC 10000056 */ beq $zero, $zero, .L80AB9F18 +/* 00180 80AB9DC0 8FBF0024 */ lw $ra, 0x0024($sp) .L80AB9DC4: -/* 00184 80AB9DC4 2CC1001E */ sltiu $at, $a2, 0x001E -/* 00188 80AB9DC8 10200052 */ beq $at, $zero, .L80AB9F14 -/* 0018C 80AB9DCC 00067880 */ sll $t7, $a2, 2 +/* 00184 80AB9DC4 2CC1001E */ sltiu $at, $a2, 0x001E +/* 00188 80AB9DC8 10200052 */ beq $at, $zero, .L80AB9F14 +/* 0018C 80AB9DCC 00067880 */ sll $t7, $a2, 2 /* 00190 80AB9DD0 3C0180AC */ lui $at, %hi(jtbl_80ABB744) ## $at = 80AC0000 -/* 00194 80AB9DD4 002F0821 */ addu $at, $at, $t7 -/* 00198 80AB9DD8 8C2FB744 */ lw $t7, %lo(jtbl_80ABB744)($at) -/* 0019C 80AB9DDC 01E00008 */ jr $t7 +/* 00194 80AB9DD4 002F0821 */ addu $at, $at, $t7 +/* 00198 80AB9DD8 8C2FB744 */ lw $t7, %lo(jtbl_80ABB744)($at) +/* 0019C 80AB9DDC 01E00008 */ jr $t7 /* 001A0 80AB9DE0 00000000 */ nop glabel L80AB9DE4 /* 001A4 80AB9DE4 A0620275 */ sb $v0, 0x0275($v1) ## 00000275 glabel L80AB9DE8 /* 001A8 80AB9DE8 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 /* 001AC 80AB9DEC 0C028800 */ jal SkelAnime_GetFrameCount - + /* 001B0 80AB9DF0 248407D0 */ addiu $a0, $a0, 0x07D0 ## $a0 = 060007D0 /* 001B4 80AB9DF4 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 001B8 80AB9DF8 3C01C120 */ lui $at, 0xC120 ## $at = C1200000 -/* 001BC 80AB9DFC 8FA30028 */ lw $v1, 0x0028($sp) -/* 001C0 80AB9E00 468021A0 */ cvt.s.w $f6, $f4 +/* 001BC 80AB9DFC 8FA30028 */ lw $v1, 0x0028($sp) +/* 001C0 80AB9E00 468021A0 */ cvt.s.w $f6, $f4 /* 001C4 80AB9E04 44814000 */ mtc1 $at, $f8 ## $f8 = -10.00 /* 001C8 80AB9E08 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 001CC 80AB9E0C 24A507D0 */ addiu $a1, $a1, 0x07D0 ## $a1 = 060007D0 /* 001D0 80AB9E10 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 001D4 80AB9E14 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 001D8 80AB9E18 E7A60010 */ swc1 $f6, 0x0010($sp) -/* 001DC 80AB9E1C AFA00014 */ sw $zero, 0x0014($sp) +/* 001D8 80AB9E18 E7A60010 */ swc1 $f6, 0x0010($sp) +/* 001DC 80AB9E1C AFA00014 */ sw $zero, 0x0014($sp) /* 001E0 80AB9E20 2464014C */ addiu $a0, $v1, 0x014C ## $a0 = 0000014C -/* 001E4 80AB9E24 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 001E8 80AB9E28 E7A80018 */ swc1 $f8, 0x0018($sp) -/* 001EC 80AB9E2C 1000003A */ beq $zero, $zero, .L80AB9F18 -/* 001F0 80AB9E30 8FBF0024 */ lw $ra, 0x0024($sp) +/* 001E4 80AB9E24 0C029468 */ jal SkelAnime_ChangeAnim + +/* 001E8 80AB9E28 E7A80018 */ swc1 $f8, 0x0018($sp) +/* 001EC 80AB9E2C 1000003A */ beq $zero, $zero, .L80AB9F18 +/* 001F0 80AB9E30 8FBF0024 */ lw $ra, 0x0024($sp) glabel L80AB9E34 /* 001F4 80AB9E34 3C040601 */ lui $a0, 0x0601 ## $a0 = 06010000 /* 001F8 80AB9E38 0C028800 */ jal SkelAnime_GetFrameCount - + /* 001FC 80AB9E3C 24849F94 */ addiu $a0, $a0, 0x9F94 ## $a0 = 06009F94 /* 00200 80AB9E40 44825000 */ mtc1 $v0, $f10 ## $f10 = 0.00 /* 00204 80AB9E44 3C01C120 */ lui $at, 0xC120 ## $at = C1200000 -/* 00208 80AB9E48 8FA30028 */ lw $v1, 0x0028($sp) -/* 0020C 80AB9E4C 46805420 */ cvt.s.w $f16, $f10 +/* 00208 80AB9E48 8FA30028 */ lw $v1, 0x0028($sp) +/* 0020C 80AB9E4C 46805420 */ cvt.s.w $f16, $f10 /* 00210 80AB9E50 44819000 */ mtc1 $at, $f18 ## $f18 = -10.00 /* 00214 80AB9E54 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 /* 00218 80AB9E58 24A59F94 */ addiu $a1, $a1, 0x9F94 ## $a1 = 06009F94 /* 0021C 80AB9E5C 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 00220 80AB9E60 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 00224 80AB9E64 E7B00010 */ swc1 $f16, 0x0010($sp) -/* 00228 80AB9E68 AFA00014 */ sw $zero, 0x0014($sp) +/* 00224 80AB9E64 E7B00010 */ swc1 $f16, 0x0010($sp) +/* 00228 80AB9E68 AFA00014 */ sw $zero, 0x0014($sp) /* 0022C 80AB9E6C 2464014C */ addiu $a0, $v1, 0x014C ## $a0 = 0000014C -/* 00230 80AB9E70 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 00234 80AB9E74 E7B20018 */ swc1 $f18, 0x0018($sp) -/* 00238 80AB9E78 10000027 */ beq $zero, $zero, .L80AB9F18 -/* 0023C 80AB9E7C 8FBF0024 */ lw $ra, 0x0024($sp) +/* 00230 80AB9E70 0C029468 */ jal SkelAnime_ChangeAnim + +/* 00234 80AB9E74 E7B20018 */ swc1 $f18, 0x0018($sp) +/* 00238 80AB9E78 10000027 */ beq $zero, $zero, .L80AB9F18 +/* 0023C 80AB9E7C 8FBF0024 */ lw $ra, 0x0024($sp) glabel L80AB9E80 /* 00240 80AB9E80 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 /* 00244 80AB9E84 0C028800 */ jal SkelAnime_GetFrameCount - + /* 00248 80AB9E88 24840718 */ addiu $a0, $a0, 0x0718 ## $a0 = 06000718 /* 0024C 80AB9E8C 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 00250 80AB9E90 3C01C120 */ lui $at, 0xC120 ## $at = C1200000 -/* 00254 80AB9E94 8FA30028 */ lw $v1, 0x0028($sp) -/* 00258 80AB9E98 468021A0 */ cvt.s.w $f6, $f4 +/* 00254 80AB9E94 8FA30028 */ lw $v1, 0x0028($sp) +/* 00258 80AB9E98 468021A0 */ cvt.s.w $f6, $f4 /* 0025C 80AB9E9C 44814000 */ mtc1 $at, $f8 ## $f8 = -10.00 /* 00260 80AB9EA0 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 00264 80AB9EA4 24A50718 */ addiu $a1, $a1, 0x0718 ## $a1 = 06000718 /* 00268 80AB9EA8 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 0026C 80AB9EAC 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 00270 80AB9EB0 E7A60010 */ swc1 $f6, 0x0010($sp) -/* 00274 80AB9EB4 AFA00014 */ sw $zero, 0x0014($sp) +/* 00270 80AB9EB0 E7A60010 */ swc1 $f6, 0x0010($sp) +/* 00274 80AB9EB4 AFA00014 */ sw $zero, 0x0014($sp) /* 00278 80AB9EB8 2464014C */ addiu $a0, $v1, 0x014C ## $a0 = 0000014C -/* 0027C 80AB9EBC 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 00280 80AB9EC0 E7A80018 */ swc1 $f8, 0x0018($sp) -/* 00284 80AB9EC4 10000014 */ beq $zero, $zero, .L80AB9F18 -/* 00288 80AB9EC8 8FBF0024 */ lw $ra, 0x0024($sp) +/* 0027C 80AB9EBC 0C029468 */ jal SkelAnime_ChangeAnim + +/* 00280 80AB9EC0 E7A80018 */ swc1 $f8, 0x0018($sp) +/* 00284 80AB9EC4 10000014 */ beq $zero, $zero, .L80AB9F18 +/* 00288 80AB9EC8 8FBF0024 */ lw $ra, 0x0024($sp) .L80AB9ECC: /* 0028C 80AB9ECC 0C028800 */ jal SkelAnime_GetFrameCount - + /* 00290 80AB9ED0 2484A630 */ addiu $a0, $a0, 0xA630 ## $a0 = FFFFA630 /* 00294 80AB9ED4 44825000 */ mtc1 $v0, $f10 ## $f10 = 0.00 /* 00298 80AB9ED8 3C01C120 */ lui $at, 0xC120 ## $at = C1200000 -/* 0029C 80AB9EDC 8FA30028 */ lw $v1, 0x0028($sp) -/* 002A0 80AB9EE0 46805420 */ cvt.s.w $f16, $f10 +/* 0029C 80AB9EDC 8FA30028 */ lw $v1, 0x0028($sp) +/* 002A0 80AB9EE0 46805420 */ cvt.s.w $f16, $f10 /* 002A4 80AB9EE4 44819000 */ mtc1 $at, $f18 ## $f18 = -10.00 /* 002A8 80AB9EE8 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 /* 002AC 80AB9EEC 24A5A630 */ addiu $a1, $a1, 0xA630 ## $a1 = 0600A630 /* 002B0 80AB9EF0 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 002B4 80AB9EF4 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 002B8 80AB9EF8 E7B00010 */ swc1 $f16, 0x0010($sp) -/* 002BC 80AB9EFC AFA00014 */ sw $zero, 0x0014($sp) +/* 002B8 80AB9EF8 E7B00010 */ swc1 $f16, 0x0010($sp) +/* 002BC 80AB9EFC AFA00014 */ sw $zero, 0x0014($sp) /* 002C0 80AB9F00 2464014C */ addiu $a0, $v1, 0x014C ## $a0 = 0000014C -/* 002C4 80AB9F04 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 002C8 80AB9F08 E7B20018 */ swc1 $f18, 0x0018($sp) -/* 002CC 80AB9F0C 8FA30028 */ lw $v1, 0x0028($sp) +/* 002C4 80AB9F04 0C029468 */ jal SkelAnime_ChangeAnim + +/* 002C8 80AB9F08 E7B20018 */ swc1 $f18, 0x0018($sp) +/* 002CC 80AB9F0C 8FA30028 */ lw $v1, 0x0028($sp) /* 002D0 80AB9F10 A0600276 */ sb $zero, 0x0276($v1) ## 00000276 glabel L80AB9F14 .L80AB9F14: -/* 002D4 80AB9F14 8FBF0024 */ lw $ra, 0x0024($sp) +/* 002D4 80AB9F14 8FBF0024 */ lw $ra, 0x0024($sp) .L80AB9F18: /* 002D8 80AB9F18 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 002DC 80AB9F1C 03E00008 */ jr $ra +/* 002DC 80AB9F1C 03E00008 */ jr $ra /* 002E0 80AB9F20 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Niw_Lady/func_80AB9F24.s b/asm/non_matchings/overlays/actors/ovl_En_Niw_Lady/func_80AB9F24.s index 2d53d65714..b75c88f697 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Niw_Lady/func_80AB9F24.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Niw_Lady/func_80AB9F24.s @@ -1,59 +1,59 @@ glabel func_80AB9F24 /* 002E4 80AB9F24 27BDFFB8 */ addiu $sp, $sp, 0xFFB8 ## $sp = FFFFFFB8 -/* 002E8 80AB9F28 AFB00028 */ sw $s0, 0x0028($sp) +/* 002E8 80AB9F28 AFB00028 */ sw $s0, 0x0028($sp) /* 002EC 80AB9F2C 3C010001 */ lui $at, 0x0001 ## $at = 00010000 /* 002F0 80AB9F30 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 002F4 80AB9F34 342117A4 */ ori $at, $at, 0x17A4 ## $at = 000117A4 -/* 002F8 80AB9F38 AFBF002C */ sw $ra, 0x002C($sp) -/* 002FC 80AB9F3C AFA5004C */ sw $a1, 0x004C($sp) -/* 00300 80AB9F40 00A12021 */ addu $a0, $a1, $at +/* 002F8 80AB9F38 AFBF002C */ sw $ra, 0x002C($sp) +/* 002FC 80AB9F3C AFA5004C */ sw $a1, 0x004C($sp) +/* 00300 80AB9F40 00A12021 */ addu $a0, $a1, $at /* 00304 80AB9F44 82050280 */ lb $a1, 0x0280($s0) ## 00000280 /* 00308 80AB9F48 0C026062 */ jal Object_IsLoaded - -/* 0030C 80AB9F4C AFA40038 */ sw $a0, 0x0038($sp) -/* 00310 80AB9F50 104000AD */ beq $v0, $zero, .L80ABA208 -/* 00314 80AB9F54 8FA40038 */ lw $a0, 0x0038($sp) + +/* 0030C 80AB9F4C AFA40038 */ sw $a0, 0x0038($sp) +/* 00310 80AB9F50 104000AD */ beq $v0, $zero, .L80ABA208 +/* 00314 80AB9F54 8FA40038 */ lw $a0, 0x0038($sp) /* 00318 80AB9F58 0C026062 */ jal Object_IsLoaded - + /* 0031C 80AB9F5C 82050281 */ lb $a1, 0x0281($s0) ## 00000281 -/* 00320 80AB9F60 104000A9 */ beq $v0, $zero, .L80ABA208 -/* 00324 80AB9F64 8FA4004C */ lw $a0, 0x004C($sp) +/* 00320 80AB9F60 104000A9 */ beq $v0, $zero, .L80ABA208 +/* 00324 80AB9F64 8FA4004C */ lw $a0, 0x004C($sp) /* 00328 80AB9F68 820E0280 */ lb $t6, 0x0280($s0) ## 00000280 /* 0032C 80AB9F6C 3C190001 */ lui $t9, 0x0001 ## $t9 = 00010000 /* 00330 80AB9F70 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 00334 80AB9F74 000E7900 */ sll $t7, $t6, 4 -/* 00338 80AB9F78 01EE7821 */ addu $t7, $t7, $t6 -/* 0033C 80AB9F7C 000F7880 */ sll $t7, $t7, 2 -/* 00340 80AB9F80 008FC021 */ addu $t8, $a0, $t7 -/* 00344 80AB9F84 0338C821 */ addu $t9, $t9, $t8 +/* 00334 80AB9F74 000E7900 */ sll $t7, $t6, 4 +/* 00338 80AB9F78 01EE7821 */ addu $t7, $t7, $t6 +/* 0033C 80AB9F7C 000F7880 */ sll $t7, $t7, 2 +/* 00340 80AB9F80 008FC021 */ addu $t8, $a0, $t7 +/* 00344 80AB9F84 0338C821 */ addu $t9, $t9, $t8 /* 00348 80AB9F88 8F3917B4 */ lw $t9, 0x17B4($t9) ## 000117B4 /* 0034C 80AB9F8C 2605014C */ addiu $a1, $s0, 0x014C ## $a1 = 0000014C /* 00350 80AB9F90 3C060600 */ lui $a2, 0x0600 ## $a2 = 06000000 -/* 00354 80AB9F94 03214021 */ addu $t0, $t9, $at +/* 00354 80AB9F94 03214021 */ addu $t0, $t9, $at /* 00358 80AB9F98 3C018016 */ lui $at, 0x8016 ## $at = 80160000 /* 0035C 80AB9F9C 26090190 */ addiu $t1, $s0, 0x0190 ## $t1 = 00000190 /* 00360 80AB9FA0 260A01F0 */ addiu $t2, $s0, 0x01F0 ## $t2 = 000001F0 /* 00364 80AB9FA4 240B0010 */ addiu $t3, $zero, 0x0010 ## $t3 = 00000010 /* 00368 80AB9FA8 AC286FC0 */ sw $t0, 0x6FC0($at) ## 80166FC0 -/* 0036C 80AB9FAC AFAB0018 */ sw $t3, 0x0018($sp) -/* 00370 80AB9FB0 AFAA0014 */ sw $t2, 0x0014($sp) -/* 00374 80AB9FB4 AFA90010 */ sw $t1, 0x0010($sp) +/* 0036C 80AB9FAC AFAB0018 */ sw $t3, 0x0018($sp) +/* 00370 80AB9FB0 AFAA0014 */ sw $t2, 0x0014($sp) +/* 00374 80AB9FB4 AFA90010 */ sw $t1, 0x0010($sp) /* 00378 80AB9FB8 24C600F0 */ addiu $a2, $a2, 0x00F0 ## $a2 = 060000F0 -/* 0037C 80AB9FBC AFA50038 */ sw $a1, 0x0038($sp) -/* 00380 80AB9FC0 0C0291BE */ jal func_800A46F8 +/* 0037C 80AB9FBC AFA50038 */ sw $a1, 0x0038($sp) +/* 00380 80AB9FC0 0C0291BE */ jal SkelAnime_InitSV /* 00384 80AB9FC4 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 /* 00388 80AB9FC8 820D0281 */ lb $t5, 0x0281($s0) ## 00000281 -/* 0038C 80AB9FCC 8FAC004C */ lw $t4, 0x004C($sp) +/* 0038C 80AB9FCC 8FAC004C */ lw $t4, 0x004C($sp) /* 00390 80AB9FD0 3C180001 */ lui $t8, 0x0001 ## $t8 = 00010000 -/* 00394 80AB9FD4 000D7100 */ sll $t6, $t5, 4 -/* 00398 80AB9FD8 01CD7021 */ addu $t6, $t6, $t5 -/* 0039C 80AB9FDC 000E7080 */ sll $t6, $t6, 2 -/* 003A0 80AB9FE0 018E7821 */ addu $t7, $t4, $t6 -/* 003A4 80AB9FE4 030FC021 */ addu $t8, $t8, $t7 +/* 00394 80AB9FD4 000D7100 */ sll $t6, $t5, 4 +/* 00398 80AB9FD8 01CD7021 */ addu $t6, $t6, $t5 +/* 0039C 80AB9FDC 000E7080 */ sll $t6, $t6, 2 +/* 003A0 80AB9FE0 018E7821 */ addu $t7, $t4, $t6 +/* 003A4 80AB9FE4 030FC021 */ addu $t8, $t8, $t7 /* 003A8 80AB9FE8 8F1817B4 */ lw $t8, 0x17B4($t8) ## 000117B4 /* 003AC 80AB9FEC 3C018000 */ lui $at, 0x8000 ## $at = 80000000 /* 003B0 80AB9FF0 24080001 */ addiu $t0, $zero, 0x0001 ## $t0 = 00000001 -/* 003B4 80AB9FF4 0301C821 */ addu $t9, $t8, $at +/* 003B4 80AB9FF4 0301C821 */ addu $t9, $t8, $at /* 003B8 80AB9FF8 3C018016 */ lui $at, 0x8016 ## $at = 80160000 /* 003BC 80AB9FFC AC396FC0 */ sw $t9, 0x6FC0($at) ## 80166FC0 /* 003C0 80ABA000 3C01C040 */ lui $at, 0xC040 ## $at = C0400000 @@ -63,26 +63,26 @@ glabel func_80AB9F24 /* 003D0 80ABA010 34A5D70A */ ori $a1, $a1, 0xD70A ## $a1 = 3C23D70A /* 003D4 80ABA014 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 003D8 80ABA018 0C00B58B */ jal Actor_SetScale - + /* 003DC 80ABA01C E604006C */ swc1 $f4, 0x006C($s0) ## 0000006C /* 003E0 80ABA020 3C068003 */ lui $a2, 0x8003 ## $a2 = 80030000 /* 003E4 80ABA024 24C6B5EC */ addiu $a2, $a2, 0xB5EC ## $a2 = 8002B5EC /* 003E8 80ABA028 260400B4 */ addiu $a0, $s0, 0x00B4 ## $a0 = 000000B4 /* 003EC 80ABA02C 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 /* 003F0 80ABA030 0C00AC78 */ jal ActorShape_Init - + /* 003F4 80ABA034 3C0741A0 */ lui $a3, 0x41A0 ## $a3 = 41A00000 /* 003F8 80ABA038 260502B0 */ addiu $a1, $s0, 0x02B0 ## $a1 = 000002B0 -/* 003FC 80ABA03C AFA50034 */ sw $a1, 0x0034($sp) +/* 003FC 80ABA03C AFA50034 */ sw $a1, 0x0034($sp) /* 00400 80ABA040 0C0170D9 */ jal ActorCollider_AllocCylinder - -/* 00404 80ABA044 8FA4004C */ lw $a0, 0x004C($sp) + +/* 00404 80ABA044 8FA4004C */ lw $a0, 0x004C($sp) /* 00408 80ABA048 3C0780AC */ lui $a3, %hi(D_80ABB3C4) ## $a3 = 80AC0000 -/* 0040C 80ABA04C 8FA50034 */ lw $a1, 0x0034($sp) +/* 0040C 80ABA04C 8FA50034 */ lw $a1, 0x0034($sp) /* 00410 80ABA050 24E7B3C4 */ addiu $a3, $a3, %lo(D_80ABB3C4) ## $a3 = 80ABB3C4 -/* 00414 80ABA054 8FA4004C */ lw $a0, 0x004C($sp) +/* 00414 80ABA054 8FA4004C */ lw $a0, 0x004C($sp) /* 00418 80ABA058 0C01712B */ jal ActorCollider_InitCylinder - + /* 0041C 80ABA05C 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 00420 80ABA060 86030278 */ lh $v1, 0x0278($s0) ## 00000278 /* 00424 80ABA064 3C0A80AC */ lui $t2, %hi(func_80ABB228) ## $t2 = 80AC0000 @@ -90,123 +90,123 @@ glabel func_80AB9F24 /* 0042C 80ABA06C 254AB228 */ addiu $t2, $t2, %lo(func_80ABB228) ## $t2 = 80ABB228 /* 00430 80ABA070 A2000272 */ sb $zero, 0x0272($s0) ## 00000272 /* 00434 80ABA074 A209001F */ sb $t1, 0x001F($s0) ## 0000001F -/* 00438 80ABA078 10600006 */ beq $v1, $zero, .L80ABA094 +/* 00438 80ABA078 10600006 */ beq $v1, $zero, .L80ABA094 /* 0043C 80ABA07C AE0A0134 */ sw $t2, 0x0134($s0) ## 00000134 /* 00440 80ABA080 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 00444 80ABA084 10610047 */ beq $v1, $at, .L80ABA1A4 +/* 00444 80ABA084 10610047 */ beq $v1, $at, .L80ABA1A4 /* 00448 80ABA088 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 -/* 0044C 80ABA08C 1000005F */ beq $zero, $zero, .L80ABA20C -/* 00450 80ABA090 8FBF002C */ lw $ra, 0x002C($sp) +/* 0044C 80ABA08C 1000005F */ beq $zero, $zero, .L80ABA20C +/* 00450 80ABA090 8FBF002C */ lw $ra, 0x002C($sp) .L80ABA094: /* 00454 80ABA094 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 /* 00458 80ABA098 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 /* 0045C 80ABA09C 944B0EF0 */ lhu $t3, 0x0EF0($v0) ## 8015F550 /* 00460 80ABA0A0 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 /* 00464 80ABA0A4 316D1000 */ andi $t5, $t3, 0x1000 ## $t5 = 00000000 -/* 00468 80ABA0A8 15A0001D */ bne $t5, $zero, .L80ABA120 +/* 00468 80ABA0A8 15A0001D */ bne $t5, $zero, .L80ABA120 /* 0046C 80ABA0AC 00000000 */ nop /* 00470 80ABA0B0 8C4C0004 */ lw $t4, 0x0004($v0) ## 8015E664 -/* 00474 80ABA0B4 1180001A */ beq $t4, $zero, .L80ABA120 +/* 00474 80ABA0B4 1180001A */ beq $t4, $zero, .L80ABA120 /* 00478 80ABA0B8 00000000 */ nop /* 0047C 80ABA0BC 3C040601 */ lui $a0, 0x0601 ## $a0 = 06010000 /* 00480 80ABA0C0 0C028800 */ jal SkelAnime_GetFrameCount - + /* 00484 80ABA0C4 2484A630 */ addiu $a0, $a0, 0xA630 ## $a0 = 0600A630 /* 00488 80ABA0C8 44823000 */ mtc1 $v0, $f6 ## $f6 = 0.00 /* 0048C 80ABA0CC 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 /* 00490 80ABA0D0 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 -/* 00494 80ABA0D4 46803220 */ cvt.s.w $f8, $f6 -/* 00498 80ABA0D8 44070000 */ mfc1 $a3, $f0 +/* 00494 80ABA0D4 46803220 */ cvt.s.w $f8, $f6 +/* 00498 80ABA0D8 44070000 */ mfc1 $a3, $f0 /* 0049C 80ABA0DC 24A5A630 */ addiu $a1, $a1, 0xA630 ## $a1 = 0600A630 -/* 004A0 80ABA0E0 8FA40038 */ lw $a0, 0x0038($sp) +/* 004A0 80ABA0E0 8FA40038 */ lw $a0, 0x0038($sp) /* 004A4 80ABA0E4 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 004A8 80ABA0E8 AFA00014 */ sw $zero, 0x0014($sp) -/* 004AC 80ABA0EC 4600428D */ trunc.w.s $f10, $f8 -/* 004B0 80ABA0F0 E7A00018 */ swc1 $f0, 0x0018($sp) -/* 004B4 80ABA0F4 440F5000 */ mfc1 $t7, $f10 +/* 004A8 80ABA0E8 AFA00014 */ sw $zero, 0x0014($sp) +/* 004AC 80ABA0EC 4600428D */ trunc.w.s $f10, $f8 +/* 004B0 80ABA0F0 E7A00018 */ swc1 $f0, 0x0018($sp) +/* 004B4 80ABA0F4 440F5000 */ mfc1 $t7, $f10 /* 004B8 80ABA0F8 00000000 */ nop -/* 004BC 80ABA0FC 000FC400 */ sll $t8, $t7, 16 -/* 004C0 80ABA100 0018CC03 */ sra $t9, $t8, 16 +/* 004BC 80ABA0FC 000FC400 */ sll $t8, $t7, 16 +/* 004C0 80ABA100 0018CC03 */ sra $t9, $t8, 16 /* 004C4 80ABA104 44998000 */ mtc1 $t9, $f16 ## $f16 = 0.00 /* 004C8 80ABA108 00000000 */ nop -/* 004CC 80ABA10C 468084A0 */ cvt.s.w $f18, $f16 -/* 004D0 80ABA110 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 004D4 80ABA114 E7B20010 */ swc1 $f18, 0x0010($sp) -/* 004D8 80ABA118 10000017 */ beq $zero, $zero, .L80ABA178 +/* 004CC 80ABA10C 468084A0 */ cvt.s.w $f18, $f16 +/* 004D0 80ABA110 0C029468 */ jal SkelAnime_ChangeAnim + +/* 004D4 80ABA114 E7B20010 */ swc1 $f18, 0x0010($sp) +/* 004D8 80ABA118 10000017 */ beq $zero, $zero, .L80ABA178 /* 004DC 80ABA11C 00000000 */ nop .L80ABA120: /* 004E0 80ABA120 0C028800 */ jal SkelAnime_GetFrameCount - + /* 004E4 80ABA124 248407D0 */ addiu $a0, $a0, 0x07D0 ## $a0 = 000007D0 /* 004E8 80ABA128 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 004EC 80ABA12C 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 /* 004F0 80ABA130 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 004F4 80ABA134 468021A0 */ cvt.s.w $f6, $f4 -/* 004F8 80ABA138 44070000 */ mfc1 $a3, $f0 +/* 004F4 80ABA134 468021A0 */ cvt.s.w $f6, $f4 +/* 004F8 80ABA138 44070000 */ mfc1 $a3, $f0 /* 004FC 80ABA13C 24A507D0 */ addiu $a1, $a1, 0x07D0 ## $a1 = 060007D0 -/* 00500 80ABA140 8FA40038 */ lw $a0, 0x0038($sp) +/* 00500 80ABA140 8FA40038 */ lw $a0, 0x0038($sp) /* 00504 80ABA144 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 00508 80ABA148 AFA00014 */ sw $zero, 0x0014($sp) -/* 0050C 80ABA14C 4600320D */ trunc.w.s $f8, $f6 -/* 00510 80ABA150 E7A00018 */ swc1 $f0, 0x0018($sp) -/* 00514 80ABA154 44094000 */ mfc1 $t1, $f8 +/* 00508 80ABA148 AFA00014 */ sw $zero, 0x0014($sp) +/* 0050C 80ABA14C 4600320D */ trunc.w.s $f8, $f6 +/* 00510 80ABA150 E7A00018 */ swc1 $f0, 0x0018($sp) +/* 00514 80ABA154 44094000 */ mfc1 $t1, $f8 /* 00518 80ABA158 00000000 */ nop -/* 0051C 80ABA15C 00095400 */ sll $t2, $t1, 16 -/* 00520 80ABA160 000A5C03 */ sra $t3, $t2, 16 +/* 0051C 80ABA15C 00095400 */ sll $t2, $t1, 16 +/* 00520 80ABA160 000A5C03 */ sra $t3, $t2, 16 /* 00524 80ABA164 448B5000 */ mtc1 $t3, $f10 ## $f10 = 0.00 /* 00528 80ABA168 00000000 */ nop -/* 0052C 80ABA16C 46805420 */ cvt.s.w $f16, $f10 -/* 00530 80ABA170 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 00534 80ABA174 E7B00010 */ swc1 $f16, 0x0010($sp) +/* 0052C 80ABA16C 46805420 */ cvt.s.w $f16, $f10 +/* 00530 80ABA170 0C029468 */ jal SkelAnime_ChangeAnim + +/* 00534 80ABA174 E7B00010 */ swc1 $f16, 0x0010($sp) .L80ABA178: /* 00538 80ABA178 3C0D8016 */ lui $t5, 0x8016 ## $t5 = 80160000 /* 0053C 80ABA17C 8DADE664 */ lw $t5, -0x199C($t5) ## 8015E664 /* 00540 80ABA180 3C0E80AC */ lui $t6, %hi(func_80ABA21C) ## $t6 = 80AC0000 /* 00544 80ABA184 3C0C80AC */ lui $t4, %hi(func_80ABA778) ## $t4 = 80AC0000 -/* 00548 80ABA188 15A00004 */ bne $t5, $zero, .L80ABA19C +/* 00548 80ABA188 15A00004 */ bne $t5, $zero, .L80ABA19C /* 0054C 80ABA18C 25CEA21C */ addiu $t6, $t6, %lo(func_80ABA21C) ## $t6 = 80ABA21C /* 00550 80ABA190 258CA778 */ addiu $t4, $t4, %lo(func_80ABA778) ## $t4 = 80ABA778 -/* 00554 80ABA194 1000001C */ beq $zero, $zero, .L80ABA208 +/* 00554 80ABA194 1000001C */ beq $zero, $zero, .L80ABA208 /* 00558 80ABA198 AE0C0250 */ sw $t4, 0x0250($s0) ## 00000250 .L80ABA19C: -/* 0055C 80ABA19C 1000001A */ beq $zero, $zero, .L80ABA208 +/* 0055C 80ABA19C 1000001A */ beq $zero, $zero, .L80ABA208 /* 00560 80ABA1A0 AE0E0250 */ sw $t6, 0x0250($s0) ## 00000250 .L80ABA1A4: /* 00564 80ABA1A4 0C028800 */ jal SkelAnime_GetFrameCount - + /* 00568 80ABA1A8 248407D0 */ addiu $a0, $a0, 0x07D0 ## $a0 = 000007D0 /* 0056C 80ABA1AC 44829000 */ mtc1 $v0, $f18 ## $f18 = 0.00 /* 00570 80ABA1B0 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 /* 00574 80ABA1B4 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 00578 80ABA1B8 46809120 */ cvt.s.w $f4, $f18 -/* 0057C 80ABA1BC 44070000 */ mfc1 $a3, $f0 +/* 00578 80ABA1B8 46809120 */ cvt.s.w $f4, $f18 +/* 0057C 80ABA1BC 44070000 */ mfc1 $a3, $f0 /* 00580 80ABA1C0 24A507D0 */ addiu $a1, $a1, 0x07D0 ## $a1 = 060007D0 -/* 00584 80ABA1C4 8FA40038 */ lw $a0, 0x0038($sp) +/* 00584 80ABA1C4 8FA40038 */ lw $a0, 0x0038($sp) /* 00588 80ABA1C8 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 0058C 80ABA1CC AFA00014 */ sw $zero, 0x0014($sp) -/* 00590 80ABA1D0 4600218D */ trunc.w.s $f6, $f4 -/* 00594 80ABA1D4 E7A00018 */ swc1 $f0, 0x0018($sp) -/* 00598 80ABA1D8 44183000 */ mfc1 $t8, $f6 +/* 0058C 80ABA1CC AFA00014 */ sw $zero, 0x0014($sp) +/* 00590 80ABA1D0 4600218D */ trunc.w.s $f6, $f4 +/* 00594 80ABA1D4 E7A00018 */ swc1 $f0, 0x0018($sp) +/* 00598 80ABA1D8 44183000 */ mfc1 $t8, $f6 /* 0059C 80ABA1DC 00000000 */ nop -/* 005A0 80ABA1E0 0018CC00 */ sll $t9, $t8, 16 -/* 005A4 80ABA1E4 00194403 */ sra $t0, $t9, 16 +/* 005A0 80ABA1E0 0018CC00 */ sll $t9, $t8, 16 +/* 005A4 80ABA1E4 00194403 */ sra $t0, $t9, 16 /* 005A8 80ABA1E8 44884000 */ mtc1 $t0, $f8 ## $f8 = 0.00 /* 005AC 80ABA1EC 00000000 */ nop -/* 005B0 80ABA1F0 468042A0 */ cvt.s.w $f10, $f8 -/* 005B4 80ABA1F4 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 005B8 80ABA1F8 E7AA0010 */ swc1 $f10, 0x0010($sp) +/* 005B0 80ABA1F0 468042A0 */ cvt.s.w $f10, $f8 +/* 005B4 80ABA1F4 0C029468 */ jal SkelAnime_ChangeAnim + +/* 005B8 80ABA1F8 E7AA0010 */ swc1 $f10, 0x0010($sp) /* 005BC 80ABA1FC 3C0980AC */ lui $t1, %hi(func_80ABAD38) ## $t1 = 80AC0000 /* 005C0 80ABA200 2529AD38 */ addiu $t1, $t1, %lo(func_80ABAD38) ## $t1 = 80ABAD38 /* 005C4 80ABA204 AE090250 */ sw $t1, 0x0250($s0) ## 00000250 .L80ABA208: -/* 005C8 80ABA208 8FBF002C */ lw $ra, 0x002C($sp) +/* 005C8 80ABA208 8FBF002C */ lw $ra, 0x002C($sp) .L80ABA20C: -/* 005CC 80ABA20C 8FB00028 */ lw $s0, 0x0028($sp) +/* 005CC 80ABA20C 8FB00028 */ lw $s0, 0x0028($sp) /* 005D0 80ABA210 27BD0048 */ addiu $sp, $sp, 0x0048 ## $sp = 00000000 -/* 005D4 80ABA214 03E00008 */ jr $ra +/* 005D4 80ABA214 03E00008 */ jr $ra /* 005D8 80ABA218 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Niw_Lady/func_80ABA244.s b/asm/non_matchings/overlays/actors/ovl_En_Niw_Lady/func_80ABA244.s index f275914b05..0edd79ef91 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Niw_Lady/func_80ABA244.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Niw_Lady/func_80ABA244.s @@ -137,11 +137,11 @@ glabel func_80ABA244 /* 007F0 80ABA430 85ADB3A0 */ lh $t5, %lo(D_80ABB3A0)($t5) /* 007F4 80ABA434 24050008 */ addiu $a1, $zero, 0x0008 ## $a1 = 00000008 /* 007F8 80ABA438 A64D010E */ sh $t5, 0x010E($s2) ## 0000010E -/* 007FC 80ABA43C 0C01B0D8 */ jal func_8006C360 +/* 007FC 80ABA43C 0C01B0D8 */ jal Text_GetFaceReaction /* 00800 80ABA440 8FA4002C */ lw $a0, 0x002C($sp) /* 00804 80ABA444 10400006 */ beq $v0, $zero, .L80ABA460 /* 00808 80ABA448 8FA4002C */ lw $a0, 0x002C($sp) -/* 0080C 80ABA44C 0C01B0D8 */ jal func_8006C360 +/* 0080C 80ABA44C 0C01B0D8 */ jal Text_GetFaceReaction /* 00810 80ABA450 24050008 */ addiu $a1, $zero, 0x0008 ## $a1 = 00000008 /* 00814 80ABA454 24180006 */ addiu $t8, $zero, 0x0006 ## $t8 = 00000006 /* 00818 80ABA458 A642010E */ sh $v0, 0x010E($s2) ## 0000010E @@ -200,7 +200,7 @@ glabel func_80ABA244 /* 008C8 80ABA508 2484B5C0 */ addiu $a0, $a0, %lo(D_80ABB5C0) ## $a0 = 80ABB5C0 /* 008CC 80ABA50C 8FA4002C */ lw $a0, 0x002C($sp) -/* 008D0 80ABA510 0C01B0D8 */ jal func_8006C360 +/* 008D0 80ABA510 0C01B0D8 */ jal Text_GetFaceReaction /* 008D4 80ABA514 24050008 */ addiu $a1, $zero, 0x0008 ## $a1 = 00000008 /* 008D8 80ABA518 54400048 */ bnel $v0, $zero, .L80ABA63C /* 008DC 80ABA51C 8FBF0024 */ lw $ra, 0x0024($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Niw_Lady/func_80ABAD7C.s b/asm/non_matchings/overlays/actors/ovl_En_Niw_Lady/func_80ABAD7C.s index 9247cd820c..b9f933cd80 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Niw_Lady/func_80ABAD7C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Niw_Lady/func_80ABAD7C.s @@ -8,11 +8,11 @@ glabel func_80ABAD7C /* 01154 80ABAD94 A48E010E */ sh $t6, 0x010E($a0) ## 0000010E /* 01158 80ABAD98 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 /* 0115C 80ABAD9C 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 01160 80ABADA0 0C01B0D8 */ jal func_8006C360 +/* 01160 80ABADA0 0C01B0D8 */ jal Text_GetFaceReaction /* 01164 80ABADA4 24050008 */ addiu $a1, $zero, 0x0008 ## $a1 = 00000008 /* 01168 80ABADA8 10400004 */ beq $v0, $zero, .L80ABADBC /* 0116C 80ABADAC 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 01170 80ABADB0 0C01B0D8 */ jal func_8006C360 +/* 01170 80ABADB0 0C01B0D8 */ jal Text_GetFaceReaction /* 01174 80ABADB4 24050008 */ addiu $a1, $zero, 0x0008 ## $a1 = 00000008 /* 01178 80ABADB8 A602010E */ sh $v0, 0x010E($s0) ## 0000010E .L80ABADBC: diff --git a/asm/non_matchings/overlays/actors/ovl_En_Niw_Lady/func_80ABB228.s b/asm/non_matchings/overlays/actors/ovl_En_Niw_Lady/func_80ABB228.s index 6dd94663bc..919ea3dd03 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Niw_Lady/func_80ABB228.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Niw_Lady/func_80ABB228.s @@ -1,25 +1,25 @@ glabel func_80ABB228 /* 015E8 80ABB228 27BDFFA0 */ addiu $sp, $sp, 0xFFA0 ## $sp = FFFFFFA0 -/* 015EC 80ABB22C AFB10028 */ sw $s1, 0x0028($sp) +/* 015EC 80ABB22C AFB10028 */ sw $s1, 0x0028($sp) /* 015F0 80ABB230 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 -/* 015F4 80ABB234 AFBF002C */ sw $ra, 0x002C($sp) -/* 015F8 80ABB238 AFB00024 */ sw $s0, 0x0024($sp) +/* 015F4 80ABB234 AFBF002C */ sw $ra, 0x002C($sp) +/* 015F8 80ABB238 AFB00024 */ sw $s0, 0x0024($sp) /* 015FC 80ABB23C 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 /* 01600 80ABB240 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 01604 80ABB244 3C0680AC */ lui $a2, %hi(D_80ABB71C) ## $a2 = 80AC0000 /* 01608 80ABB248 24C6B71C */ addiu $a2, $a2, %lo(D_80ABB71C) ## $a2 = 80ABB71C /* 0160C 80ABB24C 27A40044 */ addiu $a0, $sp, 0x0044 ## $a0 = FFFFFFE4 /* 01610 80ABB250 24070543 */ addiu $a3, $zero, 0x0543 ## $a3 = 00000543 -/* 01614 80ABB254 0C031AB1 */ jal func_800C6AC4 -/* 01618 80ABB258 AFA50054 */ sw $a1, 0x0054($sp) +/* 01614 80ABB254 0C031AB1 */ jal Graph_OpenDisps +/* 01618 80ABB258 AFA50054 */ sw $a1, 0x0054($sp) /* 0161C 80ABB25C 860E027E */ lh $t6, 0x027E($s0) ## 0000027E -/* 01620 80ABB260 8FA80054 */ lw $t0, 0x0054($sp) -/* 01624 80ABB264 11C00039 */ beq $t6, $zero, .L80ABB34C +/* 01620 80ABB260 8FA80054 */ lw $t0, 0x0054($sp) +/* 01624 80ABB264 11C00039 */ beq $t6, $zero, .L80ABB34C /* 01628 80ABB268 00000000 */ nop /* 0162C 80ABB26C 8E240000 */ lw $a0, 0x0000($s1) ## 00000000 -/* 01630 80ABB270 0C024F46 */ jal func_80093D18 -/* 01634 80ABB274 AFA80054 */ sw $t0, 0x0054($sp) -/* 01638 80ABB278 8FA80054 */ lw $t0, 0x0054($sp) +/* 01630 80ABB270 0C024F46 */ jal func_80093D18 +/* 01634 80ABB274 AFA80054 */ sw $t0, 0x0054($sp) +/* 01638 80ABB278 8FA80054 */ lw $t0, 0x0054($sp) /* 0163C 80ABB27C 3C18FB00 */ lui $t8, 0xFB00 ## $t8 = FB000000 /* 01640 80ABB280 241900FF */ addiu $t9, $zero, 0x00FF ## $t9 = 000000FF /* 01644 80ABB284 8D0202C0 */ lw $v0, 0x02C0($t0) ## 000002C0 @@ -38,51 +38,51 @@ glabel func_80ABB228 /* 01678 80ABB2B8 860B027C */ lh $t3, 0x027C($s0) ## 0000027C /* 0167C 80ABB2BC 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 /* 01680 80ABB2C0 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF -/* 01684 80ABB2C4 000B6080 */ sll $t4, $t3, 2 -/* 01688 80ABB2C8 008C2021 */ addu $a0, $a0, $t4 -/* 0168C 80ABB2CC 8C84B408 */ lw $a0, %lo(D_80ABB408)($a0) +/* 01684 80ABB2C4 000B6080 */ sll $t4, $t3, 2 +/* 01688 80ABB2C8 008C2021 */ addu $a0, $a0, $t4 +/* 0168C 80ABB2CC 8C84B408 */ lw $a0, %lo(D_80ABB408)($a0) /* 01690 80ABB2D0 3C0CDB06 */ lui $t4, 0xDB06 ## $t4 = DB060000 /* 01694 80ABB2D4 358C0030 */ ori $t4, $t4, 0x0030 ## $t4 = DB060030 -/* 01698 80ABB2D8 00047100 */ sll $t6, $a0, 4 -/* 0169C 80ABB2DC 000E7F02 */ srl $t7, $t6, 28 -/* 016A0 80ABB2E0 000FC080 */ sll $t8, $t7, 2 -/* 016A4 80ABB2E4 0338C821 */ addu $t9, $t9, $t8 +/* 01698 80ABB2D8 00047100 */ sll $t6, $a0, 4 +/* 0169C 80ABB2DC 000E7F02 */ srl $t7, $t6, 28 +/* 016A0 80ABB2E0 000FC080 */ sll $t8, $t7, 2 +/* 016A4 80ABB2E4 0338C821 */ addu $t9, $t9, $t8 /* 016A8 80ABB2E8 8F396FA8 */ lw $t9, 0x6FA8($t9) ## 80166FA8 -/* 016AC 80ABB2EC 00816824 */ and $t5, $a0, $at +/* 016AC 80ABB2EC 00816824 */ and $t5, $a0, $at /* 016B0 80ABB2F0 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 016B4 80ABB2F4 01B94821 */ addu $t1, $t5, $t9 -/* 016B8 80ABB2F8 01215021 */ addu $t2, $t1, $at +/* 016B4 80ABB2F4 01B94821 */ addu $t1, $t5, $t9 +/* 016B8 80ABB2F8 01215021 */ addu $t2, $t1, $at /* 016BC 80ABB2FC AC4A0004 */ sw $t2, 0x0004($v0) ## 00000004 /* 016C0 80ABB300 8D0202C0 */ lw $v0, 0x02C0($t0) ## 000002C0 /* 016C4 80ABB304 244B0008 */ addiu $t3, $v0, 0x0008 ## $t3 = 00000008 /* 016C8 80ABB308 AD0B02C0 */ sw $t3, 0x02C0($t0) ## 000002C0 /* 016CC 80ABB30C AC4C0000 */ sw $t4, 0x0000($v0) ## 00000000 /* 016D0 80ABB310 8E240000 */ lw $a0, 0x0000($s1) ## 00000000 -/* 016D4 80ABB314 0C2AEC28 */ jal func_80ABB0A0 -/* 016D8 80ABB318 AFA20038 */ sw $v0, 0x0038($sp) -/* 016DC 80ABB31C 8FA30038 */ lw $v1, 0x0038($sp) +/* 016D4 80ABB314 0C2AEC28 */ jal func_80ABB0A0 +/* 016D8 80ABB318 AFA20038 */ sw $v0, 0x0038($sp) +/* 016DC 80ABB31C 8FA30038 */ lw $v1, 0x0038($sp) /* 016E0 80ABB320 3C0E80AC */ lui $t6, %hi(func_80ABB0CC) ## $t6 = 80AC0000 /* 016E4 80ABB324 25CEB0CC */ addiu $t6, $t6, %lo(func_80ABB0CC) ## $t6 = 80ABB0CC /* 016E8 80ABB328 AC620004 */ sw $v0, 0x0004($v1) ## 00000004 /* 016EC 80ABB32C 9207014E */ lbu $a3, 0x014E($s0) ## 0000014E /* 016F0 80ABB330 8E06016C */ lw $a2, 0x016C($s0) ## 0000016C /* 016F4 80ABB334 8E050150 */ lw $a1, 0x0150($s0) ## 00000150 -/* 016F8 80ABB338 AFB00018 */ sw $s0, 0x0018($sp) -/* 016FC 80ABB33C AFA00014 */ sw $zero, 0x0014($sp) -/* 01700 80ABB340 AFAE0010 */ sw $t6, 0x0010($sp) -/* 01704 80ABB344 0C0286B2 */ jal func_800A1AC8 +/* 016F8 80ABB338 AFB00018 */ sw $s0, 0x0018($sp) +/* 016FC 80ABB33C AFA00014 */ sw $zero, 0x0014($sp) +/* 01700 80ABB340 AFAE0010 */ sw $t6, 0x0010($sp) +/* 01704 80ABB344 0C0286B2 */ jal SkelAnime_DrawSV /* 01708 80ABB348 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 .L80ABB34C: /* 0170C 80ABB34C 3C0680AC */ lui $a2, %hi(D_80ABB730) ## $a2 = 80AC0000 /* 01710 80ABB350 24C6B730 */ addiu $a2, $a2, %lo(D_80ABB730) ## $a2 = 80ABB730 /* 01714 80ABB354 27A40044 */ addiu $a0, $sp, 0x0044 ## $a0 = FFFFFFE4 /* 01718 80ABB358 8E250000 */ lw $a1, 0x0000($s1) ## 00000000 -/* 0171C 80ABB35C 0C031AD5 */ jal func_800C6B54 +/* 0171C 80ABB35C 0C031AD5 */ jal Graph_CloseDisps /* 01720 80ABB360 2407055A */ addiu $a3, $zero, 0x055A ## $a3 = 0000055A -/* 01724 80ABB364 8FBF002C */ lw $ra, 0x002C($sp) -/* 01728 80ABB368 8FB00024 */ lw $s0, 0x0024($sp) -/* 0172C 80ABB36C 8FB10028 */ lw $s1, 0x0028($sp) -/* 01730 80ABB370 03E00008 */ jr $ra +/* 01724 80ABB364 8FBF002C */ lw $ra, 0x002C($sp) +/* 01728 80ABB368 8FB00024 */ lw $s0, 0x0024($sp) +/* 0172C 80ABB36C 8FB10028 */ lw $s1, 0x0028($sp) +/* 01730 80ABB370 03E00008 */ jr $ra /* 01734 80ABB374 27BD0060 */ addiu $sp, $sp, 0x0060 ## $sp = 00000000 /* 01738 80ABB378 00000000 */ nop /* 0173C 80ABB37C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Nwc/func_80ABC460.s b/asm/non_matchings/overlays/actors/ovl_En_Nwc/func_80ABC460.s index 19e48285b3..cb3dae8fdd 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Nwc/func_80ABC460.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Nwc/func_80ABC460.s @@ -18,7 +18,7 @@ glabel func_80ABC460 /* 003C0 80ABC4A0 24C6CAC0 */ addiu $a2, $a2, %lo(D_80ABCAC0) ## $a2 = 80ABCAC0 /* 003C4 80ABC4A4 27A40098 */ addiu $a0, $sp, 0x0098 ## $a0 = FFFFFF98 /* 003C8 80ABC4A8 2407013C */ addiu $a3, $zero, 0x013C ## $a3 = 0000013C -/* 003CC 80ABC4AC 0C031AB1 */ jal func_800C6AC4 +/* 003CC 80ABC4AC 0C031AB1 */ jal Graph_OpenDisps /* 003D0 80ABC4B0 AFA500A8 */ sw $a1, 0x00A8($sp) /* 003D4 80ABC4B4 0C024F20 */ jal func_80093C80 /* 003D8 80ABC4B8 8FA40104 */ lw $a0, 0x0104($sp) @@ -230,7 +230,7 @@ glabel func_80ABC460 /* 006F4 80ABC7D4 24C6CAF0 */ addiu $a2, $a2, %lo(D_80ABCAF0) ## $a2 = 80ABCAF0 /* 006F8 80ABC7D8 27A40098 */ addiu $a0, $sp, 0x0098 ## $a0 = FFFFFF98 /* 006FC 80ABC7DC 2407018B */ addiu $a3, $zero, 0x018B ## $a3 = 0000018B -/* 00700 80ABC7E0 0C031AD5 */ jal func_800C6B54 +/* 00700 80ABC7E0 0C031AD5 */ jal Graph_CloseDisps /* 00704 80ABC7E4 8D250000 */ lw $a1, 0x0000($t1) ## 00000000 /* 00708 80ABC7E8 8FBF004C */ lw $ra, 0x004C($sp) /* 0070C 80ABC7EC D7B40020 */ ldc1 $f20, 0x0020($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ny/EnNy_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Ny/EnNy_Draw.s index 3f595742f4..0dda1274fc 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ny/EnNy_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ny/EnNy_Draw.s @@ -10,7 +10,7 @@ glabel EnNy_Draw /* 01194 80ABDD44 24C6E444 */ addiu $a2, $a2, %lo(D_80ABE444) ## $a2 = 80ABE444 /* 01198 80ABDD48 27A40074 */ addiu $a0, $sp, 0x0074 ## $a0 = FFFFFFE4 /* 0119C 80ABDD4C 24070345 */ addiu $a3, $zero, 0x0345 ## $a3 = 00000345 -/* 011A0 80ABDD50 0C031AB1 */ jal func_800C6AC4 +/* 011A0 80ABDD50 0C031AB1 */ jal Graph_OpenDisps /* 011A4 80ABDD54 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 /* 011A8 80ABDD58 00002025 */ or $a0, $zero, $zero ## $a0 = 00000000 /* 011AC 80ABDD5C 0C018A29 */ jal func_800628A4 @@ -141,7 +141,7 @@ glabel EnNy_Draw /* 0139C 80ABDF4C 24C6E474 */ addiu $a2, $a2, %lo(D_80ABE474) ## $a2 = 80ABE474 /* 013A0 80ABDF50 27A40074 */ addiu $a0, $sp, 0x0074 ## $a0 = FFFFFFE4 /* 013A4 80ABDF54 24070368 */ addiu $a3, $zero, 0x0368 ## $a3 = 00000368 -/* 013A8 80ABDF58 0C031AD5 */ jal func_800C6B54 +/* 013A8 80ABDF58 0C031AD5 */ jal Graph_CloseDisps /* 013AC 80ABDF5C 8DE50000 */ lw $a1, 0x0000($t7) ## 00000000 /* 013B0 80ABDF60 862301CA */ lh $v1, 0x01CA($s1) ## 000001CA /* 013B4 80ABDF64 10600031 */ beq $v1, $zero, .L80ABE02C diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ny/func_80ABCF4C.s b/asm/non_matchings/overlays/actors/ovl_En_Ny/func_80ABCF4C.s index f79959f248..b6a25830eb 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ny/func_80ABCF4C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ny/func_80ABCF4C.s @@ -49,7 +49,7 @@ glabel func_80ABCF4C /* 00444 80ABCFF4 861900B6 */ lh $t9, 0x00B6($s0) ## 000000B6 /* 00448 80ABCFF8 C60C0094 */ lwc1 $f12, 0x0094($s0) ## 00000094 /* 0044C 80ABCFFC C60E0090 */ lwc1 $f14, 0x0090($s0) ## 00000090 -/* 00450 80ABD000 0C03F494 */ jal func_800FD250 +/* 00450 80ABD000 0C03F494 */ jal Math_atan2f /* 00454 80ABD004 A6190032 */ sh $t9, 0x0032($s0) ## 00000032 /* 00458 80ABD008 E7A0002C */ swc1 $f0, 0x002C($sp) /* 0045C 80ABD00C 0C041184 */ jal cosf diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ny/func_80ABE040.s b/asm/non_matchings/overlays/actors/ovl_En_Ny/func_80ABE040.s index 23b36db792..33bd2bf51f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ny/func_80ABE040.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ny/func_80ABE040.s @@ -20,7 +20,7 @@ glabel func_80ABE040 /* 014D8 80ABE088 24C6E484 */ addiu $a2, $a2, %lo(D_80ABE484) ## $a2 = 80ABE484 /* 014DC 80ABE08C 27A4009C */ addiu $a0, $sp, 0x009C ## $a0 = FFFFFFDC /* 014E0 80ABE090 24070384 */ addiu $a3, $zero, 0x0384 ## $a3 = 00000384 -/* 014E4 80ABE094 0C031AB1 */ jal func_800C6AC4 +/* 014E4 80ABE094 0C031AB1 */ jal Graph_OpenDisps /* 014E8 80ABE098 00A09025 */ or $s2, $a1, $zero ## $s2 = 00000000 /* 014EC 80ABE09C 8FAF00C4 */ lw $t7, 0x00C4($sp) /* 014F0 80ABE0A0 0C024F46 */ jal func_80093D18 @@ -113,7 +113,7 @@ glabel func_80ABE040 /* 01644 80ABE1F4 24C6E4A4 */ addiu $a2, $a2, %lo(D_80ABE4A4) ## $a2 = 80ABE4A4 /* 01648 80ABE1F8 27A4009C */ addiu $a0, $sp, 0x009C ## $a0 = FFFFFFDC /* 0164C 80ABE1FC 24070397 */ addiu $a3, $zero, 0x0397 ## $a3 = 00000397 -/* 01650 80ABE200 0C031AD5 */ jal func_800C6B54 +/* 01650 80ABE200 0C031AD5 */ jal Graph_CloseDisps /* 01654 80ABE204 8D450000 */ lw $a1, 0x0000($t2) ## 00000000 /* 01658 80ABE208 868201CA */ lh $v0, 0x01CA($s4) ## 000001CA /* 0165C 80ABE20C 1040002F */ beq $v0, $zero, .L80ABE2CC diff --git a/asm/non_matchings/overlays/actors/ovl_En_Okuta/EnOkuta_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Okuta/EnOkuta_Draw.s index 775e9350db..2970e59b52 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Okuta/EnOkuta_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Okuta/EnOkuta_Draw.s @@ -27,7 +27,7 @@ glabel EnOkuta_Draw .L80AC2734: /* 020D4 80AC2734 8E450000 */ lw $a1, 0x0000($s2) ## 00000000 /* 020D8 80AC2738 24070675 */ addiu $a3, $zero, 0x0675 ## $a3 = 00000675 -/* 020DC 80AC273C 0C031AB1 */ jal func_800C6AC4 +/* 020DC 80AC273C 0C031AB1 */ jal Graph_OpenDisps /* 020E0 80AC2740 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 /* 020E4 80AC2744 3C010001 */ lui $at, 0x0001 ## $at = 00010000 /* 020E8 80AC2748 34211DA0 */ ori $at, $at, 0x1DA0 ## $at = 00011DA0 @@ -68,7 +68,7 @@ glabel EnOkuta_Draw /* 02174 80AC27D4 8E450000 */ lw $a1, 0x0000($s2) ## 00000000 /* 02178 80AC27D8 24C628F0 */ addiu $a2, $a2, %lo(D_80AC28F0) ## $a2 = 80AC28F0 /* 0217C 80AC27DC 27A4003C */ addiu $a0, $sp, 0x003C ## $a0 = FFFFFFE4 -/* 02180 80AC27E0 0C031AD5 */ jal func_800C6B54 +/* 02180 80AC27E0 0C031AD5 */ jal Graph_CloseDisps /* 02184 80AC27E4 2407067E */ addiu $a3, $zero, 0x067E ## $a3 = 0000067E /* 02188 80AC27E8 8FBF002C */ lw $ra, 0x002C($sp) .L80AC27EC: diff --git a/asm/non_matchings/overlays/actors/ovl_En_Okuta/func_80AC0AB4.s b/asm/non_matchings/overlays/actors/ovl_En_Okuta/func_80AC0AB4.s index a26e29edd0..dbbe2ce0c2 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Okuta/func_80AC0AB4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Okuta/func_80AC0AB4.s @@ -1,7 +1,7 @@ glabel func_80AC0AB4 /* 00454 80AC0AB4 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00458 80AC0AB8 AFA5001C */ sw $a1, 0x001C($sp) -/* 0045C 80AC0ABC AFBF0014 */ sw $ra, 0x0014($sp) +/* 00458 80AC0AB8 AFA5001C */ sw $a1, 0x001C($sp) +/* 0045C 80AC0ABC AFBF0014 */ sw $ra, 0x0014($sp) /* 00460 80AC0AC0 8C980004 */ lw $t8, 0x0004($a0) ## 00000004 /* 00464 80AC0AC4 848F008A */ lh $t7, 0x008A($a0) ## 0000008A /* 00468 80AC0AC8 3C0E80AC */ lui $t6, %hi(EnOkuta_Draw) ## $t6 = 80AC0000 @@ -12,20 +12,20 @@ glabel func_80AC0AB4 /* 0047C 80AC0ADC AC990004 */ sw $t9, 0x0004($a0) ## 00000004 /* 00480 80AC0AE0 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 00484 80AC0AE4 A48F00B6 */ sh $t7, 0x00B6($a0) ## 000000B6 -/* 00488 80AC0AE8 AFA60018 */ sw $a2, 0x0018($sp) +/* 00488 80AC0AE8 AFA60018 */ sw $a2, 0x0018($sp) /* 0048C 80AC0AEC 24A53C64 */ addiu $a1, $a1, 0x3C64 ## $a1 = 06003C64 -/* 00490 80AC0AF0 0C02947A */ jal func_800A51E8 +/* 00490 80AC0AF0 0C02947A */ jal SkelAnime_ChangeAnimDefaultStop /* 00494 80AC0AF4 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 00498 80AC0AF8 8FA40018 */ lw $a0, 0x0018($sp) -/* 0049C 80AC0AFC 0C2B0224 */ jal func_80AC0890 -/* 004A0 80AC0B00 8FA5001C */ lw $a1, 0x001C($sp) -/* 004A4 80AC0B04 8FA60018 */ lw $a2, 0x0018($sp) +/* 00498 80AC0AF8 8FA40018 */ lw $a0, 0x0018($sp) +/* 0049C 80AC0AFC 0C2B0224 */ jal func_80AC0890 +/* 004A0 80AC0B00 8FA5001C */ lw $a1, 0x001C($sp) +/* 004A4 80AC0B04 8FA60018 */ lw $a2, 0x0018($sp) /* 004A8 80AC0B08 3C0880AC */ lui $t0, %hi(func_80AC0F64) ## $t0 = 80AC0000 /* 004AC 80AC0B0C 25080F64 */ addiu $t0, $t0, %lo(func_80AC0F64) ## $t0 = 80AC0F64 /* 004B0 80AC0B10 ACC80190 */ sw $t0, 0x0190($a2) ## 00000190 -/* 004B4 80AC0B14 8FBF0014 */ lw $ra, 0x0014($sp) +/* 004B4 80AC0B14 8FBF0014 */ lw $ra, 0x0014($sp) /* 004B8 80AC0B18 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 004BC 80AC0B1C 03E00008 */ jr $ra +/* 004BC 80AC0B1C 03E00008 */ jr $ra /* 004C0 80AC0B20 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Okuta/func_80AC0B24.s b/asm/non_matchings/overlays/actors/ovl_En_Okuta/func_80AC0B24.s index f679e80abb..6134965691 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Okuta/func_80AC0B24.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Okuta/func_80AC0B24.s @@ -1,18 +1,18 @@ glabel func_80AC0B24 /* 004C4 80AC0B24 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 004C8 80AC0B28 AFBF0014 */ sw $ra, 0x0014($sp) -/* 004CC 80AC0B2C AFA40018 */ sw $a0, 0x0018($sp) +/* 004C8 80AC0B28 AFBF0014 */ sw $ra, 0x0014($sp) +/* 004CC 80AC0B2C AFA40018 */ sw $a0, 0x0018($sp) /* 004D0 80AC0B30 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 004D4 80AC0B34 24A50AC0 */ addiu $a1, $a1, 0x0AC0 ## $a1 = 06000AC0 -/* 004D8 80AC0B38 0C02947A */ jal func_800A51E8 +/* 004D8 80AC0B38 0C02947A */ jal SkelAnime_ChangeAnimDefaultStop /* 004DC 80AC0B3C 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 004E0 80AC0B40 8FAF0018 */ lw $t7, 0x0018($sp) +/* 004E0 80AC0B40 8FAF0018 */ lw $t7, 0x0018($sp) /* 004E4 80AC0B44 3C0E80AC */ lui $t6, %hi(func_80AC10A8) ## $t6 = 80AC0000 /* 004E8 80AC0B48 25CE10A8 */ addiu $t6, $t6, %lo(func_80AC10A8) ## $t6 = 80AC10A8 /* 004EC 80AC0B4C ADEE0190 */ sw $t6, 0x0190($t7) ## 00000190 -/* 004F0 80AC0B50 8FBF0014 */ lw $ra, 0x0014($sp) +/* 004F0 80AC0B50 8FBF0014 */ lw $ra, 0x0014($sp) /* 004F4 80AC0B54 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 004F8 80AC0B58 03E00008 */ jr $ra +/* 004F8 80AC0B58 03E00008 */ jr $ra /* 004FC 80AC0B5C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Okuta/func_80AC0B60.s b/asm/non_matchings/overlays/actors/ovl_En_Okuta/func_80AC0B60.s index b62da0f51d..8af0ee2e4e 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Okuta/func_80AC0B60.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Okuta/func_80AC0B60.s @@ -1,29 +1,29 @@ glabel func_80AC0B60 /* 00500 80AC0B60 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00504 80AC0B64 AFBF0014 */ sw $ra, 0x0014($sp) +/* 00504 80AC0B64 AFBF0014 */ sw $ra, 0x0014($sp) /* 00508 80AC0B68 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 /* 0050C 80AC0B6C 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 00510 80AC0B70 24A50DDC */ addiu $a1, $a1, 0x0DDC ## $a1 = 06000DDC -/* 00514 80AC0B74 AFA60018 */ sw $a2, 0x0018($sp) -/* 00518 80AC0B78 0C0294BE */ jal func_800A52F8 +/* 00514 80AC0B74 AFA60018 */ sw $a2, 0x0018($sp) +/* 00518 80AC0B78 0C0294BE */ jal SkelAnime_ChangeAnimDefaultRepeat /* 0051C 80AC0B7C 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 00520 80AC0B80 8FA60018 */ lw $a2, 0x0018($sp) +/* 00520 80AC0B80 8FA60018 */ lw $a2, 0x0018($sp) /* 00524 80AC0B84 3C0E80AC */ lui $t6, %hi(func_80AC12D8) ## $t6 = 80AC0000 /* 00528 80AC0B88 25CE12D8 */ addiu $t6, $t6, %lo(func_80AC12D8) ## $t6 = 80AC12D8 /* 0052C 80AC0B8C 8CCF0190 */ lw $t7, 0x0190($a2) ## 00000190 /* 00530 80AC0B90 3C1980AC */ lui $t9, %hi(func_80AC11A8) ## $t9 = 80AC0000 /* 00534 80AC0B94 24180002 */ addiu $t8, $zero, 0x0002 ## $t8 = 00000002 -/* 00538 80AC0B98 15CF0003 */ bne $t6, $t7, .L80AC0BA8 +/* 00538 80AC0B98 15CF0003 */ bne $t6, $t7, .L80AC0BA8 /* 0053C 80AC0B9C 273911A8 */ addiu $t9, $t9, %lo(func_80AC11A8) ## $t9 = 80AC11A8 -/* 00540 80AC0BA0 10000002 */ beq $zero, $zero, .L80AC0BAC +/* 00540 80AC0BA0 10000002 */ beq $zero, $zero, .L80AC0BAC /* 00544 80AC0BA4 A4D80194 */ sh $t8, 0x0194($a2) ## 00000194 .L80AC0BA8: /* 00548 80AC0BA8 A4C00194 */ sh $zero, 0x0194($a2) ## 00000194 .L80AC0BAC: /* 0054C 80AC0BAC ACD90190 */ sw $t9, 0x0190($a2) ## 00000190 -/* 00550 80AC0BB0 8FBF0014 */ lw $ra, 0x0014($sp) +/* 00550 80AC0BB0 8FBF0014 */ lw $ra, 0x0014($sp) /* 00554 80AC0BB4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00558 80AC0BB8 03E00008 */ jr $ra +/* 00558 80AC0BB8 03E00008 */ jr $ra /* 0055C 80AC0BBC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Okuta/func_80AC0BC0.s b/asm/non_matchings/overlays/actors/ovl_En_Okuta/func_80AC0BC0.s index 199096f09d..491d8bc113 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Okuta/func_80AC0BC0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Okuta/func_80AC0BC0.s @@ -1,17 +1,17 @@ glabel func_80AC0BC0 /* 00560 80AC0BC0 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 00564 80AC0BC4 AFB00018 */ sw $s0, 0x0018($sp) -/* 00568 80AC0BC8 AFA5002C */ sw $a1, 0x002C($sp) +/* 00564 80AC0BC4 AFB00018 */ sw $s0, 0x0018($sp) +/* 00568 80AC0BC8 AFA5002C */ sw $a1, 0x002C($sp) /* 0056C 80AC0BCC 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00570 80AC0BD0 AFBF001C */ sw $ra, 0x001C($sp) +/* 00570 80AC0BD0 AFBF001C */ sw $ra, 0x001C($sp) /* 00574 80AC0BD4 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 00578 80AC0BD8 24A50344 */ addiu $a1, $a1, 0x0344 ## $a1 = 06000344 -/* 0057C 80AC0BDC 0C02947A */ jal func_800A51E8 +/* 0057C 80AC0BDC 0C02947A */ jal SkelAnime_ChangeAnimDefaultStop /* 00580 80AC0BE0 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C /* 00584 80AC0BE4 8E0E0190 */ lw $t6, 0x0190($s0) ## 00000190 /* 00588 80AC0BE8 3C0280AC */ lui $v0, %hi(func_80AC12D8) ## $v0 = 80AC0000 /* 0058C 80AC0BEC 244212D8 */ addiu $v0, $v0, %lo(func_80AC12D8) ## $v0 = 80AC12D8 -/* 00590 80AC0BF0 104E0003 */ beq $v0, $t6, .L80AC0C00 +/* 00590 80AC0BF0 104E0003 */ beq $v0, $t6, .L80AC0C00 /* 00594 80AC0BF4 3C014120 */ lui $at, 0x4120 ## $at = 41200000 /* 00598 80AC0BF8 860F0196 */ lh $t7, 0x0196($s0) ## 00000196 /* 0059C 80AC0BFC A60F0194 */ sh $t7, 0x0194($s0) ## 00000194 @@ -22,47 +22,47 @@ glabel func_80AC0BC0 /* 005AC 80AC0C0C C6040094 */ lwc1 $f4, 0x0094($s0) ## 00000094 /* 005B0 80AC0C10 3C014248 */ lui $at, 0x4248 ## $at = 42480000 /* 005B4 80AC0C14 44815000 */ mtc1 $at, $f10 ## $f10 = 50.00 -/* 005B8 80AC0C18 46062000 */ add.s $f0, $f4, $f6 +/* 005B8 80AC0C18 46062000 */ add.s $f0, $f4, $f6 /* 005BC 80AC0C1C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 005C0 80AC0C20 4602003C */ c.lt.s $f0, $f2 +/* 005C0 80AC0C20 4602003C */ c.lt.s $f0, $f2 /* 005C4 80AC0C24 E6000360 */ swc1 $f0, 0x0360($s0) ## 00000360 -/* 005C8 80AC0C28 45020004 */ bc1fl .L80AC0C3C +/* 005C8 80AC0C28 45020004 */ bc1fl .L80AC0C3C /* 005CC 80AC0C2C C6080360 */ lwc1 $f8, 0x0360($s0) ## 00000360 -/* 005D0 80AC0C30 10000003 */ beq $zero, $zero, .L80AC0C40 +/* 005D0 80AC0C30 10000003 */ beq $zero, $zero, .L80AC0C40 /* 005D4 80AC0C34 E6020360 */ swc1 $f2, 0x0360($s0) ## 00000360 /* 005D8 80AC0C38 C6080360 */ lwc1 $f8, 0x0360($s0) ## 00000360 .L80AC0C3C: /* 005DC 80AC0C3C E6080360 */ swc1 $f8, 0x0360($s0) ## 00000360 .L80AC0C40: /* 005E0 80AC0C40 C6000360 */ lwc1 $f0, 0x0360($s0) ## 00000360 -/* 005E4 80AC0C44 8FA5002C */ lw $a1, 0x002C($sp) -/* 005E8 80AC0C48 4600503C */ c.lt.s $f10, $f0 +/* 005E4 80AC0C44 8FA5002C */ lw $a1, 0x002C($sp) +/* 005E8 80AC0C48 4600503C */ c.lt.s $f10, $f0 /* 005EC 80AC0C4C 00000000 */ nop -/* 005F0 80AC0C50 45020006 */ bc1fl .L80AC0C6C +/* 005F0 80AC0C50 45020006 */ bc1fl .L80AC0C6C /* 005F4 80AC0C54 3C014248 */ lui $at, 0x4248 ## $at = 42480000 -/* 005F8 80AC0C58 0C2B0269 */ jal func_80AC09A4 -/* 005FC 80AC0C5C AFA20024 */ sw $v0, 0x0024($sp) -/* 00600 80AC0C60 8FA20024 */ lw $v0, 0x0024($sp) +/* 005F8 80AC0C58 0C2B0269 */ jal func_80AC09A4 +/* 005FC 80AC0C5C AFA20024 */ sw $v0, 0x0024($sp) +/* 00600 80AC0C60 8FA20024 */ lw $v0, 0x0024($sp) /* 00604 80AC0C64 C6000360 */ lwc1 $f0, 0x0360($s0) ## 00000360 /* 00608 80AC0C68 3C014248 */ lui $at, 0x4248 ## $at = 42480000 .L80AC0C6C: /* 0060C 80AC0C6C 44818000 */ mtc1 $at, $f16 ## $f16 = 50.00 /* 00610 80AC0C70 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 00614 80AC0C74 240538C2 */ addiu $a1, $zero, 0x38C2 ## $a1 = 000038C2 -/* 00618 80AC0C78 4600803C */ c.lt.s $f16, $f0 +/* 00618 80AC0C78 4600803C */ c.lt.s $f16, $f0 /* 0061C 80AC0C7C 00000000 */ nop -/* 00620 80AC0C80 45020005 */ bc1fl .L80AC0C98 +/* 00620 80AC0C80 45020005 */ bc1fl .L80AC0C98 /* 00624 80AC0C84 AE020190 */ sw $v0, 0x0190($s0) ## 00000190 /* 00628 80AC0C88 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 0062C 80AC0C8C AFA20024 */ sw $v0, 0x0024($sp) -/* 00630 80AC0C90 8FA20024 */ lw $v0, 0x0024($sp) + +/* 0062C 80AC0C8C AFA20024 */ sw $v0, 0x0024($sp) +/* 00630 80AC0C90 8FA20024 */ lw $v0, 0x0024($sp) /* 00634 80AC0C94 AE020190 */ sw $v0, 0x0190($s0) ## 00000190 .L80AC0C98: -/* 00638 80AC0C98 8FBF001C */ lw $ra, 0x001C($sp) -/* 0063C 80AC0C9C 8FB00018 */ lw $s0, 0x0018($sp) +/* 00638 80AC0C98 8FBF001C */ lw $ra, 0x001C($sp) +/* 0063C 80AC0C9C 8FB00018 */ lw $s0, 0x0018($sp) /* 00640 80AC0CA0 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 00644 80AC0CA4 03E00008 */ jr $ra +/* 00644 80AC0CA4 03E00008 */ jr $ra /* 00648 80AC0CA8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Okuta/func_80AC0CAC.s b/asm/non_matchings/overlays/actors/ovl_En_Okuta/func_80AC0CAC.s index fabb0278d1..8b8069002e 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Okuta/func_80AC0CAC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Okuta/func_80AC0CAC.s @@ -1,19 +1,19 @@ glabel func_80AC0CAC /* 0064C 80AC0CAC 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 00650 80AC0CB0 AFB00020 */ sw $s0, 0x0020($sp) +/* 00650 80AC0CB0 AFB00020 */ sw $s0, 0x0020($sp) /* 00654 80AC0CB4 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00658 80AC0CB8 AFBF0024 */ sw $ra, 0x0024($sp) +/* 00658 80AC0CB8 AFBF0024 */ sw $ra, 0x0024($sp) /* 0065C 80AC0CBC 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 00660 80AC0CC0 24A53910 */ addiu $a1, $a1, 0x3910 ## $a1 = 06003910 /* 00664 80AC0CC4 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 00668 80AC0CC8 0C029490 */ jal func_800A5240 +/* 00668 80AC0CC8 0C029490 */ jal SkelAnime_ChangeAnimTransitionStop /* 0066C 80AC0CCC 3C06C0A0 */ lui $a2, 0xC0A0 ## $a2 = C0A00000 /* 00670 80AC0CD0 240E000B */ addiu $t6, $zero, 0x000B ## $t6 = 0000000B -/* 00674 80AC0CD4 AFAE0010 */ sw $t6, 0x0010($sp) +/* 00674 80AC0CD4 AFAE0010 */ sw $t6, 0x0010($sp) /* 00678 80AC0CD8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 0067C 80AC0CDC 24054000 */ addiu $a1, $zero, 0x4000 ## $a1 = 00004000 /* 00680 80AC0CE0 240600FF */ addiu $a2, $zero, 0x00FF ## $a2 = 000000FF -/* 00684 80AC0CE4 0C00D09B */ jal func_8003426C +/* 00684 80AC0CE4 0C00D09B */ jal func_8003426C /* 00688 80AC0CE8 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 /* 0068C 80AC0CEC 920F0381 */ lbu $t7, 0x0381($s0) ## 00000381 /* 00690 80AC0CF0 3C053C23 */ lui $a1, 0x3C23 ## $a1 = 3C230000 @@ -21,19 +21,19 @@ glabel func_80AC0CAC /* 00698 80AC0CF8 31F8FFFD */ andi $t8, $t7, 0xFFFD ## $t8 = 00000000 /* 0069C 80AC0CFC A2180381 */ sb $t8, 0x0381($s0) ## 00000381 /* 006A0 80AC0D00 0C00B58B */ jal Actor_SetScale - + /* 006A4 80AC0D04 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 006A8 80AC0D08 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 006AC 80AC0D0C 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 006B0 80AC0D10 240538C6 */ addiu $a1, $zero, 0x38C6 ## $a1 = 000038C6 /* 006B4 80AC0D14 3C1980AC */ lui $t9, %hi(func_80AC1458) ## $t9 = 80AC0000 /* 006B8 80AC0D18 27391458 */ addiu $t9, $t9, %lo(func_80AC1458) ## $t9 = 80AC1458 /* 006BC 80AC0D1C AE190190 */ sw $t9, 0x0190($s0) ## 00000190 -/* 006C0 80AC0D20 8FBF0024 */ lw $ra, 0x0024($sp) -/* 006C4 80AC0D24 8FB00020 */ lw $s0, 0x0020($sp) +/* 006C0 80AC0D20 8FBF0024 */ lw $ra, 0x0024($sp) +/* 006C4 80AC0D24 8FB00020 */ lw $s0, 0x0020($sp) /* 006C8 80AC0D28 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 006CC 80AC0D2C 03E00008 */ jr $ra +/* 006CC 80AC0D2C 03E00008 */ jr $ra /* 006D0 80AC0D30 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Okuta/func_80AC0D34.s b/asm/non_matchings/overlays/actors/ovl_En_Okuta/func_80AC0D34.s index 6136f2c931..2be0e2b10a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Okuta/func_80AC0D34.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Okuta/func_80AC0D34.s @@ -1,21 +1,21 @@ glabel func_80AC0D34 /* 006D4 80AC0D34 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 006D8 80AC0D38 AFBF0014 */ sw $ra, 0x0014($sp) +/* 006D8 80AC0D38 AFBF0014 */ sw $ra, 0x0014($sp) /* 006DC 80AC0D3C 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 /* 006E0 80AC0D40 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 006E4 80AC0D44 24A508FC */ addiu $a1, $a1, 0x08FC ## $a1 = 060008FC -/* 006E8 80AC0D48 AFA70018 */ sw $a3, 0x0018($sp) +/* 006E8 80AC0D48 AFA70018 */ sw $a3, 0x0018($sp) /* 006EC 80AC0D4C 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 006F0 80AC0D50 0C029490 */ jal func_800A5240 +/* 006F0 80AC0D50 0C029490 */ jal SkelAnime_ChangeAnimTransitionStop /* 006F4 80AC0D54 3C06C040 */ lui $a2, 0xC040 ## $a2 = C0400000 -/* 006F8 80AC0D58 8FA70018 */ lw $a3, 0x0018($sp) +/* 006F8 80AC0D58 8FA70018 */ lw $a3, 0x0018($sp) /* 006FC 80AC0D5C 3C0E80AC */ lui $t6, %hi(func_80AC14A8) ## $t6 = 80AC0000 /* 00700 80AC0D60 25CE14A8 */ addiu $t6, $t6, %lo(func_80AC14A8) ## $t6 = 80AC14A8 /* 00704 80AC0D64 A4E00194 */ sh $zero, 0x0194($a3) ## 00000194 /* 00708 80AC0D68 ACEE0190 */ sw $t6, 0x0190($a3) ## 00000190 -/* 0070C 80AC0D6C 8FBF0014 */ lw $ra, 0x0014($sp) +/* 0070C 80AC0D6C 8FBF0014 */ lw $ra, 0x0014($sp) /* 00710 80AC0D70 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00714 80AC0D74 03E00008 */ jr $ra +/* 00714 80AC0D74 03E00008 */ jr $ra /* 00718 80AC0D78 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ossan/EnOssan_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Ossan/EnOssan_Destroy.s index ababcb0017..28c68c06ea 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ossan/EnOssan_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ossan/EnOssan_Destroy.s @@ -1,18 +1,18 @@ glabel EnOssan_Destroy /* 00A6C 80AC370C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00A70 80AC3710 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00A74 80AC3714 AFA40018 */ sw $a0, 0x0018($sp) -/* 00A78 80AC3718 AFA5001C */ sw $a1, 0x001C($sp) -/* 00A7C 80AC371C 0C0295BC */ jal func_800A56F0 +/* 00A70 80AC3710 AFBF0014 */ sw $ra, 0x0014($sp) +/* 00A74 80AC3714 AFA40018 */ sw $a0, 0x0018($sp) +/* 00A78 80AC3718 AFA5001C */ sw $a1, 0x001C($sp) +/* 00A7C 80AC371C 0C0295BC */ jal SkelAnime_Free /* 00A80 80AC3720 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 00A84 80AC3724 8FA50018 */ lw $a1, 0x0018($sp) -/* 00A88 80AC3728 8FA4001C */ lw $a0, 0x001C($sp) +/* 00A84 80AC3724 8FA50018 */ lw $a1, 0x0018($sp) +/* 00A88 80AC3728 8FA4001C */ lw $a0, 0x001C($sp) /* 00A8C 80AC372C 0C0170EB */ jal ActorCollider_FreeCylinder - + /* 00A90 80AC3730 24A50198 */ addiu $a1, $a1, 0x0198 ## $a1 = 00000198 -/* 00A94 80AC3734 8FBF0014 */ lw $ra, 0x0014($sp) +/* 00A94 80AC3734 8FBF0014 */ lw $ra, 0x0014($sp) /* 00A98 80AC3738 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00A9C 80AC373C 03E00008 */ jr $ra +/* 00A9C 80AC373C 03E00008 */ jr $ra /* 00AA0 80AC3740 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC6ADC.s b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC6ADC.s index 82dc81487c..831c206390 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC6ADC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC6ADC.s @@ -1,27 +1,27 @@ glabel func_80AC6ADC /* 03E3C 80AC6ADC 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 03E40 80AC6AE0 AFA40028 */ sw $a0, 0x0028($sp) -/* 03E44 80AC6AE4 AFA5002C */ sw $a1, 0x002C($sp) +/* 03E40 80AC6AE0 AFA40028 */ sw $a0, 0x0028($sp) +/* 03E44 80AC6AE4 AFA5002C */ sw $a1, 0x002C($sp) /* 03E48 80AC6AE8 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 03E4C 80AC6AEC 8FA50028 */ lw $a1, 0x0028($sp) -/* 03E50 80AC6AF0 AFBF0024 */ sw $ra, 0x0024($sp) +/* 03E4C 80AC6AEC 8FA50028 */ lw $a1, 0x0028($sp) +/* 03E50 80AC6AF0 AFBF0024 */ sw $ra, 0x0024($sp) /* 03E54 80AC6AF4 3C060601 */ lui $a2, 0x0601 ## $a2 = 06010000 /* 03E58 80AC6AF8 3C070600 */ lui $a3, 0x0600 ## $a3 = 06000000 /* 03E5C 80AC6AFC 24E70338 */ addiu $a3, $a3, 0x0338 ## $a3 = 06000338 /* 03E60 80AC6B00 24C69B38 */ addiu $a2, $a2, 0x9B38 ## $a2 = 06009B38 -/* 03E64 80AC6B04 AFA00010 */ sw $zero, 0x0010($sp) -/* 03E68 80AC6B08 AFA00014 */ sw $zero, 0x0014($sp) -/* 03E6C 80AC6B0C AFA00018 */ sw $zero, 0x0018($sp) -/* 03E70 80AC6B10 0C0291BE */ jal func_800A46F8 +/* 03E64 80AC6B04 AFA00010 */ sw $zero, 0x0010($sp) +/* 03E68 80AC6B08 AFA00014 */ sw $zero, 0x0014($sp) +/* 03E6C 80AC6B0C AFA00018 */ sw $zero, 0x0018($sp) +/* 03E70 80AC6B10 0C0291BE */ jal SkelAnime_InitSV /* 03E74 80AC6B14 24A5014C */ addiu $a1, $a1, 0x014C ## $a1 = 0000014C -/* 03E78 80AC6B18 8FA20028 */ lw $v0, 0x0028($sp) +/* 03E78 80AC6B18 8FA20028 */ lw $v0, 0x0028($sp) /* 03E7C 80AC6B1C 3C0E80AC */ lui $t6, %hi(func_80AC7DAC) ## $t6 = 80AC0000 /* 03E80 80AC6B20 25CE7DAC */ addiu $t6, $t6, %lo(func_80AC7DAC) ## $t6 = 80AC7DAC /* 03E84 80AC6B24 AC4E0134 */ sw $t6, 0x0134($v0) ## 00000134 /* 03E88 80AC6B28 AC400194 */ sw $zero, 0x0194($v0) ## 00000194 -/* 03E8C 80AC6B2C 8FBF0024 */ lw $ra, 0x0024($sp) +/* 03E8C 80AC6B2C 8FBF0024 */ lw $ra, 0x0024($sp) /* 03E90 80AC6B30 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 03E94 80AC6B34 03E00008 */ jr $ra +/* 03E94 80AC6B34 03E00008 */ jr $ra /* 03E98 80AC6B38 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC6B3C.s b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC6B3C.s index b14262d76a..6a1efc5ee5 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC6B3C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC6B3C.s @@ -1,50 +1,50 @@ glabel func_80AC6B3C /* 03E9C 80AC6B3C 27BDFFB8 */ addiu $sp, $sp, 0xFFB8 ## $sp = FFFFFFB8 -/* 03EA0 80AC6B40 AFB00038 */ sw $s0, 0x0038($sp) +/* 03EA0 80AC6B40 AFB00038 */ sw $s0, 0x0038($sp) /* 03EA4 80AC6B44 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 03EA8 80AC6B48 AFA5004C */ sw $a1, 0x004C($sp) +/* 03EA8 80AC6B48 AFA5004C */ sw $a1, 0x004C($sp) /* 03EAC 80AC6B4C 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 03EB0 80AC6B50 AFBF003C */ sw $ra, 0x003C($sp) +/* 03EB0 80AC6B50 AFBF003C */ sw $ra, 0x003C($sp) /* 03EB4 80AC6B54 2605014C */ addiu $a1, $s0, 0x014C ## $a1 = 0000014C /* 03EB8 80AC6B58 3C060600 */ lui $a2, 0x0600 ## $a2 = 06000000 /* 03EBC 80AC6B5C 24C600F0 */ addiu $a2, $a2, 0x00F0 ## $a2 = 060000F0 -/* 03EC0 80AC6B60 AFA50040 */ sw $a1, 0x0040($sp) -/* 03EC4 80AC6B64 AFA00010 */ sw $zero, 0x0010($sp) -/* 03EC8 80AC6B68 AFA00014 */ sw $zero, 0x0014($sp) -/* 03ECC 80AC6B6C AFA00018 */ sw $zero, 0x0018($sp) -/* 03ED0 80AC6B70 0C0291BE */ jal func_800A46F8 +/* 03EC0 80AC6B60 AFA50040 */ sw $a1, 0x0040($sp) +/* 03EC4 80AC6B64 AFA00010 */ sw $zero, 0x0010($sp) +/* 03EC8 80AC6B68 AFA00014 */ sw $zero, 0x0014($sp) +/* 03ECC 80AC6B6C AFA00018 */ sw $zero, 0x0018($sp) +/* 03ED0 80AC6B70 0C0291BE */ jal SkelAnime_InitSV /* 03ED4 80AC6B74 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 /* 03ED8 80AC6B78 820F01EA */ lb $t7, 0x01EA($s0) ## 000001EA -/* 03EDC 80AC6B7C 8FAE004C */ lw $t6, 0x004C($sp) +/* 03EDC 80AC6B7C 8FAE004C */ lw $t6, 0x004C($sp) /* 03EE0 80AC6B80 3C080001 */ lui $t0, 0x0001 ## $t0 = 00010000 -/* 03EE4 80AC6B84 000FC100 */ sll $t8, $t7, 4 -/* 03EE8 80AC6B88 030FC021 */ addu $t8, $t8, $t7 -/* 03EEC 80AC6B8C 0018C080 */ sll $t8, $t8, 2 -/* 03EF0 80AC6B90 01D8C821 */ addu $t9, $t6, $t8 -/* 03EF4 80AC6B94 01194021 */ addu $t0, $t0, $t9 +/* 03EE4 80AC6B84 000FC100 */ sll $t8, $t7, 4 +/* 03EE8 80AC6B88 030FC021 */ addu $t8, $t8, $t7 +/* 03EEC 80AC6B8C 0018C080 */ sll $t8, $t8, 2 +/* 03EF0 80AC6B90 01D8C821 */ addu $t9, $t6, $t8 +/* 03EF4 80AC6B94 01194021 */ addu $t0, $t0, $t9 /* 03EF8 80AC6B98 8D0817B4 */ lw $t0, 0x17B4($t0) ## 000117B4 /* 03EFC 80AC6B9C 3C018000 */ lui $at, 0x8000 ## $at = 80000000 /* 03F00 80AC6BA0 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 -/* 03F04 80AC6BA4 01014821 */ addu $t1, $t0, $at +/* 03F04 80AC6BA4 01014821 */ addu $t1, $t0, $at /* 03F08 80AC6BA8 3C018016 */ lui $at, 0x8016 ## $at = 80160000 /* 03F0C 80AC6BAC AC296FC0 */ sw $t1, 0x6FC0($at) ## 80166FC0 /* 03F10 80AC6BB0 0C028800 */ jal SkelAnime_GetFrameCount - + /* 03F14 80AC6BB4 248404A8 */ addiu $a0, $a0, 0x04A8 ## $a0 = 060004A8 /* 03F18 80AC6BB8 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 03F1C 80AC6BBC 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 /* 03F20 80AC6BC0 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 03F24 80AC6BC4 468021A0 */ cvt.s.w $f6, $f4 -/* 03F28 80AC6BC8 44070000 */ mfc1 $a3, $f0 +/* 03F24 80AC6BC4 468021A0 */ cvt.s.w $f6, $f4 +/* 03F28 80AC6BC8 44070000 */ mfc1 $a3, $f0 /* 03F2C 80AC6BCC 24A504A8 */ addiu $a1, $a1, 0x04A8 ## $a1 = 060004A8 -/* 03F30 80AC6BD0 8FA40040 */ lw $a0, 0x0040($sp) +/* 03F30 80AC6BD0 8FA40040 */ lw $a0, 0x0040($sp) /* 03F34 80AC6BD4 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 03F38 80AC6BD8 AFA00014 */ sw $zero, 0x0014($sp) -/* 03F3C 80AC6BDC E7A60010 */ swc1 $f6, 0x0010($sp) -/* 03F40 80AC6BE0 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 03F44 80AC6BE4 E7A00018 */ swc1 $f0, 0x0018($sp) -/* 03F48 80AC6BE8 8FA6004C */ lw $a2, 0x004C($sp) +/* 03F38 80AC6BD8 AFA00014 */ sw $zero, 0x0014($sp) +/* 03F3C 80AC6BDC E7A60010 */ swc1 $f6, 0x0010($sp) +/* 03F40 80AC6BE0 0C029468 */ jal SkelAnime_ChangeAnim + +/* 03F44 80AC6BE4 E7A00018 */ swc1 $f0, 0x0018($sp) +/* 03F48 80AC6BE8 8FA6004C */ lw $a2, 0x004C($sp) /* 03F4C 80AC6BEC C6080024 */ lwc1 $f8, 0x0024($s0) ## 00000024 /* 03F50 80AC6BF0 3C0A80AD */ lui $t2, %hi(func_80AC80B4) ## $t2 = 80AD0000 /* 03F54 80AC6BF4 3C0B80AC */ lui $t3, %hi(func_80AC7380) ## $t3 = 80AC0000 @@ -52,25 +52,25 @@ glabel func_80AC6B3C /* 03F5C 80AC6BFC 256B7380 */ addiu $t3, $t3, %lo(func_80AC7380) ## $t3 = 80AC7380 /* 03F60 80AC6C00 AE0A0134 */ sw $t2, 0x0134($s0) ## 00000134 /* 03F64 80AC6C04 AE0B0194 */ sw $t3, 0x0194($s0) ## 00000194 -/* 03F68 80AC6C08 E7A80010 */ swc1 $f8, 0x0010($sp) +/* 03F68 80AC6C08 E7A80010 */ swc1 $f8, 0x0010($sp) /* 03F6C 80AC6C0C C60A0028 */ lwc1 $f10, 0x0028($s0) ## 00000028 /* 03F70 80AC6C10 240C0003 */ addiu $t4, $zero, 0x0003 ## $t4 = 00000003 /* 03F74 80AC6C14 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 03F78 80AC6C18 E7AA0014 */ swc1 $f10, 0x0014($sp) +/* 03F78 80AC6C18 E7AA0014 */ swc1 $f10, 0x0014($sp) /* 03F7C 80AC6C1C C610002C */ lwc1 $f16, 0x002C($s0) ## 0000002C -/* 03F80 80AC6C20 AFAC0028 */ sw $t4, 0x0028($sp) -/* 03F84 80AC6C24 AFA00024 */ sw $zero, 0x0024($sp) -/* 03F88 80AC6C28 AFA00020 */ sw $zero, 0x0020($sp) -/* 03F8C 80AC6C2C AFA0001C */ sw $zero, 0x001C($sp) +/* 03F80 80AC6C20 AFAC0028 */ sw $t4, 0x0028($sp) +/* 03F84 80AC6C24 AFA00024 */ sw $zero, 0x0024($sp) +/* 03F88 80AC6C28 AFA00020 */ sw $zero, 0x0020($sp) +/* 03F8C 80AC6C2C AFA0001C */ sw $zero, 0x001C($sp) /* 03F90 80AC6C30 24070018 */ addiu $a3, $zero, 0x0018 ## $a3 = 00000018 /* 03F94 80AC6C34 24C41C24 */ addiu $a0, $a2, 0x1C24 ## $a0 = 00001C24 /* 03F98 80AC6C38 0C00C916 */ jal Actor_SpawnAttached - -/* 03F9C 80AC6C3C E7B00018 */ swc1 $f16, 0x0018($sp) -/* 03FA0 80AC6C40 8FBF003C */ lw $ra, 0x003C($sp) -/* 03FA4 80AC6C44 8FB00038 */ lw $s0, 0x0038($sp) + +/* 03F9C 80AC6C3C E7B00018 */ swc1 $f16, 0x0018($sp) +/* 03FA0 80AC6C40 8FBF003C */ lw $ra, 0x003C($sp) +/* 03FA4 80AC6C44 8FB00038 */ lw $s0, 0x0038($sp) /* 03FA8 80AC6C48 27BD0048 */ addiu $sp, $sp, 0x0048 ## $sp = 00000000 -/* 03FAC 80AC6C4C 03E00008 */ jr $ra +/* 03FAC 80AC6C4C 03E00008 */ jr $ra /* 03FB0 80AC6C50 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC6C54.s b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC6C54.s index d0545ba4cd..75a941b279 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC6C54.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC6C54.s @@ -1,60 +1,60 @@ glabel func_80AC6C54 /* 03FB4 80AC6C54 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 03FB8 80AC6C58 AFA40030 */ sw $a0, 0x0030($sp) -/* 03FBC 80AC6C5C AFA50034 */ sw $a1, 0x0034($sp) +/* 03FB8 80AC6C58 AFA40030 */ sw $a0, 0x0030($sp) +/* 03FBC 80AC6C5C AFA50034 */ sw $a1, 0x0034($sp) /* 03FC0 80AC6C60 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 03FC4 80AC6C64 8FA50030 */ lw $a1, 0x0030($sp) -/* 03FC8 80AC6C68 AFBF0024 */ sw $ra, 0x0024($sp) +/* 03FC4 80AC6C64 8FA50030 */ lw $a1, 0x0030($sp) +/* 03FC8 80AC6C68 AFBF0024 */ sw $ra, 0x0024($sp) /* 03FCC 80AC6C6C 3C060601 */ lui $a2, 0x0601 ## $a2 = 06010000 /* 03FD0 80AC6C70 24A5014C */ addiu $a1, $a1, 0x014C ## $a1 = 0000014C -/* 03FD4 80AC6C74 AFA50028 */ sw $a1, 0x0028($sp) +/* 03FD4 80AC6C74 AFA50028 */ sw $a1, 0x0028($sp) /* 03FD8 80AC6C78 24C6FEF0 */ addiu $a2, $a2, 0xFEF0 ## $a2 = 0600FEF0 -/* 03FDC 80AC6C7C AFA00010 */ sw $zero, 0x0010($sp) -/* 03FE0 80AC6C80 AFA00014 */ sw $zero, 0x0014($sp) -/* 03FE4 80AC6C84 AFA00018 */ sw $zero, 0x0018($sp) -/* 03FE8 80AC6C88 0C0291BE */ jal func_800A46F8 +/* 03FDC 80AC6C7C AFA00010 */ sw $zero, 0x0010($sp) +/* 03FE0 80AC6C80 AFA00014 */ sw $zero, 0x0014($sp) +/* 03FE4 80AC6C84 AFA00018 */ sw $zero, 0x0018($sp) +/* 03FE8 80AC6C88 0C0291BE */ jal SkelAnime_InitSV /* 03FEC 80AC6C8C 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 03FF0 80AC6C90 8FAF0030 */ lw $t7, 0x0030($sp) -/* 03FF4 80AC6C94 8FAE0034 */ lw $t6, 0x0034($sp) +/* 03FF0 80AC6C90 8FAF0030 */ lw $t7, 0x0030($sp) +/* 03FF4 80AC6C94 8FAE0034 */ lw $t6, 0x0034($sp) /* 03FF8 80AC6C98 3C090001 */ lui $t1, 0x0001 ## $t1 = 00010000 /* 03FFC 80AC6C9C 81F801EA */ lb $t8, 0x01EA($t7) ## 000001EA /* 04000 80AC6CA0 3C018000 */ lui $at, 0x8000 ## $at = 80000000 /* 04004 80AC6CA4 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 -/* 04008 80AC6CA8 0018C900 */ sll $t9, $t8, 4 -/* 0400C 80AC6CAC 0338C821 */ addu $t9, $t9, $t8 -/* 04010 80AC6CB0 0019C880 */ sll $t9, $t9, 2 -/* 04014 80AC6CB4 01D94021 */ addu $t0, $t6, $t9 -/* 04018 80AC6CB8 01284821 */ addu $t1, $t1, $t0 +/* 04008 80AC6CA8 0018C900 */ sll $t9, $t8, 4 +/* 0400C 80AC6CAC 0338C821 */ addu $t9, $t9, $t8 +/* 04010 80AC6CB0 0019C880 */ sll $t9, $t9, 2 +/* 04014 80AC6CB4 01D94021 */ addu $t0, $t6, $t9 +/* 04018 80AC6CB8 01284821 */ addu $t1, $t1, $t0 /* 0401C 80AC6CBC 8D2917B4 */ lw $t1, 0x17B4($t1) ## 000117B4 /* 04020 80AC6CC0 248400FC */ addiu $a0, $a0, 0x00FC ## $a0 = 060000FC -/* 04024 80AC6CC4 01215021 */ addu $t2, $t1, $at +/* 04024 80AC6CC4 01215021 */ addu $t2, $t1, $at /* 04028 80AC6CC8 3C018016 */ lui $at, 0x8016 ## $at = 80160000 /* 0402C 80AC6CCC 0C028800 */ jal SkelAnime_GetFrameCount - + /* 04030 80AC6CD0 AC2A6FC0 */ sw $t2, 0x6FC0($at) ## 80166FC0 /* 04034 80AC6CD4 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 04038 80AC6CD8 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 /* 0403C 80AC6CDC 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 04040 80AC6CE0 468021A0 */ cvt.s.w $f6, $f4 -/* 04044 80AC6CE4 44070000 */ mfc1 $a3, $f0 +/* 04040 80AC6CE0 468021A0 */ cvt.s.w $f6, $f4 +/* 04044 80AC6CE4 44070000 */ mfc1 $a3, $f0 /* 04048 80AC6CE8 24A500FC */ addiu $a1, $a1, 0x00FC ## $a1 = 060000FC -/* 0404C 80AC6CEC 8FA40028 */ lw $a0, 0x0028($sp) +/* 0404C 80AC6CEC 8FA40028 */ lw $a0, 0x0028($sp) /* 04050 80AC6CF0 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 04054 80AC6CF4 AFA00014 */ sw $zero, 0x0014($sp) -/* 04058 80AC6CF8 E7A60010 */ swc1 $f6, 0x0010($sp) -/* 0405C 80AC6CFC 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 04060 80AC6D00 E7A00018 */ swc1 $f0, 0x0018($sp) -/* 04064 80AC6D04 8FA20030 */ lw $v0, 0x0030($sp) +/* 04054 80AC6CF4 AFA00014 */ sw $zero, 0x0014($sp) +/* 04058 80AC6CF8 E7A60010 */ swc1 $f6, 0x0010($sp) +/* 0405C 80AC6CFC 0C029468 */ jal SkelAnime_ChangeAnim + +/* 04060 80AC6D00 E7A00018 */ swc1 $f0, 0x0018($sp) +/* 04064 80AC6D04 8FA20030 */ lw $v0, 0x0030($sp) /* 04068 80AC6D08 3C0B80AD */ lui $t3, %hi(func_80AC8244) ## $t3 = 80AD0000 /* 0406C 80AC6D0C 3C0C80AC */ lui $t4, %hi(func_80AC7380) ## $t4 = 80AC0000 /* 04070 80AC6D10 256B8244 */ addiu $t3, $t3, %lo(func_80AC8244) ## $t3 = 80AC8244 /* 04074 80AC6D14 258C7380 */ addiu $t4, $t4, %lo(func_80AC7380) ## $t4 = 80AC7380 /* 04078 80AC6D18 AC4B0134 */ sw $t3, 0x0134($v0) ## 00000134 /* 0407C 80AC6D1C AC4C0194 */ sw $t4, 0x0194($v0) ## 00000194 -/* 04080 80AC6D20 8FBF0024 */ lw $ra, 0x0024($sp) +/* 04080 80AC6D20 8FBF0024 */ lw $ra, 0x0024($sp) /* 04084 80AC6D24 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 04088 80AC6D28 03E00008 */ jr $ra +/* 04088 80AC6D28 03E00008 */ jr $ra /* 0408C 80AC6D2C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC6D30.s b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC6D30.s index fa924092aa..63d8bef75e 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC6D30.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC6D30.s @@ -1,60 +1,60 @@ glabel func_80AC6D30 /* 04090 80AC6D30 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 04094 80AC6D34 AFA40030 */ sw $a0, 0x0030($sp) -/* 04098 80AC6D38 AFA50034 */ sw $a1, 0x0034($sp) +/* 04094 80AC6D34 AFA40030 */ sw $a0, 0x0030($sp) +/* 04098 80AC6D38 AFA50034 */ sw $a1, 0x0034($sp) /* 0409C 80AC6D3C 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 040A0 80AC6D40 8FA50030 */ lw $a1, 0x0030($sp) -/* 040A4 80AC6D44 AFBF0024 */ sw $ra, 0x0024($sp) +/* 040A0 80AC6D40 8FA50030 */ lw $a1, 0x0030($sp) +/* 040A4 80AC6D44 AFBF0024 */ sw $ra, 0x0024($sp) /* 040A8 80AC6D48 3C060601 */ lui $a2, 0x0601 ## $a2 = 06010000 /* 040AC 80AC6D4C 24A5014C */ addiu $a1, $a1, 0x014C ## $a1 = 0000014C -/* 040B0 80AC6D50 AFA50028 */ sw $a1, 0x0028($sp) +/* 040B0 80AC6D50 AFA50028 */ sw $a1, 0x0028($sp) /* 040B4 80AC6D54 24C6BFA8 */ addiu $a2, $a2, 0xBFA8 ## $a2 = 0600BFA8 -/* 040B8 80AC6D58 AFA00010 */ sw $zero, 0x0010($sp) -/* 040BC 80AC6D5C AFA00014 */ sw $zero, 0x0014($sp) -/* 040C0 80AC6D60 AFA00018 */ sw $zero, 0x0018($sp) -/* 040C4 80AC6D64 0C0291BE */ jal func_800A46F8 +/* 040B8 80AC6D58 AFA00010 */ sw $zero, 0x0010($sp) +/* 040BC 80AC6D5C AFA00014 */ sw $zero, 0x0014($sp) +/* 040C0 80AC6D60 AFA00018 */ sw $zero, 0x0018($sp) +/* 040C4 80AC6D64 0C0291BE */ jal SkelAnime_InitSV /* 040C8 80AC6D68 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 040CC 80AC6D6C 8FAF0030 */ lw $t7, 0x0030($sp) -/* 040D0 80AC6D70 8FAE0034 */ lw $t6, 0x0034($sp) +/* 040CC 80AC6D6C 8FAF0030 */ lw $t7, 0x0030($sp) +/* 040D0 80AC6D70 8FAE0034 */ lw $t6, 0x0034($sp) /* 040D4 80AC6D74 3C090001 */ lui $t1, 0x0001 ## $t1 = 00010000 /* 040D8 80AC6D78 81F801EA */ lb $t8, 0x01EA($t7) ## 000001EA /* 040DC 80AC6D7C 3C018000 */ lui $at, 0x8000 ## $at = 80000000 /* 040E0 80AC6D80 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 -/* 040E4 80AC6D84 0018C900 */ sll $t9, $t8, 4 -/* 040E8 80AC6D88 0338C821 */ addu $t9, $t9, $t8 -/* 040EC 80AC6D8C 0019C880 */ sll $t9, $t9, 2 -/* 040F0 80AC6D90 01D94021 */ addu $t0, $t6, $t9 -/* 040F4 80AC6D94 01284821 */ addu $t1, $t1, $t0 +/* 040E4 80AC6D84 0018C900 */ sll $t9, $t8, 4 +/* 040E8 80AC6D88 0338C821 */ addu $t9, $t9, $t8 +/* 040EC 80AC6D8C 0019C880 */ sll $t9, $t9, 2 +/* 040F0 80AC6D90 01D94021 */ addu $t0, $t6, $t9 +/* 040F4 80AC6D94 01284821 */ addu $t1, $t1, $t0 /* 040F8 80AC6D98 8D2917B4 */ lw $t1, 0x17B4($t1) ## 000117B4 /* 040FC 80AC6D9C 2484078C */ addiu $a0, $a0, 0x078C ## $a0 = 0600078C -/* 04100 80AC6DA0 01215021 */ addu $t2, $t1, $at +/* 04100 80AC6DA0 01215021 */ addu $t2, $t1, $at /* 04104 80AC6DA4 3C018016 */ lui $at, 0x8016 ## $at = 80160000 /* 04108 80AC6DA8 0C028800 */ jal SkelAnime_GetFrameCount - + /* 0410C 80AC6DAC AC2A6FC0 */ sw $t2, 0x6FC0($at) ## 80166FC0 /* 04110 80AC6DB0 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 04114 80AC6DB4 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 /* 04118 80AC6DB8 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 0411C 80AC6DBC 468021A0 */ cvt.s.w $f6, $f4 -/* 04120 80AC6DC0 44070000 */ mfc1 $a3, $f0 +/* 0411C 80AC6DBC 468021A0 */ cvt.s.w $f6, $f4 +/* 04120 80AC6DC0 44070000 */ mfc1 $a3, $f0 /* 04124 80AC6DC4 24A5078C */ addiu $a1, $a1, 0x078C ## $a1 = 0600078C -/* 04128 80AC6DC8 8FA40028 */ lw $a0, 0x0028($sp) +/* 04128 80AC6DC8 8FA40028 */ lw $a0, 0x0028($sp) /* 0412C 80AC6DCC 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 04130 80AC6DD0 AFA00014 */ sw $zero, 0x0014($sp) -/* 04134 80AC6DD4 E7A60010 */ swc1 $f6, 0x0010($sp) -/* 04138 80AC6DD8 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 0413C 80AC6DDC E7A00018 */ swc1 $f0, 0x0018($sp) -/* 04140 80AC6DE0 8FA20030 */ lw $v0, 0x0030($sp) +/* 04130 80AC6DD0 AFA00014 */ sw $zero, 0x0014($sp) +/* 04134 80AC6DD4 E7A60010 */ swc1 $f6, 0x0010($sp) +/* 04138 80AC6DD8 0C029468 */ jal SkelAnime_ChangeAnim + +/* 0413C 80AC6DDC E7A00018 */ swc1 $f0, 0x0018($sp) +/* 04140 80AC6DE0 8FA20030 */ lw $v0, 0x0030($sp) /* 04144 80AC6DE4 3C0B80AD */ lui $t3, %hi(func_80AC83DC) ## $t3 = 80AD0000 /* 04148 80AC6DE8 3C0C80AC */ lui $t4, %hi(func_80AC7380) ## $t4 = 80AC0000 /* 0414C 80AC6DEC 256B83DC */ addiu $t3, $t3, %lo(func_80AC83DC) ## $t3 = 80AC83DC /* 04150 80AC6DF0 258C7380 */ addiu $t4, $t4, %lo(func_80AC7380) ## $t4 = 80AC7380 /* 04154 80AC6DF4 AC4B0134 */ sw $t3, 0x0134($v0) ## 00000134 /* 04158 80AC6DF8 AC4C0194 */ sw $t4, 0x0194($v0) ## 00000194 -/* 0415C 80AC6DFC 8FBF0024 */ lw $ra, 0x0024($sp) +/* 0415C 80AC6DFC 8FBF0024 */ lw $ra, 0x0024($sp) /* 04160 80AC6E00 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 04164 80AC6E04 03E00008 */ jr $ra +/* 04164 80AC6E04 03E00008 */ jr $ra /* 04168 80AC6E08 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC6E0C.s b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC6E0C.s index 44d092acc5..3f0a50c1da 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC6E0C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC6E0C.s @@ -1,27 +1,27 @@ glabel func_80AC6E0C /* 0416C 80AC6E0C 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 04170 80AC6E10 AFA40028 */ sw $a0, 0x0028($sp) -/* 04174 80AC6E14 AFA5002C */ sw $a1, 0x002C($sp) +/* 04170 80AC6E10 AFA40028 */ sw $a0, 0x0028($sp) +/* 04174 80AC6E14 AFA5002C */ sw $a1, 0x002C($sp) /* 04178 80AC6E18 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 0417C 80AC6E1C 8FA50028 */ lw $a1, 0x0028($sp) -/* 04180 80AC6E20 AFBF0024 */ sw $ra, 0x0024($sp) +/* 0417C 80AC6E1C 8FA50028 */ lw $a1, 0x0028($sp) +/* 04180 80AC6E20 AFBF0024 */ sw $ra, 0x0024($sp) /* 04184 80AC6E24 3C060600 */ lui $a2, 0x0600 ## $a2 = 06000000 /* 04188 80AC6E28 3C070600 */ lui $a3, 0x0600 ## $a3 = 06000000 /* 0418C 80AC6E2C 24E702E4 */ addiu $a3, $a3, 0x02E4 ## $a3 = 060002E4 /* 04190 80AC6E30 24C64258 */ addiu $a2, $a2, 0x4258 ## $a2 = 06004258 -/* 04194 80AC6E34 AFA00010 */ sw $zero, 0x0010($sp) -/* 04198 80AC6E38 AFA00014 */ sw $zero, 0x0014($sp) -/* 0419C 80AC6E3C AFA00018 */ sw $zero, 0x0018($sp) -/* 041A0 80AC6E40 0C0291BE */ jal func_800A46F8 +/* 04194 80AC6E34 AFA00010 */ sw $zero, 0x0010($sp) +/* 04198 80AC6E38 AFA00014 */ sw $zero, 0x0014($sp) +/* 0419C 80AC6E3C AFA00018 */ sw $zero, 0x0018($sp) +/* 041A0 80AC6E40 0C0291BE */ jal SkelAnime_InitSV /* 041A4 80AC6E44 24A5014C */ addiu $a1, $a1, 0x014C ## $a1 = 0000014C -/* 041A8 80AC6E48 8FA20028 */ lw $v0, 0x0028($sp) +/* 041A8 80AC6E48 8FA20028 */ lw $v0, 0x0028($sp) /* 041AC 80AC6E4C 3C0E80AD */ lui $t6, %hi(func_80AC854C) ## $t6 = 80AD0000 /* 041B0 80AC6E50 25CE854C */ addiu $t6, $t6, %lo(func_80AC854C) ## $t6 = 80AC854C /* 041B4 80AC6E54 AC4E0134 */ sw $t6, 0x0134($v0) ## 00000134 /* 041B8 80AC6E58 AC400194 */ sw $zero, 0x0194($v0) ## 00000194 -/* 041BC 80AC6E5C 8FBF0024 */ lw $ra, 0x0024($sp) +/* 041BC 80AC6E5C 8FBF0024 */ lw $ra, 0x0024($sp) /* 041C0 80AC6E60 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 041C4 80AC6E64 03E00008 */ jr $ra +/* 041C4 80AC6E64 03E00008 */ jr $ra /* 041C8 80AC6E68 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC6E6C.s b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC6E6C.s index 5c46bc5820..8dae64f0e7 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC6E6C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC6E6C.s @@ -1,27 +1,27 @@ glabel func_80AC6E6C /* 041CC 80AC6E6C 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 041D0 80AC6E70 AFA40028 */ sw $a0, 0x0028($sp) -/* 041D4 80AC6E74 AFA5002C */ sw $a1, 0x002C($sp) +/* 041D0 80AC6E70 AFA40028 */ sw $a0, 0x0028($sp) +/* 041D4 80AC6E74 AFA5002C */ sw $a1, 0x002C($sp) /* 041D8 80AC6E78 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 041DC 80AC6E7C 8FA50028 */ lw $a1, 0x0028($sp) -/* 041E0 80AC6E80 AFBF0024 */ sw $ra, 0x0024($sp) +/* 041DC 80AC6E7C 8FA50028 */ lw $a1, 0x0028($sp) +/* 041E0 80AC6E80 AFBF0024 */ sw $ra, 0x0024($sp) /* 041E4 80AC6E84 3C060600 */ lui $a2, 0x0600 ## $a2 = 06000000 /* 041E8 80AC6E88 3C070600 */ lui $a3, 0x0600 ## $a3 = 06000000 /* 041EC 80AC6E8C 24E702E4 */ addiu $a3, $a3, 0x02E4 ## $a3 = 060002E4 /* 041F0 80AC6E90 24C64658 */ addiu $a2, $a2, 0x4658 ## $a2 = 06004658 -/* 041F4 80AC6E94 AFA00010 */ sw $zero, 0x0010($sp) -/* 041F8 80AC6E98 AFA00014 */ sw $zero, 0x0014($sp) -/* 041FC 80AC6E9C AFA00018 */ sw $zero, 0x0018($sp) -/* 04200 80AC6EA0 0C0291BE */ jal func_800A46F8 +/* 041F4 80AC6E94 AFA00010 */ sw $zero, 0x0010($sp) +/* 041F8 80AC6E98 AFA00014 */ sw $zero, 0x0014($sp) +/* 041FC 80AC6E9C AFA00018 */ sw $zero, 0x0018($sp) +/* 04200 80AC6EA0 0C0291BE */ jal SkelAnime_InitSV /* 04204 80AC6EA4 24A5014C */ addiu $a1, $a1, 0x014C ## $a1 = 0000014C -/* 04208 80AC6EA8 8FA20028 */ lw $v0, 0x0028($sp) +/* 04208 80AC6EA8 8FA20028 */ lw $v0, 0x0028($sp) /* 0420C 80AC6EAC 3C0E80AD */ lui $t6, %hi(func_80AC8668) ## $t6 = 80AD0000 /* 04210 80AC6EB0 25CE8668 */ addiu $t6, $t6, %lo(func_80AC8668) ## $t6 = 80AC8668 /* 04214 80AC6EB4 AC4E0134 */ sw $t6, 0x0134($v0) ## 00000134 /* 04218 80AC6EB8 AC400194 */ sw $zero, 0x0194($v0) ## 00000194 -/* 0421C 80AC6EBC 8FBF0024 */ lw $ra, 0x0024($sp) +/* 0421C 80AC6EBC 8FBF0024 */ lw $ra, 0x0024($sp) /* 04220 80AC6EC0 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 04224 80AC6EC4 03E00008 */ jr $ra +/* 04224 80AC6EC4 03E00008 */ jr $ra /* 04228 80AC6EC8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC6ECC.s b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC6ECC.s index e60149f540..036ba230d8 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC6ECC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC6ECC.s @@ -1,27 +1,27 @@ glabel func_80AC6ECC /* 0422C 80AC6ECC 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 04230 80AC6ED0 AFA40028 */ sw $a0, 0x0028($sp) -/* 04234 80AC6ED4 AFA5002C */ sw $a1, 0x002C($sp) +/* 04230 80AC6ED0 AFA40028 */ sw $a0, 0x0028($sp) +/* 04234 80AC6ED4 AFA5002C */ sw $a1, 0x002C($sp) /* 04238 80AC6ED8 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 0423C 80AC6EDC 8FA50028 */ lw $a1, 0x0028($sp) -/* 04240 80AC6EE0 AFBF0024 */ sw $ra, 0x0024($sp) +/* 0423C 80AC6EDC 8FA50028 */ lw $a1, 0x0028($sp) +/* 04240 80AC6EE0 AFBF0024 */ sw $ra, 0x0024($sp) /* 04244 80AC6EE4 3C060600 */ lui $a2, 0x0600 ## $a2 = 06000000 /* 04248 80AC6EE8 3C070600 */ lui $a3, 0x0600 ## $a3 = 06000000 /* 0424C 80AC6EEC 24E7065C */ addiu $a3, $a3, 0x065C ## $a3 = 0600065C /* 04250 80AC6EF0 24C64868 */ addiu $a2, $a2, 0x4868 ## $a2 = 06004868 -/* 04254 80AC6EF4 AFA00010 */ sw $zero, 0x0010($sp) -/* 04258 80AC6EF8 AFA00014 */ sw $zero, 0x0014($sp) -/* 0425C 80AC6EFC AFA00018 */ sw $zero, 0x0018($sp) -/* 04260 80AC6F00 0C0291BE */ jal func_800A46F8 +/* 04254 80AC6EF4 AFA00010 */ sw $zero, 0x0010($sp) +/* 04258 80AC6EF8 AFA00014 */ sw $zero, 0x0014($sp) +/* 0425C 80AC6EFC AFA00018 */ sw $zero, 0x0018($sp) +/* 04260 80AC6F00 0C0291BE */ jal SkelAnime_InitSV /* 04264 80AC6F04 24A5014C */ addiu $a1, $a1, 0x014C ## $a1 = 0000014C -/* 04268 80AC6F08 8FA20028 */ lw $v0, 0x0028($sp) +/* 04268 80AC6F08 8FA20028 */ lw $v0, 0x0028($sp) /* 0426C 80AC6F0C 3C0E80AD */ lui $t6, %hi(func_80AC8784) ## $t6 = 80AD0000 /* 04270 80AC6F10 25CE8784 */ addiu $t6, $t6, %lo(func_80AC8784) ## $t6 = 80AC8784 /* 04274 80AC6F14 AC4E0134 */ sw $t6, 0x0134($v0) ## 00000134 /* 04278 80AC6F18 AC400194 */ sw $zero, 0x0194($v0) ## 00000194 -/* 0427C 80AC6F1C 8FBF0024 */ lw $ra, 0x0024($sp) +/* 0427C 80AC6F1C 8FBF0024 */ lw $ra, 0x0024($sp) /* 04280 80AC6F20 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 04284 80AC6F24 03E00008 */ jr $ra +/* 04284 80AC6F24 03E00008 */ jr $ra /* 04288 80AC6F28 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC7528.s b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC7528.s index fad30e0d52..f78c8f1c08 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC7528.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC7528.s @@ -10,7 +10,7 @@ glabel func_80AC7528 /* 048A8 80AC7548 24C6939C */ addiu $a2, $a2, %lo(D_80AC939C) ## $a2 = 80AC939C /* 048AC 80AC754C 27A4004C */ addiu $a0, $sp, 0x004C ## $a0 = FFFFFFD4 /* 048B0 80AC7550 24071060 */ addiu $a3, $zero, 0x1060 ## $a3 = 00001060 -/* 048B4 80AC7554 0C031AB1 */ jal func_800C6AC4 +/* 048B4 80AC7554 0C031AB1 */ jal Graph_OpenDisps /* 048B8 80AC7558 AFA5005C */ sw $a1, 0x005C($sp) /* 048BC 80AC755C 93AF008F */ lbu $t7, 0x008F($sp) /* 048C0 80AC7560 8FA8005C */ lw $t0, 0x005C($sp) @@ -163,7 +163,7 @@ glabel func_80AC7528 /* 04B08 80AC77A8 24C693AC */ addiu $a2, $a2, %lo(D_80AC93AC) ## $a2 = 80AC93AC /* 04B0C 80AC77AC 27A4004C */ addiu $a0, $sp, 0x004C ## $a0 = FFFFFFD4 /* 04B10 80AC77B0 24071077 */ addiu $a3, $zero, 0x1077 ## $a3 = 00001077 -/* 04B14 80AC77B4 0C031AD5 */ jal func_800C6B54 +/* 04B14 80AC77B4 0C031AD5 */ jal Graph_CloseDisps /* 04B18 80AC77B8 8D650000 */ lw $a1, 0x0000($t3) ## 00000000 /* 04B1C 80AC77BC 8FBF0014 */ lw $ra, 0x0014($sp) /* 04B20 80AC77C0 27BD0078 */ addiu $sp, $sp, 0x0078 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC77CC.s b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC77CC.s index c23f51eef5..bbdf219027 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC77CC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC77CC.s @@ -10,7 +10,7 @@ glabel func_80AC77CC /* 04B4C 80AC77EC 24C693BC */ addiu $a2, $a2, %lo(D_80AC93BC) ## $a2 = 80AC93BC /* 04B50 80AC77F0 27A40038 */ addiu $a0, $sp, 0x0038 ## $a0 = FFFFFFC8 /* 04B54 80AC77F4 24071084 */ addiu $a3, $zero, 0x1084 ## $a3 = 00001084 -/* 04B58 80AC77F8 0C031AB1 */ jal func_800C6AC4 +/* 04B58 80AC77F8 0C031AB1 */ jal Graph_OpenDisps /* 04B5C 80AC77FC AFA50048 */ sw $a1, 0x0048($sp) /* 04B60 80AC7800 8FA80048 */ lw $t0, 0x0048($sp) /* 04B64 80AC7804 3C18E700 */ lui $t8, 0xE700 ## $t8 = E7000000 @@ -120,7 +120,7 @@ glabel func_80AC77CC /* 04D04 80AC79A4 01CD6025 */ or $t4, $t6, $t5 ## $t4 = 00000000 /* 04D08 80AC79A8 AC4C0004 */ sw $t4, 0x0004($v0) ## 00000004 /* 04D0C 80AC79AC 8FAF0070 */ lw $t7, 0x0070($sp) -/* 04D10 80AC79B0 0C031AD5 */ jal func_800C6B54 +/* 04D10 80AC79B0 0C031AD5 */ jal Graph_CloseDisps /* 04D14 80AC79B4 8DE50000 */ lw $a1, 0x0000($t7) ## F1000000 /* 04D18 80AC79B8 8FBF0014 */ lw $ra, 0x0014($sp) /* 04D1C 80AC79BC 27BD0070 */ addiu $sp, $sp, 0x0070 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC79C8.s b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC79C8.s index beff7c3314..610adbf680 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC79C8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC79C8.s @@ -13,7 +13,7 @@ glabel func_80AC79C8 /* 04D54 80AC79F4 AFAF0098 */ sw $t7, 0x0098($sp) /* 04D58 80AC79F8 8C850000 */ lw $a1, 0x0000($a0) ## 00000000 /* 04D5C 80AC79FC 27A40084 */ addiu $a0, $sp, 0x0084 ## $a0 = FFFFFFE4 -/* 04D60 80AC7A00 0C031AB1 */ jal func_800C6AC4 +/* 04D60 80AC7A00 0C031AB1 */ jal Graph_OpenDisps /* 04D64 80AC7A04 AFA50094 */ sw $a1, 0x0094($sp) /* 04D68 80AC7A08 8FB9009C */ lw $t9, 0x009C($sp) /* 04D6C 80AC7A0C 8FA80094 */ lw $t0, 0x0094($sp) @@ -246,7 +246,7 @@ glabel func_80AC79C8 /* 050E4 80AC7D84 24C693EC */ addiu $a2, $a2, %lo(D_80AC93EC) ## $a2 = 80AC93EC /* 050E8 80AC7D88 27A40084 */ addiu $a0, $sp, 0x0084 ## $a0 = FFFFFFE4 /* 050EC 80AC7D8C 240710CC */ addiu $a3, $zero, 0x10CC ## $a3 = 000010CC -/* 050F0 80AC7D90 0C031AD5 */ jal func_800C6B54 +/* 050F0 80AC7D90 0C031AD5 */ jal Graph_CloseDisps /* 050F4 80AC7D94 8DE50000 */ lw $a1, 0x0000($t7) ## 00000000 /* 050F8 80AC7D98 8FBF003C */ lw $ra, 0x003C($sp) /* 050FC 80AC7D9C 8FB00038 */ lw $s0, 0x0038($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC7DAC.s b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC7DAC.s index 6d33a3d2e3..755834e3b0 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC7DAC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC7DAC.s @@ -1,20 +1,20 @@ glabel func_80AC7DAC /* 0510C 80AC7DAC 27BDFFA8 */ addiu $sp, $sp, 0xFFA8 ## $sp = FFFFFFA8 -/* 05110 80AC7DB0 AFB10028 */ sw $s1, 0x0028($sp) +/* 05110 80AC7DB0 AFB10028 */ sw $s1, 0x0028($sp) /* 05114 80AC7DB4 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 -/* 05118 80AC7DB8 AFBF002C */ sw $ra, 0x002C($sp) -/* 0511C 80AC7DBC AFB00024 */ sw $s0, 0x0024($sp) +/* 05118 80AC7DB8 AFBF002C */ sw $ra, 0x002C($sp) +/* 0511C 80AC7DBC AFB00024 */ sw $s0, 0x0024($sp) /* 05120 80AC7DC0 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 /* 05124 80AC7DC4 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 05128 80AC7DC8 3C0680AD */ lui $a2, %hi(D_80AC93FC) ## $a2 = 80AD0000 /* 0512C 80AC7DCC 24C693FC */ addiu $a2, $a2, %lo(D_80AC93FC) ## $a2 = 80AC93FC /* 05130 80AC7DD0 27A4003C */ addiu $a0, $sp, 0x003C ## $a0 = FFFFFFE4 /* 05134 80AC7DD4 240710E0 */ addiu $a3, $zero, 0x10E0 ## $a3 = 000010E0 -/* 05138 80AC7DD8 0C031AB1 */ jal func_800C6AC4 -/* 0513C 80AC7DDC AFA5004C */ sw $a1, 0x004C($sp) -/* 05140 80AC7DE0 0C024F46 */ jal func_80093D18 +/* 05138 80AC7DD8 0C031AB1 */ jal Graph_OpenDisps +/* 0513C 80AC7DDC AFA5004C */ sw $a1, 0x004C($sp) +/* 05140 80AC7DE0 0C024F46 */ jal func_80093D18 /* 05144 80AC7DE4 8E240000 */ lw $a0, 0x0000($s1) ## 00000000 -/* 05148 80AC7DE8 8FA5004C */ lw $a1, 0x004C($sp) +/* 05148 80AC7DE8 8FA5004C */ lw $a1, 0x004C($sp) /* 0514C 80AC7DEC 3C0FDB06 */ lui $t7, 0xDB06 ## $t7 = DB060000 /* 05150 80AC7DF0 35EF0020 */ ori $t7, $t7, 0x0020 ## $t7 = DB060020 /* 05154 80AC7DF4 8CA302C0 */ lw $v1, 0x02C0($a1) ## 000002C0 @@ -26,51 +26,51 @@ glabel func_80AC7DAC /* 0516C 80AC7E0C 861801F2 */ lh $t8, 0x01F2($s0) ## 000001F2 /* 05170 80AC7E10 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 /* 05174 80AC7E14 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF -/* 05178 80AC7E18 0018C880 */ sll $t9, $t8, 2 -/* 0517C 80AC7E1C 00992021 */ addu $a0, $a0, $t9 -/* 05180 80AC7E20 8C848EA0 */ lw $a0, %lo(D_80AC8EA0)($a0) +/* 05178 80AC7E18 0018C880 */ sll $t9, $t8, 2 +/* 0517C 80AC7E1C 00992021 */ addu $a0, $a0, $t9 +/* 05180 80AC7E20 8C848EA0 */ lw $a0, %lo(D_80AC8EA0)($a0) /* 05184 80AC7E24 3C0F80AC */ lui $t7, %hi(func_80AC74F4) ## $t7 = 80AC0000 /* 05188 80AC7E28 25EF74F4 */ addiu $t7, $t7, %lo(func_80AC74F4) ## $t7 = 80AC74F4 -/* 0518C 80AC7E2C 00044900 */ sll $t1, $a0, 4 -/* 05190 80AC7E30 00095702 */ srl $t2, $t1, 28 -/* 05194 80AC7E34 000A5880 */ sll $t3, $t2, 2 -/* 05198 80AC7E38 018B6021 */ addu $t4, $t4, $t3 +/* 0518C 80AC7E2C 00044900 */ sll $t1, $a0, 4 +/* 05190 80AC7E30 00095702 */ srl $t2, $t1, 28 +/* 05194 80AC7E34 000A5880 */ sll $t3, $t2, 2 +/* 05198 80AC7E38 018B6021 */ addu $t4, $t4, $t3 /* 0519C 80AC7E3C 8D8C6FA8 */ lw $t4, 0x6FA8($t4) ## 80166FA8 -/* 051A0 80AC7E40 00814024 */ and $t0, $a0, $at +/* 051A0 80AC7E40 00814024 */ and $t0, $a0, $at /* 051A4 80AC7E44 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 051A8 80AC7E48 010C6821 */ addu $t5, $t0, $t4 -/* 051AC 80AC7E4C 01A17021 */ addu $t6, $t5, $at +/* 051A8 80AC7E48 010C6821 */ addu $t5, $t0, $t4 +/* 051AC 80AC7E4C 01A17021 */ addu $t6, $t5, $at /* 051B0 80AC7E50 AC6E0004 */ sw $t6, 0x0004($v1) ## 00000004 /* 051B4 80AC7E54 9207014E */ lbu $a3, 0x014E($s0) ## 0000014E /* 051B8 80AC7E58 8E06016C */ lw $a2, 0x016C($s0) ## 0000016C /* 051BC 80AC7E5C 8E050150 */ lw $a1, 0x0150($s0) ## 00000150 -/* 051C0 80AC7E60 AFB00018 */ sw $s0, 0x0018($sp) -/* 051C4 80AC7E64 AFA00014 */ sw $zero, 0x0014($sp) -/* 051C8 80AC7E68 AFAF0010 */ sw $t7, 0x0010($sp) -/* 051CC 80AC7E6C 0C0286B2 */ jal func_800A1AC8 +/* 051C0 80AC7E60 AFB00018 */ sw $s0, 0x0018($sp) +/* 051C4 80AC7E64 AFA00014 */ sw $zero, 0x0014($sp) +/* 051C8 80AC7E68 AFAF0010 */ sw $t7, 0x0010($sp) +/* 051CC 80AC7E6C 0C0286B2 */ jal SkelAnime_DrawSV /* 051D0 80AC7E70 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 051D4 80AC7E74 C6040238 */ lwc1 $f4, 0x0238($s0) ## 00000238 /* 051D8 80AC7E78 8E060230 */ lw $a2, 0x0230($s0) ## 00000230 /* 051DC 80AC7E7C 8E070234 */ lw $a3, 0x0234($s0) ## 00000234 -/* 051E0 80AC7E80 E7A40010 */ swc1 $f4, 0x0010($sp) +/* 051E0 80AC7E80 E7A40010 */ swc1 $f4, 0x0010($sp) /* 051E4 80AC7E84 92180251 */ lbu $t8, 0x0251($s0) ## 00000251 /* 051E8 80AC7E88 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 051EC 80AC7E8C 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 051F0 80AC7E90 0C2B1D4A */ jal func_80AC7528 -/* 051F4 80AC7E94 AFB80014 */ sw $t8, 0x0014($sp) +/* 051F0 80AC7E90 0C2B1D4A */ jal func_80AC7528 +/* 051F4 80AC7E94 AFB80014 */ sw $t8, 0x0014($sp) /* 051F8 80AC7E98 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 051FC 80AC7E9C 0C2B1E72 */ jal func_80AC79C8 +/* 051FC 80AC7E9C 0C2B1E72 */ jal func_80AC79C8 /* 05200 80AC7EA0 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 05204 80AC7EA4 3C0680AD */ lui $a2, %hi(D_80AC940C) ## $a2 = 80AD0000 /* 05208 80AC7EA8 24C6940C */ addiu $a2, $a2, %lo(D_80AC940C) ## $a2 = 80AC940C /* 0520C 80AC7EAC 27A4003C */ addiu $a0, $sp, 0x003C ## $a0 = FFFFFFE4 /* 05210 80AC7EB0 8E250000 */ lw $a1, 0x0000($s1) ## 00000000 -/* 05214 80AC7EB4 0C031AD5 */ jal func_800C6B54 +/* 05214 80AC7EB4 0C031AD5 */ jal Graph_CloseDisps /* 05218 80AC7EB8 240710F4 */ addiu $a3, $zero, 0x10F4 ## $a3 = 000010F4 -/* 0521C 80AC7EBC 8FBF002C */ lw $ra, 0x002C($sp) -/* 05220 80AC7EC0 8FB00024 */ lw $s0, 0x0024($sp) -/* 05224 80AC7EC4 8FB10028 */ lw $s1, 0x0028($sp) -/* 05228 80AC7EC8 03E00008 */ jr $ra +/* 0521C 80AC7EBC 8FBF002C */ lw $ra, 0x002C($sp) +/* 05220 80AC7EC0 8FB00024 */ lw $s0, 0x0024($sp) +/* 05224 80AC7EC4 8FB10028 */ lw $s1, 0x0028($sp) +/* 05228 80AC7EC8 03E00008 */ jr $ra /* 0522C 80AC7ECC 27BD0058 */ addiu $sp, $sp, 0x0058 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC7ED0.s b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC7ED0.s index 7d9a38b545..f4e6f736c3 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC7ED0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC7ED0.s @@ -10,7 +10,7 @@ glabel func_80AC7ED0 /* 05250 80AC7EF0 24C6941C */ addiu $a2, $a2, %lo(D_80AC941C) ## $a2 = 80AC941C /* 05254 80AC7EF4 27A40024 */ addiu $a0, $sp, 0x0024 ## $a0 = FFFFFFE4 /* 05258 80AC7EF8 24071102 */ addiu $a3, $zero, 0x1102 ## $a3 = 00001102 -/* 0525C 80AC7EFC 0C031AB1 */ jal func_800C6AC4 +/* 0525C 80AC7EFC 0C031AB1 */ jal Graph_OpenDisps /* 05260 80AC7F00 AFA50034 */ sw $a1, 0x0034($sp) /* 05264 80AC7F04 8FAF0044 */ lw $t7, 0x0044($sp) /* 05268 80AC7F08 2401000F */ addiu $at, $zero, 0x000F ## $at = 0000000F @@ -76,7 +76,7 @@ glabel func_80AC7ED0 /* 05354 80AC7FF4 24C6942C */ addiu $a2, $a2, %lo(D_80AC942C) ## $a2 = 80AC942C /* 05358 80AC7FF8 27A40024 */ addiu $a0, $sp, 0x0024 ## $a0 = FFFFFFE4 /* 0535C 80AC7FFC 8D250000 */ lw $a1, 0x0000($t1) ## 00000000 -/* 05360 80AC8000 0C031AD5 */ jal func_800C6B54 +/* 05360 80AC8000 0C031AD5 */ jal Graph_CloseDisps /* 05364 80AC8004 24071116 */ addiu $a3, $zero, 0x1116 ## $a3 = 00001116 /* 05368 80AC8008 8FBF0014 */ lw $ra, 0x0014($sp) /* 0536C 80AC800C 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC80B4.s b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC80B4.s index d66ddadb79..2588c7ed42 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC80B4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC80B4.s @@ -1,19 +1,19 @@ glabel func_80AC80B4 /* 05414 80AC80B4 27BDFF98 */ addiu $sp, $sp, 0xFF98 ## $sp = FFFFFF98 -/* 05418 80AC80B8 AFB20030 */ sw $s2, 0x0030($sp) +/* 05418 80AC80B8 AFB20030 */ sw $s2, 0x0030($sp) /* 0541C 80AC80BC 00A09025 */ or $s2, $a1, $zero ## $s2 = 00000000 -/* 05420 80AC80C0 AFBF0034 */ sw $ra, 0x0034($sp) -/* 05424 80AC80C4 AFB1002C */ sw $s1, 0x002C($sp) -/* 05428 80AC80C8 AFB00028 */ sw $s0, 0x0028($sp) +/* 05420 80AC80C0 AFBF0034 */ sw $ra, 0x0034($sp) +/* 05424 80AC80C4 AFB1002C */ sw $s1, 0x002C($sp) +/* 05428 80AC80C8 AFB00028 */ sw $s0, 0x0028($sp) /* 0542C 80AC80CC 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 /* 05430 80AC80D0 00808825 */ or $s1, $a0, $zero ## $s1 = 00000000 /* 05434 80AC80D4 3C0680AD */ lui $a2, %hi(D_80AC943C) ## $a2 = 80AD0000 /* 05438 80AC80D8 24C6943C */ addiu $a2, $a2, %lo(D_80AC943C) ## $a2 = 80AC943C /* 0543C 80AC80DC 27A4004C */ addiu $a0, $sp, 0x004C ## $a0 = FFFFFFE4 /* 05440 80AC80E0 24071139 */ addiu $a3, $zero, 0x1139 ## $a3 = 00001139 -/* 05444 80AC80E4 0C031AB1 */ jal func_800C6AC4 +/* 05444 80AC80E4 0C031AB1 */ jal Graph_OpenDisps /* 05448 80AC80E8 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 -/* 0544C 80AC80EC 0C024F46 */ jal func_80093D18 +/* 0544C 80AC80EC 0C024F46 */ jal func_80093D18 /* 05450 80AC80F0 8E440000 */ lw $a0, 0x0000($s2) ## 00000000 /* 05454 80AC80F4 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 /* 05458 80AC80F8 3C0FFB00 */ lui $t7, 0xFB00 ## $t7 = FB000000 @@ -30,13 +30,13 @@ glabel func_80AC80B4 /* 05484 80AC8124 AC480000 */ sw $t0, 0x0000($v0) ## 00000000 /* 05488 80AC8128 8E440000 */ lw $a0, 0x0000($s2) ## 00000000 /* 0548C 80AC812C 240900FF */ addiu $t1, $zero, 0x00FF ## $t1 = 000000FF -/* 05490 80AC8130 AFA90010 */ sw $t1, 0x0010($sp) +/* 05490 80AC8130 AFA90010 */ sw $t1, 0x0010($sp) /* 05494 80AC8134 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 05498 80AC8138 24060082 */ addiu $a2, $zero, 0x0082 ## $a2 = 00000082 /* 0549C 80AC813C 24070046 */ addiu $a3, $zero, 0x0046 ## $a3 = 00000046 -/* 054A0 80AC8140 0C2B2012 */ jal func_80AC8048 -/* 054A4 80AC8144 AFA20044 */ sw $v0, 0x0044($sp) -/* 054A8 80AC8148 8FA30044 */ lw $v1, 0x0044($sp) +/* 054A0 80AC8140 0C2B2012 */ jal func_80AC8048 +/* 054A4 80AC8144 AFA20044 */ sw $v0, 0x0044($sp) +/* 054A8 80AC8148 8FA30044 */ lw $v1, 0x0044($sp) /* 054AC 80AC814C 3C0BDB06 */ lui $t3, 0xDB06 ## $t3 = DB060000 /* 054B0 80AC8150 356B0024 */ ori $t3, $t3, 0x0024 ## $t3 = DB060024 /* 054B4 80AC8154 AC620004 */ sw $v0, 0x0004($v1) ## 00000004 @@ -47,12 +47,12 @@ glabel func_80AC80B4 /* 054C8 80AC8168 AE0A02C0 */ sw $t2, 0x02C0($s0) ## 000002C0 /* 054CC 80AC816C AC4B0000 */ sw $t3, 0x0000($v0) ## 00000000 /* 054D0 80AC8170 8E440000 */ lw $a0, 0x0000($s2) ## 00000000 -/* 054D4 80AC8174 AFAC0010 */ sw $t4, 0x0010($sp) +/* 054D4 80AC8174 AFAC0010 */ sw $t4, 0x0010($sp) /* 054D8 80AC8178 240600AA */ addiu $a2, $zero, 0x00AA ## $a2 = 000000AA /* 054DC 80AC817C 24070014 */ addiu $a3, $zero, 0x0014 ## $a3 = 00000014 -/* 054E0 80AC8180 0C2B2012 */ jal func_80AC8048 -/* 054E4 80AC8184 AFA20040 */ sw $v0, 0x0040($sp) -/* 054E8 80AC8188 8FA30040 */ lw $v1, 0x0040($sp) +/* 054E0 80AC8180 0C2B2012 */ jal func_80AC8048 +/* 054E4 80AC8184 AFA20040 */ sw $v0, 0x0040($sp) +/* 054E8 80AC8188 8FA30040 */ lw $v1, 0x0040($sp) /* 054EC 80AC818C 3C0EDB06 */ lui $t6, 0xDB06 ## $t6 = DB060000 /* 054F0 80AC8190 35CE0030 */ ori $t6, $t6, 0x0030 ## $t6 = DB060030 /* 054F4 80AC8194 AC620004 */ sw $v0, 0x0004($v1) ## 00000004 @@ -61,43 +61,43 @@ glabel func_80AC80B4 /* 05500 80AC81A0 AE0D02C0 */ sw $t5, 0x02C0($s0) ## 000002C0 /* 05504 80AC81A4 AC4E0000 */ sw $t6, 0x0000($v0) ## 00000000 /* 05508 80AC81A8 8E440000 */ lw $a0, 0x0000($s2) ## 00000000 -/* 0550C 80AC81AC 0C2B2007 */ jal func_80AC801C -/* 05510 80AC81B0 AFA2003C */ sw $v0, 0x003C($sp) -/* 05514 80AC81B4 8FA3003C */ lw $v1, 0x003C($sp) +/* 0550C 80AC81AC 0C2B2007 */ jal func_80AC801C +/* 05510 80AC81B0 AFA2003C */ sw $v0, 0x003C($sp) +/* 05514 80AC81B4 8FA3003C */ lw $v1, 0x003C($sp) /* 05518 80AC81B8 3C0F80AC */ lui $t7, %hi(func_80AC7ED0) ## $t7 = 80AC0000 /* 0551C 80AC81BC 25EF7ED0 */ addiu $t7, $t7, %lo(func_80AC7ED0) ## $t7 = 80AC7ED0 /* 05520 80AC81C0 AC620004 */ sw $v0, 0x0004($v1) ## 00000004 /* 05524 80AC81C4 9227014E */ lbu $a3, 0x014E($s1) ## 0000014E /* 05528 80AC81C8 8E26016C */ lw $a2, 0x016C($s1) ## 0000016C /* 0552C 80AC81CC 8E250150 */ lw $a1, 0x0150($s1) ## 00000150 -/* 05530 80AC81D0 AFB10018 */ sw $s1, 0x0018($sp) -/* 05534 80AC81D4 AFA00014 */ sw $zero, 0x0014($sp) -/* 05538 80AC81D8 AFAF0010 */ sw $t7, 0x0010($sp) -/* 0553C 80AC81DC 0C0286B2 */ jal func_800A1AC8 +/* 05530 80AC81D0 AFB10018 */ sw $s1, 0x0018($sp) +/* 05534 80AC81D4 AFA00014 */ sw $zero, 0x0014($sp) +/* 05538 80AC81D8 AFAF0010 */ sw $t7, 0x0010($sp) +/* 0553C 80AC81DC 0C0286B2 */ jal SkelAnime_DrawSV /* 05540 80AC81E0 02402025 */ or $a0, $s2, $zero ## $a0 = 00000000 /* 05544 80AC81E4 C6240238 */ lwc1 $f4, 0x0238($s1) ## 00000238 /* 05548 80AC81E8 8E260230 */ lw $a2, 0x0230($s1) ## 00000230 /* 0554C 80AC81EC 8E270234 */ lw $a3, 0x0234($s1) ## 00000234 -/* 05550 80AC81F0 E7A40010 */ swc1 $f4, 0x0010($sp) +/* 05550 80AC81F0 E7A40010 */ swc1 $f4, 0x0010($sp) /* 05554 80AC81F4 92380251 */ lbu $t8, 0x0251($s1) ## 00000251 /* 05558 80AC81F8 02402025 */ or $a0, $s2, $zero ## $a0 = 00000000 /* 0555C 80AC81FC 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 05560 80AC8200 0C2B1D4A */ jal func_80AC7528 -/* 05564 80AC8204 AFB80014 */ sw $t8, 0x0014($sp) +/* 05560 80AC8200 0C2B1D4A */ jal func_80AC7528 +/* 05564 80AC8204 AFB80014 */ sw $t8, 0x0014($sp) /* 05568 80AC8208 02402025 */ or $a0, $s2, $zero ## $a0 = 00000000 -/* 0556C 80AC820C 0C2B1E72 */ jal func_80AC79C8 +/* 0556C 80AC820C 0C2B1E72 */ jal func_80AC79C8 /* 05570 80AC8210 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 /* 05574 80AC8214 3C0680AD */ lui $a2, %hi(D_80AC944C) ## $a2 = 80AD0000 /* 05578 80AC8218 24C6944C */ addiu $a2, $a2, %lo(D_80AC944C) ## $a2 = 80AC944C /* 0557C 80AC821C 27A4004C */ addiu $a0, $sp, 0x004C ## $a0 = FFFFFFE4 /* 05580 80AC8220 8E450000 */ lw $a1, 0x0000($s2) ## 00000000 -/* 05584 80AC8224 0C031AD5 */ jal func_800C6B54 +/* 05584 80AC8224 0C031AD5 */ jal Graph_CloseDisps /* 05588 80AC8228 24071152 */ addiu $a3, $zero, 0x1152 ## $a3 = 00001152 -/* 0558C 80AC822C 8FBF0034 */ lw $ra, 0x0034($sp) -/* 05590 80AC8230 8FB00028 */ lw $s0, 0x0028($sp) -/* 05594 80AC8234 8FB1002C */ lw $s1, 0x002C($sp) -/* 05598 80AC8238 8FB20030 */ lw $s2, 0x0030($sp) -/* 0559C 80AC823C 03E00008 */ jr $ra +/* 0558C 80AC822C 8FBF0034 */ lw $ra, 0x0034($sp) +/* 05590 80AC8230 8FB00028 */ lw $s0, 0x0028($sp) +/* 05594 80AC8234 8FB1002C */ lw $s1, 0x002C($sp) +/* 05598 80AC8238 8FB20030 */ lw $s2, 0x0030($sp) +/* 0559C 80AC823C 03E00008 */ jr $ra /* 055A0 80AC8240 27BD0068 */ addiu $sp, $sp, 0x0068 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC8244.s b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC8244.s index 8515155835..164411af86 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC8244.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC8244.s @@ -1,20 +1,20 @@ glabel func_80AC8244 /* 055A4 80AC8244 27BDFFA8 */ addiu $sp, $sp, 0xFFA8 ## $sp = FFFFFFA8 -/* 055A8 80AC8248 AFB10028 */ sw $s1, 0x0028($sp) +/* 055A8 80AC8248 AFB10028 */ sw $s1, 0x0028($sp) /* 055AC 80AC824C 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 -/* 055B0 80AC8250 AFBF002C */ sw $ra, 0x002C($sp) -/* 055B4 80AC8254 AFB00024 */ sw $s0, 0x0024($sp) +/* 055B0 80AC8250 AFBF002C */ sw $ra, 0x002C($sp) +/* 055B4 80AC8254 AFB00024 */ sw $s0, 0x0024($sp) /* 055B8 80AC8258 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 /* 055BC 80AC825C 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 055C0 80AC8260 3C0680AD */ lui $a2, %hi(D_80AC945C) ## $a2 = 80AD0000 /* 055C4 80AC8264 24C6945C */ addiu $a2, $a2, %lo(D_80AC945C) ## $a2 = 80AC945C /* 055C8 80AC8268 27A4003C */ addiu $a0, $sp, 0x003C ## $a0 = FFFFFFE4 /* 055CC 80AC826C 24071167 */ addiu $a3, $zero, 0x1167 ## $a3 = 00001167 -/* 055D0 80AC8270 0C031AB1 */ jal func_800C6AC4 -/* 055D4 80AC8274 AFA5004C */ sw $a1, 0x004C($sp) -/* 055D8 80AC8278 0C024F46 */ jal func_80093D18 +/* 055D0 80AC8270 0C031AB1 */ jal Graph_OpenDisps +/* 055D4 80AC8274 AFA5004C */ sw $a1, 0x004C($sp) +/* 055D8 80AC8278 0C024F46 */ jal func_80093D18 /* 055DC 80AC827C 8E240000 */ lw $a0, 0x0000($s1) ## 00000000 -/* 055E0 80AC8280 8FA8004C */ lw $t0, 0x004C($sp) +/* 055E0 80AC8280 8FA8004C */ lw $t0, 0x004C($sp) /* 055E4 80AC8284 3C0FDB06 */ lui $t7, 0xDB06 ## $t7 = DB060000 /* 055E8 80AC8288 35EF0020 */ ori $t7, $t7, 0x0020 ## $t7 = DB060020 /* 055EC 80AC828C 8D0302C0 */ lw $v1, 0x02C0($t0) ## 000002C0 @@ -26,67 +26,67 @@ glabel func_80AC8244 /* 05604 80AC82A4 861801F2 */ lh $t8, 0x01F2($s0) ## 000001F2 /* 05608 80AC82A8 24C66FA8 */ addiu $a2, $a2, 0x6FA8 ## $a2 = 80166FA8 /* 0560C 80AC82AC 3C0500FF */ lui $a1, 0x00FF ## $a1 = 00FF0000 -/* 05610 80AC82B0 0018C880 */ sll $t9, $t8, 2 -/* 05614 80AC82B4 00992021 */ addu $a0, $a0, $t9 -/* 05618 80AC82B8 8C848EB8 */ lw $a0, %lo(D_80AC8EB8)($a0) +/* 05610 80AC82B0 0018C880 */ sll $t9, $t8, 2 +/* 05614 80AC82B4 00992021 */ addu $a0, $a0, $t9 +/* 05618 80AC82B8 8C848EB8 */ lw $a0, %lo(D_80AC8EB8)($a0) /* 0561C 80AC82BC 34A5FFFF */ ori $a1, $a1, 0xFFFF ## $a1 = 00FFFFFF /* 05620 80AC82C0 3C078000 */ lui $a3, 0x8000 ## $a3 = 80000000 -/* 05624 80AC82C4 00045100 */ sll $t2, $a0, 4 -/* 05628 80AC82C8 000A5F02 */ srl $t3, $t2, 28 -/* 0562C 80AC82CC 000B6080 */ sll $t4, $t3, 2 -/* 05630 80AC82D0 00CC6821 */ addu $t5, $a2, $t4 +/* 05624 80AC82C4 00045100 */ sll $t2, $a0, 4 +/* 05628 80AC82C8 000A5F02 */ srl $t3, $t2, 28 +/* 0562C 80AC82CC 000B6080 */ sll $t4, $t3, 2 +/* 05630 80AC82D0 00CC6821 */ addu $t5, $a2, $t4 /* 05634 80AC82D4 8DAE0000 */ lw $t6, 0x0000($t5) ## 00000000 -/* 05638 80AC82D8 00854824 */ and $t1, $a0, $a1 +/* 05638 80AC82D8 00854824 */ and $t1, $a0, $a1 /* 0563C 80AC82DC 3C040601 */ lui $a0, 0x0601 ## $a0 = 06010000 -/* 05640 80AC82E0 012E7821 */ addu $t7, $t1, $t6 -/* 05644 80AC82E4 01E7C021 */ addu $t8, $t7, $a3 +/* 05640 80AC82E0 012E7821 */ addu $t7, $t1, $t6 +/* 05644 80AC82E4 01E7C021 */ addu $t8, $t7, $a3 /* 05648 80AC82E8 AC780004 */ sw $t8, 0x0004($v1) ## 00000004 /* 0564C 80AC82EC 8D0302C0 */ lw $v1, 0x02C0($t0) ## 000002C0 /* 05650 80AC82F0 2484DE80 */ addiu $a0, $a0, 0xDE80 ## $a0 = 0600DE80 -/* 05654 80AC82F4 00045900 */ sll $t3, $a0, 4 -/* 05658 80AC82F8 000B6702 */ srl $t4, $t3, 28 +/* 05654 80AC82F4 00045900 */ sll $t3, $a0, 4 +/* 05658 80AC82F8 000B6702 */ srl $t4, $t3, 28 /* 0565C 80AC82FC 3C0ADB06 */ lui $t2, 0xDB06 ## $t2 = DB060000 /* 05660 80AC8300 24790008 */ addiu $t9, $v1, 0x0008 ## $t9 = 00000008 /* 05664 80AC8304 354A0024 */ ori $t2, $t2, 0x0024 ## $t2 = DB060024 -/* 05668 80AC8308 000C6880 */ sll $t5, $t4, 2 +/* 05668 80AC8308 000C6880 */ sll $t5, $t4, 2 /* 0566C 80AC830C AD1902C0 */ sw $t9, 0x02C0($t0) ## 000002C0 -/* 05670 80AC8310 00CD4821 */ addu $t1, $a2, $t5 +/* 05670 80AC8310 00CD4821 */ addu $t1, $a2, $t5 /* 05674 80AC8314 AC6A0000 */ sw $t2, 0x0000($v1) ## 00000000 /* 05678 80AC8318 8D2E0000 */ lw $t6, 0x0000($t1) ## 00000000 -/* 0567C 80AC831C 00857824 */ and $t7, $a0, $a1 +/* 0567C 80AC831C 00857824 */ and $t7, $a0, $a1 /* 05680 80AC8320 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 05684 80AC8324 01CFC021 */ addu $t8, $t6, $t7 -/* 05688 80AC8328 0307C821 */ addu $t9, $t8, $a3 +/* 05684 80AC8324 01CFC021 */ addu $t8, $t6, $t7 +/* 05688 80AC8328 0307C821 */ addu $t9, $t8, $a3 /* 0568C 80AC832C AC790004 */ sw $t9, 0x0004($v1) ## 00000004 /* 05690 80AC8330 9207014E */ lbu $a3, 0x014E($s0) ## 0000014E /* 05694 80AC8334 8E06016C */ lw $a2, 0x016C($s0) ## 0000016C /* 05698 80AC8338 8E050150 */ lw $a1, 0x0150($s0) ## 00000150 -/* 0569C 80AC833C AFB00018 */ sw $s0, 0x0018($sp) -/* 056A0 80AC8340 AFA00014 */ sw $zero, 0x0014($sp) -/* 056A4 80AC8344 0C0286B2 */ jal func_800A1AC8 -/* 056A8 80AC8348 AFA00010 */ sw $zero, 0x0010($sp) +/* 0569C 80AC833C AFB00018 */ sw $s0, 0x0018($sp) +/* 056A0 80AC8340 AFA00014 */ sw $zero, 0x0014($sp) +/* 056A4 80AC8344 0C0286B2 */ jal SkelAnime_DrawSV +/* 056A8 80AC8348 AFA00010 */ sw $zero, 0x0010($sp) /* 056AC 80AC834C C6040238 */ lwc1 $f4, 0x0238($s0) ## 00000238 /* 056B0 80AC8350 8E060230 */ lw $a2, 0x0230($s0) ## 00000230 /* 056B4 80AC8354 8E070234 */ lw $a3, 0x0234($s0) ## 00000234 -/* 056B8 80AC8358 E7A40010 */ swc1 $f4, 0x0010($sp) +/* 056B8 80AC8358 E7A40010 */ swc1 $f4, 0x0010($sp) /* 056BC 80AC835C 920A0251 */ lbu $t2, 0x0251($s0) ## 00000251 /* 056C0 80AC8360 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 056C4 80AC8364 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 056C8 80AC8368 0C2B1D4A */ jal func_80AC7528 -/* 056CC 80AC836C AFAA0014 */ sw $t2, 0x0014($sp) +/* 056C8 80AC8368 0C2B1D4A */ jal func_80AC7528 +/* 056CC 80AC836C AFAA0014 */ sw $t2, 0x0014($sp) /* 056D0 80AC8370 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 056D4 80AC8374 0C2B1E72 */ jal func_80AC79C8 +/* 056D4 80AC8374 0C2B1E72 */ jal func_80AC79C8 /* 056D8 80AC8378 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 056DC 80AC837C 3C0680AD */ lui $a2, %hi(D_80AC946C) ## $a2 = 80AD0000 /* 056E0 80AC8380 24C6946C */ addiu $a2, $a2, %lo(D_80AC946C) ## $a2 = 80AC946C /* 056E4 80AC8384 27A4003C */ addiu $a0, $sp, 0x003C ## $a0 = FFFFFFE4 /* 056E8 80AC8388 8E250000 */ lw $a1, 0x0000($s1) ## 00000000 -/* 056EC 80AC838C 0C031AD5 */ jal func_800C6B54 +/* 056EC 80AC838C 0C031AD5 */ jal Graph_CloseDisps /* 056F0 80AC8390 2407117C */ addiu $a3, $zero, 0x117C ## $a3 = 0000117C -/* 056F4 80AC8394 8FBF002C */ lw $ra, 0x002C($sp) -/* 056F8 80AC8398 8FB00024 */ lw $s0, 0x0024($sp) -/* 056FC 80AC839C 8FB10028 */ lw $s1, 0x0028($sp) -/* 05700 80AC83A0 03E00008 */ jr $ra +/* 056F4 80AC8394 8FBF002C */ lw $ra, 0x002C($sp) +/* 056F8 80AC8398 8FB00024 */ lw $s0, 0x0024($sp) +/* 056FC 80AC839C 8FB10028 */ lw $s1, 0x0028($sp) +/* 05700 80AC83A0 03E00008 */ jr $ra /* 05704 80AC83A4 27BD0058 */ addiu $sp, $sp, 0x0058 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC83DC.s b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC83DC.s index ec40e4be8a..6fdd6de1bf 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC83DC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC83DC.s @@ -1,19 +1,19 @@ glabel func_80AC83DC /* 0573C 80AC83DC 27BDFF98 */ addiu $sp, $sp, 0xFF98 ## $sp = FFFFFF98 -/* 05740 80AC83E0 AFB20030 */ sw $s2, 0x0030($sp) +/* 05740 80AC83E0 AFB20030 */ sw $s2, 0x0030($sp) /* 05744 80AC83E4 00A09025 */ or $s2, $a1, $zero ## $s2 = 00000000 -/* 05748 80AC83E8 AFBF0034 */ sw $ra, 0x0034($sp) -/* 0574C 80AC83EC AFB1002C */ sw $s1, 0x002C($sp) -/* 05750 80AC83F0 AFB00028 */ sw $s0, 0x0028($sp) +/* 05748 80AC83E8 AFBF0034 */ sw $ra, 0x0034($sp) +/* 0574C 80AC83EC AFB1002C */ sw $s1, 0x002C($sp) +/* 05750 80AC83F0 AFB00028 */ sw $s0, 0x0028($sp) /* 05754 80AC83F4 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 /* 05758 80AC83F8 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 0575C 80AC83FC 3C0680AD */ lui $a2, %hi(D_80AC947C) ## $a2 = 80AD0000 /* 05760 80AC8400 24C6947C */ addiu $a2, $a2, %lo(D_80AC947C) ## $a2 = 80AC947C /* 05764 80AC8404 27A4004C */ addiu $a0, $sp, 0x004C ## $a0 = FFFFFFE4 /* 05768 80AC8408 2407119A */ addiu $a3, $zero, 0x119A ## $a3 = 0000119A -/* 0576C 80AC840C 0C031AB1 */ jal func_800C6AC4 +/* 0576C 80AC840C 0C031AB1 */ jal Graph_OpenDisps /* 05770 80AC8410 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 -/* 05774 80AC8414 0C024F46 */ jal func_80093D18 +/* 05774 80AC8414 0C024F46 */ jal func_80093D18 /* 05778 80AC8418 8E440000 */ lw $a0, 0x0000($s2) ## 00000000 /* 0577C 80AC841C 8E2202C0 */ lw $v0, 0x02C0($s1) ## 000002C0 /* 05780 80AC8420 3C0FFB00 */ lui $t7, 0xFB00 ## $t7 = FB000000 @@ -29,9 +29,9 @@ glabel func_80AC83DC /* 057A8 80AC8448 AE3902C0 */ sw $t9, 0x02C0($s1) ## 000002C0 /* 057AC 80AC844C AC480000 */ sw $t0, 0x0000($v0) ## 00000000 /* 057B0 80AC8450 8E440000 */ lw $a0, 0x0000($s2) ## 00000000 -/* 057B4 80AC8454 0C2B2007 */ jal func_80AC801C -/* 057B8 80AC8458 AFA20044 */ sw $v0, 0x0044($sp) -/* 057BC 80AC845C 8FA30044 */ lw $v1, 0x0044($sp) +/* 057B4 80AC8454 0C2B2007 */ jal func_80AC801C +/* 057B8 80AC8458 AFA20044 */ sw $v0, 0x0044($sp) +/* 057BC 80AC845C 8FA30044 */ lw $v1, 0x0044($sp) /* 057C0 80AC8460 3C0ADB06 */ lui $t2, 0xDB06 ## $t2 = DB060000 /* 057C4 80AC8464 354A0020 */ ori $t2, $t2, 0x0020 ## $t2 = DB060020 /* 057C8 80AC8468 AC620004 */ sw $v0, 0x0004($v1) ## 00000004 @@ -44,52 +44,52 @@ glabel func_80AC83DC /* 057E4 80AC8484 860B01F2 */ lh $t3, 0x01F2($s0) ## 000001F2 /* 057E8 80AC8488 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 /* 057EC 80AC848C 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF -/* 057F0 80AC8490 000B6080 */ sll $t4, $t3, 2 -/* 057F4 80AC8494 008C2021 */ addu $a0, $a0, $t4 -/* 057F8 80AC8498 8C848EC4 */ lw $a0, %lo(D_80AC8EC4)($a0) +/* 057F0 80AC8490 000B6080 */ sll $t4, $t3, 2 +/* 057F4 80AC8494 008C2021 */ addu $a0, $a0, $t4 +/* 057F8 80AC8498 8C848EC4 */ lw $a0, %lo(D_80AC8EC4)($a0) /* 057FC 80AC849C 3C0A80AD */ lui $t2, %hi(func_80AC83A8) ## $t2 = 80AD0000 /* 05800 80AC84A0 254A83A8 */ addiu $t2, $t2, %lo(func_80AC83A8) ## $t2 = 80AC83A8 -/* 05804 80AC84A4 00047100 */ sll $t6, $a0, 4 -/* 05808 80AC84A8 000E7F02 */ srl $t7, $t6, 28 -/* 0580C 80AC84AC 000FC080 */ sll $t8, $t7, 2 -/* 05810 80AC84B0 0338C821 */ addu $t9, $t9, $t8 +/* 05804 80AC84A4 00047100 */ sll $t6, $a0, 4 +/* 05808 80AC84A8 000E7F02 */ srl $t7, $t6, 28 +/* 0580C 80AC84AC 000FC080 */ sll $t8, $t7, 2 +/* 05810 80AC84B0 0338C821 */ addu $t9, $t9, $t8 /* 05814 80AC84B4 8F396FA8 */ lw $t9, 0x6FA8($t9) ## 80166FA8 -/* 05818 80AC84B8 00816824 */ and $t5, $a0, $at +/* 05818 80AC84B8 00816824 */ and $t5, $a0, $at /* 0581C 80AC84BC 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 05820 80AC84C0 01B94021 */ addu $t0, $t5, $t9 -/* 05824 80AC84C4 01014821 */ addu $t1, $t0, $at +/* 05820 80AC84C0 01B94021 */ addu $t0, $t5, $t9 +/* 05824 80AC84C4 01014821 */ addu $t1, $t0, $at /* 05828 80AC84C8 AC490004 */ sw $t1, 0x0004($v0) ## 00000004 /* 0582C 80AC84CC 9207014E */ lbu $a3, 0x014E($s0) ## 0000014E /* 05830 80AC84D0 8E06016C */ lw $a2, 0x016C($s0) ## 0000016C /* 05834 80AC84D4 8E050150 */ lw $a1, 0x0150($s0) ## 00000150 -/* 05838 80AC84D8 AFB00018 */ sw $s0, 0x0018($sp) -/* 0583C 80AC84DC AFA00014 */ sw $zero, 0x0014($sp) -/* 05840 80AC84E0 AFAA0010 */ sw $t2, 0x0010($sp) -/* 05844 80AC84E4 0C0286B2 */ jal func_800A1AC8 +/* 05838 80AC84D8 AFB00018 */ sw $s0, 0x0018($sp) +/* 0583C 80AC84DC AFA00014 */ sw $zero, 0x0014($sp) +/* 05840 80AC84E0 AFAA0010 */ sw $t2, 0x0010($sp) +/* 05844 80AC84E4 0C0286B2 */ jal SkelAnime_DrawSV /* 05848 80AC84E8 02402025 */ or $a0, $s2, $zero ## $a0 = 00000000 /* 0584C 80AC84EC C6040238 */ lwc1 $f4, 0x0238($s0) ## 00000238 /* 05850 80AC84F0 8E060230 */ lw $a2, 0x0230($s0) ## 00000230 /* 05854 80AC84F4 8E070234 */ lw $a3, 0x0234($s0) ## 00000234 -/* 05858 80AC84F8 E7A40010 */ swc1 $f4, 0x0010($sp) +/* 05858 80AC84F8 E7A40010 */ swc1 $f4, 0x0010($sp) /* 0585C 80AC84FC 920B0251 */ lbu $t3, 0x0251($s0) ## 00000251 /* 05860 80AC8500 02402025 */ or $a0, $s2, $zero ## $a0 = 00000000 /* 05864 80AC8504 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 05868 80AC8508 0C2B1D4A */ jal func_80AC7528 -/* 0586C 80AC850C AFAB0014 */ sw $t3, 0x0014($sp) +/* 05868 80AC8508 0C2B1D4A */ jal func_80AC7528 +/* 0586C 80AC850C AFAB0014 */ sw $t3, 0x0014($sp) /* 05870 80AC8510 02402025 */ or $a0, $s2, $zero ## $a0 = 00000000 -/* 05874 80AC8514 0C2B1E72 */ jal func_80AC79C8 +/* 05874 80AC8514 0C2B1E72 */ jal func_80AC79C8 /* 05878 80AC8518 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 0587C 80AC851C 3C0680AD */ lui $a2, %hi(D_80AC948C) ## $a2 = 80AD0000 /* 05880 80AC8520 24C6948C */ addiu $a2, $a2, %lo(D_80AC948C) ## $a2 = 80AC948C /* 05884 80AC8524 27A4004C */ addiu $a0, $sp, 0x004C ## $a0 = FFFFFFE4 /* 05888 80AC8528 8E450000 */ lw $a1, 0x0000($s2) ## 00000000 -/* 0588C 80AC852C 0C031AD5 */ jal func_800C6B54 +/* 0588C 80AC852C 0C031AD5 */ jal Graph_CloseDisps /* 05890 80AC8530 240711B3 */ addiu $a3, $zero, 0x11B3 ## $a3 = 000011B3 -/* 05894 80AC8534 8FBF0034 */ lw $ra, 0x0034($sp) -/* 05898 80AC8538 8FB00028 */ lw $s0, 0x0028($sp) -/* 0589C 80AC853C 8FB1002C */ lw $s1, 0x002C($sp) -/* 058A0 80AC8540 8FB20030 */ lw $s2, 0x0030($sp) -/* 058A4 80AC8544 03E00008 */ jr $ra +/* 05894 80AC8534 8FBF0034 */ lw $ra, 0x0034($sp) +/* 05898 80AC8538 8FB00028 */ lw $s0, 0x0028($sp) +/* 0589C 80AC853C 8FB1002C */ lw $s1, 0x002C($sp) +/* 058A0 80AC8540 8FB20030 */ lw $s2, 0x0030($sp) +/* 058A4 80AC8544 03E00008 */ jr $ra /* 058A8 80AC8548 27BD0068 */ addiu $sp, $sp, 0x0068 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC854C.s b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC854C.s index d93200a5f7..83ea783afe 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC854C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC854C.s @@ -1,20 +1,20 @@ glabel func_80AC854C /* 058AC 80AC854C 27BDFFA8 */ addiu $sp, $sp, 0xFFA8 ## $sp = FFFFFFA8 -/* 058B0 80AC8550 AFB10028 */ sw $s1, 0x0028($sp) +/* 058B0 80AC8550 AFB10028 */ sw $s1, 0x0028($sp) /* 058B4 80AC8554 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 -/* 058B8 80AC8558 AFBF002C */ sw $ra, 0x002C($sp) -/* 058BC 80AC855C AFB00024 */ sw $s0, 0x0024($sp) +/* 058B8 80AC8558 AFBF002C */ sw $ra, 0x002C($sp) +/* 058BC 80AC855C AFB00024 */ sw $s0, 0x0024($sp) /* 058C0 80AC8560 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 /* 058C4 80AC8564 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 058C8 80AC8568 3C0680AD */ lui $a2, %hi(D_80AC949C) ## $a2 = 80AD0000 /* 058CC 80AC856C 24C6949C */ addiu $a2, $a2, %lo(D_80AC949C) ## $a2 = 80AC949C /* 058D0 80AC8570 27A4003C */ addiu $a0, $sp, 0x003C ## $a0 = FFFFFFE4 /* 058D4 80AC8574 240711C0 */ addiu $a3, $zero, 0x11C0 ## $a3 = 000011C0 -/* 058D8 80AC8578 0C031AB1 */ jal func_800C6AC4 -/* 058DC 80AC857C AFA5004C */ sw $a1, 0x004C($sp) -/* 058E0 80AC8580 0C024F46 */ jal func_80093D18 +/* 058D8 80AC8578 0C031AB1 */ jal Graph_OpenDisps +/* 058DC 80AC857C AFA5004C */ sw $a1, 0x004C($sp) +/* 058E0 80AC8580 0C024F46 */ jal func_80093D18 /* 058E4 80AC8584 8E240000 */ lw $a0, 0x0000($s1) ## 00000000 -/* 058E8 80AC8588 8FA5004C */ lw $a1, 0x004C($sp) +/* 058E8 80AC8588 8FA5004C */ lw $a1, 0x004C($sp) /* 058EC 80AC858C 3C0FDB06 */ lui $t7, 0xDB06 ## $t7 = DB060000 /* 058F0 80AC8590 35EF0020 */ ori $t7, $t7, 0x0020 ## $t7 = DB060020 /* 058F4 80AC8594 8CA302C0 */ lw $v1, 0x02C0($a1) ## 000002C0 @@ -26,49 +26,49 @@ glabel func_80AC854C /* 0590C 80AC85AC 861801F2 */ lh $t8, 0x01F2($s0) ## 000001F2 /* 05910 80AC85B0 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 /* 05914 80AC85B4 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF -/* 05918 80AC85B8 0018C880 */ sll $t9, $t8, 2 -/* 0591C 80AC85BC 00992021 */ addu $a0, $a0, $t9 -/* 05920 80AC85C0 8C848ED0 */ lw $a0, %lo(D_80AC8ED0)($a0) -/* 05924 80AC85C4 00044900 */ sll $t1, $a0, 4 -/* 05928 80AC85C8 00095702 */ srl $t2, $t1, 28 -/* 0592C 80AC85CC 000A5880 */ sll $t3, $t2, 2 -/* 05930 80AC85D0 018B6021 */ addu $t4, $t4, $t3 +/* 05918 80AC85B8 0018C880 */ sll $t9, $t8, 2 +/* 0591C 80AC85BC 00992021 */ addu $a0, $a0, $t9 +/* 05920 80AC85C0 8C848ED0 */ lw $a0, %lo(D_80AC8ED0)($a0) +/* 05924 80AC85C4 00044900 */ sll $t1, $a0, 4 +/* 05928 80AC85C8 00095702 */ srl $t2, $t1, 28 +/* 0592C 80AC85CC 000A5880 */ sll $t3, $t2, 2 +/* 05930 80AC85D0 018B6021 */ addu $t4, $t4, $t3 /* 05934 80AC85D4 8D8C6FA8 */ lw $t4, 0x6FA8($t4) ## 80166FA8 -/* 05938 80AC85D8 00814024 */ and $t0, $a0, $at +/* 05938 80AC85D8 00814024 */ and $t0, $a0, $at /* 0593C 80AC85DC 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 05940 80AC85E0 010C6821 */ addu $t5, $t0, $t4 -/* 05944 80AC85E4 01A17021 */ addu $t6, $t5, $at +/* 05940 80AC85E0 010C6821 */ addu $t5, $t0, $t4 +/* 05944 80AC85E4 01A17021 */ addu $t6, $t5, $at /* 05948 80AC85E8 AC6E0004 */ sw $t6, 0x0004($v1) ## 00000004 /* 0594C 80AC85EC 9207014E */ lbu $a3, 0x014E($s0) ## 0000014E /* 05950 80AC85F0 8E06016C */ lw $a2, 0x016C($s0) ## 0000016C /* 05954 80AC85F4 8E050150 */ lw $a1, 0x0150($s0) ## 00000150 -/* 05958 80AC85F8 AFB00018 */ sw $s0, 0x0018($sp) -/* 0595C 80AC85FC AFA00014 */ sw $zero, 0x0014($sp) -/* 05960 80AC8600 AFA00010 */ sw $zero, 0x0010($sp) -/* 05964 80AC8604 0C0286B2 */ jal func_800A1AC8 +/* 05958 80AC85F8 AFB00018 */ sw $s0, 0x0018($sp) +/* 0595C 80AC85FC AFA00014 */ sw $zero, 0x0014($sp) +/* 05960 80AC8600 AFA00010 */ sw $zero, 0x0010($sp) +/* 05964 80AC8604 0C0286B2 */ jal SkelAnime_DrawSV /* 05968 80AC8608 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 0596C 80AC860C C6040238 */ lwc1 $f4, 0x0238($s0) ## 00000238 /* 05970 80AC8610 8E060230 */ lw $a2, 0x0230($s0) ## 00000230 /* 05974 80AC8614 8E070234 */ lw $a3, 0x0234($s0) ## 00000234 -/* 05978 80AC8618 E7A40010 */ swc1 $f4, 0x0010($sp) +/* 05978 80AC8618 E7A40010 */ swc1 $f4, 0x0010($sp) /* 0597C 80AC861C 920F0251 */ lbu $t7, 0x0251($s0) ## 00000251 /* 05980 80AC8620 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 05984 80AC8624 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 05988 80AC8628 0C2B1D4A */ jal func_80AC7528 -/* 0598C 80AC862C AFAF0014 */ sw $t7, 0x0014($sp) +/* 05988 80AC8628 0C2B1D4A */ jal func_80AC7528 +/* 0598C 80AC862C AFAF0014 */ sw $t7, 0x0014($sp) /* 05990 80AC8630 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 05994 80AC8634 0C2B1E72 */ jal func_80AC79C8 +/* 05994 80AC8634 0C2B1E72 */ jal func_80AC79C8 /* 05998 80AC8638 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 0599C 80AC863C 3C0680AD */ lui $a2, %hi(D_80AC94AC) ## $a2 = 80AD0000 /* 059A0 80AC8640 24C694AC */ addiu $a2, $a2, %lo(D_80AC94AC) ## $a2 = 80AC94AC /* 059A4 80AC8644 27A4003C */ addiu $a0, $sp, 0x003C ## $a0 = FFFFFFE4 /* 059A8 80AC8648 8E250000 */ lw $a1, 0x0000($s1) ## 00000000 -/* 059AC 80AC864C 0C031AD5 */ jal func_800C6B54 +/* 059AC 80AC864C 0C031AD5 */ jal Graph_CloseDisps /* 059B0 80AC8650 240711D4 */ addiu $a3, $zero, 0x11D4 ## $a3 = 000011D4 -/* 059B4 80AC8654 8FBF002C */ lw $ra, 0x002C($sp) -/* 059B8 80AC8658 8FB00024 */ lw $s0, 0x0024($sp) -/* 059BC 80AC865C 8FB10028 */ lw $s1, 0x0028($sp) -/* 059C0 80AC8660 03E00008 */ jr $ra +/* 059B4 80AC8654 8FBF002C */ lw $ra, 0x002C($sp) +/* 059B8 80AC8658 8FB00024 */ lw $s0, 0x0024($sp) +/* 059BC 80AC865C 8FB10028 */ lw $s1, 0x0028($sp) +/* 059C0 80AC8660 03E00008 */ jr $ra /* 059C4 80AC8664 27BD0058 */ addiu $sp, $sp, 0x0058 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC8668.s b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC8668.s index 647e7a63db..c5aa374171 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC8668.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC8668.s @@ -1,20 +1,20 @@ glabel func_80AC8668 /* 059C8 80AC8668 27BDFFA8 */ addiu $sp, $sp, 0xFFA8 ## $sp = FFFFFFA8 -/* 059CC 80AC866C AFB10028 */ sw $s1, 0x0028($sp) +/* 059CC 80AC866C AFB10028 */ sw $s1, 0x0028($sp) /* 059D0 80AC8670 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 -/* 059D4 80AC8674 AFBF002C */ sw $ra, 0x002C($sp) -/* 059D8 80AC8678 AFB00024 */ sw $s0, 0x0024($sp) +/* 059D4 80AC8674 AFBF002C */ sw $ra, 0x002C($sp) +/* 059D8 80AC8678 AFB00024 */ sw $s0, 0x0024($sp) /* 059DC 80AC867C 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 /* 059E0 80AC8680 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 059E4 80AC8684 3C0680AD */ lui $a2, %hi(D_80AC94BC) ## $a2 = 80AD0000 /* 059E8 80AC8688 24C694BC */ addiu $a2, $a2, %lo(D_80AC94BC) ## $a2 = 80AC94BC /* 059EC 80AC868C 27A4003C */ addiu $a0, $sp, 0x003C ## $a0 = FFFFFFE4 /* 059F0 80AC8690 240711E2 */ addiu $a3, $zero, 0x11E2 ## $a3 = 000011E2 -/* 059F4 80AC8694 0C031AB1 */ jal func_800C6AC4 -/* 059F8 80AC8698 AFA5004C */ sw $a1, 0x004C($sp) -/* 059FC 80AC869C 0C024F46 */ jal func_80093D18 +/* 059F4 80AC8694 0C031AB1 */ jal Graph_OpenDisps +/* 059F8 80AC8698 AFA5004C */ sw $a1, 0x004C($sp) +/* 059FC 80AC869C 0C024F46 */ jal func_80093D18 /* 05A00 80AC86A0 8E240000 */ lw $a0, 0x0000($s1) ## 00000000 -/* 05A04 80AC86A4 8FA5004C */ lw $a1, 0x004C($sp) +/* 05A04 80AC86A4 8FA5004C */ lw $a1, 0x004C($sp) /* 05A08 80AC86A8 3C0FDB06 */ lui $t7, 0xDB06 ## $t7 = DB060000 /* 05A0C 80AC86AC 35EF0020 */ ori $t7, $t7, 0x0020 ## $t7 = DB060020 /* 05A10 80AC86B0 8CA302C0 */ lw $v1, 0x02C0($a1) ## 000002C0 @@ -26,49 +26,49 @@ glabel func_80AC8668 /* 05A28 80AC86C8 921801EC */ lbu $t8, 0x01EC($s0) ## 000001EC /* 05A2C 80AC86CC 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 /* 05A30 80AC86D0 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF -/* 05A34 80AC86D4 0018C880 */ sll $t9, $t8, 2 -/* 05A38 80AC86D8 00992021 */ addu $a0, $a0, $t9 -/* 05A3C 80AC86DC 8C848EDC */ lw $a0, %lo(D_80AC8EDC)($a0) -/* 05A40 80AC86E0 00044900 */ sll $t1, $a0, 4 -/* 05A44 80AC86E4 00095702 */ srl $t2, $t1, 28 -/* 05A48 80AC86E8 000A5880 */ sll $t3, $t2, 2 -/* 05A4C 80AC86EC 018B6021 */ addu $t4, $t4, $t3 +/* 05A34 80AC86D4 0018C880 */ sll $t9, $t8, 2 +/* 05A38 80AC86D8 00992021 */ addu $a0, $a0, $t9 +/* 05A3C 80AC86DC 8C848EDC */ lw $a0, %lo(D_80AC8EDC)($a0) +/* 05A40 80AC86E0 00044900 */ sll $t1, $a0, 4 +/* 05A44 80AC86E4 00095702 */ srl $t2, $t1, 28 +/* 05A48 80AC86E8 000A5880 */ sll $t3, $t2, 2 +/* 05A4C 80AC86EC 018B6021 */ addu $t4, $t4, $t3 /* 05A50 80AC86F0 8D8C6FA8 */ lw $t4, 0x6FA8($t4) ## 80166FA8 -/* 05A54 80AC86F4 00814024 */ and $t0, $a0, $at +/* 05A54 80AC86F4 00814024 */ and $t0, $a0, $at /* 05A58 80AC86F8 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 05A5C 80AC86FC 010C6821 */ addu $t5, $t0, $t4 -/* 05A60 80AC8700 01A17021 */ addu $t6, $t5, $at +/* 05A5C 80AC86FC 010C6821 */ addu $t5, $t0, $t4 +/* 05A60 80AC8700 01A17021 */ addu $t6, $t5, $at /* 05A64 80AC8704 AC6E0004 */ sw $t6, 0x0004($v1) ## 00000004 /* 05A68 80AC8708 9207014E */ lbu $a3, 0x014E($s0) ## 0000014E /* 05A6C 80AC870C 8E06016C */ lw $a2, 0x016C($s0) ## 0000016C /* 05A70 80AC8710 8E050150 */ lw $a1, 0x0150($s0) ## 00000150 -/* 05A74 80AC8714 AFB00018 */ sw $s0, 0x0018($sp) -/* 05A78 80AC8718 AFA00014 */ sw $zero, 0x0014($sp) -/* 05A7C 80AC871C AFA00010 */ sw $zero, 0x0010($sp) -/* 05A80 80AC8720 0C0286B2 */ jal func_800A1AC8 +/* 05A74 80AC8714 AFB00018 */ sw $s0, 0x0018($sp) +/* 05A78 80AC8718 AFA00014 */ sw $zero, 0x0014($sp) +/* 05A7C 80AC871C AFA00010 */ sw $zero, 0x0010($sp) +/* 05A80 80AC8720 0C0286B2 */ jal SkelAnime_DrawSV /* 05A84 80AC8724 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 05A88 80AC8728 C6040238 */ lwc1 $f4, 0x0238($s0) ## 00000238 /* 05A8C 80AC872C 8E060230 */ lw $a2, 0x0230($s0) ## 00000230 /* 05A90 80AC8730 8E070234 */ lw $a3, 0x0234($s0) ## 00000234 -/* 05A94 80AC8734 E7A40010 */ swc1 $f4, 0x0010($sp) +/* 05A94 80AC8734 E7A40010 */ swc1 $f4, 0x0010($sp) /* 05A98 80AC8738 920F0251 */ lbu $t7, 0x0251($s0) ## 00000251 /* 05A9C 80AC873C 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 05AA0 80AC8740 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 05AA4 80AC8744 0C2B1D4A */ jal func_80AC7528 -/* 05AA8 80AC8748 AFAF0014 */ sw $t7, 0x0014($sp) +/* 05AA4 80AC8744 0C2B1D4A */ jal func_80AC7528 +/* 05AA8 80AC8748 AFAF0014 */ sw $t7, 0x0014($sp) /* 05AAC 80AC874C 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 05AB0 80AC8750 0C2B1E72 */ jal func_80AC79C8 +/* 05AB0 80AC8750 0C2B1E72 */ jal func_80AC79C8 /* 05AB4 80AC8754 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 05AB8 80AC8758 3C0680AD */ lui $a2, %hi(D_80AC94CC) ## $a2 = 80AD0000 /* 05ABC 80AC875C 24C694CC */ addiu $a2, $a2, %lo(D_80AC94CC) ## $a2 = 80AC94CC /* 05AC0 80AC8760 27A4003C */ addiu $a0, $sp, 0x003C ## $a0 = FFFFFFE4 /* 05AC4 80AC8764 8E250000 */ lw $a1, 0x0000($s1) ## 00000000 -/* 05AC8 80AC8768 0C031AD5 */ jal func_800C6B54 +/* 05AC8 80AC8768 0C031AD5 */ jal Graph_CloseDisps /* 05ACC 80AC876C 240711F6 */ addiu $a3, $zero, 0x11F6 ## $a3 = 000011F6 -/* 05AD0 80AC8770 8FBF002C */ lw $ra, 0x002C($sp) -/* 05AD4 80AC8774 8FB00024 */ lw $s0, 0x0024($sp) -/* 05AD8 80AC8778 8FB10028 */ lw $s1, 0x0028($sp) -/* 05ADC 80AC877C 03E00008 */ jr $ra +/* 05AD0 80AC8770 8FBF002C */ lw $ra, 0x002C($sp) +/* 05AD4 80AC8774 8FB00024 */ lw $s0, 0x0024($sp) +/* 05AD8 80AC8778 8FB10028 */ lw $s1, 0x0028($sp) +/* 05ADC 80AC877C 03E00008 */ jr $ra /* 05AE0 80AC8780 27BD0058 */ addiu $sp, $sp, 0x0058 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC8784.s b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC8784.s index a50c55968e..e5d6ba595a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC8784.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ossan/func_80AC8784.s @@ -1,20 +1,20 @@ glabel func_80AC8784 /* 05AE4 80AC8784 27BDFFA8 */ addiu $sp, $sp, 0xFFA8 ## $sp = FFFFFFA8 -/* 05AE8 80AC8788 AFB10028 */ sw $s1, 0x0028($sp) +/* 05AE8 80AC8788 AFB10028 */ sw $s1, 0x0028($sp) /* 05AEC 80AC878C 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 -/* 05AF0 80AC8790 AFBF002C */ sw $ra, 0x002C($sp) -/* 05AF4 80AC8794 AFB00024 */ sw $s0, 0x0024($sp) +/* 05AF0 80AC8790 AFBF002C */ sw $ra, 0x002C($sp) +/* 05AF4 80AC8794 AFB00024 */ sw $s0, 0x0024($sp) /* 05AF8 80AC8798 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 /* 05AFC 80AC879C 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 05B00 80AC87A0 3C0680AD */ lui $a2, %hi(D_80AC94DC) ## $a2 = 80AD0000 /* 05B04 80AC87A4 24C694DC */ addiu $a2, $a2, %lo(D_80AC94DC) ## $a2 = 80AC94DC /* 05B08 80AC87A8 27A4003C */ addiu $a0, $sp, 0x003C ## $a0 = FFFFFFE4 /* 05B0C 80AC87AC 24071203 */ addiu $a3, $zero, 0x1203 ## $a3 = 00001203 -/* 05B10 80AC87B0 0C031AB1 */ jal func_800C6AC4 -/* 05B14 80AC87B4 AFA5004C */ sw $a1, 0x004C($sp) -/* 05B18 80AC87B8 0C024F46 */ jal func_80093D18 +/* 05B10 80AC87B0 0C031AB1 */ jal Graph_OpenDisps +/* 05B14 80AC87B4 AFA5004C */ sw $a1, 0x004C($sp) +/* 05B18 80AC87B8 0C024F46 */ jal func_80093D18 /* 05B1C 80AC87BC 8E240000 */ lw $a0, 0x0000($s1) ## 00000000 -/* 05B20 80AC87C0 8FA5004C */ lw $a1, 0x004C($sp) +/* 05B20 80AC87C0 8FA5004C */ lw $a1, 0x004C($sp) /* 05B24 80AC87C4 3C0FDB06 */ lui $t7, 0xDB06 ## $t7 = DB060000 /* 05B28 80AC87C8 35EF0020 */ ori $t7, $t7, 0x0020 ## $t7 = DB060020 /* 05B2C 80AC87CC 8CA302C0 */ lw $v1, 0x02C0($a1) ## 000002C0 @@ -26,48 +26,48 @@ glabel func_80AC8784 /* 05B44 80AC87E4 861801F2 */ lh $t8, 0x01F2($s0) ## 000001F2 /* 05B48 80AC87E8 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 /* 05B4C 80AC87EC 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF -/* 05B50 80AC87F0 0018C880 */ sll $t9, $t8, 2 -/* 05B54 80AC87F4 00992021 */ addu $a0, $a0, $t9 -/* 05B58 80AC87F8 8C848EE4 */ lw $a0, %lo(D_80AC8EE4)($a0) -/* 05B5C 80AC87FC 00044900 */ sll $t1, $a0, 4 -/* 05B60 80AC8800 00095702 */ srl $t2, $t1, 28 -/* 05B64 80AC8804 000A5880 */ sll $t3, $t2, 2 -/* 05B68 80AC8808 018B6021 */ addu $t4, $t4, $t3 +/* 05B50 80AC87F0 0018C880 */ sll $t9, $t8, 2 +/* 05B54 80AC87F4 00992021 */ addu $a0, $a0, $t9 +/* 05B58 80AC87F8 8C848EE4 */ lw $a0, %lo(D_80AC8EE4)($a0) +/* 05B5C 80AC87FC 00044900 */ sll $t1, $a0, 4 +/* 05B60 80AC8800 00095702 */ srl $t2, $t1, 28 +/* 05B64 80AC8804 000A5880 */ sll $t3, $t2, 2 +/* 05B68 80AC8808 018B6021 */ addu $t4, $t4, $t3 /* 05B6C 80AC880C 8D8C6FA8 */ lw $t4, 0x6FA8($t4) ## 80166FA8 -/* 05B70 80AC8810 00814024 */ and $t0, $a0, $at +/* 05B70 80AC8810 00814024 */ and $t0, $a0, $at /* 05B74 80AC8814 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 05B78 80AC8818 010C6821 */ addu $t5, $t0, $t4 -/* 05B7C 80AC881C 01A17021 */ addu $t6, $t5, $at +/* 05B78 80AC8818 010C6821 */ addu $t5, $t0, $t4 +/* 05B7C 80AC881C 01A17021 */ addu $t6, $t5, $at /* 05B80 80AC8820 AC6E0004 */ sw $t6, 0x0004($v1) ## 00000004 /* 05B84 80AC8824 9207014E */ lbu $a3, 0x014E($s0) ## 0000014E /* 05B88 80AC8828 8E06016C */ lw $a2, 0x016C($s0) ## 0000016C /* 05B8C 80AC882C 8E050150 */ lw $a1, 0x0150($s0) ## 00000150 -/* 05B90 80AC8830 AFB00018 */ sw $s0, 0x0018($sp) -/* 05B94 80AC8834 AFA00014 */ sw $zero, 0x0014($sp) -/* 05B98 80AC8838 AFA00010 */ sw $zero, 0x0010($sp) -/* 05B9C 80AC883C 0C0286B2 */ jal func_800A1AC8 +/* 05B90 80AC8830 AFB00018 */ sw $s0, 0x0018($sp) +/* 05B94 80AC8834 AFA00014 */ sw $zero, 0x0014($sp) +/* 05B98 80AC8838 AFA00010 */ sw $zero, 0x0010($sp) +/* 05B9C 80AC883C 0C0286B2 */ jal SkelAnime_DrawSV /* 05BA0 80AC8840 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 05BA4 80AC8844 C6040238 */ lwc1 $f4, 0x0238($s0) ## 00000238 /* 05BA8 80AC8848 8E060230 */ lw $a2, 0x0230($s0) ## 00000230 /* 05BAC 80AC884C 8E070234 */ lw $a3, 0x0234($s0) ## 00000234 -/* 05BB0 80AC8850 E7A40010 */ swc1 $f4, 0x0010($sp) +/* 05BB0 80AC8850 E7A40010 */ swc1 $f4, 0x0010($sp) /* 05BB4 80AC8854 920F0251 */ lbu $t7, 0x0251($s0) ## 00000251 /* 05BB8 80AC8858 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 05BBC 80AC885C 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 05BC0 80AC8860 0C2B1D4A */ jal func_80AC7528 -/* 05BC4 80AC8864 AFAF0014 */ sw $t7, 0x0014($sp) +/* 05BC0 80AC8860 0C2B1D4A */ jal func_80AC7528 +/* 05BC4 80AC8864 AFAF0014 */ sw $t7, 0x0014($sp) /* 05BC8 80AC8868 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 05BCC 80AC886C 0C2B1E72 */ jal func_80AC79C8 +/* 05BCC 80AC886C 0C2B1E72 */ jal func_80AC79C8 /* 05BD0 80AC8870 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 05BD4 80AC8874 3C0680AD */ lui $a2, %hi(D_80AC94EC) ## $a2 = 80AD0000 /* 05BD8 80AC8878 24C694EC */ addiu $a2, $a2, %lo(D_80AC94EC) ## $a2 = 80AC94EC /* 05BDC 80AC887C 27A4003C */ addiu $a0, $sp, 0x003C ## $a0 = FFFFFFE4 /* 05BE0 80AC8880 8E250000 */ lw $a1, 0x0000($s1) ## 00000000 -/* 05BE4 80AC8884 0C031AD5 */ jal func_800C6B54 +/* 05BE4 80AC8884 0C031AD5 */ jal Graph_CloseDisps /* 05BE8 80AC8888 24071217 */ addiu $a3, $zero, 0x1217 ## $a3 = 00001217 -/* 05BEC 80AC888C 8FBF002C */ lw $ra, 0x002C($sp) -/* 05BF0 80AC8890 8FB00024 */ lw $s0, 0x0024($sp) -/* 05BF4 80AC8894 8FB10028 */ lw $s1, 0x0028($sp) -/* 05BF8 80AC8898 03E00008 */ jr $ra +/* 05BEC 80AC888C 8FBF002C */ lw $ra, 0x002C($sp) +/* 05BF0 80AC8890 8FB00024 */ lw $s0, 0x0024($sp) +/* 05BF4 80AC8894 8FB10028 */ lw $s1, 0x0028($sp) +/* 05BF8 80AC8898 03E00008 */ jr $ra /* 05BFC 80AC889C 27BD0058 */ addiu $sp, $sp, 0x0058 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Owl/EnOwl_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Owl/EnOwl_Draw.s index 383210e5ca..200f269a01 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Owl/EnOwl_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Owl/EnOwl_Draw.s @@ -1,20 +1,20 @@ glabel EnOwl_Draw /* 03098 80ACCFB8 27BDFFB0 */ addiu $sp, $sp, 0xFFB0 ## $sp = FFFFFFB0 -/* 0309C 80ACCFBC AFBF0024 */ sw $ra, 0x0024($sp) -/* 030A0 80ACCFC0 AFA40050 */ sw $a0, 0x0050($sp) -/* 030A4 80ACCFC4 AFA50054 */ sw $a1, 0x0054($sp) +/* 0309C 80ACCFBC AFBF0024 */ sw $ra, 0x0024($sp) +/* 030A0 80ACCFC0 AFA40050 */ sw $a0, 0x0050($sp) +/* 030A4 80ACCFC4 AFA50054 */ sw $a1, 0x0054($sp) /* 030A8 80ACCFC8 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 /* 030AC 80ACCFCC 3C0680AD */ lui $a2, %hi(D_80ACD7DC) ## $a2 = 80AD0000 /* 030B0 80ACCFD0 24C6D7DC */ addiu $a2, $a2, %lo(D_80ACD7DC) ## $a2 = 80ACD7DC /* 030B4 80ACCFD4 27A40034 */ addiu $a0, $sp, 0x0034 ## $a0 = FFFFFFE4 /* 030B8 80ACCFD8 240708C7 */ addiu $a3, $zero, 0x08C7 ## $a3 = 000008C7 -/* 030BC 80ACCFDC 0C031AB1 */ jal func_800C6AC4 -/* 030C0 80ACCFE0 AFA50044 */ sw $a1, 0x0044($sp) -/* 030C4 80ACCFE4 8FAF0054 */ lw $t7, 0x0054($sp) -/* 030C8 80ACCFE8 0C0250F2 */ jal func_800943C8 +/* 030BC 80ACCFDC 0C031AB1 */ jal Graph_OpenDisps +/* 030C0 80ACCFE0 AFA50044 */ sw $a1, 0x0044($sp) +/* 030C4 80ACCFE4 8FAF0054 */ lw $t7, 0x0054($sp) +/* 030C8 80ACCFE8 0C0250F2 */ jal func_800943C8 /* 030CC 80ACCFEC 8DE40000 */ lw $a0, 0x0000($t7) ## 00000000 -/* 030D0 80ACCFF0 8FA50044 */ lw $a1, 0x0044($sp) -/* 030D4 80ACCFF4 8FA80050 */ lw $t0, 0x0050($sp) +/* 030D0 80ACCFF0 8FA50044 */ lw $a1, 0x0044($sp) +/* 030D4 80ACCFF4 8FA80050 */ lw $t0, 0x0050($sp) /* 030D8 80ACCFF8 3C19DB06 */ lui $t9, 0xDB06 ## $t9 = DB060000 /* 030DC 80ACCFFC 8CA302C0 */ lw $v1, 0x02C0($a1) ## 000002C0 /* 030E0 80ACD000 37390020 */ ori $t9, $t9, 0x0020 ## $t9 = DB060020 @@ -25,20 +25,20 @@ glabel EnOwl_Draw /* 030F4 80ACD014 850903F4 */ lh $t1, 0x03F4($t0) ## 000003F4 /* 030F8 80ACD018 3C0F8016 */ lui $t7, 0x8016 ## $t7 = 80160000 /* 030FC 80ACD01C 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 -/* 03100 80ACD020 00095080 */ sll $t2, $t1, 2 -/* 03104 80ACD024 008A2021 */ addu $a0, $a0, $t2 -/* 03108 80ACD028 8C84D638 */ lw $a0, %lo(D_80ACD638)($a0) +/* 03100 80ACD020 00095080 */ sll $t2, $t1, 2 +/* 03104 80ACD024 008A2021 */ addu $a0, $a0, $t2 +/* 03108 80ACD028 8C84D638 */ lw $a0, %lo(D_80ACD638)($a0) /* 0310C 80ACD02C 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF /* 03110 80ACD030 3C0A80AD */ lui $t2, %hi(func_80ACCF34) ## $t2 = 80AD0000 -/* 03114 80ACD034 00046100 */ sll $t4, $a0, 4 -/* 03118 80ACD038 000C6F02 */ srl $t5, $t4, 28 -/* 0311C 80ACD03C 000D7080 */ sll $t6, $t5, 2 -/* 03120 80ACD040 01EE7821 */ addu $t7, $t7, $t6 +/* 03114 80ACD034 00046100 */ sll $t4, $a0, 4 +/* 03118 80ACD038 000C6F02 */ srl $t5, $t4, 28 +/* 0311C 80ACD03C 000D7080 */ sll $t6, $t5, 2 +/* 03120 80ACD040 01EE7821 */ addu $t7, $t7, $t6 /* 03124 80ACD044 8DEF6FA8 */ lw $t7, 0x6FA8($t7) ## 80166FA8 -/* 03128 80ACD048 00815824 */ and $t3, $a0, $at +/* 03128 80ACD048 00815824 */ and $t3, $a0, $at /* 0312C 80ACD04C 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 03130 80ACD050 016FC021 */ addu $t8, $t3, $t7 -/* 03134 80ACD054 0301C821 */ addu $t9, $t8, $at +/* 03130 80ACD050 016FC021 */ addu $t8, $t3, $t7 +/* 03134 80ACD054 0301C821 */ addu $t9, $t8, $at /* 03138 80ACD058 AC790004 */ sw $t9, 0x0004($v1) ## 00000004 /* 0313C 80ACD05C 8D0203DC */ lw $v0, 0x03DC($t0) ## 000003DC /* 03140 80ACD060 3C0980AD */ lui $t1, %hi(func_80ACCE00) ## $t1 = 80AD0000 @@ -47,21 +47,21 @@ glabel EnOwl_Draw /* 0314C 80ACD06C 8C460020 */ lw $a2, 0x0020($v0) ## 00000020 /* 03150 80ACD070 90470002 */ lbu $a3, 0x0002($v0) ## 00000002 /* 03154 80ACD074 254ACF34 */ addiu $t2, $t2, %lo(func_80ACCF34) ## $t2 = 80ACCF34 -/* 03158 80ACD078 AFAA0014 */ sw $t2, 0x0014($sp) -/* 0315C 80ACD07C AFA90010 */ sw $t1, 0x0010($sp) -/* 03160 80ACD080 8FA40054 */ lw $a0, 0x0054($sp) -/* 03164 80ACD084 0C0286B2 */ jal func_800A1AC8 -/* 03168 80ACD088 AFA80018 */ sw $t0, 0x0018($sp) -/* 0316C 80ACD08C 8FAC0054 */ lw $t4, 0x0054($sp) +/* 03158 80ACD078 AFAA0014 */ sw $t2, 0x0014($sp) +/* 0315C 80ACD07C AFA90010 */ sw $t1, 0x0010($sp) +/* 03160 80ACD080 8FA40054 */ lw $a0, 0x0054($sp) +/* 03164 80ACD084 0C0286B2 */ jal SkelAnime_DrawSV +/* 03168 80ACD088 AFA80018 */ sw $t0, 0x0018($sp) +/* 0316C 80ACD08C 8FAC0054 */ lw $t4, 0x0054($sp) /* 03170 80ACD090 3C0680AD */ lui $a2, %hi(D_80ACD7EC) ## $a2 = 80AD0000 /* 03174 80ACD094 24C6D7EC */ addiu $a2, $a2, %lo(D_80ACD7EC) ## $a2 = 80ACD7EC /* 03178 80ACD098 27A40034 */ addiu $a0, $sp, 0x0034 ## $a0 = FFFFFFE4 /* 0317C 80ACD09C 240708D8 */ addiu $a3, $zero, 0x08D8 ## $a3 = 000008D8 -/* 03180 80ACD0A0 0C031AD5 */ jal func_800C6B54 +/* 03180 80ACD0A0 0C031AD5 */ jal Graph_CloseDisps /* 03184 80ACD0A4 8D850000 */ lw $a1, 0x0000($t4) ## 00000000 -/* 03188 80ACD0A8 8FBF0024 */ lw $ra, 0x0024($sp) +/* 03188 80ACD0A8 8FBF0024 */ lw $ra, 0x0024($sp) /* 0318C 80ACD0AC 27BD0050 */ addiu $sp, $sp, 0x0050 ## $sp = 00000000 -/* 03190 80ACD0B0 03E00008 */ jr $ra +/* 03190 80ACD0B0 03E00008 */ jr $ra /* 03194 80ACD0B4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Owl/EnOwl_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Owl/EnOwl_Init.s index ce08814c9b..2c55735c7b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Owl/EnOwl_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Owl/EnOwl_Init.s @@ -1,32 +1,32 @@ glabel EnOwl_Init /* 00000 80AC9F20 27BDFFB0 */ addiu $sp, $sp, 0xFFB0 ## $sp = FFFFFFB0 -/* 00004 80AC9F24 AFA50054 */ sw $a1, 0x0054($sp) -/* 00008 80AC9F28 AFBF002C */ sw $ra, 0x002C($sp) -/* 0000C 80AC9F2C AFB00028 */ sw $s0, 0x0028($sp) +/* 00004 80AC9F24 AFA50054 */ sw $a1, 0x0054($sp) +/* 00008 80AC9F28 AFBF002C */ sw $ra, 0x002C($sp) +/* 0000C 80AC9F2C AFB00028 */ sw $s0, 0x0028($sp) /* 00010 80AC9F30 3C0580AD */ lui $a1, %hi(D_80ACD61C) ## $a1 = 80AD0000 /* 00014 80AC9F34 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 00018 80AC9F38 0C01E037 */ jal Actor_ProcessInitChain - + /* 0001C 80AC9F3C 24A5D61C */ addiu $a1, $a1, %lo(D_80ACD61C) ## $a1 = 80ACD61C /* 00020 80AC9F40 3C068003 */ lui $a2, 0x8003 ## $a2 = 80030000 /* 00024 80AC9F44 24C6B5EC */ addiu $a2, $a2, 0xB5EC ## $a2 = 8002B5EC /* 00028 80AC9F48 260400B4 */ addiu $a0, $s0, 0x00B4 ## $a0 = 000000B4 /* 0002C 80AC9F4C 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 /* 00030 80AC9F50 0C00AC78 */ jal ActorShape_Init - + /* 00034 80AC9F54 3C074210 */ lui $a3, 0x4210 ## $a3 = 42100000 /* 00038 80AC9F58 3C060601 */ lui $a2, 0x0601 ## $a2 = 06010000 /* 0003C 80AC9F5C 3C070600 */ lui $a3, 0x0600 ## $a3 = 06000000 /* 00040 80AC9F60 260E01DC */ addiu $t6, $s0, 0x01DC ## $t6 = 000001DC /* 00044 80AC9F64 260F025A */ addiu $t7, $s0, 0x025A ## $t7 = 0000025A /* 00048 80AC9F68 24180015 */ addiu $t8, $zero, 0x0015 ## $t8 = 00000015 -/* 0004C 80AC9F6C AFB80018 */ sw $t8, 0x0018($sp) -/* 00050 80AC9F70 AFAF0014 */ sw $t7, 0x0014($sp) -/* 00054 80AC9F74 AFAE0010 */ sw $t6, 0x0010($sp) +/* 0004C 80AC9F6C AFB80018 */ sw $t8, 0x0018($sp) +/* 00050 80AC9F70 AFAF0014 */ sw $t7, 0x0014($sp) +/* 00054 80AC9F74 AFAE0010 */ sw $t6, 0x0010($sp) /* 00058 80AC9F78 24E715CC */ addiu $a3, $a3, 0x15CC ## $a3 = 060015CC /* 0005C 80AC9F7C 24C6C0E8 */ addiu $a2, $a2, 0xC0E8 ## $a2 = 0600C0E8 -/* 00060 80AC9F80 8FA40054 */ lw $a0, 0x0054($sp) -/* 00064 80AC9F84 0C0291BE */ jal func_800A46F8 +/* 00060 80AC9F80 8FA40054 */ lw $a0, 0x0054($sp) +/* 00064 80AC9F84 0C0291BE */ jal SkelAnime_InitSV /* 00068 80AC9F88 26050198 */ addiu $a1, $s0, 0x0198 ## $a1 = 00000198 /* 0006C 80AC9F8C 260502D8 */ addiu $a1, $s0, 0x02D8 ## $a1 = 000002D8 /* 00070 80AC9F90 3C060601 */ lui $a2, 0x0601 ## $a2 = 06010000 @@ -34,25 +34,25 @@ glabel EnOwl_Init /* 00078 80AC9F98 2619031C */ addiu $t9, $s0, 0x031C ## $t9 = 0000031C /* 0007C 80AC9F9C 2608037C */ addiu $t0, $s0, 0x037C ## $t0 = 0000037C /* 00080 80AC9FA0 24090010 */ addiu $t1, $zero, 0x0010 ## $t1 = 00000010 -/* 00084 80AC9FA4 AFA90018 */ sw $t1, 0x0018($sp) -/* 00088 80AC9FA8 AFA80014 */ sw $t0, 0x0014($sp) -/* 0008C 80AC9FAC AFB90010 */ sw $t9, 0x0010($sp) +/* 00084 80AC9FA4 AFA90018 */ sw $t1, 0x0018($sp) +/* 00088 80AC9FA8 AFA80014 */ sw $t0, 0x0014($sp) +/* 0008C 80AC9FAC AFB90010 */ sw $t9, 0x0010($sp) /* 00090 80AC9FB0 24E7C8A0 */ addiu $a3, $a3, 0xC8A0 ## $a3 = 0600C8A0 /* 00094 80AC9FB4 24C600B0 */ addiu $a2, $a2, 0x00B0 ## $a2 = 060100B0 -/* 00098 80AC9FB8 AFA50034 */ sw $a1, 0x0034($sp) -/* 0009C 80AC9FBC 0C0291BE */ jal func_800A46F8 -/* 000A0 80AC9FC0 8FA40054 */ lw $a0, 0x0054($sp) +/* 00098 80AC9FB8 AFA50034 */ sw $a1, 0x0034($sp) +/* 0009C 80AC9FBC 0C0291BE */ jal SkelAnime_InitSV +/* 000A0 80AC9FC0 8FA40054 */ lw $a0, 0x0054($sp) /* 000A4 80AC9FC4 2605014C */ addiu $a1, $s0, 0x014C ## $a1 = 0000014C -/* 000A8 80AC9FC8 AFA50038 */ sw $a1, 0x0038($sp) +/* 000A8 80AC9FC8 AFA50038 */ sw $a1, 0x0038($sp) /* 000AC 80AC9FCC 0C0170D9 */ jal ActorCollider_AllocCylinder - -/* 000B0 80AC9FD0 8FA40054 */ lw $a0, 0x0054($sp) + +/* 000B0 80AC9FD0 8FA40054 */ lw $a0, 0x0054($sp) /* 000B4 80AC9FD4 3C0780AD */ lui $a3, %hi(D_80ACD5F0) ## $a3 = 80AD0000 -/* 000B8 80AC9FD8 8FA50038 */ lw $a1, 0x0038($sp) +/* 000B8 80AC9FD8 8FA50038 */ lw $a1, 0x0038($sp) /* 000BC 80AC9FDC 24E7D5F0 */ addiu $a3, $a3, %lo(D_80ACD5F0) ## $a3 = 80ACD5F0 -/* 000C0 80AC9FE0 8FA40054 */ lw $a0, 0x0054($sp) +/* 000C0 80AC9FE0 8FA40054 */ lw $a0, 0x0054($sp) /* 000C4 80AC9FE4 0C01712B */ jal ActorCollider_InitCylinder - + /* 000C8 80AC9FE8 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 000CC 80AC9FEC 3C01C120 */ lui $at, 0xC120 ## $at = C1200000 /* 000D0 80AC9FF0 44812000 */ mtc1 $at, $f4 ## $f4 = -10.00 @@ -69,12 +69,12 @@ glabel EnOwl_Init /* 000FC 80ACA01C 24A5BA24 */ addiu $a1, $a1, %lo(func_80ACBA24) ## $a1 = 80ACBA24 /* 00100 80ACA020 3C0680AD */ lui $a2, %hi(func_80ACC540) ## $a2 = 80AD0000 /* 00104 80ACA024 24C6C540 */ addiu $a2, $a2, %lo(func_80ACC540) ## $a2 = 80ACC540 -/* 00108 80ACA028 AFA50038 */ sw $a1, 0x0038($sp) -/* 0010C 80ACA02C AFAB0010 */ sw $t3, 0x0010($sp) -/* 00110 80ACA030 8FA70034 */ lw $a3, 0x0034($sp) +/* 00108 80ACA028 AFA50038 */ sw $a1, 0x0038($sp) +/* 0010C 80ACA02C AFAB0010 */ sw $t3, 0x0010($sp) +/* 00110 80ACA030 8FA70034 */ lw $a3, 0x0034($sp) /* 00114 80ACA034 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00118 80ACA038 0C2B342E */ jal func_80ACD0B8 -/* 0011C 80ACA03C E7A80014 */ swc1 $f8, 0x0014($sp) +/* 00118 80ACA038 0C2B342E */ jal func_80ACD0B8 +/* 0011C 80ACA03C E7A80014 */ swc1 $f8, 0x0014($sp) /* 00120 80ACA040 8605001C */ lh $a1, 0x001C($s0) ## 0000001C /* 00124 80ACA044 24030004 */ addiu $v1, $zero, 0x0004 ## $v1 = 00000004 /* 00128 80ACA048 300200FF */ andi $v0, $zero, 0x00FF ## $v0 = 00000000 @@ -87,65 +87,65 @@ glabel EnOwl_Init /* 00144 80ACA064 A2000407 */ sb $zero, 0x0407($s0) ## 00000407 /* 00148 80ACA068 A2000404 */ sb $zero, 0x0404($s0) ## 00000404 /* 0014C 80ACA06C A2030408 */ sb $v1, 0x0408($s0) ## 00000408 -/* 00150 80ACA070 00063183 */ sra $a2, $a2, 6 -/* 00154 80ACA074 14A10003 */ bne $a1, $at, .L80ACA084 +/* 00150 80ACA070 00063183 */ sra $a2, $a2, 6 +/* 00154 80ACA074 14A10003 */ bne $a1, $at, .L80ACA084 /* 00158 80ACA078 30A7003F */ andi $a3, $a1, 0x003F ## $a3 = 00000000 /* 0015C 80ACA07C 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 /* 00160 80ACA080 24070020 */ addiu $a3, $zero, 0x0020 ## $a3 = 00000020 .L80ACA084: /* 00164 80ACA084 3C0480AD */ lui $a0, %hi(D_80ACD650) ## $a0 = 80AD0000 /* 00168 80ACA088 2484D650 */ addiu $a0, $a0, %lo(D_80ACD650) ## $a0 = 80ACD650 -/* 0016C 80ACA08C AFA60044 */ sw $a2, 0x0044($sp) +/* 0016C 80ACA08C AFA60044 */ sw $a2, 0x0044($sp) /* 00170 80ACA090 0C00084C */ jal osSyncPrintf - -/* 00174 80ACA094 AFA70040 */ sw $a3, 0x0040($sp) -/* 00178 80ACA098 8FA60044 */ lw $a2, 0x0044($sp) -/* 0017C 80ACA09C 8FA70040 */ lw $a3, 0x0040($sp) -/* 00180 80ACA0A0 10C00010 */ beq $a2, $zero, .L80ACA0E4 -/* 00184 80ACA0A4 28E10020 */ slti $at, $a3, 0x0020 -/* 00188 80ACA0A8 5020000F */ beql $at, $zero, .L80ACA0E8 + +/* 00174 80ACA094 AFA70040 */ sw $a3, 0x0040($sp) +/* 00178 80ACA098 8FA60044 */ lw $a2, 0x0044($sp) +/* 0017C 80ACA09C 8FA70040 */ lw $a3, 0x0040($sp) +/* 00180 80ACA0A0 10C00010 */ beq $a2, $zero, .L80ACA0E4 +/* 00184 80ACA0A4 28E10020 */ slti $at, $a3, 0x0020 +/* 00188 80ACA0A8 5020000F */ beql $at, $zero, .L80ACA0E8 /* 0018C 80ACA0AC 860D0032 */ lh $t5, 0x0032($s0) ## 00000032 -/* 00190 80ACA0B0 8FA40054 */ lw $a0, 0x0054($sp) +/* 00190 80ACA0B0 8FA40054 */ lw $a0, 0x0054($sp) /* 00194 80ACA0B4 00E02825 */ or $a1, $a3, $zero ## $a1 = 00000000 /* 00198 80ACA0B8 0C00B2D0 */ jal Flags_GetSwitch - -/* 0019C 80ACA0BC AFA60044 */ sw $a2, 0x0044($sp) -/* 001A0 80ACA0C0 10400008 */ beq $v0, $zero, .L80ACA0E4 -/* 001A4 80ACA0C4 8FA60044 */ lw $a2, 0x0044($sp) + +/* 0019C 80ACA0BC AFA60044 */ sw $a2, 0x0044($sp) +/* 001A0 80ACA0C0 10400008 */ beq $v0, $zero, .L80ACA0E4 +/* 001A4 80ACA0C4 8FA60044 */ lw $a2, 0x0044($sp) /* 001A8 80ACA0C8 3C0480AD */ lui $a0, %hi(D_80ACD67C) ## $a0 = 80AD0000 /* 001AC 80ACA0CC 0C00084C */ jal osSyncPrintf - + /* 001B0 80ACA0D0 2484D67C */ addiu $a0, $a0, %lo(D_80ACD67C) ## $a0 = 80ACD67C /* 001B4 80ACA0D4 0C00B55C */ jal Actor_Kill - + /* 001B8 80ACA0D8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 001BC 80ACA0DC 100000A8 */ beq $zero, $zero, .L80ACA380 -/* 001C0 80ACA0E0 8FBF002C */ lw $ra, 0x002C($sp) +/* 001BC 80ACA0DC 100000A8 */ beq $zero, $zero, .L80ACA380 +/* 001C0 80ACA0E0 8FBF002C */ lw $ra, 0x002C($sp) .L80ACA0E4: /* 001C4 80ACA0E4 860D0032 */ lh $t5, 0x0032($s0) ## 00000032 .L80ACA0E8: -/* 001C8 80ACA0E8 2CC1000D */ sltiu $at, $a2, 0x000D +/* 001C8 80ACA0E8 2CC1000D */ sltiu $at, $a2, 0x000D /* 001CC 80ACA0EC A60003EE */ sh $zero, 0x03EE($s0) ## 000003EE -/* 001D0 80ACA0F0 1020008C */ beq $at, $zero, .L80ACA324 +/* 001D0 80ACA0F0 1020008C */ beq $at, $zero, .L80ACA324 /* 001D4 80ACA0F4 A60D0400 */ sh $t5, 0x0400($s0) ## 00000400 -/* 001D8 80ACA0F8 00067080 */ sll $t6, $a2, 2 +/* 001D8 80ACA0F8 00067080 */ sll $t6, $a2, 2 /* 001DC 80ACA0FC 3C0180AD */ lui $at, %hi(jtbl_80ACD7FC) ## $at = 80AD0000 -/* 001E0 80ACA100 002E0821 */ addu $at, $at, $t6 -/* 001E4 80ACA104 8C2ED7FC */ lw $t6, %lo(jtbl_80ACD7FC)($at) -/* 001E8 80ACA108 01C00008 */ jr $t6 +/* 001E0 80ACA100 002E0821 */ addu $at, $at, $t6 +/* 001E4 80ACA104 8C2ED7FC */ lw $t6, %lo(jtbl_80ACD7FC)($at) +/* 001E8 80ACA108 01C00008 */ jr $t6 /* 001EC 80ACA10C 00000000 */ nop glabel L80ACA110 /* 001F0 80ACA110 3C01457A */ lui $at, 0x457A ## $at = 457A0000 -/* 001F4 80ACA114 8FAF0038 */ lw $t7, 0x0038($sp) +/* 001F4 80ACA114 8FAF0038 */ lw $t7, 0x0038($sp) /* 001F8 80ACA118 44815000 */ mtc1 $at, $f10 ## $f10 = 4000.00 /* 001FC 80ACA11C A200040A */ sb $zero, 0x040A($s0) ## 0000040A /* 00200 80ACA120 AE0F040C */ sw $t7, 0x040C($s0) ## 0000040C -/* 00204 80ACA124 10000095 */ beq $zero, $zero, .L80ACA37C +/* 00204 80ACA124 10000095 */ beq $zero, $zero, .L80ACA37C /* 00208 80ACA128 E60A00F4 */ swc1 $f10, 0x00F4($s0) ## 000000F4 glabel L80ACA12C /* 0020C 80ACA12C 3C1880AD */ lui $t8, %hi(func_80ACA928) ## $t8 = 80AD0000 /* 00210 80ACA130 2718A928 */ addiu $t8, $t8, %lo(func_80ACA928) ## $t8 = 80ACA928 -/* 00214 80ACA134 10000091 */ beq $zero, $zero, .L80ACA37C +/* 00214 80ACA134 10000091 */ beq $zero, $zero, .L80ACA37C /* 00218 80ACA138 AE18040C */ sw $t8, 0x040C($s0) ## 0000040C glabel L80ACA13C /* 0021C 80ACA13C 961903FC */ lhu $t9, 0x03FC($s0) ## 000003FC @@ -155,7 +155,7 @@ glabel L80ACA13C /* 0022C 80ACA14C 37280002 */ ori $t0, $t9, 0x0002 ## $t0 = 00000002 /* 00230 80ACA150 A60803FC */ sh $t0, 0x03FC($s0) ## 000003FC /* 00234 80ACA154 A60903EE */ sh $t1, 0x03EE($s0) ## 000003EE -/* 00238 80ACA158 10000088 */ beq $zero, $zero, .L80ACA37C +/* 00238 80ACA158 10000088 */ beq $zero, $zero, .L80ACA37C /* 0023C 80ACA15C AE0A040C */ sw $t2, 0x040C($s0) ## 0000040C glabel L80ACA160 /* 00240 80ACA160 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 @@ -164,18 +164,18 @@ glabel L80ACA160 /* 0024C 80ACA16C 3C0D80AD */ lui $t5, %hi(func_80ACACD8) ## $t5 = 80AD0000 /* 00250 80ACA170 3C0480AD */ lui $a0, %hi(D_80ACD694) ## $a0 = 80AD0000 /* 00254 80ACA174 316C0001 */ andi $t4, $t3, 0x0001 ## $t4 = 00000000 -/* 00258 80ACA178 11800007 */ beq $t4, $zero, .L80ACA198 +/* 00258 80ACA178 11800007 */ beq $t4, $zero, .L80ACA198 /* 0025C 80ACA17C 25ADACD8 */ addiu $t5, $t5, %lo(func_80ACACD8) ## $t5 = 80ACACD8 /* 00260 80ACA180 0C00084C */ jal osSyncPrintf - + /* 00264 80ACA184 2484D694 */ addiu $a0, $a0, %lo(D_80ACD694) ## $a0 = 80ACD694 /* 00268 80ACA188 0C00B55C */ jal Actor_Kill - + /* 0026C 80ACA18C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00270 80ACA190 1000007B */ beq $zero, $zero, .L80ACA380 -/* 00274 80ACA194 8FBF002C */ lw $ra, 0x002C($sp) +/* 00270 80ACA190 1000007B */ beq $zero, $zero, .L80ACA380 +/* 00274 80ACA194 8FBF002C */ lw $ra, 0x002C($sp) .L80ACA198: -/* 00278 80ACA198 10000078 */ beq $zero, $zero, .L80ACA37C +/* 00278 80ACA198 10000078 */ beq $zero, $zero, .L80ACA37C /* 0027C 80ACA19C AE0D040C */ sw $t5, 0x040C($s0) ## 0000040C glabel L80ACA1A0 /* 00280 80ACA1A0 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 @@ -184,23 +184,23 @@ glabel L80ACA1A0 /* 0028C 80ACA1AC 3C1880AD */ lui $t8, %hi(func_80ACAE5C) ## $t8 = 80AD0000 /* 00290 80ACA1B0 3C0480AD */ lui $a0, %hi(D_80ACD6A4) ## $a0 = 80AD0000 /* 00294 80ACA1B4 31CF0008 */ andi $t7, $t6, 0x0008 ## $t7 = 00000000 -/* 00298 80ACA1B8 11E00007 */ beq $t7, $zero, .L80ACA1D8 +/* 00298 80ACA1B8 11E00007 */ beq $t7, $zero, .L80ACA1D8 /* 0029C 80ACA1BC 2718AE5C */ addiu $t8, $t8, %lo(func_80ACAE5C) ## $t8 = 80ACAE5C /* 002A0 80ACA1C0 0C00084C */ jal osSyncPrintf - + /* 002A4 80ACA1C4 2484D6A4 */ addiu $a0, $a0, %lo(D_80ACD6A4) ## $a0 = 80ACD6A4 /* 002A8 80ACA1C8 0C00B55C */ jal Actor_Kill - + /* 002AC 80ACA1CC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 002B0 80ACA1D0 1000006B */ beq $zero, $zero, .L80ACA380 -/* 002B4 80ACA1D4 8FBF002C */ lw $ra, 0x002C($sp) +/* 002B0 80ACA1D0 1000006B */ beq $zero, $zero, .L80ACA380 +/* 002B4 80ACA1D4 8FBF002C */ lw $ra, 0x002C($sp) .L80ACA1D8: -/* 002B8 80ACA1D8 10000068 */ beq $zero, $zero, .L80ACA37C +/* 002B8 80ACA1D8 10000068 */ beq $zero, $zero, .L80ACA37C /* 002BC 80ACA1DC AE18040C */ sw $t8, 0x040C($s0) ## 0000040C glabel L80ACA1E0 /* 002C0 80ACA1E0 3C1980AD */ lui $t9, %hi(func_80ACAFE0) ## $t9 = 80AD0000 /* 002C4 80ACA1E4 2739AFE0 */ addiu $t9, $t9, %lo(func_80ACAFE0) ## $t9 = 80ACAFE0 -/* 002C8 80ACA1E8 10000064 */ beq $zero, $zero, .L80ACA37C +/* 002C8 80ACA1E8 10000064 */ beq $zero, $zero, .L80ACA37C /* 002CC 80ACA1EC AE19040C */ sw $t9, 0x040C($s0) ## 0000040C glabel L80ACA1F0 /* 002D0 80ACA1F0 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 @@ -208,50 +208,50 @@ glabel L80ACA1F0 /* 002D8 80ACA1F8 94480EDA */ lhu $t0, 0x0EDA($v0) ## 8015F53A /* 002DC 80ACA1FC 3C0480AD */ lui $a0, %hi(D_80ACD6B4) ## $a0 = 80AD0000 /* 002E0 80ACA200 31090200 */ andi $t1, $t0, 0x0200 ## $t1 = 00000000 -/* 002E4 80ACA204 15200007 */ bne $t1, $zero, .L80ACA224 +/* 002E4 80ACA204 15200007 */ bne $t1, $zero, .L80ACA224 /* 002E8 80ACA208 00000000 */ nop /* 002EC 80ACA20C 944A0EDC */ lhu $t2, 0x0EDC($v0) ## 8015F53C /* 002F0 80ACA210 3C0C80AD */ lui $t4, %hi(func_80ACB0B0) ## $t4 = 80AD0000 /* 002F4 80ACA214 258CB0B0 */ addiu $t4, $t4, %lo(func_80ACB0B0) ## $t4 = 80ACB0B0 /* 002F8 80ACA218 314B0001 */ andi $t3, $t2, 0x0001 ## $t3 = 00000000 -/* 002FC 80ACA21C 15600007 */ bne $t3, $zero, .L80ACA23C +/* 002FC 80ACA21C 15600007 */ bne $t3, $zero, .L80ACA23C /* 00300 80ACA220 00000000 */ nop .L80ACA224: /* 00304 80ACA224 0C00084C */ jal osSyncPrintf - + /* 00308 80ACA228 2484D6B4 */ addiu $a0, $a0, %lo(D_80ACD6B4) ## $a0 = 80ACD6B4 /* 0030C 80ACA22C 0C00B55C */ jal Actor_Kill - + /* 00310 80ACA230 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00314 80ACA234 10000052 */ beq $zero, $zero, .L80ACA380 -/* 00318 80ACA238 8FBF002C */ lw $ra, 0x002C($sp) +/* 00314 80ACA234 10000052 */ beq $zero, $zero, .L80ACA380 +/* 00318 80ACA238 8FBF002C */ lw $ra, 0x002C($sp) .L80ACA23C: -/* 0031C 80ACA23C 1000004F */ beq $zero, $zero, .L80ACA37C +/* 0031C 80ACA23C 1000004F */ beq $zero, $zero, .L80ACA37C /* 00320 80ACA240 AE0C040C */ sw $t4, 0x040C($s0) ## 0000040C glabel L80ACA244 /* 00324 80ACA244 3C0D80AD */ lui $t5, %hi(func_80ACB1A0) ## $t5 = 80AD0000 /* 00328 80ACA248 25ADB1A0 */ addiu $t5, $t5, %lo(func_80ACB1A0) ## $t5 = 80ACB1A0 /* 0032C 80ACA24C AE0D040C */ sw $t5, 0x040C($s0) ## 0000040C -/* 00330 80ACA250 8FA40054 */ lw $a0, 0x0054($sp) +/* 00330 80ACA250 8FA40054 */ lw $a0, 0x0054($sp) /* 00334 80ACA254 0C00B2ED */ jal Flags_UnsetSwitch - + /* 00338 80ACA258 24050023 */ addiu $a1, $zero, 0x0023 ## $a1 = 00000023 -/* 0033C 80ACA25C 10000048 */ beq $zero, $zero, .L80ACA380 -/* 00340 80ACA260 8FBF002C */ lw $ra, 0x002C($sp) +/* 0033C 80ACA25C 10000048 */ beq $zero, $zero, .L80ACA380 +/* 00340 80ACA260 8FBF002C */ lw $ra, 0x002C($sp) glabel L80ACA264 /* 00344 80ACA264 3C0E80AD */ lui $t6, %hi(func_80ACB2B4) ## $t6 = 80AD0000 /* 00348 80ACA268 25CEB2B4 */ addiu $t6, $t6, %lo(func_80ACB2B4) ## $t6 = 80ACB2B4 -/* 0034C 80ACA26C 10000043 */ beq $zero, $zero, .L80ACA37C +/* 0034C 80ACA26C 10000043 */ beq $zero, $zero, .L80ACA37C /* 00350 80ACA270 AE0E040C */ sw $t6, 0x040C($s0) ## 0000040C glabel L80ACA274 /* 00354 80ACA274 3C0F80AD */ lui $t7, %hi(func_80ACB2B4) ## $t7 = 80AD0000 /* 00358 80ACA278 25EFB2B4 */ addiu $t7, $t7, %lo(func_80ACB2B4) ## $t7 = 80ACB2B4 -/* 0035C 80ACA27C 1000003F */ beq $zero, $zero, .L80ACA37C +/* 0035C 80ACA27C 1000003F */ beq $zero, $zero, .L80ACA37C /* 00360 80ACA280 AE0F040C */ sw $t7, 0x040C($s0) ## 0000040C glabel L80ACA284 /* 00364 80ACA284 3C1880AD */ lui $t8, %hi(func_80ACB3E0) ## $t8 = 80AD0000 /* 00368 80ACA288 2718B3E0 */ addiu $t8, $t8, %lo(func_80ACB3E0) ## $t8 = 80ACB3E0 -/* 0036C 80ACA28C 1000003B */ beq $zero, $zero, .L80ACA37C +/* 0036C 80ACA28C 1000003B */ beq $zero, $zero, .L80ACA37C /* 00370 80ACA290 AE18040C */ sw $t8, 0x040C($s0) ## 0000040C glabel L80ACA294 /* 00374 80ACA294 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 @@ -261,19 +261,19 @@ glabel L80ACA294 /* 00384 80ACA2A4 8C4800A4 */ lw $t0, 0x00A4($v0) ## 8015E704 /* 00388 80ACA2A8 3C0A80AD */ lui $t2, %hi(func_80ACB568) ## $t2 = 80AD0000 /* 0038C 80ACA2AC 3C0480AD */ lui $a0, %hi(D_80ACD6C4) ## $a0 = 80AD0000 -/* 00390 80ACA2B0 03284824 */ and $t1, $t9, $t0 -/* 00394 80ACA2B4 15200007 */ bne $t1, $zero, .L80ACA2D4 +/* 00390 80ACA2B0 03284824 */ and $t1, $t9, $t0 +/* 00394 80ACA2B4 15200007 */ bne $t1, $zero, .L80ACA2D4 /* 00398 80ACA2B8 254AB568 */ addiu $t2, $t2, %lo(func_80ACB568) ## $t2 = 80ACB568 /* 0039C 80ACA2BC 0C00084C */ jal osSyncPrintf - + /* 003A0 80ACA2C0 2484D6C4 */ addiu $a0, $a0, %lo(D_80ACD6C4) ## $a0 = 80ACD6C4 /* 003A4 80ACA2C4 0C00B55C */ jal Actor_Kill - + /* 003A8 80ACA2C8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 003AC 80ACA2CC 1000002C */ beq $zero, $zero, .L80ACA380 -/* 003B0 80ACA2D0 8FBF002C */ lw $ra, 0x002C($sp) +/* 003AC 80ACA2CC 1000002C */ beq $zero, $zero, .L80ACA380 +/* 003B0 80ACA2D0 8FBF002C */ lw $ra, 0x002C($sp) .L80ACA2D4: -/* 003B4 80ACA2D4 10000029 */ beq $zero, $zero, .L80ACA37C +/* 003B4 80ACA2D4 10000029 */ beq $zero, $zero, .L80ACA37C /* 003B8 80ACA2D8 AE0A040C */ sw $t2, 0x040C($s0) ## 0000040C glabel L80ACA2DC /* 003BC 80ACA2DC 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 @@ -283,38 +283,38 @@ glabel L80ACA2DC /* 003CC 80ACA2EC 8C4C00A4 */ lw $t4, 0x00A4($v0) ## 8015E704 /* 003D0 80ACA2F0 3C0E80AD */ lui $t6, %hi(func_80ACB6EC) ## $t6 = 80AD0000 /* 003D4 80ACA2F4 3C0480AD */ lui $a0, %hi(D_80ACD6D4) ## $a0 = 80AD0000 -/* 003D8 80ACA2F8 016C6824 */ and $t5, $t3, $t4 -/* 003DC 80ACA2FC 15A00007 */ bne $t5, $zero, .L80ACA31C +/* 003D8 80ACA2F8 016C6824 */ and $t5, $t3, $t4 +/* 003DC 80ACA2FC 15A00007 */ bne $t5, $zero, .L80ACA31C /* 003E0 80ACA300 25CEB6EC */ addiu $t6, $t6, %lo(func_80ACB6EC) ## $t6 = 80ACB6EC /* 003E4 80ACA304 0C00084C */ jal osSyncPrintf - + /* 003E8 80ACA308 2484D6D4 */ addiu $a0, $a0, %lo(D_80ACD6D4) ## $a0 = 80ACD6D4 /* 003EC 80ACA30C 0C00B55C */ jal Actor_Kill - + /* 003F0 80ACA310 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 003F4 80ACA314 1000001A */ beq $zero, $zero, .L80ACA380 -/* 003F8 80ACA318 8FBF002C */ lw $ra, 0x002C($sp) +/* 003F4 80ACA314 1000001A */ beq $zero, $zero, .L80ACA380 +/* 003F8 80ACA318 8FBF002C */ lw $ra, 0x002C($sp) .L80ACA31C: -/* 003FC 80ACA31C 10000017 */ beq $zero, $zero, .L80ACA37C +/* 003FC 80ACA31C 10000017 */ beq $zero, $zero, .L80ACA37C /* 00400 80ACA320 AE0E040C */ sw $t6, 0x040C($s0) ## 0000040C .L80ACA324: /* 00404 80ACA324 3C0480AD */ lui $a0, %hi(D_80ACD6E4) ## $a0 = 80AD0000 /* 00408 80ACA328 2484D6E4 */ addiu $a0, $a0, %lo(D_80ACD6E4) ## $a0 = 80ACD6E4 /* 0040C 80ACA32C 0C00084C */ jal osSyncPrintf - -/* 00410 80ACA330 AFA60044 */ sw $a2, 0x0044($sp) + +/* 00410 80ACA330 AFA60044 */ sw $a2, 0x0044($sp) /* 00414 80ACA334 3C0480AD */ lui $a0, %hi(D_80ACD6EC) ## $a0 = 80AD0000 -/* 00418 80ACA338 8FA50044 */ lw $a1, 0x0044($sp) +/* 00418 80ACA338 8FA50044 */ lw $a1, 0x0044($sp) /* 0041C 80ACA33C 0C00084C */ jal osSyncPrintf - + /* 00420 80ACA340 2484D6EC */ addiu $a0, $a0, %lo(D_80ACD6EC) ## $a0 = 80ACD6EC /* 00424 80ACA344 3C0480AD */ lui $a0, %hi(D_80ACD6F8) ## $a0 = 80AD0000 /* 00428 80ACA348 0C00084C */ jal osSyncPrintf - + /* 0042C 80ACA34C 2484D6F8 */ addiu $a0, $a0, %lo(D_80ACD6F8) ## $a0 = 80ACD6F8 /* 00430 80ACA350 3C0480AD */ lui $a0, %hi(D_80ACD72C) ## $a0 = 80AD0000 /* 00434 80ACA354 0C00084C */ jal osSyncPrintf - + /* 00438 80ACA358 2484D72C */ addiu $a0, $a0, %lo(D_80ACD72C) ## $a0 = 80ACD72C /* 0043C 80ACA35C 960F03FC */ lhu $t7, 0x03FC($s0) ## 000003FC /* 00440 80ACA360 3C0880AD */ lui $t0, %hi(func_80ACA928) ## $t0 = 80AD0000 @@ -325,11 +325,11 @@ glabel L80ACA2DC /* 00454 80ACA374 A61903EE */ sh $t9, 0x03EE($s0) ## 000003EE /* 00458 80ACA378 AE08040C */ sw $t0, 0x040C($s0) ## 0000040C .L80ACA37C: -/* 0045C 80ACA37C 8FBF002C */ lw $ra, 0x002C($sp) +/* 0045C 80ACA37C 8FBF002C */ lw $ra, 0x002C($sp) .L80ACA380: -/* 00460 80ACA380 8FB00028 */ lw $s0, 0x0028($sp) +/* 00460 80ACA380 8FB00028 */ lw $s0, 0x0028($sp) /* 00464 80ACA384 27BD0050 */ addiu $sp, $sp, 0x0050 ## $sp = 00000000 -/* 00468 80ACA388 03E00008 */ jr $ra +/* 00468 80ACA388 03E00008 */ jr $ra /* 0046C 80ACA38C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACC390.s b/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACC390.s index dda7f8d69b..45ee227f7a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACC390.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACC390.s @@ -1,61 +1,61 @@ glabel func_80ACC390 /* 02470 80ACC390 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 02474 80ACC394 AFB00028 */ sw $s0, 0x0028($sp) +/* 02474 80ACC394 AFB00028 */ sw $s0, 0x0028($sp) /* 02478 80ACC398 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 0247C 80ACC39C AFBF002C */ sw $ra, 0x002C($sp) +/* 0247C 80ACC39C AFBF002C */ sw $ra, 0x002C($sp) /* 02480 80ACC3A0 0C02927F */ jal SkelAnime_FrameUpdateMatrix - + /* 02484 80ACC3A4 8C8403DC */ lw $a0, 0x03DC($a0) ## 000003DC /* 02488 80ACC3A8 960303FE */ lhu $v1, 0x03FE($s0) ## 000003FE /* 0248C 80ACC3AC 3C1980AD */ lui $t9, %hi(func_80ACC460) ## $t9 = 80AD0000 /* 02490 80ACC3B0 2739C460 */ addiu $t9, $t9, %lo(func_80ACC460) ## $t9 = 80ACC460 -/* 02494 80ACC3B4 18600012 */ blez $v1, .L80ACC400 +/* 02494 80ACC3B4 18600012 */ blez $v1, .L80ACC400 /* 02498 80ACC3B8 24080006 */ addiu $t0, $zero, 0x0006 ## $t0 = 00000006 /* 0249C 80ACC3BC 246EFFFF */ addiu $t6, $v1, 0xFFFF ## $t6 = FFFFFFFF /* 024A0 80ACC3C0 31C4FFFF */ andi $a0, $t6, 0xFFFF ## $a0 = 0000FFFF /* 024A4 80ACC3C4 24010333 */ addiu $at, $zero, 0x0333 ## $at = 00000333 -/* 024A8 80ACC3C8 00810019 */ multu $a0, $at +/* 024A8 80ACC3C8 00810019 */ multu $a0, $at /* 024AC 80ACC3CC A60E03FE */ sh $t6, 0x03FE($s0) ## 000003FE -/* 024B0 80ACC3D0 00002012 */ mflo $a0 -/* 024B4 80ACC3D4 00042400 */ sll $a0, $a0, 16 +/* 024B0 80ACC3D0 00002012 */ mflo $a0 +/* 024B4 80ACC3D4 00042400 */ sll $a0, $a0, 16 /* 024B8 80ACC3D8 0C01DE1C */ jal Math_Sins ## sins? -/* 024BC 80ACC3DC 00042403 */ sra $a0, $a0, 16 +/* 024BC 80ACC3DC 00042403 */ sra $a0, $a0, 16 /* 024C0 80ACC3E0 3C01447A */ lui $at, 0x447A ## $at = 447A0000 /* 024C4 80ACC3E4 44812000 */ mtc1 $at, $f4 ## $f4 = 1000.00 /* 024C8 80ACC3E8 00000000 */ nop -/* 024CC 80ACC3EC 46040182 */ mul.s $f6, $f0, $f4 -/* 024D0 80ACC3F0 4600320D */ trunc.w.s $f8, $f6 -/* 024D4 80ACC3F4 44184000 */ mfc1 $t8, $f8 -/* 024D8 80ACC3F8 10000014 */ beq $zero, $zero, .L80ACC44C +/* 024CC 80ACC3EC 46040182 */ mul.s $f6, $f0, $f4 +/* 024D0 80ACC3F0 4600320D */ trunc.w.s $f8, $f6 +/* 024D4 80ACC3F4 44184000 */ mfc1 $t8, $f8 +/* 024D8 80ACC3F8 10000014 */ beq $zero, $zero, .L80ACC44C /* 024DC 80ACC3FC A61800B8 */ sh $t8, 0x00B8($s0) ## 000000B8 .L80ACC400: /* 024E0 80ACC400 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 /* 024E4 80ACC404 AE190410 */ sw $t9, 0x0410($s0) ## 00000410 /* 024E8 80ACC408 A60803FE */ sh $t0, 0x03FE($s0) ## 000003FE /* 024EC 80ACC40C 0C028800 */ jal SkelAnime_GetFrameCount - + /* 024F0 80ACC410 248415CC */ addiu $a0, $a0, 0x15CC ## $a0 = 060015CC /* 024F4 80ACC414 44825000 */ mtc1 $v0, $f10 ## $f10 = 0.00 /* 024F8 80ACC418 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 /* 024FC 80ACC41C 44819000 */ mtc1 $at, $f18 ## $f18 = 5.00 -/* 02500 80ACC420 46805420 */ cvt.s.w $f16, $f10 +/* 02500 80ACC420 46805420 */ cvt.s.w $f16, $f10 /* 02504 80ACC424 8E0403DC */ lw $a0, 0x03DC($s0) ## 000003DC /* 02508 80ACC428 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 0250C 80ACC42C 24090002 */ addiu $t1, $zero, 0x0002 ## $t1 = 00000002 -/* 02510 80ACC430 AFA90014 */ sw $t1, 0x0014($sp) +/* 02510 80ACC430 AFA90014 */ sw $t1, 0x0014($sp) /* 02514 80ACC434 24A515CC */ addiu $a1, $a1, 0x15CC ## $a1 = 060015CC -/* 02518 80ACC438 E7B00010 */ swc1 $f16, 0x0010($sp) +/* 02518 80ACC438 E7B00010 */ swc1 $f16, 0x0010($sp) /* 0251C 80ACC43C 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 02520 80ACC440 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 02524 80ACC444 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 02528 80ACC448 E7B20018 */ swc1 $f18, 0x0018($sp) +/* 02524 80ACC444 0C029468 */ jal SkelAnime_ChangeAnim + +/* 02528 80ACC448 E7B20018 */ swc1 $f18, 0x0018($sp) .L80ACC44C: -/* 0252C 80ACC44C 8FBF002C */ lw $ra, 0x002C($sp) -/* 02530 80ACC450 8FB00028 */ lw $s0, 0x0028($sp) +/* 0252C 80ACC44C 8FBF002C */ lw $ra, 0x002C($sp) +/* 02530 80ACC450 8FB00028 */ lw $s0, 0x0028($sp) /* 02534 80ACC454 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 02538 80ACC458 03E00008 */ jr $ra +/* 02538 80ACC458 03E00008 */ jr $ra /* 0253C 80ACC45C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACC460.s b/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACC460.s index 85165e6513..c858d77bbf 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACC460.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACC460.s @@ -1,66 +1,66 @@ glabel func_80ACC460 /* 02540 80ACC460 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 02544 80ACC464 AFB00028 */ sw $s0, 0x0028($sp) +/* 02544 80ACC464 AFB00028 */ sw $s0, 0x0028($sp) /* 02548 80ACC468 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 0254C 80ACC46C AFBF002C */ sw $ra, 0x002C($sp) +/* 0254C 80ACC46C AFBF002C */ sw $ra, 0x002C($sp) /* 02550 80ACC470 0C02927F */ jal SkelAnime_FrameUpdateMatrix - + /* 02554 80ACC474 8C8403DC */ lw $a0, 0x03DC($a0) ## 000003DC -/* 02558 80ACC478 5040002D */ beql $v0, $zero, .L80ACC530 -/* 0255C 80ACC47C 8FBF002C */ lw $ra, 0x002C($sp) +/* 02558 80ACC478 5040002D */ beql $v0, $zero, .L80ACC530 +/* 0255C 80ACC47C 8FBF002C */ lw $ra, 0x002C($sp) /* 02560 80ACC480 960203FE */ lhu $v0, 0x03FE($s0) ## 000003FE /* 02564 80ACC484 3C0880AD */ lui $t0, %hi(func_80ACC390) ## $t0 = 80AD0000 /* 02568 80ACC488 241900A0 */ addiu $t9, $zero, 0x00A0 ## $t9 = 000000A0 -/* 0256C 80ACC48C 18400014 */ blez $v0, .L80ACC4E0 +/* 0256C 80ACC48C 18400014 */ blez $v0, .L80ACC4E0 /* 02570 80ACC490 2508C390 */ addiu $t0, $t0, %lo(func_80ACC390) ## $t0 = 80ACC390 /* 02574 80ACC494 8E0F03DC */ lw $t7, 0x03DC($s0) ## 000003DC /* 02578 80ACC498 244EFFFF */ addiu $t6, $v0, 0xFFFF ## $t6 = FFFFFFFF /* 0257C 80ACC49C A60E03FE */ sh $t6, 0x03FE($s0) ## 000003FE /* 02580 80ACC4A0 0C028800 */ jal SkelAnime_GetFrameCount - + /* 02584 80ACC4A4 8DE40008 */ lw $a0, 0x0008($t7) ## 00000008 /* 02588 80ACC4A8 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 0258C 80ACC4AC 8E0403DC */ lw $a0, 0x03DC($s0) ## 000003DC /* 02590 80ACC4B0 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 02594 80ACC4B4 468021A0 */ cvt.s.w $f6, $f4 +/* 02594 80ACC4B4 468021A0 */ cvt.s.w $f6, $f4 /* 02598 80ACC4B8 8C850008 */ lw $a1, 0x0008($a0) ## 00000008 /* 0259C 80ACC4BC 24180002 */ addiu $t8, $zero, 0x0002 ## $t8 = 00000002 -/* 025A0 80ACC4C0 44070000 */ mfc1 $a3, $f0 -/* 025A4 80ACC4C4 AFB80014 */ sw $t8, 0x0014($sp) +/* 025A0 80ACC4C0 44070000 */ mfc1 $a3, $f0 +/* 025A4 80ACC4C4 AFB80014 */ sw $t8, 0x0014($sp) /* 025A8 80ACC4C8 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 025AC 80ACC4CC E7A60010 */ swc1 $f6, 0x0010($sp) -/* 025B0 80ACC4D0 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 025B4 80ACC4D4 E7A00018 */ swc1 $f0, 0x0018($sp) -/* 025B8 80ACC4D8 10000015 */ beq $zero, $zero, .L80ACC530 -/* 025BC 80ACC4DC 8FBF002C */ lw $ra, 0x002C($sp) +/* 025AC 80ACC4CC E7A60010 */ swc1 $f6, 0x0010($sp) +/* 025B0 80ACC4D0 0C029468 */ jal SkelAnime_ChangeAnim + +/* 025B4 80ACC4D4 E7A00018 */ swc1 $f0, 0x0018($sp) +/* 025B8 80ACC4D8 10000015 */ beq $zero, $zero, .L80ACC530 +/* 025BC 80ACC4DC 8FBF002C */ lw $ra, 0x002C($sp) .L80ACC4E0: /* 025C0 80ACC4E0 3C040601 */ lui $a0, 0x0601 ## $a0 = 06010000 /* 025C4 80ACC4E4 A61903FE */ sh $t9, 0x03FE($s0) ## 000003FE /* 025C8 80ACC4E8 AE080410 */ sw $t0, 0x0410($s0) ## 00000410 /* 025CC 80ACC4EC 0C028800 */ jal SkelAnime_GetFrameCount - + /* 025D0 80ACC4F0 2484C1C4 */ addiu $a0, $a0, 0xC1C4 ## $a0 = 0600C1C4 /* 025D4 80ACC4F4 44824000 */ mtc1 $v0, $f8 ## $f8 = 0.00 /* 025D8 80ACC4F8 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 /* 025DC 80ACC4FC 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 -/* 025E0 80ACC500 468042A0 */ cvt.s.w $f10, $f8 +/* 025E0 80ACC500 468042A0 */ cvt.s.w $f10, $f8 /* 025E4 80ACC504 44818000 */ mtc1 $at, $f16 ## $f16 = 5.00 /* 025E8 80ACC508 8E0403DC */ lw $a0, 0x03DC($s0) ## 000003DC /* 025EC 80ACC50C 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 -/* 025F0 80ACC510 44070000 */ mfc1 $a3, $f0 +/* 025F0 80ACC510 44070000 */ mfc1 $a3, $f0 /* 025F4 80ACC514 24A5C1C4 */ addiu $a1, $a1, 0xC1C4 ## $a1 = 0600C1C4 -/* 025F8 80ACC518 AFA00014 */ sw $zero, 0x0014($sp) -/* 025FC 80ACC51C E7AA0010 */ swc1 $f10, 0x0010($sp) +/* 025F8 80ACC518 AFA00014 */ sw $zero, 0x0014($sp) +/* 025FC 80ACC51C E7AA0010 */ swc1 $f10, 0x0010($sp) /* 02600 80ACC520 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 02604 80ACC524 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 02608 80ACC528 E7B00018 */ swc1 $f16, 0x0018($sp) -/* 0260C 80ACC52C 8FBF002C */ lw $ra, 0x002C($sp) +/* 02604 80ACC524 0C029468 */ jal SkelAnime_ChangeAnim + +/* 02608 80ACC528 E7B00018 */ swc1 $f16, 0x0018($sp) +/* 0260C 80ACC52C 8FBF002C */ lw $ra, 0x002C($sp) .L80ACC530: -/* 02610 80ACC530 8FB00028 */ lw $s0, 0x0028($sp) +/* 02610 80ACC530 8FB00028 */ lw $s0, 0x0028($sp) /* 02614 80ACC534 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 02618 80ACC538 03E00008 */ jr $ra +/* 02618 80ACC538 03E00008 */ jr $ra /* 0261C 80ACC53C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACC540.s b/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACC540.s index 38c8ea3ec2..572c631051 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACC540.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACC540.s @@ -1,43 +1,43 @@ glabel func_80ACC540 /* 02620 80ACC540 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 02624 80ACC544 AFB00028 */ sw $s0, 0x0028($sp) +/* 02624 80ACC544 AFB00028 */ sw $s0, 0x0028($sp) /* 02628 80ACC548 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 0262C 80ACC54C AFBF002C */ sw $ra, 0x002C($sp) +/* 0262C 80ACC54C AFBF002C */ sw $ra, 0x002C($sp) /* 02630 80ACC550 0C02927F */ jal SkelAnime_FrameUpdateMatrix - + /* 02634 80ACC554 8C8403DC */ lw $a0, 0x03DC($a0) ## 000003DC -/* 02638 80ACC558 50400015 */ beql $v0, $zero, .L80ACC5B0 +/* 02638 80ACC558 50400015 */ beql $v0, $zero, .L80ACC5B0 /* 0263C 80ACC55C 960803FC */ lhu $t0, 0x03FC($s0) ## 000003FC /* 02640 80ACC560 8E0E03DC */ lw $t6, 0x03DC($s0) ## 000003DC /* 02644 80ACC564 0C028800 */ jal SkelAnime_GetFrameCount - + /* 02648 80ACC568 8DC40008 */ lw $a0, 0x0008($t6) ## 00000008 /* 0264C 80ACC56C 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 02650 80ACC570 8E0403DC */ lw $a0, 0x03DC($s0) ## 000003DC /* 02654 80ACC574 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 02658 80ACC578 468021A0 */ cvt.s.w $f6, $f4 +/* 02658 80ACC578 468021A0 */ cvt.s.w $f6, $f4 /* 0265C 80ACC57C 8C850008 */ lw $a1, 0x0008($a0) ## 00000008 /* 02660 80ACC580 240F0002 */ addiu $t7, $zero, 0x0002 ## $t7 = 00000002 -/* 02664 80ACC584 44070000 */ mfc1 $a3, $f0 -/* 02668 80ACC588 AFAF0014 */ sw $t7, 0x0014($sp) +/* 02664 80ACC584 44070000 */ mfc1 $a3, $f0 +/* 02668 80ACC588 AFAF0014 */ sw $t7, 0x0014($sp) /* 0266C 80ACC58C 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 02670 80ACC590 E7A60010 */ swc1 $f6, 0x0010($sp) -/* 02674 80ACC594 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 02678 80ACC598 E7A00018 */ swc1 $f0, 0x0018($sp) +/* 02670 80ACC590 E7A60010 */ swc1 $f6, 0x0010($sp) +/* 02674 80ACC594 0C029468 */ jal SkelAnime_ChangeAnim + +/* 02678 80ACC598 E7A00018 */ swc1 $f0, 0x0018($sp) /* 0267C 80ACC59C 961803FC */ lhu $t8, 0x03FC($s0) ## 000003FC /* 02680 80ACC5A0 37190001 */ ori $t9, $t8, 0x0001 ## $t9 = 00000001 -/* 02684 80ACC5A4 10000004 */ beq $zero, $zero, .L80ACC5B8 +/* 02684 80ACC5A4 10000004 */ beq $zero, $zero, .L80ACC5B8 /* 02688 80ACC5A8 A61903FC */ sh $t9, 0x03FC($s0) ## 000003FC /* 0268C 80ACC5AC 960803FC */ lhu $t0, 0x03FC($s0) ## 000003FC .L80ACC5B0: /* 02690 80ACC5B0 3109FFFE */ andi $t1, $t0, 0xFFFE ## $t1 = 00000000 /* 02694 80ACC5B4 A60903FC */ sh $t1, 0x03FC($s0) ## 000003FC .L80ACC5B8: -/* 02698 80ACC5B8 8FBF002C */ lw $ra, 0x002C($sp) -/* 0269C 80ACC5BC 8FB00028 */ lw $s0, 0x0028($sp) +/* 02698 80ACC5B8 8FBF002C */ lw $ra, 0x002C($sp) +/* 0269C 80ACC5BC 8FB00028 */ lw $s0, 0x0028($sp) /* 026A0 80ACC5C0 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 026A4 80ACC5C4 03E00008 */ jr $ra +/* 026A4 80ACC5C4 03E00008 */ jr $ra /* 026A8 80ACC5C8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACD0B8.s b/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACD0B8.s index 377156cd01..ec972dc30d 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACD0B8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Owl/func_80ACD0B8.s @@ -1,35 +1,35 @@ glabel func_80ACD0B8 /* 03198 80ACD0B8 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 0319C 80ACD0BC AFBF0024 */ sw $ra, 0x0024($sp) -/* 031A0 80ACD0C0 AFA40028 */ sw $a0, 0x0028($sp) -/* 031A4 80ACD0C4 AFA5002C */ sw $a1, 0x002C($sp) -/* 031A8 80ACD0C8 AFA60030 */ sw $a2, 0x0030($sp) +/* 0319C 80ACD0BC AFBF0024 */ sw $ra, 0x0024($sp) +/* 031A0 80ACD0C0 AFA40028 */ sw $a0, 0x0028($sp) +/* 031A4 80ACD0C4 AFA5002C */ sw $a1, 0x002C($sp) +/* 031A8 80ACD0C8 AFA60030 */ sw $a2, 0x0030($sp) /* 031AC 80ACD0CC AC8703DC */ sw $a3, 0x03DC($a0) ## 000003DC /* 031B0 80ACD0D0 0C028800 */ jal SkelAnime_GetFrameCount - -/* 031B4 80ACD0D4 8FA40038 */ lw $a0, 0x0038($sp) + +/* 031B4 80ACD0D4 8FA40038 */ lw $a0, 0x0038($sp) /* 031B8 80ACD0D8 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 -/* 031BC 80ACD0DC 8FAF0028 */ lw $t7, 0x0028($sp) -/* 031C0 80ACD0E0 C7A8003C */ lwc1 $f8, 0x003C($sp) -/* 031C4 80ACD0E4 468021A0 */ cvt.s.w $f6, $f4 +/* 031BC 80ACD0DC 8FAF0028 */ lw $t7, 0x0028($sp) +/* 031C0 80ACD0E0 C7A8003C */ lwc1 $f8, 0x003C($sp) +/* 031C4 80ACD0E4 468021A0 */ cvt.s.w $f6, $f4 /* 031C8 80ACD0E8 8DE403DC */ lw $a0, 0x03DC($t7) ## 000003DC /* 031CC 80ACD0EC 24180002 */ addiu $t8, $zero, 0x0002 ## $t8 = 00000002 -/* 031D0 80ACD0F0 AFB80014 */ sw $t8, 0x0014($sp) -/* 031D4 80ACD0F4 8FA50038 */ lw $a1, 0x0038($sp) +/* 031D0 80ACD0F0 AFB80014 */ sw $t8, 0x0014($sp) +/* 031D4 80ACD0F4 8FA50038 */ lw $a1, 0x0038($sp) /* 031D8 80ACD0F8 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 031DC 80ACD0FC E7A60010 */ swc1 $f6, 0x0010($sp) +/* 031DC 80ACD0FC E7A60010 */ swc1 $f6, 0x0010($sp) /* 031E0 80ACD100 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 031E4 80ACD104 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 031E8 80ACD108 E7A80018 */ swc1 $f8, 0x0018($sp) -/* 031EC 80ACD10C 8FA20028 */ lw $v0, 0x0028($sp) -/* 031F0 80ACD110 8FB9002C */ lw $t9, 0x002C($sp) +/* 031E4 80ACD104 0C029468 */ jal SkelAnime_ChangeAnim + +/* 031E8 80ACD108 E7A80018 */ swc1 $f8, 0x0018($sp) +/* 031EC 80ACD10C 8FA20028 */ lw $v0, 0x0028($sp) +/* 031F0 80ACD110 8FB9002C */ lw $t9, 0x002C($sp) /* 031F4 80ACD114 AC59040C */ sw $t9, 0x040C($v0) ## 0000040C -/* 031F8 80ACD118 8FA80030 */ lw $t0, 0x0030($sp) +/* 031F8 80ACD118 8FA80030 */ lw $t0, 0x0030($sp) /* 031FC 80ACD11C AC480410 */ sw $t0, 0x0410($v0) ## 00000410 -/* 03200 80ACD120 8FBF0024 */ lw $ra, 0x0024($sp) +/* 03200 80ACD120 8FBF0024 */ lw $ra, 0x0024($sp) /* 03204 80ACD124 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 03208 80ACD128 03E00008 */ jr $ra +/* 03208 80ACD128 03E00008 */ jr $ra /* 0320C 80ACD12C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Part/EnPart_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Part/EnPart_Draw.s index a4283c438a..8c15094981 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Part/EnPart_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Part/EnPart_Draw.s @@ -9,7 +9,7 @@ glabel EnPart_Draw /* 00DC8 80ACEB98 24C6F210 */ addiu $a2, $a2, %lo(D_80ACF210) ## $a2 = 80ACF210 /* 00DCC 80ACEB9C 27A40080 */ addiu $a0, $sp, 0x0080 ## $a0 = FFFFFFE8 /* 00DD0 80ACEBA0 24070287 */ addiu $a3, $zero, 0x0287 ## $a3 = 00000287 -/* 00DD4 80ACEBA4 0C031AB1 */ jal func_800C6AC4 +/* 00DD4 80ACEBA4 0C031AB1 */ jal Graph_OpenDisps /* 00DD8 80ACEBA8 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 /* 00DDC 80ACEBAC 8FAF0098 */ lw $t7, 0x0098($sp) /* 00DE0 80ACEBB0 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 @@ -388,7 +388,7 @@ glabel EnPart_Draw /* 01394 80ACF164 24C6F230 */ addiu $a2, $a2, %lo(D_80ACF230) ## $a2 = 80ACF230 /* 01398 80ACF168 27A40080 */ addiu $a0, $sp, 0x0080 ## $a0 = FFFFFFE8 /* 0139C 80ACF16C 240702BC */ addiu $a3, $zero, 0x02BC ## $a3 = 000002BC -/* 013A0 80ACF170 0C031AD5 */ jal func_800C6B54 +/* 013A0 80ACF170 0C031AD5 */ jal Graph_CloseDisps /* 013A4 80ACF174 8DE50000 */ lw $a1, 0x0000($t7) ## 00000000 /* 013A8 80ACF178 8FBF002C */ lw $ra, 0x002C($sp) /* 013AC 80ACF17C 8FB00028 */ lw $s0, 0x0028($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80ACFB34.s b/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80ACFB34.s index 313babc314..162136bb36 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80ACFB34.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80ACFB34.s @@ -1,26 +1,26 @@ glabel func_80ACFB34 /* 00694 80ACFB34 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 00698 80ACFB38 AFB00028 */ sw $s0, 0x0028($sp) +/* 00698 80ACFB38 AFB00028 */ sw $s0, 0x0028($sp) /* 0069C 80ACFB3C 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 006A0 80ACFB40 AFBF002C */ sw $ra, 0x002C($sp) +/* 006A0 80ACFB40 AFBF002C */ sw $ra, 0x002C($sp) /* 006A4 80ACFB44 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 /* 006A8 80ACFB48 0C028800 */ jal SkelAnime_GetFrameCount - + /* 006AC 80ACFB4C 248409C4 */ addiu $a0, $a0, 0x09C4 ## $a0 = 060009C4 /* 006B0 80ACFB50 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 006B4 80ACFB54 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 /* 006B8 80ACFB58 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 006BC 80ACFB5C 468021A0 */ cvt.s.w $f6, $f4 +/* 006BC 80ACFB5C 468021A0 */ cvt.s.w $f6, $f4 /* 006C0 80ACFB60 240E0002 */ addiu $t6, $zero, 0x0002 ## $t6 = 00000002 -/* 006C4 80ACFB64 44060000 */ mfc1 $a2, $f0 -/* 006C8 80ACFB68 AFAE0014 */ sw $t6, 0x0014($sp) +/* 006C4 80ACFB64 44060000 */ mfc1 $a2, $f0 +/* 006C8 80ACFB68 AFAE0014 */ sw $t6, 0x0014($sp) /* 006CC 80ACFB6C 24A509C4 */ addiu $a1, $a1, 0x09C4 ## $a1 = 060009C4 /* 006D0 80ACFB70 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C -/* 006D4 80ACFB74 E7A60010 */ swc1 $f6, 0x0010($sp) +/* 006D4 80ACFB74 E7A60010 */ swc1 $f6, 0x0010($sp) /* 006D8 80ACFB78 3C074040 */ lui $a3, 0x4040 ## $a3 = 40400000 -/* 006DC 80ACFB7C 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 006E0 80ACFB80 E7A00018 */ swc1 $f0, 0x0018($sp) +/* 006DC 80ACFB7C 0C029468 */ jal SkelAnime_ChangeAnim + +/* 006E0 80ACFB80 E7A00018 */ swc1 $f0, 0x0018($sp) /* 006E4 80ACFB84 92190311 */ lbu $t9, 0x0311($s0) ## 00000311 /* 006E8 80ACFB88 240F0258 */ addiu $t7, $zero, 0x0258 ## $t7 = 00000258 /* 006EC 80ACFB8C 24180003 */ addiu $t8, $zero, 0x0003 ## $t8 = 00000003 @@ -32,12 +32,12 @@ glabel func_80ACFB34 /* 00704 80ACFBA4 AE1802B0 */ sw $t8, 0x02B0($s0) ## 000002B0 /* 00708 80ACFBA8 A2080311 */ sb $t0, 0x0311($s0) ## 00000311 /* 0070C 80ACFBAC 24A5FBCC */ addiu $a1, $a1, %lo(func_80ACFBCC) ## $a1 = 80ACFBCC -/* 00710 80ACFBB0 0C2B3D28 */ jal func_80ACF4A0 +/* 00710 80ACFBB0 0C2B3D28 */ jal func_80ACF4A0 /* 00714 80ACFBB4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00718 80ACFBB8 8FBF002C */ lw $ra, 0x002C($sp) -/* 0071C 80ACFBBC 8FB00028 */ lw $s0, 0x0028($sp) +/* 00718 80ACFBB8 8FBF002C */ lw $ra, 0x002C($sp) +/* 0071C 80ACFBBC 8FB00028 */ lw $s0, 0x0028($sp) /* 00720 80ACFBC0 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 00724 80ACFBC4 03E00008 */ jr $ra +/* 00724 80ACFBC4 03E00008 */ jr $ra /* 00728 80ACFBC8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80ACFD20.s b/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80ACFD20.s index 3fe1343578..2335ae9e9a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80ACFD20.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80ACFD20.s @@ -1,26 +1,26 @@ glabel func_80ACFD20 /* 00880 80ACFD20 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 00884 80ACFD24 AFB00028 */ sw $s0, 0x0028($sp) +/* 00884 80ACFD24 AFB00028 */ sw $s0, 0x0028($sp) /* 00888 80ACFD28 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 0088C 80ACFD2C AFBF002C */ sw $ra, 0x002C($sp) +/* 0088C 80ACFD2C AFBF002C */ sw $ra, 0x002C($sp) /* 00890 80ACFD30 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 /* 00894 80ACFD34 0C028800 */ jal SkelAnime_GetFrameCount - + /* 00898 80ACFD38 248409C4 */ addiu $a0, $a0, 0x09C4 ## $a0 = 060009C4 /* 0089C 80ACFD3C 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 008A0 80ACFD40 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 /* 008A4 80ACFD44 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 008A8 80ACFD48 468021A0 */ cvt.s.w $f6, $f4 +/* 008A8 80ACFD48 468021A0 */ cvt.s.w $f6, $f4 /* 008AC 80ACFD4C 240E0002 */ addiu $t6, $zero, 0x0002 ## $t6 = 00000002 -/* 008B0 80ACFD50 44060000 */ mfc1 $a2, $f0 -/* 008B4 80ACFD54 AFAE0014 */ sw $t6, 0x0014($sp) +/* 008B0 80ACFD50 44060000 */ mfc1 $a2, $f0 +/* 008B4 80ACFD54 AFAE0014 */ sw $t6, 0x0014($sp) /* 008B8 80ACFD58 24A509C4 */ addiu $a1, $a1, 0x09C4 ## $a1 = 060009C4 /* 008BC 80ACFD5C 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C -/* 008C0 80ACFD60 E7A60010 */ swc1 $f6, 0x0010($sp) +/* 008C0 80ACFD60 E7A60010 */ swc1 $f6, 0x0010($sp) /* 008C4 80ACFD64 3C074040 */ lui $a3, 0x4040 ## $a3 = 40400000 -/* 008C8 80ACFD68 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 008CC 80ACFD6C E7A00018 */ swc1 $f0, 0x0018($sp) +/* 008C8 80ACFD68 0C029468 */ jal SkelAnime_ChangeAnim + +/* 008CC 80ACFD6C E7A00018 */ swc1 $f0, 0x0018($sp) /* 008D0 80ACFD70 240F0190 */ addiu $t7, $zero, 0x0190 ## $t7 = 00000190 /* 008D4 80ACFD74 24180004 */ addiu $t8, $zero, 0x0004 ## $t8 = 00000004 /* 008D8 80ACFD78 3C0580AD */ lui $a1, %hi(func_80ACFDAC) ## $a1 = 80AD0000 @@ -29,12 +29,12 @@ glabel func_80ACFD20 /* 008E4 80ACFD84 A60002FA */ sh $zero, 0x02FA($s0) ## 000002FA /* 008E8 80ACFD88 AE1802B0 */ sw $t8, 0x02B0($s0) ## 000002B0 /* 008EC 80ACFD8C 24A5FDAC */ addiu $a1, $a1, %lo(func_80ACFDAC) ## $a1 = 80ACFDAC -/* 008F0 80ACFD90 0C2B3D28 */ jal func_80ACF4A0 +/* 008F0 80ACFD90 0C2B3D28 */ jal func_80ACF4A0 /* 008F4 80ACFD94 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 008F8 80ACFD98 8FBF002C */ lw $ra, 0x002C($sp) -/* 008FC 80ACFD9C 8FB00028 */ lw $s0, 0x0028($sp) +/* 008F8 80ACFD98 8FBF002C */ lw $ra, 0x002C($sp) +/* 008FC 80ACFD9C 8FB00028 */ lw $s0, 0x0028($sp) /* 00900 80ACFDA0 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 00904 80ACFDA4 03E00008 */ jr $ra +/* 00904 80ACFDA4 03E00008 */ jr $ra /* 00908 80ACFDA8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80ACFEB0.s b/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80ACFEB0.s index e437176023..2bb098e487 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80ACFEB0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80ACFEB0.s @@ -1,21 +1,21 @@ glabel func_80ACFEB0 /* 00A10 80ACFEB0 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00A14 80ACFEB4 AFBF0014 */ sw $ra, 0x0014($sp) +/* 00A14 80ACFEB4 AFBF0014 */ sw $ra, 0x0014($sp) /* 00A18 80ACFEB8 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 /* 00A1C 80ACFEBC 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 00A20 80ACFEC0 24A505C4 */ addiu $a1, $a1, 0x05C4 ## $a1 = 060005C4 -/* 00A24 80ACFEC4 AFA60018 */ sw $a2, 0x0018($sp) -/* 00A28 80ACFEC8 0C0294BE */ jal func_800A52F8 +/* 00A24 80ACFEC4 AFA60018 */ sw $a2, 0x0018($sp) +/* 00A28 80ACFEC8 0C0294BE */ jal SkelAnime_ChangeAnimDefaultRepeat /* 00A2C 80ACFECC 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 00A30 80ACFED0 8FA40018 */ lw $a0, 0x0018($sp) +/* 00A30 80ACFED0 8FA40018 */ lw $a0, 0x0018($sp) /* 00A34 80ACFED4 240E0005 */ addiu $t6, $zero, 0x0005 ## $t6 = 00000005 /* 00A38 80ACFED8 3C0580AD */ lui $a1, %hi(func_80ACFEF8) ## $a1 = 80AD0000 /* 00A3C 80ACFEDC 24A5FEF8 */ addiu $a1, $a1, %lo(func_80ACFEF8) ## $a1 = 80ACFEF8 -/* 00A40 80ACFEE0 0C2B3D28 */ jal func_80ACF4A0 +/* 00A40 80ACFEE0 0C2B3D28 */ jal func_80ACF4A0 /* 00A44 80ACFEE4 AC8E02B0 */ sw $t6, 0x02B0($a0) ## 000002B0 -/* 00A48 80ACFEE8 8FBF0014 */ lw $ra, 0x0014($sp) +/* 00A48 80ACFEE8 8FBF0014 */ lw $ra, 0x0014($sp) /* 00A4C 80ACFEEC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00A50 80ACFEF0 03E00008 */ jr $ra +/* 00A50 80ACFEF0 03E00008 */ jr $ra /* 00A54 80ACFEF4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD0070.s b/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD0070.s index 751abd4de7..dac079bae4 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD0070.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD0070.s @@ -1,49 +1,49 @@ glabel func_80AD0070 /* 00BD0 80AD0070 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 00BD4 80AD0074 AFB00028 */ sw $s0, 0x0028($sp) +/* 00BD4 80AD0074 AFB00028 */ sw $s0, 0x0028($sp) /* 00BD8 80AD0078 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00BDC 80AD007C AFBF002C */ sw $ra, 0x002C($sp) +/* 00BDC 80AD007C AFBF002C */ sw $ra, 0x002C($sp) /* 00BE0 80AD0080 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 /* 00BE4 80AD0084 0C028800 */ jal SkelAnime_GetFrameCount - + /* 00BE8 80AD0088 248409C4 */ addiu $a0, $a0, 0x09C4 ## $a0 = 060009C4 /* 00BEC 80AD008C 8E0E02B0 */ lw $t6, 0x02B0($s0) ## 000002B0 /* 00BF0 80AD0090 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 00BF4 80AD0094 2401000D */ addiu $at, $zero, 0x000D ## $at = 0000000D -/* 00BF8 80AD0098 11C1000E */ beq $t6, $at, .L80AD00D4 -/* 00BFC 80AD009C 46802020 */ cvt.s.w $f0, $f4 +/* 00BF8 80AD0098 11C1000E */ beq $t6, $at, .L80AD00D4 +/* 00BFC 80AD009C 46802020 */ cvt.s.w $f0, $f4 /* 00C00 80AD00A0 44801000 */ mtc1 $zero, $f2 ## $f2 = 0.00 /* 00C04 80AD00A4 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 00C08 80AD00A8 240F0002 */ addiu $t7, $zero, 0x0002 ## $t7 = 00000002 -/* 00C0C 80AD00AC 44061000 */ mfc1 $a2, $f2 -/* 00C10 80AD00B0 AFAF0014 */ sw $t7, 0x0014($sp) +/* 00C0C 80AD00AC 44061000 */ mfc1 $a2, $f2 +/* 00C10 80AD00B0 AFAF0014 */ sw $t7, 0x0014($sp) /* 00C14 80AD00B4 24A509C4 */ addiu $a1, $a1, 0x09C4 ## $a1 = 060009C4 /* 00C18 80AD00B8 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C /* 00C1C 80AD00BC 3C074040 */ lui $a3, 0x4040 ## $a3 = 40400000 -/* 00C20 80AD00C0 E7A00010 */ swc1 $f0, 0x0010($sp) -/* 00C24 80AD00C4 E7A00034 */ swc1 $f0, 0x0034($sp) -/* 00C28 80AD00C8 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 00C2C 80AD00CC E7A20018 */ swc1 $f2, 0x0018($sp) -/* 00C30 80AD00D0 C7A00034 */ lwc1 $f0, 0x0034($sp) +/* 00C20 80AD00C0 E7A00010 */ swc1 $f0, 0x0010($sp) +/* 00C24 80AD00C4 E7A00034 */ swc1 $f0, 0x0034($sp) +/* 00C28 80AD00C8 0C029468 */ jal SkelAnime_ChangeAnim + +/* 00C2C 80AD00CC E7A20018 */ swc1 $f2, 0x0018($sp) +/* 00C30 80AD00D0 C7A00034 */ lwc1 $f0, 0x0034($sp) .L80AD00D4: -/* 00C34 80AD00D4 4600018D */ trunc.w.s $f6, $f0 +/* 00C34 80AD00D4 4600018D */ trunc.w.s $f6, $f0 /* 00C38 80AD00D8 24180008 */ addiu $t8, $zero, 0x0008 ## $t8 = 00000008 /* 00C3C 80AD00DC AE1802B0 */ sw $t8, 0x02B0($s0) ## 000002B0 /* 00C40 80AD00E0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00C44 80AD00E4 44083000 */ mfc1 $t0, $f6 +/* 00C44 80AD00E4 44083000 */ mfc1 $t0, $f6 /* 00C48 80AD00E8 24053954 */ addiu $a1, $zero, 0x3954 ## $a1 = 00003954 /* 00C4C 80AD00EC 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 00C50 80AD00F0 A60802FC */ sh $t0, 0x02FC($s0) ## 000002FC /* 00C54 80AD00F4 3C0580AD */ lui $a1, %hi(func_80AD0118) ## $a1 = 80AD0000 /* 00C58 80AD00F8 24A50118 */ addiu $a1, $a1, %lo(func_80AD0118) ## $a1 = 80AD0118 -/* 00C5C 80AD00FC 0C2B3D28 */ jal func_80ACF4A0 +/* 00C5C 80AD00FC 0C2B3D28 */ jal func_80ACF4A0 /* 00C60 80AD0100 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00C64 80AD0104 8FBF002C */ lw $ra, 0x002C($sp) -/* 00C68 80AD0108 8FB00028 */ lw $s0, 0x0028($sp) +/* 00C64 80AD0104 8FBF002C */ lw $ra, 0x002C($sp) +/* 00C68 80AD0108 8FB00028 */ lw $s0, 0x0028($sp) /* 00C6C 80AD010C 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 -/* 00C70 80AD0110 03E00008 */ jr $ra +/* 00C70 80AD0110 03E00008 */ jr $ra /* 00C74 80AD0114 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD02E4.s b/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD02E4.s index 9813f3b4ea..fda8ce6e61 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD02E4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD02E4.s @@ -1,49 +1,49 @@ glabel func_80AD02E4 /* 00E44 80AD02E4 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 00E48 80AD02E8 AFB00028 */ sw $s0, 0x0028($sp) +/* 00E48 80AD02E8 AFB00028 */ sw $s0, 0x0028($sp) /* 00E4C 80AD02EC 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00E50 80AD02F0 AFBF002C */ sw $ra, 0x002C($sp) +/* 00E50 80AD02F0 AFBF002C */ sw $ra, 0x002C($sp) /* 00E54 80AD02F4 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 /* 00E58 80AD02F8 0C028800 */ jal SkelAnime_GetFrameCount - + /* 00E5C 80AD02FC 248409C4 */ addiu $a0, $a0, 0x09C4 ## $a0 = 060009C4 /* 00E60 80AD0300 8E0E02B0 */ lw $t6, 0x02B0($s0) ## 000002B0 /* 00E64 80AD0304 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 00E68 80AD0308 2401000D */ addiu $at, $zero, 0x000D ## $at = 0000000D -/* 00E6C 80AD030C 11C1000E */ beq $t6, $at, .L80AD0348 -/* 00E70 80AD0310 46802020 */ cvt.s.w $f0, $f4 +/* 00E6C 80AD030C 11C1000E */ beq $t6, $at, .L80AD0348 +/* 00E70 80AD0310 46802020 */ cvt.s.w $f0, $f4 /* 00E74 80AD0314 44801000 */ mtc1 $zero, $f2 ## $f2 = 0.00 /* 00E78 80AD0318 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 00E7C 80AD031C 240F0002 */ addiu $t7, $zero, 0x0002 ## $t7 = 00000002 -/* 00E80 80AD0320 44061000 */ mfc1 $a2, $f2 -/* 00E84 80AD0324 AFAF0014 */ sw $t7, 0x0014($sp) +/* 00E80 80AD0320 44061000 */ mfc1 $a2, $f2 +/* 00E84 80AD0324 AFAF0014 */ sw $t7, 0x0014($sp) /* 00E88 80AD0328 24A509C4 */ addiu $a1, $a1, 0x09C4 ## $a1 = 060009C4 /* 00E8C 80AD032C 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C /* 00E90 80AD0330 3C074040 */ lui $a3, 0x4040 ## $a3 = 40400000 -/* 00E94 80AD0334 E7A00010 */ swc1 $f0, 0x0010($sp) -/* 00E98 80AD0338 E7A00034 */ swc1 $f0, 0x0034($sp) -/* 00E9C 80AD033C 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 00EA0 80AD0340 E7A20018 */ swc1 $f2, 0x0018($sp) -/* 00EA4 80AD0344 C7A00034 */ lwc1 $f0, 0x0034($sp) +/* 00E94 80AD0334 E7A00010 */ swc1 $f0, 0x0010($sp) +/* 00E98 80AD0338 E7A00034 */ swc1 $f0, 0x0034($sp) +/* 00E9C 80AD033C 0C029468 */ jal SkelAnime_ChangeAnim + +/* 00EA0 80AD0340 E7A20018 */ swc1 $f2, 0x0018($sp) +/* 00EA4 80AD0344 C7A00034 */ lwc1 $f0, 0x0034($sp) .L80AD0348: -/* 00EA8 80AD0348 4600018D */ trunc.w.s $f6, $f0 +/* 00EA8 80AD0348 4600018D */ trunc.w.s $f6, $f0 /* 00EAC 80AD034C 24180009 */ addiu $t8, $zero, 0x0009 ## $t8 = 00000009 /* 00EB0 80AD0350 AE1802B0 */ sw $t8, 0x02B0($s0) ## 000002B0 /* 00EB4 80AD0354 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00EB8 80AD0358 44083000 */ mfc1 $t0, $f6 +/* 00EB8 80AD0358 44083000 */ mfc1 $t0, $f6 /* 00EBC 80AD035C 24053954 */ addiu $a1, $zero, 0x3954 ## $a1 = 00003954 /* 00EC0 80AD0360 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 00EC4 80AD0364 A60802FC */ sh $t0, 0x02FC($s0) ## 000002FC /* 00EC8 80AD0368 3C0580AD */ lui $a1, %hi(func_80AD038C) ## $a1 = 80AD0000 /* 00ECC 80AD036C 24A5038C */ addiu $a1, $a1, %lo(func_80AD038C) ## $a1 = 80AD038C -/* 00ED0 80AD0370 0C2B3D28 */ jal func_80ACF4A0 +/* 00ED0 80AD0370 0C2B3D28 */ jal func_80ACF4A0 /* 00ED4 80AD0374 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00ED8 80AD0378 8FBF002C */ lw $ra, 0x002C($sp) -/* 00EDC 80AD037C 8FB00028 */ lw $s0, 0x0028($sp) +/* 00ED8 80AD0378 8FBF002C */ lw $ra, 0x002C($sp) +/* 00EDC 80AD037C 8FB00028 */ lw $s0, 0x0028($sp) /* 00EE0 80AD0380 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 -/* 00EE4 80AD0384 03E00008 */ jr $ra +/* 00EE4 80AD0384 03E00008 */ jr $ra /* 00EE8 80AD0388 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD0558.s b/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD0558.s index a3ee9c0692..9bbcea305b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD0558.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD0558.s @@ -1,23 +1,23 @@ glabel func_80AD0558 /* 010B8 80AD0558 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 010BC 80AD055C AFBF0014 */ sw $ra, 0x0014($sp) +/* 010BC 80AD055C AFBF0014 */ sw $ra, 0x0014($sp) /* 010C0 80AD0560 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 /* 010C4 80AD0564 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 010C8 80AD0568 24A505C4 */ addiu $a1, $a1, 0x05C4 ## $a1 = 060005C4 -/* 010CC 80AD056C AFA60018 */ sw $a2, 0x0018($sp) -/* 010D0 80AD0570 0C0294BE */ jal func_800A52F8 +/* 010CC 80AD056C AFA60018 */ sw $a2, 0x0018($sp) +/* 010D0 80AD0570 0C0294BE */ jal SkelAnime_ChangeAnimDefaultRepeat /* 010D4 80AD0574 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 010D8 80AD0578 8FA40018 */ lw $a0, 0x0018($sp) +/* 010D8 80AD0578 8FA40018 */ lw $a0, 0x0018($sp) /* 010DC 80AD057C 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 /* 010E0 80AD0580 240E000E */ addiu $t6, $zero, 0x000E ## $t6 = 0000000E /* 010E4 80AD0584 3C0580AD */ lui $a1, %hi(func_80AD05A8) ## $a1 = 80AD0000 /* 010E8 80AD0588 24A505A8 */ addiu $a1, $a1, %lo(func_80AD05A8) ## $a1 = 80AD05A8 /* 010EC 80AD058C AC8E02B0 */ sw $t6, 0x02B0($a0) ## 000002B0 -/* 010F0 80AD0590 0C2B3D28 */ jal func_80ACF4A0 +/* 010F0 80AD0590 0C2B3D28 */ jal func_80ACF4A0 /* 010F4 80AD0594 E48402E0 */ swc1 $f4, 0x02E0($a0) ## 000002E0 -/* 010F8 80AD0598 8FBF0014 */ lw $ra, 0x0014($sp) +/* 010F8 80AD0598 8FBF0014 */ lw $ra, 0x0014($sp) /* 010FC 80AD059C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 01100 80AD05A0 03E00008 */ jr $ra +/* 01100 80AD05A0 03E00008 */ jr $ra /* 01104 80AD05A4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD0720.s b/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD0720.s index c5888ec0ed..453b97addd 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD0720.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD0720.s @@ -1,22 +1,22 @@ glabel func_80AD0720 /* 01280 80AD0720 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 01284 80AD0724 AFBF0014 */ sw $ra, 0x0014($sp) +/* 01284 80AD0724 AFBF0014 */ sw $ra, 0x0014($sp) /* 01288 80AD0728 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 /* 0128C 80AD072C 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 01290 80AD0730 24A505C4 */ addiu $a1, $a1, 0x05C4 ## $a1 = 060005C4 -/* 01294 80AD0734 AFA60018 */ sw $a2, 0x0018($sp) -/* 01298 80AD0738 0C0294BE */ jal func_800A52F8 +/* 01294 80AD0734 AFA60018 */ sw $a2, 0x0018($sp) +/* 01298 80AD0738 0C0294BE */ jal SkelAnime_ChangeAnimDefaultRepeat /* 0129C 80AD073C 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 012A0 80AD0740 8FA40018 */ lw $a0, 0x0018($sp) +/* 012A0 80AD0740 8FA40018 */ lw $a0, 0x0018($sp) /* 012A4 80AD0744 240E000E */ addiu $t6, $zero, 0x000E ## $t6 = 0000000E /* 012A8 80AD0748 3C0580AD */ lui $a1, %hi(func_80AD076C) ## $a1 = 80AD0000 /* 012AC 80AD074C 24A5076C */ addiu $a1, $a1, %lo(func_80AD076C) ## $a1 = 80AD076C /* 012B0 80AD0750 AC8E02B0 */ sw $t6, 0x02B0($a0) ## 000002B0 -/* 012B4 80AD0754 0C2B3D28 */ jal func_80ACF4A0 +/* 012B4 80AD0754 0C2B3D28 */ jal func_80ACF4A0 /* 012B8 80AD0758 AC8002D4 */ sw $zero, 0x02D4($a0) ## 000002D4 -/* 012BC 80AD075C 8FBF0014 */ lw $ra, 0x0014($sp) +/* 012BC 80AD075C 8FBF0014 */ lw $ra, 0x0014($sp) /* 012C0 80AD0760 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 012C4 80AD0764 03E00008 */ jr $ra +/* 012C4 80AD0764 03E00008 */ jr $ra /* 012C8 80AD0768 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD0B3C.s b/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD0B3C.s index 605a517c06..fa397b9832 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD0B3C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD0B3C.s @@ -1,21 +1,21 @@ glabel func_80AD0B3C /* 0169C 80AD0B3C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 016A0 80AD0B40 AFBF0014 */ sw $ra, 0x0014($sp) +/* 016A0 80AD0B40 AFBF0014 */ sw $ra, 0x0014($sp) /* 016A4 80AD0B44 240E000A */ addiu $t6, $zero, 0x000A ## $t6 = 0000000A /* 016A8 80AD0B48 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 /* 016AC 80AD0B4C AC8E02B0 */ sw $t6, 0x02B0($a0) ## 000002B0 /* 016B0 80AD0B50 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 016B4 80AD0B54 24A50350 */ addiu $a1, $a1, 0x0350 ## $a1 = 06000350 -/* 016B8 80AD0B58 AFA60018 */ sw $a2, 0x0018($sp) -/* 016BC 80AD0B5C 0C02947A */ jal func_800A51E8 +/* 016B8 80AD0B58 AFA60018 */ sw $a2, 0x0018($sp) +/* 016BC 80AD0B5C 0C02947A */ jal SkelAnime_ChangeAnimDefaultStop /* 016C0 80AD0B60 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C /* 016C4 80AD0B64 3C0580AD */ lui $a1, %hi(func_80AD0B84) ## $a1 = 80AD0000 -/* 016C8 80AD0B68 8FA40018 */ lw $a0, 0x0018($sp) -/* 016CC 80AD0B6C 0C2B3D28 */ jal func_80ACF4A0 +/* 016C8 80AD0B68 8FA40018 */ lw $a0, 0x0018($sp) +/* 016CC 80AD0B6C 0C2B3D28 */ jal func_80ACF4A0 /* 016D0 80AD0B70 24A50B84 */ addiu $a1, $a1, %lo(func_80AD0B84) ## $a1 = 80AD0B84 -/* 016D4 80AD0B74 8FBF0014 */ lw $ra, 0x0014($sp) +/* 016D4 80AD0B74 8FBF0014 */ lw $ra, 0x0014($sp) /* 016D8 80AD0B78 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 016DC 80AD0B7C 03E00008 */ jr $ra +/* 016DC 80AD0B7C 03E00008 */ jr $ra /* 016E0 80AD0B80 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD0D3C.s b/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD0D3C.s index 4ed4a46c28..7f2501d31c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD0D3C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD0D3C.s @@ -1,21 +1,21 @@ glabel func_80AD0D3C /* 0189C 80AD0D3C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 018A0 80AD0D40 AFBF0014 */ sw $ra, 0x0014($sp) +/* 018A0 80AD0D40 AFBF0014 */ sw $ra, 0x0014($sp) /* 018A4 80AD0D44 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 /* 018A8 80AD0D48 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 018AC 80AD0D4C 24A50350 */ addiu $a1, $a1, 0x0350 ## $a1 = 06000350 -/* 018B0 80AD0D50 AFA60018 */ sw $a2, 0x0018($sp) -/* 018B4 80AD0D54 0C02947A */ jal func_800A51E8 +/* 018B0 80AD0D50 AFA60018 */ sw $a2, 0x0018($sp) +/* 018B4 80AD0D54 0C02947A */ jal SkelAnime_ChangeAnimDefaultStop /* 018B8 80AD0D58 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 018BC 80AD0D5C 8FA40018 */ lw $a0, 0x0018($sp) +/* 018BC 80AD0D5C 8FA40018 */ lw $a0, 0x0018($sp) /* 018C0 80AD0D60 240E000A */ addiu $t6, $zero, 0x000A ## $t6 = 0000000A /* 018C4 80AD0D64 3C0580AD */ lui $a1, %hi(func_80AD0D84) ## $a1 = 80AD0000 /* 018C8 80AD0D68 24A50D84 */ addiu $a1, $a1, %lo(func_80AD0D84) ## $a1 = 80AD0D84 -/* 018CC 80AD0D6C 0C2B3D28 */ jal func_80ACF4A0 +/* 018CC 80AD0D6C 0C2B3D28 */ jal func_80ACF4A0 /* 018D0 80AD0D70 AC8E02B0 */ sw $t6, 0x02B0($a0) ## 000002B0 -/* 018D4 80AD0D74 8FBF0014 */ lw $ra, 0x0014($sp) +/* 018D4 80AD0D74 8FBF0014 */ lw $ra, 0x0014($sp) /* 018D8 80AD0D78 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 018DC 80AD0D7C 03E00008 */ jr $ra +/* 018DC 80AD0D7C 03E00008 */ jr $ra /* 018E0 80AD0D80 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD0F38.s b/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD0F38.s index 8ebcb18546..dc2f7eb102 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD0F38.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD0F38.s @@ -1,11 +1,11 @@ glabel func_80AD0F38 /* 01A98 80AD0F38 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 01A9C 80AD0F3C AFB00018 */ sw $s0, 0x0018($sp) +/* 01A9C 80AD0F3C AFB00018 */ sw $s0, 0x0018($sp) /* 01AA0 80AD0F40 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 01AA4 80AD0F44 AFBF001C */ sw $ra, 0x001C($sp) +/* 01AA4 80AD0F44 AFBF001C */ sw $ra, 0x001C($sp) /* 01AA8 80AD0F48 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 01AAC 80AD0F4C 24A505C4 */ addiu $a1, $a1, 0x05C4 ## $a1 = 060005C4 -/* 01AB0 80AD0F50 0C0294BE */ jal func_800A52F8 +/* 01AB0 80AD0F50 0C0294BE */ jal SkelAnime_ChangeAnimDefaultRepeat /* 01AB4 80AD0F54 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C /* 01AB8 80AD0F58 0C03F66B */ jal Math_Rand_ZeroOne ## Rand.Next() float @@ -14,8 +14,8 @@ glabel func_80AD0F38 /* 01AC4 80AD0F64 44812000 */ mtc1 $at, $f4 ## $f4 = 0.50 /* 01AC8 80AD0F68 3C014020 */ lui $at, 0x4020 ## $at = 40200000 /* 01ACC 80AD0F6C 44814000 */ mtc1 $at, $f8 ## $f8 = 2.50 -/* 01AD0 80AD0F70 46040182 */ mul.s $f6, $f0, $f4 -/* 01AD4 80AD0F74 46083280 */ add.s $f10, $f6, $f8 +/* 01AD0 80AD0F70 46040182 */ mul.s $f6, $f0, $f4 +/* 01AD4 80AD0F74 46083280 */ add.s $f10, $f6, $f8 /* 01AD8 80AD0F78 0C03F66B */ jal Math_Rand_ZeroOne ## Rand.Next() float /* 01ADC 80AD0F7C E60A0068 */ swc1 $f10, 0x0068($s0) ## 00000068 @@ -23,19 +23,19 @@ glabel func_80AD0F38 /* 01AE4 80AD0F84 44811000 */ mtc1 $at, $f2 ## $f2 = 10.00 /* 01AE8 80AD0F88 2418000F */ addiu $t8, $zero, 0x000F ## $t8 = 0000000F /* 01AEC 80AD0F8C 3C0580AD */ lui $a1, %hi(func_80AD0FC8) ## $a1 = 80AD0000 -/* 01AF0 80AD0F90 46020402 */ mul.s $f16, $f0, $f2 +/* 01AF0 80AD0F90 46020402 */ mul.s $f16, $f0, $f2 /* 01AF4 80AD0F94 AE1802B0 */ sw $t8, 0x02B0($s0) ## 000002B0 /* 01AF8 80AD0F98 24A50FC8 */ addiu $a1, $a1, %lo(func_80AD0FC8) ## $a1 = 80AD0FC8 /* 01AFC 80AD0F9C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01B00 80AD0FA0 46028480 */ add.s $f18, $f16, $f2 -/* 01B04 80AD0FA4 4600910D */ trunc.w.s $f4, $f18 -/* 01B08 80AD0FA8 440F2000 */ mfc1 $t7, $f4 -/* 01B0C 80AD0FAC 0C2B3D28 */ jal func_80ACF4A0 +/* 01B00 80AD0FA0 46028480 */ add.s $f18, $f16, $f2 +/* 01B04 80AD0FA4 4600910D */ trunc.w.s $f4, $f18 +/* 01B08 80AD0FA8 440F2000 */ mfc1 $t7, $f4 +/* 01B0C 80AD0FAC 0C2B3D28 */ jal func_80ACF4A0 /* 01B10 80AD0FB0 AE0F02D4 */ sw $t7, 0x02D4($s0) ## 000002D4 -/* 01B14 80AD0FB4 8FBF001C */ lw $ra, 0x001C($sp) -/* 01B18 80AD0FB8 8FB00018 */ lw $s0, 0x0018($sp) +/* 01B14 80AD0FB4 8FBF001C */ lw $ra, 0x001C($sp) +/* 01B18 80AD0FB8 8FB00018 */ lw $s0, 0x0018($sp) /* 01B1C 80AD0FBC 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 01B20 80AD0FC0 03E00008 */ jr $ra +/* 01B20 80AD0FC0 03E00008 */ jr $ra /* 01B24 80AD0FC4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD1440.s b/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD1440.s index 696034e88a..d9cd143ba5 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD1440.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD1440.s @@ -1,14 +1,14 @@ glabel func_80AD1440 /* 01FA0 80AD1440 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 01FA4 80AD1444 AFBF0014 */ sw $ra, 0x0014($sp) +/* 01FA4 80AD1444 AFBF0014 */ sw $ra, 0x0014($sp) /* 01FA8 80AD1448 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 /* 01FAC 80AD144C 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 01FB0 80AD1450 24A50844 */ addiu $a1, $a1, 0x0844 ## $a1 = 06000844 -/* 01FB4 80AD1454 AFA70018 */ sw $a3, 0x0018($sp) +/* 01FB4 80AD1454 AFA70018 */ sw $a3, 0x0018($sp) /* 01FB8 80AD1458 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 01FBC 80AD145C 0C029490 */ jal func_800A5240 +/* 01FBC 80AD145C 0C029490 */ jal SkelAnime_ChangeAnimTransitionStop /* 01FC0 80AD1460 3C06C080 */ lui $a2, 0xC080 ## $a2 = C0800000 -/* 01FC4 80AD1464 8FA40018 */ lw $a0, 0x0018($sp) +/* 01FC4 80AD1464 8FA40018 */ lw $a0, 0x0018($sp) /* 01FC8 80AD1468 3C01C110 */ lui $at, 0xC110 ## $at = C1100000 /* 01FCC 80AD146C 44812000 */ mtc1 $at, $f4 ## $f4 = -9.00 /* 01FD0 80AD1470 848F008A */ lh $t7, 0x008A($a0) ## 0000008A @@ -17,11 +17,11 @@ glabel func_80AD1440 /* 01FDC 80AD147C 24A514A0 */ addiu $a1, $a1, %lo(func_80AD14A0) ## $a1 = 80AD14A0 /* 01FE0 80AD1480 AC8E02B0 */ sw $t6, 0x02B0($a0) ## 000002B0 /* 01FE4 80AD1484 E4840068 */ swc1 $f4, 0x0068($a0) ## 00000068 -/* 01FE8 80AD1488 0C2B3D28 */ jal func_80ACF4A0 +/* 01FE8 80AD1488 0C2B3D28 */ jal func_80ACF4A0 /* 01FEC 80AD148C A48F0032 */ sh $t7, 0x0032($a0) ## 00000032 -/* 01FF0 80AD1490 8FBF0014 */ lw $ra, 0x0014($sp) +/* 01FF0 80AD1490 8FBF0014 */ lw $ra, 0x0014($sp) /* 01FF4 80AD1494 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 01FF8 80AD1498 03E00008 */ jr $ra +/* 01FF8 80AD1498 03E00008 */ jr $ra /* 01FFC 80AD149C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD17E8.s b/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD17E8.s index 22097a45c3..6e8c56bfcc 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD17E8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD17E8.s @@ -1,23 +1,23 @@ glabel func_80AD17E8 /* 02348 80AD17E8 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 -/* 0234C 80AD17EC AFBF002C */ sw $ra, 0x002C($sp) -/* 02350 80AD17F0 AFB00028 */ sw $s0, 0x0028($sp) -/* 02354 80AD17F4 AFA50044 */ sw $a1, 0x0044($sp) +/* 0234C 80AD17EC AFBF002C */ sw $ra, 0x002C($sp) +/* 02350 80AD17F0 AFB00028 */ sw $s0, 0x0028($sp) +/* 02354 80AD17F4 AFA50044 */ sw $a1, 0x0044($sp) /* 02358 80AD17F8 8C8E02B4 */ lw $t6, 0x02B4($a0) ## 000002B4 /* 0235C 80AD17FC 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 02360 80AD1800 11C00032 */ beq $t6, $zero, .L80AD18CC +/* 02360 80AD1800 11C00032 */ beq $t6, $zero, .L80AD18CC /* 02364 80AD1804 00000000 */ nop /* 02368 80AD1808 8C8F02D4 */ lw $t7, 0x02D4($a0) ## 000002D4 /* 0236C 80AD180C 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 02370 80AD1810 24A50844 */ addiu $a1, $a1, 0x0844 ## $a1 = 06000844 /* 02374 80AD1814 25F8FFFF */ addiu $t8, $t7, 0xFFFF ## $t8 = FFFFFFFF -/* 02378 80AD1818 1B000003 */ blez $t8, .L80AD1828 +/* 02378 80AD1818 1B000003 */ blez $t8, .L80AD1828 /* 0237C 80AD181C AC9802D4 */ sw $t8, 0x02D4($a0) ## 000002D4 /* 02380 80AD1820 908800AF */ lbu $t0, 0x00AF($a0) ## 000000AF -/* 02384 80AD1824 15000011 */ bne $t0, $zero, .L80AD186C +/* 02384 80AD1824 15000011 */ bne $t0, $zero, .L80AD186C .L80AD1828: /* 02388 80AD1828 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C -/* 0238C 80AD182C 0C029490 */ jal func_800A5240 +/* 0238C 80AD182C 0C029490 */ jal SkelAnime_ChangeAnimTransitionStop /* 02390 80AD1830 3C06C080 */ lui $a2, 0xC080 ## $a2 = C0800000 /* 02394 80AD1834 3C0140C0 */ lui $at, 0x40C0 ## $at = 40C00000 /* 02398 80AD1838 A60000B4 */ sh $zero, 0x00B4($s0) ## 000000B4 @@ -31,14 +31,14 @@ glabel func_80AD17E8 /* 023B8 80AD1858 AE0002B4 */ sw $zero, 0x02B4($s0) ## 000002B4 /* 023BC 80AD185C E6020068 */ swc1 $f2, 0x0068($s0) ## 00000068 /* 023C0 80AD1860 E6040060 */ swc1 $f4, 0x0060($s0) ## 00000060 -/* 023C4 80AD1864 1000008B */ beq $zero, $zero, .L80AD1A94 +/* 023C4 80AD1864 1000008B */ beq $zero, $zero, .L80AD1A94 /* 023C8 80AD1868 A60B00B8 */ sh $t3, 0x00B8($s0) ## 000000B8 .L80AD186C: /* 023CC 80AD186C 920C0114 */ lbu $t4, 0x0114($s0) ## 00000114 /* 023D0 80AD1870 3C053E51 */ lui $a1, 0x3E51 ## $a1 = 3E510000 /* 023D4 80AD1874 260402EC */ addiu $a0, $s0, 0x02EC ## $a0 = 000002EC /* 023D8 80AD1878 318D0004 */ andi $t5, $t4, 0x0004 ## $t5 = 00000000 -/* 023DC 80AD187C 11A0000B */ beq $t5, $zero, .L80AD18AC +/* 023DC 80AD187C 11A0000B */ beq $t5, $zero, .L80AD18AC /* 023E0 80AD1880 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 023E4 80AD1884 44801000 */ mtc1 $zero, $f2 ## $f2 = 0.00 /* 023E8 80AD1888 3C073E70 */ lui $a3, 0x3E70 ## $a3 = 3E700000 @@ -47,46 +47,46 @@ glabel func_80AD17E8 /* 023F4 80AD1894 34A5EB85 */ ori $a1, $a1, 0xEB85 ## $a1 = 3E51EB85 /* 023F8 80AD1898 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 023FC 80AD189C 0C01E0C4 */ jal Math_SmoothScaleMaxMinF - -/* 02400 80AD18A0 E7A20010 */ swc1 $f2, 0x0010($sp) -/* 02404 80AD18A4 1000007C */ beq $zero, $zero, .L80AD1A98 -/* 02408 80AD18A8 8FBF002C */ lw $ra, 0x002C($sp) + +/* 02400 80AD18A0 E7A20010 */ swc1 $f2, 0x0010($sp) +/* 02404 80AD18A4 1000007C */ beq $zero, $zero, .L80AD1A98 +/* 02408 80AD18A8 8FBF002C */ lw $ra, 0x002C($sp) .L80AD18AC: /* 0240C 80AD18AC 44801000 */ mtc1 $zero, $f2 ## $f2 = 0.00 /* 02410 80AD18B0 3C073BA3 */ lui $a3, 0x3BA3 ## $a3 = 3BA30000 /* 02414 80AD18B4 34E7D70A */ ori $a3, $a3, 0xD70A ## $a3 = 3BA3D70A -/* 02418 80AD18B8 44051000 */ mfc1 $a1, $f2 +/* 02418 80AD18B8 44051000 */ mfc1 $a1, $f2 /* 0241C 80AD18BC 0C01E0C4 */ jal Math_SmoothScaleMaxMinF - -/* 02420 80AD18C0 E7A20010 */ swc1 $f2, 0x0010($sp) -/* 02424 80AD18C4 10000074 */ beq $zero, $zero, .L80AD1A98 -/* 02428 80AD18C8 8FBF002C */ lw $ra, 0x002C($sp) + +/* 02420 80AD18C0 E7A20010 */ swc1 $f2, 0x0010($sp) +/* 02424 80AD18C4 10000074 */ beq $zero, $zero, .L80AD1A98 +/* 02428 80AD18C8 8FBF002C */ lw $ra, 0x002C($sp) .L80AD18CC: /* 0242C 80AD18CC 0C02927F */ jal SkelAnime_FrameUpdateMatrix - + /* 02430 80AD18D0 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C /* 02434 80AD18D4 860E02F2 */ lh $t6, 0x02F2($s0) ## 000002F2 /* 02438 80AD18D8 860F02F0 */ lh $t7, 0x02F0($s0) ## 000002F0 /* 0243C 80AD18DC 260402F0 */ addiu $a0, $s0, 0x02F0 ## $a0 = 000002F0 /* 02440 80AD18E0 24050FA0 */ addiu $a1, $zero, 0x0FA0 ## $a1 = 00000FA0 -/* 02444 80AD18E4 01CFC021 */ addu $t8, $t6, $t7 +/* 02444 80AD18E4 01CFC021 */ addu $t8, $t6, $t7 /* 02448 80AD18E8 A61802F2 */ sh $t8, 0x02F2($s0) ## 000002F2 -/* 0244C 80AD18EC AFA00010 */ sw $zero, 0x0010($sp) +/* 0244C 80AD18EC AFA00010 */ sw $zero, 0x0010($sp) /* 02450 80AD18F0 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 /* 02454 80AD18F4 0C01E1A7 */ jal Math_SmoothScaleMaxMinS - + /* 02458 80AD18F8 240700FA */ addiu $a3, $zero, 0x00FA ## $a3 = 000000FA /* 0245C 80AD18FC 921900AF */ lbu $t9, 0x00AF($s0) ## 000000AF /* 02460 80AD1900 3C0180AD */ lui $at, %hi(D_80AD2950) ## $at = 80AD0000 -/* 02464 80AD1904 57200009 */ bnel $t9, $zero, .L80AD192C +/* 02464 80AD1904 57200009 */ bnel $t9, $zero, .L80AD192C /* 02468 80AD1908 3C0142B1 */ lui $at, 0x42B1 ## $at = 42B10000 /* 0246C 80AD190C C6060050 */ lwc1 $f6, 0x0050($s0) ## 00000050 -/* 02470 80AD1910 C4282950 */ lwc1 $f8, %lo(D_80AD2950)($at) +/* 02470 80AD1910 C4282950 */ lwc1 $f8, %lo(D_80AD2950)($at) /* 02474 80AD1914 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02478 80AD1918 46083281 */ sub.s $f10, $f6, $f8 +/* 02478 80AD1918 46083281 */ sub.s $f10, $f6, $f8 /* 0247C 80AD191C E60A0050 */ swc1 $f10, 0x0050($s0) ## 00000050 /* 02480 80AD1920 0C00B58B */ jal Actor_SetScale - + /* 02484 80AD1924 8E050050 */ lw $a1, 0x0050($s0) ## 00000050 /* 02488 80AD1928 3C0142B1 */ lui $at, 0x42B1 ## $at = 42B10000 .L80AD192C: @@ -94,28 +94,28 @@ glabel func_80AD17E8 /* 02490 80AD1930 C6100080 */ lwc1 $f16, 0x0080($s0) ## 00000080 /* 02494 80AD1934 44803000 */ mtc1 $zero, $f6 ## $f6 = 0.00 /* 02498 80AD1938 26040028 */ addiu $a0, $s0, 0x0028 ## $a0 = 00000028 -/* 0249C 80AD193C 46128100 */ add.s $f4, $f16, $f18 +/* 0249C 80AD193C 46128100 */ add.s $f4, $f16, $f18 /* 024A0 80AD1940 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 024A4 80AD1944 3C074040 */ lui $a3, 0x4040 ## $a3 = 40400000 -/* 024A8 80AD1948 E7A60010 */ swc1 $f6, 0x0010($sp) -/* 024AC 80AD194C 44052000 */ mfc1 $a1, $f4 +/* 024A8 80AD1948 E7A60010 */ swc1 $f6, 0x0010($sp) +/* 024AC 80AD194C 44052000 */ mfc1 $a1, $f4 /* 024B0 80AD1950 0C01E0C4 */ jal Math_SmoothScaleMaxMinF - + /* 024B4 80AD1954 00000000 */ nop /* 024B8 80AD1958 44804000 */ mtc1 $zero, $f8 ## $f8 = 0.00 /* 024BC 80AD195C 00000000 */ nop -/* 024C0 80AD1960 46080032 */ c.eq.s $f0, $f8 +/* 024C0 80AD1960 46080032 */ c.eq.s $f0, $f8 /* 024C4 80AD1964 00000000 */ nop -/* 024C8 80AD1968 4502002B */ bc1fl .L80AD1A18 +/* 024C8 80AD1968 4502002B */ bc1fl .L80AD1A18 /* 024CC 80AD196C 44801000 */ mtc1 $zero, $f2 ## $f2 = 0.00 /* 024D0 80AD1970 C60A0028 */ lwc1 $f10, 0x0028($s0) ## 00000028 /* 024D4 80AD1974 C6100080 */ lwc1 $f16, 0x0080($s0) ## 00000080 /* 024D8 80AD1978 3C01426C */ lui $at, 0x426C ## $at = 426C0000 /* 024DC 80AD197C 44812000 */ mtc1 $at, $f4 ## $f4 = 59.00 -/* 024E0 80AD1980 46105481 */ sub.s $f18, $f10, $f16 -/* 024E4 80AD1984 4604903C */ c.lt.s $f18, $f4 +/* 024E0 80AD1980 46105481 */ sub.s $f18, $f10, $f16 +/* 024E4 80AD1984 4604903C */ c.lt.s $f18, $f4 /* 024E8 80AD1988 00000000 */ nop -/* 024EC 80AD198C 45020022 */ bc1fl .L80AD1A18 +/* 024EC 80AD198C 45020022 */ bc1fl .L80AD1A18 /* 024F0 80AD1990 44801000 */ mtc1 $zero, $f2 ## $f2 = 0.00 /* 024F4 80AD1994 8E090024 */ lw $t1, 0x0024($s0) ## 00000024 /* 024F8 80AD1998 27A50034 */ addiu $a1, $sp, 0x0034 ## $a1 = FFFFFFF4 @@ -130,67 +130,67 @@ glabel func_80AD17E8 /* 0251C 80AD19BC 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 /* 02520 80AD19C0 ACA90008 */ sw $t1, 0x0008($a1) ## FFFFFFFC /* 02524 80AD19C4 C6060080 */ lwc1 $f6, 0x0080($s0) ## 00000080 -/* 02528 80AD19C8 AFAC0018 */ sw $t4, 0x0018($sp) -/* 0252C 80AD19CC AFAB0014 */ sw $t3, 0x0014($sp) -/* 02530 80AD19D0 AFAA0010 */ sw $t2, 0x0010($sp) -/* 02534 80AD19D4 8FA40044 */ lw $a0, 0x0044($sp) -/* 02538 80AD19D8 0C00CD20 */ jal func_80033480 -/* 0253C 80AD19DC E7A60038 */ swc1 $f6, 0x0038($sp) +/* 02528 80AD19C8 AFAC0018 */ sw $t4, 0x0018($sp) +/* 0252C 80AD19CC AFAB0014 */ sw $t3, 0x0014($sp) +/* 02530 80AD19D0 AFAA0010 */ sw $t2, 0x0010($sp) +/* 02534 80AD19D4 8FA40044 */ lw $a0, 0x0044($sp) +/* 02538 80AD19D8 0C00CD20 */ jal func_80033480 +/* 0253C 80AD19DC E7A60038 */ swc1 $f6, 0x0038($sp) /* 02540 80AD19E0 3C0180AD */ lui $at, %hi(D_80AD2954) ## $at = 80AD0000 -/* 02544 80AD19E4 C4282954 */ lwc1 $f8, %lo(D_80AD2954)($at) +/* 02544 80AD19E4 C4282954 */ lwc1 $f8, %lo(D_80AD2954)($at) /* 02548 80AD19E8 3C014000 */ lui $at, 0x4000 ## $at = 40000000 /* 0254C 80AD19EC 44815000 */ mtc1 $at, $f10 ## $f10 = 2.00 /* 02550 80AD19F0 240D0002 */ addiu $t5, $zero, 0x0002 ## $t5 = 00000002 -/* 02554 80AD19F4 AFAD0010 */ sw $t5, 0x0010($sp) -/* 02558 80AD19F8 8FA40044 */ lw $a0, 0x0044($sp) +/* 02554 80AD19F4 AFAD0010 */ sw $t5, 0x0010($sp) +/* 02558 80AD19F8 8FA40044 */ lw $a0, 0x0044($sp) /* 0255C 80AD19FC 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 02560 80AD1A00 27A60034 */ addiu $a2, $sp, 0x0034 ## $a2 = FFFFFFF4 /* 02564 80AD1A04 3C074296 */ lui $a3, 0x4296 ## $a3 = 42960000 -/* 02568 80AD1A08 E7A80014 */ swc1 $f8, 0x0014($sp) -/* 0256C 80AD1A0C 0C2B3DE2 */ jal func_80ACF788 -/* 02570 80AD1A10 E7AA0018 */ swc1 $f10, 0x0018($sp) +/* 02568 80AD1A08 E7A80014 */ swc1 $f8, 0x0014($sp) +/* 0256C 80AD1A0C 0C2B3DE2 */ jal func_80ACF788 +/* 02570 80AD1A10 E7AA0018 */ swc1 $f10, 0x0018($sp) /* 02574 80AD1A14 44801000 */ mtc1 $zero, $f2 ## $f2 = 0.00 .L80AD1A18: /* 02578 80AD1A18 C6000068 */ lwc1 $f0, 0x0068($s0) ## 00000068 /* 0257C 80AD1A1C 3C013E80 */ lui $at, 0x3E80 ## $at = 3E800000 -/* 02580 80AD1A20 4602003C */ c.lt.s $f0, $f2 +/* 02580 80AD1A20 4602003C */ c.lt.s $f0, $f2 /* 02584 80AD1A24 00000000 */ nop -/* 02588 80AD1A28 45020006 */ bc1fl .L80AD1A44 +/* 02588 80AD1A28 45020006 */ bc1fl .L80AD1A44 /* 0258C 80AD1A2C 8E0E02D4 */ lw $t6, 0x02D4($s0) ## 000002D4 /* 02590 80AD1A30 44818000 */ mtc1 $at, $f16 ## $f16 = 0.25 /* 02594 80AD1A34 00000000 */ nop -/* 02598 80AD1A38 46100480 */ add.s $f18, $f0, $f16 +/* 02598 80AD1A38 46100480 */ add.s $f18, $f0, $f16 /* 0259C 80AD1A3C E6120068 */ swc1 $f18, 0x0068($s0) ## 00000068 /* 025A0 80AD1A40 8E0E02D4 */ lw $t6, 0x02D4($s0) ## 000002D4 .L80AD1A44: /* 025A4 80AD1A44 25CFFFFF */ addiu $t7, $t6, 0xFFFF ## $t7 = FFFFFFFF -/* 025A8 80AD1A48 1DE00012 */ bgtz $t7, .L80AD1A94 +/* 025A8 80AD1A48 1DE00012 */ bgtz $t7, .L80AD1A94 /* 025AC 80AD1A4C AE0F02D4 */ sw $t7, 0x02D4($s0) ## 000002D4 /* 025B0 80AD1A50 921900AF */ lbu $t9, 0x00AF($s0) ## 000000AF -/* 025B4 80AD1A54 57200006 */ bnel $t9, $zero, .L80AD1A70 +/* 025B4 80AD1A54 57200006 */ bnel $t9, $zero, .L80AD1A70 /* 025B8 80AD1A58 8608001C */ lh $t0, 0x001C($s0) ## 0000001C -/* 025BC 80AD1A5C 0C2B46AA */ jal func_80AD1AA8 +/* 025BC 80AD1A5C 0C2B46AA */ jal func_80AD1AA8 /* 025C0 80AD1A60 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 025C4 80AD1A64 1000000C */ beq $zero, $zero, .L80AD1A98 -/* 025C8 80AD1A68 8FBF002C */ lw $ra, 0x002C($sp) +/* 025C4 80AD1A64 1000000C */ beq $zero, $zero, .L80AD1A98 +/* 025C8 80AD1A68 8FBF002C */ lw $ra, 0x002C($sp) /* 025CC 80AD1A6C 8608001C */ lh $t0, 0x001C($s0) ## 0000001C .L80AD1A70: -/* 025D0 80AD1A70 05010006 */ bgez $t0, .L80AD1A8C +/* 025D0 80AD1A70 05010006 */ bgez $t0, .L80AD1A8C /* 025D4 80AD1A74 00000000 */ nop -/* 025D8 80AD1A78 0C2B43CE */ jal func_80AD0F38 +/* 025D8 80AD1A78 0C2B43CE */ jal func_80AD0F38 /* 025DC 80AD1A7C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 025E0 80AD1A80 2409003C */ addiu $t1, $zero, 0x003C ## $t1 = 0000003C -/* 025E4 80AD1A84 10000003 */ beq $zero, $zero, .L80AD1A94 +/* 025E4 80AD1A84 10000003 */ beq $zero, $zero, .L80AD1A94 /* 025E8 80AD1A88 A60902F6 */ sh $t1, 0x02F6($s0) ## 000002F6 .L80AD1A8C: -/* 025EC 80AD1A8C 0C2B3FAC */ jal func_80ACFEB0 +/* 025EC 80AD1A8C 0C2B3FAC */ jal func_80ACFEB0 /* 025F0 80AD1A90 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 .L80AD1A94: -/* 025F4 80AD1A94 8FBF002C */ lw $ra, 0x002C($sp) +/* 025F4 80AD1A94 8FBF002C */ lw $ra, 0x002C($sp) .L80AD1A98: -/* 025F8 80AD1A98 8FB00028 */ lw $s0, 0x0028($sp) +/* 025F8 80AD1A98 8FB00028 */ lw $s0, 0x0028($sp) /* 025FC 80AD1A9C 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 -/* 02600 80AD1AA0 03E00008 */ jr $ra +/* 02600 80AD1AA0 03E00008 */ jr $ra /* 02604 80AD1AA4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD1AA8.s b/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD1AA8.s index 9b8ac6be2b..597366cb91 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD1AA8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD1AA8.s @@ -1,13 +1,13 @@ glabel func_80AD1AA8 /* 02608 80AD1AA8 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 0260C 80AD1AAC AFBF0014 */ sw $ra, 0x0014($sp) +/* 0260C 80AD1AAC AFBF0014 */ sw $ra, 0x0014($sp) /* 02610 80AD1AB0 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 /* 02614 80AD1AB4 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 02618 80AD1AB8 24A505C4 */ addiu $a1, $a1, 0x05C4 ## $a1 = 060005C4 -/* 0261C 80AD1ABC AFA60018 */ sw $a2, 0x0018($sp) -/* 02620 80AD1AC0 0C0294BE */ jal func_800A52F8 +/* 0261C 80AD1ABC AFA60018 */ sw $a2, 0x0018($sp) +/* 02620 80AD1AC0 0C0294BE */ jal SkelAnime_ChangeAnimDefaultRepeat /* 02624 80AD1AC4 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 02628 80AD1AC8 8FA40018 */ lw $a0, 0x0018($sp) +/* 02628 80AD1AC8 8FA40018 */ lw $a0, 0x0018($sp) /* 0262C 80AD1ACC 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 /* 02630 80AD1AD0 240E0001 */ addiu $t6, $zero, 0x0001 ## $t6 = 00000001 /* 02634 80AD1AD4 240F0005 */ addiu $t7, $zero, 0x0005 ## $t7 = 00000005 @@ -15,11 +15,11 @@ glabel func_80AD1AA8 /* 0263C 80AD1ADC 24A51B00 */ addiu $a1, $a1, %lo(func_80AD1B00) ## $a1 = 80AD1B00 /* 02640 80AD1AE0 AC8E02B0 */ sw $t6, 0x02B0($a0) ## 000002B0 /* 02644 80AD1AE4 A48F02FC */ sh $t7, 0x02FC($a0) ## 000002FC -/* 02648 80AD1AE8 0C2B3D28 */ jal func_80ACF4A0 +/* 02648 80AD1AE8 0C2B3D28 */ jal func_80ACF4A0 /* 0264C 80AD1AEC E48402E0 */ swc1 $f4, 0x02E0($a0) ## 000002E0 -/* 02650 80AD1AF0 8FBF0014 */ lw $ra, 0x0014($sp) +/* 02650 80AD1AF0 8FBF0014 */ lw $ra, 0x0014($sp) /* 02654 80AD1AF4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 02658 80AD1AF8 03E00008 */ jr $ra +/* 02658 80AD1AF8 03E00008 */ jr $ra /* 0265C 80AD1AFC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD2224.s b/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD2224.s index 024daa45c4..0dd4c406ae 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD2224.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD2224.s @@ -34,7 +34,7 @@ glabel func_80AD2224 /* 02DF8 80AD2298 8F250000 */ lw $a1, 0x0000($t9) ## 00000000 /* 02DFC 80AD229C 27A40030 */ addiu $a0, $sp, 0x0030 ## $a0 = FFFFFFE8 /* 02E00 80AD22A0 2407079A */ addiu $a3, $zero, 0x079A ## $a3 = 0000079A -/* 02E04 80AD22A4 0C031AB1 */ jal func_800C6AC4 +/* 02E04 80AD22A4 0C031AB1 */ jal Graph_OpenDisps /* 02E08 80AD22A8 AFA50040 */ sw $a1, 0x0040($sp) /* 02E0C 80AD22AC 0C034213 */ jal Matrix_Push /* 02E10 80AD22B0 00000000 */ nop @@ -125,7 +125,7 @@ glabel func_80AD2224 /* 02F64 80AD2404 24C628B8 */ addiu $a2, $a2, %lo(D_80AD28B8) ## $a2 = 80AD28B8 /* 02F68 80AD2408 27A40030 */ addiu $a0, $sp, 0x0030 ## $a0 = FFFFFFE8 /* 02F6C 80AD240C 240707AB */ addiu $a3, $zero, 0x07AB ## $a3 = 000007AB -/* 02F70 80AD2410 0C031AD5 */ jal func_800C6B54 +/* 02F70 80AD2410 0C031AD5 */ jal Graph_CloseDisps /* 02F74 80AD2414 8F050000 */ lw $a1, 0x0000($t8) ## 00000000 /* 02F78 80AD2418 10000002 */ beq $zero, $zero, .L80AD2424 /* 02F7C 80AD241C 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD2438.s b/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD2438.s index 6407ea478b..2f5a59f132 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD2438.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Peehat/func_80AD2438.s @@ -33,7 +33,7 @@ glabel func_80AD2438 /* 03010 80AD24B0 E7A40038 */ swc1 $f4, 0x0038($sp) /* 03014 80AD24B4 8F050000 */ lw $a1, 0x0000($t8) ## 00000000 /* 03018 80AD24B8 240707BD */ addiu $a3, $zero, 0x07BD ## $a3 = 000007BD -/* 0301C 80AD24BC 0C031AB1 */ jal func_800C6AC4 +/* 0301C 80AD24BC 0C031AB1 */ jal Graph_OpenDisps /* 03020 80AD24C0 AFA50034 */ sw $a1, 0x0034($sp) /* 03024 80AD24C4 0C034213 */ jal Matrix_Push /* 03028 80AD24C8 00000000 */ nop @@ -120,7 +120,7 @@ glabel func_80AD2438 /* 03164 80AD2604 24C628F4 */ addiu $a2, $a2, %lo(D_80AD28F4) ## $a2 = 80AD28F4 /* 03168 80AD2608 27A40024 */ addiu $a0, $sp, 0x0024 ## $a0 = FFFFFFE4 /* 0316C 80AD260C 240707CA */ addiu $a3, $zero, 0x07CA ## $a3 = 000007CA -/* 03170 80AD2610 0C031AD5 */ jal func_800C6B54 +/* 03170 80AD2610 0C031AD5 */ jal Graph_CloseDisps /* 03174 80AD2614 8F250000 */ lw $a1, 0x0000($t9) ## 00000000 .L80AD2618: /* 03178 80AD2618 8FBF0014 */ lw $ra, 0x0014($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Po_Desert/EnPoDesert_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Po_Desert/EnPoDesert_Draw.s index b7a61a6614..2d07a376b2 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Po_Desert/EnPoDesert_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Po_Desert/EnPoDesert_Draw.s @@ -1,19 +1,19 @@ glabel EnPoDesert_Draw /* 00B44 80AD37F4 27BDFF98 */ addiu $sp, $sp, 0xFF98 ## $sp = FFFFFF98 -/* 00B48 80AD37F8 AFB20030 */ sw $s2, 0x0030($sp) +/* 00B48 80AD37F8 AFB20030 */ sw $s2, 0x0030($sp) /* 00B4C 80AD37FC 00A09025 */ or $s2, $a1, $zero ## $s2 = 00000000 -/* 00B50 80AD3800 AFBF0034 */ sw $ra, 0x0034($sp) -/* 00B54 80AD3804 AFB1002C */ sw $s1, 0x002C($sp) -/* 00B58 80AD3808 AFB00028 */ sw $s0, 0x0028($sp) +/* 00B50 80AD3800 AFBF0034 */ sw $ra, 0x0034($sp) +/* 00B54 80AD3804 AFB1002C */ sw $s1, 0x002C($sp) +/* 00B58 80AD3808 AFB00028 */ sw $s0, 0x0028($sp) /* 00B5C 80AD380C 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 /* 00B60 80AD3810 00808825 */ or $s1, $a0, $zero ## $s1 = 00000000 /* 00B64 80AD3814 3C0680AD */ lui $a2, %hi(D_80AD3A04) ## $a2 = 80AD0000 /* 00B68 80AD3818 24C63A04 */ addiu $a2, $a2, %lo(D_80AD3A04) ## $a2 = 80AD3A04 /* 00B6C 80AD381C 27A40050 */ addiu $a0, $sp, 0x0050 ## $a0 = FFFFFFE8 /* 00B70 80AD3820 2407022F */ addiu $a3, $zero, 0x022F ## $a3 = 0000022F -/* 00B74 80AD3824 0C031AB1 */ jal func_800C6AC4 +/* 00B74 80AD3824 0C031AB1 */ jal Graph_OpenDisps /* 00B78 80AD3828 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 -/* 00B7C 80AD382C 0C024F61 */ jal func_80093D84 +/* 00B7C 80AD382C 0C024F61 */ jal func_80093D84 /* 00B80 80AD3830 8E440000 */ lw $a0, 0x0000($s2) ## 00000000 /* 00B84 80AD3834 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 /* 00B88 80AD3838 3C0FDB06 */ lui $t7, 0xDB06 ## $t7 = DB060000 @@ -23,13 +23,13 @@ glabel EnPoDesert_Draw /* 00B98 80AD3848 AC4F0000 */ sw $t7, 0x0000($v0) ## 00000000 /* 00B9C 80AD384C 8E440000 */ lw $a0, 0x0000($s2) ## 00000000 /* 00BA0 80AD3850 241800FF */ addiu $t8, $zero, 0x00FF ## $t8 = 000000FF -/* 00BA4 80AD3854 AFB80010 */ sw $t8, 0x0010($sp) +/* 00BA4 80AD3854 AFB80010 */ sw $t8, 0x0010($sp) /* 00BA8 80AD3858 240500FF */ addiu $a1, $zero, 0x00FF ## $a1 = 000000FF /* 00BAC 80AD385C 24060055 */ addiu $a2, $zero, 0x0055 ## $a2 = 00000055 /* 00BB0 80AD3860 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 00BB4 80AD3864 0C025474 */ jal func_800951D0 -/* 00BB8 80AD3868 AFA2004C */ sw $v0, 0x004C($sp) -/* 00BBC 80AD386C 8FA3004C */ lw $v1, 0x004C($sp) +/* 00BB4 80AD3864 0C025474 */ jal Gfx_EnvColor +/* 00BB8 80AD3868 AFA2004C */ sw $v0, 0x004C($sp) +/* 00BBC 80AD386C 8FA3004C */ lw $v1, 0x004C($sp) /* 00BC0 80AD3870 3C08DB06 */ lui $t0, 0xDB06 ## $t0 = DB060000 /* 00BC4 80AD3874 35080020 */ ori $t0, $t0, 0x0020 ## $t0 = DB060020 /* 00BC8 80AD3878 AC620004 */ sw $v0, 0x0004($v1) ## 00000004 @@ -42,17 +42,17 @@ glabel EnPoDesert_Draw /* 00BE4 80AD3894 92260221 */ lbu $a2, 0x0221($s1) ## 00000221 /* 00BE8 80AD3898 92250220 */ lbu $a1, 0x0220($s1) ## 00000220 /* 00BEC 80AD389C 8E440000 */ lw $a0, 0x0000($s2) ## 00000000 -/* 00BF0 80AD38A0 AFA20048 */ sw $v0, 0x0048($sp) -/* 00BF4 80AD38A4 0C025474 */ jal func_800951D0 -/* 00BF8 80AD38A8 AFA90010 */ sw $t1, 0x0010($sp) -/* 00BFC 80AD38AC 8FA30048 */ lw $v1, 0x0048($sp) +/* 00BF0 80AD38A0 AFA20048 */ sw $v0, 0x0048($sp) +/* 00BF4 80AD38A4 0C025474 */ jal Gfx_EnvColor +/* 00BF8 80AD38A8 AFA90010 */ sw $t1, 0x0010($sp) +/* 00BFC 80AD38AC 8FA30048 */ lw $v1, 0x0048($sp) /* 00C00 80AD38B0 3C0A80AD */ lui $t2, %hi(func_80AD3328) ## $t2 = 80AD0000 /* 00C04 80AD38B4 254A3328 */ addiu $t2, $t2, %lo(func_80AD3328) ## $t2 = 80AD3328 /* 00C08 80AD38B8 AC620004 */ sw $v0, 0x0004($v1) ## 00000004 /* 00C0C 80AD38BC 8E2B0190 */ lw $t3, 0x0190($s1) ## 00000190 /* 00C10 80AD38C0 02402025 */ or $a0, $s2, $zero ## $a0 = 00000000 /* 00C14 80AD38C4 3C0780AD */ lui $a3, %hi(func_80AD3504) ## $a3 = 80AD0000 -/* 00C18 80AD38C8 154B000B */ bne $t2, $t3, .L80AD38F8 +/* 00C18 80AD38C8 154B000B */ bne $t2, $t3, .L80AD38F8 /* 00C1C 80AD38CC 3C0880AD */ lui $t0, %hi(func_80AD3594) ## $t0 = 80AD0000 /* 00C20 80AD38D0 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 /* 00C24 80AD38D4 3C0DDB06 */ lui $t5, 0xDB06 ## $t5 = DB060000 @@ -62,7 +62,7 @@ glabel EnPoDesert_Draw /* 00C34 80AD38E4 25CE6280 */ addiu $t6, $t6, 0x6280 ## $t6 = 80116280 /* 00C38 80AD38E8 35AD0030 */ ori $t5, $t5, 0x0030 ## $t5 = DB060030 /* 00C3C 80AD38EC AC4D0000 */ sw $t5, 0x0000($v0) ## 00000000 -/* 00C40 80AD38F0 1000000A */ beq $zero, $zero, .L80AD391C +/* 00C40 80AD38F0 1000000A */ beq $zero, $zero, .L80AD391C /* 00C44 80AD38F4 AC4E0004 */ sw $t6, 0x0004($v0) ## 00000004 .L80AD38F8: /* 00C48 80AD38F8 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 @@ -78,24 +78,24 @@ glabel EnPoDesert_Draw /* 00C6C 80AD391C 8E250150 */ lw $a1, 0x0150($s1) ## 00000150 /* 00C70 80AD3920 8E26016C */ lw $a2, 0x016C($s1) ## 0000016C /* 00C74 80AD3924 25083594 */ addiu $t0, $t0, %lo(func_80AD3594) ## $t0 = 80AD3594 -/* 00C78 80AD3928 AFA80010 */ sw $t0, 0x0010($sp) -/* 00C7C 80AD392C AFB10014 */ sw $s1, 0x0014($sp) +/* 00C78 80AD3928 AFA80010 */ sw $t0, 0x0010($sp) +/* 00C7C 80AD392C AFB10014 */ sw $s1, 0x0014($sp) /* 00C80 80AD3930 8E0902D0 */ lw $t1, 0x02D0($s0) ## 000002D0 /* 00C84 80AD3934 24E73504 */ addiu $a3, $a3, %lo(func_80AD3504) ## $a3 = 80AD3504 -/* 00C88 80AD3938 0C0288A2 */ jal func_800A2288 -/* 00C8C 80AD393C AFA90018 */ sw $t1, 0x0018($sp) +/* 00C88 80AD3938 0C0288A2 */ jal SkelAnime_Draw2 +/* 00C8C 80AD393C AFA90018 */ sw $t1, 0x0018($sp) /* 00C90 80AD3940 AE0202D0 */ sw $v0, 0x02D0($s0) ## 000002D0 /* 00C94 80AD3944 3C0680AD */ lui $a2, %hi(D_80AD3A18) ## $a2 = 80AD0000 /* 00C98 80AD3948 24C63A18 */ addiu $a2, $a2, %lo(D_80AD3A18) ## $a2 = 80AD3A18 /* 00C9C 80AD394C 8E450000 */ lw $a1, 0x0000($s2) ## 00000000 /* 00CA0 80AD3950 27A40050 */ addiu $a0, $sp, 0x0050 ## $a0 = FFFFFFE8 -/* 00CA4 80AD3954 0C031AD5 */ jal func_800C6B54 +/* 00CA4 80AD3954 0C031AD5 */ jal Graph_CloseDisps /* 00CA8 80AD3958 24070255 */ addiu $a3, $zero, 0x0255 ## $a3 = 00000255 -/* 00CAC 80AD395C 8FBF0034 */ lw $ra, 0x0034($sp) -/* 00CB0 80AD3960 8FB00028 */ lw $s0, 0x0028($sp) -/* 00CB4 80AD3964 8FB1002C */ lw $s1, 0x002C($sp) -/* 00CB8 80AD3968 8FB20030 */ lw $s2, 0x0030($sp) -/* 00CBC 80AD396C 03E00008 */ jr $ra +/* 00CAC 80AD395C 8FBF0034 */ lw $ra, 0x0034($sp) +/* 00CB0 80AD3960 8FB00028 */ lw $s0, 0x0028($sp) +/* 00CB4 80AD3964 8FB1002C */ lw $s1, 0x002C($sp) +/* 00CB8 80AD3968 8FB20030 */ lw $s2, 0x0030($sp) +/* 00CBC 80AD396C 03E00008 */ jr $ra /* 00CC0 80AD3970 27BD0068 */ addiu $sp, $sp, 0x0068 ## $sp = 00000000 /* 00CC4 80AD3974 00000000 */ nop /* 00CC8 80AD3978 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Po_Desert/func_80AD2E64.s b/asm/non_matchings/overlays/actors/ovl_En_Po_Desert/func_80AD2E64.s index b28e9db3a1..70511fd88b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Po_Desert/func_80AD2E64.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Po_Desert/func_80AD2E64.s @@ -1,68 +1,68 @@ glabel func_80AD2E64 /* 001B4 80AD2E64 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 001B8 80AD2E68 AFBF0014 */ sw $ra, 0x0014($sp) -/* 001BC 80AD2E6C AFA50024 */ sw $a1, 0x0024($sp) +/* 001B8 80AD2E68 AFBF0014 */ sw $ra, 0x0014($sp) +/* 001BC 80AD2E6C AFA50024 */ sw $a1, 0x0024($sp) /* 001C0 80AD2E70 3C0F0001 */ lui $t7, 0x0001 ## $t7 = 00010000 /* 001C4 80AD2E74 8498001C */ lh $t8, 0x001C($a0) ## 0000001C -/* 001C8 80AD2E78 01E57821 */ addu $t7, $t7, $a1 +/* 001C8 80AD2E78 01E57821 */ addu $t7, $t7, $a1 /* 001CC 80AD2E7C 8DEF1E08 */ lw $t7, 0x1E08($t7) ## 00011E08 -/* 001D0 80AD2E80 0018C8C0 */ sll $t9, $t8, 3 +/* 001D0 80AD2E80 0018C8C0 */ sll $t9, $t8, 3 /* 001D4 80AD2E84 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 /* 001D8 80AD2E88 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 001DC 80AD2E8C 01F94021 */ addu $t0, $t7, $t9 -/* 001E0 80AD2E90 AFA8001C */ sw $t0, 0x001C($sp) +/* 001DC 80AD2E8C 01F94021 */ addu $t0, $t7, $t9 +/* 001E0 80AD2E90 AFA8001C */ sw $t0, 0x001C($sp) /* 001E4 80AD2E94 24A51360 */ addiu $a1, $a1, 0x1360 ## $a1 = 06001360 -/* 001E8 80AD2E98 AFA70020 */ sw $a3, 0x0020($sp) +/* 001E8 80AD2E98 AFA70020 */ sw $a3, 0x0020($sp) /* 001EC 80AD2E9C 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 001F0 80AD2EA0 0C0294D3 */ jal func_800A534C +/* 001F0 80AD2EA0 0C0294D3 */ jal SkelAnime_ChangeAnimTransitionRepeat /* 001F4 80AD2EA4 3C06C0C0 */ lui $a2, 0xC0C0 ## $a2 = C0C00000 -/* 001F8 80AD2EA8 8FA9001C */ lw $t1, 0x001C($sp) -/* 001FC 80AD2EAC 8FA40020 */ lw $a0, 0x0020($sp) +/* 001F8 80AD2EA8 8FA9001C */ lw $t1, 0x001C($sp) +/* 001FC 80AD2EAC 8FA40020 */ lw $a0, 0x0020($sp) /* 00200 80AD2EB0 3C0D8016 */ lui $t5, 0x8016 ## $t5 = 80160000 /* 00204 80AD2EB4 8D230004 */ lw $v1, 0x0004($t1) ## 00000004 /* 00208 80AD2EB8 8C8F0198 */ lw $t7, 0x0198($a0) ## 00000198 /* 0020C 80AD2EBC 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 -/* 00210 80AD2EC0 00035100 */ sll $t2, $v1, 4 -/* 00214 80AD2EC4 000A5F02 */ srl $t3, $t2, 28 -/* 00218 80AD2EC8 000B6080 */ sll $t4, $t3, 2 -/* 0021C 80AD2ECC 01AC6821 */ addu $t5, $t5, $t4 +/* 00210 80AD2EC0 00035100 */ sll $t2, $v1, 4 +/* 00214 80AD2EC4 000A5F02 */ srl $t3, $t2, 28 +/* 00218 80AD2EC8 000B6080 */ sll $t4, $t3, 2 +/* 0021C 80AD2ECC 01AC6821 */ addu $t5, $t5, $t4 /* 00220 80AD2ED0 8DAD6FA8 */ lw $t5, 0x6FA8($t5) ## 80166FA8 /* 00224 80AD2ED4 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF -/* 00228 80AD2ED8 000FC880 */ sll $t9, $t7, 2 -/* 0022C 80AD2EDC 00617024 */ and $t6, $v1, $at -/* 00230 80AD2EE0 032FC823 */ subu $t9, $t9, $t7 -/* 00234 80AD2EE4 0019C840 */ sll $t9, $t9, 1 -/* 00238 80AD2EE8 01AEC021 */ addu $t8, $t5, $t6 -/* 0023C 80AD2EEC 03191021 */ addu $v0, $t8, $t9 +/* 00228 80AD2ED8 000FC880 */ sll $t9, $t7, 2 +/* 0022C 80AD2EDC 00617024 */ and $t6, $v1, $at +/* 00230 80AD2EE0 032FC823 */ subu $t9, $t9, $t7 +/* 00234 80AD2EE4 0019C840 */ sll $t9, $t9, 1 +/* 00238 80AD2EE8 01AEC021 */ addu $t8, $t5, $t6 +/* 0023C 80AD2EEC 03191021 */ addu $v0, $t8, $t9 /* 00240 80AD2EF0 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 00244 80AD2EF4 00411021 */ addu $v0, $v0, $at +/* 00244 80AD2EF4 00411021 */ addu $v0, $v0, $at /* 00248 80AD2EF8 84480000 */ lh $t0, 0x0000($v0) ## 00000000 /* 0024C 80AD2EFC 24850008 */ addiu $a1, $a0, 0x0008 ## $a1 = 00000008 /* 00250 80AD2F00 44882000 */ mtc1 $t0, $f4 ## $f4 = 0.00 /* 00254 80AD2F04 00000000 */ nop -/* 00258 80AD2F08 468021A0 */ cvt.s.w $f6, $f4 +/* 00258 80AD2F08 468021A0 */ cvt.s.w $f6, $f4 /* 0025C 80AD2F0C E4860008 */ swc1 $f6, 0x0008($a0) ## 00000008 /* 00260 80AD2F10 84490002 */ lh $t1, 0x0002($v0) ## 00000002 /* 00264 80AD2F14 44894000 */ mtc1 $t1, $f8 ## $f8 = 0.00 /* 00268 80AD2F18 00000000 */ nop -/* 0026C 80AD2F1C 468042A0 */ cvt.s.w $f10, $f8 +/* 0026C 80AD2F1C 468042A0 */ cvt.s.w $f10, $f8 /* 00270 80AD2F20 E48A000C */ swc1 $f10, 0x000C($a0) ## 0000000C /* 00274 80AD2F24 844A0004 */ lh $t2, 0x0004($v0) ## 00000004 /* 00278 80AD2F28 448A8000 */ mtc1 $t2, $f16 ## $f16 = 0.00 /* 0027C 80AD2F2C 00000000 */ nop -/* 00280 80AD2F30 468084A0 */ cvt.s.w $f18, $f16 -/* 00284 80AD2F34 0C00B6EC */ jal func_8002DBB0 +/* 00280 80AD2F30 468084A0 */ cvt.s.w $f18, $f16 +/* 00284 80AD2F34 0C00B6EC */ jal func_8002DBB0 /* 00288 80AD2F38 E4920010 */ swc1 $f18, 0x0010($a0) ## 00000010 /* 0028C 80AD2F3C 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 /* 00290 80AD2F40 44811000 */ mtc1 $at, $f2 ## $f2 = 1.00 -/* 00294 80AD2F44 8FA70020 */ lw $a3, 0x0020($sp) +/* 00294 80AD2F44 8FA70020 */ lw $a3, 0x0020($sp) /* 00298 80AD2F48 3C1880AD */ lui $t8, %hi(func_80AD30D0) ## $t8 = 80AD0000 -/* 0029C 80AD2F4C 4602003C */ c.lt.s $f0, $f2 +/* 0029C 80AD2F4C 4602003C */ c.lt.s $f0, $f2 /* 002A0 80AD2F50 271830D0 */ addiu $t8, $t8, %lo(func_80AD30D0) ## $t8 = 80AD30D0 /* 002A4 80AD2F54 E4E0019C */ swc1 $f0, 0x019C($a3) ## 0000019C -/* 002A8 80AD2F58 45020004 */ bc1fl .L80AD2F6C +/* 002A8 80AD2F58 45020004 */ bc1fl .L80AD2F6C /* 002AC 80AD2F5C C4E4019C */ lwc1 $f4, 0x019C($a3) ## 0000019C -/* 002B0 80AD2F60 10000003 */ beq $zero, $zero, .L80AD2F70 +/* 002B0 80AD2F60 10000003 */ beq $zero, $zero, .L80AD2F70 /* 002B4 80AD2F64 E4E2019C */ swc1 $f2, 0x019C($a3) ## 0000019C /* 002B8 80AD2F68 C4E4019C */ lwc1 $f4, 0x019C($a3) ## 0000019C .L80AD2F6C: @@ -72,21 +72,21 @@ glabel func_80AD2E64 /* 002C4 80AD2F74 C4E80028 */ lwc1 $f8, 0x0028($a3) ## 00000028 /* 002C8 80AD2F78 8CEB0198 */ lw $t3, 0x0198($a3) ## 00000198 /* 002CC 80AD2F7C 44808000 */ mtc1 $zero, $f16 ## $f16 = 0.00 -/* 002D0 80AD2F80 46083281 */ sub.s $f10, $f6, $f8 +/* 002D0 80AD2F80 46083281 */ sub.s $f10, $f6, $f8 /* 002D4 80AD2F84 256C0001 */ addiu $t4, $t3, 0x0001 ## $t4 = 00000001 /* 002D8 80AD2F88 ACEC0198 */ sw $t4, 0x0198($a3) ## 00000198 /* 002DC 80AD2F8C E4F00068 */ swc1 $f16, 0x0068($a3) ## 00000068 /* 002E0 80AD2F90 E4EA01A0 */ swc1 $f10, 0x01A0($a3) ## 000001A0 -/* 002E4 80AD2F94 8FAE001C */ lw $t6, 0x001C($sp) +/* 002E4 80AD2F94 8FAE001C */ lw $t6, 0x001C($sp) /* 002E8 80AD2F98 91CF0000 */ lbu $t7, 0x0000($t6) ## 00000000 -/* 002EC 80AD2F9C 558F0003 */ bnel $t4, $t7, .L80AD2FAC +/* 002EC 80AD2F9C 558F0003 */ bnel $t4, $t7, .L80AD2FAC /* 002F0 80AD2FA0 ACF80190 */ sw $t8, 0x0190($a3) ## 00000190 /* 002F4 80AD2FA4 ACE00198 */ sw $zero, 0x0198($a3) ## 00000198 /* 002F8 80AD2FA8 ACF80190 */ sw $t8, 0x0190($a3) ## 00000190 .L80AD2FAC: -/* 002FC 80AD2FAC 8FBF0014 */ lw $ra, 0x0014($sp) +/* 002FC 80AD2FAC 8FBF0014 */ lw $ra, 0x0014($sp) /* 00300 80AD2FB0 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 00304 80AD2FB4 03E00008 */ jr $ra +/* 00304 80AD2FB4 03E00008 */ jr $ra /* 00308 80AD2FB8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Po_Desert/func_80AD2FBC.s b/asm/non_matchings/overlays/actors/ovl_En_Po_Desert/func_80AD2FBC.s index 2ccb629528..e80b8dc266 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Po_Desert/func_80AD2FBC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Po_Desert/func_80AD2FBC.s @@ -1,19 +1,19 @@ glabel func_80AD2FBC /* 0030C 80AD2FBC 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00310 80AD2FC0 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00314 80AD2FC4 AFA40018 */ sw $a0, 0x0018($sp) +/* 00310 80AD2FC0 AFBF0014 */ sw $ra, 0x0014($sp) +/* 00314 80AD2FC4 AFA40018 */ sw $a0, 0x0018($sp) /* 00318 80AD2FC8 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 0031C 80AD2FCC 24A50924 */ addiu $a1, $a1, 0x0924 ## $a1 = 06000924 /* 00320 80AD2FD0 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 00324 80AD2FD4 0C0294D3 */ jal func_800A534C +/* 00324 80AD2FD4 0C0294D3 */ jal SkelAnime_ChangeAnimTransitionRepeat /* 00328 80AD2FD8 3C06C0A0 */ lui $a2, 0xC0A0 ## $a2 = C0A00000 -/* 0032C 80AD2FDC 8FAF0018 */ lw $t7, 0x0018($sp) +/* 0032C 80AD2FDC 8FAF0018 */ lw $t7, 0x0018($sp) /* 00330 80AD2FE0 3C0E80AD */ lui $t6, %hi(func_80AD3194) ## $t6 = 80AD0000 /* 00334 80AD2FE4 25CE3194 */ addiu $t6, $t6, %lo(func_80AD3194) ## $t6 = 80AD3194 /* 00338 80AD2FE8 ADEE0190 */ sw $t6, 0x0190($t7) ## 00000190 -/* 0033C 80AD2FEC 8FBF0014 */ lw $ra, 0x0014($sp) +/* 0033C 80AD2FEC 8FBF0014 */ lw $ra, 0x0014($sp) /* 00340 80AD2FF0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00344 80AD2FF4 03E00008 */ jr $ra +/* 00344 80AD2FF4 03E00008 */ jr $ra /* 00348 80AD2FF8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Po_Desert/func_80AD2FFC.s b/asm/non_matchings/overlays/actors/ovl_En_Po_Desert/func_80AD2FFC.s index b8169112dd..2ba80b51c0 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Po_Desert/func_80AD2FFC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Po_Desert/func_80AD2FFC.s @@ -1,28 +1,28 @@ glabel func_80AD2FFC /* 0034C 80AD2FFC 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00350 80AD3000 AFBF0014 */ sw $ra, 0x0014($sp) +/* 00350 80AD3000 AFBF0014 */ sw $ra, 0x0014($sp) /* 00354 80AD3004 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 /* 00358 80AD3008 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 0035C 80AD300C 24A51360 */ addiu $a1, $a1, 0x1360 ## $a1 = 06001360 -/* 00360 80AD3010 AFA70018 */ sw $a3, 0x0018($sp) +/* 00360 80AD3010 AFA70018 */ sw $a3, 0x0018($sp) /* 00364 80AD3014 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 00368 80AD3018 0C029490 */ jal func_800A5240 +/* 00368 80AD3018 0C029490 */ jal SkelAnime_ChangeAnimTransitionStop /* 0036C 80AD301C 3C06C0C0 */ lui $a2, 0xC0C0 ## $a2 = C0C00000 -/* 00370 80AD3020 8FA40018 */ lw $a0, 0x0018($sp) +/* 00370 80AD3020 8FA40018 */ lw $a0, 0x0018($sp) /* 00374 80AD3024 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 /* 00378 80AD3028 240E0010 */ addiu $t6, $zero, 0x0010 ## $t6 = 00000010 /* 0037C 80AD302C 24053874 */ addiu $a1, $zero, 0x3874 ## $a1 = 00003874 /* 00380 80AD3030 A48E0194 */ sh $t6, 0x0194($a0) ## 00000194 /* 00384 80AD3034 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 00388 80AD3038 E4840068 */ swc1 $f4, 0x0068($a0) ## 00000068 -/* 0038C 80AD303C 8FA70018 */ lw $a3, 0x0018($sp) +/* 0038C 80AD303C 8FA70018 */ lw $a3, 0x0018($sp) /* 00390 80AD3040 3C0F80AD */ lui $t7, %hi(func_80AD3328) ## $t7 = 80AD0000 /* 00394 80AD3044 25EF3328 */ addiu $t7, $t7, %lo(func_80AD3328) ## $t7 = 80AD3328 /* 00398 80AD3048 ACEF0190 */ sw $t7, 0x0190($a3) ## 00000190 -/* 0039C 80AD304C 8FBF0014 */ lw $ra, 0x0014($sp) +/* 0039C 80AD304C 8FBF0014 */ lw $ra, 0x0014($sp) /* 003A0 80AD3050 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 003A4 80AD3054 03E00008 */ jr $ra +/* 003A4 80AD3054 03E00008 */ jr $ra /* 003A8 80AD3058 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Po_Field/EnPoField_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Po_Field/EnPoField_Draw.s index 7dbc46474a..35afec827f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Po_Field/EnPoField_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Po_Field/EnPoField_Draw.s @@ -1,34 +1,34 @@ glabel EnPoField_Draw /* 02DE4 80AD68E4 27BDFF80 */ addiu $sp, $sp, 0xFF80 ## $sp = FFFFFF80 -/* 02DE8 80AD68E8 AFBF0034 */ sw $ra, 0x0034($sp) -/* 02DEC 80AD68EC AFB20030 */ sw $s2, 0x0030($sp) -/* 02DF0 80AD68F0 AFB1002C */ sw $s1, 0x002C($sp) -/* 02DF4 80AD68F4 AFB00028 */ sw $s0, 0x0028($sp) +/* 02DE8 80AD68E8 AFBF0034 */ sw $ra, 0x0034($sp) +/* 02DEC 80AD68EC AFB20030 */ sw $s2, 0x0030($sp) +/* 02DF0 80AD68F0 AFB1002C */ sw $s1, 0x002C($sp) +/* 02DF4 80AD68F4 AFB00028 */ sw $s0, 0x0028($sp) /* 02DF8 80AD68F8 848E001C */ lh $t6, 0x001C($a0) ## 0000001C /* 02DFC 80AD68FC 8C890190 */ lw $t1, 0x0190($a0) ## 00000190 /* 02E00 80AD6900 3C1880AD */ lui $t8, %hi(D_80AD712C) ## $t8 = 80AD0000 /* 02E04 80AD6904 3C1980AD */ lui $t9, %hi(func_80AD4664) ## $t9 = 80AD0000 /* 02E08 80AD6908 2718712C */ addiu $t8, $t8, %lo(D_80AD712C) ## $t8 = 80AD712C /* 02E0C 80AD690C 27394664 */ addiu $t9, $t9, %lo(func_80AD4664) ## $t9 = 80AD4664 -/* 02E10 80AD6910 000E7900 */ sll $t7, $t6, 4 +/* 02E10 80AD6910 000E7900 */ sll $t7, $t6, 4 /* 02E14 80AD6914 00808825 */ or $s1, $a0, $zero ## $s1 = 00000000 /* 02E18 80AD6918 00A09025 */ or $s2, $a1, $zero ## $s2 = 00000000 -/* 02E1C 80AD691C 132900AC */ beq $t9, $t1, .L80AD6BD0 -/* 02E20 80AD6920 01F84021 */ addu $t0, $t7, $t8 +/* 02E1C 80AD691C 132900AC */ beq $t9, $t1, .L80AD6BD0 +/* 02E20 80AD6920 01F84021 */ addu $t0, $t7, $t8 /* 02E24 80AD6924 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 /* 02E28 80AD6928 3C0680AD */ lui $a2, %hi(D_80AD71B0) ## $a2 = 80AD0000 /* 02E2C 80AD692C 24C671B0 */ addiu $a2, $a2, %lo(D_80AD71B0) ## $a2 = 80AD71B0 -/* 02E30 80AD6930 AFA80078 */ sw $t0, 0x0078($sp) +/* 02E30 80AD6930 AFA80078 */ sw $t0, 0x0078($sp) /* 02E34 80AD6934 27A40064 */ addiu $a0, $sp, 0x0064 ## $a0 = FFFFFFE4 /* 02E38 80AD6938 240707B8 */ addiu $a3, $zero, 0x07B8 ## $a3 = 000007B8 -/* 02E3C 80AD693C 0C031AB1 */ jal func_800C6AC4 +/* 02E3C 80AD693C 0C031AB1 */ jal Graph_OpenDisps /* 02E40 80AD6940 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 -/* 02E44 80AD6944 0C024F46 */ jal func_80093D18 +/* 02E44 80AD6944 0C024F46 */ jal func_80093D18 /* 02E48 80AD6948 8E440000 */ lw $a0, 0x0000($s2) ## 00000000 -/* 02E4C 80AD694C 0C024F61 */ jal func_80093D84 +/* 02E4C 80AD694C 0C024F61 */ jal func_80093D84 /* 02E50 80AD6950 8E440000 */ lw $a0, 0x0000($s2) ## 00000000 /* 02E54 80AD6954 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 -/* 02E58 80AD6958 8FA80078 */ lw $t0, 0x0078($sp) +/* 02E58 80AD6958 8FA80078 */ lw $t0, 0x0078($sp) /* 02E5C 80AD695C 3C0BDB06 */ lui $t3, 0xDB06 ## $t3 = DB060000 /* 02E60 80AD6960 244A0008 */ addiu $t2, $v0, 0x0008 ## $t2 = 00000008 /* 02E64 80AD6964 AE0A02C0 */ sw $t2, 0x02C0($s0) ## 000002C0 @@ -39,16 +39,16 @@ glabel EnPoField_Draw /* 02E78 80AD6978 91070008 */ lbu $a3, 0x0008($t0) ## 00000008 /* 02E7C 80AD697C 91060007 */ lbu $a2, 0x0007($t0) ## 00000007 /* 02E80 80AD6980 91050006 */ lbu $a1, 0x0006($t0) ## 00000006 -/* 02E84 80AD6984 AFAC0010 */ sw $t4, 0x0010($sp) -/* 02E88 80AD6988 0C025474 */ jal func_800951D0 -/* 02E8C 80AD698C AFA20060 */ sw $v0, 0x0060($sp) -/* 02E90 80AD6990 8FA30060 */ lw $v1, 0x0060($sp) +/* 02E84 80AD6984 AFAC0010 */ sw $t4, 0x0010($sp) +/* 02E88 80AD6988 0C025474 */ jal Gfx_EnvColor +/* 02E8C 80AD698C AFA20060 */ sw $v0, 0x0060($sp) +/* 02E90 80AD6990 8FA30060 */ lw $v1, 0x0060($sp) /* 02E94 80AD6994 240100FF */ addiu $at, $zero, 0x00FF ## $at = 000000FF /* 02E98 80AD6998 AC620004 */ sw $v0, 0x0004($v1) ## 00000004 /* 02E9C 80AD699C 92220217 */ lbu $v0, 0x0217($s1) ## 00000217 -/* 02EA0 80AD69A0 50410004 */ beql $v0, $at, .L80AD69B4 +/* 02EA0 80AD69A0 50410004 */ beql $v0, $at, .L80AD69B4 /* 02EA4 80AD69A4 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 -/* 02EA8 80AD69A8 54400029 */ bnel $v0, $zero, .L80AD6A50 +/* 02EA8 80AD69A8 54400029 */ bnel $v0, $zero, .L80AD6A50 /* 02EAC 80AD69AC 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 /* 02EB0 80AD69B0 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 .L80AD69B4: @@ -62,10 +62,10 @@ glabel EnPoField_Draw /* 02ED0 80AD69D0 92260215 */ lbu $a2, 0x0215($s1) ## 00000215 /* 02ED4 80AD69D4 92250214 */ lbu $a1, 0x0214($s1) ## 00000214 /* 02ED8 80AD69D8 8E440000 */ lw $a0, 0x0000($s2) ## 00000000 -/* 02EDC 80AD69DC AFA2005C */ sw $v0, 0x005C($sp) -/* 02EE0 80AD69E0 0C025474 */ jal func_800951D0 -/* 02EE4 80AD69E4 AFAF0010 */ sw $t7, 0x0010($sp) -/* 02EE8 80AD69E8 8FA3005C */ lw $v1, 0x005C($sp) +/* 02EDC 80AD69DC AFA2005C */ sw $v0, 0x005C($sp) +/* 02EE0 80AD69E0 0C025474 */ jal Gfx_EnvColor +/* 02EE4 80AD69E4 AFAF0010 */ sw $t7, 0x0010($sp) +/* 02EE8 80AD69E8 8FA3005C */ lw $v1, 0x005C($sp) /* 02EEC 80AD69EC 3C19DB06 */ lui $t9, 0xDB06 ## $t9 = DB060000 /* 02EF0 80AD69F0 3C098011 */ lui $t1, 0x8011 ## $t1 = 80110000 /* 02EF4 80AD69F4 AC620004 */ sw $v0, 0x0004($v1) ## 00000004 @@ -80,15 +80,15 @@ glabel EnPoField_Draw /* 02F18 80AD6A18 8E250150 */ lw $a1, 0x0150($s1) ## 00000150 /* 02F1C 80AD6A1C 3C0A80AD */ lui $t2, %hi(func_80AD66D0) ## $t2 = 80AD0000 /* 02F20 80AD6A20 254A66D0 */ addiu $t2, $t2, %lo(func_80AD66D0) ## $t2 = 80AD66D0 -/* 02F24 80AD6A24 AFAA0010 */ sw $t2, 0x0010($sp) -/* 02F28 80AD6A28 AFB10014 */ sw $s1, 0x0014($sp) +/* 02F24 80AD6A24 AFAA0010 */ sw $t2, 0x0010($sp) +/* 02F28 80AD6A28 AFB10014 */ sw $s1, 0x0014($sp) /* 02F2C 80AD6A2C 8E0B02C0 */ lw $t3, 0x02C0($s0) ## 000002C0 /* 02F30 80AD6A30 3C0780AD */ lui $a3, %hi(func_80AD65C8) ## $a3 = 80AD0000 /* 02F34 80AD6A34 24E765C8 */ addiu $a3, $a3, %lo(func_80AD65C8) ## $a3 = 80AD65C8 /* 02F38 80AD6A38 02402025 */ or $a0, $s2, $zero ## $a0 = 00000000 -/* 02F3C 80AD6A3C 0C0288A2 */ jal func_800A2288 -/* 02F40 80AD6A40 AFAB0018 */ sw $t3, 0x0018($sp) -/* 02F44 80AD6A44 10000027 */ beq $zero, $zero, .L80AD6AE4 +/* 02F3C 80AD6A3C 0C0288A2 */ jal SkelAnime_Draw2 +/* 02F40 80AD6A40 AFAB0018 */ sw $t3, 0x0018($sp) +/* 02F44 80AD6A44 10000027 */ beq $zero, $zero, .L80AD6AE4 /* 02F48 80AD6A48 AE0202C0 */ sw $v0, 0x02C0($s0) ## 000002C0 /* 02F4C 80AD6A4C 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 .L80AD6A50: @@ -102,10 +102,10 @@ glabel EnPoField_Draw /* 02F6C 80AD6A6C 92260215 */ lbu $a2, 0x0215($s1) ## 00000215 /* 02F70 80AD6A70 92250214 */ lbu $a1, 0x0214($s1) ## 00000214 /* 02F74 80AD6A74 8E440000 */ lw $a0, 0x0000($s2) ## 00000000 -/* 02F78 80AD6A78 AFA20054 */ sw $v0, 0x0054($sp) -/* 02F7C 80AD6A7C 0C025474 */ jal func_800951D0 -/* 02F80 80AD6A80 AFAE0010 */ sw $t6, 0x0010($sp) -/* 02F84 80AD6A84 8FA30054 */ lw $v1, 0x0054($sp) +/* 02F78 80AD6A78 AFA20054 */ sw $v0, 0x0054($sp) +/* 02F7C 80AD6A7C 0C025474 */ jal Gfx_EnvColor +/* 02F80 80AD6A80 AFAE0010 */ sw $t6, 0x0010($sp) +/* 02F84 80AD6A84 8FA30054 */ lw $v1, 0x0054($sp) /* 02F88 80AD6A88 3C18DB06 */ lui $t8, 0xDB06 ## $t8 = DB060000 /* 02F8C 80AD6A8C 3C198011 */ lui $t9, 0x8011 ## $t9 = 80110000 /* 02F90 80AD6A90 AC620004 */ sw $v0, 0x0004($v1) ## 00000004 @@ -120,14 +120,14 @@ glabel EnPoField_Draw /* 02FB4 80AD6AB4 8E250150 */ lw $a1, 0x0150($s1) ## 00000150 /* 02FB8 80AD6AB8 3C0980AD */ lui $t1, %hi(func_80AD66D0) ## $t1 = 80AD0000 /* 02FBC 80AD6ABC 252966D0 */ addiu $t1, $t1, %lo(func_80AD66D0) ## $t1 = 80AD66D0 -/* 02FC0 80AD6AC0 AFA90010 */ sw $t1, 0x0010($sp) -/* 02FC4 80AD6AC4 AFB10014 */ sw $s1, 0x0014($sp) +/* 02FC0 80AD6AC0 AFA90010 */ sw $t1, 0x0010($sp) +/* 02FC4 80AD6AC4 AFB10014 */ sw $s1, 0x0014($sp) /* 02FC8 80AD6AC8 8E0A02D0 */ lw $t2, 0x02D0($s0) ## 000002D0 /* 02FCC 80AD6ACC 3C0780AD */ lui $a3, %hi(func_80AD65C8) ## $a3 = 80AD0000 /* 02FD0 80AD6AD0 24E765C8 */ addiu $a3, $a3, %lo(func_80AD65C8) ## $a3 = 80AD65C8 /* 02FD4 80AD6AD4 02402025 */ or $a0, $s2, $zero ## $a0 = 00000000 -/* 02FD8 80AD6AD8 0C0288A2 */ jal func_800A2288 -/* 02FDC 80AD6ADC AFAA0018 */ sw $t2, 0x0018($sp) +/* 02FD8 80AD6AD8 0C0288A2 */ jal SkelAnime_Draw2 +/* 02FDC 80AD6ADC AFAA0018 */ sw $t2, 0x0018($sp) /* 02FE0 80AD6AE0 AE0202D0 */ sw $v0, 0x02D0($s0) ## 000002D0 .L80AD6AE4: /* 02FE4 80AD6AE4 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 @@ -146,13 +146,13 @@ glabel EnPoField_Draw /* 03018 80AD6B18 922A0219 */ lbu $t2, 0x0219($s1) ## 00000219 /* 0301C 80AD6B1C 92380218 */ lbu $t8, 0x0218($s1) ## 00000218 /* 03020 80AD6B20 922E021A */ lbu $t6, 0x021A($s1) ## 0000021A -/* 03024 80AD6B24 000A5C00 */ sll $t3, $t2, 16 -/* 03028 80AD6B28 0018CE00 */ sll $t9, $t8, 24 +/* 03024 80AD6B24 000A5C00 */ sll $t3, $t2, 16 +/* 03028 80AD6B28 0018CE00 */ sll $t9, $t8, 24 /* 0302C 80AD6B2C 032B6025 */ or $t4, $t9, $t3 ## $t4 = 00000008 -/* 03030 80AD6B30 000E7A00 */ sll $t7, $t6, 8 +/* 03030 80AD6B30 000E7A00 */ sll $t7, $t6, 8 /* 03034 80AD6B34 018FC025 */ or $t8, $t4, $t7 ## $t8 = 00000008 /* 03038 80AD6B38 370900FF */ ori $t1, $t8, 0x00FF ## $t1 = 000000FF -/* 0303C 80AD6B3C 0C03423F */ jal Matrix_Put +/* 0303C 80AD6B3C 0C03423F */ jal Matrix_Put /* 03040 80AD6B40 AC490004 */ sw $t1, 0x0004($v0) ## 00000004 /* 03044 80AD6B44 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 /* 03048 80AD6B48 3C19DA38 */ lui $t9, 0xDA38 ## $t9 = DA380000 @@ -164,9 +164,9 @@ glabel EnPoField_Draw /* 03060 80AD6B60 3C0580AD */ lui $a1, %hi(D_80AD71C4) ## $a1 = 80AD0000 /* 03064 80AD6B64 24A571C4 */ addiu $a1, $a1, %lo(D_80AD71C4) ## $a1 = 80AD71C4 /* 03068 80AD6B68 240607F1 */ addiu $a2, $zero, 0x07F1 ## $a2 = 000007F1 -/* 0306C 80AD6B6C 0C0346A2 */ jal Matrix_NewMtx -/* 03070 80AD6B70 AFA20044 */ sw $v0, 0x0044($sp) -/* 03074 80AD6B74 8FA30044 */ lw $v1, 0x0044($sp) +/* 0306C 80AD6B6C 0C0346A2 */ jal Matrix_NewMtx +/* 03070 80AD6B70 AFA20044 */ sw $v0, 0x0044($sp) +/* 03074 80AD6B74 8FA30044 */ lw $v1, 0x0044($sp) /* 03078 80AD6B78 3C0D0600 */ lui $t5, 0x0600 ## $t5 = 06000000 /* 0307C 80AD6B7C 25AD4BA0 */ addiu $t5, $t5, 0x4BA0 ## $t5 = 06004BA0 /* 03080 80AD6B80 AC620004 */ sw $v0, 0x0004($v1) ## 00000004 @@ -187,17 +187,17 @@ glabel EnPoField_Draw /* 030BC 80AD6BBC 8E450000 */ lw $a1, 0x0000($s2) ## 00000000 /* 030C0 80AD6BC0 27A40064 */ addiu $a0, $sp, 0x0064 ## $a0 = FFFFFFE4 /* 030C4 80AD6BC4 24C671D8 */ addiu $a2, $a2, %lo(D_80AD71D8) ## $a2 = 80AD71D8 -/* 030C8 80AD6BC8 0C031AD5 */ jal func_800C6B54 +/* 030C8 80AD6BC8 0C031AD5 */ jal Graph_CloseDisps /* 030CC 80AD6BCC 240707F7 */ addiu $a3, $zero, 0x07F7 ## $a3 = 000007F7 .L80AD6BD0: /* 030D0 80AD6BD0 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 030D4 80AD6BD4 0C2B57A3 */ jal func_80AD5E8C +/* 030D4 80AD6BD4 0C2B57A3 */ jal func_80AD5E8C /* 030D8 80AD6BD8 02402825 */ or $a1, $s2, $zero ## $a1 = 00000000 -/* 030DC 80AD6BDC 8FBF0034 */ lw $ra, 0x0034($sp) -/* 030E0 80AD6BE0 8FB00028 */ lw $s0, 0x0028($sp) -/* 030E4 80AD6BE4 8FB1002C */ lw $s1, 0x002C($sp) -/* 030E8 80AD6BE8 8FB20030 */ lw $s2, 0x0030($sp) -/* 030EC 80AD6BEC 03E00008 */ jr $ra +/* 030DC 80AD6BDC 8FBF0034 */ lw $ra, 0x0034($sp) +/* 030E0 80AD6BE0 8FB00028 */ lw $s0, 0x0028($sp) +/* 030E4 80AD6BE4 8FB1002C */ lw $s1, 0x002C($sp) +/* 030E8 80AD6BE8 8FB20030 */ lw $s2, 0x0030($sp) +/* 030EC 80AD6BEC 03E00008 */ jr $ra /* 030F0 80AD6BF0 27BD0080 */ addiu $sp, $sp, 0x0080 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD3E2C.s b/asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD3E2C.s index 0608685f10..bc0a1afc71 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD3E2C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD3E2C.s @@ -1,13 +1,13 @@ glabel func_80AD3E2C /* 0032C 80AD3E2C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00330 80AD3E30 AFBF0014 */ sw $ra, 0x0014($sp) +/* 00330 80AD3E30 AFBF0014 */ sw $ra, 0x0014($sp) /* 00334 80AD3E34 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 /* 00338 80AD3E38 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 0033C 80AD3E3C 24A50F9C */ addiu $a1, $a1, 0x0F9C ## $a1 = 06000F9C -/* 00340 80AD3E40 AFA60018 */ sw $a2, 0x0018($sp) -/* 00344 80AD3E44 0C02947A */ jal func_800A51E8 +/* 00340 80AD3E40 AFA60018 */ sw $a2, 0x0018($sp) +/* 00344 80AD3E44 0C02947A */ jal SkelAnime_ChangeAnimDefaultStop /* 00348 80AD3E48 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 0034C 80AD3E4C 8FA40018 */ lw $a0, 0x0018($sp) +/* 0034C 80AD3E4C 8FA40018 */ lw $a0, 0x0018($sp) /* 00350 80AD3E50 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 /* 00354 80AD3E54 3C0E80AD */ lui $t6, %hi(EnPoField_Draw) ## $t6 = 80AD0000 /* 00358 80AD3E58 240200FF */ addiu $v0, $zero, 0x00FF ## $v0 = 000000FF @@ -21,15 +21,15 @@ glabel func_80AD3E2C /* 00378 80AD3E78 A0800217 */ sb $zero, 0x0217($a0) ## 00000217 /* 0037C 80AD3E7C A08000C8 */ sb $zero, 0x00C8($a0) ## 000000C8 /* 00380 80AD3E80 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 00384 80AD3E84 E48400BC */ swc1 $f4, 0x00BC($a0) ## 000000BC -/* 00388 80AD3E88 8FA60018 */ lw $a2, 0x0018($sp) +/* 00388 80AD3E88 8FA60018 */ lw $a2, 0x0018($sp) /* 0038C 80AD3E8C 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 /* 00390 80AD3E90 3C0F80AD */ lui $t7, %hi(func_80AD48CC) ## $t7 = 80AD0000 /* 00394 80AD3E94 84D8001C */ lh $t8, 0x001C($a2) ## 0000001C /* 00398 80AD3E98 C4C60028 */ lwc1 $f6, 0x0028($a2) ## 00000028 /* 0039C 80AD3E9C 25EF48CC */ addiu $t7, $t7, %lo(func_80AD48CC) ## $t7 = 80AD48CC -/* 003A0 80AD3EA0 17010013 */ bne $t8, $at, .L80AD3EF0 +/* 003A0 80AD3EA0 17010013 */ bne $t8, $at, .L80AD3EF0 /* 003A4 80AD3EA4 E4C6000C */ swc1 $f6, 0x000C($a2) ## 0000000C /* 003A8 80AD3EA8 3C014140 */ lui $at, 0x4140 ## $at = 41400000 /* 003AC 80AD3EAC 44814000 */ mtc1 $at, $f8 ## $f8 = 12.00 @@ -44,10 +44,10 @@ glabel func_80AD3E2C /* 003D0 80AD3ED0 3C0180AD */ lui $at, %hi(D_80AD723C) ## $at = 80AD0000 /* 003D4 80AD3ED4 E4C80068 */ swc1 $f8, 0x0068($a2) ## 00000068 /* 003D8 80AD3ED8 E4CA00C4 */ swc1 $f10, 0x00C4($a2) ## 000000C4 -/* 003DC 80AD3EDC C430723C */ lwc1 $f16, %lo(D_80AD723C)($at) +/* 003DC 80AD3EDC C430723C */ lwc1 $f16, %lo(D_80AD723C)($at) /* 003E0 80AD3EE0 240A005A */ addiu $t2, $zero, 0x005A ## $t2 = 0000005A /* 003E4 80AD3EE4 A0CA0117 */ sb $t2, 0x0117($a2) ## 00000117 -/* 003E8 80AD3EE8 10000013 */ beq $zero, $zero, .L80AD3F38 +/* 003E8 80AD3EE8 10000013 */ beq $zero, $zero, .L80AD3F38 /* 003EC 80AD3EEC E4D0021C */ swc1 $f16, 0x021C($a2) ## 0000021C .L80AD3EF0: /* 003F0 80AD3EF0 44809000 */ mtc1 $zero, $f18 ## $f18 = 0.00 @@ -65,14 +65,14 @@ glabel func_80AD3E2C /* 00420 80AD3F20 844D0024 */ lh $t5, 0x0024($v0) ## 80AD70A4 /* 00424 80AD3F24 E4C400C4 */ swc1 $f4, 0x00C4($a2) ## 000000C4 /* 00428 80AD3F28 A4CD0288 */ sh $t5, 0x0288($a2) ## 00000288 -/* 0042C 80AD3F2C C4267240 */ lwc1 $f6, %lo(D_80AD7240)($at) +/* 0042C 80AD3F2C C4267240 */ lwc1 $f6, %lo(D_80AD7240)($at) /* 00430 80AD3F30 A0CE0117 */ sb $t6, 0x0117($a2) ## 00000117 /* 00434 80AD3F34 E4C6021C */ swc1 $f6, 0x021C($a2) ## 0000021C .L80AD3F38: /* 00438 80AD3F38 ACCF0190 */ sw $t7, 0x0190($a2) ## 00000190 -/* 0043C 80AD3F3C 8FBF0014 */ lw $ra, 0x0014($sp) +/* 0043C 80AD3F3C 8FBF0014 */ lw $ra, 0x0014($sp) /* 00440 80AD3F40 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00444 80AD3F44 03E00008 */ jr $ra +/* 00444 80AD3F44 03E00008 */ jr $ra /* 00448 80AD3F48 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD3F4C.s b/asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD3F4C.s index c83d81b3f6..adadc62d9e 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD3F4C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD3F4C.s @@ -1,32 +1,32 @@ glabel func_80AD3F4C /* 0044C 80AD3F4C 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 00450 80AD3F50 AFBF0014 */ sw $ra, 0x0014($sp) +/* 00450 80AD3F50 AFBF0014 */ sw $ra, 0x0014($sp) /* 00454 80AD3F54 8CAE1C44 */ lw $t6, 0x1C44($a1) ## 00001C44 /* 00458 80AD3F58 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 /* 0045C 80AD3F5C 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 00460 80AD3F60 24A50924 */ addiu $a1, $a1, 0x0924 ## $a1 = 06000924 -/* 00464 80AD3F64 AFA60020 */ sw $a2, 0x0020($sp) +/* 00464 80AD3F64 AFA60020 */ sw $a2, 0x0020($sp) /* 00468 80AD3F68 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 0046C 80AD3F6C 0C0294BE */ jal func_800A52F8 -/* 00470 80AD3F70 AFAE001C */ sw $t6, 0x001C($sp) -/* 00474 80AD3F74 8FA60020 */ lw $a2, 0x0020($sp) +/* 0046C 80AD3F6C 0C0294BE */ jal SkelAnime_ChangeAnimDefaultRepeat +/* 00470 80AD3F70 AFAE001C */ sw $t6, 0x001C($sp) +/* 00474 80AD3F74 8FA60020 */ lw $a2, 0x0020($sp) /* 00478 80AD3F78 90CF0255 */ lbu $t7, 0x0255($a2) ## 00000255 /* 0047C 80AD3F7C C4C40090 */ lwc1 $f4, 0x0090($a2) ## 00000090 /* 00480 80AD3F80 24C40008 */ addiu $a0, $a2, 0x0008 ## $a0 = 00000008 /* 00484 80AD3F84 35F80001 */ ori $t8, $t7, 0x0001 ## $t8 = 00000001 /* 00488 80AD3F88 A0D80255 */ sb $t8, 0x0255($a2) ## 00000255 /* 0048C 80AD3F8C E4C4021C */ swc1 $f4, 0x021C($a2) ## 0000021C -/* 00490 80AD3F90 8FA5001C */ lw $a1, 0x001C($sp) +/* 00490 80AD3F90 8FA5001C */ lw $a1, 0x001C($sp) /* 00494 80AD3F94 0C01DF90 */ jal Math_Vec3f_Copy ## Vec3f_Copy /* 00498 80AD3F98 24A50024 */ addiu $a1, $a1, 0x0024 ## $a1 = 00000024 -/* 0049C 80AD3F9C 8FA60020 */ lw $a2, 0x0020($sp) +/* 0049C 80AD3F9C 8FA60020 */ lw $a2, 0x0020($sp) /* 004A0 80AD3FA0 3C0880AD */ lui $t0, %hi(func_80AD4E48) ## $t0 = 80AD0000 /* 004A4 80AD3FA4 25084E48 */ addiu $t0, $t0, %lo(func_80AD4E48) ## $t0 = 80AD4E48 /* 004A8 80AD3FA8 8CC90190 */ lw $t1, 0x0190($a2) ## 00000190 /* 004AC 80AD3FAC 84D9008A */ lh $t9, 0x008A($a2) ## 0000008A /* 004B0 80AD3FB0 3C0E80AD */ lui $t6, %hi(func_80AD4A68) ## $t6 = 80AD0000 -/* 004B4 80AD3FB4 11090008 */ beq $t0, $t1, .L80AD3FD8 +/* 004B4 80AD3FB4 11090008 */ beq $t0, $t1, .L80AD3FD8 /* 004B8 80AD3FB8 A4D90032 */ sh $t9, 0x0032($a2) ## 00000032 /* 004BC 80AD3FBC 8CCA0004 */ lw $t2, 0x0004($a2) ## 00000004 /* 004C0 80AD3FC0 240C0258 */ addiu $t4, $zero, 0x0258 ## $t4 = 00000258 @@ -38,9 +38,9 @@ glabel func_80AD3F4C .L80AD3FD8: /* 004D8 80AD3FD8 25CE4A68 */ addiu $t6, $t6, %lo(func_80AD4A68) ## $t6 = 80AD4A68 /* 004DC 80AD3FDC ACCE0190 */ sw $t6, 0x0190($a2) ## 00000190 -/* 004E0 80AD3FE0 8FBF0014 */ lw $ra, 0x0014($sp) +/* 004E0 80AD3FE0 8FBF0014 */ lw $ra, 0x0014($sp) /* 004E4 80AD3FE4 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 004E8 80AD3FE8 03E00008 */ jr $ra +/* 004E8 80AD3FE8 03E00008 */ jr $ra /* 004EC 80AD3FEC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD3FF0.s b/asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD3FF0.s index a93fb32c8e..e5aaf88157 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD3FF0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD3FF0.s @@ -1,14 +1,14 @@ glabel func_80AD3FF0 /* 004F0 80AD3FF0 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 004F4 80AD3FF4 AFBF0014 */ sw $ra, 0x0014($sp) +/* 004F4 80AD3FF4 AFBF0014 */ sw $ra, 0x0014($sp) /* 004F8 80AD3FF8 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 /* 004FC 80AD3FFC 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 00500 80AD4000 24A50608 */ addiu $a1, $a1, 0x0608 ## $a1 = 06000608 -/* 00504 80AD4004 AFA70018 */ sw $a3, 0x0018($sp) +/* 00504 80AD4004 AFA70018 */ sw $a3, 0x0018($sp) /* 00508 80AD4008 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 0050C 80AD400C 0C0294D3 */ jal func_800A534C +/* 0050C 80AD400C 0C0294D3 */ jal SkelAnime_ChangeAnimTransitionRepeat /* 00510 80AD4010 3C06C0A0 */ lui $a2, 0xC0A0 ## $a2 = C0A00000 -/* 00514 80AD4014 8FA70018 */ lw $a3, 0x0018($sp) +/* 00514 80AD4014 8FA70018 */ lw $a3, 0x0018($sp) /* 00518 80AD4018 3C014140 */ lui $at, 0x4140 ## $at = 41400000 /* 0051C 80AD401C 44812000 */ mtc1 $at, $f4 ## $f4 = 12.00 /* 00520 80AD4020 90EE0255 */ lbu $t6, 0x0255($a3) ## 00000255 @@ -19,7 +19,7 @@ glabel func_80AD3FF0 /* 00534 80AD4034 35CF0001 */ ori $t7, $t6, 0x0001 ## $t7 = 00000001 /* 00538 80AD4038 A0EF0255 */ sb $t7, 0x0255($a3) ## 00000255 /* 0053C 80AD403C ACE20190 */ sw $v0, 0x0190($a3) ## 00000190 -/* 00540 80AD4040 1302000C */ beq $t8, $v0, .L80AD4074 +/* 00540 80AD4040 1302000C */ beq $t8, $v0, .L80AD4074 /* 00544 80AD4044 E4E40068 */ swc1 $f4, 0x0068($a3) ## 00000068 /* 00548 80AD4048 8CF90004 */ lw $t9, 0x0004($a3) ## 00000004 /* 0054C 80AD404C 84E900B6 */ lh $t1, 0x00B6($a3) ## 000000B6 @@ -27,15 +27,15 @@ glabel func_80AD3FF0 /* 00554 80AD4054 240B07D0 */ addiu $t3, $zero, 0x07D0 ## $t3 = 000007D0 /* 00558 80AD4058 240C0020 */ addiu $t4, $zero, 0x0020 ## $t4 = 00000020 /* 0055C 80AD405C 37280001 */ ori $t0, $t9, 0x0001 ## $t0 = 00000001 -/* 00560 80AD4060 01215021 */ addu $t2, $t1, $at +/* 00560 80AD4060 01215021 */ addu $t2, $t1, $at /* 00564 80AD4064 ACE80004 */ sw $t0, 0x0004($a3) ## 00000004 /* 00568 80AD4068 A4EA0032 */ sh $t2, 0x0032($a3) ## 00000032 /* 0056C 80AD406C A4EB0196 */ sh $t3, 0x0196($a3) ## 00000196 /* 00570 80AD4070 A0EC0194 */ sb $t4, 0x0194($a3) ## 00000194 .L80AD4074: -/* 00574 80AD4074 8FBF0014 */ lw $ra, 0x0014($sp) +/* 00574 80AD4074 8FBF0014 */ lw $ra, 0x0014($sp) /* 00578 80AD4078 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 0057C 80AD407C 03E00008 */ jr $ra +/* 0057C 80AD407C 03E00008 */ jr $ra /* 00580 80AD4080 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD4084.s b/asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD4084.s index 3bfc48362c..0a4c72e0fc 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD4084.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD4084.s @@ -1,30 +1,30 @@ glabel func_80AD4084 /* 00584 80AD4084 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 00588 80AD4088 AFB00020 */ sw $s0, 0x0020($sp) +/* 00588 80AD4088 AFB00020 */ sw $s0, 0x0020($sp) /* 0058C 80AD408C 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00590 80AD4090 AFBF0024 */ sw $ra, 0x0024($sp) +/* 00590 80AD4090 AFBF0024 */ sw $ra, 0x0024($sp) /* 00594 80AD4094 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 00598 80AD4098 24A50454 */ addiu $a1, $a1, 0x0454 ## $a1 = 06000454 /* 0059C 80AD409C 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 005A0 80AD40A0 0C029490 */ jal func_800A5240 +/* 005A0 80AD40A0 0C029490 */ jal SkelAnime_ChangeAnimTransitionStop /* 005A4 80AD40A4 3C06C0C0 */ lui $a2, 0xC0C0 ## $a2 = C0C00000 /* 005A8 80AD40A8 8E0E0280 */ lw $t6, 0x0280($s0) ## 00000280 /* 005AC 80AD40AC 3C010001 */ lui $at, 0x0001 ## $at = 00010000 /* 005B0 80AD40B0 3421F824 */ ori $at, $at, 0xF824 ## $at = 0001F824 /* 005B4 80AD40B4 8DCF0000 */ lw $t7, 0x0000($t6) ## 00000000 /* 005B8 80AD40B8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 005BC 80AD40BC 01E1C024 */ and $t8, $t7, $at -/* 005C0 80AD40C0 13000005 */ beq $t8, $zero, .L80AD40D8 +/* 005BC 80AD40BC 01E1C024 */ and $t8, $t7, $at +/* 005C0 80AD40C0 13000005 */ beq $t8, $zero, .L80AD40D8 /* 005C4 80AD40C4 00000000 */ nop /* 005C8 80AD40C8 8E19024C */ lw $t9, 0x024C($s0) ## 0000024C /* 005CC 80AD40CC 87280032 */ lh $t0, 0x0032($t9) ## 00000032 -/* 005D0 80AD40D0 10000006 */ beq $zero, $zero, .L80AD40EC +/* 005D0 80AD40D0 10000006 */ beq $zero, $zero, .L80AD40EC /* 005D4 80AD40D4 A6080032 */ sh $t0, 0x0032($s0) ## 00000032 .L80AD40D8: -/* 005D8 80AD40D8 0C00B69E */ jal func_8002DA78 +/* 005D8 80AD40D8 0C00B69E */ jal func_8002DA78 /* 005DC 80AD40DC 8E05024C */ lw $a1, 0x024C($s0) ## 0000024C /* 005E0 80AD40E0 34018000 */ ori $at, $zero, 0x8000 ## $at = 00008000 -/* 005E4 80AD40E4 00414821 */ addu $t1, $v0, $at +/* 005E4 80AD40E4 00414821 */ addu $t1, $v0, $at /* 005E8 80AD40E8 A6090032 */ sh $t1, 0x0032($s0) ## 00000032 .L80AD40EC: /* 005EC 80AD40EC 920A0255 */ lbu $t2, 0x0255($s0) ## 00000255 @@ -34,19 +34,19 @@ glabel func_80AD4084 /* 005FC 80AD40FC A20B0255 */ sb $t3, 0x0255($s0) ## 00000255 /* 00600 80AD4100 240C0010 */ addiu $t4, $zero, 0x0010 ## $t4 = 00000010 /* 00604 80AD4104 E6040068 */ swc1 $f4, 0x0068($s0) ## 00000068 -/* 00608 80AD4108 AFAC0010 */ sw $t4, 0x0010($sp) +/* 00608 80AD4108 AFAC0010 */ sw $t4, 0x0010($sp) /* 0060C 80AD410C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 00610 80AD4110 24054000 */ addiu $a1, $zero, 0x4000 ## $a1 = 00004000 /* 00614 80AD4114 240600FF */ addiu $a2, $zero, 0x00FF ## $a2 = 000000FF -/* 00618 80AD4118 0C00D09B */ jal func_8003426C +/* 00618 80AD4118 0C00D09B */ jal func_8003426C /* 0061C 80AD411C 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 /* 00620 80AD4120 3C0D80AD */ lui $t5, %hi(func_80AD4E48) ## $t5 = 80AD0000 /* 00624 80AD4124 25AD4E48 */ addiu $t5, $t5, %lo(func_80AD4E48) ## $t5 = 80AD4E48 /* 00628 80AD4128 AE0D0190 */ sw $t5, 0x0190($s0) ## 00000190 -/* 0062C 80AD412C 8FBF0024 */ lw $ra, 0x0024($sp) -/* 00630 80AD4130 8FB00020 */ lw $s0, 0x0020($sp) +/* 0062C 80AD412C 8FBF0024 */ lw $ra, 0x0024($sp) +/* 00630 80AD4130 8FB00020 */ lw $s0, 0x0020($sp) /* 00634 80AD4134 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 00638 80AD4138 03E00008 */ jr $ra +/* 00638 80AD4138 03E00008 */ jr $ra /* 0063C 80AD413C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD4190.s b/asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD4190.s index 1631e42571..e282b5f84b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD4190.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD4190.s @@ -1,12 +1,12 @@ glabel func_80AD4190 /* 00690 80AD4190 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 00694 80AD4194 AFB00018 */ sw $s0, 0x0018($sp) +/* 00694 80AD4194 AFB00018 */ sw $s0, 0x0018($sp) /* 00698 80AD4198 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 0069C 80AD419C AFBF001C */ sw $ra, 0x001C($sp) +/* 0069C 80AD419C AFBF001C */ sw $ra, 0x001C($sp) /* 006A0 80AD41A0 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 006A4 80AD41A4 24A51360 */ addiu $a1, $a1, 0x1360 ## $a1 = 06001360 /* 006A8 80AD41A8 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 006AC 80AD41AC 0C0294D3 */ jal func_800A534C +/* 006AC 80AD41AC 0C0294D3 */ jal SkelAnime_ChangeAnimTransitionRepeat /* 006B0 80AD41B0 3C06C0C0 */ lui $a2, 0xC0C0 ## $a2 = C0C00000 /* 006B4 80AD41B4 920F0255 */ lbu $t7, 0x0255($s0) ## 00000255 /* 006B8 80AD41B8 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 @@ -17,19 +17,19 @@ glabel func_80AD4190 /* 006CC 80AD41CC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 006D0 80AD41D0 240538EC */ addiu $a1, $zero, 0x38EC ## $a1 = 000038EC /* 006D4 80AD41D4 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 006D8 80AD41D8 E6040068 */ swc1 $f4, 0x0068($s0) ## 00000068 /* 006DC 80AD41DC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 006E0 80AD41E0 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 006E4 80AD41E4 24053874 */ addiu $a1, $zero, 0x3874 ## $a1 = 00003874 /* 006E8 80AD41E8 3C1980AD */ lui $t9, %hi(func_80AD52F0) ## $t9 = 80AD0000 /* 006EC 80AD41EC 273952F0 */ addiu $t9, $t9, %lo(func_80AD52F0) ## $t9 = 80AD52F0 /* 006F0 80AD41F0 AE190190 */ sw $t9, 0x0190($s0) ## 00000190 -/* 006F4 80AD41F4 8FBF001C */ lw $ra, 0x001C($sp) -/* 006F8 80AD41F8 8FB00018 */ lw $s0, 0x0018($sp) +/* 006F4 80AD41F4 8FBF001C */ lw $ra, 0x001C($sp) +/* 006F8 80AD41F8 8FB00018 */ lw $s0, 0x0018($sp) /* 006FC 80AD41FC 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 00700 80AD4200 03E00008 */ jr $ra +/* 00700 80AD4200 03E00008 */ jr $ra /* 00704 80AD4204 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD5E8C.s b/asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD5E8C.s index 02a08ef35a..58177573cf 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD5E8C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD5E8C.s @@ -13,7 +13,7 @@ glabel func_80AD5E8C /* 023B8 80AD5EB8 3C0680AD */ lui $a2, %hi(D_80AD7160) ## $a2 = 80AD0000 /* 023BC 80AD5EBC 24C67160 */ addiu $a2, $a2, %lo(D_80AD7160) ## $a2 = 80AD7160 /* 023C0 80AD5EC0 24070685 */ addiu $a3, $zero, 0x0685 ## $a3 = 00000685 -/* 023C4 80AD5EC4 0C031AB1 */ jal func_800C6AC4 +/* 023C4 80AD5EC4 0C031AB1 */ jal Graph_OpenDisps /* 023C8 80AD5EC8 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 /* 023CC 80AD5ECC 0C024F61 */ jal func_80093D84 /* 023D0 80AD5ED0 8E440000 */ lw $a0, 0x0000($s2) ## 00000000 @@ -47,7 +47,7 @@ glabel func_80AD5E8C /* 02440 80AD5F40 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 02444 80AD5F44 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 /* 02448 80AD5F48 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 0244C 80AD5F4C 0C0253D0 */ jal Draw_TwoTexScroll +/* 0244C 80AD5F4C 0C0253D0 */ jal Gfx_TwoTexScroll /* 02450 80AD5F50 AFA20068 */ sw $v0, 0x0068($sp) /* 02454 80AD5F54 8FA30068 */ lw $v1, 0x0068($sp) /* 02458 80AD5F58 3C0180AD */ lui $at, %hi(D_80AD7284) ## $at = 80AD0000 @@ -192,7 +192,7 @@ glabel func_80AD5E8C /* 02670 80AD6170 8E450000 */ lw $a1, 0x0000($s2) ## 00000000 /* 02674 80AD6174 24C67188 */ addiu $a2, $a2, %lo(D_80AD7188) ## $a2 = 80AD7188 /* 02678 80AD6178 27A4006C */ addiu $a0, $sp, 0x006C ## $a0 = FFFFFFE4 -/* 0267C 80AD617C 0C031AD5 */ jal func_800C6B54 +/* 0267C 80AD617C 0C031AD5 */ jal Graph_CloseDisps /* 02680 80AD6180 240706B0 */ addiu $a3, $zero, 0x06B0 ## $a3 = 000006B0 .L80AD6184: /* 02684 80AD6184 8FBF0044 */ lw $ra, 0x0044($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD6C4C.s b/asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD6C4C.s index 1335230382..f2a8dde25d 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD6C4C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD6C4C.s @@ -17,7 +17,7 @@ glabel func_80AD6C4C /* 03188 80AD6C88 AFA80094 */ sw $t0, 0x0094($sp) /* 0318C 80AD6C8C 27A40080 */ addiu $a0, $sp, 0x0080 ## $a0 = FFFFFFE0 /* 03190 80AD6C90 2407081D */ addiu $a3, $zero, 0x081D ## $a3 = 0000081D -/* 03194 80AD6C94 0C031AB1 */ jal func_800C6AC4 +/* 03194 80AD6C94 0C031AB1 */ jal Graph_OpenDisps /* 03198 80AD6C98 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 /* 0319C 80AD6C9C 8E290190 */ lw $t1, 0x0190($s1) ## 00000190 /* 031A0 80AD6CA0 3C1980AD */ lui $t9, %hi(func_80AD53F0) ## $t9 = 80AD0000 @@ -40,7 +40,7 @@ glabel func_80AD6C4C /* 031E4 80AD6CE4 91060007 */ lbu $a2, 0x0007($t0) ## 00000007 /* 031E8 80AD6CE8 91050006 */ lbu $a1, 0x0006($t0) ## 00000006 /* 031EC 80AD6CEC AFAC0010 */ sw $t4, 0x0010($sp) -/* 031F0 80AD6CF0 0C025474 */ jal func_800951D0 +/* 031F0 80AD6CF0 0C025474 */ jal Gfx_EnvColor /* 031F4 80AD6CF4 AFA2007C */ sw $v0, 0x007C($sp) /* 031F8 80AD6CF8 8FA3007C */ lw $v1, 0x007C($sp) /* 031FC 80AD6CFC 240A00C8 */ addiu $t2, $zero, 0x00C8 ## $t2 = 000000C8 @@ -150,7 +150,7 @@ glabel func_80AD6C4C /* 03394 80AD6E94 AFA80094 */ sw $t0, 0x0094($sp) /* 03398 80AD6E98 00006012 */ mflo $t4 /* 0339C 80AD6E9C 318A01FF */ andi $t2, $t4, 0x01FF ## $t2 = 00000000 -/* 033A0 80AD6EA0 0C0253D0 */ jal Draw_TwoTexScroll +/* 033A0 80AD6EA0 0C0253D0 */ jal Gfx_TwoTexScroll /* 033A4 80AD6EA4 AFAA0020 */ sw $t2, 0x0020($sp) /* 033A8 80AD6EA8 8FA30068 */ lw $v1, 0x0068($sp) /* 033AC 80AD6EAC 8FA80094 */ lw $t0, 0x0094($sp) @@ -251,7 +251,7 @@ glabel func_80AD6C4C /* 03524 80AD7024 24C67228 */ addiu $a2, $a2, %lo(D_80AD7228) ## $a2 = 80AD7228 /* 03528 80AD7028 27A40080 */ addiu $a0, $sp, 0x0080 ## $a0 = FFFFFFE0 /* 0352C 80AD702C 8E450000 */ lw $a1, 0x0000($s2) ## 00000000 -/* 03530 80AD7030 0C031AD5 */ jal func_800C6B54 +/* 03530 80AD7030 0C031AD5 */ jal Graph_CloseDisps /* 03534 80AD7034 24070865 */ addiu $a3, $zero, 0x0865 ## $a3 = 00000865 /* 03538 80AD7038 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 0353C 80AD703C 0C2B57A3 */ jal func_80AD5E8C diff --git a/asm/non_matchings/overlays/actors/ovl_En_Po_Relay/EnPoRelay_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Po_Relay/EnPoRelay_Draw.s index 21402c3556..21a0013a0e 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Po_Relay/EnPoRelay_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Po_Relay/EnPoRelay_Draw.s @@ -1,20 +1,20 @@ glabel EnPoRelay_Draw /* 013F8 80AD8B38 27BDFFB0 */ addiu $sp, $sp, 0xFFB0 ## $sp = FFFFFFB0 -/* 013FC 80AD8B3C AFBF002C */ sw $ra, 0x002C($sp) -/* 01400 80AD8B40 AFB00028 */ sw $s0, 0x0028($sp) -/* 01404 80AD8B44 AFA50054 */ sw $a1, 0x0054($sp) +/* 013FC 80AD8B3C AFBF002C */ sw $ra, 0x002C($sp) +/* 01400 80AD8B40 AFB00028 */ sw $s0, 0x0028($sp) +/* 01404 80AD8B44 AFA50054 */ sw $a1, 0x0054($sp) /* 01408 80AD8B48 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 /* 0140C 80AD8B4C 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 01410 80AD8B50 3C0680AE */ lui $a2, %hi(D_80AD8DC4) ## $a2 = 80AE0000 /* 01414 80AD8B54 24C68DC4 */ addiu $a2, $a2, %lo(D_80AD8DC4) ## $a2 = 80AD8DC4 /* 01418 80AD8B58 27A40038 */ addiu $a0, $sp, 0x0038 ## $a0 = FFFFFFE8 /* 0141C 80AD8B5C 240703AC */ addiu $a3, $zero, 0x03AC ## $a3 = 000003AC -/* 01420 80AD8B60 0C031AB1 */ jal func_800C6AC4 -/* 01424 80AD8B64 AFA50048 */ sw $a1, 0x0048($sp) -/* 01428 80AD8B68 8FAF0054 */ lw $t7, 0x0054($sp) -/* 0142C 80AD8B6C 0C024F46 */ jal func_80093D18 +/* 01420 80AD8B60 0C031AB1 */ jal Graph_OpenDisps +/* 01424 80AD8B64 AFA50048 */ sw $a1, 0x0048($sp) +/* 01428 80AD8B68 8FAF0054 */ lw $t7, 0x0054($sp) +/* 0142C 80AD8B6C 0C024F46 */ jal func_80093D18 /* 01430 80AD8B70 8DE40000 */ lw $a0, 0x0000($t7) ## 00000000 -/* 01434 80AD8B74 8FA50048 */ lw $a1, 0x0048($sp) +/* 01434 80AD8B74 8FA50048 */ lw $a1, 0x0048($sp) /* 01438 80AD8B78 3C19DB06 */ lui $t9, 0xDB06 ## $t9 = DB060000 /* 0143C 80AD8B7C 37390020 */ ori $t9, $t9, 0x0020 ## $t9 = DB060020 /* 01440 80AD8B80 8CA302C0 */ lw $v1, 0x02C0($a1) ## 000002C0 @@ -26,39 +26,39 @@ glabel EnPoRelay_Draw /* 01458 80AD8B98 9608019E */ lhu $t0, 0x019E($s0) ## 0000019E /* 0145C 80AD8B9C 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 /* 01460 80AD8BA0 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF -/* 01464 80AD8BA4 00084880 */ sll $t1, $t0, 2 -/* 01468 80AD8BA8 00892021 */ addu $a0, $a0, $t1 -/* 0146C 80AD8BAC 8C848D54 */ lw $a0, %lo(D_80AD8D54)($a0) +/* 01464 80AD8BA4 00084880 */ sll $t1, $t0, 2 +/* 01468 80AD8BA8 00892021 */ addu $a0, $a0, $t1 +/* 0146C 80AD8BAC 8C848D54 */ lw $a0, %lo(D_80AD8D54)($a0) /* 01470 80AD8BB0 3C1980AE */ lui $t9, %hi(func_80AD88D0) ## $t9 = 80AE0000 /* 01474 80AD8BB4 273988D0 */ addiu $t9, $t9, %lo(func_80AD88D0) ## $t9 = 80AD88D0 -/* 01478 80AD8BB8 00045900 */ sll $t3, $a0, 4 -/* 0147C 80AD8BBC 000B6702 */ srl $t4, $t3, 28 -/* 01480 80AD8BC0 000C6880 */ sll $t5, $t4, 2 -/* 01484 80AD8BC4 01CD7021 */ addu $t6, $t6, $t5 +/* 01478 80AD8BB8 00045900 */ sll $t3, $a0, 4 +/* 0147C 80AD8BBC 000B6702 */ srl $t4, $t3, 28 +/* 01480 80AD8BC0 000C6880 */ sll $t5, $t4, 2 +/* 01484 80AD8BC4 01CD7021 */ addu $t6, $t6, $t5 /* 01488 80AD8BC8 8DCE6FA8 */ lw $t6, 0x6FA8($t6) ## 80166FA8 -/* 0148C 80AD8BCC 00815024 */ and $t2, $a0, $at +/* 0148C 80AD8BCC 00815024 */ and $t2, $a0, $at /* 01490 80AD8BD0 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 01494 80AD8BD4 014E7821 */ addu $t7, $t2, $t6 -/* 01498 80AD8BD8 01E1C021 */ addu $t8, $t7, $at +/* 01494 80AD8BD4 014E7821 */ addu $t7, $t2, $t6 +/* 01498 80AD8BD8 01E1C021 */ addu $t8, $t7, $at /* 0149C 80AD8BDC AC780004 */ sw $t8, 0x0004($v1) ## 00000004 /* 014A0 80AD8BE0 9207014E */ lbu $a3, 0x014E($s0) ## 0000014E /* 014A4 80AD8BE4 8E06016C */ lw $a2, 0x016C($s0) ## 0000016C /* 014A8 80AD8BE8 8E050150 */ lw $a1, 0x0150($s0) ## 00000150 -/* 014AC 80AD8BEC AFB00018 */ sw $s0, 0x0018($sp) -/* 014B0 80AD8BF0 AFB90014 */ sw $t9, 0x0014($sp) -/* 014B4 80AD8BF4 AFA00010 */ sw $zero, 0x0010($sp) -/* 014B8 80AD8BF8 0C0286B2 */ jal func_800A1AC8 -/* 014BC 80AD8BFC 8FA40054 */ lw $a0, 0x0054($sp) -/* 014C0 80AD8C00 8FA80054 */ lw $t0, 0x0054($sp) +/* 014AC 80AD8BEC AFB00018 */ sw $s0, 0x0018($sp) +/* 014B0 80AD8BF0 AFB90014 */ sw $t9, 0x0014($sp) +/* 014B4 80AD8BF4 AFA00010 */ sw $zero, 0x0010($sp) +/* 014B8 80AD8BF8 0C0286B2 */ jal SkelAnime_DrawSV +/* 014BC 80AD8BFC 8FA40054 */ lw $a0, 0x0054($sp) +/* 014C0 80AD8C00 8FA80054 */ lw $t0, 0x0054($sp) /* 014C4 80AD8C04 3C0680AE */ lui $a2, %hi(D_80AD8DD8) ## $a2 = 80AE0000 /* 014C8 80AD8C08 24C68DD8 */ addiu $a2, $a2, %lo(D_80AD8DD8) ## $a2 = 80AD8DD8 /* 014CC 80AD8C0C 27A40038 */ addiu $a0, $sp, 0x0038 ## $a0 = FFFFFFE8 /* 014D0 80AD8C10 240703BA */ addiu $a3, $zero, 0x03BA ## $a3 = 000003BA -/* 014D4 80AD8C14 0C031AD5 */ jal func_800C6B54 +/* 014D4 80AD8C14 0C031AD5 */ jal Graph_CloseDisps /* 014D8 80AD8C18 8D050000 */ lw $a1, 0x0000($t0) ## 00000000 -/* 014DC 80AD8C1C 8FBF002C */ lw $ra, 0x002C($sp) -/* 014E0 80AD8C20 8FB00028 */ lw $s0, 0x0028($sp) +/* 014DC 80AD8C1C 8FBF002C */ lw $ra, 0x002C($sp) +/* 014E0 80AD8C20 8FB00028 */ lw $s0, 0x0028($sp) /* 014E4 80AD8C24 27BD0050 */ addiu $sp, $sp, 0x0050 ## $sp = 00000000 -/* 014E8 80AD8C28 03E00008 */ jr $ra +/* 014E8 80AD8C28 03E00008 */ jr $ra /* 014EC 80AD8C2C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Po_Relay/EnPoRelay_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Po_Relay/EnPoRelay_Init.s index 2c61845c19..0c500754c6 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Po_Relay/EnPoRelay_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Po_Relay/EnPoRelay_Init.s @@ -1,110 +1,110 @@ glabel EnPoRelay_Init /* 00000 80AD7740 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 -/* 00004 80AD7744 AFB10028 */ sw $s1, 0x0028($sp) +/* 00004 80AD7744 AFB10028 */ sw $s1, 0x0028($sp) /* 00008 80AD7748 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 -/* 0000C 80AD774C AFBF002C */ sw $ra, 0x002C($sp) -/* 00010 80AD7750 AFB00024 */ sw $s0, 0x0024($sp) +/* 0000C 80AD774C AFBF002C */ sw $ra, 0x002C($sp) +/* 00010 80AD7750 AFB00024 */ sw $s0, 0x0024($sp) /* 00014 80AD7754 3C0580AE */ lui $a1, %hi(D_80AD8D28) ## $a1 = 80AE0000 /* 00018 80AD7758 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 0001C 80AD775C 0C01E037 */ jal Actor_ProcessInitChain - + /* 00020 80AD7760 24A58D28 */ addiu $a1, $a1, %lo(D_80AD8D28) ## $a1 = 80AD8D28 /* 00024 80AD7764 3C068003 */ lui $a2, 0x8003 ## $a2 = 80030000 /* 00028 80AD7768 24C6B5EC */ addiu $a2, $a2, 0xB5EC ## $a2 = 8002B5EC /* 0002C 80AD776C 260400B4 */ addiu $a0, $s0, 0x00B4 ## $a0 = 000000B4 /* 00030 80AD7770 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 /* 00034 80AD7774 0C00AC78 */ jal ActorShape_Init - + /* 00038 80AD7778 3C074228 */ lui $a3, 0x4228 ## $a3 = 42280000 /* 0003C 80AD777C 3C060601 */ lui $a2, 0x0601 ## $a2 = 06010000 /* 00040 80AD7780 3C070600 */ lui $a3, 0x0600 ## $a3 = 06000000 /* 00044 80AD7784 260E01A0 */ addiu $t6, $s0, 0x01A0 ## $t6 = 000001A0 /* 00048 80AD7788 260F020C */ addiu $t7, $s0, 0x020C ## $t7 = 0000020C /* 0004C 80AD778C 24180012 */ addiu $t8, $zero, 0x0012 ## $t8 = 00000012 -/* 00050 80AD7790 AFB80018 */ sw $t8, 0x0018($sp) -/* 00054 80AD7794 AFAF0014 */ sw $t7, 0x0014($sp) -/* 00058 80AD7798 AFAE0010 */ sw $t6, 0x0010($sp) +/* 00050 80AD7790 AFB80018 */ sw $t8, 0x0018($sp) +/* 00054 80AD7794 AFAF0014 */ sw $t7, 0x0014($sp) +/* 00058 80AD7798 AFAE0010 */ sw $t6, 0x0010($sp) /* 0005C 80AD779C 24E73768 */ addiu $a3, $a3, 0x3768 ## $a3 = 06003768 /* 00060 80AD77A0 24C6BE40 */ addiu $a2, $a2, 0xBE40 ## $a2 = 0600BE40 /* 00064 80AD77A4 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 00068 80AD77A8 0C0291BE */ jal func_800A46F8 +/* 00068 80AD77A8 0C0291BE */ jal SkelAnime_InitSV /* 0006C 80AD77AC 2605014C */ addiu $a1, $s0, 0x014C ## $a1 = 0000014C /* 00070 80AD77B0 26050290 */ addiu $a1, $s0, 0x0290 ## $a1 = 00000290 -/* 00074 80AD77B4 AFA50034 */ sw $a1, 0x0034($sp) +/* 00074 80AD77B4 AFA50034 */ sw $a1, 0x0034($sp) /* 00078 80AD77B8 0C0170D9 */ jal ActorCollider_AllocCylinder - + /* 0007C 80AD77BC 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 00080 80AD77C0 3C0780AE */ lui $a3, %hi(D_80AD8CF8) ## $a3 = 80AE0000 -/* 00084 80AD77C4 8FA50034 */ lw $a1, 0x0034($sp) +/* 00084 80AD77C4 8FA50034 */ lw $a1, 0x0034($sp) /* 00088 80AD77C8 24E78CF8 */ addiu $a3, $a3, %lo(D_80AD8CF8) ## $a3 = 80AD8CF8 /* 0008C 80AD77CC 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 00090 80AD77D0 0C01712B */ jal ActorCollider_InitCylinder - + /* 00094 80AD77D4 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 00098 80AD77D8 26060280 */ addiu $a2, $s0, 0x0280 ## $a2 = 00000280 -/* 0009C 80AD77DC AFA60034 */ sw $a2, 0x0034($sp) +/* 0009C 80AD77DC AFA60034 */ sw $a2, 0x0034($sp) /* 000A0 80AD77E0 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 000A4 80AD77E4 0C01E9D9 */ jal Lights_Insert - + /* 000A8 80AD77E8 262507A8 */ addiu $a1, $s1, 0x07A8 ## $a1 = 000007A8 /* 000AC 80AD77EC C6040008 */ lwc1 $f4, 0x0008($s0) ## 00000008 /* 000B0 80AD77F0 C608000C */ lwc1 $f8, 0x000C($s0) ## 0000000C /* 000B4 80AD77F4 C6100010 */ lwc1 $f16, 0x0010($s0) ## 00000010 -/* 000B8 80AD77F8 4600218D */ trunc.w.s $f6, $f4 +/* 000B8 80AD77F8 4600218D */ trunc.w.s $f6, $f4 /* 000BC 80AD77FC AE02027C */ sw $v0, 0x027C($s0) ## 0000027C /* 000C0 80AD7800 240A00FF */ addiu $t2, $zero, 0x00FF ## $t2 = 000000FF -/* 000C4 80AD7804 4600428D */ trunc.w.s $f10, $f8 -/* 000C8 80AD7808 44053000 */ mfc1 $a1, $f6 +/* 000C4 80AD7804 4600428D */ trunc.w.s $f10, $f8 +/* 000C8 80AD7808 44053000 */ mfc1 $a1, $f6 /* 000CC 80AD780C 240B00FF */ addiu $t3, $zero, 0x00FF ## $t3 = 000000FF -/* 000D0 80AD7810 4600848D */ trunc.w.s $f18, $f16 -/* 000D4 80AD7814 44065000 */ mfc1 $a2, $f10 +/* 000D0 80AD7810 4600848D */ trunc.w.s $f18, $f16 +/* 000D4 80AD7814 44065000 */ mfc1 $a2, $f10 /* 000D8 80AD7818 240C00FF */ addiu $t4, $zero, 0x00FF ## $t4 = 000000FF /* 000DC 80AD781C 240D00C8 */ addiu $t5, $zero, 0x00C8 ## $t5 = 000000C8 -/* 000E0 80AD7820 44079000 */ mfc1 $a3, $f18 -/* 000E4 80AD7824 00052C00 */ sll $a1, $a1, 16 -/* 000E8 80AD7828 00063400 */ sll $a2, $a2, 16 -/* 000EC 80AD782C 00073C00 */ sll $a3, $a3, 16 -/* 000F0 80AD7830 00073C03 */ sra $a3, $a3, 16 -/* 000F4 80AD7834 00063403 */ sra $a2, $a2, 16 -/* 000F8 80AD7838 00052C03 */ sra $a1, $a1, 16 -/* 000FC 80AD783C AFAD001C */ sw $t5, 0x001C($sp) -/* 00100 80AD7840 AFAC0018 */ sw $t4, 0x0018($sp) -/* 00104 80AD7844 AFAB0014 */ sw $t3, 0x0014($sp) -/* 00108 80AD7848 AFAA0010 */ sw $t2, 0x0010($sp) +/* 000E0 80AD7820 44079000 */ mfc1 $a3, $f18 +/* 000E4 80AD7824 00052C00 */ sll $a1, $a1, 16 +/* 000E8 80AD7828 00063400 */ sll $a2, $a2, 16 +/* 000EC 80AD782C 00073C00 */ sll $a3, $a3, 16 +/* 000F0 80AD7830 00073C03 */ sra $a3, $a3, 16 +/* 000F4 80AD7834 00063403 */ sra $a2, $a2, 16 +/* 000F8 80AD7838 00052C03 */ sra $a1, $a1, 16 +/* 000FC 80AD783C AFAD001C */ sw $t5, 0x001C($sp) +/* 00100 80AD7840 AFAC0018 */ sw $t4, 0x0018($sp) +/* 00104 80AD7844 AFAB0014 */ sw $t3, 0x0014($sp) +/* 00108 80AD7848 AFAA0010 */ sw $t2, 0x0010($sp) /* 0010C 80AD784C 0C01E763 */ jal Lights_InitType0PositionalLight - -/* 00110 80AD7850 8FA40034 */ lw $a0, 0x0034($sp) + +/* 00110 80AD7850 8FA40034 */ lw $a0, 0x0034($sp) /* 00114 80AD7854 240E00FF */ addiu $t6, $zero, 0x00FF ## $t6 = 000000FF /* 00118 80AD7858 A20E027B */ sb $t6, 0x027B($s0) ## 0000027B /* 0011C 80AD785C 3C0F80AE */ lui $t7, %hi(D_80AD8D24) ## $t7 = 80AE0000 -/* 00120 80AD7860 8DEF8D24 */ lw $t7, %lo(D_80AD8D24)($t7) +/* 00120 80AD7860 8DEF8D24 */ lw $t7, %lo(D_80AD8D24)($t7) /* 00124 80AD7864 24180001 */ addiu $t8, $zero, 0x0001 ## $t8 = 00000001 /* 00128 80AD7868 3C0180AE */ lui $at, %hi(D_80AD8D24) ## $at = 80AE0000 -/* 0012C 80AD786C 11E00005 */ beq $t7, $zero, .L80AD7884 +/* 0012C 80AD786C 11E00005 */ beq $t7, $zero, .L80AD7884 /* 00130 80AD7870 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 00134 80AD7874 0C00B55C */ jal Actor_Kill - + /* 00138 80AD7878 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0013C 80AD787C 1000000A */ beq $zero, $zero, .L80AD78A8 +/* 0013C 80AD787C 1000000A */ beq $zero, $zero, .L80AD78A8 /* 00140 80AD7880 8608001C */ lh $t0, 0x001C($s0) ## 0000001C .L80AD7884: -/* 00144 80AD7884 AC388D24 */ sw $t8, %lo(D_80AD8D24)($at) +/* 00144 80AD7884 AC388D24 */ sw $t8, %lo(D_80AD8D24)($at) /* 00148 80AD7888 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 0014C 80AD788C 0C00CE50 */ jal Actor_SetTextWithPrefix - + /* 00150 80AD7890 24060041 */ addiu $a2, $zero, 0x0041 ## $a2 = 00000041 /* 00154 80AD7894 9619010E */ lhu $t9, 0x010E($s0) ## 0000010E /* 00158 80AD7898 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0015C 80AD789C 0C2B5E43 */ jal func_80AD790C +/* 0015C 80AD789C 0C2B5E43 */ jal func_80AD790C /* 00160 80AD78A0 A619019C */ sh $t9, 0x019C($s0) ## 0000019C /* 00164 80AD78A4 8608001C */ lh $t0, 0x001C($s0) ## 0000001C .L80AD78A8: /* 00168 80AD78A8 3109003F */ andi $t1, $t0, 0x003F ## $t1 = 00000000 /* 0016C 80AD78AC A609001C */ sh $t1, 0x001C($s0) ## 0000001C -/* 00170 80AD78B0 8FBF002C */ lw $ra, 0x002C($sp) -/* 00174 80AD78B4 8FB10028 */ lw $s1, 0x0028($sp) -/* 00178 80AD78B8 8FB00024 */ lw $s0, 0x0024($sp) -/* 0017C 80AD78BC 03E00008 */ jr $ra +/* 00170 80AD78B0 8FBF002C */ lw $ra, 0x002C($sp) +/* 00174 80AD78B4 8FB10028 */ lw $s1, 0x0028($sp) +/* 00178 80AD78B8 8FB00024 */ lw $s0, 0x0024($sp) +/* 0017C 80AD78BC 03E00008 */ jr $ra /* 00180 80AD78C0 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Po_Relay/func_80AD88D0.s b/asm/non_matchings/overlays/actors/ovl_En_Po_Relay/func_80AD88D0.s index d2713c3e50..45c5608e19 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Po_Relay/func_80AD88D0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Po_Relay/func_80AD88D0.s @@ -11,7 +11,7 @@ glabel func_80AD88D0 /* 011B4 80AD88F4 24C68D60 */ addiu $a2, $a2, %lo(D_80AD8D60) ## $a2 = 80AD8D60 /* 011B8 80AD88F8 27A40058 */ addiu $a0, $sp, 0x0058 ## $a0 = FFFFFFD8 /* 011BC 80AD88FC 24070375 */ addiu $a3, $zero, 0x0375 ## $a3 = 00000375 -/* 011C0 80AD8900 0C031AB1 */ jal func_800C6AC4 +/* 011C0 80AD8900 0C031AB1 */ jal Graph_OpenDisps /* 011C4 80AD8904 AFA50068 */ sw $a1, 0x0068($sp) /* 011C8 80AD8908 0C03F66B */ jal Math_Rand_ZeroOne ## Rand.Next() float @@ -73,7 +73,7 @@ glabel func_80AD88D0 /* 012A8 80AD89E8 AC4F0000 */ sw $t7, 0x0000($v0) ## 00000000 /* 012AC 80AD89EC AC590004 */ sw $t9, 0x0004($v0) ## 00000004 /* 012B0 80AD89F0 8FAA0080 */ lw $t2, 0x0080($sp) -/* 012B4 80AD89F4 0C031AD5 */ jal func_800C6B54 +/* 012B4 80AD89F4 0C031AD5 */ jal Graph_CloseDisps /* 012B8 80AD89F8 8D450000 */ lw $a1, 0x0000($t2) ## 00000000 /* 012BC 80AD89FC 3C0480AE */ lui $a0, %hi(D_80AD8D48) ## $a0 = 80AE0000 /* 012C0 80AD8A00 24848D48 */ addiu $a0, $a0, %lo(D_80AD8D48) ## $a0 = 80AD8D48 @@ -117,7 +117,7 @@ glabel func_80AD88D0 /* 01350 80AD8A90 24C68D88 */ addiu $a2, $a2, %lo(D_80AD8D88) ## $a2 = 80AD8D88 /* 01354 80AD8A94 27A40038 */ addiu $a0, $sp, 0x0038 ## $a0 = FFFFFFB8 /* 01358 80AD8A98 24070394 */ addiu $a3, $zero, 0x0394 ## $a3 = 00000394 -/* 0135C 80AD8A9C 0C031AB1 */ jal func_800C6AC4 +/* 0135C 80AD8A9C 0C031AB1 */ jal Graph_OpenDisps /* 01360 80AD8AA0 AFA50048 */ sw $a1, 0x0048($sp) /* 01364 80AD8AA4 8FA80048 */ lw $t0, 0x0048($sp) /* 01368 80AD8AA8 3C0BDA38 */ lui $t3, 0xDA38 ## $t3 = DA380000 @@ -150,7 +150,7 @@ glabel func_80AD88D0 /* 013D4 80AD8B14 24C68DB0 */ addiu $a2, $a2, %lo(D_80AD8DB0) ## $a2 = 80AD8DB0 /* 013D8 80AD8B18 27A40038 */ addiu $a0, $sp, 0x0038 ## $a0 = FFFFFFB8 /* 013DC 80AD8B1C 2407039A */ addiu $a3, $zero, 0x039A ## $a3 = 0000039A -/* 013E0 80AD8B20 0C031AD5 */ jal func_800C6B54 +/* 013E0 80AD8B20 0C031AD5 */ jal Graph_CloseDisps /* 013E4 80AD8B24 8F250000 */ lw $a1, 0x0000($t9) ## 00000000 .L80AD8B28: /* 013E8 80AD8B28 8FBF0024 */ lw $ra, 0x0024($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/EnPoSisters_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/EnPoSisters_Draw.s index a0190d799f..d3817d9aa4 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/EnPoSisters_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/EnPoSisters_Draw.s @@ -1,18 +1,18 @@ glabel EnPoSisters_Draw /* 040B4 80ADD044 27BDFF08 */ addiu $sp, $sp, 0xFF08 ## $sp = FFFFFF08 -/* 040B8 80ADD048 AFBF006C */ sw $ra, 0x006C($sp) -/* 040BC 80ADD04C AFB70068 */ sw $s7, 0x0068($sp) -/* 040C0 80ADD050 AFB60064 */ sw $s6, 0x0064($sp) -/* 040C4 80ADD054 AFB50060 */ sw $s5, 0x0060($sp) -/* 040C8 80ADD058 AFB4005C */ sw $s4, 0x005C($sp) -/* 040CC 80ADD05C AFB30058 */ sw $s3, 0x0058($sp) -/* 040D0 80ADD060 AFB20054 */ sw $s2, 0x0054($sp) -/* 040D4 80ADD064 AFB10050 */ sw $s1, 0x0050($sp) -/* 040D8 80ADD068 AFB0004C */ sw $s0, 0x004C($sp) -/* 040DC 80ADD06C F7B80040 */ sdc1 $f24, 0x0040($sp) -/* 040E0 80ADD070 F7B60038 */ sdc1 $f22, 0x0038($sp) -/* 040E4 80ADD074 F7B40030 */ sdc1 $f20, 0x0030($sp) -/* 040E8 80ADD078 AFA400F4 */ sw $a0, 0x00F4($sp) +/* 040B8 80ADD048 AFBF006C */ sw $ra, 0x006C($sp) +/* 040BC 80ADD04C AFB70068 */ sw $s7, 0x0068($sp) +/* 040C0 80ADD050 AFB60064 */ sw $s6, 0x0064($sp) +/* 040C4 80ADD054 AFB50060 */ sw $s5, 0x0060($sp) +/* 040C8 80ADD058 AFB4005C */ sw $s4, 0x005C($sp) +/* 040CC 80ADD05C AFB30058 */ sw $s3, 0x0058($sp) +/* 040D0 80ADD060 AFB20054 */ sw $s2, 0x0054($sp) +/* 040D4 80ADD064 AFB10050 */ sw $s1, 0x0050($sp) +/* 040D8 80ADD068 AFB0004C */ sw $s0, 0x004C($sp) +/* 040DC 80ADD06C F7B80040 */ sdc1 $f24, 0x0040($sp) +/* 040E0 80ADD070 F7B60038 */ sdc1 $f22, 0x0038($sp) +/* 040E4 80ADD074 F7B40030 */ sdc1 $f20, 0x0030($sp) +/* 040E8 80ADD078 AFA400F4 */ sw $a0, 0x00F4($sp) /* 040EC 80ADD07C 90820194 */ lbu $v0, 0x0194($a0) ## 00000194 /* 040F0 80ADD080 00A0B025 */ or $s6, $a1, $zero ## $s6 = 00000000 /* 040F4 80ADD084 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 @@ -22,26 +22,26 @@ glabel EnPoSisters_Draw /* 04104 80ADD094 25CED700 */ addiu $t6, $t6, %lo(D_80ADD700) ## $t6 = 80ADD700 /* 04108 80ADD098 25EFD6F0 */ addiu $t7, $t7, %lo(D_80ADD6F0) ## $t7 = 80ADD6F0 /* 0410C 80ADD09C 3C0680AE */ lui $a2, %hi(D_80ADD828) ## $a2 = 80AE0000 -/* 04110 80ADD0A0 00021080 */ sll $v0, $v0, 2 -/* 04114 80ADD0A4 004E8821 */ addu $s1, $v0, $t6 -/* 04118 80ADD0A8 004FB821 */ addu $s7, $v0, $t7 +/* 04110 80ADD0A0 00021080 */ sll $v0, $v0, 2 +/* 04114 80ADD0A4 004E8821 */ addu $s1, $v0, $t6 +/* 04118 80ADD0A8 004FB821 */ addu $s7, $v0, $t7 /* 0411C 80ADD0AC 24C6D828 */ addiu $a2, $a2, %lo(D_80ADD828) ## $a2 = 80ADD828 /* 04120 80ADD0B0 27A400C4 */ addiu $a0, $sp, 0x00C4 ## $a0 = FFFFFFCC /* 04124 80ADD0B4 24070BAD */ addiu $a3, $zero, 0x0BAD ## $a3 = 00000BAD -/* 04128 80ADD0B8 0C031AB1 */ jal func_800C6AC4 +/* 04128 80ADD0B8 0C031AB1 */ jal Graph_OpenDisps /* 0412C 80ADD0BC 00A09825 */ or $s3, $a1, $zero ## $s3 = 00000000 -/* 04130 80ADD0C0 0C2B7157 */ jal func_80ADC55C +/* 04130 80ADD0C0 0C2B7157 */ jal func_80ADC55C /* 04134 80ADD0C4 02802025 */ or $a0, $s4, $zero ## $a0 = 00000000 -/* 04138 80ADD0C8 0C024F46 */ jal func_80093D18 +/* 04138 80ADD0C8 0C024F46 */ jal func_80093D18 /* 0413C 80ADD0CC 8EC40000 */ lw $a0, 0x0000($s6) ## 00000000 -/* 04140 80ADD0D0 0C024F61 */ jal func_80093D84 +/* 04140 80ADD0D0 0C024F61 */ jal func_80093D84 /* 04144 80ADD0D4 8EC40000 */ lw $a0, 0x0000($s6) ## 00000000 /* 04148 80ADD0D8 92820231 */ lbu $v0, 0x0231($s4) ## 00000231 /* 0414C 80ADD0DC 241200FF */ addiu $s2, $zero, 0x00FF ## $s2 = 000000FF /* 04150 80ADD0E0 3C15FB00 */ lui $s5, 0xFB00 ## $s5 = FB000000 -/* 04154 80ADD0E4 12420003 */ beq $s2, $v0, .L80ADD0F4 +/* 04154 80ADD0E4 12420003 */ beq $s2, $v0, .L80ADD0F4 /* 04158 80ADD0E8 3C0E8011 */ lui $t6, 0x8011 ## $t6 = 80110000 -/* 0415C 80ADD0EC 14400026 */ bne $v0, $zero, .L80ADD188 +/* 0415C 80ADD0EC 14400026 */ bne $v0, $zero, .L80ADD188 /* 04160 80ADD0F0 2401FF00 */ addiu $at, $zero, 0xFF00 ## $at = FFFFFF00 .L80ADD0F4: /* 04164 80ADD0F4 8E6202C0 */ lw $v0, 0x02C0($s3) ## 000002C0 @@ -54,10 +54,10 @@ glabel EnPoSisters_Draw /* 04180 80ADD110 9288022E */ lbu $t0, 0x022E($s4) ## 0000022E /* 04184 80ADD114 928F0230 */ lbu $t7, 0x0230($s4) ## 00000230 /* 04188 80ADD118 928A0231 */ lbu $t2, 0x0231($s4) ## 00000231 -/* 0418C 80ADD11C 000B6400 */ sll $t4, $t3, 16 -/* 04190 80ADD120 00084E00 */ sll $t1, $t0, 24 +/* 0418C 80ADD11C 000B6400 */ sll $t4, $t3, 16 +/* 04190 80ADD120 00084E00 */ sll $t1, $t0, 24 /* 04194 80ADD124 012C6825 */ or $t5, $t1, $t4 ## $t5 = 00000000 -/* 04198 80ADD128 000FC200 */ sll $t8, $t7, 8 +/* 04198 80ADD128 000FC200 */ sll $t8, $t7, 8 /* 0419C 80ADD12C 01B8C825 */ or $t9, $t5, $t8 ## $t9 = 00000008 /* 041A0 80ADD130 032A5825 */ or $t3, $t9, $t2 ## $t3 = 00000008 /* 041A4 80ADD134 AC4B0004 */ sw $t3, 0x0004($v0) ## 00000004 @@ -72,14 +72,14 @@ glabel EnPoSisters_Draw /* 041C8 80ADD158 8E850150 */ lw $a1, 0x0150($s4) ## 00000150 /* 041CC 80ADD15C 3C0F80AE */ lui $t7, %hi(func_80ADC970) ## $t7 = 80AE0000 /* 041D0 80ADD160 25EFC970 */ addiu $t7, $t7, %lo(func_80ADC970) ## $t7 = 80ADC970 -/* 041D4 80ADD164 AFAF0010 */ sw $t7, 0x0010($sp) -/* 041D8 80ADD168 AFB40014 */ sw $s4, 0x0014($sp) +/* 041D4 80ADD164 AFAF0010 */ sw $t7, 0x0010($sp) +/* 041D8 80ADD168 AFB40014 */ sw $s4, 0x0014($sp) /* 041DC 80ADD16C 8E6D02C0 */ lw $t5, 0x02C0($s3) ## 000002C0 /* 041E0 80ADD170 24E7C77C */ addiu $a3, $a3, %lo(func_80ADC77C) ## $a3 = 80ADC77C /* 041E4 80ADD174 02C02025 */ or $a0, $s6, $zero ## $a0 = 00000000 -/* 041E8 80ADD178 0C0288A2 */ jal func_800A2288 -/* 041EC 80ADD17C AFAD0018 */ sw $t5, 0x0018($sp) -/* 041F0 80ADD180 1000001F */ beq $zero, $zero, .L80ADD200 +/* 041E8 80ADD178 0C0288A2 */ jal SkelAnime_Draw2 +/* 041EC 80ADD17C AFAD0018 */ sw $t5, 0x0018($sp) +/* 041F0 80ADD180 1000001F */ beq $zero, $zero, .L80ADD200 /* 041F4 80ADD184 AE6202C0 */ sw $v0, 0x02C0($s3) ## 000002C0 .L80ADD188: /* 041F8 80ADD188 8E6202D0 */ lw $v0, 0x02D0($s3) ## 000002D0 @@ -103,21 +103,21 @@ glabel EnPoSisters_Draw /* 04240 80ADD1D0 8E86016C */ lw $a2, 0x016C($s4) ## 0000016C /* 04244 80ADD1D4 8E850150 */ lw $a1, 0x0150($s4) ## 00000150 /* 04248 80ADD1D8 25CEC970 */ addiu $t6, $t6, %lo(func_80ADC970) ## $t6 = 80ADC970 -/* 0424C 80ADD1DC AFAE0010 */ sw $t6, 0x0010($sp) -/* 04250 80ADD1E0 AFB40014 */ sw $s4, 0x0014($sp) +/* 0424C 80ADD1DC AFAE0010 */ sw $t6, 0x0010($sp) +/* 04250 80ADD1E0 AFB40014 */ sw $s4, 0x0014($sp) /* 04254 80ADD1E4 8E6F02D0 */ lw $t7, 0x02D0($s3) ## 000002D0 /* 04258 80ADD1E8 3C0780AE */ lui $a3, %hi(func_80ADC77C) ## $a3 = 80AE0000 /* 0425C 80ADD1EC 24E7C77C */ addiu $a3, $a3, %lo(func_80ADC77C) ## $a3 = 80ADC77C /* 04260 80ADD1F0 02C02025 */ or $a0, $s6, $zero ## $a0 = 00000000 -/* 04264 80ADD1F4 0C0288A2 */ jal func_800A2288 -/* 04268 80ADD1F8 AFAF0018 */ sw $t7, 0x0018($sp) +/* 04264 80ADD1F4 0C0288A2 */ jal SkelAnime_Draw2 +/* 04268 80ADD1F8 AFAF0018 */ sw $t7, 0x0018($sp) /* 0426C 80ADD1FC AE6202D0 */ sw $v0, 0x02D0($s3) ## 000002D0 .L80ADD200: /* 04270 80ADD200 928D0199 */ lbu $t5, 0x0199($s4) ## 00000199 /* 04274 80ADD204 31B80080 */ andi $t8, $t5, 0x0080 ## $t8 = 00000000 -/* 04278 80ADD208 57000019 */ bnel $t8, $zero, .L80ADD270 +/* 04278 80ADD208 57000019 */ bnel $t8, $zero, .L80ADD270 /* 0427C 80ADD20C 8E6202D0 */ lw $v0, 0x02D0($s3) ## 000002D0 -/* 04280 80ADD210 0C03423F */ jal Matrix_Put +/* 04280 80ADD210 0C03423F */ jal Matrix_Put /* 04284 80ADD214 268402F8 */ addiu $a0, $s4, 0x02F8 ## $a0 = 000002F8 /* 04288 80ADD218 8E6202C0 */ lw $v0, 0x02C0($s3) ## 000002C0 /* 0428C 80ADD21C 3C19DA38 */ lui $t9, 0xDA38 ## $t9 = DA380000 @@ -129,7 +129,7 @@ glabel EnPoSisters_Draw /* 042A4 80ADD234 8EC40000 */ lw $a0, 0x0000($s6) ## 00000000 /* 042A8 80ADD238 24A5D840 */ addiu $a1, $a1, %lo(D_80ADD840) ## $a1 = 80ADD840 /* 042AC 80ADD23C 24060BDA */ addiu $a2, $zero, 0x0BDA ## $a2 = 00000BDA -/* 042B0 80ADD240 0C0346A2 */ jal Matrix_NewMtx +/* 042B0 80ADD240 0C0346A2 */ jal Matrix_NewMtx /* 042B4 80ADD244 00408025 */ or $s0, $v0, $zero ## $s0 = 00000000 /* 042B8 80ADD248 AE020004 */ sw $v0, 0x0004($s0) ## 00000004 /* 042BC 80ADD24C 8E6202C0 */ lw $v0, 0x02C0($s3) ## 000002C0 @@ -152,26 +152,26 @@ glabel EnPoSisters_Draw /* 042FC 80ADD28C 240D0040 */ addiu $t5, $zero, 0x0040 ## $t5 = 00000040 /* 04300 80ADD290 24180001 */ addiu $t8, $zero, 0x0001 ## $t8 = 00000001 /* 04304 80ADD294 3C080001 */ lui $t0, 0x0001 ## $t0 = 00010000 -/* 04308 80ADD298 01164021 */ addu $t0, $t0, $s6 -/* 0430C 80ADD29C AFB80018 */ sw $t8, 0x0018($sp) -/* 04310 80ADD2A0 AFAD0014 */ sw $t5, 0x0014($sp) -/* 04314 80ADD2A4 AFAF0010 */ sw $t7, 0x0010($sp) -/* 04318 80ADD2A8 AFA0001C */ sw $zero, 0x001C($sp) +/* 04308 80ADD298 01164021 */ addu $t0, $t0, $s6 +/* 0430C 80ADD29C AFB80018 */ sw $t8, 0x0018($sp) +/* 04310 80ADD2A0 AFAD0014 */ sw $t5, 0x0014($sp) +/* 04314 80ADD2A4 AFAF0010 */ sw $t7, 0x0010($sp) +/* 04318 80ADD2A8 AFA0001C */ sw $zero, 0x001C($sp) /* 0431C 80ADD2AC 8D081DE4 */ lw $t0, 0x1DE4($t0) ## 00011DE4 /* 04320 80ADD2B0 240B0020 */ addiu $t3, $zero, 0x0020 ## $t3 = 00000020 /* 04324 80ADD2B4 24090080 */ addiu $t1, $zero, 0x0080 ## $t1 = 00000080 -/* 04328 80ADD2B8 00080823 */ subu $at, $zero, $t0 -/* 0432C 80ADD2BC 0001C880 */ sll $t9, $at, 2 -/* 04330 80ADD2C0 0321C821 */ addu $t9, $t9, $at -/* 04334 80ADD2C4 0019C880 */ sll $t9, $t9, 2 +/* 04328 80ADD2B8 00080823 */ subu $at, $zero, $t0 +/* 0432C 80ADD2BC 0001C880 */ sll $t9, $at, 2 +/* 04330 80ADD2C0 0321C821 */ addu $t9, $t9, $at +/* 04334 80ADD2C4 0019C880 */ sll $t9, $t9, 2 /* 04338 80ADD2C8 332A01FF */ andi $t2, $t9, 0x01FF ## $t2 = 00000000 -/* 0433C 80ADD2CC AFAA0020 */ sw $t2, 0x0020($sp) -/* 04340 80ADD2D0 AFA90028 */ sw $t1, 0x0028($sp) -/* 04344 80ADD2D4 AFAB0024 */ sw $t3, 0x0024($sp) +/* 0433C 80ADD2CC AFAA0020 */ sw $t2, 0x0020($sp) +/* 04340 80ADD2D0 AFA90028 */ sw $t1, 0x0028($sp) +/* 04344 80ADD2D4 AFAB0024 */ sw $t3, 0x0024($sp) /* 04348 80ADD2D8 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 0434C 80ADD2DC 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 /* 04350 80ADD2E0 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 04354 80ADD2E4 0C0253D0 */ jal Draw_TwoTexScroll +/* 04354 80ADD2E4 0C0253D0 */ jal Gfx_TwoTexScroll /* 04358 80ADD2E8 00408025 */ or $s0, $v0, $zero ## $s0 = 00000000 /* 0435C 80ADD2EC AE020004 */ sw $v0, 0x0004($s0) ## 00000004 /* 04360 80ADD2F0 8E6202D0 */ lw $v0, 0x02D0($s3) ## 000002D0 @@ -184,138 +184,138 @@ glabel EnPoSisters_Draw /* 0437C 80ADD30C 922F0000 */ lbu $t7, 0x0000($s1) ## 00000000 /* 04380 80ADD310 92290002 */ lbu $t1, 0x0002($s1) ## 00000002 /* 04384 80ADD314 92380003 */ lbu $t8, 0x0003($s1) ## 00000003 -/* 04388 80ADD318 0008CC00 */ sll $t9, $t0, 16 -/* 0438C 80ADD31C 000F6E00 */ sll $t5, $t7, 24 +/* 04388 80ADD318 0008CC00 */ sll $t9, $t0, 16 +/* 0438C 80ADD31C 000F6E00 */ sll $t5, $t7, 24 /* 04390 80ADD320 01B95025 */ or $t2, $t5, $t9 ## $t2 = 00000000 -/* 04394 80ADD324 00096200 */ sll $t4, $t1, 8 +/* 04394 80ADD324 00096200 */ sll $t4, $t1, 8 /* 04398 80ADD328 014C7025 */ or $t6, $t2, $t4 ## $t6 = 00000008 /* 0439C 80ADD32C 01D84025 */ or $t0, $t6, $t8 ## $t0 = 00000008 /* 043A0 80ADD330 AC480004 */ sw $t0, 0x0004($v0) ## 00000004 /* 043A4 80ADD334 8E820190 */ lw $v0, 0x0190($s4) ## 00000190 /* 043A8 80ADD338 3C0B80AE */ lui $t3, %hi(func_80ADBD38) ## $t3 = 80AE0000 /* 043AC 80ADD33C 256BBD38 */ addiu $t3, $t3, %lo(func_80ADBD38) ## $t3 = 80ADBD38 -/* 043B0 80ADD340 14A20020 */ bne $a1, $v0, .L80ADD3C4 +/* 043B0 80ADD340 14A20020 */ bne $a1, $v0, .L80ADD3C4 /* 043B4 80ADD344 00000000 */ nop /* 043B8 80ADD348 8682019A */ lh $v0, 0x019A($s4) ## 0000019A /* 043BC 80ADD34C 240D0020 */ addiu $t5, $zero, 0x0020 ## $t5 = 00000020 -/* 043C0 80ADD350 28410020 */ slti $at, $v0, 0x0020 -/* 043C4 80ADD354 1020000D */ beq $at, $zero, .L80ADD38C -/* 043C8 80ADD358 01A2C823 */ subu $t9, $t5, $v0 -/* 043CC 80ADD35C 03320019 */ multu $t9, $s2 -/* 043D0 80ADD360 0000A812 */ mflo $s5 -/* 043D4 80ADD364 06A10002 */ bgez $s5, .L80ADD370 -/* 043D8 80ADD368 02A00821 */ addu $at, $s5, $zero +/* 043C0 80ADD350 28410020 */ slti $at, $v0, 0x0020 +/* 043C4 80ADD354 1020000D */ beq $at, $zero, .L80ADD38C +/* 043C8 80ADD358 01A2C823 */ subu $t9, $t5, $v0 +/* 043CC 80ADD35C 03320019 */ multu $t9, $s2 +/* 043D0 80ADD360 0000A812 */ mflo $s5 +/* 043D4 80ADD364 06A10002 */ bgez $s5, .L80ADD370 +/* 043D8 80ADD368 02A00821 */ addu $at, $s5, $zero /* 043DC 80ADD36C 26A1001F */ addiu $at, $s5, 0x001F ## $at = FB00001F .L80ADD370: -/* 043E0 80ADD370 0001A943 */ sra $s5, $at, 5 +/* 043E0 80ADD370 0001A943 */ sra $s5, $at, 5 /* 043E4 80ADD374 3C0180AE */ lui $at, %hi(D_80ADD8A8) ## $at = 80AE0000 -/* 043E8 80ADD378 C434D8A8 */ lwc1 $f20, %lo(D_80ADD8A8)($at) +/* 043E8 80ADD378 C434D8A8 */ lwc1 $f20, %lo(D_80ADD8A8)($at) /* 043EC 80ADD37C 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 /* 043F0 80ADD380 4481B000 */ mtc1 $at, $f22 ## $f22 = 0.50 -/* 043F4 80ADD384 10000040 */ beq $zero, $zero, .L80ADD488 +/* 043F4 80ADD384 10000040 */ beq $zero, $zero, .L80ADD488 /* 043F8 80ADD388 32B500FF */ andi $s5, $s5, 0x00FF ## $s5 = 00000000 .L80ADD38C: -/* 043FC 80ADD38C 00520019 */ multu $v0, $s2 -/* 04400 80ADD390 0000A812 */ mflo $s5 +/* 043FC 80ADD38C 00520019 */ multu $v0, $s2 +/* 04400 80ADD390 0000A812 */ mflo $s5 /* 04404 80ADD394 26B5E020 */ addiu $s5, $s5, 0xE020 ## $s5 = FFFFE020 -/* 04408 80ADD398 06A10002 */ bgez $s5, .L80ADD3A4 -/* 0440C 80ADD39C 02A00821 */ addu $at, $s5, $zero +/* 04408 80ADD398 06A10002 */ bgez $s5, .L80ADD3A4 +/* 0440C 80ADD39C 02A00821 */ addu $at, $s5, $zero /* 04410 80ADD3A0 26A1001F */ addiu $at, $s5, 0x001F ## $at = FFFFE03F .L80ADD3A4: -/* 04414 80ADD3A4 0001A943 */ sra $s5, $at, 5 +/* 04414 80ADD3A4 0001A943 */ sra $s5, $at, 5 /* 04418 80ADD3A8 3C0180AE */ lui $at, %hi(D_80ADD8AC) ## $at = 80AE0000 /* 0441C 80ADD3AC 32B500FF */ andi $s5, $s5, 0x00FF ## $s5 = 00000020 -/* 04420 80ADD3B0 C434D8AC */ lwc1 $f20, %lo(D_80ADD8AC)($at) +/* 04420 80ADD3B0 C434D8AC */ lwc1 $f20, %lo(D_80ADD8AC)($at) /* 04424 80ADD3B4 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 /* 04428 80ADD3B8 4481B000 */ mtc1 $at, $f22 ## $f22 = 0.50 -/* 0442C 80ADD3BC 10000033 */ beq $zero, $zero, .L80ADD48C +/* 0442C 80ADD3BC 10000033 */ beq $zero, $zero, .L80ADD48C /* 04430 80ADD3C0 92990198 */ lbu $t9, 0x0198($s4) ## 00000198 .L80ADD3C4: -/* 04434 80ADD3C4 15620010 */ bne $t3, $v0, .L80ADD408 +/* 04434 80ADD3C4 15620010 */ bne $t3, $v0, .L80ADD408 /* 04438 80ADD3C8 3C0F80AE */ lui $t7, %hi(func_80ADBEE8) ## $t7 = 80AE0000 /* 0443C 80ADD3CC 8689019A */ lh $t1, 0x019A($s4) ## 0000019A /* 04440 80ADD3D0 240A0020 */ addiu $t2, $zero, 0x0020 ## $t2 = 00000020 -/* 04444 80ADD3D4 01496023 */ subu $t4, $t2, $t1 -/* 04448 80ADD3D8 01920019 */ multu $t4, $s2 -/* 0444C 80ADD3DC 0000A812 */ mflo $s5 -/* 04450 80ADD3E0 06A10002 */ bgez $s5, .L80ADD3EC -/* 04454 80ADD3E4 02A00821 */ addu $at, $s5, $zero +/* 04444 80ADD3D4 01496023 */ subu $t4, $t2, $t1 +/* 04448 80ADD3D8 01920019 */ multu $t4, $s2 +/* 0444C 80ADD3DC 0000A812 */ mflo $s5 +/* 04450 80ADD3E0 06A10002 */ bgez $s5, .L80ADD3EC +/* 04454 80ADD3E4 02A00821 */ addu $at, $s5, $zero /* 04458 80ADD3E8 26A1001F */ addiu $at, $s5, 0x001F ## $at = 0000003F .L80ADD3EC: -/* 0445C 80ADD3EC 0001A943 */ sra $s5, $at, 5 +/* 0445C 80ADD3EC 0001A943 */ sra $s5, $at, 5 /* 04460 80ADD3F0 3C0180AE */ lui $at, %hi(D_80ADD8B0) ## $at = 80AE0000 -/* 04464 80ADD3F4 C434D8B0 */ lwc1 $f20, %lo(D_80ADD8B0)($at) +/* 04464 80ADD3F4 C434D8B0 */ lwc1 $f20, %lo(D_80ADD8B0)($at) /* 04468 80ADD3F8 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 /* 0446C 80ADD3FC 4481B000 */ mtc1 $at, $f22 ## $f22 = 0.50 -/* 04470 80ADD400 10000021 */ beq $zero, $zero, .L80ADD488 +/* 04470 80ADD400 10000021 */ beq $zero, $zero, .L80ADD488 /* 04474 80ADD404 32B500FF */ andi $s5, $s5, 0x00FF ## $s5 = 00000020 .L80ADD408: /* 04478 80ADD408 25EFBEE8 */ addiu $t7, $t7, %lo(func_80ADBEE8) ## $t7 = 80ADBEE8 -/* 0447C 80ADD40C 15E20010 */ bne $t7, $v0, .L80ADD450 +/* 0447C 80ADD40C 15E20010 */ bne $t7, $v0, .L80ADD450 /* 04480 80ADD410 3C0D80AE */ lui $t5, %hi(func_80ADBC88) ## $t5 = 80AE0000 /* 04484 80ADD414 868E019A */ lh $t6, 0x019A($s4) ## 0000019A /* 04488 80ADD418 24180020 */ addiu $t8, $zero, 0x0020 ## $t8 = 00000020 -/* 0448C 80ADD41C 030E4023 */ subu $t0, $t8, $t6 -/* 04490 80ADD420 01120019 */ multu $t0, $s2 -/* 04494 80ADD424 0000A812 */ mflo $s5 -/* 04498 80ADD428 06A10002 */ bgez $s5, .L80ADD434 -/* 0449C 80ADD42C 02A00821 */ addu $at, $s5, $zero +/* 0448C 80ADD41C 030E4023 */ subu $t0, $t8, $t6 +/* 04490 80ADD420 01120019 */ multu $t0, $s2 +/* 04494 80ADD424 0000A812 */ mflo $s5 +/* 04498 80ADD428 06A10002 */ bgez $s5, .L80ADD434 +/* 0449C 80ADD42C 02A00821 */ addu $at, $s5, $zero /* 044A0 80ADD430 26A1001F */ addiu $at, $s5, 0x001F ## $at = 0000003F .L80ADD434: -/* 044A4 80ADD434 0001A943 */ sra $s5, $at, 5 +/* 044A4 80ADD434 0001A943 */ sra $s5, $at, 5 /* 044A8 80ADD438 3C0180AE */ lui $at, %hi(D_80ADD8B4) ## $at = 80AE0000 -/* 044AC 80ADD43C C434D8B4 */ lwc1 $f20, %lo(D_80ADD8B4)($at) +/* 044AC 80ADD43C C434D8B4 */ lwc1 $f20, %lo(D_80ADD8B4)($at) /* 044B0 80ADD440 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 /* 044B4 80ADD444 4481B000 */ mtc1 $at, $f22 ## $f22 = 0.50 -/* 044B8 80ADD448 1000000F */ beq $zero, $zero, .L80ADD488 +/* 044B8 80ADD448 1000000F */ beq $zero, $zero, .L80ADD488 /* 044BC 80ADD44C 32B500FF */ andi $s5, $s5, 0x00FF ## $s5 = 00000020 .L80ADD450: /* 044C0 80ADD450 25ADBC88 */ addiu $t5, $t5, %lo(func_80ADBC88) ## $t5 = 80ADBC88 -/* 044C4 80ADD454 15A20007 */ bne $t5, $v0, .L80ADD474 +/* 044C4 80ADD454 15A20007 */ bne $t5, $v0, .L80ADD474 /* 044C8 80ADD458 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 /* 044CC 80ADD45C 3C0180AE */ lui $at, %hi(D_80ADD8B8) ## $at = 80AE0000 -/* 044D0 80ADD460 C434D8B8 */ lwc1 $f20, %lo(D_80ADD8B8)($at) +/* 044D0 80ADD460 C434D8B8 */ lwc1 $f20, %lo(D_80ADD8B8)($at) /* 044D4 80ADD464 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 /* 044D8 80ADD468 4481B000 */ mtc1 $at, $f22 ## $f22 = 0.50 -/* 044DC 80ADD46C 10000006 */ beq $zero, $zero, .L80ADD488 -/* 044E0 80ADD470 93B500E7 */ lbu $s5, 0x00E7($sp) +/* 044DC 80ADD46C 10000006 */ beq $zero, $zero, .L80ADD488 +/* 044E0 80ADD470 93B500E7 */ lbu $s5, 0x00E7($sp) .L80ADD474: /* 044E4 80ADD474 4481B000 */ mtc1 $at, $f22 ## $f22 = 0.50 /* 044E8 80ADD478 C6840050 */ lwc1 $f4, 0x0050($s4) ## 00000050 -/* 044EC 80ADD47C 93B500E7 */ lbu $s5, 0x00E7($sp) -/* 044F0 80ADD480 46162502 */ mul.s $f20, $f4, $f22 +/* 044EC 80ADD47C 93B500E7 */ lbu $s5, 0x00E7($sp) +/* 044F0 80ADD480 46162502 */ mul.s $f20, $f4, $f22 /* 044F4 80ADD484 00000000 */ nop .L80ADD488: /* 044F8 80ADD488 92990198 */ lbu $t9, 0x0198($s4) ## 00000198 .L80ADD48C: /* 044FC 80ADD48C 3C0B80AE */ lui $t3, %hi(func_80ADAFC0) ## $t3 = 80AE0000 /* 04500 80ADD490 256BAFC0 */ addiu $t3, $t3, %lo(func_80ADAFC0) ## $t3 = 80ADAFC0 -/* 04504 80ADD494 1B200081 */ blez $t9, .L80ADD69C +/* 04504 80ADD494 1B200081 */ blez $t9, .L80ADD69C /* 04508 80ADD498 00008825 */ or $s1, $zero, $zero ## $s1 = 00000000 /* 0450C 80ADD49C 3C0A0405 */ lui $t2, 0x0405 ## $t2 = 04050000 /* 04510 80ADD4A0 254AD4E0 */ addiu $t2, $t2, 0xD4E0 ## $t2 = 0404D4E0 /* 04514 80ADD4A4 3C0180AE */ lui $at, %hi(D_80ADD8BC) ## $at = 80AE0000 -/* 04518 80ADD4A8 C438D8BC */ lwc1 $f24, %lo(D_80ADD8BC)($at) -/* 0451C 80ADD4AC AFAA0078 */ sw $t2, 0x0078($sp) -/* 04520 80ADD4B0 AFAB007C */ sw $t3, 0x007C($sp) +/* 04518 80ADD4A8 C438D8BC */ lwc1 $f24, %lo(D_80ADD8BC)($at) +/* 0451C 80ADD4AC AFAA0078 */ sw $t2, 0x0078($sp) +/* 04520 80ADD4B0 AFAB007C */ sw $t3, 0x007C($sp) /* 04524 80ADD4B4 02809025 */ or $s2, $s4, $zero ## $s2 = 00000000 -/* 04528 80ADD4B8 AFA50084 */ sw $a1, 0x0084($sp) -/* 0452C 80ADD4BC 8FA50084 */ lw $a1, 0x0084($sp) +/* 04528 80ADD4B8 AFA50084 */ sw $a1, 0x0084($sp) +/* 0452C 80ADD4BC 8FA50084 */ lw $a1, 0x0084($sp) .L80ADD4C0: /* 04530 80ADD4C0 8E820190 */ lw $v0, 0x0190($s4) ## 00000190 /* 04534 80ADD4C4 3C0980AE */ lui $t1, %hi(func_80ADBD38) ## $t1 = 80AE0000 /* 04538 80ADD4C8 2529BD38 */ addiu $t1, $t1, %lo(func_80ADBD38) ## $t1 = 80ADBD38 -/* 0453C 80ADD4CC 10A2000C */ beq $a1, $v0, .L80ADD500 +/* 0453C 80ADD4CC 10A2000C */ beq $a1, $v0, .L80ADD500 /* 04540 80ADD4D0 3C18E700 */ lui $t8, 0xE700 ## $t8 = E7000000 -/* 04544 80ADD4D4 1122000A */ beq $t1, $v0, .L80ADD500 +/* 04544 80ADD4D4 1122000A */ beq $t1, $v0, .L80ADD500 /* 04548 80ADD4D8 3C0C80AE */ lui $t4, %hi(func_80ADBEE8) ## $t4 = 80AE0000 /* 0454C 80ADD4DC 258CBEE8 */ addiu $t4, $t4, %lo(func_80ADBEE8) ## $t4 = 80ADBEE8 -/* 04550 80ADD4E0 51820008 */ beql $t4, $v0, .L80ADD504 +/* 04550 80ADD4E0 51820008 */ beql $t4, $v0, .L80ADD504 /* 04554 80ADD4E4 8E6202D0 */ lw $v0, 0x02D0($s3) ## 000002D0 -/* 04558 80ADD4E8 0011A823 */ subu $s5, $zero, $s1 -/* 0455C 80ADD4EC 02A00821 */ addu $at, $s5, $zero -/* 04560 80ADD4F0 0015A940 */ sll $s5, $s5, 5 -/* 04564 80ADD4F4 02A1A823 */ subu $s5, $s5, $at +/* 04558 80ADD4E8 0011A823 */ subu $s5, $zero, $s1 +/* 0455C 80ADD4EC 02A00821 */ addu $at, $s5, $zero +/* 04560 80ADD4F0 0015A940 */ sll $s5, $s5, 5 +/* 04564 80ADD4F4 02A1A823 */ subu $s5, $s5, $at /* 04568 80ADD4F8 26B500F8 */ addiu $s5, $s5, 0x00F8 ## $s5 = 00000118 /* 0456C 80ADD4FC 32B500FF */ andi $s5, $s5, 0x00FF ## $s5 = 00000018 .L80ADD500: @@ -336,70 +336,70 @@ glabel EnPoSisters_Draw /* 045A4 80ADD534 92E90001 */ lbu $t1, 0x0001($s7) ## 00000001 /* 045A8 80ADD538 92F90000 */ lbu $t9, 0x0000($s7) ## 00000000 /* 045AC 80ADD53C 92EE0002 */ lbu $t6, 0x0002($s7) ## 00000002 -/* 045B0 80ADD540 00096400 */ sll $t4, $t1, 16 -/* 045B4 80ADD544 00195E00 */ sll $t3, $t9, 24 +/* 045B0 80ADD540 00096400 */ sll $t4, $t1, 16 +/* 045B4 80ADD544 00195E00 */ sll $t3, $t9, 24 /* 045B8 80ADD548 016C7825 */ or $t7, $t3, $t4 ## $t7 = 80ADBFE8 -/* 045BC 80ADD54C 000E4200 */ sll $t0, $t6, 8 +/* 045BC 80ADD54C 000E4200 */ sll $t0, $t6, 8 /* 045C0 80ADD550 01E86825 */ or $t5, $t7, $t0 ## $t5 = FAADBFE8 /* 045C4 80ADD554 01A4C825 */ or $t9, $t5, $a0 ## $t9 = FAADBFF8 /* 045C8 80ADD558 AC590004 */ sw $t9, 0x0004($v0) ## 00000004 /* 045CC 80ADD55C 8E46023C */ lw $a2, 0x023C($s2) ## 0000023C /* 045D0 80ADD560 C64E0238 */ lwc1 $f14, 0x0238($s2) ## 00000238 /* 045D4 80ADD564 C64C0234 */ lwc1 $f12, 0x0234($s2) ## 00000234 -/* 045D8 80ADD568 0C034261 */ jal Matrix_Translate -/* 045DC 80ADD56C AFA50084 */ sw $a1, 0x0084($sp) +/* 045D8 80ADD568 0C034261 */ jal Matrix_Translate +/* 045DC 80ADD56C AFA50084 */ sw $a1, 0x0084($sp) /* 045E0 80ADD570 86CA07A0 */ lh $t2, 0x07A0($s6) ## 000007A0 -/* 045E4 80ADD574 000A4880 */ sll $t1, $t2, 2 -/* 045E8 80ADD578 02C95821 */ addu $t3, $s6, $t1 -/* 045EC 80ADD57C 0C016A7D */ jal func_8005A9F4 +/* 045E4 80ADD574 000A4880 */ sll $t1, $t2, 2 +/* 045E8 80ADD578 02C95821 */ addu $t3, $s6, $t1 +/* 045EC 80ADD57C 0C016A7D */ jal func_8005A9F4 /* 045F0 80ADD580 8D640790 */ lw $a0, 0x0790($t3) ## 00000790 /* 045F4 80ADD584 34018000 */ ori $at, $zero, 0x8000 ## $at = 00008000 -/* 045F8 80ADD588 00412821 */ addu $a1, $v0, $at -/* 045FC 80ADD58C 00052C00 */ sll $a1, $a1, 16 -/* 04600 80ADD590 00052C03 */ sra $a1, $a1, 16 +/* 045F8 80ADD588 00412821 */ addu $a1, $v0, $at +/* 045FC 80ADD58C 00052C00 */ sll $a1, $a1, 16 +/* 04600 80ADD590 00052C03 */ sra $a1, $a1, 16 /* 04604 80ADD594 00002025 */ or $a0, $zero, $zero ## $a0 = 00000000 /* 04608 80ADD598 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 0460C 80ADD59C 0C034421 */ jal Matrix_RotateXYZ +/* 0460C 80ADD59C 0C034421 */ jal Matrix_RotateZYX /* 04610 80ADD5A0 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 04614 80ADD5A4 8FAC007C */ lw $t4, 0x007C($sp) +/* 04614 80ADD5A4 8FAC007C */ lw $t4, 0x007C($sp) /* 04618 80ADD5A8 8E980190 */ lw $t8, 0x0190($s4) ## 00000190 /* 0461C 80ADD5AC 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 04620 80ADD5B0 5598001C */ bnel $t4, $t8, .L80ADD624 -/* 04624 80ADD5B4 4406A000 */ mfc1 $a2, $f20 +/* 04620 80ADD5B0 5598001C */ bnel $t4, $t8, .L80ADD624 +/* 04624 80ADD5B4 4406A000 */ mfc1 $a2, $f20 /* 04628 80ADD5B8 868E019A */ lh $t6, 0x019A($s4) ## 0000019A /* 0462C 80ADD5BC 3C0180AE */ lui $at, %hi(D_80ADD8C0) ## $at = 80AE0000 -/* 04630 80ADD5C0 C42AD8C0 */ lwc1 $f10, %lo(D_80ADD8C0)($at) -/* 04634 80ADD5C4 01D17823 */ subu $t7, $t6, $s1 +/* 04630 80ADD5C0 C42AD8C0 */ lwc1 $f10, %lo(D_80ADD8C0)($at) +/* 04634 80ADD5C4 01D17823 */ subu $t7, $t6, $s1 /* 04638 80ADD5C8 448F3000 */ mtc1 $t7, $f6 ## $f6 = 0.00 /* 0463C 80ADD5CC 3C0180AE */ lui $at, %hi(D_80ADD8C4) ## $at = 80AE0000 -/* 04640 80ADD5D0 46803220 */ cvt.s.w $f8, $f6 -/* 04644 80ADD5D4 460A4402 */ mul.s $f16, $f8, $f10 -/* 04648 80ADD5D8 46168500 */ add.s $f20, $f16, $f22 -/* 0464C 80ADD5DC 4616A03C */ c.lt.s $f20, $f22 +/* 04640 80ADD5D0 46803220 */ cvt.s.w $f8, $f6 +/* 04644 80ADD5D4 460A4402 */ mul.s $f16, $f8, $f10 +/* 04648 80ADD5D8 46168500 */ add.s $f20, $f16, $f22 +/* 0464C 80ADD5DC 4616A03C */ c.lt.s $f20, $f22 /* 04650 80ADD5E0 00000000 */ nop -/* 04654 80ADD5E4 45020004 */ bc1fl .L80ADD5F8 -/* 04658 80ADD5E8 4614C03C */ c.lt.s $f24, $f20 -/* 0465C 80ADD5EC 10000009 */ beq $zero, $zero, .L80ADD614 -/* 04660 80ADD5F0 4600B006 */ mov.s $f0, $f22 -/* 04664 80ADD5F4 4614C03C */ c.lt.s $f24, $f20 +/* 04654 80ADD5E4 45020004 */ bc1fl .L80ADD5F8 +/* 04658 80ADD5E8 4614C03C */ c.lt.s $f24, $f20 +/* 0465C 80ADD5EC 10000009 */ beq $zero, $zero, .L80ADD614 +/* 04660 80ADD5F0 4600B006 */ mov.s $f0, $f22 +/* 04664 80ADD5F4 4614C03C */ c.lt.s $f24, $f20 .L80ADD5F8: /* 04668 80ADD5F8 00000000 */ nop -/* 0466C 80ADD5FC 45020004 */ bc1fl .L80ADD610 -/* 04670 80ADD600 4600A086 */ mov.s $f2, $f20 -/* 04674 80ADD604 10000002 */ beq $zero, $zero, .L80ADD610 -/* 04678 80ADD608 4600C086 */ mov.s $f2, $f24 -/* 0467C 80ADD60C 4600A086 */ mov.s $f2, $f20 +/* 0466C 80ADD5FC 45020004 */ bc1fl .L80ADD610 +/* 04670 80ADD600 4600A086 */ mov.s $f2, $f20 +/* 04674 80ADD604 10000002 */ beq $zero, $zero, .L80ADD610 +/* 04678 80ADD608 4600C086 */ mov.s $f2, $f24 +/* 0467C 80ADD60C 4600A086 */ mov.s $f2, $f20 .L80ADD610: -/* 04680 80ADD610 46001006 */ mov.s $f0, $f2 +/* 04680 80ADD610 46001006 */ mov.s $f0, $f2 .L80ADD614: -/* 04684 80ADD614 C432D8C4 */ lwc1 $f18, %lo(D_80ADD8C4)($at) -/* 04688 80ADD618 46120502 */ mul.s $f20, $f0, $f18 +/* 04684 80ADD614 C432D8C4 */ lwc1 $f18, %lo(D_80ADD8C4)($at) +/* 04688 80ADD618 46120502 */ mul.s $f20, $f0, $f18 /* 0468C 80ADD61C 00000000 */ nop -/* 04690 80ADD620 4406A000 */ mfc1 $a2, $f20 +/* 04690 80ADD620 4406A000 */ mfc1 $a2, $f20 .L80ADD624: -/* 04694 80ADD624 4600A306 */ mov.s $f12, $f20 -/* 04698 80ADD628 0C0342A3 */ jal Matrix_Scale -/* 0469C 80ADD62C 4600A386 */ mov.s $f14, $f20 +/* 04694 80ADD624 4600A306 */ mov.s $f12, $f20 +/* 04698 80ADD628 0C0342A3 */ jal Matrix_Scale +/* 0469C 80ADD62C 4600A386 */ mov.s $f14, $f20 /* 046A0 80ADD630 8E6202D0 */ lw $v0, 0x02D0($s3) ## 000002D0 /* 046A4 80ADD634 3C0DDA38 */ lui $t5, 0xDA38 ## $t5 = DA380000 /* 046A8 80ADD638 35AD0003 */ ori $t5, $t5, 0x0003 ## $t5 = DA380003 @@ -410,7 +410,7 @@ glabel EnPoSisters_Draw /* 046BC 80ADD64C 8EC40000 */ lw $a0, 0x0000($s6) ## 00000000 /* 046C0 80ADD650 24A5D858 */ addiu $a1, $a1, %lo(D_80ADD858) ## $a1 = 80ADD858 /* 046C4 80ADD654 24060C3C */ addiu $a2, $zero, 0x0C3C ## $a2 = 00000C3C -/* 046C8 80ADD658 0C0346A2 */ jal Matrix_NewMtx +/* 046C8 80ADD658 0C0346A2 */ jal Matrix_NewMtx /* 046CC 80ADD65C 00408025 */ or $s0, $v0, $zero ## $s0 = 00000000 /* 046D0 80ADD660 AE020004 */ sw $v0, 0x0004($s0) ## 00000004 /* 046D4 80ADD664 8E6202D0 */ lw $v0, 0x02D0($s3) ## 000002D0 @@ -419,34 +419,34 @@ glabel EnPoSisters_Draw /* 046E0 80ADD670 24590008 */ addiu $t9, $v0, 0x0008 ## $t9 = 00000008 /* 046E4 80ADD674 AE7902D0 */ sw $t9, 0x02D0($s3) ## 000002D0 /* 046E8 80ADD678 AC4A0000 */ sw $t2, 0x0000($v0) ## 00000000 -/* 046EC 80ADD67C 8FA90078 */ lw $t1, 0x0078($sp) +/* 046EC 80ADD67C 8FA90078 */ lw $t1, 0x0078($sp) /* 046F0 80ADD680 2652000C */ addiu $s2, $s2, 0x000C ## $s2 = 0000000C /* 046F4 80ADD684 AC490004 */ sw $t1, 0x0004($v0) ## 00000004 -/* 046F8 80ADD688 8FAB00F4 */ lw $t3, 0x00F4($sp) +/* 046F8 80ADD688 8FAB00F4 */ lw $t3, 0x00F4($sp) /* 046FC 80ADD68C 916C0198 */ lbu $t4, 0x0198($t3) ## 00000198 -/* 04700 80ADD690 022C082A */ slt $at, $s1, $t4 -/* 04704 80ADD694 5420FF8A */ bnel $at, $zero, .L80ADD4C0 -/* 04708 80ADD698 8FA50084 */ lw $a1, 0x0084($sp) +/* 04700 80ADD690 022C082A */ slt $at, $s1, $t4 +/* 04704 80ADD694 5420FF8A */ bnel $at, $zero, .L80ADD4C0 +/* 04708 80ADD698 8FA50084 */ lw $a1, 0x0084($sp) .L80ADD69C: /* 0470C 80ADD69C 3C0680AE */ lui $a2, %hi(D_80ADD870) ## $a2 = 80AE0000 /* 04710 80ADD6A0 24C6D870 */ addiu $a2, $a2, %lo(D_80ADD870) ## $a2 = 80ADD870 /* 04714 80ADD6A4 27A400C4 */ addiu $a0, $sp, 0x00C4 ## $a0 = FFFFFFCC /* 04718 80ADD6A8 8EC50000 */ lw $a1, 0x0000($s6) ## 00000000 -/* 0471C 80ADD6AC 0C031AD5 */ jal func_800C6B54 +/* 0471C 80ADD6AC 0C031AD5 */ jal Graph_CloseDisps /* 04720 80ADD6B0 24070C43 */ addiu $a3, $zero, 0x0C43 ## $a3 = 00000C43 -/* 04724 80ADD6B4 8FBF006C */ lw $ra, 0x006C($sp) -/* 04728 80ADD6B8 D7B40030 */ ldc1 $f20, 0x0030($sp) -/* 0472C 80ADD6BC D7B60038 */ ldc1 $f22, 0x0038($sp) -/* 04730 80ADD6C0 D7B80040 */ ldc1 $f24, 0x0040($sp) -/* 04734 80ADD6C4 8FB0004C */ lw $s0, 0x004C($sp) -/* 04738 80ADD6C8 8FB10050 */ lw $s1, 0x0050($sp) -/* 0473C 80ADD6CC 8FB20054 */ lw $s2, 0x0054($sp) -/* 04740 80ADD6D0 8FB30058 */ lw $s3, 0x0058($sp) -/* 04744 80ADD6D4 8FB4005C */ lw $s4, 0x005C($sp) -/* 04748 80ADD6D8 8FB50060 */ lw $s5, 0x0060($sp) -/* 0474C 80ADD6DC 8FB60064 */ lw $s6, 0x0064($sp) -/* 04750 80ADD6E0 8FB70068 */ lw $s7, 0x0068($sp) -/* 04754 80ADD6E4 03E00008 */ jr $ra +/* 04724 80ADD6B4 8FBF006C */ lw $ra, 0x006C($sp) +/* 04728 80ADD6B8 D7B40030 */ ldc1 $f20, 0x0030($sp) +/* 0472C 80ADD6BC D7B60038 */ ldc1 $f22, 0x0038($sp) +/* 04730 80ADD6C0 D7B80040 */ ldc1 $f24, 0x0040($sp) +/* 04734 80ADD6C4 8FB0004C */ lw $s0, 0x004C($sp) +/* 04738 80ADD6C8 8FB10050 */ lw $s1, 0x0050($sp) +/* 0473C 80ADD6CC 8FB20054 */ lw $s2, 0x0054($sp) +/* 04740 80ADD6D0 8FB30058 */ lw $s3, 0x0058($sp) +/* 04744 80ADD6D4 8FB4005C */ lw $s4, 0x005C($sp) +/* 04748 80ADD6D8 8FB50060 */ lw $s5, 0x0060($sp) +/* 0474C 80ADD6DC 8FB60064 */ lw $s6, 0x0064($sp) +/* 04750 80ADD6E0 8FB70068 */ lw $s7, 0x0068($sp) +/* 04754 80ADD6E4 03E00008 */ jr $ra /* 04758 80ADD6E8 27BD00F8 */ addiu $sp, $sp, 0x00F8 ## $sp = 00000000 /* 0475C 80ADD6EC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80AD9368.s b/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80AD9368.s index 6679a67309..4b111fd6d2 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80AD9368.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80AD9368.s @@ -1,27 +1,27 @@ glabel func_80AD9368 /* 003D8 80AD9368 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 003DC 80AD936C AFBF0014 */ sw $ra, 0x0014($sp) +/* 003DC 80AD936C AFBF0014 */ sw $ra, 0x0014($sp) /* 003E0 80AD9370 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 /* 003E4 80AD9374 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 003E8 80AD9378 24A514CC */ addiu $a1, $a1, 0x14CC ## $a1 = 060014CC -/* 003EC 80AD937C AFA70018 */ sw $a3, 0x0018($sp) +/* 003EC 80AD937C AFA70018 */ sw $a3, 0x0018($sp) /* 003F0 80AD9380 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 003F4 80AD9384 0C0294D3 */ jal func_800A534C +/* 003F4 80AD9384 0C0294D3 */ jal SkelAnime_ChangeAnimTransitionRepeat /* 003F8 80AD9388 3C06C040 */ lui $a2, 0xC040 ## $a2 = C0400000 /* 003FC 80AD938C 24040002 */ addiu $a0, $zero, 0x0002 ## $a0 = 00000002 /* 00400 80AD9390 0C01DF64 */ jal Math_Rand_S16Offset - + /* 00404 80AD9394 24050003 */ addiu $a1, $zero, 0x0003 ## $a1 = 00000003 -/* 00408 80AD9398 8FA70018 */ lw $a3, 0x0018($sp) +/* 00408 80AD9398 8FA70018 */ lw $a3, 0x0018($sp) /* 0040C 80AD939C 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 /* 00410 80AD93A0 3C0E80AE */ lui $t6, %hi(func_80ADA4A8) ## $t6 = 80AE0000 /* 00414 80AD93A4 25CEA4A8 */ addiu $t6, $t6, %lo(func_80ADA4A8) ## $t6 = 80ADA4A8 /* 00418 80AD93A8 A4E2019A */ sh $v0, 0x019A($a3) ## 0000019A /* 0041C 80AD93AC ACEE0190 */ sw $t6, 0x0190($a3) ## 00000190 /* 00420 80AD93B0 E4E40068 */ swc1 $f4, 0x0068($a3) ## 00000068 -/* 00424 80AD93B4 8FBF0014 */ lw $ra, 0x0014($sp) +/* 00424 80AD93B4 8FBF0014 */ lw $ra, 0x0014($sp) /* 00428 80AD93B8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 0042C 80AD93BC 03E00008 */ jr $ra +/* 0042C 80AD93BC 03E00008 */ jr $ra /* 00430 80AD93C0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80AD93C4.s b/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80AD93C4.s index 84b351913c..c3c1e201ea 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80AD93C4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80AD93C4.s @@ -1,25 +1,25 @@ glabel func_80AD93C4 /* 00434 80AD93C4 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00438 80AD93C8 AFBF0014 */ sw $ra, 0x0014($sp) +/* 00438 80AD93C8 AFBF0014 */ sw $ra, 0x0014($sp) /* 0043C 80AD93CC 8C8F0190 */ lw $t7, 0x0190($a0) ## 00000190 /* 00440 80AD93D0 3C0E80AE */ lui $t6, %hi(func_80ADA6A0) ## $t6 = 80AE0000 /* 00444 80AD93D4 25CEA6A0 */ addiu $t6, $t6, %lo(func_80ADA6A0) ## $t6 = 80ADA6A0 -/* 00448 80AD93D8 11CF0008 */ beq $t6, $t7, .L80AD93FC +/* 00448 80AD93D8 11CF0008 */ beq $t6, $t7, .L80AD93FC /* 0044C 80AD93DC 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 /* 00450 80AD93E0 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 00454 80AD93E4 24A50D40 */ addiu $a1, $a1, 0x0D40 ## $a1 = 06000D40 /* 00458 80AD93E8 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C /* 0045C 80AD93EC 3C06C040 */ lui $a2, 0xC040 ## $a2 = C0400000 -/* 00460 80AD93F0 0C0294D3 */ jal func_800A534C -/* 00464 80AD93F4 AFA70018 */ sw $a3, 0x0018($sp) -/* 00468 80AD93F8 8FA70018 */ lw $a3, 0x0018($sp) +/* 00460 80AD93F0 0C0294D3 */ jal SkelAnime_ChangeAnimTransitionRepeat +/* 00464 80AD93F4 AFA70018 */ sw $a3, 0x0018($sp) +/* 00468 80AD93F8 8FA70018 */ lw $a3, 0x0018($sp) .L80AD93FC: /* 0046C 80AD93FC 2404000F */ addiu $a0, $zero, 0x000F ## $a0 = 0000000F /* 00470 80AD9400 24050003 */ addiu $a1, $zero, 0x0003 ## $a1 = 00000003 /* 00474 80AD9404 0C01DF64 */ jal Math_Rand_S16Offset - -/* 00478 80AD9408 AFA70018 */ sw $a3, 0x0018($sp) -/* 0047C 80AD940C 8FA70018 */ lw $a3, 0x0018($sp) + +/* 00478 80AD9408 AFA70018 */ sw $a3, 0x0018($sp) +/* 0047C 80AD940C 8FA70018 */ lw $a3, 0x0018($sp) /* 00480 80AD9410 3C0880AE */ lui $t0, %hi(func_80ADA530) ## $t0 = 80AE0000 /* 00484 80AD9414 2508A530 */ addiu $t0, $t0, %lo(func_80ADA530) ## $t0 = 80ADA530 /* 00488 80AD9418 90F80199 */ lbu $t8, 0x0199($a3) ## 00000199 @@ -27,9 +27,9 @@ glabel func_80AD93C4 /* 00490 80AD9420 ACE80190 */ sw $t0, 0x0190($a3) ## 00000190 /* 00494 80AD9424 37190007 */ ori $t9, $t8, 0x0007 ## $t9 = 00000007 /* 00498 80AD9428 A0F90199 */ sb $t9, 0x0199($a3) ## 00000199 -/* 0049C 80AD942C 8FBF0014 */ lw $ra, 0x0014($sp) +/* 0049C 80AD942C 8FBF0014 */ lw $ra, 0x0014($sp) /* 004A0 80AD9430 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 004A4 80AD9434 03E00008 */ jr $ra +/* 004A4 80AD9434 03E00008 */ jr $ra /* 004A8 80AD9438 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80AD944C.s b/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80AD944C.s index b64446b71d..efa69cabaa 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80AD944C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80AD944C.s @@ -1,10 +1,10 @@ glabel func_80AD944C /* 004BC 80AD944C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 004C0 80AD9450 AFBF0014 */ sw $ra, 0x0014($sp) +/* 004C0 80AD9450 AFBF0014 */ sw $ra, 0x0014($sp) /* 004C4 80AD9454 908E0231 */ lbu $t6, 0x0231($a0) ## 00000231 /* 004C8 80AD9458 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 004CC 80AD945C 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 -/* 004D0 80AD9460 11C00006 */ beq $t6, $zero, .L80AD947C +/* 004D0 80AD9460 11C00006 */ beq $t6, $zero, .L80AD947C /* 004D4 80AD9464 24A50114 */ addiu $a1, $a1, 0x0114 ## $a1 = 06000114 /* 004D8 80AD9468 909802BD */ lbu $t8, 0x02BD($a0) ## 000002BD /* 004DC 80AD946C 240F0009 */ addiu $t7, $zero, 0x0009 ## $t7 = 00000009 @@ -14,18 +14,18 @@ glabel func_80AD944C .L80AD947C: /* 004EC 80AD947C 24E4014C */ addiu $a0, $a3, 0x014C ## $a0 = 0000014C /* 004F0 80AD9480 3C06C0A0 */ lui $a2, 0xC0A0 ## $a2 = C0A00000 -/* 004F4 80AD9484 0C0294D3 */ jal func_800A534C -/* 004F8 80AD9488 AFA70018 */ sw $a3, 0x0018($sp) -/* 004FC 80AD948C 8FA70018 */ lw $a3, 0x0018($sp) +/* 004F4 80AD9484 0C0294D3 */ jal SkelAnime_ChangeAnimTransitionRepeat +/* 004F8 80AD9488 AFA70018 */ sw $a3, 0x0018($sp) +/* 004FC 80AD948C 8FA70018 */ lw $a3, 0x0018($sp) /* 00500 80AD9490 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 /* 00504 80AD9494 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 /* 00508 80AD9498 24840114 */ addiu $a0, $a0, 0x0114 ## $a0 = 06000114 /* 0050C 80AD949C 0C028800 */ jal SkelAnime_GetFrameCount - + /* 00510 80AD94A0 E4E40068 */ swc1 $f4, 0x0068($a3) ## 00000068 -/* 00514 80AD94A4 8FA70018 */ lw $a3, 0x0018($sp) -/* 00518 80AD94A8 00024080 */ sll $t0, $v0, 2 -/* 0051C 80AD94AC 01024023 */ subu $t0, $t0, $v0 +/* 00514 80AD94A4 8FA70018 */ lw $a3, 0x0018($sp) +/* 00518 80AD94A8 00024080 */ sll $t0, $v0, 2 +/* 0051C 80AD94AC 01024023 */ subu $t0, $t0, $v0 /* 00520 80AD94B0 90EA0199 */ lbu $t2, 0x0199($a3) ## 00000199 /* 00524 80AD94B4 3C0C80AE */ lui $t4, %hi(func_80ADA7F0) ## $t4 = 80AE0000 /* 00528 80AD94B8 25090003 */ addiu $t1, $t0, 0x0003 ## $t1 = 00000003 @@ -34,9 +34,9 @@ glabel func_80AD944C /* 00534 80AD94C4 A4E9019A */ sh $t1, 0x019A($a3) ## 0000019A /* 00538 80AD94C8 A0EB0199 */ sb $t3, 0x0199($a3) ## 00000199 /* 0053C 80AD94CC ACEC0190 */ sw $t4, 0x0190($a3) ## 00000190 -/* 00540 80AD94D0 8FBF0014 */ lw $ra, 0x0014($sp) +/* 00540 80AD94D0 8FBF0014 */ lw $ra, 0x0014($sp) /* 00544 80AD94D4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00548 80AD94D8 03E00008 */ jr $ra +/* 00548 80AD94D8 03E00008 */ jr $ra /* 0054C 80AD94DC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80AD94E0.s b/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80AD94E0.s index c57d02c94f..c0dc1b8d8a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80AD94E0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80AD94E0.s @@ -1,11 +1,11 @@ glabel func_80AD94E0 /* 00550 80AD94E0 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00554 80AD94E4 AFBF0014 */ sw $ra, 0x0014($sp) +/* 00554 80AD94E4 AFBF0014 */ sw $ra, 0x0014($sp) /* 00558 80AD94E8 908E0194 */ lbu $t6, 0x0194($a0) ## 00000194 /* 0055C 80AD94EC 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 /* 00560 80AD94F0 44812000 */ mtc1 $at, $f4 ## $f4 = 5.00 /* 00564 80AD94F4 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 -/* 00568 80AD94F8 15C0000D */ bne $t6, $zero, .L80AD9530 +/* 00568 80AD94F8 15C0000D */ bne $t6, $zero, .L80AD9530 /* 0056C 80AD94FC E4840068 */ swc1 $f4, 0x0068($a0) ## 00000068 /* 00570 80AD9500 909802BD */ lbu $t8, 0x02BD($a0) ## 000002BD /* 00574 80AD9504 240F0009 */ addiu $t7, $zero, 0x0009 ## $t7 = 00000009 @@ -14,11 +14,11 @@ glabel func_80AD94E0 /* 00580 80AD9510 A09902BD */ sb $t9, 0x02BD($a0) ## 000002BD /* 00584 80AD9514 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 00588 80AD9518 24A50114 */ addiu $a1, $a1, 0x0114 ## $a1 = 06000114 -/* 0058C 80AD951C AFA70018 */ sw $a3, 0x0018($sp) +/* 0058C 80AD951C AFA70018 */ sw $a3, 0x0018($sp) /* 00590 80AD9520 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 00594 80AD9524 0C0294D3 */ jal func_800A534C +/* 00594 80AD9524 0C0294D3 */ jal SkelAnime_ChangeAnimTransitionRepeat /* 00598 80AD9528 3C06C0A0 */ lui $a2, 0xC0A0 ## $a2 = C0A00000 -/* 0059C 80AD952C 8FA70018 */ lw $a3, 0x0018($sp) +/* 0059C 80AD952C 8FA70018 */ lw $a3, 0x0018($sp) .L80AD9530: /* 005A0 80AD9530 90EA0199 */ lbu $t2, 0x0199($a3) ## 00000199 /* 005A4 80AD9534 84E9008A */ lh $t1, 0x008A($a3) ## 0000008A @@ -30,9 +30,9 @@ glabel func_80AD94E0 /* 005BC 80AD954C A0EB0199 */ sb $t3, 0x0199($a3) ## 00000199 /* 005C0 80AD9550 ACEC0190 */ sw $t4, 0x0190($a3) ## 00000190 /* 005C4 80AD9554 A4E90032 */ sh $t1, 0x0032($a3) ## 00000032 -/* 005C8 80AD9558 8FBF0014 */ lw $ra, 0x0014($sp) +/* 005C8 80AD9558 8FBF0014 */ lw $ra, 0x0014($sp) /* 005CC 80AD955C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 005D0 80AD9560 03E00008 */ jr $ra +/* 005D0 80AD9560 03E00008 */ jr $ra /* 005D4 80AD9564 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80AD9568.s b/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80AD9568.s index 49b3514497..8717f1a2e5 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80AD9568.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80AD9568.s @@ -1,21 +1,21 @@ glabel func_80AD9568 /* 005D8 80AD9568 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 005DC 80AD956C AFBF0014 */ sw $ra, 0x0014($sp) +/* 005DC 80AD956C AFBF0014 */ sw $ra, 0x0014($sp) /* 005E0 80AD9570 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 /* 005E4 80AD9574 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 005E8 80AD9578 24A50D40 */ addiu $a1, $a1, 0x0D40 ## $a1 = 06000D40 -/* 005EC 80AD957C AFA70018 */ sw $a3, 0x0018($sp) +/* 005EC 80AD957C AFA70018 */ sw $a3, 0x0018($sp) /* 005F0 80AD9580 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 005F4 80AD9584 0C0294D3 */ jal func_800A534C +/* 005F4 80AD9584 0C0294D3 */ jal SkelAnime_ChangeAnimTransitionRepeat /* 005F8 80AD9588 3C06C040 */ lui $a2, 0xC040 ## $a2 = C0400000 -/* 005FC 80AD958C 8FA70018 */ lw $a3, 0x0018($sp) +/* 005FC 80AD958C 8FA70018 */ lw $a3, 0x0018($sp) /* 00600 80AD9590 34018000 */ ori $at, $zero, 0x8000 ## $at = 00008000 /* 00604 80AD9594 3C0A80AE */ lui $t2, %hi(func_80ADA9E8) ## $t2 = 80AE0000 /* 00608 80AD9598 84EE008A */ lh $t6, 0x008A($a3) ## 0000008A /* 0060C 80AD959C 90F80194 */ lbu $t8, 0x0194($a3) ## 00000194 /* 00610 80AD95A0 254AA9E8 */ addiu $t2, $t2, %lo(func_80ADA9E8) ## $t2 = 80ADA9E8 -/* 00614 80AD95A4 01C17821 */ addu $t7, $t6, $at -/* 00618 80AD95A8 13000006 */ beq $t8, $zero, .L80AD95C4 +/* 00614 80AD95A4 01C17821 */ addu $t7, $t6, $at +/* 00618 80AD95A8 13000006 */ beq $t8, $zero, .L80AD95C4 /* 0061C 80AD95AC A4EF0032 */ sh $t7, 0x0032($a3) ## 00000032 /* 00620 80AD95B0 90E802BD */ lbu $t0, 0x02BD($a3) ## 000002BD /* 00624 80AD95B4 24190003 */ addiu $t9, $zero, 0x0003 ## $t9 = 00000003 @@ -24,9 +24,9 @@ glabel func_80AD9568 /* 00630 80AD95C0 A0E902BD */ sb $t1, 0x02BD($a3) ## 000002BD .L80AD95C4: /* 00634 80AD95C4 ACEA0190 */ sw $t2, 0x0190($a3) ## 00000190 -/* 00638 80AD95C8 8FBF0014 */ lw $ra, 0x0014($sp) +/* 00638 80AD95C8 8FBF0014 */ lw $ra, 0x0014($sp) /* 0063C 80AD95CC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00640 80AD95D0 03E00008 */ jr $ra +/* 00640 80AD95D0 03E00008 */ jr $ra /* 00644 80AD95D4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80AD95D8.s b/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80AD95D8.s index 00f8847dec..aa8656e832 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80AD95D8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80AD95D8.s @@ -1,38 +1,38 @@ glabel func_80AD95D8 /* 00648 80AD95D8 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 0064C 80AD95DC AFB00020 */ sw $s0, 0x0020($sp) +/* 0064C 80AD95DC AFB00020 */ sw $s0, 0x0020($sp) /* 00650 80AD95E0 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00654 80AD95E4 AFBF0024 */ sw $ra, 0x0024($sp) +/* 00654 80AD95E4 AFBF0024 */ sw $ra, 0x0024($sp) /* 00658 80AD95E8 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 0065C 80AD95EC 24A508C0 */ addiu $a1, $a1, 0x08C0 ## $a1 = 060008C0 /* 00660 80AD95F0 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 00664 80AD95F4 0C029490 */ jal func_800A5240 +/* 00664 80AD95F4 0C029490 */ jal SkelAnime_ChangeAnimTransitionStop /* 00668 80AD95F8 3C06C040 */ lui $a2, 0xC040 ## $a2 = C0400000 /* 0066C 80AD95FC 8E0502B4 */ lw $a1, 0x02B4($s0) ## 000002B4 -/* 00670 80AD9600 50A00011 */ beql $a1, $zero, .L80AD9648 +/* 00670 80AD9600 50A00011 */ beql $a1, $zero, .L80AD9648 /* 00674 80AD9604 92090194 */ lbu $t1, 0x0194($s0) ## 00000194 /* 00678 80AD9608 8E0E02E8 */ lw $t6, 0x02E8($s0) ## 000002E8 /* 0067C 80AD960C 3C010001 */ lui $at, 0x0001 ## $at = 00010000 /* 00680 80AD9610 3421F824 */ ori $at, $at, 0xF824 ## $at = 0001F824 /* 00684 80AD9614 8DCF0000 */ lw $t7, 0x0000($t6) ## 00000000 -/* 00688 80AD9618 01E1C024 */ and $t8, $t7, $at -/* 0068C 80AD961C 13000004 */ beq $t8, $zero, .L80AD9630 +/* 00688 80AD9618 01E1C024 */ and $t8, $t7, $at +/* 0068C 80AD961C 13000004 */ beq $t8, $zero, .L80AD9630 /* 00690 80AD9620 00000000 */ nop /* 00694 80AD9624 84B90032 */ lh $t9, 0x0032($a1) ## 00000032 -/* 00698 80AD9628 10000006 */ beq $zero, $zero, .L80AD9644 +/* 00698 80AD9628 10000006 */ beq $zero, $zero, .L80AD9644 /* 0069C 80AD962C A6190032 */ sh $t9, 0x0032($s0) ## 00000032 .L80AD9630: -/* 006A0 80AD9630 0C00B69E */ jal func_8002DA78 +/* 006A0 80AD9630 0C00B69E */ jal func_8002DA78 /* 006A4 80AD9634 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 006A8 80AD9638 34018000 */ ori $at, $zero, 0x8000 ## $at = 00008000 -/* 006AC 80AD963C 00414021 */ addu $t0, $v0, $at +/* 006AC 80AD963C 00414021 */ addu $t0, $v0, $at /* 006B0 80AD9640 A6080032 */ sh $t0, 0x0032($s0) ## 00000032 .L80AD9644: /* 006B4 80AD9644 92090194 */ lbu $t1, 0x0194($s0) ## 00000194 .L80AD9648: /* 006B8 80AD9648 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 006BC 80AD964C 24054000 */ addiu $a1, $zero, 0x4000 ## $a1 = 00004000 -/* 006C0 80AD9650 11200005 */ beq $t1, $zero, .L80AD9668 +/* 006C0 80AD9650 11200005 */ beq $t1, $zero, .L80AD9668 /* 006C4 80AD9654 240600FF */ addiu $a2, $zero, 0x00FF ## $a2 = 000000FF /* 006C8 80AD9658 3C014120 */ lui $at, 0x4120 ## $at = 41200000 /* 006CC 80AD965C 44812000 */ mtc1 $at, $f4 ## $f4 = 10.00 @@ -44,15 +44,15 @@ glabel func_80AD95D8 /* 006E0 80AD9670 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 /* 006E4 80AD9674 314BFFF4 */ andi $t3, $t2, 0xFFF4 ## $t3 = 00000000 /* 006E8 80AD9678 A20B0199 */ sb $t3, 0x0199($s0) ## 00000199 -/* 006EC 80AD967C 0C00D09B */ jal func_8003426C -/* 006F0 80AD9680 AFAC0010 */ sw $t4, 0x0010($sp) +/* 006EC 80AD967C 0C00D09B */ jal func_8003426C +/* 006F0 80AD9680 AFAC0010 */ sw $t4, 0x0010($sp) /* 006F4 80AD9684 3C0D80AE */ lui $t5, %hi(func_80ADAAA4) ## $t5 = 80AE0000 /* 006F8 80AD9688 25ADAAA4 */ addiu $t5, $t5, %lo(func_80ADAAA4) ## $t5 = 80ADAAA4 /* 006FC 80AD968C AE0D0190 */ sw $t5, 0x0190($s0) ## 00000190 -/* 00700 80AD9690 8FBF0024 */ lw $ra, 0x0024($sp) -/* 00704 80AD9694 8FB00020 */ lw $s0, 0x0020($sp) +/* 00700 80AD9690 8FBF0024 */ lw $ra, 0x0024($sp) +/* 00704 80AD9694 8FB00020 */ lw $s0, 0x0020($sp) /* 00708 80AD9698 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 0070C 80AD969C 03E00008 */ jr $ra +/* 0070C 80AD969C 03E00008 */ jr $ra /* 00710 80AD96A0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80AD96A4.s b/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80AD96A4.s index 3850513a93..31a470b0af 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80AD96A4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80AD96A4.s @@ -1,20 +1,20 @@ glabel func_80AD96A4 /* 00714 80AD96A4 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00718 80AD96A8 AFBF0014 */ sw $ra, 0x0014($sp) +/* 00718 80AD96A8 AFBF0014 */ sw $ra, 0x0014($sp) /* 0071C 80AD96AC 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 /* 00720 80AD96B0 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 00724 80AD96B4 24A50A54 */ addiu $a1, $a1, 0x0A54 ## $a1 = 06000A54 -/* 00728 80AD96B8 AFA70018 */ sw $a3, 0x0018($sp) +/* 00728 80AD96B8 AFA70018 */ sw $a3, 0x0018($sp) /* 0072C 80AD96BC 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 00730 80AD96C0 0C0294D3 */ jal func_800A534C +/* 00730 80AD96C0 0C0294D3 */ jal SkelAnime_ChangeAnimTransitionRepeat /* 00734 80AD96C4 3C06C040 */ lui $a2, 0xC040 ## $a2 = C0400000 -/* 00738 80AD96C8 8FA70018 */ lw $a3, 0x0018($sp) +/* 00738 80AD96C8 8FA70018 */ lw $a3, 0x0018($sp) /* 0073C 80AD96CC 34018000 */ ori $at, $zero, 0x8000 ## $at = 00008000 /* 00740 80AD96D0 3C0980AE */ lui $t1, %hi(func_80ADAC70) ## $t1 = 80AE0000 /* 00744 80AD96D4 84EE00B6 */ lh $t6, 0x00B6($a3) ## 000000B6 /* 00748 80AD96D8 90F90199 */ lbu $t9, 0x0199($a3) ## 00000199 /* 0074C 80AD96DC 24180005 */ addiu $t8, $zero, 0x0005 ## $t8 = 00000005 -/* 00750 80AD96E0 01C17821 */ addu $t7, $t6, $at +/* 00750 80AD96E0 01C17821 */ addu $t7, $t6, $at /* 00754 80AD96E4 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 /* 00758 80AD96E8 44812000 */ mtc1 $at, $f4 ## $f4 = 5.00 /* 0075C 80AD96EC 2529AC70 */ addiu $t1, $t1, %lo(func_80ADAC70) ## $t1 = 80ADAC70 @@ -24,9 +24,9 @@ glabel func_80AD96A4 /* 0076C 80AD96FC A0E80199 */ sb $t0, 0x0199($a3) ## 00000199 /* 00770 80AD9700 ACE90190 */ sw $t1, 0x0190($a3) ## 00000190 /* 00774 80AD9704 E4E40068 */ swc1 $f4, 0x0068($a3) ## 00000068 -/* 00778 80AD9708 8FBF0014 */ lw $ra, 0x0014($sp) +/* 00778 80AD9708 8FBF0014 */ lw $ra, 0x0014($sp) /* 0077C 80AD970C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00780 80AD9710 03E00008 */ jr $ra +/* 00780 80AD9710 03E00008 */ jr $ra /* 00784 80AD9714 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80AD9718.s b/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80AD9718.s index 617104a0b4..f67578a282 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80AD9718.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80AD9718.s @@ -1,27 +1,27 @@ glabel func_80AD9718 /* 00788 80AD9718 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 0078C 80AD971C AFB00028 */ sw $s0, 0x0028($sp) +/* 0078C 80AD971C AFB00028 */ sw $s0, 0x0028($sp) /* 00790 80AD9720 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00794 80AD9724 AFBF002C */ sw $ra, 0x002C($sp) +/* 00794 80AD9724 AFBF002C */ sw $ra, 0x002C($sp) /* 00798 80AD9728 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 /* 0079C 80AD972C 0C028800 */ jal SkelAnime_GetFrameCount - + /* 007A0 80AD9730 2484119C */ addiu $a0, $a0, 0x119C ## $a0 = 0600119C /* 007A4 80AD9734 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 007A8 80AD9738 3C01C040 */ lui $at, 0xC040 ## $at = C0400000 /* 007AC 80AD973C 44814000 */ mtc1 $at, $f8 ## $f8 = -3.00 -/* 007B0 80AD9740 468021A0 */ cvt.s.w $f6, $f4 +/* 007B0 80AD9740 468021A0 */ cvt.s.w $f6, $f4 /* 007B4 80AD9744 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 007B8 80AD9748 240E0002 */ addiu $t6, $zero, 0x0002 ## $t6 = 00000002 -/* 007BC 80AD974C AFAE0014 */ sw $t6, 0x0014($sp) +/* 007BC 80AD974C AFAE0014 */ sw $t6, 0x0014($sp) /* 007C0 80AD9750 24A5119C */ addiu $a1, $a1, 0x119C ## $a1 = 0600119C /* 007C4 80AD9754 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C -/* 007C8 80AD9758 E7A60010 */ swc1 $f6, 0x0010($sp) +/* 007C8 80AD9758 E7A60010 */ swc1 $f6, 0x0010($sp) /* 007CC 80AD975C 3C063FC0 */ lui $a2, 0x3FC0 ## $a2 = 3FC00000 /* 007D0 80AD9760 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 007D4 80AD9764 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 007D8 80AD9768 E7A80018 */ swc1 $f8, 0x0018($sp) +/* 007D4 80AD9764 0C029468 */ jal SkelAnime_ChangeAnim + +/* 007D8 80AD9768 E7A80018 */ swc1 $f8, 0x0018($sp) /* 007DC 80AD976C 92190199 */ lbu $t9, 0x0199($s0) ## 00000199 /* 007E0 80AD9770 44805000 */ mtc1 $zero, $f10 ## $f10 = 0.00 /* 007E4 80AD9774 861800B6 */ lh $t8, 0x00B6($s0) ## 000000B6 @@ -33,19 +33,19 @@ glabel func_80AD9718 /* 007FC 80AD978C 24053874 */ addiu $a1, $zero, 0x3874 ## $a1 = 00003874 /* 00800 80AD9790 E60A0068 */ swc1 $f10, 0x0068($s0) ## 00000068 /* 00804 80AD9794 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 00808 80AD9798 A6180032 */ sh $t8, 0x0032($s0) ## 00000032 /* 0080C 80AD979C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 00810 80AD97A0 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 00814 80AD97A4 240538EF */ addiu $a1, $zero, 0x38EF ## $a1 = 000038EF /* 00818 80AD97A8 3C0980AE */ lui $t1, %hi(func_80ADAD54) ## $t1 = 80AE0000 /* 0081C 80AD97AC 2529AD54 */ addiu $t1, $t1, %lo(func_80ADAD54) ## $t1 = 80ADAD54 /* 00820 80AD97B0 AE090190 */ sw $t1, 0x0190($s0) ## 00000190 -/* 00824 80AD97B4 8FBF002C */ lw $ra, 0x002C($sp) -/* 00828 80AD97B8 8FB00028 */ lw $s0, 0x0028($sp) +/* 00824 80AD97B4 8FBF002C */ lw $ra, 0x002C($sp) +/* 00828 80AD97B8 8FB00028 */ lw $s0, 0x0028($sp) /* 0082C 80AD97BC 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 00830 80AD97C0 03E00008 */ jr $ra +/* 00830 80AD97C0 03E00008 */ jr $ra /* 00834 80AD97C4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80AD98F4.s b/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80AD98F4.s index c4311c779c..b08098c45d 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80AD98F4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80AD98F4.s @@ -1,41 +1,41 @@ glabel func_80AD98F4 /* 00964 80AD98F4 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 00968 80AD98F8 AFB00028 */ sw $s0, 0x0028($sp) +/* 00968 80AD98F8 AFB00028 */ sw $s0, 0x0028($sp) /* 0096C 80AD98FC 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00970 80AD9900 AFBF002C */ sw $ra, 0x002C($sp) +/* 00970 80AD9900 AFBF002C */ sw $ra, 0x002C($sp) /* 00974 80AD9904 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 -/* 00978 80AD9908 AFA50034 */ sw $a1, 0x0034($sp) +/* 00978 80AD9908 AFA50034 */ sw $a1, 0x0034($sp) /* 0097C 80AD990C 0C028800 */ jal SkelAnime_GetFrameCount - + /* 00980 80AD9910 2484119C */ addiu $a0, $a0, 0x119C ## $a0 = 0600119C /* 00984 80AD9914 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 00988 80AD9918 3C01C040 */ lui $at, 0xC040 ## $at = C0400000 /* 0098C 80AD991C 44814000 */ mtc1 $at, $f8 ## $f8 = -3.00 -/* 00990 80AD9920 468021A0 */ cvt.s.w $f6, $f4 +/* 00990 80AD9920 468021A0 */ cvt.s.w $f6, $f4 /* 00994 80AD9924 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 00998 80AD9928 240E0002 */ addiu $t6, $zero, 0x0002 ## $t6 = 00000002 -/* 0099C 80AD992C AFAE0014 */ sw $t6, 0x0014($sp) +/* 0099C 80AD992C AFAE0014 */ sw $t6, 0x0014($sp) /* 009A0 80AD9930 24A5119C */ addiu $a1, $a1, 0x119C ## $a1 = 0600119C /* 009A4 80AD9934 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C -/* 009A8 80AD9938 E7A60010 */ swc1 $f6, 0x0010($sp) +/* 009A8 80AD9938 E7A60010 */ swc1 $f6, 0x0010($sp) /* 009AC 80AD993C 3C063FC0 */ lui $a2, 0x3FC0 ## $a2 = 3FC00000 /* 009B0 80AD9940 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 009B4 80AD9944 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 009B8 80AD9948 E7A80018 */ swc1 $f8, 0x0018($sp) +/* 009B4 80AD9944 0C029468 */ jal SkelAnime_ChangeAnim + +/* 009B8 80AD9948 E7A80018 */ swc1 $f8, 0x0018($sp) /* 009BC 80AD994C 920F0194 */ lbu $t7, 0x0194($s0) ## 00000194 /* 009C0 80AD9950 3C0142DC */ lui $at, 0x42DC ## $at = 42DC0000 -/* 009C4 80AD9954 55E0000C */ bnel $t7, $zero, .L80AD9988 +/* 009C4 80AD9954 55E0000C */ bnel $t7, $zero, .L80AD9988 /* 009C8 80AD9958 861900B6 */ lh $t9, 0x00B6($s0) ## 000000B6 /* 009CC 80AD995C 44815000 */ mtc1 $at, $f10 ## $f10 = 110.00 /* 009D0 80AD9960 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 009D4 80AD9964 E60A0294 */ swc1 $f10, 0x0294($s0) ## 00000294 -/* 009D8 80AD9968 0C2B65F2 */ jal func_80AD97C8 -/* 009DC 80AD996C 8FA50034 */ lw $a1, 0x0034($sp) +/* 009D8 80AD9968 0C2B65F2 */ jal func_80AD97C8 +/* 009DC 80AD996C 8FA50034 */ lw $a1, 0x0034($sp) /* 009E0 80AD9970 3C1880AE */ lui $t8, %hi(EnPoSisters_Draw) ## $t8 = 80AE0000 /* 009E4 80AD9974 2718D044 */ addiu $t8, $t8, %lo(EnPoSisters_Draw) ## $t8 = 80ADD044 /* 009E8 80AD9978 A2000231 */ sb $zero, 0x0231($s0) ## 00000231 -/* 009EC 80AD997C 10000003 */ beq $zero, $zero, .L80AD998C +/* 009EC 80AD997C 10000003 */ beq $zero, $zero, .L80AD998C /* 009F0 80AD9980 AE180134 */ sw $t8, 0x0134($s0) ## 00000134 /* 009F4 80AD9984 861900B6 */ lh $t9, 0x00B6($s0) ## 000000B6 .L80AD9988: @@ -47,7 +47,7 @@ glabel func_80AD98F4 /* 00A08 80AD9998 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 00A0C 80AD999C 24053873 */ addiu $a1, $zero, 0x3873 ## $a1 = 00003873 /* 00A10 80AD99A0 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 00A14 80AD99A4 E6100068 */ swc1 $f16, 0x0068($s0) ## 00000068 /* 00A18 80AD99A8 92090199 */ lbu $t1, 0x0199($s0) ## 00000199 /* 00A1C 80AD99AC 3C0B80AE */ lui $t3, %hi(func_80ADAE6C) ## $t3 = 80AE0000 @@ -55,10 +55,10 @@ glabel func_80AD98F4 /* 00A24 80AD99B4 312AFFFE */ andi $t2, $t1, 0xFFFE ## $t2 = 00000000 /* 00A28 80AD99B8 A20A0199 */ sb $t2, 0x0199($s0) ## 00000199 /* 00A2C 80AD99BC AE0B0190 */ sw $t3, 0x0190($s0) ## 00000190 -/* 00A30 80AD99C0 8FBF002C */ lw $ra, 0x002C($sp) -/* 00A34 80AD99C4 8FB00028 */ lw $s0, 0x0028($sp) +/* 00A30 80AD99C0 8FBF002C */ lw $ra, 0x002C($sp) +/* 00A34 80AD99C4 8FB00028 */ lw $s0, 0x0028($sp) /* 00A38 80AD99C8 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 00A3C 80AD99CC 03E00008 */ jr $ra +/* 00A3C 80AD99CC 03E00008 */ jr $ra /* 00A40 80AD99D0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80AD9AA8.s b/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80AD9AA8.s index b79bff36b9..ac19b2b432 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80AD9AA8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80AD9AA8.s @@ -1,99 +1,99 @@ glabel func_80AD9AA8 /* 00B18 80AD9AA8 27BDFFB0 */ addiu $sp, $sp, 0xFFB0 ## $sp = FFFFFFB0 -/* 00B1C 80AD9AAC AFB00030 */ sw $s0, 0x0030($sp) +/* 00B1C 80AD9AAC AFB00030 */ sw $s0, 0x0030($sp) /* 00B20 80AD9AB0 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00B24 80AD9AB4 AFBF0034 */ sw $ra, 0x0034($sp) +/* 00B24 80AD9AB4 AFBF0034 */ sw $ra, 0x0034($sp) /* 00B28 80AD9AB8 C6040028 */ lwc1 $f4, 0x0028($s0) ## 00000028 /* 00B2C 80AD9ABC 8E070024 */ lw $a3, 0x0024($s0) ## 00000024 /* 00B30 80AD9AC0 24A41C24 */ addiu $a0, $a1, 0x1C24 ## $a0 = 00001C24 -/* 00B34 80AD9AC4 E7A40010 */ swc1 $f4, 0x0010($sp) +/* 00B34 80AD9AC4 E7A40010 */ swc1 $f4, 0x0010($sp) /* 00B38 80AD9AC8 C606002C */ lwc1 $f6, 0x002C($s0) ## 0000002C /* 00B3C 80AD9ACC 240E0400 */ addiu $t6, $zero, 0x0400 ## $t6 = 00000400 -/* 00B40 80AD9AD0 AFAE0024 */ sw $t6, 0x0024($sp) -/* 00B44 80AD9AD4 AFA50054 */ sw $a1, 0x0054($sp) -/* 00B48 80AD9AD8 AFA40038 */ sw $a0, 0x0038($sp) -/* 00B4C 80AD9ADC AFA00020 */ sw $zero, 0x0020($sp) -/* 00B50 80AD9AE0 AFA0001C */ sw $zero, 0x001C($sp) -/* 00B54 80AD9AE4 AFA00018 */ sw $zero, 0x0018($sp) +/* 00B40 80AD9AD0 AFAE0024 */ sw $t6, 0x0024($sp) +/* 00B44 80AD9AD4 AFA50054 */ sw $a1, 0x0054($sp) +/* 00B48 80AD9AD8 AFA40038 */ sw $a0, 0x0038($sp) +/* 00B4C 80AD9ADC AFA00020 */ sw $zero, 0x0020($sp) +/* 00B50 80AD9AE0 AFA0001C */ sw $zero, 0x001C($sp) +/* 00B54 80AD9AE4 AFA00018 */ sw $zero, 0x0018($sp) /* 00B58 80AD9AE8 24060091 */ addiu $a2, $zero, 0x0091 ## $a2 = 00000091 /* 00B5C 80AD9AEC 0C00C7D4 */ jal Actor_Spawn ## ActorSpawn -/* 00B60 80AD9AF0 E7A60014 */ swc1 $f6, 0x0014($sp) -/* 00B64 80AD9AF4 AFA2004C */ sw $v0, 0x004C($sp) +/* 00B60 80AD9AF0 E7A60014 */ swc1 $f6, 0x0014($sp) +/* 00B64 80AD9AF4 AFA2004C */ sw $v0, 0x004C($sp) /* 00B68 80AD9AF8 C6080028 */ lwc1 $f8, 0x0028($s0) ## 00000028 /* 00B6C 80AD9AFC 8E070024 */ lw $a3, 0x0024($s0) ## 00000024 /* 00B70 80AD9B00 240F0800 */ addiu $t7, $zero, 0x0800 ## $t7 = 00000800 -/* 00B74 80AD9B04 E7A80010 */ swc1 $f8, 0x0010($sp) +/* 00B74 80AD9B04 E7A80010 */ swc1 $f8, 0x0010($sp) /* 00B78 80AD9B08 C60A002C */ lwc1 $f10, 0x002C($s0) ## 0000002C -/* 00B7C 80AD9B0C AFAF0024 */ sw $t7, 0x0024($sp) -/* 00B80 80AD9B10 AFA00020 */ sw $zero, 0x0020($sp) -/* 00B84 80AD9B14 AFA0001C */ sw $zero, 0x001C($sp) -/* 00B88 80AD9B18 AFA00018 */ sw $zero, 0x0018($sp) -/* 00B8C 80AD9B1C 8FA40038 */ lw $a0, 0x0038($sp) -/* 00B90 80AD9B20 8FA50054 */ lw $a1, 0x0054($sp) +/* 00B7C 80AD9B0C AFAF0024 */ sw $t7, 0x0024($sp) +/* 00B80 80AD9B10 AFA00020 */ sw $zero, 0x0020($sp) +/* 00B84 80AD9B14 AFA0001C */ sw $zero, 0x001C($sp) +/* 00B88 80AD9B18 AFA00018 */ sw $zero, 0x0018($sp) +/* 00B8C 80AD9B1C 8FA40038 */ lw $a0, 0x0038($sp) +/* 00B90 80AD9B20 8FA50054 */ lw $a1, 0x0054($sp) /* 00B94 80AD9B24 24060091 */ addiu $a2, $zero, 0x0091 ## $a2 = 00000091 /* 00B98 80AD9B28 0C00C7D4 */ jal Actor_Spawn ## ActorSpawn -/* 00B9C 80AD9B2C E7AA0014 */ swc1 $f10, 0x0014($sp) -/* 00BA0 80AD9B30 AFA20048 */ sw $v0, 0x0048($sp) +/* 00B9C 80AD9B2C E7AA0014 */ swc1 $f10, 0x0014($sp) +/* 00BA0 80AD9B30 AFA20048 */ sw $v0, 0x0048($sp) /* 00BA4 80AD9B34 C6100028 */ lwc1 $f16, 0x0028($s0) ## 00000028 /* 00BA8 80AD9B38 8E070024 */ lw $a3, 0x0024($s0) ## 00000024 /* 00BAC 80AD9B3C 24180C00 */ addiu $t8, $zero, 0x0C00 ## $t8 = 00000C00 -/* 00BB0 80AD9B40 E7B00010 */ swc1 $f16, 0x0010($sp) +/* 00BB0 80AD9B40 E7B00010 */ swc1 $f16, 0x0010($sp) /* 00BB4 80AD9B44 C612002C */ lwc1 $f18, 0x002C($s0) ## 0000002C -/* 00BB8 80AD9B48 AFB80024 */ sw $t8, 0x0024($sp) -/* 00BBC 80AD9B4C AFA00020 */ sw $zero, 0x0020($sp) -/* 00BC0 80AD9B50 AFA0001C */ sw $zero, 0x001C($sp) -/* 00BC4 80AD9B54 AFA00018 */ sw $zero, 0x0018($sp) -/* 00BC8 80AD9B58 8FA40038 */ lw $a0, 0x0038($sp) -/* 00BCC 80AD9B5C 8FA50054 */ lw $a1, 0x0054($sp) +/* 00BB8 80AD9B48 AFB80024 */ sw $t8, 0x0024($sp) +/* 00BBC 80AD9B4C AFA00020 */ sw $zero, 0x0020($sp) +/* 00BC0 80AD9B50 AFA0001C */ sw $zero, 0x001C($sp) +/* 00BC4 80AD9B54 AFA00018 */ sw $zero, 0x0018($sp) +/* 00BC8 80AD9B58 8FA40038 */ lw $a0, 0x0038($sp) +/* 00BCC 80AD9B5C 8FA50054 */ lw $a1, 0x0054($sp) /* 00BD0 80AD9B60 24060091 */ addiu $a2, $zero, 0x0091 ## $a2 = 00000091 /* 00BD4 80AD9B64 0C00C7D4 */ jal Actor_Spawn ## ActorSpawn -/* 00BD8 80AD9B68 E7B20014 */ swc1 $f18, 0x0014($sp) -/* 00BDC 80AD9B6C 8FA7004C */ lw $a3, 0x004C($sp) +/* 00BD8 80AD9B68 E7B20014 */ swc1 $f18, 0x0014($sp) +/* 00BDC 80AD9B6C 8FA7004C */ lw $a3, 0x004C($sp) /* 00BE0 80AD9B70 00403025 */ or $a2, $v0, $zero ## $a2 = 00000000 -/* 00BE4 80AD9B74 8FB90048 */ lw $t9, 0x0048($sp) -/* 00BE8 80AD9B78 10E00005 */ beq $a3, $zero, .L80AD9B90 +/* 00BE4 80AD9B74 8FB90048 */ lw $t9, 0x0048($sp) +/* 00BE8 80AD9B78 10E00005 */ beq $a3, $zero, .L80AD9B90 /* 00BEC 80AD9B7C 00000000 */ nop -/* 00BF0 80AD9B80 13200003 */ beq $t9, $zero, .L80AD9B90 +/* 00BF0 80AD9B80 13200003 */ beq $t9, $zero, .L80AD9B90 /* 00BF4 80AD9B84 00000000 */ nop -/* 00BF8 80AD9B88 14400014 */ bne $v0, $zero, .L80AD9BDC +/* 00BF8 80AD9B88 14400014 */ bne $v0, $zero, .L80AD9BDC /* 00BFC 80AD9B8C 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C .L80AD9B90: -/* 00C00 80AD9B90 10E00004 */ beq $a3, $zero, .L80AD9BA4 +/* 00C00 80AD9B90 10E00004 */ beq $a3, $zero, .L80AD9BA4 /* 00C04 80AD9B94 00E02025 */ or $a0, $a3, $zero ## $a0 = 00000000 /* 00C08 80AD9B98 0C00B55C */ jal Actor_Kill - -/* 00C0C 80AD9B9C AFA60044 */ sw $a2, 0x0044($sp) -/* 00C10 80AD9BA0 8FA60044 */ lw $a2, 0x0044($sp) + +/* 00C0C 80AD9B9C AFA60044 */ sw $a2, 0x0044($sp) +/* 00C10 80AD9BA0 8FA60044 */ lw $a2, 0x0044($sp) .L80AD9BA4: -/* 00C14 80AD9BA4 8FA80048 */ lw $t0, 0x0048($sp) -/* 00C18 80AD9BA8 11000004 */ beq $t0, $zero, .L80AD9BBC +/* 00C14 80AD9BA4 8FA80048 */ lw $t0, 0x0048($sp) +/* 00C18 80AD9BA8 11000004 */ beq $t0, $zero, .L80AD9BBC /* 00C1C 80AD9BAC 01002025 */ or $a0, $t0, $zero ## $a0 = 00000000 /* 00C20 80AD9BB0 0C00B55C */ jal Actor_Kill - -/* 00C24 80AD9BB4 AFA60044 */ sw $a2, 0x0044($sp) -/* 00C28 80AD9BB8 8FA60044 */ lw $a2, 0x0044($sp) + +/* 00C24 80AD9BB4 AFA60044 */ sw $a2, 0x0044($sp) +/* 00C28 80AD9BB8 8FA60044 */ lw $a2, 0x0044($sp) .L80AD9BBC: -/* 00C2C 80AD9BBC 10C00003 */ beq $a2, $zero, .L80AD9BCC +/* 00C2C 80AD9BBC 10C00003 */ beq $a2, $zero, .L80AD9BCC /* 00C30 80AD9BC0 00000000 */ nop /* 00C34 80AD9BC4 0C00B55C */ jal Actor_Kill - + /* 00C38 80AD9BC8 00C02025 */ or $a0, $a2, $zero ## $a0 = 00000000 .L80AD9BCC: /* 00C3C 80AD9BCC 0C00B55C */ jal Actor_Kill - + /* 00C40 80AD9BD0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00C44 80AD9BD4 1000000F */ beq $zero, $zero, .L80AD9C14 -/* 00C48 80AD9BD8 8FBF0034 */ lw $ra, 0x0034($sp) +/* 00C44 80AD9BD4 1000000F */ beq $zero, $zero, .L80AD9C14 +/* 00C48 80AD9BD8 8FBF0034 */ lw $ra, 0x0034($sp) .L80AD9BDC: /* 00C4C 80AD9BDC ACD00118 */ sw $s0, 0x0118($a2) ## 00000118 -/* 00C50 80AD9BE0 8FA90048 */ lw $t1, 0x0048($sp) +/* 00C50 80AD9BE0 8FA90048 */ lw $t1, 0x0048($sp) /* 00C54 80AD9BE4 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 00C58 80AD9BE8 24A50680 */ addiu $a1, $a1, 0x0680 ## $a1 = 06000680 /* 00C5C 80AD9BEC AD300118 */ sw $s0, 0x0118($t1) ## 00000118 -/* 00C60 80AD9BF0 0C0294BE */ jal func_800A52F8 +/* 00C60 80AD9BF0 0C0294BE */ jal SkelAnime_ChangeAnimDefaultRepeat /* 00C64 80AD9BF4 ACF00118 */ sw $s0, 0x0118($a3) ## 00000118 /* 00C68 80AD9BF8 3C0B80AE */ lui $t3, %hi(func_80ADB2B8) ## $t3 = 80AE0000 /* 00C6C 80AD9BFC 240A00A0 */ addiu $t2, $zero, 0x00A0 ## $t2 = 000000A0 @@ -101,11 +101,11 @@ glabel func_80AD9AA8 /* 00C74 80AD9C04 A2000198 */ sb $zero, 0x0198($s0) ## 00000198 /* 00C78 80AD9C08 A20A0199 */ sb $t2, 0x0199($s0) ## 00000199 /* 00C7C 80AD9C0C AE0B0190 */ sw $t3, 0x0190($s0) ## 00000190 -/* 00C80 80AD9C10 8FBF0034 */ lw $ra, 0x0034($sp) +/* 00C80 80AD9C10 8FBF0034 */ lw $ra, 0x0034($sp) .L80AD9C14: -/* 00C84 80AD9C14 8FB00030 */ lw $s0, 0x0030($sp) +/* 00C84 80AD9C14 8FB00030 */ lw $s0, 0x0030($sp) /* 00C88 80AD9C18 27BD0050 */ addiu $sp, $sp, 0x0050 ## $sp = 00000000 -/* 00C8C 80AD9C1C 03E00008 */ jr $ra +/* 00C8C 80AD9C1C 03E00008 */ jr $ra /* 00C90 80AD9C20 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80AD9D44.s b/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80AD9D44.s index 7fac6b77b8..a0430d9c37 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80AD9D44.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80AD9D44.s @@ -1,40 +1,40 @@ glabel func_80AD9D44 /* 00DB4 80AD9D44 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 00DB8 80AD9D48 AFBF002C */ sw $ra, 0x002C($sp) -/* 00DBC 80AD9D4C AFB00028 */ sw $s0, 0x0028($sp) +/* 00DB8 80AD9D48 AFBF002C */ sw $ra, 0x002C($sp) +/* 00DBC 80AD9D4C AFB00028 */ sw $s0, 0x0028($sp) /* 00DC0 80AD9D50 908E0194 */ lbu $t6, 0x0194($a0) ## 00000194 /* 00DC4 80AD9D54 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 00DC8 80AD9D58 24010003 */ addiu $at, $zero, 0x0003 ## $at = 00000003 -/* 00DCC 80AD9D5C 15C10009 */ bne $t6, $at, .L80AD9D84 +/* 00DCC 80AD9D5C 15C10009 */ bne $t6, $at, .L80AD9D84 /* 00DD0 80AD9D60 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C /* 00DD4 80AD9D64 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 00DD8 80AD9D68 0C02947A */ jal func_800A51E8 +/* 00DD8 80AD9D68 0C02947A */ jal SkelAnime_ChangeAnimDefaultStop /* 00DDC 80AD9D6C 24A5119C */ addiu $a1, $a1, 0x119C ## $a1 = 0600119C /* 00DE0 80AD9D70 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 00DE4 80AD9D74 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 00DE8 80AD9D78 24053873 */ addiu $a1, $zero, 0x3873 ## $a1 = 00003873 -/* 00DEC 80AD9D7C 10000011 */ beq $zero, $zero, .L80AD9DC4 +/* 00DEC 80AD9D7C 10000011 */ beq $zero, $zero, .L80AD9DC4 /* 00DF0 80AD9D80 00000000 */ nop .L80AD9D84: /* 00DF4 80AD9D84 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 /* 00DF8 80AD9D88 0C028800 */ jal SkelAnime_GetFrameCount - + /* 00DFC 80AD9D8C 2484119C */ addiu $a0, $a0, 0x119C ## $a0 = 0600119C /* 00E00 80AD9D90 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 00E04 80AD9D94 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 /* 00E08 80AD9D98 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 00E0C 80AD9D9C 468021A0 */ cvt.s.w $f6, $f4 +/* 00E0C 80AD9D9C 468021A0 */ cvt.s.w $f6, $f4 /* 00E10 80AD9DA0 240F0003 */ addiu $t7, $zero, 0x0003 ## $t7 = 00000003 -/* 00E14 80AD9DA4 44070000 */ mfc1 $a3, $f0 -/* 00E18 80AD9DA8 AFAF0014 */ sw $t7, 0x0014($sp) +/* 00E14 80AD9DA4 44070000 */ mfc1 $a3, $f0 +/* 00E18 80AD9DA8 AFAF0014 */ sw $t7, 0x0014($sp) /* 00E1C 80AD9DAC 24A5119C */ addiu $a1, $a1, 0x119C ## $a1 = 0600119C /* 00E20 80AD9DB0 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C -/* 00E24 80AD9DB4 E7A60010 */ swc1 $f6, 0x0010($sp) +/* 00E24 80AD9DB4 E7A60010 */ swc1 $f6, 0x0010($sp) /* 00E28 80AD9DB8 3C063F00 */ lui $a2, 0x3F00 ## $a2 = 3F000000 -/* 00E2C 80AD9DBC 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 00E30 80AD9DC0 E7A00018 */ swc1 $f0, 0x0018($sp) +/* 00E2C 80AD9DBC 0C029468 */ jal SkelAnime_ChangeAnim + +/* 00E30 80AD9DC0 E7A00018 */ swc1 $f0, 0x0018($sp) .L80AD9DC4: /* 00E34 80AD9DC4 3C1980AE */ lui $t9, %hi(func_80ADB9F0) ## $t9 = 80AE0000 /* 00E38 80AD9DC8 24180020 */ addiu $t8, $zero, 0x0020 ## $t8 = 00000020 @@ -42,10 +42,10 @@ glabel func_80AD9D44 /* 00E40 80AD9DD0 A2000231 */ sb $zero, 0x0231($s0) ## 00000231 /* 00E44 80AD9DD4 A2180199 */ sb $t8, 0x0199($s0) ## 00000199 /* 00E48 80AD9DD8 AE190190 */ sw $t9, 0x0190($s0) ## 00000190 -/* 00E4C 80AD9DDC 8FBF002C */ lw $ra, 0x002C($sp) -/* 00E50 80AD9DE0 8FB00028 */ lw $s0, 0x0028($sp) +/* 00E4C 80AD9DDC 8FBF002C */ lw $ra, 0x002C($sp) +/* 00E50 80AD9DE0 8FB00028 */ lw $s0, 0x0028($sp) /* 00E54 80AD9DE4 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 00E58 80AD9DE8 03E00008 */ jr $ra +/* 00E58 80AD9DE8 03E00008 */ jr $ra /* 00E5C 80AD9DEC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80AD9DF0.s b/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80AD9DF0.s index 047d9f546b..b3468416d2 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80AD9DF0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80AD9DF0.s @@ -1,15 +1,15 @@ glabel func_80AD9DF0 /* 00E60 80AD9DF0 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 00E64 80AD9DF4 AFA50024 */ sw $a1, 0x0024($sp) -/* 00E68 80AD9DF8 AFBF001C */ sw $ra, 0x001C($sp) +/* 00E64 80AD9DF4 AFA50024 */ sw $a1, 0x0024($sp) +/* 00E68 80AD9DF8 AFBF001C */ sw $ra, 0x001C($sp) /* 00E6C 80AD9DFC 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 /* 00E70 80AD9E00 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 00E74 80AD9E04 24A5119C */ addiu $a1, $a1, 0x119C ## $a1 = 0600119C -/* 00E78 80AD9E08 AFA70020 */ sw $a3, 0x0020($sp) +/* 00E78 80AD9E08 AFA70020 */ sw $a3, 0x0020($sp) /* 00E7C 80AD9E0C 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 00E80 80AD9E10 0C029490 */ jal func_800A5240 +/* 00E80 80AD9E10 0C029490 */ jal SkelAnime_ChangeAnimTransitionStop /* 00E84 80AD9E14 3C06C0A0 */ lui $a2, 0xC0A0 ## $a2 = C0A00000 -/* 00E88 80AD9E18 8FA70020 */ lw $a3, 0x0020($sp) +/* 00E88 80AD9E18 8FA70020 */ lw $a3, 0x0020($sp) /* 00E8C 80AD9E1C 3C1980AE */ lui $t9, %hi(func_80ADB4B0) ## $t9 = 80AE0000 /* 00E90 80AD9E20 240E0001 */ addiu $t6, $zero, 0x0001 ## $t6 = 00000001 /* 00E94 80AD9E24 90EF0199 */ lbu $t7, 0x0199($a3) ## 00000199 @@ -18,14 +18,14 @@ glabel func_80AD9DF0 /* 00EA0 80AD9E30 31F8FF7F */ andi $t8, $t7, 0xFF7F ## $t8 = 00000000 /* 00EA4 80AD9E34 A0F80199 */ sb $t8, 0x0199($a3) ## 00000199 /* 00EA8 80AD9E38 ACF90190 */ sw $t9, 0x0190($a3) ## 00000190 -/* 00EAC 80AD9E3C AFA00010 */ sw $zero, 0x0010($sp) -/* 00EB0 80AD9E40 8FA40024 */ lw $a0, 0x0024($sp) +/* 00EAC 80AD9E3C AFA00010 */ sw $zero, 0x0010($sp) +/* 00EB0 80AD9E40 8FA40024 */ lw $a0, 0x0024($sp) /* 00EB4 80AD9E44 24050C6C */ addiu $a1, $zero, 0x0C6C ## $a1 = 00000C6C -/* 00EB8 80AD9E48 0C02003E */ jal func_800800F8 +/* 00EB8 80AD9E48 0C02003E */ jal func_800800F8 /* 00EBC 80AD9E4C 2406009C */ addiu $a2, $zero, 0x009C ## $a2 = 0000009C -/* 00EC0 80AD9E50 8FBF001C */ lw $ra, 0x001C($sp) +/* 00EC0 80AD9E50 8FBF001C */ lw $ra, 0x001C($sp) /* 00EC4 80AD9E54 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 00EC8 80AD9E58 03E00008 */ jr $ra +/* 00EC8 80AD9E58 03E00008 */ jr $ra /* 00ECC 80AD9E5C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80AD9E60.s b/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80AD9E60.s index 2c71b11903..19d1142ee5 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80AD9E60.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80AD9E60.s @@ -1,22 +1,22 @@ glabel func_80AD9E60 /* 00ED0 80AD9E60 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 00ED4 80AD9E64 AFB00018 */ sw $s0, 0x0018($sp) +/* 00ED4 80AD9E64 AFB00018 */ sw $s0, 0x0018($sp) /* 00ED8 80AD9E68 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00EDC 80AD9E6C AFBF001C */ sw $ra, 0x001C($sp) +/* 00EDC 80AD9E6C AFBF001C */ sw $ra, 0x001C($sp) /* 00EE0 80AD9E70 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 00EE4 80AD9E74 24A50D40 */ addiu $a1, $a1, 0x0D40 ## $a1 = 06000D40 /* 00EE8 80AD9E78 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 00EEC 80AD9E7C 0C0294D3 */ jal func_800A534C +/* 00EEC 80AD9E7C 0C0294D3 */ jal SkelAnime_ChangeAnimTransitionRepeat /* 00EF0 80AD9E80 3C06C040 */ lui $a2, 0xC040 ## $a2 = C0400000 /* 00EF4 80AD9E84 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 /* 00EF8 80AD9E88 0C028800 */ jal SkelAnime_GetFrameCount - + /* 00EFC 80AD9E8C 24840D40 */ addiu $a0, $a0, 0x0D40 ## $a0 = 06000D40 /* 00F00 80AD9E90 8E030118 */ lw $v1, 0x0118($s0) ## 00000118 -/* 00F04 80AD9E94 000270C0 */ sll $t6, $v0, 3 -/* 00F08 80AD9E98 01C27023 */ subu $t6, $t6, $v0 +/* 00F04 80AD9E94 000270C0 */ sll $t6, $v0, 3 +/* 00F08 80AD9E98 01C27023 */ subu $t6, $t6, $v0 /* 00F0C 80AD9E9C 25CF0007 */ addiu $t7, $t6, 0x0007 ## $t7 = 00000007 -/* 00F10 80AD9EA0 1060000B */ beq $v1, $zero, .L80AD9ED0 +/* 00F10 80AD9EA0 1060000B */ beq $v1, $zero, .L80AD9ED0 /* 00F14 80AD9EA4 A60F019A */ sh $t7, 0x019A($s0) ## 0000019A /* 00F18 80AD9EA8 8C790024 */ lw $t9, 0x0024($v1) ## 00000024 /* 00F1C 80AD9EAC 8E080118 */ lw $t0, 0x0118($s0) ## 00000118 @@ -26,7 +26,7 @@ glabel func_80AD9E60 /* 00F2C 80AD9EBC 8C79002C */ lw $t9, 0x002C($v1) ## 0000002C /* 00F30 80AD9EC0 AE19002C */ sw $t9, 0x002C($s0) ## 0000002C /* 00F34 80AD9EC4 850900B6 */ lh $t1, 0x00B6($t0) ## 000000B6 -/* 00F38 80AD9EC8 10000006 */ beq $zero, $zero, .L80AD9EE4 +/* 00F38 80AD9EC8 10000006 */ beq $zero, $zero, .L80AD9EE4 /* 00F3C 80AD9ECC A60900B6 */ sh $t1, 0x00B6($s0) ## 000000B6 .L80AD9ED0: /* 00F40 80AD9ED0 860B019A */ lh $t3, 0x019A($s0) ## 0000019A @@ -37,19 +37,19 @@ glabel func_80AD9E60 .L80AD9EE4: /* 00F54 80AD9EE4 920D0195 */ lbu $t5, 0x0195($s0) ## 00000195 /* 00F58 80AD9EE8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00F5C 80AD9EEC 15A00003 */ bne $t5, $zero, .L80AD9EFC +/* 00F5C 80AD9EEC 15A00003 */ bne $t5, $zero, .L80AD9EFC /* 00F60 80AD9EF0 00000000 */ nop /* 00F64 80AD9EF4 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 00F68 80AD9EF8 240538EF */ addiu $a1, $zero, 0x38EF ## $a1 = 000038EF .L80AD9EFC: /* 00F6C 80AD9EFC 3C0E80AE */ lui $t6, %hi(func_80ADB51C) ## $t6 = 80AE0000 /* 00F70 80AD9F00 25CEB51C */ addiu $t6, $t6, %lo(func_80ADB51C) ## $t6 = 80ADB51C /* 00F74 80AD9F04 AE0E0190 */ sw $t6, 0x0190($s0) ## 00000190 -/* 00F78 80AD9F08 8FBF001C */ lw $ra, 0x001C($sp) -/* 00F7C 80AD9F0C 8FB00018 */ lw $s0, 0x0018($sp) +/* 00F78 80AD9F08 8FBF001C */ lw $ra, 0x001C($sp) +/* 00F7C 80AD9F0C 8FB00018 */ lw $s0, 0x0018($sp) /* 00F80 80AD9F10 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 00F84 80AD9F14 03E00008 */ jr $ra +/* 00F84 80AD9F14 03E00008 */ jr $ra /* 00F88 80AD9F18 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80AD9F1C.s b/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80AD9F1C.s index 3922059036..caf51f6f59 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80AD9F1C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80AD9F1C.s @@ -1,14 +1,14 @@ glabel func_80AD9F1C /* 00F8C 80AD9F1C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00F90 80AD9F20 AFBF0014 */ sw $ra, 0x0014($sp) +/* 00F90 80AD9F20 AFBF0014 */ sw $ra, 0x0014($sp) /* 00F94 80AD9F24 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 /* 00F98 80AD9F28 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 00F9C 80AD9F2C 24A50D40 */ addiu $a1, $a1, 0x0D40 ## $a1 = 06000D40 -/* 00FA0 80AD9F30 AFA70018 */ sw $a3, 0x0018($sp) +/* 00FA0 80AD9F30 AFA70018 */ sw $a3, 0x0018($sp) /* 00FA4 80AD9F34 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 00FA8 80AD9F38 0C0294D3 */ jal func_800A534C +/* 00FA8 80AD9F38 0C0294D3 */ jal SkelAnime_ChangeAnimTransitionRepeat /* 00FAC 80AD9F3C 3C06C040 */ lui $a2, 0xC040 ## $a2 = C0400000 -/* 00FB0 80AD9F40 8FA70018 */ lw $a3, 0x0018($sp) +/* 00FB0 80AD9F40 8FA70018 */ lw $a3, 0x0018($sp) /* 00FB4 80AD9F44 3C0B80AE */ lui $t3, %hi(func_80ADB770) ## $t3 = 80AE0000 /* 00FB8 80AD9F48 240E00FF */ addiu $t6, $zero, 0x00FF ## $t6 = 000000FF /* 00FBC 80AD9F4C 90F90199 */ lbu $t9, 0x0199($a3) ## 00000199 @@ -24,9 +24,9 @@ glabel func_80AD9F1C /* 00FE4 80AD9F74 A0E80199 */ sb $t0, 0x0199($a3) ## 00000199 /* 00FE8 80AD9F78 ACEA0004 */ sw $t2, 0x0004($a3) ## 00000004 /* 00FEC 80AD9F7C ACEB0190 */ sw $t3, 0x0190($a3) ## 00000190 -/* 00FF0 80AD9F80 8FBF0014 */ lw $ra, 0x0014($sp) +/* 00FF0 80AD9F80 8FBF0014 */ lw $ra, 0x0014($sp) /* 00FF4 80AD9F84 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00FF8 80AD9F88 03E00008 */ jr $ra +/* 00FF8 80AD9F88 03E00008 */ jr $ra /* 00FFC 80AD9F8C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80AD9F90.s b/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80AD9F90.s index cb6a27042e..703b2c252b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80AD9F90.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80AD9F90.s @@ -1,17 +1,17 @@ glabel func_80AD9F90 /* 01000 80AD9F90 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 01004 80AD9F94 AFBF0014 */ sw $ra, 0x0014($sp) +/* 01004 80AD9F94 AFBF0014 */ sw $ra, 0x0014($sp) /* 01008 80AD9F98 908E0194 */ lbu $t6, 0x0194($a0) ## 00000194 /* 0100C 80AD9F9C 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 /* 01010 80AD9FA0 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 -/* 01014 80AD9FA4 15C10008 */ bne $t6, $at, .L80AD9FC8 +/* 01014 80AD9FA4 15C10008 */ bne $t6, $at, .L80AD9FC8 /* 01018 80AD9FA8 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 0101C 80AD9FAC 3C01C41E */ lui $at, 0xC41E ## $at = C41E0000 /* 01020 80AD9FB0 44812000 */ mtc1 $at, $f4 ## $f4 = -632.00 /* 01024 80AD9FB4 3C01C557 */ lui $at, 0xC557 ## $at = C5570000 /* 01028 80AD9FB8 44813000 */ mtc1 $at, $f6 ## $f6 = -3440.00 /* 0102C 80AD9FBC E4840008 */ swc1 $f4, 0x0008($a0) ## 00000008 -/* 01030 80AD9FC0 10000007 */ beq $zero, $zero, .L80AD9FE0 +/* 01030 80AD9FC0 10000007 */ beq $zero, $zero, .L80AD9FE0 /* 01034 80AD9FC4 E4860010 */ swc1 $f6, 0x0010($a0) ## 00000010 .L80AD9FC8: /* 01038 80AD9FC8 3C01443C */ lui $at, 0x443C ## $at = 443C0000 @@ -23,9 +23,9 @@ glabel func_80AD9F90 .L80AD9FE0: /* 01050 80AD9FE0 24C4014C */ addiu $a0, $a2, 0x014C ## $a0 = 0000014C /* 01054 80AD9FE4 24A50D40 */ addiu $a1, $a1, 0x0D40 ## $a1 = 06000D40 -/* 01058 80AD9FE8 0C0294BE */ jal func_800A52F8 -/* 0105C 80AD9FEC AFA60018 */ sw $a2, 0x0018($sp) -/* 01060 80AD9FF0 8FA60018 */ lw $a2, 0x0018($sp) +/* 01058 80AD9FE8 0C0294BE */ jal SkelAnime_ChangeAnimDefaultRepeat +/* 0105C 80AD9FEC AFA60018 */ sw $a2, 0x0018($sp) +/* 01060 80AD9FF0 8FA60018 */ lw $a2, 0x0018($sp) /* 01064 80AD9FF4 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 /* 01068 80AD9FF8 44818000 */ mtc1 $at, $f16 ## $f16 = 5.00 /* 0106C 80AD9FFC 90CF0199 */ lbu $t7, 0x0199($a2) ## 00000199 @@ -35,9 +35,9 @@ glabel func_80AD9F90 /* 0107C 80ADA00C A0D80199 */ sb $t8, 0x0199($a2) ## 00000199 /* 01080 80ADA010 ACD90190 */ sw $t9, 0x0190($a2) ## 00000190 /* 01084 80ADA014 E4D00068 */ swc1 $f16, 0x0068($a2) ## 00000068 -/* 01088 80ADA018 8FBF0014 */ lw $ra, 0x0014($sp) +/* 01088 80ADA018 8FBF0014 */ lw $ra, 0x0014($sp) /* 0108C 80ADA01C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 01090 80ADA020 03E00008 */ jr $ra +/* 01090 80ADA020 03E00008 */ jr $ra /* 01094 80ADA024 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80ADA028.s b/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80ADA028.s index 51ce21be70..f200c1ec77 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80ADA028.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80ADA028.s @@ -1,14 +1,14 @@ glabel func_80ADA028 /* 01098 80ADA028 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 0109C 80ADA02C AFBF0014 */ sw $ra, 0x0014($sp) +/* 0109C 80ADA02C AFBF0014 */ sw $ra, 0x0014($sp) /* 010A0 80ADA030 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 /* 010A4 80ADA034 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 010A8 80ADA038 24A514CC */ addiu $a1, $a1, 0x14CC ## $a1 = 060014CC -/* 010AC 80ADA03C AFA70018 */ sw $a3, 0x0018($sp) +/* 010AC 80ADA03C AFA70018 */ sw $a3, 0x0018($sp) /* 010B0 80ADA040 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 010B4 80ADA044 0C0294D3 */ jal func_800A534C +/* 010B4 80ADA044 0C0294D3 */ jal SkelAnime_ChangeAnimTransitionRepeat /* 010B8 80ADA048 3C06C040 */ lui $a2, 0xC040 ## $a2 = C0400000 -/* 010BC 80ADA04C 8FA70018 */ lw $a3, 0x0018($sp) +/* 010BC 80ADA04C 8FA70018 */ lw $a3, 0x0018($sp) /* 010C0 80ADA050 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 /* 010C4 80ADA054 3C0980AE */ lui $t1, %hi(func_80ADBBF4) ## $t1 = 80AE0000 /* 010C8 80ADA058 90EF0199 */ lbu $t7, 0x0199($a3) ## 00000199 @@ -22,9 +22,9 @@ glabel func_80ADA028 /* 010E8 80ADA078 ACE80004 */ sw $t0, 0x0004($a3) ## 00000004 /* 010EC 80ADA07C ACE90190 */ sw $t1, 0x0190($a3) ## 00000190 /* 010F0 80ADA080 E4E40068 */ swc1 $f4, 0x0068($a3) ## 00000068 -/* 010F4 80ADA084 8FBF0014 */ lw $ra, 0x0014($sp) +/* 010F4 80ADA084 8FBF0014 */ lw $ra, 0x0014($sp) /* 010F8 80ADA088 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 010FC 80ADA08C 03E00008 */ jr $ra +/* 010FC 80ADA08C 03E00008 */ jr $ra /* 01100 80ADA090 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80ADA1B8.s b/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80ADA1B8.s index c550b1fb18..695afe0d56 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80ADA1B8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80ADA1B8.s @@ -1,49 +1,49 @@ glabel func_80ADA1B8 /* 01228 80ADA1B8 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 0122C 80ADA1BC AFB00028 */ sw $s0, 0x0028($sp) +/* 0122C 80ADA1BC AFB00028 */ sw $s0, 0x0028($sp) /* 01230 80ADA1C0 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 01234 80ADA1C4 AFBF002C */ sw $ra, 0x002C($sp) +/* 01234 80ADA1C4 AFBF002C */ sw $ra, 0x002C($sp) /* 01238 80ADA1C8 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 /* 0123C 80ADA1CC 0C028800 */ jal SkelAnime_GetFrameCount - + /* 01240 80ADA1D0 2484119C */ addiu $a0, $a0, 0x119C ## $a0 = 0600119C /* 01244 80ADA1D4 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 01248 80ADA1D8 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 /* 0124C 80ADA1DC 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 01250 80ADA1E0 468021A0 */ cvt.s.w $f6, $f4 +/* 01250 80ADA1E0 468021A0 */ cvt.s.w $f6, $f4 /* 01254 80ADA1E4 3C063F55 */ lui $a2, 0x3F55 ## $a2 = 3F550000 /* 01258 80ADA1E8 240E0003 */ addiu $t6, $zero, 0x0003 ## $t6 = 00000003 -/* 0125C 80ADA1EC 44070000 */ mfc1 $a3, $f0 -/* 01260 80ADA1F0 AFAE0014 */ sw $t6, 0x0014($sp) +/* 0125C 80ADA1EC 44070000 */ mfc1 $a3, $f0 +/* 01260 80ADA1F0 AFAE0014 */ sw $t6, 0x0014($sp) /* 01264 80ADA1F4 34C63F7D */ ori $a2, $a2, 0x3F7D ## $a2 = 3F553F7D -/* 01268 80ADA1F8 E7A60010 */ swc1 $f6, 0x0010($sp) +/* 01268 80ADA1F8 E7A60010 */ swc1 $f6, 0x0010($sp) /* 0126C 80ADA1FC 24A5119C */ addiu $a1, $a1, 0x119C ## $a1 = 0600119C /* 01270 80ADA200 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C -/* 01274 80ADA204 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 01278 80ADA208 E7A00018 */ swc1 $f0, 0x0018($sp) +/* 01274 80ADA204 0C029468 */ jal SkelAnime_ChangeAnim + +/* 01278 80ADA208 E7A00018 */ swc1 $f0, 0x0018($sp) /* 0127C 80ADA20C 92020194 */ lbu $v0, 0x0194($s0) ## 00000194 /* 01280 80ADA210 3C1980AE */ lui $t9, %hi(func_80ADBD8C) ## $t9 = 80AE0000 /* 01284 80ADA214 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 01288 80ADA218 10400003 */ beq $v0, $zero, .L80ADA228 +/* 01288 80ADA218 10400003 */ beq $v0, $zero, .L80ADA228 /* 0128C 80ADA21C 2739BD8C */ addiu $t9, $t9, %lo(func_80ADBD8C) ## $t9 = 80ADBD8C -/* 01290 80ADA220 14410004 */ bne $v0, $at, .L80ADA234 +/* 01290 80ADA220 14410004 */ bne $v0, $at, .L80ADA234 /* 01294 80ADA224 2418004C */ addiu $t8, $zero, 0x004C ## $t8 = 0000004C .L80ADA228: /* 01298 80ADA228 240F0028 */ addiu $t7, $zero, 0x0028 ## $t7 = 00000028 -/* 0129C 80ADA22C 10000002 */ beq $zero, $zero, .L80ADA238 +/* 0129C 80ADA22C 10000002 */ beq $zero, $zero, .L80ADA238 /* 012A0 80ADA230 A60F019A */ sh $t7, 0x019A($s0) ## 0000019A .L80ADA234: /* 012A4 80ADA234 A618019A */ sh $t8, 0x019A($s0) ## 0000019A .L80ADA238: /* 012A8 80ADA238 A2000198 */ sb $zero, 0x0198($s0) ## 00000198 /* 012AC 80ADA23C 3C0180AE */ lui $at, %hi(D_80ADD784) ## $at = 80AE0000 -/* 012B0 80ADA240 AC20D784 */ sw $zero, %lo(D_80ADD784)($at) +/* 012B0 80ADA240 AC20D784 */ sw $zero, %lo(D_80ADD784)($at) /* 012B4 80ADA244 AE190190 */ sw $t9, 0x0190($s0) ## 00000190 -/* 012B8 80ADA248 8FBF002C */ lw $ra, 0x002C($sp) -/* 012BC 80ADA24C 8FB00028 */ lw $s0, 0x0028($sp) +/* 012B8 80ADA248 8FBF002C */ lw $ra, 0x002C($sp) +/* 012BC 80ADA24C 8FB00028 */ lw $s0, 0x0028($sp) /* 012C0 80ADA250 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 012C4 80ADA254 03E00008 */ jr $ra +/* 012C4 80ADA254 03E00008 */ jr $ra /* 012C8 80ADA258 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80ADA25C.s b/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80ADA25C.s index 65c40aa6e9..ce60f1a013 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80ADA25C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80ADA25C.s @@ -1,27 +1,27 @@ glabel func_80ADA25C /* 012CC 80ADA25C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 012D0 80ADA260 AFBF0014 */ sw $ra, 0x0014($sp) +/* 012D0 80ADA260 AFBF0014 */ sw $ra, 0x0014($sp) /* 012D4 80ADA264 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 /* 012D8 80ADA268 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 012DC 80ADA26C 24A514CC */ addiu $a1, $a1, 0x14CC ## $a1 = 060014CC -/* 012E0 80ADA270 AFA70018 */ sw $a3, 0x0018($sp) -/* 012E4 80ADA274 0C0294BE */ jal func_800A52F8 +/* 012E0 80ADA270 AFA70018 */ sw $a3, 0x0018($sp) +/* 012E4 80ADA274 0C0294BE */ jal SkelAnime_ChangeAnimDefaultRepeat /* 012E8 80ADA278 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 012EC 80ADA27C 8FA40018 */ lw $a0, 0x0018($sp) +/* 012EC 80ADA27C 8FA40018 */ lw $a0, 0x0018($sp) /* 012F0 80ADA280 240F0020 */ addiu $t7, $zero, 0x0020 ## $t7 = 00000020 /* 012F4 80ADA284 240E0008 */ addiu $t6, $zero, 0x0008 ## $t6 = 00000008 /* 012F8 80ADA288 A48F019A */ sh $t7, 0x019A($a0) ## 0000019A /* 012FC 80ADA28C A08E0198 */ sb $t6, 0x0198($a0) ## 00000198 /* 01300 80ADA290 8485019A */ lh $a1, 0x019A($a0) ## 0000019A -/* 01304 80ADA294 0C2B6490 */ jal func_80AD9240 +/* 01304 80ADA294 0C2B6490 */ jal func_80AD9240 /* 01308 80ADA298 24860008 */ addiu $a2, $a0, 0x0008 ## $a2 = 00000008 -/* 0130C 80ADA29C 8FA70018 */ lw $a3, 0x0018($sp) +/* 0130C 80ADA29C 8FA70018 */ lw $a3, 0x0018($sp) /* 01310 80ADA2A0 3C1880AE */ lui $t8, %hi(func_80ADBEE8) ## $t8 = 80AE0000 /* 01314 80ADA2A4 2718BEE8 */ addiu $t8, $t8, %lo(func_80ADBEE8) ## $t8 = 80ADBEE8 /* 01318 80ADA2A8 ACF80190 */ sw $t8, 0x0190($a3) ## 00000190 -/* 0131C 80ADA2AC 8FBF0014 */ lw $ra, 0x0014($sp) +/* 0131C 80ADA2AC 8FBF0014 */ lw $ra, 0x0014($sp) /* 01320 80ADA2B0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 01324 80ADA2B4 03E00008 */ jr $ra +/* 01324 80ADA2B4 03E00008 */ jr $ra /* 01328 80ADA2B8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80ADA2BC.s b/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80ADA2BC.s index d3b739d969..e3d7ede846 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80ADA2BC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Po_Sisters/func_80ADA2BC.s @@ -1,46 +1,46 @@ glabel func_80ADA2BC /* 0132C 80ADA2BC 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 01330 80ADA2C0 AFB00018 */ sw $s0, 0x0018($sp) -/* 01334 80ADA2C4 AFA50024 */ sw $a1, 0x0024($sp) +/* 01330 80ADA2C0 AFB00018 */ sw $s0, 0x0018($sp) +/* 01334 80ADA2C4 AFA50024 */ sw $a1, 0x0024($sp) /* 01338 80ADA2C8 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 0133C 80ADA2CC AFBF001C */ sw $ra, 0x001C($sp) +/* 0133C 80ADA2CC AFBF001C */ sw $ra, 0x001C($sp) /* 01340 80ADA2D0 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 01344 80ADA2D4 24A50D40 */ addiu $a1, $a1, 0x0D40 ## $a1 = 06000D40 /* 01348 80ADA2D8 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 0134C 80ADA2DC 0C0294D3 */ jal func_800A534C +/* 0134C 80ADA2DC 0C0294D3 */ jal SkelAnime_ChangeAnimTransitionRepeat /* 01350 80ADA2E0 3C06C040 */ lui $a2, 0xC040 ## $a2 = C0400000 /* 01354 80ADA2E4 92020194 */ lbu $v0, 0x0194($s0) ## 00000194 /* 01358 80ADA2E8 240E0028 */ addiu $t6, $zero, 0x0028 ## $t6 = 00000028 /* 0135C 80ADA2EC 240F005A */ addiu $t7, $zero, 0x005A ## $t7 = 0000005A /* 01360 80ADA2F0 24180020 */ addiu $t8, $zero, 0x0020 ## $t8 = 00000020 /* 01364 80ADA2F4 3C0880AE */ lui $t0, %hi(D_80ADD79C) ## $t0 = 80AE0000 -/* 01368 80ADA2F8 0002C840 */ sll $t9, $v0, 1 +/* 01368 80ADA2F8 0002C840 */ sll $t9, $v0, 1 /* 0136C 80ADA2FC A2000198 */ sb $zero, 0x0198($s0) ## 00000198 /* 01370 80ADA300 A20E0199 */ sb $t6, 0x0199($s0) ## 00000199 /* 01374 80ADA304 A60F019A */ sh $t7, 0x019A($s0) ## 0000019A /* 01378 80ADA308 A2180196 */ sb $t8, 0x0196($s0) ## 00000196 -/* 0137C 80ADA30C 01194021 */ addu $t0, $t0, $t9 -/* 01380 80ADA310 8508D79C */ lh $t0, %lo(D_80ADD79C)($t0) +/* 0137C 80ADA30C 01194021 */ addu $t0, $t0, $t9 +/* 01380 80ADA310 8508D79C */ lh $t0, %lo(D_80ADD79C)($t0) /* 01384 80ADA314 C6040028 */ lwc1 $f4, 0x0028($s0) ## 00000028 /* 01388 80ADA318 2405001B */ addiu $a1, $zero, 0x001B ## $a1 = 0000001B /* 0138C 80ADA31C A6080032 */ sh $t0, 0x0032($s0) ## 00000032 -/* 01390 80ADA320 14400003 */ bne $v0, $zero, .L80ADA330 +/* 01390 80ADA320 14400003 */ bne $v0, $zero, .L80ADA330 /* 01394 80ADA324 E604000C */ swc1 $f4, 0x000C($s0) ## 0000000C /* 01398 80ADA328 0C00B2DD */ jal Flags_SetSwitch - -/* 0139C 80ADA32C 8FA40024 */ lw $a0, 0x0024($sp) + +/* 0139C 80ADA32C 8FA40024 */ lw $a0, 0x0024($sp) .L80ADA330: /* 013A0 80ADA330 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 013A4 80ADA334 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 013A8 80ADA338 24052822 */ addiu $a1, $zero, 0x2822 ## $a1 = 00002822 /* 013AC 80ADA33C 3C0980AE */ lui $t1, %hi(func_80ADBF58) ## $t1 = 80AE0000 /* 013B0 80ADA340 2529BF58 */ addiu $t1, $t1, %lo(func_80ADBF58) ## $t1 = 80ADBF58 /* 013B4 80ADA344 AE090190 */ sw $t1, 0x0190($s0) ## 00000190 -/* 013B8 80ADA348 8FBF001C */ lw $ra, 0x001C($sp) -/* 013BC 80ADA34C 8FB00018 */ lw $s0, 0x0018($sp) +/* 013B8 80ADA348 8FBF001C */ lw $ra, 0x001C($sp) +/* 013BC 80ADA34C 8FB00018 */ lw $s0, 0x0018($sp) /* 013C0 80ADA350 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 013C4 80ADA354 03E00008 */ jr $ra +/* 013C4 80ADA354 03E00008 */ jr $ra /* 013C8 80ADA358 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Poh/EnPoh_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Poh/EnPoh_Update.s index 3a2d64e53f..aacad92c1d 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Poh/EnPoh_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Poh/EnPoh_Update.s @@ -1,58 +1,58 @@ glabel EnPoh_Update /* 027E4 80AE0534 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 027E8 80AE0538 AFB00028 */ sw $s0, 0x0028($sp) +/* 027E8 80AE0538 AFB00028 */ sw $s0, 0x0028($sp) /* 027EC 80AE053C 3C010001 */ lui $at, 0x0001 ## $at = 00010000 /* 027F0 80AE0540 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 027F4 80AE0544 342117A4 */ ori $at, $at, 0x17A4 ## $at = 000117A4 -/* 027F8 80AE0548 AFBF002C */ sw $ra, 0x002C($sp) -/* 027FC 80AE054C AFA50034 */ sw $a1, 0x0034($sp) -/* 02800 80AE0550 00A12021 */ addu $a0, $a1, $at +/* 027F8 80AE0548 AFBF002C */ sw $ra, 0x002C($sp) +/* 027FC 80AE054C AFA50034 */ sw $a1, 0x0034($sp) +/* 02800 80AE0550 00A12021 */ addu $a0, $a1, $at /* 02804 80AE0554 0C026062 */ jal Object_IsLoaded - + /* 02808 80AE0558 82050196 */ lb $a1, 0x0196($s0) ## 00000196 -/* 0280C 80AE055C 10400042 */ beq $v0, $zero, .L80AE0668 +/* 0280C 80AE055C 10400042 */ beq $v0, $zero, .L80AE0668 /* 02810 80AE0560 3C0F80AE */ lui $t7, %hi(func_80AE0A1C) ## $t7 = 80AE0000 /* 02814 80AE0564 820E0196 */ lb $t6, 0x0196($s0) ## 00000196 /* 02818 80AE0568 25EF0A1C */ addiu $t7, $t7, %lo(func_80AE0A1C) ## $t7 = 80AE0A1C /* 0281C 80AE056C AE0F0130 */ sw $t7, 0x0130($s0) ## 00000130 /* 02820 80AE0570 A20E001E */ sb $t6, 0x001E($s0) ## 0000001E -/* 02824 80AE0574 8FA40034 */ lw $a0, 0x0034($sp) +/* 02824 80AE0574 8FA40034 */ lw $a0, 0x0034($sp) /* 02828 80AE0578 0C00B591 */ jal Actor_SetObjectDependency - + /* 0282C 80AE057C 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 02830 80AE0580 92180197 */ lbu $t8, 0x0197($s0) ## 00000197 -/* 02834 80AE0584 8FA40034 */ lw $a0, 0x0034($sp) +/* 02834 80AE0584 8FA40034 */ lw $a0, 0x0034($sp) /* 02838 80AE0588 2605014C */ addiu $a1, $s0, 0x014C ## $a1 = 0000014C -/* 0283C 80AE058C 17000012 */ bne $t8, $zero, .L80AE05D8 +/* 0283C 80AE058C 17000012 */ bne $t8, $zero, .L80AE05D8 /* 02840 80AE0590 3C060600 */ lui $a2, 0x0600 ## $a2 = 06000000 /* 02844 80AE0594 3C060600 */ lui $a2, 0x0600 ## $a2 = 06000000 /* 02848 80AE0598 3C070600 */ lui $a3, 0x0600 ## $a3 = 06000000 /* 0284C 80AE059C 2619019E */ addiu $t9, $s0, 0x019E ## $t9 = 0000019E /* 02850 80AE05A0 2608021C */ addiu $t0, $s0, 0x021C ## $t0 = 0000021C /* 02854 80AE05A4 24090015 */ addiu $t1, $zero, 0x0015 ## $t1 = 00000015 -/* 02858 80AE05A8 AFA90018 */ sw $t1, 0x0018($sp) -/* 0285C 80AE05AC AFA80014 */ sw $t0, 0x0014($sp) -/* 02860 80AE05B0 AFB90010 */ sw $t9, 0x0010($sp) +/* 02858 80AE05A8 AFA90018 */ sw $t1, 0x0018($sp) +/* 0285C 80AE05AC AFA80014 */ sw $t0, 0x0014($sp) +/* 02860 80AE05B0 AFB90010 */ sw $t9, 0x0010($sp) /* 02864 80AE05B4 24E70A60 */ addiu $a3, $a3, 0x0A60 ## $a3 = 06000A60 /* 02868 80AE05B8 24C650D0 */ addiu $a2, $a2, 0x50D0 ## $a2 = 060050D0 -/* 0286C 80AE05BC 8FA40034 */ lw $a0, 0x0034($sp) +/* 0286C 80AE05BC 8FA40034 */ lw $a0, 0x0034($sp) /* 02870 80AE05C0 0C02915F */ jal SkelAnime_Init - + /* 02874 80AE05C4 2605014C */ addiu $a1, $s0, 0x014C ## $a1 = 0000014C /* 02878 80AE05C8 3C0A80AE */ lui $t2, %hi(func_80AE0EE4) ## $t2 = 80AE0000 /* 0287C 80AE05CC 254A0EE4 */ addiu $t2, $t2, %lo(func_80AE0EE4) ## $t2 = 80AE0EE4 -/* 02880 80AE05D0 1000001F */ beq $zero, $zero, .L80AE0650 +/* 02880 80AE05D0 1000001F */ beq $zero, $zero, .L80AE0650 /* 02884 80AE05D4 AE0A0134 */ sw $t2, 0x0134($s0) ## 00000134 .L80AE05D8: /* 02888 80AE05D8 3C070600 */ lui $a3, 0x0600 ## $a3 = 06000000 /* 0288C 80AE05DC 260B019E */ addiu $t3, $s0, 0x019E ## $t3 = 0000019E /* 02890 80AE05E0 260C021C */ addiu $t4, $s0, 0x021C ## $t4 = 0000021C /* 02894 80AE05E4 240D000C */ addiu $t5, $zero, 0x000C ## $t5 = 0000000C -/* 02898 80AE05E8 AFAD0018 */ sw $t5, 0x0018($sp) -/* 0289C 80AE05EC AFAC0014 */ sw $t4, 0x0014($sp) -/* 028A0 80AE05F0 AFAB0010 */ sw $t3, 0x0010($sp) +/* 02898 80AE05E8 AFAD0018 */ sw $t5, 0x0018($sp) +/* 0289C 80AE05EC AFAC0014 */ sw $t4, 0x0014($sp) +/* 028A0 80AE05F0 AFAB0010 */ sw $t3, 0x0010($sp) /* 028A4 80AE05F4 24E709DC */ addiu $a3, $a3, 0x09DC ## $a3 = 060009DC -/* 028A8 80AE05F8 0C0291BE */ jal func_800A46F8 +/* 028A8 80AE05F8 0C0291BE */ jal SkelAnime_InitSV /* 028AC 80AE05FC 24C66F90 */ addiu $a2, $a2, 0x6F90 ## $a2 = 00006F90 /* 028B0 80AE0600 8E180324 */ lw $t8, 0x0324($s0) ## 00000324 /* 028B4 80AE0604 3C0E80AE */ lui $t6, %hi(func_80AE1148) ## $t6 = 80AE0000 @@ -66,7 +66,7 @@ glabel EnPoh_Update /* 028D4 80AE0624 8479002A */ lh $t9, 0x002A($v1) ## 0000002A /* 028D8 80AE0628 240C0037 */ addiu $t4, $zero, 0x0037 ## $t4 = 00000037 /* 028DC 80AE062C 240D000F */ addiu $t5, $zero, 0x000F ## $t5 = 0000000F -/* 028E0 80AE0630 00194023 */ subu $t0, $zero, $t9 +/* 028E0 80AE0630 00194023 */ subu $t0, $zero, $t9 /* 028E4 80AE0634 A468002A */ sh $t0, 0x002A($v1) ## 0000002A /* 028E8 80AE0638 A6090032 */ sh $t1, 0x0032($s0) ## 00000032 /* 028EC 80AE063C 860A0032 */ lh $t2, 0x0032($s0) ## 00000032 @@ -78,14 +78,14 @@ glabel EnPoh_Update /* 02900 80AE0650 8E0E0004 */ lw $t6, 0x0004($s0) ## 00000004 /* 02904 80AE0654 2401FFEF */ addiu $at, $zero, 0xFFEF ## $at = FFFFFFEF /* 02908 80AE0658 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0290C 80AE065C 01C17824 */ and $t7, $t6, $at -/* 02910 80AE0660 0C2B78F7 */ jal func_80ADE3DC +/* 0290C 80AE065C 01C17824 */ and $t7, $t6, $at +/* 02910 80AE0660 0C2B78F7 */ jal func_80ADE3DC /* 02914 80AE0664 AE0F0004 */ sw $t7, 0x0004($s0) ## 00000004 .L80AE0668: -/* 02918 80AE0668 8FBF002C */ lw $ra, 0x002C($sp) -/* 0291C 80AE066C 8FB00028 */ lw $s0, 0x0028($sp) +/* 02918 80AE0668 8FBF002C */ lw $ra, 0x002C($sp) +/* 0291C 80AE066C 8FB00028 */ lw $s0, 0x0028($sp) /* 02920 80AE0670 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 02924 80AE0674 03E00008 */ jr $ra +/* 02924 80AE0674 03E00008 */ jr $ra /* 02928 80AE0678 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADE114.s b/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADE114.s index dcf8def04f..ed6c65658a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADE114.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADE114.s @@ -1,26 +1,26 @@ glabel func_80ADE114 /* 003C4 80ADE114 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 003C8 80ADE118 AFBF0014 */ sw $ra, 0x0014($sp) +/* 003C8 80ADE118 AFBF0014 */ sw $ra, 0x0014($sp) /* 003CC 80ADE11C 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 /* 003D0 80ADE120 8CCE02A4 */ lw $t6, 0x02A4($a2) ## 000002A4 /* 003D4 80ADE124 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C /* 003D8 80ADE128 8DC5000C */ lw $a1, 0x000C($t6) ## 0000000C -/* 003DC 80ADE12C 0C0294BE */ jal func_800A52F8 -/* 003E0 80ADE130 AFA60018 */ sw $a2, 0x0018($sp) +/* 003DC 80ADE12C 0C0294BE */ jal SkelAnime_ChangeAnimDefaultRepeat +/* 003E0 80ADE130 AFA60018 */ sw $a2, 0x0018($sp) /* 003E4 80ADE134 24040002 */ addiu $a0, $zero, 0x0002 ## $a0 = 00000002 /* 003E8 80ADE138 0C01DF64 */ jal Math_Rand_S16Offset - + /* 003EC 80ADE13C 24050003 */ addiu $a1, $zero, 0x0003 ## $a1 = 00000003 -/* 003F0 80ADE140 8FA60018 */ lw $a2, 0x0018($sp) +/* 003F0 80ADE140 8FA60018 */ lw $a2, 0x0018($sp) /* 003F4 80ADE144 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 /* 003F8 80ADE148 3C0F80AE */ lui $t7, %hi(func_80ADEAC4) ## $t7 = 80AE0000 /* 003FC 80ADE14C 25EFEAC4 */ addiu $t7, $t7, %lo(func_80ADEAC4) ## $t7 = 80ADEAC4 /* 00400 80ADE150 A4C20198 */ sh $v0, 0x0198($a2) ## 00000198 /* 00404 80ADE154 ACCF0190 */ sw $t7, 0x0190($a2) ## 00000190 /* 00408 80ADE158 E4C40068 */ swc1 $f4, 0x0068($a2) ## 00000068 -/* 0040C 80ADE15C 8FBF0014 */ lw $ra, 0x0014($sp) +/* 0040C 80ADE15C 8FBF0014 */ lw $ra, 0x0014($sp) /* 00410 80ADE160 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00414 80ADE164 03E00008 */ jr $ra +/* 00414 80ADE164 03E00008 */ jr $ra /* 00418 80ADE168 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADE16C.s b/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADE16C.s index 3160157ff6..926f84ef92 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADE16C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADE16C.s @@ -1,24 +1,24 @@ glabel func_80ADE16C /* 0041C 80ADE16C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00420 80ADE170 AFBF0014 */ sw $ra, 0x0014($sp) +/* 00420 80ADE170 AFBF0014 */ sw $ra, 0x0014($sp) /* 00424 80ADE174 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 /* 00428 80ADE178 8CCE02A4 */ lw $t6, 0x02A4($a2) ## 000002A4 /* 0042C 80ADE17C 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C /* 00430 80ADE180 8DC50010 */ lw $a1, 0x0010($t6) ## 00000010 -/* 00434 80ADE184 0C0294BE */ jal func_800A52F8 -/* 00438 80ADE188 AFA60018 */ sw $a2, 0x0018($sp) +/* 00434 80ADE184 0C0294BE */ jal SkelAnime_ChangeAnimDefaultRepeat +/* 00438 80ADE188 AFA60018 */ sw $a2, 0x0018($sp) /* 0043C 80ADE18C 2404000F */ addiu $a0, $zero, 0x000F ## $a0 = 0000000F /* 00440 80ADE190 0C01DF64 */ jal Math_Rand_S16Offset - + /* 00444 80ADE194 24050003 */ addiu $a1, $zero, 0x0003 ## $a1 = 00000003 -/* 00448 80ADE198 8FA60018 */ lw $a2, 0x0018($sp) +/* 00448 80ADE198 8FA60018 */ lw $a2, 0x0018($sp) /* 0044C 80ADE19C 3C0F80AE */ lui $t7, %hi(func_80ADEB80) ## $t7 = 80AE0000 /* 00450 80ADE1A0 25EFEB80 */ addiu $t7, $t7, %lo(func_80ADEB80) ## $t7 = 80ADEB80 /* 00454 80ADE1A4 A4C20198 */ sh $v0, 0x0198($a2) ## 00000198 /* 00458 80ADE1A8 ACCF0190 */ sw $t7, 0x0190($a2) ## 00000190 -/* 0045C 80ADE1AC 8FBF0014 */ lw $ra, 0x0014($sp) +/* 0045C 80ADE1AC 8FBF0014 */ lw $ra, 0x0014($sp) /* 00460 80ADE1B0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00464 80ADE1B4 03E00008 */ jr $ra +/* 00464 80ADE1B4 03E00008 */ jr $ra /* 00468 80ADE1B8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADE1BC.s b/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADE1BC.s index 4310ebadff..f4c98700cc 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADE1BC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADE1BC.s @@ -1,13 +1,13 @@ glabel func_80ADE1BC /* 0046C 80ADE1BC 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00470 80ADE1C0 AFBF0014 */ sw $ra, 0x0014($sp) +/* 00470 80ADE1C0 AFBF0014 */ sw $ra, 0x0014($sp) /* 00474 80ADE1C4 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 /* 00478 80ADE1C8 8CCE02A4 */ lw $t6, 0x02A4($a2) ## 000002A4 /* 0047C 80ADE1CC 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C /* 00480 80ADE1D0 8DC50010 */ lw $a1, 0x0010($t6) ## 00000010 -/* 00484 80ADE1D4 0C0294BE */ jal func_800A52F8 -/* 00488 80ADE1D8 AFA60018 */ sw $a2, 0x0018($sp) -/* 0048C 80ADE1DC 8FA60018 */ lw $a2, 0x0018($sp) +/* 00484 80ADE1D4 0C0294BE */ jal SkelAnime_ChangeAnimDefaultRepeat +/* 00488 80ADE1D8 AFA60018 */ sw $a2, 0x0018($sp) +/* 0048C 80ADE1DC 8FA60018 */ lw $a2, 0x0018($sp) /* 00490 80ADE1E0 3C014000 */ lui $at, 0x4000 ## $at = 40000000 /* 00494 80ADE1E4 44812000 */ mtc1 $at, $f4 ## $f4 = 2.00 /* 00498 80ADE1E8 3C0F80AE */ lui $t7, %hi(func_80ADEC9C) ## $t7 = 80AE0000 @@ -15,9 +15,9 @@ glabel func_80ADE1BC /* 004A0 80ADE1F0 ACCF0190 */ sw $t7, 0x0190($a2) ## 00000190 /* 004A4 80ADE1F4 A4C00198 */ sh $zero, 0x0198($a2) ## 00000198 /* 004A8 80ADE1F8 E4C40068 */ swc1 $f4, 0x0068($a2) ## 00000068 -/* 004AC 80ADE1FC 8FBF0014 */ lw $ra, 0x0014($sp) +/* 004AC 80ADE1FC 8FBF0014 */ lw $ra, 0x0014($sp) /* 004B0 80ADE200 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 004B4 80ADE204 03E00008 */ jr $ra +/* 004B4 80ADE204 03E00008 */ jr $ra /* 004B8 80ADE208 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADE20C.s b/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADE20C.s index 68e4fdb7f6..bc19eee158 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADE20C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADE20C.s @@ -1,21 +1,21 @@ glabel func_80ADE20C /* 004BC 80ADE20C 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 004C0 80ADE210 AFBF001C */ sw $ra, 0x001C($sp) -/* 004C4 80ADE214 AFB00018 */ sw $s0, 0x0018($sp) +/* 004C0 80ADE210 AFBF001C */ sw $ra, 0x001C($sp) +/* 004C4 80ADE214 AFB00018 */ sw $s0, 0x0018($sp) /* 004C8 80ADE218 908E0197 */ lbu $t6, 0x0197($a0) ## 00000197 /* 004CC 80ADE21C 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 004D0 80ADE220 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 004D4 80ADE224 15C00008 */ bne $t6, $zero, .L80ADE248 +/* 004D4 80ADE224 15C00008 */ bne $t6, $zero, .L80ADE248 /* 004D8 80ADE228 24A5020C */ addiu $a1, $a1, 0x020C ## $a1 = 0600020C /* 004DC 80ADE22C 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 004E0 80ADE230 24A501A8 */ addiu $a1, $a1, 0x01A8 ## $a1 = 060001A8 /* 004E4 80ADE234 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 004E8 80ADE238 0C0294D3 */ jal func_800A534C +/* 004E8 80ADE238 0C0294D3 */ jal SkelAnime_ChangeAnimTransitionRepeat /* 004EC 80ADE23C 3C06C0C0 */ lui $a2, 0xC0C0 ## $a2 = C0C00000 -/* 004F0 80ADE240 10000004 */ beq $zero, $zero, .L80ADE254 +/* 004F0 80ADE240 10000004 */ beq $zero, $zero, .L80ADE254 /* 004F4 80ADE244 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 .L80ADE248: -/* 004F8 80ADE248 0C0294BE */ jal func_800A52F8 +/* 004F8 80ADE248 0C0294BE */ jal SkelAnime_ChangeAnimDefaultRepeat /* 004FC 80ADE24C 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C /* 00500 80ADE250 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 .L80ADE254: @@ -24,15 +24,15 @@ glabel func_80ADE20C /* 0050C 80ADE25C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 00510 80ADE260 240538EC */ addiu $a1, $zero, 0x38EC ## $a1 = 000038EC /* 00514 80ADE264 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 00518 80ADE268 E6040068 */ swc1 $f4, 0x0068($s0) ## 00000068 /* 0051C 80ADE26C 3C1880AE */ lui $t8, %hi(func_80ADEDFC) ## $t8 = 80AE0000 /* 00520 80ADE270 2718EDFC */ addiu $t8, $t8, %lo(func_80ADEDFC) ## $t8 = 80ADEDFC /* 00524 80ADE274 AE180190 */ sw $t8, 0x0190($s0) ## 00000190 -/* 00528 80ADE278 8FBF001C */ lw $ra, 0x001C($sp) -/* 0052C 80ADE27C 8FB00018 */ lw $s0, 0x0018($sp) +/* 00528 80ADE278 8FBF001C */ lw $ra, 0x001C($sp) +/* 0052C 80ADE27C 8FB00018 */ lw $s0, 0x0018($sp) /* 00530 80ADE280 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 00534 80ADE284 03E00008 */ jr $ra +/* 00534 80ADE284 03E00008 */ jr $ra /* 00538 80ADE288 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADE28C.s b/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADE28C.s index cfb5d38f42..085d9eb6e7 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADE28C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADE28C.s @@ -1,21 +1,21 @@ glabel func_80ADE28C /* 0053C 80ADE28C 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 00540 80ADE290 AFBF0024 */ sw $ra, 0x0024($sp) -/* 00544 80ADE294 AFB00020 */ sw $s0, 0x0020($sp) +/* 00540 80ADE290 AFBF0024 */ sw $ra, 0x0024($sp) +/* 00544 80ADE294 AFB00020 */ sw $s0, 0x0020($sp) /* 00548 80ADE298 908E0197 */ lbu $t6, 0x0197($a0) ## 00000197 /* 0054C 80ADE29C 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 00550 80ADE2A0 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00554 80ADE2A4 15C00008 */ bne $t6, $zero, .L80ADE2C8 +/* 00554 80ADE2A4 15C00008 */ bne $t6, $zero, .L80ADE2C8 /* 00558 80ADE2A8 24A50570 */ addiu $a1, $a1, 0x0570 ## $a1 = 06000570 /* 0055C 80ADE2AC 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 00560 80ADE2B0 24A504EC */ addiu $a1, $a1, 0x04EC ## $a1 = 060004EC /* 00564 80ADE2B4 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 00568 80ADE2B8 0C029490 */ jal func_800A5240 +/* 00568 80ADE2B8 0C029490 */ jal SkelAnime_ChangeAnimTransitionStop /* 0056C 80ADE2BC 3C06C0C0 */ lui $a2, 0xC0C0 ## $a2 = C0C00000 -/* 00570 80ADE2C0 10000004 */ beq $zero, $zero, .L80ADE2D4 +/* 00570 80ADE2C0 10000004 */ beq $zero, $zero, .L80ADE2D4 /* 00574 80ADE2C4 8E0F02F8 */ lw $t7, 0x02F8($s0) ## 000002F8 .L80ADE2C8: -/* 00578 80ADE2C8 0C02947A */ jal func_800A51E8 +/* 00578 80ADE2C8 0C02947A */ jal SkelAnime_ChangeAnimDefaultStop /* 0057C 80ADE2CC 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C /* 00580 80ADE2D0 8E0F02F8 */ lw $t7, 0x02F8($s0) ## 000002F8 .L80ADE2D4: @@ -23,18 +23,18 @@ glabel func_80ADE28C /* 00588 80ADE2D8 3421F824 */ ori $at, $at, 0xF824 ## $at = 0001F824 /* 0058C 80ADE2DC 8DF80000 */ lw $t8, 0x0000($t7) ## 00000000 /* 00590 80ADE2E0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00594 80ADE2E4 0301C824 */ and $t9, $t8, $at -/* 00598 80ADE2E8 13200005 */ beq $t9, $zero, .L80ADE300 +/* 00594 80ADE2E4 0301C824 */ and $t9, $t8, $at +/* 00598 80ADE2E8 13200005 */ beq $t9, $zero, .L80ADE300 /* 0059C 80ADE2EC 00000000 */ nop /* 005A0 80ADE2F0 8E0802C4 */ lw $t0, 0x02C4($s0) ## 000002C4 /* 005A4 80ADE2F4 85090032 */ lh $t1, 0x0032($t0) ## 00000032 -/* 005A8 80ADE2F8 10000006 */ beq $zero, $zero, .L80ADE314 +/* 005A8 80ADE2F8 10000006 */ beq $zero, $zero, .L80ADE314 /* 005AC 80ADE2FC A6090032 */ sh $t1, 0x0032($s0) ## 00000032 .L80ADE300: -/* 005B0 80ADE300 0C00B69E */ jal func_8002DA78 +/* 005B0 80ADE300 0C00B69E */ jal func_8002DA78 /* 005B4 80ADE304 8E0502C4 */ lw $a1, 0x02C4($s0) ## 000002C4 /* 005B8 80ADE308 34018000 */ ori $at, $zero, 0x8000 ## $at = 00008000 -/* 005BC 80ADE30C 00415021 */ addu $t2, $v0, $at +/* 005BC 80ADE30C 00415021 */ addu $t2, $v0, $at /* 005C0 80ADE310 A60A0032 */ sh $t2, 0x0032($s0) ## 00000032 .L80ADE314: /* 005C4 80ADE314 920B02CD */ lbu $t3, 0x02CD($s0) ## 000002CD @@ -44,19 +44,19 @@ glabel func_80ADE28C /* 005D4 80ADE324 A20C02CD */ sb $t4, 0x02CD($s0) ## 000002CD /* 005D8 80ADE328 240D0010 */ addiu $t5, $zero, 0x0010 ## $t5 = 00000010 /* 005DC 80ADE32C E6040068 */ swc1 $f4, 0x0068($s0) ## 00000068 -/* 005E0 80ADE330 AFAD0010 */ sw $t5, 0x0010($sp) +/* 005E0 80ADE330 AFAD0010 */ sw $t5, 0x0010($sp) /* 005E4 80ADE334 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 005E8 80ADE338 24054000 */ addiu $a1, $zero, 0x4000 ## $a1 = 00004000 /* 005EC 80ADE33C 240600FF */ addiu $a2, $zero, 0x00FF ## $a2 = 000000FF -/* 005F0 80ADE340 0C00D09B */ jal func_8003426C +/* 005F0 80ADE340 0C00D09B */ jal func_8003426C /* 005F4 80ADE344 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 /* 005F8 80ADE348 3C0E80AE */ lui $t6, %hi(func_80ADEECC) ## $t6 = 80AE0000 /* 005FC 80ADE34C 25CEEECC */ addiu $t6, $t6, %lo(func_80ADEECC) ## $t6 = 80ADEECC /* 00600 80ADE350 AE0E0190 */ sw $t6, 0x0190($s0) ## 00000190 -/* 00604 80ADE354 8FBF0024 */ lw $ra, 0x0024($sp) -/* 00608 80ADE358 8FB00020 */ lw $s0, 0x0020($sp) +/* 00604 80ADE354 8FBF0024 */ lw $ra, 0x0024($sp) +/* 00608 80ADE358 8FB00020 */ lw $s0, 0x0020($sp) /* 0060C 80ADE35C 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 00610 80ADE360 03E00008 */ jr $ra +/* 00610 80ADE360 03E00008 */ jr $ra /* 00614 80ADE364 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADE368.s b/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADE368.s index 6510bc129e..b1ea036547 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADE368.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADE368.s @@ -1,14 +1,14 @@ glabel func_80ADE368 /* 00618 80ADE368 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 0061C 80ADE36C AFBF0014 */ sw $ra, 0x0014($sp) +/* 0061C 80ADE36C AFBF0014 */ sw $ra, 0x0014($sp) /* 00620 80ADE370 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 /* 00624 80ADE374 8CEE02A4 */ lw $t6, 0x02A4($a3) ## 000002A4 /* 00628 80ADE378 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C /* 0062C 80ADE37C 3C06C0A0 */ lui $a2, 0xC0A0 ## $a2 = C0A00000 /* 00630 80ADE380 8DC50018 */ lw $a1, 0x0018($t6) ## 00000018 -/* 00634 80ADE384 0C0294D3 */ jal func_800A534C -/* 00638 80ADE388 AFA70018 */ sw $a3, 0x0018($sp) -/* 0063C 80ADE38C 8FA70018 */ lw $a3, 0x0018($sp) +/* 00634 80ADE384 0C0294D3 */ jal SkelAnime_ChangeAnimTransitionRepeat +/* 00638 80ADE388 AFA70018 */ sw $a3, 0x0018($sp) +/* 0063C 80ADE38C 8FA70018 */ lw $a3, 0x0018($sp) /* 00640 80ADE390 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 /* 00644 80ADE394 44812000 */ mtc1 $at, $f4 ## $f4 = 5.00 /* 00648 80ADE398 84EF00B6 */ lh $t7, 0x00B6($a3) ## 000000B6 @@ -17,16 +17,16 @@ glabel func_80ADE368 /* 00654 80ADE3A4 3C0A80AE */ lui $t2, %hi(func_80ADF894) ## $t2 = 80AE0000 /* 00658 80ADE3A8 240900C8 */ addiu $t1, $zero, 0x00C8 ## $t1 = 000000C8 /* 0065C 80ADE3AC 254AF894 */ addiu $t2, $t2, %lo(func_80ADF894) ## $t2 = 80ADF894 -/* 00660 80ADE3B0 01E1C021 */ addu $t8, $t7, $at +/* 00660 80ADE3B0 01E1C021 */ addu $t8, $t7, $at /* 00664 80ADE3B4 37280001 */ ori $t0, $t9, 0x0001 ## $t0 = 00000001 /* 00668 80ADE3B8 A4F80032 */ sh $t8, 0x0032($a3) ## 00000032 /* 0066C 80ADE3BC A0E802CD */ sb $t0, 0x02CD($a3) ## 000002CD /* 00670 80ADE3C0 A4E90198 */ sh $t1, 0x0198($a3) ## 00000198 /* 00674 80ADE3C4 ACEA0190 */ sw $t2, 0x0190($a3) ## 00000190 /* 00678 80ADE3C8 E4E40068 */ swc1 $f4, 0x0068($a3) ## 00000068 -/* 0067C 80ADE3CC 8FBF0014 */ lw $ra, 0x0014($sp) +/* 0067C 80ADE3CC 8FBF0014 */ lw $ra, 0x0014($sp) /* 00680 80ADE3D0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00684 80ADE3D4 03E00008 */ jr $ra +/* 00684 80ADE3D4 03E00008 */ jr $ra /* 00688 80ADE3D8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADE3DC.s b/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADE3DC.s index 8d1cdba9df..ed1feb797d 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADE3DC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADE3DC.s @@ -1,51 +1,51 @@ glabel func_80ADE3DC /* 0068C 80ADE3DC 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 00690 80ADE3E0 AFBF001C */ sw $ra, 0x001C($sp) -/* 00694 80ADE3E4 AFB00018 */ sw $s0, 0x0018($sp) +/* 00690 80ADE3E0 AFBF001C */ sw $ra, 0x001C($sp) +/* 00694 80ADE3E4 AFB00018 */ sw $s0, 0x0018($sp) /* 00698 80ADE3E8 8C8E0004 */ lw $t6, 0x0004($a0) ## 00000004 /* 0069C 80ADE3EC 90980197 */ lbu $t8, 0x0197($a0) ## 00000197 /* 006A0 80ADE3F0 2401FFFE */ addiu $at, $zero, 0xFFFE ## $at = FFFFFFFE -/* 006A4 80ADE3F4 01C17824 */ and $t7, $t6, $at +/* 006A4 80ADE3F4 01C17824 */ and $t7, $t6, $at /* 006A8 80ADE3F8 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 006AC 80ADE3FC A080029D */ sb $zero, 0x029D($a0) ## 0000029D -/* 006B0 80ADE400 1700000A */ bne $t8, $zero, .L80ADE42C +/* 006B0 80ADE400 1700000A */ bne $t8, $zero, .L80ADE42C /* 006B4 80ADE404 AC8F0004 */ sw $t7, 0x0004($a0) ## 00000004 /* 006B8 80ADE408 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 006BC 80ADE40C 24A511C4 */ addiu $a1, $a1, 0x11C4 ## $a1 = 060011C4 /* 006C0 80ADE410 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 006C4 80ADE414 0C0294A7 */ jal func_800A529C +/* 006C4 80ADE414 0C0294A7 */ jal SkelAnime_ChangeAnimPlaybackStop /* 006C8 80ADE418 24060000 */ addiu $a2, $zero, 0x0000 ## $a2 = 00000000 /* 006CC 80ADE41C 3C1980AE */ lui $t9, %hi(func_80ADEF38) ## $t9 = 80AE0000 /* 006D0 80ADE420 2739EF38 */ addiu $t9, $t9, %lo(func_80ADEF38) ## $t9 = 80ADEF38 -/* 006D4 80ADE424 10000014 */ beq $zero, $zero, .L80ADE478 +/* 006D4 80ADE424 10000014 */ beq $zero, $zero, .L80ADE478 /* 006D8 80ADE428 AE190190 */ sw $t9, 0x0190($s0) ## 00000190 .L80ADE42C: /* 006DC 80ADE42C 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 006E0 80ADE430 24A50FE4 */ addiu $a1, $a1, 0x0FE4 ## $a1 = 06000FE4 /* 006E4 80ADE434 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C -/* 006E8 80ADE438 0C0294A7 */ jal func_800A529C +/* 006E8 80ADE438 0C0294A7 */ jal SkelAnime_ChangeAnimPlaybackStop /* 006EC 80ADE43C 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 006F0 80ADE440 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 /* 006F4 80ADE444 44813000 */ mtc1 $at, $f6 ## $f6 = 20.00 /* 006F8 80ADE448 C604000C */ lwc1 $f4, 0x000C($s0) ## 0000000C /* 006FC 80ADE44C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 00700 80ADE450 240538EC */ addiu $a1, $zero, 0x38EC ## $a1 = 000038EC -/* 00704 80ADE454 46062200 */ add.s $f8, $f4, $f6 +/* 00704 80ADE454 46062200 */ add.s $f8, $f4, $f6 /* 00708 80ADE458 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 0070C 80ADE45C E6080028 */ swc1 $f8, 0x0028($s0) ## 00000028 /* 00710 80ADE460 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 00714 80ADE464 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 00718 80ADE468 24053873 */ addiu $a1, $zero, 0x3873 ## $a1 = 00003873 /* 0071C 80ADE46C 3C0880AE */ lui $t0, %hi(func_80ADF0B8) ## $t0 = 80AE0000 /* 00720 80ADE470 2508F0B8 */ addiu $t0, $t0, %lo(func_80ADF0B8) ## $t0 = 80ADF0B8 /* 00724 80ADE474 AE080190 */ sw $t0, 0x0190($s0) ## 00000190 .L80ADE478: -/* 00728 80ADE478 8FBF001C */ lw $ra, 0x001C($sp) -/* 0072C 80ADE47C 8FB00018 */ lw $s0, 0x0018($sp) +/* 00728 80ADE478 8FBF001C */ lw $ra, 0x001C($sp) +/* 0072C 80ADE47C 8FB00018 */ lw $s0, 0x0018($sp) /* 00730 80ADE480 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 00734 80ADE484 03E00008 */ jr $ra +/* 00734 80ADE484 03E00008 */ jr $ra /* 00738 80ADE488 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADE4C8.s b/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADE4C8.s index a60a3f2b53..f282d8a1b8 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADE4C8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADE4C8.s @@ -1,22 +1,22 @@ glabel func_80ADE4C8 /* 00778 80ADE4C8 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 0077C 80ADE4CC AFBF0014 */ sw $ra, 0x0014($sp) +/* 0077C 80ADE4CC AFBF0014 */ sw $ra, 0x0014($sp) /* 00780 80ADE4D0 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 /* 00784 80ADE4D4 8CCE02A4 */ lw $t6, 0x02A4($a2) ## 000002A4 /* 00788 80ADE4D8 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C /* 0078C 80ADE4DC 8DC50010 */ lw $a1, 0x0010($t6) ## 00000010 -/* 00790 80ADE4E0 0C02947A */ jal func_800A51E8 -/* 00794 80ADE4E4 AFA60018 */ sw $a2, 0x0018($sp) -/* 00798 80ADE4E8 8FA60018 */ lw $a2, 0x0018($sp) +/* 00790 80ADE4E0 0C02947A */ jal SkelAnime_ChangeAnimDefaultStop +/* 00794 80ADE4E4 AFA60018 */ sw $a2, 0x0018($sp) +/* 00798 80ADE4E8 8FA60018 */ lw $a2, 0x0018($sp) /* 0079C 80ADE4EC 3C01C0A0 */ lui $at, 0xC0A0 ## $at = C0A00000 /* 007A0 80ADE4F0 44812000 */ mtc1 $at, $f4 ## $f4 = -5.00 /* 007A4 80ADE4F4 3C0F80AE */ lui $t7, %hi(func_80ADF574) ## $t7 = 80AE0000 /* 007A8 80ADE4F8 25EFF574 */ addiu $t7, $t7, %lo(func_80ADF574) ## $t7 = 80ADF574 /* 007AC 80ADE4FC ACCF0190 */ sw $t7, 0x0190($a2) ## 00000190 /* 007B0 80ADE500 E4C40068 */ swc1 $f4, 0x0068($a2) ## 00000068 -/* 007B4 80ADE504 8FBF0014 */ lw $ra, 0x0014($sp) +/* 007B4 80ADE504 8FBF0014 */ lw $ra, 0x0014($sp) /* 007B8 80ADE508 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 007BC 80ADE50C 03E00008 */ jr $ra +/* 007BC 80ADE50C 03E00008 */ jr $ra /* 007C0 80ADE510 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADE514.s b/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADE514.s index 7467ce6c71..c0fcbd5c39 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADE514.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80ADE514.s @@ -1,25 +1,25 @@ glabel func_80ADE514 /* 007C4 80ADE514 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 007C8 80ADE518 AFBF0014 */ sw $ra, 0x0014($sp) +/* 007C8 80ADE518 AFBF0014 */ sw $ra, 0x0014($sp) /* 007CC 80ADE51C 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 /* 007D0 80ADE520 8CCE02A4 */ lw $t6, 0x02A4($a2) ## 000002A4 /* 007D4 80ADE524 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C /* 007D8 80ADE528 8DC5000C */ lw $a1, 0x000C($t6) ## 0000000C -/* 007DC 80ADE52C 0C0294BE */ jal func_800A52F8 -/* 007E0 80ADE530 AFA60018 */ sw $a2, 0x0018($sp) -/* 007E4 80ADE534 8FA60018 */ lw $a2, 0x0018($sp) +/* 007DC 80ADE52C 0C0294BE */ jal SkelAnime_ChangeAnimDefaultRepeat +/* 007E0 80ADE530 AFA60018 */ sw $a2, 0x0018($sp) +/* 007E4 80ADE534 8FA60018 */ lw $a2, 0x0018($sp) /* 007E8 80ADE538 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 /* 007EC 80ADE53C 34018000 */ ori $at, $zero, 0x8000 ## $at = 00008000 /* 007F0 80ADE540 84CF0032 */ lh $t7, 0x0032($a2) ## 00000032 /* 007F4 80ADE544 3C1980AE */ lui $t9, %hi(func_80ADF5E0) ## $t9 = 80AE0000 /* 007F8 80ADE548 2739F5E0 */ addiu $t9, $t9, %lo(func_80ADF5E0) ## $t9 = 80ADF5E0 -/* 007FC 80ADE54C 01E1C021 */ addu $t8, $t7, $at +/* 007FC 80ADE54C 01E1C021 */ addu $t8, $t7, $at /* 00800 80ADE550 A4D8019C */ sh $t8, 0x019C($a2) ## 0000019C /* 00804 80ADE554 ACD90190 */ sw $t9, 0x0190($a2) ## 00000190 /* 00808 80ADE558 E4C40068 */ swc1 $f4, 0x0068($a2) ## 00000068 -/* 0080C 80ADE55C 8FBF0014 */ lw $ra, 0x0014($sp) +/* 0080C 80ADE55C 8FBF0014 */ lw $ra, 0x0014($sp) /* 00810 80ADE560 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00814 80ADE564 03E00008 */ jr $ra +/* 00814 80ADE564 03E00008 */ jr $ra /* 00818 80ADE568 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80AE0EE4.s b/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80AE0EE4.s index 471079e69b..ffb4cef57c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80AE0EE4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80AE0EE4.s @@ -1,31 +1,31 @@ glabel func_80AE0EE4 /* 03194 80AE0EE4 27BDFF90 */ addiu $sp, $sp, 0xFF90 ## $sp = FFFFFF90 -/* 03198 80AE0EE8 AFBF002C */ sw $ra, 0x002C($sp) -/* 0319C 80AE0EEC AFB10028 */ sw $s1, 0x0028($sp) -/* 031A0 80AE0EF0 AFB00024 */ sw $s0, 0x0024($sp) -/* 031A4 80AE0EF4 AFA50074 */ sw $a1, 0x0074($sp) +/* 03198 80AE0EE8 AFBF002C */ sw $ra, 0x002C($sp) +/* 0319C 80AE0EEC AFB10028 */ sw $s1, 0x0028($sp) +/* 031A0 80AE0EF0 AFB00024 */ sw $s0, 0x0024($sp) +/* 031A4 80AE0EF4 AFA50074 */ sw $a1, 0x0074($sp) /* 031A8 80AE0EF8 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 /* 031AC 80AE0EFC 00808825 */ or $s1, $a0, $zero ## $s1 = 00000000 /* 031B0 80AE0F00 3C0680AE */ lui $a2, %hi(D_80AE1B90) ## $a2 = 80AE0000 /* 031B4 80AE0F04 24C61B90 */ addiu $a2, $a2, %lo(D_80AE1B90) ## $a2 = 80AE1B90 /* 031B8 80AE0F08 27A40058 */ addiu $a0, $sp, 0x0058 ## $a0 = FFFFFFE8 /* 031BC 80AE0F0C 24070A45 */ addiu $a3, $zero, 0x0A45 ## $a3 = 00000A45 -/* 031C0 80AE0F10 0C031AB1 */ jal func_800C6AC4 +/* 031C0 80AE0F10 0C031AB1 */ jal Graph_OpenDisps /* 031C4 80AE0F14 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 -/* 031C8 80AE0F18 0C2B819F */ jal func_80AE067C +/* 031C8 80AE0F18 0C2B819F */ jal func_80AE067C /* 031CC 80AE0F1C 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 031D0 80AE0F20 8FAF0074 */ lw $t7, 0x0074($sp) -/* 031D4 80AE0F24 0C024F46 */ jal func_80093D18 +/* 031D0 80AE0F20 8FAF0074 */ lw $t7, 0x0074($sp) +/* 031D4 80AE0F24 0C024F46 */ jal func_80093D18 /* 031D8 80AE0F28 8DE40000 */ lw $a0, 0x0000($t7) ## 00000000 -/* 031DC 80AE0F2C 8FB80074 */ lw $t8, 0x0074($sp) -/* 031E0 80AE0F30 0C024F61 */ jal func_80093D84 +/* 031DC 80AE0F2C 8FB80074 */ lw $t8, 0x0074($sp) +/* 031E0 80AE0F30 0C024F61 */ jal func_80093D84 /* 031E4 80AE0F34 8F040000 */ lw $a0, 0x0000($t8) ## 00000000 /* 031E8 80AE0F38 9222029D */ lbu $v0, 0x029D($s1) ## 0000029D /* 031EC 80AE0F3C 240100FF */ addiu $at, $zero, 0x00FF ## $at = 000000FF /* 031F0 80AE0F40 3C08FB00 */ lui $t0, 0xFB00 ## $t0 = FB000000 -/* 031F4 80AE0F44 10410003 */ beq $v0, $at, .L80AE0F54 +/* 031F4 80AE0F44 10410003 */ beq $v0, $at, .L80AE0F54 /* 031F8 80AE0F48 3C188011 */ lui $t8, 0x8011 ## $t8 = 80110000 -/* 031FC 80AE0F4C 14400026 */ bne $v0, $zero, .L80AE0FE8 +/* 031FC 80AE0F4C 14400026 */ bne $v0, $zero, .L80AE0FE8 /* 03200 80AE0F50 3C0AFB00 */ lui $t2, 0xFB00 ## $t2 = FB000000 .L80AE0F54: /* 03204 80AE0F54 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 @@ -38,10 +38,10 @@ glabel func_80AE0EE4 /* 03220 80AE0F70 922A029A */ lbu $t2, 0x029A($s1) ## 0000029A /* 03224 80AE0F74 9239029C */ lbu $t9, 0x029C($s1) ## 0000029C /* 03228 80AE0F78 922C029D */ lbu $t4, 0x029D($s1) ## 0000029D -/* 0322C 80AE0F7C 000D7400 */ sll $t6, $t5, 16 -/* 03230 80AE0F80 000A5E00 */ sll $t3, $t2, 24 +/* 0322C 80AE0F7C 000D7400 */ sll $t6, $t5, 16 +/* 03230 80AE0F80 000A5E00 */ sll $t3, $t2, 24 /* 03234 80AE0F84 016E7825 */ or $t7, $t3, $t6 ## $t7 = 00000000 -/* 03238 80AE0F88 00194200 */ sll $t0, $t9, 8 +/* 03238 80AE0F88 00194200 */ sll $t0, $t9, 8 /* 0323C 80AE0F8C 01E84825 */ or $t1, $t7, $t0 ## $t1 = FB000000 /* 03240 80AE0F90 012C6825 */ or $t5, $t1, $t4 ## $t5 = FB000000 /* 03244 80AE0F94 AC4D0004 */ sw $t5, 0x0004($v0) ## 00000004 @@ -56,14 +56,14 @@ glabel func_80AE0EE4 /* 03268 80AE0FB8 8E250150 */ lw $a1, 0x0150($s1) ## 00000150 /* 0326C 80AE0FBC 3C1980AE */ lui $t9, %hi(func_80AE0CE8) ## $t9 = 80AE0000 /* 03270 80AE0FC0 27390CE8 */ addiu $t9, $t9, %lo(func_80AE0CE8) ## $t9 = 80AE0CE8 -/* 03274 80AE0FC4 AFB90010 */ sw $t9, 0x0010($sp) -/* 03278 80AE0FC8 AFB10014 */ sw $s1, 0x0014($sp) +/* 03274 80AE0FC4 AFB90010 */ sw $t9, 0x0010($sp) +/* 03278 80AE0FC8 AFB10014 */ sw $s1, 0x0014($sp) /* 0327C 80AE0FCC 8E0F02C0 */ lw $t7, 0x02C0($s0) ## 000002C0 -/* 03280 80AE0FD0 8FA40074 */ lw $a0, 0x0074($sp) +/* 03280 80AE0FD0 8FA40074 */ lw $a0, 0x0074($sp) /* 03284 80AE0FD4 24E70BF8 */ addiu $a3, $a3, %lo(func_80AE0BF8) ## $a3 = 80AE0BF8 -/* 03288 80AE0FD8 0C0288A2 */ jal func_800A2288 -/* 0328C 80AE0FDC AFAF0018 */ sw $t7, 0x0018($sp) -/* 03290 80AE0FE0 1000001F */ beq $zero, $zero, .L80AE1060 +/* 03288 80AE0FD8 0C0288A2 */ jal SkelAnime_Draw2 +/* 0328C 80AE0FDC AFAF0018 */ sw $t7, 0x0018($sp) +/* 03290 80AE0FE0 1000001F */ beq $zero, $zero, .L80AE1060 /* 03294 80AE0FE4 AE0202C0 */ sw $v0, 0x02C0($s0) ## 000002C0 .L80AE0FE8: /* 03298 80AE0FE8 8E0302D0 */ lw $v1, 0x02D0($s0) ## 000002D0 @@ -87,14 +87,14 @@ glabel func_80AE0EE4 /* 032E0 80AE1030 8E26016C */ lw $a2, 0x016C($s1) ## 0000016C /* 032E4 80AE1034 8E250150 */ lw $a1, 0x0150($s1) ## 00000150 /* 032E8 80AE1038 27390CE8 */ addiu $t9, $t9, %lo(func_80AE0CE8) ## $t9 = 80AE0CE8 -/* 032EC 80AE103C AFB90010 */ sw $t9, 0x0010($sp) -/* 032F0 80AE1040 AFB10014 */ sw $s1, 0x0014($sp) +/* 032EC 80AE103C AFB90010 */ sw $t9, 0x0010($sp) +/* 032F0 80AE1040 AFB10014 */ sw $s1, 0x0014($sp) /* 032F4 80AE1044 8E0F02D0 */ lw $t7, 0x02D0($s0) ## 000002D0 /* 032F8 80AE1048 3C0780AE */ lui $a3, %hi(func_80AE0BF8) ## $a3 = 80AE0000 /* 032FC 80AE104C 24E70BF8 */ addiu $a3, $a3, %lo(func_80AE0BF8) ## $a3 = 80AE0BF8 -/* 03300 80AE1050 8FA40074 */ lw $a0, 0x0074($sp) -/* 03304 80AE1054 0C0288A2 */ jal func_800A2288 -/* 03308 80AE1058 AFAF0018 */ sw $t7, 0x0018($sp) +/* 03300 80AE1050 8FA40074 */ lw $a0, 0x0074($sp) +/* 03304 80AE1054 0C0288A2 */ jal SkelAnime_Draw2 +/* 03308 80AE1058 AFAF0018 */ sw $t7, 0x0018($sp) /* 0330C 80AE105C AE0202D0 */ sw $v0, 0x02D0($s0) ## 000002D0 .L80AE1060: /* 03310 80AE1060 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 @@ -112,13 +112,13 @@ glabel func_80AE0EE4 /* 03340 80AE1090 9239029F */ lbu $t9, 0x029F($s1) ## 0000029F /* 03344 80AE1094 922B029E */ lbu $t3, 0x029E($s1) ## 0000029E /* 03348 80AE1098 922902A0 */ lbu $t1, 0x02A0($s1) ## 000002A0 -/* 0334C 80AE109C 00197C00 */ sll $t7, $t9, 16 -/* 03350 80AE10A0 000B7600 */ sll $t6, $t3, 24 +/* 0334C 80AE109C 00197C00 */ sll $t7, $t9, 16 +/* 03350 80AE10A0 000B7600 */ sll $t6, $t3, 24 /* 03354 80AE10A4 01CF4025 */ or $t0, $t6, $t7 ## $t0 = 00000000 -/* 03358 80AE10A8 00096200 */ sll $t4, $t1, 8 +/* 03358 80AE10A8 00096200 */ sll $t4, $t1, 8 /* 0335C 80AE10AC 010C6825 */ or $t5, $t0, $t4 ## $t5 = FB000000 /* 03360 80AE10B0 35AB00FF */ ori $t3, $t5, 0x00FF ## $t3 = FB0000FF -/* 03364 80AE10B4 0C03423F */ jal Matrix_Put +/* 03364 80AE10B4 0C03423F */ jal Matrix_Put /* 03368 80AE10B8 AC4B0004 */ sw $t3, 0x0004($v0) ## 00000004 /* 0336C 80AE10BC 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 /* 03370 80AE10C0 3C19DA38 */ lui $t9, 0xDA38 ## $t9 = DA380000 @@ -126,14 +126,14 @@ glabel func_80AE0EE4 /* 03378 80AE10C8 24580008 */ addiu $t8, $v0, 0x0008 ## $t8 = 00000008 /* 0337C 80AE10CC AE1802C0 */ sw $t8, 0x02C0($s0) ## 000002C0 /* 03380 80AE10D0 AC590000 */ sw $t9, 0x0000($v0) ## 00000000 -/* 03384 80AE10D4 8FAE0074 */ lw $t6, 0x0074($sp) +/* 03384 80AE10D4 8FAE0074 */ lw $t6, 0x0074($sp) /* 03388 80AE10D8 3C0580AE */ lui $a1, %hi(D_80AE1BA0) ## $a1 = 80AE0000 /* 0338C 80AE10DC 24A51BA0 */ addiu $a1, $a1, %lo(D_80AE1BA0) ## $a1 = 80AE1BA0 /* 03390 80AE10E0 8DC40000 */ lw $a0, 0x0000($t6) ## 00000000 /* 03394 80AE10E4 24060A74 */ addiu $a2, $zero, 0x0A74 ## $a2 = 00000A74 -/* 03398 80AE10E8 0C0346A2 */ jal Matrix_NewMtx -/* 0339C 80AE10EC AFA2003C */ sw $v0, 0x003C($sp) -/* 033A0 80AE10F0 8FA3003C */ lw $v1, 0x003C($sp) +/* 03398 80AE10E8 0C0346A2 */ jal Matrix_NewMtx +/* 0339C 80AE10EC AFA2003C */ sw $v0, 0x003C($sp) +/* 033A0 80AE10F0 8FA3003C */ lw $v1, 0x003C($sp) /* 033A4 80AE10F4 3C0ADE00 */ lui $t2, 0xDE00 ## $t2 = DE000000 /* 033A8 80AE10F8 3C0680AE */ lui $a2, %hi(D_80AE1BB0) ## $a2 = 80AE0000 /* 033AC 80AE10FC AC620004 */ sw $v0, 0x0004($v1) ## 00000004 @@ -147,13 +147,13 @@ glabel func_80AE0EE4 /* 033CC 80AE111C 24070A79 */ addiu $a3, $zero, 0x0A79 ## $a3 = 00000A79 /* 033D0 80AE1120 8D28001C */ lw $t0, 0x001C($t1) ## 0000001C /* 033D4 80AE1124 AC480004 */ sw $t0, 0x0004($v0) ## 00000004 -/* 033D8 80AE1128 8FAC0074 */ lw $t4, 0x0074($sp) -/* 033DC 80AE112C 0C031AD5 */ jal func_800C6B54 +/* 033D8 80AE1128 8FAC0074 */ lw $t4, 0x0074($sp) +/* 033DC 80AE112C 0C031AD5 */ jal Graph_CloseDisps /* 033E0 80AE1130 8D850000 */ lw $a1, 0x0000($t4) ## 00000000 -/* 033E4 80AE1134 8FBF002C */ lw $ra, 0x002C($sp) -/* 033E8 80AE1138 8FB00024 */ lw $s0, 0x0024($sp) -/* 033EC 80AE113C 8FB10028 */ lw $s1, 0x0028($sp) -/* 033F0 80AE1140 03E00008 */ jr $ra +/* 033E4 80AE1134 8FBF002C */ lw $ra, 0x002C($sp) +/* 033E8 80AE1138 8FB00024 */ lw $s0, 0x0024($sp) +/* 033EC 80AE113C 8FB10028 */ lw $s1, 0x0028($sp) +/* 033F0 80AE1140 03E00008 */ jr $ra /* 033F4 80AE1144 27BD0070 */ addiu $sp, $sp, 0x0070 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80AE1148.s b/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80AE1148.s index 7037de46d8..3c38df862f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80AE1148.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80AE1148.s @@ -1,85 +1,85 @@ glabel func_80AE1148 /* 033F8 80AE1148 27BDFF68 */ addiu $sp, $sp, 0xFF68 ## $sp = FFFFFF68 -/* 033FC 80AE114C AFBF002C */ sw $ra, 0x002C($sp) -/* 03400 80AE1150 AFB10028 */ sw $s1, 0x0028($sp) -/* 03404 80AE1154 AFB00024 */ sw $s0, 0x0024($sp) -/* 03408 80AE1158 AFA5009C */ sw $a1, 0x009C($sp) +/* 033FC 80AE114C AFBF002C */ sw $ra, 0x002C($sp) +/* 03400 80AE1150 AFB10028 */ sw $s1, 0x0028($sp) +/* 03404 80AE1154 AFB00024 */ sw $s0, 0x0024($sp) +/* 03408 80AE1158 AFA5009C */ sw $a1, 0x009C($sp) /* 0340C 80AE115C 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 /* 03410 80AE1160 00808825 */ or $s1, $a0, $zero ## $s1 = 00000000 /* 03414 80AE1164 3C0680AE */ lui $a2, %hi(D_80AE1BC0) ## $a2 = 80AE0000 /* 03418 80AE1168 24C61BC0 */ addiu $a2, $a2, %lo(D_80AE1BC0) ## $a2 = 80AE1BC0 /* 0341C 80AE116C 27A40078 */ addiu $a0, $sp, 0x0078 ## $a0 = FFFFFFE0 /* 03420 80AE1170 24070A86 */ addiu $a3, $zero, 0x0A86 ## $a3 = 00000A86 -/* 03424 80AE1174 0C031AB1 */ jal func_800C6AC4 +/* 03424 80AE1174 0C031AB1 */ jal Graph_OpenDisps /* 03428 80AE1178 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 -/* 0342C 80AE117C 0C2B819F */ jal func_80AE067C +/* 0342C 80AE117C 0C2B819F */ jal func_80AE067C /* 03430 80AE1180 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 03434 80AE1184 862F001C */ lh $t7, 0x001C($s1) ## 0000001C /* 03438 80AE1188 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 /* 0343C 80AE118C 3C1980AE */ lui $t9, %hi(D_80AE1B50) ## $t9 = 80AE0000 -/* 03440 80AE1190 15E10007 */ bne $t7, $at, .L80AE11B0 +/* 03440 80AE1190 15E10007 */ bne $t7, $at, .L80AE11B0 /* 03444 80AE1194 27391B50 */ addiu $t9, $t9, %lo(D_80AE1B50) ## $t9 = 80AE1B50 /* 03448 80AE1198 3C1880AE */ lui $t8, %hi(D_80AE1B4C) ## $t8 = 80AE0000 /* 0344C 80AE119C 27181B4C */ addiu $t8, $t8, %lo(D_80AE1B4C) ## $t8 = 80AE1B4C /* 03450 80AE11A0 3C0880AE */ lui $t0, %hi(D_80AE1B54) ## $t0 = 80AE0000 -/* 03454 80AE11A4 AFB80090 */ sw $t8, 0x0090($sp) -/* 03458 80AE11A8 10000004 */ beq $zero, $zero, .L80AE11BC +/* 03454 80AE11A4 AFB80090 */ sw $t8, 0x0090($sp) +/* 03458 80AE11A8 10000004 */ beq $zero, $zero, .L80AE11BC /* 0345C 80AE11AC 25081B54 */ addiu $t0, $t0, %lo(D_80AE1B54) ## $t0 = 80AE1B54 .L80AE11B0: /* 03460 80AE11B0 3C0880AE */ lui $t0, %hi(D_80AE1B58) ## $t0 = 80AE0000 -/* 03464 80AE11B4 AFB90090 */ sw $t9, 0x0090($sp) +/* 03464 80AE11B4 AFB90090 */ sw $t9, 0x0090($sp) /* 03468 80AE11B8 25081B58 */ addiu $t0, $t0, %lo(D_80AE1B58) ## $t0 = 80AE1B58 .L80AE11BC: /* 0346C 80AE11BC 9222029D */ lbu $v0, 0x029D($s1) ## 0000029D /* 03470 80AE11C0 240100FF */ addiu $at, $zero, 0x00FF ## $at = 000000FF -/* 03474 80AE11C4 8FAA009C */ lw $t2, 0x009C($sp) -/* 03478 80AE11C8 50410004 */ beql $v0, $at, .L80AE11DC +/* 03474 80AE11C4 8FAA009C */ lw $t2, 0x009C($sp) +/* 03478 80AE11C8 50410004 */ beql $v0, $at, .L80AE11DC /* 0347C 80AE11CC 8D440000 */ lw $a0, 0x0000($t2) ## 00000000 -/* 03480 80AE11D0 14400056 */ bne $v0, $zero, .L80AE132C -/* 03484 80AE11D4 8FAD009C */ lw $t5, 0x009C($sp) +/* 03480 80AE11D0 14400056 */ bne $v0, $zero, .L80AE132C +/* 03484 80AE11D4 8FAD009C */ lw $t5, 0x009C($sp) /* 03488 80AE11D8 8D440000 */ lw $a0, 0x0000($t2) ## 00000000 .L80AE11DC: -/* 0348C 80AE11DC 0C024F46 */ jal func_80093D18 -/* 03490 80AE11E0 AFA8008C */ sw $t0, 0x008C($sp) +/* 0348C 80AE11DC 0C024F46 */ jal func_80093D18 +/* 03490 80AE11E0 AFA8008C */ sw $t0, 0x008C($sp) /* 03494 80AE11E4 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 -/* 03498 80AE11E8 8FA8008C */ lw $t0, 0x008C($sp) +/* 03498 80AE11E8 8FA8008C */ lw $t0, 0x008C($sp) /* 0349C 80AE11EC 3C0CDB06 */ lui $t4, 0xDB06 ## $t4 = DB060000 /* 034A0 80AE11F0 244B0008 */ addiu $t3, $v0, 0x0008 ## $t3 = 00000008 /* 034A4 80AE11F4 AE0B02C0 */ sw $t3, 0x02C0($s0) ## 000002C0 /* 034A8 80AE11F8 358C0020 */ ori $t4, $t4, 0x0020 ## $t4 = DB060020 /* 034AC 80AE11FC AC4C0000 */ sw $t4, 0x0000($v0) ## 00000000 -/* 034B0 80AE1200 8FAD009C */ lw $t5, 0x009C($sp) +/* 034B0 80AE1200 8FAD009C */ lw $t5, 0x009C($sp) /* 034B4 80AE1204 922E029D */ lbu $t6, 0x029D($s1) ## 0000029D /* 034B8 80AE1208 9227029C */ lbu $a3, 0x029C($s1) ## 0000029C /* 034BC 80AE120C 9226029B */ lbu $a2, 0x029B($s1) ## 0000029B /* 034C0 80AE1210 9225029A */ lbu $a1, 0x029A($s1) ## 0000029A /* 034C4 80AE1214 8DA40000 */ lw $a0, 0x0000($t5) ## 00000000 -/* 034C8 80AE1218 AFA20074 */ sw $v0, 0x0074($sp) -/* 034CC 80AE121C AFA8008C */ sw $t0, 0x008C($sp) -/* 034D0 80AE1220 0C025474 */ jal func_800951D0 -/* 034D4 80AE1224 AFAE0010 */ sw $t6, 0x0010($sp) -/* 034D8 80AE1228 8FA30074 */ lw $v1, 0x0074($sp) -/* 034DC 80AE122C 8FA8008C */ lw $t0, 0x008C($sp) +/* 034C8 80AE1218 AFA20074 */ sw $v0, 0x0074($sp) +/* 034CC 80AE121C AFA8008C */ sw $t0, 0x008C($sp) +/* 034D0 80AE1220 0C025474 */ jal Gfx_EnvColor +/* 034D4 80AE1224 AFAE0010 */ sw $t6, 0x0010($sp) +/* 034D8 80AE1228 8FA30074 */ lw $v1, 0x0074($sp) +/* 034DC 80AE122C 8FA8008C */ lw $t0, 0x008C($sp) /* 034E0 80AE1230 3C18DB06 */ lui $t8, 0xDB06 ## $t8 = DB060000 /* 034E4 80AE1234 AC620004 */ sw $v0, 0x0004($v1) ## 00000004 /* 034E8 80AE1238 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 -/* 034EC 80AE123C 8FA90090 */ lw $t1, 0x0090($sp) +/* 034EC 80AE123C 8FA90090 */ lw $t1, 0x0090($sp) /* 034F0 80AE1240 37180028 */ ori $t8, $t8, 0x0028 ## $t8 = DB060028 /* 034F4 80AE1244 244F0008 */ addiu $t7, $v0, 0x0008 ## $t7 = 00000008 /* 034F8 80AE1248 AE0F02C0 */ sw $t7, 0x02C0($s0) ## 000002C0 /* 034FC 80AE124C AC580000 */ sw $t8, 0x0000($v0) ## 00000000 -/* 03500 80AE1250 8FB9009C */ lw $t9, 0x009C($sp) +/* 03500 80AE1250 8FB9009C */ lw $t9, 0x009C($sp) /* 03504 80AE1254 922A029D */ lbu $t2, 0x029D($s1) ## 0000029D /* 03508 80AE1258 91270002 */ lbu $a3, 0x0002($t1) ## 00000002 /* 0350C 80AE125C 91260001 */ lbu $a2, 0x0001($t1) ## 00000001 /* 03510 80AE1260 91250000 */ lbu $a1, 0x0000($t1) ## 00000000 /* 03514 80AE1264 8F240000 */ lw $a0, 0x0000($t9) ## 00000000 -/* 03518 80AE1268 AFA8008C */ sw $t0, 0x008C($sp) -/* 0351C 80AE126C AFA20070 */ sw $v0, 0x0070($sp) -/* 03520 80AE1270 0C025474 */ jal func_800951D0 -/* 03524 80AE1274 AFAA0010 */ sw $t2, 0x0010($sp) -/* 03528 80AE1278 8FA30070 */ lw $v1, 0x0070($sp) -/* 0352C 80AE127C 8FA8008C */ lw $t0, 0x008C($sp) +/* 03518 80AE1268 AFA8008C */ sw $t0, 0x008C($sp) +/* 0351C 80AE126C AFA20070 */ sw $v0, 0x0070($sp) +/* 03520 80AE1270 0C025474 */ jal Gfx_EnvColor +/* 03524 80AE1274 AFAA0010 */ sw $t2, 0x0010($sp) +/* 03528 80AE1278 8FA30070 */ lw $v1, 0x0070($sp) +/* 0352C 80AE127C 8FA8008C */ lw $t0, 0x008C($sp) /* 03530 80AE1280 3C0CDB06 */ lui $t4, 0xDB06 ## $t4 = DB060000 /* 03534 80AE1284 AC620004 */ sw $v0, 0x0004($v1) ## 00000004 /* 03538 80AE1288 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 @@ -87,16 +87,16 @@ glabel func_80AE1148 /* 03540 80AE1290 244B0008 */ addiu $t3, $v0, 0x0008 ## $t3 = 00000008 /* 03544 80AE1294 AE0B02C0 */ sw $t3, 0x02C0($s0) ## 000002C0 /* 03548 80AE1298 AC4C0000 */ sw $t4, 0x0000($v0) ## 00000000 -/* 0354C 80AE129C 8FAD009C */ lw $t5, 0x009C($sp) +/* 0354C 80AE129C 8FAD009C */ lw $t5, 0x009C($sp) /* 03550 80AE12A0 922E029D */ lbu $t6, 0x029D($s1) ## 0000029D /* 03554 80AE12A4 91070002 */ lbu $a3, 0x0002($t0) ## 00000002 /* 03558 80AE12A8 91060001 */ lbu $a2, 0x0001($t0) ## 00000001 /* 0355C 80AE12AC 91050000 */ lbu $a1, 0x0000($t0) ## 00000000 /* 03560 80AE12B0 8DA40000 */ lw $a0, 0x0000($t5) ## 00000000 -/* 03564 80AE12B4 AFA2006C */ sw $v0, 0x006C($sp) -/* 03568 80AE12B8 0C025474 */ jal func_800951D0 -/* 0356C 80AE12BC AFAE0010 */ sw $t6, 0x0010($sp) -/* 03570 80AE12C0 8FA3006C */ lw $v1, 0x006C($sp) +/* 03564 80AE12B4 AFA2006C */ sw $v0, 0x006C($sp) +/* 03568 80AE12B8 0C025474 */ jal Gfx_EnvColor +/* 0356C 80AE12BC AFAE0010 */ sw $t6, 0x0010($sp) +/* 03570 80AE12C0 8FA3006C */ lw $v1, 0x006C($sp) /* 03574 80AE12C4 3C18DB06 */ lui $t8, 0xDB06 ## $t8 = DB060000 /* 03578 80AE12C8 3C198011 */ lui $t9, 0x8011 ## $t9 = 80110000 /* 0357C 80AE12CC AC620004 */ sw $v0, 0x0004($v1) ## 00000004 @@ -114,41 +114,41 @@ glabel func_80AE1148 /* 035AC 80AE12FC 3C0B80AE */ lui $t3, %hi(func_80AE0CE8) ## $t3 = 80AE0000 /* 035B0 80AE1300 256B0CE8 */ addiu $t3, $t3, %lo(func_80AE0CE8) ## $t3 = 80AE0CE8 /* 035B4 80AE1304 254A0BF8 */ addiu $t2, $t2, %lo(func_80AE0BF8) ## $t2 = 80AE0BF8 -/* 035B8 80AE1308 AFAA0010 */ sw $t2, 0x0010($sp) -/* 035BC 80AE130C AFAB0014 */ sw $t3, 0x0014($sp) -/* 035C0 80AE1310 AFB10018 */ sw $s1, 0x0018($sp) +/* 035B8 80AE1308 AFAA0010 */ sw $t2, 0x0010($sp) +/* 035BC 80AE130C AFAB0014 */ sw $t3, 0x0014($sp) +/* 035C0 80AE1310 AFB10018 */ sw $s1, 0x0018($sp) /* 035C4 80AE1314 8E0C02C0 */ lw $t4, 0x02C0($s0) ## 000002C0 -/* 035C8 80AE1318 8FA4009C */ lw $a0, 0x009C($sp) -/* 035CC 80AE131C 0C0289CF */ jal func_800A273C -/* 035D0 80AE1320 AFAC001C */ sw $t4, 0x001C($sp) -/* 035D4 80AE1324 10000058 */ beq $zero, $zero, .L80AE1488 +/* 035C8 80AE1318 8FA4009C */ lw $a0, 0x009C($sp) +/* 035CC 80AE131C 0C0289CF */ jal SkelAnime_DrawSV2 +/* 035D0 80AE1320 AFAC001C */ sw $t4, 0x001C($sp) +/* 035D4 80AE1324 10000058 */ beq $zero, $zero, .L80AE1488 /* 035D8 80AE1328 AE0202C0 */ sw $v0, 0x02C0($s0) ## 000002C0 .L80AE132C: /* 035DC 80AE132C 8DA40000 */ lw $a0, 0x0000($t5) ## 00000000 -/* 035E0 80AE1330 0C024F46 */ jal func_80093D18 -/* 035E4 80AE1334 AFA8008C */ sw $t0, 0x008C($sp) -/* 035E8 80AE1338 8FAE009C */ lw $t6, 0x009C($sp) -/* 035EC 80AE133C 0C024F61 */ jal func_80093D84 +/* 035E0 80AE1330 0C024F46 */ jal func_80093D18 +/* 035E4 80AE1334 AFA8008C */ sw $t0, 0x008C($sp) +/* 035E8 80AE1338 8FAE009C */ lw $t6, 0x009C($sp) +/* 035EC 80AE133C 0C024F61 */ jal func_80093D84 /* 035F0 80AE1340 8DC40000 */ lw $a0, 0x0000($t6) ## 00000000 /* 035F4 80AE1344 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 035F8 80AE1348 8FA8008C */ lw $t0, 0x008C($sp) +/* 035F8 80AE1348 8FA8008C */ lw $t0, 0x008C($sp) /* 035FC 80AE134C 3C18DB06 */ lui $t8, 0xDB06 ## $t8 = DB060000 /* 03600 80AE1350 244F0008 */ addiu $t7, $v0, 0x0008 ## $t7 = 00000008 /* 03604 80AE1354 AE0F02D0 */ sw $t7, 0x02D0($s0) ## 000002D0 /* 03608 80AE1358 37180020 */ ori $t8, $t8, 0x0020 ## $t8 = DB060020 /* 0360C 80AE135C AC580000 */ sw $t8, 0x0000($v0) ## 00000000 -/* 03610 80AE1360 8FB9009C */ lw $t9, 0x009C($sp) +/* 03610 80AE1360 8FB9009C */ lw $t9, 0x009C($sp) /* 03614 80AE1364 922A029D */ lbu $t2, 0x029D($s1) ## 0000029D /* 03618 80AE1368 9227029C */ lbu $a3, 0x029C($s1) ## 0000029C /* 0361C 80AE136C 9226029B */ lbu $a2, 0x029B($s1) ## 0000029B /* 03620 80AE1370 9225029A */ lbu $a1, 0x029A($s1) ## 0000029A /* 03624 80AE1374 8F240000 */ lw $a0, 0x0000($t9) ## 00000000 -/* 03628 80AE1378 AFA20064 */ sw $v0, 0x0064($sp) -/* 0362C 80AE137C AFA8008C */ sw $t0, 0x008C($sp) -/* 03630 80AE1380 0C025474 */ jal func_800951D0 -/* 03634 80AE1384 AFAA0010 */ sw $t2, 0x0010($sp) -/* 03638 80AE1388 8FA30064 */ lw $v1, 0x0064($sp) -/* 0363C 80AE138C 8FA8008C */ lw $t0, 0x008C($sp) +/* 03628 80AE1378 AFA20064 */ sw $v0, 0x0064($sp) +/* 0362C 80AE137C AFA8008C */ sw $t0, 0x008C($sp) +/* 03630 80AE1380 0C025474 */ jal Gfx_EnvColor +/* 03634 80AE1384 AFAA0010 */ sw $t2, 0x0010($sp) +/* 03638 80AE1388 8FA30064 */ lw $v1, 0x0064($sp) +/* 0363C 80AE138C 8FA8008C */ lw $t0, 0x008C($sp) /* 03640 80AE1390 3C0CDB06 */ lui $t4, 0xDB06 ## $t4 = DB060000 /* 03644 80AE1394 AC620004 */ sw $v0, 0x0004($v1) ## 00000004 /* 03648 80AE1398 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 @@ -156,19 +156,19 @@ glabel func_80AE1148 /* 03650 80AE13A0 244B0008 */ addiu $t3, $v0, 0x0008 ## $t3 = 00000008 /* 03654 80AE13A4 AE0B02D0 */ sw $t3, 0x02D0($s0) ## 000002D0 /* 03658 80AE13A8 AC4C0000 */ sw $t4, 0x0000($v0) ## 00000000 -/* 0365C 80AE13AC 8FAE0090 */ lw $t6, 0x0090($sp) -/* 03660 80AE13B0 8FAD009C */ lw $t5, 0x009C($sp) +/* 0365C 80AE13AC 8FAE0090 */ lw $t6, 0x0090($sp) +/* 03660 80AE13B0 8FAD009C */ lw $t5, 0x009C($sp) /* 03664 80AE13B4 922F029D */ lbu $t7, 0x029D($s1) ## 0000029D /* 03668 80AE13B8 91C50000 */ lbu $a1, 0x0000($t6) ## 00000000 /* 0366C 80AE13BC 91C60001 */ lbu $a2, 0x0001($t6) ## 00000001 /* 03670 80AE13C0 91C70002 */ lbu $a3, 0x0002($t6) ## 00000002 /* 03674 80AE13C4 8DA40000 */ lw $a0, 0x0000($t5) ## 00000000 -/* 03678 80AE13C8 AFA8008C */ sw $t0, 0x008C($sp) -/* 0367C 80AE13CC AFA20060 */ sw $v0, 0x0060($sp) -/* 03680 80AE13D0 0C025474 */ jal func_800951D0 -/* 03684 80AE13D4 AFAF0010 */ sw $t7, 0x0010($sp) -/* 03688 80AE13D8 8FA30060 */ lw $v1, 0x0060($sp) -/* 0368C 80AE13DC 8FA8008C */ lw $t0, 0x008C($sp) +/* 03678 80AE13C8 AFA8008C */ sw $t0, 0x008C($sp) +/* 0367C 80AE13CC AFA20060 */ sw $v0, 0x0060($sp) +/* 03680 80AE13D0 0C025474 */ jal Gfx_EnvColor +/* 03684 80AE13D4 AFAF0010 */ sw $t7, 0x0010($sp) +/* 03688 80AE13D8 8FA30060 */ lw $v1, 0x0060($sp) +/* 0368C 80AE13DC 8FA8008C */ lw $t0, 0x008C($sp) /* 03690 80AE13E0 3C19DB06 */ lui $t9, 0xDB06 ## $t9 = DB060000 /* 03694 80AE13E4 AC620004 */ sw $v0, 0x0004($v1) ## 00000004 /* 03698 80AE13E8 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 @@ -176,16 +176,16 @@ glabel func_80AE1148 /* 036A0 80AE13F0 24580008 */ addiu $t8, $v0, 0x0008 ## $t8 = 00000008 /* 036A4 80AE13F4 AE1802D0 */ sw $t8, 0x02D0($s0) ## 000002D0 /* 036A8 80AE13F8 AC590000 */ sw $t9, 0x0000($v0) ## 00000000 -/* 036AC 80AE13FC 8FAA009C */ lw $t2, 0x009C($sp) +/* 036AC 80AE13FC 8FAA009C */ lw $t2, 0x009C($sp) /* 036B0 80AE1400 922B029D */ lbu $t3, 0x029D($s1) ## 0000029D /* 036B4 80AE1404 91070002 */ lbu $a3, 0x0002($t0) ## 00000002 /* 036B8 80AE1408 91060001 */ lbu $a2, 0x0001($t0) ## 00000001 /* 036BC 80AE140C 91050000 */ lbu $a1, 0x0000($t0) ## 00000000 /* 036C0 80AE1410 8D440000 */ lw $a0, 0x0000($t2) ## 00000000 -/* 036C4 80AE1414 AFA2005C */ sw $v0, 0x005C($sp) -/* 036C8 80AE1418 0C025474 */ jal func_800951D0 -/* 036CC 80AE141C AFAB0010 */ sw $t3, 0x0010($sp) -/* 036D0 80AE1420 8FA3005C */ lw $v1, 0x005C($sp) +/* 036C4 80AE1414 AFA2005C */ sw $v0, 0x005C($sp) +/* 036C8 80AE1418 0C025474 */ jal Gfx_EnvColor +/* 036CC 80AE141C AFAB0010 */ sw $t3, 0x0010($sp) +/* 036D0 80AE1420 8FA3005C */ lw $v1, 0x005C($sp) /* 036D4 80AE1424 3C0DDB06 */ lui $t5, 0xDB06 ## $t5 = DB060000 /* 036D8 80AE1428 3C0E8011 */ lui $t6, 0x8011 ## $t6 = 80110000 /* 036DC 80AE142C AC620004 */ sw $v0, 0x0004($v1) ## 00000004 @@ -203,13 +203,13 @@ glabel func_80AE1148 /* 0370C 80AE145C 3C1880AE */ lui $t8, %hi(func_80AE0CE8) ## $t8 = 80AE0000 /* 03710 80AE1460 27180CE8 */ addiu $t8, $t8, %lo(func_80AE0CE8) ## $t8 = 80AE0CE8 /* 03714 80AE1464 25EF0BF8 */ addiu $t7, $t7, %lo(func_80AE0BF8) ## $t7 = 80AE0BF8 -/* 03718 80AE1468 AFAF0010 */ sw $t7, 0x0010($sp) -/* 0371C 80AE146C AFB80014 */ sw $t8, 0x0014($sp) -/* 03720 80AE1470 AFB10018 */ sw $s1, 0x0018($sp) +/* 03718 80AE1468 AFAF0010 */ sw $t7, 0x0010($sp) +/* 0371C 80AE146C AFB80014 */ sw $t8, 0x0014($sp) +/* 03720 80AE1470 AFB10018 */ sw $s1, 0x0018($sp) /* 03724 80AE1474 8E1902D0 */ lw $t9, 0x02D0($s0) ## 000002D0 -/* 03728 80AE1478 8FA4009C */ lw $a0, 0x009C($sp) -/* 0372C 80AE147C 0C0289CF */ jal func_800A273C -/* 03730 80AE1480 AFB9001C */ sw $t9, 0x001C($sp) +/* 03728 80AE1478 8FA4009C */ lw $a0, 0x009C($sp) +/* 0372C 80AE147C 0C0289CF */ jal SkelAnime_DrawSV2 +/* 03730 80AE1480 AFB9001C */ sw $t9, 0x001C($sp) /* 03734 80AE1484 AE0202D0 */ sw $v0, 0x02D0($s0) ## 000002D0 .L80AE1488: /* 03738 80AE1488 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 @@ -227,13 +227,13 @@ glabel func_80AE1148 /* 03768 80AE14B8 922F029E */ lbu $t7, 0x029E($s1) ## 0000029E /* 0376C 80AE14BC 922A029F */ lbu $t2, 0x029F($s1) ## 0000029F /* 03770 80AE14C0 922E02A0 */ lbu $t6, 0x02A0($s1) ## 000002A0 -/* 03774 80AE14C4 000FC600 */ sll $t8, $t7, 24 -/* 03778 80AE14C8 000A5C00 */ sll $t3, $t2, 16 +/* 03774 80AE14C4 000FC600 */ sll $t8, $t7, 24 +/* 03778 80AE14C8 000A5C00 */ sll $t3, $t2, 16 /* 0377C 80AE14CC 030B6025 */ or $t4, $t8, $t3 ## $t4 = E7000000 -/* 03780 80AE14D0 000E7A00 */ sll $t7, $t6, 8 +/* 03780 80AE14D0 000E7A00 */ sll $t7, $t6, 8 /* 03784 80AE14D4 018FC825 */ or $t9, $t4, $t7 ## $t9 = E7000000 /* 03788 80AE14D8 372A00FF */ ori $t2, $t9, 0x00FF ## $t2 = E70000FF -/* 0378C 80AE14DC 0C03423F */ jal Matrix_Put +/* 0378C 80AE14DC 0C03423F */ jal Matrix_Put /* 03790 80AE14E0 AC4A0004 */ sw $t2, 0x0004($v0) ## 00000004 /* 03794 80AE14E4 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 /* 03798 80AE14E8 3C0BDA38 */ lui $t3, 0xDA38 ## $t3 = DA380000 @@ -241,14 +241,14 @@ glabel func_80AE1148 /* 037A0 80AE14F0 24580008 */ addiu $t8, $v0, 0x0008 ## $t8 = 00000008 /* 037A4 80AE14F4 AE1802C0 */ sw $t8, 0x02C0($s0) ## 000002C0 /* 037A8 80AE14F8 AC4B0000 */ sw $t3, 0x0000($v0) ## 00000000 -/* 037AC 80AE14FC 8FAD009C */ lw $t5, 0x009C($sp) +/* 037AC 80AE14FC 8FAD009C */ lw $t5, 0x009C($sp) /* 037B0 80AE1500 3C0580AE */ lui $a1, %hi(D_80AE1BD0) ## $a1 = 80AE0000 /* 037B4 80AE1504 24A51BD0 */ addiu $a1, $a1, %lo(D_80AE1BD0) ## $a1 = 80AE1BD0 /* 037B8 80AE1508 8DA40000 */ lw $a0, 0x0000($t5) ## 00000000 /* 037BC 80AE150C 24060AE3 */ addiu $a2, $zero, 0x0AE3 ## $a2 = 00000AE3 -/* 037C0 80AE1510 0C0346A2 */ jal Matrix_NewMtx -/* 037C4 80AE1514 AFA2004C */ sw $v0, 0x004C($sp) -/* 037C8 80AE1518 8FA3004C */ lw $v1, 0x004C($sp) +/* 037C0 80AE1510 0C0346A2 */ jal Matrix_NewMtx +/* 037C4 80AE1514 AFA2004C */ sw $v0, 0x004C($sp) +/* 037C8 80AE1518 8FA3004C */ lw $v1, 0x004C($sp) /* 037CC 80AE151C 3C04DE00 */ lui $a0, 0xDE00 ## $a0 = DE000000 /* 037D0 80AE1520 3C0A0600 */ lui $t2, 0x0600 ## $t2 = 06000000 /* 037D4 80AE1524 AC620004 */ sw $v0, 0x0004($v1) ## 00000004 @@ -276,17 +276,17 @@ glabel func_80AE1148 /* 0382C 80AE157C AC400004 */ sw $zero, 0x0004($v0) ## 00000004 /* 03830 80AE1580 AC4B0000 */ sw $t3, 0x0000($v0) ## 00000000 /* 03834 80AE1584 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 -/* 03838 80AE1588 8FA50090 */ lw $a1, 0x0090($sp) +/* 03838 80AE1588 8FA50090 */ lw $a1, 0x0090($sp) /* 0383C 80AE158C 244D0008 */ addiu $t5, $v0, 0x0008 ## $t5 = 00000008 /* 03840 80AE1590 AE0D02C0 */ sw $t5, 0x02C0($s0) ## 000002C0 /* 03844 80AE1594 AC4E0000 */ sw $t6, 0x0000($v0) ## 00000000 /* 03848 80AE1598 90AF0000 */ lbu $t7, 0x0000($a1) ## 00000000 /* 0384C 80AE159C 90B80001 */ lbu $t8, 0x0001($a1) ## 00000001 /* 03850 80AE15A0 90AC0002 */ lbu $t4, 0x0002($a1) ## 00000002 -/* 03854 80AE15A4 000FCE00 */ sll $t9, $t7, 24 -/* 03858 80AE15A8 00185C00 */ sll $t3, $t8, 16 +/* 03854 80AE15A4 000FCE00 */ sll $t9, $t7, 24 +/* 03858 80AE15A8 00185C00 */ sll $t3, $t8, 16 /* 0385C 80AE15AC 032B6825 */ or $t5, $t9, $t3 ## $t5 = E7000008 -/* 03860 80AE15B0 000C7A00 */ sll $t7, $t4, 8 +/* 03860 80AE15B0 000C7A00 */ sll $t7, $t4, 8 /* 03864 80AE15B4 01AF5025 */ or $t2, $t5, $t7 ## $t2 = E7000008 /* 03868 80AE15B8 355800FF */ ori $t8, $t2, 0x00FF ## $t8 = E70000FF /* 0386C 80AE15BC AC580004 */ sw $t8, 0x0004($v0) ## 00000004 @@ -297,14 +297,14 @@ glabel func_80AE1148 /* 03880 80AE15D0 AE1902C0 */ sw $t9, 0x02C0($s0) ## 000002C0 /* 03884 80AE15D4 AC4B0004 */ sw $t3, 0x0004($v0) ## 00000004 /* 03888 80AE15D8 AC440000 */ sw $a0, 0x0000($v0) ## 00000000 -/* 0388C 80AE15DC 8FAE009C */ lw $t6, 0x009C($sp) +/* 0388C 80AE15DC 8FAE009C */ lw $t6, 0x009C($sp) /* 03890 80AE15E0 27A40078 */ addiu $a0, $sp, 0x0078 ## $a0 = FFFFFFE0 -/* 03894 80AE15E4 0C031AD5 */ jal func_800C6B54 +/* 03894 80AE15E4 0C031AD5 */ jal Graph_CloseDisps /* 03898 80AE15E8 8DC50000 */ lw $a1, 0x0000($t6) ## FB000000 -/* 0389C 80AE15EC 8FBF002C */ lw $ra, 0x002C($sp) -/* 038A0 80AE15F0 8FB00024 */ lw $s0, 0x0024($sp) -/* 038A4 80AE15F4 8FB10028 */ lw $s1, 0x0028($sp) -/* 038A8 80AE15F8 03E00008 */ jr $ra +/* 0389C 80AE15EC 8FBF002C */ lw $ra, 0x002C($sp) +/* 038A0 80AE15F0 8FB00024 */ lw $s0, 0x0024($sp) +/* 038A4 80AE15F4 8FB10028 */ lw $s1, 0x0028($sp) +/* 038A8 80AE15F8 03E00008 */ jr $ra /* 038AC 80AE15FC 27BD0098 */ addiu $sp, $sp, 0x0098 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80AE1654.s b/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80AE1654.s index 70b74e59ea..19da712c0c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80AE1654.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Poh/func_80AE1654.s @@ -10,7 +10,7 @@ glabel func_80AE1654 /* 03924 80AE1674 24C61BF0 */ addiu $a2, $a2, %lo(D_80AE1BF0) ## $a2 = 80AE1BF0 /* 03928 80AE1678 27A40080 */ addiu $a0, $sp, 0x0080 ## $a0 = FFFFFFE8 /* 0392C 80AE167C 24070B11 */ addiu $a3, $zero, 0x0B11 ## $a3 = 00000B11 -/* 03930 80AE1680 0C031AB1 */ jal func_800C6AC4 +/* 03930 80AE1680 0C031AB1 */ jal Graph_OpenDisps /* 03934 80AE1684 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 /* 03938 80AE1688 8E180190 */ lw $t8, 0x0190($s0) ## 00000190 /* 0393C 80AE168C 3C0F80AE */ lui $t7, %hi(func_80ADF994) ## $t7 = 80AE0000 @@ -165,7 +165,7 @@ glabel func_80AE1654 /* 03B84 80AE18D4 AFA20058 */ sw $v0, 0x0058($sp) /* 03B88 80AE18D8 00007812 */ mflo $t7 /* 03B8C 80AE18DC 31F801FF */ andi $t8, $t7, 0x01FF ## $t8 = 00000000 -/* 03B90 80AE18E0 0C0253D0 */ jal Draw_TwoTexScroll +/* 03B90 80AE18E0 0C0253D0 */ jal Gfx_TwoTexScroll /* 03B94 80AE18E4 AFB80020 */ sw $t8, 0x0020($sp) /* 03B98 80AE18E8 8FA30058 */ lw $v1, 0x0058($sp) /* 03B9C 80AE18EC 3C0DFA00 */ lui $t5, 0xFA00 ## $t5 = FA000000 @@ -250,7 +250,7 @@ glabel func_80AE1654 /* 03CD0 80AE1A20 24C61C20 */ addiu $a2, $a2, %lo(D_80AE1C20) ## $a2 = 80AE1C20 /* 03CD4 80AE1A24 27A40080 */ addiu $a0, $sp, 0x0080 ## $a0 = FFFFFFE8 /* 03CD8 80AE1A28 24070B64 */ addiu $a3, $zero, 0x0B64 ## $a3 = 00000B64 -/* 03CDC 80AE1A2C 0C031AD5 */ jal func_800C6B54 +/* 03CDC 80AE1A2C 0C031AD5 */ jal Graph_CloseDisps /* 03CE0 80AE1A30 8DC50000 */ lw $a1, 0x0000($t6) ## 00000000 /* 03CE4 80AE1A34 8FBF003C */ lw $ra, 0x003C($sp) /* 03CE8 80AE1A38 8FB00034 */ lw $s0, 0x0034($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Rd/EnRd_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Rd/EnRd_Draw.s index 20672aefad..8b182fce1f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Rd/EnRd_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Rd/EnRd_Draw.s @@ -1,9 +1,9 @@ glabel EnRd_Draw /* 02268 80AE4668 27BDFF88 */ addiu $sp, $sp, 0xFF88 ## $sp = FFFFFF88 -/* 0226C 80AE466C AFBF0034 */ sw $ra, 0x0034($sp) -/* 02270 80AE4670 AFB20030 */ sw $s2, 0x0030($sp) -/* 02274 80AE4674 AFB1002C */ sw $s1, 0x002C($sp) -/* 02278 80AE4678 AFB00028 */ sw $s0, 0x0028($sp) +/* 0226C 80AE466C AFBF0034 */ sw $ra, 0x0034($sp) +/* 02270 80AE4670 AFB20030 */ sw $s2, 0x0030($sp) +/* 02274 80AE4674 AFB1002C */ sw $s1, 0x002C($sp) +/* 02278 80AE4678 AFB00028 */ sw $s0, 0x0028($sp) /* 0227C 80AE467C 8C980024 */ lw $t8, 0x0024($a0) ## 00000024 /* 02280 80AE4680 27AE0064 */ addiu $t6, $sp, 0x0064 ## $t6 = FFFFFFEC /* 02284 80AE4684 00A09025 */ or $s2, $a1, $zero ## $s2 = 00000000 @@ -18,13 +18,13 @@ glabel EnRd_Draw /* 022A8 80AE46A8 ADD80008 */ sw $t8, 0x0008($t6) ## FFFFFFF4 /* 022AC 80AE46AC 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 /* 022B0 80AE46B0 2407068F */ addiu $a3, $zero, 0x068F ## $a3 = 0000068F -/* 022B4 80AE46B4 0C031AB1 */ jal func_800C6AC4 +/* 022B4 80AE46B4 0C031AB1 */ jal Graph_OpenDisps /* 022B8 80AE46B8 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 /* 022BC 80AE46BC 86190314 */ lh $t9, 0x0314($s0) ## 00000314 /* 022C0 80AE46C0 240100FF */ addiu $at, $zero, 0x00FF ## $at = 000000FF -/* 022C4 80AE46C4 17210044 */ bne $t9, $at, .L80AE47D8 +/* 022C4 80AE46C4 17210044 */ bne $t9, $at, .L80AE47D8 /* 022C8 80AE46C8 00000000 */ nop -/* 022CC 80AE46CC 0C024F46 */ jal func_80093D18 +/* 022CC 80AE46CC 0C024F46 */ jal func_80093D18 /* 022D0 80AE46D0 8E440000 */ lw $a0, 0x0000($s2) ## 00000000 /* 022D4 80AE46D4 8E2302C0 */ lw $v1, 0x02C0($s1) ## 000002C0 /* 022D8 80AE46D8 3C09FB00 */ lui $t1, 0xFB00 ## $t1 = FB000000 @@ -50,22 +50,22 @@ glabel EnRd_Draw /* 02328 80AE4728 3C1880AE */ lui $t8, %hi(func_80AE4520) ## $t8 = 80AE0000 /* 0232C 80AE472C 27184520 */ addiu $t8, $t8, %lo(func_80AE4520) ## $t8 = 80AE4520 /* 02330 80AE4730 25EF44C4 */ addiu $t7, $t7, %lo(func_80AE44C4) ## $t7 = 80AE44C4 -/* 02334 80AE4734 AFAF0010 */ sw $t7, 0x0010($sp) -/* 02338 80AE4738 AFB80014 */ sw $t8, 0x0014($sp) -/* 0233C 80AE473C AFB00018 */ sw $s0, 0x0018($sp) +/* 02334 80AE4734 AFAF0010 */ sw $t7, 0x0010($sp) +/* 02338 80AE4738 AFB80014 */ sw $t8, 0x0014($sp) +/* 0233C 80AE473C AFB00018 */ sw $s0, 0x0018($sp) /* 02340 80AE4740 8E3902C0 */ lw $t9, 0x02C0($s1) ## 000002C0 /* 02344 80AE4744 02402025 */ or $a0, $s2, $zero ## $a0 = 00000000 -/* 02348 80AE4748 0C0289CF */ jal func_800A273C -/* 0234C 80AE474C AFB9001C */ sw $t9, 0x001C($sp) +/* 02348 80AE4748 0C0289CF */ jal SkelAnime_DrawSV2 +/* 0234C 80AE474C AFB9001C */ sw $t9, 0x001C($sp) /* 02350 80AE4750 3C0580AE */ lui $a1, %hi(D_80AE4958) ## $a1 = 80AE0000 /* 02354 80AE4754 AE2202C0 */ sw $v0, 0x02C0($s1) ## 000002C0 /* 02358 80AE4758 24A54958 */ addiu $a1, $a1, %lo(D_80AE4958) ## $a1 = 80AE4958 /* 0235C 80AE475C 27A40064 */ addiu $a0, $sp, 0x0064 ## $a0 = FFFFFFEC /* 02360 80AE4760 240600FF */ addiu $a2, $zero, 0x00FF ## $a2 = 000000FF -/* 02364 80AE4764 0C00CF0C */ jal func_80033C30 +/* 02364 80AE4764 0C00CF0C */ jal func_80033C30 /* 02368 80AE4768 02403825 */ or $a3, $s2, $zero ## $a3 = 00000000 /* 0236C 80AE476C 9208031A */ lbu $t0, 0x031A($s0) ## 0000031A -/* 02370 80AE4770 1100003F */ beq $t0, $zero, .L80AE4870 +/* 02370 80AE4770 1100003F */ beq $t0, $zero, .L80AE4870 /* 02374 80AE4774 00000000 */ nop /* 02378 80AE4778 920B031A */ lbu $t3, 0x031A($s0) ## 0000031A /* 0237C 80AE477C 92090114 */ lbu $t1, 0x0114($s0) ## 00000114 @@ -75,24 +75,24 @@ glabel EnRd_Draw /* 0238C 80AE478C 306D0003 */ andi $t5, $v1, 0x0003 ## $t5 = 00000003 /* 02390 80AE4790 252A0001 */ addiu $t2, $t1, 0x0001 ## $t2 = 00000001 /* 02394 80AE4794 A20A0114 */ sb $t2, 0x0114($s0) ## 00000114 -/* 02398 80AE4798 15A00035 */ bne $t5, $zero, .L80AE4870 +/* 02398 80AE4798 15A00035 */ bne $t5, $zero, .L80AE4870 /* 0239C 80AE479C A20C031A */ sb $t4, 0x031A($s0) ## 0000031A -/* 023A0 80AE47A0 00031083 */ sra $v0, $v1, 2 -/* 023A4 80AE47A4 00027080 */ sll $t6, $v0, 2 -/* 023A8 80AE47A8 01C27023 */ subu $t6, $t6, $v0 -/* 023AC 80AE47AC 000E7040 */ sll $t6, $t6, 1 -/* 023B0 80AE47B0 020E3021 */ addu $a2, $s0, $t6 +/* 023A0 80AE47A0 00031083 */ sra $v0, $v1, 2 +/* 023A4 80AE47A4 00027080 */ sll $t6, $v0, 2 +/* 023A8 80AE47A8 01C27023 */ subu $t6, $t6, $v0 +/* 023AC 80AE47AC 000E7040 */ sll $t6, $t6, 1 +/* 023B0 80AE47B0 020E3021 */ addu $a2, $s0, $t6 /* 023B4 80AE47B4 24C6014C */ addiu $a2, $a2, 0x014C ## $a2 = 0000014C -/* 023B8 80AE47B8 AFA20018 */ sw $v0, 0x0018($sp) +/* 023B8 80AE47B8 AFA20018 */ sw $v0, 0x0018($sp) /* 023BC 80AE47BC 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 023C0 80AE47C0 2407004B */ addiu $a3, $zero, 0x004B ## $a3 = 0000004B -/* 023C4 80AE47C4 AFA00010 */ sw $zero, 0x0010($sp) -/* 023C8 80AE47C8 0C00A953 */ jal func_8002A54C -/* 023CC 80AE47CC AFA00014 */ sw $zero, 0x0014($sp) -/* 023D0 80AE47D0 10000027 */ beq $zero, $zero, .L80AE4870 +/* 023C4 80AE47C4 AFA00010 */ sw $zero, 0x0010($sp) +/* 023C8 80AE47C8 0C00A953 */ jal func_8002A54C +/* 023CC 80AE47CC AFA00014 */ sw $zero, 0x0014($sp) +/* 023D0 80AE47D0 10000027 */ beq $zero, $zero, .L80AE4870 /* 023D4 80AE47D4 00000000 */ nop .L80AE47D8: -/* 023D8 80AE47D8 0C024F61 */ jal func_80093D84 +/* 023D8 80AE47D8 0C024F61 */ jal func_80093D84 /* 023DC 80AE47DC 8E440000 */ lw $a0, 0x0000($s2) ## 00000000 /* 023E0 80AE47E0 8E2302D0 */ lw $v1, 0x02D0($s1) ## 000002D0 /* 023E4 80AE47E4 3C18FB00 */ lui $t8, 0xFB00 ## $t8 = FB000000 @@ -116,31 +116,31 @@ glabel EnRd_Draw /* 0242C 80AE482C 8E0601A8 */ lw $a2, 0x01A8($s0) ## 000001A8 /* 02430 80AE4830 8E05018C */ lw $a1, 0x018C($s0) ## 0000018C /* 02434 80AE4834 258C44C4 */ addiu $t4, $t4, %lo(func_80AE44C4) ## $t4 = 80AE44C4 -/* 02438 80AE4838 AFAC0010 */ sw $t4, 0x0010($sp) -/* 0243C 80AE483C AFB00018 */ sw $s0, 0x0018($sp) -/* 02440 80AE4840 AFA00014 */ sw $zero, 0x0014($sp) +/* 02438 80AE4838 AFAC0010 */ sw $t4, 0x0010($sp) +/* 0243C 80AE483C AFB00018 */ sw $s0, 0x0018($sp) +/* 02440 80AE4840 AFA00014 */ sw $zero, 0x0014($sp) /* 02444 80AE4844 8E2D02D0 */ lw $t5, 0x02D0($s1) ## 000002D0 /* 02448 80AE4848 02402025 */ or $a0, $s2, $zero ## $a0 = 00000000 -/* 0244C 80AE484C 0C0289CF */ jal func_800A273C -/* 02450 80AE4850 AFAD001C */ sw $t5, 0x001C($sp) +/* 0244C 80AE484C 0C0289CF */ jal SkelAnime_DrawSV2 +/* 02450 80AE4850 AFAD001C */ sw $t5, 0x001C($sp) /* 02454 80AE4854 AE2202D0 */ sw $v0, 0x02D0($s1) ## 000002D0 /* 02458 80AE4858 3C0580AE */ lui $a1, %hi(D_80AE4958) ## $a1 = 80AE0000 /* 0245C 80AE485C 24A54958 */ addiu $a1, $a1, %lo(D_80AE4958) ## $a1 = 80AE4958 /* 02460 80AE4860 92060315 */ lbu $a2, 0x0315($s0) ## 00000315 /* 02464 80AE4864 27A40064 */ addiu $a0, $sp, 0x0064 ## $a0 = FFFFFFEC -/* 02468 80AE4868 0C00CF0C */ jal func_80033C30 +/* 02468 80AE4868 0C00CF0C */ jal func_80033C30 /* 0246C 80AE486C 02403825 */ or $a3, $s2, $zero ## $a3 = 00000000 .L80AE4870: /* 02470 80AE4870 3C0680AE */ lui $a2, %hi(D_80AE4980) ## $a2 = 80AE0000 /* 02474 80AE4874 24C64980 */ addiu $a2, $a2, %lo(D_80AE4980) ## $a2 = 80AE4980 /* 02478 80AE4878 27A40050 */ addiu $a0, $sp, 0x0050 ## $a0 = FFFFFFD8 /* 0247C 80AE487C 8E450000 */ lw $a1, 0x0000($s2) ## 00000000 -/* 02480 80AE4880 0C031AD5 */ jal func_800C6B54 +/* 02480 80AE4880 0C031AD5 */ jal Graph_CloseDisps /* 02484 80AE4884 240706C7 */ addiu $a3, $zero, 0x06C7 ## $a3 = 000006C7 -/* 02488 80AE4888 8FBF0034 */ lw $ra, 0x0034($sp) -/* 0248C 80AE488C 8FB00028 */ lw $s0, 0x0028($sp) -/* 02490 80AE4890 8FB1002C */ lw $s1, 0x002C($sp) -/* 02494 80AE4894 8FB20030 */ lw $s2, 0x0030($sp) -/* 02498 80AE4898 03E00008 */ jr $ra +/* 02488 80AE4888 8FBF0034 */ lw $ra, 0x0034($sp) +/* 0248C 80AE488C 8FB00028 */ lw $s0, 0x0028($sp) +/* 02490 80AE4890 8FB1002C */ lw $s1, 0x002C($sp) +/* 02494 80AE4894 8FB20030 */ lw $s2, 0x0030($sp) +/* 02498 80AE4898 03E00008 */ jr $ra /* 0249C 80AE489C 27BD0078 */ addiu $sp, $sp, 0x0078 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Rd/EnRd_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Rd/EnRd_Init.s index 1bab2dbf39..f53348ce62 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Rd/EnRd_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Rd/EnRd_Init.s @@ -1,23 +1,23 @@ glabel EnRd_Init /* 00008 80AE2408 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 -/* 0000C 80AE240C AFA50044 */ sw $a1, 0x0044($sp) -/* 00010 80AE2410 AFBF002C */ sw $ra, 0x002C($sp) -/* 00014 80AE2414 AFB00028 */ sw $s0, 0x0028($sp) +/* 0000C 80AE240C AFA50044 */ sw $a1, 0x0044($sp) +/* 00010 80AE2410 AFBF002C */ sw $ra, 0x002C($sp) +/* 00014 80AE2414 AFB00028 */ sw $s0, 0x0028($sp) /* 00018 80AE2418 3C0580AE */ lui $a1, %hi(D_80AE490C) ## $a1 = 80AE0000 /* 0001C 80AE241C 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 00020 80AE2420 0C01E037 */ jal Actor_ProcessInitChain - + /* 00024 80AE2424 24A5490C */ addiu $a1, $a1, %lo(D_80AE490C) ## $a1 = 80AE490C /* 00028 80AE2428 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 /* 0002C 80AE242C 3C0E80AE */ lui $t6, %hi(D_80AE48EC) ## $t6 = 80AE0000 /* 00030 80AE2430 25CE48EC */ addiu $t6, $t6, %lo(D_80AE48EC) ## $t6 = 80AE48EC -/* 00034 80AE2434 44050000 */ mfc1 $a1, $f0 -/* 00038 80AE2438 44070000 */ mfc1 $a3, $f0 +/* 00034 80AE2434 44050000 */ mfc1 $a1, $f0 +/* 00038 80AE2438 44070000 */ mfc1 $a3, $f0 /* 0003C 80AE243C A200001F */ sb $zero, 0x001F($s0) ## 0000001F /* 00040 80AE2440 AE0E0098 */ sw $t6, 0x0098($s0) ## 00000098 /* 00044 80AE2444 260400B4 */ addiu $a0, $s0, 0x00B4 ## $a0 = 000000B4 /* 00048 80AE2448 0C00AC78 */ jal ActorShape_Init - + /* 0004C 80AE244C 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 /* 00050 80AE2450 8E180028 */ lw $t8, 0x0028($s0) ## 00000028 /* 00054 80AE2454 3C014248 */ lui $at, 0x4248 ## $at = 42480000 @@ -29,7 +29,7 @@ glabel EnRd_Init /* 0006C 80AE246C 860F030E */ lh $t7, 0x030E($s0) ## 0000030E /* 00070 80AE2470 860C001C */ lh $t4, 0x001C($s0) ## 0000001C /* 00074 80AE2474 8602001C */ lh $v0, 0x001C($s0) ## 0000001C -/* 00078 80AE2478 46062200 */ add.s $f8, $f4, $f6 +/* 00078 80AE2478 46062200 */ add.s $f8, $f4, $f6 /* 0007C 80AE247C AE190038 */ sw $t9, 0x0038($s0) ## 00000038 /* 00080 80AE2480 8E19002C */ lw $t9, 0x002C($s0) ## 0000002C /* 00084 80AE2484 240A00FF */ addiu $t2, $zero, 0x00FF ## $t2 = 000000FF @@ -38,7 +38,7 @@ glabel EnRd_Init /* 00090 80AE2490 240800FE */ addiu $t0, $zero, 0x00FE ## $t0 = 000000FE /* 00094 80AE2494 24090008 */ addiu $t1, $zero, 0x0008 ## $t1 = 00000008 /* 00098 80AE2498 314B00FF */ andi $t3, $t2, 0x00FF ## $t3 = 000000FF -/* 0009C 80AE249C 000D7203 */ sra $t6, $t5, 8 +/* 0009C 80AE249C 000D7203 */ sra $t6, $t5, 8 /* 000A0 80AE24A0 304F0080 */ andi $t7, $v0, 0x0080 ## $t7 = 00000000 /* 000A4 80AE24A4 E608003C */ swc1 $f8, 0x003C($s0) ## 0000003C /* 000A8 80AE24A8 A20800AE */ sb $t0, 0x00AE($s0) ## 000000AE @@ -46,20 +46,20 @@ glabel EnRd_Init /* 000B0 80AE24B0 A60B0314 */ sh $t3, 0x0314($s0) ## 00000314 /* 000B4 80AE24B4 A20A031D */ sb $t2, 0x031D($s0) ## 0000031D /* 000B8 80AE24B8 A60E0312 */ sh $t6, 0x0312($s0) ## 00000312 -/* 000BC 80AE24BC 11E00004 */ beq $t7, $zero, .L80AE24D0 +/* 000BC 80AE24BC 11E00004 */ beq $t7, $zero, .L80AE24D0 /* 000C0 80AE24C0 AE190040 */ sw $t9, 0x0040($s0) ## 00000040 /* 000C4 80AE24C4 3458FF00 */ ori $t8, $v0, 0xFF00 ## $t8 = 0000FF00 -/* 000C8 80AE24C8 10000003 */ beq $zero, $zero, .L80AE24D8 +/* 000C8 80AE24C8 10000003 */ beq $zero, $zero, .L80AE24D8 /* 000CC 80AE24CC A618001C */ sh $t8, 0x001C($s0) ## 0000001C .L80AE24D0: /* 000D0 80AE24D0 305900FF */ andi $t9, $v0, 0x00FF ## $t9 = 00000000 /* 000D4 80AE24D4 A619001C */ sh $t9, 0x001C($s0) ## 0000001C .L80AE24D8: /* 000D8 80AE24D8 8608001C */ lh $t0, 0x001C($s0) ## 0000001C -/* 000DC 80AE24DC 8FA40044 */ lw $a0, 0x0044($sp) +/* 000DC 80AE24DC 8FA40044 */ lw $a0, 0x0044($sp) /* 000E0 80AE24E0 26050188 */ addiu $a1, $s0, 0x0188 ## $a1 = 00000188 -/* 000E4 80AE24E4 2901FFFF */ slti $at, $t0, 0xFFFF -/* 000E8 80AE24E8 14200012 */ bne $at, $zero, .L80AE2534 +/* 000E4 80AE24E4 2901FFFF */ slti $at, $t0, 0xFFFF +/* 000E8 80AE24E8 14200012 */ bne $at, $zero, .L80AE2534 /* 000EC 80AE24EC 3C060600 */ lui $a2, 0x0600 ## $a2 = 06000000 /* 000F0 80AE24F0 26050188 */ addiu $a1, $s0, 0x0188 ## $a1 = 00000188 /* 000F4 80AE24F4 3C060601 */ lui $a2, 0x0601 ## $a2 = 06010000 @@ -67,71 +67,71 @@ glabel EnRd_Init /* 000FC 80AE24FC 260901CC */ addiu $t1, $s0, 0x01CC ## $t1 = 000001CC /* 00100 80AE2500 260A0268 */ addiu $t2, $s0, 0x0268 ## $t2 = 00000268 /* 00104 80AE2504 240B001A */ addiu $t3, $zero, 0x001A ## $t3 = 0000001A -/* 00108 80AE2508 AFAB0018 */ sw $t3, 0x0018($sp) -/* 0010C 80AE250C AFAA0014 */ sw $t2, 0x0014($sp) -/* 00110 80AE2510 AFA90010 */ sw $t1, 0x0010($sp) +/* 00108 80AE2508 AFAB0018 */ sw $t3, 0x0018($sp) +/* 0010C 80AE250C AFAA0014 */ sw $t2, 0x0014($sp) +/* 00110 80AE2510 AFA90010 */ sw $t1, 0x0010($sp) /* 00114 80AE2514 24E787D0 */ addiu $a3, $a3, 0x87D0 ## $a3 = 060087D0 /* 00118 80AE2518 24C6E778 */ addiu $a2, $a2, 0xE778 ## $a2 = 0600E778 -/* 0011C 80AE251C AFA50038 */ sw $a1, 0x0038($sp) -/* 00120 80AE2520 0C0291BE */ jal func_800A46F8 -/* 00124 80AE2524 8FA40044 */ lw $a0, 0x0044($sp) +/* 0011C 80AE251C AFA50038 */ sw $a1, 0x0038($sp) +/* 00120 80AE2520 0C0291BE */ jal SkelAnime_InitSV +/* 00124 80AE2524 8FA40044 */ lw $a0, 0x0044($sp) /* 00128 80AE2528 240C002A */ addiu $t4, $zero, 0x002A ## $t4 = 0000002A -/* 0012C 80AE252C 1000000E */ beq $zero, $zero, .L80AE2568 +/* 0012C 80AE252C 1000000E */ beq $zero, $zero, .L80AE2568 /* 00130 80AE2530 A20C0117 */ sb $t4, 0x0117($s0) ## 00000117 .L80AE2534: /* 00134 80AE2534 3C070601 */ lui $a3, 0x0601 ## $a3 = 06010000 /* 00138 80AE2538 260D01CC */ addiu $t5, $s0, 0x01CC ## $t5 = 000001CC /* 0013C 80AE253C 260E0268 */ addiu $t6, $s0, 0x0268 ## $t6 = 00000268 /* 00140 80AE2540 240F001A */ addiu $t7, $zero, 0x001A ## $t7 = 0000001A -/* 00144 80AE2544 AFAF0018 */ sw $t7, 0x0018($sp) -/* 00148 80AE2548 AFAE0014 */ sw $t6, 0x0014($sp) -/* 0014C 80AE254C AFAD0010 */ sw $t5, 0x0010($sp) +/* 00144 80AE2544 AFAF0018 */ sw $t7, 0x0018($sp) +/* 00148 80AE2548 AFAE0014 */ sw $t6, 0x0014($sp) +/* 0014C 80AE254C AFAD0010 */ sw $t5, 0x0010($sp) /* 00150 80AE2550 24E787D0 */ addiu $a3, $a3, 0x87D0 ## $a3 = 060087D0 /* 00154 80AE2554 24C63DD8 */ addiu $a2, $a2, 0x3DD8 ## $a2 = 00003DD8 -/* 00158 80AE2558 0C0291BE */ jal func_800A46F8 -/* 0015C 80AE255C AFA50038 */ sw $a1, 0x0038($sp) +/* 00158 80AE2558 0C0291BE */ jal SkelAnime_InitSV +/* 0015C 80AE255C AFA50038 */ sw $a1, 0x0038($sp) /* 00160 80AE2560 2418002D */ addiu $t8, $zero, 0x002D ## $t8 = 0000002D /* 00164 80AE2564 A2180117 */ sb $t8, 0x0117($s0) ## 00000117 .L80AE2568: /* 00168 80AE2568 26050320 */ addiu $a1, $s0, 0x0320 ## $a1 = 00000320 -/* 0016C 80AE256C AFA50034 */ sw $a1, 0x0034($sp) +/* 0016C 80AE256C AFA50034 */ sw $a1, 0x0034($sp) /* 00170 80AE2570 0C0170D9 */ jal ActorCollider_AllocCylinder - -/* 00174 80AE2574 8FA40044 */ lw $a0, 0x0044($sp) + +/* 00174 80AE2574 8FA40044 */ lw $a0, 0x0044($sp) /* 00178 80AE2578 3C0780AE */ lui $a3, %hi(D_80AE48C0) ## $a3 = 80AE0000 -/* 0017C 80AE257C 8FA50034 */ lw $a1, 0x0034($sp) +/* 0017C 80AE257C 8FA50034 */ lw $a1, 0x0034($sp) /* 00180 80AE2580 24E748C0 */ addiu $a3, $a3, %lo(D_80AE48C0) ## $a3 = 80AE48C0 -/* 00184 80AE2584 8FA40044 */ lw $a0, 0x0044($sp) +/* 00184 80AE2584 8FA40044 */ lw $a0, 0x0044($sp) /* 00188 80AE2588 0C01712B */ jal ActorCollider_InitCylinder - + /* 0018C 80AE258C 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 00190 80AE2590 8619001C */ lh $t9, 0x001C($s0) ## 0000001C -/* 00194 80AE2594 2B21FFFE */ slti $at, $t9, 0xFFFE -/* 00198 80AE2598 14200005 */ bne $at, $zero, .L80AE25B0 +/* 00194 80AE2594 2B21FFFE */ slti $at, $t9, 0xFFFE +/* 00198 80AE2598 14200005 */ bne $at, $zero, .L80AE25B0 /* 0019C 80AE259C 00000000 */ nop -/* 001A0 80AE25A0 0C2B89A7 */ jal func_80AE269C +/* 001A0 80AE25A0 0C2B89A7 */ jal func_80AE269C /* 001A4 80AE25A4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 001A8 80AE25A8 10000003 */ beq $zero, $zero, .L80AE25B8 +/* 001A8 80AE25A8 10000003 */ beq $zero, $zero, .L80AE25B8 /* 001AC 80AE25AC 00000000 */ nop .L80AE25B0: -/* 001B0 80AE25B0 0C2B8A5C */ jal func_80AE2970 +/* 001B0 80AE25B0 0C2B8A5C */ jal func_80AE2970 /* 001B4 80AE25B4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 .L80AE25B8: /* 001B8 80AE25B8 0C02927F */ jal SkelAnime_FrameUpdateMatrix - -/* 001BC 80AE25BC 8FA40038 */ lw $a0, 0x0038($sp) + +/* 001BC 80AE25BC 8FA40038 */ lw $a0, 0x0038($sp) /* 001C0 80AE25C0 8608001C */ lh $t0, 0x001C($s0) ## 0000001C /* 001C4 80AE25C4 24010003 */ addiu $at, $zero, 0x0003 ## $at = 00000003 -/* 001C8 80AE25C8 55010005 */ bnel $t0, $at, .L80AE25E0 -/* 001CC 80AE25CC 8FBF002C */ lw $ra, 0x002C($sp) +/* 001C8 80AE25C8 55010005 */ bnel $t0, $at, .L80AE25E0 +/* 001CC 80AE25CC 8FBF002C */ lw $ra, 0x002C($sp) /* 001D0 80AE25D0 8E090004 */ lw $t1, 0x0004($s0) ## 00000004 /* 001D4 80AE25D4 352A0080 */ ori $t2, $t1, 0x0080 ## $t2 = 00000080 /* 001D8 80AE25D8 AE0A0004 */ sw $t2, 0x0004($s0) ## 00000004 -/* 001DC 80AE25DC 8FBF002C */ lw $ra, 0x002C($sp) +/* 001DC 80AE25DC 8FBF002C */ lw $ra, 0x002C($sp) .L80AE25E0: -/* 001E0 80AE25E0 8FB00028 */ lw $s0, 0x0028($sp) +/* 001E0 80AE25E0 8FB00028 */ lw $s0, 0x0028($sp) /* 001E4 80AE25E4 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 -/* 001E8 80AE25E8 03E00008 */ jr $ra +/* 001E8 80AE25E8 03E00008 */ jr $ra /* 001EC 80AE25EC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Rd/func_80AE269C.s b/asm/non_matchings/overlays/actors/ovl_En_Rd/func_80AE269C.s index 71109f2802..0524e7dd9e 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Rd/func_80AE269C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Rd/func_80AE269C.s @@ -1,22 +1,22 @@ glabel func_80AE269C /* 0029C 80AE269C 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 002A0 80AE26A0 AFBF001C */ sw $ra, 0x001C($sp) -/* 002A4 80AE26A4 AFB00018 */ sw $s0, 0x0018($sp) +/* 002A0 80AE26A0 AFBF001C */ sw $ra, 0x001C($sp) +/* 002A4 80AE26A4 AFB00018 */ sw $s0, 0x0018($sp) /* 002A8 80AE26A8 848E001C */ lh $t6, 0x001C($a0) ## 0000001C /* 002AC 80AE26AC 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 /* 002B0 80AE26B0 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 002B4 80AE26B4 11C10008 */ beq $t6, $at, .L80AE26D8 +/* 002B4 80AE26B4 11C10008 */ beq $t6, $at, .L80AE26D8 /* 002B8 80AE26B8 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 002BC 80AE26BC 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 /* 002C0 80AE26C0 24A587D0 */ addiu $a1, $a1, 0x87D0 ## $a1 = 060087D0 /* 002C4 80AE26C4 24840188 */ addiu $a0, $a0, 0x0188 ## $a0 = 00000188 -/* 002C8 80AE26C8 0C0294D3 */ jal func_800A534C +/* 002C8 80AE26C8 0C0294D3 */ jal SkelAnime_ChangeAnimTransitionRepeat /* 002CC 80AE26CC 3C06C0C0 */ lui $a2, 0xC0C0 ## $a2 = C0C00000 -/* 002D0 80AE26D0 10000004 */ beq $zero, $zero, .L80AE26E4 +/* 002D0 80AE26D0 10000004 */ beq $zero, $zero, .L80AE26E4 /* 002D4 80AE26D4 00000000 */ nop .L80AE26D8: /* 002D8 80AE26D8 26040188 */ addiu $a0, $s0, 0x0188 ## $a0 = 00000188 -/* 002DC 80AE26DC 0C0294BE */ jal func_800A52F8 +/* 002DC 80AE26DC 0C0294BE */ jal SkelAnime_ChangeAnimDefaultRepeat /* 002E0 80AE26E0 24A55D98 */ addiu $a1, $a1, 0x5D98 ## $a1 = 00005D98 .L80AE26E4: /* 002E4 80AE26E4 0C03F66B */ jal Math_Rand_ZeroOne @@ -26,23 +26,23 @@ glabel func_80AE269C /* 002F0 80AE26F0 44812000 */ mtc1 $at, $f4 ## $f4 = 10.00 /* 002F4 80AE26F4 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 /* 002F8 80AE26F8 44814000 */ mtc1 $at, $f8 ## $f8 = 5.00 -/* 002FC 80AE26FC 46040182 */ mul.s $f6, $f0, $f4 +/* 002FC 80AE26FC 46040182 */ mul.s $f6, $f0, $f4 /* 00300 80AE2700 44809000 */ mtc1 $zero, $f18 ## $f18 = 0.00 /* 00304 80AE2704 861900B6 */ lh $t9, 0x00B6($s0) ## 000000B6 /* 00308 80AE2708 3C0580AE */ lui $a1, %hi(func_80AE2744) ## $a1 = 80AE0000 /* 0030C 80AE270C 24A52744 */ addiu $a1, $a1, %lo(func_80AE2744) ## $a1 = 80AE2744 /* 00310 80AE2710 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 00314 80AE2714 E6120068 */ swc1 $f18, 0x0068($s0) ## 00000068 -/* 00318 80AE2718 46083280 */ add.s $f10, $f6, $f8 +/* 00318 80AE2718 46083280 */ add.s $f10, $f6, $f8 /* 0031C 80AE271C A6190032 */ sh $t9, 0x0032($s0) ## 00000032 -/* 00320 80AE2720 4600540D */ trunc.w.s $f16, $f10 -/* 00324 80AE2724 44188000 */ mfc1 $t8, $f16 -/* 00328 80AE2728 0C2B8900 */ jal func_80AE2400 +/* 00320 80AE2720 4600540D */ trunc.w.s $f16, $f10 +/* 00324 80AE2724 44188000 */ mfc1 $t8, $f16 +/* 00328 80AE2728 0C2B8900 */ jal func_80AE2400 /* 0032C 80AE272C A618030C */ sh $t8, 0x030C($s0) ## 0000030C -/* 00330 80AE2730 8FBF001C */ lw $ra, 0x001C($sp) -/* 00334 80AE2734 8FB00018 */ lw $s0, 0x0018($sp) +/* 00330 80AE2730 8FBF001C */ lw $ra, 0x001C($sp) +/* 00334 80AE2734 8FB00018 */ lw $s0, 0x0018($sp) /* 00338 80AE2738 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 0033C 80AE273C 03E00008 */ jr $ra +/* 0033C 80AE273C 03E00008 */ jr $ra /* 00340 80AE2740 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Rd/func_80AE2744.s b/asm/non_matchings/overlays/actors/ovl_En_Rd/func_80AE2744.s index d72021e0df..70dde32688 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Rd/func_80AE2744.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Rd/func_80AE2744.s @@ -1,65 +1,65 @@ glabel func_80AE2744 /* 00344 80AE2744 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 00348 80AE2748 AFB00020 */ sw $s0, 0x0020($sp) +/* 00348 80AE2748 AFB00020 */ sw $s0, 0x0020($sp) /* 0034C 80AE274C 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00350 80AE2750 AFBF0024 */ sw $ra, 0x0024($sp) +/* 00350 80AE2750 AFBF0024 */ sw $ra, 0x0024($sp) /* 00354 80AE2754 24840188 */ addiu $a0, $a0, 0x0188 ## $a0 = 00000188 -/* 00358 80AE2758 AFA50034 */ sw $a1, 0x0034($sp) +/* 00358 80AE2758 AFA50034 */ sw $a1, 0x0034($sp) /* 0035C 80AE275C 0C02927F */ jal SkelAnime_FrameUpdateMatrix - -/* 00360 80AE2760 AFA4002C */ sw $a0, 0x002C($sp) + +/* 00360 80AE2760 AFA4002C */ sw $a0, 0x002C($sp) /* 00364 80AE2764 2604030E */ addiu $a0, $s0, 0x030E ## $a0 = 0000030E /* 00368 80AE2768 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 0036C 80AE276C 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 /* 00370 80AE2770 24070064 */ addiu $a3, $zero, 0x0064 ## $a3 = 00000064 /* 00374 80AE2774 0C01E1A7 */ jal Math_SmoothScaleMaxMinS - -/* 00378 80AE2778 AFA00010 */ sw $zero, 0x0010($sp) + +/* 00378 80AE2778 AFA00010 */ sw $zero, 0x0010($sp) /* 0037C 80AE277C 26040310 */ addiu $a0, $s0, 0x0310 ## $a0 = 00000310 /* 00380 80AE2780 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 00384 80AE2784 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 /* 00388 80AE2788 24070064 */ addiu $a3, $zero, 0x0064 ## $a3 = 00000064 /* 0038C 80AE278C 0C01E1A7 */ jal Math_SmoothScaleMaxMinS - -/* 00390 80AE2790 AFA00010 */ sw $zero, 0x0010($sp) + +/* 00390 80AE2790 AFA00010 */ sw $zero, 0x0010($sp) /* 00394 80AE2794 860E001C */ lh $t6, 0x001C($s0) ## 0000001C /* 00398 80AE2798 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 0039C 80AE279C 55C1001C */ bnel $t6, $at, .L80AE2810 +/* 0039C 80AE279C 55C1001C */ bnel $t6, $at, .L80AE2810 /* 003A0 80AE27A0 860F030C */ lh $t7, 0x030C($s0) ## 0000030C /* 003A4 80AE27A4 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 /* 003A8 80AE27A8 C60601A0 */ lwc1 $f6, 0x01A0($s0) ## 000001A0 -/* 003AC 80AE27AC 46062032 */ c.eq.s $f4, $f6 +/* 003AC 80AE27AC 46062032 */ c.eq.s $f4, $f6 /* 003B0 80AE27B0 00000000 */ nop -/* 003B4 80AE27B4 45020016 */ bc1fl .L80AE2810 +/* 003B4 80AE27B4 45020016 */ bc1fl .L80AE2810 /* 003B8 80AE27B8 860F030C */ lh $t7, 0x030C($s0) ## 0000030C /* 003BC 80AE27BC 0C03F66B */ jal Math_Rand_ZeroOne ## Rand.Next() float /* 003C0 80AE27C0 00000000 */ nop /* 003C4 80AE27C4 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 /* 003C8 80AE27C8 44814000 */ mtc1 $at, $f8 ## $f8 = 0.50 -/* 003CC 80AE27CC 8FA4002C */ lw $a0, 0x002C($sp) +/* 003CC 80AE27CC 8FA4002C */ lw $a0, 0x002C($sp) /* 003D0 80AE27D0 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 003D4 80AE27D4 4600403E */ c.le.s $f8, $f0 +/* 003D4 80AE27D4 4600403E */ c.le.s $f8, $f0 /* 003D8 80AE27D8 00000000 */ nop -/* 003DC 80AE27DC 45000007 */ bc1f .L80AE27FC +/* 003DC 80AE27DC 45000007 */ bc1f .L80AE27FC /* 003E0 80AE27E0 00000000 */ nop /* 003E4 80AE27E4 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 003E8 80AE27E8 24A55D98 */ addiu $a1, $a1, 0x5D98 ## $a1 = 06005D98 -/* 003EC 80AE27EC 0C0294BE */ jal func_800A52F8 -/* 003F0 80AE27F0 8FA4002C */ lw $a0, 0x002C($sp) -/* 003F4 80AE27F4 10000018 */ beq $zero, $zero, .L80AE2858 +/* 003EC 80AE27EC 0C0294BE */ jal SkelAnime_ChangeAnimDefaultRepeat +/* 003F0 80AE27F0 8FA4002C */ lw $a0, 0x002C($sp) +/* 003F4 80AE27F4 10000018 */ beq $zero, $zero, .L80AE2858 /* 003F8 80AE27F8 8E0A0118 */ lw $t2, 0x0118($s0) ## 00000118 .L80AE27FC: -/* 003FC 80AE27FC 0C0294BE */ jal func_800A52F8 +/* 003FC 80AE27FC 0C0294BE */ jal SkelAnime_ChangeAnimDefaultRepeat /* 00400 80AE2800 24A557AC */ addiu $a1, $a1, 0x57AC ## $a1 = 000057AC -/* 00404 80AE2804 10000014 */ beq $zero, $zero, .L80AE2858 +/* 00404 80AE2804 10000014 */ beq $zero, $zero, .L80AE2858 /* 00408 80AE2808 8E0A0118 */ lw $t2, 0x0118($s0) ## 00000118 /* 0040C 80AE280C 860F030C */ lh $t7, 0x030C($s0) ## 0000030C .L80AE2810: /* 00410 80AE2810 25F8FFFF */ addiu $t8, $t7, 0xFFFF ## $t8 = FFFFFFFF /* 00414 80AE2814 A618030C */ sh $t8, 0x030C($s0) ## 0000030C /* 00418 80AE2818 8619030C */ lh $t9, 0x030C($s0) ## 0000030C -/* 0041C 80AE281C 5720000E */ bnel $t9, $zero, .L80AE2858 +/* 0041C 80AE281C 5720000E */ bnel $t9, $zero, .L80AE2858 /* 00420 80AE2820 8E0A0118 */ lw $t2, 0x0118($s0) ## 00000118 /* 00424 80AE2824 0C03F66B */ jal Math_Rand_ZeroOne ## Rand.Next() float @@ -67,92 +67,92 @@ glabel func_80AE2744 /* 0042C 80AE282C 3C014120 */ lui $at, 0x4120 ## $at = 41200000 /* 00430 80AE2830 44811000 */ mtc1 $at, $f2 ## $f2 = 10.00 /* 00434 80AE2834 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 -/* 00438 80AE2838 46020282 */ mul.s $f10, $f0, $f2 +/* 00438 80AE2838 46020282 */ mul.s $f10, $f0, $f2 /* 0043C 80AE283C E60401A0 */ swc1 $f4, 0x01A0($s0) ## 000001A0 -/* 00440 80AE2840 46025400 */ add.s $f16, $f10, $f2 -/* 00444 80AE2844 4600848D */ trunc.w.s $f18, $f16 -/* 00448 80AE2848 44099000 */ mfc1 $t1, $f18 +/* 00440 80AE2840 46025400 */ add.s $f16, $f10, $f2 +/* 00444 80AE2844 4600848D */ trunc.w.s $f18, $f16 +/* 00448 80AE2848 44099000 */ mfc1 $t1, $f18 /* 0044C 80AE284C 00000000 */ nop /* 00450 80AE2850 A609030C */ sh $t1, 0x030C($s0) ## 0000030C /* 00454 80AE2854 8E0A0118 */ lw $t2, 0x0118($s0) ## 00000118 .L80AE2858: -/* 00458 80AE2858 51400011 */ beql $t2, $zero, .L80AE28A0 +/* 00458 80AE2858 51400011 */ beql $t2, $zero, .L80AE28A0 /* 0045C 80AE285C 920D0305 */ lbu $t5, 0x0305($s0) ## 00000305 /* 00460 80AE2860 920B0305 */ lbu $t3, 0x0305($s0) ## 00000305 -/* 00464 80AE2864 55600034 */ bnel $t3, $zero, .L80AE2938 -/* 00468 80AE2868 8FB90034 */ lw $t9, 0x0034($sp) +/* 00464 80AE2864 55600034 */ bnel $t3, $zero, .L80AE2938 +/* 00468 80AE2868 8FB90034 */ lw $t9, 0x0034($sp) /* 0046C 80AE286C 860C001C */ lh $t4, 0x001C($s0) ## 0000001C /* 00470 80AE2870 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 00474 80AE2874 11810005 */ beq $t4, $at, .L80AE288C +/* 00474 80AE2874 11810005 */ beq $t4, $at, .L80AE288C /* 00478 80AE2878 00000000 */ nop -/* 0047C 80AE287C 0C2B8C77 */ jal func_80AE31DC +/* 0047C 80AE287C 0C2B8C77 */ jal func_80AE31DC /* 00480 80AE2880 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00484 80AE2884 1000002C */ beq $zero, $zero, .L80AE2938 -/* 00488 80AE2888 8FB90034 */ lw $t9, 0x0034($sp) +/* 00484 80AE2884 1000002C */ beq $zero, $zero, .L80AE2938 +/* 00488 80AE2888 8FB90034 */ lw $t9, 0x0034($sp) .L80AE288C: -/* 0048C 80AE288C 0C2B8E4B */ jal func_80AE392C +/* 0048C 80AE288C 0C2B8E4B */ jal func_80AE392C /* 00490 80AE2890 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00494 80AE2894 10000028 */ beq $zero, $zero, .L80AE2938 -/* 00498 80AE2898 8FB90034 */ lw $t9, 0x0034($sp) +/* 00494 80AE2894 10000028 */ beq $zero, $zero, .L80AE2938 +/* 00498 80AE2898 8FB90034 */ lw $t9, 0x0034($sp) /* 0049C 80AE289C 920D0305 */ lbu $t5, 0x0305($s0) ## 00000305 .L80AE28A0: -/* 004A0 80AE28A0 51A0000C */ beql $t5, $zero, .L80AE28D4 +/* 004A0 80AE28A0 51A0000C */ beql $t5, $zero, .L80AE28D4 /* 004A4 80AE28A4 3C014316 */ lui $at, 0x4316 ## $at = 43160000 /* 004A8 80AE28A8 860E001C */ lh $t6, 0x001C($s0) ## 0000001C /* 004AC 80AE28AC 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 004B0 80AE28B0 11C10005 */ beq $t6, $at, .L80AE28C8 +/* 004B0 80AE28B0 11C10005 */ beq $t6, $at, .L80AE28C8 /* 004B4 80AE28B4 00000000 */ nop -/* 004B8 80AE28B8 0C2B8DEF */ jal func_80AE37BC +/* 004B8 80AE28B8 0C2B8DEF */ jal func_80AE37BC /* 004BC 80AE28BC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 004C0 80AE28C0 10000004 */ beq $zero, $zero, .L80AE28D4 +/* 004C0 80AE28C0 10000004 */ beq $zero, $zero, .L80AE28D4 /* 004C4 80AE28C4 3C014316 */ lui $at, 0x4316 ## $at = 43160000 .L80AE28C8: -/* 004C8 80AE28C8 0C2B8E4B */ jal func_80AE392C +/* 004C8 80AE28C8 0C2B8E4B */ jal func_80AE392C /* 004CC 80AE28CC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 004D0 80AE28D0 3C014316 */ lui $at, 0x4316 ## $at = 43160000 .L80AE28D4: /* 004D4 80AE28D4 44813000 */ mtc1 $at, $f6 ## $f6 = 150.00 /* 004D8 80AE28D8 C6080090 */ lwc1 $f8, 0x0090($s0) ## 00000090 /* 004DC 80AE28DC A2000305 */ sb $zero, 0x0305($s0) ## 00000305 -/* 004E0 80AE28E0 4606403E */ c.le.s $f8, $f6 +/* 004E0 80AE28E0 4606403E */ c.le.s $f8, $f6 /* 004E4 80AE28E4 00000000 */ nop -/* 004E8 80AE28E8 45020013 */ bc1fl .L80AE2938 -/* 004EC 80AE28EC 8FB90034 */ lw $t9, 0x0034($sp) -/* 004F0 80AE28F0 0C00B779 */ jal func_8002DDE4 -/* 004F4 80AE28F4 8FA40034 */ lw $a0, 0x0034($sp) -/* 004F8 80AE28F8 5040000F */ beql $v0, $zero, .L80AE2938 -/* 004FC 80AE28FC 8FB90034 */ lw $t9, 0x0034($sp) +/* 004E8 80AE28E8 45020013 */ bc1fl .L80AE2938 +/* 004EC 80AE28EC 8FB90034 */ lw $t9, 0x0034($sp) +/* 004F0 80AE28F0 0C00B779 */ jal func_8002DDE4 +/* 004F4 80AE28F4 8FA40034 */ lw $a0, 0x0034($sp) +/* 004F8 80AE28F8 5040000F */ beql $v0, $zero, .L80AE2938 +/* 004FC 80AE28FC 8FB90034 */ lw $t9, 0x0034($sp) /* 00500 80AE2900 860F001C */ lh $t7, 0x001C($s0) ## 0000001C /* 00504 80AE2904 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 00508 80AE2908 11E10008 */ beq $t7, $at, .L80AE292C +/* 00508 80AE2908 11E10008 */ beq $t7, $at, .L80AE292C /* 0050C 80AE290C 00000000 */ nop /* 00510 80AE2910 92180305 */ lbu $t8, 0x0305($s0) ## 00000305 -/* 00514 80AE2914 17000005 */ bne $t8, $zero, .L80AE292C +/* 00514 80AE2914 17000005 */ bne $t8, $zero, .L80AE292C /* 00518 80AE2918 00000000 */ nop -/* 0051C 80AE291C 0C2B8DEF */ jal func_80AE37BC +/* 0051C 80AE291C 0C2B8DEF */ jal func_80AE37BC /* 00520 80AE2920 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00524 80AE2924 10000004 */ beq $zero, $zero, .L80AE2938 -/* 00528 80AE2928 8FB90034 */ lw $t9, 0x0034($sp) +/* 00524 80AE2924 10000004 */ beq $zero, $zero, .L80AE2938 +/* 00528 80AE2928 8FB90034 */ lw $t9, 0x0034($sp) .L80AE292C: -/* 0052C 80AE292C 0C2B8E4B */ jal func_80AE392C +/* 0052C 80AE292C 0C2B8E4B */ jal func_80AE392C /* 00530 80AE2930 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00534 80AE2934 8FB90034 */ lw $t9, 0x0034($sp) +/* 00534 80AE2934 8FB90034 */ lw $t9, 0x0034($sp) .L80AE2938: /* 00538 80AE2938 3C080001 */ lui $t0, 0x0001 ## $t0 = 00010000 /* 0053C 80AE293C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00540 80AE2940 01194021 */ addu $t0, $t0, $t9 +/* 00540 80AE2940 01194021 */ addu $t0, $t0, $t9 /* 00544 80AE2944 8D081DE4 */ lw $t0, 0x1DE4($t0) ## 00011DE4 /* 00548 80AE2948 3109005F */ andi $t1, $t0, 0x005F ## $t1 = 00000000 -/* 0054C 80AE294C 55200004 */ bnel $t1, $zero, .L80AE2960 -/* 00550 80AE2950 8FBF0024 */ lw $ra, 0x0024($sp) +/* 0054C 80AE294C 55200004 */ bnel $t1, $zero, .L80AE2960 +/* 00550 80AE2950 8FBF0024 */ lw $ra, 0x0024($sp) /* 00554 80AE2954 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 00558 80AE2958 240538E4 */ addiu $a1, $zero, 0x38E4 ## $a1 = 000038E4 -/* 0055C 80AE295C 8FBF0024 */ lw $ra, 0x0024($sp) +/* 0055C 80AE295C 8FBF0024 */ lw $ra, 0x0024($sp) .L80AE2960: -/* 00560 80AE2960 8FB00020 */ lw $s0, 0x0020($sp) +/* 00560 80AE2960 8FB00020 */ lw $s0, 0x0020($sp) /* 00564 80AE2964 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 00568 80AE2968 03E00008 */ jr $ra +/* 00568 80AE2968 03E00008 */ jr $ra /* 0056C 80AE296C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Rd/func_80AE2970.s b/asm/non_matchings/overlays/actors/ovl_En_Rd/func_80AE2970.s index 47d3baf001..6886f1d5e4 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Rd/func_80AE2970.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Rd/func_80AE2970.s @@ -1,27 +1,27 @@ glabel func_80AE2970 /* 00570 80AE2970 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 00574 80AE2974 AFB00028 */ sw $s0, 0x0028($sp) +/* 00574 80AE2974 AFB00028 */ sw $s0, 0x0028($sp) /* 00578 80AE2978 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 0057C 80AE297C AFBF002C */ sw $ra, 0x002C($sp) +/* 0057C 80AE297C AFBF002C */ sw $ra, 0x002C($sp) /* 00580 80AE2980 3C040601 */ lui $a0, 0x0601 ## $a0 = 06010000 /* 00584 80AE2984 0C028800 */ jal SkelAnime_GetFrameCount - + /* 00588 80AE2988 248487D0 */ addiu $a0, $a0, 0x87D0 ## $a0 = 060087D0 /* 0058C 80AE298C 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 00590 80AE2990 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 /* 00594 80AE2994 3C01C0C0 */ lui $at, 0xC0C0 ## $at = C0C00000 -/* 00598 80AE2998 468021A0 */ cvt.s.w $f6, $f4 +/* 00598 80AE2998 468021A0 */ cvt.s.w $f6, $f4 /* 0059C 80AE299C 44814000 */ mtc1 $at, $f8 ## $f8 = -6.00 /* 005A0 80AE29A0 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 -/* 005A4 80AE29A4 44060000 */ mfc1 $a2, $f0 -/* 005A8 80AE29A8 44070000 */ mfc1 $a3, $f0 +/* 005A4 80AE29A4 44060000 */ mfc1 $a2, $f0 +/* 005A8 80AE29A8 44070000 */ mfc1 $a3, $f0 /* 005AC 80AE29AC 24A587D0 */ addiu $a1, $a1, 0x87D0 ## $a1 = 060087D0 -/* 005B0 80AE29B0 E7A60010 */ swc1 $f6, 0x0010($sp) +/* 005B0 80AE29B0 E7A60010 */ swc1 $f6, 0x0010($sp) /* 005B4 80AE29B4 26040188 */ addiu $a0, $s0, 0x0188 ## $a0 = 00000188 -/* 005B8 80AE29B8 AFA00014 */ sw $zero, 0x0014($sp) -/* 005BC 80AE29BC 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 005C0 80AE29C0 E7A80018 */ swc1 $f8, 0x0018($sp) +/* 005B8 80AE29B8 AFA00014 */ sw $zero, 0x0014($sp) +/* 005BC 80AE29BC 0C029468 */ jal SkelAnime_ChangeAnim + +/* 005C0 80AE29C0 E7A80018 */ swc1 $f8, 0x0018($sp) /* 005C4 80AE29C4 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 /* 005C8 80AE29C8 240E000B */ addiu $t6, $zero, 0x000B ## $t6 = 0000000B /* 005CC 80AE29CC 240F0006 */ addiu $t7, $zero, 0x0006 ## $t7 = 00000006 @@ -34,12 +34,12 @@ glabel func_80AE2970 /* 005E8 80AE29E8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 005EC 80AE29EC E600006C */ swc1 $f0, 0x006C($s0) ## 0000006C /* 005F0 80AE29F0 E60000BC */ swc1 $f0, 0x00BC($s0) ## 000000BC -/* 005F4 80AE29F4 0C2B8900 */ jal func_80AE2400 +/* 005F4 80AE29F4 0C2B8900 */ jal func_80AE2400 /* 005F8 80AE29F8 E6000068 */ swc1 $f0, 0x0068($s0) ## 00000068 -/* 005FC 80AE29FC 8FBF002C */ lw $ra, 0x002C($sp) -/* 00600 80AE2A00 8FB00028 */ lw $s0, 0x0028($sp) +/* 005FC 80AE29FC 8FBF002C */ lw $ra, 0x002C($sp) +/* 00600 80AE2A00 8FB00028 */ lw $s0, 0x0028($sp) /* 00604 80AE2A04 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 00608 80AE2A08 03E00008 */ jr $ra +/* 00608 80AE2A08 03E00008 */ jr $ra /* 0060C 80AE2A0C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Rd/func_80AE2B90.s b/asm/non_matchings/overlays/actors/ovl_En_Rd/func_80AE2B90.s index 04f3abc918..6bf9c74610 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Rd/func_80AE2B90.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Rd/func_80AE2B90.s @@ -1,40 +1,40 @@ glabel func_80AE2B90 /* 00790 80AE2B90 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 00794 80AE2B94 AFA40028 */ sw $a0, 0x0028($sp) -/* 00798 80AE2B98 AFBF0024 */ sw $ra, 0x0024($sp) +/* 00794 80AE2B94 AFA40028 */ sw $a0, 0x0028($sp) +/* 00798 80AE2B98 AFBF0024 */ sw $ra, 0x0024($sp) /* 0079C 80AE2B9C 3C040601 */ lui $a0, 0x0601 ## $a0 = 06010000 -/* 007A0 80AE2BA0 AFA5002C */ sw $a1, 0x002C($sp) +/* 007A0 80AE2BA0 AFA5002C */ sw $a1, 0x002C($sp) /* 007A4 80AE2BA4 0C028800 */ jal SkelAnime_GetFrameCount - + /* 007A8 80AE2BA8 2484EFDC */ addiu $a0, $a0, 0xEFDC ## $a0 = 0600EFDC /* 007AC 80AE2BAC 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 007B0 80AE2BB0 3C01C080 */ lui $at, 0xC080 ## $at = C0800000 /* 007B4 80AE2BB4 44814000 */ mtc1 $at, $f8 ## $f8 = -4.00 -/* 007B8 80AE2BB8 468021A0 */ cvt.s.w $f6, $f4 -/* 007BC 80AE2BBC 8FA40028 */ lw $a0, 0x0028($sp) +/* 007B8 80AE2BB8 468021A0 */ cvt.s.w $f6, $f4 +/* 007BC 80AE2BBC 8FA40028 */ lw $a0, 0x0028($sp) /* 007C0 80AE2BC0 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 /* 007C4 80AE2BC4 240E0001 */ addiu $t6, $zero, 0x0001 ## $t6 = 00000001 -/* 007C8 80AE2BC8 AFAE0014 */ sw $t6, 0x0014($sp) +/* 007C8 80AE2BC8 AFAE0014 */ sw $t6, 0x0014($sp) /* 007CC 80AE2BCC 24A5EFDC */ addiu $a1, $a1, 0xEFDC ## $a1 = 0600EFDC -/* 007D0 80AE2BD0 E7A60010 */ swc1 $f6, 0x0010($sp) +/* 007D0 80AE2BD0 E7A60010 */ swc1 $f6, 0x0010($sp) /* 007D4 80AE2BD4 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 007D8 80AE2BD8 3C074080 */ lui $a3, 0x4080 ## $a3 = 40800000 -/* 007DC 80AE2BDC E7A80018 */ swc1 $f8, 0x0018($sp) -/* 007E0 80AE2BE0 0C029468 */ jal SkelAnime_ChangeAnimation - +/* 007DC 80AE2BDC E7A80018 */ swc1 $f8, 0x0018($sp) +/* 007E0 80AE2BE0 0C029468 */ jal SkelAnime_ChangeAnim + /* 007E4 80AE2BE4 24840188 */ addiu $a0, $a0, 0x0188 ## $a0 = 00000188 -/* 007E8 80AE2BE8 8FA40028 */ lw $a0, 0x0028($sp) +/* 007E8 80AE2BE8 8FA40028 */ lw $a0, 0x0028($sp) /* 007EC 80AE2BEC 3C0180AE */ lui $at, %hi(D_80AE499C) ## $at = 80AE0000 -/* 007F0 80AE2BF0 C42A499C */ lwc1 $f10, %lo(D_80AE499C)($at) +/* 007F0 80AE2BF0 C42A499C */ lwc1 $f10, %lo(D_80AE499C)($at) /* 007F4 80AE2BF4 240F0004 */ addiu $t7, $zero, 0x0004 ## $t7 = 00000004 /* 007F8 80AE2BF8 3C0580AE */ lui $a1, %hi(func_80AE2C1C) ## $a1 = 80AE0000 /* 007FC 80AE2BFC 24A52C1C */ addiu $a1, $a1, %lo(func_80AE2C1C) ## $a1 = 80AE2C1C /* 00800 80AE2C00 A08F031B */ sb $t7, 0x031B($a0) ## 0000031B -/* 00804 80AE2C04 0C2B8900 */ jal func_80AE2400 +/* 00804 80AE2C04 0C2B8900 */ jal func_80AE2400 /* 00808 80AE2C08 E48A0068 */ swc1 $f10, 0x0068($a0) ## 00000068 -/* 0080C 80AE2C0C 8FBF0024 */ lw $ra, 0x0024($sp) +/* 0080C 80AE2C0C 8FBF0024 */ lw $ra, 0x0024($sp) /* 00810 80AE2C10 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 00814 80AE2C14 03E00008 */ jr $ra +/* 00814 80AE2C14 03E00008 */ jr $ra /* 00818 80AE2C18 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Rd/func_80AE2F50.s b/asm/non_matchings/overlays/actors/ovl_En_Rd/func_80AE2F50.s index 32cecaefb5..ee4ed17e28 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Rd/func_80AE2F50.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Rd/func_80AE2F50.s @@ -1,37 +1,37 @@ glabel func_80AE2F50 /* 00B50 80AE2F50 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 00B54 80AE2F54 AFA40028 */ sw $a0, 0x0028($sp) -/* 00B58 80AE2F58 AFBF0024 */ sw $ra, 0x0024($sp) +/* 00B54 80AE2F54 AFA40028 */ sw $a0, 0x0028($sp) +/* 00B58 80AE2F58 AFBF0024 */ sw $ra, 0x0024($sp) /* 00B5C 80AE2F5C 3C040601 */ lui $a0, 0x0601 ## $a0 = 06010000 -/* 00B60 80AE2F60 AFA5002C */ sw $a1, 0x002C($sp) +/* 00B60 80AE2F60 AFA5002C */ sw $a1, 0x002C($sp) /* 00B64 80AE2F64 0C028800 */ jal SkelAnime_GetFrameCount - + /* 00B68 80AE2F68 2484EFDC */ addiu $a0, $a0, 0xEFDC ## $a0 = 0600EFDC /* 00B6C 80AE2F6C 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 00B70 80AE2F70 3C01C080 */ lui $at, 0xC080 ## $at = C0800000 /* 00B74 80AE2F74 44814000 */ mtc1 $at, $f8 ## $f8 = -4.00 -/* 00B78 80AE2F78 468021A0 */ cvt.s.w $f6, $f4 -/* 00B7C 80AE2F7C 8FA40028 */ lw $a0, 0x0028($sp) +/* 00B78 80AE2F78 468021A0 */ cvt.s.w $f6, $f4 +/* 00B7C 80AE2F7C 8FA40028 */ lw $a0, 0x0028($sp) /* 00B80 80AE2F80 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 /* 00B84 80AE2F84 240E0001 */ addiu $t6, $zero, 0x0001 ## $t6 = 00000001 -/* 00B88 80AE2F88 AFAE0014 */ sw $t6, 0x0014($sp) +/* 00B88 80AE2F88 AFAE0014 */ sw $t6, 0x0014($sp) /* 00B8C 80AE2F8C 24A5EFDC */ addiu $a1, $a1, 0xEFDC ## $a1 = 0600EFDC -/* 00B90 80AE2F90 E7A60010 */ swc1 $f6, 0x0010($sp) +/* 00B90 80AE2F90 E7A60010 */ swc1 $f6, 0x0010($sp) /* 00B94 80AE2F94 3C063F00 */ lui $a2, 0x3F00 ## $a2 = 3F000000 /* 00B98 80AE2F98 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 00B9C 80AE2F9C E7A80018 */ swc1 $f8, 0x0018($sp) -/* 00BA0 80AE2FA0 0C029468 */ jal SkelAnime_ChangeAnimation - +/* 00B9C 80AE2F9C E7A80018 */ swc1 $f8, 0x0018($sp) +/* 00BA0 80AE2FA0 0C029468 */ jal SkelAnime_ChangeAnim + /* 00BA4 80AE2FA4 24840188 */ addiu $a0, $a0, 0x0188 ## $a0 = 00000188 -/* 00BA8 80AE2FA8 8FA40028 */ lw $a0, 0x0028($sp) +/* 00BA8 80AE2FA8 8FA40028 */ lw $a0, 0x0028($sp) /* 00BAC 80AE2FAC 240F0002 */ addiu $t7, $zero, 0x0002 ## $t7 = 00000002 /* 00BB0 80AE2FB0 3C0580AE */ lui $a1, %hi(func_80AE2FD0) ## $a1 = 80AE0000 /* 00BB4 80AE2FB4 24A52FD0 */ addiu $a1, $a1, %lo(func_80AE2FD0) ## $a1 = 80AE2FD0 -/* 00BB8 80AE2FB8 0C2B8900 */ jal func_80AE2400 +/* 00BB8 80AE2FB8 0C2B8900 */ jal func_80AE2400 /* 00BBC 80AE2FBC A08F031B */ sb $t7, 0x031B($a0) ## 0000031B -/* 00BC0 80AE2FC0 8FBF0024 */ lw $ra, 0x0024($sp) +/* 00BC0 80AE2FC0 8FBF0024 */ lw $ra, 0x0024($sp) /* 00BC4 80AE2FC4 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 00BC8 80AE2FC8 03E00008 */ jr $ra +/* 00BC8 80AE2FC8 03E00008 */ jr $ra /* 00BCC 80AE2FCC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Rd/func_80AE31DC.s b/asm/non_matchings/overlays/actors/ovl_En_Rd/func_80AE31DC.s index 30bc2f5f4e..663c721142 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Rd/func_80AE31DC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Rd/func_80AE31DC.s @@ -1,38 +1,38 @@ glabel func_80AE31DC /* 00DDC 80AE31DC 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 00DE0 80AE31E0 AFA40028 */ sw $a0, 0x0028($sp) -/* 00DE4 80AE31E4 AFBF0024 */ sw $ra, 0x0024($sp) +/* 00DE0 80AE31E0 AFA40028 */ sw $a0, 0x0028($sp) +/* 00DE4 80AE31E4 AFBF0024 */ sw $ra, 0x0024($sp) /* 00DE8 80AE31E8 3C040601 */ lui $a0, 0x0601 ## $a0 = 06010000 /* 00DEC 80AE31EC 0C028800 */ jal SkelAnime_GetFrameCount - + /* 00DF0 80AE31F0 2484EFDC */ addiu $a0, $a0, 0xEFDC ## $a0 = 0600EFDC /* 00DF4 80AE31F4 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 00DF8 80AE31F8 3C01C080 */ lui $at, 0xC080 ## $at = C0800000 /* 00DFC 80AE31FC 44814000 */ mtc1 $at, $f8 ## $f8 = -4.00 -/* 00E00 80AE3200 468021A0 */ cvt.s.w $f6, $f4 -/* 00E04 80AE3204 8FA40028 */ lw $a0, 0x0028($sp) +/* 00E00 80AE3200 468021A0 */ cvt.s.w $f6, $f4 +/* 00E04 80AE3204 8FA40028 */ lw $a0, 0x0028($sp) /* 00E08 80AE3208 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 /* 00E0C 80AE320C 240E0001 */ addiu $t6, $zero, 0x0001 ## $t6 = 00000001 -/* 00E10 80AE3210 AFAE0014 */ sw $t6, 0x0014($sp) +/* 00E10 80AE3210 AFAE0014 */ sw $t6, 0x0014($sp) /* 00E14 80AE3214 24A5EFDC */ addiu $a1, $a1, 0xEFDC ## $a1 = 0600EFDC -/* 00E18 80AE3218 E7A60010 */ swc1 $f6, 0x0010($sp) +/* 00E18 80AE3218 E7A60010 */ swc1 $f6, 0x0010($sp) /* 00E1C 80AE321C 3C063F00 */ lui $a2, 0x3F00 ## $a2 = 3F000000 /* 00E20 80AE3220 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 00E24 80AE3224 E7A80018 */ swc1 $f8, 0x0018($sp) -/* 00E28 80AE3228 0C029468 */ jal SkelAnime_ChangeAnimation - +/* 00E24 80AE3224 E7A80018 */ swc1 $f8, 0x0018($sp) +/* 00E28 80AE3228 0C029468 */ jal SkelAnime_ChangeAnim + /* 00E2C 80AE322C 24840188 */ addiu $a0, $a0, 0x0188 ## $a0 = 00000188 -/* 00E30 80AE3230 8FA40028 */ lw $a0, 0x0028($sp) +/* 00E30 80AE3230 8FA40028 */ lw $a0, 0x0028($sp) /* 00E34 80AE3234 240F0003 */ addiu $t7, $zero, 0x0003 ## $t7 = 00000003 /* 00E38 80AE3238 24180001 */ addiu $t8, $zero, 0x0001 ## $t8 = 00000001 /* 00E3C 80AE323C 3C0580AE */ lui $a1, %hi(func_80AE3260) ## $a1 = 80AE0000 /* 00E40 80AE3240 24A53260 */ addiu $a1, $a1, %lo(func_80AE3260) ## $a1 = 80AE3260 /* 00E44 80AE3244 A08F031B */ sb $t7, 0x031B($a0) ## 0000031B -/* 00E48 80AE3248 0C2B8900 */ jal func_80AE2400 +/* 00E48 80AE3248 0C2B8900 */ jal func_80AE2400 /* 00E4C 80AE324C A0980305 */ sb $t8, 0x0305($a0) ## 00000305 -/* 00E50 80AE3250 8FBF0024 */ lw $ra, 0x0024($sp) +/* 00E50 80AE3250 8FBF0024 */ lw $ra, 0x0024($sp) /* 00E54 80AE3254 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 00E58 80AE3258 03E00008 */ jr $ra +/* 00E58 80AE3258 03E00008 */ jr $ra /* 00E5C 80AE325C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Rd/func_80AE33F0.s b/asm/non_matchings/overlays/actors/ovl_En_Rd/func_80AE33F0.s index 3f6934ba76..7215908ed6 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Rd/func_80AE33F0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Rd/func_80AE33F0.s @@ -1,13 +1,13 @@ glabel func_80AE33F0 /* 00FF0 80AE33F0 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00FF4 80AE33F4 AFBF0014 */ sw $ra, 0x0014($sp) +/* 00FF4 80AE33F4 AFBF0014 */ sw $ra, 0x0014($sp) /* 00FF8 80AE33F8 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 /* 00FFC 80AE33FC 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 01000 80AE3400 24A54ADC */ addiu $a1, $a1, 0x4ADC ## $a1 = 06004ADC -/* 01004 80AE3404 AFA60018 */ sw $a2, 0x0018($sp) -/* 01008 80AE3408 0C02947A */ jal func_800A51E8 +/* 01004 80AE3404 AFA60018 */ sw $a2, 0x0018($sp) +/* 01008 80AE3408 0C02947A */ jal SkelAnime_ChangeAnimDefaultStop /* 0100C 80AE340C 24840188 */ addiu $a0, $a0, 0x0188 ## $a0 = 00000188 -/* 01010 80AE3410 8FA40018 */ lw $a0, 0x0018($sp) +/* 01010 80AE3410 8FA40018 */ lw $a0, 0x0018($sp) /* 01014 80AE3414 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 /* 01018 80AE3418 300E00FF */ andi $t6, $zero, 0x00FF ## $t6 = 00000000 /* 0101C 80AE341C 240F00C8 */ addiu $t7, $zero, 0x00C8 ## $t7 = 000000C8 @@ -18,11 +18,11 @@ glabel func_80AE33F0 /* 01030 80AE3430 A0800304 */ sb $zero, 0x0304($a0) ## 00000304 /* 01034 80AE3434 A08F0319 */ sb $t7, 0x0319($a0) ## 00000319 /* 01038 80AE3438 A098031B */ sb $t8, 0x031B($a0) ## 0000031B -/* 0103C 80AE343C 0C2B8900 */ jal func_80AE2400 +/* 0103C 80AE343C 0C2B8900 */ jal func_80AE2400 /* 01040 80AE3440 E4840068 */ swc1 $f4, 0x0068($a0) ## 00000068 -/* 01044 80AE3444 8FBF0014 */ lw $ra, 0x0014($sp) +/* 01044 80AE3444 8FBF0014 */ lw $ra, 0x0014($sp) /* 01048 80AE3448 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 0104C 80AE344C 03E00008 */ jr $ra +/* 0104C 80AE344C 03E00008 */ jr $ra /* 01050 80AE3450 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Rd/func_80AE3454.s b/asm/non_matchings/overlays/actors/ovl_En_Rd/func_80AE3454.s index 299c4849b7..c4809c66b8 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Rd/func_80AE3454.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Rd/func_80AE3454.s @@ -1,49 +1,49 @@ glabel func_80AE3454 /* 01054 80AE3454 27BDFFB8 */ addiu $sp, $sp, 0xFFB8 ## $sp = FFFFFFB8 -/* 01058 80AE3458 AFB00028 */ sw $s0, 0x0028($sp) -/* 0105C 80AE345C AFBF002C */ sw $ra, 0x002C($sp) -/* 01060 80AE3460 AFA5004C */ sw $a1, 0x004C($sp) +/* 01058 80AE3458 AFB00028 */ sw $s0, 0x0028($sp) +/* 0105C 80AE345C AFBF002C */ sw $ra, 0x002C($sp) +/* 01060 80AE3460 AFA5004C */ sw $a1, 0x004C($sp) /* 01064 80AE3464 8CAF1C44 */ lw $t7, 0x1C44($a1) ## 00001C44 /* 01068 80AE3468 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 0106C 80AE346C 24840188 */ addiu $a0, $a0, 0x0188 ## $a0 = 00000188 -/* 01070 80AE3470 AFA40034 */ sw $a0, 0x0034($sp) +/* 01070 80AE3470 AFA40034 */ sw $a0, 0x0034($sp) /* 01074 80AE3474 0C02927F */ jal SkelAnime_FrameUpdateMatrix - -/* 01078 80AE3478 AFAF0040 */ sw $t7, 0x0040($sp) -/* 0107C 80AE347C 50400005 */ beql $v0, $zero, .L80AE3494 + +/* 01078 80AE3478 AFAF0040 */ sw $t7, 0x0040($sp) +/* 0107C 80AE347C 50400005 */ beql $v0, $zero, .L80AE3494 /* 01080 80AE3480 92080304 */ lbu $t0, 0x0304($s0) ## 00000304 /* 01084 80AE3484 92180304 */ lbu $t8, 0x0304($s0) ## 00000304 /* 01088 80AE3488 27190001 */ addiu $t9, $t8, 0x0001 ## $t9 = 00000001 /* 0108C 80AE348C A2190304 */ sb $t9, 0x0304($s0) ## 00000304 /* 01090 80AE3490 92080304 */ lbu $t0, 0x0304($s0) ## 00000304 .L80AE3494: -/* 01094 80AE3494 2D010005 */ sltiu $at, $t0, 0x0005 -/* 01098 80AE3498 102000C3 */ beq $at, $zero, .L80AE37A8 -/* 0109C 80AE349C 00084080 */ sll $t0, $t0, 2 +/* 01094 80AE3494 2D010005 */ sltiu $at, $t0, 0x0005 +/* 01098 80AE3498 102000C3 */ beq $at, $zero, .L80AE37A8 +/* 0109C 80AE349C 00084080 */ sll $t0, $t0, 2 /* 010A0 80AE34A0 3C0180AE */ lui $at, %hi(jtbl_80AE49A4) ## $at = 80AE0000 -/* 010A4 80AE34A4 00280821 */ addu $at, $at, $t0 -/* 010A8 80AE34A8 8C2849A4 */ lw $t0, %lo(jtbl_80AE49A4)($at) -/* 010AC 80AE34AC 01000008 */ jr $t0 +/* 010A4 80AE34A4 00280821 */ addu $at, $at, $t0 +/* 010A8 80AE34A8 8C2849A4 */ lw $t0, %lo(jtbl_80AE49A4)($at) +/* 010AC 80AE34AC 01000008 */ jr $t0 /* 010B0 80AE34B0 00000000 */ nop glabel L80AE34B4 /* 010B4 80AE34B4 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 010B8 80AE34B8 24A54268 */ addiu $a1, $a1, 0x4268 ## $a1 = 06004268 -/* 010BC 80AE34BC 0C0294BE */ jal func_800A52F8 -/* 010C0 80AE34C0 8FA40034 */ lw $a0, 0x0034($sp) +/* 010BC 80AE34BC 0C0294BE */ jal SkelAnime_ChangeAnimDefaultRepeat +/* 010C0 80AE34C0 8FA40034 */ lw $a0, 0x0034($sp) /* 010C4 80AE34C4 92090304 */ lbu $t1, 0x0304($s0) ## 00000304 -/* 010C8 80AE34C8 8FA4004C */ lw $a0, 0x004C($sp) +/* 010C8 80AE34C8 8FA4004C */ lw $a0, 0x004C($sp) /* 010CC 80AE34CC 3C190001 */ lui $t9, 0x0001 ## $t9 = 00010000 /* 010D0 80AE34D0 252A0001 */ addiu $t2, $t1, 0x0001 ## $t2 = 00000001 /* 010D4 80AE34D4 A20A0304 */ sb $t2, 0x0304($s0) ## 00000304 -/* 010D8 80AE34D8 0324C821 */ addu $t9, $t9, $a0 +/* 010D8 80AE34D8 0324C821 */ addu $t9, $t9, $a0 /* 010DC 80AE34DC 8F391D58 */ lw $t9, 0x1D58($t9) ## 00011D58 /* 010E0 80AE34E0 2405FFF8 */ addiu $a1, $zero, 0xFFF8 ## $a1 = FFFFFFF8 -/* 010E4 80AE34E4 0320F809 */ jalr $ra, $t9 +/* 010E4 80AE34E4 0320F809 */ jalr $ra, $t9 /* 010E8 80AE34E8 00000000 */ nop /* 010EC 80AE34EC C60C0090 */ lwc1 $f12, 0x0090($s0) ## 00000090 /* 010F0 80AE34F0 240500FF */ addiu $a1, $zero, 0x00FF ## $a1 = 000000FF /* 010F4 80AE34F4 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 -/* 010F8 80AE34F8 0C02A800 */ jal func_800AA000 +/* 010F8 80AE34F8 0C02A800 */ jal func_800AA000 /* 010FC 80AE34FC 2407000C */ addiu $a3, $zero, 0x000C ## $a3 = 0000000C /* 01100 80AE3500 240B0014 */ addiu $t3, $zero, 0x0014 ## $t3 = 00000014 /* 01104 80AE3504 A20B0319 */ sb $t3, 0x0319($s0) ## 00000319 @@ -53,178 +53,178 @@ glabel L80AE3508 /* 01110 80AE3510 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 /* 01114 80AE3514 240705DC */ addiu $a3, $zero, 0x05DC ## $a3 = 000005DC /* 01118 80AE3518 0C01E1A7 */ jal Math_SmoothScaleMaxMinS - -/* 0111C 80AE351C AFA00010 */ sw $zero, 0x0010($sp) + +/* 0111C 80AE351C AFA00010 */ sw $zero, 0x0010($sp) /* 01120 80AE3520 26040310 */ addiu $a0, $s0, 0x0310 ## $a0 = 00000310 /* 01124 80AE3524 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 01128 80AE3528 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 /* 0112C 80AE352C 240705DC */ addiu $a3, $zero, 0x05DC ## $a3 = 000005DC /* 01130 80AE3530 0C01E1A7 */ jal Math_SmoothScaleMaxMinS - -/* 01134 80AE3534 AFA00010 */ sw $zero, 0x0010($sp) + +/* 01134 80AE3534 AFA00010 */ sw $zero, 0x0010($sp) glabel L80AE3538 -/* 01138 80AE3538 8FAC0040 */ lw $t4, 0x0040($sp) +/* 01138 80AE3538 8FAC0040 */ lw $t4, 0x0040($sp) /* 0113C 80AE353C 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 /* 01140 80AE3540 3C0A8016 */ lui $t2, 0x8016 ## $t2 = 80160000 /* 01144 80AE3544 8D8D0680 */ lw $t5, 0x0680($t4) ## 00000680 /* 01148 80AE3548 31AE0080 */ andi $t6, $t5, 0x0080 ## $t6 = 00000000 -/* 0114C 80AE354C 15C00016 */ bne $t6, $zero, .L80AE35A8 +/* 0114C 80AE354C 15C00016 */ bne $t6, $zero, .L80AE35A8 /* 01150 80AE3550 00000000 */ nop /* 01154 80AE3554 0C028800 */ jal SkelAnime_GetFrameCount - + /* 01158 80AE3558 248446F8 */ addiu $a0, $a0, 0x46F8 ## $a0 = 060046F8 /* 0115C 80AE355C 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 01160 80AE3560 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 /* 01164 80AE3564 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 01168 80AE3568 468021A0 */ cvt.s.w $f6, $f4 +/* 01168 80AE3568 468021A0 */ cvt.s.w $f6, $f4 /* 0116C 80AE356C 240F0003 */ addiu $t7, $zero, 0x0003 ## $t7 = 00000003 -/* 01170 80AE3570 44070000 */ mfc1 $a3, $f0 -/* 01174 80AE3574 AFAF0014 */ sw $t7, 0x0014($sp) +/* 01170 80AE3570 44070000 */ mfc1 $a3, $f0 +/* 01174 80AE3574 AFAF0014 */ sw $t7, 0x0014($sp) /* 01178 80AE3578 24A546F8 */ addiu $a1, $a1, 0x46F8 ## $a1 = 060046F8 -/* 0117C 80AE357C 8FA40034 */ lw $a0, 0x0034($sp) -/* 01180 80AE3580 E7A60010 */ swc1 $f6, 0x0010($sp) +/* 0117C 80AE357C 8FA40034 */ lw $a0, 0x0034($sp) +/* 01180 80AE3580 E7A60010 */ swc1 $f6, 0x0010($sp) /* 01184 80AE3584 3C063F00 */ lui $a2, 0x3F00 ## $a2 = 3F000000 -/* 01188 80AE3588 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 0118C 80AE358C E7A00018 */ swc1 $f0, 0x0018($sp) +/* 01188 80AE3588 0C029468 */ jal SkelAnime_ChangeAnim + +/* 0118C 80AE358C E7A00018 */ swc1 $f0, 0x0018($sp) /* 01190 80AE3590 92180304 */ lbu $t8, 0x0304($s0) ## 00000304 /* 01194 80AE3594 24090004 */ addiu $t1, $zero, 0x0004 ## $t1 = 00000004 /* 01198 80AE3598 A209031B */ sb $t1, 0x031B($s0) ## 0000031B /* 0119C 80AE359C 27080001 */ addiu $t0, $t8, 0x0001 ## $t0 = 00000001 -/* 011A0 80AE35A0 10000081 */ beq $zero, $zero, .L80AE37A8 +/* 011A0 80AE35A0 10000081 */ beq $zero, $zero, .L80AE37A8 /* 011A4 80AE35A4 A2080304 */ sb $t0, 0x0304($s0) ## 00000304 .L80AE35A8: /* 011A8 80AE35A8 8D4AE664 */ lw $t2, -0x199C($t2) ## FFFFE664 /* 011AC 80AE35AC 3C05C4BB */ lui $a1, 0xC4BB ## $a1 = C4BB0000 /* 011B0 80AE35B0 34A58000 */ ori $a1, $a1, 0x8000 ## $a1 = C4BB8000 -/* 011B4 80AE35B4 11400006 */ beq $t2, $zero, .L80AE35D0 +/* 011B4 80AE35B4 11400006 */ beq $t2, $zero, .L80AE35D0 /* 011B8 80AE35B8 260400BC */ addiu $a0, $s0, 0x00BC ## $a0 = 000000BC /* 011BC 80AE35BC 44804000 */ mtc1 $zero, $f8 ## $f8 = 0.00 /* 011C0 80AE35C0 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 011C4 80AE35C4 3C074316 */ lui $a3, 0x4316 ## $a3 = 43160000 /* 011C8 80AE35C8 0C01E0C4 */ jal Math_SmoothScaleMaxMinF - -/* 011CC 80AE35CC E7A80010 */ swc1 $f8, 0x0010($sp) + +/* 011CC 80AE35CC E7A80010 */ swc1 $f8, 0x0010($sp) .L80AE35D0: -/* 011D0 80AE35D0 8FB90040 */ lw $t9, 0x0040($sp) +/* 011D0 80AE35D0 8FB90040 */ lw $t9, 0x0040($sp) /* 011D4 80AE35D4 0C01DE1C */ jal Math_Sins ## sins? /* 011D8 80AE35D8 872400B6 */ lh $a0, 0x00B6($t9) ## 000000B6 /* 011DC 80AE35DC 3C01C1C8 */ lui $at, 0xC1C8 ## $at = C1C80000 /* 011E0 80AE35E0 44815000 */ mtc1 $at, $f10 ## $f10 = -25.00 -/* 011E4 80AE35E4 8FAB0040 */ lw $t3, 0x0040($sp) +/* 011E4 80AE35E4 8FAB0040 */ lw $t3, 0x0040($sp) /* 011E8 80AE35E8 44803000 */ mtc1 $zero, $f6 ## $f6 = 0.00 -/* 011EC 80AE35EC 460A0402 */ mul.s $f16, $f0, $f10 +/* 011EC 80AE35EC 460A0402 */ mul.s $f16, $f0, $f10 /* 011F0 80AE35F0 C5720024 */ lwc1 $f18, 0x0024($t3) ## 00000024 /* 011F4 80AE35F4 26040024 */ addiu $a0, $s0, 0x0024 ## $a0 = 00000024 /* 011F8 80AE35F8 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 011FC 80AE35FC 3C074120 */ lui $a3, 0x4120 ## $a3 = 41200000 -/* 01200 80AE3600 E7A60010 */ swc1 $f6, 0x0010($sp) -/* 01204 80AE3604 46128100 */ add.s $f4, $f16, $f18 -/* 01208 80AE3608 44052000 */ mfc1 $a1, $f4 +/* 01200 80AE3600 E7A60010 */ swc1 $f6, 0x0010($sp) +/* 01204 80AE3604 46128100 */ add.s $f4, $f16, $f18 +/* 01208 80AE3608 44052000 */ mfc1 $a1, $f4 /* 0120C 80AE360C 0C01E0C4 */ jal Math_SmoothScaleMaxMinF - + /* 01210 80AE3610 00000000 */ nop -/* 01214 80AE3614 8FAC0040 */ lw $t4, 0x0040($sp) +/* 01214 80AE3614 8FAC0040 */ lw $t4, 0x0040($sp) /* 01218 80AE3618 44804000 */ mtc1 $zero, $f8 ## $f8 = 0.00 /* 0121C 80AE361C 26040028 */ addiu $a0, $s0, 0x0028 ## $a0 = 00000028 /* 01220 80AE3620 8D850028 */ lw $a1, 0x0028($t4) ## 00000028 /* 01224 80AE3624 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 01228 80AE3628 3C074120 */ lui $a3, 0x4120 ## $a3 = 41200000 /* 0122C 80AE362C 0C01E0C4 */ jal Math_SmoothScaleMaxMinF - -/* 01230 80AE3630 E7A80010 */ swc1 $f8, 0x0010($sp) -/* 01234 80AE3634 8FAD0040 */ lw $t5, 0x0040($sp) + +/* 01230 80AE3630 E7A80010 */ swc1 $f8, 0x0010($sp) +/* 01234 80AE3634 8FAD0040 */ lw $t5, 0x0040($sp) /* 01238 80AE3638 0C01DE0D */ jal Math_Coss ## coss? /* 0123C 80AE363C 85A400B6 */ lh $a0, 0x00B6($t5) ## 000000B6 /* 01240 80AE3640 3C01C1C8 */ lui $at, 0xC1C8 ## $at = C1C80000 /* 01244 80AE3644 44815000 */ mtc1 $at, $f10 ## $f10 = -25.00 -/* 01248 80AE3648 8FAE0040 */ lw $t6, 0x0040($sp) +/* 01248 80AE3648 8FAE0040 */ lw $t6, 0x0040($sp) /* 0124C 80AE364C 44803000 */ mtc1 $zero, $f6 ## $f6 = 0.00 -/* 01250 80AE3650 460A0402 */ mul.s $f16, $f0, $f10 +/* 01250 80AE3650 460A0402 */ mul.s $f16, $f0, $f10 /* 01254 80AE3654 C5D2002C */ lwc1 $f18, 0x002C($t6) ## 0000002C /* 01258 80AE3658 2604002C */ addiu $a0, $s0, 0x002C ## $a0 = 0000002C /* 0125C 80AE365C 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 01260 80AE3660 3C074120 */ lui $a3, 0x4120 ## $a3 = 41200000 -/* 01264 80AE3664 E7A60010 */ swc1 $f6, 0x0010($sp) -/* 01268 80AE3668 46128100 */ add.s $f4, $f16, $f18 -/* 0126C 80AE366C 44052000 */ mfc1 $a1, $f4 +/* 01264 80AE3664 E7A60010 */ swc1 $f6, 0x0010($sp) +/* 01268 80AE3668 46128100 */ add.s $f4, $f16, $f18 +/* 0126C 80AE366C 44052000 */ mfc1 $a1, $f4 /* 01270 80AE3670 0C01E0C4 */ jal Math_SmoothScaleMaxMinF - + /* 01274 80AE3674 00000000 */ nop -/* 01278 80AE3678 8FAF0040 */ lw $t7, 0x0040($sp) +/* 01278 80AE3678 8FAF0040 */ lw $t7, 0x0040($sp) /* 0127C 80AE367C 260400B6 */ addiu $a0, $s0, 0x00B6 ## $a0 = 000000B6 /* 01280 80AE3680 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 /* 01284 80AE3684 85E500B6 */ lh $a1, 0x00B6($t7) ## 000000B6 -/* 01288 80AE3688 AFA00010 */ sw $zero, 0x0010($sp) +/* 01288 80AE3688 AFA00010 */ sw $zero, 0x0010($sp) /* 0128C 80AE368C 0C01E1A7 */ jal Math_SmoothScaleMaxMinS - + /* 01290 80AE3690 24071770 */ addiu $a3, $zero, 0x1770 ## $a3 = 00001770 /* 01294 80AE3694 44804000 */ mtc1 $zero, $f8 ## $f8 = 0.00 /* 01298 80AE3698 C60A01A0 */ lwc1 $f10, 0x01A0($s0) ## 000001A0 /* 0129C 80AE369C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 012A0 80AE36A0 460A4032 */ c.eq.s $f8, $f10 +/* 012A0 80AE36A0 460A4032 */ c.eq.s $f8, $f10 /* 012A4 80AE36A4 00000000 */ nop -/* 012A8 80AE36A8 45020004 */ bc1fl .L80AE36BC +/* 012A8 80AE36A8 45020004 */ bc1fl .L80AE36BC /* 012AC 80AE36AC 92180319 */ lbu $t8, 0x0319($s0) ## 00000319 /* 012B0 80AE36B0 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 012B4 80AE36B4 240538E8 */ addiu $a1, $zero, 0x38E8 ## $a1 = 000038E8 /* 012B8 80AE36B8 92180319 */ lbu $t8, 0x0319($s0) ## 00000319 .L80AE36BC: /* 012BC 80AE36BC 2708FFFF */ addiu $t0, $t8, 0xFFFF ## $t0 = FFFFFFFF /* 012C0 80AE36C0 310900FF */ andi $t1, $t0, 0x00FF ## $t1 = 000000FF -/* 012C4 80AE36C4 15200038 */ bne $t1, $zero, .L80AE37A8 +/* 012C4 80AE36C4 15200038 */ bne $t1, $zero, .L80AE37A8 /* 012C8 80AE36C8 A2080319 */ sb $t0, 0x0319($s0) ## 00000319 -/* 012CC 80AE36CC 8FA4004C */ lw $a0, 0x004C($sp) +/* 012CC 80AE36CC 8FA4004C */ lw $a0, 0x004C($sp) /* 012D0 80AE36D0 3C190001 */ lui $t9, 0x0001 ## $t9 = 00010000 /* 012D4 80AE36D4 2405FFF8 */ addiu $a1, $zero, 0xFFF8 ## $a1 = FFFFFFF8 -/* 012D8 80AE36D8 0324C821 */ addu $t9, $t9, $a0 +/* 012D8 80AE36D8 0324C821 */ addu $t9, $t9, $a0 /* 012DC 80AE36DC 8F391D58 */ lw $t9, 0x1D58($t9) ## 00011D58 -/* 012E0 80AE36E0 0320F809 */ jalr $ra, $t9 +/* 012E0 80AE36E0 0320F809 */ jalr $ra, $t9 /* 012E4 80AE36E4 00000000 */ nop /* 012E8 80AE36E8 C60C0090 */ lwc1 $f12, 0x0090($s0) ## 00000090 /* 012EC 80AE36EC 240500F0 */ addiu $a1, $zero, 0x00F0 ## $a1 = 000000F0 /* 012F0 80AE36F0 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 -/* 012F4 80AE36F4 0C02A800 */ jal func_800AA000 +/* 012F4 80AE36F4 0C02A800 */ jal func_800AA000 /* 012F8 80AE36F8 2407000C */ addiu $a3, $zero, 0x000C ## $a3 = 0000000C /* 012FC 80AE36FC 240A0014 */ addiu $t2, $zero, 0x0014 ## $t2 = 00000014 /* 01300 80AE3700 A20A0319 */ sb $t2, 0x0319($s0) ## 00000319 -/* 01304 80AE3704 8FA40040 */ lw $a0, 0x0040($sp) +/* 01304 80AE3704 8FA40040 */ lw $a0, 0x0040($sp) /* 01308 80AE3708 8C8C0678 */ lw $t4, 0x0678($a0) ## 00000678 /* 0130C 80AE370C 95850092 */ lhu $a1, 0x0092($t4) ## 00000092 /* 01310 80AE3710 24A56805 */ addiu $a1, $a1, 0x6805 ## $a1 = 00006805 -/* 01314 80AE3714 0C00BDF7 */ jal func_8002F7DC +/* 01314 80AE3714 0C00BDF7 */ jal func_8002F7DC /* 01318 80AE3718 30A5FFFF */ andi $a1, $a1, 0xFFFF ## $a1 = 00006805 -/* 0131C 80AE371C 10000023 */ beq $zero, $zero, .L80AE37AC -/* 01320 80AE3720 8FBF002C */ lw $ra, 0x002C($sp) +/* 0131C 80AE371C 10000023 */ beq $zero, $zero, .L80AE37AC +/* 01320 80AE3720 8FBF002C */ lw $ra, 0x002C($sp) glabel L80AE3724 /* 01324 80AE3724 3C0D8016 */ lui $t5, 0x8016 ## $t5 = 80160000 /* 01328 80AE3728 8DADE664 */ lw $t5, -0x199C($t5) ## 8015E664 /* 0132C 80AE372C 260400BC */ addiu $a0, $s0, 0x00BC ## $a0 = 000000BC /* 01330 80AE3730 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 -/* 01334 80AE3734 11A0001C */ beq $t5, $zero, .L80AE37A8 +/* 01334 80AE3734 11A0001C */ beq $t5, $zero, .L80AE37A8 /* 01338 80AE3738 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 0133C 80AE373C 44808000 */ mtc1 $zero, $f16 ## $f16 = 0.00 /* 01340 80AE3740 3C0743C8 */ lui $a3, 0x43C8 ## $a3 = 43C80000 /* 01344 80AE3744 0C01E0C4 */ jal Math_SmoothScaleMaxMinF - -/* 01348 80AE3748 E7B00010 */ swc1 $f16, 0x0010($sp) -/* 0134C 80AE374C 10000017 */ beq $zero, $zero, .L80AE37AC -/* 01350 80AE3750 8FBF002C */ lw $ra, 0x002C($sp) + +/* 01348 80AE3748 E7B00010 */ swc1 $f16, 0x0010($sp) +/* 0134C 80AE374C 10000017 */ beq $zero, $zero, .L80AE37AC +/* 01350 80AE3750 8FBF002C */ lw $ra, 0x002C($sp) glabel L80AE3754 /* 01354 80AE3754 3C0E8016 */ lui $t6, 0x8016 ## $t6 = 80160000 /* 01358 80AE3758 8DCEE664 */ lw $t6, -0x199C($t6) ## 8015E664 /* 0135C 80AE375C 260400BC */ addiu $a0, $s0, 0x00BC ## $a0 = 000000BC /* 01360 80AE3760 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 -/* 01364 80AE3764 11C00005 */ beq $t6, $zero, .L80AE377C +/* 01364 80AE3764 11C00005 */ beq $t6, $zero, .L80AE377C /* 01368 80AE3768 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 0136C 80AE376C 44809000 */ mtc1 $zero, $f18 ## $f18 = 0.00 /* 01370 80AE3770 3C0743C8 */ lui $a3, 0x43C8 ## $a3 = 43C80000 /* 01374 80AE3774 0C01E0C4 */ jal Math_SmoothScaleMaxMinF - -/* 01378 80AE3778 E7B20010 */ swc1 $f18, 0x0010($sp) + +/* 01378 80AE3778 E7B20010 */ swc1 $f18, 0x0010($sp) .L80AE377C: /* 0137C 80AE377C 8E0F0004 */ lw $t7, 0x0004($s0) ## 00000004 /* 01380 80AE3780 2408000A */ addiu $t0, $zero, 0x000A ## $t0 = 0000000A @@ -234,15 +234,15 @@ glabel L80AE3754 /* 01390 80AE3790 AE180004 */ sw $t8, 0x0004($s0) ## 00000004 /* 01394 80AE3794 A2080306 */ sb $t0, 0x0306($s0) ## 00000306 /* 01398 80AE3798 A2090307 */ sb $t1, 0x0307($s0) ## 00000307 -/* 0139C 80AE379C 8FA5004C */ lw $a1, 0x004C($sp) -/* 013A0 80AE37A0 0C2B8AE4 */ jal func_80AE2B90 +/* 0139C 80AE379C 8FA5004C */ lw $a1, 0x004C($sp) +/* 013A0 80AE37A0 0C2B8AE4 */ jal func_80AE2B90 /* 013A4 80AE37A4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 .L80AE37A8: -/* 013A8 80AE37A8 8FBF002C */ lw $ra, 0x002C($sp) +/* 013A8 80AE37A8 8FBF002C */ lw $ra, 0x002C($sp) .L80AE37AC: -/* 013AC 80AE37AC 8FB00028 */ lw $s0, 0x0028($sp) +/* 013AC 80AE37AC 8FB00028 */ lw $s0, 0x0028($sp) /* 013B0 80AE37B0 27BD0048 */ addiu $sp, $sp, 0x0048 ## $sp = 00000000 -/* 013B4 80AE37B4 03E00008 */ jr $ra +/* 013B4 80AE37B4 03E00008 */ jr $ra /* 013B8 80AE37B8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Rd/func_80AE37BC.s b/asm/non_matchings/overlays/actors/ovl_En_Rd/func_80AE37BC.s index ef6c139ec0..83ad877812 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Rd/func_80AE37BC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Rd/func_80AE37BC.s @@ -1,35 +1,35 @@ glabel func_80AE37BC /* 013BC 80AE37BC 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 013C0 80AE37C0 AFA40028 */ sw $a0, 0x0028($sp) -/* 013C4 80AE37C4 AFBF0024 */ sw $ra, 0x0024($sp) +/* 013C0 80AE37C0 AFA40028 */ sw $a0, 0x0028($sp) +/* 013C4 80AE37C4 AFBF0024 */ sw $ra, 0x0024($sp) /* 013C8 80AE37C8 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 /* 013CC 80AE37CC 0C028800 */ jal SkelAnime_GetFrameCount - + /* 013D0 80AE37D0 24844F94 */ addiu $a0, $a0, 0x4F94 ## $a0 = 06004F94 /* 013D4 80AE37D4 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 013D8 80AE37D8 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 013DC 80AE37DC 8FA40028 */ lw $a0, 0x0028($sp) -/* 013E0 80AE37E0 468021A0 */ cvt.s.w $f6, $f4 +/* 013DC 80AE37DC 8FA40028 */ lw $a0, 0x0028($sp) +/* 013E0 80AE37E0 468021A0 */ cvt.s.w $f6, $f4 /* 013E4 80AE37E4 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 013E8 80AE37E8 240E0002 */ addiu $t6, $zero, 0x0002 ## $t6 = 00000002 -/* 013EC 80AE37EC 44060000 */ mfc1 $a2, $f0 -/* 013F0 80AE37F0 44070000 */ mfc1 $a3, $f0 -/* 013F4 80AE37F4 AFAE0014 */ sw $t6, 0x0014($sp) +/* 013EC 80AE37EC 44060000 */ mfc1 $a2, $f0 +/* 013F0 80AE37F0 44070000 */ mfc1 $a3, $f0 +/* 013F4 80AE37F4 AFAE0014 */ sw $t6, 0x0014($sp) /* 013F8 80AE37F8 24A54F94 */ addiu $a1, $a1, 0x4F94 ## $a1 = 06004F94 -/* 013FC 80AE37FC E7A60010 */ swc1 $f6, 0x0010($sp) +/* 013FC 80AE37FC E7A60010 */ swc1 $f6, 0x0010($sp) /* 01400 80AE3800 24840188 */ addiu $a0, $a0, 0x0188 ## $a0 = 00000188 -/* 01404 80AE3804 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 01408 80AE3808 E7A00018 */ swc1 $f0, 0x0018($sp) -/* 0140C 80AE380C 8FA40028 */ lw $a0, 0x0028($sp) +/* 01404 80AE3804 0C029468 */ jal SkelAnime_ChangeAnim + +/* 01408 80AE3808 E7A00018 */ swc1 $f0, 0x0018($sp) +/* 0140C 80AE380C 8FA40028 */ lw $a0, 0x0028($sp) /* 01410 80AE3810 240F0007 */ addiu $t7, $zero, 0x0007 ## $t7 = 00000007 /* 01414 80AE3814 3C0580AE */ lui $a1, %hi(func_80AE3834) ## $a1 = 80AE0000 /* 01418 80AE3818 24A53834 */ addiu $a1, $a1, %lo(func_80AE3834) ## $a1 = 80AE3834 -/* 0141C 80AE381C 0C2B8900 */ jal func_80AE2400 +/* 0141C 80AE381C 0C2B8900 */ jal func_80AE2400 /* 01420 80AE3820 A08F031B */ sb $t7, 0x031B($a0) ## 0000031B -/* 01424 80AE3824 8FBF0024 */ lw $ra, 0x0024($sp) +/* 01424 80AE3824 8FBF0024 */ lw $ra, 0x0024($sp) /* 01428 80AE3828 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 0142C 80AE382C 03E00008 */ jr $ra +/* 0142C 80AE382C 03E00008 */ jr $ra /* 01430 80AE3830 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Rd/func_80AE392C.s b/asm/non_matchings/overlays/actors/ovl_En_Rd/func_80AE392C.s index e9750e00c3..44629907c1 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Rd/func_80AE392C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Rd/func_80AE392C.s @@ -1,22 +1,22 @@ glabel func_80AE392C /* 0152C 80AE392C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 01530 80AE3930 AFBF0014 */ sw $ra, 0x0014($sp) +/* 01530 80AE3930 AFBF0014 */ sw $ra, 0x0014($sp) /* 01534 80AE3934 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 /* 01538 80AE3938 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 /* 0153C 80AE393C 24A58040 */ addiu $a1, $a1, 0x8040 ## $a1 = 06008040 -/* 01540 80AE3940 AFA70018 */ sw $a3, 0x0018($sp) +/* 01540 80AE3940 AFA70018 */ sw $a3, 0x0018($sp) /* 01544 80AE3944 24840188 */ addiu $a0, $a0, 0x0188 ## $a0 = 00000188 -/* 01548 80AE3948 0C029490 */ jal func_800A5240 +/* 01548 80AE3948 0C029490 */ jal SkelAnime_ChangeAnimTransitionStop /* 0154C 80AE394C 3C06C080 */ lui $a2, 0xC080 ## $a2 = C0800000 -/* 01550 80AE3950 8FA40018 */ lw $a0, 0x0018($sp) +/* 01550 80AE3950 8FA40018 */ lw $a0, 0x0018($sp) /* 01554 80AE3954 240E0005 */ addiu $t6, $zero, 0x0005 ## $t6 = 00000005 /* 01558 80AE3958 3C0580AE */ lui $a1, %hi(func_80AE3978) ## $a1 = 80AE0000 /* 0155C 80AE395C 24A53978 */ addiu $a1, $a1, %lo(func_80AE3978) ## $a1 = 80AE3978 -/* 01560 80AE3960 0C2B8900 */ jal func_80AE2400 +/* 01560 80AE3960 0C2B8900 */ jal func_80AE2400 /* 01564 80AE3964 A08E031B */ sb $t6, 0x031B($a0) ## 0000031B -/* 01568 80AE3968 8FBF0014 */ lw $ra, 0x0014($sp) +/* 01568 80AE3968 8FBF0014 */ lw $ra, 0x0014($sp) /* 0156C 80AE396C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 01570 80AE3970 03E00008 */ jr $ra +/* 01570 80AE3970 03E00008 */ jr $ra /* 01574 80AE3974 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Rd/func_80AE39D4.s b/asm/non_matchings/overlays/actors/ovl_En_Rd/func_80AE39D4.s index 0194020151..f486361d27 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Rd/func_80AE39D4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Rd/func_80AE39D4.s @@ -1,37 +1,37 @@ glabel func_80AE39D4 /* 015D4 80AE39D4 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 015D8 80AE39D8 AFA40028 */ sw $a0, 0x0028($sp) -/* 015DC 80AE39DC AFBF0024 */ sw $ra, 0x0024($sp) +/* 015D8 80AE39D8 AFA40028 */ sw $a0, 0x0028($sp) +/* 015DC 80AE39DC AFBF0024 */ sw $ra, 0x0024($sp) /* 015E0 80AE39E0 3C040601 */ lui $a0, 0x0601 ## $a0 = 06010000 /* 015E4 80AE39E4 0C028800 */ jal SkelAnime_GetFrameCount - + /* 015E8 80AE39E8 24848040 */ addiu $a0, $a0, 0x8040 ## $a0 = 06008040 /* 015EC 80AE39EC 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 015F0 80AE39F0 3C01C080 */ lui $at, 0xC080 ## $at = C0800000 /* 015F4 80AE39F4 44814000 */ mtc1 $at, $f8 ## $f8 = -4.00 -/* 015F8 80AE39F8 46802120 */ cvt.s.w $f4, $f4 -/* 015FC 80AE39FC 8FA40028 */ lw $a0, 0x0028($sp) +/* 015F8 80AE39F8 46802120 */ cvt.s.w $f4, $f4 +/* 015FC 80AE39FC 8FA40028 */ lw $a0, 0x0028($sp) /* 01600 80AE3A00 44803000 */ mtc1 $zero, $f6 ## $f6 = 0.00 /* 01604 80AE3A04 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 /* 01608 80AE3A08 240E0002 */ addiu $t6, $zero, 0x0002 ## $t6 = 00000002 -/* 0160C 80AE3A0C AFAE0014 */ sw $t6, 0x0014($sp) -/* 01610 80AE3A10 44072000 */ mfc1 $a3, $f4 +/* 0160C 80AE3A0C AFAE0014 */ sw $t6, 0x0014($sp) +/* 01610 80AE3A10 44072000 */ mfc1 $a3, $f4 /* 01614 80AE3A14 24A58040 */ addiu $a1, $a1, 0x8040 ## $a1 = 06008040 /* 01618 80AE3A18 3C06BF80 */ lui $a2, 0xBF80 ## $a2 = BF800000 -/* 0161C 80AE3A1C E7A80018 */ swc1 $f8, 0x0018($sp) +/* 0161C 80AE3A1C E7A80018 */ swc1 $f8, 0x0018($sp) /* 01620 80AE3A20 24840188 */ addiu $a0, $a0, 0x0188 ## $a0 = 00000188 -/* 01624 80AE3A24 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 01628 80AE3A28 E7A60010 */ swc1 $f6, 0x0010($sp) -/* 0162C 80AE3A2C 8FA40028 */ lw $a0, 0x0028($sp) +/* 01624 80AE3A24 0C029468 */ jal SkelAnime_ChangeAnim + +/* 01628 80AE3A28 E7A60010 */ swc1 $f6, 0x0010($sp) +/* 0162C 80AE3A2C 8FA40028 */ lw $a0, 0x0028($sp) /* 01630 80AE3A30 240F0006 */ addiu $t7, $zero, 0x0006 ## $t7 = 00000006 /* 01634 80AE3A34 3C0580AE */ lui $a1, %hi(func_80AE3A54) ## $a1 = 80AE0000 /* 01638 80AE3A38 24A53A54 */ addiu $a1, $a1, %lo(func_80AE3A54) ## $a1 = 80AE3A54 -/* 0163C 80AE3A3C 0C2B8900 */ jal func_80AE2400 +/* 0163C 80AE3A3C 0C2B8900 */ jal func_80AE2400 /* 01640 80AE3A40 A08F031B */ sb $t7, 0x031B($a0) ## 0000031B -/* 01644 80AE3A44 8FBF0024 */ lw $ra, 0x0024($sp) +/* 01644 80AE3A44 8FBF0024 */ lw $ra, 0x0024($sp) /* 01648 80AE3A48 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 0164C 80AE3A4C 03E00008 */ jr $ra +/* 0164C 80AE3A4C 03E00008 */ jr $ra /* 01650 80AE3A50 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Rd/func_80AE3A8C.s b/asm/non_matchings/overlays/actors/ovl_En_Rd/func_80AE3A8C.s index 351fcf2b37..ce055f3b6b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Rd/func_80AE3A8C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Rd/func_80AE3A8C.s @@ -1,18 +1,18 @@ glabel func_80AE3A8C /* 0168C 80AE3A8C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 01690 80AE3A90 AFBF0014 */ sw $ra, 0x0014($sp) +/* 01690 80AE3A90 AFBF0014 */ sw $ra, 0x0014($sp) /* 01694 80AE3A94 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 /* 01698 80AE3A98 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 0169C 80AE3A9C 24A574F0 */ addiu $a1, $a1, 0x74F0 ## $a1 = 060074F0 -/* 016A0 80AE3AA0 AFA70018 */ sw $a3, 0x0018($sp) +/* 016A0 80AE3AA0 AFA70018 */ sw $a3, 0x0018($sp) /* 016A4 80AE3AA4 24840188 */ addiu $a0, $a0, 0x0188 ## $a0 = 00000188 -/* 016A8 80AE3AA8 0C029490 */ jal func_800A5240 +/* 016A8 80AE3AA8 0C029490 */ jal SkelAnime_ChangeAnimTransitionStop /* 016AC 80AE3AAC 3C06C0C0 */ lui $a2, 0xC0C0 ## $a2 = C0C00000 -/* 016B0 80AE3AB0 8FA70018 */ lw $a3, 0x0018($sp) +/* 016B0 80AE3AB0 8FA70018 */ lw $a3, 0x0018($sp) /* 016B4 80AE3AB4 3C01C000 */ lui $at, 0xC000 ## $at = C0000000 /* 016B8 80AE3AB8 94EE0088 */ lhu $t6, 0x0088($a3) ## 00000088 /* 016BC 80AE3ABC 31CF0001 */ andi $t7, $t6, 0x0001 ## $t7 = 00000000 -/* 016C0 80AE3AC0 51E00005 */ beql $t7, $zero, .L80AE3AD8 +/* 016C0 80AE3AC0 51E00005 */ beql $t7, $zero, .L80AE3AD8 /* 016C4 80AE3AC4 8CF80004 */ lw $t8, 0x0004($a3) ## 00000004 /* 016C8 80AE3AC8 44812000 */ mtc1 $at, $f4 ## $f4 = -2.00 /* 016CC 80AE3ACC 00000000 */ nop @@ -24,17 +24,17 @@ glabel func_80AE3A8C /* 016E0 80AE3AE0 37190001 */ ori $t9, $t8, 0x0001 ## $t9 = 00000001 /* 016E4 80AE3AE4 ACF90004 */ sw $t9, 0x0004($a3) ## 00000004 /* 016E8 80AE3AE8 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 016EC 80AE3AEC AFA70018 */ sw $a3, 0x0018($sp) -/* 016F0 80AE3AF0 8FA40018 */ lw $a0, 0x0018($sp) + +/* 016EC 80AE3AEC AFA70018 */ sw $a3, 0x0018($sp) +/* 016F0 80AE3AF0 8FA40018 */ lw $a0, 0x0018($sp) /* 016F4 80AE3AF4 24080009 */ addiu $t0, $zero, 0x0009 ## $t0 = 00000009 /* 016F8 80AE3AF8 3C0580AE */ lui $a1, %hi(func_80AE3B18) ## $a1 = 80AE0000 /* 016FC 80AE3AFC 24A53B18 */ addiu $a1, $a1, %lo(func_80AE3B18) ## $a1 = 80AE3B18 -/* 01700 80AE3B00 0C2B8900 */ jal func_80AE2400 +/* 01700 80AE3B00 0C2B8900 */ jal func_80AE2400 /* 01704 80AE3B04 A088031B */ sb $t0, 0x031B($a0) ## 0000031B -/* 01708 80AE3B08 8FBF0014 */ lw $ra, 0x0014($sp) +/* 01708 80AE3B08 8FBF0014 */ lw $ra, 0x0014($sp) /* 0170C 80AE3B0C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 01710 80AE3B10 03E00008 */ jr $ra +/* 01710 80AE3B10 03E00008 */ jr $ra /* 01714 80AE3B14 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Rd/func_80AE3C20.s b/asm/non_matchings/overlays/actors/ovl_En_Rd/func_80AE3C20.s index 348a5033ee..70df39d712 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Rd/func_80AE3C20.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Rd/func_80AE3C20.s @@ -1,34 +1,34 @@ glabel func_80AE3C20 /* 01820 80AE3C20 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 01824 80AE3C24 AFBF0014 */ sw $ra, 0x0014($sp) +/* 01824 80AE3C24 AFBF0014 */ sw $ra, 0x0014($sp) /* 01828 80AE3C28 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 /* 0182C 80AE3C2C 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 01830 80AE3C30 24A56E88 */ addiu $a1, $a1, 0x6E88 ## $a1 = 06006E88 -/* 01834 80AE3C34 AFA70018 */ sw $a3, 0x0018($sp) +/* 01834 80AE3C34 AFA70018 */ sw $a3, 0x0018($sp) /* 01838 80AE3C38 24840188 */ addiu $a0, $a0, 0x0188 ## $a0 = 00000188 -/* 0183C 80AE3C3C 0C029490 */ jal func_800A5240 +/* 0183C 80AE3C3C 0C029490 */ jal SkelAnime_ChangeAnimTransitionStop /* 01840 80AE3C40 3C06BF80 */ lui $a2, 0xBF80 ## $a2 = BF800000 -/* 01844 80AE3C44 8FA40018 */ lw $a0, 0x0018($sp) +/* 01844 80AE3C44 8FA40018 */ lw $a0, 0x0018($sp) /* 01848 80AE3C48 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 /* 0184C 80AE3C4C 2401FFFE */ addiu $at, $zero, 0xFFFE ## $at = FFFFFFFE /* 01850 80AE3C50 8C980004 */ lw $t8, 0x0004($a0) ## 00000004 /* 01854 80AE3C54 240E000A */ addiu $t6, $zero, 0x000A ## $t6 = 0000000A /* 01858 80AE3C58 240F012C */ addiu $t7, $zero, 0x012C ## $t7 = 0000012C -/* 0185C 80AE3C5C 0301C824 */ and $t9, $t8, $at +/* 0185C 80AE3C5C 0301C824 */ and $t9, $t8, $at /* 01860 80AE3C60 240538E7 */ addiu $a1, $zero, 0x38E7 ## $a1 = 000038E7 /* 01864 80AE3C64 A08E031B */ sb $t6, 0x031B($a0) ## 0000031B /* 01868 80AE3C68 A48F030C */ sh $t7, 0x030C($a0) ## 0000030C /* 0186C 80AE3C6C AC990004 */ sw $t9, 0x0004($a0) ## 00000004 /* 01870 80AE3C70 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 01874 80AE3C74 E4840068 */ swc1 $f4, 0x0068($a0) ## 00000068 /* 01878 80AE3C78 3C0580AE */ lui $a1, %hi(func_80AE3C98) ## $a1 = 80AE0000 -/* 0187C 80AE3C7C 8FA40018 */ lw $a0, 0x0018($sp) -/* 01880 80AE3C80 0C2B8900 */ jal func_80AE2400 +/* 0187C 80AE3C7C 8FA40018 */ lw $a0, 0x0018($sp) +/* 01880 80AE3C80 0C2B8900 */ jal func_80AE2400 /* 01884 80AE3C84 24A53C98 */ addiu $a1, $a1, %lo(func_80AE3C98) ## $a1 = 80AE3C98 -/* 01888 80AE3C88 8FBF0014 */ lw $ra, 0x0014($sp) +/* 01888 80AE3C88 8FBF0014 */ lw $ra, 0x0014($sp) /* 0188C 80AE3C8C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 01890 80AE3C90 03E00008 */ jr $ra +/* 01890 80AE3C90 03E00008 */ jr $ra /* 01894 80AE3C94 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Reeba/EnReeba_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Reeba/EnReeba_Draw.s index 4f6e71c2ea..ff6999a9e8 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Reeba/EnReeba_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Reeba/EnReeba_Draw.s @@ -10,7 +10,7 @@ glabel EnReeba_Draw /* 01714 80AE63E4 24C6665C */ addiu $a2, $a2, %lo(D_80AE665C) ## $a2 = 80AE665C /* 01718 80AE63E8 27A4006C */ addiu $a0, $sp, 0x006C ## $a0 = FFFFFFE4 /* 0171C 80AE63EC 24070426 */ addiu $a3, $zero, 0x0426 ## $a3 = 00000426 -/* 01720 80AE63F0 0C031AB1 */ jal func_800C6AC4 +/* 01720 80AE63F0 0C031AB1 */ jal Graph_OpenDisps /* 01724 80AE63F4 AFA5007C */ sw $a1, 0x007C($sp) /* 01728 80AE63F8 0C024F46 */ jal func_80093D18 /* 0172C 80AE63FC 8E240000 */ lw $a0, 0x0000($s1) ## 00000000 @@ -49,7 +49,7 @@ glabel EnReeba_Draw /* 017A4 80AE6474 24C6666C */ addiu $a2, $a2, %lo(D_80AE666C) ## $a2 = 80AE666C /* 017A8 80AE6478 27A4006C */ addiu $a0, $sp, 0x006C ## $a0 = FFFFFFE4 /* 017AC 80AE647C 8E250000 */ lw $a1, 0x0000($s1) ## 00000000 -/* 017B0 80AE6480 0C031AD5 */ jal func_800C6B54 +/* 017B0 80AE6480 0C031AD5 */ jal Graph_CloseDisps /* 017B4 80AE6484 24070440 */ addiu $a3, $zero, 0x0440 ## $a3 = 00000440 /* 017B8 80AE6488 3C0C8016 */ lui $t4, 0x8016 ## $t4 = 80160000 /* 017BC 80AE648C 8D8CFA90 */ lw $t4, -0x0570($t4) ## 8015FA90 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Reeba/func_80AE4F40.s b/asm/non_matchings/overlays/actors/ovl_En_Reeba/func_80AE4F40.s index 41f9d8d502..5757e9889a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Reeba/func_80AE4F40.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Reeba/func_80AE4F40.s @@ -1,51 +1,51 @@ glabel func_80AE4F40 /* 00270 80AE4F40 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 00274 80AE4F44 AFB00028 */ sw $s0, 0x0028($sp) +/* 00274 80AE4F44 AFB00028 */ sw $s0, 0x0028($sp) /* 00278 80AE4F48 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 0027C 80AE4F4C AFBF002C */ sw $ra, 0x002C($sp) +/* 0027C 80AE4F4C AFBF002C */ sw $ra, 0x002C($sp) /* 00280 80AE4F50 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 -/* 00284 80AE4F54 AFA5003C */ sw $a1, 0x003C($sp) +/* 00284 80AE4F54 AFA5003C */ sw $a1, 0x003C($sp) /* 00288 80AE4F58 0C028800 */ jal SkelAnime_GetFrameCount - + /* 0028C 80AE4F5C 248401E4 */ addiu $a0, $a0, 0x01E4 ## $a0 = 060001E4 /* 00290 80AE4F60 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 -/* 00294 80AE4F64 8FAE003C */ lw $t6, 0x003C($sp) +/* 00294 80AE4F64 8FAE003C */ lw $t6, 0x003C($sp) /* 00298 80AE4F68 3C01C120 */ lui $at, 0xC120 ## $at = C1200000 -/* 0029C 80AE4F6C 468021A0 */ cvt.s.w $f6, $f4 +/* 0029C 80AE4F6C 468021A0 */ cvt.s.w $f6, $f4 /* 002A0 80AE4F70 8DCF1C44 */ lw $t7, 0x1C44($t6) ## 00001C44 /* 002A4 80AE4F74 44814000 */ mtc1 $at, $f8 ## $f8 = -10.00 /* 002A8 80AE4F78 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 002AC 80AE4F7C 24A501E4 */ addiu $a1, $a1, 0x01E4 ## $a1 = 060001E4 -/* 002B0 80AE4F80 AFA00014 */ sw $zero, 0x0014($sp) -/* 002B4 80AE4F84 E7A60010 */ swc1 $f6, 0x0010($sp) +/* 002B0 80AE4F80 AFA00014 */ sw $zero, 0x0014($sp) +/* 002B4 80AE4F84 E7A60010 */ swc1 $f6, 0x0010($sp) /* 002B8 80AE4F88 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C /* 002BC 80AE4F8C 3C064000 */ lui $a2, 0x4000 ## $a2 = 40000000 /* 002C0 80AE4F90 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 002C4 80AE4F94 AFAF0030 */ sw $t7, 0x0030($sp) -/* 002C8 80AE4F98 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 002CC 80AE4F9C E7A80018 */ swc1 $f8, 0x0018($sp) -/* 002D0 80AE4FA0 8FB80030 */ lw $t8, 0x0030($sp) +/* 002C4 80AE4F94 AFAF0030 */ sw $t7, 0x0030($sp) +/* 002C8 80AE4F98 0C029468 */ jal SkelAnime_ChangeAnim + +/* 002CC 80AE4F9C E7A80018 */ swc1 $f8, 0x0018($sp) +/* 002D0 80AE4FA0 8FB80030 */ lw $t8, 0x0030($sp) /* 002D4 80AE4FA4 24030014 */ addiu $v1, $zero, 0x0014 ## $v1 = 00000014 /* 002D8 80AE4FA8 240D0002 */ addiu $t5, $zero, 0x0002 ## $t5 = 00000002 /* 002DC 80AE4FAC C7000838 */ lwc1 $f0, 0x0838($t8) ## 00000838 /* 002E0 80AE4FB0 240539EE */ addiu $a1, $zero, 0x39EE ## $a1 = 000039EE /* 002E4 80AE4FB4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 002E8 80AE4FB8 46000005 */ abs.s $f0, $f0 -/* 002EC 80AE4FBC 4600028D */ trunc.w.s $f10, $f0 -/* 002F0 80AE4FC0 440A5000 */ mfc1 $t2, $f10 +/* 002E8 80AE4FB8 46000005 */ abs.s $f0, $f0 +/* 002EC 80AE4FBC 4600028D */ trunc.w.s $f10, $f0 +/* 002F0 80AE4FC0 440A5000 */ mfc1 $t2, $f10 /* 002F4 80AE4FC4 00000000 */ nop -/* 002F8 80AE4FC8 000A5840 */ sll $t3, $t2, 1 -/* 002FC 80AE4FCC 006B6023 */ subu $t4, $v1, $t3 +/* 002F8 80AE4FC8 000A5840 */ sll $t3, $t2, 1 +/* 002FC 80AE4FCC 006B6023 */ subu $t4, $v1, $t3 /* 00300 80AE4FD0 A60C0278 */ sh $t4, 0x0278($s0) ## 00000278 /* 00304 80AE4FD4 86020278 */ lh $v0, 0x0278($s0) ## 00000278 -/* 00308 80AE4FD8 04430004 */ bgezl $v0, .L80AE4FEC -/* 0030C 80AE4FDC 28410015 */ slti $at, $v0, 0x0015 +/* 00308 80AE4FD8 04430004 */ bgezl $v0, .L80AE4FEC +/* 0030C 80AE4FDC 28410015 */ slti $at, $v0, 0x0015 /* 00310 80AE4FE0 A60D0278 */ sh $t5, 0x0278($s0) ## 00000278 /* 00314 80AE4FE4 86020278 */ lh $v0, 0x0278($s0) ## 00000278 -/* 00318 80AE4FE8 28410015 */ slti $at, $v0, 0x0015 +/* 00318 80AE4FE8 28410015 */ slti $at, $v0, 0x0015 .L80AE4FEC: -/* 0031C 80AE4FEC 54200003 */ bnel $at, $zero, .L80AE4FFC +/* 0031C 80AE4FEC 54200003 */ bnel $at, $zero, .L80AE4FFC /* 00320 80AE4FF0 8E0E0004 */ lw $t6, 0x0004($s0) ## 00000004 /* 00324 80AE4FF4 A6030278 */ sh $v1, 0x0278($s0) ## 00000278 /* 00328 80AE4FF8 8E0E0004 */ lw $t6, 0x0004($s0) ## 00000004 @@ -54,27 +54,27 @@ glabel func_80AE4F40 /* 00330 80AE5000 3C01F7FF */ lui $at, 0xF7FF ## $at = F7FF0000 /* 00334 80AE5004 C6100080 */ lwc1 $f16, 0x0080($s0) ## 00000080 /* 00338 80AE5008 3421FFFF */ ori $at, $at, 0xFFFF ## $at = F7FFFFFF -/* 0033C 80AE500C 01C17824 */ and $t7, $t6, $at +/* 0033C 80AE500C 01C17824 */ and $t7, $t6, $at /* 00340 80AE5010 AE0F0004 */ sw $t7, 0x0004($s0) ## 00000004 -/* 00344 80AE5014 13000005 */ beq $t8, $zero, .L80AE502C +/* 00344 80AE5014 13000005 */ beq $t8, $zero, .L80AE502C /* 00348 80AE5018 E6100028 */ swc1 $f16, 0x0028($s0) ## 00000028 /* 0034C 80AE501C 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 00350 80AE5020 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00354 80AE5024 10000003 */ beq $zero, $zero, .L80AE5034 +/* 00354 80AE5024 10000003 */ beq $zero, $zero, .L80AE5034 /* 00358 80AE5028 00000000 */ nop .L80AE502C: /* 0035C 80AE502C 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 00360 80AE5030 24053986 */ addiu $a1, $zero, 0x3986 ## $a1 = 00003986 .L80AE5034: /* 00364 80AE5034 3C1980AE */ lui $t9, %hi(func_80AE5054) ## $t9 = 80AE0000 /* 00368 80AE5038 27395054 */ addiu $t9, $t9, %lo(func_80AE5054) ## $t9 = 80AE5054 /* 0036C 80AE503C AE19026C */ sw $t9, 0x026C($s0) ## 0000026C -/* 00370 80AE5040 8FBF002C */ lw $ra, 0x002C($sp) -/* 00374 80AE5044 8FB00028 */ lw $s0, 0x0028($sp) +/* 00370 80AE5040 8FBF002C */ lw $ra, 0x002C($sp) +/* 00374 80AE5044 8FB00028 */ lw $s0, 0x0028($sp) /* 00378 80AE5048 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 -/* 0037C 80AE504C 03E00008 */ jr $ra +/* 0037C 80AE504C 03E00008 */ jr $ra /* 00380 80AE5050 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Rl/EnRl_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Rl/EnRl_Destroy.s index a96db310b8..f3a1f799ac 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Rl/EnRl_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Rl/EnRl_Destroy.s @@ -1,11 +1,11 @@ glabel EnRl_Destroy /* 00000 80AE72B0 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00004 80AE72B4 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00008 80AE72B8 0C0295BC */ jal func_800A56F0 +/* 00004 80AE72B4 AFBF0014 */ sw $ra, 0x0014($sp) +/* 00008 80AE72B8 0C0295BC */ jal SkelAnime_Free /* 0000C 80AE72BC 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 00010 80AE72C0 8FBF0014 */ lw $ra, 0x0014($sp) +/* 00010 80AE72C0 8FBF0014 */ lw $ra, 0x0014($sp) /* 00014 80AE72C4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00018 80AE72C8 03E00008 */ jr $ra +/* 00018 80AE72C8 03E00008 */ jr $ra /* 0001C 80AE72CC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE7358.s b/asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE7358.s index ad7c5a87d3..3c479ff224 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE7358.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE7358.s @@ -1,25 +1,25 @@ glabel func_80AE7358 /* 000A8 80AE7358 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 000AC 80AE735C AFB00028 */ sw $s0, 0x0028($sp) +/* 000AC 80AE735C AFB00028 */ sw $s0, 0x0028($sp) /* 000B0 80AE7360 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 000B4 80AE7364 AFBF002C */ sw $ra, 0x002C($sp) +/* 000B4 80AE7364 AFBF002C */ sw $ra, 0x002C($sp) /* 000B8 80AE7368 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 /* 000BC 80AE736C 0C028800 */ jal SkelAnime_GetFrameCount - + /* 000C0 80AE7370 24840A3C */ addiu $a0, $a0, 0x0A3C ## $a0 = 06000A3C /* 000C4 80AE7374 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 000C8 80AE7378 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 /* 000CC 80AE737C 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 000D0 80AE7380 468021A0 */ cvt.s.w $f6, $f4 -/* 000D4 80AE7384 44070000 */ mfc1 $a3, $f0 +/* 000D0 80AE7380 468021A0 */ cvt.s.w $f6, $f4 +/* 000D4 80AE7384 44070000 */ mfc1 $a3, $f0 /* 000D8 80AE7388 24A50A3C */ addiu $a1, $a1, 0x0A3C ## $a1 = 06000A3C /* 000DC 80AE738C 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C /* 000E0 80AE7390 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 000E4 80AE7394 AFA00014 */ sw $zero, 0x0014($sp) -/* 000E8 80AE7398 E7A60010 */ swc1 $f6, 0x0010($sp) -/* 000EC 80AE739C 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 000F0 80AE73A0 E7A00018 */ swc1 $f0, 0x0018($sp) +/* 000E4 80AE7394 AFA00014 */ sw $zero, 0x0014($sp) +/* 000E8 80AE7398 E7A60010 */ swc1 $f6, 0x0010($sp) +/* 000EC 80AE739C 0C029468 */ jal SkelAnime_ChangeAnim + +/* 000F0 80AE73A0 E7A00018 */ swc1 $f0, 0x0018($sp) /* 000F4 80AE73A4 44804000 */ mtc1 $zero, $f8 ## $f8 = 0.00 /* 000F8 80AE73A8 240E0004 */ addiu $t6, $zero, 0x0004 ## $t6 = 00000004 /* 000FC 80AE73AC AE0E0194 */ sw $t6, 0x0194($s0) ## 00000194 @@ -28,10 +28,10 @@ glabel func_80AE7358 /* 00108 80AE73B8 AE0001A4 */ sw $zero, 0x01A4($s0) ## 000001A4 /* 0010C 80AE73BC A20000C8 */ sb $zero, 0x00C8($s0) ## 000000C8 /* 00110 80AE73C0 E608019C */ swc1 $f8, 0x019C($s0) ## 0000019C -/* 00114 80AE73C4 8FBF002C */ lw $ra, 0x002C($sp) -/* 00118 80AE73C8 8FB00028 */ lw $s0, 0x0028($sp) +/* 00114 80AE73C4 8FBF002C */ lw $ra, 0x002C($sp) +/* 00118 80AE73C8 8FB00028 */ lw $s0, 0x0028($sp) /* 0011C 80AE73CC 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 00120 80AE73D0 03E00008 */ jr $ra +/* 00120 80AE73D0 03E00008 */ jr $ra /* 00124 80AE73D4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE7544.s b/asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE7544.s index 90c0de8a21..d03b16266c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE7544.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE7544.s @@ -1,22 +1,22 @@ glabel func_80AE7544 /* 00294 80AE7544 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 00298 80AE7548 AFA40028 */ sw $a0, 0x0028($sp) -/* 0029C 80AE754C AFA5002C */ sw $a1, 0x002C($sp) +/* 00298 80AE7548 AFA40028 */ sw $a0, 0x0028($sp) +/* 0029C 80AE754C AFA5002C */ sw $a1, 0x002C($sp) /* 002A0 80AE7550 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 002A4 80AE7554 8FA50028 */ lw $a1, 0x0028($sp) -/* 002A8 80AE7558 AFBF0024 */ sw $ra, 0x0024($sp) +/* 002A4 80AE7554 8FA50028 */ lw $a1, 0x0028($sp) +/* 002A8 80AE7558 AFBF0024 */ sw $ra, 0x0024($sp) /* 002AC 80AE755C 3C060600 */ lui $a2, 0x0600 ## $a2 = 06000000 /* 002B0 80AE7560 3C070600 */ lui $a3, 0x0600 ## $a3 = 06000000 /* 002B4 80AE7564 24E70A3C */ addiu $a3, $a3, 0x0A3C ## $a3 = 06000A3C /* 002B8 80AE7568 24C67B38 */ addiu $a2, $a2, 0x7B38 ## $a2 = 06007B38 -/* 002BC 80AE756C AFA00010 */ sw $zero, 0x0010($sp) -/* 002C0 80AE7570 AFA00014 */ sw $zero, 0x0014($sp) -/* 002C4 80AE7574 AFA00018 */ sw $zero, 0x0018($sp) -/* 002C8 80AE7578 0C0291BE */ jal func_800A46F8 +/* 002BC 80AE756C AFA00010 */ sw $zero, 0x0010($sp) +/* 002C0 80AE7570 AFA00014 */ sw $zero, 0x0014($sp) +/* 002C4 80AE7574 AFA00018 */ sw $zero, 0x0018($sp) +/* 002C8 80AE7578 0C0291BE */ jal SkelAnime_InitSV /* 002CC 80AE757C 24A5014C */ addiu $a1, $a1, 0x014C ## $a1 = 0000014C -/* 002D0 80AE7580 8FBF0024 */ lw $ra, 0x0024($sp) +/* 002D0 80AE7580 8FBF0024 */ lw $ra, 0x0024($sp) /* 002D4 80AE7584 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 002D8 80AE7588 03E00008 */ jr $ra +/* 002D8 80AE7588 03E00008 */ jr $ra /* 002DC 80AE758C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE7698.s b/asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE7698.s index 1ba99af083..2aa28eb1e5 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE7698.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE7698.s @@ -1,43 +1,43 @@ glabel func_80AE7698 /* 003E8 80AE7698 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 003EC 80AE769C AFBF0024 */ sw $ra, 0x0024($sp) -/* 003F0 80AE76A0 AFA40028 */ sw $a0, 0x0028($sp) +/* 003EC 80AE769C AFBF0024 */ sw $ra, 0x0024($sp) +/* 003F0 80AE76A0 AFA40028 */ sw $a0, 0x0028($sp) /* 003F4 80AE76A4 90AE1D6C */ lbu $t6, 0x1D6C($a1) ## 00001D6C -/* 003F8 80AE76A8 51C0001D */ beql $t6, $zero, .L80AE7720 -/* 003FC 80AE76AC 8FBF0024 */ lw $ra, 0x0024($sp) +/* 003F8 80AE76A8 51C0001D */ beql $t6, $zero, .L80AE7720 +/* 003FC 80AE76AC 8FBF0024 */ lw $ra, 0x0024($sp) /* 00400 80AE76B0 8CA21D8C */ lw $v0, 0x1D8C($a1) ## 00001D8C -/* 00404 80AE76B4 5040001A */ beql $v0, $zero, .L80AE7720 -/* 00408 80AE76B8 8FBF0024 */ lw $ra, 0x0024($sp) +/* 00404 80AE76B4 5040001A */ beql $v0, $zero, .L80AE7720 +/* 00408 80AE76B8 8FBF0024 */ lw $ra, 0x0024($sp) /* 0040C 80AE76BC 944F0000 */ lhu $t7, 0x0000($v0) ## 00000000 /* 00410 80AE76C0 24010003 */ addiu $at, $zero, 0x0003 ## $at = 00000003 /* 00414 80AE76C4 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 -/* 00418 80AE76C8 55E10015 */ bnel $t7, $at, .L80AE7720 -/* 0041C 80AE76CC 8FBF0024 */ lw $ra, 0x0024($sp) +/* 00418 80AE76C8 55E10015 */ bnel $t7, $at, .L80AE7720 +/* 0041C 80AE76CC 8FBF0024 */ lw $ra, 0x0024($sp) /* 00420 80AE76D0 0C028800 */ jal SkelAnime_GetFrameCount - + /* 00424 80AE76D4 2484040C */ addiu $a0, $a0, 0x040C ## $a0 = 0600040C /* 00428 80AE76D8 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 0042C 80AE76DC 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 00430 80AE76E0 8FA40028 */ lw $a0, 0x0028($sp) -/* 00434 80AE76E4 468021A0 */ cvt.s.w $f6, $f4 +/* 00430 80AE76E0 8FA40028 */ lw $a0, 0x0028($sp) +/* 00434 80AE76E4 468021A0 */ cvt.s.w $f6, $f4 /* 00438 80AE76E8 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 0043C 80AE76EC 24180002 */ addiu $t8, $zero, 0x0002 ## $t8 = 00000002 -/* 00440 80AE76F0 44070000 */ mfc1 $a3, $f0 -/* 00444 80AE76F4 AFB80014 */ sw $t8, 0x0014($sp) +/* 00440 80AE76F0 44070000 */ mfc1 $a3, $f0 +/* 00444 80AE76F4 AFB80014 */ sw $t8, 0x0014($sp) /* 00448 80AE76F8 24A5040C */ addiu $a1, $a1, 0x040C ## $a1 = 0600040C -/* 0044C 80AE76FC E7A60010 */ swc1 $f6, 0x0010($sp) +/* 0044C 80AE76FC E7A60010 */ swc1 $f6, 0x0010($sp) /* 00450 80AE7700 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 00454 80AE7704 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 00458 80AE7708 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 0045C 80AE770C E7A00018 */ swc1 $f0, 0x0018($sp) -/* 00460 80AE7710 8FA80028 */ lw $t0, 0x0028($sp) +/* 00458 80AE7708 0C029468 */ jal SkelAnime_ChangeAnim + +/* 0045C 80AE770C E7A00018 */ swc1 $f0, 0x0018($sp) +/* 00460 80AE7710 8FA80028 */ lw $t0, 0x0028($sp) /* 00464 80AE7714 24190002 */ addiu $t9, $zero, 0x0002 ## $t9 = 00000002 /* 00468 80AE7718 AD190194 */ sw $t9, 0x0194($t0) ## 00000194 -/* 0046C 80AE771C 8FBF0024 */ lw $ra, 0x0024($sp) +/* 0046C 80AE771C 8FBF0024 */ lw $ra, 0x0024($sp) .L80AE7720: /* 00470 80AE7720 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 00474 80AE7724 03E00008 */ jr $ra +/* 00474 80AE7724 03E00008 */ jr $ra /* 00478 80AE7728 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE772C.s b/asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE772C.s index 45c4304f80..53f90133b9 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE772C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE772C.s @@ -1,33 +1,33 @@ glabel func_80AE772C /* 0047C 80AE772C 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 00480 80AE7730 AFBF0024 */ sw $ra, 0x0024($sp) -/* 00484 80AE7734 10A00014 */ beq $a1, $zero, .L80AE7788 -/* 00488 80AE7738 AFA40028 */ sw $a0, 0x0028($sp) +/* 00480 80AE7730 AFBF0024 */ sw $ra, 0x0024($sp) +/* 00484 80AE7734 10A00014 */ beq $a1, $zero, .L80AE7788 +/* 00488 80AE7738 AFA40028 */ sw $a0, 0x0028($sp) /* 0048C 80AE773C 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 /* 00490 80AE7740 0C028800 */ jal SkelAnime_GetFrameCount - + /* 00494 80AE7744 24840830 */ addiu $a0, $a0, 0x0830 ## $a0 = 06000830 /* 00498 80AE7748 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 0049C 80AE774C 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 004A0 80AE7750 8FA40028 */ lw $a0, 0x0028($sp) -/* 004A4 80AE7754 468021A0 */ cvt.s.w $f6, $f4 +/* 004A0 80AE7750 8FA40028 */ lw $a0, 0x0028($sp) +/* 004A4 80AE7754 468021A0 */ cvt.s.w $f6, $f4 /* 004A8 80AE7758 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 004AC 80AE775C 44070000 */ mfc1 $a3, $f0 +/* 004AC 80AE775C 44070000 */ mfc1 $a3, $f0 /* 004B0 80AE7760 24A50830 */ addiu $a1, $a1, 0x0830 ## $a1 = 06000830 /* 004B4 80AE7764 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 004B8 80AE7768 AFA00014 */ sw $zero, 0x0014($sp) -/* 004BC 80AE776C E7A60010 */ swc1 $f6, 0x0010($sp) +/* 004B8 80AE7768 AFA00014 */ sw $zero, 0x0014($sp) +/* 004BC 80AE776C E7A60010 */ swc1 $f6, 0x0010($sp) /* 004C0 80AE7770 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 004C4 80AE7774 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 004C8 80AE7778 E7A00018 */ swc1 $f0, 0x0018($sp) -/* 004CC 80AE777C 8FAF0028 */ lw $t7, 0x0028($sp) +/* 004C4 80AE7774 0C029468 */ jal SkelAnime_ChangeAnim + +/* 004C8 80AE7778 E7A00018 */ swc1 $f0, 0x0018($sp) +/* 004CC 80AE777C 8FAF0028 */ lw $t7, 0x0028($sp) /* 004D0 80AE7780 240E0003 */ addiu $t6, $zero, 0x0003 ## $t6 = 00000003 /* 004D4 80AE7784 ADEE0194 */ sw $t6, 0x0194($t7) ## 00000194 .L80AE7788: -/* 004D8 80AE7788 8FBF0024 */ lw $ra, 0x0024($sp) +/* 004D8 80AE7788 8FBF0024 */ lw $ra, 0x0024($sp) /* 004DC 80AE778C 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 004E0 80AE7790 03E00008 */ jr $ra +/* 004E0 80AE7790 03E00008 */ jr $ra /* 004E4 80AE7794 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE7878.s b/asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE7878.s index 2ab8a54728..f017e1be1d 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE7878.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE7878.s @@ -1,26 +1,26 @@ glabel func_80AE7878 /* 005C8 80AE7878 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 005CC 80AE787C AFA40028 */ sw $a0, 0x0028($sp) -/* 005D0 80AE7880 AFA5002C */ sw $a1, 0x002C($sp) +/* 005CC 80AE787C AFA40028 */ sw $a0, 0x0028($sp) +/* 005D0 80AE7880 AFA5002C */ sw $a1, 0x002C($sp) /* 005D4 80AE7884 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 005D8 80AE7888 8FA50028 */ lw $a1, 0x0028($sp) -/* 005DC 80AE788C AFBF0024 */ sw $ra, 0x0024($sp) +/* 005D8 80AE7888 8FA50028 */ lw $a1, 0x0028($sp) +/* 005DC 80AE788C AFBF0024 */ sw $ra, 0x0024($sp) /* 005E0 80AE7890 3C060600 */ lui $a2, 0x0600 ## $a2 = 06000000 /* 005E4 80AE7894 3C070600 */ lui $a3, 0x0600 ## $a3 = 06000000 /* 005E8 80AE7898 24E70A3C */ addiu $a3, $a3, 0x0A3C ## $a3 = 06000A3C /* 005EC 80AE789C 24C67B38 */ addiu $a2, $a2, 0x7B38 ## $a2 = 06007B38 -/* 005F0 80AE78A0 AFA00010 */ sw $zero, 0x0010($sp) -/* 005F4 80AE78A4 AFA00014 */ sw $zero, 0x0014($sp) -/* 005F8 80AE78A8 AFA00018 */ sw $zero, 0x0018($sp) -/* 005FC 80AE78AC 0C0291BE */ jal func_800A46F8 +/* 005F0 80AE78A0 AFA00010 */ sw $zero, 0x0010($sp) +/* 005F4 80AE78A4 AFA00014 */ sw $zero, 0x0014($sp) +/* 005F8 80AE78A8 AFA00018 */ sw $zero, 0x0018($sp) +/* 005FC 80AE78AC 0C0291BE */ jal SkelAnime_InitSV /* 00600 80AE78B0 24A5014C */ addiu $a1, $a1, 0x014C ## $a1 = 0000014C -/* 00604 80AE78B4 8FA20028 */ lw $v0, 0x0028($sp) +/* 00604 80AE78B4 8FA20028 */ lw $v0, 0x0028($sp) /* 00608 80AE78B8 240E0004 */ addiu $t6, $zero, 0x0004 ## $t6 = 00000004 /* 0060C 80AE78BC AC4E0194 */ sw $t6, 0x0194($v0) ## 00000194 /* 00610 80AE78C0 A04000C8 */ sb $zero, 0x00C8($v0) ## 000000C8 -/* 00614 80AE78C4 8FBF0024 */ lw $ra, 0x0024($sp) +/* 00614 80AE78C4 8FBF0024 */ lw $ra, 0x0024($sp) /* 00618 80AE78C8 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 0061C 80AE78CC 03E00008 */ jr $ra +/* 0061C 80AE78CC 03E00008 */ jr $ra /* 00620 80AE78D0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE7AF8.s b/asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE7AF8.s index 8b903f6fe4..86ef63f8ad 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE7AF8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE7AF8.s @@ -1,42 +1,42 @@ glabel func_80AE7AF8 /* 00848 80AE7AF8 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 0084C 80AE7AFC AFBF002C */ sw $ra, 0x002C($sp) -/* 00850 80AE7B00 AFB00028 */ sw $s0, 0x0028($sp) +/* 0084C 80AE7AFC AFBF002C */ sw $ra, 0x002C($sp) +/* 00850 80AE7B00 AFB00028 */ sw $s0, 0x0028($sp) /* 00854 80AE7B04 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00858 80AE7B08 AFA50034 */ sw $a1, 0x0034($sp) +/* 00858 80AE7B08 AFA50034 */ sw $a1, 0x0034($sp) /* 0085C 80AE7B0C 24060003 */ addiu $a2, $zero, 0x0003 ## $a2 = 00000003 -/* 00860 80AE7B10 0C2B9D2D */ jal func_80AE74B4 +/* 00860 80AE7B10 0C2B9D2D */ jal func_80AE74B4 /* 00864 80AE7B14 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 00868 80AE7B18 10400015 */ beq $v0, $zero, .L80AE7B70 +/* 00868 80AE7B18 10400015 */ beq $v0, $zero, .L80AE7B70 /* 0086C 80AE7B1C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 00870 80AE7B20 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 /* 00874 80AE7B24 0C028800 */ jal SkelAnime_GetFrameCount - + /* 00878 80AE7B28 2484040C */ addiu $a0, $a0, 0x040C ## $a0 = 0600040C /* 0087C 80AE7B2C 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 00880 80AE7B30 3C01C100 */ lui $at, 0xC100 ## $at = C1000000 /* 00884 80AE7B34 44814000 */ mtc1 $at, $f8 ## $f8 = -8.00 -/* 00888 80AE7B38 468021A0 */ cvt.s.w $f6, $f4 +/* 00888 80AE7B38 468021A0 */ cvt.s.w $f6, $f4 /* 0088C 80AE7B3C 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 00890 80AE7B40 240E0002 */ addiu $t6, $zero, 0x0002 ## $t6 = 00000002 -/* 00894 80AE7B44 AFAE0014 */ sw $t6, 0x0014($sp) +/* 00894 80AE7B44 AFAE0014 */ sw $t6, 0x0014($sp) /* 00898 80AE7B48 24A5040C */ addiu $a1, $a1, 0x040C ## $a1 = 0600040C /* 0089C 80AE7B4C 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C -/* 008A0 80AE7B50 E7A60010 */ swc1 $f6, 0x0010($sp) +/* 008A0 80AE7B50 E7A60010 */ swc1 $f6, 0x0010($sp) /* 008A4 80AE7B54 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 008A8 80AE7B58 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 008AC 80AE7B5C 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 008B0 80AE7B60 E7A80018 */ swc1 $f8, 0x0018($sp) +/* 008AC 80AE7B5C 0C029468 */ jal SkelAnime_ChangeAnim + +/* 008B0 80AE7B60 E7A80018 */ swc1 $f8, 0x0018($sp) /* 008B4 80AE7B64 240F0006 */ addiu $t7, $zero, 0x0006 ## $t7 = 00000006 -/* 008B8 80AE7B68 1000001E */ beq $zero, $zero, .L80AE7BE4 +/* 008B8 80AE7B68 1000001E */ beq $zero, $zero, .L80AE7BE4 /* 008BC 80AE7B6C AE0F0194 */ sw $t7, 0x0194($s0) ## 00000194 .L80AE7B70: -/* 008C0 80AE7B70 8FA50034 */ lw $a1, 0x0034($sp) +/* 008C0 80AE7B70 8FA50034 */ lw $a1, 0x0034($sp) /* 008C4 80AE7B74 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 -/* 008C8 80AE7B78 0C2B9D3F */ jal func_80AE74FC +/* 008C8 80AE7B78 0C2B9D3F */ jal func_80AE74FC /* 008CC 80AE7B7C 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 008D0 80AE7B80 10400018 */ beq $v0, $zero, .L80AE7BE4 +/* 008D0 80AE7B80 10400018 */ beq $v0, $zero, .L80AE7BE4 /* 008D4 80AE7B84 24180005 */ addiu $t8, $zero, 0x0005 ## $t8 = 00000005 /* 008D8 80AE7B88 24190002 */ addiu $t9, $zero, 0x0002 ## $t9 = 00000002 /* 008DC 80AE7B8C AE180194 */ sw $t8, 0x0194($s0) ## 00000194 @@ -51,22 +51,22 @@ glabel func_80AE7AF8 /* 00900 80AE7BB0 44895000 */ mtc1 $t1, $f10 ## $f10 = 0.00 /* 00904 80AE7BB4 AE0A01A0 */ sw $t2, 0x01A0($s0) ## 000001A0 /* 00908 80AE7BB8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0090C 80AE7BBC 46805420 */ cvt.s.w $f16, $f10 -/* 00910 80AE7BC0 46128100 */ add.s $f4, $f16, $f18 -/* 00914 80AE7BC4 15600005 */ bne $t3, $zero, .L80AE7BDC +/* 0090C 80AE7BBC 46805420 */ cvt.s.w $f16, $f10 +/* 00910 80AE7BC0 46128100 */ add.s $f4, $f16, $f18 +/* 00914 80AE7BC4 15600005 */ bne $t3, $zero, .L80AE7BDC /* 00918 80AE7BC8 E604019C */ swc1 $f4, 0x019C($s0) ## 0000019C -/* 0091C 80AE7BCC 0C2B9E35 */ jal func_80AE78D4 -/* 00920 80AE7BD0 8FA50034 */ lw $a1, 0x0034($sp) +/* 0091C 80AE7BCC 0C2B9E35 */ jal func_80AE78D4 +/* 00920 80AE7BD0 8FA50034 */ lw $a1, 0x0034($sp) /* 00924 80AE7BD4 240C0001 */ addiu $t4, $zero, 0x0001 ## $t4 = 00000001 /* 00928 80AE7BD8 AE0C01A4 */ sw $t4, 0x01A4($s0) ## 000001A4 .L80AE7BDC: /* 0092C 80AE7BDC 240D00FF */ addiu $t5, $zero, 0x00FF ## $t5 = 000000FF /* 00930 80AE7BE0 A20D00C8 */ sb $t5, 0x00C8($s0) ## 000000C8 .L80AE7BE4: -/* 00934 80AE7BE4 8FBF002C */ lw $ra, 0x002C($sp) -/* 00938 80AE7BE8 8FB00028 */ lw $s0, 0x0028($sp) +/* 00934 80AE7BE4 8FBF002C */ lw $ra, 0x002C($sp) +/* 00938 80AE7BE8 8FB00028 */ lw $s0, 0x0028($sp) /* 0093C 80AE7BEC 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 00940 80AE7BF0 03E00008 */ jr $ra +/* 00940 80AE7BF0 03E00008 */ jr $ra /* 00944 80AE7BF4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE7BF8.s b/asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE7BF8.s index 8cc1dfe3c9..5701b1bdb9 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE7BF8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE7BF8.s @@ -1,33 +1,33 @@ glabel func_80AE7BF8 /* 00948 80AE7BF8 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 0094C 80AE7BFC AFBF0024 */ sw $ra, 0x0024($sp) -/* 00950 80AE7C00 10A00014 */ beq $a1, $zero, .L80AE7C54 -/* 00954 80AE7C04 AFA40028 */ sw $a0, 0x0028($sp) +/* 0094C 80AE7BFC AFBF0024 */ sw $ra, 0x0024($sp) +/* 00950 80AE7C00 10A00014 */ beq $a1, $zero, .L80AE7C54 +/* 00954 80AE7C04 AFA40028 */ sw $a0, 0x0028($sp) /* 00958 80AE7C08 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 /* 0095C 80AE7C0C 0C028800 */ jal SkelAnime_GetFrameCount - + /* 00960 80AE7C10 24840830 */ addiu $a0, $a0, 0x0830 ## $a0 = 06000830 /* 00964 80AE7C14 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 00968 80AE7C18 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 0096C 80AE7C1C 8FA40028 */ lw $a0, 0x0028($sp) -/* 00970 80AE7C20 468021A0 */ cvt.s.w $f6, $f4 +/* 0096C 80AE7C1C 8FA40028 */ lw $a0, 0x0028($sp) +/* 00970 80AE7C20 468021A0 */ cvt.s.w $f6, $f4 /* 00974 80AE7C24 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 00978 80AE7C28 44070000 */ mfc1 $a3, $f0 +/* 00978 80AE7C28 44070000 */ mfc1 $a3, $f0 /* 0097C 80AE7C2C 24A50830 */ addiu $a1, $a1, 0x0830 ## $a1 = 06000830 /* 00980 80AE7C30 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 00984 80AE7C34 AFA00014 */ sw $zero, 0x0014($sp) -/* 00988 80AE7C38 E7A60010 */ swc1 $f6, 0x0010($sp) +/* 00984 80AE7C34 AFA00014 */ sw $zero, 0x0014($sp) +/* 00988 80AE7C38 E7A60010 */ swc1 $f6, 0x0010($sp) /* 0098C 80AE7C3C 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 00990 80AE7C40 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 00994 80AE7C44 E7A00018 */ swc1 $f0, 0x0018($sp) -/* 00998 80AE7C48 8FAF0028 */ lw $t7, 0x0028($sp) +/* 00990 80AE7C40 0C029468 */ jal SkelAnime_ChangeAnim + +/* 00994 80AE7C44 E7A00018 */ swc1 $f0, 0x0018($sp) +/* 00998 80AE7C48 8FAF0028 */ lw $t7, 0x0028($sp) /* 0099C 80AE7C4C 240E0007 */ addiu $t6, $zero, 0x0007 ## $t6 = 00000007 /* 009A0 80AE7C50 ADEE0194 */ sw $t6, 0x0194($t7) ## 00000194 .L80AE7C54: -/* 009A4 80AE7C54 8FBF0024 */ lw $ra, 0x0024($sp) +/* 009A4 80AE7C54 8FBF0024 */ lw $ra, 0x0024($sp) /* 009A8 80AE7C58 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 009AC 80AE7C5C 03E00008 */ jr $ra +/* 009AC 80AE7C5C 03E00008 */ jr $ra /* 009B0 80AE7C60 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE7D94.s b/asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE7D94.s index 7ca496ea41..1ed6818756 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE7D94.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE7D94.s @@ -1,45 +1,45 @@ glabel func_80AE7D94 /* 00AE4 80AE7D94 27BDFF88 */ addiu $sp, $sp, 0xFF88 ## $sp = FFFFFF88 -/* 00AE8 80AE7D98 AFBF002C */ sw $ra, 0x002C($sp) -/* 00AEC 80AE7D9C AFB00028 */ sw $s0, 0x0028($sp) -/* 00AF0 80AE7DA0 AFA40078 */ sw $a0, 0x0078($sp) -/* 00AF4 80AE7DA4 AFA5007C */ sw $a1, 0x007C($sp) +/* 00AE8 80AE7D98 AFBF002C */ sw $ra, 0x002C($sp) +/* 00AEC 80AE7D9C AFB00028 */ sw $s0, 0x0028($sp) +/* 00AF0 80AE7DA0 AFA40078 */ sw $a0, 0x0078($sp) +/* 00AF4 80AE7DA4 AFA5007C */ sw $a1, 0x007C($sp) /* 00AF8 80AE7DA8 84820190 */ lh $v0, 0x0190($a0) ## 00000190 /* 00AFC 80AE7DAC 3C1880AF */ lui $t8, %hi(D_80AE81A0) ## $t8 = 80AF0000 /* 00B00 80AE7DB0 3C0680AF */ lui $a2, %hi(D_80AE8200) ## $a2 = 80AF0000 -/* 00B04 80AE7DB4 00027880 */ sll $t7, $v0, 2 -/* 00B08 80AE7DB8 030FC021 */ addu $t8, $t8, $t7 -/* 00B0C 80AE7DBC 8F1881A0 */ lw $t8, %lo(D_80AE81A0)($t8) +/* 00B04 80AE7DB4 00027880 */ sll $t7, $v0, 2 +/* 00B08 80AE7DB8 030FC021 */ addu $t8, $t8, $t7 +/* 00B0C 80AE7DBC 8F1881A0 */ lw $t8, %lo(D_80AE81A0)($t8) /* 00B10 80AE7DC0 24C68200 */ addiu $a2, $a2, %lo(D_80AE8200) ## $a2 = 80AE8200 /* 00B14 80AE7DC4 27A40050 */ addiu $a0, $sp, 0x0050 ## $a0 = FFFFFFD8 -/* 00B18 80AE7DC8 AFB80068 */ sw $t8, 0x0068($sp) +/* 00B18 80AE7DC8 AFB80068 */ sw $t8, 0x0068($sp) /* 00B1C 80AE7DCC 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 /* 00B20 80AE7DD0 24070130 */ addiu $a3, $zero, 0x0130 ## $a3 = 00000130 -/* 00B24 80AE7DD4 0C031AB1 */ jal func_800C6AC4 +/* 00B24 80AE7DD4 0C031AB1 */ jal Graph_OpenDisps /* 00B28 80AE7DD8 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 -/* 00B2C 80AE7DDC 8FA9007C */ lw $t1, 0x007C($sp) -/* 00B30 80AE7DE0 0C024F61 */ jal func_80093D84 +/* 00B2C 80AE7DDC 8FA9007C */ lw $t1, 0x007C($sp) +/* 00B30 80AE7DE0 0C024F61 */ jal func_80093D84 /* 00B34 80AE7DE4 8D240000 */ lw $a0, 0x0000($t1) ## 00000000 -/* 00B38 80AE7DE8 8FA70068 */ lw $a3, 0x0068($sp) +/* 00B38 80AE7DE8 8FA70068 */ lw $a3, 0x0068($sp) /* 00B3C 80AE7DEC 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 /* 00B40 80AE7DF0 3C0BDB06 */ lui $t3, 0xDB06 ## $t3 = DB060000 -/* 00B44 80AE7DF4 00076100 */ sll $t4, $a3, 4 -/* 00B48 80AE7DF8 000C6F02 */ srl $t5, $t4, 28 +/* 00B44 80AE7DF4 00076100 */ sll $t4, $a3, 4 +/* 00B48 80AE7DF8 000C6F02 */ srl $t5, $t4, 28 /* 00B4C 80AE7DFC 3C0F8016 */ lui $t7, 0x8016 ## $t7 = 80160000 /* 00B50 80AE7E00 244A0008 */ addiu $t2, $v0, 0x0008 ## $t2 = 00000008 /* 00B54 80AE7E04 AE0A02D0 */ sw $t2, 0x02D0($s0) ## 000002D0 /* 00B58 80AE7E08 25EF6FA8 */ addiu $t7, $t7, 0x6FA8 ## $t7 = 80166FA8 -/* 00B5C 80AE7E0C 000D7080 */ sll $t6, $t5, 2 +/* 00B5C 80AE7E0C 000D7080 */ sll $t6, $t5, 2 /* 00B60 80AE7E10 356B0020 */ ori $t3, $t3, 0x0020 ## $t3 = DB060020 -/* 00B64 80AE7E14 01CF2021 */ addu $a0, $t6, $t7 +/* 00B64 80AE7E14 01CF2021 */ addu $a0, $t6, $t7 /* 00B68 80AE7E18 AC4B0000 */ sw $t3, 0x0000($v0) ## 00000000 /* 00B6C 80AE7E1C 8C980000 */ lw $t8, 0x0000($a0) ## 00000000 /* 00B70 80AE7E20 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 /* 00B74 80AE7E24 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF -/* 00B78 80AE7E28 00E12824 */ and $a1, $a3, $at +/* 00B78 80AE7E28 00E12824 */ and $a1, $a3, $at /* 00B7C 80AE7E2C 3C068000 */ lui $a2, 0x8000 ## $a2 = 80000000 -/* 00B80 80AE7E30 0305C821 */ addu $t9, $t8, $a1 -/* 00B84 80AE7E34 03264821 */ addu $t1, $t9, $a2 +/* 00B80 80AE7E30 0305C821 */ addu $t9, $t8, $a1 +/* 00B84 80AE7E34 03264821 */ addu $t1, $t9, $a2 /* 00B88 80AE7E38 AC490004 */ sw $t1, 0x0004($v0) ## 00000004 /* 00B8C 80AE7E3C 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 /* 00B90 80AE7E40 3C0BDB06 */ lui $t3, 0xDB06 ## $t3 = DB060000 @@ -50,11 +50,11 @@ glabel func_80AE7D94 /* 00BA4 80AE7E54 8C8C0000 */ lw $t4, 0x0000($a0) ## 00000000 /* 00BA8 80AE7E58 3C18FB00 */ lui $t8, 0xFB00 ## $t8 = FB000000 /* 00BAC 80AE7E5C 3C0BDB06 */ lui $t3, 0xDB06 ## $t3 = DB060000 -/* 00BB0 80AE7E60 01856821 */ addu $t5, $t4, $a1 -/* 00BB4 80AE7E64 01A67021 */ addu $t6, $t5, $a2 +/* 00BB0 80AE7E60 01856821 */ addu $t5, $t4, $a1 +/* 00BB4 80AE7E64 01A67021 */ addu $t6, $t5, $a2 /* 00BB8 80AE7E68 AC4E0004 */ sw $t6, 0x0004($v0) ## 00000004 /* 00BBC 80AE7E6C 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 00BC0 80AE7E70 8FA80078 */ lw $t0, 0x0078($sp) +/* 00BC0 80AE7E70 8FA80078 */ lw $t0, 0x0078($sp) /* 00BC4 80AE7E74 3C0C8011 */ lui $t4, 0x8011 ## $t4 = 80110000 /* 00BC8 80AE7E78 244F0008 */ addiu $t7, $v0, 0x0008 ## $t7 = 00000008 /* 00BCC 80AE7E7C AE0F02D0 */ sw $t7, 0x02D0($s0) ## 000002D0 @@ -73,25 +73,25 @@ glabel func_80AE7D94 /* 00C00 80AE7EB0 8C450004 */ lw $a1, 0x0004($v0) ## 00000150 /* 00C04 80AE7EB4 8C460020 */ lw $a2, 0x0020($v0) ## 0000016C /* 00C08 80AE7EB8 90470002 */ lbu $a3, 0x0002($v0) ## 0000014E -/* 00C0C 80AE7EBC AFA00018 */ sw $zero, 0x0018($sp) -/* 00C10 80AE7EC0 AFA00014 */ sw $zero, 0x0014($sp) -/* 00C14 80AE7EC4 AFA00010 */ sw $zero, 0x0010($sp) +/* 00C0C 80AE7EBC AFA00018 */ sw $zero, 0x0018($sp) +/* 00C10 80AE7EC0 AFA00014 */ sw $zero, 0x0014($sp) +/* 00C14 80AE7EC4 AFA00010 */ sw $zero, 0x0010($sp) /* 00C18 80AE7EC8 8E0D02D0 */ lw $t5, 0x02D0($s0) ## 000002D0 -/* 00C1C 80AE7ECC 8FA4007C */ lw $a0, 0x007C($sp) -/* 00C20 80AE7ED0 0C0289CF */ jal func_800A273C -/* 00C24 80AE7ED4 AFAD001C */ sw $t5, 0x001C($sp) +/* 00C1C 80AE7ECC 8FA4007C */ lw $a0, 0x007C($sp) +/* 00C20 80AE7ED0 0C0289CF */ jal SkelAnime_DrawSV2 +/* 00C24 80AE7ED4 AFAD001C */ sw $t5, 0x001C($sp) /* 00C28 80AE7ED8 AE0202D0 */ sw $v0, 0x02D0($s0) ## 000002D0 -/* 00C2C 80AE7EDC 8FAE007C */ lw $t6, 0x007C($sp) +/* 00C2C 80AE7EDC 8FAE007C */ lw $t6, 0x007C($sp) /* 00C30 80AE7EE0 3C0680AF */ lui $a2, %hi(D_80AE8220) ## $a2 = 80AF0000 /* 00C34 80AE7EE4 24C68220 */ addiu $a2, $a2, %lo(D_80AE8220) ## $a2 = 80AE8220 /* 00C38 80AE7EE8 27A40050 */ addiu $a0, $sp, 0x0050 ## $a0 = FFFFFFD8 /* 00C3C 80AE7EEC 2407014B */ addiu $a3, $zero, 0x014B ## $a3 = 0000014B -/* 00C40 80AE7EF0 0C031AD5 */ jal func_800C6B54 +/* 00C40 80AE7EF0 0C031AD5 */ jal Graph_CloseDisps /* 00C44 80AE7EF4 8DC50000 */ lw $a1, 0x0000($t6) ## 00000000 -/* 00C48 80AE7EF8 8FBF002C */ lw $ra, 0x002C($sp) -/* 00C4C 80AE7EFC 8FB00028 */ lw $s0, 0x0028($sp) +/* 00C48 80AE7EF8 8FBF002C */ lw $ra, 0x002C($sp) +/* 00C4C 80AE7EFC 8FB00028 */ lw $s0, 0x0028($sp) /* 00C50 80AE7F00 27BD0078 */ addiu $sp, $sp, 0x0078 ## $sp = 00000000 -/* 00C54 80AE7F04 03E00008 */ jr $ra +/* 00C54 80AE7F04 03E00008 */ jr $ra /* 00C58 80AE7F08 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE7FDC.s b/asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE7FDC.s index 431d1f4bb5..15d0fc584e 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE7FDC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Rl/func_80AE7FDC.s @@ -1,45 +1,45 @@ glabel func_80AE7FDC /* 00D2C 80AE7FDC 27BDFF90 */ addiu $sp, $sp, 0xFF90 ## $sp = FFFFFF90 -/* 00D30 80AE7FE0 AFBF0024 */ sw $ra, 0x0024($sp) -/* 00D34 80AE7FE4 AFA40070 */ sw $a0, 0x0070($sp) -/* 00D38 80AE7FE8 AFA50074 */ sw $a1, 0x0074($sp) +/* 00D30 80AE7FE0 AFBF0024 */ sw $ra, 0x0024($sp) +/* 00D34 80AE7FE4 AFA40070 */ sw $a0, 0x0070($sp) +/* 00D38 80AE7FE8 AFA50074 */ sw $a1, 0x0074($sp) /* 00D3C 80AE7FEC 84820190 */ lh $v0, 0x0190($a0) ## 00000190 /* 00D40 80AE7FF0 3C1880AF */ lui $t8, %hi(D_80AE81A0) ## $t8 = 80AF0000 /* 00D44 80AE7FF4 3C0680AF */ lui $a2, %hi(D_80AE827C) ## $a2 = 80AF0000 -/* 00D48 80AE7FF8 00027880 */ sll $t7, $v0, 2 -/* 00D4C 80AE7FFC 030FC021 */ addu $t8, $t8, $t7 -/* 00D50 80AE8000 8F1881A0 */ lw $t8, %lo(D_80AE81A0)($t8) +/* 00D48 80AE7FF8 00027880 */ sll $t7, $v0, 2 +/* 00D4C 80AE7FFC 030FC021 */ addu $t8, $t8, $t7 +/* 00D50 80AE8000 8F1881A0 */ lw $t8, %lo(D_80AE81A0)($t8) /* 00D54 80AE8004 24C6827C */ addiu $a2, $a2, %lo(D_80AE827C) ## $a2 = 80AE827C /* 00D58 80AE8008 27A40048 */ addiu $a0, $sp, 0x0048 ## $a0 = FFFFFFD8 -/* 00D5C 80AE800C AFB80060 */ sw $t8, 0x0060($sp) +/* 00D5C 80AE800C AFB80060 */ sw $t8, 0x0060($sp) /* 00D60 80AE8010 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 /* 00D64 80AE8014 240701A0 */ addiu $a3, $zero, 0x01A0 ## $a3 = 000001A0 -/* 00D68 80AE8018 0C031AB1 */ jal func_800C6AC4 -/* 00D6C 80AE801C AFA50058 */ sw $a1, 0x0058($sp) -/* 00D70 80AE8020 8FA90074 */ lw $t1, 0x0074($sp) -/* 00D74 80AE8024 0C024F46 */ jal func_80093D18 +/* 00D68 80AE8018 0C031AB1 */ jal Graph_OpenDisps +/* 00D6C 80AE801C AFA50058 */ sw $a1, 0x0058($sp) +/* 00D70 80AE8020 8FA90074 */ lw $t1, 0x0074($sp) +/* 00D74 80AE8024 0C024F46 */ jal func_80093D18 /* 00D78 80AE8028 8D240000 */ lw $a0, 0x0000($t1) ## 00000000 -/* 00D7C 80AE802C 8FA80058 */ lw $t0, 0x0058($sp) -/* 00D80 80AE8030 8FA70060 */ lw $a3, 0x0060($sp) +/* 00D7C 80AE802C 8FA80058 */ lw $t0, 0x0058($sp) +/* 00D80 80AE8030 8FA70060 */ lw $a3, 0x0060($sp) /* 00D84 80AE8034 3C0BDB06 */ lui $t3, 0xDB06 ## $t3 = DB060000 /* 00D88 80AE8038 8D0202C0 */ lw $v0, 0x02C0($t0) ## 000002C0 -/* 00D8C 80AE803C 00076100 */ sll $t4, $a3, 4 -/* 00D90 80AE8040 000C6F02 */ srl $t5, $t4, 28 +/* 00D8C 80AE803C 00076100 */ sll $t4, $a3, 4 +/* 00D90 80AE8040 000C6F02 */ srl $t5, $t4, 28 /* 00D94 80AE8044 3C0F8016 */ lui $t7, 0x8016 ## $t7 = 80160000 /* 00D98 80AE8048 244A0008 */ addiu $t2, $v0, 0x0008 ## $t2 = 00000008 /* 00D9C 80AE804C 25EF6FA8 */ addiu $t7, $t7, 0x6FA8 ## $t7 = 80166FA8 -/* 00DA0 80AE8050 000D7080 */ sll $t6, $t5, 2 +/* 00DA0 80AE8050 000D7080 */ sll $t6, $t5, 2 /* 00DA4 80AE8054 356B0020 */ ori $t3, $t3, 0x0020 ## $t3 = DB060020 /* 00DA8 80AE8058 AD0A02C0 */ sw $t2, 0x02C0($t0) ## 000002C0 -/* 00DAC 80AE805C 01CF2021 */ addu $a0, $t6, $t7 +/* 00DAC 80AE805C 01CF2021 */ addu $a0, $t6, $t7 /* 00DB0 80AE8060 AC4B0000 */ sw $t3, 0x0000($v0) ## 00000000 /* 00DB4 80AE8064 8C980000 */ lw $t8, 0x0000($a0) ## 00000000 /* 00DB8 80AE8068 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 /* 00DBC 80AE806C 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF -/* 00DC0 80AE8070 00E12824 */ and $a1, $a3, $at +/* 00DC0 80AE8070 00E12824 */ and $a1, $a3, $at /* 00DC4 80AE8074 3C068000 */ lui $a2, 0x8000 ## $a2 = 80000000 -/* 00DC8 80AE8078 0305C821 */ addu $t9, $t8, $a1 -/* 00DCC 80AE807C 03264821 */ addu $t1, $t9, $a2 +/* 00DC8 80AE8078 0305C821 */ addu $t9, $t8, $a1 +/* 00DCC 80AE807C 03264821 */ addu $t1, $t9, $a2 /* 00DD0 80AE8080 AC490004 */ sw $t1, 0x0004($v0) ## 00000004 /* 00DD4 80AE8084 8D0202C0 */ lw $v0, 0x02C0($t0) ## 000002C0 /* 00DD8 80AE8088 3C0BDB06 */ lui $t3, 0xDB06 ## $t3 = DB060000 @@ -50,8 +50,8 @@ glabel func_80AE7FDC /* 00DEC 80AE809C 8C8C0000 */ lw $t4, 0x0000($a0) ## 00000000 /* 00DF0 80AE80A0 241900FF */ addiu $t9, $zero, 0x00FF ## $t9 = 000000FF /* 00DF4 80AE80A4 3C18FB00 */ lui $t8, 0xFB00 ## $t8 = FB000000 -/* 00DF8 80AE80A8 01856821 */ addu $t5, $t4, $a1 -/* 00DFC 80AE80AC 01A67021 */ addu $t6, $t5, $a2 +/* 00DF8 80AE80A8 01856821 */ addu $t5, $t4, $a1 +/* 00DFC 80AE80AC 01A67021 */ addu $t6, $t5, $a2 /* 00E00 80AE80B0 AC4E0004 */ sw $t6, 0x0004($v0) ## 00000004 /* 00E04 80AE80B4 8D0202C0 */ lw $v0, 0x02C0($t0) ## 000002C0 /* 00E08 80AE80B8 3C0B8011 */ lui $t3, 0x8011 ## $t3 = 80110000 @@ -67,26 +67,26 @@ glabel func_80AE7FDC /* 00E30 80AE80E0 AD0902C0 */ sw $t1, 0x02C0($t0) ## 000002C0 /* 00E34 80AE80E4 AC4B0004 */ sw $t3, 0x0004($v0) ## 00000004 /* 00E38 80AE80E8 AC4A0000 */ sw $t2, 0x0000($v0) ## 00000000 -/* 00E3C 80AE80EC 8FA30070 */ lw $v1, 0x0070($sp) -/* 00E40 80AE80F0 8FA40074 */ lw $a0, 0x0074($sp) +/* 00E3C 80AE80EC 8FA30070 */ lw $v1, 0x0070($sp) +/* 00E40 80AE80F0 8FA40074 */ lw $a0, 0x0074($sp) /* 00E44 80AE80F4 2462014C */ addiu $v0, $v1, 0x014C ## $v0 = 0000014C /* 00E48 80AE80F8 8C450004 */ lw $a1, 0x0004($v0) ## 00000150 /* 00E4C 80AE80FC 8C460020 */ lw $a2, 0x0020($v0) ## 0000016C /* 00E50 80AE8100 90470002 */ lbu $a3, 0x0002($v0) ## 0000014E -/* 00E54 80AE8104 AFA00014 */ sw $zero, 0x0014($sp) -/* 00E58 80AE8108 AFA00010 */ sw $zero, 0x0010($sp) -/* 00E5C 80AE810C 0C0286B2 */ jal func_800A1AC8 -/* 00E60 80AE8110 AFA30018 */ sw $v1, 0x0018($sp) -/* 00E64 80AE8114 8FAC0074 */ lw $t4, 0x0074($sp) +/* 00E54 80AE8104 AFA00014 */ sw $zero, 0x0014($sp) +/* 00E58 80AE8108 AFA00010 */ sw $zero, 0x0010($sp) +/* 00E5C 80AE810C 0C0286B2 */ jal SkelAnime_DrawSV +/* 00E60 80AE8110 AFA30018 */ sw $v1, 0x0018($sp) +/* 00E64 80AE8114 8FAC0074 */ lw $t4, 0x0074($sp) /* 00E68 80AE8118 3C0680AF */ lui $a2, %hi(D_80AE828C) ## $a2 = 80AF0000 /* 00E6C 80AE811C 24C6828C */ addiu $a2, $a2, %lo(D_80AE828C) ## $a2 = 80AE828C /* 00E70 80AE8120 27A40048 */ addiu $a0, $sp, 0x0048 ## $a0 = FFFFFFD8 /* 00E74 80AE8124 240701B5 */ addiu $a3, $zero, 0x01B5 ## $a3 = 000001B5 -/* 00E78 80AE8128 0C031AD5 */ jal func_800C6B54 +/* 00E78 80AE8128 0C031AD5 */ jal Graph_CloseDisps /* 00E7C 80AE812C 8D850000 */ lw $a1, 0x0000($t4) ## 00000000 -/* 00E80 80AE8130 8FBF0024 */ lw $ra, 0x0024($sp) +/* 00E80 80AE8130 8FBF0024 */ lw $ra, 0x0024($sp) /* 00E84 80AE8134 27BD0070 */ addiu $sp, $sp, 0x0070 ## $sp = 00000000 -/* 00E88 80AE8138 03E00008 */ jr $ra +/* 00E88 80AE8138 03E00008 */ jr $ra /* 00E8C 80AE813C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Rr/EnRr_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Rr/EnRr_Draw.s index 8a16cb8b26..f766fe687d 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Rr/EnRr_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Rr/EnRr_Draw.s @@ -1,32 +1,32 @@ glabel EnRr_Draw /* 01D94 80AEA1D4 27BDFF38 */ addiu $sp, $sp, 0xFF38 ## $sp = FFFFFF38 -/* 01D98 80AEA1D8 AFB30054 */ sw $s3, 0x0054($sp) +/* 01D98 80AEA1D8 AFB30054 */ sw $s3, 0x0054($sp) /* 01D9C 80AEA1DC 00809825 */ or $s3, $a0, $zero ## $s3 = 00000000 -/* 01DA0 80AEA1E0 AFBF005C */ sw $ra, 0x005C($sp) -/* 01DA4 80AEA1E4 AFB40058 */ sw $s4, 0x0058($sp) -/* 01DA8 80AEA1E8 AFB20050 */ sw $s2, 0x0050($sp) -/* 01DAC 80AEA1EC AFB1004C */ sw $s1, 0x004C($sp) -/* 01DB0 80AEA1F0 AFB00048 */ sw $s0, 0x0048($sp) -/* 01DB4 80AEA1F4 F7B60040 */ sdc1 $f22, 0x0040($sp) -/* 01DB8 80AEA1F8 F7B40038 */ sdc1 $f20, 0x0038($sp) -/* 01DBC 80AEA1FC AFA500CC */ sw $a1, 0x00CC($sp) +/* 01DA0 80AEA1E0 AFBF005C */ sw $ra, 0x005C($sp) +/* 01DA4 80AEA1E4 AFB40058 */ sw $s4, 0x0058($sp) +/* 01DA8 80AEA1E8 AFB20050 */ sw $s2, 0x0050($sp) +/* 01DAC 80AEA1EC AFB1004C */ sw $s1, 0x004C($sp) +/* 01DB0 80AEA1F0 AFB00048 */ sw $s0, 0x0048($sp) +/* 01DB4 80AEA1F4 F7B60040 */ sdc1 $f22, 0x0040($sp) +/* 01DB8 80AEA1F8 F7B40038 */ sdc1 $f20, 0x0038($sp) +/* 01DBC 80AEA1FC AFA500CC */ sw $a1, 0x00CC($sp) /* 01DC0 80AEA200 8CA40000 */ lw $a0, 0x0000($a1) ## 00000000 /* 01DC4 80AEA204 0C031A73 */ jal Graph_Alloc - + /* 01DC8 80AEA208 24050100 */ addiu $a1, $zero, 0x0100 ## $a1 = 00000100 -/* 01DCC 80AEA20C 8FAF00CC */ lw $t7, 0x00CC($sp) +/* 01DCC 80AEA20C 8FAF00CC */ lw $t7, 0x00CC($sp) /* 01DD0 80AEA210 3C0680AF */ lui $a2, %hi(D_80AEA838) ## $a2 = 80AF0000 /* 01DD4 80AEA214 0040A025 */ or $s4, $v0, $zero ## $s4 = 00000000 /* 01DD8 80AEA218 8DE50000 */ lw $a1, 0x0000($t7) ## 00000000 /* 01DDC 80AEA21C 24C6A838 */ addiu $a2, $a2, %lo(D_80AEA838) ## $a2 = 80AEA838 /* 01DE0 80AEA220 27A40098 */ addiu $a0, $sp, 0x0098 ## $a0 = FFFFFFD0 /* 01DE4 80AEA224 240705C6 */ addiu $a3, $zero, 0x05C6 ## $a3 = 000005C6 -/* 01DE8 80AEA228 0C031AB1 */ jal func_800C6AC4 -/* 01DEC 80AEA22C AFA500A8 */ sw $a1, 0x00A8($sp) -/* 01DF0 80AEA230 8FB800CC */ lw $t8, 0x00CC($sp) -/* 01DF4 80AEA234 0C024F61 */ jal func_80093D84 +/* 01DE8 80AEA228 0C031AB1 */ jal Graph_OpenDisps +/* 01DEC 80AEA22C AFA500A8 */ sw $a1, 0x00A8($sp) +/* 01DF0 80AEA230 8FB800CC */ lw $t8, 0x00CC($sp) +/* 01DF4 80AEA234 0C024F61 */ jal func_80093D84 /* 01DF8 80AEA238 8F040000 */ lw $a0, 0x0000($t8) ## 00000000 -/* 01DFC 80AEA23C 8FA900A8 */ lw $t1, 0x00A8($sp) +/* 01DFC 80AEA23C 8FA900A8 */ lw $t1, 0x00A8($sp) /* 01E00 80AEA240 3C0ADB06 */ lui $t2, 0xDB06 ## $t2 = DB060000 /* 01E04 80AEA244 354A0030 */ ori $t2, $t2, 0x0030 ## $t2 = DB060030 /* 01E08 80AEA248 8D2202D0 */ lw $v0, 0x02D0($t1) ## 000002D0 @@ -42,51 +42,51 @@ glabel EnRr_Draw /* 01E30 80AEA270 244B0008 */ addiu $t3, $v0, 0x0008 ## $t3 = 00000008 /* 01E34 80AEA274 AD2B02D0 */ sw $t3, 0x02D0($t1) ## 000002D0 /* 01E38 80AEA278 AC4C0000 */ sw $t4, 0x0000($v0) ## 00000000 -/* 01E3C 80AEA27C 8FAD00CC */ lw $t5, 0x00CC($sp) +/* 01E3C 80AEA27C 8FAD00CC */ lw $t5, 0x00CC($sp) /* 01E40 80AEA280 866301EC */ lh $v1, 0x01EC($s3) ## 000001EC /* 01E44 80AEA284 240C0010 */ addiu $t4, $zero, 0x0010 ## $t4 = 00000010 /* 01E48 80AEA288 8DA40000 */ lw $a0, 0x0000($t5) ## 00000000 -/* 01E4C 80AEA28C 00030823 */ subu $at, $zero, $v1 -/* 01E50 80AEA290 0001C880 */ sll $t9, $at, 2 -/* 01E54 80AEA294 0321C823 */ subu $t9, $t9, $at -/* 01E58 80AEA298 0019C840 */ sll $t9, $t9, 1 +/* 01E4C 80AEA28C 00030823 */ subu $at, $zero, $v1 +/* 01E50 80AEA290 0001C880 */ sll $t9, $at, 2 +/* 01E54 80AEA294 0321C823 */ subu $t9, $t9, $at +/* 01E58 80AEA298 0019C840 */ sll $t9, $t9, 1 /* 01E5C 80AEA29C 332A007F */ andi $t2, $t9, 0x007F ## $t2 = 00000008 /* 01E60 80AEA2A0 240B0020 */ addiu $t3, $zero, 0x0020 ## $t3 = 00000020 /* 01E64 80AEA2A4 240F0010 */ addiu $t7, $zero, 0x0010 ## $t7 = 00000010 /* 01E68 80AEA2A8 24180001 */ addiu $t8, $zero, 0x0001 ## $t8 = 00000001 -/* 01E6C 80AEA2AC AFB80018 */ sw $t8, 0x0018($sp) -/* 01E70 80AEA2B0 AFAF0014 */ sw $t7, 0x0014($sp) -/* 01E74 80AEA2B4 AFAB0024 */ sw $t3, 0x0024($sp) -/* 01E78 80AEA2B8 AFAA0020 */ sw $t2, 0x0020($sp) -/* 01E7C 80AEA2BC AFAC0028 */ sw $t4, 0x0028($sp) -/* 01E80 80AEA2C0 AFA7001C */ sw $a3, 0x001C($sp) -/* 01E84 80AEA2C4 AFAE0010 */ sw $t6, 0x0010($sp) +/* 01E6C 80AEA2AC AFB80018 */ sw $t8, 0x0018($sp) +/* 01E70 80AEA2B0 AFAF0014 */ sw $t7, 0x0014($sp) +/* 01E74 80AEA2B4 AFAB0024 */ sw $t3, 0x0024($sp) +/* 01E78 80AEA2B8 AFAA0020 */ sw $t2, 0x0020($sp) +/* 01E7C 80AEA2BC AFAC0028 */ sw $t4, 0x0028($sp) +/* 01E80 80AEA2C0 AFA7001C */ sw $a3, 0x001C($sp) +/* 01E84 80AEA2C4 AFAE0010 */ sw $t6, 0x0010($sp) /* 01E88 80AEA2C8 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 01E8C 80AEA2CC 00004025 */ or $t0, $zero, $zero ## $t0 = 00000000 /* 01E90 80AEA2D0 3006007F */ andi $a2, $zero, 0x007F ## $a2 = 00000000 -/* 01E94 80AEA2D4 0C0253D0 */ jal Draw_TwoTexScroll +/* 01E94 80AEA2D4 0C0253D0 */ jal Gfx_TwoTexScroll /* 01E98 80AEA2D8 00408025 */ or $s0, $v0, $zero ## $s0 = 00000000 -/* 01E9C 80AEA2DC 0C034213 */ jal Matrix_Push +/* 01E9C 80AEA2DC 0C034213 */ jal Matrix_Push /* 01EA0 80AEA2E0 AE020004 */ sw $v0, 0x0004($s0) ## 00000004 /* 01EA4 80AEA2E4 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 /* 01EA8 80AEA2E8 4481B000 */ mtc1 $at, $f22 ## $f22 = 1.00 /* 01EAC 80AEA2EC C6660244 */ lwc1 $f6, 0x0244($s3) ## 00000244 /* 01EB0 80AEA2F0 C664022C */ lwc1 $f4, 0x022C($s3) ## 0000022C /* 01EB4 80AEA2F4 C6700248 */ lwc1 $f16, 0x0248($s3) ## 00000248 -/* 01EB8 80AEA2F8 4606B200 */ add.s $f8, $f22, $f6 +/* 01EB8 80AEA2F8 4606B200 */ add.s $f8, $f22, $f6 /* 01EBC 80AEA2FC C66A0230 */ lwc1 $f10, 0x0230($s3) ## 00000230 /* 01EC0 80AEA300 C6660234 */ lwc1 $f6, 0x0234($s3) ## 00000234 -/* 01EC4 80AEA304 4610B480 */ add.s $f18, $f22, $f16 -/* 01EC8 80AEA308 46082302 */ mul.s $f12, $f4, $f8 +/* 01EC4 80AEA304 4610B480 */ add.s $f18, $f22, $f16 +/* 01EC8 80AEA308 46082302 */ mul.s $f12, $f4, $f8 /* 01ECC 80AEA30C C664024C */ lwc1 $f4, 0x024C($s3) ## 0000024C /* 01ED0 80AEA310 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 01ED4 80AEA314 46125382 */ mul.s $f14, $f10, $f18 -/* 01ED8 80AEA318 4604B200 */ add.s $f8, $f22, $f4 -/* 01EDC 80AEA31C 46083402 */ mul.s $f16, $f6, $f8 -/* 01EE0 80AEA320 44068000 */ mfc1 $a2, $f16 -/* 01EE4 80AEA324 0C0342A3 */ jal Matrix_Scale +/* 01ED4 80AEA314 46125382 */ mul.s $f14, $f10, $f18 +/* 01ED8 80AEA318 4604B200 */ add.s $f8, $f22, $f4 +/* 01EDC 80AEA31C 46083402 */ mul.s $f16, $f6, $f8 +/* 01EE0 80AEA320 44068000 */ mfc1 $a2, $f16 +/* 01EE4 80AEA324 0C0342A3 */ jal Matrix_Scale /* 01EE8 80AEA328 00000000 */ nop -/* 01EEC 80AEA32C 8FA300A8 */ lw $v1, 0x00A8($sp) +/* 01EEC 80AEA32C 8FA300A8 */ lw $v1, 0x00A8($sp) /* 01EF0 80AEA330 3C0EDA38 */ lui $t6, 0xDA38 ## $t6 = DA380000 /* 01EF4 80AEA334 35CE0003 */ ori $t6, $t6, 0x0003 ## $t6 = DA380003 /* 01EF8 80AEA338 8C6202D0 */ lw $v0, 0x02D0($v1) ## 000002D0 @@ -95,67 +95,67 @@ glabel EnRr_Draw /* 01F04 80AEA344 244D0008 */ addiu $t5, $v0, 0x0008 ## $t5 = 00000008 /* 01F08 80AEA348 AC6D02D0 */ sw $t5, 0x02D0($v1) ## 000002D0 /* 01F0C 80AEA34C AC4E0000 */ sw $t6, 0x0000($v0) ## 00000000 -/* 01F10 80AEA350 8FAF00CC */ lw $t7, 0x00CC($sp) +/* 01F10 80AEA350 8FAF00CC */ lw $t7, 0x00CC($sp) /* 01F14 80AEA354 240605DD */ addiu $a2, $zero, 0x05DD ## $a2 = 000005DD /* 01F18 80AEA358 00408025 */ or $s0, $v0, $zero ## $s0 = 00000000 -/* 01F1C 80AEA35C 0C0346A2 */ jal Matrix_NewMtx +/* 01F1C 80AEA35C 0C0346A2 */ jal Matrix_NewMtx /* 01F20 80AEA360 8DE40000 */ lw $a0, 0x0000($t7) ## 00000000 -/* 01F24 80AEA364 0C034221 */ jal Matrix_Pull +/* 01F24 80AEA364 0C034221 */ jal Matrix_Pull /* 01F28 80AEA368 AE020004 */ sw $v0, 0x0004($s0) ## 00000004 /* 01F2C 80AEA36C 4480A000 */ mtc1 $zero, $f20 ## $f20 = 0.00 /* 01F30 80AEA370 2411000C */ addiu $s1, $zero, 0x000C ## $s1 = 0000000C /* 01F34 80AEA374 26720394 */ addiu $s2, $s3, 0x0394 ## $s2 = 00000394 /* 01F38 80AEA378 26700040 */ addiu $s0, $s3, 0x0040 ## $s0 = 00000040 -/* 01F3C 80AEA37C E7B400B8 */ swc1 $f20, 0x00B8($sp) -/* 01F40 80AEA380 E7B400BC */ swc1 $f20, 0x00BC($sp) -/* 01F44 80AEA384 E7B400C0 */ swc1 $f20, 0x00C0($sp) +/* 01F3C 80AEA37C E7B400B8 */ swc1 $f20, 0x00B8($sp) +/* 01F40 80AEA380 E7B400BC */ swc1 $f20, 0x00BC($sp) +/* 01F44 80AEA384 E7B400C0 */ swc1 $f20, 0x00C0($sp) .L80AEA388: /* 01F48 80AEA388 3C01447A */ lui $at, 0x447A ## $at = 447A0000 /* 01F4C 80AEA38C 44819000 */ mtc1 $at, $f18 ## $f18 = 1000.00 /* 01F50 80AEA390 C60A0224 */ lwc1 $f10, 0x0224($s0) ## 00000264 -/* 01F54 80AEA394 4406A000 */ mfc1 $a2, $f20 -/* 01F58 80AEA398 4600A306 */ mov.s $f12, $f20 +/* 01F54 80AEA394 4406A000 */ mfc1 $a2, $f20 +/* 01F58 80AEA398 4600A306 */ mov.s $f12, $f20 /* 01F5C 80AEA39C 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 01F60 80AEA3A0 0C034261 */ jal Matrix_Translate -/* 01F64 80AEA3A4 46125380 */ add.s $f14, $f10, $f18 +/* 01F60 80AEA3A0 0C034261 */ jal Matrix_Translate +/* 01F64 80AEA3A4 46125380 */ add.s $f14, $f10, $f18 /* 01F68 80AEA3A8 8604025C */ lh $a0, 0x025C($s0) ## 0000029C /* 01F6C 80AEA3AC 8605025E */ lh $a1, 0x025E($s0) ## 0000029E /* 01F70 80AEA3B0 86060260 */ lh $a2, 0x0260($s0) ## 000002A0 -/* 01F74 80AEA3B4 0C034421 */ jal Matrix_RotateXYZ +/* 01F74 80AEA3B4 0C034421 */ jal Matrix_RotateZYX /* 01F78 80AEA3B8 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 01F7C 80AEA3BC 0C034213 */ jal Matrix_Push +/* 01F7C 80AEA3BC 0C034213 */ jal Matrix_Push /* 01F80 80AEA3C0 00000000 */ nop /* 01F84 80AEA3C4 C6060244 */ lwc1 $f6, 0x0244($s0) ## 00000284 /* 01F88 80AEA3C8 C604022C */ lwc1 $f4, 0x022C($s0) ## 0000026C /* 01F8C 80AEA3CC C60A0248 */ lwc1 $f10, 0x0248($s0) ## 00000288 -/* 01F90 80AEA3D0 4606B200 */ add.s $f8, $f22, $f6 +/* 01F90 80AEA3D0 4606B200 */ add.s $f8, $f22, $f6 /* 01F94 80AEA3D4 C6100230 */ lwc1 $f16, 0x0230($s0) ## 00000270 /* 01F98 80AEA3D8 C6060234 */ lwc1 $f6, 0x0234($s0) ## 00000274 -/* 01F9C 80AEA3DC 460AB480 */ add.s $f18, $f22, $f10 -/* 01FA0 80AEA3E0 46082302 */ mul.s $f12, $f4, $f8 +/* 01F9C 80AEA3DC 460AB480 */ add.s $f18, $f22, $f10 +/* 01FA0 80AEA3E0 46082302 */ mul.s $f12, $f4, $f8 /* 01FA4 80AEA3E4 C604024C */ lwc1 $f4, 0x024C($s0) ## 0000028C /* 01FA8 80AEA3E8 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 01FAC 80AEA3EC 46128382 */ mul.s $f14, $f16, $f18 -/* 01FB0 80AEA3F0 4604B200 */ add.s $f8, $f22, $f4 -/* 01FB4 80AEA3F4 46083282 */ mul.s $f10, $f6, $f8 -/* 01FB8 80AEA3F8 44065000 */ mfc1 $a2, $f10 -/* 01FBC 80AEA3FC 0C0342A3 */ jal Matrix_Scale +/* 01FAC 80AEA3EC 46128382 */ mul.s $f14, $f16, $f18 +/* 01FB0 80AEA3F0 4604B200 */ add.s $f8, $f22, $f4 +/* 01FB4 80AEA3F4 46083282 */ mul.s $f10, $f6, $f8 +/* 01FB8 80AEA3F8 44065000 */ mfc1 $a2, $f10 +/* 01FBC 80AEA3FC 0C0342A3 */ jal Matrix_Scale /* 01FC0 80AEA400 00000000 */ nop /* 01FC4 80AEA404 3C0580AF */ lui $a1, %hi(D_80AEA858) ## $a1 = 80AF0000 /* 01FC8 80AEA408 24A5A858 */ addiu $a1, $a1, %lo(D_80AEA858) ## $a1 = 80AEA858 /* 01FCC 80AEA40C 02802025 */ or $a0, $s4, $zero ## $a0 = 00000000 -/* 01FD0 80AEA410 0C034695 */ jal Matrix_ToMtx +/* 01FD0 80AEA410 0C034695 */ jal Matrix_ToMtx /* 01FD4 80AEA414 240605F7 */ addiu $a2, $zero, 0x05F7 ## $a2 = 000005F7 -/* 01FD8 80AEA418 0C034221 */ jal Matrix_Pull +/* 01FD8 80AEA418 0C034221 */ jal Matrix_Pull /* 01FDC 80AEA41C 00000000 */ nop /* 01FE0 80AEA420 26940040 */ addiu $s4, $s4, 0x0040 ## $s4 = 00000040 /* 01FE4 80AEA424 27A400B8 */ addiu $a0, $sp, 0x00B8 ## $a0 = FFFFFFF0 -/* 01FE8 80AEA428 0C0346BD */ jal Matrix_MultVec3f +/* 01FE8 80AEA428 0C0346BD */ jal Matrix_MultVec3f /* 01FEC 80AEA42C 02402825 */ or $a1, $s2, $zero ## $a1 = 00000394 /* 01FF0 80AEA430 2631000C */ addiu $s1, $s1, 0x000C ## $s1 = 00000018 /* 01FF4 80AEA434 2401003C */ addiu $at, $zero, 0x003C ## $at = 0000003C /* 01FF8 80AEA438 2652000C */ addiu $s2, $s2, 0x000C ## $s2 = 000003A0 -/* 01FFC 80AEA43C 1621FFD2 */ bne $s1, $at, .L80AEA388 +/* 01FFC 80AEA43C 1621FFD2 */ bne $s1, $at, .L80AEA388 /* 02000 80AEA440 26100040 */ addiu $s0, $s0, 0x0040 ## $s0 = 00000080 /* 02004 80AEA444 8E790024 */ lw $t9, 0x0024($s3) ## 00000024 /* 02008 80AEA448 8E780028 */ lw $t8, 0x0028($s3) ## 00000028 @@ -164,9 +164,9 @@ glabel EnRr_Draw /* 02014 80AEA454 8E79002C */ lw $t9, 0x002C($s3) ## 0000002C /* 02018 80AEA458 2665037C */ addiu $a1, $s3, 0x037C ## $a1 = 0000037C /* 0201C 80AEA45C AE78038C */ sw $t8, 0x038C($s3) ## 0000038C -/* 02020 80AEA460 0C0346BD */ jal Matrix_MultVec3f +/* 02020 80AEA460 0C0346BD */ jal Matrix_MultVec3f /* 02024 80AEA464 AE790390 */ sw $t9, 0x0390($s3) ## 00000390 -/* 02028 80AEA468 8FAA00A8 */ lw $t2, 0x00A8($sp) +/* 02028 80AEA468 8FAA00A8 */ lw $t2, 0x00A8($sp) /* 0202C 80AEA46C 3C0D0600 */ lui $t5, 0x0600 ## $t5 = 06000000 /* 02030 80AEA470 25AD0470 */ addiu $t5, $t5, 0x0470 ## $t5 = 06000470 /* 02034 80AEA474 8D4202D0 */ lw $v0, 0x02D0($t2) ## 000002D0 @@ -176,108 +176,108 @@ glabel EnRr_Draw /* 02044 80AEA484 AD4B02D0 */ sw $t3, 0x02D0($t2) ## 000002D0 /* 02048 80AEA488 AC4D0004 */ sw $t5, 0x0004($v0) ## 00000004 /* 0204C 80AEA48C AC4C0000 */ sw $t4, 0x0000($v0) ## 00000000 -/* 02050 80AEA490 8FAE00CC */ lw $t6, 0x00CC($sp) +/* 02050 80AEA490 8FAE00CC */ lw $t6, 0x00CC($sp) /* 02054 80AEA494 24C6A868 */ addiu $a2, $a2, %lo(D_80AEA868) ## $a2 = 80AEA868 /* 02058 80AEA498 27A40098 */ addiu $a0, $sp, 0x0098 ## $a0 = FFFFFFD0 /* 0205C 80AEA49C 2407060F */ addiu $a3, $zero, 0x060F ## $a3 = 0000060F -/* 02060 80AEA4A0 0C031AD5 */ jal func_800C6B54 +/* 02060 80AEA4A0 0C031AD5 */ jal Graph_CloseDisps /* 02064 80AEA4A4 8DC50000 */ lw $a1, 0x0000($t6) ## 00000000 /* 02068 80AEA4A8 866201F2 */ lh $v0, 0x01F2($s3) ## 000001F2 -/* 0206C 80AEA4AC 1040004F */ beq $v0, $zero, .L80AEA5EC +/* 0206C 80AEA4AC 1040004F */ beq $v0, $zero, .L80AEA5EC /* 02070 80AEA4B0 2450FFFF */ addiu $s0, $v0, 0xFFFF ## $s0 = FFFFFFFF /* 02074 80AEA4B4 926F0114 */ lbu $t7, 0x0114($s3) ## 00000114 -/* 02078 80AEA4B8 00108400 */ sll $s0, $s0, 16 -/* 0207C 80AEA4BC 00108403 */ sra $s0, $s0, 16 +/* 02078 80AEA4B8 00108400 */ sll $s0, $s0, 16 +/* 0207C 80AEA4BC 00108403 */ sra $s0, $s0, 16 /* 02080 80AEA4C0 32190001 */ andi $t9, $s0, 0x0001 ## $t9 = 00000001 /* 02084 80AEA4C4 25F80001 */ addiu $t8, $t7, 0x0001 ## $t8 = 00000001 -/* 02088 80AEA4C8 17200048 */ bne $t9, $zero, .L80AEA5EC +/* 02088 80AEA4C8 17200048 */ bne $t9, $zero, .L80AEA5EC /* 0208C 80AEA4CC A2780114 */ sb $t8, 0x0114($s3) ## 00000114 /* 02090 80AEA4D0 3C014120 */ lui $at, 0x4120 ## $at = 41200000 /* 02094 80AEA4D4 4481A000 */ mtc1 $at, $f20 ## $f20 = 10.00 /* 02098 80AEA4D8 0C00CFC8 */ jal Math_Rand_CenteredFloat - -/* 0209C 80AEA4DC 4600A306 */ mov.s $f12, $f20 -/* 020A0 80AEA4E0 00105883 */ sra $t3, $s0, 2 + +/* 0209C 80AEA4DC 4600A306 */ mov.s $f12, $f20 +/* 020A0 80AEA4E0 00105883 */ sra $t3, $s0, 2 /* 020A4 80AEA4E4 240A0004 */ addiu $t2, $zero, 0x0004 ## $t2 = 00000004 -/* 020A8 80AEA4E8 014B6023 */ subu $t4, $t2, $t3 +/* 020A8 80AEA4E8 014B6023 */ subu $t4, $t2, $t3 /* 020AC 80AEA4EC 2402000C */ addiu $v0, $zero, 0x000C ## $v0 = 0000000C -/* 020B0 80AEA4F0 01820019 */ multu $t4, $v0 -/* 020B4 80AEA4F4 00107043 */ sra $t6, $s0, 1 +/* 020B0 80AEA4F0 01820019 */ multu $t4, $v0 +/* 020B4 80AEA4F4 00107043 */ sra $t6, $s0, 1 /* 020B8 80AEA4F8 31CF0003 */ andi $t7, $t6, 0x0003 ## $t7 = 00000000 /* 020BC 80AEA4FC 3C1980AF */ lui $t9, %hi(D_80AEA6F0) ## $t9 = 80AF0000 /* 020C0 80AEA500 2739A6F0 */ addiu $t9, $t9, %lo(D_80AEA6F0) ## $t9 = 80AEA6F0 -/* 020C4 80AEA504 4600A306 */ mov.s $f12, $f20 -/* 020C8 80AEA508 00006812 */ mflo $t5 -/* 020CC 80AEA50C 026D8821 */ addu $s1, $s3, $t5 +/* 020C4 80AEA504 4600A306 */ mov.s $f12, $f20 +/* 020C8 80AEA508 00006812 */ mflo $t5 +/* 020CC 80AEA50C 026D8821 */ addu $s1, $s3, $t5 /* 020D0 80AEA510 C6300388 */ lwc1 $f16, 0x0388($s1) ## 000003A0 -/* 020D4 80AEA514 01E20019 */ multu $t7, $v0 -/* 020D8 80AEA518 0000C012 */ mflo $t8 -/* 020DC 80AEA51C 03199021 */ addu $s2, $t8, $t9 +/* 020D4 80AEA514 01E20019 */ multu $t7, $v0 +/* 020D8 80AEA518 0000C012 */ mflo $t8 +/* 020DC 80AEA51C 03199021 */ addu $s2, $t8, $t9 /* 020E0 80AEA520 C6520000 */ lwc1 $f18, 0x0000($s2) ## 000003A0 -/* 020E4 80AEA524 46128100 */ add.s $f4, $f16, $f18 -/* 020E8 80AEA528 46040180 */ add.s $f6, $f0, $f4 +/* 020E4 80AEA524 46128100 */ add.s $f4, $f16, $f18 +/* 020E8 80AEA528 46040180 */ add.s $f6, $f0, $f4 /* 020EC 80AEA52C 0C00CFC8 */ jal Math_Rand_CenteredFloat - -/* 020F0 80AEA530 E7A6007C */ swc1 $f6, 0x007C($sp) + +/* 020F0 80AEA530 E7A6007C */ swc1 $f6, 0x007C($sp) /* 020F4 80AEA534 C628038C */ lwc1 $f8, 0x038C($s1) ## 000003A4 /* 020F8 80AEA538 C64A0004 */ lwc1 $f10, 0x0004($s2) ## 000003A4 -/* 020FC 80AEA53C 4600A306 */ mov.s $f12, $f20 -/* 02100 80AEA540 460A4400 */ add.s $f16, $f8, $f10 -/* 02104 80AEA544 46100480 */ add.s $f18, $f0, $f16 +/* 020FC 80AEA53C 4600A306 */ mov.s $f12, $f20 +/* 02100 80AEA540 460A4400 */ add.s $f16, $f8, $f10 +/* 02104 80AEA544 46100480 */ add.s $f18, $f0, $f16 /* 02108 80AEA548 0C00CFC8 */ jal Math_Rand_CenteredFloat - -/* 0210C 80AEA54C E7B20080 */ swc1 $f18, 0x0080($sp) + +/* 0210C 80AEA54C E7B20080 */ swc1 $f18, 0x0080($sp) /* 02110 80AEA550 C6240390 */ lwc1 $f4, 0x0390($s1) ## 000003A8 /* 02114 80AEA554 C6460008 */ lwc1 $f6, 0x0008($s2) ## 000003A8 -/* 02118 80AEA558 8FA400CC */ lw $a0, 0x00CC($sp) +/* 02118 80AEA558 8FA400CC */ lw $a0, 0x00CC($sp) /* 0211C 80AEA55C 02602825 */ or $a1, $s3, $zero ## $a1 = 00000000 -/* 02120 80AEA560 46062200 */ add.s $f8, $f4, $f6 +/* 02120 80AEA560 46062200 */ add.s $f8, $f4, $f6 /* 02124 80AEA564 27A6007C */ addiu $a2, $sp, 0x007C ## $a2 = FFFFFFB4 /* 02128 80AEA568 24070096 */ addiu $a3, $zero, 0x0096 ## $a3 = 00000096 /* 0212C 80AEA56C 240D0096 */ addiu $t5, $zero, 0x0096 ## $t5 = 00000096 -/* 02130 80AEA570 46080280 */ add.s $f10, $f0, $f8 +/* 02130 80AEA570 46080280 */ add.s $f10, $f0, $f8 /* 02134 80AEA574 240E0096 */ addiu $t6, $zero, 0x0096 ## $t6 = 00000096 /* 02138 80AEA578 240F00FA */ addiu $t7, $zero, 0x00FA ## $t7 = 000000FA /* 0213C 80AEA57C 241800EB */ addiu $t8, $zero, 0x00EB ## $t8 = 000000EB -/* 02140 80AEA580 E7AA0084 */ swc1 $f10, 0x0084($sp) +/* 02140 80AEA580 E7AA0084 */ swc1 $f10, 0x0084($sp) /* 02144 80AEA584 966A0112 */ lhu $t2, 0x0112($s3) ## 00000112 /* 02148 80AEA588 241900F5 */ addiu $t9, $zero, 0x00F5 ## $t9 = 000000F5 /* 0214C 80AEA58C 3C014040 */ lui $at, 0x4040 ## $at = 40400000 /* 02150 80AEA590 314B4000 */ andi $t3, $t2, 0x4000 ## $t3 = 00000000 -/* 02154 80AEA594 1160000C */ beq $t3, $zero, .L80AEA5C8 +/* 02154 80AEA594 1160000C */ beq $t3, $zero, .L80AEA5C8 /* 02158 80AEA598 240A00FF */ addiu $t2, $zero, 0x00FF ## $t2 = 000000FF /* 0215C 80AEA59C 240CFFFF */ addiu $t4, $zero, 0xFFFF ## $t4 = FFFFFFFF -/* 02160 80AEA5A0 AFAC0018 */ sw $t4, 0x0018($sp) -/* 02164 80AEA5A4 8FA400CC */ lw $a0, 0x00CC($sp) +/* 02160 80AEA5A0 AFAC0018 */ sw $t4, 0x0018($sp) +/* 02164 80AEA5A4 8FA400CC */ lw $a0, 0x00CC($sp) /* 02168 80AEA5A8 02602825 */ or $a1, $s3, $zero ## $a1 = 00000000 /* 0216C 80AEA5AC 27A6007C */ addiu $a2, $sp, 0x007C ## $a2 = FFFFFFB4 /* 02170 80AEA5B0 24070064 */ addiu $a3, $zero, 0x0064 ## $a3 = 00000064 -/* 02174 80AEA5B4 AFA00010 */ sw $zero, 0x0010($sp) -/* 02178 80AEA5B8 0C00A935 */ jal func_8002A4D4 -/* 0217C 80AEA5BC AFA00014 */ sw $zero, 0x0014($sp) -/* 02180 80AEA5C0 1000000B */ beq $zero, $zero, .L80AEA5F0 -/* 02184 80AEA5C4 8FBF005C */ lw $ra, 0x005C($sp) +/* 02174 80AEA5B4 AFA00010 */ sw $zero, 0x0010($sp) +/* 02178 80AEA5B8 0C00A935 */ jal func_8002A4D4 +/* 0217C 80AEA5BC AFA00014 */ sw $zero, 0x0014($sp) +/* 02180 80AEA5C0 1000000B */ beq $zero, $zero, .L80AEA5F0 +/* 02184 80AEA5C4 8FBF005C */ lw $ra, 0x005C($sp) .L80AEA5C8: /* 02188 80AEA5C8 44818000 */ mtc1 $at, $f16 ## $f16 = 0.00 -/* 0218C 80AEA5CC AFAD0010 */ sw $t5, 0x0010($sp) -/* 02190 80AEA5D0 AFAE0014 */ sw $t6, 0x0014($sp) -/* 02194 80AEA5D4 AFAF0018 */ sw $t7, 0x0018($sp) -/* 02198 80AEA5D8 AFB8001C */ sw $t8, 0x001C($sp) -/* 0219C 80AEA5DC AFB90020 */ sw $t9, 0x0020($sp) -/* 021A0 80AEA5E0 AFAA0024 */ sw $t2, 0x0024($sp) -/* 021A4 80AEA5E4 0C00A850 */ jal func_8002A140 -/* 021A8 80AEA5E8 E7B00028 */ swc1 $f16, 0x0028($sp) +/* 0218C 80AEA5CC AFAD0010 */ sw $t5, 0x0010($sp) +/* 02190 80AEA5D0 AFAE0014 */ sw $t6, 0x0014($sp) +/* 02194 80AEA5D4 AFAF0018 */ sw $t7, 0x0018($sp) +/* 02198 80AEA5D8 AFB8001C */ sw $t8, 0x001C($sp) +/* 0219C 80AEA5DC AFB90020 */ sw $t9, 0x0020($sp) +/* 021A0 80AEA5E0 AFAA0024 */ sw $t2, 0x0024($sp) +/* 021A4 80AEA5E4 0C00A850 */ jal func_8002A140 +/* 021A8 80AEA5E8 E7B00028 */ swc1 $f16, 0x0028($sp) .L80AEA5EC: -/* 021AC 80AEA5EC 8FBF005C */ lw $ra, 0x005C($sp) +/* 021AC 80AEA5EC 8FBF005C */ lw $ra, 0x005C($sp) .L80AEA5F0: -/* 021B0 80AEA5F0 D7B40038 */ ldc1 $f20, 0x0038($sp) -/* 021B4 80AEA5F4 D7B60040 */ ldc1 $f22, 0x0040($sp) -/* 021B8 80AEA5F8 8FB00048 */ lw $s0, 0x0048($sp) -/* 021BC 80AEA5FC 8FB1004C */ lw $s1, 0x004C($sp) -/* 021C0 80AEA600 8FB20050 */ lw $s2, 0x0050($sp) -/* 021C4 80AEA604 8FB30054 */ lw $s3, 0x0054($sp) -/* 021C8 80AEA608 8FB40058 */ lw $s4, 0x0058($sp) -/* 021CC 80AEA60C 03E00008 */ jr $ra +/* 021B0 80AEA5F0 D7B40038 */ ldc1 $f20, 0x0038($sp) +/* 021B4 80AEA5F4 D7B60040 */ ldc1 $f22, 0x0040($sp) +/* 021B8 80AEA5F8 8FB00048 */ lw $s0, 0x0048($sp) +/* 021BC 80AEA5FC 8FB1004C */ lw $s1, 0x004C($sp) +/* 021C0 80AEA600 8FB20050 */ lw $s2, 0x0050($sp) +/* 021C4 80AEA604 8FB30054 */ lw $s3, 0x0054($sp) +/* 021C8 80AEA608 8FB40058 */ lw $s4, 0x0058($sp) +/* 021CC 80AEA60C 03E00008 */ jr $ra /* 021D0 80AEA610 27BD00C8 */ addiu $sp, $sp, 0x00C8 ## $sp = 00000000 /* 021D4 80AEA614 00000000 */ nop /* 021D8 80AEA618 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/EnRu1_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/EnRu1_Init.s index 38cce2b63e..87d2c6f68b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/EnRu1_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ru1/EnRu1_Init.s @@ -1,107 +1,107 @@ glabel EnRu1_Init /* 05500 80AF0110 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 05504 80AF0114 AFB10028 */ sw $s1, 0x0028($sp) -/* 05508 80AF0118 AFB00024 */ sw $s0, 0x0024($sp) +/* 05504 80AF0114 AFB10028 */ sw $s1, 0x0028($sp) +/* 05508 80AF0118 AFB00024 */ sw $s0, 0x0024($sp) /* 0550C 80AF011C 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 05510 80AF0120 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 -/* 05514 80AF0124 AFBF002C */ sw $ra, 0x002C($sp) +/* 05514 80AF0124 AFBF002C */ sw $ra, 0x002C($sp) /* 05518 80AF0128 3C068003 */ lui $a2, 0x8003 ## $a2 = 80030000 /* 0551C 80AF012C 24C6B5EC */ addiu $a2, $a2, 0xB5EC ## $a2 = 8002B5EC /* 05520 80AF0130 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 /* 05524 80AF0134 248400B4 */ addiu $a0, $a0, 0x00B4 ## $a0 = 000000B4 /* 05528 80AF0138 0C00AC78 */ jal ActorShape_Init - + /* 0552C 80AF013C 3C0741F0 */ lui $a3, 0x41F0 ## $a3 = 41F00000 /* 05530 80AF0140 3C060601 */ lui $a2, 0x0601 ## $a2 = 06010000 /* 05534 80AF0144 260E0190 */ addiu $t6, $s0, 0x0190 ## $t6 = 00000190 /* 05538 80AF0148 260F01F6 */ addiu $t7, $s0, 0x01F6 ## $t7 = 000001F6 /* 0553C 80AF014C 24180011 */ addiu $t8, $zero, 0x0011 ## $t8 = 00000011 -/* 05540 80AF0150 AFB80018 */ sw $t8, 0x0018($sp) -/* 05544 80AF0154 AFAF0014 */ sw $t7, 0x0014($sp) -/* 05548 80AF0158 AFAE0010 */ sw $t6, 0x0010($sp) +/* 05540 80AF0150 AFB80018 */ sw $t8, 0x0018($sp) +/* 05544 80AF0154 AFAF0014 */ sw $t7, 0x0014($sp) +/* 05548 80AF0158 AFAE0010 */ sw $t6, 0x0010($sp) /* 0554C 80AF015C 24C62700 */ addiu $a2, $a2, 0x2700 ## $a2 = 06012700 /* 05550 80AF0160 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 05554 80AF0164 2605014C */ addiu $a1, $s0, 0x014C ## $a1 = 0000014C -/* 05558 80AF0168 0C0291BE */ jal func_800A46F8 +/* 05558 80AF0168 0C0291BE */ jal SkelAnime_InitSV /* 0555C 80AF016C 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 /* 05560 80AF0170 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 05564 80AF0174 0C2BAB48 */ jal func_80AEAD20 +/* 05564 80AF0174 0C2BAB48 */ jal func_80AEAD20 /* 05568 80AF0178 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 0556C 80AF017C 0C2BAB7C */ jal func_80AEADF0 +/* 0556C 80AF017C 0C2BAB7C */ jal func_80AEADF0 /* 05570 80AF0180 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 05574 80AF0184 2C41000B */ sltiu $at, $v0, 0x000B -/* 05578 80AF0188 1020002E */ beq $at, $zero, .L80AF0244 -/* 0557C 80AF018C 0002C880 */ sll $t9, $v0, 2 +/* 05574 80AF0184 2C41000B */ sltiu $at, $v0, 0x000B +/* 05578 80AF0188 1020002E */ beq $at, $zero, .L80AF0244 +/* 0557C 80AF018C 0002C880 */ sll $t9, $v0, 2 /* 05580 80AF0190 3C0180AF */ lui $at, %hi(jtbl_80AF1C60) ## $at = 80AF0000 -/* 05584 80AF0194 00390821 */ addu $at, $at, $t9 -/* 05588 80AF0198 8C391C60 */ lw $t9, %lo(jtbl_80AF1C60)($at) -/* 0558C 80AF019C 03200008 */ jr $t9 +/* 05584 80AF0194 00390821 */ addu $at, $at, $t9 +/* 05588 80AF0198 8C391C60 */ lw $t9, %lo(jtbl_80AF1C60)($at) +/* 0558C 80AF019C 03200008 */ jr $t9 /* 05590 80AF01A0 00000000 */ nop glabel L80AF01A4 /* 05594 80AF01A4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 05598 80AF01A8 0C2BB368 */ jal func_80AECDA0 +/* 05598 80AF01A8 0C2BB368 */ jal func_80AECDA0 /* 0559C 80AF01AC 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 055A0 80AF01B0 1000002D */ beq $zero, $zero, .L80AF0268 -/* 055A4 80AF01B4 8FBF002C */ lw $ra, 0x002C($sp) +/* 055A0 80AF01B0 1000002D */ beq $zero, $zero, .L80AF0268 +/* 055A4 80AF01B4 8FBF002C */ lw $ra, 0x002C($sp) glabel L80AF01B8 /* 055A8 80AF01B8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 055AC 80AF01BC 0C2BACF7 */ jal func_80AEB3DC +/* 055AC 80AF01BC 0C2BACF7 */ jal func_80AEB3DC /* 055B0 80AF01C0 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 055B4 80AF01C4 10000028 */ beq $zero, $zero, .L80AF0268 -/* 055B8 80AF01C8 8FBF002C */ lw $ra, 0x002C($sp) +/* 055B4 80AF01C4 10000028 */ beq $zero, $zero, .L80AF0268 +/* 055B8 80AF01C8 8FBF002C */ lw $ra, 0x002C($sp) glabel L80AF01CC /* 055BC 80AF01CC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 055C0 80AF01D0 0C2BB0C8 */ jal func_80AEC320 +/* 055C0 80AF01D0 0C2BB0C8 */ jal func_80AEC320 /* 055C4 80AF01D4 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 055C8 80AF01D8 10000023 */ beq $zero, $zero, .L80AF0268 -/* 055CC 80AF01DC 8FBF002C */ lw $ra, 0x002C($sp) +/* 055C8 80AF01D8 10000023 */ beq $zero, $zero, .L80AF0268 +/* 055CC 80AF01DC 8FBF002C */ lw $ra, 0x002C($sp) glabel L80AF01E0 /* 055D0 80AF01E0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 055D4 80AF01E4 0C2BB513 */ jal func_80AED44C +/* 055D4 80AF01E4 0C2BB513 */ jal func_80AED44C /* 055D8 80AF01E8 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 055DC 80AF01EC 1000001E */ beq $zero, $zero, .L80AF0268 -/* 055E0 80AF01F0 8FBF002C */ lw $ra, 0x002C($sp) +/* 055DC 80AF01EC 1000001E */ beq $zero, $zero, .L80AF0268 +/* 055E0 80AF01F0 8FBF002C */ lw $ra, 0x002C($sp) glabel L80AF01F4 /* 055E4 80AF01F4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 055E8 80AF01F8 0C2BBF15 */ jal func_80AEFC54 +/* 055E8 80AF01F8 0C2BBF15 */ jal func_80AEFC54 /* 055EC 80AF01FC 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 055F0 80AF0200 10000019 */ beq $zero, $zero, .L80AF0268 -/* 055F4 80AF0204 8FBF002C */ lw $ra, 0x002C($sp) +/* 055F0 80AF0200 10000019 */ beq $zero, $zero, .L80AF0268 +/* 055F4 80AF0204 8FBF002C */ lw $ra, 0x002C($sp) glabel L80AF0208 /* 055F8 80AF0208 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 055FC 80AF020C 0C2BBF4E */ jal func_80AEFD38 +/* 055FC 80AF020C 0C2BBF4E */ jal func_80AEFD38 /* 05600 80AF0210 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 05604 80AF0214 10000014 */ beq $zero, $zero, .L80AF0268 -/* 05608 80AF0218 8FBF002C */ lw $ra, 0x002C($sp) +/* 05604 80AF0214 10000014 */ beq $zero, $zero, .L80AF0268 +/* 05608 80AF0218 8FBF002C */ lw $ra, 0x002C($sp) glabel L80AF021C /* 0560C 80AF021C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 05610 80AF0220 0C2BBFE5 */ jal func_80AEFF94 +/* 05610 80AF0220 0C2BBFE5 */ jal func_80AEFF94 /* 05614 80AF0224 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 05618 80AF0228 1000000F */ beq $zero, $zero, .L80AF0268 -/* 0561C 80AF022C 8FBF002C */ lw $ra, 0x002C($sp) +/* 05618 80AF0228 1000000F */ beq $zero, $zero, .L80AF0268 +/* 0561C 80AF022C 8FBF002C */ lw $ra, 0x002C($sp) glabel L80AF0230 /* 05620 80AF0230 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 05624 80AF0234 0C2BC014 */ jal func_80AF0050 +/* 05624 80AF0234 0C2BC014 */ jal func_80AF0050 /* 05628 80AF0238 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 0562C 80AF023C 1000000A */ beq $zero, $zero, .L80AF0268 -/* 05630 80AF0240 8FBF002C */ lw $ra, 0x002C($sp) +/* 0562C 80AF023C 1000000A */ beq $zero, $zero, .L80AF0268 +/* 05630 80AF0240 8FBF002C */ lw $ra, 0x002C($sp) glabel L80AF0244 .L80AF0244: /* 05634 80AF0244 0C00B55C */ jal Actor_Kill - + /* 05638 80AF0248 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0563C 80AF024C 0C2BAB7C */ jal func_80AEADF0 +/* 0563C 80AF024C 0C2BAB7C */ jal func_80AEADF0 /* 05640 80AF0250 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 05644 80AF0254 3C0480AF */ lui $a0, %hi(D_80AF1AFC) ## $a0 = 80AF0000 /* 05648 80AF0258 24841AFC */ addiu $a0, $a0, %lo(D_80AF1AFC) ## $a0 = 80AF1AFC /* 0564C 80AF025C 0C00084C */ jal osSyncPrintf - + /* 05650 80AF0260 00402825 */ or $a1, $v0, $zero ## $a1 = 00000000 -/* 05654 80AF0264 8FBF002C */ lw $ra, 0x002C($sp) +/* 05654 80AF0264 8FBF002C */ lw $ra, 0x002C($sp) .L80AF0268: -/* 05658 80AF0268 8FB00024 */ lw $s0, 0x0024($sp) -/* 0565C 80AF026C 8FB10028 */ lw $s1, 0x0028($sp) -/* 05660 80AF0270 03E00008 */ jr $ra +/* 05658 80AF0268 8FB00024 */ lw $s0, 0x0024($sp) +/* 0565C 80AF026C 8FB10028 */ lw $s1, 0x0028($sp) +/* 05660 80AF0270 03E00008 */ jr $ra /* 05664 80AF0274 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEB264.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEB264.s index 832c35d932..670bf8c532 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEB264.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEB264.s @@ -1,54 +1,54 @@ glabel func_80AEB264 -/* 00654 80AEB264 00057100 */ sll $t6, $a1, 4 -/* 00658 80AEB268 000E7F02 */ srl $t7, $t6, 28 -/* 0065C 80AEB26C 000FC080 */ sll $t8, $t7, 2 +/* 00654 80AEB264 00057100 */ sll $t6, $a1, 4 +/* 00658 80AEB268 000E7F02 */ srl $t7, $t6, 28 +/* 0065C 80AEB26C 000FC080 */ sll $t8, $t7, 2 /* 00660 80AEB270 3C198016 */ lui $t9, 0x8016 ## $t9 = 80160000 -/* 00664 80AEB274 0338C821 */ addu $t9, $t9, $t8 +/* 00664 80AEB274 0338C821 */ addu $t9, $t9, $t8 /* 00668 80AEB278 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 /* 0066C 80AEB27C 8F396FA8 */ lw $t9, 0x6FA8($t9) ## 80166FA8 /* 00670 80AEB280 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF /* 00674 80AEB284 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 00678 80AEB288 00A14024 */ and $t0, $a1, $at -/* 0067C 80AEB28C AFA40038 */ sw $a0, 0x0038($sp) +/* 00678 80AEB288 00A14024 */ and $t0, $a1, $at +/* 0067C 80AEB28C AFA40038 */ sw $a0, 0x0038($sp) /* 00680 80AEB290 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 00684 80AEB294 03282021 */ addu $a0, $t9, $t0 -/* 00688 80AEB298 AFBF0024 */ sw $ra, 0x0024($sp) -/* 0068C 80AEB29C 00812021 */ addu $a0, $a0, $at -/* 00690 80AEB2A0 AFA60040 */ sw $a2, 0x0040($sp) -/* 00694 80AEB2A4 AFA70044 */ sw $a3, 0x0044($sp) +/* 00684 80AEB294 03282021 */ addu $a0, $t9, $t0 +/* 00688 80AEB298 AFBF0024 */ sw $ra, 0x0024($sp) +/* 0068C 80AEB29C 00812021 */ addu $a0, $a0, $at +/* 00690 80AEB2A0 AFA60040 */ sw $a2, 0x0040($sp) +/* 00694 80AEB2A4 AFA70044 */ sw $a3, 0x0044($sp) /* 00698 80AEB2A8 0C028800 */ jal SkelAnime_GetFrameCount - -/* 0069C 80AEB2AC AFA4002C */ sw $a0, 0x002C($sp) -/* 006A0 80AEB2B0 8FA90048 */ lw $t1, 0x0048($sp) -/* 006A4 80AEB2B4 8FA40038 */ lw $a0, 0x0038($sp) -/* 006A8 80AEB2B8 8FA5002C */ lw $a1, 0x002C($sp) -/* 006AC 80AEB2BC 15200007 */ bne $t1, $zero, .L80AEB2DC + +/* 0069C 80AEB2AC AFA4002C */ sw $a0, 0x002C($sp) +/* 006A0 80AEB2B0 8FA90048 */ lw $t1, 0x0048($sp) +/* 006A4 80AEB2B4 8FA40038 */ lw $a0, 0x0038($sp) +/* 006A8 80AEB2B8 8FA5002C */ lw $a1, 0x002C($sp) +/* 006AC 80AEB2BC 15200007 */ bne $t1, $zero, .L80AEB2DC /* 006B0 80AEB2C0 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C /* 006B4 80AEB2C4 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 006B8 80AEB2C8 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 /* 006BC 80AEB2CC 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 /* 006C0 80AEB2D0 44816000 */ mtc1 $at, $f12 ## $f12 = 1.00 -/* 006C4 80AEB2D4 10000006 */ beq $zero, $zero, .L80AEB2F0 -/* 006C8 80AEB2D8 468020A0 */ cvt.s.w $f2, $f4 +/* 006C4 80AEB2D4 10000006 */ beq $zero, $zero, .L80AEB2F0 +/* 006C8 80AEB2D8 468020A0 */ cvt.s.w $f2, $f4 .L80AEB2DC: /* 006CC 80AEB2DC 44823000 */ mtc1 $v0, $f6 ## $f6 = 0.00 /* 006D0 80AEB2E0 3C01BF80 */ lui $at, 0xBF80 ## $at = BF800000 /* 006D4 80AEB2E4 44801000 */ mtc1 $zero, $f2 ## $f2 = 0.00 /* 006D8 80AEB2E8 44816000 */ mtc1 $at, $f12 ## $f12 = -1.00 -/* 006DC 80AEB2EC 46803020 */ cvt.s.w $f0, $f6 +/* 006DC 80AEB2EC 46803020 */ cvt.s.w $f0, $f6 .L80AEB2F0: -/* 006E0 80AEB2F0 93AA0043 */ lbu $t2, 0x0043($sp) -/* 006E4 80AEB2F4 C7A80044 */ lwc1 $f8, 0x0044($sp) -/* 006E8 80AEB2F8 44066000 */ mfc1 $a2, $f12 -/* 006EC 80AEB2FC 44070000 */ mfc1 $a3, $f0 -/* 006F0 80AEB300 E7A20010 */ swc1 $f2, 0x0010($sp) -/* 006F4 80AEB304 AFAA0014 */ sw $t2, 0x0014($sp) -/* 006F8 80AEB308 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 006FC 80AEB30C E7A80018 */ swc1 $f8, 0x0018($sp) -/* 00700 80AEB310 8FBF0024 */ lw $ra, 0x0024($sp) +/* 006E0 80AEB2F0 93AA0043 */ lbu $t2, 0x0043($sp) +/* 006E4 80AEB2F4 C7A80044 */ lwc1 $f8, 0x0044($sp) +/* 006E8 80AEB2F8 44066000 */ mfc1 $a2, $f12 +/* 006EC 80AEB2FC 44070000 */ mfc1 $a3, $f0 +/* 006F0 80AEB300 E7A20010 */ swc1 $f2, 0x0010($sp) +/* 006F4 80AEB304 AFAA0014 */ sw $t2, 0x0014($sp) +/* 006F8 80AEB308 0C029468 */ jal SkelAnime_ChangeAnim + +/* 006FC 80AEB30C E7A80018 */ swc1 $f8, 0x0018($sp) +/* 00700 80AEB310 8FBF0024 */ lw $ra, 0x0024($sp) /* 00704 80AEB314 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 -/* 00708 80AEB318 03E00008 */ jr $ra +/* 00708 80AEB318 03E00008 */ jr $ra /* 0070C 80AEB31C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEB364.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEB364.s index 6078fecc6e..c5f6d03838 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEB364.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEB364.s @@ -1,19 +1,19 @@ glabel func_80AEB364 /* 00754 80AEB364 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00758 80AEB368 AFBF0014 */ sw $ra, 0x0014($sp) -/* 0075C 80AEB36C AFA40018 */ sw $a0, 0x0018($sp) -/* 00760 80AEB370 AFA5001C */ sw $a1, 0x001C($sp) +/* 00758 80AEB368 AFBF0014 */ sw $ra, 0x0014($sp) +/* 0075C 80AEB36C AFA40018 */ sw $a0, 0x0018($sp) +/* 00760 80AEB370 AFA5001C */ sw $a1, 0x001C($sp) /* 00764 80AEB374 908E0181 */ lbu $t6, 0x0181($a0) ## 00000181 /* 00768 80AEB378 00802825 */ or $a1, $a0, $zero ## $a1 = 00000000 /* 0076C 80AEB37C 24A6014C */ addiu $a2, $a1, 0x014C ## $a2 = 0000014C /* 00770 80AEB380 35CF0001 */ ori $t7, $t6, 0x0001 ## $t7 = 00000001 /* 00774 80AEB384 A08F0181 */ sb $t7, 0x0181($a0) ## 00000181 -/* 00778 80AEB388 8FA4001C */ lw $a0, 0x001C($sp) -/* 0077C 80AEB38C 0C028D88 */ jal func_800A3620 +/* 00778 80AEB388 8FA4001C */ lw $a0, 0x001C($sp) +/* 0077C 80AEB38C 0C028D88 */ jal SkelAnime_LoadAnimationType5 /* 00780 80AEB390 3C073F80 */ lui $a3, 0x3F80 ## $a3 = 3F800000 -/* 00784 80AEB394 8FBF0014 */ lw $ra, 0x0014($sp) +/* 00784 80AEB394 8FBF0014 */ lw $ra, 0x0014($sp) /* 00788 80AEB398 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 0078C 80AEB39C 03E00008 */ jr $ra +/* 0078C 80AEB39C 03E00008 */ jr $ra /* 00790 80AEB3A0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEB6E0.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEB6E0.s index 6730b2ae8f..76399e7825 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEB6E0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEB6E0.s @@ -1,26 +1,26 @@ glabel func_80AEB6E0 /* 00AD0 80AEB6E0 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00AD4 80AEB6E4 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00AD8 80AEB6E8 AFA40018 */ sw $a0, 0x0018($sp) -/* 00ADC 80AEB6EC AFA5001C */ sw $a1, 0x001C($sp) +/* 00AD4 80AEB6E4 AFBF0014 */ sw $ra, 0x0014($sp) +/* 00AD8 80AEB6E8 AFA40018 */ sw $a0, 0x0018($sp) +/* 00ADC 80AEB6EC AFA5001C */ sw $a1, 0x001C($sp) /* 00AE0 80AEB6F0 8C98016C */ lw $t8, 0x016C($a0) ## 0000016C /* 00AE4 80AEB6F4 848F018C */ lh $t7, 0x018C($a0) ## 0000018C /* 00AE8 80AEB6F8 2486014C */ addiu $a2, $a0, 0x014C ## $a2 = 0000014C /* 00AEC 80AEB6FC 87190002 */ lh $t9, 0x0002($t8) ## 00000002 -/* 00AF0 80AEB700 01F9082A */ slt $at, $t7, $t9 -/* 00AF4 80AEB704 50200009 */ beql $at, $zero, .L80AEB72C -/* 00AF8 80AEB708 8FBF0014 */ lw $ra, 0x0014($sp) +/* 00AF0 80AEB700 01F9082A */ slt $at, $t7, $t9 +/* 00AF4 80AEB704 50200009 */ beql $at, $zero, .L80AEB72C +/* 00AF8 80AEB708 8FBF0014 */ lw $ra, 0x0014($sp) /* 00AFC 80AEB70C 90C80035 */ lbu $t0, 0x0035($a2) ## 00000181 /* 00B00 80AEB710 3C073F80 */ lui $a3, 0x3F80 ## $a3 = 3F800000 /* 00B04 80AEB714 35090003 */ ori $t1, $t0, 0x0003 ## $t1 = 00000003 /* 00B08 80AEB718 A0C90035 */ sb $t1, 0x0035($a2) ## 00000181 -/* 00B0C 80AEB71C 8FA50018 */ lw $a1, 0x0018($sp) -/* 00B10 80AEB720 0C028D88 */ jal func_800A3620 -/* 00B14 80AEB724 8FA4001C */ lw $a0, 0x001C($sp) -/* 00B18 80AEB728 8FBF0014 */ lw $ra, 0x0014($sp) +/* 00B0C 80AEB71C 8FA50018 */ lw $a1, 0x0018($sp) +/* 00B10 80AEB720 0C028D88 */ jal SkelAnime_LoadAnimationType5 +/* 00B14 80AEB724 8FA4001C */ lw $a0, 0x001C($sp) +/* 00B18 80AEB728 8FBF0014 */ lw $ra, 0x0014($sp) .L80AEB72C: /* 00B1C 80AEB72C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00B20 80AEB730 03E00008 */ jr $ra +/* 00B20 80AEB730 03E00008 */ jr $ra /* 00B24 80AEB734 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEB738.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEB738.s index 54bf102475..cbc385747e 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEB738.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEB738.s @@ -1,8 +1,8 @@ glabel func_80AEB738 /* 00B28 80AEB738 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 00B2C 80AEB73C AFBF001C */ sw $ra, 0x001C($sp) -/* 00B30 80AEB740 AFB00018 */ sw $s0, 0x0018($sp) -/* 00B34 80AEB744 AFA50024 */ sw $a1, 0x0024($sp) +/* 00B2C 80AEB73C AFBF001C */ sw $ra, 0x001C($sp) +/* 00B30 80AEB740 AFB00018 */ sw $s0, 0x0018($sp) +/* 00B34 80AEB744 AFA50024 */ sw $a1, 0x0024($sp) /* 00B38 80AEB748 8C8E016C */ lw $t6, 0x016C($a0) ## 0000016C /* 00B3C 80AEB74C 8C99016C */ lw $t9, 0x016C($a0) ## 0000016C /* 00B40 80AEB750 8C8B016C */ lw $t3, 0x016C($a0) ## 0000016C @@ -22,21 +22,21 @@ glabel func_80AEB738 /* 00B78 80AEB788 97290004 */ lhu $t1, 0x0004($t9) ## 00000004 /* 00B7C 80AEB78C A4890188 */ sh $t1, 0x0188($a0) ## 00000188 /* 00B80 80AEB790 856C0002 */ lh $t4, 0x0002($t3) ## 00000002 -/* 00B84 80AEB794 014C082A */ slt $at, $t2, $t4 -/* 00B88 80AEB798 50200009 */ beql $at, $zero, .L80AEB7C0 -/* 00B8C 80AEB79C 8FBF001C */ lw $ra, 0x001C($sp) +/* 00B84 80AEB794 014C082A */ slt $at, $t2, $t4 +/* 00B88 80AEB798 50200009 */ beql $at, $zero, .L80AEB7C0 +/* 00B8C 80AEB79C 8FBF001C */ lw $ra, 0x001C($sp) /* 00B90 80AEB7A0 90CD0035 */ lbu $t5, 0x0035($a2) ## 00000181 /* 00B94 80AEB7A4 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 00B98 80AEB7A8 3C073F80 */ lui $a3, 0x3F80 ## $a3 = 3F800000 /* 00B9C 80AEB7AC 35AE0003 */ ori $t6, $t5, 0x0003 ## $t6 = 00000003 /* 00BA0 80AEB7B0 A0CE0035 */ sb $t6, 0x0035($a2) ## 00000181 -/* 00BA4 80AEB7B4 0C028D88 */ jal func_800A3620 -/* 00BA8 80AEB7B8 8FA40024 */ lw $a0, 0x0024($sp) -/* 00BAC 80AEB7BC 8FBF001C */ lw $ra, 0x001C($sp) +/* 00BA4 80AEB7B4 0C028D88 */ jal SkelAnime_LoadAnimationType5 +/* 00BA8 80AEB7B8 8FA40024 */ lw $a0, 0x0024($sp) +/* 00BAC 80AEB7BC 8FBF001C */ lw $ra, 0x001C($sp) .L80AEB7C0: -/* 00BB0 80AEB7C0 8FB00018 */ lw $s0, 0x0018($sp) +/* 00BB0 80AEB7C0 8FB00018 */ lw $s0, 0x0018($sp) /* 00BB4 80AEB7C4 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 00BB8 80AEB7C8 03E00008 */ jr $ra +/* 00BB8 80AEB7C8 03E00008 */ jr $ra /* 00BBC 80AEB7CC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEBCB8.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEBCB8.s index ffe26e228a..2a4388e3da 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEBCB8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEBCB8.s @@ -1,31 +1,31 @@ glabel func_80AEBCB8 /* 010A8 80AEBCB8 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 010AC 80AEBCBC AFBF0024 */ sw $ra, 0x0024($sp) -/* 010B0 80AEBCC0 10A00012 */ beq $a1, $zero, .L80AEBD0C -/* 010B4 80AEBCC4 AFA40028 */ sw $a0, 0x0028($sp) +/* 010AC 80AEBCBC AFBF0024 */ sw $ra, 0x0024($sp) +/* 010B0 80AEBCC0 10A00012 */ beq $a1, $zero, .L80AEBD0C +/* 010B4 80AEBCC4 AFA40028 */ sw $a0, 0x0028($sp) /* 010B8 80AEBCC8 3C040601 */ lui $a0, 0x0601 ## $a0 = 06010000 /* 010BC 80AEBCCC 0C028800 */ jal SkelAnime_GetFrameCount - + /* 010C0 80AEBCD0 24842E94 */ addiu $a0, $a0, 0x2E94 ## $a0 = 06012E94 /* 010C4 80AEBCD4 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 010C8 80AEBCD8 3C01C100 */ lui $at, 0xC100 ## $at = C1000000 /* 010CC 80AEBCDC 44814000 */ mtc1 $at, $f8 ## $f8 = -8.00 -/* 010D0 80AEBCE0 468021A0 */ cvt.s.w $f6, $f4 -/* 010D4 80AEBCE4 8FA40028 */ lw $a0, 0x0028($sp) +/* 010D0 80AEBCE0 468021A0 */ cvt.s.w $f6, $f4 +/* 010D4 80AEBCE4 8FA40028 */ lw $a0, 0x0028($sp) /* 010D8 80AEBCE8 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 /* 010DC 80AEBCEC 24A52E94 */ addiu $a1, $a1, 0x2E94 ## $a1 = 06012E94 /* 010E0 80AEBCF0 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 010E4 80AEBCF4 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 010E8 80AEBCF8 E7A60010 */ swc1 $f6, 0x0010($sp) -/* 010EC 80AEBCFC AFA00014 */ sw $zero, 0x0014($sp) -/* 010F0 80AEBD00 E7A80018 */ swc1 $f8, 0x0018($sp) -/* 010F4 80AEBD04 0C029468 */ jal SkelAnime_ChangeAnimation - +/* 010E8 80AEBCF8 E7A60010 */ swc1 $f6, 0x0010($sp) +/* 010EC 80AEBCFC AFA00014 */ sw $zero, 0x0014($sp) +/* 010F0 80AEBD00 E7A80018 */ swc1 $f8, 0x0018($sp) +/* 010F4 80AEBD04 0C029468 */ jal SkelAnime_ChangeAnim + /* 010F8 80AEBD08 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C .L80AEBD0C: -/* 010FC 80AEBD0C 8FBF0024 */ lw $ra, 0x0024($sp) +/* 010FC 80AEBD0C 8FBF0024 */ lw $ra, 0x0024($sp) /* 01100 80AEBD10 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 01104 80AEBD14 03E00008 */ jr $ra +/* 01104 80AEBD14 03E00008 */ jr $ra /* 01108 80AEBD18 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEBD94.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEBD94.s index 8459cdf864..2f61e12870 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEBD94.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEBD94.s @@ -1,48 +1,48 @@ glabel func_80AEBD94 /* 01184 80AEBD94 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 -/* 01188 80AEBD98 AFB00028 */ sw $s0, 0x0028($sp) +/* 01188 80AEBD98 AFB00028 */ sw $s0, 0x0028($sp) /* 0118C 80AEBD9C 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 01190 80AEBDA0 AFBF002C */ sw $ra, 0x002C($sp) -/* 01194 80AEBDA4 AFA50044 */ sw $a1, 0x0044($sp) +/* 01190 80AEBDA0 AFBF002C */ sw $ra, 0x002C($sp) +/* 01194 80AEBDA4 AFA50044 */ sw $a1, 0x0044($sp) /* 01198 80AEBDA8 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 0119C 80AEBDAC 0C2BAD20 */ jal func_80AEB480 +/* 0119C 80AEBDAC 0C2BAD20 */ jal func_80AEB480 /* 011A0 80AEBDB0 24050003 */ addiu $a1, $zero, 0x0003 ## $a1 = 00000003 -/* 011A4 80AEBDB4 1040001C */ beq $v0, $zero, .L80AEBE28 +/* 011A4 80AEBDB4 1040001C */ beq $v0, $zero, .L80AEBE28 /* 011A8 80AEBDB8 3C040601 */ lui $a0, 0x0601 ## $a0 = 06010000 /* 011AC 80AEBDBC 0C028800 */ jal SkelAnime_GetFrameCount - + /* 011B0 80AEBDC0 24849060 */ addiu $a0, $a0, 0x9060 ## $a0 = 06009060 /* 011B4 80AEBDC4 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 011B8 80AEBDC8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 011BC 80AEBDCC 8FA50044 */ lw $a1, 0x0044($sp) -/* 011C0 80AEBDD0 468021A0 */ cvt.s.w $f6, $f4 -/* 011C4 80AEBDD4 0C2BAE4D */ jal func_80AEB934 -/* 011C8 80AEBDD8 E7A60034 */ swc1 $f6, 0x0034($sp) +/* 011BC 80AEBDCC 8FA50044 */ lw $a1, 0x0044($sp) +/* 011C0 80AEBDD0 468021A0 */ cvt.s.w $f6, $f4 +/* 011C4 80AEBDD4 0C2BAE4D */ jal func_80AEB934 +/* 011C8 80AEBDD8 E7A60034 */ swc1 $f6, 0x0034($sp) /* 011CC 80AEBDDC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 011D0 80AEBDE0 0C2BADCE */ jal func_80AEB738 -/* 011D4 80AEBDE4 8FA50044 */ lw $a1, 0x0044($sp) +/* 011D0 80AEBDE0 0C2BADCE */ jal func_80AEB738 +/* 011D4 80AEBDE4 8FA50044 */ lw $a1, 0x0044($sp) /* 011D8 80AEBDE8 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 011DC 80AEBDEC C7A80034 */ lwc1 $f8, 0x0034($sp) +/* 011DC 80AEBDEC C7A80034 */ lwc1 $f8, 0x0034($sp) /* 011E0 80AEBDF0 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 /* 011E4 80AEBDF4 240E0002 */ addiu $t6, $zero, 0x0002 ## $t6 = 00000002 -/* 011E8 80AEBDF8 44070000 */ mfc1 $a3, $f0 -/* 011EC 80AEBDFC AFAE0014 */ sw $t6, 0x0014($sp) +/* 011E8 80AEBDF8 44070000 */ mfc1 $a3, $f0 +/* 011EC 80AEBDFC AFAE0014 */ sw $t6, 0x0014($sp) /* 011F0 80AEBE00 24A59060 */ addiu $a1, $a1, 0x9060 ## $a1 = 06009060 /* 011F4 80AEBE04 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C /* 011F8 80AEBE08 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 011FC 80AEBE0C E7A80010 */ swc1 $f8, 0x0010($sp) -/* 01200 80AEBE10 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 01204 80AEBE14 E7A00018 */ swc1 $f0, 0x0018($sp) +/* 011FC 80AEBE0C E7A80010 */ swc1 $f8, 0x0010($sp) +/* 01200 80AEBE10 0C029468 */ jal SkelAnime_ChangeAnim + +/* 01204 80AEBE14 E7A00018 */ swc1 $f0, 0x0018($sp) /* 01208 80AEBE18 240F0002 */ addiu $t7, $zero, 0x0002 ## $t7 = 00000002 /* 0120C 80AEBE1C 24180001 */ addiu $t8, $zero, 0x0001 ## $t8 = 00000001 /* 01210 80AEBE20 AE0F0264 */ sw $t7, 0x0264($s0) ## 00000264 /* 01214 80AEBE24 AE180268 */ sw $t8, 0x0268($s0) ## 00000268 .L80AEBE28: -/* 01218 80AEBE28 8FBF002C */ lw $ra, 0x002C($sp) -/* 0121C 80AEBE2C 8FB00028 */ lw $s0, 0x0028($sp) +/* 01218 80AEBE28 8FBF002C */ lw $ra, 0x002C($sp) +/* 0121C 80AEBE2C 8FB00028 */ lw $s0, 0x0028($sp) /* 01220 80AEBE30 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 -/* 01224 80AEBE34 03E00008 */ jr $ra +/* 01224 80AEBE34 03E00008 */ jr $ra /* 01228 80AEBE38 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEBE3C.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEBE3C.s index af6222c834..4f0acd899a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEBE3C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEBE3C.s @@ -1,42 +1,42 @@ glabel func_80AEBE3C /* 0122C 80AEBE3C 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 01230 80AEBE40 AFBF0024 */ sw $ra, 0x0024($sp) -/* 01234 80AEBE44 10C0001A */ beq $a2, $zero, .L80AEBEB0 -/* 01238 80AEBE48 AFA40038 */ sw $a0, 0x0038($sp) +/* 01230 80AEBE40 AFBF0024 */ sw $ra, 0x0024($sp) +/* 01234 80AEBE44 10C0001A */ beq $a2, $zero, .L80AEBEB0 +/* 01238 80AEBE48 AFA40038 */ sw $a0, 0x0038($sp) /* 0123C 80AEBE4C 3C040601 */ lui $a0, 0x0601 ## $a0 = 06010000 /* 01240 80AEBE50 0C028800 */ jal SkelAnime_GetFrameCount - + /* 01244 80AEBE54 24843A64 */ addiu $a0, $a0, 0x3A64 ## $a0 = 06013A64 /* 01248 80AEBE58 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 -/* 0124C 80AEBE5C 8FA40038 */ lw $a0, 0x0038($sp) -/* 01250 80AEBE60 468021A0 */ cvt.s.w $f6, $f4 -/* 01254 80AEBE64 0C2BADF4 */ jal func_80AEB7D0 -/* 01258 80AEBE68 E7A6002C */ swc1 $f6, 0x002C($sp) +/* 0124C 80AEBE5C 8FA40038 */ lw $a0, 0x0038($sp) +/* 01250 80AEBE60 468021A0 */ cvt.s.w $f6, $f4 +/* 01254 80AEBE64 0C2BADF4 */ jal func_80AEB7D0 +/* 01258 80AEBE68 E7A6002C */ swc1 $f6, 0x002C($sp) /* 0125C 80AEBE6C 3C01C100 */ lui $at, 0xC100 ## $at = C1000000 /* 01260 80AEBE70 44815000 */ mtc1 $at, $f10 ## $f10 = -8.00 -/* 01264 80AEBE74 8FA40038 */ lw $a0, 0x0038($sp) -/* 01268 80AEBE78 C7A8002C */ lwc1 $f8, 0x002C($sp) +/* 01264 80AEBE74 8FA40038 */ lw $a0, 0x0038($sp) +/* 01268 80AEBE78 C7A8002C */ lwc1 $f8, 0x002C($sp) /* 0126C 80AEBE7C 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 /* 01270 80AEBE80 24A53A64 */ addiu $a1, $a1, 0x3A64 ## $a1 = 06013A64 /* 01274 80AEBE84 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 01278 80AEBE88 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 0127C 80AEBE8C AFA00014 */ sw $zero, 0x0014($sp) +/* 0127C 80AEBE8C AFA00014 */ sw $zero, 0x0014($sp) /* 01280 80AEBE90 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 01284 80AEBE94 E7AA0018 */ swc1 $f10, 0x0018($sp) -/* 01288 80AEBE98 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 0128C 80AEBE9C E7A80010 */ swc1 $f8, 0x0010($sp) -/* 01290 80AEBEA0 8FAF0038 */ lw $t7, 0x0038($sp) +/* 01284 80AEBE94 E7AA0018 */ swc1 $f10, 0x0018($sp) +/* 01288 80AEBE98 0C029468 */ jal SkelAnime_ChangeAnim + +/* 0128C 80AEBE9C E7A80010 */ swc1 $f8, 0x0010($sp) +/* 01290 80AEBEA0 8FAF0038 */ lw $t7, 0x0038($sp) /* 01294 80AEBEA4 240E0003 */ addiu $t6, $zero, 0x0003 ## $t6 = 00000003 -/* 01298 80AEBEA8 10000003 */ beq $zero, $zero, .L80AEBEB8 +/* 01298 80AEBEA8 10000003 */ beq $zero, $zero, .L80AEBEB8 /* 0129C 80AEBEAC ADEE0264 */ sw $t6, 0x0264($t7) ## 00000264 .L80AEBEB0: -/* 012A0 80AEBEB0 0C2BAE55 */ jal func_80AEB954 -/* 012A4 80AEBEB4 8FA40038 */ lw $a0, 0x0038($sp) +/* 012A0 80AEBEB0 0C2BAE55 */ jal func_80AEB954 +/* 012A4 80AEBEB4 8FA40038 */ lw $a0, 0x0038($sp) .L80AEBEB8: -/* 012A8 80AEBEB8 8FBF0024 */ lw $ra, 0x0024($sp) +/* 012A8 80AEBEB8 8FBF0024 */ lw $ra, 0x0024($sp) /* 012AC 80AEBEBC 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 -/* 012B0 80AEBEC0 03E00008 */ jr $ra +/* 012B0 80AEBEC0 03E00008 */ jr $ra /* 012B4 80AEBEC4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEBEC8.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEBEC8.s index 37e7013e9f..42c7cd9030 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEBEC8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEBEC8.s @@ -1,44 +1,44 @@ glabel func_80AEBEC8 /* 012B8 80AEBEC8 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 012BC 80AEBECC AFA40038 */ sw $a0, 0x0038($sp) -/* 012C0 80AEBED0 AFBF0024 */ sw $ra, 0x0024($sp) -/* 012C4 80AEBED4 AFA5003C */ sw $a1, 0x003C($sp) +/* 012BC 80AEBECC AFA40038 */ sw $a0, 0x0038($sp) +/* 012C0 80AEBED0 AFBF0024 */ sw $ra, 0x0024($sp) +/* 012C4 80AEBED4 AFA5003C */ sw $a1, 0x003C($sp) /* 012C8 80AEBED8 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 012CC 80AEBEDC 0C2BAD16 */ jal func_80AEB458 +/* 012CC 80AEBEDC 0C2BAD16 */ jal func_80AEB458 /* 012D0 80AEBEE0 24050006 */ addiu $a1, $zero, 0x0006 ## $a1 = 00000006 -/* 012D4 80AEBEE4 1040001A */ beq $v0, $zero, .L80AEBF50 +/* 012D4 80AEBEE4 1040001A */ beq $v0, $zero, .L80AEBF50 /* 012D8 80AEBEE8 3C040601 */ lui $a0, 0x0601 ## $a0 = 06010000 /* 012DC 80AEBEEC 0C028800 */ jal SkelAnime_GetFrameCount - + /* 012E0 80AEBEF0 24848AA8 */ addiu $a0, $a0, 0x8AA8 ## $a0 = 06008AA8 /* 012E4 80AEBEF4 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 -/* 012E8 80AEBEF8 8FA40038 */ lw $a0, 0x0038($sp) -/* 012EC 80AEBEFC 8FA5003C */ lw $a1, 0x003C($sp) -/* 012F0 80AEBF00 468021A0 */ cvt.s.w $f6, $f4 -/* 012F4 80AEBF04 0C2BADCE */ jal func_80AEB738 -/* 012F8 80AEBF08 E7A6002C */ swc1 $f6, 0x002C($sp) +/* 012E8 80AEBEF8 8FA40038 */ lw $a0, 0x0038($sp) +/* 012EC 80AEBEFC 8FA5003C */ lw $a1, 0x003C($sp) +/* 012F0 80AEBF00 468021A0 */ cvt.s.w $f6, $f4 +/* 012F4 80AEBF04 0C2BADCE */ jal func_80AEB738 +/* 012F8 80AEBF08 E7A6002C */ swc1 $f6, 0x002C($sp) /* 012FC 80AEBF0C 3C01C100 */ lui $at, 0xC100 ## $at = C1000000 /* 01300 80AEBF10 44815000 */ mtc1 $at, $f10 ## $f10 = -8.00 -/* 01304 80AEBF14 8FA40038 */ lw $a0, 0x0038($sp) -/* 01308 80AEBF18 C7A8002C */ lwc1 $f8, 0x002C($sp) +/* 01304 80AEBF14 8FA40038 */ lw $a0, 0x0038($sp) +/* 01308 80AEBF18 C7A8002C */ lwc1 $f8, 0x002C($sp) /* 0130C 80AEBF1C 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 /* 01310 80AEBF20 240E0002 */ addiu $t6, $zero, 0x0002 ## $t6 = 00000002 -/* 01314 80AEBF24 AFAE0014 */ sw $t6, 0x0014($sp) +/* 01314 80AEBF24 AFAE0014 */ sw $t6, 0x0014($sp) /* 01318 80AEBF28 24A58AA8 */ addiu $a1, $a1, 0x8AA8 ## $a1 = 06008AA8 /* 0131C 80AEBF2C 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 01320 80AEBF30 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 /* 01324 80AEBF34 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 01328 80AEBF38 E7AA0018 */ swc1 $f10, 0x0018($sp) -/* 0132C 80AEBF3C 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 01330 80AEBF40 E7A80010 */ swc1 $f8, 0x0010($sp) -/* 01334 80AEBF44 8FB80038 */ lw $t8, 0x0038($sp) +/* 01328 80AEBF38 E7AA0018 */ swc1 $f10, 0x0018($sp) +/* 0132C 80AEBF3C 0C029468 */ jal SkelAnime_ChangeAnim + +/* 01330 80AEBF40 E7A80010 */ swc1 $f8, 0x0010($sp) +/* 01334 80AEBF44 8FB80038 */ lw $t8, 0x0038($sp) /* 01338 80AEBF48 240F0004 */ addiu $t7, $zero, 0x0004 ## $t7 = 00000004 /* 0133C 80AEBF4C AF0F0264 */ sw $t7, 0x0264($t8) ## 00000264 .L80AEBF50: -/* 01340 80AEBF50 8FBF0024 */ lw $ra, 0x0024($sp) +/* 01340 80AEBF50 8FBF0024 */ lw $ra, 0x0024($sp) /* 01344 80AEBF54 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 -/* 01348 80AEBF58 03E00008 */ jr $ra +/* 01348 80AEBF58 03E00008 */ jr $ra /* 0134C 80AEBF5C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEBFD8.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEBFD8.s index 8f05ce1b23..6b2515686b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEBFD8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEBFD8.s @@ -1,44 +1,44 @@ glabel func_80AEBFD8 /* 013C8 80AEBFD8 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 013CC 80AEBFDC AFBF0024 */ sw $ra, 0x0024($sp) -/* 013D0 80AEBFE0 AFA40028 */ sw $a0, 0x0028($sp) -/* 013D4 80AEBFE4 AFA5002C */ sw $a1, 0x002C($sp) -/* 013D8 80AEBFE8 0C2BAD0E */ jal func_80AEB438 +/* 013CC 80AEBFDC AFBF0024 */ sw $ra, 0x0024($sp) +/* 013D0 80AEBFE0 AFA40028 */ sw $a0, 0x0028($sp) +/* 013D4 80AEBFE4 AFA5002C */ sw $a1, 0x002C($sp) +/* 013D8 80AEBFE8 0C2BAD0E */ jal func_80AEB438 /* 013DC 80AEBFEC 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 013E0 80AEBFF0 1040001B */ beq $v0, $zero, .L80AEC060 -/* 013E4 80AEBFF4 8FAE002C */ lw $t6, 0x002C($sp) +/* 013E0 80AEBFF0 1040001B */ beq $v0, $zero, .L80AEC060 +/* 013E4 80AEBFF4 8FAE002C */ lw $t6, 0x002C($sp) /* 013E8 80AEBFF8 94440004 */ lhu $a0, 0x0004($v0) ## 00000004 /* 013EC 80AEBFFC 95C31D74 */ lhu $v1, 0x1D74($t6) ## 00001D74 /* 013F0 80AEC000 248FFFFE */ addiu $t7, $a0, 0xFFFE ## $t7 = FFFFFFFE -/* 013F4 80AEC004 006F082A */ slt $at, $v1, $t7 -/* 013F8 80AEC008 14200015 */ bne $at, $zero, .L80AEC060 +/* 013F4 80AEC004 006F082A */ slt $at, $v1, $t7 +/* 013F8 80AEC008 14200015 */ bne $at, $zero, .L80AEC060 /* 013FC 80AEC00C 3C040601 */ lui $a0, 0x0601 ## $a0 = 06010000 /* 01400 80AEC010 0C028800 */ jal SkelAnime_GetFrameCount - + /* 01404 80AEC014 24848100 */ addiu $a0, $a0, 0x8100 ## $a0 = 06008100 /* 01408 80AEC018 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 0140C 80AEC01C 3C01C100 */ lui $at, 0xC100 ## $at = C1000000 /* 01410 80AEC020 44814000 */ mtc1 $at, $f8 ## $f8 = -8.00 -/* 01414 80AEC024 468021A0 */ cvt.s.w $f6, $f4 -/* 01418 80AEC028 8FA40028 */ lw $a0, 0x0028($sp) +/* 01414 80AEC024 468021A0 */ cvt.s.w $f6, $f4 +/* 01418 80AEC028 8FA40028 */ lw $a0, 0x0028($sp) /* 0141C 80AEC02C 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 /* 01420 80AEC030 24180002 */ addiu $t8, $zero, 0x0002 ## $t8 = 00000002 -/* 01424 80AEC034 AFB80014 */ sw $t8, 0x0014($sp) +/* 01424 80AEC034 AFB80014 */ sw $t8, 0x0014($sp) /* 01428 80AEC038 24A58100 */ addiu $a1, $a1, 0x8100 ## $a1 = 06008100 -/* 0142C 80AEC03C E7A60010 */ swc1 $f6, 0x0010($sp) +/* 0142C 80AEC03C E7A60010 */ swc1 $f6, 0x0010($sp) /* 01430 80AEC040 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 01434 80AEC044 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 01438 80AEC048 E7A80018 */ swc1 $f8, 0x0018($sp) -/* 0143C 80AEC04C 0C029468 */ jal SkelAnime_ChangeAnimation - +/* 01438 80AEC048 E7A80018 */ swc1 $f8, 0x0018($sp) +/* 0143C 80AEC04C 0C029468 */ jal SkelAnime_ChangeAnim + /* 01440 80AEC050 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 01444 80AEC054 8FA80028 */ lw $t0, 0x0028($sp) +/* 01444 80AEC054 8FA80028 */ lw $t0, 0x0028($sp) /* 01448 80AEC058 24190006 */ addiu $t9, $zero, 0x0006 ## $t9 = 00000006 /* 0144C 80AEC05C AD190264 */ sw $t9, 0x0264($t0) ## 00000264 .L80AEC060: -/* 01450 80AEC060 8FBF0024 */ lw $ra, 0x0024($sp) +/* 01450 80AEC060 8FBF0024 */ lw $ra, 0x0024($sp) /* 01454 80AEC064 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 01458 80AEC068 03E00008 */ jr $ra +/* 01458 80AEC068 03E00008 */ jr $ra /* 0145C 80AEC06C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEC6E4.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEC6E4.s index b5ac949aa9..4132687239 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEC6E4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEC6E4.s @@ -1,46 +1,46 @@ glabel func_80AEC6E4 /* 01AD4 80AEC6E4 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 01AD8 80AEC6E8 AFA40028 */ sw $a0, 0x0028($sp) -/* 01ADC 80AEC6EC AFBF0024 */ sw $ra, 0x0024($sp) +/* 01AD8 80AEC6E8 AFA40028 */ sw $a0, 0x0028($sp) +/* 01ADC 80AEC6EC AFBF0024 */ sw $ra, 0x0024($sp) /* 01AE0 80AEC6F0 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 /* 01AE4 80AEC6F4 24050004 */ addiu $a1, $zero, 0x0004 ## $a1 = 00000004 -/* 01AE8 80AEC6F8 0C2BABE8 */ jal func_80AEAFA0 +/* 01AE8 80AEC6F8 0C2BABE8 */ jal func_80AEAFA0 /* 01AEC 80AEC6FC 24060003 */ addiu $a2, $zero, 0x0003 ## $a2 = 00000003 -/* 01AF0 80AEC700 1040001B */ beq $v0, $zero, .L80AEC770 -/* 01AF4 80AEC704 8FAE0028 */ lw $t6, 0x0028($sp) +/* 01AF0 80AEC700 1040001B */ beq $v0, $zero, .L80AEC770 +/* 01AF4 80AEC704 8FAE0028 */ lw $t6, 0x0028($sp) /* 01AF8 80AEC708 8DCF0280 */ lw $t7, 0x0280($t6) ## 00000280 /* 01AFC 80AEC70C 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 -/* 01B00 80AEC710 55E00018 */ bnel $t7, $zero, .L80AEC774 -/* 01B04 80AEC714 8FBF0024 */ lw $ra, 0x0024($sp) +/* 01B00 80AEC710 55E00018 */ bnel $t7, $zero, .L80AEC774 +/* 01B04 80AEC714 8FBF0024 */ lw $ra, 0x0024($sp) /* 01B08 80AEC718 0C028800 */ jal SkelAnime_GetFrameCount - + /* 01B0C 80AEC71C 24843784 */ addiu $a0, $a0, 0x3784 ## $a0 = 06003784 /* 01B10 80AEC720 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 01B14 80AEC724 3C01C100 */ lui $at, 0xC100 ## $at = C1000000 /* 01B18 80AEC728 44814000 */ mtc1 $at, $f8 ## $f8 = -8.00 -/* 01B1C 80AEC72C 468021A0 */ cvt.s.w $f6, $f4 -/* 01B20 80AEC730 8FA40028 */ lw $a0, 0x0028($sp) +/* 01B1C 80AEC72C 468021A0 */ cvt.s.w $f6, $f4 +/* 01B20 80AEC730 8FA40028 */ lw $a0, 0x0028($sp) /* 01B24 80AEC734 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 01B28 80AEC738 24180002 */ addiu $t8, $zero, 0x0002 ## $t8 = 00000002 -/* 01B2C 80AEC73C AFB80014 */ sw $t8, 0x0014($sp) +/* 01B2C 80AEC73C AFB80014 */ sw $t8, 0x0014($sp) /* 01B30 80AEC740 24A53784 */ addiu $a1, $a1, 0x3784 ## $a1 = 06003784 -/* 01B34 80AEC744 E7A60010 */ swc1 $f6, 0x0010($sp) +/* 01B34 80AEC744 E7A60010 */ swc1 $f6, 0x0010($sp) /* 01B38 80AEC748 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 01B3C 80AEC74C 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 01B40 80AEC750 E7A80018 */ swc1 $f8, 0x0018($sp) -/* 01B44 80AEC754 0C029468 */ jal SkelAnime_ChangeAnimation - +/* 01B40 80AEC750 E7A80018 */ swc1 $f8, 0x0018($sp) +/* 01B44 80AEC754 0C029468 */ jal SkelAnime_ChangeAnim + /* 01B48 80AEC758 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 01B4C 80AEC75C 8FA80028 */ lw $t0, 0x0028($sp) +/* 01B4C 80AEC75C 8FA80028 */ lw $t0, 0x0028($sp) /* 01B50 80AEC760 24190001 */ addiu $t9, $zero, 0x0001 ## $t9 = 00000001 /* 01B54 80AEC764 AD190280 */ sw $t9, 0x0280($t0) ## 00000280 -/* 01B58 80AEC768 0C2BB1AC */ jal func_80AEC6B0 -/* 01B5C 80AEC76C 8FA40028 */ lw $a0, 0x0028($sp) +/* 01B58 80AEC768 0C2BB1AC */ jal func_80AEC6B0 +/* 01B5C 80AEC76C 8FA40028 */ lw $a0, 0x0028($sp) .L80AEC770: -/* 01B60 80AEC770 8FBF0024 */ lw $ra, 0x0024($sp) +/* 01B60 80AEC770 8FBF0024 */ lw $ra, 0x0024($sp) .L80AEC774: /* 01B64 80AEC774 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 01B68 80AEC778 03E00008 */ jr $ra +/* 01B68 80AEC778 03E00008 */ jr $ra /* 01B6C 80AEC77C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEC8B8.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEC8B8.s index a5a9de797a..e481540a5e 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEC8B8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEC8B8.s @@ -1,39 +1,39 @@ glabel func_80AEC8B8 /* 01CA8 80AEC8B8 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 01CAC 80AEC8BC AFA40028 */ sw $a0, 0x0028($sp) -/* 01CB0 80AEC8C0 AFBF0024 */ sw $ra, 0x0024($sp) +/* 01CAC 80AEC8BC AFA40028 */ sw $a0, 0x0028($sp) +/* 01CB0 80AEC8C0 AFBF0024 */ sw $ra, 0x0024($sp) /* 01CB4 80AEC8C4 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 /* 01CB8 80AEC8C8 24050003 */ addiu $a1, $zero, 0x0003 ## $a1 = 00000003 -/* 01CBC 80AEC8CC 0C2BABE8 */ jal func_80AEAFA0 +/* 01CBC 80AEC8CC 0C2BABE8 */ jal func_80AEAFA0 /* 01CC0 80AEC8D0 24060003 */ addiu $a2, $zero, 0x0003 ## $a2 = 00000003 -/* 01CC4 80AEC8D4 10400015 */ beq $v0, $zero, .L80AEC92C +/* 01CC4 80AEC8D4 10400015 */ beq $v0, $zero, .L80AEC92C /* 01CC8 80AEC8D8 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 /* 01CCC 80AEC8DC 0C028800 */ jal SkelAnime_GetFrameCount - + /* 01CD0 80AEC8E0 24844074 */ addiu $a0, $a0, 0x4074 ## $a0 = 06004074 /* 01CD4 80AEC8E4 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 01CD8 80AEC8E8 3C01C100 */ lui $at, 0xC100 ## $at = C1000000 /* 01CDC 80AEC8EC 44814000 */ mtc1 $at, $f8 ## $f8 = -8.00 -/* 01CE0 80AEC8F0 468021A0 */ cvt.s.w $f6, $f4 -/* 01CE4 80AEC8F4 8FA40028 */ lw $a0, 0x0028($sp) +/* 01CE0 80AEC8F0 468021A0 */ cvt.s.w $f6, $f4 +/* 01CE4 80AEC8F4 8FA40028 */ lw $a0, 0x0028($sp) /* 01CE8 80AEC8F8 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 01CEC 80AEC8FC 240E0002 */ addiu $t6, $zero, 0x0002 ## $t6 = 00000002 -/* 01CF0 80AEC900 AFAE0014 */ sw $t6, 0x0014($sp) +/* 01CF0 80AEC900 AFAE0014 */ sw $t6, 0x0014($sp) /* 01CF4 80AEC904 24A54074 */ addiu $a1, $a1, 0x4074 ## $a1 = 06004074 -/* 01CF8 80AEC908 E7A60010 */ swc1 $f6, 0x0010($sp) +/* 01CF8 80AEC908 E7A60010 */ swc1 $f6, 0x0010($sp) /* 01CFC 80AEC90C 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 01D00 80AEC910 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 01D04 80AEC914 E7A80018 */ swc1 $f8, 0x0018($sp) -/* 01D08 80AEC918 0C029468 */ jal SkelAnime_ChangeAnimation - +/* 01D04 80AEC914 E7A80018 */ swc1 $f8, 0x0018($sp) +/* 01D08 80AEC918 0C029468 */ jal SkelAnime_ChangeAnim + /* 01D0C 80AEC91C 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 01D10 80AEC920 8FB80028 */ lw $t8, 0x0028($sp) +/* 01D10 80AEC920 8FB80028 */ lw $t8, 0x0028($sp) /* 01D14 80AEC924 240F000A */ addiu $t7, $zero, 0x000A ## $t7 = 0000000A /* 01D18 80AEC928 AF0F0264 */ sw $t7, 0x0264($t8) ## 00000264 .L80AEC92C: -/* 01D1C 80AEC92C 8FBF0024 */ lw $ra, 0x0024($sp) +/* 01D1C 80AEC92C 8FBF0024 */ lw $ra, 0x0024($sp) /* 01D20 80AEC930 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 01D24 80AEC934 03E00008 */ jr $ra +/* 01D24 80AEC934 03E00008 */ jr $ra /* 01D28 80AEC938 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEC93C.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEC93C.s index 11d50e175d..a1b498c166 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEC93C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEC93C.s @@ -1,40 +1,40 @@ glabel func_80AEC93C /* 01D2C 80AEC93C 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 01D30 80AEC940 AFB00028 */ sw $s0, 0x0028($sp) +/* 01D30 80AEC940 AFB00028 */ sw $s0, 0x0028($sp) /* 01D34 80AEC944 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 01D38 80AEC948 10A00019 */ beq $a1, $zero, .L80AEC9B0 -/* 01D3C 80AEC94C AFBF002C */ sw $ra, 0x002C($sp) +/* 01D38 80AEC948 10A00019 */ beq $a1, $zero, .L80AEC9B0 +/* 01D3C 80AEC94C AFBF002C */ sw $ra, 0x002C($sp) /* 01D40 80AEC950 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 /* 01D44 80AEC954 0C028800 */ jal SkelAnime_GetFrameCount - + /* 01D48 80AEC958 248478E4 */ addiu $a0, $a0, 0x78E4 ## $a0 = 060078E4 /* 01D4C 80AEC95C 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 01D50 80AEC960 3C01C100 */ lui $at, 0xC100 ## $at = C1000000 /* 01D54 80AEC964 44814000 */ mtc1 $at, $f8 ## $f8 = -8.00 -/* 01D58 80AEC968 468021A0 */ cvt.s.w $f6, $f4 +/* 01D58 80AEC968 468021A0 */ cvt.s.w $f6, $f4 /* 01D5C 80AEC96C 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 01D60 80AEC970 24A578E4 */ addiu $a1, $a1, 0x78E4 ## $a1 = 060078E4 /* 01D64 80AEC974 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C /* 01D68 80AEC978 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 01D6C 80AEC97C 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 01D70 80AEC980 E7A60010 */ swc1 $f6, 0x0010($sp) -/* 01D74 80AEC984 AFA00014 */ sw $zero, 0x0014($sp) -/* 01D78 80AEC988 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 01D7C 80AEC98C E7A80018 */ swc1 $f8, 0x0018($sp) +/* 01D70 80AEC980 E7A60010 */ swc1 $f6, 0x0010($sp) +/* 01D74 80AEC984 AFA00014 */ sw $zero, 0x0014($sp) +/* 01D78 80AEC988 0C029468 */ jal SkelAnime_ChangeAnim + +/* 01D7C 80AEC98C E7A80018 */ swc1 $f8, 0x0018($sp) /* 01D80 80AEC990 860E0032 */ lh $t6, 0x0032($s0) ## 00000032 /* 01D84 80AEC994 44805000 */ mtc1 $zero, $f10 ## $f10 = 0.00 /* 01D88 80AEC998 34018000 */ ori $at, $zero, 0x8000 ## $at = 00008000 /* 01D8C 80AEC99C 2418000B */ addiu $t8, $zero, 0x000B ## $t8 = 0000000B -/* 01D90 80AEC9A0 01C17821 */ addu $t7, $t6, $at +/* 01D90 80AEC9A0 01C17821 */ addu $t7, $t6, $at /* 01D94 80AEC9A4 A60F0032 */ sh $t7, 0x0032($s0) ## 00000032 /* 01D98 80AEC9A8 AE180264 */ sw $t8, 0x0264($s0) ## 00000264 /* 01D9C 80AEC9AC E60A026C */ swc1 $f10, 0x026C($s0) ## 0000026C .L80AEC9B0: -/* 01DA0 80AEC9B0 8FBF002C */ lw $ra, 0x002C($sp) -/* 01DA4 80AEC9B4 8FB00028 */ lw $s0, 0x0028($sp) +/* 01DA0 80AEC9B0 8FBF002C */ lw $ra, 0x002C($sp) +/* 01DA4 80AEC9B4 8FB00028 */ lw $s0, 0x0028($sp) /* 01DA8 80AEC9B8 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 01DAC 80AEC9BC 03E00008 */ jr $ra +/* 01DAC 80AEC9BC 03E00008 */ jr $ra /* 01DB0 80AEC9C0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AECF6C.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AECF6C.s index 5b923f9700..98c6060336 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AECF6C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AECF6C.s @@ -34,7 +34,7 @@ glabel func_80AECF6C /* 023DC 80AECFEC C484002C */ lwc1 $f4, 0x002C($a0) ## 0000002C /* 023E0 80AECFF0 AFA30048 */ sw $v1, 0x0048($sp) /* 023E4 80AECFF4 46128301 */ sub.s $f12, $f16, $f18 -/* 023E8 80AECFF8 0C03F494 */ jal func_800FD250 +/* 023E8 80AECFF8 0C03F494 */ jal Math_atan2f /* 023EC 80AECFFC 46062381 */ sub.s $f14, $f4, $f6 /* 023F0 80AED000 3C0180AF */ lui $at, %hi(D_80AF1BF0) ## $at = 80AF0000 /* 023F4 80AED004 C4281BF0 */ lwc1 $f8, %lo(D_80AF1BF0)($at) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AED19C.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AED19C.s index 0dd40940b5..c2d3ff0759 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AED19C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AED19C.s @@ -1,37 +1,37 @@ glabel func_80AED19C /* 0258C 80AED19C 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 02590 80AED1A0 AFBF0024 */ sw $ra, 0x0024($sp) -/* 02594 80AED1A4 10A00018 */ beq $a1, $zero, .L80AED208 -/* 02598 80AED1A8 AFA40028 */ sw $a0, 0x0028($sp) +/* 02590 80AED1A0 AFBF0024 */ sw $ra, 0x0024($sp) +/* 02594 80AED1A4 10A00018 */ beq $a1, $zero, .L80AED208 +/* 02598 80AED1A8 AFA40028 */ sw $a0, 0x0028($sp) /* 0259C 80AED1AC 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 /* 025A0 80AED1B0 0C028800 */ jal SkelAnime_GetFrameCount - + /* 025A4 80AED1B4 24841488 */ addiu $a0, $a0, 0x1488 ## $a0 = 06001488 /* 025A8 80AED1B8 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 025AC 80AED1BC 3C01C100 */ lui $at, 0xC100 ## $at = C1000000 /* 025B0 80AED1C0 44814000 */ mtc1 $at, $f8 ## $f8 = -8.00 -/* 025B4 80AED1C4 468021A0 */ cvt.s.w $f6, $f4 -/* 025B8 80AED1C8 8FA40028 */ lw $a0, 0x0028($sp) +/* 025B4 80AED1C4 468021A0 */ cvt.s.w $f6, $f4 +/* 025B8 80AED1C8 8FA40028 */ lw $a0, 0x0028($sp) /* 025BC 80AED1CC 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 025C0 80AED1D0 240E0002 */ addiu $t6, $zero, 0x0002 ## $t6 = 00000002 -/* 025C4 80AED1D4 AFAE0014 */ sw $t6, 0x0014($sp) +/* 025C4 80AED1D4 AFAE0014 */ sw $t6, 0x0014($sp) /* 025C8 80AED1D8 24A51488 */ addiu $a1, $a1, 0x1488 ## $a1 = 06001488 -/* 025CC 80AED1DC E7A60010 */ swc1 $f6, 0x0010($sp) +/* 025CC 80AED1DC E7A60010 */ swc1 $f6, 0x0010($sp) /* 025D0 80AED1E0 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 025D4 80AED1E4 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 025D8 80AED1E8 E7A80018 */ swc1 $f8, 0x0018($sp) -/* 025DC 80AED1EC 0C029468 */ jal SkelAnime_ChangeAnimation - +/* 025D8 80AED1E8 E7A80018 */ swc1 $f8, 0x0018($sp) +/* 025DC 80AED1EC 0C029468 */ jal SkelAnime_ChangeAnim + /* 025E0 80AED1F0 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 025E4 80AED1F4 8FA40028 */ lw $a0, 0x0028($sp) +/* 025E4 80AED1F4 8FA40028 */ lw $a0, 0x0028($sp) /* 025E8 80AED1F8 240F0014 */ addiu $t7, $zero, 0x0014 ## $t7 = 00000014 /* 025EC 80AED1FC 24050003 */ addiu $a1, $zero, 0x0003 ## $a1 = 00000003 -/* 025F0 80AED200 0C2BB42C */ jal func_80AED0B0 +/* 025F0 80AED200 0C2BB42C */ jal func_80AED0B0 /* 025F4 80AED204 AC8F0264 */ sw $t7, 0x0264($a0) ## 00000264 .L80AED208: -/* 025F8 80AED208 8FBF0024 */ lw $ra, 0x0024($sp) +/* 025F8 80AED208 8FBF0024 */ lw $ra, 0x0024($sp) /* 025FC 80AED20C 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 02600 80AED210 03E00008 */ jr $ra +/* 02600 80AED210 03E00008 */ jr $ra /* 02604 80AED214 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AED218.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AED218.s index 915e63718d..e0827ec14f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AED218.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AED218.s @@ -1,69 +1,69 @@ glabel func_80AED218 /* 02608 80AED218 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 0260C 80AED21C AFBF002C */ sw $ra, 0x002C($sp) -/* 02610 80AED220 AFB00028 */ sw $s0, 0x0028($sp) -/* 02614 80AED224 AFA50034 */ sw $a1, 0x0034($sp) +/* 0260C 80AED21C AFBF002C */ sw $ra, 0x002C($sp) +/* 02610 80AED220 AFB00028 */ sw $s0, 0x0028($sp) +/* 02614 80AED224 AFA50034 */ sw $a1, 0x0034($sp) /* 02618 80AED228 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 0261C 80AED22C 0C2BB421 */ jal func_80AED084 +/* 0261C 80AED22C 0C2BB421 */ jal func_80AED084 /* 02620 80AED230 24050004 */ addiu $a1, $zero, 0x0004 ## $a1 = 00000004 -/* 02624 80AED234 10400016 */ beq $v0, $zero, .L80AED290 +/* 02624 80AED234 10400016 */ beq $v0, $zero, .L80AED290 /* 02628 80AED238 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0262C 80AED23C 8FAE0034 */ lw $t6, 0x0034($sp) +/* 0262C 80AED23C 8FAE0034 */ lw $t6, 0x0034($sp) /* 02630 80AED240 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 -/* 02634 80AED244 51C0002B */ beql $t6, $zero, .L80AED2F4 -/* 02638 80AED248 8FBF002C */ lw $ra, 0x002C($sp) +/* 02634 80AED244 51C0002B */ beql $t6, $zero, .L80AED2F4 +/* 02638 80AED248 8FBF002C */ lw $ra, 0x002C($sp) /* 0263C 80AED24C 0C028800 */ jal SkelAnime_GetFrameCount - + /* 02640 80AED250 24842058 */ addiu $a0, $a0, 0x2058 ## $a0 = 06002058 /* 02644 80AED254 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 02648 80AED258 3C01C100 */ lui $at, 0xC100 ## $at = C1000000 /* 0264C 80AED25C 44814000 */ mtc1 $at, $f8 ## $f8 = -8.00 -/* 02650 80AED260 468021A0 */ cvt.s.w $f6, $f4 +/* 02650 80AED260 468021A0 */ cvt.s.w $f6, $f4 /* 02654 80AED264 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 02658 80AED268 24A52058 */ addiu $a1, $a1, 0x2058 ## $a1 = 06002058 /* 0265C 80AED26C 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C /* 02660 80AED270 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 02664 80AED274 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 02668 80AED278 E7A60010 */ swc1 $f6, 0x0010($sp) -/* 0266C 80AED27C AFA00014 */ sw $zero, 0x0014($sp) -/* 02670 80AED280 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 02674 80AED284 E7A80018 */ swc1 $f8, 0x0018($sp) -/* 02678 80AED288 1000001A */ beq $zero, $zero, .L80AED2F4 -/* 0267C 80AED28C 8FBF002C */ lw $ra, 0x002C($sp) +/* 02668 80AED278 E7A60010 */ swc1 $f6, 0x0010($sp) +/* 0266C 80AED27C AFA00014 */ sw $zero, 0x0014($sp) +/* 02670 80AED280 0C029468 */ jal SkelAnime_ChangeAnim + +/* 02674 80AED284 E7A80018 */ swc1 $f8, 0x0018($sp) +/* 02678 80AED288 1000001A */ beq $zero, $zero, .L80AED2F4 +/* 0267C 80AED28C 8FBF002C */ lw $ra, 0x002C($sp) .L80AED290: -/* 02680 80AED290 0C2BB421 */ jal func_80AED084 +/* 02680 80AED290 0C2BB421 */ jal func_80AED084 /* 02684 80AED294 24050005 */ addiu $a1, $zero, 0x0005 ## $a1 = 00000005 -/* 02688 80AED298 10400015 */ beq $v0, $zero, .L80AED2F0 +/* 02688 80AED298 10400015 */ beq $v0, $zero, .L80AED2F0 /* 0268C 80AED29C 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 /* 02690 80AED2A0 0C028800 */ jal SkelAnime_GetFrameCount - + /* 02694 80AED2A4 24842990 */ addiu $a0, $a0, 0x2990 ## $a0 = 06002990 /* 02698 80AED2A8 44825000 */ mtc1 $v0, $f10 ## $f10 = 0.00 /* 0269C 80AED2AC 3C01C100 */ lui $at, 0xC100 ## $at = C1000000 /* 026A0 80AED2B0 44819000 */ mtc1 $at, $f18 ## $f18 = -8.00 -/* 026A4 80AED2B4 46805420 */ cvt.s.w $f16, $f10 +/* 026A4 80AED2B4 46805420 */ cvt.s.w $f16, $f10 /* 026A8 80AED2B8 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 026AC 80AED2BC 240F0002 */ addiu $t7, $zero, 0x0002 ## $t7 = 00000002 -/* 026B0 80AED2C0 AFAF0014 */ sw $t7, 0x0014($sp) +/* 026B0 80AED2C0 AFAF0014 */ sw $t7, 0x0014($sp) /* 026B4 80AED2C4 24A52990 */ addiu $a1, $a1, 0x2990 ## $a1 = 06002990 /* 026B8 80AED2C8 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C -/* 026BC 80AED2CC E7B00010 */ swc1 $f16, 0x0010($sp) +/* 026BC 80AED2CC E7B00010 */ swc1 $f16, 0x0010($sp) /* 026C0 80AED2D0 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 026C4 80AED2D4 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 026C8 80AED2D8 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 026CC 80AED2DC E7B20018 */ swc1 $f18, 0x0018($sp) +/* 026C8 80AED2D8 0C029468 */ jal SkelAnime_ChangeAnim + +/* 026CC 80AED2DC E7B20018 */ swc1 $f18, 0x0018($sp) /* 026D0 80AED2E0 C6040090 */ lwc1 $f4, 0x0090($s0) ## 00000090 /* 026D4 80AED2E4 24180015 */ addiu $t8, $zero, 0x0015 ## $t8 = 00000015 /* 026D8 80AED2E8 AE180264 */ sw $t8, 0x0264($s0) ## 00000264 /* 026DC 80AED2EC E604027C */ swc1 $f4, 0x027C($s0) ## 0000027C .L80AED2F0: -/* 026E0 80AED2F0 8FBF002C */ lw $ra, 0x002C($sp) +/* 026E0 80AED2F0 8FBF002C */ lw $ra, 0x002C($sp) .L80AED2F4: -/* 026E4 80AED2F4 8FB00028 */ lw $s0, 0x0028($sp) +/* 026E4 80AED2F4 8FB00028 */ lw $s0, 0x0028($sp) /* 026E8 80AED2F8 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 026EC 80AED2FC 03E00008 */ jr $ra +/* 026EC 80AED2FC 03E00008 */ jr $ra /* 026F0 80AED300 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEE628.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEE628.s index 831fa6f4d0..165313e088 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEE628.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEE628.s @@ -1,48 +1,48 @@ glabel func_80AEE628 /* 03A18 80AEE628 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 /* 03A1C 80AEE62C 3C0E0001 */ lui $t6, 0x0001 ## $t6 = 00010000 -/* 03A20 80AEE630 AFBF0024 */ sw $ra, 0x0024($sp) -/* 03A24 80AEE634 AFA40038 */ sw $a0, 0x0038($sp) -/* 03A28 80AEE638 01C57021 */ addu $t6, $t6, $a1 +/* 03A20 80AEE630 AFBF0024 */ sw $ra, 0x0024($sp) +/* 03A24 80AEE634 AFA40038 */ sw $a0, 0x0038($sp) +/* 03A28 80AEE638 01C57021 */ addu $t6, $t6, $a1 /* 03A2C 80AEE63C 81CE1CBC */ lb $t6, 0x1CBC($t6) ## 00011CBC /* 03A30 80AEE640 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 03A34 80AEE644 0C2BABCE */ jal func_80AEAF38 -/* 03A38 80AEE648 A3AE002F */ sb $t6, 0x002F($sp) -/* 03A3C 80AEE64C 10400019 */ beq $v0, $zero, .L80AEE6B4 +/* 03A34 80AEE644 0C2BABCE */ jal func_80AEAF38 +/* 03A38 80AEE648 A3AE002F */ sb $t6, 0x002F($sp) +/* 03A3C 80AEE64C 10400019 */ beq $v0, $zero, .L80AEE6B4 /* 03A40 80AEE650 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 /* 03A44 80AEE654 0C028800 */ jal SkelAnime_GetFrameCount - + /* 03A48 80AEE658 24846B9C */ addiu $a0, $a0, 0x6B9C ## $a0 = 06006B9C /* 03A4C 80AEE65C 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 03A50 80AEE660 3C01C100 */ lui $at, 0xC100 ## $at = C1000000 /* 03A54 80AEE664 44814000 */ mtc1 $at, $f8 ## $f8 = -8.00 -/* 03A58 80AEE668 468021A0 */ cvt.s.w $f6, $f4 -/* 03A5C 80AEE66C 8FA40038 */ lw $a0, 0x0038($sp) +/* 03A58 80AEE668 468021A0 */ cvt.s.w $f6, $f4 +/* 03A5C 80AEE66C 8FA40038 */ lw $a0, 0x0038($sp) /* 03A60 80AEE670 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 03A64 80AEE674 24A56B9C */ addiu $a1, $a1, 0x6B9C ## $a1 = 06006B9C /* 03A68 80AEE678 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 03A6C 80AEE67C 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 03A70 80AEE680 E7A60010 */ swc1 $f6, 0x0010($sp) -/* 03A74 80AEE684 AFA00014 */ sw $zero, 0x0014($sp) -/* 03A78 80AEE688 E7A80018 */ swc1 $f8, 0x0018($sp) -/* 03A7C 80AEE68C 0C029468 */ jal SkelAnime_ChangeAnimation - +/* 03A70 80AEE680 E7A60010 */ swc1 $f6, 0x0010($sp) +/* 03A74 80AEE684 AFA00014 */ sw $zero, 0x0014($sp) +/* 03A78 80AEE688 E7A80018 */ swc1 $f8, 0x0018($sp) +/* 03A7C 80AEE68C 0C029468 */ jal SkelAnime_ChangeAnim + /* 03A80 80AEE690 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C /* 03A84 80AEE694 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 /* 03A88 80AEE698 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 /* 03A8C 80AEE69C 944F0F20 */ lhu $t7, 0x0F20($v0) ## 8015F580 -/* 03A90 80AEE6A0 8FA80038 */ lw $t0, 0x0038($sp) +/* 03A90 80AEE6A0 8FA80038 */ lw $t0, 0x0038($sp) /* 03A94 80AEE6A4 2419001F */ addiu $t9, $zero, 0x001F ## $t9 = 0000001F /* 03A98 80AEE6A8 35F80010 */ ori $t8, $t7, 0x0010 ## $t8 = 00000010 /* 03A9C 80AEE6AC A4580F20 */ sh $t8, 0x0F20($v0) ## 8015F580 /* 03AA0 80AEE6B0 AD190264 */ sw $t9, 0x0264($t0) ## 00000264 .L80AEE6B4: -/* 03AA4 80AEE6B4 83A9002F */ lb $t1, 0x002F($sp) -/* 03AA8 80AEE6B8 8FAA0038 */ lw $t2, 0x0038($sp) +/* 03AA4 80AEE6B4 83A9002F */ lb $t1, 0x002F($sp) +/* 03AA8 80AEE6B8 8FAA0038 */ lw $t2, 0x0038($sp) /* 03AAC 80AEE6BC A1490286 */ sb $t1, 0x0286($t2) ## 00000286 -/* 03AB0 80AEE6C0 8FBF0024 */ lw $ra, 0x0024($sp) +/* 03AB0 80AEE6C0 8FBF0024 */ lw $ra, 0x0024($sp) /* 03AB4 80AEE6C4 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 -/* 03AB8 80AEE6C8 03E00008 */ jr $ra +/* 03AB8 80AEE6C8 03E00008 */ jr $ra /* 03ABC 80AEE6CC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEE6D0.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEE6D0.s index c66b14ceeb..fac3bad620 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEE6D0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEE6D0.s @@ -3,47 +3,47 @@ glabel func_80AEE6D0 /* 03AC4 80AEE6D4 3C0F8016 */ lui $t7, 0x8016 ## $t7 = 80160000 /* 03AC8 80AEE6D8 95EFF580 */ lhu $t7, -0x0A80($t7) ## 8015F580 /* 03ACC 80AEE6DC 3C0E0001 */ lui $t6, 0x0001 ## $t6 = 00010000 -/* 03AD0 80AEE6E0 AFBF002C */ sw $ra, 0x002C($sp) -/* 03AD4 80AEE6E4 AFB00028 */ sw $s0, 0x0028($sp) -/* 03AD8 80AEE6E8 01C57021 */ addu $t6, $t6, $a1 +/* 03AD0 80AEE6E0 AFBF002C */ sw $ra, 0x002C($sp) +/* 03AD4 80AEE6E4 AFB00028 */ sw $s0, 0x0028($sp) +/* 03AD8 80AEE6E8 01C57021 */ addu $t6, $t6, $a1 /* 03ADC 80AEE6EC 81CE1CBC */ lb $t6, 0x1CBC($t6) ## 00011CBC /* 03AE0 80AEE6F0 31F80010 */ andi $t8, $t7, 0x0010 ## $t8 = 00000000 /* 03AE4 80AEE6F4 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 03AE8 80AEE6F8 1700002A */ bne $t8, $zero, .L80AEE7A4 -/* 03AEC 80AEE6FC A3AE0033 */ sb $t6, 0x0033($sp) +/* 03AE8 80AEE6F8 1700002A */ bne $t8, $zero, .L80AEE7A4 +/* 03AEC 80AEE6FC A3AE0033 */ sb $t6, 0x0033($sp) /* 03AF0 80AEE700 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 03AF4 80AEE704 0C2BAC49 */ jal func_80AEB124 -/* 03AF8 80AEE708 AFA5003C */ sw $a1, 0x003C($sp) -/* 03AFC 80AEE70C 50400026 */ beql $v0, $zero, .L80AEE7A8 -/* 03B00 80AEE710 83AC0033 */ lb $t4, 0x0033($sp) -/* 03B04 80AEE714 0C023A62 */ jal func_8008E988 -/* 03B08 80AEE718 8FA4003C */ lw $a0, 0x003C($sp) -/* 03B0C 80AEE71C 1440001D */ bne $v0, $zero, .L80AEE794 +/* 03AF4 80AEE704 0C2BAC49 */ jal func_80AEB124 +/* 03AF8 80AEE708 AFA5003C */ sw $a1, 0x003C($sp) +/* 03AFC 80AEE70C 50400026 */ beql $v0, $zero, .L80AEE7A8 +/* 03B00 80AEE710 83AC0033 */ lb $t4, 0x0033($sp) +/* 03B04 80AEE714 0C023A62 */ jal func_8008E988 +/* 03B08 80AEE718 8FA4003C */ lw $a0, 0x003C($sp) +/* 03B0C 80AEE71C 1440001D */ bne $v0, $zero, .L80AEE794 /* 03B10 80AEE720 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 /* 03B14 80AEE724 0C028800 */ jal SkelAnime_GetFrameCount - + /* 03B18 80AEE728 24844350 */ addiu $a0, $a0, 0x4350 ## $a0 = 06004350 /* 03B1C 80AEE72C 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 03B20 80AEE730 3C01C100 */ lui $at, 0xC100 ## $at = C1000000 /* 03B24 80AEE734 44814000 */ mtc1 $at, $f8 ## $f8 = -8.00 -/* 03B28 80AEE738 468021A0 */ cvt.s.w $f6, $f4 +/* 03B28 80AEE738 468021A0 */ cvt.s.w $f6, $f4 /* 03B2C 80AEE73C 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 03B30 80AEE740 24A54648 */ addiu $a1, $a1, 0x4648 ## $a1 = 06004648 /* 03B34 80AEE744 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C /* 03B38 80AEE748 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 03B3C 80AEE74C 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 03B40 80AEE750 E7A60010 */ swc1 $f6, 0x0010($sp) -/* 03B44 80AEE754 AFA00014 */ sw $zero, 0x0014($sp) -/* 03B48 80AEE758 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 03B4C 80AEE75C E7A80018 */ swc1 $f8, 0x0018($sp) -/* 03B50 80AEE760 0C2BB580 */ jal func_80AED600 +/* 03B40 80AEE750 E7A60010 */ swc1 $f6, 0x0010($sp) +/* 03B44 80AEE754 AFA00014 */ sw $zero, 0x0014($sp) +/* 03B48 80AEE758 0C029468 */ jal SkelAnime_ChangeAnim + +/* 03B4C 80AEE75C E7A80018 */ swc1 $f8, 0x0018($sp) +/* 03B50 80AEE760 0C2BB580 */ jal func_80AED600 /* 03B54 80AEE764 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 03B58 80AEE768 44805000 */ mtc1 $zero, $f10 ## $f10 = 0.00 /* 03B5C 80AEE76C 24190022 */ addiu $t9, $zero, 0x0022 ## $t9 = 00000022 /* 03B60 80AEE770 AE190264 */ sw $t9, 0x0264($s0) ## 00000264 /* 03B64 80AEE774 E60A026C */ swc1 $f10, 0x026C($s0) ## 0000026C -/* 03B68 80AEE778 8FA9003C */ lw $t1, 0x003C($sp) +/* 03B68 80AEE778 8FA9003C */ lw $t1, 0x003C($sp) /* 03B6C 80AEE77C 3C0880AF */ lui $t0, %hi(D_80AF1728) ## $t0 = 80AF0000 /* 03B70 80AEE780 25081728 */ addiu $t0, $t0, %lo(D_80AF1728) ## $t0 = 80AF1728 /* 03B74 80AEE784 240A0001 */ addiu $t2, $zero, 0x0001 ## $t2 = 00000001 @@ -51,20 +51,20 @@ glabel func_80AEE6D0 /* 03B7C 80AEE78C AD281D68 */ sw $t0, 0x1D68($t1) ## 00001D68 /* 03B80 80AEE790 A02AFA74 */ sb $t2, -0x058C($at) ## 8015FA74 .L80AEE794: -/* 03B84 80AEE794 83AB0033 */ lb $t3, 0x0033($sp) +/* 03B84 80AEE794 83AB0033 */ lb $t3, 0x0033($sp) /* 03B88 80AEE798 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -/* 03B8C 80AEE79C 10000004 */ beq $zero, $zero, .L80AEE7B0 +/* 03B8C 80AEE79C 10000004 */ beq $zero, $zero, .L80AEE7B0 /* 03B90 80AEE7A0 A20B0286 */ sb $t3, 0x0286($s0) ## 00000286 .L80AEE7A4: -/* 03B94 80AEE7A4 83AC0033 */ lb $t4, 0x0033($sp) +/* 03B94 80AEE7A4 83AC0033 */ lb $t4, 0x0033($sp) .L80AEE7A8: /* 03B98 80AEE7A8 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 /* 03B9C 80AEE7AC A20C0286 */ sb $t4, 0x0286($s0) ## 00000286 .L80AEE7B0: -/* 03BA0 80AEE7B0 8FBF002C */ lw $ra, 0x002C($sp) -/* 03BA4 80AEE7B4 8FB00028 */ lw $s0, 0x0028($sp) +/* 03BA0 80AEE7B0 8FBF002C */ lw $ra, 0x002C($sp) +/* 03BA4 80AEE7B4 8FB00028 */ lw $s0, 0x0028($sp) /* 03BA8 80AEE7B8 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 -/* 03BAC 80AEE7BC 03E00008 */ jr $ra +/* 03BAC 80AEE7BC 03E00008 */ jr $ra /* 03BB0 80AEE7C0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEE7C4.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEE7C4.s index 3b2439bbfd..8987a2763d 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEE7C4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEE7C4.s @@ -1,110 +1,110 @@ glabel func_80AEE7C4 /* 03BB4 80AEE7C4 27BDFF88 */ addiu $sp, $sp, 0xFF88 ## $sp = FFFFFF88 -/* 03BB8 80AEE7C8 AFBF002C */ sw $ra, 0x002C($sp) -/* 03BBC 80AEE7CC AFB00028 */ sw $s0, 0x0028($sp) +/* 03BB8 80AEE7C8 AFBF002C */ sw $ra, 0x002C($sp) +/* 03BBC 80AEE7CC AFB00028 */ sw $s0, 0x0028($sp) /* 03BC0 80AEE7D0 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 03BC4 80AEE7D4 0C00BD68 */ jal func_8002F5A0 -/* 03BC8 80AEE7D8 AFA5007C */ sw $a1, 0x007C($sp) -/* 03BCC 80AEE7DC 1040004A */ beq $v0, $zero, .L80AEE908 +/* 03BC4 80AEE7D4 0C00BD68 */ jal func_8002F5A0 +/* 03BC8 80AEE7D8 AFA5007C */ sw $a1, 0x007C($sp) +/* 03BCC 80AEE7DC 1040004A */ beq $v0, $zero, .L80AEE908 /* 03BD0 80AEE7E0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 03BD4 80AEE7E4 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 /* 03BD8 80AEE7E8 0C028800 */ jal SkelAnime_GetFrameCount - + /* 03BDC 80AEE7EC 24846B9C */ addiu $a0, $a0, 0x6B9C ## $a0 = 06006B9C /* 03BE0 80AEE7F0 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 03BE4 80AEE7F4 3C01C100 */ lui $at, 0xC100 ## $at = C1000000 /* 03BE8 80AEE7F8 44814000 */ mtc1 $at, $f8 ## $f8 = -8.00 -/* 03BEC 80AEE7FC 468021A0 */ cvt.s.w $f6, $f4 +/* 03BEC 80AEE7FC 468021A0 */ cvt.s.w $f6, $f4 /* 03BF0 80AEE800 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 03BF4 80AEE804 24A56B9C */ addiu $a1, $a1, 0x6B9C ## $a1 = 06006B9C /* 03BF8 80AEE808 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C /* 03BFC 80AEE80C 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 03C00 80AEE810 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 03C04 80AEE814 E7A60010 */ swc1 $f6, 0x0010($sp) -/* 03C08 80AEE818 AFA00014 */ sw $zero, 0x0014($sp) -/* 03C0C 80AEE81C 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 03C10 80AEE820 E7A80018 */ swc1 $f8, 0x0018($sp) +/* 03C04 80AEE814 E7A60010 */ swc1 $f6, 0x0010($sp) +/* 03C08 80AEE818 AFA00014 */ sw $zero, 0x0014($sp) +/* 03C0C 80AEE81C 0C029468 */ jal SkelAnime_ChangeAnim + +/* 03C10 80AEE820 E7A80018 */ swc1 $f8, 0x0018($sp) /* 03C14 80AEE824 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 03C18 80AEE828 0C2BB5B7 */ jal func_80AED6DC -/* 03C1C 80AEE82C 8FA5007C */ lw $a1, 0x007C($sp) +/* 03C18 80AEE828 0C2BB5B7 */ jal func_80AED6DC +/* 03C1C 80AEE82C 8FA5007C */ lw $a1, 0x007C($sp) /* 03C20 80AEE830 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 /* 03C24 80AEE834 2442FA90 */ addiu $v0, $v0, 0xFA90 ## $v0 = 8015FA90 /* 03C28 80AEE838 8C4E0000 */ lw $t6, 0x0000($v0) ## 8015FA90 /* 03C2C 80AEE83C 3C0180AF */ lui $at, %hi(D_80AF1C48) ## $at = 80AF0000 -/* 03C30 80AEE840 C4201C48 */ lwc1 $f0, %lo(D_80AF1C48)($at) +/* 03C30 80AEE840 C4201C48 */ lwc1 $f0, %lo(D_80AF1C48)($at) /* 03C34 80AEE844 85CF1486 */ lh $t7, 0x1486($t6) ## 00001486 /* 03C38 80AEE848 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 /* 03C3C 80AEE84C 44811000 */ mtc1 $at, $f2 ## $f2 = 1.00 /* 03C40 80AEE850 448F8000 */ mtc1 $t7, $f16 ## $f16 = 0.00 /* 03C44 80AEE854 C60A0068 */ lwc1 $f10, 0x0068($s0) ## 00000068 /* 03C48 80AEE858 3C0180AF */ lui $at, %hi(D_80AF1C4C) ## $at = 80AF0000 -/* 03C4C 80AEE85C 468084A0 */ cvt.s.w $f18, $f16 +/* 03C4C 80AEE85C 468084A0 */ cvt.s.w $f18, $f16 /* 03C50 80AEE860 C6100060 */ lwc1 $f16, 0x0060($s0) ## 00000060 /* 03C54 80AEE864 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 03C58 80AEE868 46009102 */ mul.s $f4, $f18, $f0 -/* 03C5C 80AEE86C 46022180 */ add.s $f6, $f4, $f2 -/* 03C60 80AEE870 46065202 */ mul.s $f8, $f10, $f6 +/* 03C58 80AEE868 46009102 */ mul.s $f4, $f18, $f0 +/* 03C5C 80AEE86C 46022180 */ add.s $f6, $f4, $f2 +/* 03C60 80AEE870 46065202 */ mul.s $f8, $f10, $f6 /* 03C64 80AEE874 E6080068 */ swc1 $f8, 0x0068($s0) ## 00000068 /* 03C68 80AEE878 8C580000 */ lw $t8, 0x0000($v0) ## 8015FA90 /* 03C6C 80AEE87C 87191488 */ lh $t9, 0x1488($t8) ## 00001488 /* 03C70 80AEE880 44999000 */ mtc1 $t9, $f18 ## $f18 = 0.00 /* 03C74 80AEE884 00000000 */ nop -/* 03C78 80AEE888 46809120 */ cvt.s.w $f4, $f18 -/* 03C7C 80AEE88C 46002282 */ mul.s $f10, $f4, $f0 -/* 03C80 80AEE890 46025180 */ add.s $f6, $f10, $f2 -/* 03C84 80AEE894 46068202 */ mul.s $f8, $f16, $f6 +/* 03C78 80AEE888 46809120 */ cvt.s.w $f4, $f18 +/* 03C7C 80AEE88C 46002282 */ mul.s $f10, $f4, $f0 +/* 03C80 80AEE890 46025180 */ add.s $f6, $f10, $f2 +/* 03C84 80AEE894 46068202 */ mul.s $f8, $f16, $f6 /* 03C88 80AEE898 E6080060 */ swc1 $f8, 0x0060($s0) ## 00000060 /* 03C8C 80AEE89C 8C480000 */ lw $t0, 0x0000($v0) ## 8015FA90 -/* 03C90 80AEE8A0 C4301C4C */ lwc1 $f16, %lo(D_80AF1C4C)($at) +/* 03C90 80AEE8A0 C4301C4C */ lwc1 $f16, %lo(D_80AF1C4C)($at) /* 03C94 80AEE8A4 3C0180AF */ lui $at, %hi(D_80AF1C50) ## $at = 80AF0000 /* 03C98 80AEE8A8 85091484 */ lh $t1, 0x1484($t0) ## 00001484 /* 03C9C 80AEE8AC 44899000 */ mtc1 $t1, $f18 ## $f18 = 0.00 /* 03CA0 80AEE8B0 00000000 */ nop -/* 03CA4 80AEE8B4 46809120 */ cvt.s.w $f4, $f18 -/* 03CA8 80AEE8B8 46002282 */ mul.s $f10, $f4, $f0 -/* 03CAC 80AEE8BC 46105180 */ add.s $f6, $f10, $f16 -/* 03CB0 80AEE8C0 46003207 */ neg.s $f8, $f6 +/* 03CA4 80AEE8B4 46809120 */ cvt.s.w $f4, $f18 +/* 03CA8 80AEE8B8 46002282 */ mul.s $f10, $f4, $f0 +/* 03CAC 80AEE8BC 46105180 */ add.s $f6, $f10, $f16 +/* 03CB0 80AEE8C0 46003207 */ neg.s $f8, $f6 /* 03CB4 80AEE8C4 E6080070 */ swc1 $f8, 0x0070($s0) ## 00000070 /* 03CB8 80AEE8C8 8C4A0000 */ lw $t2, 0x0000($v0) ## 8015FA90 -/* 03CBC 80AEE8CC C4301C50 */ lwc1 $f16, %lo(D_80AF1C50)($at) +/* 03CBC 80AEE8CC C4301C50 */ lwc1 $f16, %lo(D_80AF1C50)($at) /* 03CC0 80AEE8D0 854B1482 */ lh $t3, 0x1482($t2) ## 00001482 /* 03CC4 80AEE8D4 448B9000 */ mtc1 $t3, $f18 ## $f18 = 0.00 /* 03CC8 80AEE8D8 00000000 */ nop -/* 03CCC 80AEE8DC 46809120 */ cvt.s.w $f4, $f18 -/* 03CD0 80AEE8E0 46002282 */ mul.s $f10, $f4, $f0 -/* 03CD4 80AEE8E4 46105180 */ add.s $f6, $f10, $f16 -/* 03CD8 80AEE8E8 46003207 */ neg.s $f8, $f6 -/* 03CDC 80AEE8EC 0C2BB55F */ jal func_80AED57C +/* 03CCC 80AEE8DC 46809120 */ cvt.s.w $f4, $f18 +/* 03CD0 80AEE8E0 46002282 */ mul.s $f10, $f4, $f0 +/* 03CD4 80AEE8E4 46105180 */ add.s $f6, $f10, $f16 +/* 03CD8 80AEE8E8 46003207 */ neg.s $f8, $f6 +/* 03CDC 80AEE8EC 0C2BB55F */ jal func_80AED57C /* 03CE0 80AEE8F0 E608006C */ swc1 $f8, 0x006C($s0) ## 0000006C /* 03CE4 80AEE8F4 44809000 */ mtc1 $zero, $f18 ## $f18 = 0.00 /* 03CE8 80AEE8F8 240C001C */ addiu $t4, $zero, 0x001C ## $t4 = 0000001C /* 03CEC 80AEE8FC AE0C0264 */ sw $t4, 0x0264($s0) ## 00000264 -/* 03CF0 80AEE900 1000006C */ beq $zero, $zero, .L80AEEAB4 +/* 03CF0 80AEE900 1000006C */ beq $zero, $zero, .L80AEEAB4 /* 03CF4 80AEE904 E6120370 */ swc1 $f18, 0x0370($s0) ## 00000370 .L80AEE908: -/* 03CF8 80AEE908 0C2BB9B4 */ jal func_80AEE6D0 -/* 03CFC 80AEE90C 8FA5007C */ lw $a1, 0x007C($sp) -/* 03D00 80AEE910 10400004 */ beq $v0, $zero, .L80AEE924 -/* 03D04 80AEE914 8FAD007C */ lw $t5, 0x007C($sp) +/* 03CF8 80AEE908 0C2BB9B4 */ jal func_80AEE6D0 +/* 03CFC 80AEE90C 8FA5007C */ lw $a1, 0x007C($sp) +/* 03D00 80AEE910 10400004 */ beq $v0, $zero, .L80AEE924 +/* 03D04 80AEE914 8FAD007C */ lw $t5, 0x007C($sp) /* 03D08 80AEE918 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 -/* 03D0C 80AEE91C 10000065 */ beq $zero, $zero, .L80AEEAB4 +/* 03D0C 80AEE91C 10000065 */ beq $zero, $zero, .L80AEEAB4 /* 03D10 80AEE920 E6040370 */ swc1 $f4, 0x0370($s0) ## 00000370 .L80AEE924: /* 03D14 80AEE924 8DA21C44 */ lw $v0, 0x1C44($t5) ## 00001C44 /* 03D18 80AEE928 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 /* 03D1C 80AEE92C 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 /* 03D20 80AEE930 8C4E0680 */ lw $t6, 0x0680($v0) ## 00000680 -/* 03D24 80AEE934 000E78C0 */ sll $t7, $t6, 3 -/* 03D28 80AEE938 05E1004C */ bgez $t7, .L80AEEA6C +/* 03D24 80AEE934 000E78C0 */ sll $t7, $t6, 3 +/* 03D28 80AEE938 05E1004C */ bgez $t7, .L80AEEA6C /* 03D2C 80AEE93C 00000000 */ nop /* 03D30 80AEE940 C60A0370 */ lwc1 $f10, 0x0370($s0) ## 00000370 /* 03D34 80AEE944 44818000 */ mtc1 $at, $f16 ## $f16 = 1.00 /* 03D38 80AEE948 8E180264 */ lw $t8, 0x0264($s0) ## 00000264 /* 03D3C 80AEE94C 24010020 */ addiu $at, $zero, 0x0020 ## $at = 00000020 -/* 03D40 80AEE950 46105180 */ add.s $f6, $f10, $f16 +/* 03D40 80AEE950 46105180 */ add.s $f6, $f10, $f16 /* 03D44 80AEE954 26020370 */ addiu $v0, $s0, 0x0370 ## $v0 = 00000370 -/* 03D48 80AEE958 13010026 */ beq $t8, $at, .L80AEE9F4 +/* 03D48 80AEE958 13010026 */ beq $t8, $at, .L80AEE9F4 /* 03D4C 80AEE95C E6060370 */ swc1 $f6, 0x0370($s0) ## 00000370 /* 03D50 80AEE960 26020370 */ addiu $v0, $s0, 0x0370 ## $v0 = 00000370 /* 03D54 80AEE964 3C0141F0 */ lui $at, 0x41F0 ## $at = 41F00000 @@ -112,40 +112,40 @@ glabel func_80AEE7C4 /* 03D5C 80AEE96C C4520000 */ lwc1 $f18, 0x0000($v0) ## 00000370 /* 03D60 80AEE970 00002025 */ or $a0, $zero, $zero ## $a0 = 00000000 /* 03D64 80AEE974 24050003 */ addiu $a1, $zero, 0x0003 ## $a1 = 00000003 -/* 03D68 80AEE978 4612403C */ c.lt.s $f8, $f18 +/* 03D68 80AEE978 4612403C */ c.lt.s $f8, $f18 /* 03D6C 80AEE97C 00000000 */ nop -/* 03D70 80AEE980 4502004D */ bc1fl .L80AEEAB8 -/* 03D74 80AEE984 8FBF002C */ lw $ra, 0x002C($sp) +/* 03D70 80AEE980 4502004D */ bc1fl .L80AEEAB8 +/* 03D74 80AEE984 8FBF002C */ lw $ra, 0x002C($sp) /* 03D78 80AEE988 0C01DF64 */ jal Math_Rand_S16Offset - -/* 03D7C 80AEE98C AFA20034 */ sw $v0, 0x0034($sp) -/* 03D80 80AEE990 14400014 */ bne $v0, $zero, .L80AEE9E4 + +/* 03D7C 80AEE98C AFA20034 */ sw $v0, 0x0034($sp) +/* 03D80 80AEE990 14400014 */ bne $v0, $zero, .L80AEE9E4 /* 03D84 80AEE994 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 /* 03D88 80AEE998 0C028800 */ jal SkelAnime_GetFrameCount - + /* 03D8C 80AEE99C 24844350 */ addiu $a0, $a0, 0x4350 ## $a0 = 06004350 /* 03D90 80AEE9A0 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 03D94 80AEE9A4 3C01C100 */ lui $at, 0xC100 ## $at = C1000000 /* 03D98 80AEE9A8 44818000 */ mtc1 $at, $f16 ## $f16 = -8.00 -/* 03D9C 80AEE9AC 468022A0 */ cvt.s.w $f10, $f4 +/* 03D9C 80AEE9AC 468022A0 */ cvt.s.w $f10, $f4 /* 03DA0 80AEE9B0 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 03DA4 80AEE9B4 24A54350 */ addiu $a1, $a1, 0x4350 ## $a1 = 06004350 /* 03DA8 80AEE9B8 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C /* 03DAC 80AEE9BC 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 03DB0 80AEE9C0 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 03DB4 80AEE9C4 E7AA0010 */ swc1 $f10, 0x0010($sp) -/* 03DB8 80AEE9C8 AFA00014 */ sw $zero, 0x0014($sp) -/* 03DBC 80AEE9CC 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 03DC0 80AEE9D0 E7B00018 */ swc1 $f16, 0x0018($sp) -/* 03DC4 80AEE9D4 0C2BB577 */ jal func_80AED5DC +/* 03DB4 80AEE9C4 E7AA0010 */ swc1 $f10, 0x0010($sp) +/* 03DB8 80AEE9C8 AFA00014 */ sw $zero, 0x0014($sp) +/* 03DBC 80AEE9CC 0C029468 */ jal SkelAnime_ChangeAnim + +/* 03DC0 80AEE9D0 E7B00018 */ swc1 $f16, 0x0018($sp) +/* 03DC4 80AEE9D4 0C2BB577 */ jal func_80AED5DC /* 03DC8 80AEE9D8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 03DCC 80AEE9DC 24190020 */ addiu $t9, $zero, 0x0020 ## $t9 = 00000020 /* 03DD0 80AEE9E0 AE190264 */ sw $t9, 0x0264($s0) ## 00000264 .L80AEE9E4: /* 03DD4 80AEE9E4 44803000 */ mtc1 $zero, $f6 ## $f6 = 0.00 -/* 03DD8 80AEE9E8 8FA80034 */ lw $t0, 0x0034($sp) -/* 03DDC 80AEE9EC 10000031 */ beq $zero, $zero, .L80AEEAB4 +/* 03DD8 80AEE9E8 8FA80034 */ lw $t0, 0x0034($sp) +/* 03DDC 80AEE9EC 10000031 */ beq $zero, $zero, .L80AEEAB4 /* 03DE0 80AEE9F0 E5060000 */ swc1 $f6, 0x0000($t0) ## 00000000 .L80AEE9F4: /* 03DE4 80AEE9F4 3C014248 */ lui $at, 0x4248 ## $at = 42480000 @@ -153,60 +153,60 @@ glabel func_80AEE7C4 /* 03DEC 80AEE9FC C4520000 */ lwc1 $f18, 0x0000($v0) ## 00000000 /* 03DF0 80AEEA00 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 /* 03DF4 80AEEA04 24846B9C */ addiu $a0, $a0, 0x6B9C ## $a0 = 06006B9C -/* 03DF8 80AEEA08 4612403C */ c.lt.s $f8, $f18 +/* 03DF8 80AEEA08 4612403C */ c.lt.s $f8, $f18 /* 03DFC 80AEEA0C 00000000 */ nop -/* 03E00 80AEEA10 45020029 */ bc1fl .L80AEEAB8 -/* 03E04 80AEEA14 8FBF002C */ lw $ra, 0x002C($sp) +/* 03E00 80AEEA10 45020029 */ bc1fl .L80AEEAB8 +/* 03E04 80AEEA14 8FBF002C */ lw $ra, 0x002C($sp) /* 03E08 80AEEA18 0C028800 */ jal SkelAnime_GetFrameCount - -/* 03E0C 80AEEA1C AFA20034 */ sw $v0, 0x0034($sp) + +/* 03E0C 80AEEA1C AFA20034 */ sw $v0, 0x0034($sp) /* 03E10 80AEEA20 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 03E14 80AEEA24 3C01C100 */ lui $at, 0xC100 ## $at = C1000000 /* 03E18 80AEEA28 44818000 */ mtc1 $at, $f16 ## $f16 = -8.00 -/* 03E1C 80AEEA2C 468022A0 */ cvt.s.w $f10, $f4 +/* 03E1C 80AEEA2C 468022A0 */ cvt.s.w $f10, $f4 /* 03E20 80AEEA30 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 03E24 80AEEA34 24A56B9C */ addiu $a1, $a1, 0x6B9C ## $a1 = 06006B9C /* 03E28 80AEEA38 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C /* 03E2C 80AEEA3C 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 03E30 80AEEA40 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 03E34 80AEEA44 E7AA0010 */ swc1 $f10, 0x0010($sp) -/* 03E38 80AEEA48 AFA00014 */ sw $zero, 0x0014($sp) -/* 03E3C 80AEEA4C 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 03E40 80AEEA50 E7B00018 */ swc1 $f16, 0x0018($sp) +/* 03E34 80AEEA44 E7AA0010 */ swc1 $f10, 0x0010($sp) +/* 03E38 80AEEA48 AFA00014 */ sw $zero, 0x0014($sp) +/* 03E3C 80AEEA4C 0C029468 */ jal SkelAnime_ChangeAnim + +/* 03E40 80AEEA50 E7B00018 */ swc1 $f16, 0x0018($sp) /* 03E44 80AEEA54 2409001F */ addiu $t1, $zero, 0x001F ## $t1 = 0000001F /* 03E48 80AEEA58 AE090264 */ sw $t1, 0x0264($s0) ## 00000264 -/* 03E4C 80AEEA5C 8FAA0034 */ lw $t2, 0x0034($sp) +/* 03E4C 80AEEA5C 8FAA0034 */ lw $t2, 0x0034($sp) /* 03E50 80AEEA60 44803000 */ mtc1 $zero, $f6 ## $f6 = 0.00 -/* 03E54 80AEEA64 10000013 */ beq $zero, $zero, .L80AEEAB4 +/* 03E54 80AEEA64 10000013 */ beq $zero, $zero, .L80AEEAB4 /* 03E58 80AEEA68 E5460000 */ swc1 $f6, 0x0000($t2) ## 00000000 .L80AEEA6C: /* 03E5C 80AEEA6C 0C028800 */ jal SkelAnime_GetFrameCount - + /* 03E60 80AEEA70 24846B9C */ addiu $a0, $a0, 0x6B9C ## $a0 = 00006B9C /* 03E64 80AEEA74 44824000 */ mtc1 $v0, $f8 ## $f8 = 0.00 /* 03E68 80AEEA78 3C01C100 */ lui $at, 0xC100 ## $at = C1000000 /* 03E6C 80AEEA7C 44812000 */ mtc1 $at, $f4 ## $f4 = -8.00 -/* 03E70 80AEEA80 468044A0 */ cvt.s.w $f18, $f8 +/* 03E70 80AEEA80 468044A0 */ cvt.s.w $f18, $f8 /* 03E74 80AEEA84 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 03E78 80AEEA88 24A56B9C */ addiu $a1, $a1, 0x6B9C ## $a1 = 06006B9C /* 03E7C 80AEEA8C 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C /* 03E80 80AEEA90 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 03E84 80AEEA94 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 03E88 80AEEA98 E7B20010 */ swc1 $f18, 0x0010($sp) -/* 03E8C 80AEEA9C AFA00014 */ sw $zero, 0x0014($sp) -/* 03E90 80AEEAA0 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 03E94 80AEEAA4 E7A40018 */ swc1 $f4, 0x0018($sp) +/* 03E88 80AEEA98 E7B20010 */ swc1 $f18, 0x0010($sp) +/* 03E8C 80AEEA9C AFA00014 */ sw $zero, 0x0014($sp) +/* 03E90 80AEEAA0 0C029468 */ jal SkelAnime_ChangeAnim + +/* 03E94 80AEEAA4 E7A40018 */ swc1 $f4, 0x0018($sp) /* 03E98 80AEEAA8 44805000 */ mtc1 $zero, $f10 ## $f10 = 0.00 /* 03E9C 80AEEAAC 00000000 */ nop /* 03EA0 80AEEAB0 E60A0370 */ swc1 $f10, 0x0370($s0) ## 00000370 .L80AEEAB4: -/* 03EA4 80AEEAB4 8FBF002C */ lw $ra, 0x002C($sp) +/* 03EA4 80AEEAB4 8FBF002C */ lw $ra, 0x002C($sp) .L80AEEAB8: -/* 03EA8 80AEEAB8 8FB00028 */ lw $s0, 0x0028($sp) +/* 03EA8 80AEEAB8 8FB00028 */ lw $s0, 0x0028($sp) /* 03EAC 80AEEABC 27BD0078 */ addiu $sp, $sp, 0x0078 ## $sp = 00000000 -/* 03EB0 80AEEAC0 03E00008 */ jr $ra +/* 03EB0 80AEEAC0 03E00008 */ jr $ra /* 03EB4 80AEEAC4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEF0BC.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEF0BC.s index 61b3652e72..769502fbbb 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEF0BC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEF0BC.s @@ -2,51 +2,51 @@ glabel func_80AEF0BC /* 044AC 80AEF0BC 3C0E8016 */ lui $t6, 0x8016 ## $t6 = 80160000 /* 044B0 80AEF0C0 95CEF580 */ lhu $t6, -0x0A80($t6) ## 8015F580 /* 044B4 80AEF0C4 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 044B8 80AEF0C8 AFBF0024 */ sw $ra, 0x0024($sp) +/* 044B8 80AEF0C8 AFBF0024 */ sw $ra, 0x0024($sp) /* 044BC 80AEF0CC 31CF0004 */ andi $t7, $t6, 0x0004 ## $t7 = 00000000 -/* 044C0 80AEF0D0 AFA40028 */ sw $a0, 0x0028($sp) -/* 044C4 80AEF0D4 11E00021 */ beq $t7, $zero, .L80AEF15C -/* 044C8 80AEF0D8 AFA5002C */ sw $a1, 0x002C($sp) +/* 044C0 80AEF0D0 AFA40028 */ sw $a0, 0x0028($sp) +/* 044C4 80AEF0D4 11E00021 */ beq $t7, $zero, .L80AEF15C +/* 044C8 80AEF0D8 AFA5002C */ sw $a1, 0x002C($sp) /* 044CC 80AEF0DC 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 /* 044D0 80AEF0E0 0C028800 */ jal SkelAnime_GetFrameCount - + /* 044D4 80AEF0E4 24847534 */ addiu $a0, $a0, 0x7534 ## $a0 = 06007534 /* 044D8 80AEF0E8 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 044DC 80AEF0EC 3C01C100 */ lui $at, 0xC100 ## $at = C1000000 -/* 044E0 80AEF0F0 8FA30028 */ lw $v1, 0x0028($sp) -/* 044E4 80AEF0F4 468021A0 */ cvt.s.w $f6, $f4 +/* 044E0 80AEF0F0 8FA30028 */ lw $v1, 0x0028($sp) +/* 044E4 80AEF0F4 468021A0 */ cvt.s.w $f6, $f4 /* 044E8 80AEF0F8 44814000 */ mtc1 $at, $f8 ## $f8 = -8.00 /* 044EC 80AEF0FC 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 044F0 80AEF100 24180002 */ addiu $t8, $zero, 0x0002 ## $t8 = 00000002 -/* 044F4 80AEF104 AFB80014 */ sw $t8, 0x0014($sp) +/* 044F4 80AEF104 AFB80014 */ sw $t8, 0x0014($sp) /* 044F8 80AEF108 24A57534 */ addiu $a1, $a1, 0x7534 ## $a1 = 06007534 -/* 044FC 80AEF10C E7A60010 */ swc1 $f6, 0x0010($sp) +/* 044FC 80AEF10C E7A60010 */ swc1 $f6, 0x0010($sp) /* 04500 80AEF110 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 04504 80AEF114 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 /* 04508 80AEF118 2464014C */ addiu $a0, $v1, 0x014C ## $a0 = 0000014C -/* 0450C 80AEF11C 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 04510 80AEF120 E7A80018 */ swc1 $f8, 0x0018($sp) -/* 04514 80AEF124 8FA8002C */ lw $t0, 0x002C($sp) -/* 04518 80AEF128 8FA30028 */ lw $v1, 0x0028($sp) +/* 0450C 80AEF11C 0C029468 */ jal SkelAnime_ChangeAnim + +/* 04510 80AEF120 E7A80018 */ swc1 $f8, 0x0018($sp) +/* 04514 80AEF124 8FA8002C */ lw $t0, 0x002C($sp) +/* 04518 80AEF128 8FA30028 */ lw $v1, 0x0028($sp) /* 0451C 80AEF12C 3C010001 */ lui $at, 0x0001 ## $at = 00010000 /* 04520 80AEF130 24190037 */ addiu $t9, $zero, 0x0037 ## $t9 = 00000037 -/* 04524 80AEF134 00280821 */ addu $at, $at, $t0 +/* 04524 80AEF134 00280821 */ addu $at, $at, $t0 /* 04528 80AEF138 A03903DC */ sb $t9, 0x03DC($at) ## 000103DC /* 0452C 80AEF13C 8C6A0004 */ lw $t2, 0x0004($v1) ## 00000004 /* 04530 80AEF140 2401FFF6 */ addiu $at, $zero, 0xFFF6 ## $at = FFFFFFF6 /* 04534 80AEF144 2409001A */ addiu $t1, $zero, 0x001A ## $t1 = 0000001A -/* 04538 80AEF148 01415824 */ and $t3, $t2, $at +/* 04538 80AEF148 01415824 */ and $t3, $t2, $at /* 0453C 80AEF14C 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 /* 04540 80AEF150 AC690264 */ sw $t1, 0x0264($v1) ## 00000264 -/* 04544 80AEF154 10000002 */ beq $zero, $zero, .L80AEF160 +/* 04544 80AEF154 10000002 */ beq $zero, $zero, .L80AEF160 /* 04548 80AEF158 AC6B0004 */ sw $t3, 0x0004($v1) ## 00000004 .L80AEF15C: /* 0454C 80AEF15C 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 .L80AEF160: -/* 04550 80AEF160 8FBF0024 */ lw $ra, 0x0024($sp) +/* 04550 80AEF160 8FBF0024 */ lw $ra, 0x0024($sp) /* 04554 80AEF164 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 04558 80AEF168 03E00008 */ jr $ra +/* 04558 80AEF168 03E00008 */ jr $ra /* 0455C 80AEF16C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEF1F0.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEF1F0.s index 570acd0e0a..e5d2eb69b1 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEF1F0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEF1F0.s @@ -1,49 +1,49 @@ glabel func_80AEF1F0 /* 045E0 80AEF1F0 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 045E4 80AEF1F4 AFB00028 */ sw $s0, 0x0028($sp) +/* 045E4 80AEF1F4 AFB00028 */ sw $s0, 0x0028($sp) /* 045E8 80AEF1F8 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 045EC 80AEF1FC AFBF002C */ sw $ra, 0x002C($sp) -/* 045F0 80AEF200 10C00021 */ beq $a2, $zero, .L80AEF288 -/* 045F4 80AEF204 AFA50034 */ sw $a1, 0x0034($sp) +/* 045EC 80AEF1FC AFBF002C */ sw $ra, 0x002C($sp) +/* 045F0 80AEF200 10C00021 */ beq $a2, $zero, .L80AEF288 +/* 045F4 80AEF204 AFA50034 */ sw $a1, 0x0034($sp) /* 045F8 80AEF208 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 /* 045FC 80AEF20C 0C028800 */ jal SkelAnime_GetFrameCount - + /* 04600 80AEF210 24846B9C */ addiu $a0, $a0, 0x6B9C ## $a0 = 06006B9C /* 04604 80AEF214 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 04608 80AEF218 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 /* 0460C 80AEF21C 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 04610 80AEF220 468021A0 */ cvt.s.w $f6, $f4 -/* 04614 80AEF224 44070000 */ mfc1 $a3, $f0 +/* 04610 80AEF220 468021A0 */ cvt.s.w $f6, $f4 +/* 04614 80AEF224 44070000 */ mfc1 $a3, $f0 /* 04618 80AEF228 24A56B9C */ addiu $a1, $a1, 0x6B9C ## $a1 = 06006B9C /* 0461C 80AEF22C 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C /* 04620 80AEF230 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 04624 80AEF234 AFA00014 */ sw $zero, 0x0014($sp) -/* 04628 80AEF238 E7A60010 */ swc1 $f6, 0x0010($sp) -/* 0462C 80AEF23C 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 04630 80AEF240 E7A00018 */ swc1 $f0, 0x0018($sp) -/* 04634 80AEF244 0C041B33 */ jal func_80106CCC -/* 04638 80AEF248 8FA40034 */ lw $a0, 0x0034($sp) +/* 04624 80AEF234 AFA00014 */ sw $zero, 0x0014($sp) +/* 04628 80AEF238 E7A60010 */ swc1 $f6, 0x0010($sp) +/* 0462C 80AEF23C 0C029468 */ jal SkelAnime_ChangeAnim + +/* 04630 80AEF240 E7A00018 */ swc1 $f0, 0x0018($sp) +/* 04634 80AEF244 0C041B33 */ jal func_80106CCC +/* 04638 80AEF248 8FA40034 */ lw $a0, 0x0034($sp) /* 0463C 80AEF24C 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 /* 04640 80AEF250 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 /* 04644 80AEF254 944E0F20 */ lhu $t6, 0x0F20($v0) ## 8015F580 /* 04648 80AEF258 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0464C 80AEF25C 8FA50034 */ lw $a1, 0x0034($sp) +/* 0464C 80AEF25C 8FA50034 */ lw $a1, 0x0034($sp) /* 04650 80AEF260 35CF0008 */ ori $t7, $t6, 0x0008 ## $t7 = 00000008 -/* 04654 80AEF264 0C2BB5B7 */ jal func_80AED6DC +/* 04654 80AEF264 0C2BB5B7 */ jal func_80AED6DC /* 04658 80AEF268 A44F0F20 */ sh $t7, 0x0F20($v0) ## 8015F580 /* 0465C 80AEF26C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 04660 80AEF270 0C00BD60 */ jal func_8002F580 -/* 04664 80AEF274 8FA50034 */ lw $a1, 0x0034($sp) +/* 04660 80AEF270 0C00BD60 */ jal func_8002F580 +/* 04664 80AEF274 8FA50034 */ lw $a1, 0x0034($sp) /* 04668 80AEF278 2418001B */ addiu $t8, $zero, 0x001B ## $t8 = 0000001B /* 0466C 80AEF27C AE180264 */ sw $t8, 0x0264($s0) ## 00000264 -/* 04670 80AEF280 0C2BAB76 */ jal func_80AEADD8 +/* 04670 80AEF280 0C2BAB76 */ jal func_80AEADD8 /* 04674 80AEF284 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 .L80AEF288: -/* 04678 80AEF288 8FBF002C */ lw $ra, 0x002C($sp) -/* 0467C 80AEF28C 8FB00028 */ lw $s0, 0x0028($sp) +/* 04678 80AEF288 8FBF002C */ lw $ra, 0x002C($sp) +/* 0467C 80AEF28C 8FB00028 */ lw $s0, 0x0028($sp) /* 04680 80AEF290 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 04684 80AEF294 03E00008 */ jr $ra +/* 04684 80AEF294 03E00008 */ jr $ra /* 04688 80AEF298 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEF624.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEF624.s index b411936825..e910cca45b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEF624.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEF624.s @@ -1,42 +1,42 @@ glabel func_80AEF624 /* 04A14 80AEF624 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 04A18 80AEF628 AFB00028 */ sw $s0, 0x0028($sp) +/* 04A18 80AEF628 AFB00028 */ sw $s0, 0x0028($sp) /* 04A1C 80AEF62C 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 04A20 80AEF630 AFBF002C */ sw $ra, 0x002C($sp) -/* 04A24 80AEF634 AFA50034 */ sw $a1, 0x0034($sp) +/* 04A20 80AEF630 AFBF002C */ sw $ra, 0x002C($sp) +/* 04A24 80AEF634 AFA50034 */ sw $a1, 0x0034($sp) /* 04A28 80AEF638 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 /* 04A2C 80AEF63C 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 -/* 04A30 80AEF640 0C2BABF8 */ jal func_80AEAFE0 +/* 04A30 80AEF640 0C2BABF8 */ jal func_80AEAFE0 /* 04A34 80AEF644 24060003 */ addiu $a2, $zero, 0x0003 ## $a2 = 00000003 -/* 04A38 80AEF648 10400032 */ beq $v0, $zero, .L80AEF714 +/* 04A38 80AEF648 10400032 */ beq $v0, $zero, .L80AEF714 /* 04A3C 80AEF64C 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 /* 04A40 80AEF650 0C028800 */ jal SkelAnime_GetFrameCount - + /* 04A44 80AEF654 248463F4 */ addiu $a0, $a0, 0x63F4 ## $a0 = 060063F4 -/* 04A48 80AEF658 8FAE0034 */ lw $t6, 0x0034($sp) +/* 04A48 80AEF658 8FAE0034 */ lw $t6, 0x0034($sp) /* 04A4C 80AEF65C 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 /* 04A50 80AEF660 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 04A54 80AEF664 8DC81D98 */ lw $t0, 0x1D98($t6) ## 00001D98 /* 04A58 80AEF668 24090002 */ addiu $t1, $zero, 0x0002 ## $t1 = 00000002 -/* 04A5C 80AEF66C 44070000 */ mfc1 $a3, $f0 +/* 04A5C 80AEF66C 44070000 */ mfc1 $a3, $f0 /* 04A60 80AEF670 8D0F000C */ lw $t7, 0x000C($t0) ## 0000000C /* 04A64 80AEF674 24A563F4 */ addiu $a1, $a1, 0x63F4 ## $a1 = 060063F4 /* 04A68 80AEF678 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C /* 04A6C 80AEF67C 448F2000 */ mtc1 $t7, $f4 ## $f4 = 0.00 /* 04A70 80AEF680 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 04A74 80AEF684 468021A0 */ cvt.s.w $f6, $f4 +/* 04A74 80AEF684 468021A0 */ cvt.s.w $f6, $f4 /* 04A78 80AEF688 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 04A7C 80AEF68C E6060024 */ swc1 $f6, 0x0024($s0) ## 00000024 /* 04A80 80AEF690 8D180010 */ lw $t8, 0x0010($t0) ## 00000010 -/* 04A84 80AEF694 468021A0 */ cvt.s.w $f6, $f4 +/* 04A84 80AEF694 468021A0 */ cvt.s.w $f6, $f4 /* 04A88 80AEF698 44984000 */ mtc1 $t8, $f8 ## $f8 = 0.00 /* 04A8C 80AEF69C 00000000 */ nop -/* 04A90 80AEF6A0 468042A0 */ cvt.s.w $f10, $f8 +/* 04A90 80AEF6A0 468042A0 */ cvt.s.w $f10, $f8 /* 04A94 80AEF6A4 E60A0028 */ swc1 $f10, 0x0028($s0) ## 00000028 /* 04A98 80AEF6A8 8D190014 */ lw $t9, 0x0014($t0) ## 00000014 /* 04A9C 80AEF6AC 44998000 */ mtc1 $t9, $f16 ## $f16 = 0.00 /* 04AA0 80AEF6B0 00000000 */ nop -/* 04AA4 80AEF6B4 468084A0 */ cvt.s.w $f18, $f16 +/* 04AA4 80AEF6B4 468084A0 */ cvt.s.w $f18, $f16 /* 04AA8 80AEF6B8 E612002C */ swc1 $f18, 0x002C($s0) ## 0000002C /* 04AAC 80AEF6BC 85030006 */ lh $v1, 0x0006($t0) ## 00000006 /* 04AB0 80AEF6C0 A60300B4 */ sh $v1, 0x00B4($s0) ## 000000B4 @@ -47,14 +47,14 @@ glabel func_80AEF624 /* 04AC4 80AEF6D4 8503000A */ lh $v1, 0x000A($t0) ## 0000000A /* 04AC8 80AEF6D8 A60300B8 */ sh $v1, 0x00B8($s0) ## 000000B8 /* 04ACC 80AEF6DC A6030034 */ sh $v1, 0x0034($s0) ## 00000034 -/* 04AD0 80AEF6E0 AFA90014 */ sw $t1, 0x0014($sp) -/* 04AD4 80AEF6E4 E7A60010 */ swc1 $f6, 0x0010($sp) -/* 04AD8 80AEF6E8 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 04ADC 80AEF6EC E7A00018 */ swc1 $f0, 0x0018($sp) +/* 04AD0 80AEF6E0 AFA90014 */ sw $t1, 0x0014($sp) +/* 04AD4 80AEF6E4 E7A60010 */ swc1 $f6, 0x0010($sp) +/* 04AD8 80AEF6E8 0C029468 */ jal SkelAnime_ChangeAnim + +/* 04ADC 80AEF6EC E7A00018 */ swc1 $f0, 0x0018($sp) /* 04AE0 80AEF6F0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 04AE4 80AEF6F4 0C2BACE9 */ jal func_80AEB3A4 -/* 04AE8 80AEF6F8 8FA50034 */ lw $a1, 0x0034($sp) +/* 04AE4 80AEF6F4 0C2BACE9 */ jal func_80AEB3A4 +/* 04AE8 80AEF6F8 8FA50034 */ lw $a1, 0x0034($sp) /* 04AEC 80AEF6FC 240A0025 */ addiu $t2, $zero, 0x0025 ## $t2 = 00000025 /* 04AF0 80AEF700 240B0001 */ addiu $t3, $zero, 0x0001 ## $t3 = 00000001 /* 04AF4 80AEF704 240C00FF */ addiu $t4, $zero, 0x00FF ## $t4 = 000000FF @@ -62,10 +62,10 @@ glabel func_80AEF624 /* 04AFC 80AEF70C AE0B0268 */ sw $t3, 0x0268($s0) ## 00000268 /* 04B00 80AEF710 A20C00C8 */ sb $t4, 0x00C8($s0) ## 000000C8 .L80AEF714: -/* 04B04 80AEF714 8FBF002C */ lw $ra, 0x002C($sp) -/* 04B08 80AEF718 8FB00028 */ lw $s0, 0x0028($sp) +/* 04B04 80AEF714 8FBF002C */ lw $ra, 0x002C($sp) +/* 04B08 80AEF718 8FB00028 */ lw $s0, 0x0028($sp) /* 04B0C 80AEF71C 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 04B10 80AEF720 03E00008 */ jr $ra +/* 04B10 80AEF720 03E00008 */ jr $ra /* 04B14 80AEF724 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEF728.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEF728.s index bcd67948a2..68255964bc 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEF728.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEF728.s @@ -1,35 +1,35 @@ glabel func_80AEF728 /* 04B18 80AEF728 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 04B1C 80AEF72C AFBF0024 */ sw $ra, 0x0024($sp) -/* 04B20 80AEF730 10A00016 */ beq $a1, $zero, .L80AEF78C -/* 04B24 80AEF734 AFA40028 */ sw $a0, 0x0028($sp) +/* 04B1C 80AEF72C AFBF0024 */ sw $ra, 0x0024($sp) +/* 04B20 80AEF730 10A00016 */ beq $a1, $zero, .L80AEF78C +/* 04B24 80AEF734 AFA40028 */ sw $a0, 0x0028($sp) /* 04B28 80AEF738 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 /* 04B2C 80AEF73C 0C028800 */ jal SkelAnime_GetFrameCount - + /* 04B30 80AEF740 24843608 */ addiu $a0, $a0, 0x3608 ## $a0 = 06003608 /* 04B34 80AEF744 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 04B38 80AEF748 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 04B3C 80AEF74C 8FA40028 */ lw $a0, 0x0028($sp) -/* 04B40 80AEF750 468021A0 */ cvt.s.w $f6, $f4 +/* 04B3C 80AEF74C 8FA40028 */ lw $a0, 0x0028($sp) +/* 04B40 80AEF750 468021A0 */ cvt.s.w $f6, $f4 /* 04B44 80AEF754 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 04B48 80AEF758 44070000 */ mfc1 $a3, $f0 +/* 04B48 80AEF758 44070000 */ mfc1 $a3, $f0 /* 04B4C 80AEF75C 24A53608 */ addiu $a1, $a1, 0x3608 ## $a1 = 06003608 /* 04B50 80AEF760 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 04B54 80AEF764 AFA00014 */ sw $zero, 0x0014($sp) -/* 04B58 80AEF768 E7A60010 */ swc1 $f6, 0x0010($sp) +/* 04B54 80AEF764 AFA00014 */ sw $zero, 0x0014($sp) +/* 04B58 80AEF768 E7A60010 */ swc1 $f6, 0x0010($sp) /* 04B5C 80AEF76C 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 04B60 80AEF770 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 04B64 80AEF774 E7A00018 */ swc1 $f0, 0x0018($sp) -/* 04B68 80AEF778 0C2BACF3 */ jal func_80AEB3CC -/* 04B6C 80AEF77C 8FA40028 */ lw $a0, 0x0028($sp) -/* 04B70 80AEF780 8FAF0028 */ lw $t7, 0x0028($sp) +/* 04B60 80AEF770 0C029468 */ jal SkelAnime_ChangeAnim + +/* 04B64 80AEF774 E7A00018 */ swc1 $f0, 0x0018($sp) +/* 04B68 80AEF778 0C2BACF3 */ jal func_80AEB3CC +/* 04B6C 80AEF77C 8FA40028 */ lw $a0, 0x0028($sp) +/* 04B70 80AEF780 8FAF0028 */ lw $t7, 0x0028($sp) /* 04B74 80AEF784 240E0026 */ addiu $t6, $zero, 0x0026 ## $t6 = 00000026 /* 04B78 80AEF788 ADEE0264 */ sw $t6, 0x0264($t7) ## 00000264 .L80AEF78C: -/* 04B7C 80AEF78C 8FBF0024 */ lw $ra, 0x0024($sp) +/* 04B7C 80AEF78C 8FBF0024 */ lw $ra, 0x0024($sp) /* 04B80 80AEF790 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 04B84 80AEF794 03E00008 */ jr $ra +/* 04B84 80AEF794 03E00008 */ jr $ra /* 04B88 80AEF798 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEF79C.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEF79C.s index 3375938157..f2ae45c41e 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEF79C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEF79C.s @@ -1,39 +1,39 @@ glabel func_80AEF79C /* 04B8C 80AEF79C 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 04B90 80AEF7A0 AFA40028 */ sw $a0, 0x0028($sp) -/* 04B94 80AEF7A4 AFBF0024 */ sw $ra, 0x0024($sp) +/* 04B90 80AEF7A0 AFA40028 */ sw $a0, 0x0028($sp) +/* 04B94 80AEF7A4 AFBF0024 */ sw $ra, 0x0024($sp) /* 04B98 80AEF7A8 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 /* 04B9C 80AEF7AC 24050002 */ addiu $a1, $zero, 0x0002 ## $a1 = 00000002 -/* 04BA0 80AEF7B0 0C2BABF8 */ jal func_80AEAFE0 +/* 04BA0 80AEF7B0 0C2BABF8 */ jal func_80AEAFE0 /* 04BA4 80AEF7B4 24060003 */ addiu $a2, $zero, 0x0003 ## $a2 = 00000003 -/* 04BA8 80AEF7B8 10400015 */ beq $v0, $zero, .L80AEF810 +/* 04BA8 80AEF7B8 10400015 */ beq $v0, $zero, .L80AEF810 /* 04BAC 80AEF7BC 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 /* 04BB0 80AEF7C0 0C028800 */ jal SkelAnime_GetFrameCount - + /* 04BB4 80AEF7C4 24842EC0 */ addiu $a0, $a0, 0x2EC0 ## $a0 = 06002EC0 /* 04BB8 80AEF7C8 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 04BBC 80AEF7CC 3C01C100 */ lui $at, 0xC100 ## $at = C1000000 /* 04BC0 80AEF7D0 44814000 */ mtc1 $at, $f8 ## $f8 = -8.00 -/* 04BC4 80AEF7D4 468021A0 */ cvt.s.w $f6, $f4 -/* 04BC8 80AEF7D8 8FA40028 */ lw $a0, 0x0028($sp) +/* 04BC4 80AEF7D4 468021A0 */ cvt.s.w $f6, $f4 +/* 04BC8 80AEF7D8 8FA40028 */ lw $a0, 0x0028($sp) /* 04BCC 80AEF7DC 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 04BD0 80AEF7E0 240E0002 */ addiu $t6, $zero, 0x0002 ## $t6 = 00000002 -/* 04BD4 80AEF7E4 AFAE0014 */ sw $t6, 0x0014($sp) +/* 04BD4 80AEF7E4 AFAE0014 */ sw $t6, 0x0014($sp) /* 04BD8 80AEF7E8 24A52EC0 */ addiu $a1, $a1, 0x2EC0 ## $a1 = 06002EC0 -/* 04BDC 80AEF7EC E7A60010 */ swc1 $f6, 0x0010($sp) +/* 04BDC 80AEF7EC E7A60010 */ swc1 $f6, 0x0010($sp) /* 04BE0 80AEF7F0 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 04BE4 80AEF7F4 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 04BE8 80AEF7F8 E7A80018 */ swc1 $f8, 0x0018($sp) -/* 04BEC 80AEF7FC 0C029468 */ jal SkelAnime_ChangeAnimation - +/* 04BE8 80AEF7F8 E7A80018 */ swc1 $f8, 0x0018($sp) +/* 04BEC 80AEF7FC 0C029468 */ jal SkelAnime_ChangeAnim + /* 04BF0 80AEF800 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 04BF4 80AEF804 8FB80028 */ lw $t8, 0x0028($sp) +/* 04BF4 80AEF804 8FB80028 */ lw $t8, 0x0028($sp) /* 04BF8 80AEF808 240F0027 */ addiu $t7, $zero, 0x0027 ## $t7 = 00000027 /* 04BFC 80AEF80C AF0F0264 */ sw $t7, 0x0264($t8) ## 00000264 .L80AEF810: -/* 04C00 80AEF810 8FBF0024 */ lw $ra, 0x0024($sp) +/* 04C00 80AEF810 8FBF0024 */ lw $ra, 0x0024($sp) /* 04C04 80AEF814 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 04C08 80AEF818 03E00008 */ jr $ra +/* 04C08 80AEF818 03E00008 */ jr $ra /* 04C0C 80AEF81C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEF820.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEF820.s index 4d2320f170..f8e6a2f7b3 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEF820.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEF820.s @@ -1,34 +1,34 @@ glabel func_80AEF820 /* 04C10 80AEF820 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 04C14 80AEF824 AFBF0024 */ sw $ra, 0x0024($sp) -/* 04C18 80AEF828 10A00015 */ beq $a1, $zero, .L80AEF880 -/* 04C1C 80AEF82C AFA40028 */ sw $a0, 0x0028($sp) +/* 04C14 80AEF824 AFBF0024 */ sw $ra, 0x0024($sp) +/* 04C18 80AEF828 10A00015 */ beq $a1, $zero, .L80AEF880 +/* 04C1C 80AEF82C AFA40028 */ sw $a0, 0x0028($sp) /* 04C20 80AEF830 3C040601 */ lui $a0, 0x0601 ## $a0 = 06010000 /* 04C24 80AEF834 0C028800 */ jal SkelAnime_GetFrameCount - + /* 04C28 80AEF838 248497B8 */ addiu $a0, $a0, 0x97B8 ## $a0 = 060097B8 /* 04C2C 80AEF83C 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 04C30 80AEF840 3C01C100 */ lui $at, 0xC100 ## $at = C1000000 /* 04C34 80AEF844 44814000 */ mtc1 $at, $f8 ## $f8 = -8.00 -/* 04C38 80AEF848 468021A0 */ cvt.s.w $f6, $f4 -/* 04C3C 80AEF84C 8FA40028 */ lw $a0, 0x0028($sp) +/* 04C38 80AEF848 468021A0 */ cvt.s.w $f6, $f4 +/* 04C3C 80AEF84C 8FA40028 */ lw $a0, 0x0028($sp) /* 04C40 80AEF850 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 /* 04C44 80AEF854 24A597B8 */ addiu $a1, $a1, 0x97B8 ## $a1 = 060097B8 /* 04C48 80AEF858 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 04C4C 80AEF85C 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 04C50 80AEF860 E7A60010 */ swc1 $f6, 0x0010($sp) -/* 04C54 80AEF864 AFA00014 */ sw $zero, 0x0014($sp) -/* 04C58 80AEF868 E7A80018 */ swc1 $f8, 0x0018($sp) -/* 04C5C 80AEF86C 0C029468 */ jal SkelAnime_ChangeAnimation - +/* 04C50 80AEF860 E7A60010 */ swc1 $f6, 0x0010($sp) +/* 04C54 80AEF864 AFA00014 */ sw $zero, 0x0014($sp) +/* 04C58 80AEF868 E7A80018 */ swc1 $f8, 0x0018($sp) +/* 04C5C 80AEF86C 0C029468 */ jal SkelAnime_ChangeAnim + /* 04C60 80AEF870 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 04C64 80AEF874 8FAF0028 */ lw $t7, 0x0028($sp) +/* 04C64 80AEF874 8FAF0028 */ lw $t7, 0x0028($sp) /* 04C68 80AEF878 240E0028 */ addiu $t6, $zero, 0x0028 ## $t6 = 00000028 /* 04C6C 80AEF87C ADEE0264 */ sw $t6, 0x0264($t7) ## 00000264 .L80AEF880: -/* 04C70 80AEF880 8FBF0024 */ lw $ra, 0x0024($sp) +/* 04C70 80AEF880 8FBF0024 */ lw $ra, 0x0024($sp) /* 04C74 80AEF884 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 04C78 80AEF888 03E00008 */ jr $ra +/* 04C78 80AEF888 03E00008 */ jr $ra /* 04C7C 80AEF88C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEFDC0.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEFDC0.s index c8b4e256b9..e74e673e1f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEFDC0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AEFDC0.s @@ -11,7 +11,7 @@ glabel func_80AEFDC0 /* 051D4 80AEFDE4 35CF0009 */ ori $t7, $t6, 0x0009 ## $t7 = 00000009 /* 051D8 80AEFDE8 ACCF0004 */ sw $t7, 0x0004($a2) ## 00000004 /* 051DC 80AEFDEC AFA60018 */ sw $a2, 0x0018($sp) -/* 051E0 80AEFDF0 0C01B0D8 */ jal func_8006C360 +/* 051E0 80AEFDF0 0C01B0D8 */ jal Text_GetFaceReaction /* 051E4 80AEFDF4 8FA4001C */ lw $a0, 0x001C($sp) /* 051E8 80AEFDF8 8FA60018 */ lw $a2, 0x0018($sp) /* 051EC 80AEFDFC 3058FFFF */ andi $t8, $v0, 0xFFFF ## $t8 = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AF0400.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AF0400.s index aa5a780532..cab71abb4a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AF0400.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AF0400.s @@ -1,51 +1,51 @@ glabel func_80AF0400 /* 057F0 80AF0400 27BDFF78 */ addiu $sp, $sp, 0xFF78 ## $sp = FFFFFF78 -/* 057F4 80AF0404 AFBF002C */ sw $ra, 0x002C($sp) -/* 057F8 80AF0408 AFB00028 */ sw $s0, 0x0028($sp) -/* 057FC 80AF040C AFA40088 */ sw $a0, 0x0088($sp) -/* 05800 80AF0410 AFA5008C */ sw $a1, 0x008C($sp) +/* 057F4 80AF0404 AFBF002C */ sw $ra, 0x002C($sp) +/* 057F8 80AF0408 AFB00028 */ sw $s0, 0x0028($sp) +/* 057FC 80AF040C AFA40088 */ sw $a0, 0x0088($sp) +/* 05800 80AF0410 AFA5008C */ sw $a1, 0x008C($sp) /* 05804 80AF0414 8482025C */ lh $v0, 0x025C($a0) ## 0000025C /* 05808 80AF0418 3C1880AF */ lui $t8, %hi(D_80AF0858) ## $t8 = 80AF0000 /* 0580C 80AF041C 3C0A80AF */ lui $t2, %hi(D_80AF0870) ## $t2 = 80AF0000 -/* 05810 80AF0420 00027880 */ sll $t7, $v0, 2 -/* 05814 80AF0424 030FC021 */ addu $t8, $t8, $t7 -/* 05818 80AF0428 8F180858 */ lw $t8, %lo(D_80AF0858)($t8) +/* 05810 80AF0420 00027880 */ sll $t7, $v0, 2 +/* 05814 80AF0424 030FC021 */ addu $t8, $t8, $t7 +/* 05818 80AF0428 8F180858 */ lw $t8, %lo(D_80AF0858)($t8) /* 0581C 80AF042C 3C0680AF */ lui $a2, %hi(D_80AF1B54) ## $a2 = 80AF0000 /* 05820 80AF0430 24C61B54 */ addiu $a2, $a2, %lo(D_80AF1B54) ## $a2 = 80AF1B54 -/* 05824 80AF0434 AFB80078 */ sw $t8, 0x0078($sp) +/* 05824 80AF0434 AFB80078 */ sw $t8, 0x0078($sp) /* 05828 80AF0438 84830260 */ lh $v1, 0x0260($a0) ## 00000260 /* 0582C 80AF043C 27A40054 */ addiu $a0, $sp, 0x0054 ## $a0 = FFFFFFCC /* 05830 80AF0440 24070502 */ addiu $a3, $zero, 0x0502 ## $a3 = 00000502 -/* 05834 80AF0444 0003C880 */ sll $t9, $v1, 2 -/* 05838 80AF0448 01595021 */ addu $t2, $t2, $t9 -/* 0583C 80AF044C 8D4A0870 */ lw $t2, %lo(D_80AF0870)($t2) -/* 05840 80AF0450 AFAA006C */ sw $t2, 0x006C($sp) +/* 05834 80AF0444 0003C880 */ sll $t9, $v1, 2 +/* 05838 80AF0448 01595021 */ addu $t2, $t2, $t9 +/* 0583C 80AF044C 8D4A0870 */ lw $t2, %lo(D_80AF0870)($t2) +/* 05840 80AF0450 AFAA006C */ sw $t2, 0x006C($sp) /* 05844 80AF0454 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 -/* 05848 80AF0458 0C031AB1 */ jal func_800C6AC4 +/* 05848 80AF0458 0C031AB1 */ jal Graph_OpenDisps /* 0584C 80AF045C 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 -/* 05850 80AF0460 8FAC008C */ lw $t4, 0x008C($sp) -/* 05854 80AF0464 0C024F46 */ jal func_80093D18 +/* 05850 80AF0460 8FAC008C */ lw $t4, 0x008C($sp) +/* 05854 80AF0464 0C024F46 */ jal func_80093D18 /* 05858 80AF0468 8D840000 */ lw $a0, 0x0000($t4) ## 00000000 -/* 0585C 80AF046C 8FA90078 */ lw $t1, 0x0078($sp) +/* 0585C 80AF046C 8FA90078 */ lw $t1, 0x0078($sp) /* 05860 80AF0470 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 /* 05864 80AF0474 3C078016 */ lui $a3, 0x8016 ## $a3 = 80160000 -/* 05868 80AF0478 0009C100 */ sll $t8, $t1, 4 -/* 0586C 80AF047C 00187702 */ srl $t6, $t8, 28 +/* 05868 80AF0478 0009C100 */ sll $t8, $t1, 4 +/* 0586C 80AF047C 00187702 */ srl $t6, $t8, 28 /* 05870 80AF0480 3C0FDB06 */ lui $t7, 0xDB06 ## $t7 = DB060000 /* 05874 80AF0484 244D0008 */ addiu $t5, $v0, 0x0008 ## $t5 = 00000008 /* 05878 80AF0488 AE0D02C0 */ sw $t5, 0x02C0($s0) ## 000002C0 /* 0587C 80AF048C 35EF0020 */ ori $t7, $t7, 0x0020 ## $t7 = DB060020 -/* 05880 80AF0490 000EC880 */ sll $t9, $t6, 2 +/* 05880 80AF0490 000EC880 */ sll $t9, $t6, 2 /* 05884 80AF0494 24E76FA8 */ addiu $a3, $a3, 0x6FA8 ## $a3 = 80166FA8 -/* 05888 80AF0498 00F92021 */ addu $a0, $a3, $t9 +/* 05888 80AF0498 00F92021 */ addu $a0, $a3, $t9 /* 0588C 80AF049C AC4F0000 */ sw $t7, 0x0000($v0) ## 00000000 /* 05890 80AF04A0 8C8A0000 */ lw $t2, 0x0000($a0) ## 00000000 /* 05894 80AF04A4 3C0800FF */ lui $t0, 0x00FF ## $t0 = 00FF0000 /* 05898 80AF04A8 3508FFFF */ ori $t0, $t0, 0xFFFF ## $t0 = 00FFFFFF -/* 0589C 80AF04AC 01282824 */ and $a1, $t1, $t0 +/* 0589C 80AF04AC 01282824 */ and $a1, $t1, $t0 /* 058A0 80AF04B0 3C068000 */ lui $a2, 0x8000 ## $a2 = 80000000 -/* 058A4 80AF04B4 01455821 */ addu $t3, $t2, $a1 -/* 058A8 80AF04B8 01666021 */ addu $t4, $t3, $a2 +/* 058A4 80AF04B4 01455821 */ addu $t3, $t2, $a1 +/* 058A8 80AF04B8 01666021 */ addu $t4, $t3, $a2 /* 058AC 80AF04BC AC4C0004 */ sw $t4, 0x0004($v0) ## 00000004 /* 058B0 80AF04C0 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 /* 058B4 80AF04C4 3C09DB06 */ lui $t1, 0xDB06 ## $t1 = DB060000 @@ -54,23 +54,23 @@ glabel func_80AF0400 /* 058C0 80AF04D0 AE0D02C0 */ sw $t5, 0x02C0($s0) ## 000002C0 /* 058C4 80AF04D4 AC490000 */ sw $t1, 0x0000($v0) ## 00000000 /* 058C8 80AF04D8 8C8F0000 */ lw $t7, 0x0000($a0) ## 00000000 -/* 058CC 80AF04DC 01E5C021 */ addu $t8, $t7, $a1 -/* 058D0 80AF04E0 03067021 */ addu $t6, $t8, $a2 +/* 058CC 80AF04DC 01E5C021 */ addu $t8, $t7, $a1 +/* 058D0 80AF04E0 03067021 */ addu $t6, $t8, $a2 /* 058D4 80AF04E4 AC4E0004 */ sw $t6, 0x0004($v0) ## 00000004 -/* 058D8 80AF04E8 8FA4006C */ lw $a0, 0x006C($sp) +/* 058D8 80AF04E8 8FA4006C */ lw $a0, 0x006C($sp) /* 058DC 80AF04EC 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 -/* 058E0 80AF04F0 00045100 */ sll $t2, $a0, 4 -/* 058E4 80AF04F4 000A5F02 */ srl $t3, $t2, 28 +/* 058E0 80AF04F0 00045100 */ sll $t2, $a0, 4 +/* 058E4 80AF04F4 000A5F02 */ srl $t3, $t2, 28 /* 058E8 80AF04F8 24590008 */ addiu $t9, $v0, 0x0008 ## $t9 = 00000008 /* 058EC 80AF04FC AE1902C0 */ sw $t9, 0x02C0($s0) ## 000002C0 -/* 058F0 80AF0500 000B6080 */ sll $t4, $t3, 2 -/* 058F4 80AF0504 00EC6821 */ addu $t5, $a3, $t4 +/* 058F0 80AF0500 000B6080 */ sll $t4, $t3, 2 +/* 058F4 80AF0504 00EC6821 */ addu $t5, $a3, $t4 /* 058F8 80AF0508 AC490000 */ sw $t1, 0x0000($v0) ## 00000000 /* 058FC 80AF050C 8DAF0000 */ lw $t7, 0x0000($t5) ## 00000008 -/* 05900 80AF0510 0088C024 */ and $t8, $a0, $t0 +/* 05900 80AF0510 0088C024 */ and $t8, $a0, $t0 /* 05904 80AF0514 240C00FF */ addiu $t4, $zero, 0x00FF ## $t4 = 000000FF -/* 05908 80AF0518 01F87021 */ addu $t6, $t7, $t8 -/* 0590C 80AF051C 01C6C821 */ addu $t9, $t6, $a2 +/* 05908 80AF0518 01F87021 */ addu $t6, $t7, $t8 +/* 0590C 80AF051C 01C6C821 */ addu $t9, $t6, $a2 /* 05910 80AF0520 AC590004 */ sw $t9, 0x0004($v0) ## 00000004 /* 05914 80AF0524 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 /* 05918 80AF0528 3C0BFB00 */ lui $t3, 0xFB00 ## $t3 = FB000000 @@ -87,7 +87,7 @@ glabel func_80AF0400 /* 05944 80AF0554 27186290 */ addiu $t8, $t8, 0x6290 ## $t8 = 80116290 /* 05948 80AF0558 AC580004 */ sw $t8, 0x0004($v0) ## 00000004 /* 0594C 80AF055C AC4F0000 */ sw $t7, 0x0000($v0) ## 00000000 -/* 05950 80AF0560 8FA30088 */ lw $v1, 0x0088($sp) +/* 05950 80AF0560 8FA30088 */ lw $v1, 0x0088($sp) /* 05954 80AF0564 3C1980AF */ lui $t9, %hi(func_80AF0368) ## $t9 = 80AF0000 /* 05958 80AF0568 3C0E80AF */ lui $t6, %hi(func_80AF02E8) ## $t6 = 80AF0000 /* 0595C 80AF056C 2462014C */ addiu $v0, $v1, 0x014C ## $v0 = 0000014C @@ -96,25 +96,25 @@ glabel func_80AF0400 /* 05968 80AF0578 90470002 */ lbu $a3, 0x0002($v0) ## 0000014E /* 0596C 80AF057C 25CE02E8 */ addiu $t6, $t6, %lo(func_80AF02E8) ## $t6 = 80AF02E8 /* 05970 80AF0580 27390368 */ addiu $t9, $t9, %lo(func_80AF0368) ## $t9 = 80AF0368 -/* 05974 80AF0584 AFB90014 */ sw $t9, 0x0014($sp) -/* 05978 80AF0588 AFAE0010 */ sw $t6, 0x0010($sp) -/* 0597C 80AF058C AFA30018 */ sw $v1, 0x0018($sp) +/* 05974 80AF0584 AFB90014 */ sw $t9, 0x0014($sp) +/* 05978 80AF0588 AFAE0010 */ sw $t6, 0x0010($sp) +/* 0597C 80AF058C AFA30018 */ sw $v1, 0x0018($sp) /* 05980 80AF0590 8E0A02C0 */ lw $t2, 0x02C0($s0) ## 000002C0 -/* 05984 80AF0594 8FA4008C */ lw $a0, 0x008C($sp) -/* 05988 80AF0598 0C0289CF */ jal func_800A273C -/* 0598C 80AF059C AFAA001C */ sw $t2, 0x001C($sp) +/* 05984 80AF0594 8FA4008C */ lw $a0, 0x008C($sp) +/* 05988 80AF0598 0C0289CF */ jal SkelAnime_DrawSV2 +/* 0598C 80AF059C AFAA001C */ sw $t2, 0x001C($sp) /* 05990 80AF05A0 AE0202C0 */ sw $v0, 0x02C0($s0) ## 000002C0 -/* 05994 80AF05A4 8FAB008C */ lw $t3, 0x008C($sp) +/* 05994 80AF05A4 8FAB008C */ lw $t3, 0x008C($sp) /* 05998 80AF05A8 3C0680AF */ lui $a2, %hi(D_80AF1B64) ## $a2 = 80AF0000 /* 0599C 80AF05AC 24C61B64 */ addiu $a2, $a2, %lo(D_80AF1B64) ## $a2 = 80AF1B64 /* 059A0 80AF05B0 27A40054 */ addiu $a0, $sp, 0x0054 ## $a0 = FFFFFFCC /* 059A4 80AF05B4 2407051D */ addiu $a3, $zero, 0x051D ## $a3 = 0000051D -/* 059A8 80AF05B8 0C031AD5 */ jal func_800C6B54 +/* 059A8 80AF05B8 0C031AD5 */ jal Graph_CloseDisps /* 059AC 80AF05BC 8D650000 */ lw $a1, 0x0000($t3) ## 00000000 -/* 059B0 80AF05C0 8FBF002C */ lw $ra, 0x002C($sp) -/* 059B4 80AF05C4 8FB00028 */ lw $s0, 0x0028($sp) +/* 059B0 80AF05C0 8FBF002C */ lw $ra, 0x002C($sp) +/* 059B4 80AF05C4 8FB00028 */ lw $s0, 0x0028($sp) /* 059B8 80AF05C8 27BD0088 */ addiu $sp, $sp, 0x0088 ## $sp = 00000000 -/* 059BC 80AF05CC 03E00008 */ jr $ra +/* 059BC 80AF05CC 03E00008 */ jr $ra /* 059C0 80AF05D0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AF05D4.s b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AF05D4.s index 9a2c3bf76b..de3f7d17d1 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AF05D4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ru1/func_80AF05D4.s @@ -1,52 +1,52 @@ glabel func_80AF05D4 /* 059C4 80AF05D4 27BDFF78 */ addiu $sp, $sp, 0xFF78 ## $sp = FFFFFF78 -/* 059C8 80AF05D8 AFBF002C */ sw $ra, 0x002C($sp) -/* 059CC 80AF05DC AFB10028 */ sw $s1, 0x0028($sp) -/* 059D0 80AF05E0 AFB00024 */ sw $s0, 0x0024($sp) -/* 059D4 80AF05E4 AFA5008C */ sw $a1, 0x008C($sp) +/* 059C8 80AF05D8 AFBF002C */ sw $ra, 0x002C($sp) +/* 059CC 80AF05DC AFB10028 */ sw $s1, 0x0028($sp) +/* 059D0 80AF05E0 AFB00024 */ sw $s0, 0x0024($sp) +/* 059D4 80AF05E4 AFA5008C */ sw $a1, 0x008C($sp) /* 059D8 80AF05E8 8482025C */ lh $v0, 0x025C($a0) ## 0000025C /* 059DC 80AF05EC 3C0F80AF */ lui $t7, %hi(D_80AF0858) ## $t7 = 80AF0000 /* 059E0 80AF05F0 3C1980AF */ lui $t9, %hi(D_80AF0870) ## $t9 = 80AF0000 -/* 059E4 80AF05F4 00027080 */ sll $t6, $v0, 2 -/* 059E8 80AF05F8 01EE7821 */ addu $t7, $t7, $t6 -/* 059EC 80AF05FC 8DEF0858 */ lw $t7, %lo(D_80AF0858)($t7) +/* 059E4 80AF05F4 00027080 */ sll $t6, $v0, 2 +/* 059E8 80AF05F8 01EE7821 */ addu $t7, $t7, $t6 +/* 059EC 80AF05FC 8DEF0858 */ lw $t7, %lo(D_80AF0858)($t7) /* 059F0 80AF0600 00808825 */ or $s1, $a0, $zero ## $s1 = 00000000 /* 059F4 80AF0604 3C0680AF */ lui $a2, %hi(D_80AF1B74) ## $a2 = 80AF0000 -/* 059F8 80AF0608 AFAF0078 */ sw $t7, 0x0078($sp) +/* 059F8 80AF0608 AFAF0078 */ sw $t7, 0x0078($sp) /* 059FC 80AF060C 84830260 */ lh $v1, 0x0260($a0) ## 00000260 /* 05A00 80AF0610 27A40054 */ addiu $a0, $sp, 0x0054 ## $a0 = FFFFFFCC /* 05A04 80AF0614 24C61B74 */ addiu $a2, $a2, %lo(D_80AF1B74) ## $a2 = 80AF1B74 -/* 05A08 80AF0618 0003C080 */ sll $t8, $v1, 2 -/* 05A0C 80AF061C 0338C821 */ addu $t9, $t9, $t8 -/* 05A10 80AF0620 8F390870 */ lw $t9, %lo(D_80AF0870)($t9) +/* 05A08 80AF0618 0003C080 */ sll $t8, $v1, 2 +/* 05A0C 80AF061C 0338C821 */ addu $t9, $t9, $t8 +/* 05A10 80AF0620 8F390870 */ lw $t9, %lo(D_80AF0870)($t9) /* 05A14 80AF0624 2407052C */ addiu $a3, $zero, 0x052C ## $a3 = 0000052C -/* 05A18 80AF0628 AFB9006C */ sw $t9, 0x006C($sp) +/* 05A18 80AF0628 AFB9006C */ sw $t9, 0x006C($sp) /* 05A1C 80AF062C 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 -/* 05A20 80AF0630 0C031AB1 */ jal func_800C6AC4 +/* 05A20 80AF0630 0C031AB1 */ jal Graph_OpenDisps /* 05A24 80AF0634 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 -/* 05A28 80AF0638 8FAB008C */ lw $t3, 0x008C($sp) -/* 05A2C 80AF063C 0C024F61 */ jal func_80093D84 +/* 05A28 80AF0638 8FAB008C */ lw $t3, 0x008C($sp) +/* 05A2C 80AF063C 0C024F61 */ jal func_80093D84 /* 05A30 80AF0640 8D640000 */ lw $a0, 0x0000($t3) ## 00000000 -/* 05A34 80AF0644 8FA90078 */ lw $t1, 0x0078($sp) +/* 05A34 80AF0644 8FA90078 */ lw $t1, 0x0078($sp) /* 05A38 80AF0648 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 /* 05A3C 80AF064C 3C078016 */ lui $a3, 0x8016 ## $a3 = 80160000 -/* 05A40 80AF0650 00097100 */ sll $t6, $t1, 4 -/* 05A44 80AF0654 000E7F02 */ srl $t7, $t6, 28 +/* 05A40 80AF0650 00097100 */ sll $t6, $t1, 4 +/* 05A44 80AF0654 000E7F02 */ srl $t7, $t6, 28 /* 05A48 80AF0658 3C0DDB06 */ lui $t5, 0xDB06 ## $t5 = DB060000 /* 05A4C 80AF065C 244C0008 */ addiu $t4, $v0, 0x0008 ## $t4 = 00000008 /* 05A50 80AF0660 AE0C02D0 */ sw $t4, 0x02D0($s0) ## 000002D0 /* 05A54 80AF0664 35AD0020 */ ori $t5, $t5, 0x0020 ## $t5 = DB060020 -/* 05A58 80AF0668 000FC080 */ sll $t8, $t7, 2 +/* 05A58 80AF0668 000FC080 */ sll $t8, $t7, 2 /* 05A5C 80AF066C 24E76FA8 */ addiu $a3, $a3, 0x6FA8 ## $a3 = 80166FA8 -/* 05A60 80AF0670 00F82021 */ addu $a0, $a3, $t8 +/* 05A60 80AF0670 00F82021 */ addu $a0, $a3, $t8 /* 05A64 80AF0674 AC4D0000 */ sw $t5, 0x0000($v0) ## 00000000 /* 05A68 80AF0678 8C990000 */ lw $t9, 0x0000($a0) ## 00000000 /* 05A6C 80AF067C 3C0800FF */ lui $t0, 0x00FF ## $t0 = 00FF0000 /* 05A70 80AF0680 3508FFFF */ ori $t0, $t0, 0xFFFF ## $t0 = 00FFFFFF -/* 05A74 80AF0684 01282824 */ and $a1, $t1, $t0 +/* 05A74 80AF0684 01282824 */ and $a1, $t1, $t0 /* 05A78 80AF0688 3C068000 */ lui $a2, 0x8000 ## $a2 = 80000000 -/* 05A7C 80AF068C 03255021 */ addu $t2, $t9, $a1 -/* 05A80 80AF0690 01465821 */ addu $t3, $t2, $a2 +/* 05A7C 80AF068C 03255021 */ addu $t2, $t9, $a1 +/* 05A80 80AF0690 01465821 */ addu $t3, $t2, $a2 /* 05A84 80AF0694 AC4B0004 */ sw $t3, 0x0004($v0) ## 00000004 /* 05A88 80AF0698 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 /* 05A8C 80AF069C 3C09DB06 */ lui $t1, 0xDB06 ## $t1 = DB060000 @@ -55,23 +55,23 @@ glabel func_80AF05D4 /* 05A98 80AF06A8 AE0C02D0 */ sw $t4, 0x02D0($s0) ## 000002D0 /* 05A9C 80AF06AC AC490000 */ sw $t1, 0x0000($v0) ## 00000000 /* 05AA0 80AF06B0 8C8D0000 */ lw $t5, 0x0000($a0) ## 00000000 -/* 05AA4 80AF06B4 01A57021 */ addu $t6, $t5, $a1 -/* 05AA8 80AF06B8 01C67821 */ addu $t7, $t6, $a2 +/* 05AA4 80AF06B4 01A57021 */ addu $t6, $t5, $a1 +/* 05AA8 80AF06B8 01C67821 */ addu $t7, $t6, $a2 /* 05AAC 80AF06BC AC4F0004 */ sw $t7, 0x0004($v0) ## 00000004 -/* 05AB0 80AF06C0 8FA4006C */ lw $a0, 0x006C($sp) +/* 05AB0 80AF06C0 8FA4006C */ lw $a0, 0x006C($sp) /* 05AB4 80AF06C4 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 05AB8 80AF06C8 0004C900 */ sll $t9, $a0, 4 -/* 05ABC 80AF06CC 00195702 */ srl $t2, $t9, 28 +/* 05AB8 80AF06C8 0004C900 */ sll $t9, $a0, 4 +/* 05ABC 80AF06CC 00195702 */ srl $t2, $t9, 28 /* 05AC0 80AF06D0 24580008 */ addiu $t8, $v0, 0x0008 ## $t8 = 00000008 /* 05AC4 80AF06D4 AE1802D0 */ sw $t8, 0x02D0($s0) ## 000002D0 -/* 05AC8 80AF06D8 000A5880 */ sll $t3, $t2, 2 -/* 05ACC 80AF06DC 00EB6021 */ addu $t4, $a3, $t3 +/* 05AC8 80AF06D8 000A5880 */ sll $t3, $t2, 2 +/* 05ACC 80AF06DC 00EB6021 */ addu $t4, $a3, $t3 /* 05AD0 80AF06E0 AC490000 */ sw $t1, 0x0000($v0) ## 00000000 /* 05AD4 80AF06E4 8D8D0000 */ lw $t5, 0x0000($t4) ## 00000008 -/* 05AD8 80AF06E8 00887024 */ and $t6, $a0, $t0 +/* 05AD8 80AF06E8 00887024 */ and $t6, $a0, $t0 /* 05ADC 80AF06EC 3C0AFB00 */ lui $t2, 0xFB00 ## $t2 = FB000000 -/* 05AE0 80AF06F0 01AE7821 */ addu $t7, $t5, $t6 -/* 05AE4 80AF06F4 01E6C021 */ addu $t8, $t7, $a2 +/* 05AE0 80AF06F0 01AE7821 */ addu $t7, $t5, $t6 +/* 05AE4 80AF06F4 01E6C021 */ addu $t8, $t7, $a2 /* 05AE8 80AF06F8 AC580004 */ sw $t8, 0x0004($v0) ## 00000004 /* 05AEC 80AF06FC 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 /* 05AF0 80AF0700 3C0F8011 */ lui $t7, 0x8011 ## $t7 = 80110000 @@ -95,25 +95,25 @@ glabel func_80AF05D4 /* 05B38 80AF0748 8C450004 */ lw $a1, 0x0004($v0) ## 00000150 /* 05B3C 80AF074C 8C460020 */ lw $a2, 0x0020($v0) ## 0000016C /* 05B40 80AF0750 90470002 */ lbu $a3, 0x0002($v0) ## 0000014E -/* 05B44 80AF0754 AFB10018 */ sw $s1, 0x0018($sp) -/* 05B48 80AF0758 AFA00014 */ sw $zero, 0x0014($sp) -/* 05B4C 80AF075C AFB80010 */ sw $t8, 0x0010($sp) +/* 05B44 80AF0754 AFB10018 */ sw $s1, 0x0018($sp) +/* 05B48 80AF0758 AFA00014 */ sw $zero, 0x0014($sp) +/* 05B4C 80AF075C AFB80010 */ sw $t8, 0x0010($sp) /* 05B50 80AF0760 8E1902D0 */ lw $t9, 0x02D0($s0) ## 000002D0 -/* 05B54 80AF0764 8FA4008C */ lw $a0, 0x008C($sp) -/* 05B58 80AF0768 0C0289CF */ jal func_800A273C -/* 05B5C 80AF076C AFB9001C */ sw $t9, 0x001C($sp) +/* 05B54 80AF0764 8FA4008C */ lw $a0, 0x008C($sp) +/* 05B58 80AF0768 0C0289CF */ jal SkelAnime_DrawSV2 +/* 05B5C 80AF076C AFB9001C */ sw $t9, 0x001C($sp) /* 05B60 80AF0770 AE0202D0 */ sw $v0, 0x02D0($s0) ## 000002D0 -/* 05B64 80AF0774 8FAA008C */ lw $t2, 0x008C($sp) +/* 05B64 80AF0774 8FAA008C */ lw $t2, 0x008C($sp) /* 05B68 80AF0778 3C0680AF */ lui $a2, %hi(D_80AF1B84) ## $a2 = 80AF0000 /* 05B6C 80AF077C 24C61B84 */ addiu $a2, $a2, %lo(D_80AF1B84) ## $a2 = 80AF1B84 /* 05B70 80AF0780 27A40054 */ addiu $a0, $sp, 0x0054 ## $a0 = FFFFFFCC /* 05B74 80AF0784 24070549 */ addiu $a3, $zero, 0x0549 ## $a3 = 00000549 -/* 05B78 80AF0788 0C031AD5 */ jal func_800C6B54 +/* 05B78 80AF0788 0C031AD5 */ jal Graph_CloseDisps /* 05B7C 80AF078C 8D450000 */ lw $a1, 0x0000($t2) ## 00000000 -/* 05B80 80AF0790 8FBF002C */ lw $ra, 0x002C($sp) -/* 05B84 80AF0794 8FB00024 */ lw $s0, 0x0024($sp) -/* 05B88 80AF0798 8FB10028 */ lw $s1, 0x0028($sp) -/* 05B8C 80AF079C 03E00008 */ jr $ra +/* 05B80 80AF0790 8FBF002C */ lw $ra, 0x002C($sp) +/* 05B84 80AF0794 8FB00024 */ lw $s0, 0x0024($sp) +/* 05B88 80AF0798 8FB10028 */ lw $s1, 0x0028($sp) +/* 05B8C 80AF079C 03E00008 */ jr $ra /* 05B90 80AF07A0 27BD0088 */ addiu $sp, $sp, 0x0088 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru2/EnRu2_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Ru2/EnRu2_Destroy.s deleted file mode 100644 index 1ff0adf344..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru2/EnRu2_Destroy.s +++ /dev/null @@ -1,14 +0,0 @@ -glabel EnRu2_Destroy -/* 00090 80AF25E0 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00094 80AF25E4 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 -/* 00098 80AF25E8 AFBF0014 */ sw $ra, 0x0014($sp) -/* 0009C 80AF25EC 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 000A0 80AF25F0 0C0170EB */ jal ActorCollider_FreeCylinder - -/* 000A4 80AF25F4 24C502C8 */ addiu $a1, $a2, 0x02C8 ## $a1 = 000002C8 -/* 000A8 80AF25F8 8FBF0014 */ lw $ra, 0x0014($sp) -/* 000AC 80AF25FC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 000B0 80AF2600 03E00008 */ jr $ra -/* 000B4 80AF2604 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru2/EnRu2_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Ru2/EnRu2_Draw.s deleted file mode 100644 index f613af3182..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru2/EnRu2_Draw.s +++ /dev/null @@ -1,29 +0,0 @@ -glabel EnRu2_Draw -/* 01B34 80AF4084 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 01B38 80AF4088 AFBF0014 */ sw $ra, 0x0014($sp) -/* 01B3C 80AF408C 8C8202AC */ lw $v0, 0x02AC($a0) ## 000002AC -/* 01B40 80AF4090 04400008 */ bltz $v0, .L80AF40B4 -/* 01B44 80AF4094 28410003 */ slti $at, $v0, 0x0003 -/* 01B48 80AF4098 10200006 */ beq $at, $zero, .L80AF40B4 -/* 01B4C 80AF409C 00027080 */ sll $t6, $v0, 2 -/* 01B50 80AF40A0 3C0380AF */ lui $v1, %hi(D_80AF510C) ## $v1 = 80AF0000 -/* 01B54 80AF40A4 006E1821 */ addu $v1, $v1, $t6 -/* 01B58 80AF40A8 8C63510C */ lw $v1, %lo(D_80AF510C)($v1) -/* 01B5C 80AF40AC 14600006 */ bne $v1, $zero, .L80AF40C8 -/* 01B60 80AF40B0 00000000 */ nop -.L80AF40B4: -/* 01B64 80AF40B4 3C0480AF */ lui $a0, %hi(D_80AF5244) ## $a0 = 80AF0000 -/* 01B68 80AF40B8 0C00084C */ jal osSyncPrintf - -/* 01B6C 80AF40BC 24845244 */ addiu $a0, $a0, %lo(D_80AF5244) ## $a0 = 80AF5244 -/* 01B70 80AF40C0 10000004 */ beq $zero, $zero, .L80AF40D4 -/* 01B74 80AF40C4 8FBF0014 */ lw $ra, 0x0014($sp) -.L80AF40C8: -/* 01B78 80AF40C8 0060F809 */ jalr $ra, $v1 -/* 01B7C 80AF40CC 00000000 */ nop -/* 01B80 80AF40D0 8FBF0014 */ lw $ra, 0x0014($sp) -.L80AF40D4: -/* 01B84 80AF40D4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 01B88 80AF40D8 03E00008 */ jr $ra -/* 01B8C 80AF40DC 00000000 */ nop - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru2/EnRu2_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Ru2/EnRu2_Init.s deleted file mode 100644 index 2aa966820b..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru2/EnRu2_Init.s +++ /dev/null @@ -1,71 +0,0 @@ -glabel EnRu2_Init -/* 018CC 80AF3E1C 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 018D0 80AF3E20 AFB10028 */ sw $s1, 0x0028($sp) -/* 018D4 80AF3E24 AFB00024 */ sw $s0, 0x0024($sp) -/* 018D8 80AF3E28 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 018DC 80AF3E2C 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 -/* 018E0 80AF3E30 AFBF002C */ sw $ra, 0x002C($sp) -/* 018E4 80AF3E34 3C068003 */ lui $a2, 0x8003 ## $a2 = 80030000 -/* 018E8 80AF3E38 24C6B5EC */ addiu $a2, $a2, 0xB5EC ## $a2 = 8002B5EC -/* 018EC 80AF3E3C 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 -/* 018F0 80AF3E40 248400B4 */ addiu $a0, $a0, 0x00B4 ## $a0 = 000000B4 -/* 018F4 80AF3E44 0C00AC78 */ jal ActorShape_Init - -/* 018F8 80AF3E48 3C0741F0 */ lui $a3, 0x41F0 ## $a3 = 41F00000 -/* 018FC 80AF3E4C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01900 80AF3E50 0C2BC954 */ jal func_80AF2550 -/* 01904 80AF3E54 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 01908 80AF3E58 3C060601 */ lui $a2, 0x0601 ## $a2 = 06010000 -/* 0190C 80AF3E5C 260E0190 */ addiu $t6, $s0, 0x0190 ## $t6 = 00000190 -/* 01910 80AF3E60 260F021A */ addiu $t7, $s0, 0x021A ## $t7 = 0000021A -/* 01914 80AF3E64 24180017 */ addiu $t8, $zero, 0x0017 ## $t8 = 00000017 -/* 01918 80AF3E68 AFB80018 */ sw $t8, 0x0018($sp) -/* 0191C 80AF3E6C AFAF0014 */ sw $t7, 0x0014($sp) -/* 01920 80AF3E70 AFAE0010 */ sw $t6, 0x0010($sp) -/* 01924 80AF3E74 24C6C700 */ addiu $a2, $a2, 0xC700 ## $a2 = 0600C700 -/* 01928 80AF3E78 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 0192C 80AF3E7C 2605014C */ addiu $a1, $s0, 0x014C ## $a1 = 0000014C -/* 01930 80AF3E80 0C0291BE */ jal func_800A46F8 -/* 01934 80AF3E84 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 01938 80AF3E88 0C2BC9A8 */ jal func_80AF26A0 -/* 0193C 80AF3E8C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01940 80AF3E90 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 01944 80AF3E94 10410009 */ beq $v0, $at, .L80AF3EBC -/* 01948 80AF3E98 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0194C 80AF3E9C 24010003 */ addiu $at, $zero, 0x0003 ## $at = 00000003 -/* 01950 80AF3EA0 1041000A */ beq $v0, $at, .L80AF3ECC -/* 01954 80AF3EA4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01958 80AF3EA8 24010004 */ addiu $at, $zero, 0x0004 ## $at = 00000004 -/* 0195C 80AF3EAC 1041000B */ beq $v0, $at, .L80AF3EDC -/* 01960 80AF3EB0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01964 80AF3EB4 1000000D */ beq $zero, $zero, .L80AF3EEC -/* 01968 80AF3EB8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -.L80AF3EBC: -/* 0196C 80AF3EBC 0C2BCB87 */ jal func_80AF2E1C -/* 01970 80AF3EC0 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 01974 80AF3EC4 1000000C */ beq $zero, $zero, .L80AF3EF8 -/* 01978 80AF3EC8 24190003 */ addiu $t9, $zero, 0x0003 ## $t9 = 00000003 -.L80AF3ECC: -/* 0197C 80AF3ECC 0C2BCCE5 */ jal func_80AF3394 -/* 01980 80AF3ED0 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 01984 80AF3ED4 10000008 */ beq $zero, $zero, .L80AF3EF8 -/* 01988 80AF3ED8 24190003 */ addiu $t9, $zero, 0x0003 ## $t9 = 00000003 -.L80AF3EDC: -/* 0198C 80AF3EDC 0C2BCDD1 */ jal func_80AF3744 -/* 01990 80AF3EE0 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 01994 80AF3EE4 10000004 */ beq $zero, $zero, .L80AF3EF8 -/* 01998 80AF3EE8 24190003 */ addiu $t9, $zero, 0x0003 ## $t9 = 00000003 -.L80AF3EEC: -/* 0199C 80AF3EEC 0C2BCA65 */ jal func_80AF2994 -/* 019A0 80AF3EF0 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 019A4 80AF3EF4 24190003 */ addiu $t9, $zero, 0x0003 ## $t9 = 00000003 -.L80AF3EF8: -/* 019A8 80AF3EF8 A20002C2 */ sb $zero, 0x02C2($s0) ## 000002C2 -/* 019AC 80AF3EFC A21902C3 */ sb $t9, 0x02C3($s0) ## 000002C3 -/* 019B0 80AF3F00 8FBF002C */ lw $ra, 0x002C($sp) -/* 019B4 80AF3F04 8FB10028 */ lw $s1, 0x0028($sp) -/* 019B8 80AF3F08 8FB00024 */ lw $s0, 0x0024($sp) -/* 019BC 80AF3F0C 03E00008 */ jr $ra -/* 019C0 80AF3F10 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru2/EnRu2_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Ru2/EnRu2_Update.s deleted file mode 100644 index 7a961cce3d..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru2/EnRu2_Update.s +++ /dev/null @@ -1,30 +0,0 @@ -glabel EnRu2_Update -/* 01870 80AF3DC0 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 01874 80AF3DC4 AFBF0014 */ sw $ra, 0x0014($sp) -/* 01878 80AF3DC8 8C8202A8 */ lw $v0, 0x02A8($a0) ## 000002A8 -/* 0187C 80AF3DCC 04400008 */ bltz $v0, .L80AF3DF0 -/* 01880 80AF3DD0 28410014 */ slti $at, $v0, 0x0014 -/* 01884 80AF3DD4 10200006 */ beq $at, $zero, .L80AF3DF0 -/* 01888 80AF3DD8 00027080 */ sll $t6, $v0, 2 -/* 0188C 80AF3DDC 3C0380AF */ lui $v1, %hi(D_80AF50BC) ## $v1 = 80AF0000 -/* 01890 80AF3DE0 006E1821 */ addu $v1, $v1, $t6 -/* 01894 80AF3DE4 8C6350BC */ lw $v1, %lo(D_80AF50BC)($v1) -/* 01898 80AF3DE8 14600006 */ bne $v1, $zero, .L80AF3E04 -/* 0189C 80AF3DEC 00000000 */ nop -.L80AF3DF0: -/* 018A0 80AF3DF0 3C0480AF */ lui $a0, %hi(D_80AF51E8) ## $a0 = 80AF0000 -/* 018A4 80AF3DF4 0C00084C */ jal osSyncPrintf - -/* 018A8 80AF3DF8 248451E8 */ addiu $a0, $a0, %lo(D_80AF51E8) ## $a0 = 80AF51E8 -/* 018AC 80AF3DFC 10000004 */ beq $zero, $zero, .L80AF3E10 -/* 018B0 80AF3E00 8FBF0014 */ lw $ra, 0x0014($sp) -.L80AF3E04: -/* 018B4 80AF3E04 0060F809 */ jalr $ra, $v1 -/* 018B8 80AF3E08 00000000 */ nop -/* 018BC 80AF3E0C 8FBF0014 */ lw $ra, 0x0014($sp) -.L80AF3E10: -/* 018C0 80AF3E10 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 018C4 80AF3E14 03E00008 */ jr $ra -/* 018C8 80AF3E18 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF2550.s b/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF2550.s deleted file mode 100644 index f212f997ab..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF2550.s +++ /dev/null @@ -1,23 +0,0 @@ -glabel func_80AF2550 -/* 00000 80AF2550 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 00004 80AF2554 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 -/* 00008 80AF2558 AFA50024 */ sw $a1, 0x0024($sp) -/* 0000C 80AF255C 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 00010 80AF2560 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00014 80AF2564 24C502C8 */ addiu $a1, $a2, 0x02C8 ## $a1 = 000002C8 -/* 00018 80AF2568 AFA50018 */ sw $a1, 0x0018($sp) -/* 0001C 80AF256C 0C0170D9 */ jal ActorCollider_AllocCylinder - -/* 00020 80AF2570 AFA60020 */ sw $a2, 0x0020($sp) -/* 00024 80AF2574 3C0780AF */ lui $a3, %hi(D_80AF40E0) ## $a3 = 80AF0000 -/* 00028 80AF2578 8FA50018 */ lw $a1, 0x0018($sp) -/* 0002C 80AF257C 8FA60020 */ lw $a2, 0x0020($sp) -/* 00030 80AF2580 24E740E0 */ addiu $a3, $a3, %lo(D_80AF40E0) ## $a3 = 80AF40E0 -/* 00034 80AF2584 0C017114 */ jal func_8005C450 -/* 00038 80AF2588 8FA40024 */ lw $a0, 0x0024($sp) -/* 0003C 80AF258C 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00040 80AF2590 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 00044 80AF2594 03E00008 */ jr $ra -/* 00048 80AF2598 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF259C.s b/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF259C.s deleted file mode 100644 index 3d1d77a6b1..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF259C.s +++ /dev/null @@ -1,22 +0,0 @@ -glabel func_80AF259C -/* 0004C 80AF259C 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 00050 80AF25A0 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00054 80AF25A4 AFA50034 */ sw $a1, 0x0034($sp) -/* 00058 80AF25A8 248602C8 */ addiu $a2, $a0, 0x02C8 ## $a2 = 000002C8 -/* 0005C 80AF25AC 00C02825 */ or $a1, $a2, $zero ## $a1 = 000002C8 -/* 00060 80AF25B0 0C0189B7 */ jal ActorCollider_Cylinder_Update - -/* 00064 80AF25B4 AFA60018 */ sw $a2, 0x0018($sp) -/* 00068 80AF25B8 8FA40034 */ lw $a0, 0x0034($sp) -/* 0006C 80AF25BC 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 00070 80AF25C0 34211E60 */ ori $at, $at, 0x1E60 ## $at = 00011E60 -/* 00074 80AF25C4 8FA60018 */ lw $a2, 0x0018($sp) -/* 00078 80AF25C8 0C01767D */ jal Actor_CollisionCheck_SetAC - ## CollisionCheck_setAC -/* 0007C 80AF25CC 00812821 */ addu $a1, $a0, $at -/* 00080 80AF25D0 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00084 80AF25D4 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 00088 80AF25D8 03E00008 */ jr $ra -/* 0008C 80AF25DC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF2608.s b/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF2608.s deleted file mode 100644 index 689b173d4f..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF2608.s +++ /dev/null @@ -1,42 +0,0 @@ -glabel func_80AF2608 -/* 000B8 80AF2608 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 000BC 80AF260C AFBF0014 */ sw $ra, 0x0014($sp) -/* 000C0 80AF2610 848E02A6 */ lh $t6, 0x02A6($a0) ## 000002A6 -/* 000C4 80AF2614 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 -/* 000C8 80AF2618 24C302A6 */ addiu $v1, $a2, 0x02A6 ## $v1 = 000002A6 -/* 000CC 80AF261C 15C00003 */ bne $t6, $zero, .L80AF262C -/* 000D0 80AF2620 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 000D4 80AF2624 10000005 */ beq $zero, $zero, .L80AF263C -/* 000D8 80AF2628 248302A6 */ addiu $v1, $a0, 0x02A6 ## $v1 = 000002A6 -.L80AF262C: -/* 000DC 80AF262C 846F0000 */ lh $t7, 0x0000($v1) ## 000002A6 -/* 000E0 80AF2630 25F8FFFF */ addiu $t8, $t7, 0xFFFF ## $t8 = FFFFFFFF -/* 000E4 80AF2634 A4780000 */ sh $t8, 0x0000($v1) ## 000002A6 -/* 000E8 80AF2638 84620000 */ lh $v0, 0x0000($v1) ## 000002A6 -.L80AF263C: -/* 000EC 80AF263C 14400008 */ bne $v0, $zero, .L80AF2660 -/* 000F0 80AF2640 2404003C */ addiu $a0, $zero, 0x003C ## $a0 = 0000003C -/* 000F4 80AF2644 2405003C */ addiu $a1, $zero, 0x003C ## $a1 = 0000003C -/* 000F8 80AF2648 AFA3001C */ sw $v1, 0x001C($sp) -/* 000FC 80AF264C 0C01DF64 */ jal Math_Rand_S16Offset - -/* 00100 80AF2650 AFA60038 */ sw $a2, 0x0038($sp) -/* 00104 80AF2654 8FA3001C */ lw $v1, 0x001C($sp) -/* 00108 80AF2658 8FA60038 */ lw $a2, 0x0038($sp) -/* 0010C 80AF265C A4620000 */ sh $v0, 0x0000($v1) ## 00000000 -.L80AF2660: -/* 00110 80AF2660 84790000 */ lh $t9, 0x0000($v1) ## 00000000 -/* 00114 80AF2664 24C202A4 */ addiu $v0, $a2, 0x02A4 ## $v0 = 000002A4 -/* 00118 80AF2668 A4590000 */ sh $t9, 0x0000($v0) ## 000002A4 -/* 0011C 80AF266C 84480000 */ lh $t0, 0x0000($v0) ## 000002A4 -/* 00120 80AF2670 29010003 */ slti $at, $t0, 0x0003 -/* 00124 80AF2674 54200003 */ bnel $at, $zero, .L80AF2684 -/* 00128 80AF2678 8FBF0014 */ lw $ra, 0x0014($sp) -/* 0012C 80AF267C A4400000 */ sh $zero, 0x0000($v0) ## 000002A4 -/* 00130 80AF2680 8FBF0014 */ lw $ra, 0x0014($sp) -.L80AF2684: -/* 00134 80AF2684 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 -/* 00138 80AF2688 03E00008 */ jr $ra -/* 0013C 80AF268C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF2690.s b/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF2690.s deleted file mode 100644 index e35fb3ef0d..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF2690.s +++ /dev/null @@ -1,7 +0,0 @@ -glabel func_80AF2690 -/* 00140 80AF2690 8483001C */ lh $v1, 0x001C($a0) ## 0000001C -/* 00144 80AF2694 00031A03 */ sra $v1, $v1, 8 -/* 00148 80AF2698 03E00008 */ jr $ra -/* 0014C 80AF269C 306200FF */ andi $v0, $v1, 0x00FF ## $v0 = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF26A0.s b/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF26A0.s deleted file mode 100644 index ac6cdd053e..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF26A0.s +++ /dev/null @@ -1,6 +0,0 @@ -glabel func_80AF26A0 -/* 00150 80AF26A0 8483001C */ lh $v1, 0x001C($a0) ## 0000001C -/* 00154 80AF26A4 03E00008 */ jr $ra -/* 00158 80AF26A8 306200FF */ andi $v0, $v1, 0x00FF ## $v0 = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF26AC.s b/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF26AC.s deleted file mode 100644 index fde59c5635..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF26AC.s +++ /dev/null @@ -1,12 +0,0 @@ -glabel func_80AF26AC -/* 0015C 80AF26AC 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 -/* 00160 80AF26B0 240E0007 */ addiu $t6, $zero, 0x0007 ## $t6 = 00000007 -/* 00164 80AF26B4 AC8E02A8 */ sw $t6, 0x02A8($a0) ## 000002A8 -/* 00168 80AF26B8 AC8002AC */ sw $zero, 0x02AC($a0) ## 000002AC -/* 0016C 80AF26BC AC8002B4 */ sw $zero, 0x02B4($a0) ## 000002B4 -/* 00170 80AF26C0 AC8002B8 */ sw $zero, 0x02B8($a0) ## 000002B8 -/* 00174 80AF26C4 A08000C8 */ sb $zero, 0x00C8($a0) ## 000000C8 -/* 00178 80AF26C8 03E00008 */ jr $ra -/* 0017C 80AF26CC E48402B0 */ swc1 $f4, 0x02B0($a0) ## 000002B0 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF26D0.s b/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF26D0.s deleted file mode 100644 index 1c75801b74..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF26D0.s +++ /dev/null @@ -1,36 +0,0 @@ -glabel func_80AF26D0 -/* 00180 80AF26D0 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00184 80AF26D4 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00188 80AF26D8 90AE1D6C */ lbu $t6, 0x1D6C($a1) ## 00001D6C -/* 0018C 80AF26DC 3C0F80AF */ lui $t7, %hi(D_80AF4118) ## $t7 = 80AF0000 -/* 00190 80AF26E0 3C1980AF */ lui $t9, %hi(D_80AF4118) ## $t9 = 80AF0000 -/* 00194 80AF26E4 15C0000D */ bne $t6, $zero, .L80AF271C -/* 00198 80AF26E8 00000000 */ nop -/* 0019C 80AF26EC 8DEF4118 */ lw $t7, %lo(D_80AF4118)($t7) -/* 001A0 80AF26F0 51E00011 */ beql $t7, $zero, .L80AF2738 -/* 001A4 80AF26F4 8FBF0014 */ lw $ra, 0x0014($sp) -/* 001A8 80AF26F8 8498001C */ lh $t8, 0x001C($a0) ## 0000001C -/* 001AC 80AF26FC 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 001B0 80AF2700 17010003 */ bne $t8, $at, .L80AF2710 -/* 001B4 80AF2704 00000000 */ nop -/* 001B8 80AF2708 0C2BC9AB */ jal func_80AF26AC -/* 001BC 80AF270C 00000000 */ nop -.L80AF2710: -/* 001C0 80AF2710 3C0180AF */ lui $at, %hi(D_80AF4118) ## $at = 80AF0000 -/* 001C4 80AF2714 10000007 */ beq $zero, $zero, .L80AF2734 -/* 001C8 80AF2718 AC204118 */ sw $zero, %lo(D_80AF4118)($at) -.L80AF271C: -/* 001CC 80AF271C 8F394118 */ lw $t9, %lo(D_80AF4118)($t9) -/* 001D0 80AF2720 24080001 */ addiu $t0, $zero, 0x0001 ## $t0 = 00000001 -/* 001D4 80AF2724 3C0180AF */ lui $at, %hi(D_80AF4118) ## $at = 80AF0000 -/* 001D8 80AF2728 57200003 */ bnel $t9, $zero, .L80AF2738 -/* 001DC 80AF272C 8FBF0014 */ lw $ra, 0x0014($sp) -/* 001E0 80AF2730 AC284118 */ sw $t0, %lo(D_80AF4118)($at) -.L80AF2734: -/* 001E4 80AF2734 8FBF0014 */ lw $ra, 0x0014($sp) -.L80AF2738: -/* 001E8 80AF2738 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 001EC 80AF273C 03E00008 */ jr $ra -/* 001F0 80AF2740 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF2744.s b/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF2744.s deleted file mode 100644 index 34e34f9d32..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF2744.s +++ /dev/null @@ -1,21 +0,0 @@ -glabel func_80AF2744 -/* 001F4 80AF2744 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 001F8 80AF2748 3C0141F0 */ lui $at, 0x41F0 ## $at = 41F00000 -/* 001FC 80AF274C 44810000 */ mtc1 $at, $f0 ## $f0 = 30.00 -/* 00200 80AF2750 AFA50024 */ sw $a1, 0x0024($sp) -/* 00204 80AF2754 00802825 */ or $a1, $a0, $zero ## $a1 = 00000000 -/* 00208 80AF2758 AFBF001C */ sw $ra, 0x001C($sp) -/* 0020C 80AF275C AFA40020 */ sw $a0, 0x0020($sp) -/* 00210 80AF2760 240E0004 */ addiu $t6, $zero, 0x0004 ## $t6 = 00000004 -/* 00214 80AF2764 44070000 */ mfc1 $a3, $f0 -/* 00218 80AF2768 AFAE0014 */ sw $t6, 0x0014($sp) -/* 0021C 80AF276C 8FA40024 */ lw $a0, 0x0024($sp) -/* 00220 80AF2770 3C064296 */ lui $a2, 0x4296 ## $a2 = 42960000 -/* 00224 80AF2774 0C00B92D */ jal func_8002E4B4 -/* 00228 80AF2778 E7A00010 */ swc1 $f0, 0x0010($sp) -/* 0022C 80AF277C 8FBF001C */ lw $ra, 0x001C($sp) -/* 00230 80AF2780 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 00234 80AF2784 03E00008 */ jr $ra -/* 00238 80AF2788 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF278C.s b/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF278C.s deleted file mode 100644 index 5d835e03d0..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF278C.s +++ /dev/null @@ -1,12 +0,0 @@ -glabel func_80AF278C -/* 0023C 80AF278C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00240 80AF2790 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00244 80AF2794 0C02927F */ jal SkelAnime_FrameUpdateMatrix - -/* 00248 80AF2798 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 0024C 80AF279C 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00250 80AF27A0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00254 80AF27A4 03E00008 */ jr $ra -/* 00258 80AF27A8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF27AC.s b/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF27AC.s deleted file mode 100644 index fc14a3d230..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF27AC.s +++ /dev/null @@ -1,13 +0,0 @@ -glabel func_80AF27AC -/* 0025C 80AF27AC 908E1D6C */ lbu $t6, 0x1D6C($a0) ## 00001D6C -/* 00260 80AF27B0 00057880 */ sll $t7, $a1, 2 -/* 00264 80AF27B4 008FC021 */ addu $t8, $a0, $t7 -/* 00268 80AF27B8 11C00003 */ beq $t6, $zero, .L80AF27C8 -/* 0026C 80AF27BC 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 00270 80AF27C0 03E00008 */ jr $ra -/* 00274 80AF27C4 8F021D8C */ lw $v0, 0x1D8C($t8) ## 00001D8C -.L80AF27C8: -/* 00278 80AF27C8 03E00008 */ jr $ra -/* 0027C 80AF27CC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF27D0.s b/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF27D0.s deleted file mode 100644 index 79024f5ba2..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF27D0.s +++ /dev/null @@ -1,24 +0,0 @@ -glabel func_80AF27D0 -/* 00280 80AF27D0 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00284 80AF27D4 AFA40018 */ sw $a0, 0x0018($sp) -/* 00288 80AF27D8 AFBF0014 */ sw $ra, 0x0014($sp) -/* 0028C 80AF27DC AFA5001C */ sw $a1, 0x001C($sp) -/* 00290 80AF27E0 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 00294 80AF27E4 AFA60020 */ sw $a2, 0x0020($sp) -/* 00298 80AF27E8 0C2BC9EB */ jal func_80AF27AC -/* 0029C 80AF27EC 00E02825 */ or $a1, $a3, $zero ## $a1 = 00000000 -/* 002A0 80AF27F0 10400007 */ beq $v0, $zero, .L80AF2810 -/* 002A4 80AF27F4 8FBF0014 */ lw $ra, 0x0014($sp) -/* 002A8 80AF27F8 97AE0022 */ lhu $t6, 0x0022($sp) -/* 002AC 80AF27FC 944F0000 */ lhu $t7, 0x0000($v0) ## 00000000 -/* 002B0 80AF2800 55CF0004 */ bnel $t6, $t7, .L80AF2814 -/* 002B4 80AF2804 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 002B8 80AF2808 10000002 */ beq $zero, $zero, .L80AF2814 -/* 002BC 80AF280C 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -.L80AF2810: -/* 002C0 80AF2810 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -.L80AF2814: -/* 002C4 80AF2814 03E00008 */ jr $ra -/* 002C8 80AF2818 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF281C.s b/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF281C.s deleted file mode 100644 index 383bf66480..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF281C.s +++ /dev/null @@ -1,24 +0,0 @@ -glabel func_80AF281C -/* 002CC 80AF281C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 002D0 80AF2820 AFA40018 */ sw $a0, 0x0018($sp) -/* 002D4 80AF2824 AFBF0014 */ sw $ra, 0x0014($sp) -/* 002D8 80AF2828 AFA5001C */ sw $a1, 0x001C($sp) -/* 002DC 80AF282C 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 002E0 80AF2830 AFA60020 */ sw $a2, 0x0020($sp) -/* 002E4 80AF2834 0C2BC9EB */ jal func_80AF27AC -/* 002E8 80AF2838 00E02825 */ or $a1, $a3, $zero ## $a1 = 00000000 -/* 002EC 80AF283C 10400007 */ beq $v0, $zero, .L80AF285C -/* 002F0 80AF2840 8FBF0014 */ lw $ra, 0x0014($sp) -/* 002F4 80AF2844 97AE0022 */ lhu $t6, 0x0022($sp) -/* 002F8 80AF2848 944F0000 */ lhu $t7, 0x0000($v0) ## 00000000 -/* 002FC 80AF284C 51CF0004 */ beql $t6, $t7, .L80AF2860 -/* 00300 80AF2850 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 00304 80AF2854 10000002 */ beq $zero, $zero, .L80AF2860 -/* 00308 80AF2858 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -.L80AF285C: -/* 0030C 80AF285C 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -.L80AF2860: -/* 00310 80AF2860 03E00008 */ jr $ra -/* 00314 80AF2864 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF2868.s b/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF2868.s deleted file mode 100644 index 9fc4706ad8..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF2868.s +++ /dev/null @@ -1,36 +0,0 @@ -glabel func_80AF2868 -/* 00318 80AF2868 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 0031C 80AF286C 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 -/* 00320 80AF2870 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00324 80AF2874 AFA5001C */ sw $a1, 0x001C($sp) -/* 00328 80AF2878 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 0032C 80AF287C 00C02825 */ or $a1, $a2, $zero ## $a1 = 00000000 -/* 00330 80AF2880 0C2BC9EB */ jal func_80AF27AC -/* 00334 80AF2884 AFA70018 */ sw $a3, 0x0018($sp) -/* 00338 80AF2888 10400013 */ beq $v0, $zero, .L80AF28D8 -/* 0033C 80AF288C 8FA70018 */ lw $a3, 0x0018($sp) -/* 00340 80AF2890 8C4E000C */ lw $t6, 0x000C($v0) ## 0000000C -/* 00344 80AF2894 448E2000 */ mtc1 $t6, $f4 ## $f4 = 0.00 -/* 00348 80AF2898 00000000 */ nop -/* 0034C 80AF289C 468021A0 */ cvt.s.w $f6, $f4 -/* 00350 80AF28A0 E4E60024 */ swc1 $f6, 0x0024($a3) ## 00000024 -/* 00354 80AF28A4 8C4F0010 */ lw $t7, 0x0010($v0) ## 00000010 -/* 00358 80AF28A8 448F4000 */ mtc1 $t7, $f8 ## $f8 = 0.00 -/* 0035C 80AF28AC 00000000 */ nop -/* 00360 80AF28B0 468042A0 */ cvt.s.w $f10, $f8 -/* 00364 80AF28B4 E4EA0028 */ swc1 $f10, 0x0028($a3) ## 00000028 -/* 00368 80AF28B8 8C580014 */ lw $t8, 0x0014($v0) ## 00000014 -/* 0036C 80AF28BC 44988000 */ mtc1 $t8, $f16 ## $f16 = 0.00 -/* 00370 80AF28C0 00000000 */ nop -/* 00374 80AF28C4 468084A0 */ cvt.s.w $f18, $f16 -/* 00378 80AF28C8 E4F2002C */ swc1 $f18, 0x002C($a3) ## 0000002C -/* 0037C 80AF28CC 84430008 */ lh $v1, 0x0008($v0) ## 00000008 -/* 00380 80AF28D0 A4E300B6 */ sh $v1, 0x00B6($a3) ## 000000B6 -/* 00384 80AF28D4 A4E30032 */ sh $v1, 0x0032($a3) ## 00000032 -.L80AF28D8: -/* 00388 80AF28D8 8FBF0014 */ lw $ra, 0x0014($sp) -/* 0038C 80AF28DC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00390 80AF28E0 03E00008 */ jr $ra -/* 00394 80AF28E4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF28E8.s b/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF28E8.s deleted file mode 100644 index 3f85287827..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF28E8.s +++ /dev/null @@ -1,43 +0,0 @@ -glabel func_80AF28E8 -/* 00398 80AF28E8 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 0039C 80AF28EC AFBF0024 */ sw $ra, 0x0024($sp) -/* 003A0 80AF28F0 AFA40028 */ sw $a0, 0x0028($sp) -/* 003A4 80AF28F4 AFA5002C */ sw $a1, 0x002C($sp) -/* 003A8 80AF28F8 AFA60030 */ sw $a2, 0x0030($sp) -/* 003AC 80AF28FC AFA70034 */ sw $a3, 0x0034($sp) -/* 003B0 80AF2900 0C028800 */ jal SkelAnime_GetFrameCount - -/* 003B4 80AF2904 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 003B8 80AF2908 8FAE0038 */ lw $t6, 0x0038($sp) -/* 003BC 80AF290C 8FA40028 */ lw $a0, 0x0028($sp) -/* 003C0 80AF2910 8FA5002C */ lw $a1, 0x002C($sp) -/* 003C4 80AF2914 15C00007 */ bne $t6, $zero, .L80AF2934 -/* 003C8 80AF2918 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 003CC 80AF291C 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 -/* 003D0 80AF2920 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 003D4 80AF2924 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 003D8 80AF2928 44816000 */ mtc1 $at, $f12 ## $f12 = 1.00 -/* 003DC 80AF292C 10000006 */ beq $zero, $zero, .L80AF2948 -/* 003E0 80AF2930 468020A0 */ cvt.s.w $f2, $f4 -.L80AF2934: -/* 003E4 80AF2934 44823000 */ mtc1 $v0, $f6 ## $f6 = 0.00 -/* 003E8 80AF2938 3C01BF80 */ lui $at, 0xBF80 ## $at = BF800000 -/* 003EC 80AF293C 44801000 */ mtc1 $zero, $f2 ## $f2 = 0.00 -/* 003F0 80AF2940 44816000 */ mtc1 $at, $f12 ## $f12 = -1.00 -/* 003F4 80AF2944 46803020 */ cvt.s.w $f0, $f6 -.L80AF2948: -/* 003F8 80AF2948 93AF0033 */ lbu $t7, 0x0033($sp) -/* 003FC 80AF294C C7A80034 */ lwc1 $f8, 0x0034($sp) -/* 00400 80AF2950 44066000 */ mfc1 $a2, $f12 -/* 00404 80AF2954 44070000 */ mfc1 $a3, $f0 -/* 00408 80AF2958 E7A20010 */ swc1 $f2, 0x0010($sp) -/* 0040C 80AF295C AFAF0014 */ sw $t7, 0x0014($sp) -/* 00410 80AF2960 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 00414 80AF2964 E7A80018 */ swc1 $f8, 0x0018($sp) -/* 00418 80AF2968 8FBF0024 */ lw $ra, 0x0024($sp) -/* 0041C 80AF296C 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 00420 80AF2970 03E00008 */ jr $ra -/* 00424 80AF2974 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF2978.s b/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF2978.s deleted file mode 100644 index 11cb83a6a3..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF2978.s +++ /dev/null @@ -1,10 +0,0 @@ -glabel func_80AF2978 -/* 00428 80AF2978 AFA50004 */ sw $a1, 0x0004($sp) -/* 0042C 80AF297C 3C0180AF */ lui $at, %hi(D_80AF527C) ## $at = 80AF0000 -/* 00430 80AF2980 C426527C */ lwc1 $f6, %lo(D_80AF527C)($at) -/* 00434 80AF2984 C48400BC */ lwc1 $f4, 0x00BC($a0) ## 000000BC -/* 00438 80AF2988 46062200 */ add.s $f8, $f4, $f6 -/* 0043C 80AF298C 03E00008 */ jr $ra -/* 00440 80AF2990 E48800BC */ swc1 $f8, 0x00BC($a0) ## 000000BC - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF2994.s b/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF2994.s deleted file mode 100644 index d786125b6a..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF2994.s +++ /dev/null @@ -1,21 +0,0 @@ -glabel func_80AF2994 -/* 00444 80AF2994 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 00448 80AF2998 AFA50024 */ sw $a1, 0x0024($sp) -/* 0044C 80AF299C AFBF001C */ sw $ra, 0x001C($sp) -/* 00450 80AF29A0 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 00454 80AF29A4 AFA40020 */ sw $a0, 0x0020($sp) -/* 00458 80AF29A8 24A50DE8 */ addiu $a1, $a1, 0x0DE8 ## $a1 = 06000DE8 -/* 0045C 80AF29AC AFA00010 */ sw $zero, 0x0010($sp) -/* 00460 80AF29B0 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 00464 80AF29B4 0C2BCA3A */ jal func_80AF28E8 -/* 00468 80AF29B8 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 0046C 80AF29BC 3C0180AF */ lui $at, %hi(D_80AF5280) ## $at = 80AF0000 -/* 00470 80AF29C0 C4245280 */ lwc1 $f4, %lo(D_80AF5280)($at) -/* 00474 80AF29C4 8FAE0020 */ lw $t6, 0x0020($sp) -/* 00478 80AF29C8 E5C400BC */ swc1 $f4, 0x00BC($t6) ## 000000BC -/* 0047C 80AF29CC 8FBF001C */ lw $ra, 0x001C($sp) -/* 00480 80AF29D0 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 00484 80AF29D4 03E00008 */ jr $ra -/* 00488 80AF29D8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF29DC.s b/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF29DC.s deleted file mode 100644 index b3860facea..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF29DC.s +++ /dev/null @@ -1,27 +0,0 @@ -glabel func_80AF29DC -/* 0048C 80AF29DC 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 00490 80AF29E0 AFBF0034 */ sw $ra, 0x0034($sp) -/* 00494 80AF29E4 AFA40038 */ sw $a0, 0x0038($sp) -/* 00498 80AF29E8 C4800024 */ lwc1 $f0, 0x0024($a0) ## 00000024 -/* 0049C 80AF29EC C4820028 */ lwc1 $f2, 0x0028($a0) ## 00000028 -/* 004A0 80AF29F0 C48C002C */ lwc1 $f12, 0x002C($a0) ## 0000002C -/* 004A4 80AF29F4 00A03025 */ or $a2, $a1, $zero ## $a2 = 00000000 -/* 004A8 80AF29F8 00802825 */ or $a1, $a0, $zero ## $a1 = 00000000 -/* 004AC 80AF29FC 240E0002 */ addiu $t6, $zero, 0x0002 ## $t6 = 00000002 -/* 004B0 80AF2A00 AFAE0028 */ sw $t6, 0x0028($sp) -/* 004B4 80AF2A04 24C41C24 */ addiu $a0, $a2, 0x1C24 ## $a0 = 00001C24 -/* 004B8 80AF2A08 AFA00024 */ sw $zero, 0x0024($sp) -/* 004BC 80AF2A0C AFA00020 */ sw $zero, 0x0020($sp) -/* 004C0 80AF2A10 AFA0001C */ sw $zero, 0x001C($sp) -/* 004C4 80AF2A14 2407005D */ addiu $a3, $zero, 0x005D ## $a3 = 0000005D -/* 004C8 80AF2A18 E7A00010 */ swc1 $f0, 0x0010($sp) -/* 004CC 80AF2A1C E7A20014 */ swc1 $f2, 0x0014($sp) -/* 004D0 80AF2A20 0C00C916 */ jal Actor_SpawnAttached - -/* 004D4 80AF2A24 E7AC0018 */ swc1 $f12, 0x0018($sp) -/* 004D8 80AF2A28 8FBF0034 */ lw $ra, 0x0034($sp) -/* 004DC 80AF2A2C 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 -/* 004E0 80AF2A30 03E00008 */ jr $ra -/* 004E4 80AF2A34 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF2A38.s b/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF2A38.s deleted file mode 100644 index 1d1a377d57..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF2A38.s +++ /dev/null @@ -1,35 +0,0 @@ -glabel func_80AF2A38 -/* 004E8 80AF2A38 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 004EC 80AF2A3C AFBF0034 */ sw $ra, 0x0034($sp) -/* 004F0 80AF2A40 AFA40038 */ sw $a0, 0x0038($sp) -/* 004F4 80AF2A44 00A03025 */ or $a2, $a1, $zero ## $a2 = 00000000 -/* 004F8 80AF2A48 8CC21C44 */ lw $v0, 0x1C44($a2) ## 00001C44 -/* 004FC 80AF2A4C 3C014248 */ lui $at, 0x4248 ## $at = 42480000 -/* 00500 80AF2A50 44813000 */ mtc1 $at, $f6 ## $f6 = 50.00 -/* 00504 80AF2A54 C4440028 */ lwc1 $f4, 0x0028($v0) ## 00000028 -/* 00508 80AF2A58 C4400024 */ lwc1 $f0, 0x0024($v0) ## 00000024 -/* 0050C 80AF2A5C C44C002C */ lwc1 $f12, 0x002C($v0) ## 0000002C -/* 00510 80AF2A60 46062080 */ add.s $f2, $f4, $f6 -/* 00514 80AF2A64 00802825 */ or $a1, $a0, $zero ## $a1 = 00000000 -/* 00518 80AF2A68 240E000A */ addiu $t6, $zero, 0x000A ## $t6 = 0000000A -/* 0051C 80AF2A6C AFAE0028 */ sw $t6, 0x0028($sp) -/* 00520 80AF2A70 24C41C24 */ addiu $a0, $a2, 0x1C24 ## $a0 = 00001C24 -/* 00524 80AF2A74 E7A20014 */ swc1 $f2, 0x0014($sp) -/* 00528 80AF2A78 AFA6003C */ sw $a2, 0x003C($sp) -/* 0052C 80AF2A7C AFA00024 */ sw $zero, 0x0024($sp) -/* 00530 80AF2A80 AFA00020 */ sw $zero, 0x0020($sp) -/* 00534 80AF2A84 AFA0001C */ sw $zero, 0x001C($sp) -/* 00538 80AF2A88 2407008B */ addiu $a3, $zero, 0x008B ## $a3 = 0000008B -/* 0053C 80AF2A8C E7A00010 */ swc1 $f0, 0x0010($sp) -/* 00540 80AF2A90 0C00C916 */ jal Actor_SpawnAttached - -/* 00544 80AF2A94 E7AC0018 */ swc1 $f12, 0x0018($sp) -/* 00548 80AF2A98 8FA4003C */ lw $a0, 0x003C($sp) -/* 0054C 80AF2A9C 0C021344 */ jal Item_Give -/* 00550 80AF2AA0 24050068 */ addiu $a1, $zero, 0x0068 ## $a1 = 00000068 -/* 00554 80AF2AA4 8FBF0034 */ lw $ra, 0x0034($sp) -/* 00558 80AF2AA8 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 -/* 0055C 80AF2AAC 03E00008 */ jr $ra -/* 00560 80AF2AB0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF2AB4.s b/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF2AB4.s deleted file mode 100644 index f7d6b1819b..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF2AB4.s +++ /dev/null @@ -1,40 +0,0 @@ -glabel func_80AF2AB4 -/* 00564 80AF2AB4 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 00568 80AF2AB8 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 -/* 0056C 80AF2ABC 904E1415 */ lbu $t6, 0x1415($v0) ## 8015FA75 -/* 00570 80AF2AC0 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 00574 80AF2AC4 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 00578 80AF2AC8 AFBF0014 */ sw $ra, 0x0014($sp) -/* 0057C 80AF2ACC 15C10019 */ bne $t6, $at, .L80AF2B34 -/* 00580 80AF2AD0 AFA40028 */ sw $a0, 0x0028($sp) -/* 00584 80AF2AD4 8C4F1360 */ lw $t7, 0x1360($v0) ## 8015F9C0 -/* 00588 80AF2AD8 3C0880AF */ lui $t0, %hi(D_80AF411C) ## $t0 = 80AF0000 -/* 0058C 80AF2ADC 24180001 */ addiu $t8, $zero, 0x0001 ## $t8 = 00000001 -/* 00590 80AF2AE0 29E10004 */ slti $at, $t7, 0x0004 -/* 00594 80AF2AE4 10200013 */ beq $at, $zero, .L80AF2B34 -/* 00598 80AF2AE8 2508411C */ addiu $t0, $t0, %lo(D_80AF411C) ## $t0 = 80AF411C -/* 0059C 80AF2AEC 8CA31C44 */ lw $v1, 0x1C44($a1) ## 00001C44 -/* 005A0 80AF2AF0 AC9802A8 */ sw $t8, 0x02A8($a0) ## 000002A8 -/* 005A4 80AF2AF4 ACA81D68 */ sw $t0, 0x1D68($a1) ## 00001D68 -/* 005A8 80AF2AF8 24090002 */ addiu $t1, $zero, 0x0002 ## $t1 = 00000002 -/* 005AC 80AF2AFC 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 005B0 80AF2B00 A0491414 */ sb $t1, 0x1414($v0) ## 8015FA74 -/* 005B4 80AF2B04 24050068 */ addiu $a1, $zero, 0x0068 ## $a1 = 00000068 -/* 005B8 80AF2B08 0C021344 */ jal Item_Give -/* 005BC 80AF2B0C AFA3001C */ sw $v1, 0x001C($sp) -/* 005C0 80AF2B10 8FAA0028 */ lw $t2, 0x0028($sp) -/* 005C4 80AF2B14 34018000 */ ori $at, $zero, 0x8000 ## $at = 00008000 -/* 005C8 80AF2B18 8FA3001C */ lw $v1, 0x001C($sp) -/* 005CC 80AF2B1C 85420032 */ lh $v0, 0x0032($t2) ## 00000032 -/* 005D0 80AF2B20 00411021 */ addu $v0, $v0, $at -/* 005D4 80AF2B24 00021400 */ sll $v0, $v0, 16 -/* 005D8 80AF2B28 00021403 */ sra $v0, $v0, 16 -/* 005DC 80AF2B2C A46200B6 */ sh $v0, 0x00B6($v1) ## 000000B6 -/* 005E0 80AF2B30 A4620032 */ sh $v0, 0x0032($v1) ## 00000032 -.L80AF2B34: -/* 005E4 80AF2B34 8FBF0014 */ lw $ra, 0x0014($sp) -/* 005E8 80AF2B38 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 005EC 80AF2B3C 03E00008 */ jr $ra -/* 005F0 80AF2B40 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF2B44.s b/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF2B44.s deleted file mode 100644 index 085a12eb0f..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF2B44.s +++ /dev/null @@ -1,24 +0,0 @@ -glabel func_80AF2B44 -/* 005F4 80AF2B44 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 005F8 80AF2B48 AFBF0014 */ sw $ra, 0x0014($sp) -/* 005FC 80AF2B4C 90AE1D6C */ lbu $t6, 0x1D6C($a1) ## 00001D6C -/* 00600 80AF2B50 51C0000D */ beql $t6, $zero, .L80AF2B88 -/* 00604 80AF2B54 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00608 80AF2B58 8CA21D98 */ lw $v0, 0x1D98($a1) ## 00001D98 -/* 0060C 80AF2B5C 5040000A */ beql $v0, $zero, .L80AF2B88 -/* 00610 80AF2B60 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00614 80AF2B64 944F0000 */ lhu $t7, 0x0000($v0) ## 00000000 -/* 00618 80AF2B68 24030002 */ addiu $v1, $zero, 0x0002 ## $v1 = 00000002 -/* 0061C 80AF2B6C 24180001 */ addiu $t8, $zero, 0x0001 ## $t8 = 00000001 -/* 00620 80AF2B70 546F0005 */ bnel $v1, $t7, .L80AF2B88 -/* 00624 80AF2B74 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00628 80AF2B78 AC8302A8 */ sw $v1, 0x02A8($a0) ## 000002A8 -/* 0062C 80AF2B7C 0C2BCA77 */ jal func_80AF29DC -/* 00630 80AF2B80 AC9802AC */ sw $t8, 0x02AC($a0) ## 000002AC -/* 00634 80AF2B84 8FBF0014 */ lw $ra, 0x0014($sp) -.L80AF2B88: -/* 00638 80AF2B88 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 0063C 80AF2B8C 03E00008 */ jr $ra -/* 00640 80AF2B90 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF2B94.s b/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF2B94.s deleted file mode 100644 index b313c39a50..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF2B94.s +++ /dev/null @@ -1,15 +0,0 @@ -glabel func_80AF2B94 -/* 00644 80AF2B94 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 00648 80AF2B98 C48400BC */ lwc1 $f4, 0x00BC($a0) ## 000000BC -/* 0064C 80AF2B9C 240E0003 */ addiu $t6, $zero, 0x0003 ## $t6 = 00000003 -/* 00650 80AF2BA0 4604003E */ c.le.s $f0, $f4 -/* 00654 80AF2BA4 00000000 */ nop -/* 00658 80AF2BA8 45000003 */ bc1f .L80AF2BB8 -/* 0065C 80AF2BAC 00000000 */ nop -/* 00660 80AF2BB0 AC8E02A8 */ sw $t6, 0x02A8($a0) ## 000002A8 -/* 00664 80AF2BB4 E48000BC */ swc1 $f0, 0x00BC($a0) ## 000000BC -.L80AF2BB8: -/* 00668 80AF2BB8 03E00008 */ jr $ra -/* 0066C 80AF2BBC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF2BC0.s b/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF2BC0.s deleted file mode 100644 index f9c7fbc101..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF2BC0.s +++ /dev/null @@ -1,43 +0,0 @@ -glabel func_80AF2BC0 -/* 00670 80AF2BC0 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 00674 80AF2BC4 AFBF0024 */ sw $ra, 0x0024($sp) -/* 00678 80AF2BC8 AFA40028 */ sw $a0, 0x0028($sp) -/* 0067C 80AF2BCC 90AE1D6C */ lbu $t6, 0x1D6C($a1) ## 00001D6C -/* 00680 80AF2BD0 51C0001D */ beql $t6, $zero, .L80AF2C48 -/* 00684 80AF2BD4 8FBF0024 */ lw $ra, 0x0024($sp) -/* 00688 80AF2BD8 8CA21D98 */ lw $v0, 0x1D98($a1) ## 00001D98 -/* 0068C 80AF2BDC 5040001A */ beql $v0, $zero, .L80AF2C48 -/* 00690 80AF2BE0 8FBF0024 */ lw $ra, 0x0024($sp) -/* 00694 80AF2BE4 944F0000 */ lhu $t7, 0x0000($v0) ## 00000000 -/* 00698 80AF2BE8 24010003 */ addiu $at, $zero, 0x0003 ## $at = 00000003 -/* 0069C 80AF2BEC 3C040601 */ lui $a0, 0x0601 ## $a0 = 06010000 -/* 006A0 80AF2BF0 55E10015 */ bnel $t7, $at, .L80AF2C48 -/* 006A4 80AF2BF4 8FBF0024 */ lw $ra, 0x0024($sp) -/* 006A8 80AF2BF8 0C028800 */ jal SkelAnime_GetFrameCount - -/* 006AC 80AF2BFC 2484D3DC */ addiu $a0, $a0, 0xD3DC ## $a0 = 0600D3DC -/* 006B0 80AF2C00 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 -/* 006B4 80AF2C04 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 006B8 80AF2C08 8FA40028 */ lw $a0, 0x0028($sp) -/* 006BC 80AF2C0C 468021A0 */ cvt.s.w $f6, $f4 -/* 006C0 80AF2C10 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 -/* 006C4 80AF2C14 24180002 */ addiu $t8, $zero, 0x0002 ## $t8 = 00000002 -/* 006C8 80AF2C18 44070000 */ mfc1 $a3, $f0 -/* 006CC 80AF2C1C AFB80014 */ sw $t8, 0x0014($sp) -/* 006D0 80AF2C20 24A5D3DC */ addiu $a1, $a1, 0xD3DC ## $a1 = 0600D3DC -/* 006D4 80AF2C24 E7A60010 */ swc1 $f6, 0x0010($sp) -/* 006D8 80AF2C28 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 006DC 80AF2C2C 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 006E0 80AF2C30 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 006E4 80AF2C34 E7A00018 */ swc1 $f0, 0x0018($sp) -/* 006E8 80AF2C38 8FA80028 */ lw $t0, 0x0028($sp) -/* 006EC 80AF2C3C 24190004 */ addiu $t9, $zero, 0x0004 ## $t9 = 00000004 -/* 006F0 80AF2C40 AD1902A8 */ sw $t9, 0x02A8($t0) ## 000002A8 -/* 006F4 80AF2C44 8FBF0024 */ lw $ra, 0x0024($sp) -.L80AF2C48: -/* 006F8 80AF2C48 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 006FC 80AF2C4C 03E00008 */ jr $ra -/* 00700 80AF2C50 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF2C54.s b/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF2C54.s deleted file mode 100644 index 320c5c7620..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF2C54.s +++ /dev/null @@ -1,9 +0,0 @@ -glabel func_80AF2C54 -/* 00704 80AF2C54 10A00002 */ beq $a1, $zero, .L80AF2C60 -/* 00708 80AF2C58 240E0005 */ addiu $t6, $zero, 0x0005 ## $t6 = 00000005 -/* 0070C 80AF2C5C AC8E02A8 */ sw $t6, 0x02A8($a0) ## 000002A8 -.L80AF2C60: -/* 00710 80AF2C60 03E00008 */ jr $ra -/* 00714 80AF2C64 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF2C68.s b/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF2C68.s deleted file mode 100644 index 769fc1fb10..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF2C68.s +++ /dev/null @@ -1,23 +0,0 @@ -glabel func_80AF2C68 -/* 00718 80AF2C68 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 0071C 80AF2C6C AFBF0014 */ sw $ra, 0x0014($sp) -/* 00720 80AF2C70 90AE1D6C */ lbu $t6, 0x1D6C($a1) ## 00001D6C -/* 00724 80AF2C74 51C0000C */ beql $t6, $zero, .L80AF2CA8 -/* 00728 80AF2C78 8FBF0014 */ lw $ra, 0x0014($sp) -/* 0072C 80AF2C7C 8CA21DA4 */ lw $v0, 0x1DA4($a1) ## 00001DA4 -/* 00730 80AF2C80 50400009 */ beql $v0, $zero, .L80AF2CA8 -/* 00734 80AF2C84 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00738 80AF2C88 944F0000 */ lhu $t7, 0x0000($v0) ## 00000000 -/* 0073C 80AF2C8C 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 00740 80AF2C90 24180006 */ addiu $t8, $zero, 0x0006 ## $t8 = 00000006 -/* 00744 80AF2C94 55E10004 */ bnel $t7, $at, .L80AF2CA8 -/* 00748 80AF2C98 8FBF0014 */ lw $ra, 0x0014($sp) -/* 0074C 80AF2C9C 0C2BCA8E */ jal func_80AF2A38 -/* 00750 80AF2CA0 AC9802A8 */ sw $t8, 0x02A8($a0) ## 000002A8 -/* 00754 80AF2CA4 8FBF0014 */ lw $ra, 0x0014($sp) -.L80AF2CA8: -/* 00758 80AF2CA8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 0075C 80AF2CAC 03E00008 */ jr $ra -/* 00760 80AF2CB0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF2CB4.s b/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF2CB4.s deleted file mode 100644 index 79fddbcbb2..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF2CB4.s +++ /dev/null @@ -1,11 +0,0 @@ -glabel func_80AF2CB4 -/* 00764 80AF2CB4 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00768 80AF2CB8 AFBF0014 */ sw $ra, 0x0014($sp) -/* 0076C 80AF2CBC 0C2BCAAD */ jal func_80AF2AB4 -/* 00770 80AF2CC0 00000000 */ nop -/* 00774 80AF2CC4 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00778 80AF2CC8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 0077C 80AF2CCC 03E00008 */ jr $ra -/* 00780 80AF2CD0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF2CD4.s b/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF2CD4.s deleted file mode 100644 index 667ac6cdf9..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF2CD4.s +++ /dev/null @@ -1,11 +0,0 @@ -glabel func_80AF2CD4 -/* 00784 80AF2CD4 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00788 80AF2CD8 AFBF0014 */ sw $ra, 0x0014($sp) -/* 0078C 80AF2CDC 0C2BCAD1 */ jal func_80AF2B44 -/* 00790 80AF2CE0 00000000 */ nop -/* 00794 80AF2CE4 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00798 80AF2CE8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 0079C 80AF2CEC 03E00008 */ jr $ra -/* 007A0 80AF2CF0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF2CF4.s b/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF2CF4.s deleted file mode 100644 index d2ba0a40bf..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF2CF4.s +++ /dev/null @@ -1,17 +0,0 @@ -glabel func_80AF2CF4 -/* 007A4 80AF2CF4 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 007A8 80AF2CF8 AFBF0014 */ sw $ra, 0x0014($sp) -/* 007AC 80AF2CFC 0C2BCA5E */ jal func_80AF2978 -/* 007B0 80AF2D00 AFA40018 */ sw $a0, 0x0018($sp) -/* 007B4 80AF2D04 0C2BC9E3 */ jal func_80AF278C -/* 007B8 80AF2D08 8FA40018 */ lw $a0, 0x0018($sp) -/* 007BC 80AF2D0C 0C2BC982 */ jal func_80AF2608 -/* 007C0 80AF2D10 8FA40018 */ lw $a0, 0x0018($sp) -/* 007C4 80AF2D14 0C2BCAE5 */ jal func_80AF2B94 -/* 007C8 80AF2D18 8FA40018 */ lw $a0, 0x0018($sp) -/* 007CC 80AF2D1C 8FBF0014 */ lw $ra, 0x0014($sp) -/* 007D0 80AF2D20 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 007D4 80AF2D24 03E00008 */ jr $ra -/* 007D8 80AF2D28 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF2D2C.s b/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF2D2C.s deleted file mode 100644 index dd3cd8cb0f..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF2D2C.s +++ /dev/null @@ -1,19 +0,0 @@ -glabel func_80AF2D2C -/* 007DC 80AF2D2C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 007E0 80AF2D30 AFBF0014 */ sw $ra, 0x0014($sp) -/* 007E4 80AF2D34 AFA40018 */ sw $a0, 0x0018($sp) -/* 007E8 80AF2D38 0C2BC9D1 */ jal func_80AF2744 -/* 007EC 80AF2D3C AFA5001C */ sw $a1, 0x001C($sp) -/* 007F0 80AF2D40 0C2BC9E3 */ jal func_80AF278C -/* 007F4 80AF2D44 8FA40018 */ lw $a0, 0x0018($sp) -/* 007F8 80AF2D48 0C2BC982 */ jal func_80AF2608 -/* 007FC 80AF2D4C 8FA40018 */ lw $a0, 0x0018($sp) -/* 00800 80AF2D50 8FA40018 */ lw $a0, 0x0018($sp) -/* 00804 80AF2D54 0C2BCAF0 */ jal func_80AF2BC0 -/* 00808 80AF2D58 8FA5001C */ lw $a1, 0x001C($sp) -/* 0080C 80AF2D5C 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00810 80AF2D60 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00814 80AF2D64 03E00008 */ jr $ra -/* 00818 80AF2D68 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF2D6C.s b/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF2D6C.s deleted file mode 100644 index b41252d63a..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF2D6C.s +++ /dev/null @@ -1,19 +0,0 @@ -glabel func_80AF2D6C -/* 0081C 80AF2D6C 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 00820 80AF2D70 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00824 80AF2D74 0C2BC9D1 */ jal func_80AF2744 -/* 00828 80AF2D78 AFA40020 */ sw $a0, 0x0020($sp) -/* 0082C 80AF2D7C 0C2BC9E3 */ jal func_80AF278C -/* 00830 80AF2D80 8FA40020 */ lw $a0, 0x0020($sp) -/* 00834 80AF2D84 AFA2001C */ sw $v0, 0x001C($sp) -/* 00838 80AF2D88 0C2BC982 */ jal func_80AF2608 -/* 0083C 80AF2D8C 8FA40020 */ lw $a0, 0x0020($sp) -/* 00840 80AF2D90 8FA40020 */ lw $a0, 0x0020($sp) -/* 00844 80AF2D94 0C2BCB15 */ jal func_80AF2C54 -/* 00848 80AF2D98 8FA5001C */ lw $a1, 0x001C($sp) -/* 0084C 80AF2D9C 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00850 80AF2DA0 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 00854 80AF2DA4 03E00008 */ jr $ra -/* 00858 80AF2DA8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF2DAC.s b/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF2DAC.s deleted file mode 100644 index 04362a1956..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF2DAC.s +++ /dev/null @@ -1,19 +0,0 @@ -glabel func_80AF2DAC -/* 0085C 80AF2DAC 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00860 80AF2DB0 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00864 80AF2DB4 AFA40018 */ sw $a0, 0x0018($sp) -/* 00868 80AF2DB8 0C2BC9D1 */ jal func_80AF2744 -/* 0086C 80AF2DBC AFA5001C */ sw $a1, 0x001C($sp) -/* 00870 80AF2DC0 0C2BC9E3 */ jal func_80AF278C -/* 00874 80AF2DC4 8FA40018 */ lw $a0, 0x0018($sp) -/* 00878 80AF2DC8 0C2BC982 */ jal func_80AF2608 -/* 0087C 80AF2DCC 8FA40018 */ lw $a0, 0x0018($sp) -/* 00880 80AF2DD0 8FA40018 */ lw $a0, 0x0018($sp) -/* 00884 80AF2DD4 0C2BCB1A */ jal func_80AF2C68 -/* 00888 80AF2DD8 8FA5001C */ lw $a1, 0x001C($sp) -/* 0088C 80AF2DDC 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00890 80AF2DE0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00894 80AF2DE4 03E00008 */ jr $ra -/* 00898 80AF2DE8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF2DEC.s b/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF2DEC.s deleted file mode 100644 index 2d037773b9..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF2DEC.s +++ /dev/null @@ -1,15 +0,0 @@ -glabel func_80AF2DEC -/* 0089C 80AF2DEC 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 008A0 80AF2DF0 AFBF0014 */ sw $ra, 0x0014($sp) -/* 008A4 80AF2DF4 0C2BC9D1 */ jal func_80AF2744 -/* 008A8 80AF2DF8 AFA40018 */ sw $a0, 0x0018($sp) -/* 008AC 80AF2DFC 0C2BC9E3 */ jal func_80AF278C -/* 008B0 80AF2E00 8FA40018 */ lw $a0, 0x0018($sp) -/* 008B4 80AF2E04 0C2BC982 */ jal func_80AF2608 -/* 008B8 80AF2E08 8FA40018 */ lw $a0, 0x0018($sp) -/* 008BC 80AF2E0C 8FBF0014 */ lw $ra, 0x0014($sp) -/* 008C0 80AF2E10 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 008C4 80AF2E14 03E00008 */ jr $ra -/* 008C8 80AF2E18 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF2E1C.s b/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF2E1C.s deleted file mode 100644 index 086d1c763d..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF2E1C.s +++ /dev/null @@ -1,21 +0,0 @@ -glabel func_80AF2E1C -/* 008CC 80AF2E1C 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 008D0 80AF2E20 AFA50024 */ sw $a1, 0x0024($sp) -/* 008D4 80AF2E24 AFBF001C */ sw $ra, 0x001C($sp) -/* 008D8 80AF2E28 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 008DC 80AF2E2C 24A504CC */ addiu $a1, $a1, 0x04CC ## $a1 = 060004CC -/* 008E0 80AF2E30 AFA00010 */ sw $zero, 0x0010($sp) -/* 008E4 80AF2E34 AFA40020 */ sw $a0, 0x0020($sp) -/* 008E8 80AF2E38 24060002 */ addiu $a2, $zero, 0x0002 ## $a2 = 00000002 -/* 008EC 80AF2E3C 0C2BCA3A */ jal func_80AF28E8 -/* 008F0 80AF2E40 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 008F4 80AF2E44 8FA40020 */ lw $a0, 0x0020($sp) -/* 008F8 80AF2E48 240E0007 */ addiu $t6, $zero, 0x0007 ## $t6 = 00000007 -/* 008FC 80AF2E4C AC8E02A8 */ sw $t6, 0x02A8($a0) ## 000002A8 -/* 00900 80AF2E50 A08000C8 */ sb $zero, 0x00C8($a0) ## 000000C8 -/* 00904 80AF2E54 8FBF001C */ lw $ra, 0x001C($sp) -/* 00908 80AF2E58 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 0090C 80AF2E5C 03E00008 */ jr $ra -/* 00910 80AF2E60 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF2E64.s b/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF2E64.s deleted file mode 100644 index 2b3d701f17..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF2E64.s +++ /dev/null @@ -1,11 +0,0 @@ -glabel func_80AF2E64 -/* 00914 80AF2E64 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00918 80AF2E68 AFBF0014 */ sw $ra, 0x0014($sp) -/* 0091C 80AF2E6C 0C01E233 */ jal func_800788CC -/* 00920 80AF2E70 24044834 */ addiu $a0, $zero, 0x4834 ## $a0 = 00004834 -/* 00924 80AF2E74 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00928 80AF2E78 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 0092C 80AF2E7C 03E00008 */ jr $ra -/* 00930 80AF2E80 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF2E84.s b/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF2E84.s deleted file mode 100644 index c5e1a0555a..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF2E84.s +++ /dev/null @@ -1,36 +0,0 @@ -glabel func_80AF2E84 -/* 00934 80AF2E84 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 00938 80AF2E88 00A03025 */ or $a2, $a1, $zero ## $a2 = 00000000 -/* 0093C 80AF2E8C 00802825 */ or $a1, $a0, $zero ## $a1 = 00000000 -/* 00940 80AF2E90 AFBF0034 */ sw $ra, 0x0034($sp) -/* 00944 80AF2E94 AFA40038 */ sw $a0, 0x0038($sp) -/* 00948 80AF2E98 C4A40024 */ lwc1 $f4, 0x0024($a1) ## 00000024 -/* 0094C 80AF2E9C 3C0E8016 */ lui $t6, 0x8016 ## $t6 = 80160000 -/* 00950 80AF2EA0 8DCEFA90 */ lw $t6, -0x0570($t6) ## 8015FA90 -/* 00954 80AF2EA4 E7A40010 */ swc1 $f4, 0x0010($sp) -/* 00958 80AF2EA8 3C0141C0 */ lui $at, 0x41C0 ## $at = 41C00000 -/* 0095C 80AF2EAC 85CF147A */ lh $t7, 0x147A($t6) ## 8016147A -/* 00960 80AF2EB0 44815000 */ mtc1 $at, $f10 ## $f10 = 24.00 -/* 00964 80AF2EB4 C4B20028 */ lwc1 $f18, 0x0028($a1) ## 00000028 -/* 00968 80AF2EB8 448F3000 */ mtc1 $t7, $f6 ## $f6 = 0.00 -/* 0096C 80AF2EBC 24180008 */ addiu $t8, $zero, 0x0008 ## $t8 = 00000008 -/* 00970 80AF2EC0 24C41C24 */ addiu $a0, $a2, 0x1C24 ## $a0 = 00001C24 -/* 00974 80AF2EC4 46803220 */ cvt.s.w $f8, $f6 -/* 00978 80AF2EC8 240700F5 */ addiu $a3, $zero, 0x00F5 ## $a3 = 000000F5 -/* 0097C 80AF2ECC 460A4400 */ add.s $f16, $f8, $f10 -/* 00980 80AF2ED0 46128100 */ add.s $f4, $f16, $f18 -/* 00984 80AF2ED4 E7A40014 */ swc1 $f4, 0x0014($sp) -/* 00988 80AF2ED8 C4A6002C */ lwc1 $f6, 0x002C($a1) ## 0000002C -/* 0098C 80AF2EDC AFB80028 */ sw $t8, 0x0028($sp) -/* 00990 80AF2EE0 AFA00024 */ sw $zero, 0x0024($sp) -/* 00994 80AF2EE4 AFA00020 */ sw $zero, 0x0020($sp) -/* 00998 80AF2EE8 AFA0001C */ sw $zero, 0x001C($sp) -/* 0099C 80AF2EEC 0C00C916 */ jal Actor_SpawnAttached - -/* 009A0 80AF2EF0 E7A60018 */ swc1 $f6, 0x0018($sp) -/* 009A4 80AF2EF4 8FBF0034 */ lw $ra, 0x0034($sp) -/* 009A8 80AF2EF8 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 -/* 009AC 80AF2EFC 03E00008 */ jr $ra -/* 009B0 80AF2F00 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF2F04.s b/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF2F04.s deleted file mode 100644 index af5a05397c..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF2F04.s +++ /dev/null @@ -1,25 +0,0 @@ -glabel func_80AF2F04 -/* 009B4 80AF2F04 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 009B8 80AF2F08 AFBF0014 */ sw $ra, 0x0014($sp) -/* 009BC 80AF2F0C AFA40018 */ sw $a0, 0x0018($sp) -/* 009C0 80AF2F10 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 -/* 009C4 80AF2F14 0C2BC9F4 */ jal func_80AF27D0 -/* 009C8 80AF2F18 24070003 */ addiu $a3, $zero, 0x0003 ## $a3 = 00000003 -/* 009CC 80AF2F1C 1040000A */ beq $v0, $zero, .L80AF2F48 -/* 009D0 80AF2F20 8FA40018 */ lw $a0, 0x0018($sp) -/* 009D4 80AF2F24 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 -/* 009D8 80AF2F28 240E0008 */ addiu $t6, $zero, 0x0008 ## $t6 = 00000008 -/* 009DC 80AF2F2C 240F0002 */ addiu $t7, $zero, 0x0002 ## $t7 = 00000002 -/* 009E0 80AF2F30 AC8E02A8 */ sw $t6, 0x02A8($a0) ## 000002A8 -/* 009E4 80AF2F34 AC8F02AC */ sw $t7, 0x02AC($a0) ## 000002AC -/* 009E8 80AF2F38 AC8002B4 */ sw $zero, 0x02B4($a0) ## 000002B4 -/* 009EC 80AF2F3C A08000C8 */ sb $zero, 0x00C8($a0) ## 000000C8 -/* 009F0 80AF2F40 0C2BCB99 */ jal func_80AF2E64 -/* 009F4 80AF2F44 E48402B0 */ swc1 $f4, 0x02B0($a0) ## 000002B0 -.L80AF2F48: -/* 009F8 80AF2F48 8FBF0014 */ lw $ra, 0x0014($sp) -/* 009FC 80AF2F4C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00A00 80AF2F50 03E00008 */ jr $ra -/* 00A04 80AF2F54 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF2F58.s b/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF2F58.s deleted file mode 100644 index b171bf8054..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF2F58.s +++ /dev/null @@ -1,91 +0,0 @@ -glabel func_80AF2F58 -/* 00A08 80AF2F58 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00A0C 80AF2F5C AFBF0014 */ sw $ra, 0x0014($sp) -/* 00A10 80AF2F60 AFA40018 */ sw $a0, 0x0018($sp) -/* 00A14 80AF2F64 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 -/* 00A18 80AF2F68 0C2BC9F4 */ jal func_80AF27D0 -/* 00A1C 80AF2F6C 24070003 */ addiu $a3, $zero, 0x0003 ## $a3 = 00000003 -/* 00A20 80AF2F70 10400025 */ beq $v0, $zero, .L80AF3008 -/* 00A24 80AF2F74 8FA40018 */ lw $a0, 0x0018($sp) -/* 00A28 80AF2F78 3C014120 */ lui $at, 0x4120 ## $at = 41200000 -/* 00A2C 80AF2F7C 44811000 */ mtc1 $at, $f2 ## $f2 = 10.00 -/* 00A30 80AF2F80 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 00A34 80AF2F84 248202B0 */ addiu $v0, $a0, 0x02B0 ## $v0 = 000002B0 -/* 00A38 80AF2F88 C4440000 */ lwc1 $f4, 0x0000($v0) ## 000002B0 -/* 00A3C 80AF2F8C 44813000 */ mtc1 $at, $f6 ## $f6 = 1.00 -/* 00A40 80AF2F90 3C058016 */ lui $a1, 0x8016 ## $a1 = 80160000 -/* 00A44 80AF2F94 24A5FA90 */ addiu $a1, $a1, 0xFA90 ## $a1 = 8015FA90 -/* 00A48 80AF2F98 46062200 */ add.s $f8, $f4, $f6 -/* 00A4C 80AF2F9C 24180009 */ addiu $t8, $zero, 0x0009 ## $t8 = 00000009 -/* 00A50 80AF2FA0 24190001 */ addiu $t9, $zero, 0x0001 ## $t9 = 00000001 -/* 00A54 80AF2FA4 E4480000 */ swc1 $f8, 0x0000($v0) ## 000002B0 -/* 00A58 80AF2FA8 8CAE0000 */ lw $t6, 0x0000($a1) ## 8015FA90 -/* 00A5C 80AF2FAC C4400000 */ lwc1 $f0, 0x0000($v0) ## 000002B0 -/* 00A60 80AF2FB0 85CF145E */ lh $t7, 0x145E($t6) ## 0000145E -/* 00A64 80AF2FB4 448F5000 */ mtc1 $t7, $f10 ## $f10 = 0.00 -/* 00A68 80AF2FB8 00000000 */ nop -/* 00A6C 80AF2FBC 46805420 */ cvt.s.w $f16, $f10 -/* 00A70 80AF2FC0 46028480 */ add.s $f18, $f16, $f2 -/* 00A74 80AF2FC4 4600903E */ c.le.s $f18, $f0 -/* 00A78 80AF2FC8 00000000 */ nop -/* 00A7C 80AF2FCC 45000020 */ bc1f .L80AF3050 -/* 00A80 80AF2FD0 00000000 */ nop -/* 00A84 80AF2FD4 AC9802A8 */ sw $t8, 0x02A8($a0) ## 000002A8 -/* 00A88 80AF2FD8 AC9902AC */ sw $t9, 0x02AC($a0) ## 000002AC -/* 00A8C 80AF2FDC 8CA80000 */ lw $t0, 0x0000($a1) ## 8015FA90 -/* 00A90 80AF2FE0 240300FF */ addiu $v1, $zero, 0x00FF ## $v1 = 000000FF -/* 00A94 80AF2FE4 8509145E */ lh $t1, 0x145E($t0) ## 0000145E -/* 00A98 80AF2FE8 44892000 */ mtc1 $t1, $f4 ## $f4 = 0.00 -/* 00A9C 80AF2FEC 00000000 */ nop -/* 00AA0 80AF2FF0 468021A0 */ cvt.s.w $f6, $f4 -/* 00AA4 80AF2FF4 46023200 */ add.s $f8, $f6, $f2 -/* 00AA8 80AF2FF8 E4480000 */ swc1 $f8, 0x0000($v0) ## 000002B0 -/* 00AAC 80AF2FFC AC8302B4 */ sw $v1, 0x02B4($a0) ## 000002B4 -/* 00AB0 80AF3000 10000026 */ beq $zero, $zero, .L80AF309C -/* 00AB4 80AF3004 A08300C8 */ sb $v1, 0x00C8($a0) ## 000000C8 -.L80AF3008: -/* 00AB8 80AF3008 248202B0 */ addiu $v0, $a0, 0x02B0 ## $v0 = 000002B0 -/* 00ABC 80AF300C 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 00AC0 80AF3010 44818000 */ mtc1 $at, $f16 ## $f16 = 1.00 -/* 00AC4 80AF3014 C44A0000 */ lwc1 $f10, 0x0000($v0) ## 000002B0 -/* 00AC8 80AF3018 44801000 */ mtc1 $zero, $f2 ## $f2 = 0.00 -/* 00ACC 80AF301C 46105481 */ sub.s $f18, $f10, $f16 -/* 00AD0 80AF3020 E4520000 */ swc1 $f18, 0x0000($v0) ## 000002B0 -/* 00AD4 80AF3024 C4400000 */ lwc1 $f0, 0x0000($v0) ## 000002B0 -/* 00AD8 80AF3028 4602003E */ c.le.s $f0, $f2 -/* 00ADC 80AF302C 00000000 */ nop -/* 00AE0 80AF3030 45000007 */ bc1f .L80AF3050 -/* 00AE4 80AF3034 240A0007 */ addiu $t2, $zero, 0x0007 ## $t2 = 00000007 -/* 00AE8 80AF3038 AC8A02A8 */ sw $t2, 0x02A8($a0) ## 000002A8 -/* 00AEC 80AF303C AC8002AC */ sw $zero, 0x02AC($a0) ## 000002AC -/* 00AF0 80AF3040 E4420000 */ swc1 $f2, 0x0000($v0) ## 000002B0 -/* 00AF4 80AF3044 AC8002B4 */ sw $zero, 0x02B4($a0) ## 000002B4 -/* 00AF8 80AF3048 10000014 */ beq $zero, $zero, .L80AF309C -/* 00AFC 80AF304C A08000C8 */ sb $zero, 0x00C8($a0) ## 000000C8 -.L80AF3050: -/* 00B00 80AF3050 3C058016 */ lui $a1, 0x8016 ## $a1 = 80160000 -/* 00B04 80AF3054 24A5FA90 */ addiu $a1, $a1, 0xFA90 ## $a1 = 8015FA90 -/* 00B08 80AF3058 8CAB0000 */ lw $t3, 0x0000($a1) ## 8015FA90 -/* 00B0C 80AF305C 3C014120 */ lui $at, 0x4120 ## $at = 41200000 -/* 00B10 80AF3060 44811000 */ mtc1 $at, $f2 ## $f2 = 10.00 -/* 00B14 80AF3064 856C145E */ lh $t4, 0x145E($t3) ## 0000145E -/* 00B18 80AF3068 3C01437F */ lui $at, 0x437F ## $at = 437F0000 -/* 00B1C 80AF306C 44818000 */ mtc1 $at, $f16 ## $f16 = 255.00 -/* 00B20 80AF3070 448C2000 */ mtc1 $t4, $f4 ## $f4 = 0.00 -/* 00B24 80AF3074 00000000 */ nop -/* 00B28 80AF3078 468021A0 */ cvt.s.w $f6, $f4 -/* 00B2C 80AF307C 46023200 */ add.s $f8, $f6, $f2 -/* 00B30 80AF3080 46080283 */ div.s $f10, $f0, $f8 -/* 00B34 80AF3084 46105482 */ mul.s $f18, $f10, $f16 -/* 00B38 80AF3088 4600910D */ trunc.w.s $f4, $f18 -/* 00B3C 80AF308C 44022000 */ mfc1 $v0, $f4 -/* 00B40 80AF3090 00000000 */ nop -/* 00B44 80AF3094 AC8202B4 */ sw $v0, 0x02B4($a0) ## 000002B4 -/* 00B48 80AF3098 A08200C8 */ sb $v0, 0x00C8($a0) ## 000000C8 -.L80AF309C: -/* 00B4C 80AF309C 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00B50 80AF30A0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00B54 80AF30A4 03E00008 */ jr $ra -/* 00B58 80AF30A8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF30AC.s b/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF30AC.s deleted file mode 100644 index 1233bca3e4..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF30AC.s +++ /dev/null @@ -1,43 +0,0 @@ -glabel func_80AF30AC -/* 00B5C 80AF30AC 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00B60 80AF30B0 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00B64 80AF30B4 AFA5001C */ sw $a1, 0x001C($sp) -/* 00B68 80AF30B8 AFA40018 */ sw $a0, 0x0018($sp) -/* 00B6C 80AF30BC 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 -/* 00B70 80AF30C0 0C2BCA07 */ jal func_80AF281C -/* 00B74 80AF30C4 24070003 */ addiu $a3, $zero, 0x0003 ## $a3 = 00000003 -/* 00B78 80AF30C8 1040001A */ beq $v0, $zero, .L80AF3134 -/* 00B7C 80AF30CC 8FA40018 */ lw $a0, 0x0018($sp) -/* 00B80 80AF30D0 240E0008 */ addiu $t6, $zero, 0x0008 ## $t6 = 00000008 -/* 00B84 80AF30D4 240F0002 */ addiu $t7, $zero, 0x0002 ## $t7 = 00000002 -/* 00B88 80AF30D8 AC8E02A8 */ sw $t6, 0x02A8($a0) ## 000002A8 -/* 00B8C 80AF30DC AC8F02AC */ sw $t7, 0x02AC($a0) ## 000002AC -/* 00B90 80AF30E0 3C188016 */ lui $t8, 0x8016 ## $t8 = 80160000 -/* 00B94 80AF30E4 8F18FA90 */ lw $t8, -0x0570($t8) ## 8015FA90 -/* 00B98 80AF30E8 3C014120 */ lui $at, 0x4120 ## $at = 41200000 -/* 00B9C 80AF30EC 44814000 */ mtc1 $at, $f8 ## $f8 = 10.00 -/* 00BA0 80AF30F0 8719145E */ lh $t9, 0x145E($t8) ## 8016145E -/* 00BA4 80AF30F4 8C8902B8 */ lw $t1, 0x02B8($a0) ## 000002B8 -/* 00BA8 80AF30F8 240800FF */ addiu $t0, $zero, 0x00FF ## $t0 = 000000FF -/* 00BAC 80AF30FC 44992000 */ mtc1 $t9, $f4 ## $f4 = 0.00 -/* 00BB0 80AF3100 AC8802B4 */ sw $t0, 0x02B4($a0) ## 000002B4 -/* 00BB4 80AF3104 468021A0 */ cvt.s.w $f6, $f4 -/* 00BB8 80AF3108 46083280 */ add.s $f10, $f6, $f8 -/* 00BBC 80AF310C 15200007 */ bne $t1, $zero, .L80AF312C -/* 00BC0 80AF3110 E48A02B0 */ swc1 $f10, 0x02B0($a0) ## 000002B0 -/* 00BC4 80AF3114 8FA5001C */ lw $a1, 0x001C($sp) -/* 00BC8 80AF3118 0C2BCBA1 */ jal func_80AF2E84 -/* 00BCC 80AF311C AFA40018 */ sw $a0, 0x0018($sp) -/* 00BD0 80AF3120 8FA40018 */ lw $a0, 0x0018($sp) -/* 00BD4 80AF3124 240A0001 */ addiu $t2, $zero, 0x0001 ## $t2 = 00000001 -/* 00BD8 80AF3128 AC8A02B8 */ sw $t2, 0x02B8($a0) ## 000002B8 -.L80AF312C: -/* 00BDC 80AF312C 240B00FF */ addiu $t3, $zero, 0x00FF ## $t3 = 000000FF -/* 00BE0 80AF3130 A08B00C8 */ sb $t3, 0x00C8($a0) ## 000000C8 -.L80AF3134: -/* 00BE4 80AF3134 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00BE8 80AF3138 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00BEC 80AF313C 03E00008 */ jr $ra -/* 00BF0 80AF3140 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF3144.s b/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF3144.s deleted file mode 100644 index 4cf90133af..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF3144.s +++ /dev/null @@ -1,15 +0,0 @@ -glabel func_80AF3144 -/* 00BF4 80AF3144 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00BF8 80AF3148 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00BFC 80AF314C AFA40018 */ sw $a0, 0x0018($sp) -/* 00C00 80AF3150 0C2BCBC1 */ jal func_80AF2F04 -/* 00C04 80AF3154 AFA5001C */ sw $a1, 0x001C($sp) -/* 00C08 80AF3158 8FA40018 */ lw $a0, 0x0018($sp) -/* 00C0C 80AF315C 0C2BC9B4 */ jal func_80AF26D0 -/* 00C10 80AF3160 8FA5001C */ lw $a1, 0x001C($sp) -/* 00C14 80AF3164 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00C18 80AF3168 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00C1C 80AF316C 03E00008 */ jr $ra -/* 00C20 80AF3170 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF3174.s b/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF3174.s deleted file mode 100644 index 718a91d4ce..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF3174.s +++ /dev/null @@ -1,24 +0,0 @@ -glabel func_80AF3174 -/* 00C24 80AF3174 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 00C28 80AF3178 AFBF001C */ sw $ra, 0x001C($sp) -/* 00C2C 80AF317C AFB00018 */ sw $s0, 0x0018($sp) -/* 00C30 80AF3180 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00C34 80AF3184 0C2BC9D1 */ jal func_80AF2744 -/* 00C38 80AF3188 AFA50024 */ sw $a1, 0x0024($sp) -/* 00C3C 80AF318C 0C2BC9E3 */ jal func_80AF278C -/* 00C40 80AF3190 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00C44 80AF3194 0C2BC982 */ jal func_80AF2608 -/* 00C48 80AF3198 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00C4C 80AF319C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00C50 80AF31A0 0C2BCBD6 */ jal func_80AF2F58 -/* 00C54 80AF31A4 8FA50024 */ lw $a1, 0x0024($sp) -/* 00C58 80AF31A8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00C5C 80AF31AC 0C2BC9B4 */ jal func_80AF26D0 -/* 00C60 80AF31B0 8FA50024 */ lw $a1, 0x0024($sp) -/* 00C64 80AF31B4 8FBF001C */ lw $ra, 0x001C($sp) -/* 00C68 80AF31B8 8FB00018 */ lw $s0, 0x0018($sp) -/* 00C6C 80AF31BC 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 00C70 80AF31C0 03E00008 */ jr $ra -/* 00C74 80AF31C4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF31C8.s b/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF31C8.s deleted file mode 100644 index 535bc924d9..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF31C8.s +++ /dev/null @@ -1,24 +0,0 @@ -glabel func_80AF31C8 -/* 00C78 80AF31C8 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 00C7C 80AF31CC AFBF001C */ sw $ra, 0x001C($sp) -/* 00C80 80AF31D0 AFB00018 */ sw $s0, 0x0018($sp) -/* 00C84 80AF31D4 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00C88 80AF31D8 0C2BC9D1 */ jal func_80AF2744 -/* 00C8C 80AF31DC AFA50024 */ sw $a1, 0x0024($sp) -/* 00C90 80AF31E0 0C2BC9E3 */ jal func_80AF278C -/* 00C94 80AF31E4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00C98 80AF31E8 0C2BC982 */ jal func_80AF2608 -/* 00C9C 80AF31EC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00CA0 80AF31F0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00CA4 80AF31F4 0C2BCC2B */ jal func_80AF30AC -/* 00CA8 80AF31F8 8FA50024 */ lw $a1, 0x0024($sp) -/* 00CAC 80AF31FC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00CB0 80AF3200 0C2BC9B4 */ jal func_80AF26D0 -/* 00CB4 80AF3204 8FA50024 */ lw $a1, 0x0024($sp) -/* 00CB8 80AF3208 8FBF001C */ lw $ra, 0x001C($sp) -/* 00CBC 80AF320C 8FB00018 */ lw $s0, 0x0018($sp) -/* 00CC0 80AF3210 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 00CC4 80AF3214 03E00008 */ jr $ra -/* 00CC8 80AF3218 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF321C.s b/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF321C.s deleted file mode 100644 index f91d4c693c..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF321C.s +++ /dev/null @@ -1,97 +0,0 @@ -glabel func_80AF321C -/* 00CCC 80AF321C 27BDFF88 */ addiu $sp, $sp, 0xFF88 ## $sp = FFFFFF88 -/* 00CD0 80AF3220 AFBF002C */ sw $ra, 0x002C($sp) -/* 00CD4 80AF3224 AFB00028 */ sw $s0, 0x0028($sp) -/* 00CD8 80AF3228 AFA40078 */ sw $a0, 0x0078($sp) -/* 00CDC 80AF322C AFA5007C */ sw $a1, 0x007C($sp) -/* 00CE0 80AF3230 848202A4 */ lh $v0, 0x02A4($a0) ## 000002A4 -/* 00CE4 80AF3234 3C1880AF */ lui $t8, %hi(D_80AF410C) ## $t8 = 80AF0000 -/* 00CE8 80AF3238 3C0680AF */ lui $a2, %hi(D_80AF5140) ## $a2 = 80AF0000 -/* 00CEC 80AF323C 00027880 */ sll $t7, $v0, 2 -/* 00CF0 80AF3240 030FC021 */ addu $t8, $t8, $t7 -/* 00CF4 80AF3244 8F18410C */ lw $t8, %lo(D_80AF410C)($t8) -/* 00CF8 80AF3248 24C65140 */ addiu $a2, $a2, %lo(D_80AF5140) ## $a2 = 80AF5140 -/* 00CFC 80AF324C 27A40050 */ addiu $a0, $sp, 0x0050 ## $a0 = FFFFFFD8 -/* 00D00 80AF3250 AFB80068 */ sw $t8, 0x0068($sp) -/* 00D04 80AF3254 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 -/* 00D08 80AF3258 24070108 */ addiu $a3, $zero, 0x0108 ## $a3 = 00000108 -/* 00D0C 80AF325C 0C031AB1 */ jal func_800C6AC4 -/* 00D10 80AF3260 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 -/* 00D14 80AF3264 8FA9007C */ lw $t1, 0x007C($sp) -/* 00D18 80AF3268 0C024F61 */ jal func_80093D84 -/* 00D1C 80AF326C 8D240000 */ lw $a0, 0x0000($t1) ## 00000000 -/* 00D20 80AF3270 8FA70068 */ lw $a3, 0x0068($sp) -/* 00D24 80AF3274 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 00D28 80AF3278 3C0BDB06 */ lui $t3, 0xDB06 ## $t3 = DB060000 -/* 00D2C 80AF327C 00076100 */ sll $t4, $a3, 4 -/* 00D30 80AF3280 000C6F02 */ srl $t5, $t4, 28 -/* 00D34 80AF3284 3C0F8016 */ lui $t7, 0x8016 ## $t7 = 80160000 -/* 00D38 80AF3288 244A0008 */ addiu $t2, $v0, 0x0008 ## $t2 = 00000008 -/* 00D3C 80AF328C AE0A02D0 */ sw $t2, 0x02D0($s0) ## 000002D0 -/* 00D40 80AF3290 25EF6FA8 */ addiu $t7, $t7, 0x6FA8 ## $t7 = 80166FA8 -/* 00D44 80AF3294 000D7080 */ sll $t6, $t5, 2 -/* 00D48 80AF3298 356B0020 */ ori $t3, $t3, 0x0020 ## $t3 = DB060020 -/* 00D4C 80AF329C 01CF2021 */ addu $a0, $t6, $t7 -/* 00D50 80AF32A0 AC4B0000 */ sw $t3, 0x0000($v0) ## 00000000 -/* 00D54 80AF32A4 8C980000 */ lw $t8, 0x0000($a0) ## 00000000 -/* 00D58 80AF32A8 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 -/* 00D5C 80AF32AC 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF -/* 00D60 80AF32B0 00E12824 */ and $a1, $a3, $at -/* 00D64 80AF32B4 3C068000 */ lui $a2, 0x8000 ## $a2 = 80000000 -/* 00D68 80AF32B8 0305C821 */ addu $t9, $t8, $a1 -/* 00D6C 80AF32BC 03264821 */ addu $t1, $t9, $a2 -/* 00D70 80AF32C0 AC490004 */ sw $t1, 0x0004($v0) ## 00000004 -/* 00D74 80AF32C4 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 00D78 80AF32C8 3C0BDB06 */ lui $t3, 0xDB06 ## $t3 = DB060000 -/* 00D7C 80AF32CC 356B0024 */ ori $t3, $t3, 0x0024 ## $t3 = DB060024 -/* 00D80 80AF32D0 244A0008 */ addiu $t2, $v0, 0x0008 ## $t2 = 00000008 -/* 00D84 80AF32D4 AE0A02D0 */ sw $t2, 0x02D0($s0) ## 000002D0 -/* 00D88 80AF32D8 AC4B0000 */ sw $t3, 0x0000($v0) ## 00000000 -/* 00D8C 80AF32DC 8C8C0000 */ lw $t4, 0x0000($a0) ## 00000000 -/* 00D90 80AF32E0 3C18FB00 */ lui $t8, 0xFB00 ## $t8 = FB000000 -/* 00D94 80AF32E4 3C0BDB06 */ lui $t3, 0xDB06 ## $t3 = DB060000 -/* 00D98 80AF32E8 01856821 */ addu $t5, $t4, $a1 -/* 00D9C 80AF32EC 01A67021 */ addu $t6, $t5, $a2 -/* 00DA0 80AF32F0 AC4E0004 */ sw $t6, 0x0004($v0) ## 00000004 -/* 00DA4 80AF32F4 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 00DA8 80AF32F8 8FA80078 */ lw $t0, 0x0078($sp) -/* 00DAC 80AF32FC 3C0C8011 */ lui $t4, 0x8011 ## $t4 = 80110000 -/* 00DB0 80AF3300 244F0008 */ addiu $t7, $v0, 0x0008 ## $t7 = 00000008 -/* 00DB4 80AF3304 AE0F02D0 */ sw $t7, 0x02D0($s0) ## 000002D0 -/* 00DB8 80AF3308 AC580000 */ sw $t8, 0x0000($v0) ## 00000000 -/* 00DBC 80AF330C 8D1902B4 */ lw $t9, 0x02B4($t0) ## 000002B4 -/* 00DC0 80AF3310 258C6280 */ addiu $t4, $t4, 0x6280 ## $t4 = 80116280 -/* 00DC4 80AF3314 356B0030 */ ori $t3, $t3, 0x0030 ## $t3 = DB060030 -/* 00DC8 80AF3318 332900FF */ andi $t1, $t9, 0x00FF ## $t1 = 00000000 -/* 00DCC 80AF331C AC490004 */ sw $t1, 0x0004($v0) ## 00000004 -/* 00DD0 80AF3320 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 00DD4 80AF3324 244A0008 */ addiu $t2, $v0, 0x0008 ## $t2 = 00000008 -/* 00DD8 80AF3328 AE0A02D0 */ sw $t2, 0x02D0($s0) ## 000002D0 -/* 00DDC 80AF332C AC4C0004 */ sw $t4, 0x0004($v0) ## 00000004 -/* 00DE0 80AF3330 AC4B0000 */ sw $t3, 0x0000($v0) ## 00000000 -/* 00DE4 80AF3334 2502014C */ addiu $v0, $t0, 0x014C ## $v0 = 0000014C -/* 00DE8 80AF3338 8C450004 */ lw $a1, 0x0004($v0) ## 00000150 -/* 00DEC 80AF333C 8C460020 */ lw $a2, 0x0020($v0) ## 0000016C -/* 00DF0 80AF3340 90470002 */ lbu $a3, 0x0002($v0) ## 0000014E -/* 00DF4 80AF3344 AFA00018 */ sw $zero, 0x0018($sp) -/* 00DF8 80AF3348 AFA00014 */ sw $zero, 0x0014($sp) -/* 00DFC 80AF334C AFA00010 */ sw $zero, 0x0010($sp) -/* 00E00 80AF3350 8E0D02D0 */ lw $t5, 0x02D0($s0) ## 000002D0 -/* 00E04 80AF3354 8FA4007C */ lw $a0, 0x007C($sp) -/* 00E08 80AF3358 0C0289CF */ jal func_800A273C -/* 00E0C 80AF335C AFAD001C */ sw $t5, 0x001C($sp) -/* 00E10 80AF3360 AE0202D0 */ sw $v0, 0x02D0($s0) ## 000002D0 -/* 00E14 80AF3364 8FAE007C */ lw $t6, 0x007C($sp) -/* 00E18 80AF3368 3C0680AF */ lui $a2, %hi(D_80AF5164) ## $a2 = 80AF0000 -/* 00E1C 80AF336C 24C65164 */ addiu $a2, $a2, %lo(D_80AF5164) ## $a2 = 80AF5164 -/* 00E20 80AF3370 27A40050 */ addiu $a0, $sp, 0x0050 ## $a0 = FFFFFFD8 -/* 00E24 80AF3374 24070123 */ addiu $a3, $zero, 0x0123 ## $a3 = 00000123 -/* 00E28 80AF3378 0C031AD5 */ jal func_800C6B54 -/* 00E2C 80AF337C 8DC50000 */ lw $a1, 0x0000($t6) ## 00000000 -/* 00E30 80AF3380 8FBF002C */ lw $ra, 0x002C($sp) -/* 00E34 80AF3384 8FB00028 */ lw $s0, 0x0028($sp) -/* 00E38 80AF3388 27BD0078 */ addiu $sp, $sp, 0x0078 ## $sp = 00000000 -/* 00E3C 80AF338C 03E00008 */ jr $ra -/* 00E40 80AF3390 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF3394.s b/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF3394.s deleted file mode 100644 index d14eb5eb82..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF3394.s +++ /dev/null @@ -1,22 +0,0 @@ -glabel func_80AF3394 -/* 00E44 80AF3394 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 00E48 80AF3398 AFA50024 */ sw $a1, 0x0024($sp) -/* 00E4C 80AF339C AFBF001C */ sw $ra, 0x001C($sp) -/* 00E50 80AF33A0 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 -/* 00E54 80AF33A4 24A5E630 */ addiu $a1, $a1, 0xE630 ## $a1 = 0600E630 -/* 00E58 80AF33A8 AFA00010 */ sw $zero, 0x0010($sp) -/* 00E5C 80AF33AC AFA40020 */ sw $a0, 0x0020($sp) -/* 00E60 80AF33B0 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 00E64 80AF33B4 0C2BCA3A */ jal func_80AF28E8 -/* 00E68 80AF33B8 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 00E6C 80AF33BC 8FA40020 */ lw $a0, 0x0020($sp) -/* 00E70 80AF33C0 240E000A */ addiu $t6, $zero, 0x000A ## $t6 = 0000000A -/* 00E74 80AF33C4 AC8E02A8 */ sw $t6, 0x02A8($a0) ## 000002A8 -/* 00E78 80AF33C8 AC8002AC */ sw $zero, 0x02AC($a0) ## 000002AC -/* 00E7C 80AF33CC A08000C8 */ sb $zero, 0x00C8($a0) ## 000000C8 -/* 00E80 80AF33D0 8FBF001C */ lw $ra, 0x001C($sp) -/* 00E84 80AF33D4 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 00E88 80AF33D8 03E00008 */ jr $ra -/* 00E8C 80AF33DC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF33E0.s b/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF33E0.s deleted file mode 100644 index 9823343f9b..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF33E0.s +++ /dev/null @@ -1,40 +0,0 @@ -glabel func_80AF33E0 -/* 00E90 80AF33E0 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 00E94 80AF33E4 44813000 */ mtc1 $at, $f6 ## $f6 = 1.00 -/* 00E98 80AF33E8 C48402B0 */ lwc1 $f4, 0x02B0($a0) ## 000002B0 -/* 00E9C 80AF33EC 3C0E8016 */ lui $t6, 0x8016 ## $t6 = 80160000 -/* 00EA0 80AF33F0 3C014120 */ lui $at, 0x4120 ## $at = 41200000 -/* 00EA4 80AF33F4 46062200 */ add.s $f8, $f4, $f6 -/* 00EA8 80AF33F8 44819000 */ mtc1 $at, $f18 ## $f18 = 10.00 -/* 00EAC 80AF33FC 240200FF */ addiu $v0, $zero, 0x00FF ## $v0 = 000000FF -/* 00EB0 80AF3400 E48802B0 */ swc1 $f8, 0x02B0($a0) ## 000002B0 -/* 00EB4 80AF3404 8DCEFA90 */ lw $t6, -0x0570($t6) ## 8015FA90 -/* 00EB8 80AF3408 C48402B0 */ lwc1 $f4, 0x02B0($a0) ## 000002B0 -/* 00EBC 80AF340C 85CF1476 */ lh $t7, 0x1476($t6) ## 80161476 -/* 00EC0 80AF3410 448F5000 */ mtc1 $t7, $f10 ## $f10 = 0.00 -/* 00EC4 80AF3414 00000000 */ nop -/* 00EC8 80AF3418 46805420 */ cvt.s.w $f16, $f10 -/* 00ECC 80AF341C 46128000 */ add.s $f0, $f16, $f18 -/* 00ED0 80AF3420 4604003E */ c.le.s $f0, $f4 -/* 00ED4 80AF3424 00000000 */ nop -/* 00ED8 80AF3428 45020005 */ bc1fl .L80AF3440 -/* 00EDC 80AF342C C48602B0 */ lwc1 $f6, 0x02B0($a0) ## 000002B0 -/* 00EE0 80AF3430 AC8202B4 */ sw $v0, 0x02B4($a0) ## 000002B4 -/* 00EE4 80AF3434 03E00008 */ jr $ra -/* 00EE8 80AF3438 A08200C8 */ sb $v0, 0x00C8($a0) ## 000000C8 -.L80AF343C: -/* 00EEC 80AF343C C48602B0 */ lwc1 $f6, 0x02B0($a0) ## 000002B0 -.L80AF3440: -/* 00EF0 80AF3440 3C01437F */ lui $at, 0x437F ## $at = 437F0000 -/* 00EF4 80AF3444 44815000 */ mtc1 $at, $f10 ## $f10 = 255.00 -/* 00EF8 80AF3448 46003203 */ div.s $f8, $f6, $f0 -/* 00EFC 80AF344C 460A4402 */ mul.s $f16, $f8, $f10 -/* 00F00 80AF3450 4600848D */ trunc.w.s $f18, $f16 -/* 00F04 80AF3454 44029000 */ mfc1 $v0, $f18 -/* 00F08 80AF3458 00000000 */ nop -/* 00F0C 80AF345C AC8202B4 */ sw $v0, 0x02B4($a0) ## 000002B4 -/* 00F10 80AF3460 A08200C8 */ sb $v0, 0x00C8($a0) ## 000000C8 -/* 00F14 80AF3464 03E00008 */ jr $ra -/* 00F18 80AF3468 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF346C.s b/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF346C.s deleted file mode 100644 index 845ce43dbb..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF346C.s +++ /dev/null @@ -1,17 +0,0 @@ -glabel func_80AF346C -/* 00F1C 80AF346C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00F20 80AF3470 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00F24 80AF3474 AFA40018 */ sw $a0, 0x0018($sp) -/* 00F28 80AF3478 0C2BCA1A */ jal func_80AF2868 -/* 00F2C 80AF347C 24060003 */ addiu $a2, $zero, 0x0003 ## $a2 = 00000003 -/* 00F30 80AF3480 8FA40018 */ lw $a0, 0x0018($sp) -/* 00F34 80AF3484 240E000B */ addiu $t6, $zero, 0x000B ## $t6 = 0000000B -/* 00F38 80AF3488 240F0002 */ addiu $t7, $zero, 0x0002 ## $t7 = 00000002 -/* 00F3C 80AF348C AC8E02A8 */ sw $t6, 0x02A8($a0) ## 000002A8 -/* 00F40 80AF3490 AC8F02AC */ sw $t7, 0x02AC($a0) ## 000002AC -/* 00F44 80AF3494 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00F48 80AF3498 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00F4C 80AF349C 03E00008 */ jr $ra -/* 00F50 80AF34A0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF34A4.s b/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF34A4.s deleted file mode 100644 index 1103c7db74..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF34A4.s +++ /dev/null @@ -1,23 +0,0 @@ -glabel func_80AF34A4 -/* 00F54 80AF34A4 3C0E8016 */ lui $t6, 0x8016 ## $t6 = 80160000 -/* 00F58 80AF34A8 8DCEFA90 */ lw $t6, -0x0570($t6) ## 8015FA90 -/* 00F5C 80AF34AC 3C014120 */ lui $at, 0x4120 ## $at = 41200000 -/* 00F60 80AF34B0 44815000 */ mtc1 $at, $f10 ## $f10 = 10.00 -/* 00F64 80AF34B4 85CF1476 */ lh $t7, 0x1476($t6) ## 80161476 -/* 00F68 80AF34B8 C48402B0 */ lwc1 $f4, 0x02B0($a0) ## 000002B0 -/* 00F6C 80AF34BC 2418000C */ addiu $t8, $zero, 0x000C ## $t8 = 0000000C -/* 00F70 80AF34C0 448F3000 */ mtc1 $t7, $f6 ## $f6 = 0.00 -/* 00F74 80AF34C4 24190001 */ addiu $t9, $zero, 0x0001 ## $t9 = 00000001 -/* 00F78 80AF34C8 46803220 */ cvt.s.w $f8, $f6 -/* 00F7C 80AF34CC 460A4400 */ add.s $f16, $f8, $f10 -/* 00F80 80AF34D0 4604803E */ c.le.s $f16, $f4 -/* 00F84 80AF34D4 00000000 */ nop -/* 00F88 80AF34D8 45000003 */ bc1f .L80AF34E8 -/* 00F8C 80AF34DC 00000000 */ nop -/* 00F90 80AF34E0 AC9802A8 */ sw $t8, 0x02A8($a0) ## 000002A8 -/* 00F94 80AF34E4 AC9902AC */ sw $t9, 0x02AC($a0) ## 000002AC -.L80AF34E8: -/* 00F98 80AF34E8 03E00008 */ jr $ra -/* 00F9C 80AF34EC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF34F0.s b/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF34F0.s deleted file mode 100644 index 5bdad613a7..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF34F0.s +++ /dev/null @@ -1,19 +0,0 @@ -glabel func_80AF34F0 -/* 00FA0 80AF34F0 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 00FA4 80AF34F4 AFBF001C */ sw $ra, 0x001C($sp) -/* 00FA8 80AF34F8 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 -/* 00FAC 80AF34FC AFA40020 */ sw $a0, 0x0020($sp) -/* 00FB0 80AF3500 24A5DCAC */ addiu $a1, $a1, 0xDCAC ## $a1 = 0600DCAC -/* 00FB4 80AF3504 AFA00010 */ sw $zero, 0x0010($sp) -/* 00FB8 80AF3508 24060002 */ addiu $a2, $zero, 0x0002 ## $a2 = 00000002 -/* 00FBC 80AF350C 0C2BCA3A */ jal func_80AF28E8 -/* 00FC0 80AF3510 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 00FC4 80AF3514 8FAF0020 */ lw $t7, 0x0020($sp) -/* 00FC8 80AF3518 240E000D */ addiu $t6, $zero, 0x000D ## $t6 = 0000000D -/* 00FCC 80AF351C ADEE02A8 */ sw $t6, 0x02A8($t7) ## 000002A8 -/* 00FD0 80AF3520 8FBF001C */ lw $ra, 0x001C($sp) -/* 00FD4 80AF3524 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 00FD8 80AF3528 03E00008 */ jr $ra -/* 00FDC 80AF352C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF3530.s b/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF3530.s deleted file mode 100644 index 487c66e2fe..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF3530.s +++ /dev/null @@ -1,17 +0,0 @@ -glabel func_80AF3530 -/* 00FE0 80AF3530 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 00FE4 80AF3534 10A00007 */ beq $a1, $zero, .L80AF3554 -/* 00FE8 80AF3538 AFBF001C */ sw $ra, 0x001C($sp) -/* 00FEC 80AF353C 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 -/* 00FF0 80AF3540 24A5F03C */ addiu $a1, $a1, 0xF03C ## $a1 = 0600F03C -/* 00FF4 80AF3544 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 00FF8 80AF3548 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 00FFC 80AF354C 0C2BCA3A */ jal func_80AF28E8 -/* 01000 80AF3550 AFA00010 */ sw $zero, 0x0010($sp) -.L80AF3554: -/* 01004 80AF3554 8FBF001C */ lw $ra, 0x001C($sp) -/* 01008 80AF3558 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 0100C 80AF355C 03E00008 */ jr $ra -/* 01010 80AF3560 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF3564.s b/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF3564.s deleted file mode 100644 index f8cf36a43c..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF3564.s +++ /dev/null @@ -1,50 +0,0 @@ -glabel func_80AF3564 -/* 01014 80AF3564 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 01018 80AF3568 AFA40020 */ sw $a0, 0x0020($sp) -/* 0101C 80AF356C AFBF0014 */ sw $ra, 0x0014($sp) -/* 01020 80AF3570 AFA50024 */ sw $a1, 0x0024($sp) -/* 01024 80AF3574 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 01028 80AF3578 0C2BC9EB */ jal func_80AF27AC -/* 0102C 80AF357C 24050003 */ addiu $a1, $zero, 0x0003 ## $a1 = 00000003 -/* 01030 80AF3580 1040001C */ beq $v0, $zero, .L80AF35F4 -/* 01034 80AF3584 8FA70020 */ lw $a3, 0x0020($sp) -/* 01038 80AF3588 94460000 */ lhu $a2, 0x0000($v0) ## 00000000 -/* 0103C 80AF358C 8CE302BC */ lw $v1, 0x02BC($a3) ## 000002BC -/* 01040 80AF3590 24010007 */ addiu $at, $zero, 0x0007 ## $at = 00000007 -/* 01044 80AF3594 50C30018 */ beql $a2, $v1, .L80AF35F8 -/* 01048 80AF3598 8FBF0014 */ lw $ra, 0x0014($sp) -/* 0104C 80AF359C 10C10006 */ beq $a2, $at, .L80AF35B8 -/* 01050 80AF35A0 00E02025 */ or $a0, $a3, $zero ## $a0 = 00000000 -/* 01054 80AF35A4 24010008 */ addiu $at, $zero, 0x0008 ## $at = 00000008 -/* 01058 80AF35A8 10C10008 */ beq $a2, $at, .L80AF35CC -/* 0105C 80AF35AC 00E02025 */ or $a0, $a3, $zero ## $a0 = 00000000 -/* 01060 80AF35B0 1000000A */ beq $zero, $zero, .L80AF35DC -/* 01064 80AF35B4 3C0480AF */ lui $a0, %hi(D_80AF5188) ## $a0 = 80AF0000 -.L80AF35B8: -/* 01068 80AF35B8 8FA50024 */ lw $a1, 0x0024($sp) -/* 0106C 80AF35BC 0C2BCD1B */ jal func_80AF346C -/* 01070 80AF35C0 AFA60018 */ sw $a2, 0x0018($sp) -/* 01074 80AF35C4 10000009 */ beq $zero, $zero, .L80AF35EC -/* 01078 80AF35C8 8FA60018 */ lw $a2, 0x0018($sp) -.L80AF35CC: -/* 0107C 80AF35CC 0C2BCD3C */ jal func_80AF34F0 -/* 01080 80AF35D0 AFA60018 */ sw $a2, 0x0018($sp) -/* 01084 80AF35D4 10000005 */ beq $zero, $zero, .L80AF35EC -/* 01088 80AF35D8 8FA60018 */ lw $a2, 0x0018($sp) -.L80AF35DC: -/* 0108C 80AF35DC 24845188 */ addiu $a0, $a0, %lo(D_80AF5188) ## $a0 = 00005188 -/* 01090 80AF35E0 0C00084C */ jal osSyncPrintf - -/* 01094 80AF35E4 AFA60018 */ sw $a2, 0x0018($sp) -/* 01098 80AF35E8 8FA60018 */ lw $a2, 0x0018($sp) -.L80AF35EC: -/* 0109C 80AF35EC 8FAE0020 */ lw $t6, 0x0020($sp) -/* 010A0 80AF35F0 ADC602BC */ sw $a2, 0x02BC($t6) ## 000002BC -.L80AF35F4: -/* 010A4 80AF35F4 8FBF0014 */ lw $ra, 0x0014($sp) -.L80AF35F8: -/* 010A8 80AF35F8 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 010AC 80AF35FC 03E00008 */ jr $ra -/* 010B0 80AF3600 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF3604.s b/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF3604.s deleted file mode 100644 index 8b3f60163c..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF3604.s +++ /dev/null @@ -1,11 +0,0 @@ -glabel func_80AF3604 -/* 010B4 80AF3604 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 010B8 80AF3608 AFBF0014 */ sw $ra, 0x0014($sp) -/* 010BC 80AF360C 0C2BCD59 */ jal func_80AF3564 -/* 010C0 80AF3610 00000000 */ nop -/* 010C4 80AF3614 8FBF0014 */ lw $ra, 0x0014($sp) -/* 010C8 80AF3618 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 010CC 80AF361C 03E00008 */ jr $ra -/* 010D0 80AF3620 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF3624.s b/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF3624.s deleted file mode 100644 index 24efa97a58..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF3624.s +++ /dev/null @@ -1,21 +0,0 @@ -glabel func_80AF3624 -/* 010D4 80AF3624 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 010D8 80AF3628 AFBF001C */ sw $ra, 0x001C($sp) -/* 010DC 80AF362C AFB00018 */ sw $s0, 0x0018($sp) -/* 010E0 80AF3630 0C2BC9D1 */ jal func_80AF2744 -/* 010E4 80AF3634 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 010E8 80AF3638 0C2BC9E3 */ jal func_80AF278C -/* 010EC 80AF363C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 010F0 80AF3640 0C2BC982 */ jal func_80AF2608 -/* 010F4 80AF3644 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 010F8 80AF3648 0C2BCCF8 */ jal func_80AF33E0 -/* 010FC 80AF364C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01100 80AF3650 0C2BCD29 */ jal func_80AF34A4 -/* 01104 80AF3654 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01108 80AF3658 8FBF001C */ lw $ra, 0x001C($sp) -/* 0110C 80AF365C 8FB00018 */ lw $s0, 0x0018($sp) -/* 01110 80AF3660 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 01114 80AF3664 03E00008 */ jr $ra -/* 01118 80AF3668 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF366C.s b/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF366C.s deleted file mode 100644 index 8758f99720..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF366C.s +++ /dev/null @@ -1,19 +0,0 @@ -glabel func_80AF366C -/* 0111C 80AF366C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 01120 80AF3670 AFBF0014 */ sw $ra, 0x0014($sp) -/* 01124 80AF3674 AFA40018 */ sw $a0, 0x0018($sp) -/* 01128 80AF3678 0C2BC9D1 */ jal func_80AF2744 -/* 0112C 80AF367C AFA5001C */ sw $a1, 0x001C($sp) -/* 01130 80AF3680 0C2BC9E3 */ jal func_80AF278C -/* 01134 80AF3684 8FA40018 */ lw $a0, 0x0018($sp) -/* 01138 80AF3688 0C2BC982 */ jal func_80AF2608 -/* 0113C 80AF368C 8FA40018 */ lw $a0, 0x0018($sp) -/* 01140 80AF3690 8FA40018 */ lw $a0, 0x0018($sp) -/* 01144 80AF3694 0C2BCD59 */ jal func_80AF3564 -/* 01148 80AF3698 8FA5001C */ lw $a1, 0x001C($sp) -/* 0114C 80AF369C 8FBF0014 */ lw $ra, 0x0014($sp) -/* 01150 80AF36A0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 01154 80AF36A4 03E00008 */ jr $ra -/* 01158 80AF36A8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF36AC.s b/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF36AC.s deleted file mode 100644 index 0b2a0ac35f..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF36AC.s +++ /dev/null @@ -1,19 +0,0 @@ -glabel func_80AF36AC -/* 0115C 80AF36AC 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 01160 80AF36B0 AFBF0014 */ sw $ra, 0x0014($sp) -/* 01164 80AF36B4 0C2BC9D1 */ jal func_80AF2744 -/* 01168 80AF36B8 AFA40020 */ sw $a0, 0x0020($sp) -/* 0116C 80AF36BC 0C2BC9E3 */ jal func_80AF278C -/* 01170 80AF36C0 8FA40020 */ lw $a0, 0x0020($sp) -/* 01174 80AF36C4 AFA2001C */ sw $v0, 0x001C($sp) -/* 01178 80AF36C8 0C2BC982 */ jal func_80AF2608 -/* 0117C 80AF36CC 8FA40020 */ lw $a0, 0x0020($sp) -/* 01180 80AF36D0 8FA40020 */ lw $a0, 0x0020($sp) -/* 01184 80AF36D4 0C2BCD4C */ jal func_80AF3530 -/* 01188 80AF36D8 8FA5001C */ lw $a1, 0x001C($sp) -/* 0118C 80AF36DC 8FBF0014 */ lw $ra, 0x0014($sp) -/* 01190 80AF36E0 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 01194 80AF36E4 03E00008 */ jr $ra -/* 01198 80AF36E8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF36EC.s b/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF36EC.s deleted file mode 100644 index 808be51d67..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF36EC.s +++ /dev/null @@ -1,15 +0,0 @@ -glabel func_80AF36EC -/* 0119C 80AF36EC 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 011A0 80AF36F0 AFBF0014 */ sw $ra, 0x0014($sp) -/* 011A4 80AF36F4 0C2BC9A4 */ jal func_80AF2690 -/* 011A8 80AF36F8 AFA5001C */ sw $a1, 0x001C($sp) -/* 011AC 80AF36FC 8FA4001C */ lw $a0, 0x001C($sp) -/* 011B0 80AF3700 0C00B2DD */ jal Flags_SetSwitch - -/* 011B4 80AF3704 00402825 */ or $a1, $v0, $zero ## $a1 = 00000000 -/* 011B8 80AF3708 8FBF0014 */ lw $ra, 0x0014($sp) -/* 011BC 80AF370C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 011C0 80AF3710 03E00008 */ jr $ra -/* 011C4 80AF3714 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF3718.s b/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF3718.s deleted file mode 100644 index 64983facbb..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF3718.s +++ /dev/null @@ -1,15 +0,0 @@ -glabel func_80AF3718 -/* 011C8 80AF3718 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 011CC 80AF371C AFBF0014 */ sw $ra, 0x0014($sp) -/* 011D0 80AF3720 0C2BC9A4 */ jal func_80AF2690 -/* 011D4 80AF3724 AFA5001C */ sw $a1, 0x001C($sp) -/* 011D8 80AF3728 8FA4001C */ lw $a0, 0x001C($sp) -/* 011DC 80AF372C 0C00B2D0 */ jal Flags_GetSwitch - -/* 011E0 80AF3730 00402825 */ or $a1, $v0, $zero ## $a1 = 00000000 -/* 011E4 80AF3734 8FBF0014 */ lw $ra, 0x0014($sp) -/* 011E8 80AF3738 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 011EC 80AF373C 03E00008 */ jr $ra -/* 011F0 80AF3740 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF3744.s b/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF3744.s deleted file mode 100644 index 0eeb483e60..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF3744.s +++ /dev/null @@ -1,32 +0,0 @@ -glabel func_80AF3744 -/* 011F4 80AF3744 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 011F8 80AF3748 AFBF001C */ sw $ra, 0x001C($sp) -/* 011FC 80AF374C 0C2BCDC6 */ jal func_80AF3718 -/* 01200 80AF3750 AFA40020 */ sw $a0, 0x0020($sp) -/* 01204 80AF3754 10400005 */ beq $v0, $zero, .L80AF376C -/* 01208 80AF3758 8FA40020 */ lw $a0, 0x0020($sp) -/* 0120C 80AF375C 0C00B55C */ jal Actor_Kill - -/* 01210 80AF3760 00000000 */ nop -/* 01214 80AF3764 1000000E */ beq $zero, $zero, .L80AF37A0 -/* 01218 80AF3768 8FBF001C */ lw $ra, 0x001C($sp) -.L80AF376C: -/* 0121C 80AF376C 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 01220 80AF3770 24A50DE8 */ addiu $a1, $a1, 0x0DE8 ## $a1 = 06000DE8 -/* 01224 80AF3774 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 01228 80AF3778 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 0122C 80AF377C AFA00010 */ sw $zero, 0x0010($sp) -/* 01230 80AF3780 0C2BCA3A */ jal func_80AF28E8 -/* 01234 80AF3784 AFA40020 */ sw $a0, 0x0020($sp) -/* 01238 80AF3788 8FA40020 */ lw $a0, 0x0020($sp) -/* 0123C 80AF378C 240E000E */ addiu $t6, $zero, 0x000E ## $t6 = 0000000E -/* 01240 80AF3790 240F0001 */ addiu $t7, $zero, 0x0001 ## $t7 = 00000001 -/* 01244 80AF3794 AC8E02A8 */ sw $t6, 0x02A8($a0) ## 000002A8 -/* 01248 80AF3798 AC8F02AC */ sw $t7, 0x02AC($a0) ## 000002AC -/* 0124C 80AF379C 8FBF001C */ lw $ra, 0x001C($sp) -.L80AF37A0: -/* 01250 80AF37A0 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 01254 80AF37A4 03E00008 */ jr $ra -/* 01258 80AF37A8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF37AC.s b/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF37AC.s deleted file mode 100644 index e45ef9f10d..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF37AC.s +++ /dev/null @@ -1,11 +0,0 @@ -glabel func_80AF37AC -/* 0125C 80AF37AC 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 01260 80AF37B0 AFBF0014 */ sw $ra, 0x0014($sp) -/* 01264 80AF37B4 0C03D719 */ jal func_800F5C64 -/* 01268 80AF37B8 24040051 */ addiu $a0, $zero, 0x0051 ## $a0 = 00000051 -/* 0126C 80AF37BC 8FBF0014 */ lw $ra, 0x0014($sp) -/* 01270 80AF37C0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 01274 80AF37C4 03E00008 */ jr $ra -/* 01278 80AF37C8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF37CC.s b/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF37CC.s deleted file mode 100644 index 4a2b428053..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF37CC.s +++ /dev/null @@ -1,31 +0,0 @@ -glabel func_80AF37CC -/* 0127C 80AF37CC 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 01280 80AF37D0 AFBF0024 */ sw $ra, 0x0024($sp) -/* 01284 80AF37D4 AFB00020 */ sw $s0, 0x0020($sp) -/* 01288 80AF37D8 948E02C0 */ lhu $t6, 0x02C0($a0) ## 000002C0 -/* 0128C 80AF37DC 3C188016 */ lui $t8, 0x8016 ## $t8 = 80160000 -/* 01290 80AF37E0 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 01294 80AF37E4 25CF0001 */ addiu $t7, $t6, 0x0001 ## $t7 = 00000001 -/* 01298 80AF37E8 A48F02C0 */ sh $t7, 0x02C0($a0) ## 000002C0 -/* 0129C 80AF37EC 8F18FA90 */ lw $t8, -0x0570($t8) ## 8015FA90 -/* 012A0 80AF37F0 960602C0 */ lhu $a2, 0x02C0($s0) ## 000002C0 -/* 012A4 80AF37F4 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 012A8 80AF37F8 87041458 */ lh $a0, 0x1458($t8) ## 80161458 -/* 012AC 80AF37FC AFA00010 */ sw $zero, 0x0010($sp) -/* 012B0 80AF3800 24070008 */ addiu $a3, $zero, 0x0008 ## $a3 = 00000008 -/* 012B4 80AF3804 24840096 */ addiu $a0, $a0, 0x0096 ## $a0 = 00000096 -/* 012B8 80AF3808 0C01BE6F */ jal func_8006F9BC -/* 012BC 80AF380C 3084FFFF */ andi $a0, $a0, 0xFFFF ## $a0 = 00000096 -/* 012C0 80AF3810 3C014396 */ lui $at, 0x4396 ## $at = 43960000 -/* 012C4 80AF3814 44813000 */ mtc1 $at, $f6 ## $f6 = 300.00 -/* 012C8 80AF3818 C604000C */ lwc1 $f4, 0x000C($s0) ## 0000000C -/* 012CC 80AF381C 46003202 */ mul.s $f8, $f6, $f0 -/* 012D0 80AF3820 46082280 */ add.s $f10, $f4, $f8 -/* 012D4 80AF3824 E60A0028 */ swc1 $f10, 0x0028($s0) ## 00000028 -/* 012D8 80AF3828 8FBF0024 */ lw $ra, 0x0024($sp) -/* 012DC 80AF382C 8FB00020 */ lw $s0, 0x0020($sp) -/* 012E0 80AF3830 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 012E4 80AF3834 03E00008 */ jr $ra -/* 012E8 80AF3838 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF383C.s b/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF383C.s deleted file mode 100644 index 200e319c54..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF383C.s +++ /dev/null @@ -1,19 +0,0 @@ -glabel func_80AF383C -/* 012EC 80AF383C 8CA21C44 */ lw $v0, 0x1C44($a1) ## 00001C44 -/* 012F0 80AF3840 C4800024 */ lwc1 $f0, 0x0024($a0) ## 00000024 -/* 012F4 80AF3844 3C01C34A */ lui $at, 0xC34A ## $at = C34A0000 -/* 012F8 80AF3848 C4420024 */ lwc1 $f2, 0x0024($v0) ## 00000024 -/* 012FC 80AF384C 44813000 */ mtc1 $at, $f6 ## $f6 = -202.00 -/* 01300 80AF3850 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 01304 80AF3854 46001101 */ sub.s $f4, $f2, $f0 -/* 01308 80AF3858 4604303E */ c.le.s $f6, $f4 -/* 0130C 80AF385C 00000000 */ nop -/* 01310 80AF3860 45000003 */ bc1f .L80AF3870 -/* 01314 80AF3864 00000000 */ nop -/* 01318 80AF3868 03E00008 */ jr $ra -/* 0131C 80AF386C 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -.L80AF3870: -/* 01320 80AF3870 03E00008 */ jr $ra -/* 01324 80AF3874 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF3878.s b/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF3878.s deleted file mode 100644 index bdb9f97316..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF3878.s +++ /dev/null @@ -1,27 +0,0 @@ -glabel func_80AF3878 -/* 01328 80AF3878 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 0132C 80AF387C AFBF001C */ sw $ra, 0x001C($sp) -/* 01330 80AF3880 AFA40020 */ sw $a0, 0x0020($sp) -/* 01334 80AF3884 0C2BCE0F */ jal func_80AF383C -/* 01338 80AF3888 AFA50024 */ sw $a1, 0x0024($sp) -/* 0133C 80AF388C 5040000D */ beql $v0, $zero, .L80AF38C4 -/* 01340 80AF3890 8FBF001C */ lw $ra, 0x001C($sp) -/* 01344 80AF3894 0C02FF21 */ jal func_800BFC84 -/* 01348 80AF3898 8FA40024 */ lw $a0, 0x0024($sp) -/* 0134C 80AF389C 14400008 */ bne $v0, $zero, .L80AF38C0 -/* 01350 80AF38A0 8FA70020 */ lw $a3, 0x0020($sp) -/* 01354 80AF38A4 240E0010 */ addiu $t6, $zero, 0x0010 ## $t6 = 00000010 -/* 01358 80AF38A8 ACEE02A8 */ sw $t6, 0x02A8($a3) ## 000002A8 -/* 0135C 80AF38AC AFA00010 */ sw $zero, 0x0010($sp) -/* 01360 80AF38B0 8FA40024 */ lw $a0, 0x0024($sp) -/* 01364 80AF38B4 24050C3A */ addiu $a1, $zero, 0x0C3A ## $a1 = 00000C3A -/* 01368 80AF38B8 0C02003E */ jal func_800800F8 -/* 0136C 80AF38BC 2406FF9D */ addiu $a2, $zero, 0xFF9D ## $a2 = FFFFFF9D -.L80AF38C0: -/* 01370 80AF38C0 8FBF001C */ lw $ra, 0x001C($sp) -.L80AF38C4: -/* 01374 80AF38C4 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 01378 80AF38C8 03E00008 */ jr $ra -/* 0137C 80AF38CC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF38D0.s b/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF38D0.s deleted file mode 100644 index 036e20adba..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF38D0.s +++ /dev/null @@ -1,18 +0,0 @@ -glabel func_80AF38D0 -/* 01380 80AF38D0 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 01384 80AF38D4 AFBF001C */ sw $ra, 0x001C($sp) -/* 01388 80AF38D8 AFA50024 */ sw $a1, 0x0024($sp) -/* 0138C 80AF38DC 240E0010 */ addiu $t6, $zero, 0x0010 ## $t6 = 00000010 -/* 01390 80AF38E0 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 -/* 01394 80AF38E4 AC8E02A8 */ sw $t6, 0x02A8($a0) ## 000002A8 -/* 01398 80AF38E8 AFA00010 */ sw $zero, 0x0010($sp) -/* 0139C 80AF38EC 8FA40024 */ lw $a0, 0x0024($sp) -/* 013A0 80AF38F0 24050C3A */ addiu $a1, $zero, 0x0C3A ## $a1 = 00000C3A -/* 013A4 80AF38F4 0C02003E */ jal func_800800F8 -/* 013A8 80AF38F8 2406FF9D */ addiu $a2, $zero, 0xFF9D ## $a2 = FFFFFF9D -/* 013AC 80AF38FC 8FBF001C */ lw $ra, 0x001C($sp) -/* 013B0 80AF3900 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 013B4 80AF3904 03E00008 */ jr $ra -/* 013B8 80AF3908 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF390C.s b/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF390C.s deleted file mode 100644 index 88401c4a2e..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF390C.s +++ /dev/null @@ -1,57 +0,0 @@ -glabel func_80AF390C -/* 013BC 80AF390C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 013C0 80AF3910 AFBF0014 */ sw $ra, 0x0014($sp) -/* 013C4 80AF3914 AFA5001C */ sw $a1, 0x001C($sp) -/* 013C8 80AF3918 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 013CC 80AF391C 44813000 */ mtc1 $at, $f6 ## $f6 = 1.00 -/* 013D0 80AF3920 C48402C4 */ lwc1 $f4, 0x02C4($a0) ## 000002C4 -/* 013D4 80AF3924 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 013D8 80AF3928 3C014220 */ lui $at, 0x4220 ## $at = 42200000 -/* 013DC 80AF392C 46062200 */ add.s $f8, $f4, $f6 -/* 013E0 80AF3930 44812000 */ mtc1 $at, $f4 ## $f4 = 40.00 -/* 013E4 80AF3934 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 -/* 013E8 80AF3938 E48802C4 */ swc1 $f8, 0x02C4($a0) ## 000002C4 -/* 013EC 80AF393C 8C42FA90 */ lw $v0, -0x0570($v0) ## 8015FA90 -/* 013F0 80AF3940 C48A02C4 */ lwc1 $f10, 0x02C4($a0) ## 000002C4 -/* 013F4 80AF3944 844E1460 */ lh $t6, 0x1460($v0) ## 80161460 -/* 013F8 80AF3948 448E8000 */ mtc1 $t6, $f16 ## $f16 = 0.00 -/* 013FC 80AF394C 00000000 */ nop -/* 01400 80AF3950 468084A0 */ cvt.s.w $f18, $f16 -/* 01404 80AF3954 46049180 */ add.s $f6, $f18, $f4 -/* 01408 80AF3958 46065032 */ c.eq.s $f10, $f6 -/* 0140C 80AF395C 00000000 */ nop -/* 01410 80AF3960 45020006 */ bc1fl .L80AF397C -/* 01414 80AF3964 844F145C */ lh $t7, 0x145C($v0) ## 8016145C -/* 01418 80AF3968 0C2BCDEB */ jal func_80AF37AC -/* 0141C 80AF396C 00000000 */ nop -/* 01420 80AF3970 10000017 */ beq $zero, $zero, .L80AF39D0 -/* 01424 80AF3974 8FBF0014 */ lw $ra, 0x0014($sp) -/* 01428 80AF3978 844F145C */ lh $t7, 0x145C($v0) ## 0000145C -.L80AF397C: -/* 0142C 80AF397C 3C014248 */ lui $at, 0x4248 ## $at = 42480000 -/* 01430 80AF3980 44819000 */ mtc1 $at, $f18 ## $f18 = 50.00 -/* 01434 80AF3984 448F4000 */ mtc1 $t7, $f8 ## $f8 = 0.00 -/* 01438 80AF3988 C4EA02C4 */ lwc1 $f10, 0x02C4($a3) ## 000002C4 -/* 0143C 80AF398C 2418403E */ addiu $t8, $zero, 0x403E ## $t8 = 0000403E -/* 01440 80AF3990 46804420 */ cvt.s.w $f16, $f8 -/* 01444 80AF3994 3305FFFF */ andi $a1, $t8, 0xFFFF ## $a1 = 0000403E -/* 01448 80AF3998 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 0144C 80AF399C 46128100 */ add.s $f4, $f16, $f18 -/* 01450 80AF39A0 460A203C */ c.lt.s $f4, $f10 -/* 01454 80AF39A4 00000000 */ nop -/* 01458 80AF39A8 45020009 */ bc1fl .L80AF39D0 -/* 0145C 80AF39AC 8FBF0014 */ lw $ra, 0x0014($sp) -/* 01460 80AF39B0 A4F8010E */ sh $t8, 0x010E($a3) ## 0000010E -/* 01464 80AF39B4 AFA70018 */ sw $a3, 0x0018($sp) -/* 01468 80AF39B8 0C042DA0 */ jal func_8010B680 -/* 0146C 80AF39BC 8FA4001C */ lw $a0, 0x001C($sp) -/* 01470 80AF39C0 8FA70018 */ lw $a3, 0x0018($sp) -/* 01474 80AF39C4 24190011 */ addiu $t9, $zero, 0x0011 ## $t9 = 00000011 -/* 01478 80AF39C8 ACF902A8 */ sw $t9, 0x02A8($a3) ## 000002A8 -/* 0147C 80AF39CC 8FBF0014 */ lw $ra, 0x0014($sp) -.L80AF39D0: -/* 01480 80AF39D0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 01484 80AF39D4 03E00008 */ jr $ra -/* 01488 80AF39D8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF39DC.s b/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF39DC.s deleted file mode 100644 index d28577a1db..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF39DC.s +++ /dev/null @@ -1,72 +0,0 @@ -glabel func_80AF39DC -/* 0148C 80AF39DC 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 -/* 01490 80AF39E0 AFB10018 */ sw $s1, 0x0018($sp) -/* 01494 80AF39E4 00808825 */ or $s1, $a0, $zero ## $s1 = 00000000 -/* 01498 80AF39E8 AFBF001C */ sw $ra, 0x001C($sp) -/* 0149C 80AF39EC AFB00014 */ sw $s0, 0x0014($sp) -/* 014A0 80AF39F0 24A420D8 */ addiu $a0, $a1, 0x20D8 ## $a0 = 000020D8 -/* 014A4 80AF39F4 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 -/* 014A8 80AF39F8 0C042F6F */ jal func_8010BDBC -/* 014AC 80AF39FC AFA40024 */ sw $a0, 0x0024($sp) -/* 014B0 80AF3A00 24030003 */ addiu $v1, $zero, 0x0003 ## $v1 = 00000003 -/* 014B4 80AF3A04 14620023 */ bne $v1, $v0, .L80AF3A94 -/* 014B8 80AF3A08 A3A20033 */ sb $v0, 0x0033($sp) -/* 014BC 80AF3A0C 922E02C3 */ lbu $t6, 0x02C3($s1) ## 000002C3 -/* 014C0 80AF3A10 3C0480AF */ lui $a0, %hi(D_80AF51C4) ## $a0 = 80AF0000 -/* 014C4 80AF3A14 506E0020 */ beql $v1, $t6, .L80AF3A98 -/* 014C8 80AF3A18 93AC0033 */ lbu $t4, 0x0033($sp) -/* 014CC 80AF3A1C 0C00084C */ jal osSyncPrintf - -/* 014D0 80AF3A20 248451C4 */ addiu $a0, $a0, %lo(D_80AF51C4) ## $a0 = 80AF51C4 -/* 014D4 80AF3A24 922F02C2 */ lbu $t7, 0x02C2($s1) ## 000002C2 -/* 014D8 80AF3A28 24010006 */ addiu $at, $zero, 0x0006 ## $at = 00000006 -/* 014DC 80AF3A2C 24030003 */ addiu $v1, $zero, 0x0003 ## $v1 = 00000003 -/* 014E0 80AF3A30 25F80001 */ addiu $t8, $t7, 0x0001 ## $t8 = 00000001 -/* 014E4 80AF3A34 331900FF */ andi $t9, $t8, 0x00FF ## $t9 = 00000001 -/* 014E8 80AF3A38 0321001A */ div $zero, $t9, $at -/* 014EC 80AF3A3C 00004010 */ mfhi $t0 -/* 014F0 80AF3A40 A23802C2 */ sb $t8, 0x02C2($s1) ## 000002C2 -/* 014F4 80AF3A44 14680013 */ bne $v1, $t0, .L80AF3A94 -/* 014F8 80AF3A48 3C0480AF */ lui $a0, %hi(D_80AF51D8) ## $a0 = 80AF0000 -/* 014FC 80AF3A4C 8E031C44 */ lw $v1, 0x1C44($s0) ## 00001C44 -/* 01500 80AF3A50 248451D8 */ addiu $a0, $a0, %lo(D_80AF51D8) ## $a0 = 80AF51D8 -/* 01504 80AF3A54 0C00084C */ jal osSyncPrintf - -/* 01508 80AF3A58 AFA3002C */ sw $v1, 0x002C($sp) -/* 0150C 80AF3A5C 860907A0 */ lh $t1, 0x07A0($s0) ## 000007A0 -/* 01510 80AF3A60 00095080 */ sll $t2, $t1, 2 -/* 01514 80AF3A64 020A5821 */ addu $t3, $s0, $t2 -/* 01518 80AF3A68 0C016C69 */ jal func_8005B1A4 -/* 0151C 80AF3A6C 8D640790 */ lw $a0, 0x0790($t3) ## 00000790 -/* 01520 80AF3A70 3C01444D */ lui $at, 0x444D ## $at = 444D0000 -/* 01524 80AF3A74 8FA3002C */ lw $v1, 0x002C($sp) -/* 01528 80AF3A78 44812000 */ mtc1 $at, $f4 ## $f4 = 820.00 -/* 0152C 80AF3A7C 3C014334 */ lui $at, 0x4334 ## $at = 43340000 -/* 01530 80AF3A80 44803000 */ mtc1 $zero, $f6 ## $f6 = 0.00 -/* 01534 80AF3A84 44814000 */ mtc1 $at, $f8 ## $f8 = 180.00 -/* 01538 80AF3A88 E4640024 */ swc1 $f4, 0x0024($v1) ## 00000024 -/* 0153C 80AF3A8C E4660028 */ swc1 $f6, 0x0028($v1) ## 00000028 -/* 01540 80AF3A90 E468002C */ swc1 $f8, 0x002C($v1) ## 0000002C -.L80AF3A94: -/* 01544 80AF3A94 93AC0033 */ lbu $t4, 0x0033($sp) -.L80AF3A98: -/* 01548 80AF3A98 A22C02C3 */ sb $t4, 0x02C3($s1) ## 000002C3 -/* 0154C 80AF3A9C 0C042F6F */ jal func_8010BDBC -/* 01550 80AF3AA0 8FA40024 */ lw $a0, 0x0024($sp) -/* 01554 80AF3AA4 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 01558 80AF3AA8 14410007 */ bne $v0, $at, .L80AF3AC8 -/* 0155C 80AF3AAC 240D0012 */ addiu $t5, $zero, 0x0012 ## $t5 = 00000012 -/* 01560 80AF3AB0 AE2D02A8 */ sw $t5, 0x02A8($s1) ## 000002A8 -/* 01564 80AF3AB4 860E07A0 */ lh $t6, 0x07A0($s0) ## 000007A0 -/* 01568 80AF3AB8 000E7880 */ sll $t7, $t6, 2 -/* 0156C 80AF3ABC 020FC021 */ addu $t8, $s0, $t7 -/* 01570 80AF3AC0 0C016C69 */ jal func_8005B1A4 -/* 01574 80AF3AC4 8F040790 */ lw $a0, 0x0790($t8) ## 00000790 -.L80AF3AC8: -/* 01578 80AF3AC8 8FBF001C */ lw $ra, 0x001C($sp) -/* 0157C 80AF3ACC 8FB00014 */ lw $s0, 0x0014($sp) -/* 01580 80AF3AD0 8FB10018 */ lw $s1, 0x0018($sp) -/* 01584 80AF3AD4 03E00008 */ jr $ra -/* 01588 80AF3AD8 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF3ADC.s b/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF3ADC.s deleted file mode 100644 index ea97beb1cb..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF3ADC.s +++ /dev/null @@ -1,42 +0,0 @@ -glabel func_80AF3ADC -/* 0158C 80AF3ADC 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 01590 80AF3AE0 AFBF001C */ sw $ra, 0x001C($sp) -/* 01594 80AF3AE4 AFA50024 */ sw $a1, 0x0024($sp) -/* 01598 80AF3AE8 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 0159C 80AF3AEC 44813000 */ mtc1 $at, $f6 ## $f6 = 1.00 -/* 015A0 80AF3AF0 C48402C4 */ lwc1 $f4, 0x02C4($a0) ## 000002C4 -/* 015A4 80AF3AF4 3C0E8016 */ lui $t6, 0x8016 ## $t6 = 80160000 -/* 015A8 80AF3AF8 3C0142C8 */ lui $at, 0x42C8 ## $at = 42C80000 -/* 015AC 80AF3AFC 46062200 */ add.s $f8, $f4, $f6 -/* 015B0 80AF3B00 44819000 */ mtc1 $at, $f18 ## $f18 = 100.00 -/* 015B4 80AF3B04 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 -/* 015B8 80AF3B08 24A5F8B8 */ addiu $a1, $a1, 0xF8B8 ## $a1 = 0600F8B8 -/* 015BC 80AF3B0C E48802C4 */ swc1 $f8, 0x02C4($a0) ## 000002C4 -/* 015C0 80AF3B10 8DCEFA90 */ lw $t6, -0x0570($t6) ## 8015FA90 -/* 015C4 80AF3B14 C48602C4 */ lwc1 $f6, 0x02C4($a0) ## 000002C4 -/* 015C8 80AF3B18 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 015CC 80AF3B1C 85CF145E */ lh $t7, 0x145E($t6) ## 8016145E -/* 015D0 80AF3B20 3C07C140 */ lui $a3, 0xC140 ## $a3 = C1400000 -/* 015D4 80AF3B24 448F5000 */ mtc1 $t7, $f10 ## $f10 = 0.00 -/* 015D8 80AF3B28 00000000 */ nop -/* 015DC 80AF3B2C 46805420 */ cvt.s.w $f16, $f10 -/* 015E0 80AF3B30 46128100 */ add.s $f4, $f16, $f18 -/* 015E4 80AF3B34 4606203C */ c.lt.s $f4, $f6 -/* 015E8 80AF3B38 00000000 */ nop -/* 015EC 80AF3B3C 4502000A */ bc1fl .L80AF3B68 -/* 015F0 80AF3B40 8FBF001C */ lw $ra, 0x001C($sp) -/* 015F4 80AF3B44 AFA00010 */ sw $zero, 0x0010($sp) -/* 015F8 80AF3B48 0C2BCA3A */ jal func_80AF28E8 -/* 015FC 80AF3B4C AFA40020 */ sw $a0, 0x0020($sp) -/* 01600 80AF3B50 8FA40020 */ lw $a0, 0x0020($sp) -/* 01604 80AF3B54 24180013 */ addiu $t8, $zero, 0x0013 ## $t8 = 00000013 -/* 01608 80AF3B58 AC9802A8 */ sw $t8, 0x02A8($a0) ## 000002A8 -/* 0160C 80AF3B5C 0C2BCDBB */ jal func_80AF36EC -/* 01610 80AF3B60 8FA50024 */ lw $a1, 0x0024($sp) -/* 01614 80AF3B64 8FBF001C */ lw $ra, 0x001C($sp) -.L80AF3B68: -/* 01618 80AF3B68 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 0161C 80AF3B6C 03E00008 */ jr $ra -/* 01620 80AF3B70 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF3B74.s b/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF3B74.s deleted file mode 100644 index b7e2c4224b..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF3B74.s +++ /dev/null @@ -1,26 +0,0 @@ -glabel func_80AF3B74 -/* 01624 80AF3B74 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 01628 80AF3B78 8C42FA90 */ lw $v0, -0x0570($v0) ## 8015FA90 -/* 0162C 80AF3B7C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 01630 80AF3B80 AFBF0014 */ sw $ra, 0x0014($sp) -/* 01634 80AF3B84 AFA5001C */ sw $a1, 0x001C($sp) -/* 01638 80AF3B88 8459145A */ lh $t9, 0x145A($v0) ## 8016145A -/* 0163C 80AF3B8C 844E1458 */ lh $t6, 0x1458($v0) ## 80161458 -/* 01640 80AF3B90 948C02C0 */ lhu $t4, 0x02C0($a0) ## 000002C0 -/* 01644 80AF3B94 27290028 */ addiu $t1, $t9, 0x0028 ## $t1 = 00000028 -/* 01648 80AF3B98 25D80096 */ addiu $t8, $t6, 0x0096 ## $t8 = 00000096 -/* 0164C 80AF3B9C 03095021 */ addu $t2, $t8, $t1 -/* 01650 80AF3BA0 314BFFFF */ andi $t3, $t2, 0xFFFF ## $t3 = 00000000 -/* 01654 80AF3BA4 016C082A */ slt $at, $t3, $t4 -/* 01658 80AF3BA8 50200004 */ beql $at, $zero, .L80AF3BBC -/* 0165C 80AF3BAC 8FBF0014 */ lw $ra, 0x0014($sp) -/* 01660 80AF3BB0 0C00B55C */ jal Actor_Kill - -/* 01664 80AF3BB4 00000000 */ nop -/* 01668 80AF3BB8 8FBF0014 */ lw $ra, 0x0014($sp) -.L80AF3BBC: -/* 0166C 80AF3BBC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 01670 80AF3BC0 03E00008 */ jr $ra -/* 01674 80AF3BC4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF3BC8.s b/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF3BC8.s deleted file mode 100644 index f98bec8beb..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF3BC8.s +++ /dev/null @@ -1,19 +0,0 @@ -glabel func_80AF3BC8 -/* 01678 80AF3BC8 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 0167C 80AF3BCC AFBF0014 */ sw $ra, 0x0014($sp) -/* 01680 80AF3BD0 AFA40018 */ sw $a0, 0x0018($sp) -/* 01684 80AF3BD4 0C2BCE1E */ jal func_80AF3878 -/* 01688 80AF3BD8 AFA5001C */ sw $a1, 0x001C($sp) -/* 0168C 80AF3BDC 8FA40018 */ lw $a0, 0x0018($sp) -/* 01690 80AF3BE0 0C00B56E */ jal Actor_SetHeight - -/* 01694 80AF3BE4 3C054248 */ lui $a1, 0x4248 ## $a1 = 42480000 -/* 01698 80AF3BE8 8FA40018 */ lw $a0, 0x0018($sp) -/* 0169C 80AF3BEC 0C2BC967 */ jal func_80AF259C -/* 016A0 80AF3BF0 8FA5001C */ lw $a1, 0x001C($sp) -/* 016A4 80AF3BF4 8FBF0014 */ lw $ra, 0x0014($sp) -/* 016A8 80AF3BF8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 016AC 80AF3BFC 03E00008 */ jr $ra -/* 016B0 80AF3C00 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF3C04.s b/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF3C04.s deleted file mode 100644 index 000a220f15..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF3C04.s +++ /dev/null @@ -1,28 +0,0 @@ -glabel func_80AF3C04 -/* 016B4 80AF3C04 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 016B8 80AF3C08 AFBF001C */ sw $ra, 0x001C($sp) -/* 016BC 80AF3C0C AFB00018 */ sw $s0, 0x0018($sp) -/* 016C0 80AF3C10 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 016C4 80AF3C14 0C2BC9D1 */ jal func_80AF2744 -/* 016C8 80AF3C18 AFA50024 */ sw $a1, 0x0024($sp) -/* 016CC 80AF3C1C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 016D0 80AF3C20 0C2BC967 */ jal func_80AF259C -/* 016D4 80AF3C24 8FA50024 */ lw $a1, 0x0024($sp) -/* 016D8 80AF3C28 0C2BC9E3 */ jal func_80AF278C -/* 016DC 80AF3C2C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 016E0 80AF3C30 0C2BC982 */ jal func_80AF2608 -/* 016E4 80AF3C34 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 016E8 80AF3C38 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 016EC 80AF3C3C 0C00B56E */ jal Actor_SetHeight - -/* 016F0 80AF3C40 3C054248 */ lui $a1, 0x4248 ## $a1 = 42480000 -/* 016F4 80AF3C44 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 016F8 80AF3C48 0C2BCE34 */ jal func_80AF38D0 -/* 016FC 80AF3C4C 8FA50024 */ lw $a1, 0x0024($sp) -/* 01700 80AF3C50 8FBF001C */ lw $ra, 0x001C($sp) -/* 01704 80AF3C54 8FB00018 */ lw $s0, 0x0018($sp) -/* 01708 80AF3C58 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 0170C 80AF3C5C 03E00008 */ jr $ra -/* 01710 80AF3C60 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF3C64.s b/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF3C64.s deleted file mode 100644 index f5457c574c..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF3C64.s +++ /dev/null @@ -1,25 +0,0 @@ -glabel func_80AF3C64 -/* 01714 80AF3C64 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 01718 80AF3C68 AFBF001C */ sw $ra, 0x001C($sp) -/* 0171C 80AF3C6C AFB00018 */ sw $s0, 0x0018($sp) -/* 01720 80AF3C70 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 01724 80AF3C74 0C2BC9D1 */ jal func_80AF2744 -/* 01728 80AF3C78 AFA50024 */ sw $a1, 0x0024($sp) -/* 0172C 80AF3C7C 0C2BC9E3 */ jal func_80AF278C -/* 01730 80AF3C80 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01734 80AF3C84 0C2BC982 */ jal func_80AF2608 -/* 01738 80AF3C88 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0173C 80AF3C8C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01740 80AF3C90 0C00B56E */ jal Actor_SetHeight - -/* 01744 80AF3C94 3C054248 */ lui $a1, 0x4248 ## $a1 = 42480000 -/* 01748 80AF3C98 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0174C 80AF3C9C 0C2BCE43 */ jal func_80AF390C -/* 01750 80AF3CA0 8FA50024 */ lw $a1, 0x0024($sp) -/* 01754 80AF3CA4 8FBF001C */ lw $ra, 0x001C($sp) -/* 01758 80AF3CA8 8FB00018 */ lw $s0, 0x0018($sp) -/* 0175C 80AF3CAC 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 01760 80AF3CB0 03E00008 */ jr $ra -/* 01764 80AF3CB4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF3CB8.s b/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF3CB8.s deleted file mode 100644 index 9ceea8b97c..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF3CB8.s +++ /dev/null @@ -1,25 +0,0 @@ -glabel func_80AF3CB8 -/* 01768 80AF3CB8 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 0176C 80AF3CBC AFBF001C */ sw $ra, 0x001C($sp) -/* 01770 80AF3CC0 AFB00018 */ sw $s0, 0x0018($sp) -/* 01774 80AF3CC4 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 01778 80AF3CC8 0C2BC9D1 */ jal func_80AF2744 -/* 0177C 80AF3CCC AFA50024 */ sw $a1, 0x0024($sp) -/* 01780 80AF3CD0 0C2BC9E3 */ jal func_80AF278C -/* 01784 80AF3CD4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01788 80AF3CD8 0C2BC982 */ jal func_80AF2608 -/* 0178C 80AF3CDC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01790 80AF3CE0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01794 80AF3CE4 0C00B56E */ jal Actor_SetHeight - -/* 01798 80AF3CE8 3C054248 */ lui $a1, 0x4248 ## $a1 = 42480000 -/* 0179C 80AF3CEC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 017A0 80AF3CF0 0C2BCE77 */ jal func_80AF39DC -/* 017A4 80AF3CF4 8FA50024 */ lw $a1, 0x0024($sp) -/* 017A8 80AF3CF8 8FBF001C */ lw $ra, 0x001C($sp) -/* 017AC 80AF3CFC 8FB00018 */ lw $s0, 0x0018($sp) -/* 017B0 80AF3D00 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 017B4 80AF3D04 03E00008 */ jr $ra -/* 017B8 80AF3D08 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF3D0C.s b/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF3D0C.s deleted file mode 100644 index a6cc530e71..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF3D0C.s +++ /dev/null @@ -1,25 +0,0 @@ -glabel func_80AF3D0C -/* 017BC 80AF3D0C 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 017C0 80AF3D10 AFBF001C */ sw $ra, 0x001C($sp) -/* 017C4 80AF3D14 AFB00018 */ sw $s0, 0x0018($sp) -/* 017C8 80AF3D18 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 017CC 80AF3D1C 0C2BC9D1 */ jal func_80AF2744 -/* 017D0 80AF3D20 AFA50024 */ sw $a1, 0x0024($sp) -/* 017D4 80AF3D24 0C2BC9E3 */ jal func_80AF278C -/* 017D8 80AF3D28 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 017DC 80AF3D2C 0C2BC982 */ jal func_80AF2608 -/* 017E0 80AF3D30 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 017E4 80AF3D34 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 017E8 80AF3D38 0C00B56E */ jal Actor_SetHeight - -/* 017EC 80AF3D3C 3C054248 */ lui $a1, 0x4248 ## $a1 = 42480000 -/* 017F0 80AF3D40 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 017F4 80AF3D44 0C2BCEB7 */ jal func_80AF3ADC -/* 017F8 80AF3D48 8FA50024 */ lw $a1, 0x0024($sp) -/* 017FC 80AF3D4C 8FBF001C */ lw $ra, 0x001C($sp) -/* 01800 80AF3D50 8FB00018 */ lw $s0, 0x0018($sp) -/* 01804 80AF3D54 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 01808 80AF3D58 03E00008 */ jr $ra -/* 0180C 80AF3D5C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF3D60.s b/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF3D60.s deleted file mode 100644 index b7564d1f25..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF3D60.s +++ /dev/null @@ -1,28 +0,0 @@ -glabel func_80AF3D60 -/* 01810 80AF3D60 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 01814 80AF3D64 AFBF001C */ sw $ra, 0x001C($sp) -/* 01818 80AF3D68 AFB00018 */ sw $s0, 0x0018($sp) -/* 0181C 80AF3D6C 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 01820 80AF3D70 0C2BCDF3 */ jal func_80AF37CC -/* 01824 80AF3D74 AFA50024 */ sw $a1, 0x0024($sp) -/* 01828 80AF3D78 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0182C 80AF3D7C 0C2BC9D1 */ jal func_80AF2744 -/* 01830 80AF3D80 8FA50024 */ lw $a1, 0x0024($sp) -/* 01834 80AF3D84 0C2BC9E3 */ jal func_80AF278C -/* 01838 80AF3D88 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0183C 80AF3D8C 0C2BC982 */ jal func_80AF2608 -/* 01840 80AF3D90 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01844 80AF3D94 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01848 80AF3D98 0C00B56E */ jal Actor_SetHeight - -/* 0184C 80AF3D9C 3C054248 */ lui $a1, 0x4248 ## $a1 = 42480000 -/* 01850 80AF3DA0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01854 80AF3DA4 0C2BCEDD */ jal func_80AF3B74 -/* 01858 80AF3DA8 8FA50024 */ lw $a1, 0x0024($sp) -/* 0185C 80AF3DAC 8FBF001C */ lw $ra, 0x001C($sp) -/* 01860 80AF3DB0 8FB00018 */ lw $s0, 0x0018($sp) -/* 01864 80AF3DB4 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 01868 80AF3DB8 03E00008 */ jr $ra -/* 0186C 80AF3DBC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF3F14.s b/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF3F14.s deleted file mode 100644 index 26c87ec112..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF3F14.s +++ /dev/null @@ -1,6 +0,0 @@ -glabel func_80AF3F14 -/* 019C4 80AF3F14 AFA40000 */ sw $a0, 0x0000($sp) -/* 019C8 80AF3F18 03E00008 */ jr $ra -/* 019CC 80AF3F1C AFA50004 */ sw $a1, 0x0004($sp) - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF3F20.s b/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF3F20.s deleted file mode 100644 index 7ca19dd01f..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF3F20.s +++ /dev/null @@ -1,92 +0,0 @@ -glabel func_80AF3F20 -/* 019D0 80AF3F20 27BDFF90 */ addiu $sp, $sp, 0xFF90 ## $sp = FFFFFF90 -/* 019D4 80AF3F24 AFBF0024 */ sw $ra, 0x0024($sp) -/* 019D8 80AF3F28 AFA40070 */ sw $a0, 0x0070($sp) -/* 019DC 80AF3F2C AFA50074 */ sw $a1, 0x0074($sp) -/* 019E0 80AF3F30 848202A4 */ lh $v0, 0x02A4($a0) ## 000002A4 -/* 019E4 80AF3F34 3C1880AF */ lui $t8, %hi(D_80AF410C) ## $t8 = 80AF0000 -/* 019E8 80AF3F38 3C0680AF */ lui $a2, %hi(D_80AF5224) ## $a2 = 80AF0000 -/* 019EC 80AF3F3C 00027880 */ sll $t7, $v0, 2 -/* 019F0 80AF3F40 030FC021 */ addu $t8, $t8, $t7 -/* 019F4 80AF3F44 8F18410C */ lw $t8, %lo(D_80AF410C)($t8) -/* 019F8 80AF3F48 24C65224 */ addiu $a2, $a2, %lo(D_80AF5224) ## $a2 = 80AF5224 -/* 019FC 80AF3F4C 27A40048 */ addiu $a0, $sp, 0x0048 ## $a0 = FFFFFFD8 -/* 01A00 80AF3F50 AFB80060 */ sw $t8, 0x0060($sp) -/* 01A04 80AF3F54 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 -/* 01A08 80AF3F58 24070282 */ addiu $a3, $zero, 0x0282 ## $a3 = 00000282 -/* 01A0C 80AF3F5C 0C031AB1 */ jal func_800C6AC4 -/* 01A10 80AF3F60 AFA50058 */ sw $a1, 0x0058($sp) -/* 01A14 80AF3F64 8FA90074 */ lw $t1, 0x0074($sp) -/* 01A18 80AF3F68 0C024F46 */ jal func_80093D18 -/* 01A1C 80AF3F6C 8D240000 */ lw $a0, 0x0000($t1) ## 00000000 -/* 01A20 80AF3F70 8FA80058 */ lw $t0, 0x0058($sp) -/* 01A24 80AF3F74 8FA70060 */ lw $a3, 0x0060($sp) -/* 01A28 80AF3F78 3C0BDB06 */ lui $t3, 0xDB06 ## $t3 = DB060000 -/* 01A2C 80AF3F7C 8D0202C0 */ lw $v0, 0x02C0($t0) ## 000002C0 -/* 01A30 80AF3F80 00076100 */ sll $t4, $a3, 4 -/* 01A34 80AF3F84 000C6F02 */ srl $t5, $t4, 28 -/* 01A38 80AF3F88 3C0F8016 */ lui $t7, 0x8016 ## $t7 = 80160000 -/* 01A3C 80AF3F8C 244A0008 */ addiu $t2, $v0, 0x0008 ## $t2 = 00000008 -/* 01A40 80AF3F90 25EF6FA8 */ addiu $t7, $t7, 0x6FA8 ## $t7 = 80166FA8 -/* 01A44 80AF3F94 000D7080 */ sll $t6, $t5, 2 -/* 01A48 80AF3F98 356B0020 */ ori $t3, $t3, 0x0020 ## $t3 = DB060020 -/* 01A4C 80AF3F9C AD0A02C0 */ sw $t2, 0x02C0($t0) ## 000002C0 -/* 01A50 80AF3FA0 01CF2021 */ addu $a0, $t6, $t7 -/* 01A54 80AF3FA4 AC4B0000 */ sw $t3, 0x0000($v0) ## 00000000 -/* 01A58 80AF3FA8 8C980000 */ lw $t8, 0x0000($a0) ## 00000000 -/* 01A5C 80AF3FAC 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 -/* 01A60 80AF3FB0 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF -/* 01A64 80AF3FB4 00E12824 */ and $a1, $a3, $at -/* 01A68 80AF3FB8 3C068000 */ lui $a2, 0x8000 ## $a2 = 80000000 -/* 01A6C 80AF3FBC 0305C821 */ addu $t9, $t8, $a1 -/* 01A70 80AF3FC0 03264821 */ addu $t1, $t9, $a2 -/* 01A74 80AF3FC4 AC490004 */ sw $t1, 0x0004($v0) ## 00000004 -/* 01A78 80AF3FC8 8D0202C0 */ lw $v0, 0x02C0($t0) ## 000002C0 -/* 01A7C 80AF3FCC 3C0BDB06 */ lui $t3, 0xDB06 ## $t3 = DB060000 -/* 01A80 80AF3FD0 356B0024 */ ori $t3, $t3, 0x0024 ## $t3 = DB060024 -/* 01A84 80AF3FD4 244A0008 */ addiu $t2, $v0, 0x0008 ## $t2 = 00000008 -/* 01A88 80AF3FD8 AD0A02C0 */ sw $t2, 0x02C0($t0) ## 000002C0 -/* 01A8C 80AF3FDC AC4B0000 */ sw $t3, 0x0000($v0) ## 00000000 -/* 01A90 80AF3FE0 8C8C0000 */ lw $t4, 0x0000($a0) ## 00000000 -/* 01A94 80AF3FE4 241900FF */ addiu $t9, $zero, 0x00FF ## $t9 = 000000FF -/* 01A98 80AF3FE8 3C18FB00 */ lui $t8, 0xFB00 ## $t8 = FB000000 -/* 01A9C 80AF3FEC 01856821 */ addu $t5, $t4, $a1 -/* 01AA0 80AF3FF0 01A67021 */ addu $t6, $t5, $a2 -/* 01AA4 80AF3FF4 AC4E0004 */ sw $t6, 0x0004($v0) ## 00000004 -/* 01AA8 80AF3FF8 8D0202C0 */ lw $v0, 0x02C0($t0) ## 000002C0 -/* 01AAC 80AF3FFC 3C0B8011 */ lui $t3, 0x8011 ## $t3 = 80110000 -/* 01AB0 80AF4000 3C0ADB06 */ lui $t2, 0xDB06 ## $t2 = DB060000 -/* 01AB4 80AF4004 244F0008 */ addiu $t7, $v0, 0x0008 ## $t7 = 00000008 -/* 01AB8 80AF4008 AD0F02C0 */ sw $t7, 0x02C0($t0) ## 000002C0 -/* 01ABC 80AF400C AC590004 */ sw $t9, 0x0004($v0) ## 00000004 -/* 01AC0 80AF4010 AC580000 */ sw $t8, 0x0000($v0) ## 00000000 -/* 01AC4 80AF4014 8D0202C0 */ lw $v0, 0x02C0($t0) ## 000002C0 -/* 01AC8 80AF4018 354A0030 */ ori $t2, $t2, 0x0030 ## $t2 = DB060030 -/* 01ACC 80AF401C 256B6290 */ addiu $t3, $t3, 0x6290 ## $t3 = 80116290 -/* 01AD0 80AF4020 24490008 */ addiu $t1, $v0, 0x0008 ## $t1 = 00000008 -/* 01AD4 80AF4024 AD0902C0 */ sw $t1, 0x02C0($t0) ## 000002C0 -/* 01AD8 80AF4028 AC4B0004 */ sw $t3, 0x0004($v0) ## 00000004 -/* 01ADC 80AF402C AC4A0000 */ sw $t2, 0x0000($v0) ## 00000000 -/* 01AE0 80AF4030 8FA30070 */ lw $v1, 0x0070($sp) -/* 01AE4 80AF4034 8FA40074 */ lw $a0, 0x0074($sp) -/* 01AE8 80AF4038 2462014C */ addiu $v0, $v1, 0x014C ## $v0 = 0000014C -/* 01AEC 80AF403C 8C450004 */ lw $a1, 0x0004($v0) ## 00000150 -/* 01AF0 80AF4040 8C460020 */ lw $a2, 0x0020($v0) ## 0000016C -/* 01AF4 80AF4044 90470002 */ lbu $a3, 0x0002($v0) ## 0000014E -/* 01AF8 80AF4048 AFA00014 */ sw $zero, 0x0014($sp) -/* 01AFC 80AF404C AFA00010 */ sw $zero, 0x0010($sp) -/* 01B00 80AF4050 0C0286B2 */ jal func_800A1AC8 -/* 01B04 80AF4054 AFA30018 */ sw $v1, 0x0018($sp) -/* 01B08 80AF4058 8FAC0074 */ lw $t4, 0x0074($sp) -/* 01B0C 80AF405C 3C0680AF */ lui $a2, %hi(D_80AF5234) ## $a2 = 80AF0000 -/* 01B10 80AF4060 24C65234 */ addiu $a2, $a2, %lo(D_80AF5234) ## $a2 = 80AF5234 -/* 01B14 80AF4064 27A40048 */ addiu $a0, $sp, 0x0048 ## $a0 = FFFFFFD8 -/* 01B18 80AF4068 24070297 */ addiu $a3, $zero, 0x0297 ## $a3 = 00000297 -/* 01B1C 80AF406C 0C031AD5 */ jal func_800C6B54 -/* 01B20 80AF4070 8D850000 */ lw $a1, 0x0000($t4) ## 00000000 -/* 01B24 80AF4074 8FBF0024 */ lw $ra, 0x0024($sp) -/* 01B28 80AF4078 27BD0070 */ addiu $sp, $sp, 0x0070 ## $sp = 00000000 -/* 01B2C 80AF407C 03E00008 */ jr $ra -/* 01B30 80AF4080 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Sa/EnSa_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Sa/EnSa_Draw.s index 76e34f00c5..86babf9298 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Sa/EnSa_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Sa/EnSa_Draw.s @@ -9,7 +9,7 @@ glabel EnSa_Draw /* 01A24 80AF6F84 24C67490 */ addiu $a2, $a2, %lo(D_80AF7490) ## $a2 = 80AF7490 /* 01A28 80AF6F88 27A40048 */ addiu $a0, $sp, 0x0048 ## $a0 = FFFFFFE8 /* 01A2C 80AF6F8C 240705A4 */ addiu $a3, $zero, 0x05A4 ## $a3 = 000005A4 -/* 01A30 80AF6F90 0C031AB1 */ jal func_800C6AC4 +/* 01A30 80AF6F90 0C031AB1 */ jal Graph_OpenDisps /* 01A34 80AF6F94 AFA50058 */ sw $a1, 0x0058($sp) /* 01A38 80AF6F98 86020218 */ lh $v0, 0x0218($s0) ## 00000218 /* 01A3C 80AF6F9C 240100FF */ addiu $at, $zero, 0x00FF ## $at = 000000FF @@ -176,7 +176,7 @@ glabel EnSa_Draw /* 01CB4 80AF7214 24C674A0 */ addiu $a2, $a2, %lo(D_80AF74A0) ## $a2 = 80AF74A0 /* 01CB8 80AF7218 27A40048 */ addiu $a0, $sp, 0x0048 ## $a0 = FFFFFFE8 /* 01CBC 80AF721C 240705D9 */ addiu $a3, $zero, 0x05D9 ## $a3 = 000005D9 -/* 01CC0 80AF7220 0C031AD5 */ jal func_800C6B54 +/* 01CC0 80AF7220 0C031AD5 */ jal Graph_CloseDisps /* 01CC4 80AF7224 8D850000 */ lw $a1, 0x0000($t4) ## 00000000 /* 01CC8 80AF7228 8FBF0024 */ lw $ra, 0x0024($sp) /* 01CCC 80AF722C 8FB00020 */ lw $s0, 0x0020($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Sa/EnSa_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Sa/EnSa_Init.s index 2b2bbcfef7..f9db9f2edc 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Sa/EnSa_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Sa/EnSa_Init.s @@ -1,114 +1,114 @@ glabel EnSa_Init /* 00C50 80AF61B0 27BDFFB0 */ addiu $sp, $sp, 0xFFB0 ## $sp = FFFFFFB0 -/* 00C54 80AF61B4 AFB00034 */ sw $s0, 0x0034($sp) +/* 00C54 80AF61B4 AFB00034 */ sw $s0, 0x0034($sp) /* 00C58 80AF61B8 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00C5C 80AF61BC AFB10038 */ sw $s1, 0x0038($sp) +/* 00C5C 80AF61BC AFB10038 */ sw $s1, 0x0038($sp) /* 00C60 80AF61C0 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 -/* 00C64 80AF61C4 AFBF003C */ sw $ra, 0x003C($sp) +/* 00C64 80AF61C4 AFBF003C */ sw $ra, 0x003C($sp) /* 00C68 80AF61C8 248400B4 */ addiu $a0, $a0, 0x00B4 ## $a0 = 000000B4 /* 00C6C 80AF61CC 3C068003 */ lui $a2, 0x8003 ## $a2 = 80030000 /* 00C70 80AF61D0 24C6B5EC */ addiu $a2, $a2, 0xB5EC ## $a2 = 8002B5EC -/* 00C74 80AF61D4 AFA40044 */ sw $a0, 0x0044($sp) +/* 00C74 80AF61D4 AFA40044 */ sw $a0, 0x0044($sp) /* 00C78 80AF61D8 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 /* 00C7C 80AF61DC 0C00AC78 */ jal ActorShape_Init - + /* 00C80 80AF61E0 3C074140 */ lui $a3, 0x4140 ## $a3 = 41400000 /* 00C84 80AF61E4 3C060601 */ lui $a2, 0x0601 ## $a2 = 06010000 /* 00C88 80AF61E8 260E0220 */ addiu $t6, $s0, 0x0220 ## $t6 = 00000220 /* 00C8C 80AF61EC 260F0286 */ addiu $t7, $s0, 0x0286 ## $t7 = 00000286 /* 00C90 80AF61F0 24180011 */ addiu $t8, $zero, 0x0011 ## $t8 = 00000011 -/* 00C94 80AF61F4 AFB80018 */ sw $t8, 0x0018($sp) -/* 00C98 80AF61F8 AFAF0014 */ sw $t7, 0x0014($sp) -/* 00C9C 80AF61FC AFAE0010 */ sw $t6, 0x0010($sp) +/* 00C94 80AF61F4 AFB80018 */ sw $t8, 0x0018($sp) +/* 00C98 80AF61F8 AFAF0014 */ sw $t7, 0x0014($sp) +/* 00C9C 80AF61FC AFAE0010 */ sw $t6, 0x0010($sp) /* 00CA0 80AF6200 24C6B1A0 */ addiu $a2, $a2, 0xB1A0 ## $a2 = 0600B1A0 /* 00CA4 80AF6204 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 00CA8 80AF6208 2605014C */ addiu $a1, $s0, 0x014C ## $a1 = 0000014C -/* 00CAC 80AF620C 0C0291BE */ jal func_800A46F8 +/* 00CAC 80AF620C 0C0291BE */ jal SkelAnime_InitSV /* 00CB0 80AF6210 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 /* 00CB4 80AF6214 26050194 */ addiu $a1, $s0, 0x0194 ## $a1 = 00000194 -/* 00CB8 80AF6218 AFA50040 */ sw $a1, 0x0040($sp) +/* 00CB8 80AF6218 AFA50040 */ sw $a1, 0x0040($sp) /* 00CBC 80AF621C 0C0170D9 */ jal ActorCollider_AllocCylinder - + /* 00CC0 80AF6220 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 00CC4 80AF6224 3C0780AF */ lui $a3, %hi(D_80AF7260) ## $a3 = 80AF0000 -/* 00CC8 80AF6228 8FA50040 */ lw $a1, 0x0040($sp) +/* 00CC8 80AF6228 8FA50040 */ lw $a1, 0x0040($sp) /* 00CCC 80AF622C 24E77260 */ addiu $a3, $a3, %lo(D_80AF7260) ## $a3 = 80AF7260 /* 00CD0 80AF6230 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 00CD4 80AF6234 0C01712B */ jal ActorCollider_InitCylinder - + /* 00CD8 80AF6238 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 00CDC 80AF623C 3C0680AF */ lui $a2, %hi(D_80AF728C) ## $a2 = 80AF0000 /* 00CE0 80AF6240 24C6728C */ addiu $a2, $a2, %lo(D_80AF728C) ## $a2 = 80AF728C /* 00CE4 80AF6244 26040098 */ addiu $a0, $s0, 0x0098 ## $a0 = 00000098 -/* 00CE8 80AF6248 0C0187BF */ jal func_80061EFC +/* 00CE8 80AF6248 0C0187BF */ jal func_80061EFC /* 00CEC 80AF624C 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 00CF0 80AF6250 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00CF4 80AF6254 0C2BD77F */ jal func_80AF5DFC +/* 00CF4 80AF6254 0C2BD77F */ jal func_80AF5DFC /* 00CF8 80AF6258 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 00CFC 80AF625C 2C410006 */ sltiu $at, $v0, 0x0006 -/* 00D00 80AF6260 1020004A */ beq $at, $zero, .L80AF638C -/* 00D04 80AF6264 0002C880 */ sll $t9, $v0, 2 +/* 00CFC 80AF625C 2C410006 */ sltiu $at, $v0, 0x0006 +/* 00D00 80AF6260 1020004A */ beq $at, $zero, .L80AF638C +/* 00D04 80AF6264 0002C880 */ sll $t9, $v0, 2 /* 00D08 80AF6268 3C0180AF */ lui $at, %hi(jtbl_80AF74F4) ## $at = 80AF0000 -/* 00D0C 80AF626C 00390821 */ addu $at, $at, $t9 -/* 00D10 80AF6270 8C3974F4 */ lw $t9, %lo(jtbl_80AF74F4)($at) -/* 00D14 80AF6274 03200008 */ jr $t9 +/* 00D0C 80AF626C 00390821 */ addu $at, $at, $t9 +/* 00D10 80AF6270 8C3974F4 */ lw $t9, %lo(jtbl_80AF74F4)($at) +/* 00D14 80AF6274 03200008 */ jr $t9 /* 00D18 80AF6278 00000000 */ nop glabel L80AF627C /* 00D1C 80AF627C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00D20 80AF6280 0C2BD763 */ jal func_80AF5D8C +/* 00D20 80AF6280 0C2BD763 */ jal func_80AF5D8C /* 00D24 80AF6284 2405000B */ addiu $a1, $zero, 0x000B ## $a1 = 0000000B /* 00D28 80AF6288 3C0880AF */ lui $t0, %hi(func_80AF6448) ## $t0 = 80AF0000 /* 00D2C 80AF628C 25086448 */ addiu $t0, $t0, %lo(func_80AF6448) ## $t0 = 80AF6448 -/* 00D30 80AF6290 1000003E */ beq $zero, $zero, .L80AF638C +/* 00D30 80AF6290 1000003E */ beq $zero, $zero, .L80AF638C /* 00D34 80AF6294 AE080190 */ sw $t0, 0x0190($s0) ## 00000190 glabel L80AF6298 /* 00D38 80AF6298 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00D3C 80AF629C 0C2BD763 */ jal func_80AF5D8C +/* 00D3C 80AF629C 0C2BD763 */ jal func_80AF5D8C /* 00D40 80AF62A0 2405000B */ addiu $a1, $zero, 0x000B ## $a1 = 0000000B /* 00D44 80AF62A4 3C0980AF */ lui $t1, %hi(func_80AF683C) ## $t1 = 80AF0000 /* 00D48 80AF62A8 2529683C */ addiu $t1, $t1, %lo(func_80AF683C) ## $t1 = 80AF683C -/* 00D4C 80AF62AC 10000037 */ beq $zero, $zero, .L80AF638C +/* 00D4C 80AF62AC 10000037 */ beq $zero, $zero, .L80AF638C /* 00D50 80AF62B0 AE090190 */ sw $t1, 0x0190($s0) ## 00000190 glabel L80AF62B4 /* 00D54 80AF62B4 3C01BF80 */ lui $at, 0xBF80 ## $at = BF800000 /* 00D58 80AF62B8 44812000 */ mtc1 $at, $f4 ## $f4 = -1.00 /* 00D5C 80AF62BC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 00D60 80AF62C0 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 00D64 80AF62C4 0C2BD763 */ jal func_80AF5D8C +/* 00D64 80AF62C4 0C2BD763 */ jal func_80AF5D8C /* 00D68 80AF62C8 E604006C */ swc1 $f4, 0x006C($s0) ## 0000006C /* 00D6C 80AF62CC 3C0A80AF */ lui $t2, %hi(func_80AF6448) ## $t2 = 80AF0000 /* 00D70 80AF62D0 254A6448 */ addiu $t2, $t2, %lo(func_80AF6448) ## $t2 = 80AF6448 -/* 00D74 80AF62D4 1000002D */ beq $zero, $zero, .L80AF638C +/* 00D74 80AF62D4 1000002D */ beq $zero, $zero, .L80AF638C /* 00D78 80AF62D8 AE0A0190 */ sw $t2, 0x0190($s0) ## 00000190 glabel L80AF62DC /* 00D7C 80AF62DC 3C020201 */ lui $v0, 0x0201 ## $v0 = 02010000 /* 00D80 80AF62E0 3C01BF80 */ lui $at, 0xBF80 ## $at = BF800000 /* 00D84 80AF62E4 24420E20 */ addiu $v0, $v0, 0x0E20 ## $v0 = 02010E20 /* 00D88 80AF62E8 44813000 */ mtc1 $at, $f6 ## $f6 = -1.00 -/* 00D8C 80AF62EC 00025900 */ sll $t3, $v0, 4 -/* 00D90 80AF62F0 000B6702 */ srl $t4, $t3, 28 -/* 00D94 80AF62F4 000C6880 */ sll $t5, $t4, 2 +/* 00D8C 80AF62EC 00025900 */ sll $t3, $v0, 4 +/* 00D90 80AF62F0 000B6702 */ srl $t4, $t3, 28 +/* 00D94 80AF62F4 000C6880 */ sll $t5, $t4, 2 /* 00D98 80AF62F8 3C0E8016 */ lui $t6, 0x8016 ## $t6 = 80160000 /* 00D9C 80AF62FC A6000210 */ sh $zero, 0x0210($s0) ## 00000210 -/* 00DA0 80AF6300 01CD7021 */ addu $t6, $t6, $t5 +/* 00DA0 80AF6300 01CD7021 */ addu $t6, $t6, $t5 /* 00DA4 80AF6304 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 /* 00DA8 80AF6308 E606006C */ swc1 $f6, 0x006C($s0) ## 0000006C /* 00DAC 80AF630C 8DCE6FA8 */ lw $t6, 0x6FA8($t6) ## 80166FA8 /* 00DB0 80AF6310 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF -/* 00DB4 80AF6314 00417824 */ and $t7, $v0, $at +/* 00DB4 80AF6314 00417824 */ and $t7, $v0, $at /* 00DB8 80AF6318 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 00DBC 80AF631C 01CFC021 */ addu $t8, $t6, $t7 -/* 00DC0 80AF6320 0301C821 */ addu $t9, $t8, $at +/* 00DBC 80AF631C 01CFC021 */ addu $t8, $t6, $t7 +/* 00DC0 80AF6320 0301C821 */ addu $t9, $t8, $at /* 00DC4 80AF6324 AE391D68 */ sw $t9, 0x1D68($s1) ## 00001D68 /* 00DC8 80AF6328 3C018016 */ lui $at, 0x8016 ## $at = 80160000 /* 00DCC 80AF632C 24080001 */ addiu $t0, $zero, 0x0001 ## $t0 = 00000001 /* 00DD0 80AF6330 A028FA74 */ sb $t0, -0x058C($at) ## 8015FA74 /* 00DD4 80AF6334 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00DD8 80AF6338 0C2BD763 */ jal func_80AF5D8C +/* 00DD8 80AF6338 0C2BD763 */ jal func_80AF5D8C /* 00DDC 80AF633C 24050004 */ addiu $a1, $zero, 0x0004 ## $a1 = 00000004 /* 00DE0 80AF6340 3C0980AF */ lui $t1, %hi(func_80AF68E4) ## $t1 = 80AF0000 /* 00DE4 80AF6344 252968E4 */ addiu $t1, $t1, %lo(func_80AF68E4) ## $t1 = 80AF68E4 -/* 00DE8 80AF6348 10000010 */ beq $zero, $zero, .L80AF638C +/* 00DE8 80AF6348 10000010 */ beq $zero, $zero, .L80AF638C /* 00DEC 80AF634C AE090190 */ sw $t1, 0x0190($s0) ## 00000190 glabel L80AF6350 /* 00DF0 80AF6350 3C01BF80 */ lui $at, 0xBF80 ## $at = BF800000 @@ -116,30 +116,30 @@ glabel L80AF6350 /* 00DF8 80AF6358 A6000210 */ sh $zero, 0x0210($s0) ## 00000210 /* 00DFC 80AF635C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 00E00 80AF6360 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 00E04 80AF6364 0C2BD763 */ jal func_80AF5D8C +/* 00E04 80AF6364 0C2BD763 */ jal func_80AF5D8C /* 00E08 80AF6368 E608006C */ swc1 $f8, 0x006C($s0) ## 0000006C /* 00E0C 80AF636C 3C0A80AF */ lui $t2, %hi(func_80AF68E4) ## $t2 = 80AF0000 /* 00E10 80AF6370 254A68E4 */ addiu $t2, $t2, %lo(func_80AF68E4) ## $t2 = 80AF68E4 -/* 00E14 80AF6374 10000005 */ beq $zero, $zero, .L80AF638C +/* 00E14 80AF6374 10000005 */ beq $zero, $zero, .L80AF638C /* 00E18 80AF6378 AE0A0190 */ sw $t2, 0x0190($s0) ## 00000190 glabel L80AF637C /* 00E1C 80AF637C 0C00B55C */ jal Actor_Kill - + /* 00E20 80AF6380 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00E24 80AF6384 10000022 */ beq $zero, $zero, .L80AF6410 -/* 00E28 80AF6388 8FBF003C */ lw $ra, 0x003C($sp) +/* 00E24 80AF6384 10000022 */ beq $zero, $zero, .L80AF6410 +/* 00E28 80AF6388 8FBF003C */ lw $ra, 0x003C($sp) .L80AF638C: /* 00E2C 80AF638C 3C053C23 */ lui $a1, 0x3C23 ## $a1 = 3C230000 /* 00E30 80AF6390 34A5D70A */ ori $a1, $a1, 0xD70A ## $a1 = 3C23D70A /* 00E34 80AF6394 0C00B58B */ jal Actor_SetScale - + /* 00E38 80AF6398 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 00E3C 80AF639C 240B0006 */ addiu $t3, $zero, 0x0006 ## $t3 = 00000006 /* 00E40 80AF63A0 240C00FF */ addiu $t4, $zero, 0x00FF ## $t4 = 000000FF /* 00E44 80AF63A4 A20B001F */ sb $t3, 0x001F($s0) ## 0000001F /* 00E48 80AF63A8 A60001E0 */ sh $zero, 0x01E0($s0) ## 000001E0 /* 00E4C 80AF63AC A60C0218 */ sh $t4, 0x0218($s0) ## 00000218 -/* 00E50 80AF63B0 8FAD0044 */ lw $t5, 0x0044($sp) +/* 00E50 80AF63B0 8FAD0044 */ lw $t5, 0x0044($sp) /* 00E54 80AF63B4 C60A0024 */ lwc1 $f10, 0x0024($s0) ## 00000024 /* 00E58 80AF63B8 24180003 */ addiu $t8, $zero, 0x0003 ## $t8 = 00000003 /* 00E5C 80AF63BC 89AF0000 */ lwl $t7, 0x0000($t5) ## 00000000 @@ -152,22 +152,22 @@ glabel L80AF637C /* 00E78 80AF63D8 02203025 */ or $a2, $s1, $zero ## $a2 = 00000000 /* 00E7C 80AF63DC 24070018 */ addiu $a3, $zero, 0x0018 ## $a3 = 00000018 /* 00E80 80AF63E0 A60F021E */ sh $t7, 0x021E($s0) ## 0000021E -/* 00E84 80AF63E4 E7AA0010 */ swc1 $f10, 0x0010($sp) +/* 00E84 80AF63E4 E7AA0010 */ swc1 $f10, 0x0010($sp) /* 00E88 80AF63E8 C6100028 */ lwc1 $f16, 0x0028($s0) ## 00000028 -/* 00E8C 80AF63EC E7B00014 */ swc1 $f16, 0x0014($sp) +/* 00E8C 80AF63EC E7B00014 */ swc1 $f16, 0x0014($sp) /* 00E90 80AF63F0 C612002C */ lwc1 $f18, 0x002C($s0) ## 0000002C -/* 00E94 80AF63F4 AFB80028 */ sw $t8, 0x0028($sp) -/* 00E98 80AF63F8 AFA00024 */ sw $zero, 0x0024($sp) -/* 00E9C 80AF63FC AFA00020 */ sw $zero, 0x0020($sp) -/* 00EA0 80AF6400 AFA0001C */ sw $zero, 0x001C($sp) +/* 00E94 80AF63F4 AFB80028 */ sw $t8, 0x0028($sp) +/* 00E98 80AF63F8 AFA00024 */ sw $zero, 0x0024($sp) +/* 00E9C 80AF63FC AFA00020 */ sw $zero, 0x0020($sp) +/* 00EA0 80AF6400 AFA0001C */ sw $zero, 0x001C($sp) /* 00EA4 80AF6404 0C00C916 */ jal Actor_SpawnAttached - -/* 00EA8 80AF6408 E7B20018 */ swc1 $f18, 0x0018($sp) -/* 00EAC 80AF640C 8FBF003C */ lw $ra, 0x003C($sp) + +/* 00EA8 80AF6408 E7B20018 */ swc1 $f18, 0x0018($sp) +/* 00EAC 80AF640C 8FBF003C */ lw $ra, 0x003C($sp) .L80AF6410: -/* 00EB0 80AF6410 8FB00034 */ lw $s0, 0x0034($sp) -/* 00EB4 80AF6414 8FB10038 */ lw $s1, 0x0038($sp) -/* 00EB8 80AF6418 03E00008 */ jr $ra +/* 00EB0 80AF6410 8FB00034 */ lw $s0, 0x0034($sp) +/* 00EB4 80AF6414 8FB10038 */ lw $s1, 0x0038($sp) +/* 00EB8 80AF6418 03E00008 */ jr $ra /* 00EBC 80AF641C 27BD0050 */ addiu $sp, $sp, 0x0050 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Sa/func_80AF55E0.s b/asm/non_matchings/overlays/actors/ovl_En_Sa/func_80AF55E0.s index b9f77478f8..ee0d850cef 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Sa/func_80AF55E0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Sa/func_80AF55E0.s @@ -3,7 +3,7 @@ glabel func_80AF55E0 /* 00084 80AF55E4 AFBF0014 */ sw $ra, 0x0014($sp) /* 00088 80AF55E8 00A03025 */ or $a2, $a1, $zero ## $a2 = 00000000 /* 0008C 80AF55EC AFA6001C */ sw $a2, 0x001C($sp) -/* 00090 80AF55F0 0C01B0D8 */ jal func_8006C360 +/* 00090 80AF55F0 0C01B0D8 */ jal Text_GetFaceReaction /* 00094 80AF55F4 24050010 */ addiu $a1, $zero, 0x0010 ## $a1 = 00000010 /* 00098 80AF55F8 8FA6001C */ lw $a2, 0x001C($sp) /* 0009C 80AF55FC 10400003 */ beq $v0, $zero, .L80AF560C diff --git a/asm/non_matchings/overlays/actors/ovl_En_Sa/func_80AF5D8C.s b/asm/non_matchings/overlays/actors/ovl_En_Sa/func_80AF5D8C.s index 2ce075ada8..4611c77b43 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Sa/func_80AF5D8C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Sa/func_80AF5D8C.s @@ -2,32 +2,32 @@ glabel func_80AF5D8C /* 0082C 80AF5D8C 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 /* 00830 80AF5D90 3C0F80AF */ lui $t7, %hi(D_80AF7298) ## $t7 = 80AF0000 /* 00834 80AF5D94 25EF7298 */ addiu $t7, $t7, %lo(D_80AF7298) ## $t7 = 80AF7298 -/* 00838 80AF5D98 00057100 */ sll $t6, $a1, 4 -/* 0083C 80AF5D9C AFBF0024 */ sw $ra, 0x0024($sp) -/* 00840 80AF5DA0 AFA40030 */ sw $a0, 0x0030($sp) -/* 00844 80AF5DA4 01CF1821 */ addu $v1, $t6, $t7 +/* 00838 80AF5D98 00057100 */ sll $t6, $a1, 4 +/* 0083C 80AF5D9C AFBF0024 */ sw $ra, 0x0024($sp) +/* 00840 80AF5DA0 AFA40030 */ sw $a0, 0x0030($sp) +/* 00844 80AF5DA4 01CF1821 */ addu $v1, $t6, $t7 /* 00848 80AF5DA8 8C640000 */ lw $a0, 0x0000($v1) ## 00000000 /* 0084C 80AF5DAC 0C028800 */ jal SkelAnime_GetFrameCount - -/* 00850 80AF5DB0 AFA30028 */ sw $v1, 0x0028($sp) + +/* 00850 80AF5DB0 AFA30028 */ sw $v1, 0x0028($sp) /* 00854 80AF5DB4 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 -/* 00858 80AF5DB8 8FA30028 */ lw $v1, 0x0028($sp) -/* 0085C 80AF5DBC 8FA40030 */ lw $a0, 0x0030($sp) -/* 00860 80AF5DC0 468021A0 */ cvt.s.w $f6, $f4 +/* 00858 80AF5DB8 8FA30028 */ lw $v1, 0x0028($sp) +/* 0085C 80AF5DBC 8FA40030 */ lw $a0, 0x0030($sp) +/* 00860 80AF5DC0 468021A0 */ cvt.s.w $f6, $f4 /* 00864 80AF5DC4 90780008 */ lbu $t8, 0x0008($v1) ## 00000008 /* 00868 80AF5DC8 C468000C */ lwc1 $f8, 0x000C($v1) ## 0000000C /* 0086C 80AF5DCC 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 00870 80AF5DD0 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 /* 00874 80AF5DD4 8C650000 */ lw $a1, 0x0000($v1) ## 00000000 -/* 00878 80AF5DD8 E7A60010 */ swc1 $f6, 0x0010($sp) +/* 00878 80AF5DD8 E7A60010 */ swc1 $f6, 0x0010($sp) /* 0087C 80AF5DDC 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 00880 80AF5DE0 AFB80014 */ sw $t8, 0x0014($sp) -/* 00884 80AF5DE4 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 00888 80AF5DE8 E7A80018 */ swc1 $f8, 0x0018($sp) -/* 0088C 80AF5DEC 8FBF0024 */ lw $ra, 0x0024($sp) +/* 00880 80AF5DE0 AFB80014 */ sw $t8, 0x0014($sp) +/* 00884 80AF5DE4 0C029468 */ jal SkelAnime_ChangeAnim + +/* 00888 80AF5DE8 E7A80018 */ swc1 $f8, 0x0018($sp) +/* 0088C 80AF5DEC 8FBF0024 */ lw $ra, 0x0024($sp) /* 00890 80AF5DF0 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 00894 80AF5DF4 03E00008 */ jr $ra +/* 00894 80AF5DF4 03E00008 */ jr $ra /* 00898 80AF5DF8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Sa/func_80AF6448.s b/asm/non_matchings/overlays/actors/ovl_En_Sa/func_80AF6448.s index e05754ad70..8a935c2559 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Sa/func_80AF6448.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Sa/func_80AF6448.s @@ -1,94 +1,94 @@ glabel func_80AF6448 /* 00EE8 80AF6448 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 00EEC 80AF644C AFBF002C */ sw $ra, 0x002C($sp) -/* 00EF0 80AF6450 AFB00028 */ sw $s0, 0x0028($sp) -/* 00EF4 80AF6454 AFA50034 */ sw $a1, 0x0034($sp) +/* 00EEC 80AF644C AFBF002C */ sw $ra, 0x002C($sp) +/* 00EF0 80AF6450 AFB00028 */ sw $s0, 0x0028($sp) +/* 00EF4 80AF6454 AFA50034 */ sw $a1, 0x0034($sp) /* 00EF8 80AF6458 84AF00A4 */ lh $t7, 0x00A4($a1) ## 000000A4 /* 00EFC 80AF645C 24010055 */ addiu $at, $zero, 0x0055 ## $at = 00000055 /* 00F00 80AF6460 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00F04 80AF6464 55E100AD */ bnel $t7, $at, .L80AF671C +/* 00F04 80AF6464 55E100AD */ bnel $t7, $at, .L80AF671C /* 00F08 80AF6468 8E0E0154 */ lw $t6, 0x0154($s0) ## 00000154 /* 00F0C 80AF646C 849801E0 */ lh $t8, 0x01E0($a0) ## 000001E0 /* 00F10 80AF6470 3C038016 */ lui $v1, 0x8016 ## $v1 = 80160000 /* 00F14 80AF6474 2463E660 */ addiu $v1, $v1, 0xE660 ## $v1 = 8015E660 -/* 00F18 80AF6478 1300008E */ beq $t8, $zero, .L80AF66B4 +/* 00F18 80AF6478 1300008E */ beq $t8, $zero, .L80AF66B4 /* 00F1C 80AF647C 3C198012 */ lui $t9, 0x8012 ## $t9 = 80120000 /* 00F20 80AF6480 9482010E */ lhu $v0, 0x010E($a0) ## 0000010E /* 00F24 80AF6484 24011002 */ addiu $at, $zero, 0x1002 ## $at = 00001002 -/* 00F28 80AF6488 1041000D */ beq $v0, $at, .L80AF64C0 +/* 00F28 80AF6488 1041000D */ beq $v0, $at, .L80AF64C0 /* 00F2C 80AF648C 24011003 */ addiu $at, $zero, 0x1003 ## $at = 00001003 -/* 00F30 80AF6490 10410029 */ beq $v0, $at, .L80AF6538 +/* 00F30 80AF6490 10410029 */ beq $v0, $at, .L80AF6538 /* 00F34 80AF6494 24011031 */ addiu $at, $zero, 0x1031 ## $at = 00001031 -/* 00F38 80AF6498 10410033 */ beq $v0, $at, .L80AF6568 +/* 00F38 80AF6498 10410033 */ beq $v0, $at, .L80AF6568 /* 00F3C 80AF649C 24011032 */ addiu $at, $zero, 0x1032 ## $at = 00001032 -/* 00F40 80AF64A0 1041005B */ beq $v0, $at, .L80AF6610 +/* 00F40 80AF64A0 1041005B */ beq $v0, $at, .L80AF6610 /* 00F44 80AF64A4 24011047 */ addiu $at, $zero, 0x1047 ## $at = 00001047 -/* 00F48 80AF64A8 10410069 */ beq $v0, $at, .L80AF6650 +/* 00F48 80AF64A8 10410069 */ beq $v0, $at, .L80AF6650 /* 00F4C 80AF64AC 24011048 */ addiu $at, $zero, 0x1048 ## $at = 00001048 -/* 00F50 80AF64B0 50410075 */ beql $v0, $at, .L80AF6688 +/* 00F50 80AF64B0 50410075 */ beql $v0, $at, .L80AF6688 /* 00F54 80AF64B4 920F0208 */ lbu $t7, 0x0208($s0) ## 00000208 -/* 00F58 80AF64B8 10000095 */ beq $zero, $zero, .L80AF6710 +/* 00F58 80AF64B8 10000095 */ beq $zero, $zero, .L80AF6710 /* 00F5C 80AF64BC 00000000 */ nop .L80AF64C0: /* 00F60 80AF64C0 92020208 */ lbu $v0, 0x0208($s0) ## 00000208 -/* 00F64 80AF64C4 5440000C */ bnel $v0, $zero, .L80AF64F8 +/* 00F64 80AF64C4 5440000C */ bnel $v0, $zero, .L80AF64F8 /* 00F68 80AF64C8 24030002 */ addiu $v1, $zero, 0x0002 ## $v1 = 00000002 /* 00F6C 80AF64CC 9219020B */ lbu $t9, 0x020B($s0) ## 0000020B /* 00F70 80AF64D0 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 /* 00F74 80AF64D4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00F78 80AF64D8 53210007 */ beql $t9, $at, .L80AF64F8 +/* 00F78 80AF64D8 53210007 */ beql $t9, $at, .L80AF64F8 /* 00F7C 80AF64DC 24030002 */ addiu $v1, $zero, 0x0002 ## $v1 = 00000002 -/* 00F80 80AF64E0 0C2BD735 */ jal func_80AF5CD4 +/* 00F80 80AF64E0 0C2BD735 */ jal func_80AF5CD4 /* 00F84 80AF64E4 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 /* 00F88 80AF64E8 24080001 */ addiu $t0, $zero, 0x0001 ## $t0 = 00000001 /* 00F8C 80AF64EC A6080216 */ sh $t0, 0x0216($s0) ## 00000216 /* 00F90 80AF64F0 92020208 */ lbu $v0, 0x0208($s0) ## 00000208 /* 00F94 80AF64F4 24030002 */ addiu $v1, $zero, 0x0002 ## $v1 = 00000002 .L80AF64F8: -/* 00F98 80AF64F8 5462000B */ bnel $v1, $v0, .L80AF6528 +/* 00F98 80AF64F8 5462000B */ bnel $v1, $v0, .L80AF6528 /* 00F9C 80AF64FC 24010005 */ addiu $at, $zero, 0x0005 ## $at = 00000005 /* 00FA0 80AF6500 9209020B */ lbu $t1, 0x020B($s0) ## 0000020B /* 00FA4 80AF6504 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00FA8 80AF6508 50690007 */ beql $v1, $t1, .L80AF6528 +/* 00FA8 80AF6508 50690007 */ beql $v1, $t1, .L80AF6528 /* 00FAC 80AF650C 24010005 */ addiu $at, $zero, 0x0005 ## $at = 00000005 -/* 00FB0 80AF6510 0C2BD735 */ jal func_80AF5CD4 +/* 00FB0 80AF6510 0C2BD735 */ jal func_80AF5CD4 /* 00FB4 80AF6514 24050002 */ addiu $a1, $zero, 0x0002 ## $a1 = 00000002 /* 00FB8 80AF6518 240A0001 */ addiu $t2, $zero, 0x0001 ## $t2 = 00000001 /* 00FBC 80AF651C A60A0216 */ sh $t2, 0x0216($s0) ## 00000216 /* 00FC0 80AF6520 92020208 */ lbu $v0, 0x0208($s0) ## 00000208 /* 00FC4 80AF6524 24010005 */ addiu $at, $zero, 0x0005 ## $at = 00000005 .L80AF6528: -/* 00FC8 80AF6528 14410079 */ bne $v0, $at, .L80AF6710 +/* 00FC8 80AF6528 14410079 */ bne $v0, $at, .L80AF6710 /* 00FCC 80AF652C 00000000 */ nop -/* 00FD0 80AF6530 10000077 */ beq $zero, $zero, .L80AF6710 +/* 00FD0 80AF6530 10000077 */ beq $zero, $zero, .L80AF6710 /* 00FD4 80AF6534 A6000216 */ sh $zero, 0x0216($s0) ## 00000216 .L80AF6538: /* 00FD8 80AF6538 920B0208 */ lbu $t3, 0x0208($s0) ## 00000208 -/* 00FDC 80AF653C 15600074 */ bne $t3, $zero, .L80AF6710 +/* 00FDC 80AF653C 15600074 */ bne $t3, $zero, .L80AF6710 /* 00FE0 80AF6540 00000000 */ nop /* 00FE4 80AF6544 920C020B */ lbu $t4, 0x020B($s0) ## 0000020B /* 00FE8 80AF6548 24010004 */ addiu $at, $zero, 0x0004 ## $at = 00000004 /* 00FEC 80AF654C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00FF0 80AF6550 1181006F */ beq $t4, $at, .L80AF6710 +/* 00FF0 80AF6550 1181006F */ beq $t4, $at, .L80AF6710 /* 00FF4 80AF6554 00000000 */ nop -/* 00FF8 80AF6558 0C2BD735 */ jal func_80AF5CD4 +/* 00FF8 80AF6558 0C2BD735 */ jal func_80AF5CD4 /* 00FFC 80AF655C 24050004 */ addiu $a1, $zero, 0x0004 ## $a1 = 00000004 -/* 01000 80AF6560 1000006B */ beq $zero, $zero, .L80AF6710 +/* 01000 80AF6560 1000006B */ beq $zero, $zero, .L80AF6710 /* 01004 80AF6564 00000000 */ nop .L80AF6568: /* 01008 80AF6568 92020208 */ lbu $v0, 0x0208($s0) ## 00000208 -/* 0100C 80AF656C 54400010 */ bnel $v0, $zero, .L80AF65B0 +/* 0100C 80AF656C 54400010 */ bnel $v0, $zero, .L80AF65B0 /* 01010 80AF6570 24030002 */ addiu $v1, $zero, 0x0002 ## $v1 = 00000002 /* 01014 80AF6574 920D020B */ lbu $t5, 0x020B($s0) ## 0000020B /* 01018 80AF6578 24010004 */ addiu $at, $zero, 0x0004 ## $at = 00000004 -/* 0101C 80AF657C 51A1000C */ beql $t5, $at, .L80AF65B0 +/* 0101C 80AF657C 51A1000C */ beql $t5, $at, .L80AF65B0 /* 01020 80AF6580 24030002 */ addiu $v1, $zero, 0x0002 ## $v1 = 00000002 /* 01024 80AF6584 8E0F0154 */ lw $t7, 0x0154($s0) ## 00000154 /* 01028 80AF6588 3C0E0601 */ lui $t6, 0x0601 ## $t6 = 06010000 /* 0102C 80AF658C 25CE2100 */ addiu $t6, $t6, 0x2100 ## $t6 = 06012100 -/* 01030 80AF6590 15CF0006 */ bne $t6, $t7, .L80AF65AC +/* 01030 80AF6590 15CF0006 */ bne $t6, $t7, .L80AF65AC /* 01034 80AF6594 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01038 80AF6598 0C2BD735 */ jal func_80AF5CD4 +/* 01038 80AF6598 0C2BD735 */ jal func_80AF5CD4 /* 0103C 80AF659C 24050004 */ addiu $a1, $zero, 0x0004 ## $a1 = 00000004 /* 01040 80AF65A0 24180003 */ addiu $t8, $zero, 0x0003 ## $t8 = 00000003 /* 01044 80AF65A4 A6180216 */ sh $t8, 0x0216($s0) ## 00000216 @@ -96,154 +96,154 @@ glabel func_80AF6448 .L80AF65AC: /* 0104C 80AF65AC 24030002 */ addiu $v1, $zero, 0x0002 ## $v1 = 00000002 .L80AF65B0: -/* 01050 80AF65B0 5462000C */ bnel $v1, $v0, .L80AF65E4 +/* 01050 80AF65B0 5462000C */ bnel $v1, $v0, .L80AF65E4 /* 01054 80AF65B4 24010004 */ addiu $at, $zero, 0x0004 ## $at = 00000004 /* 01058 80AF65B8 9219020B */ lbu $t9, 0x020B($s0) ## 0000020B /* 0105C 80AF65BC 24010005 */ addiu $at, $zero, 0x0005 ## $at = 00000005 /* 01060 80AF65C0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01064 80AF65C4 53210007 */ beql $t9, $at, .L80AF65E4 +/* 01064 80AF65C4 53210007 */ beql $t9, $at, .L80AF65E4 /* 01068 80AF65C8 24010004 */ addiu $at, $zero, 0x0004 ## $at = 00000004 -/* 0106C 80AF65CC 0C2BD735 */ jal func_80AF5CD4 +/* 0106C 80AF65CC 0C2BD735 */ jal func_80AF5CD4 /* 01070 80AF65D0 24050005 */ addiu $a1, $zero, 0x0005 ## $a1 = 00000005 /* 01074 80AF65D4 24030002 */ addiu $v1, $zero, 0x0002 ## $v1 = 00000002 /* 01078 80AF65D8 A6030216 */ sh $v1, 0x0216($s0) ## 00000216 /* 0107C 80AF65DC 92020208 */ lbu $v0, 0x0208($s0) ## 00000208 /* 01080 80AF65E0 24010004 */ addiu $at, $zero, 0x0004 ## $at = 00000004 .L80AF65E4: -/* 01084 80AF65E4 1441004A */ bne $v0, $at, .L80AF6710 +/* 01084 80AF65E4 1441004A */ bne $v0, $at, .L80AF6710 /* 01088 80AF65E8 00000000 */ nop /* 0108C 80AF65EC 9208020B */ lbu $t0, 0x020B($s0) ## 0000020B /* 01090 80AF65F0 24010006 */ addiu $at, $zero, 0x0006 ## $at = 00000006 /* 01094 80AF65F4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01098 80AF65F8 11010045 */ beq $t0, $at, .L80AF6710 +/* 01098 80AF65F8 11010045 */ beq $t0, $at, .L80AF6710 /* 0109C 80AF65FC 00000000 */ nop -/* 010A0 80AF6600 0C2BD735 */ jal func_80AF5CD4 +/* 010A0 80AF6600 0C2BD735 */ jal func_80AF5CD4 /* 010A4 80AF6604 24050006 */ addiu $a1, $zero, 0x0006 ## $a1 = 00000006 -/* 010A8 80AF6608 10000041 */ beq $zero, $zero, .L80AF6710 +/* 010A8 80AF6608 10000041 */ beq $zero, $zero, .L80AF6710 /* 010AC 80AF660C A6000216 */ sh $zero, 0x0216($s0) ## 00000216 .L80AF6610: /* 010B0 80AF6610 92090208 */ lbu $t1, 0x0208($s0) ## 00000208 -/* 010B4 80AF6614 1520003E */ bne $t1, $zero, .L80AF6710 +/* 010B4 80AF6614 1520003E */ bne $t1, $zero, .L80AF6710 /* 010B8 80AF6618 00000000 */ nop /* 010BC 80AF661C 920A020B */ lbu $t2, 0x020B($s0) ## 0000020B /* 010C0 80AF6620 24010004 */ addiu $at, $zero, 0x0004 ## $at = 00000004 -/* 010C4 80AF6624 1141003A */ beq $t2, $at, .L80AF6710 +/* 010C4 80AF6624 1141003A */ beq $t2, $at, .L80AF6710 /* 010C8 80AF6628 00000000 */ nop /* 010CC 80AF662C 8E0C0154 */ lw $t4, 0x0154($s0) ## 00000154 /* 010D0 80AF6630 3C0B0601 */ lui $t3, 0x0601 ## $t3 = 06010000 /* 010D4 80AF6634 256B2100 */ addiu $t3, $t3, 0x2100 ## $t3 = 06012100 -/* 010D8 80AF6638 156C0035 */ bne $t3, $t4, .L80AF6710 +/* 010D8 80AF6638 156C0035 */ bne $t3, $t4, .L80AF6710 /* 010DC 80AF663C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 010E0 80AF6640 0C2BD735 */ jal func_80AF5CD4 +/* 010E0 80AF6640 0C2BD735 */ jal func_80AF5CD4 /* 010E4 80AF6644 24050004 */ addiu $a1, $zero, 0x0004 ## $a1 = 00000004 -/* 010E8 80AF6648 10000031 */ beq $zero, $zero, .L80AF6710 +/* 010E8 80AF6648 10000031 */ beq $zero, $zero, .L80AF6710 /* 010EC 80AF664C 00000000 */ nop .L80AF6650: /* 010F0 80AF6650 920D0208 */ lbu $t5, 0x0208($s0) ## 00000208 /* 010F4 80AF6654 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 010F8 80AF6658 15A1002D */ bne $t5, $at, .L80AF6710 +/* 010F8 80AF6658 15A1002D */ bne $t5, $at, .L80AF6710 /* 010FC 80AF665C 00000000 */ nop /* 01100 80AF6660 920E020B */ lbu $t6, 0x020B($s0) ## 0000020B /* 01104 80AF6664 24010007 */ addiu $at, $zero, 0x0007 ## $at = 00000007 /* 01108 80AF6668 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0110C 80AF666C 11C10028 */ beq $t6, $at, .L80AF6710 +/* 0110C 80AF666C 11C10028 */ beq $t6, $at, .L80AF6710 /* 01110 80AF6670 00000000 */ nop -/* 01114 80AF6674 0C2BD735 */ jal func_80AF5CD4 +/* 01114 80AF6674 0C2BD735 */ jal func_80AF5CD4 /* 01118 80AF6678 24050007 */ addiu $a1, $zero, 0x0007 ## $a1 = 00000007 -/* 0111C 80AF667C 10000024 */ beq $zero, $zero, .L80AF6710 +/* 0111C 80AF667C 10000024 */ beq $zero, $zero, .L80AF6710 /* 01120 80AF6680 00000000 */ nop /* 01124 80AF6684 920F0208 */ lbu $t7, 0x0208($s0) ## 00000208 .L80AF6688: -/* 01128 80AF6688 15E00021 */ bne $t7, $zero, .L80AF6710 +/* 01128 80AF6688 15E00021 */ bne $t7, $zero, .L80AF6710 /* 0112C 80AF668C 00000000 */ nop /* 01130 80AF6690 9218020B */ lbu $t8, 0x020B($s0) ## 0000020B /* 01134 80AF6694 24010007 */ addiu $at, $zero, 0x0007 ## $at = 00000007 /* 01138 80AF6698 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0113C 80AF669C 1301001C */ beq $t8, $at, .L80AF6710 +/* 0113C 80AF669C 1301001C */ beq $t8, $at, .L80AF6710 /* 01140 80AF66A0 00000000 */ nop -/* 01144 80AF66A4 0C2BD735 */ jal func_80AF5CD4 +/* 01144 80AF66A4 0C2BD735 */ jal func_80AF5CD4 /* 01148 80AF66A8 24050007 */ addiu $a1, $zero, 0x0007 ## $a1 = 00000007 -/* 0114C 80AF66AC 10000018 */ beq $zero, $zero, .L80AF6710 +/* 0114C 80AF66AC 10000018 */ beq $zero, $zero, .L80AF6710 /* 01150 80AF66B0 00000000 */ nop .L80AF66B4: /* 01154 80AF66B4 8F397168 */ lw $t9, 0x7168($t9) ## 00007168 /* 01158 80AF66B8 8C6800A4 */ lw $t0, 0x00A4($v1) ## 000000A4 /* 0115C 80AF66BC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01160 80AF66C0 03284824 */ and $t1, $t9, $t0 -/* 01164 80AF66C4 15200010 */ bne $t1, $zero, .L80AF6708 +/* 01160 80AF66C0 03284824 */ and $t1, $t9, $t0 +/* 01164 80AF66C4 15200010 */ bne $t1, $zero, .L80AF6708 /* 01168 80AF66C8 00000000 */ nop /* 0116C 80AF66CC 94620EF8 */ lhu $v0, 0x0EF8($v1) ## 00000EF8 /* 01170 80AF66D0 304A0002 */ andi $t2, $v0, 0x0002 ## $t2 = 00000000 -/* 01174 80AF66D4 15400003 */ bne $t2, $zero, .L80AF66E4 +/* 01174 80AF66D4 15400003 */ bne $t2, $zero, .L80AF66E4 /* 01178 80AF66D8 304B0008 */ andi $t3, $v0, 0x0008 ## $t3 = 00000000 -/* 0117C 80AF66DC 1160000A */ beq $t3, $zero, .L80AF6708 +/* 0117C 80AF66DC 1160000A */ beq $t3, $zero, .L80AF6708 /* 01180 80AF66E0 00000000 */ nop .L80AF66E4: /* 01184 80AF66E4 920C020B */ lbu $t4, 0x020B($s0) ## 0000020B /* 01188 80AF66E8 24010003 */ addiu $at, $zero, 0x0003 ## $at = 00000003 /* 0118C 80AF66EC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01190 80AF66F0 11810007 */ beq $t4, $at, .L80AF6710 +/* 01190 80AF66F0 11810007 */ beq $t4, $at, .L80AF6710 /* 01194 80AF66F4 00000000 */ nop -/* 01198 80AF66F8 0C2BD735 */ jal func_80AF5CD4 +/* 01198 80AF66F8 0C2BD735 */ jal func_80AF5CD4 /* 0119C 80AF66FC 24050003 */ addiu $a1, $zero, 0x0003 ## $a1 = 00000003 -/* 011A0 80AF6700 10000003 */ beq $zero, $zero, .L80AF6710 +/* 011A0 80AF6700 10000003 */ beq $zero, $zero, .L80AF6710 /* 011A4 80AF6704 00000000 */ nop .L80AF6708: -/* 011A8 80AF6708 0C2BD735 */ jal func_80AF5CD4 +/* 011A8 80AF6708 0C2BD735 */ jal func_80AF5CD4 /* 011AC 80AF670C 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 .L80AF6710: -/* 011B0 80AF6710 0C2BD739 */ jal func_80AF5CE4 +/* 011B0 80AF6710 0C2BD739 */ jal func_80AF5CE4 /* 011B4 80AF6714 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 011B8 80AF6718 8E0E0154 */ lw $t6, 0x0154($s0) ## 00000154 .L80AF671C: /* 011BC 80AF671C 3C0D0601 */ lui $t5, 0x0601 ## $t5 = 06010000 /* 011C0 80AF6720 25ADC500 */ addiu $t5, $t5, 0xC500 ## $t5 = 0600C500 -/* 011C4 80AF6724 55AE000E */ bnel $t5, $t6, .L80AF6760 +/* 011C4 80AF6724 55AE000E */ bnel $t5, $t6, .L80AF6760 /* 011C8 80AF6728 861901E0 */ lh $t9, 0x01E0($s0) ## 000001E0 /* 011CC 80AF672C C6060164 */ lwc1 $f6, 0x0164($s0) ## 00000164 /* 011D0 80AF6730 3C01BF80 */ lui $at, 0xBF80 ## $at = BF800000 /* 011D4 80AF6734 44812000 */ mtc1 $at, $f4 ## $f4 = -1.00 -/* 011D8 80AF6738 4600320D */ trunc.w.s $f8, $f6 +/* 011D8 80AF6738 4600320D */ trunc.w.s $f8, $f6 /* 011DC 80AF673C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 011E0 80AF6740 E6040168 */ swc1 $f4, 0x0168($s0) ## 00000168 -/* 011E4 80AF6744 44184000 */ mfc1 $t8, $f8 +/* 011E4 80AF6744 44184000 */ mfc1 $t8, $f8 /* 011E8 80AF6748 00000000 */ nop -/* 011EC 80AF674C 57000004 */ bnel $t8, $zero, .L80AF6760 +/* 011EC 80AF674C 57000004 */ bnel $t8, $zero, .L80AF6760 /* 011F0 80AF6750 861901E0 */ lh $t9, 0x01E0($s0) ## 000001E0 -/* 011F4 80AF6754 0C2BD763 */ jal func_80AF5D8C +/* 011F4 80AF6754 0C2BD763 */ jal func_80AF5D8C /* 011F8 80AF6758 24050006 */ addiu $a1, $zero, 0x0006 ## $a1 = 00000006 /* 011FC 80AF675C 861901E0 */ lh $t9, 0x01E0($s0) ## 000001E0 .L80AF6760: -/* 01200 80AF6760 8FA80034 */ lw $t0, 0x0034($sp) -/* 01204 80AF6764 53200016 */ beql $t9, $zero, .L80AF67C0 -/* 01208 80AF6768 8FBF002C */ lw $ra, 0x002C($sp) +/* 01200 80AF6760 8FA80034 */ lw $t0, 0x0034($sp) +/* 01204 80AF6764 53200016 */ beql $t9, $zero, .L80AF67C0 +/* 01208 80AF6768 8FBF002C */ lw $ra, 0x002C($sp) /* 0120C 80AF676C 850900A4 */ lh $t1, 0x00A4($t0) ## 000000A4 /* 01210 80AF6770 24010056 */ addiu $at, $zero, 0x0056 ## $at = 00000056 /* 01214 80AF6774 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C -/* 01218 80AF6778 15210010 */ bne $t1, $at, .L80AF67BC +/* 01218 80AF6778 15210010 */ bne $t1, $at, .L80AF67BC /* 0121C 80AF677C 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 /* 01220 80AF6780 3C014120 */ lui $at, 0x4120 ## $at = 41200000 /* 01224 80AF6784 44815000 */ mtc1 $at, $f10 ## $f10 = 10.00 /* 01228 80AF6788 3C01C120 */ lui $at, 0xC120 ## $at = C1200000 /* 0122C 80AF678C 44818000 */ mtc1 $at, $f16 ## $f16 = -10.00 /* 01230 80AF6790 240A0002 */ addiu $t2, $zero, 0x0002 ## $t2 = 00000002 -/* 01234 80AF6794 AFAA0014 */ sw $t2, 0x0014($sp) +/* 01234 80AF6794 AFAA0014 */ sw $t2, 0x0014($sp) /* 01238 80AF6798 24A5C500 */ addiu $a1, $a1, 0xC500 ## $a1 = 0600C500 /* 0123C 80AF679C 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 01240 80AF67A0 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 01244 80AF67A4 E7AA0010 */ swc1 $f10, 0x0010($sp) -/* 01248 80AF67A8 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 0124C 80AF67AC E7B00018 */ swc1 $f16, 0x0018($sp) +/* 01244 80AF67A4 E7AA0010 */ swc1 $f10, 0x0010($sp) +/* 01248 80AF67A8 0C029468 */ jal SkelAnime_ChangeAnim + +/* 0124C 80AF67AC E7B00018 */ swc1 $f16, 0x0018($sp) /* 01250 80AF67B0 3C0B80AF */ lui $t3, %hi(func_80AF67D0) ## $t3 = 80AF0000 /* 01254 80AF67B4 256B67D0 */ addiu $t3, $t3, %lo(func_80AF67D0) ## $t3 = 80AF67D0 /* 01258 80AF67B8 AE0B0190 */ sw $t3, 0x0190($s0) ## 00000190 .L80AF67BC: -/* 0125C 80AF67BC 8FBF002C */ lw $ra, 0x002C($sp) +/* 0125C 80AF67BC 8FBF002C */ lw $ra, 0x002C($sp) .L80AF67C0: -/* 01260 80AF67C0 8FB00028 */ lw $s0, 0x0028($sp) +/* 01260 80AF67C0 8FB00028 */ lw $s0, 0x0028($sp) /* 01264 80AF67C4 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 01268 80AF67C8 03E00008 */ jr $ra +/* 01268 80AF67C8 03E00008 */ jr $ra /* 0126C 80AF67CC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Sa/func_80AF67D0.s b/asm/non_matchings/overlays/actors/ovl_En_Sa/func_80AF67D0.s index 6566091dfb..c145c78cf6 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Sa/func_80AF67D0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Sa/func_80AF67D0.s @@ -1,32 +1,32 @@ glabel func_80AF67D0 /* 01270 80AF67D0 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 01274 80AF67D4 AFBF0024 */ sw $ra, 0x0024($sp) -/* 01278 80AF67D8 AFA40028 */ sw $a0, 0x0028($sp) -/* 0127C 80AF67DC AFA5002C */ sw $a1, 0x002C($sp) +/* 01274 80AF67D4 AFBF0024 */ sw $ra, 0x0024($sp) +/* 01278 80AF67D8 AFA40028 */ sw $a0, 0x0028($sp) +/* 0127C 80AF67DC AFA5002C */ sw $a1, 0x002C($sp) /* 01280 80AF67E0 848F01E0 */ lh $t7, 0x01E0($a0) ## 000001E0 /* 01284 80AF67E4 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 /* 01288 80AF67E8 24A5C500 */ addiu $a1, $a1, 0xC500 ## $a1 = 0600C500 -/* 0128C 80AF67EC 15E0000F */ bne $t7, $zero, .L80AF682C +/* 0128C 80AF67EC 15E0000F */ bne $t7, $zero, .L80AF682C /* 01290 80AF67F0 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C /* 01294 80AF67F4 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 /* 01298 80AF67F8 3C01C120 */ lui $at, 0xC120 ## $at = C1200000 /* 0129C 80AF67FC 44812000 */ mtc1 $at, $f4 ## $f4 = -10.00 /* 012A0 80AF6800 24180002 */ addiu $t8, $zero, 0x0002 ## $t8 = 00000002 -/* 012A4 80AF6804 44060000 */ mfc1 $a2, $f0 -/* 012A8 80AF6808 AFB80014 */ sw $t8, 0x0014($sp) +/* 012A4 80AF6804 44060000 */ mfc1 $a2, $f0 +/* 012A8 80AF6808 AFB80014 */ sw $t8, 0x0014($sp) /* 012AC 80AF680C 3C074120 */ lui $a3, 0x4120 ## $a3 = 41200000 -/* 012B0 80AF6810 E7A00010 */ swc1 $f0, 0x0010($sp) -/* 012B4 80AF6814 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 012B8 80AF6818 E7A40018 */ swc1 $f4, 0x0018($sp) -/* 012BC 80AF681C 8FA80028 */ lw $t0, 0x0028($sp) +/* 012B0 80AF6810 E7A00010 */ swc1 $f0, 0x0010($sp) +/* 012B4 80AF6814 0C029468 */ jal SkelAnime_ChangeAnim + +/* 012B8 80AF6818 E7A40018 */ swc1 $f4, 0x0018($sp) +/* 012BC 80AF681C 8FA80028 */ lw $t0, 0x0028($sp) /* 012C0 80AF6820 3C1980AF */ lui $t9, %hi(func_80AF6448) ## $t9 = 80AF0000 /* 012C4 80AF6824 27396448 */ addiu $t9, $t9, %lo(func_80AF6448) ## $t9 = 80AF6448 /* 012C8 80AF6828 AD190190 */ sw $t9, 0x0190($t0) ## 00000190 .L80AF682C: -/* 012CC 80AF682C 8FBF0024 */ lw $ra, 0x0024($sp) +/* 012CC 80AF682C 8FBF0024 */ lw $ra, 0x0024($sp) /* 012D0 80AF6830 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 012D4 80AF6834 03E00008 */ jr $ra +/* 012D4 80AF6834 03E00008 */ jr $ra /* 012D8 80AF6838 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Sb/EnSb_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Sb/EnSb_Destroy.s index 4f8c746795..3c3ae9719a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Sb/EnSb_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Sb/EnSb_Destroy.s @@ -1,18 +1,18 @@ glabel EnSb_Destroy /* 000E4 80AF78D4 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 000E8 80AF78D8 AFBF0014 */ sw $ra, 0x0014($sp) -/* 000EC 80AF78DC AFA40018 */ sw $a0, 0x0018($sp) -/* 000F0 80AF78E0 AFA5001C */ sw $a1, 0x001C($sp) -/* 000F4 80AF78E4 0C0295BC */ jal func_800A56F0 +/* 000E8 80AF78D8 AFBF0014 */ sw $ra, 0x0014($sp) +/* 000EC 80AF78DC AFA40018 */ sw $a0, 0x0018($sp) +/* 000F0 80AF78E0 AFA5001C */ sw $a1, 0x001C($sp) +/* 000F4 80AF78E4 0C0295BC */ jal SkelAnime_Free /* 000F8 80AF78E8 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 000FC 80AF78EC 8FA50018 */ lw $a1, 0x0018($sp) -/* 00100 80AF78F0 8FA4001C */ lw $a0, 0x001C($sp) +/* 000FC 80AF78EC 8FA50018 */ lw $a1, 0x0018($sp) +/* 00100 80AF78F0 8FA4001C */ lw $a0, 0x001C($sp) /* 00104 80AF78F4 0C0170EB */ jal ActorCollider_FreeCylinder - + /* 00108 80AF78F8 24A50194 */ addiu $a1, $a1, 0x0194 ## $a1 = 00000194 -/* 0010C 80AF78FC 8FBF0014 */ lw $ra, 0x0014($sp) +/* 0010C 80AF78FC 8FBF0014 */ lw $ra, 0x0014($sp) /* 00110 80AF7900 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00114 80AF7904 03E00008 */ jr $ra +/* 00114 80AF7904 03E00008 */ jr $ra /* 00118 80AF7908 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Sb/EnSb_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Sb/EnSb_Draw.s index c5c4c39187..34d48074b3 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Sb/EnSb_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Sb/EnSb_Draw.s @@ -1,84 +1,84 @@ glabel EnSb_Draw /* 01088 80AF8878 27BDFFB0 */ addiu $sp, $sp, 0xFFB0 ## $sp = FFFFFFB0 -/* 0108C 80AF887C AFBF002C */ sw $ra, 0x002C($sp) -/* 01090 80AF8880 AFB00028 */ sw $s0, 0x0028($sp) +/* 0108C 80AF887C AFBF002C */ sw $ra, 0x002C($sp) +/* 01090 80AF8880 AFB00028 */ sw $s0, 0x0028($sp) /* 01094 80AF8884 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 01098 80AF8888 AFA50054 */ sw $a1, 0x0054($sp) -/* 0109C 80AF888C 0C00BAF3 */ jal func_8002EBCC +/* 01098 80AF8888 AFA50054 */ sw $a1, 0x0054($sp) +/* 0109C 80AF888C 0C00BAF3 */ jal func_8002EBCC /* 010A0 80AF8890 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 /* 010A4 80AF8894 8E050150 */ lw $a1, 0x0150($s0) ## 00000150 /* 010A8 80AF8898 8E06016C */ lw $a2, 0x016C($s0) ## 0000016C /* 010AC 80AF889C 9207014E */ lbu $a3, 0x014E($s0) ## 0000014E /* 010B0 80AF88A0 3C0E80B0 */ lui $t6, %hi(func_80AF8828) ## $t6 = 80B00000 /* 010B4 80AF88A4 25CE8828 */ addiu $t6, $t6, %lo(func_80AF8828) ## $t6 = 80AF8828 -/* 010B8 80AF88A8 AFAE0014 */ sw $t6, 0x0014($sp) -/* 010BC 80AF88AC AFB00018 */ sw $s0, 0x0018($sp) -/* 010C0 80AF88B0 AFA00010 */ sw $zero, 0x0010($sp) -/* 010C4 80AF88B4 0C0286B2 */ jal func_800A1AC8 -/* 010C8 80AF88B8 8FA40054 */ lw $a0, 0x0054($sp) +/* 010B8 80AF88A8 AFAE0014 */ sw $t6, 0x0014($sp) +/* 010BC 80AF88AC AFB00018 */ sw $s0, 0x0018($sp) +/* 010C0 80AF88B0 AFA00010 */ sw $zero, 0x0010($sp) +/* 010C4 80AF88B4 0C0286B2 */ jal SkelAnime_DrawSV +/* 010C8 80AF88B8 8FA40054 */ lw $a0, 0x0054($sp) /* 010CC 80AF88BC 860301F8 */ lh $v1, 0x01F8($s0) ## 000001F8 -/* 010D0 80AF88C0 10600035 */ beq $v1, $zero, .L80AF8998 +/* 010D0 80AF88C0 10600035 */ beq $v1, $zero, .L80AF8998 /* 010D4 80AF88C4 2462FFFF */ addiu $v0, $v1, 0xFFFF ## $v0 = FFFFFFFF /* 010D8 80AF88C8 920F0114 */ lbu $t7, 0x0114($s0) ## 00000114 -/* 010DC 80AF88CC 00021400 */ sll $v0, $v0, 16 -/* 010E0 80AF88D0 00021403 */ sra $v0, $v0, 16 +/* 010DC 80AF88CC 00021400 */ sll $v0, $v0, 16 +/* 010E0 80AF88D0 00021403 */ sra $v0, $v0, 16 /* 010E4 80AF88D4 30590001 */ andi $t9, $v0, 0x0001 ## $t9 = 00000001 /* 010E8 80AF88D8 25F80001 */ addiu $t8, $t7, 0x0001 ## $t8 = 00000001 -/* 010EC 80AF88DC 1720002E */ bne $t9, $zero, .L80AF8998 +/* 010EC 80AF88DC 1720002E */ bne $t9, $zero, .L80AF8998 /* 010F0 80AF88E0 A2180114 */ sb $t8, 0x0114($s0) ## 00000114 /* 010F4 80AF88E4 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 /* 010F8 80AF88E8 44816000 */ mtc1 $at, $f12 ## $f12 = 5.00 /* 010FC 80AF88EC 0C00CFC8 */ jal Math_Rand_CenteredFloat - -/* 01100 80AF88F0 A7A2003A */ sh $v0, 0x003A($sp) -/* 01104 80AF88F4 87A2003A */ lh $v0, 0x003A($sp) + +/* 01100 80AF88F0 A7A2003A */ sh $v0, 0x003A($sp) +/* 01104 80AF88F4 87A2003A */ lh $v0, 0x003A($sp) /* 01108 80AF88F8 3C0A80B0 */ lui $t2, %hi(D_80AF8A28) ## $t2 = 80B00000 /* 0110C 80AF88FC 254A8A28 */ addiu $t2, $t2, %lo(D_80AF8A28) ## $t2 = 80AF8A28 /* 01110 80AF8900 30480003 */ andi $t0, $v0, 0x0003 ## $t0 = 00000000 -/* 01114 80AF8904 00084880 */ sll $t1, $t0, 2 -/* 01118 80AF8908 01284823 */ subu $t1, $t1, $t0 -/* 0111C 80AF890C 00094880 */ sll $t1, $t1, 2 -/* 01120 80AF8910 012A1821 */ addu $v1, $t1, $t2 +/* 01114 80AF8904 00084880 */ sll $t1, $t0, 2 +/* 01118 80AF8908 01284823 */ subu $t1, $t1, $t0 +/* 0111C 80AF890C 00094880 */ sll $t1, $t1, 2 +/* 01120 80AF8910 012A1821 */ addu $v1, $t1, $t2 /* 01124 80AF8914 C4660000 */ lwc1 $f6, 0x0000($v1) ## 00000000 /* 01128 80AF8918 C6040024 */ lwc1 $f4, 0x0024($s0) ## 00000024 /* 0112C 80AF891C 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 /* 01130 80AF8920 44816000 */ mtc1 $at, $f12 ## $f12 = 5.00 -/* 01134 80AF8924 46062200 */ add.s $f8, $f4, $f6 -/* 01138 80AF8928 AFA30034 */ sw $v1, 0x0034($sp) -/* 0113C 80AF892C 46080280 */ add.s $f10, $f0, $f8 +/* 01134 80AF8924 46062200 */ add.s $f8, $f4, $f6 +/* 01138 80AF8928 AFA30034 */ sw $v1, 0x0034($sp) +/* 0113C 80AF892C 46080280 */ add.s $f10, $f0, $f8 /* 01140 80AF8930 0C00CFC8 */ jal Math_Rand_CenteredFloat - -/* 01144 80AF8934 E7AA0040 */ swc1 $f10, 0x0040($sp) -/* 01148 80AF8938 8FAB0034 */ lw $t3, 0x0034($sp) + +/* 01144 80AF8934 E7AA0040 */ swc1 $f10, 0x0040($sp) +/* 01148 80AF8938 8FAB0034 */ lw $t3, 0x0034($sp) /* 0114C 80AF893C C6100028 */ lwc1 $f16, 0x0028($s0) ## 00000028 /* 01150 80AF8940 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 /* 01154 80AF8944 C5720004 */ lwc1 $f18, 0x0004($t3) ## 00000004 /* 01158 80AF8948 44816000 */ mtc1 $at, $f12 ## $f12 = 5.00 -/* 0115C 80AF894C 46128100 */ add.s $f4, $f16, $f18 -/* 01160 80AF8950 46040180 */ add.s $f6, $f0, $f4 +/* 0115C 80AF894C 46128100 */ add.s $f4, $f16, $f18 +/* 01160 80AF8950 46040180 */ add.s $f6, $f0, $f4 /* 01164 80AF8954 0C00CFC8 */ jal Math_Rand_CenteredFloat - -/* 01168 80AF8958 E7A60044 */ swc1 $f6, 0x0044($sp) -/* 0116C 80AF895C 8FAC0034 */ lw $t4, 0x0034($sp) + +/* 01168 80AF8958 E7A60044 */ swc1 $f6, 0x0044($sp) +/* 0116C 80AF895C 8FAC0034 */ lw $t4, 0x0034($sp) /* 01170 80AF8960 C608002C */ lwc1 $f8, 0x002C($s0) ## 0000002C /* 01174 80AF8964 240DFFFF */ addiu $t5, $zero, 0xFFFF ## $t5 = FFFFFFFF /* 01178 80AF8968 C58A0008 */ lwc1 $f10, 0x0008($t4) ## 00000008 -/* 0117C 80AF896C AFAD0018 */ sw $t5, 0x0018($sp) -/* 01180 80AF8970 AFA00014 */ sw $zero, 0x0014($sp) -/* 01184 80AF8974 460A4400 */ add.s $f16, $f8, $f10 -/* 01188 80AF8978 AFA00010 */ sw $zero, 0x0010($sp) -/* 0118C 80AF897C 8FA40054 */ lw $a0, 0x0054($sp) +/* 0117C 80AF896C AFAD0018 */ sw $t5, 0x0018($sp) +/* 01180 80AF8970 AFA00014 */ sw $zero, 0x0014($sp) +/* 01184 80AF8974 460A4400 */ add.s $f16, $f8, $f10 +/* 01188 80AF8978 AFA00010 */ sw $zero, 0x0010($sp) +/* 0118C 80AF897C 8FA40054 */ lw $a0, 0x0054($sp) /* 01190 80AF8980 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 01194 80AF8984 46100480 */ add.s $f18, $f0, $f16 +/* 01194 80AF8984 46100480 */ add.s $f18, $f0, $f16 /* 01198 80AF8988 27A60040 */ addiu $a2, $sp, 0x0040 ## $a2 = FFFFFFF0 /* 0119C 80AF898C 24070064 */ addiu $a3, $zero, 0x0064 ## $a3 = 00000064 -/* 011A0 80AF8990 0C00A935 */ jal func_8002A4D4 -/* 011A4 80AF8994 E7B20048 */ swc1 $f18, 0x0048($sp) +/* 011A0 80AF8990 0C00A935 */ jal func_8002A4D4 +/* 011A4 80AF8994 E7B20048 */ swc1 $f18, 0x0048($sp) .L80AF8998: -/* 011A8 80AF8998 8FBF002C */ lw $ra, 0x002C($sp) -/* 011AC 80AF899C 8FB00028 */ lw $s0, 0x0028($sp) +/* 011A8 80AF8998 8FBF002C */ lw $ra, 0x002C($sp) +/* 011AC 80AF899C 8FB00028 */ lw $s0, 0x0028($sp) /* 011B0 80AF89A0 27BD0050 */ addiu $sp, $sp, 0x0050 ## $sp = 00000000 -/* 011B4 80AF89A4 03E00008 */ jr $ra +/* 011B4 80AF89A4 03E00008 */ jr $ra /* 011B8 80AF89A8 00000000 */ nop /* 011BC 80AF89AC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Sb/EnSb_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Sb/EnSb_Init.s index fc341b74f8..3cf512b9d2 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Sb/EnSb_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Sb/EnSb_Init.s @@ -1,12 +1,12 @@ glabel EnSb_Init /* 00000 80AF77F0 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 00004 80AF77F4 AFA5003C */ sw $a1, 0x003C($sp) -/* 00008 80AF77F8 AFBF002C */ sw $ra, 0x002C($sp) -/* 0000C 80AF77FC AFB00028 */ sw $s0, 0x0028($sp) +/* 00004 80AF77F4 AFA5003C */ sw $a1, 0x003C($sp) +/* 00008 80AF77F8 AFBF002C */ sw $ra, 0x002C($sp) +/* 0000C 80AF77FC AFB00028 */ sw $s0, 0x0028($sp) /* 00010 80AF7800 3C0580B0 */ lui $a1, %hi(D_80AF8A1C) ## $a1 = 80B00000 /* 00014 80AF7804 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 00018 80AF7808 0C01E037 */ jal Actor_ProcessInitChain - + /* 0001C 80AF780C 24A58A1C */ addiu $a1, $a1, %lo(D_80AF8A1C) ## $a1 = 80AF8A1C /* 00020 80AF7810 3C0E80B0 */ lui $t6, %hi(D_80AF89FC) ## $t6 = 80B00000 /* 00024 80AF7814 25CE89FC */ addiu $t6, $t6, %lo(D_80AF89FC) ## $t6 = 80AF89FC @@ -17,47 +17,47 @@ glabel EnSb_Init /* 00038 80AF7828 3C070600 */ lui $a3, 0x0600 ## $a3 = 06000000 /* 0003C 80AF782C 24E70194 */ addiu $a3, $a3, 0x0194 ## $a3 = 06000194 /* 00040 80AF7830 24C62BF0 */ addiu $a2, $a2, 0x2BF0 ## $a2 = 06002BF0 -/* 00044 80AF7834 AFA00018 */ sw $zero, 0x0018($sp) -/* 00048 80AF7838 AFA00014 */ sw $zero, 0x0014($sp) -/* 0004C 80AF783C AFA00010 */ sw $zero, 0x0010($sp) -/* 00050 80AF7840 8FA4003C */ lw $a0, 0x003C($sp) -/* 00054 80AF7844 0C0291BE */ jal func_800A46F8 +/* 00044 80AF7834 AFA00018 */ sw $zero, 0x0018($sp) +/* 00048 80AF7838 AFA00014 */ sw $zero, 0x0014($sp) +/* 0004C 80AF783C AFA00010 */ sw $zero, 0x0010($sp) +/* 00050 80AF7840 8FA4003C */ lw $a0, 0x003C($sp) +/* 00054 80AF7844 0C0291BE */ jal SkelAnime_InitSV /* 00058 80AF7848 2605014C */ addiu $a1, $s0, 0x014C ## $a1 = 0000014C /* 0005C 80AF784C 26050194 */ addiu $a1, $s0, 0x0194 ## $a1 = 00000194 -/* 00060 80AF7850 AFA50030 */ sw $a1, 0x0030($sp) +/* 00060 80AF7850 AFA50030 */ sw $a1, 0x0030($sp) /* 00064 80AF7854 0C0170D9 */ jal ActorCollider_AllocCylinder - -/* 00068 80AF7858 8FA4003C */ lw $a0, 0x003C($sp) + +/* 00068 80AF7858 8FA4003C */ lw $a0, 0x003C($sp) /* 0006C 80AF785C 3C0780B0 */ lui $a3, %hi(D_80AF89D0) ## $a3 = 80B00000 -/* 00070 80AF7860 8FA50030 */ lw $a1, 0x0030($sp) +/* 00070 80AF7860 8FA50030 */ lw $a1, 0x0030($sp) /* 00074 80AF7864 24E789D0 */ addiu $a3, $a3, %lo(D_80AF89D0) ## $a3 = 80AF89D0 -/* 00078 80AF7868 8FA4003C */ lw $a0, 0x003C($sp) -/* 0007C 80AF786C 0C017114 */ jal func_8005C450 +/* 00078 80AF7868 8FA4003C */ lw $a0, 0x003C($sp) +/* 0007C 80AF786C 0C017114 */ jal func_8005C450 /* 00080 80AF7870 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 00084 80AF7874 3C053BC4 */ lui $a1, 0x3BC4 ## $a1 = 3BC40000 /* 00088 80AF7878 A60001FC */ sh $zero, 0x01FC($s0) ## 000001FC /* 0008C 80AF787C A20000AE */ sb $zero, 0x00AE($s0) ## 000000AE /* 00090 80AF7880 34A59BA6 */ ori $a1, $a1, 0x9BA6 ## $a1 = 3BC49BA6 /* 00094 80AF7884 0C00B58B */ jal Actor_SetScale - + /* 00098 80AF7888 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 0009C 80AF788C 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 /* 000A0 80AF7890 A60000B6 */ sh $zero, 0x00B6($s0) ## 000000B6 /* 000A4 80AF7894 3C0180B0 */ lui $at, %hi(D_80AF8A8C) ## $at = 80B00000 /* 000A8 80AF7898 E6040068 */ swc1 $f4, 0x0068($s0) ## 00000068 -/* 000AC 80AF789C C4268A8C */ lwc1 $f6, %lo(D_80AF8A8C)($at) +/* 000AC 80AF789C C4268A8C */ lwc1 $f6, %lo(D_80AF8A8C)($at) /* 000B0 80AF78A0 3C01BF80 */ lui $at, 0xBF80 ## $at = BF800000 /* 000B4 80AF78A4 44814000 */ mtc1 $at, $f8 ## $f8 = -1.00 /* 000B8 80AF78A8 A60001F8 */ sh $zero, 0x01F8($s0) ## 000001F8 /* 000BC 80AF78AC A2000204 */ sb $zero, 0x0204($s0) ## 00000204 /* 000C0 80AF78B0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 000C4 80AF78B4 E606006C */ swc1 $f6, 0x006C($s0) ## 0000006C -/* 000C8 80AF78B8 0C2BDE6F */ jal func_80AF79BC +/* 000C8 80AF78B8 0C2BDE6F */ jal func_80AF79BC /* 000CC 80AF78BC E6080060 */ swc1 $f8, 0x0060($s0) ## 00000060 -/* 000D0 80AF78C0 8FBF002C */ lw $ra, 0x002C($sp) -/* 000D4 80AF78C4 8FB00028 */ lw $s0, 0x0028($sp) +/* 000D0 80AF78C0 8FBF002C */ lw $ra, 0x002C($sp) +/* 000D4 80AF78C4 8FB00028 */ lw $s0, 0x0028($sp) /* 000D8 80AF78C8 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 -/* 000DC 80AF78CC 03E00008 */ jr $ra +/* 000DC 80AF78CC 03E00008 */ jr $ra /* 000E0 80AF78D0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Sb/func_80AF79BC.s b/asm/non_matchings/overlays/actors/ovl_En_Sb/func_80AF79BC.s index 566ca6abd3..f06717908a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Sb/func_80AF79BC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Sb/func_80AF79BC.s @@ -1,35 +1,35 @@ glabel func_80AF79BC /* 001CC 80AF79BC 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 001D0 80AF79C0 AFA40028 */ sw $a0, 0x0028($sp) -/* 001D4 80AF79C4 AFBF0024 */ sw $ra, 0x0024($sp) +/* 001D0 80AF79C0 AFA40028 */ sw $a0, 0x0028($sp) +/* 001D4 80AF79C4 AFBF0024 */ sw $ra, 0x0024($sp) /* 001D8 80AF79C8 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 /* 001DC 80AF79CC 0C028800 */ jal SkelAnime_GetFrameCount - + /* 001E0 80AF79D0 2484004C */ addiu $a0, $a0, 0x004C ## $a0 = 0600004C /* 001E4 80AF79D4 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 -/* 001E8 80AF79D8 8FA40028 */ lw $a0, 0x0028($sp) +/* 001E8 80AF79D8 8FA40028 */ lw $a0, 0x0028($sp) /* 001EC 80AF79DC 44804000 */ mtc1 $zero, $f8 ## $f8 = 0.00 -/* 001F0 80AF79E0 468021A0 */ cvt.s.w $f6, $f4 +/* 001F0 80AF79E0 468021A0 */ cvt.s.w $f6, $f4 /* 001F4 80AF79E4 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 001F8 80AF79E8 240E0002 */ addiu $t6, $zero, 0x0002 ## $t6 = 00000002 -/* 001FC 80AF79EC AFAE0014 */ sw $t6, 0x0014($sp) +/* 001FC 80AF79EC AFAE0014 */ sw $t6, 0x0014($sp) /* 00200 80AF79F0 24A5004C */ addiu $a1, $a1, 0x004C ## $a1 = 0600004C /* 00204 80AF79F4 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 00208 80AF79F8 E7A60010 */ swc1 $f6, 0x0010($sp) +/* 00208 80AF79F8 E7A60010 */ swc1 $f6, 0x0010($sp) /* 0020C 80AF79FC 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 /* 00210 80AF7A00 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 00214 80AF7A04 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 00218 80AF7A08 E7A80018 */ swc1 $f8, 0x0018($sp) -/* 0021C 80AF7A0C 8FA20028 */ lw $v0, 0x0028($sp) +/* 00214 80AF7A04 0C029468 */ jal SkelAnime_ChangeAnim + +/* 00218 80AF7A08 E7A80018 */ swc1 $f8, 0x0018($sp) +/* 0021C 80AF7A0C 8FA20028 */ lw $v0, 0x0028($sp) /* 00220 80AF7A10 3C1880AF */ lui $t8, %hi(func_80AF7D48) ## $t8 = 80AF0000 /* 00224 80AF7A14 240F0001 */ addiu $t7, $zero, 0x0001 ## $t7 = 00000001 /* 00228 80AF7A18 27187D48 */ addiu $t8, $t8, %lo(func_80AF7D48) ## $t8 = 80AF7D48 /* 0022C 80AF7A1C A44F01FA */ sh $t7, 0x01FA($v0) ## 000001FA /* 00230 80AF7A20 AC580190 */ sw $t8, 0x0190($v0) ## 00000190 -/* 00234 80AF7A24 8FBF0024 */ lw $ra, 0x0024($sp) +/* 00234 80AF7A24 8FBF0024 */ lw $ra, 0x0024($sp) /* 00238 80AF7A28 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 0023C 80AF7A2C 03E00008 */ jr $ra +/* 0023C 80AF7A2C 03E00008 */ jr $ra /* 00240 80AF7A30 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Sb/func_80AF7A34.s b/asm/non_matchings/overlays/actors/ovl_En_Sb/func_80AF7A34.s index 31cadd6853..bb128da998 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Sb/func_80AF7A34.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Sb/func_80AF7A34.s @@ -1,37 +1,37 @@ glabel func_80AF7A34 /* 00244 80AF7A34 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 00248 80AF7A38 AFA40028 */ sw $a0, 0x0028($sp) -/* 0024C 80AF7A3C AFBF0024 */ sw $ra, 0x0024($sp) +/* 00248 80AF7A38 AFA40028 */ sw $a0, 0x0028($sp) +/* 0024C 80AF7A3C AFBF0024 */ sw $ra, 0x0024($sp) /* 00250 80AF7A40 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 /* 00254 80AF7A44 0C028800 */ jal SkelAnime_GetFrameCount - + /* 00258 80AF7A48 24840194 */ addiu $a0, $a0, 0x0194 ## $a0 = 06000194 /* 0025C 80AF7A4C 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 -/* 00260 80AF7A50 8FA40028 */ lw $a0, 0x0028($sp) +/* 00260 80AF7A50 8FA40028 */ lw $a0, 0x0028($sp) /* 00264 80AF7A54 44804000 */ mtc1 $zero, $f8 ## $f8 = 0.00 -/* 00268 80AF7A58 468021A0 */ cvt.s.w $f6, $f4 +/* 00268 80AF7A58 468021A0 */ cvt.s.w $f6, $f4 /* 0026C 80AF7A5C 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 00270 80AF7A60 240E0002 */ addiu $t6, $zero, 0x0002 ## $t6 = 00000002 -/* 00274 80AF7A64 AFAE0014 */ sw $t6, 0x0014($sp) +/* 00274 80AF7A64 AFAE0014 */ sw $t6, 0x0014($sp) /* 00278 80AF7A68 24A50194 */ addiu $a1, $a1, 0x0194 ## $a1 = 06000194 /* 0027C 80AF7A6C 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 00280 80AF7A70 E7A60010 */ swc1 $f6, 0x0010($sp) +/* 00280 80AF7A70 E7A60010 */ swc1 $f6, 0x0010($sp) /* 00284 80AF7A74 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 /* 00288 80AF7A78 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 0028C 80AF7A7C 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 00290 80AF7A80 E7A80018 */ swc1 $f8, 0x0018($sp) -/* 00294 80AF7A84 8FA40028 */ lw $a0, 0x0028($sp) +/* 0028C 80AF7A7C 0C029468 */ jal SkelAnime_ChangeAnim + +/* 00290 80AF7A80 E7A80018 */ swc1 $f8, 0x0018($sp) +/* 00294 80AF7A84 8FA40028 */ lw $a0, 0x0028($sp) /* 00298 80AF7A88 3C0F80AF */ lui $t7, %hi(func_80AF7DC8) ## $t7 = 80AF0000 /* 0029C 80AF7A8C 25EF7DC8 */ addiu $t7, $t7, %lo(func_80AF7DC8) ## $t7 = 80AF7DC8 /* 002A0 80AF7A90 24053849 */ addiu $a1, $zero, 0x3849 ## $a1 = 00003849 /* 002A4 80AF7A94 A48001FA */ sh $zero, 0x01FA($a0) ## 000001FA /* 002A8 80AF7A98 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 002AC 80AF7A9C AC8F0190 */ sw $t7, 0x0190($a0) ## 00000190 -/* 002B0 80AF7AA0 8FBF0024 */ lw $ra, 0x0024($sp) +/* 002B0 80AF7AA0 8FBF0024 */ lw $ra, 0x0024($sp) /* 002B4 80AF7AA4 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 002B8 80AF7AA8 03E00008 */ jr $ra +/* 002B8 80AF7AA8 03E00008 */ jr $ra /* 002BC 80AF7AAC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Sb/func_80AF7AB0.s b/asm/non_matchings/overlays/actors/ovl_En_Sb/func_80AF7AB0.s index b152902681..d8052a8b7d 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Sb/func_80AF7AB0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Sb/func_80AF7AB0.s @@ -1,34 +1,34 @@ glabel func_80AF7AB0 /* 002C0 80AF7AB0 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 002C4 80AF7AB4 AFA40028 */ sw $a0, 0x0028($sp) -/* 002C8 80AF7AB8 AFBF0024 */ sw $ra, 0x0024($sp) +/* 002C4 80AF7AB4 AFA40028 */ sw $a0, 0x0028($sp) +/* 002C8 80AF7AB8 AFBF0024 */ sw $ra, 0x0024($sp) /* 002CC 80AF7ABC 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 /* 002D0 80AF7AC0 0C028800 */ jal SkelAnime_GetFrameCount - + /* 002D4 80AF7AC4 24842C8C */ addiu $a0, $a0, 0x2C8C ## $a0 = 06002C8C /* 002D8 80AF7AC8 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 -/* 002DC 80AF7ACC 8FA40028 */ lw $a0, 0x0028($sp) +/* 002DC 80AF7ACC 8FA40028 */ lw $a0, 0x0028($sp) /* 002E0 80AF7AD0 44804000 */ mtc1 $zero, $f8 ## $f8 = 0.00 -/* 002E4 80AF7AD4 468021A0 */ cvt.s.w $f6, $f4 +/* 002E4 80AF7AD4 468021A0 */ cvt.s.w $f6, $f4 /* 002E8 80AF7AD8 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 002EC 80AF7ADC 24A52C8C */ addiu $a1, $a1, 0x2C8C ## $a1 = 06002C8C /* 002F0 80AF7AE0 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 002F4 80AF7AE4 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 002F8 80AF7AE8 AFA00014 */ sw $zero, 0x0014($sp) -/* 002FC 80AF7AEC E7A60010 */ swc1 $f6, 0x0010($sp) +/* 002F8 80AF7AE8 AFA00014 */ sw $zero, 0x0014($sp) +/* 002FC 80AF7AEC E7A60010 */ swc1 $f6, 0x0010($sp) /* 00300 80AF7AF0 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 00304 80AF7AF4 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 00308 80AF7AF8 E7A80018 */ swc1 $f8, 0x0018($sp) -/* 0030C 80AF7AFC 8FA20028 */ lw $v0, 0x0028($sp) +/* 00304 80AF7AF4 0C029468 */ jal SkelAnime_ChangeAnim + +/* 00308 80AF7AF8 E7A80018 */ swc1 $f8, 0x0018($sp) +/* 0030C 80AF7AFC 8FA20028 */ lw $v0, 0x0028($sp) /* 00310 80AF7B00 3C0F80AF */ lui $t7, %hi(func_80AF7E90) ## $t7 = 80AF0000 /* 00314 80AF7B04 240E0002 */ addiu $t6, $zero, 0x0002 ## $t6 = 00000002 /* 00318 80AF7B08 25EF7E90 */ addiu $t7, $t7, %lo(func_80AF7E90) ## $t7 = 80AF7E90 /* 0031C 80AF7B0C A44E01FA */ sh $t6, 0x01FA($v0) ## 000001FA /* 00320 80AF7B10 AC4F0190 */ sw $t7, 0x0190($v0) ## 00000190 -/* 00324 80AF7B14 8FBF0024 */ lw $ra, 0x0024($sp) +/* 00324 80AF7B14 8FBF0024 */ lw $ra, 0x0024($sp) /* 00328 80AF7B18 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 0032C 80AF7B1C 03E00008 */ jr $ra +/* 0032C 80AF7B1C 03E00008 */ jr $ra /* 00330 80AF7B20 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Sb/func_80AF7B24.s b/asm/non_matchings/overlays/actors/ovl_En_Sb/func_80AF7B24.s index f31115ca73..52199b6a5d 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Sb/func_80AF7B24.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Sb/func_80AF7B24.s @@ -1,37 +1,37 @@ glabel func_80AF7B24 /* 00334 80AF7B24 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 00338 80AF7B28 AFB00028 */ sw $s0, 0x0028($sp) +/* 00338 80AF7B28 AFB00028 */ sw $s0, 0x0028($sp) /* 0033C 80AF7B2C 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00340 80AF7B30 AFBF002C */ sw $ra, 0x002C($sp) +/* 00340 80AF7B30 AFBF002C */ sw $ra, 0x002C($sp) /* 00344 80AF7B34 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 /* 00348 80AF7B38 0C028800 */ jal SkelAnime_GetFrameCount - + /* 0034C 80AF7B3C 24840124 */ addiu $a0, $a0, 0x0124 ## $a0 = 06000124 /* 00350 80AF7B40 44806000 */ mtc1 $zero, $f12 ## $f12 = 0.00 /* 00354 80AF7B44 C6060084 */ lwc1 $f6, 0x0084($s0) ## 00000084 /* 00358 80AF7B48 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 0035C 80AF7B4C 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 00360 80AF7B50 4606603C */ c.lt.s $f12, $f6 -/* 00364 80AF7B54 44076000 */ mfc1 $a3, $f12 +/* 00360 80AF7B50 4606603C */ c.lt.s $f12, $f6 +/* 00364 80AF7B54 44076000 */ mfc1 $a3, $f12 /* 00368 80AF7B58 24A50124 */ addiu $a1, $a1, 0x0124 ## $a1 = 06000124 /* 0036C 80AF7B5C 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C -/* 00370 80AF7B60 45000005 */ bc1f .L80AF7B78 -/* 00374 80AF7B64 468020A0 */ cvt.s.w $f2, $f4 +/* 00370 80AF7B60 45000005 */ bc1f .L80AF7B78 +/* 00374 80AF7B64 468020A0 */ cvt.s.w $f2, $f4 /* 00378 80AF7B68 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 /* 0037C 80AF7B6C 44810000 */ mtc1 $at, $f0 ## $f0 = 1.00 -/* 00380 80AF7B70 10000003 */ beq $zero, $zero, .L80AF7B80 +/* 00380 80AF7B70 10000003 */ beq $zero, $zero, .L80AF7B80 /* 00384 80AF7B74 44804000 */ mtc1 $zero, $f8 ## $f8 = 0.00 .L80AF7B78: -/* 00388 80AF7B78 46006006 */ mov.s $f0, $f12 +/* 00388 80AF7B78 46006006 */ mov.s $f0, $f12 /* 0038C 80AF7B7C 44804000 */ mtc1 $zero, $f8 ## $f8 = 0.00 .L80AF7B80: -/* 00390 80AF7B80 44060000 */ mfc1 $a2, $f0 +/* 00390 80AF7B80 44060000 */ mfc1 $a2, $f0 /* 00394 80AF7B84 240E0002 */ addiu $t6, $zero, 0x0002 ## $t6 = 00000002 -/* 00398 80AF7B88 AFAE0014 */ sw $t6, 0x0014($sp) -/* 0039C 80AF7B8C E7A20010 */ swc1 $f2, 0x0010($sp) -/* 003A0 80AF7B90 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 003A4 80AF7B94 E7A80018 */ swc1 $f8, 0x0018($sp) +/* 00398 80AF7B88 AFAE0014 */ sw $t6, 0x0014($sp) +/* 0039C 80AF7B8C E7A20010 */ swc1 $f2, 0x0010($sp) +/* 003A0 80AF7B90 0C029468 */ jal SkelAnime_ChangeAnim + +/* 003A4 80AF7B94 E7A80018 */ swc1 $f8, 0x0018($sp) /* 003A8 80AF7B98 3C1880B0 */ lui $t8, %hi(func_80AF803C) ## $t8 = 80B00000 /* 003AC 80AF7B9C 240F0003 */ addiu $t7, $zero, 0x0003 ## $t7 = 00000003 /* 003B0 80AF7BA0 2718803C */ addiu $t8, $t8, %lo(func_80AF803C) ## $t8 = 80AF803C @@ -39,12 +39,12 @@ glabel func_80AF7B24 /* 003B8 80AF7BA8 AE180190 */ sw $t8, 0x0190($s0) ## 00000190 /* 003BC 80AF7BAC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 003C0 80AF7BB0 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 003C4 80AF7BB4 24053849 */ addiu $a1, $zero, 0x3849 ## $a1 = 00003849 -/* 003C8 80AF7BB8 8FBF002C */ lw $ra, 0x002C($sp) -/* 003CC 80AF7BBC 8FB00028 */ lw $s0, 0x0028($sp) +/* 003C8 80AF7BB8 8FBF002C */ lw $ra, 0x002C($sp) +/* 003CC 80AF7BBC 8FB00028 */ lw $s0, 0x0028($sp) /* 003D0 80AF7BC0 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 003D4 80AF7BC4 03E00008 */ jr $ra +/* 003D4 80AF7BC4 03E00008 */ jr $ra /* 003D8 80AF7BC8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Sb/func_80AF7BCC.s b/asm/non_matchings/overlays/actors/ovl_En_Sb/func_80AF7BCC.s index a2c77e74fb..c2f1ee13bc 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Sb/func_80AF7BCC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Sb/func_80AF7BCC.s @@ -1,35 +1,35 @@ glabel func_80AF7BCC /* 003DC 80AF7BCC 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 003E0 80AF7BD0 AFA40028 */ sw $a0, 0x0028($sp) -/* 003E4 80AF7BD4 AFBF0024 */ sw $ra, 0x0024($sp) +/* 003E0 80AF7BD0 AFA40028 */ sw $a0, 0x0028($sp) +/* 003E4 80AF7BD4 AFBF0024 */ sw $ra, 0x0024($sp) /* 003E8 80AF7BD8 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 /* 003EC 80AF7BDC 0C028800 */ jal SkelAnime_GetFrameCount - + /* 003F0 80AF7BE0 248400B4 */ addiu $a0, $a0, 0x00B4 ## $a0 = 060000B4 /* 003F4 80AF7BE4 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 -/* 003F8 80AF7BE8 8FA40028 */ lw $a0, 0x0028($sp) +/* 003F8 80AF7BE8 8FA40028 */ lw $a0, 0x0028($sp) /* 003FC 80AF7BEC 44804000 */ mtc1 $zero, $f8 ## $f8 = 0.00 -/* 00400 80AF7BF0 468021A0 */ cvt.s.w $f6, $f4 +/* 00400 80AF7BF0 468021A0 */ cvt.s.w $f6, $f4 /* 00404 80AF7BF4 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 00408 80AF7BF8 240E0002 */ addiu $t6, $zero, 0x0002 ## $t6 = 00000002 -/* 0040C 80AF7BFC AFAE0014 */ sw $t6, 0x0014($sp) +/* 0040C 80AF7BFC AFAE0014 */ sw $t6, 0x0014($sp) /* 00410 80AF7C00 24A500B4 */ addiu $a1, $a1, 0x00B4 ## $a1 = 060000B4 /* 00414 80AF7C04 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 00418 80AF7C08 E7A60010 */ swc1 $f6, 0x0010($sp) +/* 00418 80AF7C08 E7A60010 */ swc1 $f6, 0x0010($sp) /* 0041C 80AF7C0C 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 /* 00420 80AF7C10 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 00424 80AF7C14 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 00428 80AF7C18 E7A80018 */ swc1 $f8, 0x0018($sp) -/* 0042C 80AF7C1C 8FA20028 */ lw $v0, 0x0028($sp) +/* 00424 80AF7C14 0C029468 */ jal SkelAnime_ChangeAnim + +/* 00428 80AF7C18 E7A80018 */ swc1 $f8, 0x0018($sp) +/* 0042C 80AF7C1C 8FA20028 */ lw $v0, 0x0028($sp) /* 00430 80AF7C20 3C1880B0 */ lui $t8, %hi(func_80AF80E4) ## $t8 = 80B00000 /* 00434 80AF7C24 240F0004 */ addiu $t7, $zero, 0x0004 ## $t7 = 00000004 /* 00438 80AF7C28 271880E4 */ addiu $t8, $t8, %lo(func_80AF80E4) ## $t8 = 80AF80E4 /* 0043C 80AF7C2C A44F01FA */ sh $t7, 0x01FA($v0) ## 000001FA /* 00440 80AF7C30 AC580190 */ sw $t8, 0x0190($v0) ## 00000190 -/* 00444 80AF7C34 8FBF0024 */ lw $ra, 0x0024($sp) +/* 00444 80AF7C34 8FBF0024 */ lw $ra, 0x0024($sp) /* 00448 80AF7C38 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 0044C 80AF7C3C 03E00008 */ jr $ra +/* 0044C 80AF7C3C 03E00008 */ jr $ra /* 00450 80AF7C40 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Sb/func_80AF7C44.s b/asm/non_matchings/overlays/actors/ovl_En_Sb/func_80AF7C44.s index 73a1b8f3bd..ccb1df88b9 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Sb/func_80AF7C44.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Sb/func_80AF7C44.s @@ -1,73 +1,73 @@ glabel func_80AF7C44 /* 00454 80AF7C44 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 00458 80AF7C48 AFB00028 */ sw $s0, 0x0028($sp) +/* 00458 80AF7C48 AFB00028 */ sw $s0, 0x0028($sp) /* 0045C 80AF7C4C 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00460 80AF7C50 AFBF002C */ sw $ra, 0x002C($sp) +/* 00460 80AF7C50 AFBF002C */ sw $ra, 0x002C($sp) /* 00464 80AF7C54 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 -/* 00468 80AF7C58 AFA50034 */ sw $a1, 0x0034($sp) +/* 00468 80AF7C58 AFA50034 */ sw $a1, 0x0034($sp) /* 0046C 80AF7C5C 0C028800 */ jal SkelAnime_GetFrameCount - + /* 00470 80AF7C60 2484004C */ addiu $a0, $a0, 0x004C ## $a0 = 0600004C /* 00474 80AF7C64 860E01FA */ lh $t6, 0x01FA($s0) ## 000001FA /* 00478 80AF7C68 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 0047C 80AF7C6C 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 00480 80AF7C70 11C1000C */ beq $t6, $at, .L80AF7CA4 -/* 00484 80AF7C74 46802020 */ cvt.s.w $f0, $f4 +/* 00480 80AF7C70 11C1000C */ beq $t6, $at, .L80AF7CA4 +/* 00484 80AF7C74 46802020 */ cvt.s.w $f0, $f4 /* 00488 80AF7C78 44803000 */ mtc1 $zero, $f6 ## $f6 = 0.00 /* 0048C 80AF7C7C 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 00490 80AF7C80 240F0002 */ addiu $t7, $zero, 0x0002 ## $t7 = 00000002 -/* 00494 80AF7C84 AFAF0014 */ sw $t7, 0x0014($sp) +/* 00494 80AF7C84 AFAF0014 */ sw $t7, 0x0014($sp) /* 00498 80AF7C88 24A5004C */ addiu $a1, $a1, 0x004C ## $a1 = 0600004C /* 0049C 80AF7C8C 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C /* 004A0 80AF7C90 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 004A4 80AF7C94 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 004A8 80AF7C98 E7A00010 */ swc1 $f0, 0x0010($sp) -/* 004AC 80AF7C9C 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 004B0 80AF7CA0 E7A60018 */ swc1 $f6, 0x0018($sp) +/* 004A8 80AF7C98 E7A00010 */ swc1 $f0, 0x0010($sp) +/* 004AC 80AF7C9C 0C029468 */ jal SkelAnime_ChangeAnim + +/* 004B0 80AF7CA0 E7A60018 */ swc1 $f6, 0x0018($sp) .L80AF7CA4: /* 004B4 80AF7CA4 24180001 */ addiu $t8, $zero, 0x0001 ## $t8 = 00000001 /* 004B8 80AF7CA8 A61801FA */ sh $t8, 0x01FA($s0) ## 000001FA -/* 004BC 80AF7CAC 8FB90034 */ lw $t9, 0x0034($sp) +/* 004BC 80AF7CAC 8FB90034 */ lw $t9, 0x0034($sp) /* 004C0 80AF7CB0 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 /* 004C4 80AF7CB4 2408003C */ addiu $t0, $zero, 0x003C ## $t0 = 0000003C -/* 004C8 80AF7CB8 1320001B */ beq $t9, $zero, .L80AF7D28 +/* 004C8 80AF7CB8 1320001B */ beq $t9, $zero, .L80AF7D28 /* 004CC 80AF7CBC 3C0980B0 */ lui $t1, %hi(func_80AF8224) ## $t1 = 80B00000 /* 004D0 80AF7CC0 C6080084 */ lwc1 $f8, 0x0084($s0) ## 00000084 -/* 004D4 80AF7CC4 4608003C */ c.lt.s $f0, $f8 +/* 004D4 80AF7CC4 4608003C */ c.lt.s $f0, $f8 /* 004D8 80AF7CC8 00000000 */ nop -/* 004DC 80AF7CCC 4502000D */ bc1fl .L80AF7D04 +/* 004DC 80AF7CCC 4502000D */ bc1fl .L80AF7D04 /* 004E0 80AF7CD0 C6060060 */ lwc1 $f6, 0x0060($s0) ## 00000060 /* 004E4 80AF7CD4 C6100060 */ lwc1 $f16, 0x0060($s0) ## 00000060 /* 004E8 80AF7CD8 3C01C0A0 */ lui $at, 0xC0A0 ## $at = C0A00000 /* 004EC 80AF7CDC 44815000 */ mtc1 $at, $f10 ## $f10 = -5.00 -/* 004F0 80AF7CE0 4600803C */ c.lt.s $f16, $f0 +/* 004F0 80AF7CE0 4600803C */ c.lt.s $f16, $f0 /* 004F4 80AF7CE4 3C0180B0 */ lui $at, %hi(D_80AF8A90) ## $at = 80B00000 /* 004F8 80AF7CE8 E60A0068 */ swc1 $f10, 0x0068($s0) ## 00000068 -/* 004FC 80AF7CEC 4500000E */ bc1f .L80AF7D28 +/* 004FC 80AF7CEC 4500000E */ bc1f .L80AF7D28 /* 00500 80AF7CF0 00000000 */ nop -/* 00504 80AF7CF4 C4328A90 */ lwc1 $f18, %lo(D_80AF8A90)($at) -/* 00508 80AF7CF8 1000000B */ beq $zero, $zero, .L80AF7D28 +/* 00504 80AF7CF4 C4328A90 */ lwc1 $f18, %lo(D_80AF8A90)($at) +/* 00508 80AF7CF8 1000000B */ beq $zero, $zero, .L80AF7D28 /* 0050C 80AF7CFC E6120060 */ swc1 $f18, 0x0060($s0) ## 00000060 /* 00510 80AF7D00 C6060060 */ lwc1 $f6, 0x0060($s0) ## 00000060 .L80AF7D04: /* 00514 80AF7D04 3C01C0C0 */ lui $at, 0xC0C0 ## $at = C0C00000 /* 00518 80AF7D08 44812000 */ mtc1 $at, $f4 ## $f4 = -6.00 -/* 0051C 80AF7D0C 4600303C */ c.lt.s $f6, $f0 +/* 0051C 80AF7D0C 4600303C */ c.lt.s $f6, $f0 /* 00520 80AF7D10 3C0180B0 */ lui $at, %hi(D_80AF8A94) ## $at = 80B00000 /* 00524 80AF7D14 E6040068 */ swc1 $f4, 0x0068($s0) ## 00000068 -/* 00528 80AF7D18 45000003 */ bc1f .L80AF7D28 +/* 00528 80AF7D18 45000003 */ bc1f .L80AF7D28 /* 0052C 80AF7D1C 00000000 */ nop -/* 00530 80AF7D20 C4288A94 */ lwc1 $f8, %lo(D_80AF8A94)($at) +/* 00530 80AF7D20 C4288A94 */ lwc1 $f8, %lo(D_80AF8A94)($at) /* 00534 80AF7D24 E6080060 */ swc1 $f8, 0x0060($s0) ## 00000060 .L80AF7D28: /* 00538 80AF7D28 25298224 */ addiu $t1, $t1, %lo(func_80AF8224) ## $t1 = 80AF8224 /* 0053C 80AF7D2C A60801FE */ sh $t0, 0x01FE($s0) ## 000001FE /* 00540 80AF7D30 AE090190 */ sw $t1, 0x0190($s0) ## 00000190 -/* 00544 80AF7D34 8FBF002C */ lw $ra, 0x002C($sp) -/* 00548 80AF7D38 8FB00028 */ lw $s0, 0x0028($sp) +/* 00544 80AF7D34 8FBF002C */ lw $ra, 0x002C($sp) +/* 00548 80AF7D38 8FB00028 */ lw $s0, 0x0028($sp) /* 0054C 80AF7D3C 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 00550 80AF7D40 03E00008 */ jr $ra +/* 00550 80AF7D40 03E00008 */ jr $ra /* 00554 80AF7D44 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Sda/func_80AF9C70.s b/asm/non_matchings/overlays/actors/ovl_En_Sda/func_80AF9C70.s index f8c66978a4..9ffbbcdc6d 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Sda/func_80AF9C70.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Sda/func_80AF9C70.s @@ -15,7 +15,7 @@ glabel func_80AF9C70 /* 00E84 80AF9CA4 24C6A498 */ addiu $a2, $a2, %lo(D_80AFA498) ## $a2 = 80AFA498 /* 00E88 80AF9CA8 27A40080 */ addiu $a0, $sp, 0x0080 ## $a0 = FFFFFFD8 /* 00E8C 80AF9CAC 2407033A */ addiu $a3, $zero, 0x033A ## $a3 = 0000033A -/* 00E90 80AF9CB0 0C031AB1 */ jal func_800C6AC4 +/* 00E90 80AF9CB0 0C031AB1 */ jal Graph_OpenDisps /* 00E94 80AF9CB4 02402825 */ or $a1, $s2, $zero ## $a1 = 00000000 /* 00E98 80AF9CB8 3C0480B0 */ lui $a0, %hi(D_80AFA4A8) ## $a0 = 80B00000 /* 00E9C 80AF9CBC 0C00084C */ jal osSyncPrintf @@ -262,7 +262,7 @@ glabel func_80AF9C70 /* 01250 80AFA070 24C6A4E0 */ addiu $a2, $a2, %lo(D_80AFA4E0) ## $a2 = 80AFA4E0 /* 01254 80AFA074 27A40080 */ addiu $a0, $sp, 0x0080 ## $a0 = FFFFFFD8 /* 01258 80AFA078 02402825 */ or $a1, $s2, $zero ## $a1 = 00000000 -/* 0125C 80AFA07C 0C031AD5 */ jal func_800C6B54 +/* 0125C 80AFA07C 0C031AD5 */ jal Graph_CloseDisps /* 01260 80AFA080 24070372 */ addiu $a3, $zero, 0x0372 ## $a3 = 00000372 /* 01264 80AFA084 8FBF0034 */ lw $ra, 0x0034($sp) /* 01268 80AFA088 D7B40018 */ ldc1 $f20, 0x0018($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Shopnuts/EnShopnuts_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Shopnuts/EnShopnuts_Draw.s index 7a62f38adf..9ec7f74db1 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Shopnuts/EnShopnuts_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Shopnuts/EnShopnuts_Draw.s @@ -1,9 +1,9 @@ glabel EnShopnuts_Draw /* 00D4C 80AFB46C 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 00D50 80AFB470 AFA40028 */ sw $a0, 0x0028($sp) -/* 00D54 80AFB474 8FAE0028 */ lw $t6, 0x0028($sp) -/* 00D58 80AFB478 AFBF0024 */ sw $ra, 0x0024($sp) -/* 00D5C 80AFB47C AFA5002C */ sw $a1, 0x002C($sp) +/* 00D50 80AFB470 AFA40028 */ sw $a0, 0x0028($sp) +/* 00D54 80AFB474 8FAE0028 */ lw $t6, 0x0028($sp) +/* 00D58 80AFB478 AFBF0024 */ sw $ra, 0x0024($sp) +/* 00D5C 80AFB47C AFA5002C */ sw $a1, 0x002C($sp) /* 00D60 80AFB480 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 /* 00D64 80AFB484 3C0F80B0 */ lui $t7, %hi(func_80AFB25C) ## $t7 = 80B00000 /* 00D68 80AFB488 3C1880B0 */ lui $t8, %hi(func_80AFB290) ## $t8 = 80B00000 @@ -12,12 +12,12 @@ glabel EnShopnuts_Draw /* 00D74 80AFB494 8DC6016C */ lw $a2, 0x016C($t6) ## 0000016C /* 00D78 80AFB498 2718B290 */ addiu $t8, $t8, %lo(func_80AFB290) ## $t8 = 80AFB290 /* 00D7C 80AFB49C 25EFB25C */ addiu $t7, $t7, %lo(func_80AFB25C) ## $t7 = 80AFB25C -/* 00D80 80AFB4A0 AFAF0010 */ sw $t7, 0x0010($sp) -/* 00D84 80AFB4A4 AFB80014 */ sw $t8, 0x0014($sp) -/* 00D88 80AFB4A8 0C0286B2 */ jal func_800A1AC8 -/* 00D8C 80AFB4AC AFAE0018 */ sw $t6, 0x0018($sp) -/* 00D90 80AFB4B0 8FBF0024 */ lw $ra, 0x0024($sp) +/* 00D80 80AFB4A0 AFAF0010 */ sw $t7, 0x0010($sp) +/* 00D84 80AFB4A4 AFB80014 */ sw $t8, 0x0014($sp) +/* 00D88 80AFB4A8 0C0286B2 */ jal SkelAnime_DrawSV +/* 00D8C 80AFB4AC AFAE0018 */ sw $t6, 0x0018($sp) +/* 00D90 80AFB4B0 8FBF0024 */ lw $ra, 0x0024($sp) /* 00D94 80AFB4B4 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 00D98 80AFB4B8 03E00008 */ jr $ra +/* 00D98 80AFB4B8 03E00008 */ jr $ra /* 00D9C 80AFB4BC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Shopnuts/EnShopnuts_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Shopnuts/EnShopnuts_Init.s index a0237d0216..dc0da2b734 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Shopnuts/EnShopnuts_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Shopnuts/EnShopnuts_Init.s @@ -1,92 +1,92 @@ glabel EnShopnuts_Init /* 00000 80AFA720 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 00004 80AFA724 AFA5003C */ sw $a1, 0x003C($sp) -/* 00008 80AFA728 AFBF002C */ sw $ra, 0x002C($sp) -/* 0000C 80AFA72C AFB00028 */ sw $s0, 0x0028($sp) +/* 00004 80AFA724 AFA5003C */ sw $a1, 0x003C($sp) +/* 00008 80AFA728 AFBF002C */ sw $ra, 0x002C($sp) +/* 0000C 80AFA72C AFB00028 */ sw $s0, 0x0028($sp) /* 00010 80AFA730 3C0580B0 */ lui $a1, %hi(D_80AFB514) ## $a1 = 80B00000 /* 00014 80AFA734 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 00018 80AFA738 0C01E037 */ jal Actor_ProcessInitChain - + /* 0001C 80AFA73C 24A5B514 */ addiu $a1, $a1, %lo(D_80AFB514) ## $a1 = 80AFB514 /* 00020 80AFA740 3C068003 */ lui $a2, 0x8003 ## $a2 = 80030000 /* 00024 80AFA744 24C6B5EC */ addiu $a2, $a2, 0xB5EC ## $a2 = 8002B5EC /* 00028 80AFA748 260400B4 */ addiu $a0, $s0, 0x00B4 ## $a0 = 000000B4 /* 0002C 80AFA74C 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 /* 00030 80AFA750 0C00AC78 */ jal ActorShape_Init - + /* 00034 80AFA754 3C07420C */ lui $a3, 0x420C ## $a3 = 420C0000 /* 00038 80AFA758 3C060600 */ lui $a2, 0x0600 ## $a2 = 06000000 /* 0003C 80AFA75C 3C070600 */ lui $a3, 0x0600 ## $a3 = 06000000 /* 00040 80AFA760 260E0196 */ addiu $t6, $s0, 0x0196 ## $t6 = 00000196 /* 00044 80AFA764 260F0202 */ addiu $t7, $s0, 0x0202 ## $t7 = 00000202 /* 00048 80AFA768 24180012 */ addiu $t8, $zero, 0x0012 ## $t8 = 00000012 -/* 0004C 80AFA76C AFB80018 */ sw $t8, 0x0018($sp) -/* 00050 80AFA770 AFAF0014 */ sw $t7, 0x0014($sp) -/* 00054 80AFA774 AFAE0010 */ sw $t6, 0x0010($sp) +/* 0004C 80AFA76C AFB80018 */ sw $t8, 0x0018($sp) +/* 00050 80AFA770 AFAF0014 */ sw $t7, 0x0014($sp) +/* 00054 80AFA774 AFAE0010 */ sw $t6, 0x0010($sp) /* 00058 80AFA778 24E74574 */ addiu $a3, $a3, 0x4574 ## $a3 = 06004574 /* 0005C 80AFA77C 24C641A8 */ addiu $a2, $a2, 0x41A8 ## $a2 = 060041A8 -/* 00060 80AFA780 8FA4003C */ lw $a0, 0x003C($sp) -/* 00064 80AFA784 0C0291BE */ jal func_800A46F8 +/* 00060 80AFA780 8FA4003C */ lw $a0, 0x003C($sp) +/* 00064 80AFA784 0C0291BE */ jal SkelAnime_InitSV /* 00068 80AFA788 2605014C */ addiu $a1, $s0, 0x014C ## $a1 = 0000014C /* 0006C 80AFA78C 26050270 */ addiu $a1, $s0, 0x0270 ## $a1 = 00000270 -/* 00070 80AFA790 AFA50030 */ sw $a1, 0x0030($sp) +/* 00070 80AFA790 AFA50030 */ sw $a1, 0x0030($sp) /* 00074 80AFA794 0C0170D9 */ jal ActorCollider_AllocCylinder - -/* 00078 80AFA798 8FA4003C */ lw $a0, 0x003C($sp) + +/* 00078 80AFA798 8FA4003C */ lw $a0, 0x003C($sp) /* 0007C 80AFA79C 3C0780B0 */ lui $a3, %hi(D_80AFB4E0) ## $a3 = 80B00000 /* 00080 80AFA7A0 24E7B4E0 */ addiu $a3, $a3, %lo(D_80AFB4E0) ## $a3 = 80AFB4E0 -/* 00084 80AFA7A4 8FA4003C */ lw $a0, 0x003C($sp) -/* 00088 80AFA7A8 8FA50030 */ lw $a1, 0x0030($sp) +/* 00084 80AFA7A4 8FA4003C */ lw $a0, 0x003C($sp) +/* 00088 80AFA7A8 8FA50030 */ lw $a1, 0x0030($sp) /* 0008C 80AFA7AC 0C01712B */ jal ActorCollider_InitCylinder - + /* 00090 80AFA7B0 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 00094 80AFA7B4 3C0680B0 */ lui $a2, %hi(D_80AFB50C) ## $a2 = 80B00000 /* 00098 80AFA7B8 24C6B50C */ addiu $a2, $a2, %lo(D_80AFB50C) ## $a2 = 80AFB50C /* 0009C 80AFA7BC 26040098 */ addiu $a0, $s0, 0x0098 ## $a0 = 00000098 -/* 000A0 80AFA7C0 0C0187B5 */ jal func_80061ED4 +/* 000A0 80AFA7C0 0C0187B5 */ jal func_80061ED4 /* 000A4 80AFA7C4 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 000A8 80AFA7C8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 000AC 80AFA7CC 0C0189B7 */ jal ActorCollider_Cylinder_Update - -/* 000B0 80AFA7D0 8FA50030 */ lw $a1, 0x0030($sp) + +/* 000B0 80AFA7D0 8FA50030 */ lw $a1, 0x0030($sp) /* 000B4 80AFA7D4 8602001C */ lh $v0, 0x001C($s0) ## 0000001C /* 000B8 80AFA7D8 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 /* 000BC 80AFA7DC 3C038016 */ lui $v1, 0x8016 ## $v1 = 80160000 -/* 000C0 80AFA7E0 14410004 */ bne $v0, $at, .L80AFA7F4 +/* 000C0 80AFA7E0 14410004 */ bne $v0, $at, .L80AFA7F4 /* 000C4 80AFA7E4 2463E660 */ addiu $v1, $v1, 0xE660 ## $v1 = 8015E660 /* 000C8 80AFA7E8 94790EF0 */ lhu $t9, 0x0EF0($v1) ## 8015F550 /* 000CC 80AFA7EC 33280800 */ andi $t0, $t9, 0x0800 ## $t0 = 00000000 -/* 000D0 80AFA7F0 1500000E */ bne $t0, $zero, .L80AFA82C +/* 000D0 80AFA7F0 1500000E */ bne $t0, $zero, .L80AFA82C .L80AFA7F4: /* 000D4 80AFA7F4 3C038016 */ lui $v1, 0x8016 ## $v1 = 80160000 /* 000D8 80AFA7F8 24010009 */ addiu $at, $zero, 0x0009 ## $at = 00000009 -/* 000DC 80AFA7FC 14410004 */ bne $v0, $at, .L80AFA810 +/* 000DC 80AFA7FC 14410004 */ bne $v0, $at, .L80AFA810 /* 000E0 80AFA800 2463E660 */ addiu $v1, $v1, 0xE660 ## $v1 = 8015E660 /* 000E4 80AFA804 94690F2A */ lhu $t1, 0x0F2A($v1) ## 8015F58A /* 000E8 80AFA808 312A0004 */ andi $t2, $t1, 0x0004 ## $t2 = 00000000 -/* 000EC 80AFA80C 15400007 */ bne $t2, $zero, .L80AFA82C +/* 000EC 80AFA80C 15400007 */ bne $t2, $zero, .L80AFA82C .L80AFA810: /* 000F0 80AFA810 2401000A */ addiu $at, $zero, 0x000A ## $at = 0000000A -/* 000F4 80AFA814 14410009 */ bne $v0, $at, .L80AFA83C +/* 000F4 80AFA814 14410009 */ bne $v0, $at, .L80AFA83C /* 000F8 80AFA818 00000000 */ nop /* 000FC 80AFA81C 946B0F2A */ lhu $t3, 0x0F2A($v1) ## 8015F58A /* 00100 80AFA820 316C0008 */ andi $t4, $t3, 0x0008 ## $t4 = 00000000 -/* 00104 80AFA824 11800005 */ beq $t4, $zero, .L80AFA83C +/* 00104 80AFA824 11800005 */ beq $t4, $zero, .L80AFA83C /* 00108 80AFA828 00000000 */ nop .L80AFA82C: /* 0010C 80AFA82C 0C00B55C */ jal Actor_Kill - + /* 00110 80AFA830 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00114 80AFA834 10000004 */ beq $zero, $zero, .L80AFA848 -/* 00118 80AFA838 8FBF002C */ lw $ra, 0x002C($sp) +/* 00114 80AFA834 10000004 */ beq $zero, $zero, .L80AFA848 +/* 00118 80AFA838 8FBF002C */ lw $ra, 0x002C($sp) .L80AFA83C: -/* 0011C 80AFA83C 0C2BEA20 */ jal func_80AFA880 +/* 0011C 80AFA83C 0C2BEA20 */ jal func_80AFA880 /* 00120 80AFA840 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00124 80AFA844 8FBF002C */ lw $ra, 0x002C($sp) +/* 00124 80AFA844 8FBF002C */ lw $ra, 0x002C($sp) .L80AFA848: -/* 00128 80AFA848 8FB00028 */ lw $s0, 0x0028($sp) +/* 00128 80AFA848 8FB00028 */ lw $s0, 0x0028($sp) /* 0012C 80AFA84C 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 -/* 00130 80AFA850 03E00008 */ jr $ra +/* 00130 80AFA850 03E00008 */ jr $ra /* 00134 80AFA854 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Shopnuts/func_80AFA880.s b/asm/non_matchings/overlays/actors/ovl_En_Shopnuts/func_80AFA880.s index c41530f71d..e71c10c25f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Shopnuts/func_80AFA880.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Shopnuts/func_80AFA880.s @@ -1,18 +1,18 @@ glabel func_80AFA880 /* 00160 80AFA880 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00164 80AFA884 AFBF0014 */ sw $ra, 0x0014($sp) +/* 00164 80AFA884 AFBF0014 */ sw $ra, 0x0014($sp) /* 00168 80AFA888 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 /* 0016C 80AFA88C 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 00170 80AFA890 24A5139C */ addiu $a1, $a1, 0x139C ## $a1 = 0600139C -/* 00174 80AFA894 AFA70018 */ sw $a3, 0x0018($sp) +/* 00174 80AFA894 AFA70018 */ sw $a3, 0x0018($sp) /* 00178 80AFA898 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 0017C 80AFA89C 0C0294A7 */ jal func_800A529C +/* 0017C 80AFA89C 0C0294A7 */ jal SkelAnime_ChangeAnimPlaybackStop /* 00180 80AFA8A0 24060000 */ addiu $a2, $zero, 0x0000 ## $a2 = 00000000 /* 00184 80AFA8A4 24040064 */ addiu $a0, $zero, 0x0064 ## $a0 = 00000064 /* 00188 80AFA8A8 0C01DF64 */ jal Math_Rand_S16Offset - + /* 0018C 80AFA8AC 24050032 */ addiu $a1, $zero, 0x0032 ## $a1 = 00000032 -/* 00190 80AFA8B0 8FA70018 */ lw $a3, 0x0018($sp) +/* 00190 80AFA8B0 8FA70018 */ lw $a3, 0x0018($sp) /* 00194 80AFA8B4 3C1980B0 */ lui $t9, %hi(func_80AFAA7C) ## $t9 = 80B00000 /* 00198 80AFA8B8 240E0005 */ addiu $t6, $zero, 0x0005 ## $t6 = 00000005 /* 0019C 80AFA8BC 90EF0281 */ lbu $t7, 0x0281($a3) ## 00000281 @@ -22,9 +22,9 @@ glabel func_80AFA880 /* 001AC 80AFA8CC A4EE02B2 */ sh $t6, 0x02B2($a3) ## 000002B2 /* 001B0 80AFA8D0 A0F80281 */ sb $t8, 0x0281($a3) ## 00000281 /* 001B4 80AFA8D4 ACF90190 */ sw $t9, 0x0190($a3) ## 00000190 -/* 001B8 80AFA8D8 8FBF0014 */ lw $ra, 0x0014($sp) +/* 001B8 80AFA8D8 8FBF0014 */ lw $ra, 0x0014($sp) /* 001BC 80AFA8DC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 001C0 80AFA8E0 03E00008 */ jr $ra +/* 001C0 80AFA8E0 03E00008 */ jr $ra /* 001C4 80AFA8E4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Shopnuts/func_80AFA8E8.s b/asm/non_matchings/overlays/actors/ovl_En_Shopnuts/func_80AFA8E8.s index a4a25159d7..783a72c33a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Shopnuts/func_80AFA8E8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Shopnuts/func_80AFA8E8.s @@ -1,21 +1,21 @@ glabel func_80AFA8E8 /* 001C8 80AFA8E8 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 001CC 80AFA8EC AFBF0014 */ sw $ra, 0x0014($sp) +/* 001CC 80AFA8EC AFBF0014 */ sw $ra, 0x0014($sp) /* 001D0 80AFA8F0 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 /* 001D4 80AFA8F4 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 001D8 80AFA8F8 24A50BA0 */ addiu $a1, $a1, 0x0BA0 ## $a1 = 06000BA0 -/* 001DC 80AFA8FC AFA60018 */ sw $a2, 0x0018($sp) -/* 001E0 80AFA900 0C0294BE */ jal func_800A52F8 +/* 001DC 80AFA8FC AFA60018 */ sw $a2, 0x0018($sp) +/* 001E0 80AFA900 0C0294BE */ jal SkelAnime_ChangeAnimDefaultRepeat /* 001E4 80AFA904 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 001E8 80AFA908 8FA60018 */ lw $a2, 0x0018($sp) +/* 001E8 80AFA908 8FA60018 */ lw $a2, 0x0018($sp) /* 001EC 80AFA90C 3C0F80B0 */ lui $t7, %hi(func_80AFACE0) ## $t7 = 80B00000 /* 001F0 80AFA910 240E0002 */ addiu $t6, $zero, 0x0002 ## $t6 = 00000002 /* 001F4 80AFA914 25EFACE0 */ addiu $t7, $t7, %lo(func_80AFACE0) ## $t7 = 80AFACE0 /* 001F8 80AFA918 A4CE0194 */ sh $t6, 0x0194($a2) ## 00000194 /* 001FC 80AFA91C ACCF0190 */ sw $t7, 0x0190($a2) ## 00000190 -/* 00200 80AFA920 8FBF0014 */ lw $ra, 0x0014($sp) +/* 00200 80AFA920 8FBF0014 */ lw $ra, 0x0014($sp) /* 00204 80AFA924 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00208 80AFA928 03E00008 */ jr $ra +/* 00208 80AFA928 03E00008 */ jr $ra /* 0020C 80AFA92C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Shopnuts/func_80AFA930.s b/asm/non_matchings/overlays/actors/ovl_En_Shopnuts/func_80AFA930.s index 184ab5aa45..7d2ece5157 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Shopnuts/func_80AFA930.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Shopnuts/func_80AFA930.s @@ -1,18 +1,18 @@ glabel func_80AFA930 /* 00210 80AFA930 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00214 80AFA934 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00218 80AFA938 AFA40018 */ sw $a0, 0x0018($sp) +/* 00214 80AFA934 AFBF0014 */ sw $ra, 0x0014($sp) +/* 00218 80AFA938 AFA40018 */ sw $a0, 0x0018($sp) /* 0021C 80AFA93C 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 00220 80AFA940 24A501EC */ addiu $a1, $a1, 0x01EC ## $a1 = 060001EC -/* 00224 80AFA944 0C02947A */ jal func_800A51E8 +/* 00224 80AFA944 0C02947A */ jal SkelAnime_ChangeAnimDefaultStop /* 00228 80AFA948 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 0022C 80AFA94C 8FAF0018 */ lw $t7, 0x0018($sp) +/* 0022C 80AFA94C 8FAF0018 */ lw $t7, 0x0018($sp) /* 00230 80AFA950 3C0E80B0 */ lui $t6, %hi(func_80AFAE28) ## $t6 = 80B00000 /* 00234 80AFA954 25CEAE28 */ addiu $t6, $t6, %lo(func_80AFAE28) ## $t6 = 80AFAE28 /* 00238 80AFA958 ADEE0190 */ sw $t6, 0x0190($t7) ## 00000190 -/* 0023C 80AFA95C 8FBF0014 */ lw $ra, 0x0014($sp) +/* 0023C 80AFA95C 8FBF0014 */ lw $ra, 0x0014($sp) /* 00240 80AFA960 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00244 80AFA964 03E00008 */ jr $ra +/* 00244 80AFA964 03E00008 */ jr $ra /* 00248 80AFA968 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Shopnuts/func_80AFA96C.s b/asm/non_matchings/overlays/actors/ovl_En_Shopnuts/func_80AFA96C.s index e19d8ea23f..1a074a0d69 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Shopnuts/func_80AFA96C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Shopnuts/func_80AFA96C.s @@ -1,31 +1,31 @@ glabel func_80AFA96C /* 0024C 80AFA96C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00250 80AFA970 AFBF0014 */ sw $ra, 0x0014($sp) +/* 00250 80AFA970 AFBF0014 */ sw $ra, 0x0014($sp) /* 00254 80AFA974 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 /* 00258 80AFA978 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 0025C 80AFA97C 24A54574 */ addiu $a1, $a1, 0x4574 ## $a1 = 06004574 -/* 00260 80AFA980 AFA70018 */ sw $a3, 0x0018($sp) +/* 00260 80AFA980 AFA70018 */ sw $a3, 0x0018($sp) /* 00264 80AFA984 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 00268 80AFA988 0C0294D3 */ jal func_800A534C +/* 00268 80AFA988 0C0294D3 */ jal SkelAnime_ChangeAnimTransitionRepeat /* 0026C 80AFA98C 3C06C040 */ lui $a2, 0xC040 ## $a2 = C0400000 -/* 00270 80AFA990 8FA70018 */ lw $a3, 0x0018($sp) +/* 00270 80AFA990 8FA70018 */ lw $a3, 0x0018($sp) /* 00274 80AFA994 3C0E80B0 */ lui $t6, %hi(func_80AFAE28) ## $t6 = 80B00000 /* 00278 80AFA998 25CEAE28 */ addiu $t6, $t6, %lo(func_80AFAE28) ## $t6 = 80AFAE28 /* 0027C 80AFA99C 8CEF0190 */ lw $t7, 0x0190($a3) ## 00000190 /* 00280 80AFA9A0 3C0880B0 */ lui $t0, %hi(func_80AFAD64) ## $t0 = 80B00000 /* 00284 80AFA9A4 24190001 */ addiu $t9, $zero, 0x0001 ## $t9 = 00000001 -/* 00288 80AFA9A8 15CF0004 */ bne $t6, $t7, .L80AFA9BC +/* 00288 80AFA9A8 15CF0004 */ bne $t6, $t7, .L80AFA9BC /* 0028C 80AFA9AC 2508AD64 */ addiu $t0, $t0, %lo(func_80AFAD64) ## $t0 = 80AFAD64 /* 00290 80AFA9B0 24181002 */ addiu $t8, $zero, 0x1002 ## $t8 = 00001002 -/* 00294 80AFA9B4 10000002 */ beq $zero, $zero, .L80AFA9C0 +/* 00294 80AFA9B4 10000002 */ beq $zero, $zero, .L80AFA9C0 /* 00298 80AFA9B8 A4F80194 */ sh $t8, 0x0194($a3) ## 00000194 .L80AFA9BC: /* 0029C 80AFA9BC A4F90194 */ sh $t9, 0x0194($a3) ## 00000194 .L80AFA9C0: /* 002A0 80AFA9C0 ACE80190 */ sw $t0, 0x0190($a3) ## 00000190 -/* 002A4 80AFA9C4 8FBF0014 */ lw $ra, 0x0014($sp) +/* 002A4 80AFA9C4 8FBF0014 */ lw $ra, 0x0014($sp) /* 002A8 80AFA9C8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 002AC 80AFA9CC 03E00008 */ jr $ra +/* 002AC 80AFA9CC 03E00008 */ jr $ra /* 002B0 80AFA9D0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Shopnuts/func_80AFA9D4.s b/asm/non_matchings/overlays/actors/ovl_En_Shopnuts/func_80AFA9D4.s index c59506cbb0..05f52c9586 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Shopnuts/func_80AFA9D4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Shopnuts/func_80AFA9D4.s @@ -1,23 +1,23 @@ glabel func_80AFA9D4 /* 002B4 80AFA9D4 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 002B8 80AFA9D8 AFBF0014 */ sw $ra, 0x0014($sp) -/* 002BC 80AFA9DC AFA40018 */ sw $a0, 0x0018($sp) +/* 002B8 80AFA9D8 AFBF0014 */ sw $ra, 0x0014($sp) +/* 002BC 80AFA9DC AFA40018 */ sw $a0, 0x0018($sp) /* 002C0 80AFA9E0 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 002C4 80AFA9E4 24A5039C */ addiu $a1, $a1, 0x039C ## $a1 = 0600039C /* 002C8 80AFA9E8 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 002CC 80AFA9EC 0C029490 */ jal func_800A5240 +/* 002CC 80AFA9EC 0C029490 */ jal SkelAnime_ChangeAnimTransitionStop /* 002D0 80AFA9F0 3C06C0A0 */ lui $a2, 0xC0A0 ## $a2 = C0A00000 -/* 002D4 80AFA9F4 8FA40018 */ lw $a0, 0x0018($sp) +/* 002D4 80AFA9F4 8FA40018 */ lw $a0, 0x0018($sp) /* 002D8 80AFA9F8 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 002DC 80AFA9FC 2405387D */ addiu $a1, $zero, 0x387D ## $a1 = 0000387D -/* 002E0 80AFAA00 8FAF0018 */ lw $t7, 0x0018($sp) +/* 002E0 80AFAA00 8FAF0018 */ lw $t7, 0x0018($sp) /* 002E4 80AFAA04 3C0E80B0 */ lui $t6, %hi(func_80AFAF64) ## $t6 = 80B00000 /* 002E8 80AFAA08 25CEAF64 */ addiu $t6, $t6, %lo(func_80AFAF64) ## $t6 = 80AFAF64 /* 002EC 80AFAA0C ADEE0190 */ sw $t6, 0x0190($t7) ## 00000190 -/* 002F0 80AFAA10 8FBF0014 */ lw $ra, 0x0014($sp) +/* 002F0 80AFAA10 8FBF0014 */ lw $ra, 0x0014($sp) /* 002F4 80AFAA14 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 002F8 80AFAA18 03E00008 */ jr $ra +/* 002F8 80AFAA18 03E00008 */ jr $ra /* 002FC 80AFAA1C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Shopnuts/func_80AFAA20.s b/asm/non_matchings/overlays/actors/ovl_En_Shopnuts/func_80AFAA20.s index f48bcb8949..290dea5f6a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Shopnuts/func_80AFAA20.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Shopnuts/func_80AFAA20.s @@ -1,27 +1,27 @@ glabel func_80AFAA20 /* 00300 80AFAA20 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00304 80AFAA24 AFBF0014 */ sw $ra, 0x0014($sp) +/* 00304 80AFAA24 AFBF0014 */ sw $ra, 0x0014($sp) /* 00308 80AFAA28 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 /* 0030C 80AFAA2C 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 00310 80AFAA30 24A50764 */ addiu $a1, $a1, 0x0764 ## $a1 = 06000764 -/* 00314 80AFAA34 AFA70018 */ sw $a3, 0x0018($sp) +/* 00314 80AFAA34 AFA70018 */ sw $a3, 0x0018($sp) /* 00318 80AFAA38 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 0031C 80AFAA3C 0C029490 */ jal func_800A5240 +/* 0031C 80AFAA3C 0C029490 */ jal SkelAnime_ChangeAnimTransitionStop /* 00320 80AFAA40 3C06C040 */ lui $a2, 0xC040 ## $a2 = C0400000 -/* 00324 80AFAA44 8FA40018 */ lw $a0, 0x0018($sp) +/* 00324 80AFAA44 8FA40018 */ lw $a0, 0x0018($sp) /* 00328 80AFAA48 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 0032C 80AFAA4C 24053880 */ addiu $a1, $zero, 0x3880 ## $a1 = 00003880 -/* 00330 80AFAA50 8FA70018 */ lw $a3, 0x0018($sp) +/* 00330 80AFAA50 8FA70018 */ lw $a3, 0x0018($sp) /* 00334 80AFAA54 3C1880B0 */ lui $t8, %hi(func_80AFB028) ## $t8 = 80B00000 /* 00338 80AFAA58 2718B028 */ addiu $t8, $t8, %lo(func_80AFB028) ## $t8 = 80AFB028 /* 0033C 80AFAA5C 90EE0281 */ lbu $t6, 0x0281($a3) ## 00000281 /* 00340 80AFAA60 ACF80190 */ sw $t8, 0x0190($a3) ## 00000190 /* 00344 80AFAA64 31CFFFFE */ andi $t7, $t6, 0xFFFE ## $t7 = 00000000 /* 00348 80AFAA68 A0EF0281 */ sb $t7, 0x0281($a3) ## 00000281 -/* 0034C 80AFAA6C 8FBF0014 */ lw $ra, 0x0014($sp) +/* 0034C 80AFAA6C 8FBF0014 */ lw $ra, 0x0014($sp) /* 00350 80AFAA70 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00354 80AFAA74 03E00008 */ jr $ra +/* 00354 80AFAA74 03E00008 */ jr $ra /* 00358 80AFAA78 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Shopnuts/func_80AFB290.s b/asm/non_matchings/overlays/actors/ovl_En_Shopnuts/func_80AFB290.s index 2a11dbcfa6..115a1b4204 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Shopnuts/func_80AFB290.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Shopnuts/func_80AFB290.s @@ -16,7 +16,7 @@ glabel func_80AFB290 /* 00BA8 80AFB2C8 240702AA */ addiu $a3, $zero, 0x02AA ## $a3 = 000002AA /* 00BAC 80AFB2CC 8C850000 */ lw $a1, 0x0000($a0) ## 00000000 /* 00BB0 80AFB2D0 27A40028 */ addiu $a0, $sp, 0x0028 ## $a0 = FFFFFFD8 -/* 00BB4 80AFB2D4 0C031AB1 */ jal func_800C6AC4 +/* 00BB4 80AFB2D4 0C031AB1 */ jal Graph_OpenDisps /* 00BB8 80AFB2D8 AFA50038 */ sw $a1, 0x0038($sp) /* 00BBC 80AFB2DC 8FA80060 */ lw $t0, 0x0060($sp) /* 00BC0 80AFB2E0 3C0140C0 */ lui $at, 0x40C0 ## $at = 40C00000 @@ -116,7 +116,7 @@ glabel func_80AFB290 /* 00D28 80AFB448 AC4F0000 */ sw $t7, 0x0000($v0) ## 00000000 /* 00D2C 80AFB44C 8FB80050 */ lw $t8, 0x0050($sp) /* 00D30 80AFB450 240702CD */ addiu $a3, $zero, 0x02CD ## $a3 = 000002CD -/* 00D34 80AFB454 0C031AD5 */ jal func_800C6B54 +/* 00D34 80AFB454 0C031AD5 */ jal Graph_CloseDisps /* 00D38 80AFB458 8F050000 */ lw $a1, 0x0000($t8) ## 00000000 .L80AFB45C: /* 00D3C 80AFB45C 8FBF0014 */ lw $ra, 0x0014($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Siofuki/EnSiofuki_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Siofuki/EnSiofuki_Draw.s index db329c3b3b..241cd23fdf 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Siofuki/EnSiofuki_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Siofuki/EnSiofuki_Draw.s @@ -14,7 +14,7 @@ glabel EnSiofuki_Draw /* 00A48 80AFC5C8 24C6C820 */ addiu $a2, $a2, %lo(D_80AFC820) ## $a2 = 80AFC820 /* 00A4C 80AFC5CC 27A4005C */ addiu $a0, $sp, 0x005C ## $a0 = FFFFFFDC /* 00A50 80AFC5D0 2407028E */ addiu $a3, $zero, 0x028E ## $a3 = 0000028E -/* 00A54 80AFC5D4 0C031AB1 */ jal func_800C6AC4 +/* 00A54 80AFC5D4 0C031AB1 */ jal Graph_OpenDisps /* 00A58 80AFC5D8 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 /* 00A5C 80AFC5DC 8FB80084 */ lw $t8, 0x0084($sp) /* 00A60 80AFC5E0 0C024F61 */ jal func_80093D84 @@ -73,7 +73,7 @@ glabel EnSiofuki_Draw /* 00B34 80AFC6B4 AFA70020 */ sw $a3, 0x0020($sp) /* 00B38 80AFC6B8 AFAF0010 */ sw $t7, 0x0010($sp) /* 00B3C 80AFC6BC 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 00B40 80AFC6C0 0C0253D0 */ jal Draw_TwoTexScroll +/* 00B40 80AFC6C0 0C0253D0 */ jal Gfx_TwoTexScroll /* 00B44 80AFC6C4 AFA20054 */ sw $v0, 0x0054($sp) /* 00B48 80AFC6C8 8FA30054 */ lw $v1, 0x0054($sp) /* 00B4C 80AFC6CC 3C0C0600 */ lui $t4, 0x0600 ## $t4 = 06000000 @@ -90,7 +90,7 @@ glabel EnSiofuki_Draw /* 00B78 80AFC6F8 24C6C848 */ addiu $a2, $a2, %lo(D_80AFC848) ## $a2 = 80AFC848 /* 00B7C 80AFC6FC 27A4005C */ addiu $a0, $sp, 0x005C ## $a0 = FFFFFFDC /* 00B80 80AFC700 240702A2 */ addiu $a3, $zero, 0x02A2 ## $a3 = 000002A2 -/* 00B84 80AFC704 0C031AD5 */ jal func_800C6B54 +/* 00B84 80AFC704 0C031AD5 */ jal Graph_CloseDisps /* 00B88 80AFC708 8DA50000 */ lw $a1, 0x0000($t5) ## 00000000 /* 00B8C 80AFC70C 922F019C */ lbu $t7, 0x019C($s1) ## 0000019C /* 00B90 80AFC710 31EE0001 */ andi $t6, $t7, 0x0001 ## $t6 = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Siofuki/func_80AFBE8C.s b/asm/non_matchings/overlays/actors/ovl_En_Siofuki/func_80AFBE8C.s index 0ddec272b0..b6aadbf68a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Siofuki/func_80AFBE8C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Siofuki/func_80AFBE8C.s @@ -90,7 +90,7 @@ glabel func_80AFBE8C /* 00460 80AFBFE0 46000004 */ sqrt.s $f0, $f0 /* 00464 80AFBFE4 E7A00030 */ swc1 $f0, 0x0030($sp) /* 00468 80AFBFE8 AE090188 */ sw $t1, 0x0188($s0) ## 00000188 -/* 0046C 80AFBFEC 0C03F494 */ jal func_800FD250 +/* 0046C 80AFBFEC 0C03F494 */ jal Math_atan2f /* 00470 80AFBFF0 AE000184 */ sw $zero, 0x0184($s0) ## 00000184 /* 00474 80AFBFF4 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 /* 00478 80AFBFF8 44811000 */ mtc1 $at, $f2 ## $f2 = 1.00 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Skb/func_80AFCDF8.s b/asm/non_matchings/overlays/actors/ovl_En_Skb/func_80AFCDF8.s index 8980de9cb1..600ed085f1 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Skb/func_80AFCDF8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Skb/func_80AFCDF8.s @@ -1,29 +1,29 @@ glabel func_80AFCDF8 /* 00458 80AFCDF8 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 0045C 80AFCDFC AFBF0014 */ sw $ra, 0x0014($sp) +/* 0045C 80AFCDFC AFBF0014 */ sw $ra, 0x0014($sp) /* 00460 80AFCE00 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 /* 00464 80AFCE04 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 00468 80AFCE08 24A51854 */ addiu $a1, $a1, 0x1854 ## $a1 = 06001854 -/* 0046C 80AFCE0C AFA70018 */ sw $a3, 0x0018($sp) +/* 0046C 80AFCE0C AFA70018 */ sw $a3, 0x0018($sp) /* 00470 80AFCE10 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 00474 80AFCE14 0C0294A7 */ jal func_800A529C +/* 00474 80AFCE14 0C0294A7 */ jal SkelAnime_ChangeAnimPlaybackStop /* 00478 80AFCE18 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 0047C 80AFCE1C 8FA40018 */ lw $a0, 0x0018($sp) +/* 0047C 80AFCE1C 8FA40018 */ lw $a0, 0x0018($sp) /* 00480 80AFCE20 2401FFFE */ addiu $at, $zero, 0xFFFE ## $at = FFFFFFFE /* 00484 80AFCE24 24053986 */ addiu $a1, $zero, 0x3986 ## $a1 = 00003986 /* 00488 80AFCE28 8C8E0004 */ lw $t6, 0x0004($a0) ## 00000004 /* 0048C 80AFCE2C A0800280 */ sb $zero, 0x0280($a0) ## 00000280 -/* 00490 80AFCE30 01C17824 */ and $t7, $t6, $at +/* 00490 80AFCE30 01C17824 */ and $t7, $t6, $at /* 00494 80AFCE34 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 00498 80AFCE38 AC8F0004 */ sw $t7, 0x0004($a0) ## 00000004 /* 0049C 80AFCE3C 3C0580B0 */ lui $a1, %hi(func_80AFCE5C) ## $a1 = 80B00000 -/* 004A0 80AFCE40 8FA40018 */ lw $a0, 0x0018($sp) -/* 004A4 80AFCE44 0C2BF268 */ jal func_80AFC9A0 +/* 004A0 80AFCE40 8FA40018 */ lw $a0, 0x0018($sp) +/* 004A4 80AFCE44 0C2BF268 */ jal func_80AFC9A0 /* 004A8 80AFCE48 24A5CE5C */ addiu $a1, $a1, %lo(func_80AFCE5C) ## $a1 = 80AFCE5C -/* 004AC 80AFCE4C 8FBF0014 */ lw $ra, 0x0014($sp) +/* 004AC 80AFCE4C 8FBF0014 */ lw $ra, 0x0014($sp) /* 004B0 80AFCE50 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 004B4 80AFCE54 03E00008 */ jr $ra +/* 004B4 80AFCE54 03E00008 */ jr $ra /* 004B8 80AFCE58 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Skb/func_80AFCF48.s b/asm/non_matchings/overlays/actors/ovl_En_Skb/func_80AFCF48.s index 10eaea0b5a..90a228aca0 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Skb/func_80AFCF48.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Skb/func_80AFCF48.s @@ -1,48 +1,48 @@ glabel func_80AFCF48 /* 005A8 80AFCF48 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 005AC 80AFCF4C AFB00028 */ sw $s0, 0x0028($sp) +/* 005AC 80AFCF4C AFB00028 */ sw $s0, 0x0028($sp) /* 005B0 80AFCF50 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 005B4 80AFCF54 AFBF002C */ sw $ra, 0x002C($sp) +/* 005B4 80AFCF54 AFBF002C */ sw $ra, 0x002C($sp) /* 005B8 80AFCF58 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 /* 005BC 80AFCF5C 0C028800 */ jal SkelAnime_GetFrameCount - + /* 005C0 80AFCF60 24841854 */ addiu $a0, $a0, 0x1854 ## $a0 = 06001854 /* 005C4 80AFCF64 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 005C8 80AFCF68 3C01C080 */ lui $at, 0xC080 ## $at = C0800000 /* 005CC 80AFCF6C 44814000 */ mtc1 $at, $f8 ## $f8 = -4.00 -/* 005D0 80AFCF70 46802120 */ cvt.s.w $f4, $f4 +/* 005D0 80AFCF70 46802120 */ cvt.s.w $f4, $f4 /* 005D4 80AFCF74 44803000 */ mtc1 $zero, $f6 ## $f6 = 0.00 /* 005D8 80AFCF78 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 005DC 80AFCF7C 240E0002 */ addiu $t6, $zero, 0x0002 ## $t6 = 00000002 -/* 005E0 80AFCF80 AFAE0014 */ sw $t6, 0x0014($sp) +/* 005E0 80AFCF80 AFAE0014 */ sw $t6, 0x0014($sp) /* 005E4 80AFCF84 24A51854 */ addiu $a1, $a1, 0x1854 ## $a1 = 06001854 -/* 005E8 80AFCF88 44072000 */ mfc1 $a3, $f4 +/* 005E8 80AFCF88 44072000 */ mfc1 $a3, $f4 /* 005EC 80AFCF8C 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C /* 005F0 80AFCF90 3C06BF80 */ lui $a2, 0xBF80 ## $a2 = BF800000 -/* 005F4 80AFCF94 E7A80018 */ swc1 $f8, 0x0018($sp) -/* 005F8 80AFCF98 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 005FC 80AFCF9C E7A60010 */ swc1 $f6, 0x0010($sp) +/* 005F4 80AFCF94 E7A80018 */ swc1 $f8, 0x0018($sp) +/* 005F8 80AFCF98 0C029468 */ jal SkelAnime_ChangeAnim + +/* 005FC 80AFCF9C E7A60010 */ swc1 $f6, 0x0010($sp) /* 00600 80AFCFA0 8E0F0004 */ lw $t7, 0x0004($s0) ## 00000004 /* 00604 80AFCFA4 44805000 */ mtc1 $zero, $f10 ## $f10 = 0.00 /* 00608 80AFCFA8 2401FFFE */ addiu $at, $zero, 0xFFFE ## $at = FFFFFFFE -/* 0060C 80AFCFAC 01E1C024 */ and $t8, $t7, $at +/* 0060C 80AFCFAC 01E1C024 */ and $t8, $t7, $at /* 00610 80AFCFB0 A2000280 */ sb $zero, 0x0280($s0) ## 00000280 /* 00614 80AFCFB4 A2000281 */ sb $zero, 0x0281($s0) ## 00000281 /* 00618 80AFCFB8 AE180004 */ sw $t8, 0x0004($s0) ## 00000004 /* 0061C 80AFCFBC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 00620 80AFCFC0 24053987 */ addiu $a1, $zero, 0x3987 ## $a1 = 00003987 /* 00624 80AFCFC4 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 00628 80AFCFC8 E60A0068 */ swc1 $f10, 0x0068($s0) ## 00000068 /* 0062C 80AFCFCC 3C0580B0 */ lui $a1, %hi(func_80AFCFF0) ## $a1 = 80B00000 /* 00630 80AFCFD0 24A5CFF0 */ addiu $a1, $a1, %lo(func_80AFCFF0) ## $a1 = 80AFCFF0 -/* 00634 80AFCFD4 0C2BF268 */ jal func_80AFC9A0 +/* 00634 80AFCFD4 0C2BF268 */ jal func_80AFC9A0 /* 00638 80AFCFD8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0063C 80AFCFDC 8FBF002C */ lw $ra, 0x002C($sp) -/* 00640 80AFCFE0 8FB00028 */ lw $s0, 0x0028($sp) +/* 0063C 80AFCFDC 8FBF002C */ lw $ra, 0x002C($sp) +/* 00640 80AFCFE0 8FB00028 */ lw $s0, 0x0028($sp) /* 00644 80AFCFE4 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 00648 80AFCFE8 03E00008 */ jr $ra +/* 00648 80AFCFE8 03E00008 */ jr $ra /* 0064C 80AFCFEC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Skb/func_80AFD0A4.s b/asm/non_matchings/overlays/actors/ovl_En_Skb/func_80AFD0A4.s index ccb4786322..d98f1b1508 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Skb/func_80AFD0A4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Skb/func_80AFD0A4.s @@ -1,43 +1,43 @@ glabel func_80AFD0A4 /* 00704 80AFD0A4 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 00708 80AFD0A8 AFB00028 */ sw $s0, 0x0028($sp) +/* 00708 80AFD0A8 AFB00028 */ sw $s0, 0x0028($sp) /* 0070C 80AFD0AC 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00710 80AFD0B0 AFBF002C */ sw $ra, 0x002C($sp) +/* 00710 80AFD0B0 AFBF002C */ sw $ra, 0x002C($sp) /* 00714 80AFD0B4 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 /* 00718 80AFD0B8 0C028800 */ jal SkelAnime_GetFrameCount - + /* 0071C 80AFD0BC 248447E0 */ addiu $a0, $a0, 0x47E0 ## $a0 = 060047E0 /* 00720 80AFD0C0 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 00724 80AFD0C4 3C01C080 */ lui $at, 0xC080 ## $at = C0800000 /* 00728 80AFD0C8 44814000 */ mtc1 $at, $f8 ## $f8 = -4.00 -/* 0072C 80AFD0CC 468021A0 */ cvt.s.w $f6, $f4 +/* 0072C 80AFD0CC 468021A0 */ cvt.s.w $f6, $f4 /* 00730 80AFD0D0 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 00734 80AFD0D4 3C063F75 */ lui $a2, 0x3F75 ## $a2 = 3F750000 /* 00738 80AFD0D8 34C6C290 */ ori $a2, $a2, 0xC290 ## $a2 = 3F75C290 /* 0073C 80AFD0DC 24A547E0 */ addiu $a1, $a1, 0x47E0 ## $a1 = 060047E0 /* 00740 80AFD0E0 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C -/* 00744 80AFD0E4 E7A60010 */ swc1 $f6, 0x0010($sp) +/* 00744 80AFD0E4 E7A60010 */ swc1 $f6, 0x0010($sp) /* 00748 80AFD0E8 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 0074C 80AFD0EC AFA00014 */ sw $zero, 0x0014($sp) -/* 00750 80AFD0F0 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 00754 80AFD0F4 E7A80018 */ swc1 $f8, 0x0018($sp) +/* 0074C 80AFD0EC AFA00014 */ sw $zero, 0x0014($sp) +/* 00750 80AFD0F0 0C029468 */ jal SkelAnime_ChangeAnim + +/* 00754 80AFD0F4 E7A80018 */ swc1 $f8, 0x0018($sp) /* 00758 80AFD0F8 3C014320 */ lui $at, 0x4320 ## $at = 43200000 /* 0075C 80AFD0FC 44818000 */ mtc1 $at, $f16 ## $f16 = 160.00 /* 00760 80AFD100 C60A0054 */ lwc1 $f10, 0x0054($s0) ## 00000054 /* 00764 80AFD104 240E0004 */ addiu $t6, $zero, 0x0004 ## $t6 = 00000004 /* 00768 80AFD108 3C0580B0 */ lui $a1, %hi(func_80AFD13C) ## $a1 = 80B00000 -/* 0076C 80AFD10C 46105482 */ mul.s $f18, $f10, $f16 +/* 0076C 80AFD10C 46105482 */ mul.s $f18, $f10, $f16 /* 00770 80AFD110 A20E0280 */ sb $t6, 0x0280($s0) ## 00000280 /* 00774 80AFD114 A6000288 */ sh $zero, 0x0288($s0) ## 00000288 /* 00778 80AFD118 24A5D13C */ addiu $a1, $a1, %lo(func_80AFD13C) ## $a1 = 80AFD13C /* 0077C 80AFD11C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00780 80AFD120 0C2BF268 */ jal func_80AFC9A0 +/* 00780 80AFD120 0C2BF268 */ jal func_80AFC9A0 /* 00784 80AFD124 E6120068 */ swc1 $f18, 0x0068($s0) ## 00000068 -/* 00788 80AFD128 8FBF002C */ lw $ra, 0x002C($sp) -/* 0078C 80AFD12C 8FB00028 */ lw $s0, 0x0028($sp) +/* 00788 80AFD128 8FBF002C */ lw $ra, 0x002C($sp) +/* 0078C 80AFD12C 8FB00028 */ lw $s0, 0x0028($sp) /* 00790 80AFD130 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 00794 80AFD134 03E00008 */ jr $ra +/* 00794 80AFD134 03E00008 */ jr $ra /* 00798 80AFD138 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Skb/func_80AFD33C.s b/asm/non_matchings/overlays/actors/ovl_En_Skb/func_80AFD33C.s index 0a2815f88a..0e850f8963 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Skb/func_80AFD33C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Skb/func_80AFD33C.s @@ -1,28 +1,28 @@ glabel func_80AFD33C /* 0099C 80AFD33C 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 009A0 80AFD340 AFB00028 */ sw $s0, 0x0028($sp) +/* 009A0 80AFD340 AFB00028 */ sw $s0, 0x0028($sp) /* 009A4 80AFD344 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 009A8 80AFD348 AFBF002C */ sw $ra, 0x002C($sp) +/* 009A8 80AFD348 AFBF002C */ sw $ra, 0x002C($sp) /* 009AC 80AFD34C 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 /* 009B0 80AFD350 0C028800 */ jal SkelAnime_GetFrameCount - + /* 009B4 80AFD354 24840460 */ addiu $a0, $a0, 0x0460 ## $a0 = 06000460 /* 009B8 80AFD358 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 009BC 80AFD35C 3C014080 */ lui $at, 0x4080 ## $at = 40800000 /* 009C0 80AFD360 44814000 */ mtc1 $at, $f8 ## $f8 = 4.00 -/* 009C4 80AFD364 468021A0 */ cvt.s.w $f6, $f4 +/* 009C4 80AFD364 468021A0 */ cvt.s.w $f6, $f4 /* 009C8 80AFD368 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 009CC 80AFD36C 3C063F19 */ lui $a2, 0x3F19 ## $a2 = 3F190000 /* 009D0 80AFD370 240E0003 */ addiu $t6, $zero, 0x0003 ## $t6 = 00000003 -/* 009D4 80AFD374 AFAE0014 */ sw $t6, 0x0014($sp) +/* 009D4 80AFD374 AFAE0014 */ sw $t6, 0x0014($sp) /* 009D8 80AFD378 34C6999A */ ori $a2, $a2, 0x999A ## $a2 = 3F19999A /* 009DC 80AFD37C 24A50460 */ addiu $a1, $a1, 0x0460 ## $a1 = 06000460 -/* 009E0 80AFD380 E7A60010 */ swc1 $f6, 0x0010($sp) +/* 009E0 80AFD380 E7A60010 */ swc1 $f6, 0x0010($sp) /* 009E4 80AFD384 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C /* 009E8 80AFD388 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 009EC 80AFD38C 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 009F0 80AFD390 E7A80018 */ swc1 $f8, 0x0018($sp) +/* 009EC 80AFD38C 0C029468 */ jal SkelAnime_ChangeAnim + +/* 009F0 80AFD390 E7A80018 */ swc1 $f8, 0x0018($sp) /* 009F4 80AFD394 920F02B4 */ lbu $t7, 0x02B4($s0) ## 000002B4 /* 009F8 80AFD398 44805000 */ mtc1 $zero, $f10 ## $f10 = 0.00 /* 009FC 80AFD39C 24190003 */ addiu $t9, $zero, 0x0003 ## $t9 = 00000003 @@ -32,12 +32,12 @@ glabel func_80AFD33C /* 00A0C 80AFD3AC A2190280 */ sb $t9, 0x0280($s0) ## 00000280 /* 00A10 80AFD3B0 24A5D3D4 */ addiu $a1, $a1, %lo(func_80AFD3D4) ## $a1 = 80AFD3D4 /* 00A14 80AFD3B4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00A18 80AFD3B8 0C2BF268 */ jal func_80AFC9A0 +/* 00A18 80AFD3B8 0C2BF268 */ jal func_80AFC9A0 /* 00A1C 80AFD3BC E60A0068 */ swc1 $f10, 0x0068($s0) ## 00000068 -/* 00A20 80AFD3C0 8FBF002C */ lw $ra, 0x002C($sp) -/* 00A24 80AFD3C4 8FB00028 */ lw $s0, 0x0028($sp) +/* 00A20 80AFD3C0 8FBF002C */ lw $ra, 0x002C($sp) +/* 00A24 80AFD3C4 8FB00028 */ lw $s0, 0x0028($sp) /* 00A28 80AFD3C8 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 00A2C 80AFD3CC 03E00008 */ jr $ra +/* 00A2C 80AFD3CC 03E00008 */ jr $ra /* 00A30 80AFD3D0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Skb/func_80AFD47C.s b/asm/non_matchings/overlays/actors/ovl_En_Skb/func_80AFD47C.s index d7e1ede993..bdfc096fbf 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Skb/func_80AFD47C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Skb/func_80AFD47C.s @@ -1,25 +1,25 @@ glabel func_80AFD47C /* 00ADC 80AFD47C 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 00AE0 80AFD480 AFB00028 */ sw $s0, 0x0028($sp) +/* 00AE0 80AFD480 AFB00028 */ sw $s0, 0x0028($sp) /* 00AE4 80AFD484 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00AE8 80AFD488 AFBF002C */ sw $ra, 0x002C($sp) +/* 00AE8 80AFD488 AFBF002C */ sw $ra, 0x002C($sp) /* 00AEC 80AFD48C 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 /* 00AF0 80AFD490 44813000 */ mtc1 $at, $f6 ## $f6 = 1.00 /* 00AF4 80AFD494 C6040164 */ lwc1 $f4, 0x0164($s0) ## 00000164 /* 00AF8 80AFD498 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 /* 00AFC 80AFD49C 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 00B00 80AFD4A0 46062201 */ sub.s $f8, $f4, $f6 +/* 00B00 80AFD4A0 46062201 */ sub.s $f8, $f4, $f6 /* 00B04 80AFD4A4 3C06BECC */ lui $a2, 0xBECC ## $a2 = BECC0000 /* 00B08 80AFD4A8 240E0003 */ addiu $t6, $zero, 0x0003 ## $t6 = 00000003 -/* 00B0C 80AFD4AC AFAE0014 */ sw $t6, 0x0014($sp) -/* 00B10 80AFD4B0 44074000 */ mfc1 $a3, $f8 +/* 00B0C 80AFD4AC AFAE0014 */ sw $t6, 0x0014($sp) +/* 00B10 80AFD4B0 44074000 */ mfc1 $a3, $f8 /* 00B14 80AFD4B4 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = BECCCCCD /* 00B18 80AFD4B8 24A50460 */ addiu $a1, $a1, 0x0460 ## $a1 = 06000460 /* 00B1C 80AFD4BC 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 00B20 80AFD4C0 E7A00010 */ swc1 $f0, 0x0010($sp) -/* 00B24 80AFD4C4 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 00B28 80AFD4C8 E7A00018 */ swc1 $f0, 0x0018($sp) +/* 00B20 80AFD4C0 E7A00010 */ swc1 $f0, 0x0010($sp) +/* 00B24 80AFD4C4 0C029468 */ jal SkelAnime_ChangeAnim + +/* 00B28 80AFD4C8 E7A00018 */ swc1 $f0, 0x0018($sp) /* 00B2C 80AFD4CC 920F02B4 */ lbu $t7, 0x02B4($s0) ## 000002B4 /* 00B30 80AFD4D0 24190005 */ addiu $t9, $zero, 0x0005 ## $t9 = 00000005 /* 00B34 80AFD4D4 3C0580B0 */ lui $a1, %hi(func_80AFD508) ## $a1 = 80B00000 @@ -28,12 +28,12 @@ glabel func_80AFD47C /* 00B40 80AFD4E0 A2190280 */ sb $t9, 0x0280($s0) ## 00000280 /* 00B44 80AFD4E4 A2000281 */ sb $zero, 0x0281($s0) ## 00000281 /* 00B48 80AFD4E8 24A5D508 */ addiu $a1, $a1, %lo(func_80AFD508) ## $a1 = 80AFD508 -/* 00B4C 80AFD4EC 0C2BF268 */ jal func_80AFC9A0 +/* 00B4C 80AFD4EC 0C2BF268 */ jal func_80AFC9A0 /* 00B50 80AFD4F0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00B54 80AFD4F4 8FBF002C */ lw $ra, 0x002C($sp) -/* 00B58 80AFD4F8 8FB00028 */ lw $s0, 0x0028($sp) +/* 00B54 80AFD4F4 8FBF002C */ lw $ra, 0x002C($sp) +/* 00B58 80AFD4F8 8FB00028 */ lw $s0, 0x0028($sp) /* 00B5C 80AFD4FC 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 00B60 80AFD500 03E00008 */ jr $ra +/* 00B60 80AFD500 03E00008 */ jr $ra /* 00B64 80AFD504 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Skb/func_80AFD644.s b/asm/non_matchings/overlays/actors/ovl_En_Skb/func_80AFD644.s index 429b51c29f..04f722f5a3 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Skb/func_80AFD644.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Skb/func_80AFD644.s @@ -1,18 +1,18 @@ glabel func_80AFD644 /* 00CA4 80AFD644 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00CA8 80AFD648 AFBF0014 */ sw $ra, 0x0014($sp) +/* 00CA8 80AFD648 AFBF0014 */ sw $ra, 0x0014($sp) /* 00CAC 80AFD64C 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 /* 00CB0 80AFD650 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 00CB4 80AFD654 24A50D98 */ addiu $a1, $a1, 0x0D98 ## $a1 = 06000D98 -/* 00CB8 80AFD658 AFA70018 */ sw $a3, 0x0018($sp) +/* 00CB8 80AFD658 AFA70018 */ sw $a3, 0x0018($sp) /* 00CBC 80AFD65C 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 00CC0 80AFD660 0C029490 */ jal func_800A5240 +/* 00CC0 80AFD660 0C029490 */ jal SkelAnime_ChangeAnimTransitionStop /* 00CC4 80AFD664 3C06C080 */ lui $a2, 0xC080 ## $a2 = C0800000 -/* 00CC8 80AFD668 8FA70018 */ lw $a3, 0x0018($sp) +/* 00CC8 80AFD668 8FA70018 */ lw $a3, 0x0018($sp) /* 00CCC 80AFD66C 3C01C080 */ lui $at, 0xC080 ## $at = C0800000 /* 00CD0 80AFD670 94EE0088 */ lhu $t6, 0x0088($a3) ## 00000088 /* 00CD4 80AFD674 31CF0001 */ andi $t7, $t6, 0x0001 ## $t7 = 00000000 -/* 00CD8 80AFD678 51E00005 */ beql $t7, $zero, .L80AFD690 +/* 00CD8 80AFD678 51E00005 */ beql $t7, $zero, .L80AFD690 /* 00CDC 80AFD67C 84F8008A */ lh $t8, 0x008A($a3) ## 0000008A /* 00CE0 80AFD680 44812000 */ mtc1 $at, $f4 ## $f4 = -4.00 /* 00CE4 80AFD684 00000000 */ nop @@ -23,17 +23,17 @@ glabel func_80AFD644 /* 00CF4 80AFD694 24053832 */ addiu $a1, $zero, 0x3832 ## $a1 = 00003832 /* 00CF8 80AFD698 A4F80032 */ sh $t8, 0x0032($a3) ## 00000032 /* 00CFC 80AFD69C 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 00D00 80AFD6A0 AFA70018 */ sw $a3, 0x0018($sp) -/* 00D04 80AFD6A4 8FA40018 */ lw $a0, 0x0018($sp) + +/* 00D00 80AFD6A0 AFA70018 */ sw $a3, 0x0018($sp) +/* 00D04 80AFD6A4 8FA40018 */ lw $a0, 0x0018($sp) /* 00D08 80AFD6A8 24190002 */ addiu $t9, $zero, 0x0002 ## $t9 = 00000002 /* 00D0C 80AFD6AC 3C0580B0 */ lui $a1, %hi(func_80AFD6CC) ## $a1 = 80B00000 /* 00D10 80AFD6B0 24A5D6CC */ addiu $a1, $a1, %lo(func_80AFD6CC) ## $a1 = 80AFD6CC -/* 00D14 80AFD6B4 0C2BF268 */ jal func_80AFC9A0 +/* 00D14 80AFD6B4 0C2BF268 */ jal func_80AFC9A0 /* 00D18 80AFD6B8 A0990280 */ sb $t9, 0x0280($a0) ## 00000280 -/* 00D1C 80AFD6BC 8FBF0014 */ lw $ra, 0x0014($sp) +/* 00D1C 80AFD6BC 8FBF0014 */ lw $ra, 0x0014($sp) /* 00D20 80AFD6C0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00D24 80AFD6C4 03E00008 */ jr $ra +/* 00D24 80AFD6C4 03E00008 */ jr $ra /* 00D28 80AFD6C8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Skb/func_80AFD7B4.s b/asm/non_matchings/overlays/actors/ovl_En_Skb/func_80AFD7B4.s index 564273449f..f1cc9188f5 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Skb/func_80AFD7B4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Skb/func_80AFD7B4.s @@ -1,20 +1,20 @@ glabel func_80AFD7B4 /* 00E14 80AFD7B4 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 00E18 80AFD7B8 AFB00020 */ sw $s0, 0x0020($sp) -/* 00E1C 80AFD7BC AFA5002C */ sw $a1, 0x002C($sp) +/* 00E18 80AFD7B8 AFB00020 */ sw $s0, 0x0020($sp) +/* 00E1C 80AFD7BC AFA5002C */ sw $a1, 0x002C($sp) /* 00E20 80AFD7C0 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00E24 80AFD7C4 AFBF0024 */ sw $ra, 0x0024($sp) +/* 00E24 80AFD7C4 AFBF0024 */ sw $ra, 0x0024($sp) /* 00E28 80AFD7C8 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 00E2C 80AFD7CC 24A509DC */ addiu $a1, $a1, 0x09DC ## $a1 = 060009DC /* 00E30 80AFD7D0 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 00E34 80AFD7D4 0C029490 */ jal func_800A5240 +/* 00E34 80AFD7D4 0C029490 */ jal SkelAnime_ChangeAnimTransitionStop /* 00E38 80AFD7D8 3C06C080 */ lui $a2, 0xC080 ## $a2 = C0800000 /* 00E3C 80AFD7DC 960E0088 */ lhu $t6, 0x0088($s0) ## 00000088 /* 00E40 80AFD7E0 8602008A */ lh $v0, 0x008A($s0) ## 0000008A /* 00E44 80AFD7E4 24180001 */ addiu $t8, $zero, 0x0001 ## $t8 = 00000001 /* 00E48 80AFD7E8 31CF0001 */ andi $t7, $t6, 0x0001 ## $t7 = 00000000 /* 00E4C 80AFD7EC A60200B6 */ sh $v0, 0x00B6($s0) ## 000000B6 -/* 00E50 80AFD7F0 11E00005 */ beq $t7, $zero, .L80AFD808 +/* 00E50 80AFD7F0 11E00005 */ beq $t7, $zero, .L80AFD808 /* 00E54 80AFD7F4 A6020032 */ sh $v0, 0x0032($s0) ## 00000032 /* 00E58 80AFD7F8 3C01C0C0 */ lui $at, 0xC0C0 ## $at = C0C00000 /* 00E5C 80AFD7FC 44812000 */ mtc1 $at, $f4 ## $f4 = -6.00 @@ -24,32 +24,32 @@ glabel func_80AFD7B4 /* 00E68 80AFD808 8E190004 */ lw $t9, 0x0004($s0) ## 00000004 /* 00E6C 80AFD80C 2401FFFE */ addiu $at, $zero, 0xFFFE ## $at = FFFFFFFE /* 00E70 80AFD810 A2180280 */ sb $t8, 0x0280($s0) ## 00000280 -/* 00E74 80AFD814 03214024 */ and $t0, $t9, $at +/* 00E74 80AFD814 03214024 */ and $t0, $t9, $at /* 00E78 80AFD818 AE080004 */ sw $t0, 0x0004($s0) ## 00000004 -/* 00E7C 80AFD81C 8FA6002C */ lw $a2, 0x002C($sp) +/* 00E7C 80AFD81C 8FA6002C */ lw $a2, 0x002C($sp) /* 00E80 80AFD820 2604028C */ addiu $a0, $s0, 0x028C ## $a0 = 0000028C -/* 00E84 80AFD824 0C00CB89 */ jal func_80032E24 +/* 00E84 80AFD824 0C00CB89 */ jal func_80032E24 /* 00E88 80AFD828 24050012 */ addiu $a1, $zero, 0x0012 ## $a1 = 00000012 /* 00E8C 80AFD82C 92090283 */ lbu $t1, 0x0283($s0) ## 00000283 /* 00E90 80AFD830 240B0001 */ addiu $t3, $zero, 0x0001 ## $t3 = 00000001 /* 00E94 80AFD834 240C0028 */ addiu $t4, $zero, 0x0028 ## $t4 = 00000028 /* 00E98 80AFD838 352A0004 */ ori $t2, $t1, 0x0004 ## $t2 = 00000004 /* 00E9C 80AFD83C A20A0283 */ sb $t2, 0x0283($s0) ## 00000283 -/* 00EA0 80AFD840 AFAC0014 */ sw $t4, 0x0014($sp) -/* 00EA4 80AFD844 AFAB0010 */ sw $t3, 0x0010($sp) -/* 00EA8 80AFD848 8FA4002C */ lw $a0, 0x002C($sp) +/* 00EA0 80AFD840 AFAC0014 */ sw $t4, 0x0014($sp) +/* 00EA4 80AFD844 AFAB0010 */ sw $t3, 0x0010($sp) +/* 00EA8 80AFD848 8FA4002C */ lw $a0, 0x002C($sp) /* 00EAC 80AFD84C 260500E4 */ addiu $a1, $s0, 0x00E4 ## $a1 = 000000E4 /* 00EB0 80AFD850 24063833 */ addiu $a2, $zero, 0x3833 ## $a2 = 00003833 -/* 00EB4 80AFD854 0C00AA7D */ jal func_8002A9F4 +/* 00EB4 80AFD854 0C00AA7D */ jal func_8002A9F4 /* 00EB8 80AFD858 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 /* 00EBC 80AFD85C 3C0580B0 */ lui $a1, %hi(func_80AFD880) ## $a1 = 80B00000 /* 00EC0 80AFD860 24A5D880 */ addiu $a1, $a1, %lo(func_80AFD880) ## $a1 = 80AFD880 -/* 00EC4 80AFD864 0C2BF268 */ jal func_80AFC9A0 +/* 00EC4 80AFD864 0C2BF268 */ jal func_80AFC9A0 /* 00EC8 80AFD868 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00ECC 80AFD86C 8FBF0024 */ lw $ra, 0x0024($sp) -/* 00ED0 80AFD870 8FB00020 */ lw $s0, 0x0020($sp) +/* 00ECC 80AFD86C 8FBF0024 */ lw $ra, 0x0024($sp) +/* 00ED0 80AFD870 8FB00020 */ lw $s0, 0x0020($sp) /* 00ED4 80AFD874 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 00ED8 80AFD878 03E00008 */ jr $ra +/* 00ED8 80AFD878 03E00008 */ jr $ra /* 00EDC 80AFD87C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Skb/func_80AFDD30.s b/asm/non_matchings/overlays/actors/ovl_En_Skb/func_80AFDD30.s index 598143c42f..77a90d1ffb 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Skb/func_80AFDD30.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Skb/func_80AFDD30.s @@ -15,7 +15,7 @@ glabel func_80AFDD30 /* 013C4 80AFDD64 3C0680B0 */ lui $a2, %hi(D_80AFE0E0) ## $a2 = 80B00000 /* 013C8 80AFDD68 24C6E0E0 */ addiu $a2, $a2, %lo(D_80AFE0E0) ## $a2 = 80AFE0E0 /* 013CC 80AFDD6C 27A40028 */ addiu $a0, $sp, 0x0028 ## $a0 = FFFFFFE0 -/* 013D0 80AFDD70 0C031AB1 */ jal func_800C6AC4 +/* 013D0 80AFDD70 0C031AB1 */ jal Graph_OpenDisps /* 013D4 80AFDD74 AFA50038 */ sw $a1, 0x0038($sp) /* 013D8 80AFDD78 8FA20048 */ lw $v0, 0x0048($sp) /* 013DC 80AFDD7C 3C010001 */ lui $at, 0x0001 ## $at = 00010000 @@ -110,7 +110,7 @@ glabel func_80AFDD30 /* 0152C 80AFDECC 24C6E0F0 */ addiu $a2, $a2, %lo(D_80AFE0F0) ## $a2 = 80AFE0F0 /* 01530 80AFDED0 27A40028 */ addiu $a0, $sp, 0x0028 ## $a0 = FFFFFFE0 /* 01534 80AFDED4 240703D2 */ addiu $a3, $zero, 0x03D2 ## $a3 = 000003D2 -/* 01538 80AFDED8 0C031AD5 */ jal func_800C6B54 +/* 01538 80AFDED8 0C031AD5 */ jal Graph_CloseDisps /* 0153C 80AFDEDC 8F050000 */ lw $a1, 0x0000($t8) ## 00000008 /* 01540 80AFDEE0 1000000C */ beq $zero, $zero, .L80AFDF14 /* 01544 80AFDEE4 8FBF0014 */ lw $ra, 0x0014($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Skj/EnSkj_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Skj/EnSkj_Draw.s index 48a3feac1f..318338f679 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Skj/EnSkj_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Skj/EnSkj_Draw.s @@ -1,23 +1,23 @@ glabel EnSkj_Draw /* 03280 80B01530 27BDFFA8 */ addiu $sp, $sp, 0xFFA8 ## $sp = FFFFFFA8 -/* 03284 80B01534 AFB10028 */ sw $s1, 0x0028($sp) +/* 03284 80B01534 AFB10028 */ sw $s1, 0x0028($sp) /* 03288 80B01538 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 -/* 0328C 80B0153C AFBF002C */ sw $ra, 0x002C($sp) -/* 03290 80B01540 AFB00024 */ sw $s0, 0x0024($sp) +/* 0328C 80B0153C AFBF002C */ sw $ra, 0x002C($sp) +/* 03290 80B01540 AFB00024 */ sw $s0, 0x0024($sp) /* 03294 80B01544 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 /* 03298 80B01548 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 0329C 80B0154C 3C0680B0 */ lui $a2, %hi(D_80B01860) ## $a2 = 80B00000 /* 032A0 80B01550 24C61860 */ addiu $a2, $a2, %lo(D_80B01860) ## $a2 = 80B01860 /* 032A4 80B01554 27A4003C */ addiu $a0, $sp, 0x003C ## $a0 = FFFFFFE4 /* 032A8 80B01558 240709AB */ addiu $a3, $zero, 0x09AB ## $a3 = 000009AB -/* 032AC 80B0155C 0C031AB1 */ jal func_800C6AC4 -/* 032B0 80B01560 AFA5004C */ sw $a1, 0x004C($sp) -/* 032B4 80B01564 0C024F46 */ jal func_80093D18 +/* 032AC 80B0155C 0C031AB1 */ jal Graph_OpenDisps +/* 032B0 80B01560 AFA5004C */ sw $a1, 0x004C($sp) +/* 032B4 80B01564 0C024F46 */ jal func_80093D18 /* 032B8 80B01568 8E240000 */ lw $a0, 0x0000($s1) ## 00000000 /* 032BC 80B0156C 8E0E02DC */ lw $t6, 0x02DC($s0) ## 000002DC -/* 032C0 80B01570 8FA3004C */ lw $v1, 0x004C($sp) -/* 032C4 80B01574 2DC100FF */ sltiu $at, $t6, 0x00FF -/* 032C8 80B01578 5020000F */ beql $at, $zero, .L80B015B8 +/* 032C0 80B01570 8FA3004C */ lw $v1, 0x004C($sp) +/* 032C4 80B01574 2DC100FF */ sltiu $at, $t6, 0x00FF +/* 032C8 80B01578 5020000F */ beql $at, $zero, .L80B015B8 /* 032CC 80B0157C 8C6202C0 */ lw $v0, 0x02C0($v1) ## 000002C0 /* 032D0 80B01580 8C6202C0 */ lw $v0, 0x02C0($v1) ## 000002C0 /* 032D4 80B01584 3C18DB06 */ lui $t8, 0xDB06 ## $t8 = DB060000 @@ -27,10 +27,10 @@ glabel EnSkj_Draw /* 032E4 80B01594 AC580000 */ sw $t8, 0x0000($v0) ## 00000000 /* 032E8 80B01598 8E0502DC */ lw $a1, 0x02DC($s0) ## 000002DC /* 032EC 80B0159C 8E240000 */ lw $a0, 0x0000($s1) ## 00000000 -/* 032F0 80B015A0 0C2C051D */ jal func_80B01474 -/* 032F4 80B015A4 AFA20038 */ sw $v0, 0x0038($sp) -/* 032F8 80B015A8 8FA60038 */ lw $a2, 0x0038($sp) -/* 032FC 80B015AC 1000000D */ beq $zero, $zero, .L80B015E4 +/* 032F0 80B015A0 0C2C051D */ jal func_80B01474 +/* 032F4 80B015A4 AFA20038 */ sw $v0, 0x0038($sp) +/* 032F8 80B015A8 8FA60038 */ lw $a2, 0x0038($sp) +/* 032FC 80B015AC 1000000D */ beq $zero, $zero, .L80B015E4 /* 03300 80B015B0 ACC20004 */ sw $v0, 0x0004($a2) ## 00000004 /* 03304 80B015B4 8C6202C0 */ lw $v0, 0x02C0($v1) ## 000002C0 .L80B015B8: @@ -41,9 +41,9 @@ glabel EnSkj_Draw /* 03318 80B015C8 AC480000 */ sw $t0, 0x0000($v0) ## 00000000 /* 0331C 80B015CC 8E0502DC */ lw $a1, 0x02DC($s0) ## 000002DC /* 03320 80B015D0 8E240000 */ lw $a0, 0x0000($s1) ## 00000000 -/* 03324 80B015D4 0C2C0539 */ jal func_80B014E4 -/* 03328 80B015D8 AFA20034 */ sw $v0, 0x0034($sp) -/* 0332C 80B015DC 8FA60034 */ lw $a2, 0x0034($sp) +/* 03324 80B015D4 0C2C0539 */ jal func_80B014E4 +/* 03328 80B015D8 AFA20034 */ sw $v0, 0x0034($sp) +/* 0332C 80B015DC 8FA60034 */ lw $a2, 0x0034($sp) /* 03330 80B015E0 ACC20004 */ sw $v0, 0x0004($a2) ## 00000004 .L80B015E4: /* 03334 80B015E4 8E050150 */ lw $a1, 0x0150($s0) ## 00000150 @@ -53,20 +53,20 @@ glabel EnSkj_Draw /* 03344 80B015F4 3C0A80B0 */ lui $t2, %hi(func_80B01360) ## $t2 = 80B00000 /* 03348 80B015F8 254A1360 */ addiu $t2, $t2, %lo(func_80B01360) ## $t2 = 80B01360 /* 0334C 80B015FC 25291348 */ addiu $t1, $t1, %lo(func_80B01348) ## $t1 = 80B01348 -/* 03350 80B01600 AFA90010 */ sw $t1, 0x0010($sp) -/* 03354 80B01604 AFAA0014 */ sw $t2, 0x0014($sp) -/* 03358 80B01608 AFB00018 */ sw $s0, 0x0018($sp) -/* 0335C 80B0160C 0C0286B2 */ jal func_800A1AC8 +/* 03350 80B01600 AFA90010 */ sw $t1, 0x0010($sp) +/* 03354 80B01604 AFAA0014 */ sw $t2, 0x0014($sp) +/* 03358 80B01608 AFB00018 */ sw $s0, 0x0018($sp) +/* 0335C 80B0160C 0C0286B2 */ jal SkelAnime_DrawSV /* 03360 80B01610 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 03364 80B01614 3C0680B0 */ lui $a2, %hi(D_80B01870) ## $a2 = 80B00000 /* 03368 80B01618 24C61870 */ addiu $a2, $a2, %lo(D_80B01870) ## $a2 = 80B01870 /* 0336C 80B0161C 27A4003C */ addiu $a0, $sp, 0x003C ## $a0 = FFFFFFE4 /* 03370 80B01620 8E250000 */ lw $a1, 0x0000($s1) ## 00000000 -/* 03374 80B01624 0C031AD5 */ jal func_800C6B54 +/* 03374 80B01624 0C031AD5 */ jal Graph_CloseDisps /* 03378 80B01628 240709BF */ addiu $a3, $zero, 0x09BF ## $a3 = 000009BF -/* 0337C 80B0162C 8FBF002C */ lw $ra, 0x002C($sp) -/* 03380 80B01630 8FB00024 */ lw $s0, 0x0024($sp) -/* 03384 80B01634 8FB10028 */ lw $s1, 0x0028($sp) -/* 03388 80B01638 03E00008 */ jr $ra +/* 0337C 80B0162C 8FBF002C */ lw $ra, 0x002C($sp) +/* 03380 80B01630 8FB00024 */ lw $s0, 0x0024($sp) +/* 03384 80B01634 8FB10028 */ lw $s1, 0x0028($sp) +/* 03388 80B01638 03E00008 */ jr $ra /* 0338C 80B0163C 27BD0058 */ addiu $sp, $sp, 0x0058 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Skj/EnSkj_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Skj/EnSkj_Init.s index 02538ed01b..fcb390afd2 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Skj/EnSkj_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Skj/EnSkj_Init.s @@ -1,28 +1,28 @@ glabel EnSkj_Init /* 001FC 80AFE4AC 27BDFFB0 */ addiu $sp, $sp, 0xFFB0 ## $sp = FFFFFFB0 -/* 00200 80AFE4B0 AFBF002C */ sw $ra, 0x002C($sp) -/* 00204 80AFE4B4 AFB00028 */ sw $s0, 0x0028($sp) -/* 00208 80AFE4B8 AFA50054 */ sw $a1, 0x0054($sp) +/* 00200 80AFE4B0 AFBF002C */ sw $ra, 0x002C($sp) +/* 00204 80AFE4B4 AFB00028 */ sw $s0, 0x0028($sp) +/* 00208 80AFE4B8 AFA50054 */ sw $a1, 0x0054($sp) /* 0020C 80AFE4BC 8483001C */ lh $v1, 0x001C($a0) ## 0000001C /* 00210 80AFE4C0 3C0580B0 */ lui $a1, %hi(D_80B017C0) ## $a1 = 80B00000 /* 00214 80AFE4C4 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00218 80AFE4C8 00031A83 */ sra $v1, $v1, 10 +/* 00218 80AFE4C8 00031A83 */ sra $v1, $v1, 10 /* 0021C 80AFE4CC 3063003F */ andi $v1, $v1, 0x003F ## $v1 = 00000000 -/* 00220 80AFE4D0 00031C00 */ sll $v1, $v1, 16 -/* 00224 80AFE4D4 00031C03 */ sra $v1, $v1, 16 -/* 00228 80AFE4D8 A7A3004E */ sh $v1, 0x004E($sp) +/* 00220 80AFE4D0 00031C00 */ sll $v1, $v1, 16 +/* 00224 80AFE4D4 00031C03 */ sra $v1, $v1, 16 +/* 00228 80AFE4D8 A7A3004E */ sh $v1, 0x004E($sp) /* 0022C 80AFE4DC 0C01E037 */ jal Actor_ProcessInitChain - + /* 00230 80AFE4E0 24A517C0 */ addiu $a1, $a1, %lo(D_80B017C0) ## $a1 = 80B017C0 -/* 00234 80AFE4E4 87A3004E */ lh $v1, 0x004E($sp) +/* 00234 80AFE4E4 87A3004E */ lh $v1, 0x004E($sp) /* 00238 80AFE4E8 24010005 */ addiu $at, $zero, 0x0005 ## $at = 00000005 /* 0023C 80AFE4EC 3C0280B0 */ lui $v0, %hi(D_80B01640) ## $v0 = 80B00000 -/* 00240 80AFE4F0 10610006 */ beq $v1, $at, .L80AFE50C +/* 00240 80AFE4F0 10610006 */ beq $v1, $at, .L80AFE50C /* 00244 80AFE4F4 24421640 */ addiu $v0, $v0, %lo(D_80B01640) ## $v0 = 80B01640 /* 00248 80AFE4F8 24010006 */ addiu $at, $zero, 0x0006 ## $at = 00000006 -/* 0024C 80AFE4FC 10610017 */ beq $v1, $at, .L80AFE55C +/* 0024C 80AFE4FC 10610017 */ beq $v1, $at, .L80AFE55C /* 00250 80AFE500 3C0280B0 */ lui $v0, %hi(D_80B01640) ## $v0 = 80B00000 -/* 00254 80AFE504 10000035 */ beq $zero, $zero, .L80AFE5DC +/* 00254 80AFE504 10000035 */ beq $zero, $zero, .L80AFE5DC /* 00258 80AFE508 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 .L80AFE50C: /* 0025C 80AFE50C 240E0001 */ addiu $t6, $zero, 0x0001 ## $t6 = 00000001 @@ -31,21 +31,21 @@ glabel EnSkj_Init /* 00268 80AFE518 8E180004 */ lw $t8, 0x0004($s0) ## 00000004 /* 0026C 80AFE51C 2401FFFA */ addiu $at, $zero, 0xFFFA ## $at = FFFFFFFA /* 00270 80AFE520 3C0F80B0 */ lui $t7, %hi(func_80B00964) ## $t7 = 80B00000 -/* 00274 80AFE524 0301C824 */ and $t9, $t8, $at +/* 00274 80AFE524 0301C824 */ and $t9, $t8, $at /* 00278 80AFE528 25EF0964 */ addiu $t7, $t7, %lo(func_80B00964) ## $t7 = 80B00964 /* 0027C 80AFE52C AE190004 */ sw $t9, 0x0004($s0) ## 00000004 /* 00280 80AFE530 AE00012C */ sw $zero, 0x012C($s0) ## 0000012C /* 00284 80AFE534 AE000134 */ sw $zero, 0x0134($s0) ## 00000134 /* 00288 80AFE538 AE0F0130 */ sw $t7, 0x0130($s0) ## 00000130 /* 0028C 80AFE53C AE190004 */ sw $t9, 0x0004($s0) ## 00000004 -/* 00290 80AFE540 8FA40054 */ lw $a0, 0x0054($sp) +/* 00290 80AFE540 8FA40054 */ lw $a0, 0x0054($sp) /* 00294 80AFE544 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 00298 80AFE548 24070006 */ addiu $a3, $zero, 0x0006 ## $a3 = 00000006 /* 0029C 80AFE54C 0C00CDD2 */ jal Actor_ChangeType - + /* 002A0 80AFE550 24851C24 */ addiu $a1, $a0, 0x1C24 ## $a1 = 00001C24 -/* 002A4 80AFE554 100000D7 */ beq $zero, $zero, .L80AFE8B4 -/* 002A8 80AFE558 8FBF002C */ lw $ra, 0x002C($sp) +/* 002A4 80AFE554 100000D7 */ beq $zero, $zero, .L80AFE8B4 +/* 002A8 80AFE558 8FBF002C */ lw $ra, 0x002C($sp) .L80AFE55C: /* 002AC 80AFE55C 24421640 */ addiu $v0, $v0, %lo(D_80B01640) ## $v0 = 00001640 /* 002B0 80AFE560 240A0001 */ addiu $t2, $zero, 0x0001 ## $t2 = 00000001 @@ -54,21 +54,21 @@ glabel EnSkj_Init /* 002BC 80AFE56C 8E0C0004 */ lw $t4, 0x0004($s0) ## 00000004 /* 002C0 80AFE570 2401FFFA */ addiu $at, $zero, 0xFFFA ## $at = FFFFFFFA /* 002C4 80AFE574 3C0B80B0 */ lui $t3, %hi(func_80B01244) ## $t3 = 80B00000 -/* 002C8 80AFE578 01816824 */ and $t5, $t4, $at +/* 002C8 80AFE578 01816824 */ and $t5, $t4, $at /* 002CC 80AFE57C 256B1244 */ addiu $t3, $t3, %lo(func_80B01244) ## $t3 = 80B01244 /* 002D0 80AFE580 AE0D0004 */ sw $t5, 0x0004($s0) ## 00000004 /* 002D4 80AFE584 AE00012C */ sw $zero, 0x012C($s0) ## 0000012C /* 002D8 80AFE588 AE000134 */ sw $zero, 0x0134($s0) ## 00000134 /* 002DC 80AFE58C AE0B0130 */ sw $t3, 0x0130($s0) ## 00000130 /* 002E0 80AFE590 AE0D0004 */ sw $t5, 0x0004($s0) ## 00000004 -/* 002E4 80AFE594 8FA40054 */ lw $a0, 0x0054($sp) +/* 002E4 80AFE594 8FA40054 */ lw $a0, 0x0054($sp) /* 002E8 80AFE598 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 002EC 80AFE59C 24070006 */ addiu $a3, $zero, 0x0006 ## $a3 = 00000006 /* 002F0 80AFE5A0 0C00CDD2 */ jal Actor_ChangeType - + /* 002F4 80AFE5A4 24851C24 */ addiu $a1, $a0, 0x1C24 ## $a1 = 00001C24 /* 002F8 80AFE5A8 3C0180B0 */ lui $at, %hi(D_80B018F8) ## $at = 80B00000 -/* 002FC 80AFE5AC C42418F8 */ lwc1 $f4, %lo(D_80B018F8)($at) +/* 002FC 80AFE5AC C42418F8 */ lwc1 $f4, %lo(D_80B018F8)($at) /* 00300 80AFE5B0 3C01C2B4 */ lui $at, 0xC2B4 ## $at = C2B40000 /* 00304 80AFE5B4 44813000 */ mtc1 $at, $f6 ## $f6 = -90.00 /* 00308 80AFE5B8 3C0143E1 */ lui $at, 0x43E1 ## $at = 43E10000 @@ -78,79 +78,79 @@ glabel EnSkj_Init /* 00318 80AFE5C8 AE180274 */ sw $t8, 0x0274($s0) ## 00000274 /* 0031C 80AFE5CC E6040038 */ swc1 $f4, 0x0038($s0) ## 00000038 /* 00320 80AFE5D0 E606003C */ swc1 $f6, 0x003C($s0) ## 0000003C -/* 00324 80AFE5D4 100000B6 */ beq $zero, $zero, .L80AFE8B0 +/* 00324 80AFE5D4 100000B6 */ beq $zero, $zero, .L80AFE8B0 /* 00328 80AFE5D8 E6080040 */ swc1 $f8, 0x0040($s0) ## 00000040 .L80AFE5DC: /* 0032C 80AFE5DC A603001C */ sh $v1, 0x001C($s0) ## 0000001C /* 00330 80AFE5E0 8602001C */ lh $v0, 0x001C($s0) ## 0000001C /* 00334 80AFE5E4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00338 80AFE5E8 10400010 */ beq $v0, $zero, .L80AFE62C +/* 00338 80AFE5E8 10400010 */ beq $v0, $zero, .L80AFE62C /* 0033C 80AFE5EC 00000000 */ nop -/* 00340 80AFE5F0 1041000E */ beq $v0, $at, .L80AFE62C +/* 00340 80AFE5F0 1041000E */ beq $v0, $at, .L80AFE62C /* 00344 80AFE5F4 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 00348 80AFE5F8 1041000C */ beq $v0, $at, .L80AFE62C +/* 00348 80AFE5F8 1041000C */ beq $v0, $at, .L80AFE62C /* 0034C 80AFE5FC 3C198012 */ lui $t9, 0x8012 ## $t9 = 80120000 /* 00350 80AFE600 93397491 */ lbu $t9, 0x7491($t9) ## 80127491 /* 00354 80AFE604 3C088016 */ lui $t0, 0x8016 ## $t0 = 80160000 -/* 00358 80AFE608 01194021 */ addu $t0, $t0, $t9 +/* 00358 80AFE608 01194021 */ addu $t0, $t0, $t9 /* 0035C 80AFE60C 9108E6D4 */ lbu $t0, -0x192C($t0) ## 8015E6D4 -/* 00360 80AFE610 29010032 */ slti $at, $t0, 0x0032 -/* 00364 80AFE614 10200005 */ beq $at, $zero, .L80AFE62C +/* 00360 80AFE610 29010032 */ slti $at, $t0, 0x0032 +/* 00364 80AFE614 10200005 */ beq $at, $zero, .L80AFE62C /* 00368 80AFE618 00000000 */ nop /* 0036C 80AFE61C 0C00B55C */ jal Actor_Kill - + /* 00370 80AFE620 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00374 80AFE624 100000A3 */ beq $zero, $zero, .L80AFE8B4 -/* 00378 80AFE628 8FBF002C */ lw $ra, 0x002C($sp) +/* 00374 80AFE624 100000A3 */ beq $zero, $zero, .L80AFE8B4 +/* 00378 80AFE628 8FBF002C */ lw $ra, 0x002C($sp) .L80AFE62C: -/* 0037C 80AFE62C 0C2BF90A */ jal func_80AFE428 -/* 00380 80AFE630 A7A3004E */ sh $v1, 0x004E($sp) +/* 0037C 80AFE62C 0C2BF90A */ jal func_80AFE428 +/* 00380 80AFE630 A7A3004E */ sh $v1, 0x004E($sp) /* 00384 80AFE634 3C060600 */ lui $a2, 0x0600 ## $a2 = 06000000 /* 00388 80AFE638 3C070600 */ lui $a3, 0x0600 ## $a3 = 06000000 /* 0038C 80AFE63C 26090190 */ addiu $t1, $s0, 0x0190 ## $t1 = 00000190 /* 00390 80AFE640 260A0202 */ addiu $t2, $s0, 0x0202 ## $t2 = 00000202 /* 00394 80AFE644 240B0013 */ addiu $t3, $zero, 0x0013 ## $t3 = 00000013 -/* 00398 80AFE648 AFAB0018 */ sw $t3, 0x0018($sp) -/* 0039C 80AFE64C AFAA0014 */ sw $t2, 0x0014($sp) -/* 003A0 80AFE650 AFA90010 */ sw $t1, 0x0010($sp) +/* 00398 80AFE648 AFAB0018 */ sw $t3, 0x0018($sp) +/* 0039C 80AFE64C AFAA0014 */ sw $t2, 0x0014($sp) +/* 003A0 80AFE650 AFA90010 */ sw $t1, 0x0010($sp) /* 003A4 80AFE654 24E70E10 */ addiu $a3, $a3, 0x0E10 ## $a3 = 06000E10 /* 003A8 80AFE658 24C65F40 */ addiu $a2, $a2, 0x5F40 ## $a2 = 06005F40 -/* 003AC 80AFE65C 8FA40054 */ lw $a0, 0x0054($sp) -/* 003B0 80AFE660 0C0291BE */ jal func_800A46F8 +/* 003AC 80AFE65C 8FA40054 */ lw $a0, 0x0054($sp) +/* 003B0 80AFE660 0C0291BE */ jal SkelAnime_InitSV /* 003B4 80AFE664 2605014C */ addiu $a1, $s0, 0x014C ## $a1 = 0000014C -/* 003B8 80AFE668 87A3004E */ lh $v1, 0x004E($sp) -/* 003BC 80AFE66C 0460000F */ bltz $v1, .L80AFE6AC -/* 003C0 80AFE670 28610003 */ slti $at, $v1, 0x0003 -/* 003C4 80AFE674 1020000D */ beq $at, $zero, .L80AFE6AC -/* 003C8 80AFE678 8FA40054 */ lw $a0, 0x0054($sp) +/* 003B8 80AFE668 87A3004E */ lh $v1, 0x004E($sp) +/* 003BC 80AFE66C 0460000F */ bltz $v1, .L80AFE6AC +/* 003C0 80AFE670 28610003 */ slti $at, $v1, 0x0003 +/* 003C4 80AFE674 1020000D */ beq $at, $zero, .L80AFE6AC +/* 003C8 80AFE678 8FA40054 */ lw $a0, 0x0054($sp) /* 003CC 80AFE67C 8E0C0004 */ lw $t4, 0x0004($s0) ## 00000004 /* 003D0 80AFE680 2401FFFA */ addiu $at, $zero, 0xFFFA ## $at = FFFFFFFA /* 003D4 80AFE684 24851C24 */ addiu $a1, $a0, 0x1C24 ## $a1 = 00001C24 -/* 003D8 80AFE688 01816824 */ and $t5, $t4, $at +/* 003D8 80AFE688 01816824 */ and $t5, $t4, $at /* 003DC 80AFE68C AE0D0004 */ sw $t5, 0x0004($s0) ## 00000004 /* 003E0 80AFE690 35AF0009 */ ori $t7, $t5, 0x0009 ## $t7 = 00000009 /* 003E4 80AFE694 AE0F0004 */ sw $t7, 0x0004($s0) ## 00000004 -/* 003E8 80AFE698 A7A3004E */ sh $v1, 0x004E($sp) +/* 003E8 80AFE698 A7A3004E */ sh $v1, 0x004E($sp) /* 003EC 80AFE69C 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 003F0 80AFE6A0 0C00CDD2 */ jal Actor_ChangeType - + /* 003F4 80AFE6A4 24070004 */ addiu $a3, $zero, 0x0004 ## $a3 = 00000004 -/* 003F8 80AFE6A8 87A3004E */ lh $v1, 0x004E($sp) +/* 003F8 80AFE6A8 87A3004E */ lh $v1, 0x004E($sp) .L80AFE6AC: -/* 003FC 80AFE6AC 04600003 */ bltz $v1, .L80AFE6BC -/* 00400 80AFE6B0 28610007 */ slti $at, $v1, 0x0007 -/* 00404 80AFE6B4 14200006 */ bne $at, $zero, .L80AFE6D0 +/* 003FC 80AFE6AC 04600003 */ bltz $v1, .L80AFE6BC +/* 00400 80AFE6B0 28610007 */ slti $at, $v1, 0x0007 +/* 00404 80AFE6B4 14200006 */ bne $at, $zero, .L80AFE6D0 /* 00408 80AFE6B8 00000000 */ nop .L80AFE6BC: /* 0040C 80AFE6BC 8E180004 */ lw $t8, 0x0004($s0) ## 00000004 /* 00410 80AFE6C0 3C01FDFF */ lui $at, 0xFDFF ## $at = FDFF0000 /* 00414 80AFE6C4 3421FFFF */ ori $at, $at, 0xFFFF ## $at = FDFFFFFF -/* 00418 80AFE6C8 0301C824 */ and $t9, $t8, $at +/* 00418 80AFE6C8 0301C824 */ and $t9, $t8, $at /* 0041C 80AFE6CC AE190004 */ sw $t9, 0x0004($s0) ## 00000004 .L80AFE6D0: -/* 00420 80AFE6D0 18600017 */ blez $v1, .L80AFE730 -/* 00424 80AFE6D4 28610003 */ slti $at, $v1, 0x0003 -/* 00428 80AFE6D8 10200015 */ beq $at, $zero, .L80AFE730 +/* 00420 80AFE6D0 18600017 */ blez $v1, .L80AFE730 +/* 00424 80AFE6D4 28610003 */ slti $at, $v1, 0x0003 +/* 00428 80AFE6D8 10200015 */ beq $at, $zero, .L80AFE730 /* 0042C 80AFE6DC 24080007 */ addiu $t0, $zero, 0x0007 ## $t0 = 00000007 /* 00430 80AFE6E0 8E0A0024 */ lw $t2, 0x0024($s0) ## 00000024 /* 00434 80AFE6E4 8E090028 */ lw $t1, 0x0028($s0) ## 00000028 @@ -158,9 +158,9 @@ glabel EnSkj_Init /* 0043C 80AFE6EC AE0A02F4 */ sw $t2, 0x02F4($s0) ## 000002F4 /* 00440 80AFE6F0 8E0A002C */ lw $t2, 0x002C($s0) ## 0000002C /* 00444 80AFE6F4 258C1648 */ addiu $t4, $t4, %lo(D_80B01648) ## $t4 = 80B01648 -/* 00448 80AFE6F8 000358C0 */ sll $t3, $v1, 3 +/* 00448 80AFE6F8 000358C0 */ sll $t3, $v1, 3 /* 0044C 80AFE6FC A208001F */ sb $t0, 0x001F($s0) ## 0000001F -/* 00450 80AFE700 016C1021 */ addu $v0, $t3, $t4 +/* 00450 80AFE700 016C1021 */ addu $v0, $t3, $t4 /* 00454 80AFE704 AE0902F8 */ sw $t1, 0x02F8($s0) ## 000002F8 /* 00458 80AFE708 AE0A02FC */ sw $t2, 0x02FC($s0) ## 000002FC /* 0045C 80AFE70C 240D0001 */ addiu $t5, $zero, 0x0001 ## $t5 = 00000001 @@ -168,14 +168,14 @@ glabel EnSkj_Init /* 00464 80AFE714 AC50FFFC */ sw $s0, -0x0004($v0) ## FFFFFFFC /* 00468 80AFE718 A20002D8 */ sb $zero, 0x02D8($s0) ## 000002D8 /* 0046C 80AFE71C AE0002DC */ sw $zero, 0x02DC($s0) ## 000002DC -/* 00470 80AFE720 0C2C0145 */ jal func_80B00514 +/* 00470 80AFE720 0C2C0145 */ jal func_80B00514 /* 00474 80AFE724 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00478 80AFE728 10000005 */ beq $zero, $zero, .L80AFE740 +/* 00478 80AFE728 10000005 */ beq $zero, $zero, .L80AFE740 /* 0047C 80AFE72C 00000000 */ nop .L80AFE730: /* 00480 80AFE730 240E00FF */ addiu $t6, $zero, 0x00FF ## $t6 = 000000FF /* 00484 80AFE734 AE0E02DC */ sw $t6, 0x02DC($s0) ## 000002DC -/* 00488 80AFE738 0C2BFC0E */ jal func_80AFF038 +/* 00488 80AFE738 0C2BFC0E */ jal func_80AFF038 /* 0048C 80AFE73C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 .L80AFE740: /* 00490 80AFE740 3C0F80B0 */ lui $t7, %hi(D_80B016A4) ## $t7 = 80B00000 @@ -184,27 +184,27 @@ glabel EnSkj_Init /* 0049C 80AFE74C AE0F0098 */ sw $t7, 0x0098($s0) ## 00000098 /* 004A0 80AFE750 A21800AF */ sb $t8, 0x00AF($s0) ## 000000AF /* 004A4 80AFE754 26050278 */ addiu $a1, $s0, 0x0278 ## $a1 = 00000278 -/* 004A8 80AFE758 AFA50034 */ sw $a1, 0x0034($sp) +/* 004A8 80AFE758 AFA50034 */ sw $a1, 0x0034($sp) /* 004AC 80AFE75C 0C0170D9 */ jal ActorCollider_AllocCylinder - -/* 004B0 80AFE760 8FA40054 */ lw $a0, 0x0054($sp) + +/* 004B0 80AFE760 8FA40054 */ lw $a0, 0x0054($sp) /* 004B4 80AFE764 3C0780B0 */ lui $a3, %hi(D_80B01678) ## $a3 = 80B00000 -/* 004B8 80AFE768 8FA50034 */ lw $a1, 0x0034($sp) +/* 004B8 80AFE768 8FA50034 */ lw $a1, 0x0034($sp) /* 004BC 80AFE76C 24E71678 */ addiu $a3, $a3, %lo(D_80B01678) ## $a3 = 80B01678 -/* 004C0 80AFE770 8FA40054 */ lw $a0, 0x0054($sp) -/* 004C4 80AFE774 0C017114 */ jal func_8005C450 +/* 004C0 80AFE770 8FA40054 */ lw $a0, 0x0054($sp) +/* 004C4 80AFE774 0C017114 */ jal func_8005C450 /* 004C8 80AFE778 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 004CC 80AFE77C 3C068003 */ lui $a2, 0x8003 ## $a2 = 80030000 /* 004D0 80AFE780 24C6B5EC */ addiu $a2, $a2, 0xB5EC ## $a2 = 8002B5EC /* 004D4 80AFE784 260400B4 */ addiu $a0, $s0, 0x00B4 ## $a0 = 000000B4 /* 004D8 80AFE788 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 /* 004DC 80AFE78C 0C00AC78 */ jal ActorShape_Init - + /* 004E0 80AFE790 3C074220 */ lui $a3, 0x4220 ## $a3 = 42200000 /* 004E4 80AFE794 3C053C23 */ lui $a1, 0x3C23 ## $a1 = 3C230000 /* 004E8 80AFE798 34A5D70A */ ori $a1, $a1, 0xD70A ## $a1 = 3C23D70A /* 004EC 80AFE79C 0C00B58B */ jal Actor_SetScale - + /* 004F0 80AFE7A0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 004F4 80AFE7A4 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 /* 004F8 80AFE7A8 3C01BF80 */ lui $at, 0xBF80 ## $at = BF800000 @@ -219,72 +219,72 @@ glabel EnSkj_Init /* 0051C 80AFE7CC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 00520 80AFE7D0 E6000068 */ swc1 $f0, 0x0068($s0) ## 00000068 /* 00524 80AFE7D4 E6000060 */ swc1 $f0, 0x0060($s0) ## 00000060 -/* 00528 80AFE7D8 0C2BF8E4 */ jal func_80AFE390 +/* 00528 80AFE7D8 0C2BF8E4 */ jal func_80AFE390 /* 0052C 80AFE7DC E60A006C */ swc1 $f10, 0x006C($s0) ## 0000006C -/* 00530 80AFE7E0 8FA80054 */ lw $t0, 0x0054($sp) +/* 00530 80AFE7E0 8FA80054 */ lw $t0, 0x0054($sp) /* 00534 80AFE7E4 3C0480B0 */ lui $a0, %hi(D_80B017D0) ## $a0 = 80B00000 /* 00538 80AFE7E8 248417D0 */ addiu $a0, $a0, %lo(D_80B017D0) ## $a0 = 80B017D0 /* 0053C 80AFE7EC 8D021C44 */ lw $v0, 0x1C44($t0) ## 00001C44 /* 00540 80AFE7F0 C4500024 */ lwc1 $f16, 0x0024($v0) ## 00000024 -/* 00544 80AFE7F4 AFA2003C */ sw $v0, 0x003C($sp) -/* 00548 80AFE7F8 460084A1 */ cvt.d.s $f18, $f16 -/* 0054C 80AFE7FC 44079000 */ mfc1 $a3, $f18 -/* 00550 80AFE800 44069800 */ mfc1 $a2, $f19 +/* 00544 80AFE7F4 AFA2003C */ sw $v0, 0x003C($sp) +/* 00548 80AFE7F8 460084A1 */ cvt.d.s $f18, $f16 +/* 0054C 80AFE7FC 44079000 */ mfc1 $a3, $f18 +/* 00550 80AFE800 44069800 */ mfc1 $a2, $f19 /* 00554 80AFE804 0C00084C */ jal osSyncPrintf - + /* 00558 80AFE808 00000000 */ nop -/* 0055C 80AFE80C 8FA2003C */ lw $v0, 0x003C($sp) +/* 0055C 80AFE80C 8FA2003C */ lw $v0, 0x003C($sp) /* 00560 80AFE810 3C0480B0 */ lui $a0, %hi(D_80B017E0) ## $a0 = 80B00000 /* 00564 80AFE814 248417E0 */ addiu $a0, $a0, %lo(D_80B017E0) ## $a0 = 80B017E0 /* 00568 80AFE818 C444002C */ lwc1 $f4, 0x002C($v0) ## 0000002C -/* 0056C 80AFE81C 460021A1 */ cvt.d.s $f6, $f4 -/* 00570 80AFE820 44073000 */ mfc1 $a3, $f6 -/* 00574 80AFE824 44063800 */ mfc1 $a2, $f7 +/* 0056C 80AFE81C 460021A1 */ cvt.d.s $f6, $f4 +/* 00570 80AFE820 44073000 */ mfc1 $a3, $f6 +/* 00574 80AFE824 44063800 */ mfc1 $a2, $f7 /* 00578 80AFE828 0C00084C */ jal osSyncPrintf - + /* 0057C 80AFE82C 00000000 */ nop /* 00580 80AFE830 C6080024 */ lwc1 $f8, 0x0024($s0) ## 00000024 /* 00584 80AFE834 3C0480B0 */ lui $a0, %hi(D_80B017F0) ## $a0 = 80B00000 /* 00588 80AFE838 248417F0 */ addiu $a0, $a0, %lo(D_80B017F0) ## $a0 = 80B017F0 -/* 0058C 80AFE83C 460042A1 */ cvt.d.s $f10, $f8 -/* 00590 80AFE840 44075000 */ mfc1 $a3, $f10 -/* 00594 80AFE844 44065800 */ mfc1 $a2, $f11 +/* 0058C 80AFE83C 460042A1 */ cvt.d.s $f10, $f8 +/* 00590 80AFE840 44075000 */ mfc1 $a3, $f10 +/* 00594 80AFE844 44065800 */ mfc1 $a2, $f11 /* 00598 80AFE848 0C00084C */ jal osSyncPrintf - + /* 0059C 80AFE84C 00000000 */ nop /* 005A0 80AFE850 C610002C */ lwc1 $f16, 0x002C($s0) ## 0000002C /* 005A4 80AFE854 3C0480B0 */ lui $a0, %hi(D_80B01800) ## $a0 = 80B00000 /* 005A8 80AFE858 24841800 */ addiu $a0, $a0, %lo(D_80B01800) ## $a0 = 80B01800 -/* 005AC 80AFE85C 460084A1 */ cvt.d.s $f18, $f16 -/* 005B0 80AFE860 44079000 */ mfc1 $a3, $f18 -/* 005B4 80AFE864 44069800 */ mfc1 $a2, $f19 +/* 005AC 80AFE85C 460084A1 */ cvt.d.s $f18, $f16 +/* 005B0 80AFE860 44079000 */ mfc1 $a3, $f18 +/* 005B4 80AFE864 44069800 */ mfc1 $a2, $f19 /* 005B8 80AFE868 0C00084C */ jal osSyncPrintf - + /* 005BC 80AFE86C 00000000 */ nop /* 005C0 80AFE870 C60402E0 */ lwc1 $f4, 0x02E0($s0) ## 000002E0 /* 005C4 80AFE874 3C0480B0 */ lui $a0, %hi(D_80B01810) ## $a0 = 80B00000 /* 005C8 80AFE878 24841810 */ addiu $a0, $a0, %lo(D_80B01810) ## $a0 = 80B01810 -/* 005CC 80AFE87C 460021A1 */ cvt.d.s $f6, $f4 -/* 005D0 80AFE880 44073000 */ mfc1 $a3, $f6 -/* 005D4 80AFE884 44063800 */ mfc1 $a2, $f7 +/* 005CC 80AFE87C 460021A1 */ cvt.d.s $f6, $f4 +/* 005D0 80AFE880 44073000 */ mfc1 $a3, $f6 +/* 005D4 80AFE884 44063800 */ mfc1 $a2, $f7 /* 005D8 80AFE888 0C00084C */ jal osSyncPrintf - + /* 005DC 80AFE88C 00000000 */ nop /* 005E0 80AFE890 C60802E8 */ lwc1 $f8, 0x02E8($s0) ## 000002E8 /* 005E4 80AFE894 3C0480B0 */ lui $a0, %hi(D_80B01820) ## $a0 = 80B00000 /* 005E8 80AFE898 24841820 */ addiu $a0, $a0, %lo(D_80B01820) ## $a0 = 80B01820 -/* 005EC 80AFE89C 460042A1 */ cvt.d.s $f10, $f8 -/* 005F0 80AFE8A0 44075000 */ mfc1 $a3, $f10 -/* 005F4 80AFE8A4 44065800 */ mfc1 $a2, $f11 +/* 005EC 80AFE89C 460042A1 */ cvt.d.s $f10, $f8 +/* 005F0 80AFE8A0 44075000 */ mfc1 $a3, $f10 +/* 005F4 80AFE8A4 44065800 */ mfc1 $a2, $f11 /* 005F8 80AFE8A8 0C00084C */ jal osSyncPrintf - + /* 005FC 80AFE8AC 00000000 */ nop .L80AFE8B0: -/* 00600 80AFE8B0 8FBF002C */ lw $ra, 0x002C($sp) +/* 00600 80AFE8B0 8FBF002C */ lw $ra, 0x002C($sp) .L80AFE8B4: -/* 00604 80AFE8B4 8FB00028 */ lw $s0, 0x0028($sp) +/* 00604 80AFE8B4 8FB00028 */ lw $s0, 0x0028($sp) /* 00608 80AFE8B8 27BD0050 */ addiu $sp, $sp, 0x0050 ## $sp = 00000000 -/* 0060C 80AFE8BC 03E00008 */ jr $ra +/* 0060C 80AFE8BC 03E00008 */ jr $ra /* 00610 80AFE8C0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80AFE2B0.s b/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80AFE2B0.s index ea1059a4c9..b0e0531abe 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80AFE2B0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80AFE2B0.s @@ -1,39 +1,39 @@ glabel func_80AFE2B0 /* 00000 80AFE2B0 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 00004 80AFE2B4 AFA50034 */ sw $a1, 0x0034($sp) -/* 00008 80AFE2B8 93AE0037 */ lbu $t6, 0x0037($sp) +/* 00004 80AFE2B4 AFA50034 */ sw $a1, 0x0034($sp) +/* 00008 80AFE2B8 93AE0037 */ lbu $t6, 0x0037($sp) /* 0000C 80AFE2BC 3C1880B0 */ lui $t8, %hi(D_80B016D4) ## $t8 = 80B00000 /* 00010 80AFE2C0 271816D4 */ addiu $t8, $t8, %lo(D_80B016D4) ## $t8 = 80B016D4 -/* 00014 80AFE2C4 000E7880 */ sll $t7, $t6, 2 -/* 00018 80AFE2C8 01EE7823 */ subu $t7, $t7, $t6 -/* 0001C 80AFE2CC 000F7880 */ sll $t7, $t7, 2 -/* 00020 80AFE2D0 AFBF0024 */ sw $ra, 0x0024($sp) -/* 00024 80AFE2D4 AFA40030 */ sw $a0, 0x0030($sp) -/* 00028 80AFE2D8 01F81821 */ addu $v1, $t7, $t8 +/* 00014 80AFE2C4 000E7880 */ sll $t7, $t6, 2 +/* 00018 80AFE2C8 01EE7823 */ subu $t7, $t7, $t6 +/* 0001C 80AFE2CC 000F7880 */ sll $t7, $t7, 2 +/* 00020 80AFE2D0 AFBF0024 */ sw $ra, 0x0024($sp) +/* 00024 80AFE2D4 AFA40030 */ sw $a0, 0x0030($sp) +/* 00028 80AFE2D8 01F81821 */ addu $v1, $t7, $t8 /* 0002C 80AFE2DC 8C640000 */ lw $a0, 0x0000($v1) ## 00000000 /* 00030 80AFE2E0 0C028800 */ jal SkelAnime_GetFrameCount - -/* 00034 80AFE2E4 AFA30028 */ sw $v1, 0x0028($sp) -/* 00038 80AFE2E8 8FA80030 */ lw $t0, 0x0030($sp) -/* 0003C 80AFE2EC 93B90037 */ lbu $t9, 0x0037($sp) + +/* 00034 80AFE2E4 AFA30028 */ sw $v1, 0x0028($sp) +/* 00038 80AFE2E8 8FA80030 */ lw $t0, 0x0030($sp) +/* 0003C 80AFE2EC 93B90037 */ lbu $t9, 0x0037($sp) /* 00040 80AFE2F0 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 -/* 00044 80AFE2F4 8FA30028 */ lw $v1, 0x0028($sp) +/* 00044 80AFE2F4 8FA30028 */ lw $v1, 0x0028($sp) /* 00048 80AFE2F8 A11902D0 */ sb $t9, 0x02D0($t0) ## 000002D0 -/* 0004C 80AFE2FC 468021A0 */ cvt.s.w $f6, $f4 +/* 0004C 80AFE2FC 468021A0 */ cvt.s.w $f6, $f4 /* 00050 80AFE300 C4680008 */ lwc1 $f8, 0x0008($v1) ## 00000008 /* 00054 80AFE304 90690004 */ lbu $t1, 0x0004($v1) ## 00000004 /* 00058 80AFE308 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 0005C 80AFE30C 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 /* 00060 80AFE310 2504014C */ addiu $a0, $t0, 0x014C ## $a0 = 0000014C -/* 00064 80AFE314 E7A60010 */ swc1 $f6, 0x0010($sp) +/* 00064 80AFE314 E7A60010 */ swc1 $f6, 0x0010($sp) /* 00068 80AFE318 8C650000 */ lw $a1, 0x0000($v1) ## 00000000 -/* 0006C 80AFE31C E7A80018 */ swc1 $f8, 0x0018($sp) -/* 00070 80AFE320 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 00074 80AFE324 AFA90014 */ sw $t1, 0x0014($sp) -/* 00078 80AFE328 8FBF0024 */ lw $ra, 0x0024($sp) +/* 0006C 80AFE31C E7A80018 */ swc1 $f8, 0x0018($sp) +/* 00070 80AFE320 0C029468 */ jal SkelAnime_ChangeAnim + +/* 00074 80AFE324 AFA90014 */ sw $t1, 0x0014($sp) +/* 00078 80AFE328 8FBF0024 */ lw $ra, 0x0024($sp) /* 0007C 80AFE32C 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 00080 80AFE330 03E00008 */ jr $ra +/* 00080 80AFE330 03E00008 */ jr $ra /* 00084 80AFE334 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80AFF5F0.s b/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80AFF5F0.s index a14be323b0..ac5c2f2979 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80AFF5F0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80AFF5F0.s @@ -1,15 +1,15 @@ glabel func_80AFF5F0 /* 01340 80AFF5F0 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 01344 80AFF5F4 AFBF0014 */ sw $ra, 0x0014($sp) -/* 01348 80AFF5F8 AFA40018 */ sw $a0, 0x0018($sp) -/* 0134C 80AFF5FC 0C029502 */ jal func_800A5408 +/* 01344 80AFF5F4 AFBF0014 */ sw $ra, 0x0014($sp) +/* 01348 80AFF5F8 AFA40018 */ sw $a0, 0x0018($sp) +/* 0134C 80AFF5FC 0C029502 */ jal SkelAnime_AnimReverse /* 01350 80AFF600 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 01354 80AFF604 8FA40018 */ lw $a0, 0x0018($sp) -/* 01358 80AFF608 0C2BF8CE */ jal func_80AFE338 +/* 01354 80AFF604 8FA40018 */ lw $a0, 0x0018($sp) +/* 01358 80AFF608 0C2BF8CE */ jal func_80AFE338 /* 0135C 80AFF60C 24050008 */ addiu $a1, $zero, 0x0008 ## $a1 = 00000008 -/* 01360 80AFF610 8FBF0014 */ lw $ra, 0x0014($sp) +/* 01360 80AFF610 8FBF0014 */ lw $ra, 0x0014($sp) /* 01364 80AFF614 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 01368 80AFF618 03E00008 */ jr $ra +/* 01368 80AFF618 03E00008 */ jr $ra /* 0136C 80AFF61C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80AFF7D8.s b/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80AFF7D8.s index 1fd3d98a7c..145cdbc16a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80AFF7D8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80AFF7D8.s @@ -99,7 +99,7 @@ glabel func_80AFF7D8 /* 0169C 80AFF94C 316C0200 */ andi $t4, $t3, 0x0200 ## $t4 = 00000000 /* 016A0 80AFF950 11800009 */ beq $t4, $zero, .L80AFF978 /* 016A4 80AFF954 00000000 */ nop -/* 016A8 80AFF958 0C01B0D8 */ jal func_8006C360 +/* 016A8 80AFF958 0C01B0D8 */ jal Text_GetFaceReaction /* 016AC 80AFF95C 24050015 */ addiu $a1, $zero, 0x0015 ## $a1 = 00000015 /* 016B0 80AFF960 304DFFFF */ andi $t5, $v0, 0xFFFF ## $t5 = 00000000 /* 016B4 80AFF964 15A00015 */ bne $t5, $zero, .L80AFF9BC @@ -124,7 +124,7 @@ glabel func_80AFF7D8 /* 016F8 80AFF9A8 10000004 */ beq $zero, $zero, .L80AFF9BC /* 016FC 80AFF9AC A61802C4 */ sh $t8, 0x02C4($s0) ## 000002C4 .L80AFF9B0: -/* 01700 80AFF9B0 0C01B0D8 */ jal func_8006C360 +/* 01700 80AFF9B0 0C01B0D8 */ jal Text_GetFaceReaction /* 01704 80AFF9B4 24050015 */ addiu $a1, $zero, 0x0015 ## $a1 = 00000015 /* 01708 80AFF9B8 A60202C4 */ sh $v0, 0x02C4($s0) ## 000002C4 .L80AFF9BC: diff --git a/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80AFFFBC.s b/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80AFFFBC.s index c62b968089..4060725a7a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80AFFFBC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80AFFFBC.s @@ -4,23 +4,23 @@ glabel func_80AFFFBC /* 01D14 80AFFFC4 3C014000 */ lui $at, 0x4000 ## $at = 40000000 /* 01D18 80AFFFC8 44813000 */ mtc1 $at, $f6 ## $f6 = 2.00 /* 01D1C 80AFFFCC 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 01D20 80AFFFD0 AFBF0014 */ sw $ra, 0x0014($sp) +/* 01D20 80AFFFD0 AFBF0014 */ sw $ra, 0x0014($sp) /* 01D24 80AFFFD4 E4840060 */ swc1 $f4, 0x0060($a0) ## 00000060 /* 01D28 80AFFFD8 E4860068 */ swc1 $f6, 0x0068($a0) ## 00000068 -/* 01D2C 80AFFFDC AFA40018 */ sw $a0, 0x0018($sp) -/* 01D30 80AFFFE0 0C2BF8AC */ jal func_80AFE2B0 +/* 01D2C 80AFFFDC AFA40018 */ sw $a0, 0x0018($sp) +/* 01D30 80AFFFE0 0C2BF8AC */ jal func_80AFE2B0 /* 01D34 80AFFFE4 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 01D38 80AFFFE8 8FA60018 */ lw $a2, 0x0018($sp) -/* 01D3C 80AFFFEC 0C029502 */ jal func_800A5408 +/* 01D38 80AFFFE8 8FA60018 */ lw $a2, 0x0018($sp) +/* 01D3C 80AFFFEC 0C029502 */ jal SkelAnime_AnimReverse /* 01D40 80AFFFF0 24C4014C */ addiu $a0, $a2, 0x014C ## $a0 = 0000014C -/* 01D44 80AFFFF4 8FA40018 */ lw $a0, 0x0018($sp) +/* 01D44 80AFFFF4 8FA40018 */ lw $a0, 0x0018($sp) /* 01D48 80AFFFF8 24050011 */ addiu $a1, $zero, 0x0011 ## $a1 = 00000011 /* 01D4C 80AFFFFC C4880158 */ lwc1 $f8, 0x0158($a0) ## 00000158 -/* 01D50 80B00000 0C2BF8CE */ jal func_80AFE338 +/* 01D50 80B00000 0C2BF8CE */ jal func_80AFE338 /* 01D54 80B00004 E4880164 */ swc1 $f8, 0x0164($a0) ## 00000164 -/* 01D58 80B00008 8FBF0014 */ lw $ra, 0x0014($sp) +/* 01D58 80B00008 8FBF0014 */ lw $ra, 0x0014($sp) /* 01D5C 80B0000C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 01D60 80B00010 03E00008 */ jr $ra +/* 01D60 80B00010 03E00008 */ jr $ra /* 01D64 80B00014 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80B01360.s b/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80B01360.s index 6fab572f0c..105fdfec26 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80B01360.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Skj/func_80B01360.s @@ -1,36 +1,36 @@ glabel func_80B01360 /* 030B0 80B01360 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 -/* 030B4 80B01364 AFBF001C */ sw $ra, 0x001C($sp) -/* 030B8 80B01368 AFB00018 */ sw $s0, 0x0018($sp) -/* 030BC 80B0136C AFA40040 */ sw $a0, 0x0040($sp) -/* 030C0 80B01370 AFA50044 */ sw $a1, 0x0044($sp) -/* 030C4 80B01374 AFA60048 */ sw $a2, 0x0048($sp) -/* 030C8 80B01378 AFA7004C */ sw $a3, 0x004C($sp) +/* 030B4 80B01364 AFBF001C */ sw $ra, 0x001C($sp) +/* 030B8 80B01368 AFB00018 */ sw $s0, 0x0018($sp) +/* 030BC 80B0136C AFA40040 */ sw $a0, 0x0040($sp) +/* 030C0 80B01370 AFA50044 */ sw $a1, 0x0044($sp) +/* 030C4 80B01374 AFA60048 */ sw $a2, 0x0048($sp) +/* 030C8 80B01378 AFA7004C */ sw $a3, 0x004C($sp) /* 030CC 80B0137C 8C850000 */ lw $a1, 0x0000($a0) ## 00000000 /* 030D0 80B01380 3C0680B0 */ lui $a2, %hi(D_80B01830) ## $a2 = 80B00000 /* 030D4 80B01384 24C61830 */ addiu $a2, $a2, %lo(D_80B01830) ## $a2 = 80B01830 /* 030D8 80B01388 27A4002C */ addiu $a0, $sp, 0x002C ## $a0 = FFFFFFEC /* 030DC 80B0138C 24070971 */ addiu $a3, $zero, 0x0971 ## $a3 = 00000971 -/* 030E0 80B01390 0C031AB1 */ jal func_800C6AC4 +/* 030E0 80B01390 0C031AB1 */ jal Graph_OpenDisps /* 030E4 80B01394 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 -/* 030E8 80B01398 8FAF0044 */ lw $t7, 0x0044($sp) +/* 030E8 80B01398 8FAF0044 */ lw $t7, 0x0044($sp) /* 030EC 80B0139C 2401000B */ addiu $at, $zero, 0x000B ## $at = 0000000B /* 030F0 80B013A0 3C188016 */ lui $t8, 0x8016 ## $t8 = 80160000 -/* 030F4 80B013A4 55E10028 */ bnel $t7, $at, .L80B01448 -/* 030F8 80B013A8 8FAF0040 */ lw $t7, 0x0040($sp) +/* 030F4 80B013A4 55E10028 */ bnel $t7, $at, .L80B01448 +/* 030F8 80B013A8 8FAF0040 */ lw $t7, 0x0040($sp) /* 030FC 80B013AC 9718F556 */ lhu $t8, -0x0AAA($t8) ## 8015F556 -/* 03100 80B013B0 8FA80040 */ lw $t0, 0x0040($sp) +/* 03100 80B013B0 8FA80040 */ lw $t0, 0x0040($sp) /* 03104 80B013B4 33190200 */ andi $t9, $t8, 0x0200 ## $t9 = 00000000 -/* 03108 80B013B8 53200023 */ beql $t9, $zero, .L80B01448 -/* 0310C 80B013BC 8FAF0040 */ lw $t7, 0x0040($sp) -/* 03110 80B013C0 0C024F46 */ jal func_80093D18 +/* 03108 80B013B8 53200023 */ beql $t9, $zero, .L80B01448 +/* 0310C 80B013BC 8FAF0040 */ lw $t7, 0x0040($sp) +/* 03110 80B013C0 0C024F46 */ jal func_80093D18 /* 03114 80B013C4 8D040000 */ lw $a0, 0x0000($t0) ## 00000000 -/* 03118 80B013C8 0C034213 */ jal Matrix_Push +/* 03118 80B013C8 0C034213 */ jal Matrix_Push /* 0311C 80B013CC 00000000 */ nop /* 03120 80B013D0 2404C000 */ addiu $a0, $zero, 0xC000 ## $a0 = FFFFC000 /* 03124 80B013D4 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 03128 80B013D8 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 0312C 80B013DC 0C034421 */ jal Matrix_RotateXYZ +/* 0312C 80B013DC 0C034421 */ jal Matrix_RotateZYX /* 03130 80B013E0 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 /* 03134 80B013E4 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 /* 03138 80B013E8 3C0ADA38 */ lui $t2, 0xDA38 ## $t2 = DA380000 @@ -38,14 +38,14 @@ glabel func_80B01360 /* 03140 80B013F0 24490008 */ addiu $t1, $v0, 0x0008 ## $t1 = 00000008 /* 03144 80B013F4 AE0902C0 */ sw $t1, 0x02C0($s0) ## 000002C0 /* 03148 80B013F8 AC4A0000 */ sw $t2, 0x0000($v0) ## 00000000 -/* 0314C 80B013FC 8FAB0040 */ lw $t3, 0x0040($sp) +/* 0314C 80B013FC 8FAB0040 */ lw $t3, 0x0040($sp) /* 03150 80B01400 3C0580B0 */ lui $a1, %hi(D_80B01840) ## $a1 = 80B00000 /* 03154 80B01404 24A51840 */ addiu $a1, $a1, %lo(D_80B01840) ## $a1 = 80B01840 /* 03158 80B01408 8D640000 */ lw $a0, 0x0000($t3) ## 00000000 /* 0315C 80B0140C 2406097E */ addiu $a2, $zero, 0x097E ## $a2 = 0000097E -/* 03160 80B01410 0C0346A2 */ jal Matrix_NewMtx -/* 03164 80B01414 AFA20028 */ sw $v0, 0x0028($sp) -/* 03168 80B01418 8FA30028 */ lw $v1, 0x0028($sp) +/* 03160 80B01410 0C0346A2 */ jal Matrix_NewMtx +/* 03164 80B01414 AFA20028 */ sw $v0, 0x0028($sp) +/* 03168 80B01418 8FA30028 */ lw $v1, 0x0028($sp) /* 0316C 80B0141C 3C0E0600 */ lui $t6, 0x0600 ## $t6 = 06000000 /* 03170 80B01420 25CE14C8 */ addiu $t6, $t6, 0x14C8 ## $t6 = 060014C8 /* 03174 80B01424 AC620004 */ sw $v0, 0x0004($v1) ## 00000004 @@ -54,20 +54,20 @@ glabel func_80B01360 /* 03180 80B01430 244C0008 */ addiu $t4, $v0, 0x0008 ## $t4 = 00000008 /* 03184 80B01434 AE0C02C0 */ sw $t4, 0x02C0($s0) ## 000002C0 /* 03188 80B01438 AC4E0004 */ sw $t6, 0x0004($v0) ## 00000004 -/* 0318C 80B0143C 0C034221 */ jal Matrix_Pull +/* 0318C 80B0143C 0C034221 */ jal Matrix_Pull /* 03190 80B01440 AC4D0000 */ sw $t5, 0x0000($v0) ## 00000000 -/* 03194 80B01444 8FAF0040 */ lw $t7, 0x0040($sp) +/* 03194 80B01444 8FAF0040 */ lw $t7, 0x0040($sp) .L80B01448: /* 03198 80B01448 3C0680B0 */ lui $a2, %hi(D_80B01850) ## $a2 = 80B00000 /* 0319C 80B0144C 24C61850 */ addiu $a2, $a2, %lo(D_80B01850) ## $a2 = 80B01850 /* 031A0 80B01450 27A4002C */ addiu $a0, $sp, 0x002C ## $a0 = FFFFFFEC /* 031A4 80B01454 24070985 */ addiu $a3, $zero, 0x0985 ## $a3 = 00000985 -/* 031A8 80B01458 0C031AD5 */ jal func_800C6B54 +/* 031A8 80B01458 0C031AD5 */ jal Graph_CloseDisps /* 031AC 80B0145C 8DE50000 */ lw $a1, 0x0000($t7) ## 00000000 -/* 031B0 80B01460 8FBF001C */ lw $ra, 0x001C($sp) -/* 031B4 80B01464 8FB00018 */ lw $s0, 0x0018($sp) +/* 031B0 80B01460 8FBF001C */ lw $ra, 0x001C($sp) +/* 031B4 80B01464 8FB00018 */ lw $s0, 0x0018($sp) /* 031B8 80B01468 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 -/* 031BC 80B0146C 03E00008 */ jr $ra +/* 031BC 80B0146C 03E00008 */ jr $ra /* 031C0 80B01470 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Skjneedle/EnSkjneedle_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Skjneedle/EnSkjneedle_Draw.s index ba1a9366fb..d6b5e9ccbd 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Skjneedle/EnSkjneedle_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Skjneedle/EnSkjneedle_Draw.s @@ -9,7 +9,7 @@ glabel EnSkjneedle_Draw /* 001F8 80B020A8 24C621C0 */ addiu $a2, $a2, %lo(D_80B021C0) ## $a2 = 80B021C0 /* 001FC 80B020AC 27A40030 */ addiu $a0, $sp, 0x0030 ## $a0 = FFFFFFE8 /* 00200 80B020B0 240700C8 */ addiu $a3, $zero, 0x00C8 ## $a3 = 000000C8 -/* 00204 80B020B4 0C031AB1 */ jal func_800C6AC4 +/* 00204 80B020B4 0C031AB1 */ jal Graph_OpenDisps /* 00208 80B020B8 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 /* 0020C 80B020BC 8FAF004C */ lw $t7, 0x004C($sp) /* 00210 80B020C0 0C024F46 */ jal func_80093D18 @@ -42,7 +42,7 @@ glabel EnSkjneedle_Draw /* 0027C 80B0212C 24C621F0 */ addiu $a2, $a2, %lo(D_80B021F0) ## $a2 = 80B021F0 /* 00280 80B02130 27A40030 */ addiu $a0, $sp, 0x0030 ## $a0 = FFFFFFE8 /* 00284 80B02134 240700D2 */ addiu $a3, $zero, 0x00D2 ## $a3 = 000000D2 -/* 00288 80B02138 0C031AD5 */ jal func_800C6B54 +/* 00288 80B02138 0C031AD5 */ jal Graph_CloseDisps /* 0028C 80B0213C 8D850000 */ lw $a1, 0x0000($t4) ## 00000000 /* 00290 80B02140 8FBF001C */ lw $ra, 0x001C($sp) /* 00294 80B02144 8FB00018 */ lw $s0, 0x0018($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ssh/EnSsh_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Ssh/EnSsh_Draw.s index 844f6a65c2..67c2d0a843 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ssh/EnSsh_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ssh/EnSsh_Draw.s @@ -13,7 +13,7 @@ glabel EnSsh_Draw /* 02074 80B042E4 8DC50000 */ lw $a1, 0x0000($t6) ## 00000000 /* 02078 80B042E8 27A40034 */ addiu $a0, $sp, 0x0034 ## $a0 = FFFFFFE4 /* 0207C 80B042EC 2407091D */ addiu $a3, $zero, 0x091D ## $a3 = 0000091D -/* 02080 80B042F0 0C031AB1 */ jal func_800C6AC4 +/* 02080 80B042F0 0C031AB1 */ jal Graph_OpenDisps /* 02084 80B042F4 AFA50044 */ sw $a1, 0x0044($sp) /* 02088 80B042F8 8FA80044 */ lw $t0, 0x0044($sp) /* 0208C 80B042FC 3C18DB06 */ lui $t8, 0xDB06 ## $t8 = DB060000 @@ -45,7 +45,7 @@ glabel EnSsh_Draw /* 020F4 80B04364 8FB90054 */ lw $t9, 0x0054($sp) /* 020F8 80B04368 27A40034 */ addiu $a0, $sp, 0x0034 ## $a0 = FFFFFFE4 /* 020FC 80B0436C 24070920 */ addiu $a3, $zero, 0x0920 ## $a3 = 00000920 -/* 02100 80B04370 0C031AD5 */ jal func_800C6B54 +/* 02100 80B04370 0C031AD5 */ jal Graph_CloseDisps /* 02104 80B04374 8F250000 */ lw $a1, 0x0000($t9) ## 00000000 /* 02108 80B04378 3C0980B0 */ lui $t1, %hi(func_80B04280) ## $t1 = 80B00000 /* 0210C 80B0437C 25294280 */ addiu $t1, $t1, %lo(func_80B04280) ## $t1 = 80B04280 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ssh/EnSsh_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Ssh/EnSsh_Init.s index 5d7467c8a3..9a00916073 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ssh/EnSsh_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ssh/EnSsh_Init.s @@ -1,100 +1,100 @@ glabel EnSsh_Init /* 014E4 80B03754 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 -/* 014E8 80B03758 AFB00028 */ sw $s0, 0x0028($sp) +/* 014E8 80B03758 AFB00028 */ sw $s0, 0x0028($sp) /* 014EC 80B0375C 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 014F0 80B03760 AFBF002C */ sw $ra, 0x002C($sp) +/* 014F0 80B03760 AFBF002C */ sw $ra, 0x002C($sp) /* 014F4 80B03764 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 -/* 014F8 80B03768 AFA50044 */ sw $a1, 0x0044($sp) +/* 014F8 80B03768 AFA50044 */ sw $a1, 0x0044($sp) /* 014FC 80B0376C 0C028800 */ jal SkelAnime_GetFrameCount - + /* 01500 80B03770 24840304 */ addiu $a0, $a0, 0x0304 ## $a0 = 06000304 /* 01504 80B03774 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 01508 80B03778 3C0E8016 */ lui $t6, 0x8016 ## $t6 = 80160000 /* 0150C 80B0377C 3C0F8016 */ lui $t7, 0x8016 ## $t7 = 80160000 -/* 01510 80B03780 468021A0 */ cvt.s.w $f6, $f4 -/* 01514 80B03784 E7A6003C */ swc1 $f6, 0x003C($sp) +/* 01510 80B03780 468021A0 */ cvt.s.w $f6, $f4 +/* 01514 80B03784 E7A6003C */ swc1 $f6, 0x003C($sp) /* 01518 80B03788 8603001C */ lh $v1, 0x001C($s0) ## 0000001C -/* 0151C 80B0378C 14600009 */ bne $v1, $zero, .L80B037B4 -/* 01520 80B03790 0003C080 */ sll $t8, $v1, 2 +/* 0151C 80B0378C 14600009 */ bne $v1, $zero, .L80B037B4 +/* 01520 80B03790 0003C080 */ sll $t8, $v1, 2 /* 01524 80B03794 85CEE730 */ lh $t6, -0x18D0($t6) ## 8015E730 -/* 01528 80B03798 29C10064 */ slti $at, $t6, 0x0064 -/* 0152C 80B0379C 1420000F */ bne $at, $zero, .L80B037DC +/* 01528 80B03798 29C10064 */ slti $at, $t6, 0x0064 +/* 0152C 80B0379C 1420000F */ bne $at, $zero, .L80B037DC /* 01530 80B037A0 00000000 */ nop /* 01534 80B037A4 0C00B55C */ jal Actor_Kill - + /* 01538 80B037A8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0153C 80B037AC 1000004A */ beq $zero, $zero, .L80B038D8 -/* 01540 80B037B0 8FBF002C */ lw $ra, 0x002C($sp) +/* 0153C 80B037AC 1000004A */ beq $zero, $zero, .L80B038D8 +/* 01540 80B037B0 8FBF002C */ lw $ra, 0x002C($sp) .L80B037B4: /* 01544 80B037B4 85EFE730 */ lh $t7, -0x18D0($t7) ## FFFFE730 -/* 01548 80B037B8 0303C021 */ addu $t8, $t8, $v1 -/* 0154C 80B037BC 0018C040 */ sll $t8, $t8, 1 -/* 01550 80B037C0 01F8082A */ slt $at, $t7, $t8 -/* 01554 80B037C4 14200005 */ bne $at, $zero, .L80B037DC +/* 01548 80B037B8 0303C021 */ addu $t8, $t8, $v1 +/* 0154C 80B037BC 0018C040 */ sll $t8, $t8, 1 +/* 01550 80B037C0 01F8082A */ slt $at, $t7, $t8 +/* 01554 80B037C4 14200005 */ bne $at, $zero, .L80B037DC /* 01558 80B037C8 00000000 */ nop /* 0155C 80B037CC 0C00B55C */ jal Actor_Kill - + /* 01560 80B037D0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01564 80B037D4 10000040 */ beq $zero, $zero, .L80B038D8 -/* 01568 80B037D8 8FBF002C */ lw $ra, 0x002C($sp) +/* 01564 80B037D4 10000040 */ beq $zero, $zero, .L80B038D8 +/* 01568 80B037D8 8FBF002C */ lw $ra, 0x002C($sp) .L80B037DC: /* 0156C 80B037DC 3C068003 */ lui $a2, 0x8003 ## $a2 = 80030000 /* 01570 80B037E0 24C6B5EC */ addiu $a2, $a2, 0xB5EC ## $a2 = 8002B5EC /* 01574 80B037E4 260400B4 */ addiu $a0, $s0, 0x00B4 ## $a0 = 000000B4 /* 01578 80B037E8 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 /* 0157C 80B037EC 0C00AC78 */ jal ActorShape_Init - + /* 01580 80B037F0 3C0741F0 */ lui $a3, 0x41F0 ## $a3 = 41F00000 /* 01584 80B037F4 2605014C */ addiu $a1, $s0, 0x014C ## $a1 = 0000014C /* 01588 80B037F8 3C060600 */ lui $a2, 0x0600 ## $a2 = 06000000 /* 0158C 80B037FC 26190190 */ addiu $t9, $s0, 0x0190 ## $t9 = 00000190 /* 01590 80B03800 26080244 */ addiu $t0, $s0, 0x0244 ## $t0 = 00000244 /* 01594 80B03804 2409001E */ addiu $t1, $zero, 0x001E ## $t1 = 0000001E -/* 01598 80B03808 AFA90018 */ sw $t1, 0x0018($sp) -/* 0159C 80B0380C AFA80014 */ sw $t0, 0x0014($sp) -/* 015A0 80B03810 AFB90010 */ sw $t9, 0x0010($sp) +/* 01598 80B03808 AFA90018 */ sw $t1, 0x0018($sp) +/* 0159C 80B0380C AFA80014 */ sw $t0, 0x0014($sp) +/* 015A0 80B03810 AFB90010 */ sw $t9, 0x0010($sp) /* 015A4 80B03814 24C652E0 */ addiu $a2, $a2, 0x52E0 ## $a2 = 060052E0 -/* 015A8 80B03818 AFA50030 */ sw $a1, 0x0030($sp) -/* 015AC 80B0381C 8FA40044 */ lw $a0, 0x0044($sp) +/* 015A8 80B03818 AFA50030 */ sw $a1, 0x0030($sp) +/* 015AC 80B0381C 8FA40044 */ lw $a0, 0x0044($sp) /* 015B0 80B03820 0C02915F */ jal SkelAnime_Init - + /* 015B4 80B03824 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 /* 015B8 80B03828 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 015BC 80B0382C C7A8003C */ lwc1 $f8, 0x003C($sp) +/* 015BC 80B0382C C7A8003C */ lwc1 $f8, 0x003C($sp) /* 015C0 80B03830 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 015C4 80B03834 240A0001 */ addiu $t2, $zero, 0x0001 ## $t2 = 00000001 -/* 015C8 80B03838 44070000 */ mfc1 $a3, $f0 -/* 015CC 80B0383C AFAA0014 */ sw $t2, 0x0014($sp) +/* 015C8 80B03838 44070000 */ mfc1 $a3, $f0 +/* 015CC 80B0383C AFAA0014 */ sw $t2, 0x0014($sp) /* 015D0 80B03840 24A50304 */ addiu $a1, $a1, 0x0304 ## $a1 = 06000304 -/* 015D4 80B03844 8FA40030 */ lw $a0, 0x0030($sp) +/* 015D4 80B03844 8FA40030 */ lw $a0, 0x0030($sp) /* 015D8 80B03848 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 015DC 80B0384C E7A80010 */ swc1 $f8, 0x0010($sp) -/* 015E0 80B03850 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 015E4 80B03854 E7A00018 */ swc1 $f0, 0x0018($sp) -/* 015E8 80B03858 0C2C08C0 */ jal func_80B02300 -/* 015EC 80B0385C 8FA40044 */ lw $a0, 0x0044($sp) +/* 015DC 80B0384C E7A80010 */ swc1 $f8, 0x0010($sp) +/* 015E0 80B03850 0C029468 */ jal SkelAnime_ChangeAnim + +/* 015E4 80B03854 E7A00018 */ swc1 $f0, 0x0018($sp) +/* 015E8 80B03858 0C2C08C0 */ jal func_80B02300 +/* 015EC 80B0385C 8FA40044 */ lw $a0, 0x0044($sp) /* 015F0 80B03860 AE020538 */ sw $v0, 0x0538($s0) ## 00000538 -/* 015F4 80B03864 8FA50044 */ lw $a1, 0x0044($sp) -/* 015F8 80B03868 0C2C0970 */ jal func_80B025C0 +/* 015F4 80B03864 8FA50044 */ lw $a1, 0x0044($sp) +/* 015F8 80B03868 0C2C0970 */ jal func_80B025C0 /* 015FC 80B0386C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 01600 80B03870 A60005CA */ sh $zero, 0x05CA($s0) ## 000005CA /* 01604 80B03874 A20005CC */ sb $zero, 0x05CC($s0) ## 000005CC -/* 01608 80B03878 8FA50044 */ lw $a1, 0x0044($sp) -/* 0160C 80B0387C 0C2C08FF */ jal func_80B023FC +/* 01608 80B03878 8FA50044 */ lw $a1, 0x0044($sp) +/* 0160C 80B0387C 0C2C08FF */ jal func_80B023FC /* 01610 80B03880 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 01614 80B03884 860B001C */ lh $t3, 0x001C($s0) ## 0000001C /* 01618 80B03888 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 0161C 80B0388C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01620 80B03890 11600006 */ beq $t3, $zero, .L80B038AC +/* 01620 80B03890 11600006 */ beq $t3, $zero, .L80B038AC /* 01624 80B03894 3C053F40 */ lui $a1, 0x3F40 ## $a1 = 3F400000 /* 01628 80B03898 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0162C 80B0389C 0C2C0A53 */ jal func_80B0294C +/* 0162C 80B0389C 0C2C0A53 */ jal func_80B0294C /* 01630 80B038A0 3C053F00 */ lui $a1, 0x3F00 ## $a1 = 3F000000 -/* 01634 80B038A4 10000004 */ beq $zero, $zero, .L80B038B8 +/* 01634 80B038A4 10000004 */ beq $zero, $zero, .L80B038B8 /* 01638 80B038A8 44805000 */ mtc1 $zero, $f10 ## $f10 = 0.00 .L80B038AC: -/* 0163C 80B038AC 0C2C0A53 */ jal func_80B0294C +/* 0163C 80B038AC 0C2C0A53 */ jal func_80B0294C /* 01640 80B038B0 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 01644 80B038B4 44805000 */ mtc1 $zero, $f10 ## $f10 = 0.00 .L80B038B8: @@ -103,13 +103,13 @@ glabel EnSsh_Init /* 01650 80B038C0 24A53FF0 */ addiu $a1, $a1, %lo(func_80B03FF0) ## $a1 = 80B03FF0 /* 01654 80B038C4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 01658 80B038C8 E60A006C */ swc1 $f10, 0x006C($s0) ## 0000006C -/* 0165C 80B038CC 0C2C089C */ jal func_80B02270 +/* 0165C 80B038CC 0C2C089C */ jal func_80B02270 /* 01660 80B038D0 A60C0524 */ sh $t4, 0x0524($s0) ## 00000524 -/* 01664 80B038D4 8FBF002C */ lw $ra, 0x002C($sp) +/* 01664 80B038D4 8FBF002C */ lw $ra, 0x002C($sp) .L80B038D8: -/* 01668 80B038D8 8FB00028 */ lw $s0, 0x0028($sp) +/* 01668 80B038D8 8FB00028 */ lw $s0, 0x0028($sp) /* 0166C 80B038DC 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 -/* 01670 80B038E0 03E00008 */ jr $ra +/* 01670 80B038E0 03E00008 */ jr $ra /* 01674 80B038E4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ssh/func_80B02700.s b/asm/non_matchings/overlays/actors/ovl_En_Ssh/func_80B02700.s index af6f136085..51e0d876fb 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ssh/func_80B02700.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ssh/func_80B02700.s @@ -1,9 +1,9 @@ glabel func_80B02700 /* 00490 80B02700 27BDFF80 */ addiu $sp, $sp, 0xFF80 ## $sp = FFFFFF80 /* 00494 80B02704 3C0E80B0 */ lui $t6, %hi(D_80B04554) ## $t6 = 80B00000 -/* 00498 80B02708 AFBF0024 */ sw $ra, 0x0024($sp) -/* 0049C 80B0270C AFA40080 */ sw $a0, 0x0080($sp) -/* 004A0 80B02710 AFA50084 */ sw $a1, 0x0084($sp) +/* 00498 80B02708 AFBF0024 */ sw $ra, 0x0024($sp) +/* 0049C 80B0270C AFA40080 */ sw $a0, 0x0080($sp) +/* 004A0 80B02710 AFA50084 */ sw $a1, 0x0084($sp) /* 004A4 80B02714 25CE4554 */ addiu $t6, $t6, %lo(D_80B04554) ## $t6 = 80B04554 /* 004A8 80B02718 8DD80000 */ lw $t8, 0x0000($t6) ## 80B04554 /* 004AC 80B0271C 27A20064 */ addiu $v0, $sp, 0x0064 ## $v0 = FFFFFFE4 @@ -44,39 +44,39 @@ glabel func_80B02700 /* 00538 80B027A8 AD8F0000 */ sw $t7, 0x0000($t4) ## FFFFFFC0 /* 0053C 80B027AC 99AF0006 */ lwr $t7, 0x0006($t5) ## 80B04592 /* 00540 80B027B0 B98F0006 */ swr $t7, 0x0006($t4) ## FFFFFFC6 -/* 00544 80B027B4 8FA30084 */ lw $v1, 0x0084($sp) -/* 00548 80B027B8 00031880 */ sll $v1, $v1, 2 -/* 0054C 80B027BC 00434021 */ addu $t0, $v0, $v1 +/* 00544 80B027B4 8FA30084 */ lw $v1, 0x0084($sp) +/* 00548 80B027B8 00031880 */ sll $v1, $v1, 2 +/* 0054C 80B027BC 00434021 */ addu $t0, $v0, $v1 /* 00550 80B027C0 8D040000 */ lw $a0, 0x0000($t0) ## 00000000 -/* 00554 80B027C4 AFA80030 */ sw $t0, 0x0030($sp) +/* 00554 80B027C4 AFA80030 */ sw $t0, 0x0030($sp) /* 00558 80B027C8 0C028800 */ jal SkelAnime_GetFrameCount - -/* 0055C 80B027CC AFA30034 */ sw $v1, 0x0034($sp) + +/* 0055C 80B027CC AFA30034 */ sw $v1, 0x0034($sp) /* 00560 80B027D0 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 -/* 00564 80B027D4 8FA30034 */ lw $v1, 0x0034($sp) -/* 00568 80B027D8 8FA80030 */ lw $t0, 0x0030($sp) -/* 0056C 80B027DC 46802020 */ cvt.s.w $f0, $f4 -/* 00570 80B027E0 8FB90084 */ lw $t9, 0x0084($sp) -/* 00574 80B027E4 03A3C021 */ addu $t8, $sp, $v1 +/* 00564 80B027D4 8FA30034 */ lw $v1, 0x0034($sp) +/* 00568 80B027D8 8FA80030 */ lw $t0, 0x0030($sp) +/* 0056C 80B027DC 46802020 */ cvt.s.w $f0, $f4 +/* 00570 80B027E0 8FB90084 */ lw $t9, 0x0084($sp) +/* 00574 80B027E4 03A3C021 */ addu $t8, $sp, $v1 /* 00578 80B027E8 3C01C0C0 */ lui $at, 0xC0C0 ## $at = C0C00000 -/* 0057C 80B027EC 03B94821 */ addu $t1, $sp, $t9 +/* 0057C 80B027EC 03B94821 */ addu $t1, $sp, $t9 /* 00580 80B027F0 44813000 */ mtc1 $at, $f6 ## $f6 = -6.00 -/* 00584 80B027F4 E7A0003C */ swc1 $f0, 0x003C($sp) +/* 00584 80B027F4 E7A0003C */ swc1 $f0, 0x003C($sp) /* 00588 80B027F8 8F060048 */ lw $a2, 0x0048($t8) ## 00000048 /* 0058C 80B027FC 8D050000 */ lw $a1, 0x0000($t0) ## 00000000 -/* 00590 80B02800 E7A00010 */ swc1 $f0, 0x0010($sp) +/* 00590 80B02800 E7A00010 */ swc1 $f0, 0x0010($sp) /* 00594 80B02804 91290040 */ lbu $t1, 0x0040($t1) ## 00000040 -/* 00598 80B02808 8FA40080 */ lw $a0, 0x0080($sp) +/* 00598 80B02808 8FA40080 */ lw $a0, 0x0080($sp) /* 0059C 80B0280C 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 005A0 80B02810 E7A60018 */ swc1 $f6, 0x0018($sp) -/* 005A4 80B02814 AFA90014 */ sw $t1, 0x0014($sp) -/* 005A8 80B02818 0C029468 */ jal SkelAnime_ChangeAnimation - +/* 005A0 80B02810 E7A60018 */ swc1 $f6, 0x0018($sp) +/* 005A4 80B02814 AFA90014 */ sw $t1, 0x0014($sp) +/* 005A8 80B02818 0C029468 */ jal SkelAnime_ChangeAnim + /* 005AC 80B0281C 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 005B0 80B02820 8FBF0024 */ lw $ra, 0x0024($sp) -/* 005B4 80B02824 C7A0003C */ lwc1 $f0, 0x003C($sp) +/* 005B0 80B02820 8FBF0024 */ lw $ra, 0x0024($sp) +/* 005B4 80B02824 C7A0003C */ lwc1 $f0, 0x003C($sp) /* 005B8 80B02828 27BD0080 */ addiu $sp, $sp, 0x0080 ## $sp = 00000000 -/* 005BC 80B0282C 03E00008 */ jr $ra +/* 005BC 80B0282C 03E00008 */ jr $ra /* 005C0 80B02830 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ssh/func_80B03A00.s b/asm/non_matchings/overlays/actors/ovl_En_Ssh/func_80B03A00.s index 4eeb70101e..9eac251066 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ssh/func_80B03A00.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ssh/func_80B03A00.s @@ -129,7 +129,7 @@ glabel func_80B03A00 /* 01944 80B03BB4 2405000D */ addiu $a1, $zero, 0x000D ## $a1 = 0000000D /* 01948 80B03BB8 57200031 */ bnel $t9, $zero, .L80B03C80 /* 0194C 80B03BBC 8FBF0014 */ lw $ra, 0x0014($sp) -/* 01950 80B03BC0 0C01B0D8 */ jal func_8006C360 +/* 01950 80B03BC0 0C01B0D8 */ jal Text_GetFaceReaction /* 01954 80B03BC4 AFA70018 */ sw $a3, 0x0018($sp) /* 01958 80B03BC8 8FA70018 */ lw $a3, 0x0018($sp) /* 0195C 80B03BCC 3048FFFF */ andi $t0, $v0, 0xFFFF ## $t0 = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_St/func_80B06D88.s b/asm/non_matchings/overlays/actors/ovl_En_St/func_80B06D88.s index 0c9dec0034..9d8831e0e5 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_St/func_80B06D88.s +++ b/asm/non_matchings/overlays/actors/ovl_En_St/func_80B06D88.s @@ -10,7 +10,7 @@ glabel func_80B06D88 /* 02518 80B06DA8 24C67200 */ addiu $a2, $a2, %lo(D_80B07200) ## $a2 = 80B07200 /* 0251C 80B06DAC 27A40028 */ addiu $a0, $sp, 0x0028 ## $a0 = FFFFFFE8 /* 02520 80B06DB0 240708D4 */ addiu $a3, $zero, 0x08D4 ## $a3 = 000008D4 -/* 02524 80B06DB4 0C031AB1 */ jal func_800C6AC4 +/* 02524 80B06DB4 0C031AB1 */ jal Graph_OpenDisps /* 02528 80B06DB8 AFA50038 */ sw $a1, 0x0038($sp) /* 0252C 80B06DBC 8FA20044 */ lw $v0, 0x0044($sp) /* 02530 80B06DC0 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 @@ -69,7 +69,7 @@ glabel func_80B06D88 /* 025F4 80B06E84 24C67210 */ addiu $a2, $a2, %lo(D_80B07210) ## $a2 = 80B07210 /* 025F8 80B06E88 27A40028 */ addiu $a0, $sp, 0x0028 ## $a0 = FFFFFFE8 /* 025FC 80B06E8C 240708F7 */ addiu $a3, $zero, 0x08F7 ## $a3 = 000008F7 -/* 02600 80B06E90 0C031AD5 */ jal func_800C6B54 +/* 02600 80B06E90 0C031AD5 */ jal Graph_CloseDisps /* 02604 80B06E94 8DC50000 */ lw $a1, 0x0000($t6) ## 00000000 /* 02608 80B06E98 8FBF0014 */ lw $ra, 0x0014($sp) /* 0260C 80B06E9C 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Sth/func_80B07734.s b/asm/non_matchings/overlays/actors/ovl_En_Sth/func_80B07734.s index d0e9ef9742..6294a9951c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Sth/func_80B07734.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Sth/func_80B07734.s @@ -1,76 +1,76 @@ glabel func_80B07734 /* 001F4 80B07734 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 -/* 001F8 80B07738 AFBF002C */ sw $ra, 0x002C($sp) -/* 001FC 80B0773C AFB00028 */ sw $s0, 0x0028($sp) +/* 001F8 80B07738 AFBF002C */ sw $ra, 0x002C($sp) +/* 001FC 80B0773C AFB00028 */ sw $s0, 0x0028($sp) /* 00200 80B07740 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00204 80B07744 0C2C1DAC */ jal func_80B076B0 -/* 00208 80B07748 AFA50044 */ sw $a1, 0x0044($sp) +/* 00204 80B07744 0C2C1DAC */ jal func_80B076B0 +/* 00208 80B07748 AFA50044 */ sw $a1, 0x0044($sp) /* 0020C 80B0774C 920E02A4 */ lbu $t6, 0x02A4($s0) ## 000002A4 -/* 00210 80B07750 8FA40044 */ lw $a0, 0x0044($sp) +/* 00210 80B07750 8FA40044 */ lw $a0, 0x0044($sp) /* 00214 80B07754 3C190001 */ lui $t9, 0x0001 ## $t9 = 00010000 -/* 00218 80B07758 000E7900 */ sll $t7, $t6, 4 -/* 0021C 80B0775C 01EE7821 */ addu $t7, $t7, $t6 -/* 00220 80B07760 000F7880 */ sll $t7, $t7, 2 -/* 00224 80B07764 008FC021 */ addu $t8, $a0, $t7 -/* 00228 80B07768 0338C821 */ addu $t9, $t9, $t8 +/* 00218 80B07758 000E7900 */ sll $t7, $t6, 4 +/* 0021C 80B0775C 01EE7821 */ addu $t7, $t7, $t6 +/* 00220 80B07760 000F7880 */ sll $t7, $t7, 2 +/* 00224 80B07764 008FC021 */ addu $t8, $a0, $t7 +/* 00228 80B07768 0338C821 */ addu $t9, $t9, $t8 /* 0022C 80B0776C 8F3917B4 */ lw $t9, 0x17B4($t9) ## 000117B4 /* 00230 80B07770 3C018000 */ lui $at, 0x8000 ## $at = 80000000 /* 00234 80B07774 3C0680B1 */ lui $a2, %hi(D_80B0B43C) ## $a2 = 80B10000 -/* 00238 80B07778 03214021 */ addu $t0, $t9, $at +/* 00238 80B07778 03214021 */ addu $t0, $t9, $at /* 0023C 80B0777C 3C018016 */ lui $at, 0x8016 ## $at = 80160000 /* 00240 80B07780 AC286FC0 */ sw $t0, 0x6FC0($at) ## 80166FC0 /* 00244 80B07784 8609001C */ lh $t1, 0x001C($s0) ## 0000001C /* 00248 80B07788 26050198 */ addiu $a1, $s0, 0x0198 ## $a1 = 00000198 /* 0024C 80B0778C 260B01DC */ addiu $t3, $s0, 0x01DC ## $t3 = 000001DC -/* 00250 80B07790 00095080 */ sll $t2, $t1, 2 -/* 00254 80B07794 00CA3021 */ addu $a2, $a2, $t2 +/* 00250 80B07790 00095080 */ sll $t2, $t1, 2 +/* 00254 80B07794 00CA3021 */ addu $a2, $a2, $t2 /* 00258 80B07798 260C023C */ addiu $t4, $s0, 0x023C ## $t4 = 0000023C /* 0025C 80B0779C 240D0010 */ addiu $t5, $zero, 0x0010 ## $t5 = 00000010 -/* 00260 80B077A0 AFAD0018 */ sw $t5, 0x0018($sp) -/* 00264 80B077A4 AFAC0014 */ sw $t4, 0x0014($sp) -/* 00268 80B077A8 8CC6B43C */ lw $a2, %lo(D_80B0B43C)($a2) -/* 0026C 80B077AC AFAB0010 */ sw $t3, 0x0010($sp) -/* 00270 80B077B0 AFA50034 */ sw $a1, 0x0034($sp) -/* 00274 80B077B4 0C0291BE */ jal func_800A46F8 +/* 00260 80B077A0 AFAD0018 */ sw $t5, 0x0018($sp) +/* 00264 80B077A4 AFAC0014 */ sw $t4, 0x0014($sp) +/* 00268 80B077A8 8CC6B43C */ lw $a2, %lo(D_80B0B43C)($a2) +/* 0026C 80B077AC AFAB0010 */ sw $t3, 0x0010($sp) +/* 00270 80B077B0 AFA50034 */ sw $a1, 0x0034($sp) +/* 00274 80B077B4 0C0291BE */ jal SkelAnime_InitSV /* 00278 80B077B8 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 /* 0027C 80B077BC 860E001C */ lh $t6, 0x001C($s0) ## 0000001C /* 00280 80B077C0 3C0580B1 */ lui $a1, %hi(D_80B0B454) ## $a1 = 80B10000 -/* 00284 80B077C4 8FA40034 */ lw $a0, 0x0034($sp) -/* 00288 80B077C8 000E7880 */ sll $t7, $t6, 2 -/* 0028C 80B077CC 00AF2821 */ addu $a1, $a1, $t7 -/* 00290 80B077D0 0C0294BE */ jal func_800A52F8 -/* 00294 80B077D4 8CA5B454 */ lw $a1, %lo(D_80B0B454)($a1) +/* 00284 80B077C4 8FA40034 */ lw $a0, 0x0034($sp) +/* 00288 80B077C8 000E7880 */ sll $t7, $t6, 2 +/* 0028C 80B077CC 00AF2821 */ addu $a1, $a1, $t7 +/* 00290 80B077D0 0C0294BE */ jal SkelAnime_ChangeAnimDefaultRepeat +/* 00294 80B077D4 8CA5B454 */ lw $a1, %lo(D_80B0B454)($a1) /* 00298 80B077D8 8618001C */ lh $t8, 0x001C($s0) ## 0000001C /* 0029C 80B077DC 3C0880B1 */ lui $t0, %hi(D_80B0B484) ## $t0 = 80B10000 /* 002A0 80B077E0 3C098016 */ lui $t1, 0x8016 ## $t1 = 80160000 -/* 002A4 80B077E4 0018C840 */ sll $t9, $t8, 1 -/* 002A8 80B077E8 01194021 */ addu $t0, $t0, $t9 -/* 002AC 80B077EC 9508B484 */ lhu $t0, %lo(D_80B0B484)($t0) +/* 002A4 80B077E4 0018C840 */ sll $t9, $t8, 1 +/* 002A8 80B077E8 01194021 */ addu $t0, $t0, $t9 +/* 002AC 80B077EC 9508B484 */ lhu $t0, %lo(D_80B0B484)($t0) /* 002B0 80B077F0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 002B4 80B077F4 3C0580B0 */ lui $a1, %hi(func_80B07D7C) ## $a1 = 80B00000 /* 002B8 80B077F8 A608029C */ sh $t0, 0x029C($s0) ## 0000029C /* 002BC 80B077FC 9529F54E */ lhu $t1, -0x0AB2($t1) ## 8015F54E /* 002C0 80B07800 310AFFFF */ andi $t2, $t0, 0xFFFF ## $t2 = 00000000 -/* 002C4 80B07804 012A5824 */ and $t3, $t1, $t2 -/* 002C8 80B07808 1160000A */ beq $t3, $zero, .L80B07834 +/* 002C4 80B07804 012A5824 */ and $t3, $t1, $t2 +/* 002C8 80B07808 1160000A */ beq $t3, $zero, .L80B07834 /* 002CC 80B0780C 00000000 */ nop /* 002D0 80B07810 860C001C */ lh $t4, 0x001C($s0) ## 0000001C /* 002D4 80B07814 3C0580B1 */ lui $a1, %hi(D_80B0B46C) ## $a1 = 80B10000 /* 002D8 80B07818 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 002DC 80B0781C 000C6880 */ sll $t5, $t4, 2 -/* 002E0 80B07820 00AD2821 */ addu $a1, $a1, $t5 -/* 002E4 80B07824 0C2C1D50 */ jal func_80B07540 -/* 002E8 80B07828 8CA5B46C */ lw $a1, %lo(D_80B0B46C)($a1) -/* 002EC 80B0782C 10000004 */ beq $zero, $zero, .L80B07840 -/* 002F0 80B07830 8FBF002C */ lw $ra, 0x002C($sp) +/* 002DC 80B0781C 000C6880 */ sll $t5, $t4, 2 +/* 002E0 80B07820 00AD2821 */ addu $a1, $a1, $t5 +/* 002E4 80B07824 0C2C1D50 */ jal func_80B07540 +/* 002E8 80B07828 8CA5B46C */ lw $a1, %lo(D_80B0B46C)($a1) +/* 002EC 80B0782C 10000004 */ beq $zero, $zero, .L80B07840 +/* 002F0 80B07830 8FBF002C */ lw $ra, 0x002C($sp) .L80B07834: -/* 002F4 80B07834 0C2C1D50 */ jal func_80B07540 +/* 002F4 80B07834 0C2C1D50 */ jal func_80B07540 /* 002F8 80B07838 24A57D7C */ addiu $a1, $a1, %lo(func_80B07D7C) ## $a1 = 00007D7C -/* 002FC 80B0783C 8FBF002C */ lw $ra, 0x002C($sp) +/* 002FC 80B0783C 8FBF002C */ lw $ra, 0x002C($sp) .L80B07840: -/* 00300 80B07840 8FB00028 */ lw $s0, 0x0028($sp) +/* 00300 80B07840 8FB00028 */ lw $s0, 0x0028($sp) /* 00304 80B07844 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 -/* 00308 80B07848 03E00008 */ jr $ra +/* 00308 80B07848 03E00008 */ jr $ra /* 0030C 80B0784C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Sth/func_80B0813C.s b/asm/non_matchings/overlays/actors/ovl_En_Sth/func_80B0813C.s index 5588f93b05..867b03af68 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Sth/func_80B0813C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Sth/func_80B0813C.s @@ -21,7 +21,7 @@ glabel func_80B0813C /* 00C48 80B08188 8FBF0014 */ lw $ra, 0x0014($sp) /* 00C4C 80B0818C 8F050000 */ lw $a1, 0x0000($t8) ## 00000000 /* 00C50 80B08190 2407081F */ addiu $a3, $zero, 0x081F ## $a3 = 0000081F -/* 00C54 80B08194 0C031AB1 */ jal func_800C6AC4 +/* 00C54 80B08194 0C031AB1 */ jal Graph_OpenDisps /* 00C58 80B08198 AFA50030 */ sw $a1, 0x0030($sp) /* 00C5C 80B0819C 8FA80030 */ lw $t0, 0x0030($sp) /* 00C60 80B081A0 3C0A80B1 */ lui $t2, %hi(D_80B0A3C0) ## $t2 = 80B10000 @@ -37,7 +37,7 @@ glabel func_80B0813C /* 00C88 80B081C8 24C6B560 */ addiu $a2, $a2, %lo(D_80B0B560) ## $a2 = 80B0B560 /* 00C8C 80B081CC 27A40020 */ addiu $a0, $sp, 0x0020 ## $a0 = FFFFFFE8 /* 00C90 80B081D0 24070821 */ addiu $a3, $zero, 0x0821 ## $a3 = 00000821 -/* 00C94 80B081D4 0C031AD5 */ jal func_800C6B54 +/* 00C94 80B081D4 0C031AD5 */ jal Graph_CloseDisps /* 00C98 80B081D8 8D650000 */ lw $a1, 0x0000($t3) ## 00000000 .L80B081DC: /* 00C9C 80B081DC 8FBF0014 */ lw $ra, 0x0014($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Sth/func_80B08258.s b/asm/non_matchings/overlays/actors/ovl_En_Sth/func_80B08258.s index a92d1a6b66..3089d6a2c0 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Sth/func_80B08258.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Sth/func_80B08258.s @@ -1,31 +1,31 @@ glabel func_80B08258 /* 00D18 80B08258 27BDFF98 */ addiu $sp, $sp, 0xFF98 ## $sp = FFFFFF98 -/* 00D1C 80B0825C AFB1002C */ sw $s1, 0x002C($sp) +/* 00D1C 80B0825C AFB1002C */ sw $s1, 0x002C($sp) /* 00D20 80B08260 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 -/* 00D24 80B08264 AFBF0034 */ sw $ra, 0x0034($sp) -/* 00D28 80B08268 AFB20030 */ sw $s2, 0x0030($sp) -/* 00D2C 80B0826C AFB00028 */ sw $s0, 0x0028($sp) +/* 00D24 80B08264 AFBF0034 */ sw $ra, 0x0034($sp) +/* 00D28 80B08268 AFB20030 */ sw $s2, 0x0030($sp) +/* 00D2C 80B0826C AFB00028 */ sw $s0, 0x0028($sp) /* 00D30 80B08270 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 /* 00D34 80B08274 00809025 */ or $s2, $a0, $zero ## $s2 = 00000000 /* 00D38 80B08278 3C0680B1 */ lui $a2, %hi(D_80B0B570) ## $a2 = 80B10000 /* 00D3C 80B0827C 24C6B570 */ addiu $a2, $a2, %lo(D_80B0B570) ## $a2 = 80B0B570 /* 00D40 80B08280 27A4004C */ addiu $a0, $sp, 0x004C ## $a0 = FFFFFFE4 /* 00D44 80B08284 24070855 */ addiu $a3, $zero, 0x0855 ## $a3 = 00000855 -/* 00D48 80B08288 0C031AB1 */ jal func_800C6AC4 +/* 00D48 80B08288 0C031AB1 */ jal Graph_OpenDisps /* 00D4C 80B0828C 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 /* 00D50 80B08290 924E02A4 */ lbu $t6, 0x02A4($s2) ## 000002A4 /* 00D54 80B08294 3C190001 */ lui $t9, 0x0001 ## $t9 = 00010000 /* 00D58 80B08298 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 00D5C 80B0829C 000E7900 */ sll $t7, $t6, 4 -/* 00D60 80B082A0 01EE7821 */ addu $t7, $t7, $t6 -/* 00D64 80B082A4 000F7880 */ sll $t7, $t7, 2 -/* 00D68 80B082A8 022FC021 */ addu $t8, $s1, $t7 -/* 00D6C 80B082AC 0338C821 */ addu $t9, $t9, $t8 +/* 00D5C 80B0829C 000E7900 */ sll $t7, $t6, 4 +/* 00D60 80B082A0 01EE7821 */ addu $t7, $t7, $t6 +/* 00D64 80B082A4 000F7880 */ sll $t7, $t7, 2 +/* 00D68 80B082A8 022FC021 */ addu $t8, $s1, $t7 +/* 00D6C 80B082AC 0338C821 */ addu $t9, $t9, $t8 /* 00D70 80B082B0 8F3917B4 */ lw $t9, 0x17B4($t9) ## 000117B4 -/* 00D74 80B082B4 03214821 */ addu $t1, $t9, $at +/* 00D74 80B082B4 03214821 */ addu $t1, $t9, $at /* 00D78 80B082B8 3C018016 */ lui $at, 0x8016 ## $at = 80160000 /* 00D7C 80B082BC AC296FC0 */ sw $t1, 0x6FC0($at) ## 80166FC0 -/* 00D80 80B082C0 0C0250F2 */ jal func_800943C8 +/* 00D80 80B082C0 0C0250F2 */ jal func_800943C8 /* 00D84 80B082C4 8E240000 */ lw $a0, 0x0000($s1) ## 00000000 /* 00D88 80B082C8 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 /* 00D8C 80B082CC 3C0BDB06 */ lui $t3, 0xDB06 ## $t3 = DB060000 @@ -36,25 +36,25 @@ glabel func_80B08258 /* 00DA0 80B082E0 864C001C */ lh $t4, 0x001C($s2) ## 0000001C /* 00DA4 80B082E4 3C0E80B1 */ lui $t6, %hi(D_80B0B4A8) ## $t6 = 80B10000 /* 00DA8 80B082E8 25CEB4A8 */ addiu $t6, $t6, %lo(D_80B0B4A8) ## $t6 = 80B0B4A8 -/* 00DAC 80B082EC 000C6880 */ sll $t5, $t4, 2 -/* 00DB0 80B082F0 01AC6823 */ subu $t5, $t5, $t4 -/* 00DB4 80B082F4 01AE1821 */ addu $v1, $t5, $t6 +/* 00DAC 80B082EC 000C6880 */ sll $t5, $t4, 2 +/* 00DB0 80B082F0 01AC6823 */ subu $t5, $t5, $t4 +/* 00DB4 80B082F4 01AE1821 */ addu $v1, $t5, $t6 /* 00DB8 80B082F8 8E240000 */ lw $a0, 0x0000($s1) ## 00000000 /* 00DBC 80B082FC 240F00FF */ addiu $t7, $zero, 0x00FF ## $t7 = 000000FF -/* 00DC0 80B08300 AFAF0010 */ sw $t7, 0x0010($sp) +/* 00DC0 80B08300 AFAF0010 */ sw $t7, 0x0010($sp) /* 00DC4 80B08304 90650000 */ lbu $a1, 0x0000($v1) ## 00000000 /* 00DC8 80B08308 90660001 */ lbu $a2, 0x0001($v1) ## 00000001 /* 00DCC 80B0830C 90670002 */ lbu $a3, 0x0002($v1) ## 00000002 -/* 00DD0 80B08310 0C2C207B */ jal func_80B081EC -/* 00DD4 80B08314 AFA20048 */ sw $v0, 0x0048($sp) -/* 00DD8 80B08318 8FA80048 */ lw $t0, 0x0048($sp) +/* 00DD0 80B08310 0C2C207B */ jal func_80B081EC +/* 00DD4 80B08314 AFA20048 */ sw $v0, 0x0048($sp) +/* 00DD8 80B08318 8FA80048 */ lw $t0, 0x0048($sp) /* 00DDC 80B0831C 3C0CDB06 */ lui $t4, 0xDB06 ## $t4 = DB060000 /* 00DE0 80B08320 3C09DB06 */ lui $t1, 0xDB06 ## $t1 = DB060000 /* 00DE4 80B08324 AD020004 */ sw $v0, 0x0004($t0) ## 00000004 /* 00DE8 80B08328 8658001C */ lh $t8, 0x001C($s2) ## 0000001C /* 00DEC 80B0832C 358C0024 */ ori $t4, $t4, 0x0024 ## $t4 = DB060024 /* 00DF0 80B08330 2405005A */ addiu $a1, $zero, 0x005A ## $a1 = 0000005A -/* 00DF4 80B08334 17000011 */ bne $t8, $zero, .L80B0837C +/* 00DF4 80B08334 17000011 */ bne $t8, $zero, .L80B0837C /* 00DF8 80B08338 2406006E */ addiu $a2, $zero, 0x006E ## $a2 = 0000006E /* 00DFC 80B0833C 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 /* 00E00 80B08340 35290024 */ ori $t1, $t1, 0x0024 ## $t1 = DB060024 @@ -63,14 +63,14 @@ glabel func_80B08258 /* 00E0C 80B0834C AE1902C0 */ sw $t9, 0x02C0($s0) ## 000002C0 /* 00E10 80B08350 AC490000 */ sw $t1, 0x0000($v0) ## 00000000 /* 00E14 80B08354 8E240000 */ lw $a0, 0x0000($s1) ## 00000000 -/* 00E18 80B08358 AFAA0010 */ sw $t2, 0x0010($sp) +/* 00E18 80B08358 AFAA0010 */ sw $t2, 0x0010($sp) /* 00E1C 80B0835C 240500BE */ addiu $a1, $zero, 0x00BE ## $a1 = 000000BE /* 00E20 80B08360 2406006E */ addiu $a2, $zero, 0x006E ## $a2 = 0000006E /* 00E24 80B08364 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 00E28 80B08368 0C2C207B */ jal func_80B081EC -/* 00E2C 80B0836C AFA20044 */ sw $v0, 0x0044($sp) -/* 00E30 80B08370 8FA30044 */ lw $v1, 0x0044($sp) -/* 00E34 80B08374 1000000D */ beq $zero, $zero, .L80B083AC +/* 00E28 80B08368 0C2C207B */ jal func_80B081EC +/* 00E2C 80B0836C AFA20044 */ sw $v0, 0x0044($sp) +/* 00E30 80B08370 8FA30044 */ lw $v1, 0x0044($sp) +/* 00E34 80B08374 1000000D */ beq $zero, $zero, .L80B083AC /* 00E38 80B08378 AC620004 */ sw $v0, 0x0004($v1) ## 00000004 .L80B0837C: /* 00E3C 80B0837C 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 @@ -80,10 +80,10 @@ glabel func_80B08258 /* 00E4C 80B0838C AE0B02C0 */ sw $t3, 0x02C0($s0) ## 000002C0 /* 00E50 80B08390 AC4C0000 */ sw $t4, 0x0000($v0) ## 00000000 /* 00E54 80B08394 8E240000 */ lw $a0, 0x0000($s1) ## 00000000 -/* 00E58 80B08398 AFAD0010 */ sw $t5, 0x0010($sp) -/* 00E5C 80B0839C 0C2C207B */ jal func_80B081EC -/* 00E60 80B083A0 AFA20040 */ sw $v0, 0x0040($sp) -/* 00E64 80B083A4 8FA30040 */ lw $v1, 0x0040($sp) +/* 00E58 80B08398 AFAD0010 */ sw $t5, 0x0010($sp) +/* 00E5C 80B0839C 0C2C207B */ jal func_80B081EC +/* 00E60 80B083A0 AFA20040 */ sw $v0, 0x0040($sp) +/* 00E64 80B083A4 8FA30040 */ lw $v1, 0x0040($sp) /* 00E68 80B083A8 AC620004 */ sw $v0, 0x0004($v1) ## 00000004 .L80B083AC: /* 00E6C 80B083AC 8E45019C */ lw $a1, 0x019C($s2) ## 0000019C @@ -93,22 +93,22 @@ glabel func_80B08258 /* 00E7C 80B083BC 3C0F80B1 */ lui $t7, %hi(func_80B0813C) ## $t7 = 80B10000 /* 00E80 80B083C0 25EF813C */ addiu $t7, $t7, %lo(func_80B0813C) ## $t7 = 80B0813C /* 00E84 80B083C4 25CE7FE0 */ addiu $t6, $t6, %lo(func_80B07FE0) ## $t6 = 80B07FE0 -/* 00E88 80B083C8 AFAE0010 */ sw $t6, 0x0010($sp) -/* 00E8C 80B083CC AFAF0014 */ sw $t7, 0x0014($sp) -/* 00E90 80B083D0 AFB20018 */ sw $s2, 0x0018($sp) -/* 00E94 80B083D4 0C0286B2 */ jal func_800A1AC8 +/* 00E88 80B083C8 AFAE0010 */ sw $t6, 0x0010($sp) +/* 00E8C 80B083CC AFAF0014 */ sw $t7, 0x0014($sp) +/* 00E90 80B083D0 AFB20018 */ sw $s2, 0x0018($sp) +/* 00E94 80B083D4 0C0286B2 */ jal SkelAnime_DrawSV /* 00E98 80B083D8 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 00E9C 80B083DC 3C0680B1 */ lui $a2, %hi(D_80B0B580) ## $a2 = 80B10000 /* 00EA0 80B083E0 24C6B580 */ addiu $a2, $a2, %lo(D_80B0B580) ## $a2 = 80B0B580 /* 00EA4 80B083E4 27A4004C */ addiu $a0, $sp, 0x004C ## $a0 = FFFFFFE4 /* 00EA8 80B083E8 8E250000 */ lw $a1, 0x0000($s1) ## 00000000 -/* 00EAC 80B083EC 0C031AD5 */ jal func_800C6B54 +/* 00EAC 80B083EC 0C031AD5 */ jal Graph_CloseDisps /* 00EB0 80B083F0 24070880 */ addiu $a3, $zero, 0x0880 ## $a3 = 00000880 -/* 00EB4 80B083F4 8FBF0034 */ lw $ra, 0x0034($sp) -/* 00EB8 80B083F8 8FB00028 */ lw $s0, 0x0028($sp) -/* 00EBC 80B083FC 8FB1002C */ lw $s1, 0x002C($sp) -/* 00EC0 80B08400 8FB20030 */ lw $s2, 0x0030($sp) -/* 00EC4 80B08404 03E00008 */ jr $ra +/* 00EB4 80B083F4 8FBF0034 */ lw $ra, 0x0034($sp) +/* 00EB8 80B083F8 8FB00028 */ lw $s0, 0x0028($sp) +/* 00EBC 80B083FC 8FB1002C */ lw $s1, 0x002C($sp) +/* 00EC0 80B08400 8FB20030 */ lw $s2, 0x0030($sp) +/* 00EC4 80B08404 03E00008 */ jr $ra /* 00EC8 80B08408 27BD0068 */ addiu $sp, $sp, 0x0068 ## $sp = 00000000 /* 00ECC 80B0840C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Stream/EnStream_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Stream/EnStream_Draw.s index 370363228b..996e133539 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Stream/EnStream_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Stream/EnStream_Draw.s @@ -14,7 +14,7 @@ glabel EnStream_Draw /* 003DC 80B0BB7C 24C6BCD0 */ addiu $a2, $a2, %lo(D_80B0BCD0) ## $a2 = 80B0BCD0 /* 003E0 80B0BB80 27A40054 */ addiu $a0, $sp, 0x0054 ## $a0 = FFFFFFE4 /* 003E4 80B0BB84 24070127 */ addiu $a3, $zero, 0x0127 ## $a3 = 00000127 -/* 003E8 80B0BB88 0C031AB1 */ jal func_800C6AC4 +/* 003E8 80B0BB88 0C031AB1 */ jal Graph_OpenDisps /* 003EC 80B0BB8C 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 /* 003F0 80B0BB90 0C024F61 */ jal func_80093D84 /* 003F4 80B0BB94 8E240000 */ lw $a0, 0x0000($s1) ## 00000000 @@ -60,7 +60,7 @@ glabel EnStream_Draw /* 00494 80B0BC34 AFA3001C */ sw $v1, 0x001C($sp) /* 00498 80B0BC38 AFAB0010 */ sw $t3, 0x0010($sp) /* 0049C 80B0BC3C 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 004A0 80B0BC40 0C0253D0 */ jal Draw_TwoTexScroll +/* 004A0 80B0BC40 0C0253D0 */ jal Gfx_TwoTexScroll /* 004A4 80B0BC44 AFA2004C */ sw $v0, 0x004C($sp) /* 004A8 80B0BC48 8FA8004C */ lw $t0, 0x004C($sp) /* 004AC 80B0BC4C 3C0A0600 */ lui $t2, 0x0600 ## $t2 = 06000000 @@ -76,7 +76,7 @@ glabel EnStream_Draw /* 004D4 80B0BC74 8E250000 */ lw $a1, 0x0000($s1) ## 00000000 /* 004D8 80B0BC78 24C6BCF8 */ addiu $a2, $a2, %lo(D_80B0BCF8) ## $a2 = 80B0BCF8 /* 004DC 80B0BC7C 27A40054 */ addiu $a0, $sp, 0x0054 ## $a0 = FFFFFFE4 -/* 004E0 80B0BC80 0C031AD5 */ jal func_800C6B54 +/* 004E0 80B0BC80 0C031AD5 */ jal Graph_CloseDisps /* 004E4 80B0BC84 24070136 */ addiu $a3, $zero, 0x0136 ## $a3 = 00000136 /* 004E8 80B0BC88 8FBF003C */ lw $ra, 0x003C($sp) /* 004EC 80B0BC8C 8FB00034 */ lw $s0, 0x0034($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Stream/func_80B0B934.s b/asm/non_matchings/overlays/actors/ovl_En_Stream/func_80B0B934.s index 2b4782b61d..a31f7c8c64 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Stream/func_80B0B934.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Stream/func_80B0B934.s @@ -29,7 +29,7 @@ glabel func_80B0B934 /* 00200 80B0B9A0 46000084 */ sqrt.s $f2, $f0 /* 00204 80B0B9A4 46065401 */ sub.s $f16, $f10, $f6 /* 00208 80B0B9A8 E7A20038 */ swc1 $f2, 0x0038($sp) -/* 0020C 80B0B9AC 0C03F494 */ jal func_800FD250 +/* 0020C 80B0B9AC 0C03F494 */ jal Math_atan2f /* 00210 80B0B9B0 E7B00034 */ swc1 $f16, 0x0034($sp) /* 00214 80B0B9B4 3C014040 */ lui $at, 0x4040 ## $at = 40400000 /* 00218 80B0B9B8 44816000 */ mtc1 $at, $f12 ## $f12 = 3.00 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Sw/func_80B0BE20.s b/asm/non_matchings/overlays/actors/ovl_En_Sw/func_80B0BE20.s index 8141668b65..c5037912dc 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Sw/func_80B0BE20.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Sw/func_80B0BE20.s @@ -32,7 +32,7 @@ glabel func_80B0BE20 /* 000E8 80B0BE98 C492036C */ lwc1 $f18, 0x036C($a0) ## 0000036C /* 000EC 80B0BE9C 46125182 */ mul.s $f6, $f10, $f18 /* 000F0 80B0BEA0 46102200 */ add.s $f8, $f4, $f16 -/* 000F4 80B0BEA4 0C03F4DA */ jal func_800FD368 +/* 000F4 80B0BEA4 0C03F4DA */ jal Math_acosf /* 000F8 80B0BEA8 46064300 */ add.s $f12, $f8, $f6 /* 000FC 80B0BEAC 26040364 */ addiu $a0, $s0, 0x0364 ## $a0 = 00000364 /* 00100 80B0BEB0 E7A00034 */ swc1 $f0, 0x0034($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Sw/func_80B0DFFC.s b/asm/non_matchings/overlays/actors/ovl_En_Sw/func_80B0DFFC.s index 7a766afcdf..88e9ffcb1c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Sw/func_80B0DFFC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Sw/func_80B0DFFC.s @@ -150,7 +150,7 @@ glabel func_80B0DFFC /* 02478 80B0E228 44892000 */ mtc1 $t1, $f4 ## $f4 = 0.00 /* 0247C 80B0E22C 448C3000 */ mtc1 $t4, $f6 ## $f6 = 0.00 /* 02480 80B0E230 46802320 */ cvt.s.w $f12, $f4 -/* 02484 80B0E234 0C03F494 */ jal func_800FD250 +/* 02484 80B0E234 0C03F494 */ jal Math_atan2f /* 02488 80B0E238 468033A0 */ cvt.s.w $f14, $f6 /* 0248C 80B0E23C 3C0180B1 */ lui $at, %hi(D_80B0F238) ## $at = 80B10000 /* 02490 80B0E240 C428F238 */ lwc1 $f8, %lo(D_80B0F238)($at) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Sw/func_80B0EAC4.s b/asm/non_matchings/overlays/actors/ovl_En_Sw/func_80B0EAC4.s index 7afa4af965..8ba67a3394 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Sw/func_80B0EAC4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Sw/func_80B0EAC4.s @@ -67,7 +67,7 @@ glabel func_80B0EAC4 /* 02E18 80B0EBC8 8D050000 */ lw $a1, 0x0000($t0) ## FFFFFFE8 /* 02E1C 80B0EBCC 24070824 */ addiu $a3, $zero, 0x0824 ## $a3 = 00000824 /* 02E20 80B0EBD0 27A40028 */ addiu $a0, $sp, 0x0028 ## $a0 = FFFFFFA0 -/* 02E24 80B0EBD4 0C031AB1 */ jal func_800C6AC4 +/* 02E24 80B0EBD4 0C031AB1 */ jal Graph_OpenDisps /* 02E28 80B0EBD8 AFA50038 */ sw $a1, 0x0038($sp) /* 02E2C 80B0EBDC 8FB1009C */ lw $s1, 0x009C($sp) /* 02E30 80B0EBE0 8FA6008C */ lw $a2, 0x008C($sp) @@ -191,7 +191,7 @@ glabel L80B0ECB8 /* 02FC8 80B0ED78 24C6F1B0 */ addiu $a2, $a2, %lo(D_80B0F1B0) ## $a2 = 80B0F1B0 /* 02FCC 80B0ED7C 27A40028 */ addiu $a0, $sp, 0x0028 ## $a0 = FFFFFFA0 /* 02FD0 80B0ED80 24070861 */ addiu $a3, $zero, 0x0861 ## $a3 = 00000861 -/* 02FD4 80B0ED84 0C031AD5 */ jal func_800C6B54 +/* 02FD4 80B0ED84 0C031AD5 */ jal Graph_CloseDisps /* 02FD8 80B0ED88 8F050000 */ lw $a1, 0x0000($t8) ## 00000000 /* 02FDC 80B0ED8C 8FBF001C */ lw $ra, 0x001C($sp) /* 02FE0 80B0ED90 8FB00014 */ lw $s0, 0x0014($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Sw/func_80B0EDB8.s b/asm/non_matchings/overlays/actors/ovl_En_Sw/func_80B0EDB8.s index 1b7ac1b25c..63def911a9 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Sw/func_80B0EDB8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Sw/func_80B0EDB8.s @@ -10,7 +10,7 @@ glabel func_80B0EDB8 /* 03028 80B0EDD8 24C6F1C0 */ addiu $a2, $a2, %lo(D_80B0F1C0) ## $a2 = 80B0F1C0 /* 0302C 80B0EDDC 27A40030 */ addiu $a0, $sp, 0x0030 ## $a0 = FFFFFFE8 /* 03030 80B0EDE0 24070885 */ addiu $a3, $zero, 0x0885 ## $a3 = 00000885 -/* 03034 80B0EDE4 0C031AB1 */ jal func_800C6AC4 +/* 03034 80B0EDE4 0C031AB1 */ jal Graph_OpenDisps /* 03038 80B0EDE8 AFA50040 */ sw $a1, 0x0040($sp) /* 0303C 80B0EDEC 87A30056 */ lh $v1, 0x0056($sp) /* 03040 80B0EDF0 3C0180B1 */ lui $at, %hi(D_80B0F2B4) ## $at = 80B10000 @@ -44,7 +44,7 @@ glabel func_80B0EDB8 /* 030AC 80B0EE5C 000B6403 */ sra $t4, $t3, 16 /* 030B0 80B0EE60 AFAC0018 */ sw $t4, 0x0018($sp) /* 030B4 80B0EE64 AFA00014 */ sw $zero, 0x0014($sp) -/* 030B8 80B0EE68 0C024DC2 */ jal func_80093708 +/* 030B8 80B0EE68 0C024DC2 */ jal Gfx_SetFog2 /* 030BC 80B0EE6C AFA80010 */ sw $t0, 0x0010($sp) /* 030C0 80B0EE70 8FAD0040 */ lw $t5, 0x0040($sp) /* 030C4 80B0EE74 3C0680B1 */ lui $a2, %hi(D_80B0F1D0) ## $a2 = 80B10000 @@ -53,7 +53,7 @@ glabel func_80B0EDB8 /* 030D0 80B0EE80 8FAE0048 */ lw $t6, 0x0048($sp) /* 030D4 80B0EE84 27A40030 */ addiu $a0, $sp, 0x0030 ## $a0 = FFFFFFE8 /* 030D8 80B0EE88 24070895 */ addiu $a3, $zero, 0x0895 ## $a3 = 00000895 -/* 030DC 80B0EE8C 0C031AD5 */ jal func_800C6B54 +/* 030DC 80B0EE8C 0C031AD5 */ jal Graph_CloseDisps /* 030E0 80B0EE90 8DC50000 */ lw $a1, 0x0000($t6) ## 00000000 /* 030E4 80B0EE94 8FBF0024 */ lw $ra, 0x0024($sp) /* 030E8 80B0EE98 27BD0048 */ addiu $sp, $sp, 0x0048 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Sw/func_80B0EEA4.s b/asm/non_matchings/overlays/actors/ovl_En_Sw/func_80B0EEA4.s index cdaccef836..e37d132f70 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Sw/func_80B0EEA4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Sw/func_80B0EEA4.s @@ -7,7 +7,7 @@ glabel func_80B0EEA4 /* 03108 80B0EEB8 24C6F1E0 */ addiu $a2, $a2, %lo(D_80B0F1E0) ## $a2 = 80B0F1E0 /* 0310C 80B0EEBC 27A40020 */ addiu $a0, $sp, 0x0020 ## $a0 = FFFFFFE8 /* 03110 80B0EEC0 2407089D */ addiu $a3, $zero, 0x089D ## $a3 = 0000089D -/* 03114 80B0EEC4 0C031AB1 */ jal func_800C6AC4 +/* 03114 80B0EEC4 0C031AB1 */ jal Graph_OpenDisps /* 03118 80B0EEC8 AFA50030 */ sw $a1, 0x0030($sp) /* 0311C 80B0EECC 8FAF0030 */ lw $t7, 0x0030($sp) /* 03120 80B0EED0 8FA40038 */ lw $a0, 0x0038($sp) @@ -20,7 +20,7 @@ glabel func_80B0EEA4 /* 0313C 80B0EEEC 8FB90038 */ lw $t9, 0x0038($sp) /* 03140 80B0EEF0 27A40020 */ addiu $a0, $sp, 0x0020 ## $a0 = FFFFFFE8 /* 03144 80B0EEF4 2407089F */ addiu $a3, $zero, 0x089F ## $a3 = 0000089F -/* 03148 80B0EEF8 0C031AD5 */ jal func_800C6B54 +/* 03148 80B0EEF8 0C031AD5 */ jal Graph_CloseDisps /* 0314C 80B0EEFC 8F250000 */ lw $a1, 0x0000($t9) ## 00000000 /* 03150 80B0EF00 8FBF0014 */ lw $ra, 0x0014($sp) /* 03154 80B0EF04 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Syateki_Man/EnSyatekiMan_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Syateki_Man/EnSyatekiMan_Draw.s index eb757e895c..6de4144394 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Syateki_Man/EnSyatekiMan_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Syateki_Man/EnSyatekiMan_Draw.s @@ -1,24 +1,24 @@ glabel EnSyatekiMan_Draw /* 00CA8 80B11518 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 00CAC 80B1151C AFBF0024 */ sw $ra, 0x0024($sp) -/* 00CB0 80B11520 AFA40028 */ sw $a0, 0x0028($sp) -/* 00CB4 80B11524 AFA5002C */ sw $a1, 0x002C($sp) -/* 00CB8 80B11528 0C024F46 */ jal func_80093D18 +/* 00CAC 80B1151C AFBF0024 */ sw $ra, 0x0024($sp) +/* 00CB0 80B11520 AFA40028 */ sw $a0, 0x0028($sp) +/* 00CB4 80B11524 AFA5002C */ sw $a1, 0x002C($sp) +/* 00CB8 80B11528 0C024F46 */ jal func_80093D18 /* 00CBC 80B1152C 8CA40000 */ lw $a0, 0x0000($a1) ## 00000000 -/* 00CC0 80B11530 8FA20028 */ lw $v0, 0x0028($sp) +/* 00CC0 80B11530 8FA20028 */ lw $v0, 0x0028($sp) /* 00CC4 80B11534 3C0F80B1 */ lui $t7, %hi(func_80B1148C) ## $t7 = 80B10000 /* 00CC8 80B11538 25EF148C */ addiu $t7, $t7, %lo(func_80B1148C) ## $t7 = 80B1148C /* 00CCC 80B1153C 8C450150 */ lw $a1, 0x0150($v0) ## 00000150 /* 00CD0 80B11540 8C46016C */ lw $a2, 0x016C($v0) ## 0000016C /* 00CD4 80B11544 9047014E */ lbu $a3, 0x014E($v0) ## 0000014E -/* 00CD8 80B11548 AFA00014 */ sw $zero, 0x0014($sp) -/* 00CDC 80B1154C AFAF0010 */ sw $t7, 0x0010($sp) -/* 00CE0 80B11550 8FA4002C */ lw $a0, 0x002C($sp) -/* 00CE4 80B11554 0C0286B2 */ jal func_800A1AC8 -/* 00CE8 80B11558 AFA20018 */ sw $v0, 0x0018($sp) -/* 00CEC 80B1155C 8FBF0024 */ lw $ra, 0x0024($sp) +/* 00CD8 80B11548 AFA00014 */ sw $zero, 0x0014($sp) +/* 00CDC 80B1154C AFAF0010 */ sw $t7, 0x0010($sp) +/* 00CE0 80B11550 8FA4002C */ lw $a0, 0x002C($sp) +/* 00CE4 80B11554 0C0286B2 */ jal SkelAnime_DrawSV +/* 00CE8 80B11558 AFA20018 */ sw $v0, 0x0018($sp) +/* 00CEC 80B1155C 8FBF0024 */ lw $ra, 0x0024($sp) /* 00CF0 80B11560 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 00CF4 80B11564 03E00008 */ jr $ra +/* 00CF4 80B11564 03E00008 */ jr $ra /* 00CF8 80B11568 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Syateki_Man/EnSyatekiMan_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Syateki_Man/EnSyatekiMan_Init.s index 35d8b39f81..d5331fe24b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Syateki_Man/EnSyatekiMan_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Syateki_Man/EnSyatekiMan_Init.s @@ -1,42 +1,42 @@ glabel EnSyatekiMan_Init /* 00000 80B10870 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 00004 80B10874 AFB00028 */ sw $s0, 0x0028($sp) +/* 00004 80B10874 AFB00028 */ sw $s0, 0x0028($sp) /* 00008 80B10878 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 0000C 80B1087C AFBF002C */ sw $ra, 0x002C($sp) +/* 0000C 80B1087C AFBF002C */ sw $ra, 0x002C($sp) /* 00010 80B10880 3C0480B1 */ lui $a0, %hi(D_80B116A0) ## $a0 = 80B10000 -/* 00014 80B10884 AFA50034 */ sw $a1, 0x0034($sp) +/* 00014 80B10884 AFA50034 */ sw $a1, 0x0034($sp) /* 00018 80B10888 0C00084C */ jal osSyncPrintf - + /* 0001C 80B1088C 248416A0 */ addiu $a0, $a0, %lo(D_80B116A0) ## $a0 = 80B116A0 /* 00020 80B10890 3C0480B1 */ lui $a0, %hi(D_80B116A4) ## $a0 = 80B10000 /* 00024 80B10894 0C00084C */ jal osSyncPrintf - + /* 00028 80B10898 248416A4 */ addiu $a0, $a0, %lo(D_80B116A4) ## $a0 = 80B116A4 /* 0002C 80B1089C 240E0001 */ addiu $t6, $zero, 0x0001 ## $t6 = 00000001 /* 00030 80B108A0 3C053C23 */ lui $a1, 0x3C23 ## $a1 = 3C230000 /* 00034 80B108A4 A20E001F */ sb $t6, 0x001F($s0) ## 0000001F /* 00038 80B108A8 34A5D70A */ ori $a1, $a1, 0xD70A ## $a1 = 3C23D70A /* 0003C 80B108AC 0C00B58B */ jal Actor_SetScale - + /* 00040 80B108B0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 00044 80B108B4 3C060601 */ lui $a2, 0x0601 ## $a2 = 06010000 /* 00048 80B108B8 3C070600 */ lui $a3, 0x0600 ## $a3 = 06000000 /* 0004C 80B108BC 260F0190 */ addiu $t7, $s0, 0x0190 ## $t7 = 00000190 /* 00050 80B108C0 261801C6 */ addiu $t8, $s0, 0x01C6 ## $t8 = 000001C6 /* 00054 80B108C4 24190009 */ addiu $t9, $zero, 0x0009 ## $t9 = 00000009 -/* 00058 80B108C8 AFB90018 */ sw $t9, 0x0018($sp) -/* 0005C 80B108CC AFB80014 */ sw $t8, 0x0014($sp) -/* 00060 80B108D0 AFAF0010 */ sw $t7, 0x0010($sp) +/* 00058 80B108C8 AFB90018 */ sw $t9, 0x0018($sp) +/* 0005C 80B108CC AFB80014 */ sw $t8, 0x0014($sp) +/* 00060 80B108D0 AFAF0010 */ sw $t7, 0x0010($sp) /* 00064 80B108D4 24E70338 */ addiu $a3, $a3, 0x0338 ## $a3 = 06000338 /* 00068 80B108D8 24C69B38 */ addiu $a2, $a2, 0x9B38 ## $a2 = 06009B38 -/* 0006C 80B108DC 8FA40034 */ lw $a0, 0x0034($sp) -/* 00070 80B108E0 0C0291BE */ jal func_800A46F8 +/* 0006C 80B108DC 8FA40034 */ lw $a0, 0x0034($sp) +/* 00070 80B108E0 0C0291BE */ jal SkelAnime_InitSV /* 00074 80B108E4 2605014C */ addiu $a1, $s0, 0x014C ## $a1 = 0000014C /* 00078 80B108E8 3C088016 */ lui $t0, 0x8016 ## $t0 = 80160000 /* 0007C 80B108EC 8D08E664 */ lw $t0, -0x199C($t0) ## 8015E664 /* 00080 80B108F0 3C0B80B1 */ lui $t3, %hi(func_80B11310) ## $t3 = 80B10000 /* 00084 80B108F4 240A0014 */ addiu $t2, $zero, 0x0014 ## $t2 = 00000014 -/* 00088 80B108F8 11000003 */ beq $t0, $zero, .L80B10908 +/* 00088 80B108F8 11000003 */ beq $t0, $zero, .L80B10908 /* 0008C 80B108FC 256B1310 */ addiu $t3, $t3, %lo(func_80B11310) ## $t3 = 80B11310 /* 00090 80B10900 24090014 */ addiu $t1, $zero, 0x0014 ## $t1 = 00000014 /* 00094 80B10904 A6090204 */ sh $t1, 0x0204($s0) ## 00000204 @@ -49,10 +49,10 @@ glabel EnSyatekiMan_Init /* 000AC 80B1091C AE0B0224 */ sw $t3, 0x0224($s0) ## 00000224 /* 000B0 80B10920 A60C00A8 */ sh $t4, 0x00A8($s0) ## 000000A8 /* 000B4 80B10924 AE0D01FC */ sw $t5, 0x01FC($s0) ## 000001FC -/* 000B8 80B10928 8FBF002C */ lw $ra, 0x002C($sp) -/* 000BC 80B1092C 8FB00028 */ lw $s0, 0x0028($sp) +/* 000B8 80B10928 8FBF002C */ lw $ra, 0x002C($sp) +/* 000BC 80B1092C 8FB00028 */ lw $s0, 0x0028($sp) /* 000C0 80B10930 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 000C4 80B10934 03E00008 */ jr $ra +/* 000C4 80B10934 03E00008 */ jr $ra /* 000C8 80B10938 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Syateki_Man/func_80B10948.s b/asm/non_matchings/overlays/actors/ovl_En_Syateki_Man/func_80B10948.s index 6c08ae6e7e..ae6783924c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Syateki_Man/func_80B10948.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Syateki_Man/func_80B10948.s @@ -1,42 +1,42 @@ glabel func_80B10948 /* 000D8 80B10948 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 000DC 80B1094C AFA40028 */ sw $a0, 0x0028($sp) -/* 000E0 80B10950 AFBF0024 */ sw $ra, 0x0024($sp) +/* 000DC 80B1094C AFA40028 */ sw $a0, 0x0028($sp) +/* 000E0 80B10950 AFBF0024 */ sw $ra, 0x0024($sp) /* 000E4 80B10954 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 -/* 000E8 80B10958 AFA5002C */ sw $a1, 0x002C($sp) +/* 000E8 80B10958 AFA5002C */ sw $a1, 0x002C($sp) /* 000EC 80B1095C 0C028800 */ jal SkelAnime_GetFrameCount - + /* 000F0 80B10960 24840338 */ addiu $a0, $a0, 0x0338 ## $a0 = 06000338 /* 000F4 80B10964 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 000F8 80B10968 3C01C120 */ lui $at, 0xC120 ## $at = C1200000 /* 000FC 80B1096C 44819000 */ mtc1 $at, $f18 ## $f18 = -10.00 -/* 00100 80B10970 468021A0 */ cvt.s.w $f6, $f4 -/* 00104 80B10974 8FA40028 */ lw $a0, 0x0028($sp) +/* 00100 80B10970 468021A0 */ cvt.s.w $f6, $f4 +/* 00104 80B10974 8FA40028 */ lw $a0, 0x0028($sp) /* 00108 80B10978 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 0010C 80B1097C 24A50338 */ addiu $a1, $a1, 0x0338 ## $a1 = 06000338 /* 00110 80B10980 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 00114 80B10984 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 00118 80B10988 4600320D */ trunc.w.s $f8, $f6 -/* 0011C 80B1098C AFA00014 */ sw $zero, 0x0014($sp) -/* 00120 80B10990 E7B20018 */ swc1 $f18, 0x0018($sp) +/* 00118 80B10988 4600320D */ trunc.w.s $f8, $f6 +/* 0011C 80B1098C AFA00014 */ sw $zero, 0x0014($sp) +/* 00120 80B10990 E7B20018 */ swc1 $f18, 0x0018($sp) /* 00124 80B10994 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 00128 80B10998 440F4000 */ mfc1 $t7, $f8 +/* 00128 80B10998 440F4000 */ mfc1 $t7, $f8 /* 0012C 80B1099C 00000000 */ nop -/* 00130 80B109A0 000FC400 */ sll $t8, $t7, 16 -/* 00134 80B109A4 0018CC03 */ sra $t9, $t8, 16 +/* 00130 80B109A0 000FC400 */ sll $t8, $t7, 16 +/* 00134 80B109A4 0018CC03 */ sra $t9, $t8, 16 /* 00138 80B109A8 44995000 */ mtc1 $t9, $f10 ## $f10 = 0.00 /* 0013C 80B109AC 00000000 */ nop -/* 00140 80B109B0 46805420 */ cvt.s.w $f16, $f10 -/* 00144 80B109B4 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 00148 80B109B8 E7B00010 */ swc1 $f16, 0x0010($sp) -/* 0014C 80B109BC 8FA90028 */ lw $t1, 0x0028($sp) +/* 00140 80B109B0 46805420 */ cvt.s.w $f16, $f10 +/* 00144 80B109B4 0C029468 */ jal SkelAnime_ChangeAnim + +/* 00148 80B109B8 E7B00010 */ swc1 $f16, 0x0010($sp) +/* 0014C 80B109BC 8FA90028 */ lw $t1, 0x0028($sp) /* 00150 80B109C0 3C0880B1 */ lui $t0, %hi(func_80B109DC) ## $t0 = 80B10000 /* 00154 80B109C4 250809DC */ addiu $t0, $t0, %lo(func_80B109DC) ## $t0 = 80B109DC /* 00158 80B109C8 AD2801FC */ sw $t0, 0x01FC($t1) ## 000001FC -/* 0015C 80B109CC 8FBF0024 */ lw $ra, 0x0024($sp) +/* 0015C 80B109CC 8FBF0024 */ lw $ra, 0x0024($sp) /* 00160 80B109D0 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 00164 80B109D4 03E00008 */ jr $ra +/* 00164 80B109D4 03E00008 */ jr $ra /* 00168 80B109D8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Syateki_Niw/EnSyatekiNiw_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Syateki_Niw/EnSyatekiNiw_Draw.s index 5332f227cf..131532dee4 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Syateki_Niw/EnSyatekiNiw_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Syateki_Niw/EnSyatekiNiw_Draw.s @@ -1,25 +1,25 @@ glabel EnSyatekiNiw_Draw /* 01820 80B13110 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 /* 01824 80B13114 3C0E80B1 */ lui $t6, %hi(D_80B136DC) ## $t6 = 80B10000 -/* 01828 80B13118 8DCE36DC */ lw $t6, %lo(D_80B136DC)($t6) -/* 0182C 80B1311C AFBF002C */ sw $ra, 0x002C($sp) -/* 01830 80B13120 AFB10028 */ sw $s1, 0x0028($sp) -/* 01834 80B13124 AFB00024 */ sw $s0, 0x0024($sp) -/* 01838 80B13128 AFAE0030 */ sw $t6, 0x0030($sp) +/* 01828 80B13118 8DCE36DC */ lw $t6, %lo(D_80B136DC)($t6) +/* 0182C 80B1311C AFBF002C */ sw $ra, 0x002C($sp) +/* 01830 80B13120 AFB10028 */ sw $s1, 0x0028($sp) +/* 01834 80B13124 AFB00024 */ sw $s0, 0x0024($sp) +/* 01838 80B13128 AFAE0030 */ sw $t6, 0x0030($sp) /* 0183C 80B1312C 8C980250 */ lw $t8, 0x0250($a0) ## 00000250 /* 01840 80B13130 3C0F80B1 */ lui $t7, %hi(func_80B128F8) ## $t7 = 80B10000 /* 01844 80B13134 25EF28F8 */ addiu $t7, $t7, %lo(func_80B128F8) ## $t7 = 80B128F8 /* 01848 80B13138 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 0184C 80B1313C 11F80019 */ beq $t7, $t8, .L80B131A4 +/* 0184C 80B1313C 11F80019 */ beq $t7, $t8, .L80B131A4 /* 01850 80B13140 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 -/* 01854 80B13144 0C024F46 */ jal func_80093D18 +/* 01854 80B13144 0C024F46 */ jal func_80093D18 /* 01858 80B13148 8CA40000 */ lw $a0, 0x0000($a1) ## 00000000 /* 0185C 80B1314C 86190260 */ lh $t9, 0x0260($s0) ## 00000260 /* 01860 80B13150 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 01864 80B13154 27A50030 */ addiu $a1, $sp, 0x0030 ## $a1 = FFFFFFF8 -/* 01868 80B13158 13200003 */ beq $t9, $zero, .L80B13168 +/* 01868 80B13158 13200003 */ beq $t9, $zero, .L80B13168 /* 0186C 80B1315C 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 01870 80B13160 0C00988C */ jal func_80026230 +/* 01870 80B13160 0C00988C */ jal func_80026230 /* 01874 80B13164 24070014 */ addiu $a3, $zero, 0x0014 ## $a3 = 00000014 .L80B13168: /* 01878 80B13168 8E050150 */ lw $a1, 0x0150($s0) ## 00000150 @@ -27,21 +27,21 @@ glabel EnSyatekiNiw_Draw /* 01880 80B13170 9207014E */ lbu $a3, 0x014E($s0) ## 0000014E /* 01884 80B13174 3C0880B1 */ lui $t0, %hi(func_80B12FE0) ## $t0 = 80B10000 /* 01888 80B13178 25082FE0 */ addiu $t0, $t0, %lo(func_80B12FE0) ## $t0 = 80B12FE0 -/* 0188C 80B1317C AFA80010 */ sw $t0, 0x0010($sp) -/* 01890 80B13180 AFB00018 */ sw $s0, 0x0018($sp) -/* 01894 80B13184 AFA00014 */ sw $zero, 0x0014($sp) -/* 01898 80B13188 0C0286B2 */ jal func_800A1AC8 +/* 0188C 80B1317C AFA80010 */ sw $t0, 0x0010($sp) +/* 01890 80B13180 AFB00018 */ sw $s0, 0x0018($sp) +/* 01894 80B13184 AFA00014 */ sw $zero, 0x0014($sp) +/* 01898 80B13188 0C0286B2 */ jal SkelAnime_DrawSV /* 0189C 80B1318C 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 018A0 80B13190 0C009982 */ jal func_80026608 +/* 018A0 80B13190 0C009982 */ jal func_80026608 /* 018A4 80B13194 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 018A8 80B13198 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 018AC 80B1319C 0C2C4D19 */ jal func_80B13464 +/* 018AC 80B1319C 0C2C4D19 */ jal func_80B13464 /* 018B0 80B131A0 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 .L80B131A4: -/* 018B4 80B131A4 8FBF002C */ lw $ra, 0x002C($sp) -/* 018B8 80B131A8 8FB00024 */ lw $s0, 0x0024($sp) -/* 018BC 80B131AC 8FB10028 */ lw $s1, 0x0028($sp) -/* 018C0 80B131B0 03E00008 */ jr $ra +/* 018B4 80B131A4 8FBF002C */ lw $ra, 0x002C($sp) +/* 018B8 80B131A8 8FB00024 */ lw $s0, 0x0024($sp) +/* 018BC 80B131AC 8FB10028 */ lw $s1, 0x0028($sp) +/* 018C0 80B131B0 03E00008 */ jr $ra /* 018C4 80B131B4 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Syateki_Niw/EnSyatekiNiw_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Syateki_Niw/EnSyatekiNiw_Init.s index a13ba64513..36595f9ce3 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Syateki_Niw/EnSyatekiNiw_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Syateki_Niw/EnSyatekiNiw_Init.s @@ -1,89 +1,89 @@ glabel EnSyatekiNiw_Init /* 00000 80B118F0 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 00004 80B118F4 AFA5003C */ sw $a1, 0x003C($sp) -/* 00008 80B118F8 AFBF002C */ sw $ra, 0x002C($sp) -/* 0000C 80B118FC AFB00028 */ sw $s0, 0x0028($sp) +/* 00004 80B118F4 AFA5003C */ sw $a1, 0x003C($sp) +/* 00008 80B118F8 AFBF002C */ sw $ra, 0x002C($sp) +/* 0000C 80B118FC AFB00028 */ sw $s0, 0x0028($sp) /* 00010 80B11900 3C0580B1 */ lui $a1, %hi(D_80B1368C) ## $a1 = 80B10000 /* 00014 80B11904 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 00018 80B11908 0C01E037 */ jal Actor_ProcessInitChain - + /* 0001C 80B1190C 24A5368C */ addiu $a1, $a1, %lo(D_80B1368C) ## $a1 = 80B1368C /* 00020 80B11910 8E0E0004 */ lw $t6, 0x0004($s0) ## 00000004 /* 00024 80B11914 2401FFFE */ addiu $at, $zero, 0xFFFE ## $at = FFFFFFFE /* 00028 80B11918 3C068003 */ lui $a2, 0x8003 ## $a2 = 80030000 -/* 0002C 80B1191C 01C17824 */ and $t7, $t6, $at +/* 0002C 80B1191C 01C17824 */ and $t7, $t6, $at /* 00030 80B11920 AE0F0004 */ sw $t7, 0x0004($s0) ## 00000004 /* 00034 80B11924 24C6B5EC */ addiu $a2, $a2, 0xB5EC ## $a2 = 8002B5EC /* 00038 80B11928 260400B4 */ addiu $a0, $s0, 0x00B4 ## $a0 = 000000B4 /* 0003C 80B1192C 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 /* 00040 80B11930 0C00AC78 */ jal ActorShape_Init - + /* 00044 80B11934 3C0741C8 */ lui $a3, 0x41C8 ## $a3 = 41C80000 /* 00048 80B11938 3C060600 */ lui $a2, 0x0600 ## $a2 = 06000000 /* 0004C 80B1193C 3C070600 */ lui $a3, 0x0600 ## $a3 = 06000000 /* 00050 80B11940 26180190 */ addiu $t8, $s0, 0x0190 ## $t8 = 00000190 /* 00054 80B11944 261901F0 */ addiu $t9, $s0, 0x01F0 ## $t9 = 000001F0 /* 00058 80B11948 24080010 */ addiu $t0, $zero, 0x0010 ## $t0 = 00000010 -/* 0005C 80B1194C AFA80018 */ sw $t0, 0x0018($sp) -/* 00060 80B11950 AFB90014 */ sw $t9, 0x0014($sp) -/* 00064 80B11954 AFB80010 */ sw $t8, 0x0010($sp) +/* 0005C 80B1194C AFA80018 */ sw $t0, 0x0018($sp) +/* 00060 80B11950 AFB90014 */ sw $t9, 0x0014($sp) +/* 00064 80B11954 AFB80010 */ sw $t8, 0x0010($sp) /* 00068 80B11958 24E700E8 */ addiu $a3, $a3, 0x00E8 ## $a3 = 060000E8 /* 0006C 80B1195C 24C62530 */ addiu $a2, $a2, 0x2530 ## $a2 = 06002530 -/* 00070 80B11960 8FA4003C */ lw $a0, 0x003C($sp) -/* 00074 80B11964 0C0291BE */ jal func_800A46F8 +/* 00070 80B11960 8FA4003C */ lw $a0, 0x003C($sp) +/* 00074 80B11964 0C0291BE */ jal SkelAnime_InitSV /* 00078 80B11968 2605014C */ addiu $a1, $s0, 0x014C ## $a1 = 0000014C /* 0007C 80B1196C 8609001C */ lh $t1, 0x001C($s0) ## 0000001C /* 00080 80B11970 260502FC */ addiu $a1, $s0, 0x02FC ## $a1 = 000002FC /* 00084 80B11974 A609029E */ sh $t1, 0x029E($s0) ## 0000029E /* 00088 80B11978 860A029E */ lh $t2, 0x029E($s0) ## 0000029E -/* 0008C 80B1197C 05430003 */ bgezl $t2, .L80B1198C -/* 00090 80B11980 8FA4003C */ lw $a0, 0x003C($sp) +/* 0008C 80B1197C 05430003 */ bgezl $t2, .L80B1198C +/* 00090 80B11980 8FA4003C */ lw $a0, 0x003C($sp) /* 00094 80B11984 A600029E */ sh $zero, 0x029E($s0) ## 0000029E -/* 00098 80B11988 8FA4003C */ lw $a0, 0x003C($sp) +/* 00098 80B11988 8FA4003C */ lw $a0, 0x003C($sp) .L80B1198C: /* 0009C 80B1198C 0C0170D9 */ jal ActorCollider_AllocCylinder - -/* 000A0 80B11990 AFA50030 */ sw $a1, 0x0030($sp) + +/* 000A0 80B11990 AFA50030 */ sw $a1, 0x0030($sp) /* 000A4 80B11994 3C0780B1 */ lui $a3, %hi(D_80B13660) ## $a3 = 80B10000 -/* 000A8 80B11998 8FA50030 */ lw $a1, 0x0030($sp) +/* 000A8 80B11998 8FA50030 */ lw $a1, 0x0030($sp) /* 000AC 80B1199C 24E73660 */ addiu $a3, $a3, %lo(D_80B13660) ## $a3 = 80B13660 -/* 000B0 80B119A0 8FA4003C */ lw $a0, 0x003C($sp) +/* 000B0 80B119A0 8FA4003C */ lw $a0, 0x003C($sp) /* 000B4 80B119A4 0C01712B */ jal ActorCollider_InitCylinder - + /* 000B8 80B119A8 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 000BC 80B119AC 860B029E */ lh $t3, 0x029E($s0) ## 0000029E /* 000C0 80B119B0 3C0480B1 */ lui $a0, %hi(D_80B13710) ## $a0 = 80B10000 -/* 000C4 80B119B4 1560000D */ bne $t3, $zero, .L80B119EC +/* 000C4 80B119B4 1560000D */ bne $t3, $zero, .L80B119EC /* 000C8 80B119B8 00000000 */ nop /* 000CC 80B119BC 3C0480B1 */ lui $a0, %hi(D_80B136E0) ## $a0 = 80B10000 /* 000D0 80B119C0 0C00084C */ jal osSyncPrintf - + /* 000D4 80B119C4 248436E0 */ addiu $a0, $a0, %lo(D_80B136E0) ## $a0 = 80B136E0 /* 000D8 80B119C8 3C0480B1 */ lui $a0, %hi(D_80B136E4) ## $a0 = 80B10000 /* 000DC 80B119CC 0C00084C */ jal osSyncPrintf - + /* 000E0 80B119D0 248436E4 */ addiu $a0, $a0, %lo(D_80B136E4) ## $a0 = 80B136E4 /* 000E4 80B119D4 3C053C23 */ lui $a1, 0x3C23 ## $a1 = 3C230000 /* 000E8 80B119D8 34A5D70A */ ori $a1, $a1, 0xD70A ## $a1 = 3C23D70A /* 000EC 80B119DC 0C00B58B */ jal Actor_SetScale - + /* 000F0 80B119E0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 000F4 80B119E4 1000000D */ beq $zero, $zero, .L80B11A1C +/* 000F4 80B119E4 1000000D */ beq $zero, $zero, .L80B11A1C /* 000F8 80B119E8 26020024 */ addiu $v0, $s0, 0x0024 ## $v0 = 00000024 .L80B119EC: /* 000FC 80B119EC 0C00084C */ jal osSyncPrintf - + /* 00100 80B119F0 24843710 */ addiu $a0, $a0, %lo(D_80B13710) ## $a0 = 00003710 /* 00104 80B119F4 3C0480B1 */ lui $a0, %hi(D_80B13714) ## $a0 = 80B10000 /* 00108 80B119F8 0C00084C */ jal osSyncPrintf - + /* 0010C 80B119FC 24843714 */ addiu $a0, $a0, %lo(D_80B13714) ## $a0 = 80B13714 /* 00110 80B11A00 240C00FF */ addiu $t4, $zero, 0x00FF ## $t4 = 000000FF /* 00114 80B11A04 3C053C23 */ lui $a1, 0x3C23 ## $a1 = 3C230000 /* 00118 80B11A08 A20C00AE */ sb $t4, 0x00AE($s0) ## 000000AE /* 0011C 80B11A0C 34A5D70A */ ori $a1, $a1, 0xD70A ## $a1 = 3C23D70A /* 00120 80B11A10 0C00B58B */ jal Actor_SetScale - + /* 00124 80B11A14 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 00128 80B11A18 26020024 */ addiu $v0, $s0, 0x0024 ## $v0 = 00000024 .L80B11A1C: @@ -102,10 +102,10 @@ glabel EnSyatekiNiw_Init /* 0015C 80B11A4C 8C580008 */ lw $t8, 0x0008($v0) ## 0000002C /* 00160 80B11A50 AE190250 */ sw $t9, 0x0250($s0) ## 00000250 /* 00164 80B11A54 AE1802F0 */ sw $t8, 0x02F0($s0) ## 000002F0 -/* 00168 80B11A58 8FBF002C */ lw $ra, 0x002C($sp) -/* 0016C 80B11A5C 8FB00028 */ lw $s0, 0x0028($sp) +/* 00168 80B11A58 8FBF002C */ lw $ra, 0x002C($sp) +/* 0016C 80B11A5C 8FB00028 */ lw $s0, 0x0028($sp) /* 00170 80B11A60 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 -/* 00174 80B11A64 03E00008 */ jr $ra +/* 00174 80B11A64 03E00008 */ jr $ra /* 00178 80B11A68 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Syateki_Niw/func_80B11DEC.s b/asm/non_matchings/overlays/actors/ovl_En_Syateki_Niw/func_80B11DEC.s index 0ef68d4ca6..907563940b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Syateki_Niw/func_80B11DEC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Syateki_Niw/func_80B11DEC.s @@ -1,42 +1,42 @@ glabel func_80B11DEC /* 004FC 80B11DEC 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 00500 80B11DF0 AFB00028 */ sw $s0, 0x0028($sp) +/* 00500 80B11DF0 AFB00028 */ sw $s0, 0x0028($sp) /* 00504 80B11DF4 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00508 80B11DF8 AFBF002C */ sw $ra, 0x002C($sp) +/* 00508 80B11DF8 AFBF002C */ sw $ra, 0x002C($sp) /* 0050C 80B11DFC 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 -/* 00510 80B11E00 AFA50034 */ sw $a1, 0x0034($sp) +/* 00510 80B11E00 AFA50034 */ sw $a1, 0x0034($sp) /* 00514 80B11E04 0C028800 */ jal SkelAnime_GetFrameCount - + /* 00518 80B11E08 248400E8 */ addiu $a0, $a0, 0x00E8 ## $a0 = 060000E8 /* 0051C 80B11E0C 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 00520 80B11E10 3C01C120 */ lui $at, 0xC120 ## $at = C1200000 /* 00524 80B11E14 44814000 */ mtc1 $at, $f8 ## $f8 = -10.00 -/* 00528 80B11E18 468021A0 */ cvt.s.w $f6, $f4 +/* 00528 80B11E18 468021A0 */ cvt.s.w $f6, $f4 /* 0052C 80B11E1C 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 00530 80B11E20 24A500E8 */ addiu $a1, $a1, 0x00E8 ## $a1 = 060000E8 /* 00534 80B11E24 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C /* 00538 80B11E28 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 0053C 80B11E2C 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 00540 80B11E30 E7A60010 */ swc1 $f6, 0x0010($sp) -/* 00544 80B11E34 AFA00014 */ sw $zero, 0x0014($sp) -/* 00548 80B11E38 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 0054C 80B11E3C E7A80018 */ swc1 $f8, 0x0018($sp) +/* 00540 80B11E30 E7A60010 */ swc1 $f6, 0x0010($sp) +/* 00544 80B11E34 AFA00014 */ sw $zero, 0x0014($sp) +/* 00548 80B11E38 0C029468 */ jal SkelAnime_ChangeAnim + +/* 0054C 80B11E3C E7A80018 */ swc1 $f8, 0x0018($sp) /* 00550 80B11E40 860E029E */ lh $t6, 0x029E($s0) ## 0000029E /* 00554 80B11E44 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00558 80B11E48 11C00003 */ beq $t6, $zero, .L80B11E58 +/* 00558 80B11E48 11C00003 */ beq $t6, $zero, .L80B11E58 /* 0055C 80B11E4C 00000000 */ nop /* 00560 80B11E50 0C00B58B */ jal Actor_SetScale - + /* 00564 80B11E54 8E0502F4 */ lw $a1, 0x02F4($s0) ## 000002F4 .L80B11E58: /* 00568 80B11E58 3C0F80B1 */ lui $t7, %hi(func_80B11E78) ## $t7 = 80B10000 /* 0056C 80B11E5C 25EF1E78 */ addiu $t7, $t7, %lo(func_80B11E78) ## $t7 = 80B11E78 /* 00570 80B11E60 AE0F0250 */ sw $t7, 0x0250($s0) ## 00000250 -/* 00574 80B11E64 8FBF002C */ lw $ra, 0x002C($sp) -/* 00578 80B11E68 8FB00028 */ lw $s0, 0x0028($sp) +/* 00574 80B11E64 8FBF002C */ lw $ra, 0x002C($sp) +/* 00578 80B11E68 8FB00028 */ lw $s0, 0x0028($sp) /* 0057C 80B11E6C 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 00580 80B11E70 03E00008 */ jr $ra +/* 00580 80B11E70 03E00008 */ jr $ra /* 00584 80B11E74 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Syateki_Niw/func_80B11E78.s b/asm/non_matchings/overlays/actors/ovl_En_Syateki_Niw/func_80B11E78.s index 4f063c9aa4..f701bf9c26 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Syateki_Niw/func_80B11E78.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Syateki_Niw/func_80B11E78.s @@ -282,7 +282,7 @@ glabel func_80B11E78 /* 00980 80B12270 A600025C */ sh $zero, 0x025C($s0) ## 0000025C /* 00984 80B12274 A60F0294 */ sh $t7, 0x0294($s0) ## 00000294 .L80B12278: -/* 00988 80B12278 0C03F494 */ jal func_800FD250 +/* 00988 80B12278 0C03F494 */ jal Math_atan2f /* 0098C 80B1227C 00000000 */ nop /* 00990 80B12280 3C0180B1 */ lui $at, %hi(D_80B137D0) ## $at = 80B10000 /* 00994 80B12284 C43237D0 */ lwc1 $f18, %lo(D_80B137D0)($at) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Syateki_Niw/func_80B123A8.s b/asm/non_matchings/overlays/actors/ovl_En_Syateki_Niw/func_80B123A8.s index f7c11eb37b..6d5645bf67 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Syateki_Niw/func_80B123A8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Syateki_Niw/func_80B123A8.s @@ -1,36 +1,36 @@ glabel func_80B123A8 /* 00AB8 80B123A8 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 00ABC 80B123AC AFB00028 */ sw $s0, 0x0028($sp) +/* 00ABC 80B123AC AFB00028 */ sw $s0, 0x0028($sp) /* 00AC0 80B123B0 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00AC4 80B123B4 AFBF002C */ sw $ra, 0x002C($sp) +/* 00AC4 80B123B4 AFBF002C */ sw $ra, 0x002C($sp) /* 00AC8 80B123B8 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 -/* 00ACC 80B123BC AFA50034 */ sw $a1, 0x0034($sp) +/* 00ACC 80B123BC AFA50034 */ sw $a1, 0x0034($sp) /* 00AD0 80B123C0 0C028800 */ jal SkelAnime_GetFrameCount - + /* 00AD4 80B123C4 248400E8 */ addiu $a0, $a0, 0x00E8 ## $a0 = 060000E8 /* 00AD8 80B123C8 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 00ADC 80B123CC 3C01C120 */ lui $at, 0xC120 ## $at = C1200000 /* 00AE0 80B123D0 44814000 */ mtc1 $at, $f8 ## $f8 = -10.00 -/* 00AE4 80B123D4 468021A0 */ cvt.s.w $f6, $f4 +/* 00AE4 80B123D4 468021A0 */ cvt.s.w $f6, $f4 /* 00AE8 80B123D8 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 00AEC 80B123DC 24A500E8 */ addiu $a1, $a1, 0x00E8 ## $a1 = 060000E8 /* 00AF0 80B123E0 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C /* 00AF4 80B123E4 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 00AF8 80B123E8 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 00AFC 80B123EC E7A60010 */ swc1 $f6, 0x0010($sp) -/* 00B00 80B123F0 AFA00014 */ sw $zero, 0x0014($sp) -/* 00B04 80B123F4 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 00B08 80B123F8 E7A80018 */ swc1 $f8, 0x0018($sp) +/* 00AFC 80B123EC E7A60010 */ swc1 $f6, 0x0010($sp) +/* 00B00 80B123F0 AFA00014 */ sw $zero, 0x0014($sp) +/* 00B04 80B123F4 0C029468 */ jal SkelAnime_ChangeAnim + +/* 00B08 80B123F8 E7A80018 */ swc1 $f8, 0x0018($sp) /* 00B0C 80B123FC 3C0180B1 */ lui $at, %hi(D_80B137D8) ## $at = 80B10000 -/* 00B10 80B12400 C42037D8 */ lwc1 $f0, %lo(D_80B137D8)($at) +/* 00B10 80B12400 C42037D8 */ lwc1 $f0, %lo(D_80B137D8)($at) /* 00B14 80B12404 3C0180B1 */ lui $at, %hi(D_80B137DC) ## $at = 80B10000 -/* 00B18 80B12408 C42237DC */ lwc1 $f2, %lo(D_80B137DC)($at) +/* 00B18 80B12408 C42237DC */ lwc1 $f2, %lo(D_80B137DC)($at) /* 00B1C 80B1240C 3C0180B1 */ lui $at, %hi(D_80B137E0) ## $at = 80B10000 /* 00B20 80B12410 E6000288 */ swc1 $f0, 0x0288($s0) ## 00000288 /* 00B24 80B12414 E602027C */ swc1 $f2, 0x027C($s0) ## 0000027C /* 00B28 80B12418 E60202B8 */ swc1 $f2, 0x02B8($s0) ## 000002B8 -/* 00B2C 80B1241C C42A37E0 */ lwc1 $f10, %lo(D_80B137E0)($at) +/* 00B2C 80B1241C C42A37E0 */ lwc1 $f10, %lo(D_80B137E0)($at) /* 00B30 80B12420 3C0E80B1 */ lui $t6, %hi(func_80B12460) ## $t6 = 80B10000 /* 00B34 80B12424 25CE2460 */ addiu $t6, $t6, %lo(func_80B12460) ## $t6 = 80B12460 /* 00B38 80B12428 AE0E0250 */ sw $t6, 0x0250($s0) ## 00000250 @@ -42,10 +42,10 @@ glabel func_80B123A8 /* 00B50 80B12440 E60202AC */ swc1 $f2, 0x02AC($s0) ## 000002AC /* 00B54 80B12444 E6020284 */ swc1 $f2, 0x0284($s0) ## 00000284 /* 00B58 80B12448 E60A02B4 */ swc1 $f10, 0x02B4($s0) ## 000002B4 -/* 00B5C 80B1244C 8FBF002C */ lw $ra, 0x002C($sp) -/* 00B60 80B12450 8FB00028 */ lw $s0, 0x0028($sp) +/* 00B5C 80B1244C 8FBF002C */ lw $ra, 0x002C($sp) +/* 00B60 80B12450 8FB00028 */ lw $s0, 0x0028($sp) /* 00B64 80B12454 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 00B68 80B12458 03E00008 */ jr $ra +/* 00B68 80B12458 03E00008 */ jr $ra /* 00B6C 80B1245C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Syateki_Niw/func_80B12460.s b/asm/non_matchings/overlays/actors/ovl_En_Syateki_Niw/func_80B12460.s index e53808c323..a59bd49017 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Syateki_Niw/func_80B12460.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Syateki_Niw/func_80B12460.s @@ -252,7 +252,7 @@ glabel L80B12798 /* 00F14 80B12804 C606002C */ lwc1 $f6, 0x002C($s0) ## 0000002C /* 00F18 80B12808 460A9301 */ sub.s $f12, $f18, $f10 /* 00F1C 80B1280C E7B00028 */ swc1 $f16, 0x0028($sp) -/* 00F20 80B12810 0C03F494 */ jal func_800FD250 +/* 00F20 80B12810 0C03F494 */ jal Math_atan2f /* 00F24 80B12814 46064381 */ sub.s $f14, $f8, $f6 /* 00F28 80B12818 3C0180B1 */ lui $at, %hi(D_80B13818) ## $at = 80B10000 /* 00F2C 80B1281C C4283818 */ lwc1 $f8, %lo(D_80B13818)($at) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Syateki_Niw/func_80B13464.s b/asm/non_matchings/overlays/actors/ovl_En_Syateki_Niw/func_80B13464.s index 7dc1d24eb4..756b821592 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Syateki_Niw/func_80B13464.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Syateki_Niw/func_80B13464.s @@ -21,7 +21,7 @@ glabel func_80B13464 /* 01BC0 80B134B0 24C63740 */ addiu $a2, $a2, %lo(D_80B13740) ## $a2 = 80B13740 /* 01BC4 80B134B4 27A40074 */ addiu $a0, $sp, 0x0074 ## $a0 = FFFFFFDC /* 01BC8 80B134B8 240704D2 */ addiu $a3, $zero, 0x04D2 ## $a3 = 000004D2 -/* 01BCC 80B134BC 0C031AB1 */ jal func_800C6AC4 +/* 01BCC 80B134BC 0C031AB1 */ jal Graph_OpenDisps /* 01BD0 80B134C0 02402825 */ or $a1, $s2, $zero ## $a1 = 00000000 /* 01BD4 80B134C4 0C024F61 */ jal func_80093D84 /* 01BD8 80B134C8 8EE40000 */ lw $a0, 0x0000($s7) ## 00000000 @@ -101,7 +101,7 @@ glabel func_80B13464 /* 01CF4 80B135E4 24C63770 */ addiu $a2, $a2, %lo(D_80B13770) ## $a2 = 80B13770 /* 01CF8 80B135E8 27A40074 */ addiu $a0, $sp, 0x0074 ## $a0 = FFFFFFDC /* 01CFC 80B135EC 02402825 */ or $a1, $s2, $zero ## $a1 = 00000000 -/* 01D00 80B135F0 0C031AD5 */ jal func_800C6B54 +/* 01D00 80B135F0 0C031AD5 */ jal Graph_CloseDisps /* 01D04 80B135F4 240704E9 */ addiu $a3, $zero, 0x04E9 ## $a3 = 000004E9 /* 01D08 80B135F8 8FBF0054 */ lw $ra, 0x0054($sp) /* 01D0C 80B135FC D7B40018 */ ldc1 $f20, 0x0018($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ta/EnTa_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Ta/EnTa_Draw.s index 3110328800..561d66081f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ta/EnTa_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ta/EnTa_Draw.s @@ -1,20 +1,20 @@ glabel EnTa_Draw /* 03240 80B16CE0 27BDFFA8 */ addiu $sp, $sp, 0xFFA8 ## $sp = FFFFFFA8 -/* 03244 80B16CE4 AFBF002C */ sw $ra, 0x002C($sp) -/* 03248 80B16CE8 AFB00028 */ sw $s0, 0x0028($sp) -/* 0324C 80B16CEC AFA5005C */ sw $a1, 0x005C($sp) +/* 03244 80B16CE4 AFBF002C */ sw $ra, 0x002C($sp) +/* 03248 80B16CE8 AFB00028 */ sw $s0, 0x0028($sp) +/* 0324C 80B16CEC AFA5005C */ sw $a1, 0x005C($sp) /* 03250 80B16CF0 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 /* 03254 80B16CF4 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 03258 80B16CF8 3C0680B1 */ lui $a2, %hi(D_80B16F2C) ## $a2 = 80B10000 /* 0325C 80B16CFC 24C66F2C */ addiu $a2, $a2, %lo(D_80B16F2C) ## $a2 = 80B16F2C /* 03260 80B16D00 27A4003C */ addiu $a0, $sp, 0x003C ## $a0 = FFFFFFE4 /* 03264 80B16D04 2407094D */ addiu $a3, $zero, 0x094D ## $a3 = 0000094D -/* 03268 80B16D08 0C031AB1 */ jal func_800C6AC4 -/* 0326C 80B16D0C AFA5004C */ sw $a1, 0x004C($sp) -/* 03270 80B16D10 8FAF005C */ lw $t7, 0x005C($sp) -/* 03274 80B16D14 0C0250F2 */ jal func_800943C8 +/* 03268 80B16D08 0C031AB1 */ jal Graph_OpenDisps +/* 0326C 80B16D0C AFA5004C */ sw $a1, 0x004C($sp) +/* 03270 80B16D10 8FAF005C */ lw $t7, 0x005C($sp) +/* 03274 80B16D14 0C0250F2 */ jal func_800943C8 /* 03278 80B16D18 8DE40000 */ lw $a0, 0x0000($t7) ## 00000000 -/* 0327C 80B16D1C 8FA8004C */ lw $t0, 0x004C($sp) +/* 0327C 80B16D1C 8FA8004C */ lw $t0, 0x004C($sp) /* 03280 80B16D20 3C19DB06 */ lui $t9, 0xDB06 ## $t9 = DB060000 /* 03284 80B16D24 37390020 */ ori $t9, $t9, 0x0020 ## $t9 = DB060020 /* 03288 80B16D28 8D0302C0 */ lw $v1, 0x02C0($t0) ## 000002C0 @@ -26,37 +26,37 @@ glabel EnTa_Draw /* 032A0 80B16D40 860902B4 */ lh $t1, 0x02B4($s0) ## 000002B4 /* 032A4 80B16D44 24C66FA8 */ addiu $a2, $a2, 0x6FA8 ## $a2 = 80166FA8 /* 032A8 80B16D48 3C0500FF */ lui $a1, 0x00FF ## $a1 = 00FF0000 -/* 032AC 80B16D4C 00095080 */ sll $t2, $t1, 2 -/* 032B0 80B16D50 008A2021 */ addu $a0, $a0, $t2 -/* 032B4 80B16D54 8C846E88 */ lw $a0, %lo(D_80B16E88)($a0) +/* 032AC 80B16D4C 00095080 */ sll $t2, $t1, 2 +/* 032B0 80B16D50 008A2021 */ addu $a0, $a0, $t2 +/* 032B4 80B16D54 8C846E88 */ lw $a0, %lo(D_80B16E88)($a0) /* 032B8 80B16D58 34A5FFFF */ ori $a1, $a1, 0xFFFF ## $a1 = 00FFFFFF /* 032BC 80B16D5C 3C078000 */ lui $a3, 0x8000 ## $a3 = 80000000 -/* 032C0 80B16D60 00046100 */ sll $t4, $a0, 4 -/* 032C4 80B16D64 000C6F02 */ srl $t5, $t4, 28 -/* 032C8 80B16D68 000D7080 */ sll $t6, $t5, 2 -/* 032CC 80B16D6C 00CE7821 */ addu $t7, $a2, $t6 +/* 032C0 80B16D60 00046100 */ sll $t4, $a0, 4 +/* 032C4 80B16D64 000C6F02 */ srl $t5, $t4, 28 +/* 032C8 80B16D68 000D7080 */ sll $t6, $t5, 2 +/* 032CC 80B16D6C 00CE7821 */ addu $t7, $a2, $t6 /* 032D0 80B16D70 8DF80000 */ lw $t8, 0x0000($t7) ## 00000000 -/* 032D4 80B16D74 00855824 */ and $t3, $a0, $a1 +/* 032D4 80B16D74 00855824 */ and $t3, $a0, $a1 /* 032D8 80B16D78 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 -/* 032DC 80B16D7C 0178C821 */ addu $t9, $t3, $t8 -/* 032E0 80B16D80 03274821 */ addu $t1, $t9, $a3 +/* 032DC 80B16D7C 0178C821 */ addu $t9, $t3, $t8 +/* 032E0 80B16D80 03274821 */ addu $t1, $t9, $a3 /* 032E4 80B16D84 AC690004 */ sw $t1, 0x0004($v1) ## 00000004 /* 032E8 80B16D88 8D0302C0 */ lw $v1, 0x02C0($t0) ## 000002C0 /* 032EC 80B16D8C 24846DC0 */ addiu $a0, $a0, 0x6DC0 ## $a0 = 06006DC0 -/* 032F0 80B16D90 00046900 */ sll $t5, $a0, 4 -/* 032F4 80B16D94 000D7702 */ srl $t6, $t5, 28 +/* 032F0 80B16D90 00046900 */ sll $t5, $a0, 4 +/* 032F4 80B16D94 000D7702 */ srl $t6, $t5, 28 /* 032F8 80B16D98 3C0CDB06 */ lui $t4, 0xDB06 ## $t4 = DB060000 /* 032FC 80B16D9C 246A0008 */ addiu $t2, $v1, 0x0008 ## $t2 = 00000008 /* 03300 80B16DA0 358C0024 */ ori $t4, $t4, 0x0024 ## $t4 = DB060024 -/* 03304 80B16DA4 000E7880 */ sll $t7, $t6, 2 +/* 03304 80B16DA4 000E7880 */ sll $t7, $t6, 2 /* 03308 80B16DA8 AD0A02C0 */ sw $t2, 0x02C0($t0) ## 000002C0 -/* 0330C 80B16DAC 00CF5821 */ addu $t3, $a2, $t7 +/* 0330C 80B16DAC 00CF5821 */ addu $t3, $a2, $t7 /* 03310 80B16DB0 AC6C0000 */ sw $t4, 0x0000($v1) ## 00000000 /* 03314 80B16DB4 8D780000 */ lw $t8, 0x0000($t3) ## 00000000 -/* 03318 80B16DB8 0085C824 */ and $t9, $a0, $a1 +/* 03318 80B16DB8 0085C824 */ and $t9, $a0, $a1 /* 0331C 80B16DBC 3C0C80B1 */ lui $t4, %hi(func_80B16B1C) ## $t4 = 80B10000 -/* 03320 80B16DC0 03194821 */ addu $t1, $t8, $t9 -/* 03324 80B16DC4 01275021 */ addu $t2, $t1, $a3 +/* 03320 80B16DC0 03194821 */ addu $t1, $t8, $t9 +/* 03324 80B16DC4 01275021 */ addu $t2, $t1, $a3 /* 03328 80B16DC8 AC6A0004 */ sw $t2, 0x0004($v1) ## 00000004 /* 0332C 80B16DCC 9207014E */ lbu $a3, 0x014E($s0) ## 0000014E /* 03330 80B16DD0 8E06016C */ lw $a2, 0x016C($s0) ## 0000016C @@ -64,22 +64,22 @@ glabel EnTa_Draw /* 03338 80B16DD8 3C0D80B1 */ lui $t5, %hi(func_80B16CA0) ## $t5 = 80B10000 /* 0333C 80B16DDC 25AD6CA0 */ addiu $t5, $t5, %lo(func_80B16CA0) ## $t5 = 80B16CA0 /* 03340 80B16DE0 258C6B1C */ addiu $t4, $t4, %lo(func_80B16B1C) ## $t4 = 80B16B1C -/* 03344 80B16DE4 AFAC0010 */ sw $t4, 0x0010($sp) -/* 03348 80B16DE8 AFAD0014 */ sw $t5, 0x0014($sp) -/* 0334C 80B16DEC AFB00018 */ sw $s0, 0x0018($sp) -/* 03350 80B16DF0 0C0286B2 */ jal func_800A1AC8 -/* 03354 80B16DF4 8FA4005C */ lw $a0, 0x005C($sp) -/* 03358 80B16DF8 8FAE005C */ lw $t6, 0x005C($sp) +/* 03344 80B16DE4 AFAC0010 */ sw $t4, 0x0010($sp) +/* 03348 80B16DE8 AFAD0014 */ sw $t5, 0x0014($sp) +/* 0334C 80B16DEC AFB00018 */ sw $s0, 0x0018($sp) +/* 03350 80B16DF0 0C0286B2 */ jal SkelAnime_DrawSV +/* 03354 80B16DF4 8FA4005C */ lw $a0, 0x005C($sp) +/* 03358 80B16DF8 8FAE005C */ lw $t6, 0x005C($sp) /* 0335C 80B16DFC 3C0680B1 */ lui $a2, %hi(D_80B16F3C) ## $a2 = 80B10000 /* 03360 80B16E00 24C66F3C */ addiu $a2, $a2, %lo(D_80B16F3C) ## $a2 = 80B16F3C /* 03364 80B16E04 27A4003C */ addiu $a0, $sp, 0x003C ## $a0 = FFFFFFE4 /* 03368 80B16E08 24070960 */ addiu $a3, $zero, 0x0960 ## $a3 = 00000960 -/* 0336C 80B16E0C 0C031AD5 */ jal func_800C6B54 +/* 0336C 80B16E0C 0C031AD5 */ jal Graph_CloseDisps /* 03370 80B16E10 8DC50000 */ lw $a1, 0x0000($t6) ## 00000000 -/* 03374 80B16E14 8FBF002C */ lw $ra, 0x002C($sp) -/* 03378 80B16E18 8FB00028 */ lw $s0, 0x0028($sp) +/* 03374 80B16E14 8FBF002C */ lw $ra, 0x002C($sp) +/* 03378 80B16E18 8FB00028 */ lw $s0, 0x0028($sp) /* 0337C 80B16E1C 27BD0058 */ addiu $sp, $sp, 0x0058 ## $sp = 00000000 -/* 03380 80B16E20 03E00008 */ jr $ra +/* 03380 80B16E20 03E00008 */ jr $ra /* 03384 80B16E24 00000000 */ nop /* 03388 80B16E28 00000000 */ nop /* 0338C 80B16E2C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ta/EnTa_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Ta/EnTa_Init.s index daa3796143..3769718eba 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ta/EnTa_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ta/EnTa_Init.s @@ -1,15 +1,15 @@ glabel EnTa_Init /* 000E8 80B13B88 27BDFFB0 */ addiu $sp, $sp, 0xFFB0 ## $sp = FFFFFFB0 -/* 000EC 80B13B8C AFB00030 */ sw $s0, 0x0030($sp) +/* 000EC 80B13B8C AFB00030 */ sw $s0, 0x0030($sp) /* 000F0 80B13B90 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 000F4 80B13B94 AFBF0034 */ sw $ra, 0x0034($sp) -/* 000F8 80B13B98 AFA50054 */ sw $a1, 0x0054($sp) +/* 000F4 80B13B94 AFBF0034 */ sw $ra, 0x0034($sp) +/* 000F8 80B13B98 AFA50054 */ sw $a1, 0x0054($sp) /* 000FC 80B13B9C 3C068003 */ lui $a2, 0x8003 ## $a2 = 80030000 /* 00100 80B13BA0 24C6B5EC */ addiu $a2, $a2, 0xB5EC ## $a2 = 8002B5EC /* 00104 80B13BA4 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 /* 00108 80B13BA8 248400B4 */ addiu $a0, $a0, 0x00B4 ## $a0 = 000000B4 /* 0010C 80B13BAC 0C00AC78 */ jal ActorShape_Init - + /* 00110 80B13BB0 3C074210 */ lui $a3, 0x4210 ## $a3 = 42100000 /* 00114 80B13BB4 2605014C */ addiu $a1, $s0, 0x014C ## $a1 = 0000014C /* 00118 80B13BB8 3C060601 */ lui $a2, 0x0601 ## $a2 = 06010000 @@ -17,25 +17,25 @@ glabel EnTa_Init /* 00120 80B13BC0 260E0190 */ addiu $t6, $s0, 0x0190 ## $t6 = 00000190 /* 00124 80B13BC4 260F01F6 */ addiu $t7, $s0, 0x01F6 ## $t7 = 000001F6 /* 00128 80B13BC8 24180011 */ addiu $t8, $zero, 0x0011 ## $t8 = 00000011 -/* 0012C 80B13BCC AFB80018 */ sw $t8, 0x0018($sp) -/* 00130 80B13BD0 AFAF0014 */ sw $t7, 0x0014($sp) -/* 00134 80B13BD4 AFAE0010 */ sw $t6, 0x0010($sp) +/* 0012C 80B13BCC AFB80018 */ sw $t8, 0x0018($sp) +/* 00130 80B13BD0 AFAF0014 */ sw $t7, 0x0014($sp) +/* 00134 80B13BD4 AFAE0010 */ sw $t6, 0x0010($sp) /* 00138 80B13BD8 24E71C94 */ addiu $a3, $a3, 0x1C94 ## $a3 = 06001C94 /* 0013C 80B13BDC 24C6B7B8 */ addiu $a2, $a2, 0xB7B8 ## $a2 = 0600B7B8 -/* 00140 80B13BE0 AFA50038 */ sw $a1, 0x0038($sp) -/* 00144 80B13BE4 0C0291BE */ jal func_800A46F8 -/* 00148 80B13BE8 8FA40054 */ lw $a0, 0x0054($sp) +/* 00140 80B13BE0 AFA50038 */ sw $a1, 0x0038($sp) +/* 00144 80B13BE4 0C0291BE */ jal SkelAnime_InitSV +/* 00148 80B13BE8 8FA40054 */ lw $a0, 0x0054($sp) /* 0014C 80B13BEC 26050264 */ addiu $a1, $s0, 0x0264 ## $a1 = 00000264 -/* 00150 80B13BF0 AFA5003C */ sw $a1, 0x003C($sp) +/* 00150 80B13BF0 AFA5003C */ sw $a1, 0x003C($sp) /* 00154 80B13BF4 0C0170D9 */ jal ActorCollider_AllocCylinder - -/* 00158 80B13BF8 8FA40054 */ lw $a0, 0x0054($sp) + +/* 00158 80B13BF8 8FA40054 */ lw $a0, 0x0054($sp) /* 0015C 80B13BFC 3C0780B1 */ lui $a3, %hi(D_80B16E50) ## $a3 = 80B10000 -/* 00160 80B13C00 8FA5003C */ lw $a1, 0x003C($sp) +/* 00160 80B13C00 8FA5003C */ lw $a1, 0x003C($sp) /* 00164 80B13C04 24E76E50 */ addiu $a3, $a3, %lo(D_80B16E50) ## $a3 = 80B16E50 -/* 00168 80B13C08 8FA40054 */ lw $a0, 0x0054($sp) +/* 00168 80B13C08 8FA40054 */ lw $a0, 0x0054($sp) /* 0016C 80B13C0C 0C01712B */ jal ActorCollider_InitCylinder - + /* 00170 80B13C10 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 00174 80B13C14 3C0980B1 */ lui $t1, %hi(func_80B166CC) ## $t1 = 80B10000 /* 00178 80B13C18 241900FF */ addiu $t9, $zero, 0x00FF ## $t9 = 000000FF @@ -50,7 +50,7 @@ glabel EnTa_Init /* 0019C 80B13C3C AE0902B0 */ sw $t1, 0x02B0($s0) ## 000002B0 /* 001A0 80B13C40 34A5D70A */ ori $a1, $a1, 0xD70A ## $a1 = 3C23D70A /* 001A4 80B13C44 0C00B58B */ jal Actor_SetScale - + /* 001A8 80B13C48 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 001AC 80B13C4C 3C01C080 */ lui $at, 0xC080 ## $at = C0800000 /* 001B0 80B13C50 44810000 */ mtc1 $at, $f0 ## $f0 = -4.00 @@ -62,227 +62,227 @@ glabel EnTa_Init /* 001C8 80B13C68 A20A001F */ sb $t2, 0x001F($s0) ## 0000001F /* 001CC 80B13C6C E6000060 */ swc1 $f0, 0x0060($s0) ## 00000060 /* 001D0 80B13C70 E6000070 */ swc1 $f0, 0x0070($s0) ## 00000070 -/* 001D4 80B13C74 10410006 */ beq $v0, $at, .L80B13C90 +/* 001D4 80B13C74 10410006 */ beq $v0, $at, .L80B13C90 /* 001D8 80B13C78 E604006C */ swc1 $f4, 0x006C($s0) ## 0000006C /* 001DC 80B13C7C 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 001E0 80B13C80 1041003B */ beq $v0, $at, .L80B13D70 +/* 001E0 80B13C80 1041003B */ beq $v0, $at, .L80B13D70 /* 001E4 80B13C84 3C0480B1 */ lui $a0, %hi(D_80B16EB8) ## $a0 = 80B10000 -/* 001E8 80B13C88 10000069 */ beq $zero, $zero, .L80B13E30 +/* 001E8 80B13C88 10000069 */ beq $zero, $zero, .L80B13E30 /* 001EC 80B13C8C 3C0480B1 */ lui $a0, %hi(D_80B16EE8) ## $a0 = 80B10000 .L80B13C90: /* 001F0 80B13C90 3C0480B1 */ lui $a0, %hi(D_80B16EA0) ## $a0 = 80B10000 /* 001F4 80B13C94 0C00084C */ jal osSyncPrintf - + /* 001F8 80B13C98 24846EA0 */ addiu $a0, $a0, %lo(D_80B16EA0) ## $a0 = 80B16EA0 /* 001FC 80B13C9C 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 /* 00200 80B13CA0 9442F540 */ lhu $v0, -0x0AC0($v0) ## 8015F540 /* 00204 80B13CA4 3C0C8016 */ lui $t4, 0x8016 ## $t4 = 80160000 /* 00208 80B13CA8 304B0800 */ andi $t3, $v0, 0x0800 ## $t3 = 00000000 -/* 0020C 80B13CAC 11600005 */ beq $t3, $zero, .L80B13CC4 +/* 0020C 80B13CAC 11600005 */ beq $t3, $zero, .L80B13CC4 /* 00210 80B13CB0 00000000 */ nop /* 00214 80B13CB4 0C00B55C */ jal Actor_Kill - + /* 00218 80B13CB8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0021C 80B13CBC 1000015E */ beq $zero, $zero, .L80B14238 -/* 00220 80B13CC0 8FBF0034 */ lw $ra, 0x0034($sp) +/* 0021C 80B13CBC 1000015E */ beq $zero, $zero, .L80B14238 +/* 00220 80B13CC0 8FBF0034 */ lw $ra, 0x0034($sp) .L80B13CC4: /* 00224 80B13CC4 8D8CE664 */ lw $t4, -0x199C($t4) ## FFFFE664 /* 00228 80B13CC8 304D0400 */ andi $t5, $v0, 0x0400 ## $t5 = 00000000 -/* 0022C 80B13CCC 11800005 */ beq $t4, $zero, .L80B13CE4 +/* 0022C 80B13CCC 11800005 */ beq $t4, $zero, .L80B13CE4 /* 00230 80B13CD0 00000000 */ nop /* 00234 80B13CD4 0C00B55C */ jal Actor_Kill - + /* 00238 80B13CD8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0023C 80B13CDC 10000156 */ beq $zero, $zero, .L80B14238 -/* 00240 80B13CE0 8FBF0034 */ lw $ra, 0x0034($sp) +/* 0023C 80B13CDC 10000156 */ beq $zero, $zero, .L80B14238 +/* 00240 80B13CE0 8FBF0034 */ lw $ra, 0x0034($sp) .L80B13CE4: -/* 00244 80B13CE4 11A00010 */ beq $t5, $zero, .L80B13D28 +/* 00244 80B13CE4 11A00010 */ beq $t5, $zero, .L80B13D28 /* 00248 80B13CE8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 0024C 80B13CEC 3C0580B1 */ lui $a1, %hi(func_80B14CAC) ## $a1 = 80B10000 /* 00250 80B13CF0 3C0680B1 */ lui $a2, %hi(func_80B167C0) ## $a2 = 80B10000 /* 00254 80B13CF4 24C667C0 */ addiu $a2, $a2, %lo(func_80B167C0) ## $a2 = 80B167C0 /* 00258 80B13CF8 24A54CAC */ addiu $a1, $a1, %lo(func_80B14CAC) ## $a1 = 80B14CAC -/* 0025C 80B13CFC 0C2C4EA8 */ jal func_80B13AA0 +/* 0025C 80B13CFC 0C2C4EA8 */ jal func_80B13AA0 /* 00260 80B13D00 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 00264 80B13D04 A60002B4 */ sh $zero, 0x02B4($s0) ## 000002B4 /* 00268 80B13D08 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 0026C 80B13D0C 24A51C94 */ addiu $a1, $a1, 0x1C94 ## $a1 = 06001C94 -/* 00270 80B13D10 0C02947A */ jal func_800A51E8 -/* 00274 80B13D14 8FA40038 */ lw $a0, 0x0038($sp) +/* 00270 80B13D10 0C02947A */ jal SkelAnime_ChangeAnimDefaultStop +/* 00274 80B13D14 8FA40038 */ lw $a0, 0x0038($sp) /* 00278 80B13D18 3C0E0600 */ lui $t6, 0x0600 ## $t6 = 06000000 /* 0027C 80B13D1C 25CE1C94 */ addiu $t6, $t6, 0x1C94 ## $t6 = 06001C94 -/* 00280 80B13D20 10000144 */ beq $zero, $zero, .L80B14234 +/* 00280 80B13D20 10000144 */ beq $zero, $zero, .L80B14234 /* 00284 80B13D24 AE0E02E4 */ sw $t6, 0x02E4($s0) ## 000002E4 .L80B13D28: /* 00288 80B13D28 3C0580B1 */ lui $a1, %hi(func_80B14754) ## $a1 = 80B10000 /* 0028C 80B13D2C 3C0680B1 */ lui $a2, %hi(func_80B167FC) ## $a2 = 80B10000 /* 00290 80B13D30 24C667FC */ addiu $a2, $a2, %lo(func_80B167FC) ## $a2 = 80B167FC -/* 00294 80B13D34 0C2C4EA8 */ jal func_80B13AA0 +/* 00294 80B13D34 0C2C4EA8 */ jal func_80B13AA0 /* 00298 80B13D38 24A54754 */ addiu $a1, $a1, %lo(func_80B14754) ## $a1 = 80B14754 /* 0029C 80B13D3C 240F0002 */ addiu $t7, $zero, 0x0002 ## $t7 = 00000002 /* 002A0 80B13D40 A60F02B4 */ sh $t7, 0x02B4($s0) ## 000002B4 /* 002A4 80B13D44 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 /* 002A8 80B13D48 24A5CD50 */ addiu $a1, $a1, 0xCD50 ## $a1 = 0600CD50 -/* 002AC 80B13D4C 0C02947A */ jal func_800A51E8 -/* 002B0 80B13D50 8FA40038 */ lw $a0, 0x0038($sp) +/* 002AC 80B13D4C 0C02947A */ jal SkelAnime_ChangeAnimDefaultStop +/* 002B0 80B13D50 8FA40038 */ lw $a0, 0x0038($sp) /* 002B4 80B13D54 3C014258 */ lui $at, 0x4258 ## $at = 42580000 /* 002B8 80B13D58 44813000 */ mtc1 $at, $f6 ## $f6 = 54.00 /* 002BC 80B13D5C 3C180601 */ lui $t8, 0x0601 ## $t8 = 06010000 /* 002C0 80B13D60 2718CD50 */ addiu $t8, $t8, 0xCD50 ## $t8 = 0600CD50 /* 002C4 80B13D64 AE1802E4 */ sw $t8, 0x02E4($s0) ## 000002E4 -/* 002C8 80B13D68 10000132 */ beq $zero, $zero, .L80B14234 +/* 002C8 80B13D68 10000132 */ beq $zero, $zero, .L80B14234 /* 002CC 80B13D6C E60600C4 */ swc1 $f6, 0x00C4($s0) ## 000000C4 .L80B13D70: /* 002D0 80B13D70 0C00084C */ jal osSyncPrintf - + /* 002D4 80B13D74 24846EB8 */ addiu $a0, $a0, %lo(D_80B16EB8) ## $a0 = 00006EB8 /* 002D8 80B13D78 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 /* 002DC 80B13D7C 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 /* 002E0 80B13D80 94590EE0 */ lhu $t9, 0x0EE0($v0) ## 8015F540 /* 002E4 80B13D84 33280800 */ andi $t0, $t9, 0x0800 ## $t0 = 00000000 -/* 002E8 80B13D88 55000006 */ bnel $t0, $zero, .L80B13DA4 +/* 002E8 80B13D88 55000006 */ bnel $t0, $zero, .L80B13DA4 /* 002EC 80B13D8C 8C490004 */ lw $t1, 0x0004($v0) ## 8015E664 /* 002F0 80B13D90 0C00B55C */ jal Actor_Kill - + /* 002F4 80B13D94 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 002F8 80B13D98 10000127 */ beq $zero, $zero, .L80B14238 -/* 002FC 80B13D9C 8FBF0034 */ lw $ra, 0x0034($sp) +/* 002F8 80B13D98 10000127 */ beq $zero, $zero, .L80B14238 +/* 002FC 80B13D9C 8FBF0034 */ lw $ra, 0x0034($sp) /* 00300 80B13DA0 8C490004 */ lw $t1, 0x0004($v0) ## 00000004 .L80B13DA4: -/* 00304 80B13DA4 8FAA0054 */ lw $t2, 0x0054($sp) -/* 00308 80B13DA8 51200006 */ beql $t1, $zero, .L80B13DC4 +/* 00304 80B13DA4 8FAA0054 */ lw $t2, 0x0054($sp) +/* 00308 80B13DA8 51200006 */ beql $t1, $zero, .L80B13DC4 /* 0030C 80B13DAC 854B00A4 */ lh $t3, 0x00A4($t2) ## 000000A4 /* 00310 80B13DB0 0C00B55C */ jal Actor_Kill - + /* 00314 80B13DB4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00318 80B13DB8 1000011F */ beq $zero, $zero, .L80B14238 -/* 0031C 80B13DBC 8FBF0034 */ lw $ra, 0x0034($sp) +/* 00318 80B13DB8 1000011F */ beq $zero, $zero, .L80B14238 +/* 0031C 80B13DBC 8FBF0034 */ lw $ra, 0x0034($sp) /* 00320 80B13DC0 854B00A4 */ lh $t3, 0x00A4($t2) ## 000000A4 .L80B13DC4: /* 00324 80B13DC4 24010036 */ addiu $at, $zero, 0x0036 ## $at = 00000036 /* 00328 80B13DC8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0032C 80B13DCC 1561000B */ bne $t3, $at, .L80B13DFC +/* 0032C 80B13DCC 1561000B */ bne $t3, $at, .L80B13DFC /* 00330 80B13DD0 3C0580B1 */ lui $a1, %hi(func_80B14D98) ## $a1 = 80B10000 /* 00334 80B13DD4 8C4C0010 */ lw $t4, 0x0010($v0) ## 00000010 -/* 00338 80B13DD8 11800008 */ beq $t4, $zero, .L80B13DFC +/* 00338 80B13DD8 11800008 */ beq $t4, $zero, .L80B13DFC /* 0033C 80B13DDC 00000000 */ nop /* 00340 80B13DE0 0C00B55C */ jal Actor_Kill - + /* 00344 80B13DE4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 00348 80B13DE8 3C0480B1 */ lui $a0, %hi(D_80B16ED0) ## $a0 = 80B10000 /* 0034C 80B13DEC 0C00084C */ jal osSyncPrintf - + /* 00350 80B13DF0 24846ED0 */ addiu $a0, $a0, %lo(D_80B16ED0) ## $a0 = 80B16ED0 -/* 00354 80B13DF4 10000110 */ beq $zero, $zero, .L80B14238 -/* 00358 80B13DF8 8FBF0034 */ lw $ra, 0x0034($sp) +/* 00354 80B13DF4 10000110 */ beq $zero, $zero, .L80B14238 +/* 00358 80B13DF8 8FBF0034 */ lw $ra, 0x0034($sp) .L80B13DFC: /* 0035C 80B13DFC 3C0680B1 */ lui $a2, %hi(func_80B167C0) ## $a2 = 80B10000 /* 00360 80B13E00 24C667C0 */ addiu $a2, $a2, %lo(func_80B167C0) ## $a2 = 80B167C0 -/* 00364 80B13E04 0C2C4EA8 */ jal func_80B13AA0 +/* 00364 80B13E04 0C2C4EA8 */ jal func_80B13AA0 /* 00368 80B13E08 24A54D98 */ addiu $a1, $a1, %lo(func_80B14D98) ## $a1 = 00004D98 /* 0036C 80B13E0C A60002B4 */ sh $zero, 0x02B4($s0) ## 000002B4 /* 00370 80B13E10 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 00374 80B13E14 24A51C94 */ addiu $a1, $a1, 0x1C94 ## $a1 = 06001C94 -/* 00378 80B13E18 0C02947A */ jal func_800A51E8 -/* 0037C 80B13E1C 8FA40038 */ lw $a0, 0x0038($sp) +/* 00378 80B13E18 0C02947A */ jal SkelAnime_ChangeAnimDefaultStop +/* 0037C 80B13E1C 8FA40038 */ lw $a0, 0x0038($sp) /* 00380 80B13E20 3C0D0600 */ lui $t5, 0x0600 ## $t5 = 06000000 /* 00384 80B13E24 25AD1C94 */ addiu $t5, $t5, 0x1C94 ## $t5 = 06001C94 -/* 00388 80B13E28 10000102 */ beq $zero, $zero, .L80B14234 +/* 00388 80B13E28 10000102 */ beq $zero, $zero, .L80B14234 /* 0038C 80B13E2C AE0D02E4 */ sw $t5, 0x02E4($s0) ## 000002E4 .L80B13E30: /* 00390 80B13E30 0C00084C */ jal osSyncPrintf - + /* 00394 80B13E34 24846EE8 */ addiu $a0, $a0, %lo(D_80B16EE8) ## $a0 = 00006EE8 -/* 00398 80B13E38 8FA30054 */ lw $v1, 0x0054($sp) +/* 00398 80B13E38 8FA30054 */ lw $v1, 0x0054($sp) /* 0039C 80B13E3C 2401005F */ addiu $at, $zero, 0x005F ## $at = 0000005F /* 003A0 80B13E40 846200A4 */ lh $v0, 0x00A4($v1) ## 000000A4 -/* 003A4 80B13E44 5441002E */ bnel $v0, $at, .L80B13F00 +/* 003A4 80B13E44 5441002E */ bnel $v0, $at, .L80B13F00 /* 003A8 80B13E48 2401004C */ addiu $at, $zero, 0x004C ## $at = 0000004C /* 003AC 80B13E4C 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 /* 003B0 80B13E50 9442F536 */ lhu $v0, -0x0ACA($v0) ## 8015F536 /* 003B4 80B13E54 304E0010 */ andi $t6, $v0, 0x0010 ## $t6 = 00000000 -/* 003B8 80B13E58 11C00005 */ beq $t6, $zero, .L80B13E70 +/* 003B8 80B13E58 11C00005 */ beq $t6, $zero, .L80B13E70 /* 003BC 80B13E5C 304F0008 */ andi $t7, $v0, 0x0008 ## $t7 = 00000000 /* 003C0 80B13E60 0C00B55C */ jal Actor_Kill - + /* 003C4 80B13E64 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 003C8 80B13E68 100000F3 */ beq $zero, $zero, .L80B14238 -/* 003CC 80B13E6C 8FBF0034 */ lw $ra, 0x0034($sp) +/* 003C8 80B13E68 100000F3 */ beq $zero, $zero, .L80B14238 +/* 003CC 80B13E6C 8FBF0034 */ lw $ra, 0x0034($sp) .L80B13E70: -/* 003D0 80B13E70 11E00010 */ beq $t7, $zero, .L80B13EB4 +/* 003D0 80B13E70 11E00010 */ beq $t7, $zero, .L80B13EB4 /* 003D4 80B13E74 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 003D8 80B13E78 3C0580B1 */ lui $a1, %hi(func_80B14C18) ## $a1 = 80B10000 /* 003DC 80B13E7C 3C0680B1 */ lui $a2, %hi(func_80B167C0) ## $a2 = 80B10000 /* 003E0 80B13E80 24C667C0 */ addiu $a2, $a2, %lo(func_80B167C0) ## $a2 = 80B167C0 /* 003E4 80B13E84 24A54C18 */ addiu $a1, $a1, %lo(func_80B14C18) ## $a1 = 80B14C18 -/* 003E8 80B13E88 0C2C4EA8 */ jal func_80B13AA0 +/* 003E8 80B13E88 0C2C4EA8 */ jal func_80B13AA0 /* 003EC 80B13E8C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 003F0 80B13E90 A60002B4 */ sh $zero, 0x02B4($s0) ## 000002B4 /* 003F4 80B13E94 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 003F8 80B13E98 24A51C94 */ addiu $a1, $a1, 0x1C94 ## $a1 = 06001C94 -/* 003FC 80B13E9C 0C02947A */ jal func_800A51E8 -/* 00400 80B13EA0 8FA40038 */ lw $a0, 0x0038($sp) +/* 003FC 80B13E9C 0C02947A */ jal SkelAnime_ChangeAnimDefaultStop +/* 00400 80B13EA0 8FA40038 */ lw $a0, 0x0038($sp) /* 00404 80B13EA4 3C180600 */ lui $t8, 0x0600 ## $t8 = 06000000 /* 00408 80B13EA8 27181C94 */ addiu $t8, $t8, 0x1C94 ## $t8 = 06001C94 -/* 0040C 80B13EAC 100000E1 */ beq $zero, $zero, .L80B14234 +/* 0040C 80B13EAC 100000E1 */ beq $zero, $zero, .L80B14234 /* 00410 80B13EB0 AE1802E4 */ sw $t8, 0x02E4($s0) ## 000002E4 .L80B13EB4: /* 00414 80B13EB4 3C0580B1 */ lui $a1, %hi(func_80B14634) ## $a1 = 80B10000 /* 00418 80B13EB8 3C0680B1 */ lui $a2, %hi(func_80B167FC) ## $a2 = 80B10000 /* 0041C 80B13EBC 24C667FC */ addiu $a2, $a2, %lo(func_80B167FC) ## $a2 = 80B167FC -/* 00420 80B13EC0 0C2C4EA8 */ jal func_80B13AA0 +/* 00420 80B13EC0 0C2C4EA8 */ jal func_80B13AA0 /* 00424 80B13EC4 24A54634 */ addiu $a1, $a1, %lo(func_80B14634) ## $a1 = 80B14634 /* 00428 80B13EC8 24190002 */ addiu $t9, $zero, 0x0002 ## $t9 = 00000002 /* 0042C 80B13ECC A61902B4 */ sh $t9, 0x02B4($s0) ## 000002B4 /* 00430 80B13ED0 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 /* 00434 80B13ED4 24A5CD50 */ addiu $a1, $a1, 0xCD50 ## $a1 = 0600CD50 -/* 00438 80B13ED8 0C02947A */ jal func_800A51E8 -/* 0043C 80B13EDC 8FA40038 */ lw $a0, 0x0038($sp) +/* 00438 80B13ED8 0C02947A */ jal SkelAnime_ChangeAnimDefaultStop +/* 0043C 80B13EDC 8FA40038 */ lw $a0, 0x0038($sp) /* 00440 80B13EE0 3C014258 */ lui $at, 0x4258 ## $at = 42580000 /* 00444 80B13EE4 44814000 */ mtc1 $at, $f8 ## $f8 = 54.00 /* 00448 80B13EE8 3C080601 */ lui $t0, 0x0601 ## $t0 = 06010000 /* 0044C 80B13EEC 2508CD50 */ addiu $t0, $t0, 0xCD50 ## $t0 = 0600CD50 /* 00450 80B13EF0 AE0802E4 */ sw $t0, 0x02E4($s0) ## 000002E4 -/* 00454 80B13EF4 100000CF */ beq $zero, $zero, .L80B14234 +/* 00454 80B13EF4 100000CF */ beq $zero, $zero, .L80B14234 /* 00458 80B13EF8 E60800C4 */ swc1 $f8, 0x00C4($s0) ## 000000C4 /* 0045C 80B13EFC 2401004C */ addiu $at, $zero, 0x004C ## $at = 0000004C .L80B13F00: -/* 00460 80B13F00 144100BB */ bne $v0, $at, .L80B141F0 +/* 00460 80B13F00 144100BB */ bne $v0, $at, .L80B141F0 /* 00464 80B13F04 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 00468 80B13F08 3C0480B1 */ lui $a0, %hi(D_80B16F04) ## $a0 = 80B10000 /* 0046C 80B13F0C 0C00084C */ jal osSyncPrintf - + /* 00470 80B13F10 24846F04 */ addiu $a0, $a0, %lo(D_80B16F04) ## $a0 = 80B16F04 /* 00474 80B13F14 3C038016 */ lui $v1, 0x8016 ## $v1 = 80160000 /* 00478 80B13F18 2463E660 */ addiu $v1, $v1, 0xE660 ## $v1 = 8015E660 /* 0047C 80B13F1C 94690ED6 */ lhu $t1, 0x0ED6($v1) ## 8015F536 /* 00480 80B13F20 312A0010 */ andi $t2, $t1, 0x0010 ## $t2 = 00000000 -/* 00484 80B13F24 55400006 */ bnel $t2, $zero, .L80B13F40 +/* 00484 80B13F24 55400006 */ bnel $t2, $zero, .L80B13F40 /* 00488 80B13F28 8C6B0004 */ lw $t3, 0x0004($v1) ## 8015E664 /* 0048C 80B13F2C 0C00B55C */ jal Actor_Kill - + /* 00490 80B13F30 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00494 80B13F34 100000C0 */ beq $zero, $zero, .L80B14238 -/* 00498 80B13F38 8FBF0034 */ lw $ra, 0x0034($sp) +/* 00494 80B13F34 100000C0 */ beq $zero, $zero, .L80B14238 +/* 00498 80B13F38 8FBF0034 */ lw $ra, 0x0034($sp) /* 0049C 80B13F3C 8C6B0004 */ lw $t3, 0x0004($v1) ## 00000004 .L80B13F40: -/* 004A0 80B13F40 55600006 */ bnel $t3, $zero, .L80B13F5C +/* 004A0 80B13F40 55600006 */ bnel $t3, $zero, .L80B13F5C /* 004A4 80B13F44 8C6C0010 */ lw $t4, 0x0010($v1) ## 00000010 /* 004A8 80B13F48 0C00B55C */ jal Actor_Kill - + /* 004AC 80B13F4C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 004B0 80B13F50 100000B9 */ beq $zero, $zero, .L80B14238 -/* 004B4 80B13F54 8FBF0034 */ lw $ra, 0x0034($sp) +/* 004B0 80B13F50 100000B9 */ beq $zero, $zero, .L80B14238 +/* 004B4 80B13F54 8FBF0034 */ lw $ra, 0x0034($sp) /* 004B8 80B13F58 8C6C0010 */ lw $t4, 0x0010($v1) ## 00000010 .L80B13F5C: /* 004BC 80B13F5C 3C0580B1 */ lui $a1, %hi(func_80B146F8) ## $a1 = 80B10000 /* 004C0 80B13F60 24A546F8 */ addiu $a1, $a1, %lo(func_80B146F8) ## $a1 = 80B146F8 -/* 004C4 80B13F64 15800092 */ bne $t4, $zero, .L80B141B0 +/* 004C4 80B13F64 15800092 */ bne $t4, $zero, .L80B141B0 /* 004C8 80B13F68 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 004CC 80B13F6C 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 /* 004D0 80B13F70 44818000 */ mtc1 $at, $f16 ## $f16 = 5.00 /* 004D4 80B13F74 3C014040 */ lui $at, 0x4040 ## $at = 40400000 -/* 004D8 80B13F78 8FA50054 */ lw $a1, 0x0054($sp) +/* 004D8 80B13F78 8FA50054 */ lw $a1, 0x0054($sp) /* 004DC 80B13F7C 44813000 */ mtc1 $at, $f6 ## $f6 = 3.00 /* 004E0 80B13F80 C6040028 */ lwc1 $f4, 0x0028($s0) ## 00000028 /* 004E4 80B13F84 240F0007 */ addiu $t7, $zero, 0x0007 ## $t7 = 00000007 @@ -290,26 +290,26 @@ glabel EnTa_Init /* 004EC 80B13F8C 8E0D0004 */ lw $t5, 0x0004($s0) ## 00000004 /* 004F0 80B13F90 860202C8 */ lh $v0, 0x02C8($s0) ## 000002C8 /* 004F4 80B13F94 C60A0024 */ lwc1 $f10, 0x0024($s0) ## 00000024 -/* 004F8 80B13F98 46062200 */ add.s $f8, $f4, $f6 +/* 004F8 80B13F98 46062200 */ add.s $f8, $f4, $f6 /* 004FC 80B13F9C 35AE0010 */ ori $t6, $t5, 0x0010 ## $t6 = 00000010 /* 00500 80B13FA0 AE0E0004 */ sw $t6, 0x0004($s0) ## 00000004 -/* 00504 80B13FA4 46105480 */ add.s $f18, $f10, $f16 +/* 00504 80B13FA4 46105480 */ add.s $f18, $f10, $f16 /* 00508 80B13FA8 A60202C6 */ sh $v0, 0x02C6($s0) ## 000002C6 /* 0050C 80B13FAC A60202C4 */ sh $v0, 0x02C4($s0) ## 000002C4 -/* 00510 80B13FB0 E7A80010 */ swc1 $f8, 0x0010($sp) +/* 00510 80B13FB0 E7A80010 */ swc1 $f8, 0x0010($sp) /* 00514 80B13FB4 3C0141D0 */ lui $at, 0x41D0 ## $at = 41D00000 /* 00518 80B13FB8 44818000 */ mtc1 $at, $f16 ## $f16 = 26.00 /* 0051C 80B13FBC C60A002C */ lwc1 $f10, 0x002C($s0) ## 0000002C -/* 00520 80B13FC0 44079000 */ mfc1 $a3, $f18 +/* 00520 80B13FC0 44079000 */ mfc1 $a3, $f18 /* 00524 80B13FC4 2418000D */ addiu $t8, $zero, 0x000D ## $t8 = 0000000D -/* 00528 80B13FC8 46105480 */ add.s $f18, $f10, $f16 +/* 00528 80B13FC8 46105480 */ add.s $f18, $f10, $f16 /* 0052C 80B13FCC 24A41C24 */ addiu $a0, $a1, 0x1C24 ## $a0 = 80B1631C -/* 00530 80B13FD0 AFA4003C */ sw $a0, 0x003C($sp) -/* 00534 80B13FD4 AFB80024 */ sw $t8, 0x0024($sp) -/* 00538 80B13FD8 E7B20014 */ swc1 $f18, 0x0014($sp) -/* 0053C 80B13FDC AFA00020 */ sw $zero, 0x0020($sp) -/* 00540 80B13FE0 AFA0001C */ sw $zero, 0x001C($sp) -/* 00544 80B13FE4 AFA00018 */ sw $zero, 0x0018($sp) +/* 00530 80B13FD0 AFA4003C */ sw $a0, 0x003C($sp) +/* 00534 80B13FD4 AFB80024 */ sw $t8, 0x0024($sp) +/* 00538 80B13FD8 E7B20014 */ swc1 $f18, 0x0014($sp) +/* 0053C 80B13FDC AFA00020 */ sw $zero, 0x0020($sp) +/* 00540 80B13FE0 AFA0001C */ sw $zero, 0x001C($sp) +/* 00544 80B13FE4 AFA00018 */ sw $zero, 0x0018($sp) /* 00548 80B13FE8 0C00C7D4 */ jal Actor_Spawn ## ActorSpawn /* 0054C 80B13FEC 24060019 */ addiu $a2, $zero, 0x0019 ## $a2 = 00000019 @@ -319,23 +319,23 @@ glabel EnTa_Init /* 0055C 80B13FFC 44818000 */ mtc1 $at, $f16 ## $f16 = 40.00 /* 00560 80B14000 C60A0028 */ lwc1 $f10, 0x0028($s0) ## 00000028 /* 00564 80B14004 C6040024 */ lwc1 $f4, 0x0024($s0) ## 00000024 -/* 00568 80B14008 8FA50054 */ lw $a1, 0x0054($sp) -/* 0056C 80B1400C 46105480 */ add.s $f18, $f10, $f16 +/* 00568 80B14008 8FA50054 */ lw $a1, 0x0054($sp) +/* 0056C 80B1400C 46105480 */ add.s $f18, $f10, $f16 /* 00570 80B14010 AE0202B8 */ sw $v0, 0x02B8($s0) ## 000002B8 /* 00574 80B14014 3C0141F0 */ lui $at, 0x41F0 ## $at = 41F00000 -/* 00578 80B14018 46062201 */ sub.s $f8, $f4, $f6 -/* 0057C 80B1401C E7B20010 */ swc1 $f18, 0x0010($sp) +/* 00578 80B14018 46062201 */ sub.s $f8, $f4, $f6 +/* 0057C 80B1401C E7B20010 */ swc1 $f18, 0x0010($sp) /* 00580 80B14020 C604002C */ lwc1 $f4, 0x002C($s0) ## 0000002C /* 00584 80B14024 44813000 */ mtc1 $at, $f6 ## $f6 = 30.00 -/* 00588 80B14028 44074000 */ mfc1 $a3, $f8 +/* 00588 80B14028 44074000 */ mfc1 $a3, $f8 /* 0058C 80B1402C 2419000D */ addiu $t9, $zero, 0x000D ## $t9 = 0000000D -/* 00590 80B14030 46062201 */ sub.s $f8, $f4, $f6 -/* 00594 80B14034 AFB90024 */ sw $t9, 0x0024($sp) -/* 00598 80B14038 AFA00020 */ sw $zero, 0x0020($sp) -/* 0059C 80B1403C AFA0001C */ sw $zero, 0x001C($sp) -/* 005A0 80B14040 E7A80014 */ swc1 $f8, 0x0014($sp) -/* 005A4 80B14044 AFA00018 */ sw $zero, 0x0018($sp) -/* 005A8 80B14048 8FA4003C */ lw $a0, 0x003C($sp) +/* 00590 80B14030 46062201 */ sub.s $f8, $f4, $f6 +/* 00594 80B14034 AFB90024 */ sw $t9, 0x0024($sp) +/* 00598 80B14038 AFA00020 */ sw $zero, 0x0020($sp) +/* 0059C 80B1403C AFA0001C */ sw $zero, 0x001C($sp) +/* 005A0 80B14040 E7A80014 */ swc1 $f8, 0x0014($sp) +/* 005A4 80B14044 AFA00018 */ sw $zero, 0x0018($sp) +/* 005A8 80B14048 8FA4003C */ lw $a0, 0x003C($sp) /* 005AC 80B1404C 0C00C7D4 */ jal Actor_Spawn ## ActorSpawn /* 005B0 80B14050 24060019 */ addiu $a2, $zero, 0x0019 ## $a2 = 00000019 @@ -345,121 +345,121 @@ glabel EnTa_Init /* 005C0 80B14060 44813000 */ mtc1 $at, $f6 ## $f6 = 40.00 /* 005C4 80B14064 C6040028 */ lwc1 $f4, 0x0028($s0) ## 00000028 /* 005C8 80B14068 C60A0024 */ lwc1 $f10, 0x0024($s0) ## 00000024 -/* 005CC 80B1406C 8FA50054 */ lw $a1, 0x0054($sp) -/* 005D0 80B14070 46062200 */ add.s $f8, $f4, $f6 +/* 005CC 80B1406C 8FA50054 */ lw $a1, 0x0054($sp) +/* 005D0 80B14070 46062200 */ add.s $f8, $f4, $f6 /* 005D4 80B14074 AE0202BC */ sw $v0, 0x02BC($s0) ## 000002BC /* 005D8 80B14078 3C0141F0 */ lui $at, 0x41F0 ## $at = 41F00000 -/* 005DC 80B1407C 46105480 */ add.s $f18, $f10, $f16 -/* 005E0 80B14080 E7A80010 */ swc1 $f8, 0x0010($sp) +/* 005DC 80B1407C 46105480 */ add.s $f18, $f10, $f16 +/* 005E0 80B14080 E7A80010 */ swc1 $f8, 0x0010($sp) /* 005E4 80B14084 C60A002C */ lwc1 $f10, 0x002C($s0) ## 0000002C /* 005E8 80B14088 44818000 */ mtc1 $at, $f16 ## $f16 = 30.00 -/* 005EC 80B1408C 44079000 */ mfc1 $a3, $f18 +/* 005EC 80B1408C 44079000 */ mfc1 $a3, $f18 /* 005F0 80B14090 2408000D */ addiu $t0, $zero, 0x000D ## $t0 = 0000000D -/* 005F4 80B14094 46105481 */ sub.s $f18, $f10, $f16 -/* 005F8 80B14098 AFA80024 */ sw $t0, 0x0024($sp) -/* 005FC 80B1409C AFA00020 */ sw $zero, 0x0020($sp) -/* 00600 80B140A0 AFA0001C */ sw $zero, 0x001C($sp) -/* 00604 80B140A4 E7B20014 */ swc1 $f18, 0x0014($sp) -/* 00608 80B140A8 AFA00018 */ sw $zero, 0x0018($sp) -/* 0060C 80B140AC 8FA4003C */ lw $a0, 0x003C($sp) +/* 005F4 80B14094 46105481 */ sub.s $f18, $f10, $f16 +/* 005F8 80B14098 AFA80024 */ sw $t0, 0x0024($sp) +/* 005FC 80B1409C AFA00020 */ sw $zero, 0x0020($sp) +/* 00600 80B140A0 AFA0001C */ sw $zero, 0x001C($sp) +/* 00604 80B140A4 E7B20014 */ swc1 $f18, 0x0014($sp) +/* 00608 80B140A8 AFA00018 */ sw $zero, 0x0018($sp) +/* 0060C 80B140AC 8FA4003C */ lw $a0, 0x003C($sp) /* 00610 80B140B0 0C00C7D4 */ jal Actor_Spawn ## ActorSpawn /* 00614 80B140B4 24060019 */ addiu $a2, $zero, 0x0019 ## $a2 = 00000019 /* 00618 80B140B8 AE0202C0 */ sw $v0, 0x02C0($s0) ## 000002C0 -/* 0061C 80B140BC 8FA50054 */ lw $a1, 0x0054($sp) -/* 00620 80B140C0 0C2C4EAB */ jal func_80B13AAC +/* 0061C 80B140BC 8FA50054 */ lw $a1, 0x0054($sp) +/* 00620 80B140C0 0C2C4EAB */ jal func_80B13AAC /* 00624 80B140C4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 00628 80B140C8 3C098016 */ lui $t1, 0x8016 ## $t1 = 80160000 /* 0062C 80B140CC 9529FA5A */ lhu $t1, -0x05A6($t1) ## 8015FA5A /* 00630 80B140D0 3C0580B1 */ lui $a1, %hi(func_80B16608) ## $a1 = 80B10000 /* 00634 80B140D4 24A56608 */ addiu $a1, $a1, %lo(func_80B16608) ## $a1 = 80B16608 /* 00638 80B140D8 312A0400 */ andi $t2, $t1, 0x0400 ## $t2 = 00000000 -/* 0063C 80B140DC 11400025 */ beq $t2, $zero, .L80B14174 +/* 0063C 80B140DC 11400025 */ beq $t2, $zero, .L80B14174 /* 00640 80B140E0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 00644 80B140E4 3C0680B1 */ lui $a2, %hi(func_80B16938) ## $a2 = 80B10000 -/* 00648 80B140E8 0C2C4EA8 */ jal func_80B13AA0 +/* 00648 80B140E8 0C2C4EA8 */ jal func_80B13AA0 /* 0064C 80B140EC 24C66938 */ addiu $a2, $a2, %lo(func_80B16938) ## $a2 = 80B16938 /* 00650 80B140F0 3C040601 */ lui $a0, 0x0601 ## $a0 = 06010000 /* 00654 80B140F4 0C028800 */ jal SkelAnime_GetFrameCount - + /* 00658 80B140F8 2484C48C */ addiu $a0, $a0, 0xC48C ## $a0 = 0600C48C /* 0065C 80B140FC 3C040601 */ lui $a0, 0x0601 ## $a0 = 06010000 /* 00660 80B14100 2484C48C */ addiu $a0, $a0, 0xC48C ## $a0 = 0600C48C /* 00664 80B14104 0C028800 */ jal SkelAnime_GetFrameCount - -/* 00668 80B14108 A7A20040 */ sh $v0, 0x0040($sp) -/* 0066C 80B1410C 87AB0040 */ lh $t3, 0x0040($sp) + +/* 00668 80B14108 A7A20040 */ sh $v0, 0x0040($sp) +/* 0066C 80B1410C 87AB0040 */ lh $t3, 0x0040($sp) /* 00670 80B14110 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 /* 00674 80B14114 44810000 */ mtc1 $at, $f0 ## $f0 = 1.00 /* 00678 80B14118 448B2000 */ mtc1 $t3, $f4 ## $f4 = 0.00 /* 0067C 80B1411C 44825000 */ mtc1 $v0, $f10 ## $f10 = 0.00 /* 00680 80B14120 44809000 */ mtc1 $zero, $f18 ## $f18 = 0.00 -/* 00684 80B14124 468021A0 */ cvt.s.w $f6, $f4 +/* 00684 80B14124 468021A0 */ cvt.s.w $f6, $f4 /* 00688 80B14128 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 /* 0068C 80B1412C 240C0002 */ addiu $t4, $zero, 0x0002 ## $t4 = 00000002 -/* 00690 80B14130 44060000 */ mfc1 $a2, $f0 -/* 00694 80B14134 AFAC0014 */ sw $t4, 0x0014($sp) -/* 00698 80B14138 46805420 */ cvt.s.w $f16, $f10 +/* 00690 80B14130 44060000 */ mfc1 $a2, $f0 +/* 00694 80B14134 AFAC0014 */ sw $t4, 0x0014($sp) +/* 00698 80B14138 46805420 */ cvt.s.w $f16, $f10 /* 0069C 80B1413C 24A5C48C */ addiu $a1, $a1, 0xC48C ## $a1 = 0600C48C -/* 006A0 80B14140 8FA40038 */ lw $a0, 0x0038($sp) -/* 006A4 80B14144 E7B20018 */ swc1 $f18, 0x0018($sp) -/* 006A8 80B14148 46003201 */ sub.s $f8, $f6, $f0 -/* 006AC 80B1414C E7B00010 */ swc1 $f16, 0x0010($sp) -/* 006B0 80B14150 44074000 */ mfc1 $a3, $f8 -/* 006B4 80B14154 0C029468 */ jal SkelAnime_ChangeAnimation - +/* 006A0 80B14140 8FA40038 */ lw $a0, 0x0038($sp) +/* 006A4 80B14144 E7B20018 */ swc1 $f18, 0x0018($sp) +/* 006A8 80B14148 46003201 */ sub.s $f8, $f6, $f0 +/* 006AC 80B1414C E7B00010 */ swc1 $f16, 0x0010($sp) +/* 006B0 80B14150 44074000 */ mfc1 $a3, $f8 +/* 006B4 80B14154 0C029468 */ jal SkelAnime_ChangeAnim + /* 006B8 80B14158 00000000 */ nop /* 006BC 80B1415C 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 /* 006C0 80B14160 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 /* 006C4 80B14164 944D13FA */ lhu $t5, 0x13FA($v0) ## 8015FA5A /* 006C8 80B14168 31AEFBFF */ andi $t6, $t5, 0xFBFF ## $t6 = 00000000 -/* 006CC 80B1416C 10000031 */ beq $zero, $zero, .L80B14234 +/* 006CC 80B1416C 10000031 */ beq $zero, $zero, .L80B14234 /* 006D0 80B14170 A44E13FA */ sh $t6, 0x13FA($v0) ## 8015FA5A .L80B14174: /* 006D4 80B14174 3C0580B1 */ lui $a1, %hi(func_80B16504) ## $a1 = 80B10000 /* 006D8 80B14178 3C0680B1 */ lui $a2, %hi(func_80B16854) ## $a2 = 80B10000 /* 006DC 80B1417C 24C66854 */ addiu $a2, $a2, %lo(func_80B16854) ## $a2 = 80B16854 /* 006E0 80B14180 24A56504 */ addiu $a1, $a1, %lo(func_80B16504) ## $a1 = 80B16504 -/* 006E4 80B14184 0C2C4EA8 */ jal func_80B13AA0 +/* 006E4 80B14184 0C2C4EA8 */ jal func_80B13AA0 /* 006E8 80B14188 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 006EC 80B1418C A60002B4 */ sh $zero, 0x02B4($s0) ## 000002B4 /* 006F0 80B14190 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 006F4 80B14194 24A517E8 */ addiu $a1, $a1, 0x17E8 ## $a1 = 060017E8 -/* 006F8 80B14198 0C02947A */ jal func_800A51E8 -/* 006FC 80B1419C 8FA40038 */ lw $a0, 0x0038($sp) +/* 006F8 80B14198 0C02947A */ jal SkelAnime_ChangeAnimDefaultStop +/* 006FC 80B1419C 8FA40038 */ lw $a0, 0x0038($sp) /* 00700 80B141A0 3C0F0600 */ lui $t7, 0x0600 ## $t7 = 06000000 /* 00704 80B141A4 25EF17E8 */ addiu $t7, $t7, 0x17E8 ## $t7 = 060017E8 -/* 00708 80B141A8 10000022 */ beq $zero, $zero, .L80B14234 +/* 00708 80B141A8 10000022 */ beq $zero, $zero, .L80B14234 /* 0070C 80B141AC AE0F02E4 */ sw $t7, 0x02E4($s0) ## 000002E4 .L80B141B0: /* 00710 80B141B0 3C0680B1 */ lui $a2, %hi(func_80B167FC) ## $a2 = 80B10000 -/* 00714 80B141B4 0C2C4EA8 */ jal func_80B13AA0 +/* 00714 80B141B4 0C2C4EA8 */ jal func_80B13AA0 /* 00718 80B141B8 24C667FC */ addiu $a2, $a2, %lo(func_80B167FC) ## $a2 = 80B167FC /* 0071C 80B141BC 24180002 */ addiu $t8, $zero, 0x0002 ## $t8 = 00000002 /* 00720 80B141C0 A61802B4 */ sh $t8, 0x02B4($s0) ## 000002B4 /* 00724 80B141C4 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 /* 00728 80B141C8 24A5CD50 */ addiu $a1, $a1, 0xCD50 ## $a1 = 0600CD50 -/* 0072C 80B141CC 0C02947A */ jal func_800A51E8 -/* 00730 80B141D0 8FA40038 */ lw $a0, 0x0038($sp) +/* 0072C 80B141CC 0C02947A */ jal SkelAnime_ChangeAnimDefaultStop +/* 00730 80B141D0 8FA40038 */ lw $a0, 0x0038($sp) /* 00734 80B141D4 3C014258 */ lui $at, 0x4258 ## $at = 42580000 /* 00738 80B141D8 44812000 */ mtc1 $at, $f4 ## $f4 = 54.00 /* 0073C 80B141DC 3C190601 */ lui $t9, 0x0601 ## $t9 = 06010000 /* 00740 80B141E0 2739CD50 */ addiu $t9, $t9, 0xCD50 ## $t9 = 0600CD50 /* 00744 80B141E4 AE1902E4 */ sw $t9, 0x02E4($s0) ## 000002E4 -/* 00748 80B141E8 10000012 */ beq $zero, $zero, .L80B14234 +/* 00748 80B141E8 10000012 */ beq $zero, $zero, .L80B14234 /* 0074C 80B141EC E60400C4 */ swc1 $f4, 0x00C4($s0) ## 000000C4 .L80B141F0: /* 00750 80B141F0 3C0580B1 */ lui $a1, %hi(func_80B14634) ## $a1 = 80B10000 /* 00754 80B141F4 3C0680B1 */ lui $a2, %hi(func_80B167FC) ## $a2 = 80B10000 /* 00758 80B141F8 24C667FC */ addiu $a2, $a2, %lo(func_80B167FC) ## $a2 = 80B167FC -/* 0075C 80B141FC 0C2C4EA8 */ jal func_80B13AA0 +/* 0075C 80B141FC 0C2C4EA8 */ jal func_80B13AA0 /* 00760 80B14200 24A54634 */ addiu $a1, $a1, %lo(func_80B14634) ## $a1 = 80B14634 /* 00764 80B14204 24080002 */ addiu $t0, $zero, 0x0002 ## $t0 = 00000002 /* 00768 80B14208 A60802B4 */ sh $t0, 0x02B4($s0) ## 000002B4 /* 0076C 80B1420C 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 /* 00770 80B14210 24A5CD50 */ addiu $a1, $a1, 0xCD50 ## $a1 = 0600CD50 -/* 00774 80B14214 0C02947A */ jal func_800A51E8 -/* 00778 80B14218 8FA40038 */ lw $a0, 0x0038($sp) +/* 00774 80B14214 0C02947A */ jal SkelAnime_ChangeAnimDefaultStop +/* 00778 80B14218 8FA40038 */ lw $a0, 0x0038($sp) /* 0077C 80B1421C 3C014258 */ lui $at, 0x4258 ## $at = 42580000 /* 00780 80B14220 44813000 */ mtc1 $at, $f6 ## $f6 = 54.00 /* 00784 80B14224 3C090601 */ lui $t1, 0x0601 ## $t1 = 06010000 @@ -467,11 +467,11 @@ glabel EnTa_Init /* 0078C 80B1422C AE0902E4 */ sw $t1, 0x02E4($s0) ## 000002E4 /* 00790 80B14230 E60600C4 */ swc1 $f6, 0x00C4($s0) ## 000000C4 .L80B14234: -/* 00794 80B14234 8FBF0034 */ lw $ra, 0x0034($sp) +/* 00794 80B14234 8FBF0034 */ lw $ra, 0x0034($sp) .L80B14238: -/* 00798 80B14238 8FB00030 */ lw $s0, 0x0030($sp) +/* 00798 80B14238 8FB00030 */ lw $s0, 0x0030($sp) /* 0079C 80B1423C 27BD0050 */ addiu $sp, $sp, 0x0050 ## $sp = 00000000 -/* 007A0 80B14240 03E00008 */ jr $ra +/* 007A0 80B14240 03E00008 */ jr $ra /* 007A4 80B14244 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B13AAC.s b/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B13AAC.s index db40bdd0a1..1ccab7a8c3 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B13AAC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B13AAC.s @@ -4,7 +4,7 @@ glabel func_80B13AAC /* 00014 80B13AB4 AFBF0014 */ sw $ra, 0x0014($sp) /* 00018 80B13AB8 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 /* 0001C 80B13ABC 24050018 */ addiu $a1, $zero, 0x0018 ## $a1 = 00000018 -/* 00020 80B13AC0 0C01B0D8 */ jal func_8006C360 +/* 00020 80B13AC0 0C01B0D8 */ jal Text_GetFaceReaction /* 00024 80B13AC4 AFA60018 */ sw $a2, 0x0018($sp) /* 00028 80B13AC8 3C048016 */ lui $a0, 0x8016 ## $a0 = 80160000 /* 0002C 80B13ACC 2484E660 */ addiu $a0, $a0, 0xE660 ## $a0 = 8015E660 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B14570.s b/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B14570.s index 7c1608ad57..f6683f6236 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B14570.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B14570.s @@ -1,39 +1,39 @@ glabel func_80B14570 /* 00AD0 80B14570 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00AD4 80B14574 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00AD8 80B14578 AFA5001C */ sw $a1, 0x001C($sp) +/* 00AD4 80B14574 AFBF0014 */ sw $ra, 0x0014($sp) +/* 00AD8 80B14578 AFA5001C */ sw $a1, 0x001C($sp) /* 00ADC 80B1457C 948E02E0 */ lhu $t6, 0x02E0($a0) ## 000002E0 /* 00AE0 80B14580 849802CC */ lh $t8, 0x02CC($a0) ## 000002CC /* 00AE4 80B14584 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 /* 00AE8 80B14588 35CF0004 */ ori $t7, $t6, 0x0004 ## $t7 = 00000004 -/* 00AEC 80B1458C 17000016 */ bne $t8, $zero, .L80B145E8 +/* 00AEC 80B1458C 17000016 */ bne $t8, $zero, .L80B145E8 /* 00AF0 80B14590 A48F02E0 */ sh $t7, 0x02E0($a0) ## 000002E0 /* 00AF4 80B14594 3C0580B1 */ lui $a1, %hi(func_80B144D8) ## $a1 = 80B10000 /* 00AF8 80B14598 3C0680B1 */ lui $a2, %hi(func_80B167C0) ## $a2 = 80B10000 /* 00AFC 80B1459C 24C667C0 */ addiu $a2, $a2, %lo(func_80B167C0) ## $a2 = 80B167C0 /* 00B00 80B145A0 24A544D8 */ addiu $a1, $a1, %lo(func_80B144D8) ## $a1 = 80B144D8 -/* 00B04 80B145A4 0C2C4EA8 */ jal func_80B13AA0 -/* 00B08 80B145A8 AFA70018 */ sw $a3, 0x0018($sp) -/* 00B0C 80B145AC 8FA70018 */ lw $a3, 0x0018($sp) +/* 00B04 80B145A4 0C2C4EA8 */ jal func_80B13AA0 +/* 00B08 80B145A8 AFA70018 */ sw $a3, 0x0018($sp) +/* 00B0C 80B145AC 8FA70018 */ lw $a3, 0x0018($sp) /* 00B10 80B145B0 24190003 */ addiu $t9, $zero, 0x0003 ## $t9 = 00000003 /* 00B14 80B145B4 2408003C */ addiu $t0, $zero, 0x003C ## $t0 = 0000003C /* 00B18 80B145B8 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 /* 00B1C 80B145BC 24A5E3D8 */ addiu $a1, $a1, 0xE3D8 ## $a1 = 0600E3D8 /* 00B20 80B145C0 A4F902CE */ sh $t9, 0x02CE($a3) ## 000002CE /* 00B24 80B145C4 A4E802CC */ sh $t0, 0x02CC($a3) ## 000002CC -/* 00B28 80B145C8 0C02947A */ jal func_800A51E8 +/* 00B28 80B145C8 0C02947A */ jal SkelAnime_ChangeAnimDefaultStop /* 00B2C 80B145CC 24E4014C */ addiu $a0, $a3, 0x014C ## $a0 = 0000014C -/* 00B30 80B145D0 8FA40018 */ lw $a0, 0x0018($sp) +/* 00B30 80B145D0 8FA40018 */ lw $a0, 0x0018($sp) /* 00B34 80B145D4 3C090600 */ lui $t1, 0x0600 ## $t1 = 06000000 /* 00B38 80B145D8 25291C94 */ addiu $t1, $t1, 0x1C94 ## $t1 = 06001C94 /* 00B3C 80B145DC 24056851 */ addiu $a1, $zero, 0x6851 ## $a1 = 00006851 /* 00B40 80B145E0 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 00B44 80B145E4 AC8902E4 */ sw $t1, 0x02E4($a0) ## 000002E4 .L80B145E8: -/* 00B48 80B145E8 8FBF0014 */ lw $ra, 0x0014($sp) +/* 00B48 80B145E8 8FBF0014 */ lw $ra, 0x0014($sp) /* 00B4C 80B145EC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00B50 80B145F0 03E00008 */ jr $ra +/* 00B50 80B145F0 03E00008 */ jr $ra /* 00B54 80B145F4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B14B6C.s b/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B14B6C.s index ea61232af0..f98267d13a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B14B6C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B14B6C.s @@ -1,24 +1,24 @@ glabel func_80B14B6C /* 010CC 80B14B6C 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 010D0 80B14B70 AFB00020 */ sw $s0, 0x0020($sp) +/* 010D0 80B14B70 AFB00020 */ sw $s0, 0x0020($sp) /* 010D4 80B14B74 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 010D8 80B14B78 AFBF0024 */ sw $ra, 0x0024($sp) -/* 010DC 80B14B7C AFA5002C */ sw $a1, 0x002C($sp) -/* 010E0 80B14B80 0C042F6F */ jal func_8010BDBC +/* 010D8 80B14B78 AFBF0024 */ sw $ra, 0x0024($sp) +/* 010DC 80B14B7C AFA5002C */ sw $a1, 0x002C($sp) +/* 010E0 80B14B80 0C042F6F */ jal func_8010BDBC /* 010E4 80B14B84 24A420D8 */ addiu $a0, $a1, 0x20D8 ## $a0 = 000020D8 /* 010E8 80B14B88 24010005 */ addiu $at, $zero, 0x0005 ## $at = 00000005 -/* 010EC 80B14B8C 1441001A */ bne $v0, $at, .L80B14BF8 -/* 010F0 80B14B90 8FA4002C */ lw $a0, 0x002C($sp) +/* 010EC 80B14B8C 1441001A */ bne $v0, $at, .L80B14BF8 +/* 010F0 80B14B90 8FA4002C */ lw $a0, 0x002C($sp) /* 010F4 80B14B94 2405104F */ addiu $a1, $zero, 0x104F ## $a1 = 0000104F /* 010F8 80B14B98 2406FF9D */ addiu $a2, $zero, 0xFF9D ## $a2 = FFFFFF9D /* 010FC 80B14B9C 02003825 */ or $a3, $s0, $zero ## $a3 = 00000000 -/* 01100 80B14BA0 0C02003E */ jal func_800800F8 -/* 01104 80B14BA4 AFA00010 */ sw $zero, 0x0010($sp) +/* 01100 80B14BA0 0C02003E */ jal func_800800F8 +/* 01104 80B14BA4 AFA00010 */ sw $zero, 0x0010($sp) /* 01108 80B14BA8 3C0580B1 */ lui $a1, %hi(func_80B14AF4) ## $a1 = 80B10000 /* 0110C 80B14BAC 3C0680B1 */ lui $a2, %hi(func_80B167C0) ## $a2 = 80B10000 /* 01110 80B14BB0 24C667C0 */ addiu $a2, $a2, %lo(func_80B167C0) ## $a2 = 80B167C0 /* 01114 80B14BB4 24A54AF4 */ addiu $a1, $a1, %lo(func_80B14AF4) ## $a1 = 80B14AF4 -/* 01118 80B14BB8 0C2C4EA8 */ jal func_80B13AA0 +/* 01118 80B14BB8 0C2C4EA8 */ jal func_80B13AA0 /* 0111C 80B14BBC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 01120 80B14BC0 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 /* 01124 80B14BC4 240E0005 */ addiu $t6, $zero, 0x0005 ## $t6 = 00000005 @@ -29,7 +29,7 @@ glabel func_80B14B6C /* 01138 80B14BD8 24A5CF28 */ addiu $a1, $a1, 0xCF28 ## $a1 = 0600CF28 /* 0113C 80B14BDC 35F80010 */ ori $t8, $t7, 0x0010 ## $t8 = 00000010 /* 01140 80B14BE0 A4580ED6 */ sh $t8, 0x0ED6($v0) ## 8015F536 -/* 01144 80B14BE4 0C02947A */ jal func_800A51E8 +/* 01144 80B14BE4 0C02947A */ jal SkelAnime_ChangeAnimDefaultStop /* 01148 80B14BE8 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C /* 0114C 80B14BEC 3C190601 */ lui $t9, 0x0601 ## $t9 = 06010000 /* 01150 80B14BF0 2739C858 */ addiu $t9, $t9, 0xC858 ## $t9 = 0600C858 @@ -38,10 +38,10 @@ glabel func_80B14B6C /* 01158 80B14BF8 960802E0 */ lhu $t0, 0x02E0($s0) ## 000002E0 /* 0115C 80B14BFC 35090001 */ ori $t1, $t0, 0x0001 ## $t1 = 00000001 /* 01160 80B14C00 A60902E0 */ sh $t1, 0x02E0($s0) ## 000002E0 -/* 01164 80B14C04 8FBF0024 */ lw $ra, 0x0024($sp) -/* 01168 80B14C08 8FB00020 */ lw $s0, 0x0020($sp) +/* 01164 80B14C04 8FBF0024 */ lw $ra, 0x0024($sp) +/* 01168 80B14C08 8FB00020 */ lw $s0, 0x0020($sp) /* 0116C 80B14C0C 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 01170 80B14C10 03E00008 */ jr $ra +/* 01170 80B14C10 03E00008 */ jr $ra /* 01174 80B14C14 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B14F20.s b/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B14F20.s index 0a6af5a8ea..0bc3e51221 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B14F20.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B14F20.s @@ -1,40 +1,40 @@ glabel func_80B14F20 /* 01480 80B14F20 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 01484 80B14F24 AFBF002C */ sw $ra, 0x002C($sp) -/* 01488 80B14F28 AFB00028 */ sw $s0, 0x0028($sp) +/* 01484 80B14F24 AFBF002C */ sw $ra, 0x002C($sp) +/* 01488 80B14F28 AFB00028 */ sw $s0, 0x0028($sp) /* 0148C 80B14F2C 3C0680B1 */ lui $a2, %hi(func_80B16854) ## $a2 = 80B10000 /* 01490 80B14F30 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 01494 80B14F34 0C2C4EA8 */ jal func_80B13AA0 +/* 01494 80B14F34 0C2C4EA8 */ jal func_80B13AA0 /* 01498 80B14F38 24C66854 */ addiu $a2, $a2, %lo(func_80B16854) ## $a2 = 80B16854 /* 0149C 80B14F3C 240E0002 */ addiu $t6, $zero, 0x0002 ## $t6 = 00000002 /* 014A0 80B14F40 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 /* 014A4 80B14F44 A60E02B4 */ sh $t6, 0x02B4($s0) ## 000002B4 /* 014A8 80B14F48 0C028800 */ jal SkelAnime_GetFrameCount - + /* 014AC 80B14F4C 248417E8 */ addiu $a0, $a0, 0x17E8 ## $a0 = 060017E8 /* 014B0 80B14F50 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 014B4 80B14F54 3C01C0A0 */ lui $at, 0xC0A0 ## $at = C0A00000 /* 014B8 80B14F58 44814000 */ mtc1 $at, $f8 ## $f8 = -5.00 -/* 014BC 80B14F5C 468021A0 */ cvt.s.w $f6, $f4 +/* 014BC 80B14F5C 468021A0 */ cvt.s.w $f6, $f4 /* 014C0 80B14F60 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 014C4 80B14F64 240F0002 */ addiu $t7, $zero, 0x0002 ## $t7 = 00000002 -/* 014C8 80B14F68 AFAF0014 */ sw $t7, 0x0014($sp) +/* 014C8 80B14F68 AFAF0014 */ sw $t7, 0x0014($sp) /* 014CC 80B14F6C 24A517E8 */ addiu $a1, $a1, 0x17E8 ## $a1 = 060017E8 /* 014D0 80B14F70 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C -/* 014D4 80B14F74 E7A60010 */ swc1 $f6, 0x0010($sp) +/* 014D4 80B14F74 E7A60010 */ swc1 $f6, 0x0010($sp) /* 014D8 80B14F78 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 014DC 80B14F7C 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 014E0 80B14F80 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 014E4 80B14F84 E7A80018 */ swc1 $f8, 0x0018($sp) +/* 014E0 80B14F80 0C029468 */ jal SkelAnime_ChangeAnim + +/* 014E4 80B14F84 E7A80018 */ swc1 $f8, 0x0018($sp) /* 014E8 80B14F88 3C180600 */ lui $t8, 0x0600 ## $t8 = 06000000 /* 014EC 80B14F8C 271817E8 */ addiu $t8, $t8, 0x17E8 ## $t8 = 060017E8 /* 014F0 80B14F90 A60002E2 */ sh $zero, 0x02E2($s0) ## 000002E2 /* 014F4 80B14F94 AE1802E4 */ sw $t8, 0x02E4($s0) ## 000002E4 -/* 014F8 80B14F98 8FBF002C */ lw $ra, 0x002C($sp) -/* 014FC 80B14F9C 8FB00028 */ lw $s0, 0x0028($sp) +/* 014F8 80B14F98 8FBF002C */ lw $ra, 0x002C($sp) +/* 014FC 80B14F9C 8FB00028 */ lw $s0, 0x0028($sp) /* 01500 80B14FA0 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 01504 80B14FA4 03E00008 */ jr $ra +/* 01504 80B14FA4 03E00008 */ jr $ra /* 01508 80B14FA8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B14FAC.s b/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B14FAC.s index c6b43fdb6b..981d3acd67 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B14FAC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B14FAC.s @@ -1,39 +1,39 @@ glabel func_80B14FAC /* 0150C 80B14FAC 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 01510 80B14FB0 AFBF002C */ sw $ra, 0x002C($sp) -/* 01514 80B14FB4 AFB00028 */ sw $s0, 0x0028($sp) +/* 01510 80B14FB0 AFBF002C */ sw $ra, 0x002C($sp) +/* 01514 80B14FB4 AFB00028 */ sw $s0, 0x0028($sp) /* 01518 80B14FB8 240E0001 */ addiu $t6, $zero, 0x0001 ## $t6 = 00000001 /* 0151C 80B14FBC 3C0680B1 */ lui $a2, %hi(func_80B16938) ## $a2 = 80B10000 /* 01520 80B14FC0 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 01524 80B14FC4 A48E02B4 */ sh $t6, 0x02B4($a0) ## 000002B4 -/* 01528 80B14FC8 0C2C4EA8 */ jal func_80B13AA0 +/* 01528 80B14FC8 0C2C4EA8 */ jal func_80B13AA0 /* 0152C 80B14FCC 24C66938 */ addiu $a2, $a2, %lo(func_80B16938) ## $a2 = 80B16938 /* 01530 80B14FD0 960F02E0 */ lhu $t7, 0x02E0($s0) ## 000002E0 /* 01534 80B14FD4 3C040601 */ lui $a0, 0x0601 ## $a0 = 06010000 /* 01538 80B14FD8 2484C48C */ addiu $a0, $a0, 0xC48C ## $a0 = 0600C48C /* 0153C 80B14FDC 31F8FFEF */ andi $t8, $t7, 0xFFEF ## $t8 = 00000000 /* 01540 80B14FE0 0C028800 */ jal SkelAnime_GetFrameCount - + /* 01544 80B14FE4 A61802E0 */ sh $t8, 0x02E0($s0) ## 000002E0 /* 01548 80B14FE8 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 0154C 80B14FEC 3C01C0A0 */ lui $at, 0xC0A0 ## $at = C0A00000 /* 01550 80B14FF0 44814000 */ mtc1 $at, $f8 ## $f8 = -5.00 -/* 01554 80B14FF4 468021A0 */ cvt.s.w $f6, $f4 +/* 01554 80B14FF4 468021A0 */ cvt.s.w $f6, $f4 /* 01558 80B14FF8 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 /* 0155C 80B14FFC 24190002 */ addiu $t9, $zero, 0x0002 ## $t9 = 00000002 -/* 01560 80B15000 AFB90014 */ sw $t9, 0x0014($sp) +/* 01560 80B15000 AFB90014 */ sw $t9, 0x0014($sp) /* 01564 80B15004 24A5C48C */ addiu $a1, $a1, 0xC48C ## $a1 = 0600C48C /* 01568 80B15008 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C -/* 0156C 80B1500C E7A60010 */ swc1 $f6, 0x0010($sp) +/* 0156C 80B1500C E7A60010 */ swc1 $f6, 0x0010($sp) /* 01570 80B15010 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 01574 80B15014 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 01578 80B15018 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 0157C 80B1501C E7A80018 */ swc1 $f8, 0x0018($sp) -/* 01580 80B15020 8FBF002C */ lw $ra, 0x002C($sp) -/* 01584 80B15024 8FB00028 */ lw $s0, 0x0028($sp) +/* 01578 80B15018 0C029468 */ jal SkelAnime_ChangeAnim + +/* 0157C 80B1501C E7A80018 */ swc1 $f8, 0x0018($sp) +/* 01580 80B15020 8FBF002C */ lw $ra, 0x002C($sp) +/* 01584 80B15024 8FB00028 */ lw $s0, 0x0028($sp) /* 01588 80B15028 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 0158C 80B1502C 03E00008 */ jr $ra +/* 0158C 80B1502C 03E00008 */ jr $ra /* 01590 80B15030 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B15100.s b/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B15100.s index aeebd9d9e3..2f914bfe12 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B15100.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B15100.s @@ -1,63 +1,63 @@ glabel func_80B15100 /* 01660 80B15100 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 -/* 01664 80B15104 AFB10028 */ sw $s1, 0x0028($sp) -/* 01668 80B15108 AFBF002C */ sw $ra, 0x002C($sp) -/* 0166C 80B1510C AFB00024 */ sw $s0, 0x0024($sp) +/* 01664 80B15104 AFB10028 */ sw $s1, 0x0028($sp) +/* 01668 80B15108 AFBF002C */ sw $ra, 0x002C($sp) +/* 0166C 80B1510C AFB00024 */ sw $s0, 0x0024($sp) /* 01670 80B15110 00808825 */ or $s1, $a0, $zero ## $s1 = 00000000 /* 01674 80B15114 8CB01C44 */ lw $s0, 0x1C44($a1) ## 00001C44 -/* 01678 80B15118 AFA50044 */ sw $a1, 0x0044($sp) -/* 0167C 80B1511C 0C042F6F */ jal func_8010BDBC +/* 01678 80B15118 AFA50044 */ sw $a1, 0x0044($sp) +/* 0167C 80B1511C 0C042F6F */ jal func_8010BDBC /* 01680 80B15120 24A420D8 */ addiu $a0, $a1, 0x20D8 ## $a0 = 000020D8 /* 01684 80B15124 24010005 */ addiu $at, $zero, 0x0005 ## $at = 00000005 -/* 01688 80B15128 54410046 */ bnel $v0, $at, .L80B15244 +/* 01688 80B15128 54410046 */ bnel $v0, $at, .L80B15244 /* 0168C 80B1512C 962802E0 */ lhu $t0, 0x02E0($s1) ## 000002E0 -/* 01690 80B15130 0C041AF2 */ jal func_80106BC8 -/* 01694 80B15134 8FA40044 */ lw $a0, 0x0044($sp) -/* 01698 80B15138 10400041 */ beq $v0, $zero, .L80B15240 +/* 01690 80B15130 0C041AF2 */ jal func_80106BC8 +/* 01694 80B15134 8FA40044 */ lw $a0, 0x0044($sp) +/* 01698 80B15138 10400041 */ beq $v0, $zero, .L80B15240 /* 0169C 80B1513C 3C040601 */ lui $a0, 0x0601 ## $a0 = 06010000 /* 016A0 80B15140 0C028800 */ jal SkelAnime_GetFrameCount - + /* 016A4 80B15144 2484C48C */ addiu $a0, $a0, 0xC48C ## $a0 = 0600C48C /* 016A8 80B15148 3C040601 */ lui $a0, 0x0601 ## $a0 = 06010000 /* 016AC 80B1514C 2484C48C */ addiu $a0, $a0, 0xC48C ## $a0 = 0600C48C /* 016B0 80B15150 0C028800 */ jal SkelAnime_GetFrameCount - -/* 016B4 80B15154 A7A20034 */ sh $v0, 0x0034($sp) -/* 016B8 80B15158 87AE0034 */ lh $t6, 0x0034($sp) + +/* 016B4 80B15154 A7A20034 */ sh $v0, 0x0034($sp) +/* 016B8 80B15158 87AE0034 */ lh $t6, 0x0034($sp) /* 016BC 80B1515C 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 /* 016C0 80B15160 44810000 */ mtc1 $at, $f0 ## $f0 = 1.00 /* 016C4 80B15164 448E2000 */ mtc1 $t6, $f4 ## $f4 = 0.00 /* 016C8 80B15168 44825000 */ mtc1 $v0, $f10 ## $f10 = 0.00 /* 016CC 80B1516C 3C014120 */ lui $at, 0x4120 ## $at = 41200000 -/* 016D0 80B15170 468021A0 */ cvt.s.w $f6, $f4 +/* 016D0 80B15170 468021A0 */ cvt.s.w $f6, $f4 /* 016D4 80B15174 44819000 */ mtc1 $at, $f18 ## $f18 = 10.00 /* 016D8 80B15178 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 /* 016DC 80B1517C 240F0002 */ addiu $t7, $zero, 0x0002 ## $t7 = 00000002 -/* 016E0 80B15180 44060000 */ mfc1 $a2, $f0 -/* 016E4 80B15184 46805420 */ cvt.s.w $f16, $f10 -/* 016E8 80B15188 AFAF0014 */ sw $t7, 0x0014($sp) +/* 016E0 80B15180 44060000 */ mfc1 $a2, $f0 +/* 016E4 80B15184 46805420 */ cvt.s.w $f16, $f10 +/* 016E8 80B15188 AFAF0014 */ sw $t7, 0x0014($sp) /* 016EC 80B1518C 24A5C48C */ addiu $a1, $a1, 0xC48C ## $a1 = 0600C48C /* 016F0 80B15190 2624014C */ addiu $a0, $s1, 0x014C ## $a0 = 0000014C -/* 016F4 80B15194 E7B20018 */ swc1 $f18, 0x0018($sp) -/* 016F8 80B15198 46003201 */ sub.s $f8, $f6, $f0 -/* 016FC 80B1519C E7B00010 */ swc1 $f16, 0x0010($sp) -/* 01700 80B151A0 44074000 */ mfc1 $a3, $f8 -/* 01704 80B151A4 0C029468 */ jal SkelAnime_ChangeAnimation - +/* 016F4 80B15194 E7B20018 */ swc1 $f18, 0x0018($sp) +/* 016F8 80B15198 46003201 */ sub.s $f8, $f6, $f0 +/* 016FC 80B1519C E7B00010 */ swc1 $f16, 0x0010($sp) +/* 01700 80B151A0 44074000 */ mfc1 $a3, $f8 +/* 01704 80B151A4 0C029468 */ jal SkelAnime_ChangeAnim + /* 01708 80B151A8 00000000 */ nop /* 0170C 80B151AC 963802E0 */ lhu $t8, 0x02E0($s1) ## 000002E0 /* 01710 80B151B0 3319FFEF */ andi $t9, $t8, 0xFFEF ## $t9 = 00000000 /* 01714 80B151B4 A63902E0 */ sh $t9, 0x02E0($s1) ## 000002E0 -/* 01718 80B151B8 0C041B33 */ jal func_80106CCC -/* 0171C 80B151BC 8FA40044 */ lw $a0, 0x0044($sp) +/* 01718 80B151B8 0C041B33 */ jal func_80106CCC +/* 0171C 80B151BC 8FA40044 */ lw $a0, 0x0044($sp) /* 01720 80B151C0 922302CA */ lbu $v1, 0x02CA($s1) ## 000002CA /* 01724 80B151C4 3C0880B1 */ lui $t0, %hi(func_80B154FC) ## $t0 = 80B10000 /* 01728 80B151C8 250854FC */ addiu $t0, $t0, %lo(func_80B154FC) ## $t0 = 80B154FC /* 0172C 80B151CC AE28025C */ sw $t0, 0x025C($s1) ## 0000025C -/* 01730 80B151D0 00034880 */ sll $t1, $v1, 2 -/* 01734 80B151D4 02291021 */ addu $v0, $s1, $t1 +/* 01730 80B151D0 00034880 */ sll $t1, $v1, 2 +/* 01734 80B151D4 02291021 */ addu $v0, $s1, $t1 /* 01738 80B151D8 3C0180B1 */ lui $at, %hi(D_80B16F58) ## $at = 80B10000 -/* 0173C 80B151DC C4246F58 */ lwc1 $f4, %lo(D_80B16F58)($at) +/* 0173C 80B151DC C4246F58 */ lwc1 $f4, %lo(D_80B16F58)($at) /* 01740 80B151E0 8C4A02B8 */ lw $t2, 0x02B8($v0) ## 000002B8 /* 01744 80B151E4 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 /* 01748 80B151E8 E544006C */ swc1 $f4, 0x006C($t2) ## 0000006C @@ -69,19 +69,19 @@ glabel func_80B15100 /* 01760 80B15200 ADA00118 */ sw $zero, 0x0118($t5) ## 00000118 /* 01764 80B15204 8E0E0438 */ lw $t6, 0x0438($s0) ## 00000438 /* 01768 80B15208 8C4402B8 */ lw $a0, 0x02B8($v0) ## 000002B8 -/* 0176C 80B1520C 55C40004 */ bnel $t6, $a0, .L80B15220 +/* 0176C 80B1520C 55C40004 */ bnel $t6, $a0, .L80B15220 /* 01770 80B15210 8E0F03AC */ lw $t7, 0x03AC($s0) ## 000003AC /* 01774 80B15214 AE000438 */ sw $zero, 0x0438($s0) ## 00000438 /* 01778 80B15218 8C4402B8 */ lw $a0, 0x02B8($v0) ## 000002B8 /* 0177C 80B1521C 8E0F03AC */ lw $t7, 0x03AC($s0) ## 000003AC .L80B15220: -/* 01780 80B15220 55E40003 */ bnel $t7, $a0, .L80B15230 +/* 01780 80B15220 55E40003 */ bnel $t7, $a0, .L80B15230 /* 01784 80B15224 8E18067C */ lw $t8, 0x067C($s0) ## 0000067C /* 01788 80B15228 AE0003AC */ sw $zero, 0x03AC($s0) ## 000003AC /* 0178C 80B1522C 8E18067C */ lw $t8, 0x067C($s0) ## 0000067C .L80B15230: /* 01790 80B15230 2401F7FF */ addiu $at, $zero, 0xF7FF ## $at = FFFFF7FF -/* 01794 80B15234 0301C824 */ and $t9, $t8, $at +/* 01794 80B15234 0301C824 */ and $t9, $t8, $at /* 01798 80B15238 AE19067C */ sw $t9, 0x067C($s0) ## 0000067C /* 0179C 80B1523C AC4002B8 */ sw $zero, 0x02B8($v0) ## 000002B8 .L80B15240: @@ -89,10 +89,10 @@ glabel func_80B15100 .L80B15244: /* 017A4 80B15244 35090001 */ ori $t1, $t0, 0x0001 ## $t1 = 80B154FD /* 017A8 80B15248 A62902E0 */ sh $t1, 0x02E0($s1) ## 000002E0 -/* 017AC 80B1524C 8FBF002C */ lw $ra, 0x002C($sp) -/* 017B0 80B15250 8FB10028 */ lw $s1, 0x0028($sp) -/* 017B4 80B15254 8FB00024 */ lw $s0, 0x0024($sp) -/* 017B8 80B15258 03E00008 */ jr $ra +/* 017AC 80B1524C 8FBF002C */ lw $ra, 0x002C($sp) +/* 017B0 80B15250 8FB10028 */ lw $s1, 0x0028($sp) +/* 017B4 80B15254 8FB00024 */ lw $s0, 0x0024($sp) +/* 017B8 80B15258 03E00008 */ jr $ra /* 017BC 80B1525C 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B15308.s b/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B15308.s index bd5d41cb8a..2677c75dd4 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B15308.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B15308.s @@ -1,31 +1,31 @@ glabel func_80B15308 /* 01868 80B15308 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 0186C 80B1530C AFBF002C */ sw $ra, 0x002C($sp) -/* 01870 80B15310 AFB00028 */ sw $s0, 0x0028($sp) +/* 0186C 80B1530C AFBF002C */ sw $ra, 0x002C($sp) +/* 01870 80B15310 AFB00028 */ sw $s0, 0x0028($sp) /* 01874 80B15314 948202E0 */ lhu $v0, 0x02E0($a0) ## 000002E0 /* 01878 80B15318 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 0187C 80B1531C 304E0010 */ andi $t6, $v0, 0x0010 ## $t6 = 00000000 -/* 01880 80B15320 11C00027 */ beq $t6, $zero, .L80B153C0 +/* 01880 80B15320 11C00027 */ beq $t6, $zero, .L80B153C0 /* 01884 80B15324 304F0100 */ andi $t7, $v0, 0x0100 ## $t7 = 00000000 -/* 01888 80B15328 11E00012 */ beq $t7, $zero, .L80B15374 +/* 01888 80B15328 11E00012 */ beq $t7, $zero, .L80B15374 /* 0188C 80B1532C 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 /* 01890 80B15330 3C0141B0 */ lui $at, 0x41B0 ## $at = 41B00000 /* 01894 80B15334 44812000 */ mtc1 $at, $f4 ## $f4 = 22.00 /* 01898 80B15338 44803000 */ mtc1 $zero, $f6 ## $f6 = 0.00 /* 0189C 80B1533C 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 /* 018A0 80B15340 24180002 */ addiu $t8, $zero, 0x0002 ## $t8 = 00000002 -/* 018A4 80B15344 AFB80014 */ sw $t8, 0x0014($sp) +/* 018A4 80B15344 AFB80014 */ sw $t8, 0x0014($sp) /* 018A8 80B15348 24A5BF38 */ addiu $a1, $a1, 0xBF38 ## $a1 = 0600BF38 /* 018AC 80B1534C 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C /* 018B0 80B15350 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 018B4 80B15354 3C074188 */ lui $a3, 0x4188 ## $a3 = 41880000 -/* 018B8 80B15358 E7A40010 */ swc1 $f4, 0x0010($sp) -/* 018BC 80B1535C 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 018C0 80B15360 E7A60018 */ swc1 $f6, 0x0018($sp) +/* 018B8 80B15358 E7A40010 */ swc1 $f4, 0x0010($sp) +/* 018BC 80B1535C 0C029468 */ jal SkelAnime_ChangeAnim + +/* 018C0 80B15360 E7A60018 */ swc1 $f6, 0x0018($sp) /* 018C4 80B15364 961902E0 */ lhu $t9, 0x02E0($s0) ## 000002E0 /* 018C8 80B15368 3328FEFF */ andi $t0, $t9, 0xFEFF ## $t0 = 00000000 -/* 018CC 80B1536C 10000011 */ beq $zero, $zero, .L80B153B4 +/* 018CC 80B1536C 10000011 */ beq $zero, $zero, .L80B153B4 /* 018D0 80B15370 A60802E0 */ sh $t0, 0x02E0($s0) ## 000002E0 .L80B15374: /* 018D4 80B15374 3C014180 */ lui $at, 0x4180 ## $at = 41800000 @@ -33,15 +33,15 @@ glabel func_80B15308 /* 018DC 80B1537C 3C014040 */ lui $at, 0x4040 ## $at = 40400000 /* 018E0 80B15380 44815000 */ mtc1 $at, $f10 ## $f10 = 3.00 /* 018E4 80B15384 24090002 */ addiu $t1, $zero, 0x0002 ## $t1 = 00000002 -/* 018E8 80B15388 AFA90014 */ sw $t1, 0x0014($sp) +/* 018E8 80B15388 AFA90014 */ sw $t1, 0x0014($sp) /* 018EC 80B1538C 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C /* 018F0 80B15390 24A5BF38 */ addiu $a1, $a1, 0xBF38 ## $a1 = FFFFBF38 /* 018F4 80B15394 3C06BF80 */ lui $a2, 0xBF80 ## $a2 = BF800000 /* 018F8 80B15398 3C0741A8 */ lui $a3, 0x41A8 ## $a3 = 41A80000 -/* 018FC 80B1539C E7A80010 */ swc1 $f8, 0x0010($sp) -/* 01900 80B153A0 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 01904 80B153A4 E7AA0018 */ swc1 $f10, 0x0018($sp) +/* 018FC 80B1539C E7A80010 */ swc1 $f8, 0x0010($sp) +/* 01900 80B153A0 0C029468 */ jal SkelAnime_ChangeAnim + +/* 01904 80B153A4 E7AA0018 */ swc1 $f10, 0x0018($sp) /* 01908 80B153A8 960A02E0 */ lhu $t2, 0x02E0($s0) ## 000002E0 /* 0190C 80B153AC 354B0100 */ ori $t3, $t2, 0x0100 ## $t3 = 00000100 /* 01910 80B153B0 A60B02E0 */ sh $t3, 0x02E0($s0) ## 000002E0 @@ -50,10 +50,10 @@ glabel func_80B15308 /* 01918 80B153B8 318DFFEF */ andi $t5, $t4, 0xFFEF ## $t5 = 00000000 /* 0191C 80B153BC A60D02E0 */ sh $t5, 0x02E0($s0) ## 000002E0 .L80B153C0: -/* 01920 80B153C0 8FBF002C */ lw $ra, 0x002C($sp) -/* 01924 80B153C4 8FB00028 */ lw $s0, 0x0028($sp) +/* 01920 80B153C0 8FBF002C */ lw $ra, 0x002C($sp) +/* 01924 80B153C4 8FB00028 */ lw $s0, 0x0028($sp) /* 01928 80B153C8 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 0192C 80B153CC 03E00008 */ jr $ra +/* 0192C 80B153CC 03E00008 */ jr $ra /* 01930 80B153D0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B154FC.s b/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B154FC.s index 8ebdaefe77..6372345534 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B154FC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B154FC.s @@ -1,42 +1,42 @@ glabel func_80B154FC /* 01A5C 80B154FC 27BDFFB0 */ addiu $sp, $sp, 0xFFB0 ## $sp = FFFFFFB0 -/* 01A60 80B15500 AFB20030 */ sw $s2, 0x0030($sp) -/* 01A64 80B15504 AFB1002C */ sw $s1, 0x002C($sp) -/* 01A68 80B15508 AFB00028 */ sw $s0, 0x0028($sp) +/* 01A60 80B15500 AFB20030 */ sw $s2, 0x0030($sp) +/* 01A64 80B15504 AFB1002C */ sw $s1, 0x002C($sp) +/* 01A68 80B15508 AFB00028 */ sw $s0, 0x0028($sp) /* 01A6C 80B1550C 00808825 */ or $s1, $a0, $zero ## $s1 = 00000000 /* 01A70 80B15510 00A09025 */ or $s2, $a1, $zero ## $s2 = 00000000 -/* 01A74 80B15514 AFBF0034 */ sw $ra, 0x0034($sp) +/* 01A74 80B15514 AFBF0034 */ sw $ra, 0x0034($sp) /* 01A78 80B15518 00008025 */ or $s0, $zero, $zero ## $s0 = 00000000 /* 01A7C 80B1551C 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 .L80B15520: /* 01A80 80B15520 8CE202B8 */ lw $v0, 0x02B8($a3) ## 000002B8 /* 01A84 80B15524 3C01C000 */ lui $at, 0xC000 ## $at = C0000000 /* 01A88 80B15528 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 01A8C 80B1552C 1040007F */ beq $v0, $zero, .L80B1572C +/* 01A8C 80B1552C 1040007F */ beq $v0, $zero, .L80B1572C /* 01A90 80B15530 02402825 */ or $a1, $s2, $zero ## $a1 = 00000000 /* 01A94 80B15534 C440006C */ lwc1 $f0, 0x006C($v0) ## 0000006C /* 01A98 80B15538 44812000 */ mtc1 $at, $f4 ## $f4 = -2.00 -/* 01A9C 80B1553C 00107040 */ sll $t6, $s0, 1 -/* 01AA0 80B15540 022E1821 */ addu $v1, $s1, $t6 -/* 01AA4 80B15544 4600203C */ c.lt.s $f4, $f0 +/* 01A9C 80B1553C 00107040 */ sll $t6, $s0, 1 +/* 01AA0 80B15540 022E1821 */ addu $v1, $s1, $t6 +/* 01AA4 80B15544 4600203C */ c.lt.s $f4, $f0 /* 01AA8 80B15548 3C0180B1 */ lui $at, %hi(D_80B16F5C) ## $at = 80B10000 /* 01AAC 80B1554C 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 -/* 01AB0 80B15550 45020005 */ bc1fl .L80B15568 -/* 01AB4 80B15554 AFA30038 */ sw $v1, 0x0038($sp) -/* 01AB8 80B15558 C4266F5C */ lwc1 $f6, %lo(D_80B16F5C)($at) -/* 01ABC 80B1555C 46060201 */ sub.s $f8, $f0, $f6 +/* 01AB0 80B15550 45020005 */ bc1fl .L80B15568 +/* 01AB4 80B15554 AFA30038 */ sw $v1, 0x0038($sp) +/* 01AB8 80B15558 C4266F5C */ lwc1 $f6, %lo(D_80B16F5C)($at) +/* 01ABC 80B1555C 46060201 */ sub.s $f8, $f0, $f6 /* 01AC0 80B15560 E448006C */ swc1 $f8, 0x006C($v0) ## 0000006C -/* 01AC4 80B15564 AFA30038 */ sw $v1, 0x0038($sp) +/* 01AC4 80B15564 AFA30038 */ sw $v1, 0x0038($sp) .L80B15568: -/* 01AC8 80B15568 0C2C542B */ jal func_80B150AC -/* 01ACC 80B1556C AFA70044 */ sw $a3, 0x0044($sp) -/* 01AD0 80B15570 8FA30038 */ lw $v1, 0x0038($sp) -/* 01AD4 80B15574 1040006B */ beq $v0, $zero, .L80B15724 -/* 01AD8 80B15578 8FA70044 */ lw $a3, 0x0044($sp) +/* 01AC8 80B15568 0C2C542B */ jal func_80B150AC +/* 01ACC 80B1556C AFA70044 */ sw $a3, 0x0044($sp) +/* 01AD0 80B15570 8FA30038 */ lw $v1, 0x0038($sp) +/* 01AD4 80B15574 1040006B */ beq $v0, $zero, .L80B15724 +/* 01AD8 80B15578 8FA70044 */ lw $a3, 0x0044($sp) /* 01ADC 80B1557C 846202C4 */ lh $v0, 0x02C4($v1) ## 000002C4 -/* 01AE0 80B15580 18400003 */ blez $v0, .L80B15590 +/* 01AE0 80B15580 18400003 */ blez $v0, .L80B15590 /* 01AE4 80B15584 244FFFFF */ addiu $t7, $v0, 0xFFFF ## $t7 = FFFFFFFF -/* 01AE8 80B15588 10000068 */ beq $zero, $zero, .L80B1572C +/* 01AE8 80B15588 10000068 */ beq $zero, $zero, .L80B1572C /* 01AEC 80B1558C A46F02C4 */ sh $t7, 0x02C4($v1) ## 000002C4 .L80B15590: /* 01AF0 80B15590 3C0141E8 */ lui $at, 0x41E8 ## $at = 41E80000 @@ -47,42 +47,42 @@ glabel func_80B154FC /* 01B04 80B155A4 2624014C */ addiu $a0, $s1, 0x014C ## $a0 = 0000014C /* 01B08 80B155A8 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 /* 01B0C 80B155AC 24180002 */ addiu $t8, $zero, 0x0002 ## $t8 = 00000002 -/* 01B10 80B155B0 AFB80014 */ sw $t8, 0x0014($sp) +/* 01B10 80B155B0 AFB80014 */ sw $t8, 0x0014($sp) /* 01B14 80B155B4 24A5BF38 */ addiu $a1, $a1, 0xBF38 ## $a1 = 0600BF38 -/* 01B18 80B155B8 AFA40044 */ sw $a0, 0x0044($sp) +/* 01B18 80B155B8 AFA40044 */ sw $a0, 0x0044($sp) /* 01B1C 80B155BC 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 01B20 80B155C0 3C074100 */ lui $a3, 0x4100 ## $a3 = 41000000 -/* 01B24 80B155C4 E7AA0010 */ swc1 $f10, 0x0010($sp) -/* 01B28 80B155C8 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 01B2C 80B155CC E7B00018 */ swc1 $f16, 0x0018($sp) +/* 01B24 80B155C4 E7AA0010 */ swc1 $f10, 0x0010($sp) +/* 01B28 80B155C8 0C029468 */ jal SkelAnime_ChangeAnim + +/* 01B2C 80B155CC E7B00018 */ swc1 $f16, 0x0018($sp) /* 01B30 80B155D0 963902E0 */ lhu $t9, 0x02E0($s1) ## 000002E0 /* 01B34 80B155D4 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 01B38 80B155D8 02402825 */ or $a1, $s2, $zero ## $a1 = 00000000 /* 01B3C 80B155DC 3328FFEF */ andi $t0, $t9, 0xFFEF ## $t0 = 00000000 -/* 01B40 80B155E0 0C2C54B4 */ jal func_80B152D0 +/* 01B40 80B155E0 0C2C54B4 */ jal func_80B152D0 /* 01B44 80B155E4 A62802E0 */ sh $t0, 0x02E0($s1) ## 000002E0 /* 01B48 80B155E8 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 01B4C 80B155EC 10410009 */ beq $v0, $at, .L80B15614 +/* 01B4C 80B155EC 10410009 */ beq $v0, $at, .L80B15614 /* 01B50 80B155F0 3C108016 */ lui $s0, 0x8016 ## $s0 = 80160000 /* 01B54 80B155F4 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 01B58 80B155F8 10410033 */ beq $v0, $at, .L80B156C8 +/* 01B58 80B155F8 10410033 */ beq $v0, $at, .L80B156C8 /* 01B5C 80B155FC 24092083 */ addiu $t1, $zero, 0x2083 ## $t1 = 00002083 /* 01B60 80B15600 24010003 */ addiu $at, $zero, 0x0003 ## $at = 00000003 -/* 01B64 80B15604 10410036 */ beq $v0, $at, .L80B156E0 +/* 01B64 80B15604 10410036 */ beq $v0, $at, .L80B156E0 /* 01B68 80B15608 240A2082 */ addiu $t2, $zero, 0x2082 ## $t2 = 00002082 -/* 01B6C 80B1560C 10000039 */ beq $zero, $zero, .L80B156F4 +/* 01B6C 80B1560C 10000039 */ beq $zero, $zero, .L80B156F4 /* 01B70 80B15610 8E2C0004 */ lw $t4, 0x0004($s1) ## 00000004 .L80B15614: /* 01B74 80B15614 2610E660 */ addiu $s0, $s0, 0xE660 ## $s0 = 8015E660 /* 01B78 80B15618 A60013CE */ sh $zero, 0x13CE($s0) ## 8015FA2E /* 01B7C 80B1561C 02402025 */ or $a0, $s2, $zero ## $a0 = 00000000 /* 01B80 80B15620 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 01B84 80B15624 0C00B7D5 */ jal func_8002DF54 +/* 01B84 80B15624 0C00B7D5 */ jal func_8002DF54 /* 01B88 80B15628 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 /* 01B8C 80B1562C 02402025 */ or $a0, $s2, $zero ## $a0 = 00000000 /* 01B90 80B15630 24052084 */ addiu $a1, $zero, 0x2084 ## $a1 = 00002084 -/* 01B94 80B15634 0C042DA0 */ jal func_8010B680 +/* 01B94 80B15634 0C042DA0 */ jal func_8010B680 /* 01B98 80B15638 02203025 */ or $a2, $s1, $zero ## $a2 = 00000000 /* 01B9C 80B1563C 3C0980B1 */ lui $t1, %hi(func_80B15424) ## $t1 = 80B10000 /* 01BA0 80B15640 3C0141E8 */ lui $at, 0x41E8 ## $at = 41E80000 @@ -93,15 +93,15 @@ glabel func_80B154FC /* 01BB4 80B15654 44812000 */ mtc1 $at, $f4 ## $f4 = -10.00 /* 01BB8 80B15658 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 /* 01BBC 80B1565C 240A0002 */ addiu $t2, $zero, 0x0002 ## $t2 = 00000002 -/* 01BC0 80B15660 AFAA0014 */ sw $t2, 0x0014($sp) +/* 01BC0 80B15660 AFAA0014 */ sw $t2, 0x0014($sp) /* 01BC4 80B15664 24A5BF38 */ addiu $a1, $a1, 0xBF38 ## $a1 = 0600BF38 -/* 01BC8 80B15668 8FA40044 */ lw $a0, 0x0044($sp) +/* 01BC8 80B15668 8FA40044 */ lw $a0, 0x0044($sp) /* 01BCC 80B1566C 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 01BD0 80B15670 3C074100 */ lui $a3, 0x4100 ## $a3 = 41000000 -/* 01BD4 80B15674 E7B20010 */ swc1 $f18, 0x0010($sp) -/* 01BD8 80B15678 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 01BDC 80B1567C E7A40018 */ swc1 $f4, 0x0018($sp) +/* 01BD4 80B15674 E7B20010 */ swc1 $f18, 0x0010($sp) +/* 01BD8 80B15678 0C029468 */ jal SkelAnime_ChangeAnim + +/* 01BDC 80B1567C E7A40018 */ swc1 $f4, 0x0018($sp) /* 01BE0 80B15680 962B02E0 */ lhu $t3, 0x02E0($s1) ## 000002E0 /* 01BE4 80B15684 3C041000 */ lui $a0, 0x1000 ## $a0 = 10000000 /* 01BE8 80B15688 348400FF */ ori $a0, $a0, 0x00FF ## $a0 = 100000FF @@ -112,28 +112,28 @@ glabel func_80B154FC /* 01BFC 80B1569C 960F13FA */ lhu $t7, 0x13FA($s0) ## 8015FA5A /* 01C00 80B156A0 35F80100 */ ori $t8, $t7, 0x0100 ## $t8 = 00000100 /* 01C04 80B156A4 0C03E803 */ jal Audio_SetBGM - + /* 01C08 80B156A8 A61813FA */ sh $t8, 0x13FA($s0) ## 8015FA5A /* 01C0C 80B156AC 963902E0 */ lhu $t9, 0x02E0($s1) ## 000002E0 /* 01C10 80B156B0 24040039 */ addiu $a0, $zero, 0x0039 ## $a0 = 00000039 /* 01C14 80B156B4 3328FDFF */ andi $t0, $t9, 0xFDFF ## $t0 = 00000000 -/* 01C18 80B156B8 0C03D719 */ jal func_800F5C64 +/* 01C18 80B156B8 0C03D719 */ jal func_800F5C64 /* 01C1C 80B156BC A62802E0 */ sh $t0, 0x02E0($s1) ## 000002E0 -/* 01C20 80B156C0 10000061 */ beq $zero, $zero, .L80B15848 -/* 01C24 80B156C4 8FBF0034 */ lw $ra, 0x0034($sp) +/* 01C20 80B156C0 10000061 */ beq $zero, $zero, .L80B15848 +/* 01C24 80B156C4 8FBF0034 */ lw $ra, 0x0034($sp) .L80B156C8: /* 01C28 80B156C8 A629010E */ sh $t1, 0x010E($s1) ## 0000010E /* 01C2C 80B156CC 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 01C30 80B156D0 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 01C34 80B156D4 24056853 */ addiu $a1, $zero, 0x6853 ## $a1 = 00006853 -/* 01C38 80B156D8 10000006 */ beq $zero, $zero, .L80B156F4 +/* 01C38 80B156D8 10000006 */ beq $zero, $zero, .L80B156F4 /* 01C3C 80B156DC 8E2C0004 */ lw $t4, 0x0004($s1) ## 00000004 .L80B156E0: /* 01C40 80B156E0 A62A010E */ sh $t2, 0x010E($s1) ## 0000010E /* 01C44 80B156E4 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 01C48 80B156E8 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 01C4C 80B156EC 24056851 */ addiu $a1, $zero, 0x6851 ## $a1 = 00006851 /* 01C50 80B156F0 8E2C0004 */ lw $t4, 0x0004($s1) ## 00000004 .L80B156F4: @@ -145,56 +145,56 @@ glabel func_80B154FC /* 01C68 80B15708 AE2D0004 */ sw $t5, 0x0004($s1) ## 00000004 /* 01C6C 80B1570C 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 01C70 80B15710 02402825 */ or $a1, $s2, $zero ## $a1 = 00000000 -/* 01C74 80B15714 0C00BCB3 */ jal func_8002F2CC +/* 01C74 80B15714 0C00BCB3 */ jal func_8002F2CC /* 01C78 80B15718 3C06447A */ lui $a2, 0x447A ## $a2 = 447A0000 -/* 01C7C 80B1571C 1000004A */ beq $zero, $zero, .L80B15848 -/* 01C80 80B15720 8FBF0034 */ lw $ra, 0x0034($sp) +/* 01C7C 80B1571C 1000004A */ beq $zero, $zero, .L80B15848 +/* 01C80 80B15720 8FBF0034 */ lw $ra, 0x0034($sp) .L80B15724: /* 01C84 80B15724 240E0007 */ addiu $t6, $zero, 0x0007 ## $t6 = 00000007 /* 01C88 80B15728 A46E02C4 */ sh $t6, 0x02C4($v1) ## 000002C4 .L80B1572C: /* 01C8C 80B1572C 26100001 */ addiu $s0, $s0, 0x0001 ## $s0 = 8015E661 /* 01C90 80B15730 24010003 */ addiu $at, $zero, 0x0003 ## $at = 00000003 -/* 01C94 80B15734 1601FF7A */ bne $s0, $at, .L80B15520 +/* 01C94 80B15734 1601FF7A */ bne $s0, $at, .L80B15520 /* 01C98 80B15738 24E70004 */ addiu $a3, $a3, 0x0004 ## $a3 = 00000004 /* 01C9C 80B1573C 3C108016 */ lui $s0, 0x8016 ## $s0 = 80160000 /* 01CA0 80B15740 2610E660 */ addiu $s0, $s0, 0xE660 ## $s0 = 8015E660 /* 01CA4 80B15744 860213D0 */ lh $v0, 0x13D0($s0) ## 8015FA30 /* 01CA8 80B15748 2401000A */ addiu $at, $zero, 0x000A ## $at = 0000000A -/* 01CAC 80B1574C 14410004 */ bne $v0, $at, .L80B15760 +/* 01CAC 80B1574C 14410004 */ bne $v0, $at, .L80B15760 /* 01CB0 80B15750 00000000 */ nop -/* 01CB4 80B15754 0C03D646 */ jal func_800F5918 +/* 01CB4 80B15754 0C03D646 */ jal func_800F5918 /* 01CB8 80B15758 00000000 */ nop /* 01CBC 80B1575C 860213D0 */ lh $v0, 0x13D0($s0) ## 8015FA30 .L80B15760: -/* 01CC0 80B15760 54400036 */ bnel $v0, $zero, .L80B1583C +/* 01CC0 80B15760 54400036 */ bnel $v0, $zero, .L80B1583C /* 01CC4 80B15764 963902E0 */ lhu $t9, 0x02E0($s1) ## 000002E0 -/* 01CC8 80B15768 0C02FF21 */ jal func_800BFC84 +/* 01CC8 80B15768 0C02FF21 */ jal func_800BFC84 /* 01CCC 80B1576C 02402025 */ or $a0, $s2, $zero ## $a0 = 00000000 -/* 01CD0 80B15770 14400031 */ bne $v0, $zero, .L80B15838 +/* 01CD0 80B15770 14400031 */ bne $v0, $zero, .L80B15838 /* 01CD4 80B15774 3C041000 */ lui $a0, 0x1000 ## $a0 = 10000000 /* 01CD8 80B15778 0C03E803 */ jal Audio_SetBGM - + /* 01CDC 80B1577C 348400FF */ ori $a0, $a0, 0x00FF ## $a0 = 100000FF /* 01CE0 80B15780 962F02E0 */ lhu $t7, 0x02E0($s1) ## 000002E0 /* 01CE4 80B15784 2404482C */ addiu $a0, $zero, 0x482C ## $a0 = 0000482C /* 01CE8 80B15788 31F8FDFF */ andi $t8, $t7, 0xFDFF ## $t8 = 00000000 -/* 01CEC 80B1578C 0C01E221 */ jal func_80078884 +/* 01CEC 80B1578C 0C01E221 */ jal func_80078884 /* 01CF0 80B15790 A63802E0 */ sh $t8, 0x02E0($s1) ## 000002E0 /* 01CF4 80B15794 A60013CE */ sh $zero, 0x13CE($s0) ## 8015FA2E /* 01CF8 80B15798 02402025 */ or $a0, $s2, $zero ## $a0 = 00000000 /* 01CFC 80B1579C 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 01D00 80B157A0 0C00B7D5 */ jal func_8002DF54 +/* 01D00 80B157A0 0C00B7D5 */ jal func_8002DF54 /* 01D04 80B157A4 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 /* 01D08 80B157A8 02402025 */ or $a0, $s2, $zero ## $a0 = 00000000 /* 01D0C 80B157AC 24052081 */ addiu $a1, $zero, 0x2081 ## $a1 = 00002081 -/* 01D10 80B157B0 0C042DA0 */ jal func_8010B680 +/* 01D10 80B157B0 0C042DA0 */ jal func_8010B680 /* 01D14 80B157B4 02203025 */ or $a2, $s1, $zero ## $a2 = 00000000 /* 01D18 80B157B8 3C1980B1 */ lui $t9, %hi(func_80B15424) ## $t9 = 80B10000 /* 01D1C 80B157BC 27395424 */ addiu $t9, $t9, %lo(func_80B15424) ## $t9 = 80B15424 /* 01D20 80B157C0 AE39025C */ sw $t9, 0x025C($s1) ## 0000025C /* 01D24 80B157C4 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 01D28 80B157C8 0C2C538A */ jal func_80B14E28 +/* 01D28 80B157C8 0C2C538A */ jal func_80B14E28 /* 01D2C 80B157CC 02402825 */ or $a1, $s2, $zero ## $a1 = 00000000 /* 01D30 80B157D0 960813FA */ lhu $t0, 0x13FA($s0) ## 8015FA5A /* 01D34 80B157D4 3C0141E8 */ lui $at, 0x41E8 ## $at = 41E80000 @@ -209,31 +209,31 @@ glabel func_80B154FC /* 01D58 80B157F8 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 /* 01D5C 80B157FC 240C0002 */ addiu $t4, $zero, 0x0002 ## $t4 = 00000002 /* 01D60 80B15800 2412FEFF */ addiu $s2, $zero, 0xFEFF ## $s2 = FFFFFEFF -/* 01D64 80B15804 AFAC0014 */ sw $t4, 0x0014($sp) +/* 01D64 80B15804 AFAC0014 */ sw $t4, 0x0014($sp) /* 01D68 80B15808 24A5BF38 */ addiu $a1, $a1, 0xBF38 ## $a1 = 0600BF38 /* 01D6C 80B1580C 2624014C */ addiu $a0, $s1, 0x014C ## $a0 = 0000014C /* 01D70 80B15810 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 01D74 80B15814 3C074100 */ lui $a3, 0x4100 ## $a3 = 41000000 -/* 01D78 80B15818 E7A60010 */ swc1 $f6, 0x0010($sp) -/* 01D7C 80B1581C 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 01D80 80B15820 E7A80018 */ swc1 $f8, 0x0018($sp) +/* 01D78 80B15818 E7A60010 */ swc1 $f6, 0x0010($sp) +/* 01D7C 80B1581C 0C029468 */ jal SkelAnime_ChangeAnim + +/* 01D80 80B15820 E7A80018 */ swc1 $f8, 0x0018($sp) /* 01D84 80B15824 962D02E0 */ lhu $t5, 0x02E0($s1) ## 000002E0 /* 01D88 80B15828 31AFFFEF */ andi $t7, $t5, 0xFFEF ## $t7 = 00000000 /* 01D8C 80B1582C A62F02E0 */ sh $t7, 0x02E0($s1) ## 000002E0 -/* 01D90 80B15830 01F2C024 */ and $t8, $t7, $s2 +/* 01D90 80B15830 01F2C024 */ and $t8, $t7, $s2 /* 01D94 80B15834 A63802E0 */ sh $t8, 0x02E0($s1) ## 000002E0 .L80B15838: /* 01D98 80B15838 963902E0 */ lhu $t9, 0x02E0($s1) ## 000002E0 .L80B1583C: /* 01D9C 80B1583C 37280001 */ ori $t0, $t9, 0x0001 ## $t0 = 00000001 /* 01DA0 80B15840 A62802E0 */ sh $t0, 0x02E0($s1) ## 000002E0 -/* 01DA4 80B15844 8FBF0034 */ lw $ra, 0x0034($sp) +/* 01DA4 80B15844 8FBF0034 */ lw $ra, 0x0034($sp) .L80B15848: -/* 01DA8 80B15848 8FB00028 */ lw $s0, 0x0028($sp) -/* 01DAC 80B1584C 8FB1002C */ lw $s1, 0x002C($sp) -/* 01DB0 80B15850 8FB20030 */ lw $s2, 0x0030($sp) -/* 01DB4 80B15854 03E00008 */ jr $ra +/* 01DA8 80B15848 8FB00028 */ lw $s0, 0x0028($sp) +/* 01DAC 80B1584C 8FB1002C */ lw $s1, 0x002C($sp) +/* 01DB0 80B15850 8FB20030 */ lw $s2, 0x0030($sp) +/* 01DB4 80B15854 03E00008 */ jr $ra /* 01DB8 80B15858 27BD0050 */ addiu $sp, $sp, 0x0050 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B1585C.s b/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B1585C.s index 3b3a66db85..0599182d65 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B1585C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B1585C.s @@ -1,55 +1,55 @@ glabel func_80B1585C /* 01DBC 80B1585C 27BDFFA0 */ addiu $sp, $sp, 0xFFA0 ## $sp = FFFFFFA0 -/* 01DC0 80B15860 AFBF005C */ sw $ra, 0x005C($sp) -/* 01DC4 80B15864 AFB60058 */ sw $s6, 0x0058($sp) -/* 01DC8 80B15868 AFB50054 */ sw $s5, 0x0054($sp) -/* 01DCC 80B1586C AFB40050 */ sw $s4, 0x0050($sp) -/* 01DD0 80B15870 AFB3004C */ sw $s3, 0x004C($sp) -/* 01DD4 80B15874 AFB20048 */ sw $s2, 0x0048($sp) -/* 01DD8 80B15878 AFB10044 */ sw $s1, 0x0044($sp) -/* 01DDC 80B1587C AFB00040 */ sw $s0, 0x0040($sp) -/* 01DE0 80B15880 F7B80038 */ sdc1 $f24, 0x0038($sp) -/* 01DE4 80B15884 F7B60030 */ sdc1 $f22, 0x0030($sp) -/* 01DE8 80B15888 F7B40028 */ sdc1 $f20, 0x0028($sp) -/* 01DEC 80B1588C AFA50064 */ sw $a1, 0x0064($sp) +/* 01DC0 80B15860 AFBF005C */ sw $ra, 0x005C($sp) +/* 01DC4 80B15864 AFB60058 */ sw $s6, 0x0058($sp) +/* 01DC8 80B15868 AFB50054 */ sw $s5, 0x0054($sp) +/* 01DCC 80B1586C AFB40050 */ sw $s4, 0x0050($sp) +/* 01DD0 80B15870 AFB3004C */ sw $s3, 0x004C($sp) +/* 01DD4 80B15874 AFB20048 */ sw $s2, 0x0048($sp) +/* 01DD8 80B15878 AFB10044 */ sw $s1, 0x0044($sp) +/* 01DDC 80B1587C AFB00040 */ sw $s0, 0x0040($sp) +/* 01DE0 80B15880 F7B80038 */ sdc1 $f24, 0x0038($sp) +/* 01DE4 80B15884 F7B60030 */ sdc1 $f22, 0x0030($sp) +/* 01DE8 80B15888 F7B40028 */ sdc1 $f20, 0x0028($sp) +/* 01DEC 80B1588C AFA50064 */ sw $a1, 0x0064($sp) /* 01DF0 80B15890 848202CC */ lh $v0, 0x02CC($a0) ## 000002CC /* 01DF4 80B15894 0080B025 */ or $s6, $a0, $zero ## $s6 = 00000000 /* 01DF8 80B15898 24110001 */ addiu $s1, $zero, 0x0001 ## $s1 = 00000001 -/* 01DFC 80B1589C 28410024 */ slti $at, $v0, 0x0024 -/* 01E00 80B158A0 1420001C */ bne $at, $zero, .L80B15914 +/* 01DFC 80B1589C 28410024 */ slti $at, $v0, 0x0024 +/* 01E00 80B158A0 1420001C */ bne $at, $zero, .L80B15914 /* 01E04 80B158A4 24030023 */ addiu $v1, $zero, 0x0023 ## $v1 = 00000023 /* 01E08 80B158A8 24920004 */ addiu $s2, $a0, 0x0004 ## $s2 = 00000004 /* 01E0C 80B158AC 2414D8F0 */ addiu $s4, $zero, 0xD8F0 ## $s4 = FFFFD8F0 /* 01E10 80B158B0 24130003 */ addiu $s3, $zero, 0x0003 ## $s3 = 00000003 .L80B158B4: /* 01E14 80B158B4 8E5002B8 */ lw $s0, 0x02B8($s2) ## 000002BC -/* 01E18 80B158B8 52000010 */ beql $s0, $zero, .L80B158FC +/* 01E18 80B158B8 52000010 */ beql $s0, $zero, .L80B158FC /* 01E1C 80B158BC 26310001 */ addiu $s1, $s1, 0x0001 ## $s1 = 00000002 -/* 01E20 80B158C0 02340019 */ multu $s1, $s4 +/* 01E20 80B158C0 02340019 */ multu $s1, $s4 /* 01E24 80B158C4 240E0100 */ addiu $t6, $zero, 0x0100 ## $t6 = 00000100 -/* 01E28 80B158C8 AFAE0010 */ sw $t6, 0x0010($sp) +/* 01E28 80B158C8 AFAE0010 */ sw $t6, 0x0010($sp) /* 01E2C 80B158CC 26040032 */ addiu $a0, $s0, 0x0032 ## $a0 = 00000032 /* 01E30 80B158D0 24060002 */ addiu $a2, $zero, 0x0002 ## $a2 = 00000002 /* 01E34 80B158D4 24070800 */ addiu $a3, $zero, 0x0800 ## $a3 = 00000800 -/* 01E38 80B158D8 00002812 */ mflo $a1 +/* 01E38 80B158D8 00002812 */ mflo $a1 /* 01E3C 80B158DC 24A5F448 */ addiu $a1, $a1, 0xF448 ## $a1 = FFFFF448 -/* 01E40 80B158E0 00052C00 */ sll $a1, $a1, 16 +/* 01E40 80B158E0 00052C00 */ sll $a1, $a1, 16 /* 01E44 80B158E4 0C01E1A7 */ jal Math_SmoothScaleMaxMinS - -/* 01E48 80B158E8 00052C03 */ sra $a1, $a1, 16 + +/* 01E48 80B158E8 00052C03 */ sra $a1, $a1, 16 /* 01E4C 80B158EC 8E5002B8 */ lw $s0, 0x02B8($s2) ## 000002BC /* 01E50 80B158F0 860F0032 */ lh $t7, 0x0032($s0) ## 00000032 /* 01E54 80B158F4 A60F00B6 */ sh $t7, 0x00B6($s0) ## 000000B6 /* 01E58 80B158F8 26310001 */ addiu $s1, $s1, 0x0001 ## $s1 = 00000003 .L80B158FC: -/* 01E5C 80B158FC 1633FFED */ bne $s1, $s3, .L80B158B4 +/* 01E5C 80B158FC 1633FFED */ bne $s1, $s3, .L80B158B4 /* 01E60 80B15900 26520004 */ addiu $s2, $s2, 0x0004 ## $s2 = 00000008 /* 01E64 80B15904 3C014120 */ lui $at, 0x4120 ## $at = 41200000 /* 01E68 80B15908 4481C000 */ mtc1 $at, $f24 ## $f24 = 10.00 -/* 01E6C 80B1590C 1000003D */ beq $zero, $zero, .L80B15A04 +/* 01E6C 80B1590C 1000003D */ beq $zero, $zero, .L80B15A04 /* 01E70 80B15910 86C202CC */ lh $v0, 0x02CC($s6) ## 000002CC .L80B15914: -/* 01E74 80B15914 1462001D */ bne $v1, $v0, .L80B1598C +/* 01E74 80B15914 1462001D */ bne $v1, $v0, .L80B1598C /* 01E78 80B15918 00008825 */ or $s1, $zero, $zero ## $s1 = 00000000 /* 01E7C 80B1591C 3C014120 */ lui $at, 0x4120 ## $at = 41200000 /* 01E80 80B15920 4481C000 */ mtc1 $at, $f24 ## $f24 = 10.00 @@ -63,65 +63,65 @@ glabel func_80B1585C /* 01EA0 80B15940 24110001 */ addiu $s1, $zero, 0x0001 ## $s1 = 00000001 .L80B15944: /* 01EA4 80B15944 0C00CFC8 */ jal Math_Rand_CenteredFloat - -/* 01EA8 80B15948 4600A306 */ mov.s $f12, $f20 -/* 01EAC 80B1594C 46180100 */ add.s $f4, $f0, $f24 + +/* 01EA8 80B15948 4600A306 */ mov.s $f12, $f20 +/* 01EAC 80B1594C 46180100 */ add.s $f4, $f0, $f24 /* 01EB0 80B15950 26520004 */ addiu $s2, $s2, 0x0004 ## $s2 = 00000004 /* 01EB4 80B15954 26730002 */ addiu $s3, $s3, 0x0002 ## $s3 = 00000002 -/* 01EB8 80B15958 4600218D */ trunc.w.s $f6, $f4 -/* 01EBC 80B1595C 44193000 */ mfc1 $t9, $f6 +/* 01EB8 80B15958 4600218D */ trunc.w.s $f6, $f4 +/* 01EBC 80B1595C 44193000 */ mfc1 $t9, $f6 /* 01EC0 80B15960 00000000 */ nop /* 01EC4 80B15964 A69902C4 */ sh $t9, 0x02C4($s4) ## 000002C4 /* 01EC8 80B15968 8E5002B4 */ lw $s0, 0x02B4($s2) ## 000002B8 -/* 01ECC 80B1596C 12000003 */ beq $s0, $zero, .L80B1597C +/* 01ECC 80B1596C 12000003 */ beq $s0, $zero, .L80B1597C /* 01ED0 80B15970 00000000 */ nop /* 01ED4 80B15974 A2110308 */ sb $s1, 0x0308($s0) ## 00000308 /* 01ED8 80B15978 E616006C */ swc1 $f22, 0x006C($s0) ## 0000006C .L80B1597C: -/* 01EDC 80B1597C 1675FFF1 */ bne $s3, $s5, .L80B15944 +/* 01EDC 80B1597C 1675FFF1 */ bne $s3, $s5, .L80B15944 /* 01EE0 80B15980 26940002 */ addiu $s4, $s4, 0x0002 ## $s4 = 00000002 -/* 01EE4 80B15984 1000001F */ beq $zero, $zero, .L80B15A04 +/* 01EE4 80B15984 1000001F */ beq $zero, $zero, .L80B15A04 /* 01EE8 80B15988 86C202CC */ lh $v0, 0x02CC($s6) ## 000002CC .L80B1598C: /* 01EEC 80B1598C 3C0180B1 */ lui $at, %hi(D_80B16F60) ## $at = 80B10000 -/* 01EF0 80B15990 C42C6F60 */ lwc1 $f12, %lo(D_80B16F60)($at) +/* 01EF0 80B15990 C42C6F60 */ lwc1 $f12, %lo(D_80B16F60)($at) /* 01EF4 80B15994 3C01C000 */ lui $at, 0xC000 ## $at = C0000000 /* 01EF8 80B15998 44811000 */ mtc1 $at, $f2 ## $f2 = -2.00 /* 01EFC 80B1599C 02C0A025 */ or $s4, $s6, $zero ## $s4 = 00000000 /* 01F00 80B159A0 24130003 */ addiu $s3, $zero, 0x0003 ## $s3 = 00000003 .L80B159A4: /* 01F04 80B159A4 868802C4 */ lh $t0, 0x02C4($s4) ## 000002C4 -/* 01F08 80B159A8 00115080 */ sll $t2, $s1, 2 -/* 01F0C 80B159AC 02CA5821 */ addu $t3, $s6, $t2 -/* 01F10 80B159B0 00684823 */ subu $t1, $v1, $t0 -/* 01F14 80B159B4 0049082A */ slt $at, $v0, $t1 -/* 01F18 80B159B8 5020000D */ beql $at, $zero, .L80B159F0 +/* 01F08 80B159A8 00115080 */ sll $t2, $s1, 2 +/* 01F0C 80B159AC 02CA5821 */ addu $t3, $s6, $t2 +/* 01F10 80B159B0 00684823 */ subu $t1, $v1, $t0 +/* 01F14 80B159B4 0049082A */ slt $at, $v0, $t1 +/* 01F18 80B159B8 5020000D */ beql $at, $zero, .L80B159F0 /* 01F1C 80B159BC 26310001 */ addiu $s1, $s1, 0x0001 ## $s1 = 00000002 /* 01F20 80B159C0 8D7002B8 */ lw $s0, 0x02B8($t3) ## 000002B8 -/* 01F24 80B159C4 5200000A */ beql $s0, $zero, .L80B159F0 +/* 01F24 80B159C4 5200000A */ beql $s0, $zero, .L80B159F0 /* 01F28 80B159C8 26310001 */ addiu $s1, $s1, 0x0001 ## $s1 = 00000003 /* 01F2C 80B159CC C600006C */ lwc1 $f0, 0x006C($s0) ## 0000006C -/* 01F30 80B159D0 4600103C */ c.lt.s $f2, $f0 +/* 01F30 80B159D0 4600103C */ c.lt.s $f2, $f0 /* 01F34 80B159D4 00000000 */ nop -/* 01F38 80B159D8 45020005 */ bc1fl .L80B159F0 +/* 01F38 80B159D8 45020005 */ bc1fl .L80B159F0 /* 01F3C 80B159DC 26310001 */ addiu $s1, $s1, 0x0001 ## $s1 = 00000004 -/* 01F40 80B159E0 460C0201 */ sub.s $f8, $f0, $f12 +/* 01F40 80B159E0 460C0201 */ sub.s $f8, $f0, $f12 /* 01F44 80B159E4 E608006C */ swc1 $f8, 0x006C($s0) ## 0000006C /* 01F48 80B159E8 86C202CC */ lh $v0, 0x02CC($s6) ## 000002CC /* 01F4C 80B159EC 26310001 */ addiu $s1, $s1, 0x0001 ## $s1 = 00000005 .L80B159F0: -/* 01F50 80B159F0 1633FFEC */ bne $s1, $s3, .L80B159A4 +/* 01F50 80B159F0 1633FFEC */ bne $s1, $s3, .L80B159A4 /* 01F54 80B159F4 26940002 */ addiu $s4, $s4, 0x0002 ## $s4 = 00000002 /* 01F58 80B159F8 3C014120 */ lui $at, 0x4120 ## $at = 41200000 /* 01F5C 80B159FC 4481C000 */ mtc1 $at, $f24 ## $f24 = 10.00 /* 01F60 80B15A00 00000000 */ nop .L80B15A04: -/* 01F64 80B15A04 14400026 */ bne $v0, $zero, .L80B15AA0 +/* 01F64 80B15A04 14400026 */ bne $v0, $zero, .L80B15AA0 /* 01F68 80B15A08 02C02025 */ or $a0, $s6, $zero ## $a0 = 00000000 /* 01F6C 80B15A0C 3C0580B1 */ lui $a1, %hi(func_80B154FC) ## $a1 = 80B10000 /* 01F70 80B15A10 3C0680B1 */ lui $a2, %hi(func_80B16938) ## $a2 = 80B10000 /* 01F74 80B15A14 24C66938 */ addiu $a2, $a2, %lo(func_80B16938) ## $a2 = 80B16938 -/* 01F78 80B15A18 0C2C4EA8 */ jal func_80B13AA0 +/* 01F78 80B15A18 0C2C4EA8 */ jal func_80B13AA0 /* 01F7C 80B15A1C 24A554FC */ addiu $a1, $a1, %lo(func_80B154FC) ## $a1 = 80B154FC /* 01F80 80B15A20 96CC02E0 */ lhu $t4, 0x02E0($s6) ## 000002E0 /* 01F84 80B15A24 3C110601 */ lui $s1, 0x0601 ## $s1 = 06010000 @@ -129,48 +129,48 @@ glabel func_80B1585C /* 01F8C 80B15A2C 318DFFEF */ andi $t5, $t4, 0xFFEF ## $t5 = 00000000 /* 01F90 80B15A30 A6CD02E0 */ sh $t5, 0x02E0($s6) ## 000002E0 /* 01F94 80B15A34 0C028800 */ jal SkelAnime_GetFrameCount - + /* 01F98 80B15A38 02202025 */ or $a0, $s1, $zero ## $a0 = 0600C48C -/* 01F9C 80B15A3C 00028400 */ sll $s0, $v0, 16 -/* 01FA0 80B15A40 00108403 */ sra $s0, $s0, 16 +/* 01F9C 80B15A3C 00028400 */ sll $s0, $v0, 16 +/* 01FA0 80B15A40 00108403 */ sra $s0, $s0, 16 /* 01FA4 80B15A44 0C028800 */ jal SkelAnime_GetFrameCount - + /* 01FA8 80B15A48 02202025 */ or $a0, $s1, $zero ## $a0 = 0600C48C /* 01FAC 80B15A4C 44905000 */ mtc1 $s0, $f10 ## $f10 = 0.00 /* 01FB0 80B15A50 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 /* 01FB4 80B15A54 44810000 */ mtc1 $at, $f0 ## $f0 = 1.00 -/* 01FB8 80B15A58 46805420 */ cvt.s.w $f16, $f10 +/* 01FB8 80B15A58 46805420 */ cvt.s.w $f16, $f10 /* 01FBC 80B15A5C 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 01FC0 80B15A60 240E0002 */ addiu $t6, $zero, 0x0002 ## $t6 = 00000002 -/* 01FC4 80B15A64 44060000 */ mfc1 $a2, $f0 -/* 01FC8 80B15A68 AFAE0014 */ sw $t6, 0x0014($sp) -/* 01FCC 80B15A6C 468021A0 */ cvt.s.w $f6, $f4 +/* 01FC4 80B15A64 44060000 */ mfc1 $a2, $f0 +/* 01FC8 80B15A68 AFAE0014 */ sw $t6, 0x0014($sp) +/* 01FCC 80B15A6C 468021A0 */ cvt.s.w $f6, $f4 /* 01FD0 80B15A70 26C4014C */ addiu $a0, $s6, 0x014C ## $a0 = 0000014C /* 01FD4 80B15A74 02202825 */ or $a1, $s1, $zero ## $a1 = 0600C48C -/* 01FD8 80B15A78 E7B80018 */ swc1 $f24, 0x0018($sp) -/* 01FDC 80B15A7C 46008481 */ sub.s $f18, $f16, $f0 -/* 01FE0 80B15A80 E7A60010 */ swc1 $f6, 0x0010($sp) -/* 01FE4 80B15A84 44079000 */ mfc1 $a3, $f18 -/* 01FE8 80B15A88 0C029468 */ jal SkelAnime_ChangeAnimation - +/* 01FD8 80B15A78 E7B80018 */ swc1 $f24, 0x0018($sp) +/* 01FDC 80B15A7C 46008481 */ sub.s $f18, $f16, $f0 +/* 01FE0 80B15A80 E7A60010 */ swc1 $f6, 0x0010($sp) +/* 01FE4 80B15A84 44079000 */ mfc1 $a3, $f18 +/* 01FE8 80B15A88 0C029468 */ jal SkelAnime_ChangeAnim + /* 01FEC 80B15A8C 00000000 */ nop -/* 01FF0 80B15A90 8FA40064 */ lw $a0, 0x0064($sp) +/* 01FF0 80B15A90 8FA40064 */ lw $a0, 0x0064($sp) /* 01FF4 80B15A94 02C02825 */ or $a1, $s6, $zero ## $a1 = 00000000 -/* 01FF8 80B15A98 0C00B7D5 */ jal func_8002DF54 +/* 01FF8 80B15A98 0C00B7D5 */ jal func_8002DF54 /* 01FFC 80B15A9C 24060007 */ addiu $a2, $zero, 0x0007 ## $a2 = 00000007 .L80B15AA0: -/* 02000 80B15AA0 8FBF005C */ lw $ra, 0x005C($sp) -/* 02004 80B15AA4 D7B40028 */ ldc1 $f20, 0x0028($sp) -/* 02008 80B15AA8 D7B60030 */ ldc1 $f22, 0x0030($sp) -/* 0200C 80B15AAC D7B80038 */ ldc1 $f24, 0x0038($sp) -/* 02010 80B15AB0 8FB00040 */ lw $s0, 0x0040($sp) -/* 02014 80B15AB4 8FB10044 */ lw $s1, 0x0044($sp) -/* 02018 80B15AB8 8FB20048 */ lw $s2, 0x0048($sp) -/* 0201C 80B15ABC 8FB3004C */ lw $s3, 0x004C($sp) -/* 02020 80B15AC0 8FB40050 */ lw $s4, 0x0050($sp) -/* 02024 80B15AC4 8FB50054 */ lw $s5, 0x0054($sp) -/* 02028 80B15AC8 8FB60058 */ lw $s6, 0x0058($sp) -/* 0202C 80B15ACC 03E00008 */ jr $ra +/* 02000 80B15AA0 8FBF005C */ lw $ra, 0x005C($sp) +/* 02004 80B15AA4 D7B40028 */ ldc1 $f20, 0x0028($sp) +/* 02008 80B15AA8 D7B60030 */ ldc1 $f22, 0x0030($sp) +/* 0200C 80B15AAC D7B80038 */ ldc1 $f24, 0x0038($sp) +/* 02010 80B15AB0 8FB00040 */ lw $s0, 0x0040($sp) +/* 02014 80B15AB4 8FB10044 */ lw $s1, 0x0044($sp) +/* 02018 80B15AB8 8FB20048 */ lw $s2, 0x0048($sp) +/* 0201C 80B15ABC 8FB3004C */ lw $s3, 0x004C($sp) +/* 02020 80B15AC0 8FB40050 */ lw $s4, 0x0050($sp) +/* 02024 80B15AC4 8FB50054 */ lw $s5, 0x0054($sp) +/* 02028 80B15AC8 8FB60058 */ lw $s6, 0x0058($sp) +/* 0202C 80B15ACC 03E00008 */ jr $ra /* 02030 80B15AD0 27BD0060 */ addiu $sp, $sp, 0x0060 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B15AD4.s b/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B15AD4.s index cf02850f38..d24975d914 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B15AD4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B15AD4.s @@ -1,69 +1,69 @@ glabel func_80B15AD4 /* 02034 80B15AD4 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 02038 80B15AD8 AFBF002C */ sw $ra, 0x002C($sp) -/* 0203C 80B15ADC AFB00028 */ sw $s0, 0x0028($sp) -/* 02040 80B15AE0 AFA50034 */ sw $a1, 0x0034($sp) +/* 02038 80B15AD8 AFBF002C */ sw $ra, 0x002C($sp) +/* 0203C 80B15ADC AFB00028 */ sw $s0, 0x0028($sp) +/* 02040 80B15AE0 AFA50034 */ sw $a1, 0x0034($sp) /* 02044 80B15AE4 848E02CC */ lh $t6, 0x02CC($a0) ## 000002CC /* 02048 80B15AE8 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 0204C 80B15AEC 55C0002E */ bnel $t6, $zero, .L80B15BA8 -/* 02050 80B15AF0 8FA40034 */ lw $a0, 0x0034($sp) +/* 0204C 80B15AEC 55C0002E */ bnel $t6, $zero, .L80B15BA8 +/* 02050 80B15AF0 8FA40034 */ lw $a0, 0x0034($sp) /* 02054 80B15AF4 948F02E0 */ lhu $t7, 0x02E0($a0) ## 000002E0 /* 02058 80B15AF8 3C0580B1 */ lui $a1, %hi(func_80B1585C) ## $a1 = 80B10000 /* 0205C 80B15AFC 24A5585C */ addiu $a1, $a1, %lo(func_80B1585C) ## $a1 = 80B1585C /* 02060 80B15B00 31F80020 */ andi $t8, $t7, 0x0020 ## $t8 = 00000000 -/* 02064 80B15B04 13000027 */ beq $t8, $zero, .L80B15BA4 +/* 02064 80B15B04 13000027 */ beq $t8, $zero, .L80B15BA4 /* 02068 80B15B08 3C0680B1 */ lui $a2, %hi(func_80B16938) ## $a2 = 80B10000 -/* 0206C 80B15B0C 0C2C4EA8 */ jal func_80B13AA0 +/* 0206C 80B15B0C 0C2C4EA8 */ jal func_80B13AA0 /* 02070 80B15B10 24C66938 */ addiu $a2, $a2, %lo(func_80B16938) ## $a2 = 80B16938 /* 02074 80B15B14 961902E0 */ lhu $t9, 0x02E0($s0) ## 000002E0 /* 02078 80B15B18 3C040601 */ lui $a0, 0x0601 ## $a0 = 06010000 /* 0207C 80B15B1C 2484BF38 */ addiu $a0, $a0, 0xBF38 ## $a0 = 0600BF38 /* 02080 80B15B20 3328FFEF */ andi $t0, $t9, 0xFFEF ## $t0 = 00000000 /* 02084 80B15B24 0C028800 */ jal SkelAnime_GetFrameCount - + /* 02088 80B15B28 A60802E0 */ sh $t0, 0x02E0($s0) ## 000002E0 /* 0208C 80B15B2C 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 02090 80B15B30 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 /* 02094 80B15B34 44810000 */ mtc1 $at, $f0 ## $f0 = 1.00 -/* 02098 80B15B38 468021A0 */ cvt.s.w $f6, $f4 +/* 02098 80B15B38 468021A0 */ cvt.s.w $f6, $f4 /* 0209C 80B15B3C 44804000 */ mtc1 $zero, $f8 ## $f8 = 0.00 /* 020A0 80B15B40 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 /* 020A4 80B15B44 24090002 */ addiu $t1, $zero, 0x0002 ## $t1 = 00000002 -/* 020A8 80B15B48 44060000 */ mfc1 $a2, $f0 -/* 020AC 80B15B4C 44070000 */ mfc1 $a3, $f0 -/* 020B0 80B15B50 AFA90014 */ sw $t1, 0x0014($sp) +/* 020A8 80B15B48 44060000 */ mfc1 $a2, $f0 +/* 020AC 80B15B4C 44070000 */ mfc1 $a3, $f0 +/* 020B0 80B15B50 AFA90014 */ sw $t1, 0x0014($sp) /* 020B4 80B15B54 24A5BF38 */ addiu $a1, $a1, 0xBF38 ## $a1 = 0600BF38 -/* 020B8 80B15B58 E7A60010 */ swc1 $f6, 0x0010($sp) +/* 020B8 80B15B58 E7A60010 */ swc1 $f6, 0x0010($sp) /* 020BC 80B15B5C 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C -/* 020C0 80B15B60 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 020C4 80B15B64 E7A80018 */ swc1 $f8, 0x0018($sp) +/* 020C0 80B15B60 0C029468 */ jal SkelAnime_ChangeAnim + +/* 020C4 80B15B64 E7A80018 */ swc1 $f8, 0x0018($sp) /* 020C8 80B15B68 240A0032 */ addiu $t2, $zero, 0x0032 ## $t2 = 00000032 /* 020CC 80B15B6C A60A02CC */ sh $t2, 0x02CC($s0) ## 000002CC -/* 020D0 80B15B70 0C0222CD */ jal func_80088B34 +/* 020D0 80B15B70 0C0222CD */ jal func_80088B34 /* 020D4 80B15B74 2404001E */ addiu $a0, $zero, 0x001E ## $a0 = 0000001E -/* 020D8 80B15B78 0C03D6B3 */ jal func_800F5ACC +/* 020D8 80B15B78 0C03D6B3 */ jal func_800F5ACC /* 020DC 80B15B7C 2404006C */ addiu $a0, $zero, 0x006C ## $a0 = 0000006C /* 020E0 80B15B80 960B02E0 */ lhu $t3, 0x02E0($s0) ## 000002E0 /* 020E4 80B15B84 356C0200 */ ori $t4, $t3, 0x0200 ## $t4 = 00000200 /* 020E8 80B15B88 A60C02E0 */ sh $t4, 0x02E0($s0) ## 000002E0 -/* 020EC 80B15B8C 0C041B33 */ jal func_80106CCC -/* 020F0 80B15B90 8FA40034 */ lw $a0, 0x0034($sp) -/* 020F4 80B15B94 8FA40034 */ lw $a0, 0x0034($sp) +/* 020EC 80B15B8C 0C041B33 */ jal func_80106CCC +/* 020F0 80B15B90 8FA40034 */ lw $a0, 0x0034($sp) +/* 020F4 80B15B94 8FA40034 */ lw $a0, 0x0034($sp) /* 020F8 80B15B98 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 020FC 80B15B9C 0C00B7D5 */ jal func_8002DF54 +/* 020FC 80B15B9C 0C00B7D5 */ jal func_8002DF54 /* 02100 80B15BA0 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 .L80B15BA4: -/* 02104 80B15BA4 8FA40034 */ lw $a0, 0x0034($sp) +/* 02104 80B15BA4 8FA40034 */ lw $a0, 0x0034($sp) .L80B15BA8: -/* 02108 80B15BA8 0C042F6F */ jal func_8010BDBC +/* 02108 80B15BA8 0C042F6F */ jal func_8010BDBC /* 0210C 80B15BAC 248420D8 */ addiu $a0, $a0, 0x20D8 ## $a0 = 000020D8 /* 02110 80B15BB0 24010005 */ addiu $at, $zero, 0x0005 ## $at = 00000005 -/* 02114 80B15BB4 54410009 */ bnel $v0, $at, .L80B15BDC +/* 02114 80B15BB4 54410009 */ bnel $v0, $at, .L80B15BDC /* 02118 80B15BB8 960F02E0 */ lhu $t7, 0x02E0($s0) ## 000002E0 -/* 0211C 80B15BBC 0C041AF2 */ jal func_80106BC8 -/* 02120 80B15BC0 8FA40034 */ lw $a0, 0x0034($sp) -/* 02124 80B15BC4 50400005 */ beql $v0, $zero, .L80B15BDC +/* 0211C 80B15BBC 0C041AF2 */ jal func_80106BC8 +/* 02120 80B15BC0 8FA40034 */ lw $a0, 0x0034($sp) +/* 02124 80B15BC4 50400005 */ beql $v0, $zero, .L80B15BDC /* 02128 80B15BC8 960F02E0 */ lhu $t7, 0x02E0($s0) ## 000002E0 /* 0212C 80B15BCC 960D02E0 */ lhu $t5, 0x02E0($s0) ## 000002E0 /* 02130 80B15BD0 35AE0020 */ ori $t6, $t5, 0x0020 ## $t6 = 00000020 @@ -72,10 +72,10 @@ glabel func_80B15AD4 .L80B15BDC: /* 0213C 80B15BDC 35F80001 */ ori $t8, $t7, 0x0001 ## $t8 = 00000001 /* 02140 80B15BE0 A61802E0 */ sh $t8, 0x02E0($s0) ## 000002E0 -/* 02144 80B15BE4 8FBF002C */ lw $ra, 0x002C($sp) -/* 02148 80B15BE8 8FB00028 */ lw $s0, 0x0028($sp) +/* 02144 80B15BE4 8FBF002C */ lw $ra, 0x002C($sp) +/* 02148 80B15BE8 8FB00028 */ lw $s0, 0x0028($sp) /* 0214C 80B15BEC 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 02150 80B15BF0 03E00008 */ jr $ra +/* 02150 80B15BF0 03E00008 */ jr $ra /* 02154 80B15BF4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B15BF8.s b/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B15BF8.s index 535b8e93df..fc71cfc7d6 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B15BF8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B15BF8.s @@ -1,16 +1,16 @@ glabel func_80B15BF8 /* 02158 80B15BF8 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 0215C 80B15BFC AFBF002C */ sw $ra, 0x002C($sp) -/* 02160 80B15C00 AFB00028 */ sw $s0, 0x0028($sp) -/* 02164 80B15C04 AFA50034 */ sw $a1, 0x0034($sp) +/* 0215C 80B15BFC AFBF002C */ sw $ra, 0x002C($sp) +/* 02160 80B15C00 AFB00028 */ sw $s0, 0x0028($sp) +/* 02164 80B15C04 AFA50034 */ sw $a1, 0x0034($sp) /* 02168 80B15C08 948E02E0 */ lhu $t6, 0x02E0($a0) ## 000002E0 /* 0216C 80B15C0C 3C0580B1 */ lui $a1, %hi(func_80B15AD4) ## $a1 = 80B10000 /* 02170 80B15C10 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 02174 80B15C14 31CF0010 */ andi $t7, $t6, 0x0010 ## $t7 = 00000000 -/* 02178 80B15C18 11E00016 */ beq $t7, $zero, .L80B15C74 +/* 02178 80B15C18 11E00016 */ beq $t7, $zero, .L80B15C74 /* 0217C 80B15C1C 24A55AD4 */ addiu $a1, $a1, %lo(func_80B15AD4) ## $a1 = 80B15AD4 /* 02180 80B15C20 3C0680B1 */ lui $a2, %hi(func_80B16938) ## $a2 = 80B10000 -/* 02184 80B15C24 0C2C4EA8 */ jal func_80B13AA0 +/* 02184 80B15C24 0C2C4EA8 */ jal func_80B13AA0 /* 02188 80B15C28 24C66938 */ addiu $a2, $a2, %lo(func_80B16938) ## $a2 = 80B16938 /* 0218C 80B15C2C 961802E0 */ lhu $t8, 0x02E0($s0) ## 000002E0 /* 02190 80B15C30 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 @@ -20,27 +20,27 @@ glabel func_80B15BF8 /* 021A0 80B15C40 A61902E0 */ sh $t9, 0x02E0($s0) ## 000002E0 /* 021A4 80B15C44 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 /* 021A8 80B15C48 24080002 */ addiu $t0, $zero, 0x0002 ## $t0 = 00000002 -/* 021AC 80B15C4C 44060000 */ mfc1 $a2, $f0 -/* 021B0 80B15C50 44071000 */ mfc1 $a3, $f2 -/* 021B4 80B15C54 AFA80014 */ sw $t0, 0x0014($sp) +/* 021AC 80B15C4C 44060000 */ mfc1 $a2, $f0 +/* 021B0 80B15C50 44071000 */ mfc1 $a3, $f2 +/* 021B4 80B15C54 AFA80014 */ sw $t0, 0x0014($sp) /* 021B8 80B15C58 24A5BF38 */ addiu $a1, $a1, 0xBF38 ## $a1 = 0600BF38 /* 021BC 80B15C5C 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C -/* 021C0 80B15C60 E7A00010 */ swc1 $f0, 0x0010($sp) -/* 021C4 80B15C64 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 021C8 80B15C68 E7A20018 */ swc1 $f2, 0x0018($sp) +/* 021C0 80B15C60 E7A00010 */ swc1 $f0, 0x0010($sp) +/* 021C4 80B15C64 0C029468 */ jal SkelAnime_ChangeAnim + +/* 021C8 80B15C68 E7A20018 */ swc1 $f2, 0x0018($sp) /* 021CC 80B15C6C 24090005 */ addiu $t1, $zero, 0x0005 ## $t1 = 00000005 /* 021D0 80B15C70 A60902CC */ sh $t1, 0x02CC($s0) ## 000002CC .L80B15C74: -/* 021D4 80B15C74 8FA40034 */ lw $a0, 0x0034($sp) -/* 021D8 80B15C78 0C042F6F */ jal func_8010BDBC +/* 021D4 80B15C74 8FA40034 */ lw $a0, 0x0034($sp) +/* 021D8 80B15C78 0C042F6F */ jal func_8010BDBC /* 021DC 80B15C7C 248420D8 */ addiu $a0, $a0, 0x20D8 ## $a0 = 000020D8 /* 021E0 80B15C80 24010005 */ addiu $at, $zero, 0x0005 ## $at = 00000005 -/* 021E4 80B15C84 54410009 */ bnel $v0, $at, .L80B15CAC +/* 021E4 80B15C84 54410009 */ bnel $v0, $at, .L80B15CAC /* 021E8 80B15C88 960C02E0 */ lhu $t4, 0x02E0($s0) ## 000002E0 -/* 021EC 80B15C8C 0C041AF2 */ jal func_80106BC8 -/* 021F0 80B15C90 8FA40034 */ lw $a0, 0x0034($sp) -/* 021F4 80B15C94 50400005 */ beql $v0, $zero, .L80B15CAC +/* 021EC 80B15C8C 0C041AF2 */ jal func_80106BC8 +/* 021F0 80B15C90 8FA40034 */ lw $a0, 0x0034($sp) +/* 021F4 80B15C94 50400005 */ beql $v0, $zero, .L80B15CAC /* 021F8 80B15C98 960C02E0 */ lhu $t4, 0x02E0($s0) ## 000002E0 /* 021FC 80B15C9C 960A02E0 */ lhu $t2, 0x02E0($s0) ## 000002E0 /* 02200 80B15CA0 354B0020 */ ori $t3, $t2, 0x0020 ## $t3 = 00000020 @@ -49,10 +49,10 @@ glabel func_80B15BF8 .L80B15CAC: /* 0220C 80B15CAC 358D0001 */ ori $t5, $t4, 0x0001 ## $t5 = 00000001 /* 02210 80B15CB0 A60D02E0 */ sh $t5, 0x02E0($s0) ## 000002E0 -/* 02214 80B15CB4 8FBF002C */ lw $ra, 0x002C($sp) -/* 02218 80B15CB8 8FB00028 */ lw $s0, 0x0028($sp) +/* 02214 80B15CB4 8FBF002C */ lw $ra, 0x002C($sp) +/* 02218 80B15CB8 8FB00028 */ lw $s0, 0x0028($sp) /* 0221C 80B15CBC 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 02220 80B15CC0 03E00008 */ jr $ra +/* 02220 80B15CC0 03E00008 */ jr $ra /* 02224 80B15CC4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B15CC8.s b/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B15CC8.s index e861a3ca78..133f8320f6 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B15CC8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B15CC8.s @@ -1,16 +1,16 @@ glabel func_80B15CC8 /* 02228 80B15CC8 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 0222C 80B15CCC AFBF002C */ sw $ra, 0x002C($sp) -/* 02230 80B15CD0 AFB00028 */ sw $s0, 0x0028($sp) -/* 02234 80B15CD4 AFA50034 */ sw $a1, 0x0034($sp) +/* 0222C 80B15CCC AFBF002C */ sw $ra, 0x002C($sp) +/* 02230 80B15CD0 AFB00028 */ sw $s0, 0x0028($sp) +/* 02234 80B15CD4 AFA50034 */ sw $a1, 0x0034($sp) /* 02238 80B15CD8 948E02E0 */ lhu $t6, 0x02E0($a0) ## 000002E0 /* 0223C 80B15CDC 3C0580B1 */ lui $a1, %hi(func_80B15BF8) ## $a1 = 80B10000 /* 02240 80B15CE0 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 02244 80B15CE4 31CF0010 */ andi $t7, $t6, 0x0010 ## $t7 = 00000000 -/* 02248 80B15CE8 11E00014 */ beq $t7, $zero, .L80B15D3C +/* 02248 80B15CE8 11E00014 */ beq $t7, $zero, .L80B15D3C /* 0224C 80B15CEC 24A55BF8 */ addiu $a1, $a1, %lo(func_80B15BF8) ## $a1 = 80B15BF8 /* 02250 80B15CF0 3C0680B1 */ lui $a2, %hi(func_80B16938) ## $a2 = 80B10000 -/* 02254 80B15CF4 0C2C4EA8 */ jal func_80B13AA0 +/* 02254 80B15CF4 0C2C4EA8 */ jal func_80B13AA0 /* 02258 80B15CF8 24C66938 */ addiu $a2, $a2, %lo(func_80B16938) ## $a2 = 80B16938 /* 0225C 80B15CFC 961802E0 */ lhu $t8, 0x02E0($s0) ## 000002E0 /* 02260 80B15D00 3C014120 */ lui $at, 0x4120 ## $at = 41200000 @@ -20,25 +20,25 @@ glabel func_80B15CC8 /* 02270 80B15D10 A61902E0 */ sh $t9, 0x02E0($s0) ## 000002E0 /* 02274 80B15D14 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 /* 02278 80B15D18 24080002 */ addiu $t0, $zero, 0x0002 ## $t0 = 00000002 -/* 0227C 80B15D1C AFA80014 */ sw $t0, 0x0014($sp) +/* 0227C 80B15D1C AFA80014 */ sw $t0, 0x0014($sp) /* 02280 80B15D20 24A5BF38 */ addiu $a1, $a1, 0xBF38 ## $a1 = 0600BF38 /* 02284 80B15D24 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C /* 02288 80B15D28 3C06BF80 */ lui $a2, 0xBF80 ## $a2 = BF800000 /* 0228C 80B15D2C 3C0741E8 */ lui $a3, 0x41E8 ## $a3 = 41E80000 -/* 02290 80B15D30 E7A60018 */ swc1 $f6, 0x0018($sp) -/* 02294 80B15D34 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 02298 80B15D38 E7A40010 */ swc1 $f4, 0x0010($sp) +/* 02290 80B15D30 E7A60018 */ swc1 $f6, 0x0018($sp) +/* 02294 80B15D34 0C029468 */ jal SkelAnime_ChangeAnim + +/* 02298 80B15D38 E7A40010 */ swc1 $f4, 0x0010($sp) .L80B15D3C: -/* 0229C 80B15D3C 8FA40034 */ lw $a0, 0x0034($sp) -/* 022A0 80B15D40 0C042F6F */ jal func_8010BDBC +/* 0229C 80B15D3C 8FA40034 */ lw $a0, 0x0034($sp) +/* 022A0 80B15D40 0C042F6F */ jal func_8010BDBC /* 022A4 80B15D44 248420D8 */ addiu $a0, $a0, 0x20D8 ## $a0 = 000020D8 /* 022A8 80B15D48 24010005 */ addiu $at, $zero, 0x0005 ## $at = 00000005 -/* 022AC 80B15D4C 54410009 */ bnel $v0, $at, .L80B15D74 +/* 022AC 80B15D4C 54410009 */ bnel $v0, $at, .L80B15D74 /* 022B0 80B15D50 960B02E0 */ lhu $t3, 0x02E0($s0) ## 000002E0 -/* 022B4 80B15D54 0C041AF2 */ jal func_80106BC8 -/* 022B8 80B15D58 8FA40034 */ lw $a0, 0x0034($sp) -/* 022BC 80B15D5C 50400005 */ beql $v0, $zero, .L80B15D74 +/* 022B4 80B15D54 0C041AF2 */ jal func_80106BC8 +/* 022B8 80B15D58 8FA40034 */ lw $a0, 0x0034($sp) +/* 022BC 80B15D5C 50400005 */ beql $v0, $zero, .L80B15D74 /* 022C0 80B15D60 960B02E0 */ lhu $t3, 0x02E0($s0) ## 000002E0 /* 022C4 80B15D64 960902E0 */ lhu $t1, 0x02E0($s0) ## 000002E0 /* 022C8 80B15D68 352A0020 */ ori $t2, $t1, 0x0020 ## $t2 = 00000020 @@ -47,10 +47,10 @@ glabel func_80B15CC8 .L80B15D74: /* 022D4 80B15D74 356C0001 */ ori $t4, $t3, 0x0001 ## $t4 = 00000001 /* 022D8 80B15D78 A60C02E0 */ sh $t4, 0x02E0($s0) ## 000002E0 -/* 022DC 80B15D7C 8FBF002C */ lw $ra, 0x002C($sp) -/* 022E0 80B15D80 8FB00028 */ lw $s0, 0x0028($sp) +/* 022DC 80B15D7C 8FBF002C */ lw $ra, 0x002C($sp) +/* 022E0 80B15D80 8FB00028 */ lw $s0, 0x0028($sp) /* 022E4 80B15D84 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 022E8 80B15D88 03E00008 */ jr $ra +/* 022E8 80B15D88 03E00008 */ jr $ra /* 022EC 80B15D8C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B15D90.s b/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B15D90.s index 17852b88d9..07014222dc 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B15D90.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B15D90.s @@ -1,13 +1,13 @@ glabel func_80B15D90 /* 022F0 80B15D90 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 022F4 80B15D94 AFA50034 */ sw $a1, 0x0034($sp) -/* 022F8 80B15D98 AFBF002C */ sw $ra, 0x002C($sp) -/* 022FC 80B15D9C AFB00028 */ sw $s0, 0x0028($sp) +/* 022F4 80B15D94 AFA50034 */ sw $a1, 0x0034($sp) +/* 022F8 80B15D98 AFBF002C */ sw $ra, 0x002C($sp) +/* 022FC 80B15D9C AFB00028 */ sw $s0, 0x0028($sp) /* 02300 80B15DA0 3C0580B1 */ lui $a1, %hi(func_80B15CC8) ## $a1 = 80B10000 /* 02304 80B15DA4 3C0680B1 */ lui $a2, %hi(func_80B16938) ## $a2 = 80B10000 /* 02308 80B15DA8 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 0230C 80B15DAC 24C66938 */ addiu $a2, $a2, %lo(func_80B16938) ## $a2 = 80B16938 -/* 02310 80B15DB0 0C2C4EA8 */ jal func_80B13AA0 +/* 02310 80B15DB0 0C2C4EA8 */ jal func_80B13AA0 /* 02314 80B15DB4 24A55CC8 */ addiu $a1, $a1, %lo(func_80B15CC8) ## $a1 = 80B15CC8 /* 02318 80B15DB8 960E02E0 */ lhu $t6, 0x02E0($s0) ## 000002E0 /* 0231C 80B15DBC 3C0141E8 */ lui $at, 0x41E8 ## $at = 41E80000 @@ -18,25 +18,25 @@ glabel func_80B15D90 /* 02330 80B15DD0 A60F02E0 */ sh $t7, 0x02E0($s0) ## 000002E0 /* 02334 80B15DD4 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 /* 02338 80B15DD8 24180002 */ addiu $t8, $zero, 0x0002 ## $t8 = 00000002 -/* 0233C 80B15DDC AFB80014 */ sw $t8, 0x0014($sp) +/* 0233C 80B15DDC AFB80014 */ sw $t8, 0x0014($sp) /* 02340 80B15DE0 24A5BF38 */ addiu $a1, $a1, 0xBF38 ## $a1 = 0600BF38 /* 02344 80B15DE4 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C /* 02348 80B15DE8 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 0234C 80B15DEC 3C074100 */ lui $a3, 0x4100 ## $a3 = 41000000 -/* 02350 80B15DF0 E7A40010 */ swc1 $f4, 0x0010($sp) -/* 02354 80B15DF4 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 02358 80B15DF8 E7A60018 */ swc1 $f6, 0x0018($sp) -/* 0235C 80B15DFC 8FA40034 */ lw $a0, 0x0034($sp) -/* 02360 80B15E00 0C042DC8 */ jal func_8010B720 +/* 02350 80B15DF0 E7A40010 */ swc1 $f4, 0x0010($sp) +/* 02354 80B15DF4 0C029468 */ jal SkelAnime_ChangeAnim + +/* 02358 80B15DF8 E7A60018 */ swc1 $f6, 0x0018($sp) +/* 0235C 80B15DFC 8FA40034 */ lw $a0, 0x0034($sp) +/* 02360 80B15E00 0C042DC8 */ jal func_8010B720 /* 02364 80B15E04 24052080 */ addiu $a1, $zero, 0x2080 ## $a1 = 00002080 /* 02368 80B15E08 961902E0 */ lhu $t9, 0x02E0($s0) ## 000002E0 /* 0236C 80B15E0C 3328FFDF */ andi $t0, $t9, 0xFFDF ## $t0 = 00000000 /* 02370 80B15E10 A60802E0 */ sh $t0, 0x02E0($s0) ## 000002E0 -/* 02374 80B15E14 8FBF002C */ lw $ra, 0x002C($sp) -/* 02378 80B15E18 8FB00028 */ lw $s0, 0x0028($sp) +/* 02374 80B15E14 8FBF002C */ lw $ra, 0x002C($sp) +/* 02378 80B15E18 8FB00028 */ lw $s0, 0x0028($sp) /* 0237C 80B15E1C 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 02380 80B15E20 03E00008 */ jr $ra +/* 02380 80B15E20 03E00008 */ jr $ra /* 02384 80B15E24 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B16504.s b/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B16504.s index fdc3fce91d..3f54dcf389 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B16504.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B16504.s @@ -5,7 +5,7 @@ glabel func_80B16504 /* 02A70 80B16510 AFBF001C */ sw $ra, 0x001C($sp) /* 02A74 80B16514 AFA5002C */ sw $a1, 0x002C($sp) /* 02A78 80B16518 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 02A7C 80B1651C 0C01B0D8 */ jal func_8006C360 +/* 02A7C 80B1651C 0C01B0D8 */ jal Text_GetFaceReaction /* 02A80 80B16520 24050018 */ addiu $a1, $zero, 0x0018 ## $a1 = 00000018 /* 02A84 80B16524 A7A20026 */ sh $v0, 0x0026($sp) /* 02A88 80B16528 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B167C0.s b/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B167C0.s index 6a5bdfd523..280630c1c3 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B167C0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B167C0.s @@ -1,20 +1,20 @@ glabel func_80B167C0 /* 02D20 80B167C0 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 02D24 80B167C4 AFA40020 */ sw $a0, 0x0020($sp) -/* 02D28 80B167C8 AFBF0014 */ sw $ra, 0x0014($sp) +/* 02D24 80B167C4 AFA40020 */ sw $a0, 0x0020($sp) +/* 02D28 80B167C8 AFBF0014 */ sw $ra, 0x0014($sp) /* 02D2C 80B167CC 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C /* 02D30 80B167D0 0C02927F */ jal SkelAnime_FrameUpdateMatrix - -/* 02D34 80B167D4 AFA4001C */ sw $a0, 0x001C($sp) -/* 02D38 80B167D8 10400004 */ beq $v0, $zero, .L80B167EC -/* 02D3C 80B167DC 8FA4001C */ lw $a0, 0x001C($sp) -/* 02D40 80B167E0 8FAE0020 */ lw $t6, 0x0020($sp) -/* 02D44 80B167E4 0C02947A */ jal func_800A51E8 + +/* 02D34 80B167D4 AFA4001C */ sw $a0, 0x001C($sp) +/* 02D38 80B167D8 10400004 */ beq $v0, $zero, .L80B167EC +/* 02D3C 80B167DC 8FA4001C */ lw $a0, 0x001C($sp) +/* 02D40 80B167E0 8FAE0020 */ lw $t6, 0x0020($sp) +/* 02D44 80B167E4 0C02947A */ jal SkelAnime_ChangeAnimDefaultStop /* 02D48 80B167E8 8DC502E4 */ lw $a1, 0x02E4($t6) ## 000002E4 .L80B167EC: -/* 02D4C 80B167EC 8FBF0014 */ lw $ra, 0x0014($sp) +/* 02D4C 80B167EC 8FBF0014 */ lw $ra, 0x0014($sp) /* 02D50 80B167F0 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 02D54 80B167F4 03E00008 */ jr $ra +/* 02D54 80B167F4 03E00008 */ jr $ra /* 02D58 80B167F8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B167FC.s b/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B167FC.s index 3bef14eb9b..3c375993ec 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B167FC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B167FC.s @@ -1,28 +1,28 @@ glabel func_80B167FC /* 02D5C 80B167FC 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 02D60 80B16800 AFB00018 */ sw $s0, 0x0018($sp) +/* 02D60 80B16800 AFB00018 */ sw $s0, 0x0018($sp) /* 02D64 80B16804 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 02D68 80B16808 AFBF001C */ sw $ra, 0x001C($sp) +/* 02D68 80B16808 AFBF001C */ sw $ra, 0x001C($sp) /* 02D6C 80B1680C 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C /* 02D70 80B16810 0C02927F */ jal SkelAnime_FrameUpdateMatrix - -/* 02D74 80B16814 AFA40024 */ sw $a0, 0x0024($sp) -/* 02D78 80B16818 10400006 */ beq $v0, $zero, .L80B16834 -/* 02D7C 80B1681C 8FA40024 */ lw $a0, 0x0024($sp) -/* 02D80 80B16820 0C02947A */ jal func_800A51E8 + +/* 02D74 80B16814 AFA40024 */ sw $a0, 0x0024($sp) +/* 02D78 80B16818 10400006 */ beq $v0, $zero, .L80B16834 +/* 02D7C 80B1681C 8FA40024 */ lw $a0, 0x0024($sp) +/* 02D80 80B16820 0C02947A */ jal SkelAnime_ChangeAnimDefaultStop /* 02D84 80B16824 8E0502E4 */ lw $a1, 0x02E4($s0) ## 000002E4 /* 02D88 80B16828 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 02D8C 80B1682C 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 02D90 80B16830 24056850 */ addiu $a1, $zero, 0x6850 ## $a1 = 00006850 .L80B16834: /* 02D94 80B16834 960E02E0 */ lhu $t6, 0x02E0($s0) ## 000002E0 /* 02D98 80B16838 35CF000C */ ori $t7, $t6, 0x000C ## $t7 = 0000000C /* 02D9C 80B1683C A60F02E0 */ sh $t7, 0x02E0($s0) ## 000002E0 -/* 02DA0 80B16840 8FBF001C */ lw $ra, 0x001C($sp) -/* 02DA4 80B16844 8FB00018 */ lw $s0, 0x0018($sp) +/* 02DA0 80B16840 8FBF001C */ lw $ra, 0x001C($sp) +/* 02DA4 80B16844 8FB00018 */ lw $s0, 0x0018($sp) /* 02DA8 80B16848 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 02DAC 80B1684C 03E00008 */ jr $ra +/* 02DAC 80B1684C 03E00008 */ jr $ra /* 02DB0 80B16850 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B16854.s b/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B16854.s index 2061f8fb26..c5f397045b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B16854.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Ta/func_80B16854.s @@ -1,33 +1,33 @@ glabel func_80B16854 /* 02DB4 80B16854 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 02DB8 80B16858 AFBF001C */ sw $ra, 0x001C($sp) -/* 02DBC 80B1685C AFB00018 */ sw $s0, 0x0018($sp) +/* 02DB8 80B16858 AFBF001C */ sw $ra, 0x001C($sp) +/* 02DBC 80B1685C AFB00018 */ sw $s0, 0x0018($sp) /* 02DC0 80B16860 848202E2 */ lh $v0, 0x02E2($a0) ## 000002E2 /* 02DC4 80B16864 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 02DC8 80B16868 18400003 */ blez $v0, .L80B16878 +/* 02DC8 80B16868 18400003 */ blez $v0, .L80B16878 /* 02DCC 80B1686C 244EFFFF */ addiu $t6, $v0, 0xFFFF ## $t6 = FFFFFFFF -/* 02DD0 80B16870 10000029 */ beq $zero, $zero, .L80B16918 +/* 02DD0 80B16870 10000029 */ beq $zero, $zero, .L80B16918 /* 02DD4 80B16874 A48E02E2 */ sh $t6, 0x02E2($a0) ## 000002E2 .L80B16878: /* 02DD8 80B16878 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C /* 02DDC 80B1687C 0C02927F */ jal SkelAnime_FrameUpdateMatrix - -/* 02DE0 80B16880 AFA40024 */ sw $a0, 0x0024($sp) -/* 02DE4 80B16884 1040000F */ beq $v0, $zero, .L80B168C4 -/* 02DE8 80B16888 8FA40024 */ lw $a0, 0x0024($sp) -/* 02DEC 80B1688C 0C02947A */ jal func_800A51E8 + +/* 02DE0 80B16880 AFA40024 */ sw $a0, 0x0024($sp) +/* 02DE4 80B16884 1040000F */ beq $v0, $zero, .L80B168C4 +/* 02DE8 80B16888 8FA40024 */ lw $a0, 0x0024($sp) +/* 02DEC 80B1688C 0C02947A */ jal SkelAnime_ChangeAnimDefaultStop /* 02DF0 80B16890 8E0502E4 */ lw $a1, 0x02E4($s0) ## 000002E4 /* 02DF4 80B16894 3C0142C8 */ lui $at, 0x42C8 ## $at = 42C80000 /* 02DF8 80B16898 44816000 */ mtc1 $at, $f12 ## $f12 = 100.00 /* 02DFC 80B1689C 0C00CFBE */ jal Math_Rand_ZeroFloat - + /* 02E00 80B168A0 00000000 */ nop /* 02E04 80B168A4 3C0142C8 */ lui $at, 0x42C8 ## $at = 42C80000 /* 02E08 80B168A8 44812000 */ mtc1 $at, $f4 ## $f4 = 100.00 /* 02E0C 80B168AC 00000000 */ nop -/* 02E10 80B168B0 46040180 */ add.s $f6, $f0, $f4 -/* 02E14 80B168B4 4600320D */ trunc.w.s $f8, $f6 -/* 02E18 80B168B8 44184000 */ mfc1 $t8, $f8 +/* 02E10 80B168B0 46040180 */ add.s $f6, $f0, $f4 +/* 02E14 80B168B4 4600320D */ trunc.w.s $f8, $f6 +/* 02E18 80B168B8 44184000 */ mfc1 $t8, $f8 /* 02E1C 80B168BC 00000000 */ nop /* 02E20 80B168C0 A61802E2 */ sh $t8, 0x02E2($s0) ## 000002E2 .L80B168C4: @@ -36,17 +36,17 @@ glabel func_80B16854 /* 02E2C 80B168CC C6000164 */ lwc1 $f0, 0x0164($s0) ## 00000164 /* 02E30 80B168D0 3C014254 */ lui $at, 0x4254 ## $at = 42540000 /* 02E34 80B168D4 24080002 */ addiu $t0, $zero, 0x0002 ## $t0 = 00000002 -/* 02E38 80B168D8 460A003C */ c.lt.s $f0, $f10 +/* 02E38 80B168D8 460A003C */ c.lt.s $f0, $f10 /* 02E3C 80B168DC 00000000 */ nop -/* 02E40 80B168E0 4502000A */ bc1fl .L80B1690C +/* 02E40 80B168E0 4502000A */ bc1fl .L80B1690C /* 02E44 80B168E4 A60802B4 */ sh $t0, 0x02B4($s0) ## 000002B4 /* 02E48 80B168E8 44818000 */ mtc1 $at, $f16 ## $f16 = 53.00 /* 02E4C 80B168EC 24190001 */ addiu $t9, $zero, 0x0001 ## $t9 = 00000001 -/* 02E50 80B168F0 4600803E */ c.le.s $f16, $f0 +/* 02E50 80B168F0 4600803E */ c.le.s $f16, $f0 /* 02E54 80B168F4 00000000 */ nop -/* 02E58 80B168F8 45020004 */ bc1fl .L80B1690C +/* 02E58 80B168F8 45020004 */ bc1fl .L80B1690C /* 02E5C 80B168FC A60802B4 */ sh $t0, 0x02B4($s0) ## 000002B4 -/* 02E60 80B16900 10000002 */ beq $zero, $zero, .L80B1690C +/* 02E60 80B16900 10000002 */ beq $zero, $zero, .L80B1690C /* 02E64 80B16904 A61902B4 */ sh $t9, 0x02B4($s0) ## 000002B4 /* 02E68 80B16908 A60802B4 */ sh $t0, 0x02B4($s0) ## 000002B4 .L80B1690C: @@ -57,10 +57,10 @@ glabel func_80B16854 /* 02E78 80B16918 960B02E0 */ lhu $t3, 0x02E0($s0) ## 000002E0 /* 02E7C 80B1691C 356C0004 */ ori $t4, $t3, 0x0004 ## $t4 = 00000004 /* 02E80 80B16920 A60C02E0 */ sh $t4, 0x02E0($s0) ## 000002E0 -/* 02E84 80B16924 8FBF001C */ lw $ra, 0x001C($sp) -/* 02E88 80B16928 8FB00018 */ lw $s0, 0x0018($sp) +/* 02E84 80B16924 8FBF001C */ lw $ra, 0x001C($sp) +/* 02E88 80B16928 8FB00018 */ lw $s0, 0x0018($sp) /* 02E8C 80B1692C 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 02E90 80B16930 03E00008 */ jr $ra +/* 02E90 80B16930 03E00008 */ jr $ra /* 02E94 80B16934 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Takara_Man/EnTakaraMan_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Takara_Man/EnTakaraMan_Draw.s index 92781e9120..16e1321ac8 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Takara_Man/EnTakaraMan_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Takara_Man/EnTakaraMan_Draw.s @@ -1,20 +1,20 @@ glabel EnTakaraMan_Draw /* 00750 80B17CB0 27BDFFB0 */ addiu $sp, $sp, 0xFFB0 ## $sp = FFFFFFB0 -/* 00754 80B17CB4 AFBF002C */ sw $ra, 0x002C($sp) -/* 00758 80B17CB8 AFB00028 */ sw $s0, 0x0028($sp) -/* 0075C 80B17CBC AFA50054 */ sw $a1, 0x0054($sp) +/* 00754 80B17CB4 AFBF002C */ sw $ra, 0x002C($sp) +/* 00758 80B17CB8 AFB00028 */ sw $s0, 0x0028($sp) +/* 0075C 80B17CBC AFA50054 */ sw $a1, 0x0054($sp) /* 00760 80B17CC0 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 /* 00764 80B17CC4 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 00768 80B17CC8 3C0680B1 */ lui $a2, %hi(D_80B17E40) ## $a2 = 80B10000 /* 0076C 80B17CCC 24C67E40 */ addiu $a2, $a2, %lo(D_80B17E40) ## $a2 = 80B17E40 /* 00770 80B17CD0 27A40038 */ addiu $a0, $sp, 0x0038 ## $a0 = FFFFFFE8 /* 00774 80B17CD4 24070210 */ addiu $a3, $zero, 0x0210 ## $a3 = 00000210 -/* 00778 80B17CD8 0C031AB1 */ jal func_800C6AC4 -/* 0077C 80B17CDC AFA50048 */ sw $a1, 0x0048($sp) -/* 00780 80B17CE0 8FAF0054 */ lw $t7, 0x0054($sp) -/* 00784 80B17CE4 0C024F46 */ jal func_80093D18 +/* 00778 80B17CD8 0C031AB1 */ jal Graph_OpenDisps +/* 0077C 80B17CDC AFA50048 */ sw $a1, 0x0048($sp) +/* 00780 80B17CE0 8FAF0054 */ lw $t7, 0x0054($sp) +/* 00784 80B17CE4 0C024F46 */ jal func_80093D18 /* 00788 80B17CE8 8DE40000 */ lw $a0, 0x0000($t7) ## 00000000 -/* 0078C 80B17CEC 8FA50048 */ lw $a1, 0x0048($sp) +/* 0078C 80B17CEC 8FA50048 */ lw $a1, 0x0048($sp) /* 00790 80B17CF0 3C19DB06 */ lui $t9, 0xDB06 ## $t9 = DB060000 /* 00794 80B17CF4 37390020 */ ori $t9, $t9, 0x0020 ## $t9 = DB060020 /* 00798 80B17CF8 8CA302C0 */ lw $v1, 0x02C0($a1) ## 000002C0 @@ -26,40 +26,40 @@ glabel EnTakaraMan_Draw /* 007B0 80B17D10 8608020E */ lh $t0, 0x020E($s0) ## 0000020E /* 007B4 80B17D14 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 /* 007B8 80B17D18 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF -/* 007BC 80B17D1C 00084880 */ sll $t1, $t0, 2 -/* 007C0 80B17D20 00892021 */ addu $a0, $a0, $t1 -/* 007C4 80B17D24 8C847DD4 */ lw $a0, %lo(D_80B17DD4)($a0) +/* 007BC 80B17D1C 00084880 */ sll $t1, $t0, 2 +/* 007C0 80B17D20 00892021 */ addu $a0, $a0, $t1 +/* 007C4 80B17D24 8C847DD4 */ lw $a0, %lo(D_80B17DD4)($a0) /* 007C8 80B17D28 3C1980B1 */ lui $t9, %hi(func_80B17C4C) ## $t9 = 80B10000 /* 007CC 80B17D2C 27397C4C */ addiu $t9, $t9, %lo(func_80B17C4C) ## $t9 = 80B17C4C -/* 007D0 80B17D30 00045900 */ sll $t3, $a0, 4 -/* 007D4 80B17D34 000B6702 */ srl $t4, $t3, 28 -/* 007D8 80B17D38 000C6880 */ sll $t5, $t4, 2 -/* 007DC 80B17D3C 01CD7021 */ addu $t6, $t6, $t5 +/* 007D0 80B17D30 00045900 */ sll $t3, $a0, 4 +/* 007D4 80B17D34 000B6702 */ srl $t4, $t3, 28 +/* 007D8 80B17D38 000C6880 */ sll $t5, $t4, 2 +/* 007DC 80B17D3C 01CD7021 */ addu $t6, $t6, $t5 /* 007E0 80B17D40 8DCE6FA8 */ lw $t6, 0x6FA8($t6) ## 80166FA8 -/* 007E4 80B17D44 00815024 */ and $t2, $a0, $at +/* 007E4 80B17D44 00815024 */ and $t2, $a0, $at /* 007E8 80B17D48 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 007EC 80B17D4C 014E7821 */ addu $t7, $t2, $t6 -/* 007F0 80B17D50 01E1C021 */ addu $t8, $t7, $at +/* 007EC 80B17D4C 014E7821 */ addu $t7, $t2, $t6 +/* 007F0 80B17D50 01E1C021 */ addu $t8, $t7, $at /* 007F4 80B17D54 AC780004 */ sw $t8, 0x0004($v1) ## 00000004 /* 007F8 80B17D58 92070152 */ lbu $a3, 0x0152($s0) ## 00000152 /* 007FC 80B17D5C 8E060170 */ lw $a2, 0x0170($s0) ## 00000170 /* 00800 80B17D60 8E050154 */ lw $a1, 0x0154($s0) ## 00000154 -/* 00804 80B17D64 AFB00018 */ sw $s0, 0x0018($sp) -/* 00808 80B17D68 AFA00014 */ sw $zero, 0x0014($sp) -/* 0080C 80B17D6C AFB90010 */ sw $t9, 0x0010($sp) -/* 00810 80B17D70 0C0286B2 */ jal func_800A1AC8 -/* 00814 80B17D74 8FA40054 */ lw $a0, 0x0054($sp) -/* 00818 80B17D78 8FA80054 */ lw $t0, 0x0054($sp) +/* 00804 80B17D64 AFB00018 */ sw $s0, 0x0018($sp) +/* 00808 80B17D68 AFA00014 */ sw $zero, 0x0014($sp) +/* 0080C 80B17D6C AFB90010 */ sw $t9, 0x0010($sp) +/* 00810 80B17D70 0C0286B2 */ jal SkelAnime_DrawSV +/* 00814 80B17D74 8FA40054 */ lw $a0, 0x0054($sp) +/* 00818 80B17D78 8FA80054 */ lw $t0, 0x0054($sp) /* 0081C 80B17D7C 3C0680B1 */ lui $a2, %hi(D_80B17E58) ## $a2 = 80B10000 /* 00820 80B17D80 24C67E58 */ addiu $a2, $a2, %lo(D_80B17E58) ## $a2 = 80B17E58 /* 00824 80B17D84 27A40038 */ addiu $a0, $sp, 0x0038 ## $a0 = FFFFFFE8 /* 00828 80B17D88 24070220 */ addiu $a3, $zero, 0x0220 ## $a3 = 00000220 -/* 0082C 80B17D8C 0C031AD5 */ jal func_800C6B54 +/* 0082C 80B17D8C 0C031AD5 */ jal Graph_CloseDisps /* 00830 80B17D90 8D050000 */ lw $a1, 0x0000($t0) ## 00000000 -/* 00834 80B17D94 8FBF002C */ lw $ra, 0x002C($sp) -/* 00838 80B17D98 8FB00028 */ lw $s0, 0x0028($sp) +/* 00834 80B17D94 8FBF002C */ lw $ra, 0x002C($sp) +/* 00838 80B17D98 8FB00028 */ lw $s0, 0x0028($sp) /* 0083C 80B17D9C 27BD0050 */ addiu $sp, $sp, 0x0050 ## $sp = 00000000 -/* 00840 80B17DA0 03E00008 */ jr $ra +/* 00840 80B17DA0 03E00008 */ jr $ra /* 00844 80B17DA4 00000000 */ nop /* 00848 80B17DA8 00000000 */ nop /* 0084C 80B17DAC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Takara_Man/EnTakaraMan_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Takara_Man/EnTakaraMan_Init.s index a822bd5151..87e98a82b5 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Takara_Man/EnTakaraMan_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Takara_Man/EnTakaraMan_Init.s @@ -3,52 +3,52 @@ glabel EnTakaraMan_Init /* 00010 80B17570 24427DD0 */ addiu $v0, $v0, %lo(D_80B17DD0) ## $v0 = 80B17DD0 /* 00014 80B17574 904E0000 */ lbu $t6, 0x0000($v0) ## 80B17DD0 /* 00018 80B17578 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 0001C 80B1757C AFB00028 */ sw $s0, 0x0028($sp) +/* 0001C 80B1757C AFB00028 */ sw $s0, 0x0028($sp) /* 00020 80B17580 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00024 80B17584 AFBF002C */ sw $ra, 0x002C($sp) -/* 00028 80B17588 11C00008 */ beq $t6, $zero, .L80B175AC -/* 0002C 80B1758C AFA50034 */ sw $a1, 0x0034($sp) +/* 00024 80B17584 AFBF002C */ sw $ra, 0x002C($sp) +/* 00028 80B17588 11C00008 */ beq $t6, $zero, .L80B175AC +/* 0002C 80B1758C AFA50034 */ sw $a1, 0x0034($sp) /* 00030 80B17590 0C00B55C */ jal Actor_Kill - + /* 00034 80B17594 00000000 */ nop /* 00038 80B17598 3C0480B1 */ lui $a0, %hi(D_80B17DE0) ## $a0 = 80B10000 /* 0003C 80B1759C 0C00084C */ jal osSyncPrintf - + /* 00040 80B175A0 24847DE0 */ addiu $a0, $a0, %lo(D_80B17DE0) ## $a0 = 80B17DE0 -/* 00044 80B175A4 1000004A */ beq $zero, $zero, .L80B176D0 -/* 00048 80B175A8 8FBF002C */ lw $ra, 0x002C($sp) +/* 00044 80B175A4 1000004A */ beq $zero, $zero, .L80B176D0 +/* 00048 80B175A8 8FBF002C */ lw $ra, 0x002C($sp) .L80B175AC: /* 0004C 80B175AC 240F0001 */ addiu $t7, $zero, 0x0001 ## $t7 = 00000001 /* 00050 80B175B0 3C0480B1 */ lui $a0, %hi(D_80B17E10) ## $a0 = 80B10000 /* 00054 80B175B4 A04F0000 */ sb $t7, 0x0000($v0) ## 00000000 /* 00058 80B175B8 0C00084C */ jal osSyncPrintf - + /* 0005C 80B175BC 24847E10 */ addiu $a0, $a0, %lo(D_80B17E10) ## $a0 = 80B17E10 -/* 00060 80B175C0 8FB80034 */ lw $t8, 0x0034($sp) +/* 00060 80B175C0 8FB80034 */ lw $t8, 0x0034($sp) /* 00064 80B175C4 3C0480B1 */ lui $a0, %hi(D_80B17E14) ## $a0 = 80B10000 /* 00068 80B175C8 24847E14 */ addiu $a0, $a0, %lo(D_80B17E14) ## $a0 = 80B17E14 /* 0006C 80B175CC 0C00084C */ jal osSyncPrintf - + /* 00070 80B175D0 8F051D38 */ lw $a1, 0x1D38($t8) ## 00001D38 -/* 00074 80B175D4 8FA40034 */ lw $a0, 0x0034($sp) +/* 00074 80B175D4 8FA40034 */ lw $a0, 0x0034($sp) /* 00078 80B175D8 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 /* 0007C 80B175DC 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 /* 00080 80B175E0 AC801D38 */ sw $zero, 0x1D38($a0) ## 00001D38 /* 00084 80B175E4 94481402 */ lhu $t0, 0x1402($v0) ## 8015FA62 /* 00088 80B175E8 2419FFFF */ addiu $t9, $zero, 0xFFFF ## $t9 = FFFFFFFF /* 0008C 80B175EC 3C060600 */ lui $a2, 0x0600 ## $a2 = 06000000 -/* 00090 80B175F0 00484821 */ addu $t1, $v0, $t0 +/* 00090 80B175F0 00484821 */ addu $t1, $v0, $t0 /* 00094 80B175F4 A13900BC */ sb $t9, 0x00BC($t1) ## 000000BC /* 00098 80B175F8 3C070600 */ lui $a3, 0x0600 ## $a3 = 06000000 /* 0009C 80B175FC 260A0194 */ addiu $t2, $s0, 0x0194 ## $t2 = 00000194 /* 000A0 80B17600 260B01D0 */ addiu $t3, $s0, 0x01D0 ## $t3 = 000001D0 /* 000A4 80B17604 240C000A */ addiu $t4, $zero, 0x000A ## $t4 = 0000000A -/* 000A8 80B17608 AFAC0018 */ sw $t4, 0x0018($sp) -/* 000AC 80B1760C AFAB0014 */ sw $t3, 0x0014($sp) -/* 000B0 80B17610 AFAA0010 */ sw $t2, 0x0010($sp) +/* 000A8 80B17608 AFAC0018 */ sw $t4, 0x0018($sp) +/* 000AC 80B1760C AFAB0014 */ sw $t3, 0x0014($sp) +/* 000B0 80B17610 AFAA0010 */ sw $t2, 0x0010($sp) /* 000B4 80B17614 24E70498 */ addiu $a3, $a3, 0x0498 ## $a3 = 06000498 /* 000B8 80B17618 24C64FE0 */ addiu $a2, $a2, 0x4FE0 ## $a2 = 06004FE0 -/* 000BC 80B1761C 0C0291BE */ jal func_800A46F8 +/* 000BC 80B1761C 0C0291BE */ jal SkelAnime_InitSV /* 000C0 80B17620 26050150 */ addiu $a1, $s0, 0x0150 ## $a1 = 00000150 /* 000C4 80B17624 26020024 */ addiu $v0, $s0, 0x0024 ## $v0 = 00000024 /* 000C8 80B17628 8C4E0000 */ lw $t6, 0x0000($v0) ## 00000024 @@ -75,7 +75,7 @@ glabel EnTakaraMan_Init /* 0011C 80B1767C E6060028 */ swc1 $f6, 0x0028($s0) ## 00000028 /* 00120 80B17680 E608002C */ swc1 $f8, 0x002C($s0) ## 0000002C /* 00124 80B17684 0C00B58B */ jal Actor_SetScale - + /* 00128 80B17688 AE180228 */ sw $t8, 0x0228($s0) ## 00000228 /* 0012C 80B1768C 2409B1E0 */ addiu $t1, $zero, 0xB1E0 ## $t1 = FFFFB1E0 /* 00130 80B17690 3C0142B4 */ lui $at, 0x42B4 ## $at = 42B40000 @@ -93,11 +93,11 @@ glabel EnTakaraMan_Init /* 00160 80B176C0 E60A021C */ swc1 $f10, 0x021C($s0) ## 0000021C /* 00164 80B176C4 A6080216 */ sh $t0, 0x0216($s0) ## 00000216 /* 00168 80B176C8 A60A0032 */ sh $t2, 0x0032($s0) ## 00000032 -/* 0016C 80B176CC 8FBF002C */ lw $ra, 0x002C($sp) +/* 0016C 80B176CC 8FBF002C */ lw $ra, 0x002C($sp) .L80B176D0: -/* 00170 80B176D0 8FB00028 */ lw $s0, 0x0028($sp) +/* 00170 80B176D0 8FB00028 */ lw $s0, 0x0028($sp) /* 00174 80B176D4 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 00178 80B176D8 03E00008 */ jr $ra +/* 00178 80B176D8 03E00008 */ jr $ra /* 0017C 80B176DC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Takara_Man/func_80B176E0.s b/asm/non_matchings/overlays/actors/ovl_En_Takara_Man/func_80B176E0.s index 5fd5953191..f8662c0feb 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Takara_Man/func_80B176E0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Takara_Man/func_80B176E0.s @@ -1,49 +1,49 @@ glabel func_80B176E0 /* 00180 80B176E0 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 00184 80B176E4 AFB00028 */ sw $s0, 0x0028($sp) +/* 00184 80B176E4 AFB00028 */ sw $s0, 0x0028($sp) /* 00188 80B176E8 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 0018C 80B176EC AFBF002C */ sw $ra, 0x002C($sp) +/* 0018C 80B176EC AFBF002C */ sw $ra, 0x002C($sp) /* 00190 80B176F0 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 -/* 00194 80B176F4 AFA50034 */ sw $a1, 0x0034($sp) +/* 00194 80B176F4 AFA50034 */ sw $a1, 0x0034($sp) /* 00198 80B176F8 0C028800 */ jal SkelAnime_GetFrameCount - + /* 0019C 80B176FC 24840498 */ addiu $a0, $a0, 0x0498 ## $a0 = 06000498 /* 001A0 80B17700 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 001A4 80B17704 3C01C120 */ lui $at, 0xC120 ## $at = C1200000 /* 001A8 80B17708 44819000 */ mtc1 $at, $f18 ## $f18 = -10.00 -/* 001AC 80B1770C 468021A0 */ cvt.s.w $f6, $f4 +/* 001AC 80B1770C 468021A0 */ cvt.s.w $f6, $f4 /* 001B0 80B17710 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 001B4 80B17714 24A50498 */ addiu $a1, $a1, 0x0498 ## $a1 = 06000498 /* 001B8 80B17718 26040150 */ addiu $a0, $s0, 0x0150 ## $a0 = 00000150 /* 001BC 80B1771C 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 001C0 80B17720 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 001C4 80B17724 4600320D */ trunc.w.s $f8, $f6 -/* 001C8 80B17728 AFA00014 */ sw $zero, 0x0014($sp) -/* 001CC 80B1772C E7B20018 */ swc1 $f18, 0x0018($sp) -/* 001D0 80B17730 440F4000 */ mfc1 $t7, $f8 +/* 001C4 80B17724 4600320D */ trunc.w.s $f8, $f6 +/* 001C8 80B17728 AFA00014 */ sw $zero, 0x0014($sp) +/* 001CC 80B1772C E7B20018 */ swc1 $f18, 0x0018($sp) +/* 001D0 80B17730 440F4000 */ mfc1 $t7, $f8 /* 001D4 80B17734 00000000 */ nop -/* 001D8 80B17738 000FC400 */ sll $t8, $t7, 16 -/* 001DC 80B1773C 0018CC03 */ sra $t9, $t8, 16 +/* 001D8 80B17738 000FC400 */ sll $t8, $t7, 16 +/* 001DC 80B1773C 0018CC03 */ sra $t9, $t8, 16 /* 001E0 80B17740 44995000 */ mtc1 $t9, $f10 ## $f10 = 0.00 /* 001E4 80B17744 00000000 */ nop -/* 001E8 80B17748 46805420 */ cvt.s.w $f16, $f10 -/* 001EC 80B1774C 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 001F0 80B17750 E7B00010 */ swc1 $f16, 0x0010($sp) +/* 001E8 80B17748 46805420 */ cvt.s.w $f16, $f10 +/* 001EC 80B1774C 0C029468 */ jal SkelAnime_ChangeAnim + +/* 001F0 80B17750 E7B00010 */ swc1 $f16, 0x0010($sp) /* 001F4 80B17754 86080214 */ lh $t0, 0x0214($s0) ## 00000214 /* 001F8 80B17758 3C0B80B1 */ lui $t3, %hi(func_80B1778C) ## $t3 = 80B10000 /* 001FC 80B1775C 2409006D */ addiu $t1, $zero, 0x006D ## $t1 = 0000006D -/* 00200 80B17760 15000004 */ bne $t0, $zero, .L80B17774 +/* 00200 80B17760 15000004 */ bne $t0, $zero, .L80B17774 /* 00204 80B17764 256B778C */ addiu $t3, $t3, %lo(func_80B1778C) ## $t3 = 80B1778C /* 00208 80B17768 240A0004 */ addiu $t2, $zero, 0x0004 ## $t2 = 00000004 /* 0020C 80B1776C A609010E */ sh $t1, 0x010E($s0) ## 0000010E /* 00210 80B17770 A60A020C */ sh $t2, 0x020C($s0) ## 0000020C .L80B17774: /* 00214 80B17774 AE0B014C */ sw $t3, 0x014C($s0) ## 0000014C -/* 00218 80B17778 8FBF002C */ lw $ra, 0x002C($sp) -/* 0021C 80B1777C 8FB00028 */ lw $s0, 0x0028($sp) +/* 00218 80B17778 8FBF002C */ lw $ra, 0x002C($sp) +/* 0021C 80B1777C 8FB00028 */ lw $s0, 0x0028($sp) /* 00220 80B17780 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 00224 80B17784 03E00008 */ jr $ra +/* 00224 80B17784 03E00008 */ jr $ra /* 00228 80B17788 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Tana/EnTana_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Tana/EnTana_Destroy.s deleted file mode 100644 index 112a1f1d96..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Tana/EnTana_Destroy.s +++ /dev/null @@ -1,6 +0,0 @@ -glabel EnTana_Destroy -/* 0007C 80B17FAC AFA40000 */ sw $a0, 0x0000($sp) -/* 00080 80B17FB0 03E00008 */ jr $ra -/* 00084 80B17FB4 AFA50004 */ sw $a1, 0x0004($sp) - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Tana/EnTana_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Tana/EnTana_Init.s deleted file mode 100644 index 56ed26e0d1..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Tana/EnTana_Init.s +++ /dev/null @@ -1,36 +0,0 @@ -glabel EnTana_Init -/* 00000 80B17F30 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00004 80B17F34 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00008 80B17F38 AFA5001C */ sw $a1, 0x001C($sp) -/* 0000C 80B17F3C 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 -/* 00010 80B17F40 84CE001C */ lh $t6, 0x001C($a2) ## 0000001C -/* 00014 80B17F44 3C0580B2 */ lui $a1, %hi(D_80B18200) ## $a1 = 80B20000 -/* 00018 80B17F48 3C0480B2 */ lui $a0, %hi(D_80B18240) ## $a0 = 80B20000 -/* 0001C 80B17F4C 000E7880 */ sll $t7, $t6, 2 -/* 00020 80B17F50 00AF2821 */ addu $a1, $a1, $t7 -/* 00024 80B17F54 8CA58200 */ lw $a1, %lo(D_80B18200)($a1) -/* 00028 80B17F58 24848240 */ addiu $a0, $a0, %lo(D_80B18240) ## $a0 = 80B18240 -/* 0002C 80B17F5C 0C00084C */ jal osSyncPrintf - -/* 00030 80B17F60 AFA60018 */ sw $a2, 0x0018($sp) -/* 00034 80B17F64 8FA40018 */ lw $a0, 0x0018($sp) -/* 00038 80B17F68 0C00B58B */ jal Actor_SetScale - -/* 0003C 80B17F6C 3C053F80 */ lui $a1, 0x3F80 ## $a1 = 3F800000 -/* 00040 80B17F70 8FA60018 */ lw $a2, 0x0018($sp) -/* 00044 80B17F74 2401FFFE */ addiu $at, $zero, 0xFFFE ## $at = FFFFFFFE -/* 00048 80B17F78 3C0A80B2 */ lui $t2, %hi(D_80B18208) ## $t2 = 80B20000 -/* 0004C 80B17F7C 8CD80004 */ lw $t8, 0x0004($a2) ## 00000004 -/* 00050 80B17F80 84C8001C */ lh $t0, 0x001C($a2) ## 0000001C -/* 00054 80B17F84 0301C824 */ and $t9, $t8, $at -/* 00058 80B17F88 00084880 */ sll $t1, $t0, 2 -/* 0005C 80B17F8C 01495021 */ addu $t2, $t2, $t1 -/* 00060 80B17F90 ACD90004 */ sw $t9, 0x0004($a2) ## 00000004 -/* 00064 80B17F94 8D4A8208 */ lw $t2, %lo(D_80B18208)($t2) -/* 00068 80B17F98 ACCA0134 */ sw $t2, 0x0134($a2) ## 00000134 -/* 0006C 80B17F9C 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00070 80B17FA0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00074 80B17FA4 03E00008 */ jr $ra -/* 00078 80B17FA8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Tana/EnTana_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Tana/EnTana_Update.s deleted file mode 100644 index 45021ba456..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Tana/EnTana_Update.s +++ /dev/null @@ -1,6 +0,0 @@ -glabel EnTana_Update -/* 00088 80B17FB8 AFA40000 */ sw $a0, 0x0000($sp) -/* 0008C 80B17FBC 03E00008 */ jr $ra -/* 00090 80B17FC0 AFA50004 */ sw $a1, 0x0004($sp) - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Tana/func_80B17FC4.s b/asm/non_matchings/overlays/actors/ovl_En_Tana/func_80B17FC4.s deleted file mode 100644 index 5eb0dd9285..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Tana/func_80B17FC4.s +++ /dev/null @@ -1,57 +0,0 @@ -glabel func_80B17FC4 -/* 00094 80B17FC4 27BDFFB8 */ addiu $sp, $sp, 0xFFB8 ## $sp = FFFFFFB8 -/* 00098 80B17FC8 AFBF001C */ sw $ra, 0x001C($sp) -/* 0009C 80B17FCC AFB00018 */ sw $s0, 0x0018($sp) -/* 000A0 80B17FD0 AFA40048 */ sw $a0, 0x0048($sp) -/* 000A4 80B17FD4 AFA5004C */ sw $a1, 0x004C($sp) -/* 000A8 80B17FD8 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 -/* 000AC 80B17FDC 3C0680B2 */ lui $a2, %hi(D_80B18254) ## $a2 = 80B20000 -/* 000B0 80B17FE0 24C68254 */ addiu $a2, $a2, %lo(D_80B18254) ## $a2 = 80B18254 -/* 000B4 80B17FE4 27A40030 */ addiu $a0, $sp, 0x0030 ## $a0 = FFFFFFE8 -/* 000B8 80B17FE8 24070094 */ addiu $a3, $zero, 0x0094 ## $a3 = 00000094 -/* 000BC 80B17FEC 0C031AB1 */ jal func_800C6AC4 -/* 000C0 80B17FF0 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 -/* 000C4 80B17FF4 8FAF004C */ lw $t7, 0x004C($sp) -/* 000C8 80B17FF8 0C024F46 */ jal func_80093D18 -/* 000CC 80B17FFC 8DE40000 */ lw $a0, 0x0000($t7) ## 00000000 -/* 000D0 80B18000 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 -/* 000D4 80B18004 3C19DA38 */ lui $t9, 0xDA38 ## $t9 = DA380000 -/* 000D8 80B18008 37390003 */ ori $t9, $t9, 0x0003 ## $t9 = DA380003 -/* 000DC 80B1800C 24580008 */ addiu $t8, $v0, 0x0008 ## $t8 = 00000008 -/* 000E0 80B18010 AE1802C0 */ sw $t8, 0x02C0($s0) ## 000002C0 -/* 000E4 80B18014 AC590000 */ sw $t9, 0x0000($v0) ## 00000000 -/* 000E8 80B18018 8FA8004C */ lw $t0, 0x004C($sp) -/* 000EC 80B1801C 3C0580B2 */ lui $a1, %hi(D_80B18264) ## $a1 = 80B20000 -/* 000F0 80B18020 24A58264 */ addiu $a1, $a1, %lo(D_80B18264) ## $a1 = 80B18264 -/* 000F4 80B18024 8D040000 */ lw $a0, 0x0000($t0) ## 00000000 -/* 000F8 80B18028 24060098 */ addiu $a2, $zero, 0x0098 ## $a2 = 00000098 -/* 000FC 80B1802C 0C0346A2 */ jal Matrix_NewMtx -/* 00100 80B18030 AFA2002C */ sw $v0, 0x002C($sp) -/* 00104 80B18034 8FA3002C */ lw $v1, 0x002C($sp) -/* 00108 80B18038 3C0ADE00 */ lui $t2, 0xDE00 ## $t2 = DE000000 -/* 0010C 80B1803C 3C0E80B2 */ lui $t6, %hi(D_80B18214) ## $t6 = 80B20000 -/* 00110 80B18040 AC620004 */ sw $v0, 0x0004($v1) ## 00000004 -/* 00114 80B18044 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 -/* 00118 80B18048 3C0680B2 */ lui $a2, %hi(D_80B18274) ## $a2 = 80B20000 -/* 0011C 80B1804C 24C68274 */ addiu $a2, $a2, %lo(D_80B18274) ## $a2 = 80B18274 -/* 00120 80B18050 24490008 */ addiu $t1, $v0, 0x0008 ## $t1 = 00000008 -/* 00124 80B18054 AE0902C0 */ sw $t1, 0x02C0($s0) ## 000002C0 -/* 00128 80B18058 AC4A0000 */ sw $t2, 0x0000($v0) ## 00000000 -/* 0012C 80B1805C 8FAB0048 */ lw $t3, 0x0048($sp) -/* 00130 80B18060 27A40030 */ addiu $a0, $sp, 0x0030 ## $a0 = FFFFFFE8 -/* 00134 80B18064 2407009D */ addiu $a3, $zero, 0x009D ## $a3 = 0000009D -/* 00138 80B18068 856C001C */ lh $t4, 0x001C($t3) ## 0000001C -/* 0013C 80B1806C 000C6880 */ sll $t5, $t4, 2 -/* 00140 80B18070 01CD7021 */ addu $t6, $t6, $t5 -/* 00144 80B18074 8DCE8214 */ lw $t6, %lo(D_80B18214)($t6) -/* 00148 80B18078 AC4E0004 */ sw $t6, 0x0004($v0) ## 00000004 -/* 0014C 80B1807C 8FAF004C */ lw $t7, 0x004C($sp) -/* 00150 80B18080 0C031AD5 */ jal func_800C6B54 -/* 00154 80B18084 8DE50000 */ lw $a1, 0x0000($t7) ## 00000000 -/* 00158 80B18088 8FBF001C */ lw $ra, 0x001C($sp) -/* 0015C 80B1808C 8FB00018 */ lw $s0, 0x0018($sp) -/* 00160 80B18090 27BD0048 */ addiu $sp, $sp, 0x0048 ## $sp = 00000000 -/* 00164 80B18094 03E00008 */ jr $ra -/* 00168 80B18098 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Tana/func_80B1809C.s b/asm/non_matchings/overlays/actors/ovl_En_Tana/func_80B1809C.s deleted file mode 100644 index 65e5da51f1..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Tana/func_80B1809C.s +++ /dev/null @@ -1,83 +0,0 @@ -glabel func_80B1809C -/* 0016C 80B1809C 27BDFFB8 */ addiu $sp, $sp, 0xFFB8 ## $sp = FFFFFFB8 -/* 00170 80B180A0 AFBF001C */ sw $ra, 0x001C($sp) -/* 00174 80B180A4 AFB00018 */ sw $s0, 0x0018($sp) -/* 00178 80B180A8 AFA40048 */ sw $a0, 0x0048($sp) -/* 0017C 80B180AC AFA5004C */ sw $a1, 0x004C($sp) -/* 00180 80B180B0 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 -/* 00184 80B180B4 3C0680B2 */ lui $a2, %hi(D_80B18284) ## $a2 = 80B20000 -/* 00188 80B180B8 24C68284 */ addiu $a2, $a2, %lo(D_80B18284) ## $a2 = 80B18284 -/* 0018C 80B180BC 27A40030 */ addiu $a0, $sp, 0x0030 ## $a0 = FFFFFFE8 -/* 00190 80B180C0 240700A3 */ addiu $a3, $zero, 0x00A3 ## $a3 = 000000A3 -/* 00194 80B180C4 0C031AB1 */ jal func_800C6AC4 -/* 00198 80B180C8 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 -/* 0019C 80B180CC 8FAF004C */ lw $t7, 0x004C($sp) -/* 001A0 80B180D0 0C024F46 */ jal func_80093D18 -/* 001A4 80B180D4 8DE40000 */ lw $a0, 0x0000($t7) ## 00000000 -/* 001A8 80B180D8 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 -/* 001AC 80B180DC 3C19DB06 */ lui $t9, 0xDB06 ## $t9 = DB060000 -/* 001B0 80B180E0 37390020 */ ori $t9, $t9, 0x0020 ## $t9 = DB060020 -/* 001B4 80B180E4 24580008 */ addiu $t8, $v0, 0x0008 ## $t8 = 00000008 -/* 001B8 80B180E8 AE1802C0 */ sw $t8, 0x02C0($s0) ## 000002C0 -/* 001BC 80B180EC AC590000 */ sw $t9, 0x0000($v0) ## 00000000 -/* 001C0 80B180F0 8FA80048 */ lw $t0, 0x0048($sp) -/* 001C4 80B180F4 3C0480B2 */ lui $a0, %hi(D_80B18220) ## $a0 = 80B20000 -/* 001C8 80B180F8 3C0F8016 */ lui $t7, 0x8016 ## $t7 = 80160000 -/* 001CC 80B180FC 8509001C */ lh $t1, 0x001C($t0) ## 0000001C -/* 001D0 80B18100 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 -/* 001D4 80B18104 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF -/* 001D8 80B18108 00095080 */ sll $t2, $t1, 2 -/* 001DC 80B1810C 008A2021 */ addu $a0, $a0, $t2 -/* 001E0 80B18110 8C848220 */ lw $a0, %lo(D_80B18220)($a0) -/* 001E4 80B18114 3C09DA38 */ lui $t1, 0xDA38 ## $t1 = DA380000 -/* 001E8 80B18118 35290003 */ ori $t1, $t1, 0x0003 ## $t1 = DA380003 -/* 001EC 80B1811C 00046100 */ sll $t4, $a0, 4 -/* 001F0 80B18120 000C6F02 */ srl $t5, $t4, 28 -/* 001F4 80B18124 000D7080 */ sll $t6, $t5, 2 -/* 001F8 80B18128 01EE7821 */ addu $t7, $t7, $t6 -/* 001FC 80B1812C 8DEF6FA8 */ lw $t7, 0x6FA8($t7) ## 80166FA8 -/* 00200 80B18130 00815824 */ and $t3, $a0, $at -/* 00204 80B18134 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 00208 80B18138 016FC021 */ addu $t8, $t3, $t7 -/* 0020C 80B1813C 0301C821 */ addu $t9, $t8, $at -/* 00210 80B18140 AC590004 */ sw $t9, 0x0004($v0) ## 00000004 -/* 00214 80B18144 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 -/* 00218 80B18148 3C0580B2 */ lui $a1, %hi(D_80B18294) ## $a1 = 80B20000 -/* 0021C 80B1814C 24A58294 */ addiu $a1, $a1, %lo(D_80B18294) ## $a1 = 80B18294 -/* 00220 80B18150 24480008 */ addiu $t0, $v0, 0x0008 ## $t0 = 00000008 -/* 00224 80B18154 AE0802C0 */ sw $t0, 0x02C0($s0) ## 000002C0 -/* 00228 80B18158 AC490000 */ sw $t1, 0x0000($v0) ## 00000000 -/* 0022C 80B1815C 8FAA004C */ lw $t2, 0x004C($sp) -/* 00230 80B18160 240600A9 */ addiu $a2, $zero, 0x00A9 ## $a2 = 000000A9 -/* 00234 80B18164 8D440000 */ lw $a0, 0x0000($t2) ## 00000000 -/* 00238 80B18168 0C0346A2 */ jal Matrix_NewMtx -/* 0023C 80B1816C AFA20028 */ sw $v0, 0x0028($sp) -/* 00240 80B18170 8FA30028 */ lw $v1, 0x0028($sp) -/* 00244 80B18174 3C0DDE00 */ lui $t5, 0xDE00 ## $t5 = DE000000 -/* 00248 80B18178 3C1880B2 */ lui $t8, %hi(D_80B18214) ## $t8 = 80B20000 -/* 0024C 80B1817C AC620004 */ sw $v0, 0x0004($v1) ## 00000004 -/* 00250 80B18180 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 -/* 00254 80B18184 3C0680B2 */ lui $a2, %hi(D_80B182A4) ## $a2 = 80B20000 -/* 00258 80B18188 24C682A4 */ addiu $a2, $a2, %lo(D_80B182A4) ## $a2 = 80B182A4 -/* 0025C 80B1818C 244C0008 */ addiu $t4, $v0, 0x0008 ## $t4 = 00000008 -/* 00260 80B18190 AE0C02C0 */ sw $t4, 0x02C0($s0) ## 000002C0 -/* 00264 80B18194 AC4D0000 */ sw $t5, 0x0000($v0) ## 00000000 -/* 00268 80B18198 8FAE0048 */ lw $t6, 0x0048($sp) -/* 0026C 80B1819C 27A40030 */ addiu $a0, $sp, 0x0030 ## $a0 = FFFFFFE8 -/* 00270 80B181A0 240700AE */ addiu $a3, $zero, 0x00AE ## $a3 = 000000AE -/* 00274 80B181A4 85CB001C */ lh $t3, 0x001C($t6) ## 0000001C -/* 00278 80B181A8 000B7880 */ sll $t7, $t3, 2 -/* 0027C 80B181AC 030FC021 */ addu $t8, $t8, $t7 -/* 00280 80B181B0 8F188214 */ lw $t8, %lo(D_80B18214)($t8) -/* 00284 80B181B4 AC580004 */ sw $t8, 0x0004($v0) ## 00000004 -/* 00288 80B181B8 8FB9004C */ lw $t9, 0x004C($sp) -/* 0028C 80B181BC 0C031AD5 */ jal func_800C6B54 -/* 00290 80B181C0 8F250000 */ lw $a1, 0x0000($t9) ## 00000000 -/* 00294 80B181C4 8FBF001C */ lw $ra, 0x001C($sp) -/* 00298 80B181C8 8FB00018 */ lw $s0, 0x0018($sp) -/* 0029C 80B181CC 27BD0048 */ addiu $sp, $sp, 0x0048 ## $sp = 00000000 -/* 002A0 80B181D0 03E00008 */ jr $ra -/* 002A4 80B181D4 00000000 */ nop -/* 002A8 80B181D8 00000000 */ nop -/* 002AC 80B181DC 00000000 */ nop - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Test/EnTest_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Test/EnTest_Update.s index 5de292d8b9..539dadf856 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Test/EnTest_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Test/EnTest_Update.s @@ -1,134 +1,134 @@ glabel EnTest_Update /* 04044 80863694 27BDFFB0 */ addiu $sp, $sp, 0xFFB0 ## $sp = FFFFFFB0 -/* 04048 80863698 AFBF002C */ sw $ra, 0x002C($sp) -/* 0404C 8086369C AFB00028 */ sw $s0, 0x0028($sp) +/* 04048 80863698 AFBF002C */ sw $ra, 0x002C($sp) +/* 0404C 8086369C AFB00028 */ sw $s0, 0x0028($sp) /* 04050 808636A0 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 04054 808636A4 0C218D3E */ jal func_808634F8 -/* 04058 808636A8 AFA50054 */ sw $a1, 0x0054($sp) +/* 04054 808636A4 0C218D3E */ jal func_808634F8 +/* 04058 808636A8 AFA50054 */ sw $a1, 0x0054($sp) /* 0405C 808636AC 920E00B1 */ lbu $t6, 0x00B1($s0) ## 000000B1 /* 04060 808636B0 24010006 */ addiu $at, $zero, 0x0006 ## $at = 00000006 -/* 04064 808636B4 51C100A7 */ beql $t6, $at, .L80863954 +/* 04064 808636B4 51C100A7 */ beql $t6, $at, .L80863954 /* 04068 808636B8 26050810 */ addiu $a1, $s0, 0x0810 ## $a1 = 00000810 /* 0406C 808636BC 0C00B638 */ jal Actor_MoveForward - + /* 04070 808636C0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 04074 808636C4 3C0141F0 */ lui $at, 0x41F0 ## $at = 41F00000 /* 04078 808636C8 44810000 */ mtc1 $at, $f0 ## $f0 = 30.00 /* 0407C 808636CC 240F001D */ addiu $t7, $zero, 0x001D ## $t7 = 0000001D -/* 04080 808636D0 AFAF0014 */ sw $t7, 0x0014($sp) -/* 04084 808636D4 44070000 */ mfc1 $a3, $f0 -/* 04088 808636D8 8FA40054 */ lw $a0, 0x0054($sp) +/* 04080 808636D0 AFAF0014 */ sw $t7, 0x0014($sp) +/* 04084 808636D4 44070000 */ mfc1 $a3, $f0 +/* 04088 808636D8 8FA40054 */ lw $a0, 0x0054($sp) /* 0408C 808636DC 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 04090 808636E0 3C064296 */ lui $a2, 0x4296 ## $a2 = 42960000 -/* 04094 808636E4 0C00B92D */ jal func_8002E4B4 -/* 04098 808636E8 E7A00010 */ swc1 $f0, 0x0010($sp) +/* 04094 808636E4 0C00B92D */ jal func_8002E4B4 +/* 04098 808636E8 E7A00010 */ swc1 $f0, 0x0010($sp) /* 0409C 808636EC 8618001C */ lh $t8, 0x001C($s0) ## 0000001C /* 040A0 808636F0 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 040A4 808636F4 5701001F */ bnel $t8, $at, .L80863774 +/* 040A4 808636F4 5701001F */ bnel $t8, $at, .L80863774 /* 040A8 808636F8 96090088 */ lhu $t1, 0x0088($s0) ## 00000088 /* 040AC 808636FC C600000C */ lwc1 $f0, 0x000C($s0) ## 0000000C /* 040B0 80863700 C6040028 */ lwc1 $f4, 0x0028($s0) ## 00000028 -/* 040B4 80863704 4600203E */ c.le.s $f4, $f0 +/* 040B4 80863704 4600203E */ c.le.s $f4, $f0 /* 040B8 80863708 00000000 */ nop -/* 040BC 8086370C 45020005 */ bc1fl .L80863724 +/* 040BC 8086370C 45020005 */ bc1fl .L80863724 /* 040C0 80863710 C6080080 */ lwc1 $f8, 0x0080($s0) ## 00000080 /* 040C4 80863714 44803000 */ mtc1 $zero, $f6 ## $f6 = 0.00 /* 040C8 80863718 E6000028 */ swc1 $f0, 0x0028($s0) ## 00000028 /* 040CC 8086371C E6060060 */ swc1 $f6, 0x0060($s0) ## 00000060 /* 040D0 80863720 C6080080 */ lwc1 $f8, 0x0080($s0) ## 00000080 .L80863724: -/* 040D4 80863724 4600403E */ c.le.s $f8, $f0 +/* 040D4 80863724 4600403E */ c.le.s $f8, $f0 /* 040D8 80863728 00000000 */ nop -/* 040DC 8086372C 45020003 */ bc1fl .L8086373C +/* 040DC 8086372C 45020003 */ bc1fl .L8086373C /* 040E0 80863730 8E1907CC */ lw $t9, 0x07CC($s0) ## 000007CC /* 040E4 80863734 E6000080 */ swc1 $f0, 0x0080($s0) ## 00000080 .L80863738: /* 040E8 80863738 8E1907CC */ lw $t9, 0x07CC($s0) ## 000007CC .L8086373C: /* 040EC 8086373C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 040F0 80863740 8FA50054 */ lw $a1, 0x0054($sp) -/* 040F4 80863744 0320F809 */ jalr $ra, $t9 +/* 040F0 80863740 8FA50054 */ lw $a1, 0x0054($sp) +/* 040F4 80863744 0320F809 */ jalr $ra, $t9 /* 040F8 80863748 00000000 */ nop /* 040FC 8086374C 920207DE */ lbu $v0, 0x07DE($s0) ## 000007DE -/* 04100 80863750 2C410005 */ sltiu $at, $v0, 0x0005 -/* 04104 80863754 10200067 */ beq $at, $zero, .L808638F4 -/* 04108 80863758 00024080 */ sll $t0, $v0, 2 +/* 04100 80863750 2C410005 */ sltiu $at, $v0, 0x0005 +/* 04104 80863754 10200067 */ beq $at, $zero, .L808638F4 +/* 04108 80863758 00024080 */ sll $t0, $v0, 2 /* 0410C 8086375C 3C018086 */ lui $at, %hi(jtbl_808647E4) ## $at = 80860000 -/* 04110 80863760 00280821 */ addu $at, $at, $t0 -/* 04114 80863764 8C2847E4 */ lw $t0, %lo(jtbl_808647E4)($at) -/* 04118 80863768 01000008 */ jr $t0 +/* 04110 80863760 00280821 */ addu $at, $at, $t0 +/* 04114 80863764 8C2847E4 */ lw $t0, %lo(jtbl_808647E4)($at) +/* 04118 80863768 01000008 */ jr $t0 /* 0411C 8086376C 00000000 */ nop /* 04120 80863770 96090088 */ lhu $t1, 0x0088($s0) ## 00000088 .L80863774: -/* 04124 80863774 8FA40054 */ lw $a0, 0x0054($sp) +/* 04124 80863774 8FA40054 */ lw $a0, 0x0054($sp) /* 04128 80863778 312A0002 */ andi $t2, $t1, 0x0002 ## $t2 = 00000000 -/* 0412C 8086377C 1140FFEE */ beq $t2, $zero, .L80863738 +/* 0412C 8086377C 1140FFEE */ beq $t2, $zero, .L80863738 /* 04130 80863780 248407C0 */ addiu $a0, $a0, 0x07C0 ## $a0 = 000007C0 /* 04134 80863784 8E050078 */ lw $a1, 0x0078($s0) ## 00000078 /* 04138 80863788 9206007D */ lbu $a2, 0x007D($s0) ## 0000007D -/* 0413C 8086378C 0C0107A9 */ jal func_80041EA4 -/* 04140 80863790 AFA40038 */ sw $a0, 0x0038($sp) +/* 0413C 8086378C 0C0107A9 */ jal func_80041EA4 +/* 04140 80863790 AFA40038 */ sw $a0, 0x0038($sp) /* 04144 80863794 24010005 */ addiu $at, $zero, 0x0005 ## $at = 00000005 -/* 04148 80863798 1041000A */ beq $v0, $at, .L808637C4 -/* 0414C 8086379C 8FA40038 */ lw $a0, 0x0038($sp) +/* 04148 80863798 1041000A */ beq $v0, $at, .L808637C4 +/* 0414C 8086379C 8FA40038 */ lw $a0, 0x0038($sp) /* 04150 808637A0 2401000C */ addiu $at, $zero, 0x000C ## $at = 0000000C -/* 04154 808637A4 10410007 */ beq $v0, $at, .L808637C4 +/* 04154 808637A4 10410007 */ beq $v0, $at, .L808637C4 /* 04158 808637A8 00000000 */ nop /* 0415C 808637AC 8E050078 */ lw $a1, 0x0078($s0) ## 00000078 -/* 04160 808637B0 0C010753 */ jal func_80041D4C +/* 04160 808637B0 0C010753 */ jal func_80041D4C /* 04164 808637B4 9206007D */ lbu $a2, 0x007D($s0) ## 0000007D /* 04168 808637B8 24010009 */ addiu $at, $zero, 0x0009 ## $at = 00000009 -/* 0416C 808637BC 5441FFDF */ bnel $v0, $at, .L8086373C +/* 0416C 808637BC 5441FFDF */ bnel $v0, $at, .L8086373C /* 04170 808637C0 8E1907CC */ lw $t9, 0x07CC($s0) ## 000007CC .L808637C4: /* 04174 808637C4 0C00B55C */ jal Actor_Kill - + /* 04178 808637C8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0417C 808637CC 100000B6 */ beq $zero, $zero, .L80863AA8 -/* 04180 808637D0 8FBF002C */ lw $ra, 0x002C($sp) +/* 0417C 808637CC 100000B6 */ beq $zero, $zero, .L80863AA8 +/* 04180 808637D0 8FBF002C */ lw $ra, 0x002C($sp) glabel L808637D4 /* 04184 808637D4 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 /* 04188 808637D8 0C028800 */ jal SkelAnime_GetFrameCount - + /* 0418C 808637DC 24841C20 */ addiu $a0, $a0, 0x1C20 ## $a0 = 06001C20 /* 04190 808637E0 44825000 */ mtc1 $v0, $f10 ## $f10 = 0.00 /* 04194 808637E4 3C014000 */ lui $at, 0x4000 ## $at = 40000000 /* 04198 808637E8 44810000 */ mtc1 $at, $f0 ## $f0 = 2.00 -/* 0419C 808637EC 46805420 */ cvt.s.w $f16, $f10 +/* 0419C 808637EC 46805420 */ cvt.s.w $f16, $f10 /* 041A0 808637F0 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 041A4 808637F4 240B0002 */ addiu $t3, $zero, 0x0002 ## $t3 = 00000002 -/* 041A8 808637F8 44060000 */ mfc1 $a2, $f0 -/* 041AC 808637FC AFAB0014 */ sw $t3, 0x0014($sp) +/* 041A8 808637F8 44060000 */ mfc1 $a2, $f0 +/* 041AC 808637FC AFAB0014 */ sw $t3, 0x0014($sp) /* 041B0 80863800 24A51C20 */ addiu $a1, $a1, 0x1C20 ## $a1 = 06001C20 -/* 041B4 80863804 E7B00010 */ swc1 $f16, 0x0010($sp) +/* 041B4 80863804 E7B00010 */ swc1 $f16, 0x0010($sp) /* 041B8 80863808 260404A8 */ addiu $a0, $s0, 0x04A8 ## $a0 = 000004A8 /* 041BC 8086380C 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 041C0 80863810 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 041C4 80863814 E7A00018 */ swc1 $f0, 0x0018($sp) +/* 041C0 80863810 0C029468 */ jal SkelAnime_ChangeAnim + +/* 041C4 80863814 E7A00018 */ swc1 $f0, 0x0018($sp) /* 041C8 80863818 3C0C8086 */ lui $t4, %hi(D_80864510) ## $t4 = 80860000 /* 041CC 8086381C 258C4510 */ addiu $t4, $t4, %lo(D_80864510) ## $t4 = 80864510 /* 041D0 80863820 92050188 */ lbu $a1, 0x0188($s0) ## 00000188 /* 041D4 80863824 8E0601A8 */ lw $a2, 0x01A8($s0) ## 000001A8 /* 041D8 80863828 8E0704C8 */ lw $a3, 0x04C8($s0) ## 000004C8 -/* 041DC 8086382C AFAC0010 */ sw $t4, 0x0010($sp) -/* 041E0 80863830 0C028D52 */ jal func_800A3548 -/* 041E4 80863834 8FA40054 */ lw $a0, 0x0054($sp) +/* 041DC 8086382C AFAC0010 */ sw $t4, 0x0010($sp) +/* 041E0 80863830 0C028D52 */ jal SkelAnime_LoadAnimationType3 +/* 041E4 80863834 8FA40054 */ lw $a0, 0x0054($sp) /* 041E8 80863838 920D07DE */ lbu $t5, 0x07DE($s0) ## 000007DE /* 041EC 8086383C 25AE0001 */ addiu $t6, $t5, 0x0001 ## $t6 = 00000001 -/* 041F0 80863840 1000002C */ beq $zero, $zero, .L808638F4 +/* 041F0 80863840 1000002C */ beq $zero, $zero, .L808638F4 /* 041F4 80863844 A20E07DE */ sb $t6, 0x07DE($s0) ## 000007DE glabel L80863848 /* 041F8 80863848 0C02927F */ jal SkelAnime_FrameUpdateMatrix - + /* 041FC 8086384C 260404A8 */ addiu $a0, $s0, 0x04A8 ## $a0 = 000004A8 /* 04200 80863850 3C078086 */ lui $a3, %hi(D_80864510) ## $a3 = 80860000 /* 04204 80863854 24E74510 */ addiu $a3, $a3, %lo(D_80864510) ## $a3 = 80864510 /* 04208 80863858 26040188 */ addiu $a0, $s0, 0x0188 ## $a0 = 00000188 /* 0420C 8086385C 8E0501A8 */ lw $a1, 0x01A8($s0) ## 000001A8 -/* 04210 80863860 0C02950A */ jal func_800A5428 +/* 04210 80863860 0C02950A */ jal func_800A5428 /* 04214 80863864 8E0604C8 */ lw $a2, 0x04C8($s0) ## 000004C8 -/* 04218 80863868 10000023 */ beq $zero, $zero, .L808638F8 +/* 04218 80863868 10000023 */ beq $zero, $zero, .L808638F8 /* 0421C 8086386C 92180114 */ lbu $t8, 0x0114($s0) ## 00000114 glabel L80863870 /* 04220 80863870 3C014080 */ lui $at, 0x4080 ## $at = 40800000 @@ -141,65 +141,65 @@ glabel L80863884 /* 04238 80863888 44816000 */ mtc1 $at, $f12 ## $f12 = 1.00 /* 0423C 8086388C C60004D0 */ lwc1 $f0, 0x04D0($s0) ## 000004D0 /* 04240 80863890 44803000 */ mtc1 $zero, $f6 ## $f6 = 0.00 -/* 04244 80863894 460C0101 */ sub.s $f4, $f0, $f12 -/* 04248 80863898 46000086 */ mov.s $f2, $f0 +/* 04244 80863894 460C0101 */ sub.s $f4, $f0, $f12 +/* 04248 80863898 46000086 */ mov.s $f2, $f0 /* 0424C 8086389C E60404D0 */ swc1 $f4, 0x04D0($s0) ## 000004D0 /* 04250 808638A0 C60004D0 */ lwc1 $f0, 0x04D0($s0) ## 000004D0 -/* 04254 808638A4 4606003E */ c.le.s $f0, $f6 +/* 04254 808638A4 4606003E */ c.le.s $f0, $f6 /* 04258 808638A8 00000000 */ nop -/* 0425C 808638AC 45020004 */ bc1fl .L808638C0 -/* 04260 808638B0 46020203 */ div.s $f8, $f0, $f2 +/* 0425C 808638AC 45020004 */ bc1fl .L808638C0 +/* 04260 808638B0 46020203 */ div.s $f8, $f0, $f2 /* 04264 808638B4 A20007DE */ sb $zero, 0x07DE($s0) ## 000007DE /* 04268 808638B8 C60004D0 */ lwc1 $f0, 0x04D0($s0) ## 000004D0 -/* 0426C 808638BC 46020203 */ div.s $f8, $f0, $f2 +/* 0426C 808638BC 46020203 */ div.s $f8, $f0, $f2 .L808638C0: /* 04270 808638C0 8E0504C8 */ lw $a1, 0x04C8($s0) ## 000004C8 /* 04274 808638C4 92040188 */ lbu $a0, 0x0188($s0) ## 00000188 /* 04278 808638C8 8E0701A8 */ lw $a3, 0x01A8($s0) ## 000001A8 /* 0427C 808638CC 00A03025 */ or $a2, $a1, $zero ## $a2 = 00000000 -/* 04280 808638D0 46086281 */ sub.s $f10, $f12, $f8 -/* 04284 808638D4 0C028B9C */ jal func_800A2E70 -/* 04288 808638D8 E7AA0010 */ swc1 $f10, 0x0010($sp) +/* 04280 808638D0 46086281 */ sub.s $f10, $f12, $f8 +/* 04284 808638D4 0C028B9C */ jal SkelAnime_InterpolateVec3s +/* 04288 808638D8 E7AA0010 */ swc1 $f10, 0x0010($sp) /* 0428C 808638DC 3C078086 */ lui $a3, %hi(D_80864510) ## $a3 = 80860000 /* 04290 808638E0 24E74510 */ addiu $a3, $a3, %lo(D_80864510) ## $a3 = 80864510 /* 04294 808638E4 26040188 */ addiu $a0, $s0, 0x0188 ## $a0 = 00000188 /* 04298 808638E8 8E0501A8 */ lw $a1, 0x01A8($s0) ## 000001A8 -/* 0429C 808638EC 0C02950A */ jal func_800A5428 +/* 0429C 808638EC 0C02950A */ jal func_800A5428 /* 042A0 808638F0 8E0604C8 */ lw $a2, 0x04C8($s0) ## 000004C8 glabel L808638F4 .L808638F4: /* 042A4 808638F4 92180114 */ lbu $t8, 0x0114($s0) ## 00000114 .L808638F8: -/* 042A8 808638F8 57000016 */ bnel $t8, $zero, .L80863954 +/* 042A8 808638F8 57000016 */ bnel $t8, $zero, .L80863954 /* 042AC 808638FC 26050810 */ addiu $a1, $s0, 0x0810 ## $a1 = 00000810 /* 042B0 80863900 921900AF */ lbu $t9, 0x00AF($s0) ## 000000AF -/* 042B4 80863904 53200013 */ beql $t9, $zero, .L80863954 +/* 042B4 80863904 53200013 */ beql $t9, $zero, .L80863954 /* 042B8 80863908 26050810 */ addiu $a1, $s0, 0x0810 ## $a1 = 00000810 /* 042BC 8086390C 920207C8 */ lbu $v0, 0x07C8($s0) ## 000007C8 /* 042C0 80863910 24010010 */ addiu $at, $zero, 0x0010 ## $at = 00000010 /* 042C4 80863914 260407D2 */ addiu $a0, $s0, 0x07D2 ## $a0 = 000007D2 -/* 042C8 80863918 10410009 */ beq $v0, $at, .L80863940 +/* 042C8 80863918 10410009 */ beq $v0, $at, .L80863940 /* 042CC 8086391C 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 042D0 80863920 24010017 */ addiu $at, $zero, 0x0017 ## $at = 00000017 -/* 042D4 80863924 50410007 */ beql $v0, $at, .L80863944 +/* 042D4 80863924 50410007 */ beql $v0, $at, .L80863944 /* 042D8 80863928 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 /* 042DC 8086392C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 042E0 80863930 0C218D18 */ jal func_80863460 -/* 042E4 80863934 8FA50054 */ lw $a1, 0x0054($sp) -/* 042E8 80863938 10000006 */ beq $zero, $zero, .L80863954 +/* 042E0 80863930 0C218D18 */ jal func_80863460 +/* 042E4 80863934 8FA50054 */ lw $a1, 0x0054($sp) +/* 042E8 80863938 10000006 */ beq $zero, $zero, .L80863954 /* 042EC 8086393C 26050810 */ addiu $a1, $s0, 0x0810 ## $a1 = 00000810 .L80863940: /* 042F0 80863940 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 .L80863944: /* 042F4 80863944 240703E8 */ addiu $a3, $zero, 0x03E8 ## $a3 = 000003E8 /* 042F8 80863948 0C01E1A7 */ jal Math_SmoothScaleMaxMinS - -/* 042FC 8086394C AFA00010 */ sw $zero, 0x0010($sp) + +/* 042FC 8086394C AFA00010 */ sw $zero, 0x0010($sp) /* 04300 80863950 26050810 */ addiu $a1, $s0, 0x0810 ## $a1 = 00000810 .L80863954: -/* 04304 80863954 AFA50034 */ sw $a1, 0x0034($sp) +/* 04304 80863954 AFA50034 */ sw $a1, 0x0034($sp) /* 04308 80863958 0C0189B7 */ jal ActorCollider_Cylinder_Update - + /* 0430C 8086395C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 04310 80863960 8E080028 */ lw $t0, 0x0028($s0) ## 00000028 /* 04314 80863964 3C014234 */ lui $at, 0x4234 ## $at = 42340000 @@ -209,44 +209,44 @@ glabel L808638F4 /* 04324 80863974 44819000 */ mtc1 $at, $f18 ## $f18 = 45.00 /* 04328 80863978 AE090038 */ sw $t1, 0x0038($s0) ## 00000038 /* 0432C 8086397C 8E09002C */ lw $t1, 0x002C($s0) ## 0000002C -/* 04330 80863980 46128100 */ add.s $f4, $f16, $f18 +/* 04330 80863980 46128100 */ add.s $f4, $f16, $f18 /* 04334 80863984 920A00AF */ lbu $t2, 0x00AF($s0) ## 000000AF /* 04338 80863988 AE090040 */ sw $t1, 0x0040($s0) ## 00000040 /* 0433C 8086398C 3C010001 */ lui $at, 0x0001 ## $at = 00010000 /* 04340 80863990 E604003C */ swc1 $f4, 0x003C($s0) ## 0000003C -/* 04344 80863994 1D400003 */ bgtz $t2, .L808639A4 -/* 04348 80863998 8FA40054 */ lw $a0, 0x0054($sp) +/* 04344 80863994 1D400003 */ bgtz $t2, .L808639A4 +/* 04348 80863998 8FA40054 */ lw $a0, 0x0054($sp) /* 0434C 8086399C 920B0114 */ lbu $t3, 0x0114($s0) ## 00000114 -/* 04350 808639A0 1160001B */ beq $t3, $zero, .L80863A10 +/* 04350 808639A0 1160001B */ beq $t3, $zero, .L80863A10 .L808639A4: /* 04354 808639A4 34211E60 */ ori $at, $at, 0x1E60 ## $at = 00011E60 -/* 04358 808639A8 00812821 */ addu $a1, $a0, $at -/* 0435C 808639AC AFA50038 */ sw $a1, 0x0038($sp) +/* 04358 808639A8 00812821 */ addu $a1, $a0, $at +/* 0435C 808639AC AFA50038 */ sw $a1, 0x0038($sp) /* 04360 808639B0 0C017713 */ jal Actor_CollisionCheck_SetOT ## CollisionCheck_setOT -/* 04364 808639B4 8FA60034 */ lw $a2, 0x0034($sp) +/* 04364 808639B4 8FA60034 */ lw $a2, 0x0034($sp) /* 04368 808639B8 920C07C8 */ lbu $t4, 0x07C8($s0) ## 000007C8 -/* 0436C 808639BC 2981000A */ slti $at, $t4, 0x000A -/* 04370 808639C0 5420000D */ bnel $at, $zero, .L808639F8 +/* 0436C 808639BC 2981000A */ slti $at, $t4, 0x000A +/* 04370 808639C0 5420000D */ bnel $at, $zero, .L808639F8 /* 04374 808639C4 921807DE */ lbu $t8, 0x07DE($s0) ## 000007DE /* 04378 808639C8 920D0114 */ lbu $t5, 0x0114($s0) ## 00000114 -/* 0437C 808639CC 8FA40054 */ lw $a0, 0x0054($sp) -/* 04380 808639D0 8FA50038 */ lw $a1, 0x0038($sp) -/* 04384 808639D4 11A00005 */ beq $t5, $zero, .L808639EC +/* 0437C 808639CC 8FA40054 */ lw $a0, 0x0054($sp) +/* 04380 808639D0 8FA50038 */ lw $a1, 0x0038($sp) +/* 04384 808639D4 11A00005 */ beq $t5, $zero, .L808639EC /* 04388 808639D8 00000000 */ nop /* 0438C 808639DC 960E0112 */ lhu $t6, 0x0112($s0) ## 00000112 /* 04390 808639E0 31CF4000 */ andi $t7, $t6, 0x4000 ## $t7 = 00000000 -/* 04394 808639E4 55E00004 */ bnel $t7, $zero, .L808639F8 +/* 04394 808639E4 55E00004 */ bnel $t7, $zero, .L808639F8 /* 04398 808639E8 921807DE */ lbu $t8, 0x07DE($s0) ## 000007DE .L808639EC: /* 0439C 808639EC 0C01767D */ jal Actor_CollisionCheck_SetAC ## CollisionCheck_setAC -/* 043A0 808639F0 8FA60034 */ lw $a2, 0x0034($sp) +/* 043A0 808639F0 8FA60034 */ lw $a2, 0x0034($sp) /* 043A4 808639F4 921807DE */ lbu $t8, 0x07DE($s0) ## 000007DE .L808639F8: -/* 043A8 808639F8 8FA40054 */ lw $a0, 0x0054($sp) -/* 043AC 808639FC 8FA50038 */ lw $a1, 0x0038($sp) -/* 043B0 80863A00 53000004 */ beql $t8, $zero, .L80863A14 +/* 043A8 808639F8 8FA40054 */ lw $a0, 0x0054($sp) +/* 043AC 808639FC 8FA50038 */ lw $a1, 0x0038($sp) +/* 043B0 80863A00 53000004 */ beql $t8, $zero, .L80863A14 /* 043B4 80863A04 82190808 */ lb $t9, 0x0808($s0) ## 00000808 /* 043B8 80863A08 0C01767D */ jal Actor_CollisionCheck_SetAC ## CollisionCheck_setAC @@ -254,52 +254,52 @@ glabel L808638F4 .L80863A10: /* 043C0 80863A10 82190808 */ lb $t9, 0x0808($s0) ## 00000808 .L80863A14: -/* 043C4 80863A14 5B200011 */ blezl $t9, .L80863A5C +/* 043C4 80863A14 5B200011 */ blezl $t9, .L80863A5C /* 043C8 80863A18 860B001C */ lh $t3, 0x001C($s0) ## 0000001C /* 043CC 80863A1C 9202086C */ lbu $v0, 0x086C($s0) ## 0000086C /* 043D0 80863A20 3C010001 */ lui $at, 0x0001 ## $at = 00010000 /* 043D4 80863A24 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 043D8 80863A28 30480004 */ andi $t0, $v0, 0x0004 ## $t0 = 00000000 -/* 043DC 80863A2C 15000008 */ bne $t0, $zero, .L80863A50 +/* 043DC 80863A2C 15000008 */ bne $t0, $zero, .L80863A50 /* 043E0 80863A30 304AFFFB */ andi $t2, $v0, 0xFFFB ## $t2 = 00000000 -/* 043E4 80863A34 8FA40054 */ lw $a0, 0x0054($sp) +/* 043E4 80863A34 8FA40054 */ lw $a0, 0x0054($sp) /* 043E8 80863A38 34211E60 */ ori $at, $at, 0x1E60 ## $at = 00011E60 /* 043EC 80863A3C 2606085C */ addiu $a2, $s0, 0x085C ## $a2 = 0000085C /* 043F0 80863A40 0C0175E7 */ jal Actor_CollisionCheck_SetAT ## CollisionCheck_setAT -/* 043F4 80863A44 00812821 */ addu $a1, $a0, $at -/* 043F8 80863A48 10000004 */ beq $zero, $zero, .L80863A5C +/* 043F4 80863A44 00812821 */ addu $a1, $a0, $at +/* 043F8 80863A48 10000004 */ beq $zero, $zero, .L80863A5C /* 043FC 80863A4C 860B001C */ lh $t3, 0x001C($s0) ## 0000001C .L80863A50: -/* 04400 80863A50 0C218C90 */ jal func_80863240 +/* 04400 80863A50 0C218C90 */ jal func_80863240 /* 04404 80863A54 A20A086C */ sb $t2, 0x086C($s0) ## 0000086C /* 04408 80863A58 860B001C */ lh $t3, 0x001C($s0) ## 0000001C .L80863A5C: -/* 0440C 80863A5C 8FAC0054 */ lw $t4, 0x0054($sp) -/* 04410 80863A60 55600011 */ bnel $t3, $zero, .L80863AA8 -/* 04414 80863A64 8FBF002C */ lw $ra, 0x002C($sp) +/* 0440C 80863A5C 8FAC0054 */ lw $t4, 0x0054($sp) +/* 04410 80863A60 55600011 */ bnel $t3, $zero, .L80863AA8 +/* 04414 80863A64 8FBF002C */ lw $ra, 0x002C($sp) /* 04418 80863A68 918D1C27 */ lbu $t5, 0x1C27($t4) ## 00001C27 /* 0441C 80863A6C 3C188003 */ lui $t8, 0x8003 ## $t8 = 80030000 -/* 04420 80863A70 51A00008 */ beql $t5, $zero, .L80863A94 +/* 04420 80863A70 51A00008 */ beql $t5, $zero, .L80863A94 /* 04424 80863A74 8E190004 */ lw $t9, 0x0004($s0) ## 00000004 /* 04428 80863A78 8E0E0004 */ lw $t6, 0x0004($s0) ## 00000004 /* 0442C 80863A7C 2718B8C4 */ addiu $t8, $t8, 0xB8C4 ## $t8 = 8002B8C4 /* 04430 80863A80 AE1800C0 */ sw $t8, 0x00C0($s0) ## 000000C0 /* 04434 80863A84 35CF0081 */ ori $t7, $t6, 0x0081 ## $t7 = 00000081 -/* 04438 80863A88 10000006 */ beq $zero, $zero, .L80863AA4 +/* 04438 80863A88 10000006 */ beq $zero, $zero, .L80863AA4 /* 0443C 80863A8C AE0F0004 */ sw $t7, 0x0004($s0) ## 00000004 /* 04440 80863A90 8E190004 */ lw $t9, 0x0004($s0) ## 00000004 .L80863A94: /* 04444 80863A94 2401FF7E */ addiu $at, $zero, 0xFF7E ## $at = FFFFFF7E /* 04448 80863A98 AE0000C0 */ sw $zero, 0x00C0($s0) ## 000000C0 -/* 0444C 80863A9C 03214024 */ and $t0, $t9, $at +/* 0444C 80863A9C 03214024 */ and $t0, $t9, $at /* 04450 80863AA0 AE080004 */ sw $t0, 0x0004($s0) ## 00000004 .L80863AA4: -/* 04454 80863AA4 8FBF002C */ lw $ra, 0x002C($sp) +/* 04454 80863AA4 8FBF002C */ lw $ra, 0x002C($sp) .L80863AA8: -/* 04458 80863AA8 8FB00028 */ lw $s0, 0x0028($sp) +/* 04458 80863AA8 8FB00028 */ lw $s0, 0x0028($sp) /* 0445C 80863AAC 27BD0050 */ addiu $sp, $sp, 0x0050 ## $sp = 00000000 -/* 04460 80863AB0 03E00008 */ jr $ra +/* 04460 80863AB0 03E00008 */ jr $ra /* 04464 80863AB4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Test/func_8085FDD0.s b/asm/non_matchings/overlays/actors/ovl_En_Test/func_8085FDD0.s index be2709ac88..afb5c3abfc 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Test/func_8085FDD0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Test/func_8085FDD0.s @@ -1,33 +1,33 @@ glabel func_8085FDD0 /* 00780 8085FDD0 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00784 8085FDD4 AFBF0014 */ sw $ra, 0x0014($sp) +/* 00784 8085FDD4 AFBF0014 */ sw $ra, 0x0014($sp) /* 00788 8085FDD8 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 /* 0078C 8085FDDC 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 00790 8085FDE0 24A5316C */ addiu $a1, $a1, 0x316C ## $a1 = 0600316C -/* 00794 8085FDE4 AFA60018 */ sw $a2, 0x0018($sp) -/* 00798 8085FDE8 0C0294BE */ jal func_800A52F8 +/* 00794 8085FDE4 AFA60018 */ sw $a2, 0x0018($sp) +/* 00798 8085FDE8 0C0294BE */ jal SkelAnime_ChangeAnimDefaultRepeat /* 0079C 8085FDEC 24840188 */ addiu $a0, $a0, 0x0188 ## $a0 = 00000188 -/* 007A0 8085FDF0 8FA40018 */ lw $a0, 0x0018($sp) +/* 007A0 8085FDF0 8FA40018 */ lw $a0, 0x0018($sp) /* 007A4 8085FDF4 3C014060 */ lui $at, 0x4060 ## $at = 40600000 /* 007A8 8085FDF8 44814000 */ mtc1 $at, $f8 ## $f8 = 3.50 /* 007AC 8085FDFC C486000C */ lwc1 $f6, 0x000C($a0) ## 0000000C /* 007B0 8085FE00 8C8F0004 */ lw $t7, 0x0004($a0) ## 00000004 /* 007B4 8085FE04 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 -/* 007B8 8085FE08 46083281 */ sub.s $f10, $f6, $f8 +/* 007B8 8085FE08 46083281 */ sub.s $f10, $f6, $f8 /* 007BC 8085FE0C 2401FFFE */ addiu $at, $zero, 0xFFFE ## $at = FFFFFFFE /* 007C0 8085FE10 240E000F */ addiu $t6, $zero, 0x000F ## $t6 = 0000000F /* 007C4 8085FE14 3C058086 */ lui $a1, %hi(func_8085FE48) ## $a1 = 80860000 -/* 007C8 8085FE18 01E1C024 */ and $t8, $t7, $at +/* 007C8 8085FE18 01E1C024 */ and $t8, $t7, $at /* 007CC 8085FE1C 24A5FE48 */ addiu $a1, $a1, %lo(func_8085FE48) ## $a1 = 8085FE48 /* 007D0 8085FE20 A08007C8 */ sb $zero, 0x07C8($a0) ## 000007C8 /* 007D4 8085FE24 AC8E07E8 */ sw $t6, 0x07E8($a0) ## 000007E8 /* 007D8 8085FE28 E48A0028 */ swc1 $f10, 0x0028($a0) ## 00000028 /* 007DC 8085FE2C AC980004 */ sw $t8, 0x0004($a0) ## 00000004 -/* 007E0 8085FE30 0C217D94 */ jal func_8085F650 +/* 007E0 8085FE30 0C217D94 */ jal func_8085F650 /* 007E4 8085FE34 E4840054 */ swc1 $f4, 0x0054($a0) ## 00000054 -/* 007E8 8085FE38 8FBF0014 */ lw $ra, 0x0014($sp) +/* 007E8 8085FE38 8FBF0014 */ lw $ra, 0x0014($sp) /* 007EC 8085FE3C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 007F0 8085FE40 03E00008 */ jr $ra +/* 007F0 8085FE40 03E00008 */ jr $ra /* 007F4 8085FE44 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Test/func_8085FF28.s b/asm/non_matchings/overlays/actors/ovl_En_Test/func_8085FF28.s index 1355327f9b..b853104916 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Test/func_8085FF28.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Test/func_8085FF28.s @@ -1,33 +1,33 @@ glabel func_8085FF28 /* 008D8 8085FF28 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 008DC 8085FF2C AFBF0014 */ sw $ra, 0x0014($sp) +/* 008DC 8085FF2C AFBF0014 */ sw $ra, 0x0014($sp) /* 008E0 8085FF30 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 /* 008E4 8085FF34 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 008E8 8085FF38 24A5316C */ addiu $a1, $a1, 0x316C ## $a1 = 0600316C -/* 008EC 8085FF3C AFA60018 */ sw $a2, 0x0018($sp) -/* 008F0 8085FF40 0C0294BE */ jal func_800A52F8 +/* 008EC 8085FF3C AFA60018 */ sw $a2, 0x0018($sp) +/* 008F0 8085FF40 0C0294BE */ jal SkelAnime_ChangeAnimDefaultRepeat /* 008F4 8085FF44 24840188 */ addiu $a0, $a0, 0x0188 ## $a0 = 00000188 -/* 008F8 8085FF48 8FA40018 */ lw $a0, 0x0018($sp) +/* 008F8 8085FF48 8FA40018 */ lw $a0, 0x0018($sp) /* 008FC 8085FF4C 3C014316 */ lui $at, 0x4316 ## $at = 43160000 /* 00900 8085FF50 44813000 */ mtc1 $at, $f6 ## $f6 = 150.00 /* 00904 8085FF54 C484000C */ lwc1 $f4, 0x000C($a0) ## 0000000C /* 00908 8085FF58 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 /* 0090C 8085FF5C A08007C8 */ sb $zero, 0x07C8($a0) ## 000007C8 -/* 00910 8085FF60 46062200 */ add.s $f8, $f4, $f6 +/* 00910 8085FF60 46062200 */ add.s $f8, $f4, $f6 /* 00914 8085FF64 0C00B58B */ jal Actor_SetScale - + /* 00918 8085FF68 E4880028 */ swc1 $f8, 0x0028($a0) ## 00000028 -/* 0091C 8085FF6C 8FA40018 */ lw $a0, 0x0018($sp) +/* 0091C 8085FF6C 8FA40018 */ lw $a0, 0x0018($sp) /* 00920 8085FF70 2401FFFE */ addiu $at, $zero, 0xFFFE ## $at = FFFFFFFE /* 00924 8085FF74 3C058086 */ lui $a1, %hi(func_8085FF9C) ## $a1 = 80860000 /* 00928 8085FF78 8C8E0004 */ lw $t6, 0x0004($a0) ## 00000004 /* 0092C 8085FF7C 24A5FF9C */ addiu $a1, $a1, %lo(func_8085FF9C) ## $a1 = 8085FF9C -/* 00930 8085FF80 01C17824 */ and $t7, $t6, $at -/* 00934 8085FF84 0C217D94 */ jal func_8085F650 +/* 00930 8085FF80 01C17824 */ and $t7, $t6, $at +/* 00934 8085FF84 0C217D94 */ jal func_8085F650 /* 00938 8085FF88 AC8F0004 */ sw $t7, 0x0004($a0) ## 00000004 -/* 0093C 8085FF8C 8FBF0014 */ lw $ra, 0x0014($sp) +/* 0093C 8085FF8C 8FBF0014 */ lw $ra, 0x0014($sp) /* 00940 8085FF90 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00944 8085FF94 03E00008 */ jr $ra +/* 00944 8085FF94 03E00008 */ jr $ra /* 00948 8085FF98 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Test/func_80860068.s b/asm/non_matchings/overlays/actors/ovl_En_Test/func_80860068.s index 40f023eed1..84083de5aa 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Test/func_80860068.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Test/func_80860068.s @@ -1,13 +1,13 @@ glabel func_80860068 /* 00A18 80860068 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00A1C 8086006C AFBF0014 */ sw $ra, 0x0014($sp) +/* 00A1C 8086006C AFBF0014 */ sw $ra, 0x0014($sp) /* 00A20 80860070 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 /* 00A24 80860074 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 00A28 80860078 24A5316C */ addiu $a1, $a1, 0x316C ## $a1 = 0600316C -/* 00A2C 8086007C AFA60018 */ sw $a2, 0x0018($sp) -/* 00A30 80860080 0C0294BE */ jal func_800A52F8 +/* 00A2C 8086007C AFA60018 */ sw $a2, 0x0018($sp) +/* 00A30 80860080 0C0294BE */ jal SkelAnime_ChangeAnimDefaultRepeat /* 00A34 80860084 24840188 */ addiu $a0, $a0, 0x0188 ## $a0 = 00000188 -/* 00A38 80860088 8FA60018 */ lw $a2, 0x0018($sp) +/* 00A38 80860088 8FA60018 */ lw $a2, 0x0018($sp) /* 00A3C 8086008C 240E000A */ addiu $t6, $zero, 0x000A ## $t6 = 0000000A /* 00A40 80860090 0C03F66B */ jal Math_Rand_ZeroOne ## Rand.Next() float @@ -16,22 +16,22 @@ glabel func_80860068 /* 00A4C 8086009C 44812000 */ mtc1 $at, $f4 ## $f4 = 10.00 /* 00A50 808600A0 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 /* 00A54 808600A4 44814000 */ mtc1 $at, $f8 ## $f8 = 5.00 -/* 00A58 808600A8 46040182 */ mul.s $f6, $f0, $f4 -/* 00A5C 808600AC 8FA40018 */ lw $a0, 0x0018($sp) +/* 00A58 808600A8 46040182 */ mul.s $f6, $f0, $f4 +/* 00A5C 808600AC 8FA40018 */ lw $a0, 0x0018($sp) /* 00A60 808600B0 44809000 */ mtc1 $zero, $f18 ## $f18 = 0.00 /* 00A64 808600B4 3C058086 */ lui $a1, %hi(func_808600EC) ## $a1 = 80860000 /* 00A68 808600B8 849900B6 */ lh $t9, 0x00B6($a0) ## 000000B6 /* 00A6C 808600BC 24A500EC */ addiu $a1, $a1, %lo(func_808600EC) ## $a1 = 808600EC /* 00A70 808600C0 E4920068 */ swc1 $f18, 0x0068($a0) ## 00000068 -/* 00A74 808600C4 46083280 */ add.s $f10, $f6, $f8 +/* 00A74 808600C4 46083280 */ add.s $f10, $f6, $f8 /* 00A78 808600C8 A4990032 */ sh $t9, 0x0032($a0) ## 00000032 -/* 00A7C 808600CC 4600540D */ trunc.w.s $f16, $f10 -/* 00A80 808600D0 44188000 */ mfc1 $t8, $f16 -/* 00A84 808600D4 0C217D94 */ jal func_8085F650 +/* 00A7C 808600CC 4600540D */ trunc.w.s $f16, $f10 +/* 00A80 808600D0 44188000 */ mfc1 $t8, $f16 +/* 00A84 808600D4 0C217D94 */ jal func_8085F650 /* 00A88 808600D8 AC9807E8 */ sw $t8, 0x07E8($a0) ## 000007E8 -/* 00A8C 808600DC 8FBF0014 */ lw $ra, 0x0014($sp) +/* 00A8C 808600DC 8FBF0014 */ lw $ra, 0x0014($sp) /* 00A90 808600E0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00A94 808600E4 03E00008 */ jr $ra +/* 00A94 808600E4 03E00008 */ jr $ra /* 00A98 808600E8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Test/func_80860318.s b/asm/non_matchings/overlays/actors/ovl_En_Test/func_80860318.s index 523f46043a..61300cfe89 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Test/func_80860318.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Test/func_80860318.s @@ -1,51 +1,51 @@ glabel func_80860318 /* 00CC8 80860318 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 00CCC 8086031C AFB00018 */ sw $s0, 0x0018($sp) +/* 00CCC 8086031C AFB00018 */ sw $s0, 0x0018($sp) /* 00CD0 80860320 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00CD4 80860324 AFA5002C */ sw $a1, 0x002C($sp) -/* 00CD8 80860328 AFBF001C */ sw $ra, 0x001C($sp) +/* 00CD4 80860324 AFA5002C */ sw $a1, 0x002C($sp) +/* 00CD8 80860328 AFBF001C */ sw $ra, 0x001C($sp) /* 00CDC 8086032C 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 /* 00CE0 80860330 24840188 */ addiu $a0, $a0, 0x0188 ## $a0 = 00000188 -/* 00CE4 80860334 AFA40024 */ sw $a0, 0x0024($sp) +/* 00CE4 80860334 AFA40024 */ sw $a0, 0x0024($sp) /* 00CE8 80860338 24A5C438 */ addiu $a1, $a1, 0xC438 ## $a1 = 0600C438 -/* 00CEC 8086033C 0C0294A7 */ jal func_800A529C +/* 00CEC 8086033C 0C0294A7 */ jal SkelAnime_ChangeAnimPlaybackStop /* 00CF0 80860340 24060000 */ addiu $a2, $zero, 0x0000 ## $a2 = 00000000 /* 00CF4 80860344 0C02927F */ jal SkelAnime_FrameUpdateMatrix - -/* 00CF8 80860348 8FA40024 */ lw $a0, 0x0024($sp) + +/* 00CF8 80860348 8FA40024 */ lw $a0, 0x0024($sp) /* 00CFC 8086034C C6040080 */ lwc1 $f4, 0x0080($s0) ## 00000080 /* 00D00 80860350 C6060028 */ lwc1 $f6, 0x0028($s0) ## 00000028 -/* 00D04 80860354 4604303E */ c.le.s $f6, $f4 +/* 00D04 80860354 4604303E */ c.le.s $f6, $f4 /* 00D08 80860358 00000000 */ nop -/* 00D0C 8086035C 45020017 */ bc1fl .L808603BC -/* 00D10 80860360 8FBF001C */ lw $ra, 0x001C($sp) +/* 00D0C 8086035C 45020017 */ bc1fl .L808603BC +/* 00D10 80860360 8FBF001C */ lw $ra, 0x001C($sp) /* 00D14 80860364 8E0F07E4 */ lw $t7, 0x07E4($s0) ## 000007E4 /* 00D18 80860368 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 /* 00D1C 8086036C 44814000 */ mtc1 $at, $f8 ## $f8 = 1.00 /* 00D20 80860370 448F5000 */ mtc1 $t7, $f10 ## $f10 = 0.00 /* 00D24 80860374 240E000C */ addiu $t6, $zero, 0x000C ## $t6 = 0000000C /* 00D28 80860378 A20E07C8 */ sb $t6, 0x07C8($s0) ## 000007C8 -/* 00D2C 8086037C 46805420 */ cvt.s.w $f16, $f10 +/* 00D2C 8086037C 46805420 */ cvt.s.w $f16, $f10 /* 00D30 80860380 3C018086 */ lui $at, %hi(D_80864788) ## $at = 80860000 /* 00D34 80860384 E60801A4 */ swc1 $f8, 0x01A4($s0) ## 000001A4 -/* 00D38 80860388 C4324788 */ lwc1 $f18, %lo(D_80864788)($at) +/* 00D38 80860388 C4324788 */ lwc1 $f18, %lo(D_80864788)($at) /* 00D3C 8086038C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 00D40 80860390 2405387A */ addiu $a1, $zero, 0x387A ## $a1 = 0000387A -/* 00D44 80860394 46128102 */ mul.s $f4, $f16, $f18 -/* 00D48 80860398 4600218D */ trunc.w.s $f6, $f4 -/* 00D4C 8086039C 44193000 */ mfc1 $t9, $f6 +/* 00D44 80860394 46128102 */ mul.s $f4, $f16, $f18 +/* 00D48 80860398 4600218D */ trunc.w.s $f6, $f4 +/* 00D4C 8086039C 44193000 */ mfc1 $t9, $f6 /* 00D50 808603A0 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 00D54 808603A4 AE1907E8 */ sw $t9, 0x07E8($s0) ## 000007E8 /* 00D58 808603A8 3C058086 */ lui $a1, %hi(func_808603CC) ## $a1 = 80860000 /* 00D5C 808603AC 24A503CC */ addiu $a1, $a1, %lo(func_808603CC) ## $a1 = 808603CC -/* 00D60 808603B0 0C217D94 */ jal func_8085F650 +/* 00D60 808603B0 0C217D94 */ jal func_8085F650 /* 00D64 808603B4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00D68 808603B8 8FBF001C */ lw $ra, 0x001C($sp) +/* 00D68 808603B8 8FBF001C */ lw $ra, 0x001C($sp) .L808603BC: -/* 00D6C 808603BC 8FB00018 */ lw $s0, 0x0018($sp) +/* 00D6C 808603BC 8FB00018 */ lw $s0, 0x0018($sp) /* 00D70 808603C0 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 00D74 808603C4 03E00008 */ jr $ra +/* 00D74 808603C4 03E00008 */ jr $ra /* 00D78 808603C8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Test/func_80860438.s b/asm/non_matchings/overlays/actors/ovl_En_Test/func_80860438.s index 42ae59c86c..476a5376f9 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Test/func_80860438.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Test/func_80860438.s @@ -1,30 +1,30 @@ glabel func_80860438 /* 00DE8 80860438 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 00DEC 8086043C AFB00028 */ sw $s0, 0x0028($sp) +/* 00DEC 8086043C AFB00028 */ sw $s0, 0x0028($sp) /* 00DF0 80860440 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00DF4 80860444 AFBF002C */ sw $ra, 0x002C($sp) +/* 00DF4 80860444 AFBF002C */ sw $ra, 0x002C($sp) /* 00DF8 80860448 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 /* 00DFC 8086044C 0C028800 */ jal SkelAnime_GetFrameCount - + /* 00E00 80860450 24841C20 */ addiu $a0, $a0, 0x1C20 ## $a0 = 06001C20 /* 00E04 80860454 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 00E08 80860458 3C014000 */ lui $at, 0x4000 ## $at = 40000000 /* 00E0C 8086045C 44810000 */ mtc1 $at, $f0 ## $f0 = 2.00 -/* 00E10 80860460 468021A0 */ cvt.s.w $f6, $f4 +/* 00E10 80860460 468021A0 */ cvt.s.w $f6, $f4 /* 00E14 80860464 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 00E18 80860468 240E0002 */ addiu $t6, $zero, 0x0002 ## $t6 = 00000002 -/* 00E1C 8086046C 44060000 */ mfc1 $a2, $f0 -/* 00E20 80860470 AFAE0014 */ sw $t6, 0x0014($sp) +/* 00E1C 8086046C 44060000 */ mfc1 $a2, $f0 +/* 00E20 80860470 AFAE0014 */ sw $t6, 0x0014($sp) /* 00E24 80860474 24A51C20 */ addiu $a1, $a1, 0x1C20 ## $a1 = 06001C20 -/* 00E28 80860478 E7A60010 */ swc1 $f6, 0x0010($sp) +/* 00E28 80860478 E7A60010 */ swc1 $f6, 0x0010($sp) /* 00E2C 8086047C 260404A8 */ addiu $a0, $s0, 0x04A8 ## $a0 = 000004A8 /* 00E30 80860480 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 00E34 80860484 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 00E38 80860488 E7A00018 */ swc1 $f0, 0x0018($sp) +/* 00E34 80860484 0C029468 */ jal SkelAnime_ChangeAnim + +/* 00E38 80860488 E7A00018 */ swc1 $f0, 0x0018($sp) /* 00E3C 8086048C 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 /* 00E40 80860490 24A581B4 */ addiu $a1, $a1, 0x81B4 ## $a1 = 060081B4 -/* 00E44 80860494 0C0294BE */ jal func_800A52F8 +/* 00E44 80860494 0C0294BE */ jal SkelAnime_ChangeAnimDefaultRepeat /* 00E48 80860498 26040188 */ addiu $a0, $s0, 0x0188 ## $a0 = 00000188 /* 00E4C 8086049C 0C03F66B */ jal Math_Rand_ZeroOne ## Rand.Next() float @@ -33,23 +33,23 @@ glabel func_80860438 /* 00E58 808604A8 44814000 */ mtc1 $at, $f8 ## $f8 = 5.00 /* 00E5C 808604AC 860A00B6 */ lh $t2, 0x00B6($s0) ## 000000B6 /* 00E60 808604B0 2409000D */ addiu $t1, $zero, 0x000D ## $t1 = 0000000D -/* 00E64 808604B4 46080282 */ mul.s $f10, $f0, $f8 +/* 00E64 808604B4 46080282 */ mul.s $f10, $f0, $f8 /* 00E68 808604B8 3C058086 */ lui $a1, %hi(func_808604FC) ## $a1 = 80860000 /* 00E6C 808604BC A20907C8 */ sb $t1, 0x07C8($s0) ## 000007C8 /* 00E70 808604C0 24A504FC */ addiu $a1, $a1, %lo(func_808604FC) ## $a1 = 808604FC /* 00E74 808604C4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 00E78 808604C8 A60A0032 */ sh $t2, 0x0032($s0) ## 00000032 -/* 00E7C 808604CC 4600540D */ trunc.w.s $f16, $f10 -/* 00E80 808604D0 44188000 */ mfc1 $t8, $f16 +/* 00E7C 808604CC 4600540D */ trunc.w.s $f16, $f10 +/* 00E80 808604D0 44188000 */ mfc1 $t8, $f16 /* 00E84 808604D4 00000000 */ nop -/* 00E88 808604D8 0018CC00 */ sll $t9, $t8, 16 -/* 00E8C 808604DC 00194403 */ sra $t0, $t9, 16 -/* 00E90 808604E0 0C217D94 */ jal func_8085F650 +/* 00E88 808604D8 0018CC00 */ sll $t9, $t8, 16 +/* 00E8C 808604DC 00194403 */ sra $t0, $t9, 16 +/* 00E90 808604E0 0C217D94 */ jal func_8085F650 /* 00E94 808604E4 AE0807E8 */ sw $t0, 0x07E8($s0) ## 000007E8 -/* 00E98 808604E8 8FBF002C */ lw $ra, 0x002C($sp) -/* 00E9C 808604EC 8FB00028 */ lw $s0, 0x0028($sp) +/* 00E98 808604E8 8FBF002C */ lw $ra, 0x002C($sp) +/* 00E9C 808604EC 8FB00028 */ lw $s0, 0x0028($sp) /* 00EA0 808604F0 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 00EA4 808604F4 03E00008 */ jr $ra +/* 00EA4 808604F4 03E00008 */ jr $ra /* 00EA8 808604F8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Test/func_808604FC.s b/asm/non_matchings/overlays/actors/ovl_En_Test/func_808604FC.s index 0024deb75e..2eaab68dca 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Test/func_808604FC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Test/func_808604FC.s @@ -1,28 +1,28 @@ glabel func_808604FC /* 00EAC 808604FC 27BDFF90 */ addiu $sp, $sp, 0xFF90 ## $sp = FFFFFF90 -/* 00EB0 80860500 AFBF002C */ sw $ra, 0x002C($sp) -/* 00EB4 80860504 AFB00028 */ sw $s0, 0x0028($sp) +/* 00EB0 80860500 AFBF002C */ sw $ra, 0x002C($sp) +/* 00EB4 80860504 AFB00028 */ sw $s0, 0x0028($sp) /* 00EB8 80860508 8CAE1C44 */ lw $t6, 0x1C44($a1) ## 00001C44 /* 00EBC 8086050C 44801000 */ mtc1 $zero, $f2 ## $f2 = 0.00 /* 00EC0 80860510 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 00EC4 80860514 00A03025 */ or $a2, $a1, $zero ## $a2 = 00000000 /* 00EC8 80860518 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 /* 00ECC 8086051C 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 00ED0 80860520 AFA60074 */ sw $a2, 0x0074($sp) -/* 00ED4 80860524 AFAE0054 */ sw $t6, 0x0054($sp) -/* 00ED8 80860528 0C21907A */ jal func_808641E8 -/* 00EDC 8086052C E7A20068 */ swc1 $f2, 0x0068($sp) -/* 00EE0 80860530 144001A5 */ bne $v0, $zero, .L80860BC8 -/* 00EE4 80860534 C7A20068 */ lwc1 $f2, 0x0068($sp) +/* 00ED0 80860520 AFA60074 */ sw $a2, 0x0074($sp) +/* 00ED4 80860524 AFAE0054 */ sw $t6, 0x0054($sp) +/* 00ED8 80860528 0C21907A */ jal func_808641E8 +/* 00EDC 8086052C E7A20068 */ swc1 $f2, 0x0068($sp) +/* 00EE0 80860530 144001A5 */ bne $v0, $zero, .L80860BC8 +/* 00EE4 80860534 C7A20068 */ lwc1 $f2, 0x0068($sp) /* 00EE8 80860538 8E0F07E8 */ lw $t7, 0x07E8($s0) ## 000007E8 /* 00EEC 8086053C 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 00EF0 80860540 25F80001 */ addiu $t8, $t7, 0x0001 ## $t8 = 00000001 /* 00EF4 80860544 AE1807E8 */ sw $t8, 0x07E8($s0) ## 000007E8 -/* 00EF8 80860548 E7A20068 */ swc1 $f2, 0x0068($sp) -/* 00EFC 8086054C 0C00CEAE */ jal func_80033AB8 -/* 00F00 80860550 8FA40074 */ lw $a0, 0x0074($sp) -/* 00F04 80860554 10400004 */ beq $v0, $zero, .L80860568 -/* 00F08 80860558 C7A20068 */ lwc1 $f2, 0x0068($sp) +/* 00EF8 80860548 E7A20068 */ swc1 $f2, 0x0068($sp) +/* 00EFC 8086054C 0C00CEAE */ jal func_80033AB8 +/* 00F00 80860550 8FA40074 */ lw $a0, 0x0074($sp) +/* 00F04 80860554 10400004 */ beq $v0, $zero, .L80860568 +/* 00F08 80860558 C7A20068 */ lwc1 $f2, 0x0068($sp) /* 00F0C 8086055C 3C014316 */ lui $at, 0x4316 ## $at = 43160000 /* 00F10 80860560 44811000 */ mtc1 $at, $f2 ## $f2 = 150.00 /* 00F14 80860564 00000000 */ nop @@ -31,57 +31,57 @@ glabel func_808604FC /* 00F1C 8086056C 44812000 */ mtc1 $at, $f4 ## $f4 = 80.00 /* 00F20 80860570 C6000090 */ lwc1 $f0, 0x0090($s0) ## 00000090 /* 00F24 80860574 26040068 */ addiu $a0, $s0, 0x0068 ## $a0 = 00000068 -/* 00F28 80860578 46022180 */ add.s $f6, $f4, $f2 +/* 00F28 80860578 46022180 */ add.s $f6, $f4, $f2 /* 00F2C 8086057C 3C05C0A0 */ lui $a1, 0xC0A0 ## $a1 = C0A00000 /* 00F30 80860580 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 00F34 80860584 3C073F4C */ lui $a3, 0x3F4C ## $a3 = 3F4C0000 -/* 00F38 80860588 4606003E */ c.le.s $f0, $f6 +/* 00F38 80860588 4606003E */ c.le.s $f0, $f6 /* 00F3C 8086058C 3C0142DC */ lui $at, 0x42DC ## $at = 42DC0000 -/* 00F40 80860590 45020008 */ bc1fl .L808605B4 +/* 00F40 80860590 45020008 */ bc1fl .L808605B4 /* 00F44 80860594 44815000 */ mtc1 $at, $f10 ## $f10 = 110.00 /* 00F48 80860598 44804000 */ mtc1 $zero, $f8 ## $f8 = 0.00 /* 00F4C 8086059C 34E7CCCD */ ori $a3, $a3, 0xCCCD ## $a3 = 3F4CCCCD /* 00F50 808605A0 0C01E0C4 */ jal Math_SmoothScaleMaxMinF - -/* 00F54 808605A4 E7A80010 */ swc1 $f8, 0x0010($sp) -/* 00F58 808605A8 10000010 */ beq $zero, $zero, .L808605EC + +/* 00F54 808605A4 E7A80010 */ swc1 $f8, 0x0010($sp) +/* 00F58 808605A8 10000010 */ beq $zero, $zero, .L808605EC /* 00F5C 808605AC 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 /* 00F60 808605B0 44815000 */ mtc1 $at, $f10 ## $f10 = 5.00 .L808605B4: /* 00F64 808605B4 26040068 */ addiu $a0, $s0, 0x0068 ## $a0 = 00000068 /* 00F68 808605B8 3C0540A0 */ lui $a1, 0x40A0 ## $a1 = 40A00000 -/* 00F6C 808605BC 46025400 */ add.s $f16, $f10, $f2 +/* 00F6C 808605BC 46025400 */ add.s $f16, $f10, $f2 /* 00F70 808605C0 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 00F74 808605C4 3C073F4C */ lui $a3, 0x3F4C ## $a3 = 3F4C0000 -/* 00F78 808605C8 4600803C */ c.lt.s $f16, $f0 +/* 00F78 808605C8 4600803C */ c.lt.s $f16, $f0 /* 00F7C 808605CC 00000000 */ nop -/* 00F80 808605D0 45020006 */ bc1fl .L808605EC +/* 00F80 808605D0 45020006 */ bc1fl .L808605EC /* 00F84 808605D4 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 /* 00F88 808605D8 44809000 */ mtc1 $zero, $f18 ## $f18 = 0.00 /* 00F8C 808605DC 34E7CCCD */ ori $a3, $a3, 0xCCCD ## $a3 = 3F4CCCCD /* 00F90 808605E0 0C01E0C4 */ jal Math_SmoothScaleMaxMinF - -/* 00F94 808605E4 E7B20010 */ swc1 $f18, 0x0010($sp) + +/* 00F94 808605E4 E7B20010 */ swc1 $f18, 0x0010($sp) /* 00F98 808605E8 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 .L808605EC: /* 00F9C 808605EC 44812000 */ mtc1 $at, $f4 ## $f4 = 5.00 /* 00FA0 808605F0 C6000068 */ lwc1 $f0, 0x0068($s0) ## 00000068 /* 00FA4 808605F4 3C01C0A0 */ lui $at, 0xC0A0 ## $at = C0A00000 /* 00FA8 808605F8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00FAC 808605FC 4600203E */ c.le.s $f4, $f0 +/* 00FAC 808605FC 4600203E */ c.le.s $f4, $f0 /* 00FB0 80860600 00000000 */ nop -/* 00FB4 80860604 45020006 */ bc1fl .L80860620 +/* 00FB4 80860604 45020006 */ bc1fl .L80860620 /* 00FB8 80860608 44814000 */ mtc1 $at, $f8 ## $f8 = -5.00 /* 00FBC 8086060C 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 /* 00FC0 80860610 44813000 */ mtc1 $at, $f6 ## $f6 = 5.00 -/* 00FC4 80860614 1000000A */ beq $zero, $zero, .L80860640 +/* 00FC4 80860614 1000000A */ beq $zero, $zero, .L80860640 /* 00FC8 80860618 E6060068 */ swc1 $f6, 0x0068($s0) ## 00000068 /* 00FCC 8086061C 44814000 */ mtc1 $at, $f8 ## $f8 = 5.00 .L80860620: /* 00FD0 80860620 3C01C0A0 */ lui $at, 0xC0A0 ## $at = C0A00000 -/* 00FD4 80860624 4608003C */ c.lt.s $f0, $f8 +/* 00FD4 80860624 4608003C */ c.lt.s $f0, $f8 /* 00FD8 80860628 00000000 */ nop -/* 00FDC 8086062C 45020005 */ bc1fl .L80860644 +/* 00FDC 8086062C 45020005 */ bc1fl .L80860644 /* 00FE0 80860630 8619001C */ lh $t9, 0x001C($s0) ## 0000001C /* 00FE4 80860634 44815000 */ mtc1 $at, $f10 ## $f10 = -5.00 /* 00FE8 80860638 00000000 */ nop @@ -90,18 +90,18 @@ glabel func_808604FC /* 00FF0 80860640 8619001C */ lh $t9, 0x001C($s0) ## 0000001C .L80860644: /* 00FF4 80860644 24010003 */ addiu $at, $zero, 0x0003 ## $at = 00000003 -/* 00FF8 80860648 8FA50074 */ lw $a1, 0x0074($sp) -/* 00FFC 8086064C 5721000C */ bnel $t9, $at, .L80860680 +/* 00FF8 80860648 8FA50074 */ lw $a1, 0x0074($sp) +/* 00FFC 8086064C 5721000C */ bnel $t9, $at, .L80860680 /* 01000 80860650 C6000068 */ lwc1 $f0, 0x0068($s0) ## 00000068 /* 01004 80860654 8E060068 */ lw $a2, 0x0068($s0) ## 00000068 -/* 01008 80860658 0C00CE6E */ jal func_800339B8 +/* 01008 80860658 0C00CE6E */ jal func_800339B8 /* 0100C 8086065C 86070032 */ lh $a3, 0x0032($s0) ## 00000032 -/* 01010 80860660 14400006 */ bne $v0, $zero, .L8086067C +/* 01010 80860660 14400006 */ bne $v0, $zero, .L8086067C /* 01014 80860664 3C01BF80 */ lui $at, 0xBF80 ## $at = BF800000 /* 01018 80860668 C6100068 */ lwc1 $f16, 0x0068($s0) ## 00000068 /* 0101C 8086066C 44819000 */ mtc1 $at, $f18 ## $f18 = -1.00 /* 01020 80860670 00000000 */ nop -/* 01024 80860674 46128102 */ mul.s $f4, $f16, $f18 +/* 01024 80860674 46128102 */ mul.s $f4, $f16, $f18 /* 01028 80860678 E6040068 */ swc1 $f4, 0x0068($s0) ## 00000068 .L8086067C: /* 0102C 8086067C C6000068 */ lwc1 $f0, 0x0068($s0) ## 00000068 @@ -109,125 +109,125 @@ glabel func_808604FC /* 01030 80860680 44803000 */ mtc1 $zero, $f6 ## $f6 = 0.00 /* 01034 80860684 3C014040 */ lui $at, 0x4040 ## $at = 40400000 /* 01038 80860688 44814000 */ mtc1 $at, $f8 ## $f8 = 3.00 -/* 0103C 8086068C 4600303E */ c.le.s $f6, $f0 +/* 0103C 8086068C 4600303E */ c.le.s $f6, $f0 /* 01040 80860690 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 -/* 01044 80860694 45020004 */ bc1fl .L808606A8 -/* 01048 80860698 46000087 */ neg.s $f2, $f0 -/* 0104C 8086069C 10000002 */ beq $zero, $zero, .L808606A8 -/* 01050 808606A0 46000086 */ mov.s $f2, $f0 -/* 01054 808606A4 46000087 */ neg.s $f2, $f0 +/* 01044 80860694 45020004 */ bc1fl .L808606A8 +/* 01048 80860698 46000087 */ neg.s $f2, $f0 +/* 0104C 8086069C 10000002 */ beq $zero, $zero, .L808606A8 +/* 01050 808606A0 46000086 */ mov.s $f2, $f0 +/* 01054 808606A4 46000087 */ neg.s $f2, $f0 .L808606A8: -/* 01058 808606A8 4608103C */ c.lt.s $f2, $f8 +/* 01058 808606A8 4608103C */ c.lt.s $f2, $f8 /* 0105C 808606AC 00000000 */ nop -/* 01060 808606B0 45000019 */ bc1f .L80860718 +/* 01060 808606B0 45000019 */ bc1f .L80860718 /* 01064 808606B4 00000000 */ nop /* 01068 808606B8 3C040601 */ lui $a0, 0x0601 ## $a0 = 06010000 /* 0106C 808606BC 0C028800 */ jal SkelAnime_GetFrameCount - + /* 01070 808606C0 248481B4 */ addiu $a0, $a0, 0x81B4 ## $a0 = 060081B4 /* 01074 808606C4 44825000 */ mtc1 $v0, $f10 ## $f10 = 0.00 /* 01078 808606C8 8E0701A0 */ lw $a3, 0x01A0($s0) ## 000001A0 /* 0107C 808606CC 3C01C0C0 */ lui $at, 0xC0C0 ## $at = C0C00000 -/* 01080 808606D0 46805420 */ cvt.s.w $f16, $f10 +/* 01080 808606D0 46805420 */ cvt.s.w $f16, $f10 /* 01084 808606D4 44819000 */ mtc1 $at, $f18 ## $f18 = -6.00 /* 01088 808606D8 26040188 */ addiu $a0, $s0, 0x0188 ## $a0 = 00000188 /* 0108C 808606DC 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 /* 01090 808606E0 24A581B4 */ addiu $a1, $a1, 0x81B4 ## $a1 = 060081B4 -/* 01094 808606E4 AFA40034 */ sw $a0, 0x0034($sp) -/* 01098 808606E8 E7B00010 */ swc1 $f16, 0x0010($sp) -/* 0109C 808606EC AFA00014 */ sw $zero, 0x0014($sp) +/* 01094 808606E4 AFA40034 */ sw $a0, 0x0034($sp) +/* 01098 808606E8 E7B00010 */ swc1 $f16, 0x0010($sp) +/* 0109C 808606EC AFA00014 */ sw $zero, 0x0014($sp) /* 010A0 808606F0 24060000 */ addiu $a2, $zero, 0x0000 ## $a2 = 00000000 -/* 010A4 808606F4 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 010A8 808606F8 E7B20018 */ swc1 $f18, 0x0018($sp) +/* 010A4 808606F4 0C029468 */ jal SkelAnime_ChangeAnim + +/* 010A8 808606F8 E7B20018 */ swc1 $f18, 0x0018($sp) /* 010AC 808606FC 3C014120 */ lui $at, 0x4120 ## $at = 41200000 /* 010B0 80860700 44812000 */ mtc1 $at, $f4 ## $f4 = 10.00 /* 010B4 80860704 C6000068 */ lwc1 $f0, 0x0068($s0) ## 00000068 -/* 010B8 80860708 8FA40034 */ lw $a0, 0x0034($sp) -/* 010BC 8086070C 46040082 */ mul.s $f2, $f0, $f4 -/* 010C0 80860710 1000001B */ beq $zero, $zero, .L80860780 +/* 010B8 80860708 8FA40034 */ lw $a0, 0x0034($sp) +/* 010BC 8086070C 46040082 */ mul.s $f2, $f0, $f4 +/* 010C0 80860710 1000001B */ beq $zero, $zero, .L80860780 /* 010C4 80860714 44803000 */ mtc1 $zero, $f6 ## $f6 = 0.00 .L80860718: /* 010C8 80860718 0C028800 */ jal SkelAnime_GetFrameCount - + /* 010CC 8086071C 248426D4 */ addiu $a0, $a0, 0x26D4 ## $a0 = 000026D4 /* 010D0 80860720 44823000 */ mtc1 $v0, $f6 ## $f6 = 0.00 /* 010D4 80860724 8E0701A0 */ lw $a3, 0x01A0($s0) ## 000001A0 /* 010D8 80860728 3C01C080 */ lui $at, 0xC080 ## $at = C0800000 -/* 010DC 8086072C 46803220 */ cvt.s.w $f8, $f6 +/* 010DC 8086072C 46803220 */ cvt.s.w $f8, $f6 /* 010E0 80860730 44815000 */ mtc1 $at, $f10 ## $f10 = -4.00 /* 010E4 80860734 26040188 */ addiu $a0, $s0, 0x0188 ## $a0 = 00000188 /* 010E8 80860738 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 010EC 8086073C 24A526D4 */ addiu $a1, $a1, 0x26D4 ## $a1 = 060026D4 -/* 010F0 80860740 AFA40034 */ sw $a0, 0x0034($sp) -/* 010F4 80860744 E7A80010 */ swc1 $f8, 0x0010($sp) -/* 010F8 80860748 AFA00014 */ sw $zero, 0x0014($sp) +/* 010F0 80860740 AFA40034 */ sw $a0, 0x0034($sp) +/* 010F4 80860744 E7A80010 */ swc1 $f8, 0x0010($sp) +/* 010F8 80860748 AFA00014 */ sw $zero, 0x0014($sp) /* 010FC 8086074C 24060000 */ addiu $a2, $zero, 0x0000 ## $a2 = 00000000 -/* 01100 80860750 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 01104 80860754 E7AA0018 */ swc1 $f10, 0x0018($sp) +/* 01100 80860750 0C029468 */ jal SkelAnime_ChangeAnim + +/* 01104 80860754 E7AA0018 */ swc1 $f10, 0x0018($sp) /* 01108 80860758 3C014120 */ lui $at, 0x4120 ## $at = 41200000 /* 0110C 8086075C 44818000 */ mtc1 $at, $f16 ## $f16 = 10.00 /* 01110 80860760 C6000068 */ lwc1 $f0, 0x0068($s0) ## 00000068 /* 01114 80860764 3C018086 */ lui $at, %hi(D_8086478C) ## $at = 80860000 -/* 01118 80860768 C424478C */ lwc1 $f4, %lo(D_8086478C)($at) -/* 0111C 8086076C 46100482 */ mul.s $f18, $f0, $f16 -/* 01120 80860770 8FA40034 */ lw $a0, 0x0034($sp) -/* 01124 80860774 46049082 */ mul.s $f2, $f18, $f4 +/* 01118 80860768 C424478C */ lwc1 $f4, %lo(D_8086478C)($at) +/* 0111C 8086076C 46100482 */ mul.s $f18, $f0, $f16 +/* 01120 80860770 8FA40034 */ lw $a0, 0x0034($sp) +/* 01124 80860774 46049082 */ mul.s $f2, $f18, $f4 /* 01128 80860778 00000000 */ nop /* 0112C 8086077C 44803000 */ mtc1 $zero, $f6 ## $f6 = 0.00 .L80860780: /* 01130 80860780 3C01C020 */ lui $at, 0xC020 ## $at = C0200000 -/* 01134 80860784 4600303E */ c.le.s $f6, $f0 +/* 01134 80860784 4600303E */ c.le.s $f6, $f0 /* 01138 80860788 00000000 */ nop -/* 0113C 8086078C 4502000F */ bc1fl .L808607CC +/* 0113C 8086078C 4502000F */ bc1fl .L808607CC /* 01140 80860790 44810000 */ mtc1 $at, $f0 ## $f0 = -2.50 /* 01144 80860794 920207DE */ lbu $v0, 0x07DE($s0) ## 000007DE /* 01148 80860798 3C014020 */ lui $at, 0x4020 ## $at = 40200000 /* 0114C 8086079C 44810000 */ mtc1 $at, $f0 ## $f0 = 2.50 -/* 01150 808607A0 14400002 */ bne $v0, $zero, .L808607AC +/* 01150 808607A0 14400002 */ bne $v0, $zero, .L808607AC /* 01154 808607A4 24480001 */ addiu $t0, $v0, 0x0001 ## $t0 = 00000001 /* 01158 808607A8 A20807DE */ sb $t0, 0x07DE($s0) ## 000007DE .L808607AC: -/* 0115C 808607AC 4602003C */ c.lt.s $f0, $f2 +/* 0115C 808607AC 4602003C */ c.lt.s $f0, $f2 /* 01160 808607B0 00000000 */ nop -/* 01164 808607B4 45000002 */ bc1f .L808607C0 +/* 01164 808607B4 45000002 */ bc1f .L808607C0 /* 01168 808607B8 00000000 */ nop -/* 0116C 808607BC 46000086 */ mov.s $f2, $f0 +/* 0116C 808607BC 46000086 */ mov.s $f2, $f0 .L808607C0: -/* 01170 808607C0 10000009 */ beq $zero, $zero, .L808607E8 +/* 01170 808607C0 10000009 */ beq $zero, $zero, .L808607E8 /* 01174 808607C4 E60201A4 */ swc1 $f2, 0x01A4($s0) ## 000001A4 /* 01178 808607C8 44810000 */ mtc1 $at, $f0 ## $f0 = 2.50 .L808607CC: /* 0117C 808607CC 00000000 */ nop -/* 01180 808607D0 4600103C */ c.lt.s $f2, $f0 +/* 01180 808607D0 4600103C */ c.lt.s $f2, $f0 /* 01184 808607D4 00000000 */ nop -/* 01188 808607D8 45020003 */ bc1fl .L808607E8 +/* 01188 808607D8 45020003 */ bc1fl .L808607E8 /* 0118C 808607DC E60201A4 */ swc1 $f2, 0x01A4($s0) ## 000001A4 -/* 01190 808607E0 46000086 */ mov.s $f2, $f0 +/* 01190 808607E0 46000086 */ mov.s $f2, $f0 /* 01194 808607E4 E60201A4 */ swc1 $f2, 0x01A4($s0) ## 000001A4 .L808607E8: -/* 01198 808607E8 8FA50054 */ lw $a1, 0x0054($sp) +/* 01198 808607E8 8FA50054 */ lw $a1, 0x0054($sp) /* 0119C 808607EC 3C0142C8 */ lui $at, 0x42C8 ## $at = 42C80000 /* 011A0 808607F0 44815000 */ mtc1 $at, $f10 ## $f10 = 100.00 /* 011A4 808607F4 C6080090 */ lwc1 $f8, 0x0090($s0) ## 00000090 /* 011A8 808607F8 860A00B6 */ lh $t2, 0x00B6($s0) ## 000000B6 /* 011AC 808607FC 84A900B6 */ lh $t1, 0x00B6($a1) ## 000000B6 -/* 011B0 80860800 460A403C */ c.lt.s $f8, $f10 -/* 011B4 80860804 012A1023 */ subu $v0, $t1, $t2 -/* 011B8 80860808 00021400 */ sll $v0, $v0, 16 -/* 011BC 8086080C 45000022 */ bc1f .L80860898 -/* 011C0 80860810 00021403 */ sra $v0, $v0, 16 +/* 011B0 80860800 460A403C */ c.lt.s $f8, $f10 +/* 011B4 80860804 012A1023 */ subu $v0, $t1, $t2 +/* 011B8 80860808 00021400 */ sll $v0, $v0, 16 +/* 011BC 8086080C 45000022 */ bc1f .L80860898 +/* 011C0 80860810 00021403 */ sra $v0, $v0, 16 /* 011C4 80860814 80AB0843 */ lb $t3, 0x0843($a1) ## 00000843 -/* 011C8 80860818 51600020 */ beql $t3, $zero, .L8086089C +/* 011C8 80860818 51600020 */ beql $t3, $zero, .L8086089C /* 011CC 8086081C C61201A0 */ lwc1 $f18, 0x01A0($s0) ## 000001A0 -/* 011D0 80860820 04400003 */ bltz $v0, .L80860830 -/* 011D4 80860824 00021823 */ subu $v1, $zero, $v0 -/* 011D8 80860828 10000001 */ beq $zero, $zero, .L80860830 +/* 011D0 80860820 04400003 */ bltz $v0, .L80860830 +/* 011D4 80860824 00021823 */ subu $v1, $zero, $v0 +/* 011D8 80860828 10000001 */ beq $zero, $zero, .L80860830 /* 011DC 8086082C 00401825 */ or $v1, $v0, $zero ## $v1 = 00000000 .L80860830: -/* 011E0 80860830 28611F40 */ slti $at, $v1, 0x1F40 -/* 011E4 80860834 54200019 */ bnel $at, $zero, .L8086089C +/* 011E0 80860830 28611F40 */ slti $at, $v1, 0x1F40 +/* 011E4 80860834 54200019 */ bnel $at, $zero, .L8086089C /* 011E8 80860838 C61201A0 */ lwc1 $f18, 0x01A0($s0) ## 000001A0 /* 011EC 8086083C 8602008A */ lh $v0, 0x008A($s0) ## 0000008A /* 011F0 80860840 A6020032 */ sh $v0, 0x0032($s0) ## 00000032 @@ -235,87 +235,87 @@ glabel func_808604FC ## Rand.Next() float /* 011F8 80860848 A60200B6 */ sh $v0, 0x00B6($s0) ## 000000B6 /* 011FC 8086084C 3C018086 */ lui $at, %hi(D_80864790) ## $at = 80860000 -/* 01200 80860850 C4304790 */ lwc1 $f16, %lo(D_80864790)($at) -/* 01204 80860854 8FAC0054 */ lw $t4, 0x0054($sp) -/* 01208 80860858 4600803C */ c.lt.s $f16, $f0 +/* 01200 80860850 C4304790 */ lwc1 $f16, %lo(D_80864790)($at) +/* 01204 80860854 8FAC0054 */ lw $t4, 0x0054($sp) +/* 01208 80860858 4600803C */ c.lt.s $f16, $f0 /* 0120C 8086085C 00000000 */ nop -/* 01210 80860860 45000009 */ bc1f .L80860888 +/* 01210 80860860 45000009 */ bc1f .L80860888 /* 01214 80860864 00000000 */ nop /* 01218 80860868 818D0842 */ lb $t5, 0x0842($t4) ## 00000842 /* 0121C 8086086C 24010011 */ addiu $at, $zero, 0x0011 ## $at = 00000011 -/* 01220 80860870 11A10005 */ beq $t5, $at, .L80860888 +/* 01220 80860870 11A10005 */ beq $t5, $at, .L80860888 /* 01224 80860874 00000000 */ nop -/* 01228 80860878 0C218653 */ jal func_8086194C +/* 01228 80860878 0C218653 */ jal func_8086194C /* 0122C 8086087C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01230 80860880 100000D2 */ beq $zero, $zero, .L80860BCC -/* 01234 80860884 8FBF002C */ lw $ra, 0x002C($sp) +/* 01230 80860880 100000D2 */ beq $zero, $zero, .L80860BCC +/* 01234 80860884 8FBF002C */ lw $ra, 0x002C($sp) .L80860888: -/* 01238 80860888 0C2187B0 */ jal func_80861EC0 +/* 01238 80860888 0C2187B0 */ jal func_80861EC0 /* 0123C 8086088C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01240 80860890 100000CE */ beq $zero, $zero, .L80860BCC -/* 01244 80860894 8FBF002C */ lw $ra, 0x002C($sp) +/* 01240 80860890 100000CE */ beq $zero, $zero, .L80860BCC +/* 01244 80860894 8FBF002C */ lw $ra, 0x002C($sp) .L80860898: /* 01248 80860898 C61201A0 */ lwc1 $f18, 0x01A0($s0) ## 000001A0 .L8086089C: -/* 0124C 8086089C 4600910D */ trunc.w.s $f4, $f18 -/* 01250 808608A0 44032000 */ mfc1 $v1, $f4 +/* 0124C 8086089C 4600910D */ trunc.w.s $f4, $f18 +/* 01250 808608A0 44032000 */ mfc1 $v1, $f4 /* 01254 808608A4 0C02927F */ jal SkelAnime_FrameUpdateMatrix - -/* 01258 808608A8 AFA30060 */ sw $v1, 0x0060($sp) + +/* 01258 808608A8 AFA30060 */ sw $v1, 0x0060($sp) /* 0125C 808608AC C60001A4 */ lwc1 $f0, 0x01A4($s0) ## 000001A4 /* 01260 808608B0 44803000 */ mtc1 $zero, $f6 ## $f6 = 0.00 /* 01264 808608B4 44808000 */ mtc1 $zero, $f16 ## $f16 = 0.00 -/* 01268 808608B8 8FA30060 */ lw $v1, 0x0060($sp) -/* 0126C 808608BC 4600303E */ c.le.s $f6, $f0 +/* 01268 808608B8 8FA30060 */ lw $v1, 0x0060($sp) +/* 0126C 808608BC 4600303E */ c.le.s $f6, $f0 /* 01270 808608C0 00000000 */ nop -/* 01274 808608C4 45020004 */ bc1fl .L808608D8 -/* 01278 808608C8 46000087 */ neg.s $f2, $f0 -/* 0127C 808608CC 10000002 */ beq $zero, $zero, .L808608D8 -/* 01280 808608D0 46000086 */ mov.s $f2, $f0 -/* 01284 808608D4 46000087 */ neg.s $f2, $f0 +/* 01274 808608C4 45020004 */ bc1fl .L808608D8 +/* 01278 808608C8 46000087 */ neg.s $f2, $f0 +/* 0127C 808608CC 10000002 */ beq $zero, $zero, .L808608D8 +/* 01280 808608D0 46000086 */ mov.s $f2, $f0 +/* 01284 808608D4 46000087 */ neg.s $f2, $f0 .L808608D8: /* 01288 808608D8 C60C01A0 */ lwc1 $f12, 0x01A0($s0) ## 000001A0 -/* 0128C 808608DC 4600803E */ c.le.s $f16, $f0 -/* 01290 808608E0 46026201 */ sub.s $f8, $f12, $f2 -/* 01294 808608E4 4600648D */ trunc.w.s $f18, $f12 -/* 01298 808608E8 4600428D */ trunc.w.s $f10, $f8 -/* 0129C 808608EC 44199000 */ mfc1 $t9, $f18 -/* 012A0 808608F0 44045000 */ mfc1 $a0, $f10 -/* 012A4 808608F4 45020004 */ bc1fl .L80860908 -/* 012A8 808608F8 46000087 */ neg.s $f2, $f0 -/* 012AC 808608FC 10000002 */ beq $zero, $zero, .L80860908 -/* 012B0 80860900 46000086 */ mov.s $f2, $f0 -/* 012B4 80860904 46000087 */ neg.s $f2, $f0 +/* 0128C 808608DC 4600803E */ c.le.s $f16, $f0 +/* 01290 808608E0 46026201 */ sub.s $f8, $f12, $f2 +/* 01294 808608E4 4600648D */ trunc.w.s $f18, $f12 +/* 01298 808608E8 4600428D */ trunc.w.s $f10, $f8 +/* 0129C 808608EC 44199000 */ mfc1 $t9, $f18 +/* 012A0 808608F0 44045000 */ mfc1 $a0, $f10 +/* 012A4 808608F4 45020004 */ bc1fl .L80860908 +/* 012A8 808608F8 46000087 */ neg.s $f2, $f0 +/* 012AC 808608FC 10000002 */ beq $zero, $zero, .L80860908 +/* 012B0 80860900 46000086 */ mov.s $f2, $f0 +/* 012B4 80860904 46000087 */ neg.s $f2, $f0 .L80860908: -/* 012B8 80860908 50790011 */ beql $v1, $t9, .L80860950 +/* 012B8 80860908 50790011 */ beql $v1, $t9, .L80860950 /* 012BC 8086090C 8E0A07E8 */ lw $t2, 0x07E8($s0) ## 000007E8 -/* 012C0 80860910 4600110D */ trunc.w.s $f4, $f2 -/* 012C4 80860914 44092000 */ mfc1 $t1, $f4 +/* 012C0 80860910 4600110D */ trunc.w.s $f4, $f2 +/* 012C4 80860914 44092000 */ mfc1 $t1, $f4 /* 012C8 80860918 00000000 */ nop -/* 012CC 8086091C 01231021 */ addu $v0, $t1, $v1 -/* 012D0 80860920 28410002 */ slti $at, $v0, 0x0002 -/* 012D4 80860924 54200003 */ bnel $at, $zero, .L80860934 -/* 012D8 80860928 28810007 */ slti $at, $a0, 0x0007 -/* 012DC 8086092C 18800004 */ blez $a0, .L80860940 -/* 012E0 80860930 28810007 */ slti $at, $a0, 0x0007 +/* 012CC 8086091C 01231021 */ addu $v0, $t1, $v1 +/* 012D0 80860920 28410002 */ slti $at, $v0, 0x0002 +/* 012D4 80860924 54200003 */ bnel $at, $zero, .L80860934 +/* 012D8 80860928 28810007 */ slti $at, $a0, 0x0007 +/* 012DC 8086092C 18800004 */ blez $a0, .L80860940 +/* 012E0 80860930 28810007 */ slti $at, $a0, 0x0007 .L80860934: -/* 012E4 80860934 10200005 */ beq $at, $zero, .L8086094C -/* 012E8 80860938 28410008 */ slti $at, $v0, 0x0008 -/* 012EC 8086093C 14200003 */ bne $at, $zero, .L8086094C +/* 012E4 80860934 10200005 */ beq $at, $zero, .L8086094C +/* 012E8 80860938 28410008 */ slti $at, $v0, 0x0008 +/* 012EC 8086093C 14200003 */ bne $at, $zero, .L8086094C .L80860940: /* 012F0 80860940 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 012F4 80860944 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 012F8 80860948 2405383D */ addiu $a1, $zero, 0x383D ## $a1 = 0000383D .L8086094C: /* 012FC 8086094C 8E0A07E8 */ lw $t2, 0x07E8($s0) ## 000007E8 .L80860950: /* 01300 80860950 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 01304 80860954 314B001F */ andi $t3, $t2, 0x001F ## $t3 = 00000000 -/* 01308 80860958 55600011 */ bnel $t3, $zero, .L808609A0 +/* 01308 80860958 55600011 */ bnel $t3, $zero, .L808609A0 /* 0130C 8086095C 3C01435C */ lui $at, 0x435C ## $at = 435C0000 /* 01310 80860960 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 01314 80860964 24053838 */ addiu $a1, $zero, 0x3838 ## $a1 = 00003838 /* 01318 80860968 0C03F66B */ jal Math_Rand_ZeroOne ## Rand.Next() float @@ -323,97 +323,97 @@ glabel func_808604FC /* 01320 80860970 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 /* 01324 80860974 44813000 */ mtc1 $at, $f6 ## $f6 = 5.00 /* 01328 80860978 8E0C07E8 */ lw $t4, 0x07E8($s0) ## 000007E8 -/* 0132C 8086097C 46060202 */ mul.s $f8, $f0, $f6 -/* 01330 80860980 4600428D */ trunc.w.s $f10, $f8 -/* 01334 80860984 440E5000 */ mfc1 $t6, $f10 +/* 0132C 8086097C 46060202 */ mul.s $f8, $f0, $f6 +/* 01330 80860980 4600428D */ trunc.w.s $f10, $f8 +/* 01334 80860984 440E5000 */ mfc1 $t6, $f10 /* 01338 80860988 00000000 */ nop -/* 0133C 8086098C 000E7C00 */ sll $t7, $t6, 16 -/* 01340 80860990 000FC403 */ sra $t8, $t7, 16 -/* 01344 80860994 0198C821 */ addu $t9, $t4, $t8 +/* 0133C 8086098C 000E7C00 */ sll $t7, $t6, 16 +/* 01340 80860990 000FC403 */ sra $t8, $t7, 16 +/* 01344 80860994 0198C821 */ addu $t9, $t4, $t8 /* 01348 80860998 AE1907E8 */ sw $t9, 0x07E8($s0) ## 000007E8 /* 0134C 8086099C 3C01435C */ lui $at, 0x435C ## $at = 435C0000 .L808609A0: /* 01350 808609A0 44818000 */ mtc1 $at, $f16 ## $f16 = 220.00 /* 01354 808609A4 C6000090 */ lwc1 $f0, 0x0090($s0) ## 00000090 /* 01358 808609A8 3C014320 */ lui $at, 0x4320 ## $at = 43200000 -/* 0135C 808609AC 4610003C */ c.lt.s $f0, $f16 +/* 0135C 808609AC 4610003C */ c.lt.s $f0, $f16 /* 01360 808609B0 00000000 */ nop -/* 01364 808609B4 45000033 */ bc1f .L80860A84 +/* 01364 808609B4 45000033 */ bc1f .L80860A84 /* 01368 808609B8 00000000 */ nop /* 0136C 808609BC 44819000 */ mtc1 $at, $f18 ## $f18 = 160.00 /* 01370 808609C0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01374 808609C4 4600903C */ c.lt.s $f18, $f0 +/* 01374 808609C4 4600903C */ c.lt.s $f18, $f0 /* 01378 808609C8 00000000 */ nop -/* 0137C 808609CC 4500002D */ bc1f .L80860A84 +/* 0137C 808609CC 4500002D */ bc1f .L80860A84 /* 01380 808609D0 00000000 */ nop -/* 01384 808609D4 0C00B821 */ jal func_8002E084 +/* 01384 808609D4 0C00B821 */ jal func_8002E084 /* 01388 808609D8 2405071C */ addiu $a1, $zero, 0x071C ## $a1 = 0000071C -/* 0138C 808609DC 10400029 */ beq $v0, $zero, .L80860A84 -/* 01390 808609E0 8FA40074 */ lw $a0, 0x0074($sp) -/* 01394 808609E4 0C00CEA1 */ jal func_80033A84 +/* 0138C 808609DC 10400029 */ beq $v0, $zero, .L80860A84 +/* 01390 808609E0 8FA40074 */ lw $a0, 0x0074($sp) +/* 01394 808609E4 0C00CEA1 */ jal func_80033A84 /* 01398 808609E8 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 0139C 808609EC 1040000D */ beq $v0, $zero, .L80860A24 -/* 013A0 808609F0 8FA80054 */ lw $t0, 0x0054($sp) +/* 0139C 808609EC 1040000D */ beq $v0, $zero, .L80860A24 +/* 013A0 808609F0 8FA80054 */ lw $t0, 0x0054($sp) /* 013A4 808609F4 0C03F66B */ jal Math_Rand_ZeroOne ## Rand.Next() float /* 013A8 808609F8 00000000 */ nop /* 013AC 808609FC 3C018086 */ lui $at, %hi(D_80864794) ## $at = 80860000 -/* 013B0 80860A00 C4244794 */ lwc1 $f4, %lo(D_80864794)($at) -/* 013B4 80860A04 4604003C */ c.lt.s $f0, $f4 +/* 013B0 80860A00 C4244794 */ lwc1 $f4, %lo(D_80864794)($at) +/* 013B4 80860A04 4604003C */ c.lt.s $f0, $f4 /* 013B8 80860A08 00000000 */ nop -/* 013BC 80860A0C 4500001D */ bc1f .L80860A84 +/* 013BC 80860A0C 4500001D */ bc1f .L80860A84 /* 013C0 80860A10 00000000 */ nop -/* 013C4 80860A14 0C2186E5 */ jal func_80861B94 +/* 013C4 80860A14 0C2186E5 */ jal func_80861B94 /* 013C8 80860A18 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 013CC 80860A1C 1000006B */ beq $zero, $zero, .L80860BCC -/* 013D0 80860A20 8FBF002C */ lw $ra, 0x002C($sp) +/* 013CC 80860A1C 1000006B */ beq $zero, $zero, .L80860BCC +/* 013D0 80860A20 8FBF002C */ lw $ra, 0x002C($sp) .L80860A24: /* 013D4 80860A24 81090151 */ lb $t1, 0x0151($t0) ## 00000151 -/* 013D8 80860A28 11200016 */ beq $t1, $zero, .L80860A84 +/* 013D8 80860A28 11200016 */ beq $t1, $zero, .L80860A84 /* 013DC 80860A2C 00000000 */ nop /* 013E0 80860A30 920A010C */ lbu $t2, 0x010C($s0) ## 0000010C -/* 013E4 80860A34 8FAB0074 */ lw $t3, 0x0074($sp) +/* 013E4 80860A34 8FAB0074 */ lw $t3, 0x0074($sp) /* 013E8 80860A38 3C0D0001 */ lui $t5, 0x0001 ## $t5 = 00010000 -/* 013EC 80860A3C 1140000F */ beq $t2, $zero, .L80860A7C -/* 013F0 80860A40 01AB6821 */ addu $t5, $t5, $t3 +/* 013EC 80860A3C 1140000F */ beq $t2, $zero, .L80860A7C +/* 013F0 80860A40 01AB6821 */ addu $t5, $t5, $t3 /* 013F4 80860A44 8DAD1DE4 */ lw $t5, 0x1DE4($t5) ## 00011DE4 /* 013F8 80860A48 01602825 */ or $a1, $t3, $zero ## $a1 = 00000000 /* 013FC 80860A4C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 01400 80860A50 31AE0001 */ andi $t6, $t5, 0x0001 ## $t6 = 00000000 -/* 01404 80860A54 11C00005 */ beq $t6, $zero, .L80860A6C +/* 01404 80860A54 11C00005 */ beq $t6, $zero, .L80860A6C /* 01408 80860A58 00000000 */ nop -/* 0140C 80860A5C 0C2189F1 */ jal func_808627C4 +/* 0140C 80860A5C 0C2189F1 */ jal func_808627C4 /* 01410 80860A60 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01414 80860A64 10000059 */ beq $zero, $zero, .L80860BCC -/* 01418 80860A68 8FBF002C */ lw $ra, 0x002C($sp) +/* 01414 80860A64 10000059 */ beq $zero, $zero, .L80860BCC +/* 01418 80860A68 8FBF002C */ lw $ra, 0x002C($sp) .L80860A6C: -/* 0141C 80860A6C 0C217EAC */ jal func_8085FAB0 -/* 01420 80860A70 8FA50074 */ lw $a1, 0x0074($sp) -/* 01424 80860A74 10000003 */ beq $zero, $zero, .L80860A84 +/* 0141C 80860A6C 0C217EAC */ jal func_8085FAB0 +/* 01420 80860A70 8FA50074 */ lw $a1, 0x0074($sp) +/* 01424 80860A74 10000003 */ beq $zero, $zero, .L80860A84 /* 01428 80860A78 00000000 */ nop .L80860A7C: -/* 0142C 80860A7C 0C2183B0 */ jal func_80860EC0 +/* 0142C 80860A7C 0C2183B0 */ jal func_80860EC0 /* 01430 80860A80 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 .L80860A84: /* 01434 80860A84 0C03F66B */ jal Math_Rand_ZeroOne ## Rand.Next() float /* 01438 80860A88 00000000 */ nop /* 0143C 80860A8C 3C018086 */ lui $at, %hi(D_80864798) ## $at = 80860000 -/* 01440 80860A90 C4264798 */ lwc1 $f6, %lo(D_80864798)($at) +/* 01440 80860A90 C4264798 */ lwc1 $f6, %lo(D_80864798)($at) /* 01444 80860A94 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01448 80860A98 4606003C */ c.lt.s $f0, $f6 +/* 01448 80860A98 4606003C */ c.lt.s $f0, $f6 /* 0144C 80860A9C 00000000 */ nop -/* 01450 80860AA0 45000004 */ bc1f .L80860AB4 +/* 01450 80860AA0 45000004 */ bc1f .L80860AB4 /* 01454 80860AA4 00000000 */ nop /* 01458 80860AA8 8602008A */ lh $v0, 0x008A($s0) ## 0000008A /* 0145C 80860AAC A6020032 */ sh $v0, 0x0032($s0) ## 00000032 /* 01460 80860AB0 A60200B6 */ sh $v0, 0x00B6($s0) ## 000000B6 .L80860AB4: -/* 01464 80860AB4 0C00B821 */ jal func_8002E084 +/* 01464 80860AB4 0C00B821 */ jal func_8002E084 /* 01468 80860AB8 240511C7 */ addiu $a1, $zero, 0x11C7 ## $a1 = 000011C7 -/* 0146C 80860ABC 1440000E */ bne $v0, $zero, .L80860AF8 +/* 0146C 80860ABC 1440000E */ bne $v0, $zero, .L80860AF8 /* 01470 80860AC0 3C0142DC */ lui $at, 0x42DC ## $at = 42DC0000 -/* 01474 80860AC4 0C21801A */ jal func_80860068 +/* 01474 80860AC4 0C21801A */ jal func_80860068 /* 01478 80860AC8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 0147C 80860ACC 0C03F66B */ jal Math_Rand_ZeroOne ## Rand.Next() float @@ -421,77 +421,77 @@ glabel func_808604FC /* 01484 80860AD4 3C014120 */ lui $at, 0x4120 ## $at = 41200000 /* 01488 80860AD8 44811000 */ mtc1 $at, $f2 ## $f2 = 10.00 /* 0148C 80860ADC 00000000 */ nop -/* 01490 80860AE0 46020202 */ mul.s $f8, $f0, $f2 -/* 01494 80860AE4 46024280 */ add.s $f10, $f8, $f2 -/* 01498 80860AE8 4600540D */ trunc.w.s $f16, $f10 -/* 0149C 80860AEC 440C8000 */ mfc1 $t4, $f16 -/* 014A0 80860AF0 10000035 */ beq $zero, $zero, .L80860BC8 +/* 01490 80860AE0 46020202 */ mul.s $f8, $f0, $f2 +/* 01494 80860AE4 46024280 */ add.s $f10, $f8, $f2 +/* 01498 80860AE8 4600540D */ trunc.w.s $f16, $f10 +/* 0149C 80860AEC 440C8000 */ mfc1 $t4, $f16 +/* 014A0 80860AF0 10000035 */ beq $zero, $zero, .L80860BC8 /* 014A4 80860AF4 AE0C07E8 */ sw $t4, 0x07E8($s0) ## 000007E8 .L80860AF8: /* 014A8 80860AF8 C6120090 */ lwc1 $f18, 0x0090($s0) ## 00000090 /* 014AC 80860AFC 44812000 */ mtc1 $at, $f4 ## $f4 = 10.00 /* 014B0 80860B00 00000000 */ nop -/* 014B4 80860B04 4604903C */ c.lt.s $f18, $f4 +/* 014B4 80860B04 4604903C */ c.lt.s $f18, $f4 /* 014B8 80860B08 00000000 */ nop -/* 014BC 80860B0C 45000022 */ bc1f .L80860B98 +/* 014BC 80860B0C 45000022 */ bc1f .L80860B98 /* 014C0 80860B10 00000000 */ nop /* 014C4 80860B14 0C03F66B */ jal Math_Rand_ZeroOne ## Rand.Next() float /* 014C8 80860B18 00000000 */ nop /* 014CC 80860B1C 3C018086 */ lui $at, %hi(D_8086479C) ## $at = 80860000 -/* 014D0 80860B20 C426479C */ lwc1 $f6, %lo(D_8086479C)($at) -/* 014D4 80860B24 8FB80054 */ lw $t8, 0x0054($sp) -/* 014D8 80860B28 4600303C */ c.lt.s $f6, $f0 +/* 014D0 80860B20 C426479C */ lwc1 $f6, %lo(D_8086479C)($at) +/* 014D4 80860B24 8FB80054 */ lw $t8, 0x0054($sp) +/* 014D8 80860B28 4600303C */ c.lt.s $f6, $f0 /* 014DC 80860B2C 00000000 */ nop -/* 014E0 80860B30 45000015 */ bc1f .L80860B88 +/* 014E0 80860B30 45000015 */ bc1f .L80860B88 /* 014E4 80860B34 00000000 */ nop /* 014E8 80860B38 8F19067C */ lw $t9, 0x067C($t8) ## 0000067C /* 014EC 80860B3C 33280010 */ andi $t0, $t9, 0x0010 ## $t0 = 00000000 -/* 014F0 80860B40 1100000D */ beq $t0, $zero, .L80860B78 +/* 014F0 80860B40 1100000D */ beq $t0, $zero, .L80860B78 /* 014F4 80860B44 00000000 */ nop /* 014F8 80860B48 9209010C */ lbu $t1, 0x010C($s0) ## 0000010C /* 014FC 80860B4C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01500 80860B50 11200005 */ beq $t1, $zero, .L80860B68 +/* 01500 80860B50 11200005 */ beq $t1, $zero, .L80860B68 /* 01504 80860B54 00000000 */ nop -/* 01508 80860B58 0C218506 */ jal func_80861418 +/* 01508 80860B58 0C218506 */ jal func_80861418 /* 0150C 80860B5C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01510 80860B60 1000001A */ beq $zero, $zero, .L80860BCC -/* 01514 80860B64 8FBF002C */ lw $ra, 0x002C($sp) +/* 01510 80860B60 1000001A */ beq $zero, $zero, .L80860BCC +/* 01514 80860B64 8FBF002C */ lw $ra, 0x002C($sp) .L80860B68: -/* 01518 80860B68 0C2189F1 */ jal func_808627C4 -/* 0151C 80860B6C 8FA50074 */ lw $a1, 0x0074($sp) -/* 01520 80860B70 10000016 */ beq $zero, $zero, .L80860BCC -/* 01524 80860B74 8FBF002C */ lw $ra, 0x002C($sp) +/* 01518 80860B68 0C2189F1 */ jal func_808627C4 +/* 0151C 80860B6C 8FA50074 */ lw $a1, 0x0074($sp) +/* 01520 80860B70 10000016 */ beq $zero, $zero, .L80860BCC +/* 01524 80860B74 8FBF002C */ lw $ra, 0x002C($sp) .L80860B78: -/* 01528 80860B78 0C218506 */ jal func_80861418 +/* 01528 80860B78 0C218506 */ jal func_80861418 /* 0152C 80860B7C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01530 80860B80 10000012 */ beq $zero, $zero, .L80860BCC -/* 01534 80860B84 8FBF002C */ lw $ra, 0x002C($sp) +/* 01530 80860B80 10000012 */ beq $zero, $zero, .L80860BCC +/* 01534 80860B84 8FBF002C */ lw $ra, 0x002C($sp) .L80860B88: -/* 01538 80860B88 0C2187B0 */ jal func_80861EC0 +/* 01538 80860B88 0C2187B0 */ jal func_80861EC0 /* 0153C 80860B8C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01540 80860B90 1000000E */ beq $zero, $zero, .L80860BCC -/* 01544 80860B94 8FBF002C */ lw $ra, 0x002C($sp) +/* 01540 80860B90 1000000E */ beq $zero, $zero, .L80860BCC +/* 01544 80860B94 8FBF002C */ lw $ra, 0x002C($sp) .L80860B98: /* 01548 80860B98 0C03F66B */ jal Math_Rand_ZeroOne ## Rand.Next() float /* 0154C 80860B9C 00000000 */ nop /* 01550 80860BA0 3C018086 */ lui $at, %hi(D_808647A0) ## $at = 80860000 -/* 01554 80860BA4 C42847A0 */ lwc1 $f8, %lo(D_808647A0)($at) +/* 01554 80860BA4 C42847A0 */ lwc1 $f8, %lo(D_808647A0)($at) /* 01558 80860BA8 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 -/* 0155C 80860BAC 4608003C */ c.lt.s $f0, $f8 +/* 0155C 80860BAC 4608003C */ c.lt.s $f0, $f8 /* 01560 80860BB0 00000000 */ nop -/* 01564 80860BB4 45020005 */ bc1fl .L80860BCC -/* 01568 80860BB8 8FBF002C */ lw $ra, 0x002C($sp) +/* 01564 80860BB4 45020005 */ bc1fl .L80860BCC +/* 01568 80860BB8 8FBF002C */ lw $ra, 0x002C($sp) /* 0156C 80860BBC 44815000 */ mtc1 $at, $f10 ## $f10 = 5.00 /* 01570 80860BC0 00000000 */ nop /* 01574 80860BC4 E60A0068 */ swc1 $f10, 0x0068($s0) ## 00000068 .L80860BC8: -/* 01578 80860BC8 8FBF002C */ lw $ra, 0x002C($sp) +/* 01578 80860BC8 8FBF002C */ lw $ra, 0x002C($sp) .L80860BCC: -/* 0157C 80860BCC 8FB00028 */ lw $s0, 0x0028($sp) +/* 0157C 80860BCC 8FB00028 */ lw $s0, 0x0028($sp) /* 01580 80860BD0 27BD0070 */ addiu $sp, $sp, 0x0070 ## $sp = 00000000 -/* 01584 80860BD4 03E00008 */ jr $ra +/* 01584 80860BD4 03E00008 */ jr $ra /* 01588 80860BD8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Test/func_80860BDC.s b/asm/non_matchings/overlays/actors/ovl_En_Test/func_80860BDC.s index a475908877..b9728a7d60 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Test/func_80860BDC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Test/func_80860BDC.s @@ -1,21 +1,21 @@ glabel func_80860BDC /* 0158C 80860BDC 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 01590 80860BE0 AFBF0014 */ sw $ra, 0x0014($sp) +/* 01590 80860BE0 AFBF0014 */ sw $ra, 0x0014($sp) /* 01594 80860BE4 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 /* 01598 80860BE8 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 /* 0159C 80860BEC 24A5E2B0 */ addiu $a1, $a1, 0xE2B0 ## $a1 = 0600E2B0 -/* 015A0 80860BF0 AFA60018 */ sw $a2, 0x0018($sp) -/* 015A4 80860BF4 0C0294BE */ jal func_800A52F8 +/* 015A0 80860BF0 AFA60018 */ sw $a2, 0x0018($sp) +/* 015A4 80860BF4 0C0294BE */ jal SkelAnime_ChangeAnimDefaultRepeat /* 015A8 80860BF8 24840188 */ addiu $a0, $a0, 0x0188 ## $a0 = 00000188 -/* 015AC 80860BFC 8FA40018 */ lw $a0, 0x0018($sp) +/* 015AC 80860BFC 8FA40018 */ lw $a0, 0x0018($sp) /* 015B0 80860C00 240E000E */ addiu $t6, $zero, 0x000E ## $t6 = 0000000E /* 015B4 80860C04 3C058086 */ lui $a1, %hi(func_80860C24) ## $a1 = 80860000 /* 015B8 80860C08 24A50C24 */ addiu $a1, $a1, %lo(func_80860C24) ## $a1 = 80860C24 -/* 015BC 80860C0C 0C217D94 */ jal func_8085F650 +/* 015BC 80860C0C 0C217D94 */ jal func_8085F650 /* 015C0 80860C10 A08E07C8 */ sb $t6, 0x07C8($a0) ## 000007C8 -/* 015C4 80860C14 8FBF0014 */ lw $ra, 0x0014($sp) +/* 015C4 80860C14 8FBF0014 */ lw $ra, 0x0014($sp) /* 015C8 80860C18 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 015CC 80860C1C 03E00008 */ jr $ra +/* 015CC 80860C1C 03E00008 */ jr $ra /* 015D0 80860C20 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Test/func_80860EC0.s b/asm/non_matchings/overlays/actors/ovl_En_Test/func_80860EC0.s index a0341b07a9..693eb433a3 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Test/func_80860EC0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Test/func_80860EC0.s @@ -1,11 +1,11 @@ glabel func_80860EC0 /* 01870 80860EC0 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 01874 80860EC4 AFB00018 */ sw $s0, 0x0018($sp) +/* 01874 80860EC4 AFB00018 */ sw $s0, 0x0018($sp) /* 01878 80860EC8 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 0187C 80860ECC AFBF001C */ sw $ra, 0x001C($sp) +/* 0187C 80860ECC AFBF001C */ sw $ra, 0x001C($sp) /* 01880 80860ED0 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 /* 01884 80860ED4 24A5E2B0 */ addiu $a1, $a1, 0xE2B0 ## $a1 = 0600E2B0 -/* 01888 80860ED8 0C0294BE */ jal func_800A52F8 +/* 01888 80860ED8 0C0294BE */ jal SkelAnime_ChangeAnimDefaultRepeat /* 0188C 80860EDC 24840188 */ addiu $a0, $a0, 0x0188 ## $a0 = 00000188 /* 01890 80860EE0 240E000F */ addiu $t6, $zero, 0x000F ## $t6 = 0000000F /* 01894 80860EE4 0C03F66B */ jal Math_Rand_ZeroOne @@ -14,12 +14,12 @@ glabel func_80860EC0 /* 0189C 80860EEC 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 /* 018A0 80860EF0 44811000 */ mtc1 $at, $f2 ## $f2 = 0.50 /* 018A4 80860EF4 3C01BF00 */ lui $at, 0xBF00 ## $at = BF000000 -/* 018A8 80860EF8 4600103C */ c.lt.s $f2, $f0 +/* 018A8 80860EF8 4600103C */ c.lt.s $f2, $f0 /* 018AC 80860EFC 00000000 */ nop -/* 018B0 80860F00 45020005 */ bc1fl .L80860F18 +/* 018B0 80860F00 45020005 */ bc1fl .L80860F18 /* 018B4 80860F04 E6020068 */ swc1 $f2, 0x0068($s0) ## 00000068 /* 018B8 80860F08 44812000 */ mtc1 $at, $f4 ## $f4 = -0.50 -/* 018BC 80860F0C 10000002 */ beq $zero, $zero, .L80860F18 +/* 018BC 80860F0C 10000002 */ beq $zero, $zero, .L80860F18 /* 018C0 80860F10 E6040068 */ swc1 $f4, 0x0068($s0) ## 00000068 /* 018C4 80860F14 E6020068 */ swc1 $f2, 0x0068($s0) ## 00000068 .L80860F18: @@ -30,26 +30,26 @@ glabel func_80860EC0 /* 018D4 80860F24 44813000 */ mtc1 $at, $f6 ## $f6 = 15.00 /* 018D8 80860F28 3C0141C8 */ lui $at, 0x41C8 ## $at = 41C80000 /* 018DC 80860F2C 44815000 */ mtc1 $at, $f10 ## $f10 = 25.00 -/* 018E0 80860F30 46060202 */ mul.s $f8, $f0, $f6 +/* 018E0 80860F30 46060202 */ mul.s $f8, $f0, $f6 /* 018E4 80860F34 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 /* 018E8 80860F38 860900B6 */ lh $t1, 0x00B6($s0) ## 000000B6 /* 018EC 80860F3C 3C058086 */ lui $a1, %hi(func_80860F84) ## $a1 = 80860000 /* 018F0 80860F40 24A50F84 */ addiu $a1, $a1, %lo(func_80860F84) ## $a1 = 80860F84 /* 018F4 80860F44 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 018F8 80860F48 E60407EC */ swc1 $f4, 0x07EC($s0) ## 000007EC -/* 018FC 80860F4C 460A4400 */ add.s $f16, $f8, $f10 +/* 018FC 80860F4C 460A4400 */ add.s $f16, $f8, $f10 /* 01900 80860F50 A6090032 */ sh $t1, 0x0032($s0) ## 00000032 -/* 01904 80860F54 4600848D */ trunc.w.s $f18, $f16 -/* 01908 80860F58 44189000 */ mfc1 $t8, $f18 +/* 01904 80860F54 4600848D */ trunc.w.s $f18, $f16 +/* 01908 80860F58 44189000 */ mfc1 $t8, $f18 /* 0190C 80860F5C 00000000 */ nop -/* 01910 80860F60 0018CC00 */ sll $t9, $t8, 16 -/* 01914 80860F64 00194403 */ sra $t0, $t9, 16 -/* 01918 80860F68 0C217D94 */ jal func_8085F650 +/* 01910 80860F60 0018CC00 */ sll $t9, $t8, 16 +/* 01914 80860F64 00194403 */ sra $t0, $t9, 16 +/* 01918 80860F68 0C217D94 */ jal func_8085F650 /* 0191C 80860F6C AE0807E8 */ sw $t0, 0x07E8($s0) ## 000007E8 -/* 01920 80860F70 8FBF001C */ lw $ra, 0x001C($sp) -/* 01924 80860F74 8FB00018 */ lw $s0, 0x0018($sp) +/* 01920 80860F70 8FBF001C */ lw $ra, 0x001C($sp) +/* 01924 80860F74 8FB00018 */ lw $s0, 0x0018($sp) /* 01928 80860F78 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 0192C 80860F7C 03E00008 */ jr $ra +/* 0192C 80860F7C 03E00008 */ jr $ra /* 01930 80860F80 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Test/func_80861418.s b/asm/non_matchings/overlays/actors/ovl_En_Test/func_80861418.s index fcc44027ef..9940ffb29d 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Test/func_80861418.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Test/func_80861418.s @@ -1,14 +1,14 @@ glabel func_80861418 /* 01DC8 80861418 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 01DCC 8086141C AFB00018 */ sw $s0, 0x0018($sp) +/* 01DCC 8086141C AFB00018 */ sw $s0, 0x0018($sp) /* 01DD0 80861420 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 01DD4 80861424 AFBF001C */ sw $ra, 0x001C($sp) +/* 01DD4 80861424 AFBF001C */ sw $ra, 0x001C($sp) /* 01DD8 80861428 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 /* 01DDC 8086142C 24A5B00C */ addiu $a1, $a1, 0xB00C ## $a1 = 0600B00C -/* 01DE0 80861430 0C02947A */ jal func_800A51E8 +/* 01DE0 80861430 0C02947A */ jal SkelAnime_ChangeAnimDefaultStop /* 01DE4 80861434 24840188 */ addiu $a0, $a0, 0x0188 ## $a0 = 00000188 /* 01DE8 80861438 260400E4 */ addiu $a0, $s0, 0x00E4 ## $a0 = 000000E4 -/* 01DEC 8086143C 0C03E291 */ jal func_800F8A44 +/* 01DEC 8086143C 0C03E291 */ jal func_800F8A44 /* 01DF0 80861440 24053838 */ addiu $a1, $zero, 0x3838 ## $a1 = 00003838 /* 01DF4 80861444 920E086C */ lbu $t6, 0x086C($s0) ## 0000086C /* 01DF8 80861448 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 @@ -19,19 +19,19 @@ glabel func_80861418 /* 01E0C 8086145C A21807C8 */ sb $t8, 0x07C8($s0) ## 000007C8 /* 01E10 80861460 24A5149C */ addiu $a1, $a1, %lo(func_8086149C) ## $a1 = 8086149C /* 01E14 80861464 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01E18 80861468 0C217D94 */ jal func_8085F650 +/* 01E18 80861468 0C217D94 */ jal func_8085F650 /* 01E1C 8086146C E6040068 */ swc1 $f4, 0x0068($s0) ## 00000068 /* 01E20 80861470 920807DE */ lbu $t0, 0x07DE($s0) ## 000007DE /* 01E24 80861474 24190010 */ addiu $t9, $zero, 0x0010 ## $t9 = 00000010 /* 01E28 80861478 A2190879 */ sb $t9, 0x0879($s0) ## 00000879 -/* 01E2C 8086147C 11000002 */ beq $t0, $zero, .L80861488 +/* 01E2C 8086147C 11000002 */ beq $t0, $zero, .L80861488 /* 01E30 80861480 24090003 */ addiu $t1, $zero, 0x0003 ## $t1 = 00000003 /* 01E34 80861484 A20907DE */ sb $t1, 0x07DE($s0) ## 000007DE .L80861488: -/* 01E38 80861488 8FBF001C */ lw $ra, 0x001C($sp) -/* 01E3C 8086148C 8FB00018 */ lw $s0, 0x0018($sp) +/* 01E38 80861488 8FBF001C */ lw $ra, 0x001C($sp) +/* 01E3C 8086148C 8FB00018 */ lw $s0, 0x0018($sp) /* 01E40 80861490 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 01E44 80861494 03E00008 */ jr $ra +/* 01E44 80861494 03E00008 */ jr $ra /* 01E48 80861498 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Test/func_808615A4.s b/asm/non_matchings/overlays/actors/ovl_En_Test/func_808615A4.s index 307d013769..efafa31d40 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Test/func_808615A4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Test/func_808615A4.s @@ -1,23 +1,23 @@ glabel func_808615A4 /* 01F54 808615A4 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 01F58 808615A8 AFBF0014 */ sw $ra, 0x0014($sp) +/* 01F58 808615A8 AFBF0014 */ sw $ra, 0x0014($sp) /* 01F5C 808615AC 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 /* 01F60 808615B0 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 /* 01F64 808615B4 24A5B4E4 */ addiu $a1, $a1, 0xB4E4 ## $a1 = 0600B4E4 -/* 01F68 808615B8 AFA60018 */ sw $a2, 0x0018($sp) -/* 01F6C 808615BC 0C02947A */ jal func_800A51E8 +/* 01F68 808615B8 AFA60018 */ sw $a2, 0x0018($sp) +/* 01F6C 808615BC 0C02947A */ jal SkelAnime_ChangeAnimDefaultStop /* 01F70 808615C0 24840188 */ addiu $a0, $a0, 0x0188 ## $a0 = 00000188 -/* 01F74 808615C4 8FA40018 */ lw $a0, 0x0018($sp) +/* 01F74 808615C4 8FA40018 */ lw $a0, 0x0018($sp) /* 01F78 808615C8 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 /* 01F7C 808615CC 240E0012 */ addiu $t6, $zero, 0x0012 ## $t6 = 00000012 /* 01F80 808615D0 3C058086 */ lui $a1, %hi(func_808615F4) ## $a1 = 80860000 /* 01F84 808615D4 24A515F4 */ addiu $a1, $a1, %lo(func_808615F4) ## $a1 = 808615F4 /* 01F88 808615D8 A08E07C8 */ sb $t6, 0x07C8($a0) ## 000007C8 -/* 01F8C 808615DC 0C217D94 */ jal func_8085F650 +/* 01F8C 808615DC 0C217D94 */ jal func_8085F650 /* 01F90 808615E0 E4840068 */ swc1 $f4, 0x0068($a0) ## 00000068 -/* 01F94 808615E4 8FBF0014 */ lw $ra, 0x0014($sp) +/* 01F94 808615E4 8FBF0014 */ lw $ra, 0x0014($sp) /* 01F98 808615E8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 01F9C 808615EC 03E00008 */ jr $ra +/* 01F9C 808615EC 03E00008 */ jr $ra /* 01FA0 808615F0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Test/func_8086181C.s b/asm/non_matchings/overlays/actors/ovl_En_Test/func_8086181C.s index 10078b2bc4..b555c87a95 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Test/func_8086181C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Test/func_8086181C.s @@ -1,13 +1,13 @@ glabel func_8086181C /* 021CC 8086181C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 021D0 80861820 AFBF0014 */ sw $ra, 0x0014($sp) +/* 021D0 80861820 AFBF0014 */ sw $ra, 0x0014($sp) /* 021D4 80861824 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 /* 021D8 80861828 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 /* 021DC 8086182C 24A5BE4C */ addiu $a1, $a1, 0xBE4C ## $a1 = 0600BE4C -/* 021E0 80861830 AFA60018 */ sw $a2, 0x0018($sp) -/* 021E4 80861834 0C02947A */ jal func_800A51E8 +/* 021E0 80861830 AFA60018 */ sw $a2, 0x0018($sp) +/* 021E4 80861834 0C02947A */ jal SkelAnime_ChangeAnimDefaultStop /* 021E8 80861838 24840188 */ addiu $a0, $a0, 0x0188 ## $a0 = 00000188 -/* 021EC 8086183C 8FA40018 */ lw $a0, 0x0018($sp) +/* 021EC 8086183C 8FA40018 */ lw $a0, 0x0018($sp) /* 021F0 80861840 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 /* 021F4 80861844 24180011 */ addiu $t8, $zero, 0x0011 ## $t8 = 00000011 /* 021F8 80861848 908E086C */ lbu $t6, 0x086C($a0) ## 0000086C @@ -18,18 +18,18 @@ glabel func_8086181C /* 0220C 8086185C A08F086C */ sb $t7, 0x086C($a0) ## 0000086C /* 02210 80861860 A09807C8 */ sb $t8, 0x07C8($a0) ## 000007C8 /* 02214 80861864 A0990879 */ sb $t9, 0x0879($a0) ## 00000879 -/* 02218 80861868 0C217D94 */ jal func_8085F650 +/* 02218 80861868 0C217D94 */ jal func_8085F650 /* 0221C 8086186C E4840068 */ swc1 $f4, 0x0068($a0) ## 00000068 -/* 02220 80861870 8FA60018 */ lw $a2, 0x0018($sp) +/* 02220 80861870 8FA60018 */ lw $a2, 0x0018($sp) /* 02224 80861874 24090003 */ addiu $t1, $zero, 0x0003 ## $t1 = 00000003 /* 02228 80861878 90C807DE */ lbu $t0, 0x07DE($a2) ## 000007DE -/* 0222C 8086187C 51000003 */ beql $t0, $zero, .L8086188C -/* 02230 80861880 8FBF0014 */ lw $ra, 0x0014($sp) +/* 0222C 8086187C 51000003 */ beql $t0, $zero, .L8086188C +/* 02230 80861880 8FBF0014 */ lw $ra, 0x0014($sp) /* 02234 80861884 A0C907DE */ sb $t1, 0x07DE($a2) ## 000007DE -/* 02238 80861888 8FBF0014 */ lw $ra, 0x0014($sp) +/* 02238 80861888 8FBF0014 */ lw $ra, 0x0014($sp) .L8086188C: /* 0223C 8086188C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 02240 80861890 03E00008 */ jr $ra +/* 02240 80861890 03E00008 */ jr $ra /* 02244 80861894 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Test/func_8086194C.s b/asm/non_matchings/overlays/actors/ovl_En_Test/func_8086194C.s index 03b2fb86f6..0df30555ee 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Test/func_8086194C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Test/func_8086194C.s @@ -1,15 +1,15 @@ glabel func_8086194C /* 022FC 8086194C 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 02300 80861950 AFB00018 */ sw $s0, 0x0018($sp) +/* 02300 80861950 AFB00018 */ sw $s0, 0x0018($sp) /* 02304 80861954 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 02308 80861958 AFBF001C */ sw $ra, 0x001C($sp) +/* 02308 80861958 AFBF001C */ sw $ra, 0x001C($sp) /* 0230C 8086195C 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 02310 80861960 24A51978 */ addiu $a1, $a1, 0x1978 ## $a1 = 06001978 -/* 02314 80861964 0C02947A */ jal func_800A51E8 +/* 02314 80861964 0C02947A */ jal SkelAnime_ChangeAnimDefaultStop /* 02318 80861968 24840188 */ addiu $a0, $a0, 0x0188 ## $a0 = 00000188 /* 0231C 8086196C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 02320 80861970 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 02324 80861974 2405386C */ addiu $a1, $zero, 0x386C ## $a1 = 0000386C /* 02328 80861978 240E0014 */ addiu $t6, $zero, 0x0014 ## $t6 = 00000014 /* 0232C 8086197C 240F0005 */ addiu $t7, $zero, 0x0005 ## $t7 = 00000005 @@ -17,20 +17,20 @@ glabel func_8086194C /* 02334 80861984 A20E07C8 */ sb $t6, 0x07C8($s0) ## 000007C8 /* 02338 80861988 AE0F07E8 */ sw $t7, 0x07E8($s0) ## 000007E8 /* 0233C 8086198C 24A519EC */ addiu $a1, $a1, %lo(func_808619EC) ## $a1 = 808619EC -/* 02340 80861990 0C217D94 */ jal func_8085F650 +/* 02340 80861990 0C217D94 */ jal func_8085F650 /* 02344 80861994 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 02348 80861998 921807DE */ lbu $t8, 0x07DE($s0) ## 000007DE /* 0234C 8086199C 24190003 */ addiu $t9, $zero, 0x0003 ## $t9 = 00000003 -/* 02350 808619A0 53000003 */ beql $t8, $zero, .L808619B0 +/* 02350 808619A0 53000003 */ beql $t8, $zero, .L808619B0 /* 02354 808619A4 8608001C */ lh $t0, 0x001C($s0) ## 0000001C /* 02358 808619A8 A21907DE */ sb $t9, 0x07DE($s0) ## 000007DE /* 0235C 808619AC 8608001C */ lh $t0, 0x001C($s0) ## 0000001C .L808619B0: /* 02360 808619B0 24010003 */ addiu $at, $zero, 0x0003 ## $at = 00000003 -/* 02364 808619B4 11010004 */ beq $t0, $at, .L808619C8 +/* 02364 808619B4 11010004 */ beq $t0, $at, .L808619C8 /* 02368 808619B8 3C01C130 */ lui $at, 0xC130 ## $at = C1300000 /* 0236C 808619BC 44812000 */ mtc1 $at, $f4 ## $f4 = -11.00 -/* 02370 808619C0 10000005 */ beq $zero, $zero, .L808619D8 +/* 02370 808619C0 10000005 */ beq $zero, $zero, .L808619D8 /* 02374 808619C4 E6040068 */ swc1 $f4, 0x0068($s0) ## 00000068 .L808619C8: /* 02378 808619C8 3C01C0E0 */ lui $at, 0xC0E0 ## $at = C0E00000 @@ -38,10 +38,10 @@ glabel func_8086194C /* 02380 808619D0 00000000 */ nop /* 02384 808619D4 E6060068 */ swc1 $f6, 0x0068($s0) ## 00000068 .L808619D8: -/* 02388 808619D8 8FBF001C */ lw $ra, 0x001C($sp) -/* 0238C 808619DC 8FB00018 */ lw $s0, 0x0018($sp) +/* 02388 808619D8 8FBF001C */ lw $ra, 0x001C($sp) +/* 0238C 808619DC 8FB00018 */ lw $s0, 0x0018($sp) /* 02390 808619E0 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 02394 808619E4 03E00008 */ jr $ra +/* 02394 808619E4 03E00008 */ jr $ra /* 02398 808619E8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Test/func_80861B94.s b/asm/non_matchings/overlays/actors/ovl_En_Test/func_80861B94.s index d9ce008b2b..bae8c8e026 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Test/func_80861B94.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Test/func_80861B94.s @@ -1,14 +1,14 @@ glabel func_80861B94 /* 02544 80861B94 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 02548 80861B98 AFB00018 */ sw $s0, 0x0018($sp) +/* 02548 80861B98 AFB00018 */ sw $s0, 0x0018($sp) /* 0254C 80861B9C 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 02550 80861BA0 AFBF001C */ sw $ra, 0x001C($sp) +/* 02550 80861BA0 AFBF001C */ sw $ra, 0x001C($sp) /* 02554 80861BA4 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 /* 02558 80861BA8 24A5A324 */ addiu $a1, $a1, 0xA324 ## $a1 = 0600A324 -/* 0255C 80861BAC 0C02947A */ jal func_800A51E8 +/* 0255C 80861BAC 0C02947A */ jal SkelAnime_ChangeAnimDefaultStop /* 02560 80861BB0 24840188 */ addiu $a0, $a0, 0x0188 ## $a0 = 00000188 /* 02564 80861BB4 260400E4 */ addiu $a0, $s0, 0x00E4 ## $a0 = 000000E4 -/* 02568 80861BB8 0C03E291 */ jal func_800F8A44 +/* 02568 80861BB8 0C03E291 */ jal func_800F8A44 /* 0256C 80861BBC 24053838 */ addiu $a1, $zero, 0x3838 ## $a1 = 00003838 /* 02570 80861BC0 3C014120 */ lui $at, 0x4120 ## $at = 41200000 /* 02574 80861BC4 44812000 */ mtc1 $at, $f4 ## $f4 = 10.00 @@ -21,7 +21,7 @@ glabel func_80861B94 /* 02590 80861BE0 2405386C */ addiu $a1, $zero, 0x386C ## $a1 = 0000386C /* 02594 80861BE4 E6040060 */ swc1 $f4, 0x0060($s0) ## 00000060 /* 02598 80861BE8 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 0259C 80861BEC E6060068 */ swc1 $f6, 0x0068($s0) ## 00000068 /* 025A0 80861BF0 9218086C */ lbu $t8, 0x086C($s0) ## 0000086C /* 025A4 80861BF4 860F00B6 */ lh $t7, 0x00B6($s0) ## 000000B6 @@ -30,19 +30,19 @@ glabel func_80861B94 /* 025B0 80861C00 A219086C */ sb $t9, 0x086C($s0) ## 0000086C /* 025B4 80861C04 24A51C40 */ addiu $a1, $a1, %lo(func_80861C40) ## $a1 = 80861C40 /* 025B8 80861C08 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 025BC 80861C0C 0C217D94 */ jal func_8085F650 +/* 025BC 80861C0C 0C217D94 */ jal func_8085F650 /* 025C0 80861C10 A60F0032 */ sh $t7, 0x0032($s0) ## 00000032 /* 025C4 80861C14 920907DE */ lbu $t1, 0x07DE($s0) ## 000007DE /* 025C8 80861C18 24080020 */ addiu $t0, $zero, 0x0020 ## $t0 = 00000020 /* 025CC 80861C1C A2080879 */ sb $t0, 0x0879($s0) ## 00000879 -/* 025D0 80861C20 11200002 */ beq $t1, $zero, .L80861C2C +/* 025D0 80861C20 11200002 */ beq $t1, $zero, .L80861C2C /* 025D4 80861C24 240A0003 */ addiu $t2, $zero, 0x0003 ## $t2 = 00000003 /* 025D8 80861C28 A20A07DE */ sb $t2, 0x07DE($s0) ## 000007DE .L80861C2C: -/* 025DC 80861C2C 8FBF001C */ lw $ra, 0x001C($sp) -/* 025E0 80861C30 8FB00018 */ lw $s0, 0x0018($sp) +/* 025DC 80861C2C 8FBF001C */ lw $ra, 0x001C($sp) +/* 025E0 80861C30 8FB00018 */ lw $s0, 0x0018($sp) /* 025E4 80861C34 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 025E8 80861C38 03E00008 */ jr $ra +/* 025E8 80861C38 03E00008 */ jr $ra /* 025EC 80861C3C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Test/func_80861C40.s b/asm/non_matchings/overlays/actors/ovl_En_Test/func_80861C40.s index 7d549111da..321405a82c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Test/func_80861C40.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Test/func_80861C40.s @@ -1,69 +1,69 @@ glabel func_80861C40 /* 025F0 80861C40 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 025F4 80861C44 AFB00018 */ sw $s0, 0x0018($sp) +/* 025F4 80861C44 AFB00018 */ sw $s0, 0x0018($sp) /* 025F8 80861C48 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 025FC 80861C4C AFBF001C */ sw $ra, 0x001C($sp) +/* 025FC 80861C4C AFBF001C */ sw $ra, 0x001C($sp) /* 02600 80861C50 24840188 */ addiu $a0, $a0, 0x0188 ## $a0 = 00000188 -/* 02604 80861C54 AFA5002C */ sw $a1, 0x002C($sp) +/* 02604 80861C54 AFA5002C */ sw $a1, 0x002C($sp) /* 02608 80861C58 0C02927F */ jal SkelAnime_FrameUpdateMatrix - -/* 0260C 80861C5C AFA40024 */ sw $a0, 0x0024($sp) -/* 02610 80861C60 10400016 */ beq $v0, $zero, .L80861CBC -/* 02614 80861C64 8FA40024 */ lw $a0, 0x0024($sp) + +/* 0260C 80861C5C AFA40024 */ sw $a0, 0x0024($sp) +/* 02610 80861C60 10400016 */ beq $v0, $zero, .L80861CBC +/* 02614 80861C64 8FA40024 */ lw $a0, 0x0024($sp) /* 02618 80861C68 8E0E07E8 */ lw $t6, 0x07E8($s0) ## 000007E8 /* 0261C 80861C6C 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 -/* 02620 80861C70 55C0000F */ bnel $t6, $zero, .L80861CB0 +/* 02620 80861C70 55C0000F */ bnel $t6, $zero, .L80861CB0 /* 02624 80861C74 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 -/* 02628 80861C78 0C02947A */ jal func_800A51E8 +/* 02628 80861C78 0C02947A */ jal SkelAnime_ChangeAnimDefaultStop /* 0262C 80861C7C 24A5A99C */ addiu $a1, $a1, 0xA99C ## $a1 = 0600A99C /* 02630 80861C80 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 /* 02634 80861C84 AE0207E8 */ sw $v0, 0x07E8($s0) ## 000007E8 /* 02638 80861C88 A2020808 */ sb $v0, 0x0808($s0) ## 00000808 /* 0263C 80861C8C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 02640 80861C90 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 02644 80861C94 24053839 */ addiu $a1, $zero, 0x3839 ## $a1 = 00003839 /* 02648 80861C98 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 0264C 80861C9C 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 02650 80861CA0 2405386C */ addiu $a1, $zero, 0x386C ## $a1 = 0000386C -/* 02654 80861CA4 10000006 */ beq $zero, $zero, .L80861CC0 +/* 02654 80861CA4 10000006 */ beq $zero, $zero, .L80861CC0 /* 02658 80861CA8 8E0F07E8 */ lw $t7, 0x07E8($s0) ## 000007E8 /* 0265C 80861CAC 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 .L80861CB0: /* 02660 80861CB0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02664 80861CB4 0C21801A */ jal func_80860068 +/* 02664 80861CB4 0C21801A */ jal func_80860068 /* 02668 80861CB8 E6040068 */ swc1 $f4, 0x0068($s0) ## 00000068 .L80861CBC: /* 0266C 80861CBC 8E0F07E8 */ lw $t7, 0x07E8($s0) ## 000007E8 .L80861CC0: /* 02670 80861CC0 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 -/* 02674 80861CC4 51E0000A */ beql $t7, $zero, .L80861CF0 +/* 02674 80861CC4 51E0000A */ beql $t7, $zero, .L80861CF0 /* 02678 80861CC8 C6000080 */ lwc1 $f0, 0x0080($s0) ## 00000080 /* 0267C 80861CCC C60601A0 */ lwc1 $f6, 0x01A0($s0) ## 000001A0 /* 02680 80861CD0 44814000 */ mtc1 $at, $f8 ## $f8 = 5.00 /* 02684 80861CD4 00000000 */ nop -/* 02688 80861CD8 4606403E */ c.le.s $f8, $f6 +/* 02688 80861CD8 4606403E */ c.le.s $f8, $f6 /* 0268C 80861CDC 00000000 */ nop -/* 02690 80861CE0 45020003 */ bc1fl .L80861CF0 +/* 02690 80861CE0 45020003 */ bc1fl .L80861CF0 /* 02694 80861CE4 C6000080 */ lwc1 $f0, 0x0080($s0) ## 00000080 /* 02698 80861CE8 A2000808 */ sb $zero, 0x0808($s0) ## 00000808 /* 0269C 80861CEC C6000080 */ lwc1 $f0, 0x0080($s0) ## 00000080 .L80861CF0: /* 026A0 80861CF0 C60A0028 */ lwc1 $f10, 0x0028($s0) ## 00000028 -/* 026A4 80861CF4 4600503E */ c.le.s $f10, $f0 +/* 026A4 80861CF4 4600503E */ c.le.s $f10, $f0 /* 026A8 80861CF8 00000000 */ nop -/* 026AC 80861CFC 45020010 */ bc1fl .L80861D40 -/* 026B0 80861D00 8FBF001C */ lw $ra, 0x001C($sp) +/* 026AC 80861CFC 45020010 */ bc1fl .L80861D40 +/* 026B0 80861D00 8FBF001C */ lw $ra, 0x001C($sp) /* 026B4 80861D04 44801000 */ mtc1 $zero, $f2 ## $f2 = 0.00 /* 026B8 80861D08 C6100068 */ lwc1 $f16, 0x0068($s0) ## 00000068 /* 026BC 80861D0C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 026C0 80861D10 46101032 */ c.eq.s $f2, $f16 +/* 026C0 80861D10 46101032 */ c.eq.s $f2, $f16 /* 026C4 80861D14 00000000 */ nop -/* 026C8 80861D18 45030006 */ bc1tl .L80861D34 +/* 026C8 80861D18 45030006 */ bc1tl .L80861D34 /* 026CC 80861D1C E6000028 */ swc1 $f0, 0x0028($s0) ## 00000028 /* 026D0 80861D20 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 026D4 80861D24 2405387B */ addiu $a1, $zero, 0x387B ## $a1 = 0000387B /* 026D8 80861D28 44801000 */ mtc1 $zero, $f2 ## $f2 = 0.00 /* 026DC 80861D2C C6000080 */ lwc1 $f0, 0x0080($s0) ## 00000080 @@ -71,11 +71,11 @@ glabel func_80861C40 .L80861D34: /* 026E4 80861D34 E6020060 */ swc1 $f2, 0x0060($s0) ## 00000060 /* 026E8 80861D38 E6020068 */ swc1 $f2, 0x0068($s0) ## 00000068 -/* 026EC 80861D3C 8FBF001C */ lw $ra, 0x001C($sp) +/* 026EC 80861D3C 8FBF001C */ lw $ra, 0x001C($sp) .L80861D40: -/* 026F0 80861D40 8FB00018 */ lw $s0, 0x0018($sp) +/* 026F0 80861D40 8FB00018 */ lw $s0, 0x0018($sp) /* 026F4 80861D44 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 026F8 80861D48 03E00008 */ jr $ra +/* 026F8 80861D48 03E00008 */ jr $ra /* 026FC 80861D4C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Test/func_80861D50.s b/asm/non_matchings/overlays/actors/ovl_En_Test/func_80861D50.s index 81fbf0ae17..bbf1eac4d4 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Test/func_80861D50.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Test/func_80861D50.s @@ -1,13 +1,13 @@ glabel func_80861D50 /* 02700 80861D50 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 02704 80861D54 AFBF0014 */ sw $ra, 0x0014($sp) +/* 02704 80861D54 AFBF0014 */ sw $ra, 0x0014($sp) /* 02708 80861D58 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 /* 0270C 80861D5C 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 /* 02710 80861D60 24A5A324 */ addiu $a1, $a1, 0xA324 ## $a1 = 0600A324 -/* 02714 80861D64 AFA60018 */ sw $a2, 0x0018($sp) -/* 02718 80861D68 0C02947A */ jal func_800A51E8 +/* 02714 80861D64 AFA60018 */ sw $a2, 0x0018($sp) +/* 02718 80861D68 0C02947A */ jal SkelAnime_ChangeAnimDefaultStop /* 0271C 80861D6C 24840188 */ addiu $a0, $a0, 0x0188 ## $a0 = 00000188 -/* 02720 80861D70 8FA40018 */ lw $a0, 0x0018($sp) +/* 02720 80861D70 8FA40018 */ lw $a0, 0x0018($sp) /* 02724 80861D74 3C014160 */ lui $at, 0x4160 ## $at = 41600000 /* 02728 80861D78 44812000 */ mtc1 $at, $f4 ## $f4 = 14.00 /* 0272C 80861D7C 3C0140C0 */ lui $at, 0x40C0 ## $at = 40C00000 @@ -18,17 +18,17 @@ glabel func_80861D50 /* 02740 80861D90 A08E07C8 */ sb $t6, 0x07C8($a0) ## 000007C8 /* 02744 80861D94 E4840060 */ swc1 $f4, 0x0060($a0) ## 00000060 /* 02748 80861D98 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 0274C 80861D9C E4860068 */ swc1 $f6, 0x0068($a0) ## 00000068 -/* 02750 80861DA0 8FA40018 */ lw $a0, 0x0018($sp) +/* 02750 80861DA0 8FA40018 */ lw $a0, 0x0018($sp) /* 02754 80861DA4 3C058086 */ lui $a1, %hi(func_80861DC8) ## $a1 = 80860000 /* 02758 80861DA8 24A51DC8 */ addiu $a1, $a1, %lo(func_80861DC8) ## $a1 = 80861DC8 /* 0275C 80861DAC 848F00B6 */ lh $t7, 0x00B6($a0) ## 000000B6 -/* 02760 80861DB0 0C217D94 */ jal func_8085F650 +/* 02760 80861DB0 0C217D94 */ jal func_8085F650 /* 02764 80861DB4 A48F0032 */ sh $t7, 0x0032($a0) ## 00000032 -/* 02768 80861DB8 8FBF0014 */ lw $ra, 0x0014($sp) +/* 02768 80861DB8 8FBF0014 */ lw $ra, 0x0014($sp) /* 0276C 80861DBC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 02770 80861DC0 03E00008 */ jr $ra +/* 02770 80861DC0 03E00008 */ jr $ra /* 02774 80861DC4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Test/func_80861DC8.s b/asm/non_matchings/overlays/actors/ovl_En_Test/func_80861DC8.s index 2d2ac77f62..59fdfa6990 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Test/func_80861DC8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Test/func_80861DC8.s @@ -1,43 +1,43 @@ glabel func_80861DC8 /* 02778 80861DC8 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 0277C 80861DCC AFB00028 */ sw $s0, 0x0028($sp) +/* 0277C 80861DCC AFB00028 */ sw $s0, 0x0028($sp) /* 02780 80861DD0 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 02784 80861DD4 AFBF002C */ sw $ra, 0x002C($sp) -/* 02788 80861DD8 AFA5003C */ sw $a1, 0x003C($sp) +/* 02784 80861DD4 AFBF002C */ sw $ra, 0x002C($sp) +/* 02788 80861DD8 AFA5003C */ sw $a1, 0x003C($sp) /* 0278C 80861DDC 8605008A */ lh $a1, 0x008A($s0) ## 0000008A /* 02790 80861DE0 240E0001 */ addiu $t6, $zero, 0x0001 ## $t6 = 00000001 -/* 02794 80861DE4 AFAE0010 */ sw $t6, 0x0010($sp) +/* 02794 80861DE4 AFAE0010 */ sw $t6, 0x0010($sp) /* 02798 80861DE8 248400B6 */ addiu $a0, $a0, 0x00B6 ## $a0 = 000000B6 /* 0279C 80861DEC 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 /* 027A0 80861DF0 0C01E1A7 */ jal Math_SmoothScaleMaxMinS - + /* 027A4 80861DF4 24070FA0 */ addiu $a3, $zero, 0x0FA0 ## $a3 = 00000FA0 /* 027A8 80861DF8 26040188 */ addiu $a0, $s0, 0x0188 ## $a0 = 00000188 /* 027AC 80861DFC 0C02927F */ jal SkelAnime_FrameUpdateMatrix - -/* 027B0 80861E00 AFA40034 */ sw $a0, 0x0034($sp) + +/* 027B0 80861E00 AFA40034 */ sw $a0, 0x0034($sp) /* 027B4 80861E04 C6040080 */ lwc1 $f4, 0x0080($s0) ## 00000080 /* 027B8 80861E08 C6060028 */ lwc1 $f6, 0x0028($s0) ## 00000028 /* 027BC 80861E0C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 027C0 80861E10 4604303E */ c.le.s $f6, $f4 +/* 027C0 80861E10 4604303E */ c.le.s $f6, $f4 /* 027C4 80861E14 00000000 */ nop -/* 027C8 80861E18 45020025 */ bc1fl .L80861EB0 -/* 027CC 80861E1C 8FBF002C */ lw $ra, 0x002C($sp) +/* 027C8 80861E18 45020025 */ bc1fl .L80861EB0 +/* 027CC 80861E1C 8FBF002C */ lw $ra, 0x002C($sp) /* 027D0 80861E20 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 027D4 80861E24 2405387B */ addiu $a1, $zero, 0x387B ## $a1 = 0000387B /* 027D8 80861E28 C60A0060 */ lwc1 $f10, 0x0060($s0) ## 00000060 /* 027DC 80861E2C 860F008A */ lh $t7, 0x008A($s0) ## 0000008A /* 027E0 80861E30 C6080080 */ lwc1 $f8, 0x0080($s0) ## 00000080 -/* 027E4 80861E34 4600540D */ trunc.w.s $f16, $f10 +/* 027E4 80861E34 4600540D */ trunc.w.s $f16, $f10 /* 027E8 80861E38 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 /* 027EC 80861E3C 2408000C */ addiu $t0, $zero, 0x000C ## $t0 = 0000000C /* 027F0 80861E40 24090004 */ addiu $t1, $zero, 0x0004 ## $t1 = 00000004 -/* 027F4 80861E44 44028000 */ mfc1 $v0, $f16 +/* 027F4 80861E44 44028000 */ mfc1 $v0, $f16 /* 027F8 80861E48 A60F00B6 */ sh $t7, 0x00B6($s0) ## 000000B6 /* 027FC 80861E4C E6080028 */ swc1 $f8, 0x0028($s0) ## 00000028 -/* 02800 80861E50 00021023 */ subu $v0, $zero, $v0 -/* 02804 80861E54 14400003 */ bne $v0, $zero, .L80861E64 +/* 02800 80861E50 00021023 */ subu $v0, $zero, $v0 +/* 02804 80861E54 14400003 */ bne $v0, $zero, .L80861E64 /* 02808 80861E58 AE0207E4 */ sw $v0, 0x07E4($s0) ## 000007E4 /* 0280C 80861E5C 24190001 */ addiu $t9, $zero, 0x0001 ## $t9 = 00000001 /* 02810 80861E60 AE1907E4 */ sw $t9, 0x07E4($s0) ## 000007E4 @@ -47,25 +47,25 @@ glabel func_80861DC8 /* 0281C 80861E6C A20807C8 */ sb $t0, 0x07C8($s0) ## 000007C8 /* 02820 80861E70 AE0907E8 */ sw $t1, 0x07E8($s0) ## 000007E8 /* 02824 80861E74 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 -/* 02828 80861E78 44060000 */ mfc1 $a2, $f0 -/* 0282C 80861E7C 44070000 */ mfc1 $a3, $f0 +/* 02828 80861E78 44060000 */ mfc1 $a2, $f0 +/* 0282C 80861E7C 44070000 */ mfc1 $a3, $f0 /* 02830 80861E80 240A0002 */ addiu $t2, $zero, 0x0002 ## $t2 = 00000002 -/* 02834 80861E84 AFAA0014 */ sw $t2, 0x0014($sp) +/* 02834 80861E84 AFAA0014 */ sw $t2, 0x0014($sp) /* 02838 80861E88 24A5C438 */ addiu $a1, $a1, 0xC438 ## $a1 = 0600C438 -/* 0283C 80861E8C E7A00018 */ swc1 $f0, 0x0018($sp) -/* 02840 80861E90 E7A00010 */ swc1 $f0, 0x0010($sp) -/* 02844 80861E94 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 02848 80861E98 8FA40034 */ lw $a0, 0x0034($sp) +/* 0283C 80861E8C E7A00018 */ swc1 $f0, 0x0018($sp) +/* 02840 80861E90 E7A00010 */ swc1 $f0, 0x0010($sp) +/* 02844 80861E94 0C029468 */ jal SkelAnime_ChangeAnim + +/* 02848 80861E98 8FA40034 */ lw $a0, 0x0034($sp) /* 0284C 80861E9C 3C058086 */ lui $a1, %hi(func_808603CC) ## $a1 = 80860000 /* 02850 80861EA0 24A503CC */ addiu $a1, $a1, %lo(func_808603CC) ## $a1 = 808603CC -/* 02854 80861EA4 0C217D94 */ jal func_8085F650 +/* 02854 80861EA4 0C217D94 */ jal func_8085F650 /* 02858 80861EA8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0285C 80861EAC 8FBF002C */ lw $ra, 0x002C($sp) +/* 0285C 80861EAC 8FBF002C */ lw $ra, 0x002C($sp) .L80861EB0: -/* 02860 80861EB0 8FB00028 */ lw $s0, 0x0028($sp) +/* 02860 80861EB0 8FB00028 */ lw $s0, 0x0028($sp) /* 02864 80861EB4 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 -/* 02868 80861EB8 03E00008 */ jr $ra +/* 02868 80861EB8 03E00008 */ jr $ra /* 0286C 80861EBC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Test/func_80861EC0.s b/asm/non_matchings/overlays/actors/ovl_En_Test/func_80861EC0.s index 040f8f809e..83472167d6 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Test/func_80861EC0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Test/func_80861EC0.s @@ -1,27 +1,27 @@ glabel func_80861EC0 /* 02870 80861EC0 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 02874 80861EC4 AFB00028 */ sw $s0, 0x0028($sp) +/* 02874 80861EC4 AFB00028 */ sw $s0, 0x0028($sp) /* 02878 80861EC8 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 0287C 80861ECC AFBF002C */ sw $ra, 0x002C($sp) +/* 0287C 80861ECC AFBF002C */ sw $ra, 0x002C($sp) /* 02880 80861ED0 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 /* 02884 80861ED4 0C028800 */ jal SkelAnime_GetFrameCount - + /* 02888 80861ED8 24841C20 */ addiu $a0, $a0, 0x1C20 ## $a0 = 06001C20 /* 0288C 80861EDC 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 02890 80861EE0 3C014000 */ lui $at, 0x4000 ## $at = 40000000 /* 02894 80861EE4 44810000 */ mtc1 $at, $f0 ## $f0 = 2.00 -/* 02898 80861EE8 468021A0 */ cvt.s.w $f6, $f4 +/* 02898 80861EE8 468021A0 */ cvt.s.w $f6, $f4 /* 0289C 80861EEC 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 028A0 80861EF0 240E0002 */ addiu $t6, $zero, 0x0002 ## $t6 = 00000002 -/* 028A4 80861EF4 44060000 */ mfc1 $a2, $f0 -/* 028A8 80861EF8 AFAE0014 */ sw $t6, 0x0014($sp) +/* 028A4 80861EF4 44060000 */ mfc1 $a2, $f0 +/* 028A8 80861EF8 AFAE0014 */ sw $t6, 0x0014($sp) /* 028AC 80861EFC 24A51C20 */ addiu $a1, $a1, 0x1C20 ## $a1 = 06001C20 -/* 028B0 80861F00 E7A60010 */ swc1 $f6, 0x0010($sp) +/* 028B0 80861F00 E7A60010 */ swc1 $f6, 0x0010($sp) /* 028B4 80861F04 26040188 */ addiu $a0, $s0, 0x0188 ## $a0 = 00000188 /* 028B8 80861F08 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 028BC 80861F0C 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 028C0 80861F10 E7A00018 */ swc1 $f0, 0x0018($sp) +/* 028BC 80861F0C 0C029468 */ jal SkelAnime_ChangeAnim + +/* 028C0 80861F10 E7A00018 */ swc1 $f0, 0x0018($sp) /* 028C4 80861F14 44804000 */ mtc1 $zero, $f8 ## $f8 = 0.00 /* 028C8 80861F18 240F0015 */ addiu $t7, $zero, 0x0015 ## $t7 = 00000015 /* 028CC 80861F1C A20F07C8 */ sb $t7, 0x07C8($s0) ## 000007C8 @@ -32,23 +32,23 @@ glabel func_80861EC0 /* 028DC 80861F2C 44815000 */ mtc1 $at, $f10 ## $f10 = 10.00 /* 028E0 80861F30 3C014130 */ lui $at, 0x4130 ## $at = 41300000 /* 028E4 80861F34 44819000 */ mtc1 $at, $f18 ## $f18 = 11.00 -/* 028E8 80861F38 460A0402 */ mul.s $f16, $f0, $f10 +/* 028E8 80861F38 460A0402 */ mul.s $f16, $f0, $f10 /* 028EC 80861F3C 860800B6 */ lh $t0, 0x00B6($s0) ## 000000B6 /* 028F0 80861F40 24090005 */ addiu $t1, $zero, 0x0005 ## $t1 = 00000005 /* 028F4 80861F44 3C058086 */ lui $a1, %hi(func_80861F80) ## $a1 = 80860000 /* 028F8 80861F48 A20907DE */ sb $t1, 0x07DE($s0) ## 000007DE /* 028FC 80861F4C 24A51F80 */ addiu $a1, $a1, %lo(func_80861F80) ## $a1 = 80861F80 /* 02900 80861F50 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02904 80861F54 46128100 */ add.s $f4, $f16, $f18 +/* 02904 80861F54 46128100 */ add.s $f4, $f16, $f18 /* 02908 80861F58 A6080032 */ sh $t0, 0x0032($s0) ## 00000032 -/* 0290C 80861F5C 4600218D */ trunc.w.s $f6, $f4 -/* 02910 80861F60 44193000 */ mfc1 $t9, $f6 -/* 02914 80861F64 0C217D94 */ jal func_8085F650 +/* 0290C 80861F5C 4600218D */ trunc.w.s $f6, $f4 +/* 02910 80861F60 44193000 */ mfc1 $t9, $f6 +/* 02914 80861F64 0C217D94 */ jal func_8085F650 /* 02918 80861F68 AE1907E8 */ sw $t9, 0x07E8($s0) ## 000007E8 -/* 0291C 80861F6C 8FBF002C */ lw $ra, 0x002C($sp) -/* 02920 80861F70 8FB00028 */ lw $s0, 0x0028($sp) +/* 0291C 80861F6C 8FBF002C */ lw $ra, 0x002C($sp) +/* 02920 80861F70 8FB00028 */ lw $s0, 0x0028($sp) /* 02924 80861F74 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 02928 80861F78 03E00008 */ jr $ra +/* 02928 80861F78 03E00008 */ jr $ra /* 0292C 80861F7C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Test/func_80862050.s b/asm/non_matchings/overlays/actors/ovl_En_Test/func_80862050.s index 6741abe5d0..fc7ad8419f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Test/func_80862050.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Test/func_80862050.s @@ -1,22 +1,22 @@ glabel func_80862050 /* 02A00 80862050 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 02A04 80862054 AFBF0014 */ sw $ra, 0x0014($sp) +/* 02A04 80862054 AFBF0014 */ sw $ra, 0x0014($sp) /* 02A08 80862058 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 /* 02A0C 8086205C 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 02A10 80862060 24A5316C */ addiu $a1, $a1, 0x316C ## $a1 = 0600316C -/* 02A14 80862064 AFA70018 */ sw $a3, 0x0018($sp) +/* 02A14 80862064 AFA70018 */ sw $a3, 0x0018($sp) /* 02A18 80862068 24840188 */ addiu $a0, $a0, 0x0188 ## $a0 = 00000188 -/* 02A1C 8086206C 0C0294D3 */ jal func_800A534C +/* 02A1C 8086206C 0C0294D3 */ jal SkelAnime_ChangeAnimTransitionRepeat /* 02A20 80862070 3C06C080 */ lui $a2, 0xC080 ## $a2 = C0800000 -/* 02A24 80862074 8FA40018 */ lw $a0, 0x0018($sp) +/* 02A24 80862074 8FA40018 */ lw $a0, 0x0018($sp) /* 02A28 80862078 240E0016 */ addiu $t6, $zero, 0x0016 ## $t6 = 00000016 /* 02A2C 8086207C 3C058086 */ lui $a1, %hi(func_8086209C) ## $a1 = 80860000 /* 02A30 80862080 24A5209C */ addiu $a1, $a1, %lo(func_8086209C) ## $a1 = 8086209C -/* 02A34 80862084 0C217D94 */ jal func_8085F650 +/* 02A34 80862084 0C217D94 */ jal func_8085F650 /* 02A38 80862088 A08E07C8 */ sb $t6, 0x07C8($a0) ## 000007C8 -/* 02A3C 8086208C 8FBF0014 */ lw $ra, 0x0014($sp) +/* 02A3C 8086208C 8FBF0014 */ lw $ra, 0x0014($sp) /* 02A40 80862090 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 02A44 80862094 03E00008 */ jr $ra +/* 02A44 80862094 03E00008 */ jr $ra /* 02A48 80862098 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Test/func_80862154.s b/asm/non_matchings/overlays/actors/ovl_En_Test/func_80862154.s index 2459139401..450347604f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Test/func_80862154.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Test/func_80862154.s @@ -1,15 +1,15 @@ glabel func_80862154 /* 02B04 80862154 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 02B08 80862158 AFB00020 */ sw $s0, 0x0020($sp) +/* 02B08 80862158 AFB00020 */ sw $s0, 0x0020($sp) /* 02B0C 8086215C 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 02B10 80862160 AFBF0024 */ sw $ra, 0x0024($sp) +/* 02B10 80862160 AFBF0024 */ sw $ra, 0x0024($sp) /* 02B14 80862164 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 /* 02B18 80862168 24A58604 */ addiu $a1, $a1, 0x8604 ## $a1 = 06008604 -/* 02B1C 8086216C 0C02947A */ jal func_800A51E8 +/* 02B1C 8086216C 0C02947A */ jal SkelAnime_ChangeAnimDefaultStop /* 02B20 80862170 24840188 */ addiu $a0, $a0, 0x0188 ## $a0 = 00000188 /* 02B24 80862174 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 02B28 80862178 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 02B2C 8086217C 2405383A */ addiu $a1, $zero, 0x383A ## $a1 = 0000383A /* 02B30 80862180 3C01C000 */ lui $at, 0xC000 ## $at = C0000000 /* 02B34 80862184 44812000 */ mtc1 $at, $f4 ## $f4 = -2.00 @@ -17,20 +17,20 @@ glabel func_80862154 /* 02B3C 8086218C A20E07C8 */ sb $t6, 0x07C8($s0) ## 000007C8 /* 02B40 80862190 240F0008 */ addiu $t7, $zero, 0x0008 ## $t7 = 00000008 /* 02B44 80862194 E6040068 */ swc1 $f4, 0x0068($s0) ## 00000068 -/* 02B48 80862198 AFAF0010 */ sw $t7, 0x0010($sp) +/* 02B48 80862198 AFAF0010 */ sw $t7, 0x0010($sp) /* 02B4C 8086219C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 02B50 808621A0 24054000 */ addiu $a1, $zero, 0x4000 ## $a1 = 00004000 /* 02B54 808621A4 240600FF */ addiu $a2, $zero, 0x00FF ## $a2 = 000000FF -/* 02B58 808621A8 0C00D09B */ jal func_8003426C +/* 02B58 808621A8 0C00D09B */ jal func_8003426C /* 02B5C 808621AC 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 /* 02B60 808621B0 3C058086 */ lui $a1, %hi(func_808621D4) ## $a1 = 80860000 /* 02B64 808621B4 24A521D4 */ addiu $a1, $a1, %lo(func_808621D4) ## $a1 = 808621D4 -/* 02B68 808621B8 0C217D94 */ jal func_8085F650 +/* 02B68 808621B8 0C217D94 */ jal func_8085F650 /* 02B6C 808621BC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02B70 808621C0 8FBF0024 */ lw $ra, 0x0024($sp) -/* 02B74 808621C4 8FB00020 */ lw $s0, 0x0020($sp) +/* 02B70 808621C0 8FBF0024 */ lw $ra, 0x0024($sp) +/* 02B74 808621C4 8FB00020 */ lw $s0, 0x0020($sp) /* 02B78 808621C8 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 02B7C 808621CC 03E00008 */ jr $ra +/* 02B7C 808621CC 03E00008 */ jr $ra /* 02B80 808621D0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Test/func_80862398.s b/asm/non_matchings/overlays/actors/ovl_En_Test/func_80862398.s index 49525d17fa..d6a57ca99b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Test/func_80862398.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Test/func_80862398.s @@ -1,15 +1,15 @@ glabel func_80862398 /* 02D48 80862398 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 02D4C 8086239C AFB00020 */ sw $s0, 0x0020($sp) +/* 02D4C 8086239C AFB00020 */ sw $s0, 0x0020($sp) /* 02D50 808623A0 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 02D54 808623A4 AFBF0024 */ sw $ra, 0x0024($sp) +/* 02D54 808623A4 AFBF0024 */ sw $ra, 0x0024($sp) /* 02D58 808623A8 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 02D5C 808623AC 24A50444 */ addiu $a1, $a1, 0x0444 ## $a1 = 06000444 -/* 02D60 808623B0 0C02947A */ jal func_800A51E8 +/* 02D60 808623B0 0C02947A */ jal SkelAnime_ChangeAnimDefaultStop /* 02D64 808623B4 24840188 */ addiu $a0, $a0, 0x0188 ## $a0 = 00000188 /* 02D68 808623B8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 02D6C 808623BC 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 02D70 808623C0 2405383A */ addiu $a1, $zero, 0x383A ## $a1 = 0000383A /* 02D74 808623C4 3C01C000 */ lui $at, 0xC000 ## $at = C0000000 /* 02D78 808623C8 44812000 */ mtc1 $at, $f4 ## $f4 = -2.00 @@ -17,20 +17,20 @@ glabel func_80862398 /* 02D80 808623D0 A20E07C8 */ sb $t6, 0x07C8($s0) ## 000007C8 /* 02D84 808623D4 240F0008 */ addiu $t7, $zero, 0x0008 ## $t7 = 00000008 /* 02D88 808623D8 E6040068 */ swc1 $f4, 0x0068($s0) ## 00000068 -/* 02D8C 808623DC AFAF0010 */ sw $t7, 0x0010($sp) +/* 02D8C 808623DC AFAF0010 */ sw $t7, 0x0010($sp) /* 02D90 808623E0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 02D94 808623E4 24054000 */ addiu $a1, $zero, 0x4000 ## $a1 = 00004000 /* 02D98 808623E8 240600FF */ addiu $a2, $zero, 0x00FF ## $a2 = 000000FF -/* 02D9C 808623EC 0C00D09B */ jal func_8003426C +/* 02D9C 808623EC 0C00D09B */ jal func_8003426C /* 02DA0 808623F0 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 /* 02DA4 808623F4 3C058086 */ lui $a1, %hi(func_80862418) ## $a1 = 80860000 /* 02DA8 808623F8 24A52418 */ addiu $a1, $a1, %lo(func_80862418) ## $a1 = 80862418 -/* 02DAC 808623FC 0C217D94 */ jal func_8085F650 +/* 02DAC 808623FC 0C217D94 */ jal func_8085F650 /* 02DB0 80862400 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02DB4 80862404 8FBF0024 */ lw $ra, 0x0024($sp) -/* 02DB8 80862408 8FB00020 */ lw $s0, 0x0020($sp) +/* 02DB4 80862404 8FBF0024 */ lw $ra, 0x0024($sp) +/* 02DB8 80862408 8FB00020 */ lw $s0, 0x0020($sp) /* 02DBC 8086240C 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 02DC0 80862410 03E00008 */ jr $ra +/* 02DC0 80862410 03E00008 */ jr $ra /* 02DC4 80862414 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Test/func_80862578.s b/asm/non_matchings/overlays/actors/ovl_En_Test/func_80862578.s index 1c0a674b65..67d540a5e8 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Test/func_80862578.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Test/func_80862578.s @@ -1,7 +1,7 @@ glabel func_80862578 /* 02F28 80862578 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 02F2C 8086257C AFB00020 */ sw $s0, 0x0020($sp) -/* 02F30 80862580 AFBF0024 */ sw $ra, 0x0024($sp) +/* 02F2C 8086257C AFB00020 */ sw $s0, 0x0020($sp) +/* 02F30 80862580 AFBF0024 */ sw $ra, 0x0024($sp) /* 02F34 80862584 3C01C080 */ lui $at, 0xC080 ## $at = C0800000 /* 02F38 80862588 44813000 */ mtc1 $at, $f6 ## $f6 = -4.00 /* 02F3C 8086258C 908F07E2 */ lbu $t7, 0x07E2($a0) ## 000007E2 @@ -13,50 +13,50 @@ glabel func_80862578 /* 02F54 808625A4 A08007DE */ sb $zero, 0x07DE($a0) ## 000007DE /* 02F58 808625A8 A0800808 */ sb $zero, 0x0808($a0) ## 00000808 /* 02F5C 808625AC E4860068 */ swc1 $f6, 0x0068($a0) ## 00000068 -/* 02F60 808625B0 15E10009 */ bne $t7, $at, .L808625D8 +/* 02F60 808625B0 15E10009 */ bne $t7, $at, .L808625D8 /* 02F64 808625B4 E48401A4 */ swc1 $f4, 0x01A4($a0) ## 000001A4 /* 02F68 808625B8 24180050 */ addiu $t8, $zero, 0x0050 ## $t8 = 00000050 -/* 02F6C 808625BC AFB80010 */ sw $t8, 0x0010($sp) +/* 02F6C 808625BC AFB80010 */ sw $t8, 0x0010($sp) /* 02F70 808625C0 24058000 */ addiu $a1, $zero, 0x8000 ## $a1 = FFFF8000 /* 02F74 808625C4 24060078 */ addiu $a2, $zero, 0x0078 ## $a2 = 00000078 -/* 02F78 808625C8 0C00D09B */ jal func_8003426C +/* 02F78 808625C8 0C00D09B */ jal func_8003426C /* 02F7C 808625CC 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 02F80 808625D0 10000014 */ beq $zero, $zero, .L80862624 +/* 02F80 808625D0 10000014 */ beq $zero, $zero, .L80862624 /* 02F84 808625D4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 .L808625D8: /* 02F88 808625D8 24190050 */ addiu $t9, $zero, 0x0050 ## $t9 = 00000050 -/* 02F8C 808625DC AFB90010 */ sw $t9, 0x0010($sp) +/* 02F8C 808625DC AFB90010 */ sw $t9, 0x0010($sp) /* 02F90 808625E0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 02F94 808625E4 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 02F98 808625E8 24060078 */ addiu $a2, $zero, 0x0078 ## $a2 = 00000078 -/* 02F9C 808625EC 0C00D09B */ jal func_8003426C +/* 02F9C 808625EC 0C00D09B */ jal func_8003426C /* 02FA0 808625F0 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 /* 02FA4 808625F4 920807E2 */ lbu $t0, 0x07E2($s0) ## 000007E2 /* 02FA8 808625F8 2401000F */ addiu $at, $zero, 0x000F ## $at = 0000000F /* 02FAC 808625FC 26040188 */ addiu $a0, $s0, 0x0188 ## $a0 = 00000188 -/* 02FB0 80862600 15010004 */ bne $t0, $at, .L80862614 +/* 02FB0 80862600 15010004 */ bne $t0, $at, .L80862614 /* 02FB4 80862604 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 /* 02FB8 80862608 24090024 */ addiu $t1, $zero, 0x0024 ## $t1 = 00000024 -/* 02FBC 8086260C 10000004 */ beq $zero, $zero, .L80862620 +/* 02FBC 8086260C 10000004 */ beq $zero, $zero, .L80862620 /* 02FC0 80862610 A60907E0 */ sh $t1, 0x07E0($s0) ## 000007E0 .L80862614: /* 02FC4 80862614 24A58604 */ addiu $a1, $a1, 0x8604 ## $a1 = 06008604 -/* 02FC8 80862618 0C0294A7 */ jal func_800A529C +/* 02FC8 80862618 0C0294A7 */ jal SkelAnime_ChangeAnimPlaybackStop /* 02FCC 8086261C 24060000 */ addiu $a2, $zero, 0x0000 ## $a2 = 00000000 .L80862620: /* 02FD0 80862620 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 .L80862624: /* 02FD4 80862624 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 02FD8 80862628 2405389E */ addiu $a1, $zero, 0x389E ## $a1 = 0000389E /* 02FDC 8086262C 3C058086 */ lui $a1, %hi(func_80862650) ## $a1 = 80860000 /* 02FE0 80862630 24A52650 */ addiu $a1, $a1, %lo(func_80862650) ## $a1 = 80862650 -/* 02FE4 80862634 0C217D94 */ jal func_8085F650 +/* 02FE4 80862634 0C217D94 */ jal func_8085F650 /* 02FE8 80862638 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02FEC 8086263C 8FBF0024 */ lw $ra, 0x0024($sp) -/* 02FF0 80862640 8FB00020 */ lw $s0, 0x0020($sp) +/* 02FEC 8086263C 8FBF0024 */ lw $ra, 0x0024($sp) +/* 02FF0 80862640 8FB00020 */ lw $s0, 0x0020($sp) /* 02FF4 80862644 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 02FF8 80862648 03E00008 */ jr $ra +/* 02FF8 80862648 03E00008 */ jr $ra /* 02FFC 8086264C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Test/func_808627C4.s b/asm/non_matchings/overlays/actors/ovl_En_Test/func_808627C4.s index 507857cf98..43fec43b3b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Test/func_808627C4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Test/func_808627C4.s @@ -1,42 +1,42 @@ glabel func_808627C4 /* 03174 808627C4 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 03178 808627C8 AFB00020 */ sw $s0, 0x0020($sp) +/* 03178 808627C8 AFB00020 */ sw $s0, 0x0020($sp) /* 0317C 808627CC 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 03180 808627D0 AFBF0024 */ sw $ra, 0x0024($sp) -/* 03184 808627D4 AFA5002C */ sw $a1, 0x002C($sp) +/* 03180 808627D0 AFBF0024 */ sw $ra, 0x0024($sp) +/* 03184 808627D4 AFA5002C */ sw $a1, 0x002C($sp) /* 03188 808627D8 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 0318C 808627DC 0C00CEAE */ jal func_80033AB8 +/* 0318C 808627DC 0C00CEAE */ jal func_80033AB8 /* 03190 808627E0 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 03194 808627E4 10400005 */ beq $v0, $zero, .L808627FC +/* 03194 808627E4 10400005 */ beq $v0, $zero, .L808627FC /* 03198 808627E8 26040188 */ addiu $a0, $s0, 0x0188 ## $a0 = 00000188 -/* 0319C 808627EC 0C2183B0 */ jal func_80860EC0 +/* 0319C 808627EC 0C2183B0 */ jal func_80860EC0 /* 031A0 808627F0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 031A4 808627F4 10000030 */ beq $zero, $zero, .L808628B8 -/* 031A8 808627F8 8FBF0024 */ lw $ra, 0x0024($sp) +/* 031A4 808627F4 10000030 */ beq $zero, $zero, .L808628B8 +/* 031A8 808627F8 8FBF0024 */ lw $ra, 0x0024($sp) .L808627FC: /* 031AC 808627FC 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 /* 031B0 80862800 24A5E2B0 */ addiu $a1, $a1, 0xE2B0 ## $a1 = 0600E2B0 -/* 031B4 80862804 0C0294D3 */ jal func_800A534C +/* 031B4 80862804 0C0294D3 */ jal SkelAnime_ChangeAnimTransitionRepeat /* 031B8 80862808 3C06C000 */ lui $a2, 0xC000 ## $a2 = C0000000 /* 031BC 8086280C 8605008A */ lh $a1, 0x008A($s0) ## 0000008A /* 031C0 80862810 240E0001 */ addiu $t6, $zero, 0x0001 ## $t6 = 00000001 -/* 031C4 80862814 AFAE0010 */ sw $t6, 0x0010($sp) +/* 031C4 80862814 AFAE0010 */ sw $t6, 0x0010($sp) /* 031C8 80862818 260400B6 */ addiu $a0, $s0, 0x00B6 ## $a0 = 000000B6 /* 031CC 8086281C 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 /* 031D0 80862820 0C01E1A7 */ jal Math_SmoothScaleMaxMinS - + /* 031D4 80862824 24070FA0 */ addiu $a3, $zero, 0x0FA0 ## $a3 = 00000FA0 -/* 031D8 80862828 8FAF002C */ lw $t7, 0x002C($sp) +/* 031D8 80862828 8FAF002C */ lw $t7, 0x002C($sp) /* 031DC 8086282C 3C180001 */ lui $t8, 0x0001 ## $t8 = 00010000 /* 031E0 80862830 3C014080 */ lui $at, 0x4080 ## $at = 40800000 -/* 031E4 80862834 030FC021 */ addu $t8, $t8, $t7 +/* 031E4 80862834 030FC021 */ addu $t8, $t8, $t7 /* 031E8 80862838 8F181DE4 */ lw $t8, 0x1DE4($t8) ## 00011DE4 /* 031EC 8086283C 33190001 */ andi $t9, $t8, 0x0001 ## $t9 = 00000000 -/* 031F0 80862840 53200006 */ beql $t9, $zero, .L8086285C +/* 031F0 80862840 53200006 */ beql $t9, $zero, .L8086285C /* 031F4 80862844 44813000 */ mtc1 $at, $f6 ## $f6 = 4.00 /* 031F8 80862848 3C01C080 */ lui $at, 0xC080 ## $at = C0800000 /* 031FC 8086284C 44812000 */ mtc1 $at, $f4 ## $f4 = -4.00 -/* 03200 80862850 10000004 */ beq $zero, $zero, .L80862864 +/* 03200 80862850 10000004 */ beq $zero, $zero, .L80862864 /* 03204 80862854 E6040068 */ swc1 $f4, 0x0068($s0) ## 00000068 /* 03208 80862858 44813000 */ mtc1 $at, $f6 ## $f6 = -4.00 .L8086285C: @@ -52,23 +52,23 @@ glabel func_808627C4 /* 03228 80862878 44811000 */ mtc1 $at, $f2 ## $f2 = 20.00 /* 0322C 8086287C 240C0018 */ addiu $t4, $zero, 0x0018 ## $t4 = 00000018 /* 03230 80862880 3C058086 */ lui $a1, %hi(func_808628C8) ## $a1 = 80860000 -/* 03234 80862884 46020202 */ mul.s $f8, $f0, $f2 +/* 03234 80862884 46020202 */ mul.s $f8, $f0, $f2 /* 03238 80862888 A20C07C8 */ sb $t4, 0x07C8($s0) ## 000007C8 /* 0323C 8086288C 24A528C8 */ addiu $a1, $a1, %lo(func_808628C8) ## $a1 = 808628C8 /* 03240 80862890 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 03244 80862894 46024280 */ add.s $f10, $f8, $f2 -/* 03248 80862898 4600540D */ trunc.w.s $f16, $f10 -/* 0324C 8086289C 440B8000 */ mfc1 $t3, $f16 -/* 03250 808628A0 0C217D94 */ jal func_8085F650 +/* 03244 80862894 46024280 */ add.s $f10, $f8, $f2 +/* 03248 80862898 4600540D */ trunc.w.s $f16, $f10 +/* 0324C 8086289C 440B8000 */ mfc1 $t3, $f16 +/* 03250 808628A0 0C217D94 */ jal func_8085F650 /* 03254 808628A4 AE0B07E8 */ sw $t3, 0x07E8($s0) ## 000007E8 /* 03258 808628A8 44809000 */ mtc1 $zero, $f18 ## $f18 = 0.00 /* 0325C 808628AC 00000000 */ nop /* 03260 808628B0 E61207EC */ swc1 $f18, 0x07EC($s0) ## 000007EC -/* 03264 808628B4 8FBF0024 */ lw $ra, 0x0024($sp) +/* 03264 808628B4 8FBF0024 */ lw $ra, 0x0024($sp) .L808628B8: -/* 03268 808628B8 8FB00020 */ lw $s0, 0x0020($sp) +/* 03268 808628B8 8FB00020 */ lw $s0, 0x0020($sp) /* 0326C 808628BC 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 03270 808628C0 03E00008 */ jr $ra +/* 03270 808628C0 03E00008 */ jr $ra /* 03274 808628C4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Test/func_80862FA8.s b/asm/non_matchings/overlays/actors/ovl_En_Test/func_80862FA8.s index 3c969feca0..a39167eb12 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Test/func_80862FA8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Test/func_80862FA8.s @@ -1,45 +1,45 @@ glabel func_80862FA8 /* 03958 80862FA8 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 0395C 80862FAC AFA5001C */ sw $a1, 0x001C($sp) -/* 03960 80862FB0 AFBF0014 */ sw $ra, 0x0014($sp) +/* 0395C 80862FAC AFA5001C */ sw $a1, 0x001C($sp) +/* 03960 80862FB0 AFBF0014 */ sw $ra, 0x0014($sp) /* 03964 80862FB4 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 /* 03968 80862FB8 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 0396C 80862FBC 24A51420 */ addiu $a1, $a1, 0x1420 ## $a1 = 06001420 -/* 03970 80862FC0 AFA60018 */ sw $a2, 0x0018($sp) -/* 03974 80862FC4 0C02947A */ jal func_800A51E8 +/* 03970 80862FC0 AFA60018 */ sw $a2, 0x0018($sp) +/* 03974 80862FC4 0C02947A */ jal SkelAnime_ChangeAnimDefaultStop /* 03978 80862FC8 24840188 */ addiu $a0, $a0, 0x0188 ## $a0 = 00000188 -/* 0397C 80862FCC 8FA40018 */ lw $a0, 0x0018($sp) +/* 0397C 80862FCC 8FA40018 */ lw $a0, 0x0018($sp) /* 03980 80862FD0 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 03984 80862FD4 2405383B */ addiu $a1, $zero, 0x383B ## $a1 = 0000383B -/* 03988 80862FD8 8FA60018 */ lw $a2, 0x0018($sp) +/* 03988 80862FD8 8FA60018 */ lw $a2, 0x0018($sp) /* 0398C 80862FDC 2401FFFE */ addiu $at, $zero, 0xFFFE ## $at = FFFFFFFE /* 03990 80862FE0 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 /* 03994 80862FE4 8CCE0004 */ lw $t6, 0x0004($a2) ## 00000004 /* 03998 80862FE8 84D8001C */ lh $t8, 0x001C($a2) ## 0000001C /* 0399C 80862FEC A0C007DE */ sb $zero, 0x07DE($a2) ## 000007DE -/* 039A0 80862FF0 01C17824 */ and $t7, $t6, $at -/* 039A4 80862FF4 2B010004 */ slti $at, $t8, 0x0004 +/* 039A0 80862FF0 01C17824 */ and $t7, $t6, $at +/* 039A4 80862FF4 2B010004 */ slti $at, $t8, 0x0004 /* 039A8 80862FF8 ACCF0004 */ sw $t7, 0x0004($a2) ## 00000004 /* 039AC 80862FFC A0C00114 */ sb $zero, 0x0114($a2) ## 00000114 -/* 039B0 80863000 10200009 */ beq $at, $zero, .L80863028 +/* 039B0 80863000 10200009 */ beq $at, $zero, .L80863028 /* 039B4 80863004 E4C40068 */ swc1 $f4, 0x0068($a2) ## 00000068 /* 039B8 80863008 24190005 */ addiu $t9, $zero, 0x0005 ## $t9 = 00000005 /* 039BC 8086300C 3C058086 */ lui $a1, %hi(func_80863044) ## $a1 = 80860000 /* 039C0 80863010 A0D907C8 */ sb $t9, 0x07C8($a2) ## 000007C8 /* 039C4 80863014 24A53044 */ addiu $a1, $a1, %lo(func_80863044) ## $a1 = 80863044 -/* 039C8 80863018 0C217D94 */ jal func_8085F650 +/* 039C8 80863018 0C217D94 */ jal func_8085F650 /* 039CC 8086301C 00C02025 */ or $a0, $a2, $zero ## $a0 = 00000000 -/* 039D0 80863020 10000005 */ beq $zero, $zero, .L80863038 -/* 039D4 80863024 8FBF0014 */ lw $ra, 0x0014($sp) +/* 039D0 80863020 10000005 */ beq $zero, $zero, .L80863038 +/* 039D4 80863024 8FBF0014 */ lw $ra, 0x0014($sp) .L80863028: /* 039D8 80863028 00C02025 */ or $a0, $a2, $zero ## $a0 = 00000000 -/* 039DC 8086302C 0C218B6F */ jal func_80862DBC -/* 039E0 80863030 8FA5001C */ lw $a1, 0x001C($sp) -/* 039E4 80863034 8FBF0014 */ lw $ra, 0x0014($sp) +/* 039DC 8086302C 0C218B6F */ jal func_80862DBC +/* 039E0 80863030 8FA5001C */ lw $a1, 0x001C($sp) +/* 039E4 80863034 8FBF0014 */ lw $ra, 0x0014($sp) .L80863038: /* 039E8 80863038 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 039EC 8086303C 03E00008 */ jr $ra +/* 039EC 8086303C 03E00008 */ jr $ra /* 039F0 80863040 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Test/func_808630F0.s b/asm/non_matchings/overlays/actors/ovl_En_Test/func_808630F0.s index cc69c284e5..52dbedc0c5 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Test/func_808630F0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Test/func_808630F0.s @@ -1,45 +1,45 @@ glabel func_808630F0 /* 03AA0 808630F0 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 03AA4 808630F4 AFA5001C */ sw $a1, 0x001C($sp) -/* 03AA8 808630F8 AFBF0014 */ sw $ra, 0x0014($sp) +/* 03AA4 808630F4 AFA5001C */ sw $a1, 0x001C($sp) +/* 03AA8 808630F8 AFBF0014 */ sw $ra, 0x0014($sp) /* 03AAC 808630FC 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 /* 03AB0 80863100 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 /* 03AB4 80863104 24A59A90 */ addiu $a1, $a1, 0x9A90 ## $a1 = 06009A90 -/* 03AB8 80863108 AFA60018 */ sw $a2, 0x0018($sp) -/* 03ABC 8086310C 0C02947A */ jal func_800A51E8 +/* 03AB8 80863108 AFA60018 */ sw $a2, 0x0018($sp) +/* 03ABC 8086310C 0C02947A */ jal SkelAnime_ChangeAnimDefaultStop /* 03AC0 80863110 24840188 */ addiu $a0, $a0, 0x0188 ## $a0 = 00000188 -/* 03AC4 80863114 8FA40018 */ lw $a0, 0x0018($sp) +/* 03AC4 80863114 8FA40018 */ lw $a0, 0x0018($sp) /* 03AC8 80863118 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 03ACC 8086311C 2405383B */ addiu $a1, $zero, 0x383B ## $a1 = 0000383B -/* 03AD0 80863120 8FA60018 */ lw $a2, 0x0018($sp) +/* 03AD0 80863120 8FA60018 */ lw $a2, 0x0018($sp) /* 03AD4 80863124 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 /* 03AD8 80863128 240E0006 */ addiu $t6, $zero, 0x0006 ## $t6 = 00000006 /* 03ADC 8086312C 84CF001C */ lh $t7, 0x001C($a2) ## 0000001C /* 03AE0 80863130 A0CE07C8 */ sb $t6, 0x07C8($a2) ## 000007C8 /* 03AE4 80863134 A0C00114 */ sb $zero, 0x0114($a2) ## 00000114 -/* 03AE8 80863138 29E10004 */ slti $at, $t7, 0x0004 +/* 03AE8 80863138 29E10004 */ slti $at, $t7, 0x0004 /* 03AEC 8086313C A0C007DE */ sb $zero, 0x07DE($a2) ## 000007DE -/* 03AF0 80863140 1020000B */ beq $at, $zero, .L80863170 +/* 03AF0 80863140 1020000B */ beq $at, $zero, .L80863170 /* 03AF4 80863144 E4C40068 */ swc1 $f4, 0x0068($a2) ## 00000068 /* 03AF8 80863148 8CD80004 */ lw $t8, 0x0004($a2) ## 00000004 /* 03AFC 8086314C 2401FFFE */ addiu $at, $zero, 0xFFFE ## $at = FFFFFFFE /* 03B00 80863150 3C058086 */ lui $a1, %hi(func_8086318C) ## $a1 = 80860000 -/* 03B04 80863154 0301C824 */ and $t9, $t8, $at +/* 03B04 80863154 0301C824 */ and $t9, $t8, $at /* 03B08 80863158 ACD90004 */ sw $t9, 0x0004($a2) ## 00000004 /* 03B0C 8086315C 24A5318C */ addiu $a1, $a1, %lo(func_8086318C) ## $a1 = 8086318C -/* 03B10 80863160 0C217D94 */ jal func_8085F650 +/* 03B10 80863160 0C217D94 */ jal func_8085F650 /* 03B14 80863164 00C02025 */ or $a0, $a2, $zero ## $a0 = 00000000 -/* 03B18 80863168 10000005 */ beq $zero, $zero, .L80863180 -/* 03B1C 8086316C 8FBF0014 */ lw $ra, 0x0014($sp) +/* 03B18 80863168 10000005 */ beq $zero, $zero, .L80863180 +/* 03B1C 8086316C 8FBF0014 */ lw $ra, 0x0014($sp) .L80863170: /* 03B20 80863170 00C02025 */ or $a0, $a2, $zero ## $a0 = 00000000 -/* 03B24 80863174 0C218B6F */ jal func_80862DBC -/* 03B28 80863178 8FA5001C */ lw $a1, 0x001C($sp) -/* 03B2C 8086317C 8FBF0014 */ lw $ra, 0x0014($sp) +/* 03B24 80863174 0C218B6F */ jal func_80862DBC +/* 03B28 80863178 8FA5001C */ lw $a1, 0x001C($sp) +/* 03B2C 8086317C 8FBF0014 */ lw $ra, 0x0014($sp) .L80863180: /* 03B30 80863180 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 03B34 80863184 03E00008 */ jr $ra +/* 03B34 80863184 03E00008 */ jr $ra /* 03B38 80863188 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Test/func_80863AB8.s b/asm/non_matchings/overlays/actors/ovl_En_Test/func_80863AB8.s index c654163396..416023196e 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Test/func_80863AB8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Test/func_80863AB8.s @@ -30,7 +30,7 @@ glabel func_80863AB8 /* 044D4 80863B24 24C64700 */ addiu $a2, $a2, %lo(D_80864700) ## $a2 = 80864700 /* 044D8 80863B28 27A4002C */ addiu $a0, $sp, 0x002C ## $a0 = FFFFFFE4 /* 044DC 80863B2C 24070DFE */ addiu $a3, $zero, 0x0DFE ## $a3 = 00000DFE -/* 044E0 80863B30 0C031AB1 */ jal func_800C6AC4 +/* 044E0 80863B30 0C031AB1 */ jal Graph_OpenDisps /* 044E4 80863B34 AFA5003C */ sw $a1, 0x003C($sp) /* 044E8 80863B38 8FA8003C */ lw $t0, 0x003C($sp) /* 044EC 80863B3C 3C18E700 */ lui $t8, 0xE700 ## $t8 = E7000000 @@ -118,7 +118,7 @@ glabel func_80863AB8 /* 04620 80863C70 24C64710 */ addiu $a2, $a2, %lo(D_80864710) ## $a2 = 80864710 /* 04624 80863C74 27A4002C */ addiu $a0, $sp, 0x002C ## $a0 = FFFFFFE4 /* 04628 80863C78 24070E03 */ addiu $a3, $zero, 0x0E03 ## $a3 = 00000E03 -/* 0462C 80863C7C 0C031AD5 */ jal func_800C6B54 +/* 0462C 80863C7C 0C031AD5 */ jal Graph_CloseDisps /* 04630 80863C80 8DC50000 */ lw $a1, 0x0000($t6) ## 00000000 .L80863C84: /* 04634 80863C84 8FA3005C */ lw $v1, 0x005C($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Test/func_80864158.s b/asm/non_matchings/overlays/actors/ovl_En_Test/func_80864158.s index 81df415ce4..2e9f7cb627 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Test/func_80864158.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Test/func_80864158.s @@ -1,16 +1,16 @@ glabel func_80864158 /* 04B08 80864158 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 04B0C 8086415C AFA5001C */ sw $a1, 0x001C($sp) -/* 04B10 80864160 AFBF0014 */ sw $ra, 0x0014($sp) +/* 04B0C 8086415C AFA5001C */ sw $a1, 0x001C($sp) +/* 04B10 80864160 AFBF0014 */ sw $ra, 0x0014($sp) /* 04B14 80864164 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 /* 04B18 80864168 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 /* 04B1C 8086416C 24A5E2B0 */ addiu $a1, $a1, 0xE2B0 ## $a1 = 0600E2B0 -/* 04B20 80864170 AFA70018 */ sw $a3, 0x0018($sp) +/* 04B20 80864170 AFA70018 */ sw $a3, 0x0018($sp) /* 04B24 80864174 24840188 */ addiu $a0, $a0, 0x0188 ## $a0 = 00000188 -/* 04B28 80864178 0C0294D3 */ jal func_800A534C +/* 04B28 80864178 0C0294D3 */ jal SkelAnime_ChangeAnimTransitionRepeat /* 04B2C 8086417C 3C06C000 */ lui $a2, 0xC000 ## $a2 = C0000000 -/* 04B30 80864180 8FA70018 */ lw $a3, 0x0018($sp) -/* 04B34 80864184 C7A4001C */ lwc1 $f4, 0x001C($sp) +/* 04B30 80864180 8FA70018 */ lw $a3, 0x0018($sp) +/* 04B34 80864184 C7A4001C */ lwc1 $f4, 0x001C($sp) /* 04B38 80864188 84EE00B6 */ lh $t6, 0x00B6($a3) ## 000000B6 /* 04B3C 8086418C E4E40068 */ swc1 $f4, 0x0068($a3) ## 00000068 /* 04B40 80864190 25CF3FFF */ addiu $t7, $t6, 0x3FFF ## $t7 = 00003FFF @@ -21,20 +21,20 @@ glabel func_80864158 /* 04B50 808641A0 44813000 */ mtc1 $at, $f6 ## $f6 = 20.00 /* 04B54 808641A4 3C014170 */ lui $at, 0x4170 ## $at = 41700000 /* 04B58 808641A8 44815000 */ mtc1 $at, $f10 ## $f10 = 15.00 -/* 04B5C 808641AC 46060202 */ mul.s $f8, $f0, $f6 -/* 04B60 808641B0 8FA40018 */ lw $a0, 0x0018($sp) +/* 04B5C 808641AC 46060202 */ mul.s $f8, $f0, $f6 +/* 04B60 808641B0 8FA40018 */ lw $a0, 0x0018($sp) /* 04B64 808641B4 24080018 */ addiu $t0, $zero, 0x0018 ## $t0 = 00000018 /* 04B68 808641B8 3C058086 */ lui $a1, %hi(func_808628C8) ## $a1 = 80860000 /* 04B6C 808641BC 24A528C8 */ addiu $a1, $a1, %lo(func_808628C8) ## $a1 = 808628C8 /* 04B70 808641C0 A08807C8 */ sb $t0, 0x07C8($a0) ## 000007C8 -/* 04B74 808641C4 460A4400 */ add.s $f16, $f8, $f10 -/* 04B78 808641C8 4600848D */ trunc.w.s $f18, $f16 -/* 04B7C 808641CC 44199000 */ mfc1 $t9, $f18 -/* 04B80 808641D0 0C217D94 */ jal func_8085F650 +/* 04B74 808641C4 460A4400 */ add.s $f16, $f8, $f10 +/* 04B78 808641C8 4600848D */ trunc.w.s $f18, $f16 +/* 04B7C 808641CC 44199000 */ mfc1 $t9, $f18 +/* 04B80 808641D0 0C217D94 */ jal func_8085F650 /* 04B84 808641D4 AC9907E8 */ sw $t9, 0x07E8($a0) ## 000007E8 -/* 04B88 808641D8 8FBF0014 */ lw $ra, 0x0014($sp) +/* 04B88 808641D8 8FBF0014 */ lw $ra, 0x0014($sp) /* 04B8C 808641DC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 04B90 808641E0 03E00008 */ jr $ra +/* 04B90 808641E0 03E00008 */ jr $ra /* 04B94 808641E4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Tg/EnTg_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Tg/EnTg_Destroy.s index e378a99b20..e1ef14c334 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Tg/EnTg_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Tg/EnTg_Destroy.s @@ -1,18 +1,18 @@ glabel EnTg_Destroy /* 00228 80B18588 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 0022C 80B1858C AFBF0014 */ sw $ra, 0x0014($sp) -/* 00230 80B18590 AFA40018 */ sw $a0, 0x0018($sp) -/* 00234 80B18594 AFA5001C */ sw $a1, 0x001C($sp) -/* 00238 80B18598 0C0295BC */ jal func_800A56F0 +/* 0022C 80B1858C AFBF0014 */ sw $ra, 0x0014($sp) +/* 00230 80B18590 AFA40018 */ sw $a0, 0x0018($sp) +/* 00234 80B18594 AFA5001C */ sw $a1, 0x001C($sp) +/* 00238 80B18598 0C0295BC */ jal SkelAnime_Free /* 0023C 80B1859C 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 00240 80B185A0 8FA50018 */ lw $a1, 0x0018($sp) -/* 00244 80B185A4 8FA4001C */ lw $a0, 0x001C($sp) +/* 00240 80B185A0 8FA50018 */ lw $a1, 0x0018($sp) +/* 00244 80B185A4 8FA4001C */ lw $a0, 0x001C($sp) /* 00248 80B185A8 0C0170EB */ jal ActorCollider_FreeCylinder - + /* 0024C 80B185AC 24A50194 */ addiu $a1, $a1, 0x0194 ## $a1 = 00000194 -/* 00250 80B185B0 8FBF0014 */ lw $ra, 0x0014($sp) +/* 00250 80B185B0 8FBF0014 */ lw $ra, 0x0014($sp) /* 00254 80B185B4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00258 80B185B8 03E00008 */ jr $ra +/* 00258 80B185B8 03E00008 */ jr $ra /* 0025C 80B185BC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Tg/EnTg_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Tg/EnTg_Draw.s index cfe59de8dc..17ded82394 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Tg/EnTg_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Tg/EnTg_Draw.s @@ -1,22 +1,22 @@ glabel EnTg_Draw /* 00484 80B187E4 27BDFFA8 */ addiu $sp, $sp, 0xFFA8 ## $sp = FFFFFFA8 -/* 00488 80B187E8 AFB10028 */ sw $s1, 0x0028($sp) +/* 00488 80B187E8 AFB10028 */ sw $s1, 0x0028($sp) /* 0048C 80B187EC 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 -/* 00490 80B187F0 AFBF002C */ sw $ra, 0x002C($sp) -/* 00494 80B187F4 AFB00024 */ sw $s0, 0x0024($sp) -/* 00498 80B187F8 AFA40058 */ sw $a0, 0x0058($sp) +/* 00490 80B187F0 AFBF002C */ sw $ra, 0x002C($sp) +/* 00494 80B187F4 AFB00024 */ sw $s0, 0x0024($sp) +/* 00498 80B187F8 AFA40058 */ sw $a0, 0x0058($sp) /* 0049C 80B187FC 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 /* 004A0 80B18800 3C0680B2 */ lui $a2, %hi(D_80B18980) ## $a2 = 80B20000 /* 004A4 80B18804 24C68980 */ addiu $a2, $a2, %lo(D_80B18980) ## $a2 = 80B18980 /* 004A8 80B18808 27A40040 */ addiu $a0, $sp, 0x0040 ## $a0 = FFFFFFE8 /* 004AC 80B1880C 240701CE */ addiu $a3, $zero, 0x01CE ## $a3 = 000001CE -/* 004B0 80B18810 0C031AB1 */ jal func_800C6AC4 +/* 004B0 80B18810 0C031AB1 */ jal Graph_OpenDisps /* 004B4 80B18814 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 /* 004B8 80B18818 44806000 */ mtc1 $zero, $f12 ## $f12 = 0.00 /* 004BC 80B1881C 3C06C40C */ lui $a2, 0xC40C ## $a2 = C40C0000 /* 004C0 80B18820 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 004C4 80B18824 0C034261 */ jal Matrix_Translate -/* 004C8 80B18828 46006386 */ mov.s $f14, $f12 +/* 004C4 80B18824 0C034261 */ jal Matrix_Translate +/* 004C8 80B18828 46006386 */ mov.s $f14, $f12 /* 004CC 80B1882C 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 /* 004D0 80B18830 3C0FDB06 */ lui $t7, 0xDB06 ## $t7 = DB060000 /* 004D4 80B18834 35EF0020 */ ori $t7, $t7, 0x0020 ## $t7 = DB060020 @@ -24,13 +24,13 @@ glabel EnTg_Draw /* 004DC 80B1883C AE0E02C0 */ sw $t6, 0x02C0($s0) ## 000002C0 /* 004E0 80B18840 AC4F0000 */ sw $t7, 0x0000($v0) ## 00000000 /* 004E4 80B18844 8E240000 */ lw $a0, 0x0000($s1) ## 00000000 -/* 004E8 80B18848 AFA00010 */ sw $zero, 0x0010($sp) +/* 004E8 80B18848 AFA00010 */ sw $zero, 0x0010($sp) /* 004EC 80B1884C 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 004F0 80B18850 24060032 */ addiu $a2, $zero, 0x0032 ## $a2 = 00000032 /* 004F4 80B18854 240700A0 */ addiu $a3, $zero, 0x00A0 ## $a3 = 000000A0 -/* 004F8 80B18858 0C2C61DE */ jal func_80B18778 -/* 004FC 80B1885C AFA2003C */ sw $v0, 0x003C($sp) -/* 00500 80B18860 8FA3003C */ lw $v1, 0x003C($sp) +/* 004F8 80B18858 0C2C61DE */ jal func_80B18778 +/* 004FC 80B1885C AFA2003C */ sw $v0, 0x003C($sp) +/* 00500 80B18860 8FA3003C */ lw $v1, 0x003C($sp) /* 00504 80B18864 3C19DB06 */ lui $t9, 0xDB06 ## $t9 = DB060000 /* 00508 80B18868 37390024 */ ori $t9, $t9, 0x0024 ## $t9 = DB060024 /* 0050C 80B1886C AC620004 */ sw $v0, 0x0004($v1) ## 00000004 @@ -41,35 +41,35 @@ glabel EnTg_Draw /* 00520 80B18880 AE1802C0 */ sw $t8, 0x02C0($s0) ## 000002C0 /* 00524 80B18884 AC590000 */ sw $t9, 0x0000($v0) ## 00000000 /* 00528 80B18888 8E240000 */ lw $a0, 0x0000($s1) ## 00000000 -/* 0052C 80B1888C AFA00010 */ sw $zero, 0x0010($sp) +/* 0052C 80B1888C AFA00010 */ sw $zero, 0x0010($sp) /* 00530 80B18890 240700FF */ addiu $a3, $zero, 0x00FF ## $a3 = 000000FF -/* 00534 80B18894 0C2C61DE */ jal func_80B18778 -/* 00538 80B18898 AFA20038 */ sw $v0, 0x0038($sp) -/* 0053C 80B1889C 8FA30038 */ lw $v1, 0x0038($sp) +/* 00534 80B18894 0C2C61DE */ jal func_80B18778 +/* 00538 80B18898 AFA20038 */ sw $v0, 0x0038($sp) +/* 0053C 80B1889C 8FA30038 */ lw $v1, 0x0038($sp) /* 00540 80B188A0 3C0880B2 */ lui $t0, %hi(func_80B18704) ## $t0 = 80B20000 /* 00544 80B188A4 3C0980B2 */ lui $t1, %hi(func_80B1871C) ## $t1 = 80B20000 /* 00548 80B188A8 AC620004 */ sw $v0, 0x0004($v1) ## 00000004 -/* 0054C 80B188AC 8FA20058 */ lw $v0, 0x0058($sp) +/* 0054C 80B188AC 8FA20058 */ lw $v0, 0x0058($sp) /* 00550 80B188B0 2529871C */ addiu $t1, $t1, %lo(func_80B1871C) ## $t1 = 80B1871C /* 00554 80B188B4 25088704 */ addiu $t0, $t0, %lo(func_80B18704) ## $t0 = 80B18704 /* 00558 80B188B8 8C450150 */ lw $a1, 0x0150($v0) ## 00000150 /* 0055C 80B188BC 8C46016C */ lw $a2, 0x016C($v0) ## 0000016C /* 00560 80B188C0 9047014E */ lbu $a3, 0x014E($v0) ## 0000014E -/* 00564 80B188C4 AFA90014 */ sw $t1, 0x0014($sp) -/* 00568 80B188C8 AFA80010 */ sw $t0, 0x0010($sp) +/* 00564 80B188C4 AFA90014 */ sw $t1, 0x0014($sp) +/* 00568 80B188C8 AFA80010 */ sw $t0, 0x0010($sp) /* 0056C 80B188CC 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 00570 80B188D0 0C0286B2 */ jal func_800A1AC8 -/* 00574 80B188D4 AFA20018 */ sw $v0, 0x0018($sp) +/* 00570 80B188D0 0C0286B2 */ jal SkelAnime_DrawSV +/* 00574 80B188D4 AFA20018 */ sw $v0, 0x0018($sp) /* 00578 80B188D8 3C0680B2 */ lui $a2, %hi(D_80B18990) ## $a2 = 80B20000 /* 0057C 80B188DC 24C68990 */ addiu $a2, $a2, %lo(D_80B18990) ## $a2 = 80B18990 /* 00580 80B188E0 27A40040 */ addiu $a0, $sp, 0x0040 ## $a0 = FFFFFFE8 /* 00584 80B188E4 8E250000 */ lw $a1, 0x0000($s1) ## 00000000 -/* 00588 80B188E8 0C031AD5 */ jal func_800C6B54 +/* 00588 80B188E8 0C031AD5 */ jal Graph_CloseDisps /* 0058C 80B188EC 240701E0 */ addiu $a3, $zero, 0x01E0 ## $a3 = 000001E0 -/* 00590 80B188F0 8FBF002C */ lw $ra, 0x002C($sp) -/* 00594 80B188F4 8FB00024 */ lw $s0, 0x0024($sp) -/* 00598 80B188F8 8FB10028 */ lw $s1, 0x0028($sp) -/* 0059C 80B188FC 03E00008 */ jr $ra +/* 00590 80B188F0 8FBF002C */ lw $ra, 0x002C($sp) +/* 00594 80B188F4 8FB00024 */ lw $s0, 0x0024($sp) +/* 00598 80B188F8 8FB10028 */ lw $s1, 0x0028($sp) +/* 0059C 80B188FC 03E00008 */ jr $ra /* 005A0 80B18900 27BD0058 */ addiu $sp, $sp, 0x0058 ## $sp = 00000000 /* 005A4 80B18904 00000000 */ nop /* 005A8 80B18908 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Tg/EnTg_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Tg/EnTg_Init.s index 7e635a0bcb..781f64064f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Tg/EnTg_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Tg/EnTg_Init.s @@ -1,61 +1,61 @@ glabel EnTg_Init /* 00150 80B184B0 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 00154 80B184B4 AFB00028 */ sw $s0, 0x0028($sp) +/* 00154 80B184B4 AFB00028 */ sw $s0, 0x0028($sp) /* 00158 80B184B8 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 0015C 80B184BC AFBF002C */ sw $ra, 0x002C($sp) -/* 00160 80B184C0 AFA5003C */ sw $a1, 0x003C($sp) +/* 0015C 80B184BC AFBF002C */ sw $ra, 0x002C($sp) +/* 00160 80B184C0 AFA5003C */ sw $a1, 0x003C($sp) /* 00164 80B184C4 3C068003 */ lui $a2, 0x8003 ## $a2 = 80030000 /* 00168 80B184C8 24C6B5EC */ addiu $a2, $a2, 0xB5EC ## $a2 = 8002B5EC /* 0016C 80B184CC 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 /* 00170 80B184D0 248400B4 */ addiu $a0, $a0, 0x00B4 ## $a0 = 000000B4 /* 00174 80B184D4 0C00AC78 */ jal ActorShape_Init - + /* 00178 80B184D8 3C0741E0 */ lui $a3, 0x41E0 ## $a3 = 41E00000 /* 0017C 80B184DC 3C060601 */ lui $a2, 0x0601 ## $a2 = 06010000 /* 00180 80B184E0 3C070600 */ lui $a3, 0x0600 ## $a3 = 06000000 /* 00184 80B184E4 24E75040 */ addiu $a3, $a3, 0x5040 ## $a3 = 06005040 /* 00188 80B184E8 24C6AE40 */ addiu $a2, $a2, 0xAE40 ## $a2 = 0600AE40 -/* 0018C 80B184EC 8FA4003C */ lw $a0, 0x003C($sp) +/* 0018C 80B184EC 8FA4003C */ lw $a0, 0x003C($sp) /* 00190 80B184F0 2605014C */ addiu $a1, $s0, 0x014C ## $a1 = 0000014C -/* 00194 80B184F4 AFA00010 */ sw $zero, 0x0010($sp) -/* 00198 80B184F8 AFA00014 */ sw $zero, 0x0014($sp) -/* 0019C 80B184FC 0C0291BE */ jal func_800A46F8 -/* 001A0 80B18500 AFA00018 */ sw $zero, 0x0018($sp) +/* 00194 80B184F4 AFA00010 */ sw $zero, 0x0010($sp) +/* 00198 80B184F8 AFA00014 */ sw $zero, 0x0014($sp) +/* 0019C 80B184FC 0C0291BE */ jal SkelAnime_InitSV +/* 001A0 80B18500 AFA00018 */ sw $zero, 0x0018($sp) /* 001A4 80B18504 26050194 */ addiu $a1, $s0, 0x0194 ## $a1 = 00000194 -/* 001A8 80B18508 AFA50030 */ sw $a1, 0x0030($sp) +/* 001A8 80B18508 AFA50030 */ sw $a1, 0x0030($sp) /* 001AC 80B1850C 0C0170D9 */ jal ActorCollider_AllocCylinder - -/* 001B0 80B18510 8FA4003C */ lw $a0, 0x003C($sp) + +/* 001B0 80B18510 8FA4003C */ lw $a0, 0x003C($sp) /* 001B4 80B18514 3C0780B2 */ lui $a3, %hi(D_80B18910) ## $a3 = 80B20000 -/* 001B8 80B18518 8FA50030 */ lw $a1, 0x0030($sp) +/* 001B8 80B18518 8FA50030 */ lw $a1, 0x0030($sp) /* 001BC 80B1851C 24E78910 */ addiu $a3, $a3, %lo(D_80B18910) ## $a3 = 80B18910 -/* 001C0 80B18520 8FA4003C */ lw $a0, 0x003C($sp) +/* 001C0 80B18520 8FA4003C */ lw $a0, 0x003C($sp) /* 001C4 80B18524 0C01712B */ jal ActorCollider_InitCylinder - + /* 001C8 80B18528 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 001CC 80B1852C 3C0680B2 */ lui $a2, %hi(D_80B1893C) ## $a2 = 80B20000 /* 001D0 80B18530 24C6893C */ addiu $a2, $a2, %lo(D_80B1893C) ## $a2 = 80B1893C /* 001D4 80B18534 26040098 */ addiu $a0, $s0, 0x0098 ## $a0 = 00000098 -/* 001D8 80B18538 0C0187BF */ jal func_80061EFC +/* 001D8 80B18538 0C0187BF */ jal func_80061EFC /* 001DC 80B1853C 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 001E0 80B18540 240E0006 */ addiu $t6, $zero, 0x0006 ## $t6 = 00000006 /* 001E4 80B18544 3C053C23 */ lui $a1, 0x3C23 ## $a1 = 3C230000 /* 001E8 80B18548 A20E001F */ sb $t6, 0x001F($s0) ## 0000001F /* 001EC 80B1854C 34A5D70A */ ori $a1, $a1, 0xD70A ## $a1 = 3C23D70A /* 001F0 80B18550 0C00B58B */ jal Actor_SetScale - + /* 001F4 80B18554 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 001F8 80B18558 8FAF003C */ lw $t7, 0x003C($sp) +/* 001F8 80B18558 8FAF003C */ lw $t7, 0x003C($sp) /* 001FC 80B1855C 3C0880B2 */ lui $t0, %hi(func_80B185C0) ## $t0 = 80B20000 /* 00200 80B18560 250885C0 */ addiu $t0, $t0, %lo(func_80B185C0) ## $t0 = 80B185C0 /* 00204 80B18564 8DF8009C */ lw $t8, 0x009C($t7) ## 0000009C /* 00208 80B18568 AE080190 */ sw $t0, 0x0190($s0) ## 00000190 /* 0020C 80B1856C 33190001 */ andi $t9, $t8, 0x0001 ## $t9 = 00000000 /* 00210 80B18570 A2190208 */ sb $t9, 0x0208($s0) ## 00000208 -/* 00214 80B18574 8FBF002C */ lw $ra, 0x002C($sp) -/* 00218 80B18578 8FB00028 */ lw $s0, 0x0028($sp) +/* 00214 80B18574 8FBF002C */ lw $ra, 0x002C($sp) +/* 00218 80B18578 8FB00028 */ lw $s0, 0x0028($sp) /* 0021C 80B1857C 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 -/* 00220 80B18580 03E00008 */ jr $ra +/* 00220 80B18580 03E00008 */ jr $ra /* 00224 80B18584 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Tg/func_80B18360.s b/asm/non_matchings/overlays/actors/ovl_En_Tg/func_80B18360.s index 312c39a5fe..1c76f2b0b6 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Tg/func_80B18360.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Tg/func_80B18360.s @@ -3,7 +3,7 @@ glabel func_80B18360 /* 00004 80B18364 AFBF0014 */ sw $ra, 0x0014($sp) /* 00008 80B18368 AFA5001C */ sw $a1, 0x001C($sp) /* 0000C 80B1836C AFA40018 */ sw $a0, 0x0018($sp) -/* 00010 80B18370 0C01B0D8 */ jal func_8006C360 +/* 00010 80B18370 0C01B0D8 */ jal Text_GetFaceReaction /* 00014 80B18374 24050024 */ addiu $a1, $zero, 0x0024 ## $a1 = 00000024 /* 00018 80B18378 8FA4001C */ lw $a0, 0x001C($sp) /* 0001C 80B1837C 10400003 */ beq $v0, $zero, .L80B1838C diff --git a/asm/non_matchings/overlays/actors/ovl_En_Tite/EnTite_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Tite/EnTite_Draw.s index adbfc33ce3..b6ae51417f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Tite/EnTite_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Tite/EnTite_Draw.s @@ -9,7 +9,7 @@ glabel EnTite_Draw /* 02804 80B1B284 24C6B724 */ addiu $a2, $a2, %lo(D_80B1B724) ## $a2 = 80B1B724 /* 02808 80B1B288 27A40070 */ addiu $a0, $sp, 0x0070 ## $a0 = FFFFFFE8 /* 0280C 80B1B28C 240706A8 */ addiu $a3, $zero, 0x06A8 ## $a3 = 000006A8 -/* 02810 80B1B290 0C031AB1 */ jal func_800C6AC4 +/* 02810 80B1B290 0C031AB1 */ jal Graph_OpenDisps /* 02814 80B1B294 AFA50080 */ sw $a1, 0x0080($sp) /* 02818 80B1B298 8FAF008C */ lw $t7, 0x008C($sp) /* 0281C 80B1B29C 0C024F46 */ jal func_80093D18 @@ -151,7 +151,7 @@ glabel EnTite_Draw /* 02A30 80B1B4B0 24C6B734 */ addiu $a2, $a2, %lo(D_80B1B734) ## $a2 = 80B1B734 /* 02A34 80B1B4B4 27A40070 */ addiu $a0, $sp, 0x0070 ## $a0 = FFFFFFE8 /* 02A38 80B1B4B8 240706C7 */ addiu $a3, $zero, 0x06C7 ## $a3 = 000006C7 -/* 02A3C 80B1B4BC 0C031AD5 */ jal func_800C6B54 +/* 02A3C 80B1B4BC 0C031AD5 */ jal Graph_CloseDisps /* 02A40 80B1B4C0 8DE50000 */ lw $a1, 0x0000($t7) ## 00000000 /* 02A44 80B1B4C4 921802E3 */ lbu $t8, 0x02E3($s0) ## 000002E3 /* 02A48 80B1B4C8 53000032 */ beql $t8, $zero, .L80B1B594 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Tite/func_80B18C5C.s b/asm/non_matchings/overlays/actors/ovl_En_Tite/func_80B18C5C.s index d823405368..ec17cc7396 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Tite/func_80B18C5C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Tite/func_80B18C5C.s @@ -1,30 +1,30 @@ glabel func_80B18C5C /* 001DC 80B18C5C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 001E0 80B18C60 AFBF0014 */ sw $ra, 0x0014($sp) +/* 001E0 80B18C60 AFBF0014 */ sw $ra, 0x0014($sp) /* 001E4 80B18C64 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 /* 001E8 80B18C68 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 001EC 80B18C6C 24A512E4 */ addiu $a1, $a1, 0x12E4 ## $a1 = 060012E4 -/* 001F0 80B18C70 AFA70018 */ sw $a3, 0x0018($sp) +/* 001F0 80B18C70 AFA70018 */ sw $a3, 0x0018($sp) /* 001F4 80B18C74 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 001F8 80B18C78 0C0294D3 */ jal func_800A534C +/* 001F8 80B18C78 0C0294D3 */ jal SkelAnime_ChangeAnimTransitionRepeat /* 001FC 80B18C7C 3C064080 */ lui $a2, 0x4080 ## $a2 = 40800000 -/* 00200 80B18C80 8FA70018 */ lw $a3, 0x0018($sp) +/* 00200 80B18C80 8FA70018 */ lw $a3, 0x0018($sp) /* 00204 80B18C84 240E0006 */ addiu $t6, $zero, 0x0006 ## $t6 = 00000006 /* 00208 80B18C88 2404000F */ addiu $a0, $zero, 0x000F ## $a0 = 0000000F /* 0020C 80B18C8C 2405001E */ addiu $a1, $zero, 0x001E ## $a1 = 0000001E /* 00210 80B18C90 0C01DF64 */ jal Math_Rand_S16Offset - + /* 00214 80B18C94 A0EE02BC */ sb $t6, 0x02BC($a3) ## 000002BC -/* 00218 80B18C98 8FA40018 */ lw $a0, 0x0018($sp) +/* 00218 80B18C98 8FA40018 */ lw $a0, 0x0018($sp) /* 0021C 80B18C9C 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 /* 00220 80B18CA0 3C0580B2 */ lui $a1, %hi(func_80B18CC4) ## $a1 = 80B20000 /* 00224 80B18CA4 24A58CC4 */ addiu $a1, $a1, %lo(func_80B18CC4) ## $a1 = 80B18CC4 /* 00228 80B18CA8 A48202E0 */ sh $v0, 0x02E0($a0) ## 000002E0 -/* 0022C 80B18CAC 0C2C62A0 */ jal func_80B18A80 +/* 0022C 80B18CAC 0C2C62A0 */ jal func_80B18A80 /* 00230 80B18CB0 E4840068 */ swc1 $f4, 0x0068($a0) ## 00000068 -/* 00234 80B18CB4 8FBF0014 */ lw $ra, 0x0014($sp) +/* 00234 80B18CB4 8FBF0014 */ lw $ra, 0x0014($sp) /* 00238 80B18CB8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 0023C 80B18CBC 03E00008 */ jr $ra +/* 0023C 80B18CBC 03E00008 */ jr $ra /* 00240 80B18CC0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Tite/func_80B18E08.s b/asm/non_matchings/overlays/actors/ovl_En_Tite/func_80B18E08.s index f7cfbef141..e00d367471 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Tite/func_80B18E08.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Tite/func_80B18E08.s @@ -1,21 +1,21 @@ glabel func_80B18E08 /* 00388 80B18E08 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 0038C 80B18E0C AFBF0014 */ sw $ra, 0x0014($sp) +/* 0038C 80B18E0C AFBF0014 */ sw $ra, 0x0014($sp) /* 00390 80B18E10 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 /* 00394 80B18E14 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 00398 80B18E18 24A5083C */ addiu $a1, $a1, 0x083C ## $a1 = 0600083C -/* 0039C 80B18E1C AFA60018 */ sw $a2, 0x0018($sp) -/* 003A0 80B18E20 0C02947A */ jal func_800A51E8 +/* 0039C 80B18E1C AFA60018 */ sw $a2, 0x0018($sp) +/* 003A0 80B18E20 0C02947A */ jal SkelAnime_ChangeAnimDefaultStop /* 003A4 80B18E24 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 003A8 80B18E28 8FA60018 */ lw $a2, 0x0018($sp) +/* 003A8 80B18E28 8FA60018 */ lw $a2, 0x0018($sp) /* 003AC 80B18E2C 240E0009 */ addiu $t6, $zero, 0x0009 ## $t6 = 00000009 /* 003B0 80B18E30 24040001 */ addiu $a0, $zero, 0x0001 ## $a0 = 00000001 /* 003B4 80B18E34 24050003 */ addiu $a1, $zero, 0x0003 ## $a1 = 00000003 /* 003B8 80B18E38 A0CE02BC */ sb $t6, 0x02BC($a2) ## 000002BC /* 003BC 80B18E3C 0C01DF64 */ jal Math_Rand_S16Offset - + /* 003C0 80B18E40 A4C002E0 */ sh $zero, 0x02E0($a2) ## 000002E0 -/* 003C4 80B18E44 8FA40018 */ lw $a0, 0x0018($sp) +/* 003C4 80B18E44 8FA40018 */ lw $a0, 0x0018($sp) /* 003C8 80B18E48 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 /* 003CC 80B18E4C 3C0580B2 */ lui $a1, %hi(func_80B18E7C) ## $a1 = 80B20000 /* 003D0 80B18E50 848F00B6 */ lh $t7, 0x00B6($a0) ## 000000B6 @@ -23,11 +23,11 @@ glabel func_80B18E08 /* 003D8 80B18E58 A08202E2 */ sb $v0, 0x02E2($a0) ## 000002E2 /* 003DC 80B18E5C E4800068 */ swc1 $f0, 0x0068($a0) ## 00000068 /* 003E0 80B18E60 E4800060 */ swc1 $f0, 0x0060($a0) ## 00000060 -/* 003E4 80B18E64 0C2C62A0 */ jal func_80B18A80 +/* 003E4 80B18E64 0C2C62A0 */ jal func_80B18A80 /* 003E8 80B18E68 A48F0032 */ sh $t7, 0x0032($a0) ## 00000032 -/* 003EC 80B18E6C 8FBF0014 */ lw $ra, 0x0014($sp) +/* 003EC 80B18E6C 8FBF0014 */ lw $ra, 0x0014($sp) /* 003F0 80B18E70 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 003F4 80B18E74 03E00008 */ jr $ra +/* 003F4 80B18E74 03E00008 */ jr $ra /* 003F8 80B18E78 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Tite/func_80B18E7C.s b/asm/non_matchings/overlays/actors/ovl_En_Tite/func_80B18E7C.s index 60de583da3..d47f02b586 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Tite/func_80B18E7C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Tite/func_80B18E7C.s @@ -1,60 +1,60 @@ glabel func_80B18E7C /* 003FC 80B18E7C 27BDFFA8 */ addiu $sp, $sp, 0xFFA8 ## $sp = FFFFFFA8 -/* 00400 80B18E80 AFB00028 */ sw $s0, 0x0028($sp) +/* 00400 80B18E80 AFB00028 */ sw $s0, 0x0028($sp) /* 00404 80B18E84 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00408 80B18E88 AFBF002C */ sw $ra, 0x002C($sp) +/* 00408 80B18E88 AFBF002C */ sw $ra, 0x002C($sp) /* 0040C 80B18E8C 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 00410 80B18E90 AFA5005C */ sw $a1, 0x005C($sp) +/* 00410 80B18E90 AFA5005C */ sw $a1, 0x005C($sp) /* 00414 80B18E94 0C02927F */ jal SkelAnime_FrameUpdateMatrix - -/* 00418 80B18E98 AFA40038 */ sw $a0, 0x0038($sp) -/* 0041C 80B18E9C 504000AA */ beql $v0, $zero, .L80B19148 + +/* 00418 80B18E98 AFA40038 */ sw $a0, 0x0038($sp) +/* 0041C 80B18E9C 504000AA */ beql $v0, $zero, .L80B19148 /* 00420 80B18EA0 860202E0 */ lh $v0, 0x02E0($s0) ## 000002E0 /* 00424 80B18EA4 860302E0 */ lh $v1, 0x02E0($s0) ## 000002E0 /* 00428 80B18EA8 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 0042C 80B18EAC 10600009 */ beq $v1, $zero, .L80B18ED4 -/* 00430 80B18EB0 AFA30050 */ sw $v1, 0x0050($sp) -/* 00434 80B18EB4 1061002E */ beq $v1, $at, .L80B18F70 +/* 0042C 80B18EAC 10600009 */ beq $v1, $zero, .L80B18ED4 +/* 00430 80B18EB0 AFA30050 */ sw $v1, 0x0050($sp) +/* 00434 80B18EB4 1061002E */ beq $v1, $at, .L80B18F70 /* 00438 80B18EB8 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 0043C 80B18EBC 10610082 */ beq $v1, $at, .L80B190C8 +/* 0043C 80B18EBC 10610082 */ beq $v1, $at, .L80B190C8 /* 00440 80B18EC0 24010003 */ addiu $at, $zero, 0x0003 ## $at = 00000003 -/* 00444 80B18EC4 5061008E */ beql $v1, $at, .L80B19100 +/* 00444 80B18EC4 5061008E */ beql $v1, $at, .L80B19100 /* 00448 80B18EC8 44809000 */ mtc1 $zero, $f18 ## $f18 = 0.00 -/* 0044C 80B18ECC 10000096 */ beq $zero, $zero, .L80B19128 -/* 00450 80B18ED0 8FB90050 */ lw $t9, 0x0050($sp) +/* 0044C 80B18ECC 10000096 */ beq $zero, $zero, .L80B19128 +/* 00450 80B18ED0 8FB90050 */ lw $t9, 0x0050($sp) .L80B18ED4: /* 00454 80B18ED4 860F001C */ lh $t7, 0x001C($s0) ## 0000001C /* 00458 80B18ED8 240E0001 */ addiu $t6, $zero, 0x0001 ## $t6 = 00000001 /* 0045C 80B18EDC 2401FFFE */ addiu $at, $zero, 0xFFFE ## $at = FFFFFFFE -/* 00460 80B18EE0 15E10004 */ bne $t7, $at, .L80B18EF4 +/* 00460 80B18EE0 15E10004 */ bne $t7, $at, .L80B18EF4 /* 00464 80B18EE4 A60E02E0 */ sh $t6, 0x02E0($s0) ## 000002E0 /* 00468 80B18EE8 96180088 */ lhu $t8, 0x0088($s0) ## 00000088 /* 0046C 80B18EEC 33190020 */ andi $t9, $t8, 0x0020 ## $t9 = 00000000 -/* 00470 80B18EF0 1720000D */ bne $t9, $zero, .L80B18F28 +/* 00470 80B18EF0 1720000D */ bne $t9, $zero, .L80B18F28 .L80B18EF4: /* 00474 80B18EF4 3C01C6FA */ lui $at, 0xC6FA ## $at = C6FA0000 /* 00478 80B18EF8 44812000 */ mtc1 $at, $f4 ## $f4 = -32000.00 /* 0047C 80B18EFC C6000080 */ lwc1 $f0, 0x0080($s0) ## 00000080 /* 00480 80B18F00 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00484 80B18F04 4600203C */ c.lt.s $f4, $f0 +/* 00484 80B18F04 4600203C */ c.lt.s $f4, $f0 /* 00488 80B18F08 00000000 */ nop -/* 0048C 80B18F0C 45000002 */ bc1f .L80B18F18 +/* 0048C 80B18F0C 45000002 */ bc1f .L80B18F18 /* 00490 80B18F10 00000000 */ nop /* 00494 80B18F14 E6000028 */ swc1 $f0, 0x0028($s0) ## 00000028 .L80B18F18: /* 00498 80B18F18 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 0049C 80B18F1C 2405386C */ addiu $a1, $zero, 0x386C ## $a1 = 0000386C -/* 004A0 80B18F20 10000009 */ beq $zero, $zero, .L80B18F48 +/* 004A0 80B18F20 10000009 */ beq $zero, $zero, .L80B18F48 /* 004A4 80B18F24 3C014100 */ lui $at, 0x4100 ## $at = 41000000 .L80B18F28: /* 004A8 80B18F28 C6060028 */ lwc1 $f6, 0x0028($s0) ## 00000028 /* 004AC 80B18F2C C6080084 */ lwc1 $f8, 0x0084($s0) ## 00000084 /* 004B0 80B18F30 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 004B4 80B18F34 2405388E */ addiu $a1, $zero, 0x388E ## $a1 = 0000388E -/* 004B8 80B18F38 46083280 */ add.s $f10, $f6, $f8 +/* 004B8 80B18F38 46083280 */ add.s $f10, $f6, $f8 /* 004BC 80B18F3C 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 004C0 80B18F40 E60A0028 */ swc1 $f10, 0x0028($s0) ## 00000028 /* 004C4 80B18F44 3C014100 */ lui $at, 0x4100 ## $at = 41000000 .L80B18F48: @@ -66,7 +66,7 @@ glabel func_80B18E7C /* 004DC 80B18F5C 860302E0 */ lh $v1, 0x02E0($s0) ## 000002E0 /* 004E0 80B18F60 E6100060 */ swc1 $f16, 0x0060($s0) ## 00000060 /* 004E4 80B18F64 E612006C */ swc1 $f18, 0x006C($s0) ## 0000006C -/* 004E8 80B18F68 1000006E */ beq $zero, $zero, .L80B19124 +/* 004E8 80B18F68 1000006E */ beq $zero, $zero, .L80B19124 /* 004EC 80B18F6C E6040068 */ swc1 $f4, 0x0068($s0) ## 00000068 .L80B18F70: /* 004F0 80B18F70 8E080004 */ lw $t0, 0x0004($s0) ## 00000004 @@ -74,31 +74,31 @@ glabel func_80B18E7C /* 004F8 80B18F78 3C010100 */ lui $at, 0x0100 ## $at = 01000000 /* 004FC 80B18F7C 01014825 */ or $t1, $t0, $at ## $t1 = 01000000 /* 00500 80B18F80 306A0003 */ andi $t2, $v1, 0x0003 ## $t2 = 00000000 -/* 00504 80B18F84 15400008 */ bne $t2, $zero, .L80B18FA8 +/* 00504 80B18F84 15400008 */ bne $t2, $zero, .L80B18FA8 /* 00508 80B18F88 AE090004 */ sw $t1, 0x0004($s0) ## 00000004 /* 0050C 80B18F8C 860B001C */ lh $t3, 0x001C($s0) ## 0000001C /* 00510 80B18F90 2401FFFE */ addiu $at, $zero, 0xFFFE ## $at = FFFFFFFE /* 00514 80B18F94 306C0020 */ andi $t4, $v1, 0x0020 ## $t4 = 00000000 -/* 00518 80B18F98 15610049 */ bne $t3, $at, .L80B190C0 +/* 00518 80B18F98 15610049 */ bne $t3, $at, .L80B190C0 /* 0051C 80B18F9C 00000000 */ nop -/* 00520 80B18FA0 11800047 */ beq $t4, $zero, .L80B190C0 +/* 00520 80B18FA0 11800047 */ beq $t4, $zero, .L80B190C0 /* 00524 80B18FA4 00000000 */ nop .L80B18FA8: /* 00528 80B18FA8 44803000 */ mtc1 $zero, $f6 ## $f6 = 0.00 /* 0052C 80B18FAC C6080060 */ lwc1 $f8, 0x0060($s0) ## 00000060 -/* 00530 80B18FB0 4606403E */ c.le.s $f8, $f6 +/* 00530 80B18FB0 4606403E */ c.le.s $f8, $f6 /* 00534 80B18FB4 00000000 */ nop -/* 00538 80B18FB8 45000041 */ bc1f .L80B190C0 +/* 00538 80B18FB8 45000041 */ bc1f .L80B190C0 /* 0053C 80B18FBC 00000000 */ nop /* 00540 80B18FC0 860E001C */ lh $t6, 0x001C($s0) ## 0000001C /* 00544 80B18FC4 240D0002 */ addiu $t5, $zero, 0x0002 ## $t5 = 00000002 /* 00548 80B18FC8 2401FFFE */ addiu $at, $zero, 0xFFFE ## $at = FFFFFFFE -/* 0054C 80B18FCC 15C10006 */ bne $t6, $at, .L80B18FE8 +/* 0054C 80B18FCC 15C10006 */ bne $t6, $at, .L80B18FE8 /* 00550 80B18FD0 A60D02E0 */ sh $t5, 0x02E0($s0) ## 000002E0 /* 00554 80B18FD4 960F0088 */ lhu $t7, 0x0088($s0) ## 00000088 /* 00558 80B18FD8 3C01C100 */ lui $at, 0xC100 ## $at = C1000000 /* 0055C 80B18FDC 31F80020 */ andi $t8, $t7, 0x0020 ## $t8 = 00000000 -/* 00560 80B18FE0 5700000F */ bnel $t8, $zero, .L80B19020 +/* 00560 80B18FE0 5700000F */ bnel $t8, $zero, .L80B19020 /* 00564 80B18FE4 C6060060 */ lwc1 $f6, 0x0060($s0) ## 00000060 .L80B18FE8: /* 00568 80B18FE8 3C01C6FA */ lui $at, 0xC6FA ## $at = C6FA0000 @@ -106,22 +106,22 @@ glabel func_80B18E7C /* 00570 80B18FF0 C6000080 */ lwc1 $f0, 0x0080($s0) ## 00000080 /* 00574 80B18FF4 44808000 */ mtc1 $zero, $f16 ## $f16 = 0.00 /* 00578 80B18FF8 44809000 */ mtc1 $zero, $f18 ## $f18 = 0.00 -/* 0057C 80B18FFC 4600503C */ c.lt.s $f10, $f0 +/* 0057C 80B18FFC 4600503C */ c.lt.s $f10, $f0 /* 00580 80B19000 00000000 */ nop -/* 00584 80B19004 45020003 */ bc1fl .L80B19014 +/* 00584 80B19004 45020003 */ bc1fl .L80B19014 /* 00588 80B19008 E6100060 */ swc1 $f16, 0x0060($s0) ## 00000060 /* 0058C 80B1900C E6000028 */ swc1 $f0, 0x0028($s0) ## 00000028 /* 00590 80B19010 E6100060 */ swc1 $f16, 0x0060($s0) ## 00000060 .L80B19014: -/* 00594 80B19014 10000028 */ beq $zero, $zero, .L80B190B8 +/* 00594 80B19014 10000028 */ beq $zero, $zero, .L80B190B8 /* 00598 80B19018 E6120068 */ swc1 $f18, 0x0068($s0) ## 00000068 /* 0059C 80B1901C C6060060 */ lwc1 $f6, 0x0060($s0) ## 00000060 .L80B19020: /* 005A0 80B19020 44814000 */ mtc1 $at, $f8 ## $f8 = -32000.00 /* 005A4 80B19024 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 -/* 005A8 80B19028 4608303C */ c.lt.s $f6, $f8 +/* 005A8 80B19028 4608303C */ c.lt.s $f6, $f8 /* 005AC 80B1902C E604006C */ swc1 $f4, 0x006C($s0) ## 0000006C -/* 005B0 80B19030 4502001E */ bc1fl .L80B190AC +/* 005B0 80B19030 4502001E */ bc1fl .L80B190AC /* 005B4 80B19034 44805000 */ mtc1 $zero, $f10 ## $f10 = 0.00 /* 005B8 80B19038 8E080024 */ lw $t0, 0x0024($s0) ## 00000024 /* 005BC 80B1903C 27A50044 */ addiu $a1, $sp, 0x0044 ## $a1 = FFFFFFEC @@ -134,22 +134,22 @@ glabel func_80B18E7C /* 005D8 80B19058 8E08002C */ lw $t0, 0x002C($s0) ## 0000002C /* 005DC 80B1905C 240701F4 */ addiu $a3, $zero, 0x01F4 ## $a3 = 000001F4 /* 005E0 80B19060 ACA80008 */ sw $t0, 0x0008($a1) ## FFFFFFF4 -/* 005E4 80B19064 C7AA0048 */ lwc1 $f10, 0x0048($sp) +/* 005E4 80B19064 C7AA0048 */ lwc1 $f10, 0x0048($sp) /* 005E8 80B19068 C6100084 */ lwc1 $f16, 0x0084($s0) ## 00000084 -/* 005EC 80B1906C 46105480 */ add.s $f18, $f10, $f16 -/* 005F0 80B19070 E7B20048 */ swc1 $f18, 0x0048($sp) +/* 005EC 80B1906C 46105480 */ add.s $f18, $f10, $f16 +/* 005F0 80B19070 E7B20048 */ swc1 $f18, 0x0048($sp) /* 005F4 80B19074 C6040060 */ lwc1 $f4, 0x0060($s0) ## 00000060 /* 005F8 80B19078 860902E0 */ lh $t1, 0x02E0($s0) ## 000002E0 -/* 005FC 80B1907C 46062202 */ mul.s $f8, $f4, $f6 +/* 005FC 80B1907C 46062202 */ mul.s $f8, $f4, $f6 /* 00600 80B19080 252A0001 */ addiu $t2, $t1, 0x0001 ## $t2 = 01000001 /* 00604 80B19084 A60A02E0 */ sh $t2, 0x02E0($s0) ## 000002E0 /* 00608 80B19088 860B02E0 */ lh $t3, 0x02E0($s0) ## 000002E0 /* 0060C 80B1908C E6080060 */ swc1 $f8, 0x0060($s0) ## 00000060 -/* 00610 80B19090 AFA00010 */ sw $zero, 0x0010($sp) -/* 00614 80B19094 8FA4005C */ lw $a0, 0x005C($sp) -/* 00618 80B19098 0C00A511 */ jal func_80029444 -/* 0061C 80B1909C AFAB0050 */ sw $t3, 0x0050($sp) -/* 00620 80B190A0 10000006 */ beq $zero, $zero, .L80B190BC +/* 00610 80B19090 AFA00010 */ sw $zero, 0x0010($sp) +/* 00614 80B19094 8FA4005C */ lw $a0, 0x005C($sp) +/* 00618 80B19098 0C00A511 */ jal func_80029444 +/* 0061C 80B1909C AFAB0050 */ sw $t3, 0x0050($sp) +/* 00620 80B190A0 10000006 */ beq $zero, $zero, .L80B190BC /* 00624 80B190A4 860C00B6 */ lh $t4, 0x00B6($s0) ## 000000B6 /* 00628 80B190A8 44805000 */ mtc1 $zero, $f10 ## $f10 = 0.00 .L80B190AC: @@ -161,67 +161,67 @@ glabel func_80B18E7C .L80B190BC: /* 0063C 80B190BC A60C0032 */ sh $t4, 0x0032($s0) ## 00000032 .L80B190C0: -/* 00640 80B190C0 10000018 */ beq $zero, $zero, .L80B19124 +/* 00640 80B190C0 10000018 */ beq $zero, $zero, .L80B19124 /* 00644 80B190C4 860302E0 */ lh $v1, 0x02E0($s0) ## 000002E0 .L80B190C8: /* 00648 80B190C8 920202E2 */ lbu $v0, 0x02E2($s0) ## 000002E2 -/* 0064C 80B190CC 10400007 */ beq $v0, $zero, .L80B190EC +/* 0064C 80B190CC 10400007 */ beq $v0, $zero, .L80B190EC /* 00650 80B190D0 244DFFFF */ addiu $t5, $v0, 0xFFFF ## $t5 = FFFFFFFF /* 00654 80B190D4 920E02F8 */ lbu $t6, 0x02F8($s0) ## 000002F8 /* 00658 80B190D8 A20D02E2 */ sb $t5, 0x02E2($s0) ## 000002E2 /* 0065C 80B190DC A60002E0 */ sh $zero, 0x02E0($s0) ## 000002E0 /* 00660 80B190E0 31CFFFFD */ andi $t7, $t6, 0xFFFD ## $t7 = 00000000 -/* 00664 80B190E4 10000003 */ beq $zero, $zero, .L80B190F4 +/* 00664 80B190E4 10000003 */ beq $zero, $zero, .L80B190F4 /* 00668 80B190E8 A20F02F8 */ sb $t7, 0x02F8($s0) ## 000002F8 .L80B190EC: -/* 0066C 80B190EC 0C2C6549 */ jal func_80B19524 +/* 0066C 80B190EC 0C2C6549 */ jal func_80B19524 /* 00670 80B190F0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 .L80B190F4: -/* 00674 80B190F4 1000000B */ beq $zero, $zero, .L80B19124 +/* 00674 80B190F4 1000000B */ beq $zero, $zero, .L80B19124 /* 00678 80B190F8 860302E0 */ lh $v1, 0x02E0($s0) ## 000002E0 /* 0067C 80B190FC 44809000 */ mtc1 $zero, $f18 ## $f18 = 0.00 .L80B19100: /* 00680 80B19100 C6040084 */ lwc1 $f4, 0x0084($s0) ## 00000084 /* 00684 80B19104 24180002 */ addiu $t8, $zero, 0x0002 ## $t8 = 00000002 -/* 00688 80B19108 46049032 */ c.eq.s $f18, $f4 +/* 00688 80B19108 46049032 */ c.eq.s $f18, $f4 /* 0068C 80B1910C 00000000 */ nop -/* 00690 80B19110 45020005 */ bc1fl .L80B19128 -/* 00694 80B19114 8FB90050 */ lw $t9, 0x0050($sp) +/* 00690 80B19110 45020005 */ bc1fl .L80B19128 +/* 00694 80B19114 8FB90050 */ lw $t9, 0x0050($sp) /* 00698 80B19118 A61802E0 */ sh $t8, 0x02E0($s0) ## 000002E0 /* 0069C 80B1911C 860302E0 */ lh $v1, 0x02E0($s0) ## 000002E0 -/* 006A0 80B19120 AFA30050 */ sw $v1, 0x0050($sp) +/* 006A0 80B19120 AFA30050 */ sw $v1, 0x0050($sp) .L80B19124: -/* 006A4 80B19124 8FB90050 */ lw $t9, 0x0050($sp) +/* 006A4 80B19124 8FB90050 */ lw $t9, 0x0050($sp) .L80B19128: -/* 006A8 80B19128 8FA40038 */ lw $a0, 0x0038($sp) -/* 006AC 80B1912C 00034080 */ sll $t0, $v1, 2 -/* 006B0 80B19130 13230004 */ beq $t9, $v1, .L80B19144 +/* 006A8 80B19128 8FA40038 */ lw $a0, 0x0038($sp) +/* 006AC 80B1912C 00034080 */ sll $t0, $v1, 2 +/* 006B0 80B19130 13230004 */ beq $t9, $v1, .L80B19144 /* 006B4 80B19134 3C0580B2 */ lui $a1, %hi(D_80B1B634) ## $a1 = 80B20000 -/* 006B8 80B19138 00A82821 */ addu $a1, $a1, $t0 -/* 006BC 80B1913C 0C02947A */ jal func_800A51E8 -/* 006C0 80B19140 8CA5B634 */ lw $a1, %lo(D_80B1B634)($a1) +/* 006B8 80B19138 00A82821 */ addu $a1, $a1, $t0 +/* 006BC 80B1913C 0C02947A */ jal SkelAnime_ChangeAnimDefaultStop +/* 006C0 80B19140 8CA5B634 */ lw $a1, %lo(D_80B1B634)($a1) .L80B19144: /* 006C4 80B19144 860202E0 */ lh $v0, 0x02E0($s0) ## 000002E0 .L80B19148: /* 006C8 80B19148 26040032 */ addiu $a0, $s0, 0x0032 ## $a0 = 00000032 /* 006CC 80B1914C 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 -/* 006D0 80B19150 1040000B */ beq $v0, $zero, .L80B19180 +/* 006D0 80B19150 1040000B */ beq $v0, $zero, .L80B19180 /* 006D4 80B19154 240703E8 */ addiu $a3, $zero, 0x03E8 ## $a3 = 000003E8 /* 006D8 80B19158 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 006DC 80B1915C 1041002D */ beq $v0, $at, .L80B19214 +/* 006DC 80B1915C 1041002D */ beq $v0, $at, .L80B19214 /* 006E0 80B19160 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 006E4 80B19164 1041006F */ beq $v0, $at, .L80B19324 +/* 006E4 80B19164 1041006F */ beq $v0, $at, .L80B19324 /* 006E8 80B19168 26040032 */ addiu $a0, $s0, 0x0032 ## $a0 = 00000032 /* 006EC 80B1916C 24010003 */ addiu $at, $zero, 0x0003 ## $at = 00000003 -/* 006F0 80B19170 10410073 */ beq $v0, $at, .L80B19340 +/* 006F0 80B19170 10410073 */ beq $v0, $at, .L80B19340 /* 006F4 80B19174 26040060 */ addiu $a0, $s0, 0x0060 ## $a0 = 00000060 -/* 006F8 80B19178 1000008A */ beq $zero, $zero, .L80B193A4 +/* 006F8 80B19178 1000008A */ beq $zero, $zero, .L80B193A4 /* 006FC 80B1917C 96030088 */ lhu $v1, 0x0088($s0) ## 00000088 .L80B19180: /* 00700 80B19180 8605008A */ lh $a1, 0x008A($s0) ## 0000008A /* 00704 80B19184 0C01E1A7 */ jal Math_SmoothScaleMaxMinS - -/* 00708 80B19188 AFA00010 */ sw $zero, 0x0010($sp) + +/* 00708 80B19188 AFA00010 */ sw $zero, 0x0010($sp) /* 0070C 80B1918C 86090032 */ lh $t1, 0x0032($s0) ## 00000032 /* 00710 80B19190 3C014396 */ lui $at, 0x4396 ## $at = 43960000 /* 00714 80B19194 44813000 */ mtc1 $at, $f6 ## $f6 = 300.00 @@ -229,256 +229,256 @@ glabel func_80B18E7C /* 0071C 80B1919C A60900B6 */ sh $t1, 0x00B6($s0) ## 000000B6 /* 00720 80B191A0 860B00B6 */ lh $t3, 0x00B6($s0) ## 000000B6 /* 00724 80B191A4 860A008A */ lh $t2, 0x008A($s0) ## 0000008A -/* 00728 80B191A8 4608303C */ c.lt.s $f6, $f8 +/* 00728 80B191A8 4608303C */ c.lt.s $f6, $f8 /* 0072C 80B191AC 3C0142A0 */ lui $at, 0x42A0 ## $at = 42A00000 -/* 00730 80B191B0 014B1823 */ subu $v1, $t2, $t3 -/* 00734 80B191B4 00031C00 */ sll $v1, $v1, 16 -/* 00738 80B191B8 4500000B */ bc1f .L80B191E8 -/* 0073C 80B191BC 00031C03 */ sra $v1, $v1, 16 +/* 00730 80B191B0 014B1823 */ subu $v1, $t2, $t3 +/* 00734 80B191B4 00031C00 */ sll $v1, $v1, 16 +/* 00738 80B191B8 4500000B */ bc1f .L80B191E8 +/* 0073C 80B191BC 00031C03 */ sra $v1, $v1, 16 /* 00740 80B191C0 44815000 */ mtc1 $at, $f10 ## $f10 = 80.00 /* 00744 80B191C4 C6100094 */ lwc1 $f16, 0x0094($s0) ## 00000094 -/* 00748 80B191C8 4610503C */ c.lt.s $f10, $f16 +/* 00748 80B191C8 4610503C */ c.lt.s $f10, $f16 /* 0074C 80B191CC 00000000 */ nop -/* 00750 80B191D0 45000005 */ bc1f .L80B191E8 +/* 00750 80B191D0 45000005 */ bc1f .L80B191E8 /* 00754 80B191D4 00000000 */ nop -/* 00758 80B191D8 0C2C6317 */ jal func_80B18C5C +/* 00758 80B191D8 0C2C6317 */ jal func_80B18C5C /* 0075C 80B191DC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00760 80B191E0 1000000A */ beq $zero, $zero, .L80B1920C +/* 00760 80B191E0 1000000A */ beq $zero, $zero, .L80B1920C /* 00764 80B191E4 00000000 */ nop .L80B191E8: -/* 00768 80B191E8 04600003 */ bltz $v1, .L80B191F8 -/* 0076C 80B191EC 00031023 */ subu $v0, $zero, $v1 -/* 00770 80B191F0 10000001 */ beq $zero, $zero, .L80B191F8 +/* 00768 80B191E8 04600003 */ bltz $v1, .L80B191F8 +/* 0076C 80B191EC 00031023 */ subu $v0, $zero, $v1 +/* 00770 80B191F0 10000001 */ beq $zero, $zero, .L80B191F8 /* 00774 80B191F4 00601025 */ or $v0, $v1, $zero ## $v0 = 00000000 .L80B191F8: -/* 00778 80B191F8 28412328 */ slti $at, $v0, 0x2328 -/* 0077C 80B191FC 14200003 */ bne $at, $zero, .L80B1920C +/* 00778 80B191F8 28412328 */ slti $at, $v0, 0x2328 +/* 0077C 80B191FC 14200003 */ bne $at, $zero, .L80B1920C /* 00780 80B19200 00000000 */ nop -/* 00784 80B19204 0C2C6549 */ jal func_80B19524 +/* 00784 80B19204 0C2C6549 */ jal func_80B19524 /* 00788 80B19208 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 .L80B1920C: -/* 0078C 80B1920C 10000065 */ beq $zero, $zero, .L80B193A4 +/* 0078C 80B1920C 10000065 */ beq $zero, $zero, .L80B193A4 /* 00790 80B19210 96030088 */ lhu $v1, 0x0088($s0) ## 00000088 .L80B19214: /* 00794 80B19214 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 /* 00798 80B19218 44812000 */ mtc1 $at, $f4 ## $f4 = 5.00 /* 0079C 80B1921C C6120060 */ lwc1 $f18, 0x0060($s0) ## 00000060 -/* 007A0 80B19220 4612203E */ c.le.s $f4, $f18 +/* 007A0 80B19220 4612203E */ c.le.s $f4, $f18 /* 007A4 80B19224 00000000 */ nop -/* 007A8 80B19228 45020012 */ bc1fl .L80B19274 +/* 007A8 80B19228 45020012 */ bc1fl .L80B19274 /* 007AC 80B1922C 920202F8 */ lbu $v0, 0x02F8($s0) ## 000002F8 /* 007B0 80B19230 960C0088 */ lhu $t4, 0x0088($s0) ## 00000088 -/* 007B4 80B19234 8FA4005C */ lw $a0, 0x005C($sp) +/* 007B4 80B19234 8FA4005C */ lw $a0, 0x005C($sp) /* 007B8 80B19238 318D0001 */ andi $t5, $t4, 0x0001 ## $t5 = 00000000 -/* 007BC 80B1923C 51A0000D */ beql $t5, $zero, .L80B19274 +/* 007BC 80B1923C 51A0000D */ beql $t5, $zero, .L80B19274 /* 007C0 80B19240 920202F8 */ lbu $v0, 0x02F8($s0) ## 000002F8 -/* 007C4 80B19244 0C00D56E */ jal func_800355B8 +/* 007C4 80B19244 0C00D56E */ jal func_800355B8 /* 007C8 80B19248 26050348 */ addiu $a1, $s0, 0x0348 ## $a1 = 00000348 -/* 007CC 80B1924C 8FA4005C */ lw $a0, 0x005C($sp) -/* 007D0 80B19250 0C00D56E */ jal func_800355B8 +/* 007CC 80B1924C 8FA4005C */ lw $a0, 0x005C($sp) +/* 007D0 80B19250 0C00D56E */ jal func_800355B8 /* 007D4 80B19254 26050354 */ addiu $a1, $s0, 0x0354 ## $a1 = 00000354 -/* 007D8 80B19258 8FA4005C */ lw $a0, 0x005C($sp) -/* 007DC 80B1925C 0C00D56E */ jal func_800355B8 +/* 007D8 80B19258 8FA4005C */ lw $a0, 0x005C($sp) +/* 007DC 80B1925C 0C00D56E */ jal func_800355B8 /* 007E0 80B19260 26050360 */ addiu $a1, $s0, 0x0360 ## $a1 = 00000360 -/* 007E4 80B19264 8FA4005C */ lw $a0, 0x005C($sp) -/* 007E8 80B19268 0C00D56E */ jal func_800355B8 +/* 007E4 80B19264 8FA4005C */ lw $a0, 0x005C($sp) +/* 007E8 80B19268 0C00D56E */ jal func_800355B8 /* 007EC 80B1926C 2605036C */ addiu $a1, $s0, 0x036C ## $a1 = 0000036C /* 007F0 80B19270 920202F8 */ lbu $v0, 0x02F8($s0) ## 000002F8 .L80B19274: -/* 007F4 80B19274 8FB9005C */ lw $t9, 0x005C($sp) +/* 007F4 80B19274 8FB9005C */ lw $t9, 0x005C($sp) /* 007F8 80B19278 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 007FC 80B1927C 304E0002 */ andi $t6, $v0, 0x0002 ## $t6 = 00000000 -/* 00800 80B19280 15C0000C */ bne $t6, $zero, .L80B192B4 +/* 00800 80B19280 15C0000C */ bne $t6, $zero, .L80B192B4 /* 00804 80B19284 3048FFFD */ andi $t0, $v0, 0xFFFD ## $t0 = 00000000 /* 00808 80B19288 8E0F0004 */ lw $t7, 0x0004($s0) ## 00000004 /* 0080C 80B1928C 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 00810 80B19290 8FA4005C */ lw $a0, 0x005C($sp) +/* 00810 80B19290 8FA4005C */ lw $a0, 0x005C($sp) /* 00814 80B19294 31F80040 */ andi $t8, $t7, 0x0040 ## $t8 = 00000000 -/* 00818 80B19298 13000006 */ beq $t8, $zero, .L80B192B4 +/* 00818 80B19298 13000006 */ beq $t8, $zero, .L80B192B4 /* 0081C 80B1929C 34211E60 */ ori $at, $at, 0x1E60 ## $at = 00011E60 -/* 00820 80B192A0 00812821 */ addu $a1, $a0, $at +/* 00820 80B192A0 00812821 */ addu $a1, $a0, $at /* 00824 80B192A4 0C0175E7 */ jal Actor_CollisionCheck_SetAT ## CollisionCheck_setAT /* 00828 80B192A8 260602E8 */ addiu $a2, $s0, 0x02E8 ## $a2 = 000002E8 -/* 0082C 80B192AC 1000001B */ beq $zero, $zero, .L80B1931C +/* 0082C 80B192AC 1000001B */ beq $zero, $zero, .L80B1931C /* 00830 80B192B0 00000000 */ nop .L80B192B4: /* 00834 80B192B4 8F271C44 */ lw $a3, 0x1C44($t9) ## 00001C44 /* 00838 80B192B8 A20802F8 */ sb $t0, 0x02F8($s0) ## 000002F8 -/* 0083C 80B192BC 8FA40038 */ lw $a0, 0x0038($sp) +/* 0083C 80B192BC 8FA40038 */ lw $a0, 0x0038($sp) /* 00840 80B192C0 24A512E4 */ addiu $a1, $a1, 0x12E4 ## $a1 = 000012E4 /* 00844 80B192C4 3C064080 */ lui $a2, 0x4080 ## $a2 = 40800000 -/* 00848 80B192C8 0C0294D3 */ jal func_800A534C -/* 0084C 80B192CC AFA70040 */ sw $a3, 0x0040($sp) -/* 00850 80B192D0 8FA70040 */ lw $a3, 0x0040($sp) +/* 00848 80B192C8 0C0294D3 */ jal SkelAnime_ChangeAnimTransitionRepeat +/* 0084C 80B192CC AFA70040 */ sw $a3, 0x0040($sp) +/* 00850 80B192D0 8FA70040 */ lw $a3, 0x0040($sp) /* 00854 80B192D4 8E0A02EC */ lw $t2, 0x02EC($s0) ## 000002EC /* 00858 80B192D8 8609008A */ lh $t1, 0x008A($s0) ## 0000008A /* 0085C 80B192DC 3C01C0C0 */ lui $at, 0xC0C0 ## $at = C0C00000 /* 00860 80B192E0 44819000 */ mtc1 $at, $f18 ## $f18 = -6.00 /* 00864 80B192E4 A6090032 */ sh $t1, 0x0032($s0) ## 00000032 -/* 00868 80B192E8 14EA0008 */ bne $a3, $t2, .L80B1930C +/* 00868 80B192E8 14EA0008 */ bne $a3, $t2, .L80B1930C /* 0086C 80B192EC E6120068 */ swc1 $f18, 0x0068($s0) ## 00000068 /* 00870 80B192F0 920B02F8 */ lbu $t3, 0x02F8($s0) ## 000002F8 /* 00874 80B192F4 00E02025 */ or $a0, $a3, $zero ## $a0 = 00000000 /* 00878 80B192F8 316C0004 */ andi $t4, $t3, 0x0004 ## $t4 = 00000000 -/* 0087C 80B192FC 15800003 */ bne $t4, $zero, .L80B1930C +/* 0087C 80B192FC 15800003 */ bne $t4, $zero, .L80B1930C /* 00880 80B19300 00000000 */ nop /* 00884 80B19304 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 00888 80B19308 2405083E */ addiu $a1, $zero, 0x083E ## $a1 = 0000083E .L80B1930C: /* 0088C 80B1930C 3C0580B2 */ lui $a1, %hi(func_80B19E94) ## $a1 = 80B20000 /* 00890 80B19310 24A59E94 */ addiu $a1, $a1, %lo(func_80B19E94) ## $a1 = 80B19E94 -/* 00894 80B19314 0C2C62A0 */ jal func_80B18A80 +/* 00894 80B19314 0C2C62A0 */ jal func_80B18A80 /* 00898 80B19318 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 .L80B1931C: -/* 0089C 80B1931C 10000021 */ beq $zero, $zero, .L80B193A4 +/* 0089C 80B1931C 10000021 */ beq $zero, $zero, .L80B193A4 /* 008A0 80B19320 96030088 */ lhu $v1, 0x0088($s0) ## 00000088 .L80B19324: /* 008A4 80B19324 8605008A */ lh $a1, 0x008A($s0) ## 0000008A -/* 008A8 80B19328 AFA00010 */ sw $zero, 0x0010($sp) +/* 008A8 80B19328 AFA00010 */ sw $zero, 0x0010($sp) /* 008AC 80B1932C 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 /* 008B0 80B19330 0C01E1A7 */ jal Math_SmoothScaleMaxMinS - + /* 008B4 80B19334 240705DC */ addiu $a3, $zero, 0x05DC ## $a3 = 000005DC -/* 008B8 80B19338 1000001A */ beq $zero, $zero, .L80B193A4 +/* 008B8 80B19338 1000001A */ beq $zero, $zero, .L80B193A4 /* 008BC 80B1933C 96030088 */ lhu $v1, 0x0088($s0) ## 00000088 .L80B19340: /* 008C0 80B19340 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 /* 008C4 80B19344 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 008C8 80B19348 3C074000 */ lui $a3, 0x4000 ## $a3 = 40000000 -/* 008CC 80B1934C 44050000 */ mfc1 $a1, $f0 +/* 008CC 80B1934C 44050000 */ mfc1 $a1, $f0 /* 008D0 80B19350 0C01E0C4 */ jal Math_SmoothScaleMaxMinF - -/* 008D4 80B19354 E7A00010 */ swc1 $f0, 0x0010($sp) + +/* 008D4 80B19354 E7A00010 */ swc1 $f0, 0x0010($sp) /* 008D8 80B19358 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 /* 008DC 80B1935C 26040068 */ addiu $a0, $s0, 0x0068 ## $a0 = 00000068 /* 008E0 80B19360 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 008E4 80B19364 44050000 */ mfc1 $a1, $f0 +/* 008E4 80B19364 44050000 */ mfc1 $a1, $f0 /* 008E8 80B19368 3C073F00 */ lui $a3, 0x3F00 ## $a3 = 3F000000 /* 008EC 80B1936C 0C01E0C4 */ jal Math_SmoothScaleMaxMinF - -/* 008F0 80B19370 E7A00010 */ swc1 $f0, 0x0010($sp) + +/* 008F0 80B19370 E7A00010 */ swc1 $f0, 0x0010($sp) /* 008F4 80B19374 C6080028 */ lwc1 $f8, 0x0028($s0) ## 00000028 /* 008F8 80B19378 C60A0084 */ lwc1 $f10, 0x0084($s0) ## 00000084 /* 008FC 80B1937C 44809000 */ mtc1 $zero, $f18 ## $f18 = 0.00 /* 00900 80B19380 26040028 */ addiu $a0, $s0, 0x0028 ## $a0 = 00000028 -/* 00904 80B19384 460A4400 */ add.s $f16, $f8, $f10 +/* 00904 80B19384 460A4400 */ add.s $f16, $f8, $f10 /* 00908 80B19388 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 0090C 80B1938C 3C074000 */ lui $a3, 0x4000 ## $a3 = 40000000 -/* 00910 80B19390 E7B20010 */ swc1 $f18, 0x0010($sp) -/* 00914 80B19394 44058000 */ mfc1 $a1, $f16 +/* 00910 80B19390 E7B20010 */ swc1 $f18, 0x0010($sp) +/* 00914 80B19394 44058000 */ mfc1 $a1, $f16 /* 00918 80B19398 0C01E0C4 */ jal Math_SmoothScaleMaxMinF - + /* 0091C 80B1939C 00000000 */ nop /* 00920 80B193A0 96030088 */ lhu $v1, 0x0088($s0) ## 00000088 .L80B193A4: /* 00924 80B193A4 306D0002 */ andi $t5, $v1, 0x0002 ## $t5 = 00000000 -/* 00928 80B193A8 11A00035 */ beq $t5, $zero, .L80B19480 +/* 00928 80B193A8 11A00035 */ beq $t5, $zero, .L80B19480 /* 0092C 80B193AC 306E0020 */ andi $t6, $v1, 0x0020 ## $t6 = 00000000 -/* 00930 80B193B0 15C00033 */ bne $t6, $zero, .L80B19480 -/* 00934 80B193B4 8FA4005C */ lw $a0, 0x005C($sp) +/* 00930 80B193B0 15C00033 */ bne $t6, $zero, .L80B19480 +/* 00934 80B193B4 8FA4005C */ lw $a0, 0x005C($sp) /* 00938 80B193B8 240F0050 */ addiu $t7, $zero, 0x0050 ## $t7 = 00000050 /* 0093C 80B193BC 2418000F */ addiu $t8, $zero, 0x000F ## $t8 = 0000000F /* 00940 80B193C0 24190001 */ addiu $t9, $zero, 0x0001 ## $t9 = 00000001 /* 00944 80B193C4 26080354 */ addiu $t0, $s0, 0x0354 ## $t0 = 00000354 /* 00948 80B193C8 26090360 */ addiu $t1, $s0, 0x0360 ## $t1 = 00000360 /* 0094C 80B193CC 260A036C */ addiu $t2, $s0, 0x036C ## $t2 = 0000036C -/* 00950 80B193D0 AFAA0030 */ sw $t2, 0x0030($sp) -/* 00954 80B193D4 AFA90034 */ sw $t1, 0x0034($sp) -/* 00958 80B193D8 AFA80038 */ sw $t0, 0x0038($sp) -/* 0095C 80B193DC AFB90018 */ sw $t9, 0x0018($sp) -/* 00960 80B193E0 AFB80014 */ sw $t8, 0x0014($sp) -/* 00964 80B193E4 AFAF0010 */ sw $t7, 0x0010($sp) +/* 00950 80B193D0 AFAA0030 */ sw $t2, 0x0030($sp) +/* 00954 80B193D4 AFA90034 */ sw $t1, 0x0034($sp) +/* 00958 80B193D8 AFA80038 */ sw $t0, 0x0038($sp) +/* 0095C 80B193DC AFB90018 */ sw $t9, 0x0018($sp) +/* 00960 80B193E0 AFB80014 */ sw $t8, 0x0014($sp) +/* 00964 80B193E4 AFAF0010 */ sw $t7, 0x0010($sp) /* 00968 80B193E8 26050348 */ addiu $a1, $s0, 0x0348 ## $a1 = 00000348 /* 0096C 80B193EC 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 00970 80B193F0 0C00CD20 */ jal func_80033480 +/* 00970 80B193F0 0C00CD20 */ jal func_80033480 /* 00974 80B193F4 24070002 */ addiu $a3, $zero, 0x0002 ## $a3 = 00000002 /* 00978 80B193F8 240B0050 */ addiu $t3, $zero, 0x0050 ## $t3 = 00000050 /* 0097C 80B193FC 240C000F */ addiu $t4, $zero, 0x000F ## $t4 = 0000000F /* 00980 80B19400 240D0001 */ addiu $t5, $zero, 0x0001 ## $t5 = 00000001 -/* 00984 80B19404 AFAD0018 */ sw $t5, 0x0018($sp) -/* 00988 80B19408 AFAC0014 */ sw $t4, 0x0014($sp) -/* 0098C 80B1940C AFAB0010 */ sw $t3, 0x0010($sp) -/* 00990 80B19410 8FA4005C */ lw $a0, 0x005C($sp) -/* 00994 80B19414 8FA50038 */ lw $a1, 0x0038($sp) +/* 00984 80B19404 AFAD0018 */ sw $t5, 0x0018($sp) +/* 00988 80B19408 AFAC0014 */ sw $t4, 0x0014($sp) +/* 0098C 80B1940C AFAB0010 */ sw $t3, 0x0010($sp) +/* 00990 80B19410 8FA4005C */ lw $a0, 0x005C($sp) +/* 00994 80B19414 8FA50038 */ lw $a1, 0x0038($sp) /* 00998 80B19418 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 0099C 80B1941C 0C00CD20 */ jal func_80033480 +/* 0099C 80B1941C 0C00CD20 */ jal func_80033480 /* 009A0 80B19420 24070002 */ addiu $a3, $zero, 0x0002 ## $a3 = 00000002 /* 009A4 80B19424 240E0050 */ addiu $t6, $zero, 0x0050 ## $t6 = 00000050 /* 009A8 80B19428 240F000F */ addiu $t7, $zero, 0x000F ## $t7 = 0000000F /* 009AC 80B1942C 24180001 */ addiu $t8, $zero, 0x0001 ## $t8 = 00000001 -/* 009B0 80B19430 AFB80018 */ sw $t8, 0x0018($sp) -/* 009B4 80B19434 AFAF0014 */ sw $t7, 0x0014($sp) -/* 009B8 80B19438 AFAE0010 */ sw $t6, 0x0010($sp) -/* 009BC 80B1943C 8FA4005C */ lw $a0, 0x005C($sp) -/* 009C0 80B19440 8FA50034 */ lw $a1, 0x0034($sp) +/* 009B0 80B19430 AFB80018 */ sw $t8, 0x0018($sp) +/* 009B4 80B19434 AFAF0014 */ sw $t7, 0x0014($sp) +/* 009B8 80B19438 AFAE0010 */ sw $t6, 0x0010($sp) +/* 009BC 80B1943C 8FA4005C */ lw $a0, 0x005C($sp) +/* 009C0 80B19440 8FA50034 */ lw $a1, 0x0034($sp) /* 009C4 80B19444 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 009C8 80B19448 0C00CD20 */ jal func_80033480 +/* 009C8 80B19448 0C00CD20 */ jal func_80033480 /* 009CC 80B1944C 24070002 */ addiu $a3, $zero, 0x0002 ## $a3 = 00000002 /* 009D0 80B19450 24190050 */ addiu $t9, $zero, 0x0050 ## $t9 = 00000050 /* 009D4 80B19454 2408000F */ addiu $t0, $zero, 0x000F ## $t0 = 0000000F /* 009D8 80B19458 24090001 */ addiu $t1, $zero, 0x0001 ## $t1 = 00000001 -/* 009DC 80B1945C AFA90018 */ sw $t1, 0x0018($sp) -/* 009E0 80B19460 AFA80014 */ sw $t0, 0x0014($sp) -/* 009E4 80B19464 AFB90010 */ sw $t9, 0x0010($sp) -/* 009E8 80B19468 8FA4005C */ lw $a0, 0x005C($sp) -/* 009EC 80B1946C 8FA50030 */ lw $a1, 0x0030($sp) +/* 009DC 80B1945C AFA90018 */ sw $t1, 0x0018($sp) +/* 009E0 80B19460 AFA80014 */ sw $t0, 0x0014($sp) +/* 009E4 80B19464 AFB90010 */ sw $t9, 0x0010($sp) +/* 009E8 80B19468 8FA4005C */ lw $a0, 0x005C($sp) +/* 009EC 80B1946C 8FA50030 */ lw $a1, 0x0030($sp) /* 009F0 80B19470 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 009F4 80B19474 0C00CD20 */ jal func_80033480 +/* 009F4 80B19474 0C00CD20 */ jal func_80033480 /* 009F8 80B19478 24070002 */ addiu $a3, $zero, 0x0002 ## $a3 = 00000002 /* 009FC 80B1947C 96030088 */ lhu $v1, 0x0088($s0) ## 00000088 .L80B19480: /* 00A00 80B19480 860A001C */ lh $t2, 0x001C($s0) ## 0000001C /* 00A04 80B19484 2401FFFE */ addiu $at, $zero, 0xFFFE ## $at = FFFFFFFE /* 00A08 80B19488 306B0040 */ andi $t3, $v1, 0x0040 ## $t3 = 00000000 -/* 00A0C 80B1948C 1541001A */ bne $t2, $at, .L80B194F8 +/* 00A0C 80B1948C 1541001A */ bne $t2, $at, .L80B194F8 /* 00A10 80B19490 30780002 */ andi $t8, $v1, 0x0002 ## $t8 = 00000000 -/* 00A14 80B19494 11600012 */ beq $t3, $zero, .L80B194E0 +/* 00A14 80B19494 11600012 */ beq $t3, $zero, .L80B194E0 /* 00A18 80B19498 306F0002 */ andi $t7, $v1, 0x0002 ## $t7 = 00000000 /* 00A1C 80B1949C 860C02E0 */ lh $t4, 0x02E0($s0) ## 000002E0 /* 00A20 80B194A0 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 /* 00A24 80B194A4 24010003 */ addiu $at, $zero, 0x0003 ## $at = 00000003 -/* 00A28 80B194A8 15810006 */ bne $t4, $at, .L80B194C4 +/* 00A28 80B194A8 15810006 */ bne $t4, $at, .L80B194C4 /* 00A2C 80B194AC E6040068 */ swc1 $f4, 0x0068($s0) ## 00000068 /* 00A30 80B194B0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 00A34 80B194B4 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 00A38 80B194B8 2405388A */ addiu $a1, $zero, 0x388A ## $a1 = 0000388A -/* 00A3C 80B194BC 10000005 */ beq $zero, $zero, .L80B194D4 +/* 00A3C 80B194BC 10000005 */ beq $zero, $zero, .L80B194D4 /* 00A40 80B194C0 960D0088 */ lhu $t5, 0x0088($s0) ## 00000088 .L80B194C4: /* 00A44 80B194C4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 00A48 80B194C8 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 00A4C 80B194CC 2405388F */ addiu $a1, $zero, 0x388F ## $a1 = 0000388F /* 00A50 80B194D0 960D0088 */ lhu $t5, 0x0088($s0) ## 00000088 .L80B194D4: /* 00A54 80B194D4 31AEFFBF */ andi $t6, $t5, 0xFFBF ## $t6 = 00000000 -/* 00A58 80B194D8 1000000D */ beq $zero, $zero, .L80B19510 +/* 00A58 80B194D8 1000000D */ beq $zero, $zero, .L80B19510 /* 00A5C 80B194DC A60E0088 */ sh $t6, 0x0088($s0) ## 00000088 .L80B194E0: -/* 00A60 80B194E0 11E0000B */ beq $t7, $zero, .L80B19510 +/* 00A60 80B194E0 11E0000B */ beq $t7, $zero, .L80B19510 /* 00A64 80B194E4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 00A68 80B194E8 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 00A6C 80B194EC 2405387B */ addiu $a1, $zero, 0x387B ## $a1 = 0000387B -/* 00A70 80B194F0 10000008 */ beq $zero, $zero, .L80B19514 -/* 00A74 80B194F4 8FBF002C */ lw $ra, 0x002C($sp) +/* 00A70 80B194F0 10000008 */ beq $zero, $zero, .L80B19514 +/* 00A74 80B194F4 8FBF002C */ lw $ra, 0x002C($sp) .L80B194F8: -/* 00A78 80B194F8 13000005 */ beq $t8, $zero, .L80B19510 +/* 00A78 80B194F8 13000005 */ beq $t8, $zero, .L80B19510 /* 00A7C 80B194FC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 00A80 80B19500 44803000 */ mtc1 $zero, $f6 ## $f6 = 0.00 /* 00A84 80B19504 2405387B */ addiu $a1, $zero, 0x387B ## $a1 = 0000387B /* 00A88 80B19508 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 00A8C 80B1950C E6060068 */ swc1 $f6, 0x0068($s0) ## 00000068 .L80B19510: -/* 00A90 80B19510 8FBF002C */ lw $ra, 0x002C($sp) +/* 00A90 80B19510 8FBF002C */ lw $ra, 0x002C($sp) .L80B19514: -/* 00A94 80B19514 8FB00028 */ lw $s0, 0x0028($sp) +/* 00A94 80B19514 8FB00028 */ lw $s0, 0x0028($sp) /* 00A98 80B19518 27BD0058 */ addiu $sp, $sp, 0x0058 ## $sp = 00000000 -/* 00A9C 80B1951C 03E00008 */ jr $ra +/* 00A9C 80B1951C 03E00008 */ jr $ra /* 00AA0 80B19520 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Tite/func_80B19524.s b/asm/non_matchings/overlays/actors/ovl_En_Tite/func_80B19524.s index 8196567032..ed2c41dd89 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Tite/func_80B19524.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Tite/func_80B19524.s @@ -1,44 +1,44 @@ glabel func_80B19524 /* 00AA4 80B19524 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00AA8 80B19528 AFBF0014 */ sw $ra, 0x0014($sp) +/* 00AA8 80B19528 AFBF0014 */ sw $ra, 0x0014($sp) /* 00AAC 80B1952C 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 /* 00AB0 80B19530 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 00AB4 80B19534 24A50A14 */ addiu $a1, $a1, 0x0A14 ## $a1 = 06000A14 -/* 00AB8 80B19538 AFA60018 */ sw $a2, 0x0018($sp) -/* 00ABC 80B1953C 0C0294BE */ jal func_800A52F8 +/* 00AB8 80B19538 AFA60018 */ sw $a2, 0x0018($sp) +/* 00ABC 80B1953C 0C0294BE */ jal SkelAnime_ChangeAnimDefaultRepeat /* 00AC0 80B19540 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 00AC4 80B19544 8FA60018 */ lw $a2, 0x0018($sp) +/* 00AC4 80B19544 8FA60018 */ lw $a2, 0x0018($sp) /* 00AC8 80B19548 240E000A */ addiu $t6, $zero, 0x000A ## $t6 = 0000000A /* 00ACC 80B1954C 3C0580B2 */ lui $a1, %hi(func_80B195C0) ## $a1 = 80B20000 /* 00AD0 80B19550 94C20088 */ lhu $v0, 0x0088($a2) ## 00000088 /* 00AD4 80B19554 A0CE02BC */ sb $t6, 0x02BC($a2) ## 000002BC /* 00AD8 80B19558 00C02025 */ or $a0, $a2, $zero ## $a0 = 00000000 /* 00ADC 80B1955C 304F0003 */ andi $t7, $v0, 0x0003 ## $t7 = 00000000 -/* 00AE0 80B19560 55E00009 */ bnel $t7, $zero, .L80B19588 +/* 00AE0 80B19560 55E00009 */ bnel $t7, $zero, .L80B19588 /* 00AE4 80B19564 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 /* 00AE8 80B19568 84D8001C */ lh $t8, 0x001C($a2) ## 0000001C /* 00AEC 80B1956C 2401FFFE */ addiu $at, $zero, 0xFFFE ## $at = FFFFFFFE /* 00AF0 80B19570 30590020 */ andi $t9, $v0, 0x0020 ## $t9 = 00000000 -/* 00AF4 80B19574 1701000C */ bne $t8, $at, .L80B195A8 +/* 00AF4 80B19574 1701000C */ bne $t8, $at, .L80B195A8 /* 00AF8 80B19578 00000000 */ nop -/* 00AFC 80B1957C 1320000A */ beq $t9, $zero, .L80B195A8 +/* 00AFC 80B1957C 1320000A */ beq $t9, $zero, .L80B195A8 /* 00B00 80B19580 00000000 */ nop /* 00B04 80B19584 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 .L80B19588: /* 00B08 80B19588 C4C40060 */ lwc1 $f4, 0x0060($a2) ## 00000060 -/* 00B0C 80B1958C 4600203E */ c.le.s $f4, $f0 +/* 00B0C 80B1958C 4600203E */ c.le.s $f4, $f0 /* 00B10 80B19590 00000000 */ nop -/* 00B14 80B19594 45000004 */ bc1f .L80B195A8 +/* 00B14 80B19594 45000004 */ bc1f .L80B195A8 /* 00B18 80B19598 00000000 */ nop /* 00B1C 80B1959C E4C0006C */ swc1 $f0, 0x006C($a2) ## 0000006C /* 00B20 80B195A0 E4C00060 */ swc1 $f0, 0x0060($a2) ## 00000060 /* 00B24 80B195A4 E4C00068 */ swc1 $f0, 0x0068($a2) ## 00000068 .L80B195A8: -/* 00B28 80B195A8 0C2C62A0 */ jal func_80B18A80 +/* 00B28 80B195A8 0C2C62A0 */ jal func_80B18A80 /* 00B2C 80B195AC 24A595C0 */ addiu $a1, $a1, %lo(func_80B195C0) ## $a1 = 80B195C0 -/* 00B30 80B195B0 8FBF0014 */ lw $ra, 0x0014($sp) +/* 00B30 80B195B0 8FBF0014 */ lw $ra, 0x0014($sp) /* 00B34 80B195B4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00B38 80B195B8 03E00008 */ jr $ra +/* 00B38 80B195B8 03E00008 */ jr $ra /* 00B3C 80B195BC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Tite/func_80B1985C.s b/asm/non_matchings/overlays/actors/ovl_En_Tite/func_80B1985C.s index 6c70cf9c12..de834fa9b6 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Tite/func_80B1985C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Tite/func_80B1985C.s @@ -1,11 +1,11 @@ glabel func_80B1985C /* 00DDC 80B1985C 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 00DE0 80B19860 AFB00018 */ sw $s0, 0x0018($sp) +/* 00DE0 80B19860 AFB00018 */ sw $s0, 0x0018($sp) /* 00DE4 80B19864 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00DE8 80B19868 AFBF001C */ sw $ra, 0x001C($sp) +/* 00DE8 80B19868 AFBF001C */ sw $ra, 0x001C($sp) /* 00DEC 80B1986C 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 00DF0 80B19870 24A50C70 */ addiu $a1, $a1, 0x0C70 ## $a1 = 06000C70 -/* 00DF4 80B19874 0C0294BE */ jal func_800A52F8 +/* 00DF4 80B19874 0C0294BE */ jal SkelAnime_ChangeAnimDefaultRepeat /* 00DF8 80B19878 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C /* 00DFC 80B1987C 3C014120 */ lui $at, 0x4120 ## $at = 41200000 /* 00E00 80B19880 44812000 */ mtc1 $at, $f4 ## $f4 = 10.00 @@ -20,36 +20,36 @@ glabel func_80B1985C /* 00E24 80B198A4 E6040060 */ swc1 $f4, 0x0060($s0) ## 00000060 /* 00E28 80B198A8 E606006C */ swc1 $f6, 0x006C($s0) ## 0000006C /* 00E2C 80B198AC 0C01DF64 */ jal Math_Rand_S16Offset - + /* 00E30 80B198B0 E6080068 */ swc1 $f8, 0x0068($s0) ## 00000068 /* 00E34 80B198B4 860F001C */ lh $t7, 0x001C($s0) ## 0000001C /* 00E38 80B198B8 2401FFFE */ addiu $at, $zero, 0xFFFE ## $at = FFFFFFFE /* 00E3C 80B198BC A20202E2 */ sb $v0, 0x02E2($s0) ## 000002E2 -/* 00E40 80B198C0 15E1000A */ bne $t7, $at, .L80B198EC +/* 00E40 80B198C0 15E1000A */ bne $t7, $at, .L80B198EC /* 00E44 80B198C4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 00E48 80B198C8 96180088 */ lhu $t8, 0x0088($s0) ## 00000088 /* 00E4C 80B198CC 2405388E */ addiu $a1, $zero, 0x388E ## $a1 = 0000388E /* 00E50 80B198D0 33190020 */ andi $t9, $t8, 0x0020 ## $t9 = 00000000 -/* 00E54 80B198D4 13200005 */ beq $t9, $zero, .L80B198EC +/* 00E54 80B198D4 13200005 */ beq $t9, $zero, .L80B198EC /* 00E58 80B198D8 00000000 */ nop /* 00E5C 80B198DC 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 00E60 80B198E0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00E64 80B198E4 10000003 */ beq $zero, $zero, .L80B198F4 +/* 00E64 80B198E4 10000003 */ beq $zero, $zero, .L80B198F4 /* 00E68 80B198E8 00000000 */ nop .L80B198EC: /* 00E6C 80B198EC 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 00E70 80B198F0 2405386C */ addiu $a1, $zero, 0x386C ## $a1 = 0000386C .L80B198F4: /* 00E74 80B198F4 3C0580B2 */ lui $a1, %hi(func_80B19918) ## $a1 = 80B20000 /* 00E78 80B198F8 24A59918 */ addiu $a1, $a1, %lo(func_80B19918) ## $a1 = 80B19918 -/* 00E7C 80B198FC 0C2C62A0 */ jal func_80B18A80 +/* 00E7C 80B198FC 0C2C62A0 */ jal func_80B18A80 /* 00E80 80B19900 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00E84 80B19904 8FBF001C */ lw $ra, 0x001C($sp) -/* 00E88 80B19908 8FB00018 */ lw $s0, 0x0018($sp) +/* 00E84 80B19904 8FBF001C */ lw $ra, 0x001C($sp) +/* 00E88 80B19908 8FB00018 */ lw $s0, 0x0018($sp) /* 00E8C 80B1990C 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 00E90 80B19910 03E00008 */ jr $ra +/* 00E90 80B19910 03E00008 */ jr $ra /* 00E94 80B19914 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Tite/func_80B19E28.s b/asm/non_matchings/overlays/actors/ovl_En_Tite/func_80B19E28.s index 787b444e71..451455c5b3 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Tite/func_80B19E28.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Tite/func_80B19E28.s @@ -1,16 +1,16 @@ glabel func_80B19E28 /* 013A8 80B19E28 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 013AC 80B19E2C AFBF0014 */ sw $ra, 0x0014($sp) +/* 013AC 80B19E2C AFBF0014 */ sw $ra, 0x0014($sp) /* 013B0 80B19E30 240E0003 */ addiu $t6, $zero, 0x0003 ## $t6 = 00000003 /* 013B4 80B19E34 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 /* 013B8 80B19E38 A08E02BC */ sb $t6, 0x02BC($a0) ## 000002BC /* 013BC 80B19E3C 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 013C0 80B19E40 24A512E4 */ addiu $a1, $a1, 0x12E4 ## $a1 = 060012E4 -/* 013C4 80B19E44 AFA70018 */ sw $a3, 0x0018($sp) +/* 013C4 80B19E44 AFA70018 */ sw $a3, 0x0018($sp) /* 013C8 80B19E48 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 013CC 80B19E4C 0C0294D3 */ jal func_800A534C +/* 013CC 80B19E4C 0C0294D3 */ jal SkelAnime_ChangeAnimTransitionRepeat /* 013D0 80B19E50 3C064080 */ lui $a2, 0x4080 ## $a2 = 40800000 -/* 013D4 80B19E54 8FA40018 */ lw $a0, 0x0018($sp) +/* 013D4 80B19E54 8FA40018 */ lw $a0, 0x0018($sp) /* 013D8 80B19E58 3C01C0C0 */ lui $at, 0xC0C0 ## $at = C0C00000 /* 013DC 80B19E5C 44812000 */ mtc1 $at, $f4 ## $f4 = -6.00 /* 013E0 80B19E60 3C01BF80 */ lui $at, 0xBF80 ## $at = BF800000 @@ -20,11 +20,11 @@ glabel func_80B19E28 /* 013F0 80B19E70 24A59E94 */ addiu $a1, $a1, %lo(func_80B19E94) ## $a1 = 80B19E94 /* 013F4 80B19E74 E4840068 */ swc1 $f4, 0x0068($a0) ## 00000068 /* 013F8 80B19E78 A48F0032 */ sh $t7, 0x0032($a0) ## 00000032 -/* 013FC 80B19E7C 0C2C62A0 */ jal func_80B18A80 +/* 013FC 80B19E7C 0C2C62A0 */ jal func_80B18A80 /* 01400 80B19E80 E486006C */ swc1 $f6, 0x006C($a0) ## 0000006C -/* 01404 80B19E84 8FBF0014 */ lw $ra, 0x0014($sp) +/* 01404 80B19E84 8FBF0014 */ lw $ra, 0x0014($sp) /* 01408 80B19E88 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 0140C 80B19E8C 03E00008 */ jr $ra +/* 0140C 80B19E8C 03E00008 */ jr $ra /* 01410 80B19E90 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Tite/func_80B1A1EC.s b/asm/non_matchings/overlays/actors/ovl_En_Tite/func_80B1A1EC.s index c0cf3cbcd2..4bb757c181 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Tite/func_80B1A1EC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Tite/func_80B1A1EC.s @@ -1,27 +1,27 @@ glabel func_80B1A1EC /* 0176C 80B1A1EC 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 01770 80B1A1F0 AFB00028 */ sw $s0, 0x0028($sp) +/* 01770 80B1A1F0 AFB00028 */ sw $s0, 0x0028($sp) /* 01774 80B1A1F4 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 01778 80B1A1F8 AFBF002C */ sw $ra, 0x002C($sp) +/* 01778 80B1A1F8 AFBF002C */ sw $ra, 0x002C($sp) /* 0177C 80B1A1FC 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 /* 01780 80B1A200 0C028800 */ jal SkelAnime_GetFrameCount - + /* 01784 80B1A204 248412E4 */ addiu $a0, $a0, 0x12E4 ## $a0 = 060012E4 /* 01788 80B1A208 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 0178C 80B1A20C 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 /* 01790 80B1A210 3C014080 */ lui $at, 0x4080 ## $at = 40800000 -/* 01794 80B1A214 468021A0 */ cvt.s.w $f6, $f4 +/* 01794 80B1A214 468021A0 */ cvt.s.w $f6, $f4 /* 01798 80B1A218 44814000 */ mtc1 $at, $f8 ## $f8 = 4.00 /* 0179C 80B1A21C 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 017A0 80B1A220 44060000 */ mfc1 $a2, $f0 -/* 017A4 80B1A224 44070000 */ mfc1 $a3, $f0 +/* 017A0 80B1A220 44060000 */ mfc1 $a2, $f0 +/* 017A4 80B1A224 44070000 */ mfc1 $a3, $f0 /* 017A8 80B1A228 24A512E4 */ addiu $a1, $a1, 0x12E4 ## $a1 = 060012E4 -/* 017AC 80B1A22C E7A60010 */ swc1 $f6, 0x0010($sp) +/* 017AC 80B1A22C E7A60010 */ swc1 $f6, 0x0010($sp) /* 017B0 80B1A230 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C -/* 017B4 80B1A234 AFA00014 */ sw $zero, 0x0014($sp) -/* 017B8 80B1A238 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 017BC 80B1A23C E7A80018 */ swc1 $f8, 0x0018($sp) +/* 017B4 80B1A234 AFA00014 */ sw $zero, 0x0014($sp) +/* 017B8 80B1A238 0C029468 */ jal SkelAnime_ChangeAnim + +/* 017BC 80B1A23C E7A80018 */ swc1 $f8, 0x0018($sp) /* 017C0 80B1A240 3C01C0C0 */ lui $at, 0xC0C0 ## $at = C0C00000 /* 017C4 80B1A244 44815000 */ mtc1 $at, $f10 ## $f10 = -6.00 /* 017C8 80B1A248 921802E4 */ lbu $t8, 0x02E4($s0) ## 000002E4 @@ -30,23 +30,23 @@ glabel func_80B1A1EC /* 017D4 80B1A254 2401000F */ addiu $at, $zero, 0x000F ## $at = 0000000F /* 017D8 80B1A258 A20E02BC */ sb $t6, 0x02BC($s0) ## 000002BC /* 017DC 80B1A25C E60A0068 */ swc1 $f10, 0x0068($s0) ## 00000068 -/* 017E0 80B1A260 17010003 */ bne $t8, $at, .L80B1A270 +/* 017E0 80B1A260 17010003 */ bne $t8, $at, .L80B1A270 /* 017E4 80B1A264 A60F0032 */ sh $t7, 0x0032($s0) ## 00000032 /* 017E8 80B1A268 24190030 */ addiu $t9, $zero, 0x0030 ## $t9 = 00000030 /* 017EC 80B1A26C A21902E3 */ sb $t9, 0x02E3($s0) ## 000002E3 .L80B1A270: /* 017F0 80B1A270 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 017F4 80B1A274 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 017F8 80B1A278 2405389E */ addiu $a1, $zero, 0x389E ## $a1 = 0000389E /* 017FC 80B1A27C 3C0580B2 */ lui $a1, %hi(func_80B1A2A0) ## $a1 = 80B20000 /* 01800 80B1A280 24A5A2A0 */ addiu $a1, $a1, %lo(func_80B1A2A0) ## $a1 = 80B1A2A0 -/* 01804 80B1A284 0C2C62A0 */ jal func_80B18A80 +/* 01804 80B1A284 0C2C62A0 */ jal func_80B18A80 /* 01808 80B1A288 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0180C 80B1A28C 8FBF002C */ lw $ra, 0x002C($sp) -/* 01810 80B1A290 8FB00028 */ lw $s0, 0x0028($sp) +/* 0180C 80B1A28C 8FBF002C */ lw $ra, 0x002C($sp) +/* 01810 80B1A290 8FB00028 */ lw $s0, 0x0028($sp) /* 01814 80B1A294 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 01818 80B1A298 03E00008 */ jr $ra +/* 01818 80B1A298 03E00008 */ jr $ra /* 0181C 80B1A29C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Tite/func_80B1A76C.s b/asm/non_matchings/overlays/actors/ovl_En_Tite/func_80B1A76C.s index 4def67601b..5d446bef78 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Tite/func_80B1A76C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Tite/func_80B1A76C.s @@ -1,16 +1,16 @@ glabel func_80B1A76C /* 01CEC 80B1A76C 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 01CF0 80B1A770 AFB00018 */ sw $s0, 0x0018($sp) +/* 01CF0 80B1A770 AFB00018 */ sw $s0, 0x0018($sp) /* 01CF4 80B1A774 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 01CF8 80B1A778 AFBF001C */ sw $ra, 0x001C($sp) +/* 01CF8 80B1A778 AFBF001C */ sw $ra, 0x001C($sp) /* 01CFC 80B1A77C 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 01D00 80B1A780 24A50A14 */ addiu $a1, $a1, 0x0A14 ## $a1 = 06000A14 /* 01D04 80B1A784 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 01D08 80B1A788 0C0294E1 */ jal func_800A5384 +/* 01D08 80B1A788 0C0294E1 */ jal SkelAnime_ChangeAnimPlaybackRepeat /* 01D0C 80B1A78C 3C063FC0 */ lui $a2, 0x3FC0 ## $a2 = 3FC00000 /* 01D10 80B1A790 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 01D14 80B1A794 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 01D18 80B1A798 24053888 */ addiu $a1, $zero, 0x3888 ## $a1 = 00003888 /* 01D1C 80B1A79C 3C01BF80 */ lui $at, 0xBF80 ## $at = BF800000 /* 01D20 80B1A7A0 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 @@ -27,53 +27,53 @@ glabel func_80B1A76C /* 01D48 80B1A7C8 44814000 */ mtc1 $at, $f8 ## $f8 = 50.00 /* 01D4C 80B1A7CC 24190001 */ addiu $t9, $zero, 0x0001 ## $t9 = 00000001 /* 01D50 80B1A7D0 3C0580B2 */ lui $a1, %hi(func_80B1A888) ## $a1 = 80B20000 -/* 01D54 80B1A7D4 46080282 */ mul.s $f10, $f0, $f8 +/* 01D54 80B1A7D4 46080282 */ mul.s $f10, $f0, $f8 /* 01D58 80B1A7D8 3C014F00 */ lui $at, 0x4F00 ## $at = 4F000000 /* 01D5C 80B1A7DC 24A5A888 */ addiu $a1, $a1, %lo(func_80B1A888) ## $a1 = 80B1A888 /* 01D60 80B1A7E0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 01D64 80B1A7E4 4458F800 */ cfc1 $t8, $31 /* 01D68 80B1A7E8 44D9F800 */ ctc1 $t9, $31 /* 01D6C 80B1A7EC 00000000 */ nop -/* 01D70 80B1A7F0 46005424 */ cvt.w.s $f16, $f10 +/* 01D70 80B1A7F0 46005424 */ cvt.w.s $f16, $f10 /* 01D74 80B1A7F4 4459F800 */ cfc1 $t9, $31 /* 01D78 80B1A7F8 00000000 */ nop /* 01D7C 80B1A7FC 33390078 */ andi $t9, $t9, 0x0078 ## $t9 = 00000000 -/* 01D80 80B1A800 53200013 */ beql $t9, $zero, .L80B1A850 -/* 01D84 80B1A804 44198000 */ mfc1 $t9, $f16 +/* 01D80 80B1A800 53200013 */ beql $t9, $zero, .L80B1A850 +/* 01D84 80B1A804 44198000 */ mfc1 $t9, $f16 /* 01D88 80B1A808 44818000 */ mtc1 $at, $f16 ## $f16 = 2147483648.00 /* 01D8C 80B1A80C 24190001 */ addiu $t9, $zero, 0x0001 ## $t9 = 00000001 -/* 01D90 80B1A810 46105401 */ sub.s $f16, $f10, $f16 +/* 01D90 80B1A810 46105401 */ sub.s $f16, $f10, $f16 /* 01D94 80B1A814 44D9F800 */ ctc1 $t9, $31 /* 01D98 80B1A818 00000000 */ nop -/* 01D9C 80B1A81C 46008424 */ cvt.w.s $f16, $f16 +/* 01D9C 80B1A81C 46008424 */ cvt.w.s $f16, $f16 /* 01DA0 80B1A820 4459F800 */ cfc1 $t9, $31 /* 01DA4 80B1A824 00000000 */ nop /* 01DA8 80B1A828 33390078 */ andi $t9, $t9, 0x0078 ## $t9 = 00000000 -/* 01DAC 80B1A82C 17200005 */ bne $t9, $zero, .L80B1A844 +/* 01DAC 80B1A82C 17200005 */ bne $t9, $zero, .L80B1A844 /* 01DB0 80B1A830 00000000 */ nop -/* 01DB4 80B1A834 44198000 */ mfc1 $t9, $f16 +/* 01DB4 80B1A834 44198000 */ mfc1 $t9, $f16 /* 01DB8 80B1A838 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 01DBC 80B1A83C 10000007 */ beq $zero, $zero, .L80B1A85C +/* 01DBC 80B1A83C 10000007 */ beq $zero, $zero, .L80B1A85C /* 01DC0 80B1A840 0321C825 */ or $t9, $t9, $at ## $t9 = 80000000 .L80B1A844: -/* 01DC4 80B1A844 10000005 */ beq $zero, $zero, .L80B1A85C +/* 01DC4 80B1A844 10000005 */ beq $zero, $zero, .L80B1A85C /* 01DC8 80B1A848 2419FFFF */ addiu $t9, $zero, 0xFFFF ## $t9 = FFFFFFFF -/* 01DCC 80B1A84C 44198000 */ mfc1 $t9, $f16 +/* 01DCC 80B1A84C 44198000 */ mfc1 $t9, $f16 .L80B1A850: /* 01DD0 80B1A850 00000000 */ nop -/* 01DD4 80B1A854 0720FFFB */ bltz $t9, .L80B1A844 +/* 01DD4 80B1A854 0720FFFB */ bltz $t9, .L80B1A844 /* 01DD8 80B1A858 00000000 */ nop .L80B1A85C: /* 01DDC 80B1A85C 3C014130 */ lui $at, 0x4130 ## $at = 41300000 /* 01DE0 80B1A860 44819000 */ mtc1 $at, $f18 ## $f18 = 11.00 /* 01DE4 80B1A864 44D8F800 */ ctc1 $t8, $31 /* 01DE8 80B1A868 A21902E2 */ sb $t9, 0x02E2($s0) ## 000002E2 -/* 01DEC 80B1A86C 0C2C62A0 */ jal func_80B18A80 +/* 01DEC 80B1A86C 0C2C62A0 */ jal func_80B18A80 /* 01DF0 80B1A870 E6120060 */ swc1 $f18, 0x0060($s0) ## 00000060 -/* 01DF4 80B1A874 8FBF001C */ lw $ra, 0x001C($sp) -/* 01DF8 80B1A878 8FB00018 */ lw $s0, 0x0018($sp) +/* 01DF4 80B1A874 8FBF001C */ lw $ra, 0x001C($sp) +/* 01DF8 80B1A878 8FB00018 */ lw $s0, 0x0018($sp) /* 01DFC 80B1A87C 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 01E00 80B1A880 03E00008 */ jr $ra +/* 01E00 80B1A880 03E00008 */ jr $ra /* 01E04 80B1A884 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Tk/EnTk_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Tk/EnTk_Destroy.s deleted file mode 100644 index 8a95e0d032..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Tk/EnTk_Destroy.s +++ /dev/null @@ -1,14 +0,0 @@ -glabel EnTk_Destroy -/* 012DC 80B1CBDC 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 012E0 80B1CBE0 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 -/* 012E4 80B1CBE4 AFBF0014 */ sw $ra, 0x0014($sp) -/* 012E8 80B1CBE8 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 012EC 80B1CBEC 0C0170EB */ jal ActorCollider_FreeCylinder - -/* 012F0 80B1CBF0 24C50194 */ addiu $a1, $a2, 0x0194 ## $a1 = 00000194 -/* 012F4 80B1CBF4 8FBF0014 */ lw $ra, 0x0014($sp) -/* 012F8 80B1CBF8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 012FC 80B1CBFC 03E00008 */ jr $ra -/* 01300 80B1CC00 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Tk/EnTk_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Tk/EnTk_Draw.s deleted file mode 100644 index 8c38b27862..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Tk/EnTk_Draw.s +++ /dev/null @@ -1,72 +0,0 @@ -glabel EnTk_Draw -/* 01A98 80B1D398 27BDFFB0 */ addiu $sp, $sp, 0xFFB0 ## $sp = FFFFFFB0 -/* 01A9C 80B1D39C AFBF002C */ sw $ra, 0x002C($sp) -/* 01AA0 80B1D3A0 AFB10028 */ sw $s1, 0x0028($sp) -/* 01AA4 80B1D3A4 AFB00024 */ sw $s0, 0x0024($sp) -/* 01AA8 80B1D3A8 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 01AAC 80B1D3AC 0C034213 */ jal Matrix_Push -/* 01AB0 80B1D3B0 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 -/* 01AB4 80B1D3B4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01AB8 80B1D3B8 0C2C6EAC */ jal func_80B1BAB0 -/* 01ABC 80B1D3BC 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 01AC0 80B1D3C0 0C034221 */ jal Matrix_Pull -/* 01AC4 80B1D3C4 00000000 */ nop -/* 01AC8 80B1D3C8 8E250000 */ lw $a1, 0x0000($s1) ## 00000000 -/* 01ACC 80B1D3CC 3C0680B2 */ lui $a2, %hi(D_80B1D60C) ## $a2 = 80B20000 -/* 01AD0 80B1D3D0 24C6D60C */ addiu $a2, $a2, %lo(D_80B1D60C) ## $a2 = 80B1D60C -/* 01AD4 80B1D3D4 27A40038 */ addiu $a0, $sp, 0x0038 ## $a0 = FFFFFFE8 -/* 01AD8 80B1D3D8 2407050E */ addiu $a3, $zero, 0x050E ## $a3 = 0000050E -/* 01ADC 80B1D3DC 0C031AB1 */ jal func_800C6AC4 -/* 01AE0 80B1D3E0 AFA50048 */ sw $a1, 0x0048($sp) -/* 01AE4 80B1D3E4 0C024F46 */ jal func_80093D18 -/* 01AE8 80B1D3E8 8E240000 */ lw $a0, 0x0000($s1) ## 00000000 -/* 01AEC 80B1D3EC 8FA50048 */ lw $a1, 0x0048($sp) -/* 01AF0 80B1D3F0 3C0FDB06 */ lui $t7, 0xDB06 ## $t7 = DB060000 -/* 01AF4 80B1D3F4 35EF0020 */ ori $t7, $t7, 0x0020 ## $t7 = DB060020 -/* 01AF8 80B1D3F8 8CA302C0 */ lw $v1, 0x02C0($a1) ## 000002C0 -/* 01AFC 80B1D3FC 3C0480B2 */ lui $a0, %hi(D_80B1D598) ## $a0 = 80B20000 -/* 01B00 80B1D400 3C0C8016 */ lui $t4, 0x8016 ## $t4 = 80160000 -/* 01B04 80B1D404 246E0008 */ addiu $t6, $v1, 0x0008 ## $t6 = 00000008 -/* 01B08 80B1D408 ACAE02C0 */ sw $t6, 0x02C0($a1) ## 000002C0 -/* 01B0C 80B1D40C AC6F0000 */ sw $t7, 0x0000($v1) ## 00000000 -/* 01B10 80B1D410 86180222 */ lh $t8, 0x0222($s0) ## 00000222 -/* 01B14 80B1D414 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 -/* 01B18 80B1D418 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF -/* 01B1C 80B1D41C 0018C880 */ sll $t9, $t8, 2 -/* 01B20 80B1D420 00992021 */ addu $a0, $a0, $t9 -/* 01B24 80B1D424 8C84D598 */ lw $a0, %lo(D_80B1D598)($a0) -/* 01B28 80B1D428 3C1880B2 */ lui $t8, %hi(func_80B1D2E4) ## $t8 = 80B20000 -/* 01B2C 80B1D42C 3C0F80B2 */ lui $t7, %hi(func_80B1D278) ## $t7 = 80B20000 -/* 01B30 80B1D430 00044900 */ sll $t1, $a0, 4 -/* 01B34 80B1D434 00095702 */ srl $t2, $t1, 28 -/* 01B38 80B1D438 000A5880 */ sll $t3, $t2, 2 -/* 01B3C 80B1D43C 018B6021 */ addu $t4, $t4, $t3 -/* 01B40 80B1D440 8D8C6FA8 */ lw $t4, 0x6FA8($t4) ## 80166FA8 -/* 01B44 80B1D444 00814024 */ and $t0, $a0, $at -/* 01B48 80B1D448 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 01B4C 80B1D44C 010C6821 */ addu $t5, $t0, $t4 -/* 01B50 80B1D450 01A17021 */ addu $t6, $t5, $at -/* 01B54 80B1D454 AC6E0004 */ sw $t6, 0x0004($v1) ## 00000004 -/* 01B58 80B1D458 9207014E */ lbu $a3, 0x014E($s0) ## 0000014E -/* 01B5C 80B1D45C 8E06016C */ lw $a2, 0x016C($s0) ## 0000016C -/* 01B60 80B1D460 8E050150 */ lw $a1, 0x0150($s0) ## 00000150 -/* 01B64 80B1D464 25EFD278 */ addiu $t7, $t7, %lo(func_80B1D278) ## $t7 = 80B1D278 -/* 01B68 80B1D468 2718D2E4 */ addiu $t8, $t8, %lo(func_80B1D2E4) ## $t8 = 80B1D2E4 -/* 01B6C 80B1D46C AFB80014 */ sw $t8, 0x0014($sp) -/* 01B70 80B1D470 AFAF0010 */ sw $t7, 0x0010($sp) -/* 01B74 80B1D474 AFB00018 */ sw $s0, 0x0018($sp) -/* 01B78 80B1D478 0C0286B2 */ jal func_800A1AC8 -/* 01B7C 80B1D47C 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 01B80 80B1D480 3C0680B2 */ lui $a2, %hi(D_80B1D61C) ## $a2 = 80B20000 -/* 01B84 80B1D484 24C6D61C */ addiu $a2, $a2, %lo(D_80B1D61C) ## $a2 = 80B1D61C -/* 01B88 80B1D488 27A40038 */ addiu $a0, $sp, 0x0038 ## $a0 = FFFFFFE8 -/* 01B8C 80B1D48C 8E250000 */ lw $a1, 0x0000($s1) ## 00000000 -/* 01B90 80B1D490 0C031AD5 */ jal func_800C6B54 -/* 01B94 80B1D494 24070520 */ addiu $a3, $zero, 0x0520 ## $a3 = 00000520 -/* 01B98 80B1D498 8FBF002C */ lw $ra, 0x002C($sp) -/* 01B9C 80B1D49C 8FB00024 */ lw $s0, 0x0024($sp) -/* 01BA0 80B1D4A0 8FB10028 */ lw $s1, 0x0028($sp) -/* 01BA4 80B1D4A4 03E00008 */ jr $ra -/* 01BA8 80B1D4A8 27BD0050 */ addiu $sp, $sp, 0x0050 ## $sp = 00000000 -/* 01BAC 80B1D4AC 00000000 */ nop - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Tk/EnTk_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Tk/EnTk_Init.s deleted file mode 100644 index 8a9ac2398a..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Tk/EnTk_Init.s +++ /dev/null @@ -1,108 +0,0 @@ -glabel EnTk_Init -/* 01160 80B1CA60 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 -/* 01164 80B1CA64 AFB00028 */ sw $s0, 0x0028($sp) -/* 01168 80B1CA68 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 0116C 80B1CA6C AFBF002C */ sw $ra, 0x002C($sp) -/* 01170 80B1CA70 AFA50044 */ sw $a1, 0x0044($sp) -/* 01174 80B1CA74 3C068003 */ lui $a2, 0x8003 ## $a2 = 80030000 -/* 01178 80B1CA78 24C6B5EC */ addiu $a2, $a2, 0xB5EC ## $a2 = 8002B5EC -/* 0117C 80B1CA7C 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 -/* 01180 80B1CA80 248400B4 */ addiu $a0, $a0, 0x00B4 ## $a0 = 000000B4 -/* 01184 80B1CA84 0C00AC78 */ jal ActorShape_Init - -/* 01188 80B1CA88 3C0741C0 */ lui $a3, 0x41C0 ## $a3 = 41C00000 -/* 0118C 80B1CA8C 2605014C */ addiu $a1, $s0, 0x014C ## $a1 = 0000014C -/* 01190 80B1CA90 3C060601 */ lui $a2, 0x0601 ## $a2 = 06010000 -/* 01194 80B1CA94 260E022A */ addiu $t6, $s0, 0x022A ## $t6 = 0000022A -/* 01198 80B1CA98 260F0296 */ addiu $t7, $s0, 0x0296 ## $t7 = 00000296 -/* 0119C 80B1CA9C 24180012 */ addiu $t8, $zero, 0x0012 ## $t8 = 00000012 -/* 011A0 80B1CAA0 AFB80018 */ sw $t8, 0x0018($sp) -/* 011A4 80B1CAA4 AFAF0014 */ sw $t7, 0x0014($sp) -/* 011A8 80B1CAA8 AFAE0010 */ sw $t6, 0x0010($sp) -/* 011AC 80B1CAAC 24C6BE40 */ addiu $a2, $a2, 0xBE40 ## $a2 = 0600BE40 -/* 011B0 80B1CAB0 AFA50030 */ sw $a1, 0x0030($sp) -/* 011B4 80B1CAB4 8FA40044 */ lw $a0, 0x0044($sp) -/* 011B8 80B1CAB8 0C0291BE */ jal func_800A46F8 -/* 011BC 80B1CABC 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 011C0 80B1CAC0 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 -/* 011C4 80B1CAC4 0C028800 */ jal SkelAnime_GetFrameCount - -/* 011C8 80B1CAC8 24842F84 */ addiu $a0, $a0, 0x2F84 ## $a0 = 06002F84 -/* 011CC 80B1CACC 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 -/* 011D0 80B1CAD0 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 011D4 80B1CAD4 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 011D8 80B1CAD8 468021A0 */ cvt.s.w $f6, $f4 -/* 011DC 80B1CADC 44070000 */ mfc1 $a3, $f0 -/* 011E0 80B1CAE0 24A52F84 */ addiu $a1, $a1, 0x2F84 ## $a1 = 06002F84 -/* 011E4 80B1CAE4 8FA40030 */ lw $a0, 0x0030($sp) -/* 011E8 80B1CAE8 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 011EC 80B1CAEC AFA00014 */ sw $zero, 0x0014($sp) -/* 011F0 80B1CAF0 E7A60010 */ swc1 $f6, 0x0010($sp) -/* 011F4 80B1CAF4 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 011F8 80B1CAF8 E7A00018 */ swc1 $f0, 0x0018($sp) -/* 011FC 80B1CAFC 26050194 */ addiu $a1, $s0, 0x0194 ## $a1 = 00000194 -/* 01200 80B1CB00 AFA50030 */ sw $a1, 0x0030($sp) -/* 01204 80B1CB04 0C0170D9 */ jal ActorCollider_AllocCylinder - -/* 01208 80B1CB08 8FA40044 */ lw $a0, 0x0044($sp) -/* 0120C 80B1CB0C 3C0780B2 */ lui $a3, %hi(D_80B1D508) ## $a3 = 80B20000 -/* 01210 80B1CB10 8FA50030 */ lw $a1, 0x0030($sp) -/* 01214 80B1CB14 24E7D508 */ addiu $a3, $a3, %lo(D_80B1D508) ## $a3 = 80B1D508 -/* 01218 80B1CB18 8FA40044 */ lw $a0, 0x0044($sp) -/* 0121C 80B1CB1C 0C01712B */ jal ActorCollider_InitCylinder - -/* 01220 80B1CB20 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 -/* 01224 80B1CB24 3C0680B2 */ lui $a2, %hi(D_80B1D534) ## $a2 = 80B20000 -/* 01228 80B1CB28 24C6D534 */ addiu $a2, $a2, %lo(D_80B1D534) ## $a2 = 80B1D534 -/* 0122C 80B1CB2C 26040098 */ addiu $a0, $s0, 0x0098 ## $a0 = 00000098 -/* 01230 80B1CB30 0C0187BF */ jal func_80061EFC -/* 01234 80B1CB34 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 01238 80B1CB38 3C038016 */ lui $v1, 0x8016 ## $v1 = 80160000 -/* 0123C 80B1CB3C 2463E660 */ addiu $v1, $v1, 0xE660 ## $v1 = 8015E660 -/* 01240 80B1CB40 9462000C */ lhu $v0, 0x000C($v1) ## 8015E66C -/* 01244 80B1CB44 3401C001 */ ori $at, $zero, 0xC001 ## $at = 0000C001 -/* 01248 80B1CB48 0041082A */ slt $at, $v0, $at -/* 0124C 80B1CB4C 1420000D */ bne $at, $zero, .L80B1CB84 -/* 01250 80B1CB50 3401E000 */ ori $at, $zero, 0xE000 ## $at = 0000E000 -/* 01254 80B1CB54 0041082A */ slt $at, $v0, $at -/* 01258 80B1CB58 1020000A */ beq $at, $zero, .L80B1CB84 -/* 0125C 80B1CB5C 00000000 */ nop -/* 01260 80B1CB60 8C790004 */ lw $t9, 0x0004($v1) ## 8015E664 -/* 01264 80B1CB64 8FA80044 */ lw $t0, 0x0044($sp) -/* 01268 80B1CB68 13200006 */ beq $t9, $zero, .L80B1CB84 -/* 0126C 80B1CB6C 00000000 */ nop -/* 01270 80B1CB70 850900A4 */ lh $t1, 0x00A4($t0) ## 000000A4 -/* 01274 80B1CB74 24010053 */ addiu $at, $zero, 0x0053 ## $at = 00000053 -/* 01278 80B1CB78 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0127C 80B1CB7C 11210005 */ beq $t1, $at, .L80B1CB94 -/* 01280 80B1CB80 3C053C23 */ lui $a1, 0x3C23 ## $a1 = 3C230000 -.L80B1CB84: -/* 01284 80B1CB84 0C00B55C */ jal Actor_Kill - -/* 01288 80B1CB88 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0128C 80B1CB8C 1000000F */ beq $zero, $zero, .L80B1CBCC -/* 01290 80B1CB90 8FBF002C */ lw $ra, 0x002C($sp) -.L80B1CB94: -/* 01294 80B1CB94 0C00B58B */ jal Actor_SetScale - -/* 01298 80B1CB98 34A5D70A */ ori $a1, $a1, 0xD70A ## $a1 = 0000D70A -/* 0129C 80B1CB9C 240A0006 */ addiu $t2, $zero, 0x0006 ## $t2 = 00000006 -/* 012A0 80B1CBA0 A20A001F */ sb $t2, 0x001F($s0) ## 0000001F -/* 012A4 80B1CBA4 3C0180B2 */ lui $at, %hi(D_80B1D684) ## $at = 80B20000 -/* 012A8 80B1CBA8 C428D684 */ lwc1 $f8, %lo(D_80B1D684)($at) -/* 012AC 80B1CBAC 3C0C80B2 */ lui $t4, %hi(func_80B1CC04) ## $t4 = 80B20000 -/* 012B0 80B1CBB0 240BFFFF */ addiu $t3, $zero, 0xFFFF ## $t3 = FFFFFFFF -/* 012B4 80B1CBB4 258CCC04 */ addiu $t4, $t4, %lo(func_80B1CC04) ## $t4 = 80B1CC04 -/* 012B8 80B1CBB8 AE0B0214 */ sw $t3, 0x0214($s0) ## 00000214 -/* 012BC 80B1CBBC AE000210 */ sw $zero, 0x0210($s0) ## 00000210 -/* 012C0 80B1CBC0 AE0C0190 */ sw $t4, 0x0190($s0) ## 00000190 -/* 012C4 80B1CBC4 E608006C */ swc1 $f8, 0x006C($s0) ## 0000006C -/* 012C8 80B1CBC8 8FBF002C */ lw $ra, 0x002C($sp) -.L80B1CBCC: -/* 012CC 80B1CBCC 8FB00028 */ lw $s0, 0x0028($sp) -/* 012D0 80B1CBD0 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 -/* 012D4 80B1CBD4 03E00008 */ jr $ra -/* 012D8 80B1CBD8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Tk/EnTk_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Tk/EnTk_Update.s deleted file mode 100644 index 1c06e60083..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Tk/EnTk_Update.s +++ /dev/null @@ -1,49 +0,0 @@ -glabel EnTk_Update -/* 01858 80B1D158 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 0185C 80B1D15C AFB00020 */ sw $s0, 0x0020($sp) -/* 01860 80B1D160 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 01864 80B1D164 AFBF0024 */ sw $ra, 0x0024($sp) -/* 01868 80B1D168 AFA5003C */ sw $a1, 0x003C($sp) -/* 0186C 80B1D16C 26060194 */ addiu $a2, $s0, 0x0194 ## $a2 = 00000194 -/* 01870 80B1D170 00C02825 */ or $a1, $a2, $zero ## $a1 = 00000194 -/* 01874 80B1D174 0C0189B7 */ jal ActorCollider_Cylinder_Update - -/* 01878 80B1D178 AFA6002C */ sw $a2, 0x002C($sp) -/* 0187C 80B1D17C 8FA4003C */ lw $a0, 0x003C($sp) -/* 01880 80B1D180 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 01884 80B1D184 34211E60 */ ori $at, $at, 0x1E60 ## $at = 00011E60 -/* 01888 80B1D188 8FA6002C */ lw $a2, 0x002C($sp) -/* 0188C 80B1D18C 0C017713 */ jal Actor_CollisionCheck_SetOT - ## CollisionCheck_setOT -/* 01890 80B1D190 00812821 */ addu $a1, $a0, $at -/* 01894 80B1D194 0C02927F */ jal SkelAnime_FrameUpdateMatrix - -/* 01898 80B1D198 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C -/* 0189C 80B1D19C 0C00B638 */ jal Actor_MoveForward - -/* 018A0 80B1D1A0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 018A4 80B1D1A4 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 -/* 018A8 80B1D1A8 240E0005 */ addiu $t6, $zero, 0x0005 ## $t6 = 00000005 -/* 018AC 80B1D1AC AFAE0014 */ sw $t6, 0x0014($sp) -/* 018B0 80B1D1B0 8FA4003C */ lw $a0, 0x003C($sp) -/* 018B4 80B1D1B4 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 018B8 80B1D1B8 3C064220 */ lui $a2, 0x4220 ## $a2 = 42200000 -/* 018BC 80B1D1BC 3C074120 */ lui $a3, 0x4120 ## $a3 = 41200000 -/* 018C0 80B1D1C0 0C00B92D */ jal func_8002E4B4 -/* 018C4 80B1D1C4 E7A40010 */ swc1 $f4, 0x0010($sp) -/* 018C8 80B1D1C8 8E190190 */ lw $t9, 0x0190($s0) ## 00000190 -/* 018CC 80B1D1CC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 018D0 80B1D1D0 8FA5003C */ lw $a1, 0x003C($sp) -/* 018D4 80B1D1D4 0320F809 */ jalr $ra, $t9 -/* 018D8 80B1D1D8 00000000 */ nop -/* 018DC 80B1D1DC 0C2C6E69 */ jal func_80B1B9A4 -/* 018E0 80B1D1E0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 018E4 80B1D1E4 0C2C7003 */ jal func_80B1C00C -/* 018E8 80B1D1E8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 018EC 80B1D1EC 8FBF0024 */ lw $ra, 0x0024($sp) -/* 018F0 80B1D1F0 8FB00020 */ lw $s0, 0x0020($sp) -/* 018F4 80B1D1F4 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 -/* 018F8 80B1D1F8 03E00008 */ jr $ra -/* 018FC 80B1D1FC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Tk/func_80B1B900.s b/asm/non_matchings/overlays/actors/ovl_En_Tk/func_80B1B900.s deleted file mode 100644 index 636b918065..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Tk/func_80B1B900.s +++ /dev/null @@ -1,46 +0,0 @@ -glabel func_80B1B900 -/* 00000 80B1B900 24820310 */ addiu $v0, $a0, 0x0310 ## $v0 = 00000310 -/* 00004 80B1B904 24040001 */ addiu $a0, $zero, 0x0001 ## $a0 = 00000001 -/* 00008 80B1B908 00001825 */ or $v1, $zero, $zero ## $v1 = 00000000 -.L80B1B90C: -/* 0000C 80B1B90C 904E0000 */ lbu $t6, 0x0000($v0) ## 00000310 -/* 00010 80B1B910 24630001 */ addiu $v1, $v1, 0x0001 ## $v1 = 00000001 -/* 00014 80B1B914 00031C00 */ sll $v1, $v1, 16 -/* 00018 80B1B918 108E001D */ beq $a0, $t6, .L80B1B990 -/* 0001C 80B1B91C 00031C03 */ sra $v1, $v1, 16 -/* 00020 80B1B920 C7A40014 */ lwc1 $f4, 0x0014($sp) -/* 00024 80B1B924 24190001 */ addiu $t9, $zero, 0x0001 ## $t9 = 00000001 -/* 00028 80B1B928 E4440004 */ swc1 $f4, 0x0004($v0) ## 00000314 -/* 0002C 80B1B92C C7A60018 */ lwc1 $f6, 0x0018($sp) -/* 00030 80B1B930 E4460008 */ swc1 $f6, 0x0008($v0) ## 00000318 -/* 00034 80B1B934 93B80013 */ lbu $t8, 0x0013($sp) -/* 00038 80B1B938 A0590000 */ sb $t9, 0x0000($v0) ## 00000310 -/* 0003C 80B1B93C A0580001 */ sb $t8, 0x0001($v0) ## 00000311 -/* 00040 80B1B940 A0580002 */ sb $t8, 0x0002($v0) ## 00000312 -/* 00044 80B1B944 8CA90000 */ lw $t1, 0x0000($a1) ## 00000000 -/* 00048 80B1B948 AC490014 */ sw $t1, 0x0014($v0) ## 00000324 -/* 0004C 80B1B94C 8CA80004 */ lw $t0, 0x0004($a1) ## 00000004 -/* 00050 80B1B950 AC480018 */ sw $t0, 0x0018($v0) ## 00000328 -/* 00054 80B1B954 8CA90008 */ lw $t1, 0x0008($a1) ## 00000008 -/* 00058 80B1B958 AC49001C */ sw $t1, 0x001C($v0) ## 0000032C -/* 0005C 80B1B95C 8CEB0000 */ lw $t3, 0x0000($a3) ## 00000000 -/* 00060 80B1B960 AC4B002C */ sw $t3, 0x002C($v0) ## 0000033C -/* 00064 80B1B964 8CEA0004 */ lw $t2, 0x0004($a3) ## 00000004 -/* 00068 80B1B968 AC4A0030 */ sw $t2, 0x0030($v0) ## 00000340 -/* 0006C 80B1B96C 8CEB0008 */ lw $t3, 0x0008($a3) ## 00000008 -/* 00070 80B1B970 AC4B0034 */ sw $t3, 0x0034($v0) ## 00000344 -/* 00074 80B1B974 8CCD0000 */ lw $t5, 0x0000($a2) ## 00000000 -/* 00078 80B1B978 AC4D0020 */ sw $t5, 0x0020($v0) ## 00000330 -/* 0007C 80B1B97C 8CCC0004 */ lw $t4, 0x0004($a2) ## 00000004 -/* 00080 80B1B980 AC4C0024 */ sw $t4, 0x0024($v0) ## 00000334 -/* 00084 80B1B984 8CCD0008 */ lw $t5, 0x0008($a2) ## 00000008 -/* 00088 80B1B988 03E00008 */ jr $ra -/* 0008C 80B1B98C AC4D0028 */ sw $t5, 0x0028($v0) ## 00000338 -.L80B1B990: -/* 00090 80B1B990 28610014 */ slti $at, $v1, 0x0014 -/* 00094 80B1B994 1420FFDD */ bne $at, $zero, .L80B1B90C -/* 00098 80B1B998 24420038 */ addiu $v0, $v0, 0x0038 ## $v0 = 00000348 -/* 0009C 80B1B99C 03E00008 */ jr $ra -/* 000A0 80B1B9A0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Tk/func_80B1B9A4.s b/asm/non_matchings/overlays/actors/ovl_En_Tk/func_80B1B9A4.s deleted file mode 100644 index a74af4894b..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Tk/func_80B1B9A4.s +++ /dev/null @@ -1,75 +0,0 @@ -glabel func_80B1B9A4 -/* 000A4 80B1B9A4 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 000A8 80B1B9A8 F7B60018 */ sdc1 $f22, 0x0018($sp) -/* 000AC 80B1B9AC 3C0180B2 */ lui $at, %hi(D_80B1D62C) ## $at = 80B20000 -/* 000B0 80B1B9B0 C436D62C */ lwc1 $f22, %lo(D_80B1D62C)($at) -/* 000B4 80B1B9B4 AFB10028 */ sw $s1, 0x0028($sp) -/* 000B8 80B1B9B8 AFB00024 */ sw $s0, 0x0024($sp) -/* 000BC 80B1B9BC F7B40010 */ sdc1 $f20, 0x0010($sp) -/* 000C0 80B1B9C0 3C0180B2 */ lui $at, %hi(D_80B1D630) ## $at = 80B20000 -/* 000C4 80B1B9C4 AFBF002C */ sw $ra, 0x002C($sp) -/* 000C8 80B1B9C8 24900310 */ addiu $s0, $a0, 0x0310 ## $s0 = 00000310 -/* 000CC 80B1B9CC C434D630 */ lwc1 $f20, %lo(D_80B1D630)($at) -/* 000D0 80B1B9D0 00008825 */ or $s1, $zero, $zero ## $s1 = 00000000 -.L80B1B9D4: -/* 000D4 80B1B9D4 920E0000 */ lbu $t6, 0x0000($s0) ## 00000310 -/* 000D8 80B1B9D8 51C00029 */ beql $t6, $zero, .L80B1BA80 -/* 000DC 80B1B9DC 26310001 */ addiu $s1, $s1, 0x0001 ## $s1 = 00000001 -/* 000E0 80B1B9E0 920F0001 */ lbu $t7, 0x0001($s0) ## 00000311 -/* 000E4 80B1B9E4 25F8FFFF */ addiu $t8, $t7, 0xFFFF ## $t8 = FFFFFFFF -/* 000E8 80B1B9E8 331900FF */ andi $t9, $t8, 0x00FF ## $t9 = 000000FF -/* 000EC 80B1B9EC 17200002 */ bne $t9, $zero, .L80B1B9F8 -/* 000F0 80B1B9F0 A2180001 */ sb $t8, 0x0001($s0) ## 00000311 -/* 000F4 80B1B9F4 A2000000 */ sb $zero, 0x0000($s0) ## 00000310 -.L80B1B9F8: -/* 000F8 80B1B9F8 0C03F66B */ jal Math_Rand_ZeroOne - ## Rand.Next() float -/* 000FC 80B1B9FC 00000000 */ nop -/* 00100 80B1BA00 46140102 */ mul.s $f4, $f0, $f20 -/* 00104 80B1BA04 46162181 */ sub.s $f6, $f4, $f22 -/* 00108 80B1BA08 0C03F66B */ jal Math_Rand_ZeroOne - ## Rand.Next() float -/* 0010C 80B1BA0C E606002C */ swc1 $f6, 0x002C($s0) ## 0000033C -/* 00110 80B1BA10 C60C0020 */ lwc1 $f12, 0x0020($s0) ## 00000330 -/* 00114 80B1BA14 C60A0014 */ lwc1 $f10, 0x0014($s0) ## 00000324 -/* 00118 80B1BA18 46140202 */ mul.s $f8, $f0, $f20 -/* 0011C 80B1BA1C C60E0024 */ lwc1 $f14, 0x0024($s0) ## 00000334 -/* 00120 80B1BA20 460C5480 */ add.s $f18, $f10, $f12 -/* 00124 80B1BA24 C6040018 */ lwc1 $f4, 0x0018($s0) ## 00000328 -/* 00128 80B1BA28 C6100028 */ lwc1 $f16, 0x0028($s0) ## 00000338 -/* 0012C 80B1BA2C E6120014 */ swc1 $f18, 0x0014($s0) ## 00000324 -/* 00130 80B1BA30 C612002C */ lwc1 $f18, 0x002C($s0) ## 0000033C -/* 00134 80B1BA34 460E2180 */ add.s $f6, $f4, $f14 -/* 00138 80B1BA38 46164081 */ sub.s $f2, $f8, $f22 -/* 0013C 80B1BA3C C608001C */ lwc1 $f8, 0x001C($s0) ## 0000032C -/* 00140 80B1BA40 E6060018 */ swc1 $f6, 0x0018($s0) ## 00000328 -/* 00144 80B1BA44 46126100 */ add.s $f4, $f12, $f18 -/* 00148 80B1BA48 C6060030 */ lwc1 $f6, 0x0030($s0) ## 00000340 -/* 0014C 80B1BA4C C6120004 */ lwc1 $f18, 0x0004($s0) ## 00000314 -/* 00150 80B1BA50 46104280 */ add.s $f10, $f8, $f16 -/* 00154 80B1BA54 E6040020 */ swc1 $f4, 0x0020($s0) ## 00000330 -/* 00158 80B1BA58 C6040008 */ lwc1 $f4, 0x0008($s0) ## 00000318 -/* 0015C 80B1BA5C 46067200 */ add.s $f8, $f14, $f6 -/* 00160 80B1BA60 E60A001C */ swc1 $f10, 0x001C($s0) ## 0000032C -/* 00164 80B1BA64 E6020034 */ swc1 $f2, 0x0034($s0) ## 00000344 -/* 00168 80B1BA68 46028280 */ add.s $f10, $f16, $f2 -/* 0016C 80B1BA6C E6080024 */ swc1 $f8, 0x0024($s0) ## 00000334 -/* 00170 80B1BA70 46049180 */ add.s $f6, $f18, $f4 -/* 00174 80B1BA74 E60A0028 */ swc1 $f10, 0x0028($s0) ## 00000338 -/* 00178 80B1BA78 E6060004 */ swc1 $f6, 0x0004($s0) ## 00000314 -/* 0017C 80B1BA7C 26310001 */ addiu $s1, $s1, 0x0001 ## $s1 = 00000002 -.L80B1BA80: -/* 00180 80B1BA80 00118C00 */ sll $s1, $s1, 16 -/* 00184 80B1BA84 00118C03 */ sra $s1, $s1, 16 -/* 00188 80B1BA88 2A210014 */ slti $at, $s1, 0x0014 -/* 0018C 80B1BA8C 1420FFD1 */ bne $at, $zero, .L80B1B9D4 -/* 00190 80B1BA90 26100038 */ addiu $s0, $s0, 0x0038 ## $s0 = 00000348 -/* 00194 80B1BA94 8FBF002C */ lw $ra, 0x002C($sp) -/* 00198 80B1BA98 D7B40010 */ ldc1 $f20, 0x0010($sp) -/* 0019C 80B1BA9C D7B60018 */ ldc1 $f22, 0x0018($sp) -/* 001A0 80B1BAA0 8FB00024 */ lw $s0, 0x0024($sp) -/* 001A4 80B1BAA4 8FB10028 */ lw $s1, 0x0028($sp) -/* 001A8 80B1BAA8 03E00008 */ jr $ra -/* 001AC 80B1BAAC 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Tk/func_80B1BAB0.s b/asm/non_matchings/overlays/actors/ovl_En_Tk/func_80B1BAB0.s deleted file mode 100644 index 77c327790c..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Tk/func_80B1BAB0.s +++ /dev/null @@ -1,213 +0,0 @@ -glabel func_80B1BAB0 -/* 001B0 80B1BAB0 27BDFF58 */ addiu $sp, $sp, 0xFF58 ## $sp = FFFFFF58 -/* 001B4 80B1BAB4 AFBE0050 */ sw $s8, 0x0050($sp) -/* 001B8 80B1BAB8 00A0F025 */ or $s8, $a1, $zero ## $s8 = 00000000 -/* 001BC 80B1BABC AFBF0054 */ sw $ra, 0x0054($sp) -/* 001C0 80B1BAC0 AFB7004C */ sw $s7, 0x004C($sp) -/* 001C4 80B1BAC4 AFB60048 */ sw $s6, 0x0048($sp) -/* 001C8 80B1BAC8 AFB50044 */ sw $s5, 0x0044($sp) -/* 001CC 80B1BACC AFB40040 */ sw $s4, 0x0040($sp) -/* 001D0 80B1BAD0 AFB3003C */ sw $s3, 0x003C($sp) -/* 001D4 80B1BAD4 AFB20038 */ sw $s2, 0x0038($sp) -/* 001D8 80B1BAD8 AFB10034 */ sw $s1, 0x0034($sp) -/* 001DC 80B1BADC AFB00030 */ sw $s0, 0x0030($sp) -/* 001E0 80B1BAE0 F7B80028 */ sdc1 $f24, 0x0028($sp) -/* 001E4 80B1BAE4 F7B60020 */ sdc1 $f22, 0x0020($sp) -/* 001E8 80B1BAE8 F7B40018 */ sdc1 $f20, 0x0018($sp) -/* 001EC 80B1BAEC 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 -/* 001F0 80B1BAF0 24920310 */ addiu $s2, $a0, 0x0310 ## $s2 = 00000310 -/* 001F4 80B1BAF4 3C0680B2 */ lui $a2, %hi(D_80B1D5B0) ## $a2 = 80B20000 -/* 001F8 80B1BAF8 24C6D5B0 */ addiu $a2, $a2, %lo(D_80B1D5B0) ## $a2 = 80B1D5B0 -/* 001FC 80B1BAFC 27A40088 */ addiu $a0, $sp, 0x0088 ## $a0 = FFFFFFE0 -/* 00200 80B1BB00 24070072 */ addiu $a3, $zero, 0x0072 ## $a3 = 00000072 -/* 00204 80B1BB04 0C031AB1 */ jal func_800C6AC4 -/* 00208 80B1BB08 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 -/* 0020C 80B1BB0C 0000B825 */ or $s7, $zero, $zero ## $s7 = 00000000 -/* 00210 80B1BB10 0C024F61 */ jal func_80093D84 -/* 00214 80B1BB14 8FC40000 */ lw $a0, 0x0000($s8) ## 00000000 -/* 00218 80B1BB18 3C014100 */ lui $at, 0x4100 ## $at = 41000000 -/* 0021C 80B1BB1C 4481C000 */ mtc1 $at, $f24 ## $f24 = 8.00 -/* 00220 80B1BB20 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 00224 80B1BB24 4481B000 */ mtc1 $at, $f22 ## $f22 = 1.00 -/* 00228 80B1BB28 3C01437F */ lui $at, 0x437F ## $at = 437F0000 -/* 0022C 80B1BB2C 4481A000 */ mtc1 $at, $f20 ## $f20 = 255.00 -/* 00230 80B1BB30 0000A025 */ or $s4, $zero, $zero ## $s4 = 00000000 -/* 00234 80B1BB34 3C16DE00 */ lui $s6, 0xDE00 ## $s6 = DE000000 -.L80B1BB38: -/* 00238 80B1BB38 924E0000 */ lbu $t6, 0x0000($s2) ## 00000310 -/* 0023C 80B1BB3C 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 00240 80B1BB40 34211DA0 */ ori $at, $at, 0x1DA0 ## $at = 00011DA0 -/* 00244 80B1BB44 11C0008A */ beq $t6, $zero, .L80B1BD70 -/* 00248 80B1BB48 03C19821 */ addu $s3, $s8, $at -/* 0024C 80B1BB4C 3C150601 */ lui $s5, 0x0601 ## $s5 = 06010000 -/* 00250 80B1BB50 16E00014 */ bne $s7, $zero, .L80B1BBA4 -/* 00254 80B1BB54 26B5BCA0 */ addiu $s5, $s5, 0xBCA0 ## $s5 = 0600BCA0 -/* 00258 80B1BB58 3C110601 */ lui $s1, 0x0601 ## $s1 = 06010000 -/* 0025C 80B1BB5C 2631BC90 */ addiu $s1, $s1, 0xBC90 ## $s1 = 0600BC90 -/* 00260 80B1BB60 8E0402D0 */ lw $a0, 0x02D0($s0) ## 000002D0 -/* 00264 80B1BB64 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 00268 80B1BB68 0C024DDD */ jal func_80093774 -/* 0026C 80B1BB6C 24170001 */ addiu $s7, $zero, 0x0001 ## $s7 = 00000001 -/* 00270 80B1BB70 AE0202D0 */ sw $v0, 0x02D0($s0) ## 000002D0 -/* 00274 80B1BB74 244F0008 */ addiu $t7, $v0, 0x0008 ## $t7 = 00000008 -/* 00278 80B1BB78 AE0F02D0 */ sw $t7, 0x02D0($s0) ## 000002D0 -/* 0027C 80B1BB7C AC510004 */ sw $s1, 0x0004($v0) ## 00000004 -/* 00280 80B1BB80 AC560000 */ sw $s6, 0x0000($v0) ## 00000000 -/* 00284 80B1BB84 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 00288 80B1BB88 3C08643C */ lui $t0, 0x643C ## $t0 = 643C0000 -/* 0028C 80B1BB8C 35081400 */ ori $t0, $t0, 0x1400 ## $t0 = 643C1400 -/* 00290 80B1BB90 24580008 */ addiu $t8, $v0, 0x0008 ## $t8 = 00000008 -/* 00294 80B1BB94 AE1802D0 */ sw $t8, 0x02D0($s0) ## 000002D0 -/* 00298 80B1BB98 3C19FB00 */ lui $t9, 0xFB00 ## $t9 = FB000000 -/* 0029C 80B1BB9C AC590000 */ sw $t9, 0x0000($v0) ## 00000000 -/* 002A0 80B1BBA0 AC480004 */ sw $t0, 0x0004($v0) ## 00000004 -.L80B1BBA4: -/* 002A4 80B1BBA4 92490001 */ lbu $t1, 0x0001($s2) ## 00000311 -/* 002A8 80B1BBA8 3C014F80 */ lui $at, 0x4F80 ## $at = 4F800000 -/* 002AC 80B1BBAC 44892000 */ mtc1 $t1, $f4 ## $f4 = 0.00 -/* 002B0 80B1BBB0 05210004 */ bgez $t1, .L80B1BBC4 -/* 002B4 80B1BBB4 468021A0 */ cvt.s.w $f6, $f4 -/* 002B8 80B1BBB8 44814000 */ mtc1 $at, $f8 ## $f8 = 4294967296.00 -/* 002BC 80B1BBBC 00000000 */ nop -/* 002C0 80B1BBC0 46083180 */ add.s $f6, $f6, $f8 -.L80B1BBC4: -/* 002C4 80B1BBC4 924A0002 */ lbu $t2, 0x0002($s2) ## 00000312 -/* 002C8 80B1BBC8 3C014F80 */ lui $at, 0x4F80 ## $at = 4F800000 -/* 002CC 80B1BBCC 448A5000 */ mtc1 $t2, $f10 ## $f10 = 0.00 -/* 002D0 80B1BBD0 05410004 */ bgez $t2, .L80B1BBE4 -/* 002D4 80B1BBD4 46805420 */ cvt.s.w $f16, $f10 -/* 002D8 80B1BBD8 44819000 */ mtc1 $at, $f18 ## $f18 = 4294967296.00 -/* 002DC 80B1BBDC 00000000 */ nop -/* 002E0 80B1BBE0 46128400 */ add.s $f16, $f16, $f18 -.L80B1BBE4: -/* 002E4 80B1BBE4 4610A103 */ div.s $f4, $f20, $f16 -/* 002E8 80B1BBE8 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 002EC 80B1BBEC 3C01AA82 */ lui $at, 0xAA82 ## $at = AA820000 -/* 002F0 80B1BBF0 34215A00 */ ori $at, $at, 0x5A00 ## $at = AA825A00 -/* 002F4 80B1BBF4 244C0008 */ addiu $t4, $v0, 0x0008 ## $t4 = 00000008 -/* 002F8 80B1BBF8 AE0C02D0 */ sw $t4, 0x02D0($s0) ## 000002D0 -/* 002FC 80B1BBFC 3C0DFA00 */ lui $t5, 0xFA00 ## $t5 = FA000000 -/* 00300 80B1BC00 AC4D0000 */ sw $t5, 0x0000($v0) ## 00000000 -/* 00304 80B1BC04 3C19E700 */ lui $t9, 0xE700 ## $t9 = E7000000 -/* 00308 80B1BC08 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 0030C 80B1BC0C 46043202 */ mul.s $f8, $f6, $f4 -/* 00310 80B1BC10 4600428D */ trunc.w.s $f10, $f8 -/* 00314 80B1BC14 44045000 */ mfc1 $a0, $f10 -/* 00318 80B1BC18 00000000 */ nop -/* 0031C 80B1BC1C 00042400 */ sll $a0, $a0, 16 -/* 00320 80B1BC20 00042403 */ sra $a0, $a0, 16 -/* 00324 80B1BC24 308E00FF */ andi $t6, $a0, 0x00FF ## $t6 = 00000000 -/* 00328 80B1BC28 01C17825 */ or $t7, $t6, $at ## $t7 = AA825A00 -/* 0032C 80B1BC2C AC4F0004 */ sw $t7, 0x0004($v0) ## 00000004 -/* 00330 80B1BC30 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 00334 80B1BC34 24580008 */ addiu $t8, $v0, 0x0008 ## $t8 = 00000008 -/* 00338 80B1BC38 AE1802D0 */ sw $t8, 0x02D0($s0) ## 000002D0 -/* 0033C 80B1BC3C AC400004 */ sw $zero, 0x0004($v0) ## 00000004 -/* 00340 80B1BC40 AC590000 */ sw $t9, 0x0000($v0) ## 00000000 -/* 00344 80B1BC44 8E46001C */ lw $a2, 0x001C($s2) ## 0000032C -/* 00348 80B1BC48 C64E0018 */ lwc1 $f14, 0x0018($s2) ## 00000328 -/* 0034C 80B1BC4C 0C034261 */ jal Matrix_Translate -/* 00350 80B1BC50 C64C0014 */ lwc1 $f12, 0x0014($s2) ## 00000324 -/* 00354 80B1BC54 0C0347F5 */ jal func_800D1FD4 -/* 00358 80B1BC58 02602025 */ or $a0, $s3, $zero ## $a0 = 00000000 -/* 0035C 80B1BC5C C64C0004 */ lwc1 $f12, 0x0004($s2) ## 00000314 -/* 00360 80B1BC60 4406B000 */ mfc1 $a2, $f22 -/* 00364 80B1BC64 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 00368 80B1BC68 0C0342A3 */ jal Matrix_Scale -/* 0036C 80B1BC6C 46006386 */ mov.s $f14, $f12 -/* 00370 80B1BC70 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 00374 80B1BC74 3C09DA38 */ lui $t1, 0xDA38 ## $t1 = DA380000 -/* 00378 80B1BC78 35290003 */ ori $t1, $t1, 0x0003 ## $t1 = DA380003 -/* 0037C 80B1BC7C 24480008 */ addiu $t0, $v0, 0x0008 ## $t0 = 00000008 -/* 00380 80B1BC80 AE0802D0 */ sw $t0, 0x02D0($s0) ## 000002D0 -/* 00384 80B1BC84 3C0580B2 */ lui $a1, %hi(D_80B1D5C4) ## $a1 = 80B20000 -/* 00388 80B1BC88 AC490000 */ sw $t1, 0x0000($v0) ## 00000000 -/* 0038C 80B1BC8C 8FC40000 */ lw $a0, 0x0000($s8) ## 00000000 -/* 00390 80B1BC90 24A5D5C4 */ addiu $a1, $a1, %lo(D_80B1D5C4) ## $a1 = 80B1D5C4 -/* 00394 80B1BC94 2406008C */ addiu $a2, $zero, 0x008C ## $a2 = 0000008C -/* 00398 80B1BC98 0C0346A2 */ jal Matrix_NewMtx -/* 0039C 80B1BC9C 00408825 */ or $s1, $v0, $zero ## $s1 = 00000000 -/* 003A0 80B1BCA0 AE220004 */ sw $v0, 0x0004($s1) ## 00000004 -/* 003A4 80B1BCA4 924A0001 */ lbu $t2, 0x0001($s2) ## 00000311 -/* 003A8 80B1BCA8 3C014F80 */ lui $at, 0x4F80 ## $at = 4F800000 -/* 003AC 80B1BCAC 448A9000 */ mtc1 $t2, $f18 ## $f18 = 0.00 -/* 003B0 80B1BCB0 05410004 */ bgez $t2, .L80B1BCC4 -/* 003B4 80B1BCB4 46809420 */ cvt.s.w $f16, $f18 -/* 003B8 80B1BCB8 44813000 */ mtc1 $at, $f6 ## $f6 = 4294967296.00 -/* 003BC 80B1BCBC 00000000 */ nop -/* 003C0 80B1BCC0 46068400 */ add.s $f16, $f16, $f6 -.L80B1BCC4: -/* 003C4 80B1BCC4 924B0002 */ lbu $t3, 0x0002($s2) ## 00000312 -/* 003C8 80B1BCC8 3C014F80 */ lui $at, 0x4F80 ## $at = 4F800000 -/* 003CC 80B1BCCC 448B2000 */ mtc1 $t3, $f4 ## $f4 = 0.00 -/* 003D0 80B1BCD0 05610004 */ bgez $t3, .L80B1BCE4 -/* 003D4 80B1BCD4 46802220 */ cvt.s.w $f8, $f4 -/* 003D8 80B1BCD8 44815000 */ mtc1 $at, $f10 ## $f10 = 4294967296.00 -/* 003DC 80B1BCDC 00000000 */ nop -/* 003E0 80B1BCE0 460A4200 */ add.s $f8, $f8, $f10 -.L80B1BCE4: -/* 003E4 80B1BCE4 4608C483 */ div.s $f18, $f24, $f8 -/* 003E8 80B1BCE8 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 003EC 80B1BCEC 3C0EDB06 */ lui $t6, 0xDB06 ## $t6 = DB060000 -/* 003F0 80B1BCF0 35CE0020 */ ori $t6, $t6, 0x0020 ## $t6 = DB060020 -/* 003F4 80B1BCF4 244D0008 */ addiu $t5, $v0, 0x0008 ## $t5 = 00000008 -/* 003F8 80B1BCF8 AE0D02D0 */ sw $t5, 0x02D0($s0) ## 000002D0 -/* 003FC 80B1BCFC 3C0480B2 */ lui $a0, %hi(D_80B1D4D0) ## $a0 = 80B20000 -/* 00400 80B1BD00 AC4E0000 */ sw $t6, 0x0000($v0) ## 00000000 -/* 00404 80B1BD04 3C0A8016 */ lui $t2, 0x8016 ## $t2 = 80160000 -/* 00408 80B1BD08 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 -/* 0040C 80B1BD0C 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF -/* 00410 80B1BD10 46128182 */ mul.s $f6, $f16, $f18 -/* 00414 80B1BD14 4600310D */ trunc.w.s $f4, $f6 -/* 00418 80B1BD18 44052000 */ mfc1 $a1, $f4 -/* 0041C 80B1BD1C 00000000 */ nop -/* 00420 80B1BD20 00052C00 */ sll $a1, $a1, 16 -/* 00424 80B1BD24 00052C03 */ sra $a1, $a1, 16 -/* 00428 80B1BD28 00057880 */ sll $t7, $a1, 2 -/* 0042C 80B1BD2C 008F2021 */ addu $a0, $a0, $t7 -/* 00430 80B1BD30 8C84D4D0 */ lw $a0, %lo(D_80B1D4D0)($a0) -/* 00434 80B1BD34 0004C900 */ sll $t9, $a0, 4 -/* 00438 80B1BD38 00194702 */ srl $t0, $t9, 28 -/* 0043C 80B1BD3C 00084880 */ sll $t1, $t0, 2 -/* 00440 80B1BD40 01495021 */ addu $t2, $t2, $t1 -/* 00444 80B1BD44 8D4A6FA8 */ lw $t2, 0x6FA8($t2) ## 80166FA8 -/* 00448 80B1BD48 0081C024 */ and $t8, $a0, $at -/* 0044C 80B1BD4C 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 00450 80B1BD50 030A5821 */ addu $t3, $t8, $t2 -/* 00454 80B1BD54 01616021 */ addu $t4, $t3, $at -/* 00458 80B1BD58 AC4C0004 */ sw $t4, 0x0004($v0) ## 00000004 -/* 0045C 80B1BD5C 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 00460 80B1BD60 244D0008 */ addiu $t5, $v0, 0x0008 ## $t5 = 00000008 -/* 00464 80B1BD64 AE0D02D0 */ sw $t5, 0x02D0($s0) ## 000002D0 -/* 00468 80B1BD68 AC550004 */ sw $s5, 0x0004($v0) ## 00000004 -/* 0046C 80B1BD6C AC560000 */ sw $s6, 0x0000($v0) ## 00000000 -.L80B1BD70: -/* 00470 80B1BD70 26940001 */ addiu $s4, $s4, 0x0001 ## $s4 = 00000001 -/* 00474 80B1BD74 0014A400 */ sll $s4, $s4, 16 -/* 00478 80B1BD78 0014A403 */ sra $s4, $s4, 16 -/* 0047C 80B1BD7C 2A810014 */ slti $at, $s4, 0x0014 -/* 00480 80B1BD80 1420FF6D */ bne $at, $zero, .L80B1BB38 -/* 00484 80B1BD84 26520038 */ addiu $s2, $s2, 0x0038 ## $s2 = 00000348 -/* 00488 80B1BD88 3C0680B2 */ lui $a2, %hi(D_80B1D5D8) ## $a2 = 80B20000 -/* 0048C 80B1BD8C 24C6D5D8 */ addiu $a2, $a2, %lo(D_80B1D5D8) ## $a2 = 80B1D5D8 -/* 00490 80B1BD90 27A40088 */ addiu $a0, $sp, 0x0088 ## $a0 = FFFFFFE0 -/* 00494 80B1BD94 8FC50000 */ lw $a1, 0x0000($s8) ## 00000000 -/* 00498 80B1BD98 0C031AD5 */ jal func_800C6B54 -/* 0049C 80B1BD9C 2407009A */ addiu $a3, $zero, 0x009A ## $a3 = 0000009A -/* 004A0 80B1BDA0 8FBF0054 */ lw $ra, 0x0054($sp) -/* 004A4 80B1BDA4 D7B40018 */ ldc1 $f20, 0x0018($sp) -/* 004A8 80B1BDA8 D7B60020 */ ldc1 $f22, 0x0020($sp) -/* 004AC 80B1BDAC D7B80028 */ ldc1 $f24, 0x0028($sp) -/* 004B0 80B1BDB0 8FB00030 */ lw $s0, 0x0030($sp) -/* 004B4 80B1BDB4 8FB10034 */ lw $s1, 0x0034($sp) -/* 004B8 80B1BDB8 8FB20038 */ lw $s2, 0x0038($sp) -/* 004BC 80B1BDBC 8FB3003C */ lw $s3, 0x003C($sp) -/* 004C0 80B1BDC0 8FB40040 */ lw $s4, 0x0040($sp) -/* 004C4 80B1BDC4 8FB50044 */ lw $s5, 0x0044($sp) -/* 004C8 80B1BDC8 8FB60048 */ lw $s6, 0x0048($sp) -/* 004CC 80B1BDCC 8FB7004C */ lw $s7, 0x004C($sp) -/* 004D0 80B1BDD0 8FBE0050 */ lw $s8, 0x0050($sp) -/* 004D4 80B1BDD4 03E00008 */ jr $ra -/* 004D8 80B1BDD8 27BD00A8 */ addiu $sp, $sp, 0x00A8 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Tk/func_80B1BDDC.s b/asm/non_matchings/overlays/actors/ovl_En_Tk/func_80B1BDDC.s deleted file mode 100644 index 69a8f7fbee..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Tk/func_80B1BDDC.s +++ /dev/null @@ -1,50 +0,0 @@ -glabel func_80B1BDDC -/* 004DC 80B1BDDC 27BDFFB8 */ addiu $sp, $sp, 0xFFB8 ## $sp = FFFFFFB8 -/* 004E0 80B1BDE0 3C0F80B2 */ lui $t7, %hi(D_80B1D4F0) ## $t7 = 80B20000 -/* 004E4 80B1BDE4 AFBF0024 */ sw $ra, 0x0024($sp) -/* 004E8 80B1BDE8 AFA40048 */ sw $a0, 0x0048($sp) -/* 004EC 80B1BDEC AFA5004C */ sw $a1, 0x004C($sp) -/* 004F0 80B1BDF0 AFA60050 */ sw $a2, 0x0050($sp) -/* 004F4 80B1BDF4 AFA70054 */ sw $a3, 0x0054($sp) -/* 004F8 80B1BDF8 25EFD4F0 */ addiu $t7, $t7, %lo(D_80B1D4F0) ## $t7 = 80B1D4F0 -/* 004FC 80B1BDFC 8DF90000 */ lw $t9, 0x0000($t7) ## 80B1D4F0 -/* 00500 80B1BE00 27AE003C */ addiu $t6, $sp, 0x003C ## $t6 = FFFFFFF4 -/* 00504 80B1BE04 8DF80004 */ lw $t8, 0x0004($t7) ## 80B1D4F4 -/* 00508 80B1BE08 ADD90000 */ sw $t9, 0x0000($t6) ## FFFFFFF4 -/* 0050C 80B1BE0C 8DF90008 */ lw $t9, 0x0008($t7) ## 80B1D4F8 -/* 00510 80B1BE10 3C0980B2 */ lui $t1, %hi(D_80B1D4FC) ## $t1 = 80B20000 -/* 00514 80B1BE14 2529D4FC */ addiu $t1, $t1, %lo(D_80B1D4FC) ## $t1 = 80B1D4FC -/* 00518 80B1BE18 ADD80004 */ sw $t8, 0x0004($t6) ## FFFFFFF8 -/* 0051C 80B1BE1C ADD90008 */ sw $t9, 0x0008($t6) ## FFFFFFFC -/* 00520 80B1BE20 8D2B0000 */ lw $t3, 0x0000($t1) ## 80B1D4FC -/* 00524 80B1BE24 27A80030 */ addiu $t0, $sp, 0x0030 ## $t0 = FFFFFFE8 -/* 00528 80B1BE28 8D2A0004 */ lw $t2, 0x0004($t1) ## 80B1D500 -/* 0052C 80B1BE2C AD0B0000 */ sw $t3, 0x0000($t0) ## FFFFFFE8 -/* 00530 80B1BE30 8D2B0008 */ lw $t3, 0x0008($t1) ## 80B1D504 -/* 00534 80B1BE34 AD0A0004 */ sw $t2, 0x0004($t0) ## FFFFFFEC -/* 00538 80B1BE38 0C03F66B */ jal Math_Rand_ZeroOne - ## Rand.Next() float -/* 0053C 80B1BE3C AD0B0008 */ sw $t3, 0x0008($t0) ## FFFFFFF0 -/* 00540 80B1BE40 C7A6005C */ lwc1 $f6, 0x005C($sp) -/* 00544 80B1BE44 C7A40034 */ lwc1 $f4, 0x0034($sp) -/* 00548 80B1BE48 93AC0053 */ lbu $t4, 0x0053($sp) -/* 0054C 80B1BE4C 46060202 */ mul.s $f8, $f0, $f6 -/* 00550 80B1BE50 C7B00054 */ lwc1 $f16, 0x0054($sp) -/* 00554 80B1BE54 C7B20058 */ lwc1 $f18, 0x0058($sp) -/* 00558 80B1BE58 8FA40048 */ lw $a0, 0x0048($sp) -/* 0055C 80B1BE5C 8FA5004C */ lw $a1, 0x004C($sp) -/* 00560 80B1BE60 27A6003C */ addiu $a2, $sp, 0x003C ## $a2 = FFFFFFF4 -/* 00564 80B1BE64 27A70030 */ addiu $a3, $sp, 0x0030 ## $a3 = FFFFFFE8 -/* 00568 80B1BE68 46082280 */ add.s $f10, $f4, $f8 -/* 0056C 80B1BE6C AFAC0010 */ sw $t4, 0x0010($sp) -/* 00570 80B1BE70 E7B00014 */ swc1 $f16, 0x0014($sp) -/* 00574 80B1BE74 E7B20018 */ swc1 $f18, 0x0018($sp) -/* 00578 80B1BE78 0C2C6E40 */ jal func_80B1B900 -/* 0057C 80B1BE7C E7AA0034 */ swc1 $f10, 0x0034($sp) -/* 00580 80B1BE80 8FBF0024 */ lw $ra, 0x0024($sp) -/* 00584 80B1BE84 27BD0048 */ addiu $sp, $sp, 0x0048 ## $sp = 00000000 -/* 00588 80B1BE88 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 0058C 80B1BE8C 03E00008 */ jr $ra -/* 00590 80B1BE90 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Tk/func_80B1BE94.s b/asm/non_matchings/overlays/actors/ovl_En_Tk/func_80B1BE94.s deleted file mode 100644 index 21dcf60bfc..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Tk/func_80B1BE94.s +++ /dev/null @@ -1,38 +0,0 @@ -glabel func_80B1BE94 -/* 00594 80B1BE94 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 00598 80B1BE98 AFA40028 */ sw $a0, 0x0028($sp) -/* 0059C 80B1BE9C AFBF0024 */ sw $ra, 0x0024($sp) -/* 005A0 80B1BEA0 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 -/* 005A4 80B1BEA4 AFA5002C */ sw $a1, 0x002C($sp) -/* 005A8 80B1BEA8 0C028800 */ jal SkelAnime_GetFrameCount - -/* 005AC 80B1BEAC 24842F84 */ addiu $a0, $a0, 0x2F84 ## $a0 = 06002F84 -/* 005B0 80B1BEB0 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 -/* 005B4 80B1BEB4 3C01C120 */ lui $at, 0xC120 ## $at = C1200000 -/* 005B8 80B1BEB8 44814000 */ mtc1 $at, $f8 ## $f8 = -10.00 -/* 005BC 80B1BEBC 468021A0 */ cvt.s.w $f6, $f4 -/* 005C0 80B1BEC0 8FA40028 */ lw $a0, 0x0028($sp) -/* 005C4 80B1BEC4 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 005C8 80B1BEC8 24A52F84 */ addiu $a1, $a1, 0x2F84 ## $a1 = 06002F84 -/* 005CC 80B1BECC 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 005D0 80B1BED0 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 005D4 80B1BED4 E7A60010 */ swc1 $f6, 0x0010($sp) -/* 005D8 80B1BED8 AFA00014 */ sw $zero, 0x0014($sp) -/* 005DC 80B1BEDC E7A80018 */ swc1 $f8, 0x0018($sp) -/* 005E0 80B1BEE0 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 005E4 80B1BEE4 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 005E8 80B1BEE8 2404003C */ addiu $a0, $zero, 0x003C ## $a0 = 0000003C -/* 005EC 80B1BEEC 0C01DF64 */ jal Math_Rand_S16Offset - -/* 005F0 80B1BEF0 2405003C */ addiu $a1, $zero, 0x003C ## $a1 = 0000003C -/* 005F4 80B1BEF4 8FA30028 */ lw $v1, 0x0028($sp) -/* 005F8 80B1BEF8 44805000 */ mtc1 $zero, $f10 ## $f10 = 0.00 -/* 005FC 80B1BEFC A462021C */ sh $v0, 0x021C($v1) ## 0000021C -/* 00600 80B1BF00 E46A0068 */ swc1 $f10, 0x0068($v1) ## 00000068 -/* 00604 80B1BF04 8FBF0024 */ lw $ra, 0x0024($sp) -/* 00608 80B1BF08 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 0060C 80B1BF0C 03E00008 */ jr $ra -/* 00610 80B1BF10 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Tk/func_80B1BF14.s b/asm/non_matchings/overlays/actors/ovl_En_Tk/func_80B1BF14.s deleted file mode 100644 index 72ede3767a..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Tk/func_80B1BF14.s +++ /dev/null @@ -1,36 +0,0 @@ -glabel func_80B1BF14 -/* 00614 80B1BF14 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 00618 80B1BF18 AFA40028 */ sw $a0, 0x0028($sp) -/* 0061C 80B1BF1C AFBF0024 */ sw $ra, 0x0024($sp) -/* 00620 80B1BF20 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 -/* 00624 80B1BF24 AFA5002C */ sw $a1, 0x002C($sp) -/* 00628 80B1BF28 0C028800 */ jal SkelAnime_GetFrameCount - -/* 0062C 80B1BF2C 24842F84 */ addiu $a0, $a0, 0x2F84 ## $a0 = 06002F84 -/* 00630 80B1BF30 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 -/* 00634 80B1BF34 3C01C120 */ lui $at, 0xC120 ## $at = C1200000 -/* 00638 80B1BF38 44814000 */ mtc1 $at, $f8 ## $f8 = -10.00 -/* 0063C 80B1BF3C 468021A0 */ cvt.s.w $f6, $f4 -/* 00640 80B1BF40 8FA40028 */ lw $a0, 0x0028($sp) -/* 00644 80B1BF44 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 00648 80B1BF48 24A51FA8 */ addiu $a1, $a1, 0x1FA8 ## $a1 = 06001FA8 -/* 0064C 80B1BF4C 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 00650 80B1BF50 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 00654 80B1BF54 E7A60010 */ swc1 $f6, 0x0010($sp) -/* 00658 80B1BF58 AFA00014 */ sw $zero, 0x0014($sp) -/* 0065C 80B1BF5C E7A80018 */ swc1 $f8, 0x0018($sp) -/* 00660 80B1BF60 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 00664 80B1BF64 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 00668 80B1BF68 240400F0 */ addiu $a0, $zero, 0x00F0 ## $a0 = 000000F0 -/* 0066C 80B1BF6C 0C01DF64 */ jal Math_Rand_S16Offset - -/* 00670 80B1BF70 240500F0 */ addiu $a1, $zero, 0x00F0 ## $a1 = 000000F0 -/* 00674 80B1BF74 8FAE0028 */ lw $t6, 0x0028($sp) -/* 00678 80B1BF78 A5C2021C */ sh $v0, 0x021C($t6) ## 0000021C -/* 0067C 80B1BF7C 8FBF0024 */ lw $ra, 0x0024($sp) -/* 00680 80B1BF80 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 00684 80B1BF84 03E00008 */ jr $ra -/* 00688 80B1BF88 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Tk/func_80B1BF8C.s b/asm/non_matchings/overlays/actors/ovl_En_Tk/func_80B1BF8C.s deleted file mode 100644 index acea15376f..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Tk/func_80B1BF8C.s +++ /dev/null @@ -1,38 +0,0 @@ -glabel func_80B1BF8C -/* 0068C 80B1BF8C 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 00690 80B1BF90 AFA40028 */ sw $a0, 0x0028($sp) -/* 00694 80B1BF94 AFBF0024 */ sw $ra, 0x0024($sp) -/* 00698 80B1BF98 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 -/* 0069C 80B1BF9C AFA5002C */ sw $a1, 0x002C($sp) -/* 006A0 80B1BFA0 0C028800 */ jal SkelAnime_GetFrameCount - -/* 006A4 80B1BFA4 24841144 */ addiu $a0, $a0, 0x1144 ## $a0 = 06001144 -/* 006A8 80B1BFA8 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 -/* 006AC 80B1BFAC 3C01C120 */ lui $at, 0xC120 ## $at = C1200000 -/* 006B0 80B1BFB0 44814000 */ mtc1 $at, $f8 ## $f8 = -10.00 -/* 006B4 80B1BFB4 468021A0 */ cvt.s.w $f6, $f4 -/* 006B8 80B1BFB8 8FA40028 */ lw $a0, 0x0028($sp) -/* 006BC 80B1BFBC 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 006C0 80B1BFC0 24A51144 */ addiu $a1, $a1, 0x1144 ## $a1 = 06001144 -/* 006C4 80B1BFC4 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 006C8 80B1BFC8 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 006CC 80B1BFCC E7A60010 */ swc1 $f6, 0x0010($sp) -/* 006D0 80B1BFD0 AFA00014 */ sw $zero, 0x0014($sp) -/* 006D4 80B1BFD4 E7A80018 */ swc1 $f8, 0x0018($sp) -/* 006D8 80B1BFD8 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 006DC 80B1BFDC 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 006E0 80B1BFE0 8FA40028 */ lw $a0, 0x0028($sp) -/* 006E4 80B1BFE4 0C2C7055 */ jal func_80B1C154 -/* 006E8 80B1BFE8 8FA5002C */ lw $a1, 0x002C($sp) -/* 006EC 80B1BFEC 04400003 */ bltz $v0, .L80B1BFFC -/* 006F0 80B1BFF0 8FAF0028 */ lw $t7, 0x0028($sp) -/* 006F4 80B1BFF4 240E0001 */ addiu $t6, $zero, 0x0001 ## $t6 = 00000001 -/* 006F8 80B1BFF8 A1EE0208 */ sb $t6, 0x0208($t7) ## 00000208 -.L80B1BFFC: -/* 006FC 80B1BFFC 8FBF0024 */ lw $ra, 0x0024($sp) -/* 00700 80B1C000 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 00704 80B1C004 03E00008 */ jr $ra -/* 00708 80B1C008 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Tk/func_80B1C00C.s b/asm/non_matchings/overlays/actors/ovl_En_Tk/func_80B1C00C.s deleted file mode 100644 index 893baee77b..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Tk/func_80B1C00C.s +++ /dev/null @@ -1,58 +0,0 @@ -glabel func_80B1C00C -/* 0070C 80B1C00C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00710 80B1C010 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00714 80B1C014 84820224 */ lh $v0, 0x0224($a0) ## 00000224 -/* 00718 80B1C018 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 -/* 0071C 80B1C01C 14400003 */ bne $v0, $zero, .L80B1C02C -/* 00720 80B1C020 244EFFFF */ addiu $t6, $v0, 0xFFFF ## $t6 = FFFFFFFF -/* 00724 80B1C024 10000003 */ beq $zero, $zero, .L80B1C034 -/* 00728 80B1C028 00001825 */ or $v1, $zero, $zero ## $v1 = 00000000 -.L80B1C02C: -/* 0072C 80B1C02C A4CE0224 */ sh $t6, 0x0224($a2) ## 00000224 -/* 00730 80B1C030 84C30224 */ lh $v1, 0x0224($a2) ## 00000224 -.L80B1C034: -/* 00734 80B1C034 54600023 */ bnel $v1, $zero, .L80B1C0C4 -/* 00738 80B1C038 8FBF0014 */ lw $ra, 0x0014($sp) -/* 0073C 80B1C03C 84CF0222 */ lh $t7, 0x0222($a2) ## 00000222 -/* 00740 80B1C040 25F80001 */ addiu $t8, $t7, 0x0001 ## $t8 = 00000001 -/* 00744 80B1C044 A4D80222 */ sh $t8, 0x0222($a2) ## 00000222 -/* 00748 80B1C048 84D90222 */ lh $t9, 0x0222($a2) ## 00000222 -/* 0074C 80B1C04C 2B210003 */ slti $at, $t9, 0x0003 -/* 00750 80B1C050 5420001C */ bnel $at, $zero, .L80B1C0C4 -/* 00754 80B1C054 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00758 80B1C058 84C80218 */ lh $t0, 0x0218($a2) ## 00000218 -/* 0075C 80B1C05C 2404001E */ addiu $a0, $zero, 0x001E ## $a0 = 0000001E -/* 00760 80B1C060 2405001E */ addiu $a1, $zero, 0x001E ## $a1 = 0000001E -/* 00764 80B1C064 2509FFFF */ addiu $t1, $t0, 0xFFFF ## $t1 = FFFFFFFF -/* 00768 80B1C068 A4C90218 */ sh $t1, 0x0218($a2) ## 00000218 -/* 0076C 80B1C06C 84CA0218 */ lh $t2, 0x0218($a2) ## 00000218 -/* 00770 80B1C070 05430013 */ bgezl $t2, .L80B1C0C0 -/* 00774 80B1C074 A4C00222 */ sh $zero, 0x0222($a2) ## 00000222 -/* 00778 80B1C078 0C01DF64 */ jal Math_Rand_S16Offset - -/* 0077C 80B1C07C AFA60018 */ sw $a2, 0x0018($sp) -/* 00780 80B1C080 8FA60018 */ lw $a2, 0x0018($sp) -/* 00784 80B1C084 240B0002 */ addiu $t3, $zero, 0x0002 ## $t3 = 00000002 -/* 00788 80B1C088 A4C20224 */ sh $v0, 0x0224($a2) ## 00000224 -/* 0078C 80B1C08C 0C03F66B */ jal Math_Rand_ZeroOne - ## Rand.Next() float -/* 00790 80B1C090 A4CB0218 */ sh $t3, 0x0218($a2) ## 00000218 -/* 00794 80B1C094 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 -/* 00798 80B1C098 44812000 */ mtc1 $at, $f4 ## $f4 = 0.50 -/* 0079C 80B1C09C 8FA60018 */ lw $a2, 0x0018($sp) -/* 007A0 80B1C0A0 4600203C */ c.lt.s $f4, $f0 -/* 007A4 80B1C0A4 00000000 */ nop -/* 007A8 80B1C0A8 45020005 */ bc1fl .L80B1C0C0 -/* 007AC 80B1C0AC A4C00222 */ sh $zero, 0x0222($a2) ## 00000222 -/* 007B0 80B1C0B0 84CC0218 */ lh $t4, 0x0218($a2) ## 00000218 -/* 007B4 80B1C0B4 258D0001 */ addiu $t5, $t4, 0x0001 ## $t5 = 00000001 -/* 007B8 80B1C0B8 A4CD0218 */ sh $t5, 0x0218($a2) ## 00000218 -/* 007BC 80B1C0BC A4C00222 */ sh $zero, 0x0222($a2) ## 00000222 -.L80B1C0C0: -/* 007C0 80B1C0C0 8FBF0014 */ lw $ra, 0x0014($sp) -.L80B1C0C4: -/* 007C4 80B1C0C4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 007C8 80B1C0C8 03E00008 */ jr $ra -/* 007CC 80B1C0CC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Tk/func_80B1C0D0.s b/asm/non_matchings/overlays/actors/ovl_En_Tk/func_80B1C0D0.s deleted file mode 100644 index e690ca31dc..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Tk/func_80B1C0D0.s +++ /dev/null @@ -1,40 +0,0 @@ -glabel func_80B1C0D0 -/* 007D0 80B1C0D0 3C0180B2 */ lui $at, %hi(D_80B1D634) ## $at = 80B20000 -/* 007D4 80B1C0D4 C424D634 */ lwc1 $f4, %lo(D_80B1D634)($at) -/* 007D8 80B1C0D8 C486008C */ lwc1 $f6, 0x008C($a0) ## 0000008C -/* 007DC 80B1C0DC 4606203C */ c.lt.s $f4, $f6 -/* 007E0 80B1C0E0 00000000 */ nop -/* 007E4 80B1C0E4 45020004 */ bc1fl .L80B1C0F8 -/* 007E8 80B1C0E8 848200B6 */ lh $v0, 0x00B6($a0) ## 000000B6 -/* 007EC 80B1C0EC 03E00008 */ jr $ra -/* 007F0 80B1C0F0 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -.L80B1C0F4: -/* 007F4 80B1C0F4 848200B6 */ lh $v0, 0x00B6($a0) ## 000000B6 -.L80B1C0F8: -/* 007F8 80B1C0F8 848E021E */ lh $t6, 0x021E($a0) ## 0000021E -/* 007FC 80B1C0FC 848F0226 */ lh $t7, 0x0226($a0) ## 00000226 -/* 00800 80B1C100 8498008A */ lh $t8, 0x008A($a0) ## 0000008A -/* 00804 80B1C104 004E1023 */ subu $v0, $v0, $t6 -/* 00808 80B1C108 00021400 */ sll $v0, $v0, 16 -/* 0080C 80B1C10C 00021403 */ sra $v0, $v0, 16 -/* 00810 80B1C110 004F1023 */ subu $v0, $v0, $t7 -/* 00814 80B1C114 00021400 */ sll $v0, $v0, 16 -/* 00818 80B1C118 00021403 */ sra $v0, $v0, 16 -/* 0081C 80B1C11C 03021823 */ subu $v1, $t8, $v0 -/* 00820 80B1C120 00031C00 */ sll $v1, $v1, 16 -/* 00824 80B1C124 00031C03 */ sra $v1, $v1, 16 -/* 00828 80B1C128 04600003 */ bltz $v1, .L80B1C138 -/* 0082C 80B1C12C 00031023 */ subu $v0, $zero, $v1 -/* 00830 80B1C130 10000001 */ beq $zero, $zero, .L80B1C138 -/* 00834 80B1C134 00601025 */ or $v0, $v1, $zero ## $v0 = 00000000 -.L80B1C138: -/* 00838 80B1C138 28411554 */ slti $at, $v0, 0x1554 -/* 0083C 80B1C13C 10200003 */ beq $at, $zero, .L80B1C14C -/* 00840 80B1C140 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 00844 80B1C144 03E00008 */ jr $ra -/* 00848 80B1C148 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -.L80B1C14C: -/* 0084C 80B1C14C 03E00008 */ jr $ra -/* 00850 80B1C150 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Tk/func_80B1C154.s b/asm/non_matchings/overlays/actors/ovl_En_Tk/func_80B1C154.s deleted file mode 100644 index 0e3e273754..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Tk/func_80B1C154.s +++ /dev/null @@ -1,68 +0,0 @@ -glabel func_80B1C154 -/* 00854 80B1C154 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 -/* 00858 80B1C158 AFBF003C */ sw $ra, 0x003C($sp) -/* 0085C 80B1C15C AFB20038 */ sw $s2, 0x0038($sp) -/* 00860 80B1C160 AFB10034 */ sw $s1, 0x0034($sp) -/* 00864 80B1C164 AFB00030 */ sw $s0, 0x0030($sp) -/* 00868 80B1C168 F7B80028 */ sdc1 $f24, 0x0028($sp) -/* 0086C 80B1C16C F7B60020 */ sdc1 $f22, 0x0020($sp) -/* 00870 80B1C170 F7B40018 */ sdc1 $f20, 0x0018($sp) -/* 00874 80B1C174 8CB01C64 */ lw $s0, 0x1C64($a1) ## 00001C64 -/* 00878 80B1C178 00808825 */ or $s1, $a0, $zero ## $s1 = 00000000 -/* 0087C 80B1C17C 3C014120 */ lui $at, 0x4120 ## $at = 41200000 -/* 00880 80B1C180 52000025 */ beql $s0, $zero, .L80B1C218 -/* 00884 80B1C184 2402FFFF */ addiu $v0, $zero, 0xFFFF ## $v0 = FFFFFFFF -/* 00888 80B1C188 4481C000 */ mtc1 $at, $f24 ## $f24 = 10.00 -/* 0088C 80B1C18C 3C014220 */ lui $at, 0x4220 ## $at = 42200000 -/* 00890 80B1C190 4481B000 */ mtc1 $at, $f22 ## $f22 = 40.00 -/* 00894 80B1C194 24120196 */ addiu $s2, $zero, 0x0196 ## $s2 = 00000196 -/* 00898 80B1C198 860E0000 */ lh $t6, 0x0000($s0) ## 00000000 -.L80B1C19C: -/* 0089C 80B1C19C 524E0004 */ beql $s2, $t6, .L80B1C1B0 -/* 008A0 80B1C1A0 8E2F0210 */ lw $t7, 0x0210($s1) ## 00000210 -/* 008A4 80B1C1A4 10000019 */ beq $zero, $zero, .L80B1C20C -/* 008A8 80B1C1A8 8E100124 */ lw $s0, 0x0124($s0) ## 00000124 -/* 008AC 80B1C1AC 8E2F0210 */ lw $t7, 0x0210($s1) ## 00000210 -.L80B1C1B0: -/* 008B0 80B1C1B0 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 008B4 80B1C1B4 560F0004 */ bnel $s0, $t7, .L80B1C1C8 -/* 008B8 80B1C1B8 C6040028 */ lwc1 $f4, 0x0028($s0) ## 00000028 -/* 008BC 80B1C1BC 10000013 */ beq $zero, $zero, .L80B1C20C -/* 008C0 80B1C1C0 8E100124 */ lw $s0, 0x0124($s0) ## 00000124 -/* 008C4 80B1C1C4 C6040028 */ lwc1 $f4, 0x0028($s0) ## 00000028 -.L80B1C1C8: -/* 008C8 80B1C1C8 C6260080 */ lwc1 $f6, 0x0080($s1) ## 00000080 -/* 008CC 80B1C1CC 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 008D0 80B1C1D0 0C00B6E3 */ jal func_8002DB8C -/* 008D4 80B1C1D4 46062501 */ sub.s $f20, $f4, $f6 -/* 008D8 80B1C1D8 4600B03C */ c.lt.s $f22, $f0 -/* 008DC 80B1C1DC 00000000 */ nop -/* 008E0 80B1C1E0 45010005 */ bc1t .L80B1C1F8 -/* 008E4 80B1C1E4 00000000 */ nop -/* 008E8 80B1C1E8 4614C03C */ c.lt.s $f24, $f20 -/* 008EC 80B1C1EC 00000000 */ nop -/* 008F0 80B1C1F0 45020004 */ bc1fl .L80B1C204 -/* 008F4 80B1C1F4 AE300210 */ sw $s0, 0x0210($s1) ## 00000210 -.L80B1C1F8: -/* 008F8 80B1C1F8 10000004 */ beq $zero, $zero, .L80B1C20C -/* 008FC 80B1C1FC 8E100124 */ lw $s0, 0x0124($s0) ## 00000124 -/* 00900 80B1C200 AE300210 */ sw $s0, 0x0210($s1) ## 00000210 -.L80B1C204: -/* 00904 80B1C204 10000004 */ beq $zero, $zero, .L80B1C218 -/* 00908 80B1C208 8602001C */ lh $v0, 0x001C($s0) ## 0000001C -.L80B1C20C: -/* 0090C 80B1C20C 5600FFE3 */ bnel $s0, $zero, .L80B1C19C -/* 00910 80B1C210 860E0000 */ lh $t6, 0x0000($s0) ## 00000000 -/* 00914 80B1C214 2402FFFF */ addiu $v0, $zero, 0xFFFF ## $v0 = FFFFFFFF -.L80B1C218: -/* 00918 80B1C218 8FBF003C */ lw $ra, 0x003C($sp) -/* 0091C 80B1C21C D7B40018 */ ldc1 $f20, 0x0018($sp) -/* 00920 80B1C220 D7B60020 */ ldc1 $f22, 0x0020($sp) -/* 00924 80B1C224 D7B80028 */ ldc1 $f24, 0x0028($sp) -/* 00928 80B1C228 8FB00030 */ lw $s0, 0x0030($sp) -/* 0092C 80B1C22C 8FB10034 */ lw $s1, 0x0034($sp) -/* 00930 80B1C230 8FB20038 */ lw $s2, 0x0038($sp) -/* 00934 80B1C234 03E00008 */ jr $ra -/* 00938 80B1C238 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Tk/func_80B1C23C.s b/asm/non_matchings/overlays/actors/ovl_En_Tk/func_80B1C23C.s deleted file mode 100644 index 1db52b53ee..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Tk/func_80B1C23C.s +++ /dev/null @@ -1,35 +0,0 @@ -glabel func_80B1C23C -/* 0093C 80B1C23C 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 00940 80B1C240 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00944 80B1C244 8C850210 */ lw $a1, 0x0210($a0) ## 00000210 -/* 00948 80B1C248 50A00017 */ beql $a1, $zero, .L80B1C2A8 -/* 0094C 80B1C24C 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00950 80B1C250 C4A40028 */ lwc1 $f4, 0x0028($a1) ## 00000028 -/* 00954 80B1C254 C4860080 */ lwc1 $f6, 0x0080($a0) ## 00000080 -/* 00958 80B1C258 AFA40020 */ sw $a0, 0x0020($sp) -/* 0095C 80B1C25C 46062201 */ sub.s $f8, $f4, $f6 -/* 00960 80B1C260 0C00B6E3 */ jal func_8002DB8C -/* 00964 80B1C264 E7A80018 */ swc1 $f8, 0x0018($sp) -/* 00968 80B1C268 3C014220 */ lui $at, 0x4220 ## $at = 42200000 -/* 0096C 80B1C26C 44815000 */ mtc1 $at, $f10 ## $f10 = 40.00 -/* 00970 80B1C270 8FA40020 */ lw $a0, 0x0020($sp) -/* 00974 80B1C274 3C014120 */ lui $at, 0x4120 ## $at = 41200000 -/* 00978 80B1C278 4600503C */ c.lt.s $f10, $f0 -/* 0097C 80B1C27C C7B20018 */ lwc1 $f18, 0x0018($sp) -/* 00980 80B1C280 45030008 */ bc1tl .L80B1C2A4 -/* 00984 80B1C284 AC800210 */ sw $zero, 0x0210($a0) ## 00000210 -/* 00988 80B1C288 44818000 */ mtc1 $at, $f16 ## $f16 = 10.00 -/* 0098C 80B1C28C 00000000 */ nop -/* 00990 80B1C290 4612803C */ c.lt.s $f16, $f18 -/* 00994 80B1C294 00000000 */ nop -/* 00998 80B1C298 45020003 */ bc1fl .L80B1C2A8 -/* 0099C 80B1C29C 8FBF0014 */ lw $ra, 0x0014($sp) -/* 009A0 80B1C2A0 AC800210 */ sw $zero, 0x0210($a0) ## 00000210 -.L80B1C2A4: -/* 009A4 80B1C2A4 8FBF0014 */ lw $ra, 0x0014($sp) -.L80B1C2A8: -/* 009A8 80B1C2A8 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 009AC 80B1C2AC 03E00008 */ jr $ra -/* 009B0 80B1C2B0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Tk/func_80B1C2B4.s b/asm/non_matchings/overlays/actors/ovl_En_Tk/func_80B1C2B4.s deleted file mode 100644 index 50d6f15d94..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Tk/func_80B1C2B4.s +++ /dev/null @@ -1,87 +0,0 @@ -glabel func_80B1C2B4 -/* 009B4 80B1C2B4 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 009B8 80B1C2B8 3C0F80B2 */ lui $t7, %hi(D_80B1D540) ## $t7 = 80B20000 -/* 009BC 80B1C2BC AFBF0014 */ sw $ra, 0x0014($sp) -/* 009C0 80B1C2C0 AFA50034 */ sw $a1, 0x0034($sp) -/* 009C4 80B1C2C4 25EFD540 */ addiu $t7, $t7, %lo(D_80B1D540) ## $t7 = 80B1D540 -/* 009C8 80B1C2C8 8DF90000 */ lw $t9, 0x0000($t7) ## 80B1D540 -/* 009CC 80B1C2CC 8DF80004 */ lw $t8, 0x0004($t7) ## 80B1D544 -/* 009D0 80B1C2D0 27AE0028 */ addiu $t6, $sp, 0x0028 ## $t6 = FFFFFFF8 -/* 009D4 80B1C2D4 ADD90000 */ sw $t9, 0x0000($t6) ## FFFFFFF8 -/* 009D8 80B1C2D8 ADD80004 */ sw $t8, 0x0004($t6) ## FFFFFFFC -/* 009DC 80B1C2DC 44807000 */ mtc1 $zero, $f14 ## $f14 = 0.00 -/* 009E0 80B1C2E0 C4800164 */ lwc1 $f0, 0x0164($a0) ## 00000164 -/* 009E4 80B1C2E4 3C0141C8 */ lui $at, 0x41C8 ## $at = 41C80000 -/* 009E8 80B1C2E8 240538B8 */ addiu $a1, $zero, 0x38B8 ## $a1 = 000038B8 -/* 009EC 80B1C2EC 46007032 */ c.eq.s $f14, $f0 -/* 009F0 80B1C2F0 00000000 */ nop -/* 009F4 80B1C2F4 45010007 */ bc1t .L80B1C314 -/* 009F8 80B1C2F8 00000000 */ nop -/* 009FC 80B1C2FC 44812000 */ mtc1 $at, $f4 ## $f4 = 25.00 -/* 00A00 80B1C300 00000000 */ nop -/* 00A04 80B1C304 46002032 */ c.eq.s $f4, $f0 -/* 00A08 80B1C308 00000000 */ nop -/* 00A0C 80B1C30C 45020006 */ bc1fl .L80B1C328 -/* 00A10 80B1C310 8C890154 */ lw $t1, 0x0154($a0) ## 00000154 -.L80B1C314: -/* 00A14 80B1C314 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 00A18 80B1C318 AFA40030 */ sw $a0, 0x0030($sp) -/* 00A1C 80B1C31C 44807000 */ mtc1 $zero, $f14 ## $f14 = 0.00 -/* 00A20 80B1C320 8FA40030 */ lw $a0, 0x0030($sp) -/* 00A24 80B1C324 8C890154 */ lw $t1, 0x0154($a0) ## 00000154 -.L80B1C328: -/* 00A28 80B1C328 3C080600 */ lui $t0, 0x0600 ## $t0 = 06000000 -/* 00A2C 80B1C32C 25081FA8 */ addiu $t0, $t0, 0x1FA8 ## $t0 = 06001FA8 -/* 00A30 80B1C330 11090003 */ beq $t0, $t1, .L80B1C340 -/* 00A34 80B1C334 27A20028 */ addiu $v0, $sp, 0x0028 ## $v0 = FFFFFFF8 -/* 00A38 80B1C338 10000024 */ beq $zero, $zero, .L80B1C3CC -/* 00A3C 80B1C33C 46007006 */ mov.s $f0, $f14 -.L80B1C340: -/* 00A40 80B1C340 3C014140 */ lui $at, 0x4140 ## $at = 41400000 -/* 00A44 80B1C344 44816000 */ mtc1 $at, $f12 ## $f12 = 12.00 -/* 00A48 80B1C348 C4820164 */ lwc1 $f2, 0x0164($a0) ## 00000164 -/* 00A4C 80B1C34C 27A30030 */ addiu $v1, $sp, 0x0030 ## $v1 = 00000000 -/* 00A50 80B1C350 C4400000 */ lwc1 $f0, 0x0000($v0) ## FFFFFFF8 -.L80B1C354: -/* 00A54 80B1C354 460C0180 */ add.s $f6, $f0, $f12 -/* 00A58 80B1C358 4606103C */ c.lt.s $f2, $f6 -/* 00A5C 80B1C35C 00000000 */ nop -/* 00A60 80B1C360 45020006 */ bc1fl .L80B1C37C -/* 00A64 80B1C364 24420004 */ addiu $v0, $v0, 0x0004 ## $v0 = FFFFFFFC -/* 00A68 80B1C368 4602003E */ c.le.s $f0, $f2 -/* 00A6C 80B1C36C 00000000 */ nop -/* 00A70 80B1C370 45030005 */ bc1tl .L80B1C388 -/* 00A74 80B1C374 27AA0030 */ addiu $t2, $sp, 0x0030 ## $t2 = 00000000 -/* 00A78 80B1C378 24420004 */ addiu $v0, $v0, 0x0004 ## $v0 = 00000000 -.L80B1C37C: -/* 00A7C 80B1C37C 5443FFF5 */ bnel $v0, $v1, .L80B1C354 -/* 00A80 80B1C380 C4400000 */ lwc1 $f0, 0x0000($v0) ## 00000000 -/* 00A84 80B1C384 27AA0030 */ addiu $t2, $sp, 0x0030 ## $t2 = 00000000 -.L80B1C388: -/* 00A88 80B1C388 004A082B */ sltu $at, $v0, $t2 -/* 00A8C 80B1C38C 54200004 */ bnel $at, $zero, .L80B1C3A0 -/* 00A90 80B1C390 C4480000 */ lwc1 $f8, 0x0000($v0) ## 00000000 -/* 00A94 80B1C394 1000000D */ beq $zero, $zero, .L80B1C3CC -/* 00A98 80B1C398 46007006 */ mov.s $f0, $f14 -/* 00A9C 80B1C39C C4480000 */ lwc1 $f8, 0x0000($v0) ## 00000000 -.L80B1C3A0: -/* 00AA0 80B1C3A0 3C0180B2 */ lui $at, %hi(D_80B1D638) ## $at = 80B20000 -/* 00AA4 80B1C3A4 C430D638 */ lwc1 $f16, %lo(D_80B1D638)($at) -/* 00AA8 80B1C3A8 46081281 */ sub.s $f10, $f2, $f8 -/* 00AAC 80B1C3AC 46105082 */ mul.s $f2, $f10, $f16 -/* 00AB0 80B1C3B0 4600148D */ trunc.w.s $f18, $f2 -/* 00AB4 80B1C3B4 44049000 */ mfc1 $a0, $f18 -/* 00AB8 80B1C3B8 00000000 */ nop -/* 00ABC 80B1C3BC 00042400 */ sll $a0, $a0, 16 -/* 00AC0 80B1C3C0 0C01DE1C */ jal Math_Sins - ## sins? -/* 00AC4 80B1C3C4 00042403 */ sra $a0, $a0, 16 -/* 00AC8 80B1C3C8 46000000 */ add.s $f0, $f0, $f0 -.L80B1C3CC: -/* 00ACC 80B1C3CC 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00AD0 80B1C3D0 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 00AD4 80B1C3D4 03E00008 */ jr $ra -/* 00AD8 80B1C3D8 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Tk/func_80B1C3DC.s b/asm/non_matchings/overlays/actors/ovl_En_Tk/func_80B1C3DC.s deleted file mode 100644 index 95de9f79df..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Tk/func_80B1C3DC.s +++ /dev/null @@ -1,99 +0,0 @@ -glabel func_80B1C3DC -/* 00ADC 80B1C3DC 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 00AE0 80B1C3E0 AFBF0024 */ sw $ra, 0x0024($sp) -/* 00AE4 80B1C3E4 AFB00020 */ sw $s0, 0x0020($sp) -/* 00AE8 80B1C3E8 848E001C */ lh $t6, 0x001C($a0) ## 0000001C -/* 00AEC 80B1C3EC 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00AF0 80B1C3F0 3C040001 */ lui $a0, 0x0001 ## $a0 = 00010000 -/* 00AF4 80B1C3F4 05C10003 */ bgez $t6, .L80B1C404 -/* 00AF8 80B1C3F8 00852021 */ addu $a0, $a0, $a1 -/* 00AFC 80B1C3FC 1000004E */ beq $zero, $zero, .L80B1C538 -/* 00B00 80B1C400 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -.L80B1C404: -/* 00B04 80B1C404 8C841E08 */ lw $a0, 0x1E08($a0) ## 00011E08 -/* 00B08 80B1C408 3C088016 */ lui $t0, 0x8016 ## $t0 = 80160000 -/* 00B0C 80B1C40C 860A0228 */ lh $t2, 0x0228($s0) ## 00000228 -/* 00B10 80B1C410 8C830004 */ lw $v1, 0x0004($a0) ## 00010004 -/* 00B14 80B1C414 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 -/* 00B18 80B1C418 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF -/* 00B1C 80B1C41C 00037900 */ sll $t7, $v1, 4 -/* 00B20 80B1C420 000FC702 */ srl $t8, $t7, 28 -/* 00B24 80B1C424 0018C880 */ sll $t9, $t8, 2 -/* 00B28 80B1C428 01194021 */ addu $t0, $t0, $t9 -/* 00B2C 80B1C42C 8D086FA8 */ lw $t0, 0x6FA8($t0) ## 80166FA8 -/* 00B30 80B1C430 00614824 */ and $t1, $v1, $at -/* 00B34 80B1C434 000A5880 */ sll $t3, $t2, 2 -/* 00B38 80B1C438 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 00B3C 80B1C43C 016A5823 */ subu $t3, $t3, $t2 -/* 00B40 80B1C440 01091021 */ addu $v0, $t0, $t1 -/* 00B44 80B1C444 00411021 */ addu $v0, $v0, $at -/* 00B48 80B1C448 000B5840 */ sll $t3, $t3, 1 -/* 00B4C 80B1C44C 004B1021 */ addu $v0, $v0, $t3 -/* 00B50 80B1C450 844C0000 */ lh $t4, 0x0000($v0) ## 00000001 -/* 00B54 80B1C454 844D0004 */ lh $t5, 0x0004($v0) ## 00000005 -/* 00B58 80B1C458 C6080024 */ lwc1 $f8, 0x0024($s0) ## 00000024 -/* 00B5C 80B1C45C 448C2000 */ mtc1 $t4, $f4 ## $f4 = 0.00 -/* 00B60 80B1C460 448D5000 */ mtc1 $t5, $f10 ## $f10 = 0.00 -/* 00B64 80B1C464 C612002C */ lwc1 $f18, 0x002C($s0) ## 0000002C -/* 00B68 80B1C468 468021A0 */ cvt.s.w $f6, $f4 -/* 00B6C 80B1C46C AFA40034 */ sw $a0, 0x0034($sp) -/* 00B70 80B1C470 46805420 */ cvt.s.w $f16, $f10 -/* 00B74 80B1C474 46083301 */ sub.s $f12, $f6, $f8 -/* 00B78 80B1C478 46128381 */ sub.s $f14, $f16, $f18 -/* 00B7C 80B1C47C E7AC002C */ swc1 $f12, 0x002C($sp) -/* 00B80 80B1C480 0C03F494 */ jal func_800FD250 -/* 00B84 80B1C484 E7AE0028 */ swc1 $f14, 0x0028($sp) -/* 00B88 80B1C488 3C0180B2 */ lui $at, %hi(D_80B1D63C) ## $at = 80B20000 -/* 00B8C 80B1C48C C424D63C */ lwc1 $f4, %lo(D_80B1D63C)($at) -/* 00B90 80B1C490 240F0001 */ addiu $t7, $zero, 0x0001 ## $t7 = 00000001 -/* 00B94 80B1C494 AFAF0010 */ sw $t7, 0x0010($sp) -/* 00B98 80B1C498 46040182 */ mul.s $f6, $f0, $f4 -/* 00B9C 80B1C49C 260400B6 */ addiu $a0, $s0, 0x00B6 ## $a0 = 000000B6 -/* 00BA0 80B1C4A0 2406000A */ addiu $a2, $zero, 0x000A ## $a2 = 0000000A -/* 00BA4 80B1C4A4 240703E8 */ addiu $a3, $zero, 0x03E8 ## $a3 = 000003E8 -/* 00BA8 80B1C4A8 4600320D */ trunc.w.s $f8, $f6 -/* 00BAC 80B1C4AC 44054000 */ mfc1 $a1, $f8 -/* 00BB0 80B1C4B0 00000000 */ nop -/* 00BB4 80B1C4B4 00052C00 */ sll $a1, $a1, 16 -/* 00BB8 80B1C4B8 0C01E1A7 */ jal Math_SmoothScaleMaxMinS - -/* 00BBC 80B1C4BC 00052C03 */ sra $a1, $a1, 16 -/* 00BC0 80B1C4C0 C7AC002C */ lwc1 $f12, 0x002C($sp) -/* 00BC4 80B1C4C4 C7AE0028 */ lwc1 $f14, 0x0028($sp) -/* 00BC8 80B1C4C8 8A1900B4 */ lwl $t9, 0x00B4($s0) ## 000000B4 -/* 00BCC 80B1C4CC 460C6282 */ mul.s $f10, $f12, $f12 -/* 00BD0 80B1C4D0 3C014120 */ lui $at, 0x4120 ## $at = 41200000 -/* 00BD4 80B1C4D4 44812000 */ mtc1 $at, $f4 ## $f4 = 10.00 -/* 00BD8 80B1C4D8 460E7402 */ mul.s $f16, $f14, $f14 -/* 00BDC 80B1C4DC 9A1900B7 */ lwr $t9, 0x00B7($s0) ## 000000B7 -/* 00BE0 80B1C4E0 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -/* 00BE4 80B1C4E4 AA190030 */ swl $t9, 0x0030($s0) ## 00000030 -/* 00BE8 80B1C4E8 BA190033 */ swr $t9, 0x0033($s0) ## 00000033 -/* 00BEC 80B1C4EC 961900B8 */ lhu $t9, 0x00B8($s0) ## 000000B8 -/* 00BF0 80B1C4F0 46105480 */ add.s $f18, $f10, $f16 -/* 00BF4 80B1C4F4 A6190034 */ sh $t9, 0x0034($s0) ## 00000034 -/* 00BF8 80B1C4F8 4604903C */ c.lt.s $f18, $f4 -/* 00BFC 80B1C4FC 00000000 */ nop -/* 00C00 80B1C500 4500000D */ bc1f .L80B1C538 -/* 00C04 80B1C504 00000000 */ nop -/* 00C08 80B1C508 86080228 */ lh $t0, 0x0228($s0) ## 00000228 -/* 00C0C 80B1C50C 25090001 */ addiu $t1, $t0, 0x0001 ## $t1 = 00000001 -/* 00C10 80B1C510 A6090228 */ sh $t1, 0x0228($s0) ## 00000228 -/* 00C14 80B1C514 8FAB0034 */ lw $t3, 0x0034($sp) -/* 00C18 80B1C518 860A0228 */ lh $t2, 0x0228($s0) ## 00000228 -/* 00C1C 80B1C51C 916C0000 */ lbu $t4, 0x0000($t3) ## 00000000 -/* 00C20 80B1C520 014C082A */ slt $at, $t2, $t4 -/* 00C24 80B1C524 14200002 */ bne $at, $zero, .L80B1C530 -/* 00C28 80B1C528 00000000 */ nop -/* 00C2C 80B1C52C A6000228 */ sh $zero, 0x0228($s0) ## 00000228 -.L80B1C530: -/* 00C30 80B1C530 10000001 */ beq $zero, $zero, .L80B1C538 -/* 00C34 80B1C534 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -.L80B1C538: -/* 00C38 80B1C538 8FBF0024 */ lw $ra, 0x0024($sp) -/* 00C3C 80B1C53C 8FB00020 */ lw $s0, 0x0020($sp) -/* 00C40 80B1C540 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 -/* 00C44 80B1C544 03E00008 */ jr $ra -/* 00C48 80B1C548 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Tk/func_80B1C54C.s b/asm/non_matchings/overlays/actors/ovl_En_Tk/func_80B1C54C.s deleted file mode 100644 index 5cbdbbe679..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Tk/func_80B1C54C.s +++ /dev/null @@ -1,26 +0,0 @@ -glabel func_80B1C54C -/* 00C4C 80B1C54C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00C50 80B1C550 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00C54 80B1C554 AFA5001C */ sw $a1, 0x001C($sp) -/* 00C58 80B1C558 0C01B0D8 */ jal func_8006C360 -/* 00C5C 80B1C55C 2405000E */ addiu $a1, $zero, 0x000E ## $a1 = 0000000E -/* 00C60 80B1C560 10400003 */ beq $v0, $zero, .L80B1C570 -/* 00C64 80B1C564 3043FFFF */ andi $v1, $v0, 0xFFFF ## $v1 = 00000000 -/* 00C68 80B1C568 10000009 */ beq $zero, $zero, .L80B1C590 -/* 00C6C 80B1C56C 00601025 */ or $v0, $v1, $zero ## $v0 = 00000000 -.L80B1C570: -/* 00C70 80B1C570 3C0E8016 */ lui $t6, 0x8016 ## $t6 = 80160000 -/* 00C74 80B1C574 95CEF572 */ lhu $t6, -0x0A8E($t6) ## 8015F572 -/* 00C78 80B1C578 24025018 */ addiu $v0, $zero, 0x5018 ## $v0 = 00005018 -/* 00C7C 80B1C57C 31CF0200 */ andi $t7, $t6, 0x0200 ## $t7 = 00000000 -/* 00C80 80B1C580 11E00003 */ beq $t7, $zero, .L80B1C590 -/* 00C84 80B1C584 00000000 */ nop -/* 00C88 80B1C588 10000001 */ beq $zero, $zero, .L80B1C590 -/* 00C8C 80B1C58C 24025019 */ addiu $v0, $zero, 0x5019 ## $v0 = 00005019 -.L80B1C590: -/* 00C90 80B1C590 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00C94 80B1C594 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00C98 80B1C598 03E00008 */ jr $ra -/* 00C9C 80B1C59C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Tk/func_80B1C5A0.s b/asm/non_matchings/overlays/actors/ovl_En_Tk/func_80B1C5A0.s deleted file mode 100644 index 7adea6a832..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Tk/func_80B1C5A0.s +++ /dev/null @@ -1,117 +0,0 @@ -glabel func_80B1C5A0 -/* 00CA0 80B1C5A0 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 00CA4 80B1C5A4 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00CA8 80B1C5A8 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 -/* 00CAC 80B1C5AC 240E0001 */ addiu $t6, $zero, 0x0001 ## $t6 = 00000001 -/* 00CB0 80B1C5B0 AFAE001C */ sw $t6, 0x001C($sp) -/* 00CB4 80B1C5B4 AFA70020 */ sw $a3, 0x0020($sp) -/* 00CB8 80B1C5B8 248420D8 */ addiu $a0, $a0, 0x20D8 ## $a0 = 000020D8 -/* 00CBC 80B1C5BC 0C042F6F */ jal func_8010BDBC -/* 00CC0 80B1C5C0 AFA50024 */ sw $a1, 0x0024($sp) -/* 00CC4 80B1C5C4 2C41000A */ sltiu $at, $v0, 0x000A -/* 00CC8 80B1C5C8 8FA60024 */ lw $a2, 0x0024($sp) -/* 00CCC 80B1C5CC 10200055 */ beq $at, $zero, .L80B1C724 -/* 00CD0 80B1C5D0 8FA70020 */ lw $a3, 0x0020($sp) -/* 00CD4 80B1C5D4 00027880 */ sll $t7, $v0, 2 -/* 00CD8 80B1C5D8 3C0180B2 */ lui $at, %hi(jtbl_80B1D640) ## $at = 80B20000 -/* 00CDC 80B1C5DC 002F0821 */ addu $at, $at, $t7 -/* 00CE0 80B1C5E0 8C2FD640 */ lw $t7, %lo(jtbl_80B1D640)($at) -/* 00CE4 80B1C5E4 01E00008 */ jr $t7 -/* 00CE8 80B1C5E8 00000000 */ nop -glabel L80B1C5EC -/* 00CEC 80B1C5EC 94D8010E */ lhu $t8, 0x010E($a2) ## 0000010E -/* 00CF0 80B1C5F0 24015028 */ addiu $at, $zero, 0x5028 ## $at = 00005028 -/* 00CF4 80B1C5F4 3C038016 */ lui $v1, 0x8016 ## $v1 = 80160000 -/* 00CF8 80B1C5F8 17010004 */ bne $t8, $at, .L80B1C60C -/* 00CFC 80B1C5FC 2463E660 */ addiu $v1, $v1, 0xE660 ## $v1 = 8015E660 -/* 00D00 80B1C600 94790F12 */ lhu $t9, 0x0F12($v1) ## 8015F572 -/* 00D04 80B1C604 37280100 */ ori $t0, $t9, 0x0100 ## $t0 = 00000100 -/* 00D08 80B1C608 A4680F12 */ sh $t0, 0x0F12($v1) ## 8015F572 -.L80B1C60C: -/* 00D0C 80B1C60C 10000045 */ beq $zero, $zero, .L80B1C724 -/* 00D10 80B1C610 AFA0001C */ sw $zero, 0x001C($sp) -glabel L80B1C614 -/* 00D14 80B1C614 00E02025 */ or $a0, $a3, $zero ## $a0 = 00000000 -/* 00D18 80B1C618 AFA60024 */ sw $a2, 0x0024($sp) -/* 00D1C 80B1C61C 0C041AF2 */ jal func_80106BC8 -/* 00D20 80B1C620 AFA70020 */ sw $a3, 0x0020($sp) -/* 00D24 80B1C624 8FA60024 */ lw $a2, 0x0024($sp) -/* 00D28 80B1C628 1040003E */ beq $v0, $zero, .L80B1C724 -/* 00D2C 80B1C62C 8FA70020 */ lw $a3, 0x0020($sp) -/* 00D30 80B1C630 94C2010E */ lhu $v0, 0x010E($a2) ## 0000010E -/* 00D34 80B1C634 24015018 */ addiu $at, $zero, 0x5018 ## $at = 00005018 -/* 00D38 80B1C638 3C090001 */ lui $t1, 0x0001 ## $t1 = 00010000 -/* 00D3C 80B1C63C 10410004 */ beq $v0, $at, .L80B1C650 -/* 00D40 80B1C640 01274821 */ addu $t1, $t1, $a3 -/* 00D44 80B1C644 24015019 */ addiu $at, $zero, 0x5019 ## $at = 00005019 -/* 00D48 80B1C648 54410037 */ bnel $v0, $at, .L80B1C728 -/* 00D4C 80B1C64C 87A2001E */ lh $v0, 0x001E($sp) -.L80B1C650: -/* 00D50 80B1C650 912904BD */ lbu $t1, 0x04BD($t1) ## 000104BD -/* 00D54 80B1C654 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 00D58 80B1C658 3C038016 */ lui $v1, 0x8016 ## $v1 = 80160000 -/* 00D5C 80B1C65C 15210004 */ bne $t1, $at, .L80B1C670 -/* 00D60 80B1C660 00E02025 */ or $a0, $a3, $zero ## $a0 = 00000000 -/* 00D64 80B1C664 240A0084 */ addiu $t2, $zero, 0x0084 ## $t2 = 00000084 -/* 00D68 80B1C668 10000016 */ beq $zero, $zero, .L80B1C6C4 -/* 00D6C 80B1C66C A4CA010E */ sh $t2, 0x010E($a2) ## 0000010E -.L80B1C670: -/* 00D70 80B1C670 2463E660 */ addiu $v1, $v1, 0xE660 ## $v1 = 8015E660 -/* 00D74 80B1C674 846B0034 */ lh $t3, 0x0034($v1) ## 8015E694 -/* 00D78 80B1C678 240C0085 */ addiu $t4, $zero, 0x0085 ## $t4 = 00000085 -/* 00D7C 80B1C67C 240D0037 */ addiu $t5, $zero, 0x0037 ## $t5 = 00000037 -/* 00D80 80B1C680 2961000A */ slti $at, $t3, 0x000A -/* 00D84 80B1C684 50200004 */ beql $at, $zero, .L80B1C698 -/* 00D88 80B1C688 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 00D8C 80B1C68C 1000000D */ beq $zero, $zero, .L80B1C6C4 -/* 00D90 80B1C690 A4CC010E */ sh $t4, 0x010E($a2) ## 0000010E -/* 00D94 80B1C694 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -.L80B1C698: -/* 00D98 80B1C698 00270821 */ addu $at, $at, $a3 -/* 00D9C 80B1C69C A02D03DC */ sb $t5, 0x03DC($at) ## 000103DC -/* 00DA0 80B1C6A0 0C021CC3 */ jal Rupees_ChangeBy -/* 00DA4 80B1C6A4 2404FFF6 */ addiu $a0, $zero, 0xFFF6 ## $a0 = FFFFFFF6 -/* 00DA8 80B1C6A8 3C038016 */ lui $v1, 0x8016 ## $v1 = 80160000 -/* 00DAC 80B1C6AC 2463E660 */ addiu $v1, $v1, 0xE660 ## $v1 = 8015E660 -/* 00DB0 80B1C6B0 946E0F12 */ lhu $t6, 0x0F12($v1) ## 8015F572 -/* 00DB4 80B1C6B4 24020002 */ addiu $v0, $zero, 0x0002 ## $v0 = 00000002 -/* 00DB8 80B1C6B8 35CF0200 */ ori $t7, $t6, 0x0200 ## $t7 = 00000200 -/* 00DBC 80B1C6BC 1000001A */ beq $zero, $zero, .L80B1C728 -/* 00DC0 80B1C6C0 A46F0F12 */ sh $t7, 0x0F12($v1) ## 8015F572 -.L80B1C6C4: -/* 00DC4 80B1C6C4 0C042DC8 */ jal func_8010B720 -/* 00DC8 80B1C6C8 94C5010E */ lhu $a1, 0x010E($a2) ## 0000010E -/* 00DCC 80B1C6CC 3C038016 */ lui $v1, 0x8016 ## $v1 = 80160000 -/* 00DD0 80B1C6D0 2463E660 */ addiu $v1, $v1, 0xE660 ## $v1 = 8015E660 -/* 00DD4 80B1C6D4 94780F12 */ lhu $t8, 0x0F12($v1) ## 8015F572 -/* 00DD8 80B1C6D8 37190200 */ ori $t9, $t8, 0x0200 ## $t9 = 00000200 -/* 00DDC 80B1C6DC 10000011 */ beq $zero, $zero, .L80B1C724 -/* 00DE0 80B1C6E0 A4790F12 */ sh $t9, 0x0F12($v1) ## 8015F572 -glabel L80B1C6E4 -/* 00DE4 80B1C6E4 00E02025 */ or $a0, $a3, $zero ## $a0 = 00000000 -/* 00DE8 80B1C6E8 AFA60024 */ sw $a2, 0x0024($sp) -/* 00DEC 80B1C6EC 0C041AF2 */ jal func_80106BC8 -/* 00DF0 80B1C6F0 AFA70020 */ sw $a3, 0x0020($sp) -/* 00DF4 80B1C6F4 8FA60024 */ lw $a2, 0x0024($sp) -/* 00DF8 80B1C6F8 1040000A */ beq $v0, $zero, .L80B1C724 -/* 00DFC 80B1C6FC 8FA70020 */ lw $a3, 0x0020($sp) -/* 00E00 80B1C700 94C2010E */ lhu $v0, 0x010E($a2) ## 0000010E -/* 00E04 80B1C704 24010084 */ addiu $at, $zero, 0x0084 ## $at = 00000084 -/* 00E08 80B1C708 10410003 */ beq $v0, $at, .L80B1C718 -/* 00E0C 80B1C70C 24010085 */ addiu $at, $zero, 0x0085 ## $at = 00000085 -/* 00E10 80B1C710 54410005 */ bnel $v0, $at, .L80B1C728 -/* 00E14 80B1C714 87A2001E */ lh $v0, 0x001E($sp) -.L80B1C718: -/* 00E18 80B1C718 0C041B33 */ jal func_80106CCC -/* 00E1C 80B1C71C 00E02025 */ or $a0, $a3, $zero ## $a0 = 00000000 -/* 00E20 80B1C720 AFA0001C */ sw $zero, 0x001C($sp) -glabel L80B1C724 -.L80B1C724: -/* 00E24 80B1C724 87A2001E */ lh $v0, 0x001E($sp) -.L80B1C728: -/* 00E28 80B1C728 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00E2C 80B1C72C 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 00E30 80B1C730 03E00008 */ jr $ra -/* 00E34 80B1C734 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Tk/func_80B1C738.s b/asm/non_matchings/overlays/actors/ovl_En_Tk/func_80B1C738.s deleted file mode 100644 index 73a3a42ce7..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Tk/func_80B1C738.s +++ /dev/null @@ -1,131 +0,0 @@ -glabel func_80B1C738 -/* 00E38 80B1C738 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00E3C 80B1C73C AFBF0014 */ sw $ra, 0x0014($sp) -/* 00E40 80B1C740 0C03F66B */ jal Math_Rand_ZeroOne - ## Rand.Next() float -/* 00E44 80B1C744 AFA40018 */ sw $a0, 0x0018($sp) -/* 00E48 80B1C748 3C0180B2 */ lui $at, %hi(D_80B1D668) ## $at = 80B20000 -/* 00E4C 80B1C74C C424D668 */ lwc1 $f4, %lo(D_80B1D668)($at) -/* 00E50 80B1C750 8FA50018 */ lw $a1, 0x0018($sp) -/* 00E54 80B1C754 3C0180B2 */ lui $at, %hi(D_80B1D670) ## $at = 80B20000 -/* 00E58 80B1C758 4604003C */ c.lt.s $f0, $f4 -/* 00E5C 80B1C75C 00000000 */ nop -/* 00E60 80B1C760 45000003 */ bc1f .L80B1C770 -/* 00E64 80B1C764 00000000 */ nop -/* 00E68 80B1C768 10000012 */ beq $zero, $zero, .L80B1C7B4 -/* 00E6C 80B1C76C 00002025 */ or $a0, $zero, $zero ## $a0 = 00000000 -.L80B1C770: -/* 00E70 80B1C770 D426D670 */ ldc1 $f6, %lo(D_80B1D670)($at) -/* 00E74 80B1C774 460000A1 */ cvt.d.s $f2, $f0 -/* 00E78 80B1C778 3C0180B2 */ lui $at, %hi(D_80B1D678) ## $at = 80B20000 -/* 00E7C 80B1C77C 4626103C */ c.lt.d $f2, $f6 -/* 00E80 80B1C780 00000000 */ nop -/* 00E84 80B1C784 45000003 */ bc1f .L80B1C794 -/* 00E88 80B1C788 00000000 */ nop -/* 00E8C 80B1C78C 10000009 */ beq $zero, $zero, .L80B1C7B4 -/* 00E90 80B1C790 24040001 */ addiu $a0, $zero, 0x0001 ## $a0 = 00000001 -.L80B1C794: -/* 00E94 80B1C794 D428D678 */ ldc1 $f8, %lo(D_80B1D678)($at) -/* 00E98 80B1C798 24040003 */ addiu $a0, $zero, 0x0003 ## $a0 = 00000003 -/* 00E9C 80B1C79C 4628103C */ c.lt.d $f2, $f8 -/* 00EA0 80B1C7A0 00000000 */ nop -/* 00EA4 80B1C7A4 45000003 */ bc1f .L80B1C7B4 -/* 00EA8 80B1C7A8 00000000 */ nop -/* 00EAC 80B1C7AC 10000001 */ beq $zero, $zero, .L80B1C7B4 -/* 00EB0 80B1C7B0 24040002 */ addiu $a0, $zero, 0x0002 ## $a0 = 00000002 -.L80B1C7B4: -/* 00EB4 80B1C7B4 10800009 */ beq $a0, $zero, .L80B1C7DC -/* 00EB8 80B1C7B8 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 00EBC 80B1C7BC 1081000E */ beq $a0, $at, .L80B1C7F8 -/* 00EC0 80B1C7C0 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 00EC4 80B1C7C4 10810015 */ beq $a0, $at, .L80B1C81C -/* 00EC8 80B1C7C8 24010003 */ addiu $at, $zero, 0x0003 ## $at = 00000003 -/* 00ECC 80B1C7CC 5081001D */ beql $a0, $at, .L80B1C844 -/* 00ED0 80B1C7D0 90A3020C */ lbu $v1, 0x020C($a1) ## 0000020C -/* 00ED4 80B1C7D4 10000021 */ beq $zero, $zero, .L80B1C85C -/* 00ED8 80B1C7D8 90A30209 */ lbu $v1, 0x0209($a1) ## 00000209 -.L80B1C7DC: -/* 00EDC 80B1C7DC 90A30209 */ lbu $v1, 0x0209($a1) ## 00000209 -/* 00EE0 80B1C7E0 00801025 */ or $v0, $a0, $zero ## $v0 = 00000002 -/* 00EE4 80B1C7E4 28610008 */ slti $at, $v1, 0x0008 -/* 00EE8 80B1C7E8 1020001C */ beq $at, $zero, .L80B1C85C -/* 00EEC 80B1C7EC 246E0001 */ addiu $t6, $v1, 0x0001 ## $t6 = 00000001 -/* 00EF0 80B1C7F0 1000003B */ beq $zero, $zero, .L80B1C8E0 -/* 00EF4 80B1C7F4 A0AE0209 */ sb $t6, 0x0209($a1) ## 00000209 -.L80B1C7F8: -/* 00EF8 80B1C7F8 90A3020A */ lbu $v1, 0x020A($a1) ## 0000020A -/* 00EFC 80B1C7FC 00801025 */ or $v0, $a0, $zero ## $v0 = 00000002 -/* 00F00 80B1C800 28610004 */ slti $at, $v1, 0x0004 -/* 00F04 80B1C804 10200003 */ beq $at, $zero, .L80B1C814 -/* 00F08 80B1C808 246F0001 */ addiu $t7, $v1, 0x0001 ## $t7 = 00000001 -/* 00F0C 80B1C80C 10000034 */ beq $zero, $zero, .L80B1C8E0 -/* 00F10 80B1C810 A0AF020A */ sb $t7, 0x020A($a1) ## 0000020A -.L80B1C814: -/* 00F14 80B1C814 10000011 */ beq $zero, $zero, .L80B1C85C -/* 00F18 80B1C818 90A30209 */ lbu $v1, 0x0209($a1) ## 00000209 -.L80B1C81C: -/* 00F1C 80B1C81C 90A3020B */ lbu $v1, 0x020B($a1) ## 0000020B -/* 00F20 80B1C820 00801025 */ or $v0, $a0, $zero ## $v0 = 00000002 -/* 00F24 80B1C824 28610002 */ slti $at, $v1, 0x0002 -/* 00F28 80B1C828 10200003 */ beq $at, $zero, .L80B1C838 -/* 00F2C 80B1C82C 24780001 */ addiu $t8, $v1, 0x0001 ## $t8 = 00000001 -/* 00F30 80B1C830 1000002B */ beq $zero, $zero, .L80B1C8E0 -/* 00F34 80B1C834 A0B8020B */ sb $t8, 0x020B($a1) ## 0000020B -.L80B1C838: -/* 00F38 80B1C838 10000008 */ beq $zero, $zero, .L80B1C85C -/* 00F3C 80B1C83C 90A30209 */ lbu $v1, 0x0209($a1) ## 00000209 -/* 00F40 80B1C840 90A3020C */ lbu $v1, 0x020C($a1) ## 0000020C -.L80B1C844: -/* 00F44 80B1C844 00801025 */ or $v0, $a0, $zero ## $v0 = 00000002 -/* 00F48 80B1C848 1C600003 */ bgtz $v1, .L80B1C858 -/* 00F4C 80B1C84C 24790001 */ addiu $t9, $v1, 0x0001 ## $t9 = 00000001 -/* 00F50 80B1C850 10000023 */ beq $zero, $zero, .L80B1C8E0 -/* 00F54 80B1C854 A0B9020C */ sb $t9, 0x020C($a1) ## 0000020C -.L80B1C858: -/* 00F58 80B1C858 90A30209 */ lbu $v1, 0x0209($a1) ## 00000209 -.L80B1C85C: -/* 00F5C 80B1C85C 28610008 */ slti $at, $v1, 0x0008 -/* 00F60 80B1C860 10200004 */ beq $at, $zero, .L80B1C874 -/* 00F64 80B1C864 24680001 */ addiu $t0, $v1, 0x0001 ## $t0 = 00000001 -/* 00F68 80B1C868 A0A80209 */ sb $t0, 0x0209($a1) ## 00000209 -/* 00F6C 80B1C86C 1000001B */ beq $zero, $zero, .L80B1C8DC -/* 00F70 80B1C870 00002025 */ or $a0, $zero, $zero ## $a0 = 00000000 -.L80B1C874: -/* 00F74 80B1C874 90A3020A */ lbu $v1, 0x020A($a1) ## 0000020A -/* 00F78 80B1C878 24040001 */ addiu $a0, $zero, 0x0001 ## $a0 = 00000001 -/* 00F7C 80B1C87C 28610004 */ slti $at, $v1, 0x0004 -/* 00F80 80B1C880 10200003 */ beq $at, $zero, .L80B1C890 -/* 00F84 80B1C884 24690001 */ addiu $t1, $v1, 0x0001 ## $t1 = 00000001 -/* 00F88 80B1C888 10000014 */ beq $zero, $zero, .L80B1C8DC -/* 00F8C 80B1C88C A0A9020A */ sb $t1, 0x020A($a1) ## 0000020A -.L80B1C890: -/* 00F90 80B1C890 90A3020B */ lbu $v1, 0x020B($a1) ## 0000020B -/* 00F94 80B1C894 24040002 */ addiu $a0, $zero, 0x0002 ## $a0 = 00000002 -/* 00F98 80B1C898 28610002 */ slti $at, $v1, 0x0002 -/* 00F9C 80B1C89C 10200003 */ beq $at, $zero, .L80B1C8AC -/* 00FA0 80B1C8A0 246A0001 */ addiu $t2, $v1, 0x0001 ## $t2 = 00000001 -/* 00FA4 80B1C8A4 1000000D */ beq $zero, $zero, .L80B1C8DC -/* 00FA8 80B1C8A8 A0AA020B */ sb $t2, 0x020B($a1) ## 0000020B -.L80B1C8AC: -/* 00FAC 80B1C8AC 90A3020C */ lbu $v1, 0x020C($a1) ## 0000020C -/* 00FB0 80B1C8B0 00002025 */ or $a0, $zero, $zero ## $a0 = 00000000 -/* 00FB4 80B1C8B4 240C0001 */ addiu $t4, $zero, 0x0001 ## $t4 = 00000001 -/* 00FB8 80B1C8B8 1C600004 */ bgtz $v1, .L80B1C8CC -/* 00FBC 80B1C8BC 246B0001 */ addiu $t3, $v1, 0x0001 ## $t3 = 00000001 -/* 00FC0 80B1C8C0 A0AB020C */ sb $t3, 0x020C($a1) ## 0000020C -/* 00FC4 80B1C8C4 10000005 */ beq $zero, $zero, .L80B1C8DC -/* 00FC8 80B1C8C8 24040003 */ addiu $a0, $zero, 0x0003 ## $a0 = 00000003 -.L80B1C8CC: -/* 00FCC 80B1C8CC A0AC0209 */ sb $t4, 0x0209($a1) ## 00000209 -/* 00FD0 80B1C8D0 A0A0020A */ sb $zero, 0x020A($a1) ## 0000020A -/* 00FD4 80B1C8D4 A0A0020B */ sb $zero, 0x020B($a1) ## 0000020B -/* 00FD8 80B1C8D8 A0A0020C */ sb $zero, 0x020C($a1) ## 0000020C -.L80B1C8DC: -/* 00FDC 80B1C8DC 00801025 */ or $v0, $a0, $zero ## $v0 = 00000003 -.L80B1C8E0: -/* 00FE0 80B1C8E0 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00FE4 80B1C8E4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00FE8 80B1C8E8 03E00008 */ jr $ra -/* 00FEC 80B1C8EC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Tk/func_80B1C8F0.s b/asm/non_matchings/overlays/actors/ovl_En_Tk/func_80B1C8F0.s deleted file mode 100644 index 5afdb12925..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Tk/func_80B1C8F0.s +++ /dev/null @@ -1,99 +0,0 @@ -glabel func_80B1C8F0 -/* 00FF0 80B1C8F0 27BDFFB0 */ addiu $sp, $sp, 0xFFB0 ## $sp = FFFFFFB0 -/* 00FF4 80B1C8F4 3C0F80B2 */ lui $t7, %hi(D_80B1D548) ## $t7 = 80B20000 -/* 00FF8 80B1C8F8 AFBF0024 */ sw $ra, 0x0024($sp) -/* 00FFC 80B1C8FC AFB00020 */ sw $s0, 0x0020($sp) -/* 01000 80B1C900 25EFD548 */ addiu $t7, $t7, %lo(D_80B1D548) ## $t7 = 80B1D548 -/* 01004 80B1C904 8DF90000 */ lw $t9, 0x0000($t7) ## 80B1D548 -/* 01008 80B1C908 27AE0044 */ addiu $t6, $sp, 0x0044 ## $t6 = FFFFFFF4 -/* 0100C 80B1C90C 8DF80004 */ lw $t8, 0x0004($t7) ## 80B1D54C -/* 01010 80B1C910 ADD90000 */ sw $t9, 0x0000($t6) ## FFFFFFF4 -/* 01014 80B1C914 8DF90008 */ lw $t9, 0x0008($t7) ## 80B1D550 -/* 01018 80B1C918 3C0980B2 */ lui $t1, %hi(D_80B1D554) ## $t1 = 80B20000 -/* 0101C 80B1C91C 2529D554 */ addiu $t1, $t1, %lo(D_80B1D554) ## $t1 = 80B1D554 -/* 01020 80B1C920 ADD80004 */ sw $t8, 0x0004($t6) ## FFFFFFF8 -/* 01024 80B1C924 ADD90008 */ sw $t9, 0x0008($t6) ## FFFFFFFC -/* 01028 80B1C928 8D2B0000 */ lw $t3, 0x0000($t1) ## 80B1D554 -/* 0102C 80B1C92C 27A80038 */ addiu $t0, $sp, 0x0038 ## $t0 = FFFFFFE8 -/* 01030 80B1C930 8D2A0004 */ lw $t2, 0x0004($t1) ## 80B1D558 -/* 01034 80B1C934 AD0B0000 */ sw $t3, 0x0000($t0) ## FFFFFFE8 -/* 01038 80B1C938 8D2B0008 */ lw $t3, 0x0008($t1) ## 80B1D55C -/* 0103C 80B1C93C 3C0D80B2 */ lui $t5, %hi(D_80B1D560) ## $t5 = 80B20000 -/* 01040 80B1C940 25ADD560 */ addiu $t5, $t5, %lo(D_80B1D560) ## $t5 = 80B1D560 -/* 01044 80B1C944 AD0A0004 */ sw $t2, 0x0004($t0) ## FFFFFFEC -/* 01048 80B1C948 AD0B0008 */ sw $t3, 0x0008($t0) ## FFFFFFF0 -/* 0104C 80B1C94C 8DAF0000 */ lw $t7, 0x0000($t5) ## 80B1D560 -/* 01050 80B1C950 27AC002C */ addiu $t4, $sp, 0x002C ## $t4 = FFFFFFDC -/* 01054 80B1C954 8DAE0004 */ lw $t6, 0x0004($t5) ## 80B1D564 -/* 01058 80B1C958 AD8F0000 */ sw $t7, 0x0000($t4) ## FFFFFFDC -/* 0105C 80B1C95C 8DAF0008 */ lw $t7, 0x0008($t5) ## 80B1D568 -/* 01060 80B1C960 3C014200 */ lui $at, 0x4200 ## $at = 42000000 -/* 01064 80B1C964 AD8E0004 */ sw $t6, 0x0004($t4) ## FFFFFFE0 -/* 01068 80B1C968 AD8F0008 */ sw $t7, 0x0008($t4) ## FFFFFFE4 -/* 0106C 80B1C96C C4800164 */ lwc1 $f0, 0x0164($a0) ## 00000164 -/* 01070 80B1C970 44812000 */ mtc1 $at, $f4 ## $f4 = 32.00 -/* 01074 80B1C974 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 01078 80B1C978 3C014220 */ lui $at, 0x4220 ## $at = 42200000 -/* 0107C 80B1C97C 4600203E */ c.le.s $f4, $f0 -/* 01080 80B1C980 00000000 */ nop -/* 01084 80B1C984 45020032 */ bc1fl .L80B1CA50 -/* 01088 80B1C988 8FBF0024 */ lw $ra, 0x0024($sp) -/* 0108C 80B1C98C 44813000 */ mtc1 $at, $f6 ## $f6 = 40.00 -/* 01090 80B1C990 00000000 */ nop -/* 01094 80B1C994 4606003C */ c.lt.s $f0, $f6 -/* 01098 80B1C998 00000000 */ nop -/* 0109C 80B1C99C 4502002C */ bc1fl .L80B1CA50 -/* 010A0 80B1C9A0 8FBF0024 */ lw $ra, 0x0024($sp) -/* 010A4 80B1C9A4 0C03F66B */ jal Math_Rand_ZeroOne - ## Rand.Next() float -/* 010A8 80B1C9A8 00000000 */ nop -/* 010AC 80B1C9AC 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 -/* 010B0 80B1C9B0 44814000 */ mtc1 $at, $f8 ## $f8 = 0.50 -/* 010B4 80B1C9B4 3C014140 */ lui $at, 0x4140 ## $at = 41400000 -/* 010B8 80B1C9B8 44818000 */ mtc1 $at, $f16 ## $f16 = 12.00 -/* 010BC 80B1C9BC 46080281 */ sub.s $f10, $f0, $f8 -/* 010C0 80B1C9C0 C6040304 */ lwc1 $f4, 0x0304($s0) ## 00000304 -/* 010C4 80B1C9C4 46105482 */ mul.s $f18, $f10, $f16 -/* 010C8 80B1C9C8 46049180 */ add.s $f6, $f18, $f4 -/* 010CC 80B1C9CC 0C03F66B */ jal Math_Rand_ZeroOne - ## Rand.Next() float -/* 010D0 80B1C9D0 E7A60044 */ swc1 $f6, 0x0044($sp) -/* 010D4 80B1C9D4 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 -/* 010D8 80B1C9D8 44814000 */ mtc1 $at, $f8 ## $f8 = 0.50 -/* 010DC 80B1C9DC 3C014100 */ lui $at, 0x4100 ## $at = 41000000 -/* 010E0 80B1C9E0 44818000 */ mtc1 $at, $f16 ## $f16 = 8.00 -/* 010E4 80B1C9E4 46080281 */ sub.s $f10, $f0, $f8 -/* 010E8 80B1C9E8 C6040308 */ lwc1 $f4, 0x0308($s0) ## 00000308 -/* 010EC 80B1C9EC 46105482 */ mul.s $f18, $f10, $f16 -/* 010F0 80B1C9F0 46049180 */ add.s $f6, $f18, $f4 -/* 010F4 80B1C9F4 0C03F66B */ jal Math_Rand_ZeroOne - ## Rand.Next() float -/* 010F8 80B1C9F8 E7A60048 */ swc1 $f6, 0x0048($sp) -/* 010FC 80B1C9FC 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 -/* 01100 80B1CA00 44814000 */ mtc1 $at, $f8 ## $f8 = 0.50 -/* 01104 80B1CA04 3C014140 */ lui $at, 0x4140 ## $at = 41400000 -/* 01108 80B1CA08 44818000 */ mtc1 $at, $f16 ## $f16 = 12.00 -/* 0110C 80B1CA0C 46080281 */ sub.s $f10, $f0, $f8 -/* 01110 80B1CA10 C604030C */ lwc1 $f4, 0x030C($s0) ## 0000030C -/* 01114 80B1CA14 3C0180B2 */ lui $at, %hi(D_80B1D680) ## $at = 80B20000 -/* 01118 80B1CA18 C428D680 */ lwc1 $f8, %lo(D_80B1D680)($at) -/* 0111C 80B1CA1C 46105482 */ mul.s $f18, $f10, $f16 -/* 01120 80B1CA20 44805000 */ mtc1 $zero, $f10 ## $f10 = 0.00 -/* 01124 80B1CA24 3C073E4C */ lui $a3, 0x3E4C ## $a3 = 3E4C0000 -/* 01128 80B1CA28 34E7CCCD */ ori $a3, $a3, 0xCCCD ## $a3 = 3E4CCCCD -/* 0112C 80B1CA2C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01130 80B1CA30 27A50044 */ addiu $a1, $sp, 0x0044 ## $a1 = FFFFFFF4 -/* 01134 80B1CA34 2406000C */ addiu $a2, $zero, 0x000C ## $a2 = 0000000C -/* 01138 80B1CA38 46049180 */ add.s $f6, $f18, $f4 -/* 0113C 80B1CA3C E7A80010 */ swc1 $f8, 0x0010($sp) -/* 01140 80B1CA40 E7AA0014 */ swc1 $f10, 0x0014($sp) -/* 01144 80B1CA44 0C2C6F77 */ jal func_80B1BDDC -/* 01148 80B1CA48 E7A6004C */ swc1 $f6, 0x004C($sp) -/* 0114C 80B1CA4C 8FBF0024 */ lw $ra, 0x0024($sp) -.L80B1CA50: -/* 01150 80B1CA50 8FB00020 */ lw $s0, 0x0020($sp) -/* 01154 80B1CA54 27BD0050 */ addiu $sp, $sp, 0x0050 ## $sp = 00000000 -/* 01158 80B1CA58 03E00008 */ jr $ra -/* 0115C 80B1CA5C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Tk/func_80B1CC04.s b/asm/non_matchings/overlays/actors/ovl_En_Tk/func_80B1CC04.s deleted file mode 100644 index 7613b19924..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Tk/func_80B1CC04.s +++ /dev/null @@ -1,152 +0,0 @@ -glabel func_80B1CC04 -/* 01304 80B1CC04 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 01308 80B1CC08 AFBF0024 */ sw $ra, 0x0024($sp) -/* 0130C 80B1CC0C AFB00020 */ sw $s0, 0x0020($sp) -/* 01310 80B1CC10 AFA50034 */ sw $a1, 0x0034($sp) -/* 01314 80B1CC14 848201E0 */ lh $v0, 0x01E0($a0) ## 000001E0 -/* 01318 80B1CC18 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 0131C 80B1CC1C 10400028 */ beq $v0, $zero, .L80B1CCC0 -/* 01320 80B1CC20 00000000 */ nop -/* 01324 80B1CC24 848300B6 */ lh $v1, 0x00B6($a0) ## 000000B6 -/* 01328 80B1CC28 848E021E */ lh $t6, 0x021E($a0) ## 0000021E -/* 0132C 80B1CC2C 848F008A */ lh $t7, 0x008A($a0) ## 0000008A -/* 01330 80B1CC30 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 01334 80B1CC34 006E1823 */ subu $v1, $v1, $t6 -/* 01338 80B1CC38 00031C00 */ sll $v1, $v1, 16 -/* 0133C 80B1CC3C 00031C03 */ sra $v1, $v1, 16 -/* 01340 80B1CC40 01E31823 */ subu $v1, $t7, $v1 -/* 01344 80B1CC44 00031C00 */ sll $v1, $v1, 16 -/* 01348 80B1CC48 14410008 */ bne $v0, $at, .L80B1CC6C -/* 0134C 80B1CC4C 00031C03 */ sra $v1, $v1, 16 -/* 01350 80B1CC50 0C2C6FE3 */ jal func_80B1BF8C -/* 01354 80B1CC54 00000000 */ nop -/* 01358 80B1CC58 3C1880B2 */ lui $t8, %hi(func_80B1CEF8) ## $t8 = 80B20000 -/* 0135C 80B1CC5C 2718CEF8 */ addiu $t8, $t8, %lo(func_80B1CEF8) ## $t8 = 80B1CEF8 -/* 01360 80B1CC60 A60001E0 */ sh $zero, 0x01E0($s0) ## 000001E0 -/* 01364 80B1CC64 1000006B */ beq $zero, $zero, .L80B1CE14 -/* 01368 80B1CC68 AE180190 */ sw $t8, 0x0190($s0) ## 00000190 -.L80B1CC6C: -/* 0136C 80B1CC6C 861901D4 */ lh $t9, 0x01D4($s0) ## 000001D4 -/* 01370 80B1CC70 3C0141F0 */ lui $at, 0x41F0 ## $at = 41F00000 -/* 01374 80B1CC74 44814000 */ mtc1 $at, $f8 ## $f8 = 30.00 -/* 01378 80B1CC78 44992000 */ mtc1 $t9, $f4 ## $f4 = 0.00 -/* 0137C 80B1CC7C 3C0880B2 */ lui $t0, %hi(func_80B1C54C) ## $t0 = 80B20000 -/* 01380 80B1CC80 3C0980B2 */ lui $t1, %hi(func_80B1C5A0) ## $t1 = 80B20000 -/* 01384 80B1CC84 468021A0 */ cvt.s.w $f6, $f4 -/* 01388 80B1CC88 2529C5A0 */ addiu $t1, $t1, %lo(func_80B1C5A0) ## $t1 = 80B1C5A0 -/* 0138C 80B1CC8C 2508C54C */ addiu $t0, $t0, %lo(func_80B1C54C) ## $t0 = 80B1C54C -/* 01390 80B1CC90 AFA80010 */ sw $t0, 0x0010($sp) -/* 01394 80B1CC94 AFA90014 */ sw $t1, 0x0014($sp) -/* 01398 80B1CC98 A7A3002E */ sh $v1, 0x002E($sp) -/* 0139C 80B1CC9C 46083280 */ add.s $f10, $f6, $f8 -/* 013A0 80B1CCA0 8FA40034 */ lw $a0, 0x0034($sp) -/* 013A4 80B1CCA4 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 013A8 80B1CCA8 260601E0 */ addiu $a2, $s0, 0x01E0 ## $a2 = 000001E0 -/* 013AC 80B1CCAC 44075000 */ mfc1 $a3, $f10 -/* 013B0 80B1CCB0 0C00D0F3 */ jal func_800343CC -/* 013B4 80B1CCB4 00000000 */ nop -/* 013B8 80B1CCB8 10000044 */ beq $zero, $zero, .L80B1CDCC -/* 013BC 80B1CCBC 87A3002E */ lh $v1, 0x002E($sp) -.L80B1CCC0: -/* 013C0 80B1CCC0 0C2C7034 */ jal func_80B1C0D0 -/* 013C4 80B1CCC4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 013C8 80B1CCC8 1040001F */ beq $v0, $zero, .L80B1CD48 -/* 013CC 80B1CCCC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 013D0 80B1CCD0 860C01D4 */ lh $t4, 0x01D4($s0) ## 000001D4 -/* 013D4 80B1CCD4 860300B6 */ lh $v1, 0x00B6($s0) ## 000000B6 -/* 013D8 80B1CCD8 860A021E */ lh $t2, 0x021E($s0) ## 0000021E -/* 013DC 80B1CCDC 448C8000 */ mtc1 $t4, $f16 ## $f16 = 0.00 -/* 013E0 80B1CCE0 3C0141F0 */ lui $at, 0x41F0 ## $at = 41F00000 -/* 013E4 80B1CCE4 44812000 */ mtc1 $at, $f4 ## $f4 = 30.00 -/* 013E8 80B1CCE8 468084A0 */ cvt.s.w $f18, $f16 -/* 013EC 80B1CCEC 860B008A */ lh $t3, 0x008A($s0) ## 0000008A -/* 013F0 80B1CCF0 006A1823 */ subu $v1, $v1, $t2 -/* 013F4 80B1CCF4 00031C00 */ sll $v1, $v1, 16 -/* 013F8 80B1CCF8 00031C03 */ sra $v1, $v1, 16 -/* 013FC 80B1CCFC A600021C */ sh $zero, 0x021C($s0) ## 0000021C -/* 01400 80B1CD00 46049180 */ add.s $f6, $f18, $f4 -/* 01404 80B1CD04 01631823 */ subu $v1, $t3, $v1 -/* 01408 80B1CD08 00031C00 */ sll $v1, $v1, 16 -/* 0140C 80B1CD0C 3C0D80B2 */ lui $t5, %hi(func_80B1C54C) ## $t5 = 80B20000 -/* 01410 80B1CD10 3C0E80B2 */ lui $t6, %hi(func_80B1C5A0) ## $t6 = 80B20000 -/* 01414 80B1CD14 00031C03 */ sra $v1, $v1, 16 -/* 01418 80B1CD18 25CEC5A0 */ addiu $t6, $t6, %lo(func_80B1C5A0) ## $t6 = 80B1C5A0 -/* 0141C 80B1CD1C 25ADC54C */ addiu $t5, $t5, %lo(func_80B1C54C) ## $t5 = 80B1C54C -/* 01420 80B1CD20 44073000 */ mfc1 $a3, $f6 -/* 01424 80B1CD24 AFAD0010 */ sw $t5, 0x0010($sp) -/* 01428 80B1CD28 AFAE0014 */ sw $t6, 0x0014($sp) -/* 0142C 80B1CD2C A7A3002E */ sh $v1, 0x002E($sp) -/* 01430 80B1CD30 8FA40034 */ lw $a0, 0x0034($sp) -/* 01434 80B1CD34 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 01438 80B1CD38 0C00D0F3 */ jal func_800343CC -/* 0143C 80B1CD3C 260601E0 */ addiu $a2, $s0, 0x01E0 ## $a2 = 000001E0 -/* 01440 80B1CD40 10000022 */ beq $zero, $zero, .L80B1CDCC -/* 01444 80B1CD44 87A3002E */ lh $v1, 0x002E($sp) -.L80B1CD48: -/* 01448 80B1CD48 0C00BC65 */ jal func_8002F194 -/* 0144C 80B1CD4C 8FA50034 */ lw $a1, 0x0034($sp) -/* 01450 80B1CD50 1040000D */ beq $v0, $zero, .L80B1CD88 -/* 01454 80B1CD54 24190001 */ addiu $t9, $zero, 0x0001 ## $t9 = 00000001 -/* 01458 80B1CD58 860300B6 */ lh $v1, 0x00B6($s0) ## 000000B6 -/* 0145C 80B1CD5C 860F021E */ lh $t7, 0x021E($s0) ## 0000021E -/* 01460 80B1CD60 8618008A */ lh $t8, 0x008A($s0) ## 0000008A -/* 01464 80B1CD64 A600021C */ sh $zero, 0x021C($s0) ## 0000021C -/* 01468 80B1CD68 006F1823 */ subu $v1, $v1, $t7 -/* 0146C 80B1CD6C 00031C00 */ sll $v1, $v1, 16 -/* 01470 80B1CD70 00031C03 */ sra $v1, $v1, 16 -/* 01474 80B1CD74 03031823 */ subu $v1, $t8, $v1 -/* 01478 80B1CD78 00031C00 */ sll $v1, $v1, 16 -/* 0147C 80B1CD7C 00031C03 */ sra $v1, $v1, 16 -/* 01480 80B1CD80 10000012 */ beq $zero, $zero, .L80B1CDCC -/* 01484 80B1CD84 A61901E0 */ sh $t9, 0x01E0($s0) ## 000001E0 -.L80B1CD88: -/* 01488 80B1CD88 8603021C */ lh $v1, 0x021C($s0) ## 0000021C -/* 0148C 80B1CD8C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01490 80B1CD90 14600003 */ bne $v1, $zero, .L80B1CDA0 -/* 01494 80B1CD94 2468FFFF */ addiu $t0, $v1, 0xFFFF ## $t0 = FFFFFFFF -/* 01498 80B1CD98 10000003 */ beq $zero, $zero, .L80B1CDA8 -/* 0149C 80B1CD9C 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -.L80B1CDA0: -/* 014A0 80B1CDA0 A608021C */ sh $t0, 0x021C($s0) ## 0000021C -/* 014A4 80B1CDA4 8602021C */ lh $v0, 0x021C($s0) ## 0000021C -.L80B1CDA8: -/* 014A8 80B1CDA8 14400008 */ bne $v0, $zero, .L80B1CDCC -/* 014AC 80B1CDAC 00001825 */ or $v1, $zero, $zero ## $v1 = 00000000 -/* 014B0 80B1CDB0 0C2C6FC5 */ jal func_80B1BF14 -/* 014B4 80B1CDB4 8FA50034 */ lw $a1, 0x0034($sp) -/* 014B8 80B1CDB8 3C0980B2 */ lui $t1, %hi(func_80B1CE28) ## $t1 = 80B20000 -/* 014BC 80B1CDBC 2529CE28 */ addiu $t1, $t1, %lo(func_80B1CE28) ## $t1 = 80B1CE28 -/* 014C0 80B1CDC0 AE090190 */ sw $t1, 0x0190($s0) ## 00000190 -/* 014C4 80B1CDC4 10000001 */ beq $zero, $zero, .L80B1CDCC -/* 014C8 80B1CDC8 87A3002E */ lh $v1, 0x002E($sp) -.L80B1CDCC: -/* 014CC 80B1CDCC 00032023 */ subu $a0, $zero, $v1 -/* 014D0 80B1CDD0 288104F6 */ slti $at, $a0, 0x04F6 -/* 014D4 80B1CDD4 10200003 */ beq $at, $zero, .L80B1CDE4 -/* 014D8 80B1CDD8 24060006 */ addiu $a2, $zero, 0x0006 ## $a2 = 00000006 -/* 014DC 80B1CDDC 10000008 */ beq $zero, $zero, .L80B1CE00 -/* 014E0 80B1CDE0 240504F6 */ addiu $a1, $zero, 0x04F6 ## $a1 = 000004F6 -.L80B1CDE4: -/* 014E4 80B1CDE4 288129EB */ slti $at, $a0, 0x29EB -/* 014E8 80B1CDE8 14200003 */ bne $at, $zero, .L80B1CDF8 -/* 014EC 80B1CDEC 00801025 */ or $v0, $a0, $zero ## $v0 = 00000000 -/* 014F0 80B1CDF0 10000001 */ beq $zero, $zero, .L80B1CDF8 -/* 014F4 80B1CDF4 240229EA */ addiu $v0, $zero, 0x29EA ## $v0 = 000029EA -.L80B1CDF8: -/* 014F8 80B1CDF8 00022C00 */ sll $a1, $v0, 16 -/* 014FC 80B1CDFC 00052C03 */ sra $a1, $a1, 16 -.L80B1CE00: -/* 01500 80B1CE00 240A0001 */ addiu $t2, $zero, 0x0001 ## $t2 = 00000001 -/* 01504 80B1CE04 AFAA0010 */ sw $t2, 0x0010($sp) -/* 01508 80B1CE08 26040226 */ addiu $a0, $s0, 0x0226 ## $a0 = 00000226 -/* 0150C 80B1CE0C 0C01E1A7 */ jal Math_SmoothScaleMaxMinS - -/* 01510 80B1CE10 240703E8 */ addiu $a3, $zero, 0x03E8 ## $a3 = 000003E8 -.L80B1CE14: -/* 01514 80B1CE14 8FBF0024 */ lw $ra, 0x0024($sp) -/* 01518 80B1CE18 8FB00020 */ lw $s0, 0x0020($sp) -/* 0151C 80B1CE1C 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 01520 80B1CE20 03E00008 */ jr $ra -/* 01524 80B1CE24 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Tk/func_80B1CE28.s b/asm/non_matchings/overlays/actors/ovl_En_Tk/func_80B1CE28.s deleted file mode 100644 index 0e8ef7f8b0..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Tk/func_80B1CE28.s +++ /dev/null @@ -1,61 +0,0 @@ -glabel func_80B1CE28 -/* 01528 80B1CE28 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 0152C 80B1CE2C AFBF0024 */ sw $ra, 0x0024($sp) -/* 01530 80B1CE30 AFB00020 */ sw $s0, 0x0020($sp) -/* 01534 80B1CE34 848E01E0 */ lh $t6, 0x01E0($a0) ## 000001E0 -/* 01538 80B1CE38 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 0153C 80B1CE3C 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 01540 80B1CE40 55C10009 */ bnel $t6, $at, .L80B1CE68 -/* 01544 80B1CE44 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01548 80B1CE48 0C2C6FE3 */ jal func_80B1BF8C -/* 0154C 80B1CE4C 00000000 */ nop -/* 01550 80B1CE50 3C0F80B2 */ lui $t7, %hi(func_80B1CEF8) ## $t7 = 80B20000 -/* 01554 80B1CE54 25EFCEF8 */ addiu $t7, $t7, %lo(func_80B1CEF8) ## $t7 = 80B1CEF8 -/* 01558 80B1CE58 A60001E0 */ sh $zero, 0x01E0($s0) ## 000001E0 -/* 0155C 80B1CE5C 10000021 */ beq $zero, $zero, .L80B1CEE4 -/* 01560 80B1CE60 AE0F0190 */ sw $t7, 0x0190($s0) ## 00000190 -/* 01564 80B1CE64 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -.L80B1CE68: -/* 01568 80B1CE68 0C2C70AD */ jal func_80B1C2B4 -/* 0156C 80B1CE6C AFA5002C */ sw $a1, 0x002C($sp) -/* 01570 80B1CE70 E6000068 */ swc1 $f0, 0x0068($s0) ## 00000068 -/* 01574 80B1CE74 8FA5002C */ lw $a1, 0x002C($sp) -/* 01578 80B1CE78 0C2C70F7 */ jal func_80B1C3DC -/* 0157C 80B1CE7C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01580 80B1CE80 24180001 */ addiu $t8, $zero, 0x0001 ## $t8 = 00000001 -/* 01584 80B1CE84 AFB80010 */ sw $t8, 0x0010($sp) -/* 01588 80B1CE88 26040226 */ addiu $a0, $s0, 0x0226 ## $a0 = 00000226 -/* 0158C 80B1CE8C 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 01590 80B1CE90 24060006 */ addiu $a2, $zero, 0x0006 ## $a2 = 00000006 -/* 01594 80B1CE94 0C01E1A7 */ jal Math_SmoothScaleMaxMinS - -/* 01598 80B1CE98 240703E8 */ addiu $a3, $zero, 0x03E8 ## $a3 = 000003E8 -/* 0159C 80B1CE9C 0C2C708F */ jal func_80B1C23C -/* 015A0 80B1CEA0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 015A4 80B1CEA4 8602021C */ lh $v0, 0x021C($s0) ## 0000021C -/* 015A8 80B1CEA8 10400002 */ beq $v0, $zero, .L80B1CEB4 -/* 015AC 80B1CEAC 2459FFFF */ addiu $t9, $v0, 0xFFFF ## $t9 = FFFFFFFF -/* 015B0 80B1CEB0 A619021C */ sh $t9, 0x021C($s0) ## 0000021C -.L80B1CEB4: -/* 015B4 80B1CEB4 0C2C7034 */ jal func_80B1C0D0 -/* 015B8 80B1CEB8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 015BC 80B1CEBC 14400004 */ bne $v0, $zero, .L80B1CED0 -/* 015C0 80B1CEC0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 015C4 80B1CEC4 8608021C */ lh $t0, 0x021C($s0) ## 0000021C -/* 015C8 80B1CEC8 55000007 */ bnel $t0, $zero, .L80B1CEE8 -/* 015CC 80B1CECC 8FBF0024 */ lw $ra, 0x0024($sp) -.L80B1CED0: -/* 015D0 80B1CED0 0C2C6FA5 */ jal func_80B1BE94 -/* 015D4 80B1CED4 8FA5002C */ lw $a1, 0x002C($sp) -/* 015D8 80B1CED8 3C0980B2 */ lui $t1, %hi(func_80B1CC04) ## $t1 = 80B20000 -/* 015DC 80B1CEDC 2529CC04 */ addiu $t1, $t1, %lo(func_80B1CC04) ## $t1 = 80B1CC04 -/* 015E0 80B1CEE0 AE090190 */ sw $t1, 0x0190($s0) ## 00000190 -.L80B1CEE4: -/* 015E4 80B1CEE4 8FBF0024 */ lw $ra, 0x0024($sp) -.L80B1CEE8: -/* 015E8 80B1CEE8 8FB00020 */ lw $s0, 0x0020($sp) -/* 015EC 80B1CEEC 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 015F0 80B1CEF0 03E00008 */ jr $ra -/* 015F4 80B1CEF4 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Tk/func_80B1CEF8.s b/asm/non_matchings/overlays/actors/ovl_En_Tk/func_80B1CEF8.s deleted file mode 100644 index 00173da907..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Tk/func_80B1CEF8.s +++ /dev/null @@ -1,168 +0,0 @@ -glabel func_80B1CEF8 -/* 015F8 80B1CEF8 27BDFFA8 */ addiu $sp, $sp, 0xFFA8 ## $sp = FFFFFFA8 -/* 015FC 80B1CEFC 3C0F80B2 */ lui $t7, %hi(D_80B1D56C) ## $t7 = 80B20000 -/* 01600 80B1CF00 AFBF0024 */ sw $ra, 0x0024($sp) -/* 01604 80B1CF04 AFB00020 */ sw $s0, 0x0020($sp) -/* 01608 80B1CF08 AFA5005C */ sw $a1, 0x005C($sp) -/* 0160C 80B1CF0C 25EFD56C */ addiu $t7, $t7, %lo(D_80B1D56C) ## $t7 = 80B1D56C -/* 01610 80B1CF10 8DF90000 */ lw $t9, 0x0000($t7) ## 80B1D56C -/* 01614 80B1CF14 27AE002C */ addiu $t6, $sp, 0x002C ## $t6 = FFFFFFD4 -/* 01618 80B1CF18 8DF80004 */ lw $t8, 0x0004($t7) ## 80B1D570 -/* 0161C 80B1CF1C ADD90000 */ sw $t9, 0x0000($t6) ## FFFFFFD4 -/* 01620 80B1CF20 8DF90008 */ lw $t9, 0x0008($t7) ## 80B1D574 -/* 01624 80B1CF24 ADD80004 */ sw $t8, 0x0004($t6) ## FFFFFFD8 -/* 01628 80B1CF28 8DF8000C */ lw $t8, 0x000C($t7) ## 80B1D578 -/* 0162C 80B1CF2C ADD90008 */ sw $t9, 0x0008($t6) ## FFFFFFDC -/* 01630 80B1CF30 8DF90010 */ lw $t9, 0x0010($t7) ## 80B1D57C -/* 01634 80B1CF34 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 01638 80B1CF38 ADD8000C */ sw $t8, 0x000C($t6) ## FFFFFFE0 -/* 0163C 80B1CF3C 0C2C723C */ jal func_80B1C8F0 -/* 01640 80B1CF40 ADD90010 */ sw $t9, 0x0010($t6) ## FFFFFFE4 -/* 01644 80B1CF44 3C014200 */ lui $at, 0x4200 ## $at = 42000000 -/* 01648 80B1CF48 44812000 */ mtc1 $at, $f4 ## $f4 = 32.00 -/* 0164C 80B1CF4C C6060164 */ lwc1 $f6, 0x0164($s0) ## 00000164 -/* 01650 80B1CF50 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01654 80B1CF54 46062032 */ c.eq.s $f4, $f6 -/* 01658 80B1CF58 00000000 */ nop -/* 0165C 80B1CF5C 45020038 */ bc1fl .L80B1D040 -/* 01660 80B1CF60 3C014200 */ lui $at, 0x4200 ## $at = 42000000 -/* 01664 80B1CF64 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 01668 80B1CF68 240528C8 */ addiu $a1, $zero, 0x28C8 ## $a1 = 000028C8 -/* 0166C 80B1CF6C 92080208 */ lbu $t0, 0x0208($s0) ## 00000208 -/* 01670 80B1CF70 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 01674 80B1CF74 A600021A */ sh $zero, 0x021A($s0) ## 0000021A -/* 01678 80B1CF78 55010031 */ bnel $t0, $at, .L80B1D040 -/* 0167C 80B1CF7C 3C014200 */ lui $at, 0x4200 ## $at = 42000000 -/* 01680 80B1CF80 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 01684 80B1CF84 3C01C220 */ lui $at, 0xC220 ## $at = C2200000 -/* 01688 80B1CF88 44814000 */ mtc1 $at, $f8 ## $f8 = -40.00 -/* 0168C 80B1CF8C E7A0004C */ swc1 $f0, 0x004C($sp) -/* 01690 80B1CF90 E7A00050 */ swc1 $f0, 0x0050($sp) -/* 01694 80B1CF94 E7A80054 */ swc1 $f8, 0x0054($sp) -/* 01698 80B1CF98 860900B6 */ lh $t1, 0x00B6($s0) ## 000000B6 -/* 0169C 80B1CF9C 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 016A0 80B1CFA0 44895000 */ mtc1 $t1, $f10 ## $f10 = 0.00 -/* 016A4 80B1CFA4 0C034348 */ jal Matrix_RotateY -/* 016A8 80B1CFA8 46805320 */ cvt.s.w $f12, $f10 -/* 016AC 80B1CFAC 27A4004C */ addiu $a0, $sp, 0x004C ## $a0 = FFFFFFF4 -/* 016B0 80B1CFB0 0C0346BD */ jal Matrix_MultVec3f -/* 016B4 80B1CFB4 27A50040 */ addiu $a1, $sp, 0x0040 ## $a1 = FFFFFFE8 -/* 016B8 80B1CFB8 C7B00040 */ lwc1 $f16, 0x0040($sp) -/* 016BC 80B1CFBC C6120024 */ lwc1 $f18, 0x0024($s0) ## 00000024 -/* 016C0 80B1CFC0 C7A60044 */ lwc1 $f6, 0x0044($sp) -/* 016C4 80B1CFC4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 016C8 80B1CFC8 46128100 */ add.s $f4, $f16, $f18 -/* 016CC 80B1CFCC C7B00048 */ lwc1 $f16, 0x0048($sp) -/* 016D0 80B1CFD0 E7A40040 */ swc1 $f4, 0x0040($sp) -/* 016D4 80B1CFD4 C6080028 */ lwc1 $f8, 0x0028($s0) ## 00000028 -/* 016D8 80B1CFD8 46083280 */ add.s $f10, $f6, $f8 -/* 016DC 80B1CFDC E7AA0044 */ swc1 $f10, 0x0044($sp) -/* 016E0 80B1CFE0 C612002C */ lwc1 $f18, 0x002C($s0) ## 0000002C -/* 016E4 80B1CFE4 46128100 */ add.s $f4, $f16, $f18 -/* 016E8 80B1CFE8 0C2C71CE */ jal func_80B1C738 -/* 016EC 80B1CFEC E7A40048 */ swc1 $f4, 0x0048($sp) -/* 016F0 80B1CFF0 24010003 */ addiu $at, $zero, 0x0003 ## $at = 00000003 -/* 016F4 80B1CFF4 1441000A */ bne $v0, $at, .L80B1D020 -/* 016F8 80B1CFF8 AE020214 */ sw $v0, 0x0214($s0) ## 00000214 -/* 016FC 80B1CFFC 3C038016 */ lui $v1, 0x8016 ## $v1 = 80160000 -/* 01700 80B1D000 2463E660 */ addiu $v1, $v1, 0xE660 ## $v1 = 8015E660 -/* 01704 80B1D004 94620EF2 */ lhu $v0, 0x0EF2($v1) ## 8015F552 -/* 01708 80B1D008 240C0004 */ addiu $t4, $zero, 0x0004 ## $t4 = 00000004 -/* 0170C 80B1D00C 304A1000 */ andi $t2, $v0, 0x1000 ## $t2 = 00000000 -/* 01710 80B1D010 15400003 */ bne $t2, $zero, .L80B1D020 -/* 01714 80B1D014 344B1000 */ ori $t3, $v0, 0x1000 ## $t3 = 00001000 -/* 01718 80B1D018 A46B0EF2 */ sh $t3, 0x0EF2($v1) ## 8015F552 -/* 0171C 80B1D01C AE0C0214 */ sw $t4, 0x0214($s0) ## 00000214 -.L80B1D020: -/* 01720 80B1D020 8E0D0214 */ lw $t5, 0x0214($s0) ## 00000214 -/* 01724 80B1D024 8FA4005C */ lw $a0, 0x005C($sp) -/* 01728 80B1D028 27A50040 */ addiu $a1, $sp, 0x0040 ## $a1 = FFFFFFE8 -/* 0172C 80B1D02C 000D7080 */ sll $t6, $t5, 2 -/* 01730 80B1D030 03AE3021 */ addu $a2, $sp, $t6 -/* 01734 80B1D034 0C007D52 */ jal Item_DropCollectible - -/* 01738 80B1D038 84C6002E */ lh $a2, 0x002E($a2) ## 0000002E -/* 0173C 80B1D03C 3C014200 */ lui $at, 0x4200 ## $at = 42000000 -.L80B1D040: -/* 01740 80B1D040 44814000 */ mtc1 $at, $f8 ## $f8 = 32.00 -/* 01744 80B1D044 C6060164 */ lwc1 $f6, 0x0164($s0) ## 00000164 -/* 01748 80B1D048 4606403E */ c.le.s $f8, $f6 -/* 0174C 80B1D04C 00000000 */ nop -/* 01750 80B1D050 45020021 */ bc1fl .L80B1D0D8 -/* 01754 80B1D054 8609021A */ lh $t1, 0x021A($s0) ## 0000021A -/* 01758 80B1D058 860F021A */ lh $t7, 0x021A($s0) ## 0000021A -/* 0175C 80B1D05C 2401000A */ addiu $at, $zero, 0x000A ## $at = 0000000A -/* 01760 80B1D060 55E1001D */ bnel $t7, $at, .L80B1D0D8 -/* 01764 80B1D064 8609021A */ lh $t1, 0x021A($s0) ## 0000021A -/* 01768 80B1D068 92180208 */ lbu $t8, 0x0208($s0) ## 00000208 -/* 0176C 80B1D06C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01770 80B1D070 57000006 */ bnel $t8, $zero, .L80B1D08C -/* 01774 80B1D074 8E190214 */ lw $t9, 0x0214($s0) ## 00000214 -/* 01778 80B1D078 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 0177C 80B1D07C 24054806 */ addiu $a1, $zero, 0x4806 ## $a1 = 00004806 -/* 01780 80B1D080 10000015 */ beq $zero, $zero, .L80B1D0D8 -/* 01784 80B1D084 8609021A */ lh $t1, 0x021A($s0) ## 0000021A -/* 01788 80B1D088 8E190214 */ lw $t9, 0x0214($s0) ## 00000214 -.L80B1D08C: -/* 0178C 80B1D08C 24010004 */ addiu $at, $zero, 0x0004 ## $at = 00000004 -/* 01790 80B1D090 3C078013 */ lui $a3, 0x8013 ## $a3 = 80130000 -/* 01794 80B1D094 1721000D */ bne $t9, $at, .L80B1D0CC -/* 01798 80B1D098 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0179C 80B1D09C 3C088013 */ lui $t0, 0x8013 ## $t0 = 80130000 -/* 017A0 80B1D0A0 24E733E0 */ addiu $a3, $a3, 0x33E0 ## $a3 = 801333E0 -/* 017A4 80B1D0A4 250833E8 */ addiu $t0, $t0, 0x33E8 ## $t0 = 801333E8 -/* 017A8 80B1D0A8 3C058013 */ lui $a1, 0x8013 ## $a1 = 80130000 -/* 017AC 80B1D0AC 24A533D4 */ addiu $a1, $a1, 0x33D4 ## $a1 = 801333D4 -/* 017B0 80B1D0B0 AFA80014 */ sw $t0, 0x0014($sp) -/* 017B4 80B1D0B4 AFA70010 */ sw $a3, 0x0010($sp) -/* 017B8 80B1D0B8 24044802 */ addiu $a0, $zero, 0x4802 ## $a0 = 00004802 -/* 017BC 80B1D0BC 0C03DCE3 */ jal Audio_PlaySoundGeneral - -/* 017C0 80B1D0C0 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 -/* 017C4 80B1D0C4 10000004 */ beq $zero, $zero, .L80B1D0D8 -/* 017C8 80B1D0C8 8609021A */ lh $t1, 0x021A($s0) ## 0000021A -.L80B1D0CC: -/* 017CC 80B1D0CC 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 017D0 80B1D0D0 24054807 */ addiu $a1, $zero, 0x4807 ## $a1 = 00004807 -/* 017D4 80B1D0D4 8609021A */ lh $t1, 0x021A($s0) ## 0000021A -.L80B1D0D8: -/* 017D8 80B1D0D8 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C -/* 017DC 80B1D0DC 8E05015C */ lw $a1, 0x015C($s0) ## 0000015C -/* 017E0 80B1D0E0 252A0001 */ addiu $t2, $t1, 0x0001 ## $t2 = 00000001 -/* 017E4 80B1D0E4 0C0295B2 */ jal func_800A56C8 -/* 017E8 80B1D0E8 A60A021A */ sh $t2, 0x021A($s0) ## 0000021A -/* 017EC 80B1D0EC 50400016 */ beql $v0, $zero, .L80B1D148 -/* 017F0 80B1D0F0 8FBF0024 */ lw $ra, 0x0024($sp) -/* 017F4 80B1D0F4 8E0B0214 */ lw $t3, 0x0214($s0) ## 00000214 -/* 017F8 80B1D0F8 8FA4005C */ lw $a0, 0x005C($sp) -/* 017FC 80B1D0FC 2405501A */ addiu $a1, $zero, 0x501A ## $a1 = 0000501A -/* 01800 80B1D100 05610005 */ bgez $t3, .L80B1D118 -/* 01804 80B1D104 00000000 */ nop -/* 01808 80B1D108 0C042DA0 */ jal func_8010B680 -/* 0180C 80B1D10C 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 01810 80B1D110 10000004 */ beq $zero, $zero, .L80B1D124 -/* 01814 80B1D114 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -.L80B1D118: -/* 01818 80B1D118 0C041B33 */ jal func_80106CCC -/* 0181C 80B1D11C 8FA4005C */ lw $a0, 0x005C($sp) -/* 01820 80B1D120 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -.L80B1D124: -/* 01824 80B1D124 0C2C6FA5 */ jal func_80B1BE94 -/* 01828 80B1D128 8FA5005C */ lw $a1, 0x005C($sp) -/* 0182C 80B1D12C 3C0D80B2 */ lui $t5, %hi(func_80B1CC04) ## $t5 = 80B20000 -/* 01830 80B1D130 240CFFFF */ addiu $t4, $zero, 0xFFFF ## $t4 = FFFFFFFF -/* 01834 80B1D134 25ADCC04 */ addiu $t5, $t5, %lo(func_80B1CC04) ## $t5 = 80B1CC04 -/* 01838 80B1D138 AE0C0214 */ sw $t4, 0x0214($s0) ## 00000214 -/* 0183C 80B1D13C A2000208 */ sb $zero, 0x0208($s0) ## 00000208 -/* 01840 80B1D140 AE0D0190 */ sw $t5, 0x0190($s0) ## 00000190 -/* 01844 80B1D144 8FBF0024 */ lw $ra, 0x0024($sp) -.L80B1D148: -/* 01848 80B1D148 8FB00020 */ lw $s0, 0x0020($sp) -/* 0184C 80B1D14C 27BD0058 */ addiu $sp, $sp, 0x0058 ## $sp = 00000000 -/* 01850 80B1D150 03E00008 */ jr $ra -/* 01854 80B1D154 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Tk/func_80B1D200.s b/asm/non_matchings/overlays/actors/ovl_En_Tk/func_80B1D200.s deleted file mode 100644 index 8b7e69da9b..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Tk/func_80B1D200.s +++ /dev/null @@ -1,33 +0,0 @@ -glabel func_80B1D200 -/* 01900 80B1D200 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 01904 80B1D204 AFBF0014 */ sw $ra, 0x0014($sp) -/* 01908 80B1D208 AFA40038 */ sw $a0, 0x0038($sp) -/* 0190C 80B1D20C 8C850000 */ lw $a1, 0x0000($a0) ## 00000000 -/* 01910 80B1D210 3C0680B2 */ lui $a2, %hi(D_80B1D5EC) ## $a2 = 80B20000 -/* 01914 80B1D214 24C6D5EC */ addiu $a2, $a2, %lo(D_80B1D5EC) ## $a2 = 80B1D5EC -/* 01918 80B1D218 27A40024 */ addiu $a0, $sp, 0x0024 ## $a0 = FFFFFFEC -/* 0191C 80B1D21C 240704A4 */ addiu $a3, $zero, 0x04A4 ## $a3 = 000004A4 -/* 01920 80B1D220 0C031AB1 */ jal func_800C6AC4 -/* 01924 80B1D224 AFA50034 */ sw $a1, 0x0034($sp) -/* 01928 80B1D228 8FA80034 */ lw $t0, 0x0034($sp) -/* 0192C 80B1D22C 3C190601 */ lui $t9, 0x0601 ## $t9 = 06010000 -/* 01930 80B1D230 2739ACE0 */ addiu $t9, $t9, 0xACE0 ## $t9 = 0600ACE0 -/* 01934 80B1D234 8D0302C0 */ lw $v1, 0x02C0($t0) ## 000002C0 -/* 01938 80B1D238 3C18DE00 */ lui $t8, 0xDE00 ## $t8 = DE000000 -/* 0193C 80B1D23C 3C0680B2 */ lui $a2, %hi(D_80B1D5FC) ## $a2 = 80B20000 -/* 01940 80B1D240 246F0008 */ addiu $t7, $v1, 0x0008 ## $t7 = 00000008 -/* 01944 80B1D244 AD0F02C0 */ sw $t7, 0x02C0($t0) ## 000002C0 -/* 01948 80B1D248 AC790004 */ sw $t9, 0x0004($v1) ## 00000004 -/* 0194C 80B1D24C AC780000 */ sw $t8, 0x0000($v1) ## 00000000 -/* 01950 80B1D250 8FA90038 */ lw $t1, 0x0038($sp) -/* 01954 80B1D254 24C6D5FC */ addiu $a2, $a2, %lo(D_80B1D5FC) ## $a2 = 80B1D5FC -/* 01958 80B1D258 27A40024 */ addiu $a0, $sp, 0x0024 ## $a0 = FFFFFFEC -/* 0195C 80B1D25C 240704A6 */ addiu $a3, $zero, 0x04A6 ## $a3 = 000004A6 -/* 01960 80B1D260 0C031AD5 */ jal func_800C6B54 -/* 01964 80B1D264 8D250000 */ lw $a1, 0x0000($t1) ## 00000000 -/* 01968 80B1D268 8FBF0014 */ lw $ra, 0x0014($sp) -/* 0196C 80B1D26C 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 -/* 01970 80B1D270 03E00008 */ jr $ra -/* 01974 80B1D274 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Tk/func_80B1D278.s b/asm/non_matchings/overlays/actors/ovl_En_Tk/func_80B1D278.s deleted file mode 100644 index f33dc6acc0..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Tk/func_80B1D278.s +++ /dev/null @@ -1,32 +0,0 @@ -glabel func_80B1D278 -/* 01978 80B1D278 2401000F */ addiu $at, $zero, 0x000F ## $at = 0000000F -/* 0197C 80B1D27C AFA40000 */ sw $a0, 0x0000($sp) -/* 01980 80B1D280 AFA60008 */ sw $a2, 0x0008($sp) -/* 01984 80B1D284 10A10006 */ beq $a1, $at, .L80B1D2A0 -/* 01988 80B1D288 AFA7000C */ sw $a3, 0x000C($sp) -/* 0198C 80B1D28C 24010010 */ addiu $at, $zero, 0x0010 ## $at = 00000010 -/* 01990 80B1D290 10A10009 */ beq $a1, $at, .L80B1D2B8 -/* 01994 80B1D294 8FA20014 */ lw $v0, 0x0014($sp) -/* 01998 80B1D298 03E00008 */ jr $ra -/* 0199C 80B1D29C 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -.L80B1D2A0: -/* 019A0 80B1D2A0 8FA30010 */ lw $v1, 0x0010($sp) -/* 019A4 80B1D2A4 8FA20014 */ lw $v0, 0x0014($sp) -/* 019A8 80B1D2A8 846E0002 */ lh $t6, 0x0002($v1) ## 00000002 -/* 019AC 80B1D2AC A44E021E */ sh $t6, 0x021E($v0) ## 0000021E -/* 019B0 80B1D2B0 03E00008 */ jr $ra -/* 019B4 80B1D2B4 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -.L80B1D2B8: -/* 019B8 80B1D2B8 8FA30010 */ lw $v1, 0x0010($sp) -/* 019BC 80B1D2BC 844F021E */ lh $t7, 0x021E($v0) ## 0000021E -/* 019C0 80B1D2C0 84490226 */ lh $t1, 0x0226($v0) ## 00000226 -/* 019C4 80B1D2C4 84780002 */ lh $t8, 0x0002($v1) ## 00000002 -/* 019C8 80B1D2C8 01F8C821 */ addu $t9, $t7, $t8 -/* 019CC 80B1D2CC A459021E */ sh $t9, 0x021E($v0) ## 0000021E -/* 019D0 80B1D2D0 84680002 */ lh $t0, 0x0002($v1) ## 00000002 -/* 019D4 80B1D2D4 01095021 */ addu $t2, $t0, $t1 -/* 019D8 80B1D2D8 A46A0002 */ sh $t2, 0x0002($v1) ## 00000002 -/* 019DC 80B1D2DC 03E00008 */ jr $ra -/* 019E0 80B1D2E0 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Tk/func_80B1D2E4.s b/asm/non_matchings/overlays/actors/ovl_En_Tk/func_80B1D2E4.s deleted file mode 100644 index 7ae1beb53c..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Tk/func_80B1D2E4.s +++ /dev/null @@ -1,50 +0,0 @@ -glabel func_80B1D2E4 -/* 019E4 80B1D2E4 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 019E8 80B1D2E8 3C0F80B2 */ lui $t7, %hi(D_80B1D580) ## $t7 = 80B20000 -/* 019EC 80B1D2EC AFBF0014 */ sw $ra, 0x0014($sp) -/* 019F0 80B1D2F0 AFA40038 */ sw $a0, 0x0038($sp) -/* 019F4 80B1D2F4 AFA5003C */ sw $a1, 0x003C($sp) -/* 019F8 80B1D2F8 AFA60040 */ sw $a2, 0x0040($sp) -/* 019FC 80B1D2FC AFA70044 */ sw $a3, 0x0044($sp) -/* 01A00 80B1D300 25EFD580 */ addiu $t7, $t7, %lo(D_80B1D580) ## $t7 = 80B1D580 -/* 01A04 80B1D304 8DF90000 */ lw $t9, 0x0000($t7) ## 80B1D580 -/* 01A08 80B1D308 27AE0028 */ addiu $t6, $sp, 0x0028 ## $t6 = FFFFFFF0 -/* 01A0C 80B1D30C 8DF80004 */ lw $t8, 0x0004($t7) ## 80B1D584 -/* 01A10 80B1D310 ADD90000 */ sw $t9, 0x0000($t6) ## FFFFFFF0 -/* 01A14 80B1D314 8DF90008 */ lw $t9, 0x0008($t7) ## 80B1D588 -/* 01A18 80B1D318 3C0880B2 */ lui $t0, %hi(D_80B1D58C) ## $t0 = 80B20000 -/* 01A1C 80B1D31C 2508D58C */ addiu $t0, $t0, %lo(D_80B1D58C) ## $t0 = 80B1D58C -/* 01A20 80B1D320 ADD80004 */ sw $t8, 0x0004($t6) ## FFFFFFF4 -/* 01A24 80B1D324 ADD90008 */ sw $t9, 0x0008($t6) ## FFFFFFF8 -/* 01A28 80B1D328 8D0A0000 */ lw $t2, 0x0000($t0) ## 80B1D58C -/* 01A2C 80B1D32C 27A7001C */ addiu $a3, $sp, 0x001C ## $a3 = FFFFFFE4 -/* 01A30 80B1D330 24010010 */ addiu $at, $zero, 0x0010 ## $at = 00000010 -/* 01A34 80B1D334 ACEA0000 */ sw $t2, 0x0000($a3) ## FFFFFFE4 -/* 01A38 80B1D338 8D090004 */ lw $t1, 0x0004($t0) ## 80B1D590 -/* 01A3C 80B1D33C 00A03025 */ or $a2, $a1, $zero ## $a2 = 00000000 -/* 01A40 80B1D340 00E02025 */ or $a0, $a3, $zero ## $a0 = FFFFFFE4 -/* 01A44 80B1D344 ACE90004 */ sw $t1, 0x0004($a3) ## FFFFFFE8 -/* 01A48 80B1D348 8D0A0008 */ lw $t2, 0x0008($t0) ## 80B1D594 -/* 01A4C 80B1D34C 14A10006 */ bne $a1, $at, .L80B1D368 -/* 01A50 80B1D350 ACEA0008 */ sw $t2, 0x0008($a3) ## FFFFFFEC -/* 01A54 80B1D354 8FA50048 */ lw $a1, 0x0048($sp) -/* 01A58 80B1D358 AFA6003C */ sw $a2, 0x003C($sp) -/* 01A5C 80B1D35C 0C0346BD */ jal Matrix_MultVec3f -/* 01A60 80B1D360 24A50038 */ addiu $a1, $a1, 0x0038 ## $a1 = 00000038 -/* 01A64 80B1D364 8FA6003C */ lw $a2, 0x003C($sp) -.L80B1D368: -/* 01A68 80B1D368 2401000E */ addiu $at, $zero, 0x000E ## $at = 0000000E -/* 01A6C 80B1D36C 14C10006 */ bne $a2, $at, .L80B1D388 -/* 01A70 80B1D370 8FA50048 */ lw $a1, 0x0048($sp) -/* 01A74 80B1D374 27A40028 */ addiu $a0, $sp, 0x0028 ## $a0 = FFFFFFF0 -/* 01A78 80B1D378 0C0346BD */ jal Matrix_MultVec3f -/* 01A7C 80B1D37C 24A50304 */ addiu $a1, $a1, 0x0304 ## $a1 = 00000304 -/* 01A80 80B1D380 0C2C7480 */ jal func_80B1D200 -/* 01A84 80B1D384 8FA40038 */ lw $a0, 0x0038($sp) -.L80B1D388: -/* 01A88 80B1D388 8FBF0014 */ lw $ra, 0x0014($sp) -/* 01A8C 80B1D38C 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 -/* 01A90 80B1D390 03E00008 */ jr $ra -/* 01A94 80B1D394 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Torch2/EnTorch2_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Torch2/EnTorch2_Draw.s index d78ad77d3a..4596bbc96e 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Torch2/EnTorch2_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Torch2/EnTorch2_Draw.s @@ -1,28 +1,28 @@ glabel EnTorch2_Draw /* 01E78 80B1F7F8 27BDFF90 */ addiu $sp, $sp, 0xFF90 ## $sp = FFFFFF90 -/* 01E7C 80B1F7FC AFB20030 */ sw $s2, 0x0030($sp) +/* 01E7C 80B1F7FC AFB20030 */ sw $s2, 0x0030($sp) /* 01E80 80B1F800 00A09025 */ or $s2, $a1, $zero ## $s2 = 00000000 -/* 01E84 80B1F804 AFBF0034 */ sw $ra, 0x0034($sp) -/* 01E88 80B1F808 AFB1002C */ sw $s1, 0x002C($sp) -/* 01E8C 80B1F80C AFB00028 */ sw $s0, 0x0028($sp) +/* 01E84 80B1F804 AFBF0034 */ sw $ra, 0x0034($sp) +/* 01E88 80B1F808 AFB1002C */ sw $s1, 0x002C($sp) +/* 01E8C 80B1F80C AFB00028 */ sw $s0, 0x0028($sp) /* 01E90 80B1F810 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 /* 01E94 80B1F814 00808825 */ or $s1, $a0, $zero ## $s1 = 00000000 /* 01E98 80B1F818 3C0680B2 */ lui $a2, %hi(D_80B1FA30) ## $a2 = 80B20000 /* 01E9C 80B1F81C 24C6FA30 */ addiu $a2, $a2, %lo(D_80B1FA30) ## $a2 = 80B1FA30 /* 01EA0 80B1F820 27A40050 */ addiu $a0, $sp, 0x0050 ## $a0 = FFFFFFE0 /* 01EA4 80B1F824 2407041A */ addiu $a3, $zero, 0x041A ## $a3 = 0000041A -/* 01EA8 80B1F828 0C031AB1 */ jal func_800C6AC4 +/* 01EA8 80B1F828 0C031AB1 */ jal Graph_OpenDisps /* 01EAC 80B1F82C 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 -/* 01EB0 80B1F830 0C024F20 */ jal func_80093C80 +/* 01EB0 80B1F830 0C024F20 */ jal func_80093C80 /* 01EB4 80B1F834 02402025 */ or $a0, $s2, $zero ## $a0 = 00000000 -/* 01EB8 80B1F838 0C024F61 */ jal func_80093D84 +/* 01EB8 80B1F838 0C024F61 */ jal func_80093D84 /* 01EBC 80B1F83C 8E440000 */ lw $a0, 0x0000($s2) ## 00000000 /* 01EC0 80B1F840 3C0480B2 */ lui $a0, %hi(D_80B20165) ## $a0 = 80B20000 /* 01EC4 80B1F844 24840165 */ addiu $a0, $a0, %lo(D_80B20165) ## $a0 = 80B20165 /* 01EC8 80B1F848 908E0000 */ lbu $t6, 0x0000($a0) ## 80B20165 /* 01ECC 80B1F84C 240100FF */ addiu $at, $zero, 0x00FF ## $at = 000000FF /* 01ED0 80B1F850 3C19FB00 */ lui $t9, 0xFB00 ## $t9 = FB000000 -/* 01ED4 80B1F854 15C1002B */ bne $t6, $at, .L80B1F904 +/* 01ED4 80B1F854 15C1002B */ bne $t6, $at, .L80B1F904 /* 01ED8 80B1F858 3C0CDB06 */ lui $t4, 0xDB06 ## $t4 = DB060000 /* 01EDC 80B1F85C 8E0302C0 */ lw $v1, 0x02C0($s0) ## 000002C0 /* 01EE0 80B1F860 3C18FB00 */ lui $t8, 0xFB00 ## $t8 = FB000000 @@ -44,11 +44,11 @@ glabel EnTorch2_Draw /* 01F20 80B1F8A0 02402825 */ or $a1, $s2, $zero ## $a1 = 00000000 /* 01F24 80B1F8A4 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 /* 01F28 80B1F8A8 AC6C0004 */ sw $t4, 0x0004($v1) ## 00000004 -/* 01F2C 80B1F8AC 0C00BAF3 */ jal func_8002EBCC +/* 01F2C 80B1F8AC 0C00BAF3 */ jal func_8002EBCC /* 01F30 80B1F8B0 AC6B0000 */ sw $t3, 0x0000($v1) ## 00000000 /* 01F34 80B1F8B4 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 01F38 80B1F8B8 02402825 */ or $a1, $s2, $zero ## $a1 = 00000000 -/* 01F3C 80B1F8BC 0C00BB60 */ jal func_8002ED80 +/* 01F3C 80B1F8BC 0C00BB60 */ jal func_8002ED80 /* 01F40 80B1F8C0 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 /* 01F44 80B1F8C4 8E2501B8 */ lw $a1, 0x01B8($s1) ## 000001B8 /* 01F48 80B1F8C8 8E2601D4 */ lw $a2, 0x01D4($s1) ## 000001D4 @@ -57,14 +57,14 @@ glabel EnTorch2_Draw /* 01F54 80B1F8D4 3C0E80B2 */ lui $t6, %hi(func_80B1F7D4) ## $t6 = 80B20000 /* 01F58 80B1F8D8 25CEF7D4 */ addiu $t6, $t6, %lo(func_80B1F7D4) ## $t6 = 80B1F7D4 /* 01F5C 80B1F8DC 25ADF7A8 */ addiu $t5, $t5, %lo(func_80B1F7A8) ## $t5 = 80B1F7A8 -/* 01F60 80B1F8E0 AFAD0010 */ sw $t5, 0x0010($sp) -/* 01F64 80B1F8E4 AFAE0014 */ sw $t6, 0x0014($sp) -/* 01F68 80B1F8E8 AFB10018 */ sw $s1, 0x0018($sp) +/* 01F60 80B1F8E0 AFAD0010 */ sw $t5, 0x0010($sp) +/* 01F64 80B1F8E4 AFAE0014 */ sw $t6, 0x0014($sp) +/* 01F68 80B1F8E8 AFB10018 */ sw $s1, 0x0018($sp) /* 01F6C 80B1F8EC 8E0F02C0 */ lw $t7, 0x02C0($s0) ## 000002C0 /* 01F70 80B1F8F0 02402025 */ or $a0, $s2, $zero ## $a0 = 00000000 -/* 01F74 80B1F8F4 0C0289CF */ jal func_800A273C -/* 01F78 80B1F8F8 AFAF001C */ sw $t7, 0x001C($sp) -/* 01F7C 80B1F8FC 10000028 */ beq $zero, $zero, .L80B1F9A0 +/* 01F74 80B1F8F4 0C0289CF */ jal SkelAnime_DrawSV2 +/* 01F78 80B1F8F8 AFAF001C */ sw $t7, 0x001C($sp) +/* 01F7C 80B1F8FC 10000028 */ beq $zero, $zero, .L80B1F9A0 /* 01F80 80B1F900 AE0202C0 */ sw $v0, 0x02C0($s0) ## 000002C0 .L80B1F904: /* 01F84 80B1F904 8E0302D0 */ lw $v1, 0x02D0($s0) ## 000002D0 @@ -85,11 +85,11 @@ glabel EnTorch2_Draw /* 01FC0 80B1F940 AE0B02D0 */ sw $t3, 0x02D0($s0) ## 000002D0 /* 01FC4 80B1F944 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 /* 01FC8 80B1F948 AC6D0004 */ sw $t5, 0x0004($v1) ## 00000004 -/* 01FCC 80B1F94C 0C00BAF3 */ jal func_8002EBCC +/* 01FCC 80B1F94C 0C00BAF3 */ jal func_8002EBCC /* 01FD0 80B1F950 AC6C0000 */ sw $t4, 0x0000($v1) ## 00000000 /* 01FD4 80B1F954 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 01FD8 80B1F958 02402825 */ or $a1, $s2, $zero ## $a1 = 00000000 -/* 01FDC 80B1F95C 0C00BB60 */ jal func_8002ED80 +/* 01FDC 80B1F95C 0C00BB60 */ jal func_8002ED80 /* 01FE0 80B1F960 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 /* 01FE4 80B1F964 8E2501B8 */ lw $a1, 0x01B8($s1) ## 000001B8 /* 01FE8 80B1F968 8E2601D4 */ lw $a2, 0x01D4($s1) ## 000001D4 @@ -98,25 +98,25 @@ glabel EnTorch2_Draw /* 01FF4 80B1F974 3C0F80B2 */ lui $t7, %hi(func_80B1F7D4) ## $t7 = 80B20000 /* 01FF8 80B1F978 25EFF7D4 */ addiu $t7, $t7, %lo(func_80B1F7D4) ## $t7 = 80B1F7D4 /* 01FFC 80B1F97C 25CEF7A8 */ addiu $t6, $t6, %lo(func_80B1F7A8) ## $t6 = 80B1F7A8 -/* 02000 80B1F980 AFAE0010 */ sw $t6, 0x0010($sp) -/* 02004 80B1F984 AFAF0014 */ sw $t7, 0x0014($sp) -/* 02008 80B1F988 AFB10018 */ sw $s1, 0x0018($sp) +/* 02000 80B1F980 AFAE0010 */ sw $t6, 0x0010($sp) +/* 02004 80B1F984 AFAF0014 */ sw $t7, 0x0014($sp) +/* 02008 80B1F988 AFB10018 */ sw $s1, 0x0018($sp) /* 0200C 80B1F98C 8E1802D0 */ lw $t8, 0x02D0($s0) ## 000002D0 /* 02010 80B1F990 02402025 */ or $a0, $s2, $zero ## $a0 = 00000000 -/* 02014 80B1F994 0C0289CF */ jal func_800A273C -/* 02018 80B1F998 AFB8001C */ sw $t8, 0x001C($sp) +/* 02014 80B1F994 0C0289CF */ jal SkelAnime_DrawSV2 +/* 02018 80B1F998 AFB8001C */ sw $t8, 0x001C($sp) /* 0201C 80B1F99C AE0202D0 */ sw $v0, 0x02D0($s0) ## 000002D0 .L80B1F9A0: /* 02020 80B1F9A0 3C0680B2 */ lui $a2, %hi(D_80B1FA44) ## $a2 = 80B20000 /* 02024 80B1F9A4 24C6FA44 */ addiu $a2, $a2, %lo(D_80B1FA44) ## $a2 = 80B1FA44 /* 02028 80B1F9A8 27A40050 */ addiu $a0, $sp, 0x0050 ## $a0 = FFFFFFE0 /* 0202C 80B1F9AC 8E450000 */ lw $a1, 0x0000($s2) ## 00000000 -/* 02030 80B1F9B0 0C031AD5 */ jal func_800C6B54 +/* 02030 80B1F9B0 0C031AD5 */ jal Graph_CloseDisps /* 02034 80B1F9B4 2407045A */ addiu $a3, $zero, 0x045A ## $a3 = 0000045A -/* 02038 80B1F9B8 8FBF0034 */ lw $ra, 0x0034($sp) -/* 0203C 80B1F9BC 8FB00028 */ lw $s0, 0x0028($sp) -/* 02040 80B1F9C0 8FB1002C */ lw $s1, 0x002C($sp) -/* 02044 80B1F9C4 8FB20030 */ lw $s2, 0x0030($sp) -/* 02048 80B1F9C8 03E00008 */ jr $ra +/* 02038 80B1F9B8 8FBF0034 */ lw $ra, 0x0034($sp) +/* 0203C 80B1F9BC 8FB00028 */ lw $s0, 0x0028($sp) +/* 02040 80B1F9C0 8FB1002C */ lw $s1, 0x002C($sp) +/* 02044 80B1F9C4 8FB20030 */ lw $s2, 0x0030($sp) +/* 02048 80B1F9C8 03E00008 */ jr $ra /* 0204C 80B1F9CC 27BD0070 */ addiu $sp, $sp, 0x0070 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Toryo/EnToryo_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Toryo/EnToryo_Draw.s index bb8f78b498..641488f651 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Toryo/EnToryo_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Toryo/EnToryo_Draw.s @@ -1,11 +1,11 @@ glabel EnToryo_Draw /* 00938 80B20AA8 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 0093C 80B20AAC AFBF0024 */ sw $ra, 0x0024($sp) -/* 00940 80B20AB0 AFA40028 */ sw $a0, 0x0028($sp) -/* 00944 80B20AB4 AFA5002C */ sw $a1, 0x002C($sp) -/* 00948 80B20AB8 0C024F46 */ jal func_80093D18 +/* 0093C 80B20AAC AFBF0024 */ sw $ra, 0x0024($sp) +/* 00940 80B20AB0 AFA40028 */ sw $a0, 0x0028($sp) +/* 00944 80B20AB4 AFA5002C */ sw $a1, 0x002C($sp) +/* 00948 80B20AB8 0C024F46 */ jal func_80093D18 /* 0094C 80B20ABC 8CA40000 */ lw $a0, 0x0000($a1) ## 00000000 -/* 00950 80B20AC0 8FA20028 */ lw $v0, 0x0028($sp) +/* 00950 80B20AC0 8FA20028 */ lw $v0, 0x0028($sp) /* 00954 80B20AC4 3C0F80B2 */ lui $t7, %hi(func_80B20B04) ## $t7 = 80B20000 /* 00958 80B20AC8 3C1880B2 */ lui $t8, %hi(func_80B20B94) ## $t8 = 80B20000 /* 0095C 80B20ACC 8C450150 */ lw $a1, 0x0150($v0) ## 00000150 @@ -13,14 +13,14 @@ glabel EnToryo_Draw /* 00964 80B20AD4 9047014E */ lbu $a3, 0x014E($v0) ## 0000014E /* 00968 80B20AD8 27180B94 */ addiu $t8, $t8, %lo(func_80B20B94) ## $t8 = 80B20B94 /* 0096C 80B20ADC 25EF0B04 */ addiu $t7, $t7, %lo(func_80B20B04) ## $t7 = 80B20B04 -/* 00970 80B20AE0 AFAF0010 */ sw $t7, 0x0010($sp) -/* 00974 80B20AE4 AFB80014 */ sw $t8, 0x0014($sp) -/* 00978 80B20AE8 8FA4002C */ lw $a0, 0x002C($sp) -/* 0097C 80B20AEC 0C0286B2 */ jal func_800A1AC8 -/* 00980 80B20AF0 AFA20018 */ sw $v0, 0x0018($sp) -/* 00984 80B20AF4 8FBF0024 */ lw $ra, 0x0024($sp) +/* 00970 80B20AE0 AFAF0010 */ sw $t7, 0x0010($sp) +/* 00974 80B20AE4 AFB80014 */ sw $t8, 0x0014($sp) +/* 00978 80B20AE8 8FA4002C */ lw $a0, 0x002C($sp) +/* 0097C 80B20AEC 0C0286B2 */ jal SkelAnime_DrawSV +/* 00980 80B20AF0 AFA20018 */ sw $v0, 0x0018($sp) +/* 00984 80B20AF4 8FBF0024 */ lw $ra, 0x0024($sp) /* 00988 80B20AF8 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 0098C 80B20AFC 03E00008 */ jr $ra +/* 0098C 80B20AFC 03E00008 */ jr $ra /* 00990 80B20B00 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Toryo/EnToryo_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Toryo/EnToryo_Init.s index 37ec56c4a9..4aa7328261 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Toryo/EnToryo_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Toryo/EnToryo_Init.s @@ -1,68 +1,68 @@ glabel EnToryo_Init /* 00000 80B20170 27BDFFB0 */ addiu $sp, $sp, 0xFFB0 ## $sp = FFFFFFB0 -/* 00004 80B20174 AFBF002C */ sw $ra, 0x002C($sp) -/* 00008 80B20178 AFB00028 */ sw $s0, 0x0028($sp) -/* 0000C 80B2017C AFA50054 */ sw $a1, 0x0054($sp) +/* 00004 80B20174 AFBF002C */ sw $ra, 0x002C($sp) +/* 00008 80B20178 AFB00028 */ sw $s0, 0x0028($sp) +/* 0000C 80B2017C AFA50054 */ sw $a1, 0x0054($sp) /* 00010 80B20180 84A200A4 */ lh $v0, 0x00A4($a1) ## 000000A4 /* 00014 80B20184 2401002A */ addiu $at, $zero, 0x002A ## $at = 0000002A /* 00018 80B20188 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 0001C 80B2018C 10410026 */ beq $v0, $at, .L80B20228 +/* 0001C 80B2018C 10410026 */ beq $v0, $at, .L80B20228 /* 00020 80B20190 3C038016 */ lui $v1, 0x8016 ## $v1 = 80160000 /* 00024 80B20194 24010052 */ addiu $at, $zero, 0x0052 ## $at = 00000052 -/* 00028 80B20198 10410012 */ beq $v0, $at, .L80B201E4 +/* 00028 80B20198 10410012 */ beq $v0, $at, .L80B201E4 /* 0002C 80B2019C 3C038016 */ lui $v1, 0x8016 ## $v1 = 80160000 /* 00030 80B201A0 2401005A */ addiu $at, $zero, 0x005A ## $at = 0000005A -/* 00034 80B201A4 14410031 */ bne $v0, $at, .L80B2026C +/* 00034 80B201A4 14410031 */ bne $v0, $at, .L80B2026C /* 00038 80B201A8 3C038016 */ lui $v1, 0x8016 ## $v1 = 80160000 /* 0003C 80B201AC 2463E660 */ addiu $v1, $v1, 0xE660 ## $v1 = 8015E660 /* 00040 80B201B0 8C6F0004 */ lw $t7, 0x0004($v1) ## 8015E664 /* 00044 80B201B4 24010011 */ addiu $at, $zero, 0x0011 ## $at = 00000011 /* 00048 80B201B8 24020011 */ addiu $v0, $zero, 0x0011 ## $v0 = 00000011 -/* 0004C 80B201BC 11E00003 */ beq $t7, $zero, .L80B201CC +/* 0004C 80B201BC 11E00003 */ beq $t7, $zero, .L80B201CC /* 00050 80B201C0 00000000 */ nop -/* 00054 80B201C4 10000001 */ beq $zero, $zero, .L80B201CC +/* 00054 80B201C4 10000001 */ beq $zero, $zero, .L80B201CC /* 00058 80B201C8 24020005 */ addiu $v0, $zero, 0x0005 ## $v0 = 00000005 .L80B201CC: -/* 0005C 80B201CC 54410028 */ bnel $v0, $at, .L80B20270 +/* 0005C 80B201CC 54410028 */ bnel $v0, $at, .L80B20270 /* 00060 80B201D0 961801E8 */ lhu $t8, 0x01E8($s0) ## 000001E8 /* 00064 80B201D4 961801E8 */ lhu $t8, 0x01E8($s0) ## 000001E8 /* 00068 80B201D8 37190001 */ ori $t9, $t8, 0x0001 ## $t9 = 00000001 -/* 0006C 80B201DC 10000023 */ beq $zero, $zero, .L80B2026C +/* 0006C 80B201DC 10000023 */ beq $zero, $zero, .L80B2026C /* 00070 80B201E0 A61901E8 */ sh $t9, 0x01E8($s0) ## 000001E8 .L80B201E4: /* 00074 80B201E4 2463E660 */ addiu $v1, $v1, 0xE660 ## $v1 = 8015CCC0 /* 00078 80B201E8 8C680004 */ lw $t0, 0x0004($v1) ## 8015CCC4 /* 0007C 80B201EC 24010005 */ addiu $at, $zero, 0x0005 ## $at = 00000005 /* 00080 80B201F0 24020011 */ addiu $v0, $zero, 0x0011 ## $v0 = 00000011 -/* 00084 80B201F4 11000003 */ beq $t0, $zero, .L80B20204 +/* 00084 80B201F4 11000003 */ beq $t0, $zero, .L80B20204 /* 00088 80B201F8 00000000 */ nop -/* 0008C 80B201FC 10000001 */ beq $zero, $zero, .L80B20204 +/* 0008C 80B201FC 10000001 */ beq $zero, $zero, .L80B20204 /* 00090 80B20200 24020005 */ addiu $v0, $zero, 0x0005 ## $v0 = 00000005 .L80B20204: -/* 00094 80B20204 5441001A */ bnel $v0, $at, .L80B20270 +/* 00094 80B20204 5441001A */ bnel $v0, $at, .L80B20270 /* 00098 80B20208 961801E8 */ lhu $t8, 0x01E8($s0) ## 000001E8 /* 0009C 80B2020C 8C690010 */ lw $t1, 0x0010($v1) ## 8015CCD0 -/* 000A0 80B20210 55200017 */ bnel $t1, $zero, .L80B20270 +/* 000A0 80B20210 55200017 */ bnel $t1, $zero, .L80B20270 /* 000A4 80B20214 961801E8 */ lhu $t8, 0x01E8($s0) ## 000001E8 /* 000A8 80B20218 960A01E8 */ lhu $t2, 0x01E8($s0) ## 000001E8 /* 000AC 80B2021C 354B0002 */ ori $t3, $t2, 0x0002 ## $t3 = 00000002 -/* 000B0 80B20220 10000012 */ beq $zero, $zero, .L80B2026C +/* 000B0 80B20220 10000012 */ beq $zero, $zero, .L80B2026C /* 000B4 80B20224 A60B01E8 */ sh $t3, 0x01E8($s0) ## 000001E8 .L80B20228: /* 000B8 80B20228 2463E660 */ addiu $v1, $v1, 0xE660 ## $v1 = 8015B320 /* 000BC 80B2022C 8C6C0004 */ lw $t4, 0x0004($v1) ## 8015B324 /* 000C0 80B20230 24010005 */ addiu $at, $zero, 0x0005 ## $at = 00000005 /* 000C4 80B20234 24020011 */ addiu $v0, $zero, 0x0011 ## $v0 = 00000011 -/* 000C8 80B20238 11800003 */ beq $t4, $zero, .L80B20248 +/* 000C8 80B20238 11800003 */ beq $t4, $zero, .L80B20248 /* 000CC 80B2023C 00000000 */ nop -/* 000D0 80B20240 10000001 */ beq $zero, $zero, .L80B20248 +/* 000D0 80B20240 10000001 */ beq $zero, $zero, .L80B20248 /* 000D4 80B20244 24020005 */ addiu $v0, $zero, 0x0005 ## $v0 = 00000005 .L80B20248: -/* 000D8 80B20248 54410009 */ bnel $v0, $at, .L80B20270 +/* 000D8 80B20248 54410009 */ bnel $v0, $at, .L80B20270 /* 000DC 80B2024C 961801E8 */ lhu $t8, 0x01E8($s0) ## 000001E8 /* 000E0 80B20250 8C6D0010 */ lw $t5, 0x0010($v1) ## 8015B330 /* 000E4 80B20254 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 000E8 80B20258 55A10005 */ bnel $t5, $at, .L80B20270 +/* 000E8 80B20258 55A10005 */ bnel $t5, $at, .L80B20270 /* 000EC 80B2025C 961801E8 */ lhu $t8, 0x01E8($s0) ## 000001E8 /* 000F0 80B20260 960E01E8 */ lhu $t6, 0x01E8($s0) ## 000001E8 /* 000F4 80B20264 35CF0004 */ ori $t7, $t6, 0x0004 ## $t7 = 00000004 @@ -71,10 +71,10 @@ glabel EnToryo_Init /* 000FC 80B2026C 961801E8 */ lhu $t8, 0x01E8($s0) ## 000001E8 .L80B20270: /* 00100 80B20270 33190007 */ andi $t9, $t8, 0x0007 ## $t9 = 00000000 -/* 00104 80B20274 17200003 */ bne $t9, $zero, .L80B20284 +/* 00104 80B20274 17200003 */ bne $t9, $zero, .L80B20284 /* 00108 80B20278 00000000 */ nop /* 0010C 80B2027C 0C00B55C */ jal Actor_Kill - + /* 00110 80B20280 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 .L80B20284: /* 00114 80B20284 3C068003 */ lui $a2, 0x8003 ## $a2 = 80030000 @@ -82,68 +82,68 @@ glabel EnToryo_Init /* 0011C 80B2028C 260400B4 */ addiu $a0, $s0, 0x00B4 ## $a0 = 000000B4 /* 00120 80B20290 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 /* 00124 80B20294 0C00AC78 */ jal ActorShape_Init - + /* 00128 80B20298 3C074228 */ lui $a3, 0x4228 ## $a3 = 42280000 /* 0012C 80B2029C 2605014C */ addiu $a1, $s0, 0x014C ## $a1 = 0000014C /* 00130 80B202A0 3C060600 */ lui $a2, 0x0600 ## $a2 = 06000000 /* 00134 80B202A4 26080214 */ addiu $t0, $s0, 0x0214 ## $t0 = 00000214 /* 00138 80B202A8 2609027A */ addiu $t1, $s0, 0x027A ## $t1 = 0000027A /* 0013C 80B202AC 240A0011 */ addiu $t2, $zero, 0x0011 ## $t2 = 00000011 -/* 00140 80B202B0 AFAA0018 */ sw $t2, 0x0018($sp) -/* 00144 80B202B4 AFA90014 */ sw $t1, 0x0014($sp) -/* 00148 80B202B8 AFA80010 */ sw $t0, 0x0010($sp) +/* 00140 80B202B0 AFAA0018 */ sw $t2, 0x0018($sp) +/* 00144 80B202B4 AFA90014 */ sw $t1, 0x0014($sp) +/* 00148 80B202B8 AFA80010 */ sw $t0, 0x0010($sp) /* 0014C 80B202BC 24C67150 */ addiu $a2, $a2, 0x7150 ## $a2 = 06007150 -/* 00150 80B202C0 AFA50038 */ sw $a1, 0x0038($sp) -/* 00154 80B202C4 8FA40054 */ lw $a0, 0x0054($sp) -/* 00158 80B202C8 0C0291BE */ jal func_800A46F8 +/* 00150 80B202C0 AFA50038 */ sw $a1, 0x0038($sp) +/* 00154 80B202C4 8FA40054 */ lw $a0, 0x0054($sp) +/* 00158 80B202C8 0C0291BE */ jal SkelAnime_InitSV /* 0015C 80B202CC 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 /* 00160 80B202D0 26050194 */ addiu $a1, $s0, 0x0194 ## $a1 = 00000194 -/* 00164 80B202D4 AFA50034 */ sw $a1, 0x0034($sp) +/* 00164 80B202D4 AFA50034 */ sw $a1, 0x0034($sp) /* 00168 80B202D8 0C0170D9 */ jal ActorCollider_AllocCylinder - -/* 0016C 80B202DC 8FA40054 */ lw $a0, 0x0054($sp) + +/* 0016C 80B202DC 8FA40054 */ lw $a0, 0x0054($sp) /* 00170 80B202E0 3C0780B2 */ lui $a3, %hi(D_80B20C00) ## $a3 = 80B20000 -/* 00174 80B202E4 8FA50034 */ lw $a1, 0x0034($sp) +/* 00174 80B202E4 8FA50034 */ lw $a1, 0x0034($sp) /* 00178 80B202E8 24E70C00 */ addiu $a3, $a3, %lo(D_80B20C00) ## $a3 = 80B20C00 -/* 0017C 80B202EC 8FA40054 */ lw $a0, 0x0054($sp) +/* 0017C 80B202EC 8FA40054 */ lw $a0, 0x0054($sp) /* 00180 80B202F0 0C01712B */ jal ActorCollider_InitCylinder - + /* 00184 80B202F4 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 00188 80B202F8 3C0580B2 */ lui $a1, %hi(D_80B20C38) ## $a1 = 80B20000 /* 0018C 80B202FC 3C0680B2 */ lui $a2, %hi(D_80B20C2C) ## $a2 = 80B20000 /* 00190 80B20300 24C60C2C */ addiu $a2, $a2, %lo(D_80B20C2C) ## $a2 = 80B20C2C /* 00194 80B20304 24A50C38 */ addiu $a1, $a1, %lo(D_80B20C38) ## $a1 = 80B20C38 -/* 00198 80B20308 0C0187BF */ jal func_80061EFC +/* 00198 80B20308 0C0187BF */ jal func_80061EFC /* 0019C 80B2030C 26040098 */ addiu $a0, $s0, 0x0098 ## $a0 = 00000098 /* 001A0 80B20310 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 /* 001A4 80B20314 240B0004 */ addiu $t3, $zero, 0x0004 ## $t3 = 00000004 -/* 001A8 80B20318 AFAB0014 */ sw $t3, 0x0014($sp) -/* 001AC 80B2031C 44060000 */ mfc1 $a2, $f0 -/* 001B0 80B20320 44070000 */ mfc1 $a3, $f0 -/* 001B4 80B20324 8FA40054 */ lw $a0, 0x0054($sp) +/* 001A8 80B20318 AFAB0014 */ sw $t3, 0x0014($sp) +/* 001AC 80B2031C 44060000 */ mfc1 $a2, $f0 +/* 001B0 80B20320 44070000 */ mfc1 $a3, $f0 +/* 001B4 80B20324 8FA40054 */ lw $a0, 0x0054($sp) /* 001B8 80B20328 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 001BC 80B2032C 0C00B92D */ jal func_8002E4B4 -/* 001C0 80B20330 E7A00010 */ swc1 $f0, 0x0010($sp) +/* 001BC 80B2032C 0C00B92D */ jal func_8002E4B4 +/* 001C0 80B20330 E7A00010 */ swc1 $f0, 0x0010($sp) /* 001C4 80B20334 3C0380B2 */ lui $v1, %hi(D_80B20C58) ## $v1 = 80B20000 /* 001C8 80B20338 24630C58 */ addiu $v1, $v1, %lo(D_80B20C58) ## $v1 = 80B20C58 /* 001CC 80B2033C 0C028800 */ jal SkelAnime_GetFrameCount - + /* 001D0 80B20340 8C640000 */ lw $a0, 0x0000($v1) ## 80B20C58 /* 001D4 80B20344 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 001D8 80B20348 3C0380B2 */ lui $v1, %hi(D_80B20C58) ## $v1 = 80B20000 /* 001DC 80B2034C 24630C58 */ addiu $v1, $v1, %lo(D_80B20C58) ## $v1 = 80B20C58 -/* 001E0 80B20350 468021A0 */ cvt.s.w $f6, $f4 +/* 001E0 80B20350 468021A0 */ cvt.s.w $f6, $f4 /* 001E4 80B20354 906C0008 */ lbu $t4, 0x0008($v1) ## 80B20C60 /* 001E8 80B20358 C468000C */ lwc1 $f8, 0x000C($v1) ## 80B20C64 /* 001EC 80B2035C 8C650000 */ lw $a1, 0x0000($v1) ## 80B20C58 -/* 001F0 80B20360 8FA40038 */ lw $a0, 0x0038($sp) +/* 001F0 80B20360 8FA40038 */ lw $a0, 0x0038($sp) /* 001F4 80B20364 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 001F8 80B20368 E7A60010 */ swc1 $f6, 0x0010($sp) +/* 001F8 80B20368 E7A60010 */ swc1 $f6, 0x0010($sp) /* 001FC 80B2036C 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 00200 80B20370 AFAC0014 */ sw $t4, 0x0014($sp) -/* 00204 80B20374 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 00208 80B20378 E7A80018 */ swc1 $f8, 0x0018($sp) +/* 00200 80B20370 AFAC0014 */ sw $t4, 0x0014($sp) +/* 00204 80B20374 0C029468 */ jal SkelAnime_ChangeAnim + +/* 00208 80B20378 E7A80018 */ swc1 $f8, 0x0018($sp) /* 0020C 80B2037C 960D01E8 */ lhu $t5, 0x01E8($s0) ## 000001E8 /* 00210 80B20380 3C1880B2 */ lui $t8, %hi(func_80B20914) ## $t8 = 80B20000 /* 00214 80B20384 240F0006 */ addiu $t7, $zero, 0x0006 ## $t7 = 00000006 @@ -152,10 +152,10 @@ glabel EnToryo_Init /* 00220 80B20390 A60E01E8 */ sh $t6, 0x01E8($s0) ## 000001E8 /* 00224 80B20394 A20F001F */ sb $t7, 0x001F($s0) ## 0000001F /* 00228 80B20398 AE180190 */ sw $t8, 0x0190($s0) ## 00000190 -/* 0022C 80B2039C 8FBF002C */ lw $ra, 0x002C($sp) -/* 00230 80B203A0 8FB00028 */ lw $s0, 0x0028($sp) +/* 0022C 80B2039C 8FBF002C */ lw $ra, 0x002C($sp) +/* 00230 80B203A0 8FB00028 */ lw $s0, 0x0028($sp) /* 00234 80B203A4 27BD0050 */ addiu $sp, $sp, 0x0050 ## $sp = 00000000 -/* 00238 80B203A8 03E00008 */ jr $ra +/* 00238 80B203A8 03E00008 */ jr $ra /* 0023C 80B203AC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Toryo/func_80B206A0.s b/asm/non_matchings/overlays/actors/ovl_En_Toryo/func_80B206A0.s index 6ddc98644c..dc518ab80d 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Toryo/func_80B206A0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Toryo/func_80B206A0.s @@ -3,7 +3,7 @@ glabel func_80B206A0 /* 00534 80B206A4 AFA40018 */ sw $a0, 0x0018($sp) /* 00538 80B206A8 AFBF0014 */ sw $ra, 0x0014($sp) /* 0053C 80B206AC 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 00540 80B206B0 0C01B0D8 */ jal func_8006C360 +/* 00540 80B206B0 0C01B0D8 */ jal Text_GetFaceReaction /* 00544 80B206B4 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 00548 80B206B8 14400026 */ bne $v0, $zero, .L80B20754 /* 0054C 80B206BC 00402025 */ or $a0, $v0, $zero ## $a0 = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Tp/EnTp_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Tp/EnTp_Draw.s index 9dbfaf5f22..dbf2542bb3 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Tp/EnTp_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Tp/EnTp_Draw.s @@ -8,7 +8,7 @@ glabel EnTp_Draw /* 019E4 80B227C4 24C62B40 */ addiu $a2, $a2, %lo(D_80B22B40) ## $a2 = 80B22B40 /* 019E8 80B227C8 27A40044 */ addiu $a0, $sp, 0x0044 ## $a0 = FFFFFFE4 /* 019EC 80B227CC 240705AB */ addiu $a3, $zero, 0x05AB ## $a3 = 000005AB -/* 019F0 80B227D0 0C031AB1 */ jal func_800C6AC4 +/* 019F0 80B227D0 0C031AB1 */ jal Graph_OpenDisps /* 019F4 80B227D4 AFA50054 */ sw $a1, 0x0054($sp) /* 019F8 80B227D8 8FAF0060 */ lw $t7, 0x0060($sp) /* 019FC 80B227DC 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 @@ -160,7 +160,7 @@ glabel EnTp_Draw /* 01C38 80B22A18 24C62B70 */ addiu $a2, $a2, %lo(D_80B22B70) ## $a2 = 80B22B70 /* 01C3C 80B22A1C 27A40044 */ addiu $a0, $sp, 0x0044 ## $a0 = FFFFFFE4 /* 01C40 80B22A20 240705D7 */ addiu $a3, $zero, 0x05D7 ## $a3 = 000005D7 -/* 01C44 80B22A24 0C031AD5 */ jal func_800C6B54 +/* 01C44 80B22A24 0C031AD5 */ jal Graph_CloseDisps /* 01C48 80B22A28 8D850000 */ lw $a1, 0x0000($t4) ## 00000000 /* 01C4C 80B22A2C 8FA30060 */ lw $v1, 0x0060($sp) /* 01C50 80B22A30 2401000B */ addiu $at, $zero, 0x000B ## $at = 0000000B diff --git a/asm/non_matchings/overlays/actors/ovl_En_Tr/EnTr_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Tr/EnTr_Draw.s index b448ab9814..16306967d6 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Tr/EnTr_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Tr/EnTr_Draw.s @@ -1,35 +1,35 @@ glabel EnTr_Draw /* 011B4 80B23EA4 27BDFFA8 */ addiu $sp, $sp, 0xFFA8 ## $sp = FFFFFFA8 -/* 011B8 80B23EA8 AFBF002C */ sw $ra, 0x002C($sp) -/* 011BC 80B23EAC AFB10028 */ sw $s1, 0x0028($sp) -/* 011C0 80B23EB0 AFB00024 */ sw $s0, 0x0024($sp) +/* 011B8 80B23EA8 AFBF002C */ sw $ra, 0x002C($sp) +/* 011BC 80B23EAC AFB10028 */ sw $s1, 0x0028($sp) +/* 011C0 80B23EB0 AFB00024 */ sw $s0, 0x0024($sp) /* 011C4 80B23EB4 90AE1D6C */ lbu $t6, 0x1D6C($a1) ## 00001D6C /* 011C8 80B23EB8 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 011CC 80B23EBC 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 -/* 011D0 80B23EC0 11C0000B */ beq $t6, $zero, .L80B23EF0 +/* 011D0 80B23EC0 11C0000B */ beq $t6, $zero, .L80B23EF0 /* 011D4 80B23EC4 00000000 */ nop /* 011D8 80B23EC8 848F02D8 */ lh $t7, 0x02D8($a0) ## 000002D8 /* 011DC 80B23ECC 3C098003 */ lui $t1, 0x8003 ## $t1 = 80030000 /* 011E0 80B23ED0 3C0680B2 */ lui $a2, %hi(D_80B24414) ## $a2 = 80B20000 -/* 011E4 80B23ED4 000FC080 */ sll $t8, $t7, 2 -/* 011E8 80B23ED8 00B8C821 */ addu $t9, $a1, $t8 +/* 011E4 80B23ED4 000FC080 */ sll $t8, $t7, 2 +/* 011E8 80B23ED8 00B8C821 */ addu $t9, $a1, $t8 /* 011EC 80B23EDC 8F281D8C */ lw $t0, 0x1D8C($t9) ## 00001D8C /* 011F0 80B23EE0 2529B5EC */ addiu $t1, $t1, 0xB5EC ## $t1 = 8002B5EC /* 011F4 80B23EE4 24C64414 */ addiu $a2, $a2, %lo(D_80B24414) ## $a2 = 80B24414 -/* 011F8 80B23EE8 15000003 */ bne $t0, $zero, .L80B23EF8 +/* 011F8 80B23EE8 15000003 */ bne $t0, $zero, .L80B23EF8 /* 011FC 80B23EEC 27A4003C */ addiu $a0, $sp, 0x003C ## $a0 = FFFFFFE4 .L80B23EF0: -/* 01200 80B23EF0 10000035 */ beq $zero, $zero, .L80B23FC8 +/* 01200 80B23EF0 10000035 */ beq $zero, $zero, .L80B23FC8 /* 01204 80B23EF4 AE0000C0 */ sw $zero, 0x00C0($s0) ## 000000C0 .L80B23EF8: /* 01208 80B23EF8 AE0900C0 */ sw $t1, 0x00C0($s0) ## 000000C0 /* 0120C 80B23EFC 8E250000 */ lw $a1, 0x0000($s1) ## 00000000 /* 01210 80B23F00 24070348 */ addiu $a3, $zero, 0x0348 ## $a3 = 00000348 -/* 01214 80B23F04 0C031AB1 */ jal func_800C6AC4 -/* 01218 80B23F08 AFA5004C */ sw $a1, 0x004C($sp) -/* 0121C 80B23F0C 0C0250F2 */ jal func_800943C8 +/* 01214 80B23F04 0C031AB1 */ jal Graph_OpenDisps +/* 01218 80B23F08 AFA5004C */ sw $a1, 0x004C($sp) +/* 0121C 80B23F0C 0C0250F2 */ jal func_800943C8 /* 01220 80B23F10 8E240000 */ lw $a0, 0x0000($s1) ## 00000000 -/* 01224 80B23F14 8FA5004C */ lw $a1, 0x004C($sp) +/* 01224 80B23F14 8FA5004C */ lw $a1, 0x004C($sp) /* 01228 80B23F18 3C0BDB06 */ lui $t3, 0xDB06 ## $t3 = DB060000 /* 0122C 80B23F1C 356B0020 */ ori $t3, $t3, 0x0020 ## $t3 = DB060020 /* 01230 80B23F20 8CA302C0 */ lw $v1, 0x02C0($a1) ## 000002C0 @@ -41,44 +41,44 @@ glabel EnTr_Draw /* 01248 80B23F38 860C02E0 */ lh $t4, 0x02E0($s0) ## 000002E0 /* 0124C 80B23F3C 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 /* 01250 80B23F40 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF -/* 01254 80B23F44 000C6880 */ sll $t5, $t4, 2 -/* 01258 80B23F48 008D2021 */ addu $a0, $a0, $t5 -/* 0125C 80B23F4C 8C8443D0 */ lw $a0, %lo(D_80B243D0)($a0) +/* 01254 80B23F44 000C6880 */ sll $t5, $t4, 2 +/* 01258 80B23F48 008D2021 */ addu $a0, $a0, $t5 +/* 0125C 80B23F4C 8C8443D0 */ lw $a0, %lo(D_80B243D0)($a0) /* 01260 80B23F50 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 /* 01264 80B23F54 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 01268 80B23F58 00047900 */ sll $t7, $a0, 4 -/* 0126C 80B23F5C 000FC702 */ srl $t8, $t7, 28 -/* 01270 80B23F60 0018C880 */ sll $t9, $t8, 2 -/* 01274 80B23F64 01194021 */ addu $t0, $t0, $t9 +/* 01268 80B23F58 00047900 */ sll $t7, $a0, 4 +/* 0126C 80B23F5C 000FC702 */ srl $t8, $t7, 28 +/* 01270 80B23F60 0018C880 */ sll $t9, $t8, 2 +/* 01274 80B23F64 01194021 */ addu $t0, $t0, $t9 /* 01278 80B23F68 8D086FA8 */ lw $t0, 0x6FA8($t0) ## 80166FA8 -/* 0127C 80B23F6C 00817024 */ and $t6, $a0, $at +/* 0127C 80B23F6C 00817024 */ and $t6, $a0, $at /* 01280 80B23F70 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 01284 80B23F74 01C84821 */ addu $t1, $t6, $t0 -/* 01288 80B23F78 01215021 */ addu $t2, $t1, $at +/* 01284 80B23F74 01C84821 */ addu $t1, $t6, $t0 +/* 01288 80B23F78 01215021 */ addu $t2, $t1, $at /* 0128C 80B23F7C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01290 80B23F80 0C00BAF3 */ jal func_8002EBCC +/* 01290 80B23F80 0C00BAF3 */ jal func_8002EBCC /* 01294 80B23F84 AC6A0004 */ sw $t2, 0x0004($v1) ## 00000004 /* 01298 80B23F88 8E050150 */ lw $a1, 0x0150($s0) ## 00000150 /* 0129C 80B23F8C 8E06016C */ lw $a2, 0x016C($s0) ## 0000016C /* 012A0 80B23F90 9207014E */ lbu $a3, 0x014E($s0) ## 0000014E /* 012A4 80B23F94 3C0B80B2 */ lui $t3, %hi(func_80B23D74) ## $t3 = 80B20000 /* 012A8 80B23F98 256B3D74 */ addiu $t3, $t3, %lo(func_80B23D74) ## $t3 = 80B23D74 -/* 012AC 80B23F9C AFAB0010 */ sw $t3, 0x0010($sp) -/* 012B0 80B23FA0 AFB00018 */ sw $s0, 0x0018($sp) -/* 012B4 80B23FA4 AFA00014 */ sw $zero, 0x0014($sp) -/* 012B8 80B23FA8 0C0286B2 */ jal func_800A1AC8 +/* 012AC 80B23F9C AFAB0010 */ sw $t3, 0x0010($sp) +/* 012B0 80B23FA0 AFB00018 */ sw $s0, 0x0018($sp) +/* 012B4 80B23FA4 AFA00014 */ sw $zero, 0x0014($sp) +/* 012B8 80B23FA8 0C0286B2 */ jal SkelAnime_DrawSV /* 012BC 80B23FAC 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 012C0 80B23FB0 3C0680B2 */ lui $a2, %hi(D_80B24424) ## $a2 = 80B20000 /* 012C4 80B23FB4 24C64424 */ addiu $a2, $a2, %lo(D_80B24424) ## $a2 = 80B24424 /* 012C8 80B23FB8 27A4003C */ addiu $a0, $sp, 0x003C ## $a0 = FFFFFFE4 /* 012CC 80B23FBC 8E250000 */ lw $a1, 0x0000($s1) ## 00000000 -/* 012D0 80B23FC0 0C031AD5 */ jal func_800C6B54 +/* 012D0 80B23FC0 0C031AD5 */ jal Graph_CloseDisps /* 012D4 80B23FC4 24070356 */ addiu $a3, $zero, 0x0356 ## $a3 = 00000356 .L80B23FC8: -/* 012D8 80B23FC8 8FBF002C */ lw $ra, 0x002C($sp) -/* 012DC 80B23FCC 8FB00024 */ lw $s0, 0x0024($sp) -/* 012E0 80B23FD0 8FB10028 */ lw $s1, 0x0028($sp) -/* 012E4 80B23FD4 03E00008 */ jr $ra +/* 012D8 80B23FC8 8FBF002C */ lw $ra, 0x002C($sp) +/* 012DC 80B23FCC 8FB00024 */ lw $s0, 0x0024($sp) +/* 012E0 80B23FD0 8FB10028 */ lw $s1, 0x0028($sp) +/* 012E4 80B23FD4 03E00008 */ jr $ra /* 012E8 80B23FD8 27BD0058 */ addiu $sp, $sp, 0x0058 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Tr/EnTr_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Tr/EnTr_Init.s index 2168ec601d..0ca754b3ab 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Tr/EnTr_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Tr/EnTr_Init.s @@ -1,37 +1,37 @@ glabel EnTr_Init /* 00008 80B22CF8 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 0000C 80B22CFC AFB00024 */ sw $s0, 0x0024($sp) +/* 0000C 80B22CFC AFB00024 */ sw $s0, 0x0024($sp) /* 00010 80B22D00 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00014 80B22D04 AFBF002C */ sw $ra, 0x002C($sp) -/* 00018 80B22D08 AFA50034 */ sw $a1, 0x0034($sp) +/* 00014 80B22D04 AFBF002C */ sw $ra, 0x002C($sp) +/* 00018 80B22D08 AFA50034 */ sw $a1, 0x0034($sp) /* 0001C 80B22D0C 3C068003 */ lui $a2, 0x8003 ## $a2 = 80030000 -/* 00020 80B22D10 AFB10028 */ sw $s1, 0x0028($sp) +/* 00020 80B22D10 AFB10028 */ sw $s1, 0x0028($sp) /* 00024 80B22D14 24C6B5EC */ addiu $a2, $a2, 0xB5EC ## $a2 = 8002B5EC /* 00028 80B22D18 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 /* 0002C 80B22D1C 248400B4 */ addiu $a0, $a0, 0x00B4 ## $a0 = 000000B4 /* 00030 80B22D20 0C00AC78 */ jal ActorShape_Init - + /* 00034 80B22D24 3C0741F0 */ lui $a3, 0x41F0 ## $a3 = 41F00000 /* 00038 80B22D28 3C0580B2 */ lui $a1, %hi(func_80B22F1C) ## $a1 = 80B20000 /* 0003C 80B22D2C 24A52F1C */ addiu $a1, $a1, %lo(func_80B22F1C) ## $a1 = 80B22F1C -/* 00040 80B22D30 0C2C8B3C */ jal func_80B22CF0 +/* 00040 80B22D30 0C2C8B3C */ jal func_80B22CF0 /* 00044 80B22D34 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 00048 80B22D38 3C053C23 */ lui $a1, 0x3C23 ## $a1 = 3C230000 /* 0004C 80B22D3C A60002D4 */ sh $zero, 0x02D4($s0) ## 000002D4 /* 00050 80B22D40 AE00011C */ sw $zero, 0x011C($s0) ## 0000011C /* 00054 80B22D44 34A5D70A */ ori $a1, $a1, 0xD70A ## $a1 = 3C23D70A /* 00058 80B22D48 0C00B58B */ jal Actor_SetScale - + /* 0005C 80B22D4C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 00060 80B22D50 8602001C */ lh $v0, 0x001C($s0) ## 0000001C /* 00064 80B22D54 2611014C */ addiu $s1, $s0, 0x014C ## $s1 = 0000014C /* 00068 80B22D58 02202825 */ or $a1, $s1, $zero ## $a1 = 0000014C -/* 0006C 80B22D5C 10400006 */ beq $v0, $zero, .L80B22D78 -/* 00070 80B22D60 8FA40034 */ lw $a0, 0x0034($sp) +/* 0006C 80B22D5C 10400006 */ beq $v0, $zero, .L80B22D78 +/* 00070 80B22D60 8FA40034 */ lw $a0, 0x0034($sp) /* 00074 80B22D64 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 00078 80B22D68 1041001A */ beq $v0, $at, .L80B22DD4 -/* 0007C 80B22D6C 8FA40034 */ lw $a0, 0x0034($sp) -/* 00080 80B22D70 10000031 */ beq $zero, $zero, .L80B22E38 +/* 00078 80B22D68 1041001A */ beq $v0, $at, .L80B22DD4 +/* 0007C 80B22D6C 8FA40034 */ lw $a0, 0x0034($sp) +/* 00080 80B22D70 10000031 */ beq $zero, $zero, .L80B22E38 /* 00084 80B22D74 3C0480B2 */ lui $a0, %hi(D_80B24400) ## $a0 = 80B20000 .L80B22D78: /* 00088 80B22D78 3C060601 */ lui $a2, 0x0601 ## $a2 = 06010000 @@ -39,23 +39,23 @@ glabel EnTr_Init /* 00090 80B22D80 260E0190 */ addiu $t6, $s0, 0x0190 ## $t6 = 00000190 /* 00094 80B22D84 260F0232 */ addiu $t7, $s0, 0x0232 ## $t7 = 00000232 /* 00098 80B22D88 2418001B */ addiu $t8, $zero, 0x001B ## $t8 = 0000001B -/* 0009C 80B22D8C AFB80018 */ sw $t8, 0x0018($sp) -/* 000A0 80B22D90 AFAF0014 */ sw $t7, 0x0014($sp) -/* 000A4 80B22D94 AFAE0010 */ sw $t6, 0x0010($sp) +/* 0009C 80B22D8C AFB80018 */ sw $t8, 0x0018($sp) +/* 000A0 80B22D90 AFAF0014 */ sw $t7, 0x0014($sp) +/* 000A4 80B22D94 AFAE0010 */ sw $t6, 0x0010($sp) /* 000A8 80B22D98 24E73FC8 */ addiu $a3, $a3, 0x3FC8 ## $a3 = 06003FC8 -/* 000AC 80B22D9C 0C0291BE */ jal func_800A46F8 +/* 000AC 80B22D9C 0C0291BE */ jal SkelAnime_InitSV /* 000B0 80B22DA0 24C61688 */ addiu $a2, $a2, 0x1688 ## $a2 = 06011688 /* 000B4 80B22DA4 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 000B8 80B22DA8 24A53FC8 */ addiu $a1, $a1, 0x3FC8 ## $a1 = 06003FC8 -/* 000BC 80B22DAC 0C02947A */ jal func_800A51E8 +/* 000BC 80B22DAC 0C02947A */ jal SkelAnime_ChangeAnimDefaultStop /* 000C0 80B22DB0 02202025 */ or $a0, $s1, $zero ## $a0 = 0000014C /* 000C4 80B22DB4 3C0580B2 */ lui $a1, %hi(func_80B23A88) ## $a1 = 80B20000 /* 000C8 80B22DB8 AE0002E4 */ sw $zero, 0x02E4($s0) ## 000002E4 /* 000CC 80B22DBC 24A53A88 */ addiu $a1, $a1, %lo(func_80B23A88) ## $a1 = 80B23A88 -/* 000D0 80B22DC0 0C2C8B3C */ jal func_80B22CF0 +/* 000D0 80B22DC0 0C2C8B3C */ jal func_80B22CF0 /* 000D4 80B22DC4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 000D8 80B22DC8 24190003 */ addiu $t9, $zero, 0x0003 ## $t9 = 00000003 -/* 000DC 80B22DCC 1000001F */ beq $zero, $zero, .L80B22E4C +/* 000DC 80B22DCC 1000001F */ beq $zero, $zero, .L80B22E4C /* 000E0 80B22DD0 A61902D8 */ sh $t9, 0x02D8($s0) ## 000002D8 .L80B22DD4: /* 000E4 80B22DD4 2611014C */ addiu $s1, $s0, 0x014C ## $s1 = 0000014C @@ -64,37 +64,37 @@ glabel EnTr_Init /* 000F0 80B22DE0 26080190 */ addiu $t0, $s0, 0x0190 ## $t0 = 00000190 /* 000F4 80B22DE4 26090232 */ addiu $t1, $s0, 0x0232 ## $t1 = 00000232 /* 000F8 80B22DE8 240A001B */ addiu $t2, $zero, 0x001B ## $t2 = 0000001B -/* 000FC 80B22DEC AFAA0018 */ sw $t2, 0x0018($sp) -/* 00100 80B22DF0 AFA90014 */ sw $t1, 0x0014($sp) -/* 00104 80B22DF4 AFA80010 */ sw $t0, 0x0010($sp) +/* 000FC 80B22DEC AFAA0018 */ sw $t2, 0x0018($sp) +/* 00100 80B22DF0 AFA90014 */ sw $t1, 0x0014($sp) +/* 00104 80B22DF4 AFA80010 */ sw $t0, 0x0010($sp) /* 00108 80B22DF8 24E71CDC */ addiu $a3, $a3, 0x1CDC ## $a3 = 06001CDC /* 0010C 80B22DFC 24C6C530 */ addiu $a2, $a2, 0xC530 ## $a2 = 0600C530 -/* 00110 80B22E00 0C0291BE */ jal func_800A46F8 +/* 00110 80B22E00 0C0291BE */ jal SkelAnime_InitSV /* 00114 80B22E04 02202825 */ or $a1, $s1, $zero ## $a1 = 0000014C /* 00118 80B22E08 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 0011C 80B22E0C 24A51CDC */ addiu $a1, $a1, 0x1CDC ## $a1 = 06001CDC -/* 00120 80B22E10 0C02947A */ jal func_800A51E8 +/* 00120 80B22E10 0C02947A */ jal SkelAnime_ChangeAnimDefaultStop /* 00124 80B22E14 02202025 */ or $a0, $s1, $zero ## $a0 = 0000014C /* 00128 80B22E18 3C0580B2 */ lui $a1, %hi(func_80B23A88) ## $a1 = 80B20000 /* 0012C 80B22E1C AE0002E4 */ sw $zero, 0x02E4($s0) ## 000002E4 /* 00130 80B22E20 24A53A88 */ addiu $a1, $a1, %lo(func_80B23A88) ## $a1 = 80B23A88 -/* 00134 80B22E24 0C2C8B3C */ jal func_80B22CF0 +/* 00134 80B22E24 0C2C8B3C */ jal func_80B22CF0 /* 00138 80B22E28 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 0013C 80B22E2C 240B0002 */ addiu $t3, $zero, 0x0002 ## $t3 = 00000002 -/* 00140 80B22E30 10000006 */ beq $zero, $zero, .L80B22E4C +/* 00140 80B22E30 10000006 */ beq $zero, $zero, .L80B22E4C /* 00144 80B22E34 A60B02D8 */ sh $t3, 0x02D8($s0) ## 000002D8 .L80B22E38: /* 00148 80B22E38 3C0580B2 */ lui $a1, %hi(D_80B24404) ## $a1 = 80B20000 /* 0014C 80B22E3C 24A54404 */ addiu $a1, $a1, %lo(D_80B24404) ## $a1 = 80B24404 /* 00150 80B22E40 24844400 */ addiu $a0, $a0, %lo(D_80B24400) ## $a0 = 00004400 /* 00154 80B22E44 0C0007FC */ jal __assert - + /* 00158 80B22E48 24060115 */ addiu $a2, $zero, 0x0115 ## $a2 = 00000115 .L80B22E4C: -/* 0015C 80B22E4C 8FBF002C */ lw $ra, 0x002C($sp) -/* 00160 80B22E50 8FB00024 */ lw $s0, 0x0024($sp) -/* 00164 80B22E54 8FB10028 */ lw $s1, 0x0028($sp) -/* 00168 80B22E58 03E00008 */ jr $ra +/* 0015C 80B22E4C 8FBF002C */ lw $ra, 0x002C($sp) +/* 00160 80B22E50 8FB00024 */ lw $s0, 0x0024($sp) +/* 00164 80B22E54 8FB10028 */ lw $s1, 0x0028($sp) +/* 00168 80B22E58 03E00008 */ jr $ra /* 0016C 80B22E5C 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Tr/EnTr_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Tr/EnTr_Update.s index 9ed678ec85..6291d8cc2b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Tr/EnTr_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Tr/EnTr_Update.s @@ -1,92 +1,92 @@ glabel EnTr_Update /* 00ECC 80B23BBC 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 /* 00ED0 80B23BC0 27BDFFB8 */ addiu $sp, $sp, 0xFFB8 ## $sp = FFFFFFB8 -/* 00ED4 80B23BC4 AFB00028 */ sw $s0, 0x0028($sp) +/* 00ED4 80B23BC4 AFB00028 */ sw $s0, 0x0028($sp) /* 00ED8 80B23BC8 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00EDC 80B23BCC AFBF002C */ sw $ra, 0x002C($sp) -/* 00EE0 80B23BD0 AFA5004C */ sw $a1, 0x004C($sp) +/* 00EDC 80B23BCC AFBF002C */ sw $ra, 0x002C($sp) +/* 00EE0 80B23BD0 AFA5004C */ sw $a1, 0x004C($sp) /* 00EE4 80B23BD4 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 /* 00EE8 80B23BD8 240E0005 */ addiu $t6, $zero, 0x0005 ## $t6 = 00000005 -/* 00EEC 80B23BDC 44060000 */ mfc1 $a2, $f0 -/* 00EF0 80B23BE0 44070000 */ mfc1 $a3, $f0 -/* 00EF4 80B23BE4 AFAE0014 */ sw $t6, 0x0014($sp) +/* 00EEC 80B23BDC 44060000 */ mfc1 $a2, $f0 +/* 00EF0 80B23BE0 44070000 */ mfc1 $a3, $f0 +/* 00EF4 80B23BE4 AFAE0014 */ sw $t6, 0x0014($sp) /* 00EF8 80B23BE8 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 00EFC 80B23BEC 0C00B92D */ jal func_8002E4B4 -/* 00F00 80B23BF0 E7A00010 */ swc1 $f0, 0x0010($sp) +/* 00EFC 80B23BEC 0C00B92D */ jal func_8002E4B4 +/* 00F00 80B23BF0 E7A00010 */ swc1 $f0, 0x0010($sp) /* 00F04 80B23BF4 8E1902DC */ lw $t9, 0x02DC($s0) ## 000002DC /* 00F08 80B23BF8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00F0C 80B23BFC 8FA5004C */ lw $a1, 0x004C($sp) -/* 00F10 80B23C00 0320F809 */ jalr $ra, $t9 +/* 00F0C 80B23BFC 8FA5004C */ lw $a1, 0x004C($sp) +/* 00F10 80B23C00 0320F809 */ jalr $ra, $t9 /* 00F14 80B23C04 00000000 */ nop /* 00F18 80B23C08 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C /* 00F1C 80B23C0C 0C02927F */ jal SkelAnime_FrameUpdateMatrix - -/* 00F20 80B23C10 AFA40034 */ sw $a0, 0x0034($sp) -/* 00F24 80B23C14 5040003B */ beql $v0, $zero, .L80B23D04 + +/* 00F20 80B23C10 AFA40034 */ sw $a0, 0x0034($sp) +/* 00F24 80B23C14 5040003B */ beql $v0, $zero, .L80B23D04 /* 00F28 80B23C18 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 00F2C 80B23C1C 8E0502E4 */ lw $a1, 0x02E4($s0) ## 000002E4 /* 00F30 80B23C20 3C0F0600 */ lui $t7, 0x0600 ## $t7 = 06000000 /* 00F34 80B23C24 25EF35CC */ addiu $t7, $t7, 0x35CC ## $t7 = 060035CC -/* 00F38 80B23C28 50A00033 */ beql $a1, $zero, .L80B23CF8 +/* 00F38 80B23C28 50A00033 */ beql $a1, $zero, .L80B23CF8 /* 00F3C 80B23C2C 44805000 */ mtc1 $zero, $f10 ## $f10 = 0.00 -/* 00F40 80B23C30 11E50004 */ beq $t7, $a1, .L80B23C44 +/* 00F40 80B23C30 11E50004 */ beq $t7, $a1, .L80B23C44 /* 00F44 80B23C34 3C180600 */ lui $t8, 0x0600 ## $t8 = 06000000 /* 00F48 80B23C38 271813CC */ addiu $t8, $t8, 0x13CC ## $t8 = 060013CC -/* 00F4C 80B23C3C 17050011 */ bne $t8, $a1, .L80B23C84 +/* 00F4C 80B23C3C 17050011 */ bne $t8, $a1, .L80B23C84 /* 00F50 80B23C40 3C090600 */ lui $t1, 0x0600 ## $t1 = 06000000 .L80B23C44: /* 00F54 80B23C44 8608001C */ lh $t0, 0x001C($s0) ## 0000001C /* 00F58 80B23C48 240539B1 */ addiu $a1, $zero, 0x39B1 ## $a1 = 000039B1 /* 00F5C 80B23C4C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00F60 80B23C50 11000005 */ beq $t0, $zero, .L80B23C68 +/* 00F60 80B23C50 11000005 */ beq $t0, $zero, .L80B23C68 /* 00F64 80B23C54 00000000 */ nop /* 00F68 80B23C58 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 00F6C 80B23C5C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00F70 80B23C60 10000004 */ beq $zero, $zero, .L80B23C74 -/* 00F74 80B23C64 8FA40034 */ lw $a0, 0x0034($sp) +/* 00F70 80B23C60 10000004 */ beq $zero, $zero, .L80B23C74 +/* 00F74 80B23C64 8FA40034 */ lw $a0, 0x0034($sp) .L80B23C68: /* 00F78 80B23C68 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 00F7C 80B23C6C 240539B0 */ addiu $a1, $zero, 0x39B0 ## $a1 = 000039B0 -/* 00F80 80B23C70 8FA40034 */ lw $a0, 0x0034($sp) +/* 00F80 80B23C70 8FA40034 */ lw $a0, 0x0034($sp) .L80B23C74: -/* 00F84 80B23C74 0C0294BE */ jal func_800A52F8 +/* 00F84 80B23C74 0C0294BE */ jal SkelAnime_ChangeAnimDefaultRepeat /* 00F88 80B23C78 8E0502E4 */ lw $a1, 0x02E4($s0) ## 000002E4 -/* 00F8C 80B23C7C 1000001B */ beq $zero, $zero, .L80B23CEC +/* 00F8C 80B23C7C 1000001B */ beq $zero, $zero, .L80B23CEC /* 00F90 80B23C80 00000000 */ nop .L80B23C84: /* 00F94 80B23C84 252949C8 */ addiu $t1, $t1, 0x49C8 ## $t1 = 000049C8 -/* 00F98 80B23C88 15250016 */ bne $t1, $a1, .L80B23CE4 +/* 00F98 80B23C88 15250016 */ bne $t1, $a1, .L80B23CE4 /* 00F9C 80B23C8C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 00FA0 80B23C90 3C0580B2 */ lui $a1, %hi(func_80B22F28) ## $a1 = 80B20000 -/* 00FA4 80B23C94 0C2C8B3C */ jal func_80B22CF0 +/* 00FA4 80B23C94 0C2C8B3C */ jal func_80B22CF0 /* 00FA8 80B23C98 24A52F28 */ addiu $a1, $a1, %lo(func_80B22F28) ## $a1 = 80B22F28 /* 00FAC 80B23C9C 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 /* 00FB0 80B23CA0 0C028800 */ jal SkelAnime_GetFrameCount - + /* 00FB4 80B23CA4 248449C8 */ addiu $a0, $a0, 0x49C8 ## $a0 = 060049C8 /* 00FB8 80B23CA8 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 00FBC 80B23CAC 3C01C0A0 */ lui $at, 0xC0A0 ## $at = C0A00000 /* 00FC0 80B23CB0 44814000 */ mtc1 $at, $f8 ## $f8 = -5.00 -/* 00FC4 80B23CB4 468021A0 */ cvt.s.w $f6, $f4 +/* 00FC4 80B23CB4 468021A0 */ cvt.s.w $f6, $f4 /* 00FC8 80B23CB8 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 00FCC 80B23CBC 24A549C8 */ addiu $a1, $a1, 0x49C8 ## $a1 = 060049C8 -/* 00FD0 80B23CC0 8FA40034 */ lw $a0, 0x0034($sp) +/* 00FD0 80B23CC0 8FA40034 */ lw $a0, 0x0034($sp) /* 00FD4 80B23CC4 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 00FD8 80B23CC8 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 00FDC 80B23CCC E7A60010 */ swc1 $f6, 0x0010($sp) -/* 00FE0 80B23CD0 AFA00014 */ sw $zero, 0x0014($sp) -/* 00FE4 80B23CD4 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 00FE8 80B23CD8 E7A80018 */ swc1 $f8, 0x0018($sp) -/* 00FEC 80B23CDC 10000003 */ beq $zero, $zero, .L80B23CEC +/* 00FDC 80B23CCC E7A60010 */ swc1 $f6, 0x0010($sp) +/* 00FE0 80B23CD0 AFA00014 */ sw $zero, 0x0014($sp) +/* 00FE4 80B23CD4 0C029468 */ jal SkelAnime_ChangeAnim + +/* 00FE8 80B23CD8 E7A80018 */ swc1 $f8, 0x0018($sp) +/* 00FEC 80B23CDC 10000003 */ beq $zero, $zero, .L80B23CEC /* 00FF0 80B23CE0 00000000 */ nop .L80B23CE4: -/* 00FF4 80B23CE4 0C0294BE */ jal func_800A52F8 -/* 00FF8 80B23CE8 8FA40034 */ lw $a0, 0x0034($sp) +/* 00FF4 80B23CE4 0C0294BE */ jal SkelAnime_ChangeAnimDefaultRepeat +/* 00FF8 80B23CE8 8FA40034 */ lw $a0, 0x0034($sp) .L80B23CEC: -/* 00FFC 80B23CEC 10000004 */ beq $zero, $zero, .L80B23D00 +/* 00FFC 80B23CEC 10000004 */ beq $zero, $zero, .L80B23D00 /* 01000 80B23CF0 AE0002E4 */ sw $zero, 0x02E4($s0) ## 000002E4 /* 01004 80B23CF4 44805000 */ mtc1 $zero, $f10 ## $f10 = 0.00 .L80B23CF8: @@ -96,38 +96,38 @@ glabel EnTr_Update /* 01010 80B23D00 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 .L80B23D04: /* 01014 80B23D04 0C00B56E */ jal Actor_SetHeight - + /* 01018 80B23D08 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 /* 0101C 80B23D0C 860302E2 */ lh $v1, 0x02E2($s0) ## 000002E2 /* 01020 80B23D10 2404003C */ addiu $a0, $zero, 0x003C ## $a0 = 0000003C -/* 01024 80B23D14 14600003 */ bne $v1, $zero, .L80B23D24 +/* 01024 80B23D14 14600003 */ bne $v1, $zero, .L80B23D24 /* 01028 80B23D18 246AFFFF */ addiu $t2, $v1, 0xFFFF ## $t2 = FFFFFFFF -/* 0102C 80B23D1C 10000004 */ beq $zero, $zero, .L80B23D30 +/* 0102C 80B23D1C 10000004 */ beq $zero, $zero, .L80B23D30 /* 01030 80B23D20 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 .L80B23D24: /* 01034 80B23D24 A60A02E2 */ sh $t2, 0x02E2($s0) ## 000002E2 /* 01038 80B23D28 860302E2 */ lh $v1, 0x02E2($s0) ## 000002E2 /* 0103C 80B23D2C 00601025 */ or $v0, $v1, $zero ## $v0 = 00000000 .L80B23D30: -/* 01040 80B23D30 54400006 */ bnel $v0, $zero, .L80B23D4C +/* 01040 80B23D30 54400006 */ bnel $v0, $zero, .L80B23D4C /* 01044 80B23D34 A60302E0 */ sh $v1, 0x02E0($s0) ## 000002E0 /* 01048 80B23D38 0C01DF64 */ jal Math_Rand_S16Offset - + /* 0104C 80B23D3C 2405003C */ addiu $a1, $zero, 0x003C ## $a1 = 0000003C /* 01050 80B23D40 A60202E2 */ sh $v0, 0x02E2($s0) ## 000002E2 /* 01054 80B23D44 860302E2 */ lh $v1, 0x02E2($s0) ## 000002E2 /* 01058 80B23D48 A60302E0 */ sh $v1, 0x02E0($s0) ## 000002E0 .L80B23D4C: /* 0105C 80B23D4C 860B02E0 */ lh $t3, 0x02E0($s0) ## 000002E0 -/* 01060 80B23D50 29610003 */ slti $at, $t3, 0x0003 -/* 01064 80B23D54 54200003 */ bnel $at, $zero, .L80B23D64 -/* 01068 80B23D58 8FBF002C */ lw $ra, 0x002C($sp) +/* 01060 80B23D50 29610003 */ slti $at, $t3, 0x0003 +/* 01064 80B23D54 54200003 */ bnel $at, $zero, .L80B23D64 +/* 01068 80B23D58 8FBF002C */ lw $ra, 0x002C($sp) /* 0106C 80B23D5C A60002E0 */ sh $zero, 0x02E0($s0) ## 000002E0 -/* 01070 80B23D60 8FBF002C */ lw $ra, 0x002C($sp) +/* 01070 80B23D60 8FBF002C */ lw $ra, 0x002C($sp) .L80B23D64: -/* 01074 80B23D64 8FB00028 */ lw $s0, 0x0028($sp) +/* 01074 80B23D64 8FB00028 */ lw $s0, 0x0028($sp) /* 01078 80B23D68 27BD0048 */ addiu $sp, $sp, 0x0048 ## $sp = 00000000 -/* 0107C 80B23D6C 03E00008 */ jr $ra +/* 0107C 80B23D6C 03E00008 */ jr $ra /* 01080 80B23D70 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Tr/func_80B22F28.s b/asm/non_matchings/overlays/actors/ovl_En_Tr/func_80B22F28.s index 6881a52d6a..004c88c36d 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Tr/func_80B22F28.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Tr/func_80B22F28.s @@ -1,122 +1,122 @@ glabel func_80B22F28 /* 00238 80B22F28 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 -/* 0023C 80B22F2C AFBF003C */ sw $ra, 0x003C($sp) -/* 00240 80B22F30 AFB10038 */ sw $s1, 0x0038($sp) -/* 00244 80B22F34 AFB00034 */ sw $s0, 0x0034($sp) +/* 0023C 80B22F2C AFBF003C */ sw $ra, 0x003C($sp) +/* 00240 80B22F30 AFB10038 */ sw $s1, 0x0038($sp) +/* 00244 80B22F34 AFB00034 */ sw $s0, 0x0034($sp) /* 00248 80B22F38 90AE1D6C */ lbu $t6, 0x1D6C($a1) ## 00001D6C /* 0024C 80B22F3C 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 00250 80B22F40 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 -/* 00254 80B22F44 51C00060 */ beql $t6, $zero, .L80B230C8 -/* 00258 80B22F48 8FBF003C */ lw $ra, 0x003C($sp) +/* 00254 80B22F44 51C00060 */ beql $t6, $zero, .L80B230C8 +/* 00258 80B22F48 8FBF003C */ lw $ra, 0x003C($sp) /* 0025C 80B22F4C 848602D8 */ lh $a2, 0x02D8($a0) ## 000002D8 -/* 00260 80B22F50 00067880 */ sll $t7, $a2, 2 -/* 00264 80B22F54 00AFC021 */ addu $t8, $a1, $t7 +/* 00260 80B22F50 00067880 */ sll $t7, $a2, 2 +/* 00264 80B22F54 00AFC021 */ addu $t8, $a1, $t7 /* 00268 80B22F58 8F021D8C */ lw $v0, 0x1D8C($t8) ## 00001D8C -/* 0026C 80B22F5C 5040005A */ beql $v0, $zero, .L80B230C8 -/* 00270 80B22F60 8FBF003C */ lw $ra, 0x003C($sp) +/* 0026C 80B22F5C 5040005A */ beql $v0, $zero, .L80B230C8 +/* 00270 80B22F60 8FBF003C */ lw $ra, 0x003C($sp) /* 00274 80B22F64 94430000 */ lhu $v1, 0x0000($v0) ## 00000000 /* 00278 80B22F68 24010004 */ addiu $at, $zero, 0x0004 ## $at = 00000004 /* 0027C 80B22F6C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00280 80B22F70 10610006 */ beq $v1, $at, .L80B22F8C +/* 00280 80B22F70 10610006 */ beq $v1, $at, .L80B22F8C /* 00284 80B22F74 3C053C23 */ lui $a1, 0x3C23 ## $a1 = 3C230000 /* 00288 80B22F78 24010006 */ addiu $at, $zero, 0x0006 ## $at = 00000006 -/* 0028C 80B22F7C 10610010 */ beq $v1, $at, .L80B22FC0 +/* 0028C 80B22F7C 10610010 */ beq $v1, $at, .L80B22FC0 /* 00290 80B22F80 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00294 80B22F84 10000046 */ beq $zero, $zero, .L80B230A0 +/* 00294 80B22F84 10000046 */ beq $zero, $zero, .L80B230A0 /* 00298 80B22F88 00000000 */ nop .L80B22F8C: /* 0029C 80B22F8C 0C00B58B */ jal Actor_SetScale - + /* 002A0 80B22F90 34A5D70A */ ori $a1, $a1, 0xD70A ## $a1 = 3C23D70A /* 002A4 80B22F94 3C0580B2 */ lui $a1, %hi(func_80B234D4) ## $a1 = 80B20000 /* 002A8 80B22F98 24A534D4 */ addiu $a1, $a1, %lo(func_80B234D4) ## $a1 = 80B234D4 -/* 002AC 80B22F9C 0C2C8B3C */ jal func_80B22CF0 +/* 002AC 80B22F9C 0C2C8B3C */ jal func_80B22CF0 /* 002B0 80B22FA0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 002B4 80B22FA4 24190018 */ addiu $t9, $zero, 0x0018 ## $t9 = 00000018 /* 002B8 80B22FA8 A61902D6 */ sh $t9, 0x02D6($s0) ## 000002D6 /* 002BC 80B22FAC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 002C0 80B22FB0 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 002C4 80B22FB4 24053877 */ addiu $a1, $zero, 0x3877 ## $a1 = 00003877 -/* 002C8 80B22FB8 10000040 */ beq $zero, $zero, .L80B230BC +/* 002C8 80B22FB8 10000040 */ beq $zero, $zero, .L80B230BC /* 002CC 80B22FBC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 .L80B22FC0: /* 002D0 80B22FC0 8608001C */ lh $t0, 0x001C($s0) ## 0000001C /* 002D4 80B22FC4 3C0480B2 */ lui $a0, %hi(D_80B24380) ## $a0 = 80B20000 -/* 002D8 80B22FC8 00084880 */ sll $t1, $t0, 2 -/* 002DC 80B22FCC 00892021 */ addu $a0, $a0, $t1 +/* 002D8 80B22FC8 00084880 */ sll $t1, $t0, 2 +/* 002DC 80B22FCC 00892021 */ addu $a0, $a0, $t1 /* 002E0 80B22FD0 0C028800 */ jal SkelAnime_GetFrameCount - -/* 002E4 80B22FD4 8C844380 */ lw $a0, %lo(D_80B24380)($a0) + +/* 002E4 80B22FD4 8C844380 */ lw $a0, %lo(D_80B24380)($a0) /* 002E8 80B22FD8 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 002EC 80B22FDC 860A001C */ lh $t2, 0x001C($s0) ## 0000001C /* 002F0 80B22FE0 3C01C0A0 */ lui $at, 0xC0A0 ## $at = C0A00000 -/* 002F4 80B22FE4 468021A0 */ cvt.s.w $f6, $f4 +/* 002F4 80B22FE4 468021A0 */ cvt.s.w $f6, $f4 /* 002F8 80B22FE8 44814000 */ mtc1 $at, $f8 ## $f8 = -5.00 /* 002FC 80B22FEC 3C0580B2 */ lui $a1, %hi(D_80B24380) ## $a1 = 80B20000 -/* 00300 80B22FF0 000A5880 */ sll $t3, $t2, 2 -/* 00304 80B22FF4 00AB2821 */ addu $a1, $a1, $t3 +/* 00300 80B22FF0 000A5880 */ sll $t3, $t2, 2 +/* 00304 80B22FF4 00AB2821 */ addu $a1, $a1, $t3 /* 00308 80B22FF8 240C0002 */ addiu $t4, $zero, 0x0002 ## $t4 = 00000002 -/* 0030C 80B22FFC AFAC0014 */ sw $t4, 0x0014($sp) -/* 00310 80B23000 8CA54380 */ lw $a1, %lo(D_80B24380)($a1) -/* 00314 80B23004 E7A60010 */ swc1 $f6, 0x0010($sp) +/* 0030C 80B22FFC AFAC0014 */ sw $t4, 0x0014($sp) +/* 00310 80B23000 8CA54380 */ lw $a1, %lo(D_80B24380)($a1) +/* 00314 80B23004 E7A60010 */ swc1 $f6, 0x0010($sp) /* 00318 80B23008 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C /* 0031C 80B2300C 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 00320 80B23010 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 00324 80B23014 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 00328 80B23018 E7A80018 */ swc1 $f8, 0x0018($sp) +/* 00324 80B23014 0C029468 */ jal SkelAnime_ChangeAnim + +/* 00328 80B23018 E7A80018 */ swc1 $f8, 0x0018($sp) /* 0032C 80B2301C 3C0580B2 */ lui $a1, %hi(func_80B22E6C) ## $a1 = 80B20000 /* 00330 80B23020 24A52E6C */ addiu $a1, $a1, %lo(func_80B22E6C) ## $a1 = 80B22E6C -/* 00334 80B23024 0C2C8B3C */ jal func_80B22CF0 +/* 00334 80B23024 0C2C8B3C */ jal func_80B22CF0 /* 00338 80B23028 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 0033C 80B2302C 8602001C */ lh $v0, 0x001C($s0) ## 0000001C /* 00340 80B23030 3C0E80B2 */ lui $t6, %hi(D_80B24378) ## $t6 = 80B20000 /* 00344 80B23034 C60A0024 */ lwc1 $f10, 0x0024($s0) ## 00000024 -/* 00348 80B23038 00026880 */ sll $t5, $v0, 2 -/* 0034C 80B2303C 01CD7021 */ addu $t6, $t6, $t5 -/* 00350 80B23040 8DCE4378 */ lw $t6, %lo(D_80B24378)($t6) +/* 00348 80B23038 00026880 */ sll $t5, $v0, 2 +/* 0034C 80B2303C 01CD7021 */ addu $t6, $t6, $t5 +/* 00350 80B23040 8DCE4378 */ lw $t6, %lo(D_80B24378)($t6) /* 00354 80B23044 240F0027 */ addiu $t7, $zero, 0x0027 ## $t7 = 00000027 /* 00358 80B23048 A60F02D6 */ sh $t7, 0x02D6($s0) ## 000002D6 /* 0035C 80B2304C AE0E02E4 */ sw $t6, 0x02E4($s0) ## 000002E4 -/* 00360 80B23050 E7AA0010 */ swc1 $f10, 0x0010($sp) +/* 00360 80B23050 E7AA0010 */ swc1 $f10, 0x0010($sp) /* 00364 80B23054 C6100028 */ lwc1 $f16, 0x0028($s0) ## 00000028 /* 00368 80B23058 24580009 */ addiu $t8, $v0, 0x0009 ## $t8 = 00000009 /* 0036C 80B2305C 26241C24 */ addiu $a0, $s1, 0x1C24 ## $a0 = 00001C24 -/* 00370 80B23060 E7B00014 */ swc1 $f16, 0x0014($sp) +/* 00370 80B23060 E7B00014 */ swc1 $f16, 0x0014($sp) /* 00374 80B23064 C612002C */ lwc1 $f18, 0x002C($s0) ## 0000002C -/* 00378 80B23068 AFB80028 */ sw $t8, 0x0028($sp) -/* 0037C 80B2306C AFA00024 */ sw $zero, 0x0024($sp) -/* 00380 80B23070 AFA00020 */ sw $zero, 0x0020($sp) -/* 00384 80B23074 AFA0001C */ sw $zero, 0x001C($sp) +/* 00378 80B23068 AFB80028 */ sw $t8, 0x0028($sp) +/* 0037C 80B2306C AFA00024 */ sw $zero, 0x0024($sp) +/* 00380 80B23070 AFA00020 */ sw $zero, 0x0020($sp) +/* 00384 80B23074 AFA0001C */ sw $zero, 0x001C($sp) /* 00388 80B23078 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 0038C 80B2307C 02203025 */ or $a2, $s1, $zero ## $a2 = 00000000 /* 00390 80B23080 240700F5 */ addiu $a3, $zero, 0x00F5 ## $a3 = 000000F5 /* 00394 80B23084 0C00C916 */ jal Actor_SpawnAttached - -/* 00398 80B23088 E7B20018 */ swc1 $f18, 0x0018($sp) + +/* 00398 80B23088 E7B20018 */ swc1 $f18, 0x0018($sp) /* 0039C 80B2308C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 003A0 80B23090 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 003A4 80B23094 240538A5 */ addiu $a1, $zero, 0x38A5 ## $a1 = 000038A5 -/* 003A8 80B23098 10000008 */ beq $zero, $zero, .L80B230BC +/* 003A8 80B23098 10000008 */ beq $zero, $zero, .L80B230BC /* 003AC 80B2309C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 .L80B230A0: -/* 003B0 80B230A0 0C2C900E */ jal func_80B24038 +/* 003B0 80B230A0 0C2C900E */ jal func_80B24038 /* 003B4 80B230A4 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 /* 003B8 80B230A8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 003BC 80B230AC 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 003C0 80B230B0 0C2C908C */ jal func_80B24230 +/* 003C0 80B230B0 0C2C908C */ jal func_80B24230 /* 003C4 80B230B4 860602D8 */ lh $a2, 0x02D8($s0) ## 000002D8 /* 003C8 80B230B8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 .L80B230BC: -/* 003CC 80B230BC 0C00BE5D */ jal func_8002F974 +/* 003CC 80B230BC 0C00BE5D */ jal func_8002F974 /* 003D0 80B230C0 2405317B */ addiu $a1, $zero, 0x317B ## $a1 = 0000317B -/* 003D4 80B230C4 8FBF003C */ lw $ra, 0x003C($sp) +/* 003D4 80B230C4 8FBF003C */ lw $ra, 0x003C($sp) .L80B230C8: -/* 003D8 80B230C8 8FB00034 */ lw $s0, 0x0034($sp) -/* 003DC 80B230CC 8FB10038 */ lw $s1, 0x0038($sp) -/* 003E0 80B230D0 03E00008 */ jr $ra +/* 003D8 80B230C8 8FB00034 */ lw $s0, 0x0034($sp) +/* 003DC 80B230CC 8FB10038 */ lw $s1, 0x0038($sp) +/* 003E0 80B230D0 03E00008 */ jr $ra /* 003E4 80B230D4 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Tr/func_80B23820.s b/asm/non_matchings/overlays/actors/ovl_En_Tr/func_80B23820.s index b58a075999..ccb61ad799 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Tr/func_80B23820.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Tr/func_80B23820.s @@ -1,55 +1,55 @@ glabel func_80B23820 /* 00B30 80B23820 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 00B34 80B23824 AFBF001C */ sw $ra, 0x001C($sp) -/* 00B38 80B23828 AFB00018 */ sw $s0, 0x0018($sp) +/* 00B34 80B23824 AFBF001C */ sw $ra, 0x001C($sp) +/* 00B38 80B23828 AFB00018 */ sw $s0, 0x0018($sp) /* 00B3C 80B2382C 90AE1D6C */ lbu $t6, 0x1D6C($a1) ## 00001D6C /* 00B40 80B23830 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 00B44 80B23834 00A03825 */ or $a3, $a1, $zero ## $a3 = 00000000 -/* 00B48 80B23838 51C00025 */ beql $t6, $zero, .L80B238D0 -/* 00B4C 80B2383C 8FBF001C */ lw $ra, 0x001C($sp) +/* 00B48 80B23838 51C00025 */ beql $t6, $zero, .L80B238D0 +/* 00B4C 80B2383C 8FBF001C */ lw $ra, 0x001C($sp) /* 00B50 80B23840 848F02D8 */ lh $t7, 0x02D8($a0) ## 000002D8 -/* 00B54 80B23844 000FC080 */ sll $t8, $t7, 2 -/* 00B58 80B23848 00B8C821 */ addu $t9, $a1, $t8 +/* 00B54 80B23844 000FC080 */ sll $t8, $t7, 2 +/* 00B58 80B23848 00B8C821 */ addu $t9, $a1, $t8 /* 00B5C 80B2384C 8F221D8C */ lw $v0, 0x1D8C($t9) ## 00001D8C -/* 00B60 80B23850 5040001F */ beql $v0, $zero, .L80B238D0 -/* 00B64 80B23854 8FBF001C */ lw $ra, 0x001C($sp) +/* 00B60 80B23850 5040001F */ beql $v0, $zero, .L80B238D0 +/* 00B64 80B23854 8FBF001C */ lw $ra, 0x001C($sp) /* 00B68 80B23858 94430000 */ lhu $v1, 0x0000($v0) ## 00000000 /* 00B6C 80B2385C 24010003 */ addiu $at, $zero, 0x0003 ## $at = 00000003 /* 00B70 80B23860 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00B74 80B23864 10610004 */ beq $v1, $at, .L80B23878 +/* 00B74 80B23864 10610004 */ beq $v1, $at, .L80B23878 /* 00B78 80B23868 2405390D */ addiu $a1, $zero, 0x390D ## $a1 = 0000390D /* 00B7C 80B2386C 24010005 */ addiu $at, $zero, 0x0005 ## $at = 00000005 -/* 00B80 80B23870 54610017 */ bnel $v1, $at, .L80B238D0 -/* 00B84 80B23874 8FBF001C */ lw $ra, 0x001C($sp) +/* 00B80 80B23870 54610017 */ bnel $v1, $at, .L80B238D0 +/* 00B84 80B23874 8FBF001C */ lw $ra, 0x001C($sp) .L80B23878: /* 00B88 80B23878 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 00B8C 80B2387C AFA70024 */ sw $a3, 0x0024($sp) -/* 00B90 80B23880 8FA50024 */ lw $a1, 0x0024($sp) + +/* 00B8C 80B2387C AFA70024 */ sw $a3, 0x0024($sp) +/* 00B90 80B23880 8FA50024 */ lw $a1, 0x0024($sp) /* 00B94 80B23884 24080022 */ addiu $t0, $zero, 0x0022 ## $t0 = 00000022 /* 00B98 80B23888 A60802D6 */ sh $t0, 0x02D6($s0) ## 000002D6 /* 00B9C 80B2388C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00BA0 80B23890 0C2C90AD */ jal func_80B242B4 +/* 00BA0 80B23890 0C2C90AD */ jal func_80B242B4 /* 00BA4 80B23894 860602D8 */ lh $a2, 0x02D8($s0) ## 000002D8 /* 00BA8 80B23898 3C0580B2 */ lui $a1, %hi(func_80B23690) ## $a1 = 80B20000 /* 00BAC 80B2389C 24A53690 */ addiu $a1, $a1, %lo(func_80B23690) ## $a1 = 80B23690 -/* 00BB0 80B238A0 0C2C8B3C */ jal func_80B22CF0 +/* 00BB0 80B238A0 0C2C8B3C */ jal func_80B22CF0 /* 00BB4 80B238A4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 00BB8 80B238A8 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 00BBC 80B238AC 24A549C8 */ addiu $a1, $a1, 0x49C8 ## $a1 = 060049C8 -/* 00BC0 80B238B0 0C0294BE */ jal func_800A52F8 +/* 00BC0 80B238B0 0C0294BE */ jal SkelAnime_ChangeAnimDefaultRepeat /* 00BC4 80B238B4 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C /* 00BC8 80B238B8 3C053B44 */ lui $a1, 0x3B44 ## $a1 = 3B440000 /* 00BCC 80B238BC AE0002E4 */ sw $zero, 0x02E4($s0) ## 000002E4 /* 00BD0 80B238C0 34A59BA6 */ ori $a1, $a1, 0x9BA6 ## $a1 = 3B449BA6 /* 00BD4 80B238C4 0C00B58B */ jal Actor_SetScale - + /* 00BD8 80B238C8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00BDC 80B238CC 8FBF001C */ lw $ra, 0x001C($sp) +/* 00BDC 80B238CC 8FBF001C */ lw $ra, 0x001C($sp) .L80B238D0: -/* 00BE0 80B238D0 8FB00018 */ lw $s0, 0x0018($sp) +/* 00BE0 80B238D0 8FB00018 */ lw $s0, 0x0018($sp) /* 00BE4 80B238D4 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 00BE8 80B238D8 03E00008 */ jr $ra +/* 00BE8 80B238D8 03E00008 */ jr $ra /* 00BEC 80B238DC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Tr/func_80B238E0.s b/asm/non_matchings/overlays/actors/ovl_En_Tr/func_80B238E0.s index 2c2b4957b4..48c7153939 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Tr/func_80B238E0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Tr/func_80B238E0.s @@ -1,57 +1,57 @@ glabel func_80B238E0 /* 00BF0 80B238E0 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 00BF4 80B238E4 AFBF002C */ sw $ra, 0x002C($sp) -/* 00BF8 80B238E8 AFB00028 */ sw $s0, 0x0028($sp) -/* 00BFC 80B238EC AFA50034 */ sw $a1, 0x0034($sp) +/* 00BF4 80B238E4 AFBF002C */ sw $ra, 0x002C($sp) +/* 00BF8 80B238E8 AFB00028 */ sw $s0, 0x0028($sp) +/* 00BFC 80B238EC AFA50034 */ sw $a1, 0x0034($sp) /* 00C00 80B238F0 848E001C */ lh $t6, 0x001C($a0) ## 0000001C /* 00C04 80B238F4 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 00C08 80B238F8 3C0480B2 */ lui $a0, %hi(D_80B24378) ## $a0 = 80B20000 -/* 00C0C 80B238FC 000E7880 */ sll $t7, $t6, 2 -/* 00C10 80B23900 008F2021 */ addu $a0, $a0, $t7 +/* 00C0C 80B238FC 000E7880 */ sll $t7, $t6, 2 +/* 00C10 80B23900 008F2021 */ addu $a0, $a0, $t7 /* 00C14 80B23904 0C028800 */ jal SkelAnime_GetFrameCount - -/* 00C18 80B23908 8C844378 */ lw $a0, %lo(D_80B24378)($a0) -/* 00C1C 80B2390C 8FA30034 */ lw $v1, 0x0034($sp) + +/* 00C18 80B23908 8C844378 */ lw $a0, %lo(D_80B24378)($a0) +/* 00C1C 80B2390C 8FA30034 */ lw $v1, 0x0034($sp) /* 00C20 80B23910 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 00C24 80B23914 90781D6C */ lbu $t8, 0x1D6C($v1) ## 00001D6C -/* 00C28 80B23918 46802020 */ cvt.s.w $f0, $f4 -/* 00C2C 80B2391C 5300001E */ beql $t8, $zero, .L80B23998 -/* 00C30 80B23920 8FBF002C */ lw $ra, 0x002C($sp) +/* 00C28 80B23918 46802020 */ cvt.s.w $f0, $f4 +/* 00C2C 80B2391C 5300001E */ beql $t8, $zero, .L80B23998 +/* 00C30 80B23920 8FBF002C */ lw $ra, 0x002C($sp) /* 00C34 80B23924 861902D8 */ lh $t9, 0x02D8($s0) ## 000002D8 -/* 00C38 80B23928 00194080 */ sll $t0, $t9, 2 -/* 00C3C 80B2392C 00684821 */ addu $t1, $v1, $t0 +/* 00C38 80B23928 00194080 */ sll $t0, $t9, 2 +/* 00C3C 80B2392C 00684821 */ addu $t1, $v1, $t0 /* 00C40 80B23930 8D221D8C */ lw $v0, 0x1D8C($t1) ## 00001D8C -/* 00C44 80B23934 50400018 */ beql $v0, $zero, .L80B23998 -/* 00C48 80B23938 8FBF002C */ lw $ra, 0x002C($sp) +/* 00C44 80B23934 50400018 */ beql $v0, $zero, .L80B23998 +/* 00C48 80B23938 8FBF002C */ lw $ra, 0x002C($sp) /* 00C4C 80B2393C 944A0000 */ lhu $t2, 0x0000($v0) ## 00000000 /* 00C50 80B23940 24010003 */ addiu $at, $zero, 0x0003 ## $at = 00000003 /* 00C54 80B23944 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C -/* 00C58 80B23948 15410012 */ bne $t2, $at, .L80B23994 +/* 00C58 80B23948 15410012 */ bne $t2, $at, .L80B23994 /* 00C5C 80B2394C 3C0580B2 */ lui $a1, %hi(D_80B24378) ## $a1 = 80B20000 /* 00C60 80B23950 860B001C */ lh $t3, 0x001C($s0) ## 0000001C /* 00C64 80B23954 3C01C120 */ lui $at, 0xC120 ## $at = C1200000 /* 00C68 80B23958 44813000 */ mtc1 $at, $f6 ## $f6 = -10.00 -/* 00C6C 80B2395C 000B6080 */ sll $t4, $t3, 2 -/* 00C70 80B23960 00AC2821 */ addu $a1, $a1, $t4 -/* 00C74 80B23964 8CA54378 */ lw $a1, %lo(D_80B24378)($a1) -/* 00C78 80B23968 AFA00014 */ sw $zero, 0x0014($sp) -/* 00C7C 80B2396C E7A00010 */ swc1 $f0, 0x0010($sp) +/* 00C6C 80B2395C 000B6080 */ sll $t4, $t3, 2 +/* 00C70 80B23960 00AC2821 */ addu $a1, $a1, $t4 +/* 00C74 80B23964 8CA54378 */ lw $a1, %lo(D_80B24378)($a1) +/* 00C78 80B23968 AFA00014 */ sw $zero, 0x0014($sp) +/* 00C7C 80B2396C E7A00010 */ swc1 $f0, 0x0010($sp) /* 00C80 80B23970 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 00C84 80B23974 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 00C88 80B23978 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 00C8C 80B2397C E7A60018 */ swc1 $f6, 0x0018($sp) +/* 00C88 80B23978 0C029468 */ jal SkelAnime_ChangeAnim + +/* 00C8C 80B2397C E7A60018 */ swc1 $f6, 0x0018($sp) /* 00C90 80B23980 3C0580B2 */ lui $a1, %hi(func_80B22F28) ## $a1 = 80B20000 /* 00C94 80B23984 AE0002E4 */ sw $zero, 0x02E4($s0) ## 000002E4 /* 00C98 80B23988 24A52F28 */ addiu $a1, $a1, %lo(func_80B22F28) ## $a1 = 80B22F28 -/* 00C9C 80B2398C 0C2C8B3C */ jal func_80B22CF0 +/* 00C9C 80B2398C 0C2C8B3C */ jal func_80B22CF0 /* 00CA0 80B23990 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 .L80B23994: -/* 00CA4 80B23994 8FBF002C */ lw $ra, 0x002C($sp) +/* 00CA4 80B23994 8FBF002C */ lw $ra, 0x002C($sp) .L80B23998: -/* 00CA8 80B23998 8FB00028 */ lw $s0, 0x0028($sp) +/* 00CA8 80B23998 8FB00028 */ lw $s0, 0x0028($sp) /* 00CAC 80B2399C 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 00CB0 80B239A0 03E00008 */ jr $ra +/* 00CB0 80B239A0 03E00008 */ jr $ra /* 00CB4 80B239A4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Tr/func_80B239A8.s b/asm/non_matchings/overlays/actors/ovl_En_Tr/func_80B239A8.s index cdfba61c10..6badc8e531 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Tr/func_80B239A8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Tr/func_80B239A8.s @@ -1,63 +1,63 @@ glabel func_80B239A8 /* 00CB8 80B239A8 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 00CBC 80B239AC AFBF002C */ sw $ra, 0x002C($sp) -/* 00CC0 80B239B0 AFB00028 */ sw $s0, 0x0028($sp) -/* 00CC4 80B239B4 AFA50034 */ sw $a1, 0x0034($sp) +/* 00CBC 80B239AC AFBF002C */ sw $ra, 0x002C($sp) +/* 00CC0 80B239B0 AFB00028 */ sw $s0, 0x0028($sp) +/* 00CC4 80B239B4 AFA50034 */ sw $a1, 0x0034($sp) /* 00CC8 80B239B8 848E001C */ lh $t6, 0x001C($a0) ## 0000001C /* 00CCC 80B239BC 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 00CD0 80B239C0 3C0480B2 */ lui $a0, %hi(D_80B24368) ## $a0 = 80B20000 -/* 00CD4 80B239C4 000E7880 */ sll $t7, $t6, 2 -/* 00CD8 80B239C8 008F2021 */ addu $a0, $a0, $t7 +/* 00CD4 80B239C4 000E7880 */ sll $t7, $t6, 2 +/* 00CD8 80B239C8 008F2021 */ addu $a0, $a0, $t7 /* 00CDC 80B239CC 0C028800 */ jal SkelAnime_GetFrameCount - -/* 00CE0 80B239D0 8C844368 */ lw $a0, %lo(D_80B24368)($a0) -/* 00CE4 80B239D4 8FA30034 */ lw $v1, 0x0034($sp) + +/* 00CE0 80B239D0 8C844368 */ lw $a0, %lo(D_80B24368)($a0) +/* 00CE4 80B239D4 8FA30034 */ lw $v1, 0x0034($sp) /* 00CE8 80B239D8 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 00CEC 80B239DC 90781D6C */ lbu $t8, 0x1D6C($v1) ## 00001D6C -/* 00CF0 80B239E0 46802020 */ cvt.s.w $f0, $f4 -/* 00CF4 80B239E4 53000024 */ beql $t8, $zero, .L80B23A78 -/* 00CF8 80B239E8 8FBF002C */ lw $ra, 0x002C($sp) +/* 00CF0 80B239E0 46802020 */ cvt.s.w $f0, $f4 +/* 00CF4 80B239E4 53000024 */ beql $t8, $zero, .L80B23A78 +/* 00CF8 80B239E8 8FBF002C */ lw $ra, 0x002C($sp) /* 00CFC 80B239EC 861902D8 */ lh $t9, 0x02D8($s0) ## 000002D8 -/* 00D00 80B239F0 00194080 */ sll $t0, $t9, 2 -/* 00D04 80B239F4 00684821 */ addu $t1, $v1, $t0 +/* 00D00 80B239F0 00194080 */ sll $t0, $t9, 2 +/* 00D04 80B239F4 00684821 */ addu $t1, $v1, $t0 /* 00D08 80B239F8 8D221D8C */ lw $v0, 0x1D8C($t1) ## 00001D8C -/* 00D0C 80B239FC 5040001E */ beql $v0, $zero, .L80B23A78 -/* 00D10 80B23A00 8FBF002C */ lw $ra, 0x002C($sp) +/* 00D0C 80B239FC 5040001E */ beql $v0, $zero, .L80B23A78 +/* 00D10 80B23A00 8FBF002C */ lw $ra, 0x002C($sp) /* 00D14 80B23A04 944A0000 */ lhu $t2, 0x0000($v0) ## 00000000 /* 00D18 80B23A08 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 /* 00D1C 80B23A0C 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C -/* 00D20 80B23A10 15410018 */ bne $t2, $at, .L80B23A74 +/* 00D20 80B23A10 15410018 */ bne $t2, $at, .L80B23A74 /* 00D24 80B23A14 3C0580B2 */ lui $a1, %hi(D_80B24368) ## $a1 = 80B20000 /* 00D28 80B23A18 860B001C */ lh $t3, 0x001C($s0) ## 0000001C /* 00D2C 80B23A1C 3C01C080 */ lui $at, 0xC080 ## $at = C0800000 /* 00D30 80B23A20 44813000 */ mtc1 $at, $f6 ## $f6 = -4.00 -/* 00D34 80B23A24 000B6080 */ sll $t4, $t3, 2 -/* 00D38 80B23A28 00AC2821 */ addu $a1, $a1, $t4 +/* 00D34 80B23A24 000B6080 */ sll $t4, $t3, 2 +/* 00D38 80B23A28 00AC2821 */ addu $a1, $a1, $t4 /* 00D3C 80B23A2C 240D0002 */ addiu $t5, $zero, 0x0002 ## $t5 = 00000002 -/* 00D40 80B23A30 AFAD0014 */ sw $t5, 0x0014($sp) -/* 00D44 80B23A34 8CA54368 */ lw $a1, %lo(D_80B24368)($a1) -/* 00D48 80B23A38 E7A00010 */ swc1 $f0, 0x0010($sp) +/* 00D40 80B23A30 AFAD0014 */ sw $t5, 0x0014($sp) +/* 00D44 80B23A34 8CA54368 */ lw $a1, %lo(D_80B24368)($a1) +/* 00D48 80B23A38 E7A00010 */ swc1 $f0, 0x0010($sp) /* 00D4C 80B23A3C 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 00D50 80B23A40 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 00D54 80B23A44 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 00D58 80B23A48 E7A60018 */ swc1 $f6, 0x0018($sp) +/* 00D54 80B23A44 0C029468 */ jal SkelAnime_ChangeAnim + +/* 00D58 80B23A48 E7A60018 */ swc1 $f6, 0x0018($sp) /* 00D5C 80B23A4C 860E001C */ lh $t6, 0x001C($s0) ## 0000001C /* 00D60 80B23A50 3C1880B2 */ lui $t8, %hi(D_80B24370) ## $t8 = 80B20000 /* 00D64 80B23A54 3C0580B2 */ lui $a1, %hi(func_80B238E0) ## $a1 = 80B20000 -/* 00D68 80B23A58 000E7880 */ sll $t7, $t6, 2 -/* 00D6C 80B23A5C 030FC021 */ addu $t8, $t8, $t7 -/* 00D70 80B23A60 8F184370 */ lw $t8, %lo(D_80B24370)($t8) +/* 00D68 80B23A58 000E7880 */ sll $t7, $t6, 2 +/* 00D6C 80B23A5C 030FC021 */ addu $t8, $t8, $t7 +/* 00D70 80B23A60 8F184370 */ lw $t8, %lo(D_80B24370)($t8) /* 00D74 80B23A64 24A538E0 */ addiu $a1, $a1, %lo(func_80B238E0) ## $a1 = 80B238E0 /* 00D78 80B23A68 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00D7C 80B23A6C 0C2C8B3C */ jal func_80B22CF0 +/* 00D7C 80B23A6C 0C2C8B3C */ jal func_80B22CF0 /* 00D80 80B23A70 AE1802E4 */ sw $t8, 0x02E4($s0) ## 000002E4 .L80B23A74: -/* 00D84 80B23A74 8FBF002C */ lw $ra, 0x002C($sp) +/* 00D84 80B23A74 8FBF002C */ lw $ra, 0x002C($sp) .L80B23A78: -/* 00D88 80B23A78 8FB00028 */ lw $s0, 0x0028($sp) +/* 00D88 80B23A78 8FB00028 */ lw $s0, 0x0028($sp) /* 00D8C 80B23A7C 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 00D90 80B23A80 03E00008 */ jr $ra +/* 00D90 80B23A80 03E00008 */ jr $ra /* 00D94 80B23A84 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Tr/func_80B23A88.s b/asm/non_matchings/overlays/actors/ovl_En_Tr/func_80B23A88.s index 2f66b56758..552b572cd5 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Tr/func_80B23A88.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Tr/func_80B23A88.s @@ -1,87 +1,87 @@ glabel func_80B23A88 /* 00D98 80B23A88 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 00D9C 80B23A8C AFBF001C */ sw $ra, 0x001C($sp) -/* 00DA0 80B23A90 AFB00018 */ sw $s0, 0x0018($sp) +/* 00D9C 80B23A8C AFBF001C */ sw $ra, 0x001C($sp) +/* 00DA0 80B23A90 AFB00018 */ sw $s0, 0x0018($sp) /* 00DA4 80B23A94 90AE1D6C */ lbu $t6, 0x1D6C($a1) ## 00001D6C /* 00DA8 80B23A98 3C070001 */ lui $a3, 0x0001 ## $a3 = 00010000 -/* 00DAC 80B23A9C 00E53821 */ addu $a3, $a3, $a1 +/* 00DAC 80B23A9C 00E53821 */ addu $a3, $a3, $a1 /* 00DB0 80B23AA0 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00DB4 80B23AA4 11C00040 */ beq $t6, $zero, .L80B23BA8 +/* 00DB4 80B23AA4 11C00040 */ beq $t6, $zero, .L80B23BA8 /* 00DB8 80B23AA8 8CE71DE4 */ lw $a3, 0x1DE4($a3) ## 00011DE4 /* 00DBC 80B23AAC 848602D8 */ lh $a2, 0x02D8($a0) ## 000002D8 -/* 00DC0 80B23AB0 00067880 */ sll $t7, $a2, 2 -/* 00DC4 80B23AB4 00AFC021 */ addu $t8, $a1, $t7 +/* 00DC0 80B23AB0 00067880 */ sll $t7, $a2, 2 +/* 00DC4 80B23AB4 00AFC021 */ addu $t8, $a1, $t7 /* 00DC8 80B23AB8 8F031D8C */ lw $v1, 0x1D8C($t8) ## 00001D8C -/* 00DCC 80B23ABC 5060003B */ beql $v1, $zero, .L80B23BAC -/* 00DD0 80B23AC0 8FBF001C */ lw $ra, 0x001C($sp) +/* 00DCC 80B23ABC 5060003B */ beql $v1, $zero, .L80B23BAC +/* 00DD0 80B23AC0 8FBF001C */ lw $ra, 0x001C($sp) /* 00DD4 80B23AC4 94620000 */ lhu $v0, 0x0000($v1) ## 00000000 /* 00DD8 80B23AC8 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 00DDC 80B23ACC 1041000A */ beq $v0, $at, .L80B23AF8 +/* 00DDC 80B23ACC 1041000A */ beq $v0, $at, .L80B23AF8 /* 00DE0 80B23AD0 24010003 */ addiu $at, $zero, 0x0003 ## $at = 00000003 -/* 00DE4 80B23AD4 10410010 */ beq $v0, $at, .L80B23B18 +/* 00DE4 80B23AD4 10410010 */ beq $v0, $at, .L80B23B18 /* 00DE8 80B23AD8 24010004 */ addiu $at, $zero, 0x0004 ## $at = 00000004 -/* 00DEC 80B23ADC 1041001A */ beq $v0, $at, .L80B23B48 +/* 00DEC 80B23ADC 1041001A */ beq $v0, $at, .L80B23B48 /* 00DF0 80B23AE0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 00DF4 80B23AE4 24010007 */ addiu $at, $zero, 0x0007 ## $at = 00000007 -/* 00DF8 80B23AE8 1041001C */ beq $v0, $at, .L80B23B5C +/* 00DF8 80B23AE8 1041001C */ beq $v0, $at, .L80B23B5C /* 00DFC 80B23AEC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00E00 80B23AF0 1000002E */ beq $zero, $zero, .L80B23BAC -/* 00E04 80B23AF4 8FBF001C */ lw $ra, 0x001C($sp) +/* 00E00 80B23AF0 1000002E */ beq $zero, $zero, .L80B23BAC +/* 00E04 80B23AF4 8FBF001C */ lw $ra, 0x001C($sp) .L80B23AF8: -/* 00E08 80B23AF8 0C2C90AD */ jal func_80B242B4 +/* 00E08 80B23AF8 0C2C90AD */ jal func_80B242B4 /* 00E0C 80B23AFC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 00E10 80B23B00 3C0580B2 */ lui $a1, %hi(func_80B239A8) ## $a1 = 80B20000 /* 00E14 80B23B04 24A539A8 */ addiu $a1, $a1, %lo(func_80B239A8) ## $a1 = 80B239A8 -/* 00E18 80B23B08 0C2C8B3C */ jal func_80B22CF0 +/* 00E18 80B23B08 0C2C8B3C */ jal func_80B22CF0 /* 00E1C 80B23B0C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00E20 80B23B10 10000026 */ beq $zero, $zero, .L80B23BAC -/* 00E24 80B23B14 8FBF001C */ lw $ra, 0x001C($sp) +/* 00E20 80B23B10 10000026 */ beq $zero, $zero, .L80B23BAC +/* 00E24 80B23B14 8FBF001C */ lw $ra, 0x001C($sp) .L80B23B18: -/* 00E28 80B23B18 0C2C90AD */ jal func_80B242B4 +/* 00E28 80B23B18 0C2C90AD */ jal func_80B242B4 /* 00E2C 80B23B1C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 00E30 80B23B20 3C0580B2 */ lui $a1, %hi(func_80B22F28) ## $a1 = 80B20000 /* 00E34 80B23B24 24A52F28 */ addiu $a1, $a1, %lo(func_80B22F28) ## $a1 = 80B22F28 -/* 00E38 80B23B28 0C2C8B3C */ jal func_80B22CF0 +/* 00E38 80B23B28 0C2C8B3C */ jal func_80B22CF0 /* 00E3C 80B23B2C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 00E40 80B23B30 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 00E44 80B23B34 24A549C8 */ addiu $a1, $a1, 0x49C8 ## $a1 = 060049C8 -/* 00E48 80B23B38 0C0294BE */ jal func_800A52F8 +/* 00E48 80B23B38 0C0294BE */ jal SkelAnime_ChangeAnimDefaultRepeat /* 00E4C 80B23B3C 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C -/* 00E50 80B23B40 10000019 */ beq $zero, $zero, .L80B23BA8 +/* 00E50 80B23B40 10000019 */ beq $zero, $zero, .L80B23BA8 /* 00E54 80B23B44 AE0002E4 */ sw $zero, 0x02E4($s0) ## 000002E4 .L80B23B48: /* 00E58 80B23B48 3C0580B2 */ lui $a1, %hi(func_80B23820) ## $a1 = 80B20000 -/* 00E5C 80B23B4C 0C2C8B3C */ jal func_80B22CF0 +/* 00E5C 80B23B4C 0C2C8B3C */ jal func_80B22CF0 /* 00E60 80B23B50 24A53820 */ addiu $a1, $a1, %lo(func_80B23820) ## $a1 = 80B23820 -/* 00E64 80B23B54 10000014 */ beq $zero, $zero, .L80B23BA8 +/* 00E64 80B23B54 10000014 */ beq $zero, $zero, .L80B23BA8 /* 00E68 80B23B58 AE000134 */ sw $zero, 0x0134($s0) ## 00000134 .L80B23B5C: /* 00E6C 80B23B5C 3C0580B2 */ lui $a1, %hi(func_80B230D8) ## $a1 = 80B20000 /* 00E70 80B23B60 24A530D8 */ addiu $a1, $a1, %lo(func_80B230D8) ## $a1 = 80B230D8 -/* 00E74 80B23B64 0C2C8B3C */ jal func_80B22CF0 -/* 00E78 80B23B68 AFA70024 */ sw $a3, 0x0024($sp) +/* 00E74 80B23B64 0C2C8B3C */ jal func_80B22CF0 +/* 00E78 80B23B68 AFA70024 */ sw $a3, 0x0024($sp) /* 00E7C 80B23B6C 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 00E80 80B23B70 24A549C8 */ addiu $a1, $a1, 0x49C8 ## $a1 = 060049C8 -/* 00E84 80B23B74 0C0294BE */ jal func_800A52F8 +/* 00E84 80B23B74 0C0294BE */ jal SkelAnime_ChangeAnimDefaultRepeat /* 00E88 80B23B78 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C /* 00E8C 80B23B7C 8619001C */ lh $t9, 0x001C($s0) ## 0000001C -/* 00E90 80B23B80 8FA70024 */ lw $a3, 0x0024($sp) +/* 00E90 80B23B80 8FA70024 */ lw $a3, 0x0024($sp) /* 00E94 80B23B84 AE0002E4 */ sw $zero, 0x02E4($s0) ## 000002E4 -/* 00E98 80B23B88 13200006 */ beq $t9, $zero, .L80B23BA4 -/* 00E9C 80B23B8C 00076280 */ sll $t4, $a3, 10 -/* 00EA0 80B23B90 00074A80 */ sll $t1, $a3, 10 +/* 00E98 80B23B88 13200006 */ beq $t9, $zero, .L80B23BA4 +/* 00E9C 80B23B8C 00076280 */ sll $t4, $a3, 10 +/* 00EA0 80B23B90 00074A80 */ sll $t1, $a3, 10 /* 00EA4 80B23B94 34018000 */ ori $at, $zero, 0x8000 ## $at = 00008000 -/* 00EA8 80B23B98 01215021 */ addu $t2, $t1, $at -/* 00EAC 80B23B9C 10000002 */ beq $zero, $zero, .L80B23BA8 +/* 00EA8 80B23B98 01215021 */ addu $t2, $t1, $at +/* 00EAC 80B23B9C 10000002 */ beq $zero, $zero, .L80B23BA8 /* 00EB0 80B23BA0 A60A02D6 */ sh $t2, 0x02D6($s0) ## 000002D6 .L80B23BA4: /* 00EB4 80B23BA4 A60C02D6 */ sh $t4, 0x02D6($s0) ## 000002D6 .L80B23BA8: -/* 00EB8 80B23BA8 8FBF001C */ lw $ra, 0x001C($sp) +/* 00EB8 80B23BA8 8FBF001C */ lw $ra, 0x001C($sp) .L80B23BAC: -/* 00EBC 80B23BAC 8FB00018 */ lw $s0, 0x0018($sp) +/* 00EBC 80B23BAC 8FB00018 */ lw $s0, 0x0018($sp) /* 00EC0 80B23BB0 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 00EC4 80B23BB4 03E00008 */ jr $ra +/* 00EC4 80B23BB4 03E00008 */ jr $ra /* 00EC8 80B23BB8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Trap/EnTrap_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Trap/EnTrap_Draw.s index 6019e6e802..0cddd5155b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Trap/EnTrap_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Trap/EnTrap_Draw.s @@ -6,7 +6,7 @@ glabel EnTrap_Draw /* 01180 80B257E0 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 /* 01184 80B257E4 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 01188 80B257E8 24A51400 */ addiu $a1, $a1, 0x1400 ## $a1 = 06001400 -/* 0118C 80B257EC 0C00D498 */ jal Draw_DListOpa +/* 0118C 80B257EC 0C00D498 */ jal Gfx_DrawDListOpa /* 01190 80B257F0 8FA4001C */ lw $a0, 0x001C($sp) /* 01194 80B257F4 8FBF0014 */ lw $ra, 0x0014($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Tubo_Trap/EnTuboTrap_Fly.s b/asm/non_matchings/overlays/actors/ovl_En_Tubo_Trap/EnTuboTrap_Fly.s deleted file mode 100644 index ed18906778..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Tubo_Trap/EnTuboTrap_Fly.s +++ /dev/null @@ -1,57 +0,0 @@ -glabel EnTuboTrap_Fly -/* 00A38 80B26328 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 00A3C 80B2632C AFBF001C */ sw $ra, 0x001C($sp) -/* 00A40 80B26330 AFB00018 */ sw $s0, 0x0018($sp) -/* 00A44 80B26334 AFA50034 */ sw $a1, 0x0034($sp) -/* 00A48 80B26338 C4920154 */ lwc1 $f18, 0x0154($a0) ## 00000154 -/* 00A4C 80B2633C C4900024 */ lwc1 $f16, 0x0024($a0) ## 00000024 -/* 00A50 80B26340 C48E0158 */ lwc1 $f14, 0x0158($a0) ## 00000158 -/* 00A54 80B26344 C48C0028 */ lwc1 $f12, 0x0028($a0) ## 00000028 -/* 00A58 80B26348 46109401 */ sub.s $f16, $f18, $f16 -/* 00A5C 80B2634C C492015C */ lwc1 $f18, 0x015C($a0) ## 0000015C -/* 00A60 80B26350 C48A002C */ lwc1 $f10, 0x002C($a0) ## 0000002C -/* 00A64 80B26354 460C7301 */ sub.s $f12, $f14, $f12 -/* 00A68 80B26358 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00A6C 80B2635C E7B0002C */ swc1 $f16, 0x002C($sp) -/* 00A70 80B26360 460A9281 */ sub.s $f10, $f18, $f10 -/* 00A74 80B26364 E7AC0028 */ swc1 $f12, 0x0028($sp) -/* 00A78 80B26368 24053037 */ addiu $a1, $zero, 0x3037 ## $a1 = 00003037 -/* 00A7C 80B2636C 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 00A80 80B26370 E7AA0024 */ swc1 $f10, 0x0024($sp) -/* 00A84 80B26374 C7A2002C */ lwc1 $f2, 0x002C($sp) -/* 00A88 80B26378 C7AC0028 */ lwc1 $f12, 0x0028($sp) -/* 00A8C 80B2637C C7AE0024 */ lwc1 $f14, 0x0024($sp) -/* 00A90 80B26380 46021102 */ mul.s $f4, $f2, $f2 -/* 00A94 80B26384 3C014370 */ lui $at, 0x4370 ## $at = 43700000 -/* 00A98 80B26388 44818000 */ mtc1 $at, $f16 ## $f16 = 240.00 -/* 00A9C 80B2638C 460C6182 */ mul.s $f6, $f12, $f12 -/* 00AA0 80B26390 3C063E4C */ lui $a2, 0x3E4C ## $a2 = 3E4C0000 -/* 00AA4 80B26394 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3E4CCCCD -/* 00AA8 80B26398 460E7282 */ mul.s $f10, $f14, $f14 -/* 00AAC 80B2639C 2604006C */ addiu $a0, $s0, 0x006C ## $a0 = 0000006C -/* 00AB0 80B263A0 3C05C040 */ lui $a1, 0xC040 ## $a1 = C0400000 -/* 00AB4 80B263A4 46062200 */ add.s $f8, $f4, $f6 -/* 00AB8 80B263A8 460A4000 */ add.s $f0, $f8, $f10 -/* 00ABC 80B263AC 46000004 */ sqrt.s $f0, $f0 -/* 00AC0 80B263B0 4600803C */ c.lt.s $f16, $f0 -/* 00AC4 80B263B4 00000000 */ nop -/* 00AC8 80B263B8 45020004 */ bc1fl .L80B263CC -/* 00ACC 80B263BC 860E00B6 */ lh $t6, 0x00B6($s0) ## 000000B6 -/* 00AD0 80B263C0 0C01E107 */ jal Math_SmoothScaleMaxF - -/* 00AD4 80B263C4 3C073F00 */ lui $a3, 0x3F00 ## $a3 = 3F000000 -/* 00AD8 80B263C8 860E00B6 */ lh $t6, 0x00B6($s0) ## 000000B6 -.L80B263CC: -/* 00ADC 80B263CC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00AE0 80B263D0 25CF1388 */ addiu $t7, $t6, 0x1388 ## $t7 = 00001388 -/* 00AE4 80B263D4 A60F00B6 */ sh $t7, 0x00B6($s0) ## 000000B6 -/* 00AE8 80B263D8 0C2C97C2 */ jal EnTuboTrap_TestCollider -/* 00AEC 80B263DC 8FA50034 */ lw $a1, 0x0034($sp) -/* 00AF0 80B263E0 8FBF001C */ lw $ra, 0x001C($sp) -/* 00AF4 80B263E4 8FB00018 */ lw $s0, 0x0018($sp) -/* 00AF8 80B263E8 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 00AFC 80B263EC 03E00008 */ jr $ra -/* 00B00 80B263F0 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Tubo_Trap/EnTuboTrap_TestCollider.s b/asm/non_matchings/overlays/actors/ovl_En_Tubo_Trap/EnTuboTrap_HandleImpact.s similarity index 96% rename from asm/non_matchings/overlays/actors/ovl_En_Tubo_Trap/EnTuboTrap_TestCollider.s rename to asm/non_matchings/overlays/actors/ovl_En_Tubo_Trap/EnTuboTrap_HandleImpact.s index 1c28df5022..fe7f9d108c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Tubo_Trap/EnTuboTrap_TestCollider.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Tubo_Trap/EnTuboTrap_HandleImpact.s @@ -1,4 +1,4 @@ -glabel EnTuboTrap_TestCollider +glabel EnTuboTrap_HandleImpact /* 00618 80B25F08 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 /* 0061C 80B25F0C AFBF001C */ sw $ra, 0x001C($sp) /* 00620 80B25F10 AFB10018 */ sw $s1, 0x0018($sp) @@ -18,7 +18,7 @@ glabel EnTuboTrap_TestCollider /* 00658 80B25F48 00000000 */ nop /* 0065C 80B25F4C 45020010 */ bc1fl .L80B25F90 /* 00660 80B25F50 92020170 */ lbu $v0, 0x0170($s0) ## 00000170 -/* 00664 80B25F54 0C2C9723 */ jal EnTuboTrap_FragmentsWater +/* 00664 80B25F54 0C2C9723 */ jal EnTuboTrap_SpawnWaterFragments /* 00668 80B25F58 00000000 */ nop /* 0066C 80B25F5C 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 00670 80B25F60 26050024 */ addiu $a1, $s0, 0x0024 ## $a1 = 00000024 @@ -41,7 +41,7 @@ glabel EnTuboTrap_TestCollider /* 006A8 80B25F98 30580004 */ andi $t8, $v0, 0x0004 ## $t8 = 00000000 /* 006AC 80B25F9C 13000015 */ beq $t8, $zero, .L80B25FF4 /* 006B0 80B25FA0 3059FFFB */ andi $t9, $v0, 0xFFFB ## $t9 = 00000000 -/* 006B4 80B25FA4 0C2C9686 */ jal EnTuboTrap_Fragments +/* 006B4 80B25FA4 0C2C9686 */ jal EnTuboTrap_SpawnFragments /* 006B8 80B25FA8 A2190170 */ sb $t9, 0x0170($s0) ## 00000170 /* 006BC 80B25FAC 26050024 */ addiu $a1, $s0, 0x0024 ## $a1 = 00000024 /* 006C0 80B25FB0 AFA50024 */ sw $a1, 0x0024($sp) @@ -72,7 +72,7 @@ glabel EnTuboTrap_TestCollider /* 00714 80B26004 11000016 */ beq $t0, $zero, .L80B26060 /* 00718 80B26008 3069FFFD */ andi $t1, $v1, 0xFFFD ## $t1 = 00000000 /* 0071C 80B2600C A2090171 */ sb $t1, 0x0171($s0) ## 00000171 -/* 00720 80B26010 0C2C9686 */ jal EnTuboTrap_Fragments +/* 00720 80B26010 0C2C9686 */ jal EnTuboTrap_SpawnFragments /* 00724 80B26014 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 /* 00728 80B26018 26050024 */ addiu $a1, $s0, 0x0024 ## $a1 = 00000024 /* 0072C 80B2601C AFA50024 */ sw $a1, 0x0024($sp) @@ -103,7 +103,7 @@ glabel EnTuboTrap_TestCollider /* 00780 80B26070 A20B0170 */ sb $t3, 0x0170($s0) ## 00000170 /* 00784 80B26074 14CC0015 */ bne $a2, $t4, .L80B260CC /* 00788 80B26078 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0078C 80B2607C 0C2C9686 */ jal EnTuboTrap_Fragments +/* 0078C 80B2607C 0C2C9686 */ jal EnTuboTrap_SpawnFragments /* 00790 80B26080 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 /* 00794 80B26084 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 00798 80B26088 26050024 */ addiu $a1, $s0, 0x0024 ## $a1 = 00000024 @@ -136,7 +136,7 @@ glabel EnTuboTrap_TestCollider /* 007F0 80B260E0 51C0000E */ beql $t6, $zero, .L80B2611C /* 007F4 80B260E4 8FBF001C */ lw $ra, 0x001C($sp) .L80B260E8: -/* 007F8 80B260E8 0C2C9686 */ jal EnTuboTrap_Fragments +/* 007F8 80B260E8 0C2C9686 */ jal EnTuboTrap_SpawnFragments /* 007FC 80B260EC 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 /* 00800 80B260F0 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 00804 80B260F4 26050024 */ addiu $a1, $s0, 0x0024 ## $a1 = 00000024 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Tubo_Trap/EnTuboTrap_InitializeAttack.s b/asm/non_matchings/overlays/actors/ovl_En_Tubo_Trap/EnTuboTrap_InitializeAttack.s deleted file mode 100644 index d71bf919a1..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Tubo_Trap/EnTuboTrap_InitializeAttack.s +++ /dev/null @@ -1,40 +0,0 @@ -glabel EnTuboTrap_InitializeAttack -/* 009AC 80B2629C 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 009B0 80B262A0 AFBF001C */ sw $ra, 0x001C($sp) -/* 009B4 80B262A4 AFB00018 */ sw $s0, 0x0018($sp) -/* 009B8 80B262A8 AFA50024 */ sw $a1, 0x0024($sp) -/* 009BC 80B262AC 848E00B6 */ lh $t6, 0x00B6($a0) ## 000000B6 -/* 009C0 80B262B0 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 009C4 80B262B4 3C063F4C */ lui $a2, 0x3F4C ## $a2 = 3F4C0000 -/* 009C8 80B262B8 25CF1388 */ addiu $t7, $t6, 0x1388 ## $t7 = 00001388 -/* 009CC 80B262BC A48F00B6 */ sh $t7, 0x00B6($a0) ## 000000B6 -/* 009D0 80B262C0 8E050150 */ lw $a1, 0x0150($s0) ## 00000150 -/* 009D4 80B262C4 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3F4CCCCD -/* 009D8 80B262C8 24840028 */ addiu $a0, $a0, 0x0028 ## $a0 = 00000028 -/* 009DC 80B262CC 0C01E107 */ jal Math_SmoothScaleMaxF - -/* 009E0 80B262D0 3C074040 */ lui $a3, 0x4040 ## $a3 = 40400000 -/* 009E4 80B262D4 C6040028 */ lwc1 $f4, 0x0028($s0) ## 00000028 -/* 009E8 80B262D8 C6060150 */ lwc1 $f6, 0x0150($s0) ## 00000150 -/* 009EC 80B262DC 3C014120 */ lui $at, 0x4120 ## $at = 41200000 -/* 009F0 80B262E0 44811000 */ mtc1 $at, $f2 ## $f2 = 10.00 -/* 009F4 80B262E4 46062001 */ sub.s $f0, $f4, $f6 -/* 009F8 80B262E8 3C1980B2 */ lui $t9, %hi(EnTuboTrap_Fly) ## $t9 = 80B20000 -/* 009FC 80B262EC 27396328 */ addiu $t9, $t9, %lo(EnTuboTrap_Fly) ## $t9 = 80B26328 -/* 00A00 80B262F0 46000005 */ abs.s $f0, $f0 -/* 00A04 80B262F4 4602003C */ c.lt.s $f0, $f2 -/* 00A08 80B262F8 00000000 */ nop -/* 00A0C 80B262FC 45020006 */ bc1fl .L80B26318 -/* 00A10 80B26300 8FBF001C */ lw $ra, 0x001C($sp) -/* 00A14 80B26304 8618008A */ lh $t8, 0x008A($s0) ## 0000008A -/* 00A18 80B26308 E6020068 */ swc1 $f2, 0x0068($s0) ## 00000068 -/* 00A1C 80B2630C AE19014C */ sw $t9, 0x014C($s0) ## 0000014C -/* 00A20 80B26310 A6180032 */ sh $t8, 0x0032($s0) ## 00000032 -/* 00A24 80B26314 8FBF001C */ lw $ra, 0x001C($sp) -.L80B26318: -/* 00A28 80B26318 8FB00018 */ lw $s0, 0x0018($sp) -/* 00A2C 80B2631C 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 00A30 80B26320 03E00008 */ jr $ra -/* 00A34 80B26324 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Tubo_Trap/EnTuboTrap_Fragments.s b/asm/non_matchings/overlays/actors/ovl_En_Tubo_Trap/EnTuboTrap_SpawnFragments.s similarity index 98% rename from asm/non_matchings/overlays/actors/ovl_En_Tubo_Trap/EnTuboTrap_Fragments.s rename to asm/non_matchings/overlays/actors/ovl_En_Tubo_Trap/EnTuboTrap_SpawnFragments.s index 26bfc1143e..3366b21942 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Tubo_Trap/EnTuboTrap_Fragments.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Tubo_Trap/EnTuboTrap_SpawnFragments.s @@ -1,12 +1,15 @@ .late_rodata +glabel D_80B265C0 + .float 0.23 -D_80B265C0: .float 0.23 -D_80B265C4: .float 0.2 -D_80B265C8: .float 0.6 +glabel D_80B265C4 + .float 0.2 + +glabel D_80B265C8 + .float 0.6 .text - -glabel EnTuboTrap_Fragments +glabel EnTuboTrap_SpawnFragments /* 00128 80B25A18 27BDFF20 */ addiu $sp, $sp, 0xFF20 ## $sp = FFFFFF20 /* 0012C 80B25A1C F7BE0070 */ sdc1 $f30, 0x0070($sp) /* 00130 80B25A20 3C0180B2 */ lui $at, %hi(D_80B265C0) ## $at = 80B20000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Tubo_Trap/EnTuboTrap_FragmentsWater.s b/asm/non_matchings/overlays/actors/ovl_En_Tubo_Trap/EnTuboTrap_SpawnWaterFragments.s similarity index 99% rename from asm/non_matchings/overlays/actors/ovl_En_Tubo_Trap/EnTuboTrap_FragmentsWater.s rename to asm/non_matchings/overlays/actors/ovl_En_Tubo_Trap/EnTuboTrap_SpawnWaterFragments.s index c5d727def5..f50a18afcf 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Tubo_Trap/EnTuboTrap_FragmentsWater.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Tubo_Trap/EnTuboTrap_SpawnWaterFragments.s @@ -1,11 +1,12 @@ .late_rodata +glabel D_80B265CC + .float 0.2 -D_80B265CC: .float 0.2 -D_80B265D0: .float 0.2 +glabel D_80B265D0 + .float 0.2 .text - -glabel EnTuboTrap_FragmentsWater +glabel EnTuboTrap_SpawnWaterFragments /* 0039C 80B25C8C 27BDFF20 */ addiu $sp, $sp, 0xFF20 ## $sp = FFFFFF20 /* 003A0 80B25C90 AFB1007C */ sw $s1, 0x007C($sp) /* 003A4 80B25C94 AFBF009C */ sw $ra, 0x009C($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Tubo_Trap/EnTuboTrap_TestLevitate.s b/asm/non_matchings/overlays/actors/ovl_En_Tubo_Trap/EnTuboTrap_TestLevitate.s deleted file mode 100644 index 3868ef1ad2..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Tubo_Trap/EnTuboTrap_TestLevitate.s +++ /dev/null @@ -1,119 +0,0 @@ -.rdata - -D_80B26564: - .asciz "\x1b[32m☆☆☆☆☆ わて ☆☆☆☆☆ %f\n\x1b[m" - .balign 4 - -D_80B26590: - .asciz "\x1b[32m☆☆☆☆☆ おいどん ☆☆☆☆☆ %f\n\x1b[m" - .balign 4 - -D_80B265BC: - .asciz "\n\n" - .balign 4 - -.text - -glabel EnTuboTrap_TestLevitate -/* 0083C 80B2612C 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 00840 80B26130 AFBF001C */ sw $ra, 0x001C($sp) -/* 00844 80B26134 AFB00018 */ sw $s0, 0x0018($sp) -/* 00848 80B26138 AFA5002C */ sw $a1, 0x002C($sp) -/* 0084C 80B2613C 8CAF1C44 */ lw $t7, 0x1C44($a1) ## 00001C44 -/* 00850 80B26140 3C188016 */ lui $t8, 0x8016 ## $t8 = 80160000 -/* 00854 80B26144 8F18FA90 */ lw $t8, -0x0570($t8) ## 8015FA90 -/* 00858 80B26148 AFAF0024 */ sw $t7, 0x0024($sp) -/* 0085C 80B2614C 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00860 80B26150 871912D8 */ lh $t9, 0x12D8($t8) ## 801612D8 -/* 00864 80B26154 53200016 */ beql $t9, $zero, .L80B261B0 -/* 00868 80B26158 3C014348 */ lui $at, 0x4348 ## $at = 43480000 -/* 0086C 80B2615C C6040028 */ lwc1 $f4, 0x0028($s0) ## 00000028 -/* 00870 80B26160 3C0480B2 */ lui $a0, %hi(D_80B26564) ## $a0 = 80B20000 -/* 00874 80B26164 24846564 */ addiu $a0, $a0, %lo(D_80B26564) ## $a0 = 80B26564 -/* 00878 80B26168 460021A1 */ cvt.d.s $f6, $f4 -/* 0087C 80B2616C 44073000 */ mfc1 $a3, $f6 -/* 00880 80B26170 44063800 */ mfc1 $a2, $f7 -/* 00884 80B26174 0C00084C */ jal osSyncPrintf - -/* 00888 80B26178 00000000 */ nop -/* 0088C 80B2617C 8FA80024 */ lw $t0, 0x0024($sp) -/* 00890 80B26180 3C0480B2 */ lui $a0, %hi(D_80B26590) ## $a0 = 80B20000 -/* 00894 80B26184 24846590 */ addiu $a0, $a0, %lo(D_80B26590) ## $a0 = 80B26590 -/* 00898 80B26188 C5080028 */ lwc1 $f8, 0x0028($t0) ## 00000028 -/* 0089C 80B2618C 460042A1 */ cvt.d.s $f10, $f8 -/* 008A0 80B26190 44075000 */ mfc1 $a3, $f10 -/* 008A4 80B26194 44065800 */ mfc1 $a2, $f11 -/* 008A8 80B26198 0C00084C */ jal osSyncPrintf - -/* 008AC 80B2619C 00000000 */ nop -/* 008B0 80B261A0 3C0480B2 */ lui $a0, %hi(D_80B265BC) ## $a0 = 80B20000 -/* 008B4 80B261A4 0C00084C */ jal osSyncPrintf - -/* 008B8 80B261A8 248465BC */ addiu $a0, $a0, %lo(D_80B265BC) ## $a0 = 80B265BC -/* 008BC 80B261AC 3C014348 */ lui $at, 0x4348 ## $at = 43480000 -.L80B261B0: -/* 008C0 80B261B0 44819000 */ mtc1 $at, $f18 ## $f18 = 200.00 -/* 008C4 80B261B4 C6100090 */ lwc1 $f16, 0x0090($s0) ## 00000090 -/* 008C8 80B261B8 8FA90024 */ lw $t1, 0x0024($sp) -/* 008CC 80B261BC 4612803C */ c.lt.s $f16, $f18 -/* 008D0 80B261C0 00000000 */ nop -/* 008D4 80B261C4 45020031 */ bc1fl .L80B2628C -/* 008D8 80B261C8 8FBF001C */ lw $ra, 0x001C($sp) -/* 008DC 80B261CC C5240028 */ lwc1 $f4, 0x0028($t1) ## 00000028 -/* 008E0 80B261D0 C6060028 */ lwc1 $f6, 0x0028($s0) ## 00000028 -/* 008E4 80B261D4 8FA4002C */ lw $a0, 0x002C($sp) -/* 008E8 80B261D8 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 -/* 008EC 80B261DC 4604303E */ c.le.s $f6, $f4 -/* 008F0 80B261E0 24851C24 */ addiu $a1, $a0, 0x1C24 ## $a1 = 00001C24 -/* 008F4 80B261E4 45020029 */ bc1fl .L80B2628C -/* 008F8 80B261E8 8FBF001C */ lw $ra, 0x001C($sp) -/* 008FC 80B261EC 0C00CDD2 */ jal Actor_ChangeType - -/* 00900 80B261F0 24070005 */ addiu $a3, $zero, 0x0005 ## $a3 = 00000005 -/* 00904 80B261F4 8E0B0004 */ lw $t3, 0x0004($s0) ## 00000004 -/* 00908 80B261F8 3C0D8016 */ lui $t5, 0x8016 ## $t5 = 80160000 -/* 0090C 80B261FC 3C01C120 */ lui $at, 0xC120 ## $at = C1200000 -/* 00910 80B26200 356C0001 */ ori $t4, $t3, 0x0001 ## $t4 = 00000001 -/* 00914 80B26204 AE0C0004 */ sw $t4, 0x0004($s0) ## 00000004 -/* 00918 80B26208 8DADE664 */ lw $t5, -0x199C($t5) ## 8015E664 -/* 0091C 80B2620C 44818000 */ mtc1 $at, $f16 ## $f16 = -10.00 -/* 00920 80B26210 3C014220 */ lui $at, 0x4220 ## $at = 42200000 -/* 00924 80B26214 448D4000 */ mtc1 $t5, $f8 ## $f8 = -0.00 -/* 00928 80B26218 44812000 */ mtc1 $at, $f4 ## $f4 = 40.00 -/* 0092C 80B2621C 8FAE0024 */ lw $t6, 0x0024($sp) -/* 00930 80B26220 468042A0 */ cvt.s.w $f10, $f8 -/* 00934 80B26224 C6000028 */ lwc1 $f0, 0x0028($s0) ## 00000028 -/* 00938 80B26228 C5C60028 */ lwc1 $f6, 0x0028($t6) ## 00000028 -/* 0093C 80B2622C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00940 80B26230 46105482 */ mul.s $f18, $f10, $f16 -/* 00944 80B26234 46049080 */ add.s $f2, $f18, $f4 -/* 00948 80B26238 46023200 */ add.s $f8, $f6, $f2 -/* 0094C 80B2623C E6080150 */ swc1 $f8, 0x0150($s0) ## 00000150 -/* 00950 80B26240 C60A0150 */ lwc1 $f10, 0x0150($s0) ## 00000150 -/* 00954 80B26244 4600503C */ c.lt.s $f10, $f0 -/* 00958 80B26248 00000000 */ nop -/* 0095C 80B2624C 45020004 */ bc1fl .L80B26260 -/* 00960 80B26250 8E180024 */ lw $t8, 0x0024($s0) ## 00000024 -/* 00964 80B26254 46020400 */ add.s $f16, $f0, $f2 -/* 00968 80B26258 E6100150 */ swc1 $f16, 0x0150($s0) ## 00000150 -/* 0096C 80B2625C 8E180024 */ lw $t8, 0x0024($s0) ## 00000024 -.L80B26260: -/* 00970 80B26260 8E0F0028 */ lw $t7, 0x0028($s0) ## 00000028 -/* 00974 80B26264 240528C4 */ addiu $a1, $zero, 0x28C4 ## $a1 = 000028C4 -/* 00978 80B26268 AE180154 */ sw $t8, 0x0154($s0) ## 00000154 -/* 0097C 80B2626C 8E18002C */ lw $t8, 0x002C($s0) ## 0000002C -/* 00980 80B26270 AE0F0158 */ sw $t7, 0x0158($s0) ## 00000158 -/* 00984 80B26274 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 00988 80B26278 AE18015C */ sw $t8, 0x015C($s0) ## 0000015C -/* 0098C 80B2627C 3C1980B2 */ lui $t9, %hi(EnTuboTrap_InitializeAttack) ## $t9 = 80B20000 -/* 00990 80B26280 2739629C */ addiu $t9, $t9, %lo(EnTuboTrap_InitializeAttack) ## $t9 = 80B2629C -/* 00994 80B26284 AE19014C */ sw $t9, 0x014C($s0) ## 0000014C -/* 00998 80B26288 8FBF001C */ lw $ra, 0x001C($sp) -.L80B2628C: -/* 0099C 80B2628C 8FB00018 */ lw $s0, 0x0018($sp) -/* 009A0 80B26290 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 009A4 80B26294 03E00008 */ jr $ra -/* 009A8 80B26298 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_En_Tubo_Trap/EnTuboTrap_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Tubo_Trap/EnTuboTrap_Update.s deleted file mode 100644 index f4076e815c..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_En_Tubo_Trap/EnTuboTrap_Update.s +++ /dev/null @@ -1,47 +0,0 @@ -glabel EnTuboTrap_Update -/* 00B04 80B263F4 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 00B08 80B263F8 AFB0001C */ sw $s0, 0x001C($sp) -/* 00B0C 80B263FC 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00B10 80B26400 AFBF0024 */ sw $ra, 0x0024($sp) -/* 00B14 80B26404 AFB10020 */ sw $s1, 0x0020($sp) -/* 00B18 80B26408 8E19014C */ lw $t9, 0x014C($s0) ## 0000014C -/* 00B1C 80B2640C 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 -/* 00B20 80B26410 0320F809 */ jalr $ra, $t9 -/* 00B24 80B26414 00000000 */ nop -/* 00B28 80B26418 0C00B638 */ jal Actor_MoveForward -/* 00B2C 80B2641C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00B30 80B26420 3C014120 */ lui $at, 0x4120 ## $at = 41200000 -/* 00B34 80B26424 44810000 */ mtc1 $at, $f0 ## $f0 = 10.00 -/* 00B38 80B26428 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 -/* 00B3C 80B2642C 44812000 */ mtc1 $at, $f4 ## $f4 = 20.00 -/* 00B40 80B26430 240E001D */ addiu $t6, $zero, 0x001D ## $t6 = 0000001D -/* 00B44 80B26434 44060000 */ mfc1 $a2, $f0 -/* 00B48 80B26438 44070000 */ mfc1 $a3, $f0 -/* 00B4C 80B2643C AFAE0014 */ sw $t6, 0x0014($sp) -/* 00B50 80B26440 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 00B54 80B26444 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 00B58 80B26448 0C00B92D */ jal func_8002E4B4 -/* 00B5C 80B2644C E7A40010 */ swc1 $f4, 0x0010($sp) -/* 00B60 80B26450 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00B64 80B26454 0C00B56E */ jal Actor_SetHeight -/* 00B68 80B26458 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 -/* 00B6C 80B2645C 26050160 */ addiu $a1, $s0, 0x0160 ## $a1 = 00000160 -/* 00B70 80B26460 AFA50028 */ sw $a1, 0x0028($sp) -/* 00B74 80B26464 0C0189B7 */ jal ActorCollider_Cylinder_Update -/* 00B78 80B26468 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00B7C 80B2646C 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 00B80 80B26470 34211E60 */ ori $at, $at, 0x1E60 ## $at = 00011E60 -/* 00B84 80B26474 02212821 */ addu $a1, $s1, $at -/* 00B88 80B26478 AFA5002C */ sw $a1, 0x002C($sp) -/* 00B8C 80B2647C 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 00B90 80B26480 0C01767D */ jal Actor_CollisionCheck_SetAC ## CollisionCheck_setAC -/* 00B94 80B26484 8FA60028 */ lw $a2, 0x0028($sp) -/* 00B98 80B26488 8FA5002C */ lw $a1, 0x002C($sp) -/* 00B9C 80B2648C 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 00BA0 80B26490 0C0175E7 */ jal Actor_CollisionCheck_SetAT ## CollisionCheck_setAT -/* 00BA4 80B26494 8FA60028 */ lw $a2, 0x0028($sp) -/* 00BA8 80B26498 8FBF0024 */ lw $ra, 0x0024($sp) -/* 00BAC 80B2649C 8FB0001C */ lw $s0, 0x001C($sp) -/* 00BB0 80B264A0 8FB10020 */ lw $s1, 0x0020($sp) -/* 00BB4 80B264A4 03E00008 */ jr $ra -/* 00BB8 80B264A8 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Vali/EnVali_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Vali/EnVali_Draw.s index 9ac1eb62ec..348a1094c2 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Vali/EnVali_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Vali/EnVali_Draw.s @@ -1,19 +1,19 @@ glabel EnVali_Draw /* 02068 80B28718 27BDFF98 */ addiu $sp, $sp, 0xFF98 ## $sp = FFFFFF98 -/* 0206C 80B2871C AFB1002C */ sw $s1, 0x002C($sp) +/* 0206C 80B2871C AFB1002C */ sw $s1, 0x002C($sp) /* 02070 80B28720 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 -/* 02074 80B28724 AFBF0034 */ sw $ra, 0x0034($sp) -/* 02078 80B28728 AFB20030 */ sw $s2, 0x0030($sp) -/* 0207C 80B2872C AFB00028 */ sw $s0, 0x0028($sp) +/* 02074 80B28724 AFBF0034 */ sw $ra, 0x0034($sp) +/* 02078 80B28728 AFB20030 */ sw $s2, 0x0030($sp) +/* 0207C 80B2872C AFB00028 */ sw $s0, 0x0028($sp) /* 02080 80B28730 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 /* 02084 80B28734 00809025 */ or $s2, $a0, $zero ## $s2 = 00000000 /* 02088 80B28738 3C0680B3 */ lui $a2, %hi(D_80B28A30) ## $a2 = 80B30000 /* 0208C 80B2873C 24C68A30 */ addiu $a2, $a2, %lo(D_80B28A30) ## $a2 = 80B28A30 /* 02090 80B28740 27A4004C */ addiu $a0, $sp, 0x004C ## $a0 = FFFFFFE4 /* 02094 80B28744 240705E1 */ addiu $a3, $zero, 0x05E1 ## $a3 = 000005E1 -/* 02098 80B28748 0C031AB1 */ jal func_800C6AC4 +/* 02098 80B28748 0C031AB1 */ jal Graph_OpenDisps /* 0209C 80B2874C 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 -/* 020A0 80B28750 0C024F61 */ jal func_80093D84 +/* 020A0 80B28750 0C024F61 */ jal func_80093D84 /* 020A4 80B28754 8E240000 */ lw $a0, 0x0000($s1) ## 00000000 /* 020A8 80B28758 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 /* 020AC 80B2875C 3C0FDB06 */ lui $t7, 0xDB06 ## $t7 = DB060000 @@ -21,23 +21,23 @@ glabel EnVali_Draw /* 020B4 80B28764 244E0008 */ addiu $t6, $v0, 0x0008 ## $t6 = 00000008 /* 020B8 80B28768 AE0E02D0 */ sw $t6, 0x02D0($s0) ## 000002D0 /* 020BC 80B2876C 3C180001 */ lui $t8, 0x0001 ## $t8 = 00010000 -/* 020C0 80B28770 0311C021 */ addu $t8, $t8, $s1 +/* 020C0 80B28770 0311C021 */ addu $t8, $t8, $s1 /* 020C4 80B28774 AC4F0000 */ sw $t7, 0x0000($v0) ## 00000000 /* 020C8 80B28778 8F181DE4 */ lw $t8, 0x1DE4($t8) ## 00011DE4 /* 020CC 80B2877C 2408007F */ addiu $t0, $zero, 0x007F ## $t0 = 0000007F /* 020D0 80B28780 8E240000 */ lw $a0, 0x0000($s1) ## 00000000 -/* 020D4 80B28784 0018C880 */ sll $t9, $t8, 2 -/* 020D8 80B28788 0338C823 */ subu $t9, $t9, $t8 -/* 020DC 80B2878C 0019C880 */ sll $t9, $t9, 2 -/* 020E0 80B28790 01193023 */ subu $a2, $t0, $t9 +/* 020D4 80B28784 0018C880 */ sll $t9, $t8, 2 +/* 020D8 80B28788 0338C823 */ subu $t9, $t9, $t8 +/* 020DC 80B2878C 0019C880 */ sll $t9, $t9, 2 +/* 020E0 80B28790 01193023 */ subu $a2, $t0, $t9 /* 020E4 80B28794 24090020 */ addiu $t1, $zero, 0x0020 ## $t1 = 00000020 -/* 020E8 80B28798 AFA90010 */ sw $t1, 0x0010($sp) +/* 020E8 80B28798 AFA90010 */ sw $t1, 0x0010($sp) /* 020EC 80B2879C 30C6007F */ andi $a2, $a2, 0x007F ## $a2 = 00000000 /* 020F0 80B287A0 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 020F4 80B287A4 24070020 */ addiu $a3, $zero, 0x0020 ## $a3 = 00000020 -/* 020F8 80B287A8 0C0253A7 */ jal Draw_TexScroll -/* 020FC 80B287AC AFA20048 */ sw $v0, 0x0048($sp) -/* 02100 80B287B0 8FA30048 */ lw $v1, 0x0048($sp) +/* 020F8 80B287A8 0C0253A7 */ jal Gfx_TexScroll +/* 020FC 80B287AC AFA20048 */ sw $v0, 0x0048($sp) +/* 02100 80B287B0 8FA30048 */ lw $v1, 0x0048($sp) /* 02104 80B287B4 3C0DDB06 */ lui $t5, 0xDB06 ## $t5 = DB060000 /* 02108 80B287B8 3C18DB06 */ lui $t8, 0xDB06 ## $t8 = DB060000 /* 0210C 80B287BC AC620004 */ sw $v0, 0x0004($v1) ## 00000004 @@ -45,7 +45,7 @@ glabel EnVali_Draw /* 02114 80B287C4 35AD0024 */ ori $t5, $t5, 0x0024 ## $t5 = DB060024 /* 02118 80B287C8 37180024 */ ori $t8, $t8, 0x0024 ## $t8 = DB060024 /* 0211C 80B287CC 314B0001 */ andi $t3, $t2, 0x0001 ## $t3 = 00000000 -/* 02120 80B287D0 11600009 */ beq $t3, $zero, .L80B287F8 +/* 02120 80B287D0 11600009 */ beq $t3, $zero, .L80B287F8 /* 02124 80B287D4 02402025 */ or $a0, $s2, $zero ## $a0 = 00000000 /* 02128 80B287D8 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 /* 0212C 80B287DC 3C0E80B3 */ lui $t6, %hi(D_80B28998) ## $t6 = 80B30000 @@ -53,7 +53,7 @@ glabel EnVali_Draw /* 02134 80B287E4 244C0008 */ addiu $t4, $v0, 0x0008 ## $t4 = 00000008 /* 02138 80B287E8 AE0C02D0 */ sw $t4, 0x02D0($s0) ## 000002D0 /* 0213C 80B287EC AC4E0004 */ sw $t6, 0x0004($v0) ## 00000004 -/* 02140 80B287F0 10000008 */ beq $zero, $zero, .L80B28814 +/* 02140 80B287F0 10000008 */ beq $zero, $zero, .L80B28814 /* 02144 80B287F4 AC4D0000 */ sw $t5, 0x0000($v0) ## 00000000 .L80B287F8: /* 02148 80B287F8 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 @@ -64,31 +64,31 @@ glabel EnVali_Draw /* 0215C 80B2880C AC480004 */ sw $t0, 0x0004($v0) ## 00000004 /* 02160 80B28810 AC580000 */ sw $t8, 0x0000($v0) ## 00000000 .L80B28814: -/* 02164 80B28814 0C2CA0D1 */ jal func_80B28344 +/* 02164 80B28814 0C2CA0D1 */ jal func_80B28344 /* 02168 80B28818 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 /* 0216C 80B2881C 8E450150 */ lw $a1, 0x0150($s2) ## 00000150 /* 02170 80B28820 8E46016C */ lw $a2, 0x016C($s2) ## 0000016C /* 02174 80B28824 3C1980B3 */ lui $t9, %hi(func_80B28280) ## $t9 = 80B30000 /* 02178 80B28828 27398280 */ addiu $t9, $t9, %lo(func_80B28280) ## $t9 = 80B28280 -/* 0217C 80B2882C AFB90010 */ sw $t9, 0x0010($sp) -/* 02180 80B28830 AFB20014 */ sw $s2, 0x0014($sp) +/* 0217C 80B2882C AFB90010 */ sw $t9, 0x0010($sp) +/* 02180 80B28830 AFB20014 */ sw $s2, 0x0014($sp) /* 02184 80B28834 8E0902D0 */ lw $t1, 0x02D0($s0) ## 000002D0 /* 02188 80B28838 3C0780B3 */ lui $a3, %hi(func_80B281F0) ## $a3 = 80B30000 /* 0218C 80B2883C 24E781F0 */ addiu $a3, $a3, %lo(func_80B281F0) ## $a3 = 80B281F0 /* 02190 80B28840 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 02194 80B28844 0C0288A2 */ jal func_800A2288 -/* 02198 80B28848 AFA90018 */ sw $t1, 0x0018($sp) +/* 02194 80B28844 0C0288A2 */ jal SkelAnime_Draw2 +/* 02198 80B28848 AFA90018 */ sw $t1, 0x0018($sp) /* 0219C 80B2884C AE0202D0 */ sw $v0, 0x02D0($s0) ## 000002D0 /* 021A0 80B28850 3C0680B3 */ lui $a2, %hi(D_80B28A40) ## $a2 = 80B30000 /* 021A4 80B28854 24C68A40 */ addiu $a2, $a2, %lo(D_80B28A40) ## $a2 = 80B28A40 /* 021A8 80B28858 8E250000 */ lw $a1, 0x0000($s1) ## 00000000 /* 021AC 80B2885C 27A4004C */ addiu $a0, $sp, 0x004C ## $a0 = FFFFFFE4 -/* 021B0 80B28860 0C031AD5 */ jal func_800C6B54 +/* 021B0 80B28860 0C031AD5 */ jal Graph_CloseDisps /* 021B4 80B28864 24070602 */ addiu $a3, $zero, 0x0602 ## $a3 = 00000602 -/* 021B8 80B28868 8FBF0034 */ lw $ra, 0x0034($sp) -/* 021BC 80B2886C 8FB00028 */ lw $s0, 0x0028($sp) -/* 021C0 80B28870 8FB1002C */ lw $s1, 0x002C($sp) -/* 021C4 80B28874 8FB20030 */ lw $s2, 0x0030($sp) -/* 021C8 80B28878 03E00008 */ jr $ra +/* 021B8 80B28868 8FBF0034 */ lw $ra, 0x0034($sp) +/* 021BC 80B2886C 8FB00028 */ lw $s0, 0x0028($sp) +/* 021C0 80B28870 8FB1002C */ lw $s1, 0x002C($sp) +/* 021C4 80B28874 8FB20030 */ lw $s2, 0x0030($sp) +/* 021C8 80B28878 03E00008 */ jr $ra /* 021CC 80B2887C 27BD0068 */ addiu $sp, $sp, 0x0068 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Vali/func_80B26878.s b/asm/non_matchings/overlays/actors/ovl_En_Vali/func_80B26878.s index 169b64dcd0..a775435b69 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Vali/func_80B26878.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Vali/func_80B26878.s @@ -1,13 +1,13 @@ glabel func_80B26878 /* 001C8 80B26878 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 001CC 80B2687C AFBF0014 */ sw $ra, 0x0014($sp) +/* 001CC 80B2687C AFBF0014 */ sw $ra, 0x0014($sp) /* 001D0 80B26880 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 /* 001D4 80B26884 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 001D8 80B26888 24A514AC */ addiu $a1, $a1, 0x14AC ## $a1 = 060014AC -/* 001DC 80B2688C AFA60018 */ sw $a2, 0x0018($sp) -/* 001E0 80B26890 0C0294BE */ jal func_800A52F8 +/* 001DC 80B2688C AFA60018 */ sw $a2, 0x0018($sp) +/* 001E0 80B26890 0C0294BE */ jal SkelAnime_ChangeAnimDefaultRepeat /* 001E4 80B26894 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 001E8 80B26898 8FA60018 */ lw $a2, 0x0018($sp) +/* 001E8 80B26898 8FA60018 */ lw $a2, 0x0018($sp) /* 001EC 80B2689C 3C1880B2 */ lui $t8, %hi(func_80B27098) ## $t8 = 80B20000 /* 001F0 80B268A0 27187098 */ addiu $t8, $t8, %lo(func_80B27098) ## $t8 = 80B27098 /* 001F4 80B268A4 90CE040D */ lbu $t6, 0x040D($a2) ## 0000040D @@ -15,9 +15,9 @@ glabel func_80B26878 /* 001FC 80B268AC ACD80190 */ sw $t8, 0x0190($a2) ## 00000190 /* 00200 80B268B0 31CFFFFE */ andi $t7, $t6, 0xFFFE ## $t7 = 00000000 /* 00204 80B268B4 A0CF040D */ sb $t7, 0x040D($a2) ## 0000040D -/* 00208 80B268B8 8FBF0014 */ lw $ra, 0x0014($sp) +/* 00208 80B268B8 8FBF0014 */ lw $ra, 0x0014($sp) /* 0020C 80B268BC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00210 80B268C0 03E00008 */ jr $ra +/* 00210 80B268C0 03E00008 */ jr $ra /* 00214 80B268C4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Vali/func_80B268FC.s b/asm/non_matchings/overlays/actors/ovl_En_Vali/func_80B268FC.s index 3f1eb347ea..eb15f187cf 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Vali/func_80B268FC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Vali/func_80B268FC.s @@ -1,14 +1,14 @@ glabel func_80B268FC /* 0024C 80B268FC 27BDFF70 */ addiu $sp, $sp, 0xFF70 ## $sp = FFFFFF70 -/* 00250 80B26900 AFBF0014 */ sw $ra, 0x0014($sp) +/* 00250 80B26900 AFBF0014 */ sw $ra, 0x0014($sp) /* 00254 80B26904 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 /* 00258 80B26908 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 0025C 80B2690C 24A50710 */ addiu $a1, $a1, 0x0710 ## $a1 = 06000710 -/* 00260 80B26910 AFA70090 */ sw $a3, 0x0090($sp) +/* 00260 80B26910 AFA70090 */ sw $a3, 0x0090($sp) /* 00264 80B26914 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 00268 80B26918 0C0294D3 */ jal func_800A534C +/* 00268 80B26918 0C0294D3 */ jal SkelAnime_ChangeAnimTransitionRepeat /* 0026C 80B2691C 3C06C040 */ lui $a2, 0xC040 ## $a2 = C0400000 -/* 00270 80B26920 8FA70090 */ lw $a3, 0x0090($sp) +/* 00270 80B26920 8FA70090 */ lw $a3, 0x0090($sp) /* 00274 80B26924 27A2003C */ addiu $v0, $sp, 0x003C ## $v0 = FFFFFFAC /* 00278 80B26928 27A30048 */ addiu $v1, $sp, 0x0048 ## $v1 = FFFFFFB8 /* 0027C 80B2692C 8CEF0024 */ lw $t7, 0x0024($a3) ## 00000024 @@ -104,7 +104,7 @@ glabel func_80B268FC /* 003E4 80B26A94 8CEC0004 */ lw $t4, 0x0004($a3) ## 00000004 /* 003E8 80B26A98 ACF80364 */ sw $t8, 0x0364($a3) ## 00000364 /* 003EC 80B26A9C 8D390008 */ lw $t9, 0x0008($t1) ## FFFFFFFC -/* 003F0 80B26AA0 46041001 */ sub.s $f0, $f2, $f4 +/* 003F0 80B26AA0 46041001 */ sub.s $f0, $f2, $f4 /* 003F4 80B26AA4 90EE040D */ lbu $t6, 0x040D($a3) ## 0000040D /* 003F8 80B26AA8 ACF90368 */ sw $t9, 0x0368($a3) ## 00000368 /* 003FC 80B26AAC 8D2B0000 */ lw $t3, 0x0000($t1) ## FFFFFFF4 @@ -112,7 +112,7 @@ glabel func_80B268FC /* 00404 80B26AB4 2718716C */ addiu $t8, $t8, %lo(func_80B2716C) ## $t8 = 80B2716C /* 00408 80B26AB8 ACEB0354 */ sw $t3, 0x0354($a3) ## 00000354 /* 0040C 80B26ABC 8D2A0004 */ lw $t2, 0x0004($t1) ## FFFFFFF8 -/* 00410 80B26AC0 01816824 */ and $t5, $t4, $at +/* 00410 80B26AC0 01816824 */ and $t5, $t4, $at /* 00414 80B26AC4 35CF0001 */ ori $t7, $t6, 0x0001 ## $t7 = 00000001 /* 00418 80B26AC8 ACEA0358 */ sw $t2, 0x0358($a3) ## 00000358 /* 0041C 80B26ACC 8D2B0008 */ lw $t3, 0x0008($t1) ## FFFFFFFC @@ -130,9 +130,9 @@ glabel func_80B268FC /* 0044C 80B26AFC ACF80190 */ sw $t8, 0x0190($a3) ## 00000190 /* 00450 80B26B00 E4E202F8 */ swc1 $f2, 0x02F8($a3) ## 000002F8 /* 00454 80B26B04 ACEB035C */ sw $t3, 0x035C($a3) ## 0000035C -/* 00458 80B26B08 8FBF0014 */ lw $ra, 0x0014($sp) +/* 00458 80B26B08 8FBF0014 */ lw $ra, 0x0014($sp) /* 0045C 80B26B0C 27BD0090 */ addiu $sp, $sp, 0x0090 ## $sp = 00000000 -/* 00460 80B26B10 03E00008 */ jr $ra +/* 00460 80B26B10 03E00008 */ jr $ra /* 00464 80B26B14 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Vali/func_80B26B4C.s b/asm/non_matchings/overlays/actors/ovl_En_Vali/func_80B26B4C.s index d17c29e4a6..29e04dc804 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Vali/func_80B26B4C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Vali/func_80B26B4C.s @@ -1,19 +1,19 @@ glabel func_80B26B4C /* 0049C 80B26B4C 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 004A0 80B26B50 AFB00020 */ sw $s0, 0x0020($sp) +/* 004A0 80B26B50 AFB00020 */ sw $s0, 0x0020($sp) /* 004A4 80B26B54 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 004A8 80B26B58 AFBF0024 */ sw $ra, 0x0024($sp) +/* 004A8 80B26B58 AFBF0024 */ sw $ra, 0x0024($sp) /* 004AC 80B26B5C 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 004B0 80B26B60 24A50854 */ addiu $a1, $a1, 0x0854 ## $a1 = 06000854 /* 004B4 80B26B64 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 004B8 80B26B68 0C029490 */ jal func_800A5240 +/* 004B8 80B26B68 0C029490 */ jal SkelAnime_ChangeAnimTransitionStop /* 004BC 80B26B6C 3C06C0A0 */ lui $a2, 0xC0A0 ## $a2 = C0A00000 /* 004C0 80B26B70 240E001E */ addiu $t6, $zero, 0x001E ## $t6 = 0000001E -/* 004C4 80B26B74 AFAE0010 */ sw $t6, 0x0010($sp) +/* 004C4 80B26B74 AFAE0010 */ sw $t6, 0x0010($sp) /* 004C8 80B26B78 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 004CC 80B26B7C 24054000 */ addiu $a1, $zero, 0x4000 ## $a1 = 00004000 /* 004D0 80B26B80 24060096 */ addiu $a2, $zero, 0x0096 ## $a2 = 00000096 -/* 004D4 80B26B84 0C00D09B */ jal func_8003426C +/* 004D4 80B26B84 0C00D09B */ jal func_8003426C /* 004D8 80B26B88 24072000 */ addiu $a3, $zero, 0x2000 ## $a3 = 00002000 /* 004DC 80B26B8C 920F040D */ lbu $t7, 0x040D($s0) ## 0000040D /* 004E0 80B26B90 3C1980B2 */ lui $t9, %hi(func_80B273D0) ## $t9 = 80B20000 @@ -22,10 +22,10 @@ glabel func_80B26B4C /* 004EC 80B26B9C A600001C */ sh $zero, 0x001C($s0) ## 0000001C /* 004F0 80B26BA0 A218040D */ sb $t8, 0x040D($s0) ## 0000040D /* 004F4 80B26BA4 AE190190 */ sw $t9, 0x0190($s0) ## 00000190 -/* 004F8 80B26BA8 8FBF0024 */ lw $ra, 0x0024($sp) -/* 004FC 80B26BAC 8FB00020 */ lw $s0, 0x0020($sp) +/* 004F8 80B26BA8 8FBF0024 */ lw $ra, 0x0024($sp) +/* 004FC 80B26BAC 8FB00020 */ lw $s0, 0x0020($sp) /* 00500 80B26BB0 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 00504 80B26BB4 03E00008 */ jr $ra +/* 00504 80B26BB4 03E00008 */ jr $ra /* 00508 80B26BB8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Vali/func_80B26BBC.s b/asm/non_matchings/overlays/actors/ovl_En_Vali/func_80B26BBC.s index 47e061d0e1..9f02284bb0 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Vali/func_80B26BBC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Vali/func_80B26BBC.s @@ -1,18 +1,18 @@ glabel func_80B26BBC /* 0050C 80B26BBC 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00510 80B26BC0 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00514 80B26BC4 AFA40018 */ sw $a0, 0x0018($sp) +/* 00510 80B26BC0 AFBF0014 */ sw $ra, 0x0014($sp) +/* 00514 80B26BC4 AFA40018 */ sw $a0, 0x0018($sp) /* 00518 80B26BC8 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 0051C 80B26BCC 24A50B34 */ addiu $a1, $a1, 0x0B34 ## $a1 = 06000B34 -/* 00520 80B26BD0 0C02947A */ jal func_800A51E8 +/* 00520 80B26BD0 0C02947A */ jal SkelAnime_ChangeAnimDefaultStop /* 00524 80B26BD4 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 00528 80B26BD8 8FAF0018 */ lw $t7, 0x0018($sp) +/* 00528 80B26BD8 8FAF0018 */ lw $t7, 0x0018($sp) /* 0052C 80B26BDC 3C0E80B2 */ lui $t6, %hi(func_80B2742C) ## $t6 = 80B20000 /* 00530 80B26BE0 25CE742C */ addiu $t6, $t6, %lo(func_80B2742C) ## $t6 = 80B2742C /* 00534 80B26BE4 ADEE0190 */ sw $t6, 0x0190($t7) ## 00000190 -/* 00538 80B26BE8 8FBF0014 */ lw $ra, 0x0014($sp) +/* 00538 80B26BE8 8FBF0014 */ lw $ra, 0x0014($sp) /* 0053C 80B26BEC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00540 80B26BF0 03E00008 */ jr $ra +/* 00540 80B26BF0 03E00008 */ jr $ra /* 00544 80B26BF4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Vali/func_80B26D54.s b/asm/non_matchings/overlays/actors/ovl_En_Vali/func_80B26D54.s index f23ceb364a..35b5bd85db 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Vali/func_80B26D54.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Vali/func_80B26D54.s @@ -1,28 +1,28 @@ glabel func_80B26D54 /* 006A4 80B26D54 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 006A8 80B26D58 AFB00020 */ sw $s0, 0x0020($sp) +/* 006A8 80B26D58 AFB00020 */ sw $s0, 0x0020($sp) /* 006AC 80B26D5C 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 006B0 80B26D60 AFBF0024 */ sw $ra, 0x0024($sp) +/* 006B0 80B26D60 AFBF0024 */ sw $ra, 0x0024($sp) /* 006B4 80B26D64 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 006B8 80B26D68 24A50710 */ addiu $a1, $a1, 0x0710 ## $a1 = 06000710 /* 006BC 80B26D6C 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 006C0 80B26D70 0C029490 */ jal func_800A5240 +/* 006C0 80B26D70 0C029490 */ jal SkelAnime_ChangeAnimTransitionStop /* 006C4 80B26D74 3C064120 */ lui $a2, 0x4120 ## $a2 = 41200000 /* 006C8 80B26D78 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 /* 006CC 80B26D7C 240E0050 */ addiu $t6, $zero, 0x0050 ## $t6 = 00000050 /* 006D0 80B26D80 A60E0196 */ sh $t6, 0x0196($s0) ## 00000196 /* 006D4 80B26D84 240F0050 */ addiu $t7, $zero, 0x0050 ## $t7 = 00000050 /* 006D8 80B26D88 E6040060 */ swc1 $f4, 0x0060($s0) ## 00000060 -/* 006DC 80B26D8C AFAF0010 */ sw $t7, 0x0010($sp) +/* 006DC 80B26D8C AFAF0010 */ sw $t7, 0x0010($sp) /* 006E0 80B26D90 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 006E4 80B26D94 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 006E8 80B26D98 240600FF */ addiu $a2, $zero, 0x00FF ## $a2 = 000000FF -/* 006EC 80B26D9C 0C00D09B */ jal func_8003426C +/* 006EC 80B26D9C 0C00D09B */ jal func_8003426C /* 006F0 80B26DA0 24072000 */ addiu $a3, $zero, 0x2000 ## $a3 = 00002000 /* 006F4 80B26DA4 A2000420 */ sb $zero, 0x0420($s0) ## 00000420 /* 006F8 80B26DA8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 006FC 80B26DAC 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 00700 80B26DB0 2405389E */ addiu $a1, $zero, 0x389E ## $a1 = 0000389E /* 00704 80B26DB4 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 /* 00708 80B26DB8 44813000 */ mtc1 $at, $f6 ## $f6 = 1.00 @@ -30,10 +30,10 @@ glabel func_80B26D54 /* 00710 80B26DC0 27187654 */ addiu $t8, $t8, %lo(func_80B27654) ## $t8 = 80B27654 /* 00714 80B26DC4 AE180190 */ sw $t8, 0x0190($s0) ## 00000190 /* 00718 80B26DC8 E6060060 */ swc1 $f6, 0x0060($s0) ## 00000060 -/* 0071C 80B26DCC 8FBF0024 */ lw $ra, 0x0024($sp) -/* 00720 80B26DD0 8FB00020 */ lw $s0, 0x0020($sp) +/* 0071C 80B26DCC 8FBF0024 */ lw $ra, 0x0024($sp) +/* 00720 80B26DD0 8FB00020 */ lw $s0, 0x0020($sp) /* 00724 80B26DD4 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 00728 80B26DD8 03E00008 */ jr $ra +/* 00728 80B26DD8 03E00008 */ jr $ra /* 0072C 80B26DDC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Vali/func_80B26E40.s b/asm/non_matchings/overlays/actors/ovl_En_Vali/func_80B26E40.s index 0c119b80d2..9ca111cefa 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Vali/func_80B26E40.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Vali/func_80B26E40.s @@ -1,26 +1,26 @@ glabel func_80B26E40 /* 00790 80B26E40 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00794 80B26E44 AFBF0014 */ sw $ra, 0x0014($sp) +/* 00794 80B26E44 AFBF0014 */ sw $ra, 0x0014($sp) /* 00798 80B26E48 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 /* 0079C 80B26E4C 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 007A0 80B26E50 24A514AC */ addiu $a1, $a1, 0x14AC ## $a1 = 060014AC -/* 007A4 80B26E54 AFA70018 */ sw $a3, 0x0018($sp) +/* 007A4 80B26E54 AFA70018 */ sw $a3, 0x0018($sp) /* 007A8 80B26E58 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 007AC 80B26E5C 0C029490 */ jal func_800A5240 +/* 007AC 80B26E5C 0C029490 */ jal SkelAnime_ChangeAnimTransitionStop /* 007B0 80B26E60 3C064120 */ lui $a2, 0x4120 ## $a2 = 41200000 -/* 007B4 80B26E64 8FA70018 */ lw $a3, 0x0018($sp) +/* 007B4 80B26E64 8FA70018 */ lw $a3, 0x0018($sp) /* 007B8 80B26E68 2401FFFE */ addiu $at, $zero, 0xFFFE ## $at = FFFFFFFE /* 007BC 80B26E6C 3C0880B2 */ lui $t0, %hi(func_80B278A0) ## $t0 = 80B20000 /* 007C0 80B26E70 8CEE0004 */ lw $t6, 0x0004($a3) ## 00000004 /* 007C4 80B26E74 250878A0 */ addiu $t0, $t0, %lo(func_80B278A0) ## $t0 = 80B278A0 /* 007C8 80B26E78 ACE80190 */ sw $t0, 0x0190($a3) ## 00000190 /* 007CC 80B26E7C 35CF0010 */ ori $t7, $t6, 0x0010 ## $t7 = 00000010 -/* 007D0 80B26E80 01E1C824 */ and $t9, $t7, $at +/* 007D0 80B26E80 01E1C824 */ and $t9, $t7, $at /* 007D4 80B26E84 ACEF0004 */ sw $t7, 0x0004($a3) ## 00000004 /* 007D8 80B26E88 ACF90004 */ sw $t9, 0x0004($a3) ## 00000004 -/* 007DC 80B26E8C 8FBF0014 */ lw $ra, 0x0014($sp) +/* 007DC 80B26E8C 8FBF0014 */ lw $ra, 0x0014($sp) /* 007E0 80B26E90 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 007E4 80B26E94 03E00008 */ jr $ra +/* 007E4 80B26E94 03E00008 */ jr $ra /* 007E8 80B26E98 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Vali/func_80B28344.s b/asm/non_matchings/overlays/actors/ovl_En_Vali/func_80B28344.s index b08e3dd293..2cc52a8f27 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Vali/func_80B28344.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Vali/func_80B28344.s @@ -19,7 +19,7 @@ glabel func_80B28344 /* 01CD8 80B28388 27A40054 */ addiu $a0, $sp, 0x0054 ## $a0 = FFFFFF94 /* 01CDC 80B2838C 8D050000 */ lw $a1, 0x0000($t0) ## 00000000 /* 01CE0 80B28390 24070594 */ addiu $a3, $zero, 0x0594 ## $a3 = 00000594 -/* 01CE4 80B28394 0C031AB1 */ jal func_800C6AC4 +/* 01CE4 80B28394 0C031AB1 */ jal Graph_OpenDisps /* 01CE8 80B28398 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 /* 01CEC 80B2839C 0C034236 */ jal Matrix_Get /* 01CF0 80B283A0 27A40080 */ addiu $a0, $sp, 0x0080 ## $a0 = FFFFFFC0 @@ -239,7 +239,7 @@ glabel func_80B28344 /* 02040 80B286F0 24C68A20 */ addiu $a2, $a2, %lo(D_80B28A20) ## $a2 = 80B28A20 /* 02044 80B286F4 27A40054 */ addiu $a0, $sp, 0x0054 ## $a0 = FFFFFF94 /* 02048 80B286F8 240705C5 */ addiu $a3, $zero, 0x05C5 ## $a3 = 000005C5 -/* 0204C 80B286FC 0C031AD5 */ jal func_800C6B54 +/* 0204C 80B286FC 0C031AD5 */ jal Graph_CloseDisps /* 02050 80B28700 8DA50000 */ lw $a1, 0x0000($t5) ## 00000000 /* 02054 80B28704 8FBF001C */ lw $ra, 0x001C($sp) /* 02058 80B28708 8FB00018 */ lw $s0, 0x0018($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Vb_Ball/EnVbBall_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Vb_Ball/EnVbBall_Draw.s index 2c73088bca..07b4eaff65 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Vb_Ball/EnVbBall_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Vb_Ball/EnVbBall_Draw.s @@ -9,7 +9,7 @@ glabel EnVbBall_Draw /* 00DFC 80B29D9C 24C6A090 */ addiu $a2, $a2, %lo(D_80B2A090) ## $a2 = 80B2A090 /* 00E00 80B29DA0 27A4003C */ addiu $a0, $sp, 0x003C ## $a0 = FFFFFFE4 /* 00E04 80B29DA4 2407025C */ addiu $a3, $zero, 0x025C ## $a3 = 0000025C -/* 00E08 80B29DA8 0C031AB1 */ jal func_800C6AC4 +/* 00E08 80B29DA8 0C031AB1 */ jal Graph_OpenDisps /* 00E0C 80B29DAC 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 /* 00E10 80B29DB0 8FAF005C */ lw $t7, 0x005C($sp) /* 00E14 80B29DB4 0C024F46 */ jal func_80093D18 @@ -145,7 +145,7 @@ glabel EnVbBall_Draw /* 01014 80B29FB4 24C6A0CC */ addiu $a2, $a2, %lo(D_80B2A0CC) ## $a2 = 80B2A0CC /* 01018 80B29FB8 27A4003C */ addiu $a0, $sp, 0x003C ## $a0 = FFFFFFE4 /* 0101C 80B29FBC 24070278 */ addiu $a3, $zero, 0x0278 ## $a3 = 00000278 -/* 01020 80B29FC0 0C031AD5 */ jal func_800C6B54 +/* 01020 80B29FC0 0C031AD5 */ jal Graph_CloseDisps /* 01024 80B29FC4 8D450000 */ lw $a1, 0x0000($t2) ## 00000000 /* 01028 80B29FC8 8FBF001C */ lw $ra, 0x001C($sp) /* 0102C 80B29FCC 8FB00018 */ lw $s0, 0x0018($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Vb_Ball/EnVbBall_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Vb_Ball/EnVbBall_Init.s index eee6740370..b159bba660 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Vb_Ball/EnVbBall_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Vb_Ball/EnVbBall_Init.s @@ -21,7 +21,7 @@ glabel EnVbBall_Init /* 00044 80B28FE4 E600015C */ swc1 $f0, 0x015C($s0) ## 0000015C /* 00048 80B28FE8 E6000158 */ swc1 $f0, 0x0158($s0) ## 00000158 /* 0004C 80B28FEC C60C0024 */ lwc1 $f12, 0x0024($s0) ## 00000024 -/* 00050 80B28FF0 0C03F494 */ jal func_800FD250 +/* 00050 80B28FF0 0C03F494 */ jal Math_atan2f /* 00054 80B28FF4 C60E002C */ lwc1 $f14, 0x002C($s0) ## 0000002C /* 00058 80B28FF8 3C014040 */ lui $at, 0x4040 ## $at = 40400000 /* 0005C 80B28FFC 44816000 */ mtc1 $at, $f12 ## $f12 = 3.00 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Vb_Ball/EnVbBall_Update.s b/asm/non_matchings/overlays/actors/ovl_En_Vb_Ball/EnVbBall_Update.s index ae301b606d..707912020c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Vb_Ball/EnVbBall_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Vb_Ball/EnVbBall_Update.s @@ -242,7 +242,7 @@ glabel EnVbBall_Update /* 00980 80B29920 46004282 */ mul.s $f10, $f8, $f0 /* 00984 80B29924 E60A0158 */ swc1 $f10, 0x0158($s0) ## 00000158 /* 00988 80B29928 C7AE00F4 */ lwc1 $f14, 0x00F4($sp) -/* 0098C 80B2992C 0C03F494 */ jal func_800FD250 +/* 0098C 80B2992C 0C03F494 */ jal Math_atan2f /* 00990 80B29930 C7AC00EC */ lwc1 $f12, 0x00EC($sp) /* 00994 80B29934 3C0180B3 */ lui $at, %hi(D_80B2A100) ## $at = 80B30000 /* 00998 80B29938 C430A100 */ lwc1 $f16, %lo(D_80B2A100)($at) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Vb_Ball/func_80B292D0.s b/asm/non_matchings/overlays/actors/ovl_En_Vb_Ball/func_80B292D0.s index 3eb7d2cebc..03ca52ddc3 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Vb_Ball/func_80B292D0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Vb_Ball/func_80B292D0.s @@ -52,7 +52,7 @@ glabel func_80B292D0 /* 003F0 80B29390 4600A306 */ mov.s $f12, $f20 /* 003F4 80B29394 E660015C */ swc1 $f0, 0x015C($s3) ## 0000015C /* 003F8 80B29398 C66C0024 */ lwc1 $f12, 0x0024($s3) ## 00000024 -/* 003FC 80B2939C 0C03F494 */ jal func_800FD250 +/* 003FC 80B2939C 0C03F494 */ jal Math_atan2f /* 00400 80B293A0 C66E002C */ lwc1 $f14, 0x002C($s3) ## 0000002C /* 00404 80B293A4 46000506 */ mov.s $f20, $f0 /* 00408 80B293A8 0C0400A4 */ jal sinf diff --git a/asm/non_matchings/overlays/actors/ovl_En_Viewer/EnViewer_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Viewer/EnViewer_Draw.s index 287e0149fd..c55cc1dd5e 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Viewer/EnViewer_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Viewer/EnViewer_Draw.s @@ -9,7 +9,7 @@ glabel EnViewer_Draw /* 02094 80B2C294 24C6D120 */ addiu $a2, $a2, %lo(D_80B2D120) ## $a2 = 80B2D120 /* 02098 80B2C298 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 /* 0209C 80B2C29C 27A40020 */ addiu $a0, $sp, 0x0020 ## $a0 = FFFFFFE0 -/* 020A0 80B2C2A0 0C031AB1 */ jal func_800C6AC4 +/* 020A0 80B2C2A0 0C031AB1 */ jal Graph_OpenDisps /* 020A4 80B2C2A4 240706E0 */ addiu $a3, $zero, 0x06E0 ## $a3 = 000006E0 /* 020A8 80B2C2A8 922E01E6 */ lbu $t6, 0x01E6($s1) ## 000001E6 /* 020AC 80B2C2AC 11C0002F */ beq $t6, $zero, .L80B2C36C @@ -68,7 +68,7 @@ glabel EnViewer_Draw /* 02170 80B2C370 24C6D134 */ addiu $a2, $a2, %lo(D_80B2D134) ## $a2 = 80B2D134 /* 02174 80B2C374 27A40020 */ addiu $a0, $sp, 0x0020 ## $a0 = FFFFFFE0 /* 02178 80B2C378 8E050000 */ lw $a1, 0x0000($s0) ## 00000000 -/* 0217C 80B2C37C 0C031AD5 */ jal func_800C6B54 +/* 0217C 80B2C37C 0C031AD5 */ jal Graph_CloseDisps /* 02180 80B2C380 240706F8 */ addiu $a3, $zero, 0x06F8 ## $a3 = 000006F8 /* 02184 80B2C384 8FBF001C */ lw $ra, 0x001C($sp) /* 02188 80B2C388 8FB00014 */ lw $s0, 0x0014($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Viewer/func_80B2A300.s b/asm/non_matchings/overlays/actors/ovl_En_Viewer/func_80B2A300.s index 5f09dd9c31..7364f755ff 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Viewer/func_80B2A300.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Viewer/func_80B2A300.s @@ -1,92 +1,92 @@ glabel func_80B2A300 /* 00100 80B2A300 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 00104 80B2A304 AFBF002C */ sw $ra, 0x002C($sp) -/* 00108 80B2A308 AFB00028 */ sw $s0, 0x0028($sp) -/* 0010C 80B2A30C AFA40038 */ sw $a0, 0x0038($sp) -/* 00110 80B2A310 AFA5003C */ sw $a1, 0x003C($sp) -/* 00114 80B2A314 AFA70044 */ sw $a3, 0x0044($sp) +/* 00104 80B2A304 AFBF002C */ sw $ra, 0x002C($sp) +/* 00108 80B2A308 AFB00028 */ sw $s0, 0x0028($sp) +/* 0010C 80B2A30C AFA40038 */ sw $a0, 0x0038($sp) +/* 00110 80B2A310 AFA5003C */ sw $a1, 0x003C($sp) +/* 00114 80B2A314 AFA70044 */ sw $a3, 0x0044($sp) /* 00118 80B2A318 8482001C */ lh $v0, 0x001C($a0) ## 0000001C /* 0011C 80B2A31C 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 00120 80B2A320 8FA4003C */ lw $a0, 0x003C($sp) -/* 00124 80B2A324 00021203 */ sra $v0, $v0, 8 -/* 00128 80B2A328 00021400 */ sll $v0, $v0, 16 -/* 0012C 80B2A32C 00021403 */ sra $v0, $v0, 16 -/* 00130 80B2A330 1041000C */ beq $v0, $at, .L80B2A364 -/* 00134 80B2A334 8FB00038 */ lw $s0, 0x0038($sp) +/* 00120 80B2A320 8FA4003C */ lw $a0, 0x003C($sp) +/* 00124 80B2A324 00021203 */ sra $v0, $v0, 8 +/* 00128 80B2A328 00021400 */ sll $v0, $v0, 16 +/* 0012C 80B2A32C 00021403 */ sra $v0, $v0, 16 +/* 00130 80B2A330 1041000C */ beq $v0, $at, .L80B2A364 +/* 00134 80B2A334 8FB00038 */ lw $s0, 0x0038($sp) /* 00138 80B2A338 24010003 */ addiu $at, $zero, 0x0003 ## $at = 00000003 -/* 0013C 80B2A33C 10410009 */ beq $v0, $at, .L80B2A364 +/* 0013C 80B2A33C 10410009 */ beq $v0, $at, .L80B2A364 /* 00140 80B2A340 24010005 */ addiu $at, $zero, 0x0005 ## $at = 00000005 -/* 00144 80B2A344 10410007 */ beq $v0, $at, .L80B2A364 +/* 00144 80B2A344 10410007 */ beq $v0, $at, .L80B2A364 /* 00148 80B2A348 24010007 */ addiu $at, $zero, 0x0007 ## $at = 00000007 -/* 0014C 80B2A34C 10410005 */ beq $v0, $at, .L80B2A364 +/* 0014C 80B2A34C 10410005 */ beq $v0, $at, .L80B2A364 /* 00150 80B2A350 24010008 */ addiu $at, $zero, 0x0008 ## $at = 00000008 -/* 00154 80B2A354 10410003 */ beq $v0, $at, .L80B2A364 +/* 00154 80B2A354 10410003 */ beq $v0, $at, .L80B2A364 /* 00158 80B2A358 24010009 */ addiu $at, $zero, 0x0009 ## $at = 00000009 -/* 0015C 80B2A35C 1441000B */ bne $v0, $at, .L80B2A38C +/* 0015C 80B2A35C 1441000B */ bne $v0, $at, .L80B2A38C /* 00160 80B2A360 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 .L80B2A364: /* 00164 80B2A364 26100198 */ addiu $s0, $s0, 0x0198 ## $s0 = 00000198 /* 00168 80B2A368 02002825 */ or $a1, $s0, $zero ## $a1 = 00000198 /* 0016C 80B2A36C 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 00170 80B2A370 AFA00010 */ sw $zero, 0x0010($sp) -/* 00174 80B2A374 AFA00014 */ sw $zero, 0x0014($sp) -/* 00178 80B2A378 AFA00018 */ sw $zero, 0x0018($sp) -/* 0017C 80B2A37C 0C0291BE */ jal func_800A46F8 -/* 00180 80B2A380 A7A20036 */ sh $v0, 0x0036($sp) -/* 00184 80B2A384 1000000B */ beq $zero, $zero, .L80B2A3B4 -/* 00188 80B2A388 87A20036 */ lh $v0, 0x0036($sp) +/* 00170 80B2A370 AFA00010 */ sw $zero, 0x0010($sp) +/* 00174 80B2A374 AFA00014 */ sw $zero, 0x0014($sp) +/* 00178 80B2A378 AFA00018 */ sw $zero, 0x0018($sp) +/* 0017C 80B2A37C 0C0291BE */ jal SkelAnime_InitSV +/* 00180 80B2A380 A7A20036 */ sh $v0, 0x0036($sp) +/* 00184 80B2A384 1000000B */ beq $zero, $zero, .L80B2A3B4 +/* 00188 80B2A388 87A20036 */ lh $v0, 0x0036($sp) .L80B2A38C: -/* 0018C 80B2A38C 8FB00038 */ lw $s0, 0x0038($sp) -/* 00190 80B2A390 8FA4003C */ lw $a0, 0x003C($sp) -/* 00194 80B2A394 AFA00010 */ sw $zero, 0x0010($sp) +/* 0018C 80B2A38C 8FB00038 */ lw $s0, 0x0038($sp) +/* 00190 80B2A390 8FA4003C */ lw $a0, 0x003C($sp) +/* 00194 80B2A394 AFA00010 */ sw $zero, 0x0010($sp) /* 00198 80B2A398 26100198 */ addiu $s0, $s0, 0x0198 ## $s0 = 00000330 /* 0019C 80B2A39C 02002825 */ or $a1, $s0, $zero ## $a1 = 00000330 -/* 001A0 80B2A3A0 AFA00014 */ sw $zero, 0x0014($sp) -/* 001A4 80B2A3A4 AFA00018 */ sw $zero, 0x0018($sp) +/* 001A0 80B2A3A0 AFA00014 */ sw $zero, 0x0014($sp) +/* 001A4 80B2A3A4 AFA00018 */ sw $zero, 0x0018($sp) /* 001A8 80B2A3A8 0C02915F */ jal SkelAnime_Init - -/* 001AC 80B2A3AC A7A20036 */ sh $v0, 0x0036($sp) -/* 001B0 80B2A3B0 87A20036 */ lh $v0, 0x0036($sp) + +/* 001AC 80B2A3AC A7A20036 */ sh $v0, 0x0036($sp) +/* 001B0 80B2A3B0 87A20036 */ lh $v0, 0x0036($sp) .L80B2A3B4: -/* 001B4 80B2A3B4 8FB80038 */ lw $t8, 0x0038($sp) -/* 001B8 80B2A3B8 8FAF003C */ lw $t7, 0x003C($sp) +/* 001B4 80B2A3B4 8FB80038 */ lw $t8, 0x0038($sp) +/* 001B8 80B2A3B8 8FAF003C */ lw $t7, 0x003C($sp) /* 001BC 80B2A3BC 3C0A0001 */ lui $t2, 0x0001 ## $t2 = 00010000 /* 001C0 80B2A3C0 831901DC */ lb $t9, 0x01DC($t8) ## 000001DC /* 001C4 80B2A3C4 3C018000 */ lui $at, 0x8000 ## $at = 80000000 /* 001C8 80B2A3C8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000330 -/* 001CC 80B2A3CC 00194100 */ sll $t0, $t9, 4 -/* 001D0 80B2A3D0 01194021 */ addu $t0, $t0, $t9 -/* 001D4 80B2A3D4 00084080 */ sll $t0, $t0, 2 -/* 001D8 80B2A3D8 01E84821 */ addu $t1, $t7, $t0 -/* 001DC 80B2A3DC 01495021 */ addu $t2, $t2, $t1 +/* 001CC 80B2A3CC 00194100 */ sll $t0, $t9, 4 +/* 001D0 80B2A3D0 01194021 */ addu $t0, $t0, $t9 +/* 001D4 80B2A3D4 00084080 */ sll $t0, $t0, 2 +/* 001D8 80B2A3D8 01E84821 */ addu $t1, $t7, $t0 +/* 001DC 80B2A3DC 01495021 */ addu $t2, $t2, $t1 /* 001E0 80B2A3E0 8D4A17B4 */ lw $t2, 0x17B4($t2) ## 000117B4 -/* 001E4 80B2A3E4 8FA50044 */ lw $a1, 0x0044($sp) -/* 001E8 80B2A3E8 01415821 */ addu $t3, $t2, $at +/* 001E4 80B2A3E4 8FA50044 */ lw $a1, 0x0044($sp) +/* 001E8 80B2A3E8 01415821 */ addu $t3, $t2, $at /* 001EC 80B2A3EC 3C018016 */ lui $at, 0x8016 ## $at = 80160000 /* 001F0 80B2A3F0 AC2B6FC0 */ sw $t3, 0x6FC0($at) ## 80166FC0 /* 001F4 80B2A3F4 24010003 */ addiu $at, $zero, 0x0003 ## $at = 00000003 -/* 001F8 80B2A3F8 10410007 */ beq $v0, $at, .L80B2A418 +/* 001F8 80B2A3F8 10410007 */ beq $v0, $at, .L80B2A418 /* 001FC 80B2A3FC 24010007 */ addiu $at, $zero, 0x0007 ## $at = 00000007 -/* 00200 80B2A400 10410005 */ beq $v0, $at, .L80B2A418 +/* 00200 80B2A400 10410005 */ beq $v0, $at, .L80B2A418 /* 00204 80B2A404 24010008 */ addiu $at, $zero, 0x0008 ## $at = 00000008 -/* 00208 80B2A408 10410003 */ beq $v0, $at, .L80B2A418 +/* 00208 80B2A408 10410003 */ beq $v0, $at, .L80B2A418 /* 0020C 80B2A40C 24010009 */ addiu $at, $zero, 0x0009 ## $at = 00000009 -/* 00210 80B2A410 14410005 */ bne $v0, $at, .L80B2A428 +/* 00210 80B2A410 14410005 */ bne $v0, $at, .L80B2A428 /* 00214 80B2A414 3C064040 */ lui $a2, 0x4040 ## $a2 = 40400000 .L80B2A418: -/* 00218 80B2A418 0C0294E1 */ jal func_800A5384 +/* 00218 80B2A418 0C0294E1 */ jal SkelAnime_ChangeAnimPlaybackRepeat /* 0021C 80B2A41C 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 00220 80B2A420 10000005 */ beq $zero, $zero, .L80B2A438 -/* 00224 80B2A424 8FBF002C */ lw $ra, 0x002C($sp) +/* 00220 80B2A420 10000005 */ beq $zero, $zero, .L80B2A438 +/* 00224 80B2A424 8FBF002C */ lw $ra, 0x002C($sp) .L80B2A428: /* 00228 80B2A428 02002025 */ or $a0, $s0, $zero ## $a0 = 00000330 -/* 0022C 80B2A42C 0C0294E1 */ jal func_800A5384 -/* 00230 80B2A430 8FA50044 */ lw $a1, 0x0044($sp) -/* 00234 80B2A434 8FBF002C */ lw $ra, 0x002C($sp) +/* 0022C 80B2A42C 0C0294E1 */ jal SkelAnime_ChangeAnimPlaybackRepeat +/* 00230 80B2A430 8FA50044 */ lw $a1, 0x0044($sp) +/* 00234 80B2A434 8FBF002C */ lw $ra, 0x002C($sp) .L80B2A438: -/* 00238 80B2A438 8FB00028 */ lw $s0, 0x0028($sp) +/* 00238 80B2A438 8FB00028 */ lw $s0, 0x0028($sp) /* 0023C 80B2A43C 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 -/* 00240 80B2A440 03E00008 */ jr $ra +/* 00240 80B2A440 03E00008 */ jr $ra /* 00244 80B2A444 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Viewer/func_80B2A448.s b/asm/non_matchings/overlays/actors/ovl_En_Viewer/func_80B2A448.s index eac3447e2d..7184dffd12 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Viewer/func_80B2A448.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Viewer/func_80B2A448.s @@ -1,39 +1,39 @@ glabel func_80B2A448 /* 00248 80B2A448 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 0024C 80B2A44C AFA40030 */ sw $a0, 0x0030($sp) -/* 00250 80B2A450 AFA50034 */ sw $a1, 0x0034($sp) +/* 0024C 80B2A44C AFA40030 */ sw $a0, 0x0030($sp) +/* 00250 80B2A450 AFA50034 */ sw $a1, 0x0034($sp) /* 00254 80B2A454 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 00258 80B2A458 8FA50030 */ lw $a1, 0x0030($sp) -/* 0025C 80B2A45C AFBF0024 */ sw $ra, 0x0024($sp) -/* 00260 80B2A460 AFA7003C */ sw $a3, 0x003C($sp) +/* 00258 80B2A458 8FA50030 */ lw $a1, 0x0030($sp) +/* 0025C 80B2A45C AFBF0024 */ sw $ra, 0x0024($sp) +/* 00260 80B2A460 AFA7003C */ sw $a3, 0x003C($sp) /* 00264 80B2A464 24A50198 */ addiu $a1, $a1, 0x0198 ## $a1 = 00000198 -/* 00268 80B2A468 AFA5002C */ sw $a1, 0x002C($sp) +/* 00268 80B2A468 AFA5002C */ sw $a1, 0x002C($sp) /* 0026C 80B2A46C 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 00270 80B2A470 AFA00010 */ sw $zero, 0x0010($sp) -/* 00274 80B2A474 AFA00014 */ sw $zero, 0x0014($sp) -/* 00278 80B2A478 0C0291BE */ jal func_800A46F8 -/* 0027C 80B2A47C AFA00018 */ sw $zero, 0x0018($sp) -/* 00280 80B2A480 8FAF0030 */ lw $t7, 0x0030($sp) -/* 00284 80B2A484 8FAE0034 */ lw $t6, 0x0034($sp) +/* 00270 80B2A470 AFA00010 */ sw $zero, 0x0010($sp) +/* 00274 80B2A474 AFA00014 */ sw $zero, 0x0014($sp) +/* 00278 80B2A478 0C0291BE */ jal SkelAnime_InitSV +/* 0027C 80B2A47C AFA00018 */ sw $zero, 0x0018($sp) +/* 00280 80B2A480 8FAF0030 */ lw $t7, 0x0030($sp) +/* 00284 80B2A484 8FAE0034 */ lw $t6, 0x0034($sp) /* 00288 80B2A488 3C090001 */ lui $t1, 0x0001 ## $t1 = 00010000 /* 0028C 80B2A48C 81F801DC */ lb $t8, 0x01DC($t7) ## 000001DC /* 00290 80B2A490 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 00294 80B2A494 8FA4002C */ lw $a0, 0x002C($sp) -/* 00298 80B2A498 0018C900 */ sll $t9, $t8, 4 -/* 0029C 80B2A49C 0338C821 */ addu $t9, $t9, $t8 -/* 002A0 80B2A4A0 0019C880 */ sll $t9, $t9, 2 -/* 002A4 80B2A4A4 01D94021 */ addu $t0, $t6, $t9 -/* 002A8 80B2A4A8 01284821 */ addu $t1, $t1, $t0 +/* 00294 80B2A494 8FA4002C */ lw $a0, 0x002C($sp) +/* 00298 80B2A498 0018C900 */ sll $t9, $t8, 4 +/* 0029C 80B2A49C 0338C821 */ addu $t9, $t9, $t8 +/* 002A0 80B2A4A0 0019C880 */ sll $t9, $t9, 2 +/* 002A4 80B2A4A4 01D94021 */ addu $t0, $t6, $t9 +/* 002A8 80B2A4A8 01284821 */ addu $t1, $t1, $t0 /* 002AC 80B2A4AC 8D2917B4 */ lw $t1, 0x17B4($t1) ## 000117B4 -/* 002B0 80B2A4B0 8FA5003C */ lw $a1, 0x003C($sp) +/* 002B0 80B2A4B0 8FA5003C */ lw $a1, 0x003C($sp) /* 002B4 80B2A4B4 3C064040 */ lui $a2, 0x4040 ## $a2 = 40400000 -/* 002B8 80B2A4B8 01215021 */ addu $t2, $t1, $at +/* 002B8 80B2A4B8 01215021 */ addu $t2, $t1, $at /* 002BC 80B2A4BC 3C018016 */ lui $at, 0x8016 ## $at = 80160000 -/* 002C0 80B2A4C0 0C0294E1 */ jal func_800A5384 +/* 002C0 80B2A4C0 0C0294E1 */ jal SkelAnime_ChangeAnimPlaybackRepeat /* 002C4 80B2A4C4 AC2A6FC0 */ sw $t2, 0x6FC0($at) ## 80166FC0 -/* 002C8 80B2A4C8 8FBF0024 */ lw $ra, 0x0024($sp) +/* 002C8 80B2A4C8 8FBF0024 */ lw $ra, 0x0024($sp) /* 002CC 80B2A4CC 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 002D0 80B2A4D0 03E00008 */ jr $ra +/* 002D0 80B2A4D0 03E00008 */ jr $ra /* 002D4 80B2A4D4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Viewer/func_80B2A4D8.s b/asm/non_matchings/overlays/actors/ovl_En_Viewer/func_80B2A4D8.s index 36c0a0df07..eeb4a8225b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Viewer/func_80B2A4D8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Viewer/func_80B2A4D8.s @@ -1,43 +1,43 @@ glabel func_80B2A4D8 /* 002D8 80B2A4D8 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 002DC 80B2A4DC AFA40018 */ sw $a0, 0x0018($sp) -/* 002E0 80B2A4E0 AFA5001C */ sw $a1, 0x001C($sp) +/* 002DC 80B2A4DC AFA40018 */ sw $a0, 0x0018($sp) +/* 002E0 80B2A4E0 AFA5001C */ sw $a1, 0x001C($sp) /* 002E4 80B2A4E4 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 002E8 80B2A4E8 8FA50018 */ lw $a1, 0x0018($sp) -/* 002EC 80B2A4EC AFBF0014 */ sw $ra, 0x0014($sp) -/* 002F0 80B2A4F0 AFA70024 */ sw $a3, 0x0024($sp) -/* 002F4 80B2A4F4 0C02998F */ jal func_800A663C +/* 002E8 80B2A4E8 8FA50018 */ lw $a1, 0x0018($sp) +/* 002EC 80B2A4EC AFBF0014 */ sw $ra, 0x0014($sp) +/* 002F0 80B2A4F0 AFA70024 */ sw $a3, 0x0024($sp) +/* 002F4 80B2A4F4 0C02998F */ jal func_800A663C /* 002F8 80B2A4F8 24A5014C */ addiu $a1, $a1, 0x014C ## $a1 = 0000014C -/* 002FC 80B2A4FC 8FA80018 */ lw $t0, 0x0018($sp) -/* 00300 80B2A500 8FA70024 */ lw $a3, 0x0024($sp) +/* 002FC 80B2A4FC 8FA80018 */ lw $t0, 0x0018($sp) +/* 00300 80B2A500 8FA70024 */ lw $a3, 0x0024($sp) /* 00304 80B2A504 24010003 */ addiu $at, $zero, 0x0003 ## $at = 00000003 /* 00308 80B2A508 8503001C */ lh $v1, 0x001C($t0) ## 0000001C /* 0030C 80B2A50C 25040198 */ addiu $a0, $t0, 0x0198 ## $a0 = 00000198 /* 00310 80B2A510 00E02825 */ or $a1, $a3, $zero ## $a1 = 00000000 -/* 00314 80B2A514 00031A03 */ sra $v1, $v1, 8 +/* 00314 80B2A514 00031A03 */ sra $v1, $v1, 8 /* 00318 80B2A518 306300FF */ andi $v1, $v1, 0x00FF ## $v1 = 00000000 -/* 0031C 80B2A51C 1061000E */ beq $v1, $at, .L80B2A558 +/* 0031C 80B2A51C 1061000E */ beq $v1, $at, .L80B2A558 /* 00320 80B2A520 24010004 */ addiu $at, $zero, 0x0004 ## $at = 00000004 -/* 00324 80B2A524 1061000C */ beq $v1, $at, .L80B2A558 +/* 00324 80B2A524 1061000C */ beq $v1, $at, .L80B2A558 /* 00328 80B2A528 24010007 */ addiu $at, $zero, 0x0007 ## $at = 00000007 -/* 0032C 80B2A52C 1061000A */ beq $v1, $at, .L80B2A558 +/* 0032C 80B2A52C 1061000A */ beq $v1, $at, .L80B2A558 /* 00330 80B2A530 24010008 */ addiu $at, $zero, 0x0008 ## $at = 00000008 -/* 00334 80B2A534 10610008 */ beq $v1, $at, .L80B2A558 +/* 00334 80B2A534 10610008 */ beq $v1, $at, .L80B2A558 /* 00338 80B2A538 24010009 */ addiu $at, $zero, 0x0009 ## $at = 00000009 -/* 0033C 80B2A53C 10610006 */ beq $v1, $at, .L80B2A558 +/* 0033C 80B2A53C 10610006 */ beq $v1, $at, .L80B2A558 /* 00340 80B2A540 3C064040 */ lui $a2, 0x4040 ## $a2 = 40400000 /* 00344 80B2A544 25040198 */ addiu $a0, $t0, 0x0198 ## $a0 = 00000198 -/* 00348 80B2A548 0C0294E1 */ jal func_800A5384 +/* 00348 80B2A548 0C0294E1 */ jal SkelAnime_ChangeAnimPlaybackRepeat /* 0034C 80B2A54C 00E02825 */ or $a1, $a3, $zero ## $a1 = 00000000 -/* 00350 80B2A550 10000004 */ beq $zero, $zero, .L80B2A564 -/* 00354 80B2A554 8FBF0014 */ lw $ra, 0x0014($sp) +/* 00350 80B2A550 10000004 */ beq $zero, $zero, .L80B2A564 +/* 00354 80B2A554 8FBF0014 */ lw $ra, 0x0014($sp) .L80B2A558: -/* 00358 80B2A558 0C0294A7 */ jal func_800A529C +/* 00358 80B2A558 0C0294A7 */ jal SkelAnime_ChangeAnimPlaybackStop /* 0035C 80B2A55C 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 00360 80B2A560 8FBF0014 */ lw $ra, 0x0014($sp) +/* 00360 80B2A560 8FBF0014 */ lw $ra, 0x0014($sp) .L80B2A564: /* 00364 80B2A564 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00368 80B2A568 03E00008 */ jr $ra +/* 00368 80B2A568 03E00008 */ jr $ra /* 0036C 80B2A56C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Viewer/func_80B2A75C.s b/asm/non_matchings/overlays/actors/ovl_En_Viewer/func_80B2A75C.s index c590ab68cb..94af4aabb4 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Viewer/func_80B2A75C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Viewer/func_80B2A75C.s @@ -1,92 +1,92 @@ glabel func_80B2A75C /* 0055C 80B2A75C 27BDFFA8 */ addiu $sp, $sp, 0xFFA8 ## $sp = FFFFFFA8 -/* 00560 80B2A760 AFBF003C */ sw $ra, 0x003C($sp) -/* 00564 80B2A764 AFB00038 */ sw $s0, 0x0038($sp) -/* 00568 80B2A768 AFA5005C */ sw $a1, 0x005C($sp) +/* 00560 80B2A760 AFBF003C */ sw $ra, 0x003C($sp) +/* 00564 80B2A764 AFB00038 */ sw $s0, 0x0038($sp) +/* 00568 80B2A768 AFA5005C */ sw $a1, 0x005C($sp) /* 0056C 80B2A76C 8482001C */ lh $v0, 0x001C($a0) ## 0000001C /* 00570 80B2A770 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 /* 00574 80B2A774 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00578 80B2A778 00021203 */ sra $v0, $v0, 8 +/* 00578 80B2A778 00021203 */ sra $v0, $v0, 8 /* 0057C 80B2A77C 304200FF */ andi $v0, $v0, 0x00FF ## $v0 = 00000000 -/* 00580 80B2A780 14410015 */ bne $v0, $at, .L80B2A7D8 -/* 00584 80B2A784 AFA20044 */ sw $v0, 0x0044($sp) +/* 00580 80B2A780 14410015 */ bne $v0, $at, .L80B2A7D8 +/* 00584 80B2A784 AFA20044 */ sw $v0, 0x0044($sp) /* 00588 80B2A788 3C0F8016 */ lui $t7, 0x8016 ## $t7 = 80160000 /* 0058C 80B2A78C 8DEFF9C0 */ lw $t7, -0x0640($t7) ## 8015F9C0 /* 00590 80B2A790 24010005 */ addiu $at, $zero, 0x0005 ## $at = 00000005 -/* 00594 80B2A794 15E100C0 */ bne $t7, $at, .L80B2AA98 +/* 00594 80B2A794 15E100C0 */ bne $t7, $at, .L80B2AA98 /* 00598 80B2A798 00000000 */ nop /* 0059C 80B2A79C 94A31D74 */ lhu $v1, 0x1D74($a1) ## 00001D74 /* 005A0 80B2A7A0 24010318 */ addiu $at, $zero, 0x0318 ## $at = 00000318 -/* 005A4 80B2A7A4 54610006 */ bnel $v1, $at, .L80B2A7C0 +/* 005A4 80B2A7A4 54610006 */ bnel $v1, $at, .L80B2A7C0 /* 005A8 80B2A7A8 2401034D */ addiu $at, $zero, 0x034D ## $at = 0000034D /* 005AC 80B2A7AC 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 005B0 80B2A7B0 2405686E */ addiu $a1, $zero, 0x686E ## $a1 = 0000686E -/* 005B4 80B2A7B4 100000B8 */ beq $zero, $zero, .L80B2AA98 +/* 005B4 80B2A7B4 100000B8 */ beq $zero, $zero, .L80B2AA98 /* 005B8 80B2A7B8 00000000 */ nop /* 005BC 80B2A7BC 2401034D */ addiu $at, $zero, 0x034D ## $at = 0000034D .L80B2A7C0: -/* 005C0 80B2A7C0 146100B5 */ bne $v1, $at, .L80B2AA98 +/* 005C0 80B2A7C0 146100B5 */ bne $v1, $at, .L80B2AA98 /* 005C4 80B2A7C4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 005C8 80B2A7C8 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 005CC 80B2A7CC 2405686F */ addiu $a1, $zero, 0x686F ## $a1 = 0000686F -/* 005D0 80B2A7D0 100000B1 */ beq $zero, $zero, .L80B2AA98 +/* 005D0 80B2A7D0 100000B1 */ beq $zero, $zero, .L80B2AA98 /* 005D4 80B2A7D4 00000000 */ nop .L80B2A7D8: -/* 005D8 80B2A7D8 8FB90044 */ lw $t9, 0x0044($sp) +/* 005D8 80B2A7D8 8FB90044 */ lw $t9, 0x0044($sp) /* 005DC 80B2A7DC 24010007 */ addiu $at, $zero, 0x0007 ## $at = 00000007 /* 005E0 80B2A7E0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 005E4 80B2A7E4 1721000A */ bne $t9, $at, .L80B2A810 -/* 005E8 80B2A7E8 8FAA0044 */ lw $t2, 0x0044($sp) +/* 005E4 80B2A7E4 1721000A */ bne $t9, $at, .L80B2A810 +/* 005E8 80B2A7E8 8FAA0044 */ lw $t2, 0x0044($sp) /* 005EC 80B2A7EC 3C053E99 */ lui $a1, 0x3E99 ## $a1 = 3E990000 /* 005F0 80B2A7F0 0C00B58B */ jal Actor_SetScale - + /* 005F4 80B2A7F4 34A5999A */ ori $a1, $a1, 0x999A ## $a1 = 3E99999A /* 005F8 80B2A7F8 3C0180B3 */ lui $at, %hi(D_80B2D184) ## $at = 80B30000 -/* 005FC 80B2A7FC C420D184 */ lwc1 $f0, %lo(D_80B2D184)($at) +/* 005FC 80B2A7FC C420D184 */ lwc1 $f0, %lo(D_80B2D184)($at) /* 00600 80B2A800 E60000F4 */ swc1 $f0, 0x00F4($s0) ## 000000F4 /* 00604 80B2A804 E60000F8 */ swc1 $f0, 0x00F8($s0) ## 000000F8 -/* 00608 80B2A808 100000A3 */ beq $zero, $zero, .L80B2AA98 +/* 00608 80B2A808 100000A3 */ beq $zero, $zero, .L80B2AA98 /* 0060C 80B2A80C E60000FC */ swc1 $f0, 0x00FC($s0) ## 000000FC .L80B2A810: /* 00610 80B2A810 24010003 */ addiu $at, $zero, 0x0003 ## $at = 00000003 -/* 00614 80B2A814 15410066 */ bne $t2, $at, .L80B2A9B0 +/* 00614 80B2A814 15410066 */ bne $t2, $at, .L80B2A9B0 /* 00618 80B2A818 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 /* 0061C 80B2A81C 8C42F9C0 */ lw $v0, -0x0640($v0) ## 8015F9C0 /* 00620 80B2A820 24010004 */ addiu $at, $zero, 0x0004 ## $at = 00000004 -/* 00624 80B2A824 8FAB005C */ lw $t3, 0x005C($sp) -/* 00628 80B2A828 5441002B */ bnel $v0, $at, .L80B2A8D8 -/* 0062C 80B2A82C 8FAE005C */ lw $t6, 0x005C($sp) +/* 00624 80B2A824 8FAB005C */ lw $t3, 0x005C($sp) +/* 00628 80B2A828 5441002B */ bnel $v0, $at, .L80B2A8D8 +/* 0062C 80B2A82C 8FAE005C */ lw $t6, 0x005C($sp) /* 00630 80B2A830 95631D74 */ lhu $v1, 0x1D74($t3) ## 00001D74 -/* 00634 80B2A834 286100DC */ slti $at, $v1, 0x00DC -/* 00638 80B2A838 1420000D */ bne $at, $zero, .L80B2A870 +/* 00634 80B2A834 286100DC */ slti $at, $v1, 0x00DC +/* 00638 80B2A838 1420000D */ bne $at, $zero, .L80B2A870 /* 0063C 80B2A83C 24010118 */ addiu $at, $zero, 0x0118 ## $at = 00000118 -/* 00640 80B2A840 10610017 */ beq $v1, $at, .L80B2A8A0 +/* 00640 80B2A840 10610017 */ beq $v1, $at, .L80B2A8A0 /* 00644 80B2A844 24010140 */ addiu $at, $zero, 0x0140 ## $at = 00000140 -/* 00648 80B2A848 10610015 */ beq $v1, $at, .L80B2A8A0 +/* 00648 80B2A848 10610015 */ beq $v1, $at, .L80B2A8A0 /* 0064C 80B2A84C 2401017C */ addiu $at, $zero, 0x017C ## $at = 0000017C -/* 00650 80B2A850 10610013 */ beq $v1, $at, .L80B2A8A0 +/* 00650 80B2A850 10610013 */ beq $v1, $at, .L80B2A8A0 /* 00654 80B2A854 24010199 */ addiu $at, $zero, 0x0199 ## $at = 00000199 -/* 00658 80B2A858 10610011 */ beq $v1, $at, .L80B2A8A0 +/* 00658 80B2A858 10610011 */ beq $v1, $at, .L80B2A8A0 /* 0065C 80B2A85C 240101B6 */ addiu $at, $zero, 0x01B6 ## $at = 000001B6 -/* 00660 80B2A860 1061000F */ beq $v1, $at, .L80B2A8A0 +/* 00660 80B2A860 1061000F */ beq $v1, $at, .L80B2A8A0 /* 00664 80B2A864 00000000 */ nop -/* 00668 80B2A868 1000001B */ beq $zero, $zero, .L80B2A8D8 -/* 0066C 80B2A86C 8FAE005C */ lw $t6, 0x005C($sp) +/* 00668 80B2A868 1000001B */ beq $zero, $zero, .L80B2A8D8 +/* 0066C 80B2A86C 8FAE005C */ lw $t6, 0x005C($sp) .L80B2A870: /* 00670 80B2A870 24010014 */ addiu $at, $zero, 0x0014 ## $at = 00000014 -/* 00674 80B2A874 1061000A */ beq $v1, $at, .L80B2A8A0 +/* 00674 80B2A874 1061000A */ beq $v1, $at, .L80B2A8A0 /* 00678 80B2A878 2401003B */ addiu $at, $zero, 0x003B ## $at = 0000003B -/* 0067C 80B2A87C 10610008 */ beq $v1, $at, .L80B2A8A0 +/* 0067C 80B2A87C 10610008 */ beq $v1, $at, .L80B2A8A0 /* 00680 80B2A880 24010047 */ addiu $at, $zero, 0x0047 ## $at = 00000047 -/* 00684 80B2A884 10610006 */ beq $v1, $at, .L80B2A8A0 +/* 00684 80B2A884 10610006 */ beq $v1, $at, .L80B2A8A0 /* 00688 80B2A888 24010081 */ addiu $at, $zero, 0x0081 ## $at = 00000081 -/* 0068C 80B2A88C 10610004 */ beq $v1, $at, .L80B2A8A0 +/* 0068C 80B2A88C 10610004 */ beq $v1, $at, .L80B2A8A0 /* 00690 80B2A890 2401008C */ addiu $at, $zero, 0x008C ## $at = 0000008C -/* 00694 80B2A894 10610002 */ beq $v1, $at, .L80B2A8A0 +/* 00694 80B2A894 10610002 */ beq $v1, $at, .L80B2A8A0 /* 00698 80B2A898 240100DB */ addiu $at, $zero, 0x00DB ## $at = 000000DB -/* 0069C 80B2A89C 1461000D */ bne $v1, $at, .L80B2A8D4 +/* 0069C 80B2A89C 1461000D */ bne $v1, $at, .L80B2A8D4 .L80B2A8A0: /* 006A0 80B2A8A0 3C0C8013 */ lui $t4, 0x8013 ## $t4 = 80130000 /* 006A4 80B2A8A4 3C0D8013 */ lui $t5, 0x8013 ## $t5 = 80130000 @@ -94,545 +94,545 @@ glabel func_80B2A75C /* 006AC 80B2A8AC 258733E0 */ addiu $a3, $t4, 0x33E0 ## $a3 = 801333E0 /* 006B0 80B2A8B0 3C058013 */ lui $a1, 0x8013 ## $a1 = 80130000 /* 006B4 80B2A8B4 24A533D4 */ addiu $a1, $a1, 0x33D4 ## $a1 = 801333D4 -/* 006B8 80B2A8B8 AFA70010 */ sw $a3, 0x0010($sp) -/* 006BC 80B2A8BC AFAD0014 */ sw $t5, 0x0014($sp) +/* 006B8 80B2A8B8 AFA70010 */ sw $a3, 0x0010($sp) +/* 006BC 80B2A8BC AFAD0014 */ sw $t5, 0x0014($sp) /* 006C0 80B2A8C0 2404481D */ addiu $a0, $zero, 0x481D ## $a0 = 0000481D /* 006C4 80B2A8C4 0C03DCE3 */ jal Audio_PlaySoundGeneral - + /* 006C8 80B2A8C8 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 /* 006CC 80B2A8CC 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 /* 006D0 80B2A8D0 8C42F9C0 */ lw $v0, -0x0640($v0) ## 8015F9C0 .L80B2A8D4: -/* 006D4 80B2A8D4 8FAE005C */ lw $t6, 0x005C($sp) +/* 006D4 80B2A8D4 8FAE005C */ lw $t6, 0x005C($sp) .L80B2A8D8: /* 006D8 80B2A8D8 24010005 */ addiu $at, $zero, 0x0005 ## $at = 00000005 -/* 006DC 80B2A8DC 1441001F */ bne $v0, $at, .L80B2A95C +/* 006DC 80B2A8DC 1441001F */ bne $v0, $at, .L80B2A95C /* 006E0 80B2A8E0 95C31D74 */ lhu $v1, 0x1D74($t6) ## 00001D74 /* 006E4 80B2A8E4 240105E4 */ addiu $at, $zero, 0x05E4 ## $at = 000005E4 -/* 006E8 80B2A8E8 14610005 */ bne $v1, $at, .L80B2A900 +/* 006E8 80B2A8E8 14610005 */ bne $v1, $at, .L80B2A900 /* 006EC 80B2A8EC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 006F0 80B2A8F0 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 006F4 80B2A8F4 240539D6 */ addiu $a1, $zero, 0x39D6 ## $a1 = 000039D6 -/* 006F8 80B2A8F8 8FA6005C */ lw $a2, 0x005C($sp) +/* 006F8 80B2A8F8 8FA6005C */ lw $a2, 0x005C($sp) /* 006FC 80B2A8FC 94C31D74 */ lhu $v1, 0x1D74($a2) ## 00001D74 .L80B2A900: /* 00700 80B2A900 24010609 */ addiu $at, $zero, 0x0609 ## $at = 00000609 -/* 00704 80B2A904 14610015 */ bne $v1, $at, .L80B2A95C -/* 00708 80B2A908 8FA6005C */ lw $a2, 0x005C($sp) +/* 00704 80B2A904 14610015 */ bne $v1, $at, .L80B2A95C +/* 00708 80B2A908 8FA6005C */ lw $a2, 0x005C($sp) /* 0070C 80B2A90C 3C014200 */ lui $at, 0x4200 ## $at = 42000000 /* 00710 80B2A910 44812000 */ mtc1 $at, $f4 ## $f4 = 32.00 /* 00714 80B2A914 3C0142CA */ lui $at, 0x42CA ## $at = 42CA0000 /* 00718 80B2A918 44813000 */ mtc1 $at, $f6 ## $f6 = 101.00 /* 0071C 80B2A91C 3C0180B3 */ lui $at, %hi(D_80B2D188) ## $at = 80B30000 -/* 00720 80B2A920 C428D188 */ lwc1 $f8, %lo(D_80B2D188)($at) +/* 00720 80B2A920 C428D188 */ lwc1 $f8, %lo(D_80B2D188)($at) /* 00724 80B2A924 2418000C */ addiu $t8, $zero, 0x000C ## $t8 = 0000000C -/* 00728 80B2A928 AFB80028 */ sw $t8, 0x0028($sp) +/* 00728 80B2A928 AFB80028 */ sw $t8, 0x0028($sp) /* 0072C 80B2A92C 24C41C24 */ addiu $a0, $a2, 0x1C24 ## $a0 = 00001C24 /* 00730 80B2A930 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 00734 80B2A934 240700F5 */ addiu $a3, $zero, 0x00F5 ## $a3 = 000000F5 -/* 00738 80B2A938 AFA0001C */ sw $zero, 0x001C($sp) -/* 0073C 80B2A93C AFA00020 */ sw $zero, 0x0020($sp) -/* 00740 80B2A940 AFA00024 */ sw $zero, 0x0024($sp) -/* 00744 80B2A944 E7A40010 */ swc1 $f4, 0x0010($sp) -/* 00748 80B2A948 E7A60014 */ swc1 $f6, 0x0014($sp) +/* 00738 80B2A938 AFA0001C */ sw $zero, 0x001C($sp) +/* 0073C 80B2A93C AFA00020 */ sw $zero, 0x0020($sp) +/* 00740 80B2A940 AFA00024 */ sw $zero, 0x0024($sp) +/* 00744 80B2A944 E7A40010 */ swc1 $f4, 0x0010($sp) +/* 00748 80B2A948 E7A60014 */ swc1 $f6, 0x0014($sp) /* 0074C 80B2A94C 0C00C916 */ jal Actor_SpawnAttached - -/* 00750 80B2A950 E7A80018 */ swc1 $f8, 0x0018($sp) -/* 00754 80B2A954 8FA6005C */ lw $a2, 0x005C($sp) + +/* 00750 80B2A950 E7A80018 */ swc1 $f8, 0x0018($sp) +/* 00754 80B2A954 8FA6005C */ lw $a2, 0x005C($sp) /* 00758 80B2A958 94C31D74 */ lhu $v1, 0x1D74($a2) ## 00001D74 .L80B2A95C: /* 0075C 80B2A95C 240103FC */ addiu $at, $zero, 0x03FC ## $at = 000003FC -/* 00760 80B2A960 14610005 */ bne $v1, $at, .L80B2A978 +/* 00760 80B2A960 14610005 */ bne $v1, $at, .L80B2A978 /* 00764 80B2A964 3C040100 */ lui $a0, 0x0100 ## $a0 = 01000000 /* 00768 80B2A968 0C03E803 */ jal Audio_SetBGM - + /* 0076C 80B2A96C 34840023 */ ori $a0, $a0, 0x0023 ## $a0 = 01000023 -/* 00770 80B2A970 8FA6005C */ lw $a2, 0x005C($sp) +/* 00770 80B2A970 8FA6005C */ lw $a2, 0x005C($sp) /* 00774 80B2A974 94C31D74 */ lhu $v1, 0x1D74($a2) ## 00001D74 .L80B2A978: /* 00778 80B2A978 240103C0 */ addiu $at, $zero, 0x03C0 ## $at = 000003C0 -/* 0077C 80B2A97C 14610046 */ bne $v1, $at, .L80B2AA98 +/* 0077C 80B2A97C 14610046 */ bne $v1, $at, .L80B2AA98 /* 00780 80B2A980 3C078013 */ lui $a3, 0x8013 ## $a3 = 80130000 /* 00784 80B2A984 3C198013 */ lui $t9, 0x8013 ## $t9 = 80130000 /* 00788 80B2A988 24E733E0 */ addiu $a3, $a3, 0x33E0 ## $a3 = 801333E0 /* 0078C 80B2A98C 273933E8 */ addiu $t9, $t9, 0x33E8 ## $t9 = 801333E8 -/* 00790 80B2A990 AFB90014 */ sw $t9, 0x0014($sp) -/* 00794 80B2A994 AFA70010 */ sw $a3, 0x0010($sp) +/* 00790 80B2A990 AFB90014 */ sw $t9, 0x0014($sp) +/* 00794 80B2A994 AFA70010 */ sw $a3, 0x0010($sp) /* 00798 80B2A998 24042816 */ addiu $a0, $zero, 0x2816 ## $a0 = 00002816 /* 0079C 80B2A99C 260500E4 */ addiu $a1, $s0, 0x00E4 ## $a1 = 000000E4 /* 007A0 80B2A9A0 0C03DCE3 */ jal Audio_PlaySoundGeneral - + /* 007A4 80B2A9A4 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 -/* 007A8 80B2A9A8 1000003B */ beq $zero, $zero, .L80B2AA98 +/* 007A8 80B2A9A8 1000003B */ beq $zero, $zero, .L80B2AA98 /* 007AC 80B2A9AC 00000000 */ nop .L80B2A9B0: -/* 007B0 80B2A9B0 8FAA0044 */ lw $t2, 0x0044($sp) +/* 007B0 80B2A9B0 8FAA0044 */ lw $t2, 0x0044($sp) /* 007B4 80B2A9B4 24010006 */ addiu $at, $zero, 0x0006 ## $at = 00000006 /* 007B8 80B2A9B8 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 007BC 80B2A9BC 1541000C */ bne $t2, $at, .L80B2A9F0 -/* 007C0 80B2A9C0 8FAB0044 */ lw $t3, 0x0044($sp) +/* 007BC 80B2A9BC 1541000C */ bne $t2, $at, .L80B2A9F0 +/* 007C0 80B2A9C0 8FAB0044 */ lw $t3, 0x0044($sp) /* 007C4 80B2A9C4 8C42F9C0 */ lw $v0, -0x0640($v0) ## 8015F9C0 /* 007C8 80B2A9C8 24010005 */ addiu $at, $zero, 0x0005 ## $at = 00000005 /* 007CC 80B2A9CC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 007D0 80B2A9D0 10410003 */ beq $v0, $at, .L80B2A9E0 +/* 007D0 80B2A9D0 10410003 */ beq $v0, $at, .L80B2A9E0 /* 007D4 80B2A9D4 2401000A */ addiu $at, $zero, 0x000A ## $at = 0000000A -/* 007D8 80B2A9D8 1441002F */ bne $v0, $at, .L80B2AA98 +/* 007D8 80B2A9D8 1441002F */ bne $v0, $at, .L80B2AA98 /* 007DC 80B2A9DC 00000000 */ nop .L80B2A9E0: /* 007E0 80B2A9E0 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 007E4 80B2A9E4 24052078 */ addiu $a1, $zero, 0x2078 ## $a1 = 00002078 -/* 007E8 80B2A9E8 1000002B */ beq $zero, $zero, .L80B2AA98 +/* 007E8 80B2A9E8 1000002B */ beq $zero, $zero, .L80B2AA98 /* 007EC 80B2A9EC 00000000 */ nop .L80B2A9F0: /* 007F0 80B2A9F0 24010004 */ addiu $at, $zero, 0x0004 ## $at = 00000004 -/* 007F4 80B2A9F4 15610028 */ bne $t3, $at, .L80B2AA98 +/* 007F4 80B2A9F4 15610028 */ bne $t3, $at, .L80B2AA98 /* 007F8 80B2A9F8 00000000 */ nop /* 007FC 80B2A9FC C60A01B0 */ lwc1 $f10, 0x01B0($s0) ## 000001B0 /* 00800 80B2AA00 8E0201A0 */ lw $v0, 0x01A0($s0) ## 000001A0 /* 00804 80B2AA04 3C0D0600 */ lui $t5, 0x0600 ## $t5 = 06000000 -/* 00808 80B2AA08 4600540D */ trunc.w.s $f16, $f10 +/* 00808 80B2AA08 4600540D */ trunc.w.s $f16, $f10 /* 0080C 80B2AA0C 25AD3858 */ addiu $t5, $t5, 0x3858 ## $t5 = 06003858 /* 00810 80B2AA10 3C0E0600 */ lui $t6, 0x0600 ## $t6 = 06000000 /* 00814 80B2AA14 24010008 */ addiu $at, $zero, 0x0008 ## $at = 00000008 -/* 00818 80B2AA18 44038000 */ mfc1 $v1, $f16 +/* 00818 80B2AA18 44038000 */ mfc1 $v1, $f16 /* 0081C 80B2AA1C 25CE4AA4 */ addiu $t6, $t6, 0x4AA4 ## $t6 = 06004AA4 -/* 00820 80B2AA20 00031C00 */ sll $v1, $v1, 16 -/* 00824 80B2AA24 15A2000E */ bne $t5, $v0, .L80B2AA60 -/* 00828 80B2AA28 00031C03 */ sra $v1, $v1, 16 -/* 0082C 80B2AA2C 14610005 */ bne $v1, $at, .L80B2AA44 +/* 00820 80B2AA20 00031C00 */ sll $v1, $v1, 16 +/* 00824 80B2AA24 15A2000E */ bne $t5, $v0, .L80B2AA60 +/* 00828 80B2AA28 00031C03 */ sra $v1, $v1, 16 +/* 0082C 80B2AA2C 14610005 */ bne $v1, $at, .L80B2AA44 /* 00830 80B2AA30 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 00834 80B2AA34 2405283D */ addiu $a1, $zero, 0x283D ## $a1 = 0000283D /* 00838 80B2AA38 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 0083C 80B2AA3C A7A3004E */ sh $v1, 0x004E($sp) -/* 00840 80B2AA40 87A3004E */ lh $v1, 0x004E($sp) + +/* 0083C 80B2AA3C A7A3004E */ sh $v1, 0x004E($sp) +/* 00840 80B2AA40 87A3004E */ lh $v1, 0x004E($sp) .L80B2AA44: /* 00844 80B2AA44 2401001E */ addiu $at, $zero, 0x001E ## $at = 0000001E -/* 00848 80B2AA48 14610013 */ bne $v1, $at, .L80B2AA98 +/* 00848 80B2AA48 14610013 */ bne $v1, $at, .L80B2AA98 /* 0084C 80B2AA4C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 00850 80B2AA50 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 00854 80B2AA54 2405282B */ addiu $a1, $zero, 0x282B ## $a1 = 0000282B -/* 00858 80B2AA58 1000000F */ beq $zero, $zero, .L80B2AA98 +/* 00858 80B2AA58 1000000F */ beq $zero, $zero, .L80B2AA98 /* 0085C 80B2AA5C 00000000 */ nop .L80B2AA60: -/* 00860 80B2AA60 15C20008 */ bne $t6, $v0, .L80B2AA84 +/* 00860 80B2AA60 15C20008 */ bne $t6, $v0, .L80B2AA84 /* 00864 80B2AA64 3C0F0600 */ lui $t7, 0x0600 ## $t7 = 06000000 /* 00868 80B2AA68 24010019 */ addiu $at, $zero, 0x0019 ## $at = 00000019 -/* 0086C 80B2AA6C 1461000A */ bne $v1, $at, .L80B2AA98 +/* 0086C 80B2AA6C 1461000A */ bne $v1, $at, .L80B2AA98 /* 00870 80B2AA70 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 00874 80B2AA74 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 00878 80B2AA78 2405282C */ addiu $a1, $zero, 0x282C ## $a1 = 0000282C -/* 0087C 80B2AA7C 10000006 */ beq $zero, $zero, .L80B2AA98 +/* 0087C 80B2AA7C 10000006 */ beq $zero, $zero, .L80B2AA98 /* 00880 80B2AA80 00000000 */ nop .L80B2AA84: /* 00884 80B2AA84 25EF2650 */ addiu $t7, $t7, 0x2650 ## $t7 = 00002650 -/* 00888 80B2AA88 15E20003 */ bne $t7, $v0, .L80B2AA98 +/* 00888 80B2AA88 15E20003 */ bne $t7, $v0, .L80B2AA98 /* 0088C 80B2AA8C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 00890 80B2AA90 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 00894 80B2AA94 24052078 */ addiu $a1, $zero, 0x2078 ## $a1 = 00002078 .L80B2AA98: /* 00898 80B2AA98 3C0380B3 */ lui $v1, %hi(D_80B2CFCC) ## $v1 = 80B30000 /* 0089C 80B2AA9C 2463CFCC */ addiu $v1, $v1, %lo(D_80B2CFCC) ## $v1 = 80B2CFCC /* 008A0 80B2AAA0 84620000 */ lh $v0, 0x0000($v1) ## 80B2CFCC /* 008A4 80B2AAA4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 008A8 80B2AAA8 10400002 */ beq $v0, $zero, .L80B2AAB4 +/* 008A8 80B2AAA8 10400002 */ beq $v0, $zero, .L80B2AAB4 /* 008AC 80B2AAAC 2458FFFF */ addiu $t8, $v0, 0xFFFF ## $t8 = FFFFFFFF /* 008B0 80B2AAB0 A4780000 */ sh $t8, 0x0000($v1) ## 80B2CFCC .L80B2AAB4: -/* 008B4 80B2AAB4 0C2CB0E6 */ jal func_80B2C398 -/* 008B8 80B2AAB8 8FA5005C */ lw $a1, 0x005C($sp) +/* 008B4 80B2AAB4 0C2CB0E6 */ jal func_80B2C398 +/* 008B8 80B2AAB8 8FA5005C */ lw $a1, 0x005C($sp) /* 008BC 80B2AABC 0C00B638 */ jal Actor_MoveForward - + /* 008C0 80B2AAC0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 008C4 80B2AAC4 26040198 */ addiu $a0, $s0, 0x0198 ## $a0 = 00000198 /* 008C8 80B2AAC8 0C02927F */ jal SkelAnime_FrameUpdateMatrix - -/* 008CC 80B2AACC AFA40040 */ sw $a0, 0x0040($sp) -/* 008D0 80B2AAD0 8FB90044 */ lw $t9, 0x0044($sp) + +/* 008CC 80B2AACC AFA40040 */ sw $a0, 0x0040($sp) +/* 008D0 80B2AAD0 8FB90044 */ lw $t9, 0x0044($sp) /* 008D4 80B2AAD4 24070003 */ addiu $a3, $zero, 0x0003 ## $a3 = 00000003 -/* 008D8 80B2AAD8 8FA6005C */ lw $a2, 0x005C($sp) -/* 008DC 80B2AADC 10F90004 */ beq $a3, $t9, .L80B2AAF0 +/* 008D8 80B2AAD8 8FA6005C */ lw $a2, 0x005C($sp) +/* 008DC 80B2AADC 10F90004 */ beq $a3, $t9, .L80B2AAF0 /* 008E0 80B2AAE0 00402825 */ or $a1, $v0, $zero ## $a1 = 00000000 /* 008E4 80B2AAE4 24090004 */ addiu $t1, $zero, 0x0004 ## $t1 = 00000004 -/* 008E8 80B2AAE8 553900A4 */ bnel $t1, $t9, .L80B2AD7C -/* 008EC 80B2AAEC 8FAC0044 */ lw $t4, 0x0044($sp) +/* 008E8 80B2AAE8 553900A4 */ bnel $t1, $t9, .L80B2AD7C +/* 008EC 80B2AAEC 8FAC0044 */ lw $t4, 0x0044($sp) .L80B2AAF0: /* 008F0 80B2AAF0 90CA1D6C */ lbu $t2, 0x1D6C($a2) ## 00001D6C /* 008F4 80B2AAF4 24090004 */ addiu $t1, $zero, 0x0004 ## $t1 = 00000004 /* 008F8 80B2AAF8 3C0B80B3 */ lui $t3, %hi(D_80B2CFCC) ## $t3 = 80B30000 -/* 008FC 80B2AAFC 114001E3 */ beq $t2, $zero, .L80B2B28C +/* 008FC 80B2AAFC 114001E3 */ beq $t2, $zero, .L80B2B28C /* 00900 80B2AB00 24080001 */ addiu $t0, $zero, 0x0001 ## $t0 = 00000001 /* 00904 80B2AB04 8CC31D90 */ lw $v1, 0x1D90($a2) ## 00001D90 -/* 00908 80B2AB08 506001E1 */ beql $v1, $zero, .L80B2B290 -/* 0090C 80B2AB0C 8FBF003C */ lw $ra, 0x003C($sp) +/* 00908 80B2AB08 506001E1 */ beql $v1, $zero, .L80B2B290 +/* 0090C 80B2AB0C 8FBF003C */ lw $ra, 0x003C($sp) /* 00910 80B2AB10 94640000 */ lhu $a0, 0x0000($v1) ## 00000000 /* 00914 80B2AB14 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 00918 80B2AB18 14810019 */ bne $a0, $at, .L80B2AB80 +/* 00918 80B2AB18 14810019 */ bne $a0, $at, .L80B2AB80 /* 0091C 80B2AB1C 00000000 */ nop -/* 00920 80B2AB20 856BCFCC */ lh $t3, %lo(D_80B2CFCC)($t3) -/* 00924 80B2AB24 15600016 */ bne $t3, $zero, .L80B2AB80 +/* 00920 80B2AB20 856BCFCC */ lh $t3, %lo(D_80B2CFCC)($t3) +/* 00924 80B2AB24 15600016 */ bne $t3, $zero, .L80B2AB80 /* 00928 80B2AB28 00000000 */ nop -/* 0092C 80B2AB2C 8FAC0044 */ lw $t4, 0x0044($sp) -/* 00930 80B2AB30 54EC000B */ bnel $a3, $t4, .L80B2AB60 +/* 0092C 80B2AB2C 8FAC0044 */ lw $t4, 0x0044($sp) +/* 00930 80B2AB30 54EC000B */ bnel $a3, $t4, .L80B2AB60 /* 00934 80B2AB34 8E0E01A0 */ lw $t6, 0x01A0($s0) ## 000001A0 /* 00938 80B2AB38 8E0D01A0 */ lw $t5, 0x01A0($s0) ## 000001A0 /* 0093C 80B2AB3C 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 00940 80B2AB40 24A52928 */ addiu $a1, $a1, 0x2928 ## $a1 = 06002928 -/* 00944 80B2AB44 10AD01D1 */ beq $a1, $t5, .L80B2B28C -/* 00948 80B2AB48 8FA40040 */ lw $a0, 0x0040($sp) -/* 0094C 80B2AB4C 0C0294E1 */ jal func_800A5384 +/* 00944 80B2AB44 10AD01D1 */ beq $a1, $t5, .L80B2B28C +/* 00948 80B2AB48 8FA40040 */ lw $a0, 0x0040($sp) +/* 0094C 80B2AB4C 0C0294E1 */ jal SkelAnime_ChangeAnimPlaybackRepeat /* 00950 80B2AB50 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 00954 80B2AB54 100001CE */ beq $zero, $zero, .L80B2B290 -/* 00958 80B2AB58 8FBF003C */ lw $ra, 0x003C($sp) +/* 00954 80B2AB54 100001CE */ beq $zero, $zero, .L80B2B290 +/* 00958 80B2AB58 8FBF003C */ lw $ra, 0x003C($sp) /* 0095C 80B2AB5C 8E0E01A0 */ lw $t6, 0x01A0($s0) ## 000001A0 .L80B2AB60: /* 00960 80B2AB60 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 00964 80B2AB64 24A54AA4 */ addiu $a1, $a1, 0x4AA4 ## $a1 = 06004AA4 -/* 00968 80B2AB68 10AE01C8 */ beq $a1, $t6, .L80B2B28C -/* 0096C 80B2AB6C 8FA40040 */ lw $a0, 0x0040($sp) -/* 00970 80B2AB70 0C0294E1 */ jal func_800A5384 +/* 00968 80B2AB68 10AE01C8 */ beq $a1, $t6, .L80B2B28C +/* 0096C 80B2AB6C 8FA40040 */ lw $a0, 0x0040($sp) +/* 00970 80B2AB70 0C0294E1 */ jal SkelAnime_ChangeAnimPlaybackRepeat /* 00974 80B2AB74 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 00978 80B2AB78 100001C5 */ beq $zero, $zero, .L80B2B290 -/* 0097C 80B2AB7C 8FBF003C */ lw $ra, 0x003C($sp) +/* 00978 80B2AB78 100001C5 */ beq $zero, $zero, .L80B2B290 +/* 0097C 80B2AB7C 8FBF003C */ lw $ra, 0x003C($sp) .L80B2AB80: -/* 00980 80B2AB80 15040018 */ bne $t0, $a0, .L80B2ABE4 -/* 00984 80B2AB84 8FAB0044 */ lw $t3, 0x0044($sp) -/* 00988 80B2AB88 8FB80044 */ lw $t8, 0x0044($sp) +/* 00980 80B2AB80 15040018 */ bne $t0, $a0, .L80B2ABE4 +/* 00984 80B2AB84 8FAB0044 */ lw $t3, 0x0044($sp) +/* 00988 80B2AB88 8FB80044 */ lw $t8, 0x0044($sp) /* 0098C 80B2AB8C 240F0064 */ addiu $t7, $zero, 0x0064 ## $t7 = 00000064 /* 00990 80B2AB90 3C0180B3 */ lui $at, %hi(D_80B2CFCC) ## $at = 80B30000 -/* 00994 80B2AB94 14F8000A */ bne $a3, $t8, .L80B2ABC0 -/* 00998 80B2AB98 A42FCFCC */ sh $t7, %lo(D_80B2CFCC)($at) +/* 00994 80B2AB94 14F8000A */ bne $a3, $t8, .L80B2ABC0 +/* 00998 80B2AB98 A42FCFCC */ sh $t7, %lo(D_80B2CFCC)($at) /* 0099C 80B2AB9C 8E1901A0 */ lw $t9, 0x01A0($s0) ## 000001A0 /* 009A0 80B2ABA0 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 009A4 80B2ABA4 24A51D28 */ addiu $a1, $a1, 0x1D28 ## $a1 = 06001D28 -/* 009A8 80B2ABA8 10B901B8 */ beq $a1, $t9, .L80B2B28C -/* 009AC 80B2ABAC 8FA40040 */ lw $a0, 0x0040($sp) -/* 009B0 80B2ABB0 0C0294E1 */ jal func_800A5384 +/* 009A8 80B2ABA8 10B901B8 */ beq $a1, $t9, .L80B2B28C +/* 009AC 80B2ABAC 8FA40040 */ lw $a0, 0x0040($sp) +/* 009B0 80B2ABB0 0C0294E1 */ jal SkelAnime_ChangeAnimPlaybackRepeat /* 009B4 80B2ABB4 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 009B8 80B2ABB8 100001B5 */ beq $zero, $zero, .L80B2B290 -/* 009BC 80B2ABBC 8FBF003C */ lw $ra, 0x003C($sp) +/* 009B8 80B2ABB8 100001B5 */ beq $zero, $zero, .L80B2B290 +/* 009BC 80B2ABBC 8FBF003C */ lw $ra, 0x003C($sp) .L80B2ABC0: /* 009C0 80B2ABC0 8E0A01A0 */ lw $t2, 0x01A0($s0) ## 000001A0 /* 009C4 80B2ABC4 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 009C8 80B2ABC8 24A53858 */ addiu $a1, $a1, 0x3858 ## $a1 = 06003858 -/* 009CC 80B2ABCC 10AA01AF */ beq $a1, $t2, .L80B2B28C -/* 009D0 80B2ABD0 8FA40040 */ lw $a0, 0x0040($sp) -/* 009D4 80B2ABD4 0C0294E1 */ jal func_800A5384 +/* 009CC 80B2ABCC 10AA01AF */ beq $a1, $t2, .L80B2B28C +/* 009D0 80B2ABD0 8FA40040 */ lw $a0, 0x0040($sp) +/* 009D4 80B2ABD4 0C0294E1 */ jal SkelAnime_ChangeAnimPlaybackRepeat /* 009D8 80B2ABD8 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 009DC 80B2ABDC 100001AC */ beq $zero, $zero, .L80B2B290 -/* 009E0 80B2ABE0 8FBF003C */ lw $ra, 0x003C($sp) +/* 009DC 80B2ABDC 100001AC */ beq $zero, $zero, .L80B2B290 +/* 009E0 80B2ABE0 8FBF003C */ lw $ra, 0x003C($sp) .L80B2ABE4: -/* 009E4 80B2ABE4 54EB005A */ bnel $a3, $t3, .L80B2AD50 +/* 009E4 80B2ABE4 54EB005A */ bnel $a3, $t3, .L80B2AD50 /* 009E8 80B2ABE8 8E0B01A0 */ lw $t3, 0x01A0($s0) ## 000001A0 /* 009EC 80B2ABEC 920C01E5 */ lbu $t4, 0x01E5($s0) ## 000001E5 -/* 009F0 80B2ABF0 2D810008 */ sltiu $at, $t4, 0x0008 -/* 009F4 80B2ABF4 102001A5 */ beq $at, $zero, .L80B2B28C -/* 009F8 80B2ABF8 000C6080 */ sll $t4, $t4, 2 +/* 009F0 80B2ABF0 2D810008 */ sltiu $at, $t4, 0x0008 +/* 009F4 80B2ABF4 102001A5 */ beq $at, $zero, .L80B2B28C +/* 009F8 80B2ABF8 000C6080 */ sll $t4, $t4, 2 /* 009FC 80B2ABFC 3C0180B3 */ lui $at, %hi(jtbl_80B2D18C) ## $at = 80B30000 -/* 00A00 80B2AC00 002C0821 */ addu $at, $at, $t4 -/* 00A04 80B2AC04 8C2CD18C */ lw $t4, %lo(jtbl_80B2D18C)($at) -/* 00A08 80B2AC08 01800008 */ jr $t4 +/* 00A00 80B2AC00 002C0821 */ addu $at, $at, $t4 +/* 00A04 80B2AC04 8C2CD18C */ lw $t4, %lo(jtbl_80B2D18C)($at) +/* 00A08 80B2AC08 01800008 */ jr $t4 /* 00A0C 80B2AC0C 00000000 */ nop glabel L80B2AC10 -/* 00A10 80B2AC10 1524019E */ bne $t1, $a0, .L80B2B28C +/* 00A10 80B2AC10 1524019E */ bne $t1, $a0, .L80B2B28C /* 00A14 80B2AC14 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 00A18 80B2AC18 8FA40040 */ lw $a0, 0x0040($sp) +/* 00A18 80B2AC18 8FA40040 */ lw $a0, 0x0040($sp) /* 00A1C 80B2AC1C 24A50F54 */ addiu $a1, $a1, 0x0F54 ## $a1 = 06000F54 -/* 00A20 80B2AC20 0C029490 */ jal func_800A5240 +/* 00A20 80B2AC20 0C029490 */ jal SkelAnime_ChangeAnimTransitionStop /* 00A24 80B2AC24 3C06C0A0 */ lui $a2, 0xC0A0 ## $a2 = C0A00000 /* 00A28 80B2AC28 920D01E5 */ lbu $t5, 0x01E5($s0) ## 000001E5 /* 00A2C 80B2AC2C 25AE0001 */ addiu $t6, $t5, 0x0001 ## $t6 = 00000001 -/* 00A30 80B2AC30 10000196 */ beq $zero, $zero, .L80B2B28C +/* 00A30 80B2AC30 10000196 */ beq $zero, $zero, .L80B2B28C /* 00A34 80B2AC34 A20E01E5 */ sb $t6, 0x01E5($s0) ## 000001E5 glabel L80B2AC38 -/* 00A38 80B2AC38 10400194 */ beq $v0, $zero, .L80B2B28C -/* 00A3C 80B2AC3C 8FA40040 */ lw $a0, 0x0040($sp) +/* 00A38 80B2AC38 10400194 */ beq $v0, $zero, .L80B2B28C +/* 00A3C 80B2AC3C 8FA40040 */ lw $a0, 0x0040($sp) /* 00A40 80B2AC40 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 00A44 80B2AC44 24A514F4 */ addiu $a1, $a1, 0x14F4 ## $a1 = 060014F4 -/* 00A48 80B2AC48 0C0294D3 */ jal func_800A534C +/* 00A48 80B2AC48 0C0294D3 */ jal SkelAnime_ChangeAnimTransitionRepeat /* 00A4C 80B2AC4C 3C06C0A0 */ lui $a2, 0xC0A0 ## $a2 = C0A00000 /* 00A50 80B2AC50 920F01E5 */ lbu $t7, 0x01E5($s0) ## 000001E5 /* 00A54 80B2AC54 25F80001 */ addiu $t8, $t7, 0x0001 ## $t8 = 00000001 -/* 00A58 80B2AC58 1000018C */ beq $zero, $zero, .L80B2B28C +/* 00A58 80B2AC58 1000018C */ beq $zero, $zero, .L80B2B28C /* 00A5C 80B2AC5C A21801E5 */ sb $t8, 0x01E5($s0) ## 000001E5 glabel L80B2AC60 /* 00A60 80B2AC60 24010005 */ addiu $at, $zero, 0x0005 ## $at = 00000005 -/* 00A64 80B2AC64 14810189 */ bne $a0, $at, .L80B2B28C +/* 00A64 80B2AC64 14810189 */ bne $a0, $at, .L80B2B28C /* 00A68 80B2AC68 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 00A6C 80B2AC6C 8FA40040 */ lw $a0, 0x0040($sp) +/* 00A6C 80B2AC6C 8FA40040 */ lw $a0, 0x0040($sp) /* 00A70 80B2AC70 24A508A0 */ addiu $a1, $a1, 0x08A0 ## $a1 = 060008A0 -/* 00A74 80B2AC74 0C029490 */ jal func_800A5240 +/* 00A74 80B2AC74 0C029490 */ jal SkelAnime_ChangeAnimTransitionStop /* 00A78 80B2AC78 3C06C0A0 */ lui $a2, 0xC0A0 ## $a2 = C0A00000 /* 00A7C 80B2AC7C 921901E5 */ lbu $t9, 0x01E5($s0) ## 000001E5 /* 00A80 80B2AC80 272A0001 */ addiu $t2, $t9, 0x0001 ## $t2 = 00000001 -/* 00A84 80B2AC84 10000181 */ beq $zero, $zero, .L80B2B28C +/* 00A84 80B2AC84 10000181 */ beq $zero, $zero, .L80B2B28C /* 00A88 80B2AC88 A20A01E5 */ sb $t2, 0x01E5($s0) ## 000001E5 glabel L80B2AC8C -/* 00A8C 80B2AC8C 1040017F */ beq $v0, $zero, .L80B2B28C -/* 00A90 80B2AC90 8FA40040 */ lw $a0, 0x0040($sp) +/* 00A8C 80B2AC8C 1040017F */ beq $v0, $zero, .L80B2B28C +/* 00A90 80B2AC90 8FA40040 */ lw $a0, 0x0040($sp) /* 00A94 80B2AC94 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 00A98 80B2AC98 24A50BC8 */ addiu $a1, $a1, 0x0BC8 ## $a1 = 06000BC8 -/* 00A9C 80B2AC9C 0C0294D3 */ jal func_800A534C +/* 00A9C 80B2AC9C 0C0294D3 */ jal SkelAnime_ChangeAnimTransitionRepeat /* 00AA0 80B2ACA0 3C06C0A0 */ lui $a2, 0xC0A0 ## $a2 = C0A00000 /* 00AA4 80B2ACA4 920B01E5 */ lbu $t3, 0x01E5($s0) ## 000001E5 /* 00AA8 80B2ACA8 256C0001 */ addiu $t4, $t3, 0x0001 ## $t4 = 00000001 -/* 00AAC 80B2ACAC 10000177 */ beq $zero, $zero, .L80B2B28C +/* 00AAC 80B2ACAC 10000177 */ beq $zero, $zero, .L80B2B28C /* 00AB0 80B2ACB0 A20C01E5 */ sb $t4, 0x01E5($s0) ## 000001E5 glabel L80B2ACB4 /* 00AB4 80B2ACB4 2401000B */ addiu $at, $zero, 0x000B ## $at = 0000000B -/* 00AB8 80B2ACB8 14810174 */ bne $a0, $at, .L80B2B28C +/* 00AB8 80B2ACB8 14810174 */ bne $a0, $at, .L80B2B28C /* 00ABC 80B2ACBC 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 00AC0 80B2ACC0 8FA40040 */ lw $a0, 0x0040($sp) +/* 00AC0 80B2ACC0 8FA40040 */ lw $a0, 0x0040($sp) /* 00AC4 80B2ACC4 24A514F4 */ addiu $a1, $a1, 0x14F4 ## $a1 = 060014F4 -/* 00AC8 80B2ACC8 0C0294D3 */ jal func_800A534C +/* 00AC8 80B2ACC8 0C0294D3 */ jal SkelAnime_ChangeAnimTransitionRepeat /* 00ACC 80B2ACCC 3C06C1A0 */ lui $a2, 0xC1A0 ## $a2 = C1A00000 /* 00AD0 80B2ACD0 920D01E5 */ lbu $t5, 0x01E5($s0) ## 000001E5 /* 00AD4 80B2ACD4 25AE0001 */ addiu $t6, $t5, 0x0001 ## $t6 = 00000001 -/* 00AD8 80B2ACD8 1000016C */ beq $zero, $zero, .L80B2B28C +/* 00AD8 80B2ACD8 1000016C */ beq $zero, $zero, .L80B2B28C /* 00ADC 80B2ACDC A20E01E5 */ sb $t6, 0x01E5($s0) ## 000001E5 glabel L80B2ACE0 /* 00AE0 80B2ACE0 24010008 */ addiu $at, $zero, 0x0008 ## $at = 00000008 -/* 00AE4 80B2ACE4 14810169 */ bne $a0, $at, .L80B2B28C +/* 00AE4 80B2ACE4 14810169 */ bne $a0, $at, .L80B2B28C /* 00AE8 80B2ACE8 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 00AEC 80B2ACEC 24A52928 */ addiu $a1, $a1, 0x2928 ## $a1 = 06002928 -/* 00AF0 80B2ACF0 8FA40040 */ lw $a0, 0x0040($sp) -/* 00AF4 80B2ACF4 0C0294D3 */ jal func_800A534C +/* 00AF0 80B2ACF0 8FA40040 */ lw $a0, 0x0040($sp) +/* 00AF4 80B2ACF4 0C0294D3 */ jal SkelAnime_ChangeAnimTransitionRepeat /* 00AF8 80B2ACF8 3C06C170 */ lui $a2, 0xC170 ## $a2 = C1700000 /* 00AFC 80B2ACFC 920F01E5 */ lbu $t7, 0x01E5($s0) ## 000001E5 /* 00B00 80B2AD00 25F80001 */ addiu $t8, $t7, 0x0001 ## $t8 = 00000001 -/* 00B04 80B2AD04 10000161 */ beq $zero, $zero, .L80B2B28C +/* 00B04 80B2AD04 10000161 */ beq $zero, $zero, .L80B2B28C /* 00B08 80B2AD08 A21801E5 */ sb $t8, 0x01E5($s0) ## 000001E5 glabel L80B2AD0C /* 00B0C 80B2AD0C 2401000C */ addiu $at, $zero, 0x000C ## $at = 0000000C -/* 00B10 80B2AD10 1481015E */ bne $a0, $at, .L80B2B28C +/* 00B10 80B2AD10 1481015E */ bne $a0, $at, .L80B2B28C /* 00B14 80B2AD14 240539C8 */ addiu $a1, $zero, 0x39C8 ## $a1 = 000039C8 /* 00B18 80B2AD18 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 00B1C 80B2AD1C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 00B20 80B2AD20 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 00B24 80B2AD24 24A505B4 */ addiu $a1, $a1, 0x05B4 ## $a1 = 060005B4 -/* 00B28 80B2AD28 8FA40040 */ lw $a0, 0x0040($sp) -/* 00B2C 80B2AD2C 0C0294E1 */ jal func_800A5384 +/* 00B28 80B2AD28 8FA40040 */ lw $a0, 0x0040($sp) +/* 00B2C 80B2AD2C 0C0294E1 */ jal SkelAnime_ChangeAnimPlaybackRepeat /* 00B30 80B2AD30 3C064040 */ lui $a2, 0x4040 ## $a2 = 40400000 /* 00B34 80B2AD34 921901E5 */ lbu $t9, 0x01E5($s0) ## 000001E5 /* 00B38 80B2AD38 272A0001 */ addiu $t2, $t9, 0x0001 ## $t2 = 00000001 -/* 00B3C 80B2AD3C 10000153 */ beq $zero, $zero, .L80B2B28C +/* 00B3C 80B2AD3C 10000153 */ beq $zero, $zero, .L80B2B28C /* 00B40 80B2AD40 A20A01E5 */ sb $t2, 0x01E5($s0) ## 000001E5 glabel L80B2AD44 -/* 00B44 80B2AD44 10000151 */ beq $zero, $zero, .L80B2B28C +/* 00B44 80B2AD44 10000151 */ beq $zero, $zero, .L80B2B28C /* 00B48 80B2AD48 A20001E5 */ sb $zero, 0x01E5($s0) ## 000001E5 /* 00B4C 80B2AD4C 8E0B01A0 */ lw $t3, 0x01A0($s0) ## 000001A0 .L80B2AD50: /* 00B50 80B2AD50 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 00B54 80B2AD54 24A52650 */ addiu $a1, $a1, 0x2650 ## $a1 = 06002650 -/* 00B58 80B2AD58 10AB014C */ beq $a1, $t3, .L80B2B28C +/* 00B58 80B2AD58 10AB014C */ beq $a1, $t3, .L80B2B28C /* 00B5C 80B2AD5C 2401000C */ addiu $at, $zero, 0x000C ## $at = 0000000C -/* 00B60 80B2AD60 1481014A */ bne $a0, $at, .L80B2B28C +/* 00B60 80B2AD60 1481014A */ bne $a0, $at, .L80B2B28C /* 00B64 80B2AD64 3C064040 */ lui $a2, 0x4040 ## $a2 = 40400000 -/* 00B68 80B2AD68 0C0294E1 */ jal func_800A5384 -/* 00B6C 80B2AD6C 8FA40040 */ lw $a0, 0x0040($sp) -/* 00B70 80B2AD70 10000147 */ beq $zero, $zero, .L80B2B290 -/* 00B74 80B2AD74 8FBF003C */ lw $ra, 0x003C($sp) -/* 00B78 80B2AD78 8FAC0044 */ lw $t4, 0x0044($sp) +/* 00B68 80B2AD68 0C0294E1 */ jal SkelAnime_ChangeAnimPlaybackRepeat +/* 00B6C 80B2AD6C 8FA40040 */ lw $a0, 0x0040($sp) +/* 00B70 80B2AD70 10000147 */ beq $zero, $zero, .L80B2B290 +/* 00B74 80B2AD74 8FBF003C */ lw $ra, 0x003C($sp) +/* 00B78 80B2AD78 8FAC0044 */ lw $t4, 0x0044($sp) .L80B2AD7C: /* 00B7C 80B2AD7C 24080001 */ addiu $t0, $zero, 0x0001 ## $t0 = 00000001 -/* 00B80 80B2AD80 8FAA0044 */ lw $t2, 0x0044($sp) -/* 00B84 80B2AD84 150C0064 */ bne $t0, $t4, .L80B2AF18 +/* 00B80 80B2AD80 8FAA0044 */ lw $t2, 0x0044($sp) +/* 00B84 80B2AD84 150C0064 */ bne $t0, $t4, .L80B2AF18 /* 00B88 80B2AD88 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 /* 00B8C 80B2AD8C 3C0D8016 */ lui $t5, 0x8016 ## $t5 = 80160000 /* 00B90 80B2AD90 8DADF9C0 */ lw $t5, -0x0640($t5) ## 8015F9C0 /* 00B94 80B2AD94 24010005 */ addiu $at, $zero, 0x0005 ## $at = 00000005 -/* 00B98 80B2AD98 55A10019 */ bnel $t5, $at, .L80B2AE00 +/* 00B98 80B2AD98 55A10019 */ bnel $t5, $at, .L80B2AE00 /* 00B9C 80B2AD9C 94CF1D74 */ lhu $t7, 0x1D74($a2) ## 00001D74 /* 00BA0 80B2ADA0 94CE1D74 */ lhu $t6, 0x1D74($a2) ## 00001D74 /* 00BA4 80B2ADA4 2401034D */ addiu $at, $zero, 0x034D ## $at = 0000034D /* 00BA8 80B2ADA8 24C41C24 */ addiu $a0, $a2, 0x1C24 ## $a0 = 00001C24 -/* 00BAC 80B2ADAC 15C10029 */ bne $t6, $at, .L80B2AE54 +/* 00BAC 80B2ADAC 15C10029 */ bne $t6, $at, .L80B2AE54 /* 00BB0 80B2ADB0 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 00BB4 80B2ADB4 3C014080 */ lui $at, 0x4080 ## $at = 40800000 /* 00BB8 80B2ADB8 44819000 */ mtc1 $at, $f18 ## $f18 = 4.00 /* 00BBC 80B2ADBC 3C0142A2 */ lui $at, 0x42A2 ## $at = 42A20000 /* 00BC0 80B2ADC0 44812000 */ mtc1 $at, $f4 ## $f4 = 81.00 /* 00BC4 80B2ADC4 3C0180B3 */ lui $at, %hi(D_80B2D1AC) ## $at = 80B30000 -/* 00BC8 80B2ADC8 C426D1AC */ lwc1 $f6, %lo(D_80B2D1AC)($at) +/* 00BC8 80B2ADC8 C426D1AC */ lwc1 $f6, %lo(D_80B2D1AC)($at) /* 00BCC 80B2ADCC 240700F1 */ addiu $a3, $zero, 0x00F1 ## $a3 = 000000F1 -/* 00BD0 80B2ADD0 AFA0001C */ sw $zero, 0x001C($sp) -/* 00BD4 80B2ADD4 AFA00020 */ sw $zero, 0x0020($sp) -/* 00BD8 80B2ADD8 AFA00024 */ sw $zero, 0x0024($sp) -/* 00BDC 80B2ADDC AFA00028 */ sw $zero, 0x0028($sp) -/* 00BE0 80B2ADE0 E7B20010 */ swc1 $f18, 0x0010($sp) -/* 00BE4 80B2ADE4 E7A40014 */ swc1 $f4, 0x0014($sp) +/* 00BD0 80B2ADD0 AFA0001C */ sw $zero, 0x001C($sp) +/* 00BD4 80B2ADD4 AFA00020 */ sw $zero, 0x0020($sp) +/* 00BD8 80B2ADD8 AFA00024 */ sw $zero, 0x0024($sp) +/* 00BDC 80B2ADDC AFA00028 */ sw $zero, 0x0028($sp) +/* 00BE0 80B2ADE0 E7B20010 */ swc1 $f18, 0x0010($sp) +/* 00BE4 80B2ADE4 E7A40014 */ swc1 $f4, 0x0014($sp) /* 00BE8 80B2ADE8 0C00C916 */ jal Actor_SpawnAttached - -/* 00BEC 80B2ADEC E7A60018 */ swc1 $f6, 0x0018($sp) -/* 00BF0 80B2ADF0 8FA6005C */ lw $a2, 0x005C($sp) -/* 00BF4 80B2ADF4 10000017 */ beq $zero, $zero, .L80B2AE54 + +/* 00BEC 80B2ADEC E7A60018 */ swc1 $f6, 0x0018($sp) +/* 00BF0 80B2ADF0 8FA6005C */ lw $a2, 0x005C($sp) +/* 00BF4 80B2ADF4 10000017 */ beq $zero, $zero, .L80B2AE54 /* 00BF8 80B2ADF8 24080001 */ addiu $t0, $zero, 0x0001 ## $t0 = 00000001 /* 00BFC 80B2ADFC 94CF1D74 */ lhu $t7, 0x1D74($a2) ## 00001D74 .L80B2AE00: /* 00C00 80B2AE00 240100C3 */ addiu $at, $zero, 0x00C3 ## $at = 000000C3 /* 00C04 80B2AE04 24C41C24 */ addiu $a0, $a2, 0x1C24 ## $a0 = 00001C24 -/* 00C08 80B2AE08 15E10012 */ bne $t7, $at, .L80B2AE54 +/* 00C08 80B2AE08 15E10012 */ bne $t7, $at, .L80B2AE54 /* 00C0C 80B2AE0C 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 00C10 80B2AE10 3C014080 */ lui $at, 0x4080 ## $at = 40800000 /* 00C14 80B2AE14 44814000 */ mtc1 $at, $f8 ## $f8 = 4.00 /* 00C18 80B2AE18 3C0142A2 */ lui $at, 0x42A2 ## $at = 42A20000 /* 00C1C 80B2AE1C 44815000 */ mtc1 $at, $f10 ## $f10 = 81.00 /* 00C20 80B2AE20 3C0180B3 */ lui $at, %hi(D_80B2D1B0) ## $at = 80B30000 -/* 00C24 80B2AE24 C430D1B0 */ lwc1 $f16, %lo(D_80B2D1B0)($at) +/* 00C24 80B2AE24 C430D1B0 */ lwc1 $f16, %lo(D_80B2D1B0)($at) /* 00C28 80B2AE28 240700F1 */ addiu $a3, $zero, 0x00F1 ## $a3 = 000000F1 -/* 00C2C 80B2AE2C AFA0001C */ sw $zero, 0x001C($sp) -/* 00C30 80B2AE30 AFA00020 */ sw $zero, 0x0020($sp) -/* 00C34 80B2AE34 AFA00024 */ sw $zero, 0x0024($sp) -/* 00C38 80B2AE38 AFA80028 */ sw $t0, 0x0028($sp) -/* 00C3C 80B2AE3C E7A80010 */ swc1 $f8, 0x0010($sp) -/* 00C40 80B2AE40 E7AA0014 */ swc1 $f10, 0x0014($sp) +/* 00C2C 80B2AE2C AFA0001C */ sw $zero, 0x001C($sp) +/* 00C30 80B2AE30 AFA00020 */ sw $zero, 0x0020($sp) +/* 00C34 80B2AE34 AFA00024 */ sw $zero, 0x0024($sp) +/* 00C38 80B2AE38 AFA80028 */ sw $t0, 0x0028($sp) +/* 00C3C 80B2AE3C E7A80010 */ swc1 $f8, 0x0010($sp) +/* 00C40 80B2AE40 E7AA0014 */ swc1 $f10, 0x0014($sp) /* 00C44 80B2AE44 0C00C916 */ jal Actor_SpawnAttached - -/* 00C48 80B2AE48 E7B00018 */ swc1 $f16, 0x0018($sp) -/* 00C4C 80B2AE4C 8FA6005C */ lw $a2, 0x005C($sp) + +/* 00C48 80B2AE48 E7B00018 */ swc1 $f16, 0x0018($sp) +/* 00C4C 80B2AE4C 8FA6005C */ lw $a2, 0x005C($sp) /* 00C50 80B2AE50 24080001 */ addiu $t0, $zero, 0x0001 ## $t0 = 00000001 .L80B2AE54: /* 00C54 80B2AE54 920301E5 */ lbu $v1, 0x01E5($s0) ## 000001E5 -/* 00C58 80B2AE58 50600006 */ beql $v1, $zero, .L80B2AE74 +/* 00C58 80B2AE58 50600006 */ beql $v1, $zero, .L80B2AE74 /* 00C5C 80B2AE5C 90D81D6C */ lbu $t8, 0x1D6C($a2) ## 00001D6C -/* 00C60 80B2AE60 50680019 */ beql $v1, $t0, .L80B2AEC8 +/* 00C60 80B2AE60 50680019 */ beql $v1, $t0, .L80B2AEC8 /* 00C64 80B2AE64 90CD1D6C */ lbu $t5, 0x1D6C($a2) ## 00001D6C -/* 00C68 80B2AE68 10000109 */ beq $zero, $zero, .L80B2B290 -/* 00C6C 80B2AE6C 8FBF003C */ lw $ra, 0x003C($sp) +/* 00C68 80B2AE68 10000109 */ beq $zero, $zero, .L80B2B290 +/* 00C6C 80B2AE6C 8FBF003C */ lw $ra, 0x003C($sp) /* 00C70 80B2AE70 90D81D6C */ lbu $t8, 0x1D6C($a2) ## 00001D6C .L80B2AE74: -/* 00C74 80B2AE74 53000106 */ beql $t8, $zero, .L80B2B290 -/* 00C78 80B2AE78 8FBF003C */ lw $ra, 0x003C($sp) +/* 00C74 80B2AE74 53000106 */ beql $t8, $zero, .L80B2B290 +/* 00C78 80B2AE78 8FBF003C */ lw $ra, 0x003C($sp) /* 00C7C 80B2AE7C 8CC21D8C */ lw $v0, 0x1D8C($a2) ## 00001D8C -/* 00C80 80B2AE80 50400103 */ beql $v0, $zero, .L80B2B290 -/* 00C84 80B2AE84 8FBF003C */ lw $ra, 0x003C($sp) +/* 00C80 80B2AE80 50400103 */ beql $v0, $zero, .L80B2B290 +/* 00C84 80B2AE84 8FBF003C */ lw $ra, 0x003C($sp) /* 00C88 80B2AE88 94590000 */ lhu $t9, 0x0000($v0) ## 00000000 /* 00C8C 80B2AE8C 24010006 */ addiu $at, $zero, 0x0006 ## $at = 00000006 -/* 00C90 80B2AE90 572100FF */ bnel $t9, $at, .L80B2B290 -/* 00C94 80B2AE94 8FBF003C */ lw $ra, 0x003C($sp) +/* 00C90 80B2AE90 572100FF */ bnel $t9, $at, .L80B2B290 +/* 00C94 80B2AE94 8FBF003C */ lw $ra, 0x003C($sp) /* 00C98 80B2AE98 8E0A01A0 */ lw $t2, 0x01A0($s0) ## 000001A0 /* 00C9C 80B2AE9C 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 00CA0 80B2AEA0 24A52574 */ addiu $a1, $a1, 0x2574 ## $a1 = 06002574 -/* 00CA4 80B2AEA4 10AA00F9 */ beq $a1, $t2, .L80B2B28C -/* 00CA8 80B2AEA8 8FA40040 */ lw $a0, 0x0040($sp) -/* 00CAC 80B2AEAC 0C0294E1 */ jal func_800A5384 +/* 00CA4 80B2AEA4 10AA00F9 */ beq $a1, $t2, .L80B2B28C +/* 00CA8 80B2AEA8 8FA40040 */ lw $a0, 0x0040($sp) +/* 00CAC 80B2AEAC 0C0294E1 */ jal SkelAnime_ChangeAnimPlaybackRepeat /* 00CB0 80B2AEB0 3C063FC0 */ lui $a2, 0x3FC0 ## $a2 = 3FC00000 /* 00CB4 80B2AEB4 920B01E5 */ lbu $t3, 0x01E5($s0) ## 000001E5 /* 00CB8 80B2AEB8 256C0001 */ addiu $t4, $t3, 0x0001 ## $t4 = 00000001 -/* 00CBC 80B2AEBC 100000F3 */ beq $zero, $zero, .L80B2B28C +/* 00CBC 80B2AEBC 100000F3 */ beq $zero, $zero, .L80B2B28C /* 00CC0 80B2AEC0 A20C01E5 */ sb $t4, 0x01E5($s0) ## 000001E5 /* 00CC4 80B2AEC4 90CD1D6C */ lbu $t5, 0x1D6C($a2) ## 00001D6C .L80B2AEC8: -/* 00CC8 80B2AEC8 51A000F1 */ beql $t5, $zero, .L80B2B290 -/* 00CCC 80B2AECC 8FBF003C */ lw $ra, 0x003C($sp) +/* 00CC8 80B2AEC8 51A000F1 */ beql $t5, $zero, .L80B2B290 +/* 00CCC 80B2AECC 8FBF003C */ lw $ra, 0x003C($sp) /* 00CD0 80B2AED0 8CC21D8C */ lw $v0, 0x1D8C($a2) ## 00001D8C -/* 00CD4 80B2AED4 504000EE */ beql $v0, $zero, .L80B2B290 -/* 00CD8 80B2AED8 8FBF003C */ lw $ra, 0x003C($sp) +/* 00CD4 80B2AED4 504000EE */ beql $v0, $zero, .L80B2B290 +/* 00CD8 80B2AED8 8FBF003C */ lw $ra, 0x003C($sp) /* 00CDC 80B2AEDC 944E0000 */ lhu $t6, 0x0000($v0) ## 00000000 /* 00CE0 80B2AEE0 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 00CE4 80B2AEE4 55C100EA */ bnel $t6, $at, .L80B2B290 -/* 00CE8 80B2AEE8 8FBF003C */ lw $ra, 0x003C($sp) +/* 00CE4 80B2AEE4 55C100EA */ bnel $t6, $at, .L80B2B290 +/* 00CE8 80B2AEE8 8FBF003C */ lw $ra, 0x003C($sp) /* 00CEC 80B2AEEC 8E0F01A0 */ lw $t7, 0x01A0($s0) ## 000001A0 /* 00CF0 80B2AEF0 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 00CF4 80B2AEF4 24A529CC */ addiu $a1, $a1, 0x29CC ## $a1 = 060029CC -/* 00CF8 80B2AEF8 10AF00E4 */ beq $a1, $t7, .L80B2B28C -/* 00CFC 80B2AEFC 8FA40040 */ lw $a0, 0x0040($sp) -/* 00D00 80B2AF00 0C0294E1 */ jal func_800A5384 +/* 00CF8 80B2AEF8 10AF00E4 */ beq $a1, $t7, .L80B2B28C +/* 00CFC 80B2AEFC 8FA40040 */ lw $a0, 0x0040($sp) +/* 00D00 80B2AF00 0C0294E1 */ jal SkelAnime_ChangeAnimPlaybackRepeat /* 00D04 80B2AF04 3C064040 */ lui $a2, 0x4040 ## $a2 = 40400000 /* 00D08 80B2AF08 921801E5 */ lbu $t8, 0x01E5($s0) ## 000001E5 /* 00D0C 80B2AF0C 27190001 */ addiu $t9, $t8, 0x0001 ## $t9 = 00000001 -/* 00D10 80B2AF10 100000DE */ beq $zero, $zero, .L80B2B28C +/* 00D10 80B2AF10 100000DE */ beq $zero, $zero, .L80B2B28C /* 00D14 80B2AF14 A21901E5 */ sb $t9, 0x01E5($s0) ## 000001E5 .L80B2AF18: -/* 00D18 80B2AF18 15410067 */ bne $t2, $at, .L80B2B0B8 -/* 00D1C 80B2AF1C 8FAE0044 */ lw $t6, 0x0044($sp) +/* 00D18 80B2AF18 15410067 */ bne $t2, $at, .L80B2B0B8 +/* 00D1C 80B2AF1C 8FAE0044 */ lw $t6, 0x0044($sp) /* 00D20 80B2AF20 84CB00A4 */ lh $t3, 0x00A4($a2) ## 000000A4 /* 00D24 80B2AF24 24010051 */ addiu $at, $zero, 0x0051 ## $at = 00000051 /* 00D28 80B2AF28 00002025 */ or $a0, $zero, $zero ## $a0 = 00000000 -/* 00D2C 80B2AF2C 15610032 */ bne $t3, $at, .L80B2AFF8 +/* 00D2C 80B2AF2C 15610032 */ bne $t3, $at, .L80B2AFF8 /* 00D30 80B2AF30 00000000 */ nop /* 00D34 80B2AF34 920301E5 */ lbu $v1, 0x01E5($s0) ## 000001E5 -/* 00D38 80B2AF38 50600006 */ beql $v1, $zero, .L80B2AF54 +/* 00D38 80B2AF38 50600006 */ beql $v1, $zero, .L80B2AF54 /* 00D3C 80B2AF3C 90CC1D6C */ lbu $t4, 0x1D6C($a2) ## 00001D6C -/* 00D40 80B2AF40 50680019 */ beql $v1, $t0, .L80B2AFA8 +/* 00D40 80B2AF40 50680019 */ beql $v1, $t0, .L80B2AFA8 /* 00D44 80B2AF44 90D91D6C */ lbu $t9, 0x1D6C($a2) ## 00001D6C -/* 00D48 80B2AF48 100000D1 */ beq $zero, $zero, .L80B2B290 -/* 00D4C 80B2AF4C 8FBF003C */ lw $ra, 0x003C($sp) +/* 00D48 80B2AF48 100000D1 */ beq $zero, $zero, .L80B2B290 +/* 00D4C 80B2AF4C 8FBF003C */ lw $ra, 0x003C($sp) /* 00D50 80B2AF50 90CC1D6C */ lbu $t4, 0x1D6C($a2) ## 00001D6C .L80B2AF54: -/* 00D54 80B2AF54 518000CE */ beql $t4, $zero, .L80B2B290 -/* 00D58 80B2AF58 8FBF003C */ lw $ra, 0x003C($sp) +/* 00D54 80B2AF54 518000CE */ beql $t4, $zero, .L80B2B290 +/* 00D58 80B2AF58 8FBF003C */ lw $ra, 0x003C($sp) /* 00D5C 80B2AF5C 8CC21D8C */ lw $v0, 0x1D8C($a2) ## 00001D8C -/* 00D60 80B2AF60 504000CB */ beql $v0, $zero, .L80B2B290 -/* 00D64 80B2AF64 8FBF003C */ lw $ra, 0x003C($sp) +/* 00D60 80B2AF60 504000CB */ beql $v0, $zero, .L80B2B290 +/* 00D64 80B2AF64 8FBF003C */ lw $ra, 0x003C($sp) /* 00D68 80B2AF68 944D0000 */ lhu $t5, 0x0000($v0) ## 00000000 /* 00D6C 80B2AF6C 24010006 */ addiu $at, $zero, 0x0006 ## $at = 00000006 -/* 00D70 80B2AF70 55A100C7 */ bnel $t5, $at, .L80B2B290 -/* 00D74 80B2AF74 8FBF003C */ lw $ra, 0x003C($sp) +/* 00D70 80B2AF70 55A100C7 */ bnel $t5, $at, .L80B2B290 +/* 00D74 80B2AF74 8FBF003C */ lw $ra, 0x003C($sp) /* 00D78 80B2AF78 8E0E01A0 */ lw $t6, 0x01A0($s0) ## 000001A0 /* 00D7C 80B2AF7C 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 00D80 80B2AF80 24A51410 */ addiu $a1, $a1, 0x1410 ## $a1 = 06001410 -/* 00D84 80B2AF84 10AE00C1 */ beq $a1, $t6, .L80B2B28C -/* 00D88 80B2AF88 8FA40040 */ lw $a0, 0x0040($sp) -/* 00D8C 80B2AF8C 0C0294E1 */ jal func_800A5384 +/* 00D84 80B2AF84 10AE00C1 */ beq $a1, $t6, .L80B2B28C +/* 00D88 80B2AF88 8FA40040 */ lw $a0, 0x0040($sp) +/* 00D8C 80B2AF8C 0C0294E1 */ jal SkelAnime_ChangeAnimPlaybackRepeat /* 00D90 80B2AF90 3C063FC0 */ lui $a2, 0x3FC0 ## $a2 = 3FC00000 /* 00D94 80B2AF94 920F01E5 */ lbu $t7, 0x01E5($s0) ## 000001E5 /* 00D98 80B2AF98 25F80001 */ addiu $t8, $t7, 0x0001 ## $t8 = 00000001 -/* 00D9C 80B2AF9C 100000BB */ beq $zero, $zero, .L80B2B28C +/* 00D9C 80B2AF9C 100000BB */ beq $zero, $zero, .L80B2B28C /* 00DA0 80B2AFA0 A21801E5 */ sb $t8, 0x01E5($s0) ## 000001E5 /* 00DA4 80B2AFA4 90D91D6C */ lbu $t9, 0x1D6C($a2) ## 00001D6C .L80B2AFA8: -/* 00DA8 80B2AFA8 532000B9 */ beql $t9, $zero, .L80B2B290 -/* 00DAC 80B2AFAC 8FBF003C */ lw $ra, 0x003C($sp) +/* 00DA8 80B2AFA8 532000B9 */ beql $t9, $zero, .L80B2B290 +/* 00DAC 80B2AFAC 8FBF003C */ lw $ra, 0x003C($sp) /* 00DB0 80B2AFB0 8CC21D8C */ lw $v0, 0x1D8C($a2) ## 00001D8C -/* 00DB4 80B2AFB4 504000B6 */ beql $v0, $zero, .L80B2B290 -/* 00DB8 80B2AFB8 8FBF003C */ lw $ra, 0x003C($sp) +/* 00DB4 80B2AFB4 504000B6 */ beql $v0, $zero, .L80B2B290 +/* 00DB8 80B2AFB8 8FBF003C */ lw $ra, 0x003C($sp) /* 00DBC 80B2AFBC 944A0000 */ lhu $t2, 0x0000($v0) ## 00000000 /* 00DC0 80B2AFC0 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 00DC4 80B2AFC4 554100B2 */ bnel $t2, $at, .L80B2B290 -/* 00DC8 80B2AFC8 8FBF003C */ lw $ra, 0x003C($sp) +/* 00DC4 80B2AFC4 554100B2 */ bnel $t2, $at, .L80B2B290 +/* 00DC8 80B2AFC8 8FBF003C */ lw $ra, 0x003C($sp) /* 00DCC 80B2AFCC 8E0B01A0 */ lw $t3, 0x01A0($s0) ## 000001A0 /* 00DD0 80B2AFD0 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 00DD4 80B2AFD4 24A50450 */ addiu $a1, $a1, 0x0450 ## $a1 = 06000450 -/* 00DD8 80B2AFD8 10AB00AC */ beq $a1, $t3, .L80B2B28C -/* 00DDC 80B2AFDC 8FA40040 */ lw $a0, 0x0040($sp) -/* 00DE0 80B2AFE0 0C0294E1 */ jal func_800A5384 +/* 00DD8 80B2AFD8 10AB00AC */ beq $a1, $t3, .L80B2B28C +/* 00DDC 80B2AFDC 8FA40040 */ lw $a0, 0x0040($sp) +/* 00DE0 80B2AFE0 0C0294E1 */ jal SkelAnime_ChangeAnimPlaybackRepeat /* 00DE4 80B2AFE4 3C064040 */ lui $a2, 0x4040 ## $a2 = 40400000 /* 00DE8 80B2AFE8 920C01E5 */ lbu $t4, 0x01E5($s0) ## 000001E5 /* 00DEC 80B2AFEC 258D0001 */ addiu $t5, $t4, 0x0001 ## $t5 = 00000001 -/* 00DF0 80B2AFF0 100000A6 */ beq $zero, $zero, .L80B2B28C +/* 00DF0 80B2AFF0 100000A6 */ beq $zero, $zero, .L80B2B28C /* 00DF4 80B2AFF4 A20D01E5 */ sb $t5, 0x01E5($s0) ## 000001E5 .L80B2AFF8: -/* 00DF8 80B2AFF8 0C03D9E8 */ jal func_800F67A0 -/* 00DFC 80B2AFFC AFA50050 */ sw $a1, 0x0050($sp) +/* 00DF8 80B2AFF8 0C03D9E8 */ jal func_800F67A0 +/* 00DFC 80B2AFFC AFA50050 */ sw $a1, 0x0050($sp) /* 00E00 80B2B000 920301E5 */ lbu $v1, 0x01E5($s0) ## 000001E5 -/* 00E04 80B2B004 8FA50050 */ lw $a1, 0x0050($sp) -/* 00E08 80B2B008 8FA6005C */ lw $a2, 0x005C($sp) -/* 00E0C 80B2B00C 10600009 */ beq $v1, $zero, .L80B2B034 +/* 00E04 80B2B004 8FA50050 */ lw $a1, 0x0050($sp) +/* 00E08 80B2B008 8FA6005C */ lw $a2, 0x005C($sp) +/* 00E0C 80B2B00C 10600009 */ beq $v1, $zero, .L80B2B034 /* 00E10 80B2B010 24080001 */ addiu $t0, $zero, 0x0001 ## $t0 = 00000001 -/* 00E14 80B2B014 10680010 */ beq $v1, $t0, .L80B2B058 +/* 00E14 80B2B014 10680010 */ beq $v1, $t0, .L80B2B058 /* 00E18 80B2B018 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 00E1C 80B2B01C 1061001C */ beq $v1, $at, .L80B2B090 +/* 00E1C 80B2B01C 1061001C */ beq $v1, $at, .L80B2B090 /* 00E20 80B2B020 24010003 */ addiu $at, $zero, 0x0003 ## $at = 00000003 -/* 00E24 80B2B024 5061009A */ beql $v1, $at, .L80B2B290 -/* 00E28 80B2B028 8FBF003C */ lw $ra, 0x003C($sp) -/* 00E2C 80B2B02C 10000098 */ beq $zero, $zero, .L80B2B290 -/* 00E30 80B2B030 8FBF003C */ lw $ra, 0x003C($sp) +/* 00E24 80B2B024 5061009A */ beql $v1, $at, .L80B2B290 +/* 00E28 80B2B028 8FBF003C */ lw $ra, 0x003C($sp) +/* 00E2C 80B2B02C 10000098 */ beq $zero, $zero, .L80B2B290 +/* 00E30 80B2B030 8FBF003C */ lw $ra, 0x003C($sp) .L80B2B034: /* 00E34 80B2B034 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 00E38 80B2B038 24A5504C */ addiu $a1, $a1, 0x504C ## $a1 = 0600504C -/* 00E3C 80B2B03C 8FA40040 */ lw $a0, 0x0040($sp) -/* 00E40 80B2B040 0C0294E1 */ jal func_800A5384 +/* 00E3C 80B2B03C 8FA40040 */ lw $a0, 0x0040($sp) +/* 00E40 80B2B040 0C0294E1 */ jal SkelAnime_ChangeAnimPlaybackRepeat /* 00E44 80B2B044 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 00E48 80B2B048 920E01E5 */ lbu $t6, 0x01E5($s0) ## 000001E5 /* 00E4C 80B2B04C 25CF0001 */ addiu $t7, $t6, 0x0001 ## $t7 = 00000001 -/* 00E50 80B2B050 1000008E */ beq $zero, $zero, .L80B2B28C +/* 00E50 80B2B050 1000008E */ beq $zero, $zero, .L80B2B28C /* 00E54 80B2B054 A20F01E5 */ sb $t7, 0x01E5($s0) ## 000001E5 .L80B2B058: /* 00E58 80B2B058 8CD81D8C */ lw $t8, 0x1D8C($a2) ## 00001D8C @@ -640,112 +640,112 @@ glabel L80B2AD44 /* 00E60 80B2B060 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 00E64 80B2B064 97190000 */ lhu $t9, 0x0000($t8) ## 00000000 /* 00E68 80B2B068 24A5420C */ addiu $a1, $a1, 0x420C ## $a1 = 0600420C -/* 00E6C 80B2B06C 8FA40040 */ lw $a0, 0x0040($sp) -/* 00E70 80B2B070 57210087 */ bnel $t9, $at, .L80B2B290 -/* 00E74 80B2B074 8FBF003C */ lw $ra, 0x003C($sp) -/* 00E78 80B2B078 0C029490 */ jal func_800A5240 +/* 00E6C 80B2B06C 8FA40040 */ lw $a0, 0x0040($sp) +/* 00E70 80B2B070 57210087 */ bnel $t9, $at, .L80B2B290 +/* 00E74 80B2B074 8FBF003C */ lw $ra, 0x003C($sp) +/* 00E78 80B2B078 0C029490 */ jal SkelAnime_ChangeAnimTransitionStop /* 00E7C 80B2B07C 3C06C0A0 */ lui $a2, 0xC0A0 ## $a2 = C0A00000 /* 00E80 80B2B080 920A01E5 */ lbu $t2, 0x01E5($s0) ## 000001E5 /* 00E84 80B2B084 254B0001 */ addiu $t3, $t2, 0x0001 ## $t3 = 00000001 -/* 00E88 80B2B088 10000080 */ beq $zero, $zero, .L80B2B28C +/* 00E88 80B2B088 10000080 */ beq $zero, $zero, .L80B2B28C /* 00E8C 80B2B08C A20B01E5 */ sb $t3, 0x01E5($s0) ## 000001E5 .L80B2B090: -/* 00E90 80B2B090 10A0007E */ beq $a1, $zero, .L80B2B28C -/* 00E94 80B2B094 8FA40040 */ lw $a0, 0x0040($sp) +/* 00E90 80B2B090 10A0007E */ beq $a1, $zero, .L80B2B28C +/* 00E94 80B2B094 8FA40040 */ lw $a0, 0x0040($sp) /* 00E98 80B2B098 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 00E9C 80B2B09C 24A548FC */ addiu $a1, $a1, 0x48FC ## $a1 = 060048FC -/* 00EA0 80B2B0A0 0C0294D3 */ jal func_800A534C +/* 00EA0 80B2B0A0 0C0294D3 */ jal SkelAnime_ChangeAnimTransitionRepeat /* 00EA4 80B2B0A4 3C06C0A0 */ lui $a2, 0xC0A0 ## $a2 = C0A00000 /* 00EA8 80B2B0A8 920C01E5 */ lbu $t4, 0x01E5($s0) ## 000001E5 /* 00EAC 80B2B0AC 258D0001 */ addiu $t5, $t4, 0x0001 ## $t5 = 00000001 -/* 00EB0 80B2B0B0 10000076 */ beq $zero, $zero, .L80B2B28C +/* 00EB0 80B2B0B0 10000076 */ beq $zero, $zero, .L80B2B28C /* 00EB4 80B2B0B4 A20D01E5 */ sb $t5, 0x01E5($s0) ## 000001E5 .L80B2B0B8: /* 00EB8 80B2B0B8 24040007 */ addiu $a0, $zero, 0x0007 ## $a0 = 00000007 -/* 00EBC 80B2B0BC 548E002F */ bnel $a0, $t6, .L80B2B17C -/* 00EC0 80B2B0C0 8FAE0044 */ lw $t6, 0x0044($sp) +/* 00EBC 80B2B0BC 548E002F */ bnel $a0, $t6, .L80B2B17C +/* 00EC0 80B2B0C0 8FAE0044 */ lw $t6, 0x0044($sp) /* 00EC4 80B2B0C4 920301E5 */ lbu $v1, 0x01E5($s0) ## 000001E5 -/* 00EC8 80B2B0C8 50600006 */ beql $v1, $zero, .L80B2B0E4 +/* 00EC8 80B2B0C8 50600006 */ beql $v1, $zero, .L80B2B0E4 /* 00ECC 80B2B0CC 90CF1D6C */ lbu $t7, 0x1D6C($a2) ## 00001D6C -/* 00ED0 80B2B0D0 1068001F */ beq $v1, $t0, .L80B2B150 +/* 00ED0 80B2B0D0 1068001F */ beq $v1, $t0, .L80B2B150 /* 00ED4 80B2B0D4 00000000 */ nop -/* 00ED8 80B2B0D8 1000006D */ beq $zero, $zero, .L80B2B290 -/* 00EDC 80B2B0DC 8FBF003C */ lw $ra, 0x003C($sp) +/* 00ED8 80B2B0D8 1000006D */ beq $zero, $zero, .L80B2B290 +/* 00EDC 80B2B0DC 8FBF003C */ lw $ra, 0x003C($sp) /* 00EE0 80B2B0E0 90CF1D6C */ lbu $t7, 0x1D6C($a2) ## 00001D6C .L80B2B0E4: -/* 00EE4 80B2B0E4 51E0006A */ beql $t7, $zero, .L80B2B290 -/* 00EE8 80B2B0E8 8FBF003C */ lw $ra, 0x003C($sp) +/* 00EE4 80B2B0E4 51E0006A */ beql $t7, $zero, .L80B2B290 +/* 00EE8 80B2B0E8 8FBF003C */ lw $ra, 0x003C($sp) /* 00EEC 80B2B0EC 8CC31D90 */ lw $v1, 0x1D90($a2) ## 00001D90 -/* 00EF0 80B2B0F0 50600067 */ beql $v1, $zero, .L80B2B290 -/* 00EF4 80B2B0F4 8FBF003C */ lw $ra, 0x003C($sp) +/* 00EF0 80B2B0F0 50600067 */ beql $v1, $zero, .L80B2B290 +/* 00EF4 80B2B0F4 8FBF003C */ lw $ra, 0x003C($sp) /* 00EF8 80B2B0F8 94780000 */ lhu $t8, 0x0000($v1) ## 00000000 /* 00EFC 80B2B0FC 3C078013 */ lui $a3, 0x8013 ## $a3 = 80130000 /* 00F00 80B2B100 24E733E0 */ addiu $a3, $a3, 0x33E0 ## $a3 = 801333E0 -/* 00F04 80B2B104 14980061 */ bne $a0, $t8, .L80B2B28C +/* 00F04 80B2B104 14980061 */ bne $a0, $t8, .L80B2B28C /* 00F08 80B2B108 3C058013 */ lui $a1, 0x8013 ## $a1 = 80130000 /* 00F0C 80B2B10C 3C198013 */ lui $t9, 0x8013 ## $t9 = 80130000 /* 00F10 80B2B110 273933E8 */ addiu $t9, $t9, 0x33E8 ## $t9 = 801333E8 -/* 00F14 80B2B114 AFB90014 */ sw $t9, 0x0014($sp) +/* 00F14 80B2B114 AFB90014 */ sw $t9, 0x0014($sp) /* 00F18 80B2B118 240439C7 */ addiu $a0, $zero, 0x39C7 ## $a0 = 000039C7 /* 00F1C 80B2B11C 24A533D4 */ addiu $a1, $a1, 0x33D4 ## $a1 = 801333D4 /* 00F20 80B2B120 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 /* 00F24 80B2B124 0C03DCE3 */ jal Audio_PlaySoundGeneral - -/* 00F28 80B2B128 AFA70010 */ sw $a3, 0x0010($sp) + +/* 00F28 80B2B128 AFA70010 */ sw $a3, 0x0010($sp) /* 00F2C 80B2B12C 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 00F30 80B2B130 24A54534 */ addiu $a1, $a1, 0x4534 ## $a1 = 06004534 -/* 00F34 80B2B134 8FA40040 */ lw $a0, 0x0040($sp) -/* 00F38 80B2B138 0C029490 */ jal func_800A5240 +/* 00F34 80B2B134 8FA40040 */ lw $a0, 0x0040($sp) +/* 00F38 80B2B138 0C029490 */ jal SkelAnime_ChangeAnimTransitionStop /* 00F3C 80B2B13C 3C06C0A0 */ lui $a2, 0xC0A0 ## $a2 = C0A00000 /* 00F40 80B2B140 920A01E5 */ lbu $t2, 0x01E5($s0) ## 000001E5 /* 00F44 80B2B144 254B0001 */ addiu $t3, $t2, 0x0001 ## $t3 = 00000001 -/* 00F48 80B2B148 10000050 */ beq $zero, $zero, .L80B2B28C +/* 00F48 80B2B148 10000050 */ beq $zero, $zero, .L80B2B28C /* 00F4C 80B2B14C A20B01E5 */ sb $t3, 0x01E5($s0) ## 000001E5 .L80B2B150: -/* 00F50 80B2B150 1040004E */ beq $v0, $zero, .L80B2B28C -/* 00F54 80B2B154 8FA40040 */ lw $a0, 0x0040($sp) +/* 00F50 80B2B150 1040004E */ beq $v0, $zero, .L80B2B28C +/* 00F54 80B2B154 8FA40040 */ lw $a0, 0x0040($sp) /* 00F58 80B2B158 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 00F5C 80B2B15C 24A548B0 */ addiu $a1, $a1, 0x48B0 ## $a1 = 060048B0 -/* 00F60 80B2B160 0C0294D3 */ jal func_800A534C +/* 00F60 80B2B160 0C0294D3 */ jal SkelAnime_ChangeAnimTransitionRepeat /* 00F64 80B2B164 3C06C0A0 */ lui $a2, 0xC0A0 ## $a2 = C0A00000 /* 00F68 80B2B168 920C01E5 */ lbu $t4, 0x01E5($s0) ## 000001E5 /* 00F6C 80B2B16C 258D0001 */ addiu $t5, $t4, 0x0001 ## $t5 = 00000001 -/* 00F70 80B2B170 10000046 */ beq $zero, $zero, .L80B2B28C +/* 00F70 80B2B170 10000046 */ beq $zero, $zero, .L80B2B28C /* 00F74 80B2B174 A20D01E5 */ sb $t5, 0x01E5($s0) ## 000001E5 -/* 00F78 80B2B178 8FAE0044 */ lw $t6, 0x0044($sp) +/* 00F78 80B2B178 8FAE0044 */ lw $t6, 0x0044($sp) .L80B2B17C: /* 00F7C 80B2B17C 24010008 */ addiu $at, $zero, 0x0008 ## $at = 00000008 -/* 00F80 80B2B180 55C10043 */ bnel $t6, $at, .L80B2B290 -/* 00F84 80B2B184 8FBF003C */ lw $ra, 0x003C($sp) +/* 00F80 80B2B180 55C10043 */ bnel $t6, $at, .L80B2B290 +/* 00F84 80B2B184 8FBF003C */ lw $ra, 0x003C($sp) /* 00F88 80B2B188 920301E5 */ lbu $v1, 0x01E5($s0) ## 000001E5 -/* 00F8C 80B2B18C 5060000A */ beql $v1, $zero, .L80B2B1B8 +/* 00F8C 80B2B18C 5060000A */ beql $v1, $zero, .L80B2B1B8 /* 00F90 80B2B190 90CF1D6C */ lbu $t7, 0x1D6C($a2) ## 00001D6C -/* 00F94 80B2B194 10680019 */ beq $v1, $t0, .L80B2B1FC +/* 00F94 80B2B194 10680019 */ beq $v1, $t0, .L80B2B1FC /* 00F98 80B2B198 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 00F9C 80B2B19C 10610025 */ beq $v1, $at, .L80B2B234 +/* 00F9C 80B2B19C 10610025 */ beq $v1, $at, .L80B2B234 /* 00FA0 80B2B1A0 00000000 */ nop -/* 00FA4 80B2B1A4 5067002E */ beql $v1, $a3, .L80B2B260 +/* 00FA4 80B2B1A4 5067002E */ beql $v1, $a3, .L80B2B260 /* 00FA8 80B2B1A8 8CD91D90 */ lw $t9, 0x1D90($a2) ## 00001D90 -/* 00FAC 80B2B1AC 10000037 */ beq $zero, $zero, .L80B2B28C +/* 00FAC 80B2B1AC 10000037 */ beq $zero, $zero, .L80B2B28C /* 00FB0 80B2B1B0 A20001E5 */ sb $zero, 0x01E5($s0) ## 000001E5 /* 00FB4 80B2B1B4 90CF1D6C */ lbu $t7, 0x1D6C($a2) ## 00001D6C .L80B2B1B8: -/* 00FB8 80B2B1B8 51E00035 */ beql $t7, $zero, .L80B2B290 -/* 00FBC 80B2B1BC 8FBF003C */ lw $ra, 0x003C($sp) +/* 00FB8 80B2B1B8 51E00035 */ beql $t7, $zero, .L80B2B290 +/* 00FBC 80B2B1BC 8FBF003C */ lw $ra, 0x003C($sp) /* 00FC0 80B2B1C0 8CC31D90 */ lw $v1, 0x1D90($a2) ## 00001D90 -/* 00FC4 80B2B1C4 50600032 */ beql $v1, $zero, .L80B2B290 -/* 00FC8 80B2B1C8 8FBF003C */ lw $ra, 0x003C($sp) +/* 00FC4 80B2B1C4 50600032 */ beql $v1, $zero, .L80B2B290 +/* 00FC8 80B2B1C8 8FBF003C */ lw $ra, 0x003C($sp) /* 00FCC 80B2B1CC 94780000 */ lhu $t8, 0x0000($v1) ## 00000000 /* 00FD0 80B2B1D0 24010009 */ addiu $at, $zero, 0x0009 ## $at = 00000009 -/* 00FD4 80B2B1D4 8FA40040 */ lw $a0, 0x0040($sp) -/* 00FD8 80B2B1D8 1701002C */ bne $t8, $at, .L80B2B28C +/* 00FD4 80B2B1D4 8FA40040 */ lw $a0, 0x0040($sp) +/* 00FD8 80B2B1D8 1701002C */ bne $t8, $at, .L80B2B28C /* 00FDC 80B2B1DC 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 00FE0 80B2B1E0 24A550A8 */ addiu $a1, $a1, 0x50A8 ## $a1 = 060050A8 -/* 00FE4 80B2B1E4 0C0294E1 */ jal func_800A5384 +/* 00FE4 80B2B1E4 0C0294E1 */ jal SkelAnime_ChangeAnimPlaybackRepeat /* 00FE8 80B2B1E8 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 00FEC 80B2B1EC 921901E5 */ lbu $t9, 0x01E5($s0) ## 000001E5 /* 00FF0 80B2B1F0 272A0001 */ addiu $t2, $t9, 0x0001 ## $t2 = 00000001 -/* 00FF4 80B2B1F4 10000025 */ beq $zero, $zero, .L80B2B28C +/* 00FF4 80B2B1F4 10000025 */ beq $zero, $zero, .L80B2B28C /* 00FF8 80B2B1F8 A20A01E5 */ sb $t2, 0x01E5($s0) ## 000001E5 .L80B2B1FC: /* 00FFC 80B2B1FC 8CCB1D90 */ lw $t3, 0x1D90($a2) ## 00001D90 @@ -753,45 +753,45 @@ glabel L80B2AD44 /* 01004 80B2B204 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 01008 80B2B208 956C0000 */ lhu $t4, 0x0000($t3) ## 00000000 /* 0100C 80B2B20C 24A53284 */ addiu $a1, $a1, 0x3284 ## $a1 = 06003284 -/* 01010 80B2B210 8FA40040 */ lw $a0, 0x0040($sp) -/* 01014 80B2B214 5581001E */ bnel $t4, $at, .L80B2B290 -/* 01018 80B2B218 8FBF003C */ lw $ra, 0x003C($sp) -/* 0101C 80B2B21C 0C029490 */ jal func_800A5240 +/* 01010 80B2B210 8FA40040 */ lw $a0, 0x0040($sp) +/* 01014 80B2B214 5581001E */ bnel $t4, $at, .L80B2B290 +/* 01018 80B2B218 8FBF003C */ lw $ra, 0x003C($sp) +/* 0101C 80B2B21C 0C029490 */ jal SkelAnime_ChangeAnimTransitionStop /* 01020 80B2B220 3C06C120 */ lui $a2, 0xC120 ## $a2 = C1200000 /* 01024 80B2B224 920D01E5 */ lbu $t5, 0x01E5($s0) ## 000001E5 /* 01028 80B2B228 25AE0001 */ addiu $t6, $t5, 0x0001 ## $t6 = 00000001 -/* 0102C 80B2B22C 10000017 */ beq $zero, $zero, .L80B2B28C +/* 0102C 80B2B22C 10000017 */ beq $zero, $zero, .L80B2B28C /* 01030 80B2B230 A20E01E5 */ sb $t6, 0x01E5($s0) ## 000001E5 .L80B2B234: -/* 01034 80B2B234 10400015 */ beq $v0, $zero, .L80B2B28C -/* 01038 80B2B238 8FA40040 */ lw $a0, 0x0040($sp) +/* 01034 80B2B234 10400015 */ beq $v0, $zero, .L80B2B28C +/* 01038 80B2B238 8FA40040 */ lw $a0, 0x0040($sp) /* 0103C 80B2B23C 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 01040 80B2B240 24A53D84 */ addiu $a1, $a1, 0x3D84 ## $a1 = 06003D84 -/* 01044 80B2B244 0C0294D3 */ jal func_800A534C +/* 01044 80B2B244 0C0294D3 */ jal SkelAnime_ChangeAnimTransitionRepeat /* 01048 80B2B248 3C06C0A0 */ lui $a2, 0xC0A0 ## $a2 = C0A00000 /* 0104C 80B2B24C 920F01E5 */ lbu $t7, 0x01E5($s0) ## 000001E5 /* 01050 80B2B250 25F80001 */ addiu $t8, $t7, 0x0001 ## $t8 = 00000001 -/* 01054 80B2B254 1000000D */ beq $zero, $zero, .L80B2B28C +/* 01054 80B2B254 1000000D */ beq $zero, $zero, .L80B2B28C /* 01058 80B2B258 A21801E5 */ sb $t8, 0x01E5($s0) ## 000001E5 /* 0105C 80B2B25C 8CD91D90 */ lw $t9, 0x1D90($a2) ## 00001D90 .L80B2B260: /* 01060 80B2B260 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 01064 80B2B264 24A53428 */ addiu $a1, $a1, 0x3428 ## $a1 = 06003428 /* 01068 80B2B268 972A0000 */ lhu $t2, 0x0000($t9) ## 00000000 -/* 0106C 80B2B26C 8FA40040 */ lw $a0, 0x0040($sp) -/* 01070 80B2B270 552A0007 */ bnel $t1, $t2, .L80B2B290 -/* 01074 80B2B274 8FBF003C */ lw $ra, 0x003C($sp) -/* 01078 80B2B278 0C029490 */ jal func_800A5240 +/* 0106C 80B2B26C 8FA40040 */ lw $a0, 0x0040($sp) +/* 01070 80B2B270 552A0007 */ bnel $t1, $t2, .L80B2B290 +/* 01074 80B2B274 8FBF003C */ lw $ra, 0x003C($sp) +/* 01078 80B2B278 0C029490 */ jal SkelAnime_ChangeAnimTransitionStop /* 0107C 80B2B27C 3C06C0A0 */ lui $a2, 0xC0A0 ## $a2 = C0A00000 /* 01080 80B2B280 920B01E5 */ lbu $t3, 0x01E5($s0) ## 000001E5 /* 01084 80B2B284 256C0001 */ addiu $t4, $t3, 0x0001 ## $t4 = 00000001 /* 01088 80B2B288 A20C01E5 */ sb $t4, 0x01E5($s0) ## 000001E5 .L80B2B28C: -/* 0108C 80B2B28C 8FBF003C */ lw $ra, 0x003C($sp) +/* 0108C 80B2B28C 8FBF003C */ lw $ra, 0x003C($sp) .L80B2B290: -/* 01090 80B2B290 8FB00038 */ lw $s0, 0x0038($sp) +/* 01090 80B2B290 8FB00038 */ lw $s0, 0x0038($sp) /* 01094 80B2B294 27BD0058 */ addiu $sp, $sp, 0x0058 ## $sp = 00000000 -/* 01098 80B2B298 03E00008 */ jr $ra +/* 01098 80B2B298 03E00008 */ jr $ra /* 0109C 80B2B29C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Viewer/func_80B2B364.s b/asm/non_matchings/overlays/actors/ovl_En_Viewer/func_80B2B364.s index 4655a1380c..a023396907 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Viewer/func_80B2B364.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Viewer/func_80B2B364.s @@ -12,7 +12,7 @@ glabel func_80B2B364 /* 0118C 80B2B38C 24C6D044 */ addiu $a2, $a2, %lo(D_80B2D044) ## $a2 = 80B2D044 /* 01190 80B2B390 27A4002C */ addiu $a0, $sp, 0x002C ## $a0 = FFFFFFEC /* 01194 80B2B394 24070555 */ addiu $a3, $zero, 0x0555 ## $a3 = 00000555 -/* 01198 80B2B398 0C031AB1 */ jal func_800C6AC4 +/* 01198 80B2B398 0C031AB1 */ jal Graph_OpenDisps /* 0119C 80B2B39C 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 /* 011A0 80B2B3A0 8FAF0040 */ lw $t7, 0x0040($sp) /* 011A4 80B2B3A4 0C024F61 */ jal func_80093D84 @@ -57,7 +57,7 @@ glabel func_80B2B364 /* 01240 80B2B440 24C6D06C */ addiu $a2, $a2, %lo(D_80B2D06C) ## $a2 = 80B2D06C /* 01244 80B2B444 27A4002C */ addiu $a0, $sp, 0x002C ## $a0 = FFFFFFEC /* 01248 80B2B448 2407055C */ addiu $a3, $zero, 0x055C ## $a3 = 0000055C -/* 0124C 80B2B44C 0C031AD5 */ jal func_800C6B54 +/* 0124C 80B2B44C 0C031AD5 */ jal Graph_CloseDisps /* 01250 80B2B450 8D050000 */ lw $a1, 0x0000($t0) ## 00000000 .L80B2B454: /* 01254 80B2B454 8FBF001C */ lw $ra, 0x001C($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Viewer/func_80B2B4A8.s b/asm/non_matchings/overlays/actors/ovl_En_Viewer/func_80B2B4A8.s index b2ee7e8f25..0e596d918b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Viewer/func_80B2B4A8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Viewer/func_80B2B4A8.s @@ -1,65 +1,65 @@ glabel func_80B2B4A8 /* 012A8 80B2B4A8 27BDFF88 */ addiu $sp, $sp, 0xFF88 ## $sp = FFFFFF88 -/* 012AC 80B2B4AC AFBF002C */ sw $ra, 0x002C($sp) -/* 012B0 80B2B4B0 AFB00028 */ sw $s0, 0x0028($sp) -/* 012B4 80B2B4B4 AFA5007C */ sw $a1, 0x007C($sp) +/* 012AC 80B2B4AC AFBF002C */ sw $ra, 0x002C($sp) +/* 012B0 80B2B4B0 AFB00028 */ sw $s0, 0x0028($sp) +/* 012B4 80B2B4B4 AFA5007C */ sw $a1, 0x007C($sp) /* 012B8 80B2B4B8 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 /* 012BC 80B2B4BC 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 012C0 80B2B4C0 3C0680B3 */ lui $a2, %hi(D_80B2D080) ## $a2 = 80B30000 /* 012C4 80B2B4C4 24C6D080 */ addiu $a2, $a2, %lo(D_80B2D080) ## $a2 = 80B2D080 /* 012C8 80B2B4C8 27A40060 */ addiu $a0, $sp, 0x0060 ## $a0 = FFFFFFE8 -/* 012CC 80B2B4CC A7A00076 */ sh $zero, 0x0076($sp) +/* 012CC 80B2B4CC A7A00076 */ sh $zero, 0x0076($sp) /* 012D0 80B2B4D0 2407057D */ addiu $a3, $zero, 0x057D ## $a3 = 0000057D -/* 012D4 80B2B4D4 0C031AB1 */ jal func_800C6AC4 -/* 012D8 80B2B4D8 AFA50070 */ sw $a1, 0x0070($sp) +/* 012D4 80B2B4D4 0C031AB1 */ jal Graph_OpenDisps +/* 012D8 80B2B4D8 AFA50070 */ sw $a1, 0x0070($sp) /* 012DC 80B2B4DC 8607001C */ lh $a3, 0x001C($s0) ## 0000001C /* 012E0 80B2B4E0 240A0003 */ addiu $t2, $zero, 0x0003 ## $t2 = 00000003 -/* 012E4 80B2B4E4 87A30076 */ lh $v1, 0x0076($sp) -/* 012E8 80B2B4E8 00073A03 */ sra $a3, $a3, 8 -/* 012EC 80B2B4EC 00073C00 */ sll $a3, $a3, 16 -/* 012F0 80B2B4F0 00073C03 */ sra $a3, $a3, 16 -/* 012F4 80B2B4F4 10EA0007 */ beq $a3, $t2, .L80B2B514 -/* 012F8 80B2B4F8 8FA80070 */ lw $t0, 0x0070($sp) +/* 012E4 80B2B4E4 87A30076 */ lh $v1, 0x0076($sp) +/* 012E8 80B2B4E8 00073A03 */ sra $a3, $a3, 8 +/* 012EC 80B2B4EC 00073C00 */ sll $a3, $a3, 16 +/* 012F0 80B2B4F0 00073C03 */ sra $a3, $a3, 16 +/* 012F4 80B2B4F4 10EA0007 */ beq $a3, $t2, .L80B2B514 +/* 012F8 80B2B4F8 8FA80070 */ lw $t0, 0x0070($sp) /* 012FC 80B2B4FC 24010005 */ addiu $at, $zero, 0x0005 ## $at = 00000005 -/* 01300 80B2B500 10E10004 */ beq $a3, $at, .L80B2B514 +/* 01300 80B2B500 10E10004 */ beq $a3, $at, .L80B2B514 /* 01304 80B2B504 24010007 */ addiu $at, $zero, 0x0007 ## $at = 00000007 -/* 01308 80B2B508 10E10002 */ beq $a3, $at, .L80B2B514 +/* 01308 80B2B508 10E10002 */ beq $a3, $at, .L80B2B514 /* 0130C 80B2B50C 24010008 */ addiu $at, $zero, 0x0008 ## $at = 00000008 -/* 01310 80B2B510 14E10094 */ bne $a3, $at, .L80B2B764 +/* 01310 80B2B510 14E10094 */ bne $a3, $at, .L80B2B764 .L80B2B514: /* 01314 80B2B514 3C0F8016 */ lui $t7, 0x8016 ## $t7 = 80160000 /* 01318 80B2B518 8DEFF9C0 */ lw $t7, -0x0640($t7) ## 8015F9C0 /* 0131C 80B2B51C 24010004 */ addiu $at, $zero, 0x0004 ## $at = 00000004 -/* 01320 80B2B520 8FB8007C */ lw $t8, 0x007C($sp) -/* 01324 80B2B524 11E10002 */ beq $t7, $at, .L80B2B530 +/* 01320 80B2B520 8FB8007C */ lw $t8, 0x007C($sp) +/* 01324 80B2B524 11E10002 */ beq $t7, $at, .L80B2B530 /* 01328 80B2B528 3C098000 */ lui $t1, 0x8000 ## $t1 = 80000000 /* 0132C 80B2B52C 24030095 */ addiu $v1, $zero, 0x0095 ## $v1 = 00000095 .L80B2B530: /* 01330 80B2B530 97021D74 */ lhu $v0, 0x1D74($t8) ## 00001D74 /* 01334 80B2B534 24790467 */ addiu $t9, $v1, 0x0467 ## $t9 = 000004FC /* 01338 80B2B538 3C0CDB06 */ lui $t4, 0xDB06 ## $t4 = DB060000 -/* 0133C 80B2B53C 0322082A */ slt $at, $t9, $v0 -/* 01340 80B2B540 14200020 */ bne $at, $zero, .L80B2B5C4 +/* 0133C 80B2B53C 0322082A */ slt $at, $t9, $v0 +/* 01340 80B2B540 14200020 */ bne $at, $zero, .L80B2B5C4 /* 01344 80B2B544 246B0468 */ addiu $t3, $v1, 0x0468 ## $t3 = 000004FD /* 01348 80B2B548 8D0202C0 */ lw $v0, 0x02C0($t0) ## 000002C0 /* 0134C 80B2B54C 3C040601 */ lui $a0, 0x0601 ## $a0 = 06010000 /* 01350 80B2B550 2484F178 */ addiu $a0, $a0, 0xF178 ## $a0 = 0600F178 -/* 01354 80B2B554 00046900 */ sll $t5, $a0, 4 -/* 01358 80B2B558 000D7702 */ srl $t6, $t5, 28 +/* 01354 80B2B554 00046900 */ sll $t5, $a0, 4 +/* 01358 80B2B558 000D7702 */ srl $t6, $t5, 28 /* 0135C 80B2B55C 3C188016 */ lui $t8, 0x8016 ## $t8 = 80160000 /* 01360 80B2B560 244B0008 */ addiu $t3, $v0, 0x0008 ## $t3 = 00000008 /* 01364 80B2B564 AD0B02C0 */ sw $t3, 0x02C0($t0) ## 000002C0 /* 01368 80B2B568 27186FA8 */ addiu $t8, $t8, 0x6FA8 ## $t8 = 80166FA8 -/* 0136C 80B2B56C 000E7880 */ sll $t7, $t6, 2 +/* 0136C 80B2B56C 000E7880 */ sll $t7, $t6, 2 /* 01370 80B2B570 358C0020 */ ori $t4, $t4, 0x0020 ## $t4 = DB060020 -/* 01374 80B2B574 01F82821 */ addu $a1, $t7, $t8 +/* 01374 80B2B574 01F82821 */ addu $a1, $t7, $t8 /* 01378 80B2B578 AC4C0000 */ sw $t4, 0x0000($v0) ## 00000000 /* 0137C 80B2B57C 8CB90000 */ lw $t9, 0x0000($a1) ## 00000000 /* 01380 80B2B580 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 /* 01384 80B2B584 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF -/* 01388 80B2B588 00813024 */ and $a2, $a0, $at -/* 0138C 80B2B58C 03265821 */ addu $t3, $t9, $a2 -/* 01390 80B2B590 01696021 */ addu $t4, $t3, $t1 +/* 01388 80B2B588 00813024 */ and $a2, $a0, $at +/* 0138C 80B2B58C 03265821 */ addu $t3, $t9, $a2 +/* 01390 80B2B590 01696021 */ addu $t4, $t3, $t1 /* 01394 80B2B594 AC4C0004 */ sw $t4, 0x0004($v0) ## 00000004 /* 01398 80B2B598 8D0202C0 */ lw $v0, 0x02C0($t0) ## 000002C0 /* 0139C 80B2B59C 3C0EDB06 */ lui $t6, 0xDB06 ## $t6 = DB060000 @@ -68,35 +68,35 @@ glabel func_80B2B4A8 /* 013A8 80B2B5A8 AD0D02C0 */ sw $t5, 0x02C0($t0) ## 000002C0 /* 013AC 80B2B5AC AC4E0000 */ sw $t6, 0x0000($v0) ## 00000000 /* 013B0 80B2B5B0 8CAF0000 */ lw $t7, 0x0000($a1) ## 00000000 -/* 013B4 80B2B5B4 01E6C021 */ addu $t8, $t7, $a2 -/* 013B8 80B2B5B8 0309C821 */ addu $t9, $t8, $t1 -/* 013BC 80B2B5BC 10000080 */ beq $zero, $zero, .L80B2B7C0 +/* 013B4 80B2B5B4 01E6C021 */ addu $t8, $t7, $a2 +/* 013B8 80B2B5B8 0309C821 */ addu $t9, $t8, $t1 +/* 013BC 80B2B5BC 10000080 */ beq $zero, $zero, .L80B2B7C0 /* 013C0 80B2B5C0 AC590004 */ sw $t9, 0x0004($v0) ## 00000004 .L80B2B5C4: -/* 013C4 80B2B5C4 0162082A */ slt $at, $t3, $v0 -/* 013C8 80B2B5C8 14200022 */ bne $at, $zero, .L80B2B654 +/* 013C4 80B2B5C4 0162082A */ slt $at, $t3, $v0 +/* 013C8 80B2B5C8 14200022 */ bne $at, $zero, .L80B2B654 /* 013CC 80B2B5CC 246C0469 */ addiu $t4, $v1, 0x0469 ## $t4 = 000004FE /* 013D0 80B2B5D0 8D0202C0 */ lw $v0, 0x02C0($t0) ## 000002C0 /* 013D4 80B2B5D4 3C040601 */ lui $a0, 0x0601 ## $a0 = 06010000 /* 013D8 80B2B5D8 2484F378 */ addiu $a0, $a0, 0xF378 ## $a0 = 0600F378 -/* 013DC 80B2B5DC 00047100 */ sll $t6, $a0, 4 -/* 013E0 80B2B5E0 000E7F02 */ srl $t7, $t6, 28 +/* 013DC 80B2B5DC 00047100 */ sll $t6, $a0, 4 +/* 013E0 80B2B5E0 000E7F02 */ srl $t7, $t6, 28 /* 013E4 80B2B5E4 3C0DDB06 */ lui $t5, 0xDB06 ## $t5 = DB060000 /* 013E8 80B2B5E8 3C198016 */ lui $t9, 0x8016 ## $t9 = 80160000 /* 013EC 80B2B5EC 244C0008 */ addiu $t4, $v0, 0x0008 ## $t4 = 00000008 /* 013F0 80B2B5F0 AD0C02C0 */ sw $t4, 0x02C0($t0) ## 000002C0 /* 013F4 80B2B5F4 27396FA8 */ addiu $t9, $t9, 0x6FA8 ## $t9 = 80166FA8 /* 013F8 80B2B5F8 35AD0020 */ ori $t5, $t5, 0x0020 ## $t5 = DB060020 -/* 013FC 80B2B5FC 000FC080 */ sll $t8, $t7, 2 -/* 01400 80B2B600 03192821 */ addu $a1, $t8, $t9 +/* 013FC 80B2B5FC 000FC080 */ sll $t8, $t7, 2 +/* 01400 80B2B600 03192821 */ addu $a1, $t8, $t9 /* 01404 80B2B604 AC4D0000 */ sw $t5, 0x0000($v0) ## 00000000 /* 01408 80B2B608 8CAB0000 */ lw $t3, 0x0000($a1) ## 00000000 /* 0140C 80B2B60C 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 /* 01410 80B2B610 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF -/* 01414 80B2B614 00813024 */ and $a2, $a0, $at +/* 01414 80B2B614 00813024 */ and $a2, $a0, $at /* 01418 80B2B618 3C098000 */ lui $t1, 0x8000 ## $t1 = 80000000 -/* 0141C 80B2B61C 01666021 */ addu $t4, $t3, $a2 -/* 01420 80B2B620 01896821 */ addu $t5, $t4, $t1 +/* 0141C 80B2B61C 01666021 */ addu $t4, $t3, $a2 +/* 01420 80B2B620 01896821 */ addu $t5, $t4, $t1 /* 01424 80B2B624 AC4D0004 */ sw $t5, 0x0004($v0) ## 00000004 /* 01428 80B2B628 8D0202C0 */ lw $v0, 0x02C0($t0) ## 000002C0 /* 0142C 80B2B62C 3C0FDB06 */ lui $t7, 0xDB06 ## $t7 = DB060000 @@ -105,35 +105,35 @@ glabel func_80B2B4A8 /* 01438 80B2B638 AD0E02C0 */ sw $t6, 0x02C0($t0) ## 000002C0 /* 0143C 80B2B63C AC4F0000 */ sw $t7, 0x0000($v0) ## 00000000 /* 01440 80B2B640 8CB80000 */ lw $t8, 0x0000($a1) ## 00000000 -/* 01444 80B2B644 0306C821 */ addu $t9, $t8, $a2 -/* 01448 80B2B648 03295821 */ addu $t3, $t9, $t1 -/* 0144C 80B2B64C 1000005C */ beq $zero, $zero, .L80B2B7C0 +/* 01444 80B2B644 0306C821 */ addu $t9, $t8, $a2 +/* 01448 80B2B648 03295821 */ addu $t3, $t9, $t1 +/* 0144C 80B2B64C 1000005C */ beq $zero, $zero, .L80B2B7C0 /* 01450 80B2B650 AC4B0004 */ sw $t3, 0x0004($v0) ## 00000004 .L80B2B654: -/* 01454 80B2B654 0182082A */ slt $at, $t4, $v0 -/* 01458 80B2B658 14200022 */ bne $at, $zero, .L80B2B6E4 +/* 01454 80B2B654 0182082A */ slt $at, $t4, $v0 +/* 01458 80B2B658 14200022 */ bne $at, $zero, .L80B2B6E4 /* 0145C 80B2B65C 3C098000 */ lui $t1, 0x8000 ## $t1 = 80000000 /* 01460 80B2B660 8D0202C0 */ lw $v0, 0x02C0($t0) ## 000002C0 /* 01464 80B2B664 3C040601 */ lui $a0, 0x0601 ## $a0 = 06010000 /* 01468 80B2B668 2484F578 */ addiu $a0, $a0, 0xF578 ## $a0 = 0600F578 -/* 0146C 80B2B66C 00047900 */ sll $t7, $a0, 4 -/* 01470 80B2B670 000FC702 */ srl $t8, $t7, 28 +/* 0146C 80B2B66C 00047900 */ sll $t7, $a0, 4 +/* 01470 80B2B670 000FC702 */ srl $t8, $t7, 28 /* 01474 80B2B674 3C0EDB06 */ lui $t6, 0xDB06 ## $t6 = DB060000 /* 01478 80B2B678 3C0B8016 */ lui $t3, 0x8016 ## $t3 = 80160000 /* 0147C 80B2B67C 244D0008 */ addiu $t5, $v0, 0x0008 ## $t5 = 00000008 /* 01480 80B2B680 AD0D02C0 */ sw $t5, 0x02C0($t0) ## 000002C0 /* 01484 80B2B684 256B6FA8 */ addiu $t3, $t3, 0x6FA8 ## $t3 = 80166FA8 /* 01488 80B2B688 35CE0020 */ ori $t6, $t6, 0x0020 ## $t6 = DB060020 -/* 0148C 80B2B68C 0018C880 */ sll $t9, $t8, 2 -/* 01490 80B2B690 032B2821 */ addu $a1, $t9, $t3 +/* 0148C 80B2B68C 0018C880 */ sll $t9, $t8, 2 +/* 01490 80B2B690 032B2821 */ addu $a1, $t9, $t3 /* 01494 80B2B694 AC4E0000 */ sw $t6, 0x0000($v0) ## 00000000 /* 01498 80B2B698 8CAC0000 */ lw $t4, 0x0000($a1) ## 00000000 /* 0149C 80B2B69C 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 /* 014A0 80B2B6A0 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF -/* 014A4 80B2B6A4 00813024 */ and $a2, $a0, $at +/* 014A4 80B2B6A4 00813024 */ and $a2, $a0, $at /* 014A8 80B2B6A8 3C098000 */ lui $t1, 0x8000 ## $t1 = 80000000 -/* 014AC 80B2B6AC 01866821 */ addu $t5, $t4, $a2 -/* 014B0 80B2B6B0 01A97021 */ addu $t6, $t5, $t1 +/* 014AC 80B2B6AC 01866821 */ addu $t5, $t4, $a2 +/* 014B0 80B2B6B0 01A97021 */ addu $t6, $t5, $t1 /* 014B4 80B2B6B4 AC4E0004 */ sw $t6, 0x0004($v0) ## 00000004 /* 014B8 80B2B6B8 8D0202C0 */ lw $v0, 0x02C0($t0) ## 000002C0 /* 014BC 80B2B6BC 3C18DB06 */ lui $t8, 0xDB06 ## $t8 = DB060000 @@ -142,31 +142,31 @@ glabel func_80B2B4A8 /* 014C8 80B2B6C8 AD0F02C0 */ sw $t7, 0x02C0($t0) ## 000002C0 /* 014CC 80B2B6CC AC580000 */ sw $t8, 0x0000($v0) ## 00000000 /* 014D0 80B2B6D0 8CB90000 */ lw $t9, 0x0000($a1) ## 00000000 -/* 014D4 80B2B6D4 03265821 */ addu $t3, $t9, $a2 -/* 014D8 80B2B6D8 01696021 */ addu $t4, $t3, $t1 -/* 014DC 80B2B6DC 10000038 */ beq $zero, $zero, .L80B2B7C0 +/* 014D4 80B2B6D4 03265821 */ addu $t3, $t9, $a2 +/* 014D8 80B2B6D8 01696021 */ addu $t4, $t3, $t1 +/* 014DC 80B2B6DC 10000038 */ beq $zero, $zero, .L80B2B7C0 /* 014E0 80B2B6E0 AC4C0004 */ sw $t4, 0x0004($v0) ## 00000004 .L80B2B6E4: /* 014E4 80B2B6E4 8D0202C0 */ lw $v0, 0x02C0($t0) ## 000002C0 /* 014E8 80B2B6E8 3C040601 */ lui $a0, 0x0601 ## $a0 = 06010000 /* 014EC 80B2B6EC 2484F778 */ addiu $a0, $a0, 0xF778 ## $a0 = 0600F778 -/* 014F0 80B2B6F0 00047900 */ sll $t7, $a0, 4 -/* 014F4 80B2B6F4 000FC702 */ srl $t8, $t7, 28 +/* 014F0 80B2B6F0 00047900 */ sll $t7, $a0, 4 +/* 014F4 80B2B6F4 000FC702 */ srl $t8, $t7, 28 /* 014F8 80B2B6F8 3C0EDB06 */ lui $t6, 0xDB06 ## $t6 = DB060000 /* 014FC 80B2B6FC 3C0B8016 */ lui $t3, 0x8016 ## $t3 = 80160000 /* 01500 80B2B700 244D0008 */ addiu $t5, $v0, 0x0008 ## $t5 = 00000008 /* 01504 80B2B704 AD0D02C0 */ sw $t5, 0x02C0($t0) ## 000002C0 /* 01508 80B2B708 256B6FA8 */ addiu $t3, $t3, 0x6FA8 ## $t3 = 80166FA8 /* 0150C 80B2B70C 35CE0020 */ ori $t6, $t6, 0x0020 ## $t6 = DB060020 -/* 01510 80B2B710 0018C880 */ sll $t9, $t8, 2 -/* 01514 80B2B714 032B2821 */ addu $a1, $t9, $t3 +/* 01510 80B2B710 0018C880 */ sll $t9, $t8, 2 +/* 01514 80B2B714 032B2821 */ addu $a1, $t9, $t3 /* 01518 80B2B718 AC4E0000 */ sw $t6, 0x0000($v0) ## 00000000 /* 0151C 80B2B71C 8CAC0000 */ lw $t4, 0x0000($a1) ## 00000000 /* 01520 80B2B720 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 /* 01524 80B2B724 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF -/* 01528 80B2B728 00813024 */ and $a2, $a0, $at -/* 0152C 80B2B72C 01866821 */ addu $t5, $t4, $a2 -/* 01530 80B2B730 01A97021 */ addu $t6, $t5, $t1 +/* 01528 80B2B728 00813024 */ and $a2, $a0, $at +/* 0152C 80B2B72C 01866821 */ addu $t5, $t4, $a2 +/* 01530 80B2B730 01A97021 */ addu $t6, $t5, $t1 /* 01534 80B2B734 AC4E0004 */ sw $t6, 0x0004($v0) ## 00000004 /* 01538 80B2B738 8D0202C0 */ lw $v0, 0x02C0($t0) ## 000002C0 /* 0153C 80B2B73C 3C18DB06 */ lui $t8, 0xDB06 ## $t8 = DB060000 @@ -175,52 +175,52 @@ glabel func_80B2B4A8 /* 01548 80B2B748 AD0F02C0 */ sw $t7, 0x02C0($t0) ## 000002C0 /* 0154C 80B2B74C AC580000 */ sw $t8, 0x0000($v0) ## 00000000 /* 01550 80B2B750 8CB90000 */ lw $t9, 0x0000($a1) ## 00000000 -/* 01554 80B2B754 03265821 */ addu $t3, $t9, $a2 -/* 01558 80B2B758 01696021 */ addu $t4, $t3, $t1 -/* 0155C 80B2B75C 10000018 */ beq $zero, $zero, .L80B2B7C0 +/* 01554 80B2B754 03265821 */ addu $t3, $t9, $a2 +/* 01558 80B2B758 01696021 */ addu $t4, $t3, $t1 +/* 0155C 80B2B75C 10000018 */ beq $zero, $zero, .L80B2B7C0 /* 01560 80B2B760 AC4C0004 */ sw $t4, 0x0004($v0) ## 00000004 .L80B2B764: /* 01564 80B2B764 24010009 */ addiu $at, $zero, 0x0009 ## $at = 00000009 -/* 01568 80B2B768 14E10015 */ bne $a3, $at, .L80B2B7C0 +/* 01568 80B2B768 14E10015 */ bne $a3, $at, .L80B2B7C0 /* 0156C 80B2B76C 3C098000 */ lui $t1, 0x8000 ## $t1 = 80000000 /* 01570 80B2B770 8D0302D0 */ lw $v1, 0x02D0($t0) ## 000002D0 /* 01574 80B2B774 3C040601 */ lui $a0, 0x0601 ## $a0 = 06010000 /* 01578 80B2B778 2484A4E0 */ addiu $a0, $a0, 0xA4E0 ## $a0 = 0600A4E0 -/* 0157C 80B2B77C 00047900 */ sll $t7, $a0, 4 -/* 01580 80B2B780 000FC702 */ srl $t8, $t7, 28 +/* 0157C 80B2B77C 00047900 */ sll $t7, $a0, 4 +/* 01580 80B2B780 000FC702 */ srl $t8, $t7, 28 /* 01584 80B2B784 3C0EDB06 */ lui $t6, 0xDB06 ## $t6 = DB060000 /* 01588 80B2B788 246D0008 */ addiu $t5, $v1, 0x0008 ## $t5 = 0000009D /* 0158C 80B2B78C AD0D02D0 */ sw $t5, 0x02D0($t0) ## 000002D0 /* 01590 80B2B790 35CE0020 */ ori $t6, $t6, 0x0020 ## $t6 = DB060020 -/* 01594 80B2B794 0018C880 */ sll $t9, $t8, 2 +/* 01594 80B2B794 0018C880 */ sll $t9, $t8, 2 /* 01598 80B2B798 3C0B8016 */ lui $t3, 0x8016 ## $t3 = 80160000 -/* 0159C 80B2B79C 01795821 */ addu $t3, $t3, $t9 +/* 0159C 80B2B79C 01795821 */ addu $t3, $t3, $t9 /* 015A0 80B2B7A0 AC6E0000 */ sw $t6, 0x0000($v1) ## 00000095 /* 015A4 80B2B7A4 8D6B6FA8 */ lw $t3, 0x6FA8($t3) ## 80166FA8 /* 015A8 80B2B7A8 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 /* 015AC 80B2B7AC 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF -/* 015B0 80B2B7B0 00816024 */ and $t4, $a0, $at -/* 015B4 80B2B7B4 016C6821 */ addu $t5, $t3, $t4 -/* 015B8 80B2B7B8 01A97021 */ addu $t6, $t5, $t1 +/* 015B0 80B2B7B0 00816024 */ and $t4, $a0, $at +/* 015B4 80B2B7B4 016C6821 */ addu $t5, $t3, $t4 +/* 015B8 80B2B7B8 01A97021 */ addu $t6, $t5, $t1 /* 015BC 80B2B7BC AC6E0004 */ sw $t6, 0x0004($v1) ## 00000099 .L80B2B7C0: /* 015C0 80B2B7C0 24010009 */ addiu $at, $zero, 0x0009 ## $at = 00000009 -/* 015C4 80B2B7C4 14E1000C */ bne $a3, $at, .L80B2B7F8 -/* 015C8 80B2B7C8 8FA4007C */ lw $a0, 0x007C($sp) +/* 015C4 80B2B7C4 14E1000C */ bne $a3, $at, .L80B2B7F8 +/* 015C8 80B2B7C8 8FA4007C */ lw $a0, 0x007C($sp) /* 015CC 80B2B7CC 8E05019C */ lw $a1, 0x019C($s0) ## 0000019C /* 015D0 80B2B7D0 8E0601B8 */ lw $a2, 0x01B8($s0) ## 000001B8 /* 015D4 80B2B7D4 9207019A */ lbu $a3, 0x019A($s0) ## 0000019A /* 015D8 80B2B7D8 3C0F80B3 */ lui $t7, %hi(func_80B2B364) ## $t7 = 80B30000 /* 015DC 80B2B7DC 25EFB364 */ addiu $t7, $t7, %lo(func_80B2B364) ## $t7 = 80B2B364 -/* 015E0 80B2B7E0 AFAF0014 */ sw $t7, 0x0014($sp) -/* 015E4 80B2B7E4 AFB00018 */ sw $s0, 0x0018($sp) -/* 015E8 80B2B7E8 0C0286B2 */ jal func_800A1AC8 -/* 015EC 80B2B7EC AFA00010 */ sw $zero, 0x0010($sp) -/* 015F0 80B2B7F0 10000037 */ beq $zero, $zero, .L80B2B8D0 -/* 015F4 80B2B7F4 8FAF007C */ lw $t7, 0x007C($sp) +/* 015E0 80B2B7E0 AFAF0014 */ sw $t7, 0x0014($sp) +/* 015E4 80B2B7E4 AFB00018 */ sw $s0, 0x0018($sp) +/* 015E8 80B2B7E8 0C0286B2 */ jal SkelAnime_DrawSV +/* 015EC 80B2B7EC AFA00010 */ sw $zero, 0x0010($sp) +/* 015F0 80B2B7F0 10000037 */ beq $zero, $zero, .L80B2B8D0 +/* 015F4 80B2B7F4 8FAF007C */ lw $t7, 0x007C($sp) .L80B2B7F8: -/* 015F8 80B2B7F8 14EA0011 */ bne $a3, $t2, .L80B2B840 -/* 015FC 80B2B7FC 8FA4007C */ lw $a0, 0x007C($sp) +/* 015F8 80B2B7F8 14EA0011 */ bne $a3, $t2, .L80B2B840 +/* 015FC 80B2B7FC 8FA4007C */ lw $a0, 0x007C($sp) /* 01600 80B2B800 8E05019C */ lw $a1, 0x019C($s0) ## 0000019C /* 01604 80B2B804 8E0601B8 */ lw $a2, 0x01B8($s0) ## 000001B8 /* 01608 80B2B808 9207019A */ lbu $a3, 0x019A($s0) ## 0000019A @@ -228,67 +228,67 @@ glabel func_80B2B4A8 /* 01610 80B2B810 3C1980B3 */ lui $t9, %hi(func_80B2B468) ## $t9 = 80B30000 /* 01614 80B2B814 2739B468 */ addiu $t9, $t9, %lo(func_80B2B468) ## $t9 = 80B2B468 /* 01618 80B2B818 2718B2F4 */ addiu $t8, $t8, %lo(func_80B2B2F4) ## $t8 = 80B2B2F4 -/* 0161C 80B2B81C AFB80010 */ sw $t8, 0x0010($sp) -/* 01620 80B2B820 AFB90014 */ sw $t9, 0x0014($sp) -/* 01624 80B2B824 0C0286B2 */ jal func_800A1AC8 -/* 01628 80B2B828 AFB00018 */ sw $s0, 0x0018($sp) -/* 0162C 80B2B82C 8FA4007C */ lw $a0, 0x007C($sp) -/* 01630 80B2B830 0C2CB307 */ jal func_80B2CC1C +/* 0161C 80B2B81C AFB80010 */ sw $t8, 0x0010($sp) +/* 01620 80B2B820 AFB90014 */ sw $t9, 0x0014($sp) +/* 01624 80B2B824 0C0286B2 */ jal SkelAnime_DrawSV +/* 01628 80B2B828 AFB00018 */ sw $s0, 0x0018($sp) +/* 0162C 80B2B82C 8FA4007C */ lw $a0, 0x007C($sp) +/* 01630 80B2B830 0C2CB307 */ jal func_80B2CC1C /* 01634 80B2B834 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 01638 80B2B838 10000025 */ beq $zero, $zero, .L80B2B8D0 -/* 0163C 80B2B83C 8FAF007C */ lw $t7, 0x007C($sp) +/* 01638 80B2B838 10000025 */ beq $zero, $zero, .L80B2B8D0 +/* 0163C 80B2B83C 8FAF007C */ lw $t7, 0x007C($sp) .L80B2B840: -/* 01640 80B2B840 10EA0007 */ beq $a3, $t2, .L80B2B860 +/* 01640 80B2B840 10EA0007 */ beq $a3, $t2, .L80B2B860 /* 01644 80B2B844 24010005 */ addiu $at, $zero, 0x0005 ## $at = 00000005 -/* 01648 80B2B848 10E10005 */ beq $a3, $at, .L80B2B860 +/* 01648 80B2B848 10E10005 */ beq $a3, $at, .L80B2B860 /* 0164C 80B2B84C 24010007 */ addiu $at, $zero, 0x0007 ## $at = 00000007 -/* 01650 80B2B850 10E10003 */ beq $a3, $at, .L80B2B860 +/* 01650 80B2B850 10E10003 */ beq $a3, $at, .L80B2B860 /* 01654 80B2B854 24010008 */ addiu $at, $zero, 0x0008 ## $at = 00000008 -/* 01658 80B2B858 14E10016 */ bne $a3, $at, .L80B2B8B4 -/* 0165C 80B2B85C 8FA4007C */ lw $a0, 0x007C($sp) +/* 01658 80B2B858 14E10016 */ bne $a3, $at, .L80B2B8B4 +/* 0165C 80B2B85C 8FA4007C */ lw $a0, 0x007C($sp) .L80B2B860: -/* 01660 80B2B860 8FAB007C */ lw $t3, 0x007C($sp) +/* 01660 80B2B860 8FAB007C */ lw $t3, 0x007C($sp) /* 01664 80B2B864 916C1D6C */ lbu $t4, 0x1D6C($t3) ## 00001D6C -/* 01668 80B2B868 51800019 */ beql $t4, $zero, .L80B2B8D0 -/* 0166C 80B2B86C 8FAF007C */ lw $t7, 0x007C($sp) +/* 01668 80B2B868 51800019 */ beql $t4, $zero, .L80B2B8D0 +/* 0166C 80B2B86C 8FAF007C */ lw $t7, 0x007C($sp) /* 01670 80B2B870 8D6D1D90 */ lw $t5, 0x1D90($t3) ## 00001D90 /* 01674 80B2B874 3C0E80B3 */ lui $t6, %hi(func_80B2B468) ## $t6 = 80B30000 /* 01678 80B2B878 25CEB468 */ addiu $t6, $t6, %lo(func_80B2B468) ## $t6 = 80B2B468 -/* 0167C 80B2B87C 11A00013 */ beq $t5, $zero, .L80B2B8CC +/* 0167C 80B2B87C 11A00013 */ beq $t5, $zero, .L80B2B8CC /* 01680 80B2B880 01602025 */ or $a0, $t3, $zero ## $a0 = 00000000 /* 01684 80B2B884 8E05019C */ lw $a1, 0x019C($s0) ## 0000019C /* 01688 80B2B888 8E0601B8 */ lw $a2, 0x01B8($s0) ## 000001B8 /* 0168C 80B2B88C 9207019A */ lbu $a3, 0x019A($s0) ## 0000019A -/* 01690 80B2B890 AFB00018 */ sw $s0, 0x0018($sp) -/* 01694 80B2B894 AFAE0014 */ sw $t6, 0x0014($sp) -/* 01698 80B2B898 0C0286B2 */ jal func_800A1AC8 -/* 0169C 80B2B89C AFA00010 */ sw $zero, 0x0010($sp) -/* 016A0 80B2B8A0 8FA4007C */ lw $a0, 0x007C($sp) -/* 016A4 80B2B8A4 0C2CB307 */ jal func_80B2CC1C +/* 01690 80B2B890 AFB00018 */ sw $s0, 0x0018($sp) +/* 01694 80B2B894 AFAE0014 */ sw $t6, 0x0014($sp) +/* 01698 80B2B898 0C0286B2 */ jal SkelAnime_DrawSV +/* 0169C 80B2B89C AFA00010 */ sw $zero, 0x0010($sp) +/* 016A0 80B2B8A0 8FA4007C */ lw $a0, 0x007C($sp) +/* 016A4 80B2B8A4 0C2CB307 */ jal func_80B2CC1C /* 016A8 80B2B8A8 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 016AC 80B2B8AC 10000008 */ beq $zero, $zero, .L80B2B8D0 -/* 016B0 80B2B8B0 8FAF007C */ lw $t7, 0x007C($sp) +/* 016AC 80B2B8AC 10000008 */ beq $zero, $zero, .L80B2B8D0 +/* 016B0 80B2B8B0 8FAF007C */ lw $t7, 0x007C($sp) .L80B2B8B4: /* 016B4 80B2B8B4 8E05019C */ lw $a1, 0x019C($s0) ## 0000019C /* 016B8 80B2B8B8 8E0601B8 */ lw $a2, 0x01B8($s0) ## 000001B8 -/* 016BC 80B2B8BC AFB00014 */ sw $s0, 0x0014($sp) -/* 016C0 80B2B8C0 AFA00010 */ sw $zero, 0x0010($sp) +/* 016BC 80B2B8BC AFB00014 */ sw $s0, 0x0014($sp) +/* 016C0 80B2B8C0 AFA00010 */ sw $zero, 0x0010($sp) /* 016C4 80B2B8C4 0C028572 */ jal SkelAnime_Draw - + /* 016C8 80B2B8C8 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 .L80B2B8CC: -/* 016CC 80B2B8CC 8FAF007C */ lw $t7, 0x007C($sp) +/* 016CC 80B2B8CC 8FAF007C */ lw $t7, 0x007C($sp) .L80B2B8D0: /* 016D0 80B2B8D0 3C0680B3 */ lui $a2, %hi(D_80B2D094) ## $a2 = 80B30000 /* 016D4 80B2B8D4 24C6D094 */ addiu $a2, $a2, %lo(D_80B2D094) ## $a2 = 80B2D094 /* 016D8 80B2B8D8 27A40060 */ addiu $a0, $sp, 0x0060 ## $a0 = FFFFFFE8 /* 016DC 80B2B8DC 240705E7 */ addiu $a3, $zero, 0x05E7 ## $a3 = 000005E7 -/* 016E0 80B2B8E0 0C031AD5 */ jal func_800C6B54 +/* 016E0 80B2B8E0 0C031AD5 */ jal Graph_CloseDisps /* 016E4 80B2B8E4 8DE50000 */ lw $a1, 0x0000($t7) ## 00000000 -/* 016E8 80B2B8E8 8FBF002C */ lw $ra, 0x002C($sp) -/* 016EC 80B2B8EC 8FB00028 */ lw $s0, 0x0028($sp) +/* 016E8 80B2B8E8 8FBF002C */ lw $ra, 0x002C($sp) +/* 016EC 80B2B8EC 8FB00028 */ lw $s0, 0x0028($sp) /* 016F0 80B2B8F0 27BD0078 */ addiu $sp, $sp, 0x0078 ## $sp = 00000000 -/* 016F4 80B2B8F4 03E00008 */ jr $ra +/* 016F4 80B2B8F4 03E00008 */ jr $ra /* 016F8 80B2B8F8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Viewer/func_80B2B9A4.s b/asm/non_matchings/overlays/actors/ovl_En_Viewer/func_80B2B9A4.s index bd2bd95282..b1f098c8e2 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Viewer/func_80B2B9A4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Viewer/func_80B2B9A4.s @@ -14,7 +14,7 @@ glabel func_80B2B9A4 /* 017D4 80B2B9D4 27A40020 */ addiu $a0, $sp, 0x0020 ## $a0 = FFFFFFE8 /* 017D8 80B2B9D8 24C6D0A8 */ addiu $a2, $a2, %lo(D_80B2D0A8) ## $a2 = 80B2D0A8 /* 017DC 80B2B9DC 24070620 */ addiu $a3, $zero, 0x0620 ## $a3 = 00000620 -/* 017E0 80B2B9E0 0C031AB1 */ jal func_800C6AC4 +/* 017E0 80B2B9E0 0C031AB1 */ jal Graph_OpenDisps /* 017E4 80B2B9E4 AFA50030 */ sw $a1, 0x0030($sp) /* 017E8 80B2B9E8 8FA80030 */ lw $t0, 0x0030($sp) /* 017EC 80B2B9EC 3C090601 */ lui $t1, 0x0601 ## $t1 = 06010000 @@ -30,7 +30,7 @@ glabel func_80B2B9A4 /* 01814 80B2BA14 24C6D0BC */ addiu $a2, $a2, %lo(D_80B2D0BC) ## $a2 = 80B2D0BC /* 01818 80B2BA18 27A40020 */ addiu $a0, $sp, 0x0020 ## $a0 = FFFFFFE8 /* 0181C 80B2BA1C 24070622 */ addiu $a3, $zero, 0x0622 ## $a3 = 00000622 -/* 01820 80B2BA20 0C031AD5 */ jal func_800C6B54 +/* 01820 80B2BA20 0C031AD5 */ jal Graph_CloseDisps /* 01824 80B2BA24 8D450000 */ lw $a1, 0x0000($t2) ## 00000000 .L80B2BA28: /* 01828 80B2BA28 8FBF0014 */ lw $ra, 0x0014($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Viewer/func_80B2BA38.s b/asm/non_matchings/overlays/actors/ovl_En_Viewer/func_80B2BA38.s index 8196dad589..070367aba9 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Viewer/func_80B2BA38.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Viewer/func_80B2BA38.s @@ -1,91 +1,91 @@ glabel func_80B2BA38 /* 01838 80B2BA38 27BDFF60 */ addiu $sp, $sp, 0xFF60 ## $sp = FFFFFF60 -/* 0183C 80B2BA3C AFBF0024 */ sw $ra, 0x0024($sp) -/* 01840 80B2BA40 AFA400A0 */ sw $a0, 0x00A0($sp) -/* 01844 80B2BA44 AFA500A4 */ sw $a1, 0x00A4($sp) +/* 0183C 80B2BA3C AFBF0024 */ sw $ra, 0x0024($sp) +/* 01840 80B2BA40 AFA400A0 */ sw $a0, 0x00A0($sp) +/* 01844 80B2BA44 AFA500A4 */ sw $a1, 0x00A4($sp) /* 01848 80B2BA48 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 /* 0184C 80B2BA4C 3C0680B3 */ lui $a2, %hi(D_80B2D0D0) ## $a2 = 80B30000 /* 01850 80B2BA50 24C6D0D0 */ addiu $a2, $a2, %lo(D_80B2D0D0) ## $a2 = 80B2D0D0 /* 01854 80B2BA54 27A4008C */ addiu $a0, $sp, 0x008C ## $a0 = FFFFFFEC /* 01858 80B2BA58 2407062F */ addiu $a3, $zero, 0x062F ## $a3 = 0000062F -/* 0185C 80B2BA5C 0C031AB1 */ jal func_800C6AC4 -/* 01860 80B2BA60 AFA5009C */ sw $a1, 0x009C($sp) -/* 01864 80B2BA64 8FAC00A4 */ lw $t4, 0x00A4($sp) +/* 0185C 80B2BA5C 0C031AB1 */ jal Graph_OpenDisps +/* 01860 80B2BA60 AFA5009C */ sw $a1, 0x009C($sp) +/* 01864 80B2BA64 8FAC00A4 */ lw $t4, 0x00A4($sp) /* 01868 80B2BA68 24010051 */ addiu $at, $zero, 0x0051 ## $at = 00000051 -/* 0186C 80B2BA6C 8FA8009C */ lw $t0, 0x009C($sp) +/* 0186C 80B2BA6C 8FA8009C */ lw $t0, 0x009C($sp) /* 01870 80B2BA70 858F00A4 */ lh $t7, 0x00A4($t4) ## 000000A4 -/* 01874 80B2BA74 8FAB00A0 */ lw $t3, 0x00A0($sp) +/* 01874 80B2BA74 8FAB00A0 */ lw $t3, 0x00A0($sp) /* 01878 80B2BA78 3C078000 */ lui $a3, 0x8000 ## $a3 = 80000000 -/* 0187C 80B2BA7C 15E1015D */ bne $t7, $at, .L80B2BFF4 +/* 0187C 80B2BA7C 15E1015D */ bne $t7, $at, .L80B2BFF4 /* 01880 80B2BA80 3C098016 */ lui $t1, 0x8016 ## $t1 = 80160000 /* 01884 80B2BA84 95821D74 */ lhu $v0, 0x1D74($t4) ## 00001D74 /* 01888 80B2BA88 3C098016 */ lui $t1, 0x8016 ## $t1 = 80160000 /* 0188C 80B2BA8C 25296FA8 */ addiu $t1, $t1, 0x6FA8 ## $t1 = 80166FA8 -/* 01890 80B2BA90 28410303 */ slti $at, $v0, 0x0303 -/* 01894 80B2BA94 10200026 */ beq $at, $zero, .L80B2BB30 +/* 01890 80B2BA90 28410303 */ slti $at, $v0, 0x0303 +/* 01894 80B2BA94 10200026 */ beq $at, $zero, .L80B2BB30 /* 01898 80B2BA98 3C078000 */ lui $a3, 0x8000 ## $a3 = 80000000 /* 0189C 80B2BA9C 8D0202C0 */ lw $v0, 0x02C0($t0) ## 000002C0 /* 018A0 80B2BAA0 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 /* 018A4 80B2BAA4 248442F0 */ addiu $a0, $a0, 0x42F0 ## $a0 = 060042F0 -/* 018A8 80B2BAA8 00046900 */ sll $t5, $a0, 4 +/* 018A8 80B2BAA8 00046900 */ sll $t5, $a0, 4 /* 018AC 80B2BAAC 24580008 */ addiu $t8, $v0, 0x0008 ## $t8 = 00000008 /* 018B0 80B2BAB0 AD1802C0 */ sw $t8, 0x02C0($t0) ## 000002C0 -/* 018B4 80B2BAB4 000D7702 */ srl $t6, $t5, 28 +/* 018B4 80B2BAB4 000D7702 */ srl $t6, $t5, 28 /* 018B8 80B2BAB8 3C19DB06 */ lui $t9, 0xDB06 ## $t9 = DB060000 /* 018BC 80B2BABC 37390020 */ ori $t9, $t9, 0x0020 ## $t9 = DB060020 -/* 018C0 80B2BAC0 000E7880 */ sll $t7, $t6, 2 -/* 018C4 80B2BAC4 012FC021 */ addu $t8, $t1, $t7 +/* 018C0 80B2BAC0 000E7880 */ sll $t7, $t6, 2 +/* 018C4 80B2BAC4 012FC021 */ addu $t8, $t1, $t7 /* 018C8 80B2BAC8 AC590000 */ sw $t9, 0x0000($v0) ## 00000000 /* 018CC 80B2BACC 8F190000 */ lw $t9, 0x0000($t8) ## 00000008 /* 018D0 80B2BAD0 3C0A00FF */ lui $t2, 0x00FF ## $t2 = 00FF0000 /* 018D4 80B2BAD4 354AFFFF */ ori $t2, $t2, 0xFFFF ## $t2 = 00FFFFFF -/* 018D8 80B2BAD8 008A6824 */ and $t5, $a0, $t2 -/* 018DC 80B2BADC 032D7021 */ addu $t6, $t9, $t5 -/* 018E0 80B2BAE0 01C77821 */ addu $t7, $t6, $a3 +/* 018D8 80B2BAD8 008A6824 */ and $t5, $a0, $t2 +/* 018DC 80B2BADC 032D7021 */ addu $t6, $t9, $t5 +/* 018E0 80B2BAE0 01C77821 */ addu $t7, $t6, $a3 /* 018E4 80B2BAE4 AC4F0004 */ sw $t7, 0x0004($v0) ## 00000004 /* 018E8 80B2BAE8 8D0202C0 */ lw $v0, 0x02C0($t0) ## 000002C0 /* 018EC 80B2BAEC 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 /* 018F0 80B2BAF0 24843EF0 */ addiu $a0, $a0, 0x3EF0 ## $a0 = 06003EF0 -/* 018F4 80B2BAF4 00046900 */ sll $t5, $a0, 4 +/* 018F4 80B2BAF4 00046900 */ sll $t5, $a0, 4 /* 018F8 80B2BAF8 24580008 */ addiu $t8, $v0, 0x0008 ## $t8 = 00000008 /* 018FC 80B2BAFC AD1802C0 */ sw $t8, 0x02C0($t0) ## 000002C0 -/* 01900 80B2BB00 000D7702 */ srl $t6, $t5, 28 +/* 01900 80B2BB00 000D7702 */ srl $t6, $t5, 28 /* 01904 80B2BB04 3C19DB06 */ lui $t9, 0xDB06 ## $t9 = DB060000 /* 01908 80B2BB08 37390024 */ ori $t9, $t9, 0x0024 ## $t9 = DB060024 -/* 0190C 80B2BB0C 000E7880 */ sll $t7, $t6, 2 -/* 01910 80B2BB10 012FC021 */ addu $t8, $t1, $t7 +/* 0190C 80B2BB0C 000E7880 */ sll $t7, $t6, 2 +/* 01910 80B2BB10 012FC021 */ addu $t8, $t1, $t7 /* 01914 80B2BB14 AC590000 */ sw $t9, 0x0000($v0) ## 00000000 /* 01918 80B2BB18 8F190000 */ lw $t9, 0x0000($t8) ## 00000008 -/* 0191C 80B2BB1C 008A6824 */ and $t5, $a0, $t2 -/* 01920 80B2BB20 032D7021 */ addu $t6, $t9, $t5 -/* 01924 80B2BB24 01C77821 */ addu $t7, $t6, $a3 -/* 01928 80B2BB28 100000E0 */ beq $zero, $zero, .L80B2BEAC +/* 0191C 80B2BB1C 008A6824 */ and $t5, $a0, $t2 +/* 01920 80B2BB20 032D7021 */ addu $t6, $t9, $t5 +/* 01924 80B2BB24 01C77821 */ addu $t7, $t6, $a3 +/* 01928 80B2BB28 100000E0 */ beq $zero, $zero, .L80B2BEAC /* 0192C 80B2BB2C AC4F0004 */ sw $t7, 0x0004($v0) ## 00000004 .L80B2BB30: -/* 01930 80B2BB30 28410304 */ slti $at, $v0, 0x0304 -/* 01934 80B2BB34 50200023 */ beql $at, $zero, .L80B2BBC4 -/* 01938 80B2BB38 28410305 */ slti $at, $v0, 0x0305 +/* 01930 80B2BB30 28410304 */ slti $at, $v0, 0x0304 +/* 01934 80B2BB34 50200023 */ beql $at, $zero, .L80B2BBC4 +/* 01938 80B2BB38 28410305 */ slti $at, $v0, 0x0305 /* 0193C 80B2BB3C 8D0202C0 */ lw $v0, 0x02C0($t0) ## 000002C0 /* 01940 80B2BB40 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 /* 01944 80B2BB44 24842EF0 */ addiu $a0, $a0, 0x2EF0 ## $a0 = 06002EF0 -/* 01948 80B2BB48 00046900 */ sll $t5, $a0, 4 -/* 0194C 80B2BB4C 000D7702 */ srl $t6, $t5, 28 +/* 01948 80B2BB48 00046900 */ sll $t5, $a0, 4 +/* 0194C 80B2BB4C 000D7702 */ srl $t6, $t5, 28 /* 01950 80B2BB50 3C098016 */ lui $t1, 0x8016 ## $t1 = 80160000 /* 01954 80B2BB54 3C19DB06 */ lui $t9, 0xDB06 ## $t9 = DB060000 /* 01958 80B2BB58 24580008 */ addiu $t8, $v0, 0x0008 ## $t8 = 00000008 /* 0195C 80B2BB5C AD1802C0 */ sw $t8, 0x02C0($t0) ## 000002C0 /* 01960 80B2BB60 37390020 */ ori $t9, $t9, 0x0020 ## $t9 = DB060020 /* 01964 80B2BB64 25296FA8 */ addiu $t1, $t1, 0x6FA8 ## $t1 = 80166FA8 -/* 01968 80B2BB68 000E7880 */ sll $t7, $t6, 2 -/* 0196C 80B2BB6C 012F2821 */ addu $a1, $t1, $t7 +/* 01968 80B2BB68 000E7880 */ sll $t7, $t6, 2 +/* 0196C 80B2BB6C 012F2821 */ addu $a1, $t1, $t7 /* 01970 80B2BB70 AC590000 */ sw $t9, 0x0000($v0) ## 00000000 /* 01974 80B2BB74 8CB80000 */ lw $t8, 0x0000($a1) ## 00000000 /* 01978 80B2BB78 3C0A00FF */ lui $t2, 0x00FF ## $t2 = 00FF0000 /* 0197C 80B2BB7C 354AFFFF */ ori $t2, $t2, 0xFFFF ## $t2 = 00FFFFFF -/* 01980 80B2BB80 008A3024 */ and $a2, $a0, $t2 +/* 01980 80B2BB80 008A3024 */ and $a2, $a0, $t2 /* 01984 80B2BB84 3C078000 */ lui $a3, 0x8000 ## $a3 = 80000000 -/* 01988 80B2BB88 0306C821 */ addu $t9, $t8, $a2 -/* 0198C 80B2BB8C 03276821 */ addu $t5, $t9, $a3 +/* 01988 80B2BB88 0306C821 */ addu $t9, $t8, $a2 +/* 0198C 80B2BB8C 03276821 */ addu $t5, $t9, $a3 /* 01990 80B2BB90 AC4D0004 */ sw $t5, 0x0004($v0) ## 00000004 /* 01994 80B2BB94 8D0202C0 */ lw $v0, 0x02C0($t0) ## 000002C0 /* 01998 80B2BB98 3C0FDB06 */ lui $t7, 0xDB06 ## $t7 = DB060000 @@ -94,35 +94,35 @@ glabel func_80B2BA38 /* 019A4 80B2BBA4 AD0E02C0 */ sw $t6, 0x02C0($t0) ## 000002C0 /* 019A8 80B2BBA8 AC4F0000 */ sw $t7, 0x0000($v0) ## 00000000 /* 019AC 80B2BBAC 8CB80000 */ lw $t8, 0x0000($a1) ## 00000000 -/* 019B0 80B2BBB0 0306C821 */ addu $t9, $t8, $a2 -/* 019B4 80B2BBB4 03276821 */ addu $t5, $t9, $a3 -/* 019B8 80B2BBB8 100000BC */ beq $zero, $zero, .L80B2BEAC +/* 019B0 80B2BBB0 0306C821 */ addu $t9, $t8, $a2 +/* 019B4 80B2BBB4 03276821 */ addu $t5, $t9, $a3 +/* 019B8 80B2BBB8 100000BC */ beq $zero, $zero, .L80B2BEAC /* 019BC 80B2BBBC AC4D0004 */ sw $t5, 0x0004($v0) ## 00000004 -/* 019C0 80B2BBC0 28410305 */ slti $at, $v0, 0x0305 +/* 019C0 80B2BBC0 28410305 */ slti $at, $v0, 0x0305 .L80B2BBC4: -/* 019C4 80B2BBC4 50200023 */ beql $at, $zero, .L80B2BC54 -/* 019C8 80B2BBC8 28410317 */ slti $at, $v0, 0x0317 +/* 019C4 80B2BBC4 50200023 */ beql $at, $zero, .L80B2BC54 +/* 019C8 80B2BBC8 28410317 */ slti $at, $v0, 0x0317 /* 019CC 80B2BBCC 8D0202C0 */ lw $v0, 0x02C0($t0) ## 000002C0 /* 019D0 80B2BBD0 3C030600 */ lui $v1, 0x0600 ## $v1 = 06000000 /* 019D4 80B2BBD4 246332F0 */ addiu $v1, $v1, 0x32F0 ## $v1 = 060032F0 -/* 019D8 80B2BBD8 0003C100 */ sll $t8, $v1, 4 -/* 019DC 80B2BBDC 0018CF02 */ srl $t9, $t8, 28 +/* 019D8 80B2BBD8 0003C100 */ sll $t8, $v1, 4 +/* 019DC 80B2BBDC 0018CF02 */ srl $t9, $t8, 28 /* 019E0 80B2BBE0 3C098016 */ lui $t1, 0x8016 ## $t1 = 80160000 /* 019E4 80B2BBE4 3C0FDB06 */ lui $t7, 0xDB06 ## $t7 = DB060000 /* 019E8 80B2BBE8 244E0008 */ addiu $t6, $v0, 0x0008 ## $t6 = 00000008 /* 019EC 80B2BBEC AD0E02C0 */ sw $t6, 0x02C0($t0) ## 000002C0 /* 019F0 80B2BBF0 35EF0020 */ ori $t7, $t7, 0x0020 ## $t7 = DB060020 /* 019F4 80B2BBF4 25296FA8 */ addiu $t1, $t1, 0x6FA8 ## $t1 = 80166FA8 -/* 019F8 80B2BBF8 00196880 */ sll $t5, $t9, 2 -/* 019FC 80B2BBFC 012D2821 */ addu $a1, $t1, $t5 +/* 019F8 80B2BBF8 00196880 */ sll $t5, $t9, 2 +/* 019FC 80B2BBFC 012D2821 */ addu $a1, $t1, $t5 /* 01A00 80B2BC00 AC4F0000 */ sw $t7, 0x0000($v0) ## 00000000 /* 01A04 80B2BC04 8CAE0000 */ lw $t6, 0x0000($a1) ## 00000000 /* 01A08 80B2BC08 3C0A00FF */ lui $t2, 0x00FF ## $t2 = 00FF0000 /* 01A0C 80B2BC0C 354AFFFF */ ori $t2, $t2, 0xFFFF ## $t2 = 00FFFFFF -/* 01A10 80B2BC10 006A3024 */ and $a2, $v1, $t2 +/* 01A10 80B2BC10 006A3024 */ and $a2, $v1, $t2 /* 01A14 80B2BC14 3C078000 */ lui $a3, 0x8000 ## $a3 = 80000000 -/* 01A18 80B2BC18 01C67821 */ addu $t7, $t6, $a2 -/* 01A1C 80B2BC1C 01E7C021 */ addu $t8, $t7, $a3 +/* 01A18 80B2BC18 01C67821 */ addu $t7, $t6, $a2 +/* 01A1C 80B2BC1C 01E7C021 */ addu $t8, $t7, $a3 /* 01A20 80B2BC20 AC580004 */ sw $t8, 0x0004($v0) ## 00000004 /* 01A24 80B2BC24 8D0202C0 */ lw $v0, 0x02C0($t0) ## 000002C0 /* 01A28 80B2BC28 3C0DDB06 */ lui $t5, 0xDB06 ## $t5 = DB060000 @@ -131,35 +131,35 @@ glabel func_80B2BA38 /* 01A34 80B2BC34 AD1902C0 */ sw $t9, 0x02C0($t0) ## 000002C0 /* 01A38 80B2BC38 AC4D0000 */ sw $t5, 0x0000($v0) ## 00000000 /* 01A3C 80B2BC3C 8CAE0000 */ lw $t6, 0x0000($a1) ## 00000000 -/* 01A40 80B2BC40 01C67821 */ addu $t7, $t6, $a2 -/* 01A44 80B2BC44 01E7C021 */ addu $t8, $t7, $a3 -/* 01A48 80B2BC48 10000098 */ beq $zero, $zero, .L80B2BEAC +/* 01A40 80B2BC40 01C67821 */ addu $t7, $t6, $a2 +/* 01A44 80B2BC44 01E7C021 */ addu $t8, $t7, $a3 +/* 01A48 80B2BC48 10000098 */ beq $zero, $zero, .L80B2BEAC /* 01A4C 80B2BC4C AC580004 */ sw $t8, 0x0004($v0) ## 00000004 -/* 01A50 80B2BC50 28410317 */ slti $at, $v0, 0x0317 +/* 01A50 80B2BC50 28410317 */ slti $at, $v0, 0x0317 .L80B2BC54: -/* 01A54 80B2BC54 50200024 */ beql $at, $zero, .L80B2BCE8 -/* 01A58 80B2BC58 28410318 */ slti $at, $v0, 0x0318 +/* 01A54 80B2BC54 50200024 */ beql $at, $zero, .L80B2BCE8 +/* 01A58 80B2BC58 28410318 */ slti $at, $v0, 0x0318 /* 01A5C 80B2BC5C 8D0202C0 */ lw $v0, 0x02C0($t0) ## 000002C0 /* 01A60 80B2BC60 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 /* 01A64 80B2BC64 248436F0 */ addiu $a0, $a0, 0x36F0 ## $a0 = 060036F0 -/* 01A68 80B2BC68 00047100 */ sll $t6, $a0, 4 -/* 01A6C 80B2BC6C 000E7F02 */ srl $t7, $t6, 28 +/* 01A68 80B2BC68 00047100 */ sll $t6, $a0, 4 +/* 01A6C 80B2BC6C 000E7F02 */ srl $t7, $t6, 28 /* 01A70 80B2BC70 3C098016 */ lui $t1, 0x8016 ## $t1 = 80160000 /* 01A74 80B2BC74 3C0DDB06 */ lui $t5, 0xDB06 ## $t5 = DB060000 /* 01A78 80B2BC78 24590008 */ addiu $t9, $v0, 0x0008 ## $t9 = 00000008 /* 01A7C 80B2BC7C AD1902C0 */ sw $t9, 0x02C0($t0) ## 000002C0 /* 01A80 80B2BC80 35AD0020 */ ori $t5, $t5, 0x0020 ## $t5 = DB060020 /* 01A84 80B2BC84 25296FA8 */ addiu $t1, $t1, 0x6FA8 ## $t1 = 80166FA8 -/* 01A88 80B2BC88 000FC080 */ sll $t8, $t7, 2 -/* 01A8C 80B2BC8C 01382821 */ addu $a1, $t1, $t8 +/* 01A88 80B2BC88 000FC080 */ sll $t8, $t7, 2 +/* 01A8C 80B2BC8C 01382821 */ addu $a1, $t1, $t8 /* 01A90 80B2BC90 AC4D0000 */ sw $t5, 0x0000($v0) ## 00000000 /* 01A94 80B2BC94 8CB90000 */ lw $t9, 0x0000($a1) ## 00000000 /* 01A98 80B2BC98 3C0A00FF */ lui $t2, 0x00FF ## $t2 = 00FF0000 /* 01A9C 80B2BC9C 354AFFFF */ ori $t2, $t2, 0xFFFF ## $t2 = 00FFFFFF -/* 01AA0 80B2BCA0 008A3024 */ and $a2, $a0, $t2 +/* 01AA0 80B2BCA0 008A3024 */ and $a2, $a0, $t2 /* 01AA4 80B2BCA4 3C078000 */ lui $a3, 0x8000 ## $a3 = 80000000 -/* 01AA8 80B2BCA8 03266821 */ addu $t5, $t9, $a2 -/* 01AAC 80B2BCAC 01A77021 */ addu $t6, $t5, $a3 +/* 01AA8 80B2BCA8 03266821 */ addu $t5, $t9, $a2 +/* 01AAC 80B2BCAC 01A77021 */ addu $t6, $t5, $a3 /* 01AB0 80B2BCB0 AC4E0004 */ sw $t6, 0x0004($v0) ## 00000004 /* 01AB4 80B2BCB4 8D0202C0 */ lw $v0, 0x02C0($t0) ## 000002C0 /* 01AB8 80B2BCB8 3C18DB06 */ lui $t8, 0xDB06 ## $t8 = DB060000 @@ -168,36 +168,36 @@ glabel func_80B2BA38 /* 01AC4 80B2BCC4 AD0F02C0 */ sw $t7, 0x02C0($t0) ## 000002C0 /* 01AC8 80B2BCC8 AC580000 */ sw $t8, 0x0000($v0) ## 00000000 /* 01ACC 80B2BCCC 8CB90000 */ lw $t9, 0x0000($a1) ## 00000000 -/* 01AD0 80B2BCD0 03266821 */ addu $t5, $t9, $a2 -/* 01AD4 80B2BCD4 01A77021 */ addu $t6, $t5, $a3 +/* 01AD0 80B2BCD0 03266821 */ addu $t5, $t9, $a2 +/* 01AD4 80B2BCD4 01A77021 */ addu $t6, $t5, $a3 /* 01AD8 80B2BCD8 AC4E0004 */ sw $t6, 0x0004($v0) ## 00000004 -/* 01ADC 80B2BCDC 10000073 */ beq $zero, $zero, .L80B2BEAC -/* 01AE0 80B2BCE0 8FAC00A4 */ lw $t4, 0x00A4($sp) -/* 01AE4 80B2BCE4 28410318 */ slti $at, $v0, 0x0318 +/* 01ADC 80B2BCDC 10000073 */ beq $zero, $zero, .L80B2BEAC +/* 01AE0 80B2BCE0 8FAC00A4 */ lw $t4, 0x00A4($sp) +/* 01AE4 80B2BCE4 28410318 */ slti $at, $v0, 0x0318 .L80B2BCE8: -/* 01AE8 80B2BCE8 50200024 */ beql $at, $zero, .L80B2BD7C -/* 01AEC 80B2BCEC 28410319 */ slti $at, $v0, 0x0319 +/* 01AE8 80B2BCE8 50200024 */ beql $at, $zero, .L80B2BD7C +/* 01AEC 80B2BCEC 28410319 */ slti $at, $v0, 0x0319 /* 01AF0 80B2BCF0 8D0202C0 */ lw $v0, 0x02C0($t0) ## 000002C0 /* 01AF4 80B2BCF4 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 /* 01AF8 80B2BCF8 24842EF0 */ addiu $a0, $a0, 0x2EF0 ## $a0 = 06002EF0 -/* 01AFC 80B2BCFC 0004C900 */ sll $t9, $a0, 4 -/* 01B00 80B2BD00 00196F02 */ srl $t5, $t9, 28 +/* 01AFC 80B2BCFC 0004C900 */ sll $t9, $a0, 4 +/* 01B00 80B2BD00 00196F02 */ srl $t5, $t9, 28 /* 01B04 80B2BD04 3C098016 */ lui $t1, 0x8016 ## $t1 = 80160000 /* 01B08 80B2BD08 3C18DB06 */ lui $t8, 0xDB06 ## $t8 = DB060000 /* 01B0C 80B2BD0C 244F0008 */ addiu $t7, $v0, 0x0008 ## $t7 = 00000008 /* 01B10 80B2BD10 AD0F02C0 */ sw $t7, 0x02C0($t0) ## 000002C0 /* 01B14 80B2BD14 37180020 */ ori $t8, $t8, 0x0020 ## $t8 = DB060020 /* 01B18 80B2BD18 25296FA8 */ addiu $t1, $t1, 0x6FA8 ## $t1 = 80166FA8 -/* 01B1C 80B2BD1C 000D7080 */ sll $t6, $t5, 2 -/* 01B20 80B2BD20 012E2821 */ addu $a1, $t1, $t6 +/* 01B1C 80B2BD1C 000D7080 */ sll $t6, $t5, 2 +/* 01B20 80B2BD20 012E2821 */ addu $a1, $t1, $t6 /* 01B24 80B2BD24 AC580000 */ sw $t8, 0x0000($v0) ## 00000000 /* 01B28 80B2BD28 8CAF0000 */ lw $t7, 0x0000($a1) ## 00000000 /* 01B2C 80B2BD2C 3C0A00FF */ lui $t2, 0x00FF ## $t2 = 00FF0000 /* 01B30 80B2BD30 354AFFFF */ ori $t2, $t2, 0xFFFF ## $t2 = 00FFFFFF -/* 01B34 80B2BD34 008A3024 */ and $a2, $a0, $t2 +/* 01B34 80B2BD34 008A3024 */ and $a2, $a0, $t2 /* 01B38 80B2BD38 3C078000 */ lui $a3, 0x8000 ## $a3 = 80000000 -/* 01B3C 80B2BD3C 01E6C021 */ addu $t8, $t7, $a2 -/* 01B40 80B2BD40 0307C821 */ addu $t9, $t8, $a3 +/* 01B3C 80B2BD3C 01E6C021 */ addu $t8, $t7, $a2 +/* 01B40 80B2BD40 0307C821 */ addu $t9, $t8, $a3 /* 01B44 80B2BD44 AC590004 */ sw $t9, 0x0004($v0) ## 00000004 /* 01B48 80B2BD48 8D0202C0 */ lw $v0, 0x02C0($t0) ## 000002C0 /* 01B4C 80B2BD4C 3C0EDB06 */ lui $t6, 0xDB06 ## $t6 = DB060000 @@ -206,36 +206,36 @@ glabel func_80B2BA38 /* 01B58 80B2BD58 AD0D02C0 */ sw $t5, 0x02C0($t0) ## 000002C0 /* 01B5C 80B2BD5C AC4E0000 */ sw $t6, 0x0000($v0) ## 00000000 /* 01B60 80B2BD60 8CAF0000 */ lw $t7, 0x0000($a1) ## 00000000 -/* 01B64 80B2BD64 01E6C021 */ addu $t8, $t7, $a2 -/* 01B68 80B2BD68 0307C821 */ addu $t9, $t8, $a3 +/* 01B64 80B2BD64 01E6C021 */ addu $t8, $t7, $a2 +/* 01B68 80B2BD68 0307C821 */ addu $t9, $t8, $a3 /* 01B6C 80B2BD6C AC590004 */ sw $t9, 0x0004($v0) ## 00000004 -/* 01B70 80B2BD70 1000004E */ beq $zero, $zero, .L80B2BEAC -/* 01B74 80B2BD74 8FAC00A4 */ lw $t4, 0x00A4($sp) -/* 01B78 80B2BD78 28410319 */ slti $at, $v0, 0x0319 +/* 01B70 80B2BD70 1000004E */ beq $zero, $zero, .L80B2BEAC +/* 01B74 80B2BD74 8FAC00A4 */ lw $t4, 0x00A4($sp) +/* 01B78 80B2BD78 28410319 */ slti $at, $v0, 0x0319 .L80B2BD7C: -/* 01B7C 80B2BD7C 50200024 */ beql $at, $zero, .L80B2BE10 +/* 01B7C 80B2BD7C 50200024 */ beql $at, $zero, .L80B2BE10 /* 01B80 80B2BD80 8D0202C0 */ lw $v0, 0x02C0($t0) ## 000002C0 /* 01B84 80B2BD84 8D0202C0 */ lw $v0, 0x02C0($t0) ## 000002C0 /* 01B88 80B2BD88 3C030600 */ lui $v1, 0x0600 ## $v1 = 06000000 /* 01B8C 80B2BD8C 246332F0 */ addiu $v1, $v1, 0x32F0 ## $v1 = 060032F0 -/* 01B90 80B2BD90 00037900 */ sll $t7, $v1, 4 -/* 01B94 80B2BD94 000FC702 */ srl $t8, $t7, 28 +/* 01B90 80B2BD90 00037900 */ sll $t7, $v1, 4 +/* 01B94 80B2BD94 000FC702 */ srl $t8, $t7, 28 /* 01B98 80B2BD98 3C098016 */ lui $t1, 0x8016 ## $t1 = 80160000 /* 01B9C 80B2BD9C 3C0EDB06 */ lui $t6, 0xDB06 ## $t6 = DB060000 /* 01BA0 80B2BDA0 244D0008 */ addiu $t5, $v0, 0x0008 ## $t5 = 00000008 /* 01BA4 80B2BDA4 AD0D02C0 */ sw $t5, 0x02C0($t0) ## 000002C0 /* 01BA8 80B2BDA8 35CE0020 */ ori $t6, $t6, 0x0020 ## $t6 = DB060020 /* 01BAC 80B2BDAC 25296FA8 */ addiu $t1, $t1, 0x6FA8 ## $t1 = 80166FA8 -/* 01BB0 80B2BDB0 0018C880 */ sll $t9, $t8, 2 -/* 01BB4 80B2BDB4 01392821 */ addu $a1, $t1, $t9 +/* 01BB0 80B2BDB0 0018C880 */ sll $t9, $t8, 2 +/* 01BB4 80B2BDB4 01392821 */ addu $a1, $t1, $t9 /* 01BB8 80B2BDB8 AC4E0000 */ sw $t6, 0x0000($v0) ## 00000000 /* 01BBC 80B2BDBC 8CAD0000 */ lw $t5, 0x0000($a1) ## 00000000 /* 01BC0 80B2BDC0 3C0A00FF */ lui $t2, 0x00FF ## $t2 = 00FF0000 /* 01BC4 80B2BDC4 354AFFFF */ ori $t2, $t2, 0xFFFF ## $t2 = 00FFFFFF -/* 01BC8 80B2BDC8 006A3024 */ and $a2, $v1, $t2 +/* 01BC8 80B2BDC8 006A3024 */ and $a2, $v1, $t2 /* 01BCC 80B2BDCC 3C078000 */ lui $a3, 0x8000 ## $a3 = 80000000 -/* 01BD0 80B2BDD0 01A67021 */ addu $t6, $t5, $a2 -/* 01BD4 80B2BDD4 01C77821 */ addu $t7, $t6, $a3 +/* 01BD0 80B2BDD0 01A67021 */ addu $t6, $t5, $a2 +/* 01BD4 80B2BDD4 01C77821 */ addu $t7, $t6, $a3 /* 01BD8 80B2BDD8 AC4F0004 */ sw $t7, 0x0004($v0) ## 00000004 /* 01BDC 80B2BDDC 8D0202C0 */ lw $v0, 0x02C0($t0) ## 000002C0 /* 01BE0 80B2BDE0 3C19DB06 */ lui $t9, 0xDB06 ## $t9 = DB060000 @@ -244,158 +244,158 @@ glabel func_80B2BA38 /* 01BEC 80B2BDEC AD1802C0 */ sw $t8, 0x02C0($t0) ## 000002C0 /* 01BF0 80B2BDF0 AC590000 */ sw $t9, 0x0000($v0) ## 00000000 /* 01BF4 80B2BDF4 8CAD0000 */ lw $t5, 0x0000($a1) ## 00000000 -/* 01BF8 80B2BDF8 01A67021 */ addu $t6, $t5, $a2 -/* 01BFC 80B2BDFC 01C77821 */ addu $t7, $t6, $a3 +/* 01BF8 80B2BDF8 01A67021 */ addu $t6, $t5, $a2 +/* 01BFC 80B2BDFC 01C77821 */ addu $t7, $t6, $a3 /* 01C00 80B2BE00 AC4F0004 */ sw $t7, 0x0004($v0) ## 00000004 -/* 01C04 80B2BE04 10000029 */ beq $zero, $zero, .L80B2BEAC -/* 01C08 80B2BE08 8FAC00A4 */ lw $t4, 0x00A4($sp) +/* 01C04 80B2BE04 10000029 */ beq $zero, $zero, .L80B2BEAC +/* 01C08 80B2BE08 8FAC00A4 */ lw $t4, 0x00A4($sp) /* 01C0C 80B2BE0C 8D0202C0 */ lw $v0, 0x02C0($t0) ## 000002C0 .L80B2BE10: /* 01C10 80B2BE10 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 /* 01C14 80B2BE14 248442F0 */ addiu $a0, $a0, 0x42F0 ## $a0 = 060042F0 -/* 01C18 80B2BE18 00046900 */ sll $t5, $a0, 4 +/* 01C18 80B2BE18 00046900 */ sll $t5, $a0, 4 /* 01C1C 80B2BE1C 24580008 */ addiu $t8, $v0, 0x0008 ## $t8 = 00000008 /* 01C20 80B2BE20 3C098016 */ lui $t1, 0x8016 ## $t1 = 80160000 /* 01C24 80B2BE24 AD1802C0 */ sw $t8, 0x02C0($t0) ## 000002C0 -/* 01C28 80B2BE28 000D7702 */ srl $t6, $t5, 28 +/* 01C28 80B2BE28 000D7702 */ srl $t6, $t5, 28 /* 01C2C 80B2BE2C 3C19DB06 */ lui $t9, 0xDB06 ## $t9 = DB060000 /* 01C30 80B2BE30 25296FA8 */ addiu $t1, $t1, 0x6FA8 ## $t1 = 80166FA8 /* 01C34 80B2BE34 37390020 */ ori $t9, $t9, 0x0020 ## $t9 = DB060020 -/* 01C38 80B2BE38 000E7880 */ sll $t7, $t6, 2 -/* 01C3C 80B2BE3C 012FC021 */ addu $t8, $t1, $t7 +/* 01C38 80B2BE38 000E7880 */ sll $t7, $t6, 2 +/* 01C3C 80B2BE3C 012FC021 */ addu $t8, $t1, $t7 /* 01C40 80B2BE40 AC590000 */ sw $t9, 0x0000($v0) ## 00000000 /* 01C44 80B2BE44 8F190000 */ lw $t9, 0x0000($t8) ## 00000008 /* 01C48 80B2BE48 3C0A00FF */ lui $t2, 0x00FF ## $t2 = 00FF0000 /* 01C4C 80B2BE4C 354AFFFF */ ori $t2, $t2, 0xFFFF ## $t2 = 00FFFFFF -/* 01C50 80B2BE50 008A6824 */ and $t5, $a0, $t2 +/* 01C50 80B2BE50 008A6824 */ and $t5, $a0, $t2 /* 01C54 80B2BE54 3C078000 */ lui $a3, 0x8000 ## $a3 = 80000000 -/* 01C58 80B2BE58 032D7021 */ addu $t6, $t9, $t5 -/* 01C5C 80B2BE5C 01C77821 */ addu $t7, $t6, $a3 +/* 01C58 80B2BE58 032D7021 */ addu $t6, $t9, $t5 +/* 01C5C 80B2BE5C 01C77821 */ addu $t7, $t6, $a3 /* 01C60 80B2BE60 AC4F0004 */ sw $t7, 0x0004($v0) ## 00000004 /* 01C64 80B2BE64 8D0202C0 */ lw $v0, 0x02C0($t0) ## 000002C0 /* 01C68 80B2BE68 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 /* 01C6C 80B2BE6C 24843EF0 */ addiu $a0, $a0, 0x3EF0 ## $a0 = 06003EF0 -/* 01C70 80B2BE70 00046900 */ sll $t5, $a0, 4 +/* 01C70 80B2BE70 00046900 */ sll $t5, $a0, 4 /* 01C74 80B2BE74 24580008 */ addiu $t8, $v0, 0x0008 ## $t8 = 00000008 /* 01C78 80B2BE78 AD1802C0 */ sw $t8, 0x02C0($t0) ## 000002C0 -/* 01C7C 80B2BE7C 000D7702 */ srl $t6, $t5, 28 +/* 01C7C 80B2BE7C 000D7702 */ srl $t6, $t5, 28 /* 01C80 80B2BE80 3C19DB06 */ lui $t9, 0xDB06 ## $t9 = DB060000 /* 01C84 80B2BE84 37390024 */ ori $t9, $t9, 0x0024 ## $t9 = DB060024 -/* 01C88 80B2BE88 000E7880 */ sll $t7, $t6, 2 -/* 01C8C 80B2BE8C 012FC021 */ addu $t8, $t1, $t7 +/* 01C88 80B2BE88 000E7880 */ sll $t7, $t6, 2 +/* 01C8C 80B2BE8C 012FC021 */ addu $t8, $t1, $t7 /* 01C90 80B2BE90 AC590000 */ sw $t9, 0x0000($v0) ## 00000000 /* 01C94 80B2BE94 8F190000 */ lw $t9, 0x0000($t8) ## 00000008 -/* 01C98 80B2BE98 008A6824 */ and $t5, $a0, $t2 -/* 01C9C 80B2BE9C 032D7021 */ addu $t6, $t9, $t5 -/* 01CA0 80B2BEA0 01C77821 */ addu $t7, $t6, $a3 +/* 01C98 80B2BE98 008A6824 */ and $t5, $a0, $t2 +/* 01C9C 80B2BE9C 032D7021 */ addu $t6, $t9, $t5 +/* 01CA0 80B2BEA0 01C77821 */ addu $t7, $t6, $a3 /* 01CA4 80B2BEA4 AC4F0004 */ sw $t7, 0x0004($v0) ## 00000004 -/* 01CA8 80B2BEA8 8FAC00A4 */ lw $t4, 0x00A4($sp) +/* 01CA8 80B2BEA8 8FAC00A4 */ lw $t4, 0x00A4($sp) .L80B2BEAC: /* 01CAC 80B2BEAC 3C188016 */ lui $t8, 0x8016 ## $t8 = 80160000 /* 01CB0 80B2BEB0 8F18F9C0 */ lw $t8, -0x0640($t8) ## 8015F9C0 /* 01CB4 80B2BEB4 24010006 */ addiu $at, $zero, 0x0006 ## $at = 00000006 -/* 01CB8 80B2BEB8 57010014 */ bnel $t8, $at, .L80B2BF0C +/* 01CB8 80B2BEB8 57010014 */ bnel $t8, $at, .L80B2BF0C /* 01CBC 80B2BEBC 95821D74 */ lhu $v0, 0x1D74($t4) ## 00001D74 /* 01CC0 80B2BEC0 8D0202C0 */ lw $v0, 0x02C0($t0) ## 000002C0 /* 01CC4 80B2BEC4 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 /* 01CC8 80B2BEC8 248452F0 */ addiu $a0, $a0, 0x52F0 ## $a0 = 060052F0 -/* 01CCC 80B2BECC 00047100 */ sll $t6, $a0, 4 +/* 01CCC 80B2BECC 00047100 */ sll $t6, $a0, 4 /* 01CD0 80B2BED0 24590008 */ addiu $t9, $v0, 0x0008 ## $t9 = 00000008 /* 01CD4 80B2BED4 AD1902C0 */ sw $t9, 0x02C0($t0) ## 000002C0 -/* 01CD8 80B2BED8 000E7F02 */ srl $t7, $t6, 28 +/* 01CD8 80B2BED8 000E7F02 */ srl $t7, $t6, 28 /* 01CDC 80B2BEDC 3C0DDB06 */ lui $t5, 0xDB06 ## $t5 = DB060000 /* 01CE0 80B2BEE0 35AD0028 */ ori $t5, $t5, 0x0028 ## $t5 = DB060028 -/* 01CE4 80B2BEE4 000FC080 */ sll $t8, $t7, 2 -/* 01CE8 80B2BEE8 0138C821 */ addu $t9, $t1, $t8 +/* 01CE4 80B2BEE4 000FC080 */ sll $t8, $t7, 2 +/* 01CE8 80B2BEE8 0138C821 */ addu $t9, $t1, $t8 /* 01CEC 80B2BEEC AC4D0000 */ sw $t5, 0x0000($v0) ## 00000000 /* 01CF0 80B2BEF0 8F2D0000 */ lw $t5, 0x0000($t9) ## 00000008 -/* 01CF4 80B2BEF4 008A7024 */ and $t6, $a0, $t2 -/* 01CF8 80B2BEF8 01AE7821 */ addu $t7, $t5, $t6 -/* 01CFC 80B2BEFC 01E7C021 */ addu $t8, $t7, $a3 -/* 01D00 80B2BF00 1000006B */ beq $zero, $zero, .L80B2C0B0 +/* 01CF4 80B2BEF4 008A7024 */ and $t6, $a0, $t2 +/* 01CF8 80B2BEF8 01AE7821 */ addu $t7, $t5, $t6 +/* 01CFC 80B2BEFC 01E7C021 */ addu $t8, $t7, $a3 +/* 01D00 80B2BF00 1000006B */ beq $zero, $zero, .L80B2C0B0 /* 01D04 80B2BF04 AC580004 */ sw $t8, 0x0004($v0) ## 00000004 /* 01D08 80B2BF08 95821D74 */ lhu $v0, 0x1D74($t4) ## 00001D74 .L80B2BF0C: /* 01D0C 80B2BF0C 3C0DDB06 */ lui $t5, 0xDB06 ## $t5 = DB060000 /* 01D10 80B2BF10 35AD0028 */ ori $t5, $t5, 0x0028 ## $t5 = DB060028 -/* 01D14 80B2BF14 284102F6 */ slti $at, $v0, 0x02F6 -/* 01D18 80B2BF18 10200010 */ beq $at, $zero, .L80B2BF5C +/* 01D14 80B2BF14 284102F6 */ slti $at, $v0, 0x02F6 +/* 01D18 80B2BF18 10200010 */ beq $at, $zero, .L80B2BF5C /* 01D1C 80B2BF1C 3C030600 */ lui $v1, 0x0600 ## $v1 = 06000000 /* 01D20 80B2BF20 8D0202C0 */ lw $v0, 0x02C0($t0) ## 000002C0 /* 01D24 80B2BF24 24634EF0 */ addiu $v1, $v1, 0x4EF0 ## $v1 = 06004EF0 -/* 01D28 80B2BF28 00037100 */ sll $t6, $v1, 4 +/* 01D28 80B2BF28 00037100 */ sll $t6, $v1, 4 /* 01D2C 80B2BF2C 24590008 */ addiu $t9, $v0, 0x0008 ## $t9 = 00000008 /* 01D30 80B2BF30 AD1902C0 */ sw $t9, 0x02C0($t0) ## 000002C0 -/* 01D34 80B2BF34 000E7F02 */ srl $t7, $t6, 28 -/* 01D38 80B2BF38 000FC080 */ sll $t8, $t7, 2 -/* 01D3C 80B2BF3C 0138C821 */ addu $t9, $t1, $t8 +/* 01D34 80B2BF34 000E7F02 */ srl $t7, $t6, 28 +/* 01D38 80B2BF38 000FC080 */ sll $t8, $t7, 2 +/* 01D3C 80B2BF3C 0138C821 */ addu $t9, $t1, $t8 /* 01D40 80B2BF40 AC4D0000 */ sw $t5, 0x0000($v0) ## 00000000 /* 01D44 80B2BF44 8F2D0000 */ lw $t5, 0x0000($t9) ## 00000008 -/* 01D48 80B2BF48 006A7024 */ and $t6, $v1, $t2 -/* 01D4C 80B2BF4C 01AE7821 */ addu $t7, $t5, $t6 -/* 01D50 80B2BF50 01E7C021 */ addu $t8, $t7, $a3 -/* 01D54 80B2BF54 10000056 */ beq $zero, $zero, .L80B2C0B0 +/* 01D48 80B2BF48 006A7024 */ and $t6, $v1, $t2 +/* 01D4C 80B2BF4C 01AE7821 */ addu $t7, $t5, $t6 +/* 01D50 80B2BF50 01E7C021 */ addu $t8, $t7, $a3 +/* 01D54 80B2BF54 10000056 */ beq $zero, $zero, .L80B2C0B0 /* 01D58 80B2BF58 AC580004 */ sw $t8, 0x0004($v0) ## 00000004 .L80B2BF5C: -/* 01D5C 80B2BF5C 28410350 */ slti $at, $v0, 0x0350 -/* 01D60 80B2BF60 10200013 */ beq $at, $zero, .L80B2BFB0 +/* 01D5C 80B2BF5C 28410350 */ slti $at, $v0, 0x0350 +/* 01D60 80B2BF60 10200013 */ beq $at, $zero, .L80B2BFB0 /* 01D64 80B2BF64 3C0DDB06 */ lui $t5, 0xDB06 ## $t5 = DB060000 /* 01D68 80B2BF68 8D0202C0 */ lw $v0, 0x02C0($t0) ## 000002C0 /* 01D6C 80B2BF6C 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 /* 01D70 80B2BF70 248452F0 */ addiu $a0, $a0, 0x52F0 ## $a0 = 060052F0 -/* 01D74 80B2BF74 00047100 */ sll $t6, $a0, 4 +/* 01D74 80B2BF74 00047100 */ sll $t6, $a0, 4 /* 01D78 80B2BF78 24590008 */ addiu $t9, $v0, 0x0008 ## $t9 = 00000008 /* 01D7C 80B2BF7C AD1902C0 */ sw $t9, 0x02C0($t0) ## 000002C0 -/* 01D80 80B2BF80 000E7F02 */ srl $t7, $t6, 28 +/* 01D80 80B2BF80 000E7F02 */ srl $t7, $t6, 28 /* 01D84 80B2BF84 3C0DDB06 */ lui $t5, 0xDB06 ## $t5 = DB060000 /* 01D88 80B2BF88 35AD0028 */ ori $t5, $t5, 0x0028 ## $t5 = DB060028 -/* 01D8C 80B2BF8C 000FC080 */ sll $t8, $t7, 2 -/* 01D90 80B2BF90 0138C821 */ addu $t9, $t1, $t8 +/* 01D8C 80B2BF8C 000FC080 */ sll $t8, $t7, 2 +/* 01D90 80B2BF90 0138C821 */ addu $t9, $t1, $t8 /* 01D94 80B2BF94 AC4D0000 */ sw $t5, 0x0000($v0) ## 00000000 /* 01D98 80B2BF98 8F2D0000 */ lw $t5, 0x0000($t9) ## 00000008 -/* 01D9C 80B2BF9C 008A7024 */ and $t6, $a0, $t2 -/* 01DA0 80B2BFA0 01AE7821 */ addu $t7, $t5, $t6 -/* 01DA4 80B2BFA4 01E7C021 */ addu $t8, $t7, $a3 -/* 01DA8 80B2BFA8 10000041 */ beq $zero, $zero, .L80B2C0B0 +/* 01D9C 80B2BF9C 008A7024 */ and $t6, $a0, $t2 +/* 01DA0 80B2BFA0 01AE7821 */ addu $t7, $t5, $t6 +/* 01DA4 80B2BFA4 01E7C021 */ addu $t8, $t7, $a3 +/* 01DA8 80B2BFA8 10000041 */ beq $zero, $zero, .L80B2C0B0 /* 01DAC 80B2BFAC AC580004 */ sw $t8, 0x0004($v0) ## 00000004 .L80B2BFB0: /* 01DB0 80B2BFB0 8D0202C0 */ lw $v0, 0x02C0($t0) ## 000002C0 /* 01DB4 80B2BFB4 3C030600 */ lui $v1, 0x0600 ## $v1 = 06000000 /* 01DB8 80B2BFB8 24634EF0 */ addiu $v1, $v1, 0x4EF0 ## $v1 = 06004EF0 -/* 01DBC 80B2BFBC 00037100 */ sll $t6, $v1, 4 +/* 01DBC 80B2BFBC 00037100 */ sll $t6, $v1, 4 /* 01DC0 80B2BFC0 24590008 */ addiu $t9, $v0, 0x0008 ## $t9 = 00000008 /* 01DC4 80B2BFC4 AD1902C0 */ sw $t9, 0x02C0($t0) ## 000002C0 -/* 01DC8 80B2BFC8 000E7F02 */ srl $t7, $t6, 28 -/* 01DCC 80B2BFCC 000FC080 */ sll $t8, $t7, 2 +/* 01DC8 80B2BFC8 000E7F02 */ srl $t7, $t6, 28 +/* 01DCC 80B2BFCC 000FC080 */ sll $t8, $t7, 2 /* 01DD0 80B2BFD0 35AD0028 */ ori $t5, $t5, 0x0028 ## $t5 = DB060028 -/* 01DD4 80B2BFD4 0138C821 */ addu $t9, $t1, $t8 +/* 01DD4 80B2BFD4 0138C821 */ addu $t9, $t1, $t8 /* 01DD8 80B2BFD8 AC4D0000 */ sw $t5, 0x0000($v0) ## 00000000 /* 01DDC 80B2BFDC 8F2D0000 */ lw $t5, 0x0000($t9) ## 00000008 -/* 01DE0 80B2BFE0 006A7024 */ and $t6, $v1, $t2 -/* 01DE4 80B2BFE4 01AE7821 */ addu $t7, $t5, $t6 -/* 01DE8 80B2BFE8 01E7C021 */ addu $t8, $t7, $a3 -/* 01DEC 80B2BFEC 10000030 */ beq $zero, $zero, .L80B2C0B0 +/* 01DE0 80B2BFE0 006A7024 */ and $t6, $v1, $t2 +/* 01DE4 80B2BFE4 01AE7821 */ addu $t7, $t5, $t6 +/* 01DE8 80B2BFE8 01E7C021 */ addu $t8, $t7, $a3 +/* 01DEC 80B2BFEC 10000030 */ beq $zero, $zero, .L80B2C0B0 /* 01DF0 80B2BFF0 AC580004 */ sw $t8, 0x0004($v0) ## 00000004 .L80B2BFF4: /* 01DF4 80B2BFF4 8D0202C0 */ lw $v0, 0x02C0($t0) ## 000002C0 /* 01DF8 80B2BFF8 3C030600 */ lui $v1, 0x0600 ## $v1 = 06000000 /* 01DFC 80B2BFFC 246332F0 */ addiu $v1, $v1, 0x32F0 ## $v1 = 060032F0 -/* 01E00 80B2C000 00037100 */ sll $t6, $v1, 4 -/* 01E04 80B2C004 000E7F02 */ srl $t7, $t6, 28 +/* 01E00 80B2C000 00037100 */ sll $t6, $v1, 4 +/* 01E04 80B2C004 000E7F02 */ srl $t7, $t6, 28 /* 01E08 80B2C008 3C0DDB06 */ lui $t5, 0xDB06 ## $t5 = DB060000 /* 01E0C 80B2C00C 24590008 */ addiu $t9, $v0, 0x0008 ## $t9 = 00000008 /* 01E10 80B2C010 25296FA8 */ addiu $t1, $t1, 0x6FA8 ## $t1 = 8016DF50 /* 01E14 80B2C014 AD1902C0 */ sw $t9, 0x02C0($t0) ## 000002C0 /* 01E18 80B2C018 35AD0020 */ ori $t5, $t5, 0x0020 ## $t5 = DB060020 -/* 01E1C 80B2C01C 000FC080 */ sll $t8, $t7, 2 -/* 01E20 80B2C020 01382821 */ addu $a1, $t1, $t8 +/* 01E1C 80B2C01C 000FC080 */ sll $t8, $t7, 2 +/* 01E20 80B2C020 01382821 */ addu $a1, $t1, $t8 /* 01E24 80B2C024 AC4D0000 */ sw $t5, 0x0000($v0) ## 00000000 /* 01E28 80B2C028 8CB90000 */ lw $t9, 0x0000($a1) ## 00000000 /* 01E2C 80B2C02C 3C0A00FF */ lui $t2, 0x00FF ## $t2 = 00FF0000 /* 01E30 80B2C030 354AFFFF */ ori $t2, $t2, 0xFFFF ## $t2 = 00FFFFFF -/* 01E34 80B2C034 006A3024 */ and $a2, $v1, $t2 -/* 01E38 80B2C038 03266821 */ addu $t5, $t9, $a2 -/* 01E3C 80B2C03C 01A77021 */ addu $t6, $t5, $a3 +/* 01E34 80B2C034 006A3024 */ and $a2, $v1, $t2 +/* 01E38 80B2C038 03266821 */ addu $t5, $t9, $a2 +/* 01E3C 80B2C03C 01A77021 */ addu $t6, $t5, $a3 /* 01E40 80B2C040 AC4E0004 */ sw $t6, 0x0004($v0) ## 00000004 /* 01E44 80B2C044 8D0202C0 */ lw $v0, 0x02C0($t0) ## 000002C0 /* 01E48 80B2C048 3C18DB06 */ lui $t8, 0xDB06 ## $t8 = DB060000 @@ -406,23 +406,23 @@ glabel func_80B2BA38 /* 01E5C 80B2C05C 8CB90000 */ lw $t9, 0x0000($a1) ## 00000000 /* 01E60 80B2C060 3C030600 */ lui $v1, 0x0600 ## $v1 = 06000000 /* 01E64 80B2C064 24634EF0 */ addiu $v1, $v1, 0x4EF0 ## $v1 = 06004EF0 -/* 01E68 80B2C068 03266821 */ addu $t5, $t9, $a2 -/* 01E6C 80B2C06C 01A77021 */ addu $t6, $t5, $a3 +/* 01E68 80B2C068 03266821 */ addu $t5, $t9, $a2 +/* 01E6C 80B2C06C 01A77021 */ addu $t6, $t5, $a3 /* 01E70 80B2C070 AC4E0004 */ sw $t6, 0x0004($v0) ## 00000004 /* 01E74 80B2C074 8D0202C0 */ lw $v0, 0x02C0($t0) ## 000002C0 -/* 01E78 80B2C078 0003C900 */ sll $t9, $v1, 4 -/* 01E7C 80B2C07C 00196F02 */ srl $t5, $t9, 28 +/* 01E78 80B2C078 0003C900 */ sll $t9, $v1, 4 +/* 01E7C 80B2C07C 00196F02 */ srl $t5, $t9, 28 /* 01E80 80B2C080 244F0008 */ addiu $t7, $v0, 0x0008 ## $t7 = 00000008 /* 01E84 80B2C084 AD0F02C0 */ sw $t7, 0x02C0($t0) ## 000002C0 /* 01E88 80B2C088 3C18DB06 */ lui $t8, 0xDB06 ## $t8 = DB060000 /* 01E8C 80B2C08C 37180028 */ ori $t8, $t8, 0x0028 ## $t8 = DB060028 -/* 01E90 80B2C090 000D7080 */ sll $t6, $t5, 2 -/* 01E94 80B2C094 012E7821 */ addu $t7, $t1, $t6 +/* 01E90 80B2C090 000D7080 */ sll $t6, $t5, 2 +/* 01E94 80B2C094 012E7821 */ addu $t7, $t1, $t6 /* 01E98 80B2C098 AC580000 */ sw $t8, 0x0000($v0) ## 00000000 /* 01E9C 80B2C09C 8DF80000 */ lw $t8, 0x0000($t7) ## 00000008 -/* 01EA0 80B2C0A0 006AC824 */ and $t9, $v1, $t2 -/* 01EA4 80B2C0A4 03196821 */ addu $t5, $t8, $t9 -/* 01EA8 80B2C0A8 01A77021 */ addu $t6, $t5, $a3 +/* 01EA0 80B2C0A0 006AC824 */ and $t9, $v1, $t2 +/* 01EA4 80B2C0A4 03196821 */ addu $t5, $t8, $t9 +/* 01EA8 80B2C0A8 01A77021 */ addu $t6, $t5, $a3 /* 01EAC 80B2C0AC AC4E0004 */ sw $t6, 0x0004($v0) ## 00000004 .L80B2C0B0: /* 01EB0 80B2C0B0 8D65019C */ lw $a1, 0x019C($t3) ## 0000019C @@ -432,21 +432,21 @@ glabel func_80B2BA38 /* 01EC0 80B2C0C0 3C1880B3 */ lui $t8, %hi(func_80B2B9A4) ## $t8 = 80B30000 /* 01EC4 80B2C0C4 2718B9A4 */ addiu $t8, $t8, %lo(func_80B2B9A4) ## $t8 = 80B2B9A4 /* 01EC8 80B2C0C8 25EFB928 */ addiu $t7, $t7, %lo(func_80B2B928) ## $t7 = 80B2B928 -/* 01ECC 80B2C0CC AFAF0010 */ sw $t7, 0x0010($sp) -/* 01ED0 80B2C0D0 AFB80014 */ sw $t8, 0x0014($sp) -/* 01ED4 80B2C0D4 AFAB0018 */ sw $t3, 0x0018($sp) -/* 01ED8 80B2C0D8 0C0286B2 */ jal func_800A1AC8 -/* 01EDC 80B2C0DC 8FA400A4 */ lw $a0, 0x00A4($sp) -/* 01EE0 80B2C0E0 8FB900A4 */ lw $t9, 0x00A4($sp) +/* 01ECC 80B2C0CC AFAF0010 */ sw $t7, 0x0010($sp) +/* 01ED0 80B2C0D0 AFB80014 */ sw $t8, 0x0014($sp) +/* 01ED4 80B2C0D4 AFAB0018 */ sw $t3, 0x0018($sp) +/* 01ED8 80B2C0D8 0C0286B2 */ jal SkelAnime_DrawSV +/* 01EDC 80B2C0DC 8FA400A4 */ lw $a0, 0x00A4($sp) +/* 01EE0 80B2C0E0 8FB900A4 */ lw $t9, 0x00A4($sp) /* 01EE4 80B2C0E4 3C0680B3 */ lui $a2, %hi(D_80B2D0E4) ## $a2 = 80B30000 /* 01EE8 80B2C0E8 24C6D0E4 */ addiu $a2, $a2, %lo(D_80B2D0E4) ## $a2 = 80B2D0E4 /* 01EEC 80B2C0EC 27A4008C */ addiu $a0, $sp, 0x008C ## $a0 = FFFFFFEC /* 01EF0 80B2C0F0 2407069A */ addiu $a3, $zero, 0x069A ## $a3 = 0000069A -/* 01EF4 80B2C0F4 0C031AD5 */ jal func_800C6B54 +/* 01EF4 80B2C0F4 0C031AD5 */ jal Graph_CloseDisps /* 01EF8 80B2C0F8 8F250000 */ lw $a1, 0x0000($t9) ## 00000000 -/* 01EFC 80B2C0FC 8FBF0024 */ lw $ra, 0x0024($sp) +/* 01EFC 80B2C0FC 8FBF0024 */ lw $ra, 0x0024($sp) /* 01F00 80B2C100 27BD00A0 */ addiu $sp, $sp, 0x00A0 ## $sp = 00000000 -/* 01F04 80B2C104 03E00008 */ jr $ra +/* 01F04 80B2C104 03E00008 */ jr $ra /* 01F08 80B2C108 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Viewer/func_80B2C130.s b/asm/non_matchings/overlays/actors/ovl_En_Viewer/func_80B2C130.s index b34ef1858b..54ba88c49a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Viewer/func_80B2C130.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Viewer/func_80B2C130.s @@ -1,38 +1,38 @@ glabel func_80B2C130 /* 01F30 80B2C130 27BDFFA8 */ addiu $sp, $sp, 0xFFA8 ## $sp = FFFFFFA8 -/* 01F34 80B2C134 AFBF0024 */ sw $ra, 0x0024($sp) -/* 01F38 80B2C138 AFA40058 */ sw $a0, 0x0058($sp) -/* 01F3C 80B2C13C AFA5005C */ sw $a1, 0x005C($sp) +/* 01F34 80B2C134 AFBF0024 */ sw $ra, 0x0024($sp) +/* 01F38 80B2C138 AFA40058 */ sw $a0, 0x0058($sp) +/* 01F3C 80B2C13C AFA5005C */ sw $a1, 0x005C($sp) /* 01F40 80B2C140 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 /* 01F44 80B2C144 3C0680B3 */ lui $a2, %hi(D_80B2D0F8) ## $a2 = 80B30000 /* 01F48 80B2C148 24C6D0F8 */ addiu $a2, $a2, %lo(D_80B2D0F8) ## $a2 = 80B2D0F8 /* 01F4C 80B2C14C 27A40044 */ addiu $a0, $sp, 0x0044 ## $a0 = FFFFFFEC /* 01F50 80B2C150 240706B5 */ addiu $a3, $zero, 0x06B5 ## $a3 = 000006B5 -/* 01F54 80B2C154 0C031AB1 */ jal func_800C6AC4 -/* 01F58 80B2C158 AFA50054 */ sw $a1, 0x0054($sp) -/* 01F5C 80B2C15C 8FA30054 */ lw $v1, 0x0054($sp) +/* 01F54 80B2C154 0C031AB1 */ jal Graph_OpenDisps +/* 01F58 80B2C158 AFA50054 */ sw $a1, 0x0054($sp) +/* 01F5C 80B2C15C 8FA30054 */ lw $v1, 0x0054($sp) /* 01F60 80B2C160 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 01F64 80B2C164 24A57210 */ addiu $a1, $a1, 0x7210 ## $a1 = 06007210 /* 01F68 80B2C168 8C6202C0 */ lw $v0, 0x02C0($v1) ## 000002C0 -/* 01F6C 80B2C16C 0005C900 */ sll $t9, $a1, 4 -/* 01F70 80B2C170 8FA80058 */ lw $t0, 0x0058($sp) -/* 01F74 80B2C174 00195702 */ srl $t2, $t9, 28 +/* 01F6C 80B2C16C 0005C900 */ sll $t9, $a1, 4 +/* 01F70 80B2C170 8FA80058 */ lw $t0, 0x0058($sp) +/* 01F74 80B2C174 00195702 */ srl $t2, $t9, 28 /* 01F78 80B2C178 3C18DB06 */ lui $t8, 0xDB06 ## $t8 = DB060000 /* 01F7C 80B2C17C 3C0C8016 */ lui $t4, 0x8016 ## $t4 = 80160000 /* 01F80 80B2C180 244F0008 */ addiu $t7, $v0, 0x0008 ## $t7 = 00000008 /* 01F84 80B2C184 258C6FA8 */ addiu $t4, $t4, 0x6FA8 ## $t4 = 80166FA8 /* 01F88 80B2C188 37180020 */ ori $t8, $t8, 0x0020 ## $t8 = DB060020 -/* 01F8C 80B2C18C 000A5880 */ sll $t3, $t2, 2 +/* 01F8C 80B2C18C 000A5880 */ sll $t3, $t2, 2 /* 01F90 80B2C190 AC6F02C0 */ sw $t7, 0x02C0($v1) ## 000002C0 -/* 01F94 80B2C194 016C3021 */ addu $a2, $t3, $t4 +/* 01F94 80B2C194 016C3021 */ addu $a2, $t3, $t4 /* 01F98 80B2C198 AC580000 */ sw $t8, 0x0000($v0) ## 00000000 /* 01F9C 80B2C19C 8CCD0000 */ lw $t5, 0x0000($a2) ## 00000000 /* 01FA0 80B2C1A0 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 /* 01FA4 80B2C1A4 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF -/* 01FA8 80B2C1A8 00A13824 */ and $a3, $a1, $at +/* 01FA8 80B2C1A8 00A13824 */ and $a3, $a1, $at /* 01FAC 80B2C1AC 3C098000 */ lui $t1, 0x8000 ## $t1 = 80000000 -/* 01FB0 80B2C1B0 01A77021 */ addu $t6, $t5, $a3 -/* 01FB4 80B2C1B4 01C97821 */ addu $t7, $t6, $t1 +/* 01FB0 80B2C1B0 01A77021 */ addu $t6, $t5, $a3 +/* 01FB4 80B2C1B4 01C97821 */ addu $t7, $t6, $t1 /* 01FB8 80B2C1B8 AC4F0004 */ sw $t7, 0x0004($v0) ## 00000004 /* 01FBC 80B2C1BC 8C6202C0 */ lw $v0, 0x02C0($v1) ## 000002C0 /* 01FC0 80B2C1C0 3C19DB06 */ lui $t9, 0xDB06 ## $t9 = DB060000 @@ -43,8 +43,8 @@ glabel func_80B2C130 /* 01FD4 80B2C1D4 8CCA0000 */ lw $t2, 0x0000($a2) ## 00000000 /* 01FD8 80B2C1D8 240F00FF */ addiu $t7, $zero, 0x00FF ## $t7 = 000000FF /* 01FDC 80B2C1DC 3C0EFB00 */ lui $t6, 0xFB00 ## $t6 = FB000000 -/* 01FE0 80B2C1E0 01475821 */ addu $t3, $t2, $a3 -/* 01FE4 80B2C1E4 01696021 */ addu $t4, $t3, $t1 +/* 01FE0 80B2C1E0 01475821 */ addu $t3, $t2, $a3 +/* 01FE4 80B2C1E4 01696021 */ addu $t4, $t3, $t1 /* 01FE8 80B2C1E8 AC4C0004 */ sw $t4, 0x0004($v0) ## 00000004 /* 01FEC 80B2C1EC 8C6202C0 */ lw $v0, 0x02C0($v1) ## 000002C0 /* 01FF0 80B2C1F0 3C0A8011 */ lui $t2, 0x8011 ## $t2 = 80110000 @@ -65,21 +65,21 @@ glabel func_80B2C130 /* 0202C 80B2C22C 8D0601B8 */ lw $a2, 0x01B8($t0) ## 000001B8 /* 02030 80B2C230 8D05019C */ lw $a1, 0x019C($t0) ## 0000019C /* 02034 80B2C234 256BC10C */ addiu $t3, $t3, %lo(func_80B2C10C) ## $t3 = 80B2C10C -/* 02038 80B2C238 AFAB0010 */ sw $t3, 0x0010($sp) -/* 0203C 80B2C23C AFA00014 */ sw $zero, 0x0014($sp) -/* 02040 80B2C240 8FA4005C */ lw $a0, 0x005C($sp) -/* 02044 80B2C244 0C0286B2 */ jal func_800A1AC8 -/* 02048 80B2C248 AFA80018 */ sw $t0, 0x0018($sp) -/* 0204C 80B2C24C 8FAC005C */ lw $t4, 0x005C($sp) +/* 02038 80B2C238 AFAB0010 */ sw $t3, 0x0010($sp) +/* 0203C 80B2C23C AFA00014 */ sw $zero, 0x0014($sp) +/* 02040 80B2C240 8FA4005C */ lw $a0, 0x005C($sp) +/* 02044 80B2C244 0C0286B2 */ jal SkelAnime_DrawSV +/* 02048 80B2C248 AFA80018 */ sw $t0, 0x0018($sp) +/* 0204C 80B2C24C 8FAC005C */ lw $t4, 0x005C($sp) /* 02050 80B2C250 3C0680B3 */ lui $a2, %hi(D_80B2D10C) ## $a2 = 80B30000 /* 02054 80B2C254 24C6D10C */ addiu $a2, $a2, %lo(D_80B2D10C) ## $a2 = 80B2D10C /* 02058 80B2C258 27A40044 */ addiu $a0, $sp, 0x0044 ## $a0 = FFFFFFEC /* 0205C 80B2C25C 240706CC */ addiu $a3, $zero, 0x06CC ## $a3 = 000006CC -/* 02060 80B2C260 0C031AD5 */ jal func_800C6B54 +/* 02060 80B2C260 0C031AD5 */ jal Graph_CloseDisps /* 02064 80B2C264 8D850000 */ lw $a1, 0x0000($t4) ## 00000000 -/* 02068 80B2C268 8FBF0024 */ lw $ra, 0x0024($sp) +/* 02068 80B2C268 8FBF0024 */ lw $ra, 0x0024($sp) /* 0206C 80B2C26C 27BD0058 */ addiu $sp, $sp, 0x0058 ## $sp = 00000000 -/* 02070 80B2C270 03E00008 */ jr $ra +/* 02070 80B2C270 03E00008 */ jr $ra /* 02074 80B2C274 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Viewer/func_80B2C8AC.s b/asm/non_matchings/overlays/actors/ovl_En_Viewer/func_80B2C8AC.s index c1d0079043..aa03537982 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Viewer/func_80B2C8AC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Viewer/func_80B2C8AC.s @@ -21,7 +21,7 @@ glabel func_80B2C8AC /* 026F8 80B2C8F8 24C6D148 */ addiu $a2, $a2, %lo(D_80B2D148) ## $a2 = 80B2D148 /* 026FC 80B2C8FC 27A400B4 */ addiu $a0, $sp, 0x00B4 ## $a0 = FFFFFFE4 /* 02700 80B2C900 24070795 */ addiu $a3, $zero, 0x0795 ## $a3 = 00000795 -/* 02704 80B2C904 0C031AB1 */ jal func_800C6AC4 +/* 02704 80B2C904 0C031AB1 */ jal Graph_OpenDisps /* 02708 80B2C908 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 /* 0270C 80B2C90C 3C0180B3 */ lui $at, %hi(D_80B2D1BC) ## $at = 80B30000 /* 02710 80B2C910 C43AD1BC */ lwc1 $f26, %lo(D_80B2D1BC)($at) @@ -153,7 +153,7 @@ glabel func_80B2C8AC /* 028F0 80B2CAF0 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 028F4 80B2CAF4 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 /* 028F8 80B2CAF8 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 028FC 80B2CAFC 0C0253D0 */ jal Draw_TwoTexScroll +/* 028FC 80B2CAFC 0C0253D0 */ jal Gfx_TwoTexScroll /* 02900 80B2CB00 00408025 */ or $s0, $v0, $zero ## $s0 = 00000000 /* 02904 80B2CB04 AE020004 */ sw $v0, 0x0004($s0) ## 00000004 /* 02908 80B2CB08 8E2202D0 */ lw $v0, 0x02D0($s1) ## 000002D0 @@ -207,7 +207,7 @@ glabel func_80B2C8AC /* 029C8 80B2CBC8 24C6D170 */ addiu $a2, $a2, %lo(D_80B2D170) ## $a2 = 80B2D170 /* 029CC 80B2CBCC 27A400B4 */ addiu $a0, $sp, 0x00B4 ## $a0 = FFFFFFE4 /* 029D0 80B2CBD0 8E850000 */ lw $a1, 0x0000($s4) ## 00000000 -/* 029D4 80B2CBD4 0C031AD5 */ jal func_800C6B54 +/* 029D4 80B2CBD4 0C031AD5 */ jal Graph_CloseDisps /* 029D8 80B2CBD8 240707F2 */ addiu $a3, $zero, 0x07F2 ## $a3 = 000007F2 /* 029DC 80B2CBDC 8FBF007C */ lw $ra, 0x007C($sp) /* 029E0 80B2CBE0 D7B40038 */ ldc1 $f20, 0x0038($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Vm/EnVm_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Vm/EnVm_Draw.s index 7513cb160c..37aff2a437 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Vm/EnVm_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Vm/EnVm_Draw.s @@ -1,21 +1,21 @@ glabel EnVm_Draw /* 011B8 80B2E618 27BDFF70 */ addiu $sp, $sp, 0xFF70 ## $sp = FFFFFF70 -/* 011BC 80B2E61C AFB20028 */ sw $s2, 0x0028($sp) +/* 011BC 80B2E61C AFB20028 */ sw $s2, 0x0028($sp) /* 011C0 80B2E620 00A09025 */ or $s2, $a1, $zero ## $s2 = 00000000 -/* 011C4 80B2E624 AFBF002C */ sw $ra, 0x002C($sp) -/* 011C8 80B2E628 AFB10024 */ sw $s1, 0x0024($sp) -/* 011CC 80B2E62C AFB00020 */ sw $s0, 0x0020($sp) +/* 011C4 80B2E624 AFBF002C */ sw $ra, 0x002C($sp) +/* 011C8 80B2E628 AFB10024 */ sw $s1, 0x0024($sp) +/* 011CC 80B2E62C AFB00020 */ sw $s0, 0x0020($sp) /* 011D0 80B2E630 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 /* 011D4 80B2E634 00808825 */ or $s1, $a0, $zero ## $s1 = 00000000 /* 011D8 80B2E638 3C0680B3 */ lui $a2, %hi(D_80B2EBBC) ## $a2 = 80B30000 /* 011DC 80B2E63C 24C6EBBC */ addiu $a2, $a2, %lo(D_80B2EBBC) ## $a2 = 80B2EBBC /* 011E0 80B2E640 27A40068 */ addiu $a0, $sp, 0x0068 ## $a0 = FFFFFFD8 /* 011E4 80B2E644 240703F6 */ addiu $a3, $zero, 0x03F6 ## $a3 = 000003F6 -/* 011E8 80B2E648 0C031AB1 */ jal func_800C6AC4 +/* 011E8 80B2E648 0C031AB1 */ jal Graph_OpenDisps /* 011EC 80B2E64C 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 -/* 011F0 80B2E650 0C024F46 */ jal func_80093D18 +/* 011F0 80B2E650 0C024F46 */ jal func_80093D18 /* 011F4 80B2E654 8E440000 */ lw $a0, 0x0000($s2) ## 00000000 -/* 011F8 80B2E658 0C024F61 */ jal func_80093D84 +/* 011F8 80B2E658 0C024F61 */ jal func_80093D84 /* 011FC 80B2E65C 8E440000 */ lw $a0, 0x0000($s2) ## 00000000 /* 01200 80B2E660 3C0E80B3 */ lui $t6, %hi(func_80B2E340) ## $t6 = 80B30000 /* 01204 80B2E664 25CEE340 */ addiu $t6, $t6, %lo(func_80B2E340) ## $t6 = 80B2E340 @@ -23,10 +23,10 @@ glabel EnVm_Draw /* 0120C 80B2E66C 8E26016C */ lw $a2, 0x016C($s1) ## 0000016C /* 01210 80B2E670 3C0780B3 */ lui $a3, %hi(func_80B2E2D8) ## $a3 = 80B30000 /* 01214 80B2E674 24E7E2D8 */ addiu $a3, $a3, %lo(func_80B2E2D8) ## $a3 = 80B2E2D8 -/* 01218 80B2E678 AFB10014 */ sw $s1, 0x0014($sp) -/* 0121C 80B2E67C AFAE0010 */ sw $t6, 0x0010($sp) +/* 01218 80B2E678 AFB10014 */ sw $s1, 0x0014($sp) +/* 0121C 80B2E67C AFAE0010 */ sw $t6, 0x0010($sp) /* 01220 80B2E680 0C028572 */ jal SkelAnime_Draw - + /* 01224 80B2E684 02402025 */ or $a0, $s2, $zero ## $a0 = 00000000 /* 01228 80B2E688 8E380024 */ lw $t8, 0x0024($s1) ## 00000024 /* 0122C 80B2E68C 27A4007C */ addiu $a0, $sp, 0x007C ## $a0 = FFFFFFEC @@ -38,25 +38,25 @@ glabel EnVm_Draw /* 01244 80B2E6A4 AC8F0004 */ sw $t7, 0x0004($a0) ## FFFFFFF0 /* 01248 80B2E6A8 8E38002C */ lw $t8, 0x002C($s1) ## 0000002C /* 0124C 80B2E6AC 02403825 */ or $a3, $s2, $zero ## $a3 = 00000000 -/* 01250 80B2E6B0 0C00CF0C */ jal func_80033C30 +/* 01250 80B2E6B0 0C00CF0C */ jal func_80033C30 /* 01254 80B2E6B4 AC980008 */ sw $t8, 0x0008($a0) ## FFFFFFF4 /* 01258 80B2E6B8 86390260 */ lh $t9, 0x0260($s1) ## 00000260 /* 0125C 80B2E6BC 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 01260 80B2E6C0 2B210003 */ slti $at, $t9, 0x0003 -/* 01264 80B2E6C4 14200088 */ bne $at, $zero, .L80B2E8E8 +/* 01260 80B2E6C0 2B210003 */ slti $at, $t9, 0x0003 +/* 01264 80B2E6C4 14200088 */ bne $at, $zero, .L80B2E8E8 /* 01268 80B2E6C8 3C014120 */ lui $at, 0x4120 ## $at = 41200000 /* 0126C 80B2E6CC 44813000 */ mtc1 $at, $f6 ## $f6 = 10.00 /* 01270 80B2E6D0 C6240240 */ lwc1 $f4, 0x0240($s1) ## 00000240 /* 01274 80B2E6D4 C62C023C */ lwc1 $f12, 0x023C($s1) ## 0000023C /* 01278 80B2E6D8 8E260244 */ lw $a2, 0x0244($s1) ## 00000244 -/* 0127C 80B2E6DC 0C034261 */ jal Matrix_Translate -/* 01280 80B2E6E0 46062380 */ add.s $f14, $f4, $f6 +/* 0127C 80B2E6DC 0C034261 */ jal Matrix_Translate +/* 01280 80B2E6E0 46062380 */ add.s $f14, $f4, $f6 /* 01284 80B2E6E4 3C0180B3 */ lui $at, %hi(D_80B2EC30) ## $at = 80B30000 -/* 01288 80B2E6E8 C42CEC30 */ lwc1 $f12, %lo(D_80B2EC30)($at) +/* 01288 80B2E6E8 C42CEC30 */ lwc1 $f12, %lo(D_80B2EC30)($at) /* 0128C 80B2E6EC 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 01290 80B2E6F0 44066000 */ mfc1 $a2, $f12 -/* 01294 80B2E6F4 0C0342A3 */ jal Matrix_Scale -/* 01298 80B2E6F8 46006386 */ mov.s $f14, $f12 +/* 01290 80B2E6F0 44066000 */ mfc1 $a2, $f12 +/* 01294 80B2E6F4 0C0342A3 */ jal Matrix_Scale +/* 01298 80B2E6F8 46006386 */ mov.s $f14, $f12 /* 0129C 80B2E6FC 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 /* 012A0 80B2E700 3C0ADA38 */ lui $t2, 0xDA38 ## $t2 = DA380000 /* 012A4 80B2E704 354A0003 */ ori $t2, $t2, 0x0003 ## $t2 = DA380003 @@ -67,9 +67,9 @@ glabel EnVm_Draw /* 012B8 80B2E718 3C0580B3 */ lui $a1, %hi(D_80B2EBCC) ## $a1 = 80B30000 /* 012BC 80B2E71C 24A5EBCC */ addiu $a1, $a1, %lo(D_80B2EBCC) ## $a1 = 80B2EBCC /* 012C0 80B2E720 24060409 */ addiu $a2, $zero, 0x0409 ## $a2 = 00000409 -/* 012C4 80B2E724 0C0346A2 */ jal Matrix_NewMtx -/* 012C8 80B2E728 AFA20064 */ sw $v0, 0x0064($sp) -/* 012CC 80B2E72C 8FA30064 */ lw $v1, 0x0064($sp) +/* 012C4 80B2E724 0C0346A2 */ jal Matrix_NewMtx +/* 012C8 80B2E728 AFA20064 */ sw $v0, 0x0064($sp) +/* 012CC 80B2E72C 8FA30064 */ lw $v1, 0x0064($sp) /* 012D0 80B2E730 3C0CFA00 */ lui $t4, 0xFA00 ## $t4 = FA000000 /* 012D4 80B2E734 240DFFA8 */ addiu $t5, $zero, 0xFFA8 ## $t5 = FFFFFFA8 /* 012D8 80B2E738 AC620004 */ sw $v0, 0x0004($v1) ## 00000004 @@ -78,7 +78,7 @@ glabel EnVm_Draw /* 012E4 80B2E744 AE0B02D0 */ sw $t3, 0x02D0($s0) ## 000002D0 /* 012E8 80B2E748 AC4D0004 */ sw $t5, 0x0004($v0) ## 00000004 /* 012EC 80B2E74C AC4C0000 */ sw $t4, 0x0000($v0) ## 00000000 -/* 012F0 80B2E750 0C0252F1 */ jal func_80094BC4 +/* 012F0 80B2E750 0C0252F1 */ jal func_80094BC4 /* 012F4 80B2E754 8E440000 */ lw $a0, 0x0000($s2) ## 00000000 /* 012F8 80B2E758 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 /* 012FC 80B2E75C 3C0FFB00 */ lui $t7, 0xFB00 ## $t7 = FB000000 @@ -93,26 +93,26 @@ glabel EnVm_Draw /* 01320 80B2E780 24590008 */ addiu $t9, $v0, 0x0008 ## $t9 = 00000008 /* 01324 80B2E784 AE1902D0 */ sw $t9, 0x02D0($s0) ## 000002D0 /* 01328 80B2E788 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 0132C 80B2E78C 02414021 */ addu $t0, $s2, $at +/* 0132C 80B2E78C 02414021 */ addu $t0, $s2, $at /* 01330 80B2E790 AC490000 */ sw $t1, 0x0000($v0) ## 00000000 /* 01334 80B2E794 8D0A1DE4 */ lw $t2, 0x1DE4($t0) ## 00001DE4 /* 01338 80B2E798 3C0480B3 */ lui $a0, %hi(D_80B2EB88) ## $a0 = 80B30000 /* 0133C 80B2E79C 3C198016 */ lui $t9, 0x8016 ## $t9 = 80160000 /* 01340 80B2E7A0 314B0007 */ andi $t3, $t2, 0x0007 ## $t3 = 00000000 -/* 01344 80B2E7A4 000B6080 */ sll $t4, $t3, 2 -/* 01348 80B2E7A8 008C2021 */ addu $a0, $a0, $t4 -/* 0134C 80B2E7AC 8C84EB88 */ lw $a0, %lo(D_80B2EB88)($a0) +/* 01344 80B2E7A4 000B6080 */ sll $t4, $t3, 2 +/* 01348 80B2E7A8 008C2021 */ addu $a0, $a0, $t4 +/* 0134C 80B2E7AC 8C84EB88 */ lw $a0, %lo(D_80B2EB88)($a0) /* 01350 80B2E7B0 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 /* 01354 80B2E7B4 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF -/* 01358 80B2E7B8 00047100 */ sll $t6, $a0, 4 -/* 0135C 80B2E7BC 000E7F02 */ srl $t7, $t6, 28 -/* 01360 80B2E7C0 000FC080 */ sll $t8, $t7, 2 -/* 01364 80B2E7C4 0338C821 */ addu $t9, $t9, $t8 +/* 01358 80B2E7B8 00047100 */ sll $t6, $a0, 4 +/* 0135C 80B2E7BC 000E7F02 */ srl $t7, $t6, 28 +/* 01360 80B2E7C0 000FC080 */ sll $t8, $t7, 2 +/* 01364 80B2E7C4 0338C821 */ addu $t9, $t9, $t8 /* 01368 80B2E7C8 8F396FA8 */ lw $t9, 0x6FA8($t9) ## 80166FA8 -/* 0136C 80B2E7CC 00816824 */ and $t5, $a0, $at +/* 0136C 80B2E7CC 00816824 */ and $t5, $a0, $at /* 01370 80B2E7D0 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 01374 80B2E7D4 01B94821 */ addu $t1, $t5, $t9 -/* 01378 80B2E7D8 01215021 */ addu $t2, $t1, $at +/* 01374 80B2E7D4 01B94821 */ addu $t1, $t5, $t9 +/* 01378 80B2E7D8 01215021 */ addu $t2, $t1, $at /* 0137C 80B2E7DC AC4A0004 */ sw $t2, 0x0004($v0) ## 00000004 /* 01380 80B2E7E0 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 /* 01384 80B2E7E4 3C070403 */ lui $a3, 0x0403 ## $a3 = 04030000 @@ -123,14 +123,14 @@ glabel EnVm_Draw /* 01398 80B2E7F8 AC4C0000 */ sw $t4, 0x0000($v0) ## 00000000 /* 0139C 80B2E7FC AC470004 */ sw $a3, 0x0004($v0) ## 00000004 /* 013A0 80B2E800 3C0180B3 */ lui $at, %hi(D_80B2EC34) ## $at = 80B30000 -/* 013A4 80B2E804 C42CEC34 */ lwc1 $f12, %lo(D_80B2EC34)($at) -/* 013A8 80B2E808 AFA80034 */ sw $t0, 0x0034($sp) -/* 013AC 80B2E80C AFA70038 */ sw $a3, 0x0038($sp) -/* 013B0 80B2E810 0C034348 */ jal Matrix_RotateY +/* 013A4 80B2E804 C42CEC34 */ lwc1 $f12, %lo(D_80B2EC34)($at) +/* 013A8 80B2E808 AFA80034 */ sw $t0, 0x0034($sp) +/* 013AC 80B2E80C AFA70038 */ sw $a3, 0x0038($sp) +/* 013B0 80B2E810 0C034348 */ jal Matrix_RotateY /* 013B4 80B2E814 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 /* 013B8 80B2E818 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 013BC 80B2E81C 8FA70038 */ lw $a3, 0x0038($sp) -/* 013C0 80B2E820 8FA80034 */ lw $t0, 0x0034($sp) +/* 013BC 80B2E81C 8FA70038 */ lw $a3, 0x0038($sp) +/* 013C0 80B2E820 8FA80034 */ lw $t0, 0x0034($sp) /* 013C4 80B2E824 3C0FDA38 */ lui $t7, 0xDA38 ## $t7 = DA380000 /* 013C8 80B2E828 244E0008 */ addiu $t6, $v0, 0x0008 ## $t6 = 00000008 /* 013CC 80B2E82C AE0E02D0 */ sw $t6, 0x02D0($s0) ## 000002D0 @@ -140,13 +140,13 @@ glabel EnVm_Draw /* 013DC 80B2E83C 3C0580B3 */ lui $a1, %hi(D_80B2EBDC) ## $a1 = 80B30000 /* 013E0 80B2E840 24A5EBDC */ addiu $a1, $a1, %lo(D_80B2EBDC) ## $a1 = 80B2EBDC /* 013E4 80B2E844 24060414 */ addiu $a2, $zero, 0x0414 ## $a2 = 00000414 -/* 013E8 80B2E848 AFA20050 */ sw $v0, 0x0050($sp) -/* 013EC 80B2E84C AFA70038 */ sw $a3, 0x0038($sp) -/* 013F0 80B2E850 0C0346A2 */ jal Matrix_NewMtx -/* 013F4 80B2E854 AFA80034 */ sw $t0, 0x0034($sp) -/* 013F8 80B2E858 8FA30050 */ lw $v1, 0x0050($sp) -/* 013FC 80B2E85C 8FA70038 */ lw $a3, 0x0038($sp) -/* 01400 80B2E860 8FA80034 */ lw $t0, 0x0034($sp) +/* 013E8 80B2E848 AFA20050 */ sw $v0, 0x0050($sp) +/* 013EC 80B2E84C AFA70038 */ sw $a3, 0x0038($sp) +/* 013F0 80B2E850 0C0346A2 */ jal Matrix_NewMtx +/* 013F4 80B2E854 AFA80034 */ sw $t0, 0x0034($sp) +/* 013F8 80B2E858 8FA30050 */ lw $v1, 0x0050($sp) +/* 013FC 80B2E85C 8FA70038 */ lw $a3, 0x0038($sp) +/* 01400 80B2E860 8FA80034 */ lw $t0, 0x0034($sp) /* 01404 80B2E864 AC620004 */ sw $v0, 0x0004($v1) ## 00000004 /* 01408 80B2E868 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 /* 0140C 80B2E86C 3C0DDB06 */ lui $t5, 0xDB06 ## $t5 = DB060000 @@ -159,20 +159,20 @@ glabel EnVm_Draw /* 01428 80B2E888 3C0D8016 */ lui $t5, 0x8016 ## $t5 = 80160000 /* 0142C 80B2E88C 27290004 */ addiu $t1, $t9, 0x0004 ## $t1 = 00000004 /* 01430 80B2E890 312A0007 */ andi $t2, $t1, 0x0007 ## $t2 = 00000004 -/* 01434 80B2E894 000A5880 */ sll $t3, $t2, 2 -/* 01438 80B2E898 008B2021 */ addu $a0, $a0, $t3 -/* 0143C 80B2E89C 8C84EB88 */ lw $a0, %lo(D_80B2EB88)($a0) +/* 01434 80B2E894 000A5880 */ sll $t3, $t2, 2 +/* 01438 80B2E898 008B2021 */ addu $a0, $a0, $t3 +/* 0143C 80B2E89C 8C84EB88 */ lw $a0, %lo(D_80B2EB88)($a0) /* 01440 80B2E8A0 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 /* 01444 80B2E8A4 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF -/* 01448 80B2E8A8 00047100 */ sll $t6, $a0, 4 -/* 0144C 80B2E8AC 000E7F02 */ srl $t7, $t6, 28 -/* 01450 80B2E8B0 000FC080 */ sll $t8, $t7, 2 -/* 01454 80B2E8B4 01B86821 */ addu $t5, $t5, $t8 +/* 01448 80B2E8A8 00047100 */ sll $t6, $a0, 4 +/* 0144C 80B2E8AC 000E7F02 */ srl $t7, $t6, 28 +/* 01450 80B2E8B0 000FC080 */ sll $t8, $t7, 2 +/* 01454 80B2E8B4 01B86821 */ addu $t5, $t5, $t8 /* 01458 80B2E8B8 8DAD6FA8 */ lw $t5, 0x6FA8($t5) ## 80166FA8 -/* 0145C 80B2E8BC 00816024 */ and $t4, $a0, $at +/* 0145C 80B2E8BC 00816024 */ and $t4, $a0, $at /* 01460 80B2E8C0 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 01464 80B2E8C4 018DC821 */ addu $t9, $t4, $t5 -/* 01468 80B2E8C8 03214821 */ addu $t1, $t9, $at +/* 01464 80B2E8C4 018DC821 */ addu $t9, $t4, $t5 +/* 01468 80B2E8C8 03214821 */ addu $t1, $t9, $at /* 0146C 80B2E8CC AC490004 */ sw $t1, 0x0004($v0) ## 00000004 /* 01470 80B2E8D0 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 /* 01474 80B2E8D4 3C0BDE00 */ lui $t3, 0xDE00 ## $t3 = DE000000 @@ -190,32 +190,32 @@ glabel EnVm_Draw /* 014A0 80B2E900 8626025A */ lh $a2, 0x025A($s1) ## 0000025A /* 014A4 80B2E904 8E440000 */ lw $a0, 0x0000($s2) ## 00000000 /* 014A8 80B2E908 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 014AC 80B2E90C 0C02539E */ jal func_80094E78 -/* 014B0 80B2E910 AFA20044 */ sw $v0, 0x0044($sp) -/* 014B4 80B2E914 8FA30044 */ lw $v1, 0x0044($sp) +/* 014AC 80B2E90C 0C02539E */ jal func_80094E78 +/* 014B0 80B2E910 AFA20044 */ sw $v0, 0x0044($sp) +/* 014B4 80B2E914 8FA30044 */ lw $v1, 0x0044($sp) /* 014B8 80B2E918 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 /* 014BC 80B2E91C AC620004 */ sw $v0, 0x0004($v1) ## 00000004 /* 014C0 80B2E920 8E26022C */ lw $a2, 0x022C($s1) ## 0000022C /* 014C4 80B2E924 C62E0228 */ lwc1 $f14, 0x0228($s1) ## 00000228 -/* 014C8 80B2E928 0C034261 */ jal Matrix_Translate +/* 014C8 80B2E928 0C034261 */ jal Matrix_Translate /* 014CC 80B2E92C C62C0224 */ lwc1 $f12, 0x0224($s1) ## 00000224 /* 014D0 80B2E930 86240254 */ lh $a0, 0x0254($s1) ## 00000254 /* 014D4 80B2E934 86250256 */ lh $a1, 0x0256($s1) ## 00000256 /* 014D8 80B2E938 86260258 */ lh $a2, 0x0258($s1) ## 00000258 -/* 014DC 80B2E93C 0C034421 */ jal Matrix_RotateXYZ +/* 014DC 80B2E93C 0C034421 */ jal Matrix_RotateZYX /* 014E0 80B2E940 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 /* 014E4 80B2E944 3C0180B3 */ lui $at, %hi(D_80B2EC38) ## $at = 80B30000 -/* 014E8 80B2E948 C42AEC38 */ lwc1 $f10, %lo(D_80B2EC38)($at) +/* 014E8 80B2E948 C42AEC38 */ lwc1 $f10, %lo(D_80B2EC38)($at) /* 014EC 80B2E94C C6280248 */ lwc1 $f8, 0x0248($s1) ## 00000248 /* 014F0 80B2E950 3C0180B3 */ lui $at, %hi(D_80B2EC3C) ## $at = 80B30000 -/* 014F4 80B2E954 C432EC3C */ lwc1 $f18, %lo(D_80B2EC3C)($at) -/* 014F8 80B2E958 460A4302 */ mul.s $f12, $f8, $f10 +/* 014F4 80B2E954 C432EC3C */ lwc1 $f18, %lo(D_80B2EC3C)($at) +/* 014F8 80B2E958 460A4302 */ mul.s $f12, $f8, $f10 /* 014FC 80B2E95C C6300250 */ lwc1 $f16, 0x0250($s1) ## 00000250 /* 01500 80B2E960 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 01504 80B2E964 46128102 */ mul.s $f4, $f16, $f18 -/* 01508 80B2E968 46006386 */ mov.s $f14, $f12 -/* 0150C 80B2E96C 44062000 */ mfc1 $a2, $f4 -/* 01510 80B2E970 0C0342A3 */ jal Matrix_Scale +/* 01504 80B2E964 46128102 */ mul.s $f4, $f16, $f18 +/* 01508 80B2E968 46006386 */ mov.s $f14, $f12 +/* 0150C 80B2E96C 44062000 */ mfc1 $a2, $f4 +/* 01510 80B2E970 0C0342A3 */ jal Matrix_Scale /* 01514 80B2E974 00000000 */ nop /* 01518 80B2E978 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 /* 0151C 80B2E97C 3C0CDA38 */ lui $t4, 0xDA38 ## $t4 = DA380000 @@ -227,7 +227,7 @@ glabel EnVm_Draw /* 01534 80B2E994 8E440000 */ lw $a0, 0x0000($s2) ## 00000000 /* 01538 80B2E998 24A5EBEC */ addiu $a1, $a1, %lo(D_80B2EBEC) ## $a1 = 80B2EBEC /* 0153C 80B2E99C 24060427 */ addiu $a2, $zero, 0x0427 ## $a2 = 00000427 -/* 01540 80B2E9A0 0C0346A2 */ jal Matrix_NewMtx +/* 01540 80B2E9A0 0C0346A2 */ jal Matrix_NewMtx /* 01544 80B2E9A4 00408825 */ or $s1, $v0, $zero ## $s1 = 00000000 /* 01548 80B2E9A8 AE220004 */ sw $v0, 0x0004($s1) ## 00000004 /* 0154C 80B2E9AC 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 @@ -242,13 +242,13 @@ glabel EnVm_Draw /* 01570 80B2E9D0 8E450000 */ lw $a1, 0x0000($s2) ## 00000000 /* 01574 80B2E9D4 24C6EBFC */ addiu $a2, $a2, %lo(D_80B2EBFC) ## $a2 = 80B2EBFC /* 01578 80B2E9D8 27A40068 */ addiu $a0, $sp, 0x0068 ## $a0 = FFFFFFD8 -/* 0157C 80B2E9DC 0C031AD5 */ jal func_800C6B54 +/* 0157C 80B2E9DC 0C031AD5 */ jal Graph_CloseDisps /* 01580 80B2E9E0 2407042C */ addiu $a3, $zero, 0x042C ## $a3 = 0000042C -/* 01584 80B2E9E4 8FBF002C */ lw $ra, 0x002C($sp) -/* 01588 80B2E9E8 8FB00020 */ lw $s0, 0x0020($sp) -/* 0158C 80B2E9EC 8FB10024 */ lw $s1, 0x0024($sp) -/* 01590 80B2E9F0 8FB20028 */ lw $s2, 0x0028($sp) -/* 01594 80B2E9F4 03E00008 */ jr $ra +/* 01584 80B2E9E4 8FBF002C */ lw $ra, 0x002C($sp) +/* 01588 80B2E9E8 8FB00020 */ lw $s0, 0x0020($sp) +/* 0158C 80B2E9EC 8FB10024 */ lw $s1, 0x0024($sp) +/* 01590 80B2E9F0 8FB20028 */ lw $s2, 0x0028($sp) +/* 01594 80B2E9F4 03E00008 */ jr $ra /* 01598 80B2E9F8 27BD0090 */ addiu $sp, $sp, 0x0090 ## $sp = 00000000 /* 0159C 80B2E9FC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Vm/func_80B2D600.s b/asm/non_matchings/overlays/actors/ovl_En_Vm/func_80B2D600.s index a88cee92f4..f36bbcb34f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Vm/func_80B2D600.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Vm/func_80B2D600.s @@ -1,26 +1,26 @@ glabel func_80B2D600 /* 001A0 80B2D600 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 001A4 80B2D604 AFB00028 */ sw $s0, 0x0028($sp) +/* 001A4 80B2D604 AFB00028 */ sw $s0, 0x0028($sp) /* 001A8 80B2D608 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 001AC 80B2D60C AFBF002C */ sw $ra, 0x002C($sp) +/* 001AC 80B2D60C AFBF002C */ sw $ra, 0x002C($sp) /* 001B0 80B2D610 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 /* 001B4 80B2D614 0C028800 */ jal SkelAnime_GetFrameCount - + /* 001B8 80B2D618 24840068 */ addiu $a0, $a0, 0x0068 ## $a0 = 06000068 /* 001BC 80B2D61C 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 001C0 80B2D620 44803000 */ mtc1 $zero, $f6 ## $f6 = 0.00 /* 001C4 80B2D624 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 001C8 80B2D628 46802020 */ cvt.s.w $f0, $f4 +/* 001C8 80B2D628 46802020 */ cvt.s.w $f0, $f4 /* 001CC 80B2D62C 240E0002 */ addiu $t6, $zero, 0x0002 ## $t6 = 00000002 -/* 001D0 80B2D630 AFAE0014 */ sw $t6, 0x0014($sp) +/* 001D0 80B2D630 AFAE0014 */ sw $t6, 0x0014($sp) /* 001D4 80B2D634 24A50068 */ addiu $a1, $a1, 0x0068 ## $a1 = 06000068 /* 001D8 80B2D638 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C /* 001DC 80B2D63C 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 001E0 80B2D640 44070000 */ mfc1 $a3, $f0 -/* 001E4 80B2D644 E7A00010 */ swc1 $f0, 0x0010($sp) -/* 001E8 80B2D648 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 001EC 80B2D64C E7A60018 */ swc1 $f6, 0x0018($sp) +/* 001E0 80B2D640 44070000 */ mfc1 $a3, $f0 +/* 001E4 80B2D644 E7A00010 */ swc1 $f0, 0x0010($sp) +/* 001E8 80B2D648 0C029468 */ jal SkelAnime_ChangeAnim + +/* 001EC 80B2D64C E7A60018 */ swc1 $f6, 0x0018($sp) /* 001F0 80B2D650 A6000260 */ sh $zero, 0x0260($s0) ## 00000260 /* 001F4 80B2D654 860F0260 */ lh $t7, 0x0260($s0) ## 00000260 /* 001F8 80B2D658 2418000A */ addiu $t8, $zero, 0x000A ## $t8 = 0000000A @@ -29,12 +29,12 @@ glabel func_80B2D600 /* 00204 80B2D664 AE180220 */ sw $t8, 0x0220($s0) ## 00000220 /* 00208 80B2D668 24A5D68C */ addiu $a1, $a1, %lo(func_80B2D68C) ## $a1 = 80B2D68C /* 0020C 80B2D66C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00210 80B2D670 0C2CB518 */ jal func_80B2D460 +/* 00210 80B2D670 0C2CB518 */ jal func_80B2D460 /* 00214 80B2D674 A60F025E */ sh $t7, 0x025E($s0) ## 0000025E -/* 00218 80B2D678 8FBF002C */ lw $ra, 0x002C($sp) -/* 0021C 80B2D67C 8FB00028 */ lw $s0, 0x0028($sp) +/* 00218 80B2D678 8FBF002C */ lw $ra, 0x002C($sp) +/* 0021C 80B2D67C 8FB00028 */ lw $s0, 0x0028($sp) /* 00220 80B2D680 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 00224 80B2D684 03E00008 */ jr $ra +/* 00224 80B2D684 03E00008 */ jr $ra /* 00228 80B2D688 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Vm/func_80B2D9D8.s b/asm/non_matchings/overlays/actors/ovl_En_Vm/func_80B2D9D8.s index b3551ba8bb..c2ce6d2382 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Vm/func_80B2D9D8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Vm/func_80B2D9D8.s @@ -5,24 +5,24 @@ glabel func_80B2D9D8 /* 00584 80B2D9E4 3C0140E0 */ lui $at, 0x40E0 ## $at = 40E00000 /* 00588 80B2D9E8 44812000 */ mtc1 $at, $f4 ## $f4 = 7.00 /* 0058C 80B2D9EC 44803000 */ mtc1 $zero, $f6 ## $f6 = 0.00 -/* 00590 80B2D9F0 AFB00028 */ sw $s0, 0x0028($sp) +/* 00590 80B2D9F0 AFB00028 */ sw $s0, 0x0028($sp) /* 00594 80B2D9F4 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00598 80B2D9F8 AFBF002C */ sw $ra, 0x002C($sp) +/* 00598 80B2D9F8 AFBF002C */ sw $ra, 0x002C($sp) /* 0059C 80B2D9FC 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 005A0 80B2DA00 240E0002 */ addiu $t6, $zero, 0x0002 ## $t6 = 00000002 -/* 005A4 80B2DA04 44060000 */ mfc1 $a2, $f0 -/* 005A8 80B2DA08 44070000 */ mfc1 $a3, $f0 -/* 005AC 80B2DA0C AFAE0014 */ sw $t6, 0x0014($sp) +/* 005A4 80B2DA04 44060000 */ mfc1 $a2, $f0 +/* 005A8 80B2DA08 44070000 */ mfc1 $a3, $f0 +/* 005AC 80B2DA0C AFAE0014 */ sw $t6, 0x0014($sp) /* 005B0 80B2DA10 24A50068 */ addiu $a1, $a1, 0x0068 ## $a1 = 06000068 /* 005B4 80B2DA14 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 005B8 80B2DA18 E7A40010 */ swc1 $f4, 0x0010($sp) -/* 005BC 80B2DA1C 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 005C0 80B2DA20 E7A60018 */ swc1 $f6, 0x0018($sp) +/* 005B8 80B2DA18 E7A40010 */ swc1 $f4, 0x0010($sp) +/* 005BC 80B2DA1C 0C029468 */ jal SkelAnime_ChangeAnim + +/* 005C0 80B2DA20 E7A60018 */ swc1 $f6, 0x0018($sp) /* 005C4 80B2DA24 240F0131 */ addiu $t7, $zero, 0x0131 ## $t7 = 00000131 /* 005C8 80B2DA28 AE0F0220 */ sw $t7, 0x0220($s0) ## 00000220 /* 005CC 80B2DA2C 3C0180B3 */ lui $at, %hi(D_80B2EC0C) ## $at = 80B30000 -/* 005D0 80B2DA30 C428EC0C */ lwc1 $f8, %lo(D_80B2EC0C)($at) +/* 005D0 80B2DA30 C428EC0C */ lwc1 $f8, %lo(D_80B2EC0C)($at) /* 005D4 80B2DA34 921902C4 */ lbu $t9, 0x02C4($s0) ## 000002C4 /* 005D8 80B2DA38 3C014220 */ lui $at, 0x4220 ## $at = 42200000 /* 005DC 80B2DA3C 44815000 */ mtc1 $at, $f10 ## $f10 = 40.00 @@ -34,12 +34,12 @@ glabel func_80B2D9D8 /* 005F4 80B2DA54 24A5DA7C */ addiu $a1, $a1, %lo(func_80B2DA7C) ## $a1 = 80B2DA7C /* 005F8 80B2DA58 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 005FC 80B2DA5C E6080248 */ swc1 $f8, 0x0248($s0) ## 00000248 -/* 00600 80B2DA60 0C2CB518 */ jal func_80B2D460 +/* 00600 80B2DA60 0C2CB518 */ jal func_80B2D460 /* 00604 80B2DA64 E60A0264 */ swc1 $f10, 0x0264($s0) ## 00000264 -/* 00608 80B2DA68 8FBF002C */ lw $ra, 0x002C($sp) -/* 0060C 80B2DA6C 8FB00028 */ lw $s0, 0x0028($sp) +/* 00608 80B2DA68 8FBF002C */ lw $ra, 0x002C($sp) +/* 0060C 80B2DA6C 8FB00028 */ lw $s0, 0x0028($sp) /* 00610 80B2DA70 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 00614 80B2DA74 03E00008 */ jr $ra +/* 00614 80B2DA74 03E00008 */ jr $ra /* 00618 80B2DA78 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Vm/func_80B2DCC8.s b/asm/non_matchings/overlays/actors/ovl_En_Vm/func_80B2DCC8.s index d0eb016fce..3b2b00a009 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Vm/func_80B2DCC8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Vm/func_80B2DCC8.s @@ -1,26 +1,26 @@ glabel func_80B2DCC8 /* 00868 80B2DCC8 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 0086C 80B2DCCC AFB00028 */ sw $s0, 0x0028($sp) +/* 0086C 80B2DCCC AFB00028 */ sw $s0, 0x0028($sp) /* 00870 80B2DCD0 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00874 80B2DCD4 AFBF002C */ sw $ra, 0x002C($sp) +/* 00874 80B2DCD4 AFBF002C */ sw $ra, 0x002C($sp) /* 00878 80B2DCD8 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 /* 0087C 80B2DCDC 0C028800 */ jal SkelAnime_GetFrameCount - + /* 00880 80B2DCE0 24840068 */ addiu $a0, $a0, 0x0068 ## $a0 = 06000068 /* 00884 80B2DCE4 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 00888 80B2DCE8 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 /* 0088C 80B2DCEC 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 00890 80B2DCF0 46802120 */ cvt.s.w $f4, $f4 +/* 00890 80B2DCF0 46802120 */ cvt.s.w $f4, $f4 /* 00894 80B2DCF4 240E0002 */ addiu $t6, $zero, 0x0002 ## $t6 = 00000002 -/* 00898 80B2DCF8 AFAE0014 */ sw $t6, 0x0014($sp) +/* 00898 80B2DCF8 AFAE0014 */ sw $t6, 0x0014($sp) /* 0089C 80B2DCFC 24A50068 */ addiu $a1, $a1, 0x0068 ## $a1 = 06000068 /* 008A0 80B2DD00 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C /* 008A4 80B2DD04 3C06BF80 */ lui $a2, 0xBF80 ## $a2 = BF800000 -/* 008A8 80B2DD08 44072000 */ mfc1 $a3, $f4 -/* 008AC 80B2DD0C E7A00010 */ swc1 $f0, 0x0010($sp) -/* 008B0 80B2DD10 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 008B4 80B2DD14 E7A00018 */ swc1 $f0, 0x0018($sp) +/* 008A8 80B2DD08 44072000 */ mfc1 $a3, $f4 +/* 008AC 80B2DD0C E7A00010 */ swc1 $f0, 0x0010($sp) +/* 008B0 80B2DD10 0C029468 */ jal SkelAnime_ChangeAnim + +/* 008B4 80B2DD14 E7A00018 */ swc1 $f0, 0x0018($sp) /* 008B8 80B2DD18 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 /* 008BC 80B2DD1C A6000260 */ sh $zero, 0x0260($s0) ## 00000260 /* 008C0 80B2DD20 86180260 */ lh $t8, 0x0260($s0) ## 00000260 @@ -33,16 +33,16 @@ glabel func_80B2DCC8 /* 008DC 80B2DD3C E6000250 */ swc1 $f0, 0x0250($s0) ## 00000250 /* 008E0 80B2DD40 E600024C */ swc1 $f0, 0x024C($s0) ## 0000024C /* 008E4 80B2DD44 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 008E8 80B2DD48 A618025E */ sh $t8, 0x025E($s0) ## 0000025E /* 008EC 80B2DD4C 3C0580B3 */ lui $a1, %hi(func_80B2DD70) ## $a1 = 80B30000 /* 008F0 80B2DD50 24A5DD70 */ addiu $a1, $a1, %lo(func_80B2DD70) ## $a1 = 80B2DD70 -/* 008F4 80B2DD54 0C2CB518 */ jal func_80B2D460 +/* 008F4 80B2DD54 0C2CB518 */ jal func_80B2D460 /* 008F8 80B2DD58 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 008FC 80B2DD5C 8FBF002C */ lw $ra, 0x002C($sp) -/* 00900 80B2DD60 8FB00028 */ lw $s0, 0x0028($sp) +/* 008FC 80B2DD5C 8FBF002C */ lw $ra, 0x002C($sp) +/* 00900 80B2DD60 8FB00028 */ lw $s0, 0x0028($sp) /* 00904 80B2DD64 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 00908 80B2DD68 03E00008 */ jr $ra +/* 00908 80B2DD68 03E00008 */ jr $ra /* 0090C 80B2DD6C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Vm/func_80B2DD70.s b/asm/non_matchings/overlays/actors/ovl_En_Vm/func_80B2DD70.s index deedbac7fb..54c8b50220 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Vm/func_80B2DD70.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Vm/func_80B2DD70.s @@ -1,80 +1,80 @@ glabel func_80B2DD70 /* 00910 80B2DD70 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 00914 80B2DD74 AFBF002C */ sw $ra, 0x002C($sp) -/* 00918 80B2DD78 AFB00028 */ sw $s0, 0x0028($sp) -/* 0091C 80B2DD7C AFA5003C */ sw $a1, 0x003C($sp) +/* 00914 80B2DD74 AFBF002C */ sw $ra, 0x002C($sp) +/* 00918 80B2DD78 AFB00028 */ sw $s0, 0x0028($sp) +/* 0091C 80B2DD7C AFA5003C */ sw $a1, 0x003C($sp) /* 00920 80B2DD80 8C8E0220 */ lw $t6, 0x0220($a0) ## 00000220 /* 00924 80B2DD84 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 00928 80B2DD88 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 0092C 80B2DD8C 15C0002D */ bne $t6, $zero, .L80B2DE44 +/* 0092C 80B2DD8C 15C0002D */ bne $t6, $zero, .L80B2DE44 /* 00930 80B2DD90 2406000A */ addiu $a2, $zero, 0x000A ## $a2 = 0000000A /* 00934 80B2DD94 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C /* 00938 80B2DD98 0C02927F */ jal SkelAnime_FrameUpdateMatrix - -/* 0093C 80B2DD9C AFA40030 */ sw $a0, 0x0030($sp) -/* 00940 80B2DDA0 50400032 */ beql $v0, $zero, .L80B2DE6C -/* 00944 80B2DDA4 8FBF002C */ lw $ra, 0x002C($sp) + +/* 0093C 80B2DD9C AFA40030 */ sw $a0, 0x0030($sp) +/* 00940 80B2DDA0 50400032 */ beql $v0, $zero, .L80B2DE6C +/* 00944 80B2DDA4 8FBF002C */ lw $ra, 0x002C($sp) /* 00948 80B2DDA8 860F025E */ lh $t7, 0x025E($s0) ## 0000025E /* 0094C 80B2DDAC 24010003 */ addiu $at, $zero, 0x0003 ## $at = 00000003 /* 00950 80B2DDB0 25F80001 */ addiu $t8, $t7, 0x0001 ## $t8 = 00000001 /* 00954 80B2DDB4 A618025E */ sh $t8, 0x025E($s0) ## 0000025E /* 00958 80B2DDB8 8602025E */ lh $v0, 0x025E($s0) ## 0000025E -/* 0095C 80B2DDBC 54410006 */ bnel $v0, $at, .L80B2DDD8 +/* 0095C 80B2DDBC 54410006 */ bnel $v0, $at, .L80B2DDD8 /* 00960 80B2DDC0 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 00964 80B2DDC4 0C2CB580 */ jal func_80B2D600 +/* 00964 80B2DDC4 0C2CB580 */ jal func_80B2D600 /* 00968 80B2DDC8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0096C 80B2DDCC 10000027 */ beq $zero, $zero, .L80B2DE6C -/* 00970 80B2DDD0 8FBF002C */ lw $ra, 0x002C($sp) +/* 0096C 80B2DDCC 10000027 */ beq $zero, $zero, .L80B2DE6C +/* 00970 80B2DDD0 8FBF002C */ lw $ra, 0x002C($sp) /* 00974 80B2DDD4 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 .L80B2DDD8: -/* 00978 80B2DDD8 14410013 */ bne $v0, $at, .L80B2DE28 +/* 00978 80B2DDD8 14410013 */ bne $v0, $at, .L80B2DE28 /* 0097C 80B2DDDC 2408000A */ addiu $t0, $zero, 0x000A ## $t0 = 0000000A /* 00980 80B2DDE0 3C100600 */ lui $s0, 0x0600 ## $s0 = 06000000 /* 00984 80B2DDE4 26100068 */ addiu $s0, $s0, 0x0068 ## $s0 = 06000068 /* 00988 80B2DDE8 0C028800 */ jal SkelAnime_GetFrameCount - + /* 0098C 80B2DDEC 02002025 */ or $a0, $s0, $zero ## $a0 = 06000068 /* 00990 80B2DDF0 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 00994 80B2DDF4 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 /* 00998 80B2DDF8 24190002 */ addiu $t9, $zero, 0x0002 ## $t9 = 00000002 -/* 0099C 80B2DDFC 468021A0 */ cvt.s.w $f6, $f4 -/* 009A0 80B2DE00 44070000 */ mfc1 $a3, $f0 -/* 009A4 80B2DE04 AFB90014 */ sw $t9, 0x0014($sp) -/* 009A8 80B2DE08 8FA40030 */ lw $a0, 0x0030($sp) +/* 0099C 80B2DDFC 468021A0 */ cvt.s.w $f6, $f4 +/* 009A0 80B2DE00 44070000 */ mfc1 $a3, $f0 +/* 009A4 80B2DE04 AFB90014 */ sw $t9, 0x0014($sp) +/* 009A8 80B2DE08 8FA40030 */ lw $a0, 0x0030($sp) /* 009AC 80B2DE0C 02002825 */ or $a1, $s0, $zero ## $a1 = 06000068 /* 009B0 80B2DE10 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 009B4 80B2DE14 E7A60010 */ swc1 $f6, 0x0010($sp) -/* 009B8 80B2DE18 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 009BC 80B2DE1C E7A00018 */ swc1 $f0, 0x0018($sp) -/* 009C0 80B2DE20 10000012 */ beq $zero, $zero, .L80B2DE6C -/* 009C4 80B2DE24 8FBF002C */ lw $ra, 0x002C($sp) +/* 009B4 80B2DE14 E7A60010 */ swc1 $f6, 0x0010($sp) +/* 009B8 80B2DE18 0C029468 */ jal SkelAnime_ChangeAnim + +/* 009BC 80B2DE1C E7A00018 */ swc1 $f0, 0x0018($sp) +/* 009C0 80B2DE20 10000012 */ beq $zero, $zero, .L80B2DE6C +/* 009C4 80B2DE24 8FBF002C */ lw $ra, 0x002C($sp) .L80B2DE28: /* 009C8 80B2DE28 3C014000 */ lui $at, 0x4000 ## $at = 40000000 /* 009CC 80B2DE2C 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 /* 009D0 80B2DE30 44814000 */ mtc1 $at, $f8 ## $f8 = 2.00 /* 009D4 80B2DE34 AE080220 */ sw $t0, 0x0220($s0) ## 06000288 /* 009D8 80B2DE38 E6000164 */ swc1 $f0, 0x0164($s0) ## 060001CC -/* 009DC 80B2DE3C 1000000A */ beq $zero, $zero, .L80B2DE68 +/* 009DC 80B2DE3C 1000000A */ beq $zero, $zero, .L80B2DE68 /* 009E0 80B2DE40 E6080168 */ swc1 $f8, 0x0168($s0) ## 060001D0 .L80B2DE44: /* 009E4 80B2DE44 26040254 */ addiu $a0, $s0, 0x0254 ## $a0 = 060002BC /* 009E8 80B2DE48 240705DC */ addiu $a3, $zero, 0x05DC ## $a3 = 000005DC /* 009EC 80B2DE4C 0C01E1A7 */ jal Math_SmoothScaleMaxMinS - -/* 009F0 80B2DE50 AFA00010 */ sw $zero, 0x0010($sp) + +/* 009F0 80B2DE50 AFA00010 */ sw $zero, 0x0010($sp) /* 009F4 80B2DE54 8E090220 */ lw $t1, 0x0220($s0) ## 06000288 /* 009F8 80B2DE58 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 060001B4 /* 009FC 80B2DE5C 252AFFFF */ addiu $t2, $t1, 0xFFFF ## $t2 = FFFFFFFF /* 00A00 80B2DE60 0C02927F */ jal SkelAnime_FrameUpdateMatrix - + /* 00A04 80B2DE64 AE0A0220 */ sw $t2, 0x0220($s0) ## 06000288 .L80B2DE68: -/* 00A08 80B2DE68 8FBF002C */ lw $ra, 0x002C($sp) +/* 00A08 80B2DE68 8FBF002C */ lw $ra, 0x002C($sp) .L80B2DE6C: -/* 00A0C 80B2DE6C 8FB00028 */ lw $s0, 0x0028($sp) +/* 00A0C 80B2DE6C 8FB00028 */ lw $s0, 0x0028($sp) /* 00A10 80B2DE70 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 -/* 00A14 80B2DE74 03E00008 */ jr $ra +/* 00A14 80B2DE74 03E00008 */ jr $ra /* 00A18 80B2DE78 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Vm/func_80B2DE7C.s b/asm/non_matchings/overlays/actors/ovl_En_Vm/func_80B2DE7C.s index 5e8775c3fe..cdf5e4b7b6 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Vm/func_80B2DE7C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Vm/func_80B2DE7C.s @@ -1,26 +1,26 @@ glabel func_80B2DE7C /* 00A1C 80B2DE7C 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 00A20 80B2DE80 AFB00028 */ sw $s0, 0x0028($sp) +/* 00A20 80B2DE80 AFB00028 */ sw $s0, 0x0028($sp) /* 00A24 80B2DE84 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00A28 80B2DE88 AFBF002C */ sw $ra, 0x002C($sp) +/* 00A28 80B2DE88 AFBF002C */ sw $ra, 0x002C($sp) /* 00A2C 80B2DE8C 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 /* 00A30 80B2DE90 0C028800 */ jal SkelAnime_GetFrameCount - + /* 00A34 80B2DE94 24840068 */ addiu $a0, $a0, 0x0068 ## $a0 = 06000068 /* 00A38 80B2DE98 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 00A3C 80B2DE9C 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 /* 00A40 80B2DEA0 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 00A44 80B2DEA4 46802120 */ cvt.s.w $f4, $f4 +/* 00A44 80B2DEA4 46802120 */ cvt.s.w $f4, $f4 /* 00A48 80B2DEA8 240E0002 */ addiu $t6, $zero, 0x0002 ## $t6 = 00000002 -/* 00A4C 80B2DEAC AFAE0014 */ sw $t6, 0x0014($sp) +/* 00A4C 80B2DEAC AFAE0014 */ sw $t6, 0x0014($sp) /* 00A50 80B2DEB0 24A50068 */ addiu $a1, $a1, 0x0068 ## $a1 = 06000068 /* 00A54 80B2DEB4 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C /* 00A58 80B2DEB8 3C06BF80 */ lui $a2, 0xBF80 ## $a2 = BF800000 -/* 00A5C 80B2DEBC 44072000 */ mfc1 $a3, $f4 -/* 00A60 80B2DEC0 E7A00010 */ swc1 $f0, 0x0010($sp) -/* 00A64 80B2DEC4 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 00A68 80B2DEC8 E7A00018 */ swc1 $f0, 0x0018($sp) +/* 00A5C 80B2DEBC 44072000 */ mfc1 $a3, $f4 +/* 00A60 80B2DEC0 E7A00010 */ swc1 $f0, 0x0010($sp) +/* 00A64 80B2DEC4 0C029468 */ jal SkelAnime_ChangeAnim + +/* 00A68 80B2DEC8 E7A00018 */ swc1 $f0, 0x0018($sp) /* 00A6C 80B2DECC 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 /* 00A70 80B2DED0 A6000260 */ sh $zero, 0x0260($s0) ## 00000260 /* 00A74 80B2DED4 86180260 */ lh $t8, 0x0260($s0) ## 00000260 @@ -32,42 +32,42 @@ glabel func_80B2DE7C /* 00A8C 80B2DEEC E6000250 */ swc1 $f0, 0x0250($s0) ## 00000250 /* 00A90 80B2DEF0 E600024C */ swc1 $f0, 0x024C($s0) ## 0000024C /* 00A94 80B2DEF4 A618025E */ sh $t8, 0x025E($s0) ## 0000025E -/* 00A98 80B2DEF8 C426EC18 */ lwc1 $f6, %lo(D_80B2EC18)($at) +/* 00A98 80B2DEF8 C426EC18 */ lwc1 $f6, %lo(D_80B2EC18)($at) /* 00A9C 80B2DEFC 3C0180B3 */ lui $at, %hi(D_80B2EC1C) ## $at = 80B30000 /* 00AA0 80B2DF00 C60A0054 */ lwc1 $f10, 0x0054($s0) ## 00000054 /* 00AA4 80B2DF04 E60600BC */ swc1 $f6, 0x00BC($s0) ## 000000BC -/* 00AA8 80B2DF08 C428EC1C */ lwc1 $f8, %lo(D_80B2EC1C)($at) +/* 00AA8 80B2DF08 C428EC1C */ lwc1 $f8, %lo(D_80B2EC1C)($at) /* 00AAC 80B2DF0C C6120028 */ lwc1 $f18, 0x0028($s0) ## 00000028 /* 00AB0 80B2DF10 3C014100 */ lui $at, 0x4100 ## $at = 41000000 -/* 00AB4 80B2DF14 460A4402 */ mul.s $f16, $f8, $f10 +/* 00AB4 80B2DF14 460A4402 */ mul.s $f16, $f8, $f10 /* 00AB8 80B2DF18 44813000 */ mtc1 $at, $f6 ## $f6 = 8.00 /* 00ABC 80B2DF1C 3C01BF00 */ lui $at, 0xBF00 ## $at = BF000000 /* 00AC0 80B2DF20 44814000 */ mtc1 $at, $f8 ## $f8 = -0.50 /* 00AC4 80B2DF24 E6060060 */ swc1 $f6, 0x0060($s0) ## 00000060 /* 00AC8 80B2DF28 E608006C */ swc1 $f8, 0x006C($s0) ## 0000006C -/* 00ACC 80B2DF2C 46109100 */ add.s $f4, $f18, $f16 +/* 00ACC 80B2DF2C 46109100 */ add.s $f4, $f18, $f16 /* 00AD0 80B2DF30 0C03F66B */ jal Math_Rand_ZeroOne ## Rand.Next() float /* 00AD4 80B2DF34 E6040028 */ swc1 $f4, 0x0028($s0) ## 00000028 /* 00AD8 80B2DF38 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 /* 00ADC 80B2DF3C 44815000 */ mtc1 $at, $f10 ## $f10 = 1.00 /* 00AE0 80B2DF40 3C0180B3 */ lui $at, %hi(D_80B2EC20) ## $at = 80B30000 -/* 00AE4 80B2DF44 460A0480 */ add.s $f18, $f0, $f10 +/* 00AE4 80B2DF44 460A0480 */ add.s $f18, $f0, $f10 /* 00AE8 80B2DF48 E6120068 */ swc1 $f18, 0x0068($s0) ## 00000068 /* 00AEC 80B2DF4C 0C00CFC8 */ jal Math_Rand_CenteredFloat - -/* 00AF0 80B2DF50 C42CEC20 */ lwc1 $f12, %lo(D_80B2EC20)($at) -/* 00AF4 80B2DF54 4600040D */ trunc.w.s $f16, $f0 + +/* 00AF0 80B2DF50 C42CEC20 */ lwc1 $f12, %lo(D_80B2EC20)($at) +/* 00AF4 80B2DF54 4600040D */ trunc.w.s $f16, $f0 /* 00AF8 80B2DF58 3C0580B3 */ lui $a1, %hi(func_80B2DF84) ## $a1 = 80B30000 /* 00AFC 80B2DF5C 24A5DF84 */ addiu $a1, $a1, %lo(func_80B2DF84) ## $a1 = 80B2DF84 /* 00B00 80B2DF60 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00B04 80B2DF64 44098000 */ mfc1 $t1, $f16 -/* 00B08 80B2DF68 0C2CB518 */ jal func_80B2D460 +/* 00B04 80B2DF64 44098000 */ mfc1 $t1, $f16 +/* 00B08 80B2DF68 0C2CB518 */ jal func_80B2D460 /* 00B0C 80B2DF6C A6090032 */ sh $t1, 0x0032($s0) ## 00000032 -/* 00B10 80B2DF70 8FBF002C */ lw $ra, 0x002C($sp) -/* 00B14 80B2DF74 8FB00028 */ lw $s0, 0x0028($sp) +/* 00B10 80B2DF70 8FBF002C */ lw $ra, 0x002C($sp) +/* 00B14 80B2DF74 8FB00028 */ lw $s0, 0x0028($sp) /* 00B18 80B2DF78 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 00B1C 80B2DF7C 03E00008 */ jr $ra +/* 00B1C 80B2DF7C 03E00008 */ jr $ra /* 00B20 80B2DF80 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Wall_Tubo/func_80B2EE9C.s b/asm/non_matchings/overlays/actors/ovl_En_Wall_Tubo/func_80B2EE9C.s index 83ff2eda83..b4dd47324c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Wall_Tubo/func_80B2EE9C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Wall_Tubo/func_80B2EE9C.s @@ -112,21 +112,21 @@ glabel func_80B2EE9C /* 0024C 80B2F03C 844A07A0 */ lh $t2, 0x07A0($v0) ## 000007A0 /* 00250 80B2F040 000A5880 */ sll $t3, $t2, 2 /* 00254 80B2F044 004B6821 */ addu $t5, $v0, $t3 -/* 00258 80B2F048 0C024BE2 */ jal func_80092F88 +/* 00258 80B2F048 0C024BE2 */ jal Quake_Add /* 0025C 80B2F04C 8DA40790 */ lw $a0, 0x0790($t5) ## 00000790 /* 00260 80B2F050 00022400 */ sll $a0, $v0, 16 /* 00264 80B2F054 A7A20032 */ sh $v0, 0x0032($sp) /* 00268 80B2F058 00042403 */ sra $a0, $a0, 16 -/* 0026C 80B2F05C 0C024B6B */ jal func_80092DAC +/* 0026C 80B2F05C 0C024B6B */ jal Quake_SetSpeed /* 00270 80B2F060 24057FFF */ addiu $a1, $zero, 0x7FFF ## $a1 = 00007FFF /* 00274 80B2F064 87A40032 */ lh $a0, 0x0032($sp) /* 00278 80B2F068 24050064 */ addiu $a1, $zero, 0x0064 ## $a1 = 00000064 /* 0027C 80B2F06C 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 /* 00280 80B2F070 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 00284 80B2F074 0C024B9C */ jal func_80092E70 +/* 00284 80B2F074 0C024B9C */ jal Quake_SetQuakeValues /* 00288 80B2F078 AFA00010 */ sw $zero, 0x0010($sp) /* 0028C 80B2F07C 87A40032 */ lh $a0, 0x0032($sp) -/* 00290 80B2F080 0C024B7C */ jal func_80092DF0 +/* 00290 80B2F080 0C024B7C */ jal Quake_SetCountdown /* 00294 80B2F084 24050064 */ addiu $a1, $zero, 0x0064 ## $a1 = 00000064 /* 00298 80B2F088 3C0E80B3 */ lui $t6, %hi(func_80B2F0B8) ## $t6 = 80B30000 /* 0029C 80B2F08C 25CEF0B8 */ addiu $t6, $t6, %lo(func_80B2F0B8) ## $t6 = 80B2F0B8 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Weiyer/EnWeiyer_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Weiyer/EnWeiyer_Draw.s index 664f47ee4b..b810f26a97 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Weiyer/EnWeiyer_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Weiyer/EnWeiyer_Draw.s @@ -1,24 +1,24 @@ glabel EnWeiyer_Draw /* 01670 80B33900 27BDFF98 */ addiu $sp, $sp, 0xFF98 ## $sp = FFFFFF98 -/* 01674 80B33904 AFB20030 */ sw $s2, 0x0030($sp) +/* 01674 80B33904 AFB20030 */ sw $s2, 0x0030($sp) /* 01678 80B33908 00A09025 */ or $s2, $a1, $zero ## $s2 = 00000000 -/* 0167C 80B3390C AFBF0034 */ sw $ra, 0x0034($sp) -/* 01680 80B33910 AFB1002C */ sw $s1, 0x002C($sp) -/* 01684 80B33914 AFB00028 */ sw $s0, 0x0028($sp) +/* 0167C 80B3390C AFBF0034 */ sw $ra, 0x0034($sp) +/* 01680 80B33910 AFB1002C */ sw $s1, 0x002C($sp) +/* 01684 80B33914 AFB00028 */ sw $s0, 0x0028($sp) /* 01688 80B33918 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 /* 0168C 80B3391C 00808825 */ or $s1, $a0, $zero ## $s1 = 00000000 /* 01690 80B33920 3C0680B3 */ lui $a2, %hi(D_80B33AF0) ## $a2 = 80B30000 /* 01694 80B33924 24C63AF0 */ addiu $a2, $a2, %lo(D_80B33AF0) ## $a2 = 80B33AF0 /* 01698 80B33928 27A40050 */ addiu $a0, $sp, 0x0050 ## $a0 = FFFFFFE8 /* 0169C 80B3392C 240704A9 */ addiu $a3, $zero, 0x04A9 ## $a3 = 000004A9 -/* 016A0 80B33930 0C031AB1 */ jal func_800C6AC4 +/* 016A0 80B33930 0C031AB1 */ jal Graph_OpenDisps /* 016A4 80B33934 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 /* 016A8 80B33938 8E2F0190 */ lw $t7, 0x0190($s1) ## 00000190 /* 016AC 80B3393C 3C0E80B3 */ lui $t6, %hi(func_80B33338) ## $t6 = 80B30000 /* 016B0 80B33940 25CE3338 */ addiu $t6, $t6, %lo(func_80B33338) ## $t6 = 80B33338 -/* 016B4 80B33944 11CF001F */ beq $t6, $t7, .L80B339C4 +/* 016B4 80B33944 11CF001F */ beq $t6, $t7, .L80B339C4 /* 016B8 80B33948 00000000 */ nop -/* 016BC 80B3394C 0C024F46 */ jal func_80093D18 +/* 016BC 80B3394C 0C024F46 */ jal func_80093D18 /* 016C0 80B33950 8E440000 */ lw $a0, 0x0000($s2) ## 00000000 /* 016C4 80B33954 8E0302C0 */ lw $v1, 0x02C0($s0) ## 000002C0 /* 016C8 80B33958 3C19DB06 */ lui $t9, 0xDB06 ## $t9 = DB060000 @@ -38,18 +38,18 @@ glabel EnWeiyer_Draw /* 01700 80B33990 AC6A0000 */ sw $t2, 0x0000($v1) ## 00000000 /* 01704 80B33994 8E26016C */ lw $a2, 0x016C($s1) ## 0000016C /* 01708 80B33998 8E250150 */ lw $a1, 0x0150($s1) ## 00000150 -/* 0170C 80B3399C AFB10014 */ sw $s1, 0x0014($sp) -/* 01710 80B339A0 AFA00010 */ sw $zero, 0x0010($sp) +/* 0170C 80B3399C AFB10014 */ sw $s1, 0x0014($sp) +/* 01710 80B339A0 AFA00010 */ sw $zero, 0x0010($sp) /* 01714 80B339A4 8E0C02C0 */ lw $t4, 0x02C0($s0) ## 000002C0 /* 01718 80B339A8 3C0780B3 */ lui $a3, %hi(func_80B338D4) ## $a3 = 80B30000 /* 0171C 80B339AC 24E738D4 */ addiu $a3, $a3, %lo(func_80B338D4) ## $a3 = 80B338D4 /* 01720 80B339B0 02402025 */ or $a0, $s2, $zero ## $a0 = 00000000 -/* 01724 80B339B4 0C0288A2 */ jal func_800A2288 -/* 01728 80B339B8 AFAC0018 */ sw $t4, 0x0018($sp) -/* 0172C 80B339BC 10000020 */ beq $zero, $zero, .L80B33A40 +/* 01724 80B339B4 0C0288A2 */ jal SkelAnime_Draw2 +/* 01728 80B339B8 AFAC0018 */ sw $t4, 0x0018($sp) +/* 0172C 80B339BC 10000020 */ beq $zero, $zero, .L80B33A40 /* 01730 80B339C0 AE0202C0 */ sw $v0, 0x02C0($s0) ## 000002C0 .L80B339C4: -/* 01734 80B339C4 0C024F61 */ jal func_80093D84 +/* 01734 80B339C4 0C024F61 */ jal func_80093D84 /* 01738 80B339C8 8E440000 */ lw $a0, 0x0000($s2) ## 00000000 /* 0173C 80B339CC 8E0302D0 */ lw $v1, 0x02D0($s0) ## 000002D0 /* 01740 80B339D0 3C0EDB06 */ lui $t6, 0xDB06 ## $t6 = DB060000 @@ -73,24 +73,24 @@ glabel EnWeiyer_Draw /* 01788 80B33A18 AC6A0004 */ sw $t2, 0x0004($v1) ## 00000004 /* 0178C 80B33A1C 8E26016C */ lw $a2, 0x016C($s1) ## 0000016C /* 01790 80B33A20 8E250150 */ lw $a1, 0x0150($s1) ## 00000150 -/* 01794 80B33A24 AFB10014 */ sw $s1, 0x0014($sp) -/* 01798 80B33A28 AFA00010 */ sw $zero, 0x0010($sp) +/* 01794 80B33A24 AFB10014 */ sw $s1, 0x0014($sp) +/* 01798 80B33A28 AFA00010 */ sw $zero, 0x0010($sp) /* 0179C 80B33A2C 8E0B02D0 */ lw $t3, 0x02D0($s0) ## 000002D0 /* 017A0 80B33A30 02402025 */ or $a0, $s2, $zero ## $a0 = 00000000 -/* 017A4 80B33A34 0C0288A2 */ jal func_800A2288 -/* 017A8 80B33A38 AFAB0018 */ sw $t3, 0x0018($sp) +/* 017A4 80B33A34 0C0288A2 */ jal SkelAnime_Draw2 +/* 017A8 80B33A38 AFAB0018 */ sw $t3, 0x0018($sp) /* 017AC 80B33A3C AE0202D0 */ sw $v0, 0x02D0($s0) ## 000002D0 .L80B33A40: /* 017B0 80B33A40 3C0680B3 */ lui $a2, %hi(D_80B33B04) ## $a2 = 80B30000 /* 017B4 80B33A44 24C63B04 */ addiu $a2, $a2, %lo(D_80B33B04) ## $a2 = 80B33B04 /* 017B8 80B33A48 27A40050 */ addiu $a0, $sp, 0x0050 ## $a0 = FFFFFFE8 /* 017BC 80B33A4C 8E450000 */ lw $a1, 0x0000($s2) ## 00000000 -/* 017C0 80B33A50 0C031AD5 */ jal func_800C6B54 +/* 017C0 80B33A50 0C031AD5 */ jal Graph_CloseDisps /* 017C4 80B33A54 240704D8 */ addiu $a3, $zero, 0x04D8 ## $a3 = 000004D8 -/* 017C8 80B33A58 8FBF0034 */ lw $ra, 0x0034($sp) -/* 017CC 80B33A5C 8FB00028 */ lw $s0, 0x0028($sp) -/* 017D0 80B33A60 8FB1002C */ lw $s1, 0x002C($sp) -/* 017D4 80B33A64 8FB20030 */ lw $s2, 0x0030($sp) -/* 017D8 80B33A68 03E00008 */ jr $ra +/* 017C8 80B33A58 8FBF0034 */ lw $ra, 0x0034($sp) +/* 017CC 80B33A5C 8FB00028 */ lw $s0, 0x0028($sp) +/* 017D0 80B33A60 8FB1002C */ lw $s1, 0x002C($sp) +/* 017D4 80B33A64 8FB20030 */ lw $s2, 0x0030($sp) +/* 017D8 80B33A68 03E00008 */ jr $ra /* 017DC 80B33A6C 27BD0068 */ addiu $sp, $sp, 0x0068 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Weiyer/func_80B32384.s b/asm/non_matchings/overlays/actors/ovl_En_Weiyer/func_80B32384.s index 12c83a012b..1e213a5349 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Weiyer/func_80B32384.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Weiyer/func_80B32384.s @@ -1,37 +1,37 @@ glabel func_80B32384 /* 000F4 80B32384 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 000F8 80B32388 AFBF0014 */ sw $ra, 0x0014($sp) +/* 000F8 80B32388 AFBF0014 */ sw $ra, 0x0014($sp) /* 000FC 80B3238C 848E00B6 */ lh $t6, 0x00B6($a0) ## 000000B6 /* 00100 80B32390 3C0180B3 */ lui $at, %hi(D_80B33B18) ## $at = 80B30000 /* 00104 80B32394 A48E0196 */ sh $t6, 0x0196($a0) ## 00000196 -/* 00108 80B32398 AFA40018 */ sw $a0, 0x0018($sp) +/* 00108 80B32398 AFA40018 */ sw $a0, 0x0018($sp) /* 0010C 80B3239C 0C041184 */ jal cosf - -/* 00110 80B323A0 C42C3B18 */ lwc1 $f12, %lo(D_80B33B18)($at) + +/* 00110 80B323A0 C42C3B18 */ lwc1 $f12, %lo(D_80B33B18)($at) /* 00114 80B323A4 3C014040 */ lui $at, 0x4040 ## $at = 40400000 /* 00118 80B323A8 44812000 */ mtc1 $at, $f4 ## $f4 = 3.00 -/* 0011C 80B323AC 8FA70018 */ lw $a3, 0x0018($sp) +/* 0011C 80B323AC 8FA70018 */ lw $a3, 0x0018($sp) /* 00120 80B323B0 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 00124 80B323B4 46040182 */ mul.s $f6, $f0, $f4 +/* 00124 80B323B4 46040182 */ mul.s $f6, $f0, $f4 /* 00128 80B323B8 C4E80028 */ lwc1 $f8, 0x0028($a3) ## 00000028 /* 0012C 80B323BC 24A50FC0 */ addiu $a1, $a1, 0x0FC0 ## $a1 = 06000FC0 /* 00130 80B323C0 3C06C0A0 */ lui $a2, 0xC0A0 ## $a2 = C0A00000 /* 00134 80B323C4 24E4014C */ addiu $a0, $a3, 0x014C ## $a0 = 0000014C -/* 00138 80B323C8 46083280 */ add.s $f10, $f6, $f8 -/* 0013C 80B323CC 0C0294D3 */ jal func_800A534C +/* 00138 80B323C8 46083280 */ add.s $f10, $f6, $f8 +/* 0013C 80B323CC 0C0294D3 */ jal SkelAnime_ChangeAnimTransitionRepeat /* 00140 80B323D0 E4EA027C */ swc1 $f10, 0x027C($a3) ## 0000027C -/* 00144 80B323D4 8FA70018 */ lw $a3, 0x0018($sp) +/* 00144 80B323D4 8FA70018 */ lw $a3, 0x0018($sp) /* 00148 80B323D8 3C014020 */ lui $at, 0x4020 ## $at = 40200000 /* 0014C 80B323DC 44811000 */ mtc1 $at, $f2 ## $f2 = 2.50 /* 00150 80B323E0 C4E00068 */ lwc1 $f0, 0x0068($a3) ## 00000068 /* 00154 80B323E4 240F001E */ addiu $t7, $zero, 0x001E ## $t7 = 0000001E /* 00158 80B323E8 3C0880B3 */ lui $t0, %hi(func_80B328E8) ## $t0 = 80B30000 -/* 0015C 80B323EC 4600103C */ c.lt.s $f2, $f0 +/* 0015C 80B323EC 4600103C */ c.lt.s $f2, $f0 /* 00160 80B323F0 250828E8 */ addiu $t0, $t0, %lo(func_80B328E8) ## $t0 = 80B328E8 /* 00164 80B323F4 A4EF0194 */ sh $t7, 0x0194($a3) ## 00000194 -/* 00168 80B323F8 45020004 */ bc1fl .L80B3240C +/* 00168 80B323F8 45020004 */ bc1fl .L80B3240C /* 0016C 80B323FC E4E00068 */ swc1 $f0, 0x0068($a3) ## 00000068 -/* 00170 80B32400 10000002 */ beq $zero, $zero, .L80B3240C +/* 00170 80B32400 10000002 */ beq $zero, $zero, .L80B3240C /* 00174 80B32404 E4E20068 */ swc1 $f2, 0x0068($a3) ## 00000068 /* 00178 80B32408 E4E00068 */ swc1 $f0, 0x0068($a3) ## 00000068 .L80B3240C: @@ -41,9 +41,9 @@ glabel func_80B32384 /* 00188 80B32418 3319FFFE */ andi $t9, $t8, 0xFFFE ## $t9 = 00000000 /* 0018C 80B3241C A0F90294 */ sb $t9, 0x0294($a3) ## 00000294 /* 00190 80B32420 E4F00280 */ swc1 $f16, 0x0280($a3) ## 00000280 -/* 00194 80B32424 8FBF0014 */ lw $ra, 0x0014($sp) +/* 00194 80B32424 8FBF0014 */ lw $ra, 0x0014($sp) /* 00198 80B32428 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 0019C 80B3242C 03E00008 */ jr $ra +/* 0019C 80B3242C 03E00008 */ jr $ra /* 001A0 80B32430 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Weiyer/func_80B32434.s b/asm/non_matchings/overlays/actors/ovl_En_Weiyer/func_80B32434.s index 3fd19ca762..e7c99b911b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Weiyer/func_80B32434.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Weiyer/func_80B32434.s @@ -1,14 +1,14 @@ glabel func_80B32434 /* 001A4 80B32434 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 001A8 80B32438 AFBF0014 */ sw $ra, 0x0014($sp) +/* 001A8 80B32438 AFBF0014 */ sw $ra, 0x0014($sp) /* 001AC 80B3243C 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 /* 001B0 80B32440 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 001B4 80B32444 24A50FC0 */ addiu $a1, $a1, 0x0FC0 ## $a1 = 06000FC0 -/* 001B8 80B32448 AFA70018 */ sw $a3, 0x0018($sp) +/* 001B8 80B32448 AFA70018 */ sw $a3, 0x0018($sp) /* 001BC 80B3244C 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 001C0 80B32450 0C0294D3 */ jal func_800A534C +/* 001C0 80B32450 0C0294D3 */ jal SkelAnime_ChangeAnimTransitionRepeat /* 001C4 80B32454 3C06C0A0 */ lui $a2, 0xC0A0 ## $a2 = C0A00000 -/* 001C8 80B32458 8FA70018 */ lw $a3, 0x0018($sp) +/* 001C8 80B32458 8FA70018 */ lw $a3, 0x0018($sp) /* 001CC 80B3245C 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 /* 001D0 80B32460 44812000 */ mtc1 $at, $f4 ## $f4 = 5.00 /* 001D4 80B32464 90EE0294 */ lbu $t6, 0x0294($a3) ## 00000294 @@ -19,9 +19,9 @@ glabel func_80B32434 /* 001E8 80B32478 A4E00194 */ sh $zero, 0x0194($a3) ## 00000194 /* 001EC 80B3247C ACF80190 */ sw $t8, 0x0190($a3) ## 00000190 /* 001F0 80B32480 E4E40068 */ swc1 $f4, 0x0068($a3) ## 00000068 -/* 001F4 80B32484 8FBF0014 */ lw $ra, 0x0014($sp) +/* 001F4 80B32484 8FBF0014 */ lw $ra, 0x0014($sp) /* 001F8 80B32488 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 001FC 80B3248C 03E00008 */ jr $ra +/* 001FC 80B3248C 03E00008 */ jr $ra /* 00200 80B32490 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Weiyer/func_80B32494.s b/asm/non_matchings/overlays/actors/ovl_En_Weiyer/func_80B32494.s index 97ad3c6def..1a208138c9 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Weiyer/func_80B32494.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Weiyer/func_80B32494.s @@ -3,19 +3,19 @@ glabel func_80B32494 /* 00208 80B32498 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 /* 0020C 80B3249C 3C01C100 */ lui $at, 0xC100 ## $at = C1000000 /* 00210 80B324A0 44812000 */ mtc1 $at, $f4 ## $f4 = -8.00 -/* 00214 80B324A4 AFB00028 */ sw $s0, 0x0028($sp) +/* 00214 80B324A4 AFB00028 */ sw $s0, 0x0028($sp) /* 00218 80B324A8 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 0021C 80B324AC AFBF002C */ sw $ra, 0x002C($sp) +/* 0021C 80B324AC AFBF002C */ sw $ra, 0x002C($sp) /* 00220 80B324B0 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 00224 80B324B4 44070000 */ mfc1 $a3, $f0 +/* 00224 80B324B4 44070000 */ mfc1 $a3, $f0 /* 00228 80B324B8 24A50288 */ addiu $a1, $a1, 0x0288 ## $a1 = 06000288 /* 0022C 80B324BC 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 00230 80B324C0 AFA00014 */ sw $zero, 0x0014($sp) +/* 00230 80B324C0 AFA00014 */ sw $zero, 0x0014($sp) /* 00234 80B324C4 3C064000 */ lui $a2, 0x4000 ## $a2 = 40000000 -/* 00238 80B324C8 E7A00010 */ swc1 $f0, 0x0010($sp) -/* 0023C 80B324CC 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 00240 80B324D0 E7A40018 */ swc1 $f4, 0x0018($sp) +/* 00238 80B324C8 E7A00010 */ swc1 $f0, 0x0010($sp) +/* 0023C 80B324CC 0C029468 */ jal SkelAnime_ChangeAnim + +/* 00240 80B324D0 E7A40018 */ swc1 $f4, 0x0018($sp) /* 00244 80B324D4 920F0294 */ lbu $t7, 0x0294($s0) ## 00000294 /* 00248 80B324D8 3C1980B3 */ lui $t9, %hi(func_80B32D30) ## $t9 = 80B30000 /* 0024C 80B324DC 240E0028 */ addiu $t6, $zero, 0x0028 ## $t6 = 00000028 @@ -24,10 +24,10 @@ glabel func_80B32494 /* 00258 80B324E8 A60E0194 */ sh $t6, 0x0194($s0) ## 00000194 /* 0025C 80B324EC A2180294 */ sb $t8, 0x0294($s0) ## 00000294 /* 00260 80B324F0 AE190190 */ sw $t9, 0x0190($s0) ## 00000190 -/* 00264 80B324F4 8FBF002C */ lw $ra, 0x002C($sp) -/* 00268 80B324F8 8FB00028 */ lw $s0, 0x0028($sp) +/* 00264 80B324F4 8FBF002C */ lw $ra, 0x002C($sp) +/* 00268 80B324F8 8FB00028 */ lw $s0, 0x0028($sp) /* 0026C 80B324FC 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 00270 80B32500 03E00008 */ jr $ra +/* 00270 80B32500 03E00008 */ jr $ra /* 00274 80B32504 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Weiyer/func_80B325A0.s b/asm/non_matchings/overlays/actors/ovl_En_Weiyer/func_80B325A0.s index 412b6fc3ad..8e1cc389f0 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Weiyer/func_80B325A0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Weiyer/func_80B325A0.s @@ -3,19 +3,19 @@ glabel func_80B325A0 /* 00314 80B325A4 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 /* 00318 80B325A8 3C01C040 */ lui $at, 0xC040 ## $at = C0400000 /* 0031C 80B325AC 44812000 */ mtc1 $at, $f4 ## $f4 = -3.00 -/* 00320 80B325B0 AFB00028 */ sw $s0, 0x0028($sp) +/* 00320 80B325B0 AFB00028 */ sw $s0, 0x0028($sp) /* 00324 80B325B4 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00328 80B325B8 AFBF002C */ sw $ra, 0x002C($sp) +/* 00328 80B325B8 AFBF002C */ sw $ra, 0x002C($sp) /* 0032C 80B325BC 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 00330 80B325C0 44070000 */ mfc1 $a3, $f0 +/* 00330 80B325C0 44070000 */ mfc1 $a3, $f0 /* 00334 80B325C4 24A50FC0 */ addiu $a1, $a1, 0x0FC0 ## $a1 = 06000FC0 /* 00338 80B325C8 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 0033C 80B325CC AFA00014 */ sw $zero, 0x0014($sp) +/* 0033C 80B325CC AFA00014 */ sw $zero, 0x0014($sp) /* 00340 80B325D0 3C064000 */ lui $a2, 0x4000 ## $a2 = 40000000 -/* 00344 80B325D4 E7A00010 */ swc1 $f0, 0x0010($sp) -/* 00348 80B325D8 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 0034C 80B325DC E7A40018 */ swc1 $f4, 0x0018($sp) +/* 00344 80B325D4 E7A00010 */ swc1 $f0, 0x0010($sp) +/* 00348 80B325D8 0C029468 */ jal SkelAnime_ChangeAnim + +/* 0034C 80B325DC E7A40018 */ swc1 $f4, 0x0018($sp) /* 00350 80B325E0 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 /* 00354 80B325E4 920F0294 */ lbu $t7, 0x0294($s0) ## 00000294 /* 00358 80B325E8 92190295 */ lbu $t9, 0x0295($s0) ## 00000295 @@ -31,22 +31,22 @@ glabel func_80B325A0 /* 00380 80B32610 E600006C */ swc1 $f0, 0x006C($s0) ## 0000006C /* 00384 80B32614 E6000060 */ swc1 $f0, 0x0060($s0) ## 00000060 /* 00388 80B32618 E6060068 */ swc1 $f6, 0x0068($s0) ## 00000068 -/* 0038C 80B3261C AFA90010 */ sw $t1, 0x0010($sp) +/* 0038C 80B3261C AFA90010 */ sw $t1, 0x0010($sp) /* 00390 80B32620 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 00394 80B32624 24054000 */ addiu $a1, $zero, 0x4000 ## $a1 = 00004000 /* 00398 80B32628 240600C8 */ addiu $a2, $zero, 0x00C8 ## $a2 = 000000C8 -/* 0039C 80B3262C 0C00D09B */ jal func_8003426C +/* 0039C 80B3262C 0C00D09B */ jal func_8003426C /* 003A0 80B32630 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 /* 003A4 80B32634 3C0A80B3 */ lui $t2, %hi(D_80B33AB2) ## $t2 = 80B30000 -/* 003A8 80B32638 854A3AB2 */ lh $t2, %lo(D_80B33AB2)($t2) +/* 003A8 80B32638 854A3AB2 */ lh $t2, %lo(D_80B33AB2)($t2) /* 003AC 80B3263C 3C0B80B3 */ lui $t3, %hi(func_80B331CC) ## $t3 = 80B30000 /* 003B0 80B32640 256B31CC */ addiu $t3, $t3, %lo(func_80B331CC) ## $t3 = 80B331CC /* 003B4 80B32644 AE0B0190 */ sw $t3, 0x0190($s0) ## 00000190 /* 003B8 80B32648 A60A02C6 */ sh $t2, 0x02C6($s0) ## 000002C6 -/* 003BC 80B3264C 8FBF002C */ lw $ra, 0x002C($sp) -/* 003C0 80B32650 8FB00028 */ lw $s0, 0x0028($sp) +/* 003BC 80B3264C 8FBF002C */ lw $ra, 0x002C($sp) +/* 003C0 80B32650 8FB00028 */ lw $s0, 0x0028($sp) /* 003C4 80B32654 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 003C8 80B32658 03E00008 */ jr $ra +/* 003C8 80B32658 03E00008 */ jr $ra /* 003CC 80B3265C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Weiyer/func_80B32660.s b/asm/non_matchings/overlays/actors/ovl_En_Weiyer/func_80B32660.s index 7cd085a9f9..787a874134 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Weiyer/func_80B32660.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Weiyer/func_80B32660.s @@ -3,19 +3,19 @@ glabel func_80B32660 /* 003D4 80B32664 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 /* 003D8 80B32668 3C01C100 */ lui $at, 0xC100 ## $at = C1000000 /* 003DC 80B3266C 44812000 */ mtc1 $at, $f4 ## $f4 = -8.00 -/* 003E0 80B32670 AFB00028 */ sw $s0, 0x0028($sp) +/* 003E0 80B32670 AFB00028 */ sw $s0, 0x0028($sp) /* 003E4 80B32674 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 003E8 80B32678 AFBF002C */ sw $ra, 0x002C($sp) +/* 003E8 80B32678 AFBF002C */ sw $ra, 0x002C($sp) /* 003EC 80B3267C 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 003F0 80B32680 44070000 */ mfc1 $a3, $f0 +/* 003F0 80B32680 44070000 */ mfc1 $a3, $f0 /* 003F4 80B32684 24A50288 */ addiu $a1, $a1, 0x0288 ## $a1 = 06000288 /* 003F8 80B32688 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 003FC 80B3268C AFA00014 */ sw $zero, 0x0014($sp) +/* 003FC 80B3268C AFA00014 */ sw $zero, 0x0014($sp) /* 00400 80B32690 3C064000 */ lui $a2, 0x4000 ## $a2 = 40000000 -/* 00404 80B32694 E7A00010 */ swc1 $f0, 0x0010($sp) -/* 00408 80B32698 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 0040C 80B3269C E7A40018 */ swc1 $f4, 0x0018($sp) +/* 00404 80B32694 E7A00010 */ swc1 $f0, 0x0010($sp) +/* 00408 80B32698 0C029468 */ jal SkelAnime_ChangeAnim + +/* 0040C 80B3269C E7A40018 */ swc1 $f4, 0x0018($sp) /* 00410 80B326A0 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 /* 00414 80B326A4 3C01BF80 */ lui $at, 0xBF80 ## $at = BF800000 /* 00418 80B326A8 44813000 */ mtc1 $at, $f6 ## $f6 = -1.00 @@ -25,30 +25,30 @@ glabel func_80B32660 /* 00428 80B326B8 E6000068 */ swc1 $f0, 0x0068($s0) ## 00000068 /* 0042C 80B326BC E6000060 */ swc1 $f0, 0x0060($s0) ## 00000060 /* 00430 80B326C0 E606006C */ swc1 $f6, 0x006C($s0) ## 0000006C -/* 00434 80B326C4 85EF3AB2 */ lh $t7, %lo(D_80B33AB2)($t7) +/* 00434 80B326C4 85EF3AB2 */ lh $t7, %lo(D_80B33AB2)($t7) /* 00438 80B326C8 24190050 */ addiu $t9, $zero, 0x0050 ## $t9 = 00000050 /* 0043C 80B326CC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 00440 80B326D0 25F8000F */ addiu $t8, $t7, 0x000F ## $t8 = 80B3000F /* 00444 80B326D4 A61802C6 */ sh $t8, 0x02C6($s0) ## 000002C6 -/* 00448 80B326D8 AFB90010 */ sw $t9, 0x0010($sp) +/* 00448 80B326D8 AFB90010 */ sw $t9, 0x0010($sp) /* 0044C 80B326DC 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 00450 80B326E0 240600C8 */ addiu $a2, $zero, 0x00C8 ## $a2 = 000000C8 -/* 00454 80B326E4 0C00D09B */ jal func_8003426C +/* 00454 80B326E4 0C00D09B */ jal func_8003426C /* 00458 80B326E8 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 /* 0045C 80B326EC 92080294 */ lbu $t0, 0x0294($s0) ## 00000294 /* 00460 80B326F0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 00464 80B326F4 2405389E */ addiu $a1, $zero, 0x389E ## $a1 = 0000389E /* 00468 80B326F8 3109FFFE */ andi $t1, $t0, 0xFFFE ## $t1 = 00000000 /* 0046C 80B326FC 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 00470 80B32700 A2090294 */ sb $t1, 0x0294($s0) ## 00000294 /* 00474 80B32704 3C0A80B3 */ lui $t2, %hi(func_80B333B8) ## $t2 = 80B30000 /* 00478 80B32708 254A33B8 */ addiu $t2, $t2, %lo(func_80B333B8) ## $t2 = 80B333B8 /* 0047C 80B3270C AE0A0190 */ sw $t2, 0x0190($s0) ## 00000190 -/* 00480 80B32710 8FBF002C */ lw $ra, 0x002C($sp) -/* 00484 80B32714 8FB00028 */ lw $s0, 0x0028($sp) +/* 00480 80B32710 8FBF002C */ lw $ra, 0x002C($sp) +/* 00484 80B32714 8FB00028 */ lw $s0, 0x0028($sp) /* 00488 80B32718 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 0048C 80B3271C 03E00008 */ jr $ra +/* 0048C 80B3271C 03E00008 */ jr $ra /* 00490 80B32720 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Weiyer/func_80B32724.s b/asm/non_matchings/overlays/actors/ovl_En_Weiyer/func_80B32724.s index 6efdaaca89..3d63a5ef95 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Weiyer/func_80B32724.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Weiyer/func_80B32724.s @@ -1,21 +1,21 @@ glabel func_80B32724 /* 00494 80B32724 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 00498 80B32728 AFB00020 */ sw $s0, 0x0020($sp) +/* 00498 80B32728 AFB00020 */ sw $s0, 0x0020($sp) /* 0049C 80B3272C 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 004A0 80B32730 AFBF0024 */ sw $ra, 0x0024($sp) +/* 004A0 80B32730 AFBF0024 */ sw $ra, 0x0024($sp) /* 004A4 80B32734 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 004A8 80B32738 24A50FC0 */ addiu $a1, $a1, 0x0FC0 ## $a1 = 06000FC0 /* 004AC 80B3273C 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 004B0 80B32740 0C0294D3 */ jal func_800A534C +/* 004B0 80B32740 0C0294D3 */ jal SkelAnime_ChangeAnimTransitionRepeat /* 004B4 80B32744 3C06C0A0 */ lui $a2, 0xC0A0 ## $a2 = C0A00000 /* 004B8 80B32748 240E0014 */ addiu $t6, $zero, 0x0014 ## $t6 = 00000014 /* 004BC 80B3274C A60E0194 */ sh $t6, 0x0194($s0) ## 00000194 /* 004C0 80B32750 240F0028 */ addiu $t7, $zero, 0x0028 ## $t7 = 00000028 -/* 004C4 80B32754 AFAF0010 */ sw $t7, 0x0010($sp) +/* 004C4 80B32754 AFAF0010 */ sw $t7, 0x0010($sp) /* 004C8 80B32758 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 004CC 80B3275C 24054000 */ addiu $a1, $zero, 0x4000 ## $a1 = 00004000 /* 004D0 80B32760 240600C8 */ addiu $a2, $zero, 0x00C8 ## $a2 = 000000C8 -/* 004D4 80B32764 0C00D09B */ jal func_8003426C +/* 004D4 80B32764 0C00D09B */ jal func_8003426C /* 004D8 80B32768 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 /* 004DC 80B3276C 92180294 */ lbu $t8, 0x0294($s0) ## 00000294 /* 004E0 80B32770 92080295 */ lbu $t0, 0x0295($s0) ## 00000295 @@ -29,10 +29,10 @@ glabel func_80B32724 /* 00500 80B32790 A2090295 */ sb $t1, 0x0295($s0) ## 00000295 /* 00504 80B32794 AE0A0190 */ sw $t2, 0x0190($s0) ## 00000190 /* 00508 80B32798 E6040068 */ swc1 $f4, 0x0068($s0) ## 00000068 -/* 0050C 80B3279C 8FBF0024 */ lw $ra, 0x0024($sp) -/* 00510 80B327A0 8FB00020 */ lw $s0, 0x0020($sp) +/* 0050C 80B3279C 8FBF0024 */ lw $ra, 0x0024($sp) +/* 00510 80B327A0 8FB00020 */ lw $s0, 0x0020($sp) /* 00514 80B327A4 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 00518 80B327A8 03E00008 */ jr $ra +/* 00518 80B327A8 03E00008 */ jr $ra /* 0051C 80B327AC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Wf/EnWf_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Wf/EnWf_Draw.s index a1bf678145..b09b99341c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Wf/EnWf_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Wf/EnWf_Draw.s @@ -1,31 +1,31 @@ glabel EnWf_Draw /* 0398C 80B3763C 27BDFFA8 */ addiu $sp, $sp, 0xFFA8 ## $sp = FFFFFFA8 -/* 03990 80B37640 AFBF002C */ sw $ra, 0x002C($sp) -/* 03994 80B37644 AFB00028 */ sw $s0, 0x0028($sp) -/* 03998 80B37648 AFA5005C */ sw $a1, 0x005C($sp) +/* 03990 80B37640 AFBF002C */ sw $ra, 0x002C($sp) +/* 03994 80B37644 AFB00028 */ sw $s0, 0x0028($sp) +/* 03998 80B37648 AFA5005C */ sw $a1, 0x005C($sp) /* 0399C 80B3764C 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 /* 039A0 80B37650 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 039A4 80B37654 3C0680B3 */ lui $a2, %hi(D_80B37B54) ## $a2 = 80B30000 /* 039A8 80B37658 24C67B54 */ addiu $a2, $a2, %lo(D_80B37B54) ## $a2 = 80B37B54 /* 039AC 80B3765C 27A40040 */ addiu $a0, $sp, 0x0040 ## $a0 = FFFFFFE8 /* 039B0 80B37660 2407086D */ addiu $a3, $zero, 0x086D ## $a3 = 0000086D -/* 039B4 80B37664 0C031AB1 */ jal func_800C6AC4 -/* 039B8 80B37668 AFA50050 */ sw $a1, 0x0050($sp) +/* 039B4 80B37664 0C031AB1 */ jal Graph_OpenDisps +/* 039B8 80B37668 AFA50050 */ sw $a1, 0x0050($sp) /* 039BC 80B3766C 8E0F02D4 */ lw $t7, 0x02D4($s0) ## 000002D4 -/* 039C0 80B37670 8FA80050 */ lw $t0, 0x0050($sp) -/* 039C4 80B37674 8FB9005C */ lw $t9, 0x005C($sp) -/* 039C8 80B37678 55E00005 */ bnel $t7, $zero, .L80B37690 +/* 039C0 80B37670 8FA80050 */ lw $t0, 0x0050($sp) +/* 039C4 80B37674 8FB9005C */ lw $t9, 0x005C($sp) +/* 039C8 80B37678 55E00005 */ bnel $t7, $zero, .L80B37690 /* 039CC 80B3767C 8F240000 */ lw $a0, 0x0000($t9) ## 00000000 /* 039D0 80B37680 86180300 */ lh $t8, 0x0300($s0) ## 00000300 -/* 039D4 80B37684 5700005F */ bnel $t8, $zero, .L80B37804 -/* 039D8 80B37688 8FAF005C */ lw $t7, 0x005C($sp) +/* 039D4 80B37684 5700005F */ bnel $t8, $zero, .L80B37804 +/* 039D8 80B37688 8FAF005C */ lw $t7, 0x005C($sp) /* 039DC 80B3768C 8F240000 */ lw $a0, 0x0000($t9) ## 00000000 .L80B37690: -/* 039E0 80B37690 0C024F46 */ jal func_80093D18 -/* 039E4 80B37694 AFA80050 */ sw $t0, 0x0050($sp) +/* 039E0 80B37690 0C024F46 */ jal func_80093D18 +/* 039E4 80B37694 AFA80050 */ sw $t0, 0x0050($sp) /* 039E8 80B37698 8609001C */ lh $t1, 0x001C($s0) ## 0000001C -/* 039EC 80B3769C 8FA80050 */ lw $t0, 0x0050($sp) -/* 039F0 80B376A0 5520001B */ bnel $t1, $zero, .L80B37710 +/* 039EC 80B3769C 8FA80050 */ lw $t0, 0x0050($sp) +/* 039F0 80B376A0 5520001B */ bnel $t1, $zero, .L80B37710 /* 039F4 80B376A4 8D0302C0 */ lw $v1, 0x02C0($t0) ## 000002C0 /* 039F8 80B376A8 8D0302C0 */ lw $v1, 0x02C0($t0) ## 000002C0 /* 039FC 80B376AC 3C0BDB06 */ lui $t3, 0xDB06 ## $t3 = DB060000 @@ -36,21 +36,21 @@ glabel EnWf_Draw /* 03A10 80B376C0 920C0302 */ lbu $t4, 0x0302($s0) ## 00000302 /* 03A14 80B376C4 3C0480B3 */ lui $a0, %hi(D_80B37AF4) ## $a0 = 80B30000 /* 03A18 80B376C8 3C098016 */ lui $t1, 0x8016 ## $t1 = 80160000 -/* 03A1C 80B376CC 000C6880 */ sll $t5, $t4, 2 -/* 03A20 80B376D0 008D2021 */ addu $a0, $a0, $t5 -/* 03A24 80B376D4 8C847AF4 */ lw $a0, %lo(D_80B37AF4)($a0) +/* 03A1C 80B376CC 000C6880 */ sll $t5, $t4, 2 +/* 03A20 80B376D0 008D2021 */ addu $a0, $a0, $t5 +/* 03A24 80B376D4 8C847AF4 */ lw $a0, %lo(D_80B37AF4)($a0) /* 03A28 80B376D8 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 /* 03A2C 80B376DC 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF -/* 03A30 80B376E0 00047900 */ sll $t7, $a0, 4 -/* 03A34 80B376E4 000FC702 */ srl $t8, $t7, 28 -/* 03A38 80B376E8 0018C880 */ sll $t9, $t8, 2 -/* 03A3C 80B376EC 01394821 */ addu $t1, $t1, $t9 +/* 03A30 80B376E0 00047900 */ sll $t7, $a0, 4 +/* 03A34 80B376E4 000FC702 */ srl $t8, $t7, 28 +/* 03A38 80B376E8 0018C880 */ sll $t9, $t8, 2 +/* 03A3C 80B376EC 01394821 */ addu $t1, $t1, $t9 /* 03A40 80B376F0 8D296FA8 */ lw $t1, 0x6FA8($t1) ## 80166FA8 -/* 03A44 80B376F4 00817024 */ and $t6, $a0, $at +/* 03A44 80B376F4 00817024 */ and $t6, $a0, $at /* 03A48 80B376F8 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 03A4C 80B376FC 01C95021 */ addu $t2, $t6, $t1 -/* 03A50 80B37700 01415821 */ addu $t3, $t2, $at -/* 03A54 80B37704 10000019 */ beq $zero, $zero, .L80B3776C +/* 03A4C 80B376FC 01C95021 */ addu $t2, $t6, $t1 +/* 03A50 80B37700 01415821 */ addu $t3, $t2, $at +/* 03A54 80B37704 10000019 */ beq $zero, $zero, .L80B3776C /* 03A58 80B37708 AC6B0004 */ sw $t3, 0x0004($v1) ## 00000004 /* 03A5C 80B3770C 8D0302C0 */ lw $v1, 0x02C0($t0) ## 000002C0 .L80B37710: @@ -62,20 +62,20 @@ glabel EnWf_Draw /* 03A74 80B37724 920F0302 */ lbu $t7, 0x0302($s0) ## 00000302 /* 03A78 80B37728 3C0480B3 */ lui $a0, %hi(D_80B37B04) ## $a0 = 80B30000 /* 03A7C 80B3772C 3C0B8016 */ lui $t3, 0x8016 ## $t3 = 80160000 -/* 03A80 80B37730 000FC080 */ sll $t8, $t7, 2 -/* 03A84 80B37734 00982021 */ addu $a0, $a0, $t8 -/* 03A88 80B37738 8C847B04 */ lw $a0, %lo(D_80B37B04)($a0) +/* 03A80 80B37730 000FC080 */ sll $t8, $t7, 2 +/* 03A84 80B37734 00982021 */ addu $a0, $a0, $t8 +/* 03A88 80B37738 8C847B04 */ lw $a0, %lo(D_80B37B04)($a0) /* 03A8C 80B3773C 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 /* 03A90 80B37740 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF -/* 03A94 80B37744 00047100 */ sll $t6, $a0, 4 -/* 03A98 80B37748 000E4F02 */ srl $t1, $t6, 28 -/* 03A9C 80B3774C 00095080 */ sll $t2, $t1, 2 -/* 03AA0 80B37750 016A5821 */ addu $t3, $t3, $t2 +/* 03A94 80B37744 00047100 */ sll $t6, $a0, 4 +/* 03A98 80B37748 000E4F02 */ srl $t1, $t6, 28 +/* 03A9C 80B3774C 00095080 */ sll $t2, $t1, 2 +/* 03AA0 80B37750 016A5821 */ addu $t3, $t3, $t2 /* 03AA4 80B37754 8D6B6FA8 */ lw $t3, 0x6FA8($t3) ## 80166FA8 -/* 03AA8 80B37758 0081C824 */ and $t9, $a0, $at +/* 03AA8 80B37758 0081C824 */ and $t9, $a0, $at /* 03AAC 80B3775C 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 03AB0 80B37760 032B6021 */ addu $t4, $t9, $t3 -/* 03AB4 80B37764 01816821 */ addu $t5, $t4, $at +/* 03AB0 80B37760 032B6021 */ addu $t4, $t9, $t3 +/* 03AB4 80B37764 01816821 */ addu $t5, $t4, $at /* 03AB8 80B37768 AC6D0004 */ sw $t5, 0x0004($v1) ## 00000004 .L80B3776C: /* 03ABC 80B3776C 8E05018C */ lw $a1, 0x018C($s0) ## 0000018C @@ -85,14 +85,14 @@ glabel EnWf_Draw /* 03ACC 80B3777C 3C1880B3 */ lui $t8, %hi(func_80B37494) ## $t8 = 80B30000 /* 03AD0 80B37780 27187494 */ addiu $t8, $t8, %lo(func_80B37494) ## $t8 = 80B37494 /* 03AD4 80B37784 25EF7454 */ addiu $t7, $t7, %lo(func_80B37454) ## $t7 = 80B37454 -/* 03AD8 80B37788 AFAF0010 */ sw $t7, 0x0010($sp) -/* 03ADC 80B3778C AFB80014 */ sw $t8, 0x0014($sp) -/* 03AE0 80B37790 AFB00018 */ sw $s0, 0x0018($sp) -/* 03AE4 80B37794 0C0286B2 */ jal func_800A1AC8 -/* 03AE8 80B37798 8FA4005C */ lw $a0, 0x005C($sp) +/* 03AD8 80B37788 AFAF0010 */ sw $t7, 0x0010($sp) +/* 03ADC 80B3778C AFB80014 */ sw $t8, 0x0014($sp) +/* 03AE0 80B37790 AFB00018 */ sw $s0, 0x0018($sp) +/* 03AE4 80B37794 0C0286B2 */ jal SkelAnime_DrawSV +/* 03AE8 80B37798 8FA4005C */ lw $a0, 0x005C($sp) /* 03AEC 80B3779C 860E02E4 */ lh $t6, 0x02E4($s0) ## 000002E4 -/* 03AF0 80B377A0 51C00018 */ beql $t6, $zero, .L80B37804 -/* 03AF4 80B377A4 8FAF005C */ lw $t7, 0x005C($sp) +/* 03AF0 80B377A0 51C00018 */ beql $t6, $zero, .L80B37804 +/* 03AF4 80B377A4 8FAF005C */ lw $t7, 0x005C($sp) /* 03AF8 80B377A8 861902E4 */ lh $t9, 0x02E4($s0) ## 000002E4 /* 03AFC 80B377AC 92090114 */ lbu $t1, 0x0114($s0) ## 00000114 /* 03B00 80B377B0 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 @@ -102,32 +102,32 @@ glabel EnWf_Draw /* 03B10 80B377C0 252A0001 */ addiu $t2, $t1, 0x0001 ## $t2 = 00000001 /* 03B14 80B377C4 A20A0114 */ sb $t2, 0x0114($s0) ## 00000114 /* 03B18 80B377C8 306C0003 */ andi $t4, $v1, 0x0003 ## $t4 = 00000000 -/* 03B1C 80B377CC 1580000C */ bne $t4, $zero, .L80B37800 -/* 03B20 80B377D0 00031083 */ sra $v0, $v1, 2 -/* 03B24 80B377D4 00026880 */ sll $t5, $v0, 2 -/* 03B28 80B377D8 01A26823 */ subu $t5, $t5, $v0 -/* 03B2C 80B377DC 000D6840 */ sll $t5, $t5, 1 -/* 03B30 80B377E0 020D3021 */ addu $a2, $s0, $t5 +/* 03B1C 80B377CC 1580000C */ bne $t4, $zero, .L80B37800 +/* 03B20 80B377D0 00031083 */ sra $v0, $v1, 2 +/* 03B24 80B377D4 00026880 */ sll $t5, $v0, 2 +/* 03B28 80B377D8 01A26823 */ subu $t5, $t5, $v0 +/* 03B2C 80B377DC 000D6840 */ sll $t5, $t5, 1 +/* 03B30 80B377E0 020D3021 */ addu $a2, $s0, $t5 /* 03B34 80B377E4 24C6014C */ addiu $a2, $a2, 0x014C ## $a2 = 0000014C -/* 03B38 80B377E8 8FA4005C */ lw $a0, 0x005C($sp) +/* 03B38 80B377E8 8FA4005C */ lw $a0, 0x005C($sp) /* 03B3C 80B377EC 2407004B */ addiu $a3, $zero, 0x004B ## $a3 = 0000004B -/* 03B40 80B377F0 AFA00010 */ sw $zero, 0x0010($sp) -/* 03B44 80B377F4 AFA00014 */ sw $zero, 0x0014($sp) -/* 03B48 80B377F8 0C00A953 */ jal func_8002A54C -/* 03B4C 80B377FC AFA20018 */ sw $v0, 0x0018($sp) +/* 03B40 80B377F0 AFA00010 */ sw $zero, 0x0010($sp) +/* 03B44 80B377F4 AFA00014 */ sw $zero, 0x0014($sp) +/* 03B48 80B377F8 0C00A953 */ jal func_8002A54C +/* 03B4C 80B377FC AFA20018 */ sw $v0, 0x0018($sp) .L80B37800: -/* 03B50 80B37800 8FAF005C */ lw $t7, 0x005C($sp) +/* 03B50 80B37800 8FAF005C */ lw $t7, 0x005C($sp) .L80B37804: /* 03B54 80B37804 3C0680B3 */ lui $a2, %hi(D_80B37B64) ## $a2 = 80B30000 /* 03B58 80B37808 24C67B64 */ addiu $a2, $a2, %lo(D_80B37B64) ## $a2 = 80B37B64 /* 03B5C 80B3780C 27A40040 */ addiu $a0, $sp, 0x0040 ## $a0 = FFFFFFE8 /* 03B60 80B37810 2407088E */ addiu $a3, $zero, 0x088E ## $a3 = 0000088E -/* 03B64 80B37814 0C031AD5 */ jal func_800C6B54 +/* 03B64 80B37814 0C031AD5 */ jal Graph_CloseDisps /* 03B68 80B37818 8DE50000 */ lw $a1, 0x0000($t7) ## 00000000 -/* 03B6C 80B3781C 8FBF002C */ lw $ra, 0x002C($sp) -/* 03B70 80B37820 8FB00028 */ lw $s0, 0x0028($sp) +/* 03B6C 80B3781C 8FBF002C */ lw $ra, 0x002C($sp) +/* 03B70 80B37820 8FB00028 */ lw $s0, 0x0028($sp) /* 03B74 80B37824 27BD0058 */ addiu $sp, $sp, 0x0058 ## $sp = 00000000 -/* 03B78 80B37828 03E00008 */ jr $ra +/* 03B78 80B37828 03E00008 */ jr $ra /* 03B7C 80B3782C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Wf/EnWf_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Wf/EnWf_Init.s index 5b4a1c36bf..f0d9af85a6 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Wf/EnWf_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Wf/EnWf_Init.s @@ -1,24 +1,24 @@ glabel EnWf_Init /* 00008 80B33CB8 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 -/* 0000C 80B33CBC AFB10028 */ sw $s1, 0x0028($sp) +/* 0000C 80B33CBC AFB10028 */ sw $s1, 0x0028($sp) /* 00010 80B33CC0 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 -/* 00014 80B33CC4 AFBF002C */ sw $ra, 0x002C($sp) -/* 00018 80B33CC8 AFB00024 */ sw $s0, 0x0024($sp) +/* 00014 80B33CC4 AFBF002C */ sw $ra, 0x002C($sp) +/* 00018 80B33CC8 AFB00024 */ sw $s0, 0x0024($sp) /* 0001C 80B33CCC 3C0580B3 */ lui $a1, %hi(D_80B37AC8) ## $a1 = 80B30000 /* 00020 80B33CD0 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 00024 80B33CD4 0C01E037 */ jal Actor_ProcessInitChain - + /* 00028 80B33CD8 24A57AC8 */ addiu $a1, $a1, %lo(D_80B37AC8) ## $a1 = 80B37AC8 /* 0002C 80B33CDC 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 /* 00030 80B33CE0 3C0E80B3 */ lui $t6, %hi(D_80B37A88) ## $t6 = 80B30000 /* 00034 80B33CE4 25CE7A88 */ addiu $t6, $t6, %lo(D_80B37A88) ## $t6 = 80B37A88 /* 00038 80B33CE8 3C068003 */ lui $a2, 0x8003 ## $a2 = 80030000 -/* 0003C 80B33CEC 44050000 */ mfc1 $a1, $f0 -/* 00040 80B33CF0 44070000 */ mfc1 $a3, $f0 +/* 0003C 80B33CEC 44050000 */ mfc1 $a1, $f0 +/* 00040 80B33CF0 44070000 */ mfc1 $a3, $f0 /* 00044 80B33CF4 AE0E0098 */ sw $t6, 0x0098($s0) ## 00000098 /* 00048 80B33CF8 24C6B5EC */ addiu $a2, $a2, 0xB5EC ## $a2 = 8002B5EC /* 0004C 80B33CFC 0C00AC78 */ jal ActorShape_Init - + /* 00050 80B33D00 260400B4 */ addiu $a0, $s0, 0x00B4 ## $a0 = 000000B4 /* 00054 80B33D04 8E180024 */ lw $t8, 0x0024($s0) ## 00000024 /* 00058 80B33D08 8E0F0028 */ lw $t7, 0x0028($s0) ## 00000028 @@ -29,7 +29,7 @@ glabel EnWf_Init /* 0006C 80B33D1C 8E18002C */ lw $t8, 0x002C($s0) ## 0000002C /* 00070 80B33D20 44812000 */ mtc1 $at, $f4 ## $f4 = 10.00 /* 00074 80B33D24 AE0F003C */ sw $t7, 0x003C($s0) ## 0000003C -/* 00078 80B33D28 000B6203 */ sra $t4, $t3, 8 +/* 00078 80B33D28 000B6203 */ sra $t4, $t3, 8 /* 0007C 80B33D2C 241900FE */ addiu $t9, $zero, 0x00FE ## $t9 = 000000FE /* 00080 80B33D30 24080008 */ addiu $t0, $zero, 0x0008 ## $t0 = 00000008 /* 00084 80B33D34 24090032 */ addiu $t1, $zero, 0x0032 ## $t1 = 00000032 @@ -46,82 +46,82 @@ glabel EnWf_Init /* 000B0 80B33D60 26050304 */ addiu $a1, $s0, 0x0304 ## $a1 = 00000304 /* 000B4 80B33D64 AE180040 */ sw $t8, 0x0040($s0) ## 00000040 /* 000B8 80B33D68 E60402F4 */ swc1 $f4, 0x02F4($s0) ## 000002F4 -/* 000BC 80B33D6C AFA50034 */ sw $a1, 0x0034($sp) -/* 000C0 80B33D70 0C016EFE */ jal func_8005BBF8 +/* 000BC 80B33D6C AFA50034 */ sw $a1, 0x0034($sp) +/* 000C0 80B33D70 0C016EFE */ jal func_8005BBF8 /* 000C4 80B33D74 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 000C8 80B33D78 3C0780B3 */ lui $a3, %hi(D_80B37A20) ## $a3 = 80B30000 /* 000CC 80B33D7C 26180324 */ addiu $t8, $s0, 0x0324 ## $t8 = 00000324 -/* 000D0 80B33D80 8FA50034 */ lw $a1, 0x0034($sp) -/* 000D4 80B33D84 AFB80010 */ sw $t8, 0x0010($sp) +/* 000D0 80B33D80 8FA50034 */ lw $a1, 0x0034($sp) +/* 000D4 80B33D84 AFB80010 */ sw $t8, 0x0010($sp) /* 000D8 80B33D88 24E77A20 */ addiu $a3, $a3, %lo(D_80B37A20) ## $a3 = 80B37A20 /* 000DC 80B33D8C 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 000E0 80B33D90 0C017014 */ jal func_8005C050 +/* 000E0 80B33D90 0C017014 */ jal func_8005C050 /* 000E4 80B33D94 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 000E8 80B33D98 26050424 */ addiu $a1, $s0, 0x0424 ## $a1 = 00000424 -/* 000EC 80B33D9C AFA50034 */ sw $a1, 0x0034($sp) +/* 000EC 80B33D9C AFA50034 */ sw $a1, 0x0034($sp) /* 000F0 80B33DA0 0C0170D9 */ jal ActorCollider_AllocCylinder - + /* 000F4 80B33DA4 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 000F8 80B33DA8 3C0780B3 */ lui $a3, %hi(D_80B37A30) ## $a3 = 80B30000 -/* 000FC 80B33DAC 8FA50034 */ lw $a1, 0x0034($sp) +/* 000FC 80B33DAC 8FA50034 */ lw $a1, 0x0034($sp) /* 00100 80B33DB0 24E77A30 */ addiu $a3, $a3, %lo(D_80B37A30) ## $a3 = 80B37A30 /* 00104 80B33DB4 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 00108 80B33DB8 0C01712B */ jal ActorCollider_InitCylinder - + /* 0010C 80B33DBC 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 00110 80B33DC0 26050470 */ addiu $a1, $s0, 0x0470 ## $a1 = 00000470 -/* 00114 80B33DC4 AFA50034 */ sw $a1, 0x0034($sp) +/* 00114 80B33DC4 AFA50034 */ sw $a1, 0x0034($sp) /* 00118 80B33DC8 0C0170D9 */ jal ActorCollider_AllocCylinder - + /* 0011C 80B33DCC 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 00120 80B33DD0 3C0780B3 */ lui $a3, %hi(D_80B37A5C) ## $a3 = 80B30000 -/* 00124 80B33DD4 8FA50034 */ lw $a1, 0x0034($sp) +/* 00124 80B33DD4 8FA50034 */ lw $a1, 0x0034($sp) /* 00128 80B33DD8 24E77A5C */ addiu $a3, $a3, %lo(D_80B37A5C) ## $a3 = 80B37A5C /* 0012C 80B33DDC 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 00130 80B33DE0 0C01712B */ jal ActorCollider_InitCylinder - + /* 00134 80B33DE4 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 00138 80B33DE8 8619001C */ lh $t9, 0x001C($s0) ## 0000001C /* 0013C 80B33DEC 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 00140 80B33DF0 26050188 */ addiu $a1, $s0, 0x0188 ## $a1 = 00000188 -/* 00144 80B33DF4 17200015 */ bne $t9, $zero, .L80B33E4C +/* 00144 80B33DF4 17200015 */ bne $t9, $zero, .L80B33E4C /* 00148 80B33DF8 3C060600 */ lui $a2, 0x0600 ## $a2 = 06000000 /* 0014C 80B33DFC 3C060601 */ lui $a2, 0x0601 ## $a2 = 06010000 /* 00150 80B33E00 3C070601 */ lui $a3, 0x0601 ## $a3 = 06010000 /* 00154 80B33E04 260801CC */ addiu $t0, $s0, 0x01CC ## $t0 = 000001CC /* 00158 80B33E08 26090250 */ addiu $t1, $s0, 0x0250 ## $t1 = 00000250 /* 0015C 80B33E0C 240A0016 */ addiu $t2, $zero, 0x0016 ## $t2 = 00000016 -/* 00160 80B33E10 AFAA0018 */ sw $t2, 0x0018($sp) -/* 00164 80B33E14 AFA90014 */ sw $t1, 0x0014($sp) -/* 00168 80B33E18 AFA80010 */ sw $t0, 0x0010($sp) +/* 00160 80B33E10 AFAA0018 */ sw $t2, 0x0018($sp) +/* 00164 80B33E14 AFA90014 */ sw $t1, 0x0014($sp) +/* 00168 80B33E18 AFA80010 */ sw $t0, 0x0010($sp) /* 0016C 80B33E1C 24E7A4AC */ addiu $a3, $a3, 0xA4AC ## $a3 = 0600A4AC /* 00170 80B33E20 24C69690 */ addiu $a2, $a2, 0x9690 ## $a2 = 06009690 /* 00174 80B33E24 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 00178 80B33E28 0C0291BE */ jal func_800A46F8 +/* 00178 80B33E28 0C0291BE */ jal SkelAnime_InitSV /* 0017C 80B33E2C 26050188 */ addiu $a1, $s0, 0x0188 ## $a1 = 00000188 /* 00180 80B33E30 3C053BF5 */ lui $a1, 0x3BF5 ## $a1 = 3BF50000 /* 00184 80B33E34 34A5C28F */ ori $a1, $a1, 0xC28F ## $a1 = 3BF5C28F /* 00188 80B33E38 0C00B58B */ jal Actor_SetScale - + /* 0018C 80B33E3C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 00190 80B33E40 240B004C */ addiu $t3, $zero, 0x004C ## $t3 = 0000004C -/* 00194 80B33E44 10000017 */ beq $zero, $zero, .L80B33EA4 +/* 00194 80B33E44 10000017 */ beq $zero, $zero, .L80B33EA4 /* 00198 80B33E48 A20B0117 */ sb $t3, 0x0117($s0) ## 00000117 .L80B33E4C: /* 0019C 80B33E4C 3C070601 */ lui $a3, 0x0601 ## $a3 = 06010000 /* 001A0 80B33E50 260C01CC */ addiu $t4, $s0, 0x01CC ## $t4 = 000001CC /* 001A4 80B33E54 260D0250 */ addiu $t5, $s0, 0x0250 ## $t5 = 00000250 /* 001A8 80B33E58 240E0016 */ addiu $t6, $zero, 0x0016 ## $t6 = 00000016 -/* 001AC 80B33E5C AFAE0018 */ sw $t6, 0x0018($sp) -/* 001B0 80B33E60 AFAD0014 */ sw $t5, 0x0014($sp) -/* 001B4 80B33E64 AFAC0010 */ sw $t4, 0x0010($sp) +/* 001AC 80B33E5C AFAE0018 */ sw $t6, 0x0018($sp) +/* 001B0 80B33E60 AFAD0014 */ sw $t5, 0x0014($sp) +/* 001B4 80B33E64 AFAC0010 */ sw $t4, 0x0010($sp) /* 001B8 80B33E68 24E7A4AC */ addiu $a3, $a3, 0xA4AC ## $a3 = 0600A4AC -/* 001BC 80B33E6C 0C0291BE */ jal func_800A46F8 +/* 001BC 80B33E6C 0C0291BE */ jal SkelAnime_InitSV /* 001C0 80B33E70 24C63BC0 */ addiu $a2, $a2, 0x3BC0 ## $a2 = 00003BC0 /* 001C4 80B33E74 3C053C23 */ lui $a1, 0x3C23 ## $a1 = 3C230000 /* 001C8 80B33E78 34A5D70A */ ori $a1, $a1, 0xD70A ## $a1 = 3C23D70A /* 001CC 80B33E7C 0C00B58B */ jal Actor_SetScale - + /* 001D0 80B33E80 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 001D4 80B33E84 8E180320 */ lw $t8, 0x0320($s0) ## 00000320 /* 001D8 80B33E88 240F0008 */ addiu $t7, $zero, 0x0008 ## $t7 = 00000008 @@ -132,25 +132,25 @@ glabel EnWf_Init /* 001EC 80B33E9C A0590005 */ sb $t9, 0x0005($v0) ## 00000005 /* 001F0 80B33EA0 A2080117 */ sb $t0, 0x0117($s0) ## 00000117 .L80B33EA4: -/* 001F4 80B33EA4 0C2CD0E0 */ jal func_80B34380 +/* 001F4 80B33EA4 0C2CD0E0 */ jal func_80B34380 /* 001F8 80B33EA8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 001FC 80B33EAC 860502FC */ lh $a1, 0x02FC($s0) ## 000002FC /* 00200 80B33EB0 240100FF */ addiu $at, $zero, 0x00FF ## $at = 000000FF -/* 00204 80B33EB4 50A10008 */ beql $a1, $at, .L80B33ED8 -/* 00208 80B33EB8 8FBF002C */ lw $ra, 0x002C($sp) +/* 00204 80B33EB4 50A10008 */ beql $a1, $at, .L80B33ED8 +/* 00208 80B33EB8 8FBF002C */ lw $ra, 0x002C($sp) /* 0020C 80B33EBC 0C00B2D0 */ jal Flags_GetSwitch - + /* 00210 80B33EC0 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 00214 80B33EC4 50400004 */ beql $v0, $zero, .L80B33ED8 -/* 00218 80B33EC8 8FBF002C */ lw $ra, 0x002C($sp) +/* 00214 80B33EC4 50400004 */ beql $v0, $zero, .L80B33ED8 +/* 00218 80B33EC8 8FBF002C */ lw $ra, 0x002C($sp) /* 0021C 80B33ECC 0C00B55C */ jal Actor_Kill - + /* 00220 80B33ED0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00224 80B33ED4 8FBF002C */ lw $ra, 0x002C($sp) +/* 00224 80B33ED4 8FBF002C */ lw $ra, 0x002C($sp) .L80B33ED8: -/* 00228 80B33ED8 8FB00024 */ lw $s0, 0x0024($sp) -/* 0022C 80B33EDC 8FB10028 */ lw $s1, 0x0028($sp) -/* 00230 80B33EE0 03E00008 */ jr $ra +/* 00228 80B33ED8 8FB00024 */ lw $s0, 0x0024($sp) +/* 0022C 80B33EDC 8FB10028 */ lw $s1, 0x0028($sp) +/* 00230 80B33EE0 03E00008 */ jr $ra /* 00234 80B33EE4 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Wf/func_80B34380.s b/asm/non_matchings/overlays/actors/ovl_En_Wf/func_80B34380.s index 19f6e19074..efae3f704b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Wf/func_80B34380.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Wf/func_80B34380.s @@ -3,30 +3,30 @@ glabel func_80B34380 /* 006D4 80B34384 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 /* 006D8 80B34388 3C0140E0 */ lui $at, 0x40E0 ## $at = 40E00000 /* 006DC 80B3438C 44812000 */ mtc1 $at, $f4 ## $f4 = 7.00 -/* 006E0 80B34390 AFB00028 */ sw $s0, 0x0028($sp) +/* 006E0 80B34390 AFB00028 */ sw $s0, 0x0028($sp) /* 006E4 80B34394 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 006E8 80B34398 AFBF002C */ sw $ra, 0x002C($sp) +/* 006E8 80B34398 AFBF002C */ sw $ra, 0x002C($sp) /* 006EC 80B3439C 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 006F0 80B343A0 240E0003 */ addiu $t6, $zero, 0x0003 ## $t6 = 00000003 -/* 006F4 80B343A4 44070000 */ mfc1 $a3, $f0 -/* 006F8 80B343A8 AFAE0014 */ sw $t6, 0x0014($sp) +/* 006F4 80B343A4 44070000 */ mfc1 $a3, $f0 +/* 006F8 80B343A8 AFAE0014 */ sw $t6, 0x0014($sp) /* 006FC 80B343AC 24A55430 */ addiu $a1, $a1, 0x5430 ## $a1 = 06005430 /* 00700 80B343B0 24840188 */ addiu $a0, $a0, 0x0188 ## $a0 = 00000188 /* 00704 80B343B4 3C063F00 */ lui $a2, 0x3F00 ## $a2 = 3F000000 -/* 00708 80B343B8 E7A00018 */ swc1 $f0, 0x0018($sp) -/* 0070C 80B343BC 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 00710 80B343C0 E7A40010 */ swc1 $f4, 0x0010($sp) +/* 00708 80B343B8 E7A00018 */ swc1 $f0, 0x0018($sp) +/* 0070C 80B343BC 0C029468 */ jal SkelAnime_ChangeAnim + +/* 00710 80B343C0 E7A40010 */ swc1 $f4, 0x0010($sp) /* 00714 80B343C4 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 /* 00718 80B343C8 44814000 */ mtc1 $at, $f8 ## $f8 = 5.00 /* 0071C 80B343CC C606000C */ lwc1 $f6, 0x000C($s0) ## 0000000C /* 00720 80B343D0 8E180004 */ lw $t8, 0x0004($s0) ## 00000004 /* 00724 80B343D4 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 00728 80B343D8 46083281 */ sub.s $f10, $f6, $f8 +/* 00728 80B343D8 46083281 */ sub.s $f10, $f6, $f8 /* 0072C 80B343DC 2401FFFE */ addiu $at, $zero, 0xFFFE ## $at = FFFFFFFE /* 00730 80B343E0 240F0014 */ addiu $t7, $zero, 0x0014 ## $t7 = 00000014 /* 00734 80B343E4 3C0580B3 */ lui $a1, %hi(func_80B34428) ## $a1 = 80B30000 -/* 00738 80B343E8 0301C824 */ and $t9, $t8, $at +/* 00738 80B343E8 0301C824 */ and $t9, $t8, $at /* 0073C 80B343EC E60A0028 */ swc1 $f10, 0x0028($s0) ## 00000028 /* 00740 80B343F0 AE0F02E8 */ sw $t7, 0x02E8($s0) ## 000002E8 /* 00744 80B343F4 A6000300 */ sh $zero, 0x0300($s0) ## 00000300 @@ -35,12 +35,12 @@ glabel func_80B34380 /* 00750 80B34400 24A54428 */ addiu $a1, $a1, %lo(func_80B34428) ## $a1 = 80B34428 /* 00754 80B34404 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 00758 80B34408 E6000054 */ swc1 $f0, 0x0054($s0) ## 00000054 -/* 0075C 80B3440C 0C2CCF2C */ jal func_80B33CB0 +/* 0075C 80B3440C 0C2CCF2C */ jal func_80B33CB0 /* 00760 80B34410 E600006C */ swc1 $f0, 0x006C($s0) ## 0000006C -/* 00764 80B34414 8FBF002C */ lw $ra, 0x002C($sp) -/* 00768 80B34418 8FB00028 */ lw $s0, 0x0028($sp) +/* 00764 80B34414 8FBF002C */ lw $ra, 0x002C($sp) +/* 00768 80B34418 8FB00028 */ lw $s0, 0x0028($sp) /* 0076C 80B3441C 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 00770 80B34420 03E00008 */ jr $ra +/* 00770 80B34420 03E00008 */ jr $ra /* 00774 80B34424 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Wf/func_80B3455C.s b/asm/non_matchings/overlays/actors/ovl_En_Wf/func_80B3455C.s index 3e6ac1e5fc..c66cfda811 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Wf/func_80B3455C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Wf/func_80B3455C.s @@ -1,14 +1,14 @@ glabel func_80B3455C /* 008AC 80B3455C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 008B0 80B34560 AFBF0014 */ sw $ra, 0x0014($sp) +/* 008B0 80B34560 AFBF0014 */ sw $ra, 0x0014($sp) /* 008B4 80B34564 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 /* 008B8 80B34568 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 /* 008BC 80B3456C 24A5A4AC */ addiu $a1, $a1, 0xA4AC ## $a1 = 0600A4AC -/* 008C0 80B34570 AFA70018 */ sw $a3, 0x0018($sp) +/* 008C0 80B34570 AFA70018 */ sw $a3, 0x0018($sp) /* 008C4 80B34574 24840188 */ addiu $a0, $a0, 0x0188 ## $a0 = 00000188 -/* 008C8 80B34578 0C0294D3 */ jal func_800A534C +/* 008C8 80B34578 0C0294D3 */ jal SkelAnime_ChangeAnimTransitionRepeat /* 008CC 80B3457C 3C06C080 */ lui $a2, 0xC080 ## $a2 = C0800000 -/* 008D0 80B34580 8FA70018 */ lw $a3, 0x0018($sp) +/* 008D0 80B34580 8FA70018 */ lw $a3, 0x0018($sp) /* 008D4 80B34584 240E0006 */ addiu $t6, $zero, 0x0006 ## $t6 = 00000006 /* 008D8 80B34588 0C03F66B */ jal Math_Rand_ZeroOne ## Rand.Next() float @@ -17,22 +17,22 @@ glabel func_80B3455C /* 008E4 80B34594 44812000 */ mtc1 $at, $f4 ## $f4 = 10.00 /* 008E8 80B34598 3C014000 */ lui $at, 0x4000 ## $at = 40000000 /* 008EC 80B3459C 44814000 */ mtc1 $at, $f8 ## $f8 = 2.00 -/* 008F0 80B345A0 46040182 */ mul.s $f6, $f0, $f4 -/* 008F4 80B345A4 8FA40018 */ lw $a0, 0x0018($sp) +/* 008F0 80B345A0 46040182 */ mul.s $f6, $f0, $f4 +/* 008F4 80B345A4 8FA40018 */ lw $a0, 0x0018($sp) /* 008F8 80B345A8 44809000 */ mtc1 $zero, $f18 ## $f18 = 0.00 /* 008FC 80B345AC 3C0580B3 */ lui $a1, %hi(func_80B345E4) ## $a1 = 80B30000 /* 00900 80B345B0 849900B6 */ lh $t9, 0x00B6($a0) ## 000000B6 /* 00904 80B345B4 24A545E4 */ addiu $a1, $a1, %lo(func_80B345E4) ## $a1 = 80B345E4 /* 00908 80B345B8 E4920068 */ swc1 $f18, 0x0068($a0) ## 00000068 -/* 0090C 80B345BC 46083280 */ add.s $f10, $f6, $f8 +/* 0090C 80B345BC 46083280 */ add.s $f10, $f6, $f8 /* 00910 80B345C0 A4990032 */ sh $t9, 0x0032($a0) ## 00000032 -/* 00914 80B345C4 4600540D */ trunc.w.s $f16, $f10 -/* 00918 80B345C8 44188000 */ mfc1 $t8, $f16 -/* 0091C 80B345CC 0C2CCF2C */ jal func_80B33CB0 +/* 00914 80B345C4 4600540D */ trunc.w.s $f16, $f10 +/* 00918 80B345C8 44188000 */ mfc1 $t8, $f16 +/* 0091C 80B345CC 0C2CCF2C */ jal func_80B33CB0 /* 00920 80B345D0 AC9802E8 */ sw $t8, 0x02E8($a0) ## 000002E8 -/* 00924 80B345D4 8FBF0014 */ lw $ra, 0x0014($sp) +/* 00924 80B345D4 8FBF0014 */ lw $ra, 0x0014($sp) /* 00928 80B345D8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 0092C 80B345DC 03E00008 */ jr $ra +/* 0092C 80B345DC 03E00008 */ jr $ra /* 00930 80B345E0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Wf/func_80B347FC.s b/asm/non_matchings/overlays/actors/ovl_En_Wf/func_80B347FC.s index f8e70a2659..7cebee9ec2 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Wf/func_80B347FC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Wf/func_80B347FC.s @@ -1,37 +1,37 @@ glabel func_80B347FC /* 00B4C 80B347FC 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 00B50 80B34800 AFA40028 */ sw $a0, 0x0028($sp) -/* 00B54 80B34804 AFBF0024 */ sw $ra, 0x0024($sp) +/* 00B50 80B34800 AFA40028 */ sw $a0, 0x0028($sp) +/* 00B54 80B34804 AFBF0024 */ sw $ra, 0x0024($sp) /* 00B58 80B34808 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 -/* 00B5C 80B3480C AFA5002C */ sw $a1, 0x002C($sp) +/* 00B5C 80B3480C AFA5002C */ sw $a1, 0x002C($sp) /* 00B60 80B34810 0C028800 */ jal SkelAnime_GetFrameCount - + /* 00B64 80B34814 248457A0 */ addiu $a0, $a0, 0x57A0 ## $a0 = 060057A0 /* 00B68 80B34818 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 00B6C 80B3481C 3C01C080 */ lui $at, 0xC080 ## $at = C0800000 /* 00B70 80B34820 44814000 */ mtc1 $at, $f8 ## $f8 = -4.00 -/* 00B74 80B34824 468021A0 */ cvt.s.w $f6, $f4 -/* 00B78 80B34828 8FA40028 */ lw $a0, 0x0028($sp) +/* 00B74 80B34824 468021A0 */ cvt.s.w $f6, $f4 +/* 00B78 80B34828 8FA40028 */ lw $a0, 0x0028($sp) /* 00B7C 80B3482C 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 00B80 80B34830 240E0001 */ addiu $t6, $zero, 0x0001 ## $t6 = 00000001 -/* 00B84 80B34834 AFAE0014 */ sw $t6, 0x0014($sp) +/* 00B84 80B34834 AFAE0014 */ sw $t6, 0x0014($sp) /* 00B88 80B34838 24A557A0 */ addiu $a1, $a1, 0x57A0 ## $a1 = 060057A0 -/* 00B8C 80B3483C E7A60010 */ swc1 $f6, 0x0010($sp) +/* 00B8C 80B3483C E7A60010 */ swc1 $f6, 0x0010($sp) /* 00B90 80B34840 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 00B94 80B34844 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 00B98 80B34848 E7A80018 */ swc1 $f8, 0x0018($sp) -/* 00B9C 80B3484C 0C029468 */ jal SkelAnime_ChangeAnimation - +/* 00B98 80B34848 E7A80018 */ swc1 $f8, 0x0018($sp) +/* 00B9C 80B3484C 0C029468 */ jal SkelAnime_ChangeAnim + /* 00BA0 80B34850 24840188 */ addiu $a0, $a0, 0x0188 ## $a0 = 00000188 -/* 00BA4 80B34854 8FA40028 */ lw $a0, 0x0028($sp) +/* 00BA4 80B34854 8FA40028 */ lw $a0, 0x0028($sp) /* 00BA8 80B34858 240F0009 */ addiu $t7, $zero, 0x0009 ## $t7 = 00000009 /* 00BAC 80B3485C 3C0580B3 */ lui $a1, %hi(func_80B3487C) ## $a1 = 80B30000 /* 00BB0 80B34860 24A5487C */ addiu $a1, $a1, %lo(func_80B3487C) ## $a1 = 80B3487C -/* 00BB4 80B34864 0C2CCF2C */ jal func_80B33CB0 +/* 00BB4 80B34864 0C2CCF2C */ jal func_80B33CB0 /* 00BB8 80B34868 AC8F02D4 */ sw $t7, 0x02D4($a0) ## 000002D4 -/* 00BBC 80B3486C 8FBF0024 */ lw $ra, 0x0024($sp) +/* 00BBC 80B3486C 8FBF0024 */ lw $ra, 0x0024($sp) /* 00BC0 80B34870 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 00BC4 80B34874 03E00008 */ jr $ra +/* 00BC4 80B34874 03E00008 */ jr $ra /* 00BC8 80B34878 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Wf/func_80B34CFC.s b/asm/non_matchings/overlays/actors/ovl_En_Wf/func_80B34CFC.s index 87f4f8344a..1a0cc247f8 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Wf/func_80B34CFC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Wf/func_80B34CFC.s @@ -1,22 +1,22 @@ glabel func_80B34CFC /* 0104C 80B34CFC 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 01050 80B34D00 AFBF0014 */ sw $ra, 0x0014($sp) +/* 01050 80B34D00 AFBF0014 */ sw $ra, 0x0014($sp) /* 01054 80B34D04 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 /* 01058 80B34D08 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 /* 0105C 80B34D0C 24A598C8 */ addiu $a1, $a1, 0x98C8 ## $a1 = 060098C8 -/* 01060 80B34D10 AFA70018 */ sw $a3, 0x0018($sp) +/* 01060 80B34D10 AFA70018 */ sw $a3, 0x0018($sp) /* 01064 80B34D14 24840188 */ addiu $a0, $a0, 0x0188 ## $a0 = 00000188 -/* 01068 80B34D18 0C0294D3 */ jal func_800A534C +/* 01068 80B34D18 0C0294D3 */ jal SkelAnime_ChangeAnimTransitionRepeat /* 0106C 80B34D1C 3C06C080 */ lui $a2, 0xC080 ## $a2 = C0800000 -/* 01070 80B34D20 8FA40018 */ lw $a0, 0x0018($sp) +/* 01070 80B34D20 8FA40018 */ lw $a0, 0x0018($sp) /* 01074 80B34D24 240E000A */ addiu $t6, $zero, 0x000A ## $t6 = 0000000A /* 01078 80B34D28 3C0580B3 */ lui $a1, %hi(func_80B34D48) ## $a1 = 80B30000 /* 0107C 80B34D2C 24A54D48 */ addiu $a1, $a1, %lo(func_80B34D48) ## $a1 = 80B34D48 -/* 01080 80B34D30 0C2CCF2C */ jal func_80B33CB0 +/* 01080 80B34D30 0C2CCF2C */ jal func_80B33CB0 /* 01084 80B34D34 AC8E02D4 */ sw $t6, 0x02D4($a0) ## 000002D4 -/* 01088 80B34D38 8FBF0014 */ lw $ra, 0x0014($sp) +/* 01088 80B34D38 8FBF0014 */ lw $ra, 0x0014($sp) /* 0108C 80B34D3C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 01090 80B34D40 03E00008 */ jr $ra +/* 01090 80B34D40 03E00008 */ jr $ra /* 01094 80B34D44 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Wf/func_80B34F28.s b/asm/non_matchings/overlays/actors/ovl_En_Wf/func_80B34F28.s index e40549e462..59c62a5780 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Wf/func_80B34F28.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Wf/func_80B34F28.s @@ -1,27 +1,27 @@ glabel func_80B34F28 /* 01278 80B34F28 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 0127C 80B34F2C AFB00028 */ sw $s0, 0x0028($sp) +/* 0127C 80B34F2C AFB00028 */ sw $s0, 0x0028($sp) /* 01280 80B34F30 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 01284 80B34F34 AFBF002C */ sw $ra, 0x002C($sp) +/* 01284 80B34F34 AFBF002C */ sw $ra, 0x002C($sp) /* 01288 80B34F38 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 /* 0128C 80B34F3C 0C028800 */ jal SkelAnime_GetFrameCount - + /* 01290 80B34F40 248457A0 */ addiu $a0, $a0, 0x57A0 ## $a0 = 060057A0 /* 01294 80B34F44 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 01298 80B34F48 3C01C080 */ lui $at, 0xC080 ## $at = C0800000 /* 0129C 80B34F4C 44814000 */ mtc1 $at, $f8 ## $f8 = -4.00 -/* 012A0 80B34F50 468021A0 */ cvt.s.w $f6, $f4 +/* 012A0 80B34F50 468021A0 */ cvt.s.w $f6, $f4 /* 012A4 80B34F54 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 012A8 80B34F58 240E0001 */ addiu $t6, $zero, 0x0001 ## $t6 = 00000001 -/* 012AC 80B34F5C AFAE0014 */ sw $t6, 0x0014($sp) +/* 012AC 80B34F5C AFAE0014 */ sw $t6, 0x0014($sp) /* 012B0 80B34F60 24A557A0 */ addiu $a1, $a1, 0x57A0 ## $a1 = 060057A0 /* 012B4 80B34F64 26040188 */ addiu $a0, $s0, 0x0188 ## $a0 = 00000188 -/* 012B8 80B34F68 E7A60010 */ swc1 $f6, 0x0010($sp) +/* 012B8 80B34F68 E7A60010 */ swc1 $f6, 0x0010($sp) /* 012BC 80B34F6C 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 012C0 80B34F70 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 012C4 80B34F74 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 012C8 80B34F78 E7A80018 */ swc1 $f8, 0x0018($sp) +/* 012C4 80B34F74 0C029468 */ jal SkelAnime_ChangeAnim + +/* 012C8 80B34F78 E7A80018 */ swc1 $f8, 0x0018($sp) /* 012CC 80B34F7C 0C03F66B */ jal Math_Rand_ZeroOne ## Rand.Next() float /* 012D0 80B34F80 00000000 */ nop @@ -29,20 +29,20 @@ glabel func_80B34F28 /* 012D8 80B34F88 44815000 */ mtc1 $at, $f10 ## $f10 = 0.50 /* 012DC 80B34F8C 3C0140C0 */ lui $at, 0x40C0 ## $at = 40C00000 /* 012E0 80B34F90 240F3E80 */ addiu $t7, $zero, 0x3E80 ## $t7 = 00003E80 -/* 012E4 80B34F94 4600503C */ c.lt.s $f10, $f0 +/* 012E4 80B34F94 4600503C */ c.lt.s $f10, $f0 /* 012E8 80B34F98 44810000 */ mtc1 $at, $f0 ## $f0 = 6.00 /* 012EC 80B34F9C 2418C180 */ addiu $t8, $zero, 0xC180 ## $t8 = FFFFC180 /* 012F0 80B34FA0 3C0180B3 */ lui $at, %hi(D_80B37B8C) ## $at = 80B30000 -/* 012F4 80B34FA4 45020004 */ bc1fl .L80B34FB8 +/* 012F4 80B34FA4 45020004 */ bc1fl .L80B34FB8 /* 012F8 80B34FA8 A61802FE */ sh $t8, 0x02FE($s0) ## 000002FE -/* 012FC 80B34FAC 10000002 */ beq $zero, $zero, .L80B34FB8 +/* 012FC 80B34FAC 10000002 */ beq $zero, $zero, .L80B34FB8 /* 01300 80B34FB0 A60F02FE */ sh $t7, 0x02FE($s0) ## 000002FE /* 01304 80B34FB4 A61802FE */ sh $t8, 0x02FE($s0) ## 000002FE .L80B34FB8: /* 01308 80B34FB8 E6000068 */ swc1 $f0, 0x0068($s0) ## 00000068 -/* 0130C 80B34FBC C4307B8C */ lwc1 $f16, %lo(D_80B37B8C)($at) +/* 0130C 80B34FBC C4307B8C */ lwc1 $f16, %lo(D_80B37B8C)($at) /* 01310 80B34FC0 861900B6 */ lh $t9, 0x00B6($s0) ## 000000B6 -/* 01314 80B34FC4 46100482 */ mul.s $f18, $f0, $f16 +/* 01314 80B34FC4 46100482 */ mul.s $f18, $f0, $f16 /* 01318 80B34FC8 A6190032 */ sh $t9, 0x0032($s0) ## 00000032 /* 0131C 80B34FCC 0C03F66B */ jal Math_Rand_ZeroOne ## Rand.Next() float @@ -51,21 +51,21 @@ glabel func_80B34F28 /* 01328 80B34FD8 44811000 */ mtc1 $at, $f2 ## $f2 = 30.00 /* 0132C 80B34FDC 44805000 */ mtc1 $zero, $f10 ## $f10 = 0.00 /* 01330 80B34FE0 240A000B */ addiu $t2, $zero, 0x000B ## $t2 = 0000000B -/* 01334 80B34FE4 46020102 */ mul.s $f4, $f0, $f2 +/* 01334 80B34FE4 46020102 */ mul.s $f4, $f0, $f2 /* 01338 80B34FE8 3C0580B3 */ lui $a1, %hi(func_80B35024) ## $a1 = 80B30000 /* 0133C 80B34FEC AE0A02D4 */ sw $t2, 0x02D4($s0) ## 000002D4 /* 01340 80B34FF0 24A55024 */ addiu $a1, $a1, %lo(func_80B35024) ## $a1 = 80B35024 /* 01344 80B34FF4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 01348 80B34FF8 E60A02EC */ swc1 $f10, 0x02EC($s0) ## 000002EC -/* 0134C 80B34FFC 46022180 */ add.s $f6, $f4, $f2 -/* 01350 80B35000 4600320D */ trunc.w.s $f8, $f6 -/* 01354 80B35004 44094000 */ mfc1 $t1, $f8 -/* 01358 80B35008 0C2CCF2C */ jal func_80B33CB0 +/* 0134C 80B34FFC 46022180 */ add.s $f6, $f4, $f2 +/* 01350 80B35000 4600320D */ trunc.w.s $f8, $f6 +/* 01354 80B35004 44094000 */ mfc1 $t1, $f8 +/* 01358 80B35008 0C2CCF2C */ jal func_80B33CB0 /* 0135C 80B3500C AE0902E8 */ sw $t1, 0x02E8($s0) ## 000002E8 -/* 01360 80B35010 8FBF002C */ lw $ra, 0x002C($sp) -/* 01364 80B35014 8FB00028 */ lw $s0, 0x0028($sp) +/* 01360 80B35010 8FBF002C */ lw $ra, 0x002C($sp) +/* 01364 80B35014 8FB00028 */ lw $s0, 0x0028($sp) /* 01368 80B35018 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 0136C 80B3501C 03E00008 */ jr $ra +/* 0136C 80B3501C 03E00008 */ jr $ra /* 01370 80B35020 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Wf/func_80B35540.s b/asm/non_matchings/overlays/actors/ovl_En_Wf/func_80B35540.s index 41087fdfa3..b9fa35ffda 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Wf/func_80B35540.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Wf/func_80B35540.s @@ -1,13 +1,13 @@ glabel func_80B35540 /* 01890 80B35540 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 01894 80B35544 AFBF0014 */ sw $ra, 0x0014($sp) +/* 01894 80B35544 AFBF0014 */ sw $ra, 0x0014($sp) /* 01898 80B35548 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 /* 0189C 80B3554C 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 018A0 80B35550 24A54638 */ addiu $a1, $a1, 0x4638 ## $a1 = 06004638 -/* 018A4 80B35554 AFA60018 */ sw $a2, 0x0018($sp) -/* 018A8 80B35558 0C02947A */ jal func_800A51E8 +/* 018A4 80B35554 AFA60018 */ sw $a2, 0x0018($sp) +/* 018A8 80B35558 0C02947A */ jal SkelAnime_ChangeAnimDefaultStop /* 018AC 80B3555C 24840188 */ addiu $a0, $a0, 0x0188 ## $a0 = 00000188 -/* 018B0 80B35560 8FA40018 */ lw $a0, 0x0018($sp) +/* 018B0 80B35560 8FA40018 */ lw $a0, 0x0018($sp) /* 018B4 80B35564 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 /* 018B8 80B35568 44812000 */ mtc1 $at, $f4 ## $f4 = 20.00 /* 018BC 80B3556C 908E0314 */ lbu $t6, 0x0314($a0) ## 00000314 @@ -24,11 +24,11 @@ glabel func_80B35540 /* 018E8 80B35598 AC8802E8 */ sw $t0, 0x02E8($a0) ## 000002E8 /* 018EC 80B3559C E4840198 */ swc1 $f4, 0x0198($a0) ## 00000198 /* 018F0 80B355A0 A49800B6 */ sh $t8, 0x00B6($a0) ## 000000B6 -/* 018F4 80B355A4 0C2CCF2C */ jal func_80B33CB0 +/* 018F4 80B355A4 0C2CCF2C */ jal func_80B33CB0 /* 018F8 80B355A8 E4860068 */ swc1 $f6, 0x0068($a0) ## 00000068 -/* 018FC 80B355AC 8FBF0014 */ lw $ra, 0x0014($sp) +/* 018FC 80B355AC 8FBF0014 */ lw $ra, 0x0014($sp) /* 01900 80B355B0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 01904 80B355B4 03E00008 */ jr $ra +/* 01904 80B355B4 03E00008 */ jr $ra /* 01908 80B355B8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Wf/func_80B3590C.s b/asm/non_matchings/overlays/actors/ovl_En_Wf/func_80B3590C.s index 13df6acd5c..3814a87416 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Wf/func_80B3590C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Wf/func_80B3590C.s @@ -1,44 +1,44 @@ glabel func_80B3590C /* 01C5C 80B3590C 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 01C60 80B35910 AFBF002C */ sw $ra, 0x002C($sp) -/* 01C64 80B35914 AFB00028 */ sw $s0, 0x0028($sp) +/* 01C60 80B35910 AFBF002C */ sw $ra, 0x002C($sp) +/* 01C64 80B35914 AFB00028 */ sw $s0, 0x0028($sp) /* 01C68 80B35918 C48201A0 */ lwc1 $f2, 0x01A0($a0) ## 000001A0 /* 01C6C 80B3591C 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 /* 01C70 80B35920 44816000 */ mtc1 $at, $f12 ## $f12 = 1.00 -/* 01C74 80B35924 4600110D */ trunc.w.s $f4, $f2 +/* 01C74 80B35924 4600110D */ trunc.w.s $f4, $f2 /* 01C78 80B35928 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 01C7C 80B3592C 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 01C80 80B35930 24A54638 */ addiu $a1, $a1, 0x4638 ## $a1 = 06004638 -/* 01C84 80B35934 440F2000 */ mfc1 $t7, $f4 +/* 01C84 80B35934 440F2000 */ mfc1 $t7, $f4 /* 01C88 80B35938 26040188 */ addiu $a0, $s0, 0x0188 ## $a0 = 00000188 /* 01C8C 80B3593C 3C06BF00 */ lui $a2, 0xBF00 ## $a2 = BF000000 -/* 01C90 80B35940 29E10010 */ slti $at, $t7, 0x0010 -/* 01C94 80B35944 14200004 */ bne $at, $zero, .L80B35958 -/* 01C98 80B35948 46006006 */ mov.s $f0, $f12 +/* 01C90 80B35940 29E10010 */ slti $at, $t7, 0x0010 +/* 01C94 80B35944 14200004 */ bne $at, $zero, .L80B35958 +/* 01C98 80B35948 46006006 */ mov.s $f0, $f12 /* 01C9C 80B3594C 3C014170 */ lui $at, 0x4170 ## $at = 41700000 /* 01CA0 80B35950 44810000 */ mtc1 $at, $f0 ## $f0 = 15.00 /* 01CA4 80B35954 00000000 */ nop .L80B35958: -/* 01CA8 80B35958 460C1181 */ sub.s $f6, $f2, $f12 +/* 01CA8 80B35958 460C1181 */ sub.s $f6, $f2, $f12 /* 01CAC 80B3595C 44804000 */ mtc1 $zero, $f8 ## $f8 = 0.00 /* 01CB0 80B35960 24180003 */ addiu $t8, $zero, 0x0003 ## $t8 = 00000003 -/* 01CB4 80B35964 AFB80014 */ sw $t8, 0x0014($sp) -/* 01CB8 80B35968 44073000 */ mfc1 $a3, $f6 -/* 01CBC 80B3596C E7A00010 */ swc1 $f0, 0x0010($sp) -/* 01CC0 80B35970 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 01CC4 80B35974 E7A80018 */ swc1 $f8, 0x0018($sp) +/* 01CB4 80B35964 AFB80014 */ sw $t8, 0x0014($sp) +/* 01CB8 80B35968 44073000 */ mfc1 $a3, $f6 +/* 01CBC 80B3596C E7A00010 */ swc1 $f0, 0x0010($sp) +/* 01CC0 80B35970 0C029468 */ jal SkelAnime_ChangeAnim + +/* 01CC4 80B35974 E7A80018 */ swc1 $f8, 0x0018($sp) /* 01CC8 80B35978 2419000C */ addiu $t9, $zero, 0x000C ## $t9 = 0000000C /* 01CCC 80B3597C 3C0580B3 */ lui $a1, %hi(func_80B359A8) ## $a1 = 80B30000 /* 01CD0 80B35980 AE1902D4 */ sw $t9, 0x02D4($s0) ## 000002D4 /* 01CD4 80B35984 A60002F8 */ sh $zero, 0x02F8($s0) ## 000002F8 /* 01CD8 80B35988 24A559A8 */ addiu $a1, $a1, %lo(func_80B359A8) ## $a1 = 80B359A8 -/* 01CDC 80B3598C 0C2CCF2C */ jal func_80B33CB0 +/* 01CDC 80B3598C 0C2CCF2C */ jal func_80B33CB0 /* 01CE0 80B35990 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01CE4 80B35994 8FBF002C */ lw $ra, 0x002C($sp) -/* 01CE8 80B35998 8FB00028 */ lw $s0, 0x0028($sp) +/* 01CE4 80B35994 8FBF002C */ lw $ra, 0x002C($sp) +/* 01CE8 80B35998 8FB00028 */ lw $s0, 0x0028($sp) /* 01CEC 80B3599C 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 01CF0 80B359A0 03E00008 */ jr $ra +/* 01CF0 80B359A0 03E00008 */ jr $ra /* 01CF4 80B359A4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Wf/func_80B35B94.s b/asm/non_matchings/overlays/actors/ovl_En_Wf/func_80B35B94.s index b174293724..7b01fa7a6c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Wf/func_80B35B94.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Wf/func_80B35B94.s @@ -1,14 +1,14 @@ glabel func_80B35B94 /* 01EE4 80B35B94 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 01EE8 80B35B98 AFBF0014 */ sw $ra, 0x0014($sp) +/* 01EE8 80B35B98 AFBF0014 */ sw $ra, 0x0014($sp) /* 01EEC 80B35B9C 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 /* 01EF0 80B35BA0 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 01EF4 80B35BA4 24A54AD0 */ addiu $a1, $a1, 0x4AD0 ## $a1 = 06004AD0 -/* 01EF8 80B35BA8 AFA70018 */ sw $a3, 0x0018($sp) +/* 01EF8 80B35BA8 AFA70018 */ sw $a3, 0x0018($sp) /* 01EFC 80B35BAC 24840188 */ addiu $a0, $a0, 0x0188 ## $a0 = 00000188 -/* 01F00 80B35BB0 0C029490 */ jal func_800A5240 +/* 01F00 80B35BB0 0C029490 */ jal SkelAnime_ChangeAnimTransitionStop /* 01F04 80B35BB4 3C06C040 */ lui $a2, 0xC040 ## $a2 = C0400000 -/* 01F08 80B35BB8 8FA40018 */ lw $a0, 0x0018($sp) +/* 01F08 80B35BB8 8FA40018 */ lw $a0, 0x0018($sp) /* 01F0C 80B35BBC 3C01C0C0 */ lui $at, 0xC0C0 ## $at = C0C00000 /* 01F10 80B35BC0 44812000 */ mtc1 $at, $f4 ## $f4 = -6.00 /* 01F14 80B35BC4 8482008A */ lh $v0, 0x008A($a0) ## 0000008A @@ -21,15 +21,15 @@ glabel func_80B35B94 /* 01F30 80B35BE0 E4840068 */ swc1 $f4, 0x0068($a0) ## 00000068 /* 01F34 80B35BE4 A4820032 */ sh $v0, 0x0032($a0) ## 00000032 /* 01F38 80B35BE8 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 01F3C 80B35BEC A48200B6 */ sh $v0, 0x00B6($a0) ## 000000B6 /* 01F40 80B35BF0 3C0580B3 */ lui $a1, %hi(func_80B35C10) ## $a1 = 80B30000 -/* 01F44 80B35BF4 8FA40018 */ lw $a0, 0x0018($sp) -/* 01F48 80B35BF8 0C2CCF2C */ jal func_80B33CB0 +/* 01F44 80B35BF4 8FA40018 */ lw $a0, 0x0018($sp) +/* 01F48 80B35BF8 0C2CCF2C */ jal func_80B33CB0 /* 01F4C 80B35BFC 24A55C10 */ addiu $a1, $a1, %lo(func_80B35C10) ## $a1 = 80B35C10 -/* 01F50 80B35C00 8FBF0014 */ lw $ra, 0x0014($sp) +/* 01F50 80B35C00 8FBF0014 */ lw $ra, 0x0014($sp) /* 01F54 80B35C04 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 01F58 80B35C08 03E00008 */ jr $ra +/* 01F58 80B35C08 03E00008 */ jr $ra /* 01F5C 80B35C0C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Wf/func_80B35D18.s b/asm/non_matchings/overlays/actors/ovl_En_Wf/func_80B35D18.s index c16e8661af..6025f7c5d2 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Wf/func_80B35D18.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Wf/func_80B35D18.s @@ -1,11 +1,11 @@ glabel func_80B35D18 /* 02068 80B35D18 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 0206C 80B35D1C AFBF0014 */ sw $ra, 0x0014($sp) +/* 0206C 80B35D1C AFBF0014 */ sw $ra, 0x0014($sp) /* 02070 80B35D20 948E0088 */ lhu $t6, 0x0088($a0) ## 00000088 /* 02074 80B35D24 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 /* 02078 80B35D28 2405389E */ addiu $a1, $zero, 0x389E ## $a1 = 0000389E /* 0207C 80B35D2C 31CF0001 */ andi $t7, $t6, 0x0001 ## $t7 = 00000000 -/* 02080 80B35D30 51E00005 */ beql $t7, $zero, .L80B35D48 +/* 02080 80B35D30 51E00005 */ beql $t7, $zero, .L80B35D48 /* 02084 80B35D34 00E02025 */ or $a0, $a3, $zero ## $a0 = 00000000 /* 02088 80B35D38 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 /* 0208C 80B35D3C 00000000 */ nop @@ -13,23 +13,23 @@ glabel func_80B35D18 /* 02094 80B35D44 00E02025 */ or $a0, $a3, $zero ## $a0 = 00000000 .L80B35D48: /* 02098 80B35D48 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 0209C 80B35D4C AFA70018 */ sw $a3, 0x0018($sp) -/* 020A0 80B35D50 8FA70018 */ lw $a3, 0x0018($sp) + +/* 0209C 80B35D4C AFA70018 */ sw $a3, 0x0018($sp) +/* 020A0 80B35D50 8FA70018 */ lw $a3, 0x0018($sp) /* 020A4 80B35D54 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 /* 020A8 80B35D58 24A59B20 */ addiu $a1, $a1, 0x9B20 ## $a1 = 06009B20 /* 020AC 80B35D5C 24060000 */ addiu $a2, $zero, 0x0000 ## $a2 = 00000000 -/* 020B0 80B35D60 0C0294A7 */ jal func_800A529C +/* 020B0 80B35D60 0C0294A7 */ jal SkelAnime_ChangeAnimPlaybackStop /* 020B4 80B35D64 24E40188 */ addiu $a0, $a3, 0x0188 ## $a0 = 00000188 -/* 020B8 80B35D68 8FA40018 */ lw $a0, 0x0018($sp) +/* 020B8 80B35D68 8FA40018 */ lw $a0, 0x0018($sp) /* 020BC 80B35D6C 2418000F */ addiu $t8, $zero, 0x000F ## $t8 = 0000000F /* 020C0 80B35D70 3C0580B3 */ lui $a1, %hi(func_80B35D90) ## $a1 = 80B30000 /* 020C4 80B35D74 24A55D90 */ addiu $a1, $a1, %lo(func_80B35D90) ## $a1 = 80B35D90 -/* 020C8 80B35D78 0C2CCF2C */ jal func_80B33CB0 +/* 020C8 80B35D78 0C2CCF2C */ jal func_80B33CB0 /* 020CC 80B35D7C AC9802D4 */ sw $t8, 0x02D4($a0) ## 000002D4 -/* 020D0 80B35D80 8FBF0014 */ lw $ra, 0x0014($sp) +/* 020D0 80B35D80 8FBF0014 */ lw $ra, 0x0014($sp) /* 020D4 80B35D84 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 020D8 80B35D88 03E00008 */ jr $ra +/* 020D8 80B35D88 03E00008 */ jr $ra /* 020DC 80B35D8C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Wf/func_80B35E4C.s b/asm/non_matchings/overlays/actors/ovl_En_Wf/func_80B35E4C.s index 2365da0609..bf48637d90 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Wf/func_80B35E4C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Wf/func_80B35E4C.s @@ -1,24 +1,24 @@ glabel func_80B35E4C /* 0219C 80B35E4C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 021A0 80B35E50 AFBF0014 */ sw $ra, 0x0014($sp) +/* 021A0 80B35E50 AFBF0014 */ sw $ra, 0x0014($sp) /* 021A4 80B35E54 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 /* 021A8 80B35E58 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 /* 021AC 80B35E5C 24A59B20 */ addiu $a1, $a1, 0x9B20 ## $a1 = 06009B20 -/* 021B0 80B35E60 AFA70018 */ sw $a3, 0x0018($sp) +/* 021B0 80B35E60 AFA70018 */ sw $a3, 0x0018($sp) /* 021B4 80B35E64 24840188 */ addiu $a0, $a0, 0x0188 ## $a0 = 00000188 -/* 021B8 80B35E68 0C029490 */ jal func_800A5240 +/* 021B8 80B35E68 0C029490 */ jal SkelAnime_ChangeAnimTransitionStop /* 021BC 80B35E6C 3C06C080 */ lui $a2, 0xC080 ## $a2 = C0800000 -/* 021C0 80B35E70 8FA70018 */ lw $a3, 0x0018($sp) +/* 021C0 80B35E70 8FA70018 */ lw $a3, 0x0018($sp) /* 021C4 80B35E74 3C01C080 */ lui $at, 0xC080 ## $at = C0800000 /* 021C8 80B35E78 24180001 */ addiu $t8, $zero, 0x0001 ## $t8 = 00000001 /* 021CC 80B35E7C 94EE0088 */ lhu $t6, 0x0088($a3) ## 00000088 /* 021D0 80B35E80 00E02025 */ or $a0, $a3, $zero ## $a0 = 00000000 /* 021D4 80B35E84 31CF0001 */ andi $t7, $t6, 0x0001 ## $t7 = 00000000 -/* 021D8 80B35E88 51E00006 */ beql $t7, $zero, .L80B35EA4 +/* 021D8 80B35E88 51E00006 */ beql $t7, $zero, .L80B35EA4 /* 021DC 80B35E8C A4F80300 */ sh $t8, 0x0300($a3) ## 00000300 /* 021E0 80B35E90 44812000 */ mtc1 $at, $f4 ## $f4 = -4.00 /* 021E4 80B35E94 A4E00300 */ sh $zero, 0x0300($a3) ## 00000300 -/* 021E8 80B35E98 10000002 */ beq $zero, $zero, .L80B35EA4 +/* 021E8 80B35E98 10000002 */ beq $zero, $zero, .L80B35EA4 /* 021EC 80B35E9C E4E40068 */ swc1 $f4, 0x0068($a3) ## 00000068 /* 021F0 80B35EA0 A4F80300 */ sh $t8, 0x0300($a3) ## 00000300 .L80B35EA4: @@ -27,17 +27,17 @@ glabel func_80B35E4C /* 021FC 80B35EAC 24053843 */ addiu $a1, $zero, 0x3843 ## $a1 = 00003843 /* 02200 80B35EB0 A4F90032 */ sh $t9, 0x0032($a3) ## 00000032 /* 02204 80B35EB4 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 02208 80B35EB8 AFA70018 */ sw $a3, 0x0018($sp) -/* 0220C 80B35EBC 8FA40018 */ lw $a0, 0x0018($sp) + +/* 02208 80B35EB8 AFA70018 */ sw $a3, 0x0018($sp) +/* 0220C 80B35EBC 8FA40018 */ lw $a0, 0x0018($sp) /* 02210 80B35EC0 24080003 */ addiu $t0, $zero, 0x0003 ## $t0 = 00000003 /* 02214 80B35EC4 3C0580B3 */ lui $a1, %hi(func_80B35EE4) ## $a1 = 80B30000 /* 02218 80B35EC8 24A55EE4 */ addiu $a1, $a1, %lo(func_80B35EE4) ## $a1 = 80B35EE4 -/* 0221C 80B35ECC 0C2CCF2C */ jal func_80B33CB0 +/* 0221C 80B35ECC 0C2CCF2C */ jal func_80B33CB0 /* 02220 80B35ED0 AC8802D4 */ sw $t0, 0x02D4($a0) ## 000002D4 -/* 02224 80B35ED4 8FBF0014 */ lw $ra, 0x0014($sp) +/* 02224 80B35ED4 8FBF0014 */ lw $ra, 0x0014($sp) /* 02228 80B35ED8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 0222C 80B35EDC 03E00008 */ jr $ra +/* 0222C 80B35EDC 03E00008 */ jr $ra /* 02230 80B35EE0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Wf/func_80B360E8.s b/asm/non_matchings/overlays/actors/ovl_En_Wf/func_80B360E8.s index 25e407c928..f3f970d55b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Wf/func_80B360E8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Wf/func_80B360E8.s @@ -1,28 +1,28 @@ glabel func_80B360E8 /* 02438 80B360E8 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 0243C 80B360EC AFB00028 */ sw $s0, 0x0028($sp) +/* 0243C 80B360EC AFB00028 */ sw $s0, 0x0028($sp) /* 02440 80B360F0 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 02444 80B360F4 AFBF002C */ sw $ra, 0x002C($sp) +/* 02444 80B360F4 AFBF002C */ sw $ra, 0x002C($sp) /* 02448 80B360F8 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 /* 0244C 80B360FC 0C028800 */ jal SkelAnime_GetFrameCount - + /* 02450 80B36100 24844AD0 */ addiu $a0, $a0, 0x4AD0 ## $a0 = 06004AD0 /* 02454 80B36104 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 02458 80B36108 3C01C040 */ lui $at, 0xC040 ## $at = C0400000 /* 0245C 80B3610C 44814000 */ mtc1 $at, $f8 ## $f8 = -3.00 -/* 02460 80B36110 46802120 */ cvt.s.w $f4, $f4 +/* 02460 80B36110 46802120 */ cvt.s.w $f4, $f4 /* 02464 80B36114 44803000 */ mtc1 $zero, $f6 ## $f6 = 0.00 /* 02468 80B36118 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 0246C 80B3611C 240E0002 */ addiu $t6, $zero, 0x0002 ## $t6 = 00000002 -/* 02470 80B36120 AFAE0014 */ sw $t6, 0x0014($sp) +/* 02470 80B36120 AFAE0014 */ sw $t6, 0x0014($sp) /* 02474 80B36124 24A54AD0 */ addiu $a1, $a1, 0x4AD0 ## $a1 = 06004AD0 -/* 02478 80B36128 44072000 */ mfc1 $a3, $f4 +/* 02478 80B36128 44072000 */ mfc1 $a3, $f4 /* 0247C 80B3612C 26040188 */ addiu $a0, $s0, 0x0188 ## $a0 = 00000188 /* 02480 80B36130 3C06BF80 */ lui $a2, 0xBF80 ## $a2 = BF800000 -/* 02484 80B36134 E7A80018 */ swc1 $f8, 0x0018($sp) -/* 02488 80B36138 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 0248C 80B3613C E7A60010 */ swc1 $f6, 0x0010($sp) +/* 02484 80B36134 E7A80018 */ swc1 $f8, 0x0018($sp) +/* 02488 80B36138 0C029468 */ jal SkelAnime_ChangeAnim + +/* 0248C 80B3613C E7A60010 */ swc1 $f6, 0x0010($sp) /* 02490 80B36140 3C0140D0 */ lui $at, 0x40D0 ## $at = 40D00000 /* 02494 80B36144 44815000 */ mtc1 $at, $f10 ## $f10 = 6.50 /* 02498 80B36148 3C014170 */ lui $at, 0x4170 ## $at = 41700000 @@ -35,18 +35,18 @@ glabel func_80B360E8 /* 024B4 80B36164 2405386C */ addiu $a1, $zero, 0x386C ## $a1 = 0000386C /* 024B8 80B36168 E60A0068 */ swc1 $f10, 0x0068($s0) ## 00000068 /* 024BC 80B3616C 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 024C0 80B36170 E6100060 */ swc1 $f16, 0x0060($s0) ## 00000060 /* 024C4 80B36174 861800B6 */ lh $t8, 0x00B6($s0) ## 000000B6 /* 024C8 80B36178 3C0580B3 */ lui $a1, %hi(func_80B361A0) ## $a1 = 80B30000 /* 024CC 80B3617C 24A561A0 */ addiu $a1, $a1, %lo(func_80B361A0) ## $a1 = 80B361A0 /* 024D0 80B36180 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 024D4 80B36184 0C2CCF2C */ jal func_80B33CB0 +/* 024D4 80B36184 0C2CCF2C */ jal func_80B33CB0 /* 024D8 80B36188 A6180032 */ sh $t8, 0x0032($s0) ## 00000032 -/* 024DC 80B3618C 8FBF002C */ lw $ra, 0x002C($sp) -/* 024E0 80B36190 8FB00028 */ lw $s0, 0x0028($sp) +/* 024DC 80B3618C 8FBF002C */ lw $ra, 0x002C($sp) +/* 024E0 80B36190 8FB00028 */ lw $s0, 0x0028($sp) /* 024E4 80B36194 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 024E8 80B36198 03E00008 */ jr $ra +/* 024E8 80B36198 03E00008 */ jr $ra /* 024EC 80B3619C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Wf/func_80B36288.s b/asm/non_matchings/overlays/actors/ovl_En_Wf/func_80B36288.s index c186f352b1..f40f62f1ee 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Wf/func_80B36288.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Wf/func_80B36288.s @@ -1,17 +1,17 @@ glabel func_80B36288 /* 025D8 80B36288 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 025DC 80B3628C AFB00028 */ sw $s0, 0x0028($sp) +/* 025DC 80B3628C AFB00028 */ sw $s0, 0x0028($sp) /* 025E0 80B36290 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 025E4 80B36294 AFBF002C */ sw $ra, 0x002C($sp) +/* 025E4 80B36294 AFBF002C */ sw $ra, 0x002C($sp) /* 025E8 80B36298 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 /* 025EC 80B3629C 0C028800 */ jal SkelAnime_GetFrameCount - + /* 025F0 80B362A0 24844CA4 */ addiu $a0, $a0, 0x4CA4 ## $a0 = 06004CA4 /* 025F4 80B362A4 860E02F8 */ lh $t6, 0x02F8($s0) ## 000002F8 /* 025F8 80B362A8 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 025FC 80B362AC 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 02600 80B362B0 11C00003 */ beq $t6, $zero, .L80B362C0 -/* 02604 80B362B4 468020A0 */ cvt.s.w $f2, $f4 +/* 02600 80B362B0 11C00003 */ beq $t6, $zero, .L80B362C0 +/* 02604 80B362B4 468020A0 */ cvt.s.w $f2, $f4 /* 02608 80B362B8 240FFFFF */ addiu $t7, $zero, 0xFFFF ## $t7 = FFFFFFFF /* 0260C 80B362BC A60F02F8 */ sh $t7, 0x02F8($s0) ## 000002F8 .L80B362C0: @@ -23,24 +23,24 @@ glabel func_80B36288 /* 02624 80B362D4 AE1802D4 */ sw $t8, 0x02D4($s0) ## 000002D4 /* 02628 80B362D8 AE1902E8 */ sw $t9, 0x02E8($s0) ## 000002E8 /* 0262C 80B362DC 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 02630 80B362E0 44060000 */ mfc1 $a2, $f0 -/* 02634 80B362E4 44070000 */ mfc1 $a3, $f0 +/* 02630 80B362E0 44060000 */ mfc1 $a2, $f0 +/* 02634 80B362E4 44070000 */ mfc1 $a3, $f0 /* 02638 80B362E8 24080003 */ addiu $t0, $zero, 0x0003 ## $t0 = 00000003 -/* 0263C 80B362EC AFA80014 */ sw $t0, 0x0014($sp) +/* 0263C 80B362EC AFA80014 */ sw $t0, 0x0014($sp) /* 02640 80B362F0 24A54CA4 */ addiu $a1, $a1, 0x4CA4 ## $a1 = 06004CA4 -/* 02644 80B362F4 E7A20010 */ swc1 $f2, 0x0010($sp) +/* 02644 80B362F4 E7A20010 */ swc1 $f2, 0x0010($sp) /* 02648 80B362F8 26040188 */ addiu $a0, $s0, 0x0188 ## $a0 = 00000188 -/* 0264C 80B362FC 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 02650 80B36300 E7A60018 */ swc1 $f6, 0x0018($sp) +/* 0264C 80B362FC 0C029468 */ jal SkelAnime_ChangeAnim + +/* 02650 80B36300 E7A60018 */ swc1 $f6, 0x0018($sp) /* 02654 80B36304 3C0580B3 */ lui $a1, %hi(func_80B36328) ## $a1 = 80B30000 /* 02658 80B36308 24A56328 */ addiu $a1, $a1, %lo(func_80B36328) ## $a1 = 80B36328 -/* 0265C 80B3630C 0C2CCF2C */ jal func_80B33CB0 +/* 0265C 80B3630C 0C2CCF2C */ jal func_80B33CB0 /* 02660 80B36310 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02664 80B36314 8FBF002C */ lw $ra, 0x002C($sp) -/* 02668 80B36318 8FB00028 */ lw $s0, 0x0028($sp) +/* 02664 80B36314 8FBF002C */ lw $ra, 0x002C($sp) +/* 02668 80B36318 8FB00028 */ lw $s0, 0x0028($sp) /* 0266C 80B3631C 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 02670 80B36320 03E00008 */ jr $ra +/* 02670 80B36320 03E00008 */ jr $ra /* 02674 80B36324 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Wf/func_80B365A8.s b/asm/non_matchings/overlays/actors/ovl_En_Wf/func_80B365A8.s index c3e0346c91..d80dbd8f9d 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Wf/func_80B365A8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Wf/func_80B365A8.s @@ -1,65 +1,65 @@ glabel func_80B365A8 /* 028F8 80B365A8 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 028FC 80B365AC AFB00028 */ sw $s0, 0x0028($sp) +/* 028FC 80B365AC AFB00028 */ sw $s0, 0x0028($sp) /* 02900 80B365B0 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 02904 80B365B4 AFBF002C */ sw $ra, 0x002C($sp) +/* 02904 80B365B4 AFBF002C */ sw $ra, 0x002C($sp) /* 02908 80B365B8 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 -/* 0290C 80B365BC AFA5003C */ sw $a1, 0x003C($sp) +/* 0290C 80B365BC AFA5003C */ sw $a1, 0x003C($sp) /* 02910 80B365C0 0C028800 */ jal SkelAnime_GetFrameCount - + /* 02914 80B365C4 248457A0 */ addiu $a0, $a0, 0x57A0 ## $a0 = 060057A0 /* 02918 80B365C8 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 0291C 80B365CC 3C01C080 */ lui $at, 0xC080 ## $at = C0800000 /* 02920 80B365D0 44814000 */ mtc1 $at, $f8 ## $f8 = -4.00 -/* 02924 80B365D4 468021A0 */ cvt.s.w $f6, $f4 +/* 02924 80B365D4 468021A0 */ cvt.s.w $f6, $f4 /* 02928 80B365D8 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 0292C 80B365DC 240E0001 */ addiu $t6, $zero, 0x0001 ## $t6 = 00000001 -/* 02930 80B365E0 AFAE0014 */ sw $t6, 0x0014($sp) +/* 02930 80B365E0 AFAE0014 */ sw $t6, 0x0014($sp) /* 02934 80B365E4 24A557A0 */ addiu $a1, $a1, 0x57A0 ## $a1 = 060057A0 /* 02938 80B365E8 26040188 */ addiu $a0, $s0, 0x0188 ## $a0 = 00000188 -/* 0293C 80B365EC E7A60010 */ swc1 $f6, 0x0010($sp) +/* 0293C 80B365EC E7A60010 */ swc1 $f6, 0x0010($sp) /* 02940 80B365F0 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 02944 80B365F4 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 02948 80B365F8 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 0294C 80B365FC E7A80018 */ swc1 $f8, 0x0018($sp) -/* 02950 80B36600 8FAF003C */ lw $t7, 0x003C($sp) +/* 02948 80B365F8 0C029468 */ jal SkelAnime_ChangeAnim + +/* 0294C 80B365FC E7A80018 */ swc1 $f8, 0x0018($sp) +/* 02950 80B36600 8FAF003C */ lw $t7, 0x003C($sp) /* 02954 80B36604 861902FE */ lh $t9, 0x02FE($s0) ## 000002FE /* 02958 80B36608 8608008A */ lh $t0, 0x008A($s0) ## 0000008A /* 0295C 80B3660C 8DE21C44 */ lw $v0, 0x1C44($t7) ## 00001C44 /* 02960 80B36610 845800B6 */ lh $t8, 0x00B6($v0) ## 000000B6 -/* 02964 80B36614 03191821 */ addu $v1, $t8, $t9 -/* 02968 80B36618 00031C00 */ sll $v1, $v1, 16 -/* 0296C 80B3661C 00031C03 */ sra $v1, $v1, 16 -/* 02970 80B36620 00682023 */ subu $a0, $v1, $t0 -/* 02974 80B36624 00042400 */ sll $a0, $a0, 16 -/* 02978 80B36628 00042403 */ sra $a0, $a0, 16 +/* 02964 80B36614 03191821 */ addu $v1, $t8, $t9 +/* 02968 80B36618 00031C00 */ sll $v1, $v1, 16 +/* 0296C 80B3661C 00031C03 */ sra $v1, $v1, 16 +/* 02970 80B36620 00682023 */ subu $a0, $v1, $t0 +/* 02974 80B36624 00042400 */ sll $a0, $a0, 16 +/* 02978 80B36628 00042403 */ sra $a0, $a0, 16 /* 0297C 80B3662C 0C01DE1C */ jal Math_Sins ## sins? -/* 02980 80B36630 A7A30036 */ sh $v1, 0x0036($sp) +/* 02980 80B36630 A7A30036 */ sh $v1, 0x0036($sp) /* 02984 80B36634 44805000 */ mtc1 $zero, $f10 ## $f10 = 0.00 -/* 02988 80B36638 87A30036 */ lh $v1, 0x0036($sp) +/* 02988 80B36638 87A30036 */ lh $v1, 0x0036($sp) /* 0298C 80B3663C 24093E80 */ addiu $t1, $zero, 0x3E80 ## $t1 = 00003E80 -/* 02990 80B36640 4600503C */ c.lt.s $f10, $f0 +/* 02990 80B36640 4600503C */ c.lt.s $f10, $f0 /* 02994 80B36644 00000000 */ nop -/* 02998 80B36648 45020004 */ bc1fl .L80B3665C +/* 02998 80B36648 45020004 */ bc1fl .L80B3665C /* 0299C 80B3664C 860A008A */ lh $t2, 0x008A($s0) ## 0000008A -/* 029A0 80B36650 1000001B */ beq $zero, $zero, .L80B366C0 +/* 029A0 80B36650 1000001B */ beq $zero, $zero, .L80B366C0 /* 029A4 80B36654 A60902FE */ sh $t1, 0x02FE($s0) ## 000002FE /* 029A8 80B36658 860A008A */ lh $t2, 0x008A($s0) ## 0000008A .L80B3665C: -/* 029AC 80B3665C 006A2023 */ subu $a0, $v1, $t2 -/* 029B0 80B36660 00042400 */ sll $a0, $a0, 16 +/* 029AC 80B3665C 006A2023 */ subu $a0, $v1, $t2 +/* 029B0 80B36660 00042400 */ sll $a0, $a0, 16 /* 029B4 80B36664 0C01DE1C */ jal Math_Sins ## sins? -/* 029B8 80B36668 00042403 */ sra $a0, $a0, 16 +/* 029B8 80B36668 00042403 */ sra $a0, $a0, 16 /* 029BC 80B3666C 44808000 */ mtc1 $zero, $f16 ## $f16 = 0.00 /* 029C0 80B36670 240BC180 */ addiu $t3, $zero, 0xC180 ## $t3 = FFFFC180 -/* 029C4 80B36674 4610003C */ c.lt.s $f0, $f16 +/* 029C4 80B36674 4610003C */ c.lt.s $f0, $f16 /* 029C8 80B36678 00000000 */ nop -/* 029CC 80B3667C 45000003 */ bc1f .L80B3668C +/* 029CC 80B3667C 45000003 */ bc1f .L80B3668C /* 029D0 80B36680 00000000 */ nop -/* 029D4 80B36684 1000000E */ beq $zero, $zero, .L80B366C0 +/* 029D4 80B36684 1000000E */ beq $zero, $zero, .L80B366C0 /* 029D8 80B36688 A60B02FE */ sh $t3, 0x02FE($s0) ## 000002FE .L80B3668C: /* 029DC 80B3668C 0C03F66B */ jal Math_Rand_ZeroOne @@ -69,11 +69,11 @@ glabel func_80B365A8 /* 029E8 80B36698 44819000 */ mtc1 $at, $f18 ## $f18 = 0.50 /* 029EC 80B3669C 240C3E80 */ addiu $t4, $zero, 0x3E80 ## $t4 = 00003E80 /* 029F0 80B366A0 240DC180 */ addiu $t5, $zero, 0xC180 ## $t5 = FFFFC180 -/* 029F4 80B366A4 4600903C */ c.lt.s $f18, $f0 +/* 029F4 80B366A4 4600903C */ c.lt.s $f18, $f0 /* 029F8 80B366A8 00000000 */ nop -/* 029FC 80B366AC 45020004 */ bc1fl .L80B366C0 +/* 029FC 80B366AC 45020004 */ bc1fl .L80B366C0 /* 02A00 80B366B0 A60D02FE */ sh $t5, 0x02FE($s0) ## 000002FE -/* 02A04 80B366B4 10000002 */ beq $zero, $zero, .L80B366C0 +/* 02A04 80B366B4 10000002 */ beq $zero, $zero, .L80B366C0 /* 02A08 80B366B8 A60C02FE */ sh $t4, 0x02FE($s0) ## 000002FE /* 02A0C 80B366BC A60D02FE */ sh $t5, 0x02FE($s0) ## 000002FE .L80B366C0: @@ -82,10 +82,10 @@ glabel func_80B365A8 /* 02A18 80B366C8 3C0180B3 */ lui $at, %hi(D_80B37BC0) ## $at = 80B30000 /* 02A1C 80B366CC 860E00B6 */ lh $t6, 0x00B6($s0) ## 000000B6 /* 02A20 80B366D0 E6000068 */ swc1 $f0, 0x0068($s0) ## 00000068 -/* 02A24 80B366D4 C4247BC0 */ lwc1 $f4, %lo(D_80B37BC0)($at) +/* 02A24 80B366D4 C4247BC0 */ lwc1 $f4, %lo(D_80B37BC0)($at) /* 02A28 80B366D8 44804000 */ mtc1 $zero, $f8 ## $f8 = 0.00 /* 02A2C 80B366DC A60E0032 */ sh $t6, 0x0032($s0) ## 00000032 -/* 02A30 80B366E0 46040182 */ mul.s $f6, $f0, $f4 +/* 02A30 80B366E0 46040182 */ mul.s $f6, $f0, $f4 /* 02A34 80B366E4 E60802EC */ swc1 $f8, 0x02EC($s0) ## 000002EC /* 02A38 80B366E8 0C03F66B */ jal Math_Rand_ZeroOne ## Rand.Next() float @@ -94,21 +94,21 @@ glabel func_80B365A8 /* 02A44 80B366F4 44815000 */ mtc1 $at, $f10 ## $f10 = 10.00 /* 02A48 80B366F8 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 /* 02A4C 80B366FC 44819000 */ mtc1 $at, $f18 ## $f18 = 5.00 -/* 02A50 80B36700 460A0402 */ mul.s $f16, $f0, $f10 +/* 02A50 80B36700 460A0402 */ mul.s $f16, $f0, $f10 /* 02A54 80B36704 2419000E */ addiu $t9, $zero, 0x000E ## $t9 = 0000000E /* 02A58 80B36708 3C0580B3 */ lui $a1, %hi(func_80B36740) ## $a1 = 80B30000 /* 02A5C 80B3670C AE1902D4 */ sw $t9, 0x02D4($s0) ## 000002D4 /* 02A60 80B36710 24A56740 */ addiu $a1, $a1, %lo(func_80B36740) ## $a1 = 80B36740 /* 02A64 80B36714 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02A68 80B36718 46128100 */ add.s $f4, $f16, $f18 -/* 02A6C 80B3671C 4600218D */ trunc.w.s $f6, $f4 -/* 02A70 80B36720 44183000 */ mfc1 $t8, $f6 -/* 02A74 80B36724 0C2CCF2C */ jal func_80B33CB0 +/* 02A68 80B36718 46128100 */ add.s $f4, $f16, $f18 +/* 02A6C 80B3671C 4600218D */ trunc.w.s $f6, $f4 +/* 02A70 80B36720 44183000 */ mfc1 $t8, $f6 +/* 02A74 80B36724 0C2CCF2C */ jal func_80B33CB0 /* 02A78 80B36728 AE1802E8 */ sw $t8, 0x02E8($s0) ## 000002E8 -/* 02A7C 80B3672C 8FBF002C */ lw $ra, 0x002C($sp) -/* 02A80 80B36730 8FB00028 */ lw $s0, 0x0028($sp) +/* 02A7C 80B3672C 8FBF002C */ lw $ra, 0x002C($sp) +/* 02A80 80B36730 8FB00028 */ lw $s0, 0x0028($sp) /* 02A84 80B36734 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 -/* 02A88 80B36738 03E00008 */ jr $ra +/* 02A88 80B36738 03E00008 */ jr $ra /* 02A8C 80B3673C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Wf/func_80B36C8C.s b/asm/non_matchings/overlays/actors/ovl_En_Wf/func_80B36C8C.s index 8819d8af72..af9b78868b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Wf/func_80B36C8C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Wf/func_80B36C8C.s @@ -1,25 +1,25 @@ glabel func_80B36C8C /* 02FDC 80B36C8C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 02FE0 80B36C90 AFBF0014 */ sw $ra, 0x0014($sp) +/* 02FE0 80B36C90 AFBF0014 */ sw $ra, 0x0014($sp) /* 02FE4 80B36C94 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 /* 02FE8 80B36C98 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 02FEC 80B36C9C 24A55430 */ addiu $a1, $a1, 0x5430 ## $a1 = 06005430 -/* 02FF0 80B36CA0 AFA70018 */ sw $a3, 0x0018($sp) +/* 02FF0 80B36CA0 AFA70018 */ sw $a3, 0x0018($sp) /* 02FF4 80B36CA4 24840188 */ addiu $a0, $a0, 0x0188 ## $a0 = 00000188 -/* 02FF8 80B36CA8 0C029490 */ jal func_800A5240 +/* 02FF8 80B36CA8 0C029490 */ jal SkelAnime_ChangeAnimTransitionStop /* 02FFC 80B36CAC 3C06C080 */ lui $a2, 0xC080 ## $a2 = C0800000 -/* 03000 80B36CB0 8FA70018 */ lw $a3, 0x0018($sp) +/* 03000 80B36CB0 8FA70018 */ lw $a3, 0x0018($sp) /* 03004 80B36CB4 3C01C0C0 */ lui $at, 0xC0C0 ## $at = C0C00000 /* 03008 80B36CB8 24190001 */ addiu $t9, $zero, 0x0001 ## $t9 = 00000001 /* 0300C 80B36CBC 94EF0088 */ lhu $t7, 0x0088($a3) ## 00000088 /* 03010 80B36CC0 84EE008A */ lh $t6, 0x008A($a3) ## 0000008A /* 03014 80B36CC4 24080002 */ addiu $t0, $zero, 0x0002 ## $t0 = 00000002 /* 03018 80B36CC8 31F80001 */ andi $t8, $t7, 0x0001 ## $t8 = 00000000 -/* 0301C 80B36CCC 13000005 */ beq $t8, $zero, .L80B36CE4 +/* 0301C 80B36CCC 13000005 */ beq $t8, $zero, .L80B36CE4 /* 03020 80B36CD0 A4EE0032 */ sh $t6, 0x0032($a3) ## 00000032 /* 03024 80B36CD4 44812000 */ mtc1 $at, $f4 ## $f4 = -6.00 /* 03028 80B36CD8 A4E00300 */ sh $zero, 0x0300($a3) ## 00000300 -/* 0302C 80B36CDC 10000002 */ beq $zero, $zero, .L80B36CE8 +/* 0302C 80B36CDC 10000002 */ beq $zero, $zero, .L80B36CE8 /* 03030 80B36CE0 E4E40068 */ swc1 $f4, 0x0068($a3) ## 00000068 .L80B36CE4: /* 03034 80B36CE4 A4F90300 */ sh $t9, 0x0300($a3) ## 00000300 @@ -27,24 +27,24 @@ glabel func_80B36C8C /* 03038 80B36CE8 C4E6019C */ lwc1 $f6, 0x019C($a3) ## 0000019C /* 0303C 80B36CEC 8CE90004 */ lw $t1, 0x0004($a3) ## 00000004 /* 03040 80B36CF0 2401FFFE */ addiu $at, $zero, 0xFFFE ## $at = FFFFFFFE -/* 03044 80B36CF4 4600320D */ trunc.w.s $f8, $f6 -/* 03048 80B36CF8 01215024 */ and $t2, $t1, $at +/* 03044 80B36CF4 4600320D */ trunc.w.s $f8, $f6 +/* 03048 80B36CF8 01215024 */ and $t2, $t1, $at /* 0304C 80B36CFC ACE802D4 */ sw $t0, 0x02D4($a3) ## 000002D4 /* 03050 80B36D00 ACEA0004 */ sw $t2, 0x0004($a3) ## 00000004 -/* 03054 80B36D04 440C4000 */ mfc1 $t4, $f8 +/* 03054 80B36D04 440C4000 */ mfc1 $t4, $f8 /* 03058 80B36D08 00E02025 */ or $a0, $a3, $zero ## $a0 = 00000000 /* 0305C 80B36D0C 2405384B */ addiu $a1, $zero, 0x384B ## $a1 = 0000384B /* 03060 80B36D10 ACEC02E8 */ sw $t4, 0x02E8($a3) ## 000002E8 /* 03064 80B36D14 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 03068 80B36D18 AFA70018 */ sw $a3, 0x0018($sp) + +/* 03068 80B36D18 AFA70018 */ sw $a3, 0x0018($sp) /* 0306C 80B36D1C 3C0580B3 */ lui $a1, %hi(func_80B36D3C) ## $a1 = 80B30000 -/* 03070 80B36D20 8FA40018 */ lw $a0, 0x0018($sp) -/* 03074 80B36D24 0C2CCF2C */ jal func_80B33CB0 +/* 03070 80B36D20 8FA40018 */ lw $a0, 0x0018($sp) +/* 03074 80B36D24 0C2CCF2C */ jal func_80B33CB0 /* 03078 80B36D28 24A56D3C */ addiu $a1, $a1, %lo(func_80B36D3C) ## $a1 = 80B36D3C -/* 0307C 80B36D2C 8FBF0014 */ lw $ra, 0x0014($sp) +/* 0307C 80B36D2C 8FBF0014 */ lw $ra, 0x0014($sp) /* 03080 80B36D30 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 03084 80B36D34 03E00008 */ jr $ra +/* 03084 80B36D34 03E00008 */ jr $ra /* 03088 80B36D38 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Wood02/EnWood02_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Wood02/EnWood02_Draw.s index a9f7c12b2f..80a736ca7a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Wood02/EnWood02_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Wood02/EnWood02_Draw.s @@ -9,7 +9,7 @@ glabel EnWood02_Draw /* 00CC0 80B3BC30 24C6BFA0 */ addiu $a2, $a2, %lo(D_80B3BFA0) ## $a2 = 80B3BFA0 /* 00CC4 80B3BC34 27A4003C */ addiu $a0, $sp, 0x003C ## $a0 = FFFFFFDC /* 00CC8 80B3BC38 24070307 */ addiu $a3, $zero, 0x0307 ## $a3 = 00000307 -/* 00CCC 80B3BC3C 0C031AB1 */ jal func_800C6AC4 +/* 00CCC 80B3BC3C 0C031AB1 */ jal Graph_OpenDisps /* 00CD0 80B3BC40 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 00CD4 80B3BC44 8FAF0060 */ lw $t7, 0x0060($sp) /* 00CD8 80B3BC48 24010008 */ addiu $at, $zero, 0x0008 ## $at = 00000008 @@ -82,7 +82,7 @@ glabel EnWood02_Draw /* 00DCC 80B3BD3C 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 00DD0 80B3BD40 AC790004 */ sw $t9, 0x0004($v1) ## 00000004 /* 00DD4 80B3BD44 8FA40064 */ lw $a0, 0x0064($sp) -/* 00DD8 80B3BD48 0C00D498 */ jal Draw_DListOpa +/* 00DD8 80B3BD48 0C00D498 */ jal Gfx_DrawDListOpa /* 00DDC 80B3BD4C 24A50700 */ addiu $a1, $a1, 0x0700 ## $a1 = 06000700 /* 00DE0 80B3BD50 10000058 */ beq $zero, $zero, .L80B3BEB4 @@ -102,7 +102,7 @@ glabel EnWood02_Draw /* 00E14 80B3BD84 8CA5BF54 */ lw $a1, %lo(D_80B3BF54)($a1) /* 00E18 80B3BD88 A3A60053 */ sb $a2, 0x0053($sp) /* 00E1C 80B3BD8C A3A70052 */ sb $a3, 0x0052($sp) -/* 00E20 80B3BD90 0C00D498 */ jal Draw_DListOpa +/* 00E20 80B3BD90 0C00D498 */ jal Gfx_DrawDListOpa /* 00E24 80B3BD94 A3A80051 */ sb $t0, 0x0051($sp) /* 00E28 80B3BD98 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 @@ -182,7 +182,7 @@ glabel EnWood02_Draw /* 00F48 80B3BEB8 24C6BFDC */ addiu $a2, $a2, %lo(D_80B3BFDC) ## $a2 = 80B3BFDC /* 00F4C 80B3BEBC 27A4003C */ addiu $a0, $sp, 0x003C ## $a0 = FFFFFFDC /* 00F50 80B3BEC0 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 00F54 80B3BEC4 0C031AD5 */ jal func_800C6B54 +/* 00F54 80B3BEC4 0C031AD5 */ jal Graph_CloseDisps /* 00F58 80B3BEC8 24070348 */ addiu $a3, $zero, 0x0348 ## $a3 = 00000348 /* 00F5C 80B3BECC 8FBF001C */ lw $ra, 0x001C($sp) /* 00F60 80B3BED0 8FB00018 */ lw $s0, 0x0018($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/EnXc_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/EnXc_Init.s index 2f37986278..5282ad6efc 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/EnXc_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Xc/EnXc_Init.s @@ -1,115 +1,115 @@ glabel EnXc_Init /* 05720 80B41900 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 05724 80B41904 AFB10028 */ sw $s1, 0x0028($sp) -/* 05728 80B41908 AFB00024 */ sw $s0, 0x0024($sp) +/* 05724 80B41904 AFB10028 */ sw $s1, 0x0028($sp) +/* 05728 80B41908 AFB00024 */ sw $s0, 0x0024($sp) /* 0572C 80B4190C 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 05730 80B41910 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 -/* 05734 80B41914 AFBF002C */ sw $ra, 0x002C($sp) +/* 05734 80B41914 AFBF002C */ sw $ra, 0x002C($sp) /* 05738 80B41918 3C068003 */ lui $a2, 0x8003 ## $a2 = 80030000 /* 0573C 80B4191C 24C6B5EC */ addiu $a2, $a2, 0xB5EC ## $a2 = 8002B5EC /* 05740 80B41920 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 /* 05744 80B41924 248400B4 */ addiu $a0, $a0, 0x00B4 ## $a0 = 000000B4 /* 05748 80B41928 0C00AC78 */ jal ActorShape_Init - + /* 0574C 80B4192C 3C0741F0 */ lui $a3, 0x41F0 ## $a3 = 41F00000 /* 05750 80B41930 3C060601 */ lui $a2, 0x0601 ## $a2 = 06010000 /* 05754 80B41934 3C070600 */ lui $a3, 0x0600 ## $a3 = 06000000 /* 05758 80B41938 260E0190 */ addiu $t6, $s0, 0x0190 ## $t6 = 00000190 /* 0575C 80B4193C 260F01F6 */ addiu $t7, $s0, 0x01F6 ## $t7 = 000001F6 /* 05760 80B41940 24180011 */ addiu $t8, $zero, 0x0011 ## $t8 = 00000011 -/* 05764 80B41944 AFB80018 */ sw $t8, 0x0018($sp) -/* 05768 80B41948 AFAF0014 */ sw $t7, 0x0014($sp) -/* 0576C 80B4194C AFAE0010 */ sw $t6, 0x0010($sp) +/* 05764 80B41944 AFB80018 */ sw $t8, 0x0018($sp) +/* 05768 80B41948 AFAF0014 */ sw $t7, 0x0014($sp) +/* 0576C 80B4194C AFAE0010 */ sw $t6, 0x0010($sp) /* 05770 80B41950 24E74828 */ addiu $a3, $a3, 0x4828 ## $a3 = 06004828 /* 05774 80B41954 24C62AF0 */ addiu $a2, $a2, 0x2AF0 ## $a2 = 06012AF0 /* 05778 80B41958 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 0577C 80B4195C 0C0291BE */ jal func_800A46F8 +/* 0577C 80B4195C 0C0291BE */ jal SkelAnime_InitSV /* 05780 80B41960 2605014C */ addiu $a1, $s0, 0x014C ## $a1 = 0000014C /* 05784 80B41964 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 05788 80B41968 0C2CF078 */ jal func_80B3C1E0 +/* 05788 80B41968 0C2CF078 */ jal func_80B3C1E0 /* 0578C 80B4196C 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 /* 05790 80B41970 9619001C */ lhu $t9, 0x001C($s0) ## 0000001C -/* 05794 80B41974 2F21000A */ sltiu $at, $t9, 0x000A -/* 05798 80B41978 10200038 */ beq $at, $zero, .L80B41A5C -/* 0579C 80B4197C 0019C880 */ sll $t9, $t9, 2 +/* 05794 80B41974 2F21000A */ sltiu $at, $t9, 0x000A +/* 05798 80B41978 10200038 */ beq $at, $zero, .L80B41A5C +/* 0579C 80B4197C 0019C880 */ sll $t9, $t9, 2 /* 057A0 80B41980 3C0180B4 */ lui $at, %hi(jtbl_80B422B0) ## $at = 80B40000 -/* 057A4 80B41984 00390821 */ addu $at, $at, $t9 -/* 057A8 80B41988 8C3922B0 */ lw $t9, %lo(jtbl_80B422B0)($at) -/* 057AC 80B4198C 03200008 */ jr $t9 +/* 057A4 80B41984 00390821 */ addu $at, $at, $t9 +/* 057A8 80B41988 8C3922B0 */ lw $t9, %lo(jtbl_80B422B0)($at) +/* 057AC 80B4198C 03200008 */ jr $t9 /* 057B0 80B41990 00000000 */ nop glabel L80B41994 /* 057B4 80B41994 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 057B8 80B41998 0C2CFAFC */ jal func_80B3EBF0 +/* 057B8 80B41998 0C2CFAFC */ jal func_80B3EBF0 /* 057BC 80B4199C 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 057C0 80B419A0 10000035 */ beq $zero, $zero, .L80B41A78 -/* 057C4 80B419A4 8FBF002C */ lw $ra, 0x002C($sp) +/* 057C0 80B419A0 10000035 */ beq $zero, $zero, .L80B41A78 +/* 057C4 80B419A4 8FBF002C */ lw $ra, 0x002C($sp) glabel L80B419A8 /* 057C8 80B419A8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 057CC 80B419AC 0C2CFB99 */ jal func_80B3EE64 +/* 057CC 80B419AC 0C2CFB99 */ jal func_80B3EE64 /* 057D0 80B419B0 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 057D4 80B419B4 10000030 */ beq $zero, $zero, .L80B41A78 -/* 057D8 80B419B8 8FBF002C */ lw $ra, 0x002C($sp) +/* 057D4 80B419B4 10000030 */ beq $zero, $zero, .L80B41A78 +/* 057D8 80B419B8 8FBF002C */ lw $ra, 0x002C($sp) glabel L80B419BC /* 057DC 80B419BC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 057E0 80B419C0 0C2CFCF2 */ jal func_80B3F3C8 +/* 057E0 80B419C0 0C2CFCF2 */ jal func_80B3F3C8 /* 057E4 80B419C4 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 057E8 80B419C8 1000002B */ beq $zero, $zero, .L80B41A78 -/* 057EC 80B419CC 8FBF002C */ lw $ra, 0x002C($sp) +/* 057E8 80B419C8 1000002B */ beq $zero, $zero, .L80B41A78 +/* 057EC 80B419CC 8FBF002C */ lw $ra, 0x002C($sp) glabel L80B419D0 /* 057F0 80B419D0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 057F4 80B419D4 0C2CFE82 */ jal func_80B3FA08 +/* 057F4 80B419D4 0C2CFE82 */ jal func_80B3FA08 /* 057F8 80B419D8 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 057FC 80B419DC 10000026 */ beq $zero, $zero, .L80B41A78 -/* 05800 80B419E0 8FBF002C */ lw $ra, 0x002C($sp) +/* 057FC 80B419DC 10000026 */ beq $zero, $zero, .L80B41A78 +/* 05800 80B419E0 8FBF002C */ lw $ra, 0x002C($sp) glabel L80B419E4 /* 05804 80B419E4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 05808 80B419E8 0C2D0164 */ jal func_80B40590 +/* 05808 80B419E8 0C2D0164 */ jal func_80B40590 /* 0580C 80B419EC 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 05810 80B419F0 10000021 */ beq $zero, $zero, .L80B41A78 -/* 05814 80B419F4 8FBF002C */ lw $ra, 0x002C($sp) +/* 05810 80B419F0 10000021 */ beq $zero, $zero, .L80B41A78 +/* 05814 80B419F4 8FBF002C */ lw $ra, 0x002C($sp) glabel L80B419F8 /* 05818 80B419F8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0581C 80B419FC 0C2CF28E */ jal func_80B3CA38 +/* 0581C 80B419FC 0C2CF28E */ jal func_80B3CA38 /* 05820 80B41A00 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 05824 80B41A04 1000001C */ beq $zero, $zero, .L80B41A78 -/* 05828 80B41A08 8FBF002C */ lw $ra, 0x002C($sp) +/* 05824 80B41A04 1000001C */ beq $zero, $zero, .L80B41A78 +/* 05828 80B41A08 8FBF002C */ lw $ra, 0x002C($sp) glabel L80B41A0C /* 0582C 80B41A0C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 05830 80B41A10 0C2CF2D6 */ jal func_80B3CB58 +/* 05830 80B41A10 0C2CF2D6 */ jal func_80B3CB58 /* 05834 80B41A14 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 05838 80B41A18 10000017 */ beq $zero, $zero, .L80B41A78 -/* 0583C 80B41A1C 8FBF002C */ lw $ra, 0x002C($sp) +/* 05838 80B41A18 10000017 */ beq $zero, $zero, .L80B41A78 +/* 0583C 80B41A1C 8FBF002C */ lw $ra, 0x002C($sp) glabel L80B41A20 /* 05840 80B41A20 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 05844 80B41A24 0C2CF340 */ jal func_80B3CD00 +/* 05844 80B41A24 0C2CF340 */ jal func_80B3CD00 /* 05848 80B41A28 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 0584C 80B41A2C 10000012 */ beq $zero, $zero, .L80B41A78 -/* 05850 80B41A30 8FBF002C */ lw $ra, 0x002C($sp) +/* 0584C 80B41A2C 10000012 */ beq $zero, $zero, .L80B41A78 +/* 05850 80B41A30 8FBF002C */ lw $ra, 0x002C($sp) glabel L80B41A34 /* 05854 80B41A34 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 05858 80B41A38 0C2D056E */ jal func_80B415B8 +/* 05858 80B41A38 0C2D056E */ jal func_80B415B8 /* 0585C 80B41A3C 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 05860 80B41A40 1000000D */ beq $zero, $zero, .L80B41A78 -/* 05864 80B41A44 8FBF002C */ lw $ra, 0x002C($sp) +/* 05860 80B41A40 1000000D */ beq $zero, $zero, .L80B41A78 +/* 05864 80B41A44 8FBF002C */ lw $ra, 0x002C($sp) glabel L80B41A48 /* 05868 80B41A48 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0586C 80B41A4C 0C2CF39E */ jal func_80B3CE78 +/* 0586C 80B41A4C 0C2CF39E */ jal func_80B3CE78 /* 05870 80B41A50 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 05874 80B41A54 10000008 */ beq $zero, $zero, .L80B41A78 -/* 05878 80B41A58 8FBF002C */ lw $ra, 0x002C($sp) +/* 05874 80B41A54 10000008 */ beq $zero, $zero, .L80B41A78 +/* 05878 80B41A58 8FBF002C */ lw $ra, 0x002C($sp) .L80B41A5C: /* 0587C 80B41A5C 3C0480B4 */ lui $a0, %hi(D_80B4215C) ## $a0 = 80B40000 /* 05880 80B41A60 0C00084C */ jal osSyncPrintf - + /* 05884 80B41A64 2484215C */ addiu $a0, $a0, %lo(D_80B4215C) ## $a0 = 80B4215C /* 05888 80B41A68 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0588C 80B41A6C 0C2CF39E */ jal func_80B3CE78 +/* 0588C 80B41A6C 0C2CF39E */ jal func_80B3CE78 /* 05890 80B41A70 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 05894 80B41A74 8FBF002C */ lw $ra, 0x002C($sp) +/* 05894 80B41A74 8FBF002C */ lw $ra, 0x002C($sp) .L80B41A78: -/* 05898 80B41A78 8FB00024 */ lw $s0, 0x0024($sp) -/* 0589C 80B41A7C 8FB10028 */ lw $s1, 0x0028($sp) -/* 058A0 80B41A80 03E00008 */ jr $ra +/* 05898 80B41A78 8FB00024 */ lw $s0, 0x0024($sp) +/* 0589C 80B41A7C 8FB10028 */ lw $s1, 0x0028($sp) +/* 058A0 80B41A80 03E00008 */ jr $ra /* 058A4 80B41A84 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3C700.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3C700.s index c36529cd5c..ab918b42db 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3C700.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3C700.s @@ -1,54 +1,54 @@ glabel func_80B3C700 -/* 00520 80B3C700 00057100 */ sll $t6, $a1, 4 -/* 00524 80B3C704 000E7F02 */ srl $t7, $t6, 28 -/* 00528 80B3C708 000FC080 */ sll $t8, $t7, 2 +/* 00520 80B3C700 00057100 */ sll $t6, $a1, 4 +/* 00524 80B3C704 000E7F02 */ srl $t7, $t6, 28 +/* 00528 80B3C708 000FC080 */ sll $t8, $t7, 2 /* 0052C 80B3C70C 3C198016 */ lui $t9, 0x8016 ## $t9 = 80160000 -/* 00530 80B3C710 0338C821 */ addu $t9, $t9, $t8 +/* 00530 80B3C710 0338C821 */ addu $t9, $t9, $t8 /* 00534 80B3C714 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 /* 00538 80B3C718 8F396FA8 */ lw $t9, 0x6FA8($t9) ## 80166FA8 /* 0053C 80B3C71C 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF /* 00540 80B3C720 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 00544 80B3C724 00A14024 */ and $t0, $a1, $at -/* 00548 80B3C728 AFA40038 */ sw $a0, 0x0038($sp) +/* 00544 80B3C724 00A14024 */ and $t0, $a1, $at +/* 00548 80B3C728 AFA40038 */ sw $a0, 0x0038($sp) /* 0054C 80B3C72C 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 00550 80B3C730 03282021 */ addu $a0, $t9, $t0 -/* 00554 80B3C734 AFBF0024 */ sw $ra, 0x0024($sp) -/* 00558 80B3C738 00812021 */ addu $a0, $a0, $at -/* 0055C 80B3C73C AFA60040 */ sw $a2, 0x0040($sp) -/* 00560 80B3C740 AFA70044 */ sw $a3, 0x0044($sp) +/* 00550 80B3C730 03282021 */ addu $a0, $t9, $t0 +/* 00554 80B3C734 AFBF0024 */ sw $ra, 0x0024($sp) +/* 00558 80B3C738 00812021 */ addu $a0, $a0, $at +/* 0055C 80B3C73C AFA60040 */ sw $a2, 0x0040($sp) +/* 00560 80B3C740 AFA70044 */ sw $a3, 0x0044($sp) /* 00564 80B3C744 0C028800 */ jal SkelAnime_GetFrameCount - -/* 00568 80B3C748 AFA4002C */ sw $a0, 0x002C($sp) -/* 0056C 80B3C74C 8FA90048 */ lw $t1, 0x0048($sp) -/* 00570 80B3C750 8FA40038 */ lw $a0, 0x0038($sp) -/* 00574 80B3C754 8FA5002C */ lw $a1, 0x002C($sp) -/* 00578 80B3C758 15200007 */ bne $t1, $zero, .L80B3C778 + +/* 00568 80B3C748 AFA4002C */ sw $a0, 0x002C($sp) +/* 0056C 80B3C74C 8FA90048 */ lw $t1, 0x0048($sp) +/* 00570 80B3C750 8FA40038 */ lw $a0, 0x0038($sp) +/* 00574 80B3C754 8FA5002C */ lw $a1, 0x002C($sp) +/* 00578 80B3C758 15200007 */ bne $t1, $zero, .L80B3C778 /* 0057C 80B3C75C 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C /* 00580 80B3C760 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 00584 80B3C764 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 /* 00588 80B3C768 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 /* 0058C 80B3C76C 44816000 */ mtc1 $at, $f12 ## $f12 = 1.00 -/* 00590 80B3C770 10000006 */ beq $zero, $zero, .L80B3C78C -/* 00594 80B3C774 468020A0 */ cvt.s.w $f2, $f4 +/* 00590 80B3C770 10000006 */ beq $zero, $zero, .L80B3C78C +/* 00594 80B3C774 468020A0 */ cvt.s.w $f2, $f4 .L80B3C778: /* 00598 80B3C778 44823000 */ mtc1 $v0, $f6 ## $f6 = 0.00 /* 0059C 80B3C77C 3C01BF80 */ lui $at, 0xBF80 ## $at = BF800000 /* 005A0 80B3C780 44801000 */ mtc1 $zero, $f2 ## $f2 = 0.00 /* 005A4 80B3C784 44816000 */ mtc1 $at, $f12 ## $f12 = -1.00 -/* 005A8 80B3C788 46803020 */ cvt.s.w $f0, $f6 +/* 005A8 80B3C788 46803020 */ cvt.s.w $f0, $f6 .L80B3C78C: -/* 005AC 80B3C78C 93AA0043 */ lbu $t2, 0x0043($sp) -/* 005B0 80B3C790 C7A80044 */ lwc1 $f8, 0x0044($sp) -/* 005B4 80B3C794 44066000 */ mfc1 $a2, $f12 -/* 005B8 80B3C798 44070000 */ mfc1 $a3, $f0 -/* 005BC 80B3C79C E7A20010 */ swc1 $f2, 0x0010($sp) -/* 005C0 80B3C7A0 AFAA0014 */ sw $t2, 0x0014($sp) -/* 005C4 80B3C7A4 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 005C8 80B3C7A8 E7A80018 */ swc1 $f8, 0x0018($sp) -/* 005CC 80B3C7AC 8FBF0024 */ lw $ra, 0x0024($sp) +/* 005AC 80B3C78C 93AA0043 */ lbu $t2, 0x0043($sp) +/* 005B0 80B3C790 C7A80044 */ lwc1 $f8, 0x0044($sp) +/* 005B4 80B3C794 44066000 */ mfc1 $a2, $f12 +/* 005B8 80B3C798 44070000 */ mfc1 $a3, $f0 +/* 005BC 80B3C79C E7A20010 */ swc1 $f2, 0x0010($sp) +/* 005C0 80B3C7A0 AFAA0014 */ sw $t2, 0x0014($sp) +/* 005C4 80B3C7A4 0C029468 */ jal SkelAnime_ChangeAnim + +/* 005C8 80B3C7A8 E7A80018 */ swc1 $f8, 0x0018($sp) +/* 005CC 80B3C7AC 8FBF0024 */ lw $ra, 0x0024($sp) /* 005D0 80B3C7B0 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 -/* 005D4 80B3C7B4 03E00008 */ jr $ra +/* 005D4 80B3C7B4 03E00008 */ jr $ra /* 005D8 80B3C7B8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3C820.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3C820.s index a838d6a88a..88fa1b69dd 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3C820.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3C820.s @@ -1,31 +1,31 @@ glabel func_80B3C820 /* 00640 80B3C820 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 00644 80B3C824 AFA40028 */ sw $a0, 0x0028($sp) -/* 00648 80B3C828 AFBF0024 */ sw $ra, 0x0024($sp) +/* 00644 80B3C824 AFA40028 */ sw $a0, 0x0028($sp) +/* 00648 80B3C828 AFBF0024 */ sw $ra, 0x0024($sp) /* 0064C 80B3C82C 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 /* 00650 80B3C830 0C028800 */ jal SkelAnime_GetFrameCount - + /* 00654 80B3C834 24844828 */ addiu $a0, $a0, 0x4828 ## $a0 = 06004828 /* 00658 80B3C838 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 0065C 80B3C83C 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 00660 80B3C840 8FA40028 */ lw $a0, 0x0028($sp) -/* 00664 80B3C844 468021A0 */ cvt.s.w $f6, $f4 +/* 00660 80B3C840 8FA40028 */ lw $a0, 0x0028($sp) +/* 00664 80B3C844 468021A0 */ cvt.s.w $f6, $f4 /* 00668 80B3C848 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 0066C 80B3C84C 44070000 */ mfc1 $a3, $f0 +/* 0066C 80B3C84C 44070000 */ mfc1 $a3, $f0 /* 00670 80B3C850 24A54828 */ addiu $a1, $a1, 0x4828 ## $a1 = 06004828 /* 00674 80B3C854 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 00678 80B3C858 AFA00014 */ sw $zero, 0x0014($sp) -/* 0067C 80B3C85C E7A60010 */ swc1 $f6, 0x0010($sp) +/* 00678 80B3C858 AFA00014 */ sw $zero, 0x0014($sp) +/* 0067C 80B3C85C E7A60010 */ swc1 $f6, 0x0010($sp) /* 00680 80B3C860 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 00684 80B3C864 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 00688 80B3C868 E7A00018 */ swc1 $f0, 0x0018($sp) -/* 0068C 80B3C86C 8FAF0028 */ lw $t7, 0x0028($sp) +/* 00684 80B3C864 0C029468 */ jal SkelAnime_ChangeAnim + +/* 00688 80B3C868 E7A00018 */ swc1 $f0, 0x0018($sp) +/* 0068C 80B3C86C 8FAF0028 */ lw $t7, 0x0028($sp) /* 00690 80B3C870 240E0035 */ addiu $t6, $zero, 0x0035 ## $t6 = 00000035 /* 00694 80B3C874 ADEE0260 */ sw $t6, 0x0260($t7) ## 00000260 -/* 00698 80B3C878 8FBF0024 */ lw $ra, 0x0024($sp) +/* 00698 80B3C878 8FBF0024 */ lw $ra, 0x0024($sp) /* 0069C 80B3C87C 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 006A0 80B3C880 03E00008 */ jr $ra +/* 006A0 80B3C880 03E00008 */ jr $ra /* 006A4 80B3C884 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3C8CC.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3C8CC.s index 0903eefa56..bc2092b8f1 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3C8CC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3C8CC.s @@ -1,26 +1,26 @@ glabel func_80B3C8CC /* 006EC 80B3C8CC 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 006F0 80B3C8D0 AFBF0014 */ sw $ra, 0x0014($sp) -/* 006F4 80B3C8D4 AFA40018 */ sw $a0, 0x0018($sp) -/* 006F8 80B3C8D8 AFA5001C */ sw $a1, 0x001C($sp) +/* 006F0 80B3C8D0 AFBF0014 */ sw $ra, 0x0014($sp) +/* 006F4 80B3C8D4 AFA40018 */ sw $a0, 0x0018($sp) +/* 006F8 80B3C8D8 AFA5001C */ sw $a1, 0x001C($sp) /* 006FC 80B3C8DC 8C8F016C */ lw $t7, 0x016C($a0) ## 0000016C /* 00700 80B3C8E0 8499018C */ lh $t9, 0x018C($a0) ## 0000018C /* 00704 80B3C8E4 2486014C */ addiu $a2, $a0, 0x014C ## $a2 = 0000014C /* 00708 80B3C8E8 85F80002 */ lh $t8, 0x0002($t7) ## 00000002 -/* 0070C 80B3C8EC 0319082A */ slt $at, $t8, $t9 -/* 00710 80B3C8F0 54200009 */ bnel $at, $zero, .L80B3C918 -/* 00714 80B3C8F4 8FBF0014 */ lw $ra, 0x0014($sp) +/* 0070C 80B3C8EC 0319082A */ slt $at, $t8, $t9 +/* 00710 80B3C8F0 54200009 */ bnel $at, $zero, .L80B3C918 +/* 00714 80B3C8F4 8FBF0014 */ lw $ra, 0x0014($sp) /* 00718 80B3C8F8 90C80035 */ lbu $t0, 0x0035($a2) ## 00000181 /* 0071C 80B3C8FC 3C073F80 */ lui $a3, 0x3F80 ## $a3 = 3F800000 /* 00720 80B3C900 35090003 */ ori $t1, $t0, 0x0003 ## $t1 = 00000003 /* 00724 80B3C904 A0C90035 */ sb $t1, 0x0035($a2) ## 00000181 -/* 00728 80B3C908 8FA50018 */ lw $a1, 0x0018($sp) -/* 0072C 80B3C90C 0C028D88 */ jal func_800A3620 -/* 00730 80B3C910 8FA4001C */ lw $a0, 0x001C($sp) -/* 00734 80B3C914 8FBF0014 */ lw $ra, 0x0014($sp) +/* 00728 80B3C908 8FA50018 */ lw $a1, 0x0018($sp) +/* 0072C 80B3C90C 0C028D88 */ jal SkelAnime_LoadAnimationType5 +/* 00730 80B3C910 8FA4001C */ lw $a0, 0x001C($sp) +/* 00734 80B3C914 8FBF0014 */ lw $ra, 0x0014($sp) .L80B3C918: /* 00738 80B3C918 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 0073C 80B3C91C 03E00008 */ jr $ra +/* 0073C 80B3C91C 03E00008 */ jr $ra /* 00740 80B3C920 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3C924.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3C924.s index 57cde32fb3..7d719b979e 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3C924.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3C924.s @@ -1,19 +1,19 @@ glabel func_80B3C924 /* 00744 80B3C924 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00748 80B3C928 AFBF0014 */ sw $ra, 0x0014($sp) -/* 0074C 80B3C92C AFA40018 */ sw $a0, 0x0018($sp) -/* 00750 80B3C930 AFA5001C */ sw $a1, 0x001C($sp) +/* 00748 80B3C928 AFBF0014 */ sw $ra, 0x0014($sp) +/* 0074C 80B3C92C AFA40018 */ sw $a0, 0x0018($sp) +/* 00750 80B3C930 AFA5001C */ sw $a1, 0x001C($sp) /* 00754 80B3C934 908E0181 */ lbu $t6, 0x0181($a0) ## 00000181 /* 00758 80B3C938 00802825 */ or $a1, $a0, $zero ## $a1 = 00000000 /* 0075C 80B3C93C 24A6014C */ addiu $a2, $a1, 0x014C ## $a2 = 0000014C /* 00760 80B3C940 35CF0003 */ ori $t7, $t6, 0x0003 ## $t7 = 00000003 /* 00764 80B3C944 A08F0181 */ sb $t7, 0x0181($a0) ## 00000181 -/* 00768 80B3C948 8FA4001C */ lw $a0, 0x001C($sp) -/* 0076C 80B3C94C 0C028D88 */ jal func_800A3620 +/* 00768 80B3C948 8FA4001C */ lw $a0, 0x001C($sp) +/* 0076C 80B3C94C 0C028D88 */ jal SkelAnime_LoadAnimationType5 /* 00770 80B3C950 3C073F80 */ lui $a3, 0x3F80 ## $a3 = 3F800000 -/* 00774 80B3C954 8FBF0014 */ lw $ra, 0x0014($sp) +/* 00774 80B3C954 8FBF0014 */ lw $ra, 0x0014($sp) /* 00778 80B3C958 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 0077C 80B3C95C 03E00008 */ jr $ra +/* 0077C 80B3C95C 03E00008 */ jr $ra /* 00780 80B3C960 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3C964.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3C964.s index bb9bf80e4b..75e738f2cd 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3C964.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3C964.s @@ -1,8 +1,8 @@ glabel func_80B3C964 /* 00784 80B3C964 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00788 80B3C968 AFBF0014 */ sw $ra, 0x0014($sp) -/* 0078C 80B3C96C AFA40018 */ sw $a0, 0x0018($sp) -/* 00790 80B3C970 AFA5001C */ sw $a1, 0x001C($sp) +/* 00788 80B3C968 AFBF0014 */ sw $ra, 0x0014($sp) +/* 0078C 80B3C96C AFA40018 */ sw $a0, 0x0018($sp) +/* 00790 80B3C970 AFA5001C */ sw $a1, 0x001C($sp) /* 00794 80B3C974 8C8E016C */ lw $t6, 0x016C($a0) ## 0000016C /* 00798 80B3C978 8C99016C */ lw $t9, 0x016C($a0) ## 0000016C /* 0079C 80B3C97C 908A0181 */ lbu $t2, 0x0181($a0) ## 00000181 @@ -23,11 +23,11 @@ glabel func_80B3C964 /* 007D8 80B3C9B8 97290004 */ lhu $t1, 0x0004($t9) ## 00000004 /* 007DC 80B3C9BC A08B0181 */ sb $t3, 0x0181($a0) ## 00000181 /* 007E0 80B3C9C0 A4890188 */ sh $t1, 0x0188($a0) ## 00000188 -/* 007E4 80B3C9C4 0C028D88 */ jal func_800A3620 -/* 007E8 80B3C9C8 8FA4001C */ lw $a0, 0x001C($sp) -/* 007EC 80B3C9CC 8FBF0014 */ lw $ra, 0x0014($sp) +/* 007E4 80B3C9C4 0C028D88 */ jal SkelAnime_LoadAnimationType5 +/* 007E8 80B3C9C8 8FA4001C */ lw $a0, 0x001C($sp) +/* 007EC 80B3C9CC 8FBF0014 */ lw $ra, 0x0014($sp) /* 007F0 80B3C9D0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 007F4 80B3C9D4 03E00008 */ jr $ra +/* 007F4 80B3C9D4 03E00008 */ jr $ra /* 007F8 80B3C9D8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3D794.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3D794.s index ecd5a3422d..02911e8694 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3D794.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3D794.s @@ -1,75 +1,75 @@ glabel func_80B3D794 /* 015B4 80B3D794 27BDFFB0 */ addiu $sp, $sp, 0xFFB0 ## $sp = FFFFFFB0 -/* 015B8 80B3D798 AFBF002C */ sw $ra, 0x002C($sp) -/* 015BC 80B3D79C AFB10028 */ sw $s1, 0x0028($sp) -/* 015C0 80B3D7A0 AFB00024 */ sw $s0, 0x0024($sp) +/* 015B8 80B3D798 AFBF002C */ sw $ra, 0x002C($sp) +/* 015BC 80B3D79C AFB10028 */ sw $s1, 0x0028($sp) +/* 015C0 80B3D7A0 AFB00024 */ sw $s0, 0x0024($sp) /* 015C4 80B3D7A4 90AE1D6C */ lbu $t6, 0x1D6C($a1) ## 00001D6C /* 015C8 80B3D7A8 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 015CC 80B3D7AC 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 -/* 015D0 80B3D7B0 51C00038 */ beql $t6, $zero, .L80B3D894 -/* 015D4 80B3D7B4 8FBF002C */ lw $ra, 0x002C($sp) +/* 015D0 80B3D7B0 51C00038 */ beql $t6, $zero, .L80B3D894 +/* 015D4 80B3D7B4 8FBF002C */ lw $ra, 0x002C($sp) /* 015D8 80B3D7B8 8CA61D9C */ lw $a2, 0x1D9C($a1) ## 00001D9C -/* 015DC 80B3D7BC 50C00035 */ beql $a2, $zero, .L80B3D894 -/* 015E0 80B3D7C0 8FBF002C */ lw $ra, 0x002C($sp) +/* 015DC 80B3D7BC 50C00035 */ beql $a2, $zero, .L80B3D894 +/* 015E0 80B3D7C0 8FBF002C */ lw $ra, 0x002C($sp) /* 015E4 80B3D7C4 94CF0000 */ lhu $t7, 0x0000($a2) ## 00000000 /* 015E8 80B3D7C8 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 /* 015EC 80B3D7CC 3C040602 */ lui $a0, 0x0602 ## $a0 = 06020000 -/* 015F0 80B3D7D0 15E1002F */ bne $t7, $at, .L80B3D890 +/* 015F0 80B3D7D0 15E1002F */ bne $t7, $at, .L80B3D890 /* 015F4 80B3D7D4 2484C0E8 */ addiu $a0, $a0, 0xC0E8 ## $a0 = 0601C0E8 /* 015F8 80B3D7D8 0C028800 */ jal SkelAnime_GetFrameCount - -/* 015FC 80B3D7DC AFA60044 */ sw $a2, 0x0044($sp) + +/* 015FC 80B3D7DC AFA60044 */ sw $a2, 0x0044($sp) /* 01600 80B3D7E0 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 -/* 01604 80B3D7E4 8FA60044 */ lw $a2, 0x0044($sp) +/* 01604 80B3D7E4 8FA60044 */ lw $a2, 0x0044($sp) /* 01608 80B3D7E8 24180002 */ addiu $t8, $zero, 0x0002 ## $t8 = 00000002 -/* 0160C 80B3D7EC 468021A0 */ cvt.s.w $f6, $f4 +/* 0160C 80B3D7EC 468021A0 */ cvt.s.w $f6, $f4 /* 01610 80B3D7F0 24190001 */ addiu $t9, $zero, 0x0001 ## $t9 = 00000001 /* 01614 80B3D7F4 26030024 */ addiu $v1, $s0, 0x0024 ## $v1 = 00000024 /* 01618 80B3D7F8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 0161C 80B3D7FC 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 01620 80B3D800 E7A60034 */ swc1 $f6, 0x0034($sp) +/* 01620 80B3D800 E7A60034 */ swc1 $f6, 0x0034($sp) /* 01624 80B3D804 AE180260 */ sw $t8, 0x0260($s0) ## 00000260 /* 01628 80B3D808 AE190264 */ sw $t9, 0x0264($s0) ## 00000264 /* 0162C 80B3D80C 8CC8000C */ lw $t0, 0x000C($a2) ## 0000000C /* 01630 80B3D810 44884000 */ mtc1 $t0, $f8 ## $f8 = 0.00 /* 01634 80B3D814 00000000 */ nop -/* 01638 80B3D818 468042A0 */ cvt.s.w $f10, $f8 +/* 01638 80B3D818 468042A0 */ cvt.s.w $f10, $f8 /* 0163C 80B3D81C E46A0000 */ swc1 $f10, 0x0000($v1) ## 00000024 /* 01640 80B3D820 8CC90010 */ lw $t1, 0x0010($a2) ## 00000010 /* 01644 80B3D824 44898000 */ mtc1 $t1, $f16 ## $f16 = 0.00 /* 01648 80B3D828 00000000 */ nop -/* 0164C 80B3D82C 468084A0 */ cvt.s.w $f18, $f16 +/* 0164C 80B3D82C 468084A0 */ cvt.s.w $f18, $f16 /* 01650 80B3D830 E4720004 */ swc1 $f18, 0x0004($v1) ## 00000028 /* 01654 80B3D834 8CCA0014 */ lw $t2, 0x0014($a2) ## 00000014 /* 01658 80B3D838 448A2000 */ mtc1 $t2, $f4 ## $f4 = 0.00 /* 0165C 80B3D83C 00000000 */ nop -/* 01660 80B3D840 468021A0 */ cvt.s.w $f6, $f4 -/* 01664 80B3D844 0C2CF523 */ jal func_80B3D48C +/* 01660 80B3D840 468021A0 */ cvt.s.w $f6, $f4 +/* 01664 80B3D844 0C2CF523 */ jal func_80B3D48C /* 01668 80B3D848 E4660008 */ swc1 $f6, 0x0008($v1) ## 0000002C /* 0166C 80B3D84C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01670 80B3D850 0C2CF259 */ jal func_80B3C964 +/* 01670 80B3D850 0C2CF259 */ jal func_80B3C964 /* 01674 80B3D854 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 /* 01678 80B3D858 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 0167C 80B3D85C C7A80034 */ lwc1 $f8, 0x0034($sp) +/* 0167C 80B3D85C C7A80034 */ lwc1 $f8, 0x0034($sp) /* 01680 80B3D860 3C050602 */ lui $a1, 0x0602 ## $a1 = 06020000 /* 01684 80B3D864 240B0002 */ addiu $t3, $zero, 0x0002 ## $t3 = 00000002 -/* 01688 80B3D868 44070000 */ mfc1 $a3, $f0 -/* 0168C 80B3D86C AFAB0014 */ sw $t3, 0x0014($sp) +/* 01688 80B3D868 44070000 */ mfc1 $a3, $f0 +/* 0168C 80B3D86C AFAB0014 */ sw $t3, 0x0014($sp) /* 01690 80B3D870 24A5C0E8 */ addiu $a1, $a1, 0xC0E8 ## $a1 = 0601C0E8 /* 01694 80B3D874 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C /* 01698 80B3D878 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 0169C 80B3D87C E7A80010 */ swc1 $f8, 0x0010($sp) -/* 016A0 80B3D880 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 016A4 80B3D884 E7A00018 */ swc1 $f0, 0x0018($sp) -/* 016A8 80B3D888 0C2CF446 */ jal func_80B3D118 +/* 0169C 80B3D87C E7A80010 */ swc1 $f8, 0x0010($sp) +/* 016A0 80B3D880 0C029468 */ jal SkelAnime_ChangeAnim + +/* 016A4 80B3D884 E7A00018 */ swc1 $f0, 0x0018($sp) +/* 016A8 80B3D888 0C2CF446 */ jal func_80B3D118 /* 016AC 80B3D88C 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 .L80B3D890: -/* 016B0 80B3D890 8FBF002C */ lw $ra, 0x002C($sp) +/* 016B0 80B3D890 8FBF002C */ lw $ra, 0x002C($sp) .L80B3D894: -/* 016B4 80B3D894 8FB00024 */ lw $s0, 0x0024($sp) -/* 016B8 80B3D898 8FB10028 */ lw $s1, 0x0028($sp) -/* 016BC 80B3D89C 03E00008 */ jr $ra +/* 016B4 80B3D894 8FB00024 */ lw $s0, 0x0024($sp) +/* 016B8 80B3D898 8FB10028 */ lw $s1, 0x0028($sp) +/* 016BC 80B3D89C 03E00008 */ jr $ra /* 016C0 80B3D8A0 27BD0050 */ addiu $sp, $sp, 0x0050 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3D8A4.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3D8A4.s index 69ab49b718..b8d8820e67 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3D8A4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3D8A4.s @@ -1,66 +1,66 @@ glabel func_80B3D8A4 /* 016C4 80B3D8A4 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 016C8 80B3D8A8 AFB00028 */ sw $s0, 0x0028($sp) +/* 016C8 80B3D8A8 AFB00028 */ sw $s0, 0x0028($sp) /* 016CC 80B3D8AC 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 016D0 80B3D8B0 10C00030 */ beq $a2, $zero, .L80B3D974 -/* 016D4 80B3D8B4 AFBF002C */ sw $ra, 0x002C($sp) +/* 016D0 80B3D8B0 10C00030 */ beq $a2, $zero, .L80B3D974 +/* 016D4 80B3D8B4 AFBF002C */ sw $ra, 0x002C($sp) /* 016D8 80B3D8B8 3C040601 */ lui $a0, 0x0601 ## $a0 = 06010000 /* 016DC 80B3D8BC 0C028800 */ jal SkelAnime_GetFrameCount - + /* 016E0 80B3D8C0 24842FD0 */ addiu $a0, $a0, 0x2FD0 ## $a0 = 06012FD0 /* 016E4 80B3D8C4 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 016E8 80B3D8C8 3C01C100 */ lui $at, 0xC100 ## $at = C1000000 /* 016EC 80B3D8CC 44814000 */ mtc1 $at, $f8 ## $f8 = -8.00 -/* 016F0 80B3D8D0 468021A0 */ cvt.s.w $f6, $f4 +/* 016F0 80B3D8D0 468021A0 */ cvt.s.w $f6, $f4 /* 016F4 80B3D8D4 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 /* 016F8 80B3D8D8 24A52FD0 */ addiu $a1, $a1, 0x2FD0 ## $a1 = 06012FD0 /* 016FC 80B3D8DC 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C /* 01700 80B3D8E0 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 01704 80B3D8E4 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 01708 80B3D8E8 E7A60010 */ swc1 $f6, 0x0010($sp) -/* 0170C 80B3D8EC AFA00014 */ sw $zero, 0x0014($sp) -/* 01710 80B3D8F0 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 01714 80B3D8F4 E7A80018 */ swc1 $f8, 0x0018($sp) +/* 01708 80B3D8E8 E7A60010 */ swc1 $f6, 0x0010($sp) +/* 0170C 80B3D8EC AFA00014 */ sw $zero, 0x0014($sp) +/* 01710 80B3D8F0 0C029468 */ jal SkelAnime_ChangeAnim + +/* 01714 80B3D8F4 E7A80018 */ swc1 $f8, 0x0018($sp) /* 01718 80B3D8F8 44805000 */ mtc1 $zero, $f10 ## $f10 = 0.00 /* 0171C 80B3D8FC 240E0003 */ addiu $t6, $zero, 0x0003 ## $t6 = 00000003 /* 01720 80B3D900 AE0E0260 */ sw $t6, 0x0260($s0) ## 00000260 /* 01724 80B3D904 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01728 80B3D908 0C2CF277 */ jal func_80B3C9DC +/* 01728 80B3D908 0C2CF277 */ jal func_80B3C9DC /* 0172C 80B3D90C E60A0268 */ swc1 $f10, 0x0268($s0) ## 00000268 /* 01730 80B3D910 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 /* 01734 80B3D914 2442FA90 */ addiu $v0, $v0, 0xFA90 ## $v0 = 8015FA90 /* 01738 80B3D918 8C4F0000 */ lw $t7, 0x0000($v0) ## 8015FA90 /* 0173C 80B3D91C 3C0180B4 */ lui $at, %hi(D_80B42228) ## $at = 80B40000 -/* 01740 80B3D920 C4202228 */ lwc1 $f0, %lo(D_80B42228)($at) +/* 01740 80B3D920 C4202228 */ lwc1 $f0, %lo(D_80B42228)($at) /* 01744 80B3D924 85F81456 */ lh $t8, 0x1456($t7) ## 00001456 /* 01748 80B3D928 3C014150 */ lui $at, 0x4150 ## $at = 41500000 /* 0174C 80B3D92C 44811000 */ mtc1 $at, $f2 ## $f2 = 13.00 /* 01750 80B3D930 44988000 */ mtc1 $t8, $f16 ## $f16 = 0.00 /* 01754 80B3D934 00000000 */ nop -/* 01758 80B3D938 468084A0 */ cvt.s.w $f18, $f16 -/* 0175C 80B3D93C 46009102 */ mul.s $f4, $f18, $f0 -/* 01760 80B3D940 46022180 */ add.s $f6, $f4, $f2 -/* 01764 80B3D944 46003207 */ neg.s $f8, $f6 +/* 01758 80B3D938 468084A0 */ cvt.s.w $f18, $f16 +/* 0175C 80B3D93C 46009102 */ mul.s $f4, $f18, $f0 +/* 01760 80B3D940 46022180 */ add.s $f6, $f4, $f2 +/* 01764 80B3D944 46003207 */ neg.s $f8, $f6 /* 01768 80B3D948 E608006C */ swc1 $f8, 0x006C($s0) ## 0000006C /* 0176C 80B3D94C 8C590000 */ lw $t9, 0x0000($v0) ## 8015FA90 /* 01770 80B3D950 87281456 */ lh $t0, 0x1456($t9) ## 00001456 /* 01774 80B3D954 44885000 */ mtc1 $t0, $f10 ## $f10 = 0.00 /* 01778 80B3D958 00000000 */ nop -/* 0177C 80B3D95C 46805420 */ cvt.s.w $f16, $f10 -/* 01780 80B3D960 46008482 */ mul.s $f18, $f16, $f0 -/* 01784 80B3D964 46029100 */ add.s $f4, $f18, $f2 -/* 01788 80B3D968 46002187 */ neg.s $f6, $f4 -/* 0178C 80B3D96C 10000003 */ beq $zero, $zero, .L80B3D97C +/* 0177C 80B3D95C 46805420 */ cvt.s.w $f16, $f10 +/* 01780 80B3D960 46008482 */ mul.s $f18, $f16, $f0 +/* 01784 80B3D964 46029100 */ add.s $f4, $f18, $f2 +/* 01788 80B3D968 46002187 */ neg.s $f6, $f4 +/* 0178C 80B3D96C 10000003 */ beq $zero, $zero, .L80B3D97C /* 01790 80B3D970 E6060070 */ swc1 $f6, 0x0070($s0) ## 00000070 .L80B3D974: -/* 01794 80B3D974 0C2CF233 */ jal func_80B3C8CC +/* 01794 80B3D974 0C2CF233 */ jal func_80B3C8CC /* 01798 80B3D978 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 .L80B3D97C: -/* 0179C 80B3D97C 8FBF002C */ lw $ra, 0x002C($sp) -/* 017A0 80B3D980 8FB00028 */ lw $s0, 0x0028($sp) +/* 0179C 80B3D97C 8FBF002C */ lw $ra, 0x002C($sp) +/* 017A0 80B3D980 8FB00028 */ lw $s0, 0x0028($sp) /* 017A4 80B3D984 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 017A8 80B3D988 03E00008 */ jr $ra +/* 017A8 80B3D988 03E00008 */ jr $ra /* 017AC 80B3D98C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3DA00.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3DA00.s index d1383caa1c..6243f3d372 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3DA00.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3DA00.s @@ -2,47 +2,47 @@ glabel func_80B3DA00 /* 01820 80B3DA00 3C0F8016 */ lui $t7, 0x8016 ## $t7 = 80160000 /* 01824 80B3DA04 8DEFFA90 */ lw $t7, -0x0570($t7) ## 8015FA90 /* 01828 80B3DA08 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 0182C 80B3DA0C AFBF0024 */ sw $ra, 0x0024($sp) -/* 01830 80B3DA10 AFA40028 */ sw $a0, 0x0028($sp) +/* 0182C 80B3DA0C AFBF0024 */ sw $ra, 0x0024($sp) +/* 01830 80B3DA10 AFA40028 */ sw $a0, 0x0028($sp) /* 01834 80B3DA14 85F8145A */ lh $t8, 0x145A($t7) ## 8016145A /* 01838 80B3DA18 3C0142BE */ lui $at, 0x42BE ## $at = 42BE0000 /* 0183C 80B3DA1C 44814000 */ mtc1 $at, $f8 ## $f8 = 95.00 /* 01840 80B3DA20 44982000 */ mtc1 $t8, $f4 ## $f4 = 0.00 /* 01844 80B3DA24 C4800090 */ lwc1 $f0, 0x0090($a0) ## 00000090 /* 01848 80B3DA28 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 -/* 0184C 80B3DA2C 468021A0 */ cvt.s.w $f6, $f4 -/* 01850 80B3DA30 46083280 */ add.s $f10, $f6, $f8 -/* 01854 80B3DA34 460A003E */ c.le.s $f0, $f10 +/* 0184C 80B3DA2C 468021A0 */ cvt.s.w $f6, $f4 +/* 01850 80B3DA30 46083280 */ add.s $f10, $f6, $f8 +/* 01854 80B3DA34 460A003E */ c.le.s $f0, $f10 /* 01858 80B3DA38 00000000 */ nop -/* 0185C 80B3DA3C 45020017 */ bc1fl .L80B3DA9C -/* 01860 80B3DA40 8FBF0024 */ lw $ra, 0x0024($sp) +/* 0185C 80B3DA3C 45020017 */ bc1fl .L80B3DA9C +/* 01860 80B3DA40 8FBF0024 */ lw $ra, 0x0024($sp) /* 01864 80B3DA44 0C028800 */ jal SkelAnime_GetFrameCount - + /* 01868 80B3DA48 24844828 */ addiu $a0, $a0, 0x4828 ## $a0 = 06004828 /* 0186C 80B3DA4C 44828000 */ mtc1 $v0, $f16 ## $f16 = 0.00 /* 01870 80B3DA50 3C01C140 */ lui $at, 0xC140 ## $at = C1400000 /* 01874 80B3DA54 44812000 */ mtc1 $at, $f4 ## $f4 = -12.00 -/* 01878 80B3DA58 468084A0 */ cvt.s.w $f18, $f16 -/* 0187C 80B3DA5C 8FA40028 */ lw $a0, 0x0028($sp) +/* 01878 80B3DA58 468084A0 */ cvt.s.w $f18, $f16 +/* 0187C 80B3DA5C 8FA40028 */ lw $a0, 0x0028($sp) /* 01880 80B3DA60 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 01884 80B3DA64 24A54828 */ addiu $a1, $a1, 0x4828 ## $a1 = 06004828 /* 01888 80B3DA68 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 0188C 80B3DA6C 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 01890 80B3DA70 E7B20010 */ swc1 $f18, 0x0010($sp) -/* 01894 80B3DA74 AFA00014 */ sw $zero, 0x0014($sp) -/* 01898 80B3DA78 E7A40018 */ swc1 $f4, 0x0018($sp) -/* 0189C 80B3DA7C 0C029468 */ jal SkelAnime_ChangeAnimation - +/* 01890 80B3DA70 E7B20010 */ swc1 $f18, 0x0010($sp) +/* 01894 80B3DA74 AFA00014 */ sw $zero, 0x0014($sp) +/* 01898 80B3DA78 E7A40018 */ swc1 $f4, 0x0018($sp) +/* 0189C 80B3DA7C 0C029468 */ jal SkelAnime_ChangeAnim + /* 018A0 80B3DA80 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 018A4 80B3DA84 8FA20028 */ lw $v0, 0x0028($sp) +/* 018A4 80B3DA84 8FA20028 */ lw $v0, 0x0028($sp) /* 018A8 80B3DA88 44803000 */ mtc1 $zero, $f6 ## $f6 = 0.00 /* 018AC 80B3DA8C 24190005 */ addiu $t9, $zero, 0x0005 ## $t9 = 00000005 /* 018B0 80B3DA90 AC590260 */ sw $t9, 0x0260($v0) ## 00000260 /* 018B4 80B3DA94 E4460268 */ swc1 $f6, 0x0268($v0) ## 00000268 -/* 018B8 80B3DA98 8FBF0024 */ lw $ra, 0x0024($sp) +/* 018B8 80B3DA98 8FBF0024 */ lw $ra, 0x0024($sp) .L80B3DA9C: /* 018BC 80B3DA9C 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 018C0 80B3DAA0 03E00008 */ jr $ra +/* 018C0 80B3DAA0 03E00008 */ jr $ra /* 018C4 80B3DAA4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3DAF0.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3DAF0.s index 25fd499047..485969e700 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3DAF0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3DAF0.s @@ -1,55 +1,55 @@ glabel func_80B3DAF0 /* 01910 80B3DAF0 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 01914 80B3DAF4 AFA40028 */ sw $a0, 0x0028($sp) -/* 01918 80B3DAF8 AFBF0024 */ sw $ra, 0x0024($sp) +/* 01914 80B3DAF4 AFA40028 */ sw $a0, 0x0028($sp) +/* 01918 80B3DAF8 AFBF0024 */ sw $ra, 0x0024($sp) /* 0191C 80B3DAFC 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 01920 80B3DB00 0C2CF134 */ jal func_80B3C4D0 +/* 01920 80B3DB00 0C2CF134 */ jal func_80B3C4D0 /* 01924 80B3DB04 24050004 */ addiu $a1, $zero, 0x0004 ## $a1 = 00000004 -/* 01928 80B3DB08 50400025 */ beql $v0, $zero, .L80B3DBA0 -/* 0192C 80B3DB0C 8FBF0024 */ lw $ra, 0x0024($sp) +/* 01928 80B3DB08 50400025 */ beql $v0, $zero, .L80B3DBA0 +/* 0192C 80B3DB0C 8FBF0024 */ lw $ra, 0x0024($sp) /* 01930 80B3DB10 94440000 */ lhu $a0, 0x0000($v0) ## 00000000 /* 01934 80B3DB14 24010003 */ addiu $at, $zero, 0x0003 ## $at = 00000003 -/* 01938 80B3DB18 10810008 */ beq $a0, $at, .L80B3DB3C +/* 01938 80B3DB18 10810008 */ beq $a0, $at, .L80B3DB3C /* 0193C 80B3DB1C 2401000B */ addiu $at, $zero, 0x000B ## $at = 0000000B -/* 01940 80B3DB20 10810006 */ beq $a0, $at, .L80B3DB3C +/* 01940 80B3DB20 10810006 */ beq $a0, $at, .L80B3DB3C /* 01944 80B3DB24 2401000C */ addiu $at, $zero, 0x000C ## $at = 0000000C -/* 01948 80B3DB28 10810004 */ beq $a0, $at, .L80B3DB3C +/* 01948 80B3DB28 10810004 */ beq $a0, $at, .L80B3DB3C /* 0194C 80B3DB2C 2401000D */ addiu $at, $zero, 0x000D ## $at = 0000000D -/* 01950 80B3DB30 10810002 */ beq $a0, $at, .L80B3DB3C +/* 01950 80B3DB30 10810002 */ beq $a0, $at, .L80B3DB3C /* 01954 80B3DB34 24010017 */ addiu $at, $zero, 0x0017 ## $at = 00000017 -/* 01958 80B3DB38 14810018 */ bne $a0, $at, .L80B3DB9C +/* 01958 80B3DB38 14810018 */ bne $a0, $at, .L80B3DB9C .L80B3DB3C: /* 0195C 80B3DB3C 3C040602 */ lui $a0, 0x0602 ## $a0 = 06020000 /* 01960 80B3DB40 0C028800 */ jal SkelAnime_GetFrameCount - + /* 01964 80B3DB44 2484B19C */ addiu $a0, $a0, 0xB19C ## $a0 = 0601B19C /* 01968 80B3DB48 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 0196C 80B3DB4C 3C01C080 */ lui $at, 0xC080 ## $at = C0800000 /* 01970 80B3DB50 44814000 */ mtc1 $at, $f8 ## $f8 = -4.00 -/* 01974 80B3DB54 468021A0 */ cvt.s.w $f6, $f4 -/* 01978 80B3DB58 8FA40028 */ lw $a0, 0x0028($sp) +/* 01974 80B3DB54 468021A0 */ cvt.s.w $f6, $f4 +/* 01978 80B3DB58 8FA40028 */ lw $a0, 0x0028($sp) /* 0197C 80B3DB5C 3C050602 */ lui $a1, 0x0602 ## $a1 = 06020000 /* 01980 80B3DB60 240E0002 */ addiu $t6, $zero, 0x0002 ## $t6 = 00000002 -/* 01984 80B3DB64 AFAE0014 */ sw $t6, 0x0014($sp) +/* 01984 80B3DB64 AFAE0014 */ sw $t6, 0x0014($sp) /* 01988 80B3DB68 24A5B19C */ addiu $a1, $a1, 0xB19C ## $a1 = 0601B19C -/* 0198C 80B3DB6C E7A60010 */ swc1 $f6, 0x0010($sp) +/* 0198C 80B3DB6C E7A60010 */ swc1 $f6, 0x0010($sp) /* 01990 80B3DB70 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 01994 80B3DB74 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 01998 80B3DB78 E7A80018 */ swc1 $f8, 0x0018($sp) -/* 0199C 80B3DB7C 0C029468 */ jal SkelAnime_ChangeAnimation - +/* 01998 80B3DB78 E7A80018 */ swc1 $f8, 0x0018($sp) +/* 0199C 80B3DB7C 0C029468 */ jal SkelAnime_ChangeAnim + /* 019A0 80B3DB80 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 019A4 80B3DB84 8FB80028 */ lw $t8, 0x0028($sp) +/* 019A4 80B3DB84 8FB80028 */ lw $t8, 0x0028($sp) /* 019A8 80B3DB88 240F0007 */ addiu $t7, $zero, 0x0007 ## $t7 = 00000007 /* 019AC 80B3DB8C 24190002 */ addiu $t9, $zero, 0x0002 ## $t9 = 00000002 /* 019B0 80B3DB90 AF0F0260 */ sw $t7, 0x0260($t8) ## 00000260 -/* 019B4 80B3DB94 8FA80028 */ lw $t0, 0x0028($sp) +/* 019B4 80B3DB94 8FA80028 */ lw $t0, 0x0028($sp) /* 019B8 80B3DB98 AD190264 */ sw $t9, 0x0264($t0) ## 00000264 .L80B3DB9C: -/* 019BC 80B3DB9C 8FBF0024 */ lw $ra, 0x0024($sp) +/* 019BC 80B3DB9C 8FBF0024 */ lw $ra, 0x0024($sp) .L80B3DBA0: /* 019C0 80B3DBA0 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 019C4 80B3DBA4 03E00008 */ jr $ra +/* 019C4 80B3DBA4 03E00008 */ jr $ra /* 019C8 80B3DBA8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3DBAC.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3DBAC.s index c4a32af928..ac6d10c1b9 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3DBAC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3DBAC.s @@ -1,36 +1,36 @@ glabel func_80B3DBAC /* 019CC 80B3DBAC 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 019D0 80B3DBB0 AFBF0024 */ sw $ra, 0x0024($sp) -/* 019D4 80B3DBB4 10A00017 */ beq $a1, $zero, .L80B3DC14 -/* 019D8 80B3DBB8 AFA40028 */ sw $a0, 0x0028($sp) +/* 019D0 80B3DBB0 AFBF0024 */ sw $ra, 0x0024($sp) +/* 019D4 80B3DBB4 10A00017 */ beq $a1, $zero, .L80B3DC14 +/* 019D8 80B3DBB8 AFA40028 */ sw $a0, 0x0028($sp) /* 019DC 80B3DBBC 3C040601 */ lui $a0, 0x0601 ## $a0 = 06010000 /* 019E0 80B3DBC0 0C028800 */ jal SkelAnime_GetFrameCount - + /* 019E4 80B3DBC4 24847C54 */ addiu $a0, $a0, 0x7C54 ## $a0 = 06017C54 /* 019E8 80B3DBC8 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 019EC 80B3DBCC 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 019F0 80B3DBD0 8FA40028 */ lw $a0, 0x0028($sp) -/* 019F4 80B3DBD4 468021A0 */ cvt.s.w $f6, $f4 +/* 019F0 80B3DBD0 8FA40028 */ lw $a0, 0x0028($sp) +/* 019F4 80B3DBD4 468021A0 */ cvt.s.w $f6, $f4 /* 019F8 80B3DBD8 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 /* 019FC 80B3DBDC 240E0002 */ addiu $t6, $zero, 0x0002 ## $t6 = 00000002 -/* 01A00 80B3DBE0 44070000 */ mfc1 $a3, $f0 -/* 01A04 80B3DBE4 AFAE0014 */ sw $t6, 0x0014($sp) +/* 01A00 80B3DBE0 44070000 */ mfc1 $a3, $f0 +/* 01A04 80B3DBE4 AFAE0014 */ sw $t6, 0x0014($sp) /* 01A08 80B3DBE8 24A57C54 */ addiu $a1, $a1, 0x7C54 ## $a1 = 06017C54 -/* 01A0C 80B3DBEC E7A60010 */ swc1 $f6, 0x0010($sp) +/* 01A0C 80B3DBEC E7A60010 */ swc1 $f6, 0x0010($sp) /* 01A10 80B3DBF0 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 01A14 80B3DBF4 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 01A18 80B3DBF8 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 01A1C 80B3DBFC E7A00018 */ swc1 $f0, 0x0018($sp) -/* 01A20 80B3DC00 8FA20028 */ lw $v0, 0x0028($sp) +/* 01A18 80B3DBF8 0C029468 */ jal SkelAnime_ChangeAnim + +/* 01A1C 80B3DBFC E7A00018 */ swc1 $f0, 0x0018($sp) +/* 01A20 80B3DC00 8FA20028 */ lw $v0, 0x0028($sp) /* 01A24 80B3DC04 240F0008 */ addiu $t7, $zero, 0x0008 ## $t7 = 00000008 /* 01A28 80B3DC08 24180003 */ addiu $t8, $zero, 0x0003 ## $t8 = 00000003 /* 01A2C 80B3DC0C AC4F0260 */ sw $t7, 0x0260($v0) ## 00000260 /* 01A30 80B3DC10 AC580264 */ sw $t8, 0x0264($v0) ## 00000264 .L80B3DC14: -/* 01A34 80B3DC14 8FBF0024 */ lw $ra, 0x0024($sp) +/* 01A34 80B3DC14 8FBF0024 */ lw $ra, 0x0024($sp) /* 01A38 80B3DC18 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 01A3C 80B3DC1C 03E00008 */ jr $ra +/* 01A3C 80B3DC1C 03E00008 */ jr $ra /* 01A40 80B3DC20 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3DC24.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3DC24.s index 0249d2888d..78e949e025 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3DC24.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3DC24.s @@ -1,39 +1,39 @@ glabel func_80B3DC24 /* 01A44 80B3DC24 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 01A48 80B3DC28 AFBF0024 */ sw $ra, 0x0024($sp) -/* 01A4C 80B3DC2C 10C0001A */ beq $a2, $zero, .L80B3DC98 -/* 01A50 80B3DC30 AFA40038 */ sw $a0, 0x0038($sp) +/* 01A48 80B3DC28 AFBF0024 */ sw $ra, 0x0024($sp) +/* 01A4C 80B3DC2C 10C0001A */ beq $a2, $zero, .L80B3DC98 +/* 01A50 80B3DC30 AFA40038 */ sw $a0, 0x0038($sp) /* 01A54 80B3DC34 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 01A58 80B3DC38 0C2CF536 */ jal func_80B3D4D8 +/* 01A58 80B3DC38 0C2CF536 */ jal func_80B3D4D8 /* 01A5C 80B3DC3C 24050004 */ addiu $a1, $zero, 0x0004 ## $a1 = 00000004 -/* 01A60 80B3DC40 AFA2002C */ sw $v0, 0x002C($sp) +/* 01A60 80B3DC40 AFA2002C */ sw $v0, 0x002C($sp) /* 01A64 80B3DC44 0C028800 */ jal SkelAnime_GetFrameCount - + /* 01A68 80B3DC48 00402025 */ or $a0, $v0, $zero ## $a0 = 00000000 /* 01A6C 80B3DC4C 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 01A70 80B3DC50 3C01C100 */ lui $at, 0xC100 ## $at = C1000000 /* 01A74 80B3DC54 44814000 */ mtc1 $at, $f8 ## $f8 = -8.00 -/* 01A78 80B3DC58 468021A0 */ cvt.s.w $f6, $f4 -/* 01A7C 80B3DC5C 8FA40038 */ lw $a0, 0x0038($sp) -/* 01A80 80B3DC60 8FA5002C */ lw $a1, 0x002C($sp) +/* 01A78 80B3DC58 468021A0 */ cvt.s.w $f6, $f4 +/* 01A7C 80B3DC5C 8FA40038 */ lw $a0, 0x0038($sp) +/* 01A80 80B3DC60 8FA5002C */ lw $a1, 0x002C($sp) /* 01A84 80B3DC64 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 01A88 80B3DC68 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 01A8C 80B3DC6C AFA00014 */ sw $zero, 0x0014($sp) -/* 01A90 80B3DC70 E7A60010 */ swc1 $f6, 0x0010($sp) -/* 01A94 80B3DC74 E7A80018 */ swc1 $f8, 0x0018($sp) -/* 01A98 80B3DC78 0C029468 */ jal SkelAnime_ChangeAnimation - +/* 01A8C 80B3DC6C AFA00014 */ sw $zero, 0x0014($sp) +/* 01A90 80B3DC70 E7A60010 */ swc1 $f6, 0x0010($sp) +/* 01A94 80B3DC74 E7A80018 */ swc1 $f8, 0x0018($sp) +/* 01A98 80B3DC78 0C029468 */ jal SkelAnime_ChangeAnim + /* 01A9C 80B3DC7C 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 01AA0 80B3DC80 8FAF0038 */ lw $t7, 0x0038($sp) +/* 01AA0 80B3DC80 8FAF0038 */ lw $t7, 0x0038($sp) /* 01AA4 80B3DC84 240E0009 */ addiu $t6, $zero, 0x0009 ## $t6 = 00000009 /* 01AA8 80B3DC88 24180003 */ addiu $t8, $zero, 0x0003 ## $t8 = 00000003 /* 01AAC 80B3DC8C ADEE0260 */ sw $t6, 0x0260($t7) ## 00000260 -/* 01AB0 80B3DC90 8FB90038 */ lw $t9, 0x0038($sp) +/* 01AB0 80B3DC90 8FB90038 */ lw $t9, 0x0038($sp) /* 01AB4 80B3DC94 AF380264 */ sw $t8, 0x0264($t9) ## 00000264 .L80B3DC98: -/* 01AB8 80B3DC98 8FBF0024 */ lw $ra, 0x0024($sp) +/* 01AB8 80B3DC98 8FBF0024 */ lw $ra, 0x0024($sp) /* 01ABC 80B3DC9C 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 -/* 01AC0 80B3DCA0 03E00008 */ jr $ra +/* 01AC0 80B3DCA0 03E00008 */ jr $ra /* 01AC4 80B3DCA4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3DCA8.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3DCA8.s index c09375dfd2..3fb59a2f9b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3DCA8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3DCA8.s @@ -1,43 +1,43 @@ glabel func_80B3DCA8 /* 01AC8 80B3DCA8 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 01ACC 80B3DCAC AFBF0024 */ sw $ra, 0x0024($sp) -/* 01AD0 80B3DCB0 AFA40028 */ sw $a0, 0x0028($sp) +/* 01ACC 80B3DCAC AFBF0024 */ sw $ra, 0x0024($sp) +/* 01AD0 80B3DCB0 AFA40028 */ sw $a0, 0x0028($sp) /* 01AD4 80B3DCB4 90AE1D6C */ lbu $t6, 0x1D6C($a1) ## 00001D6C -/* 01AD8 80B3DCB8 51C0001D */ beql $t6, $zero, .L80B3DD30 -/* 01ADC 80B3DCBC 8FBF0024 */ lw $ra, 0x0024($sp) +/* 01AD8 80B3DCB8 51C0001D */ beql $t6, $zero, .L80B3DD30 +/* 01ADC 80B3DCBC 8FBF0024 */ lw $ra, 0x0024($sp) /* 01AE0 80B3DCC0 8CA21D9C */ lw $v0, 0x1D9C($a1) ## 00001D9C -/* 01AE4 80B3DCC4 5040001A */ beql $v0, $zero, .L80B3DD30 -/* 01AE8 80B3DCC8 8FBF0024 */ lw $ra, 0x0024($sp) +/* 01AE4 80B3DCC4 5040001A */ beql $v0, $zero, .L80B3DD30 +/* 01AE8 80B3DCC8 8FBF0024 */ lw $ra, 0x0024($sp) /* 01AEC 80B3DCCC 944F0000 */ lhu $t7, 0x0000($v0) ## 00000000 /* 01AF0 80B3DCD0 24010008 */ addiu $at, $zero, 0x0008 ## $at = 00000008 /* 01AF4 80B3DCD4 3C040601 */ lui $a0, 0x0601 ## $a0 = 06010000 -/* 01AF8 80B3DCD8 55E10015 */ bnel $t7, $at, .L80B3DD30 -/* 01AFC 80B3DCDC 8FBF0024 */ lw $ra, 0x0024($sp) +/* 01AF8 80B3DCD8 55E10015 */ bnel $t7, $at, .L80B3DD30 +/* 01AFC 80B3DCDC 8FBF0024 */ lw $ra, 0x0024($sp) /* 01B00 80B3DCE0 0C028800 */ jal SkelAnime_GetFrameCount - + /* 01B04 80B3DCE4 24847C54 */ addiu $a0, $a0, 0x7C54 ## $a0 = 06017C54 /* 01B08 80B3DCE8 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 01B0C 80B3DCEC 3C01C100 */ lui $at, 0xC100 ## $at = C1000000 /* 01B10 80B3DCF0 44813000 */ mtc1 $at, $f6 ## $f6 = -8.00 -/* 01B14 80B3DCF4 46802020 */ cvt.s.w $f0, $f4 -/* 01B18 80B3DCF8 8FA40028 */ lw $a0, 0x0028($sp) +/* 01B14 80B3DCF4 46802020 */ cvt.s.w $f0, $f4 +/* 01B18 80B3DCF8 8FA40028 */ lw $a0, 0x0028($sp) /* 01B1C 80B3DCFC 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 /* 01B20 80B3DD00 24A57C54 */ addiu $a1, $a1, 0x7C54 ## $a1 = 06017C54 /* 01B24 80B3DD04 24060000 */ addiu $a2, $zero, 0x0000 ## $a2 = 00000000 -/* 01B28 80B3DD08 AFA00014 */ sw $zero, 0x0014($sp) -/* 01B2C 80B3DD0C 44070000 */ mfc1 $a3, $f0 -/* 01B30 80B3DD10 E7A00010 */ swc1 $f0, 0x0010($sp) -/* 01B34 80B3DD14 E7A60018 */ swc1 $f6, 0x0018($sp) -/* 01B38 80B3DD18 0C029468 */ jal SkelAnime_ChangeAnimation - +/* 01B28 80B3DD08 AFA00014 */ sw $zero, 0x0014($sp) +/* 01B2C 80B3DD0C 44070000 */ mfc1 $a3, $f0 +/* 01B30 80B3DD10 E7A00010 */ swc1 $f0, 0x0010($sp) +/* 01B34 80B3DD14 E7A60018 */ swc1 $f6, 0x0018($sp) +/* 01B38 80B3DD18 0C029468 */ jal SkelAnime_ChangeAnim + /* 01B3C 80B3DD1C 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 01B40 80B3DD20 8FB90028 */ lw $t9, 0x0028($sp) +/* 01B40 80B3DD20 8FB90028 */ lw $t9, 0x0028($sp) /* 01B44 80B3DD24 2418000A */ addiu $t8, $zero, 0x000A ## $t8 = 0000000A /* 01B48 80B3DD28 AF380260 */ sw $t8, 0x0260($t9) ## 00000260 -/* 01B4C 80B3DD2C 8FBF0024 */ lw $ra, 0x0024($sp) +/* 01B4C 80B3DD2C 8FBF0024 */ lw $ra, 0x0024($sp) .L80B3DD30: /* 01B50 80B3DD30 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 01B54 80B3DD34 03E00008 */ jr $ra +/* 01B54 80B3DD34 03E00008 */ jr $ra /* 01B58 80B3DD38 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3DD3C.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3DD3C.s index 9979ff228a..8ff09b8544 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3DD3C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3DD3C.s @@ -1,57 +1,57 @@ glabel func_80B3DD3C /* 01B5C 80B3DD3C 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 01B60 80B3DD40 AFBF002C */ sw $ra, 0x002C($sp) -/* 01B64 80B3DD44 AFB00028 */ sw $s0, 0x0028($sp) +/* 01B60 80B3DD40 AFBF002C */ sw $ra, 0x002C($sp) +/* 01B64 80B3DD44 AFB00028 */ sw $s0, 0x0028($sp) /* 01B68 80B3DD48 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 01B6C 80B3DD4C AFA50034 */ sw $a1, 0x0034($sp) +/* 01B6C 80B3DD4C AFA50034 */ sw $a1, 0x0034($sp) /* 01B70 80B3DD50 24060005 */ addiu $a2, $zero, 0x0005 ## $a2 = 00000005 -/* 01B74 80B3DD54 0C2CF13C */ jal func_80B3C4F0 +/* 01B74 80B3DD54 0C2CF13C */ jal func_80B3C4F0 /* 01B78 80B3DD58 24070004 */ addiu $a3, $zero, 0x0004 ## $a3 = 00000004 -/* 01B7C 80B3DD5C 1040001A */ beq $v0, $zero, .L80B3DDC8 +/* 01B7C 80B3DD5C 1040001A */ beq $v0, $zero, .L80B3DDC8 /* 01B80 80B3DD60 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 01B84 80B3DD64 C6000164 */ lwc1 $f0, 0x0164($s0) ## 00000164 /* 01B88 80B3DD68 C602015C */ lwc1 $f2, 0x015C($s0) ## 0000015C /* 01B8C 80B3DD6C 3C040601 */ lui $a0, 0x0601 ## $a0 = 06010000 -/* 01B90 80B3DD70 4600103E */ c.le.s $f2, $f0 +/* 01B90 80B3DD70 4600103E */ c.le.s $f2, $f0 /* 01B94 80B3DD74 00000000 */ nop -/* 01B98 80B3DD78 4502001D */ bc1fl .L80B3DDF0 -/* 01B9C 80B3DD7C 8FBF002C */ lw $ra, 0x002C($sp) +/* 01B98 80B3DD78 4502001D */ bc1fl .L80B3DDF0 +/* 01B9C 80B3DD7C 8FBF002C */ lw $ra, 0x002C($sp) /* 01BA0 80B3DD80 0C028800 */ jal SkelAnime_GetFrameCount - + /* 01BA4 80B3DD84 24847C54 */ addiu $a0, $a0, 0x7C54 ## $a0 = 06017C54 /* 01BA8 80B3DD88 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 01BAC 80B3DD8C 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 /* 01BB0 80B3DD90 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 -/* 01BB4 80B3DD94 46802120 */ cvt.s.w $f4, $f4 +/* 01BB4 80B3DD94 46802120 */ cvt.s.w $f4, $f4 /* 01BB8 80B3DD98 240E0002 */ addiu $t6, $zero, 0x0002 ## $t6 = 00000002 -/* 01BBC 80B3DD9C AFAE0014 */ sw $t6, 0x0014($sp) +/* 01BBC 80B3DD9C AFAE0014 */ sw $t6, 0x0014($sp) /* 01BC0 80B3DDA0 24A57C54 */ addiu $a1, $a1, 0x7C54 ## $a1 = 06017C54 /* 01BC4 80B3DDA4 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C /* 01BC8 80B3DDA8 3C06BF80 */ lui $a2, 0xBF80 ## $a2 = BF800000 -/* 01BCC 80B3DDAC 44072000 */ mfc1 $a3, $f4 -/* 01BD0 80B3DDB0 E7A00010 */ swc1 $f0, 0x0010($sp) -/* 01BD4 80B3DDB4 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 01BD8 80B3DDB8 E7A00018 */ swc1 $f0, 0x0018($sp) +/* 01BCC 80B3DDAC 44072000 */ mfc1 $a3, $f4 +/* 01BD0 80B3DDB0 E7A00010 */ swc1 $f0, 0x0010($sp) +/* 01BD4 80B3DDB4 0C029468 */ jal SkelAnime_ChangeAnim + +/* 01BD8 80B3DDB8 E7A00018 */ swc1 $f0, 0x0018($sp) /* 01BDC 80B3DDBC 240F000B */ addiu $t7, $zero, 0x000B ## $t7 = 0000000B -/* 01BE0 80B3DDC0 1000000A */ beq $zero, $zero, .L80B3DDEC +/* 01BE0 80B3DDC0 1000000A */ beq $zero, $zero, .L80B3DDEC /* 01BE4 80B3DDC4 AE0F0260 */ sw $t7, 0x0260($s0) ## 00000260 .L80B3DDC8: -/* 01BE8 80B3DDC8 8FA50034 */ lw $a1, 0x0034($sp) +/* 01BE8 80B3DDC8 8FA50034 */ lw $a1, 0x0034($sp) /* 01BEC 80B3DDCC 24060008 */ addiu $a2, $zero, 0x0008 ## $a2 = 00000008 -/* 01BF0 80B3DDD0 0C2CF14F */ jal func_80B3C53C +/* 01BF0 80B3DDD0 0C2CF14F */ jal func_80B3C53C /* 01BF4 80B3DDD4 24070004 */ addiu $a3, $zero, 0x0004 ## $a3 = 00000004 -/* 01BF8 80B3DDD8 10400004 */ beq $v0, $zero, .L80B3DDEC +/* 01BF8 80B3DDD8 10400004 */ beq $v0, $zero, .L80B3DDEC /* 01BFC 80B3DDDC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01C00 80B3DDE0 8FA50034 */ lw $a1, 0x0034($sp) -/* 01C04 80B3DDE4 0C2CF709 */ jal func_80B3DC24 +/* 01C00 80B3DDE0 8FA50034 */ lw $a1, 0x0034($sp) +/* 01C04 80B3DDE4 0C2CF709 */ jal func_80B3DC24 /* 01C08 80B3DDE8 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 .L80B3DDEC: -/* 01C0C 80B3DDEC 8FBF002C */ lw $ra, 0x002C($sp) +/* 01C0C 80B3DDEC 8FBF002C */ lw $ra, 0x002C($sp) .L80B3DDF0: -/* 01C10 80B3DDF0 8FB00028 */ lw $s0, 0x0028($sp) +/* 01C10 80B3DDF0 8FB00028 */ lw $s0, 0x0028($sp) /* 01C14 80B3DDF4 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 01C18 80B3DDF8 03E00008 */ jr $ra +/* 01C18 80B3DDF8 03E00008 */ jr $ra /* 01C1C 80B3DDFC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3DE00.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3DE00.s index 03d9cea610..c208aaece9 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3DE00.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3DE00.s @@ -1,36 +1,36 @@ glabel func_80B3DE00 /* 01C20 80B3DE00 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 01C24 80B3DE04 AFBF0024 */ sw $ra, 0x0024($sp) -/* 01C28 80B3DE08 10A00017 */ beq $a1, $zero, .L80B3DE68 -/* 01C2C 80B3DE0C AFA40028 */ sw $a0, 0x0028($sp) +/* 01C24 80B3DE04 AFBF0024 */ sw $ra, 0x0024($sp) +/* 01C28 80B3DE08 10A00017 */ beq $a1, $zero, .L80B3DE68 +/* 01C2C 80B3DE0C AFA40028 */ sw $a0, 0x0028($sp) /* 01C30 80B3DE10 3C040602 */ lui $a0, 0x0602 ## $a0 = 06020000 /* 01C34 80B3DE14 0C028800 */ jal SkelAnime_GetFrameCount - + /* 01C38 80B3DE18 2484B19C */ addiu $a0, $a0, 0xB19C ## $a0 = 0601B19C /* 01C3C 80B3DE1C 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 01C40 80B3DE20 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 01C44 80B3DE24 8FA40028 */ lw $a0, 0x0028($sp) -/* 01C48 80B3DE28 46802120 */ cvt.s.w $f4, $f4 +/* 01C44 80B3DE24 8FA40028 */ lw $a0, 0x0028($sp) +/* 01C48 80B3DE28 46802120 */ cvt.s.w $f4, $f4 /* 01C4C 80B3DE2C 3C050602 */ lui $a1, 0x0602 ## $a1 = 06020000 /* 01C50 80B3DE30 240E0002 */ addiu $t6, $zero, 0x0002 ## $t6 = 00000002 -/* 01C54 80B3DE34 AFAE0014 */ sw $t6, 0x0014($sp) +/* 01C54 80B3DE34 AFAE0014 */ sw $t6, 0x0014($sp) /* 01C58 80B3DE38 24A5B19C */ addiu $a1, $a1, 0xB19C ## $a1 = 0601B19C /* 01C5C 80B3DE3C 3C06BF80 */ lui $a2, 0xBF80 ## $a2 = BF800000 -/* 01C60 80B3DE40 44072000 */ mfc1 $a3, $f4 +/* 01C60 80B3DE40 44072000 */ mfc1 $a3, $f4 /* 01C64 80B3DE44 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 01C68 80B3DE48 E7A00010 */ swc1 $f0, 0x0010($sp) -/* 01C6C 80B3DE4C 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 01C70 80B3DE50 E7A00018 */ swc1 $f0, 0x0018($sp) -/* 01C74 80B3DE54 8FA20028 */ lw $v0, 0x0028($sp) +/* 01C68 80B3DE48 E7A00010 */ swc1 $f0, 0x0010($sp) +/* 01C6C 80B3DE4C 0C029468 */ jal SkelAnime_ChangeAnim + +/* 01C70 80B3DE50 E7A00018 */ swc1 $f0, 0x0018($sp) +/* 01C74 80B3DE54 8FA20028 */ lw $v0, 0x0028($sp) /* 01C78 80B3DE58 240F000C */ addiu $t7, $zero, 0x000C ## $t7 = 0000000C /* 01C7C 80B3DE5C 24180002 */ addiu $t8, $zero, 0x0002 ## $t8 = 00000002 /* 01C80 80B3DE60 AC4F0260 */ sw $t7, 0x0260($v0) ## 00000260 /* 01C84 80B3DE64 AC580264 */ sw $t8, 0x0264($v0) ## 00000264 .L80B3DE68: -/* 01C88 80B3DE68 8FBF0024 */ lw $ra, 0x0024($sp) +/* 01C88 80B3DE68 8FBF0024 */ lw $ra, 0x0024($sp) /* 01C8C 80B3DE6C 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 01C90 80B3DE70 03E00008 */ jr $ra +/* 01C90 80B3DE70 03E00008 */ jr $ra /* 01C94 80B3DE74 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3DE78.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3DE78.s index 52c1cda378..aa145d0e0c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3DE78.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3DE78.s @@ -1,27 +1,27 @@ glabel func_80B3DE78 /* 01C98 80B3DE78 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 01C9C 80B3DE7C AFBF0024 */ sw $ra, 0x0024($sp) -/* 01CA0 80B3DE80 10A00018 */ beq $a1, $zero, .L80B3DEE4 -/* 01CA4 80B3DE84 AFA40028 */ sw $a0, 0x0028($sp) +/* 01C9C 80B3DE7C AFBF0024 */ sw $ra, 0x0024($sp) +/* 01CA0 80B3DE80 10A00018 */ beq $a1, $zero, .L80B3DEE4 +/* 01CA4 80B3DE84 AFA40028 */ sw $a0, 0x0028($sp) /* 01CA8 80B3DE88 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 /* 01CAC 80B3DE8C 0C028800 */ jal SkelAnime_GetFrameCount - + /* 01CB0 80B3DE90 24844828 */ addiu $a0, $a0, 0x4828 ## $a0 = 06004828 /* 01CB4 80B3DE94 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 01CB8 80B3DE98 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 01CBC 80B3DE9C 8FA30028 */ lw $v1, 0x0028($sp) -/* 01CC0 80B3DEA0 468021A0 */ cvt.s.w $f6, $f4 +/* 01CBC 80B3DE9C 8FA30028 */ lw $v1, 0x0028($sp) +/* 01CC0 80B3DEA0 468021A0 */ cvt.s.w $f6, $f4 /* 01CC4 80B3DEA4 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 01CC8 80B3DEA8 44070000 */ mfc1 $a3, $f0 +/* 01CC8 80B3DEA8 44070000 */ mfc1 $a3, $f0 /* 01CCC 80B3DEAC 24A54828 */ addiu $a1, $a1, 0x4828 ## $a1 = 06004828 /* 01CD0 80B3DEB0 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 01CD4 80B3DEB4 AFA00014 */ sw $zero, 0x0014($sp) -/* 01CD8 80B3DEB8 E7A60010 */ swc1 $f6, 0x0010($sp) +/* 01CD4 80B3DEB4 AFA00014 */ sw $zero, 0x0014($sp) +/* 01CD8 80B3DEB8 E7A60010 */ swc1 $f6, 0x0010($sp) /* 01CDC 80B3DEBC 2464014C */ addiu $a0, $v1, 0x014C ## $a0 = 0000014C -/* 01CE0 80B3DEC0 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 01CE4 80B3DEC4 E7A00018 */ swc1 $f0, 0x0018($sp) -/* 01CE8 80B3DEC8 8FA30028 */ lw $v1, 0x0028($sp) +/* 01CE0 80B3DEC0 0C029468 */ jal SkelAnime_ChangeAnim + +/* 01CE4 80B3DEC4 E7A00018 */ swc1 $f0, 0x0018($sp) +/* 01CE8 80B3DEC8 8FA30028 */ lw $v1, 0x0028($sp) /* 01CEC 80B3DECC 44804000 */ mtc1 $zero, $f8 ## $f8 = 0.00 /* 01CF0 80B3DED0 240E000D */ addiu $t6, $zero, 0x000D ## $t6 = 0000000D /* 01CF4 80B3DED4 240F0001 */ addiu $t7, $zero, 0x0001 ## $t7 = 00000001 @@ -29,9 +29,9 @@ glabel func_80B3DE78 /* 01CFC 80B3DEDC AC6F0264 */ sw $t7, 0x0264($v1) ## 00000264 /* 01D00 80B3DEE0 E4680268 */ swc1 $f8, 0x0268($v1) ## 00000268 .L80B3DEE4: -/* 01D04 80B3DEE4 8FBF0024 */ lw $ra, 0x0024($sp) +/* 01D04 80B3DEE4 8FBF0024 */ lw $ra, 0x0024($sp) /* 01D08 80B3DEE8 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 01D0C 80B3DEEC 03E00008 */ jr $ra +/* 01D0C 80B3DEEC 03E00008 */ jr $ra /* 01D10 80B3DEF0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3DEF4.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3DEF4.s index a80530c8cb..f081abf042 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3DEF4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3DEF4.s @@ -1,50 +1,50 @@ glabel func_80B3DEF4 /* 01D14 80B3DEF4 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 01D18 80B3DEF8 AFBF002C */ sw $ra, 0x002C($sp) -/* 01D1C 80B3DEFC AFB00028 */ sw $s0, 0x0028($sp) +/* 01D18 80B3DEF8 AFBF002C */ sw $ra, 0x002C($sp) +/* 01D1C 80B3DEFC AFB00028 */ sw $s0, 0x0028($sp) /* 01D20 80B3DF00 90AE1D6C */ lbu $t6, 0x1D6C($a1) ## 00001D6C /* 01D24 80B3DF04 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 01D28 80B3DF08 51C00022 */ beql $t6, $zero, .L80B3DF94 -/* 01D2C 80B3DF0C 8FBF002C */ lw $ra, 0x002C($sp) +/* 01D28 80B3DF08 51C00022 */ beql $t6, $zero, .L80B3DF94 +/* 01D2C 80B3DF0C 8FBF002C */ lw $ra, 0x002C($sp) /* 01D30 80B3DF10 8CA21D9C */ lw $v0, 0x1D9C($a1) ## 00001D9C -/* 01D34 80B3DF14 5040001F */ beql $v0, $zero, .L80B3DF94 -/* 01D38 80B3DF18 8FBF002C */ lw $ra, 0x002C($sp) +/* 01D34 80B3DF14 5040001F */ beql $v0, $zero, .L80B3DF94 +/* 01D38 80B3DF18 8FBF002C */ lw $ra, 0x002C($sp) /* 01D3C 80B3DF1C 944F0000 */ lhu $t7, 0x0000($v0) ## 00000000 /* 01D40 80B3DF20 24010004 */ addiu $at, $zero, 0x0004 ## $at = 00000004 /* 01D44 80B3DF24 3C040601 */ lui $a0, 0x0601 ## $a0 = 06010000 -/* 01D48 80B3DF28 55E1001A */ bnel $t7, $at, .L80B3DF94 -/* 01D4C 80B3DF2C 8FBF002C */ lw $ra, 0x002C($sp) +/* 01D48 80B3DF28 55E1001A */ bnel $t7, $at, .L80B3DF94 +/* 01D4C 80B3DF2C 8FBF002C */ lw $ra, 0x002C($sp) /* 01D50 80B3DF30 0C028800 */ jal SkelAnime_GetFrameCount - + /* 01D54 80B3DF34 24842FD0 */ addiu $a0, $a0, 0x2FD0 ## $a0 = 06012FD0 /* 01D58 80B3DF38 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 01D5C 80B3DF3C 3C01C140 */ lui $at, 0xC140 ## $at = C1400000 /* 01D60 80B3DF40 44814000 */ mtc1 $at, $f8 ## $f8 = -12.00 -/* 01D64 80B3DF44 46802120 */ cvt.s.w $f4, $f4 +/* 01D64 80B3DF44 46802120 */ cvt.s.w $f4, $f4 /* 01D68 80B3DF48 44803000 */ mtc1 $zero, $f6 ## $f6 = 0.00 /* 01D6C 80B3DF4C 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 /* 01D70 80B3DF50 24A52FD0 */ addiu $a1, $a1, 0x2FD0 ## $a1 = 06012FD0 /* 01D74 80B3DF54 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C /* 01D78 80B3DF58 3C06BF80 */ lui $a2, 0xBF80 ## $a2 = BF800000 -/* 01D7C 80B3DF5C 44072000 */ mfc1 $a3, $f4 -/* 01D80 80B3DF60 AFA00014 */ sw $zero, 0x0014($sp) -/* 01D84 80B3DF64 E7A80018 */ swc1 $f8, 0x0018($sp) -/* 01D88 80B3DF68 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 01D8C 80B3DF6C E7A60010 */ swc1 $f6, 0x0010($sp) +/* 01D7C 80B3DF5C 44072000 */ mfc1 $a3, $f4 +/* 01D80 80B3DF60 AFA00014 */ sw $zero, 0x0014($sp) +/* 01D84 80B3DF64 E7A80018 */ swc1 $f8, 0x0018($sp) +/* 01D88 80B3DF68 0C029468 */ jal SkelAnime_ChangeAnim + +/* 01D8C 80B3DF6C E7A60010 */ swc1 $f6, 0x0010($sp) /* 01D90 80B3DF70 86190032 */ lh $t9, 0x0032($s0) ## 00000032 /* 01D94 80B3DF74 44805000 */ mtc1 $zero, $f10 ## $f10 = 0.00 /* 01D98 80B3DF78 34018000 */ ori $at, $zero, 0x8000 ## $at = 00008000 /* 01D9C 80B3DF7C 2418000E */ addiu $t8, $zero, 0x000E ## $t8 = 0000000E -/* 01DA0 80B3DF80 03214021 */ addu $t0, $t9, $at +/* 01DA0 80B3DF80 03214021 */ addu $t0, $t9, $at /* 01DA4 80B3DF84 AE180260 */ sw $t8, 0x0260($s0) ## 00000260 /* 01DA8 80B3DF88 A6080032 */ sh $t0, 0x0032($s0) ## 00000032 /* 01DAC 80B3DF8C E60A0268 */ swc1 $f10, 0x0268($s0) ## 00000268 -/* 01DB0 80B3DF90 8FBF002C */ lw $ra, 0x002C($sp) +/* 01DB0 80B3DF90 8FBF002C */ lw $ra, 0x002C($sp) .L80B3DF94: -/* 01DB4 80B3DF94 8FB00028 */ lw $s0, 0x0028($sp) +/* 01DB4 80B3DF94 8FB00028 */ lw $s0, 0x0028($sp) /* 01DB8 80B3DF98 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 01DBC 80B3DF9C 03E00008 */ jr $ra +/* 01DBC 80B3DF9C 03E00008 */ jr $ra /* 01DC0 80B3DFA0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3E014.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3E014.s index 8f0d338dcf..9b33682ff0 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3E014.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3E014.s @@ -2,47 +2,47 @@ glabel func_80B3E014 /* 01E34 80B3E014 3C0F8016 */ lui $t7, 0x8016 ## $t7 = 80160000 /* 01E38 80B3E018 8DEFFA90 */ lw $t7, -0x0570($t7) ## 8015FA90 /* 01E3C 80B3E01C 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 01E40 80B3E020 AFBF0024 */ sw $ra, 0x0024($sp) -/* 01E44 80B3E024 AFA40028 */ sw $a0, 0x0028($sp) +/* 01E40 80B3E020 AFBF0024 */ sw $ra, 0x0024($sp) +/* 01E44 80B3E024 AFA40028 */ sw $a0, 0x0028($sp) /* 01E48 80B3E028 85F8145E */ lh $t8, 0x145E($t7) ## 8016145E /* 01E4C 80B3E02C 3C01430C */ lui $at, 0x430C ## $at = 430C0000 /* 01E50 80B3E030 44814000 */ mtc1 $at, $f8 ## $f8 = 140.00 /* 01E54 80B3E034 44982000 */ mtc1 $t8, $f4 ## $f4 = 0.00 /* 01E58 80B3E038 C4800090 */ lwc1 $f0, 0x0090($a0) ## 00000090 /* 01E5C 80B3E03C 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 -/* 01E60 80B3E040 468021A0 */ cvt.s.w $f6, $f4 -/* 01E64 80B3E044 46083280 */ add.s $f10, $f6, $f8 -/* 01E68 80B3E048 4600503E */ c.le.s $f10, $f0 +/* 01E60 80B3E040 468021A0 */ cvt.s.w $f6, $f4 +/* 01E64 80B3E044 46083280 */ add.s $f10, $f6, $f8 +/* 01E68 80B3E048 4600503E */ c.le.s $f10, $f0 /* 01E6C 80B3E04C 00000000 */ nop -/* 01E70 80B3E050 45020017 */ bc1fl .L80B3E0B0 -/* 01E74 80B3E054 8FBF0024 */ lw $ra, 0x0024($sp) +/* 01E70 80B3E050 45020017 */ bc1fl .L80B3E0B0 +/* 01E74 80B3E054 8FBF0024 */ lw $ra, 0x0024($sp) /* 01E78 80B3E058 0C028800 */ jal SkelAnime_GetFrameCount - + /* 01E7C 80B3E05C 24844828 */ addiu $a0, $a0, 0x4828 ## $a0 = 06004828 /* 01E80 80B3E060 44828000 */ mtc1 $v0, $f16 ## $f16 = 0.00 /* 01E84 80B3E064 3C01C140 */ lui $at, 0xC140 ## $at = C1400000 /* 01E88 80B3E068 44812000 */ mtc1 $at, $f4 ## $f4 = -12.00 -/* 01E8C 80B3E06C 468084A0 */ cvt.s.w $f18, $f16 -/* 01E90 80B3E070 8FA40028 */ lw $a0, 0x0028($sp) +/* 01E8C 80B3E06C 468084A0 */ cvt.s.w $f18, $f16 +/* 01E90 80B3E070 8FA40028 */ lw $a0, 0x0028($sp) /* 01E94 80B3E074 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 01E98 80B3E078 24A54828 */ addiu $a1, $a1, 0x4828 ## $a1 = 06004828 /* 01E9C 80B3E07C 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 01EA0 80B3E080 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 01EA4 80B3E084 E7B20010 */ swc1 $f18, 0x0010($sp) -/* 01EA8 80B3E088 AFA00014 */ sw $zero, 0x0014($sp) -/* 01EAC 80B3E08C E7A40018 */ swc1 $f4, 0x0018($sp) -/* 01EB0 80B3E090 0C029468 */ jal SkelAnime_ChangeAnimation - +/* 01EA4 80B3E084 E7B20010 */ swc1 $f18, 0x0010($sp) +/* 01EA8 80B3E088 AFA00014 */ sw $zero, 0x0014($sp) +/* 01EAC 80B3E08C E7A40018 */ swc1 $f4, 0x0018($sp) +/* 01EB0 80B3E090 0C029468 */ jal SkelAnime_ChangeAnim + /* 01EB4 80B3E094 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 01EB8 80B3E098 8FA20028 */ lw $v0, 0x0028($sp) +/* 01EB8 80B3E098 8FA20028 */ lw $v0, 0x0028($sp) /* 01EBC 80B3E09C 44803000 */ mtc1 $zero, $f6 ## $f6 = 0.00 /* 01EC0 80B3E0A0 24190010 */ addiu $t9, $zero, 0x0010 ## $t9 = 00000010 /* 01EC4 80B3E0A4 AC590260 */ sw $t9, 0x0260($v0) ## 00000260 /* 01EC8 80B3E0A8 E4460268 */ swc1 $f6, 0x0268($v0) ## 00000268 -/* 01ECC 80B3E0AC 8FBF0024 */ lw $ra, 0x0024($sp) +/* 01ECC 80B3E0AC 8FBF0024 */ lw $ra, 0x0024($sp) .L80B3E0B0: /* 01ED0 80B3E0B0 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 01ED4 80B3E0B4 03E00008 */ jr $ra +/* 01ED4 80B3E0B4 03E00008 */ jr $ra /* 01ED8 80B3E0B8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3E0BC.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3E0BC.s index 1616ffd6bd..9507a0076a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3E0BC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3E0BC.s @@ -1,48 +1,48 @@ glabel func_80B3E0BC /* 01EDC 80B3E0BC 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 01EE0 80B3E0C0 AFBF002C */ sw $ra, 0x002C($sp) -/* 01EE4 80B3E0C4 AFB00028 */ sw $s0, 0x0028($sp) +/* 01EE0 80B3E0C0 AFBF002C */ sw $ra, 0x002C($sp) +/* 01EE4 80B3E0C4 AFB00028 */ sw $s0, 0x0028($sp) /* 01EE8 80B3E0C8 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 /* 01EEC 80B3E0CC 44813000 */ mtc1 $at, $f6 ## $f6 = 1.00 /* 01EF0 80B3E0D0 C4840268 */ lwc1 $f4, 0x0268($a0) ## 00000268 /* 01EF4 80B3E0D4 3C014140 */ lui $at, 0x4140 ## $at = 41400000 /* 01EF8 80B3E0D8 44818000 */ mtc1 $at, $f16 ## $f16 = 12.00 -/* 01EFC 80B3E0DC 46062200 */ add.s $f8, $f4, $f6 +/* 01EFC 80B3E0DC 46062200 */ add.s $f8, $f4, $f6 /* 01F00 80B3E0E0 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 01F04 80B3E0E4 E4880268 */ swc1 $f8, 0x0268($a0) ## 00000268 /* 01F08 80B3E0E8 C48A0268 */ lwc1 $f10, 0x0268($a0) ## 00000268 /* 01F0C 80B3E0EC 3C040602 */ lui $a0, 0x0602 ## $a0 = 06020000 -/* 01F10 80B3E0F0 460A803E */ c.le.s $f16, $f10 +/* 01F10 80B3E0F0 460A803E */ c.le.s $f16, $f10 /* 01F14 80B3E0F4 00000000 */ nop -/* 01F18 80B3E0F8 45020016 */ bc1fl .L80B3E154 -/* 01F1C 80B3E0FC 8FBF002C */ lw $ra, 0x002C($sp) +/* 01F18 80B3E0F8 45020016 */ bc1fl .L80B3E154 +/* 01F1C 80B3E0FC 8FBF002C */ lw $ra, 0x002C($sp) /* 01F20 80B3E100 0C028800 */ jal SkelAnime_GetFrameCount - + /* 01F24 80B3E104 24849598 */ addiu $a0, $a0, 0x9598 ## $a0 = 06019598 /* 01F28 80B3E108 44829000 */ mtc1 $v0, $f18 ## $f18 = 0.00 /* 01F2C 80B3E10C 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 /* 01F30 80B3E110 3C050602 */ lui $a1, 0x0602 ## $a1 = 06020000 -/* 01F34 80B3E114 46809120 */ cvt.s.w $f4, $f18 +/* 01F34 80B3E114 46809120 */ cvt.s.w $f4, $f18 /* 01F38 80B3E118 240E0002 */ addiu $t6, $zero, 0x0002 ## $t6 = 00000002 -/* 01F3C 80B3E11C 44070000 */ mfc1 $a3, $f0 -/* 01F40 80B3E120 AFAE0014 */ sw $t6, 0x0014($sp) +/* 01F3C 80B3E11C 44070000 */ mfc1 $a3, $f0 +/* 01F40 80B3E120 AFAE0014 */ sw $t6, 0x0014($sp) /* 01F44 80B3E124 24A59598 */ addiu $a1, $a1, 0x9598 ## $a1 = 06019598 /* 01F48 80B3E128 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C -/* 01F4C 80B3E12C E7A40010 */ swc1 $f4, 0x0010($sp) +/* 01F4C 80B3E12C E7A40010 */ swc1 $f4, 0x0010($sp) /* 01F50 80B3E130 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 01F54 80B3E134 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 01F58 80B3E138 E7A00018 */ swc1 $f0, 0x0018($sp) +/* 01F54 80B3E134 0C029468 */ jal SkelAnime_ChangeAnim + +/* 01F58 80B3E138 E7A00018 */ swc1 $f0, 0x0018($sp) /* 01F5C 80B3E13C 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 /* 01F60 80B3E140 240F0011 */ addiu $t7, $zero, 0x0011 ## $t7 = 00000011 /* 01F64 80B3E144 AE0F0260 */ sw $t7, 0x0260($s0) ## 00000260 /* 01F68 80B3E148 E6000268 */ swc1 $f0, 0x0268($s0) ## 00000268 /* 01F6C 80B3E14C E6000068 */ swc1 $f0, 0x0068($s0) ## 00000068 -/* 01F70 80B3E150 8FBF002C */ lw $ra, 0x002C($sp) +/* 01F70 80B3E150 8FBF002C */ lw $ra, 0x002C($sp) .L80B3E154: -/* 01F74 80B3E154 8FB00028 */ lw $s0, 0x0028($sp) +/* 01F74 80B3E154 8FB00028 */ lw $s0, 0x0028($sp) /* 01F78 80B3E158 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 01F7C 80B3E15C 03E00008 */ jr $ra +/* 01F7C 80B3E15C 03E00008 */ jr $ra /* 01F80 80B3E160 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3E908.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3E908.s index cec35d275a..7b0e388333 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3E908.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3E908.s @@ -1,42 +1,42 @@ glabel func_80B3E908 /* 02728 80B3E908 27BDFF80 */ addiu $sp, $sp, 0xFF80 ## $sp = FFFFFF80 -/* 0272C 80B3E90C AFBF002C */ sw $ra, 0x002C($sp) -/* 02730 80B3E910 AFB00028 */ sw $s0, 0x0028($sp) -/* 02734 80B3E914 AFA40080 */ sw $a0, 0x0080($sp) -/* 02738 80B3E918 AFA50084 */ sw $a1, 0x0084($sp) +/* 0272C 80B3E90C AFBF002C */ sw $ra, 0x002C($sp) +/* 02730 80B3E910 AFB00028 */ sw $s0, 0x0028($sp) +/* 02734 80B3E914 AFA40080 */ sw $a0, 0x0080($sp) +/* 02738 80B3E918 AFA50084 */ sw $a1, 0x0084($sp) /* 0273C 80B3E91C 8482025C */ lh $v0, 0x025C($a0) ## 0000025C /* 02740 80B3E920 3C0880B4 */ lui $t0, %hi(D_80B41D6C) ## $t0 = 80B40000 /* 02744 80B3E924 8CB00000 */ lw $s0, 0x0000($a1) ## 00000000 -/* 02748 80B3E928 00027880 */ sll $t7, $v0, 2 -/* 0274C 80B3E92C 010F4021 */ addu $t0, $t0, $t7 -/* 02750 80B3E930 8D081D6C */ lw $t0, %lo(D_80B41D6C)($t0) +/* 02748 80B3E928 00027880 */ sll $t7, $v0, 2 +/* 0274C 80B3E92C 010F4021 */ addu $t0, $t0, $t7 +/* 02750 80B3E930 8D081D6C */ lw $t0, %lo(D_80B41D6C)($t0) /* 02754 80B3E934 3C0680B4 */ lui $a2, %hi(D_80B42010) ## $a2 = 80B40000 /* 02758 80B3E938 24C62010 */ addiu $a2, $a2, %lo(D_80B42010) ## $a2 = 80B42010 /* 0275C 80B3E93C 27A40050 */ addiu $a0, $sp, 0x0050 ## $a0 = FFFFFFD0 /* 02760 80B3E940 240705A4 */ addiu $a3, $zero, 0x05A4 ## $a3 = 000005A4 /* 02764 80B3E944 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 02768 80B3E948 0C031AB1 */ jal func_800C6AC4 -/* 0276C 80B3E94C AFA80070 */ sw $t0, 0x0070($sp) -/* 02770 80B3E950 8FA80070 */ lw $t0, 0x0070($sp) +/* 02768 80B3E948 0C031AB1 */ jal Graph_OpenDisps +/* 0276C 80B3E94C AFA80070 */ sw $t0, 0x0070($sp) +/* 02770 80B3E950 8FA80070 */ lw $t0, 0x0070($sp) /* 02774 80B3E954 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 /* 02778 80B3E958 3C09DB06 */ lui $t1, 0xDB06 ## $t1 = DB060000 -/* 0277C 80B3E95C 00085100 */ sll $t2, $t0, 4 -/* 02780 80B3E960 000A5F02 */ srl $t3, $t2, 28 +/* 0277C 80B3E95C 00085100 */ sll $t2, $t0, 4 +/* 02780 80B3E960 000A5F02 */ srl $t3, $t2, 28 /* 02784 80B3E964 3C0D8016 */ lui $t5, 0x8016 ## $t5 = 80160000 /* 02788 80B3E968 24590008 */ addiu $t9, $v0, 0x0008 ## $t9 = 00000008 /* 0278C 80B3E96C AE1902C0 */ sw $t9, 0x02C0($s0) ## 000002C0 /* 02790 80B3E970 25AD6FA8 */ addiu $t5, $t5, 0x6FA8 ## $t5 = 80166FA8 -/* 02794 80B3E974 000B6080 */ sll $t4, $t3, 2 +/* 02794 80B3E974 000B6080 */ sll $t4, $t3, 2 /* 02798 80B3E978 35290020 */ ori $t1, $t1, 0x0020 ## $t1 = DB060020 -/* 0279C 80B3E97C 018D2021 */ addu $a0, $t4, $t5 +/* 0279C 80B3E97C 018D2021 */ addu $a0, $t4, $t5 /* 027A0 80B3E980 AC490000 */ sw $t1, 0x0000($v0) ## 00000000 /* 027A4 80B3E984 8C8E0000 */ lw $t6, 0x0000($a0) ## 00000000 /* 027A8 80B3E988 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 /* 027AC 80B3E98C 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF -/* 027B0 80B3E990 01012824 */ and $a1, $t0, $at +/* 027B0 80B3E990 01012824 */ and $a1, $t0, $at /* 027B4 80B3E994 3C068000 */ lui $a2, 0x8000 ## $a2 = 80000000 -/* 027B8 80B3E998 01C57821 */ addu $t7, $t6, $a1 -/* 027BC 80B3E99C 01E6C021 */ addu $t8, $t7, $a2 +/* 027B8 80B3E998 01C57821 */ addu $t7, $t6, $a1 +/* 027BC 80B3E99C 01E6C021 */ addu $t8, $t7, $a2 /* 027C0 80B3E9A0 AC580004 */ sw $t8, 0x0004($v0) ## 00000004 /* 027C4 80B3E9A4 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 /* 027C8 80B3E9A8 3C09DB06 */ lui $t1, 0xDB06 ## $t1 = DB060000 @@ -47,8 +47,8 @@ glabel func_80B3E908 /* 027DC 80B3E9BC 8C8A0000 */ lw $t2, 0x0000($a0) ## 00000000 /* 027E0 80B3E9C0 3C0FFFFF */ lui $t7, 0xFFFF ## $t7 = FFFF0000 /* 027E4 80B3E9C4 35EF1400 */ ori $t7, $t7, 0x1400 ## $t7 = FFFF1400 -/* 027E8 80B3E9C8 01455821 */ addu $t3, $t2, $a1 -/* 027EC 80B3E9CC 01666021 */ addu $t4, $t3, $a2 +/* 027E8 80B3E9C8 01455821 */ addu $t3, $t2, $a1 +/* 027EC 80B3E9CC 01666021 */ addu $t4, $t3, $a2 /* 027F0 80B3E9D0 AC4C0004 */ sw $t4, 0x0004($v0) ## 00000004 /* 027F4 80B3E9D4 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 /* 027F8 80B3E9D8 3C0EFA00 */ lui $t6, 0xFA00 ## $t6 = FA000000 @@ -63,34 +63,34 @@ glabel func_80B3E908 /* 0281C 80B3E9FC 24580008 */ addiu $t8, $v0, 0x0008 ## $t8 = 00000008 /* 02820 80B3EA00 AE1802C0 */ sw $t8, 0x02C0($s0) ## 000002C0 /* 02824 80B3EA04 AC490004 */ sw $t1, 0x0004($v0) ## 00000004 -/* 02828 80B3EA08 0C024F46 */ jal func_80093D18 +/* 02828 80B3EA08 0C024F46 */ jal func_80093D18 /* 0282C 80B3EA0C AC590000 */ sw $t9, 0x0000($v0) ## 00000000 -/* 02830 80B3EA10 8FA40080 */ lw $a0, 0x0080($sp) -/* 02834 80B3EA14 8FA50084 */ lw $a1, 0x0084($sp) -/* 02838 80B3EA18 0C00BAF3 */ jal func_8002EBCC +/* 02830 80B3EA10 8FA40080 */ lw $a0, 0x0080($sp) +/* 02834 80B3EA14 8FA50084 */ lw $a1, 0x0084($sp) +/* 02838 80B3EA18 0C00BAF3 */ jal func_8002EBCC /* 0283C 80B3EA1C 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 02840 80B3EA20 8FAA0080 */ lw $t2, 0x0080($sp) +/* 02840 80B3EA20 8FAA0080 */ lw $t2, 0x0080($sp) /* 02844 80B3EA24 3C0B80B4 */ lui $t3, %hi(func_80B3E8AC) ## $t3 = 80B40000 /* 02848 80B3EA28 256BE8AC */ addiu $t3, $t3, %lo(func_80B3E8AC) ## $t3 = 80B3E8AC /* 0284C 80B3EA2C 2542014C */ addiu $v0, $t2, 0x014C ## $v0 = 0000014C /* 02850 80B3EA30 8C450004 */ lw $a1, 0x0004($v0) ## 00000150 /* 02854 80B3EA34 8C460020 */ lw $a2, 0x0020($v0) ## 0000016C /* 02858 80B3EA38 90470002 */ lbu $a3, 0x0002($v0) ## 0000014E -/* 0285C 80B3EA3C AFA00014 */ sw $zero, 0x0014($sp) -/* 02860 80B3EA40 AFAB0010 */ sw $t3, 0x0010($sp) -/* 02864 80B3EA44 8FA40084 */ lw $a0, 0x0084($sp) -/* 02868 80B3EA48 0C0286B2 */ jal func_800A1AC8 -/* 0286C 80B3EA4C AFAA0018 */ sw $t2, 0x0018($sp) +/* 0285C 80B3EA3C AFA00014 */ sw $zero, 0x0014($sp) +/* 02860 80B3EA40 AFAB0010 */ sw $t3, 0x0010($sp) +/* 02864 80B3EA44 8FA40084 */ lw $a0, 0x0084($sp) +/* 02868 80B3EA48 0C0286B2 */ jal SkelAnime_DrawSV +/* 0286C 80B3EA4C AFAA0018 */ sw $t2, 0x0018($sp) /* 02870 80B3EA50 3C0680B4 */ lui $a2, %hi(D_80B42028) ## $a2 = 80B40000 /* 02874 80B3EA54 24C62028 */ addiu $a2, $a2, %lo(D_80B42028) ## $a2 = 80B42028 /* 02878 80B3EA58 27A40050 */ addiu $a0, $sp, 0x0050 ## $a0 = FFFFFFD0 /* 0287C 80B3EA5C 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 02880 80B3EA60 0C031AD5 */ jal func_800C6B54 +/* 02880 80B3EA60 0C031AD5 */ jal Graph_CloseDisps /* 02884 80B3EA64 240705D9 */ addiu $a3, $zero, 0x05D9 ## $a3 = 000005D9 -/* 02888 80B3EA68 8FBF002C */ lw $ra, 0x002C($sp) -/* 0288C 80B3EA6C 8FB00028 */ lw $s0, 0x0028($sp) +/* 02888 80B3EA68 8FBF002C */ lw $ra, 0x002C($sp) +/* 0288C 80B3EA6C 8FB00028 */ lw $s0, 0x0028($sp) /* 02890 80B3EA70 27BD0080 */ addiu $sp, $sp, 0x0080 ## $sp = 00000000 -/* 02894 80B3EA74 03E00008 */ jr $ra +/* 02894 80B3EA74 03E00008 */ jr $ra /* 02898 80B3EA78 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3EA7C.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3EA7C.s index fac7c54296..02f46c5c6f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3EA7C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3EA7C.s @@ -1,42 +1,42 @@ glabel func_80B3EA7C /* 0289C 80B3EA7C 27BDFF80 */ addiu $sp, $sp, 0xFF80 ## $sp = FFFFFF80 -/* 028A0 80B3EA80 AFBF002C */ sw $ra, 0x002C($sp) -/* 028A4 80B3EA84 AFB00028 */ sw $s0, 0x0028($sp) -/* 028A8 80B3EA88 AFA40080 */ sw $a0, 0x0080($sp) -/* 028AC 80B3EA8C AFA50084 */ sw $a1, 0x0084($sp) +/* 028A0 80B3EA80 AFBF002C */ sw $ra, 0x002C($sp) +/* 028A4 80B3EA84 AFB00028 */ sw $s0, 0x0028($sp) +/* 028A8 80B3EA88 AFA40080 */ sw $a0, 0x0080($sp) +/* 028AC 80B3EA8C AFA50084 */ sw $a1, 0x0084($sp) /* 028B0 80B3EA90 8482025C */ lh $v0, 0x025C($a0) ## 0000025C /* 028B4 80B3EA94 3C0880B4 */ lui $t0, %hi(D_80B41D6C) ## $t0 = 80B40000 /* 028B8 80B3EA98 8CB00000 */ lw $s0, 0x0000($a1) ## 00000000 -/* 028BC 80B3EA9C 00027880 */ sll $t7, $v0, 2 -/* 028C0 80B3EAA0 010F4021 */ addu $t0, $t0, $t7 -/* 028C4 80B3EAA4 8D081D6C */ lw $t0, %lo(D_80B41D6C)($t0) +/* 028BC 80B3EA9C 00027880 */ sll $t7, $v0, 2 +/* 028C0 80B3EAA0 010F4021 */ addu $t0, $t0, $t7 +/* 028C4 80B3EAA4 8D081D6C */ lw $t0, %lo(D_80B41D6C)($t0) /* 028C8 80B3EAA8 3C0680B4 */ lui $a2, %hi(D_80B42040) ## $a2 = 80B40000 /* 028CC 80B3EAAC 24C62040 */ addiu $a2, $a2, %lo(D_80B42040) ## $a2 = 80B42040 /* 028D0 80B3EAB0 27A40050 */ addiu $a0, $sp, 0x0050 ## $a0 = FFFFFFD0 /* 028D4 80B3EAB4 240705E7 */ addiu $a3, $zero, 0x05E7 ## $a3 = 000005E7 /* 028D8 80B3EAB8 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 028DC 80B3EABC 0C031AB1 */ jal func_800C6AC4 -/* 028E0 80B3EAC0 AFA80070 */ sw $t0, 0x0070($sp) -/* 028E4 80B3EAC4 8FA80070 */ lw $t0, 0x0070($sp) +/* 028DC 80B3EABC 0C031AB1 */ jal Graph_OpenDisps +/* 028E0 80B3EAC0 AFA80070 */ sw $t0, 0x0070($sp) +/* 028E4 80B3EAC4 8FA80070 */ lw $t0, 0x0070($sp) /* 028E8 80B3EAC8 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 /* 028EC 80B3EACC 3C09DB06 */ lui $t1, 0xDB06 ## $t1 = DB060000 -/* 028F0 80B3EAD0 00085100 */ sll $t2, $t0, 4 -/* 028F4 80B3EAD4 000A5F02 */ srl $t3, $t2, 28 +/* 028F0 80B3EAD0 00085100 */ sll $t2, $t0, 4 +/* 028F4 80B3EAD4 000A5F02 */ srl $t3, $t2, 28 /* 028F8 80B3EAD8 3C0D8016 */ lui $t5, 0x8016 ## $t5 = 80160000 /* 028FC 80B3EADC 24590008 */ addiu $t9, $v0, 0x0008 ## $t9 = 00000008 /* 02900 80B3EAE0 AE1902C0 */ sw $t9, 0x02C0($s0) ## 000002C0 /* 02904 80B3EAE4 25AD6FA8 */ addiu $t5, $t5, 0x6FA8 ## $t5 = 80166FA8 -/* 02908 80B3EAE8 000B6080 */ sll $t4, $t3, 2 +/* 02908 80B3EAE8 000B6080 */ sll $t4, $t3, 2 /* 0290C 80B3EAEC 35290020 */ ori $t1, $t1, 0x0020 ## $t1 = DB060020 -/* 02910 80B3EAF0 018D2021 */ addu $a0, $t4, $t5 +/* 02910 80B3EAF0 018D2021 */ addu $a0, $t4, $t5 /* 02914 80B3EAF4 AC490000 */ sw $t1, 0x0000($v0) ## 00000000 /* 02918 80B3EAF8 8C8E0000 */ lw $t6, 0x0000($a0) ## 00000000 /* 0291C 80B3EAFC 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 /* 02920 80B3EB00 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF -/* 02924 80B3EB04 01012824 */ and $a1, $t0, $at +/* 02924 80B3EB04 01012824 */ and $a1, $t0, $at /* 02928 80B3EB08 3C068000 */ lui $a2, 0x8000 ## $a2 = 80000000 -/* 0292C 80B3EB0C 01C57821 */ addu $t7, $t6, $a1 -/* 02930 80B3EB10 01E6C021 */ addu $t8, $t7, $a2 +/* 0292C 80B3EB0C 01C57821 */ addu $t7, $t6, $a1 +/* 02930 80B3EB10 01E6C021 */ addu $t8, $t7, $a2 /* 02934 80B3EB14 AC580004 */ sw $t8, 0x0004($v0) ## 00000004 /* 02938 80B3EB18 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 /* 0293C 80B3EB1C 3C09DB06 */ lui $t1, 0xDB06 ## $t1 = DB060000 @@ -47,8 +47,8 @@ glabel func_80B3EA7C /* 02950 80B3EB30 8C8A0000 */ lw $t2, 0x0000($a0) ## 00000000 /* 02954 80B3EB34 3C0FFFFF */ lui $t7, 0xFFFF ## $t7 = FFFF0000 /* 02958 80B3EB38 35EF1400 */ ori $t7, $t7, 0x1400 ## $t7 = FFFF1400 -/* 0295C 80B3EB3C 01455821 */ addu $t3, $t2, $a1 -/* 02960 80B3EB40 01666021 */ addu $t4, $t3, $a2 +/* 0295C 80B3EB3C 01455821 */ addu $t3, $t2, $a1 +/* 02960 80B3EB40 01666021 */ addu $t4, $t3, $a2 /* 02964 80B3EB44 AC4C0004 */ sw $t4, 0x0004($v0) ## 00000004 /* 02968 80B3EB48 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 /* 0296C 80B3EB4C 3C0EFA00 */ lui $t6, 0xFA00 ## $t6 = FA000000 @@ -63,34 +63,34 @@ glabel func_80B3EA7C /* 02990 80B3EB70 24580008 */ addiu $t8, $v0, 0x0008 ## $t8 = 00000008 /* 02994 80B3EB74 AE1802C0 */ sw $t8, 0x02C0($s0) ## 000002C0 /* 02998 80B3EB78 AC490004 */ sw $t1, 0x0004($v0) ## 00000004 -/* 0299C 80B3EB7C 0C024F46 */ jal func_80093D18 +/* 0299C 80B3EB7C 0C024F46 */ jal func_80093D18 /* 029A0 80B3EB80 AC590000 */ sw $t9, 0x0000($v0) ## 00000000 -/* 029A4 80B3EB84 8FA40080 */ lw $a0, 0x0080($sp) -/* 029A8 80B3EB88 8FA50084 */ lw $a1, 0x0084($sp) -/* 029AC 80B3EB8C 0C00BAF3 */ jal func_8002EBCC +/* 029A4 80B3EB84 8FA40080 */ lw $a0, 0x0080($sp) +/* 029A8 80B3EB88 8FA50084 */ lw $a1, 0x0084($sp) +/* 029AC 80B3EB8C 0C00BAF3 */ jal func_8002EBCC /* 029B0 80B3EB90 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 029B4 80B3EB94 8FAA0080 */ lw $t2, 0x0080($sp) +/* 029B4 80B3EB94 8FAA0080 */ lw $t2, 0x0080($sp) /* 029B8 80B3EB98 3C0B80B4 */ lui $t3, %hi(func_80B3E8E4) ## $t3 = 80B40000 /* 029BC 80B3EB9C 256BE8E4 */ addiu $t3, $t3, %lo(func_80B3E8E4) ## $t3 = 80B3E8E4 /* 029C0 80B3EBA0 2542014C */ addiu $v0, $t2, 0x014C ## $v0 = 0000014C /* 029C4 80B3EBA4 8C450004 */ lw $a1, 0x0004($v0) ## 00000150 /* 029C8 80B3EBA8 8C460020 */ lw $a2, 0x0020($v0) ## 0000016C /* 029CC 80B3EBAC 90470002 */ lbu $a3, 0x0002($v0) ## 0000014E -/* 029D0 80B3EBB0 AFA00014 */ sw $zero, 0x0014($sp) -/* 029D4 80B3EBB4 AFAB0010 */ sw $t3, 0x0010($sp) -/* 029D8 80B3EBB8 8FA40084 */ lw $a0, 0x0084($sp) -/* 029DC 80B3EBBC 0C0286B2 */ jal func_800A1AC8 -/* 029E0 80B3EBC0 AFAA0018 */ sw $t2, 0x0018($sp) +/* 029D0 80B3EBB0 AFA00014 */ sw $zero, 0x0014($sp) +/* 029D4 80B3EBB4 AFAB0010 */ sw $t3, 0x0010($sp) +/* 029D8 80B3EBB8 8FA40084 */ lw $a0, 0x0084($sp) +/* 029DC 80B3EBBC 0C0286B2 */ jal SkelAnime_DrawSV +/* 029E0 80B3EBC0 AFAA0018 */ sw $t2, 0x0018($sp) /* 029E4 80B3EBC4 3C0680B4 */ lui $a2, %hi(D_80B42058) ## $a2 = 80B40000 /* 029E8 80B3EBC8 24C62058 */ addiu $a2, $a2, %lo(D_80B42058) ## $a2 = 80B42058 /* 029EC 80B3EBCC 27A40050 */ addiu $a0, $sp, 0x0050 ## $a0 = FFFFFFD0 /* 029F0 80B3EBD0 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 029F4 80B3EBD4 0C031AD5 */ jal func_800C6B54 +/* 029F4 80B3EBD4 0C031AD5 */ jal Graph_CloseDisps /* 029F8 80B3EBD8 2407061C */ addiu $a3, $zero, 0x061C ## $a3 = 0000061C -/* 029FC 80B3EBDC 8FBF002C */ lw $ra, 0x002C($sp) -/* 02A00 80B3EBE0 8FB00028 */ lw $s0, 0x0028($sp) +/* 029FC 80B3EBDC 8FBF002C */ lw $ra, 0x002C($sp) +/* 02A00 80B3EBE0 8FB00028 */ lw $s0, 0x0028($sp) /* 02A04 80B3EBE4 27BD0080 */ addiu $sp, $sp, 0x0080 ## $sp = 00000000 -/* 02A08 80B3EBE8 03E00008 */ jr $ra +/* 02A08 80B3EBE8 03E00008 */ jr $ra /* 02A0C 80B3EBEC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3F010.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3F010.s index 5275be5c60..61469c46d0 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3F010.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3F010.s @@ -2,47 +2,47 @@ glabel func_80B3F010 /* 02E30 80B3F010 3C0F8016 */ lui $t7, 0x8016 ## $t7 = 80160000 /* 02E34 80B3F014 8DEFFA90 */ lw $t7, -0x0570($t7) ## 8015FA90 /* 02E38 80B3F018 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 02E3C 80B3F01C AFBF0024 */ sw $ra, 0x0024($sp) -/* 02E40 80B3F020 AFA40028 */ sw $a0, 0x0028($sp) +/* 02E3C 80B3F01C AFBF0024 */ sw $ra, 0x0024($sp) +/* 02E40 80B3F020 AFA40028 */ sw $a0, 0x0028($sp) /* 02E44 80B3F024 85F8145E */ lh $t8, 0x145E($t7) ## 8016145E /* 02E48 80B3F028 3C01430C */ lui $at, 0x430C ## $at = 430C0000 /* 02E4C 80B3F02C 44814000 */ mtc1 $at, $f8 ## $f8 = 140.00 /* 02E50 80B3F030 44982000 */ mtc1 $t8, $f4 ## $f4 = 0.00 /* 02E54 80B3F034 C4800090 */ lwc1 $f0, 0x0090($a0) ## 00000090 /* 02E58 80B3F038 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 -/* 02E5C 80B3F03C 468021A0 */ cvt.s.w $f6, $f4 -/* 02E60 80B3F040 46083280 */ add.s $f10, $f6, $f8 -/* 02E64 80B3F044 4600503E */ c.le.s $f10, $f0 +/* 02E5C 80B3F03C 468021A0 */ cvt.s.w $f6, $f4 +/* 02E60 80B3F040 46083280 */ add.s $f10, $f6, $f8 +/* 02E64 80B3F044 4600503E */ c.le.s $f10, $f0 /* 02E68 80B3F048 00000000 */ nop -/* 02E6C 80B3F04C 45020017 */ bc1fl .L80B3F0AC -/* 02E70 80B3F050 8FBF0024 */ lw $ra, 0x0024($sp) +/* 02E6C 80B3F04C 45020017 */ bc1fl .L80B3F0AC +/* 02E70 80B3F050 8FBF0024 */ lw $ra, 0x0024($sp) /* 02E74 80B3F054 0C028800 */ jal SkelAnime_GetFrameCount - + /* 02E78 80B3F058 24844828 */ addiu $a0, $a0, 0x4828 ## $a0 = 06004828 /* 02E7C 80B3F05C 44828000 */ mtc1 $v0, $f16 ## $f16 = 0.00 /* 02E80 80B3F060 3C01C140 */ lui $at, 0xC140 ## $at = C1400000 /* 02E84 80B3F064 44812000 */ mtc1 $at, $f4 ## $f4 = -12.00 -/* 02E88 80B3F068 468084A0 */ cvt.s.w $f18, $f16 -/* 02E8C 80B3F06C 8FA40028 */ lw $a0, 0x0028($sp) +/* 02E88 80B3F068 468084A0 */ cvt.s.w $f18, $f16 +/* 02E8C 80B3F06C 8FA40028 */ lw $a0, 0x0028($sp) /* 02E90 80B3F070 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 02E94 80B3F074 24A54828 */ addiu $a1, $a1, 0x4828 ## $a1 = 06004828 /* 02E98 80B3F078 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 02E9C 80B3F07C 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 02EA0 80B3F080 E7B20010 */ swc1 $f18, 0x0010($sp) -/* 02EA4 80B3F084 AFA00014 */ sw $zero, 0x0014($sp) -/* 02EA8 80B3F088 E7A40018 */ swc1 $f4, 0x0018($sp) -/* 02EAC 80B3F08C 0C029468 */ jal SkelAnime_ChangeAnimation - +/* 02EA0 80B3F080 E7B20010 */ swc1 $f18, 0x0010($sp) +/* 02EA4 80B3F084 AFA00014 */ sw $zero, 0x0014($sp) +/* 02EA8 80B3F088 E7A40018 */ swc1 $f4, 0x0018($sp) +/* 02EAC 80B3F08C 0C029468 */ jal SkelAnime_ChangeAnim + /* 02EB0 80B3F090 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 02EB4 80B3F094 8FA20028 */ lw $v0, 0x0028($sp) +/* 02EB4 80B3F094 8FA20028 */ lw $v0, 0x0028($sp) /* 02EB8 80B3F098 44803000 */ mtc1 $zero, $f6 ## $f6 = 0.00 /* 02EBC 80B3F09C 24190029 */ addiu $t9, $zero, 0x0029 ## $t9 = 00000029 /* 02EC0 80B3F0A0 AC590260 */ sw $t9, 0x0260($v0) ## 00000260 /* 02EC4 80B3F0A4 E4460268 */ swc1 $f6, 0x0268($v0) ## 00000268 -/* 02EC8 80B3F0A8 8FBF0024 */ lw $ra, 0x0024($sp) +/* 02EC8 80B3F0A8 8FBF0024 */ lw $ra, 0x0024($sp) .L80B3F0AC: /* 02ECC 80B3F0AC 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 02ED0 80B3F0B0 03E00008 */ jr $ra +/* 02ED0 80B3F0B0 03E00008 */ jr $ra /* 02ED4 80B3F0B4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3FFB4.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3FFB4.s index 1221ff0b1d..f6dfc7eccc 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3FFB4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B3FFB4.s @@ -1,41 +1,41 @@ glabel func_80B3FFB4 /* 03DD4 80B3FFB4 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 03DD8 80B3FFB8 AFBF0024 */ sw $ra, 0x0024($sp) -/* 03DDC 80B3FFBC AFA40028 */ sw $a0, 0x0028($sp) +/* 03DD8 80B3FFB8 AFBF0024 */ sw $ra, 0x0024($sp) +/* 03DDC 80B3FFBC AFA40028 */ sw $a0, 0x0028($sp) /* 03DE0 80B3FFC0 2406000A */ addiu $a2, $zero, 0x000A ## $a2 = 0000000A -/* 03DE4 80B3FFC4 0C2CF13C */ jal func_80B3C4F0 +/* 03DE4 80B3FFC4 0C2CF13C */ jal func_80B3C4F0 /* 03DE8 80B3FFC8 24070004 */ addiu $a3, $zero, 0x0004 ## $a3 = 00000004 -/* 03DEC 80B3FFCC 10400018 */ beq $v0, $zero, .L80B40030 +/* 03DEC 80B3FFCC 10400018 */ beq $v0, $zero, .L80B40030 /* 03DF0 80B3FFD0 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 /* 03DF4 80B3FFD4 0C028800 */ jal SkelAnime_GetFrameCount - + /* 03DF8 80B3FFD8 24841A08 */ addiu $a0, $a0, 0x1A08 ## $a0 = 06001A08 /* 03DFC 80B3FFDC 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 03E00 80B3FFE0 3C01C100 */ lui $at, 0xC100 ## $at = C1000000 /* 03E04 80B3FFE4 44814000 */ mtc1 $at, $f8 ## $f8 = -8.00 -/* 03E08 80B3FFE8 468021A0 */ cvt.s.w $f6, $f4 -/* 03E0C 80B3FFEC 8FA40028 */ lw $a0, 0x0028($sp) +/* 03E08 80B3FFE8 468021A0 */ cvt.s.w $f6, $f4 +/* 03E0C 80B3FFEC 8FA40028 */ lw $a0, 0x0028($sp) /* 03E10 80B3FFF0 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 03E14 80B3FFF4 240E0002 */ addiu $t6, $zero, 0x0002 ## $t6 = 00000002 -/* 03E18 80B3FFF8 AFAE0014 */ sw $t6, 0x0014($sp) +/* 03E18 80B3FFF8 AFAE0014 */ sw $t6, 0x0014($sp) /* 03E1C 80B3FFFC 24A51A08 */ addiu $a1, $a1, 0x1A08 ## $a1 = 06001A08 -/* 03E20 80B40000 E7A60010 */ swc1 $f6, 0x0010($sp) +/* 03E20 80B40000 E7A60010 */ swc1 $f6, 0x0010($sp) /* 03E24 80B40004 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 03E28 80B40008 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 03E2C 80B4000C E7A80018 */ swc1 $f8, 0x0018($sp) -/* 03E30 80B40010 0C029468 */ jal SkelAnime_ChangeAnimation - +/* 03E2C 80B4000C E7A80018 */ swc1 $f8, 0x0018($sp) +/* 03E30 80B40010 0C029468 */ jal SkelAnime_ChangeAnim + /* 03E34 80B40014 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 03E38 80B40018 8FB80028 */ lw $t8, 0x0028($sp) +/* 03E38 80B40018 8FB80028 */ lw $t8, 0x0028($sp) /* 03E3C 80B4001C 240F0037 */ addiu $t7, $zero, 0x0037 ## $t7 = 00000037 /* 03E40 80B40020 24190004 */ addiu $t9, $zero, 0x0004 ## $t9 = 00000004 /* 03E44 80B40024 AF0F0260 */ sw $t7, 0x0260($t8) ## 00000260 -/* 03E48 80B40028 8FA80028 */ lw $t0, 0x0028($sp) +/* 03E48 80B40028 8FA80028 */ lw $t0, 0x0028($sp) /* 03E4C 80B4002C AD190264 */ sw $t9, 0x0264($t0) ## 00000264 .L80B40030: -/* 03E50 80B40030 8FBF0024 */ lw $ra, 0x0024($sp) +/* 03E50 80B40030 8FBF0024 */ lw $ra, 0x0024($sp) /* 03E54 80B40034 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 03E58 80B40038 03E00008 */ jr $ra +/* 03E58 80B40038 03E00008 */ jr $ra /* 03E5C 80B4003C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B40040.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B40040.s index e15bf85c0f..56b5ee35e6 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B40040.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B40040.s @@ -1,33 +1,33 @@ glabel func_80B40040 /* 03E60 80B40040 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 03E64 80B40044 AFBF0024 */ sw $ra, 0x0024($sp) -/* 03E68 80B40048 10A00014 */ beq $a1, $zero, .L80B4009C -/* 03E6C 80B4004C AFA40028 */ sw $a0, 0x0028($sp) +/* 03E64 80B40044 AFBF0024 */ sw $ra, 0x0024($sp) +/* 03E68 80B40048 10A00014 */ beq $a1, $zero, .L80B4009C +/* 03E6C 80B4004C AFA40028 */ sw $a0, 0x0028($sp) /* 03E70 80B40050 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 /* 03E74 80B40054 0C028800 */ jal SkelAnime_GetFrameCount - + /* 03E78 80B40058 24841D14 */ addiu $a0, $a0, 0x1D14 ## $a0 = 06001D14 /* 03E7C 80B4005C 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 03E80 80B40060 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 03E84 80B40064 8FA40028 */ lw $a0, 0x0028($sp) -/* 03E88 80B40068 468021A0 */ cvt.s.w $f6, $f4 +/* 03E84 80B40064 8FA40028 */ lw $a0, 0x0028($sp) +/* 03E88 80B40068 468021A0 */ cvt.s.w $f6, $f4 /* 03E8C 80B4006C 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 03E90 80B40070 44070000 */ mfc1 $a3, $f0 +/* 03E90 80B40070 44070000 */ mfc1 $a3, $f0 /* 03E94 80B40074 24A51D14 */ addiu $a1, $a1, 0x1D14 ## $a1 = 06001D14 /* 03E98 80B40078 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 03E9C 80B4007C AFA00014 */ sw $zero, 0x0014($sp) -/* 03EA0 80B40080 E7A60010 */ swc1 $f6, 0x0010($sp) +/* 03E9C 80B4007C AFA00014 */ sw $zero, 0x0014($sp) +/* 03EA0 80B40080 E7A60010 */ swc1 $f6, 0x0010($sp) /* 03EA4 80B40084 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 03EA8 80B40088 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 03EAC 80B4008C E7A00018 */ swc1 $f0, 0x0018($sp) -/* 03EB0 80B40090 8FAF0028 */ lw $t7, 0x0028($sp) +/* 03EA8 80B40088 0C029468 */ jal SkelAnime_ChangeAnim + +/* 03EAC 80B4008C E7A00018 */ swc1 $f0, 0x0018($sp) +/* 03EB0 80B40090 8FAF0028 */ lw $t7, 0x0028($sp) /* 03EB4 80B40094 240E0038 */ addiu $t6, $zero, 0x0038 ## $t6 = 00000038 /* 03EB8 80B40098 ADEE0260 */ sw $t6, 0x0260($t7) ## 00000260 .L80B4009C: -/* 03EBC 80B4009C 8FBF0024 */ lw $ra, 0x0024($sp) +/* 03EBC 80B4009C 8FBF0024 */ lw $ra, 0x0024($sp) /* 03EC0 80B400A0 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 03EC4 80B400A4 03E00008 */ jr $ra +/* 03EC4 80B400A4 03E00008 */ jr $ra /* 03EC8 80B400A8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B402C4.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B402C4.s index 2179cbe576..d4f5efb32c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B402C4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B402C4.s @@ -1,32 +1,32 @@ glabel func_80B402C4 /* 040E4 80B402C4 27BDFF68 */ addiu $sp, $sp, 0xFF68 ## $sp = FFFFFF68 -/* 040E8 80B402C8 AFBF002C */ sw $ra, 0x002C($sp) -/* 040EC 80B402CC AFB10028 */ sw $s1, 0x0028($sp) -/* 040F0 80B402D0 AFB00024 */ sw $s0, 0x0024($sp) -/* 040F4 80B402D4 AFA5009C */ sw $a1, 0x009C($sp) +/* 040E8 80B402C8 AFBF002C */ sw $ra, 0x002C($sp) +/* 040EC 80B402CC AFB10028 */ sw $s1, 0x0028($sp) +/* 040F0 80B402D0 AFB00024 */ sw $s0, 0x0024($sp) +/* 040F4 80B402D4 AFA5009C */ sw $a1, 0x009C($sp) /* 040F8 80B402D8 8482025C */ lh $v0, 0x025C($a0) ## 0000025C /* 040FC 80B402DC 3C0F80B4 */ lui $t7, %hi(D_80B41D6C) ## $t7 = 80B40000 /* 04100 80B402E0 00808825 */ or $s1, $a0, $zero ## $s1 = 00000000 -/* 04104 80B402E4 00027080 */ sll $t6, $v0, 2 -/* 04108 80B402E8 01EE7821 */ addu $t7, $t7, $t6 -/* 0410C 80B402EC 8DEF1D6C */ lw $t7, %lo(D_80B41D6C)($t7) +/* 04104 80B402E4 00027080 */ sll $t6, $v0, 2 +/* 04108 80B402E8 01EE7821 */ addu $t7, $t7, $t6 +/* 0410C 80B402EC 8DEF1D6C */ lw $t7, %lo(D_80B41D6C)($t7) /* 04110 80B402F0 3C0680B4 */ lui $a2, %hi(D_80B42070) ## $a2 = 80B40000 /* 04114 80B402F4 24C62070 */ addiu $a2, $a2, %lo(D_80B42070) ## $a2 = 80B42070 -/* 04118 80B402F8 AFAF0088 */ sw $t7, 0x0088($sp) +/* 04118 80B402F8 AFAF0088 */ sw $t7, 0x0088($sp) /* 0411C 80B402FC 8CB00000 */ lw $s0, 0x0000($a1) ## 00000000 /* 04120 80B40300 27A40068 */ addiu $a0, $sp, 0x0068 ## $a0 = FFFFFFD0 /* 04124 80B40304 24070235 */ addiu $a3, $zero, 0x0235 ## $a3 = 00000235 -/* 04128 80B40308 0C031AB1 */ jal func_800C6AC4 +/* 04128 80B40308 0C031AB1 */ jal Graph_OpenDisps /* 0412C 80B4030C 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 04130 80B40310 8E3902BC */ lw $t9, 0x02BC($s1) ## 000002BC /* 04134 80B40314 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 04138 80B40318 53200060 */ beql $t9, $zero, .L80B4049C +/* 04138 80B40318 53200060 */ beql $t9, $zero, .L80B4049C /* 0413C 80B4031C 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 04140 80B40320 0C031A73 */ jal Graph_Alloc - + /* 04144 80B40324 24050040 */ addiu $a1, $zero, 0x0040 ## $a1 = 00000040 -/* 04148 80B40328 0C034213 */ jal Matrix_Push -/* 0414C 80B4032C AFA20064 */ sw $v0, 0x0064($sp) +/* 04148 80B40328 0C034213 */ jal Matrix_Push +/* 0414C 80B4032C AFA20064 */ sw $v0, 0x0064($sp) /* 04150 80B40330 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 /* 04154 80B40334 8C42FA90 */ lw $v0, -0x0570($v0) ## 8015FA90 /* 04158 80B40338 3C0142C8 */ lui $at, 0x42C8 ## $at = 42C80000 @@ -36,42 +36,42 @@ glabel func_80B402C4 /* 04168 80B40348 84491476 */ lh $t1, 0x1476($v0) ## 80161476 /* 0416C 80B4034C 44882000 */ mtc1 $t0, $f4 ## $f4 = 0.00 /* 04170 80B40350 3C0180B4 */ lui $at, %hi(D_80B42258) ## $at = 80B40000 -/* 04174 80B40354 C4322258 */ lwc1 $f18, %lo(D_80B42258)($at) -/* 04178 80B40358 468021A0 */ cvt.s.w $f6, $f4 +/* 04174 80B40354 C4322258 */ lwc1 $f18, %lo(D_80B42258)($at) +/* 04178 80B40358 468021A0 */ cvt.s.w $f6, $f4 /* 0417C 80B4035C 448A2000 */ mtc1 $t2, $f4 ## $f4 = 0.00 /* 04180 80B40360 44895000 */ mtc1 $t1, $f10 ## $f10 = 0.00 /* 04184 80B40364 3C0180B4 */ lui $at, %hi(D_80B4225C) ## $at = 80B40000 /* 04188 80B40368 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 0418C 80B4036C 46805420 */ cvt.s.w $f16, $f10 -/* 04190 80B40370 46083300 */ add.s $f12, $f6, $f8 -/* 04194 80B40374 C428225C */ lwc1 $f8, %lo(D_80B4225C)($at) -/* 04198 80B40378 468021A0 */ cvt.s.w $f6, $f4 -/* 0419C 80B4037C 46128380 */ add.s $f14, $f16, $f18 -/* 041A0 80B40380 46083280 */ add.s $f10, $f6, $f8 -/* 041A4 80B40384 44065000 */ mfc1 $a2, $f10 -/* 041A8 80B40388 0C034261 */ jal Matrix_Translate +/* 0418C 80B4036C 46805420 */ cvt.s.w $f16, $f10 +/* 04190 80B40370 46083300 */ add.s $f12, $f6, $f8 +/* 04194 80B40374 C428225C */ lwc1 $f8, %lo(D_80B4225C)($at) +/* 04198 80B40378 468021A0 */ cvt.s.w $f6, $f4 +/* 0419C 80B4037C 46128380 */ add.s $f14, $f16, $f18 +/* 041A0 80B40380 46083280 */ add.s $f10, $f6, $f8 +/* 041A4 80B40384 44065000 */ mfc1 $a2, $f10 +/* 041A8 80B40388 0C034261 */ jal Matrix_Translate /* 041AC 80B4038C 00000000 */ nop /* 041B0 80B40390 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 /* 041B4 80B40394 8C42FA90 */ lw $v0, -0x0570($v0) ## 8015FA90 /* 041B8 80B40398 862602A4 */ lh $a2, 0x02A4($s1) ## 000002A4 /* 041BC 80B4039C 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 /* 041C0 80B403A0 84441480 */ lh $a0, 0x1480($v0) ## 80161480 -/* 041C4 80B403A4 0C034421 */ jal Matrix_RotateXYZ +/* 041C4 80B403A4 0C034421 */ jal Matrix_RotateZYX /* 041C8 80B403A8 84451482 */ lh $a1, 0x1482($v0) ## 80161482 /* 041CC 80B403AC 26220298 */ addiu $v0, $s1, 0x0298 ## $v0 = 00000298 /* 041D0 80B403B0 C44C0000 */ lwc1 $f12, 0x0000($v0) ## 00000298 /* 041D4 80B403B4 C44E0004 */ lwc1 $f14, 0x0004($v0) ## 0000029C /* 041D8 80B403B8 8C460008 */ lw $a2, 0x0008($v0) ## 000002A0 -/* 041DC 80B403BC 0C0342A3 */ jal Matrix_Scale +/* 041DC 80B403BC 0C0342A3 */ jal Matrix_Scale /* 041E0 80B403C0 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 /* 041E4 80B403C4 3C0580B4 */ lui $a1, %hi(D_80B42088) ## $a1 = 80B40000 /* 041E8 80B403C8 24A52088 */ addiu $a1, $a1, %lo(D_80B42088) ## $a1 = 80B42088 -/* 041EC 80B403CC 8FA40064 */ lw $a0, 0x0064($sp) -/* 041F0 80B403D0 0C034695 */ jal Matrix_ToMtx +/* 041EC 80B403CC 8FA40064 */ lw $a0, 0x0064($sp) +/* 041F0 80B403D0 0C034695 */ jal Matrix_ToMtx /* 041F4 80B403D4 2406025A */ addiu $a2, $zero, 0x025A ## $a2 = 0000025A -/* 041F8 80B403D8 0C034221 */ jal Matrix_Pull +/* 041F8 80B403D8 0C034221 */ jal Matrix_Pull /* 041FC 80B403DC 00000000 */ nop -/* 04200 80B403E0 0C024F61 */ jal func_80093D84 +/* 04200 80B403E0 0C024F61 */ jal func_80093D84 /* 04204 80B403E4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 04208 80B403E8 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 /* 0420C 80B403EC 3C0CFA00 */ lui $t4, 0xFA00 ## $t4 = FA000000 @@ -86,7 +86,7 @@ glabel func_80B402C4 /* 04230 80B40410 331900FF */ andi $t9, $t8, 0x00FF ## $t9 = 00000000 /* 04234 80B40414 31AE00FF */ andi $t6, $t5, 0x00FF ## $t6 = 00000000 /* 04238 80B40418 01C17825 */ or $t7, $t6, $at ## $t7 = FFFF0000 -/* 0423C 80B4041C 00194200 */ sll $t0, $t9, 8 +/* 0423C 80B4041C 00194200 */ sll $t0, $t9, 8 /* 04240 80B40420 01E84825 */ or $t1, $t7, $t0 ## $t1 = FFFF0000 /* 04244 80B40424 AC490004 */ sw $t1, 0x0004($v0) ## 00000004 /* 04248 80B40428 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 @@ -99,7 +99,7 @@ glabel func_80B402C4 /* 04264 80B40444 3C08DA38 */ lui $t0, 0xDA38 ## $t0 = DA380000 /* 04268 80B40448 35080003 */ ori $t0, $t0, 0x0003 ## $t0 = DA380003 /* 0426C 80B4044C 318D00FF */ andi $t5, $t4, 0x00FF ## $t5 = 00000080 -/* 04270 80B40450 000D7400 */ sll $t6, $t5, 16 +/* 04270 80B40450 000D7400 */ sll $t6, $t5, 16 /* 04274 80B40454 01C1C025 */ or $t8, $t6, $at ## $t8 = FF000000 /* 04278 80B40458 37190080 */ ori $t9, $t8, 0x0080 ## $t9 = FF000080 /* 0427C 80B4045C AC590004 */ sw $t9, 0x0004($v0) ## 00000004 @@ -109,7 +109,7 @@ glabel func_80B402C4 /* 0428C 80B4046C 244F0008 */ addiu $t7, $v0, 0x0008 ## $t7 = 00000008 /* 04290 80B40470 AE0F02D0 */ sw $t7, 0x02D0($s0) ## 000002D0 /* 04294 80B40474 AC480000 */ sw $t0, 0x0000($v0) ## 00000000 -/* 04298 80B40478 8FA90064 */ lw $t1, 0x0064($sp) +/* 04298 80B40478 8FA90064 */ lw $t1, 0x0064($sp) /* 0429C 80B4047C 3C0BDE00 */ lui $t3, 0xDE00 ## $t3 = DE000000 /* 042A0 80B40480 AC490004 */ sw $t1, 0x0004($v0) ## 00000004 /* 042A4 80B40484 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 @@ -119,32 +119,32 @@ glabel func_80B402C4 /* 042B4 80B40494 AC4B0000 */ sw $t3, 0x0000($v0) ## 00000000 /* 042B8 80B40498 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 .L80B4049C: -/* 042BC 80B4049C 8FA5009C */ lw $a1, 0x009C($sp) -/* 042C0 80B404A0 0C00BAF3 */ jal func_8002EBCC +/* 042BC 80B4049C 8FA5009C */ lw $a1, 0x009C($sp) +/* 042C0 80B404A0 0C00BAF3 */ jal func_8002EBCC /* 042C4 80B404A4 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 042C8 80B404A8 8FAD009C */ lw $t5, 0x009C($sp) -/* 042CC 80B404AC 0C024F46 */ jal func_80093D18 +/* 042C8 80B404A8 8FAD009C */ lw $t5, 0x009C($sp) +/* 042CC 80B404AC 0C024F46 */ jal func_80093D18 /* 042D0 80B404B0 8DA40000 */ lw $a0, 0x0000($t5) ## 00000000 -/* 042D4 80B404B4 8FA70088 */ lw $a3, 0x0088($sp) +/* 042D4 80B404B4 8FA70088 */ lw $a3, 0x0088($sp) /* 042D8 80B404B8 8E0302C0 */ lw $v1, 0x02C0($s0) ## 000002C0 /* 042DC 80B404BC 3C18DB06 */ lui $t8, 0xDB06 ## $t8 = DB060000 -/* 042E0 80B404C0 0007C900 */ sll $t9, $a3, 4 -/* 042E4 80B404C4 00197F02 */ srl $t7, $t9, 28 +/* 042E0 80B404C0 0007C900 */ sll $t9, $a3, 4 +/* 042E4 80B404C4 00197F02 */ srl $t7, $t9, 28 /* 042E8 80B404C8 3C098016 */ lui $t1, 0x8016 ## $t1 = 80160000 /* 042EC 80B404CC 246E0008 */ addiu $t6, $v1, 0x0008 ## $t6 = 00000008 /* 042F0 80B404D0 AE0E02C0 */ sw $t6, 0x02C0($s0) ## 000002C0 /* 042F4 80B404D4 25296FA8 */ addiu $t1, $t1, 0x6FA8 ## $t1 = 80166FA8 -/* 042F8 80B404D8 000F4080 */ sll $t0, $t7, 2 +/* 042F8 80B404D8 000F4080 */ sll $t0, $t7, 2 /* 042FC 80B404DC 37180020 */ ori $t8, $t8, 0x0020 ## $t8 = DB060020 -/* 04300 80B404E0 01092021 */ addu $a0, $t0, $t1 +/* 04300 80B404E0 01092021 */ addu $a0, $t0, $t1 /* 04304 80B404E4 AC780000 */ sw $t8, 0x0000($v1) ## 00000000 /* 04308 80B404E8 8C8A0000 */ lw $t2, 0x0000($a0) ## 00000000 /* 0430C 80B404EC 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 /* 04310 80B404F0 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF -/* 04314 80B404F4 00E12824 */ and $a1, $a3, $at +/* 04314 80B404F4 00E12824 */ and $a1, $a3, $at /* 04318 80B404F8 3C068000 */ lui $a2, 0x8000 ## $a2 = 80000000 -/* 0431C 80B404FC 01455821 */ addu $t3, $t2, $a1 -/* 04320 80B40500 01666021 */ addu $t4, $t3, $a2 +/* 0431C 80B404FC 01455821 */ addu $t3, $t2, $a1 +/* 04320 80B40500 01666021 */ addu $t4, $t3, $a2 /* 04324 80B40504 AC6C0004 */ sw $t4, 0x0004($v1) ## 00000004 /* 04328 80B40508 8E0302C0 */ lw $v1, 0x02C0($s0) ## 000002C0 /* 0432C 80B4050C 3C0EDB06 */ lui $t6, 0xDB06 ## $t6 = DB060000 @@ -155,8 +155,8 @@ glabel func_80B402C4 /* 04340 80B40520 8C980000 */ lw $t8, 0x0000($a0) ## 00000000 /* 04344 80B40524 2622014C */ addiu $v0, $s1, 0x014C ## $v0 = 0000014C /* 04348 80B40528 3C0980B4 */ lui $t1, %hi(func_80B40248) ## $t1 = 80B40000 -/* 0434C 80B4052C 0305C821 */ addu $t9, $t8, $a1 -/* 04350 80B40530 03267821 */ addu $t7, $t9, $a2 +/* 0434C 80B4052C 0305C821 */ addu $t9, $t8, $a1 +/* 04350 80B40530 03267821 */ addu $t7, $t9, $a2 /* 04354 80B40534 AC6F0004 */ sw $t7, 0x0004($v1) ## 00000004 /* 04358 80B40538 90470002 */ lbu $a3, 0x0002($v0) ## 0000014E /* 0435C 80B4053C 8C460020 */ lw $a2, 0x0020($v0) ## 0000016C @@ -164,21 +164,21 @@ glabel func_80B402C4 /* 04364 80B40544 3C0880B4 */ lui $t0, %hi(func_80B40224) ## $t0 = 80B40000 /* 04368 80B40548 25080224 */ addiu $t0, $t0, %lo(func_80B40224) ## $t0 = 80B40224 /* 0436C 80B4054C 25290248 */ addiu $t1, $t1, %lo(func_80B40248) ## $t1 = 80B40248 -/* 04370 80B40550 AFA90014 */ sw $t1, 0x0014($sp) -/* 04374 80B40554 AFA80010 */ sw $t0, 0x0010($sp) -/* 04378 80B40558 AFB10018 */ sw $s1, 0x0018($sp) -/* 0437C 80B4055C 0C0286B2 */ jal func_800A1AC8 -/* 04380 80B40560 8FA4009C */ lw $a0, 0x009C($sp) +/* 04370 80B40550 AFA90014 */ sw $t1, 0x0014($sp) +/* 04374 80B40554 AFA80010 */ sw $t0, 0x0010($sp) +/* 04378 80B40558 AFB10018 */ sw $s1, 0x0018($sp) +/* 0437C 80B4055C 0C0286B2 */ jal SkelAnime_DrawSV +/* 04380 80B40560 8FA4009C */ lw $a0, 0x009C($sp) /* 04384 80B40564 3C0680B4 */ lui $a2, %hi(D_80B420A0) ## $a2 = 80B40000 /* 04388 80B40568 24C620A0 */ addiu $a2, $a2, %lo(D_80B420A0) ## $a2 = 80B420A0 /* 0438C 80B4056C 27A40068 */ addiu $a0, $sp, 0x0068 ## $a0 = FFFFFFD0 /* 04390 80B40570 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 04394 80B40574 0C031AD5 */ jal func_800C6B54 +/* 04394 80B40574 0C031AD5 */ jal Graph_CloseDisps /* 04398 80B40578 2407029C */ addiu $a3, $zero, 0x029C ## $a3 = 0000029C -/* 0439C 80B4057C 8FBF002C */ lw $ra, 0x002C($sp) -/* 043A0 80B40580 8FB00024 */ lw $s0, 0x0024($sp) -/* 043A4 80B40584 8FB10028 */ lw $s1, 0x0028($sp) -/* 043A8 80B40588 03E00008 */ jr $ra +/* 0439C 80B4057C 8FBF002C */ lw $ra, 0x002C($sp) +/* 043A0 80B40580 8FB00024 */ lw $s0, 0x0024($sp) +/* 043A4 80B40584 8FB10028 */ lw $s1, 0x0028($sp) +/* 043A8 80B40588 03E00008 */ jr $ra /* 043AC 80B4058C 27BD0098 */ addiu $sp, $sp, 0x0098 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B4070C.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B4070C.s index 2af9dd1296..1a03312bd2 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B4070C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B4070C.s @@ -1,44 +1,44 @@ glabel func_80B4070C /* 0452C 80B4070C 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 -/* 04530 80B40710 AFB00028 */ sw $s0, 0x0028($sp) +/* 04530 80B40710 AFB00028 */ sw $s0, 0x0028($sp) /* 04534 80B40714 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 04538 80B40718 AFBF002C */ sw $ra, 0x002C($sp) +/* 04538 80B40718 AFBF002C */ sw $ra, 0x002C($sp) /* 0453C 80B4071C 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 -/* 04540 80B40720 AFA50044 */ sw $a1, 0x0044($sp) +/* 04540 80B40720 AFA50044 */ sw $a1, 0x0044($sp) /* 04544 80B40724 0C028800 */ jal SkelAnime_GetFrameCount - + /* 04548 80B40728 24844828 */ addiu $a0, $a0, 0x4828 ## $a0 = 06004828 /* 0454C 80B4072C 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 04550 80B40730 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 04554 80B40734 468021A0 */ cvt.s.w $f6, $f4 -/* 04558 80B40738 0C2CF277 */ jal func_80B3C9DC -/* 0455C 80B4073C E7A60030 */ swc1 $f6, 0x0030($sp) +/* 04554 80B40734 468021A0 */ cvt.s.w $f6, $f4 +/* 04558 80B40738 0C2CF277 */ jal func_80B3C9DC +/* 0455C 80B4073C E7A60030 */ swc1 $f6, 0x0030($sp) /* 04560 80B40740 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 04564 80B40744 8FA50044 */ lw $a1, 0x0044($sp) -/* 04568 80B40748 0C2CF162 */ jal func_80B3C588 +/* 04564 80B40744 8FA50044 */ lw $a1, 0x0044($sp) +/* 04568 80B40748 0C2CF162 */ jal func_80B3C588 /* 0456C 80B4074C 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 /* 04570 80B40750 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 04574 80B40754 C7A80030 */ lwc1 $f8, 0x0030($sp) +/* 04574 80B40754 C7A80030 */ lwc1 $f8, 0x0030($sp) /* 04578 80B40758 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 0457C 80B4075C 44070000 */ mfc1 $a3, $f0 +/* 0457C 80B4075C 44070000 */ mfc1 $a3, $f0 /* 04580 80B40760 24A54828 */ addiu $a1, $a1, 0x4828 ## $a1 = 06004828 /* 04584 80B40764 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C /* 04588 80B40768 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 0458C 80B4076C AFA00014 */ sw $zero, 0x0014($sp) -/* 04590 80B40770 E7A80010 */ swc1 $f8, 0x0010($sp) -/* 04594 80B40774 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 04598 80B40778 E7A00018 */ swc1 $f0, 0x0018($sp) +/* 0458C 80B4076C AFA00014 */ sw $zero, 0x0014($sp) +/* 04590 80B40770 E7A80010 */ swc1 $f8, 0x0010($sp) +/* 04594 80B40774 0C029468 */ jal SkelAnime_ChangeAnim + +/* 04598 80B40778 E7A00018 */ swc1 $f0, 0x0018($sp) /* 0459C 80B4077C 240E003A */ addiu $t6, $zero, 0x003A ## $t6 = 0000003A /* 045A0 80B40780 240F0005 */ addiu $t7, $zero, 0x0005 ## $t7 = 00000005 /* 045A4 80B40784 241800FF */ addiu $t8, $zero, 0x00FF ## $t8 = 000000FF /* 045A8 80B40788 AE0E0260 */ sw $t6, 0x0260($s0) ## 00000260 /* 045AC 80B4078C AE0F0264 */ sw $t7, 0x0264($s0) ## 00000264 /* 045B0 80B40790 A21800C8 */ sb $t8, 0x00C8($s0) ## 000000C8 -/* 045B4 80B40794 8FBF002C */ lw $ra, 0x002C($sp) -/* 045B8 80B40798 8FB00028 */ lw $s0, 0x0028($sp) +/* 045B4 80B40794 8FBF002C */ lw $ra, 0x002C($sp) +/* 045B8 80B40798 8FB00028 */ lw $s0, 0x0028($sp) /* 045BC 80B4079C 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 -/* 045C0 80B407A0 03E00008 */ jr $ra +/* 045C0 80B407A0 03E00008 */ jr $ra /* 045C4 80B407A4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B407A8.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B407A8.s index aa29b41432..5a848cbc89 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B407A8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B407A8.s @@ -1,35 +1,35 @@ glabel func_80B407A8 /* 045C8 80B407A8 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 045CC 80B407AC AFA40028 */ sw $a0, 0x0028($sp) -/* 045D0 80B407B0 AFBF0024 */ sw $ra, 0x0024($sp) +/* 045CC 80B407AC AFA40028 */ sw $a0, 0x0028($sp) +/* 045D0 80B407B0 AFBF0024 */ sw $ra, 0x0024($sp) /* 045D4 80B407B4 3C040602 */ lui $a0, 0x0602 ## $a0 = 06020000 /* 045D8 80B407B8 0C028800 */ jal SkelAnime_GetFrameCount - + /* 045DC 80B407BC 24848B00 */ addiu $a0, $a0, 0x8B00 ## $a0 = 06018B00 /* 045E0 80B407C0 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 045E4 80B407C4 3C01C100 */ lui $at, 0xC100 ## $at = C1000000 /* 045E8 80B407C8 44814000 */ mtc1 $at, $f8 ## $f8 = -8.00 -/* 045EC 80B407CC 468021A0 */ cvt.s.w $f6, $f4 -/* 045F0 80B407D0 8FA40028 */ lw $a0, 0x0028($sp) +/* 045EC 80B407CC 468021A0 */ cvt.s.w $f6, $f4 +/* 045F0 80B407D0 8FA40028 */ lw $a0, 0x0028($sp) /* 045F4 80B407D4 3C050602 */ lui $a1, 0x0602 ## $a1 = 06020000 /* 045F8 80B407D8 240E0002 */ addiu $t6, $zero, 0x0002 ## $t6 = 00000002 -/* 045FC 80B407DC AFAE0014 */ sw $t6, 0x0014($sp) +/* 045FC 80B407DC AFAE0014 */ sw $t6, 0x0014($sp) /* 04600 80B407E0 24A58B00 */ addiu $a1, $a1, 0x8B00 ## $a1 = 06018B00 -/* 04604 80B407E4 E7A60010 */ swc1 $f6, 0x0010($sp) +/* 04604 80B407E4 E7A60010 */ swc1 $f6, 0x0010($sp) /* 04608 80B407E8 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 0460C 80B407EC 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 04610 80B407F0 E7A80018 */ swc1 $f8, 0x0018($sp) -/* 04614 80B407F4 0C029468 */ jal SkelAnime_ChangeAnimation - +/* 04610 80B407F0 E7A80018 */ swc1 $f8, 0x0018($sp) +/* 04614 80B407F4 0C029468 */ jal SkelAnime_ChangeAnim + /* 04618 80B407F8 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 0461C 80B407FC 8FA20028 */ lw $v0, 0x0028($sp) +/* 0461C 80B407FC 8FA20028 */ lw $v0, 0x0028($sp) /* 04620 80B40800 240F003B */ addiu $t7, $zero, 0x003B ## $t7 = 0000003B /* 04624 80B40804 24180001 */ addiu $t8, $zero, 0x0001 ## $t8 = 00000001 /* 04628 80B40808 AC4F0260 */ sw $t7, 0x0260($v0) ## 00000260 /* 0462C 80B4080C AC580264 */ sw $t8, 0x0264($v0) ## 00000264 -/* 04630 80B40810 8FBF0024 */ lw $ra, 0x0024($sp) +/* 04630 80B40810 8FBF0024 */ lw $ra, 0x0024($sp) /* 04634 80B40814 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 04638 80B40818 03E00008 */ jr $ra +/* 04638 80B40818 03E00008 */ jr $ra /* 0463C 80B4081C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B40820.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B40820.s index da028a5734..130e407b93 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B40820.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B40820.s @@ -1,62 +1,62 @@ glabel func_80B40820 /* 04640 80B40820 27BDFFB8 */ addiu $sp, $sp, 0xFFB8 ## $sp = FFFFFFB8 -/* 04644 80B40824 AFB00028 */ sw $s0, 0x0028($sp) +/* 04644 80B40824 AFB00028 */ sw $s0, 0x0028($sp) /* 04648 80B40828 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 0464C 80B4082C AFBF002C */ sw $ra, 0x002C($sp) +/* 0464C 80B4082C AFBF002C */ sw $ra, 0x002C($sp) /* 04650 80B40830 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 -/* 04654 80B40834 AFA5004C */ sw $a1, 0x004C($sp) +/* 04654 80B40834 AFA5004C */ sw $a1, 0x004C($sp) /* 04658 80B40838 0C028800 */ jal SkelAnime_GetFrameCount - + /* 0465C 80B4083C 24844828 */ addiu $a0, $a0, 0x4828 ## $a0 = 06004828 /* 04660 80B40840 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 04664 80B40844 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 /* 04668 80B40848 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C -/* 0466C 80B4084C 468021A0 */ cvt.s.w $f6, $f4 +/* 0466C 80B4084C 468021A0 */ cvt.s.w $f6, $f4 /* 04670 80B40850 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 04674 80B40854 44070000 */ mfc1 $a3, $f0 +/* 04674 80B40854 44070000 */ mfc1 $a3, $f0 /* 04678 80B40858 24A54828 */ addiu $a1, $a1, 0x4828 ## $a1 = 06004828 -/* 0467C 80B4085C AFA40034 */ sw $a0, 0x0034($sp) +/* 0467C 80B4085C AFA40034 */ sw $a0, 0x0034($sp) /* 04680 80B40860 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 04684 80B40864 E7A60010 */ swc1 $f6, 0x0010($sp) -/* 04688 80B40868 AFA00014 */ sw $zero, 0x0014($sp) -/* 0468C 80B4086C 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 04690 80B40870 E7A00018 */ swc1 $f0, 0x0018($sp) +/* 04684 80B40864 E7A60010 */ swc1 $f6, 0x0010($sp) +/* 04688 80B40868 AFA00014 */ sw $zero, 0x0014($sp) +/* 0468C 80B4086C 0C029468 */ jal SkelAnime_ChangeAnim + +/* 04690 80B40870 E7A00018 */ swc1 $f0, 0x0018($sp) /* 04694 80B40874 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 04698 80B40878 8FA5004C */ lw $a1, 0x004C($sp) -/* 0469C 80B4087C 0C2CF162 */ jal func_80B3C588 +/* 04698 80B40878 8FA5004C */ lw $a1, 0x004C($sp) +/* 0469C 80B4087C 0C2CF162 */ jal func_80B3C588 /* 046A0 80B40880 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 /* 046A4 80B40884 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 046A8 80B40888 0C2CF259 */ jal func_80B3C964 -/* 046AC 80B4088C 8FA5004C */ lw $a1, 0x004C($sp) +/* 046A8 80B40888 0C2CF259 */ jal func_80B3C964 +/* 046AC 80B4088C 8FA5004C */ lw $a1, 0x004C($sp) /* 046B0 80B40890 3C040601 */ lui $a0, 0x0601 ## $a0 = 06010000 /* 046B4 80B40894 0C028800 */ jal SkelAnime_GetFrameCount - + /* 046B8 80B40898 248469E8 */ addiu $a0, $a0, 0x69E8 ## $a0 = 060169E8 /* 046BC 80B4089C 44824000 */ mtc1 $v0, $f8 ## $f8 = 0.00 /* 046C0 80B408A0 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 /* 046C4 80B408A4 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 -/* 046C8 80B408A8 468042A0 */ cvt.s.w $f10, $f8 +/* 046C8 80B408A8 468042A0 */ cvt.s.w $f10, $f8 /* 046CC 80B408AC 240E0002 */ addiu $t6, $zero, 0x0002 ## $t6 = 00000002 -/* 046D0 80B408B0 44070000 */ mfc1 $a3, $f0 -/* 046D4 80B408B4 AFAE0014 */ sw $t6, 0x0014($sp) +/* 046D0 80B408B0 44070000 */ mfc1 $a3, $f0 +/* 046D4 80B408B4 AFAE0014 */ sw $t6, 0x0014($sp) /* 046D8 80B408B8 24A569E8 */ addiu $a1, $a1, 0x69E8 ## $a1 = 060169E8 -/* 046DC 80B408BC 8FA40034 */ lw $a0, 0x0034($sp) -/* 046E0 80B408C0 E7AA0010 */ swc1 $f10, 0x0010($sp) +/* 046DC 80B408BC 8FA40034 */ lw $a0, 0x0034($sp) +/* 046E0 80B408C0 E7AA0010 */ swc1 $f10, 0x0010($sp) /* 046E4 80B408C4 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 046E8 80B408C8 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 046EC 80B408CC E7A00018 */ swc1 $f0, 0x0018($sp) +/* 046E8 80B408C8 0C029468 */ jal SkelAnime_ChangeAnim + +/* 046EC 80B408CC E7A00018 */ swc1 $f0, 0x0018($sp) /* 046F0 80B408D0 240F003C */ addiu $t7, $zero, 0x003C ## $t7 = 0000003C /* 046F4 80B408D4 24180001 */ addiu $t8, $zero, 0x0001 ## $t8 = 00000001 /* 046F8 80B408D8 241900FF */ addiu $t9, $zero, 0x00FF ## $t9 = 000000FF /* 046FC 80B408DC AE0F0260 */ sw $t7, 0x0260($s0) ## 00000260 /* 04700 80B408E0 AE180264 */ sw $t8, 0x0264($s0) ## 00000264 /* 04704 80B408E4 A21900C8 */ sb $t9, 0x00C8($s0) ## 000000C8 -/* 04708 80B408E8 8FBF002C */ lw $ra, 0x002C($sp) -/* 0470C 80B408EC 8FB00028 */ lw $s0, 0x0028($sp) +/* 04708 80B408E8 8FBF002C */ lw $ra, 0x002C($sp) +/* 0470C 80B408EC 8FB00028 */ lw $s0, 0x0028($sp) /* 04710 80B408F0 27BD0048 */ addiu $sp, $sp, 0x0048 ## $sp = 00000000 -/* 04714 80B408F4 03E00008 */ jr $ra +/* 04714 80B408F4 03E00008 */ jr $ra /* 04718 80B408F8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B408FC.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B408FC.s index e493b18f58..443488f426 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B408FC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B408FC.s @@ -1,62 +1,62 @@ glabel func_80B408FC /* 0471C 80B408FC 27BDFFB8 */ addiu $sp, $sp, 0xFFB8 ## $sp = FFFFFFB8 -/* 04720 80B40900 AFB00028 */ sw $s0, 0x0028($sp) +/* 04720 80B40900 AFB00028 */ sw $s0, 0x0028($sp) /* 04724 80B40904 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 04728 80B40908 AFBF002C */ sw $ra, 0x002C($sp) +/* 04728 80B40908 AFBF002C */ sw $ra, 0x002C($sp) /* 0472C 80B4090C 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 -/* 04730 80B40910 AFA5004C */ sw $a1, 0x004C($sp) +/* 04730 80B40910 AFA5004C */ sw $a1, 0x004C($sp) /* 04734 80B40914 0C028800 */ jal SkelAnime_GetFrameCount - + /* 04738 80B40918 24844828 */ addiu $a0, $a0, 0x4828 ## $a0 = 06004828 /* 0473C 80B4091C 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 04740 80B40920 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 /* 04744 80B40924 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C -/* 04748 80B40928 468021A0 */ cvt.s.w $f6, $f4 +/* 04748 80B40928 468021A0 */ cvt.s.w $f6, $f4 /* 0474C 80B4092C 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 04750 80B40930 44070000 */ mfc1 $a3, $f0 +/* 04750 80B40930 44070000 */ mfc1 $a3, $f0 /* 04754 80B40934 24A54828 */ addiu $a1, $a1, 0x4828 ## $a1 = 06004828 -/* 04758 80B40938 AFA40034 */ sw $a0, 0x0034($sp) +/* 04758 80B40938 AFA40034 */ sw $a0, 0x0034($sp) /* 0475C 80B4093C 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 04760 80B40940 E7A60010 */ swc1 $f6, 0x0010($sp) -/* 04764 80B40944 AFA00014 */ sw $zero, 0x0014($sp) -/* 04768 80B40948 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 0476C 80B4094C E7A00018 */ swc1 $f0, 0x0018($sp) +/* 04760 80B40940 E7A60010 */ swc1 $f6, 0x0010($sp) +/* 04764 80B40944 AFA00014 */ sw $zero, 0x0014($sp) +/* 04768 80B40948 0C029468 */ jal SkelAnime_ChangeAnim + +/* 0476C 80B4094C E7A00018 */ swc1 $f0, 0x0018($sp) /* 04770 80B40950 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 04774 80B40954 8FA5004C */ lw $a1, 0x004C($sp) -/* 04778 80B40958 0C2CF162 */ jal func_80B3C588 +/* 04774 80B40954 8FA5004C */ lw $a1, 0x004C($sp) +/* 04778 80B40958 0C2CF162 */ jal func_80B3C588 /* 0477C 80B4095C 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 /* 04780 80B40960 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 04784 80B40964 0C2CF259 */ jal func_80B3C964 -/* 04788 80B40968 8FA5004C */ lw $a1, 0x004C($sp) +/* 04784 80B40964 0C2CF259 */ jal func_80B3C964 +/* 04788 80B40968 8FA5004C */ lw $a1, 0x004C($sp) /* 0478C 80B4096C 3C040601 */ lui $a0, 0x0601 ## $a0 = 06010000 /* 04790 80B40970 0C028800 */ jal SkelAnime_GetFrameCount - + /* 04794 80B40974 248449E4 */ addiu $a0, $a0, 0x49E4 ## $a0 = 060149E4 /* 04798 80B40978 44824000 */ mtc1 $v0, $f8 ## $f8 = 0.00 /* 0479C 80B4097C 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 /* 047A0 80B40980 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 -/* 047A4 80B40984 468042A0 */ cvt.s.w $f10, $f8 +/* 047A4 80B40984 468042A0 */ cvt.s.w $f10, $f8 /* 047A8 80B40988 240E0002 */ addiu $t6, $zero, 0x0002 ## $t6 = 00000002 -/* 047AC 80B4098C 44070000 */ mfc1 $a3, $f0 -/* 047B0 80B40990 AFAE0014 */ sw $t6, 0x0014($sp) +/* 047AC 80B4098C 44070000 */ mfc1 $a3, $f0 +/* 047B0 80B40990 AFAE0014 */ sw $t6, 0x0014($sp) /* 047B4 80B40994 24A549E4 */ addiu $a1, $a1, 0x49E4 ## $a1 = 060149E4 -/* 047B8 80B40998 8FA40034 */ lw $a0, 0x0034($sp) -/* 047BC 80B4099C E7AA0010 */ swc1 $f10, 0x0010($sp) +/* 047B8 80B40998 8FA40034 */ lw $a0, 0x0034($sp) +/* 047BC 80B4099C E7AA0010 */ swc1 $f10, 0x0010($sp) /* 047C0 80B409A0 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 047C4 80B409A4 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 047C8 80B409A8 E7A00018 */ swc1 $f0, 0x0018($sp) +/* 047C4 80B409A4 0C029468 */ jal SkelAnime_ChangeAnim + +/* 047C8 80B409A8 E7A00018 */ swc1 $f0, 0x0018($sp) /* 047CC 80B409AC 240F003D */ addiu $t7, $zero, 0x003D ## $t7 = 0000003D /* 047D0 80B409B0 24180001 */ addiu $t8, $zero, 0x0001 ## $t8 = 00000001 /* 047D4 80B409B4 241900FF */ addiu $t9, $zero, 0x00FF ## $t9 = 000000FF /* 047D8 80B409B8 AE0F0260 */ sw $t7, 0x0260($s0) ## 00000260 /* 047DC 80B409BC AE180264 */ sw $t8, 0x0264($s0) ## 00000264 /* 047E0 80B409C0 A21900C8 */ sb $t9, 0x00C8($s0) ## 000000C8 -/* 047E4 80B409C4 8FBF002C */ lw $ra, 0x002C($sp) -/* 047E8 80B409C8 8FB00028 */ lw $s0, 0x0028($sp) +/* 047E4 80B409C4 8FBF002C */ lw $ra, 0x002C($sp) +/* 047E8 80B409C8 8FB00028 */ lw $s0, 0x0028($sp) /* 047EC 80B409CC 27BD0048 */ addiu $sp, $sp, 0x0048 ## $sp = 00000000 -/* 047F0 80B409D0 03E00008 */ jr $ra +/* 047F0 80B409D0 03E00008 */ jr $ra /* 047F4 80B409D4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B409D8.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B409D8.s index 780231a9ea..5ee8d5b360 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B409D8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B409D8.s @@ -1,45 +1,45 @@ glabel func_80B409D8 /* 047F8 80B409D8 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 -/* 047FC 80B409DC AFB00028 */ sw $s0, 0x0028($sp) +/* 047FC 80B409DC AFB00028 */ sw $s0, 0x0028($sp) /* 04800 80B409E0 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 04804 80B409E4 AFBF002C */ sw $ra, 0x002C($sp) +/* 04804 80B409E4 AFBF002C */ sw $ra, 0x002C($sp) /* 04808 80B409E8 3C040602 */ lui $a0, 0x0602 ## $a0 = 06020000 -/* 0480C 80B409EC AFA50044 */ sw $a1, 0x0044($sp) +/* 0480C 80B409EC AFA50044 */ sw $a1, 0x0044($sp) /* 04810 80B409F0 0C028800 */ jal SkelAnime_GetFrameCount - + /* 04814 80B409F4 24849F78 */ addiu $a0, $a0, 0x9F78 ## $a0 = 06019F78 /* 04818 80B409F8 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 0481C 80B409FC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 04820 80B40A00 468021A0 */ cvt.s.w $f6, $f4 -/* 04824 80B40A04 0C2CF277 */ jal func_80B3C9DC -/* 04828 80B40A08 E7A60030 */ swc1 $f6, 0x0030($sp) +/* 04820 80B40A00 468021A0 */ cvt.s.w $f6, $f4 +/* 04824 80B40A04 0C2CF277 */ jal func_80B3C9DC +/* 04828 80B40A08 E7A60030 */ swc1 $f6, 0x0030($sp) /* 0482C 80B40A0C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 04830 80B40A10 8FA50044 */ lw $a1, 0x0044($sp) -/* 04834 80B40A14 0C2CF162 */ jal func_80B3C588 +/* 04830 80B40A10 8FA50044 */ lw $a1, 0x0044($sp) +/* 04834 80B40A14 0C2CF162 */ jal func_80B3C588 /* 04838 80B40A18 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 /* 0483C 80B40A1C 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 04840 80B40A20 C7A80030 */ lwc1 $f8, 0x0030($sp) +/* 04840 80B40A20 C7A80030 */ lwc1 $f8, 0x0030($sp) /* 04844 80B40A24 3C050602 */ lui $a1, 0x0602 ## $a1 = 06020000 /* 04848 80B40A28 240E0002 */ addiu $t6, $zero, 0x0002 ## $t6 = 00000002 -/* 0484C 80B40A2C 44070000 */ mfc1 $a3, $f0 -/* 04850 80B40A30 AFAE0014 */ sw $t6, 0x0014($sp) +/* 0484C 80B40A2C 44070000 */ mfc1 $a3, $f0 +/* 04850 80B40A30 AFAE0014 */ sw $t6, 0x0014($sp) /* 04854 80B40A34 24A59F78 */ addiu $a1, $a1, 0x9F78 ## $a1 = 06019F78 /* 04858 80B40A38 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C /* 0485C 80B40A3C 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 04860 80B40A40 E7A80010 */ swc1 $f8, 0x0010($sp) -/* 04864 80B40A44 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 04868 80B40A48 E7A00018 */ swc1 $f0, 0x0018($sp) +/* 04860 80B40A40 E7A80010 */ swc1 $f8, 0x0010($sp) +/* 04864 80B40A44 0C029468 */ jal SkelAnime_ChangeAnim + +/* 04868 80B40A48 E7A00018 */ swc1 $f0, 0x0018($sp) /* 0486C 80B40A4C 240F003E */ addiu $t7, $zero, 0x003E ## $t7 = 0000003E /* 04870 80B40A50 24180001 */ addiu $t8, $zero, 0x0001 ## $t8 = 00000001 /* 04874 80B40A54 241900FF */ addiu $t9, $zero, 0x00FF ## $t9 = 000000FF /* 04878 80B40A58 AE0F0260 */ sw $t7, 0x0260($s0) ## 00000260 /* 0487C 80B40A5C AE180264 */ sw $t8, 0x0264($s0) ## 00000264 /* 04880 80B40A60 A21900C8 */ sb $t9, 0x00C8($s0) ## 000000C8 -/* 04884 80B40A64 8FBF002C */ lw $ra, 0x002C($sp) -/* 04888 80B40A68 8FB00028 */ lw $s0, 0x0028($sp) +/* 04884 80B40A64 8FBF002C */ lw $ra, 0x002C($sp) +/* 04888 80B40A68 8FB00028 */ lw $s0, 0x0028($sp) /* 0488C 80B40A6C 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 -/* 04890 80B40A70 03E00008 */ jr $ra +/* 04890 80B40A70 03E00008 */ jr $ra /* 04894 80B40A74 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B40A78.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B40A78.s index 07b62383f5..dab5cf542e 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B40A78.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B40A78.s @@ -1,45 +1,45 @@ glabel func_80B40A78 /* 04898 80B40A78 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 -/* 0489C 80B40A7C AFB00028 */ sw $s0, 0x0028($sp) +/* 0489C 80B40A7C AFB00028 */ sw $s0, 0x0028($sp) /* 048A0 80B40A80 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 048A4 80B40A84 AFBF002C */ sw $ra, 0x002C($sp) +/* 048A4 80B40A84 AFBF002C */ sw $ra, 0x002C($sp) /* 048A8 80B40A88 3C040602 */ lui $a0, 0x0602 ## $a0 = 06020000 -/* 048AC 80B40A8C AFA50044 */ sw $a1, 0x0044($sp) +/* 048AC 80B40A8C AFA50044 */ sw $a1, 0x0044($sp) /* 048B0 80B40A90 0C028800 */ jal SkelAnime_GetFrameCount - + /* 048B4 80B40A94 24849F78 */ addiu $a0, $a0, 0x9F78 ## $a0 = 06019F78 /* 048B8 80B40A98 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 048BC 80B40A9C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 048C0 80B40AA0 468021A0 */ cvt.s.w $f6, $f4 -/* 048C4 80B40AA4 0C2CF277 */ jal func_80B3C9DC -/* 048C8 80B40AA8 E7A60030 */ swc1 $f6, 0x0030($sp) +/* 048C0 80B40AA0 468021A0 */ cvt.s.w $f6, $f4 +/* 048C4 80B40AA4 0C2CF277 */ jal func_80B3C9DC +/* 048C8 80B40AA8 E7A60030 */ swc1 $f6, 0x0030($sp) /* 048CC 80B40AAC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 048D0 80B40AB0 8FA50044 */ lw $a1, 0x0044($sp) -/* 048D4 80B40AB4 0C2CF162 */ jal func_80B3C588 +/* 048D0 80B40AB0 8FA50044 */ lw $a1, 0x0044($sp) +/* 048D4 80B40AB4 0C2CF162 */ jal func_80B3C588 /* 048D8 80B40AB8 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 /* 048DC 80B40ABC 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 048E0 80B40AC0 C7A80030 */ lwc1 $f8, 0x0030($sp) +/* 048E0 80B40AC0 C7A80030 */ lwc1 $f8, 0x0030($sp) /* 048E4 80B40AC4 3C050602 */ lui $a1, 0x0602 ## $a1 = 06020000 /* 048E8 80B40AC8 240E0002 */ addiu $t6, $zero, 0x0002 ## $t6 = 00000002 -/* 048EC 80B40ACC 44070000 */ mfc1 $a3, $f0 -/* 048F0 80B40AD0 AFAE0014 */ sw $t6, 0x0014($sp) +/* 048EC 80B40ACC 44070000 */ mfc1 $a3, $f0 +/* 048F0 80B40AD0 AFAE0014 */ sw $t6, 0x0014($sp) /* 048F4 80B40AD4 24A59F78 */ addiu $a1, $a1, 0x9F78 ## $a1 = 06019F78 /* 048F8 80B40AD8 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C /* 048FC 80B40ADC 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 04900 80B40AE0 E7A80010 */ swc1 $f8, 0x0010($sp) -/* 04904 80B40AE4 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 04908 80B40AE8 E7A00018 */ swc1 $f0, 0x0018($sp) +/* 04900 80B40AE0 E7A80010 */ swc1 $f8, 0x0010($sp) +/* 04904 80B40AE4 0C029468 */ jal SkelAnime_ChangeAnim + +/* 04908 80B40AE8 E7A00018 */ swc1 $f0, 0x0018($sp) /* 0490C 80B40AEC 240F003F */ addiu $t7, $zero, 0x003F ## $t7 = 0000003F /* 04910 80B40AF0 24180001 */ addiu $t8, $zero, 0x0001 ## $t8 = 00000001 /* 04914 80B40AF4 241900FF */ addiu $t9, $zero, 0x00FF ## $t9 = 000000FF /* 04918 80B40AF8 AE0F0260 */ sw $t7, 0x0260($s0) ## 00000260 /* 0491C 80B40AFC AE180264 */ sw $t8, 0x0264($s0) ## 00000264 /* 04920 80B40B00 A21900C8 */ sb $t9, 0x00C8($s0) ## 000000C8 -/* 04924 80B40B04 8FBF002C */ lw $ra, 0x002C($sp) -/* 04928 80B40B08 8FB00028 */ lw $s0, 0x0028($sp) +/* 04924 80B40B04 8FBF002C */ lw $ra, 0x002C($sp) +/* 04928 80B40B08 8FB00028 */ lw $s0, 0x0028($sp) /* 0492C 80B40B0C 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 -/* 04930 80B40B10 03E00008 */ jr $ra +/* 04930 80B40B10 03E00008 */ jr $ra /* 04934 80B40B14 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B40B18.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B40B18.s index 7db51e7dea..1cfb8d295b 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B40B18.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B40B18.s @@ -1,44 +1,44 @@ glabel func_80B40B18 /* 04938 80B40B18 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 -/* 0493C 80B40B1C AFB00028 */ sw $s0, 0x0028($sp) +/* 0493C 80B40B1C AFB00028 */ sw $s0, 0x0028($sp) /* 04940 80B40B20 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 04944 80B40B24 AFBF002C */ sw $ra, 0x002C($sp) +/* 04944 80B40B24 AFBF002C */ sw $ra, 0x002C($sp) /* 04948 80B40B28 3C040602 */ lui $a0, 0x0602 ## $a0 = 06020000 -/* 0494C 80B40B2C AFA50044 */ sw $a1, 0x0044($sp) +/* 0494C 80B40B2C AFA50044 */ sw $a1, 0x0044($sp) /* 04950 80B40B30 0C028800 */ jal SkelAnime_GetFrameCount - + /* 04954 80B40B34 24849C30 */ addiu $a0, $a0, 0x9C30 ## $a0 = 06019C30 /* 04958 80B40B38 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 0495C 80B40B3C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 04960 80B40B40 468021A0 */ cvt.s.w $f6, $f4 -/* 04964 80B40B44 0C2CF277 */ jal func_80B3C9DC -/* 04968 80B40B48 E7A60030 */ swc1 $f6, 0x0030($sp) +/* 04960 80B40B40 468021A0 */ cvt.s.w $f6, $f4 +/* 04964 80B40B44 0C2CF277 */ jal func_80B3C9DC +/* 04968 80B40B48 E7A60030 */ swc1 $f6, 0x0030($sp) /* 0496C 80B40B4C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 04970 80B40B50 8FA50044 */ lw $a1, 0x0044($sp) -/* 04974 80B40B54 0C2CF162 */ jal func_80B3C588 +/* 04970 80B40B50 8FA50044 */ lw $a1, 0x0044($sp) +/* 04974 80B40B54 0C2CF162 */ jal func_80B3C588 /* 04978 80B40B58 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 /* 0497C 80B40B5C 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 04980 80B40B60 C7A80030 */ lwc1 $f8, 0x0030($sp) +/* 04980 80B40B60 C7A80030 */ lwc1 $f8, 0x0030($sp) /* 04984 80B40B64 3C050602 */ lui $a1, 0x0602 ## $a1 = 06020000 -/* 04988 80B40B68 44070000 */ mfc1 $a3, $f0 +/* 04988 80B40B68 44070000 */ mfc1 $a3, $f0 /* 0498C 80B40B6C 24A59C30 */ addiu $a1, $a1, 0x9C30 ## $a1 = 06019C30 /* 04990 80B40B70 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C /* 04994 80B40B74 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 04998 80B40B78 AFA00014 */ sw $zero, 0x0014($sp) -/* 0499C 80B40B7C E7A80010 */ swc1 $f8, 0x0010($sp) -/* 049A0 80B40B80 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 049A4 80B40B84 E7A00018 */ swc1 $f0, 0x0018($sp) +/* 04998 80B40B78 AFA00014 */ sw $zero, 0x0014($sp) +/* 0499C 80B40B7C E7A80010 */ swc1 $f8, 0x0010($sp) +/* 049A0 80B40B80 0C029468 */ jal SkelAnime_ChangeAnim + +/* 049A4 80B40B84 E7A00018 */ swc1 $f0, 0x0018($sp) /* 049A8 80B40B88 240E0040 */ addiu $t6, $zero, 0x0040 ## $t6 = 00000040 /* 049AC 80B40B8C 240F0001 */ addiu $t7, $zero, 0x0001 ## $t7 = 00000001 /* 049B0 80B40B90 241800FF */ addiu $t8, $zero, 0x00FF ## $t8 = 000000FF /* 049B4 80B40B94 AE0E0260 */ sw $t6, 0x0260($s0) ## 00000260 /* 049B8 80B40B98 AE0F0264 */ sw $t7, 0x0264($s0) ## 00000264 /* 049BC 80B40B9C A21800C8 */ sb $t8, 0x00C8($s0) ## 000000C8 -/* 049C0 80B40BA0 8FBF002C */ lw $ra, 0x002C($sp) -/* 049C4 80B40BA4 8FB00028 */ lw $s0, 0x0028($sp) +/* 049C0 80B40BA0 8FBF002C */ lw $ra, 0x002C($sp) +/* 049C4 80B40BA4 8FB00028 */ lw $s0, 0x0028($sp) /* 049C8 80B40BA8 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 -/* 049CC 80B40BAC 03E00008 */ jr $ra +/* 049CC 80B40BAC 03E00008 */ jr $ra /* 049D0 80B40BB0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B40BB4.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B40BB4.s index a13095e69d..6bade6ec9a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B40BB4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B40BB4.s @@ -1,44 +1,44 @@ glabel func_80B40BB4 /* 049D4 80B40BB4 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 -/* 049D8 80B40BB8 AFB00028 */ sw $s0, 0x0028($sp) +/* 049D8 80B40BB8 AFB00028 */ sw $s0, 0x0028($sp) /* 049DC 80B40BBC 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 049E0 80B40BC0 AFBF002C */ sw $ra, 0x002C($sp) +/* 049E0 80B40BC0 AFBF002C */ sw $ra, 0x002C($sp) /* 049E4 80B40BC4 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 -/* 049E8 80B40BC8 AFA50044 */ sw $a1, 0x0044($sp) +/* 049E8 80B40BC8 AFA50044 */ sw $a1, 0x0044($sp) /* 049EC 80B40BCC 0C028800 */ jal SkelAnime_GetFrameCount - + /* 049F0 80B40BD0 24844828 */ addiu $a0, $a0, 0x4828 ## $a0 = 06004828 /* 049F4 80B40BD4 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 049F8 80B40BD8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 049FC 80B40BDC 468021A0 */ cvt.s.w $f6, $f4 -/* 04A00 80B40BE0 0C2CF277 */ jal func_80B3C9DC -/* 04A04 80B40BE4 E7A60030 */ swc1 $f6, 0x0030($sp) +/* 049FC 80B40BDC 468021A0 */ cvt.s.w $f6, $f4 +/* 04A00 80B40BE0 0C2CF277 */ jal func_80B3C9DC +/* 04A04 80B40BE4 E7A60030 */ swc1 $f6, 0x0030($sp) /* 04A08 80B40BE8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 04A0C 80B40BEC 8FA50044 */ lw $a1, 0x0044($sp) -/* 04A10 80B40BF0 0C2CF162 */ jal func_80B3C588 +/* 04A0C 80B40BEC 8FA50044 */ lw $a1, 0x0044($sp) +/* 04A10 80B40BF0 0C2CF162 */ jal func_80B3C588 /* 04A14 80B40BF4 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 /* 04A18 80B40BF8 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 04A1C 80B40BFC C7A80030 */ lwc1 $f8, 0x0030($sp) +/* 04A1C 80B40BFC C7A80030 */ lwc1 $f8, 0x0030($sp) /* 04A20 80B40C00 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 04A24 80B40C04 44070000 */ mfc1 $a3, $f0 +/* 04A24 80B40C04 44070000 */ mfc1 $a3, $f0 /* 04A28 80B40C08 24A54828 */ addiu $a1, $a1, 0x4828 ## $a1 = 06004828 /* 04A2C 80B40C0C 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C /* 04A30 80B40C10 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 04A34 80B40C14 AFA00014 */ sw $zero, 0x0014($sp) -/* 04A38 80B40C18 E7A80010 */ swc1 $f8, 0x0010($sp) -/* 04A3C 80B40C1C 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 04A40 80B40C20 E7A00018 */ swc1 $f0, 0x0018($sp) +/* 04A34 80B40C14 AFA00014 */ sw $zero, 0x0014($sp) +/* 04A38 80B40C18 E7A80010 */ swc1 $f8, 0x0010($sp) +/* 04A3C 80B40C1C 0C029468 */ jal SkelAnime_ChangeAnim + +/* 04A40 80B40C20 E7A00018 */ swc1 $f0, 0x0018($sp) /* 04A44 80B40C24 240E0041 */ addiu $t6, $zero, 0x0041 ## $t6 = 00000041 /* 04A48 80B40C28 240F0001 */ addiu $t7, $zero, 0x0001 ## $t7 = 00000001 /* 04A4C 80B40C2C 241800FF */ addiu $t8, $zero, 0x00FF ## $t8 = 000000FF /* 04A50 80B40C30 AE0E0260 */ sw $t6, 0x0260($s0) ## 00000260 /* 04A54 80B40C34 AE0F0264 */ sw $t7, 0x0264($s0) ## 00000264 /* 04A58 80B40C38 A21800C8 */ sb $t8, 0x00C8($s0) ## 000000C8 -/* 04A5C 80B40C3C 8FBF002C */ lw $ra, 0x002C($sp) -/* 04A60 80B40C40 8FB00028 */ lw $s0, 0x0028($sp) +/* 04A5C 80B40C3C 8FBF002C */ lw $ra, 0x002C($sp) +/* 04A60 80B40C40 8FB00028 */ lw $s0, 0x0028($sp) /* 04A64 80B40C44 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 -/* 04A68 80B40C48 03E00008 */ jr $ra +/* 04A68 80B40C48 03E00008 */ jr $ra /* 04A6C 80B40C4C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B40D98.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B40D98.s index 5681213316..2db093767a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B40D98.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B40D98.s @@ -2,47 +2,47 @@ glabel func_80B40D98 /* 04BB8 80B40D98 3C0F8016 */ lui $t7, 0x8016 ## $t7 = 80160000 /* 04BBC 80B40D9C 8DEFFA90 */ lw $t7, -0x0570($t7) ## 8015FA90 /* 04BC0 80B40DA0 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 04BC4 80B40DA4 AFBF0024 */ sw $ra, 0x0024($sp) -/* 04BC8 80B40DA8 AFA40028 */ sw $a0, 0x0028($sp) +/* 04BC4 80B40DA4 AFBF0024 */ sw $ra, 0x0024($sp) +/* 04BC8 80B40DA8 AFA40028 */ sw $a0, 0x0028($sp) /* 04BCC 80B40DAC 85F8145E */ lh $t8, 0x145E($t7) ## 8016145E /* 04BD0 80B40DB0 3C01430C */ lui $at, 0x430C ## $at = 430C0000 /* 04BD4 80B40DB4 44814000 */ mtc1 $at, $f8 ## $f8 = 140.00 /* 04BD8 80B40DB8 44982000 */ mtc1 $t8, $f4 ## $f4 = 0.00 /* 04BDC 80B40DBC C4800090 */ lwc1 $f0, 0x0090($a0) ## 00000090 /* 04BE0 80B40DC0 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 -/* 04BE4 80B40DC4 468021A0 */ cvt.s.w $f6, $f4 -/* 04BE8 80B40DC8 46083280 */ add.s $f10, $f6, $f8 -/* 04BEC 80B40DCC 4600503E */ c.le.s $f10, $f0 +/* 04BE4 80B40DC4 468021A0 */ cvt.s.w $f6, $f4 +/* 04BE8 80B40DC8 46083280 */ add.s $f10, $f6, $f8 +/* 04BEC 80B40DCC 4600503E */ c.le.s $f10, $f0 /* 04BF0 80B40DD0 00000000 */ nop -/* 04BF4 80B40DD4 45020017 */ bc1fl .L80B40E34 -/* 04BF8 80B40DD8 8FBF0024 */ lw $ra, 0x0024($sp) +/* 04BF4 80B40DD4 45020017 */ bc1fl .L80B40E34 +/* 04BF8 80B40DD8 8FBF0024 */ lw $ra, 0x0024($sp) /* 04BFC 80B40DDC 0C028800 */ jal SkelAnime_GetFrameCount - + /* 04C00 80B40DE0 24844828 */ addiu $a0, $a0, 0x4828 ## $a0 = 06004828 /* 04C04 80B40DE4 44828000 */ mtc1 $v0, $f16 ## $f16 = 0.00 /* 04C08 80B40DE8 3C01C140 */ lui $at, 0xC140 ## $at = C1400000 /* 04C0C 80B40DEC 44812000 */ mtc1 $at, $f4 ## $f4 = -12.00 -/* 04C10 80B40DF0 468084A0 */ cvt.s.w $f18, $f16 -/* 04C14 80B40DF4 8FA40028 */ lw $a0, 0x0028($sp) +/* 04C10 80B40DF0 468084A0 */ cvt.s.w $f18, $f16 +/* 04C14 80B40DF4 8FA40028 */ lw $a0, 0x0028($sp) /* 04C18 80B40DF8 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 04C1C 80B40DFC 24A54828 */ addiu $a1, $a1, 0x4828 ## $a1 = 06004828 /* 04C20 80B40E00 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 04C24 80B40E04 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 04C28 80B40E08 E7B20010 */ swc1 $f18, 0x0010($sp) -/* 04C2C 80B40E0C AFA00014 */ sw $zero, 0x0014($sp) -/* 04C30 80B40E10 E7A40018 */ swc1 $f4, 0x0018($sp) -/* 04C34 80B40E14 0C029468 */ jal SkelAnime_ChangeAnimation - +/* 04C28 80B40E08 E7B20010 */ swc1 $f18, 0x0010($sp) +/* 04C2C 80B40E0C AFA00014 */ sw $zero, 0x0014($sp) +/* 04C30 80B40E10 E7A40018 */ swc1 $f4, 0x0018($sp) +/* 04C34 80B40E14 0C029468 */ jal SkelAnime_ChangeAnim + /* 04C38 80B40E18 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 04C3C 80B40E1C 8FA20028 */ lw $v0, 0x0028($sp) +/* 04C3C 80B40E1C 8FA20028 */ lw $v0, 0x0028($sp) /* 04C40 80B40E20 44803000 */ mtc1 $zero, $f6 ## $f6 = 0.00 /* 04C44 80B40E24 2419004B */ addiu $t9, $zero, 0x004B ## $t9 = 0000004B /* 04C48 80B40E28 AC590260 */ sw $t9, 0x0260($v0) ## 00000260 /* 04C4C 80B40E2C E4460268 */ swc1 $f6, 0x0268($v0) ## 00000268 -/* 04C50 80B40E30 8FBF0024 */ lw $ra, 0x0024($sp) +/* 04C50 80B40E30 8FBF0024 */ lw $ra, 0x0024($sp) .L80B40E34: /* 04C54 80B40E34 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 04C58 80B40E38 03E00008 */ jr $ra +/* 04C58 80B40E38 03E00008 */ jr $ra /* 04C5C 80B40E3C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B414AC.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B414AC.s index 30f8e7f843..2de0cb0844 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B414AC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B414AC.s @@ -1,39 +1,39 @@ glabel func_80B414AC /* 052CC 80B414AC 27BDFF98 */ addiu $sp, $sp, 0xFF98 ## $sp = FFFFFF98 -/* 052D0 80B414B0 AFBF002C */ sw $ra, 0x002C($sp) -/* 052D4 80B414B4 AFB00028 */ sw $s0, 0x0028($sp) -/* 052D8 80B414B8 AFA40068 */ sw $a0, 0x0068($sp) -/* 052DC 80B414BC AFA5006C */ sw $a1, 0x006C($sp) +/* 052D0 80B414B0 AFBF002C */ sw $ra, 0x002C($sp) +/* 052D4 80B414B4 AFB00028 */ sw $s0, 0x0028($sp) +/* 052D8 80B414B8 AFA40068 */ sw $a0, 0x0068($sp) +/* 052DC 80B414BC AFA5006C */ sw $a1, 0x006C($sp) /* 052E0 80B414C0 8CB00000 */ lw $s0, 0x0000($a1) ## 00000000 /* 052E4 80B414C4 3C0680B4 */ lui $a2, %hi(D_80B420F0) ## $a2 = 80B40000 /* 052E8 80B414C8 24C620F0 */ addiu $a2, $a2, %lo(D_80B420F0) ## $a2 = 80B420F0 /* 052EC 80B414CC 27A40048 */ addiu $a0, $sp, 0x0048 ## $a0 = FFFFFFE0 /* 052F0 80B414D0 24070347 */ addiu $a3, $zero, 0x0347 ## $a3 = 00000347 -/* 052F4 80B414D4 0C031AB1 */ jal func_800C6AC4 +/* 052F4 80B414D4 0C031AB1 */ jal Graph_OpenDisps /* 052F8 80B414D8 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 052FC 80B414DC 0C024F46 */ jal func_80093D18 +/* 052FC 80B414DC 0C024F46 */ jal func_80093D18 /* 05300 80B414E0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 05304 80B414E4 8E0402C0 */ lw $a0, 0x02C0($s0) ## 000002C0 /* 05308 80B414E8 3C030600 */ lui $v1, 0x0600 ## $v1 = 06000000 /* 0530C 80B414EC 246358C0 */ addiu $v1, $v1, 0x58C0 ## $v1 = 060058C0 -/* 05310 80B414F0 0003C900 */ sll $t9, $v1, 4 -/* 05314 80B414F4 00194702 */ srl $t0, $t9, 28 +/* 05310 80B414F0 0003C900 */ sll $t9, $v1, 4 +/* 05314 80B414F4 00194702 */ srl $t0, $t9, 28 /* 05318 80B414F8 3C18DB06 */ lui $t8, 0xDB06 ## $t8 = DB060000 /* 0531C 80B414FC 3C0A8016 */ lui $t2, 0x8016 ## $t2 = 80160000 /* 05320 80B41500 248F0008 */ addiu $t7, $a0, 0x0008 ## $t7 = 00000008 /* 05324 80B41504 AE0F02C0 */ sw $t7, 0x02C0($s0) ## 000002C0 /* 05328 80B41508 254A6FA8 */ addiu $t2, $t2, 0x6FA8 ## $t2 = 80166FA8 /* 0532C 80B4150C 37180020 */ ori $t8, $t8, 0x0020 ## $t8 = DB060020 -/* 05330 80B41510 00084880 */ sll $t1, $t0, 2 -/* 05334 80B41514 012A2821 */ addu $a1, $t1, $t2 +/* 05330 80B41510 00084880 */ sll $t1, $t0, 2 +/* 05334 80B41514 012A2821 */ addu $a1, $t1, $t2 /* 05338 80B41518 AC980000 */ sw $t8, 0x0000($a0) ## 00000000 /* 0533C 80B4151C 8CAB0000 */ lw $t3, 0x0000($a1) ## 00000000 /* 05340 80B41520 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 /* 05344 80B41524 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF -/* 05348 80B41528 00613024 */ and $a2, $v1, $at +/* 05348 80B41528 00613024 */ and $a2, $v1, $at /* 0534C 80B4152C 3C078000 */ lui $a3, 0x8000 ## $a3 = 80000000 -/* 05350 80B41530 01666021 */ addu $t4, $t3, $a2 -/* 05354 80B41534 01876821 */ addu $t5, $t4, $a3 +/* 05350 80B41530 01666021 */ addu $t4, $t3, $a2 +/* 05354 80B41534 01876821 */ addu $t5, $t4, $a3 /* 05358 80B41538 AC8D0004 */ sw $t5, 0x0004($a0) ## 00000004 /* 0535C 80B4153C 8E0402C0 */ lw $a0, 0x02C0($s0) ## 000002C0 /* 05360 80B41540 3C0FDB06 */ lui $t7, 0xDB06 ## $t7 = DB060000 @@ -42,29 +42,29 @@ glabel func_80B414AC /* 0536C 80B4154C AE0E02C0 */ sw $t6, 0x02C0($s0) ## 000002C0 /* 05370 80B41550 AC8F0000 */ sw $t7, 0x0000($a0) ## 00000000 /* 05374 80B41554 8CB80000 */ lw $t8, 0x0000($a1) ## 00000000 -/* 05378 80B41558 0306C821 */ addu $t9, $t8, $a2 -/* 0537C 80B4155C 03274021 */ addu $t0, $t9, $a3 +/* 05378 80B41558 0306C821 */ addu $t9, $t8, $a2 +/* 0537C 80B4155C 03274021 */ addu $t0, $t9, $a3 /* 05380 80B41560 AC880004 */ sw $t0, 0x0004($a0) ## 00000004 -/* 05384 80B41564 8FA20068 */ lw $v0, 0x0068($sp) -/* 05388 80B41568 8FA4006C */ lw $a0, 0x006C($sp) +/* 05384 80B41564 8FA20068 */ lw $v0, 0x0068($sp) +/* 05388 80B41568 8FA4006C */ lw $a0, 0x006C($sp) /* 0538C 80B4156C 9047014E */ lbu $a3, 0x014E($v0) ## 0000014E /* 05390 80B41570 8C46016C */ lw $a2, 0x016C($v0) ## 0000016C /* 05394 80B41574 8C450150 */ lw $a1, 0x0150($v0) ## 00000150 -/* 05398 80B41578 AFA00018 */ sw $zero, 0x0018($sp) -/* 0539C 80B4157C AFA00014 */ sw $zero, 0x0014($sp) -/* 053A0 80B41580 AFA00010 */ sw $zero, 0x0010($sp) -/* 053A4 80B41584 0C0286B2 */ jal func_800A1AC8 +/* 05398 80B41578 AFA00018 */ sw $zero, 0x0018($sp) +/* 0539C 80B4157C AFA00014 */ sw $zero, 0x0014($sp) +/* 053A0 80B41580 AFA00010 */ sw $zero, 0x0010($sp) +/* 053A4 80B41584 0C0286B2 */ jal SkelAnime_DrawSV /* 053A8 80B41588 2442014C */ addiu $v0, $v0, 0x014C ## $v0 = 0000014C /* 053AC 80B4158C 3C0680B4 */ lui $a2, %hi(D_80B42108) ## $a2 = 80B40000 /* 053B0 80B41590 24C62108 */ addiu $a2, $a2, %lo(D_80B42108) ## $a2 = 80B42108 /* 053B4 80B41594 27A40048 */ addiu $a0, $sp, 0x0048 ## $a0 = FFFFFFE0 /* 053B8 80B41598 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 053BC 80B4159C 0C031AD5 */ jal func_800C6B54 +/* 053BC 80B4159C 0C031AD5 */ jal Graph_CloseDisps /* 053C0 80B415A0 24070356 */ addiu $a3, $zero, 0x0356 ## $a3 = 00000356 -/* 053C4 80B415A4 8FBF002C */ lw $ra, 0x002C($sp) -/* 053C8 80B415A8 8FB00028 */ lw $s0, 0x0028($sp) +/* 053C4 80B415A4 8FBF002C */ lw $ra, 0x002C($sp) +/* 053C8 80B415A8 8FB00028 */ lw $s0, 0x0028($sp) /* 053CC 80B415AC 27BD0068 */ addiu $sp, $sp, 0x0068 ## $sp = 00000000 -/* 053D0 80B415B0 03E00008 */ jr $ra +/* 053D0 80B415B0 03E00008 */ jr $ra /* 053D4 80B415B4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B41BA4.s b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B41BA4.s index 61c190e026..12755d1523 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B41BA4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B41BA4.s @@ -1,48 +1,48 @@ glabel func_80B41BA4 /* 059C4 80B41BA4 27BDFF88 */ addiu $sp, $sp, 0xFF88 ## $sp = FFFFFF88 -/* 059C8 80B41BA8 AFBF002C */ sw $ra, 0x002C($sp) -/* 059CC 80B41BAC AFB00028 */ sw $s0, 0x0028($sp) -/* 059D0 80B41BB0 AFA40078 */ sw $a0, 0x0078($sp) -/* 059D4 80B41BB4 AFA5007C */ sw $a1, 0x007C($sp) +/* 059C8 80B41BA8 AFBF002C */ sw $ra, 0x002C($sp) +/* 059CC 80B41BAC AFB00028 */ sw $s0, 0x0028($sp) +/* 059D0 80B41BB0 AFA40078 */ sw $a0, 0x0078($sp) +/* 059D4 80B41BB4 AFA5007C */ sw $a1, 0x007C($sp) /* 059D8 80B41BB8 8482025C */ lh $v0, 0x025C($a0) ## 0000025C /* 059DC 80B41BBC 3C1880B4 */ lui $t8, %hi(D_80B41D6C) ## $t8 = 80B40000 /* 059E0 80B41BC0 3C0680B4 */ lui $a2, %hi(D_80B421A0) ## $a2 = 80B40000 -/* 059E4 80B41BC4 00027880 */ sll $t7, $v0, 2 -/* 059E8 80B41BC8 030FC021 */ addu $t8, $t8, $t7 -/* 059EC 80B41BCC 8F181D6C */ lw $t8, %lo(D_80B41D6C)($t8) +/* 059E4 80B41BC4 00027880 */ sll $t7, $v0, 2 +/* 059E8 80B41BC8 030FC021 */ addu $t8, $t8, $t7 +/* 059EC 80B41BCC 8F181D6C */ lw $t8, %lo(D_80B41D6C)($t8) /* 059F0 80B41BD0 24C621A0 */ addiu $a2, $a2, %lo(D_80B421A0) ## $a2 = 80B421A0 /* 059F4 80B41BD4 27A40048 */ addiu $a0, $sp, 0x0048 ## $a0 = FFFFFFD0 -/* 059F8 80B41BD8 AFB80068 */ sw $t8, 0x0068($sp) +/* 059F8 80B41BD8 AFB80068 */ sw $t8, 0x0068($sp) /* 059FC 80B41BDC 8CB00000 */ lw $s0, 0x0000($a1) ## 00000000 /* 05A00 80B41BE0 2407048C */ addiu $a3, $zero, 0x048C ## $a3 = 0000048C -/* 05A04 80B41BE4 0C031AB1 */ jal func_800C6AC4 +/* 05A04 80B41BE4 0C031AB1 */ jal Graph_OpenDisps /* 05A08 80B41BE8 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 05A0C 80B41BEC 8FA40078 */ lw $a0, 0x0078($sp) -/* 05A10 80B41BF0 8FA5007C */ lw $a1, 0x007C($sp) -/* 05A14 80B41BF4 0C00BAF3 */ jal func_8002EBCC +/* 05A0C 80B41BEC 8FA40078 */ lw $a0, 0x0078($sp) +/* 05A10 80B41BF0 8FA5007C */ lw $a1, 0x007C($sp) +/* 05A14 80B41BF4 0C00BAF3 */ jal func_8002EBCC /* 05A18 80B41BF8 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 05A1C 80B41BFC 0C024F46 */ jal func_80093D18 +/* 05A1C 80B41BFC 0C024F46 */ jal func_80093D18 /* 05A20 80B41C00 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 05A24 80B41C04 8FA70068 */ lw $a3, 0x0068($sp) +/* 05A24 80B41C04 8FA70068 */ lw $a3, 0x0068($sp) /* 05A28 80B41C08 8E0302C0 */ lw $v1, 0x02C0($s0) ## 000002C0 /* 05A2C 80B41C0C 3C09DB06 */ lui $t1, 0xDB06 ## $t1 = DB060000 -/* 05A30 80B41C10 00075100 */ sll $t2, $a3, 4 -/* 05A34 80B41C14 000A5F02 */ srl $t3, $t2, 28 +/* 05A30 80B41C10 00075100 */ sll $t2, $a3, 4 +/* 05A34 80B41C14 000A5F02 */ srl $t3, $t2, 28 /* 05A38 80B41C18 3C0D8016 */ lui $t5, 0x8016 ## $t5 = 80160000 /* 05A3C 80B41C1C 24680008 */ addiu $t0, $v1, 0x0008 ## $t0 = 00000008 /* 05A40 80B41C20 AE0802C0 */ sw $t0, 0x02C0($s0) ## 000002C0 /* 05A44 80B41C24 25AD6FA8 */ addiu $t5, $t5, 0x6FA8 ## $t5 = 80166FA8 -/* 05A48 80B41C28 000B6080 */ sll $t4, $t3, 2 +/* 05A48 80B41C28 000B6080 */ sll $t4, $t3, 2 /* 05A4C 80B41C2C 35290020 */ ori $t1, $t1, 0x0020 ## $t1 = DB060020 -/* 05A50 80B41C30 018D2021 */ addu $a0, $t4, $t5 +/* 05A50 80B41C30 018D2021 */ addu $a0, $t4, $t5 /* 05A54 80B41C34 AC690000 */ sw $t1, 0x0000($v1) ## 00000000 /* 05A58 80B41C38 8C8E0000 */ lw $t6, 0x0000($a0) ## 00000000 /* 05A5C 80B41C3C 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 /* 05A60 80B41C40 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF -/* 05A64 80B41C44 00E12824 */ and $a1, $a3, $at +/* 05A64 80B41C44 00E12824 */ and $a1, $a3, $at /* 05A68 80B41C48 3C068000 */ lui $a2, 0x8000 ## $a2 = 80000000 -/* 05A6C 80B41C4C 01C57821 */ addu $t7, $t6, $a1 -/* 05A70 80B41C50 01E6C021 */ addu $t8, $t7, $a2 +/* 05A6C 80B41C4C 01C57821 */ addu $t7, $t6, $a1 +/* 05A70 80B41C50 01E6C021 */ addu $t8, $t7, $a2 /* 05A74 80B41C54 AC780004 */ sw $t8, 0x0004($v1) ## 00000004 /* 05A78 80B41C58 8E0302C0 */ lw $v1, 0x02C0($s0) ## 000002C0 /* 05A7C 80B41C5C 3C08DB06 */ lui $t0, 0xDB06 ## $t0 = DB060000 @@ -53,31 +53,31 @@ glabel func_80B41BA4 /* 05A90 80B41C70 8C890000 */ lw $t1, 0x0000($a0) ## 00000000 /* 05A94 80B41C74 3C0D80B4 */ lui $t5, %hi(func_80B41B0C) ## $t5 = 80B40000 /* 05A98 80B41C78 3C0C80B4 */ lui $t4, %hi(func_80B41A88) ## $t4 = 80B40000 -/* 05A9C 80B41C7C 01255021 */ addu $t2, $t1, $a1 -/* 05AA0 80B41C80 01465821 */ addu $t3, $t2, $a2 +/* 05A9C 80B41C7C 01255021 */ addu $t2, $t1, $a1 +/* 05AA0 80B41C80 01465821 */ addu $t3, $t2, $a2 /* 05AA4 80B41C84 AC6B0004 */ sw $t3, 0x0004($v1) ## 00000004 -/* 05AA8 80B41C88 8FA30078 */ lw $v1, 0x0078($sp) +/* 05AA8 80B41C88 8FA30078 */ lw $v1, 0x0078($sp) /* 05AAC 80B41C8C 258C1A88 */ addiu $t4, $t4, %lo(func_80B41A88) ## $t4 = 80B41A88 /* 05AB0 80B41C90 25AD1B0C */ addiu $t5, $t5, %lo(func_80B41B0C) ## $t5 = 80B41B0C /* 05AB4 80B41C94 2462014C */ addiu $v0, $v1, 0x014C ## $v0 = 0000014C /* 05AB8 80B41C98 8C450004 */ lw $a1, 0x0004($v0) ## 00000150 /* 05ABC 80B41C9C 8C460020 */ lw $a2, 0x0020($v0) ## 0000016C /* 05AC0 80B41CA0 90470002 */ lbu $a3, 0x0002($v0) ## 0000014E -/* 05AC4 80B41CA4 AFAD0014 */ sw $t5, 0x0014($sp) -/* 05AC8 80B41CA8 AFAC0010 */ sw $t4, 0x0010($sp) -/* 05ACC 80B41CAC 8FA4007C */ lw $a0, 0x007C($sp) -/* 05AD0 80B41CB0 0C0286B2 */ jal func_800A1AC8 -/* 05AD4 80B41CB4 AFA30018 */ sw $v1, 0x0018($sp) +/* 05AC4 80B41CA4 AFAD0014 */ sw $t5, 0x0014($sp) +/* 05AC8 80B41CA8 AFAC0010 */ sw $t4, 0x0010($sp) +/* 05ACC 80B41CAC 8FA4007C */ lw $a0, 0x007C($sp) +/* 05AD0 80B41CB0 0C0286B2 */ jal SkelAnime_DrawSV +/* 05AD4 80B41CB4 AFA30018 */ sw $v1, 0x0018($sp) /* 05AD8 80B41CB8 3C0680B4 */ lui $a2, %hi(D_80B421B0) ## $a2 = 80B40000 /* 05ADC 80B41CBC 24C621B0 */ addiu $a2, $a2, %lo(D_80B421B0) ## $a2 = 80B421B0 /* 05AE0 80B41CC0 27A40048 */ addiu $a0, $sp, 0x0048 ## $a0 = FFFFFFD0 /* 05AE4 80B41CC4 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 05AE8 80B41CC8 0C031AD5 */ jal func_800C6B54 +/* 05AE8 80B41CC8 0C031AD5 */ jal Graph_CloseDisps /* 05AEC 80B41CCC 240704B7 */ addiu $a3, $zero, 0x04B7 ## $a3 = 000004B7 -/* 05AF0 80B41CD0 8FBF002C */ lw $ra, 0x002C($sp) -/* 05AF4 80B41CD4 8FB00028 */ lw $s0, 0x0028($sp) +/* 05AF0 80B41CD0 8FBF002C */ lw $ra, 0x002C($sp) +/* 05AF4 80B41CD4 8FB00028 */ lw $s0, 0x0028($sp) /* 05AF8 80B41CD8 27BD0078 */ addiu $sp, $sp, 0x0078 ## $sp = 00000000 -/* 05AFC 80B41CDC 03E00008 */ jr $ra +/* 05AFC 80B41CDC 03E00008 */ jr $ra /* 05B00 80B41CE0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Yukabyun/EnYukabyun_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Yukabyun/EnYukabyun_Draw.s index e0d4604bdb..58412c21c8 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Yukabyun/EnYukabyun_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Yukabyun/EnYukabyun_Draw.s @@ -9,7 +9,7 @@ glabel EnYukabyun_Draw /* 0043C 80B43DFC 24C63F70 */ addiu $a2, $a2, %lo(D_80B43F70) ## $a2 = 80B43F70 /* 00440 80B43E00 27A40030 */ addiu $a0, $sp, 0x0030 ## $a0 = FFFFFFE8 /* 00444 80B43E04 2407016E */ addiu $a3, $zero, 0x016E ## $a3 = 0000016E -/* 00448 80B43E08 0C031AB1 */ jal func_800C6AC4 +/* 00448 80B43E08 0C031AB1 */ jal Graph_OpenDisps /* 0044C 80B43E0C 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 /* 00450 80B43E10 8FAF004C */ lw $t7, 0x004C($sp) /* 00454 80B43E14 0C024F46 */ jal func_80093D18 @@ -67,7 +67,7 @@ glabel EnYukabyun_Draw /* 00524 80B43EE4 24C63F98 */ addiu $a2, $a2, %lo(D_80B43F98) ## $a2 = 80B43F98 /* 00528 80B43EE8 27A40030 */ addiu $a0, $sp, 0x0030 ## $a0 = FFFFFFE8 /* 0052C 80B43EEC 2407017A */ addiu $a3, $zero, 0x017A ## $a3 = 0000017A -/* 00530 80B43EF0 0C031AD5 */ jal func_800C6B54 +/* 00530 80B43EF0 0C031AD5 */ jal Graph_CloseDisps /* 00534 80B43EF4 8D650000 */ lw $a1, 0x0000($t3) ## 00000000 /* 00538 80B43EF8 8FBF001C */ lw $ra, 0x001C($sp) /* 0053C 80B43EFC 8FB00018 */ lw $s0, 0x0018($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zf/EnZf_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Zf/EnZf_Draw.s index 6d31919576..c9d306df99 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zf/EnZf_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zf/EnZf_Draw.s @@ -1,20 +1,20 @@ glabel EnZf_Draw /* 05888 80B498D8 27BDFF80 */ addiu $sp, $sp, 0xFF80 ## $sp = FFFFFF80 -/* 0588C 80B498DC AFBF003C */ sw $ra, 0x003C($sp) -/* 05890 80B498E0 AFB10038 */ sw $s1, 0x0038($sp) -/* 05894 80B498E4 AFB00034 */ sw $s0, 0x0034($sp) -/* 05898 80B498E8 AFA50084 */ sw $a1, 0x0084($sp) +/* 0588C 80B498DC AFBF003C */ sw $ra, 0x003C($sp) +/* 05890 80B498E0 AFB10038 */ sw $s1, 0x0038($sp) +/* 05894 80B498E4 AFB00034 */ sw $s0, 0x0034($sp) +/* 05898 80B498E8 AFA50084 */ sw $a1, 0x0084($sp) /* 0589C 80B498EC 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 /* 058A0 80B498F0 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 058A4 80B498F4 3C0680B5 */ lui $a2, %hi(D_80B4A310) ## $a2 = 80B50000 /* 058A8 80B498F8 24C6A310 */ addiu $a2, $a2, %lo(D_80B4A310) ## $a2 = 80B4A310 /* 058AC 80B498FC 27A40064 */ addiu $a0, $sp, 0x0064 ## $a0 = FFFFFFE4 /* 058B0 80B49900 24070DCD */ addiu $a3, $zero, 0x0DCD ## $a3 = 00000DCD -/* 058B4 80B49904 0C031AB1 */ jal func_800C6AC4 +/* 058B4 80B49904 0C031AB1 */ jal Graph_OpenDisps /* 058B8 80B49908 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 /* 058BC 80B4990C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 058C0 80B49910 8FA50084 */ lw $a1, 0x0084($sp) -/* 058C4 80B49914 0C00BAF3 */ jal func_8002EBCC +/* 058C0 80B49910 8FA50084 */ lw $a1, 0x0084($sp) +/* 058C4 80B49914 0C00BAF3 */ jal func_8002EBCC /* 058C8 80B49918 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 /* 058CC 80B4991C 3C0480B5 */ lui $a0, %hi(D_80B4A2F8) ## $a0 = 80B50000 /* 058D0 80B49920 3C0FD700 */ lui $t7, 0xD700 ## $t7 = D7000000 @@ -29,7 +29,7 @@ glabel EnZf_Draw /* 058F4 80B49944 844906D4 */ lh $t1, 0x06D4($v0) ## 801606D4 /* 058F8 80B49948 240100FF */ addiu $at, $zero, 0x00FF ## $at = 000000FF /* 058FC 80B4994C 3319FFFF */ andi $t9, $t8, 0xFFFF ## $t9 = 00000000 -/* 05900 80B49950 00095400 */ sll $t2, $t1, 16 +/* 05900 80B49950 00095400 */ sll $t2, $t1, 16 /* 05904 80B49954 032A5825 */ or $t3, $t9, $t2 ## $t3 = 00000000 /* 05908 80B49958 AC8B0004 */ sw $t3, 0x0004($a0) ## 80B4A2FC /* 0590C 80B4995C 8E2202C0 */ lw $v0, 0x02C0($s1) ## 000002C0 @@ -38,11 +38,11 @@ glabel EnZf_Draw /* 05918 80B49968 AC440004 */ sw $a0, 0x0004($v0) ## 80160004 /* 0591C 80B4996C AC4D0000 */ sw $t5, 0x0000($v0) ## 80160000 /* 05920 80B49970 920E0404 */ lbu $t6, 0x0404($s0) ## 00000404 -/* 05924 80B49974 8FAF0084 */ lw $t7, 0x0084($sp) -/* 05928 80B49978 8FA90084 */ lw $t1, 0x0084($sp) -/* 0592C 80B4997C 15C10047 */ bne $t6, $at, .L80B49A9C +/* 05924 80B49974 8FAF0084 */ lw $t7, 0x0084($sp) +/* 05928 80B49978 8FA90084 */ lw $t1, 0x0084($sp) +/* 0592C 80B4997C 15C10047 */ bne $t6, $at, .L80B49A9C /* 05930 80B49980 00000000 */ nop -/* 05934 80B49984 0C024F46 */ jal func_80093D18 +/* 05934 80B49984 0C024F46 */ jal func_80093D18 /* 05938 80B49988 8DE40000 */ lw $a0, 0x0000($t7) ## D7000002 /* 0593C 80B4998C 8E2202C0 */ lw $v0, 0x02C0($s1) ## 000002C0 /* 05940 80B49990 3C08FB00 */ lui $t0, 0xFB00 ## $t0 = FB000000 @@ -64,18 +64,18 @@ glabel EnZf_Draw /* 05980 80B499D0 8E06016C */ lw $a2, 0x016C($s0) ## 0000016C /* 05984 80B499D4 8E050150 */ lw $a1, 0x0150($s0) ## 00000150 /* 05988 80B499D8 25AD9688 */ addiu $t5, $t5, %lo(func_80B49688) ## $t5 = 80B49688 -/* 0598C 80B499DC AFAD0010 */ sw $t5, 0x0010($sp) -/* 05990 80B499E0 AFB00014 */ sw $s0, 0x0014($sp) +/* 0598C 80B499DC AFAD0010 */ sw $t5, 0x0010($sp) +/* 05990 80B499E0 AFB00014 */ sw $s0, 0x0014($sp) /* 05994 80B499E4 8E2E02C0 */ lw $t6, 0x02C0($s1) ## 000002C0 /* 05998 80B499E8 3C0780B5 */ lui $a3, %hi(func_80B495FC) ## $a3 = 80B50000 /* 0599C 80B499EC 24E795FC */ addiu $a3, $a3, %lo(func_80B495FC) ## $a3 = 80B495FC -/* 059A0 80B499F0 8FA40084 */ lw $a0, 0x0084($sp) -/* 059A4 80B499F4 0C0288A2 */ jal func_800A2288 -/* 059A8 80B499F8 AFAE0018 */ sw $t6, 0x0018($sp) +/* 059A0 80B499F0 8FA40084 */ lw $a0, 0x0084($sp) +/* 059A4 80B499F4 0C0288A2 */ jal SkelAnime_Draw2 +/* 059A8 80B499F8 AFAE0018 */ sw $t6, 0x0018($sp) /* 059AC 80B499FC AE2202C0 */ sw $v0, 0x02C0($s1) ## 000002C0 /* 059B0 80B49A00 860F03F6 */ lh $t7, 0x03F6($s0) ## 000003F6 -/* 059B4 80B49A04 51E0004B */ beql $t7, $zero, .L80B49B34 -/* 059B8 80B49A08 8FAA0084 */ lw $t2, 0x0084($sp) +/* 059B4 80B49A04 51E0004B */ beql $t7, $zero, .L80B49B34 +/* 059B8 80B49A08 8FAA0084 */ lw $t2, 0x0084($sp) /* 059BC 80B49A0C 860903F6 */ lh $t1, 0x03F6($s0) ## 000003F6 /* 059C0 80B49A10 92180114 */ lbu $t8, 0x0114($s0) ## 00000114 /* 059C4 80B49A14 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 @@ -85,35 +85,35 @@ glabel EnZf_Draw /* 059D4 80B49A24 27080001 */ addiu $t0, $t8, 0x0001 ## $t0 = 00000001 /* 059D8 80B49A28 A2080114 */ sb $t0, 0x0114($s0) ## 00000114 /* 059DC 80B49A2C 306A0003 */ andi $t2, $v1, 0x0003 ## $t2 = 00000000 -/* 059E0 80B49A30 1540003F */ bne $t2, $zero, .L80B49B30 -/* 059E4 80B49A34 00031083 */ sra $v0, $v1, 2 -/* 059E8 80B49A38 00025880 */ sll $t3, $v0, 2 -/* 059EC 80B49A3C 01625823 */ subu $t3, $t3, $v0 +/* 059E0 80B49A30 1540003F */ bne $t2, $zero, .L80B49B30 +/* 059E4 80B49A34 00031083 */ sra $v0, $v1, 2 +/* 059E8 80B49A38 00025880 */ sll $t3, $v0, 2 +/* 059EC 80B49A3C 01625823 */ subu $t3, $t3, $v0 /* 059F0 80B49A40 3C0180B5 */ lui $at, %hi(D_80B4A444) ## $at = 80B50000 -/* 059F4 80B49A44 C424A444 */ lwc1 $f4, %lo(D_80B4A444)($at) -/* 059F8 80B49A48 000B5880 */ sll $t3, $t3, 2 -/* 059FC 80B49A4C 020B3021 */ addu $a2, $s0, $t3 +/* 059F4 80B49A44 C424A444 */ lwc1 $f4, %lo(D_80B4A444)($at) +/* 059F8 80B49A48 000B5880 */ sll $t3, $t3, 2 +/* 059FC 80B49A4C 020B3021 */ addu $a2, $s0, $t3 /* 05A00 80B49A50 240C0096 */ addiu $t4, $zero, 0x0096 ## $t4 = 00000096 /* 05A04 80B49A54 240D0096 */ addiu $t5, $zero, 0x0096 ## $t5 = 00000096 /* 05A08 80B49A58 240E00FA */ addiu $t6, $zero, 0x00FA ## $t6 = 000000FA /* 05A0C 80B49A5C 240F00EB */ addiu $t7, $zero, 0x00EB ## $t7 = 000000EB /* 05A10 80B49A60 241800F5 */ addiu $t8, $zero, 0x00F5 ## $t8 = 000000F5 /* 05A14 80B49A64 240800FF */ addiu $t0, $zero, 0x00FF ## $t0 = 000000FF -/* 05A18 80B49A68 AFA80024 */ sw $t0, 0x0024($sp) -/* 05A1C 80B49A6C AFB80020 */ sw $t8, 0x0020($sp) -/* 05A20 80B49A70 AFAF001C */ sw $t7, 0x001C($sp) -/* 05A24 80B49A74 AFAE0018 */ sw $t6, 0x0018($sp) -/* 05A28 80B49A78 AFAD0014 */ sw $t5, 0x0014($sp) -/* 05A2C 80B49A7C AFAC0010 */ sw $t4, 0x0010($sp) +/* 05A18 80B49A68 AFA80024 */ sw $t0, 0x0024($sp) +/* 05A1C 80B49A6C AFB80020 */ sw $t8, 0x0020($sp) +/* 05A20 80B49A70 AFAF001C */ sw $t7, 0x001C($sp) +/* 05A24 80B49A74 AFAE0018 */ sw $t6, 0x0018($sp) +/* 05A28 80B49A78 AFAD0014 */ sw $t5, 0x0014($sp) +/* 05A2C 80B49A7C AFAC0010 */ sw $t4, 0x0010($sp) /* 05A30 80B49A80 24C604FC */ addiu $a2, $a2, 0x04FC ## $a2 = 000004FC -/* 05A34 80B49A84 8FA40084 */ lw $a0, 0x0084($sp) +/* 05A34 80B49A84 8FA40084 */ lw $a0, 0x0084($sp) /* 05A38 80B49A88 24070096 */ addiu $a3, $zero, 0x0096 ## $a3 = 00000096 -/* 05A3C 80B49A8C 0C00A850 */ jal func_8002A140 -/* 05A40 80B49A90 E7A40028 */ swc1 $f4, 0x0028($sp) -/* 05A44 80B49A94 10000027 */ beq $zero, $zero, .L80B49B34 -/* 05A48 80B49A98 8FAA0084 */ lw $t2, 0x0084($sp) +/* 05A3C 80B49A8C 0C00A850 */ jal func_8002A140 +/* 05A40 80B49A90 E7A40028 */ swc1 $f4, 0x0028($sp) +/* 05A44 80B49A94 10000027 */ beq $zero, $zero, .L80B49B34 +/* 05A48 80B49A98 8FAA0084 */ lw $t2, 0x0084($sp) .L80B49A9C: -/* 05A4C 80B49A9C 0C024F61 */ jal func_80093D84 +/* 05A4C 80B49A9C 0C024F61 */ jal func_80093D84 /* 05A50 80B49AA0 8D240000 */ lw $a0, 0x0000($t1) ## 00000000 /* 05A54 80B49AA4 8E2202D0 */ lw $v0, 0x02D0($s1) ## 000002D0 /* 05A58 80B49AA8 3C0AE700 */ lui $t2, 0xE700 ## $t2 = E7000000 @@ -141,28 +141,28 @@ glabel EnZf_Draw /* 05AB0 80B49B00 AC580000 */ sw $t8, 0x0000($v0) ## 00000000 /* 05AB4 80B49B04 8E06016C */ lw $a2, 0x016C($s0) ## 0000016C /* 05AB8 80B49B08 8E050150 */ lw $a1, 0x0150($s0) ## 00000150 -/* 05ABC 80B49B0C AFB00014 */ sw $s0, 0x0014($sp) -/* 05AC0 80B49B10 AFA90010 */ sw $t1, 0x0010($sp) +/* 05ABC 80B49B0C AFB00014 */ sw $s0, 0x0014($sp) +/* 05AC0 80B49B10 AFA90010 */ sw $t1, 0x0010($sp) /* 05AC4 80B49B14 8E3902D0 */ lw $t9, 0x02D0($s1) ## 000002D0 /* 05AC8 80B49B18 3C0780B5 */ lui $a3, %hi(func_80B495FC) ## $a3 = 80B50000 /* 05ACC 80B49B1C 24E795FC */ addiu $a3, $a3, %lo(func_80B495FC) ## $a3 = 80B495FC -/* 05AD0 80B49B20 8FA40084 */ lw $a0, 0x0084($sp) -/* 05AD4 80B49B24 0C0288A2 */ jal func_800A2288 -/* 05AD8 80B49B28 AFB90018 */ sw $t9, 0x0018($sp) +/* 05AD0 80B49B20 8FA40084 */ lw $a0, 0x0084($sp) +/* 05AD4 80B49B24 0C0288A2 */ jal SkelAnime_Draw2 +/* 05AD8 80B49B28 AFB90018 */ sw $t9, 0x0018($sp) /* 05ADC 80B49B2C AE2202D0 */ sw $v0, 0x02D0($s1) ## 000002D0 .L80B49B30: -/* 05AE0 80B49B30 8FAA0084 */ lw $t2, 0x0084($sp) +/* 05AE0 80B49B30 8FAA0084 */ lw $t2, 0x0084($sp) .L80B49B34: /* 05AE4 80B49B34 3C0680B5 */ lui $a2, %hi(D_80B4A320) ## $a2 = 80B50000 /* 05AE8 80B49B38 24C6A320 */ addiu $a2, $a2, %lo(D_80B4A320) ## $a2 = 80B4A320 /* 05AEC 80B49B3C 27A40064 */ addiu $a0, $sp, 0x0064 ## $a0 = FFFFFFE4 /* 05AF0 80B49B40 24070E11 */ addiu $a3, $zero, 0x0E11 ## $a3 = 00000E11 -/* 05AF4 80B49B44 0C031AD5 */ jal func_800C6B54 +/* 05AF4 80B49B44 0C031AD5 */ jal Graph_CloseDisps /* 05AF8 80B49B48 8D450000 */ lw $a1, 0x0000($t2) ## 00000000 -/* 05AFC 80B49B4C 8FBF003C */ lw $ra, 0x003C($sp) -/* 05B00 80B49B50 8FB00034 */ lw $s0, 0x0034($sp) -/* 05B04 80B49B54 8FB10038 */ lw $s1, 0x0038($sp) -/* 05B08 80B49B58 03E00008 */ jr $ra +/* 05AFC 80B49B4C 8FBF003C */ lw $ra, 0x003C($sp) +/* 05B00 80B49B50 8FB00034 */ lw $s0, 0x0034($sp) +/* 05B04 80B49B54 8FB10038 */ lw $s1, 0x0038($sp) +/* 05B08 80B49B58 03E00008 */ jr $ra /* 05B0C 80B49B5C 27BD0080 */ addiu $sp, $sp, 0x0080 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B450AC.s b/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B450AC.s index bc7a5dab7c..08a70e91c0 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B450AC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B450AC.s @@ -1,38 +1,38 @@ glabel func_80B450AC /* 0105C 80B450AC 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 01060 80B450B0 AFB00028 */ sw $s0, 0x0028($sp) +/* 01060 80B450B0 AFB00028 */ sw $s0, 0x0028($sp) /* 01064 80B450B4 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 01068 80B450B8 AFBF002C */ sw $ra, 0x002C($sp) +/* 01068 80B450B8 AFBF002C */ sw $ra, 0x002C($sp) /* 0106C 80B450BC 3C040601 */ lui $a0, 0x0601 ## $a0 = 06010000 /* 01070 80B450C0 0C028800 */ jal SkelAnime_GetFrameCount - + /* 01074 80B450C4 24849530 */ addiu $a0, $a0, 0x9530 ## $a0 = 06009530 /* 01078 80B450C8 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 0107C 80B450CC 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 /* 01080 80B450D0 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 -/* 01084 80B450D4 468021A0 */ cvt.s.w $f6, $f4 -/* 01088 80B450D8 44060000 */ mfc1 $a2, $f0 +/* 01084 80B450D4 468021A0 */ cvt.s.w $f6, $f4 +/* 01088 80B450D8 44060000 */ mfc1 $a2, $f0 /* 0108C 80B450DC 24A59530 */ addiu $a1, $a1, 0x9530 ## $a1 = 06009530 /* 01090 80B450E0 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C /* 01094 80B450E4 3C074110 */ lui $a3, 0x4110 ## $a3 = 41100000 -/* 01098 80B450E8 AFA00014 */ sw $zero, 0x0014($sp) -/* 0109C 80B450EC E7A60010 */ swc1 $f6, 0x0010($sp) -/* 010A0 80B450F0 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 010A4 80B450F4 E7A00018 */ swc1 $f0, 0x0018($sp) +/* 01098 80B450E8 AFA00014 */ sw $zero, 0x0014($sp) +/* 0109C 80B450EC E7A60010 */ swc1 $f6, 0x0010($sp) +/* 010A0 80B450F0 0C029468 */ jal SkelAnime_ChangeAnim + +/* 010A4 80B450F4 E7A00018 */ swc1 $f0, 0x0018($sp) /* 010A8 80B450F8 3C014396 */ lui $at, 0x4396 ## $at = 43960000 /* 010AC 80B450FC 44815000 */ mtc1 $at, $f10 ## $f10 = 300.00 /* 010B0 80B45100 C6080080 */ lwc1 $f8, 0x0080($s0) ## 00000080 /* 010B4 80B45104 96190088 */ lhu $t9, 0x0088($s0) ## 00000088 /* 010B8 80B45108 8E090004 */ lw $t1, 0x0004($s0) ## 00000004 -/* 010BC 80B4510C 460A4400 */ add.s $f16, $f8, $f10 +/* 010BC 80B4510C 460A4400 */ add.s $f16, $f8, $f10 /* 010C0 80B45110 8602008A */ lh $v0, 0x008A($s0) ## 0000008A /* 010C4 80B45114 2401FFFE */ addiu $at, $zero, 0xFFFE ## $at = FFFFFFFE /* 010C8 80B45118 240F000A */ addiu $t7, $zero, 0x000A ## $t7 = 0000000A /* 010CC 80B4511C 24180001 */ addiu $t8, $zero, 0x0001 ## $t8 = 00000001 /* 010D0 80B45120 3C0580B4 */ lui $a1, %hi(func_80B45174) ## $a1 = 80B40000 /* 010D4 80B45124 3328FFFD */ andi $t0, $t9, 0xFFFD ## $t0 = 00000000 -/* 010D8 80B45128 01215024 */ and $t2, $t1, $at +/* 010D8 80B45128 01215024 */ and $t2, $t1, $at /* 010DC 80B4512C E6100028 */ swc1 $f16, 0x0028($s0) ## 00000028 /* 010E0 80B45130 A20000C8 */ sb $zero, 0x00C8($s0) ## 000000C8 /* 010E4 80B45134 A2000404 */ sb $zero, 0x0404($s0) ## 00000404 @@ -44,12 +44,12 @@ glabel func_80B450AC /* 010FC 80B4514C 24A55174 */ addiu $a1, $a1, %lo(func_80B45174) ## $a1 = 80B45174 /* 01100 80B45150 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 01104 80B45154 A6020032 */ sh $v0, 0x0032($s0) ## 00000032 -/* 01108 80B45158 0C2D1014 */ jal func_80B44050 +/* 01108 80B45158 0C2D1014 */ jal func_80B44050 /* 0110C 80B4515C A60200B6 */ sh $v0, 0x00B6($s0) ## 000000B6 -/* 01110 80B45160 8FBF002C */ lw $ra, 0x002C($sp) -/* 01114 80B45164 8FB00028 */ lw $s0, 0x0028($sp) +/* 01110 80B45160 8FBF002C */ lw $ra, 0x002C($sp) +/* 01114 80B45164 8FB00028 */ lw $s0, 0x0028($sp) /* 01118 80B45168 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 0111C 80B4516C 03E00008 */ jr $ra +/* 0111C 80B4516C 03E00008 */ jr $ra /* 01120 80B45170 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B45174.s b/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B45174.s index 199191a0a6..10cb60538f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B45174.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B45174.s @@ -1,91 +1,91 @@ glabel func_80B45174 /* 01124 80B45174 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 01128 80B45178 AFBF0034 */ sw $ra, 0x0034($sp) -/* 0112C 80B4517C AFB00030 */ sw $s0, 0x0030($sp) -/* 01130 80B45180 AFA5003C */ sw $a1, 0x003C($sp) +/* 01128 80B45178 AFBF0034 */ sw $ra, 0x0034($sp) +/* 0112C 80B4517C AFB00030 */ sw $s0, 0x0030($sp) +/* 01130 80B45180 AFA5003C */ sw $a1, 0x003C($sp) /* 01134 80B45184 8C8E03F0 */ lw $t6, 0x03F0($a0) ## 000003F0 /* 01138 80B45188 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 /* 0113C 80B4518C 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 01140 80B45190 55C1000B */ bnel $t6, $at, .L80B451C0 +/* 01140 80B45190 55C1000B */ bnel $t6, $at, .L80B451C0 /* 01144 80B45194 8E0203F0 */ lw $v0, 0x03F0($s0) ## 000003F0 /* 01148 80B45198 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 0114C 80B4519C 24053829 */ addiu $a1, $zero, 0x3829 ## $a1 = 00003829 /* 01150 80B451A0 8E0F0004 */ lw $t7, 0x0004($s0) ## 00000004 /* 01154 80B451A4 8619001C */ lh $t9, 0x001C($s0) ## 0000001C /* 01158 80B451A8 35F80001 */ ori $t8, $t7, 0x0001 ## $t8 = 00000001 -/* 0115C 80B451AC 17200003 */ bne $t9, $zero, .L80B451BC +/* 0115C 80B451AC 17200003 */ bne $t9, $zero, .L80B451BC /* 01160 80B451B0 AE180004 */ sw $t8, 0x0004($s0) ## 00000004 -/* 01164 80B451B4 0C03D6B3 */ jal func_800F5ACC +/* 01164 80B451B4 0C03D6B3 */ jal func_800F5ACC /* 01168 80B451B8 24040038 */ addiu $a0, $zero, 0x0038 ## $a0 = 00000038 .L80B451BC: /* 0116C 80B451BC 8E0203F0 */ lw $v0, 0x03F0($s0) ## 000003F0 .L80B451C0: -/* 01170 80B451C0 5040001D */ beql $v0, $zero, .L80B45238 +/* 01170 80B451C0 5040001D */ beql $v0, $zero, .L80B45238 /* 01174 80B451C4 92020404 */ lbu $v0, 0x0404($s0) ## 00000404 /* 01178 80B451C8 8608001C */ lh $t0, 0x001C($s0) ## 0000001C /* 0117C 80B451CC 2401FFFF */ addiu $at, $zero, 0xFFFF ## $at = FFFFFFFF /* 01180 80B451D0 2449FFFF */ addiu $t1, $v0, 0xFFFF ## $t1 = FFFFFFFF -/* 01184 80B451D4 51010004 */ beql $t0, $at, .L80B451E8 +/* 01184 80B451D4 51010004 */ beql $t0, $at, .L80B451E8 /* 01188 80B451D8 3C014320 */ lui $at, 0x4320 ## $at = 43200000 -/* 0118C 80B451DC 1000000F */ beq $zero, $zero, .L80B4521C +/* 0118C 80B451DC 1000000F */ beq $zero, $zero, .L80B4521C /* 01190 80B451E0 AE0903F0 */ sw $t1, 0x03F0($s0) ## 000003F0 /* 01194 80B451E4 3C014320 */ lui $at, 0x4320 ## $at = 43200000 .L80B451E8: /* 01198 80B451E8 44812000 */ mtc1 $at, $f4 ## $f4 = 160.00 /* 0119C 80B451EC C6060090 */ lwc1 $f6, 0x0090($s0) ## 00000090 /* 011A0 80B451F0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 011A4 80B451F4 4604303E */ c.le.s $f6, $f4 +/* 011A4 80B451F4 4604303E */ c.le.s $f6, $f4 /* 011A8 80B451F8 00000000 */ nop -/* 011AC 80B451FC 45020008 */ bc1fl .L80B45220 +/* 011AC 80B451FC 45020008 */ bc1fl .L80B45220 /* 011B0 80B45200 3C014396 */ lui $at, 0x4396 ## $at = 43960000 /* 011B4 80B45204 8E0A0004 */ lw $t2, 0x0004($s0) ## 00000004 /* 011B8 80B45208 AE0003F0 */ sw $zero, 0x03F0($s0) ## 000003F0 /* 011BC 80B4520C 24053829 */ addiu $a1, $zero, 0x3829 ## $a1 = 00003829 /* 011C0 80B45210 354B0001 */ ori $t3, $t2, 0x0001 ## $t3 = 00000001 /* 011C4 80B45214 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 011C8 80B45218 AE0B0004 */ sw $t3, 0x0004($s0) ## 00000004 .L80B4521C: /* 011CC 80B4521C 3C014396 */ lui $at, 0x4396 ## $at = 43960000 .L80B45220: /* 011D0 80B45220 44815000 */ mtc1 $at, $f10 ## $f10 = 300.00 /* 011D4 80B45224 C6080080 */ lwc1 $f8, 0x0080($s0) ## 00000080 -/* 011D8 80B45228 460A4400 */ add.s $f16, $f8, $f10 -/* 011DC 80B4522C 10000006 */ beq $zero, $zero, .L80B45248 +/* 011D8 80B45228 460A4400 */ add.s $f16, $f8, $f10 +/* 011DC 80B4522C 10000006 */ beq $zero, $zero, .L80B45248 /* 011E0 80B45230 E6100028 */ swc1 $f16, 0x0028($s0) ## 00000028 /* 011E4 80B45234 92020404 */ lbu $v0, 0x0404($s0) ## 00000404 .L80B45238: -/* 011E8 80B45238 284100FF */ slti $at, $v0, 0x00FF -/* 011EC 80B4523C 10200002 */ beq $at, $zero, .L80B45248 +/* 011E8 80B45238 284100FF */ slti $at, $v0, 0x00FF +/* 011EC 80B4523C 10200002 */ beq $at, $zero, .L80B45248 /* 011F0 80B45240 244C0033 */ addiu $t4, $v0, 0x0033 ## $t4 = 00000033 /* 011F4 80B45244 A20C0404 */ sb $t4, 0x0404($s0) ## 00000404 .L80B45248: /* 011F8 80B45248 960D0088 */ lhu $t5, 0x0088($s0) ## 00000088 /* 011FC 80B4524C 31AE0003 */ andi $t6, $t5, 0x0003 ## $t6 = 00000000 -/* 01200 80B45250 11C00036 */ beq $t6, $zero, .L80B4532C +/* 01200 80B45250 11C00036 */ beq $t6, $zero, .L80B4532C /* 01204 80B45254 00000000 */ nop /* 01208 80B45258 8E0F03E4 */ lw $t7, 0x03E4($s0) ## 000003E4 /* 0120C 80B4525C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01210 80B45260 11E00032 */ beq $t7, $zero, .L80B4532C +/* 01210 80B45260 11E00032 */ beq $t7, $zero, .L80B4532C /* 01214 80B45264 00000000 */ nop /* 01218 80B45268 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 0121C 80B4526C 24053828 */ addiu $a1, $zero, 0x3828 ## $a1 = 00003828 /* 01220 80B45270 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 /* 01224 80B45274 3C014188 */ lui $at, 0x4188 ## $at = 41880000 /* 01228 80B45278 44819000 */ mtc1 $at, $f18 ## $f18 = 17.00 /* 0122C 80B4527C 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 /* 01230 80B45280 24180002 */ addiu $t8, $zero, 0x0002 ## $t8 = 00000002 -/* 01234 80B45284 44070000 */ mfc1 $a3, $f0 -/* 01238 80B45288 AFB80014 */ sw $t8, 0x0014($sp) +/* 01234 80B45284 44070000 */ mfc1 $a3, $f0 +/* 01238 80B45288 AFB80014 */ sw $t8, 0x0014($sp) /* 0123C 80B4528C 24A58C6C */ addiu $a1, $a1, 0x8C6C ## $a1 = 06008C6C /* 01240 80B45290 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C /* 01244 80B45294 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 01248 80B45298 E7A00018 */ swc1 $f0, 0x0018($sp) -/* 0124C 80B4529C 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 01250 80B452A0 E7B20010 */ swc1 $f18, 0x0010($sp) +/* 01248 80B45298 E7A00018 */ swc1 $f0, 0x0018($sp) +/* 0124C 80B4529C 0C029468 */ jal SkelAnime_ChangeAnim + +/* 01250 80B452A0 E7B20010 */ swc1 $f18, 0x0010($sp) /* 01254 80B452A4 96190088 */ lhu $t9, 0x0088($s0) ## 00000088 /* 01258 80B452A8 C6040080 */ lwc1 $f4, 0x0080($s0) ## 00000080 /* 0125C 80B452AC 44803000 */ mtc1 $zero, $f6 ## $f6 = 0.00 @@ -97,54 +97,54 @@ glabel func_80B45174 /* 01274 80B452C4 3C014000 */ lui $at, 0x4000 ## $at = 40000000 /* 01278 80B452C8 44814000 */ mtc1 $at, $f8 ## $f8 = 2.00 /* 0127C 80B452CC 24090002 */ addiu $t1, $zero, 0x0002 ## $t1 = 00000002 -/* 01280 80B452D0 AFA90010 */ sw $t1, 0x0010($sp) -/* 01284 80B452D4 AFA00020 */ sw $zero, 0x0020($sp) -/* 01288 80B452D8 AFA0001C */ sw $zero, 0x001C($sp) -/* 0128C 80B452DC AFA00018 */ sw $zero, 0x0018($sp) -/* 01290 80B452E0 8FA4003C */ lw $a0, 0x003C($sp) +/* 01280 80B452D0 AFA90010 */ sw $t1, 0x0010($sp) +/* 01284 80B452D4 AFA00020 */ sw $zero, 0x0020($sp) +/* 01288 80B452D8 AFA0001C */ sw $zero, 0x001C($sp) +/* 0128C 80B452DC AFA00018 */ sw $zero, 0x0018($sp) +/* 01290 80B452E0 8FA4003C */ lw $a0, 0x003C($sp) /* 01294 80B452E4 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 01298 80B452E8 260604F0 */ addiu $a2, $s0, 0x04F0 ## $a2 = 000004F0 /* 0129C 80B452EC 3C074040 */ lui $a3, 0x4040 ## $a3 = 40400000 -/* 012A0 80B452F0 0C00CC98 */ jal func_80033260 -/* 012A4 80B452F4 E7A80014 */ swc1 $f8, 0x0014($sp) +/* 012A0 80B452F0 0C00CC98 */ jal func_80033260 +/* 012A4 80B452F4 E7A80014 */ swc1 $f8, 0x0014($sp) /* 012A8 80B452F8 3C014000 */ lui $at, 0x4000 ## $at = 40000000 /* 012AC 80B452FC 44815000 */ mtc1 $at, $f10 ## $f10 = 2.00 /* 012B0 80B45300 240A0002 */ addiu $t2, $zero, 0x0002 ## $t2 = 00000002 -/* 012B4 80B45304 AFAA0010 */ sw $t2, 0x0010($sp) -/* 012B8 80B45308 8FA4003C */ lw $a0, 0x003C($sp) +/* 012B4 80B45304 AFAA0010 */ sw $t2, 0x0010($sp) +/* 012B8 80B45308 8FA4003C */ lw $a0, 0x003C($sp) /* 012BC 80B4530C 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 012C0 80B45310 260604E4 */ addiu $a2, $s0, 0x04E4 ## $a2 = 000004E4 /* 012C4 80B45314 3C074040 */ lui $a3, 0x4040 ## $a3 = 40400000 -/* 012C8 80B45318 AFA00018 */ sw $zero, 0x0018($sp) -/* 012CC 80B4531C AFA0001C */ sw $zero, 0x001C($sp) -/* 012D0 80B45320 AFA00020 */ sw $zero, 0x0020($sp) -/* 012D4 80B45324 0C00CC98 */ jal func_80033260 -/* 012D8 80B45328 E7AA0014 */ swc1 $f10, 0x0014($sp) +/* 012C8 80B45318 AFA00018 */ sw $zero, 0x0018($sp) +/* 012CC 80B4531C AFA0001C */ sw $zero, 0x001C($sp) +/* 012D0 80B45320 AFA00020 */ sw $zero, 0x0020($sp) +/* 012D4 80B45324 0C00CC98 */ jal func_80033260 +/* 012D8 80B45328 E7AA0014 */ swc1 $f10, 0x0014($sp) .L80B4532C: /* 012DC 80B4532C 0C02927F */ jal SkelAnime_FrameUpdateMatrix - + /* 012E0 80B45330 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C -/* 012E4 80B45334 5040000D */ beql $v0, $zero, .L80B4536C +/* 012E4 80B45334 5040000D */ beql $v0, $zero, .L80B4536C /* 012E8 80B45338 920D0404 */ lbu $t5, 0x0404($s0) ## 00000404 /* 012EC 80B4533C 860C001C */ lh $t4, 0x001C($s0) ## 0000001C /* 012F0 80B45340 240B00FF */ addiu $t3, $zero, 0x00FF ## $t3 = 000000FF /* 012F4 80B45344 A20B0404 */ sb $t3, 0x0404($s0) ## 00000404 -/* 012F8 80B45348 19800005 */ blez $t4, .L80B45360 +/* 012F8 80B45348 19800005 */ blez $t4, .L80B45360 /* 012FC 80B4534C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01300 80B45350 0C2D1CD8 */ jal func_80B47360 -/* 01304 80B45354 8FA5003C */ lw $a1, 0x003C($sp) -/* 01308 80B45358 10000004 */ beq $zero, $zero, .L80B4536C +/* 01300 80B45350 0C2D1CD8 */ jal func_80B47360 +/* 01304 80B45354 8FA5003C */ lw $a1, 0x003C($sp) +/* 01308 80B45358 10000004 */ beq $zero, $zero, .L80B4536C /* 0130C 80B4535C 920D0404 */ lbu $t5, 0x0404($s0) ## 00000404 .L80B45360: -/* 01310 80B45360 0C2D14E1 */ jal func_80B45384 +/* 01310 80B45360 0C2D14E1 */ jal func_80B45384 /* 01314 80B45364 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 01318 80B45368 920D0404 */ lbu $t5, 0x0404($s0) ## 00000404 .L80B4536C: /* 0131C 80B4536C A20D00C8 */ sb $t5, 0x00C8($s0) ## 000000C8 -/* 01320 80B45370 8FBF0034 */ lw $ra, 0x0034($sp) -/* 01324 80B45374 8FB00030 */ lw $s0, 0x0030($sp) +/* 01320 80B45370 8FBF0034 */ lw $ra, 0x0034($sp) +/* 01324 80B45374 8FB00030 */ lw $s0, 0x0030($sp) /* 01328 80B45378 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 -/* 0132C 80B4537C 03E00008 */ jr $ra +/* 0132C 80B4537C 03E00008 */ jr $ra /* 01330 80B45380 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B45384.s b/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B45384.s index a307c2aef2..a45c0b2e01 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B45384.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B45384.s @@ -1,27 +1,27 @@ glabel func_80B45384 /* 01334 80B45384 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 01338 80B45388 AFB00028 */ sw $s0, 0x0028($sp) +/* 01338 80B45388 AFB00028 */ sw $s0, 0x0028($sp) /* 0133C 80B4538C 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 01340 80B45390 AFBF002C */ sw $ra, 0x002C($sp) +/* 01340 80B45390 AFBF002C */ sw $ra, 0x002C($sp) /* 01344 80B45394 3C040601 */ lui $a0, 0x0601 ## $a0 = 06010000 /* 01348 80B45398 0C028800 */ jal SkelAnime_GetFrameCount - + /* 0134C 80B4539C 2484B10C */ addiu $a0, $a0, 0xB10C ## $a0 = 0600B10C /* 01350 80B453A0 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 01354 80B453A4 3C01C080 */ lui $at, 0xC080 ## $at = C0800000 /* 01358 80B453A8 44814000 */ mtc1 $at, $f8 ## $f8 = -4.00 -/* 0135C 80B453AC 468021A0 */ cvt.s.w $f6, $f4 +/* 0135C 80B453AC 468021A0 */ cvt.s.w $f6, $f4 /* 01360 80B453B0 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 /* 01364 80B453B4 240E0001 */ addiu $t6, $zero, 0x0001 ## $t6 = 00000001 -/* 01368 80B453B8 AFAE0014 */ sw $t6, 0x0014($sp) +/* 01368 80B453B8 AFAE0014 */ sw $t6, 0x0014($sp) /* 0136C 80B453BC 24A5B10C */ addiu $a1, $a1, 0xB10C ## $a1 = 0600B10C /* 01370 80B453C0 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C -/* 01374 80B453C4 E7A60010 */ swc1 $f6, 0x0010($sp) +/* 01374 80B453C4 E7A60010 */ swc1 $f6, 0x0010($sp) /* 01378 80B453C8 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 0137C 80B453CC 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 01380 80B453D0 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 01384 80B453D4 E7A80018 */ swc1 $f8, 0x0018($sp) +/* 01380 80B453D0 0C029468 */ jal SkelAnime_ChangeAnim + +/* 01384 80B453D4 E7A80018 */ swc1 $f8, 0x0018($sp) /* 01388 80B453D8 240F0003 */ addiu $t7, $zero, 0x0003 ## $t7 = 00000003 /* 0138C 80B453DC 0C03F66B */ jal Math_Rand_ZeroOne ## Rand.Next() float @@ -30,23 +30,23 @@ glabel func_80B45384 /* 01398 80B453E8 44815000 */ mtc1 $at, $f10 ## $f10 = 10.00 /* 0139C 80B453EC 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 /* 013A0 80B453F0 44819000 */ mtc1 $at, $f18 ## $f18 = 5.00 -/* 013A4 80B453F4 460A0402 */ mul.s $f16, $f0, $f10 +/* 013A4 80B453F4 460A0402 */ mul.s $f16, $f0, $f10 /* 013A8 80B453F8 44804000 */ mtc1 $zero, $f8 ## $f8 = 0.00 /* 013AC 80B453FC 860800B6 */ lh $t0, 0x00B6($s0) ## 000000B6 /* 013B0 80B45400 3C0580B4 */ lui $a1, %hi(func_80B4543C) ## $a1 = 80B40000 /* 013B4 80B45404 24A5543C */ addiu $a1, $a1, %lo(func_80B4543C) ## $a1 = 80B4543C /* 013B8 80B45408 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 013BC 80B4540C E6080068 */ swc1 $f8, 0x0068($s0) ## 00000068 -/* 013C0 80B45410 46128100 */ add.s $f4, $f16, $f18 +/* 013C0 80B45410 46128100 */ add.s $f4, $f16, $f18 /* 013C4 80B45414 A6080032 */ sh $t0, 0x0032($s0) ## 00000032 -/* 013C8 80B45418 4600218D */ trunc.w.s $f6, $f4 -/* 013CC 80B4541C 44193000 */ mfc1 $t9, $f6 -/* 013D0 80B45420 0C2D1014 */ jal func_80B44050 +/* 013C8 80B45418 4600218D */ trunc.w.s $f6, $f4 +/* 013CC 80B4541C 44193000 */ mfc1 $t9, $f6 +/* 013D0 80B45420 0C2D1014 */ jal func_80B44050 /* 013D4 80B45424 AE1903F0 */ sw $t9, 0x03F0($s0) ## 000003F0 -/* 013D8 80B45428 8FBF002C */ lw $ra, 0x002C($sp) -/* 013DC 80B4542C 8FB00028 */ lw $s0, 0x0028($sp) +/* 013D8 80B45428 8FBF002C */ lw $ra, 0x002C($sp) +/* 013DC 80B4542C 8FB00028 */ lw $s0, 0x0028($sp) /* 013E0 80B45430 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 013E4 80B45434 03E00008 */ jr $ra +/* 013E4 80B45434 03E00008 */ jr $ra /* 013E8 80B45438 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B456B4.s b/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B456B4.s index 666bbc6068..bd0c19c2e4 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B456B4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B456B4.s @@ -1,27 +1,27 @@ glabel func_80B456B4 /* 01664 80B456B4 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 01668 80B456B8 AFB00018 */ sw $s0, 0x0018($sp) -/* 0166C 80B456BC AFA5002C */ sw $a1, 0x002C($sp) +/* 01668 80B456B8 AFB00018 */ sw $s0, 0x0018($sp) +/* 0166C 80B456BC AFA5002C */ sw $a1, 0x002C($sp) /* 01670 80B456C0 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 01674 80B456C4 AFBF001C */ sw $ra, 0x001C($sp) +/* 01674 80B456C4 AFBF001C */ sw $ra, 0x001C($sp) /* 01678 80B456C8 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 /* 0167C 80B456CC 24A58138 */ addiu $a1, $a1, 0x8138 ## $a1 = 06008138 /* 01680 80B456D0 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 01684 80B456D4 0C0294D3 */ jal func_800A534C +/* 01684 80B456D4 0C0294D3 */ jal SkelAnime_ChangeAnimTransitionRepeat /* 01688 80B456D8 3C06C080 */ lui $a2, 0xC080 ## $a2 = C0800000 /* 0168C 80B456DC 860F001C */ lh $t7, 0x001C($s0) ## 0000001C /* 01690 80B456E0 240E0005 */ addiu $t6, $zero, 0x0005 ## $t6 = 00000005 /* 01694 80B456E4 AE0E03DC */ sw $t6, 0x03DC($s0) ## 000003DC -/* 01698 80B456E8 05E0000C */ bltz $t7, .L80B4571C +/* 01698 80B456E8 05E0000C */ bltz $t7, .L80B4571C /* 0169C 80B456EC 26040024 */ addiu $a0, $s0, 0x0024 ## $a0 = 00000024 /* 016A0 80B456F0 860503FE */ lh $a1, 0x03FE($s0) ## 000003FE -/* 016A4 80B456F4 0C2D11AA */ jal func_80B446A8 -/* 016A8 80B456F8 AFA40024 */ sw $a0, 0x0024($sp) -/* 016AC 80B456FC 8FA40024 */ lw $a0, 0x0024($sp) +/* 016A4 80B456F4 0C2D11AA */ jal func_80B446A8 +/* 016A8 80B456F8 AFA40024 */ sw $a0, 0x0024($sp) +/* 016AC 80B456FC 8FA40024 */ lw $a0, 0x0024($sp) /* 016B0 80B45700 A60203FE */ sh $v0, 0x03FE($s0) ## 000003FE -/* 016B4 80B45704 8FA7002C */ lw $a3, 0x002C($sp) +/* 016B4 80B45704 8FA7002C */ lw $a3, 0x002C($sp) /* 016B8 80B45708 860503FE */ lh $a1, 0x03FE($s0) ## 000003FE -/* 016BC 80B4570C 0C2D12C5 */ jal func_80B44B14 +/* 016BC 80B4570C 0C2D12C5 */ jal func_80B44B14 /* 016C0 80B45710 86060400 */ lh $a2, 0x0400($s0) ## 00000400 /* 016C4 80B45714 A6020402 */ sh $v0, 0x0402($s0) ## 00000402 /* 016C8 80B45718 AE0003E4 */ sw $zero, 0x03E4($s0) ## 000003E4 @@ -30,12 +30,12 @@ glabel func_80B456B4 /* 016D0 80B45720 3C0580B4 */ lui $a1, %hi(func_80B45748) ## $a1 = 80B40000 /* 016D4 80B45724 24A55748 */ addiu $a1, $a1, %lo(func_80B45748) ## $a1 = 80B45748 /* 016D8 80B45728 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 016DC 80B4572C 0C2D1014 */ jal func_80B44050 +/* 016DC 80B4572C 0C2D1014 */ jal func_80B44050 /* 016E0 80B45730 E6040068 */ swc1 $f4, 0x0068($s0) ## 00000068 -/* 016E4 80B45734 8FBF001C */ lw $ra, 0x001C($sp) -/* 016E8 80B45738 8FB00018 */ lw $s0, 0x0018($sp) +/* 016E4 80B45734 8FBF001C */ lw $ra, 0x001C($sp) +/* 016E8 80B45738 8FB00018 */ lw $s0, 0x0018($sp) /* 016EC 80B4573C 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 016F0 80B45740 03E00008 */ jr $ra +/* 016F0 80B45740 03E00008 */ jr $ra /* 016F4 80B45744 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B45E30.s b/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B45E30.s index 758cffdae6..a90ae6ad86 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B45E30.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B45E30.s @@ -4,31 +4,31 @@ glabel func_80B45E30 /* 01DE8 80B45E38 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 /* 01DEC 80B45E3C 3C01C040 */ lui $at, 0xC040 ## $at = C0400000 /* 01DF0 80B45E40 44813000 */ mtc1 $at, $f6 ## $f6 = -3.00 -/* 01DF4 80B45E44 AFB00028 */ sw $s0, 0x0028($sp) +/* 01DF4 80B45E44 AFB00028 */ sw $s0, 0x0028($sp) /* 01DF8 80B45E48 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 01DFC 80B45E4C AFBF002C */ sw $ra, 0x002C($sp) +/* 01DFC 80B45E4C AFBF002C */ sw $ra, 0x002C($sp) /* 01E00 80B45E50 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 /* 01E04 80B45E54 240E0002 */ addiu $t6, $zero, 0x0002 ## $t6 = 00000002 -/* 01E08 80B45E58 AFAE0014 */ sw $t6, 0x0014($sp) +/* 01E08 80B45E58 AFAE0014 */ sw $t6, 0x0014($sp) /* 01E0C 80B45E5C 24A59530 */ addiu $a1, $a1, 0x9530 ## $a1 = 06009530 /* 01E10 80B45E60 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C /* 01E14 80B45E64 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 01E18 80B45E68 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 01E1C 80B45E6C E7A40010 */ swc1 $f4, 0x0010($sp) -/* 01E20 80B45E70 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 01E24 80B45E74 E7A60018 */ swc1 $f6, 0x0018($sp) +/* 01E1C 80B45E6C E7A40010 */ swc1 $f4, 0x0010($sp) +/* 01E20 80B45E70 0C029468 */ jal SkelAnime_ChangeAnim + +/* 01E24 80B45E74 E7A60018 */ swc1 $f6, 0x0018($sp) /* 01E28 80B45E78 8618001C */ lh $t8, 0x001C($s0) ## 0000001C /* 01E2C 80B45E7C 3C014170 */ lui $at, 0x4170 ## $at = 41700000 /* 01E30 80B45E80 44814000 */ mtc1 $at, $f8 ## $f8 = 15.00 /* 01E34 80B45E84 240F0001 */ addiu $t7, $zero, 0x0001 ## $t7 = 00000001 /* 01E38 80B45E88 AE0003F0 */ sw $zero, 0x03F0($s0) ## 000003F0 /* 01E3C 80B45E8C AE0F03E4 */ sw $t7, 0x03E4($s0) ## 000003E4 -/* 01E40 80B45E90 07000005 */ bltz $t8, .L80B45EA8 +/* 01E40 80B45E90 07000005 */ bltz $t8, .L80B45EA8 /* 01E44 80B45E94 E6080060 */ swc1 $f8, 0x0060($s0) ## 00000060 /* 01E48 80B45E98 3C014180 */ lui $at, 0x4180 ## $at = 41800000 /* 01E4C 80B45E9C 44815000 */ mtc1 $at, $f10 ## $f10 = 16.00 -/* 01E50 80B45EA0 10000005 */ beq $zero, $zero, .L80B45EB8 +/* 01E50 80B45EA0 10000005 */ beq $zero, $zero, .L80B45EB8 /* 01E54 80B45EA4 E60A0068 */ swc1 $f10, 0x0068($s0) ## 00000068 .L80B45EA8: /* 01E58 80B45EA8 3C014120 */ lui $at, 0x4120 ## $at = 41200000 @@ -40,16 +40,16 @@ glabel func_80B45E30 /* 01E6C 80B45EBC AE1903DC */ sw $t9, 0x03DC($s0) ## 000003DC /* 01E70 80B45EC0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 01E74 80B45EC4 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 01E78 80B45EC8 2405382F */ addiu $a1, $zero, 0x382F ## $a1 = 0000382F /* 01E7C 80B45ECC 3C0580B4 */ lui $a1, %hi(func_80B45EF0) ## $a1 = 80B40000 /* 01E80 80B45ED0 24A55EF0 */ addiu $a1, $a1, %lo(func_80B45EF0) ## $a1 = 80B45EF0 -/* 01E84 80B45ED4 0C2D1014 */ jal func_80B44050 +/* 01E84 80B45ED4 0C2D1014 */ jal func_80B44050 /* 01E88 80B45ED8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01E8C 80B45EDC 8FBF002C */ lw $ra, 0x002C($sp) -/* 01E90 80B45EE0 8FB00028 */ lw $s0, 0x0028($sp) +/* 01E8C 80B45EDC 8FBF002C */ lw $ra, 0x002C($sp) +/* 01E90 80B45EE0 8FB00028 */ lw $s0, 0x0028($sp) /* 01E94 80B45EE4 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 01E98 80B45EE8 03E00008 */ jr $ra +/* 01E98 80B45EE8 03E00008 */ jr $ra /* 01E9C 80B45EEC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B45EF0.s b/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B45EF0.s index d6bb9564fb..84789353ec 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B45EF0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B45EF0.s @@ -1,17 +1,17 @@ glabel func_80B45EF0 /* 01EA0 80B45EF0 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 01EA4 80B45EF4 AFBF002C */ sw $ra, 0x002C($sp) -/* 01EA8 80B45EF8 AFB00028 */ sw $s0, 0x0028($sp) -/* 01EAC 80B45EFC AFA5003C */ sw $a1, 0x003C($sp) +/* 01EA4 80B45EF4 AFBF002C */ sw $ra, 0x002C($sp) +/* 01EA8 80B45EF8 AFB00028 */ sw $s0, 0x0028($sp) +/* 01EAC 80B45EFC AFA5003C */ sw $a1, 0x003C($sp) /* 01EB0 80B45F00 8C8E03F0 */ lw $t6, 0x03F0($a0) ## 000003F0 /* 01EB4 80B45F04 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 01EB8 80B45F08 51C0000E */ beql $t6, $zero, .L80B45F44 +/* 01EB8 80B45F08 51C0000E */ beql $t6, $zero, .L80B45F44 /* 01EBC 80B45F0C 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C /* 01EC0 80B45F10 C4800080 */ lwc1 $f0, 0x0080($a0) ## 000001CC /* 01EC4 80B45F14 C4840028 */ lwc1 $f4, 0x0028($a0) ## 00000174 -/* 01EC8 80B45F18 4600203E */ c.le.s $f4, $f0 +/* 01EC8 80B45F18 4600203E */ c.le.s $f4, $f0 /* 01ECC 80B45F1C 00000000 */ nop -/* 01ED0 80B45F20 45020008 */ bc1fl .L80B45F44 +/* 01ED0 80B45F20 45020008 */ bc1fl .L80B45F44 /* 01ED4 80B45F24 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C /* 01ED8 80B45F28 44803000 */ mtc1 $zero, $f6 ## $f6 = 0.00 /* 01EDC 80B45F2C 44804000 */ mtc1 $zero, $f8 ## $f8 = 0.00 @@ -22,80 +22,80 @@ glabel func_80B45EF0 /* 01EF0 80B45F40 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C .L80B45F44: /* 01EF4 80B45F44 0C02927F */ jal SkelAnime_FrameUpdateMatrix - -/* 01EF8 80B45F48 AFA40034 */ sw $a0, 0x0034($sp) + +/* 01EF8 80B45F48 AFA40034 */ sw $a0, 0x0034($sp) /* 01EFC 80B45F4C 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 01F00 80B45F50 1040001C */ beq $v0, $zero, .L80B45FC4 -/* 01F04 80B45F54 8FA40034 */ lw $a0, 0x0034($sp) +/* 01F00 80B45F50 1040001C */ beq $v0, $zero, .L80B45FC4 +/* 01F04 80B45F54 8FA40034 */ lw $a0, 0x0034($sp) /* 01F08 80B45F58 8E0F03F0 */ lw $t7, 0x03F0($s0) ## 000003F0 /* 01F0C 80B45F5C 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 /* 01F10 80B45F60 24A58C6C */ addiu $a1, $a1, 0x8C6C ## $a1 = 06008C6C -/* 01F14 80B45F64 15E00012 */ bne $t7, $zero, .L80B45FB0 +/* 01F14 80B45F64 15E00012 */ bne $t7, $zero, .L80B45FB0 /* 01F18 80B45F68 3C064040 */ lui $a2, 0x4040 ## $a2 = 40400000 /* 01F1C 80B45F6C 3C014188 */ lui $at, 0x4188 ## $at = 41880000 /* 01F20 80B45F70 44815000 */ mtc1 $at, $f10 ## $f10 = 17.00 /* 01F24 80B45F74 3C01C040 */ lui $at, 0xC040 ## $at = C0400000 /* 01F28 80B45F78 44818000 */ mtc1 $at, $f16 ## $f16 = -3.00 -/* 01F2C 80B45F7C 44070000 */ mfc1 $a3, $f0 +/* 01F2C 80B45F7C 44070000 */ mfc1 $a3, $f0 /* 01F30 80B45F80 24180002 */ addiu $t8, $zero, 0x0002 ## $t8 = 00000002 -/* 01F34 80B45F84 AFB80014 */ sw $t8, 0x0014($sp) -/* 01F38 80B45F88 E7AA0010 */ swc1 $f10, 0x0010($sp) -/* 01F3C 80B45F8C 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 01F40 80B45F90 E7B00018 */ swc1 $f16, 0x0018($sp) +/* 01F34 80B45F84 AFB80014 */ sw $t8, 0x0014($sp) +/* 01F38 80B45F88 E7AA0010 */ swc1 $f10, 0x0010($sp) +/* 01F3C 80B45F8C 0C029468 */ jal SkelAnime_ChangeAnim + +/* 01F40 80B45F90 E7B00018 */ swc1 $f16, 0x0018($sp) /* 01F44 80B45F94 2419000A */ addiu $t9, $zero, 0x000A ## $t9 = 0000000A /* 01F48 80B45F98 AE1903F0 */ sw $t9, 0x03F0($s0) ## 000003F0 /* 01F4C 80B45F9C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 01F50 80B45FA0 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 01F54 80B45FA4 2405382F */ addiu $a1, $zero, 0x382F ## $a1 = 0000382F -/* 01F58 80B45FA8 10000007 */ beq $zero, $zero, .L80B45FC8 -/* 01F5C 80B45FAC 8FA8003C */ lw $t0, 0x003C($sp) +/* 01F58 80B45FA8 10000007 */ beq $zero, $zero, .L80B45FC8 +/* 01F5C 80B45FAC 8FA8003C */ lw $t0, 0x003C($sp) .L80B45FB0: /* 01F60 80B45FB0 E6000068 */ swc1 $f0, 0x0068($s0) ## 00000068 /* 01F64 80B45FB4 AE0003E4 */ sw $zero, 0x03E4($s0) ## 000003E4 -/* 01F68 80B45FB8 8FA5003C */ lw $a1, 0x003C($sp) -/* 01F6C 80B45FBC 0C2D15AD */ jal func_80B456B4 +/* 01F68 80B45FB8 8FA5003C */ lw $a1, 0x003C($sp) +/* 01F6C 80B45FBC 0C2D15AD */ jal func_80B456B4 /* 01F70 80B45FC0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 .L80B45FC4: -/* 01F74 80B45FC4 8FA8003C */ lw $t0, 0x003C($sp) +/* 01F74 80B45FC4 8FA8003C */ lw $t0, 0x003C($sp) .L80B45FC8: /* 01F78 80B45FC8 3C090001 */ lui $t1, 0x0001 ## $t1 = 00010000 /* 01F7C 80B45FCC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01F80 80B45FD0 01284821 */ addu $t1, $t1, $t0 +/* 01F80 80B45FD0 01284821 */ addu $t1, $t1, $t0 /* 01F84 80B45FD4 8D291DE4 */ lw $t1, 0x1DE4($t1) ## 00011DE4 /* 01F88 80B45FD8 312A005F */ andi $t2, $t1, 0x005F ## $t2 = 00000000 -/* 01F8C 80B45FDC 55400004 */ bnel $t2, $zero, .L80B45FF0 +/* 01F8C 80B45FDC 55400004 */ bnel $t2, $zero, .L80B45FF0 /* 01F90 80B45FE0 860B001C */ lh $t3, 0x001C($s0) ## 0000001C /* 01F94 80B45FE4 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 01F98 80B45FE8 24053829 */ addiu $a1, $zero, 0x3829 ## $a1 = 00003829 /* 01F9C 80B45FEC 860B001C */ lh $t3, 0x001C($s0) ## 0000001C .L80B45FF0: /* 01FA0 80B45FF0 2401FFFE */ addiu $at, $zero, 0xFFFE ## $at = FFFFFFFE -/* 01FA4 80B45FF4 55610011 */ bnel $t3, $at, .L80B4603C -/* 01FA8 80B45FF8 8FBF002C */ lw $ra, 0x002C($sp) +/* 01FA4 80B45FF4 55610011 */ bnel $t3, $at, .L80B4603C +/* 01FA8 80B45FF8 8FBF002C */ lw $ra, 0x002C($sp) /* 01FAC 80B45FFC 960C0088 */ lhu $t4, 0x0088($s0) ## 00000088 -/* 01FB0 80B46000 8FA4003C */ lw $a0, 0x003C($sp) +/* 01FB0 80B46000 8FA4003C */ lw $a0, 0x003C($sp) /* 01FB4 80B46004 318D0003 */ andi $t5, $t4, 0x0003 ## $t5 = 00000000 -/* 01FB8 80B46008 51A0000C */ beql $t5, $zero, .L80B4603C -/* 01FBC 80B4600C 8FBF002C */ lw $ra, 0x002C($sp) -/* 01FC0 80B46010 0C2D133C */ jal func_80B44CF0 +/* 01FB8 80B46008 51A0000C */ beql $t5, $zero, .L80B4603C +/* 01FBC 80B4600C 8FBF002C */ lw $ra, 0x002C($sp) +/* 01FC0 80B46010 0C2D133C */ jal func_80B44CF0 /* 01FC4 80B46014 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 01FC8 80B46018 10400005 */ beq $v0, $zero, .L80B46030 +/* 01FC8 80B46018 10400005 */ beq $v0, $zero, .L80B46030 /* 01FCC 80B4601C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01FD0 80B46020 0C2D1A89 */ jal func_80B46A24 +/* 01FD0 80B46020 0C2D1A89 */ jal func_80B46A24 /* 01FD4 80B46024 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01FD8 80B46028 10000004 */ beq $zero, $zero, .L80B4603C -/* 01FDC 80B4602C 8FBF002C */ lw $ra, 0x002C($sp) +/* 01FD8 80B46028 10000004 */ beq $zero, $zero, .L80B4603C +/* 01FDC 80B4602C 8FBF002C */ lw $ra, 0x002C($sp) .L80B46030: -/* 01FE0 80B46030 0C2D20F9 */ jal func_80B483E4 -/* 01FE4 80B46034 8FA5003C */ lw $a1, 0x003C($sp) -/* 01FE8 80B46038 8FBF002C */ lw $ra, 0x002C($sp) +/* 01FE0 80B46030 0C2D20F9 */ jal func_80B483E4 +/* 01FE4 80B46034 8FA5003C */ lw $a1, 0x003C($sp) +/* 01FE8 80B46038 8FBF002C */ lw $ra, 0x002C($sp) .L80B4603C: -/* 01FEC 80B4603C 8FB00028 */ lw $s0, 0x0028($sp) +/* 01FEC 80B4603C 8FB00028 */ lw $s0, 0x0028($sp) /* 01FF0 80B46040 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 -/* 01FF4 80B46044 03E00008 */ jr $ra +/* 01FF4 80B46044 03E00008 */ jr $ra /* 01FF8 80B46048 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B4604C.s b/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B4604C.s index 2972edb0e0..9431f3dd13 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B4604C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B4604C.s @@ -1,22 +1,22 @@ glabel func_80B4604C /* 01FFC 80B4604C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 02000 80B46050 AFBF0014 */ sw $ra, 0x0014($sp) +/* 02000 80B46050 AFBF0014 */ sw $ra, 0x0014($sp) /* 02004 80B46054 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 /* 02008 80B46058 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 /* 0200C 80B4605C 24A58138 */ addiu $a1, $a1, 0x8138 ## $a1 = 06008138 -/* 02010 80B46060 AFA70018 */ sw $a3, 0x0018($sp) +/* 02010 80B46060 AFA70018 */ sw $a3, 0x0018($sp) /* 02014 80B46064 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 02018 80B46068 0C0294D3 */ jal func_800A534C +/* 02018 80B46068 0C0294D3 */ jal SkelAnime_ChangeAnimTransitionRepeat /* 0201C 80B4606C 3C06C080 */ lui $a2, 0xC080 ## $a2 = C0800000 -/* 02020 80B46070 8FA40018 */ lw $a0, 0x0018($sp) +/* 02020 80B46070 8FA40018 */ lw $a0, 0x0018($sp) /* 02024 80B46074 240E0006 */ addiu $t6, $zero, 0x0006 ## $t6 = 00000006 /* 02028 80B46078 3C0580B4 */ lui $a1, %hi(func_80B46098) ## $a1 = 80B40000 /* 0202C 80B4607C 24A56098 */ addiu $a1, $a1, %lo(func_80B46098) ## $a1 = 80B46098 -/* 02030 80B46080 0C2D1014 */ jal func_80B44050 +/* 02030 80B46080 0C2D1014 */ jal func_80B44050 /* 02034 80B46084 AC8E03DC */ sw $t6, 0x03DC($a0) ## 000003DC -/* 02038 80B46088 8FBF0014 */ lw $ra, 0x0014($sp) +/* 02038 80B46088 8FBF0014 */ lw $ra, 0x0014($sp) /* 0203C 80B4608C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 02040 80B46090 03E00008 */ jr $ra +/* 02040 80B46090 03E00008 */ jr $ra /* 02044 80B46094 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B462E4.s b/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B462E4.s index 70ac7a49a7..9c8e2daae5 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B462E4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B462E4.s @@ -1,38 +1,38 @@ glabel func_80B462E4 /* 02294 80B462E4 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 02298 80B462E8 AFBF001C */ sw $ra, 0x001C($sp) -/* 0229C 80B462EC AFB00018 */ sw $s0, 0x0018($sp) -/* 022A0 80B462F0 AFA50024 */ sw $a1, 0x0024($sp) +/* 02298 80B462E8 AFBF001C */ sw $ra, 0x001C($sp) +/* 0229C 80B462EC AFB00018 */ sw $s0, 0x0018($sp) +/* 022A0 80B462F0 AFA50024 */ sw $a1, 0x0024($sp) /* 022A4 80B462F4 848E001C */ lh $t6, 0x001C($a0) ## 0000001C /* 022A8 80B462F8 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 022AC 80B462FC 05C00012 */ bltz $t6, .L80B46348 +/* 022AC 80B462FC 05C00012 */ bltz $t6, .L80B46348 /* 022B0 80B46300 00000000 */ nop /* 022B4 80B46304 860700B6 */ lh $a3, 0x00B6($s0) ## 000000B6 /* 022B8 80B46308 3C064220 */ lui $a2, 0x4220 ## $a2 = 42200000 /* 022BC 80B4630C 24E73FFF */ addiu $a3, $a3, 0x3FFF ## $a3 = 00003FFF -/* 022C0 80B46310 00073C00 */ sll $a3, $a3, 16 -/* 022C4 80B46314 0C00CE6E */ jal func_800339B8 -/* 022C8 80B46318 00073C03 */ sra $a3, $a3, 16 -/* 022CC 80B4631C 1440000A */ bne $v0, $zero, .L80B46348 +/* 022C0 80B46310 00073C00 */ sll $a3, $a3, 16 +/* 022C4 80B46314 0C00CE6E */ jal func_800339B8 +/* 022C8 80B46318 00073C03 */ sra $a3, $a3, 16 +/* 022CC 80B4631C 1440000A */ bne $v0, $zero, .L80B46348 /* 022D0 80B46320 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 022D4 80B46324 860700B6 */ lh $a3, 0x00B6($s0) ## 000000B6 -/* 022D8 80B46328 8FA50024 */ lw $a1, 0x0024($sp) +/* 022D8 80B46328 8FA50024 */ lw $a1, 0x0024($sp) /* 022DC 80B4632C 3C06C220 */ lui $a2, 0xC220 ## $a2 = C2200000 /* 022E0 80B46330 24E73FFF */ addiu $a3, $a3, 0x3FFF ## $a3 = 00003FFF -/* 022E4 80B46334 00073C00 */ sll $a3, $a3, 16 -/* 022E8 80B46338 0C00CE6E */ jal func_800339B8 -/* 022EC 80B4633C 00073C03 */ sra $a3, $a3, 16 -/* 022F0 80B46340 10400021 */ beq $v0, $zero, .L80B463C8 +/* 022E4 80B46334 00073C00 */ sll $a3, $a3, 16 +/* 022E8 80B46338 0C00CE6E */ jal func_800339B8 +/* 022EC 80B4633C 00073C03 */ sra $a3, $a3, 16 +/* 022F0 80B46340 10400021 */ beq $v0, $zero, .L80B463C8 /* 022F4 80B46344 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 .L80B46348: /* 022F8 80B46348 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 /* 022FC 80B4634C 24A56388 */ addiu $a1, $a1, 0x6388 ## $a1 = 06016388 -/* 02300 80B46350 0C0294BE */ jal func_800A52F8 +/* 02300 80B46350 0C0294BE */ jal SkelAnime_ChangeAnimDefaultRepeat /* 02304 80B46354 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C /* 02308 80B46358 3C014140 */ lui $at, 0x4140 ## $at = 41400000 /* 0230C 80B4635C 44816000 */ mtc1 $at, $f12 ## $f12 = 12.00 /* 02310 80B46360 0C00CFC8 */ jal Math_Rand_CenteredFloat - + /* 02314 80B46364 00000000 */ nop /* 02318 80B46368 860F00B6 */ lh $t7, 0x00B6($s0) ## 000000B6 /* 0231C 80B4636C E6000068 */ swc1 $f0, 0x0068($s0) ## 00000068 @@ -43,30 +43,30 @@ glabel func_80B462E4 /* 0232C 80B4637C 44812000 */ mtc1 $at, $f4 ## $f4 = 10.00 /* 02330 80B46380 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 /* 02334 80B46384 44814000 */ mtc1 $at, $f8 ## $f8 = 20.00 -/* 02338 80B46388 46040182 */ mul.s $f6, $f0, $f4 +/* 02338 80B46388 46040182 */ mul.s $f6, $f0, $f4 /* 0233C 80B4638C 44809000 */ mtc1 $zero, $f18 ## $f18 = 0.00 /* 02340 80B46390 24080007 */ addiu $t0, $zero, 0x0007 ## $t0 = 00000007 /* 02344 80B46394 3C0580B4 */ lui $a1, %hi(func_80B463E4) ## $a1 = 80B40000 /* 02348 80B46398 AE0003E4 */ sw $zero, 0x03E4($s0) ## 000003E4 /* 0234C 80B4639C AE0803DC */ sw $t0, 0x03DC($s0) ## 000003DC /* 02350 80B463A0 24A563E4 */ addiu $a1, $a1, %lo(func_80B463E4) ## $a1 = 80B463E4 -/* 02354 80B463A4 46083280 */ add.s $f10, $f6, $f8 +/* 02354 80B463A4 46083280 */ add.s $f10, $f6, $f8 /* 02358 80B463A8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 0235C 80B463AC E6120408 */ swc1 $f18, 0x0408($s0) ## 00000408 -/* 02360 80B463B0 4600540D */ trunc.w.s $f16, $f10 -/* 02364 80B463B4 44198000 */ mfc1 $t9, $f16 -/* 02368 80B463B8 0C2D1014 */ jal func_80B44050 +/* 02360 80B463B0 4600540D */ trunc.w.s $f16, $f10 +/* 02364 80B463B4 44198000 */ mfc1 $t9, $f16 +/* 02368 80B463B8 0C2D1014 */ jal func_80B44050 /* 0236C 80B463BC AE1903F0 */ sw $t9, 0x03F0($s0) ## 000003F0 -/* 02370 80B463C0 10000004 */ beq $zero, $zero, .L80B463D4 -/* 02374 80B463C4 8FBF001C */ lw $ra, 0x001C($sp) +/* 02370 80B463C0 10000004 */ beq $zero, $zero, .L80B463D4 +/* 02374 80B463C4 8FBF001C */ lw $ra, 0x001C($sp) .L80B463C8: -/* 02378 80B463C8 0C2D15AD */ jal func_80B456B4 -/* 0237C 80B463CC 8FA50024 */ lw $a1, 0x0024($sp) -/* 02380 80B463D0 8FBF001C */ lw $ra, 0x001C($sp) +/* 02378 80B463C8 0C2D15AD */ jal func_80B456B4 +/* 0237C 80B463CC 8FA50024 */ lw $a1, 0x0024($sp) +/* 02380 80B463D0 8FBF001C */ lw $ra, 0x001C($sp) .L80B463D4: -/* 02384 80B463D4 8FB00018 */ lw $s0, 0x0018($sp) +/* 02384 80B463D4 8FB00018 */ lw $s0, 0x0018($sp) /* 02388 80B463D8 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 0238C 80B463DC 03E00008 */ jr $ra +/* 0238C 80B463DC 03E00008 */ jr $ra /* 02390 80B463E0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B46A24.s b/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B46A24.s index 0fa44c9391..01946052fa 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B46A24.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B46A24.s @@ -1,31 +1,31 @@ glabel func_80B46A24 /* 029D4 80B46A24 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 029D8 80B46A28 AFB00028 */ sw $s0, 0x0028($sp) +/* 029D8 80B46A28 AFB00028 */ sw $s0, 0x0028($sp) /* 029DC 80B46A2C 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 029E0 80B46A30 AFBF002C */ sw $ra, 0x002C($sp) +/* 029E0 80B46A30 AFBF002C */ sw $ra, 0x002C($sp) /* 029E4 80B46A34 3C040601 */ lui $a0, 0x0601 ## $a0 = 06010000 /* 029E8 80B46A38 0C028800 */ jal SkelAnime_GetFrameCount - + /* 029EC 80B46A3C 2484A3D4 */ addiu $a0, $a0, 0xA3D4 ## $a0 = 0600A3D4 /* 029F0 80B46A40 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 029F4 80B46A44 3C01C080 */ lui $at, 0xC080 ## $at = C0800000 /* 029F8 80B46A48 44814000 */ mtc1 $at, $f8 ## $f8 = -4.00 -/* 029FC 80B46A4C 468021A0 */ cvt.s.w $f6, $f4 +/* 029FC 80B46A4C 468021A0 */ cvt.s.w $f6, $f4 /* 02A00 80B46A50 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 /* 02A04 80B46A54 240E0002 */ addiu $t6, $zero, 0x0002 ## $t6 = 00000002 -/* 02A08 80B46A58 AFAE0014 */ sw $t6, 0x0014($sp) +/* 02A08 80B46A58 AFAE0014 */ sw $t6, 0x0014($sp) /* 02A0C 80B46A5C 24A5A3D4 */ addiu $a1, $a1, 0xA3D4 ## $a1 = 0600A3D4 /* 02A10 80B46A60 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C -/* 02A14 80B46A64 E7A60010 */ swc1 $f6, 0x0010($sp) +/* 02A14 80B46A64 E7A60010 */ swc1 $f6, 0x0010($sp) /* 02A18 80B46A68 3C063FA0 */ lui $a2, 0x3FA0 ## $a2 = 3FA00000 /* 02A1C 80B46A6C 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 02A20 80B46A70 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 02A24 80B46A74 E7A80018 */ swc1 $f8, 0x0018($sp) +/* 02A20 80B46A70 0C029468 */ jal SkelAnime_ChangeAnim + +/* 02A24 80B46A74 E7A80018 */ swc1 $f8, 0x0018($sp) /* 02A28 80B46A78 860F001C */ lh $t7, 0x001C($s0) ## 0000001C /* 02A2C 80B46A7C 2401FFFE */ addiu $at, $zero, 0xFFFE ## $at = FFFFFFFE /* 02A30 80B46A80 24080009 */ addiu $t0, $zero, 0x0009 ## $t0 = 00000009 -/* 02A34 80B46A84 15E10005 */ bne $t7, $at, .L80B46A9C +/* 02A34 80B46A84 15E10005 */ bne $t7, $at, .L80B46A9C /* 02A38 80B46A88 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 02A3C 80B46A8C 3C013FE0 */ lui $at, 0x3FE0 ## $at = 3FE00000 /* 02A40 80B46A90 44815000 */ mtc1 $at, $f10 ## $f10 = 1.75 @@ -37,18 +37,18 @@ glabel func_80B46A24 /* 02A54 80B46AA4 24053829 */ addiu $a1, $zero, 0x3829 ## $a1 = 00003829 /* 02A58 80B46AA8 3319FFFB */ andi $t9, $t8, 0xFFFB ## $t9 = 00000000 /* 02A5C 80B46AAC 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 02A60 80B46AB0 A2190474 */ sb $t9, 0x0474($s0) ## 00000474 /* 02A64 80B46AB4 44808000 */ mtc1 $zero, $f16 ## $f16 = 0.00 /* 02A68 80B46AB8 3C0580B4 */ lui $a1, %hi(func_80B46AE0) ## $a1 = 80B40000 /* 02A6C 80B46ABC 24A56AE0 */ addiu $a1, $a1, %lo(func_80B46AE0) ## $a1 = 80B46AE0 /* 02A70 80B46AC0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02A74 80B46AC4 0C2D1014 */ jal func_80B44050 +/* 02A74 80B46AC4 0C2D1014 */ jal func_80B44050 /* 02A78 80B46AC8 E6100068 */ swc1 $f16, 0x0068($s0) ## 00000068 -/* 02A7C 80B46ACC 8FBF002C */ lw $ra, 0x002C($sp) -/* 02A80 80B46AD0 8FB00028 */ lw $s0, 0x0028($sp) +/* 02A7C 80B46ACC 8FBF002C */ lw $ra, 0x002C($sp) +/* 02A80 80B46AD0 8FB00028 */ lw $s0, 0x0028($sp) /* 02A84 80B46AD4 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 02A88 80B46AD8 03E00008 */ jr $ra +/* 02A88 80B46AD8 03E00008 */ jr $ra /* 02A8C 80B46ADC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B46D64.s b/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B46D64.s index 8a7b71ab87..66d0a6e679 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B46D64.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B46D64.s @@ -1,32 +1,32 @@ glabel func_80B46D64 /* 02D14 80B46D64 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 02D18 80B46D68 AFBF0024 */ sw $ra, 0x0024($sp) -/* 02D1C 80B46D6C AFA40028 */ sw $a0, 0x0028($sp) +/* 02D18 80B46D68 AFBF0024 */ sw $ra, 0x0024($sp) +/* 02D1C 80B46D6C AFA40028 */ sw $a0, 0x0028($sp) /* 02D20 80B46D70 3C014040 */ lui $at, 0x4040 ## $at = 40400000 /* 02D24 80B46D74 44813000 */ mtc1 $at, $f6 ## $f6 = 3.00 /* 02D28 80B46D78 C4840164 */ lwc1 $f4, 0x0164($a0) ## 00000164 /* 02D2C 80B46D7C 44801000 */ mtc1 $zero, $f2 ## $f2 = 0.00 /* 02D30 80B46D80 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 -/* 02D34 80B46D84 46062001 */ sub.s $f0, $f4, $f6 +/* 02D34 80B46D84 46062001 */ sub.s $f0, $f4, $f6 /* 02D38 80B46D88 240F0002 */ addiu $t7, $zero, 0x0002 ## $t7 = 00000002 -/* 02D3C 80B46D8C AFAF0014 */ sw $t7, 0x0014($sp) +/* 02D3C 80B46D8C AFAF0014 */ sw $t7, 0x0014($sp) /* 02D40 80B46D90 24A5A3D4 */ addiu $a1, $a1, 0xA3D4 ## $a1 = 0600A3D4 -/* 02D44 80B46D94 44070000 */ mfc1 $a3, $f0 +/* 02D44 80B46D94 44070000 */ mfc1 $a3, $f0 /* 02D48 80B46D98 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C /* 02D4C 80B46D9C 3C06BF80 */ lui $a2, 0xBF80 ## $a2 = BF800000 -/* 02D50 80B46DA0 E7A20010 */ swc1 $f2, 0x0010($sp) -/* 02D54 80B46DA4 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 02D58 80B46DA8 E7A20018 */ swc1 $f2, 0x0018($sp) -/* 02D5C 80B46DAC 8FA40028 */ lw $a0, 0x0028($sp) +/* 02D50 80B46DA0 E7A20010 */ swc1 $f2, 0x0010($sp) +/* 02D54 80B46DA4 0C029468 */ jal SkelAnime_ChangeAnim + +/* 02D58 80B46DA8 E7A20018 */ swc1 $f2, 0x0018($sp) +/* 02D5C 80B46DAC 8FA40028 */ lw $a0, 0x0028($sp) /* 02D60 80B46DB0 24180008 */ addiu $t8, $zero, 0x0008 ## $t8 = 00000008 /* 02D64 80B46DB4 3C0580B4 */ lui $a1, %hi(func_80B46DD4) ## $a1 = 80B40000 /* 02D68 80B46DB8 24A56DD4 */ addiu $a1, $a1, %lo(func_80B46DD4) ## $a1 = 80B46DD4 -/* 02D6C 80B46DBC 0C2D1014 */ jal func_80B44050 +/* 02D6C 80B46DBC 0C2D1014 */ jal func_80B44050 /* 02D70 80B46DC0 AC9803DC */ sw $t8, 0x03DC($a0) ## 000003DC -/* 02D74 80B46DC4 8FBF0024 */ lw $ra, 0x0024($sp) +/* 02D74 80B46DC4 8FBF0024 */ lw $ra, 0x0024($sp) /* 02D78 80B46DC8 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 02D7C 80B46DCC 03E00008 */ jr $ra +/* 02D7C 80B46DCC 03E00008 */ jr $ra /* 02D80 80B46DD0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B46E8C.s b/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B46E8C.s index a6ed8daa29..33eed35651 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B46E8C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B46E8C.s @@ -3,20 +3,20 @@ glabel func_80B46E8C /* 02E40 80B46E90 3C01C040 */ lui $at, 0xC040 ## $at = C0400000 /* 02E44 80B46E94 44813000 */ mtc1 $at, $f6 ## $f6 = -3.00 /* 02E48 80B46E98 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 -/* 02E4C 80B46E9C AFB00028 */ sw $s0, 0x0028($sp) +/* 02E4C 80B46E9C AFB00028 */ sw $s0, 0x0028($sp) /* 02E50 80B46EA0 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 02E54 80B46EA4 AFBF002C */ sw $ra, 0x002C($sp) +/* 02E54 80B46EA4 AFBF002C */ sw $ra, 0x002C($sp) /* 02E58 80B46EA8 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 /* 02E5C 80B46EAC 240E0002 */ addiu $t6, $zero, 0x0002 ## $t6 = 00000002 -/* 02E60 80B46EB0 AFAE0014 */ sw $t6, 0x0014($sp) +/* 02E60 80B46EB0 AFAE0014 */ sw $t6, 0x0014($sp) /* 02E64 80B46EB4 24A59530 */ addiu $a1, $a1, 0x9530 ## $a1 = 06009530 /* 02E68 80B46EB8 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C /* 02E6C 80B46EBC 3C06BF80 */ lui $a2, 0xBF80 ## $a2 = BF800000 /* 02E70 80B46EC0 3C074040 */ lui $a3, 0x4040 ## $a3 = 40400000 -/* 02E74 80B46EC4 E7A60018 */ swc1 $f6, 0x0018($sp) -/* 02E78 80B46EC8 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 02E7C 80B46ECC E7A40010 */ swc1 $f4, 0x0010($sp) +/* 02E74 80B46EC4 E7A60018 */ swc1 $f6, 0x0018($sp) +/* 02E78 80B46EC8 0C029468 */ jal SkelAnime_ChangeAnim + +/* 02E7C 80B46ECC E7A40010 */ swc1 $f4, 0x0010($sp) /* 02E80 80B46ED0 3C014170 */ lui $at, 0x4170 ## $at = 41700000 /* 02E84 80B46ED4 44814000 */ mtc1 $at, $f8 ## $f8 = 15.00 /* 02E88 80B46ED8 3C01C170 */ lui $at, 0xC170 ## $at = C1700000 @@ -30,16 +30,16 @@ glabel func_80B46E8C /* 02EA8 80B46EF8 2405382F */ addiu $a1, $zero, 0x382F ## $a1 = 0000382F /* 02EAC 80B46EFC E6080060 */ swc1 $f8, 0x0060($s0) ## 00000060 /* 02EB0 80B46F00 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 02EB4 80B46F04 E60A0068 */ swc1 $f10, 0x0068($s0) ## 00000068 /* 02EB8 80B46F08 3C0580B4 */ lui $a1, %hi(func_80B46F2C) ## $a1 = 80B40000 /* 02EBC 80B46F0C 24A56F2C */ addiu $a1, $a1, %lo(func_80B46F2C) ## $a1 = 80B46F2C -/* 02EC0 80B46F10 0C2D1014 */ jal func_80B44050 +/* 02EC0 80B46F10 0C2D1014 */ jal func_80B44050 /* 02EC4 80B46F14 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02EC8 80B46F18 8FBF002C */ lw $ra, 0x002C($sp) -/* 02ECC 80B46F1C 8FB00028 */ lw $s0, 0x0028($sp) +/* 02EC8 80B46F18 8FBF002C */ lw $ra, 0x002C($sp) +/* 02ECC 80B46F1C 8FB00028 */ lw $s0, 0x0028($sp) /* 02ED0 80B46F20 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 02ED4 80B46F24 03E00008 */ jr $ra +/* 02ED4 80B46F24 03E00008 */ jr $ra /* 02ED8 80B46F28 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B46F2C.s b/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B46F2C.s index f1b8455aff..d40f8f41bd 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B46F2C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B46F2C.s @@ -1,17 +1,17 @@ glabel func_80B46F2C /* 02EDC 80B46F2C 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 02EE0 80B46F30 AFBF002C */ sw $ra, 0x002C($sp) -/* 02EE4 80B46F34 AFB00028 */ sw $s0, 0x0028($sp) -/* 02EE8 80B46F38 AFA5003C */ sw $a1, 0x003C($sp) +/* 02EE0 80B46F30 AFBF002C */ sw $ra, 0x002C($sp) +/* 02EE4 80B46F34 AFB00028 */ sw $s0, 0x0028($sp) +/* 02EE8 80B46F38 AFA5003C */ sw $a1, 0x003C($sp) /* 02EEC 80B46F3C 8C8E03F0 */ lw $t6, 0x03F0($a0) ## 000003F0 /* 02EF0 80B46F40 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 02EF4 80B46F44 51C0000E */ beql $t6, $zero, .L80B46F80 +/* 02EF4 80B46F44 51C0000E */ beql $t6, $zero, .L80B46F80 /* 02EF8 80B46F48 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C /* 02EFC 80B46F4C C4800080 */ lwc1 $f0, 0x0080($a0) ## 000001CC /* 02F00 80B46F50 C4840028 */ lwc1 $f4, 0x0028($a0) ## 00000174 -/* 02F04 80B46F54 4600203E */ c.le.s $f4, $f0 +/* 02F04 80B46F54 4600203E */ c.le.s $f4, $f0 /* 02F08 80B46F58 00000000 */ nop -/* 02F0C 80B46F5C 45020008 */ bc1fl .L80B46F80 +/* 02F0C 80B46F5C 45020008 */ bc1fl .L80B46F80 /* 02F10 80B46F60 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C /* 02F14 80B46F64 44803000 */ mtc1 $zero, $f6 ## $f6 = 0.00 /* 02F18 80B46F68 44804000 */ mtc1 $zero, $f8 ## $f8 = 0.00 @@ -22,65 +22,65 @@ glabel func_80B46F2C /* 02F2C 80B46F7C 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C .L80B46F80: /* 02F30 80B46F80 0C02927F */ jal SkelAnime_FrameUpdateMatrix - -/* 02F34 80B46F84 AFA40034 */ sw $a0, 0x0034($sp) -/* 02F38 80B46F88 10400024 */ beq $v0, $zero, .L80B4701C -/* 02F3C 80B46F8C 8FA40034 */ lw $a0, 0x0034($sp) + +/* 02F34 80B46F84 AFA40034 */ sw $a0, 0x0034($sp) +/* 02F38 80B46F88 10400024 */ beq $v0, $zero, .L80B4701C +/* 02F3C 80B46F8C 8FA40034 */ lw $a0, 0x0034($sp) /* 02F40 80B46F90 8E0F03F0 */ lw $t7, 0x03F0($s0) ## 000003F0 -/* 02F44 80B46F94 8FA5003C */ lw $a1, 0x003C($sp) +/* 02F44 80B46F94 8FA5003C */ lw $a1, 0x003C($sp) /* 02F48 80B46F98 3C080001 */ lui $t0, 0x0001 ## $t0 = 00010000 -/* 02F4C 80B46F9C 15E00015 */ bne $t7, $zero, .L80B46FF4 -/* 02F50 80B46FA0 01054021 */ addu $t0, $t0, $a1 +/* 02F4C 80B46F9C 15E00015 */ bne $t7, $zero, .L80B46FF4 +/* 02F50 80B46FA0 01054021 */ addu $t0, $t0, $a1 /* 02F54 80B46FA4 3C014188 */ lui $at, 0x4188 ## $at = 41880000 /* 02F58 80B46FA8 44815000 */ mtc1 $at, $f10 ## $f10 = 17.00 /* 02F5C 80B46FAC 3C01C040 */ lui $at, 0xC040 ## $at = C0400000 /* 02F60 80B46FB0 44818000 */ mtc1 $at, $f16 ## $f16 = -3.00 /* 02F64 80B46FB4 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 /* 02F68 80B46FB8 24180002 */ addiu $t8, $zero, 0x0002 ## $t8 = 00000002 -/* 02F6C 80B46FBC AFB80014 */ sw $t8, 0x0014($sp) +/* 02F6C 80B46FBC AFB80014 */ sw $t8, 0x0014($sp) /* 02F70 80B46FC0 24A58C6C */ addiu $a1, $a1, 0x8C6C ## $a1 = 06008C6C /* 02F74 80B46FC4 3C064040 */ lui $a2, 0x4040 ## $a2 = 40400000 /* 02F78 80B46FC8 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 02F7C 80B46FCC E7AA0010 */ swc1 $f10, 0x0010($sp) -/* 02F80 80B46FD0 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 02F84 80B46FD4 E7B00018 */ swc1 $f16, 0x0018($sp) +/* 02F7C 80B46FCC E7AA0010 */ swc1 $f10, 0x0010($sp) +/* 02F80 80B46FD0 0C029468 */ jal SkelAnime_ChangeAnim + +/* 02F84 80B46FD4 E7B00018 */ swc1 $f16, 0x0018($sp) /* 02F88 80B46FD8 2419000A */ addiu $t9, $zero, 0x000A ## $t9 = 0000000A /* 02F8C 80B46FDC AE1903F0 */ sw $t9, 0x03F0($s0) ## 000003F0 /* 02F90 80B46FE0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 02F94 80B46FE4 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 02F98 80B46FE8 2405382F */ addiu $a1, $zero, 0x382F ## $a1 = 0000382F -/* 02F9C 80B46FEC 1000000C */ beq $zero, $zero, .L80B47020 -/* 02FA0 80B46FF0 8FAA003C */ lw $t2, 0x003C($sp) +/* 02F9C 80B46FEC 1000000C */ beq $zero, $zero, .L80B47020 +/* 02FA0 80B46FF0 8FAA003C */ lw $t2, 0x003C($sp) .L80B46FF4: /* 02FA4 80B46FF4 8D081DE4 */ lw $t0, 0x1DE4($t0) ## 00001DE4 /* 02FA8 80B46FF8 31090001 */ andi $t1, $t0, 0x0001 ## $t1 = 00000000 -/* 02FAC 80B46FFC 11200005 */ beq $t1, $zero, .L80B47014 +/* 02FAC 80B46FFC 11200005 */ beq $t1, $zero, .L80B47014 /* 02FB0 80B47000 00000000 */ nop -/* 02FB4 80B47004 0C2D20F9 */ jal func_80B483E4 +/* 02FB4 80B47004 0C2D20F9 */ jal func_80B483E4 /* 02FB8 80B47008 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02FBC 80B4700C 10000004 */ beq $zero, $zero, .L80B47020 -/* 02FC0 80B47010 8FAA003C */ lw $t2, 0x003C($sp) +/* 02FBC 80B4700C 10000004 */ beq $zero, $zero, .L80B47020 +/* 02FC0 80B47010 8FAA003C */ lw $t2, 0x003C($sp) .L80B47014: -/* 02FC4 80B47014 0C2D14E1 */ jal func_80B45384 +/* 02FC4 80B47014 0C2D14E1 */ jal func_80B45384 /* 02FC8 80B47018 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 .L80B4701C: -/* 02FCC 80B4701C 8FAA003C */ lw $t2, 0x003C($sp) +/* 02FCC 80B4701C 8FAA003C */ lw $t2, 0x003C($sp) .L80B47020: /* 02FD0 80B47020 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 02FD4 80B47024 8D4B009C */ lw $t3, 0x009C($t2) ## 0000009C /* 02FD8 80B47028 316C005F */ andi $t4, $t3, 0x005F ## $t4 = 00000000 -/* 02FDC 80B4702C 55800004 */ bnel $t4, $zero, .L80B47040 -/* 02FE0 80B47030 8FBF002C */ lw $ra, 0x002C($sp) +/* 02FDC 80B4702C 55800004 */ bnel $t4, $zero, .L80B47040 +/* 02FE0 80B47030 8FBF002C */ lw $ra, 0x002C($sp) /* 02FE4 80B47034 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 02FE8 80B47038 24053829 */ addiu $a1, $zero, 0x3829 ## $a1 = 00003829 -/* 02FEC 80B4703C 8FBF002C */ lw $ra, 0x002C($sp) +/* 02FEC 80B4703C 8FBF002C */ lw $ra, 0x002C($sp) .L80B47040: -/* 02FF0 80B47040 8FB00028 */ lw $s0, 0x0028($sp) +/* 02FF0 80B47040 8FB00028 */ lw $s0, 0x0028($sp) /* 02FF4 80B47044 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 -/* 02FF8 80B47048 03E00008 */ jr $ra +/* 02FF8 80B47048 03E00008 */ jr $ra /* 02FFC 80B4704C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B47050.s b/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B47050.s index 9c49e4b93e..7088e7d244 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B47050.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B47050.s @@ -1,28 +1,28 @@ glabel func_80B47050 /* 03000 80B47050 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 03004 80B47054 AFBF0014 */ sw $ra, 0x0014($sp) +/* 03004 80B47054 AFBF0014 */ sw $ra, 0x0014($sp) /* 03008 80B47058 948E0088 */ lhu $t6, 0x0088($a0) ## 00000088 /* 0300C 80B4705C 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 /* 03010 80B47060 24180001 */ addiu $t8, $zero, 0x0001 ## $t8 = 00000001 /* 03014 80B47064 31CF0001 */ andi $t7, $t6, 0x0001 ## $t7 = 00000000 -/* 03018 80B47068 11E00011 */ beq $t7, $zero, .L80B470B0 +/* 03018 80B47068 11E00011 */ beq $t7, $zero, .L80B470B0 /* 0301C 80B4706C 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 /* 03020 80B47070 44801000 */ mtc1 $zero, $f2 ## $f2 = 0.00 /* 03024 80B47074 C4800060 */ lwc1 $f0, 0x0060($a0) ## 00000060 /* 03028 80B47078 3C01C080 */ lui $at, 0xC080 ## $at = C0800000 -/* 0302C 80B4707C 46001032 */ c.eq.s $f2, $f0 +/* 0302C 80B4707C 46001032 */ c.eq.s $f2, $f0 /* 03030 80B47080 00000000 */ nop -/* 03034 80B47084 45030008 */ bc1tl .L80B470A8 +/* 03034 80B47084 45030008 */ bc1tl .L80B470A8 /* 03038 80B47088 E4E20068 */ swc1 $f2, 0x0068($a3) ## 00000068 /* 0303C 80B4708C 44812000 */ mtc1 $at, $f4 ## $f4 = -4.00 /* 03040 80B47090 00000000 */ nop -/* 03044 80B47094 46002032 */ c.eq.s $f4, $f0 +/* 03044 80B47094 46002032 */ c.eq.s $f4, $f0 /* 03048 80B47098 00000000 */ nop -/* 0304C 80B4709C 45020005 */ bc1fl .L80B470B4 +/* 0304C 80B4709C 45020005 */ bc1fl .L80B470B4 /* 03050 80B470A0 44801000 */ mtc1 $zero, $f2 ## $f2 = 0.00 /* 03054 80B470A4 E4E20068 */ swc1 $f2, 0x0068($a3) ## 00000068 .L80B470A8: -/* 03058 80B470A8 10000003 */ beq $zero, $zero, .L80B470B8 +/* 03058 80B470A8 10000003 */ beq $zero, $zero, .L80B470B8 /* 0305C 80B470AC ACE003E4 */ sw $zero, 0x03E4($a3) ## 000003E4 .L80B470B0: /* 03060 80B470B0 44801000 */ mtc1 $zero, $f2 ## $f2 = 0.00 @@ -32,31 +32,31 @@ glabel func_80B47050 /* 03068 80B470B8 90F90410 */ lbu $t9, 0x0410($a3) ## 00000410 /* 0306C 80B470BC 2401000F */ addiu $at, $zero, 0x000F ## $at = 0000000F /* 03070 80B470C0 24E4014C */ addiu $a0, $a3, 0x014C ## $a0 = 0000014C -/* 03074 80B470C4 17210004 */ bne $t9, $at, .L80B470D8 +/* 03074 80B470C4 17210004 */ bne $t9, $at, .L80B470D8 /* 03078 80B470C8 24A557F8 */ addiu $a1, $a1, 0x57F8 ## $a1 = 060157F8 /* 0307C 80B470CC 24080024 */ addiu $t0, $zero, 0x0024 ## $t0 = 00000024 -/* 03080 80B470D0 10000005 */ beq $zero, $zero, .L80B470E8 +/* 03080 80B470D0 10000005 */ beq $zero, $zero, .L80B470E8 /* 03084 80B470D4 A4E803F6 */ sh $t0, 0x03F6($a3) ## 000003F6 .L80B470D8: -/* 03088 80B470D8 44061000 */ mfc1 $a2, $f2 -/* 0308C 80B470DC 0C0294A7 */ jal func_800A529C -/* 03090 80B470E0 AFA70018 */ sw $a3, 0x0018($sp) -/* 03094 80B470E4 8FA70018 */ lw $a3, 0x0018($sp) +/* 03088 80B470D8 44061000 */ mfc1 $a2, $f2 +/* 0308C 80B470DC 0C0294A7 */ jal SkelAnime_ChangeAnimPlaybackStop +/* 03090 80B470E0 AFA70018 */ sw $a3, 0x0018($sp) +/* 03094 80B470E4 8FA70018 */ lw $a3, 0x0018($sp) .L80B470E8: /* 03098 80B470E8 00E02025 */ or $a0, $a3, $zero ## $a0 = 00000000 /* 0309C 80B470EC 2405389E */ addiu $a1, $zero, 0x389E ## $a1 = 0000389E /* 030A0 80B470F0 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 030A4 80B470F4 AFA70018 */ sw $a3, 0x0018($sp) -/* 030A8 80B470F8 8FA40018 */ lw $a0, 0x0018($sp) + +/* 030A4 80B470F4 AFA70018 */ sw $a3, 0x0018($sp) +/* 030A8 80B470F8 8FA40018 */ lw $a0, 0x0018($sp) /* 030AC 80B470FC 2409000E */ addiu $t1, $zero, 0x000E ## $t1 = 0000000E /* 030B0 80B47100 3C0580B4 */ lui $a1, %hi(func_80B47120) ## $a1 = 80B40000 /* 030B4 80B47104 24A57120 */ addiu $a1, $a1, %lo(func_80B47120) ## $a1 = 80B47120 -/* 030B8 80B47108 0C2D1014 */ jal func_80B44050 +/* 030B8 80B47108 0C2D1014 */ jal func_80B44050 /* 030BC 80B4710C AC8903DC */ sw $t1, 0x03DC($a0) ## 000003DC -/* 030C0 80B47110 8FBF0014 */ lw $ra, 0x0014($sp) +/* 030C0 80B47110 8FBF0014 */ lw $ra, 0x0014($sp) /* 030C4 80B47114 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 030C8 80B47118 03E00008 */ jr $ra +/* 030C8 80B47118 03E00008 */ jr $ra /* 030CC 80B4711C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B47360.s b/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B47360.s index 15a1d8b8a0..646840b41f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B47360.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B47360.s @@ -1,61 +1,61 @@ glabel func_80B47360 /* 03310 80B47360 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 -/* 03314 80B47364 AFB00028 */ sw $s0, 0x0028($sp) +/* 03314 80B47364 AFB00028 */ sw $s0, 0x0028($sp) /* 03318 80B47368 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 /* 0331C 80B4736C 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 03320 80B47370 AFBF002C */ sw $ra, 0x002C($sp) +/* 03320 80B47370 AFBF002C */ sw $ra, 0x002C($sp) /* 03324 80B47374 3C040601 */ lui $a0, 0x0601 ## $a0 = 06010000 -/* 03328 80B47378 AFA50044 */ sw $a1, 0x0044($sp) +/* 03328 80B47378 AFA50044 */ sw $a1, 0x0044($sp) /* 0332C 80B4737C 248419F4 */ addiu $a0, $a0, 0x19F4 ## $a0 = 060119F4 /* 03330 80B47380 0C028800 */ jal SkelAnime_GetFrameCount - -/* 03334 80B47384 E7A0003C */ swc1 $f0, 0x003C($sp) + +/* 03334 80B47384 E7A0003C */ swc1 $f0, 0x003C($sp) /* 03338 80B47388 8E0E03DC */ lw $t6, 0x03DC($s0) ## 000003DC /* 0333C 80B4738C 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 -/* 03340 80B47390 C7A0003C */ lwc1 $f0, 0x003C($sp) -/* 03344 80B47394 29C10011 */ slti $at, $t6, 0x0011 -/* 03348 80B47398 10200004 */ beq $at, $zero, .L80B473AC -/* 0334C 80B4739C 468020A0 */ cvt.s.w $f2, $f4 +/* 03340 80B47390 C7A0003C */ lwc1 $f0, 0x003C($sp) +/* 03344 80B47394 29C10011 */ slti $at, $t6, 0x0011 +/* 03348 80B47398 10200004 */ beq $at, $zero, .L80B473AC +/* 0334C 80B4739C 468020A0 */ cvt.s.w $f2, $f4 /* 03350 80B473A0 3C01C080 */ lui $at, 0xC080 ## $at = C0800000 /* 03354 80B473A4 44810000 */ mtc1 $at, $f0 ## $f0 = -4.00 /* 03358 80B473A8 00000000 */ nop .L80B473AC: /* 0335C 80B473AC 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 /* 03360 80B473B0 240F0002 */ addiu $t7, $zero, 0x0002 ## $t7 = 00000002 -/* 03364 80B473B4 AFAF0014 */ sw $t7, 0x0014($sp) +/* 03364 80B473B4 AFAF0014 */ sw $t7, 0x0014($sp) /* 03368 80B473B8 24A519F4 */ addiu $a1, $a1, 0x19F4 ## $a1 = 060119F4 /* 0336C 80B473BC 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C /* 03370 80B473C0 3C064000 */ lui $a2, 0x4000 ## $a2 = 40000000 /* 03374 80B473C4 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 03378 80B473C8 E7A20010 */ swc1 $f2, 0x0010($sp) -/* 0337C 80B473CC 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 03380 80B473D0 E7A00018 */ swc1 $f0, 0x0018($sp) +/* 03378 80B473C8 E7A20010 */ swc1 $f2, 0x0010($sp) +/* 0337C 80B473CC 0C029468 */ jal SkelAnime_ChangeAnim + +/* 03380 80B473D0 E7A00018 */ swc1 $f0, 0x0018($sp) /* 03384 80B473D4 44803000 */ mtc1 $zero, $f6 ## $f6 = 0.00 /* 03388 80B473D8 24180012 */ addiu $t8, $zero, 0x0012 ## $t8 = 00000012 /* 0338C 80B473DC AE1803DC */ sw $t8, 0x03DC($s0) ## 000003DC /* 03390 80B473E0 26040024 */ addiu $a0, $s0, 0x0024 ## $a0 = 00000024 /* 03394 80B473E4 860503FE */ lh $a1, 0x03FE($s0) ## 000003FE /* 03398 80B473E8 E6060068 */ swc1 $f6, 0x0068($s0) ## 00000068 -/* 0339C 80B473EC 0C2D11AA */ jal func_80B446A8 -/* 033A0 80B473F0 AFA40034 */ sw $a0, 0x0034($sp) -/* 033A4 80B473F4 8FA40034 */ lw $a0, 0x0034($sp) +/* 0339C 80B473EC 0C2D11AA */ jal func_80B446A8 +/* 033A0 80B473F0 AFA40034 */ sw $a0, 0x0034($sp) +/* 033A4 80B473F4 8FA40034 */ lw $a0, 0x0034($sp) /* 033A8 80B473F8 A60203FE */ sh $v0, 0x03FE($s0) ## 000003FE -/* 033AC 80B473FC 8FA70044 */ lw $a3, 0x0044($sp) +/* 033AC 80B473FC 8FA70044 */ lw $a3, 0x0044($sp) /* 033B0 80B47400 860503FE */ lh $a1, 0x03FE($s0) ## 000003FE -/* 033B4 80B47404 0C2D121C */ jal func_80B44870 +/* 033B4 80B47404 0C2D121C */ jal func_80B44870 /* 033B8 80B47408 86060400 */ lh $a2, 0x0400($s0) ## 00000400 /* 033BC 80B4740C 861900B6 */ lh $t9, 0x00B6($s0) ## 000000B6 /* 033C0 80B47410 3C0580B4 */ lui $a1, %hi(func_80B4743C) ## $a1 = 80B40000 /* 033C4 80B47414 A6020402 */ sh $v0, 0x0402($s0) ## 00000402 /* 033C8 80B47418 24A5743C */ addiu $a1, $a1, %lo(func_80B4743C) ## $a1 = 80B4743C /* 033CC 80B4741C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 033D0 80B47420 0C2D1014 */ jal func_80B44050 +/* 033D0 80B47420 0C2D1014 */ jal func_80B44050 /* 033D4 80B47424 A6190032 */ sh $t9, 0x0032($s0) ## 00000032 -/* 033D8 80B47428 8FBF002C */ lw $ra, 0x002C($sp) -/* 033DC 80B4742C 8FB00028 */ lw $s0, 0x0028($sp) +/* 033D8 80B47428 8FBF002C */ lw $ra, 0x002C($sp) +/* 033DC 80B4742C 8FB00028 */ lw $s0, 0x0028($sp) /* 033E0 80B47430 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 -/* 033E4 80B47434 03E00008 */ jr $ra +/* 033E4 80B47434 03E00008 */ jr $ra /* 033E8 80B47438 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B474E4.s b/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B474E4.s index 82e44a159a..f52a9c4e5d 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B474E4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B474E4.s @@ -1,15 +1,15 @@ glabel func_80B474E4 /* 03494 80B474E4 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 03498 80B474E8 AFBF0014 */ sw $ra, 0x0014($sp) +/* 03498 80B474E8 AFBF0014 */ sw $ra, 0x0014($sp) /* 0349C 80B474EC 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 /* 034A0 80B474F0 AC8003E4 */ sw $zero, 0x03E4($a0) ## 000003E4 /* 034A4 80B474F4 3C0580B5 */ lui $a1, %hi(D_80B4A280) ## $a1 = 80B50000 -/* 034A8 80B474F8 8CA5A280 */ lw $a1, %lo(D_80B4A280)($a1) -/* 034AC 80B474FC AFA70018 */ sw $a3, 0x0018($sp) +/* 034A8 80B474F8 8CA5A280 */ lw $a1, %lo(D_80B4A280)($a1) +/* 034AC 80B474FC AFA70018 */ sw $a3, 0x0018($sp) /* 034B0 80B47500 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 034B4 80B47504 0C029490 */ jal func_800A5240 +/* 034B4 80B47504 0C029490 */ jal SkelAnime_ChangeAnimTransitionStop /* 034B8 80B47508 3C06C080 */ lui $a2, 0xC080 ## $a2 = C0800000 -/* 034BC 80B4750C 8FA40018 */ lw $a0, 0x0018($sp) +/* 034BC 80B4750C 8FA40018 */ lw $a0, 0x0018($sp) /* 034C0 80B47510 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 /* 034C4 80B47514 240E0014 */ addiu $t6, $zero, 0x0014 ## $t6 = 00000014 /* 034C8 80B47518 3C0580B4 */ lui $a1, %hi(func_80B47544) ## $a1 = 80B40000 @@ -17,11 +17,11 @@ glabel func_80B474E4 /* 034D0 80B47520 AC8E03DC */ sw $t6, 0x03DC($a0) ## 000003DC /* 034D4 80B47524 E4800068 */ swc1 $f0, 0x0068($a0) ## 00000068 /* 034D8 80B47528 E480040C */ swc1 $f0, 0x040C($a0) ## 0000040C -/* 034DC 80B4752C 0C2D1014 */ jal func_80B44050 +/* 034DC 80B4752C 0C2D1014 */ jal func_80B44050 /* 034E0 80B47530 E4800408 */ swc1 $f0, 0x0408($a0) ## 00000408 -/* 034E4 80B47534 8FBF0014 */ lw $ra, 0x0014($sp) +/* 034E4 80B47534 8FBF0014 */ lw $ra, 0x0014($sp) /* 034E8 80B47538 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 034EC 80B4753C 03E00008 */ jr $ra +/* 034EC 80B4753C 03E00008 */ jr $ra /* 034F0 80B47540 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B47544.s b/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B47544.s index 8aa3b14482..ca67dc0e81 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B47544.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B47544.s @@ -3,119 +3,119 @@ glabel func_80B47544 /* 034F8 80B47548 27BDFFB8 */ addiu $sp, $sp, 0xFFB8 ## $sp = FFFFFFB8 /* 034FC 80B4754C 3C0143C8 */ lui $at, 0x43C8 ## $at = 43C80000 /* 03500 80B47550 44812000 */ mtc1 $at, $f4 ## $f4 = 400.00 -/* 03504 80B47554 AFB00028 */ sw $s0, 0x0028($sp) -/* 03508 80B47558 AFA5004C */ sw $a1, 0x004C($sp) +/* 03504 80B47554 AFB00028 */ sw $s0, 0x0028($sp) +/* 03508 80B47558 AFA5004C */ sw $a1, 0x004C($sp) /* 0350C 80B4755C 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 03510 80B47560 AFBF002C */ sw $ra, 0x002C($sp) -/* 03514 80B47564 44051000 */ mfc1 $a1, $f2 +/* 03510 80B47560 AFBF002C */ sw $ra, 0x002C($sp) +/* 03514 80B47564 44051000 */ mfc1 $a1, $f2 /* 03518 80B47568 24840068 */ addiu $a0, $a0, 0x0068 ## $a0 = 00000068 /* 0351C 80B4756C 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 03520 80B47570 3C073F00 */ lui $a3, 0x3F00 ## $a3 = 3F000000 -/* 03524 80B47574 E7A20010 */ swc1 $f2, 0x0010($sp) +/* 03524 80B47574 E7A20010 */ swc1 $f2, 0x0010($sp) /* 03528 80B47578 0C01E0C4 */ jal Math_SmoothScaleMaxMinF - -/* 0352C 80B4757C E7A40040 */ swc1 $f4, 0x0040($sp) + +/* 0352C 80B4757C E7A40040 */ swc1 $f4, 0x0040($sp) /* 03530 80B47580 8605008A */ lh $a1, 0x008A($s0) ## 0000008A /* 03534 80B47584 34018000 */ ori $at, $zero, 0x8000 ## $at = 00008000 -/* 03538 80B47588 AFA00010 */ sw $zero, 0x0010($sp) -/* 0353C 80B4758C 00A12821 */ addu $a1, $a1, $at -/* 03540 80B47590 00052C00 */ sll $a1, $a1, 16 -/* 03544 80B47594 00052C03 */ sra $a1, $a1, 16 +/* 03538 80B47588 AFA00010 */ sw $zero, 0x0010($sp) +/* 0353C 80B4758C 00A12821 */ addu $a1, $a1, $at +/* 03540 80B47590 00052C00 */ sll $a1, $a1, 16 +/* 03544 80B47594 00052C03 */ sra $a1, $a1, 16 /* 03548 80B47598 260400B6 */ addiu $a0, $s0, 0x00B6 ## $a0 = 000000B6 /* 0354C 80B4759C 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 /* 03550 80B475A0 0C01E1A7 */ jal Math_SmoothScaleMaxMinS - + /* 03554 80B475A4 24070FA0 */ addiu $a3, $zero, 0x0FA0 ## $a3 = 00000FA0 /* 03558 80B475A8 3C0143D2 */ lui $at, 0x43D2 ## $at = 43D20000 /* 0355C 80B475AC 44814000 */ mtc1 $at, $f8 ## $f8 = 420.00 /* 03560 80B475B0 C6060028 */ lwc1 $f6, 0x0028($s0) ## 00000028 /* 03564 80B475B4 3C01437A */ lui $at, 0x437A ## $at = 437A0000 -/* 03568 80B475B8 4606403E */ c.le.s $f8, $f6 +/* 03568 80B475B8 4606403E */ c.le.s $f8, $f6 /* 0356C 80B475BC 00000000 */ nop -/* 03570 80B475C0 45020005 */ bc1fl .L80B475D8 +/* 03570 80B475C0 45020005 */ bc1fl .L80B475D8 /* 03574 80B475C4 C6100090 */ lwc1 $f16, 0x0090($s0) ## 00000090 /* 03578 80B475C8 44815000 */ mtc1 $at, $f10 ## $f10 = 250.00 /* 0357C 80B475CC 00000000 */ nop -/* 03580 80B475D0 E7AA0040 */ swc1 $f10, 0x0040($sp) +/* 03580 80B475D0 E7AA0040 */ swc1 $f10, 0x0040($sp) /* 03584 80B475D4 C6100090 */ lwc1 $f16, 0x0090($s0) ## 00000090 .L80B475D8: -/* 03588 80B475D8 C7B20040 */ lwc1 $f18, 0x0040($sp) -/* 0358C 80B475DC 4612803C */ c.lt.s $f16, $f18 +/* 03588 80B475D8 C7B20040 */ lwc1 $f18, 0x0040($sp) +/* 0358C 80B475DC 4612803C */ c.lt.s $f16, $f18 /* 03590 80B475E0 00000000 */ nop -/* 03594 80B475E4 4502000D */ bc1fl .L80B4761C +/* 03594 80B475E4 4502000D */ bc1fl .L80B4761C /* 03598 80B475E8 8E1803E4 */ lw $t8, 0x03E4($s0) ## 000003E4 /* 0359C 80B475EC 8E0E03E4 */ lw $t6, 0x03E4($s0) ## 000003E4 /* 035A0 80B475F0 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 035A4 80B475F4 51C10009 */ beql $t6, $at, .L80B4761C +/* 035A4 80B475F4 51C10009 */ beql $t6, $at, .L80B4761C /* 035A8 80B475F8 8E1803E4 */ lw $t8, 0x03E4($s0) ## 000003E4 /* 035AC 80B475FC 860F0032 */ lh $t7, 0x0032($s0) ## 00000032 /* 035B0 80B47600 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 035B4 80B47604 A60F00B6 */ sh $t7, 0x00B6($s0) ## 000000B6 -/* 035B8 80B47608 0C2D1CD8 */ jal func_80B47360 -/* 035BC 80B4760C 8FA5004C */ lw $a1, 0x004C($sp) -/* 035C0 80B47610 1000005E */ beq $zero, $zero, .L80B4778C -/* 035C4 80B47614 8FBF002C */ lw $ra, 0x002C($sp) +/* 035B8 80B47608 0C2D1CD8 */ jal func_80B47360 +/* 035BC 80B4760C 8FA5004C */ lw $a1, 0x004C($sp) +/* 035C0 80B47610 1000005E */ beq $zero, $zero, .L80B4778C +/* 035C4 80B47614 8FBF002C */ lw $ra, 0x002C($sp) /* 035C8 80B47618 8E1803E4 */ lw $t8, 0x03E4($s0) ## 000003E4 .L80B4761C: /* 035CC 80B4761C 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 035D0 80B47620 8FA4004C */ lw $a0, 0x004C($sp) -/* 035D4 80B47624 53010004 */ beql $t8, $at, .L80B47638 +/* 035D0 80B47620 8FA4004C */ lw $a0, 0x004C($sp) +/* 035D4 80B47624 53010004 */ beql $t8, $at, .L80B47638 /* 035D8 80B47628 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C -/* 035DC 80B4762C 0C2D2793 */ jal func_80B49E4C +/* 035DC 80B4762C 0C2D2793 */ jal func_80B49E4C /* 035E0 80B47630 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 035E4 80B47634 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C .L80B47638: /* 035E8 80B47638 0C02927F */ jal SkelAnime_FrameUpdateMatrix - -/* 035EC 80B4763C AFA40034 */ sw $a0, 0x0034($sp) + +/* 035EC 80B4763C AFA40034 */ sw $a0, 0x0034($sp) /* 035F0 80B47640 44801000 */ mtc1 $zero, $f2 ## $f2 = 0.00 -/* 035F4 80B47644 50400047 */ beql $v0, $zero, .L80B47764 -/* 035F8 80B47648 8FAF004C */ lw $t7, 0x004C($sp) +/* 035F4 80B47644 50400047 */ beql $v0, $zero, .L80B47764 +/* 035F8 80B47648 8FAF004C */ lw $t7, 0x004C($sp) /* 035FC 80B4764C 8E1903E4 */ lw $t9, 0x03E4($s0) ## 000003E4 /* 03600 80B47650 240A0001 */ addiu $t2, $zero, 0x0001 ## $t2 = 00000001 /* 03604 80B47654 27280001 */ addiu $t0, $t9, 0x0001 ## $t0 = 00000001 -/* 03608 80B47658 29010003 */ slti $at, $t0, 0x0003 -/* 0360C 80B4765C 14200002 */ bne $at, $zero, .L80B47668 +/* 03608 80B47658 29010003 */ slti $at, $t0, 0x0003 +/* 0360C 80B4765C 14200002 */ bne $at, $zero, .L80B47668 /* 03610 80B47660 AE0803E4 */ sw $t0, 0x03E4($s0) ## 000003E4 /* 03614 80B47664 AE0003E4 */ sw $zero, 0x03E4($s0) ## 000003E4 .L80B47668: /* 03618 80B47668 C6040408 */ lwc1 $f4, 0x0408($s0) ## 00000408 -/* 0361C 80B4766C 46041032 */ c.eq.s $f2, $f4 +/* 0361C 80B4766C 46041032 */ c.eq.s $f2, $f4 /* 03620 80B47670 00000000 */ nop -/* 03624 80B47674 45020007 */ bc1fl .L80B47694 +/* 03624 80B47674 45020007 */ bc1fl .L80B47694 /* 03628 80B47678 AE0A03E4 */ sw $t2, 0x03E4($s0) ## 000003E4 /* 0362C 80B4767C C606040C */ lwc1 $f6, 0x040C($s0) ## 0000040C -/* 03630 80B47680 46061032 */ c.eq.s $f2, $f6 +/* 03630 80B47680 46061032 */ c.eq.s $f2, $f6 /* 03634 80B47684 00000000 */ nop -/* 03638 80B47688 45030003 */ bc1tl .L80B47698 +/* 03638 80B47688 45030003 */ bc1tl .L80B47698 /* 0363C 80B4768C 8E0B03E4 */ lw $t3, 0x03E4($s0) ## 000003E4 /* 03640 80B47690 AE0A03E4 */ sw $t2, 0x03E4($s0) ## 000003E4 .L80B47694: /* 03644 80B47694 8E0B03E4 */ lw $t3, 0x03E4($s0) ## 000003E4 .L80B47698: /* 03648 80B47698 3C0480B5 */ lui $a0, %hi(D_80B4A280) ## $a0 = 80B50000 -/* 0364C 80B4769C 000B6080 */ sll $t4, $t3, 2 -/* 03650 80B476A0 008C2021 */ addu $a0, $a0, $t4 +/* 0364C 80B4769C 000B6080 */ sll $t4, $t3, 2 +/* 03650 80B476A0 008C2021 */ addu $a0, $a0, $t4 /* 03654 80B476A4 0C028800 */ jal SkelAnime_GetFrameCount - -/* 03658 80B476A8 8C84A280 */ lw $a0, %lo(D_80B4A280)($a0) + +/* 03658 80B476A8 8C84A280 */ lw $a0, %lo(D_80B4A280)($a0) /* 0365C 80B476AC 8E0303E4 */ lw $v1, 0x03E4($s0) ## 000003E4 /* 03660 80B476B0 44824000 */ mtc1 $v0, $f8 ## $f8 = 0.00 /* 03664 80B476B4 44801000 */ mtc1 $zero, $f2 ## $f2 = 0.00 -/* 03668 80B476B8 10600008 */ beq $v1, $zero, .L80B476DC -/* 0366C 80B476BC 46804020 */ cvt.s.w $f0, $f8 +/* 03668 80B476B8 10600008 */ beq $v1, $zero, .L80B476DC +/* 0366C 80B476BC 46804020 */ cvt.s.w $f0, $f8 /* 03670 80B476C0 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 03674 80B476C4 1061000A */ beq $v1, $at, .L80B476F0 +/* 03674 80B476C4 1061000A */ beq $v1, $at, .L80B476F0 /* 03678 80B476C8 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 0367C 80B476CC 50610014 */ beql $v1, $at, .L80B47720 +/* 0367C 80B476CC 50610014 */ beql $v1, $at, .L80B47720 /* 03680 80B476D0 C6080080 */ lwc1 $f8, 0x0080($s0) ## 00000080 -/* 03684 80B476D4 10000017 */ beq $zero, $zero, .L80B47734 -/* 03688 80B476D8 00036880 */ sll $t5, $v1, 2 +/* 03684 80B476D4 10000017 */ beq $zero, $zero, .L80B47734 +/* 03688 80B476D8 00036880 */ sll $t5, $v1, 2 .L80B476DC: /* 0368C 80B476DC C60A0080 */ lwc1 $f10, 0x0080($s0) ## 00000080 /* 03690 80B476E0 E6020060 */ swc1 $f2, 0x0060($s0) ## 00000060 /* 03694 80B476E4 8E0303E4 */ lw $v1, 0x03E4($s0) ## 000003E4 -/* 03698 80B476E8 10000011 */ beq $zero, $zero, .L80B47730 +/* 03698 80B476E8 10000011 */ beq $zero, $zero, .L80B47730 /* 0369C 80B476EC E60A0028 */ swc1 $f10, 0x0028($s0) ## 00000028 .L80B476F0: /* 036A0 80B476F0 3C014120 */ lui $at, 0x4120 ## $at = 41200000 @@ -123,11 +123,11 @@ glabel func_80B47544 /* 036A8 80B476F8 C610040C */ lwc1 $f16, 0x040C($s0) ## 0000040C /* 036AC 80B476FC C6060408 */ lwc1 $f6, 0x0408($s0) ## 00000408 /* 036B0 80B47700 E6020408 */ swc1 $f2, 0x0408($s0) ## 00000408 -/* 036B4 80B47704 46128100 */ add.s $f4, $f16, $f18 +/* 036B4 80B47704 46128100 */ add.s $f4, $f16, $f18 /* 036B8 80B47708 E602040C */ swc1 $f2, 0x040C($s0) ## 0000040C /* 036BC 80B4770C 8E0303E4 */ lw $v1, 0x03E4($s0) ## 000003E4 /* 036C0 80B47710 E6060068 */ swc1 $f6, 0x0068($s0) ## 00000068 -/* 036C4 80B47714 10000006 */ beq $zero, $zero, .L80B47730 +/* 036C4 80B47714 10000006 */ beq $zero, $zero, .L80B47730 /* 036C8 80B47718 E6040060 */ swc1 $f4, 0x0060($s0) ## 00000060 /* 036CC 80B4771C C6080080 */ lwc1 $f8, 0x0080($s0) ## 00000080 .L80B47720: @@ -136,37 +136,37 @@ glabel func_80B47544 /* 036D8 80B47728 8E0303E4 */ lw $v1, 0x03E4($s0) ## 000003E4 /* 036DC 80B4772C E6080028 */ swc1 $f8, 0x0028($s0) ## 00000028 .L80B47730: -/* 036E0 80B47730 00036880 */ sll $t5, $v1, 2 +/* 036E0 80B47730 00036880 */ sll $t5, $v1, 2 .L80B47734: /* 036E4 80B47734 3C0580B5 */ lui $a1, %hi(D_80B4A280) ## $a1 = 80B50000 -/* 036E8 80B47738 00AD2821 */ addu $a1, $a1, $t5 -/* 036EC 80B4773C 44071000 */ mfc1 $a3, $f2 +/* 036E8 80B47738 00AD2821 */ addu $a1, $a1, $t5 +/* 036EC 80B4773C 44071000 */ mfc1 $a3, $f2 /* 036F0 80B47740 240E0002 */ addiu $t6, $zero, 0x0002 ## $t6 = 00000002 -/* 036F4 80B47744 AFAE0014 */ sw $t6, 0x0014($sp) -/* 036F8 80B47748 8CA5A280 */ lw $a1, %lo(D_80B4A280)($a1) -/* 036FC 80B4774C 8FA40034 */ lw $a0, 0x0034($sp) +/* 036F4 80B47744 AFAE0014 */ sw $t6, 0x0014($sp) +/* 036F8 80B47748 8CA5A280 */ lw $a1, %lo(D_80B4A280)($a1) +/* 036FC 80B4774C 8FA40034 */ lw $a0, 0x0034($sp) /* 03700 80B47750 3C063FC0 */ lui $a2, 0x3FC0 ## $a2 = 3FC00000 -/* 03704 80B47754 E7A00010 */ swc1 $f0, 0x0010($sp) -/* 03708 80B47758 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 0370C 80B4775C E7A20018 */ swc1 $f2, 0x0018($sp) -/* 03710 80B47760 8FAF004C */ lw $t7, 0x004C($sp) +/* 03704 80B47754 E7A00010 */ swc1 $f0, 0x0010($sp) +/* 03708 80B47758 0C029468 */ jal SkelAnime_ChangeAnim + +/* 0370C 80B4775C E7A20018 */ swc1 $f2, 0x0018($sp) +/* 03710 80B47760 8FAF004C */ lw $t7, 0x004C($sp) .L80B47764: /* 03714 80B47764 3C180001 */ lui $t8, 0x0001 ## $t8 = 00010000 /* 03718 80B47768 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0371C 80B4776C 030FC021 */ addu $t8, $t8, $t7 +/* 0371C 80B4776C 030FC021 */ addu $t8, $t8, $t7 /* 03720 80B47770 8F181DE4 */ lw $t8, 0x1DE4($t8) ## 00011DE4 /* 03724 80B47774 3319005F */ andi $t9, $t8, 0x005F ## $t9 = 00000000 -/* 03728 80B47778 57200004 */ bnel $t9, $zero, .L80B4778C -/* 0372C 80B4777C 8FBF002C */ lw $ra, 0x002C($sp) +/* 03728 80B47778 57200004 */ bnel $t9, $zero, .L80B4778C +/* 0372C 80B4777C 8FBF002C */ lw $ra, 0x002C($sp) /* 03730 80B47780 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 03734 80B47784 24053829 */ addiu $a1, $zero, 0x3829 ## $a1 = 00003829 -/* 03738 80B47788 8FBF002C */ lw $ra, 0x002C($sp) +/* 03738 80B47788 8FBF002C */ lw $ra, 0x002C($sp) .L80B4778C: -/* 0373C 80B4778C 8FB00028 */ lw $s0, 0x0028($sp) +/* 0373C 80B4778C 8FB00028 */ lw $s0, 0x0028($sp) /* 03740 80B47790 27BD0048 */ addiu $sp, $sp, 0x0048 ## $sp = 00000000 -/* 03744 80B47794 03E00008 */ jr $ra +/* 03744 80B47794 03E00008 */ jr $ra /* 03748 80B47798 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B4779C.s b/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B4779C.s index 05883445b3..77764a6229 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B4779C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B4779C.s @@ -1,35 +1,35 @@ glabel func_80B4779C /* 0374C 80B4779C 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 03750 80B477A0 AFB00018 */ sw $s0, 0x0018($sp) -/* 03754 80B477A4 AFA5002C */ sw $a1, 0x002C($sp) -/* 03758 80B477A8 AFBF001C */ sw $ra, 0x001C($sp) +/* 03750 80B477A0 AFB00018 */ sw $s0, 0x0018($sp) +/* 03754 80B477A4 AFA5002C */ sw $a1, 0x002C($sp) +/* 03758 80B477A8 AFBF001C */ sw $ra, 0x001C($sp) /* 0375C 80B477AC 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 03760 80B477B0 AC8003E4 */ sw $zero, 0x03E4($a0) ## 000003E4 /* 03764 80B477B4 3C0580B5 */ lui $a1, %hi(D_80B4A280) ## $a1 = 80B50000 -/* 03768 80B477B8 8CA5A280 */ lw $a1, %lo(D_80B4A280)($a1) -/* 0376C 80B477BC 0C02947A */ jal func_800A51E8 +/* 03768 80B477B8 8CA5A280 */ lw $a1, %lo(D_80B4A280)($a1) +/* 0376C 80B477BC 0C02947A */ jal SkelAnime_ChangeAnimDefaultStop /* 03770 80B477C0 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C /* 03774 80B477C4 240E0013 */ addiu $t6, $zero, 0x0013 ## $t6 = 00000013 /* 03778 80B477C8 AE0E03DC */ sw $t6, 0x03DC($s0) ## 000003DC /* 0377C 80B477CC 26040024 */ addiu $a0, $s0, 0x0024 ## $a0 = 00000024 /* 03780 80B477D0 860503FE */ lh $a1, 0x03FE($s0) ## 000003FE -/* 03784 80B477D4 0C2D11AA */ jal func_80B446A8 -/* 03788 80B477D8 AFA40024 */ sw $a0, 0x0024($sp) -/* 0378C 80B477DC 8FA40024 */ lw $a0, 0x0024($sp) +/* 03784 80B477D4 0C2D11AA */ jal func_80B446A8 +/* 03788 80B477D8 AFA40024 */ sw $a0, 0x0024($sp) +/* 0378C 80B477DC 8FA40024 */ lw $a0, 0x0024($sp) /* 03790 80B477E0 A60203FE */ sh $v0, 0x03FE($s0) ## 000003FE -/* 03794 80B477E4 8FA7002C */ lw $a3, 0x002C($sp) +/* 03794 80B477E4 8FA7002C */ lw $a3, 0x002C($sp) /* 03798 80B477E8 860503FE */ lh $a1, 0x03FE($s0) ## 000003FE -/* 0379C 80B477EC 0C2D121C */ jal func_80B44870 +/* 0379C 80B477EC 0C2D121C */ jal func_80B44870 /* 037A0 80B477F0 86060400 */ lh $a2, 0x0400($s0) ## 00000400 /* 037A4 80B477F4 3C0580B4 */ lui $a1, %hi(func_80B4781C) ## $a1 = 80B40000 /* 037A8 80B477F8 A6020402 */ sh $v0, 0x0402($s0) ## 00000402 /* 037AC 80B477FC 24A5781C */ addiu $a1, $a1, %lo(func_80B4781C) ## $a1 = 80B4781C -/* 037B0 80B47800 0C2D1014 */ jal func_80B44050 +/* 037B0 80B47800 0C2D1014 */ jal func_80B44050 /* 037B4 80B47804 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 037B8 80B47808 8FBF001C */ lw $ra, 0x001C($sp) -/* 037BC 80B4780C 8FB00018 */ lw $s0, 0x0018($sp) +/* 037B8 80B47808 8FBF001C */ lw $ra, 0x001C($sp) +/* 037BC 80B4780C 8FB00018 */ lw $s0, 0x0018($sp) /* 037C0 80B47810 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 037C4 80B47814 03E00008 */ jr $ra +/* 037C4 80B47814 03E00008 */ jr $ra /* 037C8 80B47818 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B4781C.s b/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B4781C.s index a9385b30dc..b97bf7212f 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B4781C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B4781C.s @@ -2,35 +2,35 @@ glabel func_80B4781C /* 037CC 80B4781C 27BDFF88 */ addiu $sp, $sp, 0xFF88 ## $sp = FFFFFF88 /* 037D0 80B47820 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 /* 037D4 80B47824 44812000 */ mtc1 $at, $f4 ## $f4 = 1.00 -/* 037D8 80B47828 AFB00034 */ sw $s0, 0x0034($sp) +/* 037D8 80B47828 AFB00034 */ sw $s0, 0x0034($sp) /* 037DC 80B4782C 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 037E0 80B47830 AFBF003C */ sw $ra, 0x003C($sp) -/* 037E4 80B47834 AFB10038 */ sw $s1, 0x0038($sp) -/* 037E8 80B47838 F7B40028 */ sdc1 $f20, 0x0028($sp) -/* 037EC 80B4783C E7A40070 */ swc1 $f4, 0x0070($sp) +/* 037E0 80B47830 AFBF003C */ sw $ra, 0x003C($sp) +/* 037E4 80B47834 AFB10038 */ sw $s1, 0x0038($sp) +/* 037E8 80B47838 F7B40028 */ sdc1 $f20, 0x0028($sp) +/* 037EC 80B4783C E7A40070 */ swc1 $f4, 0x0070($sp) /* 037F0 80B47840 860E0402 */ lh $t6, 0x0402($s0) ## 00000402 /* 037F4 80B47844 3C1880B5 */ lui $t8, %hi(D_80B4A090) ## $t8 = 80B50000 /* 037F8 80B47848 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 -/* 037FC 80B4784C 000E7880 */ sll $t7, $t6, 2 -/* 03800 80B47850 01EE7823 */ subu $t7, $t7, $t6 +/* 037FC 80B4784C 000E7880 */ sll $t7, $t6, 2 +/* 03800 80B47850 01EE7823 */ subu $t7, $t7, $t6 /* 03804 80B47854 3C0180B5 */ lui $at, %hi(D_80B4A388) ## $at = 80B50000 -/* 03808 80B47858 000F7880 */ sll $t7, $t7, 2 +/* 03808 80B47858 000F7880 */ sll $t7, $t7, 2 /* 0380C 80B4785C 2718A090 */ addiu $t8, $t8, %lo(D_80B4A090) ## $t8 = 80B4A090 -/* 03810 80B47860 C434A388 */ lwc1 $f20, %lo(D_80B4A388)($at) -/* 03814 80B47864 0C00B6EC */ jal func_8002DBB0 -/* 03818 80B47868 01F82821 */ addu $a1, $t7, $t8 -/* 0381C 80B4786C E7A00074 */ swc1 $f0, 0x0074($sp) +/* 03810 80B47860 C434A388 */ lwc1 $f20, %lo(D_80B4A388)($at) +/* 03814 80B47864 0C00B6EC */ jal func_8002DBB0 +/* 03818 80B47868 01F82821 */ addu $a1, $t7, $t8 +/* 0381C 80B4786C E7A00074 */ swc1 $f0, 0x0074($sp) /* 03820 80B47870 8E1903E4 */ lw $t9, 0x03E4($s0) ## 000003E4 /* 03824 80B47874 3C080001 */ lui $t0, 0x0001 ## $t0 = 00010000 -/* 03828 80B47878 01114021 */ addu $t0, $t0, $s1 -/* 0382C 80B4787C AFB90054 */ sw $t9, 0x0054($sp) +/* 03828 80B47878 01114021 */ addu $t0, $t0, $s1 +/* 0382C 80B4787C AFB90054 */ sw $t9, 0x0054($sp) /* 03830 80B47880 8D081DE4 */ lw $t0, 0x1DE4($t0) ## 00011DE4 /* 03834 80B47884 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 03838 80B47888 3109005F */ andi $t1, $t0, 0x005F ## $t1 = 00000000 -/* 0383C 80B4788C 55200004 */ bnel $t1, $zero, .L80B478A0 +/* 0383C 80B4788C 55200004 */ bnel $t1, $zero, .L80B478A0 /* 03840 80B47890 3C0143D2 */ lui $at, 0x43D2 ## $at = 43D20000 /* 03844 80B47894 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 03848 80B47898 24053829 */ addiu $a1, $zero, 0x3829 ## $a1 = 00003829 /* 0384C 80B4789C 3C0143D2 */ lui $at, 0x43D2 ## $at = 43D20000 .L80B478A0: @@ -38,9 +38,9 @@ glabel func_80B4781C /* 03854 80B478A4 C6060028 */ lwc1 $f6, 0x0028($s0) ## 00000028 /* 03858 80B478A8 3C01438C */ lui $at, 0x438C ## $at = 438C0000 /* 0385C 80B478AC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 03860 80B478B0 4606403E */ c.le.s $f8, $f6 +/* 03860 80B478B0 4606403E */ c.le.s $f8, $f6 /* 03864 80B478B4 00000000 */ nop -/* 03868 80B478B8 45020004 */ bc1fl .L80B478CC +/* 03868 80B478B8 45020004 */ bc1fl .L80B478CC /* 0386C 80B478BC 860A0402 */ lh $t2, 0x0402($s0) ## 00000402 /* 03870 80B478C0 4481A000 */ mtc1 $at, $f20 ## $f20 = 280.00 /* 03874 80B478C4 00000000 */ nop @@ -48,73 +48,73 @@ glabel func_80B4781C .L80B478CC: /* 0387C 80B478CC 3C0C80B5 */ lui $t4, %hi(D_80B4A090) ## $t4 = 80B50000 /* 03880 80B478D0 258CA090 */ addiu $t4, $t4, %lo(D_80B4A090) ## $t4 = 80B4A090 -/* 03884 80B478D4 000A5880 */ sll $t3, $t2, 2 -/* 03888 80B478D8 016A5823 */ subu $t3, $t3, $t2 -/* 0388C 80B478DC 000B5880 */ sll $t3, $t3, 2 -/* 03890 80B478E0 0C00B6B0 */ jal func_8002DAC0 -/* 03894 80B478E4 016C2821 */ addu $a1, $t3, $t4 -/* 03898 80B478E8 A7A2005A */ sh $v0, 0x005A($sp) +/* 03884 80B478D4 000A5880 */ sll $t3, $t2, 2 +/* 03888 80B478D8 016A5823 */ subu $t3, $t3, $t2 +/* 0388C 80B478DC 000B5880 */ sll $t3, $t3, 2 +/* 03890 80B478E0 0C00B6B0 */ jal func_8002DAC0 +/* 03894 80B478E4 016C2821 */ addu $a1, $t3, $t4 +/* 03898 80B478E8 A7A2005A */ sh $v0, 0x005A($sp) /* 0389C 80B478EC 8E0703E4 */ lw $a3, 0x03E4($s0) ## 000003E4 /* 038A0 80B478F0 3C0380B5 */ lui $v1, %hi(D_80B4AB30) ## $v1 = 80B50000 -/* 038A4 80B478F4 87AD005A */ lh $t5, 0x005A($sp) -/* 038A8 80B478F8 10E00008 */ beq $a3, $zero, .L80B4791C +/* 038A4 80B478F4 87AD005A */ lh $t5, 0x005A($sp) +/* 038A8 80B478F8 10E00008 */ beq $a3, $zero, .L80B4791C /* 038AC 80B478FC 34018000 */ ori $at, $zero, 0x8000 ## $at = 00008000 /* 038B0 80B47900 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 038B4 80B47904 10E10066 */ beq $a3, $at, .L80B47AA0 +/* 038B4 80B47904 10E10066 */ beq $a3, $at, .L80B47AA0 /* 038B8 80B47908 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 038BC 80B4790C 50E100BD */ beql $a3, $at, .L80B47C04 +/* 038BC 80B4790C 50E100BD */ beql $a3, $at, .L80B47C04 /* 038C0 80B47910 C606015C */ lwc1 $f6, 0x015C($s0) ## 0000015C -/* 038C4 80B47914 100000C3 */ beq $zero, $zero, .L80B47C24 -/* 038C8 80B47918 8FAB0054 */ lw $t3, 0x0054($sp) +/* 038C4 80B47914 100000C3 */ beq $zero, $zero, .L80B47C24 +/* 038C8 80B47918 8FAB0054 */ lw $t3, 0x0054($sp) .L80B4791C: /* 038CC 80B4791C A60D0032 */ sh $t5, 0x0032($s0) ## 00000032 -/* 038D0 80B47920 87AE005A */ lh $t6, 0x005A($sp) +/* 038D0 80B47920 87AE005A */ lh $t6, 0x005A($sp) /* 038D4 80B47924 2463AB30 */ addiu $v1, $v1, %lo(D_80B4AB30) ## $v1 = 80B4AB30 /* 038D8 80B47928 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 038DC 80B4792C 01C17821 */ addu $t7, $t6, $at +/* 038DC 80B4792C 01C17821 */ addu $t7, $t6, $at /* 038E0 80B47930 A60F00B6 */ sh $t7, 0x00B6($s0) ## 000000B6 /* 038E4 80B47934 AC600000 */ sw $zero, 0x0000($v1) ## 80B4AB30 /* 038E8 80B47938 861803FE */ lh $t8, 0x03FE($s0) ## 000003FE /* 038EC 80B4793C 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 /* 038F0 80B47940 3C0642D6 */ lui $a2, 0x42D6 ## $a2 = 42D60000 -/* 038F4 80B47944 0C2D1016 */ jal func_80B44058 +/* 038F4 80B47944 0C2D1016 */ jal func_80B44058 /* 038F8 80B47948 A6180400 */ sh $t8, 0x0400($s0) ## 00000400 -/* 038FC 80B4794C 2C430001 */ sltiu $v1, $v0, 0x0001 -/* 03900 80B47950 AFA30050 */ sw $v1, 0x0050($sp) +/* 038FC 80B4794C 2C430001 */ sltiu $v1, $v0, 0x0001 +/* 03900 80B47950 AFA30050 */ sw $v1, 0x0050($sp) /* 03904 80B47954 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 03908 80B47958 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 0390C 80B4795C 0C2D1016 */ jal func_80B44058 +/* 0390C 80B4795C 0C2D1016 */ jal func_80B44058 /* 03910 80B47960 3C06435C */ lui $a2, 0x435C ## $a2 = 435C0000 -/* 03914 80B47964 8FA30050 */ lw $v1, 0x0050($sp) +/* 03914 80B47964 8FA30050 */ lw $v1, 0x0050($sp) /* 03918 80B47968 8E0903E4 */ lw $t1, 0x03E4($s0) ## 000003E4 -/* 0391C 80B4796C 2C590001 */ sltiu $t9, $v0, 0x0001 -/* 03920 80B47970 00194040 */ sll $t0, $t9, 1 +/* 0391C 80B4796C 2C590001 */ sltiu $t9, $v0, 0x0001 +/* 03920 80B47970 00194040 */ sll $t0, $t9, 1 /* 03924 80B47974 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 /* 03928 80B47978 00681825 */ or $v1, $v1, $t0 ## $v1 = 00000000 /* 0392C 80B4797C 252A0001 */ addiu $t2, $t1, 0x0001 ## $t2 = 00000001 -/* 03930 80B47980 10610006 */ beq $v1, $at, .L80B4799C +/* 03930 80B47980 10610006 */ beq $v1, $at, .L80B4799C /* 03934 80B47984 AE0A03E4 */ sw $t2, 0x03E4($s0) ## 000003E4 /* 03938 80B47988 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 0393C 80B4798C 10610012 */ beq $v1, $at, .L80B479D8 +/* 0393C 80B4798C 10610012 */ beq $v1, $at, .L80B479D8 /* 03940 80B47990 24010003 */ addiu $at, $zero, 0x0003 ## $at = 00000003 -/* 03944 80B47994 54610018 */ bnel $v1, $at, .L80B479F8 +/* 03944 80B47994 54610018 */ bnel $v1, $at, .L80B479F8 /* 03948 80B47998 3C0142D6 */ lui $at, 0x42D6 ## $at = 42D60000 .L80B4799C: /* 0394C 80B4799C 960B0088 */ lhu $t3, 0x0088($s0) ## 00000088 /* 03950 80B479A0 3C014140 */ lui $at, 0x4140 ## $at = 41400000 /* 03954 80B479A4 44815000 */ mtc1 $at, $f10 ## $f10 = 12.00 /* 03958 80B479A8 316C0008 */ andi $t4, $t3, 0x0008 ## $t4 = 00000000 -/* 0395C 80B479AC 11800006 */ beq $t4, $zero, .L80B479C8 +/* 0395C 80B479AC 11800006 */ beq $t4, $zero, .L80B479C8 /* 03960 80B479B0 E60A0060 */ swc1 $f10, 0x0060($s0) ## 00000060 /* 03964 80B479B4 3C014100 */ lui $at, 0x4100 ## $at = 41000000 /* 03968 80B479B8 44819000 */ mtc1 $at, $f18 ## $f18 = 8.00 /* 0396C 80B479BC C6100060 */ lwc1 $f16, 0x0060($s0) ## 00000060 -/* 03970 80B479C0 46128100 */ add.s $f4, $f16, $f18 +/* 03970 80B479C0 46128100 */ add.s $f4, $f16, $f18 /* 03974 80B479C4 E6040060 */ swc1 $f4, 0x0060($s0) ## 00000060 .L80B479C8: /* 03978 80B479C8 3C014100 */ lui $at, 0x4100 ## $at = 41000000 /* 0397C 80B479CC 44813000 */ mtc1 $at, $f6 ## $f6 = 8.00 -/* 03980 80B479D0 10000031 */ beq $zero, $zero, .L80B47A98 +/* 03980 80B479D0 10000031 */ beq $zero, $zero, .L80B47A98 /* 03984 80B479D4 E6060068 */ swc1 $f6, 0x0068($s0) ## 00000068 .L80B479D8: /* 03988 80B479D8 3C014170 */ lui $at, 0x4170 ## $at = 41700000 @@ -122,7 +122,7 @@ glabel func_80B4781C /* 03990 80B479E0 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 /* 03994 80B479E4 44815000 */ mtc1 $at, $f10 ## $f10 = 20.00 /* 03998 80B479E8 E6080060 */ swc1 $f8, 0x0060($s0) ## 00000060 -/* 0399C 80B479EC 1000002A */ beq $zero, $zero, .L80B47A98 +/* 0399C 80B479EC 1000002A */ beq $zero, $zero, .L80B47A98 /* 039A0 80B479F0 E60A0068 */ swc1 $f10, 0x0068($s0) ## 00000068 /* 039A4 80B479F4 3C0142D6 */ lui $at, 0x42D6 ## $at = 42D60000 .L80B479F8: @@ -132,57 +132,57 @@ glabel func_80B4781C /* 039B4 80B47A04 3C014100 */ lui $at, 0x4100 ## $at = 41000000 /* 039B8 80B47A08 44812000 */ mtc1 $at, $f4 ## $f4 = 8.00 /* 039BC 80B47A0C 3C0180B5 */ lui $at, %hi(D_80B4A38C) ## $at = 80B50000 -/* 039C0 80B47A10 C426A38C */ lwc1 $f6, %lo(D_80B4A38C)($at) +/* 039C0 80B47A10 C426A38C */ lwc1 $f6, %lo(D_80B4A38C)($at) /* 039C4 80B47A14 24030014 */ addiu $v1, $zero, 0x0014 ## $v1 = 00000014 -/* 039C8 80B47A18 46128500 */ add.s $f20, $f16, $f18 -/* 039CC 80B47A1C 46062000 */ add.s $f0, $f4, $f6 +/* 039C8 80B47A18 46128500 */ add.s $f20, $f16, $f18 +/* 039CC 80B47A1C 46062000 */ add.s $f0, $f4, $f6 .L80B47A20: -/* 039D0 80B47A20 4406A000 */ mfc1 $a2, $f20 +/* 039D0 80B47A20 4406A000 */ mfc1 $a2, $f20 /* 039D4 80B47A24 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 039D8 80B47A28 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 039DC 80B47A2C AFA3004C */ sw $v1, 0x004C($sp) -/* 039E0 80B47A30 0C2D1016 */ jal func_80B44058 -/* 039E4 80B47A34 E7A00060 */ swc1 $f0, 0x0060($sp) -/* 039E8 80B47A38 8FA3004C */ lw $v1, 0x004C($sp) -/* 039EC 80B47A3C 14400006 */ bne $v0, $zero, .L80B47A58 -/* 039F0 80B47A40 C7A00060 */ lwc1 $f0, 0x0060($sp) +/* 039DC 80B47A2C AFA3004C */ sw $v1, 0x004C($sp) +/* 039E0 80B47A30 0C2D1016 */ jal func_80B44058 +/* 039E4 80B47A34 E7A00060 */ swc1 $f0, 0x0060($sp) +/* 039E8 80B47A38 8FA3004C */ lw $v1, 0x004C($sp) +/* 039EC 80B47A3C 14400006 */ bne $v0, $zero, .L80B47A58 +/* 039F0 80B47A40 C7A00060 */ lwc1 $f0, 0x0060($sp) /* 039F4 80B47A44 3C014140 */ lui $at, 0x4140 ## $at = 41400000 /* 039F8 80B47A48 44814000 */ mtc1 $at, $f8 ## $f8 = 12.00 /* 039FC 80B47A4C E6000068 */ swc1 $f0, 0x0068($s0) ## 00000068 -/* 03A00 80B47A50 10000009 */ beq $zero, $zero, .L80B47A78 +/* 03A00 80B47A50 10000009 */ beq $zero, $zero, .L80B47A78 /* 03A04 80B47A54 E6080060 */ swc1 $f8, 0x0060($s0) ## 00000060 .L80B47A58: /* 03A08 80B47A58 3C014120 */ lui $at, 0x4120 ## $at = 41200000 /* 03A0C 80B47A5C 44819000 */ mtc1 $at, $f18 ## $f18 = 10.00 /* 03A10 80B47A60 3C0180B5 */ lui $at, %hi(D_80B4A390) ## $at = 80B50000 -/* 03A14 80B47A64 C430A390 */ lwc1 $f16, %lo(D_80B4A390)($at) -/* 03A18 80B47A68 4612A500 */ add.s $f20, $f20, $f18 +/* 03A14 80B47A64 C430A390 */ lwc1 $f16, %lo(D_80B4A390)($at) +/* 03A18 80B47A68 4612A500 */ add.s $f20, $f20, $f18 /* 03A1C 80B47A6C 2463FFFF */ addiu $v1, $v1, 0xFFFF ## $v1 = FFFFFFFF -/* 03A20 80B47A70 0461FFEB */ bgez $v1, .L80B47A20 -/* 03A24 80B47A74 46100000 */ add.s $f0, $f0, $f16 +/* 03A20 80B47A70 0461FFEB */ bgez $v1, .L80B47A20 +/* 03A24 80B47A74 46100000 */ add.s $f0, $f0, $f16 .L80B47A78: /* 03A28 80B47A78 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 /* 03A2C 80B47A7C C6120068 */ lwc1 $f18, 0x0068($s0) ## 00000068 -/* 03A30 80B47A80 46120032 */ c.eq.s $f0, $f18 +/* 03A30 80B47A80 46120032 */ c.eq.s $f0, $f18 /* 03A34 80B47A84 00000000 */ nop -/* 03A38 80B47A88 45000003 */ bc1f .L80B47A98 +/* 03A38 80B47A88 45000003 */ bc1f .L80B47A98 /* 03A3C 80B47A8C 00000000 */ nop -/* 03A40 80B47A90 0C2D1D39 */ jal func_80B474E4 +/* 03A40 80B47A90 0C2D1D39 */ jal func_80B474E4 /* 03A44 80B47A94 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 .L80B47A98: -/* 03A48 80B47A98 10000061 */ beq $zero, $zero, .L80B47C20 +/* 03A48 80B47A98 10000061 */ beq $zero, $zero, .L80B47C20 /* 03A4C 80B47A9C 8E0703E4 */ lw $a3, 0x03E4($s0) ## 000003E4 .L80B47AA0: /* 03A50 80B47AA0 96020088 */ lhu $v0, 0x0088($s0) ## 00000088 /* 03A54 80B47AA4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 03A58 80B47AA8 304D0002 */ andi $t5, $v0, 0x0002 ## $t5 = 00000000 -/* 03A5C 80B47AAC 15A00003 */ bne $t5, $zero, .L80B47ABC +/* 03A5C 80B47AAC 15A00003 */ bne $t5, $zero, .L80B47ABC /* 03A60 80B47AB0 304E0001 */ andi $t6, $v0, 0x0001 ## $t6 = 00000000 -/* 03A64 80B47AB4 11C00042 */ beq $t6, $zero, .L80B47BC0 -/* 03A68 80B47AB8 87A5005A */ lh $a1, 0x005A($sp) +/* 03A64 80B47AB4 11C00042 */ beq $t6, $zero, .L80B47BC0 +/* 03A68 80B47AB8 87A5005A */ lh $a1, 0x005A($sp) .L80B47ABC: /* 03A6C 80B47ABC 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 03A70 80B47AC0 24053828 */ addiu $a1, $zero, 0x3828 ## $a1 = 00003828 /* 03A74 80B47AC4 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 /* 03A78 80B47AC8 C6040080 */ lwc1 $f4, 0x0080($s0) ## 00000080 @@ -192,111 +192,111 @@ glabel func_80B4781C /* 03A88 80B47AD8 E6000068 */ swc1 $f0, 0x0068($s0) ## 00000068 /* 03A8C 80B47ADC 44813000 */ mtc1 $at, $f6 ## $f6 = 2.00 /* 03A90 80B47AE0 240F0002 */ addiu $t7, $zero, 0x0002 ## $t7 = 00000002 -/* 03A94 80B47AE4 AFAF0010 */ sw $t7, 0x0010($sp) -/* 03A98 80B47AE8 AFA00020 */ sw $zero, 0x0020($sp) -/* 03A9C 80B47AEC AFA0001C */ sw $zero, 0x001C($sp) -/* 03AA0 80B47AF0 AFA00018 */ sw $zero, 0x0018($sp) +/* 03A94 80B47AE4 AFAF0010 */ sw $t7, 0x0010($sp) +/* 03A98 80B47AE8 AFA00020 */ sw $zero, 0x0020($sp) +/* 03A9C 80B47AEC AFA0001C */ sw $zero, 0x001C($sp) +/* 03AA0 80B47AF0 AFA00018 */ sw $zero, 0x0018($sp) /* 03AA4 80B47AF4 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 03AA8 80B47AF8 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 03AAC 80B47AFC 260604F0 */ addiu $a2, $s0, 0x04F0 ## $a2 = 000004F0 /* 03AB0 80B47B00 3C074040 */ lui $a3, 0x4040 ## $a3 = 40400000 -/* 03AB4 80B47B04 0C00CC98 */ jal func_80033260 -/* 03AB8 80B47B08 E7A60014 */ swc1 $f6, 0x0014($sp) +/* 03AB4 80B47B04 0C00CC98 */ jal func_80033260 +/* 03AB8 80B47B08 E7A60014 */ swc1 $f6, 0x0014($sp) /* 03ABC 80B47B0C 3C014000 */ lui $at, 0x4000 ## $at = 40000000 /* 03AC0 80B47B10 44814000 */ mtc1 $at, $f8 ## $f8 = 2.00 /* 03AC4 80B47B14 24180002 */ addiu $t8, $zero, 0x0002 ## $t8 = 00000002 -/* 03AC8 80B47B18 AFB80010 */ sw $t8, 0x0010($sp) +/* 03AC8 80B47B18 AFB80010 */ sw $t8, 0x0010($sp) /* 03ACC 80B47B1C 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 03AD0 80B47B20 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 03AD4 80B47B24 260604E4 */ addiu $a2, $s0, 0x04E4 ## $a2 = 000004E4 /* 03AD8 80B47B28 3C074040 */ lui $a3, 0x4040 ## $a3 = 40400000 -/* 03ADC 80B47B2C AFA00018 */ sw $zero, 0x0018($sp) -/* 03AE0 80B47B30 AFA0001C */ sw $zero, 0x001C($sp) -/* 03AE4 80B47B34 AFA00020 */ sw $zero, 0x0020($sp) -/* 03AE8 80B47B38 0C00CC98 */ jal func_80033260 -/* 03AEC 80B47B3C E7A80014 */ swc1 $f8, 0x0014($sp) +/* 03ADC 80B47B2C AFA00018 */ sw $zero, 0x0018($sp) +/* 03AE0 80B47B30 AFA0001C */ sw $zero, 0x001C($sp) +/* 03AE4 80B47B34 AFA00020 */ sw $zero, 0x0020($sp) +/* 03AE8 80B47B38 0C00CC98 */ jal func_80033260 +/* 03AEC 80B47B3C E7A80014 */ swc1 $f8, 0x0014($sp) /* 03AF0 80B47B40 C60A0090 */ lwc1 $f10, 0x0090($s0) ## 00000090 -/* 03AF4 80B47B44 C7B00074 */ lwc1 $f16, 0x0074($sp) +/* 03AF4 80B47B44 C7B00074 */ lwc1 $f16, 0x0074($sp) /* 03AF8 80B47B48 3C0142A0 */ lui $at, 0x42A0 ## $at = 42A00000 -/* 03AFC 80B47B4C 460AA03E */ c.le.s $f20, $f10 +/* 03AFC 80B47B4C 460AA03E */ c.le.s $f20, $f10 /* 03B00 80B47B50 00000000 */ nop -/* 03B04 80B47B54 45020006 */ bc1fl .L80B47B70 +/* 03B04 80B47B54 45020006 */ bc1fl .L80B47B70 /* 03B08 80B47B58 44819000 */ mtc1 $at, $f18 ## $f18 = 80.00 -/* 03B0C 80B47B5C 0C2D1D39 */ jal func_80B474E4 +/* 03B0C 80B47B5C 0C2D1D39 */ jal func_80B474E4 /* 03B10 80B47B60 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 03B14 80B47B64 10000012 */ beq $zero, $zero, .L80B47BB0 +/* 03B14 80B47B64 10000012 */ beq $zero, $zero, .L80B47BB0 /* 03B18 80B47B68 3C014000 */ lui $at, 0x4000 ## $at = 40000000 /* 03B1C 80B47B6C 44819000 */ mtc1 $at, $f18 ## $f18 = 2.00 .L80B47B70: /* 03B20 80B47B70 26040024 */ addiu $a0, $s0, 0x0024 ## $a0 = 00000024 -/* 03B24 80B47B74 4612803C */ c.lt.s $f16, $f18 +/* 03B24 80B47B74 4612803C */ c.lt.s $f16, $f18 /* 03B28 80B47B78 00000000 */ nop -/* 03B2C 80B47B7C 4502000C */ bc1fl .L80B47BB0 +/* 03B2C 80B47B7C 4502000C */ bc1fl .L80B47BB0 /* 03B30 80B47B80 3C014000 */ lui $at, 0x4000 ## $at = 40000000 /* 03B34 80B47B84 860503FE */ lh $a1, 0x03FE($s0) ## 000003FE -/* 03B38 80B47B88 0C2D11AA */ jal func_80B446A8 -/* 03B3C 80B47B8C AFA40044 */ sw $a0, 0x0044($sp) -/* 03B40 80B47B90 8FA40044 */ lw $a0, 0x0044($sp) +/* 03B38 80B47B88 0C2D11AA */ jal func_80B446A8 +/* 03B3C 80B47B8C AFA40044 */ sw $a0, 0x0044($sp) +/* 03B40 80B47B90 8FA40044 */ lw $a0, 0x0044($sp) /* 03B44 80B47B94 A60203FE */ sh $v0, 0x03FE($s0) ## 000003FE /* 03B48 80B47B98 860503FE */ lh $a1, 0x03FE($s0) ## 000003FE /* 03B4C 80B47B9C 86060400 */ lh $a2, 0x0400($s0) ## 00000400 -/* 03B50 80B47BA0 0C2D121C */ jal func_80B44870 +/* 03B50 80B47BA0 0C2D121C */ jal func_80B44870 /* 03B54 80B47BA4 02203825 */ or $a3, $s1, $zero ## $a3 = 00000000 /* 03B58 80B47BA8 A6020402 */ sh $v0, 0x0402($s0) ## 00000402 /* 03B5C 80B47BAC 3C014000 */ lui $at, 0x4000 ## $at = 40000000 .L80B47BB0: /* 03B60 80B47BB0 44812000 */ mtc1 $at, $f4 ## $f4 = 2.00 /* 03B64 80B47BB4 AE0003E4 */ sw $zero, 0x03E4($s0) ## 000003E4 -/* 03B68 80B47BB8 1000000F */ beq $zero, $zero, .L80B47BF8 -/* 03B6C 80B47BBC E7A40070 */ swc1 $f4, 0x0070($sp) +/* 03B68 80B47BB8 1000000F */ beq $zero, $zero, .L80B47BF8 +/* 03B6C 80B47BBC E7A40070 */ swc1 $f4, 0x0070($sp) .L80B47BC0: /* 03B70 80B47BC0 26040032 */ addiu $a0, $s0, 0x0032 ## $a0 = 00000032 /* 03B74 80B47BC4 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 /* 03B78 80B47BC8 24070FA0 */ addiu $a3, $zero, 0x0FA0 ## $a3 = 00000FA0 /* 03B7C 80B47BCC 0C01E1A7 */ jal Math_SmoothScaleMaxMinS - -/* 03B80 80B47BD0 AFA00010 */ sw $zero, 0x0010($sp) + +/* 03B80 80B47BD0 AFA00010 */ sw $zero, 0x0010($sp) /* 03B84 80B47BD4 86190032 */ lh $t9, 0x0032($s0) ## 00000032 /* 03B88 80B47BD8 34018000 */ ori $at, $zero, 0x8000 ## $at = 00008000 /* 03B8C 80B47BDC 3C0380B5 */ lui $v1, %hi(D_80B4AB30) ## $v1 = 80B50000 -/* 03B90 80B47BE0 03214021 */ addu $t0, $t9, $at +/* 03B90 80B47BE0 03214021 */ addu $t0, $t9, $at /* 03B94 80B47BE4 2463AB30 */ addiu $v1, $v1, %lo(D_80B4AB30) ## $v1 = 80B4AB30 /* 03B98 80B47BE8 A60800B6 */ sh $t0, 0x00B6($s0) ## 000000B6 /* 03B9C 80B47BEC 8C690000 */ lw $t1, 0x0000($v1) ## 80B4AB30 /* 03BA0 80B47BF0 252A0001 */ addiu $t2, $t1, 0x0001 ## $t2 = 00000001 /* 03BA4 80B47BF4 AC6A0000 */ sw $t2, 0x0000($v1) ## 80B4AB30 .L80B47BF8: -/* 03BA8 80B47BF8 10000009 */ beq $zero, $zero, .L80B47C20 +/* 03BA8 80B47BF8 10000009 */ beq $zero, $zero, .L80B47C20 /* 03BAC 80B47BFC 8E0703E4 */ lw $a3, 0x03E4($s0) ## 000003E4 /* 03BB0 80B47C00 C606015C */ lwc1 $f6, 0x015C($s0) ## 0000015C .L80B47C04: /* 03BB4 80B47C04 C6080164 */ lwc1 $f8, 0x0164($s0) ## 00000164 -/* 03BB8 80B47C08 46083032 */ c.eq.s $f6, $f8 +/* 03BB8 80B47C08 46083032 */ c.eq.s $f6, $f8 /* 03BBC 80B47C0C 00000000 */ nop -/* 03BC0 80B47C10 45020004 */ bc1fl .L80B47C24 -/* 03BC4 80B47C14 8FAB0054 */ lw $t3, 0x0054($sp) +/* 03BC0 80B47C10 45020004 */ bc1fl .L80B47C24 +/* 03BC4 80B47C14 8FAB0054 */ lw $t3, 0x0054($sp) /* 03BC8 80B47C18 AE0003E4 */ sw $zero, 0x03E4($s0) ## 000003E4 /* 03BCC 80B47C1C 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 .L80B47C20: -/* 03BD0 80B47C20 8FAB0054 */ lw $t3, 0x0054($sp) +/* 03BD0 80B47C20 8FAB0054 */ lw $t3, 0x0054($sp) .L80B47C24: /* 03BD4 80B47C24 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C -/* 03BD8 80B47C28 00076080 */ sll $t4, $a3, 2 -/* 03BDC 80B47C2C 11670005 */ beq $t3, $a3, .L80B47C44 +/* 03BD8 80B47C28 00076080 */ sll $t4, $a3, 2 +/* 03BDC 80B47C2C 11670005 */ beq $t3, $a3, .L80B47C44 /* 03BE0 80B47C30 3C0580B5 */ lui $a1, %hi(D_80B4A280) ## $a1 = 80B50000 -/* 03BE4 80B47C34 00AC2821 */ addu $a1, $a1, $t4 -/* 03BE8 80B47C38 8CA5A280 */ lw $a1, %lo(D_80B4A280)($a1) -/* 03BEC 80B47C3C 0C0294A7 */ jal func_800A529C -/* 03BF0 80B47C40 8FA60070 */ lw $a2, 0x0070($sp) +/* 03BE4 80B47C34 00AC2821 */ addu $a1, $a1, $t4 +/* 03BE8 80B47C38 8CA5A280 */ lw $a1, %lo(D_80B4A280)($a1) +/* 03BEC 80B47C3C 0C0294A7 */ jal SkelAnime_ChangeAnimPlaybackStop +/* 03BF0 80B47C40 8FA60070 */ lw $a2, 0x0070($sp) .L80B47C44: /* 03BF4 80B47C44 0C02927F */ jal SkelAnime_FrameUpdateMatrix - + /* 03BF8 80B47C48 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C -/* 03BFC 80B47C4C 8FBF003C */ lw $ra, 0x003C($sp) -/* 03C00 80B47C50 D7B40028 */ ldc1 $f20, 0x0028($sp) -/* 03C04 80B47C54 8FB00034 */ lw $s0, 0x0034($sp) -/* 03C08 80B47C58 8FB10038 */ lw $s1, 0x0038($sp) -/* 03C0C 80B47C5C 03E00008 */ jr $ra +/* 03BFC 80B47C4C 8FBF003C */ lw $ra, 0x003C($sp) +/* 03C00 80B47C50 D7B40028 */ ldc1 $f20, 0x0028($sp) +/* 03C04 80B47C54 8FB00034 */ lw $s0, 0x0034($sp) +/* 03C08 80B47C58 8FB10038 */ lw $s1, 0x0038($sp) +/* 03C0C 80B47C5C 03E00008 */ jr $ra /* 03C10 80B47C60 27BD0078 */ addiu $sp, $sp, 0x0078 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B47C64.s b/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B47C64.s index ef33346224..e305a67a50 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B47C64.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B47C64.s @@ -1,40 +1,40 @@ glabel func_80B47C64 /* 03C14 80B47C64 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 03C18 80B47C68 AFB00018 */ sw $s0, 0x0018($sp) -/* 03C1C 80B47C6C AFA5002C */ sw $a1, 0x002C($sp) +/* 03C18 80B47C68 AFB00018 */ sw $s0, 0x0018($sp) +/* 03C1C 80B47C6C AFA5002C */ sw $a1, 0x002C($sp) /* 03C20 80B47C70 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 03C24 80B47C74 AFBF001C */ sw $ra, 0x001C($sp) +/* 03C24 80B47C74 AFBF001C */ sw $ra, 0x001C($sp) /* 03C28 80B47C78 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 /* 03C2C 80B47C7C 24A5366C */ addiu $a1, $a1, 0x366C ## $a1 = 0601366C -/* 03C30 80B47C80 0C02947A */ jal func_800A51E8 +/* 03C30 80B47C80 0C02947A */ jal SkelAnime_ChangeAnimDefaultStop /* 03C34 80B47C84 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C /* 03C38 80B47C88 860E0032 */ lh $t6, 0x0032($s0) ## 00000032 /* 03C3C 80B47C8C 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 /* 03C40 80B47C90 34018000 */ ori $at, $zero, 0x8000 ## $at = 00008000 /* 03C44 80B47C94 24180015 */ addiu $t8, $zero, 0x0015 ## $t8 = 00000015 -/* 03C48 80B47C98 01C17821 */ addu $t7, $t6, $at +/* 03C48 80B47C98 01C17821 */ addu $t7, $t6, $at /* 03C4C 80B47C9C A60F0032 */ sh $t7, 0x0032($s0) ## 00000032 /* 03C50 80B47CA0 AE1803DC */ sw $t8, 0x03DC($s0) ## 000003DC /* 03C54 80B47CA4 26040024 */ addiu $a0, $s0, 0x0024 ## $a0 = 00000024 /* 03C58 80B47CA8 860503FE */ lh $a1, 0x03FE($s0) ## 000003FE /* 03C5C 80B47CAC E6040068 */ swc1 $f4, 0x0068($s0) ## 00000068 -/* 03C60 80B47CB0 0C2D11AA */ jal func_80B446A8 -/* 03C64 80B47CB4 AFA40024 */ sw $a0, 0x0024($sp) -/* 03C68 80B47CB8 8FA40024 */ lw $a0, 0x0024($sp) +/* 03C60 80B47CB0 0C2D11AA */ jal func_80B446A8 +/* 03C64 80B47CB4 AFA40024 */ sw $a0, 0x0024($sp) +/* 03C68 80B47CB8 8FA40024 */ lw $a0, 0x0024($sp) /* 03C6C 80B47CBC A60203FE */ sh $v0, 0x03FE($s0) ## 000003FE -/* 03C70 80B47CC0 8FA7002C */ lw $a3, 0x002C($sp) +/* 03C70 80B47CC0 8FA7002C */ lw $a3, 0x002C($sp) /* 03C74 80B47CC4 860503FE */ lh $a1, 0x03FE($s0) ## 000003FE -/* 03C78 80B47CC8 0C2D121C */ jal func_80B44870 +/* 03C78 80B47CC8 0C2D121C */ jal func_80B44870 /* 03C7C 80B47CCC 86060400 */ lh $a2, 0x0400($s0) ## 00000400 /* 03C80 80B47CD0 3C0580B4 */ lui $a1, %hi(func_80B47CF8) ## $a1 = 80B40000 /* 03C84 80B47CD4 A6020402 */ sh $v0, 0x0402($s0) ## 00000402 /* 03C88 80B47CD8 24A57CF8 */ addiu $a1, $a1, %lo(func_80B47CF8) ## $a1 = 80B47CF8 -/* 03C8C 80B47CDC 0C2D1014 */ jal func_80B44050 +/* 03C8C 80B47CDC 0C2D1014 */ jal func_80B44050 /* 03C90 80B47CE0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 03C94 80B47CE4 8FBF001C */ lw $ra, 0x001C($sp) -/* 03C98 80B47CE8 8FB00018 */ lw $s0, 0x0018($sp) +/* 03C94 80B47CE4 8FBF001C */ lw $ra, 0x001C($sp) +/* 03C98 80B47CE8 8FB00018 */ lw $s0, 0x0018($sp) /* 03C9C 80B47CEC 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 03CA0 80B47CF0 03E00008 */ jr $ra +/* 03CA0 80B47CF0 03E00008 */ jr $ra /* 03CA4 80B47CF4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B47DA8.s b/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B47DA8.s index 198dc01d31..16978b2e78 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B47DA8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B47DA8.s @@ -1,47 +1,47 @@ glabel func_80B47DA8 /* 03D58 80B47DA8 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 03D5C 80B47DAC AFB00028 */ sw $s0, 0x0028($sp) +/* 03D5C 80B47DAC AFB00028 */ sw $s0, 0x0028($sp) /* 03D60 80B47DB0 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 03D64 80B47DB4 AFBF002C */ sw $ra, 0x002C($sp) +/* 03D64 80B47DB4 AFBF002C */ sw $ra, 0x002C($sp) /* 03D68 80B47DB8 3C040601 */ lui $a0, 0x0601 ## $a0 = 06010000 /* 03D6C 80B47DBC 0C028800 */ jal SkelAnime_GetFrameCount - + /* 03D70 80B47DC0 248457F8 */ addiu $a0, $a0, 0x57F8 ## $a0 = 060157F8 /* 03D74 80B47DC4 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 03D78 80B47DC8 3C01C080 */ lui $at, 0xC080 ## $at = C0800000 /* 03D7C 80B47DCC 44814000 */ mtc1 $at, $f8 ## $f8 = -4.00 -/* 03D80 80B47DD0 468021A0 */ cvt.s.w $f6, $f4 +/* 03D80 80B47DD0 468021A0 */ cvt.s.w $f6, $f4 /* 03D84 80B47DD4 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 /* 03D88 80B47DD8 240E0002 */ addiu $t6, $zero, 0x0002 ## $t6 = 00000002 -/* 03D8C 80B47DDC AFAE0014 */ sw $t6, 0x0014($sp) +/* 03D8C 80B47DDC AFAE0014 */ sw $t6, 0x0014($sp) /* 03D90 80B47DE0 24A557F8 */ addiu $a1, $a1, 0x57F8 ## $a1 = 060157F8 /* 03D94 80B47DE4 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C -/* 03D98 80B47DE8 E7A60010 */ swc1 $f6, 0x0010($sp) +/* 03D98 80B47DE8 E7A60010 */ swc1 $f6, 0x0010($sp) /* 03D9C 80B47DEC 3C063FC0 */ lui $a2, 0x3FC0 ## $a2 = 3FC00000 /* 03DA0 80B47DF0 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 03DA4 80B47DF4 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 03DA8 80B47DF8 E7A80018 */ swc1 $f8, 0x0018($sp) +/* 03DA4 80B47DF4 0C029468 */ jal SkelAnime_ChangeAnim + +/* 03DA8 80B47DF8 E7A80018 */ swc1 $f8, 0x0018($sp) /* 03DAC 80B47DFC 960F0088 */ lhu $t7, 0x0088($s0) ## 00000088 /* 03DB0 80B47E00 3C01C080 */ lui $at, 0xC080 ## $at = C0800000 /* 03DB4 80B47E04 44811000 */ mtc1 $at, $f2 ## $f2 = -4.00 /* 03DB8 80B47E08 31F80001 */ andi $t8, $t7, 0x0001 ## $t8 = 00000000 -/* 03DBC 80B47E0C 1300000F */ beq $t8, $zero, .L80B47E4C +/* 03DBC 80B47E0C 1300000F */ beq $t8, $zero, .L80B47E4C /* 03DC0 80B47E10 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 03DC4 80B47E14 C6000060 */ lwc1 $f0, 0x0060($s0) ## 00000060 /* 03DC8 80B47E18 44805000 */ mtc1 $zero, $f10 ## $f10 = 0.00 /* 03DCC 80B47E1C 00000000 */ nop -/* 03DD0 80B47E20 46005032 */ c.eq.s $f10, $f0 +/* 03DD0 80B47E20 46005032 */ c.eq.s $f10, $f0 /* 03DD4 80B47E24 00000000 */ nop -/* 03DD8 80B47E28 45030006 */ bc1tl .L80B47E44 +/* 03DD8 80B47E28 45030006 */ bc1tl .L80B47E44 /* 03DDC 80B47E2C E6020068 */ swc1 $f2, 0x0068($s0) ## 00000068 -/* 03DE0 80B47E30 46001032 */ c.eq.s $f2, $f0 +/* 03DE0 80B47E30 46001032 */ c.eq.s $f2, $f0 /* 03DE4 80B47E34 00000000 */ nop -/* 03DE8 80B47E38 45020005 */ bc1fl .L80B47E50 +/* 03DE8 80B47E38 45020005 */ bc1fl .L80B47E50 /* 03DEC 80B47E3C 24190001 */ addiu $t9, $zero, 0x0001 ## $t9 = 00000001 /* 03DF0 80B47E40 E6020068 */ swc1 $f2, 0x0068($s0) ## 00000068 .L80B47E44: -/* 03DF4 80B47E44 10000003 */ beq $zero, $zero, .L80B47E54 +/* 03DF4 80B47E44 10000003 */ beq $zero, $zero, .L80B47E54 /* 03DF8 80B47E48 AE0003E4 */ sw $zero, 0x03E4($s0) ## 000003E4 .L80B47E4C: /* 03DFC 80B47E4C 24190001 */ addiu $t9, $zero, 0x0001 ## $t9 = 00000001 @@ -50,30 +50,30 @@ glabel func_80B47DA8 .L80B47E54: /* 03E04 80B47E54 8602001C */ lh $v0, 0x001C($s0) ## 0000001C /* 03E08 80B47E58 2401FFFE */ addiu $at, $zero, 0xFFFE ## $at = FFFFFFFE -/* 03E0C 80B47E5C 14410004 */ bne $v0, $at, .L80B47E70 +/* 03E0C 80B47E5C 14410004 */ bne $v0, $at, .L80B47E70 /* 03E10 80B47E60 3C014090 */ lui $at, 0x4090 ## $at = 40900000 /* 03E14 80B47E64 44818000 */ mtc1 $at, $f16 ## $f16 = 4.50 /* 03E18 80B47E68 8602001C */ lh $v0, 0x001C($s0) ## 0000001C /* 03E1C 80B47E6C E6100168 */ swc1 $f16, 0x0168($s0) ## 00000168 .L80B47E70: -/* 03E20 80B47E70 04410003 */ bgez $v0, .L80B47E80 +/* 03E20 80B47E70 04410003 */ bgez $v0, .L80B47E80 /* 03E24 80B47E74 00000000 */ nop /* 03E28 80B47E78 8608008A */ lh $t0, 0x008A($s0) ## 0000008A /* 03E2C 80B47E7C A6080032 */ sh $t0, 0x0032($s0) ## 00000032 .L80B47E80: /* 03E30 80B47E80 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 03E34 80B47E84 2405382B */ addiu $a1, $zero, 0x382B ## $a1 = 0000382B /* 03E38 80B47E88 24090010 */ addiu $t1, $zero, 0x0010 ## $t1 = 00000010 /* 03E3C 80B47E8C 3C0580B4 */ lui $a1, %hi(func_80B47EB4) ## $a1 = 80B40000 /* 03E40 80B47E90 AE0903DC */ sw $t1, 0x03DC($s0) ## 000003DC /* 03E44 80B47E94 24A57EB4 */ addiu $a1, $a1, %lo(func_80B47EB4) ## $a1 = 80B47EB4 -/* 03E48 80B47E98 0C2D1014 */ jal func_80B44050 +/* 03E48 80B47E98 0C2D1014 */ jal func_80B44050 /* 03E4C 80B47E9C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 03E50 80B47EA0 8FBF002C */ lw $ra, 0x002C($sp) -/* 03E54 80B47EA4 8FB00028 */ lw $s0, 0x0028($sp) +/* 03E50 80B47EA0 8FBF002C */ lw $ra, 0x002C($sp) +/* 03E54 80B47EA4 8FB00028 */ lw $s0, 0x0028($sp) /* 03E58 80B47EA8 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 03E5C 80B47EAC 03E00008 */ jr $ra +/* 03E5C 80B47EAC 03E00008 */ jr $ra /* 03E60 80B47EB0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B48210.s b/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B48210.s index 42f4ffe79a..1dd51f8620 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B48210.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B48210.s @@ -3,20 +3,20 @@ glabel func_80B48210 /* 041C4 80B48214 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 /* 041C8 80B48218 3C014040 */ lui $at, 0x4040 ## $at = 40400000 /* 041CC 80B4821C 44812000 */ mtc1 $at, $f4 ## $f4 = 3.00 -/* 041D0 80B48220 AFB00028 */ sw $s0, 0x0028($sp) +/* 041D0 80B48220 AFB00028 */ sw $s0, 0x0028($sp) /* 041D4 80B48224 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 041D8 80B48228 AFBF002C */ sw $ra, 0x002C($sp) +/* 041D8 80B48228 AFBF002C */ sw $ra, 0x002C($sp) /* 041DC 80B4822C 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 /* 041E0 80B48230 240E0002 */ addiu $t6, $zero, 0x0002 ## $t6 = 00000002 -/* 041E4 80B48234 44070000 */ mfc1 $a3, $f0 -/* 041E8 80B48238 AFAE0014 */ sw $t6, 0x0014($sp) +/* 041E4 80B48234 44070000 */ mfc1 $a3, $f0 +/* 041E8 80B48238 AFAE0014 */ sw $t6, 0x0014($sp) /* 041EC 80B4823C 24A59530 */ addiu $a1, $a1, 0x9530 ## $a1 = 06009530 /* 041F0 80B48240 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C /* 041F4 80B48244 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 041F8 80B48248 E7A00018 */ swc1 $f0, 0x0018($sp) -/* 041FC 80B4824C 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 04200 80B48250 E7A40010 */ swc1 $f4, 0x0010($sp) +/* 041F8 80B48248 E7A00018 */ swc1 $f0, 0x0018($sp) +/* 041FC 80B4824C 0C029468 */ jal SkelAnime_ChangeAnim + +/* 04200 80B48250 E7A40010 */ swc1 $f4, 0x0010($sp) /* 04204 80B48254 3C0141B0 */ lui $at, 0x41B0 ## $at = 41B00000 /* 04208 80B48258 44813000 */ mtc1 $at, $f6 ## $f6 = 22.00 /* 0420C 80B4825C 3C0140F0 */ lui $at, 0x40F0 ## $at = 40F00000 @@ -30,18 +30,18 @@ glabel func_80B48210 /* 0422C 80B4827C 2405382F */ addiu $a1, $zero, 0x382F ## $a1 = 0000382F /* 04230 80B48280 E6060060 */ swc1 $f6, 0x0060($s0) ## 00000060 /* 04234 80B48284 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 04238 80B48288 E6080068 */ swc1 $f8, 0x0068($s0) ## 00000068 /* 0423C 80B4828C 861900B6 */ lh $t9, 0x00B6($s0) ## 000000B6 /* 04240 80B48290 3C0580B5 */ lui $a1, %hi(func_80B482B8) ## $a1 = 80B50000 /* 04244 80B48294 24A582B8 */ addiu $a1, $a1, %lo(func_80B482B8) ## $a1 = 80B482B8 /* 04248 80B48298 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0424C 80B4829C 0C2D1014 */ jal func_80B44050 +/* 0424C 80B4829C 0C2D1014 */ jal func_80B44050 /* 04250 80B482A0 A6190032 */ sh $t9, 0x0032($s0) ## 00000032 -/* 04254 80B482A4 8FBF002C */ lw $ra, 0x002C($sp) -/* 04258 80B482A8 8FB00028 */ lw $s0, 0x0028($sp) +/* 04254 80B482A4 8FBF002C */ lw $ra, 0x002C($sp) +/* 04258 80B482A8 8FB00028 */ lw $s0, 0x0028($sp) /* 0425C 80B482AC 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 04260 80B482B0 03E00008 */ jr $ra +/* 04260 80B482B0 03E00008 */ jr $ra /* 04264 80B482B4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B482B8.s b/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B482B8.s index dfeb5b9a60..51caed567d 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B482B8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B482B8.s @@ -1,41 +1,41 @@ glabel func_80B482B8 /* 04268 80B482B8 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 0426C 80B482BC AFB00028 */ sw $s0, 0x0028($sp) +/* 0426C 80B482BC AFB00028 */ sw $s0, 0x0028($sp) /* 04270 80B482C0 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 04274 80B482C4 AFBF002C */ sw $ra, 0x002C($sp) -/* 04278 80B482C8 AFA5003C */ sw $a1, 0x003C($sp) +/* 04274 80B482C4 AFBF002C */ sw $ra, 0x002C($sp) +/* 04278 80B482C8 AFA5003C */ sw $a1, 0x003C($sp) /* 0427C 80B482CC 8605008A */ lh $a1, 0x008A($s0) ## 0000008A /* 04280 80B482D0 240E0001 */ addiu $t6, $zero, 0x0001 ## $t6 = 00000001 -/* 04284 80B482D4 AFAE0010 */ sw $t6, 0x0010($sp) +/* 04284 80B482D4 AFAE0010 */ sw $t6, 0x0010($sp) /* 04288 80B482D8 248400B6 */ addiu $a0, $a0, 0x00B6 ## $a0 = 000000B6 /* 0428C 80B482DC 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 /* 04290 80B482E0 0C01E1A7 */ jal Math_SmoothScaleMaxMinS - + /* 04294 80B482E4 24070FA0 */ addiu $a3, $zero, 0x0FA0 ## $a3 = 00000FA0 /* 04298 80B482E8 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 /* 0429C 80B482EC 44813000 */ mtc1 $at, $f6 ## $f6 = 5.00 /* 042A0 80B482F0 C6040060 */ lwc1 $f4, 0x0060($s0) ## 00000060 -/* 042A4 80B482F4 8FA4003C */ lw $a0, 0x003C($sp) -/* 042A8 80B482F8 4604303E */ c.le.s $f6, $f4 +/* 042A4 80B482F4 8FA4003C */ lw $a0, 0x003C($sp) +/* 042A8 80B482F8 4604303E */ c.le.s $f6, $f4 /* 042AC 80B482FC 00000000 */ nop -/* 042B0 80B48300 45020007 */ bc1fl .L80B48320 +/* 042B0 80B48300 45020007 */ bc1fl .L80B48320 /* 042B4 80B48304 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C -/* 042B8 80B48308 0C00D56E */ jal func_800355B8 +/* 042B8 80B48308 0C00D56E */ jal func_800355B8 /* 042BC 80B4830C 260504F0 */ addiu $a1, $s0, 0x04F0 ## $a1 = 000004F0 -/* 042C0 80B48310 8FA4003C */ lw $a0, 0x003C($sp) -/* 042C4 80B48314 0C00D56E */ jal func_800355B8 +/* 042C0 80B48310 8FA4003C */ lw $a0, 0x003C($sp) +/* 042C4 80B48314 0C00D56E */ jal func_800355B8 /* 042C8 80B48318 260504E4 */ addiu $a1, $s0, 0x04E4 ## $a1 = 000004E4 /* 042CC 80B4831C 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C .L80B48320: /* 042D0 80B48320 0C02927F */ jal SkelAnime_FrameUpdateMatrix - -/* 042D4 80B48324 AFA40030 */ sw $a0, 0x0030($sp) -/* 042D8 80B48328 10400029 */ beq $v0, $zero, .L80B483D0 -/* 042DC 80B4832C 8FA40030 */ lw $a0, 0x0030($sp) + +/* 042D4 80B48324 AFA40030 */ sw $a0, 0x0030($sp) +/* 042D8 80B48328 10400029 */ beq $v0, $zero, .L80B483D0 +/* 042DC 80B4832C 8FA40030 */ lw $a0, 0x0030($sp) /* 042E0 80B48330 8E0F03F0 */ lw $t7, 0x03F0($s0) ## 000003F0 /* 042E4 80B48334 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 /* 042E8 80B48338 24A5A3D4 */ addiu $a1, $a1, 0xA3D4 ## $a1 = 0600A3D4 -/* 042EC 80B4833C 15E0000F */ bne $t7, $zero, .L80B4837C +/* 042EC 80B4833C 15E0000F */ bne $t7, $zero, .L80B4837C /* 042F0 80B48340 3C064040 */ lui $a2, 0x4040 ## $a2 = 40400000 /* 042F4 80B48344 3C014150 */ lui $at, 0x4150 ## $at = 41500000 /* 042F8 80B48348 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 @@ -43,21 +43,21 @@ glabel func_80B482B8 /* 04300 80B48350 3C01C080 */ lui $at, 0xC080 ## $at = C0800000 /* 04304 80B48354 44815000 */ mtc1 $at, $f10 ## $f10 = -4.00 /* 04308 80B48358 24180002 */ addiu $t8, $zero, 0x0002 ## $t8 = 00000002 -/* 0430C 80B4835C 44070000 */ mfc1 $a3, $f0 -/* 04310 80B48360 AFB80014 */ sw $t8, 0x0014($sp) -/* 04314 80B48364 E7A80010 */ swc1 $f8, 0x0010($sp) -/* 04318 80B48368 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 0431C 80B4836C E7AA0018 */ swc1 $f10, 0x0018($sp) +/* 0430C 80B4835C 44070000 */ mfc1 $a3, $f0 +/* 04310 80B48360 AFB80014 */ sw $t8, 0x0014($sp) +/* 04314 80B48364 E7A80010 */ swc1 $f8, 0x0010($sp) +/* 04318 80B48368 0C029468 */ jal SkelAnime_ChangeAnim + +/* 0431C 80B4836C E7AA0018 */ swc1 $f10, 0x0018($sp) /* 04320 80B48370 2419000A */ addiu $t9, $zero, 0x000A ## $t9 = 0000000A -/* 04324 80B48374 10000016 */ beq $zero, $zero, .L80B483D0 +/* 04324 80B48374 10000016 */ beq $zero, $zero, .L80B483D0 /* 04328 80B48378 AE1903F0 */ sw $t9, 0x03F0($s0) ## 000003F0 .L80B4837C: /* 0432C 80B4837C 96080088 */ lhu $t0, 0x0088($s0) ## 00000088 /* 04330 80B48380 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 04334 80B48384 31090003 */ andi $t1, $t0, 0x0003 ## $t1 = 00000000 -/* 04338 80B48388 51200012 */ beql $t1, $zero, .L80B483D4 -/* 0433C 80B4838C 8FBF002C */ lw $ra, 0x002C($sp) +/* 04338 80B48388 51200012 */ beql $t1, $zero, .L80B483D4 +/* 0433C 80B4838C 8FBF002C */ lw $ra, 0x002C($sp) /* 04340 80B48390 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 /* 04344 80B48394 8602008A */ lh $v0, 0x008A($s0) ## 0000008A /* 04348 80B48398 C6100080 */ lwc1 $f16, 0x0080($s0) ## 00000080 @@ -65,22 +65,22 @@ glabel func_80B482B8 /* 04350 80B483A0 A60200B6 */ sh $v0, 0x00B6($s0) ## 000000B6 /* 04354 80B483A4 A6020032 */ sh $v0, 0x0032($s0) ## 00000032 /* 04358 80B483A8 E6000068 */ swc1 $f0, 0x0068($s0) ## 00000068 -/* 0435C 80B483AC 0C2D1A89 */ jal func_80B46A24 +/* 0435C 80B483AC 0C2D1A89 */ jal func_80B46A24 /* 04360 80B483B0 E6100028 */ swc1 $f16, 0x0028($s0) ## 00000028 /* 04364 80B483B4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 04368 80B483B8 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 0436C 80B483BC 2405382A */ addiu $a1, $zero, 0x382A ## $a1 = 0000382A /* 04370 80B483C0 3C014150 */ lui $at, 0x4150 ## $at = 41500000 /* 04374 80B483C4 44819000 */ mtc1 $at, $f18 ## $f18 = 13.00 /* 04378 80B483C8 00000000 */ nop /* 0437C 80B483CC E6120164 */ swc1 $f18, 0x0164($s0) ## 00000164 .L80B483D0: -/* 04380 80B483D0 8FBF002C */ lw $ra, 0x002C($sp) +/* 04380 80B483D0 8FBF002C */ lw $ra, 0x002C($sp) .L80B483D4: -/* 04384 80B483D4 8FB00028 */ lw $s0, 0x0028($sp) +/* 04384 80B483D4 8FB00028 */ lw $s0, 0x0028($sp) /* 04388 80B483D8 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 -/* 0438C 80B483DC 03E00008 */ jr $ra +/* 0438C 80B483DC 03E00008 */ jr $ra /* 04390 80B483E0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B483E4.s b/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B483E4.s index 400f8bcbbb..1045c075ac 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B483E4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B483E4.s @@ -1,76 +1,76 @@ glabel func_80B483E4 /* 04394 80B483E4 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 04398 80B483E8 AFBF0024 */ sw $ra, 0x0024($sp) -/* 0439C 80B483EC AFB00020 */ sw $s0, 0x0020($sp) -/* 043A0 80B483F0 AFA50034 */ sw $a1, 0x0034($sp) +/* 04398 80B483E8 AFBF0024 */ sw $ra, 0x0024($sp) +/* 0439C 80B483EC AFB00020 */ sw $s0, 0x0020($sp) +/* 043A0 80B483F0 AFA50034 */ sw $a1, 0x0034($sp) /* 043A4 80B483F4 848E001C */ lh $t6, 0x001C($a0) ## 0000001C /* 043A8 80B483F8 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 043AC 80B483FC 05C00012 */ bltz $t6, .L80B48448 +/* 043AC 80B483FC 05C00012 */ bltz $t6, .L80B48448 /* 043B0 80B48400 00000000 */ nop /* 043B4 80B48404 860700B6 */ lh $a3, 0x00B6($s0) ## 000000B6 /* 043B8 80B48408 3C064220 */ lui $a2, 0x4220 ## $a2 = 42200000 /* 043BC 80B4840C 24E73FFF */ addiu $a3, $a3, 0x3FFF ## $a3 = 00003FFF -/* 043C0 80B48410 00073C00 */ sll $a3, $a3, 16 -/* 043C4 80B48414 0C00CE6E */ jal func_800339B8 -/* 043C8 80B48418 00073C03 */ sra $a3, $a3, 16 -/* 043CC 80B4841C 1440000A */ bne $v0, $zero, .L80B48448 +/* 043C0 80B48410 00073C00 */ sll $a3, $a3, 16 +/* 043C4 80B48414 0C00CE6E */ jal func_800339B8 +/* 043C8 80B48418 00073C03 */ sra $a3, $a3, 16 +/* 043CC 80B4841C 1440000A */ bne $v0, $zero, .L80B48448 /* 043D0 80B48420 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 043D4 80B48424 860700B6 */ lh $a3, 0x00B6($s0) ## 000000B6 -/* 043D8 80B48428 8FA50034 */ lw $a1, 0x0034($sp) +/* 043D8 80B48428 8FA50034 */ lw $a1, 0x0034($sp) /* 043DC 80B4842C 3C06C220 */ lui $a2, 0xC220 ## $a2 = C2200000 /* 043E0 80B48430 24E73FFF */ addiu $a3, $a3, 0x3FFF ## $a3 = 00003FFF -/* 043E4 80B48434 00073C00 */ sll $a3, $a3, 16 -/* 043E8 80B48438 0C00CE6E */ jal func_800339B8 -/* 043EC 80B4843C 00073C03 */ sra $a3, $a3, 16 -/* 043F0 80B48440 10400046 */ beq $v0, $zero, .L80B4855C +/* 043E4 80B48434 00073C00 */ sll $a3, $a3, 16 +/* 043E8 80B48438 0C00CE6E */ jal func_800339B8 +/* 043EC 80B4843C 00073C03 */ sra $a3, $a3, 16 +/* 043F0 80B48440 10400046 */ beq $v0, $zero, .L80B4855C /* 043F4 80B48444 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 .L80B48448: /* 043F8 80B48448 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 /* 043FC 80B4844C 24A56388 */ addiu $a1, $a1, 0x6388 ## $a1 = 06016388 -/* 04400 80B48450 0C0294BE */ jal func_800A52F8 +/* 04400 80B48450 0C0294BE */ jal SkelAnime_ChangeAnimDefaultRepeat /* 04404 80B48454 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C -/* 04408 80B48458 8FAF0034 */ lw $t7, 0x0034($sp) +/* 04408 80B48458 8FAF0034 */ lw $t7, 0x0034($sp) /* 0440C 80B4845C 24190001 */ addiu $t9, $zero, 0x0001 ## $t9 = 00000001 /* 04410 80B48460 260400B6 */ addiu $a0, $s0, 0x00B6 ## $a0 = 000000B6 /* 04414 80B48464 8DF81C44 */ lw $t8, 0x1C44($t7) ## 00001C44 /* 04418 80B48468 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 /* 0441C 80B4846C 24070FA0 */ addiu $a3, $zero, 0x0FA0 ## $a3 = 00000FA0 -/* 04420 80B48470 AFB80028 */ sw $t8, 0x0028($sp) +/* 04420 80B48470 AFB80028 */ sw $t8, 0x0028($sp) /* 04424 80B48474 8605008A */ lh $a1, 0x008A($s0) ## 0000008A /* 04428 80B48478 0C01E1A7 */ jal Math_SmoothScaleMaxMinS - -/* 0442C 80B4847C AFB90010 */ sw $t9, 0x0010($sp) -/* 04430 80B48480 8FA80028 */ lw $t0, 0x0028($sp) + +/* 0442C 80B4847C AFB90010 */ sw $t9, 0x0010($sp) +/* 04430 80B48480 8FA80028 */ lw $t0, 0x0028($sp) /* 04434 80B48484 860900B6 */ lh $t1, 0x00B6($s0) ## 000000B6 /* 04438 80B48488 850300B6 */ lh $v1, 0x00B6($t0) ## 000000B6 -/* 0443C 80B4848C 00692023 */ subu $a0, $v1, $t1 -/* 04440 80B48490 00042400 */ sll $a0, $a0, 16 -/* 04444 80B48494 00042403 */ sra $a0, $a0, 16 +/* 0443C 80B4848C 00692023 */ subu $a0, $v1, $t1 +/* 04440 80B48490 00042400 */ sll $a0, $a0, 16 +/* 04444 80B48494 00042403 */ sra $a0, $a0, 16 /* 04448 80B48498 0C01DE1C */ jal Math_Sins ## sins? -/* 0444C 80B4849C A7A3002E */ sh $v1, 0x002E($sp) +/* 0444C 80B4849C A7A3002E */ sh $v1, 0x002E($sp) /* 04450 80B484A0 44801000 */ mtc1 $zero, $f2 ## $f2 = 0.00 -/* 04454 80B484A4 87A3002E */ lh $v1, 0x002E($sp) +/* 04454 80B484A4 87A3002E */ lh $v1, 0x002E($sp) /* 04458 80B484A8 3C01C0C0 */ lui $at, 0xC0C0 ## $at = C0C00000 -/* 0445C 80B484AC 4600103E */ c.le.s $f2, $f0 +/* 0445C 80B484AC 4600103E */ c.le.s $f2, $f0 /* 04460 80B484B0 00000000 */ nop -/* 04464 80B484B4 45020005 */ bc1fl .L80B484CC +/* 04464 80B484B4 45020005 */ bc1fl .L80B484CC /* 04468 80B484B8 860A00B6 */ lh $t2, 0x00B6($s0) ## 000000B6 /* 0446C 80B484BC 44812000 */ mtc1 $at, $f4 ## $f4 = -6.00 -/* 04470 80B484C0 1000000F */ beq $zero, $zero, .L80B48500 +/* 04470 80B484C0 1000000F */ beq $zero, $zero, .L80B48500 /* 04474 80B484C4 E6040068 */ swc1 $f4, 0x0068($s0) ## 00000068 /* 04478 80B484C8 860A00B6 */ lh $t2, 0x00B6($s0) ## 000000B6 .L80B484CC: -/* 0447C 80B484CC 006A2023 */ subu $a0, $v1, $t2 -/* 04480 80B484D0 00042400 */ sll $a0, $a0, 16 +/* 0447C 80B484CC 006A2023 */ subu $a0, $v1, $t2 +/* 04480 80B484D0 00042400 */ sll $a0, $a0, 16 /* 04484 80B484D4 0C01DE1C */ jal Math_Sins ## sins? -/* 04488 80B484D8 00042403 */ sra $a0, $a0, 16 +/* 04488 80B484D8 00042403 */ sra $a0, $a0, 16 /* 0448C 80B484DC 44801000 */ mtc1 $zero, $f2 ## $f2 = 0.00 /* 04490 80B484E0 3C0140C0 */ lui $at, 0x40C0 ## $at = 40C00000 -/* 04494 80B484E4 4602003C */ c.lt.s $f0, $f2 +/* 04494 80B484E4 4602003C */ c.lt.s $f0, $f2 /* 04498 80B484E8 00000000 */ nop -/* 0449C 80B484EC 45020005 */ bc1fl .L80B48504 +/* 0449C 80B484EC 45020005 */ bc1fl .L80B48504 /* 044A0 80B484F0 860B00B6 */ lh $t3, 0x00B6($s0) ## 000000B6 /* 044A4 80B484F4 44813000 */ mtc1 $at, $f6 ## $f6 = 6.00 /* 044A8 80B484F8 00000000 */ nop @@ -88,27 +88,27 @@ glabel func_80B483E4 /* 044CC 80B4851C 44814000 */ mtc1 $at, $f8 ## $f8 = 10.00 /* 044D0 80B48520 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 /* 044D4 80B48524 44818000 */ mtc1 $at, $f16 ## $f16 = 5.00 -/* 044D8 80B48528 46080282 */ mul.s $f10, $f0, $f8 +/* 044D8 80B48528 46080282 */ mul.s $f10, $f0, $f8 /* 044DC 80B4852C 240F000C */ addiu $t7, $zero, 0x000C ## $t7 = 0000000C /* 044E0 80B48530 3C0580B5 */ lui $a1, %hi(func_80B48578) ## $a1 = 80B50000 /* 044E4 80B48534 AE0F03DC */ sw $t7, 0x03DC($s0) ## 000003DC /* 044E8 80B48538 24A58578 */ addiu $a1, $a1, %lo(func_80B48578) ## $a1 = 80B48578 /* 044EC 80B4853C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 044F0 80B48540 46105480 */ add.s $f18, $f10, $f16 -/* 044F4 80B48544 4600910D */ trunc.w.s $f4, $f18 -/* 044F8 80B48548 440E2000 */ mfc1 $t6, $f4 -/* 044FC 80B4854C 0C2D1014 */ jal func_80B44050 +/* 044F0 80B48540 46105480 */ add.s $f18, $f10, $f16 +/* 044F4 80B48544 4600910D */ trunc.w.s $f4, $f18 +/* 044F8 80B48548 440E2000 */ mfc1 $t6, $f4 +/* 044FC 80B4854C 0C2D1014 */ jal func_80B44050 /* 04500 80B48550 AE0E03F0 */ sw $t6, 0x03F0($s0) ## 000003F0 -/* 04504 80B48554 10000004 */ beq $zero, $zero, .L80B48568 -/* 04508 80B48558 8FBF0024 */ lw $ra, 0x0024($sp) +/* 04504 80B48554 10000004 */ beq $zero, $zero, .L80B48568 +/* 04508 80B48558 8FBF0024 */ lw $ra, 0x0024($sp) .L80B4855C: -/* 0450C 80B4855C 0C2D15AD */ jal func_80B456B4 -/* 04510 80B48560 8FA50034 */ lw $a1, 0x0034($sp) -/* 04514 80B48564 8FBF0024 */ lw $ra, 0x0024($sp) +/* 0450C 80B4855C 0C2D15AD */ jal func_80B456B4 +/* 04510 80B48560 8FA50034 */ lw $a1, 0x0034($sp) +/* 04514 80B48564 8FBF0024 */ lw $ra, 0x0024($sp) .L80B48568: -/* 04518 80B48568 8FB00020 */ lw $s0, 0x0020($sp) +/* 04518 80B48568 8FB00020 */ lw $s0, 0x0020($sp) /* 0451C 80B4856C 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 04520 80B48570 03E00008 */ jr $ra +/* 04520 80B48570 03E00008 */ jr $ra /* 04524 80B48574 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B48CEC.s b/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B48CEC.s index 13a9b23bde..de114a9441 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B48CEC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B48CEC.s @@ -1,48 +1,48 @@ glabel func_80B48CEC /* 04C9C 80B48CEC 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 04CA0 80B48CF0 AFB00028 */ sw $s0, 0x0028($sp) +/* 04CA0 80B48CF0 AFB00028 */ sw $s0, 0x0028($sp) /* 04CA4 80B48CF4 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 04CA8 80B48CF8 AFBF002C */ sw $ra, 0x002C($sp) +/* 04CA8 80B48CF8 AFBF002C */ sw $ra, 0x002C($sp) /* 04CAC 80B48CFC 3C040601 */ lui $a0, 0x0601 ## $a0 = 06010000 /* 04CB0 80B48D00 0C028800 */ jal SkelAnime_GetFrameCount - + /* 04CB4 80B48D04 24844E60 */ addiu $a0, $a0, 0x4E60 ## $a0 = 06014E60 /* 04CB8 80B48D08 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 04CBC 80B48D0C 3C01C080 */ lui $at, 0xC080 ## $at = C0800000 /* 04CC0 80B48D10 44814000 */ mtc1 $at, $f8 ## $f8 = -4.00 -/* 04CC4 80B48D14 468021A0 */ cvt.s.w $f6, $f4 +/* 04CC4 80B48D14 468021A0 */ cvt.s.w $f6, $f4 /* 04CC8 80B48D18 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 /* 04CCC 80B48D1C 240E0002 */ addiu $t6, $zero, 0x0002 ## $t6 = 00000002 -/* 04CD0 80B48D20 AFAE0014 */ sw $t6, 0x0014($sp) +/* 04CD0 80B48D20 AFAE0014 */ sw $t6, 0x0014($sp) /* 04CD4 80B48D24 24A54E60 */ addiu $a1, $a1, 0x4E60 ## $a1 = 06014E60 /* 04CD8 80B48D28 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C -/* 04CDC 80B48D2C E7A60010 */ swc1 $f6, 0x0010($sp) +/* 04CDC 80B48D2C E7A60010 */ swc1 $f6, 0x0010($sp) /* 04CE0 80B48D30 3C063FC0 */ lui $a2, 0x3FC0 ## $a2 = 3FC00000 /* 04CE4 80B48D34 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 04CE8 80B48D38 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 04CEC 80B48D3C E7A80018 */ swc1 $f8, 0x0018($sp) +/* 04CE8 80B48D38 0C029468 */ jal SkelAnime_ChangeAnim + +/* 04CEC 80B48D3C E7A80018 */ swc1 $f8, 0x0018($sp) /* 04CF0 80B48D40 960F0088 */ lhu $t7, 0x0088($s0) ## 00000088 /* 04CF4 80B48D44 44801000 */ mtc1 $zero, $f2 ## $f2 = 0.00 /* 04CF8 80B48D48 2408000F */ addiu $t0, $zero, 0x000F ## $t0 = 0000000F /* 04CFC 80B48D4C 31F80001 */ andi $t8, $t7, 0x0001 ## $t8 = 00000000 -/* 04D00 80B48D50 13000010 */ beq $t8, $zero, .L80B48D94 +/* 04D00 80B48D50 13000010 */ beq $t8, $zero, .L80B48D94 /* 04D04 80B48D54 3C0B80B5 */ lui $t3, %hi(D_80B4A1B4) ## $t3 = 80B50000 /* 04D08 80B48D58 C6000060 */ lwc1 $f0, 0x0060($s0) ## 00000060 /* 04D0C 80B48D5C 3C01C080 */ lui $at, 0xC080 ## $at = C0800000 -/* 04D10 80B48D60 46001032 */ c.eq.s $f2, $f0 +/* 04D10 80B48D60 46001032 */ c.eq.s $f2, $f0 /* 04D14 80B48D64 00000000 */ nop -/* 04D18 80B48D68 45030008 */ bc1tl .L80B48D8C +/* 04D18 80B48D68 45030008 */ bc1tl .L80B48D8C /* 04D1C 80B48D6C E6020068 */ swc1 $f2, 0x0068($s0) ## 00000068 /* 04D20 80B48D70 44815000 */ mtc1 $at, $f10 ## $f10 = -4.00 /* 04D24 80B48D74 00000000 */ nop -/* 04D28 80B48D78 46005032 */ c.eq.s $f10, $f0 +/* 04D28 80B48D78 46005032 */ c.eq.s $f10, $f0 /* 04D2C 80B48D7C 00000000 */ nop -/* 04D30 80B48D80 45020005 */ bc1fl .L80B48D98 +/* 04D30 80B48D80 45020005 */ bc1fl .L80B48D98 /* 04D34 80B48D84 24190001 */ addiu $t9, $zero, 0x0001 ## $t9 = 00000001 /* 04D38 80B48D88 E6020068 */ swc1 $f2, 0x0068($s0) ## 00000068 .L80B48D8C: -/* 04D3C 80B48D8C 10000003 */ beq $zero, $zero, .L80B48D9C +/* 04D3C 80B48D8C 10000003 */ beq $zero, $zero, .L80B48D9C /* 04D40 80B48D90 AE0003E4 */ sw $zero, 0x03E4($s0) ## 000003E4 .L80B48D94: /* 04D44 80B48D94 24190001 */ addiu $t9, $zero, 0x0001 ## $t9 = 00000001 @@ -52,25 +52,25 @@ glabel func_80B48CEC /* 04D4C 80B48D9C 8E090004 */ lw $t1, 0x0004($s0) ## 00000004 /* 04D50 80B48DA0 2401FFFE */ addiu $at, $zero, 0xFFFE ## $at = FFFFFFFE /* 04D54 80B48DA4 AE0803DC */ sw $t0, 0x03DC($s0) ## 000003DC -/* 04D58 80B48DA8 01215024 */ and $t2, $t1, $at +/* 04D58 80B48DA8 01215024 */ and $t2, $t1, $at /* 04D5C 80B48DAC AE0A0004 */ sw $t2, 0x0004($s0) ## 00000004 -/* 04D60 80B48DB0 856BA1B4 */ lh $t3, %lo(D_80B4A1B4)($t3) +/* 04D60 80B48DB0 856BA1B4 */ lh $t3, %lo(D_80B4A1B4)($t3) /* 04D64 80B48DB4 2401FFFF */ addiu $at, $zero, 0xFFFF ## $at = FFFFFFFF /* 04D68 80B48DB8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 04D6C 80B48DBC 11610018 */ beq $t3, $at, .L80B48E20 +/* 04D6C 80B48DBC 11610018 */ beq $t3, $at, .L80B48E20 /* 04D70 80B48DC0 2405382D */ addiu $a1, $zero, 0x382D ## $a1 = 0000382D /* 04D74 80B48DC4 8E020120 */ lw $v0, 0x0120($s0) ## 00000120 /* 04D78 80B48DC8 240C005A */ addiu $t4, $zero, 0x005A ## $t4 = 0000005A -/* 04D7C 80B48DCC 5040000B */ beql $v0, $zero, .L80B48DFC +/* 04D7C 80B48DCC 5040000B */ beql $v0, $zero, .L80B48DFC /* 04D80 80B48DD0 8E180124 */ lw $t8, 0x0124($s0) ## 00000124 /* 04D84 80B48DD4 A44C03F4 */ sh $t4, 0x03F4($v0) ## 000003F4 /* 04D88 80B48DD8 8E020120 */ lw $v0, 0x0120($s0) ## 00000120 /* 04D8C 80B48DDC 240E0003 */ addiu $t6, $zero, 0x0003 ## $t6 = 00000003 /* 04D90 80B48DE0 904D00AF */ lbu $t5, 0x00AF($v0) ## 000000AF -/* 04D94 80B48DE4 29A10003 */ slti $at, $t5, 0x0003 -/* 04D98 80B48DE8 1020000D */ beq $at, $zero, .L80B48E20 +/* 04D94 80B48DE4 29A10003 */ slti $at, $t5, 0x0003 +/* 04D98 80B48DE8 1020000D */ beq $at, $zero, .L80B48E20 /* 04D9C 80B48DEC 00000000 */ nop -/* 04DA0 80B48DF0 1000000B */ beq $zero, $zero, .L80B48E20 +/* 04DA0 80B48DF0 1000000B */ beq $zero, $zero, .L80B48E20 /* 04DA4 80B48DF4 A04E00AF */ sb $t6, 0x00AF($v0) ## 000000AF /* 04DA8 80B48DF8 8E180124 */ lw $t8, 0x0124($s0) ## 00000124 .L80B48DFC: @@ -79,23 +79,23 @@ glabel func_80B48CEC /* 04DB4 80B48E04 A70F03F4 */ sh $t7, 0x03F4($t8) ## 000003F4 /* 04DB8 80B48E08 8E020124 */ lw $v0, 0x0124($s0) ## 00000124 /* 04DBC 80B48E0C 905900AF */ lbu $t9, 0x00AF($v0) ## 000000AF -/* 04DC0 80B48E10 2B210003 */ slti $at, $t9, 0x0003 -/* 04DC4 80B48E14 10200002 */ beq $at, $zero, .L80B48E20 +/* 04DC0 80B48E10 2B210003 */ slti $at, $t9, 0x0003 +/* 04DC4 80B48E14 10200002 */ beq $at, $zero, .L80B48E20 /* 04DC8 80B48E18 00000000 */ nop /* 04DCC 80B48E1C A04800AF */ sb $t0, 0x00AF($v0) ## 000000AF .L80B48E20: /* 04DD0 80B48E20 3C0180B5 */ lui $at, %hi(D_80B4A1B0) ## $at = 80B50000 /* 04DD4 80B48E24 0C00BE0A */ jal Audio_PlayActorSound2 - -/* 04DD8 80B48E28 A420A1B0 */ sh $zero, %lo(D_80B4A1B0)($at) + +/* 04DD8 80B48E28 A420A1B0 */ sh $zero, %lo(D_80B4A1B0)($at) /* 04DDC 80B48E2C 3C0580B5 */ lui $a1, %hi(func_80B48E50) ## $a1 = 80B50000 /* 04DE0 80B48E30 24A58E50 */ addiu $a1, $a1, %lo(func_80B48E50) ## $a1 = 80B48E50 -/* 04DE4 80B48E34 0C2D1014 */ jal func_80B44050 +/* 04DE4 80B48E34 0C2D1014 */ jal func_80B44050 /* 04DE8 80B48E38 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 04DEC 80B48E3C 8FBF002C */ lw $ra, 0x002C($sp) -/* 04DF0 80B48E40 8FB00028 */ lw $s0, 0x0028($sp) +/* 04DEC 80B48E3C 8FBF002C */ lw $ra, 0x002C($sp) +/* 04DF0 80B48E40 8FB00028 */ lw $s0, 0x0028($sp) /* 04DF4 80B48E44 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 04DF8 80B48E48 03E00008 */ jr $ra +/* 04DF8 80B48E48 03E00008 */ jr $ra /* 04DFC 80B48E4C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B49B60.s b/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B49B60.s index 6657869bc9..d9e4f59017 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B49B60.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B49B60.s @@ -1,13 +1,13 @@ glabel func_80B49B60 /* 05B10 80B49B60 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 05B14 80B49B64 AFA5001C */ sw $a1, 0x001C($sp) -/* 05B18 80B49B68 AFBF0014 */ sw $ra, 0x0014($sp) +/* 05B14 80B49B64 AFA5001C */ sw $a1, 0x001C($sp) +/* 05B18 80B49B68 AFBF0014 */ sw $ra, 0x0014($sp) /* 05B1C 80B49B6C 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 /* 05B20 80B49B70 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 /* 05B24 80B49B74 24A56388 */ addiu $a1, $a1, 0x6388 ## $a1 = 06016388 -/* 05B28 80B49B78 AFA70018 */ sw $a3, 0x0018($sp) +/* 05B28 80B49B78 AFA70018 */ sw $a3, 0x0018($sp) /* 05B2C 80B49B7C 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 05B30 80B49B80 0C0294D3 */ jal func_800A534C +/* 05B30 80B49B80 0C0294D3 */ jal SkelAnime_ChangeAnimTransitionRepeat /* 05B34 80B49B84 3C06BF80 */ lui $a2, 0xBF80 ## $a2 = BF800000 /* 05B38 80B49B88 0C03F66B */ jal Math_Rand_ZeroOne ## Rand.Next() float @@ -16,43 +16,43 @@ glabel func_80B49B60 /* 05B44 80B49B94 44812000 */ mtc1 $at, $f4 ## $f4 = 10.00 /* 05B48 80B49B98 3C014100 */ lui $at, 0x4100 ## $at = 41000000 /* 05B4C 80B49B9C 44814000 */ mtc1 $at, $f8 ## $f8 = 8.00 -/* 05B50 80B49BA0 46040182 */ mul.s $f6, $f0, $f4 -/* 05B54 80B49BA4 8FA70018 */ lw $a3, 0x0018($sp) +/* 05B50 80B49BA0 46040182 */ mul.s $f6, $f0, $f4 +/* 05B54 80B49BA4 8FA70018 */ lw $a3, 0x0018($sp) /* 05B58 80B49BA8 2401FFFE */ addiu $at, $zero, 0xFFFE ## $at = FFFFFFFE /* 05B5C 80B49BAC 3C0580B5 */ lui $a1, %hi(func_80B48578) ## $a1 = 80B50000 /* 05B60 80B49BB0 84F8001C */ lh $t8, 0x001C($a3) ## 0000001C /* 05B64 80B49BB4 240B000C */ addiu $t3, $zero, 0x000C ## $t3 = 0000000C /* 05B68 80B49BB8 24A58578 */ addiu $a1, $a1, %lo(func_80B48578) ## $a1 = 80B48578 -/* 05B6C 80B49BBC 46083280 */ add.s $f10, $f6, $f8 +/* 05B6C 80B49BBC 46083280 */ add.s $f10, $f6, $f8 /* 05B70 80B49BC0 00E02025 */ or $a0, $a3, $zero ## $a0 = 00000000 -/* 05B74 80B49BC4 4600540D */ trunc.w.s $f16, $f10 -/* 05B78 80B49BC8 440F8000 */ mfc1 $t7, $f16 -/* 05B7C 80B49BCC 1701000B */ bne $t8, $at, .L80B49BFC +/* 05B74 80B49BC4 4600540D */ trunc.w.s $f16, $f10 +/* 05B78 80B49BC8 440F8000 */ mfc1 $t7, $f16 +/* 05B7C 80B49BCC 1701000B */ bne $t8, $at, .L80B49BFC /* 05B80 80B49BD0 ACEF03F0 */ sw $t7, 0x03F0($a3) ## 000003F0 -/* 05B84 80B49BD4 C7A0001C */ lwc1 $f0, 0x001C($sp) +/* 05B84 80B49BD4 C7A0001C */ lwc1 $f0, 0x001C($sp) /* 05B88 80B49BD8 01E0C825 */ or $t9, $t7, $zero ## $t9 = 00000000 -/* 05B8C 80B49BDC 46000480 */ add.s $f18, $f0, $f0 +/* 05B8C 80B49BDC 46000480 */ add.s $f18, $f0, $f0 /* 05B90 80B49BE0 E4F20068 */ swc1 $f18, 0x0068($a3) ## 00000068 -/* 05B94 80B49BE4 07210003 */ bgez $t9, .L80B49BF4 -/* 05B98 80B49BE8 00194043 */ sra $t0, $t9, 1 +/* 05B94 80B49BE4 07210003 */ bgez $t9, .L80B49BF4 +/* 05B98 80B49BE8 00194043 */ sra $t0, $t9, 1 /* 05B9C 80B49BEC 27210001 */ addiu $at, $t9, 0x0001 ## $at = 00000001 -/* 05BA0 80B49BF0 00014043 */ sra $t0, $at, 1 +/* 05BA0 80B49BF0 00014043 */ sra $t0, $at, 1 .L80B49BF4: -/* 05BA4 80B49BF4 10000003 */ beq $zero, $zero, .L80B49C04 +/* 05BA4 80B49BF4 10000003 */ beq $zero, $zero, .L80B49C04 /* 05BA8 80B49BF8 ACE803F0 */ sw $t0, 0x03F0($a3) ## 000003F0 .L80B49BFC: -/* 05BAC 80B49BFC C7A4001C */ lwc1 $f4, 0x001C($sp) +/* 05BAC 80B49BFC C7A4001C */ lwc1 $f4, 0x001C($sp) /* 05BB0 80B49C00 E4E40068 */ swc1 $f4, 0x0068($a3) ## 00000068 .L80B49C04: /* 05BB4 80B49C04 84E900B6 */ lh $t1, 0x00B6($a3) ## 000000B6 /* 05BB8 80B49C08 ACE003E4 */ sw $zero, 0x03E4($a3) ## 000003E4 /* 05BBC 80B49C0C ACEB03DC */ sw $t3, 0x03DC($a3) ## 000003DC /* 05BC0 80B49C10 252A3FFF */ addiu $t2, $t1, 0x3FFF ## $t2 = 00003FFF -/* 05BC4 80B49C14 0C2D1014 */ jal func_80B44050 +/* 05BC4 80B49C14 0C2D1014 */ jal func_80B44050 /* 05BC8 80B49C18 A4EA0032 */ sh $t2, 0x0032($a3) ## 00000032 -/* 05BCC 80B49C1C 8FBF0014 */ lw $ra, 0x0014($sp) +/* 05BCC 80B49C1C 8FBF0014 */ lw $ra, 0x0014($sp) /* 05BD0 80B49C20 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 05BD4 80B49C24 03E00008 */ jr $ra +/* 05BD4 80B49C24 03E00008 */ jr $ra /* 05BD8 80B49C28 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl1/EnZl1_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Zl1/EnZl1_Destroy.s index 08c0b72015..73d37901fd 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl1/EnZl1_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl1/EnZl1_Destroy.s @@ -1,18 +1,18 @@ glabel EnZl1_Destroy /* 002A0 80B4ADE0 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 002A4 80B4ADE4 AFBF0014 */ sw $ra, 0x0014($sp) -/* 002A8 80B4ADE8 AFA40018 */ sw $a0, 0x0018($sp) -/* 002AC 80B4ADEC AFA5001C */ sw $a1, 0x001C($sp) -/* 002B0 80B4ADF0 0C0295BC */ jal func_800A56F0 +/* 002A4 80B4ADE4 AFBF0014 */ sw $ra, 0x0014($sp) +/* 002A8 80B4ADE8 AFA40018 */ sw $a0, 0x0018($sp) +/* 002AC 80B4ADEC AFA5001C */ sw $a1, 0x001C($sp) +/* 002B0 80B4ADF0 0C0295BC */ jal SkelAnime_Free /* 002B4 80B4ADF4 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 002B8 80B4ADF8 8FA50018 */ lw $a1, 0x0018($sp) -/* 002BC 80B4ADFC 8FA4001C */ lw $a0, 0x001C($sp) +/* 002B8 80B4ADF8 8FA50018 */ lw $a1, 0x0018($sp) +/* 002BC 80B4ADFC 8FA4001C */ lw $a0, 0x001C($sp) /* 002C0 80B4AE00 0C0170EB */ jal ActorCollider_FreeCylinder - + /* 002C4 80B4AE04 24A50194 */ addiu $a1, $a1, 0x0194 ## $a1 = 00000194 -/* 002C8 80B4AE08 8FBF0014 */ lw $ra, 0x0014($sp) +/* 002C8 80B4AE08 8FBF0014 */ lw $ra, 0x0014($sp) /* 002CC 80B4AE0C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 002D0 80B4AE10 03E00008 */ jr $ra +/* 002D0 80B4AE10 03E00008 */ jr $ra /* 002D4 80B4AE14 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl1/EnZl1_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Zl1/EnZl1_Draw.s index 31daec48e9..377ca27fd1 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl1/EnZl1_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl1/EnZl1_Draw.s @@ -1,17 +1,17 @@ glabel EnZl1_Draw /* 0191C 80B4C45C 27BDFFA8 */ addiu $sp, $sp, 0xFFA8 ## $sp = FFFFFFA8 -/* 01920 80B4C460 AFBF002C */ sw $ra, 0x002C($sp) -/* 01924 80B4C464 AFB00028 */ sw $s0, 0x0028($sp) -/* 01928 80B4C468 AFA5005C */ sw $a1, 0x005C($sp) +/* 01920 80B4C460 AFBF002C */ sw $ra, 0x002C($sp) +/* 01924 80B4C464 AFB00028 */ sw $s0, 0x0028($sp) +/* 01928 80B4C468 AFA5005C */ sw $a1, 0x005C($sp) /* 0192C 80B4C46C 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 /* 01930 80B4C470 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 01934 80B4C474 3C0680B5 */ lui $a2, %hi(D_80B4E720) ## $a2 = 80B50000 /* 01938 80B4C478 24C6E720 */ addiu $a2, $a2, %lo(D_80B4E720) ## $a2 = 80B4E720 /* 0193C 80B4C47C 27A40040 */ addiu $a0, $sp, 0x0040 ## $a0 = FFFFFFE8 /* 01940 80B4C480 240707DB */ addiu $a3, $zero, 0x07DB ## $a3 = 000007DB -/* 01944 80B4C484 0C031AB1 */ jal func_800C6AC4 -/* 01948 80B4C488 AFA50050 */ sw $a1, 0x0050($sp) -/* 0194C 80B4C48C 8FA80050 */ lw $t0, 0x0050($sp) +/* 01944 80B4C484 0C031AB1 */ jal Graph_OpenDisps +/* 01948 80B4C488 AFA50050 */ sw $a1, 0x0050($sp) +/* 0194C 80B4C48C 8FA80050 */ lw $t0, 0x0050($sp) /* 01950 80B4C490 3C18DB06 */ lui $t8, 0xDB06 ## $t8 = DB060000 /* 01954 80B4C494 37180020 */ ori $t8, $t8, 0x0020 ## $t8 = DB060020 /* 01958 80B4C498 8D0202C0 */ lw $v0, 0x02C0($t0) ## 000002C0 @@ -23,15 +23,15 @@ glabel EnZl1_Draw /* 01970 80B4C4B0 8E0401F4 */ lw $a0, 0x01F4($s0) ## 000001F4 /* 01974 80B4C4B4 3C0600FF */ lui $a2, 0x00FF ## $a2 = 00FF0000 /* 01978 80B4C4B8 34C6FFFF */ ori $a2, $a2, 0xFFFF ## $a2 = 00FFFFFF -/* 0197C 80B4C4BC 0004C900 */ sll $t9, $a0, 4 -/* 01980 80B4C4C0 00194F02 */ srl $t1, $t9, 28 -/* 01984 80B4C4C4 00095080 */ sll $t2, $t1, 2 -/* 01988 80B4C4C8 00AA5821 */ addu $t3, $a1, $t2 +/* 0197C 80B4C4BC 0004C900 */ sll $t9, $a0, 4 +/* 01980 80B4C4C0 00194F02 */ srl $t1, $t9, 28 +/* 01984 80B4C4C4 00095080 */ sll $t2, $t1, 2 +/* 01988 80B4C4C8 00AA5821 */ addu $t3, $a1, $t2 /* 0198C 80B4C4CC 8D6C0000 */ lw $t4, 0x0000($t3) ## 00000000 -/* 01990 80B4C4D0 00866824 */ and $t5, $a0, $a2 +/* 01990 80B4C4D0 00866824 */ and $t5, $a0, $a2 /* 01994 80B4C4D4 3C078000 */ lui $a3, 0x8000 ## $a3 = 80000000 -/* 01998 80B4C4D8 018D7021 */ addu $t6, $t4, $t5 -/* 0199C 80B4C4DC 01C77821 */ addu $t7, $t6, $a3 +/* 01998 80B4C4D8 018D7021 */ addu $t6, $t4, $t5 +/* 0199C 80B4C4DC 01C77821 */ addu $t7, $t6, $a3 /* 019A0 80B4C4E0 AC4F0004 */ sw $t7, 0x0004($v0) ## 00000004 /* 019A4 80B4C4E4 8D0202C0 */ lw $v0, 0x02C0($t0) ## 000002C0 /* 019A8 80B4C4E8 3C19DB06 */ lui $t9, 0xDB06 ## $t9 = DB060000 @@ -40,15 +40,15 @@ glabel EnZl1_Draw /* 019B4 80B4C4F4 AD1802C0 */ sw $t8, 0x02C0($t0) ## 000002C0 /* 019B8 80B4C4F8 AC590000 */ sw $t9, 0x0000($v0) ## 00000000 /* 019BC 80B4C4FC 8E0401F8 */ lw $a0, 0x01F8($s0) ## 000001F8 -/* 019C0 80B4C500 00044900 */ sll $t1, $a0, 4 -/* 019C4 80B4C504 00095702 */ srl $t2, $t1, 28 -/* 019C8 80B4C508 000A5880 */ sll $t3, $t2, 2 -/* 019CC 80B4C50C 00AB6021 */ addu $t4, $a1, $t3 +/* 019C0 80B4C500 00044900 */ sll $t1, $a0, 4 +/* 019C4 80B4C504 00095702 */ srl $t2, $t1, 28 +/* 019C8 80B4C508 000A5880 */ sll $t3, $t2, 2 +/* 019CC 80B4C50C 00AB6021 */ addu $t4, $a1, $t3 /* 019D0 80B4C510 8D8D0000 */ lw $t5, 0x0000($t4) ## 00000000 -/* 019D4 80B4C514 00867024 */ and $t6, $a0, $a2 +/* 019D4 80B4C514 00867024 */ and $t6, $a0, $a2 /* 019D8 80B4C518 3C09DB06 */ lui $t1, 0xDB06 ## $t1 = DB060000 -/* 019DC 80B4C51C 01AE7821 */ addu $t7, $t5, $t6 -/* 019E0 80B4C520 01E7C021 */ addu $t8, $t7, $a3 +/* 019DC 80B4C51C 01AE7821 */ addu $t7, $t5, $t6 +/* 019E0 80B4C520 01E7C021 */ addu $t8, $t7, $a3 /* 019E4 80B4C524 AC580004 */ sw $t8, 0x0004($v0) ## 00000004 /* 019E8 80B4C528 8D0202C0 */ lw $v0, 0x02C0($t0) ## 000002C0 /* 019EC 80B4C52C 35290028 */ ori $t1, $t1, 0x0028 ## $t1 = DB060028 @@ -56,17 +56,17 @@ glabel EnZl1_Draw /* 019F4 80B4C534 AD1902C0 */ sw $t9, 0x02C0($t0) ## 000002C0 /* 019F8 80B4C538 AC490000 */ sw $t1, 0x0000($v0) ## 00000000 /* 019FC 80B4C53C 8E0401EC */ lw $a0, 0x01EC($s0) ## 000001EC -/* 01A00 80B4C540 00045100 */ sll $t2, $a0, 4 -/* 01A04 80B4C544 000A5F02 */ srl $t3, $t2, 28 -/* 01A08 80B4C548 000B6080 */ sll $t4, $t3, 2 -/* 01A0C 80B4C54C 00AC6821 */ addu $t5, $a1, $t4 +/* 01A00 80B4C540 00045100 */ sll $t2, $a0, 4 +/* 01A04 80B4C544 000A5F02 */ srl $t3, $t2, 28 +/* 01A08 80B4C548 000B6080 */ sll $t4, $t3, 2 +/* 01A0C 80B4C54C 00AC6821 */ addu $t5, $a1, $t4 /* 01A10 80B4C550 8DAE0000 */ lw $t6, 0x0000($t5) ## 00000000 -/* 01A14 80B4C554 00867824 */ and $t7, $a0, $a2 -/* 01A18 80B4C558 01CFC021 */ addu $t8, $t6, $t7 -/* 01A1C 80B4C55C 0307C821 */ addu $t9, $t8, $a3 +/* 01A14 80B4C554 00867824 */ and $t7, $a0, $a2 +/* 01A18 80B4C558 01CFC021 */ addu $t8, $t6, $t7 +/* 01A1C 80B4C55C 0307C821 */ addu $t9, $t8, $a3 /* 01A20 80B4C560 AC590004 */ sw $t9, 0x0004($v0) ## 00000004 -/* 01A24 80B4C564 8FA9005C */ lw $t1, 0x005C($sp) -/* 01A28 80B4C568 0C024F46 */ jal func_80093D18 +/* 01A24 80B4C564 8FA9005C */ lw $t1, 0x005C($sp) +/* 01A28 80B4C568 0C024F46 */ jal func_80093D18 /* 01A2C 80B4C56C 8D240000 */ lw $a0, 0x0000($t1) ## DB060028 /* 01A30 80B4C570 8E050150 */ lw $a1, 0x0150($s0) ## 00000150 /* 01A34 80B4C574 8E06016C */ lw $a2, 0x016C($s0) ## 0000016C @@ -75,21 +75,21 @@ glabel EnZl1_Draw /* 01A40 80B4C580 3C0B80B5 */ lui $t3, %hi(func_80B4C400) ## $t3 = 80B50000 /* 01A44 80B4C584 256BC400 */ addiu $t3, $t3, %lo(func_80B4C400) ## $t3 = 80B4C400 /* 01A48 80B4C588 254AC340 */ addiu $t2, $t2, %lo(func_80B4C340) ## $t2 = 80B4C340 -/* 01A4C 80B4C58C AFAA0010 */ sw $t2, 0x0010($sp) -/* 01A50 80B4C590 AFAB0014 */ sw $t3, 0x0014($sp) -/* 01A54 80B4C594 AFB00018 */ sw $s0, 0x0018($sp) -/* 01A58 80B4C598 0C0286B2 */ jal func_800A1AC8 -/* 01A5C 80B4C59C 8FA4005C */ lw $a0, 0x005C($sp) -/* 01A60 80B4C5A0 8FAC005C */ lw $t4, 0x005C($sp) +/* 01A4C 80B4C58C AFAA0010 */ sw $t2, 0x0010($sp) +/* 01A50 80B4C590 AFAB0014 */ sw $t3, 0x0014($sp) +/* 01A54 80B4C594 AFB00018 */ sw $s0, 0x0018($sp) +/* 01A58 80B4C598 0C0286B2 */ jal SkelAnime_DrawSV +/* 01A5C 80B4C59C 8FA4005C */ lw $a0, 0x005C($sp) +/* 01A60 80B4C5A0 8FAC005C */ lw $t4, 0x005C($sp) /* 01A64 80B4C5A4 3C0680B5 */ lui $a2, %hi(D_80B4E730) ## $a2 = 80B50000 /* 01A68 80B4C5A8 24C6E730 */ addiu $a2, $a2, %lo(D_80B4E730) ## $a2 = 80B4E730 /* 01A6C 80B4C5AC 27A40040 */ addiu $a0, $sp, 0x0040 ## $a0 = FFFFFFE8 /* 01A70 80B4C5B0 240707FE */ addiu $a3, $zero, 0x07FE ## $a3 = 000007FE -/* 01A74 80B4C5B4 0C031AD5 */ jal func_800C6B54 +/* 01A74 80B4C5B4 0C031AD5 */ jal Graph_CloseDisps /* 01A78 80B4C5B8 8D850000 */ lw $a1, 0x0000($t4) ## 00000000 -/* 01A7C 80B4C5BC 8FBF002C */ lw $ra, 0x002C($sp) -/* 01A80 80B4C5C0 8FB00028 */ lw $s0, 0x0028($sp) +/* 01A7C 80B4C5BC 8FBF002C */ lw $ra, 0x002C($sp) +/* 01A80 80B4C5C0 8FB00028 */ lw $s0, 0x0028($sp) /* 01A84 80B4C5C4 27BD0058 */ addiu $sp, $sp, 0x0058 ## $sp = 00000000 -/* 01A88 80B4C5C8 03E00008 */ jr $ra +/* 01A88 80B4C5C8 03E00008 */ jr $ra /* 01A8C 80B4C5CC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl1/EnZl1_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Zl1/EnZl1_Init.s index 5320a49788..5aa093fc2d 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl1/EnZl1_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl1/EnZl1_Init.s @@ -1,184 +1,184 @@ glabel EnZl1_Init /* 00010 80B4AB50 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 -/* 00014 80B4AB54 AFB00028 */ sw $s0, 0x0028($sp) +/* 00014 80B4AB54 AFB00028 */ sw $s0, 0x0028($sp) /* 00018 80B4AB58 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 0001C 80B4AB5C AFBF002C */ sw $ra, 0x002C($sp) +/* 0001C 80B4AB5C AFBF002C */ sw $ra, 0x002C($sp) /* 00020 80B4AB60 3C040601 */ lui $a0, 0x0601 ## $a0 = 06010000 -/* 00024 80B4AB64 AFA50044 */ sw $a1, 0x0044($sp) +/* 00024 80B4AB64 AFA50044 */ sw $a1, 0x0044($sp) /* 00028 80B4AB68 0C028800 */ jal SkelAnime_GetFrameCount - + /* 0002C 80B4AB6C 24842118 */ addiu $a0, $a0, 0x2118 ## $a0 = 06012118 /* 00030 80B4AB70 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 00034 80B4AB74 2605014C */ addiu $a1, $s0, 0x014C ## $a1 = 0000014C /* 00038 80B4AB78 3C060601 */ lui $a2, 0x0601 ## $a2 = 06010000 -/* 0003C 80B4AB7C 468021A0 */ cvt.s.w $f6, $f4 +/* 0003C 80B4AB7C 468021A0 */ cvt.s.w $f6, $f4 /* 00040 80B4AB80 24C6F5D8 */ addiu $a2, $a2, 0xF5D8 ## $a2 = 0600F5D8 -/* 00044 80B4AB84 AFA50034 */ sw $a1, 0x0034($sp) -/* 00048 80B4AB88 8FA40044 */ lw $a0, 0x0044($sp) +/* 00044 80B4AB84 AFA50034 */ sw $a1, 0x0034($sp) +/* 00048 80B4AB88 8FA40044 */ lw $a0, 0x0044($sp) /* 0004C 80B4AB8C 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 00050 80B4AB90 AFA00010 */ sw $zero, 0x0010($sp) -/* 00054 80B4AB94 E7A6003C */ swc1 $f6, 0x003C($sp) -/* 00058 80B4AB98 AFA00014 */ sw $zero, 0x0014($sp) -/* 0005C 80B4AB9C 0C0291BE */ jal func_800A46F8 -/* 00060 80B4ABA0 AFA00018 */ sw $zero, 0x0018($sp) +/* 00050 80B4AB90 AFA00010 */ sw $zero, 0x0010($sp) +/* 00054 80B4AB94 E7A6003C */ swc1 $f6, 0x003C($sp) +/* 00058 80B4AB98 AFA00014 */ sw $zero, 0x0014($sp) +/* 0005C 80B4AB9C 0C0291BE */ jal SkelAnime_InitSV +/* 00060 80B4ABA0 AFA00018 */ sw $zero, 0x0018($sp) /* 00064 80B4ABA4 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 00068 80B4ABA8 C7A8003C */ lwc1 $f8, 0x003C($sp) +/* 00068 80B4ABA8 C7A8003C */ lwc1 $f8, 0x003C($sp) /* 0006C 80B4ABAC 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 -/* 00070 80B4ABB0 44070000 */ mfc1 $a3, $f0 +/* 00070 80B4ABB0 44070000 */ mfc1 $a3, $f0 /* 00074 80B4ABB4 24A52118 */ addiu $a1, $a1, 0x2118 ## $a1 = 06012118 -/* 00078 80B4ABB8 8FA40034 */ lw $a0, 0x0034($sp) +/* 00078 80B4ABB8 8FA40034 */ lw $a0, 0x0034($sp) /* 0007C 80B4ABBC 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 00080 80B4ABC0 AFA00014 */ sw $zero, 0x0014($sp) -/* 00084 80B4ABC4 E7A80010 */ swc1 $f8, 0x0010($sp) -/* 00088 80B4ABC8 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 0008C 80B4ABCC E7A00018 */ swc1 $f0, 0x0018($sp) +/* 00080 80B4ABC0 AFA00014 */ sw $zero, 0x0014($sp) +/* 00084 80B4ABC4 E7A80010 */ swc1 $f8, 0x0010($sp) +/* 00088 80B4ABC8 0C029468 */ jal SkelAnime_ChangeAnim + +/* 0008C 80B4ABCC E7A00018 */ swc1 $f0, 0x0018($sp) /* 00090 80B4ABD0 26050194 */ addiu $a1, $s0, 0x0194 ## $a1 = 00000194 -/* 00094 80B4ABD4 AFA50030 */ sw $a1, 0x0030($sp) +/* 00094 80B4ABD4 AFA50030 */ sw $a1, 0x0030($sp) /* 00098 80B4ABD8 0C0170D9 */ jal ActorCollider_AllocCylinder - -/* 0009C 80B4ABDC 8FA40044 */ lw $a0, 0x0044($sp) + +/* 0009C 80B4ABDC 8FA40044 */ lw $a0, 0x0044($sp) /* 000A0 80B4ABE0 3C0780B5 */ lui $a3, %hi(D_80B4E5F0) ## $a3 = 80B50000 -/* 000A4 80B4ABE4 8FA50030 */ lw $a1, 0x0030($sp) +/* 000A4 80B4ABE4 8FA50030 */ lw $a1, 0x0030($sp) /* 000A8 80B4ABE8 24E7E5F0 */ addiu $a3, $a3, %lo(D_80B4E5F0) ## $a3 = 80B4E5F0 -/* 000AC 80B4ABEC 8FA40044 */ lw $a0, 0x0044($sp) +/* 000AC 80B4ABEC 8FA40044 */ lw $a0, 0x0044($sp) /* 000B0 80B4ABF0 0C01712B */ jal ActorCollider_InitCylinder - + /* 000B4 80B4ABF4 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 000B8 80B4ABF8 3C053C23 */ lui $a1, 0x3C23 ## $a1 = 3C230000 /* 000BC 80B4ABFC 34A5D70A */ ori $a1, $a1, 0xD70A ## $a1 = 3C23D70A /* 000C0 80B4AC00 0C00B58B */ jal Actor_SetScale - + /* 000C4 80B4AC04 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 000C8 80B4AC08 3C068003 */ lui $a2, 0x8003 ## $a2 = 80030000 /* 000CC 80B4AC0C 24C6B5EC */ addiu $a2, $a2, 0xB5EC ## $a2 = 8002B5EC /* 000D0 80B4AC10 260400B4 */ addiu $a0, $s0, 0x00B4 ## $a0 = 000000B4 /* 000D4 80B4AC14 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 /* 000D8 80B4AC18 0C00AC78 */ jal ActorShape_Init - + /* 000DC 80B4AC1C 3C0741C0 */ lui $a3, 0x41C0 ## $a3 = 41C00000 /* 000E0 80B4AC20 A200001F */ sb $zero, 0x001F($s0) ## 0000001F /* 000E4 80B4AC24 3C0E8016 */ lui $t6, 0x8016 ## $t6 = 80160000 /* 000E8 80B4AC28 8DCEF9C0 */ lw $t6, -0x0640($t6) ## 8015F9C0 /* 000EC 80B4AC2C 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 -/* 000F0 80B4AC30 29C10004 */ slti $at, $t6, 0x0004 -/* 000F4 80B4AC34 14200014 */ bne $at, $zero, .L80B4AC88 +/* 000F0 80B4AC30 29C10004 */ slti $at, $t6, 0x0004 +/* 000F4 80B4AC34 14200014 */ bne $at, $zero, .L80B4AC88 /* 000F8 80B4AC38 00000000 */ nop /* 000FC 80B4AC3C 0C028800 */ jal SkelAnime_GetFrameCount - + /* 00100 80B4AC40 24840438 */ addiu $a0, $a0, 0x0438 ## $a0 = 06000438 /* 00104 80B4AC44 44825000 */ mtc1 $v0, $f10 ## $f10 = 0.00 /* 00108 80B4AC48 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 /* 0010C 80B4AC4C 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 00110 80B4AC50 46805420 */ cvt.s.w $f16, $f10 -/* 00114 80B4AC54 44070000 */ mfc1 $a3, $f0 +/* 00110 80B4AC50 46805420 */ cvt.s.w $f16, $f10 +/* 00114 80B4AC54 44070000 */ mfc1 $a3, $f0 /* 00118 80B4AC58 24A50438 */ addiu $a1, $a1, 0x0438 ## $a1 = 06000438 -/* 0011C 80B4AC5C 8FA40034 */ lw $a0, 0x0034($sp) +/* 0011C 80B4AC5C 8FA40034 */ lw $a0, 0x0034($sp) /* 00120 80B4AC60 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 00124 80B4AC64 AFA00014 */ sw $zero, 0x0014($sp) -/* 00128 80B4AC68 E7B00010 */ swc1 $f16, 0x0010($sp) -/* 0012C 80B4AC6C 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 00130 80B4AC70 E7A00018 */ swc1 $f0, 0x0018($sp) +/* 00124 80B4AC64 AFA00014 */ sw $zero, 0x0014($sp) +/* 00128 80B4AC68 E7B00010 */ swc1 $f16, 0x0010($sp) +/* 0012C 80B4AC6C 0C029468 */ jal SkelAnime_ChangeAnim + +/* 00130 80B4AC70 E7A00018 */ swc1 $f0, 0x0018($sp) /* 00134 80B4AC74 3C0F80B5 */ lui $t7, %hi(func_80B4BC78) ## $t7 = 80B50000 /* 00138 80B4AC78 25EFBC78 */ addiu $t7, $t7, %lo(func_80B4BC78) ## $t7 = 80B4BC78 /* 0013C 80B4AC7C A60001E6 */ sh $zero, 0x01E6($s0) ## 000001E6 -/* 00140 80B4AC80 10000052 */ beq $zero, $zero, .L80B4ADCC +/* 00140 80B4AC80 10000052 */ beq $zero, $zero, .L80B4ADCC /* 00144 80B4AC84 AE0F0190 */ sw $t7, 0x0190($s0) ## 00000190 .L80B4AC88: /* 00148 80B4AC88 0C00D6D3 */ jal Flags_GetEventChkInf - + /* 0014C 80B4AC8C 24040009 */ addiu $a0, $zero, 0x0009 ## $a0 = 00000009 -/* 00150 80B4AC90 1040000D */ beq $v0, $zero, .L80B4ACC8 +/* 00150 80B4AC90 1040000D */ beq $v0, $zero, .L80B4ACC8 /* 00154 80B4AC94 00000000 */ nop /* 00158 80B4AC98 0C00D6D3 */ jal Flags_GetEventChkInf - + /* 0015C 80B4AC9C 24040025 */ addiu $a0, $zero, 0x0025 ## $a0 = 00000025 -/* 00160 80B4ACA0 10400009 */ beq $v0, $zero, .L80B4ACC8 +/* 00160 80B4ACA0 10400009 */ beq $v0, $zero, .L80B4ACC8 /* 00164 80B4ACA4 00000000 */ nop /* 00168 80B4ACA8 0C00D6D3 */ jal Flags_GetEventChkInf - + /* 0016C 80B4ACAC 24040037 */ addiu $a0, $zero, 0x0037 ## $a0 = 00000037 -/* 00170 80B4ACB0 10400005 */ beq $v0, $zero, .L80B4ACC8 +/* 00170 80B4ACB0 10400005 */ beq $v0, $zero, .L80B4ACC8 /* 00174 80B4ACB4 00000000 */ nop /* 00178 80B4ACB8 0C00B55C */ jal Actor_Kill - + /* 0017C 80B4ACBC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00180 80B4ACC0 10000043 */ beq $zero, $zero, .L80B4ADD0 -/* 00184 80B4ACC4 8FBF002C */ lw $ra, 0x002C($sp) +/* 00180 80B4ACC0 10000043 */ beq $zero, $zero, .L80B4ADD0 +/* 00184 80B4ACC4 8FBF002C */ lw $ra, 0x002C($sp) .L80B4ACC8: /* 00188 80B4ACC8 0C00D6D3 */ jal Flags_GetEventChkInf - + /* 0018C 80B4ACCC 24040009 */ addiu $a0, $zero, 0x0009 ## $a0 = 00000009 -/* 00190 80B4ACD0 10400005 */ beq $v0, $zero, .L80B4ACE8 +/* 00190 80B4ACD0 10400005 */ beq $v0, $zero, .L80B4ACE8 /* 00194 80B4ACD4 00000000 */ nop /* 00198 80B4ACD8 0C00D6D3 */ jal Flags_GetEventChkInf - + /* 0019C 80B4ACDC 24040025 */ addiu $a0, $zero, 0x0025 ## $a0 = 00000025 -/* 001A0 80B4ACE0 14400008 */ bne $v0, $zero, .L80B4AD04 +/* 001A0 80B4ACE0 14400008 */ bne $v0, $zero, .L80B4AD04 /* 001A4 80B4ACE4 00000000 */ nop .L80B4ACE8: /* 001A8 80B4ACE8 0C00D6D3 */ jal Flags_GetEventChkInf - + /* 001AC 80B4ACEC 24040009 */ addiu $a0, $zero, 0x0009 ## $a0 = 00000009 -/* 001B0 80B4ACF0 10400019 */ beq $v0, $zero, .L80B4AD58 +/* 001B0 80B4ACF0 10400019 */ beq $v0, $zero, .L80B4AD58 /* 001B4 80B4ACF4 00000000 */ nop /* 001B8 80B4ACF8 0C00D6D3 */ jal Flags_GetEventChkInf - + /* 001BC 80B4ACFC 24040037 */ addiu $a0, $zero, 0x0037 ## $a0 = 00000037 -/* 001C0 80B4AD00 10400015 */ beq $v0, $zero, .L80B4AD58 +/* 001C0 80B4AD00 10400015 */ beq $v0, $zero, .L80B4AD58 .L80B4AD04: /* 001C4 80B4AD04 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 /* 001C8 80B4AD08 0C028800 */ jal SkelAnime_GetFrameCount - + /* 001CC 80B4AD0C 24840438 */ addiu $a0, $a0, 0x0438 ## $a0 = 06000438 /* 001D0 80B4AD10 44829000 */ mtc1 $v0, $f18 ## $f18 = 0.00 /* 001D4 80B4AD14 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 /* 001D8 80B4AD18 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 001DC 80B4AD1C 46809120 */ cvt.s.w $f4, $f18 -/* 001E0 80B4AD20 44070000 */ mfc1 $a3, $f0 +/* 001DC 80B4AD1C 46809120 */ cvt.s.w $f4, $f18 +/* 001E0 80B4AD20 44070000 */ mfc1 $a3, $f0 /* 001E4 80B4AD24 24A50438 */ addiu $a1, $a1, 0x0438 ## $a1 = 06000438 -/* 001E8 80B4AD28 8FA40034 */ lw $a0, 0x0034($sp) +/* 001E8 80B4AD28 8FA40034 */ lw $a0, 0x0034($sp) /* 001EC 80B4AD2C 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 001F0 80B4AD30 AFA00014 */ sw $zero, 0x0014($sp) -/* 001F4 80B4AD34 E7A40010 */ swc1 $f4, 0x0010($sp) -/* 001F8 80B4AD38 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 001FC 80B4AD3C E7A00018 */ swc1 $f0, 0x0018($sp) +/* 001F0 80B4AD30 AFA00014 */ sw $zero, 0x0014($sp) +/* 001F4 80B4AD34 E7A40010 */ swc1 $f4, 0x0010($sp) +/* 001F8 80B4AD38 0C029468 */ jal SkelAnime_ChangeAnim + +/* 001FC 80B4AD3C E7A00018 */ swc1 $f0, 0x0018($sp) /* 00200 80B4AD40 3C1980B5 */ lui $t9, %hi(func_80B4AF18) ## $t9 = 80B50000 /* 00204 80B4AD44 2418703D */ addiu $t8, $zero, 0x703D ## $t8 = 0000703D /* 00208 80B4AD48 2739AF18 */ addiu $t9, $t9, %lo(func_80B4AF18) ## $t9 = 80B4AF18 /* 0020C 80B4AD4C A618010E */ sh $t8, 0x010E($s0) ## 0000010E -/* 00210 80B4AD50 1000001E */ beq $zero, $zero, .L80B4ADCC +/* 00210 80B4AD50 1000001E */ beq $zero, $zero, .L80B4ADCC /* 00214 80B4AD54 AE190190 */ sw $t9, 0x0190($s0) ## 00000190 .L80B4AD58: /* 00218 80B4AD58 0C00D6D3 */ jal Flags_GetEventChkInf - + /* 0021C 80B4AD5C 24040040 */ addiu $a0, $zero, 0x0040 ## $a0 = 00000040 -/* 00220 80B4AD60 10400016 */ beq $v0, $zero, .L80B4ADBC +/* 00220 80B4AD60 10400016 */ beq $v0, $zero, .L80B4ADBC /* 00224 80B4AD64 340AFFFF */ ori $t2, $zero, 0xFFFF ## $t2 = 0000FFFF /* 00228 80B4AD68 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 /* 0022C 80B4AD6C 0C028800 */ jal SkelAnime_GetFrameCount - + /* 00230 80B4AD70 24840438 */ addiu $a0, $a0, 0x0438 ## $a0 = 06000438 /* 00234 80B4AD74 44823000 */ mtc1 $v0, $f6 ## $f6 = 0.00 /* 00238 80B4AD78 44805000 */ mtc1 $zero, $f10 ## $f10 = 0.00 /* 0023C 80B4AD7C 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 00240 80B4AD80 46803220 */ cvt.s.w $f8, $f6 +/* 00240 80B4AD80 46803220 */ cvt.s.w $f8, $f6 /* 00244 80B4AD84 24A50438 */ addiu $a1, $a1, 0x0438 ## $a1 = 06000438 -/* 00248 80B4AD88 8FA40034 */ lw $a0, 0x0034($sp) +/* 00248 80B4AD88 8FA40034 */ lw $a0, 0x0034($sp) /* 0024C 80B4AD8C 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 00250 80B4AD90 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 00254 80B4AD94 AFA00014 */ sw $zero, 0x0014($sp) -/* 00258 80B4AD98 E7A80010 */ swc1 $f8, 0x0010($sp) -/* 0025C 80B4AD9C 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 00260 80B4ADA0 E7AA0018 */ swc1 $f10, 0x0018($sp) +/* 00254 80B4AD94 AFA00014 */ sw $zero, 0x0014($sp) +/* 00258 80B4AD98 E7A80010 */ swc1 $f8, 0x0010($sp) +/* 0025C 80B4AD9C 0C029468 */ jal SkelAnime_ChangeAnim + +/* 00260 80B4ADA0 E7AA0018 */ swc1 $f10, 0x0018($sp) /* 00264 80B4ADA4 3C0980B5 */ lui $t1, %hi(func_80B4AF18) ## $t1 = 80B50000 /* 00268 80B4ADA8 2408703C */ addiu $t0, $zero, 0x703C ## $t0 = 0000703C /* 0026C 80B4ADAC 2529AF18 */ addiu $t1, $t1, %lo(func_80B4AF18) ## $t1 = 80B4AF18 /* 00270 80B4ADB0 A608010E */ sh $t0, 0x010E($s0) ## 0000010E -/* 00274 80B4ADB4 10000005 */ beq $zero, $zero, .L80B4ADCC +/* 00274 80B4ADB4 10000005 */ beq $zero, $zero, .L80B4ADCC /* 00278 80B4ADB8 AE090190 */ sw $t1, 0x0190($s0) ## 00000190 .L80B4ADBC: /* 0027C 80B4ADBC 3C0B80B5 */ lui $t3, %hi(func_80B4B010) ## $t3 = 80B50000 @@ -186,11 +186,11 @@ glabel EnZl1_Init /* 00284 80B4ADC4 A60A010E */ sh $t2, 0x010E($s0) ## 0000010E /* 00288 80B4ADC8 AE0B0190 */ sw $t3, 0x0190($s0) ## 00000190 .L80B4ADCC: -/* 0028C 80B4ADCC 8FBF002C */ lw $ra, 0x002C($sp) +/* 0028C 80B4ADCC 8FBF002C */ lw $ra, 0x002C($sp) .L80B4ADD0: -/* 00290 80B4ADD0 8FB00028 */ lw $s0, 0x0028($sp) +/* 00290 80B4ADD0 8FB00028 */ lw $s0, 0x0028($sp) /* 00294 80B4ADD4 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 -/* 00298 80B4ADD8 03E00008 */ jr $ra +/* 00298 80B4ADD8 03E00008 */ jr $ra /* 0029C 80B4ADDC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl1/func_80B4B010.s b/asm/non_matchings/overlays/actors/ovl_En_Zl1/func_80B4B010.s index df2204bdc7..4d8b0df7cd 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl1/func_80B4B010.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl1/func_80B4B010.s @@ -1,12 +1,12 @@ glabel func_80B4B010 /* 004D0 80B4B010 27BDFF90 */ addiu $sp, $sp, 0xFF90 ## $sp = FFFFFF90 -/* 004D4 80B4B014 AFBF002C */ sw $ra, 0x002C($sp) -/* 004D8 80B4B018 AFB10028 */ sw $s1, 0x0028($sp) -/* 004DC 80B4B01C AFB00024 */ sw $s0, 0x0024($sp) +/* 004D4 80B4B014 AFBF002C */ sw $ra, 0x002C($sp) +/* 004D8 80B4B018 AFB10028 */ sw $s1, 0x0028($sp) +/* 004DC 80B4B01C AFB00024 */ sw $s0, 0x0024($sp) /* 004E0 80B4B020 8CAE1C44 */ lw $t6, 0x1C44($a1) ## 00001C44 /* 004E4 80B4B024 3C1880B5 */ lui $t8, %hi(D_80B4E630) ## $t8 = 80B50000 /* 004E8 80B4B028 2718E630 */ addiu $t8, $t8, %lo(D_80B4E630) ## $t8 = 80B4E630 -/* 004EC 80B4B02C AFAE006C */ sw $t6, 0x006C($sp) +/* 004EC 80B4B02C AFAE006C */ sw $t6, 0x006C($sp) /* 004F0 80B4B030 8F090000 */ lw $t1, 0x0000($t8) ## 80B4E630 /* 004F4 80B4B034 27AF0054 */ addiu $t7, $sp, 0x0054 ## $t7 = FFFFFFE4 /* 004F8 80B4B038 8F190004 */ lw $t9, 0x0004($t8) ## 80B4E634 @@ -33,70 +33,70 @@ glabel func_80B4B010 /* 0054C 80B4B08C 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 00550 80B4B090 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 /* 00554 80B4B094 ADD80004 */ sw $t8, 0x0004($t6) ## FFFFFFD0 -/* 00558 80B4B098 0C00BC65 */ jal func_8002F194 +/* 00558 80B4B098 0C00BC65 */ jal func_8002F194 /* 0055C 80B4B09C ADD90008 */ sw $t9, 0x0008($t6) ## FFFFFFD4 -/* 00560 80B4B0A0 1040004B */ beq $v0, $zero, .L80B4B1D0 +/* 00560 80B4B0A0 1040004B */ beq $v0, $zero, .L80B4B1D0 /* 00564 80B4B0A4 3C040601 */ lui $a0, 0x0601 ## $a0 = 06010000 /* 00568 80B4B0A8 0C028800 */ jal SkelAnime_GetFrameCount - + /* 0056C 80B4B0AC 24840B38 */ addiu $a0, $a0, 0x0B38 ## $a0 = 06010B38 /* 00570 80B4B0B0 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 00574 80B4B0B4 3C01C120 */ lui $at, 0xC120 ## $at = C1200000 /* 00578 80B4B0B8 44814000 */ mtc1 $at, $f8 ## $f8 = -10.00 -/* 0057C 80B4B0BC 468021A0 */ cvt.s.w $f6, $f4 +/* 0057C 80B4B0BC 468021A0 */ cvt.s.w $f6, $f4 /* 00580 80B4B0C0 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 /* 00584 80B4B0C4 24090003 */ addiu $t1, $zero, 0x0003 ## $t1 = 00000003 -/* 00588 80B4B0C8 AFA90014 */ sw $t1, 0x0014($sp) +/* 00588 80B4B0C8 AFA90014 */ sw $t1, 0x0014($sp) /* 0058C 80B4B0CC 24A50B38 */ addiu $a1, $a1, 0x0B38 ## $a1 = 06010B38 /* 00590 80B4B0D0 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C -/* 00594 80B4B0D4 E7A60010 */ swc1 $f6, 0x0010($sp) +/* 00594 80B4B0D4 E7A60010 */ swc1 $f6, 0x0010($sp) /* 00598 80B4B0D8 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 0059C 80B4B0DC 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 005A0 80B4B0E0 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 005A4 80B4B0E4 E7A80018 */ swc1 $f8, 0x0018($sp) -/* 005A8 80B4B0E8 0C03008C */ jal func_800C0230 +/* 005A0 80B4B0E0 0C029468 */ jal SkelAnime_ChangeAnim + +/* 005A4 80B4B0E4 E7A80018 */ swc1 $f8, 0x0018($sp) +/* 005A8 80B4B0E8 0C03008C */ jal func_800C0230 /* 005AC 80B4B0EC 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 005B0 80B4B0F0 A60201E8 */ sh $v0, 0x01E8($s0) ## 000001E8 /* 005B4 80B4B0F4 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 005B8 80B4B0F8 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 005BC 80B4B0FC 0C0300C5 */ jal func_800C0314 +/* 005BC 80B4B0FC 0C0300C5 */ jal func_800C0314 /* 005C0 80B4B100 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 /* 005C4 80B4B104 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 005C8 80B4B108 860501E8 */ lh $a1, 0x01E8($s0) ## 000001E8 -/* 005CC 80B4B10C 0C0300C5 */ jal func_800C0314 +/* 005CC 80B4B10C 0C0300C5 */ jal func_800C0314 /* 005D0 80B4B110 24060007 */ addiu $a2, $zero, 0x0007 ## $a2 = 00000007 /* 005D4 80B4B114 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 005D8 80B4B118 860501E8 */ lh $a1, 0x01E8($s0) ## 000001E8 -/* 005DC 80B4B11C 8FA6006C */ lw $a2, 0x006C($sp) -/* 005E0 80B4B120 0C030202 */ jal func_800C0808 +/* 005DC 80B4B11C 8FA6006C */ lw $a2, 0x006C($sp) +/* 005E0 80B4B120 0C030202 */ jal func_800C0808 /* 005E4 80B4B124 24070021 */ addiu $a3, $zero, 0x0021 ## $a3 = 00000021 /* 005E8 80B4B128 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 005EC 80B4B12C 02211821 */ addu $v1, $s1, $at +/* 005EC 80B4B12C 02211821 */ addu $v1, $s1, $at /* 005F0 80B4B130 240800FF */ addiu $t0, $zero, 0x00FF ## $t0 = 000000FF /* 005F4 80B4B134 240A0018 */ addiu $t2, $zero, 0x0018 ## $t2 = 00000018 /* 005F8 80B4B138 A0680B06 */ sb $t0, 0x0B06($v1) ## 00000B06 /* 005FC 80B4B13C A0680B07 */ sb $t0, 0x0B07($v1) ## 00000B07 /* 00600 80B4B140 A0680B08 */ sb $t0, 0x0B08($v1) ## 00000B08 /* 00604 80B4B144 A06A0B09 */ sb $t2, 0x0B09($v1) ## 00000B09 -/* 00608 80B4B148 00310821 */ addu $at, $at, $s1 +/* 00608 80B4B148 00310821 */ addu $at, $at, $s1 /* 0060C 80B4B14C 240B0001 */ addiu $t3, $zero, 0x0001 ## $t3 = 00000001 /* 00610 80B4B150 A02B0B05 */ sb $t3, 0x0B05($at) ## 00010B05 /* 00614 80B4B154 860501E8 */ lh $a1, 0x01E8($s0) ## 000001E8 /* 00618 80B4B158 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 0061C 80B4B15C 27A60054 */ addiu $a2, $sp, 0x0054 ## $a2 = FFFFFFE4 -/* 00620 80B4B160 0C030136 */ jal func_800C04D8 +/* 00620 80B4B160 0C030136 */ jal func_800C04D8 /* 00624 80B4B164 27A70048 */ addiu $a3, $sp, 0x0048 ## $a3 = FFFFFFD8 /* 00628 80B4B168 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 0062C 80B4B16C 860501E8 */ lh $a1, 0x01E8($s0) ## 000001E8 -/* 00630 80B4B170 0C0301C1 */ jal func_800C0704 +/* 00630 80B4B170 0C0301C1 */ jal func_800C0704 /* 00634 80B4B174 3C0641F0 */ lui $a2, 0x41F0 ## $a2 = 41F00000 /* 00638 80B4B178 0C02CE10 */ jal func_800B3840 ## letterbox_target_addr /* 0063C 80B4B17C 24040020 */ addiu $a0, $zero, 0x0020 ## $a0 = 00000020 -/* 00640 80B4B180 0C020978 */ jal Interface_ChangeAlpha +/* 00640 80B4B180 0C020978 */ jal Interface_ChangeAlpha /* 00644 80B4B184 24040002 */ addiu $a0, $zero, 0x0002 ## $a0 = 00000002 /* 00648 80B4B188 27AC003C */ addiu $t4, $sp, 0x003C ## $t4 = FFFFFFCC -/* 0064C 80B4B18C 8FA2006C */ lw $v0, 0x006C($sp) +/* 0064C 80B4B18C 8FA2006C */ lw $v0, 0x006C($sp) /* 00650 80B4B190 8D8E0000 */ lw $t6, 0x0000($t4) ## FFFFFFCC /* 00654 80B4B194 44805000 */ mtc1 $zero, $f10 ## $f10 = 0.00 /* 00658 80B4B198 3C0F80B5 */ lui $t7, %hi(func_80B4B240) ## $t7 = 80B50000 @@ -109,41 +109,41 @@ glabel func_80B4B010 /* 00674 80B4B1B4 E44A0068 */ swc1 $f10, 0x0068($v0) ## 00000068 /* 00678 80B4B1B8 AC4E002C */ sw $t6, 0x002C($v0) ## 0000002C /* 0067C 80B4B1BC A60001E2 */ sh $zero, 0x01E2($s0) ## 000001E2 -/* 00680 80B4B1C0 0C03D719 */ jal func_800F5C64 +/* 00680 80B4B1C0 0C03D719 */ jal func_800F5C64 /* 00684 80B4B1C4 AE0F0190 */ sw $t7, 0x0190($s0) ## 00000190 -/* 00688 80B4B1C8 10000019 */ beq $zero, $zero, .L80B4B230 -/* 0068C 80B4B1CC 8FBF002C */ lw $ra, 0x002C($sp) +/* 00688 80B4B1C8 10000019 */ beq $zero, $zero, .L80B4B230 +/* 0068C 80B4B1CC 8FBF002C */ lw $ra, 0x002C($sp) .L80B4B1D0: /* 00690 80B4B1D0 8618008A */ lh $t8, 0x008A($s0) ## 0000008A /* 00694 80B4B1D4 861900B6 */ lh $t9, 0x00B6($s0) ## 000000B6 -/* 00698 80B4B1D8 8FA9006C */ lw $t1, 0x006C($sp) -/* 0069C 80B4B1DC 03191023 */ subu $v0, $t8, $t9 -/* 006A0 80B4B1E0 04400004 */ bltz $v0, .L80B4B1F4 -/* 006A4 80B4B1E4 00021823 */ subu $v1, $zero, $v0 -/* 006A8 80B4B1E8 00021C00 */ sll $v1, $v0, 16 -/* 006AC 80B4B1EC 10000003 */ beq $zero, $zero, .L80B4B1FC -/* 006B0 80B4B1F0 00031C03 */ sra $v1, $v1, 16 +/* 00698 80B4B1D8 8FA9006C */ lw $t1, 0x006C($sp) +/* 0069C 80B4B1DC 03191023 */ subu $v0, $t8, $t9 +/* 006A0 80B4B1E0 04400004 */ bltz $v0, .L80B4B1F4 +/* 006A4 80B4B1E4 00021823 */ subu $v1, $zero, $v0 +/* 006A8 80B4B1E8 00021C00 */ sll $v1, $v0, 16 +/* 006AC 80B4B1EC 10000003 */ beq $zero, $zero, .L80B4B1FC +/* 006B0 80B4B1F0 00031C03 */ sra $v1, $v1, 16 .L80B4B1F4: -/* 006B4 80B4B1F4 00031C00 */ sll $v1, $v1, 16 -/* 006B8 80B4B1F8 00031C03 */ sra $v1, $v1, 16 +/* 006B4 80B4B1F4 00031C00 */ sll $v1, $v1, 16 +/* 006B8 80B4B1F8 00031C03 */ sra $v1, $v1, 16 .L80B4B1FC: -/* 006BC 80B4B1FC 2861238E */ slti $at, $v1, 0x238E -/* 006C0 80B4B200 5020000B */ beql $at, $zero, .L80B4B230 -/* 006C4 80B4B204 8FBF002C */ lw $ra, 0x002C($sp) +/* 006BC 80B4B1FC 2861238E */ slti $at, $v1, 0x238E +/* 006C0 80B4B200 5020000B */ beql $at, $zero, .L80B4B230 +/* 006C4 80B4B204 8FBF002C */ lw $ra, 0x002C($sp) /* 006C8 80B4B208 C5300028 */ lwc1 $f16, 0x0028($t1) ## 00000028 /* 006CC 80B4B20C C6120028 */ lwc1 $f18, 0x0028($s0) ## 00000028 /* 006D0 80B4B210 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 006D4 80B4B214 4612803C */ c.lt.s $f16, $f18 +/* 006D4 80B4B214 4612803C */ c.lt.s $f16, $f18 /* 006D8 80B4B218 00000000 */ nop -/* 006DC 80B4B21C 45030004 */ bc1tl .L80B4B230 -/* 006E0 80B4B220 8FBF002C */ lw $ra, 0x002C($sp) -/* 006E4 80B4B224 0C00BCBD */ jal func_8002F2F4 +/* 006DC 80B4B21C 45030004 */ bc1tl .L80B4B230 +/* 006E0 80B4B220 8FBF002C */ lw $ra, 0x002C($sp) +/* 006E4 80B4B224 0C00BCBD */ jal func_8002F2F4 /* 006E8 80B4B228 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 006EC 80B4B22C 8FBF002C */ lw $ra, 0x002C($sp) +/* 006EC 80B4B22C 8FBF002C */ lw $ra, 0x002C($sp) .L80B4B230: -/* 006F0 80B4B230 8FB00024 */ lw $s0, 0x0024($sp) -/* 006F4 80B4B234 8FB10028 */ lw $s1, 0x0028($sp) -/* 006F8 80B4B238 03E00008 */ jr $ra +/* 006F0 80B4B230 8FB00024 */ lw $s0, 0x0024($sp) +/* 006F4 80B4B234 8FB10028 */ lw $s1, 0x0028($sp) +/* 006F8 80B4B238 03E00008 */ jr $ra /* 006FC 80B4B23C 27BD0070 */ addiu $sp, $sp, 0x0070 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl1/func_80B4B240.s b/asm/non_matchings/overlays/actors/ovl_En_Zl1/func_80B4B240.s index 9e7693b6bd..d70c005447 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl1/func_80B4B240.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl1/func_80B4B240.s @@ -1,9 +1,9 @@ glabel func_80B4B240 /* 00700 80B4B240 27BDFF80 */ addiu $sp, $sp, 0xFF80 ## $sp = FFFFFF80 /* 00704 80B4B244 3C0F80B5 */ lui $t7, %hi(D_80B4E654) ## $t7 = 80B50000 -/* 00708 80B4B248 AFBF002C */ sw $ra, 0x002C($sp) -/* 0070C 80B4B24C AFB10028 */ sw $s1, 0x0028($sp) -/* 00710 80B4B250 AFB00024 */ sw $s0, 0x0024($sp) +/* 00708 80B4B248 AFBF002C */ sw $ra, 0x002C($sp) +/* 0070C 80B4B24C AFB10028 */ sw $s1, 0x0028($sp) +/* 00710 80B4B250 AFB00024 */ sw $s0, 0x0024($sp) /* 00714 80B4B254 25EFE654 */ addiu $t7, $t7, %lo(D_80B4E654) ## $t7 = 80B4E654 /* 00718 80B4B258 8DF90000 */ lw $t9, 0x0000($t7) ## 80B4E654 /* 0071C 80B4B25C 27AE0074 */ addiu $t6, $sp, 0x0074 ## $t6 = FFFFFFF4 @@ -37,92 +37,92 @@ glabel func_80B4B240 /* 0078C 80B4B2CC 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 00790 80B4B2D0 BB090002 */ swr $t1, 0x0002($t8) ## FFFFFFD6 /* 00794 80B4B2D4 8CAA1C44 */ lw $t2, 0x1C44($a1) ## 00001C44 -/* 00798 80B4B2D8 AFA0003C */ sw $zero, 0x003C($sp) +/* 00798 80B4B2D8 AFA0003C */ sw $zero, 0x003C($sp) /* 0079C 80B4B2DC 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 -/* 007A0 80B4B2E0 AFAA004C */ sw $t2, 0x004C($sp) +/* 007A0 80B4B2E0 AFAA004C */ sw $t2, 0x004C($sp) /* 007A4 80B4B2E4 948B01E2 */ lhu $t3, 0x01E2($a0) ## 000001E2 -/* 007A8 80B4B2E8 2D61000A */ sltiu $at, $t3, 0x000A -/* 007AC 80B4B2EC 1020011D */ beq $at, $zero, .L80B4B764 -/* 007B0 80B4B2F0 000B5880 */ sll $t3, $t3, 2 +/* 007A8 80B4B2E8 2D61000A */ sltiu $at, $t3, 0x000A +/* 007AC 80B4B2EC 1020011D */ beq $at, $zero, .L80B4B764 +/* 007B0 80B4B2F0 000B5880 */ sll $t3, $t3, 2 /* 007B4 80B4B2F4 3C0180B5 */ lui $at, %hi(jtbl_80B4E740) ## $at = 80B50000 -/* 007B8 80B4B2F8 002B0821 */ addu $at, $at, $t3 -/* 007BC 80B4B2FC 8C2BE740 */ lw $t3, %lo(jtbl_80B4E740)($at) -/* 007C0 80B4B300 01600008 */ jr $t3 +/* 007B8 80B4B2F8 002B0821 */ addu $at, $at, $t3 +/* 007BC 80B4B2FC 8C2BE740 */ lw $t3, %lo(jtbl_80B4E740)($at) +/* 007C0 80B4B300 01600008 */ jr $t3 /* 007C4 80B4B304 00000000 */ nop glabel L80B4B308 /* 007C8 80B4B308 C6040164 */ lwc1 $f4, 0x0164($s0) ## 00000164 /* 007CC 80B4B30C 2401000E */ addiu $at, $zero, 0x000E ## $at = 0000000E -/* 007D0 80B4B310 4600218D */ trunc.w.s $f6, $f4 -/* 007D4 80B4B314 44023000 */ mfc1 $v0, $f6 +/* 007D0 80B4B310 4600218D */ trunc.w.s $f6, $f4 +/* 007D4 80B4B314 44023000 */ mfc1 $v0, $f6 /* 007D8 80B4B318 00000000 */ nop -/* 007DC 80B4B31C 00021400 */ sll $v0, $v0, 16 -/* 007E0 80B4B320 00021403 */ sra $v0, $v0, 16 -/* 007E4 80B4B324 10410007 */ beq $v0, $at, .L80B4B344 +/* 007DC 80B4B31C 00021400 */ sll $v0, $v0, 16 +/* 007E0 80B4B320 00021403 */ sra $v0, $v0, 16 +/* 007E4 80B4B324 10410007 */ beq $v0, $at, .L80B4B344 /* 007E8 80B4B328 2401000F */ addiu $at, $zero, 0x000F ## $at = 0000000F -/* 007EC 80B4B32C 10410007 */ beq $v0, $at, .L80B4B34C +/* 007EC 80B4B32C 10410007 */ beq $v0, $at, .L80B4B34C /* 007F0 80B4B330 24010040 */ addiu $at, $zero, 0x0040 ## $at = 00000040 -/* 007F4 80B4B334 10410012 */ beq $v0, $at, .L80B4B380 +/* 007F4 80B4B334 10410012 */ beq $v0, $at, .L80B4B380 /* 007F8 80B4B338 3C0E0601 */ lui $t6, 0x0601 ## $t6 = 06010000 -/* 007FC 80B4B33C 1000010A */ beq $zero, $zero, .L80B4B768 -/* 00800 80B4B340 8FAE003C */ lw $t6, 0x003C($sp) +/* 007FC 80B4B33C 1000010A */ beq $zero, $zero, .L80B4B768 +/* 00800 80B4B340 8FAE003C */ lw $t6, 0x003C($sp) .L80B4B344: -/* 00804 80B4B344 10000107 */ beq $zero, $zero, .L80B4B764 +/* 00804 80B4B344 10000107 */ beq $zero, $zero, .L80B4B764 /* 00808 80B4B348 A60001E4 */ sh $zero, 0x01E4($s0) ## 000001E4 .L80B4B34C: /* 0080C 80B4B34C 860301E4 */ lh $v1, 0x01E4($s0) ## 000001E4 /* 00810 80B4B350 3C014170 */ lui $at, 0x4170 ## $at = 41700000 -/* 00814 80B4B354 14600003 */ bne $v1, $zero, .L80B4B364 +/* 00814 80B4B354 14600003 */ bne $v1, $zero, .L80B4B364 /* 00818 80B4B358 246DFFFF */ addiu $t5, $v1, 0xFFFF ## $t5 = FFFFFFFF -/* 0081C 80B4B35C 10000003 */ beq $zero, $zero, .L80B4B36C +/* 0081C 80B4B35C 10000003 */ beq $zero, $zero, .L80B4B36C /* 00820 80B4B360 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 .L80B4B364: /* 00824 80B4B364 A60D01E4 */ sh $t5, 0x01E4($s0) ## 000001E4 /* 00828 80B4B368 860201E4 */ lh $v0, 0x01E4($s0) ## 000001E4 .L80B4B36C: -/* 0082C 80B4B36C 504000FE */ beql $v0, $zero, .L80B4B768 -/* 00830 80B4B370 8FAE003C */ lw $t6, 0x003C($sp) +/* 0082C 80B4B36C 504000FE */ beql $v0, $zero, .L80B4B768 +/* 00830 80B4B370 8FAE003C */ lw $t6, 0x003C($sp) /* 00834 80B4B374 44814000 */ mtc1 $at, $f8 ## $f8 = 15.00 -/* 00838 80B4B378 100000FA */ beq $zero, $zero, .L80B4B764 +/* 00838 80B4B378 100000FA */ beq $zero, $zero, .L80B4B764 /* 0083C 80B4B37C E6080164 */ swc1 $f8, 0x0164($s0) ## 00000164 .L80B4B380: /* 00840 80B4B380 25CE1348 */ addiu $t6, $t6, 0x1348 ## $t6 = 06011348 /* 00844 80B4B384 240F0001 */ addiu $t7, $zero, 0x0001 ## $t7 = 00000001 -/* 00848 80B4B388 AFAE0048 */ sw $t6, 0x0048($sp) -/* 0084C 80B4B38C AFAF003C */ sw $t7, 0x003C($sp) +/* 00848 80B4B388 AFAE0048 */ sw $t6, 0x0048($sp) +/* 0084C 80B4B38C AFAF003C */ sw $t7, 0x003C($sp) /* 00850 80B4B390 2418702E */ addiu $t8, $zero, 0x702E ## $t8 = 0000702E /* 00854 80B4B394 A618010E */ sh $t8, 0x010E($s0) ## 0000010E /* 00858 80B4B398 3305FFFF */ andi $a1, $t8, 0xFFFF ## $a1 = 0000702E /* 0085C 80B4B39C 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 00860 80B4B3A0 0C042DA0 */ jal func_8010B680 +/* 00860 80B4B3A0 0C042DA0 */ jal func_8010B680 /* 00864 80B4B3A4 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 /* 00868 80B4B3A8 861901E2 */ lh $t9, 0x01E2($s0) ## 000001E2 /* 0086C 80B4B3AC 27280001 */ addiu $t0, $t9, 0x0001 ## $t0 = 00000001 -/* 00870 80B4B3B0 100000EC */ beq $zero, $zero, .L80B4B764 +/* 00870 80B4B3B0 100000EC */ beq $zero, $zero, .L80B4B764 /* 00874 80B4B3B4 A60801E2 */ sh $t0, 0x01E2($s0) ## 000001E2 glabel L80B4B3B8 -/* 00878 80B4B3B8 0C042F6F */ jal func_8010BDBC +/* 00878 80B4B3B8 0C042F6F */ jal func_8010BDBC /* 0087C 80B4B3BC 262420D8 */ addiu $a0, $s1, 0x20D8 ## $a0 = 000020D8 /* 00880 80B4B3C0 24010005 */ addiu $at, $zero, 0x0005 ## $at = 00000005 -/* 00884 80B4B3C4 544100E8 */ bnel $v0, $at, .L80B4B768 -/* 00888 80B4B3C8 8FAE003C */ lw $t6, 0x003C($sp) -/* 0088C 80B4B3CC 0C041AF2 */ jal func_80106BC8 +/* 00884 80B4B3C4 544100E8 */ bnel $v0, $at, .L80B4B768 +/* 00888 80B4B3C8 8FAE003C */ lw $t6, 0x003C($sp) +/* 0088C 80B4B3CC 0C041AF2 */ jal func_80106BC8 /* 00890 80B4B3D0 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 00894 80B4B3D4 104000E3 */ beq $v0, $zero, .L80B4B764 +/* 00894 80B4B3D4 104000E3 */ beq $v0, $zero, .L80B4B764 /* 00898 80B4B3D8 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 0089C 80B4B3DC 00310821 */ addu $at, $at, $s1 +/* 0089C 80B4B3DC 00310821 */ addu $at, $at, $s1 /* 008A0 80B4B3E0 A0200B05 */ sb $zero, 0x0B05($at) ## 00010B05 /* 008A4 80B4B3E4 860501E8 */ lh $a1, 0x01E8($s0) ## 000001E8 /* 008A8 80B4B3E8 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 008AC 80B4B3EC 27A60074 */ addiu $a2, $sp, 0x0074 ## $a2 = FFFFFFF4 -/* 008B0 80B4B3F0 0C030136 */ jal func_800C04D8 +/* 008B0 80B4B3F0 0C030136 */ jal func_800C04D8 /* 008B4 80B4B3F4 27A70068 */ addiu $a3, $sp, 0x0068 ## $a3 = FFFFFFE8 /* 008B8 80B4B3F8 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 008BC 80B4B3FC 860501E8 */ lh $a1, 0x01E8($s0) ## 000001E8 -/* 008C0 80B4B400 0C0301C1 */ jal func_800C0704 +/* 008C0 80B4B400 0C0301C1 */ jal func_800C0704 /* 008C4 80B4B404 3C0641C8 */ lui $a2, 0x41C8 ## $a2 = 41C80000 /* 008C8 80B4B408 27AA0058 */ addiu $t2, $sp, 0x0058 ## $t2 = FFFFFFD8 /* 008CC 80B4B40C 8D4C0000 */ lw $t4, 0x0000($t2) ## FFFFFFD8 -/* 008D0 80B4B410 8FA9004C */ lw $t1, 0x004C($sp) +/* 008D0 80B4B410 8FA9004C */ lw $t1, 0x004C($sp) /* 008D4 80B4B414 240D702F */ addiu $t5, $zero, 0x702F ## $t5 = 0000702F /* 008D8 80B4B418 31A5FFFF */ andi $a1, $t5, 0xFFFF ## $a1 = 0000702F /* 008DC 80B4B41C AD2C0024 */ sw $t4, 0x0024($t1) ## 00000024 @@ -131,217 +131,217 @@ glabel L80B4B3B8 /* 008E8 80B4B428 AD2B0028 */ sw $t3, 0x0028($t1) ## 00000028 /* 008EC 80B4B42C 8D4C0008 */ lw $t4, 0x0008($t2) ## FFFFFFE0 /* 008F0 80B4B430 AD2C002C */ sw $t4, 0x002C($t1) ## 0000002C -/* 008F4 80B4B434 0C042DC8 */ jal func_8010B720 +/* 008F4 80B4B434 0C042DC8 */ jal func_8010B720 /* 008F8 80B4B438 A60D010E */ sh $t5, 0x010E($s0) ## 0000010E /* 008FC 80B4B43C 860E01E2 */ lh $t6, 0x01E2($s0) ## 000001E2 /* 00900 80B4B440 25CF0001 */ addiu $t7, $t6, 0x0001 ## $t7 = 00000001 -/* 00904 80B4B444 100000C7 */ beq $zero, $zero, .L80B4B764 +/* 00904 80B4B444 100000C7 */ beq $zero, $zero, .L80B4B764 /* 00908 80B4B448 A60F01E2 */ sh $t7, 0x01E2($s0) ## 000001E2 glabel L80B4B44C /* 0090C 80B4B44C 262420D8 */ addiu $a0, $s1, 0x20D8 ## $a0 = 000020D8 -/* 00910 80B4B450 0C042F6F */ jal func_8010BDBC -/* 00914 80B4B454 AFA40034 */ sw $a0, 0x0034($sp) +/* 00910 80B4B450 0C042F6F */ jal func_8010BDBC +/* 00914 80B4B454 AFA40034 */ sw $a0, 0x0034($sp) /* 00918 80B4B458 24010004 */ addiu $at, $zero, 0x0004 ## $at = 00000004 -/* 0091C 80B4B45C 544100C2 */ bnel $v0, $at, .L80B4B768 -/* 00920 80B4B460 8FAE003C */ lw $t6, 0x003C($sp) -/* 00924 80B4B464 0C041AF2 */ jal func_80106BC8 +/* 0091C 80B4B45C 544100C2 */ bnel $v0, $at, .L80B4B768 +/* 00920 80B4B460 8FAE003C */ lw $t6, 0x003C($sp) +/* 00924 80B4B464 0C041AF2 */ jal func_80106BC8 /* 00928 80B4B468 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 0092C 80B4B46C 104000BD */ beq $v0, $zero, .L80B4B764 -/* 00930 80B4B470 8FB80034 */ lw $t8, 0x0034($sp) +/* 0092C 80B4B46C 104000BD */ beq $v0, $zero, .L80B4B764 +/* 00930 80B4B470 8FB80034 */ lw $t8, 0x0034($sp) /* 00934 80B4B474 27197FFF */ addiu $t9, $t8, 0x7FFF ## $t9 = 00007FFF /* 00938 80B4B478 933963E6 */ lbu $t9, 0x63E6($t9) ## 0000E3E5 /* 0093C 80B4B47C 3C0C0601 */ lui $t4, 0x0601 ## $t4 = 06010000 /* 00940 80B4B480 258C16E4 */ addiu $t4, $t4, 0x16E4 ## $t4 = 060116E4 -/* 00944 80B4B484 1720000A */ bne $t9, $zero, .L80B4B4B0 +/* 00944 80B4B484 1720000A */ bne $t9, $zero, .L80B4B4B0 /* 00948 80B4B488 240D0002 */ addiu $t5, $zero, 0x0002 ## $t5 = 00000002 /* 0094C 80B4B48C 3C080601 */ lui $t0, 0x0601 ## $t0 = 06010000 /* 00950 80B4B490 25083F10 */ addiu $t0, $t0, 0x3F10 ## $t0 = 06013F10 /* 00954 80B4B494 24090002 */ addiu $t1, $zero, 0x0002 ## $t1 = 00000002 -/* 00958 80B4B498 AFA80048 */ sw $t0, 0x0048($sp) -/* 0095C 80B4B49C AFA9003C */ sw $t1, 0x003C($sp) +/* 00958 80B4B498 AFA80048 */ sw $t0, 0x0048($sp) +/* 0095C 80B4B49C AFA9003C */ sw $t1, 0x003C($sp) /* 00960 80B4B4A0 860A01E2 */ lh $t2, 0x01E2($s0) ## 000001E2 /* 00964 80B4B4A4 254B0001 */ addiu $t3, $t2, 0x0001 ## $t3 = 00000001 -/* 00968 80B4B4A8 100000AE */ beq $zero, $zero, .L80B4B764 +/* 00968 80B4B4A8 100000AE */ beq $zero, $zero, .L80B4B764 /* 0096C 80B4B4AC A60B01E2 */ sh $t3, 0x01E2($s0) ## 000001E2 .L80B4B4B0: -/* 00970 80B4B4B0 AFAC0048 */ sw $t4, 0x0048($sp) -/* 00974 80B4B4B4 AFAD003C */ sw $t5, 0x003C($sp) +/* 00970 80B4B4B0 AFAC0048 */ sw $t4, 0x0048($sp) +/* 00974 80B4B4B4 AFAD003C */ sw $t5, 0x003C($sp) /* 00978 80B4B4B8 240E0006 */ addiu $t6, $zero, 0x0006 ## $t6 = 00000006 -/* 0097C 80B4B4BC 100000A9 */ beq $zero, $zero, .L80B4B764 +/* 0097C 80B4B4BC 100000A9 */ beq $zero, $zero, .L80B4B764 /* 00980 80B4B4C0 A60E01E2 */ sh $t6, 0x01E2($s0) ## 000001E2 glabel L80B4B4C4 /* 00984 80B4B4C4 3C040601 */ lui $a0, 0x0601 ## $a0 = 06010000 /* 00988 80B4B4C8 0C028800 */ jal SkelAnime_GetFrameCount - + /* 0098C 80B4B4CC 24843F10 */ addiu $a0, $a0, 0x3F10 ## $a0 = 06013F10 /* 00990 80B4B4D0 44825000 */ mtc1 $v0, $f10 ## $f10 = 0.00 /* 00994 80B4B4D4 C6120164 */ lwc1 $f18, 0x0164($s0) ## 00000164 /* 00998 80B4B4D8 3C0F0601 */ lui $t7, 0x0601 ## $t7 = 06010000 -/* 0099C 80B4B4DC 46805420 */ cvt.s.w $f16, $f10 +/* 0099C 80B4B4DC 46805420 */ cvt.s.w $f16, $f10 /* 009A0 80B4B4E0 24197032 */ addiu $t9, $zero, 0x7032 ## $t9 = 00007032 /* 009A4 80B4B4E4 25EF43A8 */ addiu $t7, $t7, 0x43A8 ## $t7 = 060143A8 /* 009A8 80B4B4E8 24180001 */ addiu $t8, $zero, 0x0001 ## $t8 = 00000001 /* 009AC 80B4B4EC 3325FFFF */ andi $a1, $t9, 0xFFFF ## $a1 = 00007032 /* 009B0 80B4B4F0 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 009B4 80B4B4F4 46128032 */ c.eq.s $f16, $f18 +/* 009B4 80B4B4F4 46128032 */ c.eq.s $f16, $f18 /* 009B8 80B4B4F8 00000000 */ nop -/* 009BC 80B4B4FC 4502009A */ bc1fl .L80B4B768 -/* 009C0 80B4B500 8FAE003C */ lw $t6, 0x003C($sp) -/* 009C4 80B4B504 AFAF0048 */ sw $t7, 0x0048($sp) -/* 009C8 80B4B508 AFB8003C */ sw $t8, 0x003C($sp) -/* 009CC 80B4B50C 0C042DC8 */ jal func_8010B720 +/* 009BC 80B4B4FC 4502009A */ bc1fl .L80B4B768 +/* 009C0 80B4B500 8FAE003C */ lw $t6, 0x003C($sp) +/* 009C4 80B4B504 AFAF0048 */ sw $t7, 0x0048($sp) +/* 009C8 80B4B508 AFB8003C */ sw $t8, 0x003C($sp) +/* 009CC 80B4B50C 0C042DC8 */ jal func_8010B720 /* 009D0 80B4B510 A619010E */ sh $t9, 0x010E($s0) ## 0000010E /* 009D4 80B4B514 860801E2 */ lh $t0, 0x01E2($s0) ## 000001E2 /* 009D8 80B4B518 25090001 */ addiu $t1, $t0, 0x0001 ## $t1 = 00000001 -/* 009DC 80B4B51C 10000091 */ beq $zero, $zero, .L80B4B764 +/* 009DC 80B4B51C 10000091 */ beq $zero, $zero, .L80B4B764 /* 009E0 80B4B520 A60901E2 */ sh $t1, 0x01E2($s0) ## 000001E2 glabel L80B4B524 /* 009E4 80B4B524 262420D8 */ addiu $a0, $s1, 0x20D8 ## $a0 = 000020D8 -/* 009E8 80B4B528 0C042F6F */ jal func_8010BDBC -/* 009EC 80B4B52C AFA40034 */ sw $a0, 0x0034($sp) +/* 009E8 80B4B528 0C042F6F */ jal func_8010BDBC +/* 009EC 80B4B52C AFA40034 */ sw $a0, 0x0034($sp) /* 009F0 80B4B530 24010004 */ addiu $at, $zero, 0x0004 ## $at = 00000004 -/* 009F4 80B4B534 5441008C */ bnel $v0, $at, .L80B4B768 -/* 009F8 80B4B538 8FAE003C */ lw $t6, 0x003C($sp) -/* 009FC 80B4B53C 0C041AF2 */ jal func_80106BC8 +/* 009F4 80B4B534 5441008C */ bnel $v0, $at, .L80B4B768 +/* 009F8 80B4B538 8FAE003C */ lw $t6, 0x003C($sp) +/* 009FC 80B4B53C 0C041AF2 */ jal func_80106BC8 /* 00A00 80B4B540 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 00A04 80B4B544 10400087 */ beq $v0, $zero, .L80B4B764 -/* 00A08 80B4B548 8FAA0034 */ lw $t2, 0x0034($sp) +/* 00A04 80B4B544 10400087 */ beq $v0, $zero, .L80B4B764 +/* 00A08 80B4B548 8FAA0034 */ lw $t2, 0x0034($sp) /* 00A0C 80B4B54C 254B7FFF */ addiu $t3, $t2, 0x7FFF ## $t3 = 00007FFF /* 00A10 80B4B550 916B63E6 */ lbu $t3, 0x63E6($t3) ## 0000E3E5 /* 00A14 80B4B554 240F7034 */ addiu $t7, $zero, 0x7034 ## $t7 = 00007034 /* 00A18 80B4B558 31E5FFFF */ andi $a1, $t7, 0xFFFF ## $a1 = 00007034 -/* 00A1C 80B4B55C 15600009 */ bne $t3, $zero, .L80B4B584 +/* 00A1C 80B4B55C 15600009 */ bne $t3, $zero, .L80B4B584 /* 00A20 80B4B560 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 00A24 80B4B564 3C0C0601 */ lui $t4, 0x0601 ## $t4 = 06010000 /* 00A28 80B4B568 258C32D8 */ addiu $t4, $t4, 0x32D8 ## $t4 = 060132D8 /* 00A2C 80B4B56C 240D0002 */ addiu $t5, $zero, 0x0002 ## $t5 = 00000002 -/* 00A30 80B4B570 AFAC0048 */ sw $t4, 0x0048($sp) -/* 00A34 80B4B574 AFAD003C */ sw $t5, 0x003C($sp) +/* 00A30 80B4B570 AFAC0048 */ sw $t4, 0x0048($sp) +/* 00A34 80B4B574 AFAD003C */ sw $t5, 0x003C($sp) /* 00A38 80B4B578 240E0009 */ addiu $t6, $zero, 0x0009 ## $t6 = 00000009 -/* 00A3C 80B4B57C 10000079 */ beq $zero, $zero, .L80B4B764 +/* 00A3C 80B4B57C 10000079 */ beq $zero, $zero, .L80B4B764 /* 00A40 80B4B580 A60E01E2 */ sh $t6, 0x01E2($s0) ## 000001E2 .L80B4B584: -/* 00A44 80B4B584 0C042DC8 */ jal func_8010B720 +/* 00A44 80B4B584 0C042DC8 */ jal func_8010B720 /* 00A48 80B4B588 A60F010E */ sh $t7, 0x010E($s0) ## 0000010E /* 00A4C 80B4B58C 861801E2 */ lh $t8, 0x01E2($s0) ## 000001E2 /* 00A50 80B4B590 27190001 */ addiu $t9, $t8, 0x0001 ## $t9 = 00000001 -/* 00A54 80B4B594 10000073 */ beq $zero, $zero, .L80B4B764 +/* 00A54 80B4B594 10000073 */ beq $zero, $zero, .L80B4B764 /* 00A58 80B4B598 A61901E2 */ sh $t9, 0x01E2($s0) ## 000001E2 glabel L80B4B59C -/* 00A5C 80B4B59C 0C042F6F */ jal func_8010BDBC +/* 00A5C 80B4B59C 0C042F6F */ jal func_8010BDBC /* 00A60 80B4B5A0 262420D8 */ addiu $a0, $s1, 0x20D8 ## $a0 = 000020D8 /* 00A64 80B4B5A4 24010005 */ addiu $at, $zero, 0x0005 ## $at = 00000005 -/* 00A68 80B4B5A8 5441006F */ bnel $v0, $at, .L80B4B768 -/* 00A6C 80B4B5AC 8FAE003C */ lw $t6, 0x003C($sp) -/* 00A70 80B4B5B0 0C041AF2 */ jal func_80106BC8 +/* 00A68 80B4B5A8 5441006F */ bnel $v0, $at, .L80B4B768 +/* 00A6C 80B4B5AC 8FAE003C */ lw $t6, 0x003C($sp) +/* 00A70 80B4B5B0 0C041AF2 */ jal func_80106BC8 /* 00A74 80B4B5B4 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 00A78 80B4B5B8 1040006A */ beq $v0, $zero, .L80B4B764 +/* 00A78 80B4B5B8 1040006A */ beq $v0, $zero, .L80B4B764 /* 00A7C 80B4B5BC 24087033 */ addiu $t0, $zero, 0x7033 ## $t0 = 00007033 /* 00A80 80B4B5C0 A608010E */ sh $t0, 0x010E($s0) ## 0000010E /* 00A84 80B4B5C4 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 00A88 80B4B5C8 0C042DC8 */ jal func_8010B720 +/* 00A88 80B4B5C8 0C042DC8 */ jal func_8010B720 /* 00A8C 80B4B5CC 3105FFFF */ andi $a1, $t0, 0xFFFF ## $a1 = 00007033 /* 00A90 80B4B5D0 860901E2 */ lh $t1, 0x01E2($s0) ## 000001E2 /* 00A94 80B4B5D4 252AFFFF */ addiu $t2, $t1, 0xFFFF ## $t2 = FFFFFFFF -/* 00A98 80B4B5D8 10000062 */ beq $zero, $zero, .L80B4B764 +/* 00A98 80B4B5D8 10000062 */ beq $zero, $zero, .L80B4B764 /* 00A9C 80B4B5DC A60A01E2 */ sh $t2, 0x01E2($s0) ## 000001E2 glabel L80B4B5E0 /* 00AA0 80B4B5E0 3C040601 */ lui $a0, 0x0601 ## $a0 = 06010000 /* 00AA4 80B4B5E4 0C028800 */ jal SkelAnime_GetFrameCount - + /* 00AA8 80B4B5E8 248416E4 */ addiu $a0, $a0, 0x16E4 ## $a0 = 060116E4 /* 00AAC 80B4B5EC 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 00AB0 80B4B5F0 C6080164 */ lwc1 $f8, 0x0164($s0) ## 00000164 /* 00AB4 80B4B5F4 3C0B0601 */ lui $t3, 0x0601 ## $t3 = 06010000 -/* 00AB8 80B4B5F8 468021A0 */ cvt.s.w $f6, $f4 +/* 00AB8 80B4B5F8 468021A0 */ cvt.s.w $f6, $f4 /* 00ABC 80B4B5FC 240D7031 */ addiu $t5, $zero, 0x7031 ## $t5 = 00007031 /* 00AC0 80B4B600 256B1B88 */ addiu $t3, $t3, 0x1B88 ## $t3 = 06011B88 /* 00AC4 80B4B604 240C0001 */ addiu $t4, $zero, 0x0001 ## $t4 = 00000001 /* 00AC8 80B4B608 31A5FFFF */ andi $a1, $t5, 0xFFFF ## $a1 = 00007031 /* 00ACC 80B4B60C 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 00AD0 80B4B610 46083032 */ c.eq.s $f6, $f8 +/* 00AD0 80B4B610 46083032 */ c.eq.s $f6, $f8 /* 00AD4 80B4B614 00000000 */ nop -/* 00AD8 80B4B618 45020053 */ bc1fl .L80B4B768 -/* 00ADC 80B4B61C 8FAE003C */ lw $t6, 0x003C($sp) -/* 00AE0 80B4B620 AFAB0048 */ sw $t3, 0x0048($sp) -/* 00AE4 80B4B624 AFAC003C */ sw $t4, 0x003C($sp) -/* 00AE8 80B4B628 0C042DC8 */ jal func_8010B720 +/* 00AD8 80B4B618 45020053 */ bc1fl .L80B4B768 +/* 00ADC 80B4B61C 8FAE003C */ lw $t6, 0x003C($sp) +/* 00AE0 80B4B620 AFAB0048 */ sw $t3, 0x0048($sp) +/* 00AE4 80B4B624 AFAC003C */ sw $t4, 0x003C($sp) +/* 00AE8 80B4B628 0C042DC8 */ jal func_8010B720 /* 00AEC 80B4B62C A60D010E */ sh $t5, 0x010E($s0) ## 0000010E /* 00AF0 80B4B630 860E01E2 */ lh $t6, 0x01E2($s0) ## 000001E2 /* 00AF4 80B4B634 25CF0001 */ addiu $t7, $t6, 0x0001 ## $t7 = 00000001 -/* 00AF8 80B4B638 1000004A */ beq $zero, $zero, .L80B4B764 +/* 00AF8 80B4B638 1000004A */ beq $zero, $zero, .L80B4B764 /* 00AFC 80B4B63C A60F01E2 */ sh $t7, 0x01E2($s0) ## 000001E2 glabel L80B4B640 -/* 00B00 80B4B640 0C042F6F */ jal func_8010BDBC +/* 00B00 80B4B640 0C042F6F */ jal func_8010BDBC /* 00B04 80B4B644 262420D8 */ addiu $a0, $s1, 0x20D8 ## $a0 = 000020D8 /* 00B08 80B4B648 24010005 */ addiu $at, $zero, 0x0005 ## $at = 00000005 -/* 00B0C 80B4B64C 54410046 */ bnel $v0, $at, .L80B4B768 -/* 00B10 80B4B650 8FAE003C */ lw $t6, 0x003C($sp) -/* 00B14 80B4B654 0C041AF2 */ jal func_80106BC8 +/* 00B0C 80B4B64C 54410046 */ bnel $v0, $at, .L80B4B768 +/* 00B10 80B4B650 8FAE003C */ lw $t6, 0x003C($sp) +/* 00B14 80B4B654 0C041AF2 */ jal func_80106BC8 /* 00B18 80B4B658 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 00B1C 80B4B65C 10400041 */ beq $v0, $zero, .L80B4B764 +/* 00B1C 80B4B65C 10400041 */ beq $v0, $zero, .L80B4B764 /* 00B20 80B4B660 24187030 */ addiu $t8, $zero, 0x7030 ## $t8 = 00007030 /* 00B24 80B4B664 A618010E */ sh $t8, 0x010E($s0) ## 0000010E /* 00B28 80B4B668 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 00B2C 80B4B66C 0C042DC8 */ jal func_8010B720 +/* 00B2C 80B4B66C 0C042DC8 */ jal func_8010B720 /* 00B30 80B4B670 3305FFFF */ andi $a1, $t8, 0xFFFF ## $a1 = 00007030 /* 00B34 80B4B674 861901E2 */ lh $t9, 0x01E2($s0) ## 000001E2 /* 00B38 80B4B678 27280001 */ addiu $t0, $t9, 0x0001 ## $t0 = 00000001 -/* 00B3C 80B4B67C 10000039 */ beq $zero, $zero, .L80B4B764 +/* 00B3C 80B4B67C 10000039 */ beq $zero, $zero, .L80B4B764 /* 00B40 80B4B680 A60801E2 */ sh $t0, 0x01E2($s0) ## 000001E2 glabel L80B4B684 /* 00B44 80B4B684 262420D8 */ addiu $a0, $s1, 0x20D8 ## $a0 = 000020D8 -/* 00B48 80B4B688 0C042F6F */ jal func_8010BDBC -/* 00B4C 80B4B68C AFA40034 */ sw $a0, 0x0034($sp) +/* 00B48 80B4B688 0C042F6F */ jal func_8010BDBC +/* 00B4C 80B4B68C AFA40034 */ sw $a0, 0x0034($sp) /* 00B50 80B4B690 24010004 */ addiu $at, $zero, 0x0004 ## $at = 00000004 -/* 00B54 80B4B694 54410034 */ bnel $v0, $at, .L80B4B768 -/* 00B58 80B4B698 8FAE003C */ lw $t6, 0x003C($sp) -/* 00B5C 80B4B69C 0C041AF2 */ jal func_80106BC8 +/* 00B54 80B4B694 54410034 */ bnel $v0, $at, .L80B4B768 +/* 00B58 80B4B698 8FAE003C */ lw $t6, 0x003C($sp) +/* 00B5C 80B4B69C 0C041AF2 */ jal func_80106BC8 /* 00B60 80B4B6A0 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 00B64 80B4B6A4 1040002F */ beq $v0, $zero, .L80B4B764 -/* 00B68 80B4B6A8 8FA90034 */ lw $t1, 0x0034($sp) +/* 00B64 80B4B6A4 1040002F */ beq $v0, $zero, .L80B4B764 +/* 00B68 80B4B6A8 8FA90034 */ lw $t1, 0x0034($sp) /* 00B6C 80B4B6AC 252A7FFF */ addiu $t2, $t1, 0x7FFF ## $t2 = 00007FFF /* 00B70 80B4B6B0 914A63E6 */ lbu $t2, 0x63E6($t2) ## 0000E3E5 /* 00B74 80B4B6B4 240E7031 */ addiu $t6, $zero, 0x7031 ## $t6 = 00007031 /* 00B78 80B4B6B8 31C5FFFF */ andi $a1, $t6, 0xFFFF ## $a1 = 00007031 -/* 00B7C 80B4B6BC 15400009 */ bne $t2, $zero, .L80B4B6E4 +/* 00B7C 80B4B6BC 15400009 */ bne $t2, $zero, .L80B4B6E4 /* 00B80 80B4B6C0 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 00B84 80B4B6C4 3C0B0601 */ lui $t3, 0x0601 ## $t3 = 06010000 /* 00B88 80B4B6C8 256B38E0 */ addiu $t3, $t3, 0x38E0 ## $t3 = 060138E0 /* 00B8C 80B4B6CC 240C0002 */ addiu $t4, $zero, 0x0002 ## $t4 = 00000002 -/* 00B90 80B4B6D0 AFAB0048 */ sw $t3, 0x0048($sp) -/* 00B94 80B4B6D4 AFAC003C */ sw $t4, 0x003C($sp) +/* 00B90 80B4B6D0 AFAB0048 */ sw $t3, 0x0048($sp) +/* 00B94 80B4B6D4 AFAC003C */ sw $t4, 0x003C($sp) /* 00B98 80B4B6D8 240D0003 */ addiu $t5, $zero, 0x0003 ## $t5 = 00000003 -/* 00B9C 80B4B6DC 10000021 */ beq $zero, $zero, .L80B4B764 +/* 00B9C 80B4B6DC 10000021 */ beq $zero, $zero, .L80B4B764 /* 00BA0 80B4B6E0 A60D01E2 */ sh $t5, 0x01E2($s0) ## 000001E2 .L80B4B6E4: -/* 00BA4 80B4B6E4 0C042DC8 */ jal func_8010B720 +/* 00BA4 80B4B6E4 0C042DC8 */ jal func_8010B720 /* 00BA8 80B4B6E8 A60E010E */ sh $t6, 0x010E($s0) ## 0000010E /* 00BAC 80B4B6EC 860F01E2 */ lh $t7, 0x01E2($s0) ## 000001E2 /* 00BB0 80B4B6F0 25F8FFFF */ addiu $t8, $t7, 0xFFFF ## $t8 = FFFFFFFF -/* 00BB4 80B4B6F4 1000001B */ beq $zero, $zero, .L80B4B764 +/* 00BB4 80B4B6F4 1000001B */ beq $zero, $zero, .L80B4B764 /* 00BB8 80B4B6F8 A61801E2 */ sh $t8, 0x01E2($s0) ## 000001E2 glabel L80B4B6FC /* 00BBC 80B4B6FC 3C040601 */ lui $a0, 0x0601 ## $a0 = 06010000 /* 00BC0 80B4B700 0C028800 */ jal SkelAnime_GetFrameCount - + /* 00BC4 80B4B704 248432D8 */ addiu $a0, $a0, 0x32D8 ## $a0 = 060132D8 /* 00BC8 80B4B708 44825000 */ mtc1 $v0, $f10 ## $f10 = 0.00 /* 00BCC 80B4B70C C6120164 */ lwc1 $f18, 0x0164($s0) ## 00000164 /* 00BD0 80B4B710 3C190600 */ lui $t9, 0x0600 ## $t9 = 06000000 -/* 00BD4 80B4B714 46805420 */ cvt.s.w $f16, $f10 +/* 00BD4 80B4B714 46805420 */ cvt.s.w $f16, $f10 /* 00BD8 80B4B718 3C0980B5 */ lui $t1, %hi(D_80B4C5D0) ## $t1 = 80B50000 /* 00BDC 80B4B71C 27390438 */ addiu $t9, $t9, 0x0438 ## $t9 = 06000438 /* 00BE0 80B4B720 24080001 */ addiu $t0, $zero, 0x0001 ## $t0 = 00000001 /* 00BE4 80B4B724 2529C5D0 */ addiu $t1, $t1, %lo(D_80B4C5D0) ## $t1 = 80B4C5D0 /* 00BE8 80B4B728 240A0001 */ addiu $t2, $zero, 0x0001 ## $t2 = 00000001 -/* 00BEC 80B4B72C 46128032 */ c.eq.s $f16, $f18 +/* 00BEC 80B4B72C 46128032 */ c.eq.s $f16, $f18 /* 00BF0 80B4B730 3C018016 */ lui $at, 0x8016 ## $at = 80160000 /* 00BF4 80B4B734 3C0B80B5 */ lui $t3, %hi(func_80B4B8B4) ## $t3 = 80B50000 -/* 00BF8 80B4B738 4502000B */ bc1fl .L80B4B768 -/* 00BFC 80B4B73C 8FAE003C */ lw $t6, 0x003C($sp) -/* 00C00 80B4B740 AFB90048 */ sw $t9, 0x0048($sp) -/* 00C04 80B4B744 AFA8003C */ sw $t0, 0x003C($sp) +/* 00BF8 80B4B738 4502000B */ bc1fl .L80B4B768 +/* 00BFC 80B4B73C 8FAE003C */ lw $t6, 0x003C($sp) +/* 00C00 80B4B740 AFB90048 */ sw $t9, 0x0048($sp) +/* 00C04 80B4B744 AFA8003C */ sw $t0, 0x003C($sp) /* 00C08 80B4B748 AE291D68 */ sw $t1, 0x1D68($s1) ## 00001D68 /* 00C0C 80B4B74C A02AFA74 */ sb $t2, -0x058C($at) ## 8015FA74 /* 00C10 80B4B750 860C01E2 */ lh $t4, 0x01E2($s0) ## 000001E2 @@ -350,45 +350,45 @@ glabel L80B4B6FC /* 00C1C 80B4B75C 258D0001 */ addiu $t5, $t4, 0x0001 ## $t5 = 00000001 /* 00C20 80B4B760 A60D01E2 */ sh $t5, 0x01E2($s0) ## 000001E2 .L80B4B764: -/* 00C24 80B4B764 8FAE003C */ lw $t6, 0x003C($sp) +/* 00C24 80B4B764 8FAE003C */ lw $t6, 0x003C($sp) .L80B4B768: -/* 00C28 80B4B768 51C00013 */ beql $t6, $zero, .L80B4B7B8 +/* 00C28 80B4B768 51C00013 */ beql $t6, $zero, .L80B4B7B8 /* 00C2C 80B4B76C 8E080038 */ lw $t0, 0x0038($s0) ## 00000038 /* 00C30 80B4B770 0C028800 */ jal SkelAnime_GetFrameCount - -/* 00C34 80B4B774 8FA40048 */ lw $a0, 0x0048($sp) + +/* 00C34 80B4B774 8FA40048 */ lw $a0, 0x0048($sp) /* 00C38 80B4B778 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 -/* 00C3C 80B4B77C 8FAF003C */ lw $t7, 0x003C($sp) +/* 00C3C 80B4B77C 8FAF003C */ lw $t7, 0x003C($sp) /* 00C40 80B4B780 3C01C120 */ lui $at, 0xC120 ## $at = C1200000 -/* 00C44 80B4B784 468021A0 */ cvt.s.w $f6, $f4 -/* 00C48 80B4B788 03AFC021 */ addu $t8, $sp, $t7 +/* 00C44 80B4B784 468021A0 */ cvt.s.w $f6, $f4 +/* 00C48 80B4B788 03AFC021 */ addu $t8, $sp, $t7 /* 00C4C 80B4B78C 44814000 */ mtc1 $at, $f8 ## $f8 = -10.00 /* 00C50 80B4B790 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C -/* 00C54 80B4B794 8FA50048 */ lw $a1, 0x0048($sp) +/* 00C54 80B4B794 8FA50048 */ lw $a1, 0x0048($sp) /* 00C58 80B4B798 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 00C5C 80B4B79C E7A60010 */ swc1 $f6, 0x0010($sp) +/* 00C5C 80B4B79C E7A60010 */ swc1 $f6, 0x0010($sp) /* 00C60 80B4B7A0 93180054 */ lbu $t8, 0x0054($t8) ## 00000054 /* 00C64 80B4B7A4 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 00C68 80B4B7A8 E7A80018 */ swc1 $f8, 0x0018($sp) -/* 00C6C 80B4B7AC 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 00C70 80B4B7B0 AFB80014 */ sw $t8, 0x0014($sp) +/* 00C68 80B4B7A8 E7A80018 */ swc1 $f8, 0x0018($sp) +/* 00C6C 80B4B7AC 0C029468 */ jal SkelAnime_ChangeAnim + +/* 00C70 80B4B7B0 AFB80014 */ sw $t8, 0x0014($sp) /* 00C74 80B4B7B4 8E080038 */ lw $t0, 0x0038($s0) ## 00000038 .L80B4B7B8: /* 00C78 80B4B7B8 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 00C7C 80B4B7BC 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 00C80 80B4B7C0 AFA80010 */ sw $t0, 0x0010($sp) +/* 00C80 80B4B7C0 AFA80010 */ sw $t0, 0x0010($sp) /* 00C84 80B4B7C4 8E19003C */ lw $t9, 0x003C($s0) ## 0000003C /* 00C88 80B4B7C8 26060200 */ addiu $a2, $s0, 0x0200 ## $a2 = 00000200 /* 00C8C 80B4B7CC 26070206 */ addiu $a3, $s0, 0x0206 ## $a3 = 00000206 -/* 00C90 80B4B7D0 AFB90014 */ sw $t9, 0x0014($sp) +/* 00C90 80B4B7D0 AFB90014 */ sw $t9, 0x0014($sp) /* 00C94 80B4B7D4 8E080040 */ lw $t0, 0x0040($s0) ## 00000040 -/* 00C98 80B4B7D8 0C00E0A4 */ jal func_80038290 -/* 00C9C 80B4B7DC AFA80018 */ sw $t0, 0x0018($sp) -/* 00CA0 80B4B7E0 8FBF002C */ lw $ra, 0x002C($sp) -/* 00CA4 80B4B7E4 8FB00024 */ lw $s0, 0x0024($sp) -/* 00CA8 80B4B7E8 8FB10028 */ lw $s1, 0x0028($sp) -/* 00CAC 80B4B7EC 03E00008 */ jr $ra +/* 00C98 80B4B7D8 0C00E0A4 */ jal func_80038290 +/* 00C9C 80B4B7DC AFA80018 */ sw $t0, 0x0018($sp) +/* 00CA0 80B4B7E0 8FBF002C */ lw $ra, 0x002C($sp) +/* 00CA4 80B4B7E4 8FB00024 */ lw $s0, 0x0024($sp) +/* 00CA8 80B4B7E8 8FB10028 */ lw $s1, 0x0028($sp) +/* 00CAC 80B4B7EC 03E00008 */ jr $ra /* 00CB0 80B4B7F0 27BD0080 */ addiu $sp, $sp, 0x0080 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl1/func_80B4B874.s b/asm/non_matchings/overlays/actors/ovl_En_Zl1/func_80B4B874.s index 1a151fdeb0..2a587fa048 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl1/func_80B4B874.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl1/func_80B4B874.s @@ -1,19 +1,19 @@ glabel func_80B4B874 /* 00D34 80B4B874 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00D38 80B4B878 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00D3C 80B4B87C AFA40018 */ sw $a0, 0x0018($sp) -/* 00D40 80B4B880 AFA5001C */ sw $a1, 0x001C($sp) +/* 00D38 80B4B878 AFBF0014 */ sw $ra, 0x0014($sp) +/* 00D3C 80B4B87C AFA40018 */ sw $a0, 0x0018($sp) +/* 00D40 80B4B880 AFA5001C */ sw $a1, 0x001C($sp) /* 00D44 80B4B884 908E0181 */ lbu $t6, 0x0181($a0) ## 00000181 /* 00D48 80B4B888 00802825 */ or $a1, $a0, $zero ## $a1 = 00000000 /* 00D4C 80B4B88C 24A6014C */ addiu $a2, $a1, 0x014C ## $a2 = 0000014C /* 00D50 80B4B890 35CF0001 */ ori $t7, $t6, 0x0001 ## $t7 = 00000001 /* 00D54 80B4B894 A08F0181 */ sb $t7, 0x0181($a0) ## 00000181 -/* 00D58 80B4B898 8FA4001C */ lw $a0, 0x001C($sp) -/* 00D5C 80B4B89C 0C028D88 */ jal func_800A3620 +/* 00D58 80B4B898 8FA4001C */ lw $a0, 0x001C($sp) +/* 00D5C 80B4B89C 0C028D88 */ jal SkelAnime_LoadAnimationType5 /* 00D60 80B4B8A0 3C073F80 */ lui $a3, 0x3F80 ## $a3 = 3F800000 -/* 00D64 80B4B8A4 8FBF0014 */ lw $ra, 0x0014($sp) +/* 00D64 80B4B8A4 8FBF0014 */ lw $ra, 0x0014($sp) /* 00D68 80B4B8A8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00D6C 80B4B8AC 03E00008 */ jr $ra +/* 00D6C 80B4B8AC 03E00008 */ jr $ra /* 00D70 80B4B8B0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl1/func_80B4B8B4.s b/asm/non_matchings/overlays/actors/ovl_En_Zl1/func_80B4B8B4.s index f349aa1784..51705c45cb 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl1/func_80B4B8B4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl1/func_80B4B8B4.s @@ -1,13 +1,13 @@ glabel func_80B4B8B4 /* 00D74 80B4B8B4 27BDFF28 */ addiu $sp, $sp, 0xFF28 ## $sp = FFFFFF28 /* 00D78 80B4B8B8 3C0F80B5 */ lui $t7, %hi(D_80B4E67C) ## $t7 = 80B50000 -/* 00D7C 80B4B8BC AFB20030 */ sw $s2, 0x0030($sp) -/* 00D80 80B4B8C0 AFB00028 */ sw $s0, 0x0028($sp) +/* 00D7C 80B4B8BC AFB20030 */ sw $s2, 0x0030($sp) +/* 00D80 80B4B8C0 AFB00028 */ sw $s0, 0x0028($sp) /* 00D84 80B4B8C4 25EFE67C */ addiu $t7, $t7, %lo(D_80B4E67C) ## $t7 = 80B4E67C /* 00D88 80B4B8C8 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 00D8C 80B4B8CC 00A09025 */ or $s2, $a1, $zero ## $s2 = 00000000 -/* 00D90 80B4B8D0 AFBF0034 */ sw $ra, 0x0034($sp) -/* 00D94 80B4B8D4 AFB1002C */ sw $s1, 0x002C($sp) +/* 00D90 80B4B8D0 AFBF0034 */ sw $ra, 0x0034($sp) +/* 00D94 80B4B8D4 AFB1002C */ sw $s1, 0x002C($sp) /* 00D98 80B4B8D8 25E80024 */ addiu $t0, $t7, 0x0024 ## $t0 = 80B4E6A0 /* 00D9C 80B4B8DC 27AE00B0 */ addiu $t6, $sp, 0x00B0 ## $t6 = FFFFFFD8 .L80B4B8E0: @@ -18,7 +18,7 @@ glabel func_80B4B8B4 /* 00DB0 80B4B8F0 8DF8FFF8 */ lw $t8, -0x0008($t7) ## 80B4E680 /* 00DB4 80B4B8F4 ADD8FFF8 */ sw $t8, -0x0008($t6) ## FFFFFFDC /* 00DB8 80B4B8F8 8DF9FFFC */ lw $t9, -0x0004($t7) ## 80B4E684 -/* 00DBC 80B4B8FC 15E8FFF8 */ bne $t7, $t0, .L80B4B8E0 +/* 00DBC 80B4B8FC 15E8FFF8 */ bne $t7, $t0, .L80B4B8E0 /* 00DC0 80B4B900 ADD9FFFC */ sw $t9, -0x0004($t6) ## FFFFFFE0 /* 00DC4 80B4B904 8DF90000 */ lw $t9, 0x0000($t7) ## 80B4E688 /* 00DC8 80B4B908 3C0A80B5 */ lui $t2, %hi(D_80B4E6A4) ## $t2 = 80B50000 @@ -60,30 +60,30 @@ glabel func_80B4B8B4 /* 00E58 80B4B998 AD6D0004 */ sw $t5, 0x0004($t3) ## FFFFFF88 /* 00E5C 80B4B99C AD680008 */ sw $t0, 0x0008($t3) ## FFFFFF8C /* 00E60 80B4B9A0 0C02927F */ jal SkelAnime_FrameUpdateMatrix - -/* 00E64 80B4B9A4 AFA40044 */ sw $a0, 0x0044($sp) + +/* 00E64 80B4B9A4 AFA40044 */ sw $a0, 0x0044($sp) /* 00E68 80B4B9A8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00E6C 80B4B9AC 0C2D2E1D */ jal func_80B4B874 +/* 00E6C 80B4B9AC 0C2D2E1D */ jal func_80B4B874 /* 00E70 80B4B9B0 02402825 */ or $a1, $s2, $zero ## $a1 = 00000000 /* 00E74 80B4B9B4 924F1D6C */ lbu $t7, 0x1D6C($s2) ## 00001D6C /* 00E78 80B4B9B8 3C0E80B5 */ lui $t6, %hi(func_80B4BBC4) ## $t6 = 80B50000 /* 00E7C 80B4B9BC 25CEBBC4 */ addiu $t6, $t6, %lo(func_80B4BBC4) ## $t6 = 80B4BBC4 -/* 00E80 80B4B9C0 55E00004 */ bnel $t7, $zero, .L80B4B9D4 +/* 00E80 80B4B9C0 55E00004 */ bnel $t7, $zero, .L80B4B9D4 /* 00E84 80B4B9C4 8E511D8C */ lw $s1, 0x1D8C($s2) ## 00001D8C -/* 00E88 80B4B9C8 10000078 */ beq $zero, $zero, .L80B4BBAC +/* 00E88 80B4B9C8 10000078 */ beq $zero, $zero, .L80B4BBAC /* 00E8C 80B4B9CC AE0E0190 */ sw $t6, 0x0190($s0) ## 00000190 /* 00E90 80B4B9D0 8E511D8C */ lw $s1, 0x1D8C($s2) ## 00001D8C .L80B4B9D4: -/* 00E94 80B4B9D4 12200075 */ beq $s1, $zero, .L80B4BBAC +/* 00E94 80B4B9D4 12200075 */ beq $s1, $zero, .L80B4BBAC /* 00E98 80B4B9D8 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 00E9C 80B4B9DC 0C2D2DFD */ jal func_80B4B7F4 +/* 00E9C 80B4B9DC 0C2D2DFD */ jal func_80B4B7F4 /* 00EA0 80B4B9E0 27A50074 */ addiu $a1, $sp, 0x0074 ## $a1 = FFFFFF9C /* 00EA4 80B4B9E4 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 00EA8 80B4B9E8 0C2D2E0D */ jal func_80B4B834 +/* 00EA8 80B4B9E8 0C2D2E0D */ jal func_80B4B834 /* 00EAC 80B4B9EC 27A50068 */ addiu $a1, $sp, 0x0068 ## $a1 = FFFFFF90 /* 00EB0 80B4B9F0 860201E6 */ lh $v0, 0x01E6($s0) ## 000001E6 /* 00EB4 80B4B9F4 27B80074 */ addiu $t8, $sp, 0x0074 ## $t8 = FFFFFF9C -/* 00EB8 80B4B9F8 54400016 */ bnel $v0, $zero, .L80B4BA54 +/* 00EB8 80B4B9F8 54400016 */ bnel $v0, $zero, .L80B4BA54 /* 00EBC 80B4B9FC 96230000 */ lhu $v1, 0x0000($s1) ## 00000000 /* 00EC0 80B4BA00 8F090000 */ lw $t1, 0x0000($t8) ## FFFFFF9C /* 00EC4 80B4BA04 27A30048 */ addiu $v1, $sp, 0x0048 ## $v1 = FFFFFF70 @@ -107,30 +107,30 @@ glabel func_80B4B8B4 /* 00F0C 80B4BA4C AE0D002C */ sw $t5, 0x002C($s0) ## 0000002C /* 00F10 80B4BA50 96230000 */ lhu $v1, 0x0000($s1) ## 00000000 .L80B4BA54: -/* 00F14 80B4BA54 10620017 */ beq $v1, $v0, .L80B4BAB4 -/* 00F18 80B4BA58 00034080 */ sll $t0, $v1, 2 -/* 00F1C 80B4BA5C 03A82021 */ addu $a0, $sp, $t0 +/* 00F14 80B4BA54 10620017 */ beq $v1, $v0, .L80B4BAB4 +/* 00F18 80B4BA58 00034080 */ sll $t0, $v1, 2 +/* 00F1C 80B4BA5C 03A82021 */ addu $a0, $sp, $t0 /* 00F20 80B4BA60 0C028800 */ jal SkelAnime_GetFrameCount - + /* 00F24 80B4BA64 8C8400B0 */ lw $a0, 0x00B0($a0) ## 000000B0 /* 00F28 80B4BA68 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 00F2C 80B4BA6C 96230000 */ lhu $v1, 0x0000($s1) ## 00000000 /* 00F30 80B4BA70 3C01C120 */ lui $at, 0xC120 ## $at = C1200000 -/* 00F34 80B4BA74 468021A0 */ cvt.s.w $f6, $f4 -/* 00F38 80B4BA78 00037880 */ sll $t7, $v1, 2 -/* 00F3C 80B4BA7C 03AF2821 */ addu $a1, $sp, $t7 +/* 00F34 80B4BA74 468021A0 */ cvt.s.w $f6, $f4 +/* 00F38 80B4BA78 00037880 */ sll $t7, $v1, 2 +/* 00F3C 80B4BA7C 03AF2821 */ addu $a1, $sp, $t7 /* 00F40 80B4BA80 8CA500B0 */ lw $a1, 0x00B0($a1) ## 000000B0 -/* 00F44 80B4BA84 03A37021 */ addu $t6, $sp, $v1 +/* 00F44 80B4BA84 03A37021 */ addu $t6, $sp, $v1 /* 00F48 80B4BA88 44814000 */ mtc1 $at, $f8 ## $f8 = -10.00 -/* 00F4C 80B4BA8C E7A60010 */ swc1 $f6, 0x0010($sp) +/* 00F4C 80B4BA8C E7A60010 */ swc1 $f6, 0x0010($sp) /* 00F50 80B4BA90 91CE00A4 */ lbu $t6, 0x00A4($t6) ## 000000A4 -/* 00F54 80B4BA94 8FA40044 */ lw $a0, 0x0044($sp) +/* 00F54 80B4BA94 8FA40044 */ lw $a0, 0x0044($sp) /* 00F58 80B4BA98 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 00F5C 80B4BA9C 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 00F60 80B4BAA0 E7A80018 */ swc1 $f8, 0x0018($sp) -/* 00F64 80B4BAA4 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 00F68 80B4BAA8 AFAE0014 */ sw $t6, 0x0014($sp) +/* 00F60 80B4BAA0 E7A80018 */ swc1 $f8, 0x0018($sp) +/* 00F64 80B4BAA4 0C029468 */ jal SkelAnime_ChangeAnim + +/* 00F68 80B4BAA8 AFAE0014 */ sw $t6, 0x0014($sp) /* 00F6C 80B4BAAC 96380000 */ lhu $t8, 0x0000($s1) ## 00000000 /* 00F70 80B4BAB0 A61801E6 */ sh $t8, 0x01E6($s0) ## 000001E6 .L80B4BAB4: @@ -143,67 +143,67 @@ glabel func_80B4B8B4 /* 00F8C 80B4BACC AE0A0064 */ sw $t2, 0x0064($s0) ## 00000064 /* 00F90 80B4BAD0 964B1D74 */ lhu $t3, 0x1D74($s2) ## 00001D74 /* 00F94 80B4BAD4 96220004 */ lhu $v0, 0x0004($s1) ## 00000004 -/* 00F98 80B4BAD8 0162082A */ slt $at, $t3, $v0 -/* 00F9C 80B4BADC 50200020 */ beql $at, $zero, .L80B4BB60 +/* 00F98 80B4BAD8 0162082A */ slt $at, $t3, $v0 +/* 00F9C 80B4BADC 50200020 */ beql $at, $zero, .L80B4BB60 /* 00FA0 80B4BAE0 8E0F0038 */ lw $t7, 0x0038($s0) ## 00000038 /* 00FA4 80B4BAE4 962C0002 */ lhu $t4, 0x0002($s1) ## 00000002 -/* 00FA8 80B4BAE8 C7B00068 */ lwc1 $f16, 0x0068($sp) -/* 00FAC 80B4BAEC C7B20074 */ lwc1 $f18, 0x0074($sp) -/* 00FB0 80B4BAF0 004C6823 */ subu $t5, $v0, $t4 +/* 00FA8 80B4BAE8 C7B00068 */ lwc1 $f16, 0x0068($sp) +/* 00FAC 80B4BAEC C7B20074 */ lwc1 $f18, 0x0074($sp) +/* 00FB0 80B4BAF0 004C6823 */ subu $t5, $v0, $t4 /* 00FB4 80B4BAF4 448D5000 */ mtc1 $t5, $f10 ## $f10 = 0.00 -/* 00FB8 80B4BAF8 46128101 */ sub.s $f4, $f16, $f18 +/* 00FB8 80B4BAF8 46128101 */ sub.s $f4, $f16, $f18 /* 00FBC 80B4BAFC C6020070 */ lwc1 $f2, 0x0070($s0) ## 00000070 -/* 00FC0 80B4BB00 46805020 */ cvt.s.w $f0, $f10 -/* 00FC4 80B4BB04 46002183 */ div.s $f6, $f4, $f0 +/* 00FC0 80B4BB00 46805020 */ cvt.s.w $f0, $f10 +/* 00FC4 80B4BB04 46002183 */ div.s $f6, $f4, $f0 /* 00FC8 80B4BB08 E606005C */ swc1 $f6, 0x005C($s0) ## 0000005C -/* 00FCC 80B4BB0C C7AA0078 */ lwc1 $f10, 0x0078($sp) -/* 00FD0 80B4BB10 C7A8006C */ lwc1 $f8, 0x006C($sp) +/* 00FCC 80B4BB0C C7AA0078 */ lwc1 $f10, 0x0078($sp) +/* 00FD0 80B4BB10 C7A8006C */ lwc1 $f8, 0x006C($sp) /* 00FD4 80B4BB14 C606006C */ lwc1 $f6, 0x006C($s0) ## 0000006C -/* 00FD8 80B4BB18 460A4401 */ sub.s $f16, $f8, $f10 -/* 00FDC 80B4BB1C 46008483 */ div.s $f18, $f16, $f0 +/* 00FD8 80B4BB18 460A4401 */ sub.s $f16, $f8, $f10 +/* 00FDC 80B4BB1C 46008483 */ div.s $f18, $f16, $f0 /* 00FE0 80B4BB20 E6120060 */ swc1 $f18, 0x0060($s0) ## 00000060 /* 00FE4 80B4BB24 C6040060 */ lwc1 $f4, 0x0060($s0) ## 00000060 -/* 00FE8 80B4BB28 46062200 */ add.s $f8, $f4, $f6 +/* 00FE8 80B4BB28 46062200 */ add.s $f8, $f4, $f6 /* 00FEC 80B4BB2C E6080060 */ swc1 $f8, 0x0060($s0) ## 00000060 /* 00FF0 80B4BB30 C60A0060 */ lwc1 $f10, 0x0060($s0) ## 00000060 -/* 00FF4 80B4BB34 4602503C */ c.lt.s $f10, $f2 +/* 00FF4 80B4BB34 4602503C */ c.lt.s $f10, $f2 /* 00FF8 80B4BB38 00000000 */ nop -/* 00FFC 80B4BB3C 45020003 */ bc1fl .L80B4BB4C -/* 01000 80B4BB40 C7B00070 */ lwc1 $f16, 0x0070($sp) +/* 00FFC 80B4BB3C 45020003 */ bc1fl .L80B4BB4C +/* 01000 80B4BB40 C7B00070 */ lwc1 $f16, 0x0070($sp) /* 01004 80B4BB44 E6020060 */ swc1 $f2, 0x0060($s0) ## 00000060 -/* 01008 80B4BB48 C7B00070 */ lwc1 $f16, 0x0070($sp) +/* 01008 80B4BB48 C7B00070 */ lwc1 $f16, 0x0070($sp) .L80B4BB4C: -/* 0100C 80B4BB4C C7B2007C */ lwc1 $f18, 0x007C($sp) -/* 01010 80B4BB50 46128101 */ sub.s $f4, $f16, $f18 -/* 01014 80B4BB54 46002183 */ div.s $f6, $f4, $f0 +/* 0100C 80B4BB4C C7B2007C */ lwc1 $f18, 0x007C($sp) +/* 01010 80B4BB50 46128101 */ sub.s $f4, $f16, $f18 +/* 01014 80B4BB54 46002183 */ div.s $f6, $f4, $f0 /* 01018 80B4BB58 E6060064 */ swc1 $f6, 0x0064($s0) ## 00000064 /* 0101C 80B4BB5C 8E0F0038 */ lw $t7, 0x0038($s0) ## 00000038 .L80B4BB60: /* 01020 80B4BB60 02402025 */ or $a0, $s2, $zero ## $a0 = 00000000 /* 01024 80B4BB64 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 01028 80B4BB68 AFAF0010 */ sw $t7, 0x0010($sp) +/* 01028 80B4BB68 AFAF0010 */ sw $t7, 0x0010($sp) /* 0102C 80B4BB6C 8E08003C */ lw $t0, 0x003C($s0) ## 0000003C /* 01030 80B4BB70 26060200 */ addiu $a2, $s0, 0x0200 ## $a2 = 00000200 /* 01034 80B4BB74 26070206 */ addiu $a3, $s0, 0x0206 ## $a3 = 00000206 -/* 01038 80B4BB78 AFA80014 */ sw $t0, 0x0014($sp) +/* 01038 80B4BB78 AFA80014 */ sw $t0, 0x0014($sp) /* 0103C 80B4BB7C 8E0F0040 */ lw $t7, 0x0040($s0) ## 00000040 -/* 01040 80B4BB80 0C00E0A4 */ jal func_80038290 -/* 01044 80B4BB84 AFAF0018 */ sw $t7, 0x0018($sp) +/* 01040 80B4BB80 0C00E0A4 */ jal func_80038290 +/* 01044 80B4BB84 AFAF0018 */ sw $t7, 0x0018($sp) /* 01048 80B4BB88 02402025 */ or $a0, $s2, $zero ## $a0 = 00000000 /* 0104C 80B4BB8C 860501E8 */ lh $a1, 0x01E8($s0) ## 000001E8 /* 01050 80B4BB90 27A60098 */ addiu $a2, $sp, 0x0098 ## $a2 = FFFFFFC0 -/* 01054 80B4BB94 0C030136 */ jal func_800C04D8 +/* 01054 80B4BB94 0C030136 */ jal func_800C04D8 /* 01058 80B4BB98 27A7008C */ addiu $a3, $sp, 0x008C ## $a3 = FFFFFFB4 /* 0105C 80B4BB9C 02402025 */ or $a0, $s2, $zero ## $a0 = 00000000 /* 01060 80B4BBA0 860501E8 */ lh $a1, 0x01E8($s0) ## 000001E8 -/* 01064 80B4BBA4 0C0301C1 */ jal func_800C0704 +/* 01064 80B4BBA4 0C0301C1 */ jal func_800C0704 /* 01068 80B4BBA8 3C06428C */ lui $a2, 0x428C ## $a2 = 428C0000 .L80B4BBAC: -/* 0106C 80B4BBAC 8FBF0034 */ lw $ra, 0x0034($sp) -/* 01070 80B4BBB0 8FB00028 */ lw $s0, 0x0028($sp) -/* 01074 80B4BBB4 8FB1002C */ lw $s1, 0x002C($sp) -/* 01078 80B4BBB8 8FB20030 */ lw $s2, 0x0030($sp) -/* 0107C 80B4BBBC 03E00008 */ jr $ra +/* 0106C 80B4BBAC 8FBF0034 */ lw $ra, 0x0034($sp) +/* 01070 80B4BBB0 8FB00028 */ lw $s0, 0x0028($sp) +/* 01074 80B4BBB4 8FB1002C */ lw $s1, 0x002C($sp) +/* 01078 80B4BBB8 8FB20030 */ lw $s2, 0x0030($sp) +/* 0107C 80B4BBBC 03E00008 */ jr $ra /* 01080 80B4BBC0 27BD00D8 */ addiu $sp, $sp, 0x00D8 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl1/func_80B4BBC4.s b/asm/non_matchings/overlays/actors/ovl_En_Zl1/func_80B4BBC4.s index 0d9ed71528..acdcb013b7 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl1/func_80B4BBC4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl1/func_80B4BBC4.s @@ -1,50 +1,50 @@ glabel func_80B4BBC4 /* 01084 80B4BBC4 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 -/* 01088 80B4BBC8 AFB00028 */ sw $s0, 0x0028($sp) +/* 01088 80B4BBC8 AFB00028 */ sw $s0, 0x0028($sp) /* 0108C 80B4BBCC 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 01090 80B4BBD0 AFBF002C */ sw $ra, 0x002C($sp) +/* 01090 80B4BBD0 AFBF002C */ sw $ra, 0x002C($sp) /* 01094 80B4BBD4 3C040600 */ lui $a0, 0x0600 ## $a0 = 06000000 -/* 01098 80B4BBD8 AFA50044 */ sw $a1, 0x0044($sp) +/* 01098 80B4BBD8 AFA50044 */ sw $a1, 0x0044($sp) /* 0109C 80B4BBDC 0C028800 */ jal SkelAnime_GetFrameCount - + /* 010A0 80B4BBE0 24840438 */ addiu $a0, $a0, 0x0438 ## $a0 = 06000438 /* 010A4 80B4BBE4 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 -/* 010A8 80B4BBE8 8FAE0044 */ lw $t6, 0x0044($sp) +/* 010A8 80B4BBE8 8FAE0044 */ lw $t6, 0x0044($sp) /* 010AC 80B4BBEC 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 010B0 80B4BBF0 468021A0 */ cvt.s.w $f6, $f4 +/* 010B0 80B4BBF0 468021A0 */ cvt.s.w $f6, $f4 /* 010B4 80B4BBF4 8DCF1C44 */ lw $t7, 0x1C44($t6) ## 00001C44 /* 010B8 80B4BBF8 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 010BC 80B4BBFC 44070000 */ mfc1 $a3, $f0 +/* 010BC 80B4BBFC 44070000 */ mfc1 $a3, $f0 /* 010C0 80B4BC00 24A50438 */ addiu $a1, $a1, 0x0438 ## $a1 = 06000438 -/* 010C4 80B4BC04 AFA00014 */ sw $zero, 0x0014($sp) -/* 010C8 80B4BC08 E7A60010 */ swc1 $f6, 0x0010($sp) +/* 010C4 80B4BC04 AFA00014 */ sw $zero, 0x0014($sp) +/* 010C8 80B4BC08 E7A60010 */ swc1 $f6, 0x0010($sp) /* 010CC 80B4BC0C 2604014C */ addiu $a0, $s0, 0x014C ## $a0 = 0000014C /* 010D0 80B4BC10 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 010D4 80B4BC14 E7A00018 */ swc1 $f0, 0x0018($sp) -/* 010D8 80B4BC18 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 010DC 80B4BC1C AFAF0034 */ sw $t7, 0x0034($sp) -/* 010E0 80B4BC20 8FA40044 */ lw $a0, 0x0044($sp) +/* 010D4 80B4BC14 E7A00018 */ swc1 $f0, 0x0018($sp) +/* 010D8 80B4BC18 0C029468 */ jal SkelAnime_ChangeAnim + +/* 010DC 80B4BC1C AFAF0034 */ sw $t7, 0x0034($sp) +/* 010E0 80B4BC20 8FA40044 */ lw $a0, 0x0044($sp) /* 010E4 80B4BC24 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 010E8 80B4BC28 0C00B7D5 */ jal func_8002DF54 +/* 010E8 80B4BC28 0C00B7D5 */ jal func_8002DF54 /* 010EC 80B4BC2C 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 -/* 010F0 80B4BC30 8FA40034 */ lw $a0, 0x0034($sp) -/* 010F4 80B4BC34 0C00BDF7 */ jal func_8002F7DC +/* 010F0 80B4BC30 8FA40034 */ lw $a0, 0x0034($sp) +/* 010F4 80B4BC34 0C00BDF7 */ jal func_8002F7DC /* 010F8 80B4BC38 24056836 */ addiu $a1, $zero, 0x6836 ## $a1 = 00006836 /* 010FC 80B4BC3C 24187039 */ addiu $t8, $zero, 0x7039 ## $t8 = 00007039 /* 01100 80B4BC40 A618010E */ sh $t8, 0x010E($s0) ## 0000010E -/* 01104 80B4BC44 8FA40044 */ lw $a0, 0x0044($sp) +/* 01104 80B4BC44 8FA40044 */ lw $a0, 0x0044($sp) /* 01108 80B4BC48 3305FFFF */ andi $a1, $t8, 0xFFFF ## $a1 = 00007039 -/* 0110C 80B4BC4C 0C042DA0 */ jal func_8010B680 +/* 0110C 80B4BC4C 0C042DA0 */ jal func_8010B680 /* 01110 80B4BC50 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 /* 01114 80B4BC54 3C1980B5 */ lui $t9, %hi(func_80B4BF2C) ## $t9 = 80B50000 /* 01118 80B4BC58 2739BF2C */ addiu $t9, $t9, %lo(func_80B4BF2C) ## $t9 = 80B4BF2C /* 0111C 80B4BC5C A60001E2 */ sh $zero, 0x01E2($s0) ## 000001E2 /* 01120 80B4BC60 AE190190 */ sw $t9, 0x0190($s0) ## 00000190 -/* 01124 80B4BC64 8FBF002C */ lw $ra, 0x002C($sp) -/* 01128 80B4BC68 8FB00028 */ lw $s0, 0x0028($sp) +/* 01124 80B4BC64 8FBF002C */ lw $ra, 0x002C($sp) +/* 01128 80B4BC68 8FB00028 */ lw $s0, 0x0028($sp) /* 0112C 80B4BC6C 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 -/* 01130 80B4BC70 03E00008 */ jr $ra +/* 01130 80B4BC70 03E00008 */ jr $ra /* 01134 80B4BC74 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl1/func_80B4BC78.s b/asm/non_matchings/overlays/actors/ovl_En_Zl1/func_80B4BC78.s index b5a360a624..9b2f5a5b13 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl1/func_80B4BC78.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl1/func_80B4BC78.s @@ -1,12 +1,12 @@ glabel func_80B4BC78 /* 01138 80B4BC78 27BDFF48 */ addiu $sp, $sp, 0xFF48 ## $sp = FFFFFF48 /* 0113C 80B4BC7C 3C0F80B5 */ lui $t7, %hi(D_80B4E6D4) ## $t7 = 80B50000 -/* 01140 80B4BC80 AFB00024 */ sw $s0, 0x0024($sp) +/* 01140 80B4BC80 AFB00024 */ sw $s0, 0x0024($sp) /* 01144 80B4BC84 25EFE6D4 */ addiu $t7, $t7, %lo(D_80B4E6D4) ## $t7 = 80B4E6D4 /* 01148 80B4BC88 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 0114C 80B4BC8C AFBF002C */ sw $ra, 0x002C($sp) -/* 01150 80B4BC90 AFB10028 */ sw $s1, 0x0028($sp) -/* 01154 80B4BC94 AFA500BC */ sw $a1, 0x00BC($sp) +/* 0114C 80B4BC8C AFBF002C */ sw $ra, 0x002C($sp) +/* 01150 80B4BC90 AFB10028 */ sw $s1, 0x0028($sp) +/* 01154 80B4BC94 AFA500BC */ sw $a1, 0x00BC($sp) /* 01158 80B4BC98 25E80024 */ addiu $t0, $t7, 0x0024 ## $t0 = 80B4E6F8 /* 0115C 80B4BC9C 27AE0090 */ addiu $t6, $sp, 0x0090 ## $t6 = FFFFFFD8 .L80B4BCA0: @@ -17,7 +17,7 @@ glabel func_80B4BC78 /* 01170 80B4BCB0 8DF8FFF8 */ lw $t8, -0x0008($t7) ## 80B4E6D8 /* 01174 80B4BCB4 ADD8FFF8 */ sw $t8, -0x0008($t6) ## FFFFFFDC /* 01178 80B4BCB8 8DF9FFFC */ lw $t9, -0x0004($t7) ## 80B4E6DC -/* 0117C 80B4BCBC 15E8FFF8 */ bne $t7, $t0, .L80B4BCA0 +/* 0117C 80B4BCBC 15E8FFF8 */ bne $t7, $t0, .L80B4BCA0 /* 01180 80B4BCC0 ADD9FFFC */ sw $t9, -0x0004($t6) ## FFFFFFE0 /* 01184 80B4BCC4 8DF90000 */ lw $t9, 0x0000($t7) ## 80B4E6E0 /* 01188 80B4BCC8 3C0A80B5 */ lui $t2, %hi(D_80B4E6FC) ## $t2 = 80B50000 @@ -41,49 +41,49 @@ glabel func_80B4BC78 /* 011D0 80B4BD10 ADAF0004 */ sw $t7, 0x0004($t5) ## FFFFFFA4 /* 011D4 80B4BD14 ADAE0008 */ sw $t6, 0x0008($t5) ## FFFFFFA8 /* 011D8 80B4BD18 0C02927F */ jal SkelAnime_FrameUpdateMatrix - -/* 011DC 80B4BD1C AFA4003C */ sw $a0, 0x003C($sp) -/* 011E0 80B4BD20 50400016 */ beql $v0, $zero, .L80B4BD7C + +/* 011DC 80B4BD1C AFA4003C */ sw $a0, 0x003C($sp) +/* 011E0 80B4BD20 50400016 */ beql $v0, $zero, .L80B4BD7C /* 011E4 80B4BD24 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 011E8 80B4BD28 8E190154 */ lw $t9, 0x0154($s0) ## 00000154 /* 011EC 80B4BD2C 3C180601 */ lui $t8, 0x0601 ## $t8 = 06010000 /* 011F0 80B4BD30 27180B38 */ addiu $t8, $t8, 0x0B38 ## $t8 = 06010B38 -/* 011F4 80B4BD34 17190010 */ bne $t8, $t9, .L80B4BD78 +/* 011F4 80B4BD34 17190010 */ bne $t8, $t9, .L80B4BD78 /* 011F8 80B4BD38 3C110601 */ lui $s1, 0x0601 ## $s1 = 06010000 /* 011FC 80B4BD3C 26311348 */ addiu $s1, $s1, 0x1348 ## $s1 = 06011348 /* 01200 80B4BD40 0C028800 */ jal SkelAnime_GetFrameCount - + /* 01204 80B4BD44 02202025 */ or $a0, $s1, $zero ## $a0 = 06011348 /* 01208 80B4BD48 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 0120C 80B4BD4C 3C01C120 */ lui $at, 0xC120 ## $at = C1200000 /* 01210 80B4BD50 44814000 */ mtc1 $at, $f8 ## $f8 = -10.00 -/* 01214 80B4BD54 468021A0 */ cvt.s.w $f6, $f4 -/* 01218 80B4BD58 8FA4003C */ lw $a0, 0x003C($sp) +/* 01214 80B4BD54 468021A0 */ cvt.s.w $f6, $f4 +/* 01218 80B4BD58 8FA4003C */ lw $a0, 0x003C($sp) /* 0121C 80B4BD5C 02202825 */ or $a1, $s1, $zero ## $a1 = 06011348 /* 01220 80B4BD60 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 01224 80B4BD64 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 01228 80B4BD68 AFA00014 */ sw $zero, 0x0014($sp) -/* 0122C 80B4BD6C E7A60010 */ swc1 $f6, 0x0010($sp) -/* 01230 80B4BD70 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 01234 80B4BD74 E7A80018 */ swc1 $f8, 0x0018($sp) +/* 01228 80B4BD68 AFA00014 */ sw $zero, 0x0014($sp) +/* 0122C 80B4BD6C E7A60010 */ swc1 $f6, 0x0010($sp) +/* 01230 80B4BD70 0C029468 */ jal SkelAnime_ChangeAnim + +/* 01234 80B4BD74 E7A80018 */ swc1 $f8, 0x0018($sp) .L80B4BD78: /* 01238 80B4BD78 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 .L80B4BD7C: -/* 0123C 80B4BD7C 0C2D2E1D */ jal func_80B4B874 -/* 01240 80B4BD80 8FA500BC */ lw $a1, 0x00BC($sp) -/* 01244 80B4BD84 8FA900BC */ lw $t1, 0x00BC($sp) +/* 0123C 80B4BD7C 0C2D2E1D */ jal func_80B4B874 +/* 01240 80B4BD80 8FA500BC */ lw $a1, 0x00BC($sp) +/* 01244 80B4BD84 8FA900BC */ lw $t1, 0x00BC($sp) /* 01248 80B4BD88 8D311D8C */ lw $s1, 0x1D8C($t1) ## 00001D8C -/* 0124C 80B4BD8C 12200062 */ beq $s1, $zero, .L80B4BF18 +/* 0124C 80B4BD8C 12200062 */ beq $s1, $zero, .L80B4BF18 /* 01250 80B4BD90 02202025 */ or $a0, $s1, $zero ## $a0 = 06011348 -/* 01254 80B4BD94 0C2D2DFD */ jal func_80B4B7F4 +/* 01254 80B4BD94 0C2D2DFD */ jal func_80B4B7F4 /* 01258 80B4BD98 27A50070 */ addiu $a1, $sp, 0x0070 ## $a1 = FFFFFFB8 /* 0125C 80B4BD9C 02202025 */ or $a0, $s1, $zero ## $a0 = 06011348 -/* 01260 80B4BDA0 0C2D2E0D */ jal func_80B4B834 +/* 01260 80B4BDA0 0C2D2E0D */ jal func_80B4B834 /* 01264 80B4BDA4 27A50064 */ addiu $a1, $sp, 0x0064 ## $a1 = FFFFFFAC /* 01268 80B4BDA8 860201E6 */ lh $v0, 0x01E6($s0) ## 000001E6 /* 0126C 80B4BDAC 27AA0070 */ addiu $t2, $sp, 0x0070 ## $t2 = FFFFFFB8 -/* 01270 80B4BDB0 54400016 */ bnel $v0, $zero, .L80B4BE0C +/* 01270 80B4BDB0 54400016 */ bnel $v0, $zero, .L80B4BE0C /* 01274 80B4BDB4 96230000 */ lhu $v1, 0x0000($s1) ## 06011348 /* 01278 80B4BDB8 8D4C0000 */ lw $t4, 0x0000($t2) ## FFFFFFB8 /* 0127C 80B4BDBC 27A30040 */ addiu $v1, $sp, 0x0040 ## $v1 = FFFFFF88 @@ -107,30 +107,30 @@ glabel func_80B4BC78 /* 012C4 80B4BE04 AE0E002C */ sw $t6, 0x002C($s0) ## 0000002C /* 012C8 80B4BE08 96230000 */ lhu $v1, 0x0000($s1) ## 06011348 .L80B4BE0C: -/* 012CC 80B4BE0C 10620017 */ beq $v1, $v0, .L80B4BE6C -/* 012D0 80B4BE10 0003C080 */ sll $t8, $v1, 2 -/* 012D4 80B4BE14 03B82021 */ addu $a0, $sp, $t8 +/* 012CC 80B4BE0C 10620017 */ beq $v1, $v0, .L80B4BE6C +/* 012D0 80B4BE10 0003C080 */ sll $t8, $v1, 2 +/* 012D4 80B4BE14 03B82021 */ addu $a0, $sp, $t8 /* 012D8 80B4BE18 0C028800 */ jal SkelAnime_GetFrameCount - + /* 012DC 80B4BE1C 8C840090 */ lw $a0, 0x0090($a0) ## 00000090 /* 012E0 80B4BE20 44825000 */ mtc1 $v0, $f10 ## $f10 = 0.00 /* 012E4 80B4BE24 96230000 */ lhu $v1, 0x0000($s1) ## 06011348 /* 012E8 80B4BE28 3C01C120 */ lui $at, 0xC120 ## $at = C1200000 -/* 012EC 80B4BE2C 46805420 */ cvt.s.w $f16, $f10 -/* 012F0 80B4BE30 0003C880 */ sll $t9, $v1, 2 -/* 012F4 80B4BE34 03B92821 */ addu $a1, $sp, $t9 +/* 012EC 80B4BE2C 46805420 */ cvt.s.w $f16, $f10 +/* 012F0 80B4BE30 0003C880 */ sll $t9, $v1, 2 +/* 012F4 80B4BE34 03B92821 */ addu $a1, $sp, $t9 /* 012F8 80B4BE38 8CA50090 */ lw $a1, 0x0090($a1) ## 00000090 -/* 012FC 80B4BE3C 03A34821 */ addu $t1, $sp, $v1 +/* 012FC 80B4BE3C 03A34821 */ addu $t1, $sp, $v1 /* 01300 80B4BE40 44819000 */ mtc1 $at, $f18 ## $f18 = -10.00 -/* 01304 80B4BE44 E7B00010 */ swc1 $f16, 0x0010($sp) +/* 01304 80B4BE44 E7B00010 */ swc1 $f16, 0x0010($sp) /* 01308 80B4BE48 91290084 */ lbu $t1, 0x0084($t1) ## 00000084 -/* 0130C 80B4BE4C 8FA4003C */ lw $a0, 0x003C($sp) +/* 0130C 80B4BE4C 8FA4003C */ lw $a0, 0x003C($sp) /* 01310 80B4BE50 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 01314 80B4BE54 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 01318 80B4BE58 E7B20018 */ swc1 $f18, 0x0018($sp) -/* 0131C 80B4BE5C 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 01320 80B4BE60 AFA90014 */ sw $t1, 0x0014($sp) +/* 01318 80B4BE58 E7B20018 */ swc1 $f18, 0x0018($sp) +/* 0131C 80B4BE5C 0C029468 */ jal SkelAnime_ChangeAnim + +/* 01320 80B4BE60 AFA90014 */ sw $t1, 0x0014($sp) /* 01324 80B4BE64 962A0000 */ lhu $t2, 0x0000($s1) ## 06011348 /* 01328 80B4BE68 A60A01E6 */ sh $t2, 0x01E6($s0) ## 000001E6 .L80B4BE6C: @@ -141,49 +141,49 @@ glabel func_80B4BC78 /* 0133C 80B4BE7C AE0C0060 */ sw $t4, 0x0060($s0) ## 00000060 /* 01340 80B4BE80 8D6D0008 */ lw $t5, 0x0008($t3) ## FFFFFFA8 /* 01344 80B4BE84 AE0D0064 */ sw $t5, 0x0064($s0) ## 00000064 -/* 01348 80B4BE88 8FA800BC */ lw $t0, 0x00BC($sp) +/* 01348 80B4BE88 8FA800BC */ lw $t0, 0x00BC($sp) /* 0134C 80B4BE8C 96220004 */ lhu $v0, 0x0004($s1) ## 0601134C /* 01350 80B4BE90 950F1D74 */ lhu $t7, 0x1D74($t0) ## 00001D74 -/* 01354 80B4BE94 01E2082A */ slt $at, $t7, $v0 -/* 01358 80B4BE98 50200020 */ beql $at, $zero, .L80B4BF1C -/* 0135C 80B4BE9C 8FBF002C */ lw $ra, 0x002C($sp) +/* 01354 80B4BE94 01E2082A */ slt $at, $t7, $v0 +/* 01358 80B4BE98 50200020 */ beql $at, $zero, .L80B4BF1C +/* 0135C 80B4BE9C 8FBF002C */ lw $ra, 0x002C($sp) /* 01360 80B4BEA0 962E0002 */ lhu $t6, 0x0002($s1) ## 0601134A -/* 01364 80B4BEA4 C7A60064 */ lwc1 $f6, 0x0064($sp) -/* 01368 80B4BEA8 C7A80070 */ lwc1 $f8, 0x0070($sp) -/* 0136C 80B4BEAC 004EC023 */ subu $t8, $v0, $t6 +/* 01364 80B4BEA4 C7A60064 */ lwc1 $f6, 0x0064($sp) +/* 01368 80B4BEA8 C7A80070 */ lwc1 $f8, 0x0070($sp) +/* 0136C 80B4BEAC 004EC023 */ subu $t8, $v0, $t6 /* 01370 80B4BEB0 44982000 */ mtc1 $t8, $f4 ## $f4 = 0.00 -/* 01374 80B4BEB4 46083281 */ sub.s $f10, $f6, $f8 +/* 01374 80B4BEB4 46083281 */ sub.s $f10, $f6, $f8 /* 01378 80B4BEB8 C6020070 */ lwc1 $f2, 0x0070($s0) ## 00000070 -/* 0137C 80B4BEBC 46802020 */ cvt.s.w $f0, $f4 -/* 01380 80B4BEC0 46005403 */ div.s $f16, $f10, $f0 +/* 0137C 80B4BEBC 46802020 */ cvt.s.w $f0, $f4 +/* 01380 80B4BEC0 46005403 */ div.s $f16, $f10, $f0 /* 01384 80B4BEC4 E610005C */ swc1 $f16, 0x005C($s0) ## 0000005C -/* 01388 80B4BEC8 C7A40074 */ lwc1 $f4, 0x0074($sp) -/* 0138C 80B4BECC C7B20068 */ lwc1 $f18, 0x0068($sp) +/* 01388 80B4BEC8 C7A40074 */ lwc1 $f4, 0x0074($sp) +/* 0138C 80B4BECC C7B20068 */ lwc1 $f18, 0x0068($sp) /* 01390 80B4BED0 C610006C */ lwc1 $f16, 0x006C($s0) ## 0000006C -/* 01394 80B4BED4 46049181 */ sub.s $f6, $f18, $f4 -/* 01398 80B4BED8 46003203 */ div.s $f8, $f6, $f0 +/* 01394 80B4BED4 46049181 */ sub.s $f6, $f18, $f4 +/* 01398 80B4BED8 46003203 */ div.s $f8, $f6, $f0 /* 0139C 80B4BEDC E6080060 */ swc1 $f8, 0x0060($s0) ## 00000060 /* 013A0 80B4BEE0 C60A0060 */ lwc1 $f10, 0x0060($s0) ## 00000060 -/* 013A4 80B4BEE4 46105480 */ add.s $f18, $f10, $f16 +/* 013A4 80B4BEE4 46105480 */ add.s $f18, $f10, $f16 /* 013A8 80B4BEE8 E6120060 */ swc1 $f18, 0x0060($s0) ## 00000060 /* 013AC 80B4BEEC C6040060 */ lwc1 $f4, 0x0060($s0) ## 00000060 -/* 013B0 80B4BEF0 4602203C */ c.lt.s $f4, $f2 +/* 013B0 80B4BEF0 4602203C */ c.lt.s $f4, $f2 /* 013B4 80B4BEF4 00000000 */ nop -/* 013B8 80B4BEF8 45020003 */ bc1fl .L80B4BF08 -/* 013BC 80B4BEFC C7A6006C */ lwc1 $f6, 0x006C($sp) +/* 013B8 80B4BEF8 45020003 */ bc1fl .L80B4BF08 +/* 013BC 80B4BEFC C7A6006C */ lwc1 $f6, 0x006C($sp) /* 013C0 80B4BF00 E6020060 */ swc1 $f2, 0x0060($s0) ## 00000060 -/* 013C4 80B4BF04 C7A6006C */ lwc1 $f6, 0x006C($sp) +/* 013C4 80B4BF04 C7A6006C */ lwc1 $f6, 0x006C($sp) .L80B4BF08: -/* 013C8 80B4BF08 C7A80078 */ lwc1 $f8, 0x0078($sp) -/* 013CC 80B4BF0C 46083281 */ sub.s $f10, $f6, $f8 -/* 013D0 80B4BF10 46005403 */ div.s $f16, $f10, $f0 +/* 013C8 80B4BF08 C7A80078 */ lwc1 $f8, 0x0078($sp) +/* 013CC 80B4BF0C 46083281 */ sub.s $f10, $f6, $f8 +/* 013D0 80B4BF10 46005403 */ div.s $f16, $f10, $f0 /* 013D4 80B4BF14 E6100064 */ swc1 $f16, 0x0064($s0) ## 00000064 .L80B4BF18: -/* 013D8 80B4BF18 8FBF002C */ lw $ra, 0x002C($sp) +/* 013D8 80B4BF18 8FBF002C */ lw $ra, 0x002C($sp) .L80B4BF1C: -/* 013DC 80B4BF1C 8FB00024 */ lw $s0, 0x0024($sp) -/* 013E0 80B4BF20 8FB10028 */ lw $s1, 0x0028($sp) -/* 013E4 80B4BF24 03E00008 */ jr $ra +/* 013DC 80B4BF1C 8FB00024 */ lw $s0, 0x0024($sp) +/* 013E0 80B4BF20 8FB10028 */ lw $s1, 0x0028($sp) +/* 013E4 80B4BF24 03E00008 */ jr $ra /* 013E8 80B4BF28 27BD00B8 */ addiu $sp, $sp, 0x00B8 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/EnZl2_Destroy.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/EnZl2_Destroy.s index e9dcb06a4e..6a7dbc1057 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/EnZl2_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl2/EnZl2_Destroy.s @@ -1,11 +1,11 @@ glabel EnZl2_Destroy /* 00000 80B4E990 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00004 80B4E994 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00008 80B4E998 0C0295BC */ jal func_800A56F0 +/* 00004 80B4E994 AFBF0014 */ sw $ra, 0x0014($sp) +/* 00008 80B4E998 0C0295BC */ jal SkelAnime_Free /* 0000C 80B4E99C 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C -/* 00010 80B4E9A0 8FBF0014 */ lw $ra, 0x0014($sp) +/* 00010 80B4E9A0 8FBF0014 */ lw $ra, 0x0014($sp) /* 00014 80B4E9A4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00018 80B4E9A8 03E00008 */ jr $ra +/* 00018 80B4E9A8 03E00008 */ jr $ra /* 0001C 80B4E9AC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/EnZl2_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/EnZl2_Init.s index facabb93cb..170663d066 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/EnZl2_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl2/EnZl2_Init.s @@ -1,49 +1,49 @@ glabel EnZl2_Init /* 03910 80B522A0 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 -/* 03914 80B522A4 AFA40040 */ sw $a0, 0x0040($sp) -/* 03918 80B522A8 AFBF0024 */ sw $ra, 0x0024($sp) -/* 0391C 80B522AC AFA50044 */ sw $a1, 0x0044($sp) +/* 03914 80B522A4 AFA40040 */ sw $a0, 0x0040($sp) +/* 03918 80B522A8 AFBF0024 */ sw $ra, 0x0024($sp) +/* 0391C 80B522AC AFA50044 */ sw $a1, 0x0044($sp) /* 03920 80B522B0 248400B4 */ addiu $a0, $a0, 0x00B4 ## $a0 = 000000B4 /* 03924 80B522B4 3C068003 */ lui $a2, 0x8003 ## $a2 = 80030000 /* 03928 80B522B8 24C6B5EC */ addiu $a2, $a2, 0xB5EC ## $a2 = 8002B5EC -/* 0392C 80B522BC AFA4002C */ sw $a0, 0x002C($sp) +/* 0392C 80B522BC AFA4002C */ sw $a0, 0x002C($sp) /* 03930 80B522C0 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 /* 03934 80B522C4 0C00AC78 */ jal ActorShape_Init - + /* 03938 80B522C8 3C0741F0 */ lui $a3, 0x41F0 ## $a3 = 41F00000 -/* 0393C 80B522CC 8FAE002C */ lw $t6, 0x002C($sp) +/* 0393C 80B522CC 8FAE002C */ lw $t6, 0x002C($sp) /* 03940 80B522D0 3C060601 */ lui $a2, 0x0601 ## $a2 = 06010000 /* 03944 80B522D4 24C60D70 */ addiu $a2, $a2, 0x0D70 ## $a2 = 06010D70 /* 03948 80B522D8 A1C00014 */ sb $zero, 0x0014($t6) ## 00000014 -/* 0394C 80B522DC 8FA50040 */ lw $a1, 0x0040($sp) -/* 03950 80B522E0 AFA00018 */ sw $zero, 0x0018($sp) -/* 03954 80B522E4 AFA00014 */ sw $zero, 0x0014($sp) -/* 03958 80B522E8 AFA00010 */ sw $zero, 0x0010($sp) -/* 0395C 80B522EC 8FA40044 */ lw $a0, 0x0044($sp) +/* 0394C 80B522DC 8FA50040 */ lw $a1, 0x0040($sp) +/* 03950 80B522E0 AFA00018 */ sw $zero, 0x0018($sp) +/* 03954 80B522E4 AFA00014 */ sw $zero, 0x0014($sp) +/* 03958 80B522E8 AFA00010 */ sw $zero, 0x0010($sp) +/* 0395C 80B522EC 8FA40044 */ lw $a0, 0x0044($sp) /* 03960 80B522F0 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 03964 80B522F4 0C0291BE */ jal func_800A46F8 +/* 03964 80B522F4 0C0291BE */ jal SkelAnime_InitSV /* 03968 80B522F8 24A5014C */ addiu $a1, $a1, 0x014C ## $a1 = 0000014C -/* 0396C 80B522FC 8FAF0040 */ lw $t7, 0x0040($sp) +/* 0396C 80B522FC 8FAF0040 */ lw $t7, 0x0040($sp) /* 03970 80B52300 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 /* 03974 80B52304 85E2001C */ lh $v0, 0x001C($t7) ## 0000001C -/* 03978 80B52308 10410005 */ beq $v0, $at, .L80B52320 +/* 03978 80B52308 10410005 */ beq $v0, $at, .L80B52320 /* 0397C 80B5230C 24010004 */ addiu $at, $zero, 0x0004 ## $at = 00000004 -/* 03980 80B52310 10410007 */ beq $v0, $at, .L80B52330 +/* 03980 80B52310 10410007 */ beq $v0, $at, .L80B52330 /* 03984 80B52314 00000000 */ nop -/* 03988 80B52318 10000008 */ beq $zero, $zero, .L80B5233C -/* 0398C 80B5231C 8FBF0024 */ lw $ra, 0x0024($sp) +/* 03988 80B52318 10000008 */ beq $zero, $zero, .L80B5233C +/* 0398C 80B5231C 8FBF0024 */ lw $ra, 0x0024($sp) .L80B52320: -/* 03990 80B52320 0C03DC98 */ jal func_800F7260 +/* 03990 80B52320 0C03DC98 */ jal func_800F7260 /* 03994 80B52324 2404006F */ addiu $a0, $zero, 0x006F ## $a0 = 0000006F -/* 03998 80B52328 10000004 */ beq $zero, $zero, .L80B5233C -/* 0399C 80B5232C 8FBF0024 */ lw $ra, 0x0024($sp) +/* 03998 80B52328 10000004 */ beq $zero, $zero, .L80B5233C +/* 0399C 80B5232C 8FBF0024 */ lw $ra, 0x0024($sp) .L80B52330: /* 039A0 80B52330 3C018016 */ lui $at, 0x8016 ## $at = 80160000 /* 039A4 80B52334 A420FA32 */ sh $zero, -0x05CE($at) ## 8015FA32 -/* 039A8 80B52338 8FBF0024 */ lw $ra, 0x0024($sp) +/* 039A8 80B52338 8FBF0024 */ lw $ra, 0x0024($sp) .L80B5233C: /* 039AC 80B5233C 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 -/* 039B0 80B52340 03E00008 */ jr $ra +/* 039B0 80B52340 03E00008 */ jr $ra /* 039B4 80B52344 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B4F45C.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B4F45C.s index 5263100779..2d46c24417 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B4F45C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B4F45C.s @@ -1,72 +1,72 @@ glabel func_80B4F45C /* 00ACC 80B4F45C 27BDFF80 */ addiu $sp, $sp, 0xFF80 ## $sp = FFFFFF80 /* 00AD0 80B4F460 2401000E */ addiu $at, $zero, 0x000E ## $at = 0000000E -/* 00AD4 80B4F464 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00AD8 80B4F468 AFA40080 */ sw $a0, 0x0080($sp) -/* 00ADC 80B4F46C AFA60088 */ sw $a2, 0x0088($sp) -/* 00AE0 80B4F470 14A101BB */ bne $a1, $at, .L80B4FB60 -/* 00AE4 80B4F474 AFA7008C */ sw $a3, 0x008C($sp) +/* 00AD4 80B4F464 AFBF0014 */ sw $ra, 0x0014($sp) +/* 00AD8 80B4F468 AFA40080 */ sw $a0, 0x0080($sp) +/* 00ADC 80B4F46C AFA60088 */ sw $a2, 0x0088($sp) +/* 00AE0 80B4F470 14A101BB */ bne $a1, $at, .L80B4FB60 +/* 00AE4 80B4F474 AFA7008C */ sw $a3, 0x008C($sp) /* 00AE8 80B4F478 8C840000 */ lw $a0, 0x0000($a0) ## 00000000 /* 00AEC 80B4F47C 0C031A73 */ jal Graph_Alloc - + /* 00AF0 80B4F480 240501C0 */ addiu $a1, $zero, 0x01C0 ## $a1 = 000001C0 -/* 00AF4 80B4F484 8FA50098 */ lw $a1, 0x0098($sp) -/* 00AF8 80B4F488 AFA20074 */ sw $v0, 0x0074($sp) +/* 00AF4 80B4F484 8FA50098 */ lw $a1, 0x0098($sp) +/* 00AF8 80B4F488 AFA20074 */ sw $v0, 0x0074($sp) /* 00AFC 80B4F48C 3C18DB06 */ lui $t8, 0xDB06 ## $t8 = DB060000 /* 00B00 80B4F490 8CA40000 */ lw $a0, 0x0000($a1) ## 00000000 /* 00B04 80B4F494 37180030 */ ori $t8, $t8, 0x0030 ## $t8 = DB060030 /* 00B08 80B4F498 248F0008 */ addiu $t7, $a0, 0x0008 ## $t7 = 00000008 /* 00B0C 80B4F49C ACAF0000 */ sw $t7, 0x0000($a1) ## 00000000 /* 00B10 80B4F4A0 AC820004 */ sw $v0, 0x0004($a0) ## 00000004 -/* 00B14 80B4F4A4 0C034213 */ jal Matrix_Push +/* 00B14 80B4F4A4 0C034213 */ jal Matrix_Push /* 00B18 80B4F4A8 AC980000 */ sw $t8, 0x0000($a0) ## 00000000 -/* 00B1C 80B4F4AC 8FA8008C */ lw $t0, 0x008C($sp) +/* 00B1C 80B4F4AC 8FA8008C */ lw $t0, 0x008C($sp) /* 00B20 80B4F4B0 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 /* 00B24 80B4F4B4 C50C0000 */ lwc1 $f12, 0x0000($t0) ## 00000000 /* 00B28 80B4F4B8 C50E0004 */ lwc1 $f14, 0x0004($t0) ## 00000004 -/* 00B2C 80B4F4BC 0C034261 */ jal Matrix_Translate +/* 00B2C 80B4F4BC 0C034261 */ jal Matrix_Translate /* 00B30 80B4F4C0 8D060008 */ lw $a2, 0x0008($t0) ## 00000008 -/* 00B34 80B4F4C4 8FA20090 */ lw $v0, 0x0090($sp) +/* 00B34 80B4F4C4 8FA20090 */ lw $v0, 0x0090($sp) /* 00B38 80B4F4C8 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 /* 00B3C 80B4F4CC 84440000 */ lh $a0, 0x0000($v0) ## 00000000 /* 00B40 80B4F4D0 84450002 */ lh $a1, 0x0002($v0) ## 00000002 -/* 00B44 80B4F4D4 0C034421 */ jal Matrix_RotateXYZ +/* 00B44 80B4F4D4 0C034421 */ jal Matrix_RotateZYX /* 00B48 80B4F4D8 84460004 */ lh $a2, 0x0004($v0) ## 00000004 -/* 00B4C 80B4F4DC 0C034213 */ jal Matrix_Push +/* 00B4C 80B4F4DC 0C034213 */ jal Matrix_Push /* 00B50 80B4F4E0 00000000 */ nop /* 00B54 80B4F4E4 3C0143B5 */ lui $at, 0x43B5 ## $at = 43B50000 /* 00B58 80B4F4E8 44816000 */ mtc1 $at, $f12 ## $f12 = 362.00 /* 00B5C 80B4F4EC 3C01C305 */ lui $at, 0xC305 ## $at = C3050000 /* 00B60 80B4F4F0 44817000 */ mtc1 $at, $f14 ## $f14 = -133.00 /* 00B64 80B4F4F4 24060000 */ addiu $a2, $zero, 0x0000 ## $a2 = 00000000 -/* 00B68 80B4F4F8 0C034261 */ jal Matrix_Translate +/* 00B68 80B4F4F8 0C034261 */ jal Matrix_Translate /* 00B6C 80B4F4FC 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 00B70 80B4F500 0C034236 */ jal Matrix_Get +/* 00B70 80B4F500 0C034236 */ jal Matrix_Get /* 00B74 80B4F504 27A40034 */ addiu $a0, $sp, 0x0034 ## $a0 = FFFFFFB4 /* 00B78 80B4F508 27A40034 */ addiu $a0, $sp, 0x0034 ## $a0 = FFFFFFB4 /* 00B7C 80B4F50C 27A5002C */ addiu $a1, $sp, 0x002C ## $a1 = FFFFFFAC -/* 00B80 80B4F510 0C034833 */ jal func_800D20CC +/* 00B80 80B4F510 0C034833 */ jal func_800D20CC /* 00B84 80B4F514 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 00B88 80B4F518 0C03034A */ jal func_800C0D28 -/* 00B8C 80B4F51C 8FA40080 */ lw $a0, 0x0080($sp) -/* 00B90 80B4F520 1440000D */ bne $v0, $zero, .L80B4F558 +/* 00B88 80B4F518 0C03034A */ jal func_800C0D28 +/* 00B8C 80B4F51C 8FA40080 */ lw $a0, 0x0080($sp) +/* 00B90 80B4F520 1440000D */ bne $v0, $zero, .L80B4F558 /* 00B94 80B4F524 00000000 */ nop -/* 00B98 80B4F528 8FA40094 */ lw $a0, 0x0094($sp) -/* 00B9C 80B4F52C 87A5002E */ lh $a1, 0x002E($sp) -/* 00BA0 80B4F530 0C2D3B8E */ jal func_80B4EE38 +/* 00B98 80B4F528 8FA40094 */ lw $a0, 0x0094($sp) +/* 00B9C 80B4F52C 87A5002E */ lh $a1, 0x002E($sp) +/* 00BA0 80B4F530 0C2D3B8E */ jal func_80B4EE38 /* 00BA4 80B4F534 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 00BA8 80B4F538 8FA40094 */ lw $a0, 0x0094($sp) -/* 00BAC 80B4F53C 87A5002C */ lh $a1, 0x002C($sp) -/* 00BB0 80B4F540 0C2D3C8C */ jal func_80B4F230 +/* 00BA8 80B4F538 8FA40094 */ lw $a0, 0x0094($sp) +/* 00BAC 80B4F53C 87A5002C */ lh $a1, 0x002C($sp) +/* 00BB0 80B4F540 0C2D3C8C */ jal func_80B4F230 /* 00BB4 80B4F544 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 -/* 00BB8 80B4F548 8FA40094 */ lw $a0, 0x0094($sp) -/* 00BBC 80B4F54C 87A50030 */ lh $a1, 0x0030($sp) -/* 00BC0 80B4F550 0C2D3BD9 */ jal func_80B4EF64 +/* 00BB8 80B4F548 8FA40094 */ lw $a0, 0x0094($sp) +/* 00BBC 80B4F54C 87A50030 */ lh $a1, 0x0030($sp) +/* 00BC0 80B4F550 0C2D3BD9 */ jal func_80B4EF64 /* 00BC4 80B4F554 24060002 */ addiu $a2, $zero, 0x0002 ## $a2 = 00000002 .L80B4F558: /* 00BC8 80B4F558 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 /* 00BCC 80B4F55C 8C42FA90 */ lw $v0, -0x0570($v0) ## 8015FA90 -/* 00BD0 80B4F560 8FA30094 */ lw $v1, 0x0094($sp) +/* 00BD0 80B4F560 8FA30094 */ lw $v1, 0x0094($sp) /* 00BD4 80B4F564 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 /* 00BD8 80B4F568 84591492 */ lh $t9, 0x1492($v0) ## 80161492 /* 00BDC 80B4F56C 844A1494 */ lh $t2, 0x1494($v0) ## 80161494 @@ -74,51 +74,51 @@ glabel func_80B4F45C /* 00BE4 80B4F574 846D01E0 */ lh $t5, 0x01E0($v1) ## 000001E0 /* 00BE8 80B4F578 846B01DE */ lh $t3, 0x01DE($v1) ## 000001DE /* 00BEC 80B4F57C 846901DC */ lh $t1, 0x01DC($v1) ## 000001DC -/* 00BF0 80B4F580 018D3021 */ addu $a2, $t4, $t5 -/* 00BF4 80B4F584 014B2821 */ addu $a1, $t2, $t3 -/* 00BF8 80B4F588 03292021 */ addu $a0, $t9, $t1 -/* 00BFC 80B4F58C 00042400 */ sll $a0, $a0, 16 -/* 00C00 80B4F590 00052C00 */ sll $a1, $a1, 16 -/* 00C04 80B4F594 00063400 */ sll $a2, $a2, 16 +/* 00BF0 80B4F580 018D3021 */ addu $a2, $t4, $t5 +/* 00BF4 80B4F584 014B2821 */ addu $a1, $t2, $t3 +/* 00BF8 80B4F588 03292021 */ addu $a0, $t9, $t1 +/* 00BFC 80B4F58C 00042400 */ sll $a0, $a0, 16 +/* 00C00 80B4F590 00052C00 */ sll $a1, $a1, 16 +/* 00C04 80B4F594 00063400 */ sll $a2, $a2, 16 /* 00C08 80B4F598 246301DC */ addiu $v1, $v1, 0x01DC ## $v1 = 000001DC -/* 00C0C 80B4F59C AFA3001C */ sw $v1, 0x001C($sp) -/* 00C10 80B4F5A0 00063403 */ sra $a2, $a2, 16 -/* 00C14 80B4F5A4 00052C03 */ sra $a1, $a1, 16 -/* 00C18 80B4F5A8 0C034421 */ jal Matrix_RotateXYZ -/* 00C1C 80B4F5AC 00042403 */ sra $a0, $a0, 16 +/* 00C0C 80B4F59C AFA3001C */ sw $v1, 0x001C($sp) +/* 00C10 80B4F5A0 00063403 */ sra $a2, $a2, 16 +/* 00C14 80B4F5A4 00052C03 */ sra $a1, $a1, 16 +/* 00C18 80B4F5A8 0C034421 */ jal Matrix_RotateZYX +/* 00C1C 80B4F5AC 00042403 */ sra $a0, $a0, 16 /* 00C20 80B4F5B0 3C01C33C */ lui $at, 0xC33C ## $at = C33C0000 /* 00C24 80B4F5B4 44816000 */ mtc1 $at, $f12 ## $f12 = -188.00 /* 00C28 80B4F5B8 3C01C338 */ lui $at, 0xC338 ## $at = C3380000 /* 00C2C 80B4F5BC 44817000 */ mtc1 $at, $f14 ## $f14 = -184.00 /* 00C30 80B4F5C0 24060000 */ addiu $a2, $zero, 0x0000 ## $a2 = 00000000 -/* 00C34 80B4F5C4 0C034261 */ jal Matrix_Translate +/* 00C34 80B4F5C4 0C034261 */ jal Matrix_Translate /* 00C38 80B4F5C8 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 /* 00C3C 80B4F5CC 3C0580B5 */ lui $a1, %hi(D_80B52900) ## $a1 = 80B50000 /* 00C40 80B4F5D0 24A52900 */ addiu $a1, $a1, %lo(D_80B52900) ## $a1 = 80B52900 -/* 00C44 80B4F5D4 8FA40074 */ lw $a0, 0x0074($sp) -/* 00C48 80B4F5D8 0C034695 */ jal Matrix_ToMtx +/* 00C44 80B4F5D4 8FA40074 */ lw $a0, 0x0074($sp) +/* 00C48 80B4F5D8 0C034695 */ jal Matrix_ToMtx /* 00C4C 80B4F5DC 24060420 */ addiu $a2, $zero, 0x0420 ## $a2 = 00000420 -/* 00C50 80B4F5E0 0C034236 */ jal Matrix_Get +/* 00C50 80B4F5E0 0C034236 */ jal Matrix_Get /* 00C54 80B4F5E4 27A40034 */ addiu $a0, $sp, 0x0034 ## $a0 = FFFFFFB4 /* 00C58 80B4F5E8 27A40034 */ addiu $a0, $sp, 0x0034 ## $a0 = FFFFFFB4 /* 00C5C 80B4F5EC 27A5002C */ addiu $a1, $sp, 0x002C ## $a1 = FFFFFFAC -/* 00C60 80B4F5F0 0C034833 */ jal func_800D20CC +/* 00C60 80B4F5F0 0C034833 */ jal func_800D20CC /* 00C64 80B4F5F4 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 00C68 80B4F5F8 0C03034A */ jal func_800C0D28 -/* 00C6C 80B4F5FC 8FA40080 */ lw $a0, 0x0080($sp) -/* 00C70 80B4F600 14400009 */ bne $v0, $zero, .L80B4F628 +/* 00C68 80B4F5F8 0C03034A */ jal func_800C0D28 +/* 00C6C 80B4F5FC 8FA40080 */ lw $a0, 0x0080($sp) +/* 00C70 80B4F600 14400009 */ bne $v0, $zero, .L80B4F628 /* 00C74 80B4F604 00000000 */ nop -/* 00C78 80B4F608 8FA40094 */ lw $a0, 0x0094($sp) -/* 00C7C 80B4F60C 87A5002E */ lh $a1, 0x002E($sp) -/* 00C80 80B4F610 0C2D3B8E */ jal func_80B4EE38 +/* 00C78 80B4F608 8FA40094 */ lw $a0, 0x0094($sp) +/* 00C7C 80B4F60C 87A5002E */ lh $a1, 0x002E($sp) +/* 00C80 80B4F610 0C2D3B8E */ jal func_80B4EE38 /* 00C84 80B4F614 24060003 */ addiu $a2, $zero, 0x0003 ## $a2 = 00000003 -/* 00C88 80B4F618 8FA40094 */ lw $a0, 0x0094($sp) -/* 00C8C 80B4F61C 87A5002C */ lh $a1, 0x002C($sp) -/* 00C90 80B4F620 0C2D3C8C */ jal func_80B4F230 +/* 00C88 80B4F618 8FA40094 */ lw $a0, 0x0094($sp) +/* 00C8C 80B4F61C 87A5002C */ lh $a1, 0x002C($sp) +/* 00C90 80B4F620 0C2D3C8C */ jal func_80B4F230 /* 00C94 80B4F624 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 .L80B4F628: /* 00C98 80B4F628 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 00C9C 80B4F62C 8FA3001C */ lw $v1, 0x001C($sp) +/* 00C9C 80B4F62C 8FA3001C */ lw $v1, 0x001C($sp) /* 00CA0 80B4F630 8C42FA90 */ lw $v0, -0x0570($v0) ## 8015FA90 /* 00CA4 80B4F634 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 /* 00CA8 80B4F638 846F0006 */ lh $t7, 0x0006($v1) ## 00000006 @@ -127,50 +127,50 @@ glabel func_80B4F45C /* 00CB4 80B4F644 844E1498 */ lh $t6, 0x1498($v0) ## 80161498 /* 00CB8 80B4F648 8458149A */ lh $t8, 0x149A($v0) ## 8016149A /* 00CBC 80B4F64C 8449149C */ lh $t1, 0x149C($v0) ## 8016149C -/* 00CC0 80B4F650 01CF2021 */ addu $a0, $t6, $t7 -/* 00CC4 80B4F654 03192821 */ addu $a1, $t8, $t9 -/* 00CC8 80B4F658 012A3021 */ addu $a2, $t1, $t2 -/* 00CCC 80B4F65C 00063400 */ sll $a2, $a2, 16 -/* 00CD0 80B4F660 00052C00 */ sll $a1, $a1, 16 -/* 00CD4 80B4F664 00042400 */ sll $a0, $a0, 16 -/* 00CD8 80B4F668 00042403 */ sra $a0, $a0, 16 -/* 00CDC 80B4F66C 00052C03 */ sra $a1, $a1, 16 -/* 00CE0 80B4F670 0C034421 */ jal Matrix_RotateXYZ -/* 00CE4 80B4F674 00063403 */ sra $a2, $a2, 16 +/* 00CC0 80B4F650 01CF2021 */ addu $a0, $t6, $t7 +/* 00CC4 80B4F654 03192821 */ addu $a1, $t8, $t9 +/* 00CC8 80B4F658 012A3021 */ addu $a2, $t1, $t2 +/* 00CCC 80B4F65C 00063400 */ sll $a2, $a2, 16 +/* 00CD0 80B4F660 00052C00 */ sll $a1, $a1, 16 +/* 00CD4 80B4F664 00042400 */ sll $a0, $a0, 16 +/* 00CD8 80B4F668 00042403 */ sra $a0, $a0, 16 +/* 00CDC 80B4F66C 00052C03 */ sra $a1, $a1, 16 +/* 00CE0 80B4F670 0C034421 */ jal Matrix_RotateZYX +/* 00CE4 80B4F674 00063403 */ sra $a2, $a2, 16 /* 00CE8 80B4F678 3C01C3CD */ lui $at, 0xC3CD ## $at = C3CD0000 /* 00CEC 80B4F67C 44816000 */ mtc1 $at, $f12 ## $f12 = -410.00 /* 00CF0 80B4F680 3C01C338 */ lui $at, 0xC338 ## $at = C3380000 /* 00CF4 80B4F684 44817000 */ mtc1 $at, $f14 ## $f14 = -184.00 /* 00CF8 80B4F688 24060000 */ addiu $a2, $zero, 0x0000 ## $a2 = 00000000 -/* 00CFC 80B4F68C 0C034261 */ jal Matrix_Translate +/* 00CFC 80B4F68C 0C034261 */ jal Matrix_Translate /* 00D00 80B4F690 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 00D04 80B4F694 8FA40074 */ lw $a0, 0x0074($sp) +/* 00D04 80B4F694 8FA40074 */ lw $a0, 0x0074($sp) /* 00D08 80B4F698 3C0580B5 */ lui $a1, %hi(D_80B52910) ## $a1 = 80B50000 /* 00D0C 80B4F69C 24A52910 */ addiu $a1, $a1, %lo(D_80B52910) ## $a1 = 80B52910 /* 00D10 80B4F6A0 2406044C */ addiu $a2, $zero, 0x044C ## $a2 = 0000044C -/* 00D14 80B4F6A4 0C034695 */ jal Matrix_ToMtx +/* 00D14 80B4F6A4 0C034695 */ jal Matrix_ToMtx /* 00D18 80B4F6A8 24840040 */ addiu $a0, $a0, 0x0040 ## $a0 = 00000040 -/* 00D1C 80B4F6AC 0C034236 */ jal Matrix_Get +/* 00D1C 80B4F6AC 0C034236 */ jal Matrix_Get /* 00D20 80B4F6B0 27A40034 */ addiu $a0, $sp, 0x0034 ## $a0 = FFFFFFB4 /* 00D24 80B4F6B4 27A40034 */ addiu $a0, $sp, 0x0034 ## $a0 = FFFFFFB4 /* 00D28 80B4F6B8 27A5002C */ addiu $a1, $sp, 0x002C ## $a1 = FFFFFFAC -/* 00D2C 80B4F6BC 0C034833 */ jal func_800D20CC +/* 00D2C 80B4F6BC 0C034833 */ jal func_800D20CC /* 00D30 80B4F6C0 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 00D34 80B4F6C4 0C03034A */ jal func_800C0D28 -/* 00D38 80B4F6C8 8FA40080 */ lw $a0, 0x0080($sp) -/* 00D3C 80B4F6CC 14400009 */ bne $v0, $zero, .L80B4F6F4 +/* 00D34 80B4F6C4 0C03034A */ jal func_800C0D28 +/* 00D38 80B4F6C8 8FA40080 */ lw $a0, 0x0080($sp) +/* 00D3C 80B4F6CC 14400009 */ bne $v0, $zero, .L80B4F6F4 /* 00D40 80B4F6D0 00000000 */ nop -/* 00D44 80B4F6D4 8FA40094 */ lw $a0, 0x0094($sp) -/* 00D48 80B4F6D8 87A5002E */ lh $a1, 0x002E($sp) -/* 00D4C 80B4F6DC 0C2D3B8E */ jal func_80B4EE38 +/* 00D44 80B4F6D4 8FA40094 */ lw $a0, 0x0094($sp) +/* 00D48 80B4F6D8 87A5002E */ lh $a1, 0x002E($sp) +/* 00D4C 80B4F6DC 0C2D3B8E */ jal func_80B4EE38 /* 00D50 80B4F6E0 24060006 */ addiu $a2, $zero, 0x0006 ## $a2 = 00000006 -/* 00D54 80B4F6E4 8FA40094 */ lw $a0, 0x0094($sp) -/* 00D58 80B4F6E8 87A5002C */ lh $a1, 0x002C($sp) -/* 00D5C 80B4F6EC 0C2D3C8C */ jal func_80B4F230 +/* 00D54 80B4F6E4 8FA40094 */ lw $a0, 0x0094($sp) +/* 00D58 80B4F6E8 87A5002C */ lh $a1, 0x002C($sp) +/* 00D5C 80B4F6EC 0C2D3C8C */ jal func_80B4F230 /* 00D60 80B4F6F0 24060007 */ addiu $a2, $zero, 0x0007 ## $a2 = 00000007 .L80B4F6F4: /* 00D64 80B4F6F4 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 00D68 80B4F6F8 8FA3001C */ lw $v1, 0x001C($sp) +/* 00D68 80B4F6F8 8FA3001C */ lw $v1, 0x001C($sp) /* 00D6C 80B4F6FC 8C42FA90 */ lw $v0, -0x0570($v0) ## 8015FA90 /* 00D70 80B4F700 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 /* 00D74 80B4F704 846C000C */ lh $t4, 0x000C($v1) ## 0000000C @@ -179,66 +179,66 @@ glabel func_80B4F45C /* 00D80 80B4F710 844B149E */ lh $t3, 0x149E($v0) ## 8016149E /* 00D84 80B4F714 844D14A0 */ lh $t5, 0x14A0($v0) ## 801614A0 /* 00D88 80B4F718 844F14A2 */ lh $t7, 0x14A2($v0) ## 801614A2 -/* 00D8C 80B4F71C 016C2021 */ addu $a0, $t3, $t4 -/* 00D90 80B4F720 01AE2821 */ addu $a1, $t5, $t6 -/* 00D94 80B4F724 01F83021 */ addu $a2, $t7, $t8 -/* 00D98 80B4F728 00063400 */ sll $a2, $a2, 16 -/* 00D9C 80B4F72C 00052C00 */ sll $a1, $a1, 16 -/* 00DA0 80B4F730 00042400 */ sll $a0, $a0, 16 -/* 00DA4 80B4F734 00042403 */ sra $a0, $a0, 16 -/* 00DA8 80B4F738 00052C03 */ sra $a1, $a1, 16 -/* 00DAC 80B4F73C 0C034421 */ jal Matrix_RotateXYZ -/* 00DB0 80B4F740 00063403 */ sra $a2, $a2, 16 +/* 00D8C 80B4F71C 016C2021 */ addu $a0, $t3, $t4 +/* 00D90 80B4F720 01AE2821 */ addu $a1, $t5, $t6 +/* 00D94 80B4F724 01F83021 */ addu $a2, $t7, $t8 +/* 00D98 80B4F728 00063400 */ sll $a2, $a2, 16 +/* 00D9C 80B4F72C 00052C00 */ sll $a1, $a1, 16 +/* 00DA0 80B4F730 00042400 */ sll $a0, $a0, 16 +/* 00DA4 80B4F734 00042403 */ sra $a0, $a0, 16 +/* 00DA8 80B4F738 00052C03 */ sra $a1, $a1, 16 +/* 00DAC 80B4F73C 0C034421 */ jal Matrix_RotateZYX +/* 00DB0 80B4F740 00063403 */ sra $a2, $a2, 16 /* 00DB4 80B4F744 3C0180B5 */ lui $at, %hi(D_80B52BB4) ## $at = 80B50000 -/* 00DB8 80B4F748 C42C2BB4 */ lwc1 $f12, %lo(D_80B52BB4)($at) +/* 00DB8 80B4F748 C42C2BB4 */ lwc1 $f12, %lo(D_80B52BB4)($at) /* 00DBC 80B4F74C 3C01C1D0 */ lui $at, 0xC1D0 ## $at = C1D00000 /* 00DC0 80B4F750 44817000 */ mtc1 $at, $f14 ## $f14 = -26.00 /* 00DC4 80B4F754 24060000 */ addiu $a2, $zero, 0x0000 ## $a2 = 00000000 -/* 00DC8 80B4F758 0C034261 */ jal Matrix_Translate +/* 00DC8 80B4F758 0C034261 */ jal Matrix_Translate /* 00DCC 80B4F75C 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 00DD0 80B4F760 8FA40074 */ lw $a0, 0x0074($sp) +/* 00DD0 80B4F760 8FA40074 */ lw $a0, 0x0074($sp) /* 00DD4 80B4F764 3C0580B5 */ lui $a1, %hi(D_80B52920) ## $a1 = 80B50000 /* 00DD8 80B4F768 24A52920 */ addiu $a1, $a1, %lo(D_80B52920) ## $a1 = 80B52920 /* 00DDC 80B4F76C 24060460 */ addiu $a2, $zero, 0x0460 ## $a2 = 00000460 -/* 00DE0 80B4F770 0C034695 */ jal Matrix_ToMtx +/* 00DE0 80B4F770 0C034695 */ jal Matrix_ToMtx /* 00DE4 80B4F774 24840080 */ addiu $a0, $a0, 0x0080 ## $a0 = 00000080 -/* 00DE8 80B4F778 0C034221 */ jal Matrix_Pull +/* 00DE8 80B4F778 0C034221 */ jal Matrix_Pull /* 00DEC 80B4F77C 00000000 */ nop -/* 00DF0 80B4F780 0C034213 */ jal Matrix_Push +/* 00DF0 80B4F780 0C034213 */ jal Matrix_Push /* 00DF4 80B4F784 00000000 */ nop /* 00DF8 80B4F788 3C0180B5 */ lui $at, %hi(D_80B52BB8) ## $at = 80B50000 -/* 00DFC 80B4F78C C42C2BB8 */ lwc1 $f12, %lo(D_80B52BB8)($at) +/* 00DFC 80B4F78C C42C2BB8 */ lwc1 $f12, %lo(D_80B52BB8)($at) /* 00E00 80B4F790 3C0180B5 */ lui $at, %hi(D_80B52BBC) ## $at = 80B50000 /* 00E04 80B4F794 3C0643C2 */ lui $a2, 0x43C2 ## $a2 = 43C20000 /* 00E08 80B4F798 34C68000 */ ori $a2, $a2, 0x8000 ## $a2 = 43C28000 -/* 00E0C 80B4F79C C42E2BBC */ lwc1 $f14, %lo(D_80B52BBC)($at) -/* 00E10 80B4F7A0 0C034261 */ jal Matrix_Translate +/* 00E0C 80B4F79C C42E2BBC */ lwc1 $f14, %lo(D_80B52BBC)($at) +/* 00E10 80B4F7A0 0C034261 */ jal Matrix_Translate /* 00E14 80B4F7A4 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 00E18 80B4F7A8 0C034236 */ jal Matrix_Get +/* 00E18 80B4F7A8 0C034236 */ jal Matrix_Get /* 00E1C 80B4F7AC 27A40034 */ addiu $a0, $sp, 0x0034 ## $a0 = FFFFFFB4 /* 00E20 80B4F7B0 27A40034 */ addiu $a0, $sp, 0x0034 ## $a0 = FFFFFFB4 /* 00E24 80B4F7B4 27A5002C */ addiu $a1, $sp, 0x002C ## $a1 = FFFFFFAC -/* 00E28 80B4F7B8 0C034833 */ jal func_800D20CC +/* 00E28 80B4F7B8 0C034833 */ jal func_800D20CC /* 00E2C 80B4F7BC 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 00E30 80B4F7C0 0C03034A */ jal func_800C0D28 -/* 00E34 80B4F7C4 8FA40080 */ lw $a0, 0x0080($sp) -/* 00E38 80B4F7C8 1440000D */ bne $v0, $zero, .L80B4F800 +/* 00E30 80B4F7C0 0C03034A */ jal func_800C0D28 +/* 00E34 80B4F7C4 8FA40080 */ lw $a0, 0x0080($sp) +/* 00E38 80B4F7C8 1440000D */ bne $v0, $zero, .L80B4F800 /* 00E3C 80B4F7CC 00000000 */ nop -/* 00E40 80B4F7D0 8FA40094 */ lw $a0, 0x0094($sp) -/* 00E44 80B4F7D4 87A5002E */ lh $a1, 0x002E($sp) -/* 00E48 80B4F7D8 0C2D3B8E */ jal func_80B4EE38 +/* 00E40 80B4F7D0 8FA40094 */ lw $a0, 0x0094($sp) +/* 00E44 80B4F7D4 87A5002E */ lh $a1, 0x002E($sp) +/* 00E48 80B4F7D8 0C2D3B8E */ jal func_80B4EE38 /* 00E4C 80B4F7DC 24060009 */ addiu $a2, $zero, 0x0009 ## $a2 = 00000009 -/* 00E50 80B4F7E0 8FA40094 */ lw $a0, 0x0094($sp) -/* 00E54 80B4F7E4 87A5002C */ lh $a1, 0x002C($sp) -/* 00E58 80B4F7E8 0C2D3C8C */ jal func_80B4F230 +/* 00E50 80B4F7E0 8FA40094 */ lw $a0, 0x0094($sp) +/* 00E54 80B4F7E4 87A5002C */ lh $a1, 0x002C($sp) +/* 00E58 80B4F7E8 0C2D3C8C */ jal func_80B4F230 /* 00E5C 80B4F7EC 2406000A */ addiu $a2, $zero, 0x000A ## $a2 = 0000000A -/* 00E60 80B4F7F0 8FA40094 */ lw $a0, 0x0094($sp) -/* 00E64 80B4F7F4 87A50030 */ lh $a1, 0x0030($sp) -/* 00E68 80B4F7F8 0C2D3BD9 */ jal func_80B4EF64 +/* 00E60 80B4F7F0 8FA40094 */ lw $a0, 0x0094($sp) +/* 00E64 80B4F7F4 87A50030 */ lh $a1, 0x0030($sp) +/* 00E68 80B4F7F8 0C2D3BD9 */ jal func_80B4EF64 /* 00E6C 80B4F7FC 2406000B */ addiu $a2, $zero, 0x000B ## $a2 = 0000000B .L80B4F800: /* 00E70 80B4F800 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 00E74 80B4F804 8FA3001C */ lw $v1, 0x001C($sp) +/* 00E74 80B4F804 8FA3001C */ lw $v1, 0x001C($sp) /* 00E78 80B4F808 8C42FA90 */ lw $v0, -0x0570($v0) ## 8015FA90 /* 00E7C 80B4F80C 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 /* 00E80 80B4F810 84690012 */ lh $t1, 0x0012($v1) ## 00000012 @@ -247,54 +247,54 @@ glabel func_80B4F45C /* 00E8C 80B4F81C 845914A4 */ lh $t9, 0x14A4($v0) ## 801614A4 /* 00E90 80B4F820 844A14A6 */ lh $t2, 0x14A6($v0) ## 801614A6 /* 00E94 80B4F824 844C14A8 */ lh $t4, 0x14A8($v0) ## 801614A8 -/* 00E98 80B4F828 03292021 */ addu $a0, $t9, $t1 -/* 00E9C 80B4F82C 014B2821 */ addu $a1, $t2, $t3 -/* 00EA0 80B4F830 018D3021 */ addu $a2, $t4, $t5 -/* 00EA4 80B4F834 00063400 */ sll $a2, $a2, 16 -/* 00EA8 80B4F838 00052C00 */ sll $a1, $a1, 16 -/* 00EAC 80B4F83C 00042400 */ sll $a0, $a0, 16 -/* 00EB0 80B4F840 00042403 */ sra $a0, $a0, 16 -/* 00EB4 80B4F844 00052C03 */ sra $a1, $a1, 16 -/* 00EB8 80B4F848 0C034421 */ jal Matrix_RotateXYZ -/* 00EBC 80B4F84C 00063403 */ sra $a2, $a2, 16 +/* 00E98 80B4F828 03292021 */ addu $a0, $t9, $t1 +/* 00E9C 80B4F82C 014B2821 */ addu $a1, $t2, $t3 +/* 00EA0 80B4F830 018D3021 */ addu $a2, $t4, $t5 +/* 00EA4 80B4F834 00063400 */ sll $a2, $a2, 16 +/* 00EA8 80B4F838 00052C00 */ sll $a1, $a1, 16 +/* 00EAC 80B4F83C 00042400 */ sll $a0, $a0, 16 +/* 00EB0 80B4F840 00042403 */ sra $a0, $a0, 16 +/* 00EB4 80B4F844 00052C03 */ sra $a1, $a1, 16 +/* 00EB8 80B4F848 0C034421 */ jal Matrix_RotateZYX +/* 00EBC 80B4F84C 00063403 */ sra $a2, $a2, 16 /* 00EC0 80B4F850 3C0180B5 */ lui $at, %hi(D_80B52BC0) ## $at = 80B50000 -/* 00EC4 80B4F854 C42C2BC0 */ lwc1 $f12, %lo(D_80B52BC0)($at) +/* 00EC4 80B4F854 C42C2BC0 */ lwc1 $f12, %lo(D_80B52BC0)($at) /* 00EC8 80B4F858 3C01BF80 */ lui $at, 0xBF80 ## $at = BF800000 /* 00ECC 80B4F85C 44817000 */ mtc1 $at, $f14 ## $f14 = -1.00 /* 00ED0 80B4F860 3C06C040 */ lui $a2, 0xC040 ## $a2 = C0400000 -/* 00ED4 80B4F864 0C034261 */ jal Matrix_Translate +/* 00ED4 80B4F864 0C034261 */ jal Matrix_Translate /* 00ED8 80B4F868 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 00EDC 80B4F86C 8FA40074 */ lw $a0, 0x0074($sp) +/* 00EDC 80B4F86C 8FA40074 */ lw $a0, 0x0074($sp) /* 00EE0 80B4F870 3C0580B5 */ lui $a1, %hi(D_80B52930) ## $a1 = 80B50000 /* 00EE4 80B4F874 24A52930 */ addiu $a1, $a1, %lo(D_80B52930) ## $a1 = 80B52930 /* 00EE8 80B4F878 24060479 */ addiu $a2, $zero, 0x0479 ## $a2 = 00000479 -/* 00EEC 80B4F87C 0C034695 */ jal Matrix_ToMtx +/* 00EEC 80B4F87C 0C034695 */ jal Matrix_ToMtx /* 00EF0 80B4F880 248400C0 */ addiu $a0, $a0, 0x00C0 ## $a0 = 000000C0 -/* 00EF4 80B4F884 0C034236 */ jal Matrix_Get +/* 00EF4 80B4F884 0C034236 */ jal Matrix_Get /* 00EF8 80B4F888 27A40034 */ addiu $a0, $sp, 0x0034 ## $a0 = FFFFFFB4 /* 00EFC 80B4F88C 27A40034 */ addiu $a0, $sp, 0x0034 ## $a0 = FFFFFFB4 /* 00F00 80B4F890 27A5002C */ addiu $a1, $sp, 0x002C ## $a1 = FFFFFFAC -/* 00F04 80B4F894 0C034833 */ jal func_800D20CC +/* 00F04 80B4F894 0C034833 */ jal func_800D20CC /* 00F08 80B4F898 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 00F0C 80B4F89C 0C03034A */ jal func_800C0D28 -/* 00F10 80B4F8A0 8FA40080 */ lw $a0, 0x0080($sp) -/* 00F14 80B4F8A4 1440000D */ bne $v0, $zero, .L80B4F8DC +/* 00F0C 80B4F89C 0C03034A */ jal func_800C0D28 +/* 00F10 80B4F8A0 8FA40080 */ lw $a0, 0x0080($sp) +/* 00F14 80B4F8A4 1440000D */ bne $v0, $zero, .L80B4F8DC /* 00F18 80B4F8A8 00000000 */ nop -/* 00F1C 80B4F8AC 8FA40094 */ lw $a0, 0x0094($sp) -/* 00F20 80B4F8B0 87A5002E */ lh $a1, 0x002E($sp) -/* 00F24 80B4F8B4 0C2D3B8E */ jal func_80B4EE38 +/* 00F1C 80B4F8AC 8FA40094 */ lw $a0, 0x0094($sp) +/* 00F20 80B4F8B0 87A5002E */ lh $a1, 0x002E($sp) +/* 00F24 80B4F8B4 0C2D3B8E */ jal func_80B4EE38 /* 00F28 80B4F8B8 2406000C */ addiu $a2, $zero, 0x000C ## $a2 = 0000000C -/* 00F2C 80B4F8BC 8FA40094 */ lw $a0, 0x0094($sp) -/* 00F30 80B4F8C0 87A5002C */ lh $a1, 0x002C($sp) -/* 00F34 80B4F8C4 0C2D3C8C */ jal func_80B4F230 +/* 00F2C 80B4F8BC 8FA40094 */ lw $a0, 0x0094($sp) +/* 00F30 80B4F8C0 87A5002C */ lh $a1, 0x002C($sp) +/* 00F34 80B4F8C4 0C2D3C8C */ jal func_80B4F230 /* 00F38 80B4F8C8 2406000D */ addiu $a2, $zero, 0x000D ## $a2 = 0000000D -/* 00F3C 80B4F8CC 8FA40094 */ lw $a0, 0x0094($sp) -/* 00F40 80B4F8D0 87A50030 */ lh $a1, 0x0030($sp) -/* 00F44 80B4F8D4 0C2D3BD9 */ jal func_80B4EF64 +/* 00F3C 80B4F8CC 8FA40094 */ lw $a0, 0x0094($sp) +/* 00F40 80B4F8D0 87A50030 */ lh $a1, 0x0030($sp) +/* 00F44 80B4F8D4 0C2D3BD9 */ jal func_80B4EF64 /* 00F48 80B4F8D8 2406000E */ addiu $a2, $zero, 0x000E ## $a2 = 0000000E .L80B4F8DC: /* 00F4C 80B4F8DC 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 00F50 80B4F8E0 8FA3001C */ lw $v1, 0x001C($sp) +/* 00F50 80B4F8E0 8FA3001C */ lw $v1, 0x001C($sp) /* 00F54 80B4F8E4 8C42FA90 */ lw $v0, -0x0570($v0) ## 8015FA90 /* 00F58 80B4F8E8 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 /* 00F5C 80B4F8EC 846F0018 */ lh $t7, 0x0018($v1) ## 00000018 @@ -303,66 +303,66 @@ glabel func_80B4F45C /* 00F68 80B4F8F8 844E14AA */ lh $t6, 0x14AA($v0) ## 801614AA /* 00F6C 80B4F8FC 845814AC */ lh $t8, 0x14AC($v0) ## 801614AC /* 00F70 80B4F900 844914AE */ lh $t1, 0x14AE($v0) ## 801614AE -/* 00F74 80B4F904 01CF2021 */ addu $a0, $t6, $t7 -/* 00F78 80B4F908 03192821 */ addu $a1, $t8, $t9 -/* 00F7C 80B4F90C 012A3021 */ addu $a2, $t1, $t2 -/* 00F80 80B4F910 00063400 */ sll $a2, $a2, 16 -/* 00F84 80B4F914 00052C00 */ sll $a1, $a1, 16 -/* 00F88 80B4F918 00042400 */ sll $a0, $a0, 16 -/* 00F8C 80B4F91C 00042403 */ sra $a0, $a0, 16 -/* 00F90 80B4F920 00052C03 */ sra $a1, $a1, 16 -/* 00F94 80B4F924 0C034421 */ jal Matrix_RotateXYZ -/* 00F98 80B4F928 00063403 */ sra $a2, $a2, 16 +/* 00F74 80B4F904 01CF2021 */ addu $a0, $t6, $t7 +/* 00F78 80B4F908 03192821 */ addu $a1, $t8, $t9 +/* 00F7C 80B4F90C 012A3021 */ addu $a2, $t1, $t2 +/* 00F80 80B4F910 00063400 */ sll $a2, $a2, 16 +/* 00F84 80B4F914 00052C00 */ sll $a1, $a1, 16 +/* 00F88 80B4F918 00042400 */ sll $a0, $a0, 16 +/* 00F8C 80B4F91C 00042403 */ sra $a0, $a0, 16 +/* 00F90 80B4F920 00052C03 */ sra $a1, $a1, 16 +/* 00F94 80B4F924 0C034421 */ jal Matrix_RotateZYX +/* 00F98 80B4F928 00063403 */ sra $a2, $a2, 16 /* 00F9C 80B4F92C 3C01C3DF */ lui $at, 0xC3DF ## $at = C3DF0000 /* 00FA0 80B4F930 44816000 */ mtc1 $at, $f12 ## $f12 = -446.00 /* 00FA4 80B4F934 3C01C250 */ lui $at, 0xC250 ## $at = C2500000 /* 00FA8 80B4F938 44817000 */ mtc1 $at, $f14 ## $f14 = -52.00 /* 00FAC 80B4F93C 3C0642A8 */ lui $a2, 0x42A8 ## $a2 = 42A80000 -/* 00FB0 80B4F940 0C034261 */ jal Matrix_Translate +/* 00FB0 80B4F940 0C034261 */ jal Matrix_Translate /* 00FB4 80B4F944 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 00FB8 80B4F948 8FA40074 */ lw $a0, 0x0074($sp) +/* 00FB8 80B4F948 8FA40074 */ lw $a0, 0x0074($sp) /* 00FBC 80B4F94C 3C0580B5 */ lui $a1, %hi(D_80B52940) ## $a1 = 80B50000 /* 00FC0 80B4F950 24A52940 */ addiu $a1, $a1, %lo(D_80B52940) ## $a1 = 80B52940 /* 00FC4 80B4F954 2406048C */ addiu $a2, $zero, 0x048C ## $a2 = 0000048C -/* 00FC8 80B4F958 0C034695 */ jal Matrix_ToMtx +/* 00FC8 80B4F958 0C034695 */ jal Matrix_ToMtx /* 00FCC 80B4F95C 24840100 */ addiu $a0, $a0, 0x0100 ## $a0 = 00000100 -/* 00FD0 80B4F960 0C034221 */ jal Matrix_Pull +/* 00FD0 80B4F960 0C034221 */ jal Matrix_Pull /* 00FD4 80B4F964 00000000 */ nop -/* 00FD8 80B4F968 0C034213 */ jal Matrix_Push +/* 00FD8 80B4F968 0C034213 */ jal Matrix_Push /* 00FDC 80B4F96C 00000000 */ nop /* 00FE0 80B4F970 3C0180B5 */ lui $at, %hi(D_80B52BC4) ## $at = 80B50000 -/* 00FE4 80B4F974 C42C2BC4 */ lwc1 $f12, %lo(D_80B52BC4)($at) +/* 00FE4 80B4F974 C42C2BC4 */ lwc1 $f12, %lo(D_80B52BC4)($at) /* 00FE8 80B4F978 3C0180B5 */ lui $at, %hi(D_80B52BC8) ## $at = 80B50000 /* 00FEC 80B4F97C 3C06C3C2 */ lui $a2, 0xC3C2 ## $a2 = C3C20000 /* 00FF0 80B4F980 34C68000 */ ori $a2, $a2, 0x8000 ## $a2 = C3C28000 -/* 00FF4 80B4F984 C42E2BC8 */ lwc1 $f14, %lo(D_80B52BC8)($at) -/* 00FF8 80B4F988 0C034261 */ jal Matrix_Translate +/* 00FF4 80B4F984 C42E2BC8 */ lwc1 $f14, %lo(D_80B52BC8)($at) +/* 00FF8 80B4F988 0C034261 */ jal Matrix_Translate /* 00FFC 80B4F98C 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 01000 80B4F990 0C034236 */ jal Matrix_Get +/* 01000 80B4F990 0C034236 */ jal Matrix_Get /* 01004 80B4F994 27A40034 */ addiu $a0, $sp, 0x0034 ## $a0 = FFFFFFB4 /* 01008 80B4F998 27A40034 */ addiu $a0, $sp, 0x0034 ## $a0 = FFFFFFB4 /* 0100C 80B4F99C 27A5002C */ addiu $a1, $sp, 0x002C ## $a1 = FFFFFFAC -/* 01010 80B4F9A0 0C034833 */ jal func_800D20CC +/* 01010 80B4F9A0 0C034833 */ jal func_800D20CC /* 01014 80B4F9A4 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 01018 80B4F9A8 0C03034A */ jal func_800C0D28 -/* 0101C 80B4F9AC 8FA40080 */ lw $a0, 0x0080($sp) -/* 01020 80B4F9B0 1440000D */ bne $v0, $zero, .L80B4F9E8 +/* 01018 80B4F9A8 0C03034A */ jal func_800C0D28 +/* 0101C 80B4F9AC 8FA40080 */ lw $a0, 0x0080($sp) +/* 01020 80B4F9B0 1440000D */ bne $v0, $zero, .L80B4F9E8 /* 01024 80B4F9B4 00000000 */ nop -/* 01028 80B4F9B8 8FA40094 */ lw $a0, 0x0094($sp) -/* 0102C 80B4F9BC 87A5002E */ lh $a1, 0x002E($sp) -/* 01030 80B4F9C0 0C2D3B8E */ jal func_80B4EE38 +/* 01028 80B4F9B8 8FA40094 */ lw $a0, 0x0094($sp) +/* 0102C 80B4F9BC 87A5002E */ lh $a1, 0x002E($sp) +/* 01030 80B4F9C0 0C2D3B8E */ jal func_80B4EE38 /* 01034 80B4F9C4 2406000F */ addiu $a2, $zero, 0x000F ## $a2 = 0000000F -/* 01038 80B4F9C8 8FA40094 */ lw $a0, 0x0094($sp) -/* 0103C 80B4F9CC 87A5002C */ lh $a1, 0x002C($sp) -/* 01040 80B4F9D0 0C2D3C8C */ jal func_80B4F230 +/* 01038 80B4F9C8 8FA40094 */ lw $a0, 0x0094($sp) +/* 0103C 80B4F9CC 87A5002C */ lh $a1, 0x002C($sp) +/* 01040 80B4F9D0 0C2D3C8C */ jal func_80B4F230 /* 01044 80B4F9D4 24060010 */ addiu $a2, $zero, 0x0010 ## $a2 = 00000010 -/* 01048 80B4F9D8 8FA40094 */ lw $a0, 0x0094($sp) -/* 0104C 80B4F9DC 87A50030 */ lh $a1, 0x0030($sp) -/* 01050 80B4F9E0 0C2D3BD9 */ jal func_80B4EF64 +/* 01048 80B4F9D8 8FA40094 */ lw $a0, 0x0094($sp) +/* 0104C 80B4F9DC 87A50030 */ lh $a1, 0x0030($sp) +/* 01050 80B4F9E0 0C2D3BD9 */ jal func_80B4EF64 /* 01054 80B4F9E4 24060011 */ addiu $a2, $zero, 0x0011 ## $a2 = 00000011 .L80B4F9E8: /* 01058 80B4F9E8 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 0105C 80B4F9EC 8FA3001C */ lw $v1, 0x001C($sp) +/* 0105C 80B4F9EC 8FA3001C */ lw $v1, 0x001C($sp) /* 01060 80B4F9F0 8C42FA90 */ lw $v0, -0x0570($v0) ## 8015FA90 /* 01064 80B4F9F4 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 /* 01068 80B4F9F8 846C001E */ lh $t4, 0x001E($v1) ## 0000001E @@ -371,54 +371,54 @@ glabel func_80B4F45C /* 01074 80B4FA04 844B14B0 */ lh $t3, 0x14B0($v0) ## 801614B0 /* 01078 80B4FA08 844D14B2 */ lh $t5, 0x14B2($v0) ## 801614B2 /* 0107C 80B4FA0C 844F14B4 */ lh $t7, 0x14B4($v0) ## 801614B4 -/* 01080 80B4FA10 016C2021 */ addu $a0, $t3, $t4 -/* 01084 80B4FA14 01AE2821 */ addu $a1, $t5, $t6 -/* 01088 80B4FA18 01F83021 */ addu $a2, $t7, $t8 -/* 0108C 80B4FA1C 00063400 */ sll $a2, $a2, 16 -/* 01090 80B4FA20 00052C00 */ sll $a1, $a1, 16 -/* 01094 80B4FA24 00042400 */ sll $a0, $a0, 16 -/* 01098 80B4FA28 00042403 */ sra $a0, $a0, 16 -/* 0109C 80B4FA2C 00052C03 */ sra $a1, $a1, 16 -/* 010A0 80B4FA30 0C034421 */ jal Matrix_RotateXYZ -/* 010A4 80B4FA34 00063403 */ sra $a2, $a2, 16 +/* 01080 80B4FA10 016C2021 */ addu $a0, $t3, $t4 +/* 01084 80B4FA14 01AE2821 */ addu $a1, $t5, $t6 +/* 01088 80B4FA18 01F83021 */ addu $a2, $t7, $t8 +/* 0108C 80B4FA1C 00063400 */ sll $a2, $a2, 16 +/* 01090 80B4FA20 00052C00 */ sll $a1, $a1, 16 +/* 01094 80B4FA24 00042400 */ sll $a0, $a0, 16 +/* 01098 80B4FA28 00042403 */ sra $a0, $a0, 16 +/* 0109C 80B4FA2C 00052C03 */ sra $a1, $a1, 16 +/* 010A0 80B4FA30 0C034421 */ jal Matrix_RotateZYX +/* 010A4 80B4FA34 00063403 */ sra $a2, $a2, 16 /* 010A8 80B4FA38 3C0180B5 */ lui $at, %hi(D_80B52BCC) ## $at = 80B50000 -/* 010AC 80B4FA3C C42C2BCC */ lwc1 $f12, %lo(D_80B52BCC)($at) +/* 010AC 80B4FA3C C42C2BCC */ lwc1 $f12, %lo(D_80B52BCC)($at) /* 010B0 80B4FA40 3C01BF80 */ lui $at, 0xBF80 ## $at = BF800000 /* 010B4 80B4FA44 44817000 */ mtc1 $at, $f14 ## $f14 = -1.00 /* 010B8 80B4FA48 3C064040 */ lui $a2, 0x4040 ## $a2 = 40400000 -/* 010BC 80B4FA4C 0C034261 */ jal Matrix_Translate +/* 010BC 80B4FA4C 0C034261 */ jal Matrix_Translate /* 010C0 80B4FA50 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 010C4 80B4FA54 8FA40074 */ lw $a0, 0x0074($sp) +/* 010C4 80B4FA54 8FA40074 */ lw $a0, 0x0074($sp) /* 010C8 80B4FA58 3C0580B5 */ lui $a1, %hi(D_80B52950) ## $a1 = 80B50000 /* 010CC 80B4FA5C 24A52950 */ addiu $a1, $a1, %lo(D_80B52950) ## $a1 = 80B52950 /* 010D0 80B4FA60 240604A5 */ addiu $a2, $zero, 0x04A5 ## $a2 = 000004A5 -/* 010D4 80B4FA64 0C034695 */ jal Matrix_ToMtx +/* 010D4 80B4FA64 0C034695 */ jal Matrix_ToMtx /* 010D8 80B4FA68 24840140 */ addiu $a0, $a0, 0x0140 ## $a0 = 00000140 -/* 010DC 80B4FA6C 0C034236 */ jal Matrix_Get +/* 010DC 80B4FA6C 0C034236 */ jal Matrix_Get /* 010E0 80B4FA70 27A40034 */ addiu $a0, $sp, 0x0034 ## $a0 = FFFFFFB4 /* 010E4 80B4FA74 27A40034 */ addiu $a0, $sp, 0x0034 ## $a0 = FFFFFFB4 /* 010E8 80B4FA78 27A5002C */ addiu $a1, $sp, 0x002C ## $a1 = FFFFFFAC -/* 010EC 80B4FA7C 0C034833 */ jal func_800D20CC +/* 010EC 80B4FA7C 0C034833 */ jal func_800D20CC /* 010F0 80B4FA80 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 010F4 80B4FA84 0C03034A */ jal func_800C0D28 -/* 010F8 80B4FA88 8FA40080 */ lw $a0, 0x0080($sp) -/* 010FC 80B4FA8C 1440000C */ bne $v0, $zero, .L80B4FAC0 -/* 01100 80B4FA90 8FA40094 */ lw $a0, 0x0094($sp) -/* 01104 80B4FA94 87A5002E */ lh $a1, 0x002E($sp) -/* 01108 80B4FA98 0C2D3B8E */ jal func_80B4EE38 +/* 010F4 80B4FA84 0C03034A */ jal func_800C0D28 +/* 010F8 80B4FA88 8FA40080 */ lw $a0, 0x0080($sp) +/* 010FC 80B4FA8C 1440000C */ bne $v0, $zero, .L80B4FAC0 +/* 01100 80B4FA90 8FA40094 */ lw $a0, 0x0094($sp) +/* 01104 80B4FA94 87A5002E */ lh $a1, 0x002E($sp) +/* 01108 80B4FA98 0C2D3B8E */ jal func_80B4EE38 /* 0110C 80B4FA9C 24060012 */ addiu $a2, $zero, 0x0012 ## $a2 = 00000012 -/* 01110 80B4FAA0 8FA40094 */ lw $a0, 0x0094($sp) -/* 01114 80B4FAA4 87A5002C */ lh $a1, 0x002C($sp) -/* 01118 80B4FAA8 0C2D3C8C */ jal func_80B4F230 +/* 01110 80B4FAA0 8FA40094 */ lw $a0, 0x0094($sp) +/* 01114 80B4FAA4 87A5002C */ lh $a1, 0x002C($sp) +/* 01118 80B4FAA8 0C2D3C8C */ jal func_80B4F230 /* 0111C 80B4FAAC 24060013 */ addiu $a2, $zero, 0x0013 ## $a2 = 00000013 -/* 01120 80B4FAB0 8FA40094 */ lw $a0, 0x0094($sp) -/* 01124 80B4FAB4 87A50030 */ lh $a1, 0x0030($sp) -/* 01128 80B4FAB8 0C2D3BD9 */ jal func_80B4EF64 +/* 01120 80B4FAB0 8FA40094 */ lw $a0, 0x0094($sp) +/* 01124 80B4FAB4 87A50030 */ lh $a1, 0x0030($sp) +/* 01128 80B4FAB8 0C2D3BD9 */ jal func_80B4EF64 /* 0112C 80B4FABC 24060014 */ addiu $a2, $zero, 0x0014 ## $a2 = 00000014 .L80B4FAC0: /* 01130 80B4FAC0 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 /* 01134 80B4FAC4 8C42FA90 */ lw $v0, -0x0570($v0) ## 8015FA90 -/* 01138 80B4FAC8 8FA9001C */ lw $t1, 0x001C($sp) +/* 01138 80B4FAC8 8FA9001C */ lw $t1, 0x001C($sp) /* 0113C 80B4FACC 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 /* 01140 80B4FAD0 845914B6 */ lh $t9, 0x14B6($v0) ## 801614B6 /* 01144 80B4FAD4 844B14B8 */ lh $t3, 0x14B8($v0) ## 801614B8 @@ -426,41 +426,41 @@ glabel func_80B4F45C /* 0114C 80B4FADC 852A0024 */ lh $t2, 0x0024($t1) ## 00000024 /* 01150 80B4FAE0 852C0026 */ lh $t4, 0x0026($t1) ## 00000026 /* 01154 80B4FAE4 852E0028 */ lh $t6, 0x0028($t1) ## 00000028 -/* 01158 80B4FAE8 032A2021 */ addu $a0, $t9, $t2 -/* 0115C 80B4FAEC 016C2821 */ addu $a1, $t3, $t4 -/* 01160 80B4FAF0 01AE3021 */ addu $a2, $t5, $t6 -/* 01164 80B4FAF4 00063400 */ sll $a2, $a2, 16 -/* 01168 80B4FAF8 00052C00 */ sll $a1, $a1, 16 -/* 0116C 80B4FAFC 00042400 */ sll $a0, $a0, 16 -/* 01170 80B4FB00 00042403 */ sra $a0, $a0, 16 -/* 01174 80B4FB04 00052C03 */ sra $a1, $a1, 16 -/* 01178 80B4FB08 0C034421 */ jal Matrix_RotateXYZ -/* 0117C 80B4FB0C 00063403 */ sra $a2, $a2, 16 +/* 01158 80B4FAE8 032A2021 */ addu $a0, $t9, $t2 +/* 0115C 80B4FAEC 016C2821 */ addu $a1, $t3, $t4 +/* 01160 80B4FAF0 01AE3021 */ addu $a2, $t5, $t6 +/* 01164 80B4FAF4 00063400 */ sll $a2, $a2, 16 +/* 01168 80B4FAF8 00052C00 */ sll $a1, $a1, 16 +/* 0116C 80B4FAFC 00042400 */ sll $a0, $a0, 16 +/* 01170 80B4FB00 00042403 */ sra $a0, $a0, 16 +/* 01174 80B4FB04 00052C03 */ sra $a1, $a1, 16 +/* 01178 80B4FB08 0C034421 */ jal Matrix_RotateZYX +/* 0117C 80B4FB0C 00063403 */ sra $a2, $a2, 16 /* 01180 80B4FB10 3C01C3DF */ lui $at, 0xC3DF ## $at = C3DF0000 /* 01184 80B4FB14 44816000 */ mtc1 $at, $f12 ## $f12 = -446.00 /* 01188 80B4FB18 3C01C250 */ lui $at, 0xC250 ## $at = C2500000 /* 0118C 80B4FB1C 44817000 */ mtc1 $at, $f14 ## $f14 = -52.00 /* 01190 80B4FB20 3C06C2A8 */ lui $a2, 0xC2A8 ## $a2 = C2A80000 -/* 01194 80B4FB24 0C034261 */ jal Matrix_Translate +/* 01194 80B4FB24 0C034261 */ jal Matrix_Translate /* 01198 80B4FB28 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 0119C 80B4FB2C 8FA40074 */ lw $a0, 0x0074($sp) +/* 0119C 80B4FB2C 8FA40074 */ lw $a0, 0x0074($sp) /* 011A0 80B4FB30 3C0580B5 */ lui $a1, %hi(D_80B52960) ## $a1 = 80B50000 /* 011A4 80B4FB34 24A52960 */ addiu $a1, $a1, %lo(D_80B52960) ## $a1 = 80B52960 /* 011A8 80B4FB38 240604B8 */ addiu $a2, $zero, 0x04B8 ## $a2 = 000004B8 -/* 011AC 80B4FB3C 0C034695 */ jal Matrix_ToMtx +/* 011AC 80B4FB3C 0C034695 */ jal Matrix_ToMtx /* 011B0 80B4FB40 24840180 */ addiu $a0, $a0, 0x0180 ## $a0 = 00000180 -/* 011B4 80B4FB44 0C034221 */ jal Matrix_Pull +/* 011B4 80B4FB44 0C034221 */ jal Matrix_Pull /* 011B8 80B4FB48 00000000 */ nop -/* 011BC 80B4FB4C 0C034221 */ jal Matrix_Pull +/* 011BC 80B4FB4C 0C034221 */ jal Matrix_Pull /* 011C0 80B4FB50 00000000 */ nop -/* 011C4 80B4FB54 8FB80094 */ lw $t8, 0x0094($sp) +/* 011C4 80B4FB54 8FB80094 */ lw $t8, 0x0094($sp) /* 011C8 80B4FB58 240F0001 */ addiu $t7, $zero, 0x0001 ## $t7 = 00000001 /* 011CC 80B4FB5C AF0F024C */ sw $t7, 0x024C($t8) ## 0000024C .L80B4FB60: -/* 011D0 80B4FB60 8FBF0014 */ lw $ra, 0x0014($sp) +/* 011D0 80B4FB60 8FBF0014 */ lw $ra, 0x0014($sp) /* 011D4 80B4FB64 27BD0080 */ addiu $sp, $sp, 0x0080 ## $sp = 00000000 /* 011D8 80B4FB68 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 011DC 80B4FB6C 03E00008 */ jr $ra +/* 011DC 80B4FB6C 03E00008 */ jr $ra /* 011E0 80B4FB70 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B4FB74.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B4FB74.s index a96ef2c07a..f9f2c81dda 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B4FB74.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B4FB74.s @@ -1,19 +1,19 @@ glabel func_80B4FB74 /* 011E4 80B4FB74 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 /* 011E8 80B4FB78 2401000A */ addiu $at, $zero, 0x000A ## $at = 0000000A -/* 011EC 80B4FB7C AFBF0014 */ sw $ra, 0x0014($sp) -/* 011F0 80B4FB80 AFA60040 */ sw $a2, 0x0040($sp) -/* 011F4 80B4FB84 14A1004D */ bne $a1, $at, .L80B4FCBC -/* 011F8 80B4FB88 AFA70044 */ sw $a3, 0x0044($sp) -/* 011FC 80B4FB8C 8FAE0048 */ lw $t6, 0x0048($sp) +/* 011EC 80B4FB7C AFBF0014 */ sw $ra, 0x0014($sp) +/* 011F0 80B4FB80 AFA60040 */ sw $a2, 0x0040($sp) +/* 011F4 80B4FB84 14A1004D */ bne $a1, $at, .L80B4FCBC +/* 011F8 80B4FB88 AFA70044 */ sw $a3, 0x0044($sp) +/* 011FC 80B4FB8C 8FAE0048 */ lw $t6, 0x0048($sp) /* 01200 80B4FB90 8DCF0254 */ lw $t7, 0x0254($t6) ## 00000254 -/* 01204 80B4FB94 51E0000F */ beql $t7, $zero, .L80B4FBD4 +/* 01204 80B4FB94 51E0000F */ beql $t7, $zero, .L80B4FBD4 /* 01208 80B4FB98 8C821C44 */ lw $v0, 0x1C44($a0) ## 00001C44 /* 0120C 80B4FB9C 94981D74 */ lhu $t8, 0x1D74($a0) ## 00001D74 -/* 01210 80B4FBA0 8FB9004C */ lw $t9, 0x004C($sp) +/* 01210 80B4FBA0 8FB9004C */ lw $t9, 0x004C($sp) /* 01214 80B4FBA4 3C09DE00 */ lui $t1, 0xDE00 ## $t1 = DE000000 -/* 01218 80B4FBA8 2B010384 */ slti $at, $t8, 0x0384 -/* 0121C 80B4FBAC 54200009 */ bnel $at, $zero, .L80B4FBD4 +/* 01218 80B4FBA8 2B010384 */ slti $at, $t8, 0x0384 +/* 0121C 80B4FBAC 54200009 */ bnel $at, $zero, .L80B4FBD4 /* 01220 80B4FBB0 8C821C44 */ lw $v0, 0x1C44($a0) ## 00001C44 /* 01224 80B4FBB4 8F220000 */ lw $v0, 0x0000($t9) ## 00000000 /* 01228 80B4FBB8 3C0A0601 */ lui $t2, 0x0601 ## $t2 = 06010000 @@ -24,39 +24,39 @@ glabel func_80B4FB74 /* 0123C 80B4FBCC AC490000 */ sw $t1, 0x0000($v0) ## 00000000 /* 01240 80B4FBD0 8C821C44 */ lw $v0, 0x1C44($a0) ## 00001C44 .L80B4FBD4: -/* 01244 80B4FBD4 AFA40038 */ sw $a0, 0x0038($sp) -/* 01248 80B4FBD8 0C034213 */ jal Matrix_Push -/* 0124C 80B4FBDC AFA20024 */ sw $v0, 0x0024($sp) -/* 01250 80B4FBE0 8FA20024 */ lw $v0, 0x0024($sp) +/* 01244 80B4FBD4 AFA40038 */ sw $a0, 0x0038($sp) +/* 01248 80B4FBD8 0C034213 */ jal Matrix_Push +/* 0124C 80B4FBDC AFA20024 */ sw $v0, 0x0024($sp) +/* 01250 80B4FBE0 8FA20024 */ lw $v0, 0x0024($sp) /* 01254 80B4FBE4 240100FF */ addiu $at, $zero, 0x00FF ## $at = 000000FF /* 01258 80B4FBE8 3C0C0601 */ lui $t4, 0x0601 ## $t4 = 06010000 /* 0125C 80B4FBEC 904B015D */ lbu $t3, 0x015D($v0) ## 0000015D /* 01260 80B4FBF0 258CBAE8 */ addiu $t4, $t4, 0xBAE8 ## $t4 = 0600BAE8 /* 01264 80B4FBF4 24440A20 */ addiu $a0, $v0, 0x0A20 ## $a0 = 00000A20 -/* 01268 80B4FBF8 1561002E */ bne $t3, $at, .L80B4FCB4 +/* 01268 80B4FBF8 1561002E */ bne $t3, $at, .L80B4FCB4 /* 0126C 80B4FBFC 00000000 */ nop -/* 01270 80B4FC00 0C03423F */ jal Matrix_Put -/* 01274 80B4FC04 AFAC0018 */ sw $t4, 0x0018($sp) +/* 01270 80B4FC00 0C03423F */ jal Matrix_Put +/* 01274 80B4FC04 AFAC0018 */ sw $t4, 0x0018($sp) /* 01278 80B4FC08 3C014334 */ lui $at, 0x4334 ## $at = 43340000 /* 0127C 80B4FC0C 44816000 */ mtc1 $at, $f12 ## $f12 = 180.00 /* 01280 80B4FC10 3C0180B5 */ lui $at, %hi(D_80B52BD0) ## $at = 80B50000 /* 01284 80B4FC14 3C06C3BB */ lui $a2, 0xC3BB ## $a2 = C3BB0000 /* 01288 80B4FC18 34C68000 */ ori $a2, $a2, 0x8000 ## $a2 = C3BB8000 -/* 0128C 80B4FC1C C42E2BD0 */ lwc1 $f14, %lo(D_80B52BD0)($at) -/* 01290 80B4FC20 0C034261 */ jal Matrix_Translate +/* 0128C 80B4FC1C C42E2BD0 */ lwc1 $f14, %lo(D_80B52BD0)($at) +/* 01290 80B4FC20 0C034261 */ jal Matrix_Translate /* 01294 80B4FC24 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 /* 01298 80B4FC28 2404A219 */ addiu $a0, $zero, 0xA219 ## $a0 = FFFFA219 /* 0129C 80B4FC2C 2405AC17 */ addiu $a1, $zero, 0xAC17 ## $a1 = FFFFAC17 /* 012A0 80B4FC30 24063333 */ addiu $a2, $zero, 0x3333 ## $a2 = 00003333 -/* 012A4 80B4FC34 0C034421 */ jal Matrix_RotateXYZ +/* 012A4 80B4FC34 0C034421 */ jal Matrix_RotateZYX /* 012A8 80B4FC38 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 /* 012AC 80B4FC3C 3C0180B5 */ lui $at, %hi(D_80B52BD4) ## $at = 80B50000 -/* 012B0 80B4FC40 C42C2BD4 */ lwc1 $f12, %lo(D_80B52BD4)($at) +/* 012B0 80B4FC40 C42C2BD4 */ lwc1 $f12, %lo(D_80B52BD4)($at) /* 012B4 80B4FC44 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 012B8 80B4FC48 44066000 */ mfc1 $a2, $f12 -/* 012BC 80B4FC4C 0C0342A3 */ jal Matrix_Scale -/* 012C0 80B4FC50 46006386 */ mov.s $f14, $f12 -/* 012C4 80B4FC54 8FA7004C */ lw $a3, 0x004C($sp) +/* 012B8 80B4FC48 44066000 */ mfc1 $a2, $f12 +/* 012BC 80B4FC4C 0C0342A3 */ jal Matrix_Scale +/* 012C0 80B4FC50 46006386 */ mov.s $f14, $f12 +/* 012C4 80B4FC54 8FA7004C */ lw $a3, 0x004C($sp) /* 012C8 80B4FC58 3C0EDA38 */ lui $t6, 0xDA38 ## $t6 = DA380000 /* 012CC 80B4FC5C 35CE0003 */ ori $t6, $t6, 0x0003 ## $t6 = DA380003 /* 012D0 80B4FC60 8CE20000 */ lw $v0, 0x0000($a3) ## 00000000 @@ -65,28 +65,28 @@ glabel func_80B4FB74 /* 012DC 80B4FC6C 244D0008 */ addiu $t5, $v0, 0x0008 ## $t5 = 00000008 /* 012E0 80B4FC70 ACED0000 */ sw $t5, 0x0000($a3) ## 00000000 /* 012E4 80B4FC74 AC4E0000 */ sw $t6, 0x0000($v0) ## 00000000 -/* 012E8 80B4FC78 8FAF0038 */ lw $t7, 0x0038($sp) +/* 012E8 80B4FC78 8FAF0038 */ lw $t7, 0x0038($sp) /* 012EC 80B4FC7C 240604E5 */ addiu $a2, $zero, 0x04E5 ## $a2 = 000004E5 /* 012F0 80B4FC80 8DE40000 */ lw $a0, 0x0000($t7) ## 00000000 -/* 012F4 80B4FC84 0C0346A2 */ jal Matrix_NewMtx -/* 012F8 80B4FC88 AFA20020 */ sw $v0, 0x0020($sp) -/* 012FC 80B4FC8C 8FA30020 */ lw $v1, 0x0020($sp) +/* 012F4 80B4FC84 0C0346A2 */ jal Matrix_NewMtx +/* 012F8 80B4FC88 AFA20020 */ sw $v0, 0x0020($sp) +/* 012FC 80B4FC8C 8FA30020 */ lw $v1, 0x0020($sp) /* 01300 80B4FC90 3C19DE00 */ lui $t9, 0xDE00 ## $t9 = DE000000 /* 01304 80B4FC94 AC620004 */ sw $v0, 0x0004($v1) ## 00000004 -/* 01308 80B4FC98 8FB8004C */ lw $t8, 0x004C($sp) +/* 01308 80B4FC98 8FB8004C */ lw $t8, 0x004C($sp) /* 0130C 80B4FC9C 8F020000 */ lw $v0, 0x0000($t8) ## 00000000 /* 01310 80B4FCA0 24480008 */ addiu $t0, $v0, 0x0008 ## $t0 = 00000008 /* 01314 80B4FCA4 AF080000 */ sw $t0, 0x0000($t8) ## 00000000 /* 01318 80B4FCA8 AC590000 */ sw $t9, 0x0000($v0) ## 00000000 -/* 0131C 80B4FCAC 8FA90018 */ lw $t1, 0x0018($sp) +/* 0131C 80B4FCAC 8FA90018 */ lw $t1, 0x0018($sp) /* 01320 80B4FCB0 AC490004 */ sw $t1, 0x0004($v0) ## 00000004 .L80B4FCB4: -/* 01324 80B4FCB4 0C034221 */ jal Matrix_Pull +/* 01324 80B4FCB4 0C034221 */ jal Matrix_Pull /* 01328 80B4FCB8 00000000 */ nop .L80B4FCBC: -/* 0132C 80B4FCBC 8FBF0014 */ lw $ra, 0x0014($sp) +/* 0132C 80B4FCBC 8FBF0014 */ lw $ra, 0x0014($sp) /* 01330 80B4FCC0 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 -/* 01334 80B4FCC4 03E00008 */ jr $ra +/* 01334 80B4FCC4 03E00008 */ jr $ra /* 01338 80B4FCC8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B4FD00.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B4FD00.s index 06c361ddc0..50848ceff0 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B4FD00.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B4FD00.s @@ -1,43 +1,43 @@ glabel func_80B4FD00 /* 01370 80B4FD00 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 01374 80B4FD04 AFBF0024 */ sw $ra, 0x0024($sp) -/* 01378 80B4FD08 AFA40028 */ sw $a0, 0x0028($sp) -/* 0137C 80B4FD0C AFA5002C */ sw $a1, 0x002C($sp) -/* 01380 80B4FD10 AFA60030 */ sw $a2, 0x0030($sp) -/* 01384 80B4FD14 AFA70034 */ sw $a3, 0x0034($sp) +/* 01374 80B4FD04 AFBF0024 */ sw $ra, 0x0024($sp) +/* 01378 80B4FD08 AFA40028 */ sw $a0, 0x0028($sp) +/* 0137C 80B4FD0C AFA5002C */ sw $a1, 0x002C($sp) +/* 01380 80B4FD10 AFA60030 */ sw $a2, 0x0030($sp) +/* 01384 80B4FD14 AFA70034 */ sw $a3, 0x0034($sp) /* 01388 80B4FD18 0C028800 */ jal SkelAnime_GetFrameCount - + /* 0138C 80B4FD1C 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 01390 80B4FD20 8FAE0038 */ lw $t6, 0x0038($sp) -/* 01394 80B4FD24 8FA40028 */ lw $a0, 0x0028($sp) -/* 01398 80B4FD28 8FA5002C */ lw $a1, 0x002C($sp) -/* 0139C 80B4FD2C 15C00007 */ bne $t6, $zero, .L80B4FD4C +/* 01390 80B4FD20 8FAE0038 */ lw $t6, 0x0038($sp) +/* 01394 80B4FD24 8FA40028 */ lw $a0, 0x0028($sp) +/* 01398 80B4FD28 8FA5002C */ lw $a1, 0x002C($sp) +/* 0139C 80B4FD2C 15C00007 */ bne $t6, $zero, .L80B4FD4C /* 013A0 80B4FD30 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C /* 013A4 80B4FD34 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 013A8 80B4FD38 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 /* 013AC 80B4FD3C 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 /* 013B0 80B4FD40 44816000 */ mtc1 $at, $f12 ## $f12 = 1.00 -/* 013B4 80B4FD44 10000006 */ beq $zero, $zero, .L80B4FD60 -/* 013B8 80B4FD48 468020A0 */ cvt.s.w $f2, $f4 +/* 013B4 80B4FD44 10000006 */ beq $zero, $zero, .L80B4FD60 +/* 013B8 80B4FD48 468020A0 */ cvt.s.w $f2, $f4 .L80B4FD4C: /* 013BC 80B4FD4C 44823000 */ mtc1 $v0, $f6 ## $f6 = 0.00 /* 013C0 80B4FD50 3C01BF80 */ lui $at, 0xBF80 ## $at = BF800000 /* 013C4 80B4FD54 44801000 */ mtc1 $zero, $f2 ## $f2 = 0.00 /* 013C8 80B4FD58 44816000 */ mtc1 $at, $f12 ## $f12 = -1.00 -/* 013CC 80B4FD5C 46803020 */ cvt.s.w $f0, $f6 +/* 013CC 80B4FD5C 46803020 */ cvt.s.w $f0, $f6 .L80B4FD60: -/* 013D0 80B4FD60 93AF0033 */ lbu $t7, 0x0033($sp) -/* 013D4 80B4FD64 C7A80034 */ lwc1 $f8, 0x0034($sp) -/* 013D8 80B4FD68 44066000 */ mfc1 $a2, $f12 -/* 013DC 80B4FD6C 44070000 */ mfc1 $a3, $f0 -/* 013E0 80B4FD70 E7A20010 */ swc1 $f2, 0x0010($sp) -/* 013E4 80B4FD74 AFAF0014 */ sw $t7, 0x0014($sp) -/* 013E8 80B4FD78 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 013EC 80B4FD7C E7A80018 */ swc1 $f8, 0x0018($sp) -/* 013F0 80B4FD80 8FBF0024 */ lw $ra, 0x0024($sp) +/* 013D0 80B4FD60 93AF0033 */ lbu $t7, 0x0033($sp) +/* 013D4 80B4FD64 C7A80034 */ lwc1 $f8, 0x0034($sp) +/* 013D8 80B4FD68 44066000 */ mfc1 $a2, $f12 +/* 013DC 80B4FD6C 44070000 */ mfc1 $a3, $f0 +/* 013E0 80B4FD70 E7A20010 */ swc1 $f2, 0x0010($sp) +/* 013E4 80B4FD74 AFAF0014 */ sw $t7, 0x0014($sp) +/* 013E8 80B4FD78 0C029468 */ jal SkelAnime_ChangeAnim + +/* 013EC 80B4FD7C E7A80018 */ swc1 $f8, 0x0018($sp) +/* 013F0 80B4FD80 8FBF0024 */ lw $ra, 0x0024($sp) /* 013F4 80B4FD84 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 013F8 80B4FD88 03E00008 */ jr $ra +/* 013F8 80B4FD88 03E00008 */ jr $ra /* 013FC 80B4FD8C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B50304.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B50304.s index bf0d349d09..ecc83072e0 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B50304.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B50304.s @@ -37,7 +37,7 @@ glabel func_80B50304 /* 01A00 80B50390 A06C0014 */ sb $t4, 0x0014($v1) ## 000000C8 /* 01A04 80B50394 AFA30028 */ sw $v1, 0x0028($sp) /* 01A08 80B50398 C7AE0030 */ lwc1 $f14, 0x0030($sp) -/* 01A0C 80B5039C 0C03F494 */ jal func_800FD250 +/* 01A0C 80B5039C 0C03F494 */ jal Math_atan2f /* 01A10 80B503A0 C7AC0034 */ lwc1 $f12, 0x0034($sp) /* 01A14 80B503A4 3C0180B5 */ lui $at, %hi(D_80B52BD8) ## $at = 80B50000 /* 01A18 80B503A8 C4322BD8 */ lwc1 $f18, %lo(D_80B52BD8)($at) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B523C8.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B523C8.s index e5237a859f..9992002616 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B523C8.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B523C8.s @@ -1,91 +1,91 @@ glabel func_80B523C8 /* 03A38 80B523C8 27BDFF78 */ addiu $sp, $sp, 0xFF78 ## $sp = FFFFFF78 -/* 03A3C 80B523CC AFBF002C */ sw $ra, 0x002C($sp) -/* 03A40 80B523D0 AFB10028 */ sw $s1, 0x0028($sp) -/* 03A44 80B523D4 AFB00024 */ sw $s0, 0x0024($sp) -/* 03A48 80B523D8 AFA5008C */ sw $a1, 0x008C($sp) +/* 03A3C 80B523CC AFBF002C */ sw $ra, 0x002C($sp) +/* 03A40 80B523D0 AFB10028 */ sw $s1, 0x0028($sp) +/* 03A44 80B523D4 AFB00024 */ sw $s0, 0x0024($sp) +/* 03A48 80B523D8 AFA5008C */ sw $a1, 0x008C($sp) /* 03A4C 80B523DC 84820190 */ lh $v0, 0x0190($a0) ## 00000190 /* 03A50 80B523E0 84830194 */ lh $v1, 0x0194($a0) ## 00000194 /* 03A54 80B523E4 3C0980B5 */ lui $t1, %hi(D_80B52810) ## $t1 = 80B50000 /* 03A58 80B523E8 25292810 */ addiu $t1, $t1, %lo(D_80B52810) ## $t1 = 80B52810 -/* 03A5C 80B523EC 00027080 */ sll $t6, $v0, 2 -/* 03A60 80B523F0 0003C880 */ sll $t9, $v1, 2 -/* 03A64 80B523F4 012E7821 */ addu $t7, $t1, $t6 -/* 03A68 80B523F8 01395021 */ addu $t2, $t1, $t9 +/* 03A5C 80B523EC 00027080 */ sll $t6, $v0, 2 +/* 03A60 80B523F0 0003C880 */ sll $t9, $v1, 2 +/* 03A64 80B523F4 012E7821 */ addu $t7, $t1, $t6 +/* 03A68 80B523F8 01395021 */ addu $t2, $t1, $t9 /* 03A6C 80B523FC 8DF80000 */ lw $t8, 0x0000($t7) ## 00000000 /* 03A70 80B52400 8D4B0000 */ lw $t3, 0x0000($t2) ## 00000000 /* 03A74 80B52404 3C0D80B5 */ lui $t5, %hi(D_80B52834) ## $t5 = 80B50000 -/* 03A78 80B52408 AFB80074 */ sw $t8, 0x0074($sp) -/* 03A7C 80B5240C AFAB0070 */ sw $t3, 0x0070($sp) +/* 03A78 80B52408 AFB80074 */ sw $t8, 0x0074($sp) +/* 03A7C 80B5240C AFAB0070 */ sw $t3, 0x0070($sp) /* 03A80 80B52410 84880198 */ lh $t0, 0x0198($a0) ## 00000198 /* 03A84 80B52414 00808825 */ or $s1, $a0, $zero ## $s1 = 00000000 /* 03A88 80B52418 3C0680B5 */ lui $a2, %hi(D_80B52B38) ## $a2 = 80B50000 -/* 03A8C 80B5241C 00086080 */ sll $t4, $t0, 2 -/* 03A90 80B52420 01AC6821 */ addu $t5, $t5, $t4 -/* 03A94 80B52424 8DAD2834 */ lw $t5, %lo(D_80B52834)($t5) +/* 03A8C 80B5241C 00086080 */ sll $t4, $t0, 2 +/* 03A90 80B52420 01AC6821 */ addu $t5, $t5, $t4 +/* 03A94 80B52424 8DAD2834 */ lw $t5, %lo(D_80B52834)($t5) /* 03A98 80B52428 24C62B38 */ addiu $a2, $a2, %lo(D_80B52B38) ## $a2 = 80B52B38 /* 03A9C 80B5242C 27A4004C */ addiu $a0, $sp, 0x004C ## $a0 = FFFFFFC4 -/* 03AA0 80B52430 AFAD0064 */ sw $t5, 0x0064($sp) +/* 03AA0 80B52430 AFAD0064 */ sw $t5, 0x0064($sp) /* 03AA4 80B52434 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 /* 03AA8 80B52438 24070657 */ addiu $a3, $zero, 0x0657 ## $a3 = 00000657 -/* 03AAC 80B5243C 0C031AB1 */ jal func_800C6AC4 +/* 03AAC 80B5243C 0C031AB1 */ jal Graph_OpenDisps /* 03AB0 80B52440 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 -/* 03AB4 80B52444 8FAF008C */ lw $t7, 0x008C($sp) -/* 03AB8 80B52448 0C024F46 */ jal func_80093D18 +/* 03AB4 80B52444 8FAF008C */ lw $t7, 0x008C($sp) +/* 03AB8 80B52448 0C024F46 */ jal func_80093D18 /* 03ABC 80B5244C 8DE40000 */ lw $a0, 0x0000($t7) ## 00000000 -/* 03AC0 80B52450 8FA70074 */ lw $a3, 0x0074($sp) +/* 03AC0 80B52450 8FA70074 */ lw $a3, 0x0074($sp) /* 03AC4 80B52454 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 /* 03AC8 80B52458 3C048016 */ lui $a0, 0x8016 ## $a0 = 80160000 -/* 03ACC 80B5245C 00075100 */ sll $t2, $a3, 4 -/* 03AD0 80B52460 000A5F02 */ srl $t3, $t2, 28 +/* 03ACC 80B5245C 00075100 */ sll $t2, $a3, 4 +/* 03AD0 80B52460 000A5F02 */ srl $t3, $t2, 28 /* 03AD4 80B52464 3C19DB06 */ lui $t9, 0xDB06 ## $t9 = DB060000 /* 03AD8 80B52468 24580008 */ addiu $t8, $v0, 0x0008 ## $t8 = 00000008 /* 03ADC 80B5246C AE1802C0 */ sw $t8, 0x02C0($s0) ## 000002C0 /* 03AE0 80B52470 37390020 */ ori $t9, $t9, 0x0020 ## $t9 = DB060020 -/* 03AE4 80B52474 000B6080 */ sll $t4, $t3, 2 +/* 03AE4 80B52474 000B6080 */ sll $t4, $t3, 2 /* 03AE8 80B52478 24846FA8 */ addiu $a0, $a0, 0x6FA8 ## $a0 = 80166FA8 -/* 03AEC 80B5247C 008C6821 */ addu $t5, $a0, $t4 +/* 03AEC 80B5247C 008C6821 */ addu $t5, $a0, $t4 /* 03AF0 80B52480 AC590000 */ sw $t9, 0x0000($v0) ## 00000000 /* 03AF4 80B52484 8DAE0000 */ lw $t6, 0x0000($t5) ## 00000000 /* 03AF8 80B52488 3C0500FF */ lui $a1, 0x00FF ## $a1 = 00FF0000 /* 03AFC 80B5248C 34A5FFFF */ ori $a1, $a1, 0xFFFF ## $a1 = 00FFFFFF -/* 03B00 80B52490 00E57824 */ and $t7, $a3, $a1 +/* 03B00 80B52490 00E57824 */ and $t7, $a3, $a1 /* 03B04 80B52494 3C068000 */ lui $a2, 0x8000 ## $a2 = 80000000 -/* 03B08 80B52498 01CFC021 */ addu $t8, $t6, $t7 -/* 03B0C 80B5249C 0306C821 */ addu $t9, $t8, $a2 +/* 03B08 80B52498 01CFC021 */ addu $t8, $t6, $t7 +/* 03B0C 80B5249C 0306C821 */ addu $t9, $t8, $a2 /* 03B10 80B524A0 AC590004 */ sw $t9, 0x0004($v0) ## 00000004 -/* 03B14 80B524A4 8FA70070 */ lw $a3, 0x0070($sp) +/* 03B14 80B524A4 8FA70070 */ lw $a3, 0x0070($sp) /* 03B18 80B524A8 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 /* 03B1C 80B524AC 3C0BDB06 */ lui $t3, 0xDB06 ## $t3 = DB060000 -/* 03B20 80B524B0 00076100 */ sll $t4, $a3, 4 -/* 03B24 80B524B4 000C6F02 */ srl $t5, $t4, 28 +/* 03B20 80B524B0 00076100 */ sll $t4, $a3, 4 +/* 03B24 80B524B4 000C6F02 */ srl $t5, $t4, 28 /* 03B28 80B524B8 244A0008 */ addiu $t2, $v0, 0x0008 ## $t2 = 00000008 /* 03B2C 80B524BC AE0A02C0 */ sw $t2, 0x02C0($s0) ## 000002C0 -/* 03B30 80B524C0 000D7080 */ sll $t6, $t5, 2 +/* 03B30 80B524C0 000D7080 */ sll $t6, $t5, 2 /* 03B34 80B524C4 356B0024 */ ori $t3, $t3, 0x0024 ## $t3 = DB060024 -/* 03B38 80B524C8 008E7821 */ addu $t7, $a0, $t6 +/* 03B38 80B524C8 008E7821 */ addu $t7, $a0, $t6 /* 03B3C 80B524CC AC4B0000 */ sw $t3, 0x0000($v0) ## 00000000 /* 03B40 80B524D0 8DF80000 */ lw $t8, 0x0000($t7) ## 00000000 -/* 03B44 80B524D4 00E5C824 */ and $t9, $a3, $a1 +/* 03B44 80B524D4 00E5C824 */ and $t9, $a3, $a1 /* 03B48 80B524D8 3C0DDB06 */ lui $t5, 0xDB06 ## $t5 = DB060000 -/* 03B4C 80B524DC 03195021 */ addu $t2, $t8, $t9 -/* 03B50 80B524E0 01465821 */ addu $t3, $t2, $a2 +/* 03B4C 80B524DC 03195021 */ addu $t2, $t8, $t9 +/* 03B50 80B524E0 01465821 */ addu $t3, $t2, $a2 /* 03B54 80B524E4 AC4B0004 */ sw $t3, 0x0004($v0) ## 00000004 -/* 03B58 80B524E8 8FA70064 */ lw $a3, 0x0064($sp) +/* 03B58 80B524E8 8FA70064 */ lw $a3, 0x0064($sp) /* 03B5C 80B524EC 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 /* 03B60 80B524F0 35AD0028 */ ori $t5, $t5, 0x0028 ## $t5 = DB060028 -/* 03B64 80B524F4 00077100 */ sll $t6, $a3, 4 -/* 03B68 80B524F8 000E7F02 */ srl $t7, $t6, 28 +/* 03B64 80B524F4 00077100 */ sll $t6, $a3, 4 +/* 03B68 80B524F8 000E7F02 */ srl $t7, $t6, 28 /* 03B6C 80B524FC 244C0008 */ addiu $t4, $v0, 0x0008 ## $t4 = 00000008 /* 03B70 80B52500 AE0C02C0 */ sw $t4, 0x02C0($s0) ## 000002C0 -/* 03B74 80B52504 000FC080 */ sll $t8, $t7, 2 -/* 03B78 80B52508 0098C821 */ addu $t9, $a0, $t8 +/* 03B74 80B52504 000FC080 */ sll $t8, $t7, 2 +/* 03B78 80B52508 0098C821 */ addu $t9, $a0, $t8 /* 03B7C 80B5250C AC4D0000 */ sw $t5, 0x0000($v0) ## 00000000 /* 03B80 80B52510 8F2A0000 */ lw $t2, 0x0000($t9) ## DB060020 -/* 03B84 80B52514 00E55824 */ and $t3, $a3, $a1 +/* 03B84 80B52514 00E55824 */ and $t3, $a3, $a1 /* 03B88 80B52518 241800FF */ addiu $t8, $zero, 0x00FF ## $t8 = 000000FF -/* 03B8C 80B5251C 014B6021 */ addu $t4, $t2, $t3 -/* 03B90 80B52520 01866821 */ addu $t5, $t4, $a2 +/* 03B8C 80B5251C 014B6021 */ addu $t4, $t2, $t3 +/* 03B90 80B52520 01866821 */ addu $t5, $t4, $a2 /* 03B94 80B52524 AC4D0004 */ sw $t5, 0x0004($v0) ## 00000004 /* 03B98 80B52528 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 /* 03B9C 80B5252C 3C0FFB00 */ lui $t7, 0xFB00 ## $t7 = FB000000 @@ -110,25 +110,25 @@ glabel func_80B523C8 /* 03BE8 80B52578 3C0C80B5 */ lui $t4, %hi(func_80B52348) ## $t4 = 80B50000 /* 03BEC 80B5257C 258C2348 */ addiu $t4, $t4, %lo(func_80B52348) ## $t4 = 80B52348 /* 03BF0 80B52580 25ADFB74 */ addiu $t5, $t5, %lo(func_80B4FB74) ## $t5 = 80B4FB74 -/* 03BF4 80B52584 AFAD0014 */ sw $t5, 0x0014($sp) -/* 03BF8 80B52588 AFAC0010 */ sw $t4, 0x0010($sp) -/* 03BFC 80B5258C AFB10018 */ sw $s1, 0x0018($sp) +/* 03BF4 80B52584 AFAD0014 */ sw $t5, 0x0014($sp) +/* 03BF8 80B52588 AFAC0010 */ sw $t4, 0x0010($sp) +/* 03BFC 80B5258C AFB10018 */ sw $s1, 0x0018($sp) /* 03C00 80B52590 8E0E02C0 */ lw $t6, 0x02C0($s0) ## 000002C0 -/* 03C04 80B52594 8FA4008C */ lw $a0, 0x008C($sp) -/* 03C08 80B52598 0C0289CF */ jal func_800A273C -/* 03C0C 80B5259C AFAE001C */ sw $t6, 0x001C($sp) +/* 03C04 80B52594 8FA4008C */ lw $a0, 0x008C($sp) +/* 03C08 80B52598 0C0289CF */ jal SkelAnime_DrawSV2 +/* 03C0C 80B5259C AFAE001C */ sw $t6, 0x001C($sp) /* 03C10 80B525A0 AE0202C0 */ sw $v0, 0x02C0($s0) ## 000002C0 -/* 03C14 80B525A4 8FAF008C */ lw $t7, 0x008C($sp) +/* 03C14 80B525A4 8FAF008C */ lw $t7, 0x008C($sp) /* 03C18 80B525A8 3C0680B5 */ lui $a2, %hi(D_80B52B48) ## $a2 = 80B50000 /* 03C1C 80B525AC 24C62B48 */ addiu $a2, $a2, %lo(D_80B52B48) ## $a2 = 80B52B48 /* 03C20 80B525B0 27A4004C */ addiu $a0, $sp, 0x004C ## $a0 = FFFFFFC4 /* 03C24 80B525B4 24070670 */ addiu $a3, $zero, 0x0670 ## $a3 = 00000670 -/* 03C28 80B525B8 0C031AD5 */ jal func_800C6B54 +/* 03C28 80B525B8 0C031AD5 */ jal Graph_CloseDisps /* 03C2C 80B525BC 8DE50000 */ lw $a1, 0x0000($t7) ## 00000000 -/* 03C30 80B525C0 8FBF002C */ lw $ra, 0x002C($sp) -/* 03C34 80B525C4 8FB00024 */ lw $s0, 0x0024($sp) -/* 03C38 80B525C8 8FB10028 */ lw $s1, 0x0028($sp) -/* 03C3C 80B525CC 03E00008 */ jr $ra +/* 03C30 80B525C0 8FBF002C */ lw $ra, 0x002C($sp) +/* 03C34 80B525C4 8FB00024 */ lw $s0, 0x0024($sp) +/* 03C38 80B525C8 8FB10028 */ lw $s1, 0x0028($sp) +/* 03C3C 80B525CC 03E00008 */ jr $ra /* 03C40 80B525D0 27BD0088 */ addiu $sp, $sp, 0x0088 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B525D4.s b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B525D4.s index 345a56565f..d0914cc134 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B525D4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl2/func_80B525D4.s @@ -1,52 +1,52 @@ glabel func_80B525D4 /* 03C44 80B525D4 27BDFF78 */ addiu $sp, $sp, 0xFF78 ## $sp = FFFFFF78 -/* 03C48 80B525D8 AFBF002C */ sw $ra, 0x002C($sp) -/* 03C4C 80B525DC AFB10028 */ sw $s1, 0x0028($sp) -/* 03C50 80B525E0 AFB00024 */ sw $s0, 0x0024($sp) -/* 03C54 80B525E4 AFA5008C */ sw $a1, 0x008C($sp) +/* 03C48 80B525D8 AFBF002C */ sw $ra, 0x002C($sp) +/* 03C4C 80B525DC AFB10028 */ sw $s1, 0x0028($sp) +/* 03C50 80B525E0 AFB00024 */ sw $s0, 0x0024($sp) +/* 03C54 80B525E4 AFA5008C */ sw $a1, 0x008C($sp) /* 03C58 80B525E8 84820190 */ lh $v0, 0x0190($a0) ## 00000190 /* 03C5C 80B525EC 3C0F80B5 */ lui $t7, %hi(D_80B52810) ## $t7 = 80B50000 /* 03C60 80B525F0 3C1980B5 */ lui $t9, %hi(D_80B52834) ## $t9 = 80B50000 -/* 03C64 80B525F4 00027080 */ sll $t6, $v0, 2 -/* 03C68 80B525F8 01EE7821 */ addu $t7, $t7, $t6 -/* 03C6C 80B525FC 8DEF2810 */ lw $t7, %lo(D_80B52810)($t7) +/* 03C64 80B525F4 00027080 */ sll $t6, $v0, 2 +/* 03C68 80B525F8 01EE7821 */ addu $t7, $t7, $t6 +/* 03C6C 80B525FC 8DEF2810 */ lw $t7, %lo(D_80B52810)($t7) /* 03C70 80B52600 00808825 */ or $s1, $a0, $zero ## $s1 = 00000000 /* 03C74 80B52604 3C0680B5 */ lui $a2, %hi(D_80B52B58) ## $a2 = 80B50000 -/* 03C78 80B52608 AFAF0078 */ sw $t7, 0x0078($sp) +/* 03C78 80B52608 AFAF0078 */ sw $t7, 0x0078($sp) /* 03C7C 80B5260C 84830198 */ lh $v1, 0x0198($a0) ## 00000198 /* 03C80 80B52610 27A40054 */ addiu $a0, $sp, 0x0054 ## $a0 = FFFFFFCC /* 03C84 80B52614 24C62B58 */ addiu $a2, $a2, %lo(D_80B52B58) ## $a2 = 80B52B58 -/* 03C88 80B52618 0003C080 */ sll $t8, $v1, 2 -/* 03C8C 80B5261C 0338C821 */ addu $t9, $t9, $t8 -/* 03C90 80B52620 8F392834 */ lw $t9, %lo(D_80B52834)($t9) +/* 03C88 80B52618 0003C080 */ sll $t8, $v1, 2 +/* 03C8C 80B5261C 0338C821 */ addu $t9, $t9, $t8 +/* 03C90 80B52620 8F392834 */ lw $t9, %lo(D_80B52834)($t9) /* 03C94 80B52624 2407067F */ addiu $a3, $zero, 0x067F ## $a3 = 0000067F -/* 03C98 80B52628 AFB9006C */ sw $t9, 0x006C($sp) +/* 03C98 80B52628 AFB9006C */ sw $t9, 0x006C($sp) /* 03C9C 80B5262C 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 -/* 03CA0 80B52630 0C031AB1 */ jal func_800C6AC4 +/* 03CA0 80B52630 0C031AB1 */ jal Graph_OpenDisps /* 03CA4 80B52634 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 -/* 03CA8 80B52638 8FAB008C */ lw $t3, 0x008C($sp) -/* 03CAC 80B5263C 0C024F61 */ jal func_80093D84 +/* 03CA8 80B52638 8FAB008C */ lw $t3, 0x008C($sp) +/* 03CAC 80B5263C 0C024F61 */ jal func_80093D84 /* 03CB0 80B52640 8D640000 */ lw $a0, 0x0000($t3) ## 00000000 -/* 03CB4 80B52644 8FA90078 */ lw $t1, 0x0078($sp) +/* 03CB4 80B52644 8FA90078 */ lw $t1, 0x0078($sp) /* 03CB8 80B52648 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 /* 03CBC 80B5264C 3C078016 */ lui $a3, 0x8016 ## $a3 = 80160000 -/* 03CC0 80B52650 00097100 */ sll $t6, $t1, 4 -/* 03CC4 80B52654 000E7F02 */ srl $t7, $t6, 28 +/* 03CC0 80B52650 00097100 */ sll $t6, $t1, 4 +/* 03CC4 80B52654 000E7F02 */ srl $t7, $t6, 28 /* 03CC8 80B52658 3C0DDB06 */ lui $t5, 0xDB06 ## $t5 = DB060000 /* 03CCC 80B5265C 244C0008 */ addiu $t4, $v0, 0x0008 ## $t4 = 00000008 /* 03CD0 80B52660 AE0C02D0 */ sw $t4, 0x02D0($s0) ## 000002D0 /* 03CD4 80B52664 35AD0020 */ ori $t5, $t5, 0x0020 ## $t5 = DB060020 -/* 03CD8 80B52668 000FC080 */ sll $t8, $t7, 2 +/* 03CD8 80B52668 000FC080 */ sll $t8, $t7, 2 /* 03CDC 80B5266C 24E76FA8 */ addiu $a3, $a3, 0x6FA8 ## $a3 = 80166FA8 -/* 03CE0 80B52670 00F82021 */ addu $a0, $a3, $t8 +/* 03CE0 80B52670 00F82021 */ addu $a0, $a3, $t8 /* 03CE4 80B52674 AC4D0000 */ sw $t5, 0x0000($v0) ## 00000000 /* 03CE8 80B52678 8C990000 */ lw $t9, 0x0000($a0) ## 00000000 /* 03CEC 80B5267C 3C0800FF */ lui $t0, 0x00FF ## $t0 = 00FF0000 /* 03CF0 80B52680 3508FFFF */ ori $t0, $t0, 0xFFFF ## $t0 = 00FFFFFF -/* 03CF4 80B52684 01282824 */ and $a1, $t1, $t0 +/* 03CF4 80B52684 01282824 */ and $a1, $t1, $t0 /* 03CF8 80B52688 3C068000 */ lui $a2, 0x8000 ## $a2 = 80000000 -/* 03CFC 80B5268C 03255021 */ addu $t2, $t9, $a1 -/* 03D00 80B52690 01465821 */ addu $t3, $t2, $a2 +/* 03CFC 80B5268C 03255021 */ addu $t2, $t9, $a1 +/* 03D00 80B52690 01465821 */ addu $t3, $t2, $a2 /* 03D04 80B52694 AC4B0004 */ sw $t3, 0x0004($v0) ## 00000004 /* 03D08 80B52698 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 /* 03D0C 80B5269C 3C0DDB06 */ lui $t5, 0xDB06 ## $t5 = DB060000 @@ -57,23 +57,23 @@ glabel func_80B525D4 /* 03D20 80B526B0 8C8E0000 */ lw $t6, 0x0000($a0) ## 00000000 /* 03D24 80B526B4 3C0ADB06 */ lui $t2, 0xDB06 ## $t2 = DB060000 /* 03D28 80B526B8 354A0028 */ ori $t2, $t2, 0x0028 ## $t2 = DB060028 -/* 03D2C 80B526BC 01C57821 */ addu $t7, $t6, $a1 -/* 03D30 80B526C0 01E6C021 */ addu $t8, $t7, $a2 +/* 03D2C 80B526BC 01C57821 */ addu $t7, $t6, $a1 +/* 03D30 80B526C0 01E6C021 */ addu $t8, $t7, $a2 /* 03D34 80B526C4 AC580004 */ sw $t8, 0x0004($v0) ## 00000004 -/* 03D38 80B526C8 8FA4006C */ lw $a0, 0x006C($sp) +/* 03D38 80B526C8 8FA4006C */ lw $a0, 0x006C($sp) /* 03D3C 80B526CC 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 03D40 80B526D0 00045900 */ sll $t3, $a0, 4 -/* 03D44 80B526D4 000B6702 */ srl $t4, $t3, 28 +/* 03D40 80B526D0 00045900 */ sll $t3, $a0, 4 +/* 03D44 80B526D4 000B6702 */ srl $t4, $t3, 28 /* 03D48 80B526D8 24590008 */ addiu $t9, $v0, 0x0008 ## $t9 = 00000008 /* 03D4C 80B526DC AE1902D0 */ sw $t9, 0x02D0($s0) ## 000002D0 -/* 03D50 80B526E0 000C6880 */ sll $t5, $t4, 2 -/* 03D54 80B526E4 00ED7021 */ addu $t6, $a3, $t5 +/* 03D50 80B526E0 000C6880 */ sll $t5, $t4, 2 +/* 03D54 80B526E4 00ED7021 */ addu $t6, $a3, $t5 /* 03D58 80B526E8 AC4A0000 */ sw $t2, 0x0000($v0) ## 00000000 /* 03D5C 80B526EC 8DCF0000 */ lw $t7, 0x0000($t6) ## 00000000 -/* 03D60 80B526F0 0088C024 */ and $t8, $a0, $t0 +/* 03D60 80B526F0 0088C024 */ and $t8, $a0, $t0 /* 03D64 80B526F4 3C0CFB00 */ lui $t4, 0xFB00 ## $t4 = FB000000 -/* 03D68 80B526F8 01F8C821 */ addu $t9, $t7, $t8 -/* 03D6C 80B526FC 03265021 */ addu $t2, $t9, $a2 +/* 03D68 80B526F8 01F8C821 */ addu $t9, $t7, $t8 +/* 03D6C 80B526FC 03265021 */ addu $t2, $t9, $a2 /* 03D70 80B52700 AC4A0004 */ sw $t2, 0x0004($v0) ## 00000004 /* 03D74 80B52704 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 /* 03D78 80B52708 3C198011 */ lui $t9, 0x8011 ## $t9 = 80110000 @@ -97,25 +97,25 @@ glabel func_80B525D4 /* 03DC0 80B52750 8C450004 */ lw $a1, 0x0004($v0) ## 00000150 /* 03DC4 80B52754 8C460020 */ lw $a2, 0x0020($v0) ## 0000016C /* 03DC8 80B52758 90470002 */ lbu $a3, 0x0002($v0) ## 0000014E -/* 03DCC 80B5275C AFB10018 */ sw $s1, 0x0018($sp) -/* 03DD0 80B52760 AFA00014 */ sw $zero, 0x0014($sp) -/* 03DD4 80B52764 AFAA0010 */ sw $t2, 0x0010($sp) +/* 03DCC 80B5275C AFB10018 */ sw $s1, 0x0018($sp) +/* 03DD0 80B52760 AFA00014 */ sw $zero, 0x0014($sp) +/* 03DD4 80B52764 AFAA0010 */ sw $t2, 0x0010($sp) /* 03DD8 80B52768 8E0B02D0 */ lw $t3, 0x02D0($s0) ## 000002D0 -/* 03DDC 80B5276C 8FA4008C */ lw $a0, 0x008C($sp) -/* 03DE0 80B52770 0C0289CF */ jal func_800A273C -/* 03DE4 80B52774 AFAB001C */ sw $t3, 0x001C($sp) +/* 03DDC 80B5276C 8FA4008C */ lw $a0, 0x008C($sp) +/* 03DE0 80B52770 0C0289CF */ jal SkelAnime_DrawSV2 +/* 03DE4 80B52774 AFAB001C */ sw $t3, 0x001C($sp) /* 03DE8 80B52778 AE0202D0 */ sw $v0, 0x02D0($s0) ## 000002D0 -/* 03DEC 80B5277C 8FAC008C */ lw $t4, 0x008C($sp) +/* 03DEC 80B5277C 8FAC008C */ lw $t4, 0x008C($sp) /* 03DF0 80B52780 3C0680B5 */ lui $a2, %hi(D_80B52B68) ## $a2 = 80B50000 /* 03DF4 80B52784 24C62B68 */ addiu $a2, $a2, %lo(D_80B52B68) ## $a2 = 80B52B68 /* 03DF8 80B52788 27A40054 */ addiu $a0, $sp, 0x0054 ## $a0 = FFFFFFCC /* 03DFC 80B5278C 2407069C */ addiu $a3, $zero, 0x069C ## $a3 = 0000069C -/* 03E00 80B52790 0C031AD5 */ jal func_800C6B54 +/* 03E00 80B52790 0C031AD5 */ jal Graph_CloseDisps /* 03E04 80B52794 8D850000 */ lw $a1, 0x0000($t4) ## 00000000 -/* 03E08 80B52798 8FBF002C */ lw $ra, 0x002C($sp) -/* 03E0C 80B5279C 8FB00024 */ lw $s0, 0x0024($sp) -/* 03E10 80B527A0 8FB10028 */ lw $s1, 0x0028($sp) -/* 03E14 80B527A4 03E00008 */ jr $ra +/* 03E08 80B52798 8FBF002C */ lw $ra, 0x002C($sp) +/* 03E0C 80B5279C 8FB00024 */ lw $s0, 0x0024($sp) +/* 03E10 80B527A0 8FB10028 */ lw $s1, 0x0028($sp) +/* 03E14 80B527A4 03E00008 */ jr $ra /* 03E18 80B527A8 27BD0088 */ addiu $sp, $sp, 0x0088 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/EnZl3_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/EnZl3_Init.s index 33b419a2e6..0c4959fc67 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/EnZl3_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl3/EnZl3_Init.s @@ -1,63 +1,63 @@ glabel EnZl3_Init /* 06AEC 80B59E9C 27BDFFB8 */ addiu $sp, $sp, 0xFFB8 ## $sp = FFFFFFB8 -/* 06AF0 80B59EA0 AFB00028 */ sw $s0, 0x0028($sp) +/* 06AF0 80B59EA0 AFB00028 */ sw $s0, 0x0028($sp) /* 06AF4 80B59EA4 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 06AF8 80B59EA8 AFBF002C */ sw $ra, 0x002C($sp) +/* 06AF8 80B59EA8 AFBF002C */ sw $ra, 0x002C($sp) /* 06AFC 80B59EAC 3C0480B6 */ lui $a0, %hi(D_80B5A994) ## $a0 = 80B60000 -/* 06B00 80B59EB0 AFA5004C */ sw $a1, 0x004C($sp) +/* 06B00 80B59EB0 AFA5004C */ sw $a1, 0x004C($sp) /* 06B04 80B59EB4 0C00084C */ jal osSyncPrintf - + /* 06B08 80B59EB8 2484A994 */ addiu $a0, $a0, %lo(D_80B5A994) ## $a0 = 80B5A994 /* 06B0C 80B59EBC 260400B4 */ addiu $a0, $s0, 0x00B4 ## $a0 = 000000B4 /* 06B10 80B59EC0 3C068003 */ lui $a2, 0x8003 ## $a2 = 80030000 /* 06B14 80B59EC4 24C6B5EC */ addiu $a2, $a2, 0xB5EC ## $a2 = 8002B5EC -/* 06B18 80B59EC8 AFA40034 */ sw $a0, 0x0034($sp) +/* 06B18 80B59EC8 AFA40034 */ sw $a0, 0x0034($sp) /* 06B1C 80B59ECC 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 /* 06B20 80B59ED0 0C00AC78 */ jal ActorShape_Init - + /* 06B24 80B59ED4 3C0741F0 */ lui $a3, 0x41F0 ## $a3 = 41F00000 -/* 06B28 80B59ED8 8FAE0034 */ lw $t6, 0x0034($sp) +/* 06B28 80B59ED8 8FAE0034 */ lw $t6, 0x0034($sp) /* 06B2C 80B59EDC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 06B30 80B59EE0 A1C00014 */ sb $zero, 0x0014($t6) ## 00000014 -/* 06B34 80B59EE4 0C2D4CEC */ jal func_80B533B0 -/* 06B38 80B59EE8 8FA5004C */ lw $a1, 0x004C($sp) +/* 06B34 80B59EE4 0C2D4CEC */ jal func_80B533B0 +/* 06B38 80B59EE8 8FA5004C */ lw $a1, 0x004C($sp) /* 06B3C 80B59EEC 3C060601 */ lui $a2, 0x0601 ## $a2 = 06010000 /* 06B40 80B59EF0 260F0190 */ addiu $t7, $s0, 0x0190 ## $t7 = 00000190 /* 06B44 80B59EF4 261801EA */ addiu $t8, $s0, 0x01EA ## $t8 = 000001EA /* 06B48 80B59EF8 2419000F */ addiu $t9, $zero, 0x000F ## $t9 = 0000000F -/* 06B4C 80B59EFC AFB90018 */ sw $t9, 0x0018($sp) -/* 06B50 80B59F00 AFB80014 */ sw $t8, 0x0014($sp) -/* 06B54 80B59F04 AFAF0010 */ sw $t7, 0x0010($sp) +/* 06B4C 80B59EFC AFB90018 */ sw $t9, 0x0018($sp) +/* 06B50 80B59F00 AFB80014 */ sw $t8, 0x0014($sp) +/* 06B54 80B59F04 AFAF0010 */ sw $t7, 0x0010($sp) /* 06B58 80B59F08 24C60D70 */ addiu $a2, $a2, 0x0D70 ## $a2 = 06010D70 -/* 06B5C 80B59F0C 8FA4004C */ lw $a0, 0x004C($sp) +/* 06B5C 80B59F0C 8FA4004C */ lw $a0, 0x004C($sp) /* 06B60 80B59F10 2605014C */ addiu $a1, $s0, 0x014C ## $a1 = 0000014C -/* 06B64 80B59F14 0C0291BE */ jal func_800A46F8 +/* 06B64 80B59F14 0C0291BE */ jal SkelAnime_InitSV /* 06B68 80B59F18 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 06B6C 80B59F1C 0C2D5375 */ jal func_80B54DD4 +/* 06B6C 80B59F1C 0C2D5375 */ jal func_80B54DD4 /* 06B70 80B59F20 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 06B74 80B59F24 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 06B78 80B59F28 10410005 */ beq $v0, $at, .L80B59F40 +/* 06B78 80B59F28 10410005 */ beq $v0, $at, .L80B59F40 /* 06B7C 80B59F2C 24010003 */ addiu $at, $zero, 0x0003 ## $at = 00000003 -/* 06B80 80B59F30 10410006 */ beq $v0, $at, .L80B59F4C +/* 06B80 80B59F30 10410006 */ beq $v0, $at, .L80B59F4C /* 06B84 80B59F34 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 06B88 80B59F38 10000006 */ beq $zero, $zero, .L80B59F54 +/* 06B88 80B59F38 10000006 */ beq $zero, $zero, .L80B59F54 /* 06B8C 80B59F3C 00000000 */ nop .L80B59F40: /* 06B90 80B59F40 3C018016 */ lui $at, 0x8016 ## $at = 80160000 -/* 06B94 80B59F44 10000003 */ beq $zero, $zero, .L80B59F54 +/* 06B94 80B59F44 10000003 */ beq $zero, $zero, .L80B59F54 /* 06B98 80B59F48 A420FA32 */ sh $zero, -0x05CE($at) ## 8015FA32 .L80B59F4C: -/* 06B9C 80B59F4C 0C2D66A0 */ jal func_80B59A80 -/* 06BA0 80B59F50 8FA5004C */ lw $a1, 0x004C($sp) +/* 06B9C 80B59F4C 0C2D66A0 */ jal func_80B59A80 +/* 06BA0 80B59F50 8FA5004C */ lw $a1, 0x004C($sp) .L80B59F54: /* 06BA4 80B59F54 3C0480B6 */ lui $a0, %hi(D_80B5A9D0) ## $a0 = 80B60000 /* 06BA8 80B59F58 0C00084C */ jal osSyncPrintf - + /* 06BAC 80B59F5C 2484A9D0 */ addiu $a0, $a0, %lo(D_80B5A9D0) ## $a0 = 80B5A9D0 -/* 06BB0 80B59F60 8FBF002C */ lw $ra, 0x002C($sp) -/* 06BB4 80B59F64 8FB00028 */ lw $s0, 0x0028($sp) +/* 06BB0 80B59F60 8FBF002C */ lw $ra, 0x002C($sp) +/* 06BB4 80B59F64 8FB00028 */ lw $s0, 0x0028($sp) /* 06BB8 80B59F68 27BD0048 */ addiu $sp, $sp, 0x0048 ## $sp = 00000000 -/* 06BBC 80B59F6C 03E00008 */ jr $ra +/* 06BBC 80B59F6C 03E00008 */ jr $ra /* 06BC0 80B59F70 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B5458C.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B5458C.s index 40b5d1f363..a80397ae19 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B5458C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B5458C.s @@ -1,83 +1,83 @@ glabel func_80B5458C /* 011DC 80B5458C 27BDFF70 */ addiu $sp, $sp, 0xFF70 ## $sp = FFFFFF70 /* 011E0 80B54590 2401000E */ addiu $at, $zero, 0x000E ## $at = 0000000E -/* 011E4 80B54594 AFBF0014 */ sw $ra, 0x0014($sp) -/* 011E8 80B54598 AFA40090 */ sw $a0, 0x0090($sp) -/* 011EC 80B5459C AFA60098 */ sw $a2, 0x0098($sp) -/* 011F0 80B545A0 14A101BF */ bne $a1, $at, .L80B54CA0 -/* 011F4 80B545A4 AFA7009C */ sw $a3, 0x009C($sp) +/* 011E4 80B54594 AFBF0014 */ sw $ra, 0x0014($sp) +/* 011E8 80B54598 AFA40090 */ sw $a0, 0x0090($sp) +/* 011EC 80B5459C AFA60098 */ sw $a2, 0x0098($sp) +/* 011F0 80B545A0 14A101BF */ bne $a1, $at, .L80B54CA0 +/* 011F4 80B545A4 AFA7009C */ sw $a3, 0x009C($sp) /* 011F8 80B545A8 8C840000 */ lw $a0, 0x0000($a0) ## 00000000 /* 011FC 80B545AC 0C031A73 */ jal Graph_Alloc - + /* 01200 80B545B0 240501C0 */ addiu $a1, $zero, 0x01C0 ## $a1 = 000001C0 -/* 01204 80B545B4 8FA800A0 */ lw $t0, 0x00A0($sp) -/* 01208 80B545B8 8FA300A4 */ lw $v1, 0x00A4($sp) -/* 0120C 80B545BC AFA20078 */ sw $v0, 0x0078($sp) +/* 01204 80B545B4 8FA800A0 */ lw $t0, 0x00A0($sp) +/* 01208 80B545B8 8FA300A4 */ lw $v1, 0x00A4($sp) +/* 0120C 80B545BC AFA20078 */ sw $v0, 0x0078($sp) /* 01210 80B545C0 850F0000 */ lh $t7, 0x0000($t0) ## 00000000 /* 01214 80B545C4 84780402 */ lh $t8, 0x0402($v1) ## 00000402 /* 01218 80B545C8 850A0004 */ lh $t2, 0x0004($t0) ## 00000004 /* 0121C 80B545CC 3C0EDB06 */ lui $t6, 0xDB06 ## $t6 = DB060000 -/* 01220 80B545D0 01F8C821 */ addu $t9, $t7, $t8 +/* 01220 80B545D0 01F8C821 */ addu $t9, $t7, $t8 /* 01224 80B545D4 A5190000 */ sh $t9, 0x0000($t0) ## 00000000 /* 01228 80B545D8 846B0400 */ lh $t3, 0x0400($v1) ## 00000400 /* 0122C 80B545DC 35CE0030 */ ori $t6, $t6, 0x0030 ## $t6 = DB060030 /* 01230 80B545E0 24630400 */ addiu $v1, $v1, 0x0400 ## $v1 = 00000400 -/* 01234 80B545E4 014B6021 */ addu $t4, $t2, $t3 +/* 01234 80B545E4 014B6021 */ addu $t4, $t2, $t3 /* 01238 80B545E8 A50C0004 */ sh $t4, 0x0004($t0) ## 00000004 -/* 0123C 80B545EC 8FA500A8 */ lw $a1, 0x00A8($sp) +/* 0123C 80B545EC 8FA500A8 */ lw $a1, 0x00A8($sp) /* 01240 80B545F0 8CA40000 */ lw $a0, 0x0000($a1) ## 00000000 /* 01244 80B545F4 248D0008 */ addiu $t5, $a0, 0x0008 ## $t5 = 00000008 /* 01248 80B545F8 ACAD0000 */ sw $t5, 0x0000($a1) ## 00000000 /* 0124C 80B545FC AC820004 */ sw $v0, 0x0004($a0) ## 00000004 -/* 01250 80B54600 0C034213 */ jal Matrix_Push +/* 01250 80B54600 0C034213 */ jal Matrix_Push /* 01254 80B54604 AC8E0000 */ sw $t6, 0x0000($a0) ## 00000000 -/* 01258 80B54608 8FA9009C */ lw $t1, 0x009C($sp) +/* 01258 80B54608 8FA9009C */ lw $t1, 0x009C($sp) /* 0125C 80B5460C 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 /* 01260 80B54610 C52C0000 */ lwc1 $f12, 0x0000($t1) ## 00000000 /* 01264 80B54614 C52E0004 */ lwc1 $f14, 0x0004($t1) ## 00000004 -/* 01268 80B54618 0C034261 */ jal Matrix_Translate +/* 01268 80B54618 0C034261 */ jal Matrix_Translate /* 0126C 80B5461C 8D260008 */ lw $a2, 0x0008($t1) ## 00000008 -/* 01270 80B54620 8FA800A0 */ lw $t0, 0x00A0($sp) +/* 01270 80B54620 8FA800A0 */ lw $t0, 0x00A0($sp) /* 01274 80B54624 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 /* 01278 80B54628 85040000 */ lh $a0, 0x0000($t0) ## 00000000 /* 0127C 80B5462C 85050002 */ lh $a1, 0x0002($t0) ## 00000002 -/* 01280 80B54630 0C034421 */ jal Matrix_RotateXYZ +/* 01280 80B54630 0C034421 */ jal Matrix_RotateZYX /* 01284 80B54634 85060004 */ lh $a2, 0x0004($t0) ## 00000004 -/* 01288 80B54638 0C034213 */ jal Matrix_Push +/* 01288 80B54638 0C034213 */ jal Matrix_Push /* 0128C 80B5463C 00000000 */ nop /* 01290 80B54640 3C0143B5 */ lui $at, 0x43B5 ## $at = 43B50000 /* 01294 80B54644 44816000 */ mtc1 $at, $f12 ## $f12 = 362.00 /* 01298 80B54648 3C01C305 */ lui $at, 0xC305 ## $at = C3050000 /* 0129C 80B5464C 44817000 */ mtc1 $at, $f14 ## $f14 = -133.00 /* 012A0 80B54650 24060000 */ addiu $a2, $zero, 0x0000 ## $a2 = 00000000 -/* 012A4 80B54654 0C034261 */ jal Matrix_Translate +/* 012A4 80B54654 0C034261 */ jal Matrix_Translate /* 012A8 80B54658 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 012AC 80B5465C 0C034236 */ jal Matrix_Get +/* 012AC 80B5465C 0C034236 */ jal Matrix_Get /* 012B0 80B54660 27A40038 */ addiu $a0, $sp, 0x0038 ## $a0 = FFFFFFA8 /* 012B4 80B54664 27A40038 */ addiu $a0, $sp, 0x0038 ## $a0 = FFFFFFA8 /* 012B8 80B54668 27A50030 */ addiu $a1, $sp, 0x0030 ## $a1 = FFFFFFA0 -/* 012BC 80B5466C 0C034833 */ jal func_800D20CC +/* 012BC 80B5466C 0C034833 */ jal func_800D20CC /* 012C0 80B54670 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 012C4 80B54674 0C03034A */ jal func_800C0D28 -/* 012C8 80B54678 8FA40090 */ lw $a0, 0x0090($sp) -/* 012CC 80B5467C 1440000D */ bne $v0, $zero, .L80B546B4 +/* 012C4 80B54674 0C03034A */ jal func_800C0D28 +/* 012C8 80B54678 8FA40090 */ lw $a0, 0x0090($sp) +/* 012CC 80B5467C 1440000D */ bne $v0, $zero, .L80B546B4 /* 012D0 80B54680 00000000 */ nop -/* 012D4 80B54684 8FA400A4 */ lw $a0, 0x00A4($sp) -/* 012D8 80B54688 87A50032 */ lh $a1, 0x0032($sp) -/* 012DC 80B5468C 0C2D4E60 */ jal func_80B53980 +/* 012D4 80B54684 8FA400A4 */ lw $a0, 0x00A4($sp) +/* 012D8 80B54688 87A50032 */ lh $a1, 0x0032($sp) +/* 012DC 80B5468C 0C2D4E60 */ jal func_80B53980 /* 012E0 80B54690 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 012E4 80B54694 8FA400A4 */ lw $a0, 0x00A4($sp) -/* 012E8 80B54698 87A50030 */ lh $a1, 0x0030($sp) -/* 012EC 80B5469C 0C2D50D8 */ jal func_80B54360 +/* 012E4 80B54694 8FA400A4 */ lw $a0, 0x00A4($sp) +/* 012E8 80B54698 87A50030 */ lh $a1, 0x0030($sp) +/* 012EC 80B5469C 0C2D50D8 */ jal func_80B54360 /* 012F0 80B546A0 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 -/* 012F4 80B546A4 8FA400A4 */ lw $a0, 0x00A4($sp) -/* 012F8 80B546A8 87A50034 */ lh $a1, 0x0034($sp) -/* 012FC 80B546AC 0C2D4ED9 */ jal func_80B53B64 +/* 012F4 80B546A4 8FA400A4 */ lw $a0, 0x00A4($sp) +/* 012F8 80B546A8 87A50034 */ lh $a1, 0x0034($sp) +/* 012FC 80B546AC 0C2D4ED9 */ jal func_80B53B64 /* 01300 80B546B0 24060002 */ addiu $a2, $zero, 0x0002 ## $a2 = 00000002 .L80B546B4: /* 01304 80B546B4 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 /* 01308 80B546B8 8C42FA90 */ lw $v0, -0x0570($v0) ## 8015FA90 -/* 0130C 80B546BC 8FA300A4 */ lw $v1, 0x00A4($sp) +/* 0130C 80B546BC 8FA300A4 */ lw $v1, 0x00A4($sp) /* 01310 80B546C0 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 /* 01314 80B546C4 844F1492 */ lh $t7, 0x1492($v0) ## 80161492 /* 01318 80B546C8 84591494 */ lh $t9, 0x1494($v0) ## 80161494 @@ -85,47 +85,47 @@ glabel func_80B5458C /* 01320 80B546D0 846C0290 */ lh $t4, 0x0290($v1) ## 00000290 /* 01324 80B546D4 846A028E */ lh $t2, 0x028E($v1) ## 0000028E /* 01328 80B546D8 8478028C */ lh $t8, 0x028C($v1) ## 0000028C -/* 0132C 80B546DC 016C3021 */ addu $a2, $t3, $t4 -/* 01330 80B546E0 032A2821 */ addu $a1, $t9, $t2 -/* 01334 80B546E4 01F82021 */ addu $a0, $t7, $t8 -/* 01338 80B546E8 00042400 */ sll $a0, $a0, 16 -/* 0133C 80B546EC 00052C00 */ sll $a1, $a1, 16 -/* 01340 80B546F0 00063400 */ sll $a2, $a2, 16 +/* 0132C 80B546DC 016C3021 */ addu $a2, $t3, $t4 +/* 01330 80B546E0 032A2821 */ addu $a1, $t9, $t2 +/* 01334 80B546E4 01F82021 */ addu $a0, $t7, $t8 +/* 01338 80B546E8 00042400 */ sll $a0, $a0, 16 +/* 0133C 80B546EC 00052C00 */ sll $a1, $a1, 16 +/* 01340 80B546F0 00063400 */ sll $a2, $a2, 16 /* 01344 80B546F4 2463028C */ addiu $v1, $v1, 0x028C ## $v1 = 0000028C -/* 01348 80B546F8 AFA30020 */ sw $v1, 0x0020($sp) -/* 0134C 80B546FC 00063403 */ sra $a2, $a2, 16 -/* 01350 80B54700 00052C03 */ sra $a1, $a1, 16 -/* 01354 80B54704 0C034421 */ jal Matrix_RotateXYZ -/* 01358 80B54708 00042403 */ sra $a0, $a0, 16 +/* 01348 80B546F8 AFA30020 */ sw $v1, 0x0020($sp) +/* 0134C 80B546FC 00063403 */ sra $a2, $a2, 16 +/* 01350 80B54700 00052C03 */ sra $a1, $a1, 16 +/* 01354 80B54704 0C034421 */ jal Matrix_RotateZYX +/* 01358 80B54708 00042403 */ sra $a0, $a0, 16 /* 0135C 80B5470C 3C01C33C */ lui $at, 0xC33C ## $at = C33C0000 /* 01360 80B54710 44816000 */ mtc1 $at, $f12 ## $f12 = -188.00 /* 01364 80B54714 3C01C338 */ lui $at, 0xC338 ## $at = C3380000 /* 01368 80B54718 44817000 */ mtc1 $at, $f14 ## $f14 = -184.00 /* 0136C 80B5471C 24060000 */ addiu $a2, $zero, 0x0000 ## $a2 = 00000000 -/* 01370 80B54720 0C034261 */ jal Matrix_Translate +/* 01370 80B54720 0C034261 */ jal Matrix_Translate /* 01374 80B54724 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 /* 01378 80B54728 3C0580B6 */ lui $a1, %hi(D_80B5A5A0) ## $a1 = 80B60000 /* 0137C 80B5472C 24A5A5A0 */ addiu $a1, $a1, %lo(D_80B5A5A0) ## $a1 = 80B5A5A0 -/* 01380 80B54730 8FA40078 */ lw $a0, 0x0078($sp) -/* 01384 80B54734 0C034695 */ jal Matrix_ToMtx +/* 01380 80B54730 8FA40078 */ lw $a0, 0x0078($sp) +/* 01384 80B54734 0C034695 */ jal Matrix_ToMtx /* 01388 80B54738 240605D2 */ addiu $a2, $zero, 0x05D2 ## $a2 = 000005D2 -/* 0138C 80B5473C 0C034236 */ jal Matrix_Get +/* 0138C 80B5473C 0C034236 */ jal Matrix_Get /* 01390 80B54740 27A40038 */ addiu $a0, $sp, 0x0038 ## $a0 = FFFFFFA8 /* 01394 80B54744 27A40038 */ addiu $a0, $sp, 0x0038 ## $a0 = FFFFFFA8 /* 01398 80B54748 27A50030 */ addiu $a1, $sp, 0x0030 ## $a1 = FFFFFFA0 -/* 0139C 80B5474C 0C034833 */ jal func_800D20CC +/* 0139C 80B5474C 0C034833 */ jal func_800D20CC /* 013A0 80B54750 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 013A4 80B54754 0C03034A */ jal func_800C0D28 -/* 013A8 80B54758 8FA40090 */ lw $a0, 0x0090($sp) -/* 013AC 80B5475C 14400005 */ bne $v0, $zero, .L80B54774 +/* 013A4 80B54754 0C03034A */ jal func_800C0D28 +/* 013A8 80B54758 8FA40090 */ lw $a0, 0x0090($sp) +/* 013AC 80B5475C 14400005 */ bne $v0, $zero, .L80B54774 /* 013B0 80B54760 00000000 */ nop -/* 013B4 80B54764 8FA400A4 */ lw $a0, 0x00A4($sp) -/* 013B8 80B54768 87A50032 */ lh $a1, 0x0032($sp) -/* 013BC 80B5476C 0C2D4E60 */ jal func_80B53980 +/* 013B4 80B54764 8FA400A4 */ lw $a0, 0x00A4($sp) +/* 013B8 80B54768 87A50032 */ lh $a1, 0x0032($sp) +/* 013BC 80B5476C 0C2D4E60 */ jal func_80B53980 /* 013C0 80B54770 24060003 */ addiu $a2, $zero, 0x0003 ## $a2 = 00000003 .L80B54774: /* 013C4 80B54774 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 013C8 80B54778 8FA30020 */ lw $v1, 0x0020($sp) +/* 013C8 80B54778 8FA30020 */ lw $v1, 0x0020($sp) /* 013CC 80B5477C 8C42FA90 */ lw $v0, -0x0570($v0) ## 8015FA90 /* 013D0 80B54780 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 /* 013D4 80B54784 846E0006 */ lh $t6, 0x0006($v1) ## 00000006 @@ -134,46 +134,46 @@ glabel func_80B5458C /* 013E0 80B54790 844D1498 */ lh $t5, 0x1498($v0) ## 80161498 /* 013E4 80B54794 844F149A */ lh $t7, 0x149A($v0) ## 8016149A /* 013E8 80B54798 8459149C */ lh $t9, 0x149C($v0) ## 8016149C -/* 013EC 80B5479C 01AE2021 */ addu $a0, $t5, $t6 -/* 013F0 80B547A0 01F82821 */ addu $a1, $t7, $t8 -/* 013F4 80B547A4 032A3021 */ addu $a2, $t9, $t2 -/* 013F8 80B547A8 00063400 */ sll $a2, $a2, 16 -/* 013FC 80B547AC 00052C00 */ sll $a1, $a1, 16 -/* 01400 80B547B0 00042400 */ sll $a0, $a0, 16 -/* 01404 80B547B4 00042403 */ sra $a0, $a0, 16 -/* 01408 80B547B8 00052C03 */ sra $a1, $a1, 16 -/* 0140C 80B547BC 0C034421 */ jal Matrix_RotateXYZ -/* 01410 80B547C0 00063403 */ sra $a2, $a2, 16 +/* 013EC 80B5479C 01AE2021 */ addu $a0, $t5, $t6 +/* 013F0 80B547A0 01F82821 */ addu $a1, $t7, $t8 +/* 013F4 80B547A4 032A3021 */ addu $a2, $t9, $t2 +/* 013F8 80B547A8 00063400 */ sll $a2, $a2, 16 +/* 013FC 80B547AC 00052C00 */ sll $a1, $a1, 16 +/* 01400 80B547B0 00042400 */ sll $a0, $a0, 16 +/* 01404 80B547B4 00042403 */ sra $a0, $a0, 16 +/* 01408 80B547B8 00052C03 */ sra $a1, $a1, 16 +/* 0140C 80B547BC 0C034421 */ jal Matrix_RotateZYX +/* 01410 80B547C0 00063403 */ sra $a2, $a2, 16 /* 01414 80B547C4 3C01C3CD */ lui $at, 0xC3CD ## $at = C3CD0000 /* 01418 80B547C8 44816000 */ mtc1 $at, $f12 ## $f12 = -410.00 /* 0141C 80B547CC 3C01C338 */ lui $at, 0xC338 ## $at = C3380000 /* 01420 80B547D0 44817000 */ mtc1 $at, $f14 ## $f14 = -184.00 /* 01424 80B547D4 24060000 */ addiu $a2, $zero, 0x0000 ## $a2 = 00000000 -/* 01428 80B547D8 0C034261 */ jal Matrix_Translate +/* 01428 80B547D8 0C034261 */ jal Matrix_Translate /* 0142C 80B547DC 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 01430 80B547E0 8FA40078 */ lw $a0, 0x0078($sp) +/* 01430 80B547E0 8FA40078 */ lw $a0, 0x0078($sp) /* 01434 80B547E4 3C0580B6 */ lui $a1, %hi(D_80B5A5B0) ## $a1 = 80B60000 /* 01438 80B547E8 24A5A5B0 */ addiu $a1, $a1, %lo(D_80B5A5B0) ## $a1 = 80B5A5B0 /* 0143C 80B547EC 240605FE */ addiu $a2, $zero, 0x05FE ## $a2 = 000005FE -/* 01440 80B547F0 0C034695 */ jal Matrix_ToMtx +/* 01440 80B547F0 0C034695 */ jal Matrix_ToMtx /* 01444 80B547F4 24840040 */ addiu $a0, $a0, 0x0040 ## $a0 = 00000040 -/* 01448 80B547F8 0C034236 */ jal Matrix_Get +/* 01448 80B547F8 0C034236 */ jal Matrix_Get /* 0144C 80B547FC 27A40038 */ addiu $a0, $sp, 0x0038 ## $a0 = FFFFFFA8 /* 01450 80B54800 27A40038 */ addiu $a0, $sp, 0x0038 ## $a0 = FFFFFFA8 /* 01454 80B54804 27A50030 */ addiu $a1, $sp, 0x0030 ## $a1 = FFFFFFA0 -/* 01458 80B54808 0C034833 */ jal func_800D20CC +/* 01458 80B54808 0C034833 */ jal func_800D20CC /* 0145C 80B5480C 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 01460 80B54810 0C03034A */ jal func_800C0D28 -/* 01464 80B54814 8FA40090 */ lw $a0, 0x0090($sp) -/* 01468 80B54818 14400005 */ bne $v0, $zero, .L80B54830 +/* 01460 80B54810 0C03034A */ jal func_800C0D28 +/* 01464 80B54814 8FA40090 */ lw $a0, 0x0090($sp) +/* 01468 80B54818 14400005 */ bne $v0, $zero, .L80B54830 /* 0146C 80B5481C 00000000 */ nop -/* 01470 80B54820 8FA400A4 */ lw $a0, 0x00A4($sp) -/* 01474 80B54824 87A50030 */ lh $a1, 0x0030($sp) -/* 01478 80B54828 0C2D50D8 */ jal func_80B54360 +/* 01470 80B54820 8FA400A4 */ lw $a0, 0x00A4($sp) +/* 01474 80B54824 87A50030 */ lh $a1, 0x0030($sp) +/* 01478 80B54828 0C2D50D8 */ jal func_80B54360 /* 0147C 80B5482C 24060007 */ addiu $a2, $zero, 0x0007 ## $a2 = 00000007 .L80B54830: /* 01480 80B54830 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 01484 80B54834 8FA30020 */ lw $v1, 0x0020($sp) +/* 01484 80B54834 8FA30020 */ lw $v1, 0x0020($sp) /* 01488 80B54838 8C42FA90 */ lw $v0, -0x0570($v0) ## 8015FA90 /* 0148C 80B5483C 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 /* 01490 80B54840 846C000C */ lh $t4, 0x000C($v1) ## 0000000C @@ -182,66 +182,66 @@ glabel func_80B5458C /* 0149C 80B5484C 844B149E */ lh $t3, 0x149E($v0) ## 8016149E /* 014A0 80B54850 844D14A0 */ lh $t5, 0x14A0($v0) ## 801614A0 /* 014A4 80B54854 844F14A2 */ lh $t7, 0x14A2($v0) ## 801614A2 -/* 014A8 80B54858 016C2021 */ addu $a0, $t3, $t4 -/* 014AC 80B5485C 01AE2821 */ addu $a1, $t5, $t6 -/* 014B0 80B54860 01F83021 */ addu $a2, $t7, $t8 -/* 014B4 80B54864 00063400 */ sll $a2, $a2, 16 -/* 014B8 80B54868 00052C00 */ sll $a1, $a1, 16 -/* 014BC 80B5486C 00042400 */ sll $a0, $a0, 16 -/* 014C0 80B54870 00042403 */ sra $a0, $a0, 16 -/* 014C4 80B54874 00052C03 */ sra $a1, $a1, 16 -/* 014C8 80B54878 0C034421 */ jal Matrix_RotateXYZ -/* 014CC 80B5487C 00063403 */ sra $a2, $a2, 16 +/* 014A8 80B54858 016C2021 */ addu $a0, $t3, $t4 +/* 014AC 80B5485C 01AE2821 */ addu $a1, $t5, $t6 +/* 014B0 80B54860 01F83021 */ addu $a2, $t7, $t8 +/* 014B4 80B54864 00063400 */ sll $a2, $a2, 16 +/* 014B8 80B54868 00052C00 */ sll $a1, $a1, 16 +/* 014BC 80B5486C 00042400 */ sll $a0, $a0, 16 +/* 014C0 80B54870 00042403 */ sra $a0, $a0, 16 +/* 014C4 80B54874 00052C03 */ sra $a1, $a1, 16 +/* 014C8 80B54878 0C034421 */ jal Matrix_RotateZYX +/* 014CC 80B5487C 00063403 */ sra $a2, $a2, 16 /* 014D0 80B54880 3C0180B6 */ lui $at, %hi(D_80B5AAEC) ## $at = 80B60000 -/* 014D4 80B54884 C42CAAEC */ lwc1 $f12, %lo(D_80B5AAEC)($at) +/* 014D4 80B54884 C42CAAEC */ lwc1 $f12, %lo(D_80B5AAEC)($at) /* 014D8 80B54888 3C01C1D0 */ lui $at, 0xC1D0 ## $at = C1D00000 /* 014DC 80B5488C 44817000 */ mtc1 $at, $f14 ## $f14 = -26.00 /* 014E0 80B54890 24060000 */ addiu $a2, $zero, 0x0000 ## $a2 = 00000000 -/* 014E4 80B54894 0C034261 */ jal Matrix_Translate +/* 014E4 80B54894 0C034261 */ jal Matrix_Translate /* 014E8 80B54898 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 014EC 80B5489C 8FA40078 */ lw $a0, 0x0078($sp) +/* 014EC 80B5489C 8FA40078 */ lw $a0, 0x0078($sp) /* 014F0 80B548A0 3C0580B6 */ lui $a1, %hi(D_80B5A5C0) ## $a1 = 80B60000 /* 014F4 80B548A4 24A5A5C0 */ addiu $a1, $a1, %lo(D_80B5A5C0) ## $a1 = 80B5A5C0 /* 014F8 80B548A8 24060612 */ addiu $a2, $zero, 0x0612 ## $a2 = 00000612 -/* 014FC 80B548AC 0C034695 */ jal Matrix_ToMtx +/* 014FC 80B548AC 0C034695 */ jal Matrix_ToMtx /* 01500 80B548B0 24840080 */ addiu $a0, $a0, 0x0080 ## $a0 = 00000080 -/* 01504 80B548B4 0C034221 */ jal Matrix_Pull +/* 01504 80B548B4 0C034221 */ jal Matrix_Pull /* 01508 80B548B8 00000000 */ nop -/* 0150C 80B548BC 0C034213 */ jal Matrix_Push +/* 0150C 80B548BC 0C034213 */ jal Matrix_Push /* 01510 80B548C0 00000000 */ nop /* 01514 80B548C4 3C0180B6 */ lui $at, %hi(D_80B5AAF0) ## $at = 80B60000 -/* 01518 80B548C8 C42CAAF0 */ lwc1 $f12, %lo(D_80B5AAF0)($at) +/* 01518 80B548C8 C42CAAF0 */ lwc1 $f12, %lo(D_80B5AAF0)($at) /* 0151C 80B548CC 3C0180B6 */ lui $at, %hi(D_80B5AAF4) ## $at = 80B60000 /* 01520 80B548D0 3C0643C2 */ lui $a2, 0x43C2 ## $a2 = 43C20000 /* 01524 80B548D4 34C68000 */ ori $a2, $a2, 0x8000 ## $a2 = 43C28000 -/* 01528 80B548D8 C42EAAF4 */ lwc1 $f14, %lo(D_80B5AAF4)($at) -/* 0152C 80B548DC 0C034261 */ jal Matrix_Translate +/* 01528 80B548D8 C42EAAF4 */ lwc1 $f14, %lo(D_80B5AAF4)($at) +/* 0152C 80B548DC 0C034261 */ jal Matrix_Translate /* 01530 80B548E0 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 01534 80B548E4 0C034236 */ jal Matrix_Get +/* 01534 80B548E4 0C034236 */ jal Matrix_Get /* 01538 80B548E8 27A40038 */ addiu $a0, $sp, 0x0038 ## $a0 = FFFFFFA8 /* 0153C 80B548EC 27A40038 */ addiu $a0, $sp, 0x0038 ## $a0 = FFFFFFA8 /* 01540 80B548F0 27A50030 */ addiu $a1, $sp, 0x0030 ## $a1 = FFFFFFA0 -/* 01544 80B548F4 0C034833 */ jal func_800D20CC +/* 01544 80B548F4 0C034833 */ jal func_800D20CC /* 01548 80B548F8 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 0154C 80B548FC 0C03034A */ jal func_800C0D28 -/* 01550 80B54900 8FA40090 */ lw $a0, 0x0090($sp) -/* 01554 80B54904 1440000D */ bne $v0, $zero, .L80B5493C +/* 0154C 80B548FC 0C03034A */ jal func_800C0D28 +/* 01550 80B54900 8FA40090 */ lw $a0, 0x0090($sp) +/* 01554 80B54904 1440000D */ bne $v0, $zero, .L80B5493C /* 01558 80B54908 00000000 */ nop -/* 0155C 80B5490C 8FA400A4 */ lw $a0, 0x00A4($sp) -/* 01560 80B54910 87A50032 */ lh $a1, 0x0032($sp) -/* 01564 80B54914 0C2D4E60 */ jal func_80B53980 +/* 0155C 80B5490C 8FA400A4 */ lw $a0, 0x00A4($sp) +/* 01560 80B54910 87A50032 */ lh $a1, 0x0032($sp) +/* 01564 80B54914 0C2D4E60 */ jal func_80B53980 /* 01568 80B54918 24060009 */ addiu $a2, $zero, 0x0009 ## $a2 = 00000009 -/* 0156C 80B5491C 8FA400A4 */ lw $a0, 0x00A4($sp) -/* 01570 80B54920 87A50030 */ lh $a1, 0x0030($sp) -/* 01574 80B54924 0C2D50D8 */ jal func_80B54360 +/* 0156C 80B5491C 8FA400A4 */ lw $a0, 0x00A4($sp) +/* 01570 80B54920 87A50030 */ lh $a1, 0x0030($sp) +/* 01574 80B54924 0C2D50D8 */ jal func_80B54360 /* 01578 80B54928 2406000A */ addiu $a2, $zero, 0x000A ## $a2 = 0000000A -/* 0157C 80B5492C 8FA400A4 */ lw $a0, 0x00A4($sp) -/* 01580 80B54930 87A50034 */ lh $a1, 0x0034($sp) -/* 01584 80B54934 0C2D4ED9 */ jal func_80B53B64 +/* 0157C 80B5492C 8FA400A4 */ lw $a0, 0x00A4($sp) +/* 01580 80B54930 87A50034 */ lh $a1, 0x0034($sp) +/* 01584 80B54934 0C2D4ED9 */ jal func_80B53B64 /* 01588 80B54938 2406000B */ addiu $a2, $zero, 0x000B ## $a2 = 0000000B .L80B5493C: /* 0158C 80B5493C 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 01590 80B54940 8FA30020 */ lw $v1, 0x0020($sp) +/* 01590 80B54940 8FA30020 */ lw $v1, 0x0020($sp) /* 01594 80B54944 8C42FA90 */ lw $v0, -0x0570($v0) ## 8015FA90 /* 01598 80B54948 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 /* 0159C 80B5494C 846A0012 */ lh $t2, 0x0012($v1) ## 00000012 @@ -250,54 +250,54 @@ glabel func_80B5458C /* 015A8 80B54958 845914A4 */ lh $t9, 0x14A4($v0) ## 801614A4 /* 015AC 80B5495C 844B14A6 */ lh $t3, 0x14A6($v0) ## 801614A6 /* 015B0 80B54960 844D14A8 */ lh $t5, 0x14A8($v0) ## 801614A8 -/* 015B4 80B54964 032A2021 */ addu $a0, $t9, $t2 -/* 015B8 80B54968 016C2821 */ addu $a1, $t3, $t4 -/* 015BC 80B5496C 01AE3021 */ addu $a2, $t5, $t6 -/* 015C0 80B54970 00063400 */ sll $a2, $a2, 16 -/* 015C4 80B54974 00052C00 */ sll $a1, $a1, 16 -/* 015C8 80B54978 00042400 */ sll $a0, $a0, 16 -/* 015CC 80B5497C 00042403 */ sra $a0, $a0, 16 -/* 015D0 80B54980 00052C03 */ sra $a1, $a1, 16 -/* 015D4 80B54984 0C034421 */ jal Matrix_RotateXYZ -/* 015D8 80B54988 00063403 */ sra $a2, $a2, 16 +/* 015B4 80B54964 032A2021 */ addu $a0, $t9, $t2 +/* 015B8 80B54968 016C2821 */ addu $a1, $t3, $t4 +/* 015BC 80B5496C 01AE3021 */ addu $a2, $t5, $t6 +/* 015C0 80B54970 00063400 */ sll $a2, $a2, 16 +/* 015C4 80B54974 00052C00 */ sll $a1, $a1, 16 +/* 015C8 80B54978 00042400 */ sll $a0, $a0, 16 +/* 015CC 80B5497C 00042403 */ sra $a0, $a0, 16 +/* 015D0 80B54980 00052C03 */ sra $a1, $a1, 16 +/* 015D4 80B54984 0C034421 */ jal Matrix_RotateZYX +/* 015D8 80B54988 00063403 */ sra $a2, $a2, 16 /* 015DC 80B5498C 3C0180B6 */ lui $at, %hi(D_80B5AAF8) ## $at = 80B60000 -/* 015E0 80B54990 C42CAAF8 */ lwc1 $f12, %lo(D_80B5AAF8)($at) +/* 015E0 80B54990 C42CAAF8 */ lwc1 $f12, %lo(D_80B5AAF8)($at) /* 015E4 80B54994 3C01BF80 */ lui $at, 0xBF80 ## $at = BF800000 /* 015E8 80B54998 44817000 */ mtc1 $at, $f14 ## $f14 = -1.00 /* 015EC 80B5499C 3C06C040 */ lui $a2, 0xC040 ## $a2 = C0400000 -/* 015F0 80B549A0 0C034261 */ jal Matrix_Translate +/* 015F0 80B549A0 0C034261 */ jal Matrix_Translate /* 015F4 80B549A4 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 015F8 80B549A8 8FA40078 */ lw $a0, 0x0078($sp) +/* 015F8 80B549A8 8FA40078 */ lw $a0, 0x0078($sp) /* 015FC 80B549AC 3C0580B6 */ lui $a1, %hi(D_80B5A5D0) ## $a1 = 80B60000 /* 01600 80B549B0 24A5A5D0 */ addiu $a1, $a1, %lo(D_80B5A5D0) ## $a1 = 80B5A5D0 /* 01604 80B549B4 2406062B */ addiu $a2, $zero, 0x062B ## $a2 = 0000062B -/* 01608 80B549B8 0C034695 */ jal Matrix_ToMtx +/* 01608 80B549B8 0C034695 */ jal Matrix_ToMtx /* 0160C 80B549BC 248400C0 */ addiu $a0, $a0, 0x00C0 ## $a0 = 000000C0 -/* 01610 80B549C0 0C034236 */ jal Matrix_Get +/* 01610 80B549C0 0C034236 */ jal Matrix_Get /* 01614 80B549C4 27A40038 */ addiu $a0, $sp, 0x0038 ## $a0 = FFFFFFA8 /* 01618 80B549C8 27A40038 */ addiu $a0, $sp, 0x0038 ## $a0 = FFFFFFA8 /* 0161C 80B549CC 27A50030 */ addiu $a1, $sp, 0x0030 ## $a1 = FFFFFFA0 -/* 01620 80B549D0 0C034833 */ jal func_800D20CC +/* 01620 80B549D0 0C034833 */ jal func_800D20CC /* 01624 80B549D4 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 01628 80B549D8 0C03034A */ jal func_800C0D28 -/* 0162C 80B549DC 8FA40090 */ lw $a0, 0x0090($sp) -/* 01630 80B549E0 1440000D */ bne $v0, $zero, .L80B54A18 +/* 01628 80B549D8 0C03034A */ jal func_800C0D28 +/* 0162C 80B549DC 8FA40090 */ lw $a0, 0x0090($sp) +/* 01630 80B549E0 1440000D */ bne $v0, $zero, .L80B54A18 /* 01634 80B549E4 00000000 */ nop -/* 01638 80B549E8 8FA400A4 */ lw $a0, 0x00A4($sp) -/* 0163C 80B549EC 87A50032 */ lh $a1, 0x0032($sp) -/* 01640 80B549F0 0C2D4E60 */ jal func_80B53980 +/* 01638 80B549E8 8FA400A4 */ lw $a0, 0x00A4($sp) +/* 0163C 80B549EC 87A50032 */ lh $a1, 0x0032($sp) +/* 01640 80B549F0 0C2D4E60 */ jal func_80B53980 /* 01644 80B549F4 2406000C */ addiu $a2, $zero, 0x000C ## $a2 = 0000000C -/* 01648 80B549F8 8FA400A4 */ lw $a0, 0x00A4($sp) -/* 0164C 80B549FC 87A50030 */ lh $a1, 0x0030($sp) -/* 01650 80B54A00 0C2D50D8 */ jal func_80B54360 +/* 01648 80B549F8 8FA400A4 */ lw $a0, 0x00A4($sp) +/* 0164C 80B549FC 87A50030 */ lh $a1, 0x0030($sp) +/* 01650 80B54A00 0C2D50D8 */ jal func_80B54360 /* 01654 80B54A04 2406000D */ addiu $a2, $zero, 0x000D ## $a2 = 0000000D -/* 01658 80B54A08 8FA400A4 */ lw $a0, 0x00A4($sp) -/* 0165C 80B54A0C 87A50034 */ lh $a1, 0x0034($sp) -/* 01660 80B54A10 0C2D4ED9 */ jal func_80B53B64 +/* 01658 80B54A08 8FA400A4 */ lw $a0, 0x00A4($sp) +/* 0165C 80B54A0C 87A50034 */ lh $a1, 0x0034($sp) +/* 01660 80B54A10 0C2D4ED9 */ jal func_80B53B64 /* 01664 80B54A14 2406000E */ addiu $a2, $zero, 0x000E ## $a2 = 0000000E .L80B54A18: /* 01668 80B54A18 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 0166C 80B54A1C 8FA30020 */ lw $v1, 0x0020($sp) +/* 0166C 80B54A1C 8FA30020 */ lw $v1, 0x0020($sp) /* 01670 80B54A20 8C42FA90 */ lw $v0, -0x0570($v0) ## 8015FA90 /* 01674 80B54A24 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 /* 01678 80B54A28 84780018 */ lh $t8, 0x0018($v1) ## 00000018 @@ -306,66 +306,66 @@ glabel func_80B5458C /* 01684 80B54A34 844F14AA */ lh $t7, 0x14AA($v0) ## 801614AA /* 01688 80B54A38 845914AC */ lh $t9, 0x14AC($v0) ## 801614AC /* 0168C 80B54A3C 844B14AE */ lh $t3, 0x14AE($v0) ## 801614AE -/* 01690 80B54A40 01F82021 */ addu $a0, $t7, $t8 -/* 01694 80B54A44 032A2821 */ addu $a1, $t9, $t2 -/* 01698 80B54A48 016C3021 */ addu $a2, $t3, $t4 -/* 0169C 80B54A4C 00063400 */ sll $a2, $a2, 16 -/* 016A0 80B54A50 00052C00 */ sll $a1, $a1, 16 -/* 016A4 80B54A54 00042400 */ sll $a0, $a0, 16 -/* 016A8 80B54A58 00042403 */ sra $a0, $a0, 16 -/* 016AC 80B54A5C 00052C03 */ sra $a1, $a1, 16 -/* 016B0 80B54A60 0C034421 */ jal Matrix_RotateXYZ -/* 016B4 80B54A64 00063403 */ sra $a2, $a2, 16 +/* 01690 80B54A40 01F82021 */ addu $a0, $t7, $t8 +/* 01694 80B54A44 032A2821 */ addu $a1, $t9, $t2 +/* 01698 80B54A48 016C3021 */ addu $a2, $t3, $t4 +/* 0169C 80B54A4C 00063400 */ sll $a2, $a2, 16 +/* 016A0 80B54A50 00052C00 */ sll $a1, $a1, 16 +/* 016A4 80B54A54 00042400 */ sll $a0, $a0, 16 +/* 016A8 80B54A58 00042403 */ sra $a0, $a0, 16 +/* 016AC 80B54A5C 00052C03 */ sra $a1, $a1, 16 +/* 016B0 80B54A60 0C034421 */ jal Matrix_RotateZYX +/* 016B4 80B54A64 00063403 */ sra $a2, $a2, 16 /* 016B8 80B54A68 3C01C3DF */ lui $at, 0xC3DF ## $at = C3DF0000 /* 016BC 80B54A6C 44816000 */ mtc1 $at, $f12 ## $f12 = -446.00 /* 016C0 80B54A70 3C01C250 */ lui $at, 0xC250 ## $at = C2500000 /* 016C4 80B54A74 44817000 */ mtc1 $at, $f14 ## $f14 = -52.00 /* 016C8 80B54A78 3C0642A8 */ lui $a2, 0x42A8 ## $a2 = 42A80000 -/* 016CC 80B54A7C 0C034261 */ jal Matrix_Translate +/* 016CC 80B54A7C 0C034261 */ jal Matrix_Translate /* 016D0 80B54A80 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 016D4 80B54A84 8FA40078 */ lw $a0, 0x0078($sp) +/* 016D4 80B54A84 8FA40078 */ lw $a0, 0x0078($sp) /* 016D8 80B54A88 3C0580B6 */ lui $a1, %hi(D_80B5A5E0) ## $a1 = 80B60000 /* 016DC 80B54A8C 24A5A5E0 */ addiu $a1, $a1, %lo(D_80B5A5E0) ## $a1 = 80B5A5E0 /* 016E0 80B54A90 2406063E */ addiu $a2, $zero, 0x063E ## $a2 = 0000063E -/* 016E4 80B54A94 0C034695 */ jal Matrix_ToMtx +/* 016E4 80B54A94 0C034695 */ jal Matrix_ToMtx /* 016E8 80B54A98 24840100 */ addiu $a0, $a0, 0x0100 ## $a0 = 00000100 -/* 016EC 80B54A9C 0C034221 */ jal Matrix_Pull +/* 016EC 80B54A9C 0C034221 */ jal Matrix_Pull /* 016F0 80B54AA0 00000000 */ nop -/* 016F4 80B54AA4 0C034213 */ jal Matrix_Push +/* 016F4 80B54AA4 0C034213 */ jal Matrix_Push /* 016F8 80B54AA8 00000000 */ nop /* 016FC 80B54AAC 3C0180B6 */ lui $at, %hi(D_80B5AAFC) ## $at = 80B60000 -/* 01700 80B54AB0 C42CAAFC */ lwc1 $f12, %lo(D_80B5AAFC)($at) +/* 01700 80B54AB0 C42CAAFC */ lwc1 $f12, %lo(D_80B5AAFC)($at) /* 01704 80B54AB4 3C0180B6 */ lui $at, %hi(D_80B5AB00) ## $at = 80B60000 /* 01708 80B54AB8 3C06C3C2 */ lui $a2, 0xC3C2 ## $a2 = C3C20000 /* 0170C 80B54ABC 34C68000 */ ori $a2, $a2, 0x8000 ## $a2 = C3C28000 -/* 01710 80B54AC0 C42EAB00 */ lwc1 $f14, %lo(D_80B5AB00)($at) -/* 01714 80B54AC4 0C034261 */ jal Matrix_Translate +/* 01710 80B54AC0 C42EAB00 */ lwc1 $f14, %lo(D_80B5AB00)($at) +/* 01714 80B54AC4 0C034261 */ jal Matrix_Translate /* 01718 80B54AC8 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 0171C 80B54ACC 0C034236 */ jal Matrix_Get +/* 0171C 80B54ACC 0C034236 */ jal Matrix_Get /* 01720 80B54AD0 27A40038 */ addiu $a0, $sp, 0x0038 ## $a0 = FFFFFFA8 /* 01724 80B54AD4 27A40038 */ addiu $a0, $sp, 0x0038 ## $a0 = FFFFFFA8 /* 01728 80B54AD8 27A50030 */ addiu $a1, $sp, 0x0030 ## $a1 = FFFFFFA0 -/* 0172C 80B54ADC 0C034833 */ jal func_800D20CC +/* 0172C 80B54ADC 0C034833 */ jal func_800D20CC /* 01730 80B54AE0 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 01734 80B54AE4 0C03034A */ jal func_800C0D28 -/* 01738 80B54AE8 8FA40090 */ lw $a0, 0x0090($sp) -/* 0173C 80B54AEC 1440000D */ bne $v0, $zero, .L80B54B24 +/* 01734 80B54AE4 0C03034A */ jal func_800C0D28 +/* 01738 80B54AE8 8FA40090 */ lw $a0, 0x0090($sp) +/* 0173C 80B54AEC 1440000D */ bne $v0, $zero, .L80B54B24 /* 01740 80B54AF0 00000000 */ nop -/* 01744 80B54AF4 8FA400A4 */ lw $a0, 0x00A4($sp) -/* 01748 80B54AF8 87A50032 */ lh $a1, 0x0032($sp) -/* 0174C 80B54AFC 0C2D4E60 */ jal func_80B53980 +/* 01744 80B54AF4 8FA400A4 */ lw $a0, 0x00A4($sp) +/* 01748 80B54AF8 87A50032 */ lh $a1, 0x0032($sp) +/* 0174C 80B54AFC 0C2D4E60 */ jal func_80B53980 /* 01750 80B54B00 2406000F */ addiu $a2, $zero, 0x000F ## $a2 = 0000000F -/* 01754 80B54B04 8FA400A4 */ lw $a0, 0x00A4($sp) -/* 01758 80B54B08 87A50030 */ lh $a1, 0x0030($sp) -/* 0175C 80B54B0C 0C2D50D8 */ jal func_80B54360 +/* 01754 80B54B04 8FA400A4 */ lw $a0, 0x00A4($sp) +/* 01758 80B54B08 87A50030 */ lh $a1, 0x0030($sp) +/* 0175C 80B54B0C 0C2D50D8 */ jal func_80B54360 /* 01760 80B54B10 24060010 */ addiu $a2, $zero, 0x0010 ## $a2 = 00000010 -/* 01764 80B54B14 8FA400A4 */ lw $a0, 0x00A4($sp) -/* 01768 80B54B18 87A50034 */ lh $a1, 0x0034($sp) -/* 0176C 80B54B1C 0C2D4ED9 */ jal func_80B53B64 +/* 01764 80B54B14 8FA400A4 */ lw $a0, 0x00A4($sp) +/* 01768 80B54B18 87A50034 */ lh $a1, 0x0034($sp) +/* 0176C 80B54B1C 0C2D4ED9 */ jal func_80B53B64 /* 01770 80B54B20 24060011 */ addiu $a2, $zero, 0x0011 ## $a2 = 00000011 .L80B54B24: /* 01774 80B54B24 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 01778 80B54B28 8FA30020 */ lw $v1, 0x0020($sp) +/* 01778 80B54B28 8FA30020 */ lw $v1, 0x0020($sp) /* 0177C 80B54B2C 8C42FA90 */ lw $v0, -0x0570($v0) ## 8015FA90 /* 01780 80B54B30 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 /* 01784 80B54B34 846E001E */ lh $t6, 0x001E($v1) ## 0000001E @@ -374,54 +374,54 @@ glabel func_80B5458C /* 01790 80B54B40 844D14B0 */ lh $t5, 0x14B0($v0) ## 801614B0 /* 01794 80B54B44 844F14B2 */ lh $t7, 0x14B2($v0) ## 801614B2 /* 01798 80B54B48 845914B4 */ lh $t9, 0x14B4($v0) ## 801614B4 -/* 0179C 80B54B4C 01AE2021 */ addu $a0, $t5, $t6 -/* 017A0 80B54B50 01F82821 */ addu $a1, $t7, $t8 -/* 017A4 80B54B54 032A3021 */ addu $a2, $t9, $t2 -/* 017A8 80B54B58 00063400 */ sll $a2, $a2, 16 -/* 017AC 80B54B5C 00052C00 */ sll $a1, $a1, 16 -/* 017B0 80B54B60 00042400 */ sll $a0, $a0, 16 -/* 017B4 80B54B64 00042403 */ sra $a0, $a0, 16 -/* 017B8 80B54B68 00052C03 */ sra $a1, $a1, 16 -/* 017BC 80B54B6C 0C034421 */ jal Matrix_RotateXYZ -/* 017C0 80B54B70 00063403 */ sra $a2, $a2, 16 +/* 0179C 80B54B4C 01AE2021 */ addu $a0, $t5, $t6 +/* 017A0 80B54B50 01F82821 */ addu $a1, $t7, $t8 +/* 017A4 80B54B54 032A3021 */ addu $a2, $t9, $t2 +/* 017A8 80B54B58 00063400 */ sll $a2, $a2, 16 +/* 017AC 80B54B5C 00052C00 */ sll $a1, $a1, 16 +/* 017B0 80B54B60 00042400 */ sll $a0, $a0, 16 +/* 017B4 80B54B64 00042403 */ sra $a0, $a0, 16 +/* 017B8 80B54B68 00052C03 */ sra $a1, $a1, 16 +/* 017BC 80B54B6C 0C034421 */ jal Matrix_RotateZYX +/* 017C0 80B54B70 00063403 */ sra $a2, $a2, 16 /* 017C4 80B54B74 3C0180B6 */ lui $at, %hi(D_80B5AB04) ## $at = 80B60000 -/* 017C8 80B54B78 C42CAB04 */ lwc1 $f12, %lo(D_80B5AB04)($at) +/* 017C8 80B54B78 C42CAB04 */ lwc1 $f12, %lo(D_80B5AB04)($at) /* 017CC 80B54B7C 3C01BF80 */ lui $at, 0xBF80 ## $at = BF800000 /* 017D0 80B54B80 44817000 */ mtc1 $at, $f14 ## $f14 = -1.00 /* 017D4 80B54B84 3C064040 */ lui $a2, 0x4040 ## $a2 = 40400000 -/* 017D8 80B54B88 0C034261 */ jal Matrix_Translate +/* 017D8 80B54B88 0C034261 */ jal Matrix_Translate /* 017DC 80B54B8C 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 017E0 80B54B90 8FA40078 */ lw $a0, 0x0078($sp) +/* 017E0 80B54B90 8FA40078 */ lw $a0, 0x0078($sp) /* 017E4 80B54B94 3C0580B6 */ lui $a1, %hi(D_80B5A5F0) ## $a1 = 80B60000 /* 017E8 80B54B98 24A5A5F0 */ addiu $a1, $a1, %lo(D_80B5A5F0) ## $a1 = 80B5A5F0 /* 017EC 80B54B9C 24060657 */ addiu $a2, $zero, 0x0657 ## $a2 = 00000657 -/* 017F0 80B54BA0 0C034695 */ jal Matrix_ToMtx +/* 017F0 80B54BA0 0C034695 */ jal Matrix_ToMtx /* 017F4 80B54BA4 24840140 */ addiu $a0, $a0, 0x0140 ## $a0 = 00000140 -/* 017F8 80B54BA8 0C034236 */ jal Matrix_Get +/* 017F8 80B54BA8 0C034236 */ jal Matrix_Get /* 017FC 80B54BAC 27A40038 */ addiu $a0, $sp, 0x0038 ## $a0 = FFFFFFA8 /* 01800 80B54BB0 27A40038 */ addiu $a0, $sp, 0x0038 ## $a0 = FFFFFFA8 /* 01804 80B54BB4 27A50030 */ addiu $a1, $sp, 0x0030 ## $a1 = FFFFFFA0 -/* 01808 80B54BB8 0C034833 */ jal func_800D20CC +/* 01808 80B54BB8 0C034833 */ jal func_800D20CC /* 0180C 80B54BBC 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 01810 80B54BC0 0C03034A */ jal func_800C0D28 -/* 01814 80B54BC4 8FA40090 */ lw $a0, 0x0090($sp) -/* 01818 80B54BC8 1440000C */ bne $v0, $zero, .L80B54BFC -/* 0181C 80B54BCC 8FA400A4 */ lw $a0, 0x00A4($sp) -/* 01820 80B54BD0 87A50032 */ lh $a1, 0x0032($sp) -/* 01824 80B54BD4 0C2D4E60 */ jal func_80B53980 +/* 01810 80B54BC0 0C03034A */ jal func_800C0D28 +/* 01814 80B54BC4 8FA40090 */ lw $a0, 0x0090($sp) +/* 01818 80B54BC8 1440000C */ bne $v0, $zero, .L80B54BFC +/* 0181C 80B54BCC 8FA400A4 */ lw $a0, 0x00A4($sp) +/* 01820 80B54BD0 87A50032 */ lh $a1, 0x0032($sp) +/* 01824 80B54BD4 0C2D4E60 */ jal func_80B53980 /* 01828 80B54BD8 24060012 */ addiu $a2, $zero, 0x0012 ## $a2 = 00000012 -/* 0182C 80B54BDC 8FA400A4 */ lw $a0, 0x00A4($sp) -/* 01830 80B54BE0 87A50030 */ lh $a1, 0x0030($sp) -/* 01834 80B54BE4 0C2D50D8 */ jal func_80B54360 +/* 0182C 80B54BDC 8FA400A4 */ lw $a0, 0x00A4($sp) +/* 01830 80B54BE0 87A50030 */ lh $a1, 0x0030($sp) +/* 01834 80B54BE4 0C2D50D8 */ jal func_80B54360 /* 01838 80B54BE8 24060013 */ addiu $a2, $zero, 0x0013 ## $a2 = 00000013 -/* 0183C 80B54BEC 8FA400A4 */ lw $a0, 0x00A4($sp) -/* 01840 80B54BF0 87A50034 */ lh $a1, 0x0034($sp) -/* 01844 80B54BF4 0C2D4ED9 */ jal func_80B53B64 +/* 0183C 80B54BEC 8FA400A4 */ lw $a0, 0x00A4($sp) +/* 01840 80B54BF0 87A50034 */ lh $a1, 0x0034($sp) +/* 01844 80B54BF4 0C2D4ED9 */ jal func_80B53B64 /* 01848 80B54BF8 24060014 */ addiu $a2, $zero, 0x0014 ## $a2 = 00000014 .L80B54BFC: /* 0184C 80B54BFC 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 /* 01850 80B54C00 8C42FA90 */ lw $v0, -0x0570($v0) ## 8015FA90 -/* 01854 80B54C04 8FAC0020 */ lw $t4, 0x0020($sp) +/* 01854 80B54C04 8FAC0020 */ lw $t4, 0x0020($sp) /* 01858 80B54C08 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 /* 0185C 80B54C0C 844B14B6 */ lh $t3, 0x14B6($v0) ## 801614B6 /* 01860 80B54C10 844E14B8 */ lh $t6, 0x14B8($v0) ## 801614B8 @@ -429,56 +429,56 @@ glabel func_80B5458C /* 01868 80B54C18 858D0024 */ lh $t5, 0x0024($t4) ## 00000024 /* 0186C 80B54C1C 858F0026 */ lh $t7, 0x0026($t4) ## 00000026 /* 01870 80B54C20 85990028 */ lh $t9, 0x0028($t4) ## 00000028 -/* 01874 80B54C24 016D2021 */ addu $a0, $t3, $t5 -/* 01878 80B54C28 01CF2821 */ addu $a1, $t6, $t7 -/* 0187C 80B54C2C 03193021 */ addu $a2, $t8, $t9 -/* 01880 80B54C30 00063400 */ sll $a2, $a2, 16 -/* 01884 80B54C34 00052C00 */ sll $a1, $a1, 16 -/* 01888 80B54C38 00042400 */ sll $a0, $a0, 16 -/* 0188C 80B54C3C 00042403 */ sra $a0, $a0, 16 -/* 01890 80B54C40 00052C03 */ sra $a1, $a1, 16 -/* 01894 80B54C44 0C034421 */ jal Matrix_RotateXYZ -/* 01898 80B54C48 00063403 */ sra $a2, $a2, 16 +/* 01874 80B54C24 016D2021 */ addu $a0, $t3, $t5 +/* 01878 80B54C28 01CF2821 */ addu $a1, $t6, $t7 +/* 0187C 80B54C2C 03193021 */ addu $a2, $t8, $t9 +/* 01880 80B54C30 00063400 */ sll $a2, $a2, 16 +/* 01884 80B54C34 00052C00 */ sll $a1, $a1, 16 +/* 01888 80B54C38 00042400 */ sll $a0, $a0, 16 +/* 0188C 80B54C3C 00042403 */ sra $a0, $a0, 16 +/* 01890 80B54C40 00052C03 */ sra $a1, $a1, 16 +/* 01894 80B54C44 0C034421 */ jal Matrix_RotateZYX +/* 01898 80B54C48 00063403 */ sra $a2, $a2, 16 /* 0189C 80B54C4C 3C01C3DF */ lui $at, 0xC3DF ## $at = C3DF0000 /* 018A0 80B54C50 44816000 */ mtc1 $at, $f12 ## $f12 = -446.00 /* 018A4 80B54C54 3C01C250 */ lui $at, 0xC250 ## $at = C2500000 /* 018A8 80B54C58 44817000 */ mtc1 $at, $f14 ## $f14 = -52.00 /* 018AC 80B54C5C 3C06C2A8 */ lui $a2, 0xC2A8 ## $a2 = C2A80000 -/* 018B0 80B54C60 0C034261 */ jal Matrix_Translate +/* 018B0 80B54C60 0C034261 */ jal Matrix_Translate /* 018B4 80B54C64 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 018B8 80B54C68 8FA40078 */ lw $a0, 0x0078($sp) +/* 018B8 80B54C68 8FA40078 */ lw $a0, 0x0078($sp) /* 018BC 80B54C6C 3C0580B6 */ lui $a1, %hi(D_80B5A600) ## $a1 = 80B60000 /* 018C0 80B54C70 24A5A600 */ addiu $a1, $a1, %lo(D_80B5A600) ## $a1 = 80B5A600 /* 018C4 80B54C74 2406066A */ addiu $a2, $zero, 0x066A ## $a2 = 0000066A -/* 018C8 80B54C78 0C034695 */ jal Matrix_ToMtx +/* 018C8 80B54C78 0C034695 */ jal Matrix_ToMtx /* 018CC 80B54C7C 24840180 */ addiu $a0, $a0, 0x0180 ## $a0 = 00000180 -/* 018D0 80B54C80 0C034221 */ jal Matrix_Pull +/* 018D0 80B54C80 0C034221 */ jal Matrix_Pull /* 018D4 80B54C84 00000000 */ nop -/* 018D8 80B54C88 0C034221 */ jal Matrix_Pull +/* 018D8 80B54C88 0C034221 */ jal Matrix_Pull /* 018DC 80B54C8C 00000000 */ nop -/* 018E0 80B54C90 8FAB00A4 */ lw $t3, 0x00A4($sp) +/* 018E0 80B54C90 8FAB00A4 */ lw $t3, 0x00A4($sp) /* 018E4 80B54C94 240A0001 */ addiu $t2, $zero, 0x0001 ## $t2 = 00000001 -/* 018E8 80B54C98 1000000E */ beq $zero, $zero, .L80B54CD4 +/* 018E8 80B54C98 1000000E */ beq $zero, $zero, .L80B54CD4 /* 018EC 80B54C9C AD6A02FC */ sw $t2, 0x02FC($t3) ## 000002FC .L80B54CA0: /* 018F0 80B54CA0 24010007 */ addiu $at, $zero, 0x0007 ## $at = 00000007 -/* 018F4 80B54CA4 14A1000B */ bne $a1, $at, .L80B54CD4 -/* 018F8 80B54CA8 8FA800A0 */ lw $t0, 0x00A0($sp) -/* 018FC 80B54CAC 8FA200A4 */ lw $v0, 0x00A4($sp) +/* 018F4 80B54CA4 14A1000B */ bne $a1, $at, .L80B54CD4 +/* 018F8 80B54CA8 8FA800A0 */ lw $t0, 0x00A0($sp) +/* 018FC 80B54CAC 8FA200A4 */ lw $v0, 0x00A4($sp) /* 01900 80B54CB0 850D0000 */ lh $t5, 0x0000($t0) ## 00000000 /* 01904 80B54CB4 850C0002 */ lh $t4, 0x0002($t0) ## 00000002 /* 01908 80B54CB8 844E0408 */ lh $t6, 0x0408($v0) ## 00000408 /* 0190C 80B54CBC 24420406 */ addiu $v0, $v0, 0x0406 ## $v0 = 00000406 -/* 01910 80B54CC0 01AE7821 */ addu $t7, $t5, $t6 +/* 01910 80B54CC0 01AE7821 */ addu $t7, $t5, $t6 /* 01914 80B54CC4 A50F0000 */ sh $t7, 0x0000($t0) ## 00000000 /* 01918 80B54CC8 84580000 */ lh $t8, 0x0000($v0) ## 00000406 -/* 0191C 80B54CCC 0198C823 */ subu $t9, $t4, $t8 +/* 0191C 80B54CCC 0198C823 */ subu $t9, $t4, $t8 /* 01920 80B54CD0 A5190002 */ sh $t9, 0x0002($t0) ## 00000002 .L80B54CD4: -/* 01924 80B54CD4 8FBF0014 */ lw $ra, 0x0014($sp) +/* 01924 80B54CD4 8FBF0014 */ lw $ra, 0x0014($sp) /* 01928 80B54CD8 27BD0090 */ addiu $sp, $sp, 0x0090 ## $sp = 00000000 /* 0192C 80B54CDC 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 01930 80B54CE0 03E00008 */ jr $ra +/* 01930 80B54CE0 03E00008 */ jr $ra /* 01934 80B54CE4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B54E14.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B54E14.s index e3fc2034f3..43f8538d0e 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B54E14.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B54E14.s @@ -1,43 +1,43 @@ glabel func_80B54E14 /* 01A64 80B54E14 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 01A68 80B54E18 AFBF0024 */ sw $ra, 0x0024($sp) -/* 01A6C 80B54E1C AFA40028 */ sw $a0, 0x0028($sp) -/* 01A70 80B54E20 AFA5002C */ sw $a1, 0x002C($sp) -/* 01A74 80B54E24 AFA60030 */ sw $a2, 0x0030($sp) -/* 01A78 80B54E28 AFA70034 */ sw $a3, 0x0034($sp) +/* 01A68 80B54E18 AFBF0024 */ sw $ra, 0x0024($sp) +/* 01A6C 80B54E1C AFA40028 */ sw $a0, 0x0028($sp) +/* 01A70 80B54E20 AFA5002C */ sw $a1, 0x002C($sp) +/* 01A74 80B54E24 AFA60030 */ sw $a2, 0x0030($sp) +/* 01A78 80B54E28 AFA70034 */ sw $a3, 0x0034($sp) /* 01A7C 80B54E2C 0C028800 */ jal SkelAnime_GetFrameCount - + /* 01A80 80B54E30 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 01A84 80B54E34 8FAE0038 */ lw $t6, 0x0038($sp) -/* 01A88 80B54E38 8FA40028 */ lw $a0, 0x0028($sp) -/* 01A8C 80B54E3C 8FA5002C */ lw $a1, 0x002C($sp) -/* 01A90 80B54E40 15C00007 */ bne $t6, $zero, .L80B54E60 +/* 01A84 80B54E34 8FAE0038 */ lw $t6, 0x0038($sp) +/* 01A88 80B54E38 8FA40028 */ lw $a0, 0x0028($sp) +/* 01A8C 80B54E3C 8FA5002C */ lw $a1, 0x002C($sp) +/* 01A90 80B54E40 15C00007 */ bne $t6, $zero, .L80B54E60 /* 01A94 80B54E44 2484014C */ addiu $a0, $a0, 0x014C ## $a0 = 0000014C /* 01A98 80B54E48 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 01A9C 80B54E4C 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 /* 01AA0 80B54E50 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 /* 01AA4 80B54E54 44816000 */ mtc1 $at, $f12 ## $f12 = 1.00 -/* 01AA8 80B54E58 10000006 */ beq $zero, $zero, .L80B54E74 -/* 01AAC 80B54E5C 468020A0 */ cvt.s.w $f2, $f4 +/* 01AA8 80B54E58 10000006 */ beq $zero, $zero, .L80B54E74 +/* 01AAC 80B54E5C 468020A0 */ cvt.s.w $f2, $f4 .L80B54E60: /* 01AB0 80B54E60 44823000 */ mtc1 $v0, $f6 ## $f6 = 0.00 /* 01AB4 80B54E64 3C01BF80 */ lui $at, 0xBF80 ## $at = BF800000 /* 01AB8 80B54E68 44801000 */ mtc1 $zero, $f2 ## $f2 = 0.00 /* 01ABC 80B54E6C 44816000 */ mtc1 $at, $f12 ## $f12 = -1.00 -/* 01AC0 80B54E70 46803020 */ cvt.s.w $f0, $f6 +/* 01AC0 80B54E70 46803020 */ cvt.s.w $f0, $f6 .L80B54E74: -/* 01AC4 80B54E74 93AF0033 */ lbu $t7, 0x0033($sp) -/* 01AC8 80B54E78 C7A80034 */ lwc1 $f8, 0x0034($sp) -/* 01ACC 80B54E7C 44066000 */ mfc1 $a2, $f12 -/* 01AD0 80B54E80 44070000 */ mfc1 $a3, $f0 -/* 01AD4 80B54E84 E7A20010 */ swc1 $f2, 0x0010($sp) -/* 01AD8 80B54E88 AFAF0014 */ sw $t7, 0x0014($sp) -/* 01ADC 80B54E8C 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 01AE0 80B54E90 E7A80018 */ swc1 $f8, 0x0018($sp) -/* 01AE4 80B54E94 8FBF0024 */ lw $ra, 0x0024($sp) +/* 01AC4 80B54E74 93AF0033 */ lbu $t7, 0x0033($sp) +/* 01AC8 80B54E78 C7A80034 */ lwc1 $f8, 0x0034($sp) +/* 01ACC 80B54E7C 44066000 */ mfc1 $a2, $f12 +/* 01AD0 80B54E80 44070000 */ mfc1 $a3, $f0 +/* 01AD4 80B54E84 E7A20010 */ swc1 $f2, 0x0010($sp) +/* 01AD8 80B54E88 AFAF0014 */ sw $t7, 0x0014($sp) +/* 01ADC 80B54E8C 0C029468 */ jal SkelAnime_ChangeAnim + +/* 01AE0 80B54E90 E7A80018 */ swc1 $f8, 0x0018($sp) +/* 01AE4 80B54E94 8FBF0024 */ lw $ra, 0x0024($sp) /* 01AE8 80B54E98 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 01AEC 80B54E9C 03E00008 */ jr $ra +/* 01AEC 80B54E9C 03E00008 */ jr $ra /* 01AF0 80B54EA0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B57034.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B57034.s index 557edd1d67..b4b7567ac4 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B57034.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B57034.s @@ -35,7 +35,7 @@ glabel func_80B57034 /* 03D08 80B570B8 1000000E */ beq $zero, $zero, .L80B570F4 /* 03D0C 80B570BC 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 .L80B570C0: -/* 03D10 80B570C0 0C03F494 */ jal func_800FD250 +/* 03D10 80B570C0 0C03F494 */ jal Math_atan2f /* 03D14 80B570C4 00000000 */ nop /* 03D18 80B570C8 3C0180B6 */ lui $at, %hi(D_80B5AB84) ## $at = 80B60000 /* 03D1C 80B570CC C428AB84 */ lwc1 $f8, %lo(D_80B5AB84)($at) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B57104.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B57104.s index 8cfa4749cf..1db94dbe80 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B57104.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B57104.s @@ -25,7 +25,7 @@ glabel func_80B57104 /* 03DB0 80B57160 4503000D */ bc1tl .L80B57198 /* 03DB4 80B57164 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 .L80B57168: -/* 03DB8 80B57168 0C03F494 */ jal func_800FD250 +/* 03DB8 80B57168 0C03F494 */ jal Math_atan2f /* 03DBC 80B5716C 00000000 */ nop /* 03DC0 80B57170 3C0180B6 */ lui $at, %hi(D_80B5AB88) ## $at = 80B60000 /* 03DC4 80B57174 C424AB88 */ lwc1 $f4, %lo(D_80B5AB88)($at) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B57458.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B57458.s index df0d1732d4..d18e08adf7 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B57458.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B57458.s @@ -35,7 +35,7 @@ glabel func_80B57458 /* 0412C 80B574DC 46001381 */ sub.s $f14, $f2, $f0 .L80B574E0: /* 04130 80B574E0 A7A3001C */ sh $v1, 0x001C($sp) -/* 04134 80B574E4 0C03F494 */ jal func_800FD250 +/* 04134 80B574E4 0C03F494 */ jal Math_atan2f /* 04138 80B574E8 AFA40048 */ sw $a0, 0x0048($sp) /* 0413C 80B574EC 3C0180B6 */ lui $at, %hi(D_80B5AB8C) ## $at = 80B60000 /* 04140 80B574F0 C432AB8C */ lwc1 $f18, %lo(D_80B5AB8C)($at) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B577BC.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B577BC.s index 67402e6ead..eb2e354df8 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B577BC.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B577BC.s @@ -12,7 +12,7 @@ glabel func_80B577BC /* 04434 80B577E4 E7B00038 */ swc1 $f16, 0x0038($sp) /* 04438 80B577E8 46105301 */ sub.s $f12, $f10, $f16 /* 0443C 80B577EC E7B20030 */ swc1 $f18, 0x0030($sp) -/* 04440 80B577F0 0C03F494 */ jal func_800FD250 +/* 04440 80B577F0 0C03F494 */ jal Math_atan2f /* 04444 80B577F4 46124381 */ sub.s $f14, $f8, $f18 /* 04448 80B577F8 3C0180B6 */ lui $at, %hi(D_80B5AB90) ## $at = 80B60000 /* 0444C 80B577FC C432AB90 */ lwc1 $f18, %lo(D_80B5AB90)($at) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B5944C.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B5944C.s index 42cf92c819..03994238ec 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B5944C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B5944C.s @@ -1,17 +1,17 @@ glabel func_80B5944C /* 0609C 80B5944C 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 /* 060A0 80B59450 2401000E */ addiu $at, $zero, 0x000E ## $at = 0000000E -/* 060A4 80B59454 AFBF001C */ sw $ra, 0x001C($sp) -/* 060A8 80B59458 AFB00018 */ sw $s0, 0x0018($sp) -/* 060AC 80B5945C AFA40020 */ sw $a0, 0x0020($sp) -/* 060B0 80B59460 AFA60028 */ sw $a2, 0x0028($sp) -/* 060B4 80B59464 14A10087 */ bne $a1, $at, .L80B59684 -/* 060B8 80B59468 AFA7002C */ sw $a3, 0x002C($sp) +/* 060A4 80B59454 AFBF001C */ sw $ra, 0x001C($sp) +/* 060A8 80B59458 AFB00018 */ sw $s0, 0x0018($sp) +/* 060AC 80B5945C AFA40020 */ sw $a0, 0x0020($sp) +/* 060B0 80B59460 AFA60028 */ sw $a2, 0x0028($sp) +/* 060B4 80B59464 14A10087 */ bne $a1, $at, .L80B59684 +/* 060B8 80B59468 AFA7002C */ sw $a3, 0x002C($sp) /* 060BC 80B5946C 8C840000 */ lw $a0, 0x0000($a0) ## 00000000 /* 060C0 80B59470 0C031A73 */ jal Graph_Alloc - + /* 060C4 80B59474 240501C0 */ addiu $a1, $zero, 0x01C0 ## $a1 = 000001C0 -/* 060C8 80B59478 8FA50038 */ lw $a1, 0x0038($sp) +/* 060C8 80B59478 8FA50038 */ lw $a1, 0x0038($sp) /* 060CC 80B5947C 3C0FDB06 */ lui $t7, 0xDB06 ## $t7 = DB060000 /* 060D0 80B59480 35EF0030 */ ori $t7, $t7, 0x0030 ## $t7 = DB060030 /* 060D4 80B59484 8CA40000 */ lw $a0, 0x0000($a1) ## 00000000 @@ -20,133 +20,133 @@ glabel func_80B5944C /* 060E0 80B59490 ACAE0000 */ sw $t6, 0x0000($a1) ## 00000000 /* 060E4 80B59494 AC820004 */ sw $v0, 0x0004($a0) ## 00000004 /* 060E8 80B59498 AC8F0000 */ sw $t7, 0x0000($a0) ## 00000000 -/* 060EC 80B5949C 8FA30030 */ lw $v1, 0x0030($sp) -/* 060F0 80B594A0 8FA20034 */ lw $v0, 0x0034($sp) +/* 060EC 80B5949C 8FA30030 */ lw $v1, 0x0030($sp) +/* 060F0 80B594A0 8FA20034 */ lw $v0, 0x0034($sp) /* 060F4 80B594A4 84780000 */ lh $t8, 0x0000($v1) ## 00000000 /* 060F8 80B594A8 84590402 */ lh $t9, 0x0402($v0) ## 00000402 /* 060FC 80B594AC 846A0004 */ lh $t2, 0x0004($v1) ## 00000004 /* 06100 80B594B0 24420400 */ addiu $v0, $v0, 0x0400 ## $v0 = 00000400 -/* 06104 80B594B4 03194821 */ addu $t1, $t8, $t9 +/* 06104 80B594B4 03194821 */ addu $t1, $t8, $t9 /* 06108 80B594B8 A4690000 */ sh $t1, 0x0000($v1) ## 00000000 /* 0610C 80B594BC 844B0000 */ lh $t3, 0x0000($v0) ## 00000400 -/* 06110 80B594C0 014B6021 */ addu $t4, $t2, $t3 -/* 06114 80B594C4 0C034213 */ jal Matrix_Push +/* 06110 80B594C0 014B6021 */ addu $t4, $t2, $t3 +/* 06114 80B594C4 0C034213 */ jal Matrix_Push /* 06118 80B594C8 A46C0004 */ sh $t4, 0x0004($v1) ## 00000004 -/* 0611C 80B594CC 8FA8002C */ lw $t0, 0x002C($sp) +/* 0611C 80B594CC 8FA8002C */ lw $t0, 0x002C($sp) /* 06120 80B594D0 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 /* 06124 80B594D4 C50C0000 */ lwc1 $f12, 0x0000($t0) ## 00000000 /* 06128 80B594D8 C50E0004 */ lwc1 $f14, 0x0004($t0) ## 00000004 -/* 0612C 80B594DC 0C034261 */ jal Matrix_Translate +/* 0612C 80B594DC 0C034261 */ jal Matrix_Translate /* 06130 80B594E0 8D060008 */ lw $a2, 0x0008($t0) ## 00000008 -/* 06134 80B594E4 8FA30030 */ lw $v1, 0x0030($sp) +/* 06134 80B594E4 8FA30030 */ lw $v1, 0x0030($sp) /* 06138 80B594E8 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 /* 0613C 80B594EC 84640000 */ lh $a0, 0x0000($v1) ## 00000000 /* 06140 80B594F0 84650002 */ lh $a1, 0x0002($v1) ## 00000002 -/* 06144 80B594F4 0C034421 */ jal Matrix_RotateXYZ +/* 06144 80B594F4 0C034421 */ jal Matrix_RotateZYX /* 06148 80B594F8 84660004 */ lh $a2, 0x0004($v1) ## 00000004 -/* 0614C 80B594FC 0C034213 */ jal Matrix_Push +/* 0614C 80B594FC 0C034213 */ jal Matrix_Push /* 06150 80B59500 00000000 */ nop /* 06154 80B59504 3C01432E */ lui $at, 0x432E ## $at = 432E0000 /* 06158 80B59508 44816000 */ mtc1 $at, $f12 ## $f12 = 174.00 /* 0615C 80B5950C 3C0180B6 */ lui $at, %hi(D_80B5AB94) ## $at = 80B60000 -/* 06160 80B59510 C42EAB94 */ lwc1 $f14, %lo(D_80B5AB94)($at) +/* 06160 80B59510 C42EAB94 */ lwc1 $f14, %lo(D_80B5AB94)($at) /* 06164 80B59514 24060000 */ addiu $a2, $zero, 0x0000 ## $a2 = 00000000 -/* 06168 80B59518 0C034261 */ jal Matrix_Translate +/* 06168 80B59518 0C034261 */ jal Matrix_Translate /* 0616C 80B5951C 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 /* 06170 80B59520 3C0580B6 */ lui $a1, %hi(D_80B5A824) ## $a1 = 80B60000 /* 06174 80B59524 24A5A824 */ addiu $a1, $a1, %lo(D_80B5A824) ## $a1 = 80B5A824 /* 06178 80B59528 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0617C 80B5952C 0C034695 */ jal Matrix_ToMtx +/* 0617C 80B5952C 0C034695 */ jal Matrix_ToMtx /* 06180 80B59530 240609A7 */ addiu $a2, $zero, 0x09A7 ## $a2 = 000009A7 /* 06184 80B59534 3C01C3CD */ lui $at, 0xC3CD ## $at = C3CD0000 /* 06188 80B59538 44816000 */ mtc1 $at, $f12 ## $f12 = -410.00 /* 0618C 80B5953C 3C01C338 */ lui $at, 0xC338 ## $at = C3380000 /* 06190 80B59540 44817000 */ mtc1 $at, $f14 ## $f14 = -184.00 /* 06194 80B59544 24060000 */ addiu $a2, $zero, 0x0000 ## $a2 = 00000000 -/* 06198 80B59548 0C034261 */ jal Matrix_Translate +/* 06198 80B59548 0C034261 */ jal Matrix_Translate /* 0619C 80B5954C 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 /* 061A0 80B59550 3C0580B6 */ lui $a1, %hi(D_80B5A83C) ## $a1 = 80B60000 /* 061A4 80B59554 24A5A83C */ addiu $a1, $a1, %lo(D_80B5A83C) ## $a1 = 80B5A83C /* 061A8 80B59558 26040040 */ addiu $a0, $s0, 0x0040 ## $a0 = 00000040 -/* 061AC 80B5955C 0C034695 */ jal Matrix_ToMtx +/* 061AC 80B5955C 0C034695 */ jal Matrix_ToMtx /* 061B0 80B59560 240609AA */ addiu $a2, $zero, 0x09AA ## $a2 = 000009AA /* 061B4 80B59564 3C0180B6 */ lui $at, %hi(D_80B5AB98) ## $at = 80B60000 -/* 061B8 80B59568 C42CAB98 */ lwc1 $f12, %lo(D_80B5AB98)($at) +/* 061B8 80B59568 C42CAB98 */ lwc1 $f12, %lo(D_80B5AB98)($at) /* 061BC 80B5956C 3C01C1D0 */ lui $at, 0xC1D0 ## $at = C1D00000 /* 061C0 80B59570 44817000 */ mtc1 $at, $f14 ## $f14 = -26.00 /* 061C4 80B59574 24060000 */ addiu $a2, $zero, 0x0000 ## $a2 = 00000000 -/* 061C8 80B59578 0C034261 */ jal Matrix_Translate +/* 061C8 80B59578 0C034261 */ jal Matrix_Translate /* 061CC 80B5957C 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 /* 061D0 80B59580 3C0580B6 */ lui $a1, %hi(D_80B5A854) ## $a1 = 80B60000 /* 061D4 80B59584 24A5A854 */ addiu $a1, $a1, %lo(D_80B5A854) ## $a1 = 80B5A854 /* 061D8 80B59588 26040080 */ addiu $a0, $s0, 0x0080 ## $a0 = 00000080 -/* 061DC 80B5958C 0C034695 */ jal Matrix_ToMtx +/* 061DC 80B5958C 0C034695 */ jal Matrix_ToMtx /* 061E0 80B59590 240609AD */ addiu $a2, $zero, 0x09AD ## $a2 = 000009AD -/* 061E4 80B59594 0C034221 */ jal Matrix_Pull +/* 061E4 80B59594 0C034221 */ jal Matrix_Pull /* 061E8 80B59598 00000000 */ nop -/* 061EC 80B5959C 0C034213 */ jal Matrix_Push +/* 061EC 80B5959C 0C034213 */ jal Matrix_Push /* 061F0 80B595A0 00000000 */ nop /* 061F4 80B595A4 3C014220 */ lui $at, 0x4220 ## $at = 42200000 /* 061F8 80B595A8 44816000 */ mtc1 $at, $f12 ## $f12 = 40.00 /* 061FC 80B595AC 3C014384 */ lui $at, 0x4384 ## $at = 43840000 /* 06200 80B595B0 44817000 */ mtc1 $at, $f14 ## $f14 = 264.00 /* 06204 80B595B4 3C0643C1 */ lui $a2, 0x43C1 ## $a2 = 43C10000 -/* 06208 80B595B8 0C034261 */ jal Matrix_Translate +/* 06208 80B595B8 0C034261 */ jal Matrix_Translate /* 0620C 80B595BC 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 /* 06210 80B595C0 3C0580B6 */ lui $a1, %hi(D_80B5A86C) ## $a1 = 80B60000 /* 06214 80B595C4 24A5A86C */ addiu $a1, $a1, %lo(D_80B5A86C) ## $a1 = 80B5A86C /* 06218 80B595C8 260400C0 */ addiu $a0, $s0, 0x00C0 ## $a0 = 000000C0 -/* 0621C 80B595CC 0C034695 */ jal Matrix_ToMtx +/* 0621C 80B595CC 0C034695 */ jal Matrix_ToMtx /* 06220 80B595D0 240609B3 */ addiu $a2, $zero, 0x09B3 ## $a2 = 000009B3 /* 06224 80B595D4 3C01C3DF */ lui $at, 0xC3DF ## $at = C3DF0000 /* 06228 80B595D8 44816000 */ mtc1 $at, $f12 ## $f12 = -446.00 /* 0622C 80B595DC 3C01C250 */ lui $at, 0xC250 ## $at = C2500000 /* 06230 80B595E0 44817000 */ mtc1 $at, $f14 ## $f14 = -52.00 /* 06234 80B595E4 3C0642A8 */ lui $a2, 0x42A8 ## $a2 = 42A80000 -/* 06238 80B595E8 0C034261 */ jal Matrix_Translate +/* 06238 80B595E8 0C034261 */ jal Matrix_Translate /* 0623C 80B595EC 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 /* 06240 80B595F0 3C0580B6 */ lui $a1, %hi(D_80B5A884) ## $a1 = 80B60000 /* 06244 80B595F4 24A5A884 */ addiu $a1, $a1, %lo(D_80B5A884) ## $a1 = 80B5A884 /* 06248 80B595F8 26040100 */ addiu $a0, $s0, 0x0100 ## $a0 = 00000100 -/* 0624C 80B595FC 0C034695 */ jal Matrix_ToMtx +/* 0624C 80B595FC 0C034695 */ jal Matrix_ToMtx /* 06250 80B59600 240609B6 */ addiu $a2, $zero, 0x09B6 ## $a2 = 000009B6 -/* 06254 80B59604 0C034221 */ jal Matrix_Pull +/* 06254 80B59604 0C034221 */ jal Matrix_Pull /* 06258 80B59608 00000000 */ nop -/* 0625C 80B5960C 0C034213 */ jal Matrix_Push +/* 0625C 80B5960C 0C034213 */ jal Matrix_Push /* 06260 80B59610 00000000 */ nop /* 06264 80B59614 3C014220 */ lui $at, 0x4220 ## $at = 42200000 /* 06268 80B59618 44816000 */ mtc1 $at, $f12 ## $f12 = 40.00 /* 0626C 80B5961C 3C014384 */ lui $at, 0x4384 ## $at = 43840000 /* 06270 80B59620 44817000 */ mtc1 $at, $f14 ## $f14 = 264.00 /* 06274 80B59624 3C06C3C1 */ lui $a2, 0xC3C1 ## $a2 = C3C10000 -/* 06278 80B59628 0C034261 */ jal Matrix_Translate +/* 06278 80B59628 0C034261 */ jal Matrix_Translate /* 0627C 80B5962C 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 /* 06280 80B59630 3C0580B6 */ lui $a1, %hi(D_80B5A89C) ## $a1 = 80B60000 /* 06284 80B59634 24A5A89C */ addiu $a1, $a1, %lo(D_80B5A89C) ## $a1 = 80B5A89C /* 06288 80B59638 26040140 */ addiu $a0, $s0, 0x0140 ## $a0 = 00000140 -/* 0628C 80B5963C 0C034695 */ jal Matrix_ToMtx +/* 0628C 80B5963C 0C034695 */ jal Matrix_ToMtx /* 06290 80B59640 240609BC */ addiu $a2, $zero, 0x09BC ## $a2 = 000009BC /* 06294 80B59644 3C01C3DF */ lui $at, 0xC3DF ## $at = C3DF0000 /* 06298 80B59648 44816000 */ mtc1 $at, $f12 ## $f12 = -446.00 /* 0629C 80B5964C 3C01C250 */ lui $at, 0xC250 ## $at = C2500000 /* 062A0 80B59650 44817000 */ mtc1 $at, $f14 ## $f14 = -52.00 /* 062A4 80B59654 3C06C2A8 */ lui $a2, 0xC2A8 ## $a2 = C2A80000 -/* 062A8 80B59658 0C034261 */ jal Matrix_Translate +/* 062A8 80B59658 0C034261 */ jal Matrix_Translate /* 062AC 80B5965C 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 /* 062B0 80B59660 3C0580B6 */ lui $a1, %hi(D_80B5A8B4) ## $a1 = 80B60000 /* 062B4 80B59664 24A5A8B4 */ addiu $a1, $a1, %lo(D_80B5A8B4) ## $a1 = 80B5A8B4 /* 062B8 80B59668 26040180 */ addiu $a0, $s0, 0x0180 ## $a0 = 00000180 -/* 062BC 80B5966C 0C034695 */ jal Matrix_ToMtx +/* 062BC 80B5966C 0C034695 */ jal Matrix_ToMtx /* 062C0 80B59670 240609BF */ addiu $a2, $zero, 0x09BF ## $a2 = 000009BF -/* 062C4 80B59674 0C034221 */ jal Matrix_Pull +/* 062C4 80B59674 0C034221 */ jal Matrix_Pull /* 062C8 80B59678 00000000 */ nop -/* 062CC 80B5967C 0C034221 */ jal Matrix_Pull +/* 062CC 80B5967C 0C034221 */ jal Matrix_Pull /* 062D0 80B59680 00000000 */ nop .L80B59684: -/* 062D4 80B59684 8FBF001C */ lw $ra, 0x001C($sp) -/* 062D8 80B59688 8FB00018 */ lw $s0, 0x0018($sp) +/* 062D4 80B59684 8FBF001C */ lw $ra, 0x001C($sp) +/* 062D8 80B59688 8FB00018 */ lw $s0, 0x0018($sp) /* 062DC 80B5968C 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 062E0 80B59690 03E00008 */ jr $ra +/* 062E0 80B59690 03E00008 */ jr $ra /* 062E4 80B59694 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B59FF4.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B59FF4.s index 0250498e14..0b2c6f4a2c 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B59FF4.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B59FF4.s @@ -1,51 +1,51 @@ glabel func_80B59FF4 /* 06C44 80B59FF4 27BDFF78 */ addiu $sp, $sp, 0xFF78 ## $sp = FFFFFF78 -/* 06C48 80B59FF8 AFBF002C */ sw $ra, 0x002C($sp) -/* 06C4C 80B59FFC AFB00028 */ sw $s0, 0x0028($sp) -/* 06C50 80B5A000 AFA40088 */ sw $a0, 0x0088($sp) -/* 06C54 80B5A004 AFA5008C */ sw $a1, 0x008C($sp) +/* 06C48 80B59FF8 AFBF002C */ sw $ra, 0x002C($sp) +/* 06C4C 80B59FFC AFB00028 */ sw $s0, 0x0028($sp) +/* 06C50 80B5A000 AFA40088 */ sw $a0, 0x0088($sp) +/* 06C54 80B5A004 AFA5008C */ sw $a1, 0x008C($sp) /* 06C58 80B5A008 84820244 */ lh $v0, 0x0244($a0) ## 00000244 /* 06C5C 80B5A00C 3C1880B6 */ lui $t8, %hi(D_80B5A43C) ## $t8 = 80B60000 /* 06C60 80B5A010 3C0A80B6 */ lui $t2, %hi(D_80B5A45C) ## $t2 = 80B60000 -/* 06C64 80B5A014 00027880 */ sll $t7, $v0, 2 -/* 06C68 80B5A018 030FC021 */ addu $t8, $t8, $t7 -/* 06C6C 80B5A01C 8F18A43C */ lw $t8, %lo(D_80B5A43C)($t8) +/* 06C64 80B5A014 00027880 */ sll $t7, $v0, 2 +/* 06C68 80B5A018 030FC021 */ addu $t8, $t8, $t7 +/* 06C6C 80B5A01C 8F18A43C */ lw $t8, %lo(D_80B5A43C)($t8) /* 06C70 80B5A020 3C0680B6 */ lui $a2, %hi(D_80B5AA4C) ## $a2 = 80B60000 /* 06C74 80B5A024 24C6AA4C */ addiu $a2, $a2, %lo(D_80B5AA4C) ## $a2 = 80B5AA4C -/* 06C78 80B5A028 AFB80078 */ sw $t8, 0x0078($sp) +/* 06C78 80B5A028 AFB80078 */ sw $t8, 0x0078($sp) /* 06C7C 80B5A02C 84830248 */ lh $v1, 0x0248($a0) ## 00000248 /* 06C80 80B5A030 27A40054 */ addiu $a0, $sp, 0x0054 ## $a0 = FFFFFFCC /* 06C84 80B5A034 24070875 */ addiu $a3, $zero, 0x0875 ## $a3 = 00000875 -/* 06C88 80B5A038 0003C880 */ sll $t9, $v1, 2 -/* 06C8C 80B5A03C 01595021 */ addu $t2, $t2, $t9 -/* 06C90 80B5A040 8D4AA45C */ lw $t2, %lo(D_80B5A45C)($t2) -/* 06C94 80B5A044 AFAA006C */ sw $t2, 0x006C($sp) +/* 06C88 80B5A038 0003C880 */ sll $t9, $v1, 2 +/* 06C8C 80B5A03C 01595021 */ addu $t2, $t2, $t9 +/* 06C90 80B5A040 8D4AA45C */ lw $t2, %lo(D_80B5A45C)($t2) +/* 06C94 80B5A044 AFAA006C */ sw $t2, 0x006C($sp) /* 06C98 80B5A048 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 -/* 06C9C 80B5A04C 0C031AB1 */ jal func_800C6AC4 +/* 06C9C 80B5A04C 0C031AB1 */ jal Graph_OpenDisps /* 06CA0 80B5A050 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 -/* 06CA4 80B5A054 8FAC008C */ lw $t4, 0x008C($sp) -/* 06CA8 80B5A058 0C024F46 */ jal func_80093D18 +/* 06CA4 80B5A054 8FAC008C */ lw $t4, 0x008C($sp) +/* 06CA8 80B5A058 0C024F46 */ jal func_80093D18 /* 06CAC 80B5A05C 8D840000 */ lw $a0, 0x0000($t4) ## 00000000 -/* 06CB0 80B5A060 8FA90078 */ lw $t1, 0x0078($sp) +/* 06CB0 80B5A060 8FA90078 */ lw $t1, 0x0078($sp) /* 06CB4 80B5A064 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 /* 06CB8 80B5A068 3C078016 */ lui $a3, 0x8016 ## $a3 = 80160000 -/* 06CBC 80B5A06C 0009C100 */ sll $t8, $t1, 4 -/* 06CC0 80B5A070 00187702 */ srl $t6, $t8, 28 +/* 06CBC 80B5A06C 0009C100 */ sll $t8, $t1, 4 +/* 06CC0 80B5A070 00187702 */ srl $t6, $t8, 28 /* 06CC4 80B5A074 3C0FDB06 */ lui $t7, 0xDB06 ## $t7 = DB060000 /* 06CC8 80B5A078 244D0008 */ addiu $t5, $v0, 0x0008 ## $t5 = 00000008 /* 06CCC 80B5A07C AE0D02C0 */ sw $t5, 0x02C0($s0) ## 000002C0 /* 06CD0 80B5A080 35EF0020 */ ori $t7, $t7, 0x0020 ## $t7 = DB060020 -/* 06CD4 80B5A084 000EC880 */ sll $t9, $t6, 2 +/* 06CD4 80B5A084 000EC880 */ sll $t9, $t6, 2 /* 06CD8 80B5A088 24E76FA8 */ addiu $a3, $a3, 0x6FA8 ## $a3 = 80166FA8 -/* 06CDC 80B5A08C 00F92021 */ addu $a0, $a3, $t9 +/* 06CDC 80B5A08C 00F92021 */ addu $a0, $a3, $t9 /* 06CE0 80B5A090 AC4F0000 */ sw $t7, 0x0000($v0) ## 00000000 /* 06CE4 80B5A094 8C8A0000 */ lw $t2, 0x0000($a0) ## 00000000 /* 06CE8 80B5A098 3C0800FF */ lui $t0, 0x00FF ## $t0 = 00FF0000 /* 06CEC 80B5A09C 3508FFFF */ ori $t0, $t0, 0xFFFF ## $t0 = 00FFFFFF -/* 06CF0 80B5A0A0 01282824 */ and $a1, $t1, $t0 +/* 06CF0 80B5A0A0 01282824 */ and $a1, $t1, $t0 /* 06CF4 80B5A0A4 3C068000 */ lui $a2, 0x8000 ## $a2 = 80000000 -/* 06CF8 80B5A0A8 01455821 */ addu $t3, $t2, $a1 -/* 06CFC 80B5A0AC 01666021 */ addu $t4, $t3, $a2 +/* 06CF8 80B5A0A8 01455821 */ addu $t3, $t2, $a1 +/* 06CFC 80B5A0AC 01666021 */ addu $t4, $t3, $a2 /* 06D00 80B5A0B0 AC4C0004 */ sw $t4, 0x0004($v0) ## 00000004 /* 06D04 80B5A0B4 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 /* 06D08 80B5A0B8 3C0FDB06 */ lui $t7, 0xDB06 ## $t7 = DB060000 @@ -56,23 +56,23 @@ glabel func_80B59FF4 /* 06D1C 80B5A0CC 8C980000 */ lw $t8, 0x0000($a0) ## 00000000 /* 06D20 80B5A0D0 3C0BDB06 */ lui $t3, 0xDB06 ## $t3 = DB060000 /* 06D24 80B5A0D4 356B0028 */ ori $t3, $t3, 0x0028 ## $t3 = DB060028 -/* 06D28 80B5A0D8 03057021 */ addu $t6, $t8, $a1 -/* 06D2C 80B5A0DC 01C6C821 */ addu $t9, $t6, $a2 +/* 06D28 80B5A0D8 03057021 */ addu $t6, $t8, $a1 +/* 06D2C 80B5A0DC 01C6C821 */ addu $t9, $t6, $a2 /* 06D30 80B5A0E0 AC590004 */ sw $t9, 0x0004($v0) ## 00000004 -/* 06D34 80B5A0E4 8FA4006C */ lw $a0, 0x006C($sp) +/* 06D34 80B5A0E4 8FA4006C */ lw $a0, 0x006C($sp) /* 06D38 80B5A0E8 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 -/* 06D3C 80B5A0EC 00046100 */ sll $t4, $a0, 4 -/* 06D40 80B5A0F0 000C6F02 */ srl $t5, $t4, 28 +/* 06D3C 80B5A0EC 00046100 */ sll $t4, $a0, 4 +/* 06D40 80B5A0F0 000C6F02 */ srl $t5, $t4, 28 /* 06D44 80B5A0F4 244A0008 */ addiu $t2, $v0, 0x0008 ## $t2 = 00000008 /* 06D48 80B5A0F8 AE0A02C0 */ sw $t2, 0x02C0($s0) ## 000002C0 -/* 06D4C 80B5A0FC 000D7880 */ sll $t7, $t5, 2 -/* 06D50 80B5A100 00EFC021 */ addu $t8, $a3, $t7 +/* 06D4C 80B5A0FC 000D7880 */ sll $t7, $t5, 2 +/* 06D50 80B5A100 00EFC021 */ addu $t8, $a3, $t7 /* 06D54 80B5A104 AC4B0000 */ sw $t3, 0x0000($v0) ## 00000000 /* 06D58 80B5A108 8F0E0000 */ lw $t6, 0x0000($t8) ## 00000000 -/* 06D5C 80B5A10C 0088C824 */ and $t9, $a0, $t0 +/* 06D5C 80B5A10C 0088C824 */ and $t9, $a0, $t0 /* 06D60 80B5A110 240F00FF */ addiu $t7, $zero, 0x00FF ## $t7 = 000000FF -/* 06D64 80B5A114 01D95021 */ addu $t2, $t6, $t9 -/* 06D68 80B5A118 01465821 */ addu $t3, $t2, $a2 +/* 06D64 80B5A114 01D95021 */ addu $t2, $t6, $t9 +/* 06D68 80B5A118 01465821 */ addu $t3, $t2, $a2 /* 06D6C 80B5A11C AC4B0004 */ sw $t3, 0x0004($v0) ## 00000004 /* 06D70 80B5A120 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 /* 06D74 80B5A124 3C0DFB00 */ lui $t5, 0xFB00 ## $t5 = FB000000 @@ -89,7 +89,7 @@ glabel func_80B59FF4 /* 06DA0 80B5A150 27396290 */ addiu $t9, $t9, 0x6290 ## $t9 = 80116290 /* 06DA4 80B5A154 AC590004 */ sw $t9, 0x0004($v0) ## 00000004 /* 06DA8 80B5A158 AC4E0000 */ sw $t6, 0x0000($v0) ## 00000000 -/* 06DAC 80B5A15C 8FA30088 */ lw $v1, 0x0088($sp) +/* 06DAC 80B5A15C 8FA30088 */ lw $v1, 0x0088($sp) /* 06DB0 80B5A160 3C0B80B5 */ lui $t3, %hi(func_80B54CE8) ## $t3 = 80B50000 /* 06DB4 80B5A164 3C0A80B6 */ lui $t2, %hi(func_80B59F74) ## $t2 = 80B60000 /* 06DB8 80B5A168 2462014C */ addiu $v0, $v1, 0x014C ## $v0 = 0000014C @@ -98,25 +98,25 @@ glabel func_80B59FF4 /* 06DC4 80B5A174 90470002 */ lbu $a3, 0x0002($v0) ## 0000014E /* 06DC8 80B5A178 254A9F74 */ addiu $t2, $t2, %lo(func_80B59F74) ## $t2 = 80B59F74 /* 06DCC 80B5A17C 256B4CE8 */ addiu $t3, $t3, %lo(func_80B54CE8) ## $t3 = 80B54CE8 -/* 06DD0 80B5A180 AFAB0014 */ sw $t3, 0x0014($sp) -/* 06DD4 80B5A184 AFAA0010 */ sw $t2, 0x0010($sp) -/* 06DD8 80B5A188 AFA30018 */ sw $v1, 0x0018($sp) +/* 06DD0 80B5A180 AFAB0014 */ sw $t3, 0x0014($sp) +/* 06DD4 80B5A184 AFAA0010 */ sw $t2, 0x0010($sp) +/* 06DD8 80B5A188 AFA30018 */ sw $v1, 0x0018($sp) /* 06DDC 80B5A18C 8E0C02C0 */ lw $t4, 0x02C0($s0) ## 000002C0 -/* 06DE0 80B5A190 8FA4008C */ lw $a0, 0x008C($sp) -/* 06DE4 80B5A194 0C0289CF */ jal func_800A273C -/* 06DE8 80B5A198 AFAC001C */ sw $t4, 0x001C($sp) +/* 06DE0 80B5A190 8FA4008C */ lw $a0, 0x008C($sp) +/* 06DE4 80B5A194 0C0289CF */ jal SkelAnime_DrawSV2 +/* 06DE8 80B5A198 AFAC001C */ sw $t4, 0x001C($sp) /* 06DEC 80B5A19C AE0202C0 */ sw $v0, 0x02C0($s0) ## 000002C0 -/* 06DF0 80B5A1A0 8FAD008C */ lw $t5, 0x008C($sp) +/* 06DF0 80B5A1A0 8FAD008C */ lw $t5, 0x008C($sp) /* 06DF4 80B5A1A4 3C0680B6 */ lui $a2, %hi(D_80B5AA5C) ## $a2 = 80B60000 /* 06DF8 80B5A1A8 24C6AA5C */ addiu $a2, $a2, %lo(D_80B5AA5C) ## $a2 = 80B5AA5C /* 06DFC 80B5A1AC 27A40054 */ addiu $a0, $sp, 0x0054 ## $a0 = FFFFFFCC /* 06E00 80B5A1B0 2407088E */ addiu $a3, $zero, 0x088E ## $a3 = 0000088E -/* 06E04 80B5A1B4 0C031AD5 */ jal func_800C6B54 +/* 06E04 80B5A1B4 0C031AD5 */ jal Graph_CloseDisps /* 06E08 80B5A1B8 8DA50000 */ lw $a1, 0x0000($t5) ## 00000000 -/* 06E0C 80B5A1BC 8FBF002C */ lw $ra, 0x002C($sp) -/* 06E10 80B5A1C0 8FB00028 */ lw $s0, 0x0028($sp) +/* 06E0C 80B5A1BC 8FBF002C */ lw $ra, 0x002C($sp) +/* 06E10 80B5A1C0 8FB00028 */ lw $s0, 0x0028($sp) /* 06E14 80B5A1C4 27BD0088 */ addiu $sp, $sp, 0x0088 ## $sp = 00000000 -/* 06E18 80B5A1C8 03E00008 */ jr $ra +/* 06E18 80B5A1C8 03E00008 */ jr $ra /* 06E1C 80B5A1CC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B5A1D0.s b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B5A1D0.s index e38c4942ca..cceaac2439 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B5A1D0.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl3/func_80B5A1D0.s @@ -1,52 +1,52 @@ glabel func_80B5A1D0 /* 06E20 80B5A1D0 27BDFF78 */ addiu $sp, $sp, 0xFF78 ## $sp = FFFFFF78 -/* 06E24 80B5A1D4 AFBF002C */ sw $ra, 0x002C($sp) -/* 06E28 80B5A1D8 AFB10028 */ sw $s1, 0x0028($sp) -/* 06E2C 80B5A1DC AFB00024 */ sw $s0, 0x0024($sp) -/* 06E30 80B5A1E0 AFA5008C */ sw $a1, 0x008C($sp) +/* 06E24 80B5A1D4 AFBF002C */ sw $ra, 0x002C($sp) +/* 06E28 80B5A1D8 AFB10028 */ sw $s1, 0x0028($sp) +/* 06E2C 80B5A1DC AFB00024 */ sw $s0, 0x0024($sp) +/* 06E30 80B5A1E0 AFA5008C */ sw $a1, 0x008C($sp) /* 06E34 80B5A1E4 84820244 */ lh $v0, 0x0244($a0) ## 00000244 /* 06E38 80B5A1E8 3C0F80B6 */ lui $t7, %hi(D_80B5A43C) ## $t7 = 80B60000 /* 06E3C 80B5A1EC 3C1980B6 */ lui $t9, %hi(D_80B5A45C) ## $t9 = 80B60000 -/* 06E40 80B5A1F0 00027080 */ sll $t6, $v0, 2 -/* 06E44 80B5A1F4 01EE7821 */ addu $t7, $t7, $t6 -/* 06E48 80B5A1F8 8DEFA43C */ lw $t7, %lo(D_80B5A43C)($t7) +/* 06E40 80B5A1F0 00027080 */ sll $t6, $v0, 2 +/* 06E44 80B5A1F4 01EE7821 */ addu $t7, $t7, $t6 +/* 06E48 80B5A1F8 8DEFA43C */ lw $t7, %lo(D_80B5A43C)($t7) /* 06E4C 80B5A1FC 00808825 */ or $s1, $a0, $zero ## $s1 = 00000000 /* 06E50 80B5A200 3C0680B6 */ lui $a2, %hi(D_80B5AA6C) ## $a2 = 80B60000 -/* 06E54 80B5A204 AFAF0078 */ sw $t7, 0x0078($sp) +/* 06E54 80B5A204 AFAF0078 */ sw $t7, 0x0078($sp) /* 06E58 80B5A208 84830248 */ lh $v1, 0x0248($a0) ## 00000248 /* 06E5C 80B5A20C 27A40054 */ addiu $a0, $sp, 0x0054 ## $a0 = FFFFFFCC /* 06E60 80B5A210 24C6AA6C */ addiu $a2, $a2, %lo(D_80B5AA6C) ## $a2 = 80B5AA6C -/* 06E64 80B5A214 0003C080 */ sll $t8, $v1, 2 -/* 06E68 80B5A218 0338C821 */ addu $t9, $t9, $t8 -/* 06E6C 80B5A21C 8F39A45C */ lw $t9, %lo(D_80B5A45C)($t9) +/* 06E64 80B5A214 0003C080 */ sll $t8, $v1, 2 +/* 06E68 80B5A218 0338C821 */ addu $t9, $t9, $t8 +/* 06E6C 80B5A21C 8F39A45C */ lw $t9, %lo(D_80B5A45C)($t9) /* 06E70 80B5A220 2407089D */ addiu $a3, $zero, 0x089D ## $a3 = 0000089D -/* 06E74 80B5A224 AFB9006C */ sw $t9, 0x006C($sp) +/* 06E74 80B5A224 AFB9006C */ sw $t9, 0x006C($sp) /* 06E78 80B5A228 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 -/* 06E7C 80B5A22C 0C031AB1 */ jal func_800C6AC4 +/* 06E7C 80B5A22C 0C031AB1 */ jal Graph_OpenDisps /* 06E80 80B5A230 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 -/* 06E84 80B5A234 8FAB008C */ lw $t3, 0x008C($sp) -/* 06E88 80B5A238 0C024F61 */ jal func_80093D84 +/* 06E84 80B5A234 8FAB008C */ lw $t3, 0x008C($sp) +/* 06E88 80B5A238 0C024F61 */ jal func_80093D84 /* 06E8C 80B5A23C 8D640000 */ lw $a0, 0x0000($t3) ## 00000000 -/* 06E90 80B5A240 8FA90078 */ lw $t1, 0x0078($sp) +/* 06E90 80B5A240 8FA90078 */ lw $t1, 0x0078($sp) /* 06E94 80B5A244 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 /* 06E98 80B5A248 3C078016 */ lui $a3, 0x8016 ## $a3 = 80160000 -/* 06E9C 80B5A24C 00097100 */ sll $t6, $t1, 4 -/* 06EA0 80B5A250 000E7F02 */ srl $t7, $t6, 28 +/* 06E9C 80B5A24C 00097100 */ sll $t6, $t1, 4 +/* 06EA0 80B5A250 000E7F02 */ srl $t7, $t6, 28 /* 06EA4 80B5A254 3C0DDB06 */ lui $t5, 0xDB06 ## $t5 = DB060000 /* 06EA8 80B5A258 244C0008 */ addiu $t4, $v0, 0x0008 ## $t4 = 00000008 /* 06EAC 80B5A25C AE0C02D0 */ sw $t4, 0x02D0($s0) ## 000002D0 /* 06EB0 80B5A260 35AD0020 */ ori $t5, $t5, 0x0020 ## $t5 = DB060020 -/* 06EB4 80B5A264 000FC080 */ sll $t8, $t7, 2 +/* 06EB4 80B5A264 000FC080 */ sll $t8, $t7, 2 /* 06EB8 80B5A268 24E76FA8 */ addiu $a3, $a3, 0x6FA8 ## $a3 = 80166FA8 -/* 06EBC 80B5A26C 00F82021 */ addu $a0, $a3, $t8 +/* 06EBC 80B5A26C 00F82021 */ addu $a0, $a3, $t8 /* 06EC0 80B5A270 AC4D0000 */ sw $t5, 0x0000($v0) ## 00000000 /* 06EC4 80B5A274 8C990000 */ lw $t9, 0x0000($a0) ## 00000000 /* 06EC8 80B5A278 3C0800FF */ lui $t0, 0x00FF ## $t0 = 00FF0000 /* 06ECC 80B5A27C 3508FFFF */ ori $t0, $t0, 0xFFFF ## $t0 = 00FFFFFF -/* 06ED0 80B5A280 01282824 */ and $a1, $t1, $t0 +/* 06ED0 80B5A280 01282824 */ and $a1, $t1, $t0 /* 06ED4 80B5A284 3C068000 */ lui $a2, 0x8000 ## $a2 = 80000000 -/* 06ED8 80B5A288 03255021 */ addu $t2, $t9, $a1 -/* 06EDC 80B5A28C 01465821 */ addu $t3, $t2, $a2 +/* 06ED8 80B5A288 03255021 */ addu $t2, $t9, $a1 +/* 06EDC 80B5A28C 01465821 */ addu $t3, $t2, $a2 /* 06EE0 80B5A290 AC4B0004 */ sw $t3, 0x0004($v0) ## 00000004 /* 06EE4 80B5A294 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 /* 06EE8 80B5A298 3C0DDB06 */ lui $t5, 0xDB06 ## $t5 = DB060000 @@ -57,23 +57,23 @@ glabel func_80B5A1D0 /* 06EFC 80B5A2AC 8C8E0000 */ lw $t6, 0x0000($a0) ## 00000000 /* 06F00 80B5A2B0 3C0ADB06 */ lui $t2, 0xDB06 ## $t2 = DB060000 /* 06F04 80B5A2B4 354A0028 */ ori $t2, $t2, 0x0028 ## $t2 = DB060028 -/* 06F08 80B5A2B8 01C57821 */ addu $t7, $t6, $a1 -/* 06F0C 80B5A2BC 01E6C021 */ addu $t8, $t7, $a2 +/* 06F08 80B5A2B8 01C57821 */ addu $t7, $t6, $a1 +/* 06F0C 80B5A2BC 01E6C021 */ addu $t8, $t7, $a2 /* 06F10 80B5A2C0 AC580004 */ sw $t8, 0x0004($v0) ## 00000004 -/* 06F14 80B5A2C4 8FA4006C */ lw $a0, 0x006C($sp) +/* 06F14 80B5A2C4 8FA4006C */ lw $a0, 0x006C($sp) /* 06F18 80B5A2C8 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 -/* 06F1C 80B5A2CC 00045900 */ sll $t3, $a0, 4 -/* 06F20 80B5A2D0 000B6702 */ srl $t4, $t3, 28 +/* 06F1C 80B5A2CC 00045900 */ sll $t3, $a0, 4 +/* 06F20 80B5A2D0 000B6702 */ srl $t4, $t3, 28 /* 06F24 80B5A2D4 24590008 */ addiu $t9, $v0, 0x0008 ## $t9 = 00000008 /* 06F28 80B5A2D8 AE1902D0 */ sw $t9, 0x02D0($s0) ## 000002D0 -/* 06F2C 80B5A2DC 000C6880 */ sll $t5, $t4, 2 -/* 06F30 80B5A2E0 00ED7021 */ addu $t6, $a3, $t5 +/* 06F2C 80B5A2DC 000C6880 */ sll $t5, $t4, 2 +/* 06F30 80B5A2E0 00ED7021 */ addu $t6, $a3, $t5 /* 06F34 80B5A2E4 AC4A0000 */ sw $t2, 0x0000($v0) ## 00000000 /* 06F38 80B5A2E8 8DCF0000 */ lw $t7, 0x0000($t6) ## 00000000 -/* 06F3C 80B5A2EC 0088C024 */ and $t8, $a0, $t0 +/* 06F3C 80B5A2EC 0088C024 */ and $t8, $a0, $t0 /* 06F40 80B5A2F0 3C0CFB00 */ lui $t4, 0xFB00 ## $t4 = FB000000 -/* 06F44 80B5A2F4 01F8C821 */ addu $t9, $t7, $t8 -/* 06F48 80B5A2F8 03265021 */ addu $t2, $t9, $a2 +/* 06F44 80B5A2F4 01F8C821 */ addu $t9, $t7, $t8 +/* 06F48 80B5A2F8 03265021 */ addu $t2, $t9, $a2 /* 06F4C 80B5A2FC AC4A0004 */ sw $t2, 0x0004($v0) ## 00000004 /* 06F50 80B5A300 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 /* 06F54 80B5A304 3C198011 */ lui $t9, 0x8011 ## $t9 = 80110000 @@ -97,25 +97,25 @@ glabel func_80B5A1D0 /* 06F9C 80B5A34C 8C450004 */ lw $a1, 0x0004($v0) ## 00000150 /* 06FA0 80B5A350 8C460020 */ lw $a2, 0x0020($v0) ## 0000016C /* 06FA4 80B5A354 90470002 */ lbu $a3, 0x0002($v0) ## 0000014E -/* 06FA8 80B5A358 AFB10018 */ sw $s1, 0x0018($sp) -/* 06FAC 80B5A35C AFA00014 */ sw $zero, 0x0014($sp) -/* 06FB0 80B5A360 AFAA0010 */ sw $t2, 0x0010($sp) +/* 06FA8 80B5A358 AFB10018 */ sw $s1, 0x0018($sp) +/* 06FAC 80B5A35C AFA00014 */ sw $zero, 0x0014($sp) +/* 06FB0 80B5A360 AFAA0010 */ sw $t2, 0x0010($sp) /* 06FB4 80B5A364 8E0B02D0 */ lw $t3, 0x02D0($s0) ## 000002D0 -/* 06FB8 80B5A368 8FA4008C */ lw $a0, 0x008C($sp) -/* 06FBC 80B5A36C 0C0289CF */ jal func_800A273C -/* 06FC0 80B5A370 AFAB001C */ sw $t3, 0x001C($sp) +/* 06FB8 80B5A368 8FA4008C */ lw $a0, 0x008C($sp) +/* 06FBC 80B5A36C 0C0289CF */ jal SkelAnime_DrawSV2 +/* 06FC0 80B5A370 AFAB001C */ sw $t3, 0x001C($sp) /* 06FC4 80B5A374 AE0202D0 */ sw $v0, 0x02D0($s0) ## 000002D0 -/* 06FC8 80B5A378 8FAC008C */ lw $t4, 0x008C($sp) +/* 06FC8 80B5A378 8FAC008C */ lw $t4, 0x008C($sp) /* 06FCC 80B5A37C 3C0680B6 */ lui $a2, %hi(D_80B5AA7C) ## $a2 = 80B60000 /* 06FD0 80B5A380 24C6AA7C */ addiu $a2, $a2, %lo(D_80B5AA7C) ## $a2 = 80B5AA7C /* 06FD4 80B5A384 27A40054 */ addiu $a0, $sp, 0x0054 ## $a0 = FFFFFFCC /* 06FD8 80B5A388 240708BA */ addiu $a3, $zero, 0x08BA ## $a3 = 000008BA -/* 06FDC 80B5A38C 0C031AD5 */ jal func_800C6B54 +/* 06FDC 80B5A38C 0C031AD5 */ jal Graph_CloseDisps /* 06FE0 80B5A390 8D850000 */ lw $a1, 0x0000($t4) ## 00000000 -/* 06FE4 80B5A394 8FBF002C */ lw $ra, 0x002C($sp) -/* 06FE8 80B5A398 8FB00024 */ lw $s0, 0x0024($sp) -/* 06FEC 80B5A39C 8FB10028 */ lw $s1, 0x0028($sp) -/* 06FF0 80B5A3A0 03E00008 */ jr $ra +/* 06FE4 80B5A394 8FBF002C */ lw $ra, 0x002C($sp) +/* 06FE8 80B5A398 8FB00024 */ lw $s0, 0x0024($sp) +/* 06FEC 80B5A39C 8FB10028 */ lw $s1, 0x0028($sp) +/* 06FF0 80B5A3A0 03E00008 */ jr $ra /* 06FF4 80B5A3A4 27BD0088 */ addiu $sp, $sp, 0x0088 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl4/EnZl4_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Zl4/EnZl4_Draw.s index 94e048a3ac..3f7d5d0858 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl4/EnZl4_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl4/EnZl4_Draw.s @@ -1,9 +1,9 @@ glabel EnZl4_Draw /* 02D9C 80B5E54C 27BDFF78 */ addiu $sp, $sp, 0xFF78 ## $sp = FFFFFF78 /* 02DA0 80B5E550 3C0F80B6 */ lui $t7, %hi(D_80B5FB48) ## $t7 = 80B60000 -/* 02DA4 80B5E554 AFBF002C */ sw $ra, 0x002C($sp) -/* 02DA8 80B5E558 AFB00028 */ sw $s0, 0x0028($sp) -/* 02DAC 80B5E55C AFA5008C */ sw $a1, 0x008C($sp) +/* 02DA4 80B5E554 AFBF002C */ sw $ra, 0x002C($sp) +/* 02DA8 80B5E558 AFB00028 */ sw $s0, 0x0028($sp) +/* 02DAC 80B5E55C AFA5008C */ sw $a1, 0x008C($sp) /* 02DB0 80B5E560 25EFFB48 */ addiu $t7, $t7, %lo(D_80B5FB48) ## $t7 = 80B5FB48 /* 02DB4 80B5E564 8DF90000 */ lw $t9, 0x0000($t7) ## 80B5FB48 /* 02DB8 80B5E568 8DF80004 */ lw $t8, 0x0004($t7) ## 80B5FB4C @@ -32,15 +32,15 @@ glabel EnZl4_Draw /* 02E14 80B5E5C4 AD4C0014 */ sw $t4, 0x0014($t2) ## FFFFFFE4 /* 02E18 80B5E5C8 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 02E1C 80B5E5CC AD4D0018 */ sw $t5, 0x0018($t2) ## FFFFFFE8 -/* 02E20 80B5E5D0 8FAE008C */ lw $t6, 0x008C($sp) +/* 02E20 80B5E5D0 8FAE008C */ lw $t6, 0x008C($sp) /* 02E24 80B5E5D4 3C0680B6 */ lui $a2, %hi(D_80B5FB80) ## $a2 = 80B60000 /* 02E28 80B5E5D8 24C6FB80 */ addiu $a2, $a2, %lo(D_80B5FB80) ## $a2 = 80B5FB80 /* 02E2C 80B5E5DC 8DC50000 */ lw $a1, 0x0000($t6) ## FFFFFFEC /* 02E30 80B5E5E0 27A40044 */ addiu $a0, $sp, 0x0044 ## $a0 = FFFFFFBC /* 02E34 80B5E5E4 240707DC */ addiu $a3, $zero, 0x07DC ## $a3 = 000007DC -/* 02E38 80B5E5E8 0C031AB1 */ jal func_800C6AC4 -/* 02E3C 80B5E5EC AFA50054 */ sw $a1, 0x0054($sp) -/* 02E40 80B5E5F0 8FA80054 */ lw $t0, 0x0054($sp) +/* 02E38 80B5E5E8 0C031AB1 */ jal Graph_OpenDisps +/* 02E3C 80B5E5EC AFA50054 */ sw $a1, 0x0054($sp) +/* 02E40 80B5E5F0 8FA80054 */ lw $t0, 0x0054($sp) /* 02E44 80B5E5F4 3C18DB06 */ lui $t8, 0xDB06 ## $t8 = DB060000 /* 02E48 80B5E5F8 37180020 */ ori $t8, $t8, 0x0020 ## $t8 = DB060020 /* 02E4C 80B5E5FC 8D0202C0 */ lw $v0, 0x02C0($t0) ## 000002C0 @@ -52,20 +52,20 @@ glabel EnZl4_Draw /* 02E64 80B5E614 9219020B */ lbu $t9, 0x020B($s0) ## 0000020B /* 02E68 80B5E618 24C66FA8 */ addiu $a2, $a2, 0x6FA8 ## $a2 = 80166FA8 /* 02E6C 80B5E61C 3C0500FF */ lui $a1, 0x00FF ## $a1 = 00FF0000 -/* 02E70 80B5E620 00195080 */ sll $t2, $t9, 2 -/* 02E74 80B5E624 012A5821 */ addu $t3, $t1, $t2 +/* 02E70 80B5E620 00195080 */ sll $t2, $t9, 2 +/* 02E74 80B5E624 012A5821 */ addu $t3, $t1, $t2 /* 02E78 80B5E628 8D640000 */ lw $a0, 0x0000($t3) ## 00000000 /* 02E7C 80B5E62C 34A5FFFF */ ori $a1, $a1, 0xFFFF ## $a1 = 00FFFFFF /* 02E80 80B5E630 3C078000 */ lui $a3, 0x8000 ## $a3 = 80000000 -/* 02E84 80B5E634 00046900 */ sll $t5, $a0, 4 -/* 02E88 80B5E638 000D7702 */ srl $t6, $t5, 28 -/* 02E8C 80B5E63C 000E7880 */ sll $t7, $t6, 2 -/* 02E90 80B5E640 00CFC021 */ addu $t8, $a2, $t7 +/* 02E84 80B5E634 00046900 */ sll $t5, $a0, 4 +/* 02E88 80B5E638 000D7702 */ srl $t6, $t5, 28 +/* 02E8C 80B5E63C 000E7880 */ sll $t7, $t6, 2 +/* 02E90 80B5E640 00CFC021 */ addu $t8, $a2, $t7 /* 02E94 80B5E644 8F190000 */ lw $t9, 0x0000($t8) ## DB060020 -/* 02E98 80B5E648 00856024 */ and $t4, $a0, $a1 +/* 02E98 80B5E648 00856024 */ and $t4, $a0, $a1 /* 02E9C 80B5E64C 3C0EDB06 */ lui $t6, 0xDB06 ## $t6 = DB060000 -/* 02EA0 80B5E650 01995021 */ addu $t2, $t4, $t9 -/* 02EA4 80B5E654 01475821 */ addu $t3, $t2, $a3 +/* 02EA0 80B5E650 01995021 */ addu $t2, $t4, $t9 +/* 02EA4 80B5E654 01475821 */ addu $t3, $t2, $a3 /* 02EA8 80B5E658 AC4B0004 */ sw $t3, 0x0004($v0) ## 00000004 /* 02EAC 80B5E65C 8D0202C0 */ lw $v0, 0x02C0($t0) ## 000002C0 /* 02EB0 80B5E660 35CE0024 */ ori $t6, $t6, 0x0024 ## $t6 = DB060024 @@ -73,18 +73,18 @@ glabel EnZl4_Draw /* 02EB8 80B5E668 AD0D02C0 */ sw $t5, 0x02C0($t0) ## 000002C0 /* 02EBC 80B5E66C AC4E0000 */ sw $t6, 0x0000($v0) ## 00000000 /* 02EC0 80B5E670 920F020A */ lbu $t7, 0x020A($s0) ## 0000020A -/* 02EC4 80B5E674 000FC080 */ sll $t8, $t7, 2 -/* 02EC8 80B5E678 01386021 */ addu $t4, $t1, $t8 +/* 02EC4 80B5E674 000FC080 */ sll $t8, $t7, 2 +/* 02EC8 80B5E678 01386021 */ addu $t4, $t1, $t8 /* 02ECC 80B5E67C 8D840000 */ lw $a0, 0x0000($t4) ## 00000000 -/* 02ED0 80B5E680 00045100 */ sll $t2, $a0, 4 -/* 02ED4 80B5E684 000A5F02 */ srl $t3, $t2, 28 -/* 02ED8 80B5E688 000B6880 */ sll $t5, $t3, 2 -/* 02EDC 80B5E68C 00CD7021 */ addu $t6, $a2, $t5 +/* 02ED0 80B5E680 00045100 */ sll $t2, $a0, 4 +/* 02ED4 80B5E684 000A5F02 */ srl $t3, $t2, 28 +/* 02ED8 80B5E688 000B6880 */ sll $t5, $t3, 2 +/* 02EDC 80B5E68C 00CD7021 */ addu $t6, $a2, $t5 /* 02EE0 80B5E690 8DCF0000 */ lw $t7, 0x0000($t6) ## DB060024 -/* 02EE4 80B5E694 0085C824 */ and $t9, $a0, $a1 +/* 02EE4 80B5E694 0085C824 */ and $t9, $a0, $a1 /* 02EE8 80B5E698 3C0BDB06 */ lui $t3, 0xDB06 ## $t3 = DB060000 -/* 02EEC 80B5E69C 032FC021 */ addu $t8, $t9, $t7 -/* 02EF0 80B5E6A0 03076021 */ addu $t4, $t8, $a3 +/* 02EEC 80B5E69C 032FC021 */ addu $t8, $t9, $t7 +/* 02EF0 80B5E6A0 03076021 */ addu $t4, $t8, $a3 /* 02EF4 80B5E6A4 AC4C0004 */ sw $t4, 0x0004($v0) ## 00000004 /* 02EF8 80B5E6A8 8D0202C0 */ lw $v0, 0x02C0($t0) ## 000002C0 /* 02EFC 80B5E6AC 356B0028 */ ori $t3, $t3, 0x0028 ## $t3 = DB060028 @@ -92,20 +92,20 @@ glabel EnZl4_Draw /* 02F04 80B5E6B4 AD0A02C0 */ sw $t2, 0x02C0($t0) ## 000002C0 /* 02F08 80B5E6B8 AC4B0000 */ sw $t3, 0x0000($v0) ## 00000000 /* 02F0C 80B5E6BC 920D020C */ lbu $t5, 0x020C($s0) ## 0000020C -/* 02F10 80B5E6C0 000D7080 */ sll $t6, $t5, 2 -/* 02F14 80B5E6C4 03AE2021 */ addu $a0, $sp, $t6 +/* 02F10 80B5E6C0 000D7080 */ sll $t6, $t5, 2 +/* 02F14 80B5E6C4 03AE2021 */ addu $a0, $sp, $t6 /* 02F18 80B5E6C8 8C840074 */ lw $a0, 0x0074($a0) ## 00000074 -/* 02F1C 80B5E6CC 00047900 */ sll $t7, $a0, 4 -/* 02F20 80B5E6D0 000FC702 */ srl $t8, $t7, 28 -/* 02F24 80B5E6D4 00186080 */ sll $t4, $t8, 2 -/* 02F28 80B5E6D8 00CC5021 */ addu $t2, $a2, $t4 +/* 02F1C 80B5E6CC 00047900 */ sll $t7, $a0, 4 +/* 02F20 80B5E6D0 000FC702 */ srl $t8, $t7, 28 +/* 02F24 80B5E6D4 00186080 */ sll $t4, $t8, 2 +/* 02F28 80B5E6D8 00CC5021 */ addu $t2, $a2, $t4 /* 02F2C 80B5E6DC 8D4B0000 */ lw $t3, 0x0000($t2) ## 00000008 -/* 02F30 80B5E6E0 0085C824 */ and $t9, $a0, $a1 -/* 02F34 80B5E6E4 032B6821 */ addu $t5, $t9, $t3 -/* 02F38 80B5E6E8 01A77021 */ addu $t6, $t5, $a3 +/* 02F30 80B5E6E0 0085C824 */ and $t9, $a0, $a1 +/* 02F34 80B5E6E4 032B6821 */ addu $t5, $t9, $t3 +/* 02F38 80B5E6E8 01A77021 */ addu $t6, $t5, $a3 /* 02F3C 80B5E6EC AC4E0004 */ sw $t6, 0x0004($v0) ## 00000004 -/* 02F40 80B5E6F0 8FAF008C */ lw $t7, 0x008C($sp) -/* 02F44 80B5E6F4 0C024F46 */ jal func_80093D18 +/* 02F40 80B5E6F0 8FAF008C */ lw $t7, 0x008C($sp) +/* 02F44 80B5E6F4 0C024F46 */ jal func_80093D18 /* 02F48 80B5E6F8 8DE40000 */ lw $a0, 0x0000($t7) ## 00000008 /* 02F4C 80B5E6FC 8E050150 */ lw $a1, 0x0150($s0) ## 00000150 /* 02F50 80B5E700 8E06016C */ lw $a2, 0x016C($s0) ## 0000016C @@ -114,22 +114,22 @@ glabel EnZl4_Draw /* 02F5C 80B5E70C 3C0C80B6 */ lui $t4, %hi(func_80B5E4F0) ## $t4 = 80B60000 /* 02F60 80B5E710 258CE4F0 */ addiu $t4, $t4, %lo(func_80B5E4F0) ## $t4 = 80B5E4F0 /* 02F64 80B5E714 2718E364 */ addiu $t8, $t8, %lo(func_80B5E364) ## $t8 = 80B5E364 -/* 02F68 80B5E718 AFB80010 */ sw $t8, 0x0010($sp) -/* 02F6C 80B5E71C AFAC0014 */ sw $t4, 0x0014($sp) -/* 02F70 80B5E720 AFB00018 */ sw $s0, 0x0018($sp) -/* 02F74 80B5E724 0C0286B2 */ jal func_800A1AC8 -/* 02F78 80B5E728 8FA4008C */ lw $a0, 0x008C($sp) -/* 02F7C 80B5E72C 8FAA008C */ lw $t2, 0x008C($sp) +/* 02F68 80B5E718 AFB80010 */ sw $t8, 0x0010($sp) +/* 02F6C 80B5E71C AFAC0014 */ sw $t4, 0x0014($sp) +/* 02F70 80B5E720 AFB00018 */ sw $s0, 0x0018($sp) +/* 02F74 80B5E724 0C0286B2 */ jal SkelAnime_DrawSV +/* 02F78 80B5E728 8FA4008C */ lw $a0, 0x008C($sp) +/* 02F7C 80B5E72C 8FAA008C */ lw $t2, 0x008C($sp) /* 02F80 80B5E730 3C0680B6 */ lui $a2, %hi(D_80B5FB90) ## $a2 = 80B60000 /* 02F84 80B5E734 24C6FB90 */ addiu $a2, $a2, %lo(D_80B5FB90) ## $a2 = 80B5FB90 /* 02F88 80B5E738 27A40044 */ addiu $a0, $sp, 0x0044 ## $a0 = FFFFFFBC /* 02F8C 80B5E73C 240707FB */ addiu $a3, $zero, 0x07FB ## $a3 = 000007FB -/* 02F90 80B5E740 0C031AD5 */ jal func_800C6B54 +/* 02F90 80B5E740 0C031AD5 */ jal Graph_CloseDisps /* 02F94 80B5E744 8D450000 */ lw $a1, 0x0000($t2) ## 00000000 -/* 02F98 80B5E748 8FBF002C */ lw $ra, 0x002C($sp) -/* 02F9C 80B5E74C 8FB00028 */ lw $s0, 0x0028($sp) +/* 02F98 80B5E748 8FBF002C */ lw $ra, 0x002C($sp) +/* 02F9C 80B5E74C 8FB00028 */ lw $s0, 0x0028($sp) /* 02FA0 80B5E750 27BD0088 */ addiu $sp, $sp, 0x0088 ## $sp = 00000000 -/* 02FA4 80B5E754 03E00008 */ jr $ra +/* 02FA4 80B5E754 03E00008 */ jr $ra /* 02FA8 80B5E758 00000000 */ nop /* 02FAC 80B5E75C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl4/EnZl4_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Zl4/EnZl4_Init.s index 6406f1e156..296ba4bbf6 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl4/EnZl4_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl4/EnZl4_Init.s @@ -1,56 +1,56 @@ glabel EnZl4_Init /* 005FC 80B5BDAC 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 -/* 00600 80B5BDB0 AFB00024 */ sw $s0, 0x0024($sp) +/* 00600 80B5BDB0 AFB00024 */ sw $s0, 0x0024($sp) /* 00604 80B5BDB4 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00608 80B5BDB8 AFB10028 */ sw $s1, 0x0028($sp) -/* 0060C 80B5BDBC AFBF002C */ sw $ra, 0x002C($sp) -/* 00610 80B5BDC0 AFA50044 */ sw $a1, 0x0044($sp) +/* 00608 80B5BDB8 AFB10028 */ sw $s1, 0x0028($sp) +/* 0060C 80B5BDBC AFBF002C */ sw $ra, 0x002C($sp) +/* 00610 80B5BDC0 AFA50044 */ sw $a1, 0x0044($sp) /* 00614 80B5BDC4 2611014C */ addiu $s1, $s0, 0x014C ## $s1 = 0000014C /* 00618 80B5BDC8 260E0218 */ addiu $t6, $s0, 0x0218 ## $t6 = 00000218 /* 0061C 80B5BDCC 260F0284 */ addiu $t7, $s0, 0x0284 ## $t7 = 00000284 /* 00620 80B5BDD0 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 /* 00624 80B5BDD4 3C060601 */ lui $a2, 0x0601 ## $a2 = 06010000 /* 00628 80B5BDD8 24180012 */ addiu $t8, $zero, 0x0012 ## $t8 = 00000012 -/* 0062C 80B5BDDC AFB80018 */ sw $t8, 0x0018($sp) +/* 0062C 80B5BDDC AFB80018 */ sw $t8, 0x0018($sp) /* 00630 80B5BDE0 24C6E038 */ addiu $a2, $a2, 0xE038 ## $a2 = 0600E038 /* 00634 80B5BDE4 02202825 */ or $a1, $s1, $zero ## $a1 = 0000014C -/* 00638 80B5BDE8 AFAF0014 */ sw $t7, 0x0014($sp) -/* 0063C 80B5BDEC AFAE0010 */ sw $t6, 0x0010($sp) -/* 00640 80B5BDF0 0C0291BE */ jal func_800A46F8 +/* 00638 80B5BDE8 AFAF0014 */ sw $t7, 0x0014($sp) +/* 0063C 80B5BDEC AFAE0010 */ sw $t6, 0x0010($sp) +/* 00640 80B5BDF0 0C0291BE */ jal SkelAnime_InitSV /* 00644 80B5BDF4 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 /* 00648 80B5BDF8 3C068003 */ lui $a2, 0x8003 ## $a2 = 80030000 /* 0064C 80B5BDFC 24C6B5EC */ addiu $a2, $a2, 0xB5EC ## $a2 = 8002B5EC /* 00650 80B5BE00 260400B4 */ addiu $a0, $s0, 0x00B4 ## $a0 = 000000B4 /* 00654 80B5BE04 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 /* 00658 80B5BE08 0C00AC78 */ jal ActorShape_Init - + /* 0065C 80B5BE0C 3C074190 */ lui $a3, 0x4190 ## $a3 = 41900000 /* 00660 80B5BE10 3C0580B6 */ lui $a1, %hi(D_80B5E7B8) ## $a1 = 80B60000 /* 00664 80B5BE14 24A5E7B8 */ addiu $a1, $a1, %lo(D_80B5E7B8) ## $a1 = 80B5E7B8 /* 00668 80B5BE18 02202025 */ or $a0, $s1, $zero ## $a0 = 0000014C -/* 0066C 80B5BE1C 0C00D3B0 */ jal func_80034EC0 +/* 0066C 80B5BE1C 0C00D3B0 */ jal func_80034EC0 /* 00670 80B5BE20 24060015 */ addiu $a2, $zero, 0x0015 ## $a2 = 00000015 /* 00674 80B5BE24 26050194 */ addiu $a1, $s0, 0x0194 ## $a1 = 00000194 -/* 00678 80B5BE28 AFA50030 */ sw $a1, 0x0030($sp) +/* 00678 80B5BE28 AFA50030 */ sw $a1, 0x0030($sp) /* 0067C 80B5BE2C 0C0170D9 */ jal ActorCollider_AllocCylinder - -/* 00680 80B5BE30 8FA40044 */ lw $a0, 0x0044($sp) + +/* 00680 80B5BE30 8FA40044 */ lw $a0, 0x0044($sp) /* 00684 80B5BE34 3C0780B6 */ lui $a3, %hi(D_80B5E780) ## $a3 = 80B60000 -/* 00688 80B5BE38 8FA50030 */ lw $a1, 0x0030($sp) +/* 00688 80B5BE38 8FA50030 */ lw $a1, 0x0030($sp) /* 0068C 80B5BE3C 24E7E780 */ addiu $a3, $a3, %lo(D_80B5E780) ## $a3 = 80B5E780 -/* 00690 80B5BE40 8FA40044 */ lw $a0, 0x0044($sp) +/* 00690 80B5BE40 8FA40044 */ lw $a0, 0x0044($sp) /* 00694 80B5BE44 0C01712B */ jal ActorCollider_InitCylinder - + /* 00698 80B5BE48 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 0069C 80B5BE4C 3C0680B6 */ lui $a2, %hi(D_80B5E7AC) ## $a2 = 80B60000 /* 006A0 80B5BE50 24C6E7AC */ addiu $a2, $a2, %lo(D_80B5E7AC) ## $a2 = 80B5E7AC /* 006A4 80B5BE54 26040098 */ addiu $a0, $s0, 0x0098 ## $a0 = 00000098 -/* 006A8 80B5BE58 0C0187BF */ jal func_80061EFC +/* 006A8 80B5BE58 0C0187BF */ jal func_80061EFC /* 006AC 80B5BE5C 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 006B0 80B5BE60 3C053C23 */ lui $a1, 0x3C23 ## $a1 = 3C230000 /* 006B4 80B5BE64 34A5D70A */ ori $a1, $a1, 0xD70A ## $a1 = 3C23D70A /* 006B8 80B5BE68 0C00B58B */ jal Actor_SetScale - + /* 006BC 80B5BE6C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 006C0 80B5BE70 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 /* 006C4 80B5BE74 24190006 */ addiu $t9, $zero, 0x0006 ## $t9 = 00000006 @@ -63,48 +63,48 @@ glabel EnZl4_Init /* 006E0 80B5BE90 8C4A1360 */ lw $t2, 0x1360($v0) ## 8015F9C0 /* 006E4 80B5BE94 3C0580B6 */ lui $a1, %hi(D_80B5E7B8) ## $a1 = 80B60000 /* 006E8 80B5BE98 24A5E7B8 */ addiu $a1, $a1, %lo(D_80B5E7B8) ## $a1 = 80B5E7B8 -/* 006EC 80B5BE9C 29410004 */ slti $at, $t2, 0x0004 -/* 006F0 80B5BEA0 14200007 */ bne $at, $zero, .L80B5BEC0 +/* 006EC 80B5BE9C 29410004 */ slti $at, $t2, 0x0004 +/* 006F0 80B5BEA0 14200007 */ bne $at, $zero, .L80B5BEC0 /* 006F4 80B5BEA4 02202025 */ or $a0, $s1, $zero ## $a0 = 0000014C -/* 006F8 80B5BEA8 0C00D3B0 */ jal func_80034EC0 +/* 006F8 80B5BEA8 0C00D3B0 */ jal func_80034EC0 /* 006FC 80B5BEAC 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 /* 00700 80B5BEB0 3C0B80B6 */ lui $t3, %hi(func_80B5E108) ## $t3 = 80B60000 /* 00704 80B5BEB4 256BE108 */ addiu $t3, $t3, %lo(func_80B5E108) ## $t3 = 80B5E108 -/* 00708 80B5BEB8 10000026 */ beq $zero, $zero, .L80B5BF54 +/* 00708 80B5BEB8 10000026 */ beq $zero, $zero, .L80B5BF54 /* 0070C 80B5BEBC AE0B0190 */ sw $t3, 0x0190($s0) ## 00000190 .L80B5BEC0: /* 00710 80B5BEC0 944C0EDC */ lhu $t4, 0x0EDC($v0) ## 00000EDC /* 00714 80B5BEC4 3C0580B6 */ lui $a1, %hi(D_80B5E7B8) ## $a1 = 80B60000 /* 00718 80B5BEC8 24A5E7B8 */ addiu $a1, $a1, %lo(D_80B5E7B8) ## $a1 = 80B5E7B8 /* 0071C 80B5BECC 318D0001 */ andi $t5, $t4, 0x0001 ## $t5 = 00000000 -/* 00720 80B5BED0 11A00007 */ beq $t5, $zero, .L80B5BEF0 +/* 00720 80B5BED0 11A00007 */ beq $t5, $zero, .L80B5BEF0 /* 00724 80B5BED4 02202025 */ or $a0, $s1, $zero ## $a0 = 0000014C -/* 00728 80B5BED8 0C00D3B0 */ jal func_80034EC0 +/* 00728 80B5BED8 0C00D3B0 */ jal func_80034EC0 /* 0072C 80B5BEDC 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 /* 00730 80B5BEE0 3C0E80B6 */ lui $t6, %hi(func_80B5E090) ## $t6 = 80B60000 /* 00734 80B5BEE4 25CEE090 */ addiu $t6, $t6, %lo(func_80B5E090) ## $t6 = 80B5E090 -/* 00738 80B5BEE8 1000001A */ beq $zero, $zero, .L80B5BF54 +/* 00738 80B5BEE8 1000001A */ beq $zero, $zero, .L80B5BF54 /* 0073C 80B5BEEC AE0E0190 */ sw $t6, 0x0190($s0) ## 00000190 .L80B5BEF0: /* 00740 80B5BEF0 8C4F0000 */ lw $t7, 0x0000($v0) ## 00000000 /* 00744 80B5BEF4 240105F0 */ addiu $at, $zero, 0x05F0 ## $at = 000005F0 /* 00748 80B5BEF8 3C0580B6 */ lui $a1, %hi(D_80B5E7B8) ## $a1 = 80B60000 -/* 0074C 80B5BEFC 11E10008 */ beq $t7, $at, .L80B5BF20 +/* 0074C 80B5BEFC 11E10008 */ beq $t7, $at, .L80B5BF20 /* 00750 80B5BF00 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 00754 80B5BF04 02202025 */ or $a0, $s1, $zero ## $a0 = 0000014C /* 00758 80B5BF08 24A5E7B8 */ addiu $a1, $a1, %lo(D_80B5E7B8) ## $a1 = 80B5E7B8 -/* 0075C 80B5BF0C 0C00D3B0 */ jal func_80034EC0 +/* 0075C 80B5BF0C 0C00D3B0 */ jal func_80034EC0 /* 00760 80B5BF10 24060015 */ addiu $a2, $zero, 0x0015 ## $a2 = 00000015 /* 00764 80B5BF14 A2000209 */ sb $zero, 0x0209($s0) ## 00000209 -/* 00768 80B5BF18 1000000B */ beq $zero, $zero, .L80B5BF48 +/* 00768 80B5BF18 1000000B */ beq $zero, $zero, .L80B5BF48 /* 0076C 80B5BF1C A2000208 */ sb $zero, 0x0208($s0) ## 00000208 .L80B5BF20: -/* 00770 80B5BF20 0C2D6F00 */ jal func_80B5BC00 -/* 00774 80B5BF24 8FA50044 */ lw $a1, 0x0044($sp) +/* 00770 80B5BF20 0C2D6F00 */ jal func_80B5BC00 +/* 00774 80B5BF24 8FA50044 */ lw $a1, 0x0044($sp) /* 00778 80B5BF28 3C0580B6 */ lui $a1, %hi(D_80B5E7B8) ## $a1 = 80B60000 /* 0077C 80B5BF2C 24A5E7B8 */ addiu $a1, $a1, %lo(D_80B5E7B8) ## $a1 = 80B5E7B8 /* 00780 80B5BF30 02202025 */ or $a0, $s1, $zero ## $a0 = 0000014C -/* 00784 80B5BF34 0C00D3B0 */ jal func_80034EC0 +/* 00784 80B5BF34 0C00D3B0 */ jal func_80034EC0 /* 00788 80B5BF38 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 /* 0078C 80B5BF3C 24180005 */ addiu $t8, $zero, 0x0005 ## $t8 = 00000005 /* 00790 80B5BF40 A2180209 */ sb $t8, 0x0209($s0) ## 00000209 @@ -114,10 +114,10 @@ glabel EnZl4_Init /* 0079C 80B5BF4C 2739DE1C */ addiu $t9, $t9, %lo(func_80B5DE1C) ## $t9 = 80B5DE1C /* 007A0 80B5BF50 AE190190 */ sw $t9, 0x0190($s0) ## 00000190 .L80B5BF54: -/* 007A4 80B5BF54 8FBF002C */ lw $ra, 0x002C($sp) -/* 007A8 80B5BF58 8FB00024 */ lw $s0, 0x0024($sp) -/* 007AC 80B5BF5C 8FB10028 */ lw $s1, 0x0028($sp) -/* 007B0 80B5BF60 03E00008 */ jr $ra +/* 007A4 80B5BF54 8FBF002C */ lw $ra, 0x002C($sp) +/* 007A8 80B5BF58 8FB00024 */ lw $s0, 0x0024($sp) +/* 007AC 80B5BF5C 8FB10028 */ lw $s1, 0x0028($sp) +/* 007B0 80B5BF60 03E00008 */ jr $ra /* 007B4 80B5BF64 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl4/func_80B5B90C.s b/asm/non_matchings/overlays/actors/ovl_En_Zl4/func_80B5B90C.s index fb81e087a9..82e742e2b0 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl4/func_80B5B90C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl4/func_80B5B90C.s @@ -2,7 +2,7 @@ glabel func_80B5B90C /* 0015C 80B5B90C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 00160 80B5B910 AFBF0014 */ sw $ra, 0x0014($sp) /* 00164 80B5B914 AFA5001C */ sw $a1, 0x001C($sp) -/* 00168 80B5B918 0C01B0D8 */ jal func_8006C360 +/* 00168 80B5B918 0C01B0D8 */ jal Text_GetFaceReaction /* 0016C 80B5B91C 24050016 */ addiu $a1, $zero, 0x0016 ## $a1 = 00000016 /* 00170 80B5B920 10400003 */ beq $v0, $zero, .L80B5B930 /* 00174 80B5B924 3043FFFF */ andi $v1, $v0, 0xFFFF ## $v1 = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zl4/func_80B5BB38.s b/asm/non_matchings/overlays/actors/ovl_En_Zl4/func_80B5BB38.s index c8deb3fa96..d274d6aec9 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zl4/func_80B5BB38.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zl4/func_80B5BB38.s @@ -1,19 +1,19 @@ glabel func_80B5BB38 /* 00388 80B5BB38 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 0038C 80B5BB3C AFBF0014 */ sw $ra, 0x0014($sp) -/* 00390 80B5BB40 AFA40018 */ sw $a0, 0x0018($sp) -/* 00394 80B5BB44 AFA5001C */ sw $a1, 0x001C($sp) +/* 0038C 80B5BB3C AFBF0014 */ sw $ra, 0x0014($sp) +/* 00390 80B5BB40 AFA40018 */ sw $a0, 0x0018($sp) +/* 00394 80B5BB44 AFA5001C */ sw $a1, 0x001C($sp) /* 00398 80B5BB48 908E0181 */ lbu $t6, 0x0181($a0) ## 00000181 /* 0039C 80B5BB4C 00802825 */ or $a1, $a0, $zero ## $a1 = 00000000 /* 003A0 80B5BB50 24A6014C */ addiu $a2, $a1, 0x014C ## $a2 = 0000014C /* 003A4 80B5BB54 35CF0001 */ ori $t7, $t6, 0x0001 ## $t7 = 00000001 /* 003A8 80B5BB58 A08F0181 */ sb $t7, 0x0181($a0) ## 00000181 -/* 003AC 80B5BB5C 8FA4001C */ lw $a0, 0x001C($sp) -/* 003B0 80B5BB60 0C028D88 */ jal func_800A3620 +/* 003AC 80B5BB5C 8FA4001C */ lw $a0, 0x001C($sp) +/* 003B0 80B5BB60 0C028D88 */ jal SkelAnime_LoadAnimationType5 /* 003B4 80B5BB64 3C073F80 */ lui $a3, 0x3F80 ## $a3 = 3F800000 -/* 003B8 80B5BB68 8FBF0014 */ lw $ra, 0x0014($sp) +/* 003B8 80B5BB68 8FBF0014 */ lw $ra, 0x0014($sp) /* 003BC 80B5BB6C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 003C0 80B5BB70 03E00008 */ jr $ra +/* 003C0 80B5BB70 03E00008 */ jr $ra /* 003C4 80B5BB74 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zo/EnZo_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_Zo/EnZo_Draw.s index 7e0c86b554..7c7c543143 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zo/EnZo_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zo/EnZo_Draw.s @@ -37,7 +37,7 @@ glabel EnZo_Draw /* 020AC 80B622CC 8FBF0024 */ lw $ra, 0x0024($sp) /* 020B0 80B622D0 8E250000 */ lw $a1, 0x0000($s1) ## 00000000 /* 020B4 80B622D4 240703F0 */ addiu $a3, $zero, 0x03F0 ## $a3 = 000003F0 -/* 020B8 80B622D8 0C031AB1 */ jal func_800C6AC4 +/* 020B8 80B622D8 0C031AB1 */ jal Graph_OpenDisps /* 020BC 80B622DC AFA50044 */ sw $a1, 0x0044($sp) /* 020C0 80B622E0 3C01437F */ lui $at, 0x437F ## $at = 437F0000 /* 020C4 80B622E4 44814000 */ mtc1 $at, $f8 ## $f8 = 255.00 @@ -125,7 +125,7 @@ glabel EnZo_Draw /* 02204 80B62424 24C62684 */ addiu $a2, $a2, %lo(D_80B62684) ## $a2 = 80B62684 /* 02208 80B62428 27A40034 */ addiu $a0, $sp, 0x0034 ## $a0 = FFFFFFDC /* 0220C 80B6242C 8E250000 */ lw $a1, 0x0000($s1) ## 00000000 -/* 02210 80B62430 0C031AD5 */ jal func_800C6B54 +/* 02210 80B62430 0C031AD5 */ jal Graph_CloseDisps /* 02214 80B62434 24070401 */ addiu $a3, $zero, 0x0401 ## $a3 = 00000401 /* 02218 80B62438 8FBF0024 */ lw $ra, 0x0024($sp) .L80B6243C: diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zo/EnZo_Init.s b/asm/non_matchings/overlays/actors/ovl_En_Zo/EnZo_Init.s index 03f40ad879..7827fdf0b1 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zo/EnZo_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zo/EnZo_Init.s @@ -1,69 +1,69 @@ glabel EnZo_Init /* 014BC 80B616DC 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 /* 014C0 80B616E0 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 -/* 014C4 80B616E4 AFB00028 */ sw $s0, 0x0028($sp) -/* 014C8 80B616E8 AFA50044 */ sw $a1, 0x0044($sp) +/* 014C4 80B616E4 AFB00028 */ sw $s0, 0x0028($sp) +/* 014C8 80B616E8 AFA50044 */ sw $a1, 0x0044($sp) /* 014CC 80B616EC 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 014D0 80B616F0 AFBF002C */ sw $ra, 0x002C($sp) -/* 014D4 80B616F4 44050000 */ mfc1 $a1, $f0 -/* 014D8 80B616F8 44070000 */ mfc1 $a3, $f0 +/* 014D0 80B616F0 AFBF002C */ sw $ra, 0x002C($sp) +/* 014D4 80B616F4 44050000 */ mfc1 $a1, $f0 +/* 014D8 80B616F8 44070000 */ mfc1 $a3, $f0 /* 014DC 80B616FC 248400B4 */ addiu $a0, $a0, 0x00B4 ## $a0 = 000000B4 /* 014E0 80B61700 0C00AC78 */ jal ActorShape_Init - + /* 014E4 80B61704 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 /* 014E8 80B61708 2605014C */ addiu $a1, $s0, 0x014C ## $a1 = 0000014C /* 014EC 80B6170C 3C060601 */ lui $a2, 0x0601 ## $a2 = 06010000 /* 014F0 80B61710 260E020A */ addiu $t6, $s0, 0x020A ## $t6 = 0000020A /* 014F4 80B61714 260F0282 */ addiu $t7, $s0, 0x0282 ## $t7 = 00000282 /* 014F8 80B61718 24180014 */ addiu $t8, $zero, 0x0014 ## $t8 = 00000014 -/* 014FC 80B6171C AFB80018 */ sw $t8, 0x0018($sp) -/* 01500 80B61720 AFAF0014 */ sw $t7, 0x0014($sp) -/* 01504 80B61724 AFAE0010 */ sw $t6, 0x0010($sp) +/* 014FC 80B6171C AFB80018 */ sw $t8, 0x0018($sp) +/* 01500 80B61720 AFAF0014 */ sw $t7, 0x0014($sp) +/* 01504 80B61724 AFAE0010 */ sw $t6, 0x0010($sp) /* 01508 80B61728 24C6BFA8 */ addiu $a2, $a2, 0xBFA8 ## $a2 = 0600BFA8 -/* 0150C 80B6172C AFA50038 */ sw $a1, 0x0038($sp) -/* 01510 80B61730 8FA40044 */ lw $a0, 0x0044($sp) -/* 01514 80B61734 0C0291BE */ jal func_800A46F8 +/* 0150C 80B6172C AFA50038 */ sw $a1, 0x0038($sp) +/* 01510 80B61730 8FA40044 */ lw $a0, 0x0044($sp) +/* 01514 80B61734 0C0291BE */ jal SkelAnime_InitSV /* 01518 80B61738 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 /* 0151C 80B6173C 260501BC */ addiu $a1, $s0, 0x01BC ## $a1 = 000001BC -/* 01520 80B61740 AFA50034 */ sw $a1, 0x0034($sp) +/* 01520 80B61740 AFA50034 */ sw $a1, 0x0034($sp) /* 01524 80B61744 0C0170D9 */ jal ActorCollider_AllocCylinder - -/* 01528 80B61748 8FA40044 */ lw $a0, 0x0044($sp) + +/* 01528 80B61748 8FA40044 */ lw $a0, 0x0044($sp) /* 0152C 80B6174C 3C0780B6 */ lui $a3, %hi(D_80B6248C) ## $a3 = 80B60000 -/* 01530 80B61750 8FA50034 */ lw $a1, 0x0034($sp) +/* 01530 80B61750 8FA50034 */ lw $a1, 0x0034($sp) /* 01534 80B61754 24E7248C */ addiu $a3, $a3, %lo(D_80B6248C) ## $a3 = 80B6248C -/* 01538 80B61758 8FA40044 */ lw $a0, 0x0044($sp) +/* 01538 80B61758 8FA40044 */ lw $a0, 0x0044($sp) /* 0153C 80B6175C 0C01712B */ jal ActorCollider_InitCylinder - + /* 01540 80B61760 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 01544 80B61764 3C0680B6 */ lui $a2, %hi(D_80B624B8) ## $a2 = 80B60000 /* 01548 80B61768 24C624B8 */ addiu $a2, $a2, %lo(D_80B624B8) ## $a2 = 80B624B8 /* 0154C 80B6176C 26040098 */ addiu $a0, $s0, 0x0098 ## $a0 = 00000098 -/* 01550 80B61770 0C0187BF */ jal func_80061EFC +/* 01550 80B61770 0C0187BF */ jal func_80061EFC /* 01554 80B61774 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 01558 80B61778 3C198016 */ lui $t9, 0x8016 ## $t9 = 80160000 /* 0155C 80B6177C 8F39E664 */ lw $t9, -0x199C($t9) ## 8015E664 /* 01560 80B61780 3C0580B6 */ lui $a1, %hi(D_80B624E4) ## $a1 = 80B60000 /* 01564 80B61784 24A524E4 */ addiu $a1, $a1, %lo(D_80B624E4) ## $a1 = 80B624E4 -/* 01568 80B61788 1720000A */ bne $t9, $zero, .L80B617B4 -/* 0156C 80B6178C 8FA40038 */ lw $a0, 0x0038($sp) +/* 01568 80B61788 1720000A */ bne $t9, $zero, .L80B617B4 +/* 0156C 80B6178C 8FA40038 */ lw $a0, 0x0038($sp) /* 01570 80B61790 8608001C */ lh $t0, 0x001C($s0) ## 0000001C /* 01574 80B61794 24010008 */ addiu $at, $zero, 0x0008 ## $at = 00000008 /* 01578 80B61798 3109003F */ andi $t1, $t0, 0x003F ## $t1 = 00000000 -/* 0157C 80B6179C 15210005 */ bne $t1, $at, .L80B617B4 +/* 0157C 80B6179C 15210005 */ bne $t1, $at, .L80B617B4 /* 01580 80B617A0 00000000 */ nop /* 01584 80B617A4 0C00B55C */ jal Actor_Kill - + /* 01588 80B617A8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0158C 80B617AC 10000049 */ beq $zero, $zero, .L80B618D4 -/* 01590 80B617B0 8FBF002C */ lw $ra, 0x002C($sp) +/* 0158C 80B617AC 10000049 */ beq $zero, $zero, .L80B618D4 +/* 01590 80B617B0 8FBF002C */ lw $ra, 0x002C($sp) .L80B617B4: -/* 01594 80B617B4 0C00D3B0 */ jal func_80034EC0 +/* 01594 80B617B4 0C00D3B0 */ jal func_80034EC0 /* 01598 80B617B8 24060002 */ addiu $a2, $zero, 0x0002 ## $a2 = 00000002 /* 0159C 80B617BC 3C053C23 */ lui $a1, 0x3C23 ## $a1 = 3C230000 /* 015A0 80B617C0 34A5D70A */ ori $a1, $a1, 0xD70A ## $a1 = 3C23D70A /* 015A4 80B617C4 0C00B58B */ jal Actor_SetScale - + /* 015A8 80B617C8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 015AC 80B617CC 860D01FE */ lh $t5, 0x01FE($s0) ## 000001FE /* 015B0 80B617D0 860B01FC */ lh $t3, 0x01FC($s0) ## 000001FC @@ -71,43 +71,43 @@ glabel EnZo_Init /* 015B8 80B617D8 448D5000 */ mtc1 $t5, $f10 ## $f10 = 0.00 /* 015BC 80B617DC 448B2000 */ mtc1 $t3, $f4 ## $f4 = 0.00 /* 015C0 80B617E0 44813000 */ mtc1 $at, $f6 ## $f6 = 30.00 -/* 015C4 80B617E4 46805420 */ cvt.s.w $f16, $f10 +/* 015C4 80B617E4 46805420 */ cvt.s.w $f16, $f10 /* 015C8 80B617E8 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 /* 015CC 80B617EC 44819000 */ mtc1 $at, $f18 ## $f18 = 0.50 /* 015D0 80B617F0 240A0006 */ addiu $t2, $zero, 0x0006 ## $t2 = 00000006 /* 015D4 80B617F4 240C0001 */ addiu $t4, $zero, 0x0001 ## $t4 = 00000001 -/* 015D8 80B617F8 46802020 */ cvt.s.w $f0, $f4 -/* 015DC 80B617FC 46128102 */ mul.s $f4, $f16, $f18 +/* 015D8 80B617F8 46802020 */ cvt.s.w $f0, $f4 +/* 015DC 80B617FC 46128102 */ mul.s $f4, $f16, $f18 /* 015E0 80B61800 A20A001F */ sb $t2, 0x001F($s0) ## 0000001F /* 015E4 80B61804 A60C064C */ sh $t4, 0x064C($s0) ## 0000064C /* 015E8 80B61808 A2000208 */ sb $zero, 0x0208($s0) ## 00000208 /* 015EC 80B6180C A6000194 */ sh $zero, 0x0194($s0) ## 00000194 -/* 015F0 80B61810 46060200 */ add.s $f8, $f0, $f6 +/* 015F0 80B61810 46060200 */ add.s $f8, $f0, $f6 /* 015F4 80B61814 44803000 */ mtc1 $zero, $f6 ## $f6 = 0.00 -/* 015F8 80B61818 44062000 */ mfc1 $a2, $f4 -/* 015FC 80B6181C 44070000 */ mfc1 $a3, $f0 +/* 015F8 80B61818 44062000 */ mfc1 $a2, $f4 +/* 015FC 80B6181C 44070000 */ mfc1 $a3, $f0 /* 01600 80B61820 E6080644 */ swc1 $f8, 0x0644($s0) ## 00000644 /* 01604 80B61824 240E0005 */ addiu $t6, $zero, 0x0005 ## $t6 = 00000005 -/* 01608 80B61828 AFAE0014 */ sw $t6, 0x0014($sp) -/* 0160C 80B6182C 8FA40044 */ lw $a0, 0x0044($sp) +/* 01608 80B61828 AFAE0014 */ sw $t6, 0x0014($sp) +/* 0160C 80B6182C 8FA40044 */ lw $a0, 0x0044($sp) /* 01610 80B61830 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 01614 80B61834 0C00B92D */ jal func_8002E4B4 -/* 01618 80B61838 E7A60010 */ swc1 $f6, 0x0010($sp) +/* 01614 80B61834 0C00B92D */ jal func_8002E4B4 +/* 01618 80B61838 E7A60010 */ swc1 $f6, 0x0010($sp) /* 0161C 80B6183C 3C014258 */ lui $at, 0x4258 ## $at = 42580000 /* 01620 80B61840 44815000 */ mtc1 $at, $f10 ## $f10 = 54.00 /* 01624 80B61844 C6080084 */ lwc1 $f8, 0x0084($s0) ## 00000084 /* 01628 80B61848 3C198003 */ lui $t9, 0x8003 ## $t9 = 80030000 /* 0162C 80B6184C 3C0580B6 */ lui $a1, %hi(D_80B624E4) ## $a1 = 80B60000 -/* 01630 80B61850 460A403C */ c.lt.s $f8, $f10 +/* 01630 80B61850 460A403C */ c.lt.s $f8, $f10 /* 01634 80B61854 2739B5EC */ addiu $t9, $t9, 0xB5EC ## $t9 = 8002B5EC /* 01638 80B61858 24A524E4 */ addiu $a1, $a1, %lo(D_80B624E4) ## $a1 = 80B624E4 -/* 0163C 80B6185C 45030008 */ bc1tl .L80B61880 +/* 0163C 80B6185C 45030008 */ bc1tl .L80B61880 /* 01640 80B61860 3C0141C0 */ lui $at, 0x41C0 ## $at = 41C00000 /* 01644 80B61864 860F001C */ lh $t7, 0x001C($s0) ## 0000001C /* 01648 80B61868 24010008 */ addiu $at, $zero, 0x0008 ## $at = 00000008 /* 0164C 80B6186C 3C0C80B6 */ lui $t4, %hi(func_80B619D4) ## $t4 = 80B60000 /* 01650 80B61870 31F8003F */ andi $t8, $t7, 0x003F ## $t8 = 00000000 -/* 01654 80B61874 17010011 */ bne $t8, $at, .L80B618BC +/* 01654 80B61874 17010011 */ bne $t8, $at, .L80B618BC /* 01658 80B61878 258C19D4 */ addiu $t4, $t4, %lo(func_80B619D4) ## $t4 = 80B619D4 /* 0165C 80B6187C 3C0141C0 */ lui $at, 0x41C0 ## $at = 41C00000 .L80B61880: @@ -115,8 +115,8 @@ glabel EnZo_Init /* 01664 80B61884 AE1900C0 */ sw $t9, 0x00C0($s0) ## 000000C0 /* 01668 80B61888 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 /* 0166C 80B6188C E61000C4 */ swc1 $f16, 0x00C4($s0) ## 000000C4 -/* 01670 80B61890 0C00D3B0 */ jal func_80034EC0 -/* 01674 80B61894 8FA40038 */ lw $a0, 0x0038($sp) +/* 01670 80B61890 0C00D3B0 */ jal func_80034EC0 +/* 01674 80B61894 8FA40038 */ lw $a0, 0x0038($sp) /* 01678 80B61898 3C01437F */ lui $at, 0x437F ## $at = 437F0000 /* 0167C 80B6189C 44819000 */ mtc1 $at, $f18 ## $f18 = 255.00 /* 01680 80B618A0 3C0980B6 */ lui $t1, %hi(func_80B618F0) ## $t1 = 80B60000 @@ -124,20 +124,20 @@ glabel EnZo_Init /* 01688 80B618A8 252918F0 */ addiu $t1, $t1, %lo(func_80B618F0) ## $t1 = 80B618F0 /* 0168C 80B618AC A2080208 */ sb $t0, 0x0208($s0) ## 00000208 /* 01690 80B618B0 AE090190 */ sw $t1, 0x0190($s0) ## 00000190 -/* 01694 80B618B4 10000006 */ beq $zero, $zero, .L80B618D0 +/* 01694 80B618B4 10000006 */ beq $zero, $zero, .L80B618D0 /* 01698 80B618B8 E6120648 */ swc1 $f18, 0x0648($s0) ## 00000648 .L80B618BC: /* 0169C 80B618BC 8E0A0004 */ lw $t2, 0x0004($s0) ## 00000004 /* 016A0 80B618C0 2401FFFE */ addiu $at, $zero, 0xFFFE ## $at = FFFFFFFE /* 016A4 80B618C4 AE0C0190 */ sw $t4, 0x0190($s0) ## 00000190 -/* 016A8 80B618C8 01415824 */ and $t3, $t2, $at +/* 016A8 80B618C8 01415824 */ and $t3, $t2, $at /* 016AC 80B618CC AE0B0004 */ sw $t3, 0x0004($s0) ## 00000004 .L80B618D0: -/* 016B0 80B618D0 8FBF002C */ lw $ra, 0x002C($sp) +/* 016B0 80B618D0 8FBF002C */ lw $ra, 0x002C($sp) .L80B618D4: -/* 016B4 80B618D4 8FB00028 */ lw $s0, 0x0028($sp) +/* 016B4 80B618D4 8FB00028 */ lw $s0, 0x0028($sp) /* 016B8 80B618D8 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 -/* 016BC 80B618DC 03E00008 */ jr $ra +/* 016BC 80B618DC 03E00008 */ jr $ra /* 016C0 80B618E0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zo/func_80B60874.s b/asm/non_matchings/overlays/actors/ovl_En_Zo/func_80B60874.s index 567eeb404b..569916368a 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zo/func_80B60874.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zo/func_80B60874.s @@ -18,7 +18,7 @@ glabel func_80B60874 /* 00694 80B608B4 24C625C0 */ addiu $a2, $a2, %lo(D_80B625C0) ## $a2 = 80B625C0 /* 00698 80B608B8 27A4006C */ addiu $a0, $sp, 0x006C ## $a0 = FFFFFFE4 /* 0069C 80B608BC 240700D9 */ addiu $a3, $zero, 0x00D9 ## $a3 = 000000D9 -/* 006A0 80B608C0 0C031AB1 */ jal func_800C6AC4 +/* 006A0 80B608C0 0C031AB1 */ jal Graph_OpenDisps /* 006A4 80B608C4 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 /* 006A8 80B608C8 8FAF008C */ lw $t7, 0x008C($sp) /* 006AC 80B608CC 0000B025 */ or $s6, $zero, $zero ## $s6 = 00000000 @@ -110,7 +110,7 @@ glabel func_80B60874 /* 007F8 80B60A18 24C625E8 */ addiu $a2, $a2, %lo(D_80B625E8) ## $a2 = 80B625E8 /* 007FC 80B60A1C 27A4006C */ addiu $a0, $sp, 0x006C ## $a0 = FFFFFFE4 /* 00800 80B60A20 240700F8 */ addiu $a3, $zero, 0x00F8 ## $a3 = 000000F8 -/* 00804 80B60A24 0C031AD5 */ jal func_800C6B54 +/* 00804 80B60A24 0C031AD5 */ jal Graph_CloseDisps /* 00808 80B60A28 8D650000 */ lw $a1, 0x0000($t3) ## 00000000 /* 0080C 80B60A2C 8FBF0044 */ lw $ra, 0x0044($sp) /* 00810 80B60A30 D7B40018 */ ldc1 $f20, 0x0018($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zo/func_80B60A60.s b/asm/non_matchings/overlays/actors/ovl_En_Zo/func_80B60A60.s index 34e286639b..a8cf07bec3 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zo/func_80B60A60.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zo/func_80B60A60.s @@ -18,7 +18,7 @@ glabel func_80B60A60 /* 00880 80B60AA0 24C625FC */ addiu $a2, $a2, %lo(D_80B625FC) ## $a2 = 80B625FC /* 00884 80B60AA4 27A40074 */ addiu $a0, $sp, 0x0074 ## $a0 = FFFFFFE4 /* 00888 80B60AA8 24070104 */ addiu $a3, $zero, 0x0104 ## $a3 = 00000104 -/* 0088C 80B60AAC 0C031AB1 */ jal func_800C6AC4 +/* 0088C 80B60AAC 0C031AB1 */ jal Graph_OpenDisps /* 00890 80B60AB0 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 /* 00894 80B60AB4 0000A825 */ or $s5, $zero, $zero ## $s5 = 00000000 /* 00898 80B60AB8 0C024F61 */ jal func_80093D84 @@ -108,7 +108,7 @@ glabel func_80B60A60 /* 009DC 80B60BFC 24C62624 */ addiu $a2, $a2, %lo(D_80B62624) ## $a2 = 80B62624 /* 009E0 80B60C00 27A40074 */ addiu $a0, $sp, 0x0074 ## $a0 = FFFFFFE4 /* 009E4 80B60C04 8EC50000 */ lw $a1, 0x0000($s6) ## 00000000 -/* 009E8 80B60C08 0C031AD5 */ jal func_800C6B54 +/* 009E8 80B60C08 0C031AD5 */ jal Graph_CloseDisps /* 009EC 80B60C0C 2407011E */ addiu $a3, $zero, 0x011E ## $a3 = 0000011E /* 009F0 80B60C10 8FBF0044 */ lw $ra, 0x0044($sp) /* 009F4 80B60C14 D7B40018 */ ldc1 $f20, 0x0018($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zo/func_80B60C44.s b/asm/non_matchings/overlays/actors/ovl_En_Zo/func_80B60C44.s index 39a9d42ae2..0835a776ea 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zo/func_80B60C44.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zo/func_80B60C44.s @@ -18,7 +18,7 @@ glabel func_80B60C44 /* 00A64 80B60C84 24C62638 */ addiu $a2, $a2, %lo(D_80B62638) ## $a2 = 80B62638 /* 00A68 80B60C88 27A40074 */ addiu $a0, $sp, 0x0074 ## $a0 = FFFFFFE4 /* 00A6C 80B60C8C 2407012A */ addiu $a3, $zero, 0x012A ## $a3 = 0000012A -/* 00A70 80B60C90 0C031AB1 */ jal func_800C6AC4 +/* 00A70 80B60C90 0C031AB1 */ jal Graph_OpenDisps /* 00A74 80B60C94 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 /* 00A78 80B60C98 0000A825 */ or $s5, $zero, $zero ## $s5 = 00000000 /* 00A7C 80B60C9C 0C024F61 */ jal func_80093D84 @@ -111,7 +111,7 @@ glabel func_80B60C44 /* 00BCC 80B60DEC 24C62660 */ addiu $a2, $a2, %lo(D_80B62660) ## $a2 = 80B62660 /* 00BD0 80B60DF0 27A40074 */ addiu $a0, $sp, 0x0074 ## $a0 = FFFFFFE4 /* 00BD4 80B60DF4 8EC50000 */ lw $a1, 0x0000($s6) ## 00000000 -/* 00BD8 80B60DF8 0C031AD5 */ jal func_800C6B54 +/* 00BD8 80B60DF8 0C031AD5 */ jal Graph_CloseDisps /* 00BDC 80B60DFC 2407014B */ addiu $a3, $zero, 0x014B ## $a3 = 0000014B /* 00BE0 80B60E00 8FBF0044 */ lw $ra, 0x0044($sp) /* 00BE4 80B60E04 D7B40018 */ ldc1 $f20, 0x0018($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_Zo/func_80B61024.s b/asm/non_matchings/overlays/actors/ovl_En_Zo/func_80B61024.s index 858ae5b7f8..510c68759e 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_Zo/func_80B61024.s +++ b/asm/non_matchings/overlays/actors/ovl_En_Zo/func_80B61024.s @@ -2,7 +2,7 @@ glabel func_80B61024 /* 00E04 80B61024 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 /* 00E08 80B61028 AFBF0014 */ sw $ra, 0x0014($sp) /* 00E0C 80B6102C AFA5001C */ sw $a1, 0x001C($sp) -/* 00E10 80B61030 0C01B0D8 */ jal func_8006C360 +/* 00E10 80B61030 0C01B0D8 */ jal Text_GetFaceReaction /* 00E14 80B61034 2405001D */ addiu $a1, $zero, 0x001D ## $a1 = 0000001D /* 00E18 80B61038 10400003 */ beq $v0, $zero, .L80B61048 /* 00E1C 80B6103C 3043FFFF */ andi $v1, $v0, 0xFFFF ## $v1 = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_En_fHG/EnfHG_Draw.s b/asm/non_matchings/overlays/actors/ovl_En_fHG/EnfHG_Draw.s index b5467f8c6d..2e00c962ac 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_fHG/EnfHG_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_En_fHG/EnfHG_Draw.s @@ -13,7 +13,7 @@ glabel EnfHG_Draw /* 02510 80B64ED0 24C65378 */ addiu $a2, $a2, %lo(D_80B65378) ## $a2 = 80B65378 /* 02514 80B64ED4 27A40040 */ addiu $a0, $sp, 0x0040 ## $a0 = FFFFFFE0 /* 02518 80B64ED8 24070987 */ addiu $a3, $zero, 0x0987 ## $a3 = 00000987 -/* 0251C 80B64EDC 0C031AB1 */ jal func_800C6AC4 +/* 0251C 80B64EDC 0C031AB1 */ jal Graph_OpenDisps /* 02520 80B64EE0 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 /* 02524 80B64EE4 0C024F46 */ jal func_80093D18 /* 02528 80B64EE8 8E440000 */ lw $a0, 0x0000($s2) ## 00000000 @@ -33,7 +33,7 @@ glabel EnfHG_Draw /* 02560 80B64F20 AFA90018 */ sw $t1, 0x0018($sp) /* 02564 80B64F24 AFA80014 */ sw $t0, 0x0014($sp) /* 02568 80B64F28 AFA00010 */ sw $zero, 0x0010($sp) -/* 0256C 80B64F2C 0C024CDC */ jal func_80093370 +/* 0256C 80B64F2C 0C024CDC */ jal Gfx_SetFog /* 02570 80B64F30 240500FF */ addiu $a1, $zero, 0x00FF ## $a1 = 000000FF /* 02574 80B64F34 10000076 */ beq $zero, $zero, .L80B65110 /* 02578 80B64F38 AE2202C0 */ sw $v0, 0x02C0($s1) ## 000002C0 @@ -162,7 +162,7 @@ glabel EnfHG_Draw /* 02738 80B650F8 44195000 */ mfc1 $t9, $f10 /* 0273C 80B650FC 00000000 */ nop /* 02740 80B65100 272803E8 */ addiu $t0, $t9, 0x03E8 ## $t0 = 000003E8 -/* 02744 80B65104 0C024CDC */ jal func_80093370 +/* 02744 80B65104 0C024CDC */ jal Gfx_SetFog /* 02748 80B65108 AFA80018 */ sw $t0, 0x0018($sp) /* 0274C 80B6510C AE2202C0 */ sw $v0, 0x02C0($s1) ## 000002C0 .L80B65110: @@ -182,7 +182,7 @@ glabel EnfHG_Draw /* 02784 80B65144 24C65388 */ addiu $a2, $a2, %lo(D_80B65388) ## $a2 = 80B65388 /* 02788 80B65148 8E450000 */ lw $a1, 0x0000($s2) ## 00000000 /* 0278C 80B6514C 27A40040 */ addiu $a0, $sp, 0x0040 ## $a0 = FFFFFFE0 -/* 02790 80B65150 0C031AD5 */ jal func_800C6B54 +/* 02790 80B65150 0C031AD5 */ jal Graph_CloseDisps /* 02794 80B65154 240709B0 */ addiu $a3, $zero, 0x09B0 ## $a3 = 000009B0 /* 02798 80B65158 8FBF0034 */ lw $ra, 0x0034($sp) /* 0279C 80B6515C 8FB00028 */ lw $s0, 0x0028($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_En_fHG/func_80B62B04.s b/asm/non_matchings/overlays/actors/ovl_En_fHG/func_80B62B04.s index 57ec86d45b..47d264a838 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_fHG/func_80B62B04.s +++ b/asm/non_matchings/overlays/actors/ovl_En_fHG/func_80B62B04.s @@ -1,15 +1,15 @@ glabel func_80B62B04 /* 00144 80B62B04 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00148 80B62B08 AFA5001C */ sw $a1, 0x001C($sp) -/* 0014C 80B62B0C AFBF0014 */ sw $ra, 0x0014($sp) +/* 00148 80B62B08 AFA5001C */ sw $a1, 0x001C($sp) +/* 0014C 80B62B0C AFBF0014 */ sw $ra, 0x0014($sp) /* 00150 80B62B10 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 /* 00154 80B62B14 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 /* 00158 80B62B18 24A5E8A0 */ addiu $a1, $a1, 0xE8A0 ## $a1 = 0600E8A0 -/* 0015C 80B62B1C AFA60018 */ sw $a2, 0x0018($sp) -/* 00160 80B62B20 0C0294BE */ jal func_800A52F8 +/* 0015C 80B62B1C AFA60018 */ sw $a2, 0x0018($sp) +/* 00160 80B62B20 0C0294BE */ jal SkelAnime_ChangeAnimDefaultRepeat /* 00164 80B62B24 24840250 */ addiu $a0, $a0, 0x0250 ## $a0 = 00000250 /* 00168 80B62B28 3C014160 */ lui $at, 0x4160 ## $at = 41600000 -/* 0016C 80B62B2C 8FA60018 */ lw $a2, 0x0018($sp) +/* 0016C 80B62B2C 8FA60018 */ lw $a2, 0x0018($sp) /* 00170 80B62B30 44812000 */ mtc1 $at, $f4 ## $f4 = 14.00 /* 00174 80B62B34 3C01C396 */ lui $at, 0xC396 ## $at = C3960000 /* 00178 80B62B38 44813000 */ mtc1 $at, $f6 ## $f6 = -300.00 @@ -19,11 +19,11 @@ glabel func_80B62B04 /* 00188 80B62B48 ACCE01FC */ sw $t6, 0x01FC($a2) ## 000001FC /* 0018C 80B62B4C E4C40024 */ swc1 $f4, 0x0024($a2) ## 00000024 /* 00190 80B62B50 E4C60028 */ swc1 $f6, 0x0028($a2) ## 00000028 -/* 00194 80B62B54 C4285398 */ lwc1 $f8, %lo(D_80B65398)($at) +/* 00194 80B62B54 C4285398 */ lwc1 $f8, %lo(D_80B65398)($at) /* 00198 80B62B58 E4C8002C */ swc1 $f8, 0x002C($a2) ## 0000002C -/* 0019C 80B62B5C 8FBF0014 */ lw $ra, 0x0014($sp) +/* 0019C 80B62B5C 8FBF0014 */ lw $ra, 0x0014($sp) /* 001A0 80B62B60 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 001A4 80B62B64 03E00008 */ jr $ra +/* 001A4 80B62B64 03E00008 */ jr $ra /* 001A8 80B62B68 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_fHG/func_80B62B6C.s b/asm/non_matchings/overlays/actors/ovl_En_fHG/func_80B62B6C.s index d1efacd203..143418bb32 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_fHG/func_80B62B6C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_fHG/func_80B62B6C.s @@ -1,30 +1,30 @@ glabel func_80B62B6C /* 001AC 80B62B6C 27BDFF98 */ addiu $sp, $sp, 0xFF98 ## $sp = FFFFFF98 -/* 001B0 80B62B70 AFBF003C */ sw $ra, 0x003C($sp) -/* 001B4 80B62B74 AFB00038 */ sw $s0, 0x0038($sp) -/* 001B8 80B62B78 AFA5006C */ sw $a1, 0x006C($sp) +/* 001B0 80B62B70 AFBF003C */ sw $ra, 0x003C($sp) +/* 001B4 80B62B74 AFB00038 */ sw $s0, 0x0038($sp) +/* 001B8 80B62B78 AFA5006C */ sw $a1, 0x006C($sp) /* 001BC 80B62B7C 8C8F0118 */ lw $t7, 0x0118($a0) ## 00000118 /* 001C0 80B62B80 8CA71C44 */ lw $a3, 0x1C44($a1) ## 00001C44 /* 001C4 80B62B84 24010009 */ addiu $at, $zero, 0x0009 ## $at = 00000009 -/* 001C8 80B62B88 AFAF005C */ sw $t7, 0x005C($sp) +/* 001C8 80B62B88 AFAF005C */ sw $t7, 0x005C($sp) /* 001CC 80B62B8C 848301CA */ lh $v1, 0x01CA($a0) ## 000001CA /* 001D0 80B62B90 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 001D4 80B62B94 50610007 */ beql $v1, $at, .L80B62BB4 -/* 001D8 80B62B98 2C610010 */ sltiu $at, $v1, 0x0010 +/* 001D4 80B62B94 50610007 */ beql $v1, $at, .L80B62BB4 +/* 001D8 80B62B98 2C610010 */ sltiu $at, $v1, 0x0010 /* 001DC 80B62B9C 26040250 */ addiu $a0, $s0, 0x0250 ## $a0 = 00000250 /* 001E0 80B62BA0 0C02927F */ jal SkelAnime_FrameUpdateMatrix - -/* 001E4 80B62BA4 AFA70060 */ sw $a3, 0x0060($sp) -/* 001E8 80B62BA8 8FA70060 */ lw $a3, 0x0060($sp) + +/* 001E4 80B62BA4 AFA70060 */ sw $a3, 0x0060($sp) +/* 001E8 80B62BA8 8FA70060 */ lw $a3, 0x0060($sp) /* 001EC 80B62BAC 860301CA */ lh $v1, 0x01CA($s0) ## 000001CA -/* 001F0 80B62BB0 2C610010 */ sltiu $at, $v1, 0x0010 +/* 001F0 80B62BB0 2C610010 */ sltiu $at, $v1, 0x0010 .L80B62BB4: -/* 001F4 80B62BB4 10200467 */ beq $at, $zero, .L80B63D54 -/* 001F8 80B62BB8 0003C080 */ sll $t8, $v1, 2 +/* 001F4 80B62BB4 10200467 */ beq $at, $zero, .L80B63D54 +/* 001F8 80B62BB8 0003C080 */ sll $t8, $v1, 2 /* 001FC 80B62BBC 3C0180B6 */ lui $at, %hi(jtbl_80B6539C) ## $at = 80B60000 -/* 00200 80B62BC0 00380821 */ addu $at, $at, $t8 -/* 00204 80B62BC4 8C38539C */ lw $t8, %lo(jtbl_80B6539C)($at) -/* 00208 80B62BC8 03000008 */ jr $t8 +/* 00200 80B62BC0 00380821 */ addu $at, $at, $t8 +/* 00204 80B62BC4 8C38539C */ lw $t8, %lo(jtbl_80B6539C)($at) +/* 00208 80B62BC8 03000008 */ jr $t8 /* 0020C 80B62BCC 00000000 */ nop glabel L80B62BD0 /* 00210 80B62BD0 3C014160 */ lui $at, 0x4160 ## $at = 41600000 @@ -32,23 +32,23 @@ glabel L80B62BD0 /* 00218 80B62BD8 C4E40024 */ lwc1 $f4, 0x0024($a3) ## 00000024 /* 0021C 80B62BDC 3C014316 */ lui $at, 0x4316 ## $at = 43160000 /* 00220 80B62BE0 44816000 */ mtc1 $at, $f12 ## $f12 = 150.00 -/* 00224 80B62BE4 46022001 */ sub.s $f0, $f4, $f2 +/* 00224 80B62BE4 46022001 */ sub.s $f0, $f4, $f2 /* 00228 80B62BE8 3C0180B6 */ lui $at, %hi(D_80B653DC) ## $at = 80B60000 -/* 0022C 80B62BEC 46000005 */ abs.s $f0, $f0 -/* 00230 80B62BF0 460C003C */ c.lt.s $f0, $f12 +/* 0022C 80B62BEC 46000005 */ abs.s $f0, $f0 +/* 00230 80B62BF0 460C003C */ c.lt.s $f0, $f12 /* 00234 80B62BF4 00000000 */ nop -/* 00238 80B62BF8 45020457 */ bc1fl .L80B63D58 +/* 00238 80B62BF8 45020457 */ bc1fl .L80B63D58 /* 0023C 80B62BFC 860501CC */ lh $a1, 0x01CC($s0) ## 000001CC /* 00240 80B62C00 C4E6002C */ lwc1 $f6, 0x002C($a3) ## 0000002C -/* 00244 80B62C04 C42853DC */ lwc1 $f8, %lo(D_80B653DC)($at) +/* 00244 80B62C04 C42853DC */ lwc1 $f8, %lo(D_80B653DC)($at) /* 00248 80B62C08 2419000F */ addiu $t9, $zero, 0x000F ## $t9 = 0000000F -/* 0024C 80B62C0C 46083001 */ sub.s $f0, $f6, $f8 -/* 00250 80B62C10 46000005 */ abs.s $f0, $f0 -/* 00254 80B62C14 460C003C */ c.lt.s $f0, $f12 +/* 0024C 80B62C0C 46083001 */ sub.s $f0, $f6, $f8 +/* 00250 80B62C10 46000005 */ abs.s $f0, $f0 +/* 00254 80B62C14 460C003C */ c.lt.s $f0, $f12 /* 00258 80B62C18 00000000 */ nop -/* 0025C 80B62C1C 4502044E */ bc1fl .L80B63D58 +/* 0025C 80B62C1C 4502044E */ bc1fl .L80B63D58 /* 00260 80B62C20 860501CC */ lh $a1, 0x01CC($s0) ## 000001CC -/* 00264 80B62C24 1000044B */ beq $zero, $zero, .L80B63D54 +/* 00264 80B62C24 1000044B */ beq $zero, $zero, .L80B63D54 /* 00268 80B62C28 A61901CA */ sh $t9, 0x01CA($s0) ## 000001CA glabel L80B62C2C /* 0026C 80B62C2C 3C014160 */ lui $at, 0x4160 ## $at = 41600000 @@ -56,110 +56,110 @@ glabel L80B62C2C /* 00274 80B62C34 C4EA0024 */ lwc1 $f10, 0x0024($a3) ## 00000024 /* 00278 80B62C38 3C0142C8 */ lui $at, 0x42C8 ## $at = 42C80000 /* 0027C 80B62C3C 44816000 */ mtc1 $at, $f12 ## $f12 = 100.00 -/* 00280 80B62C40 46025001 */ sub.s $f0, $f10, $f2 +/* 00280 80B62C40 46025001 */ sub.s $f0, $f10, $f2 /* 00284 80B62C44 3C0180B6 */ lui $at, %hi(D_80B653E0) ## $at = 80B60000 -/* 00288 80B62C48 46000005 */ abs.s $f0, $f0 -/* 0028C 80B62C4C 460C003C */ c.lt.s $f0, $f12 +/* 00288 80B62C48 46000005 */ abs.s $f0, $f0 +/* 0028C 80B62C4C 460C003C */ c.lt.s $f0, $f12 /* 00290 80B62C50 00000000 */ nop -/* 00294 80B62C54 45020440 */ bc1fl .L80B63D58 +/* 00294 80B62C54 45020440 */ bc1fl .L80B63D58 /* 00298 80B62C58 860501CC */ lh $a1, 0x01CC($s0) ## 000001CC /* 0029C 80B62C5C C4F2002C */ lwc1 $f18, 0x002C($a3) ## 0000002C -/* 002A0 80B62C60 C42453E0 */ lwc1 $f4, %lo(D_80B653E0)($at) +/* 002A0 80B62C60 C42453E0 */ lwc1 $f4, %lo(D_80B653E0)($at) /* 002A4 80B62C64 24080001 */ addiu $t0, $zero, 0x0001 ## $t0 = 00000001 /* 002A8 80B62C68 3C098016 */ lui $t1, 0x8016 ## $t1 = 80160000 -/* 002AC 80B62C6C 46049001 */ sub.s $f0, $f18, $f4 -/* 002B0 80B62C70 46000005 */ abs.s $f0, $f0 -/* 002B4 80B62C74 460C003C */ c.lt.s $f0, $f12 +/* 002AC 80B62C6C 46049001 */ sub.s $f0, $f18, $f4 +/* 002B0 80B62C70 46000005 */ abs.s $f0, $f0 +/* 002B4 80B62C74 460C003C */ c.lt.s $f0, $f12 /* 002B8 80B62C78 00000000 */ nop -/* 002BC 80B62C7C 45020436 */ bc1fl .L80B63D58 +/* 002BC 80B62C7C 45020436 */ bc1fl .L80B63D58 /* 002C0 80B62C80 860501CC */ lh $a1, 0x01CC($s0) ## 000001CC /* 002C4 80B62C84 A60801CA */ sh $t0, 0x01CA($s0) ## 000001CA /* 002C8 80B62C88 9529F542 */ lhu $t1, -0x0ABE($t1) ## 8015F542 /* 002CC 80B62C8C 240B0039 */ addiu $t3, $zero, 0x0039 ## $t3 = 00000039 /* 002D0 80B62C90 312A0004 */ andi $t2, $t1, 0x0004 ## $t2 = 00000000 -/* 002D4 80B62C94 51400430 */ beql $t2, $zero, .L80B63D58 +/* 002D4 80B62C94 51400430 */ beql $t2, $zero, .L80B63D58 /* 002D8 80B62C98 860501CC */ lh $a1, 0x01CC($s0) ## 000001CC -/* 002DC 80B62C9C 1000042D */ beq $zero, $zero, .L80B63D54 +/* 002DC 80B62C9C 1000042D */ beq $zero, $zero, .L80B63D54 /* 002E0 80B62CA0 A60B01D4 */ sh $t3, 0x01D4($s0) ## 000001D4 glabel L80B62CA4 /* 002E4 80B62CA4 3C0C8016 */ lui $t4, 0x8016 ## $t4 = 80160000 /* 002E8 80B62CA8 958CF542 */ lhu $t4, -0x0ABE($t4) ## 8015F542 -/* 002EC 80B62CAC 8FA4006C */ lw $a0, 0x006C($sp) +/* 002EC 80B62CAC 8FA4006C */ lw $a0, 0x006C($sp) /* 002F0 80B62CB0 318D0004 */ andi $t5, $t4, 0x0004 ## $t5 = 00000000 -/* 002F4 80B62CB4 11A00032 */ beq $t5, $zero, .L80B62D80 +/* 002F4 80B62CB4 11A00032 */ beq $t5, $zero, .L80B62D80 /* 002F8 80B62CB8 24851D64 */ addiu $a1, $a0, 0x1D64 ## $a1 = 00001D64 /* 002FC 80B62CBC 860301D4 */ lh $v1, 0x01D4($s0) ## 000001D4 -/* 00300 80B62CC0 8FA6006C */ lw $a2, 0x006C($sp) +/* 00300 80B62CC0 8FA6006C */ lw $a2, 0x006C($sp) /* 00304 80B62CC4 24010037 */ addiu $at, $zero, 0x0037 ## $at = 00000037 -/* 00308 80B62CC8 14610013 */ bne $v1, $at, .L80B62D18 +/* 00308 80B62CC8 14610013 */ bne $v1, $at, .L80B62D18 /* 0030C 80B62CCC 24C41C24 */ addiu $a0, $a2, 0x1C24 ## $a0 = 00001C24 /* 00310 80B62CD0 3C014160 */ lui $at, 0x4160 ## $at = 41600000 /* 00314 80B62CD4 44811000 */ mtc1 $at, $f2 ## $f2 = 14.00 /* 00318 80B62CD8 3C01C302 */ lui $at, 0xC302 ## $at = C3020000 /* 0031C 80B62CDC 44813000 */ mtc1 $at, $f6 ## $f6 = -130.00 /* 00320 80B62CE0 3C0180B6 */ lui $at, %hi(D_80B653E4) ## $at = 80B60000 -/* 00324 80B62CE4 C42853E4 */ lwc1 $f8, %lo(D_80B653E4)($at) +/* 00324 80B62CE4 C42853E4 */ lwc1 $f8, %lo(D_80B653E4)($at) /* 00328 80B62CE8 240F0100 */ addiu $t7, $zero, 0x0100 ## $t7 = 00000100 -/* 0032C 80B62CEC AFAF0028 */ sw $t7, 0x0028($sp) +/* 0032C 80B62CEC AFAF0028 */ sw $t7, 0x0028($sp) /* 00330 80B62CF0 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 00334 80B62CF4 2407002E */ addiu $a3, $zero, 0x002E ## $a3 = 0000002E -/* 00338 80B62CF8 AFA0001C */ sw $zero, 0x001C($sp) -/* 0033C 80B62CFC AFA00020 */ sw $zero, 0x0020($sp) -/* 00340 80B62D00 AFA00024 */ sw $zero, 0x0024($sp) -/* 00344 80B62D04 E7A20010 */ swc1 $f2, 0x0010($sp) -/* 00348 80B62D08 E7A60014 */ swc1 $f6, 0x0014($sp) +/* 00338 80B62CF8 AFA0001C */ sw $zero, 0x001C($sp) +/* 0033C 80B62CFC AFA00020 */ sw $zero, 0x0020($sp) +/* 00340 80B62D00 AFA00024 */ sw $zero, 0x0024($sp) +/* 00344 80B62D04 E7A20010 */ swc1 $f2, 0x0010($sp) +/* 00348 80B62D08 E7A60014 */ swc1 $f6, 0x0014($sp) /* 0034C 80B62D0C 0C00C916 */ jal Actor_SpawnAttached - -/* 00350 80B62D10 E7A80018 */ swc1 $f8, 0x0018($sp) + +/* 00350 80B62D10 E7A80018 */ swc1 $f8, 0x0018($sp) /* 00354 80B62D14 860301D4 */ lh $v1, 0x01D4($s0) ## 000001D4 .L80B62D18: /* 00358 80B62D18 24010033 */ addiu $at, $zero, 0x0033 ## $at = 00000033 -/* 0035C 80B62D1C 14610006 */ bne $v1, $at, .L80B62D38 +/* 0035C 80B62D1C 14610006 */ bne $v1, $at, .L80B62D38 /* 00360 80B62D20 2405283C */ addiu $a1, $zero, 0x283C ## $a1 = 0000283C /* 00364 80B62D24 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 00368 80B62D28 8E04011C */ lw $a0, 0x011C($s0) ## 0000011C /* 0036C 80B62D2C 0C03E803 */ jal Audio_SetBGM - + /* 00370 80B62D30 2404001B */ addiu $a0, $zero, 0x001B ## $a0 = 0000001B /* 00374 80B62D34 860301D4 */ lh $v1, 0x01D4($s0) ## 000001D4 .L80B62D38: -/* 00378 80B62D38 54600407 */ bnel $v1, $zero, .L80B63D58 +/* 00378 80B62D38 54600407 */ bnel $v1, $zero, .L80B63D58 /* 0037C 80B62D3C 860501CC */ lh $a1, 0x01CC($s0) ## 000001CC /* 00380 80B62D40 0C03F66B */ jal Math_Rand_ZeroOne ## Rand.Next() float /* 00384 80B62D44 00000000 */ nop /* 00388 80B62D48 3C0180B6 */ lui $at, %hi(D_80B653E8) ## $at = 80B60000 -/* 0038C 80B62D4C C42A53E8 */ lwc1 $f10, %lo(D_80B653E8)($at) +/* 0038C 80B62D4C C42A53E8 */ lwc1 $f10, %lo(D_80B653E8)($at) /* 00390 80B62D50 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00394 80B62D54 8FA5006C */ lw $a1, 0x006C($sp) -/* 00398 80B62D58 460A0482 */ mul.s $f18, $f0, $f10 -/* 0039C 80B62D5C 4600910D */ trunc.w.s $f4, $f18 -/* 003A0 80B62D60 44062000 */ mfc1 $a2, $f4 +/* 00394 80B62D54 8FA5006C */ lw $a1, 0x006C($sp) +/* 00398 80B62D58 460A0482 */ mul.s $f18, $f0, $f10 +/* 0039C 80B62D5C 4600910D */ trunc.w.s $f4, $f18 +/* 003A0 80B62D60 44062000 */ mfc1 $a2, $f4 /* 003A4 80B62D64 00000000 */ nop -/* 003A8 80B62D68 00063400 */ sll $a2, $a2, 16 -/* 003AC 80B62D6C 0C2D8F61 */ jal func_80B63D84 -/* 003B0 80B62D70 00063403 */ sra $a2, $a2, 16 +/* 003A8 80B62D68 00063400 */ sll $a2, $a2, 16 +/* 003AC 80B62D6C 0C2D8F61 */ jal func_80B63D84 +/* 003B0 80B62D70 00063403 */ sra $a2, $a2, 16 /* 003B4 80B62D74 241900FF */ addiu $t9, $zero, 0x00FF ## $t9 = 000000FF -/* 003B8 80B62D78 100003F6 */ beq $zero, $zero, .L80B63D54 +/* 003B8 80B62D78 100003F6 */ beq $zero, $zero, .L80B63D54 /* 003BC 80B62D7C A219014C */ sb $t9, 0x014C($s0) ## 0000014C .L80B62D80: -/* 003C0 80B62D80 0C019148 */ jal func_80064520 -/* 003C4 80B62D84 AFA70060 */ sw $a3, 0x0060($sp) -/* 003C8 80B62D88 8FA4006C */ lw $a0, 0x006C($sp) +/* 003C0 80B62D80 0C019148 */ jal func_80064520 +/* 003C4 80B62D84 AFA70060 */ sw $a3, 0x0060($sp) +/* 003C8 80B62D88 8FA4006C */ lw $a0, 0x006C($sp) /* 003CC 80B62D8C 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 003D0 80B62D90 0C00B7D5 */ jal func_8002DF54 +/* 003D0 80B62D90 0C00B7D5 */ jal func_8002DF54 /* 003D4 80B62D94 24060008 */ addiu $a2, $zero, 0x0008 ## $a2 = 00000008 -/* 003D8 80B62D98 0C03008C */ jal func_800C0230 -/* 003DC 80B62D9C 8FA4006C */ lw $a0, 0x006C($sp) +/* 003D8 80B62D98 0C03008C */ jal func_800C0230 +/* 003DC 80B62D9C 8FA4006C */ lw $a0, 0x006C($sp) /* 003E0 80B62DA0 A60201CC */ sh $v0, 0x01CC($s0) ## 000001CC -/* 003E4 80B62DA4 8FA4006C */ lw $a0, 0x006C($sp) +/* 003E4 80B62DA4 8FA4006C */ lw $a0, 0x006C($sp) /* 003E8 80B62DA8 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 003EC 80B62DAC 0C0300C5 */ jal func_800C0314 +/* 003EC 80B62DAC 0C0300C5 */ jal func_800C0314 /* 003F0 80B62DB0 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 -/* 003F4 80B62DB4 8FA4006C */ lw $a0, 0x006C($sp) +/* 003F4 80B62DB4 8FA4006C */ lw $a0, 0x006C($sp) /* 003F8 80B62DB8 860501CC */ lh $a1, 0x01CC($s0) ## 000001CC -/* 003FC 80B62DBC 0C0300C5 */ jal func_800C0314 +/* 003FC 80B62DBC 0C0300C5 */ jal func_800C0314 /* 00400 80B62DC0 24060007 */ addiu $a2, $zero, 0x0007 ## $a2 = 00000007 /* 00404 80B62DC4 3C01C220 */ lui $at, 0xC220 ## $at = C2200000 /* 00408 80B62DC8 44813000 */ mtc1 $at, $f6 ## $f6 = -40.00 @@ -170,18 +170,18 @@ glabel L80B62CA4 /* 0041C 80B62DDC A60A01D4 */ sh $t2, 0x01D4($s0) ## 000001D4 /* 00420 80B62DE0 348400FF */ ori $a0, $a0, 0x00FF ## $a0 = 100100FF /* 00424 80B62DE4 0C03E803 */ jal Audio_SetBGM - + /* 00428 80B62DE8 E6060028 */ swc1 $f6, 0x0028($s0) ## 00000028 /* 0042C 80B62DEC 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 /* 00430 80B62DF0 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 /* 00434 80B62DF4 944B0EE2 */ lhu $t3, 0x0EE2($v0) ## 8015F542 -/* 00438 80B62DF8 8FA4006C */ lw $a0, 0x006C($sp) +/* 00438 80B62DF8 8FA4006C */ lw $a0, 0x006C($sp) /* 0043C 80B62DFC 24050023 */ addiu $a1, $zero, 0x0023 ## $a1 = 00000023 /* 00440 80B62E00 356C0004 */ ori $t4, $t3, 0x0004 ## $t4 = 00000004 /* 00444 80B62E04 0C00B2DD */ jal Flags_SetSwitch - + /* 00448 80B62E08 A44C0EE2 */ sh $t4, 0x0EE2($v0) ## 8015F542 -/* 0044C 80B62E0C 8FA70060 */ lw $a3, 0x0060($sp) +/* 0044C 80B62E0C 8FA70060 */ lw $a3, 0x0060($sp) glabel L80B62E10 /* 00450 80B62E10 3C014160 */ lui $at, 0x4160 ## $at = 41600000 /* 00454 80B62E14 44811000 */ mtc1 $at, $f2 ## $f2 = 14.00 @@ -190,7 +190,7 @@ glabel L80B62E10 /* 00460 80B62E20 3C0180B6 */ lui $at, %hi(D_80B653EC) ## $at = 80B60000 /* 00464 80B62E24 E4E20024 */ swc1 $f2, 0x0024($a3) ## 00000024 /* 00468 80B62E28 E4E80028 */ swc1 $f8, 0x0028($a3) ## 00000028 -/* 0046C 80B62E2C C42A53EC */ lwc1 $f10, %lo(D_80B653EC)($at) +/* 0046C 80B62E2C C42A53EC */ lwc1 $f10, %lo(D_80B653EC)($at) /* 00470 80B62E30 A4E000B6 */ sh $zero, 0x00B6($a3) ## 000000B6 /* 00474 80B62E34 84ED00B6 */ lh $t5, 0x00B6($a3) ## 000000B6 /* 00478 80B62E38 44809000 */ mtc1 $zero, $f18 ## $f18 = 0.00 @@ -202,74 +202,74 @@ glabel L80B62E10 /* 00490 80B62E50 3C0180B6 */ lui $at, %hi(D_80B653F0) ## $at = 80B60000 /* 00494 80B62E54 E6020150 */ swc1 $f2, 0x0150($s0) ## 00000150 /* 00498 80B62E58 E6040154 */ swc1 $f4, 0x0154($s0) ## 00000154 -/* 0049C 80B62E5C C42653F0 */ lwc1 $f6, %lo(D_80B653F0)($at) +/* 0049C 80B62E5C C42653F0 */ lwc1 $f6, %lo(D_80B653F0)($at) /* 004A0 80B62E60 3C0180B6 */ lui $at, %hi(D_80B653F4) ## $at = 80B60000 /* 004A4 80B62E64 E602015C */ swc1 $f2, 0x015C($s0) ## 0000015C /* 004A8 80B62E68 E6020160 */ swc1 $f2, 0x0160($s0) ## 00000160 /* 004AC 80B62E6C E6060158 */ swc1 $f6, 0x0158($s0) ## 00000158 -/* 004B0 80B62E70 C42853F4 */ lwc1 $f8, %lo(D_80B653F4)($at) +/* 004B0 80B62E70 C42853F4 */ lwc1 $f8, %lo(D_80B653F4)($at) /* 004B4 80B62E74 860301D4 */ lh $v1, 0x01D4($s0) ## 000001D4 /* 004B8 80B62E78 24010019 */ addiu $at, $zero, 0x0019 ## $at = 00000019 /* 004BC 80B62E7C E6080164 */ swc1 $f8, 0x0164($s0) ## 00000164 -/* 004C0 80B62E80 14610012 */ bne $v1, $at, .L80B62ECC -/* 004C4 80B62E84 8FA6006C */ lw $a2, 0x006C($sp) +/* 004C0 80B62E80 14610012 */ bne $v1, $at, .L80B62ECC +/* 004C4 80B62E84 8FA6006C */ lw $a2, 0x006C($sp) /* 004C8 80B62E88 3C01C302 */ lui $at, 0xC302 ## $at = C3020000 /* 004CC 80B62E8C 44815000 */ mtc1 $at, $f10 ## $f10 = -130.00 /* 004D0 80B62E90 3C0180B6 */ lui $at, %hi(D_80B653F8) ## $at = 80B60000 -/* 004D4 80B62E94 C43253F8 */ lwc1 $f18, %lo(D_80B653F8)($at) +/* 004D4 80B62E94 C43253F8 */ lwc1 $f18, %lo(D_80B653F8)($at) /* 004D8 80B62E98 240F0100 */ addiu $t7, $zero, 0x0100 ## $t7 = 00000100 -/* 004DC 80B62E9C AFAF0028 */ sw $t7, 0x0028($sp) +/* 004DC 80B62E9C AFAF0028 */ sw $t7, 0x0028($sp) /* 004E0 80B62EA0 24C41C24 */ addiu $a0, $a2, 0x1C24 ## $a0 = 00001C24 /* 004E4 80B62EA4 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 004E8 80B62EA8 2407002E */ addiu $a3, $zero, 0x002E ## $a3 = 0000002E -/* 004EC 80B62EAC E7A20010 */ swc1 $f2, 0x0010($sp) -/* 004F0 80B62EB0 AFA0001C */ sw $zero, 0x001C($sp) -/* 004F4 80B62EB4 AFA00020 */ sw $zero, 0x0020($sp) -/* 004F8 80B62EB8 AFA00024 */ sw $zero, 0x0024($sp) -/* 004FC 80B62EBC E7AA0014 */ swc1 $f10, 0x0014($sp) +/* 004EC 80B62EAC E7A20010 */ swc1 $f2, 0x0010($sp) +/* 004F0 80B62EB0 AFA0001C */ sw $zero, 0x001C($sp) +/* 004F4 80B62EB4 AFA00020 */ sw $zero, 0x0020($sp) +/* 004F8 80B62EB8 AFA00024 */ sw $zero, 0x0024($sp) +/* 004FC 80B62EBC E7AA0014 */ swc1 $f10, 0x0014($sp) /* 00500 80B62EC0 0C00C916 */ jal Actor_SpawnAttached - -/* 00504 80B62EC4 E7B20018 */ swc1 $f18, 0x0018($sp) + +/* 00504 80B62EC4 E7B20018 */ swc1 $f18, 0x0018($sp) /* 00508 80B62EC8 860301D4 */ lh $v1, 0x01D4($s0) ## 000001D4 .L80B62ECC: /* 0050C 80B62ECC 24010015 */ addiu $at, $zero, 0x0015 ## $at = 00000015 -/* 00510 80B62ED0 14610004 */ bne $v1, $at, .L80B62EE4 +/* 00510 80B62ED0 14610004 */ bne $v1, $at, .L80B62EE4 /* 00514 80B62ED4 2405283C */ addiu $a1, $zero, 0x283C ## $a1 = 0000283C /* 00518 80B62ED8 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 0051C 80B62EDC 8E04011C */ lw $a0, 0x011C($s0) ## 0000011C /* 00520 80B62EE0 860301D4 */ lh $v1, 0x01D4($s0) ## 000001D4 .L80B62EE4: -/* 00524 80B62EE4 1460039B */ bne $v1, $zero, .L80B63D54 +/* 00524 80B62EE4 1460039B */ bne $v1, $zero, .L80B63D54 /* 00528 80B62EE8 24180003 */ addiu $t8, $zero, 0x0003 ## $t8 = 00000003 /* 0052C 80B62EEC 24190050 */ addiu $t9, $zero, 0x0050 ## $t9 = 00000050 /* 00530 80B62EF0 A61801CA */ sh $t8, 0x01CA($s0) ## 000001CA -/* 00534 80B62EF4 10000397 */ beq $zero, $zero, .L80B63D54 +/* 00534 80B62EF4 10000397 */ beq $zero, $zero, .L80B63D54 /* 00538 80B62EF8 A61901D4 */ sh $t9, 0x01D4($s0) ## 000001D4 glabel L80B62EFC /* 0053C 80B62EFC 860301D4 */ lh $v1, 0x01D4($s0) ## 000001D4 /* 00540 80B62F00 24010019 */ addiu $at, $zero, 0x0019 ## $at = 00000019 /* 00544 80B62F04 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00548 80B62F08 54610005 */ bnel $v1, $at, .L80B62F20 +/* 00548 80B62F08 54610005 */ bnel $v1, $at, .L80B62F20 /* 0054C 80B62F0C 24010014 */ addiu $at, $zero, 0x0014 ## $at = 00000014 /* 00550 80B62F10 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 00554 80B62F14 2405283E */ addiu $a1, $zero, 0x283E ## $a1 = 0000283E /* 00558 80B62F18 860301D4 */ lh $v1, 0x01D4($s0) ## 000001D4 /* 0055C 80B62F1C 24010014 */ addiu $at, $zero, 0x0014 ## $at = 00000014 .L80B62F20: -/* 00560 80B62F20 14610005 */ bne $v1, $at, .L80B62F38 -/* 00564 80B62F24 8FA4006C */ lw $a0, 0x006C($sp) +/* 00560 80B62F20 14610005 */ bne $v1, $at, .L80B62F38 +/* 00564 80B62F24 8FA4006C */ lw $a0, 0x006C($sp) /* 00568 80B62F28 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 0056C 80B62F2C 0C00B7D5 */ jal func_8002DF54 +/* 0056C 80B62F2C 0C00B7D5 */ jal func_8002DF54 /* 00570 80B62F30 24060009 */ addiu $a2, $zero, 0x0009 ## $a2 = 00000009 /* 00574 80B62F34 860301D4 */ lh $v1, 0x01D4($s0) ## 000001D4 .L80B62F38: /* 00578 80B62F38 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 0057C 80B62F3C 54610004 */ bnel $v1, $at, .L80B62F50 +/* 0057C 80B62F3C 54610004 */ bnel $v1, $at, .L80B62F50 /* 00580 80B62F40 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 /* 00584 80B62F44 0C03E803 */ jal Audio_SetBGM - + /* 00588 80B62F48 24040023 */ addiu $a0, $zero, 0x0023 ## $a0 = 00000023 /* 0058C 80B62F4C 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 .L80B62F50: @@ -277,49 +277,49 @@ glabel L80B62EFC /* 00594 80B62F54 C60401A8 */ lwc1 $f4, 0x01A8($s0) ## 000001A8 /* 00598 80B62F58 3C063D4C */ lui $a2, 0x3D4C ## $a2 = 3D4C0000 /* 0059C 80B62F5C 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3D4CCCCD -/* 005A0 80B62F60 46062202 */ mul.s $f8, $f4, $f6 +/* 005A0 80B62F60 46062202 */ mul.s $f8, $f4, $f6 /* 005A4 80B62F64 26040150 */ addiu $a0, $s0, 0x0150 ## $a0 = 00000150 /* 005A8 80B62F68 3C054258 */ lui $a1, 0x4258 ## $a1 = 42580000 -/* 005AC 80B62F6C 44074000 */ mfc1 $a3, $f8 +/* 005AC 80B62F6C 44074000 */ mfc1 $a3, $f8 /* 005B0 80B62F70 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 005B4 80B62F74 00000000 */ nop /* 005B8 80B62F78 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 /* 005BC 80B62F7C 44819000 */ mtc1 $at, $f18 ## $f18 = 20.00 /* 005C0 80B62F80 C60A01A8 */ lwc1 $f10, 0x01A8($s0) ## 000001A8 /* 005C4 80B62F84 3C063D4C */ lui $a2, 0x3D4C ## $a2 = 3D4C0000 /* 005C8 80B62F88 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3D4CCCCD -/* 005CC 80B62F8C 46125102 */ mul.s $f4, $f10, $f18 +/* 005CC 80B62F8C 46125102 */ mul.s $f4, $f10, $f18 /* 005D0 80B62F90 26040154 */ addiu $a0, $s0, 0x0154 ## $a0 = 00000154 /* 005D4 80B62F94 3C054080 */ lui $a1, 0x4080 ## $a1 = 40800000 -/* 005D8 80B62F98 44072000 */ mfc1 $a3, $f4 +/* 005D8 80B62F98 44072000 */ mfc1 $a3, $f4 /* 005DC 80B62F9C 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 005E0 80B62FA0 00000000 */ nop /* 005E4 80B62FA4 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 /* 005E8 80B62FA8 44814000 */ mtc1 $at, $f8 ## $f8 = 20.00 /* 005EC 80B62FAC C60601A8 */ lwc1 $f6, 0x01A8($s0) ## 000001A8 /* 005F0 80B62FB0 3C05C54A */ lui $a1, 0xC54A ## $a1 = C54A0000 /* 005F4 80B62FB4 3C063D4C */ lui $a2, 0x3D4C ## $a2 = 3D4C0000 -/* 005F8 80B62FB8 46083282 */ mul.s $f10, $f6, $f8 +/* 005F8 80B62FB8 46083282 */ mul.s $f10, $f6, $f8 /* 005FC 80B62FBC 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3D4CCCCD /* 00600 80B62FC0 34A53000 */ ori $a1, $a1, 0x3000 ## $a1 = C54A3000 /* 00604 80B62FC4 26040158 */ addiu $a0, $s0, 0x0158 ## $a0 = 00000158 -/* 00608 80B62FC8 44075000 */ mfc1 $a3, $f10 +/* 00608 80B62FC8 44075000 */ mfc1 $a3, $f10 /* 0060C 80B62FCC 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 00610 80B62FD0 00000000 */ nop /* 00614 80B62FD4 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 /* 00618 80B62FD8 44812000 */ mtc1 $at, $f4 ## $f4 = 20.00 /* 0061C 80B62FDC C61201A8 */ lwc1 $f18, 0x01A8($s0) ## 000001A8 /* 00620 80B62FE0 3C063D4C */ lui $a2, 0x3D4C ## $a2 = 3D4C0000 /* 00624 80B62FE4 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3D4CCCCD -/* 00628 80B62FE8 46049182 */ mul.s $f6, $f18, $f4 +/* 00628 80B62FE8 46049182 */ mul.s $f6, $f18, $f4 /* 0062C 80B62FEC 2604015C */ addiu $a0, $s0, 0x015C ## $a0 = 0000015C /* 00630 80B62FF0 3C05C2AC */ lui $a1, 0xC2AC ## $a1 = C2AC0000 -/* 00634 80B62FF4 44073000 */ mfc1 $a3, $f6 +/* 00634 80B62FF4 44073000 */ mfc1 $a3, $f6 /* 00638 80B62FF8 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 0063C 80B62FFC 00000000 */ nop /* 00640 80B63000 3C014160 */ lui $at, 0x4160 ## $at = 41600000 /* 00644 80B63004 44811000 */ mtc1 $at, $f2 ## $f2 = 14.00 @@ -327,43 +327,43 @@ glabel L80B62EFC /* 0064C 80B6300C 44815000 */ mtc1 $at, $f10 ## $f10 = 20.00 /* 00650 80B63010 C60801A8 */ lwc1 $f8, 0x01A8($s0) ## 000001A8 /* 00654 80B63014 3C063D4C */ lui $a2, 0x3D4C ## $a2 = 3D4C0000 -/* 00658 80B63018 44051000 */ mfc1 $a1, $f2 -/* 0065C 80B6301C 460A4482 */ mul.s $f18, $f8, $f10 +/* 00658 80B63018 44051000 */ mfc1 $a1, $f2 +/* 0065C 80B6301C 460A4482 */ mul.s $f18, $f8, $f10 /* 00660 80B63020 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3D4CCCCD /* 00664 80B63024 26040160 */ addiu $a0, $s0, 0x0160 ## $a0 = 00000160 -/* 00668 80B63028 44079000 */ mfc1 $a3, $f18 +/* 00668 80B63028 44079000 */ mfc1 $a3, $f18 /* 0066C 80B6302C 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 00670 80B63030 00000000 */ nop /* 00674 80B63034 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 /* 00678 80B63038 44813000 */ mtc1 $at, $f6 ## $f6 = 20.00 /* 0067C 80B6303C C60401A8 */ lwc1 $f4, 0x01A8($s0) ## 000001A8 /* 00680 80B63040 3C05C53A */ lui $a1, 0xC53A ## $a1 = C53A0000 /* 00684 80B63044 3C063D4C */ lui $a2, 0x3D4C ## $a2 = 3D4C0000 -/* 00688 80B63048 46062202 */ mul.s $f8, $f4, $f6 +/* 00688 80B63048 46062202 */ mul.s $f8, $f4, $f6 /* 0068C 80B6304C 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3D4CCCCD /* 00690 80B63050 34A54000 */ ori $a1, $a1, 0x4000 ## $a1 = C53A4000 /* 00694 80B63054 26040164 */ addiu $a0, $s0, 0x0164 ## $a0 = 00000164 -/* 00698 80B63058 44074000 */ mfc1 $a3, $f8 +/* 00698 80B63058 44074000 */ mfc1 $a3, $f8 /* 0069C 80B6305C 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 006A0 80B63060 00000000 */ nop /* 006A4 80B63064 3C073C23 */ lui $a3, 0x3C23 ## $a3 = 3C230000 /* 006A8 80B63068 34E7D70A */ ori $a3, $a3, 0xD70A ## $a3 = 3C23D70A /* 006AC 80B6306C 260401A8 */ addiu $a0, $s0, 0x01A8 ## $a0 = 000001A8 /* 006B0 80B63070 3C053F80 */ lui $a1, 0x3F80 ## $a1 = 3F800000 /* 006B4 80B63074 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 006B8 80B63078 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 006BC 80B6307C 860801D4 */ lh $t0, 0x01D4($s0) ## 000001D4 /* 006C0 80B63080 24090004 */ addiu $t1, $zero, 0x0004 ## $t1 = 00000004 /* 006C4 80B63084 240A0032 */ addiu $t2, $zero, 0x0032 ## $t2 = 00000032 -/* 006C8 80B63088 55000333 */ bnel $t0, $zero, .L80B63D58 +/* 006C8 80B63088 55000333 */ bnel $t0, $zero, .L80B63D58 /* 006CC 80B6308C 860501CC */ lh $a1, 0x01CC($s0) ## 000001CC /* 006D0 80B63090 44805000 */ mtc1 $zero, $f10 ## $f10 = 0.00 /* 006D4 80B63094 A60901CA */ sh $t1, 0x01CA($s0) ## 000001CA /* 006D8 80B63098 A60A01D4 */ sh $t2, 0x01D4($s0) ## 000001D4 -/* 006DC 80B6309C 1000032D */ beq $zero, $zero, .L80B63D54 +/* 006DC 80B6309C 1000032D */ beq $zero, $zero, .L80B63D54 /* 006E0 80B630A0 E60A01A8 */ swc1 $f10, 0x01A8($s0) ## 000001A8 glabel L80B630A4 /* 006E4 80B630A4 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 @@ -371,99 +371,99 @@ glabel L80B630A4 /* 006EC 80B630AC C61201A8 */ lwc1 $f18, 0x01A8($s0) ## 000001A8 /* 006F0 80B630B0 3C063DCC */ lui $a2, 0x3DCC ## $a2 = 3DCC0000 /* 006F4 80B630B4 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3DCCCCCD -/* 006F8 80B630B8 46049182 */ mul.s $f6, $f18, $f4 +/* 006F8 80B630B8 46049182 */ mul.s $f6, $f18, $f4 /* 006FC 80B630BC 26040150 */ addiu $a0, $s0, 0x0150 ## $a0 = 00000150 /* 00700 80B630C0 3C0542A8 */ lui $a1, 0x42A8 ## $a1 = 42A80000 -/* 00704 80B630C4 44073000 */ mfc1 $a3, $f6 +/* 00704 80B630C4 44073000 */ mfc1 $a3, $f6 /* 00708 80B630C8 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 0070C 80B630CC 00000000 */ nop /* 00710 80B630D0 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 /* 00714 80B630D4 44815000 */ mtc1 $at, $f10 ## $f10 = 20.00 /* 00718 80B630D8 C60801A8 */ lwc1 $f8, 0x01A8($s0) ## 000001A8 /* 0071C 80B630DC 3C063DCC */ lui $a2, 0x3DCC ## $a2 = 3DCC0000 /* 00720 80B630E0 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3DCCCCCD -/* 00724 80B630E4 460A4482 */ mul.s $f18, $f8, $f10 +/* 00724 80B630E4 460A4482 */ mul.s $f18, $f8, $f10 /* 00728 80B630E8 26040154 */ addiu $a0, $s0, 0x0154 ## $a0 = 00000154 /* 0072C 80B630EC 3C05C1D0 */ lui $a1, 0xC1D0 ## $a1 = C1D00000 -/* 00730 80B630F0 44079000 */ mfc1 $a3, $f18 +/* 00730 80B630F0 44079000 */ mfc1 $a3, $f18 /* 00734 80B630F4 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 00738 80B630F8 00000000 */ nop /* 0073C 80B630FC 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 /* 00740 80B63100 44813000 */ mtc1 $at, $f6 ## $f6 = 20.00 /* 00744 80B63104 C60401A8 */ lwc1 $f4, 0x01A8($s0) ## 000001A8 /* 00748 80B63108 3C05C542 */ lui $a1, 0xC542 ## $a1 = C5420000 /* 0074C 80B6310C 3C063DCC */ lui $a2, 0x3DCC ## $a2 = 3DCC0000 -/* 00750 80B63110 46062202 */ mul.s $f8, $f4, $f6 +/* 00750 80B63110 46062202 */ mul.s $f8, $f4, $f6 /* 00754 80B63114 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3DCCCCCD /* 00758 80B63118 34A5B000 */ ori $a1, $a1, 0xB000 ## $a1 = C542B000 /* 0075C 80B6311C 26040158 */ addiu $a0, $s0, 0x0158 ## $a0 = 00000158 -/* 00760 80B63120 44074000 */ mfc1 $a3, $f8 +/* 00760 80B63120 44074000 */ mfc1 $a3, $f8 /* 00764 80B63124 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 00768 80B63128 00000000 */ nop /* 0076C 80B6312C 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 /* 00770 80B63130 44819000 */ mtc1 $at, $f18 ## $f18 = 20.00 /* 00774 80B63134 C60A01A8 */ lwc1 $f10, 0x01A8($s0) ## 000001A8 /* 00778 80B63138 3C063DCC */ lui $a2, 0x3DCC ## $a2 = 3DCC0000 /* 0077C 80B6313C 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3DCCCCCD -/* 00780 80B63140 46125102 */ mul.s $f4, $f10, $f18 +/* 00780 80B63140 46125102 */ mul.s $f4, $f10, $f18 /* 00784 80B63144 2604015C */ addiu $a0, $s0, 0x015C ## $a0 = 0000015C /* 00788 80B63148 3C05C308 */ lui $a1, 0xC308 ## $a1 = C3080000 -/* 0078C 80B6314C 44072000 */ mfc1 $a3, $f4 +/* 0078C 80B6314C 44072000 */ mfc1 $a3, $f4 /* 00790 80B63150 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 00794 80B63154 00000000 */ nop /* 00798 80B63158 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 /* 0079C 80B6315C 44814000 */ mtc1 $at, $f8 ## $f8 = 20.00 /* 007A0 80B63160 C60601A8 */ lwc1 $f6, 0x01A8($s0) ## 000001A8 /* 007A4 80B63164 3C063DCC */ lui $a2, 0x3DCC ## $a2 = 3DCC0000 /* 007A8 80B63168 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3DCCCCCD -/* 007AC 80B6316C 46083282 */ mul.s $f10, $f6, $f8 +/* 007AC 80B6316C 46083282 */ mul.s $f10, $f6, $f8 /* 007B0 80B63170 26040160 */ addiu $a0, $s0, 0x0160 ## $a0 = 00000160 /* 007B4 80B63174 3C054294 */ lui $a1, 0x4294 ## $a1 = 42940000 -/* 007B8 80B63178 44075000 */ mfc1 $a3, $f10 +/* 007B8 80B63178 44075000 */ mfc1 $a3, $f10 /* 007BC 80B6317C 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 007C0 80B63180 00000000 */ nop /* 007C4 80B63184 3C014220 */ lui $at, 0x4220 ## $at = 42200000 /* 007C8 80B63188 44812000 */ mtc1 $at, $f4 ## $f4 = 40.00 /* 007CC 80B6318C C61201A8 */ lwc1 $f18, 0x01A8($s0) ## 000001A8 /* 007D0 80B63190 3C05C553 */ lui $a1, 0xC553 ## $a1 = C5530000 /* 007D4 80B63194 3C063DCC */ lui $a2, 0x3DCC ## $a2 = 3DCC0000 -/* 007D8 80B63198 46049182 */ mul.s $f6, $f18, $f4 +/* 007D8 80B63198 46049182 */ mul.s $f6, $f18, $f4 /* 007DC 80B6319C 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3DCCCCCD /* 007E0 80B631A0 34A54000 */ ori $a1, $a1, 0x4000 ## $a1 = C5534000 /* 007E4 80B631A4 26040164 */ addiu $a0, $s0, 0x0164 ## $a0 = 00000164 -/* 007E8 80B631A8 44073000 */ mfc1 $a3, $f6 +/* 007E8 80B631A8 44073000 */ mfc1 $a3, $f6 /* 007EC 80B631AC 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 007F0 80B631B0 00000000 */ nop /* 007F4 80B631B4 3C073D4C */ lui $a3, 0x3D4C ## $a3 = 3D4C0000 /* 007F8 80B631B8 34E7CCCD */ ori $a3, $a3, 0xCCCD ## $a3 = 3D4CCCCD /* 007FC 80B631BC 260401A8 */ addiu $a0, $s0, 0x01A8 ## $a0 = 000001A8 /* 00800 80B631C0 3C053F80 */ lui $a1, 0x3F80 ## $a1 = 3F800000 /* 00804 80B631C4 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 00808 80B631C8 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 0080C 80B631CC 860301D4 */ lh $v1, 0x01D4($s0) ## 000001D4 /* 00810 80B631D0 24010005 */ addiu $at, $zero, 0x0005 ## $at = 00000005 /* 00814 80B631D4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00818 80B631D8 14610004 */ bne $v1, $at, .L80B631EC +/* 00818 80B631D8 14610004 */ bne $v1, $at, .L80B631EC /* 0081C 80B631DC 00000000 */ nop /* 00820 80B631E0 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 00824 80B631E4 2405282C */ addiu $a1, $zero, 0x282C ## $a1 = 0000282C /* 00828 80B631E8 860301D4 */ lh $v1, 0x01D4($s0) ## 000001D4 .L80B631EC: -/* 0082C 80B631EC 146002D9 */ bne $v1, $zero, .L80B63D54 +/* 0082C 80B631EC 146002D9 */ bne $v1, $zero, .L80B63D54 /* 00830 80B631F0 240B0005 */ addiu $t3, $zero, 0x0005 ## $t3 = 00000005 /* 00834 80B631F4 44804000 */ mtc1 $zero, $f8 ## $f8 = 0.00 /* 00838 80B631F8 240C0032 */ addiu $t4, $zero, 0x0032 ## $t4 = 00000032 /* 0083C 80B631FC A60B01CA */ sh $t3, 0x01CA($s0) ## 000001CA /* 00840 80B63200 A60C01D4 */ sh $t4, 0x01D4($s0) ## 000001D4 -/* 00844 80B63204 100002D3 */ beq $zero, $zero, .L80B63D54 +/* 00844 80B63204 100002D3 */ beq $zero, $zero, .L80B63D54 /* 00848 80B63208 E60801A8 */ swc1 $f8, 0x01A8($s0) ## 000001A8 glabel L80B6320C /* 0084C 80B6320C 3C014280 */ lui $at, 0x4280 ## $at = 42800000 @@ -471,7 +471,7 @@ glabel L80B6320C /* 00854 80B63214 3C01C180 */ lui $at, 0xC180 ## $at = C1800000 /* 00858 80B63218 44816000 */ mtc1 $at, $f12 ## $f12 = -16.00 /* 0085C 80B6321C 3C0180B6 */ lui $at, %hi(D_80B653FC) ## $at = 80B60000 -/* 00860 80B63220 C42E53FC */ lwc1 $f14, %lo(D_80B653FC)($at) +/* 00860 80B63220 C42E53FC */ lwc1 $f14, %lo(D_80B653FC)($at) /* 00864 80B63224 3C01432E */ lui $at, 0x432E ## $at = 432E0000 /* 00868 80B63228 44818000 */ mtc1 $at, $f16 ## $f16 = 174.00 /* 0086C 80B6322C 3C01C308 */ lui $at, 0xC308 ## $at = C3080000 @@ -484,108 +484,108 @@ glabel L80B6320C /* 00888 80B63248 E60E0158 */ swc1 $f14, 0x0158($s0) ## 00000158 /* 0088C 80B6324C E6100160 */ swc1 $f16, 0x0160($s0) ## 00000160 /* 00890 80B63250 E60A015C */ swc1 $f10, 0x015C($s0) ## 0000015C -/* 00894 80B63254 C4325400 */ lwc1 $f18, %lo(D_80B65400)($at) +/* 00894 80B63254 C4325400 */ lwc1 $f18, %lo(D_80B65400)($at) /* 00898 80B63258 3C014208 */ lui $at, 0x4208 ## $at = 42080000 /* 0089C 80B6325C 44812000 */ mtc1 $at, $f4 ## $f4 = 34.00 /* 008A0 80B63260 3C01428A */ lui $at, 0x428A ## $at = 428A0000 /* 008A4 80B63264 44813000 */ mtc1 $at, $f6 ## $f6 = 69.00 -/* 008A8 80B63268 46041001 */ sub.s $f0, $f2, $f4 +/* 008A8 80B63268 46041001 */ sub.s $f0, $f2, $f4 /* 008AC 80B6326C 3C0180B6 */ lui $at, %hi(D_80B65404) ## $at = 80B60000 /* 008B0 80B63270 E6120164 */ swc1 $f18, 0x0164($s0) ## 00000164 /* 008B4 80B63274 C6120164 */ lwc1 $f18, 0x0164($s0) ## 00000164 -/* 008B8 80B63278 46000005 */ abs.s $f0, $f0 +/* 008B8 80B63278 46000005 */ abs.s $f0, $f0 /* 008BC 80B6327C 240E00FA */ addiu $t6, $zero, 0x00FA ## $t6 = 000000FA /* 008C0 80B63280 E6000168 */ swc1 $f0, 0x0168($s0) ## 00000168 -/* 008C4 80B63284 46066001 */ sub.s $f0, $f12, $f6 -/* 008C8 80B63288 46000005 */ abs.s $f0, $f0 +/* 008C4 80B63284 46066001 */ sub.s $f0, $f12, $f6 +/* 008C8 80B63288 46000005 */ abs.s $f0, $f0 /* 008CC 80B6328C E600016C */ swc1 $f0, 0x016C($s0) ## 0000016C -/* 008D0 80B63290 C4285404 */ lwc1 $f8, %lo(D_80B65404)($at) +/* 008D0 80B63290 C4285404 */ lwc1 $f8, %lo(D_80B65404)($at) /* 008D4 80B63294 3C014324 */ lui $at, 0x4324 ## $at = 43240000 /* 008D8 80B63298 44815000 */ mtc1 $at, $f10 ## $f10 = 164.00 -/* 008DC 80B6329C 46087001 */ sub.s $f0, $f14, $f8 +/* 008DC 80B6329C 46087001 */ sub.s $f0, $f14, $f8 /* 008E0 80B632A0 3C0180B6 */ lui $at, %hi(D_80B65408) ## $at = 80B60000 -/* 008E4 80B632A4 46000005 */ abs.s $f0, $f0 +/* 008E4 80B632A4 46000005 */ abs.s $f0, $f0 /* 008E8 80B632A8 E6000170 */ swc1 $f0, 0x0170($s0) ## 00000170 /* 008EC 80B632AC 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 /* 008F0 80B632B0 00000000 */ nop -/* 008F4 80B632B4 46000005 */ abs.s $f0, $f0 +/* 008F4 80B632B4 46000005 */ abs.s $f0, $f0 /* 008F8 80B632B8 E6000174 */ swc1 $f0, 0x0174($s0) ## 00000174 -/* 008FC 80B632BC 460A8001 */ sub.s $f0, $f16, $f10 -/* 00900 80B632C0 46000005 */ abs.s $f0, $f0 +/* 008FC 80B632BC 460A8001 */ sub.s $f0, $f16, $f10 +/* 00900 80B632C0 46000005 */ abs.s $f0, $f0 /* 00904 80B632C4 E6000178 */ swc1 $f0, 0x0178($s0) ## 00000178 -/* 00908 80B632C8 C4245408 */ lwc1 $f4, %lo(D_80B65408)($at) +/* 00908 80B632C8 C4245408 */ lwc1 $f4, %lo(D_80B65408)($at) /* 0090C 80B632CC A60E01D4 */ sh $t6, 0x01D4($s0) ## 000001D4 -/* 00910 80B632D0 46049001 */ sub.s $f0, $f18, $f4 -/* 00914 80B632D4 46000005 */ abs.s $f0, $f0 +/* 00910 80B632D0 46049001 */ sub.s $f0, $f18, $f4 +/* 00914 80B632D4 46000005 */ abs.s $f0, $f0 /* 00918 80B632D8 E600017C */ swc1 $f0, 0x017C($s0) ## 0000017C glabel L80B632DC /* 0091C 80B632DC C60601A8 */ lwc1 $f6, 0x01A8($s0) ## 000001A8 /* 00920 80B632E0 C6080168 */ lwc1 $f8, 0x0168($s0) ## 00000168 /* 00924 80B632E4 3C063D4C */ lui $a2, 0x3D4C ## $a2 = 3D4C0000 /* 00928 80B632E8 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3D4CCCCD -/* 0092C 80B632EC 46083282 */ mul.s $f10, $f6, $f8 +/* 0092C 80B632EC 46083282 */ mul.s $f10, $f6, $f8 /* 00930 80B632F0 26040150 */ addiu $a0, $s0, 0x0150 ## $a0 = 00000150 /* 00934 80B632F4 3C054208 */ lui $a1, 0x4208 ## $a1 = 42080000 -/* 00938 80B632F8 44075000 */ mfc1 $a3, $f10 +/* 00938 80B632F8 44075000 */ mfc1 $a3, $f10 /* 0093C 80B632FC 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 00940 80B63300 00000000 */ nop /* 00944 80B63304 C61201A8 */ lwc1 $f18, 0x01A8($s0) ## 000001A8 /* 00948 80B63308 C604016C */ lwc1 $f4, 0x016C($s0) ## 0000016C /* 0094C 80B6330C 3C063D4C */ lui $a2, 0x3D4C ## $a2 = 3D4C0000 /* 00950 80B63310 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3D4CCCCD -/* 00954 80B63314 46049182 */ mul.s $f6, $f18, $f4 +/* 00954 80B63314 46049182 */ mul.s $f6, $f18, $f4 /* 00958 80B63318 26040154 */ addiu $a0, $s0, 0x0154 ## $a0 = 00000154 /* 0095C 80B6331C 3C05428A */ lui $a1, 0x428A ## $a1 = 428A0000 -/* 00960 80B63320 44073000 */ mfc1 $a3, $f6 +/* 00960 80B63320 44073000 */ mfc1 $a3, $f6 /* 00964 80B63324 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 00968 80B63328 00000000 */ nop /* 0096C 80B6332C C60801A8 */ lwc1 $f8, 0x01A8($s0) ## 000001A8 /* 00970 80B63330 C60A0170 */ lwc1 $f10, 0x0170($s0) ## 00000170 /* 00974 80B63334 3C05C54D */ lui $a1, 0xC54D ## $a1 = C54D0000 /* 00978 80B63338 3C063D4C */ lui $a2, 0x3D4C ## $a2 = 3D4C0000 -/* 0097C 80B6333C 460A4482 */ mul.s $f18, $f8, $f10 +/* 0097C 80B6333C 460A4482 */ mul.s $f18, $f8, $f10 /* 00980 80B63340 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3D4CCCCD /* 00984 80B63344 34A5A000 */ ori $a1, $a1, 0xA000 ## $a1 = C54DA000 /* 00988 80B63348 26040158 */ addiu $a0, $s0, 0x0158 ## $a0 = 00000158 -/* 0098C 80B6334C 44079000 */ mfc1 $a3, $f18 +/* 0098C 80B6334C 44079000 */ mfc1 $a3, $f18 /* 00990 80B63350 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 00994 80B63354 00000000 */ nop /* 00998 80B63358 C60401A8 */ lwc1 $f4, 0x01A8($s0) ## 000001A8 /* 0099C 80B6335C C6060174 */ lwc1 $f6, 0x0174($s0) ## 00000174 /* 009A0 80B63360 3C063D4C */ lui $a2, 0x3D4C ## $a2 = 3D4C0000 /* 009A4 80B63364 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3D4CCCCD -/* 009A8 80B63368 46062202 */ mul.s $f8, $f4, $f6 +/* 009A8 80B63368 46062202 */ mul.s $f8, $f4, $f6 /* 009AC 80B6336C 2604015C */ addiu $a0, $s0, 0x015C ## $a0 = 0000015C /* 009B0 80B63370 3C05C308 */ lui $a1, 0xC308 ## $a1 = C3080000 -/* 009B4 80B63374 44074000 */ mfc1 $a3, $f8 +/* 009B4 80B63374 44074000 */ mfc1 $a3, $f8 /* 009B8 80B63378 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 009BC 80B6337C 00000000 */ nop /* 009C0 80B63380 C60A01A8 */ lwc1 $f10, 0x01A8($s0) ## 000001A8 /* 009C4 80B63384 C6120178 */ lwc1 $f18, 0x0178($s0) ## 00000178 /* 009C8 80B63388 3C063D4C */ lui $a2, 0x3D4C ## $a2 = 3D4C0000 /* 009CC 80B6338C 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3D4CCCCD -/* 009D0 80B63390 46125102 */ mul.s $f4, $f10, $f18 +/* 009D0 80B63390 46125102 */ mul.s $f4, $f10, $f18 /* 009D4 80B63394 26040160 */ addiu $a0, $s0, 0x0160 ## $a0 = 00000160 /* 009D8 80B63398 3C054324 */ lui $a1, 0x4324 ## $a1 = 43240000 -/* 009DC 80B6339C 44072000 */ mfc1 $a3, $f4 +/* 009DC 80B6339C 44072000 */ mfc1 $a3, $f4 /* 009E0 80B633A0 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 009E4 80B633A4 00000000 */ nop /* 009E8 80B633A8 C60601A8 */ lwc1 $f6, 0x01A8($s0) ## 000001A8 /* 009EC 80B633AC C608017C */ lwc1 $f8, 0x017C($s0) ## 0000017C /* 009F0 80B633B0 3C05C553 */ lui $a1, 0xC553 ## $a1 = C5530000 /* 009F4 80B633B4 3C063D4C */ lui $a2, 0x3D4C ## $a2 = 3D4C0000 -/* 009F8 80B633B8 46083282 */ mul.s $f10, $f6, $f8 +/* 009F8 80B633B8 46083282 */ mul.s $f10, $f6, $f8 /* 009FC 80B633BC 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3D4CCCCD /* 00A00 80B633C0 34A54000 */ ori $a1, $a1, 0x4000 ## $a1 = C5534000 /* 00A04 80B633C4 26040164 */ addiu $a0, $s0, 0x0164 ## $a0 = 00000164 -/* 00A08 80B633C8 44075000 */ mfc1 $a3, $f10 +/* 00A08 80B633C8 44075000 */ mfc1 $a3, $f10 /* 00A0C 80B633CC 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 00A10 80B633D0 00000000 */ nop /* 00A14 80B633D4 3C053C23 */ lui $a1, 0x3C23 ## $a1 = 3C230000 /* 00A18 80B633D8 3C073A83 */ lui $a3, 0x3A83 ## $a3 = 3A830000 @@ -593,51 +593,51 @@ glabel L80B632DC /* 00A20 80B633E0 34A5D70A */ ori $a1, $a1, 0xD70A ## $a1 = 3C23D70A /* 00A24 80B633E4 260401A8 */ addiu $a0, $s0, 0x01A8 ## $a0 = 000001A8 /* 00A28 80B633E8 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 00A2C 80B633EC 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 00A30 80B633F0 860301D4 */ lh $v1, 0x01D4($s0) ## 000001D4 /* 00A34 80B633F4 240100F5 */ addiu $at, $zero, 0x00F5 ## $at = 000000F5 -/* 00A38 80B633F8 10610002 */ beq $v1, $at, .L80B63404 +/* 00A38 80B633F8 10610002 */ beq $v1, $at, .L80B63404 /* 00A3C 80B633FC 24010003 */ addiu $at, $zero, 0x0003 ## $at = 00000003 -/* 00A40 80B63400 14610012 */ bne $v1, $at, .L80B6344C +/* 00A40 80B63400 14610012 */ bne $v1, $at, .L80B6344C .L80B63404: /* 00A44 80B63404 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 /* 00A48 80B63408 24A5DDB8 */ addiu $a1, $a1, 0xDDB8 ## $a1 = 0600DDB8 /* 00A4C 80B6340C 26040250 */ addiu $a0, $s0, 0x0250 ## $a0 = 00000250 -/* 00A50 80B63410 0C029490 */ jal func_800A5240 +/* 00A50 80B63410 0C029490 */ jal SkelAnime_ChangeAnimTransitionStop /* 00A54 80B63414 3C06C100 */ lui $a2, 0xC100 ## $a2 = C1000000 /* 00A58 80B63418 240F0002 */ addiu $t7, $zero, 0x0002 ## $t7 = 00000002 /* 00A5C 80B6341C A20F014C */ sb $t7, 0x014C($s0) ## 0000014C /* 00A60 80B63420 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 00A64 80B63424 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 00A68 80B63428 2405283D */ addiu $a1, $zero, 0x283D ## $a1 = 0000283D /* 00A6C 80B6342C 860301D4 */ lh $v1, 0x01D4($s0) ## 000001D4 /* 00A70 80B63430 24010003 */ addiu $at, $zero, 0x0003 ## $at = 00000003 /* 00A74 80B63434 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00A78 80B63438 54610005 */ bnel $v1, $at, .L80B63450 +/* 00A78 80B63438 54610005 */ bnel $v1, $at, .L80B63450 /* 00A7C 80B6343C 240100C0 */ addiu $at, $zero, 0x00C0 ## $at = 000000C0 /* 00A80 80B63440 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 00A84 80B63444 240538B2 */ addiu $a1, $zero, 0x38B2 ## $a1 = 000038B2 /* 00A88 80B63448 860301D4 */ lh $v1, 0x01D4($s0) ## 000001D4 .L80B6344C: /* 00A8C 80B6344C 240100C0 */ addiu $at, $zero, 0x00C0 ## $at = 000000C0 .L80B63450: -/* 00A90 80B63450 14610004 */ bne $v1, $at, .L80B63464 +/* 00A90 80B63450 14610004 */ bne $v1, $at, .L80B63464 /* 00A94 80B63454 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 00A98 80B63458 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 00A9C 80B6345C 2405282C */ addiu $a1, $zero, 0x282C ## $a1 = 0000282C /* 00AA0 80B63460 860301D4 */ lh $v1, 0x01D4($s0) ## 000001D4 .L80B63464: /* 00AA4 80B63464 240100D4 */ addiu $at, $zero, 0x00D4 ## $at = 000000D4 -/* 00AA8 80B63468 14610015 */ bne $v1, $at, .L80B634C0 +/* 00AA8 80B63468 14610015 */ bne $v1, $at, .L80B634C0 /* 00AAC 80B6346C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 00AB0 80B63470 26180250 */ addiu $t8, $s0, 0x0250 ## $t8 = 00000250 -/* 00AB4 80B63474 AFB80044 */ sw $t8, 0x0044($sp) +/* 00AB4 80B63474 AFB80044 */ sw $t8, 0x0044($sp) /* 00AB8 80B63478 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 00ABC 80B6347C 2405282B */ addiu $a1, $zero, 0x282B ## $a1 = 0000282B /* 00AC0 80B63480 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 /* 00AC4 80B63484 44819000 */ mtc1 $at, $f18 ## $f18 = 5.00 @@ -646,312 +646,312 @@ glabel L80B632DC /* 00AD0 80B63490 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 /* 00AD4 80B63494 3C063E99 */ lui $a2, 0x3E99 ## $a2 = 3E990000 /* 00AD8 80B63498 24190001 */ addiu $t9, $zero, 0x0001 ## $t9 = 00000001 -/* 00ADC 80B6349C AFB90014 */ sw $t9, 0x0014($sp) +/* 00ADC 80B6349C AFB90014 */ sw $t9, 0x0014($sp) /* 00AE0 80B634A0 34C6999A */ ori $a2, $a2, 0x999A ## $a2 = 3E99999A /* 00AE4 80B634A4 24A5E8A0 */ addiu $a1, $a1, 0xE8A0 ## $a1 = 0600E8A0 -/* 00AE8 80B634A8 8FA40044 */ lw $a0, 0x0044($sp) +/* 00AE8 80B634A8 8FA40044 */ lw $a0, 0x0044($sp) /* 00AEC 80B634AC 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 00AF0 80B634B0 E7B20010 */ swc1 $f18, 0x0010($sp) -/* 00AF4 80B634B4 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 00AF8 80B634B8 E7A40018 */ swc1 $f4, 0x0018($sp) +/* 00AF0 80B634B0 E7B20010 */ swc1 $f18, 0x0010($sp) +/* 00AF4 80B634B4 0C029468 */ jal SkelAnime_ChangeAnim + +/* 00AF8 80B634B8 E7A40018 */ swc1 $f4, 0x0018($sp) /* 00AFC 80B634BC 860301D4 */ lh $v1, 0x01D4($s0) ## 000001D4 .L80B634C0: /* 00B00 80B634C0 2401005A */ addiu $at, $zero, 0x005A ## $at = 0000005A -/* 00B04 80B634C4 1461000B */ bne $v1, $at, .L80B634F4 -/* 00B08 80B634C8 8FA9006C */ lw $t1, 0x006C($sp) +/* 00B04 80B634C4 1461000B */ bne $v1, $at, .L80B634F4 +/* 00B08 80B634C8 8FA9006C */ lw $t1, 0x006C($sp) /* 00B0C 80B634CC 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 00B10 80B634D0 00290821 */ addu $at, $at, $t1 +/* 00B10 80B634D0 00290821 */ addu $at, $at, $t1 /* 00B14 80B634D4 24080002 */ addiu $t0, $zero, 0x0002 ## $t0 = 00000002 /* 00B18 80B634D8 A0280AE3 */ sb $t0, 0x0AE3($at) ## 00010AE3 -/* 00B1C 80B634DC 8FAB006C */ lw $t3, 0x006C($sp) +/* 00B1C 80B634DC 8FAB006C */ lw $t3, 0x006C($sp) /* 00B20 80B634E0 3C010001 */ lui $at, 0x0001 ## $at = 00010000 /* 00B24 80B634E4 240A0014 */ addiu $t2, $zero, 0x0014 ## $t2 = 00000014 -/* 00B28 80B634E8 002B0821 */ addu $at, $at, $t3 +/* 00B28 80B634E8 002B0821 */ addu $at, $at, $t3 /* 00B2C 80B634EC A42A0AFA */ sh $t2, 0x0AFA($at) ## 00010AFA /* 00B30 80B634F0 860301D4 */ lh $v1, 0x01D4($s0) ## 000001D4 .L80B634F4: /* 00B34 80B634F4 24010064 */ addiu $at, $zero, 0x0064 ## $at = 00000064 -/* 00B38 80B634F8 14610003 */ bne $v1, $at, .L80B63508 +/* 00B38 80B634F8 14610003 */ bne $v1, $at, .L80B63508 /* 00B3C 80B634FC 240C0003 */ addiu $t4, $zero, 0x0003 ## $t4 = 00000003 /* 00B40 80B63500 A20C014C */ sb $t4, 0x014C($s0) ## 0000014C /* 00B44 80B63504 860301D4 */ lh $v1, 0x01D4($s0) ## 000001D4 .L80B63508: /* 00B48 80B63508 2401003C */ addiu $at, $zero, 0x003C ## $at = 0000003C -/* 00B4C 80B6350C 14610003 */ bne $v1, $at, .L80B6351C +/* 00B4C 80B6350C 14610003 */ bne $v1, $at, .L80B6351C /* 00B50 80B63510 240D0005 */ addiu $t5, $zero, 0x0005 ## $t5 = 00000005 /* 00B54 80B63514 A20D014C */ sb $t5, 0x014C($s0) ## 0000014C /* 00B58 80B63518 860301D4 */ lh $v1, 0x01D4($s0) ## 000001D4 .L80B6351C: /* 00B5C 80B6351C 24010082 */ addiu $at, $zero, 0x0082 ## $at = 00000082 -/* 00B60 80B63520 14610004 */ bne $v1, $at, .L80B63534 +/* 00B60 80B63520 14610004 */ bne $v1, $at, .L80B63534 /* 00B64 80B63524 3C041050 */ lui $a0, 0x1050 ## $a0 = 10500000 /* 00B68 80B63528 0C03E803 */ jal Audio_SetBGM - + /* 00B6C 80B6352C 348400FF */ ori $a0, $a0, 0x00FF ## $a0 = 105000FF /* 00B70 80B63530 860301D4 */ lh $v1, 0x01D4($s0) ## 000001D4 .L80B63534: /* 00B74 80B63534 2401001E */ addiu $at, $zero, 0x001E ## $at = 0000001E -/* 00B78 80B63538 14610004 */ bne $v1, $at, .L80B6354C -/* 00B7C 80B6353C 8FAF005C */ lw $t7, 0x005C($sp) +/* 00B78 80B63538 14610004 */ bne $v1, $at, .L80B6354C +/* 00B7C 80B6353C 8FAF005C */ lw $t7, 0x005C($sp) /* 00B80 80B63540 240E0002 */ addiu $t6, $zero, 0x0002 ## $t6 = 00000002 /* 00B84 80B63544 A5EE01AA */ sh $t6, 0x01AA($t7) ## 000001AA /* 00B88 80B63548 860301D4 */ lh $v1, 0x01D4($s0) ## 000001D4 .L80B6354C: /* 00B8C 80B6354C 24010023 */ addiu $at, $zero, 0x0023 ## $at = 00000023 -/* 00B90 80B63550 14610005 */ bne $v1, $at, .L80B63568 +/* 00B90 80B63550 14610005 */ bne $v1, $at, .L80B63568 /* 00B94 80B63554 3C0480B6 */ lui $a0, %hi(D_80B651F8) ## $a0 = 80B60000 /* 00B98 80B63558 248451F8 */ addiu $a0, $a0, %lo(D_80B651F8) ## $a0 = 80B651F8 -/* 00B9C 80B6355C 0C01E245 */ jal func_80078914 +/* 00B9C 80B6355C 0C01E245 */ jal func_80078914 /* 00BA0 80B63560 240538AB */ addiu $a1, $zero, 0x38AB ## $a1 = 000038AB /* 00BA4 80B63564 860301D4 */ lh $v1, 0x01D4($s0) ## 000001D4 .L80B63568: /* 00BA8 80B63568 24010082 */ addiu $at, $zero, 0x0082 ## $at = 00000082 -/* 00BAC 80B6356C 14610008 */ bne $v1, $at, .L80B63590 +/* 00BAC 80B6356C 14610008 */ bne $v1, $at, .L80B63590 /* 00BB0 80B63570 24180001 */ addiu $t8, $zero, 0x0001 ## $t8 = 00000001 -/* 00BB4 80B63574 8FB9005C */ lw $t9, 0x005C($sp) +/* 00BB4 80B63574 8FB9005C */ lw $t9, 0x005C($sp) /* 00BB8 80B63578 3C0480B6 */ lui $a0, %hi(D_80B651F8) ## $a0 = 80B60000 /* 00BBC 80B6357C 248451F8 */ addiu $a0, $a0, %lo(D_80B651F8) ## $a0 = 80B651F8 /* 00BC0 80B63580 240539D6 */ addiu $a1, $zero, 0x39D6 ## $a1 = 000039D6 -/* 00BC4 80B63584 0C01E245 */ jal func_80078914 +/* 00BC4 80B63584 0C01E245 */ jal func_80078914 /* 00BC8 80B63588 A73801AA */ sh $t8, 0x01AA($t9) ## 000001AA /* 00BCC 80B6358C 860301D4 */ lh $v1, 0x01D4($s0) ## 000001D4 .L80B63590: /* 00BD0 80B63590 24010014 */ addiu $at, $zero, 0x0014 ## $at = 00000014 -/* 00BD4 80B63594 54610005 */ bnel $v1, $at, .L80B635AC +/* 00BD4 80B63594 54610005 */ bnel $v1, $at, .L80B635AC /* 00BD8 80B63598 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 /* 00BDC 80B6359C 0C03E803 */ jal Audio_SetBGM - + /* 00BE0 80B635A0 2404001B */ addiu $a0, $zero, 0x001B ## $a0 = 0000001B /* 00BE4 80B635A4 860301D4 */ lh $v1, 0x01D4($s0) ## 000001D4 /* 00BE8 80B635A8 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 .L80B635AC: -/* 00BEC 80B635AC 146101E9 */ bne $v1, $at, .L80B63D54 +/* 00BEC 80B635AC 146101E9 */ bne $v1, $at, .L80B63D54 /* 00BF0 80B635B0 3C014342 */ lui $at, 0x4342 ## $at = 43420000 /* 00BF4 80B635B4 44815000 */ mtc1 $at, $f10 ## $f10 = 194.00 /* 00BF8 80B635B8 C6080150 */ lwc1 $f8, 0x0150($s0) ## 00000150 /* 00BFC 80B635BC 3C01C1D0 */ lui $at, 0xC1D0 ## $at = C1D00000 /* 00C00 80B635C0 44812000 */ mtc1 $at, $f4 ## $f4 = -26.00 -/* 00C04 80B635C4 460A4001 */ sub.s $f0, $f8, $f10 +/* 00C04 80B635C4 460A4001 */ sub.s $f0, $f8, $f10 /* 00C08 80B635C8 C6120154 */ lwc1 $f18, 0x0154($s0) ## 00000154 /* 00C0C 80B635CC 44803000 */ mtc1 $zero, $f6 ## $f6 = 0.00 /* 00C10 80B635D0 24080007 */ addiu $t0, $zero, 0x0007 ## $t0 = 00000007 -/* 00C14 80B635D4 46000005 */ abs.s $f0, $f0 +/* 00C14 80B635D4 46000005 */ abs.s $f0, $f0 /* 00C18 80B635D8 E60601A8 */ swc1 $f6, 0x01A8($s0) ## 000001A8 /* 00C1C 80B635DC E6000168 */ swc1 $f0, 0x0168($s0) ## 00000168 -/* 00C20 80B635E0 46049001 */ sub.s $f0, $f18, $f4 +/* 00C20 80B635E0 46049001 */ sub.s $f0, $f18, $f4 /* 00C24 80B635E4 A60801CA */ sh $t0, 0x01CA($s0) ## 000001CA /* 00C28 80B635E8 3C0180B6 */ lui $at, %hi(D_80B6540C) ## $at = 80B60000 /* 00C2C 80B635EC C6060158 */ lwc1 $f6, 0x0158($s0) ## 00000158 -/* 00C30 80B635F0 46000005 */ abs.s $f0, $f0 +/* 00C30 80B635F0 46000005 */ abs.s $f0, $f0 /* 00C34 80B635F4 C6120024 */ lwc1 $f18, 0x0024($s0) ## 00000024 /* 00C38 80B635F8 E600016C */ swc1 $f0, 0x016C($s0) ## 0000016C -/* 00C3C 80B635FC C428540C */ lwc1 $f8, %lo(D_80B6540C)($at) +/* 00C3C 80B635FC C428540C */ lwc1 $f8, %lo(D_80B6540C)($at) /* 00C40 80B63600 3C01428C */ lui $at, 0x428C ## $at = 428C0000 /* 00C44 80B63604 C60A015C */ lwc1 $f10, 0x015C($s0) ## 0000015C -/* 00C48 80B63608 46083001 */ sub.s $f0, $f6, $f8 +/* 00C48 80B63608 46083001 */ sub.s $f0, $f6, $f8 /* 00C4C 80B6360C 44813000 */ mtc1 $at, $f6 ## $f6 = 70.00 /* 00C50 80B63610 C6040028 */ lwc1 $f4, 0x0028($s0) ## 00000028 /* 00C54 80B63614 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 -/* 00C58 80B63618 46000005 */ abs.s $f0, $f0 -/* 00C5C 80B6361C 46062200 */ add.s $f8, $f4, $f6 +/* 00C58 80B63618 46000005 */ abs.s $f0, $f0 +/* 00C5C 80B6361C 46062200 */ add.s $f8, $f4, $f6 /* 00C60 80B63620 E6000170 */ swc1 $f0, 0x0170($s0) ## 00000170 /* 00C64 80B63624 C6040160 */ lwc1 $f4, 0x0160($s0) ## 00000160 -/* 00C68 80B63628 46125001 */ sub.s $f0, $f10, $f18 +/* 00C68 80B63628 46125001 */ sub.s $f0, $f10, $f18 /* 00C6C 80B6362C 44815000 */ mtc1 $at, $f10 ## $f10 = 20.00 /* 00C70 80B63630 C6060164 */ lwc1 $f6, 0x0164($s0) ## 00000164 /* 00C74 80B63634 24090064 */ addiu $t1, $zero, 0x0064 ## $t1 = 00000064 -/* 00C78 80B63638 460A4481 */ sub.s $f18, $f8, $f10 +/* 00C78 80B63638 460A4481 */ sub.s $f18, $f8, $f10 /* 00C7C 80B6363C C608002C */ lwc1 $f8, 0x002C($s0) ## 0000002C /* 00C80 80B63640 240A0022 */ addiu $t2, $zero, 0x0022 ## $t2 = 00000022 -/* 00C84 80B63644 46000005 */ abs.s $f0, $f0 +/* 00C84 80B63644 46000005 */ abs.s $f0, $f0 /* 00C88 80B63648 A60901D4 */ sh $t1, 0x01D4($s0) ## 000001D4 /* 00C8C 80B6364C E6000174 */ swc1 $f0, 0x0174($s0) ## 00000174 -/* 00C90 80B63650 46122001 */ sub.s $f0, $f4, $f18 +/* 00C90 80B63650 46122001 */ sub.s $f0, $f4, $f18 /* 00C94 80B63654 A60A01D6 */ sh $t2, 0x01D6($s0) ## 000001D6 -/* 00C98 80B63658 46000005 */ abs.s $f0, $f0 +/* 00C98 80B63658 46000005 */ abs.s $f0, $f0 /* 00C9C 80B6365C E6000178 */ swc1 $f0, 0x0178($s0) ## 00000178 -/* 00CA0 80B63660 46083001 */ sub.s $f0, $f6, $f8 -/* 00CA4 80B63664 46000005 */ abs.s $f0, $f0 -/* 00CA8 80B63668 100001BA */ beq $zero, $zero, .L80B63D54 +/* 00CA0 80B63660 46083001 */ sub.s $f0, $f6, $f8 +/* 00CA4 80B63664 46000005 */ abs.s $f0, $f0 +/* 00CA8 80B63668 100001BA */ beq $zero, $zero, .L80B63D54 /* 00CAC 80B6366C E600017C */ swc1 $f0, 0x017C($s0) ## 0000017C glabel L80B63670 /* 00CB0 80B63670 860B01D6 */ lh $t3, 0x01D6($s0) ## 000001D6 /* 00CB4 80B63674 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 00CB8 80B63678 15610013 */ bne $t3, $at, .L80B636C8 +/* 00CB8 80B63678 15610013 */ bne $t3, $at, .L80B636C8 /* 00CBC 80B6367C 3C040601 */ lui $a0, 0x0601 ## $a0 = 06010000 /* 00CC0 80B63680 260C0250 */ addiu $t4, $s0, 0x0250 ## $t4 = 00000250 -/* 00CC4 80B63684 AFAC0044 */ sw $t4, 0x0044($sp) +/* 00CC4 80B63684 AFAC0044 */ sw $t4, 0x0044($sp) /* 00CC8 80B63688 0C028800 */ jal SkelAnime_GetFrameCount - + /* 00CCC 80B6368C 2484E8A0 */ addiu $a0, $a0, 0xE8A0 ## $a0 = 0600E8A0 /* 00CD0 80B63690 44825000 */ mtc1 $v0, $f10 ## $f10 = 0.00 /* 00CD4 80B63694 3C01C040 */ lui $at, 0xC040 ## $at = C0400000 /* 00CD8 80B63698 44819000 */ mtc1 $at, $f18 ## $f18 = -3.00 -/* 00CDC 80B6369C 46805120 */ cvt.s.w $f4, $f10 +/* 00CDC 80B6369C 46805120 */ cvt.s.w $f4, $f10 /* 00CE0 80B636A0 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 /* 00CE4 80B636A4 240D0001 */ addiu $t5, $zero, 0x0001 ## $t5 = 00000001 -/* 00CE8 80B636A8 AFAD0014 */ sw $t5, 0x0014($sp) +/* 00CE8 80B636A8 AFAD0014 */ sw $t5, 0x0014($sp) /* 00CEC 80B636AC 24A5E8A0 */ addiu $a1, $a1, 0xE8A0 ## $a1 = 0600E8A0 -/* 00CF0 80B636B0 8FA40044 */ lw $a0, 0x0044($sp) -/* 00CF4 80B636B4 E7A40010 */ swc1 $f4, 0x0010($sp) +/* 00CF0 80B636B0 8FA40044 */ lw $a0, 0x0044($sp) +/* 00CF4 80B636B4 E7A40010 */ swc1 $f4, 0x0010($sp) /* 00CF8 80B636B8 3C063F00 */ lui $a2, 0x3F00 ## $a2 = 3F000000 /* 00CFC 80B636BC 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 00D00 80B636C0 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 00D04 80B636C4 E7B20018 */ swc1 $f18, 0x0018($sp) +/* 00D00 80B636C0 0C029468 */ jal SkelAnime_ChangeAnim + +/* 00D04 80B636C4 E7B20018 */ swc1 $f18, 0x0018($sp) .L80B636C8: /* 00D08 80B636C8 C60601A8 */ lwc1 $f6, 0x01A8($s0) ## 000001A8 /* 00D0C 80B636CC C6080168 */ lwc1 $f8, 0x0168($s0) ## 00000168 /* 00D10 80B636D0 3C063DCC */ lui $a2, 0x3DCC ## $a2 = 3DCC0000 /* 00D14 80B636D4 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3DCCCCCD -/* 00D18 80B636D8 46083282 */ mul.s $f10, $f6, $f8 +/* 00D18 80B636D8 46083282 */ mul.s $f10, $f6, $f8 /* 00D1C 80B636DC 26040150 */ addiu $a0, $s0, 0x0150 ## $a0 = 00000150 /* 00D20 80B636E0 3C054342 */ lui $a1, 0x4342 ## $a1 = 43420000 -/* 00D24 80B636E4 44075000 */ mfc1 $a3, $f10 +/* 00D24 80B636E4 44075000 */ mfc1 $a3, $f10 /* 00D28 80B636E8 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 00D2C 80B636EC 00000000 */ nop /* 00D30 80B636F0 C60401A8 */ lwc1 $f4, 0x01A8($s0) ## 000001A8 /* 00D34 80B636F4 C612016C */ lwc1 $f18, 0x016C($s0) ## 0000016C /* 00D38 80B636F8 3C063DCC */ lui $a2, 0x3DCC ## $a2 = 3DCC0000 /* 00D3C 80B636FC 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3DCCCCCD -/* 00D40 80B63700 46122182 */ mul.s $f6, $f4, $f18 +/* 00D40 80B63700 46122182 */ mul.s $f6, $f4, $f18 /* 00D44 80B63704 26040154 */ addiu $a0, $s0, 0x0154 ## $a0 = 00000154 /* 00D48 80B63708 3C05C1D0 */ lui $a1, 0xC1D0 ## $a1 = C1D00000 -/* 00D4C 80B6370C 44073000 */ mfc1 $a3, $f6 +/* 00D4C 80B6370C 44073000 */ mfc1 $a3, $f6 /* 00D50 80B63710 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 00D54 80B63714 00000000 */ nop /* 00D58 80B63718 3C0180B6 */ lui $at, %hi(D_80B65410) ## $at = 80B60000 -/* 00D5C 80B6371C C42A5410 */ lwc1 $f10, %lo(D_80B65410)($at) +/* 00D5C 80B6371C C42A5410 */ lwc1 $f10, %lo(D_80B65410)($at) /* 00D60 80B63720 C60801AC */ lwc1 $f8, 0x01AC($s0) ## 000001AC /* 00D64 80B63724 C61201A8 */ lwc1 $f18, 0x01A8($s0) ## 000001A8 /* 00D68 80B63728 C6060170 */ lwc1 $f6, 0x0170($s0) ## 00000170 -/* 00D6C 80B6372C 460A4100 */ add.s $f4, $f8, $f10 +/* 00D6C 80B6372C 460A4100 */ add.s $f4, $f8, $f10 /* 00D70 80B63730 3C063DCC */ lui $a2, 0x3DCC ## $a2 = 3DCC0000 -/* 00D74 80B63734 46069202 */ mul.s $f8, $f18, $f6 +/* 00D74 80B63734 46069202 */ mul.s $f8, $f18, $f6 /* 00D78 80B63738 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3DCCCCCD -/* 00D7C 80B6373C 44052000 */ mfc1 $a1, $f4 +/* 00D7C 80B6373C 44052000 */ mfc1 $a1, $f4 /* 00D80 80B63740 26040158 */ addiu $a0, $s0, 0x0158 ## $a0 = 00000158 -/* 00D84 80B63744 44074000 */ mfc1 $a3, $f8 +/* 00D84 80B63744 44074000 */ mfc1 $a3, $f8 /* 00D88 80B63748 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 00D8C 80B6374C 00000000 */ nop /* 00D90 80B63750 3C063DCC */ lui $a2, 0x3DCC ## $a2 = 3DCC0000 /* 00D94 80B63754 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3DCCCCCD /* 00D98 80B63758 260401AC */ addiu $a0, $s0, 0x01AC ## $a0 = 000001AC /* 00D9C 80B6375C 3C05C2C8 */ lui $a1, 0xC2C8 ## $a1 = C2C80000 /* 00DA0 80B63760 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 00DA4 80B63764 3C073F80 */ lui $a3, 0x3F80 ## $a3 = 3F800000 /* 00DA8 80B63768 3C014120 */ lui $at, 0x4120 ## $at = 41200000 /* 00DAC 80B6376C 44812000 */ mtc1 $at, $f4 ## $f4 = 10.00 /* 00DB0 80B63770 C60A01A8 */ lwc1 $f10, 0x01A8($s0) ## 000001A8 /* 00DB4 80B63774 3C063DCC */ lui $a2, 0x3DCC ## $a2 = 3DCC0000 /* 00DB8 80B63778 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3DCCCCCD -/* 00DBC 80B6377C 46045482 */ mul.s $f18, $f10, $f4 +/* 00DBC 80B6377C 46045482 */ mul.s $f18, $f10, $f4 /* 00DC0 80B63780 2604015C */ addiu $a0, $s0, 0x015C ## $a0 = 0000015C /* 00DC4 80B63784 8E050024 */ lw $a1, 0x0024($s0) ## 00000024 -/* 00DC8 80B63788 44079000 */ mfc1 $a3, $f18 +/* 00DC8 80B63788 44079000 */ mfc1 $a3, $f18 /* 00DCC 80B6378C 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 00DD0 80B63790 00000000 */ nop /* 00DD4 80B63794 3C01428C */ lui $at, 0x428C ## $at = 428C0000 /* 00DD8 80B63798 44814000 */ mtc1 $at, $f8 ## $f8 = 70.00 /* 00DDC 80B6379C C6060028 */ lwc1 $f6, 0x0028($s0) ## 00000028 /* 00DE0 80B637A0 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 /* 00DE4 80B637A4 44812000 */ mtc1 $at, $f4 ## $f4 = 20.00 -/* 00DE8 80B637A8 46083280 */ add.s $f10, $f6, $f8 +/* 00DE8 80B637A8 46083280 */ add.s $f10, $f6, $f8 /* 00DEC 80B637AC 3C014120 */ lui $at, 0x4120 ## $at = 41200000 /* 00DF0 80B637B0 44814000 */ mtc1 $at, $f8 ## $f8 = 10.00 /* 00DF4 80B637B4 C60601A8 */ lwc1 $f6, 0x01A8($s0) ## 000001A8 -/* 00DF8 80B637B8 46045481 */ sub.s $f18, $f10, $f4 +/* 00DF8 80B637B8 46045481 */ sub.s $f18, $f10, $f4 /* 00DFC 80B637BC 3C063DCC */ lui $a2, 0x3DCC ## $a2 = 3DCC0000 -/* 00E00 80B637C0 46083282 */ mul.s $f10, $f6, $f8 +/* 00E00 80B637C0 46083282 */ mul.s $f10, $f6, $f8 /* 00E04 80B637C4 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3DCCCCCD -/* 00E08 80B637C8 44059000 */ mfc1 $a1, $f18 +/* 00E08 80B637C8 44059000 */ mfc1 $a1, $f18 /* 00E0C 80B637CC 26040160 */ addiu $a0, $s0, 0x0160 ## $a0 = 00000160 -/* 00E10 80B637D0 44075000 */ mfc1 $a3, $f10 +/* 00E10 80B637D0 44075000 */ mfc1 $a3, $f10 /* 00E14 80B637D4 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 00E18 80B637D8 00000000 */ nop /* 00E1C 80B637DC 3C014120 */ lui $at, 0x4120 ## $at = 41200000 /* 00E20 80B637E0 44819000 */ mtc1 $at, $f18 ## $f18 = 10.00 /* 00E24 80B637E4 C60401A8 */ lwc1 $f4, 0x01A8($s0) ## 000001A8 /* 00E28 80B637E8 3C063DCC */ lui $a2, 0x3DCC ## $a2 = 3DCC0000 /* 00E2C 80B637EC 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3DCCCCCD -/* 00E30 80B637F0 46122182 */ mul.s $f6, $f4, $f18 +/* 00E30 80B637F0 46122182 */ mul.s $f6, $f4, $f18 /* 00E34 80B637F4 26040164 */ addiu $a0, $s0, 0x0164 ## $a0 = 00000164 /* 00E38 80B637F8 8E05002C */ lw $a1, 0x002C($s0) ## 0000002C -/* 00E3C 80B637FC 44073000 */ mfc1 $a3, $f6 +/* 00E3C 80B637FC 44073000 */ mfc1 $a3, $f6 /* 00E40 80B63800 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 00E44 80B63804 00000000 */ nop /* 00E48 80B63808 3C063DCC */ lui $a2, 0x3DCC ## $a2 = 3DCC0000 /* 00E4C 80B6380C 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3DCCCCCD /* 00E50 80B63810 26040028 */ addiu $a0, $s0, 0x0028 ## $a0 = 00000028 /* 00E54 80B63814 3C054270 */ lui $a1, 0x4270 ## $a1 = 42700000 /* 00E58 80B63818 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 00E5C 80B6381C 3C074000 */ lui $a3, 0x4000 ## $a3 = 40000000 /* 00E60 80B63820 860401C0 */ lh $a0, 0x01C0($s0) ## 000001C0 -/* 00E64 80B63824 00800821 */ addu $at, $a0, $zero -/* 00E68 80B63828 00042080 */ sll $a0, $a0, 2 -/* 00E6C 80B6382C 00812023 */ subu $a0, $a0, $at -/* 00E70 80B63830 00042100 */ sll $a0, $a0, 4 -/* 00E74 80B63834 00812023 */ subu $a0, $a0, $at -/* 00E78 80B63838 000420C0 */ sll $a0, $a0, 3 -/* 00E7C 80B6383C 00812023 */ subu $a0, $a0, $at -/* 00E80 80B63840 00042080 */ sll $a0, $a0, 2 -/* 00E84 80B63844 00042400 */ sll $a0, $a0, 16 +/* 00E64 80B63824 00800821 */ addu $at, $a0, $zero +/* 00E68 80B63828 00042080 */ sll $a0, $a0, 2 +/* 00E6C 80B6382C 00812023 */ subu $a0, $a0, $at +/* 00E70 80B63830 00042100 */ sll $a0, $a0, 4 +/* 00E74 80B63834 00812023 */ subu $a0, $a0, $at +/* 00E78 80B63838 000420C0 */ sll $a0, $a0, 3 +/* 00E7C 80B6383C 00812023 */ subu $a0, $a0, $at +/* 00E80 80B63840 00042080 */ sll $a0, $a0, 2 +/* 00E84 80B63844 00042400 */ sll $a0, $a0, 16 /* 00E88 80B63848 0C01DE1C */ jal Math_Sins ## sins? -/* 00E8C 80B6384C 00042403 */ sra $a0, $a0, 16 -/* 00E90 80B63850 46000280 */ add.s $f10, $f0, $f0 +/* 00E8C 80B6384C 00042403 */ sra $a0, $a0, 16 +/* 00E90 80B63850 46000280 */ add.s $f10, $f0, $f0 /* 00E94 80B63854 C6080028 */ lwc1 $f8, 0x0028($s0) ## 00000028 /* 00E98 80B63858 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 /* 00E9C 80B6385C 44811000 */ mtc1 $at, $f2 ## $f2 = 1.00 -/* 00EA0 80B63860 460A4100 */ add.s $f4, $f8, $f10 +/* 00EA0 80B63860 460A4100 */ add.s $f4, $f8, $f10 /* 00EA4 80B63864 3C073D4C */ lui $a3, 0x3D4C ## $a3 = 3D4C0000 -/* 00EA8 80B63868 44051000 */ mfc1 $a1, $f2 -/* 00EAC 80B6386C 44061000 */ mfc1 $a2, $f2 +/* 00EA8 80B63868 44051000 */ mfc1 $a1, $f2 +/* 00EAC 80B6386C 44061000 */ mfc1 $a2, $f2 /* 00EB0 80B63870 E6040028 */ swc1 $f4, 0x0028($s0) ## 00000028 /* 00EB4 80B63874 34E7CCCD */ ori $a3, $a3, 0xCCCD ## $a3 = 3D4CCCCD /* 00EB8 80B63878 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 00EBC 80B6387C 260401A8 */ addiu $a0, $s0, 0x01A8 ## $a0 = 000001A8 /* 00EC0 80B63880 860301D4 */ lh $v1, 0x01D4($s0) ## 000001D4 -/* 00EC4 80B63884 8FA4006C */ lw $a0, 0x006C($sp) +/* 00EC4 80B63884 8FA4006C */ lw $a0, 0x006C($sp) /* 00EC8 80B63888 2401004B */ addiu $at, $zero, 0x004B ## $at = 0000004B -/* 00ECC 80B6388C 14610018 */ bne $v1, $at, .L80B638F0 +/* 00ECC 80B6388C 14610018 */ bne $v1, $at, .L80B638F0 /* 00ED0 80B63890 24851D4C */ addiu $a1, $a0, 0x1D4C ## $a1 = 00001D4C /* 00ED4 80B63894 3C020600 */ lui $v0, 0x0600 ## $v0 = 06000000 /* 00ED8 80B63898 244259A0 */ addiu $v0, $v0, 0x59A0 ## $v0 = 060059A0 -/* 00EDC 80B6389C 00027900 */ sll $t7, $v0, 4 -/* 00EE0 80B638A0 000FC702 */ srl $t8, $t7, 28 -/* 00EE4 80B638A4 0018C880 */ sll $t9, $t8, 2 +/* 00EDC 80B6389C 00027900 */ sll $t7, $v0, 4 +/* 00EE0 80B638A0 000FC702 */ srl $t8, $t7, 28 +/* 00EE4 80B638A4 0018C880 */ sll $t9, $t8, 2 /* 00EE8 80B638A8 3C088016 */ lui $t0, 0x8016 ## $t0 = 80160000 -/* 00EEC 80B638AC 01194021 */ addu $t0, $t0, $t9 +/* 00EEC 80B638AC 01194021 */ addu $t0, $t0, $t9 /* 00EF0 80B638B0 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 /* 00EF4 80B638B4 8D086FA8 */ lw $t0, 0x6FA8($t0) ## 80166FA8 /* 00EF8 80B638B8 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF -/* 00EFC 80B638BC 00414824 */ and $t1, $v0, $at +/* 00EFC 80B638BC 00414824 */ and $t1, $v0, $at /* 00F00 80B638C0 3C018000 */ lui $at, 0x8000 ## $at = 80000000 /* 00F04 80B638C4 240A00B4 */ addiu $t2, $zero, 0x00B4 ## $t2 = 000000B4 /* 00F08 80B638C8 240B0080 */ addiu $t3, $zero, 0x0080 ## $t3 = 00000080 /* 00F0C 80B638CC 240C0028 */ addiu $t4, $zero, 0x0028 ## $t4 = 00000028 -/* 00F10 80B638D0 01093021 */ addu $a2, $t0, $t1 -/* 00F14 80B638D4 00C13021 */ addu $a2, $a2, $at -/* 00F18 80B638D8 AFAC0018 */ sw $t4, 0x0018($sp) -/* 00F1C 80B638DC AFAB0014 */ sw $t3, 0x0014($sp) -/* 00F20 80B638E0 AFAA0010 */ sw $t2, 0x0010($sp) +/* 00F10 80B638D0 01093021 */ addu $a2, $t0, $t1 +/* 00F14 80B638D4 00C13021 */ addu $a2, $a2, $at +/* 00F18 80B638D8 AFAC0018 */ sw $t4, 0x0018($sp) +/* 00F1C 80B638DC AFAB0014 */ sw $t3, 0x0014($sp) +/* 00F20 80B638E0 AFAA0010 */ sw $t2, 0x0010($sp) /* 00F24 80B638E4 0C00B380 */ jal TitleCard_InitBossName - + /* 00F28 80B638E8 240700A0 */ addiu $a3, $zero, 0x00A0 ## $a3 = 000000A0 /* 00F2C 80B638EC 860301D4 */ lh $v1, 0x01D4($s0) ## 000001D4 .L80B638F0: -/* 00F30 80B638F0 14600118 */ bne $v1, $zero, .L80B63D54 +/* 00F30 80B638F0 14600118 */ bne $v1, $zero, .L80B63D54 /* 00F34 80B638F4 240D0008 */ addiu $t5, $zero, 0x0008 ## $t5 = 00000008 /* 00F38 80B638F8 44809000 */ mtc1 $zero, $f18 ## $f18 = 0.00 /* 00F3C 80B638FC 240E00C8 */ addiu $t6, $zero, 0x00C8 ## $t6 = 000000C8 @@ -962,159 +962,159 @@ glabel L80B63670 /* 00F50 80B63910 3C040601 */ lui $a0, 0x0601 ## $a0 = 06010000 /* 00F54 80B63914 26180250 */ addiu $t8, $s0, 0x0250 ## $t8 = 00000250 /* 00F58 80B63918 E61201A8 */ swc1 $f18, 0x01A8($s0) ## 000001A8 -/* 00F5C 80B6391C AFB80044 */ sw $t8, 0x0044($sp) +/* 00F5C 80B6391C AFB80044 */ sw $t8, 0x0044($sp) /* 00F60 80B63920 0C028800 */ jal SkelAnime_GetFrameCount - + /* 00F64 80B63924 2484C65C */ addiu $a0, $a0, 0xC65C ## $a0 = 0600C65C /* 00F68 80B63928 44823000 */ mtc1 $v0, $f6 ## $f6 = 0.00 /* 00F6C 80B6392C 3C01C080 */ lui $at, 0xC080 ## $at = C0800000 /* 00F70 80B63930 44815000 */ mtc1 $at, $f10 ## $f10 = -4.00 -/* 00F74 80B63934 46803220 */ cvt.s.w $f8, $f6 +/* 00F74 80B63934 46803220 */ cvt.s.w $f8, $f6 /* 00F78 80B63938 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 /* 00F7C 80B6393C 24190003 */ addiu $t9, $zero, 0x0003 ## $t9 = 00000003 -/* 00F80 80B63940 AFB90014 */ sw $t9, 0x0014($sp) +/* 00F80 80B63940 AFB90014 */ sw $t9, 0x0014($sp) /* 00F84 80B63944 24A5C65C */ addiu $a1, $a1, 0xC65C ## $a1 = 0600C65C -/* 00F88 80B63948 8FA40044 */ lw $a0, 0x0044($sp) -/* 00F8C 80B6394C E7A80010 */ swc1 $f8, 0x0010($sp) +/* 00F88 80B63948 8FA40044 */ lw $a0, 0x0044($sp) +/* 00F8C 80B6394C E7A80010 */ swc1 $f8, 0x0010($sp) /* 00F90 80B63950 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 00F94 80B63954 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 00F98 80B63958 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 00F9C 80B6395C E7AA0018 */ swc1 $f10, 0x0018($sp) +/* 00F98 80B63958 0C029468 */ jal SkelAnime_ChangeAnim + +/* 00F9C 80B6395C E7AA0018 */ swc1 $f10, 0x0018($sp) /* 00FA0 80B63960 2408000A */ addiu $t0, $zero, 0x000A ## $t0 = 0000000A /* 00FA4 80B63964 A208014C */ sb $t0, 0x014C($s0) ## 0000014C /* 00FA8 80B63968 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 00FAC 80B6396C 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 00FB0 80B63970 240538B2 */ addiu $a1, $zero, 0x38B2 ## $a1 = 000038B2 /* 00FB4 80B63974 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 00FB8 80B63978 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 00FBC 80B6397C 2405283D */ addiu $a1, $zero, 0x283D ## $a1 = 0000283D -/* 00FC0 80B63980 100000F5 */ beq $zero, $zero, .L80B63D58 +/* 00FC0 80B63980 100000F5 */ beq $zero, $zero, .L80B63D58 /* 00FC4 80B63984 860501CC */ lh $a1, 0x01CC($s0) ## 000001CC glabel L80B63988 /* 00FC8 80B63988 860901D6 */ lh $t1, 0x01D6($s0) ## 000001D6 /* 00FCC 80B6398C 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 /* 00FD0 80B63990 3C040601 */ lui $a0, 0x0601 ## $a0 = 06010000 -/* 00FD4 80B63994 15210014 */ bne $t1, $at, .L80B639E8 +/* 00FD4 80B63994 15210014 */ bne $t1, $at, .L80B639E8 /* 00FD8 80B63998 2484CB1C */ addiu $a0, $a0, 0xCB1C ## $a0 = 0600CB1C /* 00FDC 80B6399C 260A0250 */ addiu $t2, $s0, 0x0250 ## $t2 = 00000250 /* 00FE0 80B639A0 0C028800 */ jal SkelAnime_GetFrameCount - -/* 00FE4 80B639A4 AFAA0044 */ sw $t2, 0x0044($sp) + +/* 00FE4 80B639A4 AFAA0044 */ sw $t2, 0x0044($sp) /* 00FE8 80B639A8 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 00FEC 80B639AC 3C01C040 */ lui $at, 0xC040 ## $at = C0400000 /* 00FF0 80B639B0 44813000 */ mtc1 $at, $f6 ## $f6 = -3.00 -/* 00FF4 80B639B4 468024A0 */ cvt.s.w $f18, $f4 +/* 00FF4 80B639B4 468024A0 */ cvt.s.w $f18, $f4 /* 00FF8 80B639B8 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 /* 00FFC 80B639BC 240B0003 */ addiu $t3, $zero, 0x0003 ## $t3 = 00000003 -/* 01000 80B639C0 AFAB0014 */ sw $t3, 0x0014($sp) +/* 01000 80B639C0 AFAB0014 */ sw $t3, 0x0014($sp) /* 01004 80B639C4 24A5CB1C */ addiu $a1, $a1, 0xCB1C ## $a1 = 0600CB1C -/* 01008 80B639C8 8FA40044 */ lw $a0, 0x0044($sp) -/* 0100C 80B639CC E7B20010 */ swc1 $f18, 0x0010($sp) +/* 01008 80B639C8 8FA40044 */ lw $a0, 0x0044($sp) +/* 0100C 80B639CC E7B20010 */ swc1 $f18, 0x0010($sp) /* 01010 80B639D0 3C063F00 */ lui $a2, 0x3F00 ## $a2 = 3F000000 /* 01014 80B639D4 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 01018 80B639D8 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 0101C 80B639DC E7A60018 */ swc1 $f6, 0x0018($sp) +/* 01018 80B639D8 0C029468 */ jal SkelAnime_ChangeAnim + +/* 0101C 80B639DC E7A60018 */ swc1 $f6, 0x0018($sp) /* 01020 80B639E0 240C000B */ addiu $t4, $zero, 0x000B ## $t4 = 0000000B /* 01024 80B639E4 A20C014C */ sb $t4, 0x014C($s0) ## 0000014C .L80B639E8: /* 01028 80B639E8 860D01D4 */ lh $t5, 0x01D4($s0) ## 000001D4 /* 0102C 80B639EC 240100AA */ addiu $at, $zero, 0x00AA ## $at = 000000AA -/* 01030 80B639F0 8FA4006C */ lw $a0, 0x006C($sp) -/* 01034 80B639F4 15A10006 */ bne $t5, $at, .L80B63A10 +/* 01030 80B639F0 8FA4006C */ lw $a0, 0x006C($sp) +/* 01034 80B639F4 15A10006 */ bne $t5, $at, .L80B63A10 /* 01038 80B639F8 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 0103C 80B639FC 0C00B7D5 */ jal func_8002DF54 +/* 0103C 80B639FC 0C00B7D5 */ jal func_8002DF54 /* 01040 80B63A00 24060008 */ addiu $a2, $zero, 0x0008 ## $a2 = 00000008 /* 01044 80B63A04 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 01048 80B63A08 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 0104C 80B63A0C 240538A6 */ addiu $a1, $zero, 0x38A6 ## $a1 = 000038A6 .L80B63A10: /* 01050 80B63A10 3C0180B6 */ lui $at, %hi(D_80B65414) ## $at = 80B60000 -/* 01054 80B63A14 C42A5414 */ lwc1 $f10, %lo(D_80B65414)($at) +/* 01054 80B63A14 C42A5414 */ lwc1 $f10, %lo(D_80B65414)($at) /* 01058 80B63A18 C60801AC */ lwc1 $f8, 0x01AC($s0) ## 000001AC /* 0105C 80B63A1C 3C013FC0 */ lui $at, 0x3FC0 ## $at = 3FC00000 /* 01060 80B63A20 44813000 */ mtc1 $at, $f6 ## $f6 = 1.50 /* 01064 80B63A24 C61201A8 */ lwc1 $f18, 0x01A8($s0) ## 000001A8 -/* 01068 80B63A28 460A4100 */ add.s $f4, $f8, $f10 +/* 01068 80B63A28 460A4100 */ add.s $f4, $f8, $f10 /* 0106C 80B63A2C 3C063DCC */ lui $a2, 0x3DCC ## $a2 = 3DCC0000 -/* 01070 80B63A30 46069202 */ mul.s $f8, $f18, $f6 +/* 01070 80B63A30 46069202 */ mul.s $f8, $f18, $f6 /* 01074 80B63A34 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3DCCCCCD -/* 01078 80B63A38 44052000 */ mfc1 $a1, $f4 +/* 01078 80B63A38 44052000 */ mfc1 $a1, $f4 /* 0107C 80B63A3C 26040158 */ addiu $a0, $s0, 0x0158 ## $a0 = 00000158 -/* 01080 80B63A40 44074000 */ mfc1 $a3, $f8 +/* 01080 80B63A40 44074000 */ mfc1 $a3, $f8 /* 01084 80B63A44 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 01088 80B63A48 00000000 */ nop /* 0108C 80B63A4C 3C063DCC */ lui $a2, 0x3DCC ## $a2 = 3DCC0000 /* 01090 80B63A50 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3DCCCCCD /* 01094 80B63A54 260401AC */ addiu $a0, $s0, 0x01AC ## $a0 = 000001AC /* 01098 80B63A58 3C05C2C8 */ lui $a1, 0xC2C8 ## $a1 = C2C80000 /* 0109C 80B63A5C 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 010A0 80B63A60 3C073F80 */ lui $a3, 0x3F80 ## $a3 = 3F800000 /* 010A4 80B63A64 3C014120 */ lui $at, 0x4120 ## $at = 41200000 /* 010A8 80B63A68 44812000 */ mtc1 $at, $f4 ## $f4 = 10.00 /* 010AC 80B63A6C C60A01A8 */ lwc1 $f10, 0x01A8($s0) ## 000001A8 /* 010B0 80B63A70 3C05C536 */ lui $a1, 0xC536 ## $a1 = C5360000 /* 010B4 80B63A74 34A53800 */ ori $a1, $a1, 0x3800 ## $a1 = C5363800 -/* 010B8 80B63A78 46045482 */ mul.s $f18, $f10, $f4 +/* 010B8 80B63A78 46045482 */ mul.s $f18, $f10, $f4 /* 010BC 80B63A7C 2604002C */ addiu $a0, $s0, 0x002C ## $a0 = 0000002C /* 010C0 80B63A80 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 010C4 80B63A84 44079000 */ mfc1 $a3, $f18 +/* 010C4 80B63A84 44079000 */ mfc1 $a3, $f18 /* 010C8 80B63A88 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 010CC 80B63A8C 00000000 */ nop /* 010D0 80B63A90 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 /* 010D4 80B63A94 44810000 */ mtc1 $at, $f0 ## $f0 = 1.00 /* 010D8 80B63A98 3C073D4C */ lui $a3, 0x3D4C ## $a3 = 3D4C0000 /* 010DC 80B63A9C 34E7CCCD */ ori $a3, $a3, 0xCCCD ## $a3 = 3D4CCCCD -/* 010E0 80B63AA0 44050000 */ mfc1 $a1, $f0 -/* 010E4 80B63AA4 44060000 */ mfc1 $a2, $f0 +/* 010E0 80B63AA0 44050000 */ mfc1 $a1, $f0 +/* 010E4 80B63AA4 44060000 */ mfc1 $a2, $f0 /* 010E8 80B63AA8 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 010EC 80B63AAC 260401A8 */ addiu $a0, $s0, 0x01A8 ## $a0 = 000001A8 /* 010F0 80B63AB0 3C0180B6 */ lui $at, %hi(D_80B65418) ## $at = 80B60000 -/* 010F4 80B63AB4 C4285418 */ lwc1 $f8, %lo(D_80B65418)($at) +/* 010F4 80B63AB4 C4285418 */ lwc1 $f8, %lo(D_80B65418)($at) /* 010F8 80B63AB8 C606002C */ lwc1 $f6, 0x002C($s0) ## 0000002C /* 010FC 80B63ABC 3C014396 */ lui $at, 0x4396 ## $at = 43960000 /* 01100 80B63AC0 44815000 */ mtc1 $at, $f10 ## $f10 = 300.00 -/* 01104 80B63AC4 46083001 */ sub.s $f0, $f6, $f8 -/* 01108 80B63AC8 46000005 */ abs.s $f0, $f0 -/* 0110C 80B63ACC 460A003C */ c.lt.s $f0, $f10 +/* 01104 80B63AC4 46083001 */ sub.s $f0, $f6, $f8 +/* 01108 80B63AC8 46000005 */ abs.s $f0, $f0 +/* 0110C 80B63ACC 460A003C */ c.lt.s $f0, $f10 /* 01110 80B63AD0 00000000 */ nop -/* 01114 80B63AD4 4502001E */ bc1fl .L80B63B50 +/* 01114 80B63AD4 4502001E */ bc1fl .L80B63B50 /* 01118 80B63AD8 3C063E4C */ lui $a2, 0x3E4C ## $a2 = 3E4C0000 /* 0111C 80B63ADC 860E01C8 */ lh $t6, 0x01C8($s0) ## 000001C8 /* 01120 80B63AE0 3C014160 */ lui $at, 0x4160 ## $at = 41600000 /* 01124 80B63AE4 240F0001 */ addiu $t7, $zero, 0x0001 ## $t7 = 00000001 -/* 01128 80B63AE8 15C00018 */ bne $t6, $zero, .L80B63B4C +/* 01128 80B63AE8 15C00018 */ bne $t6, $zero, .L80B63B4C /* 0112C 80B63AEC 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 01130 80B63AF0 44811000 */ mtc1 $at, $f2 ## $f2 = 14.00 /* 01134 80B63AF4 A60F01C8 */ sh $t7, 0x01C8($s0) ## 000001C8 /* 01138 80B63AF8 3C014248 */ lui $at, 0x4248 ## $at = 42480000 -/* 0113C 80B63AFC E7A20010 */ swc1 $f2, 0x0010($sp) +/* 0113C 80B63AFC E7A20010 */ swc1 $f2, 0x0010($sp) /* 01140 80B63B00 C6040028 */ lwc1 $f4, 0x0028($s0) ## 00000028 /* 01144 80B63B04 44819000 */ mtc1 $at, $f18 ## $f18 = 50.00 /* 01148 80B63B08 3C0180B6 */ lui $at, %hi(D_80B6541C) ## $at = 80B60000 -/* 0114C 80B63B0C C428541C */ lwc1 $f8, %lo(D_80B6541C)($at) -/* 01150 80B63B10 46122180 */ add.s $f6, $f4, $f18 -/* 01154 80B63B14 AFA0001C */ sw $zero, 0x001C($sp) -/* 01158 80B63B18 E7A80018 */ swc1 $f8, 0x0018($sp) -/* 0115C 80B63B1C 8FA6006C */ lw $a2, 0x006C($sp) -/* 01160 80B63B20 E7A60014 */ swc1 $f6, 0x0014($sp) +/* 0114C 80B63B0C C428541C */ lwc1 $f8, %lo(D_80B6541C)($at) +/* 01150 80B63B10 46122180 */ add.s $f6, $f4, $f18 +/* 01154 80B63B14 AFA0001C */ sw $zero, 0x001C($sp) +/* 01158 80B63B18 E7A80018 */ swc1 $f8, 0x0018($sp) +/* 0115C 80B63B1C 8FA6006C */ lw $a2, 0x006C($sp) +/* 01160 80B63B20 E7A60014 */ swc1 $f6, 0x0014($sp) /* 01164 80B63B24 861900B6 */ lh $t9, 0x00B6($s0) ## 000000B6 /* 01168 80B63B28 24080028 */ addiu $t0, $zero, 0x0028 ## $t0 = 00000028 -/* 0116C 80B63B2C AFA80028 */ sw $t0, 0x0028($sp) -/* 01170 80B63B30 AFA00024 */ sw $zero, 0x0024($sp) +/* 0116C 80B63B2C AFA80028 */ sw $t0, 0x0028($sp) +/* 01170 80B63B30 AFA00024 */ sw $zero, 0x0024($sp) /* 01174 80B63B34 2407006D */ addiu $a3, $zero, 0x006D ## $a3 = 0000006D /* 01178 80B63B38 24C41C24 */ addiu $a0, $a2, 0x1C24 ## $a0 = 3E4C1C24 /* 0117C 80B63B3C 0C00C916 */ jal Actor_SpawnAttached - -/* 01180 80B63B40 AFB90020 */ sw $t9, 0x0020($sp) + +/* 01180 80B63B40 AFB90020 */ sw $t9, 0x0020($sp) /* 01184 80B63B44 24090001 */ addiu $t1, $zero, 0x0001 ## $t1 = 00000001 /* 01188 80B63B48 A209014F */ sb $t1, 0x014F($s0) ## 0000014F .L80B63B4C: @@ -1124,103 +1124,103 @@ glabel L80B63988 /* 01194 80B63B54 2604015C */ addiu $a0, $s0, 0x015C ## $a0 = 0000015C /* 01198 80B63B58 8E050024 */ lw $a1, 0x0024($s0) ## 00000024 /* 0119C 80B63B5C 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 011A0 80B63B60 3C074248 */ lui $a3, 0x4248 ## $a3 = 42480000 /* 011A4 80B63B64 3C063E4C */ lui $a2, 0x3E4C ## $a2 = 3E4C0000 /* 011A8 80B63B68 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3E4CCCCD /* 011AC 80B63B6C 26040164 */ addiu $a0, $s0, 0x0164 ## $a0 = 00000164 /* 011B0 80B63B70 8E05002C */ lw $a1, 0x002C($s0) ## 0000002C /* 011B4 80B63B74 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 011B8 80B63B78 3C074248 */ lui $a3, 0x4248 ## $a3 = 42480000 /* 011BC 80B63B7C 3C0480B6 */ lui $a0, %hi(D_80B65220) ## $a0 = 80B60000 /* 011C0 80B63B80 24845220 */ addiu $a0, $a0, %lo(D_80B65220) ## $a0 = 80B65220 /* 011C4 80B63B84 0C00084C */ jal osSyncPrintf - + /* 011C8 80B63B88 860501D4 */ lh $a1, 0x01D4($s0) ## 000001D4 /* 011CC 80B63B8C 3C0180B6 */ lui $at, %hi(D_80B65420) ## $at = 80B60000 -/* 011D0 80B63B90 C4245420 */ lwc1 $f4, %lo(D_80B65420)($at) +/* 011D0 80B63B90 C4245420 */ lwc1 $f4, %lo(D_80B65420)($at) /* 011D4 80B63B94 C60A002C */ lwc1 $f10, 0x002C($s0) ## 0000002C /* 011D8 80B63B98 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 /* 011DC 80B63B9C 44819000 */ mtc1 $at, $f18 ## $f18 = 1.00 -/* 011E0 80B63BA0 46045001 */ sub.s $f0, $f10, $f4 -/* 011E4 80B63BA4 8FAA006C */ lw $t2, 0x006C($sp) +/* 011E0 80B63BA0 46045001 */ sub.s $f0, $f10, $f4 +/* 011E4 80B63BA4 8FAA006C */ lw $t2, 0x006C($sp) /* 011E8 80B63BA8 3C010001 */ lui $at, 0x0001 ## $at = 00010000 /* 011EC 80B63BAC 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 -/* 011F0 80B63BB0 46000005 */ abs.s $f0, $f0 +/* 011F0 80B63BB0 46000005 */ abs.s $f0, $f0 /* 011F4 80B63BB4 240B0014 */ addiu $t3, $zero, 0x0014 ## $t3 = 00000014 -/* 011F8 80B63BB8 4612003C */ c.lt.s $f0, $f18 +/* 011F8 80B63BB8 4612003C */ c.lt.s $f0, $f18 /* 011FC 80B63BBC 240D0009 */ addiu $t5, $zero, 0x0009 ## $t5 = 00000009 /* 01200 80B63BC0 24A5B4C8 */ addiu $a1, $a1, 0xB4C8 ## $a1 = 0600B4C8 /* 01204 80B63BC4 26040250 */ addiu $a0, $s0, 0x0250 ## $a0 = 00000250 -/* 01208 80B63BC8 45000062 */ bc1f .L80B63D54 -/* 0120C 80B63BCC 002A0821 */ addu $at, $at, $t2 +/* 01208 80B63BC8 45000062 */ bc1f .L80B63D54 +/* 0120C 80B63BCC 002A0821 */ addu $at, $at, $t2 /* 01210 80B63BD0 A0200AE3 */ sb $zero, 0x0AE3($at) ## 00010AE3 -/* 01214 80B63BD4 8FAC006C */ lw $t4, 0x006C($sp) +/* 01214 80B63BD4 8FAC006C */ lw $t4, 0x006C($sp) /* 01218 80B63BD8 3C010001 */ lui $at, 0x0001 ## $at = 00010000 /* 0121C 80B63BDC 3C06C040 */ lui $a2, 0xC040 ## $a2 = C0400000 -/* 01220 80B63BE0 002C0821 */ addu $at, $at, $t4 +/* 01220 80B63BE0 002C0821 */ addu $at, $at, $t4 /* 01224 80B63BE4 A42B0AFA */ sh $t3, 0x0AFA($at) ## 00010AFA -/* 01228 80B63BE8 0C0294D3 */ jal func_800A534C +/* 01228 80B63BE8 0C0294D3 */ jal SkelAnime_ChangeAnimTransitionRepeat /* 0122C 80B63BEC A60D01CA */ sh $t5, 0x01CA($s0) ## 000001CA /* 01230 80B63BF0 240E00FF */ addiu $t6, $zero, 0x00FF ## $t6 = 000000FF /* 01234 80B63BF4 240F004B */ addiu $t7, $zero, 0x004B ## $t7 = 0000004B /* 01238 80B63BF8 2418008C */ addiu $t8, $zero, 0x008C ## $t8 = 0000008C /* 0123C 80B63BFC A20E014C */ sb $t6, 0x014C($s0) ## 0000014C /* 01240 80B63C00 A60F01D6 */ sh $t7, 0x01D6($s0) ## 000001D6 -/* 01244 80B63C04 10000053 */ beq $zero, $zero, .L80B63D54 +/* 01244 80B63C04 10000053 */ beq $zero, $zero, .L80B63D54 /* 01248 80B63C08 A61801D4 */ sh $t8, 0x01D4($s0) ## 000001D4 glabel L80B63C0C /* 0124C 80B63C0C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01250 80B63C10 0C2D92AA */ jal func_80B64AA8 -/* 01254 80B63C14 8FA5006C */ lw $a1, 0x006C($sp) +/* 01250 80B63C10 0C2D92AA */ jal func_80B64AA8 +/* 01254 80B63C14 8FA5006C */ lw $a1, 0x006C($sp) /* 01258 80B63C18 3C0180B6 */ lui $at, %hi(D_80B65424) ## $at = 80B60000 -/* 0125C 80B63C1C C4285424 */ lwc1 $f8, %lo(D_80B65424)($at) +/* 0125C 80B63C1C C4285424 */ lwc1 $f8, %lo(D_80B65424)($at) /* 01260 80B63C20 C60601AC */ lwc1 $f6, 0x01AC($s0) ## 000001AC /* 01264 80B63C24 3C013FC0 */ lui $at, 0x3FC0 ## $at = 3FC00000 /* 01268 80B63C28 44819000 */ mtc1 $at, $f18 ## $f18 = 1.50 /* 0126C 80B63C2C C60401A8 */ lwc1 $f4, 0x01A8($s0) ## 000001A8 -/* 01270 80B63C30 46083280 */ add.s $f10, $f6, $f8 +/* 01270 80B63C30 46083280 */ add.s $f10, $f6, $f8 /* 01274 80B63C34 3C063DCC */ lui $a2, 0x3DCC ## $a2 = 3DCC0000 -/* 01278 80B63C38 46122182 */ mul.s $f6, $f4, $f18 +/* 01278 80B63C38 46122182 */ mul.s $f6, $f4, $f18 /* 0127C 80B63C3C 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3DCCCCCD -/* 01280 80B63C40 44055000 */ mfc1 $a1, $f10 +/* 01280 80B63C40 44055000 */ mfc1 $a1, $f10 /* 01284 80B63C44 26040158 */ addiu $a0, $s0, 0x0158 ## $a0 = 00000158 -/* 01288 80B63C48 44073000 */ mfc1 $a3, $f6 +/* 01288 80B63C48 44073000 */ mfc1 $a3, $f6 /* 0128C 80B63C4C 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 01290 80B63C50 00000000 */ nop /* 01294 80B63C54 3C063DCC */ lui $a2, 0x3DCC ## $a2 = 3DCC0000 /* 01298 80B63C58 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3DCCCCCD /* 0129C 80B63C5C 260401AC */ addiu $a0, $s0, 0x01AC ## $a0 = 000001AC /* 012A0 80B63C60 3C05C2C8 */ lui $a1, 0xC2C8 ## $a1 = C2C80000 /* 012A4 80B63C64 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 012A8 80B63C68 3C073F80 */ lui $a3, 0x3F80 ## $a3 = 3F800000 /* 012AC 80B63C6C 3C01428C */ lui $at, 0x428C ## $at = 428C0000 /* 012B0 80B63C70 44815000 */ mtc1 $at, $f10 ## $f10 = 70.00 /* 012B4 80B63C74 C6080028 */ lwc1 $f8, 0x0028($s0) ## 00000028 /* 012B8 80B63C78 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 /* 012BC 80B63C7C 44819000 */ mtc1 $at, $f18 ## $f18 = 20.00 -/* 012C0 80B63C80 460A4100 */ add.s $f4, $f8, $f10 +/* 012C0 80B63C80 460A4100 */ add.s $f4, $f8, $f10 /* 012C4 80B63C84 3C014120 */ lui $at, 0x4120 ## $at = 41200000 /* 012C8 80B63C88 44815000 */ mtc1 $at, $f10 ## $f10 = 10.00 /* 012CC 80B63C8C C60801A8 */ lwc1 $f8, 0x01A8($s0) ## 000001A8 -/* 012D0 80B63C90 46122181 */ sub.s $f6, $f4, $f18 +/* 012D0 80B63C90 46122181 */ sub.s $f6, $f4, $f18 /* 012D4 80B63C94 3C063DCC */ lui $a2, 0x3DCC ## $a2 = 3DCC0000 -/* 012D8 80B63C98 460A4102 */ mul.s $f4, $f8, $f10 +/* 012D8 80B63C98 460A4102 */ mul.s $f4, $f8, $f10 /* 012DC 80B63C9C 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3DCCCCCD -/* 012E0 80B63CA0 44053000 */ mfc1 $a1, $f6 +/* 012E0 80B63CA0 44053000 */ mfc1 $a1, $f6 /* 012E4 80B63CA4 26040160 */ addiu $a0, $s0, 0x0160 ## $a0 = 00000160 -/* 012E8 80B63CA8 44072000 */ mfc1 $a3, $f4 +/* 012E8 80B63CA8 44072000 */ mfc1 $a3, $f4 /* 012EC 80B63CAC 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 012F0 80B63CB0 00000000 */ nop /* 012F4 80B63CB4 861901D6 */ lh $t9, 0x01D6($s0) ## 000001D6 -/* 012F8 80B63CB8 8FA4006C */ lw $a0, 0x006C($sp) -/* 012FC 80B63CBC 57200026 */ bnel $t9, $zero, .L80B63D58 +/* 012F8 80B63CB8 8FA4006C */ lw $a0, 0x006C($sp) +/* 012FC 80B63CBC 57200026 */ bnel $t9, $zero, .L80B63D58 /* 01300 80B63CC0 860501CC */ lh $a1, 0x01CC($s0) ## 000001CC -/* 01304 80B63CC4 0C030129 */ jal func_800C04A4 +/* 01304 80B63CC4 0C030129 */ jal func_800C04A4 /* 01308 80B63CC8 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 0130C 80B63CCC 26030150 */ addiu $v1, $s0, 0x0150 ## $v1 = 00000150 /* 01310 80B63CD0 8C690000 */ lw $t1, 0x0000($v1) ## 00000150 @@ -1243,15 +1243,15 @@ glabel L80B63C0C /* 01354 80B63D14 8E0D0164 */ lw $t5, 0x0164($s0) ## 00000164 /* 01358 80B63D18 AC4D0058 */ sw $t5, 0x0058($v0) ## 00000058 /* 0135C 80B63D1C 860501CC */ lh $a1, 0x01CC($s0) ## 000001CC -/* 01360 80B63D20 0C03022B */ jal func_800C08AC -/* 01364 80B63D24 8FA4006C */ lw $a0, 0x006C($sp) +/* 01360 80B63D20 0C03022B */ jal func_800C08AC +/* 01364 80B63D24 8FA4006C */ lw $a0, 0x006C($sp) /* 01368 80B63D28 A60001CC */ sh $zero, 0x01CC($s0) ## 000001CC -/* 0136C 80B63D2C 8FA4006C */ lw $a0, 0x006C($sp) -/* 01370 80B63D30 0C01914D */ jal func_80064534 +/* 0136C 80B63D2C 8FA4006C */ lw $a0, 0x006C($sp) +/* 01370 80B63D30 0C01914D */ jal func_80064534 /* 01374 80B63D34 24851D64 */ addiu $a1, $a0, 0x1D64 ## $a1 = 00001D64 -/* 01378 80B63D38 8FA4006C */ lw $a0, 0x006C($sp) +/* 01378 80B63D38 8FA4006C */ lw $a0, 0x006C($sp) /* 0137C 80B63D3C 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 01380 80B63D40 0C00B7D5 */ jal func_8002DF54 +/* 01380 80B63D40 0C00B7D5 */ jal func_8002DF54 /* 01384 80B63D44 24060007 */ addiu $a2, $zero, 0x0007 ## $a2 = 00000007 /* 01388 80B63D48 3C0F80B6 */ lui $t7, %hi(func_80B64AA8) ## $t7 = 80B60000 /* 0138C 80B63D4C 25EF4AA8 */ addiu $t7, $t7, %lo(func_80B64AA8) ## $t7 = 80B64AA8 @@ -1260,17 +1260,17 @@ glabel L80B63D54 .L80B63D54: /* 01394 80B63D54 860501CC */ lh $a1, 0x01CC($s0) ## 000001CC .L80B63D58: -/* 01398 80B63D58 8FA4006C */ lw $a0, 0x006C($sp) +/* 01398 80B63D58 8FA4006C */ lw $a0, 0x006C($sp) /* 0139C 80B63D5C 2606015C */ addiu $a2, $s0, 0x015C ## $a2 = 0000015C -/* 013A0 80B63D60 50A00004 */ beql $a1, $zero, .L80B63D74 -/* 013A4 80B63D64 8FBF003C */ lw $ra, 0x003C($sp) -/* 013A8 80B63D68 0C030136 */ jal func_800C04D8 +/* 013A0 80B63D60 50A00004 */ beql $a1, $zero, .L80B63D74 +/* 013A4 80B63D64 8FBF003C */ lw $ra, 0x003C($sp) +/* 013A8 80B63D68 0C030136 */ jal func_800C04D8 /* 013AC 80B63D6C 26070150 */ addiu $a3, $s0, 0x0150 ## $a3 = 00000150 -/* 013B0 80B63D70 8FBF003C */ lw $ra, 0x003C($sp) +/* 013B0 80B63D70 8FBF003C */ lw $ra, 0x003C($sp) .L80B63D74: -/* 013B4 80B63D74 8FB00038 */ lw $s0, 0x0038($sp) +/* 013B4 80B63D74 8FB00038 */ lw $s0, 0x0038($sp) /* 013B8 80B63D78 27BD0068 */ addiu $sp, $sp, 0x0068 ## $sp = 00000000 -/* 013BC 80B63D7C 03E00008 */ jr $ra +/* 013BC 80B63D7C 03E00008 */ jr $ra /* 013C0 80B63D80 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_fHG/func_80B63D84.s b/asm/non_matchings/overlays/actors/ovl_En_fHG/func_80B63D84.s index 268f007e4e..f143d85cb4 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_fHG/func_80B63D84.s +++ b/asm/non_matchings/overlays/actors/ovl_En_fHG/func_80B63D84.s @@ -1,10 +1,10 @@ glabel func_80B63D84 /* 013C4 80B63D84 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 /* 013C8 80B63D88 3C0F80B6 */ lui $t7, %hi(D_80B65204) ## $t7 = 80B60000 -/* 013CC 80B63D8C AFBF001C */ sw $ra, 0x001C($sp) -/* 013D0 80B63D90 AFB00018 */ sw $s0, 0x0018($sp) -/* 013D4 80B63D94 AFA50034 */ sw $a1, 0x0034($sp) -/* 013D8 80B63D98 AFA60038 */ sw $a2, 0x0038($sp) +/* 013CC 80B63D8C AFBF001C */ sw $ra, 0x001C($sp) +/* 013D0 80B63D90 AFB00018 */ sw $s0, 0x0018($sp) +/* 013D4 80B63D94 AFA50034 */ sw $a1, 0x0034($sp) +/* 013D8 80B63D98 AFA60038 */ sw $a2, 0x0038($sp) /* 013DC 80B63D9C 25EF5204 */ addiu $t7, $t7, %lo(D_80B65204) ## $t7 = 80B65204 /* 013E0 80B63DA0 8DF90000 */ lw $t9, 0x0000($t7) ## 80B65204 /* 013E4 80B63DA4 27AE0024 */ addiu $t6, $sp, 0x0024 ## $t6 = FFFFFFF4 @@ -17,69 +17,69 @@ glabel func_80B63D84 /* 01400 80B63DC0 24840250 */ addiu $a0, $a0, 0x0250 ## $a0 = 00000250 /* 01404 80B63DC4 24060000 */ addiu $a2, $zero, 0x0000 ## $a2 = 00000000 /* 01408 80B63DC8 ADD80004 */ sw $t8, 0x0004($t6) ## FFFFFFF8 -/* 0140C 80B63DCC 0C0294D3 */ jal func_800A534C +/* 0140C 80B63DCC 0C0294D3 */ jal SkelAnime_ChangeAnimTransitionRepeat /* 01410 80B63DD0 ADD90008 */ sw $t9, 0x0008($t6) ## FFFFFFFC /* 01414 80B63DD4 3C0880B6 */ lui $t0, %hi(func_80B6404C) ## $t0 = 80B60000 /* 01418 80B63DD8 2508404C */ addiu $t0, $t0, %lo(func_80B6404C) ## $t0 = 80B6404C /* 0141C 80B63DDC AE0801FC */ sw $t0, 0x01FC($s0) ## 000001FC -/* 01420 80B63DE0 87A9003A */ lh $t1, 0x003A($sp) +/* 01420 80B63DE0 87A9003A */ lh $t1, 0x003A($sp) /* 01424 80B63DE4 3C0480B6 */ lui $a0, %hi(D_80B6525C) ## $a0 = 80B60000 /* 01428 80B63DE8 2484525C */ addiu $a0, $a0, %lo(D_80B6525C) ## $a0 = 80B6525C /* 0142C 80B63DEC A60901C2 */ sh $t1, 0x01C2($s0) ## 000001C2 /* 01430 80B63DF0 860501C2 */ lh $a1, 0x01C2($s0) ## 000001C2 -/* 01434 80B63DF4 00055040 */ sll $t2, $a1, 1 -/* 01438 80B63DF8 03AA5821 */ addu $t3, $sp, $t2 +/* 01434 80B63DF4 00055040 */ sll $t2, $a1, 1 +/* 01438 80B63DF8 03AA5821 */ addu $t3, $sp, $t2 /* 0143C 80B63DFC 856B0024 */ lh $t3, 0x0024($t3) ## 00000024 /* 01440 80B63E00 0C00084C */ jal osSyncPrintf - + /* 01444 80B63E04 A60B01C4 */ sh $t3, 0x01C4($s0) ## 000001C4 /* 01448 80B63E08 3C0480B6 */ lui $a0, %hi(D_80B6526C) ## $a0 = 80B60000 /* 0144C 80B63E0C 2484526C */ addiu $a0, $a0, %lo(D_80B6526C) ## $a0 = 80B6526C /* 01450 80B63E10 0C00084C */ jal osSyncPrintf - + /* 01454 80B63E14 860501C4 */ lh $a1, 0x01C4($s0) ## 000001C4 /* 01458 80B63E18 860C01C2 */ lh $t4, 0x01C2($s0) ## 000001C2 /* 0145C 80B63E1C 3C0E80B6 */ lui $t6, %hi(D_80B65190) ## $t6 = 80B60000 /* 01460 80B63E20 25CE5190 */ addiu $t6, $t6, %lo(D_80B65190) ## $t6 = 80B65190 -/* 01464 80B63E24 000C6900 */ sll $t5, $t4, 4 +/* 01464 80B63E24 000C6900 */ sll $t5, $t4, 4 /* 01468 80B63E28 3C0180B6 */ lui $at, %hi(D_80B65428) ## $at = 80B60000 -/* 0146C 80B63E2C 01AE1021 */ addu $v0, $t5, $t6 -/* 01470 80B63E30 C4205428 */ lwc1 $f0, %lo(D_80B65428)($at) +/* 0146C 80B63E2C 01AE1021 */ addu $v0, $t5, $t6 +/* 01470 80B63E30 C4205428 */ lwc1 $f0, %lo(D_80B65428)($at) /* 01474 80B63E34 C4440000 */ lwc1 $f4, 0x0000($v0) ## 00000000 /* 01478 80B63E38 3C014120 */ lui $at, 0x4120 ## $at = 41200000 /* 0147C 80B63E3C 44814000 */ mtc1 $at, $f8 ## $f8 = 10.00 -/* 01480 80B63E40 46002182 */ mul.s $f6, $f4, $f0 +/* 01480 80B63E40 46002182 */ mul.s $f6, $f4, $f0 /* 01484 80B63E44 3C0142F0 */ lui $at, 0x42F0 ## $at = 42F00000 /* 01488 80B63E48 3C0480B6 */ lui $a0, %hi(D_80B6527C) ## $a0 = 80B60000 /* 0148C 80B63E4C 2484527C */ addiu $a0, $a0, %lo(D_80B6527C) ## $a0 = 80B6527C -/* 01490 80B63E50 46083280 */ add.s $f10, $f6, $f8 +/* 01490 80B63E50 46083280 */ add.s $f10, $f6, $f8 /* 01494 80B63E54 44813000 */ mtc1 $at, $f6 ## $f6 = 120.00 /* 01498 80B63E58 3C0180B6 */ lui $at, %hi(D_80B6542C) ## $at = 80B60000 /* 0149C 80B63E5C E60A0024 */ swc1 $f10, 0x0024($s0) ## 00000024 /* 014A0 80B63E60 C4440004 */ lwc1 $f4, 0x0004($v0) ## 00000004 -/* 014A4 80B63E64 46062200 */ add.s $f8, $f4, $f6 +/* 014A4 80B63E64 46062200 */ add.s $f8, $f4, $f6 /* 014A8 80B63E68 E6080028 */ swc1 $f8, 0x0028($s0) ## 00000028 /* 014AC 80B63E6C C44A0008 */ lwc1 $f10, 0x0008($v0) ## 00000008 -/* 014B0 80B63E70 C426542C */ lwc1 $f6, %lo(D_80B6542C)($at) -/* 014B4 80B63E74 46005102 */ mul.s $f4, $f10, $f0 +/* 014B0 80B63E70 C426542C */ lwc1 $f6, %lo(D_80B6542C)($at) +/* 014B4 80B63E74 46005102 */ mul.s $f4, $f10, $f0 /* 014B8 80B63E78 C60A0024 */ lwc1 $f10, 0x0024($s0) ## 00000024 -/* 014BC 80B63E7C 46062201 */ sub.s $f8, $f4, $f6 -/* 014C0 80B63E80 46005121 */ cvt.d.s $f4, $f10 +/* 014BC 80B63E7C 46062201 */ sub.s $f8, $f4, $f6 +/* 014C0 80B63E80 46005121 */ cvt.d.s $f4, $f10 /* 014C4 80B63E84 E608002C */ swc1 $f8, 0x002C($s0) ## 0000002C /* 014C8 80B63E88 844F000C */ lh $t7, 0x000C($v0) ## 0000000C -/* 014CC 80B63E8C 44072000 */ mfc1 $a3, $f4 -/* 014D0 80B63E90 44062800 */ mfc1 $a2, $f5 +/* 014CC 80B63E8C 44072000 */ mfc1 $a3, $f4 +/* 014D0 80B63E90 44062800 */ mfc1 $a2, $f5 /* 014D4 80B63E94 0C00084C */ jal osSyncPrintf - + /* 014D8 80B63E98 A60F0032 */ sh $t7, 0x0032($s0) ## 00000032 /* 014DC 80B63E9C C606002C */ lwc1 $f6, 0x002C($s0) ## 0000002C /* 014E0 80B63EA0 3C0480B6 */ lui $a0, %hi(D_80B65288) ## $a0 = 80B60000 /* 014E4 80B63EA4 24845288 */ addiu $a0, $a0, %lo(D_80B65288) ## $a0 = 80B65288 -/* 014E8 80B63EA8 46003221 */ cvt.d.s $f8, $f6 -/* 014EC 80B63EAC 44074000 */ mfc1 $a3, $f8 -/* 014F0 80B63EB0 44064800 */ mfc1 $a2, $f9 +/* 014E8 80B63EA8 46003221 */ cvt.d.s $f8, $f6 +/* 014EC 80B63EAC 44074000 */ mfc1 $a3, $f8 +/* 014F0 80B63EB0 44064800 */ mfc1 $a2, $f9 /* 014F4 80B63EB4 0C00084C */ jal osSyncPrintf - + /* 014F8 80B63EB8 00000000 */ nop /* 014FC 80B63EBC 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 /* 01500 80B63EC0 44816000 */ mtc1 $at, $f12 ## $f12 = 1.00 @@ -88,92 +88,92 @@ glabel func_80B63D84 /* 0150C 80B63ECC 44817000 */ mtc1 $at, $f14 ## $f14 = 2.00 /* 01510 80B63ED0 3C0180B6 */ lui $at, %hi(D_80B65430) ## $at = 80B60000 /* 01514 80B63ED4 3C0880B6 */ lui $t0, %hi(D_80B65190) ## $t0 = 80B60000 -/* 01518 80B63ED8 C4305430 */ lwc1 $f16, %lo(D_80B65430)($at) +/* 01518 80B63ED8 C4305430 */ lwc1 $f16, %lo(D_80B65430)($at) /* 0151C 80B63EDC 25085190 */ addiu $t0, $t0, %lo(D_80B65190) ## $t0 = 80B65190 -/* 01520 80B63EE0 0018C900 */ sll $t9, $t8, 4 +/* 01520 80B63EE0 0018C900 */ sll $t9, $t8, 4 /* 01524 80B63EE4 3C0180B6 */ lui $at, %hi(D_80B65434) ## $at = 80B60000 -/* 01528 80B63EE8 03281021 */ addu $v0, $t9, $t0 -/* 0152C 80B63EEC C4325434 */ lwc1 $f18, %lo(D_80B65434)($at) +/* 01528 80B63EE8 03281021 */ addu $v0, $t9, $t0 +/* 0152C 80B63EEC C4325434 */ lwc1 $f18, %lo(D_80B65434)($at) /* 01530 80B63EF0 C44A0000 */ lwc1 $f10, 0x0000($v0) ## 00000000 /* 01534 80B63EF4 3C014120 */ lui $at, 0x4120 ## $at = 41200000 /* 01538 80B63EF8 44813000 */ mtc1 $at, $f6 ## $f6 = 10.00 -/* 0153C 80B63EFC 46125102 */ mul.s $f4, $f10, $f18 +/* 0153C 80B63EFC 46125102 */ mul.s $f4, $f10, $f18 /* 01540 80B63F00 3C0180B6 */ lui $at, %hi(D_80B65438) ## $at = 80B60000 /* 01544 80B63F04 24090064 */ addiu $t1, $zero, 0x0064 ## $t1 = 00000064 -/* 01548 80B63F08 46062200 */ add.s $f8, $f4, $f6 +/* 01548 80B63F08 46062200 */ add.s $f8, $f4, $f6 /* 0154C 80B63F0C E608018C */ swc1 $f8, 0x018C($s0) ## 0000018C /* 01550 80B63F10 C44A0004 */ lwc1 $f10, 0x0004($v0) ## 00000004 /* 01554 80B63F14 E60A0190 */ swc1 $f10, 0x0190($s0) ## 00000190 /* 01558 80B63F18 C4440008 */ lwc1 $f4, 0x0008($v0) ## 00000008 -/* 0155C 80B63F1C C4285438 */ lwc1 $f8, %lo(D_80B65438)($at) +/* 0155C 80B63F1C C4285438 */ lwc1 $f8, %lo(D_80B65438)($at) /* 01560 80B63F20 3C0180B6 */ lui $at, %hi(D_80B6543C) ## $at = 80B60000 -/* 01564 80B63F24 46122182 */ mul.s $f6, $f4, $f18 +/* 01564 80B63F24 46122182 */ mul.s $f6, $f4, $f18 /* 01568 80B63F28 C604018C */ lwc1 $f4, 0x018C($s0) ## 0000018C -/* 0156C 80B63F2C 46083281 */ sub.s $f10, $f6, $f8 +/* 0156C 80B63F2C 46083281 */ sub.s $f10, $f6, $f8 /* 01570 80B63F30 C6060024 */ lwc1 $f6, 0x0024($s0) ## 00000024 -/* 01574 80B63F34 46062001 */ sub.s $f0, $f4, $f6 +/* 01574 80B63F34 46062001 */ sub.s $f0, $f4, $f6 /* 01578 80B63F38 E60A0194 */ swc1 $f10, 0x0194($s0) ## 00000194 -/* 0157C 80B63F3C 46000005 */ abs.s $f0, $f0 -/* 01580 80B63F40 460E0202 */ mul.s $f8, $f0, $f14 +/* 0157C 80B63F3C 46000005 */ abs.s $f0, $f0 +/* 01580 80B63F40 460E0202 */ mul.s $f8, $f0, $f14 /* 01584 80B63F44 00000000 */ nop -/* 01588 80B63F48 46104082 */ mul.s $f2, $f8, $f16 -/* 0158C 80B63F4C 460C103C */ c.lt.s $f2, $f12 +/* 01588 80B63F48 46104082 */ mul.s $f2, $f8, $f16 +/* 0158C 80B63F4C 460C103C */ c.lt.s $f2, $f12 /* 01590 80B63F50 E6020198 */ swc1 $f2, 0x0198($s0) ## 00000198 -/* 01594 80B63F54 45000002 */ bc1f .L80B63F60 +/* 01594 80B63F54 45000002 */ bc1f .L80B63F60 /* 01598 80B63F58 00000000 */ nop /* 0159C 80B63F5C E60C0198 */ swc1 $f12, 0x0198($s0) ## 00000198 .L80B63F60: /* 015A0 80B63F60 C60A0194 */ lwc1 $f10, 0x0194($s0) ## 00000194 /* 015A4 80B63F64 C604002C */ lwc1 $f4, 0x002C($s0) ## 0000002C -/* 015A8 80B63F68 46045001 */ sub.s $f0, $f10, $f4 -/* 015AC 80B63F6C 46000005 */ abs.s $f0, $f0 -/* 015B0 80B63F70 460E0182 */ mul.s $f6, $f0, $f14 +/* 015A8 80B63F68 46045001 */ sub.s $f0, $f10, $f4 +/* 015AC 80B63F6C 46000005 */ abs.s $f0, $f0 +/* 015B0 80B63F70 460E0182 */ mul.s $f6, $f0, $f14 /* 015B4 80B63F74 00000000 */ nop -/* 015B8 80B63F78 46103082 */ mul.s $f2, $f6, $f16 -/* 015BC 80B63F7C 460C103C */ c.lt.s $f2, $f12 +/* 015B8 80B63F78 46103082 */ mul.s $f2, $f6, $f16 +/* 015BC 80B63F7C 460C103C */ c.lt.s $f2, $f12 /* 015C0 80B63F80 E602019C */ swc1 $f2, 0x019C($s0) ## 0000019C /* 015C4 80B63F84 44801000 */ mtc1 $zero, $f2 ## $f2 = 0.00 -/* 015C8 80B63F88 45000002 */ bc1f .L80B63F94 +/* 015C8 80B63F88 45000002 */ bc1f .L80B63F94 /* 015CC 80B63F8C 00000000 */ nop /* 015D0 80B63F90 E60C019C */ swc1 $f12, 0x019C($s0) ## 0000019C .L80B63F94: -/* 015D4 80B63F94 C420543C */ lwc1 $f0, %lo(D_80B6543C)($at) -/* 015D8 80B63F98 8FA20034 */ lw $v0, 0x0034($sp) +/* 015D4 80B63F94 C420543C */ lwc1 $f0, %lo(D_80B6543C)($at) +/* 015D8 80B63F98 8FA20034 */ lw $v0, 0x0034($sp) /* 015DC 80B63F9C A60901D4 */ sh $t1, 0x01D4($s0) ## 000001D4 /* 015E0 80B63FA0 3C0180B6 */ lui $at, %hi(D_80B65440) ## $at = 80B60000 /* 015E4 80B63FA4 E6000050 */ swc1 $f0, 0x0050($s0) ## 00000050 /* 015E8 80B63FA8 E6000054 */ swc1 $f0, 0x0054($s0) ## 00000054 -/* 015EC 80B63FAC C4285440 */ lwc1 $f8, %lo(D_80B65440)($at) +/* 015EC 80B63FAC C4285440 */ lwc1 $f8, %lo(D_80B65440)($at) /* 015F0 80B63FB0 E60201A4 */ swc1 $f2, 0x01A4($s0) ## 000001A4 /* 015F4 80B63FB4 3C014F80 */ lui $at, 0x4F80 ## $at = 4F800000 /* 015F8 80B63FB8 E6080058 */ swc1 $f8, 0x0058($s0) ## 00000058 /* 015FC 80B63FBC 904A07AF */ lbu $t2, 0x07AF($v0) ## 000007AF /* 01600 80B63FC0 448A5000 */ mtc1 $t2, $f10 ## $f10 = 0.00 -/* 01604 80B63FC4 05410004 */ bgez $t2, .L80B63FD8 -/* 01608 80B63FC8 46805120 */ cvt.s.w $f4, $f10 +/* 01604 80B63FC4 05410004 */ bgez $t2, .L80B63FD8 +/* 01608 80B63FC8 46805120 */ cvt.s.w $f4, $f10 /* 0160C 80B63FCC 44813000 */ mtc1 $at, $f6 ## $f6 = 4294967296.00 /* 01610 80B63FD0 00000000 */ nop -/* 01614 80B63FD4 46062100 */ add.s $f4, $f4, $f6 +/* 01614 80B63FD4 46062100 */ add.s $f4, $f4, $f6 .L80B63FD8: /* 01618 80B63FD8 E60401E8 */ swc1 $f4, 0x01E8($s0) ## 000001E8 /* 0161C 80B63FDC 904B07B0 */ lbu $t3, 0x07B0($v0) ## 000007B0 /* 01620 80B63FE0 3C014F80 */ lui $at, 0x4F80 ## $at = 4F800000 /* 01624 80B63FE4 448B4000 */ mtc1 $t3, $f8 ## $f8 = 0.00 -/* 01628 80B63FE8 05610004 */ bgez $t3, .L80B63FFC -/* 0162C 80B63FEC 468042A0 */ cvt.s.w $f10, $f8 +/* 01628 80B63FE8 05610004 */ bgez $t3, .L80B63FFC +/* 0162C 80B63FEC 468042A0 */ cvt.s.w $f10, $f8 /* 01630 80B63FF0 44813000 */ mtc1 $at, $f6 ## $f6 = 4294967296.00 /* 01634 80B63FF4 00000000 */ nop -/* 01638 80B63FF8 46065280 */ add.s $f10, $f10, $f6 +/* 01638 80B63FF8 46065280 */ add.s $f10, $f10, $f6 .L80B63FFC: /* 0163C 80B63FFC E60A01EC */ swc1 $f10, 0x01EC($s0) ## 000001EC /* 01640 80B64000 904C07B1 */ lbu $t4, 0x07B1($v0) ## 000007B1 /* 01644 80B64004 3C014F80 */ lui $at, 0x4F80 ## $at = 4F800000 /* 01648 80B64008 448C2000 */ mtc1 $t4, $f4 ## $f4 = 0.00 -/* 0164C 80B6400C 05810004 */ bgez $t4, .L80B64020 -/* 01650 80B64010 46802220 */ cvt.s.w $f8, $f4 +/* 0164C 80B6400C 05810004 */ bgez $t4, .L80B64020 +/* 01650 80B64010 46802220 */ cvt.s.w $f8, $f4 /* 01654 80B64014 44813000 */ mtc1 $at, $f6 ## $f6 = 4294967296.00 /* 01658 80B64018 00000000 */ nop -/* 0165C 80B6401C 46064200 */ add.s $f8, $f8, $f6 +/* 0165C 80B6401C 46064200 */ add.s $f8, $f8, $f6 .L80B64020: /* 01660 80B64020 E60801F0 */ swc1 $f8, 0x01F0($s0) ## 000001F0 /* 01664 80B64024 E60201F4 */ swc1 $f2, 0x01F4($s0) ## 000001F4 @@ -181,10 +181,10 @@ glabel func_80B63D84 /* 0166C 80B6402C A60001E0 */ sh $zero, 0x01E0($s0) ## 000001E0 /* 01670 80B64030 A60001C6 */ sh $zero, 0x01C6($s0) ## 000001C6 /* 01674 80B64034 A60001C8 */ sh $zero, 0x01C8($s0) ## 000001C8 -/* 01678 80B64038 8FBF001C */ lw $ra, 0x001C($sp) -/* 0167C 80B6403C 8FB00018 */ lw $s0, 0x0018($sp) +/* 01678 80B64038 8FBF001C */ lw $ra, 0x001C($sp) +/* 0167C 80B6403C 8FB00018 */ lw $s0, 0x0018($sp) /* 01680 80B64040 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 01684 80B64044 03E00008 */ jr $ra +/* 01684 80B64044 03E00008 */ jr $ra /* 01688 80B64048 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_fHG/func_80B6404C.s b/asm/non_matchings/overlays/actors/ovl_En_fHG/func_80B6404C.s index 0a56b7a03b..33d21ccd43 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_fHG/func_80B6404C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_fHG/func_80B6404C.s @@ -1,64 +1,64 @@ glabel func_80B6404C /* 0168C 80B6404C 27BDFFB8 */ addiu $sp, $sp, 0xFFB8 ## $sp = FFFFFFB8 -/* 01690 80B64050 AFB00038 */ sw $s0, 0x0038($sp) +/* 01690 80B64050 AFB00038 */ sw $s0, 0x0038($sp) /* 01694 80B64054 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 01698 80B64058 AFBF003C */ sw $ra, 0x003C($sp) +/* 01698 80B64058 AFBF003C */ sw $ra, 0x003C($sp) /* 0169C 80B6405C 3C0480B6 */ lui $a0, %hi(D_80B65294) ## $a0 = 80B60000 -/* 016A0 80B64060 AFA5004C */ sw $a1, 0x004C($sp) +/* 016A0 80B64060 AFA5004C */ sw $a1, 0x004C($sp) /* 016A4 80B64064 0C00084C */ jal osSyncPrintf - + /* 016A8 80B64068 24845294 */ addiu $a0, $a0, %lo(D_80B65294) ## $a0 = 80B65294 /* 016AC 80B6406C C6040024 */ lwc1 $f4, 0x0024($s0) ## 00000024 /* 016B0 80B64070 3C0480B6 */ lui $a0, %hi(D_80B652A0) ## $a0 = 80B60000 /* 016B4 80B64074 248452A0 */ addiu $a0, $a0, %lo(D_80B652A0) ## $a0 = 80B652A0 -/* 016B8 80B64078 460021A1 */ cvt.d.s $f6, $f4 -/* 016BC 80B6407C 44073000 */ mfc1 $a3, $f6 -/* 016C0 80B64080 44063800 */ mfc1 $a2, $f7 +/* 016B8 80B64078 460021A1 */ cvt.d.s $f6, $f4 +/* 016BC 80B6407C 44073000 */ mfc1 $a3, $f6 +/* 016C0 80B64080 44063800 */ mfc1 $a2, $f7 /* 016C4 80B64084 0C00084C */ jal osSyncPrintf - + /* 016C8 80B64088 00000000 */ nop /* 016CC 80B6408C C608002C */ lwc1 $f8, 0x002C($s0) ## 0000002C /* 016D0 80B64090 3C0480B6 */ lui $a0, %hi(D_80B652AC) ## $a0 = 80B60000 /* 016D4 80B64094 248452AC */ addiu $a0, $a0, %lo(D_80B652AC) ## $a0 = 80B652AC -/* 016D8 80B64098 460042A1 */ cvt.d.s $f10, $f8 -/* 016DC 80B6409C 44075000 */ mfc1 $a3, $f10 -/* 016E0 80B640A0 44065800 */ mfc1 $a2, $f11 +/* 016D8 80B64098 460042A1 */ cvt.d.s $f10, $f8 +/* 016DC 80B6409C 44075000 */ mfc1 $a3, $f10 +/* 016E0 80B640A0 44065800 */ mfc1 $a2, $f11 /* 016E4 80B640A4 0C00084C */ jal osSyncPrintf - + /* 016E8 80B640A8 00000000 */ nop /* 016EC 80B640AC 860E001C */ lh $t6, 0x001C($s0) ## 0000001C /* 016F0 80B640B0 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 016F4 80B640B4 15C10013 */ bne $t6, $at, .L80B64104 +/* 016F4 80B640B4 15C10013 */ bne $t6, $at, .L80B64104 /* 016F8 80B640B8 3C0142C8 */ lui $at, 0x42C8 ## $at = 42C80000 /* 016FC 80B640BC 44819000 */ mtc1 $at, $f18 ## $f18 = 100.00 /* 01700 80B640C0 C6100050 */ lwc1 $f16, 0x0050($s0) ## 00000050 /* 01704 80B640C4 C60400E4 */ lwc1 $f4, 0x00E4($s0) ## 000000E4 /* 01708 80B640C8 C60800E8 */ lwc1 $f8, 0x00E8($s0) ## 000000E8 -/* 0170C 80B640CC 46128002 */ mul.s $f0, $f16, $f18 +/* 0170C 80B640CC 46128002 */ mul.s $f0, $f16, $f18 /* 01710 80B640D0 C61000EC */ lwc1 $f16, 0x00EC($s0) ## 000000EC /* 01714 80B640D4 860F01C0 */ lh $t7, 0x01C0($s0) ## 000001C0 /* 01718 80B640D8 26040180 */ addiu $a0, $s0, 0x0180 ## $a0 = 00000180 /* 0171C 80B640DC 31F80007 */ andi $t8, $t7, 0x0007 ## $t8 = 00000000 -/* 01720 80B640E0 46002183 */ div.s $f6, $f4, $f0 -/* 01724 80B640E4 46004283 */ div.s $f10, $f8, $f0 +/* 01720 80B640E0 46002183 */ div.s $f6, $f4, $f0 +/* 01724 80B640E4 46004283 */ div.s $f10, $f8, $f0 /* 01728 80B640E8 E6060180 */ swc1 $f6, 0x0180($s0) ## 00000180 -/* 0172C 80B640EC 46008483 */ div.s $f18, $f16, $f0 +/* 0172C 80B640EC 46008483 */ div.s $f18, $f16, $f0 /* 01730 80B640F0 E60A0184 */ swc1 $f10, 0x0184($s0) ## 00000184 -/* 01734 80B640F4 17000003 */ bne $t8, $zero, .L80B64104 +/* 01734 80B640F4 17000003 */ bne $t8, $zero, .L80B64104 /* 01738 80B640F8 E6120188 */ swc1 $f18, 0x0188($s0) ## 00000188 -/* 0173C 80B640FC 0C01E245 */ jal func_80078914 +/* 0173C 80B640FC 0C01E245 */ jal func_80078914 /* 01740 80B64100 24052804 */ addiu $a1, $zero, 0x2804 ## $a1 = 00002804 .L80B64104: /* 01744 80B64104 26040250 */ addiu $a0, $s0, 0x0250 ## $a0 = 00000250 /* 01748 80B64108 0C02927F */ jal SkelAnime_FrameUpdateMatrix - -/* 0174C 80B6410C AFA40044 */ sw $a0, 0x0044($sp) + +/* 0174C 80B6410C AFA40044 */ sw $a0, 0x0044($sp) /* 01750 80B64110 3C053C3C */ lui $a1, 0x3C3C ## $a1 = 3C3C0000 /* 01754 80B64114 34A56A7E */ ori $a1, $a1, 0x6A7E ## $a1 = 3C3C6A7E /* 01758 80B64118 26040050 */ addiu $a0, $s0, 0x0050 ## $a0 = 00000050 /* 0175C 80B6411C 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 01760 80B64120 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 01764 80B64124 8E0701A4 */ lw $a3, 0x01A4($s0) ## 000001A4 /* 01768 80B64128 3C053951 */ lui $a1, 0x3951 ## $a1 = 39510000 /* 0176C 80B6412C 3C0735C9 */ lui $a3, 0x35C9 ## $a3 = 35C90000 @@ -66,28 +66,28 @@ glabel func_80B6404C /* 01774 80B64134 34A5B717 */ ori $a1, $a1, 0xB717 ## $a1 = 3951B717 /* 01778 80B64138 260401A4 */ addiu $a0, $s0, 0x01A4 ## $a0 = 000001A4 /* 0177C 80B6413C 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 01780 80B64140 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 01784 80B64144 3C063DCC */ lui $a2, 0x3DCC ## $a2 = 3DCC0000 /* 01788 80B64148 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3DCCCCCD /* 0178C 80B6414C 26040028 */ addiu $a0, $s0, 0x0028 ## $a0 = 00000028 /* 01790 80B64150 3C054270 */ lui $a1, 0x4270 ## $a1 = 42700000 /* 01794 80B64154 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 01798 80B64158 3C073F80 */ lui $a3, 0x3F80 ## $a3 = 3F800000 /* 0179C 80B6415C 861901D4 */ lh $t9, 0x01D4($s0) ## 000001D4 /* 017A0 80B64160 C6040050 */ lwc1 $f4, 0x0050($s0) ## 00000050 /* 017A4 80B64164 3C0480B6 */ lui $a0, %hi(D_80B652B8) ## $a0 = 80B60000 -/* 017A8 80B64168 17200033 */ bne $t9, $zero, .L80B64238 +/* 017A8 80B64168 17200033 */ bne $t9, $zero, .L80B64238 /* 017AC 80B6416C E6040054 */ swc1 $f4, 0x0054($s0) ## 00000054 /* 017B0 80B64170 248452B8 */ addiu $a0, $a0, %lo(D_80B652B8) ## $a0 = 80B652B8 /* 017B4 80B64174 0C00084C */ jal osSyncPrintf - + /* 017B8 80B64178 8605001C */ lh $a1, 0x001C($s0) ## 0000001C /* 017BC 80B6417C 8608001C */ lh $t0, 0x001C($s0) ## 0000001C /* 017C0 80B64180 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 /* 017C4 80B64184 3C0C80B6 */ lui $t4, %hi(func_80B6424C) ## $t4 = 80B60000 -/* 017C8 80B64188 1101000E */ beq $t0, $at, .L80B641C4 +/* 017C8 80B64188 1101000E */ beq $t0, $at, .L80B641C4 /* 017CC 80B6418C 258C424C */ addiu $t4, $t4, %lo(func_80B6424C) ## $t4 = 80B6424C /* 017D0 80B64190 3C0A80B6 */ lui $t2, %hi(func_80B64AA8) ## $t2 = 80B60000 /* 017D4 80B64194 2409008C */ addiu $t1, $zero, 0x008C ## $t1 = 0000008C @@ -96,49 +96,49 @@ glabel func_80B6404C /* 017E0 80B641A0 AE0A01FC */ sw $t2, 0x01FC($s0) ## 000001FC /* 017E4 80B641A4 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 /* 017E8 80B641A8 24A5B4C8 */ addiu $a1, $a1, 0xB4C8 ## $a1 = 0600B4C8 -/* 017EC 80B641AC 8FA40044 */ lw $a0, 0x0044($sp) -/* 017F0 80B641B0 0C0294D3 */ jal func_800A534C +/* 017EC 80B641AC 8FA40044 */ lw $a0, 0x0044($sp) +/* 017F0 80B641B0 0C0294D3 */ jal SkelAnime_ChangeAnimTransitionRepeat /* 017F4 80B641B4 24060000 */ addiu $a2, $zero, 0x0000 ## $a2 = 00000000 /* 017F8 80B641B8 240B8000 */ addiu $t3, $zero, 0x8000 ## $t3 = FFFF8000 -/* 017FC 80B641BC 1000001E */ beq $zero, $zero, .L80B64238 +/* 017FC 80B641BC 1000001E */ beq $zero, $zero, .L80B64238 /* 01800 80B641C0 A60B01C6 */ sh $t3, 0x01C6($s0) ## 000001C6 .L80B641C4: /* 01804 80B641C4 AE0C01FC */ sw $t4, 0x01FC($s0) ## 000001FC /* 01808 80B641C8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 0180C 80B641CC 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 01810 80B641D0 2405283D */ addiu $a1, $zero, 0x283D ## $a1 = 0000283D /* 01814 80B641D4 C6060024 */ lwc1 $f6, 0x0024($s0) ## 00000024 -/* 01818 80B641D8 8FA6004C */ lw $a2, 0x004C($sp) +/* 01818 80B641D8 8FA6004C */ lw $a2, 0x004C($sp) /* 0181C 80B641DC 240D0028 */ addiu $t5, $zero, 0x0028 ## $t5 = 00000028 /* 01820 80B641E0 A60D01D4 */ sh $t5, 0x01D4($s0) ## 000001D4 /* 01824 80B641E4 3C014248 */ lui $at, 0x4248 ## $at = 42480000 -/* 01828 80B641E8 E7A60010 */ swc1 $f6, 0x0010($sp) +/* 01828 80B641E8 E7A60010 */ swc1 $f6, 0x0010($sp) /* 0182C 80B641EC C6080028 */ lwc1 $f8, 0x0028($s0) ## 00000028 /* 01830 80B641F0 44815000 */ mtc1 $at, $f10 ## $f10 = 50.00 /* 01834 80B641F4 34018000 */ ori $at, $zero, 0x8000 ## $at = 00008000 /* 01838 80B641F8 24180027 */ addiu $t8, $zero, 0x0027 ## $t8 = 00000027 -/* 0183C 80B641FC 460A4400 */ add.s $f16, $f8, $f10 +/* 0183C 80B641FC 460A4400 */ add.s $f16, $f8, $f10 /* 01840 80B64200 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 01844 80B64204 2407006D */ addiu $a3, $zero, 0x006D ## $a3 = 0000006D /* 01848 80B64208 24C41C24 */ addiu $a0, $a2, 0x1C24 ## $a0 = 00001C24 -/* 0184C 80B6420C E7B00014 */ swc1 $f16, 0x0014($sp) +/* 0184C 80B6420C E7B00014 */ swc1 $f16, 0x0014($sp) /* 01850 80B64210 C612002C */ lwc1 $f18, 0x002C($s0) ## 0000002C -/* 01854 80B64214 AFA0001C */ sw $zero, 0x001C($sp) -/* 01858 80B64218 E7B20018 */ swc1 $f18, 0x0018($sp) +/* 01854 80B64214 AFA0001C */ sw $zero, 0x001C($sp) +/* 01858 80B64218 E7B20018 */ swc1 $f18, 0x0018($sp) /* 0185C 80B6421C 860E00B6 */ lh $t6, 0x00B6($s0) ## 000000B6 -/* 01860 80B64220 AFB80028 */ sw $t8, 0x0028($sp) -/* 01864 80B64224 AFA00024 */ sw $zero, 0x0024($sp) -/* 01868 80B64228 01C17821 */ addu $t7, $t6, $at +/* 01860 80B64220 AFB80028 */ sw $t8, 0x0028($sp) +/* 01864 80B64224 AFA00024 */ sw $zero, 0x0024($sp) +/* 01868 80B64228 01C17821 */ addu $t7, $t6, $at /* 0186C 80B6422C 0C00C916 */ jal Actor_SpawnAttached - -/* 01870 80B64230 AFAF0020 */ sw $t7, 0x0020($sp) + +/* 01870 80B64230 AFAF0020 */ sw $t7, 0x0020($sp) /* 01874 80B64234 A200014F */ sb $zero, 0x014F($s0) ## 0000014F .L80B64238: -/* 01878 80B64238 8FBF003C */ lw $ra, 0x003C($sp) -/* 0187C 80B6423C 8FB00038 */ lw $s0, 0x0038($sp) +/* 01878 80B64238 8FBF003C */ lw $ra, 0x003C($sp) +/* 0187C 80B6423C 8FB00038 */ lw $s0, 0x0038($sp) /* 01880 80B64240 27BD0048 */ addiu $sp, $sp, 0x0048 ## $sp = 00000000 -/* 01884 80B64244 03E00008 */ jr $ra +/* 01884 80B64244 03E00008 */ jr $ra /* 01888 80B64248 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_fHG/func_80B6424C.s b/asm/non_matchings/overlays/actors/ovl_En_fHG/func_80B6424C.s index 6cfc08e309..de63d7ae5e 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_fHG/func_80B6424C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_fHG/func_80B6424C.s @@ -1,188 +1,188 @@ glabel func_80B6424C /* 0188C 80B6424C 27BDFFA8 */ addiu $sp, $sp, 0xFFA8 ## $sp = FFFFFFA8 -/* 01890 80B64250 AFB00038 */ sw $s0, 0x0038($sp) +/* 01890 80B64250 AFB00038 */ sw $s0, 0x0038($sp) /* 01894 80B64254 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 01898 80B64258 AFBF003C */ sw $ra, 0x003C($sp) +/* 01898 80B64258 AFBF003C */ sw $ra, 0x003C($sp) /* 0189C 80B6425C 3C0480B6 */ lui $a0, %hi(D_80B652EC) ## $a0 = 80B60000 -/* 018A0 80B64260 AFA5005C */ sw $a1, 0x005C($sp) +/* 018A0 80B64260 AFA5005C */ sw $a1, 0x005C($sp) /* 018A4 80B64264 0C00084C */ jal osSyncPrintf - + /* 018A8 80B64268 248452EC */ addiu $a0, $a0, %lo(D_80B652EC) ## $a0 = 80B652EC /* 018AC 80B6426C A200014D */ sb $zero, 0x014D($s0) ## 0000014D /* 018B0 80B64270 26040250 */ addiu $a0, $s0, 0x0250 ## $a0 = 00000250 /* 018B4 80B64274 0C02927F */ jal SkelAnime_FrameUpdateMatrix - -/* 018B8 80B64278 AFA40044 */ sw $a0, 0x0044($sp) + +/* 018B8 80B64278 AFA40044 */ sw $a0, 0x0044($sp) /* 018BC 80B6427C 860E01D4 */ lh $t6, 0x01D4($s0) ## 000001D4 -/* 018C0 80B64280 8FA8005C */ lw $t0, 0x005C($sp) +/* 018C0 80B64280 8FA8005C */ lw $t0, 0x005C($sp) /* 018C4 80B64284 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 -/* 018C8 80B64288 11C00029 */ beq $t6, $zero, .L80B64330 +/* 018C8 80B64288 11C00029 */ beq $t6, $zero, .L80B64330 /* 018CC 80B6428C 3C053C3C */ lui $a1, 0x3C3C ## $a1 = 3C3C0000 /* 018D0 80B64290 3C073951 */ lui $a3, 0x3951 ## $a3 = 39510000 /* 018D4 80B64294 34E7B717 */ ori $a3, $a3, 0xB717 ## $a3 = 3951B717 /* 018D8 80B64298 34A56A7E */ ori $a1, $a1, 0x6A7E ## $a1 = 3C3C6A7E /* 018DC 80B6429C 26040058 */ addiu $a0, $s0, 0x0058 ## $a0 = 00000058 /* 018E0 80B642A0 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 018E4 80B642A4 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 018E8 80B642A8 860F01D4 */ lh $t7, 0x01D4($s0) ## 000001D4 /* 018EC 80B642AC 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 /* 018F0 80B642B0 24180001 */ addiu $t8, $zero, 0x0001 ## $t8 = 00000001 -/* 018F4 80B642B4 15E10008 */ bne $t7, $at, .L80B642D8 +/* 018F4 80B642B4 15E10008 */ bne $t7, $at, .L80B642D8 /* 018F8 80B642B8 24190032 */ addiu $t9, $zero, 0x0032 ## $t9 = 00000032 /* 018FC 80B642BC A218014C */ sb $t8, 0x014C($s0) ## 0000014C /* 01900 80B642C0 A61901D6 */ sh $t9, 0x01D6($s0) ## 000001D6 /* 01904 80B642C4 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 /* 01908 80B642C8 24A5C65C */ addiu $a1, $a1, 0xC65C ## $a1 = 0600C65C -/* 0190C 80B642CC 8FA40044 */ lw $a0, 0x0044($sp) -/* 01910 80B642D0 0C029490 */ jal func_800A5240 +/* 0190C 80B642CC 8FA40044 */ lw $a0, 0x0044($sp) +/* 01910 80B642D0 0C029490 */ jal SkelAnime_ChangeAnimTransitionStop /* 01914 80B642D4 24060000 */ addiu $a2, $zero, 0x0000 ## $a2 = 00000000 .L80B642D8: /* 01918 80B642D8 260401E8 */ addiu $a0, $s0, 0x01E8 ## $a0 = 000001E8 /* 0191C 80B642DC 3C05437F */ lui $a1, 0x437F ## $a1 = 437F0000 /* 01920 80B642E0 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 01924 80B642E4 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 01928 80B642E8 3C074120 */ lui $a3, 0x4120 ## $a3 = 41200000 /* 0192C 80B642EC 260401EC */ addiu $a0, $s0, 0x01EC ## $a0 = 000001EC /* 01930 80B642F0 3C05437F */ lui $a1, 0x437F ## $a1 = 437F0000 /* 01934 80B642F4 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 01938 80B642F8 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 0193C 80B642FC 3C074120 */ lui $a3, 0x4120 ## $a3 = 41200000 /* 01940 80B64300 260401F0 */ addiu $a0, $s0, 0x01F0 ## $a0 = 000001F0 /* 01944 80B64304 3C05437F */ lui $a1, 0x437F ## $a1 = 437F0000 /* 01948 80B64308 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 0194C 80B6430C 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 01950 80B64310 3C074120 */ lui $a3, 0x4120 ## $a3 = 41200000 /* 01954 80B64314 260401F4 */ addiu $a0, $s0, 0x01F4 ## $a0 = 000001F4 /* 01958 80B64318 3C05C270 */ lui $a1, 0xC270 ## $a1 = C2700000 /* 0195C 80B6431C 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 01960 80B64320 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 01964 80B64324 3C0740A0 */ lui $a3, 0x40A0 ## $a3 = 40A00000 -/* 01968 80B64328 10000084 */ beq $zero, $zero, .L80B6453C +/* 01968 80B64328 10000084 */ beq $zero, $zero, .L80B6453C /* 0196C 80B6432C 860A01DE */ lh $t2, 0x01DE($s0) ## 000001DE .L80B64330: /* 01970 80B64330 910907AF */ lbu $t1, 0x07AF($t0) ## 000007AF /* 01974 80B64334 260401E8 */ addiu $a0, $s0, 0x01E8 ## $a0 = 000001E8 /* 01978 80B64338 44892000 */ mtc1 $t1, $f4 ## $f4 = 0.00 -/* 0197C 80B6433C 05210005 */ bgez $t1, .L80B64354 -/* 01980 80B64340 46802120 */ cvt.s.w $f4, $f4 +/* 0197C 80B6433C 05210005 */ bgez $t1, .L80B64354 +/* 01980 80B64340 46802120 */ cvt.s.w $f4, $f4 /* 01984 80B64344 3C014F80 */ lui $at, 0x4F80 ## $at = 4F800000 /* 01988 80B64348 44813000 */ mtc1 $at, $f6 ## $f6 = 4294967296.00 /* 0198C 80B6434C 00000000 */ nop -/* 01990 80B64350 46062100 */ add.s $f4, $f4, $f6 +/* 01990 80B64350 46062100 */ add.s $f4, $f4, $f6 .L80B64354: -/* 01994 80B64354 44052000 */ mfc1 $a1, $f4 +/* 01994 80B64354 44052000 */ mfc1 $a1, $f4 /* 01998 80B64358 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 0199C 80B6435C 3C074120 */ lui $a3, 0x4120 ## $a3 = 41200000 -/* 019A0 80B64360 8FAA005C */ lw $t2, 0x005C($sp) +/* 019A0 80B64360 8FAA005C */ lw $t2, 0x005C($sp) /* 019A4 80B64364 260401EC */ addiu $a0, $s0, 0x01EC ## $a0 = 000001EC /* 019A8 80B64368 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 019AC 80B6436C 914B07AF */ lbu $t3, 0x07AF($t2) ## 000007AF /* 019B0 80B64370 3C014F80 */ lui $at, 0x4F80 ## $at = 4F800000 /* 019B4 80B64374 448B4000 */ mtc1 $t3, $f8 ## $f8 = 0.00 -/* 019B8 80B64378 05610004 */ bgez $t3, .L80B6438C -/* 019BC 80B6437C 46804220 */ cvt.s.w $f8, $f8 +/* 019B8 80B64378 05610004 */ bgez $t3, .L80B6438C +/* 019BC 80B6437C 46804220 */ cvt.s.w $f8, $f8 /* 019C0 80B64380 44815000 */ mtc1 $at, $f10 ## $f10 = 4294967296.00 /* 019C4 80B64384 00000000 */ nop -/* 019C8 80B64388 460A4200 */ add.s $f8, $f8, $f10 +/* 019C8 80B64388 460A4200 */ add.s $f8, $f8, $f10 .L80B6438C: -/* 019CC 80B6438C 44054000 */ mfc1 $a1, $f8 +/* 019CC 80B6438C 44054000 */ mfc1 $a1, $f8 /* 019D0 80B64390 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 019D4 80B64394 3C074120 */ lui $a3, 0x4120 ## $a3 = 41200000 -/* 019D8 80B64398 8FAC005C */ lw $t4, 0x005C($sp) +/* 019D8 80B64398 8FAC005C */ lw $t4, 0x005C($sp) /* 019DC 80B6439C 260401F0 */ addiu $a0, $s0, 0x01F0 ## $a0 = 000001F0 /* 019E0 80B643A0 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 019E4 80B643A4 918D07AF */ lbu $t5, 0x07AF($t4) ## 000007AF /* 019E8 80B643A8 3C014F80 */ lui $at, 0x4F80 ## $at = 4F800000 /* 019EC 80B643AC 448D8000 */ mtc1 $t5, $f16 ## $f16 = 0.00 -/* 019F0 80B643B0 05A10004 */ bgez $t5, .L80B643C4 -/* 019F4 80B643B4 46808420 */ cvt.s.w $f16, $f16 +/* 019F0 80B643B0 05A10004 */ bgez $t5, .L80B643C4 +/* 019F4 80B643B4 46808420 */ cvt.s.w $f16, $f16 /* 019F8 80B643B8 44819000 */ mtc1 $at, $f18 ## $f18 = 4294967296.00 /* 019FC 80B643BC 00000000 */ nop -/* 01A00 80B643C0 46128400 */ add.s $f16, $f16, $f18 +/* 01A00 80B643C0 46128400 */ add.s $f16, $f16, $f18 .L80B643C4: -/* 01A04 80B643C4 44058000 */ mfc1 $a1, $f16 +/* 01A04 80B643C4 44058000 */ mfc1 $a1, $f16 /* 01A08 80B643C8 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 01A0C 80B643CC 3C074120 */ lui $a3, 0x4120 ## $a3 = 41200000 /* 01A10 80B643D0 260401F4 */ addiu $a0, $s0, 0x01F4 ## $a0 = 000001F4 /* 01A14 80B643D4 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 /* 01A18 80B643D8 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 01A1C 80B643DC 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 01A20 80B643E0 3C0740A0 */ lui $a3, 0x40A0 ## $a3 = 40A00000 /* 01A24 80B643E4 860E01D6 */ lh $t6, 0x01D6($s0) ## 000001D6 /* 01A28 80B643E8 2401001D */ addiu $at, $zero, 0x001D ## $at = 0000001D /* 01A2C 80B643EC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01A30 80B643F0 55C10007 */ bnel $t6, $at, .L80B64410 +/* 01A30 80B643F0 55C10007 */ bnel $t6, $at, .L80B64410 /* 01A34 80B643F4 860F01DE */ lh $t7, 0x01DE($s0) ## 000001DE /* 01A38 80B643F8 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 01A3C 80B643FC 240538A6 */ addiu $a1, $zero, 0x38A6 ## $a1 = 000038A6 /* 01A40 80B64400 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 01A44 80B64404 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 01A48 80B64408 240538B2 */ addiu $a1, $zero, 0x38B2 ## $a1 = 000038B2 /* 01A4C 80B6440C 860F01DE */ lh $t7, 0x01DE($s0) ## 000001DE .L80B64410: -/* 01A50 80B64410 55E00033 */ bnel $t7, $zero, .L80B644E0 +/* 01A50 80B64410 55E00033 */ bnel $t7, $zero, .L80B644E0 /* 01A54 80B64414 3C053C3C */ lui $a1, 0x3C3C ## $a1 = 3C3C0000 /* 01A58 80B64418 860301D6 */ lh $v1, 0x01D6($s0) ## 000001D6 /* 01A5C 80B6441C 24010018 */ addiu $at, $zero, 0x0018 ## $at = 00000018 -/* 01A60 80B64420 54610019 */ bnel $v1, $at, .L80B64488 +/* 01A60 80B64420 54610019 */ bnel $v1, $at, .L80B64488 /* 01A64 80B64424 2401002D */ addiu $at, $zero, 0x002D ## $at = 0000002D /* 01A68 80B64428 C6040024 */ lwc1 $f4, 0x0024($s0) ## 00000024 /* 01A6C 80B6442C 3C0142C8 */ lui $at, 0x42C8 ## $at = 42C80000 /* 01A70 80B64430 44814000 */ mtc1 $at, $f8 ## $f8 = 100.00 -/* 01A74 80B64434 E7A40010 */ swc1 $f4, 0x0010($sp) +/* 01A74 80B64434 E7A40010 */ swc1 $f4, 0x0010($sp) /* 01A78 80B64438 C6060028 */ lwc1 $f6, 0x0028($s0) ## 00000028 /* 01A7C 80B6443C 3C0141C8 */ lui $at, 0x41C8 ## $at = 41C80000 /* 01A80 80B64440 44818000 */ mtc1 $at, $f16 ## $f16 = 25.00 -/* 01A84 80B64444 46083280 */ add.s $f10, $f6, $f8 -/* 01A88 80B64448 8FA6005C */ lw $a2, 0x005C($sp) +/* 01A84 80B64444 46083280 */ add.s $f10, $f6, $f8 +/* 01A88 80B64448 8FA6005C */ lw $a2, 0x005C($sp) /* 01A8C 80B6444C 24190001 */ addiu $t9, $zero, 0x0001 ## $t9 = 00000001 /* 01A90 80B64450 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 01A94 80B64454 46105480 */ add.s $f18, $f10, $f16 +/* 01A94 80B64454 46105480 */ add.s $f18, $f10, $f16 /* 01A98 80B64458 2407006D */ addiu $a3, $zero, 0x006D ## $a3 = 0000006D /* 01A9C 80B6445C 24C41C24 */ addiu $a0, $a2, 0x1C24 ## $a0 = 00001C24 -/* 01AA0 80B64460 E7B20014 */ swc1 $f18, 0x0014($sp) +/* 01AA0 80B64460 E7B20014 */ swc1 $f18, 0x0014($sp) /* 01AA4 80B64464 C604002C */ lwc1 $f4, 0x002C($s0) ## 0000002C -/* 01AA8 80B64468 AFB90028 */ sw $t9, 0x0028($sp) -/* 01AAC 80B6446C AFA00024 */ sw $zero, 0x0024($sp) -/* 01AB0 80B64470 AFA00020 */ sw $zero, 0x0020($sp) -/* 01AB4 80B64474 AFA0001C */ sw $zero, 0x001C($sp) +/* 01AA8 80B64468 AFB90028 */ sw $t9, 0x0028($sp) +/* 01AAC 80B6446C AFA00024 */ sw $zero, 0x0024($sp) +/* 01AB0 80B64470 AFA00020 */ sw $zero, 0x0020($sp) +/* 01AB4 80B64474 AFA0001C */ sw $zero, 0x001C($sp) /* 01AB8 80B64478 0C00C916 */ jal Actor_SpawnAttached - -/* 01ABC 80B6447C E7A40018 */ swc1 $f4, 0x0018($sp) + +/* 01ABC 80B6447C E7A40018 */ swc1 $f4, 0x0018($sp) /* 01AC0 80B64480 860301D6 */ lh $v1, 0x01D6($s0) ## 000001D6 /* 01AC4 80B64484 2401002D */ addiu $at, $zero, 0x002D ## $at = 0000002D .L80B64488: -/* 01AC8 80B64488 14610006 */ bne $v1, $at, .L80B644A4 -/* 01ACC 80B6448C 8FA40044 */ lw $a0, 0x0044($sp) +/* 01AC8 80B64488 14610006 */ bne $v1, $at, .L80B644A4 +/* 01ACC 80B6448C 8FA40044 */ lw $a0, 0x0044($sp) /* 01AD0 80B64490 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 /* 01AD4 80B64494 24A5B9D0 */ addiu $a1, $a1, 0xB9D0 ## $a1 = 0600B9D0 -/* 01AD8 80B64498 0C0294D3 */ jal func_800A534C +/* 01AD8 80B64498 0C0294D3 */ jal SkelAnime_ChangeAnimTransitionRepeat /* 01ADC 80B6449C 24060000 */ addiu $a2, $zero, 0x0000 ## $a2 = 00000000 /* 01AE0 80B644A0 860301D6 */ lh $v1, 0x01D6($s0) ## 000001D6 .L80B644A4: /* 01AE4 80B644A4 24010026 */ addiu $at, $zero, 0x0026 ## $at = 00000026 -/* 01AE8 80B644A8 14610003 */ bne $v1, $at, .L80B644B8 +/* 01AE8 80B644A8 14610003 */ bne $v1, $at, .L80B644B8 /* 01AEC 80B644AC 24080003 */ addiu $t0, $zero, 0x0003 ## $t0 = 00000003 /* 01AF0 80B644B0 A208014C */ sb $t0, 0x014C($s0) ## 0000014C /* 01AF4 80B644B4 860301D6 */ lh $v1, 0x01D6($s0) ## 000001D6 .L80B644B8: /* 01AF8 80B644B8 24010010 */ addiu $at, $zero, 0x0010 ## $at = 00000010 -/* 01AFC 80B644BC 14610007 */ bne $v1, $at, .L80B644DC -/* 01B00 80B644C0 8FA40044 */ lw $a0, 0x0044($sp) +/* 01AFC 80B644BC 14610007 */ bne $v1, $at, .L80B644DC +/* 01B00 80B644C0 8FA40044 */ lw $a0, 0x0044($sp) /* 01B04 80B644C4 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 /* 01B08 80B644C8 24A5CB1C */ addiu $a1, $a1, 0xCB1C ## $a1 = 0600CB1C -/* 01B0C 80B644CC 0C029490 */ jal func_800A5240 +/* 01B0C 80B644CC 0C029490 */ jal SkelAnime_ChangeAnimTransitionStop /* 01B10 80B644D0 24060000 */ addiu $a2, $zero, 0x0000 ## $a2 = 00000000 /* 01B14 80B644D4 24090004 */ addiu $t1, $zero, 0x0004 ## $t1 = 00000004 /* 01B18 80B644D8 A209014C */ sb $t1, 0x014C($s0) ## 0000014C @@ -194,117 +194,117 @@ glabel func_80B6424C /* 01B28 80B644E8 34A56A7E */ ori $a1, $a1, 0x6A7E ## $a1 = 3C3C6A7E /* 01B2C 80B644EC 26040058 */ addiu $a0, $s0, 0x0058 ## $a0 = 00000058 /* 01B30 80B644F0 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 01B34 80B644F4 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 01B38 80B644F8 26040024 */ addiu $a0, $s0, 0x0024 ## $a0 = 00000024 /* 01B3C 80B644FC 8E05018C */ lw $a1, 0x018C($s0) ## 0000018C /* 01B40 80B64500 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 01B44 80B64504 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 01B48 80B64508 8E070198 */ lw $a3, 0x0198($s0) ## 00000198 /* 01B4C 80B6450C 3C063DCC */ lui $a2, 0x3DCC ## $a2 = 3DCC0000 /* 01B50 80B64510 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3DCCCCCD /* 01B54 80B64514 26040028 */ addiu $a0, $s0, 0x0028 ## $a0 = 00000028 /* 01B58 80B64518 3C054270 */ lui $a1, 0x4270 ## $a1 = 42700000 /* 01B5C 80B6451C 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 01B60 80B64520 3C073F80 */ lui $a3, 0x3F80 ## $a3 = 3F800000 /* 01B64 80B64524 2604002C */ addiu $a0, $s0, 0x002C ## $a0 = 0000002C /* 01B68 80B64528 8E050194 */ lw $a1, 0x0194($s0) ## 00000194 /* 01B6C 80B6452C 3C063F80 */ lui $a2, 0x3F80 ## $a2 = 3F800000 /* 01B70 80B64530 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 01B74 80B64534 8E07019C */ lw $a3, 0x019C($s0) ## 0000019C /* 01B78 80B64538 860A01DE */ lh $t2, 0x01DE($s0) ## 000001DE .L80B6453C: /* 01B7C 80B6453C 24010014 */ addiu $at, $zero, 0x0014 ## $at = 00000014 /* 01B80 80B64540 3C0B80B6 */ lui $t3, %hi(func_80B6476C) ## $t3 = 80B60000 -/* 01B84 80B64544 1541001C */ bne $t2, $at, .L80B645B8 +/* 01B84 80B64544 1541001C */ bne $t2, $at, .L80B645B8 /* 01B88 80B64548 256B476C */ addiu $t3, $t3, %lo(func_80B6476C) ## $t3 = 80B6476C /* 01B8C 80B6454C 3C040601 */ lui $a0, 0x0601 ## $a0 = 06010000 /* 01B90 80B64550 AE0B01FC */ sw $t3, 0x01FC($s0) ## 000001FC /* 01B94 80B64554 A60001C8 */ sh $zero, 0x01C8($s0) ## 000001C8 /* 01B98 80B64558 0C028800 */ jal SkelAnime_GetFrameCount - + /* 01B9C 80B6455C 2484CB1C */ addiu $a0, $a0, 0xCB1C ## $a0 = 0600CB1C /* 01BA0 80B64560 44823000 */ mtc1 $v0, $f6 ## $f6 = 0.00 /* 01BA4 80B64564 3C01C0A0 */ lui $at, 0xC0A0 ## $at = C0A00000 /* 01BA8 80B64568 44815000 */ mtc1 $at, $f10 ## $f10 = -5.00 -/* 01BAC 80B6456C 46803220 */ cvt.s.w $f8, $f6 +/* 01BAC 80B6456C 46803220 */ cvt.s.w $f8, $f6 /* 01BB0 80B64570 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 /* 01BB4 80B64574 240C0002 */ addiu $t4, $zero, 0x0002 ## $t4 = 00000002 -/* 01BB8 80B64578 AFAC0014 */ sw $t4, 0x0014($sp) +/* 01BB8 80B64578 AFAC0014 */ sw $t4, 0x0014($sp) /* 01BBC 80B6457C 24A5CB1C */ addiu $a1, $a1, 0xCB1C ## $a1 = 0600CB1C -/* 01BC0 80B64580 8FA40044 */ lw $a0, 0x0044($sp) -/* 01BC4 80B64584 E7A80010 */ swc1 $f8, 0x0010($sp) +/* 01BC0 80B64580 8FA40044 */ lw $a0, 0x0044($sp) +/* 01BC4 80B64584 E7A80010 */ swc1 $f8, 0x0010($sp) /* 01BC8 80B64588 3C06BF80 */ lui $a2, 0xBF80 ## $a2 = BF800000 /* 01BCC 80B6458C 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 01BD0 80B64590 0C029468 */ jal SkelAnime_ChangeAnimation - -/* 01BD4 80B64594 E7AA0018 */ swc1 $f10, 0x0018($sp) +/* 01BD0 80B64590 0C029468 */ jal SkelAnime_ChangeAnim + +/* 01BD4 80B64594 E7AA0018 */ swc1 $f10, 0x0018($sp) /* 01BD8 80B64598 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 /* 01BDC 80B6459C 44818000 */ mtc1 $at, $f16 ## $f16 = 1.00 /* 01BE0 80B645A0 240D000A */ addiu $t5, $zero, 0x000A ## $t5 = 0000000A /* 01BE4 80B645A4 240E0004 */ addiu $t6, $zero, 0x0004 ## $t6 = 00000004 /* 01BE8 80B645A8 A60D01D4 */ sh $t5, 0x01D4($s0) ## 000001D4 /* 01BEC 80B645AC A20E014C */ sb $t6, 0x014C($s0) ## 0000014C -/* 01BF0 80B645B0 10000069 */ beq $zero, $zero, .L80B64758 +/* 01BF0 80B645B0 10000069 */ beq $zero, $zero, .L80B64758 /* 01BF4 80B645B4 E61001A0 */ swc1 $f16, 0x01A0($s0) ## 000001A0 .L80B645B8: /* 01BF8 80B645B8 C606002C */ lwc1 $f6, 0x002C($s0) ## 0000002C /* 01BFC 80B645BC C6080194 */ lwc1 $f8, 0x0194($s0) ## 00000194 /* 01C00 80B645C0 C6120024 */ lwc1 $f18, 0x0024($s0) ## 00000024 /* 01C04 80B645C4 C604018C */ lwc1 $f4, 0x018C($s0) ## 0000018C -/* 01C08 80B645C8 46083281 */ sub.s $f10, $f6, $f8 +/* 01C08 80B645C8 46083281 */ sub.s $f10, $f6, $f8 /* 01C0C 80B645CC 3C0143AF */ lui $at, 0x43AF ## $at = 43AF0000 /* 01C10 80B645D0 44813000 */ mtc1 $at, $f6 ## $f6 = 350.00 -/* 01C14 80B645D4 46049081 */ sub.s $f2, $f18, $f4 -/* 01C18 80B645D8 E7AA0050 */ swc1 $f10, 0x0050($sp) -/* 01C1C 80B645DC C7B00050 */ lwc1 $f16, 0x0050($sp) +/* 01C14 80B645D4 46049081 */ sub.s $f2, $f18, $f4 +/* 01C18 80B645D8 E7AA0050 */ swc1 $f10, 0x0050($sp) +/* 01C1C 80B645DC C7B00050 */ lwc1 $f16, 0x0050($sp) /* 01C20 80B645E0 3C014396 */ lui $at, 0x4396 ## $at = 43960000 /* 01C24 80B645E4 44814000 */ mtc1 $at, $f8 ## $f8 = 300.00 -/* 01C28 80B645E8 46108482 */ mul.s $f18, $f16, $f16 +/* 01C28 80B645E8 46108482 */ mul.s $f18, $f16, $f16 /* 01C2C 80B645EC 240F0001 */ addiu $t7, $zero, 0x0001 ## $t7 = 00000001 -/* 01C30 80B645F0 46021102 */ mul.s $f4, $f2, $f2 -/* 01C34 80B645F4 46122000 */ add.s $f0, $f4, $f18 -/* 01C38 80B645F8 46000004 */ sqrt.s $f0, $f0 -/* 01C3C 80B645FC 4606003C */ c.lt.s $f0, $f6 -/* 01C40 80B64600 E7A0004C */ swc1 $f0, 0x004C($sp) -/* 01C44 80B64604 45020003 */ bc1fl .L80B64614 -/* 01C48 80B64608 4608003C */ c.lt.s $f0, $f8 +/* 01C30 80B645F0 46021102 */ mul.s $f4, $f2, $f2 +/* 01C34 80B645F4 46122000 */ add.s $f0, $f4, $f18 +/* 01C38 80B645F8 46000004 */ sqrt.s $f0, $f0 +/* 01C3C 80B645FC 4606003C */ c.lt.s $f0, $f6 +/* 01C40 80B64600 E7A0004C */ swc1 $f0, 0x004C($sp) +/* 01C44 80B64604 45020003 */ bc1fl .L80B64614 +/* 01C48 80B64608 4608003C */ c.lt.s $f0, $f8 /* 01C4C 80B6460C A20F014D */ sb $t7, 0x014D($s0) ## 0000014D -/* 01C50 80B64610 4608003C */ c.lt.s $f0, $f8 +/* 01C50 80B64610 4608003C */ c.lt.s $f0, $f8 .L80B64614: /* 01C54 80B64614 00000000 */ nop -/* 01C58 80B64618 4502001E */ bc1fl .L80B64694 +/* 01C58 80B64618 4502001E */ bc1fl .L80B64694 /* 01C5C 80B6461C C6080198 */ lwc1 $f8, 0x0198($s0) ## 00000198 /* 01C60 80B64620 861801C8 */ lh $t8, 0x01C8($s0) ## 000001C8 -/* 01C64 80B64624 8FA6005C */ lw $a2, 0x005C($sp) +/* 01C64 80B64624 8FA6005C */ lw $a2, 0x005C($sp) /* 01C68 80B64628 24190001 */ addiu $t9, $zero, 0x0001 ## $t9 = 00000001 -/* 01C6C 80B6462C 17000018 */ bne $t8, $zero, .L80B64690 +/* 01C6C 80B6462C 17000018 */ bne $t8, $zero, .L80B64690 /* 01C70 80B64630 3C014248 */ lui $at, 0x4248 ## $at = 42480000 /* 01C74 80B64634 C60A018C */ lwc1 $f10, 0x018C($s0) ## 0000018C /* 01C78 80B64638 A61901C8 */ sh $t9, 0x01C8($s0) ## 000001C8 /* 01C7C 80B6463C 44812000 */ mtc1 $at, $f4 ## $f4 = 50.00 -/* 01C80 80B64640 E7AA0010 */ swc1 $f10, 0x0010($sp) +/* 01C80 80B64640 E7AA0010 */ swc1 $f10, 0x0010($sp) /* 01C84 80B64644 C6100028 */ lwc1 $f16, 0x0028($s0) ## 00000028 /* 01C88 80B64648 24090028 */ addiu $t1, $zero, 0x0028 ## $t1 = 00000028 /* 01C8C 80B6464C 24C41C24 */ addiu $a0, $a2, 0x1C24 ## $a0 = 00001C24 -/* 01C90 80B64650 46048480 */ add.s $f18, $f16, $f4 +/* 01C90 80B64650 46048480 */ add.s $f18, $f16, $f4 /* 01C94 80B64654 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 01C98 80B64658 2407006D */ addiu $a3, $zero, 0x006D ## $a3 = 0000006D -/* 01C9C 80B6465C E7B20014 */ swc1 $f18, 0x0014($sp) +/* 01C9C 80B6465C E7B20014 */ swc1 $f18, 0x0014($sp) /* 01CA0 80B64660 C6060194 */ lwc1 $f6, 0x0194($s0) ## 00000194 -/* 01CA4 80B64664 AFA0001C */ sw $zero, 0x001C($sp) -/* 01CA8 80B64668 E7A60018 */ swc1 $f6, 0x0018($sp) +/* 01CA4 80B64664 AFA0001C */ sw $zero, 0x001C($sp) +/* 01CA8 80B64668 E7A60018 */ swc1 $f6, 0x0018($sp) /* 01CAC 80B6466C 860800B6 */ lh $t0, 0x00B6($s0) ## 000000B6 -/* 01CB0 80B64670 E7A20054 */ swc1 $f2, 0x0054($sp) -/* 01CB4 80B64674 AFA90028 */ sw $t1, 0x0028($sp) -/* 01CB8 80B64678 AFA00024 */ sw $zero, 0x0024($sp) +/* 01CB0 80B64670 E7A20054 */ swc1 $f2, 0x0054($sp) +/* 01CB4 80B64674 AFA90028 */ sw $t1, 0x0028($sp) +/* 01CB8 80B64678 AFA00024 */ sw $zero, 0x0024($sp) /* 01CBC 80B6467C 0C00C916 */ jal Actor_SpawnAttached - -/* 01CC0 80B64680 AFA80020 */ sw $t0, 0x0020($sp) -/* 01CC4 80B64684 C7A20054 */ lwc1 $f2, 0x0054($sp) + +/* 01CC0 80B64680 AFA80020 */ sw $t0, 0x0020($sp) +/* 01CC4 80B64684 C7A20054 */ lwc1 $f2, 0x0054($sp) /* 01CC8 80B64688 240A0001 */ addiu $t2, $zero, 0x0001 ## $t2 = 00000001 /* 01CCC 80B6468C A20A014F */ sb $t2, 0x014F($s0) ## 0000014F .L80B64690: @@ -312,63 +312,63 @@ glabel func_80B6424C .L80B64694: /* 01CD4 80B64694 3C0480B6 */ lui $a0, %hi(D_80B652FC) ## $a0 = 80B60000 /* 01CD8 80B64698 248452FC */ addiu $a0, $a0, %lo(D_80B652FC) ## $a0 = 80B652FC -/* 01CDC 80B6469C 460042A1 */ cvt.d.s $f10, $f8 -/* 01CE0 80B646A0 E7A20054 */ swc1 $f2, 0x0054($sp) -/* 01CE4 80B646A4 44075000 */ mfc1 $a3, $f10 -/* 01CE8 80B646A8 44065800 */ mfc1 $a2, $f11 +/* 01CDC 80B6469C 460042A1 */ cvt.d.s $f10, $f8 +/* 01CE0 80B646A0 E7A20054 */ swc1 $f2, 0x0054($sp) +/* 01CE4 80B646A4 44075000 */ mfc1 $a3, $f10 +/* 01CE8 80B646A8 44065800 */ mfc1 $a2, $f11 /* 01CEC 80B646AC 0C00084C */ jal osSyncPrintf - + /* 01CF0 80B646B0 00000000 */ nop /* 01CF4 80B646B4 C610019C */ lwc1 $f16, 0x019C($s0) ## 0000019C /* 01CF8 80B646B8 3C0480B6 */ lui $a0, %hi(D_80B65308) ## $a0 = 80B60000 /* 01CFC 80B646BC 24845308 */ addiu $a0, $a0, %lo(D_80B65308) ## $a0 = 80B65308 -/* 01D00 80B646C0 46008121 */ cvt.d.s $f4, $f16 -/* 01D04 80B646C4 44072000 */ mfc1 $a3, $f4 -/* 01D08 80B646C8 44062800 */ mfc1 $a2, $f5 +/* 01D00 80B646C0 46008121 */ cvt.d.s $f4, $f16 +/* 01D04 80B646C4 44072000 */ mfc1 $a3, $f4 +/* 01D08 80B646C8 44062800 */ mfc1 $a2, $f5 /* 01D0C 80B646CC 0C00084C */ jal osSyncPrintf - + /* 01D10 80B646D0 00000000 */ nop -/* 01D14 80B646D4 C7A20054 */ lwc1 $f2, 0x0054($sp) +/* 01D14 80B646D4 C7A20054 */ lwc1 $f2, 0x0054($sp) /* 01D18 80B646D8 3C0480B6 */ lui $a0, %hi(D_80B65314) ## $a0 = 80B60000 /* 01D1C 80B646DC 24845314 */ addiu $a0, $a0, %lo(D_80B65314) ## $a0 = 80B65314 -/* 01D20 80B646E0 460014A1 */ cvt.d.s $f18, $f2 -/* 01D24 80B646E4 44079000 */ mfc1 $a3, $f18 -/* 01D28 80B646E8 44069800 */ mfc1 $a2, $f19 +/* 01D20 80B646E0 460014A1 */ cvt.d.s $f18, $f2 +/* 01D24 80B646E4 44079000 */ mfc1 $a3, $f18 +/* 01D28 80B646E8 44069800 */ mfc1 $a2, $f19 /* 01D2C 80B646EC 0C00084C */ jal osSyncPrintf - + /* 01D30 80B646F0 00000000 */ nop -/* 01D34 80B646F4 C7A60050 */ lwc1 $f6, 0x0050($sp) +/* 01D34 80B646F4 C7A60050 */ lwc1 $f6, 0x0050($sp) /* 01D38 80B646F8 3C0480B6 */ lui $a0, %hi(D_80B6531C) ## $a0 = 80B60000 /* 01D3C 80B646FC 2484531C */ addiu $a0, $a0, %lo(D_80B6531C) ## $a0 = 80B6531C -/* 01D40 80B64700 46003221 */ cvt.d.s $f8, $f6 -/* 01D44 80B64704 44074000 */ mfc1 $a3, $f8 -/* 01D48 80B64708 44064800 */ mfc1 $a2, $f9 +/* 01D40 80B64700 46003221 */ cvt.d.s $f8, $f6 +/* 01D44 80B64704 44074000 */ mfc1 $a3, $f8 +/* 01D48 80B64708 44064800 */ mfc1 $a2, $f9 /* 01D4C 80B6470C 0C00084C */ jal osSyncPrintf - + /* 01D50 80B64710 00000000 */ nop /* 01D54 80B64714 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 01D58 80B64718 C7AA004C */ lwc1 $f10, 0x004C($sp) +/* 01D58 80B64718 C7AA004C */ lwc1 $f10, 0x004C($sp) /* 01D5C 80B6471C 3C0C80B6 */ lui $t4, %hi(func_80B64AA8) ## $t4 = 80B60000 /* 01D60 80B64720 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 -/* 01D64 80B64724 46005032 */ c.eq.s $f10, $f0 +/* 01D64 80B64724 46005032 */ c.eq.s $f10, $f0 /* 01D68 80B64728 240B008C */ addiu $t3, $zero, 0x008C ## $t3 = 0000008C /* 01D6C 80B6472C 258C4AA8 */ addiu $t4, $t4, %lo(func_80B64AA8) ## $t4 = 80B64AA8 /* 01D70 80B64730 24A5B4C8 */ addiu $a1, $a1, 0xB4C8 ## $a1 = 0600B4C8 -/* 01D74 80B64734 45020009 */ bc1fl .L80B6475C -/* 01D78 80B64738 8FBF003C */ lw $ra, 0x003C($sp) +/* 01D74 80B64734 45020009 */ bc1fl .L80B6475C +/* 01D78 80B64738 8FBF003C */ lw $ra, 0x003C($sp) /* 01D7C 80B6473C A60B01D4 */ sh $t3, 0x01D4($s0) ## 000001D4 /* 01D80 80B64740 AE0C01FC */ sw $t4, 0x01FC($s0) ## 000001FC -/* 01D84 80B64744 44060000 */ mfc1 $a2, $f0 -/* 01D88 80B64748 0C0294D3 */ jal func_800A534C -/* 01D8C 80B6474C 8FA40044 */ lw $a0, 0x0044($sp) +/* 01D84 80B64744 44060000 */ mfc1 $a2, $f0 +/* 01D88 80B64748 0C0294D3 */ jal SkelAnime_ChangeAnimTransitionRepeat +/* 01D8C 80B6474C 8FA40044 */ lw $a0, 0x0044($sp) /* 01D90 80B64750 240D0005 */ addiu $t5, $zero, 0x0005 ## $t5 = 00000005 /* 01D94 80B64754 A20D014C */ sb $t5, 0x014C($s0) ## 0000014C .L80B64758: -/* 01D98 80B64758 8FBF003C */ lw $ra, 0x003C($sp) +/* 01D98 80B64758 8FBF003C */ lw $ra, 0x003C($sp) .L80B6475C: -/* 01D9C 80B6475C 8FB00038 */ lw $s0, 0x0038($sp) +/* 01D9C 80B6475C 8FB00038 */ lw $s0, 0x0038($sp) /* 01DA0 80B64760 27BD0058 */ addiu $sp, $sp, 0x0058 ## $sp = 00000000 -/* 01DA4 80B64764 03E00008 */ jr $ra +/* 01DA4 80B64764 03E00008 */ jr $ra /* 01DA8 80B64768 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_En_fHG/func_80B6476C.s b/asm/non_matchings/overlays/actors/ovl_En_fHG/func_80B6476C.s index 122ed688b1..2e3f73f2a2 100644 --- a/asm/non_matchings/overlays/actors/ovl_En_fHG/func_80B6476C.s +++ b/asm/non_matchings/overlays/actors/ovl_En_fHG/func_80B6476C.s @@ -1,232 +1,232 @@ glabel func_80B6476C /* 01DAC 80B6476C 27BDFFA0 */ addiu $sp, $sp, 0xFFA0 ## $sp = FFFFFFA0 -/* 01DB0 80B64770 AFB00040 */ sw $s0, 0x0040($sp) +/* 01DB0 80B64770 AFB00040 */ sw $s0, 0x0040($sp) /* 01DB4 80B64774 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 01DB8 80B64778 AFBF0044 */ sw $ra, 0x0044($sp) +/* 01DB8 80B64778 AFBF0044 */ sw $ra, 0x0044($sp) /* 01DBC 80B6477C 3C0480B6 */ lui $a0, %hi(D_80B65324) ## $a0 = 80B60000 -/* 01DC0 80B64780 F7B40038 */ sdc1 $f20, 0x0038($sp) -/* 01DC4 80B64784 AFA50064 */ sw $a1, 0x0064($sp) +/* 01DC0 80B64780 F7B40038 */ sdc1 $f20, 0x0038($sp) +/* 01DC4 80B64784 AFA50064 */ sw $a1, 0x0064($sp) /* 01DC8 80B64788 0C00084C */ jal osSyncPrintf - + /* 01DCC 80B6478C 24845324 */ addiu $a0, $a0, %lo(D_80B65324) ## $a0 = 80B65324 /* 01DD0 80B64790 26040250 */ addiu $a0, $s0, 0x0250 ## $a0 = 00000250 /* 01DD4 80B64794 0C02927F */ jal SkelAnime_FrameUpdateMatrix - -/* 01DD8 80B64798 AFA4004C */ sw $a0, 0x004C($sp) -/* 01DDC 80B6479C 8FAE0064 */ lw $t6, 0x0064($sp) + +/* 01DD8 80B64798 AFA4004C */ sw $a0, 0x004C($sp) +/* 01DDC 80B6479C 8FAE0064 */ lw $t6, 0x0064($sp) /* 01DE0 80B647A0 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 /* 01DE4 80B647A4 4481A000 */ mtc1 $at, $f20 ## $f20 = 1.00 /* 01DE8 80B647A8 91CF07AF */ lbu $t7, 0x07AF($t6) ## 000007AF /* 01DEC 80B647AC 260401E8 */ addiu $a0, $s0, 0x01E8 ## $a0 = 000001E8 -/* 01DF0 80B647B0 4406A000 */ mfc1 $a2, $f20 +/* 01DF0 80B647B0 4406A000 */ mfc1 $a2, $f20 /* 01DF4 80B647B4 448F2000 */ mtc1 $t7, $f4 ## $f4 = 0.00 -/* 01DF8 80B647B8 05E10005 */ bgez $t7, .L80B647D0 -/* 01DFC 80B647BC 46802120 */ cvt.s.w $f4, $f4 +/* 01DF8 80B647B8 05E10005 */ bgez $t7, .L80B647D0 +/* 01DFC 80B647BC 46802120 */ cvt.s.w $f4, $f4 /* 01E00 80B647C0 3C014F80 */ lui $at, 0x4F80 ## $at = 4F800000 /* 01E04 80B647C4 44813000 */ mtc1 $at, $f6 ## $f6 = 4294967296.00 /* 01E08 80B647C8 00000000 */ nop -/* 01E0C 80B647CC 46062100 */ add.s $f4, $f4, $f6 +/* 01E0C 80B647CC 46062100 */ add.s $f4, $f4, $f6 .L80B647D0: -/* 01E10 80B647D0 44052000 */ mfc1 $a1, $f4 +/* 01E10 80B647D0 44052000 */ mfc1 $a1, $f4 /* 01E14 80B647D4 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 01E18 80B647D8 3C074120 */ lui $a3, 0x4120 ## $a3 = 41200000 -/* 01E1C 80B647DC 8FB80064 */ lw $t8, 0x0064($sp) -/* 01E20 80B647E0 4406A000 */ mfc1 $a2, $f20 +/* 01E1C 80B647DC 8FB80064 */ lw $t8, 0x0064($sp) +/* 01E20 80B647E0 4406A000 */ mfc1 $a2, $f20 /* 01E24 80B647E4 260401EC */ addiu $a0, $s0, 0x01EC ## $a0 = 000001EC /* 01E28 80B647E8 931907AF */ lbu $t9, 0x07AF($t8) ## 000007AF /* 01E2C 80B647EC 44994000 */ mtc1 $t9, $f8 ## $f8 = 0.00 -/* 01E30 80B647F0 07210005 */ bgez $t9, .L80B64808 -/* 01E34 80B647F4 46804220 */ cvt.s.w $f8, $f8 +/* 01E30 80B647F0 07210005 */ bgez $t9, .L80B64808 +/* 01E34 80B647F4 46804220 */ cvt.s.w $f8, $f8 /* 01E38 80B647F8 3C014F80 */ lui $at, 0x4F80 ## $at = 4F800000 /* 01E3C 80B647FC 44815000 */ mtc1 $at, $f10 ## $f10 = 4294967296.00 /* 01E40 80B64800 00000000 */ nop -/* 01E44 80B64804 460A4200 */ add.s $f8, $f8, $f10 +/* 01E44 80B64804 460A4200 */ add.s $f8, $f8, $f10 .L80B64808: -/* 01E48 80B64808 44054000 */ mfc1 $a1, $f8 +/* 01E48 80B64808 44054000 */ mfc1 $a1, $f8 /* 01E4C 80B6480C 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 01E50 80B64810 3C074120 */ lui $a3, 0x4120 ## $a3 = 41200000 -/* 01E54 80B64814 8FA80064 */ lw $t0, 0x0064($sp) -/* 01E58 80B64818 4406A000 */ mfc1 $a2, $f20 +/* 01E54 80B64814 8FA80064 */ lw $t0, 0x0064($sp) +/* 01E58 80B64818 4406A000 */ mfc1 $a2, $f20 /* 01E5C 80B6481C 260401F0 */ addiu $a0, $s0, 0x01F0 ## $a0 = 000001F0 /* 01E60 80B64820 910907AF */ lbu $t1, 0x07AF($t0) ## 000007AF /* 01E64 80B64824 3C014F80 */ lui $at, 0x4F80 ## $at = 4F800000 /* 01E68 80B64828 44899000 */ mtc1 $t1, $f18 ## $f18 = 0.00 -/* 01E6C 80B6482C 05210004 */ bgez $t1, .L80B64840 -/* 01E70 80B64830 468094A0 */ cvt.s.w $f18, $f18 +/* 01E6C 80B6482C 05210004 */ bgez $t1, .L80B64840 +/* 01E70 80B64830 468094A0 */ cvt.s.w $f18, $f18 /* 01E74 80B64834 44812000 */ mtc1 $at, $f4 ## $f4 = 4294967296.00 /* 01E78 80B64838 00000000 */ nop -/* 01E7C 80B6483C 46049480 */ add.s $f18, $f18, $f4 +/* 01E7C 80B6483C 46049480 */ add.s $f18, $f18, $f4 .L80B64840: -/* 01E80 80B64840 44059000 */ mfc1 $a1, $f18 +/* 01E80 80B64840 44059000 */ mfc1 $a1, $f18 /* 01E84 80B64844 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 01E88 80B64848 3C074120 */ lui $a3, 0x4120 ## $a3 = 41200000 -/* 01E8C 80B6484C 4406A000 */ mfc1 $a2, $f20 +/* 01E8C 80B6484C 4406A000 */ mfc1 $a2, $f20 /* 01E90 80B64850 260401F4 */ addiu $a0, $s0, 0x01F4 ## $a0 = 000001F4 /* 01E94 80B64854 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 /* 01E98 80B64858 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 01E9C 80B6485C 3C0740A0 */ lui $a3, 0x40A0 ## $a3 = 40A00000 /* 01EA0 80B64860 3C053C3C */ lui $a1, 0x3C3C ## $a1 = 3C3C0000 -/* 01EA4 80B64864 4406A000 */ mfc1 $a2, $f20 +/* 01EA4 80B64864 4406A000 */ mfc1 $a2, $f20 /* 01EA8 80B64868 3C073B03 */ lui $a3, 0x3B03 ## $a3 = 3B030000 /* 01EAC 80B6486C 34E7126F */ ori $a3, $a3, 0x126F ## $a3 = 3B03126F /* 01EB0 80B64870 34A56A7E */ ori $a1, $a1, 0x6A7E ## $a1 = 3C3C6A7E /* 01EB4 80B64874 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 01EB8 80B64878 26040058 */ addiu $a0, $s0, 0x0058 ## $a0 = 00000058 /* 01EBC 80B6487C 860A01D4 */ lh $t2, 0x01D4($s0) ## 000001D4 /* 01EC0 80B64880 3C063DCC */ lui $a2, 0x3DCC ## $a2 = 3DCC0000 /* 01EC4 80B64884 260401A0 */ addiu $a0, $s0, 0x01A0 ## $a0 = 000001A0 -/* 01EC8 80B64888 11400021 */ beq $t2, $zero, .L80B64910 +/* 01EC8 80B64888 11400021 */ beq $t2, $zero, .L80B64910 /* 01ECC 80B6488C 3C073DCC */ lui $a3, 0x3DCC ## $a3 = 3DCC0000 -/* 01ED0 80B64890 4405A000 */ mfc1 $a1, $f20 +/* 01ED0 80B64890 4405A000 */ mfc1 $a1, $f20 /* 01ED4 80B64894 260401A0 */ addiu $a0, $s0, 0x01A0 ## $a0 = 000001A0 /* 01ED8 80B64898 0C01E123 */ jal Math_SmoothDownscaleMaxF - + /* 01EDC 80B6489C 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3DCCCCCD /* 01EE0 80B648A0 860B01D4 */ lh $t3, 0x01D4($s0) ## 000001D4 /* 01EE4 80B648A4 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 01EE8 80B648A8 5561001E */ bnel $t3, $at, .L80B64924 +/* 01EE8 80B648A8 5561001E */ bnel $t3, $at, .L80B64924 /* 01EEC 80B648AC C60401A0 */ lwc1 $f4, 0x01A0($s0) ## 000001A0 /* 01EF0 80B648B0 860C01C2 */ lh $t4, 0x01C2($s0) ## 000001C2 /* 01EF4 80B648B4 3C0180B6 */ lui $at, %hi(D_80B65444) ## $at = 80B60000 -/* 01EF8 80B648B8 C4205444 */ lwc1 $f0, %lo(D_80B65444)($at) +/* 01EF8 80B648B8 C4205444 */ lwc1 $f0, %lo(D_80B65444)($at) /* 01EFC 80B648BC A60C01C4 */ sh $t4, 0x01C4($s0) ## 000001C4 /* 01F00 80B648C0 860D01C4 */ lh $t5, 0x01C4($s0) ## 000001C4 /* 01F04 80B648C4 3C0F80B6 */ lui $t7, %hi(D_80B65190) ## $t7 = 80B60000 /* 01F08 80B648C8 25EF5190 */ addiu $t7, $t7, %lo(D_80B65190) ## $t7 = 80B65190 -/* 01F0C 80B648CC 000D7100 */ sll $t6, $t5, 4 -/* 01F10 80B648D0 01CF1021 */ addu $v0, $t6, $t7 +/* 01F0C 80B648CC 000D7100 */ sll $t6, $t5, 4 +/* 01F10 80B648D0 01CF1021 */ addu $v0, $t6, $t7 /* 01F14 80B648D4 C4460000 */ lwc1 $f6, 0x0000($v0) ## 00000000 /* 01F18 80B648D8 3C014120 */ lui $at, 0x4120 ## $at = 41200000 /* 01F1C 80B648DC 44815000 */ mtc1 $at, $f10 ## $f10 = 10.00 -/* 01F20 80B648E0 46003202 */ mul.s $f8, $f6, $f0 +/* 01F20 80B648E0 46003202 */ mul.s $f8, $f6, $f0 /* 01F24 80B648E4 3C0180B6 */ lui $at, %hi(D_80B65448) ## $at = 80B60000 -/* 01F28 80B648E8 460A4480 */ add.s $f18, $f8, $f10 +/* 01F28 80B648E8 460A4480 */ add.s $f18, $f8, $f10 /* 01F2C 80B648EC E612018C */ swc1 $f18, 0x018C($s0) ## 0000018C /* 01F30 80B648F0 C4440004 */ lwc1 $f4, 0x0004($v0) ## 00000004 /* 01F34 80B648F4 E6040190 */ swc1 $f4, 0x0190($s0) ## 00000190 /* 01F38 80B648F8 C4460008 */ lwc1 $f6, 0x0008($v0) ## 00000008 -/* 01F3C 80B648FC C42A5448 */ lwc1 $f10, %lo(D_80B65448)($at) -/* 01F40 80B64900 46003202 */ mul.s $f8, $f6, $f0 -/* 01F44 80B64904 460A4481 */ sub.s $f18, $f8, $f10 -/* 01F48 80B64908 10000005 */ beq $zero, $zero, .L80B64920 +/* 01F3C 80B648FC C42A5448 */ lwc1 $f10, %lo(D_80B65448)($at) +/* 01F40 80B64900 46003202 */ mul.s $f8, $f6, $f0 +/* 01F44 80B64904 460A4481 */ sub.s $f18, $f8, $f10 +/* 01F48 80B64908 10000005 */ beq $zero, $zero, .L80B64920 /* 01F4C 80B6490C E6120194 */ swc1 $f18, 0x0194($s0) ## 00000194 .L80B64910: -/* 01F50 80B64910 4405A000 */ mfc1 $a1, $f20 -/* 01F54 80B64914 4406A000 */ mfc1 $a2, $f20 +/* 01F50 80B64910 4405A000 */ mfc1 $a1, $f20 +/* 01F54 80B64914 4406A000 */ mfc1 $a2, $f20 /* 01F58 80B64918 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 01F5C 80B6491C 34E7CCCD */ ori $a3, $a3, 0xCCCD ## $a3 = 0000CCCD .L80B64920: /* 01F60 80B64920 C60401A0 */ lwc1 $f4, 0x01A0($s0) ## 000001A0 .L80B64924: /* 01F64 80B64924 C6060198 */ lwc1 $f6, 0x0198($s0) ## 00000198 -/* 01F68 80B64928 4406A000 */ mfc1 $a2, $f20 +/* 01F68 80B64928 4406A000 */ mfc1 $a2, $f20 /* 01F6C 80B6492C 26040024 */ addiu $a0, $s0, 0x0024 ## $a0 = 00000024 -/* 01F70 80B64930 46062202 */ mul.s $f8, $f4, $f6 +/* 01F70 80B64930 46062202 */ mul.s $f8, $f4, $f6 /* 01F74 80B64934 8E05018C */ lw $a1, 0x018C($s0) ## 0000018C -/* 01F78 80B64938 44074000 */ mfc1 $a3, $f8 +/* 01F78 80B64938 44074000 */ mfc1 $a3, $f8 /* 01F7C 80B6493C 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 01F80 80B64940 00000000 */ nop /* 01F84 80B64944 3C063DCC */ lui $a2, 0x3DCC ## $a2 = 3DCC0000 -/* 01F88 80B64948 4407A000 */ mfc1 $a3, $f20 +/* 01F88 80B64948 4407A000 */ mfc1 $a3, $f20 /* 01F8C 80B6494C 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3DCCCCCD /* 01F90 80B64950 26040028 */ addiu $a0, $s0, 0x0028 ## $a0 = 00000028 /* 01F94 80B64954 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 01F98 80B64958 3C054270 */ lui $a1, 0x4270 ## $a1 = 42700000 /* 01F9C 80B6495C C60A01A0 */ lwc1 $f10, 0x01A0($s0) ## 000001A0 /* 01FA0 80B64960 C612019C */ lwc1 $f18, 0x019C($s0) ## 0000019C -/* 01FA4 80B64964 4406A000 */ mfc1 $a2, $f20 +/* 01FA4 80B64964 4406A000 */ mfc1 $a2, $f20 /* 01FA8 80B64968 2604002C */ addiu $a0, $s0, 0x002C ## $a0 = 0000002C -/* 01FAC 80B6496C 46125102 */ mul.s $f4, $f10, $f18 +/* 01FAC 80B6496C 46125102 */ mul.s $f4, $f10, $f18 /* 01FB0 80B64970 8E050194 */ lw $a1, 0x0194($s0) ## 00000194 -/* 01FB4 80B64974 44072000 */ mfc1 $a3, $f4 +/* 01FB4 80B64974 44072000 */ mfc1 $a3, $f4 /* 01FB8 80B64978 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 01FBC 80B6497C 00000000 */ nop /* 01FC0 80B64980 C60E018C */ lwc1 $f14, 0x018C($s0) ## 0000018C /* 01FC4 80B64984 C6060024 */ lwc1 $f6, 0x0024($s0) ## 00000024 /* 01FC8 80B64988 C6100194 */ lwc1 $f16, 0x0194($s0) ## 00000194 /* 01FCC 80B6498C C608002C */ lwc1 $f8, 0x002C($s0) ## 0000002C -/* 01FD0 80B64990 460E3081 */ sub.s $f2, $f6, $f14 +/* 01FD0 80B64990 460E3081 */ sub.s $f2, $f6, $f14 /* 01FD4 80B64994 3C014396 */ lui $at, 0x4396 ## $at = 43960000 /* 01FD8 80B64998 44812000 */ mtc1 $at, $f4 ## $f4 = 300.00 -/* 01FDC 80B6499C 46104301 */ sub.s $f12, $f8, $f16 -/* 01FE0 80B649A0 46021282 */ mul.s $f10, $f2, $f2 +/* 01FDC 80B6499C 46104301 */ sub.s $f12, $f8, $f16 +/* 01FE0 80B649A0 46021282 */ mul.s $f10, $f2, $f2 /* 01FE4 80B649A4 00000000 */ nop -/* 01FE8 80B649A8 460C6482 */ mul.s $f18, $f12, $f12 -/* 01FEC 80B649AC 46125000 */ add.s $f0, $f10, $f18 -/* 01FF0 80B649B0 46000504 */ sqrt.s $f20, $f0 -/* 01FF4 80B649B4 4604A03C */ c.lt.s $f20, $f4 +/* 01FE8 80B649A8 460C6482 */ mul.s $f18, $f12, $f12 +/* 01FEC 80B649AC 46125000 */ add.s $f0, $f10, $f18 +/* 01FF0 80B649B0 46000504 */ sqrt.s $f20, $f0 +/* 01FF4 80B649B4 4604A03C */ c.lt.s $f20, $f4 /* 01FF8 80B649B8 00000000 */ nop -/* 01FFC 80B649BC 45000019 */ bc1f .L80B64A24 +/* 01FFC 80B649BC 45000019 */ bc1f .L80B64A24 /* 02000 80B649C0 00000000 */ nop /* 02004 80B649C4 861801C8 */ lh $t8, 0x01C8($s0) ## 000001C8 /* 02008 80B649C8 24190001 */ addiu $t9, $zero, 0x0001 ## $t9 = 00000001 /* 0200C 80B649CC 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 02010 80B649D0 17000014 */ bne $t8, $zero, .L80B64A24 +/* 02010 80B649D0 17000014 */ bne $t8, $zero, .L80B64A24 /* 02014 80B649D4 2407006D */ addiu $a3, $zero, 0x006D ## $a3 = 0000006D /* 02018 80B649D8 A61901C8 */ sh $t9, 0x01C8($s0) ## 000001C8 -/* 0201C 80B649DC E7AE0010 */ swc1 $f14, 0x0010($sp) +/* 0201C 80B649DC E7AE0010 */ swc1 $f14, 0x0010($sp) /* 02020 80B649E0 3C014248 */ lui $at, 0x4248 ## $at = 42480000 /* 02024 80B649E4 44814000 */ mtc1 $at, $f8 ## $f8 = 50.00 /* 02028 80B649E8 C6060028 */ lwc1 $f6, 0x0028($s0) ## 00000028 -/* 0202C 80B649EC AFA0001C */ sw $zero, 0x001C($sp) -/* 02030 80B649F0 E7B00018 */ swc1 $f16, 0x0018($sp) -/* 02034 80B649F4 46083280 */ add.s $f10, $f6, $f8 -/* 02038 80B649F8 8FA60064 */ lw $a2, 0x0064($sp) +/* 0202C 80B649EC AFA0001C */ sw $zero, 0x001C($sp) +/* 02030 80B649F0 E7B00018 */ swc1 $f16, 0x0018($sp) +/* 02034 80B649F4 46083280 */ add.s $f10, $f6, $f8 +/* 02038 80B649F8 8FA60064 */ lw $a2, 0x0064($sp) /* 0203C 80B649FC 34018000 */ ori $at, $zero, 0x8000 ## $at = 00008000 /* 02040 80B64A00 240B0028 */ addiu $t3, $zero, 0x0028 ## $t3 = 00000028 -/* 02044 80B64A04 E7AA0014 */ swc1 $f10, 0x0014($sp) +/* 02044 80B64A04 E7AA0014 */ swc1 $f10, 0x0014($sp) /* 02048 80B64A08 860900B6 */ lh $t1, 0x00B6($s0) ## 000000B6 -/* 0204C 80B64A0C AFAB0028 */ sw $t3, 0x0028($sp) -/* 02050 80B64A10 AFA00024 */ sw $zero, 0x0024($sp) -/* 02054 80B64A14 01215021 */ addu $t2, $t1, $at -/* 02058 80B64A18 AFAA0020 */ sw $t2, 0x0020($sp) +/* 0204C 80B64A0C AFAB0028 */ sw $t3, 0x0028($sp) +/* 02050 80B64A10 AFA00024 */ sw $zero, 0x0024($sp) +/* 02054 80B64A14 01215021 */ addu $t2, $t1, $at +/* 02058 80B64A18 AFAA0020 */ sw $t2, 0x0020($sp) /* 0205C 80B64A1C 0C00C916 */ jal Actor_SpawnAttached - + /* 02060 80B64A20 24C41C24 */ addiu $a0, $a2, 0x1C24 ## $a0 = 00001C24 .L80B64A24: /* 02064 80B64A24 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 /* 02068 80B64A28 3C0D80B6 */ lui $t5, %hi(func_80B64AA8) ## $t5 = 80B60000 /* 0206C 80B64A2C 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 -/* 02070 80B64A30 4600A032 */ c.eq.s $f20, $f0 +/* 02070 80B64A30 4600A032 */ c.eq.s $f20, $f0 /* 02074 80B64A34 240C008C */ addiu $t4, $zero, 0x008C ## $t4 = 0000008C /* 02078 80B64A38 25AD4AA8 */ addiu $t5, $t5, %lo(func_80B64AA8) ## $t5 = 80B64AA8 /* 0207C 80B64A3C 24A5B4C8 */ addiu $a1, $a1, 0xB4C8 ## $a1 = 0600B4C8 -/* 02080 80B64A40 45020015 */ bc1fl .L80B64A98 -/* 02084 80B64A44 8FBF0044 */ lw $ra, 0x0044($sp) +/* 02080 80B64A40 45020015 */ bc1fl .L80B64A98 +/* 02084 80B64A44 8FBF0044 */ lw $ra, 0x0044($sp) /* 02088 80B64A48 8E020118 */ lw $v0, 0x0118($s0) ## 00000118 /* 0208C 80B64A4C A60C01D4 */ sh $t4, 0x01D4($s0) ## 000001D4 /* 02090 80B64A50 AE0D01FC */ sw $t5, 0x01FC($s0) ## 000001FC -/* 02094 80B64A54 44060000 */ mfc1 $a2, $f0 -/* 02098 80B64A58 8FA4004C */ lw $a0, 0x004C($sp) -/* 0209C 80B64A5C 0C0294D3 */ jal func_800A534C -/* 020A0 80B64A60 AFA20050 */ sw $v0, 0x0050($sp) -/* 020A4 80B64A64 8FA20050 */ lw $v0, 0x0050($sp) +/* 02094 80B64A54 44060000 */ mfc1 $a2, $f0 +/* 02098 80B64A58 8FA4004C */ lw $a0, 0x004C($sp) +/* 0209C 80B64A5C 0C0294D3 */ jal SkelAnime_ChangeAnimTransitionRepeat +/* 020A0 80B64A60 AFA20050 */ sw $v0, 0x0050($sp) +/* 020A4 80B64A64 8FA20050 */ lw $v0, 0x0050($sp) /* 020A8 80B64A68 240F0005 */ addiu $t7, $zero, 0x0005 ## $t7 = 00000005 /* 020AC 80B64A6C 24180001 */ addiu $t8, $zero, 0x0001 ## $t8 = 00000001 /* 020B0 80B64A70 904E00AF */ lbu $t6, 0x00AF($v0) ## 000000AF /* 020B4 80B64A74 24198000 */ addiu $t9, $zero, 0x8000 ## $t9 = FFFF8000 -/* 020B8 80B64A78 29C10019 */ slti $at, $t6, 0x0019 -/* 020BC 80B64A7C 54200004 */ bnel $at, $zero, .L80B64A90 +/* 020B8 80B64A78 29C10019 */ slti $at, $t6, 0x0019 +/* 020BC 80B64A7C 54200004 */ bnel $at, $zero, .L80B64A90 /* 020C0 80B64A80 A05801C9 */ sb $t8, 0x01C9($v0) ## 000001C9 -/* 020C4 80B64A84 10000002 */ beq $zero, $zero, .L80B64A90 +/* 020C4 80B64A84 10000002 */ beq $zero, $zero, .L80B64A90 /* 020C8 80B64A88 A20F014C */ sb $t7, 0x014C($s0) ## 0000014C /* 020CC 80B64A8C A05801C9 */ sb $t8, 0x01C9($v0) ## 000001C9 .L80B64A90: /* 020D0 80B64A90 A61901C6 */ sh $t9, 0x01C6($s0) ## 000001C6 -/* 020D4 80B64A94 8FBF0044 */ lw $ra, 0x0044($sp) +/* 020D4 80B64A94 8FBF0044 */ lw $ra, 0x0044($sp) .L80B64A98: -/* 020D8 80B64A98 D7B40038 */ ldc1 $f20, 0x0038($sp) -/* 020DC 80B64A9C 8FB00040 */ lw $s0, 0x0040($sp) -/* 020E0 80B64AA0 03E00008 */ jr $ra +/* 020D8 80B64A98 D7B40038 */ ldc1 $f20, 0x0038($sp) +/* 020DC 80B64A9C 8FB00040 */ lw $s0, 0x0040($sp) +/* 020E0 80B64AA0 03E00008 */ jr $ra /* 020E4 80B64AA4 27BD0060 */ addiu $sp, $sp, 0x0060 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_End_Title/EndTitle_Draw.s b/asm/non_matchings/overlays/actors/ovl_End_Title/EndTitle_Draw.s index 19bda11c78..c9125d4ab8 100644 --- a/asm/non_matchings/overlays/actors/ovl_End_Title/EndTitle_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_End_Title/EndTitle_Draw.s @@ -12,7 +12,7 @@ glabel EndTitle_Draw /* 00070 80B65790 24070193 */ addiu $a3, $zero, 0x0193 ## $a3 = 00000193 /* 00074 80B65794 AFB800F0 */ sw $t8, 0x00F0($sp) /* 00078 80B65798 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 -/* 0007C 80B6579C 0C031AB1 */ jal func_800C6AC4 +/* 0007C 80B6579C 0C031AB1 */ jal Graph_OpenDisps /* 00080 80B657A0 AFA500EC */ sw $a1, 0x00EC($sp) /* 00084 80B657A4 8FB90104 */ lw $t9, 0x0104($sp) /* 00088 80B657A8 0C024F61 */ jal func_80093D84 @@ -73,7 +73,7 @@ glabel EndTitle_Draw /* 00164 80B65884 AC580000 */ sw $t8, 0x0000($v0) ## 00000000 /* 00168 80B65888 8FAF0104 */ lw $t7, 0x0104($sp) /* 0016C 80B6588C 240701A1 */ addiu $a3, $zero, 0x01A1 ## $a3 = 000001A1 -/* 00170 80B65890 0C031AD5 */ jal func_800C6B54 +/* 00170 80B65890 0C031AD5 */ jal Graph_CloseDisps /* 00174 80B65894 8DE50000 */ lw $a1, 0x0000($t7) ## 00000008 /* 00178 80B65898 8FB90104 */ lw $t9, 0x0104($sp) /* 0017C 80B6589C 3C0680B7 */ lui $a2, %hi(D_80B6988C) ## $a2 = 80B70000 @@ -81,7 +81,7 @@ glabel EndTitle_Draw /* 00184 80B658A4 8F250000 */ lw $a1, 0x0000($t9) ## 00000000 /* 00188 80B658A8 27A400C0 */ addiu $a0, $sp, 0x00C0 ## $a0 = FFFFFFC0 /* 0018C 80B658AC 240701A3 */ addiu $a3, $zero, 0x01A3 ## $a3 = 000001A3 -/* 00190 80B658B0 0C031AB1 */ jal func_800C6AC4 +/* 00190 80B658B0 0C031AB1 */ jal Graph_OpenDisps /* 00194 80B658B4 AFA500D0 */ sw $a1, 0x00D0($sp) /* 00198 80B658B8 8FA400F4 */ lw $a0, 0x00F4($sp) /* 0019C 80B658BC 8FA300D0 */ lw $v1, 0x00D0($sp) @@ -398,7 +398,7 @@ glabel EndTitle_Draw /* 00664 80B65D84 AC5F0004 */ sw $ra, 0x0004($v0) ## 00000004 /* 00668 80B65D88 AC4D0000 */ sw $t5, 0x0000($v0) ## 00000000 /* 0066C 80B65D8C 8FAF0104 */ lw $t7, 0x0104($sp) -/* 00670 80B65D90 0C031AD5 */ jal func_800C6B54 +/* 00670 80B65D90 0C031AD5 */ jal Graph_CloseDisps /* 00674 80B65D94 8DE50000 */ lw $a1, 0x0000($t7) ## E4360300 /* 00678 80B65D98 8FBF0014 */ lw $ra, 0x0014($sp) /* 0067C 80B65D9C 27BD0100 */ addiu $sp, $sp, 0x0100 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_End_Title/func_80B65DA8.s b/asm/non_matchings/overlays/actors/ovl_End_Title/func_80B65DA8.s index 5a14344e9d..f3c837d08f 100644 --- a/asm/non_matchings/overlays/actors/ovl_End_Title/func_80B65DA8.s +++ b/asm/non_matchings/overlays/actors/ovl_End_Title/func_80B65DA8.s @@ -20,7 +20,7 @@ glabel func_80B65DA8 /* 006C8 80B65DE8 24C698B4 */ addiu $a2, $a2, %lo(D_80B698B4) ## $a2 = 80B698B4 /* 006CC 80B65DEC 8F250000 */ lw $a1, 0x0000($t9) ## 00000000 /* 006D0 80B65DF0 24070252 */ addiu $a3, $zero, 0x0252 ## $a3 = 00000252 -/* 006D4 80B65DF4 0C031AB1 */ jal func_800C6AC4 +/* 006D4 80B65DF4 0C031AB1 */ jal Graph_OpenDisps /* 006D8 80B65DF8 AFA50038 */ sw $a1, 0x0038($sp) /* 006DC 80B65DFC 8FA80038 */ lw $t0, 0x0038($sp) /* 006E0 80B65E00 0C024FCD */ jal func_80093F34 @@ -48,7 +48,7 @@ glabel func_80B65DA8 /* 00738 80B65E58 AC580000 */ sw $t8, 0x0000($v0) ## 00000000 /* 0073C 80B65E5C 8FB9004C */ lw $t9, 0x004C($sp) /* 00740 80B65E60 24070258 */ addiu $a3, $zero, 0x0258 ## $a3 = 00000258 -/* 00744 80B65E64 0C031AD5 */ jal func_800C6B54 +/* 00744 80B65E64 0C031AD5 */ jal Graph_CloseDisps /* 00748 80B65E68 8F250000 */ lw $a1, 0x0000($t9) ## 00000000 /* 0074C 80B65E6C 8FBF0014 */ lw $ra, 0x0014($sp) /* 00750 80B65E70 27BD0048 */ addiu $sp, $sp, 0x0048 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Fishing/Fishing_Destroy.s b/asm/non_matchings/overlays/actors/ovl_Fishing/Fishing_Destroy.s index 79fb174d82..333fcfe39e 100644 --- a/asm/non_matchings/overlays/actors/ovl_Fishing/Fishing_Destroy.s +++ b/asm/non_matchings/overlays/actors/ovl_Fishing/Fishing_Destroy.s @@ -1,34 +1,34 @@ glabel Fishing_Destroy /* 0151C 80B6AEBC 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 01520 80B6AEC0 AFBF0014 */ sw $ra, 0x0014($sp) -/* 01524 80B6AEC4 AFA40018 */ sw $a0, 0x0018($sp) +/* 01520 80B6AEC0 AFBF0014 */ sw $ra, 0x0014($sp) +/* 01524 80B6AEC4 AFA40018 */ sw $a0, 0x0018($sp) /* 01528 80B6AEC8 248401D8 */ addiu $a0, $a0, 0x01D8 ## $a0 = 000001D8 -/* 0152C 80B6AECC 0C0295BC */ jal func_800A56F0 -/* 01530 80B6AED0 AFA5001C */ sw $a1, 0x001C($sp) -/* 01534 80B6AED4 8FA30018 */ lw $v1, 0x0018($sp) -/* 01538 80B6AED8 8FA7001C */ lw $a3, 0x001C($sp) +/* 0152C 80B6AECC 0C0295BC */ jal SkelAnime_Free +/* 01530 80B6AED0 AFA5001C */ sw $a1, 0x001C($sp) +/* 01534 80B6AED4 8FA30018 */ lw $v1, 0x0018($sp) +/* 01538 80B6AED8 8FA7001C */ lw $a3, 0x001C($sp) /* 0153C 80B6AEDC 240100C8 */ addiu $at, $zero, 0x00C8 ## $at = 000000C8 /* 01540 80B6AEE0 8462001C */ lh $v0, 0x001C($v1) ## 0000001C /* 01544 80B6AEE4 00E02025 */ or $a0, $a3, $zero ## $a0 = 00000000 /* 01548 80B6AEE8 24E507A8 */ addiu $a1, $a3, 0x07A8 ## $a1 = 000007A8 -/* 0154C 80B6AEEC 54410006 */ bnel $v0, $at, .L80B6AF08 +/* 0154C 80B6AEEC 54410006 */ bnel $v0, $at, .L80B6AF08 /* 01550 80B6AEF0 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 /* 01554 80B6AEF4 0C01E9F1 */ jal Lights_Remove - + /* 01558 80B6AEF8 8C66021C */ lw $a2, 0x021C($v1) ## 0000021C -/* 0155C 80B6AEFC 10000007 */ beq $zero, $zero, .L80B6AF1C -/* 01560 80B6AF00 8FBF0014 */ lw $ra, 0x0014($sp) +/* 0155C 80B6AEFC 10000007 */ beq $zero, $zero, .L80B6AF1C +/* 01560 80B6AF00 8FBF0014 */ lw $ra, 0x0014($sp) /* 01564 80B6AF04 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 .L80B6AF08: -/* 01568 80B6AF08 14410003 */ bne $v0, $at, .L80B6AF18 +/* 01568 80B6AF08 14410003 */ bne $v0, $at, .L80B6AF18 /* 0156C 80B6AF0C 00E02025 */ or $a0, $a3, $zero ## $a0 = 00000000 -/* 01570 80B6AF10 0C016F32 */ jal func_8005BCC8 +/* 01570 80B6AF10 0C016F32 */ jal func_8005BCC8 /* 01574 80B6AF14 24650230 */ addiu $a1, $v1, 0x0230 ## $a1 = 00000230 .L80B6AF18: -/* 01578 80B6AF18 8FBF0014 */ lw $ra, 0x0014($sp) +/* 01578 80B6AF18 8FBF0014 */ lw $ra, 0x0014($sp) .L80B6AF1C: /* 0157C 80B6AF1C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 01580 80B6AF20 03E00008 */ jr $ra +/* 01580 80B6AF20 03E00008 */ jr $ra /* 01584 80B6AF24 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Fishing/Fishing_Draw.s b/asm/non_matchings/overlays/actors/ovl_Fishing/Fishing_Draw.s index 88e491a108..5c84781036 100644 --- a/asm/non_matchings/overlays/actors/ovl_Fishing/Fishing_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Fishing/Fishing_Draw.s @@ -1,94 +1,94 @@ glabel Fishing_Draw /* 0C444 80B75DE4 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 0C448 80B75DE8 AFB00028 */ sw $s0, 0x0028($sp) +/* 0C448 80B75DE8 AFB00028 */ sw $s0, 0x0028($sp) /* 0C44C 80B75DEC 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 0C450 80B75DF0 AFBF002C */ sw $ra, 0x002C($sp) -/* 0C454 80B75DF4 AFA50034 */ sw $a1, 0x0034($sp) -/* 0C458 80B75DF8 0C024F46 */ jal func_80093D18 +/* 0C450 80B75DF0 AFBF002C */ sw $ra, 0x002C($sp) +/* 0C454 80B75DF4 AFA50034 */ sw $a1, 0x0034($sp) +/* 0C458 80B75DF8 0C024F46 */ jal func_80093D18 /* 0C45C 80B75DFC 8CA40000 */ lw $a0, 0x0000($a1) ## 00000000 /* 0C460 80B75E00 C60C0024 */ lwc1 $f12, 0x0024($s0) ## 00000024 /* 0C464 80B75E04 C60E0028 */ lwc1 $f14, 0x0028($s0) ## 00000028 /* 0C468 80B75E08 8E06002C */ lw $a2, 0x002C($s0) ## 0000002C -/* 0C46C 80B75E0C 0C034261 */ jal Matrix_Translate +/* 0C46C 80B75E0C 0C034261 */ jal Matrix_Translate /* 0C470 80B75E10 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 /* 0C474 80B75E14 860F0162 */ lh $t7, 0x0162($s0) ## 00000162 /* 0C478 80B75E18 861800B6 */ lh $t8, 0x00B6($s0) ## 000000B6 /* 0C47C 80B75E1C 3C014700 */ lui $at, 0x4700 ## $at = 47000000 /* 0C480 80B75E20 44814000 */ mtc1 $at, $f8 ## $f8 = 32768.00 -/* 0C484 80B75E24 01F8C821 */ addu $t9, $t7, $t8 +/* 0C484 80B75E24 01F8C821 */ addu $t9, $t7, $t8 /* 0C488 80B75E28 44992000 */ mtc1 $t9, $f4 ## $f4 = 0.00 /* 0C48C 80B75E2C 3C0180B8 */ lui $at, %hi(D_80B7B758) ## $at = 80B80000 -/* 0C490 80B75E30 C430B758 */ lwc1 $f16, %lo(D_80B7B758)($at) -/* 0C494 80B75E34 468021A0 */ cvt.s.w $f6, $f4 +/* 0C490 80B75E30 C430B758 */ lwc1 $f16, %lo(D_80B7B758)($at) +/* 0C494 80B75E34 468021A0 */ cvt.s.w $f6, $f4 /* 0C498 80B75E38 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 -/* 0C49C 80B75E3C 46083283 */ div.s $f10, $f6, $f8 -/* 0C4A0 80B75E40 46105302 */ mul.s $f12, $f10, $f16 -/* 0C4A4 80B75E44 0C034348 */ jal Matrix_RotateY +/* 0C49C 80B75E3C 46083283 */ div.s $f10, $f6, $f8 +/* 0C4A0 80B75E40 46105302 */ mul.s $f12, $f10, $f16 +/* 0C4A4 80B75E44 0C034348 */ jal Matrix_RotateY /* 0C4A8 80B75E48 00000000 */ nop /* 0C4AC 80B75E4C 86080160 */ lh $t0, 0x0160($s0) ## 00000160 /* 0C4B0 80B75E50 860900B4 */ lh $t1, 0x00B4($s0) ## 000000B4 /* 0C4B4 80B75E54 3C014700 */ lui $at, 0x4700 ## $at = 47000000 /* 0C4B8 80B75E58 44813000 */ mtc1 $at, $f6 ## $f6 = 32768.00 -/* 0C4BC 80B75E5C 01095021 */ addu $t2, $t0, $t1 +/* 0C4BC 80B75E5C 01095021 */ addu $t2, $t0, $t1 /* 0C4C0 80B75E60 448A9000 */ mtc1 $t2, $f18 ## $f18 = 0.00 /* 0C4C4 80B75E64 3C0180B8 */ lui $at, %hi(D_80B7B75C) ## $at = 80B80000 -/* 0C4C8 80B75E68 C42AB75C */ lwc1 $f10, %lo(D_80B7B75C)($at) -/* 0C4CC 80B75E6C 46809120 */ cvt.s.w $f4, $f18 +/* 0C4C8 80B75E68 C42AB75C */ lwc1 $f10, %lo(D_80B7B75C)($at) +/* 0C4CC 80B75E6C 46809120 */ cvt.s.w $f4, $f18 /* 0C4D0 80B75E70 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 -/* 0C4D4 80B75E74 46062203 */ div.s $f8, $f4, $f6 -/* 0C4D8 80B75E78 460A4302 */ mul.s $f12, $f8, $f10 -/* 0C4DC 80B75E7C 0C0342DC */ jal Matrix_RotateX +/* 0C4D4 80B75E74 46062203 */ div.s $f8, $f4, $f6 +/* 0C4D8 80B75E78 460A4302 */ mul.s $f12, $f8, $f10 +/* 0C4DC 80B75E7C 0C0342DC */ jal Matrix_RotateX /* 0C4E0 80B75E80 00000000 */ nop /* 0C4E4 80B75E84 860B0164 */ lh $t3, 0x0164($s0) ## 00000164 /* 0C4E8 80B75E88 860C00B8 */ lh $t4, 0x00B8($s0) ## 000000B8 /* 0C4EC 80B75E8C 3C014700 */ lui $at, 0x4700 ## $at = 47000000 /* 0C4F0 80B75E90 44812000 */ mtc1 $at, $f4 ## $f4 = 32768.00 -/* 0C4F4 80B75E94 016C6821 */ addu $t5, $t3, $t4 +/* 0C4F4 80B75E94 016C6821 */ addu $t5, $t3, $t4 /* 0C4F8 80B75E98 448D8000 */ mtc1 $t5, $f16 ## $f16 = 0.00 /* 0C4FC 80B75E9C 3C0180B8 */ lui $at, %hi(D_80B7B760) ## $at = 80B80000 -/* 0C500 80B75EA0 C428B760 */ lwc1 $f8, %lo(D_80B7B760)($at) -/* 0C504 80B75EA4 468084A0 */ cvt.s.w $f18, $f16 +/* 0C500 80B75EA0 C428B760 */ lwc1 $f8, %lo(D_80B7B760)($at) +/* 0C504 80B75EA4 468084A0 */ cvt.s.w $f18, $f16 /* 0C508 80B75EA8 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 -/* 0C50C 80B75EAC 46049183 */ div.s $f6, $f18, $f4 -/* 0C510 80B75EB0 46083302 */ mul.s $f12, $f6, $f8 -/* 0C514 80B75EB4 0C0343B5 */ jal Matrix_RotateZ +/* 0C50C 80B75EAC 46049183 */ div.s $f6, $f18, $f4 +/* 0C510 80B75EB0 46083302 */ mul.s $f12, $f6, $f8 +/* 0C514 80B75EB4 0C0343B5 */ jal Matrix_RotateZ /* 0C518 80B75EB8 00000000 */ nop /* 0C51C 80B75EBC C60C0050 */ lwc1 $f12, 0x0050($s0) ## 00000050 /* 0C520 80B75EC0 C60E0054 */ lwc1 $f14, 0x0054($s0) ## 00000054 /* 0C524 80B75EC4 8E060058 */ lw $a2, 0x0058($s0) ## 00000058 -/* 0C528 80B75EC8 0C0342A3 */ jal Matrix_Scale +/* 0C528 80B75EC8 0C0342A3 */ jal Matrix_Scale /* 0C52C 80B75ECC 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 /* 0C530 80B75ED0 920E0150 */ lbu $t6, 0x0150($s0) ## 00000150 /* 0C534 80B75ED4 3C06453B */ lui $a2, 0x453B ## $a2 = 453B0000 /* 0C538 80B75ED8 34C68000 */ ori $a2, $a2, 0x8000 ## $a2 = 453B8000 -/* 0C53C 80B75EDC 55C0002B */ bnel $t6, $zero, .L80B75F8C +/* 0C53C 80B75EDC 55C0002B */ bnel $t6, $zero, .L80B75F8C /* 0C540 80B75EE0 44806000 */ mtc1 $zero, $f12 ## $f12 = 0.00 /* 0C544 80B75EE4 860F016C */ lh $t7, 0x016C($s0) ## 0000016C /* 0C548 80B75EE8 3C0180B8 */ lui $at, %hi(D_80B7B764) ## $at = 80B80000 -/* 0C54C 80B75EEC C432B764 */ lwc1 $f18, %lo(D_80B7B764)($at) +/* 0C54C 80B75EEC C432B764 */ lwc1 $f18, %lo(D_80B7B764)($at) /* 0C550 80B75EF0 448F5000 */ mtc1 $t7, $f10 ## $f10 = 0.00 /* 0C554 80B75EF4 3C0180B8 */ lui $at, %hi(D_80B7B768) ## $at = 80B80000 -/* 0C558 80B75EF8 C426B768 */ lwc1 $f6, %lo(D_80B7B768)($at) -/* 0C55C 80B75EFC 46805420 */ cvt.s.w $f16, $f10 +/* 0C558 80B75EF8 C426B768 */ lwc1 $f6, %lo(D_80B7B768)($at) +/* 0C55C 80B75EFC 46805420 */ cvt.s.w $f16, $f10 /* 0C560 80B75F00 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 -/* 0C564 80B75F04 46128102 */ mul.s $f4, $f16, $f18 -/* 0C568 80B75F08 0C034348 */ jal Matrix_RotateY -/* 0C56C 80B75F0C 46062301 */ sub.s $f12, $f4, $f6 +/* 0C564 80B75F04 46128102 */ mul.s $f4, $f16, $f18 +/* 0C568 80B75F08 0C034348 */ jal Matrix_RotateY +/* 0C56C 80B75F0C 46062301 */ sub.s $f12, $f4, $f6 /* 0C570 80B75F10 8618016C */ lh $t8, 0x016C($s0) ## 0000016C /* 0C574 80B75F14 3C014120 */ lui $at, 0x4120 ## $at = 41200000 /* 0C578 80B75F18 44818000 */ mtc1 $at, $f16 ## $f16 = 10.00 /* 0C57C 80B75F1C 44984000 */ mtc1 $t8, $f8 ## $f8 = 0.00 /* 0C580 80B75F20 3C0180B8 */ lui $at, %hi(D_80B7B76C) ## $at = 80B80000 -/* 0C584 80B75F24 C424B76C */ lwc1 $f4, %lo(D_80B7B76C)($at) -/* 0C588 80B75F28 468042A0 */ cvt.s.w $f10, $f8 +/* 0C584 80B75F24 C424B76C */ lwc1 $f4, %lo(D_80B7B76C)($at) +/* 0C588 80B75F28 468042A0 */ cvt.s.w $f10, $f8 /* 0C58C 80B75F2C 44806000 */ mtc1 $zero, $f12 ## $f12 = 0.00 /* 0C590 80B75F30 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 0C594 80B75F34 46006386 */ mov.s $f14, $f12 -/* 0C598 80B75F38 46105482 */ mul.s $f18, $f10, $f16 +/* 0C594 80B75F34 46006386 */ mov.s $f14, $f12 +/* 0C598 80B75F38 46105482 */ mul.s $f18, $f10, $f16 /* 0C59C 80B75F3C 00000000 */ nop -/* 0C5A0 80B75F40 46049182 */ mul.s $f6, $f18, $f4 -/* 0C5A4 80B75F44 44063000 */ mfc1 $a2, $f6 -/* 0C5A8 80B75F48 0C034261 */ jal Matrix_Translate +/* 0C5A0 80B75F40 46049182 */ mul.s $f6, $f18, $f4 +/* 0C5A4 80B75F44 44063000 */ mfc1 $a2, $f6 +/* 0C5A8 80B75F48 0C034261 */ jal Matrix_Translate /* 0C5AC 80B75F4C 00000000 */ nop /* 0C5B0 80B75F50 8E0501DC */ lw $a1, 0x01DC($s0) ## 000001DC /* 0C5B4 80B75F54 8E0601F8 */ lw $a2, 0x01F8($s0) ## 000001F8 @@ -97,36 +97,36 @@ glabel Fishing_Draw /* 0C5C0 80B75F60 3C0880B7 */ lui $t0, %hi(func_80B75CE0) ## $t0 = 80B70000 /* 0C5C4 80B75F64 25085CE0 */ addiu $t0, $t0, %lo(func_80B75CE0) ## $t0 = 80B75CE0 /* 0C5C8 80B75F68 27395BAC */ addiu $t9, $t9, %lo(func_80B75BAC) ## $t9 = 80B75BAC -/* 0C5CC 80B75F6C AFB90010 */ sw $t9, 0x0010($sp) -/* 0C5D0 80B75F70 AFA80014 */ sw $t0, 0x0014($sp) -/* 0C5D4 80B75F74 AFB00018 */ sw $s0, 0x0018($sp) -/* 0C5D8 80B75F78 0C0286B2 */ jal func_800A1AC8 -/* 0C5DC 80B75F7C 8FA40034 */ lw $a0, 0x0034($sp) -/* 0C5E0 80B75F80 10000025 */ beq $zero, $zero, .L80B76018 -/* 0C5E4 80B75F84 8FBF002C */ lw $ra, 0x002C($sp) +/* 0C5CC 80B75F6C AFB90010 */ sw $t9, 0x0010($sp) +/* 0C5D0 80B75F70 AFA80014 */ sw $t0, 0x0014($sp) +/* 0C5D4 80B75F74 AFB00018 */ sw $s0, 0x0018($sp) +/* 0C5D8 80B75F78 0C0286B2 */ jal SkelAnime_DrawSV +/* 0C5DC 80B75F7C 8FA40034 */ lw $a0, 0x0034($sp) +/* 0C5E0 80B75F80 10000025 */ beq $zero, $zero, .L80B76018 +/* 0C5E4 80B75F84 8FBF002C */ lw $ra, 0x002C($sp) /* 0C5E8 80B75F88 44806000 */ mtc1 $zero, $f12 ## $f12 = 0.00 .L80B75F8C: /* 0C5EC 80B75F8C 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 0C5F0 80B75F90 0C034261 */ jal Matrix_Translate -/* 0C5F4 80B75F94 46006386 */ mov.s $f14, $f12 +/* 0C5F0 80B75F90 0C034261 */ jal Matrix_Translate +/* 0C5F4 80B75F94 46006386 */ mov.s $f14, $f12 /* 0C5F8 80B75F98 8609016C */ lh $t1, 0x016C($s0) ## 0000016C /* 0C5FC 80B75F9C 3C0180B8 */ lui $at, %hi(D_80B7B770) ## $at = 80B80000 -/* 0C600 80B75FA0 C430B770 */ lwc1 $f16, %lo(D_80B7B770)($at) +/* 0C600 80B75FA0 C430B770 */ lwc1 $f16, %lo(D_80B7B770)($at) /* 0C604 80B75FA4 44894000 */ mtc1 $t1, $f8 ## $f8 = 0.00 /* 0C608 80B75FA8 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 -/* 0C60C 80B75FAC 468042A0 */ cvt.s.w $f10, $f8 -/* 0C610 80B75FB0 46105302 */ mul.s $f12, $f10, $f16 -/* 0C614 80B75FB4 0C034348 */ jal Matrix_RotateY +/* 0C60C 80B75FAC 468042A0 */ cvt.s.w $f10, $f8 +/* 0C610 80B75FB0 46105302 */ mul.s $f12, $f10, $f16 +/* 0C614 80B75FB4 0C034348 */ jal Matrix_RotateY /* 0C618 80B75FB8 00000000 */ nop /* 0C61C 80B75FBC 44806000 */ mtc1 $zero, $f12 ## $f12 = 0.00 /* 0C620 80B75FC0 3C06C53B */ lui $a2, 0xC53B ## $a2 = C53B0000 /* 0C624 80B75FC4 34C68000 */ ori $a2, $a2, 0x8000 ## $a2 = C53B8000 /* 0C628 80B75FC8 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 0C62C 80B75FCC 0C034261 */ jal Matrix_Translate -/* 0C630 80B75FD0 46006386 */ mov.s $f14, $f12 +/* 0C62C 80B75FCC 0C034261 */ jal Matrix_Translate +/* 0C630 80B75FD0 46006386 */ mov.s $f14, $f12 /* 0C634 80B75FD4 3C0180B8 */ lui $at, %hi(D_80B7B774) ## $at = 80B80000 -/* 0C638 80B75FD8 C42CB774 */ lwc1 $f12, %lo(D_80B7B774)($at) -/* 0C63C 80B75FDC 0C034348 */ jal Matrix_RotateY +/* 0C638 80B75FD8 C42CB774 */ lwc1 $f12, %lo(D_80B7B774)($at) +/* 0C63C 80B75FDC 0C034348 */ jal Matrix_RotateY /* 0C640 80B75FE0 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 /* 0C644 80B75FE4 8E0501DC */ lw $a1, 0x01DC($s0) ## 000001DC /* 0C648 80B75FE8 8E0601F8 */ lw $a2, 0x01F8($s0) ## 000001F8 @@ -135,16 +135,16 @@ glabel Fishing_Draw /* 0C654 80B75FF4 3C0B80B7 */ lui $t3, %hi(func_80B75DA4) ## $t3 = 80B70000 /* 0C658 80B75FF8 256B5DA4 */ addiu $t3, $t3, %lo(func_80B75DA4) ## $t3 = 80B75DA4 /* 0C65C 80B75FFC 254A5D20 */ addiu $t2, $t2, %lo(func_80B75D20) ## $t2 = 80B75D20 -/* 0C660 80B76000 AFAA0010 */ sw $t2, 0x0010($sp) -/* 0C664 80B76004 AFAB0014 */ sw $t3, 0x0014($sp) -/* 0C668 80B76008 AFB00018 */ sw $s0, 0x0018($sp) -/* 0C66C 80B7600C 0C0286B2 */ jal func_800A1AC8 -/* 0C670 80B76010 8FA40034 */ lw $a0, 0x0034($sp) -/* 0C674 80B76014 8FBF002C */ lw $ra, 0x002C($sp) +/* 0C660 80B76000 AFAA0010 */ sw $t2, 0x0010($sp) +/* 0C664 80B76004 AFAB0014 */ sw $t3, 0x0014($sp) +/* 0C668 80B76008 AFB00018 */ sw $s0, 0x0018($sp) +/* 0C66C 80B7600C 0C0286B2 */ jal SkelAnime_DrawSV +/* 0C670 80B76010 8FA40034 */ lw $a0, 0x0034($sp) +/* 0C674 80B76014 8FBF002C */ lw $ra, 0x002C($sp) .L80B76018: -/* 0C678 80B76018 8FB00028 */ lw $s0, 0x0028($sp) +/* 0C678 80B76018 8FB00028 */ lw $s0, 0x0028($sp) /* 0C67C 80B7601C 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 0C680 80B76020 03E00008 */ jr $ra +/* 0C680 80B76020 03E00008 */ jr $ra /* 0C684 80B76024 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Fishing/Fishing_Init.s b/asm/non_matchings/overlays/actors/ovl_Fishing/Fishing_Init.s index cd306fd65c..bad1555428 100644 --- a/asm/non_matchings/overlays/actors/ovl_Fishing/Fishing_Init.s +++ b/asm/non_matchings/overlays/actors/ovl_Fishing/Fishing_Init.s @@ -1,25 +1,25 @@ glabel Fishing_Init /* 00BA0 80B6A540 27BDFF88 */ addiu $sp, $sp, 0xFF88 ## $sp = FFFFFF88 -/* 00BA4 80B6A544 AFB30050 */ sw $s3, 0x0050($sp) +/* 00BA4 80B6A544 AFB30050 */ sw $s3, 0x0050($sp) /* 00BA8 80B6A548 00A09825 */ or $s3, $a1, $zero ## $s3 = 00000000 -/* 00BAC 80B6A54C AFBF0054 */ sw $ra, 0x0054($sp) -/* 00BB0 80B6A550 AFB2004C */ sw $s2, 0x004C($sp) +/* 00BAC 80B6A54C AFBF0054 */ sw $ra, 0x0054($sp) +/* 00BB0 80B6A550 AFB2004C */ sw $s2, 0x004C($sp) /* 00BB4 80B6A554 3C0580B8 */ lui $a1, %hi(D_80B7AE50) ## $a1 = 80B80000 /* 00BB8 80B6A558 00809025 */ or $s2, $a0, $zero ## $s2 = 00000000 -/* 00BBC 80B6A55C AFB10048 */ sw $s1, 0x0048($sp) -/* 00BC0 80B6A560 AFB00044 */ sw $s0, 0x0044($sp) -/* 00BC4 80B6A564 F7B60038 */ sdc1 $f22, 0x0038($sp) -/* 00BC8 80B6A568 F7B40030 */ sdc1 $f20, 0x0030($sp) +/* 00BBC 80B6A55C AFB10048 */ sw $s1, 0x0048($sp) +/* 00BC0 80B6A560 AFB00044 */ sw $s0, 0x0044($sp) +/* 00BC4 80B6A564 F7B60038 */ sdc1 $f22, 0x0038($sp) +/* 00BC8 80B6A568 F7B40030 */ sdc1 $f20, 0x0030($sp) /* 00BCC 80B6A56C 0C01E037 */ jal Actor_ProcessInitChain - + /* 00BD0 80B6A570 24A5AE50 */ addiu $a1, $a1, %lo(D_80B7AE50) ## $a1 = 80B7AE50 /* 00BD4 80B6A574 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 /* 00BD8 80B6A578 264400B4 */ addiu $a0, $s2, 0x00B4 ## $a0 = 000000B4 /* 00BDC 80B6A57C 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 00BE0 80B6A580 44050000 */ mfc1 $a1, $f0 -/* 00BE4 80B6A584 44070000 */ mfc1 $a3, $f0 +/* 00BE0 80B6A580 44050000 */ mfc1 $a1, $f0 +/* 00BE4 80B6A584 44070000 */ mfc1 $a3, $f0 /* 00BE8 80B6A588 0C00AC78 */ jal ActorShape_Init - + /* 00BEC 80B6A58C 00000000 */ nop /* 00BF0 80B6A590 3C0E8016 */ lui $t6, 0x8016 ## $t6 = 80160000 /* 00BF4 80B6A594 8DCEFA90 */ lw $t6, -0x0570($t6) ## 8015FA90 @@ -28,37 +28,37 @@ glabel Fishing_Init /* 00C00 80B6A5A0 85CF09DE */ lh $t7, 0x09DE($t6) ## 801609DE /* 00C04 80B6A5A4 24180001 */ addiu $t8, $zero, 0x0001 ## $t8 = 00000001 /* 00C08 80B6A5A8 3C0180B8 */ lui $at, %hi(D_80B7E075) ## $at = 80B80000 -/* 00C0C 80B6A5AC 11E00005 */ beq $t7, $zero, .L80B6A5C4 +/* 00C0C 80B6A5AC 11E00005 */ beq $t7, $zero, .L80B6A5C4 /* 00C10 80B6A5B0 3C1080B8 */ lui $s0, %hi(D_80B7E070) ## $s0 = 80B80000 /* 00C14 80B6A5B4 3C118016 */ lui $s1, 0x8016 ## $s1 = 80160000 /* 00C18 80B6A5B8 2631E660 */ addiu $s1, $s1, 0xE660 ## $s1 = 8015E660 -/* 00C1C 80B6A5BC 10000004 */ beq $zero, $zero, .L80B6A5D0 -/* 00C20 80B6A5C0 A038E075 */ sb $t8, %lo(D_80B7E075)($at) +/* 00C1C 80B6A5BC 10000004 */ beq $zero, $zero, .L80B6A5D0 +/* 00C20 80B6A5C0 A038E075 */ sb $t8, %lo(D_80B7E075)($at) .L80B6A5C4: /* 00C24 80B6A5C4 8E390004 */ lw $t9, 0x0004($s1) ## 8015E664 /* 00C28 80B6A5C8 3C0180B8 */ lui $at, %hi(D_80B7E075) ## $at = 80B80000 -/* 00C2C 80B6A5CC A039E075 */ sb $t9, %lo(D_80B7E075)($at) +/* 00C2C 80B6A5CC A039E075 */ sb $t9, %lo(D_80B7E075)($at) .L80B6A5D0: /* 00C30 80B6A5D0 8642001C */ lh $v0, 0x001C($s2) ## 0000001C /* 00C34 80B6A5D4 2610E070 */ addiu $s0, $s0, %lo(D_80B7E070) ## $s0 = 80B7E070 -/* 00C38 80B6A5D8 28410064 */ slti $at, $v0, 0x0064 -/* 00C3C 80B6A5DC 102001A7 */ beq $at, $zero, .L80B6AC7C +/* 00C38 80B6A5D8 28410064 */ slti $at, $v0, 0x0064 +/* 00C3C 80B6A5DC 102001A7 */ beq $at, $zero, .L80B6AC7C /* 00C40 80B6A5E0 3C0180B8 */ lui $at, %hi(D_80B7E074) ## $at = 80B80000 -/* 00C44 80B6A5E4 A020E074 */ sb $zero, %lo(D_80B7E074)($at) +/* 00C44 80B6A5E4 A020E074 */ sb $zero, %lo(D_80B7E074)($at) /* 00C48 80B6A5E8 3C0180B8 */ lui $at, %hi(D_80B7E070) ## $at = 80B80000 -/* 00C4C 80B6A5EC AC32E070 */ sw $s2, %lo(D_80B7E070)($at) +/* 00C4C 80B6A5EC AC32E070 */ sw $s2, %lo(D_80B7E070)($at) /* 00C50 80B6A5F0 8E050000 */ lw $a1, 0x0000($s0) ## 80B7E070 /* 00C54 80B6A5F4 02602025 */ or $a0, $s3, $zero ## $a0 = 00000000 -/* 00C58 80B6A5F8 0C016EFE */ jal func_8005BBF8 +/* 00C58 80B6A5F8 0C016EFE */ jal func_8005BBF8 /* 00C5C 80B6A5FC 24A50230 */ addiu $a1, $a1, 0x0230 ## $a1 = 00000230 /* 00C60 80B6A600 8E030000 */ lw $v1, 0x0000($s0) ## 80B7E070 /* 00C64 80B6A604 3C0780B8 */ lui $a3, %hi(D_80B7A888) ## $a3 = 80B80000 /* 00C68 80B6A608 24E7A888 */ addiu $a3, $a3, %lo(D_80B7A888) ## $a3 = 80B7A888 /* 00C6C 80B6A60C 24680250 */ addiu $t0, $v1, 0x0250 ## $t0 = 00000250 -/* 00C70 80B6A610 AFA80010 */ sw $t0, 0x0010($sp) +/* 00C70 80B6A610 AFA80010 */ sw $t0, 0x0010($sp) /* 00C74 80B6A614 02602025 */ or $a0, $s3, $zero ## $a0 = 00000000 /* 00C78 80B6A618 02403025 */ or $a2, $s2, $zero ## $a2 = 00000000 -/* 00C7C 80B6A61C 0C017014 */ jal func_8005C050 +/* 00C7C 80B6A61C 0C017014 */ jal func_8005C050 /* 00C80 80B6A620 24650230 */ addiu $a1, $v1, 0x0230 ## $a1 = 00000230 /* 00C84 80B6A624 24090001 */ addiu $t1, $zero, 0x0001 ## $t1 = 00000001 /* 00C88 80B6A628 A649001C */ sh $t1, 0x001C($s2) ## 0000001C @@ -68,15 +68,15 @@ glabel Fishing_Init /* 00C98 80B6A638 24E7453C */ addiu $a3, $a3, 0x453C ## $a3 = 0600453C /* 00C9C 80B6A63C 24C685F8 */ addiu $a2, $a2, 0x85F8 ## $a2 = 060085F8 /* 00CA0 80B6A640 02002825 */ or $a1, $s0, $zero ## $a1 = 000001D8 -/* 00CA4 80B6A644 AFA00018 */ sw $zero, 0x0018($sp) -/* 00CA8 80B6A648 AFA00014 */ sw $zero, 0x0014($sp) -/* 00CAC 80B6A64C AFA00010 */ sw $zero, 0x0010($sp) -/* 00CB0 80B6A650 0C0291BE */ jal func_800A46F8 +/* 00CA4 80B6A644 AFA00018 */ sw $zero, 0x0018($sp) +/* 00CA8 80B6A648 AFA00014 */ sw $zero, 0x0014($sp) +/* 00CAC 80B6A64C AFA00010 */ sw $zero, 0x0010($sp) +/* 00CB0 80B6A650 0C0291BE */ jal SkelAnime_InitSV /* 00CB4 80B6A654 02602025 */ or $a0, $s3, $zero ## $a0 = 00000000 /* 00CB8 80B6A658 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 00CBC 80B6A65C 24A5453C */ addiu $a1, $a1, 0x453C ## $a1 = 0600453C /* 00CC0 80B6A660 02002025 */ or $a0, $s0, $zero ## $a0 = 000001D8 -/* 00CC4 80B6A664 0C0294D3 */ jal func_800A534C +/* 00CC4 80B6A664 0C0294D3 */ jal SkelAnime_ChangeAnimTransitionRepeat /* 00CC8 80B6A668 24060000 */ addiu $a2, $zero, 0x0000 ## $a2 = 00000000 /* 00CCC 80B6A66C 3C014320 */ lui $at, 0x4320 ## $at = 43200000 /* 00CD0 80B6A670 44812000 */ mtc1 $at, $f4 ## $f4 = 160.00 @@ -98,7 +98,7 @@ glabel Fishing_Init /* 00D10 80B6A6B0 E6440024 */ swc1 $f4, 0x0024($s2) ## 00000024 /* 00D14 80B6A6B4 E6460028 */ swc1 $f6, 0x0028($s2) ## 00000028 /* 00D18 80B6A6B8 0C00B58B */ jal Actor_SetScale - + /* 00D1C 80B6A6BC E648002C */ swc1 $f8, 0x002C($s2) ## 0000002C /* 00D20 80B6A6C0 8E4D0028 */ lw $t5, 0x0028($s2) ## 00000028 /* 00D24 80B6A6C4 3C014296 */ lui $at, 0x4296 ## $at = 42960000 @@ -108,248 +108,248 @@ glabel Fishing_Init /* 00D34 80B6A6D4 44818000 */ mtc1 $at, $f16 ## $f16 = 75.00 /* 00D38 80B6A6D8 8E4F0004 */ lw $t7, 0x0004($s2) ## 00000004 /* 00D3C 80B6A6DC AE4E0038 */ sw $t6, 0x0038($s2) ## 00000038 -/* 00D40 80B6A6E0 46105480 */ add.s $f18, $f10, $f16 +/* 00D40 80B6A6E0 46105480 */ add.s $f18, $f10, $f16 /* 00D44 80B6A6E4 8E4E002C */ lw $t6, 0x002C($s2) ## 0000002C /* 00D48 80B6A6E8 35F80009 */ ori $t8, $t7, 0x0009 ## $t8 = 00000009 /* 00D4C 80B6A6EC AE580004 */ sw $t8, 0x0004($s2) ## 00000004 /* 00D50 80B6A6F0 E652003C */ swc1 $f18, 0x003C($s2) ## 0000003C /* 00D54 80B6A6F4 3C1980B8 */ lui $t9, %hi(D_80B7E075) ## $t9 = 80B80000 /* 00D58 80B6A6F8 AE4E0040 */ sw $t6, 0x0040($s2) ## 00000040 -/* 00D5C 80B6A6FC 9339E075 */ lbu $t9, %lo(D_80B7E075)($t9) +/* 00D5C 80B6A6FC 9339E075 */ lbu $t9, %lo(D_80B7E075)($t9) /* 00D60 80B6A700 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 /* 00D64 80B6A704 2402000A */ addiu $v0, $zero, 0x000A ## $v0 = 0000000A -/* 00D68 80B6A708 1321000C */ beq $t9, $at, .L80B6A73C +/* 00D68 80B6A708 1321000C */ beq $t9, $at, .L80B6A73C /* 00D6C 80B6A70C 3C1080B8 */ lui $s0, %hi(D_80B830B8) ## $s0 = 80B80000 /* 00D70 80B6A710 8E280EC0 */ lw $t0, 0x0EC0($s1) ## 8015F520 /* 00D74 80B6A714 240A0001 */ addiu $t2, $zero, 0x0001 ## $t2 = 00000001 /* 00D78 80B6A718 3C0180B8 */ lui $at, %hi(D_80B7A688) ## $at = 80B80000 /* 00D7C 80B6A71C 31091000 */ andi $t1, $t0, 0x1000 ## $t1 = 00000000 -/* 00D80 80B6A720 11200004 */ beq $t1, $zero, .L80B6A734 +/* 00D80 80B6A720 11200004 */ beq $t1, $zero, .L80B6A734 /* 00D84 80B6A724 00000000 */ nop /* 00D88 80B6A728 3C0180B8 */ lui $at, %hi(D_80B7A688) ## $at = 80B80000 -/* 00D8C 80B6A72C 10000006 */ beq $zero, $zero, .L80B6A748 -/* 00D90 80B6A730 A020A688 */ sb $zero, %lo(D_80B7A688)($at) +/* 00D8C 80B6A72C 10000006 */ beq $zero, $zero, .L80B6A748 +/* 00D90 80B6A730 A020A688 */ sb $zero, %lo(D_80B7A688)($at) .L80B6A734: -/* 00D94 80B6A734 10000004 */ beq $zero, $zero, .L80B6A748 -/* 00D98 80B6A738 A02AA688 */ sb $t2, %lo(D_80B7A688)($at) +/* 00D94 80B6A734 10000004 */ beq $zero, $zero, .L80B6A748 +/* 00D98 80B6A738 A02AA688 */ sb $t2, %lo(D_80B7A688)($at) .L80B6A73C: /* 00D9C 80B6A73C 240B0002 */ addiu $t3, $zero, 0x0002 ## $t3 = 00000002 /* 00DA0 80B6A740 3C0180B8 */ lui $at, %hi(D_80B7A688) ## $at = 80B80000 -/* 00DA4 80B6A744 A02BA688 */ sb $t3, %lo(D_80B7A688)($at) +/* 00DA4 80B6A744 A02BA688 */ sb $t3, %lo(D_80B7A688)($at) .L80B6A748: /* 00DA8 80B6A748 240C0014 */ addiu $t4, $zero, 0x0014 ## $t4 = 00000014 /* 00DAC 80B6A74C 3C0180B8 */ lui $at, %hi(D_80B7A684) ## $at = 80B80000 -/* 00DB0 80B6A750 A42CA684 */ sh $t4, %lo(D_80B7A684)($at) +/* 00DB0 80B6A750 A42CA684 */ sh $t4, %lo(D_80B7A684)($at) /* 00DB4 80B6A754 3C010001 */ lui $at, 0x0001 ## $at = 00010000 /* 00DB8 80B6A758 261030B8 */ addiu $s0, $s0, %lo(D_80B830B8) ## $s0 = 80B830B8 -/* 00DBC 80B6A75C 00330821 */ addu $at, $at, $s3 +/* 00DBC 80B6A75C 00330821 */ addu $at, $at, $s3 /* 00DC0 80B6A760 AC301E10 */ sw $s0, 0x1E10($at) ## 00011E10 /* 00DC4 80B6A764 3C018012 */ lui $at, 0x8012 ## $at = 80120000 /* 00DC8 80B6A768 240D0001 */ addiu $t5, $zero, 0x0001 ## $t5 = 00000001 /* 00DCC 80B6A76C A42DFB40 */ sh $t5, -0x04C0($at) ## 8011FB40 /* 00DD0 80B6A770 3C0180B8 */ lui $at, %hi(D_80B7E0AC) ## $at = 80B80000 -/* 00DD4 80B6A774 A420E0AC */ sh $zero, %lo(D_80B7E0AC)($at) +/* 00DD4 80B6A774 A420E0AC */ sh $zero, %lo(D_80B7E0AC)($at) /* 00DD8 80B6A778 3C0180B8 */ lui $at, %hi(D_80B7E0A6) ## $at = 80B80000 /* 00DDC 80B6A77C 3C041001 */ lui $a0, 0x1001 ## $a0 = 10010000 -/* 00DE0 80B6A780 A422E0A6 */ sh $v0, %lo(D_80B7E0A6)($at) +/* 00DE0 80B6A780 A422E0A6 */ sh $v0, %lo(D_80B7E0A6)($at) /* 00DE4 80B6A784 0C03E803 */ jal Audio_SetBGM - + /* 00DE8 80B6A788 348400FF */ ori $a0, $a0, 0x00FF ## $a0 = 100100FF /* 00DEC 80B6A78C 3C0E80B8 */ lui $t6, %hi(D_80B7E075) ## $t6 = 80B80000 -/* 00DF0 80B6A790 91CEE075 */ lbu $t6, %lo(D_80B7E075)($t6) +/* 00DF0 80B6A790 91CEE075 */ lbu $t6, %lo(D_80B7E075)($t6) /* 00DF4 80B6A794 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 /* 00DF8 80B6A798 3C0680B8 */ lui $a2, %hi(D_80B7E07D) ## $a2 = 80B80000 -/* 00DFC 80B6A79C 15C1000F */ bne $t6, $at, .L80B6A7DC +/* 00DFC 80B6A79C 15C1000F */ bne $t6, $at, .L80B6A7DC /* 00E00 80B6A7A0 24C6E07D */ addiu $a2, $a2, %lo(D_80B7E07D) ## $a2 = 80B7E07D /* 00E04 80B6A7A4 8E220EC0 */ lw $v0, 0x0EC0($s1) ## 8015F520 /* 00E08 80B6A7A8 3C014220 */ lui $at, 0x4220 ## $at = 42200000 /* 00E0C 80B6A7AC 3043007F */ andi $v1, $v0, 0x007F ## $v1 = 00000000 -/* 00E10 80B6A7B0 50600007 */ beql $v1, $zero, .L80B6A7D0 +/* 00E10 80B6A7B0 50600007 */ beql $v1, $zero, .L80B6A7D0 /* 00E14 80B6A7B4 44814000 */ mtc1 $at, $f8 ## $f8 = 40.00 /* 00E18 80B6A7B8 44832000 */ mtc1 $v1, $f4 ## $f4 = 0.00 /* 00E1C 80B6A7BC 3C0180B8 */ lui $at, %hi(D_80B7E078) ## $at = 80B80000 -/* 00E20 80B6A7C0 468021A0 */ cvt.s.w $f6, $f4 -/* 00E24 80B6A7C4 10000013 */ beq $zero, $zero, .L80B6A814 -/* 00E28 80B6A7C8 E426E078 */ swc1 $f6, %lo(D_80B7E078)($at) +/* 00E20 80B6A7C0 468021A0 */ cvt.s.w $f6, $f4 +/* 00E24 80B6A7C4 10000013 */ beq $zero, $zero, .L80B6A814 +/* 00E28 80B6A7C8 E426E078 */ swc1 $f6, %lo(D_80B7E078)($at) /* 00E2C 80B6A7CC 44814000 */ mtc1 $at, $f8 ## $f8 = -0.00 .L80B6A7D0: /* 00E30 80B6A7D0 3C0180B8 */ lui $at, %hi(D_80B7E078) ## $at = 80B80000 -/* 00E34 80B6A7D4 1000000F */ beq $zero, $zero, .L80B6A814 -/* 00E38 80B6A7D8 E428E078 */ swc1 $f8, %lo(D_80B7E078)($at) +/* 00E34 80B6A7D4 1000000F */ beq $zero, $zero, .L80B6A814 +/* 00E38 80B6A7D8 E428E078 */ swc1 $f8, %lo(D_80B7E078)($at) .L80B6A7DC: /* 00E3C 80B6A7DC 8E220EC0 */ lw $v0, 0x0EC0($s1) ## 8015F520 /* 00E40 80B6A7E0 3C017F00 */ lui $at, 0x7F00 ## $at = 7F000000 -/* 00E44 80B6A7E4 00411824 */ and $v1, $v0, $at -/* 00E48 80B6A7E8 10600007 */ beq $v1, $zero, .L80B6A808 +/* 00E44 80B6A7E4 00411824 */ and $v1, $v0, $at +/* 00E48 80B6A7E8 10600007 */ beq $v1, $zero, .L80B6A808 /* 00E4C 80B6A7EC 3C014234 */ lui $at, 0x4234 ## $at = 42340000 -/* 00E50 80B6A7F0 00037E03 */ sra $t7, $v1, 24 +/* 00E50 80B6A7F0 00037E03 */ sra $t7, $v1, 24 /* 00E54 80B6A7F4 448F5000 */ mtc1 $t7, $f10 ## $f10 = 0.00 /* 00E58 80B6A7F8 3C0180B8 */ lui $at, %hi(D_80B7E078) ## $at = 80B80000 -/* 00E5C 80B6A7FC 46805420 */ cvt.s.w $f16, $f10 -/* 00E60 80B6A800 10000004 */ beq $zero, $zero, .L80B6A814 -/* 00E64 80B6A804 E430E078 */ swc1 $f16, %lo(D_80B7E078)($at) +/* 00E5C 80B6A7FC 46805420 */ cvt.s.w $f16, $f10 +/* 00E60 80B6A800 10000004 */ beq $zero, $zero, .L80B6A814 +/* 00E64 80B6A804 E430E078 */ swc1 $f16, %lo(D_80B7E078)($at) .L80B6A808: /* 00E68 80B6A808 44819000 */ mtc1 $at, $f18 ## $f18 = -0.00 /* 00E6C 80B6A80C 3C0180B8 */ lui $at, %hi(D_80B7E078) ## $at = 80B80000 -/* 00E70 80B6A810 E432E078 */ swc1 $f18, %lo(D_80B7E078)($at) +/* 00E70 80B6A810 E432E078 */ swc1 $f18, %lo(D_80B7E078)($at) .L80B6A814: /* 00E74 80B6A814 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000 -/* 00E78 80B6A818 0041C024 */ and $t8, $v0, $at -/* 00E7C 80B6A81C 00184403 */ sra $t0, $t8, 16 +/* 00E78 80B6A818 0041C024 */ and $t8, $v0, $at +/* 00E7C 80B6A81C 00184403 */ sra $t0, $t8, 16 /* 00E80 80B6A820 31090007 */ andi $t1, $t0, 0x0007 ## $t1 = 00000000 /* 00E84 80B6A824 24010007 */ addiu $at, $zero, 0x0007 ## $at = 00000007 -/* 00E88 80B6A828 15210009 */ bne $t1, $at, .L80B6A850 +/* 00E88 80B6A828 15210009 */ bne $t1, $at, .L80B6A850 /* 00E8C 80B6A82C A0C80000 */ sb $t0, 0x0000($a2) ## 80B7E07D /* 00E90 80B6A830 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 00E94 80B6A834 00330821 */ addu $at, $at, $s3 +/* 00E94 80B6A834 00330821 */ addu $at, $at, $s3 /* 00E98 80B6A838 240A005A */ addiu $t2, $zero, 0x005A ## $t2 = 0000005A /* 00E9C 80B6A83C A42A1D30 */ sh $t2, 0x1D30($at) ## 00011D30 /* 00EA0 80B6A840 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 /* 00EA4 80B6A844 3C0180B8 */ lui $at, %hi(D_80B7E076) ## $at = 80B80000 -/* 00EA8 80B6A848 10000007 */ beq $zero, $zero, .L80B6A868 -/* 00EAC 80B6A84C A025E076 */ sb $a1, %lo(D_80B7E076)($at) +/* 00EA8 80B6A848 10000007 */ beq $zero, $zero, .L80B6A868 +/* 00EAC 80B6A84C A025E076 */ sb $a1, %lo(D_80B7E076)($at) .L80B6A850: /* 00EB0 80B6A850 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 00EB4 80B6A854 00330821 */ addu $at, $at, $s3 +/* 00EB4 80B6A854 00330821 */ addu $at, $at, $s3 /* 00EB8 80B6A858 240B0028 */ addiu $t3, $zero, 0x0028 ## $t3 = 00000028 /* 00EBC 80B6A85C A42B1D30 */ sh $t3, 0x1D30($at) ## 00011D30 /* 00EC0 80B6A860 3C0180B8 */ lui $at, %hi(D_80B7E076) ## $at = 80B80000 -/* 00EC4 80B6A864 A020E076 */ sb $zero, %lo(D_80B7E076)($at) +/* 00EC4 80B6A864 A020E076 */ sb $zero, %lo(D_80B7E076)($at) .L80B6A868: /* 00EC8 80B6A868 90CC0000 */ lbu $t4, 0x0000($a2) ## 80B7E07D /* 00ECC 80B6A86C 24010006 */ addiu $at, $zero, 0x0006 ## $at = 00000006 /* 00ED0 80B6A870 2403003C */ addiu $v1, $zero, 0x003C ## $v1 = 0000003C /* 00ED4 80B6A874 318D0007 */ andi $t5, $t4, 0x0007 ## $t5 = 00000000 -/* 00ED8 80B6A878 11A10006 */ beq $t5, $at, .L80B6A894 +/* 00ED8 80B6A878 11A10006 */ beq $t5, $at, .L80B6A894 /* 00EDC 80B6A87C 3C0480B8 */ lui $a0, %hi(D_80B830B0) ## $a0 = 80B80000 /* 00EE0 80B6A880 3C0E8016 */ lui $t6, 0x8016 ## $t6 = 80160000 /* 00EE4 80B6A884 8DCEFA90 */ lw $t6, -0x0570($t6) ## 8015FA90 /* 00EE8 80B6A888 3C0180B8 */ lui $at, %hi(D_80B7E077) ## $at = 80B80000 /* 00EEC 80B6A88C 85CF09DA */ lh $t7, 0x09DA($t6) ## 801609DA -/* 00EF0 80B6A890 11E00012 */ beq $t7, $zero, .L80B6A8DC +/* 00EF0 80B6A890 11E00012 */ beq $t7, $zero, .L80B6A8DC .L80B6A894: /* 00EF4 80B6A894 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 /* 00EF8 80B6A898 8C42FA90 */ lw $v0, -0x0570($v0) ## 8015FA90 /* 00EFC 80B6A89C 24180064 */ addiu $t8, $zero, 0x0064 ## $t8 = 00000064 /* 00F00 80B6A8A0 3C0180B8 */ lui $at, %hi(D_80B7E077) ## $at = 80B80000 -/* 00F04 80B6A8A4 A038E077 */ sb $t8, %lo(D_80B7E077)($at) +/* 00F04 80B6A8A4 A038E077 */ sb $t8, %lo(D_80B7E077)($at) /* 00F08 80B6A8A8 845909DA */ lh $t9, 0x09DA($v0) ## 801609DA -/* 00F0C 80B6A8AC 5320000D */ beql $t9, $zero, .L80B6A8E4 +/* 00F0C 80B6A8AC 5320000D */ beql $t9, $zero, .L80B6A8E4 /* 00F10 80B6A8B0 00008825 */ or $s1, $zero, $zero ## $s1 = 00000000 /* 00F14 80B6A8B4 A44009DA */ sh $zero, 0x09DA($v0) ## 801609DA /* 00F18 80B6A8B8 8E280EC0 */ lw $t0, 0x0EC0($s1) ## 00000EC0 /* 00F1C 80B6A8BC 3C01FF00 */ lui $at, 0xFF00 ## $at = FF000000 /* 00F20 80B6A8C0 3421FFFF */ ori $at, $at, 0xFFFF ## $at = FF00FFFF -/* 00F24 80B6A8C4 01014824 */ and $t1, $t0, $at +/* 00F24 80B6A8C4 01014824 */ and $t1, $t0, $at /* 00F28 80B6A8C8 3C010006 */ lui $at, 0x0006 ## $at = 00060000 /* 00F2C 80B6A8CC AE290EC0 */ sw $t1, 0x0EC0($s1) ## 00000EC0 /* 00F30 80B6A8D0 01215825 */ or $t3, $t1, $at ## $t3 = 00060000 -/* 00F34 80B6A8D4 10000002 */ beq $zero, $zero, .L80B6A8E0 +/* 00F34 80B6A8D4 10000002 */ beq $zero, $zero, .L80B6A8E0 /* 00F38 80B6A8D8 AE2B0EC0 */ sw $t3, 0x0EC0($s1) ## 00000EC0 .L80B6A8DC: -/* 00F3C 80B6A8DC A020E077 */ sb $zero, %lo(D_80B7E077)($at) +/* 00F3C 80B6A8DC A020E077 */ sb $zero, %lo(D_80B7E077)($at) .L80B6A8E0: /* 00F40 80B6A8E0 00008825 */ or $s1, $zero, $zero ## $s1 = 00000000 .L80B6A8E4: -/* 00F44 80B6A8E4 00116180 */ sll $t4, $s1, 6 +/* 00F44 80B6A8E4 00116180 */ sll $t4, $s1, 6 /* 00F48 80B6A8E8 26310001 */ addiu $s1, $s1, 0x0001 ## $s1 = 00000001 -/* 00F4C 80B6A8EC 00118C00 */ sll $s1, $s1, 16 -/* 00F50 80B6A8F0 00118C03 */ sra $s1, $s1, 16 -/* 00F54 80B6A8F4 2A210082 */ slti $at, $s1, 0x0082 -/* 00F58 80B6A8F8 020C6821 */ addu $t5, $s0, $t4 -/* 00F5C 80B6A8FC 1420FFF9 */ bne $at, $zero, .L80B6A8E4 +/* 00F4C 80B6A8EC 00118C00 */ sll $s1, $s1, 16 +/* 00F50 80B6A8F0 00118C03 */ sra $s1, $s1, 16 +/* 00F54 80B6A8F4 2A210082 */ slti $at, $s1, 0x0082 +/* 00F58 80B6A8F8 020C6821 */ addu $t5, $s0, $t4 +/* 00F5C 80B6A8FC 1420FFF9 */ bne $at, $zero, .L80B6A8E4 /* 00F60 80B6A900 A1A00024 */ sb $zero, 0x0024($t5) ## 00000024 /* 00F64 80B6A904 3C0280B8 */ lui $v0, %hi(D_80B7FEF8) ## $v0 = 80B80000 /* 00F68 80B6A908 2442FEF8 */ addiu $v0, $v0, %lo(D_80B7FEF8) ## $v0 = 80B7FEF8 /* 00F6C 80B6A90C 00008825 */ or $s1, $zero, $zero ## $s1 = 00000000 .L80B6A910: -/* 00F70 80B6A910 02230019 */ multu $s1, $v1 +/* 00F70 80B6A910 02230019 */ multu $s1, $v1 /* 00F74 80B6A914 26310001 */ addiu $s1, $s1, 0x0001 ## $s1 = 00000001 -/* 00F78 80B6A918 00118C00 */ sll $s1, $s1, 16 -/* 00F7C 80B6A91C 00118C03 */ sra $s1, $s1, 16 -/* 00F80 80B6A920 2A21008C */ slti $at, $s1, 0x008C -/* 00F84 80B6A924 00007012 */ mflo $t6 -/* 00F88 80B6A928 004E7821 */ addu $t7, $v0, $t6 -/* 00F8C 80B6A92C 1420FFF8 */ bne $at, $zero, .L80B6A910 +/* 00F78 80B6A918 00118C00 */ sll $s1, $s1, 16 +/* 00F7C 80B6A91C 00118C03 */ sra $s1, $s1, 16 +/* 00F80 80B6A920 2A21008C */ slti $at, $s1, 0x008C +/* 00F84 80B6A924 00007012 */ mflo $t6 +/* 00F88 80B6A928 004E7821 */ addu $t7, $v0, $t6 +/* 00F8C 80B6A92C 1420FFF8 */ bne $at, $zero, .L80B6A910 /* 00F90 80B6A930 A1E00030 */ sb $zero, 0x0030($t7) ## 00000030 /* 00F94 80B6A934 3C0180B8 */ lui $at, %hi(D_80B7B374) ## $at = 80B80000 -/* 00F98 80B6A938 C424B374 */ lwc1 $f4, %lo(D_80B7B374)($at) +/* 00F98 80B6A938 C424B374 */ lwc1 $f4, %lo(D_80B7B374)($at) /* 00F9C 80B6A93C 3C0280B8 */ lui $v0, %hi(D_80B830A8) ## $v0 = 80B80000 /* 00FA0 80B6A940 244230A8 */ addiu $v0, $v0, %lo(D_80B830A8) ## $v0 = 80B830A8 /* 00FA4 80B6A944 3C0180B8 */ lui $at, %hi(D_80B7B378) ## $at = 80B80000 /* 00FA8 80B6A948 E4440000 */ swc1 $f4, 0x0000($v0) ## 80B830A8 -/* 00FAC 80B6A94C C426B378 */ lwc1 $f6, %lo(D_80B7B378)($at) +/* 00FAC 80B6A94C C426B378 */ lwc1 $f6, %lo(D_80B7B378)($at) /* 00FB0 80B6A950 3C0380B8 */ lui $v1, %hi(D_80B830AC) ## $v1 = 80B80000 /* 00FB4 80B6A954 246330AC */ addiu $v1, $v1, %lo(D_80B830AC) ## $v1 = 80B830AC /* 00FB8 80B6A958 3C0180B8 */ lui $at, %hi(D_80B7B37C) ## $at = 80B80000 /* 00FBC 80B6A95C E4660000 */ swc1 $f6, 0x0000($v1) ## 80B830AC -/* 00FC0 80B6A960 C428B37C */ lwc1 $f8, %lo(D_80B7B37C)($at) +/* 00FC0 80B6A960 C428B37C */ lwc1 $f8, %lo(D_80B7B37C)($at) /* 00FC4 80B6A964 3C014434 */ lui $at, 0x4434 ## $at = 44340000 /* 00FC8 80B6A968 248430B0 */ addiu $a0, $a0, %lo(D_80B830B0) ## $a0 = 80B830B0 /* 00FCC 80B6A96C 4481B000 */ mtc1 $at, $f22 ## $f22 = 720.00 /* 00FD0 80B6A970 00008825 */ or $s1, $zero, $zero ## $s1 = 00000000 /* 00FD4 80B6A974 E4880000 */ swc1 $f8, 0x0000($a0) ## 80B830B0 -/* 00FD8 80B6A978 0011C0C0 */ sll $t8, $s1, 3 +/* 00FD8 80B6A978 0011C0C0 */ sll $t8, $s1, 3 .L80B6A97C: -/* 00FDC 80B6A97C 0311C021 */ addu $t8, $t8, $s1 +/* 00FDC 80B6A97C 0311C021 */ addu $t8, $t8, $s1 /* 00FE0 80B6A980 3C1980B8 */ lui $t9, %hi(D_80B81FC8) ## $t9 = 80B80000 /* 00FE4 80B6A984 27391FC8 */ addiu $t9, $t9, %lo(D_80B81FC8) ## $t9 = 80B81FC8 -/* 00FE8 80B6A988 0018C0C0 */ sll $t8, $t8, 3 +/* 00FE8 80B6A988 0018C0C0 */ sll $t8, $t8, 3 /* 00FEC 80B6A98C 3C0280B8 */ lui $v0, %hi(D_80B830A8) ## $v0 = 80B80000 /* 00FF0 80B6A990 3C0380B8 */ lui $v1, %hi(D_80B830AC) ## $v1 = 80B80000 /* 00FF4 80B6A994 3C0480B8 */ lui $a0, %hi(D_80B830B0) ## $a0 = 80B80000 /* 00FF8 80B6A998 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 -/* 00FFC 80B6A99C 03198021 */ addu $s0, $t8, $t9 -/* 01000 80B6A9A0 2A210015 */ slti $at, $s1, 0x0015 +/* 00FFC 80B6A99C 03198021 */ addu $s0, $t8, $t9 +/* 01000 80B6A9A0 2A210015 */ slti $at, $s1, 0x0015 /* 01004 80B6A9A4 248430B0 */ addiu $a0, $a0, %lo(D_80B830B0) ## $a0 = 80B830B0 /* 01008 80B6A9A8 246330AC */ addiu $v1, $v1, %lo(D_80B830AC) ## $v1 = 80B830AC /* 0100C 80B6A9AC 244230A8 */ addiu $v0, $v0, %lo(D_80B830A8) ## $v0 = 80B830A8 -/* 01010 80B6A9B0 1020000D */ beq $at, $zero, .L80B6A9E8 +/* 01010 80B6A9B0 1020000D */ beq $at, $zero, .L80B6A9E8 /* 01014 80B6A9B4 A2050000 */ sb $a1, 0x0000($s0) ## 80B830B8 /* 01018 80B6A9B8 0C0400A4 */ jal sinf - + /* 0101C 80B6A9BC C44C0000 */ lwc1 $f12, 0x0000($v0) ## 80B830A8 -/* 01020 80B6A9C0 46160502 */ mul.s $f20, $f0, $f22 +/* 01020 80B6A9C0 46160502 */ mul.s $f20, $f0, $f22 /* 01024 80B6A9C4 3C0180B8 */ lui $at, %hi(D_80B830A8) ## $at = 80B80000 /* 01028 80B6A9C8 E6140004 */ swc1 $f20, 0x0004($s0) ## 80B830BC /* 0102C 80B6A9CC E6140010 */ swc1 $f20, 0x0010($s0) ## 80B830C8 /* 01030 80B6A9D0 0C041184 */ jal cosf - -/* 01034 80B6A9D4 C42C30A8 */ lwc1 $f12, %lo(D_80B830A8)($at) -/* 01038 80B6A9D8 46160502 */ mul.s $f20, $f0, $f22 + +/* 01034 80B6A9D4 C42C30A8 */ lwc1 $f12, %lo(D_80B830A8)($at) +/* 01038 80B6A9D8 46160502 */ mul.s $f20, $f0, $f22 /* 0103C 80B6A9DC E614000C */ swc1 $f20, 0x000C($s0) ## 80B830C4 -/* 01040 80B6A9E0 1000001B */ beq $zero, $zero, .L80B6AA50 +/* 01040 80B6A9E0 1000001B */ beq $zero, $zero, .L80B6AA50 /* 01044 80B6A9E4 E6140018 */ swc1 $f20, 0x0018($s0) ## 80B830D0 .L80B6A9E8: -/* 01048 80B6A9E8 2A210029 */ slti $at, $s1, 0x0029 -/* 0104C 80B6A9EC 1020000D */ beq $at, $zero, .L80B6AA24 +/* 01048 80B6A9E8 2A210029 */ slti $at, $s1, 0x0029 +/* 0104C 80B6A9EC 1020000D */ beq $at, $zero, .L80B6AA24 /* 01050 80B6A9F0 00000000 */ nop /* 01054 80B6A9F4 0C0400A4 */ jal sinf - + /* 01058 80B6A9F8 C46C0000 */ lwc1 $f12, 0x0000($v1) ## 00000000 -/* 0105C 80B6A9FC 46160502 */ mul.s $f20, $f0, $f22 +/* 0105C 80B6A9FC 46160502 */ mul.s $f20, $f0, $f22 /* 01060 80B6AA00 3C0180B8 */ lui $at, %hi(D_80B830AC) ## $at = 80B80000 /* 01064 80B6AA04 E6140004 */ swc1 $f20, 0x0004($s0) ## 80B830BC /* 01068 80B6AA08 E6140010 */ swc1 $f20, 0x0010($s0) ## 80B830C8 /* 0106C 80B6AA0C 0C041184 */ jal cosf - -/* 01070 80B6AA10 C42C30AC */ lwc1 $f12, %lo(D_80B830AC)($at) -/* 01074 80B6AA14 46160502 */ mul.s $f20, $f0, $f22 + +/* 01070 80B6AA10 C42C30AC */ lwc1 $f12, %lo(D_80B830AC)($at) +/* 01074 80B6AA14 46160502 */ mul.s $f20, $f0, $f22 /* 01078 80B6AA18 E614000C */ swc1 $f20, 0x000C($s0) ## 80B830C4 -/* 0107C 80B6AA1C 1000000C */ beq $zero, $zero, .L80B6AA50 +/* 0107C 80B6AA1C 1000000C */ beq $zero, $zero, .L80B6AA50 /* 01080 80B6AA20 E6140018 */ swc1 $f20, 0x0018($s0) ## 80B830D0 .L80B6AA24: /* 01084 80B6AA24 0C0400A4 */ jal sinf - + /* 01088 80B6AA28 C48C0000 */ lwc1 $f12, 0x0000($a0) ## 00000000 -/* 0108C 80B6AA2C 46160502 */ mul.s $f20, $f0, $f22 +/* 0108C 80B6AA2C 46160502 */ mul.s $f20, $f0, $f22 /* 01090 80B6AA30 3C0180B8 */ lui $at, %hi(D_80B830B0) ## $at = 80B80000 /* 01094 80B6AA34 E6140004 */ swc1 $f20, 0x0004($s0) ## 80B830BC /* 01098 80B6AA38 E6140010 */ swc1 $f20, 0x0010($s0) ## 80B830C8 /* 0109C 80B6AA3C 0C041184 */ jal cosf - -/* 010A0 80B6AA40 C42C30B0 */ lwc1 $f12, %lo(D_80B830B0)($at) -/* 010A4 80B6AA44 46160502 */ mul.s $f20, $f0, $f22 + +/* 010A0 80B6AA40 C42C30B0 */ lwc1 $f12, %lo(D_80B830B0)($at) +/* 010A4 80B6AA44 46160502 */ mul.s $f20, $f0, $f22 /* 010A8 80B6AA48 E614000C */ swc1 $f20, 0x000C($s0) ## 80B830C4 /* 010AC 80B6AA4C E6140018 */ swc1 $f20, 0x0018($s0) ## 80B830D0 .L80B6AA50: @@ -359,82 +359,82 @@ glabel Fishing_Init /* 010BC 80B6AA5C 44816000 */ mtc1 $at, $f12 ## $f12 = 100.00 /* 010C0 80B6AA60 E6000008 */ swc1 $f0, 0x0008($s0) ## 80B830C0 /* 010C4 80B6AA64 0C00CFBE */ jal Math_Rand_ZeroFloat - + /* 010C8 80B6AA68 E6000014 */ swc1 $f0, 0x0014($s0) ## 80B830CC -/* 010CC 80B6AA6C 4600028D */ trunc.w.s $f10, $f0 +/* 010CC 80B6AA6C 4600028D */ trunc.w.s $f10, $f0 /* 010D0 80B6AA70 A600003C */ sh $zero, 0x003C($s0) ## 80B830F4 /* 010D4 80B6AA74 A600003E */ sh $zero, 0x003E($s0) ## 80B830F6 /* 010D8 80B6AA78 A6000040 */ sh $zero, 0x0040($s0) ## 80B830F8 -/* 010DC 80B6AA7C 44095000 */ mfc1 $t1, $f10 +/* 010DC 80B6AA7C 44095000 */ mfc1 $t1, $f10 /* 010E0 80B6AA80 3C0A80B8 */ lui $t2, %hi(D_80B7E075) ## $t2 = 80B80000 /* 010E4 80B6AA84 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 /* 010E8 80B6AA88 A6090002 */ sh $t1, 0x0002($s0) ## 80B830BA -/* 010EC 80B6AA8C 914AE075 */ lbu $t2, %lo(D_80B7E075)($t2) -/* 010F0 80B6AA90 1141000E */ beq $t2, $at, .L80B6AACC -/* 010F4 80B6AA94 2A21000F */ slti $at, $s1, 0x000F -/* 010F8 80B6AA98 14200002 */ bne $at, $zero, .L80B6AAA4 -/* 010FC 80B6AA9C 2A210014 */ slti $at, $s1, 0x0014 -/* 01100 80B6AAA0 14200009 */ bne $at, $zero, .L80B6AAC8 +/* 010EC 80B6AA8C 914AE075 */ lbu $t2, %lo(D_80B7E075)($t2) +/* 010F0 80B6AA90 1141000E */ beq $t2, $at, .L80B6AACC +/* 010F4 80B6AA94 2A21000F */ slti $at, $s1, 0x000F +/* 010F8 80B6AA98 14200002 */ bne $at, $zero, .L80B6AAA4 +/* 010FC 80B6AA9C 2A210014 */ slti $at, $s1, 0x0014 +/* 01100 80B6AAA0 14200009 */ bne $at, $zero, .L80B6AAC8 .L80B6AAA4: -/* 01104 80B6AAA4 2A210023 */ slti $at, $s1, 0x0023 -/* 01108 80B6AAA8 14200002 */ bne $at, $zero, .L80B6AAB4 -/* 0110C 80B6AAAC 2A210028 */ slti $at, $s1, 0x0028 -/* 01110 80B6AAB0 14200005 */ bne $at, $zero, .L80B6AAC8 +/* 01104 80B6AAA4 2A210023 */ slti $at, $s1, 0x0023 +/* 01108 80B6AAA8 14200002 */ bne $at, $zero, .L80B6AAB4 +/* 0110C 80B6AAAC 2A210028 */ slti $at, $s1, 0x0028 +/* 01110 80B6AAB0 14200005 */ bne $at, $zero, .L80B6AAC8 .L80B6AAB4: -/* 01114 80B6AAB4 2A210037 */ slti $at, $s1, 0x0037 -/* 01118 80B6AAB8 14200004 */ bne $at, $zero, .L80B6AACC -/* 0111C 80B6AABC 2A21003C */ slti $at, $s1, 0x003C -/* 01120 80B6AAC0 50200003 */ beql $at, $zero, .L80B6AAD0 +/* 01114 80B6AAB4 2A210037 */ slti $at, $s1, 0x0037 +/* 01118 80B6AAB8 14200004 */ bne $at, $zero, .L80B6AACC +/* 0111C 80B6AABC 2A21003C */ slti $at, $s1, 0x003C +/* 01120 80B6AAC0 50200003 */ beql $at, $zero, .L80B6AAD0 /* 01124 80B6AAC4 26310001 */ addiu $s1, $s1, 0x0001 ## $s1 = 00000001 .L80B6AAC8: /* 01128 80B6AAC8 A2000000 */ sb $zero, 0x0000($s0) ## 80B830B8 .L80B6AACC: /* 0112C 80B6AACC 26310001 */ addiu $s1, $s1, 0x0001 ## $s1 = 00000002 .L80B6AAD0: -/* 01130 80B6AAD0 00118C00 */ sll $s1, $s1, 16 -/* 01134 80B6AAD4 00118C03 */ sra $s1, $s1, 16 -/* 01138 80B6AAD8 2A21003C */ slti $at, $s1, 0x003C -/* 0113C 80B6AADC 5420FFA7 */ bnel $at, $zero, .L80B6A97C -/* 01140 80B6AAE0 0011C0C0 */ sll $t8, $s1, 3 +/* 01130 80B6AAD0 00118C00 */ sll $s1, $s1, 16 +/* 01134 80B6AAD4 00118C03 */ sra $s1, $s1, 16 +/* 01138 80B6AAD8 2A21003C */ slti $at, $s1, 0x003C +/* 0113C 80B6AADC 5420FFA7 */ bnel $at, $zero, .L80B6A97C +/* 01140 80B6AAE0 0011C0C0 */ sll $t8, $s1, 3 /* 01144 80B6AAE4 02402025 */ or $a0, $s2, $zero ## $a0 = 00000000 -/* 01148 80B6AAE8 0C2DA88B */ jal func_80B6A22C +/* 01148 80B6AAE8 0C2DA88B */ jal func_80B6A22C /* 0114C 80B6AAEC 02602825 */ or $a1, $s3, $zero ## $a1 = 00000000 /* 01150 80B6AAF0 3C014254 */ lui $at, 0x4254 ## $at = 42540000 /* 01154 80B6AAF4 44818000 */ mtc1 $at, $f16 ## $f16 = 53.00 /* 01158 80B6AAF8 3C01C188 */ lui $at, 0xC188 ## $at = C1880000 /* 0115C 80B6AAFC 44819000 */ mtc1 $at, $f18 ## $f18 = -17.00 /* 01160 80B6AB00 3C0180B8 */ lui $at, %hi(D_80B7B380) ## $at = 80B80000 -/* 01164 80B6AB04 C424B380 */ lwc1 $f4, %lo(D_80B7B380)($at) +/* 01164 80B6AB04 C424B380 */ lwc1 $f4, %lo(D_80B7B380)($at) /* 01168 80B6AB08 26641C24 */ addiu $a0, $s3, 0x1C24 ## $a0 = 00001C24 /* 0116C 80B6AB0C 240B0300 */ addiu $t3, $zero, 0x0300 ## $t3 = 00000300 -/* 01170 80B6AB10 AFAB0028 */ sw $t3, 0x0028($sp) -/* 01174 80B6AB14 AFA4005C */ sw $a0, 0x005C($sp) +/* 01170 80B6AB10 AFAB0028 */ sw $t3, 0x0028($sp) +/* 01174 80B6AB14 AFA4005C */ sw $a0, 0x005C($sp) /* 01178 80B6AB18 02402825 */ or $a1, $s2, $zero ## $a1 = 00000000 /* 0117C 80B6AB1C 02603025 */ or $a2, $s3, $zero ## $a2 = 00000000 /* 01180 80B6AB20 24070141 */ addiu $a3, $zero, 0x0141 ## $a3 = 00000141 -/* 01184 80B6AB24 AFA0001C */ sw $zero, 0x001C($sp) -/* 01188 80B6AB28 AFA00020 */ sw $zero, 0x0020($sp) -/* 0118C 80B6AB2C AFA00024 */ sw $zero, 0x0024($sp) -/* 01190 80B6AB30 E7B00010 */ swc1 $f16, 0x0010($sp) -/* 01194 80B6AB34 E7B20014 */ swc1 $f18, 0x0014($sp) +/* 01184 80B6AB24 AFA0001C */ sw $zero, 0x001C($sp) +/* 01188 80B6AB28 AFA00020 */ sw $zero, 0x0020($sp) +/* 0118C 80B6AB2C AFA00024 */ sw $zero, 0x0024($sp) +/* 01190 80B6AB30 E7B00010 */ swc1 $f16, 0x0010($sp) +/* 01194 80B6AB34 E7B20014 */ swc1 $f18, 0x0014($sp) /* 01198 80B6AB38 0C00C916 */ jal Actor_SpawnAttached - -/* 0119C 80B6AB3C E7A40018 */ swc1 $f4, 0x0018($sp) + +/* 0119C 80B6AB3C E7A40018 */ swc1 $f4, 0x0018($sp) /* 011A0 80B6AB40 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 011A4 80B6AB44 8FB2005C */ lw $s2, 0x005C($sp) +/* 011A4 80B6AB44 8FB2005C */ lw $s2, 0x005C($sp) /* 011A8 80B6AB48 240C00C8 */ addiu $t4, $zero, 0x00C8 ## $t4 = 000000C8 -/* 011AC 80B6AB4C 44070000 */ mfc1 $a3, $f0 -/* 011B0 80B6AB50 AFAC0024 */ sw $t4, 0x0024($sp) +/* 011AC 80B6AB4C 44070000 */ mfc1 $a3, $f0 +/* 011B0 80B6AB50 AFAC0024 */ sw $t4, 0x0024($sp) /* 011B4 80B6AB54 02602825 */ or $a1, $s3, $zero ## $a1 = 00000000 /* 011B8 80B6AB58 240600FE */ addiu $a2, $zero, 0x00FE ## $a2 = 000000FE -/* 011BC 80B6AB5C AFA00018 */ sw $zero, 0x0018($sp) -/* 011C0 80B6AB60 AFA0001C */ sw $zero, 0x001C($sp) -/* 011C4 80B6AB64 AFA00020 */ sw $zero, 0x0020($sp) +/* 011BC 80B6AB5C AFA00018 */ sw $zero, 0x0018($sp) +/* 011C0 80B6AB60 AFA0001C */ sw $zero, 0x001C($sp) +/* 011C4 80B6AB64 AFA00020 */ sw $zero, 0x0020($sp) /* 011C8 80B6AB68 02402025 */ or $a0, $s2, $zero ## $a0 = 00000000 -/* 011CC 80B6AB6C E7A00010 */ swc1 $f0, 0x0010($sp) +/* 011CC 80B6AB6C E7A00010 */ swc1 $f0, 0x0010($sp) /* 011D0 80B6AB70 0C00C7D4 */ jal Actor_Spawn ## ActorSpawn -/* 011D4 80B6AB74 E7A00014 */ swc1 $f0, 0x0014($sp) +/* 011D4 80B6AB74 E7A00014 */ swc1 $f0, 0x0014($sp) /* 011D8 80B6AB78 3C0D8016 */ lui $t5, 0x8016 ## $t5 = 80160000 /* 011DC 80B6AB7C 8DADFA90 */ lw $t5, -0x0570($t5) ## 8015FA90 /* 011E0 80B6AB80 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 @@ -442,76 +442,76 @@ glabel Fishing_Init /* 011E8 80B6AB88 85AE09D6 */ lh $t6, 0x09D6($t5) ## 801609D6 /* 011EC 80B6AB8C 3C1980B8 */ lui $t9, %hi(D_80B7E075) ## $t9 = 80B80000 /* 011F0 80B6AB90 00008825 */ or $s1, $zero, $zero ## $s1 = 00000000 -/* 011F4 80B6AB94 11C10007 */ beq $t6, $at, .L80B6ABB4 +/* 011F4 80B6AB94 11C10007 */ beq $t6, $at, .L80B6ABB4 /* 011F8 80B6AB98 00000000 */ nop -/* 011FC 80B6AB9C 91EFE07D */ lbu $t7, %lo(D_80B7E07D)($t7) +/* 011FC 80B6AB9C 91EFE07D */ lbu $t7, %lo(D_80B7E07D)($t7) /* 01200 80B6ABA0 24010003 */ addiu $at, $zero, 0x0003 ## $at = 00000003 /* 01204 80B6ABA4 2402000F */ addiu $v0, $zero, 0x000F ## $v0 = 0000000F /* 01208 80B6ABA8 31F80003 */ andi $t8, $t7, 0x0003 ## $t8 = 00000000 -/* 0120C 80B6ABAC 17010009 */ bne $t8, $at, .L80B6ABD4 +/* 0120C 80B6ABAC 17010009 */ bne $t8, $at, .L80B6ABD4 /* 01210 80B6ABB0 00000000 */ nop .L80B6ABB4: -/* 01214 80B6ABB4 9339E075 */ lbu $t9, %lo(D_80B7E075)($t9) +/* 01214 80B6ABB4 9339E075 */ lbu $t9, %lo(D_80B7E075)($t9) /* 01218 80B6ABB8 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 0121C 80B6ABBC 13210003 */ beq $t9, $at, .L80B6ABCC +/* 0121C 80B6ABBC 13210003 */ beq $t9, $at, .L80B6ABCC /* 01220 80B6ABC0 00000000 */ nop -/* 01224 80B6ABC4 10000003 */ beq $zero, $zero, .L80B6ABD4 +/* 01224 80B6ABC4 10000003 */ beq $zero, $zero, .L80B6ABD4 /* 01228 80B6ABC8 24020010 */ addiu $v0, $zero, 0x0010 ## $v0 = 00000010 .L80B6ABCC: -/* 0122C 80B6ABCC 10000001 */ beq $zero, $zero, .L80B6ABD4 +/* 0122C 80B6ABCC 10000001 */ beq $zero, $zero, .L80B6ABD4 /* 01230 80B6ABD0 24020011 */ addiu $v0, $zero, 0x0011 ## $v0 = 00000011 .L80B6ABD4: -/* 01234 80B6ABD4 184000B0 */ blez $v0, .L80B6AE98 +/* 01234 80B6ABD4 184000B0 */ blez $v0, .L80B6AE98 /* 01238 80B6ABD8 00408025 */ or $s0, $v0, $zero ## $s0 = 00000011 /* 0123C 80B6ABDC 3C014780 */ lui $at, 0x4780 ## $at = 47800000 /* 01240 80B6ABE0 4481A000 */ mtc1 $at, $f20 ## $f20 = 65536.00 /* 01244 80B6ABE4 00000000 */ nop .L80B6ABE8: /* 01248 80B6ABE8 0C00CFBE */ jal Math_Rand_ZeroFloat - -/* 0124C 80B6ABEC 4600A306 */ mov.s $f12, $f20 + +/* 0124C 80B6ABEC 4600A306 */ mov.s $f12, $f20 /* 01250 80B6ABF0 3C0980B8 */ lui $t1, %hi(D_80B7AD40) ## $t1 = 80B80000 /* 01254 80B6ABF4 2529AD40 */ addiu $t1, $t1, %lo(D_80B7AD40) ## $t1 = 80B7AD40 -/* 01258 80B6ABF8 00114100 */ sll $t0, $s1, 4 -/* 0125C 80B6ABFC 01091021 */ addu $v0, $t0, $t1 +/* 01258 80B6ABF8 00114100 */ sll $t0, $s1, 4 +/* 0125C 80B6ABFC 01091021 */ addu $v0, $t0, $t1 /* 01260 80B6AC00 844A0002 */ lh $t2, 0x0002($v0) ## 00000002 /* 01264 80B6AC04 844B0004 */ lh $t3, 0x0004($v0) ## 00000004 /* 01268 80B6AC08 844C0006 */ lh $t4, 0x0006($v0) ## 00000006 /* 0126C 80B6AC0C 448A3000 */ mtc1 $t2, $f6 ## $f6 = 0.00 /* 01270 80B6AC10 448B4000 */ mtc1 $t3, $f8 ## $f8 = 0.00 /* 01274 80B6AC14 448C8000 */ mtc1 $t4, $f16 ## $f16 = 0.00 -/* 01278 80B6AC18 468031A0 */ cvt.s.w $f6, $f6 +/* 01278 80B6AC18 468031A0 */ cvt.s.w $f6, $f6 /* 0127C 80B6AC1C 262F0064 */ addiu $t7, $s1, 0x0064 ## $t7 = 00000064 -/* 01280 80B6AC20 AFAF0024 */ sw $t7, 0x0024($sp) +/* 01280 80B6AC20 AFAF0024 */ sw $t7, 0x0024($sp) /* 01284 80B6AC24 02402025 */ or $a0, $s2, $zero ## $a0 = 00000000 /* 01288 80B6AC28 02602825 */ or $a1, $s3, $zero ## $a1 = 00000000 -/* 0128C 80B6AC2C 4600010D */ trunc.w.s $f4, $f0 -/* 01290 80B6AC30 44073000 */ mfc1 $a3, $f6 +/* 0128C 80B6AC2C 4600010D */ trunc.w.s $f4, $f0 +/* 01290 80B6AC30 44073000 */ mfc1 $a3, $f6 /* 01294 80B6AC34 240600FE */ addiu $a2, $zero, 0x00FE ## $a2 = 000000FE -/* 01298 80B6AC38 468042A0 */ cvt.s.w $f10, $f8 -/* 0129C 80B6AC3C 440E2000 */ mfc1 $t6, $f4 -/* 012A0 80B6AC40 AFA00018 */ sw $zero, 0x0018($sp) -/* 012A4 80B6AC44 AFA00020 */ sw $zero, 0x0020($sp) -/* 012A8 80B6AC48 AFAE001C */ sw $t6, 0x001C($sp) -/* 012AC 80B6AC4C 468084A0 */ cvt.s.w $f18, $f16 -/* 012B0 80B6AC50 E7AA0010 */ swc1 $f10, 0x0010($sp) +/* 01298 80B6AC38 468042A0 */ cvt.s.w $f10, $f8 +/* 0129C 80B6AC3C 440E2000 */ mfc1 $t6, $f4 +/* 012A0 80B6AC40 AFA00018 */ sw $zero, 0x0018($sp) +/* 012A4 80B6AC44 AFA00020 */ sw $zero, 0x0020($sp) +/* 012A8 80B6AC48 AFAE001C */ sw $t6, 0x001C($sp) +/* 012AC 80B6AC4C 468084A0 */ cvt.s.w $f18, $f16 +/* 012B0 80B6AC50 E7AA0010 */ swc1 $f10, 0x0010($sp) /* 012B4 80B6AC54 0C00C7D4 */ jal Actor_Spawn ## ActorSpawn -/* 012B8 80B6AC58 E7B20014 */ swc1 $f18, 0x0014($sp) +/* 012B8 80B6AC58 E7B20014 */ swc1 $f18, 0x0014($sp) /* 012BC 80B6AC5C 26310001 */ addiu $s1, $s1, 0x0001 ## $s1 = 00000001 -/* 012C0 80B6AC60 00118C00 */ sll $s1, $s1, 16 -/* 012C4 80B6AC64 00118C03 */ sra $s1, $s1, 16 -/* 012C8 80B6AC68 0230082A */ slt $at, $s1, $s0 -/* 012CC 80B6AC6C 1420FFDE */ bne $at, $zero, .L80B6ABE8 +/* 012C0 80B6AC60 00118C00 */ sll $s1, $s1, 16 +/* 012C4 80B6AC64 00118C03 */ sra $s1, $s1, 16 +/* 012C8 80B6AC68 0230082A */ slt $at, $s1, $s0 +/* 012CC 80B6AC6C 1420FFDE */ bne $at, $zero, .L80B6ABE8 /* 012D0 80B6AC70 00000000 */ nop -/* 012D4 80B6AC74 10000089 */ beq $zero, $zero, .L80B6AE9C -/* 012D8 80B6AC78 8FBF0054 */ lw $ra, 0x0054($sp) +/* 012D4 80B6AC74 10000089 */ beq $zero, $zero, .L80B6AE9C +/* 012D8 80B6AC78 8FBF0054 */ lw $ra, 0x0054($sp) .L80B6AC7C: -/* 012DC 80B6AC7C 28410073 */ slti $at, $v0, 0x0073 -/* 012E0 80B6AC80 14200004 */ bne $at, $zero, .L80B6AC94 +/* 012DC 80B6AC7C 28410073 */ slti $at, $v0, 0x0073 +/* 012E0 80B6AC80 14200004 */ bne $at, $zero, .L80B6AC94 /* 012E4 80B6AC84 3C110600 */ lui $s1, 0x0600 ## $s1 = 06000000 /* 012E8 80B6AC88 240100C8 */ addiu $at, $zero, 0x00C8 ## $at = 000000C8 -/* 012EC 80B6AC8C 14410012 */ bne $v0, $at, .L80B6ACD8 +/* 012EC 80B6AC8C 14410012 */ bne $v0, $at, .L80B6ACD8 /* 012F0 80B6AC90 02602025 */ or $a0, $s3, $zero ## $a0 = 00000000 .L80B6AC94: /* 012F4 80B6AC94 2631007C */ addiu $s1, $s1, 0x007C ## $s1 = 0600007C @@ -521,15 +521,15 @@ glabel Fishing_Init /* 01304 80B6ACA4 02002825 */ or $a1, $s0, $zero ## $a1 = 000001D8 /* 01308 80B6ACA8 02203825 */ or $a3, $s1, $zero ## $a3 = 0600007C /* 0130C 80B6ACAC 02602025 */ or $a0, $s3, $zero ## $a0 = 00000000 -/* 01310 80B6ACB0 AFA00010 */ sw $zero, 0x0010($sp) -/* 01314 80B6ACB4 AFA00014 */ sw $zero, 0x0014($sp) -/* 01318 80B6ACB8 0C0291BE */ jal func_800A46F8 -/* 0131C 80B6ACBC AFA00018 */ sw $zero, 0x0018($sp) +/* 01310 80B6ACB0 AFA00010 */ sw $zero, 0x0010($sp) +/* 01314 80B6ACB4 AFA00014 */ sw $zero, 0x0014($sp) +/* 01318 80B6ACB8 0C0291BE */ jal SkelAnime_InitSV +/* 0131C 80B6ACBC AFA00018 */ sw $zero, 0x0018($sp) /* 01320 80B6ACC0 02002025 */ or $a0, $s0, $zero ## $a0 = 000001D8 /* 01324 80B6ACC4 02202825 */ or $a1, $s1, $zero ## $a1 = 0600007C -/* 01328 80B6ACC8 0C0294D3 */ jal func_800A534C +/* 01328 80B6ACC8 0C0294D3 */ jal SkelAnime_ChangeAnimTransitionRepeat /* 0132C 80B6ACCC 24060000 */ addiu $a2, $zero, 0x0000 ## $a2 = 00000000 -/* 01330 80B6ACD0 10000010 */ beq $zero, $zero, .L80B6AD14 +/* 01330 80B6ACD0 10000010 */ beq $zero, $zero, .L80B6AD14 /* 01334 80B6ACD4 00000000 */ nop .L80B6ACD8: /* 01338 80B6ACD8 3C110601 */ lui $s1, 0x0601 ## $s1 = 06010000 @@ -539,22 +539,22 @@ glabel Fishing_Init /* 01348 80B6ACE8 24C61058 */ addiu $a2, $a2, 0x1058 ## $a2 = 06011058 /* 0134C 80B6ACEC 02002825 */ or $a1, $s0, $zero ## $a1 = 000001D8 /* 01350 80B6ACF0 02203825 */ or $a3, $s1, $zero ## $a3 = 0600CFE0 -/* 01354 80B6ACF4 AFA00010 */ sw $zero, 0x0010($sp) -/* 01358 80B6ACF8 AFA00014 */ sw $zero, 0x0014($sp) -/* 0135C 80B6ACFC 0C0291BE */ jal func_800A46F8 -/* 01360 80B6AD00 AFA00018 */ sw $zero, 0x0018($sp) +/* 01354 80B6ACF4 AFA00010 */ sw $zero, 0x0010($sp) +/* 01358 80B6ACF8 AFA00014 */ sw $zero, 0x0014($sp) +/* 0135C 80B6ACFC 0C0291BE */ jal SkelAnime_InitSV +/* 01360 80B6AD00 AFA00018 */ sw $zero, 0x0018($sp) /* 01364 80B6AD04 02002025 */ or $a0, $s0, $zero ## $a0 = 000001D8 /* 01368 80B6AD08 02202825 */ or $a1, $s1, $zero ## $a1 = 0600CFE0 -/* 0136C 80B6AD0C 0C0294D3 */ jal func_800A534C +/* 0136C 80B6AD0C 0C0294D3 */ jal SkelAnime_ChangeAnimTransitionRepeat /* 01370 80B6AD10 24060000 */ addiu $a2, $zero, 0x0000 ## $a2 = 00000000 .L80B6AD14: /* 01374 80B6AD14 0C02927F */ jal SkelAnime_FrameUpdateMatrix - + /* 01378 80B6AD18 02002025 */ or $a0, $s0, $zero ## $a0 = 000001D8 /* 0137C 80B6AD1C 8658001C */ lh $t8, 0x001C($s2) ## 0000001C /* 01380 80B6AD20 240100C8 */ addiu $at, $zero, 0x00C8 ## $at = 000000C8 /* 01384 80B6AD24 2402000A */ addiu $v0, $zero, 0x000A ## $v0 = 0000000A -/* 01388 80B6AD28 17010012 */ bne $t8, $at, .L80B6AD74 +/* 01388 80B6AD28 17010012 */ bne $t8, $at, .L80B6AD74 /* 0138C 80B6AD2C 3C0C80B8 */ lui $t4, %hi(D_80B7A700) ## $t4 = 80B80000 /* 01390 80B6AD30 24190064 */ addiu $t9, $zero, 0x0064 ## $t9 = 00000064 /* 01394 80B6AD34 A6590158 */ sh $t9, 0x0158($s2) ## 00000158 @@ -562,7 +562,7 @@ glabel Fishing_Init /* 0139C 80B6AD3C 26651C24 */ addiu $a1, $s3, 0x1C24 ## $a1 = 00001C24 /* 013A0 80B6AD40 02403025 */ or $a2, $s2, $zero ## $a2 = 00000000 /* 013A4 80B6AD44 0C00CDD2 */ jal Actor_ChangeType - + /* 013A8 80B6AD48 24070006 */ addiu $a3, $zero, 0x0006 ## $a3 = 00000006 /* 013AC 80B6AD4C 8E480004 */ lw $t0, 0x0004($s2) ## 00000004 /* 013B0 80B6AD50 A240001F */ sb $zero, 0x001F($s2) ## 0000001F @@ -571,100 +571,100 @@ glabel Fishing_Init /* 013BC 80B6AD5C AE490004 */ sw $t1, 0x0004($s2) ## 00000004 /* 013C0 80B6AD60 266507A8 */ addiu $a1, $s3, 0x07A8 ## $a1 = 000007A8 /* 013C4 80B6AD64 0C01E9D9 */ jal Lights_Insert - + /* 013C8 80B6AD68 26460220 */ addiu $a2, $s2, 0x0220 ## $a2 = 00000220 -/* 013CC 80B6AD6C 1000004A */ beq $zero, $zero, .L80B6AE98 +/* 013CC 80B6AD6C 1000004A */ beq $zero, $zero, .L80B6AE98 /* 013D0 80B6AD70 AE42021C */ sw $v0, 0x021C($s2) ## 0000021C .L80B6AD74: /* 013D4 80B6AD74 864A001C */ lh $t2, 0x001C($s2) ## 0000001C /* 013D8 80B6AD78 864D001C */ lh $t5, 0x001C($s2) ## 0000001C /* 013DC 80B6AD7C A6420158 */ sh $v0, 0x0158($s2) ## 00000158 -/* 013E0 80B6AD80 000A5900 */ sll $t3, $t2, 4 +/* 013E0 80B6AD80 000A5900 */ sll $t3, $t2, 4 /* 013E4 80B6AD84 A642015A */ sh $v0, 0x015A($s2) ## 0000015A -/* 013E8 80B6AD88 018B6021 */ addu $t4, $t4, $t3 -/* 013EC 80B6AD8C 918CA700 */ lbu $t4, %lo(D_80B7A700)($t4) +/* 013E8 80B6AD88 018B6021 */ addu $t4, $t4, $t3 +/* 013EC 80B6AD8C 918CA700 */ lbu $t4, %lo(D_80B7A700)($t4) /* 013F0 80B6AD90 3C0180B8 */ lui $at, %hi(D_80B7A70C) ## $at = 80B80000 -/* 013F4 80B6AD94 000D7100 */ sll $t6, $t5, 4 +/* 013F4 80B6AD94 000D7100 */ sll $t6, $t5, 4 /* 013F8 80B6AD98 864F001C */ lh $t7, 0x001C($s2) ## 0000001C -/* 013FC 80B6AD9C 002E0821 */ addu $at, $at, $t6 +/* 013FC 80B6AD9C 002E0821 */ addu $at, $at, $t6 /* 01400 80B6ADA0 A24C0150 */ sb $t4, 0x0150($s2) ## 00000150 -/* 01404 80B6ADA4 C426A70C */ lwc1 $f6, %lo(D_80B7A70C)($at) +/* 01404 80B6ADA4 C426A70C */ lwc1 $f6, %lo(D_80B7A70C)($at) /* 01408 80B6ADA8 3C1980B8 */ lui $t9, %hi(D_80B7A708) ## $t9 = 80B80000 -/* 0140C 80B6ADAC 000FC100 */ sll $t8, $t7, 4 -/* 01410 80B6ADB0 0338C821 */ addu $t9, $t9, $t8 +/* 0140C 80B6ADAC 000FC100 */ sll $t8, $t7, 4 +/* 01410 80B6ADB0 0338C821 */ addu $t9, $t9, $t8 /* 01414 80B6ADB4 E64601A8 */ swc1 $f6, 0x01A8($s2) ## 000001A8 -/* 01418 80B6ADB8 9339A708 */ lbu $t9, %lo(D_80B7A708)($t9) +/* 01418 80B6ADB8 9339A708 */ lbu $t9, %lo(D_80B7A708)($t9) /* 0141C 80B6ADBC 3C014F80 */ lui $at, 0x4F80 ## $at = 4F800000 /* 01420 80B6ADC0 44994000 */ mtc1 $t9, $f8 ## $f8 = -0.00 -/* 01424 80B6ADC4 07210004 */ bgez $t9, .L80B6ADD8 -/* 01428 80B6ADC8 468042A0 */ cvt.s.w $f10, $f8 +/* 01424 80B6ADC4 07210004 */ bgez $t9, .L80B6ADD8 +/* 01428 80B6ADC8 468042A0 */ cvt.s.w $f10, $f8 /* 0142C 80B6ADCC 44818000 */ mtc1 $at, $f16 ## $f16 = 4294967296.00 /* 01430 80B6ADD0 00000000 */ nop -/* 01434 80B6ADD4 46105280 */ add.s $f10, $f10, $f16 +/* 01434 80B6ADD4 46105280 */ add.s $f10, $f10, $f16 .L80B6ADD8: /* 01438 80B6ADD8 E64A01AC */ swc1 $f10, 0x01AC($s2) ## 000001AC /* 0143C 80B6ADDC 3C0180B8 */ lui $at, %hi(D_80B7B384) ## $at = 80B80000 /* 01440 80B6ADE0 0C00CFBE */ jal Math_Rand_ZeroFloat - -/* 01444 80B6ADE4 C42CB384 */ lwc1 $f12, %lo(D_80B7B384)($at) + +/* 01444 80B6ADE4 C42CB384 */ lwc1 $f12, %lo(D_80B7B384)($at) /* 01448 80B6ADE8 C65201AC */ lwc1 $f18, 0x01AC($s2) ## 000001AC /* 0144C 80B6ADEC 3C014282 */ lui $at, 0x4282 ## $at = 42820000 /* 01450 80B6ADF0 44814000 */ mtc1 $at, $f8 ## $f8 = 65.00 -/* 01454 80B6ADF4 46009100 */ add.s $f4, $f18, $f0 +/* 01454 80B6ADF4 46009100 */ add.s $f4, $f18, $f0 /* 01458 80B6ADF8 E64401AC */ swc1 $f4, 0x01AC($s2) ## 000001AC /* 0145C 80B6ADFC C64601AC */ lwc1 $f6, 0x01AC($s2) ## 000001AC -/* 01460 80B6AE00 4606403E */ c.le.s $f8, $f6 +/* 01460 80B6AE00 4606403E */ c.le.s $f8, $f6 /* 01464 80B6AE04 00000000 */ nop -/* 01468 80B6AE08 4500000F */ bc1f .L80B6AE48 +/* 01468 80B6AE08 4500000F */ bc1f .L80B6AE48 /* 0146C 80B6AE0C 00000000 */ nop /* 01470 80B6AE10 0C03F66B */ jal Math_Rand_ZeroOne ## Rand.Next() float /* 01474 80B6AE14 00000000 */ nop /* 01478 80B6AE18 3C0180B8 */ lui $at, %hi(D_80B7B388) ## $at = 80B80000 -/* 0147C 80B6AE1C C430B388 */ lwc1 $f16, %lo(D_80B7B388)($at) +/* 0147C 80B6AE1C C430B388 */ lwc1 $f16, %lo(D_80B7B388)($at) /* 01480 80B6AE20 3C0180B8 */ lui $at, %hi(D_80B7B38C) ## $at = 80B80000 -/* 01484 80B6AE24 4610003C */ c.lt.s $f0, $f16 +/* 01484 80B6AE24 4610003C */ c.lt.s $f0, $f16 /* 01488 80B6AE28 00000000 */ nop -/* 0148C 80B6AE2C 45000006 */ bc1f .L80B6AE48 +/* 0148C 80B6AE2C 45000006 */ bc1f .L80B6AE48 /* 01490 80B6AE30 00000000 */ nop /* 01494 80B6AE34 0C00CFBE */ jal Math_Rand_ZeroFloat - -/* 01498 80B6AE38 C42CB38C */ lwc1 $f12, %lo(D_80B7B38C)($at) + +/* 01498 80B6AE38 C42CB38C */ lwc1 $f12, %lo(D_80B7B38C)($at) /* 0149C 80B6AE3C C64A01AC */ lwc1 $f10, 0x01AC($s2) ## 000001AC -/* 014A0 80B6AE40 46005480 */ add.s $f18, $f10, $f0 +/* 014A0 80B6AE40 46005480 */ add.s $f18, $f10, $f0 /* 014A4 80B6AE44 E65201AC */ swc1 $f18, 0x01AC($s2) ## 000001AC .L80B6AE48: /* 014A8 80B6AE48 3C088016 */ lui $t0, 0x8016 ## $t0 = 80160000 /* 014AC 80B6AE4C 8D08FA90 */ lw $t0, -0x0570($t0) ## 8015FA90 /* 014B0 80B6AE50 3C0980B8 */ lui $t1, %hi(D_80B7E075) ## $t1 = 80B80000 /* 014B4 80B6AE54 850209E0 */ lh $v0, 0x09E0($t0) ## 801609E0 -/* 014B8 80B6AE58 10400007 */ beq $v0, $zero, .L80B6AE78 +/* 014B8 80B6AE58 10400007 */ beq $v0, $zero, .L80B6AE78 /* 014BC 80B6AE5C 00000000 */ nop /* 014C0 80B6AE60 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 014C4 80B6AE64 3C0142A0 */ lui $at, 0x42A0 ## $at = 42A00000 /* 014C8 80B6AE68 44814000 */ mtc1 $at, $f8 ## $f8 = 80.00 -/* 014CC 80B6AE6C 468021A0 */ cvt.s.w $f6, $f4 -/* 014D0 80B6AE70 46083400 */ add.s $f16, $f6, $f8 +/* 014CC 80B6AE6C 468021A0 */ cvt.s.w $f6, $f4 +/* 014D0 80B6AE70 46083400 */ add.s $f16, $f6, $f8 /* 014D4 80B6AE74 E65001AC */ swc1 $f16, 0x01AC($s2) ## 000001AC .L80B6AE78: -/* 014D8 80B6AE78 9129E075 */ lbu $t1, %lo(D_80B7E075)($t1) +/* 014D8 80B6AE78 9129E075 */ lbu $t1, %lo(D_80B7E075)($t1) /* 014DC 80B6AE7C 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 014E0 80B6AE80 15210005 */ bne $t1, $at, .L80B6AE98 +/* 014E0 80B6AE80 15210005 */ bne $t1, $at, .L80B6AE98 /* 014E4 80B6AE84 3C0180B8 */ lui $at, %hi(D_80B7B390) ## $at = 80B80000 -/* 014E8 80B6AE88 C432B390 */ lwc1 $f18, %lo(D_80B7B390)($at) +/* 014E8 80B6AE88 C432B390 */ lwc1 $f18, %lo(D_80B7B390)($at) /* 014EC 80B6AE8C C64A01AC */ lwc1 $f10, 0x01AC($s2) ## 000001AC -/* 014F0 80B6AE90 46125102 */ mul.s $f4, $f10, $f18 +/* 014F0 80B6AE90 46125102 */ mul.s $f4, $f10, $f18 /* 014F4 80B6AE94 E64401AC */ swc1 $f4, 0x01AC($s2) ## 000001AC .L80B6AE98: -/* 014F8 80B6AE98 8FBF0054 */ lw $ra, 0x0054($sp) +/* 014F8 80B6AE98 8FBF0054 */ lw $ra, 0x0054($sp) .L80B6AE9C: -/* 014FC 80B6AE9C D7B40030 */ ldc1 $f20, 0x0030($sp) -/* 01500 80B6AEA0 D7B60038 */ ldc1 $f22, 0x0038($sp) -/* 01504 80B6AEA4 8FB00044 */ lw $s0, 0x0044($sp) -/* 01508 80B6AEA8 8FB10048 */ lw $s1, 0x0048($sp) -/* 0150C 80B6AEAC 8FB2004C */ lw $s2, 0x004C($sp) -/* 01510 80B6AEB0 8FB30050 */ lw $s3, 0x0050($sp) -/* 01514 80B6AEB4 03E00008 */ jr $ra +/* 014FC 80B6AE9C D7B40030 */ ldc1 $f20, 0x0030($sp) +/* 01500 80B6AEA0 D7B60038 */ ldc1 $f22, 0x0038($sp) +/* 01504 80B6AEA4 8FB00044 */ lw $s0, 0x0044($sp) +/* 01508 80B6AEA8 8FB10048 */ lw $s1, 0x0048($sp) +/* 0150C 80B6AEAC 8FB2004C */ lw $s2, 0x004C($sp) +/* 01510 80B6AEB0 8FB30050 */ lw $s3, 0x0050($sp) +/* 01514 80B6AEB4 03E00008 */ jr $ra /* 01518 80B6AEB8 27BD0078 */ addiu $sp, $sp, 0x0078 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Fishing/Fishing_Update.s b/asm/non_matchings/overlays/actors/ovl_Fishing/Fishing_Update.s index eaf33fed11..f703962947 100644 --- a/asm/non_matchings/overlays/actors/ovl_Fishing/Fishing_Update.s +++ b/asm/non_matchings/overlays/actors/ovl_Fishing/Fishing_Update.s @@ -3,11 +3,11 @@ glabel Fishing_Update /* 07C58 80B715F8 240E000A */ addiu $t6, $zero, 0x000A ## $t6 = 0000000A /* 07C5C 80B715FC 3C01442F */ lui $at, 0x442F ## $at = 442F0000 /* 07C60 80B71600 44812000 */ mtc1 $at, $f4 ## $f4 = 700.00 -/* 07C64 80B71604 AFBF0034 */ sw $ra, 0x0034($sp) -/* 07C68 80B71608 AFB10030 */ sw $s1, 0x0030($sp) -/* 07C6C 80B7160C AFB0002C */ sw $s0, 0x002C($sp) -/* 07C70 80B71610 F7B40020 */ sdc1 $f20, 0x0020($sp) -/* 07C74 80B71614 A7AE0134 */ sh $t6, 0x0134($sp) +/* 07C64 80B71604 AFBF0034 */ sw $ra, 0x0034($sp) +/* 07C68 80B71608 AFB10030 */ sw $s1, 0x0030($sp) +/* 07C6C 80B7160C AFB0002C */ sw $s0, 0x002C($sp) +/* 07C70 80B71610 F7B40020 */ sdc1 $f20, 0x0020($sp) +/* 07C74 80B71614 A7AE0134 */ sh $t6, 0x0134($sp) /* 07C78 80B71618 908F0150 */ lbu $t7, 0x0150($a0) ## 00000150 /* 07C7C 80B7161C 3C014248 */ lui $at, 0x4248 ## $at = 42480000 /* 07C80 80B71620 44813000 */ mtc1 $at, $f6 ## $f6 = 50.00 @@ -15,60 +15,60 @@ glabel Fishing_Update /* 07C88 80B71628 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 07C8C 80B7162C 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 /* 07C90 80B71630 E48400F4 */ swc1 $f4, 0x00F4($a0) ## 000000F4 -/* 07C94 80B71634 15E0000A */ bne $t7, $zero, .L80B71660 +/* 07C94 80B71634 15E0000A */ bne $t7, $zero, .L80B71660 /* 07C98 80B71638 E48600F8 */ swc1 $f6, 0x00F8($a0) ## 000000F8 /* 07C9C 80B7163C 3C0180B8 */ lui $at, %hi(D_80B7B564) ## $at = 80B80000 -/* 07CA0 80B71640 C42AB564 */ lwc1 $f10, %lo(D_80B7B564)($at) +/* 07CA0 80B71640 C42AB564 */ lwc1 $f10, %lo(D_80B7B564)($at) /* 07CA4 80B71644 C5080068 */ lwc1 $f8, 0x0068($t0) ## 00000068 /* 07CA8 80B71648 3C013E80 */ lui $at, 0x3E80 ## $at = 3E800000 /* 07CAC 80B7164C 44813000 */ mtc1 $at, $f6 ## $f6 = 0.25 -/* 07CB0 80B71650 460A4102 */ mul.s $f4, $f8, $f10 -/* 07CB4 80B71654 46062200 */ add.s $f8, $f4, $f6 -/* 07CB8 80B71658 10000009 */ beq $zero, $zero, .L80B71680 -/* 07CBC 80B7165C E7A80118 */ swc1 $f8, 0x0118($sp) +/* 07CB0 80B71650 460A4102 */ mul.s $f4, $f8, $f10 +/* 07CB4 80B71654 46062200 */ add.s $f8, $f4, $f6 +/* 07CB8 80B71658 10000009 */ beq $zero, $zero, .L80B71680 +/* 07CBC 80B7165C E7A80118 */ swc1 $f8, 0x0118($sp) .L80B71660: /* 07CC0 80B71660 3C0180B8 */ lui $at, %hi(D_80B7B568) ## $at = 80B80000 -/* 07CC4 80B71664 C424B568 */ lwc1 $f4, %lo(D_80B7B568)($at) +/* 07CC4 80B71664 C424B568 */ lwc1 $f4, %lo(D_80B7B568)($at) /* 07CC8 80B71668 C50A0068 */ lwc1 $f10, 0x0068($t0) ## 00000068 /* 07CCC 80B7166C 3C013E80 */ lui $at, 0x3E80 ## $at = 3E800000 /* 07CD0 80B71670 44814000 */ mtc1 $at, $f8 ## $f8 = 0.25 -/* 07CD4 80B71674 46045182 */ mul.s $f6, $f10, $f4 -/* 07CD8 80B71678 46083280 */ add.s $f10, $f6, $f8 -/* 07CDC 80B7167C E7AA0118 */ swc1 $f10, 0x0118($sp) +/* 07CD4 80B71674 46045182 */ mul.s $f6, $f10, $f4 +/* 07CD8 80B71678 46083280 */ add.s $f10, $f6, $f8 +/* 07CDC 80B7167C E7AA0118 */ swc1 $f10, 0x0118($sp) .L80B71680: /* 07CE0 80B71680 3C1880B8 */ lui $t8, %hi(D_80B7E0B0) ## $t8 = 80B80000 -/* 07CE4 80B71684 8718E0B0 */ lh $t8, %lo(D_80B7E0B0)($t8) -/* 07CE8 80B71688 1700000E */ bne $t8, $zero, .L80B716C4 +/* 07CE4 80B71684 8718E0B0 */ lh $t8, %lo(D_80B7E0B0)($t8) +/* 07CE8 80B71688 1700000E */ bne $t8, $zero, .L80B716C4 /* 07CEC 80B7168C 3C1980B8 */ lui $t9, %hi(D_80B7FEC4) ## $t9 = 80B80000 -/* 07CF0 80B71690 8739FEC4 */ lh $t9, %lo(D_80B7FEC4)($t9) -/* 07CF4 80B71694 1720000B */ bne $t9, $zero, .L80B716C4 +/* 07CF0 80B71690 8739FEC4 */ lh $t9, %lo(D_80B7FEC4)($t9) +/* 07CF4 80B71694 1720000B */ bne $t9, $zero, .L80B716C4 /* 07CF8 80B71698 3C0180B8 */ lui $at, %hi(D_80B7B56C) ## $at = 80B80000 -/* 07CFC 80B7169C C424B56C */ lwc1 $f4, %lo(D_80B7B56C)($at) +/* 07CFC 80B7169C C424B56C */ lwc1 $f4, %lo(D_80B7B56C)($at) /* 07D00 80B716A0 C506002C */ lwc1 $f6, 0x002C($t0) ## 0000002C -/* 07D04 80B716A4 4606203C */ c.lt.s $f4, $f6 +/* 07D04 80B716A4 4606203C */ c.lt.s $f4, $f6 /* 07D08 80B716A8 00000000 */ nop -/* 07D0C 80B716AC 4502000B */ bc1fl .L80B716DC +/* 07D0C 80B716AC 4502000B */ bc1fl .L80B716DC /* 07D10 80B716B0 8E0C0004 */ lw $t4, 0x0004($s0) ## 00000004 /* 07D14 80B716B4 86090158 */ lh $t1, 0x0158($s0) ## 00000158 /* 07D18 80B716B8 24010064 */ addiu $at, $zero, 0x0064 ## $at = 00000064 -/* 07D1C 80B716BC 51210007 */ beql $t1, $at, .L80B716DC +/* 07D1C 80B716BC 51210007 */ beql $t1, $at, .L80B716DC /* 07D20 80B716C0 8E0C0004 */ lw $t4, 0x0004($s0) ## 00000004 .L80B716C4: /* 07D24 80B716C4 8E0A0004 */ lw $t2, 0x0004($s0) ## 00000004 /* 07D28 80B716C8 2401FFFE */ addiu $at, $zero, 0xFFFE ## $at = FFFFFFFE -/* 07D2C 80B716CC 01415824 */ and $t3, $t2, $at -/* 07D30 80B716D0 10000025 */ beq $zero, $zero, .L80B71768 +/* 07D2C 80B716CC 01415824 */ and $t3, $t2, $at +/* 07D30 80B716D0 10000025 */ beq $zero, $zero, .L80B71768 /* 07D34 80B716D4 AE0B0004 */ sw $t3, 0x0004($s0) ## 00000004 /* 07D38 80B716D8 8E0C0004 */ lw $t4, 0x0004($s0) ## 00000004 .L80B716DC: /* 07D3C 80B716DC 3C0E80B8 */ lui $t6, %hi(D_80B7A694) ## $t6 = 80B80000 /* 07D40 80B716E0 358D0001 */ ori $t5, $t4, 0x0001 ## $t5 = 00000001 /* 07D44 80B716E4 AE0D0004 */ sw $t5, 0x0004($s0) ## 00000004 -/* 07D48 80B716E8 85CEA694 */ lh $t6, %lo(D_80B7A694)($t6) -/* 07D4C 80B716EC 11C00018 */ beq $t6, $zero, .L80B71750 +/* 07D48 80B716E8 85CEA694 */ lh $t6, %lo(D_80B7A694)($t6) +/* 07D4C 80B716EC 11C00018 */ beq $t6, $zero, .L80B71750 /* 07D50 80B716F0 3C0280B8 */ lui $v0, %hi(D_80B7E0B2) ## $v0 = 80B80000 -/* 07D54 80B716F4 8442E0B2 */ lh $v0, %lo(D_80B7E0B2)($v0) -/* 07D58 80B716F8 14400009 */ bne $v0, $zero, .L80B71720 +/* 07D54 80B716F4 8442E0B2 */ lh $v0, %lo(D_80B7E0B2)($v0) +/* 07D58 80B716F8 14400009 */ bne $v0, $zero, .L80B71720 /* 07D5C 80B716FC 3C0F80B8 */ lui $t7, %hi(D_80B7E0B8) ## $t7 = 80B80000 /* 07D60 80B71700 25EFE0B8 */ addiu $t7, $t7, %lo(D_80B7E0B8) ## $t7 = 80B7E0B8 /* 07D64 80B71704 8DF90000 */ lw $t9, 0x0000($t7) ## 80B7E0B8 @@ -76,21 +76,21 @@ glabel Fishing_Update /* 07D6C 80B7170C 8DF80004 */ lw $t8, 0x0004($t7) ## 80B7E0BC /* 07D70 80B71710 AE18003C */ sw $t8, 0x003C($s0) ## 0000003C /* 07D74 80B71714 8DF90008 */ lw $t9, 0x0008($t7) ## 80B7E0C0 -/* 07D78 80B71718 1000000D */ beq $zero, $zero, .L80B71750 +/* 07D78 80B71718 1000000D */ beq $zero, $zero, .L80B71750 /* 07D7C 80B7171C AE190040 */ sw $t9, 0x0040($s0) ## 00000040 .L80B71720: /* 07D80 80B71720 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 07D84 80B71724 5441000B */ bnel $v0, $at, .L80B71754 +/* 07D84 80B71724 5441000B */ bnel $v0, $at, .L80B71754 /* 07D88 80B71728 8E0C0024 */ lw $t4, 0x0024($s0) ## 00000024 /* 07D8C 80B7172C 44804000 */ mtc1 $zero, $f8 ## $f8 = 0.00 /* 07D90 80B71730 24090001 */ addiu $t1, $zero, 0x0001 ## $t1 = 00000001 /* 07D94 80B71734 3C0180B8 */ lui $at, %hi(D_80B7A6CC) ## $at = 80B80000 -/* 07D98 80B71738 A029A6CC */ sb $t1, %lo(D_80B7A6CC)($at) +/* 07D98 80B71738 A029A6CC */ sb $t1, %lo(D_80B7A6CC)($at) /* 07D9C 80B7173C 3C0180B8 */ lui $at, %hi(D_80B7FED0) ## $at = 80B80000 -/* 07DA0 80B71740 E428FED0 */ swc1 $f8, %lo(D_80B7FED0)($at) +/* 07DA0 80B71740 E428FED0 */ swc1 $f8, %lo(D_80B7FED0)($at) /* 07DA4 80B71744 3C0180B8 */ lui $at, %hi(D_80B7E088) ## $at = 80B80000 /* 07DA8 80B71748 240A0002 */ addiu $t2, $zero, 0x0002 ## $t2 = 00000002 -/* 07DAC 80B7174C A02AE088 */ sb $t2, %lo(D_80B7E088)($at) +/* 07DAC 80B7174C A02AE088 */ sb $t2, %lo(D_80B7E088)($at) .L80B71750: /* 07DB0 80B71750 8E0C0024 */ lw $t4, 0x0024($s0) ## 00000024 .L80B71754: @@ -104,37 +104,37 @@ glabel Fishing_Update /* 07DCC 80B7176C 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 /* 07DD0 80B71770 25AE0001 */ addiu $t6, $t5, 0x0001 ## $t6 = 00000002 /* 07DD4 80B71774 A60E015C */ sh $t6, 0x015C($s0) ## 0000015C -/* 07DD8 80B71778 00027840 */ sll $t7, $v0, 1 +/* 07DD8 80B71778 00027840 */ sll $t7, $v0, 1 .L80B7177C: -/* 07DDC 80B7177C 020F1821 */ addu $v1, $s0, $t7 +/* 07DDC 80B7177C 020F1821 */ addu $v1, $s0, $t7 /* 07DE0 80B71780 8464017A */ lh $a0, 0x017A($v1) ## 0000017A -/* 07DE4 80B71784 10800002 */ beq $a0, $zero, .L80B71790 +/* 07DE4 80B71784 10800002 */ beq $a0, $zero, .L80B71790 /* 07DE8 80B71788 2498FFFF */ addiu $t8, $a0, 0xFFFF ## $t8 = FFFFFFFF /* 07DEC 80B7178C A478017A */ sh $t8, 0x017A($v1) ## 0000017A .L80B71790: /* 07DF0 80B71790 24420001 */ addiu $v0, $v0, 0x0001 ## $v0 = 00000001 -/* 07DF4 80B71794 00021400 */ sll $v0, $v0, 16 -/* 07DF8 80B71798 00021403 */ sra $v0, $v0, 16 -/* 07DFC 80B7179C 28410004 */ slti $at, $v0, 0x0004 -/* 07E00 80B717A0 5420FFF6 */ bnel $at, $zero, .L80B7177C -/* 07E04 80B717A4 00027840 */ sll $t7, $v0, 1 +/* 07DF4 80B71794 00021400 */ sll $v0, $v0, 16 +/* 07DF8 80B71798 00021403 */ sra $v0, $v0, 16 +/* 07DFC 80B7179C 28410004 */ slti $at, $v0, 0x0004 +/* 07E00 80B717A0 5420FFF6 */ bnel $at, $zero, .L80B7177C +/* 07E04 80B717A4 00027840 */ sll $t7, $v0, 1 /* 07E08 80B717A8 860201A4 */ lh $v0, 0x01A4($s0) ## 000001A4 -/* 07E0C 80B717AC 10400002 */ beq $v0, $zero, .L80B717B8 +/* 07E0C 80B717AC 10400002 */ beq $v0, $zero, .L80B717B8 /* 07E10 80B717B0 2459FFFF */ addiu $t9, $v0, 0xFFFF ## $t9 = 00000000 /* 07E14 80B717B4 A61901A4 */ sh $t9, 0x01A4($s0) ## 000001A4 .L80B717B8: /* 07E18 80B717B8 860201A2 */ lh $v0, 0x01A2($s0) ## 000001A2 -/* 07E1C 80B717BC 10400002 */ beq $v0, $zero, .L80B717C8 +/* 07E1C 80B717BC 10400002 */ beq $v0, $zero, .L80B717C8 /* 07E20 80B717C0 2449FFFF */ addiu $t1, $v0, 0xFFFF ## $t1 = 00000000 /* 07E24 80B717C4 A60901A2 */ sh $t1, 0x01A2($s0) ## 000001A2 .L80B717C8: /* 07E28 80B717C8 860201A0 */ lh $v0, 0x01A0($s0) ## 000001A0 -/* 07E2C 80B717CC 10400002 */ beq $v0, $zero, .L80B717D8 +/* 07E2C 80B717CC 10400002 */ beq $v0, $zero, .L80B717D8 /* 07E30 80B717D0 244AFFFF */ addiu $t2, $v0, 0xFFFF ## $t2 = 00000000 /* 07E34 80B717D4 A60A01A0 */ sh $t2, 0x01A0($s0) ## 000001A0 .L80B717D8: /* 07E38 80B717D8 92020151 */ lbu $v0, 0x0151($s0) ## 00000151 -/* 07E3C 80B717DC 10400002 */ beq $v0, $zero, .L80B717E8 +/* 07E3C 80B717DC 10400002 */ beq $v0, $zero, .L80B717E8 /* 07E40 80B717E0 244BFFFF */ addiu $t3, $v0, 0xFFFF ## $t3 = 00000000 /* 07E44 80B717E4 A20B0151 */ sb $t3, 0x0151($s0) ## 00000151 .L80B717E8: @@ -142,188 +142,188 @@ glabel Fishing_Update /* 07E4C 80B717EC 4481A000 */ mtc1 $at, $f20 ## $f20 = 1.00 /* 07E50 80B717F0 8E050190 */ lw $a1, 0x0190($s0) ## 00000190 /* 07E54 80B717F4 3C073E4C */ lui $a3, 0x3E4C ## $a3 = 3E4C0000 -/* 07E58 80B717F8 4406A000 */ mfc1 $a2, $f20 +/* 07E58 80B717F8 4406A000 */ mfc1 $a2, $f20 /* 07E5C 80B717FC 34E7CCCD */ ori $a3, $a3, 0xCCCD ## $a3 = 3E4CCCCD -/* 07E60 80B71800 AFA800E0 */ sw $t0, 0x00E0($sp) +/* 07E60 80B71800 AFA800E0 */ sw $t0, 0x00E0($sp) /* 07E64 80B71804 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 07E68 80B71808 26040198 */ addiu $a0, $s0, 0x0198 ## $a0 = 00000198 /* 07E6C 80B7180C 860C0158 */ lh $t4, 0x0158($s0) ## 00000158 /* 07E70 80B71810 24010006 */ addiu $at, $zero, 0x0006 ## $at = 00000006 -/* 07E74 80B71814 15810008 */ bne $t4, $at, .L80B71838 +/* 07E74 80B71814 15810008 */ bne $t4, $at, .L80B71838 /* 07E78 80B71818 3C063E4C */ lui $a2, 0x3E4C ## $a2 = 3E4C0000 /* 07E7C 80B7181C 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3E4CCCCD /* 07E80 80B71820 2604019C */ addiu $a0, $s0, 0x019C ## $a0 = 0000019C /* 07E84 80B71824 8E050194 */ lw $a1, 0x0194($s0) ## 00000194 /* 07E88 80B71828 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 07E8C 80B7182C 3C074348 */ lui $a3, 0x4348 ## $a3 = 43480000 -/* 07E90 80B71830 10000027 */ beq $zero, $zero, .L80B718D0 +/* 07E90 80B71830 10000027 */ beq $zero, $zero, .L80B718D0 /* 07E94 80B71834 26040170 */ addiu $a0, $s0, 0x0170 ## $a0 = 00000170 .L80B71838: /* 07E98 80B71838 8E2D07C0 */ lw $t5, 0x07C0($s1) ## 000007C0 /* 07E9C 80B7183C C6060028 */ lwc1 $f6, 0x0028($s0) ## 00000028 -/* 07EA0 80B71840 4600A006 */ mov.s $f0, $f20 +/* 07EA0 80B71840 4600A006 */ mov.s $f0, $f20 /* 07EA4 80B71844 8DAE0028 */ lw $t6, 0x0028($t5) ## 00000028 -/* 07EA8 80B71848 4600A086 */ mov.s $f2, $f20 +/* 07EA8 80B71848 4600A086 */ mov.s $f2, $f20 /* 07EAC 80B7184C 85CF0002 */ lh $t7, 0x0002($t6) ## 00000002 /* 07EB0 80B71850 448F5000 */ mtc1 $t7, $f10 ## $f10 = 0.00 /* 07EB4 80B71854 00000000 */ nop -/* 07EB8 80B71858 46805120 */ cvt.s.w $f4, $f10 -/* 07EBC 80B7185C 4606203C */ c.lt.s $f4, $f6 +/* 07EB8 80B71858 46805120 */ cvt.s.w $f4, $f10 +/* 07EBC 80B7185C 4606203C */ c.lt.s $f4, $f6 /* 07EC0 80B71860 00000000 */ nop -/* 07EC4 80B71864 4500000E */ bc1f .L80B718A0 +/* 07EC4 80B71864 4500000E */ bc1f .L80B718A0 /* 07EC8 80B71868 3C188016 */ lui $t8, 0x8016 ## $t8 = 80160000 /* 07ECC 80B7186C 8F18FA90 */ lw $t8, -0x0570($t8) ## 8015FA90 /* 07ED0 80B71870 3C0180B8 */ lui $at, %hi(D_80B7B570) ## $at = 80B80000 -/* 07ED4 80B71874 C424B570 */ lwc1 $f4, %lo(D_80B7B570)($at) +/* 07ED4 80B71874 C424B570 */ lwc1 $f4, %lo(D_80B7B570)($at) /* 07ED8 80B71878 87190A54 */ lh $t9, 0x0A54($t8) ## 80160A54 /* 07EDC 80B7187C 3C013FC0 */ lui $at, 0x3FC0 ## $at = 3FC00000 /* 07EE0 80B71880 44994000 */ mtc1 $t9, $f8 ## $f8 = 0.00 /* 07EE4 80B71884 00000000 */ nop -/* 07EE8 80B71888 468042A0 */ cvt.s.w $f10, $f8 +/* 07EE8 80B71888 468042A0 */ cvt.s.w $f10, $f8 /* 07EEC 80B7188C 44814000 */ mtc1 $at, $f8 ## $f8 = 1.50 /* 07EF0 80B71890 3C014040 */ lui $at, 0x4040 ## $at = 40400000 /* 07EF4 80B71894 44811000 */ mtc1 $at, $f2 ## $f2 = 3.00 -/* 07EF8 80B71898 46045182 */ mul.s $f6, $f10, $f4 -/* 07EFC 80B7189C 46083000 */ add.s $f0, $f6, $f8 +/* 07EF8 80B71898 46045182 */ mul.s $f6, $f10, $f4 +/* 07EFC 80B7189C 46083000 */ add.s $f0, $f6, $f8 .L80B718A0: /* 07F00 80B718A0 C60A0194 */ lwc1 $f10, 0x0194($s0) ## 00000194 /* 07F04 80B718A4 3C0143FA */ lui $at, 0x43FA ## $at = 43FA0000 /* 07F08 80B718A8 44813000 */ mtc1 $at, $f6 ## $f6 = 500.00 -/* 07F0C 80B718AC 46005102 */ mul.s $f4, $f10, $f0 -/* 07F10 80B718B0 4406A000 */ mfc1 $a2, $f20 +/* 07F0C 80B718AC 46005102 */ mul.s $f4, $f10, $f0 +/* 07F10 80B718B0 4406A000 */ mfc1 $a2, $f20 /* 07F14 80B718B4 2604019C */ addiu $a0, $s0, 0x019C ## $a0 = 0000019C -/* 07F18 80B718B8 46023202 */ mul.s $f8, $f6, $f2 -/* 07F1C 80B718BC 44052000 */ mfc1 $a1, $f4 -/* 07F20 80B718C0 44074000 */ mfc1 $a3, $f8 +/* 07F18 80B718B8 46023202 */ mul.s $f8, $f6, $f2 +/* 07F1C 80B718BC 44052000 */ mfc1 $a1, $f4 +/* 07F20 80B718C0 44074000 */ mfc1 $a3, $f8 /* 07F24 80B718C4 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 07F28 80B718C8 00000000 */ nop /* 07F2C 80B718CC 26040170 */ addiu $a0, $s0, 0x0170 ## $a0 = 00000170 .L80B718D0: -/* 07F30 80B718D0 AFA40040 */ sw $a0, 0x0040($sp) +/* 07F30 80B718D0 AFA40040 */ sw $a0, 0x0040($sp) /* 07F34 80B718D4 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 07F38 80B718D8 24060005 */ addiu $a2, $zero, 0x0005 ## $a2 = 00000005 /* 07F3C 80B718DC 0C01E1EF */ jal Math_SmoothScaleMaxS - + /* 07F40 80B718E0 240701F4 */ addiu $a3, $zero, 0x01F4 ## $a3 = 000001F4 /* 07F44 80B718E4 92090150 */ lbu $t1, 0x0150($s0) ## 00000150 -/* 07F48 80B718E8 1520002A */ bne $t1, $zero, .L80B71994 +/* 07F48 80B718E8 1520002A */ bne $t1, $zero, .L80B71994 /* 07F4C 80B718EC 3C014170 */ lui $at, 0x4170 ## $at = 41700000 /* 07F50 80B718F0 44812000 */ mtc1 $at, $f4 ## $f4 = 15.00 /* 07F54 80B718F4 C60A01AC */ lwc1 $f10, 0x01AC($s0) ## 000001AC /* 07F58 80B718F8 3C0180B8 */ lui $at, %hi(D_80B7B574) ## $at = 80B80000 -/* 07F5C 80B718FC C428B574 */ lwc1 $f8, %lo(D_80B7B574)($at) -/* 07F60 80B71900 46045182 */ mul.s $f6, $f10, $f4 +/* 07F5C 80B718FC C428B574 */ lwc1 $f8, %lo(D_80B7B574)($at) +/* 07F60 80B71900 46045182 */ mul.s $f6, $f10, $f4 /* 07F64 80B71904 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 07F68 80B71908 46083282 */ mul.s $f10, $f6, $f8 -/* 07F6C 80B7190C 44055000 */ mfc1 $a1, $f10 +/* 07F68 80B71908 46083282 */ mul.s $f10, $f6, $f8 +/* 07F6C 80B7190C 44055000 */ mfc1 $a1, $f10 /* 07F70 80B71910 0C00B58B */ jal Actor_SetScale - + /* 07F74 80B71914 00000000 */ nop /* 07F78 80B71918 C604018C */ lwc1 $f4, 0x018C($s0) ## 0000018C /* 07F7C 80B7191C C6060198 */ lwc1 $f6, 0x0198($s0) ## 00000198 -/* 07F80 80B71920 46062200 */ add.s $f8, $f4, $f6 +/* 07F80 80B71920 46062200 */ add.s $f8, $f4, $f6 /* 07F84 80B71924 E608018C */ swc1 $f8, 0x018C($s0) ## 0000018C /* 07F88 80B71928 0C041184 */ jal cosf - + /* 07F8C 80B7192C C60C018C */ lwc1 $f12, 0x018C($s0) ## 0000018C /* 07F90 80B71930 C60A019C */ lwc1 $f10, 0x019C($s0) ## 0000019C /* 07F94 80B71934 860A016E */ lh $t2, 0x016E($s0) ## 0000016E /* 07F98 80B71938 3C0180B8 */ lui $at, %hi(D_80B7B578) ## $at = 80B80000 -/* 07F9C 80B7193C 460A0102 */ mul.s $f4, $f0, $f10 +/* 07F9C 80B7193C 460A0102 */ mul.s $f4, $f0, $f10 /* 07FA0 80B71940 C608018C */ lwc1 $f8, 0x018C($s0) ## 0000018C -/* 07FA4 80B71944 4600218D */ trunc.w.s $f6, $f4 -/* 07FA8 80B71948 440E3000 */ mfc1 $t6, $f6 +/* 07FA4 80B71944 4600218D */ trunc.w.s $f6, $f4 +/* 07FA8 80B71948 440E3000 */ mfc1 $t6, $f6 /* 07FAC 80B7194C 00000000 */ nop -/* 07FB0 80B71950 014E7821 */ addu $t7, $t2, $t6 +/* 07FB0 80B71950 014E7821 */ addu $t7, $t2, $t6 /* 07FB4 80B71954 A60F016C */ sh $t7, 0x016C($s0) ## 0000016C -/* 07FB8 80B71958 C42AB578 */ lwc1 $f10, %lo(D_80B7B578)($at) +/* 07FB8 80B71958 C42AB578 */ lwc1 $f10, %lo(D_80B7B578)($at) /* 07FBC 80B7195C 0C041184 */ jal cosf - -/* 07FC0 80B71960 460A4300 */ add.s $f12, $f8, $f10 + +/* 07FC0 80B71960 460A4300 */ add.s $f12, $f8, $f10 /* 07FC4 80B71964 C604019C */ lwc1 $f4, 0x019C($s0) ## 0000019C /* 07FC8 80B71968 3C0180B8 */ lui $at, %hi(D_80B7B57C) ## $at = 80B80000 -/* 07FCC 80B7196C C428B57C */ lwc1 $f8, %lo(D_80B7B57C)($at) -/* 07FD0 80B71970 46040182 */ mul.s $f6, $f0, $f4 +/* 07FCC 80B7196C C428B57C */ lwc1 $f8, %lo(D_80B7B57C)($at) +/* 07FD0 80B71970 46040182 */ mul.s $f6, $f0, $f4 /* 07FD4 80B71974 860C016E */ lh $t4, 0x016E($s0) ## 0000016E -/* 07FD8 80B71978 46083282 */ mul.s $f10, $f6, $f8 -/* 07FDC 80B7197C 4600510D */ trunc.w.s $f4, $f10 -/* 07FE0 80B71980 440B2000 */ mfc1 $t3, $f4 +/* 07FD8 80B71978 46083282 */ mul.s $f10, $f6, $f8 +/* 07FDC 80B7197C 4600510D */ trunc.w.s $f4, $f10 +/* 07FE0 80B71980 440B2000 */ mfc1 $t3, $f4 /* 07FE4 80B71984 00000000 */ nop -/* 07FE8 80B71988 018B6821 */ addu $t5, $t4, $t3 -/* 07FEC 80B7198C 10000043 */ beq $zero, $zero, .L80B71A9C +/* 07FE8 80B71988 018B6821 */ addu $t5, $t4, $t3 +/* 07FEC 80B7198C 10000043 */ beq $zero, $zero, .L80B71A9C /* 07FF0 80B71990 A60D0176 */ sh $t5, 0x0176($s0) ## 00000176 .L80B71994: /* 07FF4 80B71994 3C014282 */ lui $at, 0x4282 ## $at = 42820000 /* 07FF8 80B71998 44814000 */ mtc1 $at, $f8 ## $f8 = 65.00 /* 07FFC 80B7199C C60601AC */ lwc1 $f6, 0x01AC($s0) ## 000001AC /* 08000 80B719A0 3C0180B8 */ lui $at, %hi(D_80B7B580) ## $at = 80B80000 -/* 08004 80B719A4 C424B580 */ lwc1 $f4, %lo(D_80B7B580)($at) -/* 08008 80B719A8 46083282 */ mul.s $f10, $f6, $f8 +/* 08004 80B719A4 C424B580 */ lwc1 $f4, %lo(D_80B7B580)($at) +/* 08008 80B719A8 46083282 */ mul.s $f10, $f6, $f8 /* 0800C 80B719AC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 08010 80B719B0 46045182 */ mul.s $f6, $f10, $f4 -/* 08014 80B719B4 44053000 */ mfc1 $a1, $f6 +/* 08010 80B719B0 46045182 */ mul.s $f6, $f10, $f4 +/* 08014 80B719B4 44053000 */ mfc1 $a1, $f6 /* 08018 80B719B8 0C00B58B */ jal Actor_SetScale - + /* 0801C 80B719BC 00000000 */ nop /* 08020 80B719C0 3C0180B8 */ lui $at, %hi(D_80B7B584) ## $at = 80B80000 -/* 08024 80B719C4 C42AB584 */ lwc1 $f10, %lo(D_80B7B584)($at) +/* 08024 80B719C4 C42AB584 */ lwc1 $f10, %lo(D_80B7B584)($at) /* 08028 80B719C8 C6080058 */ lwc1 $f8, 0x0058($s0) ## 00000058 /* 0802C 80B719CC 3C0180B8 */ lui $at, %hi(D_80B7B588) ## $at = 80B80000 /* 08030 80B719D0 C6040198 */ lwc1 $f4, 0x0198($s0) ## 00000198 -/* 08034 80B719D4 460A4002 */ mul.s $f0, $f8, $f10 +/* 08034 80B719D4 460A4002 */ mul.s $f0, $f8, $f10 /* 08038 80B719D8 C60A018C */ lwc1 $f10, 0x018C($s0) ## 0000018C /* 0803C 80B719DC 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 /* 08040 80B719E0 E6000050 */ swc1 $f0, 0x0050($s0) ## 00000050 /* 08044 80B719E4 E6000054 */ swc1 $f0, 0x0054($s0) ## 00000054 -/* 08048 80B719E8 C426B588 */ lwc1 $f6, %lo(D_80B7B588)($at) -/* 0804C 80B719EC 46062202 */ mul.s $f8, $f4, $f6 -/* 08050 80B719F0 46085100 */ add.s $f4, $f10, $f8 +/* 08048 80B719E8 C426B588 */ lwc1 $f6, %lo(D_80B7B588)($at) +/* 0804C 80B719EC 46062202 */ mul.s $f8, $f4, $f6 +/* 08050 80B719F0 46085100 */ add.s $f4, $f10, $f8 /* 08054 80B719F4 E604018C */ swc1 $f4, 0x018C($s0) ## 0000018C .L80B719F8: /* 08058 80B719F8 44823000 */ mtc1 $v0, $f6 ## $f6 = 0.00 /* 0805C 80B719FC 3C0180B8 */ lui $at, %hi(D_80B7B58C) ## $at = 80B80000 -/* 08060 80B71A00 C428B58C */ lwc1 $f8, %lo(D_80B7B58C)($at) -/* 08064 80B71A04 468032A0 */ cvt.s.w $f10, $f6 +/* 08060 80B71A00 C428B58C */ lwc1 $f8, %lo(D_80B7B58C)($at) +/* 08064 80B71A04 468032A0 */ cvt.s.w $f10, $f6 /* 08068 80B71A08 C606018C */ lwc1 $f6, 0x018C($s0) ## 0000018C -/* 0806C 80B71A0C A7A20136 */ sh $v0, 0x0136($sp) -/* 08070 80B71A10 46085102 */ mul.s $f4, $f10, $f8 +/* 0806C 80B71A0C A7A20136 */ sh $v0, 0x0136($sp) +/* 08070 80B71A10 46085102 */ mul.s $f4, $f10, $f8 /* 08074 80B71A14 0C041184 */ jal cosf - -/* 08078 80B71A18 46043300 */ add.s $f12, $f6, $f4 + +/* 08078 80B71A18 46043300 */ add.s $f12, $f6, $f4 /* 0807C 80B71A1C C60A019C */ lwc1 $f10, 0x019C($s0) ## 0000019C -/* 08080 80B71A20 87A20136 */ lh $v0, 0x0136($sp) +/* 08080 80B71A20 87A20136 */ lh $v0, 0x0136($sp) /* 08084 80B71A24 860A016E */ lh $t2, 0x016E($s0) ## 0000016E -/* 08088 80B71A28 460A0082 */ mul.s $f2, $f0, $f10 -/* 0808C 80B71A2C 00026040 */ sll $t4, $v0, 1 +/* 08088 80B71A28 460A0082 */ mul.s $f2, $f0, $f10 +/* 0808C 80B71A2C 00026040 */ sll $t4, $v0, 1 /* 08090 80B71A30 24420001 */ addiu $v0, $v0, 0x0001 ## $v0 = 00000001 -/* 08094 80B71A34 00021400 */ sll $v0, $v0, 16 -/* 08098 80B71A38 00021403 */ sra $v0, $v0, 16 -/* 0809C 80B71A3C 28410003 */ slti $at, $v0, 0x0003 -/* 080A0 80B71A40 020C5821 */ addu $t3, $s0, $t4 -/* 080A4 80B71A44 46021200 */ add.s $f8, $f2, $f2 -/* 080A8 80B71A48 4600418D */ trunc.w.s $f6, $f8 -/* 080AC 80B71A4C 44193000 */ mfc1 $t9, $f6 +/* 08094 80B71A34 00021400 */ sll $v0, $v0, 16 +/* 08098 80B71A38 00021403 */ sra $v0, $v0, 16 +/* 0809C 80B71A3C 28410003 */ slti $at, $v0, 0x0003 +/* 080A0 80B71A40 020C5821 */ addu $t3, $s0, $t4 +/* 080A4 80B71A44 46021200 */ add.s $f8, $f2, $f2 +/* 080A8 80B71A48 4600418D */ trunc.w.s $f6, $f8 +/* 080AC 80B71A4C 44193000 */ mfc1 $t9, $f6 /* 080B0 80B71A50 00000000 */ nop -/* 080B4 80B71A54 01594821 */ addu $t1, $t2, $t9 -/* 080B8 80B71A58 1420FFE7 */ bne $at, $zero, .L80B719F8 +/* 080B4 80B71A54 01594821 */ addu $t1, $t2, $t9 +/* 080B8 80B71A58 1420FFE7 */ bne $at, $zero, .L80B719F8 /* 080BC 80B71A5C A56901CC */ sh $t1, 0x01CC($t3) ## 000001CC /* 080C0 80B71A60 3C0180B8 */ lui $at, %hi(D_80B7B590) ## $at = 80B80000 -/* 080C4 80B71A64 C42AB590 */ lwc1 $f10, %lo(D_80B7B590)($at) +/* 080C4 80B71A64 C42AB590 */ lwc1 $f10, %lo(D_80B7B590)($at) /* 080C8 80B71A68 C604018C */ lwc1 $f4, 0x018C($s0) ## 0000018C /* 080CC 80B71A6C 0C041184 */ jal cosf - -/* 080D0 80B71A70 460A2300 */ add.s $f12, $f4, $f10 + +/* 080D0 80B71A70 460A2300 */ add.s $f12, $f4, $f10 /* 080D4 80B71A74 C608019C */ lwc1 $f8, 0x019C($s0) ## 0000019C /* 080D8 80B71A78 3C0180B8 */ lui $at, %hi(D_80B7B594) ## $at = 80B80000 -/* 080DC 80B71A7C C424B594 */ lwc1 $f4, %lo(D_80B7B594)($at) -/* 080E0 80B71A80 46004082 */ mul.s $f2, $f8, $f0 -/* 080E4 80B71A84 46021180 */ add.s $f6, $f2, $f2 -/* 080E8 80B71A88 46043282 */ mul.s $f10, $f6, $f4 -/* 080EC 80B71A8C 4600520D */ trunc.w.s $f8, $f10 -/* 080F0 80B71A90 440E4000 */ mfc1 $t6, $f8 +/* 080DC 80B71A7C C424B594 */ lwc1 $f4, %lo(D_80B7B594)($at) +/* 080E0 80B71A80 46004082 */ mul.s $f2, $f8, $f0 +/* 080E4 80B71A84 46021180 */ add.s $f6, $f2, $f2 +/* 080E8 80B71A88 46043282 */ mul.s $f10, $f6, $f4 +/* 080EC 80B71A8C 4600520D */ trunc.w.s $f8, $f10 +/* 080F0 80B71A90 440E4000 */ mfc1 $t6, $f8 /* 080F4 80B71A94 00000000 */ nop /* 080F8 80B71A98 A60E016C */ sh $t6, 0x016C($s0) ## 0000016C .L80B71A9C: @@ -331,90 +331,90 @@ glabel Fishing_Update /* 08100 80B71AA0 C6040024 */ lwc1 $f4, 0x0024($s0) ## 00000024 /* 08104 80B71AA4 C60A01B8 */ lwc1 $f10, 0x01B8($s0) ## 000001B8 /* 08108 80B71AA8 C6080028 */ lwc1 $f8, 0x0028($s0) ## 00000028 -/* 0810C 80B71AAC 46043381 */ sub.s $f14, $f6, $f4 -/* 08110 80B71AB0 46085181 */ sub.s $f6, $f10, $f8 -/* 08114 80B71AB4 E7A6012C */ swc1 $f6, 0x012C($sp) +/* 0810C 80B71AAC 46043381 */ sub.s $f14, $f6, $f4 +/* 08110 80B71AB0 46085181 */ sub.s $f6, $f10, $f8 +/* 08114 80B71AB4 E7A6012C */ swc1 $f6, 0x012C($sp) /* 08118 80B71AB8 C60A002C */ lwc1 $f10, 0x002C($s0) ## 0000002C /* 0811C 80B71ABC C60401BC */ lwc1 $f4, 0x01BC($s0) ## 000001BC -/* 08120 80B71AC0 E7AE0130 */ swc1 $f14, 0x0130($sp) -/* 08124 80B71AC4 460A2301 */ sub.s $f12, $f4, $f10 +/* 08120 80B71AC0 E7AE0130 */ swc1 $f14, 0x0130($sp) +/* 08124 80B71AC4 460A2301 */ sub.s $f12, $f4, $f10 /* 08128 80B71AC8 0C034199 */ jal atan2s - -/* 0812C 80B71ACC E7AC0128 */ swc1 $f12, 0x0128($sp) -/* 08130 80B71AD0 C7B00130 */ lwc1 $f16, 0x0130($sp) -/* 08134 80B71AD4 C7B20128 */ lwc1 $f18, 0x0128($sp) -/* 08138 80B71AD8 A7A200FC */ sh $v0, 0x00FC($sp) -/* 0813C 80B71ADC 46108202 */ mul.s $f8, $f16, $f16 -/* 08140 80B71AE0 C7AE012C */ lwc1 $f14, 0x012C($sp) -/* 08144 80B71AE4 46129182 */ mul.s $f6, $f18, $f18 -/* 08148 80B71AE8 46064080 */ add.s $f2, $f8, $f6 -/* 0814C 80B71AEC 46001304 */ sqrt.s $f12, $f2 + +/* 0812C 80B71ACC E7AC0128 */ swc1 $f12, 0x0128($sp) +/* 08130 80B71AD0 C7B00130 */ lwc1 $f16, 0x0130($sp) +/* 08134 80B71AD4 C7B20128 */ lwc1 $f18, 0x0128($sp) +/* 08138 80B71AD8 A7A200FC */ sh $v0, 0x00FC($sp) +/* 0813C 80B71ADC 46108202 */ mul.s $f8, $f16, $f16 +/* 08140 80B71AE0 C7AE012C */ lwc1 $f14, 0x012C($sp) +/* 08144 80B71AE4 46129182 */ mul.s $f6, $f18, $f18 +/* 08148 80B71AE8 46064080 */ add.s $f2, $f8, $f6 +/* 0814C 80B71AEC 46001304 */ sqrt.s $f12, $f2 /* 08150 80B71AF0 0C034199 */ jal atan2s - -/* 08154 80B71AF4 E7A2004C */ swc1 $f2, 0x004C($sp) -/* 08158 80B71AF8 C7AC012C */ lwc1 $f12, 0x012C($sp) -/* 0815C 80B71AFC C7A2004C */ lwc1 $f2, 0x004C($sp) -/* 08160 80B71B00 A7A200FE */ sh $v0, 0x00FE($sp) -/* 08164 80B71B04 460C6102 */ mul.s $f4, $f12, $f12 -/* 08168 80B71B08 46041000 */ add.s $f0, $f2, $f4 -/* 0816C 80B71B0C 46000004 */ sqrt.s $f0, $f0 -/* 08170 80B71B10 E7A00124 */ swc1 $f0, 0x0124($sp) + +/* 08154 80B71AF4 E7A2004C */ swc1 $f2, 0x004C($sp) +/* 08158 80B71AF8 C7AC012C */ lwc1 $f12, 0x012C($sp) +/* 0815C 80B71AFC C7A2004C */ lwc1 $f2, 0x004C($sp) +/* 08160 80B71B00 A7A200FE */ sh $v0, 0x00FE($sp) +/* 08164 80B71B04 460C6102 */ mul.s $f4, $f12, $f12 +/* 08168 80B71B08 46041000 */ add.s $f0, $f2, $f4 +/* 0816C 80B71B0C 46000004 */ sqrt.s $f0, $f0 +/* 08170 80B71B10 E7A00124 */ swc1 $f0, 0x0124($sp) /* 08174 80B71B14 860F01A0 */ lh $t7, 0x01A0($s0) ## 000001A0 -/* 08178 80B71B18 51E0001D */ beql $t7, $zero, .L80B71B90 +/* 08178 80B71B18 51E0001D */ beql $t7, $zero, .L80B71B90 /* 0817C 80B71B1C 86020158 */ lh $v0, 0x0158($s0) ## 00000158 /* 08180 80B71B20 86030158 */ lh $v1, 0x0158($s0) ## 00000158 /* 08184 80B71B24 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 08188 80B71B28 10610018 */ beq $v1, $at, .L80B71B8C +/* 08188 80B71B28 10610018 */ beq $v1, $at, .L80B71B8C /* 0818C 80B71B2C 24010003 */ addiu $at, $zero, 0x0003 ## $at = 00000003 -/* 08190 80B71B30 10610016 */ beq $v1, $at, .L80B71B8C +/* 08190 80B71B30 10610016 */ beq $v1, $at, .L80B71B8C /* 08194 80B71B34 24010004 */ addiu $at, $zero, 0x0004 ## $at = 00000004 -/* 08198 80B71B38 50610015 */ beql $v1, $at, .L80B71B90 +/* 08198 80B71B38 50610015 */ beql $v1, $at, .L80B71B90 /* 0819C 80B71B3C 86020158 */ lh $v0, 0x0158($s0) ## 00000158 /* 081A0 80B71B40 8603015C */ lh $v1, 0x015C($s0) ## 0000015C /* 081A4 80B71B44 30780040 */ andi $t8, $v1, 0x0040 ## $t8 = 00000000 -/* 081A8 80B71B48 53000006 */ beql $t8, $zero, .L80B71B64 -/* 081AC 80B71B4C 87AC00FC */ lh $t4, 0x00FC($sp) -/* 081B0 80B71B50 87AA00FC */ lh $t2, 0x00FC($sp) +/* 081A8 80B71B48 53000006 */ beql $t8, $zero, .L80B71B64 +/* 081AC 80B71B4C 87AC00FC */ lh $t4, 0x00FC($sp) +/* 081B0 80B71B50 87AA00FC */ lh $t2, 0x00FC($sp) /* 081B4 80B71B54 25594000 */ addiu $t9, $t2, 0x4000 ## $t9 = 00004000 -/* 081B8 80B71B58 10000004 */ beq $zero, $zero, .L80B71B6C -/* 081BC 80B71B5C A7B900FC */ sh $t9, 0x00FC($sp) -/* 081C0 80B71B60 87AC00FC */ lh $t4, 0x00FC($sp) +/* 081B8 80B71B58 10000004 */ beq $zero, $zero, .L80B71B6C +/* 081BC 80B71B5C A7B900FC */ sh $t9, 0x00FC($sp) +/* 081C0 80B71B60 87AC00FC */ lh $t4, 0x00FC($sp) .L80B71B64: /* 081C4 80B71B64 2589C000 */ addiu $t1, $t4, 0xC000 ## $t1 = FFFFC000 -/* 081C8 80B71B68 A7A900FC */ sh $t1, 0x00FC($sp) +/* 081C8 80B71B68 A7A900FC */ sh $t1, 0x00FC($sp) .L80B71B6C: /* 081CC 80B71B6C 246B0020 */ addiu $t3, $v1, 0x0020 ## $t3 = 00000020 /* 081D0 80B71B70 316D0040 */ andi $t5, $t3, 0x0040 ## $t5 = 00000000 -/* 081D4 80B71B74 11A00003 */ beq $t5, $zero, .L80B71B84 +/* 081D4 80B71B74 11A00003 */ beq $t5, $zero, .L80B71B84 /* 081D8 80B71B78 244E2000 */ addiu $t6, $v0, 0x2000 ## $t6 = 00002000 -/* 081DC 80B71B7C 10000003 */ beq $zero, $zero, .L80B71B8C -/* 081E0 80B71B80 A7AE00FE */ sh $t6, 0x00FE($sp) +/* 081DC 80B71B7C 10000003 */ beq $zero, $zero, .L80B71B8C +/* 081E0 80B71B80 A7AE00FE */ sh $t6, 0x00FE($sp) .L80B71B84: /* 081E4 80B71B84 244FE000 */ addiu $t7, $v0, 0xE000 ## $t7 = FFFFE000 -/* 081E8 80B71B88 A7AF00FE */ sh $t7, 0x00FE($sp) +/* 081E8 80B71B88 A7AF00FE */ sh $t7, 0x00FE($sp) .L80B71B8C: /* 081EC 80B71B8C 86020158 */ lh $v0, 0x0158($s0) ## 00000158 .L80B71B90: -/* 081F0 80B71B90 2841000C */ slti $at, $v0, 0x000C -/* 081F4 80B71B94 14200005 */ bne $at, $zero, .L80B71BAC +/* 081F0 80B71B90 2841000C */ slti $at, $v0, 0x000C +/* 081F4 80B71B94 14200005 */ bne $at, $zero, .L80B71BAC /* 081F8 80B71B98 24010064 */ addiu $at, $zero, 0x0064 ## $at = 00000064 -/* 081FC 80B71B9C 5041000D */ beql $v0, $at, .L80B71BD4 +/* 081FC 80B71B9C 5041000D */ beql $v0, $at, .L80B71BD4 /* 08200 80B71BA0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 08204 80B71BA4 10000DB5 */ beq $zero, $zero, .L80B7527C +/* 08204 80B71BA4 10000DB5 */ beq $zero, $zero, .L80B7527C /* 08208 80B71BA8 8604015C */ lh $a0, 0x015C($s0) ## 0000015C .L80B71BAC: /* 0820C 80B71BAC 24580019 */ addiu $t8, $v0, 0x0019 ## $t8 = 00000019 -/* 08210 80B71BB0 2F010025 */ sltiu $at, $t8, 0x0025 -/* 08214 80B71BB4 10200DB0 */ beq $at, $zero, .L80B75278 -/* 08218 80B71BB8 0018C080 */ sll $t8, $t8, 2 +/* 08210 80B71BB0 2F010025 */ sltiu $at, $t8, 0x0025 +/* 08214 80B71BB4 10200DB0 */ beq $at, $zero, .L80B75278 +/* 08218 80B71BB8 0018C080 */ sll $t8, $t8, 2 /* 0821C 80B71BBC 3C0180B8 */ lui $at, %hi(jtbl_80B7B598) ## $at = 80B80000 -/* 08220 80B71BC0 00380821 */ addu $at, $at, $t8 -/* 08224 80B71BC4 8C38B598 */ lw $t8, %lo(jtbl_80B7B598)($at) -/* 08228 80B71BC8 03000008 */ jr $t8 +/* 08220 80B71BC0 00380821 */ addu $at, $at, $t8 +/* 08224 80B71BC4 8C38B598 */ lw $t8, %lo(jtbl_80B7B598)($at) +/* 08228 80B71BC8 03000008 */ jr $t8 /* 0822C 80B71BCC 00000000 */ nop /* 08230 80B71BD0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 .L80B71BD4: -/* 08234 80B71BD4 0C2DC50E */ jal func_80B71438 +/* 08234 80B71BD4 0C2DC50E */ jal func_80B71438 /* 08238 80B71BD8 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 /* 0823C 80B71BDC 3C0143FA */ lui $at, 0x43FA ## $at = 43FA0000 /* 08240 80B71BE0 44815000 */ mtc1 $at, $f10 ## $f10 = 500.00 @@ -424,204 +424,204 @@ glabel Fishing_Update /* 08250 80B71BF0 C60A0028 */ lwc1 $f10, 0x0028($s0) ## 00000028 /* 08254 80B71BF4 E60800F8 */ swc1 $f8, 0x00F8($s0) ## 000000F8 /* 08258 80B71BF8 C6060024 */ lwc1 $f6, 0x0024($s0) ## 00000024 -/* 0825C 80B71BFC 4600520D */ trunc.w.s $f8, $f10 +/* 0825C 80B71BFC 4600520D */ trunc.w.s $f8, $f10 /* 08260 80B71C00 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 /* 08264 80B71C04 44815000 */ mtc1 $at, $f10 ## $f10 = 20.00 -/* 08268 80B71C08 4600310D */ trunc.w.s $f4, $f6 -/* 0826C 80B71C0C 440C4000 */ mfc1 $t4, $f8 +/* 08268 80B71C08 4600310D */ trunc.w.s $f4, $f6 +/* 0826C 80B71C0C 440C4000 */ mfc1 $t4, $f8 /* 08270 80B71C10 3C014248 */ lui $at, 0x4248 ## $at = 42480000 /* 08274 80B71C14 240D00FF */ addiu $t5, $zero, 0x00FF ## $t5 = 000000FF -/* 08278 80B71C18 000C4C00 */ sll $t1, $t4, 16 -/* 0827C 80B71C1C 00095C03 */ sra $t3, $t1, 16 +/* 08278 80B71C18 000C4C00 */ sll $t1, $t4, 16 +/* 0827C 80B71C1C 00095C03 */ sra $t3, $t1, 16 /* 08280 80B71C20 448B3000 */ mtc1 $t3, $f6 ## $f6 = 0.00 -/* 08284 80B71C24 44052000 */ mfc1 $a1, $f4 +/* 08284 80B71C24 44052000 */ mfc1 $a1, $f4 /* 08288 80B71C28 240B00FF */ addiu $t3, $zero, 0x00FF ## $t3 = 000000FF -/* 0828C 80B71C2C 46803120 */ cvt.s.w $f4, $f6 +/* 0828C 80B71C2C 46803120 */ cvt.s.w $f4, $f6 /* 08290 80B71C30 240900FF */ addiu $t1, $zero, 0x00FF ## $t1 = 000000FF /* 08294 80B71C34 240C00FF */ addiu $t4, $zero, 0x00FF ## $t4 = 000000FF -/* 08298 80B71C38 00052C00 */ sll $a1, $a1, 16 -/* 0829C 80B71C3C 00052C03 */ sra $a1, $a1, 16 +/* 08298 80B71C38 00052C00 */ sll $a1, $a1, 16 +/* 0829C 80B71C3C 00052C03 */ sra $a1, $a1, 16 /* 082A0 80B71C40 26040220 */ addiu $a0, $s0, 0x0220 ## $a0 = 00000220 -/* 082A4 80B71C44 460A2200 */ add.s $f8, $f4, $f10 +/* 082A4 80B71C44 460A2200 */ add.s $f8, $f4, $f10 /* 082A8 80B71C48 C604002C */ lwc1 $f4, 0x002C($s0) ## 0000002C -/* 082AC 80B71C4C AFAD001C */ sw $t5, 0x001C($sp) -/* 082B0 80B71C50 AFAB0018 */ sw $t3, 0x0018($sp) -/* 082B4 80B71C54 4600228D */ trunc.w.s $f10, $f4 +/* 082AC 80B71C4C AFAD001C */ sw $t5, 0x001C($sp) +/* 082B0 80B71C50 AFAB0018 */ sw $t3, 0x0018($sp) +/* 082B4 80B71C54 4600228D */ trunc.w.s $f10, $f4 /* 082B8 80B71C58 44812000 */ mtc1 $at, $f4 ## $f4 = 50.00 -/* 082BC 80B71C5C AFA90014 */ sw $t1, 0x0014($sp) -/* 082C0 80B71C60 4600418D */ trunc.w.s $f6, $f8 -/* 082C4 80B71C64 440F5000 */ mfc1 $t7, $f10 -/* 082C8 80B71C68 AFAC0010 */ sw $t4, 0x0010($sp) -/* 082CC 80B71C6C 000FC400 */ sll $t8, $t7, 16 -/* 082D0 80B71C70 00185403 */ sra $t2, $t8, 16 +/* 082BC 80B71C5C AFA90014 */ sw $t1, 0x0014($sp) +/* 082C0 80B71C60 4600418D */ trunc.w.s $f6, $f8 +/* 082C4 80B71C64 440F5000 */ mfc1 $t7, $f10 +/* 082C8 80B71C68 AFAC0010 */ sw $t4, 0x0010($sp) +/* 082CC 80B71C6C 000FC400 */ sll $t8, $t7, 16 +/* 082D0 80B71C70 00185403 */ sra $t2, $t8, 16 /* 082D4 80B71C74 448A4000 */ mtc1 $t2, $f8 ## $f8 = 0.00 -/* 082D8 80B71C78 44063000 */ mfc1 $a2, $f6 -/* 082DC 80B71C7C 468041A0 */ cvt.s.w $f6, $f8 -/* 082E0 80B71C80 00063400 */ sll $a2, $a2, 16 -/* 082E4 80B71C84 00063403 */ sra $a2, $a2, 16 -/* 082E8 80B71C88 46043281 */ sub.s $f10, $f6, $f4 -/* 082EC 80B71C8C 4600520D */ trunc.w.s $f8, $f10 -/* 082F0 80B71C90 44074000 */ mfc1 $a3, $f8 +/* 082D8 80B71C78 44063000 */ mfc1 $a2, $f6 +/* 082DC 80B71C7C 468041A0 */ cvt.s.w $f6, $f8 +/* 082E0 80B71C80 00063400 */ sll $a2, $a2, 16 +/* 082E4 80B71C84 00063403 */ sra $a2, $a2, 16 +/* 082E8 80B71C88 46043281 */ sub.s $f10, $f6, $f4 +/* 082EC 80B71C8C 4600520D */ trunc.w.s $f8, $f10 +/* 082F0 80B71C90 44074000 */ mfc1 $a3, $f8 /* 082F4 80B71C94 00000000 */ nop -/* 082F8 80B71C98 00073C00 */ sll $a3, $a3, 16 +/* 082F8 80B71C98 00073C00 */ sll $a3, $a3, 16 /* 082FC 80B71C9C 0C01E763 */ jal Lights_InitType0PositionalLight - -/* 08300 80B71CA0 00073C03 */ sra $a3, $a3, 16 + +/* 08300 80B71CA0 00073C03 */ sra $a3, $a3, 16 /* 08304 80B71CA4 3C0180B8 */ lui $at, %hi(D_80B7E078) ## $at = 80B80000 -/* 08308 80B71CA8 C426E078 */ lwc1 $f6, %lo(D_80B7E078)($at) +/* 08308 80B71CA8 C426E078 */ lwc1 $f6, %lo(D_80B7E078)($at) /* 0830C 80B71CAC 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 08310 80B71CB0 02217021 */ addu $t6, $s1, $at +/* 08310 80B71CB0 02217021 */ addu $t6, $s1, $at /* 08314 80B71CB4 E60601AC */ swc1 $f6, 0x01AC($s0) ## 000001AC -/* 08318 80B71CB8 AFAE0048 */ sw $t6, 0x0048($sp) +/* 08318 80B71CB8 AFAE0048 */ sw $t6, 0x0048($sp) /* 0831C 80B71CBC 8DC41DE4 */ lw $a0, 0x1DE4($t6) ## 00001DE4 -/* 08320 80B71CC0 00800821 */ addu $at, $a0, $zero -/* 08324 80B71CC4 00042080 */ sll $a0, $a0, 2 -/* 08328 80B71CC8 00812021 */ addu $a0, $a0, $at -/* 0832C 80B71CCC 00042080 */ sll $a0, $a0, 2 -/* 08330 80B71CD0 00812023 */ subu $a0, $a0, $at -/* 08334 80B71CD4 00042080 */ sll $a0, $a0, 2 -/* 08338 80B71CD8 00812023 */ subu $a0, $a0, $at -/* 0833C 80B71CDC 00042080 */ sll $a0, $a0, 2 -/* 08340 80B71CE0 00042400 */ sll $a0, $a0, 16 +/* 08320 80B71CC0 00800821 */ addu $at, $a0, $zero +/* 08324 80B71CC4 00042080 */ sll $a0, $a0, 2 +/* 08328 80B71CC8 00812021 */ addu $a0, $a0, $at +/* 0832C 80B71CCC 00042080 */ sll $a0, $a0, 2 +/* 08330 80B71CD0 00812023 */ subu $a0, $a0, $at +/* 08334 80B71CD4 00042080 */ sll $a0, $a0, 2 +/* 08338 80B71CD8 00812023 */ subu $a0, $a0, $at +/* 0833C 80B71CDC 00042080 */ sll $a0, $a0, 2 +/* 08340 80B71CE0 00042400 */ sll $a0, $a0, 16 /* 08344 80B71CE4 0C01DE1C */ jal Math_Sins ## sins? -/* 08348 80B71CE8 00042403 */ sra $a0, $a0, 16 +/* 08348 80B71CE8 00042403 */ sra $a0, $a0, 16 /* 0834C 80B71CEC 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 /* 08350 80B71CF0 44812000 */ mtc1 $at, $f4 ## $f4 = 1.00 -/* 08354 80B71CF4 8FB80048 */ lw $t8, 0x0048($sp) -/* 08358 80B71CF8 46040282 */ mul.s $f10, $f0, $f4 -/* 0835C 80B71CFC E7AA0104 */ swc1 $f10, 0x0104($sp) +/* 08354 80B71CF4 8FB80048 */ lw $t8, 0x0048($sp) +/* 08358 80B71CF8 46040282 */ mul.s $f10, $f0, $f4 +/* 0835C 80B71CFC E7AA0104 */ swc1 $f10, 0x0104($sp) /* 08360 80B71D00 8F041DE4 */ lw $a0, 0x1DE4($t8) ## 00001DE4 -/* 08364 80B71D04 00800821 */ addu $at, $a0, $zero -/* 08368 80B71D08 000420C0 */ sll $a0, $a0, 3 -/* 0836C 80B71D0C 00812023 */ subu $a0, $a0, $at -/* 08370 80B71D10 00042080 */ sll $a0, $a0, 2 -/* 08374 80B71D14 00812021 */ addu $a0, $a0, $at -/* 08378 80B71D18 00042080 */ sll $a0, $a0, 2 -/* 0837C 80B71D1C 00812023 */ subu $a0, $a0, $at -/* 08380 80B71D20 00042040 */ sll $a0, $a0, 1 -/* 08384 80B71D24 00042400 */ sll $a0, $a0, 16 +/* 08364 80B71D04 00800821 */ addu $at, $a0, $zero +/* 08368 80B71D08 000420C0 */ sll $a0, $a0, 3 +/* 0836C 80B71D0C 00812023 */ subu $a0, $a0, $at +/* 08370 80B71D10 00042080 */ sll $a0, $a0, 2 +/* 08374 80B71D14 00812021 */ addu $a0, $a0, $at +/* 08378 80B71D18 00042080 */ sll $a0, $a0, 2 +/* 0837C 80B71D1C 00812023 */ subu $a0, $a0, $at +/* 08380 80B71D20 00042040 */ sll $a0, $a0, 1 +/* 08384 80B71D24 00042400 */ sll $a0, $a0, 16 /* 08388 80B71D28 0C01DE1C */ jal Math_Sins ## sins? -/* 0838C 80B71D2C 00042403 */ sra $a0, $a0, 16 +/* 0838C 80B71D2C 00042403 */ sra $a0, $a0, 16 /* 08390 80B71D30 3C014000 */ lui $at, 0x4000 ## $at = 40000000 /* 08394 80B71D34 44814000 */ mtc1 $at, $f8 ## $f8 = 2.00 /* 08398 80B71D38 3C014302 */ lui $at, 0x4302 ## $at = 43020000 /* 0839C 80B71D3C 44812000 */ mtc1 $at, $f4 ## $f4 = 130.00 -/* 083A0 80B71D40 46080182 */ mul.s $f6, $f0, $f8 +/* 083A0 80B71D40 46080182 */ mul.s $f6, $f0, $f8 /* 083A4 80B71D44 3C01425C */ lui $at, 0x425C ## $at = 425C0000 /* 083A8 80B71D48 44815000 */ mtc1 $at, $f10 ## $f10 = 55.00 /* 083AC 80B71D4C 3C0180B8 */ lui $at, %hi(D_80B7B62C) ## $at = 80B80000 /* 083B0 80B71D50 240A8000 */ addiu $t2, $zero, 0x8000 ## $t2 = FFFF8000 -/* 083B4 80B71D54 E7A60108 */ swc1 $f6, 0x0108($sp) +/* 083B4 80B71D54 E7A60108 */ swc1 $f6, 0x0108($sp) /* 083B8 80B71D58 E6040024 */ swc1 $f4, 0x0024($s0) ## 00000024 -/* 083BC 80B71D5C C7A80104 */ lwc1 $f8, 0x0104($sp) +/* 083BC 80B71D5C C7A80104 */ lwc1 $f8, 0x0104($sp) /* 083C0 80B71D60 C60200EC */ lwc1 $f2, 0x00EC($s0) ## 000000EC -/* 083C4 80B71D64 46085180 */ add.s $f6, $f10, $f8 +/* 083C4 80B71D64 46085180 */ add.s $f6, $f10, $f8 /* 083C8 80B71D68 E6060028 */ swc1 $f6, 0x0028($s0) ## 00000028 -/* 083CC 80B71D6C C424B62C */ lwc1 $f4, %lo(D_80B7B62C)($at) +/* 083CC 80B71D6C C424B62C */ lwc1 $f4, %lo(D_80B7B62C)($at) /* 083D0 80B71D70 3C014348 */ lui $at, 0x4348 ## $at = 43480000 /* 083D4 80B71D74 44813000 */ mtc1 $at, $f6 ## $f6 = 200.00 -/* 083D8 80B71D78 C7AA0108 */ lwc1 $f10, 0x0108($sp) +/* 083D8 80B71D78 C7AA0108 */ lwc1 $f10, 0x0108($sp) /* 083DC 80B71D7C A60A00B6 */ sh $t2, 0x00B6($s0) ## 000000B6 -/* 083E0 80B71D80 4606103C */ c.lt.s $f2, $f6 -/* 083E4 80B71D84 460A2200 */ add.s $f8, $f4, $f10 -/* 083E8 80B71D88 45000026 */ bc1f .L80B71E24 +/* 083E0 80B71D80 4606103C */ c.lt.s $f2, $f6 +/* 083E4 80B71D84 460A2200 */ add.s $f8, $f4, $f10 +/* 083E8 80B71D88 45000026 */ bc1f .L80B71E24 /* 083EC 80B71D8C E608002C */ swc1 $f8, 0x002C($s0) ## 0000002C /* 083F0 80B71D90 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 /* 083F4 80B71D94 00000000 */ nop -/* 083F8 80B71D98 4602203C */ c.lt.s $f4, $f2 +/* 083F8 80B71D98 4602203C */ c.lt.s $f4, $f2 /* 083FC 80B71D9C 00000000 */ nop -/* 08400 80B71DA0 45000020 */ bc1f .L80B71E24 +/* 08400 80B71DA0 45000020 */ bc1f .L80B71E24 /* 08404 80B71DA4 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 /* 08408 80B71DA8 44816000 */ mtc1 $at, $f12 ## $f12 = 5.00 /* 0840C 80B71DAC 0C00CFC8 */ jal Math_Rand_CenteredFloat - + /* 08410 80B71DB0 00000000 */ nop /* 08414 80B71DB4 3C014302 */ lui $at, 0x4302 ## $at = 43020000 /* 08418 80B71DB8 44815000 */ mtc1 $at, $f10 ## $f10 = 130.00 /* 0841C 80B71DBC 3C014220 */ lui $at, 0x4220 ## $at = 42200000 /* 08420 80B71DC0 44813000 */ mtc1 $at, $f6 ## $f6 = 40.00 -/* 08424 80B71DC4 460A0200 */ add.s $f8, $f0, $f10 +/* 08424 80B71DC4 460A0200 */ add.s $f8, $f0, $f10 /* 08428 80B71DC8 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 /* 0842C 80B71DCC 44816000 */ mtc1 $at, $f12 ## $f12 = 5.00 -/* 08430 80B71DD0 E7A600C8 */ swc1 $f6, 0x00C8($sp) +/* 08430 80B71DD0 E7A600C8 */ swc1 $f6, 0x00C8($sp) /* 08434 80B71DD4 0C00CFC8 */ jal Math_Rand_CenteredFloat - -/* 08438 80B71DD8 E7A800C4 */ swc1 $f8, 0x00C4($sp) + +/* 08438 80B71DD8 E7A800C4 */ swc1 $f8, 0x00C4($sp) /* 0843C 80B71DDC 3C0144A0 */ lui $at, 0x44A0 ## $at = 44A00000 /* 08440 80B71DE0 44812000 */ mtc1 $at, $f4 ## $f4 = 1280.00 /* 08444 80B71DE4 3C0180B8 */ lui $at, %hi(D_80B7B630) ## $at = 80B80000 -/* 08448 80B71DE8 C42CB630 */ lwc1 $f12, %lo(D_80B7B630)($at) -/* 0844C 80B71DEC 46040280 */ add.s $f10, $f0, $f4 +/* 08448 80B71DE8 C42CB630 */ lwc1 $f12, %lo(D_80B7B630)($at) +/* 0844C 80B71DEC 46040280 */ add.s $f10, $f0, $f4 /* 08450 80B71DF0 0C00CFBE */ jal Math_Rand_ZeroFloat - -/* 08454 80B71DF4 E7AA00CC */ swc1 $f10, 0x00CC($sp) + +/* 08454 80B71DF4 E7AA00CC */ swc1 $f10, 0x00CC($sp) /* 08458 80B71DF8 3C0180B8 */ lui $at, %hi(D_80B7B634) ## $at = 80B80000 -/* 0845C 80B71DFC C428B634 */ lwc1 $f8, %lo(D_80B7B634)($at) -/* 08460 80B71E00 8FB90048 */ lw $t9, 0x0048($sp) +/* 0845C 80B71DFC C428B634 */ lwc1 $f8, %lo(D_80B7B634)($at) +/* 08460 80B71E00 8FB90048 */ lw $t9, 0x0048($sp) /* 08464 80B71E04 240C0001 */ addiu $t4, $zero, 0x0001 ## $t4 = 00000001 -/* 08468 80B71E08 46080180 */ add.s $f6, $f0, $f8 +/* 08468 80B71E08 46080180 */ add.s $f6, $f0, $f8 /* 0846C 80B71E0C 8F251E10 */ lw $a1, 0x1E10($t9) ## 00001E10 -/* 08470 80B71E10 AFAC0010 */ sw $t4, 0x0010($sp) +/* 08470 80B71E10 AFAC0010 */ sw $t4, 0x0010($sp) /* 08474 80B71E14 00002025 */ or $a0, $zero, $zero ## $a0 = 00000000 -/* 08478 80B71E18 44073000 */ mfc1 $a3, $f6 -/* 0847C 80B71E1C 0C2DA802 */ jal func_80B6A008 +/* 08478 80B71E18 44073000 */ mfc1 $a3, $f6 +/* 0847C 80B71E1C 0C2DA802 */ jal func_80B6A008 /* 08480 80B71E20 27A600C4 */ addiu $a2, $sp, 0x00C4 ## $a2 = FFFFFF8C .L80B71E24: /* 08484 80B71E24 8604015C */ lh $a0, 0x015C($s0) ## 0000015C -/* 08488 80B71E28 000422C0 */ sll $a0, $a0, 11 -/* 0848C 80B71E2C 00042400 */ sll $a0, $a0, 16 +/* 08488 80B71E28 000422C0 */ sll $a0, $a0, 11 +/* 0848C 80B71E2C 00042400 */ sll $a0, $a0, 16 /* 08490 80B71E30 0C01DE1C */ jal Math_Sins ## sins? -/* 08494 80B71E34 00042403 */ sra $a0, $a0, 16 +/* 08494 80B71E34 00042403 */ sra $a0, $a0, 16 /* 08498 80B71E38 3C0180B8 */ lui $at, %hi(D_80B7B638) ## $at = 80B80000 -/* 0849C 80B71E3C C422B638 */ lwc1 $f2, %lo(D_80B7B638)($at) +/* 0849C 80B71E3C C422B638 */ lwc1 $f2, %lo(D_80B7B638)($at) /* 084A0 80B71E40 26040172 */ addiu $a0, $s0, 0x0172 ## $a0 = 00000172 /* 084A4 80B71E44 24060002 */ addiu $a2, $zero, 0x0002 ## $a2 = 00000002 -/* 084A8 80B71E48 46020102 */ mul.s $f4, $f0, $f2 +/* 084A8 80B71E48 46020102 */ mul.s $f4, $f0, $f2 /* 084AC 80B71E4C 240707D0 */ addiu $a3, $zero, 0x07D0 ## $a3 = 000007D0 -/* 084B0 80B71E50 46022280 */ add.s $f10, $f4, $f2 -/* 084B4 80B71E54 4600520D */ trunc.w.s $f8, $f10 -/* 084B8 80B71E58 44054000 */ mfc1 $a1, $f8 +/* 084B0 80B71E50 46022280 */ add.s $f10, $f4, $f2 +/* 084B4 80B71E54 4600520D */ trunc.w.s $f8, $f10 +/* 084B8 80B71E58 44054000 */ mfc1 $a1, $f8 /* 084BC 80B71E5C 00000000 */ nop -/* 084C0 80B71E60 00052C00 */ sll $a1, $a1, 16 +/* 084C0 80B71E60 00052C00 */ sll $a1, $a1, 16 /* 084C4 80B71E64 0C01E1EF */ jal Math_SmoothScaleMaxS - -/* 084C8 80B71E68 00052C03 */ sra $a1, $a1, 16 + +/* 084C8 80B71E68 00052C03 */ sra $a1, $a1, 16 /* 084CC 80B71E6C 8604015C */ lh $a0, 0x015C($s0) ## 0000015C -/* 084D0 80B71E70 00800821 */ addu $at, $a0, $zero -/* 084D4 80B71E74 00042080 */ sll $a0, $a0, 2 -/* 084D8 80B71E78 00812021 */ addu $a0, $a0, $at -/* 084DC 80B71E7C 00042240 */ sll $a0, $a0, 9 -/* 084E0 80B71E80 00042400 */ sll $a0, $a0, 16 +/* 084D0 80B71E70 00800821 */ addu $at, $a0, $zero +/* 084D4 80B71E74 00042080 */ sll $a0, $a0, 2 +/* 084D8 80B71E78 00812021 */ addu $a0, $a0, $at +/* 084DC 80B71E7C 00042240 */ sll $a0, $a0, 9 +/* 084E0 80B71E80 00042400 */ sll $a0, $a0, 16 /* 084E4 80B71E84 0C01DE1C */ jal Math_Sins ## sins? -/* 084E8 80B71E88 00042403 */ sra $a0, $a0, 16 +/* 084E8 80B71E88 00042403 */ sra $a0, $a0, 16 /* 084EC 80B71E8C 3C0180B8 */ lui $at, %hi(D_80B7B63C) ## $at = 80B80000 -/* 084F0 80B71E90 C426B63C */ lwc1 $f6, %lo(D_80B7B63C)($at) +/* 084F0 80B71E90 C426B63C */ lwc1 $f6, %lo(D_80B7B63C)($at) /* 084F4 80B71E94 26040174 */ addiu $a0, $s0, 0x0174 ## $a0 = 00000174 /* 084F8 80B71E98 24060002 */ addiu $a2, $zero, 0x0002 ## $a2 = 00000002 -/* 084FC 80B71E9C 46060102 */ mul.s $f4, $f0, $f6 +/* 084FC 80B71E9C 46060102 */ mul.s $f4, $f0, $f6 /* 08500 80B71EA0 240707D0 */ addiu $a3, $zero, 0x07D0 ## $a3 = 000007D0 -/* 08504 80B71EA4 4600228D */ trunc.w.s $f10, $f4 -/* 08508 80B71EA8 44055000 */ mfc1 $a1, $f10 +/* 08504 80B71EA4 4600228D */ trunc.w.s $f10, $f4 +/* 08508 80B71EA8 44055000 */ mfc1 $a1, $f10 /* 0850C 80B71EAC 00000000 */ nop -/* 08510 80B71EB0 00052C00 */ sll $a1, $a1, 16 +/* 08510 80B71EB0 00052C00 */ sll $a1, $a1, 16 /* 08514 80B71EB4 0C01E1EF */ jal Math_SmoothScaleMaxS - -/* 08518 80B71EB8 00052C03 */ sra $a1, $a1, 16 + +/* 08518 80B71EB8 00052C03 */ sra $a1, $a1, 16 /* 0851C 80B71EBC 3C0180B8 */ lui $at, %hi(D_80B7B640) ## $at = 80B80000 -/* 08520 80B71EC0 C428B640 */ lwc1 $f8, %lo(D_80B7B640)($at) +/* 08520 80B71EC0 C428B640 */ lwc1 $f8, %lo(D_80B7B640)($at) /* 08524 80B71EC4 3C0180B8 */ lui $at, %hi(D_80B7B644) ## $at = 80B80000 /* 08528 80B71EC8 E6080190 */ swc1 $f8, 0x0190($s0) ## 00000190 -/* 0852C 80B71ECC C426B644 */ lwc1 $f6, %lo(D_80B7B644)($at) -/* 08530 80B71ED0 10000F30 */ beq $zero, $zero, .L80B75B94 +/* 0852C 80B71ECC C426B644 */ lwc1 $f6, %lo(D_80B7B644)($at) +/* 08530 80B71ED0 10000F30 */ beq $zero, $zero, .L80B75B94 /* 08534 80B71ED4 E6060194 */ swc1 $f6, 0x0194($s0) ## 00000194 glabel L80B71ED8 /* 08538 80B71ED8 8E0E0008 */ lw $t6, 0x0008($s0) ## 00000008 /* 0853C 80B71EDC 8E0D000C */ lw $t5, 0x000C($s0) ## 0000000C -/* 08540 80B71EE0 4406A000 */ mfc1 $a2, $f20 +/* 08540 80B71EE0 4406A000 */ mfc1 $a2, $f20 /* 08544 80B71EE4 AE0E01B4 */ sw $t6, 0x01B4($s0) ## 000001B4 /* 08548 80B71EE8 8E0E0010 */ lw $t6, 0x0010($s0) ## 00000010 /* 0854C 80B71EEC 26040068 */ addiu $a0, $s0, 0x0068 ## $a0 = 00000068 @@ -629,40 +629,40 @@ glabel L80B71ED8 /* 08554 80B71EF4 3C073F00 */ lui $a3, 0x3F00 ## $a3 = 3F000000 /* 08558 80B71EF8 AE0D01B8 */ sw $t5, 0x01B8($s0) ## 000001B8 /* 0855C 80B71EFC 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 08560 80B71F00 AE0E01BC */ sw $t6, 0x01BC($s0) ## 000001BC -/* 08564 80B71F04 4406A000 */ mfc1 $a2, $f20 +/* 08564 80B71F04 4406A000 */ mfc1 $a2, $f20 /* 08568 80B71F08 260401B0 */ addiu $a0, $s0, 0x01B0 ## $a0 = 000001B0 /* 0856C 80B71F0C 3C054580 */ lui $a1, 0x4580 ## $a1 = 45800000 /* 08570 80B71F10 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 08574 80B71F14 3C074380 */ lui $a3, 0x4380 ## $a3 = 43800000 /* 08578 80B71F18 3C014220 */ lui $at, 0x4220 ## $at = 42200000 /* 0857C 80B71F1C 44815000 */ mtc1 $at, $f10 ## $f10 = 40.00 -/* 08580 80B71F20 C7A40124 */ lwc1 $f4, 0x0124($sp) -/* 08584 80B71F24 460A203C */ c.lt.s $f4, $f10 +/* 08580 80B71F20 C7A40124 */ lwc1 $f4, 0x0124($sp) +/* 08584 80B71F24 460A203C */ c.lt.s $f4, $f10 /* 08588 80B71F28 00000000 */ nop -/* 0858C 80B71F2C 45000008 */ bc1f .L80B71F50 +/* 0858C 80B71F2C 45000008 */ bc1f .L80B71F50 /* 08590 80B71F30 240F000B */ addiu $t7, $zero, 0x000B ## $t7 = 0000000B /* 08594 80B71F34 A60F0158 */ sh $t7, 0x0158($s0) ## 00000158 /* 08598 80B71F38 3C0180B8 */ lui $at, %hi(D_80B7B648) ## $at = 80B80000 -/* 0859C 80B71F3C C428B648 */ lwc1 $f8, %lo(D_80B7B648)($at) +/* 0859C 80B71F3C C428B648 */ lwc1 $f8, %lo(D_80B7B648)($at) /* 085A0 80B71F40 3C0143FA */ lui $at, 0x43FA ## $at = 43FA0000 /* 085A4 80B71F44 44813000 */ mtc1 $at, $f6 ## $f6 = 500.00 /* 085A8 80B71F48 E6080190 */ swc1 $f8, 0x0190($s0) ## 00000190 /* 085AC 80B71F4C E6060194 */ swc1 $f6, 0x0194($s0) ## 00000194 .L80B71F50: /* 085B0 80B71F50 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 085B4 80B71F54 0C2DC3B5 */ jal func_80B70ED4 +/* 085B4 80B71F54 0C2DC3B5 */ jal func_80B70ED4 /* 085B8 80B71F58 26250014 */ addiu $a1, $s1, 0x0014 ## $a1 = 00000014 /* 085BC 80B71F5C 3C01437A */ lui $at, 0x437A ## $at = 437A0000 /* 085C0 80B71F60 44815000 */ mtc1 $at, $f10 ## $f10 = 250.00 -/* 085C4 80B71F64 C7A80118 */ lwc1 $f8, 0x0118($sp) +/* 085C4 80B71F64 C7A80118 */ lwc1 $f8, 0x0118($sp) /* 085C8 80B71F68 C6040090 */ lwc1 $f4, 0x0090($s0) ## 00000090 -/* 085CC 80B71F6C 46085182 */ mul.s $f6, $f10, $f8 -/* 085D0 80B71F70 4606203C */ c.lt.s $f4, $f6 +/* 085CC 80B71F6C 46085182 */ mul.s $f6, $f10, $f8 +/* 085D0 80B71F70 4606203C */ c.lt.s $f4, $f6 /* 085D4 80B71F74 00000000 */ nop -/* 085D8 80B71F78 45020CC0 */ bc1fl .L80B7527C +/* 085D8 80B71F78 45020CC0 */ bc1fl .L80B7527C /* 085DC 80B71F7C 8604015C */ lh $a0, 0x015C($s0) ## 0000015C /* 085E0 80B71F80 A6000158 */ sh $zero, 0x0158($s0) ## 00000158 /* 085E4 80B71F84 86180158 */ lh $t8, 0x0158($s0) ## 00000158 @@ -672,12 +672,12 @@ glabel L80B71ED8 /* 085F4 80B71F94 A60A01A4 */ sh $t2, 0x01A4($s0) ## 000001A4 /* 085F8 80B71F98 A61901A2 */ sh $t9, 0x01A2($s0) ## 000001A2 /* 085FC 80B71F9C A602017C */ sh $v0, 0x017C($s0) ## 0000017C -/* 08600 80B71FA0 10000CB5 */ beq $zero, $zero, .L80B75278 +/* 08600 80B71FA0 10000CB5 */ beq $zero, $zero, .L80B75278 /* 08604 80B71FA4 A618015A */ sh $t8, 0x015A($s0) ## 0000015A glabel L80B71FA8 /* 08608 80B71FA8 8E090008 */ lw $t1, 0x0008($s0) ## 00000008 /* 0860C 80B71FAC 8E0C000C */ lw $t4, 0x000C($s0) ## 0000000C -/* 08610 80B71FB0 4406A000 */ mfc1 $a2, $f20 +/* 08610 80B71FB0 4406A000 */ mfc1 $a2, $f20 /* 08614 80B71FB4 AE0901B4 */ sw $t1, 0x01B4($s0) ## 000001B4 /* 08618 80B71FB8 8E090010 */ lw $t1, 0x0010($s0) ## 00000010 /* 0861C 80B71FBC 3C073D4C */ lui $a3, 0x3D4C ## $a3 = 3D4C0000 @@ -686,20 +686,20 @@ glabel L80B71FA8 /* 08628 80B71FC8 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 /* 0862C 80B71FCC AE0C01B8 */ sw $t4, 0x01B8($s0) ## 000001B8 /* 08630 80B71FD0 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 08634 80B71FD4 AE0901BC */ sw $t1, 0x01BC($s0) ## 000001BC -/* 08638 80B71FD8 4406A000 */ mfc1 $a2, $f20 +/* 08638 80B71FD8 4406A000 */ mfc1 $a2, $f20 /* 0863C 80B71FDC 260401B0 */ addiu $a0, $s0, 0x01B0 ## $a0 = 000001B0 /* 08640 80B71FE0 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 /* 08644 80B71FE4 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 08648 80B71FE8 3C074380 */ lui $a3, 0x4380 ## $a3 = 43800000 /* 0864C 80B71FEC 3C014220 */ lui $at, 0x4220 ## $at = 42200000 /* 08650 80B71FF0 44814000 */ mtc1 $at, $f8 ## $f8 = 40.00 -/* 08654 80B71FF4 C7AA0124 */ lwc1 $f10, 0x0124($sp) -/* 08658 80B71FF8 460A403E */ c.le.s $f8, $f10 +/* 08654 80B71FF4 C7AA0124 */ lwc1 $f10, 0x0124($sp) +/* 08658 80B71FF8 460A403E */ c.le.s $f8, $f10 /* 0865C 80B71FFC 00000000 */ nop -/* 08660 80B72000 45000006 */ bc1f .L80B7201C +/* 08660 80B72000 45000006 */ bc1f .L80B7201C /* 08664 80B72004 3C0144FA */ lui $at, 0x44FA ## $at = 44FA0000 /* 08668 80B72008 44812000 */ mtc1 $at, $f4 ## $f4 = 2000.00 /* 0866C 80B7200C 2402000A */ addiu $v0, $zero, 0x000A ## $v0 = 0000000A @@ -708,16 +708,16 @@ glabel L80B71FA8 /* 08678 80B72018 E6040194 */ swc1 $f4, 0x0194($s0) ## 00000194 .L80B7201C: /* 0867C 80B7201C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 08680 80B72020 0C2DC3B5 */ jal func_80B70ED4 +/* 08680 80B72020 0C2DC3B5 */ jal func_80B70ED4 /* 08684 80B72024 26250014 */ addiu $a1, $s1, 0x0014 ## $a1 = 00000014 /* 08688 80B72028 3C01437A */ lui $at, 0x437A ## $at = 437A0000 /* 0868C 80B7202C 44815000 */ mtc1 $at, $f10 ## $f10 = 250.00 -/* 08690 80B72030 C7A80118 */ lwc1 $f8, 0x0118($sp) +/* 08690 80B72030 C7A80118 */ lwc1 $f8, 0x0118($sp) /* 08694 80B72034 C6060090 */ lwc1 $f6, 0x0090($s0) ## 00000090 -/* 08698 80B72038 46085102 */ mul.s $f4, $f10, $f8 -/* 0869C 80B7203C 4604303C */ c.lt.s $f6, $f4 +/* 08698 80B72038 46085102 */ mul.s $f4, $f10, $f8 +/* 0869C 80B7203C 4604303C */ c.lt.s $f6, $f4 /* 086A0 80B72040 00000000 */ nop -/* 086A4 80B72044 4500000A */ bc1f .L80B72070 +/* 086A4 80B72044 4500000A */ bc1f .L80B72070 /* 086A8 80B72048 00000000 */ nop /* 086AC 80B7204C A6000158 */ sh $zero, 0x0158($s0) ## 00000158 /* 086B0 80B72050 860B0158 */ lh $t3, 0x0158($s0) ## 00000158 @@ -729,43 +729,43 @@ glabel L80B71FA8 /* 086C8 80B72068 A602017C */ sh $v0, 0x017C($s0) ## 0000017C /* 086CC 80B7206C A60B015A */ sh $t3, 0x015A($s0) ## 0000015A .L80B72070: -/* 086D0 80B72070 0C042F6F */ jal func_8010BDBC +/* 086D0 80B72070 0C042F6F */ jal func_8010BDBC /* 086D4 80B72074 262420D8 */ addiu $a0, $s1, 0x20D8 ## $a0 = 000020D8 -/* 086D8 80B72078 14400022 */ bne $v0, $zero, .L80B72104 +/* 086D8 80B72078 14400022 */ bne $v0, $zero, .L80B72104 /* 086DC 80B7207C 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 /* 086E0 80B72080 9442E66C */ lhu $v0, -0x1994($v0) ## 8015E66C /* 086E4 80B72084 3401C000 */ ori $at, $zero, 0xC000 ## $at = 0000C000 -/* 086E8 80B72088 0041082A */ slt $at, $v0, $at -/* 086EC 80B7208C 1420000F */ bne $at, $zero, .L80B720CC +/* 086E8 80B72088 0041082A */ slt $at, $v0, $at +/* 086EC 80B7208C 1420000F */ bne $at, $zero, .L80B720CC /* 086F0 80B72090 3401C01C */ ori $at, $zero, 0xC01C ## $at = 0000C01C -/* 086F4 80B72094 0041082A */ slt $at, $v0, $at -/* 086F8 80B72098 1020000C */ beq $at, $zero, .L80B720CC +/* 086F4 80B72094 0041082A */ slt $at, $v0, $at +/* 086F8 80B72098 1020000C */ beq $at, $zero, .L80B720CC /* 086FC 80B7209C 3C014316 */ lui $at, 0x4316 ## $at = 43160000 /* 08700 80B720A0 240F0007 */ addiu $t7, $zero, 0x0007 ## $t7 = 00000007 /* 08704 80B720A4 44816000 */ mtc1 $at, $f12 ## $f12 = 150.00 /* 08708 80B720A8 0C00CFBE */ jal Math_Rand_ZeroFloat - + /* 0870C 80B720AC A60F0158 */ sh $t7, 0x0158($s0) ## 00000158 -/* 08710 80B720B0 4600028D */ trunc.w.s $f10, $f0 +/* 08710 80B720B0 4600028D */ trunc.w.s $f10, $f0 /* 08714 80B720B4 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 08718 80B720B8 440C5000 */ mfc1 $t4, $f10 +/* 08718 80B720B8 440C5000 */ mfc1 $t4, $f10 /* 0871C 80B720BC 00000000 */ nop /* 08720 80B720C0 258900C8 */ addiu $t1, $t4, 0x00C8 ## $t1 = 000000C8 /* 08724 80B720C4 A6090180 */ sh $t1, 0x0180($s0) ## 00000180 /* 08728 80B720C8 9442E66C */ lhu $v0, -0x1994($v0) ## 8015E66C .L80B720CC: -/* 0872C 80B720CC 28413AAA */ slti $at, $v0, 0x3AAA -/* 08730 80B720D0 1420000C */ bne $at, $zero, .L80B72104 -/* 08734 80B720D4 28413AC6 */ slti $at, $v0, 0x3AC6 -/* 08738 80B720D8 1020000A */ beq $at, $zero, .L80B72104 +/* 0872C 80B720CC 28413AAA */ slti $at, $v0, 0x3AAA +/* 08730 80B720D0 1420000C */ bne $at, $zero, .L80B72104 +/* 08734 80B720D4 28413AC6 */ slti $at, $v0, 0x3AC6 +/* 08738 80B720D8 1020000A */ beq $at, $zero, .L80B72104 /* 0873C 80B720DC 3C014316 */ lui $at, 0x4316 ## $at = 43160000 /* 08740 80B720E0 240B0007 */ addiu $t3, $zero, 0x0007 ## $t3 = 00000007 /* 08744 80B720E4 44816000 */ mtc1 $at, $f12 ## $f12 = 150.00 /* 08748 80B720E8 0C00CFBE */ jal Math_Rand_ZeroFloat - + /* 0874C 80B720EC A60B0158 */ sh $t3, 0x0158($s0) ## 00000158 -/* 08750 80B720F0 4600020D */ trunc.w.s $f8, $f0 -/* 08754 80B720F4 44184000 */ mfc1 $t8, $f8 +/* 08750 80B720F0 4600020D */ trunc.w.s $f8, $f0 +/* 08754 80B720F4 44184000 */ mfc1 $t8, $f8 /* 08758 80B720F8 00000000 */ nop /* 0875C 80B720FC 270A00C8 */ addiu $t2, $t8, 0x00C8 ## $t2 = 000000C8 /* 08760 80B72100 A60A0180 */ sh $t2, 0x0180($s0) ## 00000180 @@ -773,64 +773,64 @@ glabel L80B71FA8 /* 08764 80B72104 3C038016 */ lui $v1, 0x8016 ## $v1 = 80160000 /* 08768 80B72108 8C63FA90 */ lw $v1, -0x0570($v1) ## 8015FA90 /* 0876C 80B7210C 847909F2 */ lh $t9, 0x09F2($v1) ## 801609F2 -/* 08770 80B72110 13200C59 */ beq $t9, $zero, .L80B75278 +/* 08770 80B72110 13200C59 */ beq $t9, $zero, .L80B75278 /* 08774 80B72114 3C014316 */ lui $at, 0x4316 ## $at = 43160000 /* 08778 80B72118 A46009F2 */ sh $zero, 0x09F2($v1) ## 801609F2 /* 0877C 80B7211C 240C0007 */ addiu $t4, $zero, 0x0007 ## $t4 = 00000007 /* 08780 80B72120 44816000 */ mtc1 $at, $f12 ## $f12 = 150.00 /* 08784 80B72124 0C00CFBE */ jal Math_Rand_ZeroFloat - + /* 08788 80B72128 A60C0158 */ sh $t4, 0x0158($s0) ## 00000158 -/* 0878C 80B7212C 4600018D */ trunc.w.s $f6, $f0 -/* 08790 80B72130 440E3000 */ mfc1 $t6, $f6 +/* 0878C 80B7212C 4600018D */ trunc.w.s $f6, $f0 +/* 08790 80B72130 440E3000 */ mfc1 $t6, $f6 /* 08794 80B72134 00000000 */ nop /* 08798 80B72138 25CF07D0 */ addiu $t7, $t6, 0x07D0 ## $t7 = 000007D0 -/* 0879C 80B7213C 10000C4E */ beq $zero, $zero, .L80B75278 +/* 0879C 80B7213C 10000C4E */ beq $zero, $zero, .L80B75278 /* 087A0 80B72140 A60F0180 */ sh $t7, 0x0180($s0) ## 00000180 glabel L80B72144 -/* 087A4 80B72144 4405A000 */ mfc1 $a1, $f20 -/* 087A8 80B72148 4406A000 */ mfc1 $a2, $f20 +/* 087A4 80B72144 4405A000 */ mfc1 $a1, $f20 +/* 087A8 80B72148 4406A000 */ mfc1 $a2, $f20 /* 087AC 80B7214C 3C073D4C */ lui $a3, 0x3D4C ## $a3 = 3D4C0000 /* 087B0 80B72150 34E7CCCD */ ori $a3, $a3, 0xCCCD ## $a3 = 3D4CCCCD /* 087B4 80B72154 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 087B8 80B72158 26040068 */ addiu $a0, $s0, 0x0068 ## $a0 = 00000068 -/* 087BC 80B7215C 4406A000 */ mfc1 $a2, $f20 +/* 087BC 80B7215C 4406A000 */ mfc1 $a2, $f20 /* 087C0 80B72160 260401B0 */ addiu $a0, $s0, 0x01B0 ## $a0 = 000001B0 /* 087C4 80B72164 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 /* 087C8 80B72168 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 087CC 80B7216C 3C074380 */ lui $a3, 0x4380 ## $a3 = 43800000 /* 087D0 80B72170 8618017A */ lh $t8, 0x017A($s0) ## 0000017A -/* 087D4 80B72174 1700002C */ bne $t8, $zero, .L80B72228 +/* 087D4 80B72174 1700002C */ bne $t8, $zero, .L80B72228 /* 087D8 80B72178 00000000 */ nop /* 087DC 80B7217C 860A01A4 */ lh $t2, 0x01A4($s0) ## 000001A4 -/* 087E0 80B72180 15400005 */ bne $t2, $zero, .L80B72198 +/* 087E0 80B72180 15400005 */ bne $t2, $zero, .L80B72198 /* 087E4 80B72184 2402000A */ addiu $v0, $zero, 0x000A ## $v0 = 0000000A /* 087E8 80B72188 A602015A */ sh $v0, 0x015A($s0) ## 0000015A /* 087EC 80B7218C 8619015A */ lh $t9, 0x015A($s0) ## 0000015A -/* 087F0 80B72190 10000025 */ beq $zero, $zero, .L80B72228 +/* 087F0 80B72190 10000025 */ beq $zero, $zero, .L80B72228 /* 087F4 80B72194 A6190158 */ sh $t9, 0x0158($s0) ## 00000158 .L80B72198: /* 087F8 80B72198 3C0141F0 */ lui $at, 0x41F0 ## $at = 41F00000 /* 087FC 80B7219C 240C0001 */ addiu $t4, $zero, 0x0001 ## $t4 = 00000001 /* 08800 80B721A0 44816000 */ mtc1 $at, $f12 ## $f12 = 30.00 /* 08804 80B721A4 0C00CFBE */ jal Math_Rand_ZeroFloat - + /* 08808 80B721A8 A60C0158 */ sh $t4, 0x0158($s0) ## 00000158 -/* 0880C 80B721AC 4600010D */ trunc.w.s $f4, $f0 +/* 0880C 80B721AC 4600010D */ trunc.w.s $f4, $f0 /* 08810 80B721B0 3C014396 */ lui $at, 0x4396 ## $at = 43960000 /* 08814 80B721B4 44816000 */ mtc1 $at, $f12 ## $f12 = 300.00 -/* 08818 80B721B8 440E2000 */ mfc1 $t6, $f4 +/* 08818 80B721B8 440E2000 */ mfc1 $t6, $f4 /* 0881C 80B721BC 00000000 */ nop /* 08820 80B721C0 25CF000A */ addiu $t7, $t6, 0x000A ## $t7 = 0000000A /* 08824 80B721C4 0C00CFC8 */ jal Math_Rand_CenteredFloat - + /* 08828 80B721C8 A60F017A */ sh $t7, 0x017A($s0) ## 0000017A /* 0882C 80B721CC 3C014248 */ lui $at, 0x4248 ## $at = 42480000 /* 08830 80B721D0 44816000 */ mtc1 $at, $f12 ## $f12 = 50.00 /* 08834 80B721D4 0C00CFBE */ jal Math_Rand_ZeroFloat - + /* 08838 80B721D8 E60001B4 */ swc1 $f0, 0x01B4($s0) ## 000001B4 /* 0883C 80B721DC 8E3807C0 */ lw $t8, 0x07C0($s1) ## 000007C0 /* 08840 80B721E0 3C014248 */ lui $at, 0x4248 ## $at = 42480000 @@ -841,11 +841,11 @@ glabel L80B72144 /* 08854 80B721F4 85590002 */ lh $t9, 0x0002($t2) ## 00000002 /* 08858 80B721F8 44995000 */ mtc1 $t9, $f10 ## $f10 = 0.00 /* 0885C 80B721FC 00000000 */ nop -/* 08860 80B72200 46805220 */ cvt.s.w $f8, $f10 -/* 08864 80B72204 46064101 */ sub.s $f4, $f8, $f6 -/* 08868 80B72208 46002281 */ sub.s $f10, $f4, $f0 +/* 08860 80B72200 46805220 */ cvt.s.w $f8, $f10 +/* 08864 80B72204 46064101 */ sub.s $f4, $f8, $f6 +/* 08868 80B72208 46002281 */ sub.s $f10, $f4, $f0 /* 0886C 80B7220C 0C00CFC8 */ jal Math_Rand_CenteredFloat - + /* 08870 80B72210 E60A01B8 */ swc1 $f10, 0x01B8($s0) ## 000001B8 /* 08874 80B72214 3C0144FA */ lui $at, 0x44FA ## $at = 44FA0000 /* 08878 80B72218 44814000 */ mtc1 $at, $f8 ## $f8 = 2000.00 @@ -854,24 +854,24 @@ glabel L80B72144 /* 08884 80B72224 E6080194 */ swc1 $f8, 0x0194($s0) ## 00000194 .L80B72228: /* 08888 80B72228 3C0C80B8 */ lui $t4, %hi(D_80B7E0B6) ## $t4 = 80B80000 -/* 0888C 80B7222C 918CE0B6 */ lbu $t4, %lo(D_80B7E0B6)($t4) +/* 0888C 80B7222C 918CE0B6 */ lbu $t4, %lo(D_80B7E0B6)($t4) /* 08890 80B72230 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 08894 80B72234 15810005 */ bne $t4, $at, .L80B7224C +/* 08894 80B72234 15810005 */ bne $t4, $at, .L80B7224C /* 08898 80B72238 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0889C 80B7223C 0C2DC3B5 */ jal func_80B70ED4 +/* 0889C 80B7223C 0C2DC3B5 */ jal func_80B70ED4 /* 088A0 80B72240 26250014 */ addiu $a1, $s1, 0x0014 ## $a1 = 00000014 -/* 088A4 80B72244 10000C0D */ beq $zero, $zero, .L80B7527C +/* 088A4 80B72244 10000C0D */ beq $zero, $zero, .L80B7527C /* 088A8 80B72248 8604015C */ lh $a0, 0x015C($s0) ## 0000015C .L80B7224C: /* 088AC 80B7224C 8E090004 */ lw $t1, 0x0004($s0) ## 00000004 /* 088B0 80B72250 2401FFFE */ addiu $at, $zero, 0xFFFE ## $at = FFFFFFFE -/* 088B4 80B72254 01215824 */ and $t3, $t1, $at -/* 088B8 80B72258 10000C07 */ beq $zero, $zero, .L80B75278 +/* 088B4 80B72254 01215824 */ and $t3, $t1, $at +/* 088B8 80B72258 10000C07 */ beq $zero, $zero, .L80B75278 /* 088BC 80B7225C AE0B0004 */ sw $t3, 0x0004($s0) ## 00000004 glabel L80B72260 /* 088C0 80B72260 920D0150 */ lbu $t5, 0x0150($s0) ## 00000150 /* 088C4 80B72264 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 088C8 80B72268 15A1000D */ bne $t5, $at, .L80B722A0 +/* 088C8 80B72268 15A1000D */ bne $t5, $at, .L80B722A0 /* 088CC 80B7226C 3C01C30C */ lui $at, 0xC30C ## $at = C30C0000 /* 088D0 80B72270 44803000 */ mtc1 $zero, $f6 ## $f6 = 0.00 /* 088D4 80B72274 44812000 */ mtc1 $at, $f4 ## $f4 = -140.00 @@ -883,225 +883,225 @@ glabel L80B72260 /* 088EC 80B7228C A60201A2 */ sh $v0, 0x01A2($s0) ## 000001A2 /* 088F0 80B72290 E60601B4 */ swc1 $f6, 0x01B4($s0) ## 000001B4 /* 088F4 80B72294 E60401B8 */ swc1 $f4, 0x01B8($s0) ## 000001B8 -/* 088F8 80B72298 10000BF7 */ beq $zero, $zero, .L80B75278 +/* 088F8 80B72298 10000BF7 */ beq $zero, $zero, .L80B75278 /* 088FC 80B7229C E60A01BC */ swc1 $f10, 0x01BC($s0) ## 000001BC .L80B722A0: /* 08900 80B722A0 260401B0 */ addiu $a0, $s0, 0x01B0 ## $a0 = 000001B0 -/* 08904 80B722A4 4406A000 */ mfc1 $a2, $f20 -/* 08908 80B722A8 AFA4004C */ sw $a0, 0x004C($sp) +/* 08904 80B722A4 4406A000 */ mfc1 $a2, $f20 +/* 08908 80B722A8 AFA4004C */ sw $a0, 0x004C($sp) /* 0890C 80B722AC 3C054580 */ lui $a1, 0x4580 ## $a1 = 45800000 /* 08910 80B722B0 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 08914 80B722B4 3C074380 */ lui $a3, 0x4380 ## $a3 = 43800000 /* 08918 80B722B8 3C01437A */ lui $at, 0x437A ## $at = 437A0000 /* 0891C 80B722BC 44813000 */ mtc1 $at, $f6 ## $f6 = 250.00 -/* 08920 80B722C0 C7A40118 */ lwc1 $f4, 0x0118($sp) +/* 08920 80B722C0 C7A40118 */ lwc1 $f4, 0x0118($sp) /* 08924 80B722C4 C6080090 */ lwc1 $f8, 0x0090($s0) ## 00000090 -/* 08928 80B722C8 8FA4004C */ lw $a0, 0x004C($sp) -/* 0892C 80B722CC 46043282 */ mul.s $f10, $f6, $f4 -/* 08930 80B722D0 460A403C */ c.lt.s $f8, $f10 +/* 08928 80B722C8 8FA4004C */ lw $a0, 0x004C($sp) +/* 0892C 80B722CC 46043282 */ mul.s $f10, $f6, $f4 +/* 08930 80B722D0 460A403C */ c.lt.s $f8, $f10 /* 08934 80B722D4 00000000 */ nop -/* 08938 80B722D8 45030005 */ bc1tl .L80B722F0 -/* 0893C 80B722DC 4406A000 */ mfc1 $a2, $f20 +/* 08938 80B722D8 45030005 */ bc1tl .L80B722F0 +/* 0893C 80B722DC 4406A000 */ mfc1 $a2, $f20 /* 08940 80B722E0 860F017C */ lh $t7, 0x017C($s0) ## 0000017C -/* 08944 80B722E4 51E00015 */ beql $t7, $zero, .L80B7233C +/* 08944 80B722E4 51E00015 */ beql $t7, $zero, .L80B7233C /* 08948 80B722E8 3C0144FA */ lui $at, 0x44FA ## $at = 44FA0000 -/* 0894C 80B722EC 4406A000 */ mfc1 $a2, $f20 +/* 0894C 80B722EC 4406A000 */ mfc1 $a2, $f20 .L80B722F0: /* 08950 80B722F0 3C054600 */ lui $a1, 0x4600 ## $a1 = 46000000 /* 08954 80B722F4 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 08958 80B722F8 3C074440 */ lui $a3, 0x4440 ## $a3 = 44400000 /* 0895C 80B722FC 3C054086 */ lui $a1, 0x4086 ## $a1 = 40860000 -/* 08960 80B72300 4406A000 */ mfc1 $a2, $f20 +/* 08960 80B72300 4406A000 */ mfc1 $a2, $f20 /* 08964 80B72304 34A56666 */ ori $a1, $a1, 0x6666 ## $a1 = 40866666 /* 08968 80B72308 26040068 */ addiu $a0, $s0, 0x0068 ## $a0 = 00000068 /* 0896C 80B7230C 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 08970 80B72310 3C073F40 */ lui $a3, 0x3F40 ## $a3 = 3F400000 /* 08974 80B72314 3C0180B8 */ lui $at, %hi(D_80B7B64C) ## $at = 80B80000 -/* 08978 80B72318 C426B64C */ lwc1 $f6, %lo(D_80B7B64C)($at) +/* 08978 80B72318 C426B64C */ lwc1 $f6, %lo(D_80B7B64C)($at) /* 0897C 80B7231C 3C01457A */ lui $at, 0x457A ## $at = 457A0000 /* 08980 80B72320 44812000 */ mtc1 $at, $f4 ## $f4 = 4000.00 /* 08984 80B72324 24180014 */ addiu $t8, $zero, 0x0014 ## $t8 = 00000014 /* 08988 80B72328 A618017A */ sh $t8, 0x017A($s0) ## 0000017A /* 0898C 80B7232C E6060190 */ swc1 $f6, 0x0190($s0) ## 00000190 -/* 08990 80B72330 1000000B */ beq $zero, $zero, .L80B72360 +/* 08990 80B72330 1000000B */ beq $zero, $zero, .L80B72360 /* 08994 80B72334 E6040194 */ swc1 $f4, 0x0194($s0) ## 00000194 /* 08998 80B72338 3C0144FA */ lui $at, 0x44FA ## $at = 44FA0000 .L80B7233C: /* 0899C 80B7233C 44814000 */ mtc1 $at, $f8 ## $f8 = 2000.00 -/* 089A0 80B72340 4406A000 */ mfc1 $a2, $f20 +/* 089A0 80B72340 4406A000 */ mfc1 $a2, $f20 /* 089A4 80B72344 3C073DCC */ lui $a3, 0x3DCC ## $a3 = 3DCC0000 /* 089A8 80B72348 E6140190 */ swc1 $f20, 0x0190($s0) ## 00000190 /* 089AC 80B7234C 34E7CCCD */ ori $a3, $a3, 0xCCCD ## $a3 = 3DCCCCCD /* 089B0 80B72350 26040068 */ addiu $a0, $s0, 0x0068 ## $a0 = 00000068 /* 089B4 80B72354 3C053FC0 */ lui $a1, 0x3FC0 ## $a1 = 3FC00000 /* 089B8 80B72358 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 089BC 80B7235C E6080194 */ swc1 $f8, 0x0194($s0) ## 00000194 .L80B72360: /* 089C0 80B72360 860A017A */ lh $t2, 0x017A($s0) ## 0000017A -/* 089C4 80B72364 11400006 */ beq $t2, $zero, .L80B72380 +/* 089C4 80B72364 11400006 */ beq $t2, $zero, .L80B72380 /* 089C8 80B72368 3C014248 */ lui $at, 0x4248 ## $at = 42480000 /* 089CC 80B7236C 44813000 */ mtc1 $at, $f6 ## $f6 = 50.00 -/* 089D0 80B72370 C7AA0124 */ lwc1 $f10, 0x0124($sp) -/* 089D4 80B72374 4606503C */ c.lt.s $f10, $f6 +/* 089D0 80B72370 C7AA0124 */ lwc1 $f10, 0x0124($sp) +/* 089D4 80B72374 4606503C */ c.lt.s $f10, $f6 /* 089D8 80B72378 00000000 */ nop -/* 089DC 80B7237C 4500000C */ bc1f .L80B723B0 +/* 089DC 80B7237C 4500000C */ bc1f .L80B723B0 .L80B72380: /* 089E0 80B72380 3C0141F0 */ lui $at, 0x41F0 ## $at = 41F00000 /* 089E4 80B72384 44816000 */ mtc1 $at, $f12 ## $f12 = 30.00 /* 089E8 80B72388 0C00CFBE */ jal Math_Rand_ZeroFloat - + /* 089EC 80B7238C A6000158 */ sh $zero, 0x0158($s0) ## 00000158 -/* 089F0 80B72390 4600010D */ trunc.w.s $f4, $f0 +/* 089F0 80B72390 4600010D */ trunc.w.s $f4, $f0 /* 089F4 80B72394 3C0143FA */ lui $at, 0x43FA ## $at = 43FA0000 /* 089F8 80B72398 44814000 */ mtc1 $at, $f8 ## $f8 = 500.00 /* 089FC 80B7239C E6140190 */ swc1 $f20, 0x0190($s0) ## 00000190 -/* 08A00 80B723A0 440B2000 */ mfc1 $t3, $f4 +/* 08A00 80B723A0 440B2000 */ mfc1 $t3, $f4 /* 08A04 80B723A4 E6080194 */ swc1 $f8, 0x0194($s0) ## 00000194 /* 08A08 80B723A8 256D0003 */ addiu $t5, $t3, 0x0003 ## $t5 = 00000003 /* 08A0C 80B723AC A60D017A */ sh $t5, 0x017A($s0) ## 0000017A .L80B723B0: /* 08A10 80B723B0 3C0E80B8 */ lui $t6, %hi(D_80B7E0B6) ## $t6 = 80B80000 -/* 08A14 80B723B4 91CEE0B6 */ lbu $t6, %lo(D_80B7E0B6)($t6) +/* 08A14 80B723B4 91CEE0B6 */ lbu $t6, %lo(D_80B7E0B6)($t6) /* 08A18 80B723B8 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 08A1C 80B723BC 15C10005 */ bne $t6, $at, .L80B723D4 +/* 08A1C 80B723BC 15C10005 */ bne $t6, $at, .L80B723D4 /* 08A20 80B723C0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 08A24 80B723C4 0C2DC3B5 */ jal func_80B70ED4 +/* 08A24 80B723C4 0C2DC3B5 */ jal func_80B70ED4 /* 08A28 80B723C8 26250014 */ addiu $a1, $s1, 0x0014 ## $a1 = 00000014 -/* 08A2C 80B723CC 10000BAB */ beq $zero, $zero, .L80B7527C +/* 08A2C 80B723CC 10000BAB */ beq $zero, $zero, .L80B7527C /* 08A30 80B723D0 8604015C */ lh $a0, 0x015C($s0) ## 0000015C .L80B723D4: /* 08A34 80B723D4 8E0F0004 */ lw $t7, 0x0004($s0) ## 00000004 /* 08A38 80B723D8 2401FFFE */ addiu $at, $zero, 0xFFFE ## $at = FFFFFFFE -/* 08A3C 80B723DC 01E1C024 */ and $t8, $t7, $at -/* 08A40 80B723E0 10000BA5 */ beq $zero, $zero, .L80B75278 +/* 08A3C 80B723DC 01E1C024 */ and $t8, $t7, $at +/* 08A40 80B723E0 10000BA5 */ beq $zero, $zero, .L80B75278 /* 08A44 80B723E4 AE180004 */ sw $t8, 0x0004($s0) ## 00000004 glabel L80B723E8 /* 08A48 80B723E8 26040166 */ addiu $a0, $s0, 0x0166 ## $a0 = 00000166 /* 08A4C 80B723EC 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 08A50 80B723F0 24060014 */ addiu $a2, $zero, 0x0014 ## $a2 = 00000014 /* 08A54 80B723F4 0C01E1EF */ jal Math_SmoothScaleMaxS - + /* 08A58 80B723F8 24070020 */ addiu $a3, $zero, 0x0020 ## $a3 = 00000020 /* 08A5C 80B723FC 3C01437A */ lui $at, 0x437A ## $at = 437A0000 /* 08A60 80B72400 44813000 */ mtc1 $at, $f6 ## $f6 = 250.00 -/* 08A64 80B72404 C7A40118 */ lwc1 $f4, 0x0118($sp) +/* 08A64 80B72404 C7A40118 */ lwc1 $f4, 0x0118($sp) /* 08A68 80B72408 C60A0090 */ lwc1 $f10, 0x0090($s0) ## 00000090 -/* 08A6C 80B7240C 46043202 */ mul.s $f8, $f6, $f4 -/* 08A70 80B72410 4608503C */ c.lt.s $f10, $f8 +/* 08A6C 80B7240C 46043202 */ mul.s $f8, $f6, $f4 +/* 08A70 80B72410 4608503C */ c.lt.s $f10, $f8 /* 08A74 80B72414 00000000 */ nop -/* 08A78 80B72418 45030005 */ bc1tl .L80B72430 -/* 08A7C 80B7241C 4406A000 */ mfc1 $a2, $f20 +/* 08A78 80B72418 45030005 */ bc1tl .L80B72430 +/* 08A7C 80B7241C 4406A000 */ mfc1 $a2, $f20 /* 08A80 80B72420 860A017C */ lh $t2, 0x017C($s0) ## 0000017C -/* 08A84 80B72424 51400024 */ beql $t2, $zero, .L80B724B8 +/* 08A84 80B72424 51400024 */ beql $t2, $zero, .L80B724B8 /* 08A88 80B72428 3C014248 */ lui $at, 0x4248 ## $at = 42480000 -/* 08A8C 80B7242C 4406A000 */ mfc1 $a2, $f20 +/* 08A8C 80B7242C 4406A000 */ mfc1 $a2, $f20 .L80B72430: /* 08A90 80B72430 26040068 */ addiu $a0, $s0, 0x0068 ## $a0 = 00000068 /* 08A94 80B72434 3C054040 */ lui $a1, 0x4040 ## $a1 = 40400000 /* 08A98 80B72438 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 08A9C 80B7243C 3C073F40 */ lui $a3, 0x3F40 ## $a3 = 3F400000 /* 08AA0 80B72440 3C01457A */ lui $at, 0x457A ## $at = 457A0000 /* 08AA4 80B72444 44813000 */ mtc1 $at, $f6 ## $f6 = 4000.00 /* 08AA8 80B72448 24190014 */ addiu $t9, $zero, 0x0014 ## $t9 = 00000014 -/* 08AAC 80B7244C 4406A000 */ mfc1 $a2, $f20 +/* 08AAC 80B7244C 4406A000 */ mfc1 $a2, $f20 /* 08AB0 80B72450 E6140190 */ swc1 $f20, 0x0190($s0) ## 00000190 /* 08AB4 80B72454 A619017A */ sh $t9, 0x017A($s0) ## 0000017A /* 08AB8 80B72458 260401B0 */ addiu $a0, $s0, 0x01B0 ## $a0 = 000001B0 /* 08ABC 80B7245C 3C054580 */ lui $a1, 0x4580 ## $a1 = 45800000 /* 08AC0 80B72460 3C074380 */ lui $a3, 0x4380 ## $a3 = 43800000 /* 08AC4 80B72464 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 08AC8 80B72468 E6060194 */ swc1 $f6, 0x0194($s0) ## 00000194 /* 08ACC 80B7246C 3C0C0001 */ lui $t4, 0x0001 ## $t4 = 00010000 -/* 08AD0 80B72470 01916021 */ addu $t4, $t4, $s1 +/* 08AD0 80B72470 01916021 */ addu $t4, $t4, $s1 /* 08AD4 80B72474 8D8C1DE4 */ lw $t4, 0x1DE4($t4) ## 00011DE4 /* 08AD8 80B72478 3189001F */ andi $t1, $t4, 0x001F ## $t1 = 00000000 -/* 08ADC 80B7247C 15200036 */ bne $t1, $zero, .L80B72558 +/* 08ADC 80B7247C 15200036 */ bne $t1, $zero, .L80B72558 /* 08AE0 80B72480 3C014416 */ lui $at, 0x4416 ## $at = 44160000 /* 08AE4 80B72484 44816000 */ mtc1 $at, $f12 ## $f12 = 600.00 /* 08AE8 80B72488 0C00CFC8 */ jal Math_Rand_CenteredFloat - + /* 08AEC 80B7248C 00000000 */ nop /* 08AF0 80B72490 3C014416 */ lui $at, 0x4416 ## $at = 44160000 /* 08AF4 80B72494 44816000 */ mtc1 $at, $f12 ## $f12 = 600.00 /* 08AF8 80B72498 0C00CFC8 */ jal Math_Rand_CenteredFloat - + /* 08AFC 80B7249C E60001B4 */ swc1 $f0, 0x01B4($s0) ## 000001B4 /* 08B00 80B724A0 3C01C2F0 */ lui $at, 0xC2F0 ## $at = C2F00000 /* 08B04 80B724A4 44812000 */ mtc1 $at, $f4 ## $f4 = -120.00 /* 08B08 80B724A8 E60001BC */ swc1 $f0, 0x01BC($s0) ## 000001BC -/* 08B0C 80B724AC 1000002A */ beq $zero, $zero, .L80B72558 +/* 08B0C 80B724AC 1000002A */ beq $zero, $zero, .L80B72558 /* 08B10 80B724B0 E60401B8 */ swc1 $f4, 0x01B8($s0) ## 000001B8 /* 08B14 80B724B4 3C014248 */ lui $at, 0x4248 ## $at = 42480000 .L80B724B8: /* 08B18 80B724B8 44815000 */ mtc1 $at, $f10 ## $f10 = 50.00 -/* 08B1C 80B724BC C7A80124 */ lwc1 $f8, 0x0124($sp) -/* 08B20 80B724C0 4608503C */ c.lt.s $f10, $f8 +/* 08B1C 80B724BC C7A80124 */ lwc1 $f8, 0x0124($sp) +/* 08B20 80B724C0 4608503C */ c.lt.s $f10, $f8 /* 08B24 80B724C4 00000000 */ nop -/* 08B28 80B724C8 45000013 */ bc1f .L80B72518 +/* 08B28 80B724C8 45000013 */ bc1f .L80B72518 /* 08B2C 80B724CC 3C0180B8 */ lui $at, %hi(D_80B7B650) ## $at = 80B80000 -/* 08B30 80B724D0 C426B650 */ lwc1 $f6, %lo(D_80B7B650)($at) +/* 08B30 80B724D0 C426B650 */ lwc1 $f6, %lo(D_80B7B650)($at) /* 08B34 80B724D4 3C0180B8 */ lui $at, %hi(D_80B7B654) ## $at = 80B80000 -/* 08B38 80B724D8 4405A000 */ mfc1 $a1, $f20 +/* 08B38 80B724D8 4405A000 */ mfc1 $a1, $f20 /* 08B3C 80B724DC E6060190 */ swc1 $f6, 0x0190($s0) ## 00000190 -/* 08B40 80B724E0 C424B654 */ lwc1 $f4, %lo(D_80B7B654)($at) -/* 08B44 80B724E4 4406A000 */ mfc1 $a2, $f20 +/* 08B40 80B724E0 C424B654 */ lwc1 $f4, %lo(D_80B7B654)($at) +/* 08B44 80B724E4 4406A000 */ mfc1 $a2, $f20 /* 08B48 80B724E8 3C073DCC */ lui $a3, 0x3DCC ## $a3 = 3DCC0000 /* 08B4C 80B724EC 34E7CCCD */ ori $a3, $a3, 0xCCCD ## $a3 = 3DCCCCCD /* 08B50 80B724F0 26040068 */ addiu $a0, $s0, 0x0068 ## $a0 = 00000068 /* 08B54 80B724F4 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 08B58 80B724F8 E6040194 */ swc1 $f4, 0x0194($s0) ## 00000194 -/* 08B5C 80B724FC 4406A000 */ mfc1 $a2, $f20 +/* 08B5C 80B724FC 4406A000 */ mfc1 $a2, $f20 /* 08B60 80B72500 260401B0 */ addiu $a0, $s0, 0x01B0 ## $a0 = 000001B0 /* 08B64 80B72504 3C054500 */ lui $a1, 0x4500 ## $a1 = 45000000 /* 08B68 80B72508 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 08B6C 80B7250C 3C074300 */ lui $a3, 0x4300 ## $a3 = 43000000 -/* 08B70 80B72510 10000012 */ beq $zero, $zero, .L80B7255C +/* 08B70 80B72510 10000012 */ beq $zero, $zero, .L80B7255C /* 08B74 80B72514 860201A4 */ lh $v0, 0x01A4($s0) ## 000001A4 .L80B72518: /* 08B78 80B72518 3C0180B8 */ lui $at, %hi(D_80B7B658) ## $at = 80B80000 -/* 08B7C 80B7251C C42AB658 */ lwc1 $f10, %lo(D_80B7B658)($at) +/* 08B7C 80B7251C C42AB658 */ lwc1 $f10, %lo(D_80B7B658)($at) /* 08B80 80B72520 3C0143FA */ lui $at, 0x43FA ## $at = 43FA0000 /* 08B84 80B72524 44814000 */ mtc1 $at, $f8 ## $f8 = 500.00 -/* 08B88 80B72528 4405A000 */ mfc1 $a1, $f20 +/* 08B88 80B72528 4405A000 */ mfc1 $a1, $f20 /* 08B8C 80B7252C 3C063CA3 */ lui $a2, 0x3CA3 ## $a2 = 3CA30000 /* 08B90 80B72530 34C6D70A */ ori $a2, $a2, 0xD70A ## $a2 = 3CA3D70A /* 08B94 80B72534 26040068 */ addiu $a0, $s0, 0x0068 ## $a0 = 00000068 /* 08B98 80B72538 E60A0190 */ swc1 $f10, 0x0190($s0) ## 00000190 /* 08B9C 80B7253C 0C01E123 */ jal Math_SmoothDownscaleMaxF - + /* 08BA0 80B72540 E6080194 */ swc1 $f8, 0x0194($s0) ## 00000194 -/* 08BA4 80B72544 4406A000 */ mfc1 $a2, $f20 +/* 08BA4 80B72544 4406A000 */ mfc1 $a2, $f20 /* 08BA8 80B72548 260401B0 */ addiu $a0, $s0, 0x01B0 ## $a0 = 000001B0 /* 08BAC 80B7254C 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 /* 08BB0 80B72550 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 08BB4 80B72554 3C074380 */ lui $a3, 0x4380 ## $a3 = 43800000 .L80B72558: /* 08BB8 80B72558 860201A4 */ lh $v0, 0x01A4($s0) ## 000001A4 .L80B7255C: -/* 08BBC 80B7255C 14400005 */ bne $v0, $zero, .L80B72574 +/* 08BBC 80B7255C 14400005 */ bne $v0, $zero, .L80B72574 /* 08BC0 80B72560 00000000 */ nop /* 08BC4 80B72564 2402000A */ addiu $v0, $zero, 0x000A ## $v0 = 0000000A /* 08BC8 80B72568 A6020158 */ sh $v0, 0x0158($s0) ## 00000158 -/* 08BCC 80B7256C 10000022 */ beq $zero, $zero, .L80B725F8 +/* 08BCC 80B7256C 10000022 */ beq $zero, $zero, .L80B725F8 /* 08BD0 80B72570 A602015A */ sh $v0, 0x015A($s0) ## 0000015A .L80B72574: /* 08BD4 80B72574 3C038016 */ lui $v1, 0x8016 ## $v1 = 80160000 /* 08BD8 80B72578 8C63FA90 */ lw $v1, -0x0570($v1) ## 8015FA90 /* 08BDC 80B7257C 846B09D8 */ lh $t3, 0x09D8($v1) ## 801609D8 -/* 08BE0 80B72580 15600005 */ bne $t3, $zero, .L80B72598 +/* 08BE0 80B72580 15600005 */ bne $t3, $zero, .L80B72598 /* 08BE4 80B72584 304D07FF */ andi $t5, $v0, 0x07FF ## $t5 = 0000000A -/* 08BE8 80B72588 15A0001B */ bne $t5, $zero, .L80B725F8 -/* 08BEC 80B7258C 28413A98 */ slti $at, $v0, 0x3A98 -/* 08BF0 80B72590 5020001A */ beql $at, $zero, .L80B725FC +/* 08BE8 80B72588 15A0001B */ bne $t5, $zero, .L80B725F8 +/* 08BEC 80B7258C 28413A98 */ slti $at, $v0, 0x3A98 +/* 08BF0 80B72590 5020001A */ beql $at, $zero, .L80B725FC /* 08BF4 80B72594 8E0C0004 */ lw $t4, 0x0004($s0) ## 00000004 .L80B72598: /* 08BF8 80B72598 A46009D8 */ sh $zero, 0x09D8($v1) ## 801609D8 @@ -1119,46 +1119,46 @@ glabel L80B723E8 /* 08C28 80B725C8 85590002 */ lh $t9, 0x0002($t2) ## 00000002 /* 08C2C 80B725CC 44993000 */ mtc1 $t9, $f6 ## $f6 = 0.00 /* 08C30 80B725D0 00000000 */ nop -/* 08C34 80B725D4 46803120 */ cvt.s.w $f4, $f6 -/* 08C38 80B725D8 460A2200 */ add.s $f8, $f4, $f10 +/* 08C34 80B725D4 46803120 */ cvt.s.w $f4, $f6 +/* 08C38 80B725D8 460A2200 */ add.s $f8, $f4, $f10 /* 08C3C 80B725DC 0C00CFBE */ jal Math_Rand_ZeroFloat - + /* 08C40 80B725E0 E60801B8 */ swc1 $f8, 0x01B8($s0) ## 000001B8 /* 08C44 80B725E4 3C014248 */ lui $at, 0x4248 ## $at = 42480000 /* 08C48 80B725E8 44816000 */ mtc1 $at, $f12 ## $f12 = 50.00 /* 08C4C 80B725EC 0C00CFBE */ jal Math_Rand_ZeroFloat - + /* 08C50 80B725F0 E60001B4 */ swc1 $f0, 0x01B4($s0) ## 000001B4 /* 08C54 80B725F4 E60001BC */ swc1 $f0, 0x01BC($s0) ## 000001BC .L80B725F8: /* 08C58 80B725F8 8E0C0004 */ lw $t4, 0x0004($s0) ## 00000004 .L80B725FC: /* 08C5C 80B725FC 2401FFFE */ addiu $at, $zero, 0xFFFE ## $at = FFFFFFFE -/* 08C60 80B72600 01814824 */ and $t1, $t4, $at -/* 08C64 80B72604 10000B1C */ beq $zero, $zero, .L80B75278 +/* 08C60 80B72600 01814824 */ and $t1, $t4, $at +/* 08C64 80B72604 10000B1C */ beq $zero, $zero, .L80B75278 /* 08C68 80B72608 AE090004 */ sw $t1, 0x0004($s0) ## 00000004 glabel L80B7260C /* 08C6C 80B7260C 3C01437A */ lui $at, 0x437A ## $at = 437A0000 /* 08C70 80B72610 44812000 */ mtc1 $at, $f4 ## $f4 = 250.00 -/* 08C74 80B72614 C7AA0118 */ lwc1 $f10, 0x0118($sp) +/* 08C74 80B72614 C7AA0118 */ lwc1 $f10, 0x0118($sp) /* 08C78 80B72618 C6060090 */ lwc1 $f6, 0x0090($s0) ## 00000090 -/* 08C7C 80B7261C 460A2202 */ mul.s $f8, $f4, $f10 -/* 08C80 80B72620 4608303C */ c.lt.s $f6, $f8 +/* 08C7C 80B7261C 460A2202 */ mul.s $f8, $f4, $f10 +/* 08C80 80B72620 4608303C */ c.lt.s $f6, $f8 /* 08C84 80B72624 00000000 */ nop -/* 08C88 80B72628 45030004 */ bc1tl .L80B7263C +/* 08C88 80B72628 45030004 */ bc1tl .L80B7263C /* 08C8C 80B7262C 3C01C2F0 */ lui $at, 0xC2F0 ## $at = C2F00000 /* 08C90 80B72630 860B017C */ lh $t3, 0x017C($s0) ## 0000017C -/* 08C94 80B72634 11600006 */ beq $t3, $zero, .L80B72650 +/* 08C94 80B72634 11600006 */ beq $t3, $zero, .L80B72650 /* 08C98 80B72638 3C01C2F0 */ lui $at, 0xC2F0 ## $at = C2F00000 .L80B7263C: /* 08C9C 80B7263C 44812000 */ mtc1 $at, $f4 ## $f4 = -120.00 /* 08CA0 80B72640 240DFFFF */ addiu $t5, $zero, 0xFFFF ## $t5 = FFFFFFFF /* 08CA4 80B72644 A60D0158 */ sh $t5, 0x0158($s0) ## 00000158 -/* 08CA8 80B72648 10000B0B */ beq $zero, $zero, .L80B75278 +/* 08CA8 80B72648 10000B0B */ beq $zero, $zero, .L80B75278 /* 08CAC 80B7264C E60401B8 */ swc1 $f4, 0x01B8($s0) ## 000001B8 .L80B72650: /* 08CB0 80B72650 3C0180B8 */ lui $at, %hi(D_80B7B65C) ## $at = 80B80000 -/* 08CB4 80B72654 C42AB65C */ lwc1 $f10, %lo(D_80B7B65C)($at) +/* 08CB4 80B72654 C42AB65C */ lwc1 $f10, %lo(D_80B7B65C)($at) /* 08CB8 80B72658 3C01447A */ lui $at, 0x447A ## $at = 447A0000 /* 08CBC 80B7265C 44813000 */ mtc1 $at, $f6 ## $f6 = 1000.00 /* 08CC0 80B72660 26040166 */ addiu $a0, $s0, 0x0166 ## $a0 = 00000166 @@ -1167,7 +1167,7 @@ glabel L80B7260C /* 08CCC 80B7266C 24070100 */ addiu $a3, $zero, 0x0100 ## $a3 = 00000100 /* 08CD0 80B72670 E60A0190 */ swc1 $f10, 0x0190($s0) ## 00000190 /* 08CD4 80B72674 0C01E1EF */ jal Math_SmoothScaleMaxS - + /* 08CD8 80B72678 E6060194 */ swc1 $f6, 0x0194($s0) ## 00000194 /* 08CDC 80B7267C 8E2E07C0 */ lw $t6, 0x07C0($s1) ## 000007C0 /* 08CE0 80B72680 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 @@ -1177,33 +1177,33 @@ glabel L80B7260C /* 08CF0 80B72690 85F80002 */ lh $t8, 0x0002($t7) ## 00000002 /* 08CF4 80B72694 44982000 */ mtc1 $t8, $f4 ## $f4 = 0.00 /* 08CF8 80B72698 00000000 */ nop -/* 08CFC 80B7269C 468022A0 */ cvt.s.w $f10, $f4 -/* 08D00 80B726A0 46065101 */ sub.s $f4, $f10, $f6 -/* 08D04 80B726A4 4604403C */ c.lt.s $f8, $f4 +/* 08CFC 80B7269C 468022A0 */ cvt.s.w $f10, $f4 +/* 08D00 80B726A0 46065101 */ sub.s $f4, $f10, $f6 +/* 08D04 80B726A4 4604403C */ c.lt.s $f8, $f4 /* 08D08 80B726A8 00000000 */ nop -/* 08D0C 80B726AC 4502000A */ bc1fl .L80B726D8 -/* 08D10 80B726B0 4405A000 */ mfc1 $a1, $f20 -/* 08D14 80B726B4 4406A000 */ mfc1 $a2, $f20 +/* 08D0C 80B726AC 4502000A */ bc1fl .L80B726D8 +/* 08D10 80B726B0 4405A000 */ mfc1 $a1, $f20 +/* 08D14 80B726B4 4406A000 */ mfc1 $a2, $f20 /* 08D18 80B726B8 3C073DCC */ lui $a3, 0x3DCC ## $a3 = 3DCC0000 /* 08D1C 80B726BC 34E7CCCD */ ori $a3, $a3, 0xCCCD ## $a3 = 3DCCCCCD /* 08D20 80B726C0 26040068 */ addiu $a0, $s0, 0x0068 ## $a0 = 00000068 /* 08D24 80B726C4 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 08D28 80B726C8 3C053F00 */ lui $a1, 0x3F00 ## $a1 = 3F000000 -/* 08D2C 80B726CC 1000005B */ beq $zero, $zero, .L80B7283C -/* 08D30 80B726D0 4406A000 */ mfc1 $a2, $f20 -/* 08D34 80B726D4 4405A000 */ mfc1 $a1, $f20 +/* 08D2C 80B726CC 1000005B */ beq $zero, $zero, .L80B7283C +/* 08D30 80B726D0 4406A000 */ mfc1 $a2, $f20 +/* 08D34 80B726D4 4405A000 */ mfc1 $a1, $f20 .L80B726D8: /* 08D38 80B726D8 3C063C23 */ lui $a2, 0x3C23 ## $a2 = 3C230000 /* 08D3C 80B726DC 34C6D70A */ ori $a2, $a2, 0xD70A ## $a2 = 3C23D70A /* 08D40 80B726E0 0C01E123 */ jal Math_SmoothDownscaleMaxF - + /* 08D44 80B726E4 26040068 */ addiu $a0, $s0, 0x0068 ## $a0 = 00000068 /* 08D48 80B726E8 44805000 */ mtc1 $zero, $f10 ## $f10 = 0.00 /* 08D4C 80B726EC C6060068 */ lwc1 $f6, 0x0068($s0) ## 00000068 -/* 08D50 80B726F0 46065032 */ c.eq.s $f10, $f6 +/* 08D50 80B726F0 46065032 */ c.eq.s $f10, $f6 /* 08D54 80B726F4 00000000 */ nop -/* 08D58 80B726F8 4503000F */ bc1tl .L80B72738 +/* 08D58 80B726F8 4503000F */ bc1tl .L80B72738 /* 08D5C 80B726FC 3C014396 */ lui $at, 0x4396 ## $at = 43960000 /* 08D60 80B72700 8E2A07C0 */ lw $t2, 0x07C0($s1) ## 000007C0 /* 08D64 80B72704 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 @@ -1212,29 +1212,29 @@ glabel L80B7260C /* 08D70 80B72710 872C0002 */ lh $t4, 0x0002($t9) ## 00000002 /* 08D74 80B72714 448C4000 */ mtc1 $t4, $f8 ## $f8 = 0.00 /* 08D78 80B72718 00000000 */ nop -/* 08D7C 80B7271C 46804120 */ cvt.s.w $f4, $f8 +/* 08D7C 80B7271C 46804120 */ cvt.s.w $f4, $f8 /* 08D80 80B72720 C6080028 */ lwc1 $f8, 0x0028($s0) ## 00000028 -/* 08D84 80B72724 460A2181 */ sub.s $f6, $f4, $f10 -/* 08D88 80B72728 4608303C */ c.lt.s $f6, $f8 +/* 08D84 80B72724 460A2181 */ sub.s $f6, $f4, $f10 +/* 08D88 80B72728 4608303C */ c.lt.s $f6, $f8 /* 08D8C 80B7272C 00000000 */ nop -/* 08D90 80B72730 45000041 */ bc1f .L80B72838 +/* 08D90 80B72730 45000041 */ bc1f .L80B72838 /* 08D94 80B72734 3C014396 */ lui $at, 0x4396 ## $at = 43960000 .L80B72738: /* 08D98 80B72738 44816000 */ mtc1 $at, $f12 ## $f12 = 300.00 /* 08D9C 80B7273C 0C00CFBE */ jal Math_Rand_ZeroFloat - + /* 08DA0 80B72740 00000000 */ nop /* 08DA4 80B72744 3C014396 */ lui $at, 0x4396 ## $at = 43960000 /* 08DA8 80B72748 44816000 */ mtc1 $at, $f12 ## $f12 = 300.00 /* 08DAC 80B7274C 0C00CFBE */ jal Math_Rand_ZeroFloat - + /* 08DB0 80B72750 E60001B4 */ swc1 $f0, 0x01B4($s0) ## 000001B4 /* 08DB4 80B72754 3C014120 */ lui $at, 0x4120 ## $at = 41200000 /* 08DB8 80B72758 44815000 */ mtc1 $at, $f10 ## $f10 = 10.00 /* 08DBC 80B7275C C6040080 */ lwc1 $f4, 0x0080($s0) ## 00000080 /* 08DC0 80B72760 44804000 */ mtc1 $zero, $f8 ## $f8 = 0.00 /* 08DC4 80B72764 8E0D01C0 */ lw $t5, 0x01C0($s0) ## 000001C0 -/* 08DC8 80B72768 460A2180 */ add.s $f6, $f4, $f10 +/* 08DC8 80B72768 460A2180 */ add.s $f6, $f4, $f10 /* 08DCC 80B7276C 2409FFE7 */ addiu $t1, $zero, 0xFFE7 ## $t1 = FFFFFFE7 /* 08DD0 80B72770 27A600B8 */ addiu $a2, $sp, 0x00B8 ## $a2 = FFFFFF80 /* 08DD4 80B72774 E60001BC */ swc1 $f0, 0x01BC($s0) ## 000001BC @@ -1244,7 +1244,7 @@ glabel L80B7260C /* 08DE4 80B72784 ACCD0000 */ sw $t5, 0x0000($a2) ## FFFFFF80 /* 08DE8 80B72788 8E0B01C4 */ lw $t3, 0x01C4($s0) ## 000001C4 /* 08DEC 80B7278C 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 08DF0 80B72790 0221C821 */ addu $t9, $s1, $at +/* 08DF0 80B72790 0221C821 */ addu $t9, $s1, $at /* 08DF4 80B72794 ACCB0004 */ sw $t3, 0x0004($a2) ## FFFFFF84 /* 08DF8 80B72798 8E0D01C8 */ lw $t5, 0x01C8($s0) ## 000001C8 /* 08DFC 80B7279C 260400E4 */ addiu $a0, $s0, 0x00E4 ## $a0 = 000000E4 @@ -1257,201 +1257,201 @@ glabel L80B7260C /* 08E18 80B727B8 24090096 */ addiu $t1, $zero, 0x0096 ## $t1 = 00000096 /* 08E1C 80B727BC 3C074120 */ lui $a3, 0x4120 ## $a3 = 41200000 /* 08E20 80B727C0 85F80002 */ lh $t8, 0x0002($t7) ## 00000002 -/* 08E24 80B727C4 AFB90048 */ sw $t9, 0x0048($sp) -/* 08E28 80B727C8 AFA4004C */ sw $a0, 0x004C($sp) +/* 08E24 80B727C4 AFB90048 */ sw $t9, 0x0048($sp) +/* 08E28 80B727C8 AFA4004C */ sw $a0, 0x004C($sp) /* 08E2C 80B727CC 44982000 */ mtc1 $t8, $f4 ## $f4 = 0.00 /* 08E30 80B727D0 00000000 */ nop -/* 08E34 80B727D4 468022A0 */ cvt.s.w $f10, $f4 -/* 08E38 80B727D8 E7AA00BC */ swc1 $f10, 0x00BC($sp) +/* 08E34 80B727D4 468022A0 */ cvt.s.w $f10, $f4 +/* 08E38 80B727D8 E7AA00BC */ swc1 $f10, 0x00BC($sp) /* 08E3C 80B727DC 8F251E10 */ lw $a1, 0x1E10($t9) ## 00001E10 -/* 08E40 80B727E0 AFAB0018 */ sw $t3, 0x0018($sp) -/* 08E44 80B727E4 AFA90014 */ sw $t1, 0x0014($sp) -/* 08E48 80B727E8 0C2DA70B */ jal func_80B69C2C -/* 08E4C 80B727EC E7A60010 */ swc1 $f6, 0x0010($sp) -/* 08E50 80B727F0 8FAD0048 */ lw $t5, 0x0048($sp) +/* 08E40 80B727E0 AFAB0018 */ sw $t3, 0x0018($sp) +/* 08E44 80B727E4 AFA90014 */ sw $t1, 0x0014($sp) +/* 08E48 80B727E8 0C2DA70B */ jal func_80B69C2C +/* 08E4C 80B727EC E7A60010 */ swc1 $f6, 0x0010($sp) +/* 08E50 80B727F0 8FAD0048 */ lw $t5, 0x0048($sp) /* 08E54 80B727F4 3C0143C8 */ lui $at, 0x43C8 ## $at = 43C80000 /* 08E58 80B727F8 44814000 */ mtc1 $at, $f8 ## $f8 = 400.00 /* 08E5C 80B727FC 8DA51E10 */ lw $a1, 0x1E10($t5) ## 00001E10 /* 08E60 80B72800 240E0096 */ addiu $t6, $zero, 0x0096 ## $t6 = 00000096 /* 08E64 80B72804 240F005A */ addiu $t7, $zero, 0x005A ## $t7 = 0000005A -/* 08E68 80B72808 AFAF0018 */ sw $t7, 0x0018($sp) -/* 08E6C 80B7280C AFAE0014 */ sw $t6, 0x0014($sp) -/* 08E70 80B72810 8FA4004C */ lw $a0, 0x004C($sp) +/* 08E68 80B72808 AFAF0018 */ sw $t7, 0x0018($sp) +/* 08E6C 80B7280C AFAE0014 */ sw $t6, 0x0014($sp) +/* 08E70 80B72810 8FA4004C */ lw $a0, 0x004C($sp) /* 08E74 80B72814 27A600B8 */ addiu $a2, $sp, 0x00B8 ## $a2 = FFFFFF80 /* 08E78 80B72818 3C0741F0 */ lui $a3, 0x41F0 ## $a3 = 41F00000 -/* 08E7C 80B7281C 0C2DA70B */ jal func_80B69C2C -/* 08E80 80B72820 E7A80010 */ swc1 $f8, 0x0010($sp) +/* 08E7C 80B7281C 0C2DA70B */ jal func_80B69C2C +/* 08E80 80B72820 E7A80010 */ swc1 $f8, 0x0010($sp) /* 08E84 80B72824 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 08E88 80B72828 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 08E8C 80B7282C 24050836 */ addiu $a1, $zero, 0x0836 ## $a1 = 00000836 -/* 08E90 80B72830 10000A92 */ beq $zero, $zero, .L80B7527C +/* 08E90 80B72830 10000A92 */ beq $zero, $zero, .L80B7527C /* 08E94 80B72834 8604015C */ lh $a0, 0x015C($s0) ## 0000015C .L80B72838: -/* 08E98 80B72838 4406A000 */ mfc1 $a2, $f20 +/* 08E98 80B72838 4406A000 */ mfc1 $a2, $f20 .L80B7283C: /* 08E9C 80B7283C 260401B0 */ addiu $a0, $s0, 0x01B0 ## $a0 = 000001B0 /* 08EA0 80B72840 3C054500 */ lui $a1, 0x4500 ## $a1 = 45000000 /* 08EA4 80B72844 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 08EA8 80B72848 3C074300 */ lui $a3, 0x4300 ## $a3 = 43000000 /* 08EAC 80B7284C 8E180004 */ lw $t8, 0x0004($s0) ## 00000004 /* 08EB0 80B72850 2401FFFE */ addiu $at, $zero, 0xFFFE ## $at = FFFFFFFE -/* 08EB4 80B72854 03015024 */ and $t2, $t8, $at -/* 08EB8 80B72858 10000A87 */ beq $zero, $zero, .L80B75278 +/* 08EB4 80B72854 03015024 */ and $t2, $t8, $at +/* 08EB8 80B72858 10000A87 */ beq $zero, $zero, .L80B75278 /* 08EBC 80B7285C AE0A0004 */ sw $t2, 0x0004($s0) ## 00000004 glabel L80B72860 /* 08EC0 80B72860 3C01437A */ lui $at, 0x437A ## $at = 437A0000 /* 08EC4 80B72864 44815000 */ mtc1 $at, $f10 ## $f10 = 250.00 -/* 08EC8 80B72868 C7A60118 */ lwc1 $f6, 0x0118($sp) +/* 08EC8 80B72868 C7A60118 */ lwc1 $f6, 0x0118($sp) /* 08ECC 80B7286C C6040090 */ lwc1 $f4, 0x0090($s0) ## 00000090 -/* 08ED0 80B72870 46065202 */ mul.s $f8, $f10, $f6 -/* 08ED4 80B72874 4608203C */ c.lt.s $f4, $f8 +/* 08ED0 80B72870 46065202 */ mul.s $f8, $f10, $f6 +/* 08ED4 80B72874 4608203C */ c.lt.s $f4, $f8 /* 08ED8 80B72878 00000000 */ nop -/* 08EDC 80B7287C 45030004 */ bc1tl .L80B72890 +/* 08EDC 80B7287C 45030004 */ bc1tl .L80B72890 /* 08EE0 80B72880 3C01C2F0 */ lui $at, 0xC2F0 ## $at = C2F00000 /* 08EE4 80B72884 8619017C */ lh $t9, 0x017C($s0) ## 0000017C -/* 08EE8 80B72888 13200006 */ beq $t9, $zero, .L80B728A4 +/* 08EE8 80B72888 13200006 */ beq $t9, $zero, .L80B728A4 /* 08EEC 80B7288C 3C01C2F0 */ lui $at, 0xC2F0 ## $at = C2F00000 .L80B72890: /* 08EF0 80B72890 44815000 */ mtc1 $at, $f10 ## $f10 = -120.00 /* 08EF4 80B72894 240CFFFF */ addiu $t4, $zero, 0xFFFF ## $t4 = FFFFFFFF /* 08EF8 80B72898 A60C0158 */ sh $t4, 0x0158($s0) ## 00000158 -/* 08EFC 80B7289C 10000A76 */ beq $zero, $zero, .L80B75278 +/* 08EFC 80B7289C 10000A76 */ beq $zero, $zero, .L80B75278 /* 08F00 80B728A0 E60A01B8 */ swc1 $f10, 0x01B8($s0) ## 000001B8 .L80B728A4: /* 08F04 80B728A4 26040166 */ addiu $a0, $s0, 0x0166 ## $a0 = 00000166 /* 08F08 80B728A8 24051000 */ addiu $a1, $zero, 0x1000 ## $a1 = 00001000 /* 08F0C 80B728AC 24060014 */ addiu $a2, $zero, 0x0014 ## $a2 = 00000014 /* 08F10 80B728B0 0C01E1EF */ jal Math_SmoothScaleMaxS - + /* 08F14 80B728B4 2407006A */ addiu $a3, $zero, 0x006A ## $a3 = 0000006A /* 08F18 80B728B8 3C014220 */ lui $at, 0x4220 ## $at = 42200000 /* 08F1C 80B728BC 44813000 */ mtc1 $at, $f6 ## $f6 = 40.00 -/* 08F20 80B728C0 C7A40124 */ lwc1 $f4, 0x0124($sp) -/* 08F24 80B728C4 4604303C */ c.lt.s $f6, $f4 +/* 08F20 80B728C0 C7A40124 */ lwc1 $f4, 0x0124($sp) +/* 08F24 80B728C4 4604303C */ c.lt.s $f6, $f4 /* 08F28 80B728C8 00000000 */ nop -/* 08F2C 80B728CC 45000013 */ bc1f .L80B7291C +/* 08F2C 80B728CC 45000013 */ bc1f .L80B7291C /* 08F30 80B728D0 3C0180B8 */ lui $at, %hi(D_80B7B660) ## $at = 80B80000 -/* 08F34 80B728D4 C428B660 */ lwc1 $f8, %lo(D_80B7B660)($at) +/* 08F34 80B728D4 C428B660 */ lwc1 $f8, %lo(D_80B7B660)($at) /* 08F38 80B728D8 3C014496 */ lui $at, 0x4496 ## $at = 44960000 /* 08F3C 80B728DC 44815000 */ mtc1 $at, $f10 ## $f10 = 1200.00 -/* 08F40 80B728E0 4406A000 */ mfc1 $a2, $f20 +/* 08F40 80B728E0 4406A000 */ mfc1 $a2, $f20 /* 08F44 80B728E4 3C073C23 */ lui $a3, 0x3C23 ## $a3 = 3C230000 /* 08F48 80B728E8 34E7D70A */ ori $a3, $a3, 0xD70A ## $a3 = 3C23D70A /* 08F4C 80B728EC 26040068 */ addiu $a0, $s0, 0x0068 ## $a0 = 00000068 /* 08F50 80B728F0 3C053F00 */ lui $a1, 0x3F00 ## $a1 = 3F000000 /* 08F54 80B728F4 E6080190 */ swc1 $f8, 0x0190($s0) ## 00000190 /* 08F58 80B728F8 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 08F5C 80B728FC E60A0194 */ swc1 $f10, 0x0194($s0) ## 00000194 -/* 08F60 80B72900 4406A000 */ mfc1 $a2, $f20 +/* 08F60 80B72900 4406A000 */ mfc1 $a2, $f20 /* 08F64 80B72904 260401B0 */ addiu $a0, $s0, 0x01B0 ## $a0 = 000001B0 /* 08F68 80B72908 3C054500 */ lui $a1, 0x4500 ## $a1 = 45000000 /* 08F6C 80B7290C 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 08F70 80B72910 3C074300 */ lui $a3, 0x4300 ## $a3 = 43000000 -/* 08F74 80B72914 10000A59 */ beq $zero, $zero, .L80B7527C +/* 08F74 80B72914 10000A59 */ beq $zero, $zero, .L80B7527C /* 08F78 80B72918 8604015C */ lh $a0, 0x015C($s0) ## 0000015C .L80B7291C: /* 08F7C 80B7291C 2409FFFF */ addiu $t1, $zero, 0xFFFF ## $t1 = FFFFFFFF -/* 08F80 80B72920 10000A55 */ beq $zero, $zero, .L80B75278 +/* 08F80 80B72920 10000A55 */ beq $zero, $zero, .L80B75278 /* 08F84 80B72924 A6090158 */ sh $t1, 0x0158($s0) ## 00000158 glabel L80B72928 /* 08F88 80B72928 3C0D80B8 */ lui $t5, %hi(D_80B7E118) ## $t5 = 80B80000 -/* 08F8C 80B7292C 91ADE118 */ lbu $t5, %lo(D_80B7E118)($t5) +/* 08F8C 80B7292C 91ADE118 */ lbu $t5, %lo(D_80B7E118)($t5) /* 08F90 80B72930 860B001C */ lh $t3, 0x001C($s0) ## 0000001C -/* 08F94 80B72934 016D7021 */ addu $t6, $t3, $t5 +/* 08F94 80B72934 016D7021 */ addu $t6, $t3, $t5 /* 08F98 80B72938 31CF0001 */ andi $t7, $t6, 0x0001 ## $t7 = 00000000 -/* 08F9C 80B7293C 11E00004 */ beq $t7, $zero, .L80B72950 +/* 08F9C 80B7293C 11E00004 */ beq $t7, $zero, .L80B72950 /* 08FA0 80B72940 3C014120 */ lui $at, 0x4120 ## $at = 41200000 /* 08FA4 80B72944 44813000 */ mtc1 $at, $f6 ## $f6 = 10.00 -/* 08FA8 80B72948 10000005 */ beq $zero, $zero, .L80B72960 -/* 08FAC 80B7294C E7A6010C */ swc1 $f6, 0x010C($sp) +/* 08FA8 80B72948 10000005 */ beq $zero, $zero, .L80B72960 +/* 08FAC 80B7294C E7A6010C */ swc1 $f6, 0x010C($sp) .L80B72950: /* 08FB0 80B72950 3C01C120 */ lui $at, 0xC120 ## $at = C1200000 /* 08FB4 80B72954 44812000 */ mtc1 $at, $f4 ## $f4 = -10.00 /* 08FB8 80B72958 00000000 */ nop -/* 08FBC 80B7295C E7A4010C */ swc1 $f4, 0x010C($sp) +/* 08FBC 80B7295C E7A4010C */ swc1 $f4, 0x010C($sp) .L80B72960: /* 08FC0 80B72960 44804000 */ mtc1 $zero, $f8 ## $f8 = 0.00 /* 08FC4 80B72964 44805000 */ mtc1 $zero, $f10 ## $f10 = 0.00 /* 08FC8 80B72968 3C0180B8 */ lui $at, %hi(D_80B7E0DC) ## $at = 80B80000 -/* 08FCC 80B7296C C42CE0DC */ lwc1 $f12, %lo(D_80B7E0DC)($at) +/* 08FCC 80B7296C C42CE0DC */ lwc1 $f12, %lo(D_80B7E0DC)($at) /* 08FD0 80B72970 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 08FD4 80B72974 E7A80110 */ swc1 $f8, 0x0110($sp) -/* 08FD8 80B72978 0C034348 */ jal Matrix_RotateY -/* 08FDC 80B7297C E7AA0114 */ swc1 $f10, 0x0114($sp) +/* 08FD4 80B72974 E7A80110 */ swc1 $f8, 0x0110($sp) +/* 08FD8 80B72978 0C034348 */ jal Matrix_RotateY +/* 08FDC 80B7297C E7AA0114 */ swc1 $f10, 0x0114($sp) /* 08FE0 80B72980 27A4010C */ addiu $a0, $sp, 0x010C ## $a0 = FFFFFFD4 -/* 08FE4 80B72984 0C0346BD */ jal Matrix_MultVec3f +/* 08FE4 80B72984 0C0346BD */ jal Matrix_MultVec3f /* 08FE8 80B72988 27A50100 */ addiu $a1, $sp, 0x0100 ## $a1 = FFFFFFC8 /* 08FEC 80B7298C 3C0280B8 */ lui $v0, %hi(D_80B7E0B8) ## $v0 = 80B80000 /* 08FF0 80B72990 2442E0B8 */ addiu $v0, $v0, %lo(D_80B7E0B8) ## $v0 = 80B7E0B8 /* 08FF4 80B72994 C4460000 */ lwc1 $f6, 0x0000($v0) ## 80B7E0B8 -/* 08FF8 80B72998 C7A40100 */ lwc1 $f4, 0x0100($sp) +/* 08FF8 80B72998 C7A40100 */ lwc1 $f4, 0x0100($sp) /* 08FFC 80B7299C 3C1880B8 */ lui $t8, %hi(D_80B7E0B6) ## $t8 = 80B80000 /* 09000 80B729A0 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 09004 80B729A4 46043200 */ add.s $f8, $f6, $f4 +/* 09004 80B729A4 46043200 */ add.s $f8, $f6, $f4 /* 09008 80B729A8 E60801B4 */ swc1 $f8, 0x01B4($s0) ## 000001B4 -/* 0900C 80B729AC C7A60108 */ lwc1 $f6, 0x0108($sp) +/* 0900C 80B729AC C7A60108 */ lwc1 $f6, 0x0108($sp) /* 09010 80B729B0 C44A0008 */ lwc1 $f10, 0x0008($v0) ## 80B7E0C0 -/* 09014 80B729B4 46065100 */ add.s $f4, $f10, $f6 +/* 09014 80B729B4 46065100 */ add.s $f4, $f10, $f6 /* 09018 80B729B8 E60401BC */ swc1 $f4, 0x01BC($s0) ## 000001BC -/* 0901C 80B729BC 9318E0B6 */ lbu $t8, %lo(D_80B7E0B6)($t8) -/* 09020 80B729C0 57010005 */ bnel $t8, $at, .L80B729D8 +/* 0901C 80B729BC 9318E0B6 */ lbu $t8, %lo(D_80B7E0B6)($t8) +/* 09020 80B729C0 57010005 */ bnel $t8, $at, .L80B729D8 /* 09024 80B729C4 920A0150 */ lbu $t2, 0x0150($s0) ## 00000150 /* 09028 80B729C8 C4480004 */ lwc1 $f8, 0x0004($v0) ## 80B7E0BC -/* 0902C 80B729CC 1000000E */ beq $zero, $zero, .L80B72A08 +/* 0902C 80B729CC 1000000E */ beq $zero, $zero, .L80B72A08 /* 09030 80B729D0 E60801B8 */ swc1 $f8, 0x01B8($s0) ## 000001B8 /* 09034 80B729D4 920A0150 */ lbu $t2, 0x0150($s0) ## 00000150 .L80B729D8: -/* 09038 80B729D8 15400006 */ bne $t2, $zero, .L80B729F4 +/* 09038 80B729D8 15400006 */ bne $t2, $zero, .L80B729F4 /* 0903C 80B729DC 3C014170 */ lui $at, 0x4170 ## $at = 41700000 /* 09040 80B729E0 44813000 */ mtc1 $at, $f6 ## $f6 = 15.00 /* 09044 80B729E4 C44A0004 */ lwc1 $f10, 0x0004($v0) ## 80B7E0BC -/* 09048 80B729E8 46065101 */ sub.s $f4, $f10, $f6 -/* 0904C 80B729EC 10000006 */ beq $zero, $zero, .L80B72A08 +/* 09048 80B729E8 46065101 */ sub.s $f4, $f10, $f6 +/* 0904C 80B729EC 10000006 */ beq $zero, $zero, .L80B72A08 /* 09050 80B729F0 E60401B8 */ swc1 $f4, 0x01B8($s0) ## 000001B8 .L80B729F4: /* 09054 80B729F4 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 /* 09058 80B729F8 44815000 */ mtc1 $at, $f10 ## $f10 = 5.00 /* 0905C 80B729FC C4480004 */ lwc1 $f8, 0x0004($v0) ## 80B7E0BC -/* 09060 80B72A00 460A4181 */ sub.s $f6, $f8, $f10 +/* 09060 80B72A00 460A4181 */ sub.s $f6, $f8, $f10 /* 09064 80B72A04 E60601B8 */ swc1 $f6, 0x01B8($s0) ## 000001B8 .L80B72A08: /* 09068 80B72A08 C6000080 */ lwc1 $f0, 0x0080($s0) ## 00000080 /* 0906C 80B72A0C C60401B8 */ lwc1 $f4, 0x01B8($s0) ## 000001B8 -/* 09070 80B72A10 4600203E */ c.le.s $f4, $f0 +/* 09070 80B72A10 4600203E */ c.le.s $f4, $f0 /* 09074 80B72A14 00000000 */ nop -/* 09078 80B72A18 45000005 */ bc1f .L80B72A30 +/* 09078 80B72A18 45000005 */ bc1f .L80B72A30 /* 0907C 80B72A1C 3C014040 */ lui $at, 0x4040 ## $at = 40400000 /* 09080 80B72A20 44814000 */ mtc1 $at, $f8 ## $f8 = 3.00 /* 09084 80B72A24 00000000 */ nop -/* 09088 80B72A28 46080280 */ add.s $f10, $f0, $f8 +/* 09088 80B72A28 46080280 */ add.s $f10, $f0, $f8 /* 0908C 80B72A2C E60A01B8 */ swc1 $f10, 0x01B8($s0) ## 000001B8 .L80B72A30: /* 09090 80B72A30 3C1980B8 */ lui $t9, %hi(D_80B7E0B6) ## $t9 = 80B80000 -/* 09094 80B72A34 9339E0B6 */ lbu $t9, %lo(D_80B7E0B6)($t9) +/* 09094 80B72A34 9339E0B6 */ lbu $t9, %lo(D_80B7E0B6)($t9) /* 09098 80B72A38 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 0909C 80B72A3C 13210012 */ beq $t9, $at, .L80B72A88 +/* 0909C 80B72A3C 13210012 */ beq $t9, $at, .L80B72A88 /* 090A0 80B72A40 00000000 */ nop /* 090A4 80B72A44 C60201B8 */ lwc1 $f2, 0x01B8($s0) ## 000001B8 /* 090A8 80B72A48 C6000028 */ lwc1 $f0, 0x0028($s0) ## 00000028 -/* 090AC 80B72A4C 4600103C */ c.lt.s $f2, $f0 +/* 090AC 80B72A4C 4600103C */ c.lt.s $f2, $f0 /* 090B0 80B72A50 00000000 */ nop -/* 090B4 80B72A54 4500000C */ bc1f .L80B72A88 +/* 090B4 80B72A54 4500000C */ bc1f .L80B72A88 /* 090B8 80B72A58 00000000 */ nop -/* 090BC 80B72A5C 46020181 */ sub.s $f6, $f0, $f2 +/* 090BC 80B72A5C 46020181 */ sub.s $f6, $f0, $f2 /* 090C0 80B72A60 3C0180B8 */ lui $at, %hi(D_80B7B664) ## $at = 80B80000 -/* 090C4 80B72A64 C424B664 */ lwc1 $f4, %lo(D_80B7B664)($at) -/* 090C8 80B72A68 44051000 */ mfc1 $a1, $f2 +/* 090C4 80B72A64 C424B664 */ lwc1 $f4, %lo(D_80B7B664)($at) +/* 090C8 80B72A68 44051000 */ mfc1 $a1, $f2 /* 090CC 80B72A6C 3C063DCC */ lui $a2, 0x3DCC ## $a2 = 3DCC0000 -/* 090D0 80B72A70 46043202 */ mul.s $f8, $f6, $f4 +/* 090D0 80B72A70 46043202 */ mul.s $f8, $f6, $f4 /* 090D4 80B72A74 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3DCCCCCD /* 090D8 80B72A78 26040028 */ addiu $a0, $s0, 0x0028 ## $a0 = 00000028 -/* 090DC 80B72A7C 44074000 */ mfc1 $a3, $f8 +/* 090DC 80B72A7C 44074000 */ mfc1 $a3, $f8 /* 090E0 80B72A80 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 090E4 80B72A84 00000000 */ nop .L80B72A88: /* 090E8 80B72A88 3C0C8016 */ lui $t4, 0x8016 ## $t4 = 80160000 @@ -1459,366 +1459,366 @@ glabel L80B72928 /* 090F0 80B72A90 3C0143C0 */ lui $at, 0x43C0 ## $at = 43C00000 /* 090F4 80B72A94 44812000 */ mtc1 $at, $f4 ## $f4 = 384.00 /* 090F8 80B72A98 858909F4 */ lh $t1, 0x09F4($t4) ## 801609F4 -/* 090FC 80B72A9C 4406A000 */ mfc1 $a2, $f20 +/* 090FC 80B72A9C 4406A000 */ mfc1 $a2, $f20 /* 09100 80B72AA0 260401B0 */ addiu $a0, $s0, 0x01B0 ## $a0 = 000001B0 -/* 09104 80B72AA4 000959C0 */ sll $t3, $t1, 7 +/* 09104 80B72AA4 000959C0 */ sll $t3, $t1, 7 /* 09108 80B72AA8 448B5000 */ mtc1 $t3, $f10 ## $f10 = 0.00 /* 0910C 80B72AAC 3C054600 */ lui $a1, 0x4600 ## $a1 = 46000000 -/* 09110 80B72AB0 468051A0 */ cvt.s.w $f6, $f10 -/* 09114 80B72AB4 46043200 */ add.s $f8, $f6, $f4 -/* 09118 80B72AB8 44074000 */ mfc1 $a3, $f8 +/* 09110 80B72AB0 468051A0 */ cvt.s.w $f6, $f10 +/* 09114 80B72AB4 46043200 */ add.s $f8, $f6, $f4 +/* 09118 80B72AB8 44074000 */ mfc1 $a3, $f8 /* 0911C 80B72ABC 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 09120 80B72AC0 00000000 */ nop /* 09124 80B72AC4 262D0014 */ addiu $t5, $s1, 0x0014 ## $t5 = 00000014 -/* 09128 80B72AC8 AFAD004C */ sw $t5, 0x004C($sp) +/* 09128 80B72AC8 AFAD004C */ sw $t5, 0x004C($sp) /* 0912C 80B72ACC 95AF000C */ lhu $t7, 0x000C($t5) ## 00000020 /* 09130 80B72AD0 3C01FFFF */ lui $at, 0xFFFF ## $at = FFFF0000 /* 09134 80B72AD4 34217FFF */ ori $at, $at, 0x7FFF ## $at = FFFF7FFF -/* 09138 80B72AD8 01E1C027 */ nor $t8, $t7, $at -/* 0913C 80B72ADC 17000005 */ bne $t8, $zero, .L80B72AF4 +/* 09138 80B72AD8 01E1C027 */ nor $t8, $t7, $at +/* 0913C 80B72ADC 17000005 */ bne $t8, $zero, .L80B72AF4 /* 09140 80B72AE0 3C0180B8 */ lui $at, %hi(D_80B7B668) ## $at = 80B80000 -/* 09144 80B72AE4 C426B668 */ lwc1 $f6, %lo(D_80B7B668)($at) +/* 09144 80B72AE4 C426B668 */ lwc1 $f6, %lo(D_80B7B668)($at) /* 09148 80B72AE8 C60A01A8 */ lwc1 $f10, 0x01A8($s0) ## 000001A8 -/* 0914C 80B72AEC 46065100 */ add.s $f4, $f10, $f6 +/* 0914C 80B72AEC 46065100 */ add.s $f4, $f10, $f6 /* 09150 80B72AF0 E60401A8 */ swc1 $f4, 0x01A8($s0) ## 000001A8 .L80B72AF4: /* 09154 80B72AF4 3C0380B8 */ lui $v1, %hi(D_80B7E120) ## $v1 = 80B80000 /* 09158 80B72AF8 2463E120 */ addiu $v1, $v1, %lo(D_80B7E120) ## $v1 = 80B7E120 /* 0915C 80B72AFC 90620000 */ lbu $v0, 0x0000($v1) ## 80B7E120 -/* 09160 80B72B00 1040000E */ beq $v0, $zero, .L80B72B3C +/* 09160 80B72B00 1040000E */ beq $v0, $zero, .L80B72B3C /* 09164 80B72B04 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 09168 80B72B08 14410006 */ bne $v0, $at, .L80B72B24 +/* 09168 80B72B08 14410006 */ bne $v0, $at, .L80B72B24 /* 0916C 80B72B0C 3C0180B8 */ lui $at, %hi(D_80B7B66C) ## $at = 80B80000 -/* 09170 80B72B10 C42AB66C */ lwc1 $f10, %lo(D_80B7B66C)($at) +/* 09170 80B72B10 C42AB66C */ lwc1 $f10, %lo(D_80B7B66C)($at) /* 09174 80B72B14 C60801A8 */ lwc1 $f8, 0x01A8($s0) ## 000001A8 -/* 09178 80B72B18 460A4180 */ add.s $f6, $f8, $f10 -/* 0917C 80B72B1C 10000006 */ beq $zero, $zero, .L80B72B38 +/* 09178 80B72B18 460A4180 */ add.s $f6, $f8, $f10 +/* 0917C 80B72B1C 10000006 */ beq $zero, $zero, .L80B72B38 /* 09180 80B72B20 E60601A8 */ swc1 $f6, 0x01A8($s0) ## 000001A8 .L80B72B24: /* 09184 80B72B24 3C0180B8 */ lui $at, %hi(D_80B7B670) ## $at = 80B80000 -/* 09188 80B72B28 C428B670 */ lwc1 $f8, %lo(D_80B7B670)($at) +/* 09188 80B72B28 C428B670 */ lwc1 $f8, %lo(D_80B7B670)($at) /* 0918C 80B72B2C C60401A8 */ lwc1 $f4, 0x01A8($s0) ## 000001A8 -/* 09190 80B72B30 46082280 */ add.s $f10, $f4, $f8 +/* 09190 80B72B30 46082280 */ add.s $f10, $f4, $f8 /* 09194 80B72B34 E60A01A8 */ swc1 $f10, 0x01A8($s0) ## 000001A8 .L80B72B38: /* 09198 80B72B38 A0600000 */ sb $zero, 0x0000($v1) ## 80B7E120 .L80B72B3C: -/* 0919C 80B72B3C 8FAA004C */ lw $t2, 0x004C($sp) +/* 0919C 80B72B3C 8FAA004C */ lw $t2, 0x004C($sp) /* 091A0 80B72B40 2401BFFF */ addiu $at, $zero, 0xBFFF ## $at = FFFFBFFF /* 091A4 80B72B44 9559000C */ lhu $t9, 0x000C($t2) ## 0000000C -/* 091A8 80B72B48 03216027 */ nor $t4, $t9, $at -/* 091AC 80B72B4C 15800005 */ bne $t4, $zero, .L80B72B64 +/* 091A8 80B72B48 03216027 */ nor $t4, $t9, $at +/* 091AC 80B72B4C 15800005 */ bne $t4, $zero, .L80B72B64 /* 091B0 80B72B50 3C0180B8 */ lui $at, %hi(D_80B7B674) ## $at = 80B80000 -/* 091B4 80B72B54 C424B674 */ lwc1 $f4, %lo(D_80B7B674)($at) +/* 091B4 80B72B54 C424B674 */ lwc1 $f4, %lo(D_80B7B674)($at) /* 091B8 80B72B58 C60601A8 */ lwc1 $f6, 0x01A8($s0) ## 000001A8 -/* 091BC 80B72B5C 46043200 */ add.s $f8, $f6, $f4 +/* 091BC 80B72B5C 46043200 */ add.s $f8, $f6, $f4 /* 091C0 80B72B60 E60801A8 */ swc1 $f8, 0x01A8($s0) ## 000001A8 .L80B72B64: /* 091C4 80B72B64 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 /* 091C8 80B72B68 44812000 */ mtc1 $at, $f4 ## $f4 = 0.50 /* 091CC 80B72B6C C60601AC */ lwc1 $f6, 0x01AC($s0) ## 000001AC /* 091D0 80B72B70 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 -/* 091D4 80B72B74 C7AA0124 */ lwc1 $f10, 0x0124($sp) -/* 091D8 80B72B78 46043202 */ mul.s $f8, $f6, $f4 +/* 091D4 80B72B74 C7AA0124 */ lwc1 $f10, 0x0124($sp) +/* 091D8 80B72B78 46043202 */ mul.s $f8, $f6, $f4 /* 091DC 80B72B7C 44813000 */ mtc1 $at, $f6 ## $f6 = 20.00 /* 091E0 80B72B80 00000000 */ nop -/* 091E4 80B72B84 46064100 */ add.s $f4, $f8, $f6 -/* 091E8 80B72B88 4604503C */ c.lt.s $f10, $f4 +/* 091E4 80B72B84 46064100 */ add.s $f4, $f8, $f6 +/* 091E8 80B72B88 4604503C */ c.lt.s $f10, $f4 /* 091EC 80B72B8C 00000000 */ nop -/* 091F0 80B72B90 4502001A */ bc1fl .L80B72BFC +/* 091F0 80B72B90 4502001A */ bc1fl .L80B72BFC /* 091F4 80B72B94 8619015E */ lh $t9, 0x015E($s0) ## 0000015E /* 091F8 80B72B98 8609015E */ lh $t1, 0x015E($s0) ## 0000015E -/* 091FC 80B72B9C 1520000C */ bne $t1, $zero, .L80B72BD0 +/* 091FC 80B72B9C 1520000C */ bne $t1, $zero, .L80B72BD0 /* 09200 80B72BA0 3C0143FA */ lui $at, 0x43FA ## $at = 43FA0000 /* 09204 80B72BA4 44814000 */ mtc1 $at, $f8 ## $f8 = 500.00 /* 09208 80B72BA8 3C014120 */ lui $at, 0x4120 ## $at = 41200000 /* 0920C 80B72BAC 44816000 */ mtc1 $at, $f12 ## $f12 = 10.00 /* 09210 80B72BB0 E6140190 */ swc1 $f20, 0x0190($s0) ## 00000190 /* 09214 80B72BB4 0C00CFBE */ jal Math_Rand_ZeroFloat - + /* 09218 80B72BB8 E6080194 */ swc1 $f8, 0x0194($s0) ## 00000194 -/* 0921C 80B72BBC 4600018D */ trunc.w.s $f6, $f0 -/* 09220 80B72BC0 440F3000 */ mfc1 $t7, $f6 +/* 0921C 80B72BBC 4600018D */ trunc.w.s $f6, $f0 +/* 09220 80B72BC0 440F3000 */ mfc1 $t7, $f6 /* 09224 80B72BC4 00000000 */ nop /* 09228 80B72BC8 25F80002 */ addiu $t8, $t7, 0x0002 ## $t8 = 00000002 /* 0922C 80B72BCC A618017A */ sh $t8, 0x017A($s0) ## 0000017A .L80B72BD0: /* 09230 80B72BD0 3C05BE4C */ lui $a1, 0xBE4C ## $a1 = BE4C0000 -/* 09234 80B72BD4 4406A000 */ mfc1 $a2, $f20 +/* 09234 80B72BD4 4406A000 */ mfc1 $a2, $f20 /* 09238 80B72BD8 3C073DCC */ lui $a3, 0x3DCC ## $a3 = 3DCC0000 /* 0923C 80B72BDC 34E7CCCD */ ori $a3, $a3, 0xCCCD ## $a3 = 3DCCCCCD /* 09240 80B72BE0 34A5CCCD */ ori $a1, $a1, 0xCCCD ## $a1 = BE4CCCCD /* 09244 80B72BE4 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 09248 80B72BE8 26040068 */ addiu $a0, $s0, 0x0068 ## $a0 = 00000068 /* 0924C 80B72BEC 240A0001 */ addiu $t2, $zero, 0x0001 ## $t2 = 00000001 -/* 09250 80B72BF0 10000011 */ beq $zero, $zero, .L80B72C38 +/* 09250 80B72BF0 10000011 */ beq $zero, $zero, .L80B72C38 /* 09254 80B72BF4 A60A015E */ sh $t2, 0x015E($s0) ## 0000015E /* 09258 80B72BF8 8619015E */ lh $t9, 0x015E($s0) ## 0000015E .L80B72BFC: -/* 0925C 80B72BFC 53200008 */ beql $t9, $zero, .L80B72C20 -/* 09260 80B72C00 4406A000 */ mfc1 $a2, $f20 +/* 0925C 80B72BFC 53200008 */ beql $t9, $zero, .L80B72C20 +/* 09260 80B72C00 4406A000 */ mfc1 $a2, $f20 /* 09264 80B72C04 44805000 */ mtc1 $zero, $f10 ## $f10 = 0.00 /* 09268 80B72C08 E6140190 */ swc1 $f20, 0x0190($s0) ## 00000190 /* 0926C 80B72C0C 3C0180B8 */ lui $at, %hi(D_80B7B678) ## $at = 80B80000 /* 09270 80B72C10 E60A01B0 */ swc1 $f10, 0x01B0($s0) ## 000001B0 -/* 09274 80B72C14 C424B678 */ lwc1 $f4, %lo(D_80B7B678)($at) +/* 09274 80B72C14 C424B678 */ lwc1 $f4, %lo(D_80B7B678)($at) /* 09278 80B72C18 E6040194 */ swc1 $f4, 0x0194($s0) ## 00000194 -/* 0927C 80B72C1C 4406A000 */ mfc1 $a2, $f20 +/* 0927C 80B72C1C 4406A000 */ mfc1 $a2, $f20 .L80B72C20: /* 09280 80B72C20 3C073E19 */ lui $a3, 0x3E19 ## $a3 = 3E190000 /* 09284 80B72C24 34E7999A */ ori $a3, $a3, 0x999A ## $a3 = 3E19999A /* 09288 80B72C28 26040068 */ addiu $a0, $s0, 0x0068 ## $a0 = 00000068 /* 0928C 80B72C2C 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 09290 80B72C30 3C054040 */ lui $a1, 0x4040 ## $a1 = 40400000 /* 09294 80B72C34 A600015E */ sh $zero, 0x015E($s0) ## 0000015E .L80B72C38: /* 09298 80B72C38 3C014270 */ lui $at, 0x4270 ## $at = 42700000 /* 0929C 80B72C3C 44814000 */ mtc1 $at, $f8 ## $f8 = 60.00 /* 092A0 80B72C40 C60001AC */ lwc1 $f0, 0x01AC($s0) ## 000001AC -/* 092A4 80B72C44 4600403E */ c.le.s $f8, $f0 +/* 092A4 80B72C44 4600403E */ c.le.s $f8, $f0 /* 092A8 80B72C48 00000000 */ nop -/* 092AC 80B72C4C 45000003 */ bc1f .L80B72C5C +/* 092AC 80B72C4C 45000003 */ bc1f .L80B72C5C /* 092B0 80B72C50 3C0180B8 */ lui $at, %hi(D_80B7B67C) ## $at = 80B80000 -/* 092B4 80B72C54 1000000B */ beq $zero, $zero, .L80B72C84 -/* 092B8 80B72C58 C422B67C */ lwc1 $f2, %lo(D_80B7B67C)($at) +/* 092B4 80B72C54 1000000B */ beq $zero, $zero, .L80B72C84 +/* 092B8 80B72C58 C422B67C */ lwc1 $f2, %lo(D_80B7B67C)($at) .L80B72C5C: /* 092BC 80B72C5C 3C014234 */ lui $at, 0x4234 ## $at = 42340000 /* 092C0 80B72C60 44813000 */ mtc1 $at, $f6 ## $f6 = 45.00 /* 092C4 80B72C64 00000000 */ nop -/* 092C8 80B72C68 4600303E */ c.le.s $f6, $f0 +/* 092C8 80B72C68 4600303E */ c.le.s $f6, $f0 /* 092CC 80B72C6C 00000000 */ nop -/* 092D0 80B72C70 45000003 */ bc1f .L80B72C80 +/* 092D0 80B72C70 45000003 */ bc1f .L80B72C80 /* 092D4 80B72C74 3C0180B8 */ lui $at, %hi(D_80B7B680) ## $at = 80B80000 -/* 092D8 80B72C78 10000002 */ beq $zero, $zero, .L80B72C84 -/* 092DC 80B72C7C C422B680 */ lwc1 $f2, %lo(D_80B7B680)($at) +/* 092D8 80B72C78 10000002 */ beq $zero, $zero, .L80B72C84 +/* 092DC 80B72C7C C422B680 */ lwc1 $f2, %lo(D_80B7B680)($at) .L80B72C80: -/* 092E0 80B72C80 4600A086 */ mov.s $f2, $f20 +/* 092E0 80B72C80 4600A086 */ mov.s $f2, $f20 .L80B72C84: /* 092E4 80B72C84 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 /* 092E8 80B72C88 9442E66C */ lhu $v0, -0x1994($v0) ## 8015E66C /* 092EC 80B72C8C 3401B555 */ ori $at, $zero, 0xB555 ## $at = 0000B555 -/* 092F0 80B72C90 0041082A */ slt $at, $v0, $at -/* 092F4 80B72C94 14200009 */ bne $at, $zero, .L80B72CBC +/* 092F0 80B72C90 0041082A */ slt $at, $v0, $at +/* 092F4 80B72C94 14200009 */ bne $at, $zero, .L80B72CBC /* 092F8 80B72C98 3401CAAB */ ori $at, $zero, 0xCAAB ## $at = 0000CAAB -/* 092FC 80B72C9C 0041082A */ slt $at, $v0, $at -/* 09300 80B72CA0 10200006 */ beq $at, $zero, .L80B72CBC +/* 092FC 80B72C9C 0041082A */ slt $at, $v0, $at +/* 09300 80B72CA0 10200006 */ beq $at, $zero, .L80B72CBC /* 09304 80B72CA4 3C013FE0 */ lui $at, 0x3FE0 ## $at = 3FE00000 /* 09308 80B72CA8 44815000 */ mtc1 $at, $f10 ## $f10 = 1.75 /* 0930C 80B72CAC 00000000 */ nop -/* 09310 80B72CB0 460A1082 */ mul.s $f2, $f2, $f10 -/* 09314 80B72CB4 1000003C */ beq $zero, $zero, .L80B72DA8 +/* 09310 80B72CB0 460A1082 */ mul.s $f2, $f2, $f10 +/* 09314 80B72CB4 1000003C */ beq $zero, $zero, .L80B72DA8 /* 09318 80B72CB8 00000000 */ nop .L80B72CBC: -/* 0931C 80B72CBC 28413555 */ slti $at, $v0, 0x3555 -/* 09320 80B72CC0 14200008 */ bne $at, $zero, .L80B72CE4 -/* 09324 80B72CC4 28414AAB */ slti $at, $v0, 0x4AAB -/* 09328 80B72CC8 10200006 */ beq $at, $zero, .L80B72CE4 +/* 0931C 80B72CBC 28413555 */ slti $at, $v0, 0x3555 +/* 09320 80B72CC0 14200008 */ bne $at, $zero, .L80B72CE4 +/* 09324 80B72CC4 28414AAB */ slti $at, $v0, 0x4AAB +/* 09328 80B72CC8 10200006 */ beq $at, $zero, .L80B72CE4 /* 0932C 80B72CCC 3C013FC0 */ lui $at, 0x3FC0 ## $at = 3FC00000 /* 09330 80B72CD0 44812000 */ mtc1 $at, $f4 ## $f4 = 1.50 /* 09334 80B72CD4 00000000 */ nop -/* 09338 80B72CD8 46041082 */ mul.s $f2, $f2, $f4 -/* 0933C 80B72CDC 10000032 */ beq $zero, $zero, .L80B72DA8 +/* 09338 80B72CD8 46041082 */ mul.s $f2, $f2, $f4 +/* 0933C 80B72CDC 10000032 */ beq $zero, $zero, .L80B72DA8 /* 09340 80B72CE0 00000000 */ nop .L80B72CE4: /* 09344 80B72CE4 3C0C80B8 */ lui $t4, %hi(D_80B7E076) ## $t4 = 80B80000 -/* 09348 80B72CE8 918CE076 */ lbu $t4, %lo(D_80B7E076)($t4) -/* 0934C 80B72CEC 11800006 */ beq $t4, $zero, .L80B72D08 +/* 09348 80B72CE8 918CE076 */ lbu $t4, %lo(D_80B7E076)($t4) +/* 0934C 80B72CEC 11800006 */ beq $t4, $zero, .L80B72D08 /* 09350 80B72CF0 3C013FC0 */ lui $at, 0x3FC0 ## $at = 3FC00000 /* 09354 80B72CF4 44814000 */ mtc1 $at, $f8 ## $f8 = 1.50 /* 09358 80B72CF8 00000000 */ nop -/* 0935C 80B72CFC 46081082 */ mul.s $f2, $f2, $f8 -/* 09360 80B72D00 10000029 */ beq $zero, $zero, .L80B72DA8 +/* 0935C 80B72CFC 46081082 */ mul.s $f2, $f2, $f8 +/* 09360 80B72D00 10000029 */ beq $zero, $zero, .L80B72DA8 /* 09364 80B72D04 00000000 */ nop .L80B72D08: /* 09368 80B72D08 3C0180B8 */ lui $at, %hi(D_80B7A650) ## $at = 80B80000 /* 0936C 80B72D0C 4449F800 */ cfc1 $t1, $31 /* 09370 80B72D10 240B0001 */ addiu $t3, $zero, 0x0001 ## $t3 = 00000001 /* 09374 80B72D14 44CBF800 */ ctc1 $t3, $31 -/* 09378 80B72D18 C426A650 */ lwc1 $f6, %lo(D_80B7A650)($at) -/* 0937C 80B72D1C 460032A4 */ cvt.w.s $f10, $f6 +/* 09378 80B72D18 C426A650 */ lwc1 $f6, %lo(D_80B7A650)($at) +/* 0937C 80B72D1C 460032A4 */ cvt.w.s $f10, $f6 /* 09380 80B72D20 444BF800 */ cfc1 $t3, $31 /* 09384 80B72D24 00000000 */ nop /* 09388 80B72D28 316B0078 */ andi $t3, $t3, 0x0078 ## $t3 = 00000000 -/* 0938C 80B72D2C 11600012 */ beq $t3, $zero, .L80B72D78 +/* 0938C 80B72D2C 11600012 */ beq $t3, $zero, .L80B72D78 /* 09390 80B72D30 3C014F00 */ lui $at, 0x4F00 ## $at = 4F000000 /* 09394 80B72D34 44815000 */ mtc1 $at, $f10 ## $f10 = 2147483648.00 /* 09398 80B72D38 240B0001 */ addiu $t3, $zero, 0x0001 ## $t3 = 00000001 -/* 0939C 80B72D3C 460A3281 */ sub.s $f10, $f6, $f10 +/* 0939C 80B72D3C 460A3281 */ sub.s $f10, $f6, $f10 /* 093A0 80B72D40 44CBF800 */ ctc1 $t3, $31 /* 093A4 80B72D44 00000000 */ nop -/* 093A8 80B72D48 460052A4 */ cvt.w.s $f10, $f10 +/* 093A8 80B72D48 460052A4 */ cvt.w.s $f10, $f10 /* 093AC 80B72D4C 444BF800 */ cfc1 $t3, $31 /* 093B0 80B72D50 00000000 */ nop /* 093B4 80B72D54 316B0078 */ andi $t3, $t3, 0x0078 ## $t3 = 00000000 -/* 093B8 80B72D58 15600005 */ bne $t3, $zero, .L80B72D70 +/* 093B8 80B72D58 15600005 */ bne $t3, $zero, .L80B72D70 /* 093BC 80B72D5C 00000000 */ nop -/* 093C0 80B72D60 440B5000 */ mfc1 $t3, $f10 +/* 093C0 80B72D60 440B5000 */ mfc1 $t3, $f10 /* 093C4 80B72D64 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 093C8 80B72D68 10000007 */ beq $zero, $zero, .L80B72D88 +/* 093C8 80B72D68 10000007 */ beq $zero, $zero, .L80B72D88 /* 093CC 80B72D6C 01615825 */ or $t3, $t3, $at ## $t3 = 80000000 .L80B72D70: -/* 093D0 80B72D70 10000005 */ beq $zero, $zero, .L80B72D88 +/* 093D0 80B72D70 10000005 */ beq $zero, $zero, .L80B72D88 /* 093D4 80B72D74 240BFFFF */ addiu $t3, $zero, 0xFFFF ## $t3 = FFFFFFFF .L80B72D78: -/* 093D8 80B72D78 440B5000 */ mfc1 $t3, $f10 +/* 093D8 80B72D78 440B5000 */ mfc1 $t3, $f10 /* 093DC 80B72D7C 00000000 */ nop -/* 093E0 80B72D80 0560FFFB */ bltz $t3, .L80B72D70 +/* 093E0 80B72D80 0560FFFB */ bltz $t3, .L80B72D70 /* 093E4 80B72D84 00000000 */ nop .L80B72D88: /* 093E8 80B72D88 44C9F800 */ ctc1 $t1, $31 /* 093EC 80B72D8C 316D00FF */ andi $t5, $t3, 0x00FF ## $t5 = 000000FF -/* 093F0 80B72D90 11A00005 */ beq $t5, $zero, .L80B72DA8 +/* 093F0 80B72D90 11A00005 */ beq $t5, $zero, .L80B72DA8 /* 093F4 80B72D94 3C014040 */ lui $at, 0x4040 ## $at = 40400000 /* 093F8 80B72D98 44812000 */ mtc1 $at, $f4 ## $f4 = 3.00 /* 093FC 80B72D9C 00000000 */ nop -/* 09400 80B72DA0 46041082 */ mul.s $f2, $f2, $f4 +/* 09400 80B72DA0 46041082 */ mul.s $f2, $f2, $f4 /* 09404 80B72DA4 00000000 */ nop .L80B72DA8: /* 09408 80B72DA8 3C0180B8 */ lui $at, %hi(D_80B7B684) ## $at = 80B80000 -/* 0940C 80B72DAC C428B684 */ lwc1 $f8, %lo(D_80B7B684)($at) +/* 0940C 80B72DAC C428B684 */ lwc1 $f8, %lo(D_80B7B684)($at) /* 09410 80B72DB0 3C0E80B8 */ lui $t6, %hi(D_80B7E0B6) ## $t6 = 80B80000 -/* 09414 80B72DB4 91CEE0B6 */ lbu $t6, %lo(D_80B7E0B6)($t6) -/* 09418 80B72DB8 46024002 */ mul.s $f0, $f8, $f2 +/* 09414 80B72DB4 91CEE0B6 */ lbu $t6, %lo(D_80B7E0B6)($t6) +/* 09418 80B72DB8 46024002 */ mul.s $f0, $f8, $f2 /* 0941C 80B72DBC 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 09420 80B72DC0 15C10006 */ bne $t6, $at, .L80B72DDC -/* 09424 80B72DC4 46000306 */ mov.s $f12, $f0 +/* 09420 80B72DC0 15C10006 */ bne $t6, $at, .L80B72DDC +/* 09424 80B72DC4 46000306 */ mov.s $f12, $f0 /* 09428 80B72DC8 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 /* 0942C 80B72DCC 44813000 */ mtc1 $at, $f6 ## $f6 = 5.00 /* 09430 80B72DD0 00000000 */ nop -/* 09434 80B72DD4 46060302 */ mul.s $f12, $f0, $f6 +/* 09434 80B72DD4 46060302 */ mul.s $f12, $f0, $f6 /* 09438 80B72DD8 00000000 */ nop .L80B72DDC: /* 0943C 80B72DDC 860F017A */ lh $t7, 0x017A($s0) ## 0000017A /* 09440 80B72DE0 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 09444 80B72DE4 11E1000A */ beq $t7, $at, .L80B72E10 +/* 09444 80B72DE4 11E1000A */ beq $t7, $at, .L80B72E10 /* 09448 80B72DE8 00000000 */ nop -/* 0944C 80B72DEC E7A20120 */ swc1 $f2, 0x0120($sp) +/* 0944C 80B72DEC E7A20120 */ swc1 $f2, 0x0120($sp) /* 09450 80B72DF0 0C03F66B */ jal Math_Rand_ZeroOne ## Rand.Next() float -/* 09454 80B72DF4 E7AC011C */ swc1 $f12, 0x011C($sp) -/* 09458 80B72DF8 C7AC011C */ lwc1 $f12, 0x011C($sp) -/* 0945C 80B72DFC C7A20120 */ lwc1 $f2, 0x0120($sp) -/* 09460 80B72E00 460C003C */ c.lt.s $f0, $f12 +/* 09454 80B72DF4 E7AC011C */ swc1 $f12, 0x011C($sp) +/* 09458 80B72DF8 C7AC011C */ lwc1 $f12, 0x011C($sp) +/* 0945C 80B72DFC C7A20120 */ lwc1 $f2, 0x0120($sp) +/* 09460 80B72E00 460C003C */ c.lt.s $f0, $f12 /* 09464 80B72E04 00000000 */ nop -/* 09468 80B72E08 45000040 */ bc1f .L80B72F0C +/* 09468 80B72E08 45000040 */ bc1f .L80B72F0C /* 0946C 80B72E0C 00000000 */ nop .L80B72E10: /* 09470 80B72E10 0C03F66B */ jal Math_Rand_ZeroOne ## Rand.Next() float -/* 09474 80B72E14 E7A20120 */ swc1 $f2, 0x0120($sp) -/* 09478 80B72E18 C7A20120 */ lwc1 $f2, 0x0120($sp) +/* 09474 80B72E14 E7A20120 */ swc1 $f2, 0x0120($sp) +/* 09478 80B72E18 C7A20120 */ lwc1 $f2, 0x0120($sp) /* 0947C 80B72E1C C60A01A8 */ lwc1 $f10, 0x01A8($s0) ## 000001A8 -/* 09480 80B72E20 46025102 */ mul.s $f4, $f10, $f2 -/* 09484 80B72E24 4604003C */ c.lt.s $f0, $f4 +/* 09480 80B72E20 46025102 */ mul.s $f4, $f10, $f2 +/* 09484 80B72E24 4604003C */ c.lt.s $f0, $f4 /* 09488 80B72E28 00000000 */ nop -/* 0948C 80B72E2C 45010007 */ bc1t .L80B72E4C +/* 0948C 80B72E2C 45010007 */ bc1t .L80B72E4C /* 09490 80B72E30 3C198016 */ lui $t9, 0x8016 ## $t9 = 80160000 /* 09494 80B72E34 8F39FA90 */ lw $t9, -0x0570($t9) ## 8015FA90 /* 09498 80B72E38 92180150 */ lbu $t8, 0x0150($s0) ## 00000150 /* 0949C 80B72E3C 872C0A5E */ lh $t4, 0x0A5E($t9) ## 80160A5E /* 094A0 80B72E40 270A0001 */ addiu $t2, $t8, 0x0001 ## $t2 = 00000001 -/* 094A4 80B72E44 154C0031 */ bne $t2, $t4, .L80B72F0C +/* 094A4 80B72E44 154C0031 */ bne $t2, $t4, .L80B72F0C /* 094A8 80B72E48 00000000 */ nop .L80B72E4C: /* 094AC 80B72E4C 92090150 */ lbu $t1, 0x0150($s0) ## 00000150 -/* 094B0 80B72E50 1520000F */ bne $t1, $zero, .L80B72E90 +/* 094B0 80B72E50 1520000F */ bne $t1, $zero, .L80B72E90 /* 094B4 80B72E54 240B0003 */ addiu $t3, $zero, 0x0003 ## $t3 = 00000003 /* 094B8 80B72E58 A60B0158 */ sh $t3, 0x0158($s0) ## 00000158 /* 094BC 80B72E5C 3C0180B8 */ lui $at, %hi(D_80B7B688) ## $at = 80B80000 -/* 094C0 80B72E60 C428B688 */ lwc1 $f8, %lo(D_80B7B688)($at) +/* 094C0 80B72E60 C428B688 */ lwc1 $f8, %lo(D_80B7B688)($at) /* 094C4 80B72E64 3C0180B8 */ lui $at, %hi(D_80B7B68C) ## $at = 80B80000 /* 094C8 80B72E68 E6080190 */ swc1 $f8, 0x0190($s0) ## 00000190 -/* 094CC 80B72E6C C426B68C */ lwc1 $f6, %lo(D_80B7B68C)($at) +/* 094CC 80B72E6C C426B68C */ lwc1 $f6, %lo(D_80B7B68C)($at) /* 094D0 80B72E70 3C014120 */ lui $at, 0x4120 ## $at = 41200000 /* 094D4 80B72E74 44816000 */ mtc1 $at, $f12 ## $f12 = 10.00 /* 094D8 80B72E78 0C00CFBE */ jal Math_Rand_ZeroFloat - + /* 094DC 80B72E7C E6060194 */ swc1 $f6, 0x0194($s0) ## 00000194 -/* 094E0 80B72E80 4600028D */ trunc.w.s $f10, $f0 -/* 094E4 80B72E84 440E5000 */ mfc1 $t6, $f10 -/* 094E8 80B72E88 10000009 */ beq $zero, $zero, .L80B72EB0 +/* 094E0 80B72E80 4600028D */ trunc.w.s $f10, $f0 +/* 094E4 80B72E84 440E5000 */ mfc1 $t6, $f10 +/* 094E8 80B72E88 10000009 */ beq $zero, $zero, .L80B72EB0 /* 094EC 80B72E8C A60E017A */ sh $t6, 0x017A($s0) ## 0000017A .L80B72E90: /* 094F0 80B72E90 240FFFFD */ addiu $t7, $zero, 0xFFFD ## $t7 = FFFFFFFD /* 094F4 80B72E94 A60F0158 */ sh $t7, 0x0158($s0) ## 00000158 /* 094F8 80B72E98 E6140190 */ swc1 $f20, 0x0190($s0) ## 00000190 /* 094FC 80B72E9C 3C0180B8 */ lui $at, %hi(D_80B7B690) ## $at = 80B80000 -/* 09500 80B72EA0 C424B690 */ lwc1 $f4, %lo(D_80B7B690)($at) +/* 09500 80B72EA0 C424B690 */ lwc1 $f4, %lo(D_80B7B690)($at) /* 09504 80B72EA4 24180028 */ addiu $t8, $zero, 0x0028 ## $t8 = 00000028 /* 09508 80B72EA8 A618017A */ sh $t8, 0x017A($s0) ## 0000017A /* 0950C 80B72EAC E6040194 */ swc1 $f4, 0x0194($s0) ## 00000194 .L80B72EB0: /* 09510 80B72EB0 3C1980B8 */ lui $t9, %hi(D_80B7E0B6) ## $t9 = 80B80000 -/* 09514 80B72EB4 9339E0B6 */ lbu $t9, %lo(D_80B7E0B6)($t9) +/* 09514 80B72EB4 9339E0B6 */ lbu $t9, %lo(D_80B7E0B6)($t9) /* 09518 80B72EB8 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 0951C 80B72EBC 1721000A */ bne $t9, $at, .L80B72EE8 +/* 0951C 80B72EBC 1721000A */ bne $t9, $at, .L80B72EE8 /* 09520 80B72EC0 3C013FC0 */ lui $at, 0x3FC0 ## $at = 3FC00000 /* 09524 80B72EC4 44816000 */ mtc1 $at, $f12 ## $f12 = 1.50 /* 09528 80B72EC8 0C00CFBE */ jal Math_Rand_ZeroFloat - + /* 0952C 80B72ECC 00000000 */ nop /* 09530 80B72ED0 3C014040 */ lui $at, 0x4040 ## $at = 40400000 /* 09534 80B72ED4 44814000 */ mtc1 $at, $f8 ## $f8 = 3.00 /* 09538 80B72ED8 00000000 */ nop -/* 0953C 80B72EDC 46080180 */ add.s $f6, $f0, $f8 -/* 09540 80B72EE0 1000000A */ beq $zero, $zero, .L80B72F0C +/* 0953C 80B72EDC 46080180 */ add.s $f6, $f0, $f8 +/* 09540 80B72EE0 1000000A */ beq $zero, $zero, .L80B72F0C /* 09544 80B72EE4 E6060188 */ swc1 $f6, 0x0188($s0) ## 00000188 .L80B72EE8: /* 09548 80B72EE8 3C013FC0 */ lui $at, 0x3FC0 ## $at = 3FC00000 /* 0954C 80B72EEC 44816000 */ mtc1 $at, $f12 ## $f12 = 1.50 /* 09550 80B72EF0 0C00CFBE */ jal Math_Rand_ZeroFloat - + /* 09554 80B72EF4 00000000 */ nop /* 09558 80B72EF8 3C014090 */ lui $at, 0x4090 ## $at = 40900000 /* 0955C 80B72EFC 44815000 */ mtc1 $at, $f10 ## $f10 = 4.50 /* 09560 80B72F00 00000000 */ nop -/* 09564 80B72F04 460A0100 */ add.s $f4, $f0, $f10 +/* 09564 80B72F04 460A0100 */ add.s $f4, $f0, $f10 /* 09568 80B72F08 E6040188 */ swc1 $f4, 0x0188($s0) ## 00000188 .L80B72F0C: /* 0956C 80B72F0C 3C0A80B8 */ lui $t2, %hi(D_80B7A694) ## $t2 = 80B80000 -/* 09570 80B72F10 854AA694 */ lh $t2, %lo(D_80B7A694)($t2) +/* 09570 80B72F10 854AA694 */ lh $t2, %lo(D_80B7A694)($t2) /* 09574 80B72F14 24010003 */ addiu $at, $zero, 0x0003 ## $at = 00000003 -/* 09578 80B72F18 55410011 */ bnel $t2, $at, .L80B72F60 +/* 09578 80B72F18 55410011 */ bnel $t2, $at, .L80B72F60 /* 0957C 80B72F1C 8609015A */ lh $t1, 0x015A($s0) ## 0000015A /* 09580 80B72F20 860C017E */ lh $t4, 0x017E($s0) ## 0000017E -/* 09584 80B72F24 5180000E */ beql $t4, $zero, .L80B72F60 +/* 09584 80B72F24 5180000E */ beql $t4, $zero, .L80B72F60 /* 09588 80B72F28 8609015A */ lh $t1, 0x015A($s0) ## 0000015A /* 0958C 80B72F2C C6020024 */ lwc1 $f2, 0x0024($s0) ## 00000024 /* 09590 80B72F30 C60C002C */ lwc1 $f12, 0x002C($s0) ## 0000002C /* 09594 80B72F34 3C014448 */ lui $at, 0x4448 ## $at = 44480000 -/* 09598 80B72F38 46021202 */ mul.s $f8, $f2, $f2 +/* 09598 80B72F38 46021202 */ mul.s $f8, $f2, $f2 /* 0959C 80B72F3C 44815000 */ mtc1 $at, $f10 ## $f10 = 800.00 -/* 095A0 80B72F40 460C6182 */ mul.s $f6, $f12, $f12 -/* 095A4 80B72F44 46064000 */ add.s $f0, $f8, $f6 -/* 095A8 80B72F48 46000004 */ sqrt.s $f0, $f0 -/* 095AC 80B72F4C 4600503C */ c.lt.s $f10, $f0 +/* 095A0 80B72F40 460C6182 */ mul.s $f6, $f12, $f12 +/* 095A4 80B72F44 46064000 */ add.s $f0, $f8, $f6 +/* 095A8 80B72F48 46000004 */ sqrt.s $f0, $f0 +/* 095AC 80B72F4C 4600503C */ c.lt.s $f10, $f0 /* 095B0 80B72F50 00000000 */ nop -/* 095B4 80B72F54 45020019 */ bc1fl .L80B72FBC +/* 095B4 80B72F54 45020019 */ bc1fl .L80B72FBC /* 095B8 80B72F58 3C0142C8 */ lui $at, 0x42C8 ## $at = 42C80000 /* 095BC 80B72F5C 8609015A */ lh $t1, 0x015A($s0) ## 0000015A .L80B72F60: /* 095C0 80B72F60 3C0141F0 */ lui $at, 0x41F0 ## $at = 41F00000 /* 095C4 80B72F64 44816000 */ mtc1 $at, $f12 ## $f12 = 30.00 /* 095C8 80B72F68 0C00CFBE */ jal Math_Rand_ZeroFloat - + /* 095CC 80B72F6C A6090158 */ sh $t1, 0x0158($s0) ## 00000158 -/* 095D0 80B72F70 4600010D */ trunc.w.s $f4, $f0 +/* 095D0 80B72F70 4600010D */ trunc.w.s $f4, $f0 /* 095D4 80B72F74 3C014120 */ lui $at, 0x4120 ## $at = 41200000 /* 095D8 80B72F78 44816000 */ mtc1 $at, $f12 ## $f12 = 10.00 -/* 095DC 80B72F7C 440F2000 */ mfc1 $t7, $f4 +/* 095DC 80B72F7C 440F2000 */ mfc1 $t7, $f4 /* 095E0 80B72F80 00000000 */ nop /* 095E4 80B72F84 25F80032 */ addiu $t8, $t7, 0x0032 ## $t8 = 00000032 /* 095E8 80B72F88 0C00CFBE */ jal Math_Rand_ZeroFloat - + /* 095EC 80B72F8C A618017C */ sh $t8, 0x017C($s0) ## 0000017C -/* 095F0 80B72F90 4600020D */ trunc.w.s $f8, $f0 +/* 095F0 80B72F90 4600020D */ trunc.w.s $f8, $f0 /* 095F4 80B72F94 3C0144FA */ lui $at, 0x44FA ## $at = 44FA0000 /* 095F8 80B72F98 44803000 */ mtc1 $zero, $f6 ## $f6 = 0.00 /* 095FC 80B72F9C 44815000 */ mtc1 $at, $f10 ## $f10 = 2000.00 -/* 09600 80B72FA0 44094000 */ mfc1 $t1, $f8 +/* 09600 80B72FA0 44094000 */ mfc1 $t1, $f8 /* 09604 80B72FA4 E6140190 */ swc1 $f20, 0x0190($s0) ## 00000190 /* 09608 80B72FA8 E60601B0 */ swc1 $f6, 0x01B0($s0) ## 000001B0 /* 0960C 80B72FAC 252B0005 */ addiu $t3, $t1, 0x0005 ## $t3 = 00000005 @@ -1827,12 +1827,12 @@ glabel L80B72928 /* 09618 80B72FB8 3C0142C8 */ lui $at, 0x42C8 ## $at = 42C80000 .L80B72FBC: /* 0961C 80B72FBC 44814000 */ mtc1 $at, $f8 ## $f8 = 100.00 -/* 09620 80B72FC0 C7A60118 */ lwc1 $f6, 0x0118($sp) +/* 09620 80B72FC0 C7A60118 */ lwc1 $f6, 0x0118($sp) /* 09624 80B72FC4 C6040090 */ lwc1 $f4, 0x0090($s0) ## 00000090 -/* 09628 80B72FC8 46064282 */ mul.s $f10, $f8, $f6 -/* 0962C 80B72FCC 460A203C */ c.lt.s $f4, $f10 +/* 09628 80B72FC8 46064282 */ mul.s $f10, $f8, $f6 +/* 0962C 80B72FCC 460A203C */ c.lt.s $f4, $f10 /* 09630 80B72FD0 00000000 */ nop -/* 09634 80B72FD4 450208A9 */ bc1fl .L80B7527C +/* 09634 80B72FD4 450208A9 */ bc1fl .L80B7527C /* 09638 80B72FD8 8604015C */ lh $a0, 0x015C($s0) ## 0000015C /* 0963C 80B72FDC A6000158 */ sh $zero, 0x0158($s0) ## 00000158 /* 09640 80B72FE0 860D0158 */ lh $t5, 0x0158($s0) ## 00000158 @@ -1842,78 +1842,78 @@ glabel L80B72928 /* 09650 80B72FF0 A60E01A4 */ sh $t6, 0x01A4($s0) ## 000001A4 /* 09654 80B72FF4 A60F01A2 */ sh $t7, 0x01A2($s0) ## 000001A2 /* 09658 80B72FF8 A602017C */ sh $v0, 0x017C($s0) ## 0000017C -/* 0965C 80B72FFC 1000089E */ beq $zero, $zero, .L80B75278 +/* 0965C 80B72FFC 1000089E */ beq $zero, $zero, .L80B75278 /* 09660 80B73000 A60D015A */ sh $t5, 0x015A($s0) ## 0000015A glabel L80B73004 /* 09664 80B73004 24180006 */ addiu $t8, $zero, 0x0006 ## $t8 = 00000006 /* 09668 80B73008 A2180151 */ sb $t8, 0x0151($s0) ## 00000151 -/* 0966C 80B7300C 8FAA00E0 */ lw $t2, 0x00E0($sp) +/* 0966C 80B7300C 8FAA00E0 */ lw $t2, 0x00E0($sp) /* 09670 80B73010 24190002 */ addiu $t9, $zero, 0x0002 ## $t9 = 00000002 -/* 09674 80B73014 A7B90134 */ sh $t9, 0x0134($sp) +/* 09674 80B73014 A7B90134 */ sh $t9, 0x0134($sp) /* 09678 80B73018 C5480024 */ lwc1 $f8, 0x0024($t2) ## 00000024 /* 0967C 80B7301C 3C0E80B8 */ lui $t6, %hi(D_80B7E118) ## $t6 = 80B80000 -/* 09680 80B73020 91CEE118 */ lbu $t6, %lo(D_80B7E118)($t6) -/* 09684 80B73024 4600418D */ trunc.w.s $f6, $f8 -/* 09688 80B73028 440D3000 */ mfc1 $t5, $f6 +/* 09680 80B73020 91CEE118 */ lbu $t6, %lo(D_80B7E118)($t6) +/* 09684 80B73024 4600418D */ trunc.w.s $f6, $f8 +/* 09688 80B73028 440D3000 */ mfc1 $t5, $f6 /* 0968C 80B7302C 00000000 */ nop -/* 09690 80B73030 01AE7821 */ addu $t7, $t5, $t6 +/* 09690 80B73030 01AE7821 */ addu $t7, $t5, $t6 /* 09694 80B73034 31F80001 */ andi $t8, $t7, 0x0001 ## $t8 = 00000000 -/* 09698 80B73038 13000004 */ beq $t8, $zero, .L80B7304C +/* 09698 80B73038 13000004 */ beq $t8, $zero, .L80B7304C /* 0969C 80B7303C 3C0141F0 */ lui $at, 0x41F0 ## $at = 41F00000 /* 096A0 80B73040 44812000 */ mtc1 $at, $f4 ## $f4 = 30.00 -/* 096A4 80B73044 10000005 */ beq $zero, $zero, .L80B7305C -/* 096A8 80B73048 E7A4010C */ swc1 $f4, 0x010C($sp) +/* 096A4 80B73044 10000005 */ beq $zero, $zero, .L80B7305C +/* 096A8 80B73048 E7A4010C */ swc1 $f4, 0x010C($sp) .L80B7304C: /* 096AC 80B7304C 3C01C1F0 */ lui $at, 0xC1F0 ## $at = C1F00000 /* 096B0 80B73050 44815000 */ mtc1 $at, $f10 ## $f10 = -30.00 /* 096B4 80B73054 00000000 */ nop -/* 096B8 80B73058 E7AA010C */ swc1 $f10, 0x010C($sp) +/* 096B8 80B73058 E7AA010C */ swc1 $f10, 0x010C($sp) .L80B7305C: /* 096BC 80B7305C 3C0141F0 */ lui $at, 0x41F0 ## $at = 41F00000 /* 096C0 80B73060 44813000 */ mtc1 $at, $f6 ## $f6 = 30.00 /* 096C4 80B73064 44804000 */ mtc1 $zero, $f8 ## $f8 = 0.00 /* 096C8 80B73068 3C0180B8 */ lui $at, %hi(D_80B7E0DC) ## $at = 80B80000 -/* 096CC 80B7306C C42CE0DC */ lwc1 $f12, %lo(D_80B7E0DC)($at) +/* 096CC 80B7306C C42CE0DC */ lwc1 $f12, %lo(D_80B7E0DC)($at) /* 096D0 80B73070 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 096D4 80B73074 E7A60114 */ swc1 $f6, 0x0114($sp) -/* 096D8 80B73078 0C034348 */ jal Matrix_RotateY -/* 096DC 80B7307C E7A80110 */ swc1 $f8, 0x0110($sp) +/* 096D4 80B73074 E7A60114 */ swc1 $f6, 0x0114($sp) +/* 096D8 80B73078 0C034348 */ jal Matrix_RotateY +/* 096DC 80B7307C E7A80110 */ swc1 $f8, 0x0110($sp) /* 096E0 80B73080 27A4010C */ addiu $a0, $sp, 0x010C ## $a0 = FFFFFFD4 -/* 096E4 80B73084 0C0346BD */ jal Matrix_MultVec3f +/* 096E4 80B73084 0C0346BD */ jal Matrix_MultVec3f /* 096E8 80B73088 27A50100 */ addiu $a1, $sp, 0x0100 ## $a1 = FFFFFFC8 /* 096EC 80B7308C 3C0280B8 */ lui $v0, %hi(D_80B7E0B8) ## $v0 = 80B80000 /* 096F0 80B73090 2442E0B8 */ addiu $v0, $v0, %lo(D_80B7E0B8) ## $v0 = 80B7E0B8 /* 096F4 80B73094 C4440000 */ lwc1 $f4, 0x0000($v0) ## 80B7E0B8 -/* 096F8 80B73098 C7AA0100 */ lwc1 $f10, 0x0100($sp) +/* 096F8 80B73098 C7AA0100 */ lwc1 $f10, 0x0100($sp) /* 096FC 80B7309C 3C014120 */ lui $at, 0x4120 ## $at = 41200000 -/* 09700 80B730A0 4406A000 */ mfc1 $a2, $f20 -/* 09704 80B730A4 460A2200 */ add.s $f8, $f4, $f10 -/* 09708 80B730A8 4407A000 */ mfc1 $a3, $f20 +/* 09700 80B730A0 4406A000 */ mfc1 $a2, $f20 +/* 09704 80B730A4 460A2200 */ add.s $f8, $f4, $f10 +/* 09708 80B730A8 4407A000 */ mfc1 $a3, $f20 /* 0970C 80B730AC 26040068 */ addiu $a0, $s0, 0x0068 ## $a0 = 00000068 /* 09710 80B730B0 E60801B4 */ swc1 $f8, 0x01B4($s0) ## 000001B4 -/* 09714 80B730B4 C7A40108 */ lwc1 $f4, 0x0108($sp) +/* 09714 80B730B4 C7A40108 */ lwc1 $f4, 0x0108($sp) /* 09718 80B730B8 C4460008 */ lwc1 $f6, 0x0008($v0) ## 80B7E0C0 -/* 0971C 80B730BC 46043280 */ add.s $f10, $f6, $f4 +/* 0971C 80B730BC 46043280 */ add.s $f10, $f6, $f4 /* 09720 80B730C0 44813000 */ mtc1 $at, $f6 ## $f6 = 10.00 /* 09724 80B730C4 3C014580 */ lui $at, 0x4580 ## $at = 45800000 /* 09728 80B730C8 E60A01BC */ swc1 $f10, 0x01BC($s0) ## 000001BC /* 0972C 80B730CC C4480004 */ lwc1 $f8, 0x0004($v0) ## 80B7E0BC /* 09730 80B730D0 44815000 */ mtc1 $at, $f10 ## $f10 = 4096.00 /* 09734 80B730D4 3C0180B8 */ lui $at, %hi(D_80B7B694) ## $at = 80B80000 -/* 09738 80B730D8 46064101 */ sub.s $f4, $f8, $f6 +/* 09738 80B730D8 46064101 */ sub.s $f4, $f8, $f6 /* 0973C 80B730DC E60A01B0 */ swc1 $f10, 0x01B0($s0) ## 000001B0 /* 09740 80B730E0 C6080188 */ lwc1 $f8, 0x0188($s0) ## 00000188 /* 09744 80B730E4 E60401B8 */ swc1 $f4, 0x01B8($s0) ## 000001B8 -/* 09748 80B730E8 C426B694 */ lwc1 $f6, %lo(D_80B7B694)($at) -/* 0974C 80B730EC 46064102 */ mul.s $f4, $f8, $f6 -/* 09750 80B730F0 44052000 */ mfc1 $a1, $f4 +/* 09748 80B730E8 C426B694 */ lwc1 $f6, %lo(D_80B7B694)($at) +/* 0974C 80B730EC 46064102 */ mul.s $f4, $f8, $f6 +/* 09750 80B730F0 44052000 */ mfc1 $a1, $f4 /* 09754 80B730F4 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 09758 80B730F8 00000000 */ nop /* 0975C 80B730FC 3C1980B8 */ lui $t9, %hi(D_80B7A694) ## $t9 = 80B80000 -/* 09760 80B73100 8739A694 */ lh $t9, %lo(D_80B7A694)($t9) +/* 09760 80B73100 8739A694 */ lh $t9, %lo(D_80B7A694)($t9) /* 09764 80B73104 24010003 */ addiu $at, $zero, 0x0003 ## $at = 00000003 -/* 09768 80B73108 5721001D */ bnel $t9, $at, .L80B73180 +/* 09768 80B73108 5721001D */ bnel $t9, $at, .L80B73180 /* 0976C 80B7310C 3C0144FA */ lui $at, 0x44FA ## $at = 44FA0000 /* 09770 80B73110 8E2A07C0 */ lw $t2, 0x07C0($s1) ## 000007C0 /* 09774 80B73114 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 @@ -1924,24 +1924,24 @@ glabel L80B73004 /* 09788 80B73128 85890002 */ lh $t1, 0x0002($t4) ## 00000002 /* 0978C 80B7312C 44895000 */ mtc1 $t1, $f10 ## $f10 = 0.00 /* 09790 80B73130 00000000 */ nop -/* 09794 80B73134 46805220 */ cvt.s.w $f8, $f10 +/* 09794 80B73134 46805220 */ cvt.s.w $f8, $f10 /* 09798 80B73138 C44A0004 */ lwc1 $f10, 0x0004($v0) ## 80B7E0BC -/* 0979C 80B7313C 46064100 */ add.s $f4, $f8, $f6 -/* 097A0 80B73140 460A203C */ c.lt.s $f4, $f10 +/* 0979C 80B7313C 46064100 */ add.s $f4, $f8, $f6 +/* 097A0 80B73140 460A203C */ c.lt.s $f4, $f10 /* 097A4 80B73144 00000000 */ nop -/* 097A8 80B73148 4503000D */ bc1tl .L80B73180 +/* 097A8 80B73148 4503000D */ bc1tl .L80B73180 /* 097AC 80B7314C 3C0144FA */ lui $at, 0x44FA ## $at = 44FA0000 /* 097B0 80B73150 C4420000 */ lwc1 $f2, 0x0000($v0) ## 80B7E0B8 /* 097B4 80B73154 C44C0008 */ lwc1 $f12, 0x0008($v0) ## 80B7E0C0 /* 097B8 80B73158 3C014448 */ lui $at, 0x4448 ## $at = 44480000 -/* 097BC 80B7315C 46021202 */ mul.s $f8, $f2, $f2 +/* 097BC 80B7315C 46021202 */ mul.s $f8, $f2, $f2 /* 097C0 80B73160 44812000 */ mtc1 $at, $f4 ## $f4 = 800.00 -/* 097C4 80B73164 460C6182 */ mul.s $f6, $f12, $f12 -/* 097C8 80B73168 46064000 */ add.s $f0, $f8, $f6 -/* 097CC 80B7316C 46000004 */ sqrt.s $f0, $f0 -/* 097D0 80B73170 4600203C */ c.lt.s $f4, $f0 +/* 097C4 80B73164 460C6182 */ mul.s $f6, $f12, $f12 +/* 097C8 80B73168 46064000 */ add.s $f0, $f8, $f6 +/* 097CC 80B7316C 46000004 */ sqrt.s $f0, $f0 +/* 097D0 80B73170 4600203C */ c.lt.s $f4, $f0 /* 097D4 80B73174 00000000 */ nop -/* 097D8 80B73178 45000008 */ bc1f .L80B7319C +/* 097D8 80B73178 45000008 */ bc1f .L80B7319C /* 097DC 80B7317C 3C0144FA */ lui $at, 0x44FA ## $at = 44FA0000 .L80B73180: /* 097E0 80B73180 860B015A */ lh $t3, 0x015A($s0) ## 0000015A @@ -1949,17 +1949,17 @@ glabel L80B73004 /* 097E8 80B73188 A600017A */ sh $zero, 0x017A($s0) ## 0000017A /* 097EC 80B7318C E6140190 */ swc1 $f20, 0x0190($s0) ## 00000190 /* 097F0 80B73190 A60B0158 */ sh $t3, 0x0158($s0) ## 00000158 -/* 097F4 80B73194 10000838 */ beq $zero, $zero, .L80B75278 +/* 097F4 80B73194 10000838 */ beq $zero, $zero, .L80B75278 /* 097F8 80B73198 E60A0194 */ swc1 $f10, 0x0194($s0) ## 00000194 .L80B7319C: /* 097FC 80B7319C 860D017A */ lh $t5, 0x017A($s0) ## 0000017A -/* 09800 80B731A0 11A00006 */ beq $t5, $zero, .L80B731BC +/* 09800 80B731A0 11A00006 */ beq $t5, $zero, .L80B731BC /* 09804 80B731A4 3C0141F0 */ lui $at, 0x41F0 ## $at = 41F00000 /* 09808 80B731A8 44813000 */ mtc1 $at, $f6 ## $f6 = 30.00 -/* 0980C 80B731AC C7A80124 */ lwc1 $f8, 0x0124($sp) -/* 09810 80B731B0 4606403C */ c.lt.s $f8, $f6 +/* 0980C 80B731AC C7A80124 */ lwc1 $f8, 0x0124($sp) +/* 09810 80B731B0 4606403C */ c.lt.s $f8, $f6 /* 09814 80B731B4 00000000 */ nop -/* 09818 80B731B8 4500082F */ bc1f .L80B75278 +/* 09818 80B731B8 4500082F */ bc1f .L80B75278 .L80B731BC: /* 0981C 80B731BC 240E0004 */ addiu $t6, $zero, 0x0004 ## $t6 = 00000004 /* 09820 80B731C0 A60E0158 */ sh $t6, 0x0158($s0) ## 00000158 @@ -1974,35 +1974,35 @@ glabel L80B73004 /* 09844 80B731E4 8C580008 */ lw $t8, 0x0008($v0) ## 80B7E0C0 /* 09848 80B731E8 E60401B0 */ swc1 $f4, 0x01B0($s0) ## 000001B0 /* 0984C 80B731EC AE1801BC */ sw $t8, 0x01BC($s0) ## 000001BC -/* 09850 80B731F0 C42AB698 */ lwc1 $f10, %lo(D_80B7B698)($at) +/* 09850 80B731F0 C42AB698 */ lwc1 $f10, %lo(D_80B7B698)($at) /* 09854 80B731F4 3C0180B8 */ lui $at, %hi(D_80B7B69C) ## $at = 80B80000 /* 09858 80B731F8 E60A0190 */ swc1 $f10, 0x0190($s0) ## 00000190 -/* 0985C 80B731FC C428B69C */ lwc1 $f8, %lo(D_80B7B69C)($at) +/* 0985C 80B731FC C428B69C */ lwc1 $f8, %lo(D_80B7B69C)($at) /* 09860 80B73200 A619017A */ sh $t9, 0x017A($s0) ## 0000017A -/* 09864 80B73204 1000081C */ beq $zero, $zero, .L80B75278 +/* 09864 80B73204 1000081C */ beq $zero, $zero, .L80B75278 /* 09868 80B73208 E6080194 */ swc1 $f8, 0x0194($s0) ## 00000194 glabel L80B7320C -/* 0986C 80B7320C 4406A000 */ mfc1 $a2, $f20 +/* 0986C 80B7320C 4406A000 */ mfc1 $a2, $f20 /* 09870 80B73210 260401B0 */ addiu $a0, $s0, 0x01B0 ## $a0 = 000001B0 /* 09874 80B73214 3C054680 */ lui $a1, 0x4680 ## $a1 = 46800000 /* 09878 80B73218 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 0987C 80B7321C 3C074580 */ lui $a3, 0x4580 ## $a3 = 45800000 -/* 09880 80B73220 8FA40040 */ lw $a0, 0x0040($sp) +/* 09880 80B73220 8FA40040 */ lw $a0, 0x0040($sp) /* 09884 80B73224 24054E20 */ addiu $a1, $zero, 0x4E20 ## $a1 = 00004E20 /* 09888 80B73228 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 /* 0988C 80B7322C 0C01E1EF */ jal Math_SmoothScaleMaxS - + /* 09890 80B73230 24071388 */ addiu $a3, $zero, 0x1388 ## $a3 = 00001388 /* 09894 80B73234 240A0032 */ addiu $t2, $zero, 0x0032 ## $t2 = 00000032 /* 09898 80B73238 A20A0151 */ sb $t2, 0x0151($s0) ## 00000151 /* 0989C 80B7323C 240C0002 */ addiu $t4, $zero, 0x0002 ## $t4 = 00000002 /* 098A0 80B73240 3C0980B8 */ lui $t1, %hi(D_80B7E0B8) ## $t1 = 80B80000 -/* 098A4 80B73244 A7AC0134 */ sh $t4, 0x0134($sp) +/* 098A4 80B73244 A7AC0134 */ sh $t4, 0x0134($sp) /* 098A8 80B73248 2529E0B8 */ addiu $t1, $t1, %lo(D_80B7E0B8) ## $t1 = 80B7E0B8 /* 098AC 80B7324C 8D2D0000 */ lw $t5, 0x0000($t1) ## 80B7E0B8 -/* 098B0 80B73250 4406A000 */ mfc1 $a2, $f20 -/* 098B4 80B73254 4407A000 */ mfc1 $a3, $f20 +/* 098B0 80B73250 4406A000 */ mfc1 $a2, $f20 +/* 098B4 80B73254 4407A000 */ mfc1 $a3, $f20 /* 098B8 80B73258 AE0D01B4 */ sw $t5, 0x01B4($s0) ## 000001B4 /* 098BC 80B7325C 8D2B0004 */ lw $t3, 0x0004($t1) ## 80B7E0BC /* 098C0 80B73260 8E050188 */ lw $a1, 0x0188($s0) ## 00000188 @@ -2010,15 +2010,15 @@ glabel L80B7320C /* 098C8 80B73268 AE0B01B8 */ sw $t3, 0x01B8($s0) ## 000001B8 /* 098CC 80B7326C 8D2D0008 */ lw $t5, 0x0008($t1) ## 80B7E0C0 /* 098D0 80B73270 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 098D4 80B73274 AE0D01BC */ sw $t5, 0x01BC($s0) ## 000001BC /* 098D8 80B73278 3C0E80B8 */ lui $t6, %hi(D_80B7A694) ## $t6 = 80B80000 -/* 098DC 80B7327C 85CEA694 */ lh $t6, %lo(D_80B7A694)($t6) +/* 098DC 80B7327C 85CEA694 */ lh $t6, %lo(D_80B7A694)($t6) /* 098E0 80B73280 24010003 */ addiu $at, $zero, 0x0003 ## $at = 00000003 -/* 098E4 80B73284 55C10020 */ bnel $t6, $at, .L80B73308 +/* 098E4 80B73284 55C10020 */ bnel $t6, $at, .L80B73308 /* 098E8 80B73288 3C0144FA */ lui $at, 0x44FA ## $at = 44FA0000 /* 098EC 80B7328C 860F017A */ lh $t7, 0x017A($s0) ## 0000017A -/* 098F0 80B73290 51E0001D */ beql $t7, $zero, .L80B73308 +/* 098F0 80B73290 51E0001D */ beql $t7, $zero, .L80B73308 /* 098F4 80B73294 3C0144FA */ lui $at, 0x44FA ## $at = 44FA0000 /* 098F8 80B73298 8E3807C0 */ lw $t8, 0x07C0($s1) ## 000007C0 /* 098FC 80B7329C 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 @@ -2029,24 +2029,24 @@ glabel L80B7320C /* 09910 80B732B0 872A0002 */ lh $t2, 0x0002($t9) ## 00000002 /* 09914 80B732B4 448A3000 */ mtc1 $t2, $f6 ## $f6 = 0.00 /* 09918 80B732B8 00000000 */ nop -/* 0991C 80B732BC 46803120 */ cvt.s.w $f4, $f6 +/* 0991C 80B732BC 46803120 */ cvt.s.w $f4, $f6 /* 09920 80B732C0 C4460004 */ lwc1 $f6, 0x0004($v0) ## 80B7E0BC -/* 09924 80B732C4 460A2200 */ add.s $f8, $f4, $f10 -/* 09928 80B732C8 4606403C */ c.lt.s $f8, $f6 +/* 09924 80B732C4 460A2200 */ add.s $f8, $f4, $f10 +/* 09928 80B732C8 4606403C */ c.lt.s $f8, $f6 /* 0992C 80B732CC 00000000 */ nop -/* 09930 80B732D0 4503000D */ bc1tl .L80B73308 +/* 09930 80B732D0 4503000D */ bc1tl .L80B73308 /* 09934 80B732D4 3C0144FA */ lui $at, 0x44FA ## $at = 44FA0000 /* 09938 80B732D8 C4420000 */ lwc1 $f2, 0x0000($v0) ## 80B7E0B8 /* 0993C 80B732DC C44C0008 */ lwc1 $f12, 0x0008($v0) ## 80B7E0C0 /* 09940 80B732E0 3C014448 */ lui $at, 0x4448 ## $at = 44480000 -/* 09944 80B732E4 46021102 */ mul.s $f4, $f2, $f2 +/* 09944 80B732E4 46021102 */ mul.s $f4, $f2, $f2 /* 09948 80B732E8 44814000 */ mtc1 $at, $f8 ## $f8 = 800.00 -/* 0994C 80B732EC 460C6282 */ mul.s $f10, $f12, $f12 -/* 09950 80B732F0 460A2000 */ add.s $f0, $f4, $f10 -/* 09954 80B732F4 46000004 */ sqrt.s $f0, $f0 -/* 09958 80B732F8 4600403C */ c.lt.s $f8, $f0 +/* 0994C 80B732EC 460C6282 */ mul.s $f10, $f12, $f12 +/* 09950 80B732F0 460A2000 */ add.s $f0, $f4, $f10 +/* 09954 80B732F4 46000004 */ sqrt.s $f0, $f0 +/* 09958 80B732F8 4600403C */ c.lt.s $f8, $f0 /* 0995C 80B732FC 00000000 */ nop -/* 09960 80B73300 45000008 */ bc1f .L80B73324 +/* 09960 80B73300 45000008 */ bc1f .L80B73324 /* 09964 80B73304 3C0144FA */ lui $at, 0x44FA ## $at = 44FA0000 .L80B73308: /* 09968 80B73308 860C015A */ lh $t4, 0x015A($s0) ## 0000015A @@ -2054,32 +2054,32 @@ glabel L80B7320C /* 09970 80B73310 A600017A */ sh $zero, 0x017A($s0) ## 0000017A /* 09974 80B73314 E6140190 */ swc1 $f20, 0x0190($s0) ## 00000190 /* 09978 80B73318 A60C0158 */ sh $t4, 0x0158($s0) ## 00000158 -/* 0997C 80B7331C 100007D6 */ beq $zero, $zero, .L80B75278 +/* 0997C 80B7331C 100007D6 */ beq $zero, $zero, .L80B75278 /* 09980 80B73320 E6060194 */ swc1 $f6, 0x0194($s0) ## 00000194 .L80B73324: /* 09984 80B73324 3C014120 */ lui $at, 0x4120 ## $at = 41200000 /* 09988 80B73328 44815000 */ mtc1 $at, $f10 ## $f10 = 10.00 -/* 0998C 80B7332C C7A40124 */ lwc1 $f4, 0x0124($sp) -/* 09990 80B73330 460A203C */ c.lt.s $f4, $f10 +/* 0998C 80B7332C C7A40124 */ lwc1 $f4, 0x0124($sp) +/* 09990 80B73330 460A203C */ c.lt.s $f4, $f10 /* 09994 80B73334 00000000 */ nop -/* 09998 80B73338 450007CF */ bc1f .L80B75278 +/* 09998 80B73338 450007CF */ bc1f .L80B75278 /* 0999C 80B7333C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 099A0 80B73340 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 099A4 80B73344 0C2DC28B */ jal func_80B70A2C +/* 099A4 80B73344 0C2DC28B */ jal func_80B70A2C /* 099A8 80B73348 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 099AC 80B7334C 10400003 */ beq $v0, $zero, .L80B7335C +/* 099AC 80B7334C 10400003 */ beq $v0, $zero, .L80B7335C /* 099B0 80B73350 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 099B4 80B73354 0C2DC49E */ jal func_80B71278 +/* 099B4 80B73354 0C2DC49E */ jal func_80B71278 /* 099B8 80B73358 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 .L80B7335C: /* 099BC 80B7335C 24090005 */ addiu $t1, $zero, 0x0005 ## $t1 = 00000005 /* 099C0 80B73360 A6090158 */ sh $t1, 0x0158($s0) ## 00000158 /* 099C4 80B73364 3C0180B8 */ lui $at, %hi(D_80B7B6A0) ## $at = 80B80000 -/* 099C8 80B73368 C428B6A0 */ lwc1 $f8, %lo(D_80B7B6A0)($at) +/* 099C8 80B73368 C428B6A0 */ lwc1 $f8, %lo(D_80B7B6A0)($at) /* 099CC 80B7336C 3C0180B8 */ lui $at, %hi(D_80B7B6A4) ## $at = 80B80000 /* 099D0 80B73370 240B0096 */ addiu $t3, $zero, 0x0096 ## $t3 = 00000096 /* 099D4 80B73374 E6080190 */ swc1 $f8, 0x0190($s0) ## 00000190 -/* 099D8 80B73378 C426B6A4 */ lwc1 $f6, %lo(D_80B7B6A4)($at) +/* 099D8 80B73378 C426B6A4 */ lwc1 $f6, %lo(D_80B7B6A4)($at) /* 099DC 80B7337C 240D0078 */ addiu $t5, $zero, 0x0078 ## $t5 = 00000078 /* 099E0 80B73380 A60B017C */ sh $t3, 0x017C($s0) ## 0000017C /* 099E4 80B73384 A600017A */ sh $zero, 0x017A($s0) ## 0000017A @@ -2088,219 +2088,219 @@ glabel L80B7320C /* 099F0 80B73390 3C0180B8 */ lui $at, %hi(D_80B7A694) ## $at = 80B80000 /* 099F4 80B73394 240E0004 */ addiu $t6, $zero, 0x0004 ## $t6 = 00000004 /* 099F8 80B73398 E6060194 */ swc1 $f6, 0x0194($s0) ## 00000194 -/* 099FC 80B7339C A42EA694 */ sh $t6, %lo(D_80B7A694)($at) +/* 099FC 80B7339C A42EA694 */ sh $t6, %lo(D_80B7A694)($at) /* 09A00 80B733A0 3C0180B8 */ lui $at, %hi(D_80B7E0A8) ## $at = 80B80000 -/* 09A04 80B733A4 AC30E0A8 */ sw $s0, %lo(D_80B7E0A8)($at) +/* 09A04 80B733A4 AC30E0A8 */ sw $s0, %lo(D_80B7E0A8)($at) /* 09A08 80B733A8 3C0143C8 */ lui $at, 0x43C8 ## $at = 43C80000 /* 09A0C 80B733AC 44816000 */ mtc1 $at, $f12 ## $f12 = 400.00 /* 09A10 80B733B0 0C00CFBE */ jal Math_Rand_ZeroFloat - + /* 09A14 80B733B4 00000000 */ nop /* 09A18 80B733B8 3C0143FA */ lui $at, 0x43FA ## $at = 43FA0000 /* 09A1C 80B733BC 44812000 */ mtc1 $at, $f4 ## $f4 = 500.00 /* 09A20 80B733C0 3C0F80B8 */ lui $t7, %hi(D_80B7E0B6) ## $t7 = 80B80000 -/* 09A24 80B733C4 91EFE0B6 */ lbu $t7, %lo(D_80B7E0B6)($t7) -/* 09A28 80B733C8 46002281 */ sub.s $f10, $f4, $f0 +/* 09A24 80B733C4 91EFE0B6 */ lbu $t7, %lo(D_80B7E0B6)($t7) +/* 09A28 80B733C8 46002281 */ sub.s $f10, $f4, $f0 /* 09A2C 80B733CC 3C0180B8 */ lui $at, %hi(D_80B7A69C) ## $at = 80B80000 -/* 09A30 80B733D0 E42AA69C */ swc1 $f10, %lo(D_80B7A69C)($at) +/* 09A30 80B733D0 E42AA69C */ swc1 $f10, %lo(D_80B7A69C)($at) /* 09A34 80B733D4 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 09A38 80B733D8 15E10052 */ bne $t7, $at, .L80B73524 +/* 09A38 80B733D8 15E10052 */ bne $t7, $at, .L80B73524 /* 09A3C 80B733DC 3C01428C */ lui $at, 0x428C ## $at = 428C0000 /* 09A40 80B733E0 44814000 */ mtc1 $at, $f8 ## $f8 = 70.00 /* 09A44 80B733E4 C60001AC */ lwc1 $f0, 0x01AC($s0) ## 000001AC -/* 09A48 80B733E8 4600403C */ c.lt.s $f8, $f0 +/* 09A48 80B733E8 4600403C */ c.lt.s $f8, $f0 /* 09A4C 80B733EC 00000000 */ nop -/* 09A50 80B733F0 4500000D */ bc1f .L80B73428 +/* 09A50 80B733F0 4500000D */ bc1f .L80B73428 /* 09A54 80B733F4 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 /* 09A58 80B733F8 44816000 */ mtc1 $at, $f12 ## $f12 = 20.00 /* 09A5C 80B733FC 0C00CFBE */ jal Math_Rand_ZeroFloat - + /* 09A60 80B73400 00000000 */ nop -/* 09A64 80B73404 4600018D */ trunc.w.s $f6, $f0 -/* 09A68 80B73408 44023000 */ mfc1 $v0, $f6 +/* 09A64 80B73404 4600018D */ trunc.w.s $f6, $f0 +/* 09A68 80B73408 44023000 */ mfc1 $v0, $f6 /* 09A6C 80B7340C 00000000 */ nop -/* 09A70 80B73410 00021400 */ sll $v0, $v0, 16 -/* 09A74 80B73414 00021403 */ sra $v0, $v0, 16 +/* 09A70 80B73410 00021400 */ sll $v0, $v0, 16 +/* 09A74 80B73414 00021403 */ sra $v0, $v0, 16 /* 09A78 80B73418 2442000A */ addiu $v0, $v0, 0x000A ## $v0 = 0000000A -/* 09A7C 80B7341C 00021400 */ sll $v0, $v0, 16 -/* 09A80 80B73420 10000033 */ beq $zero, $zero, .L80B734F0 -/* 09A84 80B73424 00021403 */ sra $v0, $v0, 16 +/* 09A7C 80B7341C 00021400 */ sll $v0, $v0, 16 +/* 09A80 80B73420 10000033 */ beq $zero, $zero, .L80B734F0 +/* 09A84 80B73424 00021403 */ sra $v0, $v0, 16 .L80B73428: /* 09A88 80B73428 3C014270 */ lui $at, 0x4270 ## $at = 42700000 /* 09A8C 80B7342C 44812000 */ mtc1 $at, $f4 ## $f4 = 60.00 /* 09A90 80B73430 00000000 */ nop -/* 09A94 80B73434 4600203C */ c.lt.s $f4, $f0 +/* 09A94 80B73434 4600203C */ c.lt.s $f4, $f0 /* 09A98 80B73438 00000000 */ nop -/* 09A9C 80B7343C 4500000D */ bc1f .L80B73474 +/* 09A9C 80B7343C 4500000D */ bc1f .L80B73474 /* 09AA0 80B73440 3C0141F0 */ lui $at, 0x41F0 ## $at = 41F00000 /* 09AA4 80B73444 44816000 */ mtc1 $at, $f12 ## $f12 = 30.00 /* 09AA8 80B73448 0C00CFBE */ jal Math_Rand_ZeroFloat - + /* 09AAC 80B7344C 00000000 */ nop -/* 09AB0 80B73450 4600028D */ trunc.w.s $f10, $f0 -/* 09AB4 80B73454 44025000 */ mfc1 $v0, $f10 +/* 09AB0 80B73450 4600028D */ trunc.w.s $f10, $f0 +/* 09AB4 80B73454 44025000 */ mfc1 $v0, $f10 /* 09AB8 80B73458 00000000 */ nop -/* 09ABC 80B7345C 00021400 */ sll $v0, $v0, 16 -/* 09AC0 80B73460 00021403 */ sra $v0, $v0, 16 +/* 09ABC 80B7345C 00021400 */ sll $v0, $v0, 16 +/* 09AC0 80B73460 00021403 */ sra $v0, $v0, 16 /* 09AC4 80B73464 24420014 */ addiu $v0, $v0, 0x0014 ## $v0 = 00000014 -/* 09AC8 80B73468 00021400 */ sll $v0, $v0, 16 -/* 09ACC 80B7346C 10000020 */ beq $zero, $zero, .L80B734F0 -/* 09AD0 80B73470 00021403 */ sra $v0, $v0, 16 +/* 09AC8 80B73468 00021400 */ sll $v0, $v0, 16 +/* 09ACC 80B7346C 10000020 */ beq $zero, $zero, .L80B734F0 +/* 09AD0 80B73470 00021403 */ sra $v0, $v0, 16 .L80B73474: /* 09AD4 80B73474 3C014248 */ lui $at, 0x4248 ## $at = 42480000 /* 09AD8 80B73478 44814000 */ mtc1 $at, $f8 ## $f8 = 50.00 /* 09ADC 80B7347C 00000000 */ nop -/* 09AE0 80B73480 4600403C */ c.lt.s $f8, $f0 +/* 09AE0 80B73480 4600403C */ c.lt.s $f8, $f0 /* 09AE4 80B73484 00000000 */ nop -/* 09AE8 80B73488 4500000D */ bc1f .L80B734C0 +/* 09AE8 80B73488 4500000D */ bc1f .L80B734C0 /* 09AEC 80B7348C 3C0141F0 */ lui $at, 0x41F0 ## $at = 41F00000 /* 09AF0 80B73490 44816000 */ mtc1 $at, $f12 ## $f12 = 30.00 /* 09AF4 80B73494 0C00CFBE */ jal Math_Rand_ZeroFloat - + /* 09AF8 80B73498 00000000 */ nop -/* 09AFC 80B7349C 4600018D */ trunc.w.s $f6, $f0 -/* 09B00 80B734A0 44023000 */ mfc1 $v0, $f6 +/* 09AFC 80B7349C 4600018D */ trunc.w.s $f6, $f0 +/* 09B00 80B734A0 44023000 */ mfc1 $v0, $f6 /* 09B04 80B734A4 00000000 */ nop -/* 09B08 80B734A8 00021400 */ sll $v0, $v0, 16 -/* 09B0C 80B734AC 00021403 */ sra $v0, $v0, 16 +/* 09B08 80B734A8 00021400 */ sll $v0, $v0, 16 +/* 09B0C 80B734AC 00021403 */ sra $v0, $v0, 16 /* 09B10 80B734B0 2442001E */ addiu $v0, $v0, 0x001E ## $v0 = 0000001E -/* 09B14 80B734B4 00021400 */ sll $v0, $v0, 16 -/* 09B18 80B734B8 1000000D */ beq $zero, $zero, .L80B734F0 -/* 09B1C 80B734BC 00021403 */ sra $v0, $v0, 16 +/* 09B14 80B734B4 00021400 */ sll $v0, $v0, 16 +/* 09B18 80B734B8 1000000D */ beq $zero, $zero, .L80B734F0 +/* 09B1C 80B734BC 00021403 */ sra $v0, $v0, 16 .L80B734C0: /* 09B20 80B734C0 3C014220 */ lui $at, 0x4220 ## $at = 42200000 /* 09B24 80B734C4 44816000 */ mtc1 $at, $f12 ## $f12 = 40.00 /* 09B28 80B734C8 0C00CFBE */ jal Math_Rand_ZeroFloat - + /* 09B2C 80B734CC 00000000 */ nop -/* 09B30 80B734D0 4600010D */ trunc.w.s $f4, $f0 -/* 09B34 80B734D4 44022000 */ mfc1 $v0, $f4 +/* 09B30 80B734D0 4600010D */ trunc.w.s $f4, $f0 +/* 09B34 80B734D4 44022000 */ mfc1 $v0, $f4 /* 09B38 80B734D8 00000000 */ nop -/* 09B3C 80B734DC 00021400 */ sll $v0, $v0, 16 -/* 09B40 80B734E0 00021403 */ sra $v0, $v0, 16 +/* 09B3C 80B734DC 00021400 */ sll $v0, $v0, 16 +/* 09B40 80B734E0 00021403 */ sra $v0, $v0, 16 /* 09B44 80B734E4 24420028 */ addiu $v0, $v0, 0x0028 ## $v0 = 00000028 -/* 09B48 80B734E8 00021400 */ sll $v0, $v0, 16 -/* 09B4C 80B734EC 00021403 */ sra $v0, $v0, 16 +/* 09B48 80B734E8 00021400 */ sll $v0, $v0, 16 +/* 09B4C 80B734EC 00021403 */ sra $v0, $v0, 16 .L80B734F0: /* 09B50 80B734F0 3C0180B8 */ lui $at, %hi(D_80B7E122) ## $at = 80B80000 -/* 09B54 80B734F4 A422E122 */ sh $v0, %lo(D_80B7E122)($at) -/* 09B58 80B734F8 00023080 */ sll $a2, $v0, 2 +/* 09B54 80B734F4 A422E122 */ sh $v0, %lo(D_80B7E122)($at) +/* 09B58 80B734F8 00023080 */ sll $a2, $v0, 2 /* 09B5C 80B734FC 3C0180B8 */ lui $at, %hi(D_80B7E0A4) ## $at = 80B80000 -/* 09B60 80B73500 00C23023 */ subu $a2, $a2, $v0 +/* 09B60 80B73500 00C23023 */ subu $a2, $a2, $v0 /* 09B64 80B73504 44806000 */ mtc1 $zero, $f12 ## $f12 = 0.00 -/* 09B68 80B73508 A422E0A4 */ sh $v0, %lo(D_80B7E0A4)($at) +/* 09B68 80B73508 A422E0A4 */ sh $v0, %lo(D_80B7E0A4)($at) /* 09B6C 80B7350C 30C600FF */ andi $a2, $a2, 0x00FF ## $a2 = 00000000 /* 09B70 80B73510 2405003C */ addiu $a1, $zero, 0x003C ## $a1 = 0000003C -/* 09B74 80B73514 0C02A7DB */ jal func_800A9F6C +/* 09B74 80B73514 0C02A7DB */ jal func_800A9F6C /* 09B78 80B73518 2407000A */ addiu $a3, $zero, 0x000A ## $a3 = 0000000A -/* 09B7C 80B7351C 10000051 */ beq $zero, $zero, .L80B73664 +/* 09B7C 80B7351C 10000051 */ beq $zero, $zero, .L80B73664 /* 09B80 80B73520 00000000 */ nop .L80B73524: /* 09B84 80B73524 3C01428C */ lui $at, 0x428C ## $at = 428C0000 /* 09B88 80B73528 44815000 */ mtc1 $at, $f10 ## $f10 = 70.00 /* 09B8C 80B7352C C60001AC */ lwc1 $f0, 0x01AC($s0) ## 000001AC -/* 09B90 80B73530 4600503C */ c.lt.s $f10, $f0 +/* 09B90 80B73530 4600503C */ c.lt.s $f10, $f0 /* 09B94 80B73534 00000000 */ nop -/* 09B98 80B73538 4500000D */ bc1f .L80B73570 +/* 09B98 80B73538 4500000D */ bc1f .L80B73570 /* 09B9C 80B7353C 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 /* 09BA0 80B73540 44816000 */ mtc1 $at, $f12 ## $f12 = 5.00 /* 09BA4 80B73544 0C00CFBE */ jal Math_Rand_ZeroFloat - + /* 09BA8 80B73548 00000000 */ nop -/* 09BAC 80B7354C 4600020D */ trunc.w.s $f8, $f0 -/* 09BB0 80B73550 44024000 */ mfc1 $v0, $f8 +/* 09BAC 80B7354C 4600020D */ trunc.w.s $f8, $f0 +/* 09BB0 80B73550 44024000 */ mfc1 $v0, $f8 /* 09BB4 80B73554 00000000 */ nop -/* 09BB8 80B73558 00021400 */ sll $v0, $v0, 16 -/* 09BBC 80B7355C 00021403 */ sra $v0, $v0, 16 +/* 09BB8 80B73558 00021400 */ sll $v0, $v0, 16 +/* 09BBC 80B7355C 00021403 */ sra $v0, $v0, 16 /* 09BC0 80B73560 2442000A */ addiu $v0, $v0, 0x000A ## $v0 = 0000000A -/* 09BC4 80B73564 00021400 */ sll $v0, $v0, 16 -/* 09BC8 80B73568 10000033 */ beq $zero, $zero, .L80B73638 -/* 09BCC 80B7356C 00021403 */ sra $v0, $v0, 16 +/* 09BC4 80B73564 00021400 */ sll $v0, $v0, 16 +/* 09BC8 80B73568 10000033 */ beq $zero, $zero, .L80B73638 +/* 09BCC 80B7356C 00021403 */ sra $v0, $v0, 16 .L80B73570: /* 09BD0 80B73570 3C014270 */ lui $at, 0x4270 ## $at = 42700000 /* 09BD4 80B73574 44813000 */ mtc1 $at, $f6 ## $f6 = 60.00 /* 09BD8 80B73578 00000000 */ nop -/* 09BDC 80B7357C 4600303C */ c.lt.s $f6, $f0 +/* 09BDC 80B7357C 4600303C */ c.lt.s $f6, $f0 /* 09BE0 80B73580 00000000 */ nop -/* 09BE4 80B73584 4500000D */ bc1f .L80B735BC +/* 09BE4 80B73584 4500000D */ bc1f .L80B735BC /* 09BE8 80B73588 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 /* 09BEC 80B7358C 44816000 */ mtc1 $at, $f12 ## $f12 = 5.00 /* 09BF0 80B73590 0C00CFBE */ jal Math_Rand_ZeroFloat - + /* 09BF4 80B73594 00000000 */ nop -/* 09BF8 80B73598 4600010D */ trunc.w.s $f4, $f0 -/* 09BFC 80B7359C 44022000 */ mfc1 $v0, $f4 +/* 09BF8 80B73598 4600010D */ trunc.w.s $f4, $f0 +/* 09BFC 80B7359C 44022000 */ mfc1 $v0, $f4 /* 09C00 80B735A0 00000000 */ nop -/* 09C04 80B735A4 00021400 */ sll $v0, $v0, 16 -/* 09C08 80B735A8 00021403 */ sra $v0, $v0, 16 +/* 09C04 80B735A4 00021400 */ sll $v0, $v0, 16 +/* 09C08 80B735A8 00021403 */ sra $v0, $v0, 16 /* 09C0C 80B735AC 2442000F */ addiu $v0, $v0, 0x000F ## $v0 = 0000000F -/* 09C10 80B735B0 00021400 */ sll $v0, $v0, 16 -/* 09C14 80B735B4 10000020 */ beq $zero, $zero, .L80B73638 -/* 09C18 80B735B8 00021403 */ sra $v0, $v0, 16 +/* 09C10 80B735B0 00021400 */ sll $v0, $v0, 16 +/* 09C14 80B735B4 10000020 */ beq $zero, $zero, .L80B73638 +/* 09C18 80B735B8 00021403 */ sra $v0, $v0, 16 .L80B735BC: /* 09C1C 80B735BC 3C014248 */ lui $at, 0x4248 ## $at = 42480000 /* 09C20 80B735C0 44815000 */ mtc1 $at, $f10 ## $f10 = 50.00 /* 09C24 80B735C4 00000000 */ nop -/* 09C28 80B735C8 4600503C */ c.lt.s $f10, $f0 +/* 09C28 80B735C8 4600503C */ c.lt.s $f10, $f0 /* 09C2C 80B735CC 00000000 */ nop -/* 09C30 80B735D0 4500000D */ bc1f .L80B73608 +/* 09C30 80B735D0 4500000D */ bc1f .L80B73608 /* 09C34 80B735D4 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 /* 09C38 80B735D8 44816000 */ mtc1 $at, $f12 ## $f12 = 5.00 /* 09C3C 80B735DC 0C00CFBE */ jal Math_Rand_ZeroFloat - + /* 09C40 80B735E0 00000000 */ nop -/* 09C44 80B735E4 4600020D */ trunc.w.s $f8, $f0 -/* 09C48 80B735E8 44024000 */ mfc1 $v0, $f8 +/* 09C44 80B735E4 4600020D */ trunc.w.s $f8, $f0 +/* 09C48 80B735E8 44024000 */ mfc1 $v0, $f8 /* 09C4C 80B735EC 00000000 */ nop -/* 09C50 80B735F0 00021400 */ sll $v0, $v0, 16 -/* 09C54 80B735F4 00021403 */ sra $v0, $v0, 16 +/* 09C50 80B735F0 00021400 */ sll $v0, $v0, 16 +/* 09C54 80B735F4 00021403 */ sra $v0, $v0, 16 /* 09C58 80B735F8 24420011 */ addiu $v0, $v0, 0x0011 ## $v0 = 00000011 -/* 09C5C 80B735FC 00021400 */ sll $v0, $v0, 16 -/* 09C60 80B73600 1000000D */ beq $zero, $zero, .L80B73638 -/* 09C64 80B73604 00021403 */ sra $v0, $v0, 16 +/* 09C5C 80B735FC 00021400 */ sll $v0, $v0, 16 +/* 09C60 80B73600 1000000D */ beq $zero, $zero, .L80B73638 +/* 09C64 80B73604 00021403 */ sra $v0, $v0, 16 .L80B73608: /* 09C68 80B73608 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 /* 09C6C 80B7360C 44816000 */ mtc1 $at, $f12 ## $f12 = 5.00 /* 09C70 80B73610 0C00CFBE */ jal Math_Rand_ZeroFloat - + /* 09C74 80B73614 00000000 */ nop -/* 09C78 80B73618 4600018D */ trunc.w.s $f6, $f0 -/* 09C7C 80B7361C 44023000 */ mfc1 $v0, $f6 +/* 09C78 80B73618 4600018D */ trunc.w.s $f6, $f0 +/* 09C7C 80B7361C 44023000 */ mfc1 $v0, $f6 /* 09C80 80B73620 00000000 */ nop -/* 09C84 80B73624 00021400 */ sll $v0, $v0, 16 -/* 09C88 80B73628 00021403 */ sra $v0, $v0, 16 +/* 09C84 80B73624 00021400 */ sll $v0, $v0, 16 +/* 09C88 80B73628 00021403 */ sra $v0, $v0, 16 /* 09C8C 80B7362C 24420019 */ addiu $v0, $v0, 0x0019 ## $v0 = 00000019 -/* 09C90 80B73630 00021400 */ sll $v0, $v0, 16 -/* 09C94 80B73634 00021403 */ sra $v0, $v0, 16 +/* 09C90 80B73630 00021400 */ sll $v0, $v0, 16 +/* 09C94 80B73634 00021403 */ sra $v0, $v0, 16 .L80B73638: /* 09C98 80B73638 3C0180B8 */ lui $at, %hi(D_80B7E122) ## $at = 80B80000 -/* 09C9C 80B7363C A422E122 */ sh $v0, %lo(D_80B7E122)($at) -/* 09CA0 80B73640 00023080 */ sll $a2, $v0, 2 +/* 09C9C 80B7363C A422E122 */ sh $v0, %lo(D_80B7E122)($at) +/* 09CA0 80B73640 00023080 */ sll $a2, $v0, 2 /* 09CA4 80B73644 3C0180B8 */ lui $at, %hi(D_80B7E0A4) ## $at = 80B80000 -/* 09CA8 80B73648 00C23023 */ subu $a2, $a2, $v0 +/* 09CA8 80B73648 00C23023 */ subu $a2, $a2, $v0 /* 09CAC 80B7364C 44806000 */ mtc1 $zero, $f12 ## $f12 = 0.00 -/* 09CB0 80B73650 A422E0A4 */ sh $v0, %lo(D_80B7E0A4)($at) +/* 09CB0 80B73650 A422E0A4 */ sh $v0, %lo(D_80B7E0A4)($at) /* 09CB4 80B73654 30C600FF */ andi $a2, $a2, 0x00FF ## $a2 = 00000000 /* 09CB8 80B73658 240500B4 */ addiu $a1, $zero, 0x00B4 ## $a1 = 000000B4 -/* 09CBC 80B7365C 0C02A7DB */ jal func_800A9F6C +/* 09CBC 80B7365C 0C02A7DB */ jal func_800A9F6C /* 09CC0 80B73660 2407000A */ addiu $a3, $zero, 0x000A ## $a3 = 0000000A .L80B73664: /* 09CC4 80B73664 3C0180B8 */ lui $at, %hi(D_80B7E124) ## $at = 80B80000 -/* 09CC8 80B73668 A020E124 */ sb $zero, %lo(D_80B7E124)($at) +/* 09CC8 80B73668 A020E124 */ sb $zero, %lo(D_80B7E124)($at) /* 09CCC 80B7366C 3C0180B8 */ lui $at, %hi(D_80B7E116) ## $at = 80B80000 /* 09CD0 80B73670 240F0064 */ addiu $t7, $zero, 0x0064 ## $t7 = 00000064 -/* 09CD4 80B73674 A42FE116 */ sh $t7, %lo(D_80B7E116)($at) +/* 09CD4 80B73674 A42FE116 */ sh $t7, %lo(D_80B7E116)($at) /* 09CD8 80B73678 3C0180B8 */ lui $at, %hi(D_80B7E080) ## $at = 80B80000 -/* 09CDC 80B7367C 100006FE */ beq $zero, $zero, .L80B75278 -/* 09CE0 80B73680 A420E080 */ sh $zero, %lo(D_80B7E080)($at) +/* 09CDC 80B7367C 100006FE */ beq $zero, $zero, .L80B75278 +/* 09CE0 80B73680 A420E080 */ sh $zero, %lo(D_80B7E080)($at) glabel L80B73684 /* 09CE4 80B73684 24180032 */ addiu $t8, $zero, 0x0032 ## $t8 = 00000032 /* 09CE8 80B73688 3C1980B8 */ lui $t9, %hi(D_80B7E0B8) ## $t9 = 80B80000 /* 09CEC 80B7368C A2180151 */ sb $t8, 0x0151($s0) ## 00000151 /* 09CF0 80B73690 2739E0B8 */ addiu $t9, $t9, %lo(D_80B7E0B8) ## $t9 = 80B7E0B8 /* 09CF4 80B73694 8F2C0000 */ lw $t4, 0x0000($t9) ## 80B7E0B8 -/* 09CF8 80B73698 4406A000 */ mfc1 $a2, $f20 -/* 09CFC 80B7369C 4407A000 */ mfc1 $a3, $f20 +/* 09CF8 80B73698 4406A000 */ mfc1 $a2, $f20 +/* 09CFC 80B7369C 4407A000 */ mfc1 $a3, $f20 /* 09D00 80B736A0 AE0C01B4 */ sw $t4, 0x01B4($s0) ## 000001B4 /* 09D04 80B736A4 8F2A0004 */ lw $t2, 0x0004($t9) ## 80B7E0BC /* 09D08 80B736A8 26040068 */ addiu $a0, $s0, 0x0068 ## $a0 = 00000068 @@ -2308,43 +2308,43 @@ glabel L80B73684 /* 09D10 80B736B0 AE0A01B8 */ sw $t2, 0x01B8($s0) ## 000001B8 /* 09D14 80B736B4 8F2C0008 */ lw $t4, 0x0008($t9) ## 80B7E0C0 /* 09D18 80B736B8 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 09D1C 80B736BC AE0C01BC */ sw $t4, 0x01BC($s0) ## 000001BC /* 09D20 80B736C0 3C0980B8 */ lui $t1, %hi(D_80B7A694) ## $t1 = 80B80000 -/* 09D24 80B736C4 8529A694 */ lh $t1, %lo(D_80B7A694)($t1) +/* 09D24 80B736C4 8529A694 */ lh $t1, %lo(D_80B7A694)($t1) /* 09D28 80B736C8 24010003 */ addiu $at, $zero, 0x0003 ## $at = 00000003 -/* 09D2C 80B736CC 55210020 */ bnel $t1, $at, .L80B73750 +/* 09D2C 80B736CC 55210020 */ bnel $t1, $at, .L80B73750 /* 09D30 80B736D0 3C0144FA */ lui $at, 0x44FA ## $at = 44FA0000 /* 09D34 80B736D4 860B017A */ lh $t3, 0x017A($s0) ## 0000017A -/* 09D38 80B736D8 5160001D */ beql $t3, $zero, .L80B73750 +/* 09D38 80B736D8 5160001D */ beql $t3, $zero, .L80B73750 /* 09D3C 80B736DC 3C0144FA */ lui $at, 0x44FA ## $at = 44FA0000 /* 09D40 80B736E0 8E2D07C0 */ lw $t5, 0x07C0($s1) ## 000007C0 /* 09D44 80B736E4 3C0180B8 */ lui $at, %hi(D_80B7E0BC) ## $at = 80B80000 -/* 09D48 80B736E8 C430E0BC */ lwc1 $f16, %lo(D_80B7E0BC)($at) +/* 09D48 80B736E8 C430E0BC */ lwc1 $f16, %lo(D_80B7E0BC)($at) /* 09D4C 80B736EC 8DAE0028 */ lw $t6, 0x0028($t5) ## 00000028 /* 09D50 80B736F0 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 /* 09D54 80B736F4 44815000 */ mtc1 $at, $f10 ## $f10 = 5.00 /* 09D58 80B736F8 85CF0002 */ lh $t7, 0x0002($t6) ## 00000002 /* 09D5C 80B736FC 448F2000 */ mtc1 $t7, $f4 ## $f4 = 0.00 /* 09D60 80B73700 00000000 */ nop -/* 09D64 80B73704 468023A0 */ cvt.s.w $f14, $f4 -/* 09D68 80B73708 460A7200 */ add.s $f8, $f14, $f10 -/* 09D6C 80B7370C 4610403C */ c.lt.s $f8, $f16 +/* 09D64 80B73704 468023A0 */ cvt.s.w $f14, $f4 +/* 09D68 80B73708 460A7200 */ add.s $f8, $f14, $f10 +/* 09D6C 80B7370C 4610403C */ c.lt.s $f8, $f16 /* 09D70 80B73710 00000000 */ nop -/* 09D74 80B73714 4501000D */ bc1t .L80B7374C +/* 09D74 80B73714 4501000D */ bc1t .L80B7374C /* 09D78 80B73718 3C0180B8 */ lui $at, %hi(D_80B7E0B8) ## $at = 80B80000 -/* 09D7C 80B7371C C422E0B8 */ lwc1 $f2, %lo(D_80B7E0B8)($at) +/* 09D7C 80B7371C C422E0B8 */ lwc1 $f2, %lo(D_80B7E0B8)($at) /* 09D80 80B73720 3C0180B8 */ lui $at, %hi(D_80B7E0C0) ## $at = 80B80000 -/* 09D84 80B73724 C42CE0C0 */ lwc1 $f12, %lo(D_80B7E0C0)($at) -/* 09D88 80B73728 46021182 */ mul.s $f6, $f2, $f2 +/* 09D84 80B73724 C42CE0C0 */ lwc1 $f12, %lo(D_80B7E0C0)($at) +/* 09D88 80B73728 46021182 */ mul.s $f6, $f2, $f2 /* 09D8C 80B7372C 3C014448 */ lui $at, 0x4448 ## $at = 44480000 /* 09D90 80B73730 44815000 */ mtc1 $at, $f10 ## $f10 = 800.00 -/* 09D94 80B73734 460C6102 */ mul.s $f4, $f12, $f12 -/* 09D98 80B73738 46043000 */ add.s $f0, $f6, $f4 -/* 09D9C 80B7373C 46000004 */ sqrt.s $f0, $f0 -/* 09DA0 80B73740 4600503C */ c.lt.s $f10, $f0 +/* 09D94 80B73734 460C6102 */ mul.s $f4, $f12, $f12 +/* 09D98 80B73738 46043000 */ add.s $f0, $f6, $f4 +/* 09D9C 80B7373C 46000004 */ sqrt.s $f0, $f0 +/* 09DA0 80B73740 4600503C */ c.lt.s $f10, $f0 /* 09DA4 80B73744 00000000 */ nop -/* 09DA8 80B73748 45000008 */ bc1f .L80B7376C +/* 09DA8 80B73748 45000008 */ bc1f .L80B7376C .L80B7374C: /* 09DAC 80B7374C 3C0144FA */ lui $at, 0x44FA ## $at = 44FA0000 .L80B73750: @@ -2353,41 +2353,41 @@ glabel L80B73684 /* 09DB8 80B73758 A600017A */ sh $zero, 0x017A($s0) ## 0000017A /* 09DBC 80B7375C E6140190 */ swc1 $f20, 0x0190($s0) ## 00000190 /* 09DC0 80B73760 A6180158 */ sh $t8, 0x0158($s0) ## 00000158 -/* 09DC4 80B73764 100006C4 */ beq $zero, $zero, .L80B75278 +/* 09DC4 80B73764 100006C4 */ beq $zero, $zero, .L80B75278 /* 09DC8 80B73768 E6080194 */ swc1 $f8, 0x0194($s0) ## 00000194 .L80B7376C: /* 09DCC 80B7376C 3C014120 */ lui $at, 0x4120 ## $at = 41200000 /* 09DD0 80B73770 44812000 */ mtc1 $at, $f4 ## $f4 = 10.00 -/* 09DD4 80B73774 C7A60124 */ lwc1 $f6, 0x0124($sp) -/* 09DD8 80B73778 4604303C */ c.lt.s $f6, $f4 +/* 09DD4 80B73774 C7A60124 */ lwc1 $f6, 0x0124($sp) +/* 09DD8 80B73778 4604303C */ c.lt.s $f6, $f4 /* 09DDC 80B7377C 00000000 */ nop -/* 09DE0 80B73780 450006BD */ bc1f .L80B75278 +/* 09DE0 80B73780 450006BD */ bc1f .L80B75278 /* 09DE4 80B73784 3C014120 */ lui $at, 0x4120 ## $at = 41200000 /* 09DE8 80B73788 44815000 */ mtc1 $at, $f10 ## $f10 = 10.00 /* 09DEC 80B7378C 00000000 */ nop -/* 09DF0 80B73790 460A7201 */ sub.s $f8, $f14, $f10 -/* 09DF4 80B73794 4610403C */ c.lt.s $f8, $f16 +/* 09DF0 80B73790 460A7201 */ sub.s $f8, $f14, $f10 +/* 09DF4 80B73794 4610403C */ c.lt.s $f8, $f16 /* 09DF8 80B73798 00000000 */ nop -/* 09DFC 80B7379C 45000005 */ bc1f .L80B737B4 +/* 09DFC 80B7379C 45000005 */ bc1f .L80B737B4 /* 09E00 80B737A0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 09E04 80B737A4 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 09E08 80B737A8 2405288A */ addiu $a1, $zero, 0x288A ## $a1 = 0000288A -/* 09E0C 80B737AC 0C01E221 */ jal func_80078884 +/* 09E0C 80B737AC 0C01E221 */ jal func_80078884 /* 09E10 80B737B0 24040836 */ addiu $a0, $zero, 0x0836 ## $a0 = 00000836 .L80B737B4: /* 09E14 80B737B4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 09E18 80B737B8 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 09E1C 80B737BC 0C2DC28B */ jal func_80B70A2C +/* 09E1C 80B737BC 0C2DC28B */ jal func_80B70A2C /* 09E20 80B737C0 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 /* 09E24 80B737C4 24190005 */ addiu $t9, $zero, 0x0005 ## $t9 = 00000005 /* 09E28 80B737C8 A6190158 */ sh $t9, 0x0158($s0) ## 00000158 /* 09E2C 80B737CC 3C0180B8 */ lui $at, %hi(D_80B7B6A8) ## $at = 80B80000 -/* 09E30 80B737D0 C426B6A8 */ lwc1 $f6, %lo(D_80B7B6A8)($at) +/* 09E30 80B737D0 C426B6A8 */ lwc1 $f6, %lo(D_80B7B6A8)($at) /* 09E34 80B737D4 3C0180B8 */ lui $at, %hi(D_80B7B6AC) ## $at = 80B80000 /* 09E38 80B737D8 240A0096 */ addiu $t2, $zero, 0x0096 ## $t2 = 00000096 /* 09E3C 80B737DC E6060190 */ swc1 $f6, 0x0190($s0) ## 00000190 -/* 09E40 80B737E0 C424B6AC */ lwc1 $f4, %lo(D_80B7B6AC)($at) +/* 09E40 80B737E0 C424B6AC */ lwc1 $f4, %lo(D_80B7B6AC)($at) /* 09E44 80B737E4 240C0078 */ addiu $t4, $zero, 0x0078 ## $t4 = 00000078 /* 09E48 80B737E8 A60A017C */ sh $t2, 0x017C($s0) ## 0000017C /* 09E4C 80B737EC A600017A */ sh $zero, 0x017A($s0) ## 0000017A @@ -2396,47 +2396,47 @@ glabel L80B73684 /* 09E58 80B737F8 3C0180B8 */ lui $at, %hi(D_80B7A694) ## $at = 80B80000 /* 09E5C 80B737FC 24090004 */ addiu $t1, $zero, 0x0004 ## $t1 = 00000004 /* 09E60 80B73800 E6040194 */ swc1 $f4, 0x0194($s0) ## 00000194 -/* 09E64 80B73804 A429A694 */ sh $t1, %lo(D_80B7A694)($at) +/* 09E64 80B73804 A429A694 */ sh $t1, %lo(D_80B7A694)($at) /* 09E68 80B73808 3C0B80B8 */ lui $t3, %hi(D_80B7E0B6) ## $t3 = 80B80000 -/* 09E6C 80B7380C 916BE0B6 */ lbu $t3, %lo(D_80B7E0B6)($t3) +/* 09E6C 80B7380C 916BE0B6 */ lbu $t3, %lo(D_80B7E0B6)($t3) /* 09E70 80B73810 3C0180B8 */ lui $at, %hi(D_80B7E0A8) ## $at = 80B80000 -/* 09E74 80B73814 AC30E0A8 */ sw $s0, %lo(D_80B7E0A8)($at) +/* 09E74 80B73814 AC30E0A8 */ sw $s0, %lo(D_80B7E0A8)($at) /* 09E78 80B73818 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 09E7C 80B7381C 1561000D */ bne $t3, $at, .L80B73854 +/* 09E7C 80B7381C 1561000D */ bne $t3, $at, .L80B73854 /* 09E80 80B73820 240D001E */ addiu $t5, $zero, 0x001E ## $t5 = 0000001E /* 09E84 80B73824 3C0180B8 */ lui $at, %hi(D_80B7E122) ## $at = 80B80000 -/* 09E88 80B73828 A42DE122 */ sh $t5, %lo(D_80B7E122)($at) +/* 09E88 80B73828 A42DE122 */ sh $t5, %lo(D_80B7E122)($at) /* 09E8C 80B7382C 3C0180B8 */ lui $at, %hi(D_80B7E0A4) ## $at = 80B80000 /* 09E90 80B73830 240E0064 */ addiu $t6, $zero, 0x0064 ## $t6 = 00000064 /* 09E94 80B73834 44806000 */ mtc1 $zero, $f12 ## $f12 = 0.00 -/* 09E98 80B73838 A42EE0A4 */ sh $t6, %lo(D_80B7E0A4)($at) +/* 09E98 80B73838 A42EE0A4 */ sh $t6, %lo(D_80B7E0A4)($at) /* 09E9C 80B7383C 2405003C */ addiu $a1, $zero, 0x003C ## $a1 = 0000003C /* 09EA0 80B73840 2406005A */ addiu $a2, $zero, 0x005A ## $a2 = 0000005A -/* 09EA4 80B73844 0C02A7DB */ jal func_800A9F6C +/* 09EA4 80B73844 0C02A7DB */ jal func_800A9F6C /* 09EA8 80B73848 2407000A */ addiu $a3, $zero, 0x000A ## $a3 = 0000000A -/* 09EAC 80B7384C 1000000C */ beq $zero, $zero, .L80B73880 +/* 09EAC 80B7384C 1000000C */ beq $zero, $zero, .L80B73880 /* 09EB0 80B73850 00000000 */ nop .L80B73854: /* 09EB4 80B73854 240F001E */ addiu $t7, $zero, 0x001E ## $t7 = 0000001E /* 09EB8 80B73858 3C0180B8 */ lui $at, %hi(D_80B7E122) ## $at = 80B80000 -/* 09EBC 80B7385C A42FE122 */ sh $t7, %lo(D_80B7E122)($at) +/* 09EBC 80B7385C A42FE122 */ sh $t7, %lo(D_80B7E122)($at) /* 09EC0 80B73860 3C0180B8 */ lui $at, %hi(D_80B7E0A4) ## $at = 80B80000 /* 09EC4 80B73864 24180028 */ addiu $t8, $zero, 0x0028 ## $t8 = 00000028 /* 09EC8 80B73868 44806000 */ mtc1 $zero, $f12 ## $f12 = 0.00 -/* 09ECC 80B7386C A438E0A4 */ sh $t8, %lo(D_80B7E0A4)($at) +/* 09ECC 80B7386C A438E0A4 */ sh $t8, %lo(D_80B7E0A4)($at) /* 09ED0 80B73870 240500B4 */ addiu $a1, $zero, 0x00B4 ## $a1 = 000000B4 /* 09ED4 80B73874 2406005A */ addiu $a2, $zero, 0x005A ## $a2 = 0000005A -/* 09ED8 80B73878 0C02A7DB */ jal func_800A9F6C +/* 09ED8 80B73878 0C02A7DB */ jal func_800A9F6C /* 09EDC 80B7387C 2407000A */ addiu $a3, $zero, 0x000A ## $a3 = 0000000A .L80B73880: /* 09EE0 80B73880 3C0180B8 */ lui $at, %hi(D_80B7E124) ## $at = 80B80000 -/* 09EE4 80B73884 A020E124 */ sb $zero, %lo(D_80B7E124)($at) +/* 09EE4 80B73884 A020E124 */ sb $zero, %lo(D_80B7E124)($at) /* 09EE8 80B73888 3C0180B8 */ lui $at, %hi(D_80B7E116) ## $at = 80B80000 /* 09EEC 80B7388C 24190064 */ addiu $t9, $zero, 0x0064 ## $t9 = 00000064 -/* 09EF0 80B73890 A439E116 */ sh $t9, %lo(D_80B7E116)($at) +/* 09EF0 80B73890 A439E116 */ sh $t9, %lo(D_80B7E116)($at) /* 09EF4 80B73894 3C0180B8 */ lui $at, %hi(D_80B7E080) ## $at = 80B80000 -/* 09EF8 80B73898 10000677 */ beq $zero, $zero, .L80B75278 -/* 09EFC 80B7389C A420E080 */ sh $zero, %lo(D_80B7E080)($at) +/* 09EF8 80B73898 10000677 */ beq $zero, $zero, .L80B75278 +/* 09EFC 80B7389C A420E080 */ sh $zero, %lo(D_80B7E080)($at) glabel L80B738A0 /* 09F00 80B738A0 3C014496 */ lui $at, 0x4496 ## $at = 44960000 /* 09F04 80B738A4 44815000 */ mtc1 $at, $f10 ## $f10 = 1200.00 @@ -2455,324 +2455,324 @@ glabel L80B738A0 /* 09F38 80B738D8 C60601AC */ lwc1 $f6, 0x01AC($s0) ## 000001AC /* 09F3C 80B738DC 3C0480B8 */ lui $a0, %hi(D_80B7B1F0) ## $a0 = 80B80000 /* 09F40 80B738E0 2484B1F0 */ addiu $a0, $a0, %lo(D_80B7B1F0) ## $a0 = 80B7B1F0 -/* 09F44 80B738E4 46003124 */ cvt.w.s $f4, $f6 +/* 09F44 80B738E4 46003124 */ cvt.w.s $f4, $f6 /* 09F48 80B738E8 4445F800 */ cfc1 $a1, $31 /* 09F4C 80B738EC 00000000 */ nop /* 09F50 80B738F0 30A50078 */ andi $a1, $a1, 0x0078 ## $a1 = 00000000 -/* 09F54 80B738F4 10A00012 */ beq $a1, $zero, .L80B73940 +/* 09F54 80B738F4 10A00012 */ beq $a1, $zero, .L80B73940 /* 09F58 80B738F8 3C014F00 */ lui $at, 0x4F00 ## $at = 4F000000 /* 09F5C 80B738FC 44812000 */ mtc1 $at, $f4 ## $f4 = 2147483648.00 /* 09F60 80B73900 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 -/* 09F64 80B73904 46043101 */ sub.s $f4, $f6, $f4 +/* 09F64 80B73904 46043101 */ sub.s $f4, $f6, $f4 /* 09F68 80B73908 44C5F800 */ ctc1 $a1, $31 /* 09F6C 80B7390C 00000000 */ nop -/* 09F70 80B73910 46002124 */ cvt.w.s $f4, $f4 +/* 09F70 80B73910 46002124 */ cvt.w.s $f4, $f4 /* 09F74 80B73914 4445F800 */ cfc1 $a1, $31 /* 09F78 80B73918 00000000 */ nop /* 09F7C 80B7391C 30A50078 */ andi $a1, $a1, 0x0078 ## $a1 = 00000000 -/* 09F80 80B73920 14A00005 */ bne $a1, $zero, .L80B73938 +/* 09F80 80B73920 14A00005 */ bne $a1, $zero, .L80B73938 /* 09F84 80B73924 00000000 */ nop -/* 09F88 80B73928 44052000 */ mfc1 $a1, $f4 +/* 09F88 80B73928 44052000 */ mfc1 $a1, $f4 /* 09F8C 80B7392C 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 09F90 80B73930 10000007 */ beq $zero, $zero, .L80B73950 +/* 09F90 80B73930 10000007 */ beq $zero, $zero, .L80B73950 /* 09F94 80B73934 00A12825 */ or $a1, $a1, $at ## $a1 = 80000000 .L80B73938: -/* 09F98 80B73938 10000005 */ beq $zero, $zero, .L80B73950 +/* 09F98 80B73938 10000005 */ beq $zero, $zero, .L80B73950 /* 09F9C 80B7393C 2405FFFF */ addiu $a1, $zero, 0xFFFF ## $a1 = FFFFFFFF .L80B73940: -/* 09FA0 80B73940 44052000 */ mfc1 $a1, $f4 +/* 09FA0 80B73940 44052000 */ mfc1 $a1, $f4 /* 09FA4 80B73944 00000000 */ nop -/* 09FA8 80B73948 04A0FFFB */ bltz $a1, .L80B73938 +/* 09FA8 80B73948 04A0FFFB */ bltz $a1, .L80B73938 /* 09FAC 80B7394C 00000000 */ nop .L80B73950: /* 09FB0 80B73950 44C9F800 */ ctc1 $t1, $31 /* 09FB4 80B73954 0C00084C */ jal osSyncPrintf - + /* 09FB8 80B73958 30A500FF */ andi $a1, $a1, 0x00FF ## $a1 = 000000FF -/* 09FBC 80B7395C 8FA40040 */ lw $a0, 0x0040($sp) +/* 09FBC 80B7395C 8FA40040 */ lw $a0, 0x0040($sp) /* 09FC0 80B73960 24052AF8 */ addiu $a1, $zero, 0x2AF8 ## $a1 = 00002AF8 /* 09FC4 80B73964 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 /* 09FC8 80B73968 0C01E1EF */ jal Math_SmoothScaleMaxS - + /* 09FCC 80B7396C 24070BB8 */ addiu $a3, $zero, 0x0BB8 ## $a3 = 00000BB8 /* 09FD0 80B73970 3C0180B8 */ lui $at, %hi(D_80B7E0A8) ## $at = 80B80000 -/* 09FD4 80B73974 AC30E0A8 */ sw $s0, %lo(D_80B7E0A8)($at) +/* 09FD4 80B73974 AC30E0A8 */ sw $s0, %lo(D_80B7E0A8)($at) /* 09FD8 80B73978 8605008A */ lh $a1, 0x008A($s0) ## 0000008A /* 09FDC 80B7397C 34018000 */ ori $at, $zero, 0x8000 ## $at = 00008000 -/* 09FE0 80B73980 8FA400E0 */ lw $a0, 0x00E0($sp) -/* 09FE4 80B73984 00A12821 */ addu $a1, $a1, $at -/* 09FE8 80B73988 00052C00 */ sll $a1, $a1, 16 -/* 09FEC 80B7398C 00052C03 */ sra $a1, $a1, 16 +/* 09FE0 80B73980 8FA400E0 */ lw $a0, 0x00E0($sp) +/* 09FE4 80B73984 00A12821 */ addu $a1, $a1, $at +/* 09FE8 80B73988 00052C00 */ sll $a1, $a1, 16 +/* 09FEC 80B7398C 00052C03 */ sra $a1, $a1, 16 /* 09FF0 80B73990 24060005 */ addiu $a2, $zero, 0x0005 ## $a2 = 00000005 /* 09FF4 80B73994 24070500 */ addiu $a3, $zero, 0x0500 ## $a3 = 00000500 /* 09FF8 80B73998 0C01E1EF */ jal Math_SmoothScaleMaxS - + /* 09FFC 80B7399C 248400B6 */ addiu $a0, $a0, 0x00B6 ## $a0 = 000000B6 /* 0A000 80B739A0 3C0380B8 */ lui $v1, %hi(D_80B7E124) ## $v1 = 80B80000 -/* 0A004 80B739A4 9063E124 */ lbu $v1, %lo(D_80B7E124)($v1) -/* 0A008 80B739A8 1460000B */ bne $v1, $zero, .L80B739D8 +/* 0A004 80B739A4 9063E124 */ lbu $v1, %lo(D_80B7E124)($v1) +/* 0A008 80B739A8 1460000B */ bne $v1, $zero, .L80B739D8 /* 0A00C 80B739AC 3C0480B8 */ lui $a0, %hi(D_80B7FEA0) ## $a0 = 80B80000 /* 0A010 80B739B0 2484FEA0 */ addiu $a0, $a0, %lo(D_80B7FEA0) ## $a0 = 80B7FEA0 /* 0A014 80B739B4 84820000 */ lh $v0, 0x0000($a0) ## 80B7FEA0 -/* 0A018 80B739B8 28410014 */ slti $at, $v0, 0x0014 -/* 0A01C 80B739BC 10200006 */ beq $at, $zero, .L80B739D8 +/* 0A018 80B739B8 28410014 */ slti $at, $v0, 0x0014 +/* 0A01C 80B739BC 10200006 */ beq $at, $zero, .L80B739D8 /* 0A020 80B739C0 3C0B80B8 */ lui $t3, %hi(D_80B7E0AE) ## $t3 = 80B80000 -/* 0A024 80B739C4 856BE0AE */ lh $t3, %lo(D_80B7E0AE)($t3) +/* 0A024 80B739C4 856BE0AE */ lh $t3, %lo(D_80B7E0AE)($t3) /* 0A028 80B739C8 316D0003 */ andi $t5, $t3, 0x0003 ## $t5 = 00000000 -/* 0A02C 80B739CC 15A00002 */ bne $t5, $zero, .L80B739D8 +/* 0A02C 80B739CC 15A00002 */ bne $t5, $zero, .L80B739D8 /* 0A030 80B739D0 244E0001 */ addiu $t6, $v0, 0x0001 ## $t6 = 00000001 /* 0A034 80B739D4 A48E0000 */ sh $t6, 0x0000($a0) ## 80B7FEA0 .L80B739D8: /* 0A038 80B739D8 3C0F80B8 */ lui $t7, %hi(D_80B7E122) ## $t7 = 80B80000 -/* 0A03C 80B739DC 85EFE122 */ lh $t7, %lo(D_80B7E122)($t7) -/* 0A040 80B739E0 51E0009A */ beql $t7, $zero, .L80B73C4C +/* 0A03C 80B739DC 85EFE122 */ lh $t7, %lo(D_80B7E122)($t7) +/* 0A040 80B739E0 51E0009A */ beql $t7, $zero, .L80B73C4C /* 0A044 80B739E4 262B0014 */ addiu $t3, $s1, 0x0014 ## $t3 = 00000014 -/* 0A048 80B739E8 14600097 */ bne $v1, $zero, .L80B73C48 +/* 0A048 80B739E8 14600097 */ bne $v1, $zero, .L80B73C48 /* 0A04C 80B739EC 26230014 */ addiu $v1, $s1, 0x0014 ## $v1 = 00000014 /* 0A050 80B739F0 80620015 */ lb $v0, 0x0015($v1) ## 00000029 -/* 0A054 80B739F4 2841FFCE */ slti $at, $v0, 0xFFCE -/* 0A058 80B739F8 10200005 */ beq $at, $zero, .L80B73A10 +/* 0A054 80B739F4 2841FFCE */ slti $at, $v0, 0xFFCE +/* 0A058 80B739F8 10200005 */ beq $at, $zero, .L80B73A10 /* 0A05C 80B739FC 3C1880B8 */ lui $t8, %hi(D_80B7A6C8) ## $t8 = 80B80000 -/* 0A060 80B73A00 8718A6C8 */ lh $t8, %lo(D_80B7A6C8)($t8) -/* 0A064 80B73A04 2B01FFD9 */ slti $at, $t8, 0xFFD9 -/* 0A068 80B73A08 50200007 */ beql $at, $zero, .L80B73A28 -/* 0A06C 80B73A0C 2841FFCE */ slti $at, $v0, 0xFFCE +/* 0A060 80B73A00 8718A6C8 */ lh $t8, %lo(D_80B7A6C8)($t8) +/* 0A064 80B73A04 2B01FFD9 */ slti $at, $t8, 0xFFD9 +/* 0A068 80B73A08 50200007 */ beql $at, $zero, .L80B73A28 +/* 0A06C 80B73A0C 2841FFCE */ slti $at, $v0, 0xFFCE .L80B73A10: /* 0A070 80B73A10 9479000C */ lhu $t9, 0x000C($v1) ## 00000020 /* 0A074 80B73A14 3C01FFFF */ lui $at, 0xFFFF ## $at = FFFF0000 /* 0A078 80B73A18 34217FFF */ ori $at, $at, 0x7FFF ## $at = FFFF7FFF -/* 0A07C 80B73A1C 03215027 */ nor $t2, $t9, $at -/* 0A080 80B73A20 15400089 */ bne $t2, $zero, .L80B73C48 -/* 0A084 80B73A24 2841FFCE */ slti $at, $v0, 0xFFCE +/* 0A07C 80B73A1C 03215027 */ nor $t2, $t9, $at +/* 0A080 80B73A20 15400089 */ bne $t2, $zero, .L80B73C48 +/* 0A084 80B73A24 2841FFCE */ slti $at, $v0, 0xFFCE .L80B73A28: -/* 0A088 80B73A28 10200036 */ beq $at, $zero, .L80B73B04 +/* 0A088 80B73A28 10200036 */ beq $at, $zero, .L80B73B04 /* 0A08C 80B73A2C 3C0141F0 */ lui $at, 0x41F0 ## $at = 41F00000 /* 0A090 80B73A30 44814000 */ mtc1 $at, $f8 ## $f8 = 30.00 /* 0A094 80B73A34 C60A01AC */ lwc1 $f10, 0x01AC($s0) ## 000001AC /* 0A098 80B73A38 3C0180B8 */ lui $at, %hi(D_80B7B6B0) ## $at = 80B80000 -/* 0A09C 80B73A3C C424B6B0 */ lwc1 $f4, %lo(D_80B7B6B0)($at) -/* 0A0A0 80B73A40 46085181 */ sub.s $f6, $f10, $f8 +/* 0A09C 80B73A3C C424B6B0 */ lwc1 $f4, %lo(D_80B7B6B0)($at) +/* 0A0A0 80B73A40 46085181 */ sub.s $f6, $f10, $f8 /* 0A0A4 80B73A44 3C014220 */ lui $at, 0x4220 ## $at = 42200000 /* 0A0A8 80B73A48 44814000 */ mtc1 $at, $f8 ## $f8 = 40.00 -/* 0A0AC 80B73A4C 46043282 */ mul.s $f10, $f6, $f4 +/* 0A0AC 80B73A4C 46043282 */ mul.s $f10, $f6, $f4 /* 0A0B0 80B73A50 44803000 */ mtc1 $zero, $f6 ## $f6 = 0.00 -/* 0A0B4 80B73A54 460A4001 */ sub.s $f0, $f8, $f10 -/* 0A0B8 80B73A58 4600303C */ c.lt.s $f6, $f0 +/* 0A0B4 80B73A54 460A4001 */ sub.s $f0, $f8, $f10 +/* 0A0B8 80B73A58 4600303C */ c.lt.s $f6, $f0 /* 0A0BC 80B73A5C 00000000 */ nop -/* 0A0C0 80B73A60 45000028 */ bc1f .L80B73B04 +/* 0A0C0 80B73A60 45000028 */ bc1f .L80B73B04 /* 0A0C4 80B73A64 00000000 */ nop /* 0A0C8 80B73A68 444CF800 */ cfc1 $t4, $31 /* 0A0CC 80B73A6C 24090001 */ addiu $t1, $zero, 0x0001 ## $t1 = 00000001 /* 0A0D0 80B73A70 44C9F800 */ ctc1 $t1, $31 /* 0A0D4 80B73A74 00000000 */ nop -/* 0A0D8 80B73A78 46000124 */ cvt.w.s $f4, $f0 +/* 0A0D8 80B73A78 46000124 */ cvt.w.s $f4, $f0 /* 0A0DC 80B73A7C 4449F800 */ cfc1 $t1, $31 /* 0A0E0 80B73A80 00000000 */ nop /* 0A0E4 80B73A84 31290078 */ andi $t1, $t1, 0x0078 ## $t1 = 00000000 -/* 0A0E8 80B73A88 11200012 */ beq $t1, $zero, .L80B73AD4 +/* 0A0E8 80B73A88 11200012 */ beq $t1, $zero, .L80B73AD4 /* 0A0EC 80B73A8C 3C014F00 */ lui $at, 0x4F00 ## $at = 4F000000 /* 0A0F0 80B73A90 44812000 */ mtc1 $at, $f4 ## $f4 = 2147483648.00 /* 0A0F4 80B73A94 24090001 */ addiu $t1, $zero, 0x0001 ## $t1 = 00000001 -/* 0A0F8 80B73A98 46040101 */ sub.s $f4, $f0, $f4 +/* 0A0F8 80B73A98 46040101 */ sub.s $f4, $f0, $f4 /* 0A0FC 80B73A9C 44C9F800 */ ctc1 $t1, $31 /* 0A100 80B73AA0 00000000 */ nop -/* 0A104 80B73AA4 46002124 */ cvt.w.s $f4, $f4 +/* 0A104 80B73AA4 46002124 */ cvt.w.s $f4, $f4 /* 0A108 80B73AA8 4449F800 */ cfc1 $t1, $31 /* 0A10C 80B73AAC 00000000 */ nop /* 0A110 80B73AB0 31290078 */ andi $t1, $t1, 0x0078 ## $t1 = 00000000 -/* 0A114 80B73AB4 15200005 */ bne $t1, $zero, .L80B73ACC +/* 0A114 80B73AB4 15200005 */ bne $t1, $zero, .L80B73ACC /* 0A118 80B73AB8 00000000 */ nop -/* 0A11C 80B73ABC 44092000 */ mfc1 $t1, $f4 +/* 0A11C 80B73ABC 44092000 */ mfc1 $t1, $f4 /* 0A120 80B73AC0 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 0A124 80B73AC4 10000007 */ beq $zero, $zero, .L80B73AE4 +/* 0A124 80B73AC4 10000007 */ beq $zero, $zero, .L80B73AE4 /* 0A128 80B73AC8 01214825 */ or $t1, $t1, $at ## $t1 = 80000000 .L80B73ACC: -/* 0A12C 80B73ACC 10000005 */ beq $zero, $zero, .L80B73AE4 +/* 0A12C 80B73ACC 10000005 */ beq $zero, $zero, .L80B73AE4 /* 0A130 80B73AD0 2409FFFF */ addiu $t1, $zero, 0xFFFF ## $t1 = FFFFFFFF .L80B73AD4: -/* 0A134 80B73AD4 44092000 */ mfc1 $t1, $f4 +/* 0A134 80B73AD4 44092000 */ mfc1 $t1, $f4 /* 0A138 80B73AD8 00000000 */ nop -/* 0A13C 80B73ADC 0520FFFB */ bltz $t1, .L80B73ACC +/* 0A13C 80B73ADC 0520FFFB */ bltz $t1, .L80B73ACC /* 0A140 80B73AE0 00000000 */ nop .L80B73AE4: /* 0A144 80B73AE4 860B008A */ lh $t3, 0x008A($s0) ## 0000008A /* 0A148 80B73AE8 860D00B6 */ lh $t5, 0x00B6($s0) ## 000000B6 /* 0A14C 80B73AEC 44CCF800 */ ctc1 $t4, $31 /* 0A150 80B73AF0 240F0001 */ addiu $t7, $zero, 0x0001 ## $t7 = 00000001 -/* 0A154 80B73AF4 016D7023 */ subu $t6, $t3, $t5 +/* 0A154 80B73AF4 016D7023 */ subu $t6, $t3, $t5 /* 0A158 80B73AF8 A2090152 */ sb $t1, 0x0152($s0) ## 00000152 /* 0A15C 80B73AFC A60E0154 */ sh $t6, 0x0154($s0) ## 00000154 /* 0A160 80B73B00 A20F0156 */ sb $t7, 0x0156($s0) ## 00000156 .L80B73B04: /* 0A164 80B73B04 3C0180B8 */ lui $at, %hi(D_80B7B6B4) ## $at = 80B80000 -/* 0A168 80B73B08 C428B6B4 */ lwc1 $f8, %lo(D_80B7B6B4)($at) +/* 0A168 80B73B08 C428B6B4 */ lwc1 $f8, %lo(D_80B7B6B4)($at) /* 0A16C 80B73B0C 3C0180B8 */ lui $at, %hi(D_80B7B6B8) ## $at = 80B80000 /* 0A170 80B73B10 24180001 */ addiu $t8, $zero, 0x0001 ## $t8 = 00000001 /* 0A174 80B73B14 E6080198 */ swc1 $f8, 0x0198($s0) ## 00000198 -/* 0A178 80B73B18 C42AB6B8 */ lwc1 $f10, %lo(D_80B7B6B8)($at) +/* 0A178 80B73B18 C42AB6B8 */ lwc1 $f10, %lo(D_80B7B6B8)($at) /* 0A17C 80B73B1C 3C0180B8 */ lui $at, %hi(D_80B7E124) ## $at = 80B80000 /* 0A180 80B73B20 2404081A */ addiu $a0, $zero, 0x081A ## $a0 = 0000081A /* 0A184 80B73B24 E60A019C */ swc1 $f10, 0x019C($s0) ## 0000019C /* 0A188 80B73B28 0C03E803 */ jal Audio_SetBGM - -/* 0A18C 80B73B2C A038E124 */ sb $t8, %lo(D_80B7E124)($at) + +/* 0A18C 80B73B2C A038E124 */ sb $t8, %lo(D_80B7E124)($at) /* 0A190 80B73B30 3C0180B8 */ lui $at, %hi(D_80B7E0A6) ## $at = 80B80000 -/* 0A194 80B73B34 A420E0A6 */ sh $zero, %lo(D_80B7E0A6)($at) +/* 0A194 80B73B34 A420E0A6 */ sh $zero, %lo(D_80B7E0A6)($at) /* 0A198 80B73B38 92190150 */ lbu $t9, 0x0150($s0) ## 00000150 /* 0A19C 80B73B3C 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 0A1A0 80B73B40 17210008 */ bne $t9, $at, .L80B73B64 +/* 0A1A0 80B73B40 17210008 */ bne $t9, $at, .L80B73B64 /* 0A1A4 80B73B44 3C014040 */ lui $at, 0x4040 ## $at = 40400000 /* 0A1A8 80B73B48 44812000 */ mtc1 $at, $f4 ## $f4 = 3.00 /* 0A1AC 80B73B4C C60601AC */ lwc1 $f6, 0x01AC($s0) ## 000001AC /* 0A1B0 80B73B50 3C0142F0 */ lui $at, 0x42F0 ## $at = 42F00000 /* 0A1B4 80B73B54 44815000 */ mtc1 $at, $f10 ## $f10 = 120.00 -/* 0A1B8 80B73B58 46043202 */ mul.s $f8, $f6, $f4 -/* 0A1BC 80B73B5C 10000006 */ beq $zero, $zero, .L80B73B78 -/* 0A1C0 80B73B60 460A4080 */ add.s $f2, $f8, $f10 +/* 0A1B8 80B73B58 46043202 */ mul.s $f8, $f6, $f4 +/* 0A1BC 80B73B5C 10000006 */ beq $zero, $zero, .L80B73B78 +/* 0A1C0 80B73B60 460A4080 */ add.s $f2, $f8, $f10 .L80B73B64: /* 0A1C4 80B73B64 C60001AC */ lwc1 $f0, 0x01AC($s0) ## 000001AC /* 0A1C8 80B73B68 3C0142F0 */ lui $at, 0x42F0 ## $at = 42F00000 /* 0A1CC 80B73B6C 44812000 */ mtc1 $at, $f4 ## $f4 = 120.00 -/* 0A1D0 80B73B70 46000180 */ add.s $f6, $f0, $f0 -/* 0A1D4 80B73B74 46043080 */ add.s $f2, $f6, $f4 +/* 0A1D0 80B73B70 46000180 */ add.s $f6, $f0, $f0 +/* 0A1D4 80B73B74 46043080 */ add.s $f2, $f6, $f4 .L80B73B78: /* 0A1D8 80B73B78 3C01437F */ lui $at, 0x437F ## $at = 437F0000 /* 0A1DC 80B73B7C 44810000 */ mtc1 $at, $f0 ## $f0 = 255.00 /* 0A1E0 80B73B80 00000000 */ nop -/* 0A1E4 80B73B84 4602003C */ c.lt.s $f0, $f2 +/* 0A1E4 80B73B84 4602003C */ c.lt.s $f0, $f2 /* 0A1E8 80B73B88 00000000 */ nop -/* 0A1EC 80B73B8C 45020003 */ bc1fl .L80B73B9C +/* 0A1EC 80B73B8C 45020003 */ bc1fl .L80B73B9C /* 0A1F0 80B73B90 444AF800 */ cfc1 $t2, $31 -/* 0A1F4 80B73B94 46000086 */ mov.s $f2, $f0 +/* 0A1F4 80B73B94 46000086 */ mov.s $f2, $f0 /* 0A1F8 80B73B98 444AF800 */ cfc1 $t2, $31 .L80B73B9C: /* 0A1FC 80B73B9C 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 /* 0A200 80B73BA0 44C5F800 */ ctc1 $a1, $31 /* 0A204 80B73BA4 44806000 */ mtc1 $zero, $f12 ## $f12 = 0.00 -/* 0A208 80B73BA8 46001224 */ cvt.w.s $f8, $f2 +/* 0A208 80B73BA8 46001224 */ cvt.w.s $f8, $f2 /* 0A20C 80B73BAC 4445F800 */ cfc1 $a1, $31 /* 0A210 80B73BB0 00000000 */ nop /* 0A214 80B73BB4 30A50078 */ andi $a1, $a1, 0x0078 ## $a1 = 00000000 -/* 0A218 80B73BB8 10A00012 */ beq $a1, $zero, .L80B73C04 +/* 0A218 80B73BB8 10A00012 */ beq $a1, $zero, .L80B73C04 /* 0A21C 80B73BBC 3C014F00 */ lui $at, 0x4F00 ## $at = 4F000000 /* 0A220 80B73BC0 44814000 */ mtc1 $at, $f8 ## $f8 = 2147483648.00 /* 0A224 80B73BC4 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 -/* 0A228 80B73BC8 46081201 */ sub.s $f8, $f2, $f8 +/* 0A228 80B73BC8 46081201 */ sub.s $f8, $f2, $f8 /* 0A22C 80B73BCC 44C5F800 */ ctc1 $a1, $31 /* 0A230 80B73BD0 00000000 */ nop -/* 0A234 80B73BD4 46004224 */ cvt.w.s $f8, $f8 +/* 0A234 80B73BD4 46004224 */ cvt.w.s $f8, $f8 /* 0A238 80B73BD8 4445F800 */ cfc1 $a1, $31 /* 0A23C 80B73BDC 00000000 */ nop /* 0A240 80B73BE0 30A50078 */ andi $a1, $a1, 0x0078 ## $a1 = 00000000 -/* 0A244 80B73BE4 14A00005 */ bne $a1, $zero, .L80B73BFC +/* 0A244 80B73BE4 14A00005 */ bne $a1, $zero, .L80B73BFC /* 0A248 80B73BE8 00000000 */ nop -/* 0A24C 80B73BEC 44054000 */ mfc1 $a1, $f8 +/* 0A24C 80B73BEC 44054000 */ mfc1 $a1, $f8 /* 0A250 80B73BF0 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 0A254 80B73BF4 10000007 */ beq $zero, $zero, .L80B73C14 +/* 0A254 80B73BF4 10000007 */ beq $zero, $zero, .L80B73C14 /* 0A258 80B73BF8 00A12825 */ or $a1, $a1, $at ## $a1 = 80000000 .L80B73BFC: -/* 0A25C 80B73BFC 10000005 */ beq $zero, $zero, .L80B73C14 +/* 0A25C 80B73BFC 10000005 */ beq $zero, $zero, .L80B73C14 /* 0A260 80B73C00 2405FFFF */ addiu $a1, $zero, 0xFFFF ## $a1 = FFFFFFFF .L80B73C04: -/* 0A264 80B73C04 44054000 */ mfc1 $a1, $f8 +/* 0A264 80B73C04 44054000 */ mfc1 $a1, $f8 /* 0A268 80B73C08 00000000 */ nop -/* 0A26C 80B73C0C 04A0FFFB */ bltz $a1, .L80B73BFC +/* 0A26C 80B73C0C 04A0FFFB */ bltz $a1, .L80B73BFC /* 0A270 80B73C10 00000000 */ nop .L80B73C14: /* 0A274 80B73C14 44CAF800 */ ctc1 $t2, $31 /* 0A278 80B73C18 30A500FF */ andi $a1, $a1, 0x00FF ## $a1 = 000000FF /* 0A27C 80B73C1C 24060078 */ addiu $a2, $zero, 0x0078 ## $a2 = 00000078 -/* 0A280 80B73C20 0C02A7DB */ jal func_800A9F6C +/* 0A280 80B73C20 0C02A7DB */ jal func_800A9F6C /* 0A284 80B73C24 24070005 */ addiu $a3, $zero, 0x0005 ## $a3 = 00000005 /* 0A288 80B73C28 240C0028 */ addiu $t4, $zero, 0x0028 ## $t4 = 00000028 /* 0A28C 80B73C2C 3C0180B8 */ lui $at, %hi(D_80B7E0A4) ## $at = 80B80000 -/* 0A290 80B73C30 A42CE0A4 */ sh $t4, %lo(D_80B7E0A4)($at) +/* 0A290 80B73C30 A42CE0A4 */ sh $t4, %lo(D_80B7E0A4)($at) /* 0A294 80B73C34 3C0180B8 */ lui $at, %hi(D_80B7FDA8) ## $at = 80B80000 /* 0A298 80B73C38 2409000A */ addiu $t1, $zero, 0x000A ## $t1 = 0000000A -/* 0A29C 80B73C3C A029FDA8 */ sb $t1, %lo(D_80B7FDA8)($at) -/* 0A2A0 80B73C40 0C01E221 */ jal func_80078884 +/* 0A29C 80B73C3C A029FDA8 */ sb $t1, %lo(D_80B7FDA8)($at) +/* 0A2A0 80B73C40 0C01E221 */ jal func_80078884 /* 0A2A4 80B73C44 2404184A */ addiu $a0, $zero, 0x184A ## $a0 = 0000184A .L80B73C48: /* 0A2A8 80B73C48 262B0014 */ addiu $t3, $s1, 0x0014 ## $t3 = 00000014 .L80B73C4C: -/* 0A2AC 80B73C4C AFAB004C */ sw $t3, 0x004C($sp) +/* 0A2AC 80B73C4C AFAB004C */ sw $t3, 0x004C($sp) /* 0A2B0 80B73C50 8E2D07C0 */ lw $t5, 0x07C0($s1) ## 000007C0 /* 0A2B4 80B73C54 C60A0028 */ lwc1 $f10, 0x0028($s0) ## 00000028 /* 0A2B8 80B73C58 8DAE0028 */ lw $t6, 0x0028($t5) ## 00000028 /* 0A2BC 80B73C5C 85CF0002 */ lh $t7, 0x0002($t6) ## 00000002 /* 0A2C0 80B73C60 448F3000 */ mtc1 $t7, $f6 ## $f6 = 0.00 /* 0A2C4 80B73C64 00000000 */ nop -/* 0A2C8 80B73C68 46803120 */ cvt.s.w $f4, $f6 -/* 0A2CC 80B73C6C 4604503C */ c.lt.s $f10, $f4 +/* 0A2C8 80B73C68 46803120 */ cvt.s.w $f4, $f6 +/* 0A2CC 80B73C6C 4604503C */ c.lt.s $f10, $f4 /* 0A2D0 80B73C70 00000000 */ nop -/* 0A2D4 80B73C74 450001B0 */ bc1f .L80B74338 +/* 0A2D4 80B73C74 450001B0 */ bc1f .L80B74338 /* 0A2D8 80B73C78 00000000 */ nop /* 0A2DC 80B73C7C 8618017C */ lh $t8, 0x017C($s0) ## 0000017C -/* 0A2E0 80B73C80 2B01001F */ slti $at, $t8, 0x001F -/* 0A2E4 80B73C84 54200004 */ bnel $at, $zero, .L80B73C98 +/* 0A2E0 80B73C80 2B01001F */ slti $at, $t8, 0x001F +/* 0A2E4 80B73C84 54200004 */ bnel $at, $zero, .L80B73C98 /* 0A2E8 80B73C88 2402000F */ addiu $v0, $zero, 0x000F ## $v0 = 0000000F -/* 0A2EC 80B73C8C 10000002 */ beq $zero, $zero, .L80B73C98 +/* 0A2EC 80B73C8C 10000002 */ beq $zero, $zero, .L80B73C98 /* 0A2F0 80B73C90 24020007 */ addiu $v0, $zero, 0x0007 ## $v0 = 00000007 /* 0A2F4 80B73C94 2402000F */ addiu $v0, $zero, 0x000F ## $v0 = 0000000F .L80B73C98: /* 0A2F8 80B73C98 8619015C */ lh $t9, 0x015C($s0) ## 0000015C -/* 0A2FC 80B73C9C 03225024 */ and $t2, $t9, $v0 -/* 0A300 80B73CA0 5540006E */ bnel $t2, $zero, .L80B73E5C +/* 0A2FC 80B73C9C 03225024 */ and $t2, $t9, $v0 +/* 0A300 80B73CA0 5540006E */ bnel $t2, $zero, .L80B73E5C /* 0A304 80B73CA4 8602017C */ lh $v0, 0x017C($s0) ## 0000017C /* 0A308 80B73CA8 0C03F66B */ jal Math_Rand_ZeroOne ## Rand.Next() float -/* 0A30C 80B73CAC AFA20048 */ sw $v0, 0x0048($sp) +/* 0A30C 80B73CAC AFA20048 */ sw $v0, 0x0048($sp) /* 0A310 80B73CB0 3C013F40 */ lui $at, 0x3F40 ## $at = 3F400000 /* 0A314 80B73CB4 44814000 */ mtc1 $at, $f8 ## $f8 = 0.75 -/* 0A318 80B73CB8 8FA30048 */ lw $v1, 0x0048($sp) -/* 0A31C 80B73CBC 4608003C */ c.lt.s $f0, $f8 +/* 0A318 80B73CB8 8FA30048 */ lw $v1, 0x0048($sp) +/* 0A31C 80B73CBC 4608003C */ c.lt.s $f0, $f8 /* 0A320 80B73CC0 00000000 */ nop -/* 0A324 80B73CC4 45000064 */ bc1f .L80B73E58 +/* 0A324 80B73CC4 45000064 */ bc1f .L80B73E58 /* 0A328 80B73CC8 3C0C80B8 */ lui $t4, %hi(D_80B7E0A4) ## $t4 = 80B80000 -/* 0A32C 80B73CCC 858CE0A4 */ lh $t4, %lo(D_80B7E0A4)($t4) -/* 0A330 80B73CD0 15800061 */ bne $t4, $zero, .L80B73E58 +/* 0A32C 80B73CCC 858CE0A4 */ lh $t4, %lo(D_80B7E0A4)($t4) +/* 0A330 80B73CD0 15800061 */ bne $t4, $zero, .L80B73E58 /* 0A334 80B73CD4 3C01428C */ lui $at, 0x428C ## $at = 428C0000 /* 0A338 80B73CD8 44813000 */ mtc1 $at, $f6 ## $f6 = 70.00 /* 0A33C 80B73CDC C60001AC */ lwc1 $f0, 0x01AC($s0) ## 000001AC -/* 0A340 80B73CE0 4600303E */ c.le.s $f6, $f0 +/* 0A340 80B73CE0 4600303E */ c.le.s $f6, $f0 /* 0A344 80B73CE4 00000000 */ nop -/* 0A348 80B73CE8 45000004 */ bc1f .L80B73CFC +/* 0A348 80B73CE8 45000004 */ bc1f .L80B73CFC /* 0A34C 80B73CEC 3C01437F */ lui $at, 0x437F ## $at = 437F0000 /* 0A350 80B73CF0 44811000 */ mtc1 $at, $f2 ## $f2 = 255.00 -/* 0A354 80B73CF4 10000023 */ beq $zero, $zero, .L80B73D84 +/* 0A354 80B73CF4 10000023 */ beq $zero, $zero, .L80B73D84 /* 0A358 80B73CF8 2401000F */ addiu $at, $zero, 0x000F ## $at = 0000000F .L80B73CFC: /* 0A35C 80B73CFC 3C014270 */ lui $at, 0x4270 ## $at = 42700000 /* 0A360 80B73D00 44815000 */ mtc1 $at, $f10 ## $f10 = 60.00 /* 0A364 80B73D04 00000000 */ nop -/* 0A368 80B73D08 4600503E */ c.le.s $f10, $f0 +/* 0A368 80B73D08 4600503E */ c.le.s $f10, $f0 /* 0A36C 80B73D0C 00000000 */ nop -/* 0A370 80B73D10 45000004 */ bc1f .L80B73D24 +/* 0A370 80B73D10 45000004 */ bc1f .L80B73D24 /* 0A374 80B73D14 3C014366 */ lui $at, 0x4366 ## $at = 43660000 /* 0A378 80B73D18 44811000 */ mtc1 $at, $f2 ## $f2 = 230.00 -/* 0A37C 80B73D1C 10000019 */ beq $zero, $zero, .L80B73D84 +/* 0A37C 80B73D1C 10000019 */ beq $zero, $zero, .L80B73D84 /* 0A380 80B73D20 2401000F */ addiu $at, $zero, 0x000F ## $at = 0000000F .L80B73D24: /* 0A384 80B73D24 3C014248 */ lui $at, 0x4248 ## $at = 42480000 /* 0A388 80B73D28 44812000 */ mtc1 $at, $f4 ## $f4 = 50.00 /* 0A38C 80B73D2C 00000000 */ nop -/* 0A390 80B73D30 4600203E */ c.le.s $f4, $f0 +/* 0A390 80B73D30 4600203E */ c.le.s $f4, $f0 /* 0A394 80B73D34 00000000 */ nop -/* 0A398 80B73D38 45000004 */ bc1f .L80B73D4C +/* 0A398 80B73D38 45000004 */ bc1f .L80B73D4C /* 0A39C 80B73D3C 3C014348 */ lui $at, 0x4348 ## $at = 43480000 /* 0A3A0 80B73D40 44811000 */ mtc1 $at, $f2 ## $f2 = 200.00 -/* 0A3A4 80B73D44 1000000F */ beq $zero, $zero, .L80B73D84 +/* 0A3A4 80B73D44 1000000F */ beq $zero, $zero, .L80B73D84 /* 0A3A8 80B73D48 2401000F */ addiu $at, $zero, 0x000F ## $at = 0000000F .L80B73D4C: /* 0A3AC 80B73D4C 3C014220 */ lui $at, 0x4220 ## $at = 42200000 /* 0A3B0 80B73D50 44814000 */ mtc1 $at, $f8 ## $f8 = 40.00 /* 0A3B4 80B73D54 00000000 */ nop -/* 0A3B8 80B73D58 4600403E */ c.le.s $f8, $f0 +/* 0A3B8 80B73D58 4600403E */ c.le.s $f8, $f0 /* 0A3BC 80B73D5C 00000000 */ nop -/* 0A3C0 80B73D60 45000004 */ bc1f .L80B73D74 +/* 0A3C0 80B73D60 45000004 */ bc1f .L80B73D74 /* 0A3C4 80B73D64 3C01432A */ lui $at, 0x432A ## $at = 432A0000 /* 0A3C8 80B73D68 44811000 */ mtc1 $at, $f2 ## $f2 = 170.00 -/* 0A3CC 80B73D6C 10000005 */ beq $zero, $zero, .L80B73D84 +/* 0A3CC 80B73D6C 10000005 */ beq $zero, $zero, .L80B73D84 /* 0A3D0 80B73D70 2401000F */ addiu $at, $zero, 0x000F ## $at = 0000000F .L80B73D74: /* 0A3D4 80B73D74 3C01430C */ lui $at, 0x430C ## $at = 430C0000 @@ -2780,163 +2780,163 @@ glabel L80B738A0 /* 0A3DC 80B73D7C 00000000 */ nop /* 0A3E0 80B73D80 2401000F */ addiu $at, $zero, 0x000F ## $at = 0000000F .L80B73D84: -/* 0A3E4 80B73D84 14610005 */ bne $v1, $at, .L80B73D9C +/* 0A3E4 80B73D84 14610005 */ bne $v1, $at, .L80B73D9C /* 0A3E8 80B73D88 3C013F40 */ lui $at, 0x3F40 ## $at = 3F400000 /* 0A3EC 80B73D8C 44813000 */ mtc1 $at, $f6 ## $f6 = 0.75 /* 0A3F0 80B73D90 00000000 */ nop -/* 0A3F4 80B73D94 46061082 */ mul.s $f2, $f2, $f6 +/* 0A3F4 80B73D94 46061082 */ mul.s $f2, $f2, $f6 /* 0A3F8 80B73D98 00000000 */ nop .L80B73D9C: /* 0A3FC 80B73D9C 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 /* 0A400 80B73DA0 44816000 */ mtc1 $at, $f12 ## $f12 = 5.00 /* 0A404 80B73DA4 0C00CFBE */ jal Math_Rand_ZeroFloat - -/* 0A408 80B73DA8 E7A200A4 */ swc1 $f2, 0x00A4($sp) + +/* 0A408 80B73DA8 E7A200A4 */ swc1 $f2, 0x00A4($sp) /* 0A40C 80B73DAC 4449F800 */ cfc1 $t1, $31 /* 0A410 80B73DB0 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 /* 0A414 80B73DB4 44C5F800 */ ctc1 $a1, $31 -/* 0A418 80B73DB8 C7A200A4 */ lwc1 $f2, 0x00A4($sp) +/* 0A418 80B73DB8 C7A200A4 */ lwc1 $f2, 0x00A4($sp) /* 0A41C 80B73DBC 44806000 */ mtc1 $zero, $f12 ## $f12 = 0.00 -/* 0A420 80B73DC0 460012A4 */ cvt.w.s $f10, $f2 +/* 0A420 80B73DC0 460012A4 */ cvt.w.s $f10, $f2 /* 0A424 80B73DC4 4445F800 */ cfc1 $a1, $31 /* 0A428 80B73DC8 00000000 */ nop /* 0A42C 80B73DCC 30A50078 */ andi $a1, $a1, 0x0078 ## $a1 = 00000000 -/* 0A430 80B73DD0 10A00012 */ beq $a1, $zero, .L80B73E1C +/* 0A430 80B73DD0 10A00012 */ beq $a1, $zero, .L80B73E1C /* 0A434 80B73DD4 3C014F00 */ lui $at, 0x4F00 ## $at = 4F000000 /* 0A438 80B73DD8 44815000 */ mtc1 $at, $f10 ## $f10 = 2147483648.00 /* 0A43C 80B73DDC 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 -/* 0A440 80B73DE0 460A1281 */ sub.s $f10, $f2, $f10 +/* 0A440 80B73DE0 460A1281 */ sub.s $f10, $f2, $f10 /* 0A444 80B73DE4 44C5F800 */ ctc1 $a1, $31 /* 0A448 80B73DE8 00000000 */ nop -/* 0A44C 80B73DEC 460052A4 */ cvt.w.s $f10, $f10 +/* 0A44C 80B73DEC 460052A4 */ cvt.w.s $f10, $f10 /* 0A450 80B73DF0 4445F800 */ cfc1 $a1, $31 /* 0A454 80B73DF4 00000000 */ nop /* 0A458 80B73DF8 30A50078 */ andi $a1, $a1, 0x0078 ## $a1 = 00000000 -/* 0A45C 80B73DFC 14A00005 */ bne $a1, $zero, .L80B73E14 +/* 0A45C 80B73DFC 14A00005 */ bne $a1, $zero, .L80B73E14 /* 0A460 80B73E00 00000000 */ nop -/* 0A464 80B73E04 44055000 */ mfc1 $a1, $f10 +/* 0A464 80B73E04 44055000 */ mfc1 $a1, $f10 /* 0A468 80B73E08 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 0A46C 80B73E0C 10000007 */ beq $zero, $zero, .L80B73E2C +/* 0A46C 80B73E0C 10000007 */ beq $zero, $zero, .L80B73E2C /* 0A470 80B73E10 00A12825 */ or $a1, $a1, $at ## $a1 = 80000000 .L80B73E14: -/* 0A474 80B73E14 10000005 */ beq $zero, $zero, .L80B73E2C +/* 0A474 80B73E14 10000005 */ beq $zero, $zero, .L80B73E2C /* 0A478 80B73E18 2405FFFF */ addiu $a1, $zero, 0xFFFF ## $a1 = FFFFFFFF .L80B73E1C: -/* 0A47C 80B73E1C 44055000 */ mfc1 $a1, $f10 +/* 0A47C 80B73E1C 44055000 */ mfc1 $a1, $f10 /* 0A480 80B73E20 00000000 */ nop -/* 0A484 80B73E24 04A0FFFB */ bltz $a1, .L80B73E14 +/* 0A484 80B73E24 04A0FFFB */ bltz $a1, .L80B73E14 /* 0A488 80B73E28 00000000 */ nop .L80B73E2C: /* 0A48C 80B73E2C 44C9F800 */ ctc1 $t1, $31 /* 0A490 80B73E30 30A500FF */ andi $a1, $a1, 0x00FF ## $a1 = 000000FF /* 0A494 80B73E34 24070005 */ addiu $a3, $zero, 0x0005 ## $a3 = 00000005 -/* 0A498 80B73E38 4600010D */ trunc.w.s $f4, $f0 -/* 0A49C 80B73E3C 44062000 */ mfc1 $a2, $f4 +/* 0A498 80B73E38 4600010D */ trunc.w.s $f4, $f0 +/* 0A49C 80B73E3C 44062000 */ mfc1 $a2, $f4 /* 0A4A0 80B73E40 00000000 */ nop -/* 0A4A4 80B73E44 00063400 */ sll $a2, $a2, 16 -/* 0A4A8 80B73E48 00063403 */ sra $a2, $a2, 16 +/* 0A4A4 80B73E44 00063400 */ sll $a2, $a2, 16 +/* 0A4A8 80B73E48 00063403 */ sra $a2, $a2, 16 /* 0A4AC 80B73E4C 24C6000A */ addiu $a2, $a2, 0x000A ## $a2 = 0000000A -/* 0A4B0 80B73E50 0C02A7DB */ jal func_800A9F6C +/* 0A4B0 80B73E50 0C02A7DB */ jal func_800A9F6C /* 0A4B4 80B73E54 30C600FF */ andi $a2, $a2, 0x00FF ## $a2 = 0000000A .L80B73E58: /* 0A4B8 80B73E58 8602017C */ lh $v0, 0x017C($s0) ## 0000017C .L80B73E5C: -/* 0A4BC 80B73E5C 2841001F */ slti $at, $v0, 0x001F -/* 0A4C0 80B73E60 542000CF */ bnel $at, $zero, .L80B741A0 +/* 0A4BC 80B73E5C 2841001F */ slti $at, $v0, 0x001F +/* 0A4C0 80B73E60 542000CF */ bnel $at, $zero, .L80B741A0 /* 0A4C4 80B73E64 3058000F */ andi $t8, $v0, 0x000F ## $t8 = 00000000 /* 0A4C8 80B73E68 860D017A */ lh $t5, 0x017A($s0) ## 0000017A -/* 0A4CC 80B73E6C 55A00081 */ bnel $t5, $zero, .L80B74074 +/* 0A4CC 80B73E6C 55A00081 */ bnel $t5, $zero, .L80B74074 /* 0A4D0 80B73E70 860B017E */ lh $t3, 0x017E($s0) ## 0000017E /* 0A4D4 80B73E74 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 /* 0A4D8 80B73E78 3C014348 */ lui $at, 0x4348 ## $at = 43480000 /* 0A4DC 80B73E7C 44814000 */ mtc1 $at, $f8 ## $f8 = 200.00 /* 0A4E0 80B73E80 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 0A4E4 80B73E84 E7A0010C */ swc1 $f0, 0x010C($sp) -/* 0A4E8 80B73E88 E7A00110 */ swc1 $f0, 0x0110($sp) -/* 0A4EC 80B73E8C E7A80114 */ swc1 $f8, 0x0114($sp) +/* 0A4E4 80B73E84 E7A0010C */ swc1 $f0, 0x010C($sp) +/* 0A4E8 80B73E88 E7A00110 */ swc1 $f0, 0x0110($sp) +/* 0A4EC 80B73E8C E7A80114 */ swc1 $f8, 0x0114($sp) .L80B73E90: /* 0A4F0 80B73E90 3C0180B8 */ lui $at, %hi(D_80B7B6BC) ## $at = 80B80000 -/* 0A4F4 80B73E94 C42CB6BC */ lwc1 $f12, %lo(D_80B7B6BC)($at) +/* 0A4F4 80B73E94 C42CB6BC */ lwc1 $f12, %lo(D_80B7B6BC)($at) /* 0A4F8 80B73E98 0C00CFC8 */ jal Math_Rand_CenteredFloat - -/* 0A4FC 80B73E9C A7A200A2 */ sh $v0, 0x00A2($sp) + +/* 0A4FC 80B73E9C A7A200A2 */ sh $v0, 0x00A2($sp) /* 0A500 80B73EA0 860E008A */ lh $t6, 0x008A($s0) ## 0000008A /* 0A504 80B73EA4 34018000 */ ori $at, $zero, 0x8000 ## $at = 00008000 /* 0A508 80B73EA8 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 0A50C 80B73EAC 01C17821 */ addu $t7, $t6, $at +/* 0A50C 80B73EAC 01C17821 */ addu $t7, $t6, $at /* 0A510 80B73EB0 448F3000 */ mtc1 $t7, $f6 ## $f6 = 0.00 /* 0A514 80B73EB4 3C014700 */ lui $at, 0x4700 ## $at = 47000000 /* 0A518 80B73EB8 44812000 */ mtc1 $at, $f4 ## $f4 = 32768.00 -/* 0A51C 80B73EBC 468032A0 */ cvt.s.w $f10, $f6 +/* 0A51C 80B73EBC 468032A0 */ cvt.s.w $f10, $f6 /* 0A520 80B73EC0 3C0180B8 */ lui $at, %hi(D_80B7B6C0) ## $at = 80B80000 -/* 0A524 80B73EC4 C426B6C0 */ lwc1 $f6, %lo(D_80B7B6C0)($at) -/* 0A528 80B73EC8 46045203 */ div.s $f8, $f10, $f4 -/* 0A52C 80B73ECC 46064282 */ mul.s $f10, $f8, $f6 -/* 0A530 80B73ED0 0C034348 */ jal Matrix_RotateY -/* 0A534 80B73ED4 460A0300 */ add.s $f12, $f0, $f10 +/* 0A524 80B73EC4 C426B6C0 */ lwc1 $f6, %lo(D_80B7B6C0)($at) +/* 0A528 80B73EC8 46045203 */ div.s $f8, $f10, $f4 +/* 0A52C 80B73ECC 46064282 */ mul.s $f10, $f8, $f6 +/* 0A530 80B73ED0 0C034348 */ jal Matrix_RotateY +/* 0A534 80B73ED4 460A0300 */ add.s $f12, $f0, $f10 /* 0A538 80B73ED8 27A4010C */ addiu $a0, $sp, 0x010C ## $a0 = FFFFFFD4 -/* 0A53C 80B73EDC 0C0346BD */ jal Matrix_MultVec3f +/* 0A53C 80B73EDC 0C0346BD */ jal Matrix_MultVec3f /* 0A540 80B73EE0 27A50100 */ addiu $a1, $sp, 0x0100 ## $a1 = FFFFFFC8 /* 0A544 80B73EE4 C6040024 */ lwc1 $f4, 0x0024($s0) ## 00000024 -/* 0A548 80B73EE8 C7A80100 */ lwc1 $f8, 0x0100($sp) -/* 0A54C 80B73EEC 97A200A2 */ lhu $v0, 0x00A2($sp) +/* 0A548 80B73EE8 C7A80100 */ lwc1 $f8, 0x0100($sp) +/* 0A54C 80B73EEC 97A200A2 */ lhu $v0, 0x00A2($sp) /* 0A550 80B73EF0 C60A002C */ lwc1 $f10, 0x002C($s0) ## 0000002C -/* 0A554 80B73EF4 46082180 */ add.s $f6, $f4, $f8 +/* 0A554 80B73EF4 46082180 */ add.s $f6, $f4, $f8 /* 0A558 80B73EF8 3C0180B8 */ lui $at, %hi(D_80B7B6C4) ## $at = 80B80000 /* 0A55C 80B73EFC E60601B4 */ swc1 $f6, 0x01B4($s0) ## 000001B4 -/* 0A560 80B73F00 C7A40108 */ lwc1 $f4, 0x0108($sp) +/* 0A560 80B73F00 C7A40108 */ lwc1 $f4, 0x0108($sp) /* 0A564 80B73F04 C60001B4 */ lwc1 $f0, 0x01B4($s0) ## 000001B4 -/* 0A568 80B73F08 46045200 */ add.s $f8, $f10, $f4 -/* 0A56C 80B73F0C 46000182 */ mul.s $f6, $f0, $f0 +/* 0A568 80B73F08 46045200 */ add.s $f8, $f10, $f4 +/* 0A56C 80B73F0C 46000182 */ mul.s $f6, $f0, $f0 /* 0A570 80B73F10 E60801BC */ swc1 $f8, 0x01BC($s0) ## 000001BC /* 0A574 80B73F14 C60201BC */ lwc1 $f2, 0x01BC($s0) ## 000001BC -/* 0A578 80B73F18 C428B6C4 */ lwc1 $f8, %lo(D_80B7B6C4)($at) -/* 0A57C 80B73F1C 46021282 */ mul.s $f10, $f2, $f2 -/* 0A580 80B73F20 460A3100 */ add.s $f4, $f6, $f10 -/* 0A584 80B73F24 4608203C */ c.lt.s $f4, $f8 +/* 0A578 80B73F18 C428B6C4 */ lwc1 $f8, %lo(D_80B7B6C4)($at) +/* 0A57C 80B73F1C 46021282 */ mul.s $f10, $f2, $f2 +/* 0A580 80B73F20 460A3100 */ add.s $f4, $f6, $f10 +/* 0A584 80B73F24 4608203C */ c.lt.s $f4, $f8 /* 0A588 80B73F28 00000000 */ nop -/* 0A58C 80B73F2C 45010005 */ bc1t .L80B73F44 +/* 0A58C 80B73F2C 45010005 */ bc1t .L80B73F44 /* 0A590 80B73F30 24420001 */ addiu $v0, $v0, 0x0001 ## $v0 = 00000001 /* 0A594 80B73F34 3042FFFF */ andi $v0, $v0, 0xFFFF ## $v0 = 00000001 -/* 0A598 80B73F38 28410064 */ slti $at, $v0, 0x0064 -/* 0A59C 80B73F3C 1420FFD4 */ bne $at, $zero, .L80B73E90 +/* 0A598 80B73F38 28410064 */ slti $at, $v0, 0x0064 +/* 0A59C 80B73F3C 1420FFD4 */ bne $at, $zero, .L80B73E90 /* 0A5A0 80B73F40 00000000 */ nop .L80B73F44: /* 0A5A4 80B73F44 0C03F66B */ jal Math_Rand_ZeroOne ## Rand.Next() float /* 0A5A8 80B73F48 00000000 */ nop /* 0A5AC 80B73F4C 3C0180B8 */ lui $at, %hi(D_80B7B6C8) ## $at = 80B80000 -/* 0A5B0 80B73F50 C426B6C8 */ lwc1 $f6, %lo(D_80B7B6C8)($at) -/* 0A5B4 80B73F54 4606003C */ c.lt.s $f0, $f6 +/* 0A5B0 80B73F50 C426B6C8 */ lwc1 $f6, %lo(D_80B7B6C8)($at) +/* 0A5B4 80B73F54 4606003C */ c.lt.s $f0, $f6 /* 0A5B8 80B73F58 00000000 */ nop -/* 0A5BC 80B73F5C 45020033 */ bc1fl .L80B7402C +/* 0A5BC 80B73F5C 45020033 */ bc1fl .L80B7402C /* 0A5C0 80B73F60 3C014120 */ lui $at, 0x4120 ## $at = 41200000 /* 0A5C4 80B73F64 86180180 */ lh $t8, 0x0180($s0) ## 00000180 -/* 0A5C8 80B73F68 1700002F */ bne $t8, $zero, .L80B74028 +/* 0A5C8 80B73F68 1700002F */ bne $t8, $zero, .L80B74028 /* 0A5CC 80B73F6C 3C014270 */ lui $at, 0x4270 ## $at = 42700000 /* 0A5D0 80B73F70 44815000 */ mtc1 $at, $f10 ## $f10 = 60.00 /* 0A5D4 80B73F74 C60001AC */ lwc1 $f0, 0x01AC($s0) ## 000001AC -/* 0A5D8 80B73F78 4600503E */ c.le.s $f10, $f0 +/* 0A5D8 80B73F78 4600503E */ c.le.s $f10, $f0 /* 0A5DC 80B73F7C 00000000 */ nop -/* 0A5E0 80B73F80 45020004 */ bc1fl .L80B73F94 +/* 0A5E0 80B73F80 45020004 */ bc1fl .L80B73F94 /* 0A5E4 80B73F84 3C014248 */ lui $at, 0x4248 ## $at = 42480000 -/* 0A5E8 80B73F88 1000000B */ beq $zero, $zero, .L80B73FB8 +/* 0A5E8 80B73F88 1000000B */ beq $zero, $zero, .L80B73FB8 /* 0A5EC 80B73F8C 240500FF */ addiu $a1, $zero, 0x00FF ## $a1 = 000000FF /* 0A5F0 80B73F90 3C014248 */ lui $at, 0x4248 ## $at = 42480000 .L80B73F94: /* 0A5F4 80B73F94 44812000 */ mtc1 $at, $f4 ## $f4 = 50.00 /* 0A5F8 80B73F98 00000000 */ nop -/* 0A5FC 80B73F9C 4600203E */ c.le.s $f4, $f0 +/* 0A5FC 80B73F9C 4600203E */ c.le.s $f4, $f0 /* 0A600 80B73FA0 00000000 */ nop -/* 0A604 80B73FA4 45020004 */ bc1fl .L80B73FB8 +/* 0A604 80B73FA4 45020004 */ bc1fl .L80B73FB8 /* 0A608 80B73FA8 240500B4 */ addiu $a1, $zero, 0x00B4 ## $a1 = 000000B4 -/* 0A60C 80B73FAC 10000002 */ beq $zero, $zero, .L80B73FB8 +/* 0A60C 80B73FAC 10000002 */ beq $zero, $zero, .L80B73FB8 /* 0A610 80B73FB0 240500C8 */ addiu $a1, $zero, 0x00C8 ## $a1 = 000000C8 /* 0A614 80B73FB4 240500B4 */ addiu $a1, $zero, 0x00B4 ## $a1 = 000000B4 .L80B73FB8: /* 0A618 80B73FB8 44806000 */ mtc1 $zero, $f12 ## $f12 = 0.00 /* 0A61C 80B73FBC 2406005A */ addiu $a2, $zero, 0x005A ## $a2 = 0000005A -/* 0A620 80B73FC0 0C02A7DB */ jal func_800A9F6C +/* 0A620 80B73FC0 0C02A7DB */ jal func_800A9F6C /* 0A624 80B73FC4 24070002 */ addiu $a3, $zero, 0x0002 ## $a3 = 00000002 /* 0A628 80B73FC8 3C014396 */ lui $at, 0x4396 ## $at = 43960000 /* 0A62C 80B73FCC 44814000 */ mtc1 $at, $f8 ## $f8 = 300.00 @@ -2950,157 +2950,157 @@ glabel L80B738A0 /* 0A64C 80B73FEC 3C0180B8 */ lui $at, %hi(D_80B7E0A4) ## $at = 80B80000 /* 0A650 80B73FF0 240C0028 */ addiu $t4, $zero, 0x0028 ## $t4 = 00000028 /* 0A654 80B73FF4 E60801B8 */ swc1 $f8, 0x01B8($s0) ## 000001B8 -/* 0A658 80B73FF8 A42CE0A4 */ sh $t4, %lo(D_80B7E0A4)($at) +/* 0A658 80B73FF8 A42CE0A4 */ sh $t4, %lo(D_80B7E0A4)($at) /* 0A65C 80B73FFC 3C0141F0 */ lui $at, 0x41F0 ## $at = 41F00000 /* 0A660 80B74000 44816000 */ mtc1 $at, $f12 ## $f12 = 30.00 /* 0A664 80B74004 0C00CFBE */ jal Math_Rand_ZeroFloat - + /* 0A668 80B74008 00000000 */ nop -/* 0A66C 80B7400C 4600018D */ trunc.w.s $f6, $f0 +/* 0A66C 80B7400C 4600018D */ trunc.w.s $f6, $f0 /* 0A670 80B74010 3C0180B8 */ lui $at, %hi(D_80B7E116) ## $at = 80B80000 -/* 0A674 80B74014 440E3000 */ mfc1 $t6, $f6 +/* 0A674 80B74014 440E3000 */ mfc1 $t6, $f6 /* 0A678 80B74018 00000000 */ nop /* 0A67C 80B7401C 25CF0014 */ addiu $t7, $t6, 0x0014 ## $t7 = 00000014 -/* 0A680 80B74020 10000013 */ beq $zero, $zero, .L80B74070 -/* 0A684 80B74024 A42FE116 */ sh $t7, %lo(D_80B7E116)($at) +/* 0A680 80B74020 10000013 */ beq $zero, $zero, .L80B74070 +/* 0A684 80B74024 A42FE116 */ sh $t7, %lo(D_80B7E116)($at) .L80B74028: /* 0A688 80B74028 3C014120 */ lui $at, 0x4120 ## $at = 41200000 .L80B7402C: /* 0A68C 80B7402C 44816000 */ mtc1 $at, $f12 ## $f12 = 10.00 /* 0A690 80B74030 0C00CFBE */ jal Math_Rand_ZeroFloat - + /* 0A694 80B74034 00000000 */ nop -/* 0A698 80B74038 4600028D */ trunc.w.s $f10, $f0 +/* 0A698 80B74038 4600028D */ trunc.w.s $f10, $f0 /* 0A69C 80B7403C 3C014316 */ lui $at, 0x4316 ## $at = 43160000 /* 0A6A0 80B74040 44816000 */ mtc1 $at, $f12 ## $f12 = 150.00 /* 0A6A4 80B74044 A600017E */ sh $zero, 0x017E($s0) ## 0000017E -/* 0A6A8 80B74048 440C5000 */ mfc1 $t4, $f10 +/* 0A6A8 80B74048 440C5000 */ mfc1 $t4, $f10 /* 0A6AC 80B7404C 00000000 */ nop /* 0A6B0 80B74050 25890003 */ addiu $t1, $t4, 0x0003 ## $t1 = 00000003 /* 0A6B4 80B74054 0C00CFBE */ jal Math_Rand_ZeroFloat - + /* 0A6B8 80B74058 A609017A */ sh $t1, 0x017A($s0) ## 0000017A /* 0A6BC 80B7405C 3C01C28C */ lui $at, 0xC28C ## $at = C28C0000 /* 0A6C0 80B74060 44812000 */ mtc1 $at, $f4 ## $f4 = -70.00 /* 0A6C4 80B74064 00000000 */ nop -/* 0A6C8 80B74068 46002201 */ sub.s $f8, $f4, $f0 +/* 0A6C8 80B74068 46002201 */ sub.s $f8, $f4, $f0 /* 0A6CC 80B7406C E60801B8 */ swc1 $f8, 0x01B8($s0) ## 000001B8 .L80B74070: /* 0A6D0 80B74070 860B017E */ lh $t3, 0x017E($s0) ## 0000017E .L80B74074: -/* 0A6D4 80B74074 11600016 */ beq $t3, $zero, .L80B740D0 +/* 0A6D4 80B74074 11600016 */ beq $t3, $zero, .L80B740D0 /* 0A6D8 80B74078 00000000 */ nop /* 0A6DC 80B7407C 44803000 */ mtc1 $zero, $f6 ## $f6 = 0.00 /* 0A6E0 80B74080 3C0180B8 */ lui $at, %hi(D_80B7E11C) ## $at = 80B80000 -/* 0A6E4 80B74084 4406A000 */ mfc1 $a2, $f20 -/* 0A6E8 80B74088 E426E11C */ swc1 $f6, %lo(D_80B7E11C)($at) +/* 0A6E4 80B74084 4406A000 */ mfc1 $a2, $f20 +/* 0A6E8 80B74088 E426E11C */ swc1 $f6, %lo(D_80B7E11C)($at) /* 0A6EC 80B7408C 3C0180B8 */ lui $at, %hi(D_80B7B6CC) ## $at = 80B80000 -/* 0A6F0 80B74090 C42AB6CC */ lwc1 $f10, %lo(D_80B7B6CC)($at) +/* 0A6F0 80B74090 C42AB6CC */ lwc1 $f10, %lo(D_80B7B6CC)($at) /* 0A6F4 80B74094 3C0180B8 */ lui $at, %hi(D_80B7B6D0) ## $at = 80B80000 -/* 0A6F8 80B74098 4407A000 */ mfc1 $a3, $f20 +/* 0A6F8 80B74098 4407A000 */ mfc1 $a3, $f20 /* 0A6FC 80B7409C E60A0190 */ swc1 $f10, 0x0190($s0) ## 00000190 -/* 0A700 80B740A0 C424B6D0 */ lwc1 $f4, %lo(D_80B7B6D0)($at) +/* 0A700 80B740A0 C424B6D0 */ lwc1 $f4, %lo(D_80B7B6D0)($at) /* 0A704 80B740A4 26040068 */ addiu $a0, $s0, 0x0068 ## $a0 = 00000068 /* 0A708 80B740A8 3C0540F0 */ lui $a1, 0x40F0 ## $a1 = 40F00000 /* 0A70C 80B740AC 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 0A710 80B740B0 E6040194 */ swc1 $f4, 0x0194($s0) ## 00000194 -/* 0A714 80B740B4 8FA40040 */ lw $a0, 0x0040($sp) +/* 0A714 80B740B4 8FA40040 */ lw $a0, 0x0040($sp) /* 0A718 80B740B8 24054E20 */ addiu $a1, $zero, 0x4E20 ## $a1 = 00004E20 /* 0A71C 80B740BC 24060002 */ addiu $a2, $zero, 0x0002 ## $a2 = 00000002 /* 0A720 80B740C0 0C01E1EF */ jal Math_SmoothScaleMaxS - + /* 0A724 80B740C4 24070FA0 */ addiu $a3, $zero, 0x0FA0 ## $a3 = 00000FA0 -/* 0A728 80B740C8 1000009B */ beq $zero, $zero, .L80B74338 +/* 0A728 80B740C8 1000009B */ beq $zero, $zero, .L80B74338 /* 0A72C 80B740CC 00000000 */ nop .L80B740D0: /* 0A730 80B740D0 3C0D80B8 */ lui $t5, %hi(D_80B7E124) ## $t5 = 80B80000 -/* 0A734 80B740D4 91ADE124 */ lbu $t5, %lo(D_80B7E124)($t5) -/* 0A738 80B740D8 15A00010 */ bne $t5, $zero, .L80B7411C +/* 0A734 80B740D4 91ADE124 */ lbu $t5, %lo(D_80B7E124)($t5) +/* 0A738 80B740D8 15A00010 */ bne $t5, $zero, .L80B7411C /* 0A73C 80B740DC 3C0E80B8 */ lui $t6, %hi(D_80B7E0B6) ## $t6 = 80B80000 -/* 0A740 80B740E0 91CEE0B6 */ lbu $t6, %lo(D_80B7E0B6)($t6) +/* 0A740 80B740E0 91CEE0B6 */ lbu $t6, %lo(D_80B7E0B6)($t6) /* 0A744 80B740E4 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 0A748 80B740E8 15C1000C */ bne $t6, $at, .L80B7411C +/* 0A748 80B740E8 15C1000C */ bne $t6, $at, .L80B7411C /* 0A74C 80B740EC 3C0144FA */ lui $at, 0x44FA ## $at = 44FA0000 /* 0A750 80B740F0 44814000 */ mtc1 $at, $f8 ## $f8 = 2000.00 -/* 0A754 80B740F4 4406A000 */ mfc1 $a2, $f20 +/* 0A754 80B740F4 4406A000 */ mfc1 $a2, $f20 /* 0A758 80B740F8 3C073E4C */ lui $a3, 0x3E4C ## $a3 = 3E4C0000 /* 0A75C 80B740FC E6140190 */ swc1 $f20, 0x0190($s0) ## 00000190 /* 0A760 80B74100 34E7CCCD */ ori $a3, $a3, 0xCCCD ## $a3 = 3E4CCCCD /* 0A764 80B74104 26040068 */ addiu $a0, $s0, 0x0068 ## $a0 = 00000068 /* 0A768 80B74108 3C054040 */ lui $a1, 0x4040 ## $a1 = 40400000 /* 0A76C 80B7410C 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 0A770 80B74110 E6080194 */ swc1 $f8, 0x0194($s0) ## 00000194 -/* 0A774 80B74114 1000000D */ beq $zero, $zero, .L80B7414C +/* 0A774 80B74114 1000000D */ beq $zero, $zero, .L80B7414C /* 0A778 80B74118 920F0150 */ lbu $t7, 0x0150($s0) ## 00000150 .L80B7411C: /* 0A77C 80B7411C 3C0180B8 */ lui $at, %hi(D_80B7B6D4) ## $at = 80B80000 -/* 0A780 80B74120 C426B6D4 */ lwc1 $f6, %lo(D_80B7B6D4)($at) +/* 0A780 80B74120 C426B6D4 */ lwc1 $f6, %lo(D_80B7B6D4)($at) /* 0A784 80B74124 3C0180B8 */ lui $at, %hi(D_80B7B6D8) ## $at = 80B80000 -/* 0A788 80B74128 4406A000 */ mfc1 $a2, $f20 +/* 0A788 80B74128 4406A000 */ mfc1 $a2, $f20 /* 0A78C 80B7412C E6060190 */ swc1 $f6, 0x0190($s0) ## 00000190 -/* 0A790 80B74130 C42AB6D8 */ lwc1 $f10, %lo(D_80B7B6D8)($at) +/* 0A790 80B74130 C42AB6D8 */ lwc1 $f10, %lo(D_80B7B6D8)($at) /* 0A794 80B74134 26040068 */ addiu $a0, $s0, 0x0068 ## $a0 = 00000068 /* 0A798 80B74138 3C0540A0 */ lui $a1, 0x40A0 ## $a1 = 40A00000 /* 0A79C 80B7413C 3C073F00 */ lui $a3, 0x3F00 ## $a3 = 3F000000 /* 0A7A0 80B74140 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 0A7A4 80B74144 E60A0194 */ swc1 $f10, 0x0194($s0) ## 00000194 /* 0A7A8 80B74148 920F0150 */ lbu $t7, 0x0150($s0) ## 00000150 .L80B7414C: -/* 0A7AC 80B7414C 15E00008 */ bne $t7, $zero, .L80B74170 +/* 0A7AC 80B7414C 15E00008 */ bne $t7, $zero, .L80B74170 /* 0A7B0 80B74150 3C0180B8 */ lui $at, %hi(D_80B7B6DC) ## $at = 80B80000 -/* 0A7B4 80B74154 C428B6DC */ lwc1 $f8, %lo(D_80B7B6DC)($at) +/* 0A7B4 80B74154 C428B6DC */ lwc1 $f8, %lo(D_80B7B6DC)($at) /* 0A7B8 80B74158 C60401AC */ lwc1 $f4, 0x01AC($s0) ## 000001AC /* 0A7BC 80B7415C 3C0180B8 */ lui $at, %hi(D_80B7E11C) ## $at = 80B80000 -/* 0A7C0 80B74160 46082182 */ mul.s $f6, $f4, $f8 -/* 0A7C4 80B74164 4606A281 */ sub.s $f10, $f20, $f6 -/* 0A7C8 80B74168 10000073 */ beq $zero, $zero, .L80B74338 -/* 0A7CC 80B7416C E42AE11C */ swc1 $f10, %lo(D_80B7E11C)($at) +/* 0A7C0 80B74160 46082182 */ mul.s $f6, $f4, $f8 +/* 0A7C4 80B74164 4606A281 */ sub.s $f10, $f20, $f6 +/* 0A7C8 80B74168 10000073 */ beq $zero, $zero, .L80B74338 +/* 0A7CC 80B7416C E42AE11C */ swc1 $f10, %lo(D_80B7E11C)($at) .L80B74170: /* 0A7D0 80B74170 3C0180B8 */ lui $at, %hi(D_80B7B6E0) ## $at = 80B80000 -/* 0A7D4 80B74174 C428B6E0 */ lwc1 $f8, %lo(D_80B7B6E0)($at) +/* 0A7D4 80B74174 C428B6E0 */ lwc1 $f8, %lo(D_80B7B6E0)($at) /* 0A7D8 80B74178 C60401AC */ lwc1 $f4, 0x01AC($s0) ## 000001AC /* 0A7DC 80B7417C 3C0180B8 */ lui $at, %hi(D_80B7B6E4) ## $at = 80B80000 -/* 0A7E0 80B74180 C42AB6E4 */ lwc1 $f10, %lo(D_80B7B6E4)($at) -/* 0A7E4 80B74184 46082182 */ mul.s $f6, $f4, $f8 +/* 0A7E0 80B74180 C42AB6E4 */ lwc1 $f10, %lo(D_80B7B6E4)($at) +/* 0A7E4 80B74184 46082182 */ mul.s $f6, $f4, $f8 /* 0A7E8 80B74188 3C0180B8 */ lui $at, %hi(D_80B7E11C) ## $at = 80B80000 -/* 0A7EC 80B7418C 460A3102 */ mul.s $f4, $f6, $f10 -/* 0A7F0 80B74190 4604A201 */ sub.s $f8, $f20, $f4 -/* 0A7F4 80B74194 10000068 */ beq $zero, $zero, .L80B74338 -/* 0A7F8 80B74198 E428E11C */ swc1 $f8, %lo(D_80B7E11C)($at) +/* 0A7EC 80B7418C 460A3102 */ mul.s $f4, $f6, $f10 +/* 0A7F0 80B74190 4604A201 */ sub.s $f8, $f20, $f4 +/* 0A7F4 80B74194 10000068 */ beq $zero, $zero, .L80B74338 +/* 0A7F8 80B74198 E428E11C */ swc1 $f8, %lo(D_80B7E11C)($at) /* 0A7FC 80B7419C 3058000F */ andi $t8, $v0, 0x000F ## $t8 = 00000000 .L80B741A0: -/* 0A800 80B741A0 5700001E */ bnel $t8, $zero, .L80B7421C +/* 0A800 80B741A0 5700001E */ bnel $t8, $zero, .L80B7421C /* 0A804 80B741A4 92090150 */ lbu $t1, 0x0150($s0) ## 00000150 -/* 0A808 80B741A8 8FB9004C */ lw $t9, 0x004C($sp) +/* 0A808 80B741A8 8FB9004C */ lw $t9, 0x004C($sp) /* 0A80C 80B741AC 3C01FFFF */ lui $at, 0xFFFF ## $at = FFFF0000 /* 0A810 80B741B0 34217FFF */ ori $at, $at, 0x7FFF ## $at = FFFF7FFF /* 0A814 80B741B4 972A0000 */ lhu $t2, 0x0000($t9) ## 00000000 -/* 0A818 80B741B8 01416027 */ nor $t4, $t2, $at -/* 0A81C 80B741BC 15800016 */ bne $t4, $zero, .L80B74218 +/* 0A818 80B741B8 01416027 */ nor $t4, $t2, $at +/* 0A81C 80B741BC 15800016 */ bne $t4, $zero, .L80B74218 /* 0A820 80B741C0 3C014270 */ lui $at, 0x4270 ## $at = 42700000 /* 0A824 80B741C4 44815000 */ mtc1 $at, $f10 ## $f10 = 60.00 /* 0A828 80B741C8 C60601AC */ lwc1 $f6, 0x01AC($s0) ## 000001AC -/* 0A82C 80B741CC 4606503E */ c.le.s $f10, $f6 +/* 0A82C 80B741CC 4606503E */ c.le.s $f10, $f6 /* 0A830 80B741D0 00000000 */ nop -/* 0A834 80B741D4 45000004 */ bc1f .L80B741E8 +/* 0A834 80B741D4 45000004 */ bc1f .L80B741E8 /* 0A838 80B741D8 3C0980B8 */ lui $t1, %hi(D_80B7E080) ## $t1 = 80B80000 -/* 0A83C 80B741DC 8529E080 */ lh $t1, %lo(D_80B7E080)($t1) -/* 0A840 80B741E0 292107D0 */ slti $at, $t1, 0x07D0 -/* 0A844 80B741E4 1420000C */ bne $at, $zero, .L80B74218 +/* 0A83C 80B741DC 8529E080 */ lh $t1, %lo(D_80B7E080)($t1) +/* 0A840 80B741E0 292107D0 */ slti $at, $t1, 0x07D0 +/* 0A844 80B741E4 1420000C */ bne $at, $zero, .L80B74218 .L80B741E8: /* 0A848 80B741E8 3C0141F0 */ lui $at, 0x41F0 ## $at = 41F00000 /* 0A84C 80B741EC 44816000 */ mtc1 $at, $f12 ## $f12 = 30.00 /* 0A850 80B741F0 0C00CFBE */ jal Math_Rand_ZeroFloat - + /* 0A854 80B741F4 00000000 */ nop -/* 0A858 80B741F8 4600010D */ trunc.w.s $f4, $f0 +/* 0A858 80B741F8 4600010D */ trunc.w.s $f4, $f0 /* 0A85C 80B741FC 8619008A */ lh $t9, 0x008A($s0) ## 0000008A /* 0A860 80B74200 860A00B6 */ lh $t2, 0x00B6($s0) ## 000000B6 -/* 0A864 80B74204 440F2000 */ mfc1 $t7, $f4 -/* 0A868 80B74208 032A6023 */ subu $t4, $t9, $t2 +/* 0A864 80B74204 440F2000 */ mfc1 $t7, $f4 +/* 0A868 80B74208 032A6023 */ subu $t4, $t9, $t2 /* 0A86C 80B7420C A60C0154 */ sh $t4, 0x0154($s0) ## 00000154 /* 0A870 80B74210 25F8000F */ addiu $t8, $t7, 0x000F ## $t8 = 0000000F /* 0A874 80B74214 A2180152 */ sb $t8, 0x0152($s0) ## 00000152 @@ -3109,130 +3109,130 @@ glabel L80B738A0 .L80B7421C: /* 0A87C 80B7421C E6140190 */ swc1 $f20, 0x0190($s0) ## 00000190 /* 0A880 80B74220 3C0180B8 */ lui $at, %hi(D_80B7B6E8) ## $at = 80B80000 -/* 0A884 80B74224 C428B6E8 */ lwc1 $f8, %lo(D_80B7B6E8)($at) -/* 0A888 80B74228 1520000B */ bne $t1, $zero, .L80B74258 +/* 0A884 80B74224 C428B6E8 */ lwc1 $f8, %lo(D_80B7B6E8)($at) +/* 0A888 80B74228 1520000B */ bne $t1, $zero, .L80B74258 /* 0A88C 80B7422C E6080194 */ swc1 $f8, 0x0194($s0) ## 00000194 /* 0A890 80B74230 3C0180B8 */ lui $at, %hi(D_80B7B6EC) ## $at = 80B80000 -/* 0A894 80B74234 C42AB6EC */ lwc1 $f10, %lo(D_80B7B6EC)($at) +/* 0A894 80B74234 C42AB6EC */ lwc1 $f10, %lo(D_80B7B6EC)($at) /* 0A898 80B74238 C60601AC */ lwc1 $f6, 0x01AC($s0) ## 000001AC /* 0A89C 80B7423C 3C0180B8 */ lui $at, %hi(D_80B7B6F0) ## $at = 80B80000 -/* 0A8A0 80B74240 C428B6F0 */ lwc1 $f8, %lo(D_80B7B6F0)($at) -/* 0A8A4 80B74244 460A3102 */ mul.s $f4, $f6, $f10 +/* 0A8A0 80B74240 C428B6F0 */ lwc1 $f8, %lo(D_80B7B6F0)($at) +/* 0A8A4 80B74244 460A3102 */ mul.s $f4, $f6, $f10 /* 0A8A8 80B74248 3C0180B8 */ lui $at, %hi(D_80B7E11C) ## $at = 80B80000 -/* 0A8AC 80B7424C 46044181 */ sub.s $f6, $f8, $f4 -/* 0A8B0 80B74250 1000000D */ beq $zero, $zero, .L80B74288 -/* 0A8B4 80B74254 E426E11C */ swc1 $f6, %lo(D_80B7E11C)($at) +/* 0A8AC 80B7424C 46044181 */ sub.s $f6, $f8, $f4 +/* 0A8B0 80B74250 1000000D */ beq $zero, $zero, .L80B74288 +/* 0A8B4 80B74254 E426E11C */ swc1 $f6, %lo(D_80B7E11C)($at) .L80B74258: /* 0A8B8 80B74258 3C0180B8 */ lui $at, %hi(D_80B7B6F4) ## $at = 80B80000 -/* 0A8BC 80B7425C C428B6F4 */ lwc1 $f8, %lo(D_80B7B6F4)($at) +/* 0A8BC 80B7425C C428B6F4 */ lwc1 $f8, %lo(D_80B7B6F4)($at) /* 0A8C0 80B74260 C60A01AC */ lwc1 $f10, 0x01AC($s0) ## 000001AC /* 0A8C4 80B74264 3C0180B8 */ lui $at, %hi(D_80B7B6F8) ## $at = 80B80000 -/* 0A8C8 80B74268 C426B6F8 */ lwc1 $f6, %lo(D_80B7B6F8)($at) -/* 0A8CC 80B7426C 46085102 */ mul.s $f4, $f10, $f8 +/* 0A8C8 80B74268 C426B6F8 */ lwc1 $f6, %lo(D_80B7B6F8)($at) +/* 0A8CC 80B7426C 46085102 */ mul.s $f4, $f10, $f8 /* 0A8D0 80B74270 3C0180B8 */ lui $at, %hi(D_80B7B6FC) ## $at = 80B80000 -/* 0A8D4 80B74274 C428B6FC */ lwc1 $f8, %lo(D_80B7B6FC)($at) +/* 0A8D4 80B74274 C428B6FC */ lwc1 $f8, %lo(D_80B7B6FC)($at) /* 0A8D8 80B74278 3C0180B8 */ lui $at, %hi(D_80B7E11C) ## $at = 80B80000 -/* 0A8DC 80B7427C 46062282 */ mul.s $f10, $f4, $f6 -/* 0A8E0 80B74280 460A4101 */ sub.s $f4, $f8, $f10 -/* 0A8E4 80B74284 E424E11C */ swc1 $f4, %lo(D_80B7E11C)($at) +/* 0A8DC 80B7427C 46062282 */ mul.s $f10, $f4, $f6 +/* 0A8E0 80B74280 460A4101 */ sub.s $f4, $f8, $f10 +/* 0A8E4 80B74284 E424E11C */ swc1 $f4, %lo(D_80B7E11C)($at) .L80B74288: -/* 0A8E8 80B74288 4406A000 */ mfc1 $a2, $f20 +/* 0A8E8 80B74288 4406A000 */ mfc1 $a2, $f20 /* 0A8EC 80B7428C 26040068 */ addiu $a0, $s0, 0x0068 ## $a0 = 00000068 /* 0A8F0 80B74290 3C054000 */ lui $a1, 0x4000 ## $a1 = 40000000 /* 0A8F4 80B74294 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 0A8F8 80B74298 3C073F00 */ lui $a3, 0x3F00 ## $a3 = 3F000000 /* 0A8FC 80B7429C 860B017C */ lh $t3, 0x017C($s0) ## 0000017C -/* 0A900 80B742A0 15600025 */ bne $t3, $zero, .L80B74338 +/* 0A900 80B742A0 15600025 */ bne $t3, $zero, .L80B74338 /* 0A904 80B742A4 00000000 */ nop /* 0A908 80B742A8 A2000152 */ sb $zero, 0x0152($s0) ## 00000152 /* 0A90C 80B742AC 3C0280B8 */ lui $v0, %hi(D_80B7E080) ## $v0 = 80B80000 -/* 0A910 80B742B0 8442E080 */ lh $v0, %lo(D_80B7E080)($v0) -/* 0A914 80B742B4 284107D0 */ slti $at, $v0, 0x07D0 -/* 0A918 80B742B8 1020000A */ beq $at, $zero, .L80B742E4 +/* 0A910 80B742B0 8442E080 */ lh $v0, %lo(D_80B7E080)($v0) +/* 0A914 80B742B4 284107D0 */ slti $at, $v0, 0x07D0 +/* 0A918 80B742B8 1020000A */ beq $at, $zero, .L80B742E4 /* 0A91C 80B742BC 3C014248 */ lui $at, 0x4248 ## $at = 42480000 /* 0A920 80B742C0 44816000 */ mtc1 $at, $f12 ## $f12 = 50.00 /* 0A924 80B742C4 0C00CFBE */ jal Math_Rand_ZeroFloat - + /* 0A928 80B742C8 00000000 */ nop -/* 0A92C 80B742CC 4600018D */ trunc.w.s $f6, $f0 -/* 0A930 80B742D0 44183000 */ mfc1 $t8, $f6 +/* 0A92C 80B742CC 4600018D */ trunc.w.s $f6, $f0 +/* 0A930 80B742D0 44183000 */ mfc1 $t8, $f6 /* 0A934 80B742D4 00000000 */ nop /* 0A938 80B742D8 27190032 */ addiu $t9, $t8, 0x0032 ## $t9 = 00000032 -/* 0A93C 80B742DC 10000016 */ beq $zero, $zero, .L80B74338 +/* 0A93C 80B742DC 10000016 */ beq $zero, $zero, .L80B74338 /* 0A940 80B742E0 A619017C */ sh $t9, 0x017C($s0) ## 0000017C .L80B742E4: -/* 0A944 80B742E4 28410BB8 */ slti $at, $v0, 0x0BB8 -/* 0A948 80B742E8 1020000A */ beq $at, $zero, .L80B74314 +/* 0A944 80B742E4 28410BB8 */ slti $at, $v0, 0x0BB8 +/* 0A948 80B742E8 1020000A */ beq $at, $zero, .L80B74314 /* 0A94C 80B742EC 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 /* 0A950 80B742F0 44816000 */ mtc1 $at, $f12 ## $f12 = 20.00 /* 0A954 80B742F4 0C00CFBE */ jal Math_Rand_ZeroFloat - + /* 0A958 80B742F8 00000000 */ nop -/* 0A95C 80B742FC 4600020D */ trunc.w.s $f8, $f0 -/* 0A960 80B74300 440B4000 */ mfc1 $t3, $f8 +/* 0A95C 80B742FC 4600020D */ trunc.w.s $f8, $f0 +/* 0A960 80B74300 440B4000 */ mfc1 $t3, $f8 /* 0A964 80B74304 00000000 */ nop /* 0A968 80B74308 256D001E */ addiu $t5, $t3, 0x001E ## $t5 = 0000001E -/* 0A96C 80B7430C 1000000A */ beq $zero, $zero, .L80B74338 +/* 0A96C 80B7430C 1000000A */ beq $zero, $zero, .L80B74338 /* 0A970 80B74310 A60D017C */ sh $t5, 0x017C($s0) ## 0000017C .L80B74314: /* 0A974 80B74314 3C014120 */ lui $at, 0x4120 ## $at = 41200000 /* 0A978 80B74318 44816000 */ mtc1 $at, $f12 ## $f12 = 10.00 /* 0A97C 80B7431C 0C00CFBE */ jal Math_Rand_ZeroFloat - + /* 0A980 80B74320 00000000 */ nop -/* 0A984 80B74324 4600028D */ trunc.w.s $f10, $f0 -/* 0A988 80B74328 44195000 */ mfc1 $t9, $f10 +/* 0A984 80B74324 4600028D */ trunc.w.s $f10, $f0 +/* 0A988 80B74328 44195000 */ mfc1 $t9, $f10 /* 0A98C 80B7432C 00000000 */ nop /* 0A990 80B74330 272A0019 */ addiu $t2, $t9, 0x0019 ## $t2 = 00000019 /* 0A994 80B74334 A60A017C */ sh $t2, 0x017C($s0) ## 0000017C .L80B74338: /* 0A998 80B74338 3C0C80B8 */ lui $t4, %hi(D_80B7E074) ## $t4 = 80B80000 -/* 0A99C 80B7433C 918CE074 */ lbu $t4, %lo(D_80B7E074)($t4) +/* 0A99C 80B7433C 918CE074 */ lbu $t4, %lo(D_80B7E074)($t4) /* 0A9A0 80B74340 3C0280B8 */ lui $v0, %hi(D_80B7E124) ## $v0 = 80B80000 -/* 0A9A4 80B74344 9042E124 */ lbu $v0, %lo(D_80B7E124)($v0) -/* 0A9A8 80B74348 11800004 */ beq $t4, $zero, .L80B7435C +/* 0A9A4 80B74344 9042E124 */ lbu $v0, %lo(D_80B7E124)($v0) +/* 0A9A8 80B74348 11800004 */ beq $t4, $zero, .L80B7435C /* 0A9AC 80B7434C 00000000 */ nop /* 0A9B0 80B74350 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 /* 0A9B4 80B74354 3C0180B8 */ lui $at, %hi(D_80B7E11C) ## $at = 80B80000 -/* 0A9B8 80B74358 E424E11C */ swc1 $f4, %lo(D_80B7E11C)($at) +/* 0A9B8 80B74358 E424E11C */ swc1 $f4, %lo(D_80B7E11C)($at) .L80B7435C: -/* 0A9BC 80B7435C 14400004 */ bne $v0, $zero, .L80B74370 +/* 0A9BC 80B7435C 14400004 */ bne $v0, $zero, .L80B74370 /* 0A9C0 80B74360 3C0980B8 */ lui $t1, %hi(D_80B7E0B6) ## $t1 = 80B80000 -/* 0A9C4 80B74364 9129E0B6 */ lbu $t1, %lo(D_80B7E0B6)($t1) +/* 0A9C4 80B74364 9129E0B6 */ lbu $t1, %lo(D_80B7E0B6)($t1) /* 0A9C8 80B74368 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 0A9CC 80B7436C 1121002A */ beq $t1, $at, .L80B74418 +/* 0A9CC 80B7436C 1121002A */ beq $t1, $at, .L80B74418 .L80B74370: /* 0A9D0 80B74370 3C014040 */ lui $at, 0x4040 ## $at = 40400000 /* 0A9D4 80B74374 44814000 */ mtc1 $at, $f8 ## $f8 = 3.00 /* 0A9D8 80B74378 C6060068 */ lwc1 $f6, 0x0068($s0) ## 00000068 /* 0A9DC 80B7437C 3C0280B8 */ lui $v0, %hi(D_80B7E0AE) ## $v0 = 80B80000 -/* 0A9E0 80B74380 8442E0AE */ lh $v0, %lo(D_80B7E0AE)($v0) -/* 0A9E4 80B74384 4608303C */ c.lt.s $f6, $f8 +/* 0A9E0 80B74380 8442E0AE */ lh $v0, %lo(D_80B7E0AE)($v0) +/* 0A9E4 80B74384 4608303C */ c.lt.s $f6, $f8 /* 0A9E8 80B74388 00000000 */ nop -/* 0A9EC 80B7438C 4500000A */ bc1f .L80B743B8 +/* 0A9EC 80B7438C 4500000A */ bc1f .L80B743B8 /* 0A9F0 80B74390 304B0008 */ andi $t3, $v0, 0x0008 ## $t3 = 00000000 -/* 0A9F4 80B74394 11600004 */ beq $t3, $zero, .L80B743A8 +/* 0A9F4 80B74394 11600004 */ beq $t3, $zero, .L80B743A8 /* 0A9F8 80B74398 3C0180B8 */ lui $at, %hi(D_80B7B700) ## $at = 80B80000 -/* 0A9FC 80B7439C C42AB700 */ lwc1 $f10, %lo(D_80B7B700)($at) -/* 0AA00 80B743A0 1000000E */ beq $zero, $zero, .L80B743DC -/* 0AA04 80B743A4 E7AA0100 */ swc1 $f10, 0x0100($sp) +/* 0A9FC 80B7439C C42AB700 */ lwc1 $f10, %lo(D_80B7B700)($at) +/* 0AA00 80B743A0 1000000E */ beq $zero, $zero, .L80B743DC +/* 0AA04 80B743A4 E7AA0100 */ swc1 $f10, 0x0100($sp) .L80B743A8: /* 0AA08 80B743A8 3C01BF40 */ lui $at, 0xBF40 ## $at = BF400000 /* 0AA0C 80B743AC 44812000 */ mtc1 $at, $f4 ## $f4 = -0.75 -/* 0AA10 80B743B0 1000000A */ beq $zero, $zero, .L80B743DC -/* 0AA14 80B743B4 E7A40100 */ swc1 $f4, 0x0100($sp) +/* 0AA10 80B743B0 1000000A */ beq $zero, $zero, .L80B743DC +/* 0AA14 80B743B4 E7A40100 */ swc1 $f4, 0x0100($sp) .L80B743B8: /* 0AA18 80B743B8 304D0004 */ andi $t5, $v0, 0x0004 ## $t5 = 00000000 -/* 0AA1C 80B743BC 11A00004 */ beq $t5, $zero, .L80B743D0 +/* 0AA1C 80B743BC 11A00004 */ beq $t5, $zero, .L80B743D0 /* 0AA20 80B743C0 3C0180B8 */ lui $at, %hi(D_80B7B704) ## $at = 80B80000 -/* 0AA24 80B743C4 C426B704 */ lwc1 $f6, %lo(D_80B7B704)($at) -/* 0AA28 80B743C8 10000004 */ beq $zero, $zero, .L80B743DC -/* 0AA2C 80B743CC E7A60100 */ swc1 $f6, 0x0100($sp) +/* 0AA24 80B743C4 C426B704 */ lwc1 $f6, %lo(D_80B7B704)($at) +/* 0AA28 80B743C8 10000004 */ beq $zero, $zero, .L80B743DC +/* 0AA2C 80B743CC E7A60100 */ swc1 $f6, 0x0100($sp) .L80B743D0: /* 0AA30 80B743D0 3C0180B8 */ lui $at, %hi(D_80B7B708) ## $at = 80B80000 -/* 0AA34 80B743D4 C428B708 */ lwc1 $f8, %lo(D_80B7B708)($at) -/* 0AA38 80B743D8 E7A80100 */ swc1 $f8, 0x0100($sp) +/* 0AA34 80B743D4 C428B708 */ lwc1 $f8, %lo(D_80B7B708)($at) +/* 0AA38 80B743D8 E7A80100 */ swc1 $f8, 0x0100($sp) .L80B743DC: /* 0AA3C 80B743DC 3C0480B8 */ lui $a0, %hi(D_80B7A6C0) ## $a0 = 80B80000 /* 0AA40 80B743E0 3C063DCC */ lui $a2, 0x3DCC ## $a2 = 3DCC0000 @@ -3240,7 +3240,7 @@ glabel L80B738A0 /* 0AA48 80B743E8 2484A6C0 */ addiu $a0, $a0, %lo(D_80B7A6C0) ## $a0 = 80B7A6C0 /* 0AA4C 80B743EC 3C05420C */ lui $a1, 0x420C ## $a1 = 420C0000 /* 0AA50 80B743F0 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 0AA54 80B743F4 3C074060 */ lui $a3, 0x4060 ## $a3 = 40600000 /* 0AA58 80B743F8 3C0480B8 */ lui $a0, %hi(D_80B7A6BC) ## $a0 = 80B80000 /* 0AA5C 80B743FC 3C063E99 */ lui $a2, 0x3E99 ## $a2 = 3E990000 @@ -3249,8 +3249,8 @@ glabel L80B738A0 /* 0AA68 80B74408 34C6999A */ ori $a2, $a2, 0x999A ## $a2 = 3E99999A /* 0AA6C 80B7440C 2484A6BC */ addiu $a0, $a0, %lo(D_80B7A6BC) ## $a0 = 80B7A6BC /* 0AA70 80B74410 0C01E107 */ jal Math_SmoothScaleMaxF - -/* 0AA74 80B74414 8FA50100 */ lw $a1, 0x0100($sp) + +/* 0AA74 80B74414 8FA50100 */ lw $a1, 0x0100($sp) .L80B74418: /* 0AA78 80B74418 8E1801C0 */ lw $t8, 0x01C0($s0) ## 000001C0 /* 0AA7C 80B7441C 3C0E80B8 */ lui $t6, %hi(D_80B7EABC) ## $t6 = 80B80000 @@ -3267,199 +3267,199 @@ glabel L80B738A0 /* 0AAA8 80B74448 C4420948 */ lwc1 $f2, 0x0948($v0) ## 80B7EAB0 /* 0AAAC 80B7444C C448094C */ lwc1 $f8, 0x094C($v0) ## 80B7EAB4 /* 0AAB0 80B74450 C4460958 */ lwc1 $f6, 0x0958($v0) ## 80B7EAC0 -/* 0AAB4 80B74454 46025101 */ sub.s $f4, $f10, $f2 -/* 0AAB8 80B74458 46083281 */ sub.s $f10, $f6, $f8 -/* 0AABC 80B7445C E7A4010C */ swc1 $f4, 0x010C($sp) +/* 0AAB4 80B74454 46025101 */ sub.s $f4, $f10, $f2 +/* 0AAB8 80B74458 46083281 */ sub.s $f10, $f6, $f8 +/* 0AABC 80B7445C E7A4010C */ swc1 $f4, 0x010C($sp) /* 0AAC0 80B74460 C444095C */ lwc1 $f4, 0x095C($v0) ## 80B7EAC4 /* 0AAC4 80B74464 C4460950 */ lwc1 $f6, 0x0950($v0) ## 80B7EAB8 -/* 0AAC8 80B74468 E7AA0110 */ swc1 $f10, 0x0110($sp) +/* 0AAC8 80B74468 E7AA0110 */ swc1 $f10, 0x0110($sp) /* 0AACC 80B7446C 44815000 */ mtc1 $at, $f10 ## $f10 = 400.00 -/* 0AAD0 80B74470 46062201 */ sub.s $f8, $f4, $f6 -/* 0AAD4 80B74474 C7A4010C */ lwc1 $f4, 0x010C($sp) -/* 0AAD8 80B74478 E7A80114 */ swc1 $f8, 0x0114($sp) -/* 0AADC 80B7447C 46042182 */ mul.s $f6, $f4, $f4 -/* 0AAE0 80B74480 C7A80110 */ lwc1 $f8, 0x0110($sp) -/* 0AAE4 80B74484 46084102 */ mul.s $f4, $f8, $f8 -/* 0AAE8 80B74488 46043200 */ add.s $f8, $f6, $f4 -/* 0AAEC 80B7448C C7A60114 */ lwc1 $f6, 0x0114($sp) -/* 0AAF0 80B74490 46063102 */ mul.s $f4, $f6, $f6 -/* 0AAF4 80B74494 46044180 */ add.s $f6, $f8, $f4 -/* 0AAF8 80B74498 4606503C */ c.lt.s $f10, $f6 +/* 0AAD0 80B74470 46062201 */ sub.s $f8, $f4, $f6 +/* 0AAD4 80B74474 C7A4010C */ lwc1 $f4, 0x010C($sp) +/* 0AAD8 80B74478 E7A80114 */ swc1 $f8, 0x0114($sp) +/* 0AADC 80B7447C 46042182 */ mul.s $f6, $f4, $f4 +/* 0AAE0 80B74480 C7A80110 */ lwc1 $f8, 0x0110($sp) +/* 0AAE4 80B74484 46084102 */ mul.s $f4, $f8, $f8 +/* 0AAE8 80B74488 46043200 */ add.s $f8, $f6, $f4 +/* 0AAEC 80B7448C C7A60114 */ lwc1 $f6, 0x0114($sp) +/* 0AAF0 80B74490 46063102 */ mul.s $f4, $f6, $f6 +/* 0AAF4 80B74494 46044180 */ add.s $f6, $f8, $f4 +/* 0AAF8 80B74498 4606503C */ c.lt.s $f10, $f6 /* 0AAFC 80B7449C 00000000 */ nop -/* 0AB00 80B744A0 4500002F */ bc1f .L80B74560 +/* 0AB00 80B744A0 4500002F */ bc1f .L80B74560 /* 0AB04 80B744A4 3C013FC0 */ lui $at, 0x3FC0 ## $at = 3FC00000 /* 0AB08 80B744A8 44812000 */ mtc1 $at, $f4 ## $f4 = 1.50 /* 0AB0C 80B744AC C6080068 */ lwc1 $f8, 0x0068($s0) ## 00000068 -/* 0AB10 80B744B0 44051000 */ mfc1 $a1, $f2 +/* 0AB10 80B744B0 44051000 */ mfc1 $a1, $f2 /* 0AB14 80B744B4 3C063E4C */ lui $a2, 0x3E4C ## $a2 = 3E4C0000 -/* 0AB18 80B744B8 46044002 */ mul.s $f0, $f8, $f4 +/* 0AB18 80B744B8 46044002 */ mul.s $f0, $f8, $f4 /* 0AB1C 80B744BC 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3E4CCCCD /* 0AB20 80B744C0 26040024 */ addiu $a0, $s0, 0x0024 ## $a0 = 00000024 -/* 0AB24 80B744C4 46000280 */ add.s $f10, $f0, $f0 -/* 0AB28 80B744C8 44075000 */ mfc1 $a3, $f10 +/* 0AB24 80B744C4 46000280 */ add.s $f10, $f0, $f0 +/* 0AB28 80B744C8 44075000 */ mfc1 $a3, $f10 /* 0AB2C 80B744CC 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 0AB30 80B744D0 00000000 */ nop /* 0AB34 80B744D4 3C013FC0 */ lui $at, 0x3FC0 ## $at = 3FC00000 /* 0AB38 80B744D8 44814000 */ mtc1 $at, $f8 ## $f8 = 1.50 /* 0AB3C 80B744DC C6060068 */ lwc1 $f6, 0x0068($s0) ## 00000068 /* 0AB40 80B744E0 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 /* 0AB44 80B744E4 44815000 */ mtc1 $at, $f10 ## $f10 = 5.00 -/* 0AB48 80B744E8 46083002 */ mul.s $f0, $f6, $f8 +/* 0AB48 80B744E8 46083002 */ mul.s $f0, $f6, $f8 /* 0AB4C 80B744EC 3C0180B8 */ lui $at, %hi(D_80B7B70C) ## $at = 80B80000 -/* 0AB50 80B744F0 C428B70C */ lwc1 $f8, %lo(D_80B7B70C)($at) +/* 0AB50 80B744F0 C428B70C */ lwc1 $f8, %lo(D_80B7B70C)($at) /* 0AB54 80B744F4 3C0280B8 */ lui $v0, %hi(D_80B7E168) ## $v0 = 80B80000 /* 0AB58 80B744F8 2442E168 */ addiu $v0, $v0, %lo(D_80B7E168) ## $v0 = 80B7E168 /* 0AB5C 80B744FC 3C063E4C */ lui $a2, 0x3E4C ## $a2 = 3E4C0000 /* 0AB60 80B74500 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3E4CCCCD -/* 0AB64 80B74504 46000100 */ add.s $f4, $f0, $f0 +/* 0AB64 80B74504 46000100 */ add.s $f4, $f0, $f0 /* 0AB68 80B74508 8C45094C */ lw $a1, 0x094C($v0) ## 80B7EAB4 /* 0AB6C 80B7450C 26040028 */ addiu $a0, $s0, 0x0028 ## $a0 = 00000028 -/* 0AB70 80B74510 460A2182 */ mul.s $f6, $f4, $f10 +/* 0AB70 80B74510 460A2182 */ mul.s $f6, $f4, $f10 /* 0AB74 80B74514 00000000 */ nop -/* 0AB78 80B74518 46083102 */ mul.s $f4, $f6, $f8 -/* 0AB7C 80B7451C 44072000 */ mfc1 $a3, $f4 +/* 0AB78 80B74518 46083102 */ mul.s $f4, $f6, $f8 +/* 0AB7C 80B7451C 44072000 */ mfc1 $a3, $f4 /* 0AB80 80B74520 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 0AB84 80B74524 00000000 */ nop /* 0AB88 80B74528 3C013FC0 */ lui $at, 0x3FC0 ## $at = 3FC00000 /* 0AB8C 80B7452C 44813000 */ mtc1 $at, $f6 ## $f6 = 1.50 /* 0AB90 80B74530 C60A0068 */ lwc1 $f10, 0x0068($s0) ## 00000068 /* 0AB94 80B74534 3C0280B8 */ lui $v0, %hi(D_80B7E168) ## $v0 = 80B80000 /* 0AB98 80B74538 2442E168 */ addiu $v0, $v0, %lo(D_80B7E168) ## $v0 = 80B7E168 -/* 0AB9C 80B7453C 46065002 */ mul.s $f0, $f10, $f6 +/* 0AB9C 80B7453C 46065002 */ mul.s $f0, $f10, $f6 /* 0ABA0 80B74540 3C063E4C */ lui $a2, 0x3E4C ## $a2 = 3E4C0000 /* 0ABA4 80B74544 34C6CCCD */ ori $a2, $a2, 0xCCCD ## $a2 = 3E4CCCCD /* 0ABA8 80B74548 8C450950 */ lw $a1, 0x0950($v0) ## 80B7EAB8 /* 0ABAC 80B7454C 2604002C */ addiu $a0, $s0, 0x002C ## $a0 = 0000002C -/* 0ABB0 80B74550 46000200 */ add.s $f8, $f0, $f0 -/* 0ABB4 80B74554 44074000 */ mfc1 $a3, $f8 +/* 0ABB0 80B74550 46000200 */ add.s $f8, $f0, $f0 +/* 0ABB4 80B74554 44074000 */ mfc1 $a3, $f8 /* 0ABB8 80B74558 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 0ABBC 80B7455C 00000000 */ nop .L80B74560: -/* 0ABC0 80B74560 8FB9004C */ lw $t9, 0x004C($sp) +/* 0ABC0 80B74560 8FB9004C */ lw $t9, 0x004C($sp) /* 0ABC4 80B74564 3C01FFFF */ lui $at, 0xFFFF ## $at = FFFF0000 /* 0ABC8 80B74568 34217FFF */ ori $at, $at, 0x7FFF ## $at = FFFF7FFF /* 0ABCC 80B7456C 972A0000 */ lhu $t2, 0x0000($t9) ## 00000000 /* 0ABD0 80B74570 3C0380B8 */ lui $v1, %hi(D_80B7E122) ## $v1 = 80B80000 -/* 0ABD4 80B74574 8463E122 */ lh $v1, %lo(D_80B7E122)($v1) -/* 0ABD8 80B74578 01416027 */ nor $t4, $t2, $at -/* 0ABDC 80B7457C 11800004 */ beq $t4, $zero, .L80B74590 +/* 0ABD4 80B74574 8463E122 */ lh $v1, %lo(D_80B7E122)($v1) +/* 0ABD8 80B74578 01416027 */ nor $t4, $t2, $at +/* 0ABDC 80B7457C 11800004 */ beq $t4, $zero, .L80B74590 /* 0ABE0 80B74580 00000000 */ nop /* 0ABE4 80B74584 83290015 */ lb $t1, 0x0015($t9) ## 00000015 -/* 0ABE8 80B74588 2921FFE2 */ slti $at, $t1, 0xFFE2 -/* 0ABEC 80B7458C 10200008 */ beq $at, $zero, .L80B745B0 +/* 0ABE8 80B74588 2921FFE2 */ slti $at, $t1, 0xFFE2 +/* 0ABEC 80B7458C 10200008 */ beq $at, $zero, .L80B745B0 .L80B74590: /* 0ABF0 80B74590 3C0480B8 */ lui $a0, %hi(D_80B7E116) ## $a0 = 80B80000 /* 0ABF4 80B74594 2484E116 */ addiu $a0, $a0, %lo(D_80B7E116) ## $a0 = 80B7E116 /* 0ABF8 80B74598 84820000 */ lh $v0, 0x0000($a0) ## 80B7E116 -/* 0ABFC 80B7459C 28410064 */ slti $at, $v0, 0x0064 -/* 0AC00 80B745A0 10200009 */ beq $at, $zero, .L80B745C8 +/* 0ABFC 80B7459C 28410064 */ slti $at, $v0, 0x0064 +/* 0AC00 80B745A0 10200009 */ beq $at, $zero, .L80B745C8 /* 0AC04 80B745A4 244B0001 */ addiu $t3, $v0, 0x0001 ## $t3 = 00000001 -/* 0AC08 80B745A8 10000007 */ beq $zero, $zero, .L80B745C8 +/* 0AC08 80B745A8 10000007 */ beq $zero, $zero, .L80B745C8 /* 0AC0C 80B745AC A48B0000 */ sh $t3, 0x0000($a0) ## 80B7E116 .L80B745B0: /* 0AC10 80B745B0 3C0280B8 */ lui $v0, %hi(D_80B7E116) ## $v0 = 80B80000 -/* 0AC14 80B745B4 8442E116 */ lh $v0, %lo(D_80B7E116)($v0) -/* 0AC18 80B745B8 10400003 */ beq $v0, $zero, .L80B745C8 +/* 0AC14 80B745B4 8442E116 */ lh $v0, %lo(D_80B7E116)($v0) +/* 0AC18 80B745B8 10400003 */ beq $v0, $zero, .L80B745C8 /* 0AC1C 80B745BC 244DFFFF */ addiu $t5, $v0, 0xFFFF ## $t5 = 80B7FFFF /* 0AC20 80B745C0 3C0180B8 */ lui $at, %hi(D_80B7E116) ## $at = 80B80000 -/* 0AC24 80B745C4 A42DE116 */ sh $t5, %lo(D_80B7E116)($at) +/* 0AC24 80B745C4 A42DE116 */ sh $t5, %lo(D_80B7E116)($at) .L80B745C8: /* 0AC28 80B745C8 3C0E80B8 */ lui $t6, %hi(D_80B7A694) ## $t6 = 80B80000 -/* 0AC2C 80B745CC 85CEA694 */ lh $t6, %lo(D_80B7A694)($t6) +/* 0AC2C 80B745CC 85CEA694 */ lh $t6, %lo(D_80B7A694)($t6) /* 0AC30 80B745D0 3C0480B8 */ lui $a0, %hi(D_80B7E116) ## $a0 = 80B80000 /* 0AC34 80B745D4 2484E116 */ addiu $a0, $a0, %lo(D_80B7E116) ## $a0 = 80B7E116 -/* 0AC38 80B745D8 29C10003 */ slti $at, $t6, 0x0003 -/* 0AC3C 80B745DC 14200029 */ bne $at, $zero, .L80B74684 +/* 0AC38 80B745D8 29C10003 */ slti $at, $t6, 0x0003 +/* 0AC3C 80B745DC 14200029 */ bne $at, $zero, .L80B74684 /* 0AC40 80B745E0 3C0F80B8 */ lui $t7, %hi(D_80B7E074) ## $t7 = 80B80000 -/* 0AC44 80B745E4 91EFE074 */ lbu $t7, %lo(D_80B7E074)($t7) -/* 0AC48 80B745E8 11E00004 */ beq $t7, $zero, .L80B745FC +/* 0AC44 80B745E4 91EFE074 */ lbu $t7, %lo(D_80B7E074)($t7) +/* 0AC48 80B745E8 11E00004 */ beq $t7, $zero, .L80B745FC /* 0AC4C 80B745EC 3C1880B8 */ lui $t8, %hi(D_80B7E080) ## $t8 = 80B80000 -/* 0AC50 80B745F0 8718E080 */ lh $t8, %lo(D_80B7E080)($t8) -/* 0AC54 80B745F4 2B010033 */ slti $at, $t8, 0x0033 -/* 0AC58 80B745F8 10200022 */ beq $at, $zero, .L80B74684 +/* 0AC50 80B745F0 8718E080 */ lh $t8, %lo(D_80B7E080)($t8) +/* 0AC54 80B745F4 2B010033 */ slti $at, $t8, 0x0033 +/* 0AC58 80B745F8 10200022 */ beq $at, $zero, .L80B74684 .L80B745FC: /* 0AC5C 80B745FC 3C0A80B8 */ lui $t2, %hi(D_80B7E080) ## $t2 = 80B80000 -/* 0AC60 80B74600 854AE080 */ lh $t2, %lo(D_80B7E080)($t2) -/* 0AC64 80B74604 29411770 */ slti $at, $t2, 0x1770 -/* 0AC68 80B74608 1020001E */ beq $at, $zero, .L80B74684 +/* 0AC60 80B74600 854AE080 */ lh $t2, %lo(D_80B7E080)($t2) +/* 0AC64 80B74604 29411770 */ slti $at, $t2, 0x1770 +/* 0AC68 80B74608 1020001E */ beq $at, $zero, .L80B74684 /* 0AC6C 80B7460C 00000000 */ nop -/* 0AC70 80B74610 14600004 */ bne $v1, $zero, .L80B74624 +/* 0AC70 80B74610 14600004 */ bne $v1, $zero, .L80B74624 /* 0AC74 80B74614 3C0C80B8 */ lui $t4, %hi(D_80B7E124) ## $t4 = 80B80000 -/* 0AC78 80B74618 918CE124 */ lbu $t4, %lo(D_80B7E124)($t4) -/* 0AC7C 80B7461C 11800019 */ beq $t4, $zero, .L80B74684 +/* 0AC78 80B74618 918CE124 */ lbu $t4, %lo(D_80B7E124)($t4) +/* 0AC7C 80B7461C 11800019 */ beq $t4, $zero, .L80B74684 /* 0AC80 80B74620 00000000 */ nop .L80B74624: /* 0AC84 80B74624 84990000 */ lh $t9, 0x0000($a0) ## 80B7E116 -/* 0AC88 80B74628 13200016 */ beq $t9, $zero, .L80B74684 +/* 0AC88 80B74628 13200016 */ beq $t9, $zero, .L80B74684 /* 0AC8C 80B7462C 3C0980B8 */ lui $t1, %hi(D_80B7E0AE) ## $t1 = 80B80000 -/* 0AC90 80B74630 8529E0AE */ lh $t1, %lo(D_80B7E0AE)($t1) +/* 0AC90 80B74630 8529E0AE */ lh $t1, %lo(D_80B7E0AE)($t1) /* 0AC94 80B74634 312B007F */ andi $t3, $t1, 0x007F ## $t3 = 00000000 -/* 0AC98 80B74638 15600056 */ bne $t3, $zero, .L80B74794 +/* 0AC98 80B74638 15600056 */ bne $t3, $zero, .L80B74794 /* 0AC9C 80B7463C 00000000 */ nop /* 0ACA0 80B74640 0C03F66B */ jal Math_Rand_ZeroOne ## Rand.Next() float /* 0ACA4 80B74644 00000000 */ nop /* 0ACA8 80B74648 3C0180B8 */ lui $at, %hi(D_80B7B710) ## $at = 80B80000 -/* 0ACAC 80B7464C C424B710 */ lwc1 $f4, %lo(D_80B7B710)($at) -/* 0ACB0 80B74650 4604003C */ c.lt.s $f0, $f4 +/* 0ACAC 80B7464C C424B710 */ lwc1 $f4, %lo(D_80B7B710)($at) +/* 0ACB0 80B74650 4604003C */ c.lt.s $f0, $f4 /* 0ACB4 80B74654 00000000 */ nop -/* 0ACB8 80B74658 4500004E */ bc1f .L80B74794 +/* 0ACB8 80B74658 4500004E */ bc1f .L80B74794 /* 0ACBC 80B7465C 3C0D80B8 */ lui $t5, %hi(D_80B7E0B6) ## $t5 = 80B80000 -/* 0ACC0 80B74660 91ADE0B6 */ lbu $t5, %lo(D_80B7E0B6)($t5) +/* 0ACC0 80B74660 91ADE0B6 */ lbu $t5, %lo(D_80B7E0B6)($t5) /* 0ACC4 80B74664 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 0ACC8 80B74668 11A1004A */ beq $t5, $at, .L80B74794 +/* 0ACC8 80B74668 11A1004A */ beq $t5, $at, .L80B74794 /* 0ACCC 80B7466C 3C0E8016 */ lui $t6, 0x8016 ## $t6 = 80160000 /* 0ACD0 80B74670 8DCEFA90 */ lw $t6, -0x0570($t6) ## 8015FA90 /* 0ACD4 80B74674 85CF0A5E */ lh $t7, 0x0A5E($t6) ## 80160A5E -/* 0ACD8 80B74678 15E00046 */ bne $t7, $zero, .L80B74794 +/* 0ACD8 80B74678 15E00046 */ bne $t7, $zero, .L80B74794 /* 0ACDC 80B7467C 3C0380B8 */ lui $v1, %hi(D_80B7E122) ## $v1 = 80B80000 -/* 0ACE0 80B74680 8463E122 */ lh $v1, %lo(D_80B7E122)($v1) +/* 0ACE0 80B74680 8463E122 */ lh $v1, %lo(D_80B7E122)($v1) .L80B74684: /* 0ACE4 80B74684 3C0480B8 */ lui $a0, %hi(D_80B7A67C) ## $a0 = 80B80000 /* 0ACE8 80B74688 2484A67C */ addiu $a0, $a0, %lo(D_80B7A67C) ## $a0 = 80B7A67C /* 0ACEC 80B7468C 24180014 */ addiu $t8, $zero, 0x0014 ## $t8 = 00000014 -/* 0ACF0 80B74690 14600018 */ bne $v1, $zero, .L80B746F4 +/* 0ACF0 80B74690 14600018 */ bne $v1, $zero, .L80B746F4 /* 0ACF4 80B74694 A0980000 */ sb $t8, 0x0000($a0) ## 80B7A67C /* 0ACF8 80B74698 3C0A80B8 */ lui $t2, %hi(D_80B7E124) ## $t2 = 80B80000 -/* 0ACFC 80B7469C 914AE124 */ lbu $t2, %lo(D_80B7E124)($t2) -/* 0AD00 80B746A0 15400014 */ bne $t2, $zero, .L80B746F4 +/* 0ACFC 80B7469C 914AE124 */ lbu $t2, %lo(D_80B7E124)($t2) +/* 0AD00 80B746A0 15400014 */ bne $t2, $zero, .L80B746F4 /* 0AD04 80B746A4 3C0280B8 */ lui $v0, %hi(D_80B7E075) ## $v0 = 80B80000 -/* 0AD08 80B746A8 9042E075 */ lbu $v0, %lo(D_80B7E075)($v0) +/* 0AD08 80B746A8 9042E075 */ lbu $v0, %lo(D_80B7E075)($v0) /* 0AD0C 80B746AC 24030001 */ addiu $v1, $zero, 0x0001 ## $v1 = 00000001 /* 0AD10 80B746B0 240C4081 */ addiu $t4, $zero, 0x4081 ## $t4 = 00004081 /* 0AD14 80B746B4 3C0180B8 */ lui $at, %hi(D_80B7E086) ## $at = 80B80000 -/* 0AD18 80B746B8 14620006 */ bne $v1, $v0, .L80B746D4 -/* 0AD1C 80B746BC A42CE086 */ sh $t4, %lo(D_80B7E086)($at) +/* 0AD18 80B746B8 14620006 */ bne $v1, $v0, .L80B746D4 +/* 0AD1C 80B746BC A42CE086 */ sh $t4, %lo(D_80B7E086)($at) /* 0AD20 80B746C0 3C198016 */ lui $t9, 0x8016 ## $t9 = 80160000 /* 0AD24 80B746C4 8F39F520 */ lw $t9, -0x0AE0($t9) ## 8015F520 /* 0AD28 80B746C8 33290400 */ andi $t1, $t9, 0x0400 ## $t1 = 00000000 -/* 0AD2C 80B746CC 15200007 */ bne $t1, $zero, .L80B746EC +/* 0AD2C 80B746CC 15200007 */ bne $t1, $zero, .L80B746EC /* 0AD30 80B746D0 00000000 */ nop .L80B746D4: -/* 0AD34 80B746D4 10620012 */ beq $v1, $v0, .L80B74720 +/* 0AD34 80B746D4 10620012 */ beq $v1, $v0, .L80B74720 /* 0AD38 80B746D8 3C0B8016 */ lui $t3, 0x8016 ## $t3 = 80160000 /* 0AD3C 80B746DC 8D6BF520 */ lw $t3, -0x0AE0($t3) ## 8015F520 /* 0AD40 80B746E0 316D0800 */ andi $t5, $t3, 0x0800 ## $t5 = 00000000 -/* 0AD44 80B746E4 51A0000F */ beql $t5, $zero, .L80B74724 +/* 0AD44 80B746E4 51A0000F */ beql $t5, $zero, .L80B74724 /* 0AD48 80B746E8 A600015A */ sh $zero, 0x015A($s0) ## 0000015A .L80B746EC: -/* 0AD4C 80B746EC 1000000C */ beq $zero, $zero, .L80B74720 +/* 0AD4C 80B746EC 1000000C */ beq $zero, $zero, .L80B74720 /* 0AD50 80B746F0 A0800000 */ sb $zero, 0x0000($a0) ## 80B7A67C .L80B746F4: /* 0AD54 80B746F4 240E4082 */ addiu $t6, $zero, 0x4082 ## $t6 = 00004082 /* 0AD58 80B746F8 3C0180B8 */ lui $at, %hi(D_80B7E086) ## $at = 80B80000 /* 0AD5C 80B746FC 44806000 */ mtc1 $zero, $f12 ## $f12 = 0.00 -/* 0AD60 80B74700 A42EE086 */ sh $t6, %lo(D_80B7E086)($at) +/* 0AD60 80B74700 A42EE086 */ sh $t6, %lo(D_80B7E086)($at) /* 0AD64 80B74704 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 /* 0AD68 80B74708 24060003 */ addiu $a2, $zero, 0x0003 ## $a2 = 00000003 -/* 0AD6C 80B7470C 0C02A7DB */ jal func_800A9F6C +/* 0AD6C 80B7470C 0C02A7DB */ jal func_800A9F6C /* 0AD70 80B74710 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 /* 0AD74 80B74714 3C04100A */ lui $a0, 0x100A ## $a0 = 100A0000 /* 0AD78 80B74718 0C03E803 */ jal Audio_SetBGM - + /* 0AD7C 80B7471C 348400FF */ ori $a0, $a0, 0x00FF ## $a0 = 100A00FF .L80B74720: /* 0AD80 80B74720 A600015A */ sh $zero, 0x015A($s0) ## 0000015A @@ -3475,23 +3475,23 @@ glabel L80B738A0 /* 0ADA4 80B74744 E6140190 */ swc1 $f20, 0x0190($s0) ## 00000190 /* 0ADA8 80B74748 3C0180B8 */ lui $at, %hi(D_80B7B714) ## $at = 80B80000 /* 0ADAC 80B7474C A60F0158 */ sh $t7, 0x0158($s0) ## 00000158 -/* 0ADB0 80B74750 C42AB714 */ lwc1 $f10, %lo(D_80B7B714)($at) +/* 0ADB0 80B74750 C42AB714 */ lwc1 $f10, %lo(D_80B7B714)($at) /* 0ADB4 80B74754 3C0C80B8 */ lui $t4, %hi(D_80B7A694) ## $t4 = 80B80000 /* 0ADB8 80B74758 24010004 */ addiu $at, $zero, 0x0004 ## $at = 00000004 /* 0ADBC 80B7475C E60A0194 */ swc1 $f10, 0x0194($s0) ## 00000194 -/* 0ADC0 80B74760 858CA694 */ lh $t4, %lo(D_80B7A694)($t4) -/* 0ADC4 80B74764 15810003 */ bne $t4, $at, .L80B74774 +/* 0ADC0 80B74760 858CA694 */ lh $t4, %lo(D_80B7A694)($t4) +/* 0ADC4 80B74764 15810003 */ bne $t4, $at, .L80B74774 /* 0ADC8 80B74768 24190003 */ addiu $t9, $zero, 0x0003 ## $t9 = 00000003 /* 0ADCC 80B7476C 3C0180B8 */ lui $at, %hi(D_80B7A694) ## $at = 80B80000 -/* 0ADD0 80B74770 A439A694 */ sh $t9, %lo(D_80B7A694)($at) +/* 0ADD0 80B74770 A439A694 */ sh $t9, %lo(D_80B7A694)($at) .L80B74774: /* 0ADD4 80B74774 3C0180B8 */ lui $at, %hi(D_80B7E0A6) ## $at = 80B80000 -/* 0ADD8 80B74778 A422E0A6 */ sh $v0, %lo(D_80B7E0A6)($at) +/* 0ADD8 80B74778 A422E0A6 */ sh $v0, %lo(D_80B7E0A6)($at) /* 0ADDC 80B7477C 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 /* 0ADE0 80B74780 44813000 */ mtc1 $at, $f6 ## $f6 = 0.50 /* 0ADE4 80B74784 3C0180B8 */ lui $at, %hi(D_80B7E11C) ## $at = 80B80000 -/* 0ADE8 80B74788 E426E11C */ swc1 $f6, %lo(D_80B7E11C)($at) -/* 0ADEC 80B7478C 100002BA */ beq $zero, $zero, .L80B75278 +/* 0ADE8 80B74788 E426E11C */ swc1 $f6, %lo(D_80B7E11C)($at) +/* 0ADEC 80B7478C 100002BA */ beq $zero, $zero, .L80B75278 /* 0ADF0 80B74790 A2000152 */ sb $zero, 0x0152($s0) ## 00000152 .L80B74794: /* 0ADF4 80B74794 3C098016 */ lui $t1, 0x8016 ## $t1 = 80160000 @@ -3502,22 +3502,22 @@ glabel L80B738A0 /* 0AE08 80B747A8 C6080090 */ lwc1 $f8, 0x0090($s0) ## 00000090 /* 0AE0C 80B747AC 448B2000 */ mtc1 $t3, $f4 ## $f4 = 0.00 /* 0AE10 80B747B0 00000000 */ nop -/* 0AE14 80B747B4 468022A0 */ cvt.s.w $f10, $f4 -/* 0AE18 80B747B8 46065100 */ add.s $f4, $f10, $f6 -/* 0AE1C 80B747BC 4604403C */ c.lt.s $f8, $f4 +/* 0AE14 80B747B4 468022A0 */ cvt.s.w $f10, $f4 +/* 0AE18 80B747B8 46065100 */ add.s $f4, $f10, $f6 +/* 0AE1C 80B747BC 4604403C */ c.lt.s $f8, $f4 /* 0AE20 80B747C0 00000000 */ nop -/* 0AE24 80B747C4 450002AC */ bc1f .L80B75278 +/* 0AE24 80B747C4 450002AC */ bc1f .L80B75278 /* 0AE28 80B747C8 240D0006 */ addiu $t5, $zero, 0x0006 ## $t5 = 00000006 /* 0AE2C 80B747CC 240E0064 */ addiu $t6, $zero, 0x0064 ## $t6 = 00000064 /* 0AE30 80B747D0 A60D0158 */ sh $t5, 0x0158($s0) ## 00000158 /* 0AE34 80B747D4 A60E017A */ sh $t6, 0x017A($s0) ## 0000017A -/* 0AE38 80B747D8 8FB800E0 */ lw $t8, 0x00E0($sp) +/* 0AE38 80B747D8 8FB800E0 */ lw $t8, 0x00E0($sp) /* 0AE3C 80B747DC 240F0003 */ addiu $t7, $zero, 0x0003 ## $t7 = 00000003 /* 0AE40 80B747E0 44806000 */ mtc1 $zero, $f12 ## $f12 = 0.00 /* 0AE44 80B747E4 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 /* 0AE48 80B747E8 24060003 */ addiu $a2, $zero, 0x0003 ## $a2 = 00000003 /* 0AE4C 80B747EC 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 0AE50 80B747F0 0C02A7DB */ jal func_800A9F6C +/* 0AE50 80B747F0 0C02A7DB */ jal func_800A9F6C /* 0AE54 80B747F4 A70F0860 */ sh $t7, 0x0860($t8) ## 00002F70 /* 0AE58 80B747F8 3C0280B8 */ lui $v0, %hi(D_80B7E084) ## $v0 = 80B80000 /* 0AE5C 80B747FC 2442E084 */ addiu $v0, $v0, %lo(D_80B7E084) ## $v0 = 80B7E084 @@ -3525,24 +3525,24 @@ glabel L80B738A0 /* 0AE64 80B74804 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 0AE68 80B74808 26251D64 */ addiu $a1, $s1, 0x1D64 ## $a1 = 00001D64 /* 0AE6C 80B7480C 254C0001 */ addiu $t4, $t2, 0x0001 ## $t4 = 00000001 -/* 0AE70 80B74810 0C019148 */ jal func_80064520 +/* 0AE70 80B74810 0C019148 */ jal func_80064520 /* 0AE74 80B74814 A44C0000 */ sh $t4, 0x0000($v0) ## 80B7E084 /* 0AE78 80B74818 24190064 */ addiu $t9, $zero, 0x0064 ## $t9 = 00000064 /* 0AE7C 80B7481C 3C0180B8 */ lui $at, %hi(D_80B7A6CC) ## $at = 80B80000 -/* 0AE80 80B74820 A039A6CC */ sb $t9, %lo(D_80B7A6CC)($at) +/* 0AE80 80B74820 A039A6CC */ sb $t9, %lo(D_80B7A6CC)($at) /* 0AE84 80B74824 3C014234 */ lui $at, 0x4234 ## $at = 42340000 /* 0AE88 80B74828 44815000 */ mtc1 $at, $f10 ## $f10 = 45.00 /* 0AE8C 80B7482C 3C0180B8 */ lui $at, %hi(D_80B7FEC8) ## $at = 80B80000 /* 0AE90 80B74830 24090005 */ addiu $t1, $zero, 0x0005 ## $t1 = 00000005 -/* 0AE94 80B74834 E42AFEC8 */ swc1 $f10, %lo(D_80B7FEC8)($at) +/* 0AE94 80B74834 E42AFEC8 */ swc1 $f10, %lo(D_80B7FEC8)($at) /* 0AE98 80B74838 3C0180B8 */ lui $at, %hi(D_80B7A694) ## $at = 80B80000 -/* 0AE9C 80B7483C A429A694 */ sh $t1, %lo(D_80B7A694)($at) +/* 0AE9C 80B7483C A429A694 */ sh $t1, %lo(D_80B7A694)($at) /* 0AEA0 80B74840 3C0143FA */ lui $at, 0x43FA ## $at = 43FA0000 /* 0AEA4 80B74844 44813000 */ mtc1 $at, $f6 ## $f6 = 500.00 /* 0AEA8 80B74848 E6140190 */ swc1 $f20, 0x0190($s0) ## 00000190 /* 0AEAC 80B7484C 3C0180B8 */ lui $at, %hi(D_80B7B718) ## $at = 80B80000 /* 0AEB0 80B74850 E6060194 */ swc1 $f6, 0x0194($s0) ## 00000194 -/* 0AEB4 80B74854 C428B718 */ lwc1 $f8, %lo(D_80B7B718)($at) +/* 0AEB4 80B74854 C428B718 */ lwc1 $f8, %lo(D_80B7B718)($at) /* 0AEB8 80B74858 C6060028 */ lwc1 $f6, 0x0028($s0) ## 00000028 /* 0AEBC 80B7485C E608019C */ swc1 $f8, 0x019C($s0) ## 0000019C /* 0AEC0 80B74860 8E2B07C0 */ lw $t3, 0x07C0($s1) ## 000007C0 @@ -3550,30 +3550,30 @@ glabel L80B738A0 /* 0AEC8 80B74868 85AE0002 */ lh $t6, 0x0002($t5) ## 00000002 /* 0AECC 80B7486C 448E2000 */ mtc1 $t6, $f4 ## $f4 = 0.00 /* 0AED0 80B74870 00000000 */ nop -/* 0AED4 80B74874 468022A0 */ cvt.s.w $f10, $f4 -/* 0AED8 80B74878 460A303E */ c.le.s $f6, $f10 +/* 0AED4 80B74874 468022A0 */ cvt.s.w $f10, $f4 +/* 0AED8 80B74878 460A303E */ c.le.s $f6, $f10 /* 0AEDC 80B7487C 00000000 */ nop -/* 0AEE0 80B74880 45000007 */ bc1f .L80B748A0 +/* 0AEE0 80B74880 45000007 */ bc1f .L80B748A0 /* 0AEE4 80B74884 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0AEE8 80B74888 0C2DC49E */ jal func_80B71278 +/* 0AEE8 80B74888 0C2DC49E */ jal func_80B71278 /* 0AEEC 80B7488C 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 /* 0AEF0 80B74890 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 0AEF4 80B74894 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 0AEF8 80B74898 0C2DC28B */ jal func_80B70A2C +/* 0AEF8 80B74898 0C2DC28B */ jal func_80B70A2C /* 0AEFC 80B7489C 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 glabel L80B748A0 .L80B748A0: /* 0AF00 80B748A0 260F0024 */ addiu $t7, $s0, 0x0024 ## $t7 = 00000024 /* 0AF04 80B748A4 26180028 */ addiu $t8, $s0, 0x0028 ## $t8 = 00000028 /* 0AF08 80B748A8 260A002C */ addiu $t2, $s0, 0x002C ## $t2 = 0000002C -/* 0AF0C 80B748AC AFAA003C */ sw $t2, 0x003C($sp) -/* 0AF10 80B748B0 AFB80044 */ sw $t8, 0x0044($sp) -/* 0AF14 80B748B4 AFAF0048 */ sw $t7, 0x0048($sp) -/* 0AF18 80B748B8 8FA40040 */ lw $a0, 0x0040($sp) +/* 0AF0C 80B748AC AFAA003C */ sw $t2, 0x003C($sp) +/* 0AF10 80B748B0 AFB80044 */ sw $t8, 0x0044($sp) +/* 0AF14 80B748B4 AFAF0048 */ sw $t7, 0x0048($sp) +/* 0AF18 80B748B8 8FA40040 */ lw $a0, 0x0040($sp) /* 0AF1C 80B748BC 24052AF8 */ addiu $a1, $zero, 0x2AF8 ## $a1 = 00002AF8 /* 0AF20 80B748C0 24060002 */ addiu $a2, $zero, 0x0002 ## $a2 = 00000002 /* 0AF24 80B748C4 0C01E1EF */ jal Math_SmoothScaleMaxS - + /* 0AF28 80B748C8 24070FA0 */ addiu $a3, $zero, 0x0FA0 ## $a3 = 00000FA0 /* 0AF2C 80B748CC 3C0480B8 */ lui $a0, %hi(D_80B7FEC8) ## $a0 = 80B80000 /* 0AF30 80B748D0 3C063D4C */ lui $a2, 0x3D4C ## $a2 = 3D4C0000 @@ -3581,31 +3581,31 @@ glabel L80B748A0 /* 0AF38 80B748D8 2484FEC8 */ addiu $a0, $a0, %lo(D_80B7FEC8) ## $a0 = 80B7FEC8 /* 0AF3C 80B748DC 3C054170 */ lui $a1, 0x4170 ## $a1 = 41700000 /* 0AF40 80B748E0 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 0AF44 80B748E4 3C073F40 */ lui $a3, 0x3F40 ## $a3 = 3F400000 /* 0AF48 80B748E8 3C0180B8 */ lui $at, %hi(D_80B7FEC8) ## $at = 80B80000 /* 0AF4C 80B748EC 3C0C80B8 */ lui $t4, %hi(D_80B7E075) ## $t4 = 80B80000 -/* 0AF50 80B748F0 C428FEC8 */ lwc1 $f8, %lo(D_80B7FEC8)($at) -/* 0AF54 80B748F4 918CE075 */ lbu $t4, %lo(D_80B7E075)($t4) +/* 0AF50 80B748F0 C428FEC8 */ lwc1 $f8, %lo(D_80B7FEC8)($at) +/* 0AF54 80B748F4 918CE075 */ lbu $t4, %lo(D_80B7E075)($t4) /* 0AF58 80B748F8 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 0AF5C 80B748FC E7A8010C */ swc1 $f8, 0x010C($sp) -/* 0AF60 80B74900 11810007 */ beq $t4, $at, .L80B74920 +/* 0AF5C 80B748FC E7A8010C */ swc1 $f8, 0x010C($sp) +/* 0AF60 80B74900 11810007 */ beq $t4, $at, .L80B74920 /* 0AF64 80B74904 3C0141F0 */ lui $at, 0x41F0 ## $at = 41F00000 /* 0AF68 80B74908 44812000 */ mtc1 $at, $f4 ## $f4 = 30.00 /* 0AF6C 80B7490C 3C01425C */ lui $at, 0x425C ## $at = 425C0000 /* 0AF70 80B74910 44815000 */ mtc1 $at, $f10 ## $f10 = 55.00 -/* 0AF74 80B74914 E7A40110 */ swc1 $f4, 0x0110($sp) -/* 0AF78 80B74918 10000007 */ beq $zero, $zero, .L80B74938 -/* 0AF7C 80B7491C E7AA0114 */ swc1 $f10, 0x0114($sp) +/* 0AF74 80B74914 E7A40110 */ swc1 $f4, 0x0110($sp) +/* 0AF78 80B74918 10000007 */ beq $zero, $zero, .L80B74938 +/* 0AF7C 80B7491C E7AA0114 */ swc1 $f10, 0x0114($sp) .L80B74920: /* 0AF80 80B74920 3C014120 */ lui $at, 0x4120 ## $at = 41200000 /* 0AF84 80B74924 44813000 */ mtc1 $at, $f6 ## $f6 = 10.00 /* 0AF88 80B74928 3C014248 */ lui $at, 0x4248 ## $at = 42480000 /* 0AF8C 80B7492C 44814000 */ mtc1 $at, $f8 ## $f8 = 50.00 -/* 0AF90 80B74930 E7A60110 */ swc1 $f6, 0x0110($sp) -/* 0AF94 80B74934 E7A80114 */ swc1 $f8, 0x0114($sp) +/* 0AF90 80B74930 E7A60110 */ swc1 $f6, 0x0110($sp) +/* 0AF94 80B74934 E7A80114 */ swc1 $f8, 0x0114($sp) .L80B74938: -/* 0AF98 80B74938 8FB900E0 */ lw $t9, 0x00E0($sp) +/* 0AF98 80B74938 8FB900E0 */ lw $t9, 0x00E0($sp) /* 0AF9C 80B7493C 3C014700 */ lui $at, 0x4700 ## $at = 47000000 /* 0AFA0 80B74940 44813000 */ mtc1 $at, $f6 ## $f6 = 32768.00 /* 0AFA4 80B74944 872900B6 */ lh $t1, 0x00B6($t9) ## 000000B6 @@ -3613,34 +3613,34 @@ glabel L80B748A0 /* 0AFAC 80B7494C 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 0AFB0 80B74950 44892000 */ mtc1 $t1, $f4 ## $f4 = 0.00 /* 0AFB4 80B74954 00000000 */ nop -/* 0AFB8 80B74958 468022A0 */ cvt.s.w $f10, $f4 -/* 0AFBC 80B7495C C424B71C */ lwc1 $f4, %lo(D_80B7B71C)($at) -/* 0AFC0 80B74960 46065203 */ div.s $f8, $f10, $f6 -/* 0AFC4 80B74964 46044302 */ mul.s $f12, $f8, $f4 -/* 0AFC8 80B74968 0C034348 */ jal Matrix_RotateY +/* 0AFB8 80B74958 468022A0 */ cvt.s.w $f10, $f4 +/* 0AFBC 80B7495C C424B71C */ lwc1 $f4, %lo(D_80B7B71C)($at) +/* 0AFC0 80B74960 46065203 */ div.s $f8, $f10, $f6 +/* 0AFC4 80B74964 46044302 */ mul.s $f12, $f8, $f4 +/* 0AFC8 80B74968 0C034348 */ jal Matrix_RotateY /* 0AFCC 80B7496C 00000000 */ nop /* 0AFD0 80B74970 3C0580B8 */ lui $a1, %hi(D_80B7FEA8) ## $a1 = 80B80000 /* 0AFD4 80B74974 24A5FEA8 */ addiu $a1, $a1, %lo(D_80B7FEA8) ## $a1 = 80B7FEA8 -/* 0AFD8 80B74978 0C0346BD */ jal Matrix_MultVec3f +/* 0AFD8 80B74978 0C0346BD */ jal Matrix_MultVec3f /* 0AFDC 80B7497C 27A4010C */ addiu $a0, $sp, 0x010C ## $a0 = FFFFFFD4 -/* 0AFE0 80B74980 8FA300E0 */ lw $v1, 0x00E0($sp) +/* 0AFE0 80B74980 8FA300E0 */ lw $v1, 0x00E0($sp) /* 0AFE4 80B74984 3C0580B8 */ lui $a1, %hi(D_80B7FEA8) ## $a1 = 80B80000 /* 0AFE8 80B74988 24A5FEA8 */ addiu $a1, $a1, %lo(D_80B7FEA8) ## $a1 = 80B7FEA8 /* 0AFEC 80B7498C C4AA0000 */ lwc1 $f10, 0x0000($a1) ## 80B7FEA8 /* 0AFF0 80B74990 C4660024 */ lwc1 $f6, 0x0024($v1) ## 00000024 /* 0AFF4 80B74994 C4A40004 */ lwc1 $f4, 0x0004($a1) ## 80B7FEAC /* 0AFF8 80B74998 3C0280B8 */ lui $v0, %hi(D_80B7FEB8) ## $v0 = 80B80000 -/* 0AFFC 80B7499C 46065200 */ add.s $f8, $f10, $f6 +/* 0AFFC 80B7499C 46065200 */ add.s $f8, $f10, $f6 /* 0B000 80B749A0 2442FEB8 */ addiu $v0, $v0, %lo(D_80B7FEB8) ## $v0 = 80B7FEB8 /* 0B004 80B749A4 3C0E80B8 */ lui $t6, %hi(D_80B7E075) ## $t6 = 80B80000 /* 0B008 80B749A8 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 /* 0B00C 80B749AC E4A80000 */ swc1 $f8, 0x0000($a1) ## 80B7FEA8 /* 0B010 80B749B0 C46A0028 */ lwc1 $f10, 0x0028($v1) ## 00000028 /* 0B014 80B749B4 C4A80008 */ lwc1 $f8, 0x0008($a1) ## 80B7FEB0 -/* 0B018 80B749B8 460A2180 */ add.s $f6, $f4, $f10 +/* 0B018 80B749B8 460A2180 */ add.s $f6, $f4, $f10 /* 0B01C 80B749BC E4A60004 */ swc1 $f6, 0x0004($a1) ## 80B7FEAC /* 0B020 80B749C0 C464002C */ lwc1 $f4, 0x002C($v1) ## 0000002C -/* 0B024 80B749C4 46044280 */ add.s $f10, $f8, $f4 +/* 0B024 80B749C4 46044280 */ add.s $f10, $f8, $f4 /* 0B028 80B749C8 E4AA0008 */ swc1 $f10, 0x0008($a1) ## 80B7FEB0 /* 0B02C 80B749CC 8C6D0024 */ lw $t5, 0x0024($v1) ## 00000024 /* 0B030 80B749D0 AC4D0000 */ sw $t5, 0x0000($v0) ## 80B7FEB8 @@ -3648,138 +3648,138 @@ glabel L80B748A0 /* 0B038 80B749D8 AC4B0004 */ sw $t3, 0x0004($v0) ## 80B7FEBC /* 0B03C 80B749DC 8C6D002C */ lw $t5, 0x002C($v1) ## 0000002C /* 0B040 80B749E0 AC4D0008 */ sw $t5, 0x0008($v0) ## 80B7FEC0 -/* 0B044 80B749E4 91CEE075 */ lbu $t6, %lo(D_80B7E075)($t6) -/* 0B048 80B749E8 11C10006 */ beq $t6, $at, .L80B74A04 +/* 0B044 80B749E4 91CEE075 */ lbu $t6, %lo(D_80B7E075)($t6) +/* 0B048 80B749E8 11C10006 */ beq $t6, $at, .L80B74A04 /* 0B04C 80B749EC 3C014220 */ lui $at, 0x4220 ## $at = 42200000 /* 0B050 80B749F0 44814000 */ mtc1 $at, $f8 ## $f8 = 40.00 /* 0B054 80B749F4 C4460004 */ lwc1 $f6, 0x0004($v0) ## 80B7FEBC -/* 0B058 80B749F8 46083100 */ add.s $f4, $f6, $f8 -/* 0B05C 80B749FC 10000006 */ beq $zero, $zero, .L80B74A18 +/* 0B058 80B749F8 46083100 */ add.s $f4, $f6, $f8 +/* 0B05C 80B749FC 10000006 */ beq $zero, $zero, .L80B74A18 /* 0B060 80B74A00 E4440004 */ swc1 $f4, 0x0004($v0) ## 80B7FEBC .L80B74A04: /* 0B064 80B74A04 3C0141C8 */ lui $at, 0x41C8 ## $at = 41C80000 /* 0B068 80B74A08 44813000 */ mtc1 $at, $f6 ## $f6 = 25.00 /* 0B06C 80B74A0C C44A0004 */ lwc1 $f10, 0x0004($v0) ## 80B7FEBC -/* 0B070 80B74A10 46065200 */ add.s $f8, $f10, $f6 +/* 0B070 80B74A10 46065200 */ add.s $f8, $f10, $f6 /* 0B074 80B74A14 E4480004 */ swc1 $f8, 0x0004($v0) ## 80B7FEBC .L80B74A18: /* 0B078 80B74A18 860F017A */ lh $t7, 0x017A($s0) ## 0000017A /* 0B07C 80B74A1C 2401005A */ addiu $at, $zero, 0x005A ## $at = 0000005A -/* 0B080 80B74A20 55E10068 */ bnel $t7, $at, .L80B74BC4 +/* 0B080 80B74A20 55E10068 */ bnel $t7, $at, .L80B74BC4 /* 0B084 80B74A24 240AC000 */ addiu $t2, $zero, 0xC000 ## $t2 = FFFFC000 /* 0B088 80B74A28 0C03E803 */ jal Audio_SetBGM - + /* 0B08C 80B74A2C 24040924 */ addiu $a0, $zero, 0x0924 ## $a0 = 00000924 /* 0B090 80B74A30 3C0480B8 */ lui $a0, %hi(D_80B7A67C) ## $a0 = 80B80000 /* 0B094 80B74A34 2484A67C */ addiu $a0, $a0, %lo(D_80B7A67C) ## $a0 = 80B7A67C /* 0B098 80B74A38 24180028 */ addiu $t8, $zero, 0x0028 ## $t8 = 00000028 /* 0B09C 80B74A3C A0980000 */ sb $t8, 0x0000($a0) ## 80B7A67C /* 0B0A0 80B74A40 920A0150 */ lbu $t2, 0x0150($s0) ## 00000150 -/* 0B0A4 80B74A44 55400036 */ bnel $t2, $zero, .L80B74B20 +/* 0B0A4 80B74A44 55400036 */ bnel $t2, $zero, .L80B74B20 /* 0B0A8 80B74A48 C60001AC */ lwc1 $f0, 0x01AC($s0) ## 000001AC /* 0B0AC 80B74A4C 444CF800 */ cfc1 $t4, $31 /* 0B0B0 80B74A50 24190001 */ addiu $t9, $zero, 0x0001 ## $t9 = 00000001 /* 0B0B4 80B74A54 44D9F800 */ ctc1 $t9, $31 /* 0B0B8 80B74A58 C60401AC */ lwc1 $f4, 0x01AC($s0) ## 000001AC -/* 0B0BC 80B74A5C 460022A4 */ cvt.w.s $f10, $f4 +/* 0B0BC 80B74A5C 460022A4 */ cvt.w.s $f10, $f4 /* 0B0C0 80B74A60 4459F800 */ cfc1 $t9, $31 /* 0B0C4 80B74A64 00000000 */ nop /* 0B0C8 80B74A68 33390078 */ andi $t9, $t9, 0x0078 ## $t9 = 00000000 -/* 0B0CC 80B74A6C 13200012 */ beq $t9, $zero, .L80B74AB8 +/* 0B0CC 80B74A6C 13200012 */ beq $t9, $zero, .L80B74AB8 /* 0B0D0 80B74A70 3C014F00 */ lui $at, 0x4F00 ## $at = 4F000000 /* 0B0D4 80B74A74 44815000 */ mtc1 $at, $f10 ## $f10 = 2147483648.00 /* 0B0D8 80B74A78 24190001 */ addiu $t9, $zero, 0x0001 ## $t9 = 00000001 -/* 0B0DC 80B74A7C 460A2281 */ sub.s $f10, $f4, $f10 +/* 0B0DC 80B74A7C 460A2281 */ sub.s $f10, $f4, $f10 /* 0B0E0 80B74A80 44D9F800 */ ctc1 $t9, $31 /* 0B0E4 80B74A84 00000000 */ nop -/* 0B0E8 80B74A88 460052A4 */ cvt.w.s $f10, $f10 +/* 0B0E8 80B74A88 460052A4 */ cvt.w.s $f10, $f10 /* 0B0EC 80B74A8C 4459F800 */ cfc1 $t9, $31 /* 0B0F0 80B74A90 00000000 */ nop /* 0B0F4 80B74A94 33390078 */ andi $t9, $t9, 0x0078 ## $t9 = 00000000 -/* 0B0F8 80B74A98 17200005 */ bne $t9, $zero, .L80B74AB0 +/* 0B0F8 80B74A98 17200005 */ bne $t9, $zero, .L80B74AB0 /* 0B0FC 80B74A9C 00000000 */ nop -/* 0B100 80B74AA0 44195000 */ mfc1 $t9, $f10 +/* 0B100 80B74AA0 44195000 */ mfc1 $t9, $f10 /* 0B104 80B74AA4 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 0B108 80B74AA8 10000007 */ beq $zero, $zero, .L80B74AC8 +/* 0B108 80B74AA8 10000007 */ beq $zero, $zero, .L80B74AC8 /* 0B10C 80B74AAC 0321C825 */ or $t9, $t9, $at ## $t9 = 80000000 .L80B74AB0: -/* 0B110 80B74AB0 10000005 */ beq $zero, $zero, .L80B74AC8 +/* 0B110 80B74AB0 10000005 */ beq $zero, $zero, .L80B74AC8 /* 0B114 80B74AB4 2419FFFF */ addiu $t9, $zero, 0xFFFF ## $t9 = FFFFFFFF .L80B74AB8: -/* 0B118 80B74AB8 44195000 */ mfc1 $t9, $f10 +/* 0B118 80B74AB8 44195000 */ mfc1 $t9, $f10 /* 0B11C 80B74ABC 00000000 */ nop -/* 0B120 80B74AC0 0720FFFB */ bltz $t9, .L80B74AB0 +/* 0B120 80B74AC0 0720FFFB */ bltz $t9, .L80B74AB0 /* 0B124 80B74AC4 00000000 */ nop .L80B74AC8: /* 0B128 80B74AC8 3C0180B8 */ lui $at, %hi(D_80B7A678) ## $at = 80B80000 -/* 0B12C 80B74ACC A439A678 */ sh $t9, %lo(D_80B7A678)($at) +/* 0B12C 80B74ACC A439A678 */ sh $t9, %lo(D_80B7A678)($at) /* 0B130 80B74AD0 3C0280B8 */ lui $v0, %hi(D_80B7A678) ## $v0 = 80B80000 -/* 0B134 80B74AD4 9442A678 */ lhu $v0, %lo(D_80B7A678)($v0) +/* 0B134 80B74AD4 9442A678 */ lhu $v0, %lo(D_80B7A678)($v0) /* 0B138 80B74AD8 44CCF800 */ ctc1 $t4, $31 -/* 0B13C 80B74ADC 2841004B */ slti $at, $v0, 0x004B -/* 0B140 80B74AE0 14200004 */ bne $at, $zero, .L80B74AF4 +/* 0B13C 80B74ADC 2841004B */ slti $at, $v0, 0x004B +/* 0B140 80B74AE0 14200004 */ bne $at, $zero, .L80B74AF4 /* 0B144 80B74AE4 2409409F */ addiu $t1, $zero, 0x409F ## $t1 = 0000409F /* 0B148 80B74AE8 3C0180B8 */ lui $at, %hi(D_80B7E086) ## $at = 80B80000 -/* 0B14C 80B74AEC 10000032 */ beq $zero, $zero, .L80B74BB8 -/* 0B150 80B74AF0 A429E086 */ sh $t1, %lo(D_80B7E086)($at) +/* 0B14C 80B74AEC 10000032 */ beq $zero, $zero, .L80B74BB8 +/* 0B150 80B74AF0 A429E086 */ sh $t1, %lo(D_80B7E086)($at) .L80B74AF4: -/* 0B154 80B74AF4 28410032 */ slti $at, $v0, 0x0032 -/* 0B158 80B74AF8 14200004 */ bne $at, $zero, .L80B74B0C +/* 0B154 80B74AF4 28410032 */ slti $at, $v0, 0x0032 +/* 0B158 80B74AF8 14200004 */ bne $at, $zero, .L80B74B0C /* 0B15C 80B74AFC 240B4091 */ addiu $t3, $zero, 0x4091 ## $t3 = 00004091 /* 0B160 80B74B00 3C0180B8 */ lui $at, %hi(D_80B7E086) ## $at = 80B80000 -/* 0B164 80B74B04 1000002C */ beq $zero, $zero, .L80B74BB8 -/* 0B168 80B74B08 A42BE086 */ sh $t3, %lo(D_80B7E086)($at) +/* 0B164 80B74B04 1000002C */ beq $zero, $zero, .L80B74BB8 +/* 0B168 80B74B08 A42BE086 */ sh $t3, %lo(D_80B7E086)($at) .L80B74B0C: /* 0B16C 80B74B0C 240D4083 */ addiu $t5, $zero, 0x4083 ## $t5 = 00004083 /* 0B170 80B74B10 3C0180B8 */ lui $at, %hi(D_80B7E086) ## $at = 80B80000 -/* 0B174 80B74B14 10000028 */ beq $zero, $zero, .L80B74BB8 -/* 0B178 80B74B18 A42DE086 */ sh $t5, %lo(D_80B7E086)($at) +/* 0B174 80B74B14 10000028 */ beq $zero, $zero, .L80B74BB8 +/* 0B178 80B74B18 A42DE086 */ sh $t5, %lo(D_80B7E086)($at) /* 0B17C 80B74B1C C60001AC */ lwc1 $f0, 0x01AC($s0) ## 000001AC .L80B74B20: /* 0B180 80B74B20 240F0001 */ addiu $t7, $zero, 0x0001 ## $t7 = 00000001 -/* 0B184 80B74B24 46000180 */ add.s $f6, $f0, $f0 +/* 0B184 80B74B24 46000180 */ add.s $f6, $f0, $f0 /* 0B188 80B74B28 444EF800 */ cfc1 $t6, $31 /* 0B18C 80B74B2C 44CFF800 */ ctc1 $t7, $31 /* 0B190 80B74B30 00000000 */ nop -/* 0B194 80B74B34 46003224 */ cvt.w.s $f8, $f6 +/* 0B194 80B74B34 46003224 */ cvt.w.s $f8, $f6 /* 0B198 80B74B38 444FF800 */ cfc1 $t7, $31 /* 0B19C 80B74B3C 00000000 */ nop /* 0B1A0 80B74B40 31EF0078 */ andi $t7, $t7, 0x0078 ## $t7 = 00000000 -/* 0B1A4 80B74B44 11E00012 */ beq $t7, $zero, .L80B74B90 +/* 0B1A4 80B74B44 11E00012 */ beq $t7, $zero, .L80B74B90 /* 0B1A8 80B74B48 3C014F00 */ lui $at, 0x4F00 ## $at = 4F000000 /* 0B1AC 80B74B4C 44814000 */ mtc1 $at, $f8 ## $f8 = 2147483648.00 /* 0B1B0 80B74B50 240F0001 */ addiu $t7, $zero, 0x0001 ## $t7 = 00000001 -/* 0B1B4 80B74B54 46083201 */ sub.s $f8, $f6, $f8 +/* 0B1B4 80B74B54 46083201 */ sub.s $f8, $f6, $f8 /* 0B1B8 80B74B58 44CFF800 */ ctc1 $t7, $31 /* 0B1BC 80B74B5C 00000000 */ nop -/* 0B1C0 80B74B60 46004224 */ cvt.w.s $f8, $f8 +/* 0B1C0 80B74B60 46004224 */ cvt.w.s $f8, $f8 /* 0B1C4 80B74B64 444FF800 */ cfc1 $t7, $31 /* 0B1C8 80B74B68 00000000 */ nop /* 0B1CC 80B74B6C 31EF0078 */ andi $t7, $t7, 0x0078 ## $t7 = 00000000 -/* 0B1D0 80B74B70 15E00005 */ bne $t7, $zero, .L80B74B88 +/* 0B1D0 80B74B70 15E00005 */ bne $t7, $zero, .L80B74B88 /* 0B1D4 80B74B74 00000000 */ nop -/* 0B1D8 80B74B78 440F4000 */ mfc1 $t7, $f8 +/* 0B1D8 80B74B78 440F4000 */ mfc1 $t7, $f8 /* 0B1DC 80B74B7C 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 0B1E0 80B74B80 10000007 */ beq $zero, $zero, .L80B74BA0 +/* 0B1E0 80B74B80 10000007 */ beq $zero, $zero, .L80B74BA0 /* 0B1E4 80B74B84 01E17825 */ or $t7, $t7, $at ## $t7 = 80000000 .L80B74B88: -/* 0B1E8 80B74B88 10000005 */ beq $zero, $zero, .L80B74BA0 +/* 0B1E8 80B74B88 10000005 */ beq $zero, $zero, .L80B74BA0 /* 0B1EC 80B74B8C 240FFFFF */ addiu $t7, $zero, 0xFFFF ## $t7 = FFFFFFFF .L80B74B90: -/* 0B1F0 80B74B90 440F4000 */ mfc1 $t7, $f8 +/* 0B1F0 80B74B90 440F4000 */ mfc1 $t7, $f8 /* 0B1F4 80B74B94 00000000 */ nop -/* 0B1F8 80B74B98 05E0FFFB */ bltz $t7, .L80B74B88 +/* 0B1F8 80B74B98 05E0FFFB */ bltz $t7, .L80B74B88 /* 0B1FC 80B74B9C 00000000 */ nop .L80B74BA0: /* 0B200 80B74BA0 3C0180B8 */ lui $at, %hi(D_80B7A678) ## $at = 80B80000 -/* 0B204 80B74BA4 A42FA678 */ sh $t7, %lo(D_80B7A678)($at) +/* 0B204 80B74BA4 A42FA678 */ sh $t7, %lo(D_80B7A678)($at) /* 0B208 80B74BA8 44CEF800 */ ctc1 $t6, $31 /* 0B20C 80B74BAC 3C0180B8 */ lui $at, %hi(D_80B7E086) ## $at = 80B80000 /* 0B210 80B74BB0 24184099 */ addiu $t8, $zero, 0x4099 ## $t8 = 00004099 -/* 0B214 80B74BB4 A438E086 */ sh $t8, %lo(D_80B7E086)($at) +/* 0B214 80B74BB4 A438E086 */ sh $t8, %lo(D_80B7E086)($at) .L80B74BB8: /* 0B218 80B74BB8 A20001D5 */ sb $zero, 0x01D5($s0) ## 000001D5 -/* 0B21C 80B74BBC 8FA300E0 */ lw $v1, 0x00E0($sp) +/* 0B21C 80B74BBC 8FA300E0 */ lw $v1, 0x00E0($sp) /* 0B220 80B74BC0 240AC000 */ addiu $t2, $zero, 0xC000 ## $t2 = FFFFC000 .L80B74BC4: /* 0B224 80B74BC4 A60A0160 */ sh $t2, 0x0160($s0) ## 00000160 @@ -3800,199 +3800,199 @@ glabel L80B748A0 /* 0B260 80B74C00 A60200B4 */ sh $v0, 0x00B4($s0) ## 000000B4 /* 0B264 80B74C04 27A4010C */ addiu $a0, $sp, 0x010C ## $a0 = FFFFFFD4 /* 0B268 80B74C08 27A50100 */ addiu $a1, $sp, 0x0100 ## $a1 = FFFFFFC8 -/* 0B26C 80B74C0C E7A4010C */ swc1 $f4, 0x010C($sp) -/* 0B270 80B74C10 E7AA0110 */ swc1 $f10, 0x0110($sp) -/* 0B274 80B74C14 0C0346BD */ jal Matrix_MultVec3f -/* 0B278 80B74C18 E7A60114 */ swc1 $f6, 0x0114($sp) -/* 0B27C 80B74C1C 8FA900E0 */ lw $t1, 0x00E0($sp) -/* 0B280 80B74C20 C7A40100 */ lwc1 $f4, 0x0100($sp) -/* 0B284 80B74C24 4406A000 */ mfc1 $a2, $f20 +/* 0B26C 80B74C0C E7A4010C */ swc1 $f4, 0x010C($sp) +/* 0B270 80B74C10 E7AA0110 */ swc1 $f10, 0x0110($sp) +/* 0B274 80B74C14 0C0346BD */ jal Matrix_MultVec3f +/* 0B278 80B74C18 E7A60114 */ swc1 $f6, 0x0114($sp) +/* 0B27C 80B74C1C 8FA900E0 */ lw $t1, 0x00E0($sp) +/* 0B280 80B74C20 C7A40100 */ lwc1 $f4, 0x0100($sp) +/* 0B284 80B74C24 4406A000 */ mfc1 $a2, $f20 /* 0B288 80B74C28 C52809BC */ lwc1 $f8, 0x09BC($t1) ## 000009BC -/* 0B28C 80B74C2C 8FA40048 */ lw $a0, 0x0048($sp) +/* 0B28C 80B74C2C 8FA40048 */ lw $a0, 0x0048($sp) /* 0B290 80B74C30 3C0740C0 */ lui $a3, 0x40C0 ## $a3 = 40C00000 -/* 0B294 80B74C34 46044280 */ add.s $f10, $f8, $f4 -/* 0B298 80B74C38 44055000 */ mfc1 $a1, $f10 +/* 0B294 80B74C34 46044280 */ add.s $f10, $f8, $f4 +/* 0B298 80B74C38 44055000 */ mfc1 $a1, $f10 /* 0B29C 80B74C3C 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 0B2A0 80B74C40 00000000 */ nop -/* 0B2A4 80B74C44 8FAB00E0 */ lw $t3, 0x00E0($sp) -/* 0B2A8 80B74C48 C7A80104 */ lwc1 $f8, 0x0104($sp) -/* 0B2AC 80B74C4C 4406A000 */ mfc1 $a2, $f20 +/* 0B2A4 80B74C44 8FAB00E0 */ lw $t3, 0x00E0($sp) +/* 0B2A8 80B74C48 C7A80104 */ lwc1 $f8, 0x0104($sp) +/* 0B2AC 80B74C4C 4406A000 */ mfc1 $a2, $f20 /* 0B2B0 80B74C50 C56609C0 */ lwc1 $f6, 0x09C0($t3) ## 000009C0 -/* 0B2B4 80B74C54 8FA40044 */ lw $a0, 0x0044($sp) +/* 0B2B4 80B74C54 8FA40044 */ lw $a0, 0x0044($sp) /* 0B2B8 80B74C58 3C0740C0 */ lui $a3, 0x40C0 ## $a3 = 40C00000 -/* 0B2BC 80B74C5C 46083100 */ add.s $f4, $f6, $f8 -/* 0B2C0 80B74C60 44052000 */ mfc1 $a1, $f4 +/* 0B2BC 80B74C5C 46083100 */ add.s $f4, $f6, $f8 +/* 0B2C0 80B74C60 44052000 */ mfc1 $a1, $f4 /* 0B2C4 80B74C64 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 0B2C8 80B74C68 00000000 */ nop -/* 0B2CC 80B74C6C 8FAD00E0 */ lw $t5, 0x00E0($sp) -/* 0B2D0 80B74C70 C7A60108 */ lwc1 $f6, 0x0108($sp) -/* 0B2D4 80B74C74 4406A000 */ mfc1 $a2, $f20 +/* 0B2CC 80B74C6C 8FAD00E0 */ lw $t5, 0x00E0($sp) +/* 0B2D0 80B74C70 C7A60108 */ lwc1 $f6, 0x0108($sp) +/* 0B2D4 80B74C74 4406A000 */ mfc1 $a2, $f20 /* 0B2D8 80B74C78 C5AA09C4 */ lwc1 $f10, 0x09C4($t5) ## 000009C4 -/* 0B2DC 80B74C7C 8FA4003C */ lw $a0, 0x003C($sp) +/* 0B2DC 80B74C7C 8FA4003C */ lw $a0, 0x003C($sp) /* 0B2E0 80B74C80 3C0740C0 */ lui $a3, 0x40C0 ## $a3 = 40C00000 -/* 0B2E4 80B74C84 46065200 */ add.s $f8, $f10, $f6 -/* 0B2E8 80B74C88 44054000 */ mfc1 $a1, $f8 +/* 0B2E4 80B74C84 46065200 */ add.s $f8, $f10, $f6 +/* 0B2E8 80B74C88 44054000 */ mfc1 $a1, $f8 /* 0B2EC 80B74C8C 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 0B2F0 80B74C90 00000000 */ nop /* 0B2F4 80B74C94 3C01433C */ lui $at, 0x433C ## $at = 433C0000 /* 0B2F8 80B74C98 44812000 */ mtc1 $at, $f4 ## $f4 = 188.00 /* 0B2FC 80B74C9C 3C0180B8 */ lui $at, %hi(D_80B7E144) ## $at = 80B80000 -/* 0B300 80B74CA0 E424E144 */ swc1 $f4, %lo(D_80B7E144)($at) +/* 0B300 80B74CA0 E424E144 */ swc1 $f4, %lo(D_80B7E144)($at) /* 0B304 80B74CA4 860E017A */ lh $t6, 0x017A($s0) ## 0000017A -/* 0B308 80B74CA8 29C10033 */ slti $at, $t6, 0x0033 -/* 0B30C 80B74CAC 10200083 */ beq $at, $zero, .L80B74EBC +/* 0B308 80B74CA8 29C10033 */ slti $at, $t6, 0x0033 +/* 0B30C 80B74CAC 10200083 */ beq $at, $zero, .L80B74EBC /* 0B310 80B74CB0 00000000 */ nop /* 0B314 80B74CB4 920201D5 */ lbu $v0, 0x01D5($s0) ## 000001D5 -/* 0B318 80B74CB8 10400005 */ beq $v0, $zero, .L80B74CD0 +/* 0B318 80B74CB8 10400005 */ beq $v0, $zero, .L80B74CD0 /* 0B31C 80B74CBC 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 0B320 80B74CC0 5041005C */ beql $v0, $at, .L80B74E34 +/* 0B320 80B74CC0 5041005C */ beql $v0, $at, .L80B74E34 /* 0B324 80B74CC4 262420D8 */ addiu $a0, $s1, 0x20D8 ## $a0 = 000020D8 -/* 0B328 80B74CC8 1000007C */ beq $zero, $zero, .L80B74EBC +/* 0B328 80B74CC8 1000007C */ beq $zero, $zero, .L80B74EBC /* 0B32C 80B74CCC 00000000 */ nop .L80B74CD0: /* 0B330 80B74CD0 262420D8 */ addiu $a0, $s1, 0x20D8 ## $a0 = 000020D8 -/* 0B334 80B74CD4 0C042F6F */ jal func_8010BDBC -/* 0B338 80B74CD8 AFA4004C */ sw $a0, 0x004C($sp) +/* 0B334 80B74CD4 0C042F6F */ jal func_8010BDBC +/* 0B338 80B74CD8 AFA4004C */ sw $a0, 0x004C($sp) /* 0B33C 80B74CDC 24010004 */ addiu $at, $zero, 0x0004 ## $at = 00000004 -/* 0B340 80B74CE0 10410005 */ beq $v0, $at, .L80B74CF8 -/* 0B344 80B74CE4 8FA4004C */ lw $a0, 0x004C($sp) -/* 0B348 80B74CE8 0C042F6F */ jal func_8010BDBC +/* 0B340 80B74CE0 10410005 */ beq $v0, $at, .L80B74CF8 +/* 0B344 80B74CE4 8FA4004C */ lw $a0, 0x004C($sp) +/* 0B348 80B74CE8 0C042F6F */ jal func_8010BDBC /* 0B34C 80B74CEC 00000000 */ nop -/* 0B350 80B74CF0 14400072 */ bne $v0, $zero, .L80B74EBC +/* 0B350 80B74CF0 14400072 */ bne $v0, $zero, .L80B74EBC /* 0B354 80B74CF4 00000000 */ nop .L80B74CF8: -/* 0B358 80B74CF8 0C041AF2 */ jal func_80106BC8 +/* 0B358 80B74CF8 0C041AF2 */ jal func_80106BC8 /* 0B35C 80B74CFC 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 0B360 80B74D00 1040006E */ beq $v0, $zero, .L80B74EBC +/* 0B360 80B74D00 1040006E */ beq $v0, $zero, .L80B74EBC /* 0B364 80B74D04 00000000 */ nop -/* 0B368 80B74D08 0C041B33 */ jal func_80106CCC +/* 0B368 80B74D08 0C041B33 */ jal func_80106CCC /* 0B36C 80B74D0C 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 0B370 80B74D10 3C0F0001 */ lui $t7, 0x0001 ## $t7 = 00010000 -/* 0B374 80B74D14 01F17821 */ addu $t7, $t7, $s1 +/* 0B374 80B74D14 01F17821 */ addu $t7, $t7, $s1 /* 0B378 80B74D18 91EF04BD */ lbu $t7, 0x04BD($t7) ## 000104BD -/* 0B37C 80B74D1C 15E0003F */ bne $t7, $zero, .L80B74E1C +/* 0B37C 80B74D1C 15E0003F */ bne $t7, $zero, .L80B74E1C /* 0B380 80B74D20 3C0180B8 */ lui $at, %hi(D_80B7A670) ## $at = 80B80000 -/* 0B384 80B74D24 C420A670 */ lwc1 $f0, %lo(D_80B7A670)($at) +/* 0B384 80B74D24 C420A670 */ lwc1 $f0, %lo(D_80B7A670)($at) /* 0B388 80B74D28 44805000 */ mtc1 $zero, $f10 ## $f10 = 0.00 /* 0B38C 80B74D2C 00000000 */ nop -/* 0B390 80B74D30 46005032 */ c.eq.s $f10, $f0 +/* 0B390 80B74D30 46005032 */ c.eq.s $f10, $f0 /* 0B394 80B74D34 00000000 */ nop -/* 0B398 80B74D38 45020010 */ bc1fl .L80B74D7C +/* 0B398 80B74D38 45020010 */ bc1fl .L80B74D7C /* 0B39C 80B74D3C 920C0150 */ lbu $t4, 0x0150($s0) ## 00000150 /* 0B3A0 80B74D40 C60601AC */ lwc1 $f6, 0x01AC($s0) ## 000001AC /* 0B3A4 80B74D44 3C0180B8 */ lui $at, %hi(D_80B7A670) ## $at = 80B80000 /* 0B3A8 80B74D48 3C0A80B8 */ lui $t2, %hi(D_80B7E0B6) ## $t2 = 80B80000 -/* 0B3AC 80B74D4C E426A670 */ swc1 $f6, %lo(D_80B7A670)($at) +/* 0B3AC 80B74D4C E426A670 */ swc1 $f6, %lo(D_80B7A670)($at) /* 0B3B0 80B74D50 92180150 */ lbu $t8, 0x0150($s0) ## 00000150 /* 0B3B4 80B74D54 3C0180B8 */ lui $at, %hi(D_80B7E07C) ## $at = 80B80000 -/* 0B3B8 80B74D58 914AE0B6 */ lbu $t2, %lo(D_80B7E0B6)($t2) -/* 0B3BC 80B74D5C A038E07C */ sb $t8, %lo(D_80B7E07C)($at) +/* 0B3B8 80B74D58 914AE0B6 */ lbu $t2, %lo(D_80B7E0B6)($t2) +/* 0B3BC 80B74D5C A038E07C */ sb $t8, %lo(D_80B7E07C)($at) /* 0B3C0 80B74D60 3C0180B8 */ lui $at, %hi(D_80B7E07E) ## $at = 80B80000 /* 0B3C4 80B74D64 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 0B3C8 80B74D68 0C00B55C */ jal Actor_Kill - -/* 0B3CC 80B74D6C A02AE07E */ sb $t2, %lo(D_80B7E07E)($at) -/* 0B3D0 80B74D70 1000002B */ beq $zero, $zero, .L80B74E20 + +/* 0B3CC 80B74D6C A02AE07E */ sb $t2, %lo(D_80B7E07E)($at) +/* 0B3D0 80B74D70 1000002B */ beq $zero, $zero, .L80B74E20 /* 0B3D4 80B74D74 920F01D5 */ lbu $t7, 0x01D5($s0) ## 000001D5 /* 0B3D8 80B74D78 920C0150 */ lbu $t4, 0x0150($s0) ## 00000150 .L80B74D7C: -/* 0B3DC 80B74D7C 15800019 */ bne $t4, $zero, .L80B74DE4 +/* 0B3DC 80B74D7C 15800019 */ bne $t4, $zero, .L80B74DE4 /* 0B3E0 80B74D80 3C1980B8 */ lui $t9, %hi(D_80B7E07C) ## $t9 = 80B80000 -/* 0B3E4 80B74D84 9339E07C */ lbu $t9, %lo(D_80B7E07C)($t9) -/* 0B3E8 80B74D88 57200017 */ bnel $t9, $zero, .L80B74DE8 +/* 0B3E4 80B74D84 9339E07C */ lbu $t9, %lo(D_80B7E07C)($t9) +/* 0B3E8 80B74D88 57200017 */ bnel $t9, $zero, .L80B74DE8 /* 0B3EC 80B74D8C C60601AC */ lwc1 $f6, 0x01AC($s0) ## 000001AC /* 0B3F0 80B74D90 C60801AC */ lwc1 $f8, 0x01AC($s0) ## 000001AC -/* 0B3F4 80B74D94 4600028D */ trunc.w.s $f10, $f0 -/* 0B3F8 80B74D98 4600410D */ trunc.w.s $f4, $f8 -/* 0B3FC 80B74D9C 44185000 */ mfc1 $t8, $f10 -/* 0B400 80B74DA0 440B2000 */ mfc1 $t3, $f4 -/* 0B404 80B74DA4 00185400 */ sll $t2, $t8, 16 -/* 0B408 80B74DA8 000A6403 */ sra $t4, $t2, 16 -/* 0B40C 80B74DAC 000B6C00 */ sll $t5, $t3, 16 -/* 0B410 80B74DB0 000D7403 */ sra $t6, $t5, 16 -/* 0B414 80B74DB4 01CC082A */ slt $at, $t6, $t4 -/* 0B418 80B74DB8 1020000A */ beq $at, $zero, .L80B74DE4 +/* 0B3F4 80B74D94 4600028D */ trunc.w.s $f10, $f0 +/* 0B3F8 80B74D98 4600410D */ trunc.w.s $f4, $f8 +/* 0B3FC 80B74D9C 44185000 */ mfc1 $t8, $f10 +/* 0B400 80B74DA0 440B2000 */ mfc1 $t3, $f4 +/* 0B404 80B74DA4 00185400 */ sll $t2, $t8, 16 +/* 0B408 80B74DA8 000A6403 */ sra $t4, $t2, 16 +/* 0B40C 80B74DAC 000B6C00 */ sll $t5, $t3, 16 +/* 0B410 80B74DB0 000D7403 */ sra $t6, $t5, 16 +/* 0B414 80B74DB4 01CC082A */ slt $at, $t6, $t4 +/* 0B418 80B74DB8 1020000A */ beq $at, $zero, .L80B74DE4 /* 0B41C 80B74DBC 24190001 */ addiu $t9, $zero, 0x0001 ## $t9 = 00000001 /* 0B420 80B74DC0 2409003C */ addiu $t1, $zero, 0x003C ## $t1 = 0000003C /* 0B424 80B74DC4 A21901D5 */ sb $t9, 0x01D5($s0) ## 000001D5 /* 0B428 80B74DC8 A609017A */ sh $t1, 0x017A($s0) ## 0000017A /* 0B42C 80B74DCC 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 0B430 80B74DD0 24054098 */ addiu $a1, $zero, 0x4098 ## $a1 = 00004098 -/* 0B434 80B74DD4 0C042DA0 */ jal func_8010B680 +/* 0B434 80B74DD4 0C042DA0 */ jal func_8010B680 /* 0B438 80B74DD8 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 0B43C 80B74DDC 10000010 */ beq $zero, $zero, .L80B74E20 +/* 0B43C 80B74DDC 10000010 */ beq $zero, $zero, .L80B74E20 /* 0B440 80B74DE0 920F01D5 */ lbu $t7, 0x01D5($s0) ## 000001D5 .L80B74DE4: /* 0B444 80B74DE4 C60601AC */ lwc1 $f6, 0x01AC($s0) ## 000001AC .L80B74DE8: /* 0B448 80B74DE8 3C0180B8 */ lui $at, %hi(D_80B7A670) ## $at = 80B80000 /* 0B44C 80B74DEC 3C0280B8 */ lui $v0, %hi(D_80B7E07C) ## $v0 = 80B80000 -/* 0B450 80B74DF0 E426A670 */ swc1 $f6, %lo(D_80B7A670)($at) +/* 0B450 80B74DF0 E426A670 */ swc1 $f6, %lo(D_80B7A670)($at) /* 0B454 80B74DF4 920B0150 */ lbu $t3, 0x0150($s0) ## 00000150 /* 0B458 80B74DF8 3C0D80B8 */ lui $t5, %hi(D_80B7E0B6) ## $t5 = 80B80000 -/* 0B45C 80B74DFC 9042E07C */ lbu $v0, %lo(D_80B7E07C)($v0) -/* 0B460 80B74E00 91ADE0B6 */ lbu $t5, %lo(D_80B7E0B6)($t5) +/* 0B45C 80B74DFC 9042E07C */ lbu $v0, %lo(D_80B7E07C)($v0) +/* 0B460 80B74E00 91ADE0B6 */ lbu $t5, %lo(D_80B7E0B6)($t5) /* 0B464 80B74E04 3C0180B8 */ lui $at, %hi(D_80B7E07C) ## $at = 80B80000 -/* 0B468 80B74E08 A02BE07C */ sb $t3, %lo(D_80B7E07C)($at) +/* 0B468 80B74E08 A02BE07C */ sb $t3, %lo(D_80B7E07C)($at) /* 0B46C 80B74E0C 3C0180B8 */ lui $at, %hi(D_80B7E07E) ## $at = 80B80000 -/* 0B470 80B74E10 A02DE07E */ sb $t5, %lo(D_80B7E07E)($at) +/* 0B470 80B74E10 A02DE07E */ sb $t5, %lo(D_80B7E07E)($at) /* 0B474 80B74E14 E60001AC */ swc1 $f0, 0x01AC($s0) ## 000001AC /* 0B478 80B74E18 A2020150 */ sb $v0, 0x0150($s0) ## 00000150 .L80B74E1C: /* 0B47C 80B74E1C 920F01D5 */ lbu $t7, 0x01D5($s0) ## 000001D5 .L80B74E20: -/* 0B480 80B74E20 15E00026 */ bne $t7, $zero, .L80B74EBC +/* 0B480 80B74E20 15E00026 */ bne $t7, $zero, .L80B74EBC /* 0B484 80B74E24 3C0180B8 */ lui $at, %hi(D_80B7A694) ## $at = 80B80000 -/* 0B488 80B74E28 10000024 */ beq $zero, $zero, .L80B74EBC -/* 0B48C 80B74E2C A420A694 */ sh $zero, %lo(D_80B7A694)($at) +/* 0B488 80B74E28 10000024 */ beq $zero, $zero, .L80B74EBC +/* 0B48C 80B74E2C A420A694 */ sh $zero, %lo(D_80B7A694)($at) /* 0B490 80B74E30 262420D8 */ addiu $a0, $s1, 0x20D8 ## $a0 = 000020D8 .L80B74E34: -/* 0B494 80B74E34 0C042F6F */ jal func_8010BDBC -/* 0B498 80B74E38 AFA4004C */ sw $a0, 0x004C($sp) +/* 0B494 80B74E34 0C042F6F */ jal func_8010BDBC +/* 0B498 80B74E38 AFA4004C */ sw $a0, 0x004C($sp) /* 0B49C 80B74E3C 24010004 */ addiu $at, $zero, 0x0004 ## $at = 00000004 -/* 0B4A0 80B74E40 10410005 */ beq $v0, $at, .L80B74E58 -/* 0B4A4 80B74E44 8FA4004C */ lw $a0, 0x004C($sp) -/* 0B4A8 80B74E48 0C042F6F */ jal func_8010BDBC +/* 0B4A0 80B74E40 10410005 */ beq $v0, $at, .L80B74E58 +/* 0B4A4 80B74E44 8FA4004C */ lw $a0, 0x004C($sp) +/* 0B4A8 80B74E48 0C042F6F */ jal func_8010BDBC /* 0B4AC 80B74E4C 00000000 */ nop -/* 0B4B0 80B74E50 1440001A */ bne $v0, $zero, .L80B74EBC +/* 0B4B0 80B74E50 1440001A */ bne $v0, $zero, .L80B74EBC /* 0B4B4 80B74E54 00000000 */ nop .L80B74E58: -/* 0B4B8 80B74E58 0C041AF2 */ jal func_80106BC8 +/* 0B4B8 80B74E58 0C041AF2 */ jal func_80106BC8 /* 0B4BC 80B74E5C 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 0B4C0 80B74E60 10400016 */ beq $v0, $zero, .L80B74EBC +/* 0B4C0 80B74E60 10400016 */ beq $v0, $zero, .L80B74EBC /* 0B4C4 80B74E64 00000000 */ nop -/* 0B4C8 80B74E68 0C041B33 */ jal func_80106CCC +/* 0B4C8 80B74E68 0C041B33 */ jal func_80106CCC /* 0B4CC 80B74E6C 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 0B4D0 80B74E70 3C180001 */ lui $t8, 0x0001 ## $t8 = 00010000 -/* 0B4D4 80B74E74 0311C021 */ addu $t8, $t8, $s1 +/* 0B4D4 80B74E74 0311C021 */ addu $t8, $t8, $s1 /* 0B4D8 80B74E78 931804BD */ lbu $t8, 0x04BD($t8) ## 000104BD -/* 0B4DC 80B74E7C 1300000D */ beq $t8, $zero, .L80B74EB4 +/* 0B4DC 80B74E7C 1300000D */ beq $t8, $zero, .L80B74EB4 /* 0B4E0 80B74E80 00000000 */ nop /* 0B4E4 80B74E84 C60801AC */ lwc1 $f8, 0x01AC($s0) ## 000001AC /* 0B4E8 80B74E88 3C0180B8 */ lui $at, %hi(D_80B7A670) ## $at = 80B80000 /* 0B4EC 80B74E8C 3C0A80B8 */ lui $t2, %hi(D_80B7E0B6) ## $t2 = 80B80000 -/* 0B4F0 80B74E90 C420A670 */ lwc1 $f0, %lo(D_80B7A670)($at) -/* 0B4F4 80B74E94 914AE0B6 */ lbu $t2, %lo(D_80B7E0B6)($t2) +/* 0B4F0 80B74E90 C420A670 */ lwc1 $f0, %lo(D_80B7A670)($at) +/* 0B4F4 80B74E94 914AE0B6 */ lbu $t2, %lo(D_80B7E0B6)($t2) /* 0B4F8 80B74E98 3C0280B8 */ lui $v0, %hi(D_80B7E07C) ## $v0 = 80B80000 -/* 0B4FC 80B74E9C E428A670 */ swc1 $f8, %lo(D_80B7A670)($at) -/* 0B500 80B74EA0 9042E07C */ lbu $v0, %lo(D_80B7E07C)($v0) +/* 0B4FC 80B74E9C E428A670 */ swc1 $f8, %lo(D_80B7A670)($at) +/* 0B500 80B74EA0 9042E07C */ lbu $v0, %lo(D_80B7E07C)($v0) /* 0B504 80B74EA4 3C0180B8 */ lui $at, %hi(D_80B7E07E) ## $at = 80B80000 -/* 0B508 80B74EA8 A02AE07E */ sb $t2, %lo(D_80B7E07E)($at) +/* 0B508 80B74EA8 A02AE07E */ sb $t2, %lo(D_80B7E07E)($at) /* 0B50C 80B74EAC E60001AC */ swc1 $f0, 0x01AC($s0) ## 000001AC /* 0B510 80B74EB0 A2020150 */ sb $v0, 0x0150($s0) ## 00000150 .L80B74EB4: /* 0B514 80B74EB4 3C0180B8 */ lui $at, %hi(D_80B7A694) ## $at = 80B80000 -/* 0B518 80B74EB8 A420A694 */ sh $zero, %lo(D_80B7A694)($at) +/* 0B518 80B74EB8 A420A694 */ sh $zero, %lo(D_80B7A694)($at) .L80B74EBC: /* 0B51C 80B74EBC 3C0E80B8 */ lui $t6, %hi(D_80B7A694) ## $t6 = 80B80000 -/* 0B520 80B74EC0 85CEA694 */ lh $t6, %lo(D_80B7A694)($t6) -/* 0B524 80B74EC4 55C000ED */ bnel $t6, $zero, .L80B7527C +/* 0B520 80B74EC0 85CEA694 */ lh $t6, %lo(D_80B7A694)($t6) +/* 0B524 80B74EC4 55C000ED */ bnel $t6, $zero, .L80B7527C /* 0B528 80B74EC8 8604015C */ lh $a0, 0x015C($s0) ## 0000015C /* 0B52C 80B74ECC 8E0C0130 */ lw $t4, 0x0130($s0) ## 00000130 -/* 0B530 80B74ED0 51800036 */ beql $t4, $zero, .L80B74FAC +/* 0B530 80B74ED0 51800036 */ beql $t4, $zero, .L80B74FAC /* 0B534 80B74ED4 3C014402 */ lui $at, 0x4402 ## $at = 44020000 /* 0B538 80B74ED8 A600015A */ sh $zero, 0x015A($s0) ## 0000015A /* 0B53C 80B74EDC 3C0144FA */ lui $at, 0x44FA ## $at = 44FA0000 @@ -4009,27 +4009,27 @@ glabel L80B748A0 /* 0B568 80B74F08 260401D8 */ addiu $a0, $s0, 0x01D8 ## $a0 = 000001D8 /* 0B56C 80B74F0C A6190158 */ sh $t9, 0x0158($s0) ## 00000158 /* 0B570 80B74F10 E6040194 */ swc1 $f4, 0x0194($s0) ## 00000194 -/* 0B574 80B74F14 AFA4004C */ sw $a0, 0x004C($sp) -/* 0B578 80B74F18 0C0295BC */ jal func_800A56F0 +/* 0B574 80B74F14 AFA4004C */ sw $a0, 0x004C($sp) +/* 0B578 80B74F18 0C0295BC */ jal SkelAnime_Free /* 0B57C 80B74F1C 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 /* 0B580 80B74F20 920D0150 */ lbu $t5, 0x0150($s0) ## 00000150 -/* 0B584 80B74F24 15A00011 */ bne $t5, $zero, .L80B74F6C +/* 0B584 80B74F24 15A00011 */ bne $t5, $zero, .L80B74F6C /* 0B588 80B74F28 3C060600 */ lui $a2, 0x0600 ## $a2 = 06000000 /* 0B58C 80B74F2C 3C070600 */ lui $a3, 0x0600 ## $a3 = 06000000 /* 0B590 80B74F30 24E7007C */ addiu $a3, $a3, 0x007C ## $a3 = 0600007C /* 0B594 80B74F34 24C629C0 */ addiu $a2, $a2, 0x29C0 ## $a2 = 060029C0 /* 0B598 80B74F38 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 0B59C 80B74F3C 8FA5004C */ lw $a1, 0x004C($sp) -/* 0B5A0 80B74F40 AFA00010 */ sw $zero, 0x0010($sp) -/* 0B5A4 80B74F44 AFA00014 */ sw $zero, 0x0014($sp) -/* 0B5A8 80B74F48 0C0291BE */ jal func_800A46F8 -/* 0B5AC 80B74F4C AFA00018 */ sw $zero, 0x0018($sp) +/* 0B59C 80B74F3C 8FA5004C */ lw $a1, 0x004C($sp) +/* 0B5A0 80B74F40 AFA00010 */ sw $zero, 0x0010($sp) +/* 0B5A4 80B74F44 AFA00014 */ sw $zero, 0x0014($sp) +/* 0B5A8 80B74F48 0C0291BE */ jal SkelAnime_InitSV +/* 0B5AC 80B74F4C AFA00018 */ sw $zero, 0x0018($sp) /* 0B5B0 80B74F50 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 0B5B4 80B74F54 24A5007C */ addiu $a1, $a1, 0x007C ## $a1 = 0600007C -/* 0B5B8 80B74F58 8FA4004C */ lw $a0, 0x004C($sp) -/* 0B5BC 80B74F5C 0C0294D3 */ jal func_800A534C +/* 0B5B8 80B74F58 8FA4004C */ lw $a0, 0x004C($sp) +/* 0B5BC 80B74F5C 0C0294D3 */ jal SkelAnime_ChangeAnimTransitionRepeat /* 0B5C0 80B74F60 24060000 */ addiu $a2, $zero, 0x0000 ## $a2 = 00000000 -/* 0B5C4 80B74F64 10000011 */ beq $zero, $zero, .L80B74FAC +/* 0B5C4 80B74F64 10000011 */ beq $zero, $zero, .L80B74FAC /* 0B5C8 80B74F68 3C014402 */ lui $at, 0x4402 ## $at = 44020000 .L80B74F6C: /* 0B5CC 80B74F6C 3C060601 */ lui $a2, 0x0601 ## $a2 = 06010000 @@ -4037,54 +4037,54 @@ glabel L80B748A0 /* 0B5D4 80B74F74 24E7CFE0 */ addiu $a3, $a3, 0xCFE0 ## $a3 = 0600CFE0 /* 0B5D8 80B74F78 24C61058 */ addiu $a2, $a2, 0x1058 ## $a2 = 06011058 /* 0B5DC 80B74F7C 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 0B5E0 80B74F80 8FA5004C */ lw $a1, 0x004C($sp) -/* 0B5E4 80B74F84 AFA00010 */ sw $zero, 0x0010($sp) -/* 0B5E8 80B74F88 AFA00014 */ sw $zero, 0x0014($sp) -/* 0B5EC 80B74F8C 0C0291BE */ jal func_800A46F8 -/* 0B5F0 80B74F90 AFA00018 */ sw $zero, 0x0018($sp) +/* 0B5E0 80B74F80 8FA5004C */ lw $a1, 0x004C($sp) +/* 0B5E4 80B74F84 AFA00010 */ sw $zero, 0x0010($sp) +/* 0B5E8 80B74F88 AFA00014 */ sw $zero, 0x0014($sp) +/* 0B5EC 80B74F8C 0C0291BE */ jal SkelAnime_InitSV +/* 0B5F0 80B74F90 AFA00018 */ sw $zero, 0x0018($sp) /* 0B5F4 80B74F94 3C050601 */ lui $a1, 0x0601 ## $a1 = 06010000 /* 0B5F8 80B74F98 24A5CFE0 */ addiu $a1, $a1, 0xCFE0 ## $a1 = 0600CFE0 -/* 0B5FC 80B74F9C 8FA4004C */ lw $a0, 0x004C($sp) -/* 0B600 80B74FA0 0C0294D3 */ jal func_800A534C +/* 0B5FC 80B74F9C 8FA4004C */ lw $a0, 0x004C($sp) +/* 0B600 80B74FA0 0C0294D3 */ jal SkelAnime_ChangeAnimTransitionRepeat /* 0B604 80B74FA4 24060000 */ addiu $a2, $zero, 0x0000 ## $a2 = 00000000 /* 0B608 80B74FA8 3C014402 */ lui $at, 0x4402 ## $at = 44020000 .L80B74FAC: /* 0B60C 80B74FAC 44815000 */ mtc1 $at, $f10 ## $f10 = 520.00 /* 0B610 80B74FB0 3C0180B8 */ lui $at, %hi(D_80B7E148) ## $at = 80B80000 /* 0B614 80B74FB4 3C04100A */ lui $a0, 0x100A ## $a0 = 100A0000 -/* 0B618 80B74FB8 E42AE148 */ swc1 $f10, %lo(D_80B7E148)($at) +/* 0B618 80B74FB8 E42AE148 */ swc1 $f10, %lo(D_80B7E148)($at) /* 0B61C 80B74FBC 3C014343 */ lui $at, 0x4343 ## $at = 43430000 /* 0B620 80B74FC0 44813000 */ mtc1 $at, $f6 ## $f6 = 195.00 /* 0B624 80B74FC4 3C0180B8 */ lui $at, %hi(D_80B7E144) ## $at = 80B80000 /* 0B628 80B74FC8 348400FF */ ori $a0, $a0, 0x00FF ## $a0 = 100A00FF /* 0B62C 80B74FCC 0C03E803 */ jal Audio_SetBGM - -/* 0B630 80B74FD0 E426E144 */ swc1 $f6, %lo(D_80B7E144)($at) + +/* 0B630 80B74FD0 E426E144 */ swc1 $f6, %lo(D_80B7E144)($at) /* 0B634 80B74FD4 240F0014 */ addiu $t7, $zero, 0x0014 ## $t7 = 00000014 /* 0B638 80B74FD8 3C0180B8 */ lui $at, %hi(D_80B7E0A6) ## $at = 80B80000 -/* 0B63C 80B74FDC A42FE0A6 */ sh $t7, %lo(D_80B7E0A6)($at) +/* 0B63C 80B74FDC A42FE0A6 */ sh $t7, %lo(D_80B7E0A6)($at) /* 0B640 80B74FE0 3C0180B8 */ lui $at, %hi(D_80B7A6CC) ## $at = 80B80000 /* 0B644 80B74FE4 24180003 */ addiu $t8, $zero, 0x0003 ## $t8 = 00000003 -/* 0B648 80B74FE8 100000A3 */ beq $zero, $zero, .L80B75278 -/* 0B64C 80B74FEC A038A6CC */ sb $t8, %lo(D_80B7A6CC)($at) +/* 0B648 80B74FE8 100000A3 */ beq $zero, $zero, .L80B75278 +/* 0B64C 80B74FEC A038A6CC */ sb $t8, %lo(D_80B7A6CC)($at) glabel L80B74FF0 /* 0B650 80B74FF0 240A0032 */ addiu $t2, $zero, 0x0032 ## $t2 = 00000032 /* 0B654 80B74FF4 A20A0151 */ sb $t2, 0x0151($s0) ## 00000151 /* 0B658 80B74FF8 240E0005 */ addiu $t6, $zero, 0x0005 ## $t6 = 00000005 -/* 0B65C 80B74FFC A7AE0134 */ sh $t6, 0x0134($sp) +/* 0B65C 80B74FFC A7AE0134 */ sh $t6, 0x0134($sp) /* 0B660 80B75000 8602001C */ lh $v0, 0x001C($s0) ## 0000001C /* 0B664 80B75004 3C014640 */ lui $at, 0x4640 ## $at = 46400000 /* 0B668 80B75008 44814000 */ mtc1 $at, $f8 ## $f8 = 12288.00 -/* 0B66C 80B7500C 28410068 */ slti $at, $v0, 0x0068 -/* 0B670 80B75010 10200013 */ beq $at, $zero, .L80B75060 +/* 0B66C 80B7500C 28410068 */ slti $at, $v0, 0x0068 +/* 0B670 80B75010 10200013 */ beq $at, $zero, .L80B75060 /* 0B674 80B75014 E60801B0 */ swc1 $f8, 0x01B0($s0) ## 000001B0 -/* 0B678 80B75018 000260C0 */ sll $t4, $v0, 3 -/* 0B67C 80B7501C 01826021 */ addu $t4, $t4, $v0 -/* 0B680 80B75020 000C60C0 */ sll $t4, $t4, 3 +/* 0B678 80B75018 000260C0 */ sll $t4, $v0, 3 +/* 0B67C 80B7501C 01826021 */ addu $t4, $t4, $v0 +/* 0B680 80B75020 000C60C0 */ sll $t4, $t4, 3 /* 0B684 80B75024 3C0980B8 */ lui $t1, %hi(D_80B81FC8) ## $t1 = 80B80000 /* 0B688 80B75028 25291FC8 */ addiu $t1, $t1, %lo(D_80B81FC8) ## $t1 = 80B81FC8 /* 0B68C 80B7502C 2599E3E4 */ addiu $t9, $t4, 0xE3E4 ## $t9 = FFFFE3E4 -/* 0B690 80B75030 03295821 */ addu $t3, $t9, $t1 +/* 0B690 80B75030 03295821 */ addu $t3, $t9, $t1 /* 0B694 80B75034 8D6F0000 */ lw $t7, 0x0000($t3) ## 00000000 /* 0B698 80B75038 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 /* 0B69C 80B7503C 44812000 */ mtc1 $at, $f4 ## $f4 = 1.00 @@ -4094,18 +4094,18 @@ glabel L80B74FF0 /* 0B6AC 80B7504C AE0D01B8 */ sw $t5, 0x01B8($s0) ## 000001B8 /* 0B6B0 80B75050 8D6F0008 */ lw $t7, 0x0008($t3) ## 00000008 /* 0B6B4 80B75054 AE0F01BC */ sw $t7, 0x01BC($s0) ## 000001BC -/* 0B6B8 80B75058 10000026 */ beq $zero, $zero, .L80B750F4 -/* 0B6BC 80B7505C E424A898 */ swc1 $f4, %lo(D_80B7A898)($at) +/* 0B6B8 80B75058 10000026 */ beq $zero, $zero, .L80B750F4 +/* 0B6BC 80B7505C E424A898 */ swc1 $f4, %lo(D_80B7A898)($at) .L80B75060: -/* 0B6C0 80B75060 2841006C */ slti $at, $v0, 0x006C -/* 0B6C4 80B75064 10200012 */ beq $at, $zero, .L80B750B0 -/* 0B6C8 80B75068 0002C0C0 */ sll $t8, $v0, 3 -/* 0B6CC 80B7506C 0302C021 */ addu $t8, $t8, $v0 -/* 0B6D0 80B75070 0018C0C0 */ sll $t8, $t8, 3 +/* 0B6C0 80B75060 2841006C */ slti $at, $v0, 0x006C +/* 0B6C4 80B75064 10200012 */ beq $at, $zero, .L80B750B0 +/* 0B6C8 80B75068 0002C0C0 */ sll $t8, $v0, 3 +/* 0B6CC 80B7506C 0302C021 */ addu $t8, $t8, $v0 +/* 0B6D0 80B75070 0018C0C0 */ sll $t8, $t8, 3 /* 0B6D4 80B75074 3C0E80B8 */ lui $t6, %hi(D_80B81FC8) ## $t6 = 80B80000 /* 0B6D8 80B75078 25CE1FC8 */ addiu $t6, $t6, %lo(D_80B81FC8) ## $t6 = 80B81FC8 /* 0B6DC 80B7507C 270AE864 */ addiu $t2, $t8, 0xE864 ## $t2 = FFFFE867 -/* 0B6E0 80B75080 014E6021 */ addu $t4, $t2, $t6 +/* 0B6E0 80B75080 014E6021 */ addu $t4, $t2, $t6 /* 0B6E4 80B75084 8D890000 */ lw $t1, 0x0000($t4) ## 00000000 /* 0B6E8 80B75088 3C014000 */ lui $at, 0x4000 ## $at = 40000000 /* 0B6EC 80B7508C 44815000 */ mtc1 $at, $f10 ## $f10 = 2.00 @@ -4115,16 +4115,16 @@ glabel L80B74FF0 /* 0B6FC 80B7509C AE1901B8 */ sw $t9, 0x01B8($s0) ## 000001B8 /* 0B700 80B750A0 8D890008 */ lw $t1, 0x0008($t4) ## 00000008 /* 0B704 80B750A4 AE0901BC */ sw $t1, 0x01BC($s0) ## 000001BC -/* 0B708 80B750A8 10000012 */ beq $zero, $zero, .L80B750F4 -/* 0B70C 80B750AC E42AA898 */ swc1 $f10, %lo(D_80B7A898)($at) +/* 0B708 80B750A8 10000012 */ beq $zero, $zero, .L80B750F4 +/* 0B70C 80B750AC E42AA898 */ swc1 $f10, %lo(D_80B7A898)($at) .L80B750B0: -/* 0B710 80B750B0 000258C0 */ sll $t3, $v0, 3 -/* 0B714 80B750B4 01625821 */ addu $t3, $t3, $v0 -/* 0B718 80B750B8 000B58C0 */ sll $t3, $t3, 3 +/* 0B710 80B750B0 000258C0 */ sll $t3, $v0, 3 +/* 0B714 80B750B4 01625821 */ addu $t3, $t3, $v0 +/* 0B718 80B750B8 000B58C0 */ sll $t3, $t3, 3 /* 0B71C 80B750BC 3C0F80B8 */ lui $t7, %hi(D_80B81FC8) ## $t7 = 80B80000 /* 0B720 80B750C0 25EF1FC8 */ addiu $t7, $t7, %lo(D_80B81FC8) ## $t7 = 80B81FC8 /* 0B724 80B750C4 256DECE4 */ addiu $t5, $t3, 0xECE4 ## $t5 = FFFFECE4 -/* 0B728 80B750C8 01AFC021 */ addu $t8, $t5, $t7 +/* 0B728 80B750C8 01AFC021 */ addu $t8, $t5, $t7 /* 0B72C 80B750CC 8F0E0000 */ lw $t6, 0x0000($t8) ## 00000003 /* 0B730 80B750D0 3C014040 */ lui $at, 0x4040 ## $at = 40400000 /* 0B734 80B750D4 44813000 */ mtc1 $at, $f6 ## $f6 = 3.00 @@ -4134,105 +4134,105 @@ glabel L80B74FF0 /* 0B744 80B750E4 AE0A01B8 */ sw $t2, 0x01B8($s0) ## 000001B8 /* 0B748 80B750E8 8F0E0008 */ lw $t6, 0x0008($t8) ## 0000000B /* 0B74C 80B750EC AE0E01BC */ sw $t6, 0x01BC($s0) ## 000001BC -/* 0B750 80B750F0 E426A898 */ swc1 $f6, %lo(D_80B7A898)($at) +/* 0B750 80B750F0 E426A898 */ swc1 $f6, %lo(D_80B7A898)($at) .L80B750F4: -/* 0B754 80B750F4 4406A000 */ mfc1 $a2, $f20 -/* 0B758 80B750F8 4407A000 */ mfc1 $a3, $f20 +/* 0B754 80B750F4 4406A000 */ mfc1 $a2, $f20 +/* 0B758 80B750F8 4407A000 */ mfc1 $a3, $f20 /* 0B75C 80B750FC 26040068 */ addiu $a0, $s0, 0x0068 ## $a0 = 00000068 /* 0B760 80B75100 0C01E107 */ jal Math_SmoothScaleMaxF - + /* 0B764 80B75104 3C0540A0 */ lui $a1, 0x40A0 ## $a1 = 40A00000 /* 0B768 80B75108 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 /* 0B76C 80B7510C 44812000 */ mtc1 $at, $f4 ## $f4 = 20.00 -/* 0B770 80B75110 C7A80124 */ lwc1 $f8, 0x0124($sp) -/* 0B774 80B75114 4604403C */ c.lt.s $f8, $f4 +/* 0B770 80B75110 C7A80124 */ lwc1 $f8, 0x0124($sp) +/* 0B774 80B75114 4604403C */ c.lt.s $f8, $f4 /* 0B778 80B75118 00000000 */ nop -/* 0B77C 80B7511C 4502003C */ bc1fl .L80B75210 +/* 0B77C 80B7511C 4502003C */ bc1fl .L80B75210 /* 0B780 80B75120 860A0180 */ lh $t2, 0x0180($s0) ## 00000180 -/* 0B784 80B75124 8FA40040 */ lw $a0, 0x0040($sp) +/* 0B784 80B75124 8FA40040 */ lw $a0, 0x0040($sp) /* 0B788 80B75128 24054E20 */ addiu $a1, $zero, 0x4E20 ## $a1 = 00004E20 /* 0B78C 80B7512C 24060002 */ addiu $a2, $zero, 0x0002 ## $a2 = 00000002 /* 0B790 80B75130 0C01E1EF */ jal Math_SmoothScaleMaxS - + /* 0B794 80B75134 24070FA0 */ addiu $a3, $zero, 0x0FA0 ## $a3 = 00000FA0 /* 0B798 80B75138 860C017E */ lh $t4, 0x017E($s0) ## 0000017E -/* 0B79C 80B7513C 15800033 */ bne $t4, $zero, .L80B7520C +/* 0B79C 80B7513C 15800033 */ bne $t4, $zero, .L80B7520C /* 0B7A0 80B75140 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 0B7A4 80B75144 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 0B7A8 80B75148 0C2DC28B */ jal func_80B70A2C +/* 0B7A8 80B75148 0C2DC28B */ jal func_80B70A2C /* 0B7AC 80B7514C 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 0B7B0 80B75150 1040002E */ beq $v0, $zero, .L80B7520C +/* 0B7B0 80B75150 1040002E */ beq $v0, $zero, .L80B7520C /* 0B7B4 80B75154 3C0180B8 */ lui $at, %hi(D_80B7B720) ## $at = 80B80000 /* 0B7B8 80B75158 0C00CFBE */ jal Math_Rand_ZeroFloat - -/* 0B7BC 80B7515C C42CB720 */ lwc1 $f12, %lo(D_80B7B720)($at) + +/* 0B7BC 80B7515C C42CB720 */ lwc1 $f12, %lo(D_80B7B720)($at) /* 0B7C0 80B75160 4459F800 */ cfc1 $t9, $31 /* 0B7C4 80B75164 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 /* 0B7C8 80B75168 44C5F800 */ ctc1 $a1, $31 /* 0B7CC 80B7516C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0B7D0 80B75170 460002A4 */ cvt.w.s $f10, $f0 +/* 0B7D0 80B75170 460002A4 */ cvt.w.s $f10, $f0 /* 0B7D4 80B75174 4445F800 */ cfc1 $a1, $31 /* 0B7D8 80B75178 00000000 */ nop /* 0B7DC 80B7517C 30A50078 */ andi $a1, $a1, 0x0078 ## $a1 = 00000000 -/* 0B7E0 80B75180 10A00012 */ beq $a1, $zero, .L80B751CC +/* 0B7E0 80B75180 10A00012 */ beq $a1, $zero, .L80B751CC /* 0B7E4 80B75184 3C014F00 */ lui $at, 0x4F00 ## $at = 4F000000 /* 0B7E8 80B75188 44815000 */ mtc1 $at, $f10 ## $f10 = 2147483648.00 /* 0B7EC 80B7518C 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 -/* 0B7F0 80B75190 460A0281 */ sub.s $f10, $f0, $f10 +/* 0B7F0 80B75190 460A0281 */ sub.s $f10, $f0, $f10 /* 0B7F4 80B75194 44C5F800 */ ctc1 $a1, $31 /* 0B7F8 80B75198 00000000 */ nop -/* 0B7FC 80B7519C 460052A4 */ cvt.w.s $f10, $f10 +/* 0B7FC 80B7519C 460052A4 */ cvt.w.s $f10, $f10 /* 0B800 80B751A0 4445F800 */ cfc1 $a1, $31 /* 0B804 80B751A4 00000000 */ nop /* 0B808 80B751A8 30A50078 */ andi $a1, $a1, 0x0078 ## $a1 = 00000000 -/* 0B80C 80B751AC 14A00005 */ bne $a1, $zero, .L80B751C4 +/* 0B80C 80B751AC 14A00005 */ bne $a1, $zero, .L80B751C4 /* 0B810 80B751B0 00000000 */ nop -/* 0B814 80B751B4 44055000 */ mfc1 $a1, $f10 +/* 0B814 80B751B4 44055000 */ mfc1 $a1, $f10 /* 0B818 80B751B8 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 0B81C 80B751BC 10000007 */ beq $zero, $zero, .L80B751DC +/* 0B81C 80B751BC 10000007 */ beq $zero, $zero, .L80B751DC /* 0B820 80B751C0 00A12825 */ or $a1, $a1, $at ## $a1 = 80000000 .L80B751C4: -/* 0B824 80B751C4 10000005 */ beq $zero, $zero, .L80B751DC +/* 0B824 80B751C4 10000005 */ beq $zero, $zero, .L80B751DC /* 0B828 80B751C8 2405FFFF */ addiu $a1, $zero, 0xFFFF ## $a1 = FFFFFFFF .L80B751CC: -/* 0B82C 80B751CC 44055000 */ mfc1 $a1, $f10 +/* 0B82C 80B751CC 44055000 */ mfc1 $a1, $f10 /* 0B830 80B751D0 00000000 */ nop -/* 0B834 80B751D4 04A0FFFB */ bltz $a1, .L80B751C4 +/* 0B834 80B751D4 04A0FFFB */ bltz $a1, .L80B751C4 /* 0B838 80B751D8 00000000 */ nop .L80B751DC: /* 0B83C 80B751DC 44D9F800 */ ctc1 $t9, $31 -/* 0B840 80B751E0 0C2DC49E */ jal func_80B71278 +/* 0B840 80B751E0 0C2DC49E */ jal func_80B71278 /* 0B844 80B751E4 30A500FF */ andi $a1, $a1, 0x00FF ## $a1 = 000000FF /* 0B848 80B751E8 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 /* 0B84C 80B751EC 44816000 */ mtc1 $at, $f12 ## $f12 = 20.00 /* 0B850 80B751F0 0C00CFBE */ jal Math_Rand_ZeroFloat - + /* 0B854 80B751F4 00000000 */ nop -/* 0B858 80B751F8 4600018D */ trunc.w.s $f6, $f0 -/* 0B85C 80B751FC 440F3000 */ mfc1 $t7, $f6 +/* 0B858 80B751F8 4600018D */ trunc.w.s $f6, $f0 +/* 0B85C 80B751FC 440F3000 */ mfc1 $t7, $f6 /* 0B860 80B75200 00000000 */ nop /* 0B864 80B75204 25F80014 */ addiu $t8, $t7, 0x0014 ## $t8 = 00000014 /* 0B868 80B75208 A618017E */ sh $t8, 0x017E($s0) ## 0000017E .L80B7520C: /* 0B86C 80B7520C 860A0180 */ lh $t2, 0x0180($s0) ## 00000180 .L80B75210: -/* 0B870 80B75210 15400004 */ bne $t2, $zero, .L80B75224 +/* 0B870 80B75210 15400004 */ bne $t2, $zero, .L80B75224 /* 0B874 80B75214 2402000A */ addiu $v0, $zero, 0x000A ## $v0 = 0000000A /* 0B878 80B75218 A6020158 */ sh $v0, 0x0158($s0) ## 00000158 -/* 0B87C 80B7521C 10000016 */ beq $zero, $zero, .L80B75278 +/* 0B87C 80B7521C 10000016 */ beq $zero, $zero, .L80B75278 /* 0B880 80B75220 A602015A */ sh $v0, 0x015A($s0) ## 0000015A .L80B75224: /* 0B884 80B75224 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0B888 80B75228 0C2DC3B5 */ jal func_80B70ED4 +/* 0B888 80B75228 0C2DC3B5 */ jal func_80B70ED4 /* 0B88C 80B7522C 26250014 */ addiu $a1, $s1, 0x0014 ## $a1 = 00000014 /* 0B890 80B75230 3C0142C8 */ lui $at, 0x42C8 ## $at = 42C80000 /* 0B894 80B75234 44812000 */ mtc1 $at, $f4 ## $f4 = 100.00 -/* 0B898 80B75238 C7AA0118 */ lwc1 $f10, 0x0118($sp) +/* 0B898 80B75238 C7AA0118 */ lwc1 $f10, 0x0118($sp) /* 0B89C 80B7523C C6080090 */ lwc1 $f8, 0x0090($s0) ## 00000090 -/* 0B8A0 80B75240 460A2182 */ mul.s $f6, $f4, $f10 -/* 0B8A4 80B75244 4606403C */ c.lt.s $f8, $f6 +/* 0B8A0 80B75240 460A2182 */ mul.s $f6, $f4, $f10 +/* 0B8A4 80B75244 4606403C */ c.lt.s $f8, $f6 /* 0B8A8 80B75248 00000000 */ nop -/* 0B8AC 80B7524C 4502000B */ bc1fl .L80B7527C +/* 0B8AC 80B7524C 4502000B */ bc1fl .L80B7527C /* 0B8B0 80B75250 8604015C */ lh $a0, 0x015C($s0) ## 0000015C /* 0B8B4 80B75254 A6000158 */ sh $zero, 0x0158($s0) ## 00000158 /* 0B8B8 80B75258 860E0158 */ lh $t6, 0x0158($s0) ## 00000158 @@ -4247,30 +4247,30 @@ glabel L80B75278 .L80B75278: /* 0B8D8 80B75278 8604015C */ lh $a0, 0x015C($s0) ## 0000015C .L80B7527C: -/* 0B8DC 80B7527C 00042300 */ sll $a0, $a0, 12 -/* 0B8E0 80B75280 00042400 */ sll $a0, $a0, 16 +/* 0B8DC 80B7527C 00042300 */ sll $a0, $a0, 12 +/* 0B8E0 80B75280 00042400 */ sll $a0, $a0, 16 /* 0B8E4 80B75284 0C01DE1C */ jal Math_Sins ## sins? -/* 0B8E8 80B75288 00042403 */ sra $a0, $a0, 16 +/* 0B8E8 80B75288 00042403 */ sra $a0, $a0, 16 /* 0B8EC 80B7528C 3C0180B8 */ lui $at, %hi(D_80B7B724) ## $at = 80B80000 -/* 0B8F0 80B75290 C424B724 */ lwc1 $f4, %lo(D_80B7B724)($at) +/* 0B8F0 80B75290 C424B724 */ lwc1 $f4, %lo(D_80B7B724)($at) /* 0B8F4 80B75294 3C0180B8 */ lui $at, %hi(D_80B7B728) ## $at = 80B80000 -/* 0B8F8 80B75298 C428B728 */ lwc1 $f8, %lo(D_80B7B728)($at) -/* 0B8FC 80B7529C 46040282 */ mul.s $f10, $f0, $f4 +/* 0B8F8 80B75298 C428B728 */ lwc1 $f8, %lo(D_80B7B728)($at) +/* 0B8FC 80B7529C 46040282 */ mul.s $f10, $f0, $f4 /* 0B900 80B752A0 26040172 */ addiu $a0, $s0, 0x0172 ## $a0 = 00000172 /* 0B904 80B752A4 24060002 */ addiu $a2, $zero, 0x0002 ## $a2 = 00000002 /* 0B908 80B752A8 240707D0 */ addiu $a3, $zero, 0x07D0 ## $a3 = 000007D0 -/* 0B90C 80B752AC 46085180 */ add.s $f6, $f10, $f8 -/* 0B910 80B752B0 4600310D */ trunc.w.s $f4, $f6 -/* 0B914 80B752B4 44052000 */ mfc1 $a1, $f4 +/* 0B90C 80B752AC 46085180 */ add.s $f6, $f10, $f8 +/* 0B910 80B752B0 4600310D */ trunc.w.s $f4, $f6 +/* 0B914 80B752B4 44052000 */ mfc1 $a1, $f4 /* 0B918 80B752B8 00000000 */ nop -/* 0B91C 80B752BC 00052C00 */ sll $a1, $a1, 16 +/* 0B91C 80B752BC 00052C00 */ sll $a1, $a1, 16 /* 0B920 80B752C0 0C01E1EF */ jal Math_SmoothScaleMaxS - -/* 0B924 80B752C4 00052C03 */ sra $a1, $a1, 16 + +/* 0B924 80B752C4 00052C03 */ sra $a1, $a1, 16 /* 0B928 80B752C8 860B0158 */ lh $t3, 0x0158($s0) ## 00000158 /* 0B92C 80B752CC 24010006 */ addiu $at, $zero, 0x0006 ## $at = 00000006 -/* 0B930 80B752D0 516101FB */ beql $t3, $at, .L80B75AC0 +/* 0B930 80B752D0 516101FB */ beql $t3, $at, .L80B75AC0 /* 0B934 80B752D4 920201D2 */ lbu $v0, 0x01D2($s0) ## 000001D2 /* 0B938 80B752D8 8E2D07C0 */ lw $t5, 0x07C0($s1) ## 000007C0 /* 0B93C 80B752DC C6060028 */ lwc1 $f6, 0x0028($s0) ## 00000028 @@ -4278,50 +4278,50 @@ glabel L80B75278 /* 0B944 80B752E4 85F80002 */ lh $t8, 0x0002($t7) ## 00000002 /* 0B948 80B752E8 44985000 */ mtc1 $t8, $f10 ## $f10 = 0.00 /* 0B94C 80B752EC 00000000 */ nop -/* 0B950 80B752F0 46805220 */ cvt.s.w $f8, $f10 -/* 0B954 80B752F4 4606403C */ c.lt.s $f8, $f6 +/* 0B950 80B752F0 46805220 */ cvt.s.w $f8, $f10 +/* 0B954 80B752F4 4606403C */ c.lt.s $f8, $f6 /* 0B958 80B752F8 00000000 */ nop -/* 0B95C 80B752FC 4500001A */ bc1f .L80B75368 +/* 0B95C 80B752FC 4500001A */ bc1f .L80B75368 /* 0B960 80B75300 3C013FC0 */ lui $at, 0x3FC0 ## $at = 3FC00000 /* 0B964 80B75304 44812000 */ mtc1 $at, $f4 ## $f4 = 1.50 /* 0B968 80B75308 3C0180B8 */ lui $at, %hi(D_80B7B72C) ## $at = 80B80000 /* 0B96C 80B7530C 2604016E */ addiu $a0, $s0, 0x016E ## $a0 = 0000016E /* 0B970 80B75310 E6040190 */ swc1 $f4, 0x0190($s0) ## 00000190 -/* 0B974 80B75314 C42AB72C */ lwc1 $f10, %lo(D_80B7B72C)($at) +/* 0B974 80B75314 C42AB72C */ lwc1 $f10, %lo(D_80B7B72C)($at) /* 0B978 80B75318 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 0B97C 80B7531C 24060005 */ addiu $a2, $zero, 0x0005 ## $a2 = 00000005 /* 0B980 80B75320 240707D0 */ addiu $a3, $zero, 0x07D0 ## $a3 = 000007D0 /* 0B984 80B75324 0C01E1EF */ jal Math_SmoothScaleMaxS - + /* 0B988 80B75328 E60A0194 */ swc1 $f10, 0x0194($s0) ## 00000194 /* 0B98C 80B7532C 240A0003 */ addiu $t2, $zero, 0x0003 ## $t2 = 00000003 /* 0B990 80B75330 240E0003 */ addiu $t6, $zero, 0x0003 ## $t6 = 00000003 /* 0B994 80B75334 240C0003 */ addiu $t4, $zero, 0x0003 ## $t4 = 00000003 /* 0B998 80B75338 24192000 */ addiu $t9, $zero, 0x2000 ## $t9 = 00002000 /* 0B99C 80B7533C 24092000 */ addiu $t1, $zero, 0x2000 ## $t1 = 00002000 -/* 0B9A0 80B75340 A7AC00F4 */ sh $t4, 0x00F4($sp) -/* 0B9A4 80B75344 A7AE00F0 */ sh $t6, 0x00F0($sp) -/* 0B9A8 80B75348 A7AA00FA */ sh $t2, 0x00FA($sp) -/* 0B9AC 80B7534C A7A900F2 */ sh $t1, 0x00F2($sp) -/* 0B9B0 80B75350 A7B900EE */ sh $t9, 0x00EE($sp) +/* 0B9A0 80B75340 A7AC00F4 */ sh $t4, 0x00F4($sp) +/* 0B9A4 80B75344 A7AE00F0 */ sh $t6, 0x00F0($sp) +/* 0B9A8 80B75348 A7AA00FA */ sh $t2, 0x00FA($sp) +/* 0B9AC 80B7534C A7A900F2 */ sh $t1, 0x00F2($sp) +/* 0B9B0 80B75350 A7B900EE */ sh $t9, 0x00EE($sp) /* 0B9B4 80B75354 C6080184 */ lwc1 $f8, 0x0184($s0) ## 00000184 /* 0B9B8 80B75358 A600017E */ sh $zero, 0x017E($s0) ## 0000017E -/* 0B9BC 80B7535C 46144181 */ sub.s $f6, $f8, $f20 -/* 0B9C0 80B75360 10000057 */ beq $zero, $zero, .L80B754C0 +/* 0B9BC 80B7535C 46144181 */ sub.s $f6, $f8, $f20 +/* 0B9C0 80B75360 10000057 */ beq $zero, $zero, .L80B754C0 /* 0B9C4 80B75364 E6060184 */ swc1 $f6, 0x0184($s0) ## 00000184 .L80B75368: -/* 0B9C8 80B75368 4405A000 */ mfc1 $a1, $f20 +/* 0B9C8 80B75368 4405A000 */ mfc1 $a1, $f20 /* 0B9CC 80B7536C 26040184 */ addiu $a0, $s0, 0x0184 ## $a0 = 00000184 /* 0B9D0 80B75370 0C01E123 */ jal Math_SmoothDownscaleMaxF - + /* 0B9D4 80B75374 3C064000 */ lui $a2, 0x4000 ## $a2 = 40000000 /* 0B9D8 80B75378 86030158 */ lh $v1, 0x0158($s0) ## 00000158 /* 0B9DC 80B7537C 2401FFFF */ addiu $at, $zero, 0xFFFF ## $at = FFFFFFFF -/* 0B9E0 80B75380 10610006 */ beq $v1, $at, .L80B7539C +/* 0B9E0 80B75380 10610006 */ beq $v1, $at, .L80B7539C /* 0B9E4 80B75384 2401FFFE */ addiu $at, $zero, 0xFFFE ## $at = FFFFFFFE -/* 0B9E8 80B75388 10610004 */ beq $v1, $at, .L80B7539C +/* 0B9E8 80B75388 10610004 */ beq $v1, $at, .L80B7539C /* 0B9EC 80B7538C 2401FFE7 */ addiu $at, $zero, 0xFFE7 ## $at = FFFFFFE7 -/* 0B9F0 80B75390 50610003 */ beql $v1, $at, .L80B753A0 +/* 0B9F0 80B75390 50610003 */ beql $v1, $at, .L80B753A0 /* 0B9F4 80B75394 A600016A */ sh $zero, 0x016A($s0) ## 0000016A /* 0B9F8 80B75398 A6000166 */ sh $zero, 0x0166($s0) ## 00000166 .L80B7539C: @@ -4334,178 +4334,178 @@ glabel L80B75278 /* 0BA10 80B753B0 24180004 */ addiu $t8, $zero, 0x0004 ## $t8 = 00000004 /* 0BA14 80B753B4 240A2000 */ addiu $t2, $zero, 0x2000 ## $t2 = 00002000 /* 0BA18 80B753B8 240E2000 */ addiu $t6, $zero, 0x2000 ## $t6 = 00002000 -/* 0BA1C 80B753BC A7B800F4 */ sh $t8, 0x00F4($sp) -/* 0BA20 80B753C0 A7AF00F0 */ sh $t7, 0x00F0($sp) -/* 0BA24 80B753C4 A7AD00FA */ sh $t5, 0x00FA($sp) -/* 0BA28 80B753C8 A7AE00F2 */ sh $t6, 0x00F2($sp) -/* 0BA2C 80B753CC A7AA00EE */ sh $t2, 0x00EE($sp) +/* 0BA1C 80B753BC A7B800F4 */ sh $t8, 0x00F4($sp) +/* 0BA20 80B753C0 A7AF00F0 */ sh $t7, 0x00F0($sp) +/* 0BA24 80B753C4 A7AD00FA */ sh $t5, 0x00FA($sp) +/* 0BA28 80B753C8 A7AE00F2 */ sh $t6, 0x00F2($sp) +/* 0BA2C 80B753CC A7AA00EE */ sh $t2, 0x00EE($sp) /* 0BA30 80B753D0 C60401B0 */ lwc1 $f4, 0x01B0($s0) ## 000001B0 -/* 0BA34 80B753D4 87A60134 */ lh $a2, 0x0134($sp) -/* 0BA38 80B753D8 87A500FC */ lh $a1, 0x00FC($sp) -/* 0BA3C 80B753DC 4600228D */ trunc.w.s $f10, $f4 +/* 0BA34 80B753D4 87A60134 */ lh $a2, 0x0134($sp) +/* 0BA38 80B753D8 87A500FC */ lh $a1, 0x00FC($sp) +/* 0BA3C 80B753DC 4600228D */ trunc.w.s $f10, $f4 /* 0BA40 80B753E0 26040032 */ addiu $a0, $s0, 0x0032 ## $a0 = 00000032 -/* 0BA44 80B753E4 44075000 */ mfc1 $a3, $f10 +/* 0BA44 80B753E4 44075000 */ mfc1 $a3, $f10 /* 0BA48 80B753E8 00000000 */ nop -/* 0BA4C 80B753EC 00073C00 */ sll $a3, $a3, 16 -/* 0BA50 80B753F0 0C2DA6E1 */ jal func_80B69B84 -/* 0BA54 80B753F4 00073C03 */ sra $a3, $a3, 16 +/* 0BA4C 80B753EC 00073C00 */ sll $a3, $a3, 16 +/* 0BA50 80B753F0 0C2DA6E1 */ jal func_80B69B84 +/* 0BA54 80B753F4 00073C03 */ sra $a3, $a3, 16 /* 0BA58 80B753F8 44824000 */ mtc1 $v0, $f8 ## $f8 = 0.00 /* 0BA5C 80B753FC 3C014040 */ lui $at, 0x4040 ## $at = 40400000 /* 0BA60 80B75400 44812000 */ mtc1 $at, $f4 ## $f4 = 3.00 -/* 0BA64 80B75404 468041A0 */ cvt.s.w $f6, $f8 +/* 0BA64 80B75404 468041A0 */ cvt.s.w $f6, $f8 /* 0BA68 80B75408 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 /* 0BA6C 80B7540C 26040030 */ addiu $a0, $s0, 0x0030 ## $a0 = 00000030 -/* 0BA70 80B75410 87A500FE */ lh $a1, 0x00FE($sp) -/* 0BA74 80B75414 87A60134 */ lh $a2, 0x0134($sp) -/* 0BA78 80B75418 46043282 */ mul.s $f10, $f6, $f4 +/* 0BA70 80B75410 87A500FE */ lh $a1, 0x00FE($sp) +/* 0BA74 80B75414 87A60134 */ lh $a2, 0x0134($sp) +/* 0BA78 80B75418 46043282 */ mul.s $f10, $f6, $f4 /* 0BA7C 80B7541C 44812000 */ mtc1 $at, $f4 ## $f4 = 0.50 -/* 0BA80 80B75420 4600520D */ trunc.w.s $f8, $f10 -/* 0BA84 80B75424 44094000 */ mfc1 $t1, $f8 +/* 0BA80 80B75420 4600520D */ trunc.w.s $f8, $f10 +/* 0BA84 80B75424 44094000 */ mfc1 $t1, $f8 /* 0BA88 80B75428 00000000 */ nop -/* 0BA8C 80B7542C A7A900F6 */ sh $t1, 0x00F6($sp) +/* 0BA8C 80B7542C A7A900F6 */ sh $t1, 0x00F6($sp) /* 0BA90 80B75430 C60601B0 */ lwc1 $f6, 0x01B0($s0) ## 000001B0 -/* 0BA94 80B75434 46043282 */ mul.s $f10, $f6, $f4 -/* 0BA98 80B75438 4600520D */ trunc.w.s $f8, $f10 -/* 0BA9C 80B7543C 44074000 */ mfc1 $a3, $f8 +/* 0BA94 80B75434 46043282 */ mul.s $f10, $f6, $f4 +/* 0BA98 80B75438 4600520D */ trunc.w.s $f8, $f10 +/* 0BA9C 80B7543C 44074000 */ mfc1 $a3, $f8 /* 0BAA0 80B75440 00000000 */ nop -/* 0BAA4 80B75444 00073C00 */ sll $a3, $a3, 16 +/* 0BAA4 80B75444 00073C00 */ sll $a3, $a3, 16 /* 0BAA8 80B75448 0C01E1EF */ jal Math_SmoothScaleMaxS - -/* 0BAAC 80B7544C 00073C03 */ sra $a3, $a3, 16 -/* 0BAB0 80B75450 87A500F6 */ lh $a1, 0x00F6($sp) -/* 0BAB4 80B75454 28A11F41 */ slti $at, $a1, 0x1F41 -/* 0BAB8 80B75458 54200004 */ bnel $at, $zero, .L80B7546C -/* 0BABC 80B7545C 28A1E0C0 */ slti $at, $a1, 0xE0C0 -/* 0BAC0 80B75460 10000005 */ beq $zero, $zero, .L80B75478 + +/* 0BAAC 80B7544C 00073C03 */ sra $a3, $a3, 16 +/* 0BAB0 80B75450 87A500F6 */ lh $a1, 0x00F6($sp) +/* 0BAB4 80B75454 28A11F41 */ slti $at, $a1, 0x1F41 +/* 0BAB8 80B75458 54200004 */ bnel $at, $zero, .L80B7546C +/* 0BABC 80B7545C 28A1E0C0 */ slti $at, $a1, 0xE0C0 +/* 0BAC0 80B75460 10000005 */ beq $zero, $zero, .L80B75478 /* 0BAC4 80B75464 24051F40 */ addiu $a1, $zero, 0x1F40 ## $a1 = 00001F40 -/* 0BAC8 80B75468 28A1E0C0 */ slti $at, $a1, 0xE0C0 +/* 0BAC8 80B75468 28A1E0C0 */ slti $at, $a1, 0xE0C0 .L80B7546C: -/* 0BACC 80B7546C 10200002 */ beq $at, $zero, .L80B75478 +/* 0BACC 80B7546C 10200002 */ beq $at, $zero, .L80B75478 /* 0BAD0 80B75470 00000000 */ nop /* 0BAD4 80B75474 2405E0C0 */ addiu $a1, $zero, 0xE0C0 ## $a1 = FFFFE0C0 .L80B75478: /* 0BAD8 80B75478 3C0180B8 */ lui $at, %hi(D_80B7B730) ## $at = 80B80000 -/* 0BADC 80B7547C C424B730 */ lwc1 $f4, %lo(D_80B7B730)($at) +/* 0BADC 80B7547C C424B730 */ lwc1 $f4, %lo(D_80B7B730)($at) /* 0BAE0 80B75480 C6060068 */ lwc1 $f6, 0x0068($s0) ## 00000068 -/* 0BAE4 80B75484 4606203E */ c.le.s $f4, $f6 +/* 0BAE4 80B75484 4606203E */ c.le.s $f4, $f6 /* 0BAE8 80B75488 00000000 */ nop -/* 0BAEC 80B7548C 45000006 */ bc1f .L80B754A8 +/* 0BAEC 80B7548C 45000006 */ bc1f .L80B754A8 /* 0BAF0 80B75490 2604016E */ addiu $a0, $s0, 0x016E ## $a0 = 0000016E /* 0BAF4 80B75494 24060002 */ addiu $a2, $zero, 0x0002 ## $a2 = 00000002 /* 0BAF8 80B75498 0C01E1EF */ jal Math_SmoothScaleMaxS - + /* 0BAFC 80B7549C 24074E20 */ addiu $a3, $zero, 0x4E20 ## $a3 = 00004E20 -/* 0BB00 80B754A0 10000005 */ beq $zero, $zero, .L80B754B8 +/* 0BB00 80B754A0 10000005 */ beq $zero, $zero, .L80B754B8 /* 0BB04 80B754A4 00000000 */ nop .L80B754A8: /* 0BB08 80B754A8 2604016E */ addiu $a0, $s0, 0x016E ## $a0 = 0000016E /* 0BB0C 80B754AC 24060003 */ addiu $a2, $zero, 0x0003 ## $a2 = 00000003 /* 0BB10 80B754B0 0C01E1EF */ jal Math_SmoothScaleMaxS - + /* 0BB14 80B754B4 24070BB8 */ addiu $a3, $zero, 0x0BB8 ## $a3 = 00000BB8 .L80B754B8: -/* 0BB18 80B754B8 0C00B642 */ jal func_8002D908 +/* 0BB18 80B754B8 0C00B642 */ jal func_8002D908 /* 0BB1C 80B754BC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 .L80B754C0: -/* 0BB20 80B754C0 0C00B5FB */ jal func_8002D7EC +/* 0BB20 80B754C0 0C00B5FB */ jal func_8002D7EC /* 0BB24 80B754C4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 0BB28 80B754C8 3C013FC0 */ lui $at, 0x3FC0 ## $at = 3FC00000 /* 0BB2C 80B754CC 44814000 */ mtc1 $at, $f8 ## $f8 = 1.50 /* 0BB30 80B754D0 C60A0184 */ lwc1 $f10, 0x0184($s0) ## 00000184 /* 0BB34 80B754D4 C6040028 */ lwc1 $f4, 0x0028($s0) ## 00000028 /* 0BB38 80B754D8 92020152 */ lbu $v0, 0x0152($s0) ## 00000152 -/* 0BB3C 80B754DC 46085182 */ mul.s $f6, $f10, $f8 -/* 0BB40 80B754E0 46062280 */ add.s $f10, $f4, $f6 -/* 0BB44 80B754E4 10400019 */ beq $v0, $zero, .L80B7554C +/* 0BB3C 80B754DC 46085182 */ mul.s $f6, $f10, $f8 +/* 0BB40 80B754E0 46062280 */ add.s $f10, $f4, $f6 +/* 0BB44 80B754E4 10400019 */ beq $v0, $zero, .L80B7554C /* 0BB48 80B754E8 E60A0028 */ swc1 $f10, 0x0028($s0) ## 00000028 /* 0BB4C 80B754EC 92180156 */ lbu $t8, 0x0156($s0) ## 00000156 /* 0BB50 80B754F0 860D0154 */ lh $t5, 0x0154($s0) ## 00000154 /* 0BB54 80B754F4 244FFFFF */ addiu $t7, $v0, 0xFFFF ## $t7 = FFFFFFFF /* 0BB58 80B754F8 A20F0152 */ sb $t7, 0x0152($s0) ## 00000152 -/* 0BB5C 80B754FC 13000006 */ beq $t8, $zero, .L80B75518 +/* 0BB5C 80B754FC 13000006 */ beq $t8, $zero, .L80B75518 /* 0BB60 80B75500 A60D0168 */ sh $t5, 0x0168($s0) ## 00000168 /* 0BB64 80B75504 240A0005 */ addiu $t2, $zero, 0x0005 ## $t2 = 00000005 /* 0BB68 80B75508 240E4000 */ addiu $t6, $zero, 0x4000 ## $t6 = 00004000 -/* 0BB6C 80B7550C A7AA00F0 */ sh $t2, 0x00F0($sp) -/* 0BB70 80B75510 10000005 */ beq $zero, $zero, .L80B75528 -/* 0BB74 80B75514 A7AE00EE */ sh $t6, 0x00EE($sp) +/* 0BB6C 80B7550C A7AA00F0 */ sh $t2, 0x00F0($sp) +/* 0BB70 80B75510 10000005 */ beq $zero, $zero, .L80B75528 +/* 0BB74 80B75514 A7AE00EE */ sh $t6, 0x00EE($sp) .L80B75518: /* 0BB78 80B75518 240C000A */ addiu $t4, $zero, 0x000A ## $t4 = 0000000A /* 0BB7C 80B7551C 24190800 */ addiu $t9, $zero, 0x0800 ## $t9 = 00000800 -/* 0BB80 80B75520 A7AC00F0 */ sh $t4, 0x00F0($sp) -/* 0BB84 80B75524 A7B900EE */ sh $t9, 0x00EE($sp) +/* 0BB80 80B75520 A7AC00F0 */ sh $t4, 0x00F0($sp) +/* 0BB84 80B75524 A7B900EE */ sh $t9, 0x00EE($sp) .L80B75528: /* 0BB88 80B75528 860900B4 */ lh $t1, 0x00B4($s0) ## 000000B4 /* 0BB8C 80B7552C 240BFB00 */ addiu $t3, $zero, 0xFB00 ## $t3 = FFFFFB00 /* 0BB90 80B75530 240F0005 */ addiu $t7, $zero, 0x0005 ## $t7 = 00000005 -/* 0BB94 80B75534 01696823 */ subu $t5, $t3, $t1 +/* 0BB94 80B75534 01696823 */ subu $t5, $t3, $t1 /* 0BB98 80B75538 A60D0166 */ sh $t5, 0x0166($s0) ## 00000166 /* 0BB9C 80B7553C 24184000 */ addiu $t8, $zero, 0x4000 ## $t8 = 00004000 -/* 0BBA0 80B75540 A7AF00F4 */ sh $t7, 0x00F4($sp) -/* 0BBA4 80B75544 10000002 */ beq $zero, $zero, .L80B75550 -/* 0BBA8 80B75548 A7B800F2 */ sh $t8, 0x00F2($sp) +/* 0BBA0 80B75540 A7AF00F4 */ sh $t7, 0x00F4($sp) +/* 0BBA4 80B75544 10000002 */ beq $zero, $zero, .L80B75550 +/* 0BBA8 80B75548 A7B800F2 */ sh $t8, 0x00F2($sp) .L80B7554C: /* 0BBAC 80B7554C A2000156 */ sb $zero, 0x0156($s0) ## 00000156 .L80B75550: /* 0BBB0 80B75550 26040160 */ addiu $a0, $s0, 0x0160 ## $a0 = 00000160 /* 0BBB4 80B75554 86050166 */ lh $a1, 0x0166($s0) ## 00000166 -/* 0BBB8 80B75558 87A600F4 */ lh $a2, 0x00F4($sp) +/* 0BBB8 80B75558 87A600F4 */ lh $a2, 0x00F4($sp) /* 0BBBC 80B7555C 0C01E1EF */ jal Math_SmoothScaleMaxS - -/* 0BBC0 80B75560 87A700F2 */ lh $a3, 0x00F2($sp) + +/* 0BBC0 80B75560 87A700F2 */ lh $a3, 0x00F2($sp) /* 0BBC4 80B75564 26040162 */ addiu $a0, $s0, 0x0162 ## $a0 = 00000162 /* 0BBC8 80B75568 86050168 */ lh $a1, 0x0168($s0) ## 00000168 -/* 0BBCC 80B7556C 87A600F0 */ lh $a2, 0x00F0($sp) +/* 0BBCC 80B7556C 87A600F0 */ lh $a2, 0x00F0($sp) /* 0BBD0 80B75570 0C01E1EF */ jal Math_SmoothScaleMaxS - -/* 0BBD4 80B75574 87A700EE */ lh $a3, 0x00EE($sp) + +/* 0BBD4 80B75574 87A700EE */ lh $a3, 0x00EE($sp) /* 0BBD8 80B75578 26040164 */ addiu $a0, $s0, 0x0164 ## $a0 = 00000164 /* 0BBDC 80B7557C 8605016A */ lh $a1, 0x016A($s0) ## 0000016A -/* 0BBE0 80B75580 87A600FA */ lh $a2, 0x00FA($sp) +/* 0BBE0 80B75580 87A600FA */ lh $a2, 0x00FA($sp) /* 0BBE4 80B75584 0C01E1EF */ jal Math_SmoothScaleMaxS - + /* 0BBE8 80B75588 24072000 */ addiu $a3, $zero, 0x2000 ## $a3 = 00002000 /* 0BBEC 80B7558C 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 /* 0BBF0 80B75590 44814000 */ mtc1 $at, $f8 ## $f8 = 0.50 /* 0BBF4 80B75594 C6040068 */ lwc1 $f4, 0x0068($s0) ## 00000068 -/* 0BBF8 80B75598 4608203E */ c.le.s $f4, $f8 +/* 0BBF8 80B75598 4608203E */ c.le.s $f4, $f8 /* 0BBFC 80B7559C 00000000 */ nop -/* 0BC00 80B755A0 4500000C */ bc1f .L80B755D4 +/* 0BC00 80B755A0 4500000C */ bc1f .L80B755D4 /* 0BC04 80B755A4 260400B4 */ addiu $a0, $s0, 0x00B4 ## $a0 = 000000B4 /* 0BC08 80B755A8 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 0BC0C 80B755AC 2406000A */ addiu $a2, $zero, 0x000A ## $a2 = 0000000A /* 0BC10 80B755B0 0C01E1EF */ jal Math_SmoothScaleMaxS - + /* 0BC14 80B755B4 86070178 */ lh $a3, 0x0178($s0) ## 00000178 /* 0BC18 80B755B8 26040178 */ addiu $a0, $s0, 0x0178 ## $a0 = 00000178 /* 0BC1C 80B755BC 24050500 */ addiu $a1, $zero, 0x0500 ## $a1 = 00000500 /* 0BC20 80B755C0 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 /* 0BC24 80B755C4 0C01E1EF */ jal Math_SmoothScaleMaxS - + /* 0BC28 80B755C8 24070020 */ addiu $a3, $zero, 0x0020 ## $a3 = 00000020 -/* 0BC2C 80B755CC 1000000B */ beq $zero, $zero, .L80B755FC +/* 0BC2C 80B755CC 1000000B */ beq $zero, $zero, .L80B755FC /* 0BC30 80B755D0 86030158 */ lh $v1, 0x0158($s0) ## 00000158 .L80B755D4: /* 0BC34 80B755D4 86050030 */ lh $a1, 0x0030($s0) ## 00000030 /* 0BC38 80B755D8 260400B4 */ addiu $a0, $s0, 0x00B4 ## $a0 = 000000B4 /* 0BC3C 80B755DC 2406000A */ addiu $a2, $zero, 0x000A ## $a2 = 0000000A -/* 0BC40 80B755E0 00052823 */ subu $a1, $zero, $a1 -/* 0BC44 80B755E4 00052C00 */ sll $a1, $a1, 16 -/* 0BC48 80B755E8 00052C03 */ sra $a1, $a1, 16 +/* 0BC40 80B755E0 00052823 */ subu $a1, $zero, $a1 +/* 0BC44 80B755E4 00052C00 */ sll $a1, $a1, 16 +/* 0BC48 80B755E8 00052C03 */ sra $a1, $a1, 16 /* 0BC4C 80B755EC 0C01E1EF */ jal Math_SmoothScaleMaxS - + /* 0BC50 80B755F0 24071000 */ addiu $a3, $zero, 0x1000 ## $a3 = 00001000 /* 0BC54 80B755F4 A6000178 */ sh $zero, 0x0178($s0) ## 00000178 /* 0BC58 80B755F8 86030158 */ lh $v1, 0x0158($s0) ## 00000158 .L80B755FC: /* 0BC5C 80B755FC 860A0032 */ lh $t2, 0x0032($s0) ## 00000032 /* 0BC60 80B75600 2401FFFF */ addiu $at, $zero, 0xFFFF ## $at = FFFFFFFF -/* 0BC64 80B75604 10610042 */ beq $v1, $at, .L80B75710 +/* 0BC64 80B75604 10610042 */ beq $v1, $at, .L80B75710 /* 0BC68 80B75608 A60A00B6 */ sh $t2, 0x00B6($s0) ## 000000B6 /* 0BC6C 80B7560C 2401FFFE */ addiu $at, $zero, 0xFFFE ## $at = FFFFFFFE -/* 0BC70 80B75610 1061003F */ beq $v1, $at, .L80B75710 +/* 0BC70 80B75610 1061003F */ beq $v1, $at, .L80B75710 /* 0BC74 80B75614 2401FFE7 */ addiu $at, $zero, 0xFFE7 ## $at = FFFFFFE7 -/* 0BC78 80B75618 5061003E */ beql $v1, $at, .L80B75714 +/* 0BC78 80B75618 5061003E */ beql $v1, $at, .L80B75714 /* 0BC7C 80B7561C 8E3807C0 */ lw $t8, 0x07C0($s1) ## 000007C0 /* 0BC80 80B75620 8E2E07C0 */ lw $t6, 0x07C0($s1) ## 000007C0 /* 0BC84 80B75624 C6000028 */ lwc1 $f0, 0x0028($s0) ## 00000028 @@ -4513,21 +4513,21 @@ glabel L80B75278 /* 0BC8C 80B7562C 85990002 */ lh $t9, 0x0002($t4) ## 00000002 /* 0BC90 80B75630 44993000 */ mtc1 $t9, $f6 ## $f6 = 0.00 /* 0BC94 80B75634 00000000 */ nop -/* 0BC98 80B75638 468033A0 */ cvt.s.w $f14, $f6 -/* 0BC9C 80B7563C 4600703C */ c.lt.s $f14, $f0 +/* 0BC98 80B75638 468033A0 */ cvt.s.w $f14, $f6 +/* 0BC9C 80B7563C 4600703C */ c.lt.s $f14, $f0 /* 0BCA0 80B75640 00000000 */ nop -/* 0BCA4 80B75644 45020018 */ bc1fl .L80B756A8 -/* 0BCA8 80B75648 460E003C */ c.lt.s $f0, $f14 +/* 0BCA4 80B75644 45020018 */ bc1fl .L80B756A8 +/* 0BCA8 80B75648 460E003C */ c.lt.s $f0, $f14 /* 0BCAC 80B7564C C60A0104 */ lwc1 $f10, 0x0104($s0) ## 00000104 -/* 0BCB0 80B75650 460E503E */ c.le.s $f10, $f14 +/* 0BCB0 80B75650 460E503E */ c.le.s $f10, $f14 /* 0BCB4 80B75654 00000000 */ nop -/* 0BCB8 80B75658 45000012 */ bc1f .L80B756A4 +/* 0BCB8 80B75658 45000012 */ bc1f .L80B756A4 /* 0BCBC 80B7565C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 0BCC0 80B75660 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 0BCC4 80B75664 0C2DC28B */ jal func_80B70A2C +/* 0BCC4 80B75664 0C2DC28B */ jal func_80B70A2C /* 0BCC8 80B75668 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 /* 0BCCC 80B7566C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0BCD0 80B75670 0C2DC49E */ jal func_80B71278 +/* 0BCD0 80B75670 0C2DC49E */ jal func_80B71278 /* 0BCD4 80B75674 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 /* 0BCD8 80B75678 C6080060 */ lwc1 $f8, 0x0060($s0) ## 00000060 /* 0BCDC 80B7567C 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 @@ -4535,28 +4535,28 @@ glabel L80B75278 /* 0BCE4 80B75684 44816000 */ mtc1 $at, $f12 ## $f12 = 32768.00 /* 0BCE8 80B75688 E6080184 */ swc1 $f8, 0x0184($s0) ## 00000184 /* 0BCEC 80B7568C 0C00CFC8 */ jal Math_Rand_CenteredFloat - + /* 0BCF0 80B75690 E6040060 */ swc1 $f4, 0x0060($s0) ## 00000060 -/* 0BCF4 80B75694 4600018D */ trunc.w.s $f6, $f0 -/* 0BCF8 80B75698 44093000 */ mfc1 $t1, $f6 -/* 0BCFC 80B7569C 1000001C */ beq $zero, $zero, .L80B75710 +/* 0BCF4 80B75694 4600018D */ trunc.w.s $f6, $f0 +/* 0BCF8 80B75698 44093000 */ mfc1 $t1, $f6 +/* 0BCFC 80B7569C 1000001C */ beq $zero, $zero, .L80B75710 /* 0BD00 80B756A0 A609016A */ sh $t1, 0x016A($s0) ## 0000016A .L80B756A4: -/* 0BD04 80B756A4 460E003C */ c.lt.s $f0, $f14 +/* 0BD04 80B756A4 460E003C */ c.lt.s $f0, $f14 .L80B756A8: /* 0BD08 80B756A8 00000000 */ nop -/* 0BD0C 80B756AC 45020019 */ bc1fl .L80B75714 +/* 0BD0C 80B756AC 45020019 */ bc1fl .L80B75714 /* 0BD10 80B756B0 8E3807C0 */ lw $t8, 0x07C0($s1) ## 000007C0 /* 0BD14 80B756B4 C60A0104 */ lwc1 $f10, 0x0104($s0) ## 00000104 -/* 0BD18 80B756B8 460A703E */ c.le.s $f14, $f10 +/* 0BD18 80B756B8 460A703E */ c.le.s $f14, $f10 /* 0BD1C 80B756BC 00000000 */ nop -/* 0BD20 80B756C0 45000013 */ bc1f .L80B75710 +/* 0BD20 80B756C0 45000013 */ bc1f .L80B75710 /* 0BD24 80B756C4 3C01C0A0 */ lui $at, 0xC0A0 ## $at = C0A00000 /* 0BD28 80B756C8 44810000 */ mtc1 $at, $f0 ## $f0 = -5.00 /* 0BD2C 80B756CC C6080184 */ lwc1 $f8, 0x0184($s0) ## 00000184 -/* 0BD30 80B756D0 4600403C */ c.lt.s $f8, $f0 +/* 0BD30 80B756D0 4600403C */ c.lt.s $f8, $f0 /* 0BD34 80B756D4 00000000 */ nop -/* 0BD38 80B756D8 45020003 */ bc1fl .L80B756E8 +/* 0BD38 80B756D8 45020003 */ bc1fl .L80B756E8 /* 0BD3C 80B756DC 240DF060 */ addiu $t5, $zero, 0xF060 ## $t5 = FFFFF060 /* 0BD40 80B756E0 E6000184 */ swc1 $f0, 0x0184($s0) ## 00000184 /* 0BD44 80B756E4 240DF060 */ addiu $t5, $zero, 0xF060 ## $t5 = FFFFF060 @@ -4564,12 +4564,12 @@ glabel L80B75278 /* 0BD48 80B756E8 A60D0030 */ sh $t5, 0x0030($s0) ## 00000030 /* 0BD4C 80B756EC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 0BD50 80B756F0 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 0BD54 80B756F4 0C2DC28B */ jal func_80B70A2C +/* 0BD54 80B756F4 0C2DC28B */ jal func_80B70A2C /* 0BD58 80B756F8 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 /* 0BD5C 80B756FC 240F0014 */ addiu $t7, $zero, 0x0014 ## $t7 = 00000014 /* 0BD60 80B75700 A20F01D2 */ sb $t7, 0x01D2($s0) ## 000001D2 /* 0BD64 80B75704 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0BD68 80B75708 0C2DC49E */ jal func_80B71278 +/* 0BD68 80B75708 0C2DC49E */ jal func_80B71278 /* 0BD6C 80B7570C 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 .L80B75710: /* 0BD70 80B75710 8E3807C0 */ lw $t8, 0x07C0($s1) ## 000007C0 @@ -4579,34 +4579,34 @@ glabel L80B75278 /* 0BD7C 80B7571C 854E0002 */ lh $t6, 0x0002($t2) ## 00000002 /* 0BD80 80B75720 448E2000 */ mtc1 $t6, $f4 ## $f4 = 0.00 /* 0BD84 80B75724 00000000 */ nop -/* 0BD88 80B75728 468023A0 */ cvt.s.w $f14, $f4 -/* 0BD8C 80B7572C 460E003C */ c.lt.s $f0, $f14 +/* 0BD88 80B75728 468023A0 */ cvt.s.w $f14, $f4 +/* 0BD8C 80B7572C 460E003C */ c.lt.s $f0, $f14 /* 0BD90 80B75730 00000000 */ nop -/* 0BD94 80B75734 4500002D */ bc1f .L80B757EC +/* 0BD94 80B75734 4500002D */ bc1f .L80B757EC /* 0BD98 80B75738 3C014120 */ lui $at, 0x4120 ## $at = 41200000 /* 0BD9C 80B7573C 44813000 */ mtc1 $at, $f6 ## $f6 = 10.00 /* 0BDA0 80B75740 00000000 */ nop -/* 0BDA4 80B75744 46067281 */ sub.s $f10, $f14, $f6 -/* 0BDA8 80B75748 4600503C */ c.lt.s $f10, $f0 +/* 0BDA4 80B75744 46067281 */ sub.s $f10, $f14, $f6 +/* 0BDA8 80B75748 4600503C */ c.lt.s $f10, $f0 /* 0BDAC 80B7574C 00000000 */ nop -/* 0BDB0 80B75750 45020027 */ bc1fl .L80B757F0 +/* 0BDB0 80B75750 45020027 */ bc1fl .L80B757F0 /* 0BDB4 80B75754 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 /* 0BDB8 80B75758 860C015C */ lh $t4, 0x015C($s0) ## 0000015C /* 0BDBC 80B7575C 31990001 */ andi $t9, $t4, 0x0001 ## $t9 = 00000000 -/* 0BDC0 80B75760 57200023 */ bnel $t9, $zero, .L80B757F0 +/* 0BDC0 80B75760 57200023 */ bnel $t9, $zero, .L80B757F0 /* 0BDC4 80B75764 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 /* 0BDC8 80B75768 44804000 */ mtc1 $zero, $f8 ## $f8 = 0.00 /* 0BDCC 80B7576C C6040068 */ lwc1 $f4, 0x0068($s0) ## 00000068 -/* 0BDD0 80B75770 4604403C */ c.lt.s $f8, $f4 +/* 0BDD0 80B75770 4604403C */ c.lt.s $f8, $f4 /* 0BDD4 80B75774 00000000 */ nop -/* 0BDD8 80B75778 4502001D */ bc1fl .L80B757F0 +/* 0BDD8 80B75778 4502001D */ bc1fl .L80B757F0 /* 0BDDC 80B7577C 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 /* 0BDE0 80B75780 8E090024 */ lw $t1, 0x0024($s0) ## 00000024 /* 0BDE4 80B75784 27A60084 */ addiu $a2, $sp, 0x0084 ## $a2 = FFFFFF4C /* 0BDE8 80B75788 3C050001 */ lui $a1, 0x0001 ## $a1 = 00010000 /* 0BDEC 80B7578C ACC90000 */ sw $t1, 0x0000($a2) ## FFFFFF4C /* 0BDF0 80B75790 8E0B0028 */ lw $t3, 0x0028($s0) ## 00000028 -/* 0BDF4 80B75794 00B12821 */ addu $a1, $a1, $s1 +/* 0BDF4 80B75794 00B12821 */ addu $a1, $a1, $s1 /* 0BDF8 80B75798 3C0143FA */ lui $at, 0x43FA ## $at = 43FA0000 /* 0BDFC 80B7579C ACCB0004 */ sw $t3, 0x0004($a2) ## FFFFFF50 /* 0BE00 80B757A0 8E09002C */ lw $t1, 0x002C($s0) ## 0000002C @@ -4621,70 +4621,70 @@ glabel L80B75278 /* 0BE24 80B757C4 85F80002 */ lh $t8, 0x0002($t7) ## 00000002 /* 0BE28 80B757C8 44983000 */ mtc1 $t8, $f6 ## $f6 = 0.00 /* 0BE2C 80B757CC 00000000 */ nop -/* 0BE30 80B757D0 468032A0 */ cvt.s.w $f10, $f6 -/* 0BE34 80B757D4 E7AA0088 */ swc1 $f10, 0x0088($sp) +/* 0BE30 80B757D0 468032A0 */ cvt.s.w $f10, $f6 +/* 0BE34 80B757D4 E7AA0088 */ swc1 $f10, 0x0088($sp) /* 0BE38 80B757D8 8CA51E10 */ lw $a1, 0x1E10($a1) ## 00011E10 -/* 0BE3C 80B757DC AFAE0018 */ sw $t6, 0x0018($sp) -/* 0BE40 80B757E0 AFAA0014 */ sw $t2, 0x0014($sp) -/* 0BE44 80B757E4 0C2DA70B */ jal func_80B69C2C -/* 0BE48 80B757E8 E7A80010 */ swc1 $f8, 0x0010($sp) +/* 0BE3C 80B757DC AFAE0018 */ sw $t6, 0x0018($sp) +/* 0BE40 80B757E0 AFAA0014 */ sw $t2, 0x0014($sp) +/* 0BE44 80B757E4 0C2DA70B */ jal func_80B69C2C +/* 0BE48 80B757E8 E7A80010 */ swc1 $f8, 0x0010($sp) .L80B757EC: /* 0BE4C 80B757EC 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 .L80B757F0: /* 0BE50 80B757F0 C6060068 */ lwc1 $f6, 0x0068($s0) ## 00000068 -/* 0BE54 80B757F4 4606203C */ c.lt.s $f4, $f6 +/* 0BE54 80B757F4 4606203C */ c.lt.s $f4, $f6 /* 0BE58 80B757F8 00000000 */ nop -/* 0BE5C 80B757FC 45030006 */ bc1tl .L80B75818 +/* 0BE5C 80B757FC 45030006 */ bc1tl .L80B75818 /* 0BE60 80B75800 C60A0060 */ lwc1 $f10, 0x0060($s0) ## 00000060 /* 0BE64 80B75804 860C0158 */ lh $t4, 0x0158($s0) ## 00000158 /* 0BE68 80B75808 24010005 */ addiu $at, $zero, 0x0005 ## $at = 00000005 -/* 0BE6C 80B7580C 558100AC */ bnel $t4, $at, .L80B75AC0 +/* 0BE6C 80B7580C 558100AC */ bnel $t4, $at, .L80B75AC0 /* 0BE70 80B75810 920201D2 */ lbu $v0, 0x01D2($s0) ## 000001D2 /* 0BE74 80B75814 C60A0060 */ lwc1 $f10, 0x0060($s0) ## 00000060 .L80B75818: /* 0BE78 80B75818 3C0180B8 */ lui $at, %hi(D_80B7B734) ## $at = 80B80000 -/* 0BE7C 80B7581C C424B734 */ lwc1 $f4, %lo(D_80B7B734)($at) -/* 0BE80 80B75820 E7AA0080 */ swc1 $f10, 0x0080($sp) +/* 0BE7C 80B7581C C424B734 */ lwc1 $f4, %lo(D_80B7B734)($at) +/* 0BE80 80B75820 E7AA0080 */ swc1 $f10, 0x0080($sp) /* 0BE84 80B75824 C60801AC */ lwc1 $f8, 0x01AC($s0) ## 000001AC /* 0BE88 80B75828 C6060028 */ lwc1 $f6, 0x0028($s0) ## 00000028 /* 0BE8C 80B7582C 3C01BF80 */ lui $at, 0xBF80 ## $at = BF800000 -/* 0BE90 80B75830 46044002 */ mul.s $f0, $f8, $f4 +/* 0BE90 80B75830 46044002 */ mul.s $f0, $f8, $f4 /* 0BE94 80B75834 C6080104 */ lwc1 $f8, 0x0104($s0) ## 00000104 /* 0BE98 80B75838 24190045 */ addiu $t9, $zero, 0x0045 ## $t9 = 00000045 /* 0BE9C 80B7583C 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 0BEA0 80B75840 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 0BEA4 80B75844 3C0641F0 */ lui $a2, 0x41F0 ## $a2 = 41F00000 /* 0BEA8 80B75848 3C0741F0 */ lui $a3, 0x41F0 ## $a3 = 41F00000 -/* 0BEAC 80B7584C 46003281 */ sub.s $f10, $f6, $f0 +/* 0BEAC 80B7584C 46003281 */ sub.s $f10, $f6, $f0 /* 0BEB0 80B75850 44813000 */ mtc1 $at, $f6 ## $f6 = -1.00 /* 0BEB4 80B75854 3C0142C8 */ lui $at, 0x42C8 ## $at = 42C80000 -/* 0BEB8 80B75858 46004101 */ sub.s $f4, $f8, $f0 +/* 0BEB8 80B75858 46004101 */ sub.s $f4, $f8, $f0 /* 0BEBC 80B7585C E60A0028 */ swc1 $f10, 0x0028($s0) ## 00000028 /* 0BEC0 80B75860 44815000 */ mtc1 $at, $f10 ## $f10 = 100.00 /* 0BEC4 80B75864 E6060060 */ swc1 $f6, 0x0060($s0) ## 00000060 /* 0BEC8 80B75868 E6040104 */ swc1 $f4, 0x0104($s0) ## 00000104 -/* 0BECC 80B7586C E7A000D8 */ swc1 $f0, 0x00D8($sp) -/* 0BED0 80B75870 AFB90014 */ sw $t9, 0x0014($sp) -/* 0BED4 80B75874 0C00B92D */ jal func_8002E4B4 -/* 0BED8 80B75878 E7AA0010 */ swc1 $f10, 0x0010($sp) -/* 0BEDC 80B7587C C7A000D8 */ lwc1 $f0, 0x00D8($sp) +/* 0BECC 80B7586C E7A000D8 */ swc1 $f0, 0x00D8($sp) +/* 0BED0 80B75870 AFB90014 */ sw $t9, 0x0014($sp) +/* 0BED4 80B75874 0C00B92D */ jal func_8002E4B4 +/* 0BED8 80B75878 E7AA0010 */ swc1 $f10, 0x0010($sp) +/* 0BEDC 80B7587C C7A000D8 */ lwc1 $f0, 0x00D8($sp) /* 0BEE0 80B75880 C6080028 */ lwc1 $f8, 0x0028($s0) ## 00000028 /* 0BEE4 80B75884 C6060104 */ lwc1 $f6, 0x0104($s0) ## 00000104 /* 0BEE8 80B75888 96020088 */ lhu $v0, 0x0088($s0) ## 00000088 -/* 0BEEC 80B7588C 46004100 */ add.s $f4, $f8, $f0 +/* 0BEEC 80B7588C 46004100 */ add.s $f4, $f8, $f0 /* 0BEF0 80B75890 304B0008 */ andi $t3, $v0, 0x0008 ## $t3 = 00000000 -/* 0BEF4 80B75894 46003280 */ add.s $f10, $f6, $f0 +/* 0BEF4 80B75894 46003280 */ add.s $f10, $f6, $f0 /* 0BEF8 80B75898 E6040028 */ swc1 $f4, 0x0028($s0) ## 00000028 /* 0BEFC 80B7589C E60A0104 */ swc1 $f10, 0x0104($s0) ## 00000104 -/* 0BF00 80B758A0 C7A80080 */ lwc1 $f8, 0x0080($sp) -/* 0BF04 80B758A4 11600004 */ beq $t3, $zero, .L80B758B8 +/* 0BF00 80B758A0 C7A80080 */ lwc1 $f8, 0x0080($sp) +/* 0BF04 80B758A4 11600004 */ beq $t3, $zero, .L80B758B8 /* 0BF08 80B758A8 E6080060 */ swc1 $f8, 0x0060($s0) ## 00000060 /* 0BF0C 80B758AC 24090014 */ addiu $t1, $zero, 0x0014 ## $t1 = 00000014 /* 0BF10 80B758B0 A60901A0 */ sh $t1, 0x01A0($s0) ## 000001A0 /* 0BF14 80B758B4 96020088 */ lhu $v0, 0x0088($s0) ## 00000088 .L80B758B8: /* 0BF18 80B758B8 304D0001 */ andi $t5, $v0, 0x0001 ## $t5 = 00000000 -/* 0BF1C 80B758BC 51A00080 */ beql $t5, $zero, .L80B75AC0 +/* 0BF1C 80B758BC 51A00080 */ beql $t5, $zero, .L80B75AC0 /* 0BF20 80B758C0 920201D2 */ lbu $v0, 0x01D2($s0) ## 000001D2 /* 0BF24 80B758C4 8E2F07C0 */ lw $t7, 0x07C0($s1) ## 000007C0 /* 0BF28 80B758C8 C60A0028 */ lwc1 $f10, 0x0028($s0) ## 00000028 @@ -4692,33 +4692,33 @@ glabel L80B75278 /* 0BF30 80B758D0 870A0002 */ lh $t2, 0x0002($t8) ## 00000002 /* 0BF34 80B758D4 448A2000 */ mtc1 $t2, $f4 ## $f4 = 0.00 /* 0BF38 80B758D8 00000000 */ nop -/* 0BF3C 80B758DC 468021A0 */ cvt.s.w $f6, $f4 -/* 0BF40 80B758E0 460A303C */ c.lt.s $f6, $f10 +/* 0BF3C 80B758DC 468021A0 */ cvt.s.w $f6, $f4 +/* 0BF40 80B758E0 460A303C */ c.lt.s $f6, $f10 /* 0BF44 80B758E4 00000000 */ nop -/* 0BF48 80B758E8 45000048 */ bc1f .L80B75A0C +/* 0BF48 80B758E8 45000048 */ bc1f .L80B75A0C /* 0BF4C 80B758EC 3C014040 */ lui $at, 0x4040 ## $at = 40400000 /* 0BF50 80B758F0 44816000 */ mtc1 $at, $f12 ## $f12 = 3.00 /* 0BF54 80B758F4 0C00CFBE */ jal Math_Rand_ZeroFloat - + /* 0BF58 80B758F8 00000000 */ nop /* 0BF5C 80B758FC 3C0180B8 */ lui $at, %hi(D_80B7B738) ## $at = 80B80000 -/* 0BF60 80B75900 C422B738 */ lwc1 $f2, %lo(D_80B7B738)($at) +/* 0BF60 80B75900 C422B738 */ lwc1 $f2, %lo(D_80B7B738)($at) /* 0BF64 80B75904 3C014040 */ lui $at, 0x4040 ## $at = 40400000 /* 0BF68 80B75908 44814000 */ mtc1 $at, $f8 ## $f8 = 3.00 /* 0BF6C 80B7590C C6060024 */ lwc1 $f6, 0x0024($s0) ## 00000024 /* 0BF70 80B75910 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0BF74 80B75914 46080100 */ add.s $f4, $f0, $f8 -/* 0BF78 80B75918 46023282 */ mul.s $f10, $f6, $f2 +/* 0BF74 80B75914 46080100 */ add.s $f4, $f0, $f8 +/* 0BF78 80B75918 46023282 */ mul.s $f10, $f6, $f2 /* 0BF7C 80B7591C C608002C */ lwc1 $f8, 0x002C($s0) ## 0000002C /* 0BF80 80B75920 24052869 */ addiu $a1, $zero, 0x2869 ## $a1 = 00002869 /* 0BF84 80B75924 E6040184 */ swc1 $f4, 0x0184($s0) ## 00000184 -/* 0BF88 80B75928 46024102 */ mul.s $f4, $f8, $f2 +/* 0BF88 80B75928 46024102 */ mul.s $f4, $f8, $f2 /* 0BF8C 80B7592C E60A005C */ swc1 $f10, 0x005C($s0) ## 0000005C /* 0BF90 80B75930 0C00BE0A */ jal Audio_PlayActorSound2 - + /* 0BF94 80B75934 E6040064 */ swc1 $f4, 0x0064($s0) ## 00000064 /* 0BF98 80B75938 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0BF9C 80B7593C 0C2DC33C */ jal func_80B70CF0 +/* 0BF9C 80B7593C 0C2DC33C */ jal func_80B70CF0 /* 0BFA0 80B75940 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 /* 0BFA4 80B75944 0C03F66B */ jal Math_Rand_ZeroOne ## Rand.Next() float @@ -4726,11 +4726,11 @@ glabel L80B75278 /* 0BFAC 80B7594C 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 /* 0BFB0 80B75950 44813000 */ mtc1 $at, $f6 ## $f6 = 0.50 /* 0BFB4 80B75954 00000000 */ nop -/* 0BFB8 80B75958 4606003C */ c.lt.s $f0, $f6 +/* 0BFB8 80B75958 4606003C */ c.lt.s $f0, $f6 /* 0BFBC 80B7595C 00000000 */ nop -/* 0BFC0 80B75960 45000003 */ bc1f .L80B75970 +/* 0BFC0 80B75960 45000003 */ bc1f .L80B75970 /* 0BFC4 80B75964 240E4000 */ addiu $t6, $zero, 0x4000 ## $t6 = 00004000 -/* 0BFC8 80B75968 10000003 */ beq $zero, $zero, .L80B75978 +/* 0BFC8 80B75968 10000003 */ beq $zero, $zero, .L80B75978 /* 0BFCC 80B7596C A60E016A */ sh $t6, 0x016A($s0) ## 0000016A .L80B75970: /* 0BFD0 80B75970 240CC000 */ addiu $t4, $zero, 0xC000 ## $t4 = FFFFC000 @@ -4742,156 +4742,156 @@ glabel L80B75278 /* 0BFE0 80B75980 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 /* 0BFE4 80B75984 44815000 */ mtc1 $at, $f10 ## $f10 = 0.50 /* 0BFE8 80B75988 00000000 */ nop -/* 0BFEC 80B7598C 460A003C */ c.lt.s $f0, $f10 +/* 0BFEC 80B7598C 460A003C */ c.lt.s $f0, $f10 /* 0BFF0 80B75990 00000000 */ nop -/* 0BFF4 80B75994 45020004 */ bc1fl .L80B759A8 +/* 0BFF4 80B75994 45020004 */ bc1fl .L80B759A8 /* 0BFF8 80B75998 3C014200 */ lui $at, 0x4200 ## $at = 42000000 -/* 0BFFC 80B7599C 1000000B */ beq $zero, $zero, .L80B759CC +/* 0BFFC 80B7599C 1000000B */ beq $zero, $zero, .L80B759CC /* 0C000 80B759A0 A6000166 */ sh $zero, 0x0166($s0) ## 00000166 /* 0C004 80B759A4 3C014200 */ lui $at, 0x4200 ## $at = 42000000 .L80B759A8: /* 0C008 80B759A8 44816000 */ mtc1 $at, $f12 ## $f12 = 32.00 /* 0C00C 80B759AC 0C00CFC8 */ jal Math_Rand_CenteredFloat - + /* 0C010 80B759B0 00000000 */ nop -/* 0C014 80B759B4 4600020D */ trunc.w.s $f8, $f0 +/* 0C014 80B759B4 4600020D */ trunc.w.s $f8, $f0 /* 0C018 80B759B8 34018000 */ ori $at, $zero, 0x8000 ## $at = 00008000 -/* 0C01C 80B759BC 440D4000 */ mfc1 $t5, $f8 +/* 0C01C 80B759BC 440D4000 */ mfc1 $t5, $f8 /* 0C020 80B759C0 00000000 */ nop -/* 0C024 80B759C4 01A17821 */ addu $t7, $t5, $at +/* 0C024 80B759C4 01A17821 */ addu $t7, $t5, $at /* 0C028 80B759C8 A60F0166 */ sh $t7, 0x0166($s0) ## 00000166 .L80B759CC: /* 0C02C 80B759CC 3C014680 */ lui $at, 0x4680 ## $at = 46800000 /* 0C030 80B759D0 44816000 */ mtc1 $at, $f12 ## $f12 = 16384.00 /* 0C034 80B759D4 0C00CFC8 */ jal Math_Rand_CenteredFloat - + /* 0C038 80B759D8 00000000 */ nop -/* 0C03C 80B759DC 4600010D */ trunc.w.s $f4, $f0 +/* 0C03C 80B759DC 4600010D */ trunc.w.s $f4, $f0 /* 0C040 80B759E0 E6140190 */ swc1 $f20, 0x0190($s0) ## 00000190 /* 0C044 80B759E4 3C0180B8 */ lui $at, %hi(D_80B7B73C) ## $at = 80B80000 -/* 0C048 80B759E8 440A2000 */ mfc1 $t2, $f4 +/* 0C048 80B759E8 440A2000 */ mfc1 $t2, $f4 /* 0C04C 80B759EC 00000000 */ nop /* 0C050 80B759F0 A60A0168 */ sh $t2, 0x0168($s0) ## 00000168 -/* 0C054 80B759F4 C426B73C */ lwc1 $f6, %lo(D_80B7B73C)($at) +/* 0C054 80B759F4 C426B73C */ lwc1 $f6, %lo(D_80B7B73C)($at) /* 0C058 80B759F8 3C0180B8 */ lui $at, %hi(D_80B7B740) ## $at = 80B80000 /* 0C05C 80B759FC E6060194 */ swc1 $f6, 0x0194($s0) ## 00000194 -/* 0C060 80B75A00 C42AB740 */ lwc1 $f10, %lo(D_80B7B740)($at) -/* 0C064 80B75A04 1000002D */ beq $zero, $zero, .L80B75ABC +/* 0C060 80B75A00 C42AB740 */ lwc1 $f10, %lo(D_80B7B740)($at) +/* 0C064 80B75A04 1000002D */ beq $zero, $zero, .L80B75ABC /* 0C068 80B75A08 E60A019C */ swc1 $f10, 0x019C($s0) ## 0000019C .L80B75A0C: /* 0C06C 80B75A0C 860E0158 */ lh $t6, 0x0158($s0) ## 00000158 /* 0C070 80B75A10 44804000 */ mtc1 $zero, $f8 ## $f8 = 0.00 /* 0C074 80B75A14 24010005 */ addiu $at, $zero, 0x0005 ## $at = 00000005 -/* 0C078 80B75A18 15C10028 */ bne $t6, $at, .L80B75ABC +/* 0C078 80B75A18 15C10028 */ bne $t6, $at, .L80B75ABC /* 0C07C 80B75A1C E6080184 */ swc1 $f8, 0x0184($s0) ## 00000184 /* 0C080 80B75A20 860C015C */ lh $t4, 0x015C($s0) ## 0000015C /* 0C084 80B75A24 31990001 */ andi $t9, $t4, 0x0001 ## $t9 = 00000000 -/* 0C088 80B75A28 17200024 */ bne $t9, $zero, .L80B75ABC +/* 0C088 80B75A28 17200024 */ bne $t9, $zero, .L80B75ABC /* 0C08C 80B75A2C 3C014120 */ lui $at, 0x4120 ## $at = 41200000 /* 0C090 80B75A30 44816000 */ mtc1 $at, $f12 ## $f12 = 10.00 /* 0C094 80B75A34 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 0C098 80B75A38 02214821 */ addu $t1, $s1, $at +/* 0C098 80B75A38 02214821 */ addu $t1, $s1, $at /* 0C09C 80B75A3C 260B00E4 */ addiu $t3, $s0, 0x00E4 ## $t3 = 000000E4 -/* 0C0A0 80B75A40 AFAB004C */ sw $t3, 0x004C($sp) +/* 0C0A0 80B75A40 AFAB004C */ sw $t3, 0x004C($sp) /* 0C0A4 80B75A44 0C00CFC8 */ jal Math_Rand_CenteredFloat - -/* 0C0A8 80B75A48 AFA90048 */ sw $t1, 0x0048($sp) + +/* 0C0A8 80B75A48 AFA90048 */ sw $t1, 0x0048($sp) /* 0C0AC 80B75A4C C6040024 */ lwc1 $f4, 0x0024($s0) ## 00000024 /* 0C0B0 80B75A50 3C014120 */ lui $at, 0x4120 ## $at = 41200000 /* 0C0B4 80B75A54 44816000 */ mtc1 $at, $f12 ## $f12 = 10.00 -/* 0C0B8 80B75A58 46040180 */ add.s $f6, $f0, $f4 +/* 0C0B8 80B75A58 46040180 */ add.s $f6, $f0, $f4 /* 0C0BC 80B75A5C 0C00CFC8 */ jal Math_Rand_CenteredFloat - -/* 0C0C0 80B75A60 E7A60074 */ swc1 $f6, 0x0074($sp) + +/* 0C0C0 80B75A60 E7A60074 */ swc1 $f6, 0x0074($sp) /* 0C0C4 80B75A64 C60A002C */ lwc1 $f10, 0x002C($s0) ## 0000002C /* 0C0C8 80B75A68 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 /* 0C0CC 80B75A6C 44813000 */ mtc1 $at, $f6 ## $f6 = 5.00 -/* 0C0D0 80B75A70 460A0200 */ add.s $f8, $f0, $f10 +/* 0C0D0 80B75A70 460A0200 */ add.s $f8, $f0, $f10 /* 0C0D4 80B75A74 3C0180B8 */ lui $at, %hi(D_80B7B744) ## $at = 80B80000 -/* 0C0D8 80B75A78 8FAD0048 */ lw $t5, 0x0048($sp) -/* 0C0DC 80B75A7C 8FA4004C */ lw $a0, 0x004C($sp) -/* 0C0E0 80B75A80 E7A8007C */ swc1 $f8, 0x007C($sp) +/* 0C0D8 80B75A78 8FAD0048 */ lw $t5, 0x0048($sp) +/* 0C0DC 80B75A7C 8FA4004C */ lw $a0, 0x004C($sp) +/* 0C0E0 80B75A80 E7A8007C */ swc1 $f8, 0x007C($sp) /* 0C0E4 80B75A84 C6040080 */ lwc1 $f4, 0x0080($s0) ## 00000080 /* 0C0E8 80B75A88 27A60074 */ addiu $a2, $sp, 0x0074 ## $a2 = FFFFFF3C -/* 0C0EC 80B75A8C 46062280 */ add.s $f10, $f4, $f6 -/* 0C0F0 80B75A90 C424B744 */ lwc1 $f4, %lo(D_80B7B744)($at) +/* 0C0EC 80B75A8C 46062280 */ add.s $f10, $f4, $f6 +/* 0C0F0 80B75A90 C424B744 */ lwc1 $f4, %lo(D_80B7B744)($at) /* 0C0F4 80B75A94 3C0180B8 */ lui $at, %hi(D_80B7B748) ## $at = 80B80000 -/* 0C0F8 80B75A98 E7AA0078 */ swc1 $f10, 0x0078($sp) +/* 0C0F8 80B75A98 E7AA0078 */ swc1 $f10, 0x0078($sp) /* 0C0FC 80B75A9C C60801AC */ lwc1 $f8, 0x01AC($s0) ## 000001AC -/* 0C100 80B75AA0 C42AB748 */ lwc1 $f10, %lo(D_80B7B748)($at) +/* 0C100 80B75AA0 C42AB748 */ lwc1 $f10, %lo(D_80B7B748)($at) /* 0C104 80B75AA4 8DA51E10 */ lw $a1, 0x1E10($t5) ## 00001E10 -/* 0C108 80B75AA8 46044182 */ mul.s $f6, $f8, $f4 -/* 0C10C 80B75AAC 460A3200 */ add.s $f8, $f6, $f10 -/* 0C110 80B75AB0 44074000 */ mfc1 $a3, $f8 -/* 0C114 80B75AB4 0C2DA7B4 */ jal func_80B69ED0 +/* 0C108 80B75AA8 46044182 */ mul.s $f6, $f8, $f4 +/* 0C10C 80B75AAC 460A3200 */ add.s $f8, $f6, $f10 +/* 0C110 80B75AB0 44074000 */ mfc1 $a3, $f8 +/* 0C114 80B75AB4 0C2DA7B4 */ jal func_80B69ED0 /* 0C118 80B75AB8 00000000 */ nop .L80B75ABC: /* 0C11C 80B75ABC 920201D2 */ lbu $v0, 0x01D2($s0) ## 000001D2 .L80B75AC0: -/* 0C120 80B75AC0 10400034 */ beq $v0, $zero, .L80B75B94 +/* 0C120 80B75AC0 10400034 */ beq $v0, $zero, .L80B75B94 /* 0C124 80B75AC4 3C0180B8 */ lui $at, %hi(D_80B7B74C) ## $at = 80B80000 -/* 0C128 80B75AC8 C426B74C */ lwc1 $f6, %lo(D_80B7B74C)($at) +/* 0C128 80B75AC8 C426B74C */ lwc1 $f6, %lo(D_80B7B74C)($at) /* 0C12C 80B75ACC C60401AC */ lwc1 $f4, 0x01AC($s0) ## 000001AC /* 0C130 80B75AD0 3C014120 */ lui $at, 0x4120 ## $at = 41200000 /* 0C134 80B75AD4 44814000 */ mtc1 $at, $f8 ## $f8 = 10.00 -/* 0C138 80B75AD8 46062282 */ mul.s $f10, $f4, $f6 +/* 0C138 80B75AD8 46062282 */ mul.s $f10, $f4, $f6 /* 0C13C 80B75ADC 244FFFFF */ addiu $t7, $v0, 0xFFFF ## $t7 = FFFFFFFF /* 0C140 80B75AE0 A20F01D2 */ sb $t7, 0x01D2($s0) ## 000001D2 /* 0C144 80B75AE4 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 0C148 80B75AE8 02215021 */ addu $t2, $s1, $at +/* 0C148 80B75AE8 02215021 */ addu $t2, $s1, $at /* 0C14C 80B75AEC 261800E4 */ addiu $t8, $s0, 0x00E4 ## $t8 = 000000E4 -/* 0C150 80B75AF0 AFB8004C */ sw $t8, 0x004C($sp) -/* 0C154 80B75AF4 46085300 */ add.s $f12, $f10, $f8 -/* 0C158 80B75AF8 AFAA0048 */ sw $t2, 0x0048($sp) -/* 0C15C 80B75AFC A7A00072 */ sh $zero, 0x0072($sp) -/* 0C160 80B75B00 E7AC0060 */ swc1 $f12, 0x0060($sp) +/* 0C150 80B75AF0 AFB8004C */ sw $t8, 0x004C($sp) +/* 0C154 80B75AF4 46085300 */ add.s $f12, $f10, $f8 +/* 0C158 80B75AF8 AFAA0048 */ sw $t2, 0x0048($sp) +/* 0C15C 80B75AFC A7A00072 */ sh $zero, 0x0072($sp) +/* 0C160 80B75B00 E7AC0060 */ swc1 $f12, 0x0060($sp) .L80B75B04: /* 0C164 80B75B04 0C00CFC8 */ jal Math_Rand_CenteredFloat - -/* 0C168 80B75B08 C7AC0060 */ lwc1 $f12, 0x0060($sp) + +/* 0C168 80B75B08 C7AC0060 */ lwc1 $f12, 0x0060($sp) /* 0C16C 80B75B0C C6040024 */ lwc1 $f4, 0x0024($s0) ## 00000024 -/* 0C170 80B75B10 C7AC0060 */ lwc1 $f12, 0x0060($sp) -/* 0C174 80B75B14 46040180 */ add.s $f6, $f0, $f4 +/* 0C170 80B75B10 C7AC0060 */ lwc1 $f12, 0x0060($sp) +/* 0C174 80B75B14 46040180 */ add.s $f6, $f0, $f4 /* 0C178 80B75B18 0C00CFC8 */ jal Math_Rand_CenteredFloat - -/* 0C17C 80B75B1C E7A60064 */ swc1 $f6, 0x0064($sp) + +/* 0C17C 80B75B1C E7A60064 */ swc1 $f6, 0x0064($sp) /* 0C180 80B75B20 C60A0028 */ lwc1 $f10, 0x0028($s0) ## 00000028 -/* 0C184 80B75B24 C7AC0060 */ lwc1 $f12, 0x0060($sp) -/* 0C188 80B75B28 460A0200 */ add.s $f8, $f0, $f10 +/* 0C184 80B75B24 C7AC0060 */ lwc1 $f12, 0x0060($sp) +/* 0C188 80B75B28 460A0200 */ add.s $f8, $f0, $f10 /* 0C18C 80B75B2C 0C00CFC8 */ jal Math_Rand_CenteredFloat - -/* 0C190 80B75B30 E7A80068 */ swc1 $f8, 0x0068($sp) + +/* 0C190 80B75B30 E7A80068 */ swc1 $f8, 0x0068($sp) /* 0C194 80B75B34 C604002C */ lwc1 $f4, 0x002C($s0) ## 0000002C /* 0C198 80B75B38 3C0180B8 */ lui $at, %hi(D_80B7B750) ## $at = 80B80000 -/* 0C19C 80B75B3C C42CB750 */ lwc1 $f12, %lo(D_80B7B750)($at) -/* 0C1A0 80B75B40 46040180 */ add.s $f6, $f0, $f4 +/* 0C19C 80B75B3C C42CB750 */ lwc1 $f12, %lo(D_80B7B750)($at) +/* 0C1A0 80B75B40 46040180 */ add.s $f6, $f0, $f4 /* 0C1A4 80B75B44 0C00CFBE */ jal Math_Rand_ZeroFloat - -/* 0C1A8 80B75B48 E7A6006C */ swc1 $f6, 0x006C($sp) + +/* 0C1A8 80B75B48 E7A6006C */ swc1 $f6, 0x006C($sp) /* 0C1AC 80B75B4C 3C0180B8 */ lui $at, %hi(D_80B7B754) ## $at = 80B80000 -/* 0C1B0 80B75B50 C42AB754 */ lwc1 $f10, %lo(D_80B7B754)($at) -/* 0C1B4 80B75B54 8FAE0048 */ lw $t6, 0x0048($sp) -/* 0C1B8 80B75B58 8FA4004C */ lw $a0, 0x004C($sp) -/* 0C1BC 80B75B5C 460A0200 */ add.s $f8, $f0, $f10 +/* 0C1B0 80B75B50 C42AB754 */ lwc1 $f10, %lo(D_80B7B754)($at) +/* 0C1B4 80B75B54 8FAE0048 */ lw $t6, 0x0048($sp) +/* 0C1B8 80B75B58 8FA4004C */ lw $a0, 0x004C($sp) +/* 0C1BC 80B75B5C 460A0200 */ add.s $f8, $f0, $f10 /* 0C1C0 80B75B60 8DC51E10 */ lw $a1, 0x1E10($t6) ## 00001E10 -/* 0C1C4 80B75B64 AFA00010 */ sw $zero, 0x0010($sp) +/* 0C1C4 80B75B64 AFA00010 */ sw $zero, 0x0010($sp) /* 0C1C8 80B75B68 27A60064 */ addiu $a2, $sp, 0x0064 ## $a2 = FFFFFF2C -/* 0C1CC 80B75B6C 44074000 */ mfc1 $a3, $f8 -/* 0C1D0 80B75B70 0C2DA802 */ jal func_80B6A008 +/* 0C1CC 80B75B6C 44074000 */ mfc1 $a3, $f8 +/* 0C1D0 80B75B70 0C2DA802 */ jal func_80B6A008 /* 0C1D4 80B75B74 00000000 */ nop -/* 0C1D8 80B75B78 87A20072 */ lh $v0, 0x0072($sp) +/* 0C1D8 80B75B78 87A20072 */ lh $v0, 0x0072($sp) /* 0C1DC 80B75B7C 24420001 */ addiu $v0, $v0, 0x0001 ## $v0 = 00000001 -/* 0C1E0 80B75B80 00021400 */ sll $v0, $v0, 16 -/* 0C1E4 80B75B84 00021403 */ sra $v0, $v0, 16 -/* 0C1E8 80B75B88 28410002 */ slti $at, $v0, 0x0002 -/* 0C1EC 80B75B8C 1420FFDD */ bne $at, $zero, .L80B75B04 -/* 0C1F0 80B75B90 A7A20072 */ sh $v0, 0x0072($sp) +/* 0C1E0 80B75B80 00021400 */ sll $v0, $v0, 16 +/* 0C1E4 80B75B84 00021403 */ sra $v0, $v0, 16 +/* 0C1E8 80B75B88 28410002 */ slti $at, $v0, 0x0002 +/* 0C1EC 80B75B8C 1420FFDD */ bne $at, $zero, .L80B75B04 +/* 0C1F0 80B75B90 A7A20072 */ sh $v0, 0x0072($sp) .L80B75B94: -/* 0C1F4 80B75B94 8FBF0034 */ lw $ra, 0x0034($sp) -/* 0C1F8 80B75B98 D7B40020 */ ldc1 $f20, 0x0020($sp) -/* 0C1FC 80B75B9C 8FB0002C */ lw $s0, 0x002C($sp) -/* 0C200 80B75BA0 8FB10030 */ lw $s1, 0x0030($sp) -/* 0C204 80B75BA4 03E00008 */ jr $ra +/* 0C1F4 80B75B94 8FBF0034 */ lw $ra, 0x0034($sp) +/* 0C1F8 80B75B98 D7B40020 */ ldc1 $f20, 0x0020($sp) +/* 0C1FC 80B75B9C 8FB0002C */ lw $s0, 0x002C($sp) +/* 0C200 80B75BA0 8FB10030 */ lw $s1, 0x0030($sp) +/* 0C204 80B75BA4 03E00008 */ jr $ra /* 0C208 80B75BA8 27BD0138 */ addiu $sp, $sp, 0x0138 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B6B674.s b/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B6B674.s index 83f0c1687c..88d7e3baac 100644 --- a/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B6B674.s +++ b/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B6B674.s @@ -20,7 +20,7 @@ glabel func_80B6B674 /* 01D1C 80B6B6BC 24C6B000 */ addiu $a2, $a2, %lo(D_80B7B000) ## $a2 = 80B7B000 /* 01D20 80B6B6C0 27A40110 */ addiu $a0, $sp, 0x0110 ## $a0 = FFFFFFD8 /* 01D24 80B6B6C4 240708DF */ addiu $a3, $zero, 0x08DF ## $a3 = 000008DF -/* 01D28 80B6B6C8 0C031AB1 */ jal func_800C6AC4 +/* 01D28 80B6B6C8 0C031AB1 */ jal Graph_OpenDisps /* 01D2C 80B6B6CC 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 /* 01D30 80B6B6D0 0C034213 */ jal Matrix_Push /* 01D34 80B6B6D4 00000000 */ nop @@ -255,7 +255,7 @@ glabel func_80B6B674 /* 020A8 80B6BA48 AFA00020 */ sw $zero, 0x0020($sp) /* 020AC 80B6BA4C AFA0001C */ sw $zero, 0x001C($sp) /* 020B0 80B6BA50 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 020B4 80B6BA54 0C0253D0 */ jal Draw_TwoTexScroll +/* 020B4 80B6BA54 0C0253D0 */ jal Gfx_TwoTexScroll /* 020B8 80B6BA58 AFA200D4 */ sw $v0, 0x00D4($sp) /* 020BC 80B6BA5C 8FA800D4 */ lw $t0, 0x00D4($sp) /* 020C0 80B6BA60 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 @@ -385,7 +385,7 @@ glabel func_80B6B674 /* 0229C 80B6BC3C 16800016 */ bne $s4, $zero, .L80B6BC98 /* 022A0 80B6BC40 26523760 */ addiu $s2, $s2, 0x3760 ## $s2 = 06003760 /* 022A4 80B6BC44 8E0402D0 */ lw $a0, 0x02D0($s0) ## 000002D0 -/* 022A8 80B6BC48 0C024DDD */ jal func_80093774 +/* 022A8 80B6BC48 0C024DDD */ jal Gfx_CallSetupDL /* 022AC 80B6BC4C 24050014 */ addiu $a1, $zero, 0x0014 ## $a1 = 00000014 /* 022B0 80B6BC50 AE0202D0 */ sw $v0, 0x02D0($s0) ## 000002D0 /* 022B4 80B6BC54 244D0008 */ addiu $t5, $v0, 0x0008 ## $t5 = 00000008 @@ -697,7 +697,7 @@ glabel func_80B6B674 /* 0274C 80B6C0EC 24C6B090 */ addiu $a2, $a2, %lo(D_80B7B090) ## $a2 = 80B7B090 /* 02750 80B6C0F0 27A40110 */ addiu $a0, $sp, 0x0110 ## $a0 = FFFFFFD8 /* 02754 80B6C0F4 8EC50000 */ lw $a1, 0x0000($s6) ## 00000000 -/* 02758 80B6C0F8 0C031AD5 */ jal func_800C6B54 +/* 02758 80B6C0F8 0C031AD5 */ jal Graph_CloseDisps /* 0275C 80B6C0FC 24070A05 */ addiu $a3, $zero, 0x0A05 ## $a3 = 00000A05 /* 02760 80B6C100 8FBF0064 */ lw $ra, 0x0064($sp) /* 02764 80B6C104 D7B40038 */ ldc1 $f20, 0x0038($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B6C134.s b/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B6C134.s index 96f13e4397..5262ba346b 100644 --- a/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B6C134.s +++ b/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B6C134.s @@ -9,7 +9,7 @@ glabel func_80B6C134 /* 027B0 80B6C150 24C6B0A0 */ addiu $a2, $a2, %lo(D_80B7B0A0) ## $a2 = 80B7B0A0 /* 027B4 80B6C154 27A40058 */ addiu $a0, $sp, 0x0058 ## $a0 = FFFFFFE8 /* 027B8 80B6C158 24070A0C */ addiu $a3, $zero, 0x0A0C ## $a3 = 00000A0C -/* 027BC 80B6C15C 0C031AB1 */ jal func_800C6AC4 +/* 027BC 80B6C15C 0C031AB1 */ jal Graph_OpenDisps /* 027C0 80B6C160 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 /* 027C4 80B6C164 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 /* 027C8 80B6C168 3C0FDB06 */ lui $t7, 0xDB06 ## $t7 = DB060000 @@ -38,7 +38,7 @@ glabel func_80B6C134 /* 02824 80B6C1C4 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 02828 80B6C1C8 AFA20054 */ sw $v0, 0x0054($sp) /* 0282C 80B6C1CC 00603025 */ or $a2, $v1, $zero ## $a2 = 00010000 -/* 02830 80B6C1D0 0C0253D0 */ jal Draw_TwoTexScroll +/* 02830 80B6C1D0 0C0253D0 */ jal Gfx_TwoTexScroll /* 02834 80B6C1D4 000338C0 */ sll $a3, $v1, 3 /* 02838 80B6C1D8 8FA80054 */ lw $t0, 0x0054($sp) /* 0283C 80B6C1DC 3C18C3E1 */ lui $t8, 0xC3E1 ## $t8 = C3E10000 @@ -102,7 +102,7 @@ glabel func_80B6C134 /* 02924 80B6C2C4 8E250000 */ lw $a1, 0x0000($s1) ## 00000000 /* 02928 80B6C2C8 24C6B0C0 */ addiu $a2, $a2, %lo(D_80B7B0C0) ## $a2 = 80B7B0C0 /* 0292C 80B6C2CC 27A40058 */ addiu $a0, $sp, 0x0058 ## $a0 = FFFFFFE8 -/* 02930 80B6C2D0 0C031AD5 */ jal func_800C6B54 +/* 02930 80B6C2D0 0C031AD5 */ jal Graph_CloseDisps /* 02934 80B6C2D4 24070A35 */ addiu $a3, $zero, 0x0A35 ## $a3 = 00000A35 /* 02938 80B6C2D8 8FBF003C */ lw $ra, 0x003C($sp) /* 0293C 80B6C2DC 8FB00034 */ lw $s0, 0x0034($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B6CAF8.s b/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B6CAF8.s index 818e7205c7..5324abef83 100644 --- a/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B6CAF8.s +++ b/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B6CAF8.s @@ -22,7 +22,7 @@ glabel func_80B6CAF8 /* 031A8 80B6CB48 27A4007C */ addiu $a0, $sp, 0x007C ## $a0 = FFFFFFB4 /* 031AC 80B6CB4C AFAA0090 */ sw $t2, 0x0090($sp) /* 031B0 80B6CB50 8D250000 */ lw $a1, 0x0000($t1) ## 00000000 -/* 031B4 80B6CB54 0C031AB1 */ jal func_800C6AC4 +/* 031B4 80B6CB54 0C031AB1 */ jal Graph_OpenDisps /* 031B8 80B6CB58 AFA5008C */ sw $a1, 0x008C($sp) /* 031BC 80B6CB5C 0C034213 */ jal Matrix_Push /* 031C0 80B6CB60 00000000 */ nop @@ -348,7 +348,7 @@ glabel func_80B6CAF8 /* 03690 80B6D030 24C6B110 */ addiu $a2, $a2, %lo(D_80B7B110) ## $a2 = 80B7B110 /* 03694 80B6D034 27A4007C */ addiu $a0, $sp, 0x007C ## $a0 = FFFFFFB4 /* 03698 80B6D038 24070C1A */ addiu $a3, $zero, 0x0C1A ## $a3 = 00000C1A -/* 0369C 80B6D03C 0C031AD5 */ jal func_800C6B54 +/* 0369C 80B6D03C 0C031AD5 */ jal Graph_CloseDisps /* 036A0 80B6D040 8D650000 */ lw $a1, 0x0000($t3) ## 00000000 /* 036A4 80B6D044 8FBF0014 */ lw $ra, 0x0014($sp) /* 036A8 80B6D048 27BD00C8 */ addiu $sp, $sp, 0x00C8 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B6D354.s b/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B6D354.s index a2518275a9..86d0331d01 100644 --- a/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B6D354.s +++ b/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B6D354.s @@ -17,7 +17,7 @@ glabel func_80B6D354 /* 039F0 80B6D390 24C6B120 */ addiu $a2, $a2, %lo(D_80B7B120) ## $a2 = 80B7B120 /* 039F4 80B6D394 27A4006C */ addiu $a0, $sp, 0x006C ## $a0 = FFFFFFE4 /* 039F8 80B6D398 24070C89 */ addiu $a3, $zero, 0x0C89 ## $a3 = 00000C89 -/* 039FC 80B6D39C 0C031AB1 */ jal func_800C6AC4 +/* 039FC 80B6D39C 0C031AB1 */ jal Graph_OpenDisps /* 03A00 80B6D3A0 00A09025 */ or $s2, $a1, $zero ## $s2 = 00000000 /* 03A04 80B6D3A4 0C2DB415 */ jal func_80B6D054 /* 03A08 80B6D3A8 02A02025 */ or $a0, $s5, $zero ## $a0 = 00000000 @@ -195,7 +195,7 @@ glabel func_80B6D354 /* 03CA0 80B6D640 24C6B150 */ addiu $a2, $a2, %lo(D_80B7B150) ## $a2 = 80B7B150 /* 03CA4 80B6D644 27A4006C */ addiu $a0, $sp, 0x006C ## $a0 = FFFFFFE4 /* 03CA8 80B6D648 8EA50000 */ lw $a1, 0x0000($s5) ## 00000000 -/* 03CAC 80B6D64C 0C031AD5 */ jal func_800C6B54 +/* 03CAC 80B6D64C 0C031AD5 */ jal Graph_CloseDisps /* 03CB0 80B6D650 24070CC7 */ addiu $a3, $zero, 0x0CC7 ## $a3 = 00000CC7 /* 03CB4 80B6D654 8FBF0044 */ lw $ra, 0x0044($sp) /* 03CB8 80B6D658 D7B40018 */ ldc1 $f20, 0x0018($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B6D688.s b/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B6D688.s index 304bb2d02a..4084fe3af0 100644 --- a/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B6D688.s +++ b/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B6D688.s @@ -19,7 +19,7 @@ glabel func_80B6D688 /* 03D2C 80B6D6CC AFB000E8 */ sw $s0, 0x00E8($sp) /* 03D30 80B6D6D0 27A40098 */ addiu $a0, $sp, 0x0098 ## $a0 = FFFFFFB0 /* 03D34 80B6D6D4 24070CD7 */ addiu $a3, $zero, 0x0CD7 ## $a3 = 00000CD7 -/* 03D38 80B6D6D8 0C031AB1 */ jal func_800C6AC4 +/* 03D38 80B6D6D8 0C031AB1 */ jal Graph_OpenDisps /* 03D3C 80B6D6DC 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 /* 03D40 80B6D6E0 8FB900E8 */ lw $t9, 0x00E8($sp) /* 03D44 80B6D6E4 0C024F46 */ jal func_80093D18 @@ -269,7 +269,7 @@ glabel func_80B6D688 /* 040F8 80B6DA98 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 .L80B6DA9C: /* 040FC 80B6DA9C 8E2402D0 */ lw $a0, 0x02D0($s1) ## 000002D0 -/* 04100 80B6DAA0 0C024DDD */ jal func_80093774 +/* 04100 80B6DAA0 0C024DDD */ jal Gfx_CallSetupDL /* 04104 80B6DAA4 24050014 */ addiu $a1, $zero, 0x0014 ## $a1 = 00000014 /* 04108 80B6DAA8 AE2202D0 */ sw $v0, 0x02D0($s1) ## 000002D0 /* 0410C 80B6DAAC 244F0008 */ addiu $t7, $v0, 0x0008 ## $t7 = 00000008 @@ -317,7 +317,7 @@ glabel func_80B6D688 /* 041B0 80B6DB50 E7AC006C */ swc1 $f12, 0x006C($sp) /* 041B4 80B6DB54 46062381 */ sub.s $f14, $f4, $f6 /* 041B8 80B6DB58 E7AA0068 */ swc1 $f10, 0x0068($sp) -/* 041BC 80B6DB5C 0C03F494 */ jal func_800FD250 +/* 041BC 80B6DB5C 0C03F494 */ jal Math_atan2f /* 041C0 80B6DB60 E7AE0064 */ swc1 $f14, 0x0064($sp) /* 041C4 80B6DB64 C7B2006C */ lwc1 $f18, 0x006C($sp) /* 041C8 80B6DB68 C7A80064 */ lwc1 $f8, 0x0064($sp) @@ -328,7 +328,7 @@ glabel func_80B6D688 /* 041DC 80B6DB7C E7A20030 */ swc1 $f2, 0x0030($sp) /* 041E0 80B6DB80 46101000 */ add.s $f0, $f2, $f16 /* 041E4 80B6DB84 E7B0002C */ swc1 $f16, 0x002C($sp) -/* 041E8 80B6DB88 0C03F494 */ jal func_800FD250 +/* 041E8 80B6DB88 0C03F494 */ jal Math_atan2f /* 041EC 80B6DB8C 46000384 */ sqrt.s $f14, $f0 /* 041F0 80B6DB90 C7B20068 */ lwc1 $f18, 0x0068($sp) /* 041F4 80B6DB94 C7A20030 */ lwc1 $f2, 0x0030($sp) @@ -424,7 +424,7 @@ glabel func_80B6D688 /* 04354 80B6DCF4 E7AC004C */ swc1 $f12, 0x004C($sp) /* 04358 80B6DCF8 AFA2002C */ sw $v0, 0x002C($sp) /* 0435C 80B6DCFC 46083381 */ sub.s $f14, $f6, $f8 -/* 04360 80B6DD00 0C03F494 */ jal func_800FD250 +/* 04360 80B6DD00 0C03F494 */ jal Math_atan2f /* 04364 80B6DD04 E7AE0044 */ swc1 $f14, 0x0044($sp) /* 04368 80B6DD08 C7B2004C */ lwc1 $f18, 0x004C($sp) /* 0436C 80B6DD0C C7AA0044 */ lwc1 $f10, 0x0044($sp) @@ -435,7 +435,7 @@ glabel func_80B6D688 /* 04380 80B6DD20 E7A20028 */ swc1 $f2, 0x0028($sp) /* 04384 80B6DD24 46101000 */ add.s $f0, $f2, $f16 /* 04388 80B6DD28 E7B00024 */ swc1 $f16, 0x0024($sp) -/* 0438C 80B6DD2C 0C03F494 */ jal func_800FD250 +/* 0438C 80B6DD2C 0C03F494 */ jal Math_atan2f /* 04390 80B6DD30 46000384 */ sqrt.s $f14, $f0 /* 04394 80B6DD34 C7B20048 */ lwc1 $f18, 0x0048($sp) /* 04398 80B6DD38 C7A20028 */ lwc1 $f2, 0x0028($sp) @@ -560,7 +560,7 @@ glabel func_80B6D688 /* 04568 80B6DF08 24C6B1B0 */ addiu $a2, $a2, %lo(D_80B7B1B0) ## $a2 = 80B7B1B0 /* 0456C 80B6DF0C 27A40098 */ addiu $a0, $sp, 0x0098 ## $a0 = FFFFFFB0 /* 04570 80B6DF10 24070DAC */ addiu $a3, $zero, 0x0DAC ## $a3 = 00000DAC -/* 04574 80B6DF14 0C031AD5 */ jal func_800C6B54 +/* 04574 80B6DF14 0C031AD5 */ jal Graph_CloseDisps /* 04578 80B6DF18 8D450000 */ lw $a1, 0x0000($t2) ## 00000000 /* 0457C 80B6DF1C 8FBF001C */ lw $ra, 0x001C($sp) /* 04580 80B6DF20 8FB00014 */ lw $s0, 0x0014($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B6DF30.s b/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B6DF30.s index 78c1786883..d8c843efd7 100644 --- a/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B6DF30.s +++ b/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B6DF30.s @@ -12,7 +12,7 @@ glabel func_80B6DF30 /* 045B8 80B6DF58 27A400A0 */ addiu $a0, $sp, 0x00A0 ## $a0 = FFFFFFD0 /* 045BC 80B6DF5C 24C6B1C0 */ addiu $a2, $a2, %lo(D_80B7B1C0) ## $a2 = 80B7B1C0 /* 045C0 80B6DF60 24070E10 */ addiu $a3, $zero, 0x0E10 ## $a3 = 00000E10 -/* 045C4 80B6DF64 0C031AB1 */ jal func_800C6AC4 +/* 045C4 80B6DF64 0C031AB1 */ jal Graph_OpenDisps /* 045C8 80B6DF68 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 /* 045CC 80B6DF6C 3C0380B8 */ lui $v1, %hi(D_80B7FDA8) ## $v1 = 80B80000 /* 045D0 80B6DF70 2463FDA8 */ addiu $v1, $v1, %lo(D_80B7FDA8) ## $v1 = 80B7FDA8 @@ -723,7 +723,7 @@ glabel func_80B6DF30 /* 05018 80B6E9B8 24C6B1E0 */ addiu $a2, $a2, %lo(D_80B7B1E0) ## $a2 = 80B7B1E0 /* 0501C 80B6E9BC 27A400A0 */ addiu $a0, $sp, 0x00A0 ## $a0 = FFFFFFD0 /* 05020 80B6E9C0 24070EFE */ addiu $a3, $zero, 0x0EFE ## $a3 = 00000EFE -/* 05024 80B6E9C4 0C031AD5 */ jal func_800C6B54 +/* 05024 80B6E9C4 0C031AD5 */ jal Graph_CloseDisps /* 05028 80B6E9C8 8D050000 */ lw $a1, 0x0000($t0) ## 00000000 /* 0502C 80B6E9CC 8FBF0024 */ lw $ra, 0x0024($sp) /* 05030 80B6E9D0 8FB0001C */ lw $s0, 0x001C($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B76474.s b/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B76474.s index c505db9050..070f42a831 100644 --- a/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B76474.s +++ b/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B76474.s @@ -19,7 +19,7 @@ glabel func_80B76474 /* 0CB18 80B764B8 24C6B200 */ addiu $a2, $a2, %lo(D_80B7B200) ## $a2 = 80B7B200 /* 0CB1C 80B764BC 27A4007C */ addiu $a0, $sp, 0x007C ## $a0 = FFFFFFDC /* 0CB20 80B764C0 24071E18 */ addiu $a3, $zero, 0x1E18 ## $a3 = 00001E18 -/* 0CB24 80B764C4 0C031AB1 */ jal func_800C6AC4 +/* 0CB24 80B764C4 0C031AB1 */ jal Graph_OpenDisps /* 0CB28 80B764C8 00A09025 */ or $s2, $a1, $zero ## $s2 = 00000000 /* 0CB2C 80B764CC 0C034213 */ jal Matrix_Push /* 0CB30 80B764D0 00000000 */ nop @@ -291,7 +291,7 @@ glabel func_80B76474 /* 0CF18 80B768B8 24C6B250 */ addiu $a2, $a2, %lo(D_80B7B250) ## $a2 = 80B7B250 /* 0CF1C 80B768BC 27A4007C */ addiu $a0, $sp, 0x007C ## $a0 = FFFFFFDC /* 0CF20 80B768C0 8FC50000 */ lw $a1, 0x0000($s8) ## 00000000 -/* 0CF24 80B768C4 0C031AD5 */ jal func_800C6B54 +/* 0CF24 80B768C4 0C031AD5 */ jal Graph_CloseDisps /* 0CF28 80B768C8 24071E7D */ addiu $a3, $zero, 0x1E7D ## $a3 = 00001E7D /* 0CF2C 80B768CC 8FBF003C */ lw $ra, 0x003C($sp) /* 0CF30 80B768D0 8FB00018 */ lw $s0, 0x0018($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B771CC.s b/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B771CC.s index 38558d5792..43b3e4d246 100644 --- a/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B771CC.s +++ b/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B771CC.s @@ -34,7 +34,7 @@ glabel func_80B771CC /* 0D8A4 80B77244 8DE50000 */ lw $a1, 0x0000($t7) ## 00000000 /* 0D8A8 80B77248 27A40070 */ addiu $a0, $sp, 0x0070 ## $a0 = FFFFFFD8 /* 0D8AC 80B7724C 24071F70 */ addiu $a3, $zero, 0x1F70 ## $a3 = 00001F70 -/* 0D8B0 80B77250 0C031AB1 */ jal func_800C6AC4 +/* 0D8B0 80B77250 0C031AB1 */ jal Graph_OpenDisps /* 0D8B4 80B77254 00A09025 */ or $s2, $a1, $zero ## $s2 = 00000000 /* 0D8B8 80B77258 3C014700 */ lui $at, 0x4700 ## $at = 47000000 /* 0D8BC 80B7725C 4481C000 */ mtc1 $at, $f24 ## $f24 = 32768.00 @@ -129,7 +129,7 @@ glabel func_80B771CC /* 0DA14 80B773B4 24C6B280 */ addiu $a2, $a2, %lo(D_80B7B280) ## $a2 = 80B7B280 /* 0DA18 80B773B8 27A40070 */ addiu $a0, $sp, 0x0070 ## $a0 = FFFFFFD8 /* 0DA1C 80B773BC 24071FA3 */ addiu $a3, $zero, 0x1FA3 ## $a3 = 00001FA3 -/* 0DA20 80B773C0 0C031AD5 */ jal func_800C6B54 +/* 0DA20 80B773C0 0C031AD5 */ jal Graph_CloseDisps /* 0DA24 80B773C4 8F050000 */ lw $a1, 0x0000($t8) ## 00000000 /* 0DA28 80B773C8 8FBF0054 */ lw $ra, 0x0054($sp) /* 0DA2C 80B773CC D7B40018 */ ldc1 $f20, 0x0018($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B7A140.s b/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B7A140.s index a3c387ccb8..d6a0db1d77 100644 --- a/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B7A140.s +++ b/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B7A140.s @@ -11,7 +11,7 @@ glabel func_80B7A140 /* 107C4 80B7A164 24C6B2E4 */ addiu $a2, $a2, %lo(D_80B7B2E4) ## $a2 = 80B7B2E4 /* 107C8 80B7A168 27A40024 */ addiu $a0, $sp, 0x0024 ## $a0 = FFFFFFEC /* 107CC 80B7A16C 240723AE */ addiu $a3, $zero, 0x23AE ## $a3 = 000023AE -/* 107D0 80B7A170 0C031AB1 */ jal func_800C6AC4 +/* 107D0 80B7A170 0C031AB1 */ jal Graph_OpenDisps /* 107D4 80B7A174 AFA50034 */ sw $a1, 0x0034($sp) /* 107D8 80B7A178 3C0480B8 */ lui $a0, %hi(D_80B7A89C) ## $a0 = 80B80000 /* 107DC 80B7A17C 3C0580B8 */ lui $a1, %hi(D_80B7E090) ## $a1 = 80B80000 @@ -73,7 +73,7 @@ glabel func_80B7A140 /* 108B4 80B7A254 27A40024 */ addiu $a0, $sp, 0x0024 ## $a0 = FFFFFFEC /* 108B8 80B7A258 24C6B2F4 */ addiu $a2, $a2, %lo(D_80B7B2F4) ## $a2 = 80B7B2F4 /* 108BC 80B7A25C 240723B6 */ addiu $a3, $zero, 0x23B6 ## $a3 = 000023B6 -/* 108C0 80B7A260 0C031AD5 */ jal func_800C6B54 +/* 108C0 80B7A260 0C031AD5 */ jal Graph_CloseDisps /* 108C4 80B7A264 8DE50000 */ lw $a1, 0x0000($t7) ## 00000008 .L80B7A268: /* 108C8 80B7A268 8FBF0014 */ lw $ra, 0x0014($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B7A278.s b/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B7A278.s index 63de1884d4..bb406545f9 100644 --- a/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B7A278.s +++ b/asm/non_matchings/overlays/actors/ovl_Fishing/func_80B7A278.s @@ -1,38 +1,38 @@ glabel func_80B7A278 /* 108D8 80B7A278 27BDFF98 */ addiu $sp, $sp, 0xFF98 ## $sp = FFFFFF98 -/* 108DC 80B7A27C AFB00028 */ sw $s0, 0x0028($sp) +/* 108DC 80B7A27C AFB00028 */ sw $s0, 0x0028($sp) /* 108E0 80B7A280 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 -/* 108E4 80B7A284 AFBF002C */ sw $ra, 0x002C($sp) -/* 108E8 80B7A288 AFA40068 */ sw $a0, 0x0068($sp) +/* 108E4 80B7A284 AFBF002C */ sw $ra, 0x002C($sp) +/* 108E8 80B7A288 AFA40068 */ sw $a0, 0x0068($sp) /* 108EC 80B7A28C 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 /* 108F0 80B7A290 3C0680B8 */ lui $a2, %hi(D_80B7B304) ## $a2 = 80B80000 /* 108F4 80B7A294 24C6B304 */ addiu $a2, $a2, %lo(D_80B7B304) ## $a2 = 80B7B304 /* 108F8 80B7A298 27A40048 */ addiu $a0, $sp, 0x0048 ## $a0 = FFFFFFE0 /* 108FC 80B7A29C 240723C4 */ addiu $a3, $zero, 0x23C4 ## $a3 = 000023C4 -/* 10900 80B7A2A0 0C031AB1 */ jal func_800C6AC4 -/* 10904 80B7A2A4 AFA50058 */ sw $a1, 0x0058($sp) -/* 10908 80B7A2A8 0C024F46 */ jal func_80093D18 +/* 10900 80B7A2A0 0C031AB1 */ jal Graph_OpenDisps +/* 10904 80B7A2A4 AFA50058 */ sw $a1, 0x0058($sp) +/* 10908 80B7A2A8 0C024F46 */ jal func_80093D18 /* 1090C 80B7A2AC 8E040000 */ lw $a0, 0x0000($s0) ## 00000000 -/* 10910 80B7A2B0 0C024F61 */ jal func_80093D84 +/* 10910 80B7A2B0 0C024F61 */ jal func_80093D84 /* 10914 80B7A2B4 8E040000 */ lw $a0, 0x0000($s0) ## 00000000 -/* 10918 80B7A2B8 8FA80068 */ lw $t0, 0x0068($sp) +/* 10918 80B7A2B8 8FA80068 */ lw $t0, 0x0068($sp) /* 1091C 80B7A2BC 3C0180B8 */ lui $at, %hi(D_80B7B8E4) ## $at = 80B80000 -/* 10920 80B7A2C0 C424B8E4 */ lwc1 $f4, %lo(D_80B7B8E4)($at) +/* 10920 80B7A2C0 C424B8E4 */ lwc1 $f4, %lo(D_80B7B8E4)($at) /* 10924 80B7A2C4 C50200EC */ lwc1 $f2, 0x00EC($t0) ## 000000EC -/* 10928 80B7A2C8 4604103C */ c.lt.s $f2, $f4 +/* 10928 80B7A2C8 4604103C */ c.lt.s $f2, $f4 /* 1092C 80B7A2CC 00000000 */ nop -/* 10930 80B7A2D0 4500002E */ bc1f .L80B7A38C +/* 10930 80B7A2D0 4500002E */ bc1f .L80B7A38C /* 10934 80B7A2D4 3C0142C8 */ lui $at, 0x42C8 ## $at = 42C80000 /* 10938 80B7A2D8 44813000 */ mtc1 $at, $f6 ## $f6 = 100.00 /* 1093C 80B7A2DC C50000E4 */ lwc1 $f0, 0x00E4($t0) ## 000000E4 /* 10940 80B7A2E0 3C0FDB06 */ lui $t7, 0xDB06 ## $t7 = DB060000 -/* 10944 80B7A2E4 46023200 */ add.s $f8, $f6, $f2 +/* 10944 80B7A2E4 46023200 */ add.s $f8, $f6, $f2 /* 10948 80B7A2E8 35EF0020 */ ori $t7, $t7, 0x0020 ## $t7 = DB060020 -/* 1094C 80B7A2EC 8FA90058 */ lw $t1, 0x0058($sp) -/* 10950 80B7A2F0 46000005 */ abs.s $f0, $f0 -/* 10954 80B7A2F4 4608003C */ c.lt.s $f0, $f8 +/* 1094C 80B7A2EC 8FA90058 */ lw $t1, 0x0058($sp) +/* 10950 80B7A2F0 46000005 */ abs.s $f0, $f0 +/* 10954 80B7A2F4 4608003C */ c.lt.s $f0, $f8 /* 10958 80B7A2F8 00000000 */ nop -/* 1095C 80B7A2FC 45000023 */ bc1f .L80B7A38C +/* 1095C 80B7A2FC 45000023 */ bc1f .L80B7A38C /* 10960 80B7A300 00000000 */ nop /* 10964 80B7A304 8D2202C0 */ lw $v0, 0x02C0($t1) ## 000002C0 /* 10968 80B7A308 3C0480B8 */ lui $a0, %hi(D_80B7AFF4) ## $a0 = 80B80000 @@ -43,94 +43,94 @@ glabel func_80B7A278 /* 1097C 80B7A31C 85180160 */ lh $t8, 0x0160($t0) ## 00000160 /* 10980 80B7A320 3C0E8016 */ lui $t6, 0x8016 ## $t6 = 80160000 /* 10984 80B7A324 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF -/* 10988 80B7A328 0018C880 */ sll $t9, $t8, 2 -/* 1098C 80B7A32C 00992021 */ addu $a0, $a0, $t9 -/* 10990 80B7A330 8C84AFF4 */ lw $a0, %lo(D_80B7AFF4)($a0) +/* 10988 80B7A328 0018C880 */ sll $t9, $t8, 2 +/* 1098C 80B7A32C 00992021 */ addu $a0, $a0, $t9 +/* 10990 80B7A330 8C84AFF4 */ lw $a0, %lo(D_80B7AFF4)($a0) /* 10994 80B7A334 3C1980B8 */ lui $t9, %hi(func_80B7A10C) ## $t9 = 80B80000 /* 10998 80B7A338 2739A10C */ addiu $t9, $t9, %lo(func_80B7A10C) ## $t9 = 80B7A10C -/* 1099C 80B7A33C 00045900 */ sll $t3, $a0, 4 -/* 109A0 80B7A340 000B6702 */ srl $t4, $t3, 28 -/* 109A4 80B7A344 000C6880 */ sll $t5, $t4, 2 -/* 109A8 80B7A348 01CD7021 */ addu $t6, $t6, $t5 +/* 1099C 80B7A33C 00045900 */ sll $t3, $a0, 4 +/* 109A0 80B7A340 000B6702 */ srl $t4, $t3, 28 +/* 109A4 80B7A344 000C6880 */ sll $t5, $t4, 2 +/* 109A8 80B7A348 01CD7021 */ addu $t6, $t6, $t5 /* 109AC 80B7A34C 8DCE6FA8 */ lw $t6, 0x6FA8($t6) ## 80166FA8 -/* 109B0 80B7A350 00815024 */ and $t2, $a0, $at +/* 109B0 80B7A350 00815024 */ and $t2, $a0, $at /* 109B4 80B7A354 3C018000 */ lui $at, 0x8000 ## $at = 80000000 -/* 109B8 80B7A358 014E7821 */ addu $t7, $t2, $t6 -/* 109BC 80B7A35C 01E1C021 */ addu $t8, $t7, $at +/* 109B8 80B7A358 014E7821 */ addu $t7, $t2, $t6 +/* 109BC 80B7A35C 01E1C021 */ addu $t8, $t7, $at /* 109C0 80B7A360 AC580004 */ sw $t8, 0x0004($v0) ## 00000004 /* 109C4 80B7A364 910701DA */ lbu $a3, 0x01DA($t0) ## 000001DA /* 109C8 80B7A368 8D0601F8 */ lw $a2, 0x01F8($t0) ## 000001F8 /* 109CC 80B7A36C 8D0501DC */ lw $a1, 0x01DC($t0) ## 000001DC /* 109D0 80B7A370 3C0B80B8 */ lui $t3, %hi(func_80B7A140) ## $t3 = 80B80000 /* 109D4 80B7A374 256BA140 */ addiu $t3, $t3, %lo(func_80B7A140) ## $t3 = 80B7A140 -/* 109D8 80B7A378 AFAB0014 */ sw $t3, 0x0014($sp) -/* 109DC 80B7A37C AFA80018 */ sw $t0, 0x0018($sp) -/* 109E0 80B7A380 AFB90010 */ sw $t9, 0x0010($sp) -/* 109E4 80B7A384 0C0286B2 */ jal func_800A1AC8 +/* 109D8 80B7A378 AFAB0014 */ sw $t3, 0x0014($sp) +/* 109DC 80B7A37C AFA80018 */ sw $t0, 0x0018($sp) +/* 109E0 80B7A380 AFB90010 */ sw $t9, 0x0010($sp) +/* 109E4 80B7A384 0C0286B2 */ jal SkelAnime_DrawSV /* 109E8 80B7A388 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 .L80B7A38C: -/* 109EC 80B7A38C 0C2DD91D */ jal func_80B76474 +/* 109EC 80B7A38C 0C2DD91D */ jal func_80B76474 /* 109F0 80B7A390 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 109F4 80B7A394 3C040001 */ lui $a0, 0x0001 ## $a0 = 00010000 -/* 109F8 80B7A398 00902021 */ addu $a0, $a0, $s0 +/* 109F8 80B7A398 00902021 */ addu $a0, $a0, $s0 /* 109FC 80B7A39C 8C841E10 */ lw $a0, 0x1E10($a0) ## 00011E10 -/* 10A00 80B7A3A0 0C2DAD9D */ jal func_80B6B674 +/* 10A00 80B7A3A0 0C2DAD9D */ jal func_80B6B674 /* 10A04 80B7A3A4 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 10A08 80B7A3A8 0C2DDC73 */ jal func_80B771CC +/* 10A08 80B7A3A8 0C2DDC73 */ jal func_80B771CC /* 10A0C 80B7A3AC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 10A10 80B7A3B0 0C2DB04D */ jal func_80B6C134 +/* 10A10 80B7A3B0 0C2DB04D */ jal func_80B6C134 /* 10A14 80B7A3B4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 10A18 80B7A3B8 3C0380B8 */ lui $v1, %hi(D_80B7E0A6) ## $v1 = 80B80000 /* 10A1C 80B7A3BC 2463E0A6 */ addiu $v1, $v1, %lo(D_80B7E0A6) ## $v1 = 80B7E0A6 /* 10A20 80B7A3C0 84620000 */ lh $v0, 0x0000($v1) ## 80B7E0A6 -/* 10A24 80B7A3C4 1040001B */ beq $v0, $zero, .L80B7A434 +/* 10A24 80B7A3C4 1040001B */ beq $v0, $zero, .L80B7A434 /* 10A28 80B7A3C8 244CFFFF */ addiu $t4, $v0, 0xFFFF ## $t4 = FFFFFFFF /* 10A2C 80B7A3CC A46C0000 */ sh $t4, 0x0000($v1) ## 80B7E0A6 /* 10A30 80B7A3D0 846D0000 */ lh $t5, 0x0000($v1) ## 80B7E0A6 /* 10A34 80B7A3D4 3C0A80B8 */ lui $t2, %hi(D_80B7E075) ## $t2 = 80B80000 -/* 10A38 80B7A3D8 15A00016 */ bne $t5, $zero, .L80B7A434 +/* 10A38 80B7A3D8 15A00016 */ bne $t5, $zero, .L80B7A434 /* 10A3C 80B7A3DC 00000000 */ nop -/* 10A40 80B7A3E0 914AE075 */ lbu $t2, %lo(D_80B7E075)($t2) +/* 10A40 80B7A3E0 914AE075 */ lbu $t2, %lo(D_80B7E075)($t2) /* 10A44 80B7A3E4 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 10A48 80B7A3E8 11410005 */ beq $t2, $at, .L80B7A400 +/* 10A48 80B7A3E8 11410005 */ beq $t2, $at, .L80B7A400 /* 10A4C 80B7A3EC 00000000 */ nop /* 10A50 80B7A3F0 0C03E803 */ jal Audio_SetBGM - + /* 10A54 80B7A3F4 24040019 */ addiu $a0, $zero, 0x0019 ## $a0 = 00000019 -/* 10A58 80B7A3F8 10000003 */ beq $zero, $zero, .L80B7A408 +/* 10A58 80B7A3F8 10000003 */ beq $zero, $zero, .L80B7A408 /* 10A5C 80B7A3FC 00000000 */ nop .L80B7A400: /* 10A60 80B7A400 0C03E803 */ jal Audio_SetBGM - + /* 10A64 80B7A404 24040027 */ addiu $a0, $zero, 0x0027 ## $a0 = 00000027 .L80B7A408: /* 10A68 80B7A408 3C0E80B8 */ lui $t6, %hi(D_80B7E075) ## $t6 = 80B80000 -/* 10A6C 80B7A40C 91CEE075 */ lbu $t6, %lo(D_80B7E075)($t6) +/* 10A6C 80B7A40C 91CEE075 */ lbu $t6, %lo(D_80B7E075)($t6) /* 10A70 80B7A410 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 10A74 80B7A414 11C10005 */ beq $t6, $at, .L80B7A42C +/* 10A74 80B7A414 11C10005 */ beq $t6, $at, .L80B7A42C /* 10A78 80B7A418 00000000 */ nop /* 10A7C 80B7A41C 0C03E803 */ jal Audio_SetBGM - + /* 10A80 80B7A420 24040019 */ addiu $a0, $zero, 0x0019 ## $a0 = 00000019 -/* 10A84 80B7A424 10000003 */ beq $zero, $zero, .L80B7A434 +/* 10A84 80B7A424 10000003 */ beq $zero, $zero, .L80B7A434 /* 10A88 80B7A428 00000000 */ nop .L80B7A42C: /* 10A8C 80B7A42C 0C03E803 */ jal Audio_SetBGM - + /* 10A90 80B7A430 24040027 */ addiu $a0, $zero, 0x0027 ## $a0 = 00000027 .L80B7A434: /* 10A94 80B7A434 3C0F80B8 */ lui $t7, %hi(D_80B7E0AC) ## $t7 = 80B80000 -/* 10A98 80B7A438 85EFE0AC */ lh $t7, %lo(D_80B7E0AC)($t7) +/* 10A98 80B7A438 85EFE0AC */ lh $t7, %lo(D_80B7E0AC)($t7) /* 10A9C 80B7A43C 3C1880B8 */ lui $t8, %hi(D_80B7A674) ## $t8 = 80B80000 -/* 10AA0 80B7A440 51E00022 */ beql $t7, $zero, .L80B7A4CC +/* 10AA0 80B7A440 51E00022 */ beql $t7, $zero, .L80B7A4CC /* 10AA4 80B7A444 240D0001 */ addiu $t5, $zero, 0x0001 ## $t5 = 00000001 -/* 10AA8 80B7A448 9318A674 */ lbu $t8, %lo(D_80B7A674)($t8) -/* 10AAC 80B7A44C 5300001F */ beql $t8, $zero, .L80B7A4CC +/* 10AA8 80B7A448 9318A674 */ lbu $t8, %lo(D_80B7A674)($t8) +/* 10AAC 80B7A44C 5300001F */ beql $t8, $zero, .L80B7A4CC /* 10AB0 80B7A450 240D0001 */ addiu $t5, $zero, 0x0001 ## $t5 = 00000001 -/* 10AB4 80B7A454 0C2DB7CC */ jal func_80B6DF30 +/* 10AB4 80B7A454 0C2DB7CC */ jal func_80B6DF30 /* 10AB8 80B7A458 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 10ABC 80B7A45C 3C0480B8 */ lui $a0, %hi(D_80B7E168) ## $a0 = 80B80000 -/* 10AC0 80B7A460 0C2DB258 */ jal func_80B6C960 +/* 10AC0 80B7A460 0C2DB258 */ jal func_80B6C960 /* 10AC4 80B7A464 2484E168 */ addiu $a0, $a0, %lo(D_80B7E168) ## $a0 = 80B7E168 /* 10AC8 80B7A468 3C1980B8 */ lui $t9, %hi(D_80B7F428) ## $t9 = 80B80000 /* 10ACC 80B7A46C 2739F428 */ addiu $t9, $t9, %lo(D_80B7F428) ## $t9 = 80B7F428 @@ -140,43 +140,43 @@ glabel func_80B7A278 /* 10ADC 80B7A47C 24E7EAC8 */ addiu $a3, $a3, %lo(D_80B7EAC8) ## $a3 = 80B7EAC8 /* 10AE0 80B7A480 24C6E168 */ addiu $a2, $a2, %lo(D_80B7E168) ## $a2 = 80B7E168 /* 10AE4 80B7A484 24A5E158 */ addiu $a1, $a1, %lo(D_80B7E158) ## $a1 = 80B7E158 -/* 10AE8 80B7A488 AFB90010 */ sw $t9, 0x0010($sp) -/* 10AEC 80B7A48C 0C2DB0F8 */ jal func_80B6C3E0 +/* 10AE8 80B7A488 AFB90010 */ sw $t9, 0x0010($sp) +/* 10AEC 80B7A48C 0C2DB0F8 */ jal func_80B6C3E0 /* 10AF0 80B7A490 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 10AF4 80B7A494 3C0580B8 */ lui $a1, %hi(D_80B7E168) ## $a1 = 80B80000 /* 10AF8 80B7A498 3C0680B8 */ lui $a2, %hi(D_80B7EAC8) ## $a2 = 80B80000 /* 10AFC 80B7A49C 24C6EAC8 */ addiu $a2, $a2, %lo(D_80B7EAC8) ## $a2 = 80B7EAC8 /* 10B00 80B7A4A0 24A5E168 */ addiu $a1, $a1, %lo(D_80B7E168) ## $a1 = 80B7E168 -/* 10B04 80B7A4A4 0C2DB5A2 */ jal func_80B6D688 +/* 10B04 80B7A4A4 0C2DB5A2 */ jal func_80B6D688 /* 10B08 80B7A4A8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 10B0C 80B7A4AC 26020014 */ addiu $v0, $s0, 0x0014 ## $v0 = 00000014 /* 10B10 80B7A4B0 804B0014 */ lb $t3, 0x0014($v0) ## 00000028 /* 10B14 80B7A4B4 3C0180B8 */ lui $at, %hi(D_80B7A6C4) ## $at = 80B80000 -/* 10B18 80B7A4B8 A42BA6C4 */ sh $t3, %lo(D_80B7A6C4)($at) +/* 10B18 80B7A4B8 A42BA6C4 */ sh $t3, %lo(D_80B7A6C4)($at) /* 10B1C 80B7A4BC 804C0015 */ lb $t4, 0x0015($v0) ## 00000029 /* 10B20 80B7A4C0 3C0180B8 */ lui $at, %hi(D_80B7A6C8) ## $at = 80B80000 -/* 10B24 80B7A4C4 A42CA6C8 */ sh $t4, %lo(D_80B7A6C8)($at) +/* 10B24 80B7A4C4 A42CA6C8 */ sh $t4, %lo(D_80B7A6C8)($at) /* 10B28 80B7A4C8 240D0001 */ addiu $t5, $zero, 0x0001 ## $t5 = 00000001 .L80B7A4CC: /* 10B2C 80B7A4CC 3C0180B8 */ lui $at, %hi(D_80B7A674) ## $at = 80B80000 -/* 10B30 80B7A4D0 A02DA674 */ sb $t5, %lo(D_80B7A674)($at) +/* 10B30 80B7A4D0 A02DA674 */ sb $t5, %lo(D_80B7A674)($at) /* 10B34 80B7A4D4 3C014302 */ lui $at, 0x4302 ## $at = 43020000 /* 10B38 80B7A4D8 44816000 */ mtc1 $at, $f12 ## $f12 = 130.00 /* 10B3C 80B7A4DC 3C014220 */ lui $at, 0x4220 ## $at = 42200000 /* 10B40 80B7A4E0 44817000 */ mtc1 $at, $f14 ## $f14 = 40.00 /* 10B44 80B7A4E4 3C0644A2 */ lui $a2, 0x44A2 ## $a2 = 44A20000 /* 10B48 80B7A4E8 34C68000 */ ori $a2, $a2, 0x8000 ## $a2 = 44A28000 -/* 10B4C 80B7A4EC 0C034261 */ jal Matrix_Translate +/* 10B4C 80B7A4EC 0C034261 */ jal Matrix_Translate /* 10B50 80B7A4F0 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 /* 10B54 80B7A4F4 3C0180B8 */ lui $at, %hi(D_80B7B8E8) ## $at = 80B80000 -/* 10B58 80B7A4F8 C42CB8E8 */ lwc1 $f12, %lo(D_80B7B8E8)($at) +/* 10B58 80B7A4F8 C42CB8E8 */ lwc1 $f12, %lo(D_80B7B8E8)($at) /* 10B5C 80B7A4FC 3C0180B8 */ lui $at, %hi(D_80B7B8EC) ## $at = 80B80000 /* 10B60 80B7A500 3C063E0F */ lui $a2, 0x3E0F ## $a2 = 3E0F0000 /* 10B64 80B7A504 34C65C29 */ ori $a2, $a2, 0x5C29 ## $a2 = 3E0F5C29 -/* 10B68 80B7A508 C42EB8EC */ lwc1 $f14, %lo(D_80B7B8EC)($at) -/* 10B6C 80B7A50C 0C0342A3 */ jal Matrix_Scale +/* 10B68 80B7A508 C42EB8EC */ lwc1 $f14, %lo(D_80B7B8EC)($at) +/* 10B6C 80B7A50C 0C0342A3 */ jal Matrix_Scale /* 10B70 80B7A510 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 10B74 80B7A514 8FA70058 */ lw $a3, 0x0058($sp) +/* 10B74 80B7A514 8FA70058 */ lw $a3, 0x0058($sp) /* 10B78 80B7A518 3C0EDA38 */ lui $t6, 0xDA38 ## $t6 = DA380000 /* 10B7C 80B7A51C 35CE0003 */ ori $t6, $t6, 0x0003 ## $t6 = DA380003 /* 10B80 80B7A520 8CE202C0 */ lw $v0, 0x02C0($a3) ## 000002C0 @@ -187,13 +187,13 @@ glabel func_80B7A278 /* 10B94 80B7A534 AC4E0000 */ sw $t6, 0x0000($v0) ## 00000000 /* 10B98 80B7A538 8E040000 */ lw $a0, 0x0000($s0) ## 00000000 /* 10B9C 80B7A53C 24062451 */ addiu $a2, $zero, 0x2451 ## $a2 = 00002451 -/* 10BA0 80B7A540 0C0346A2 */ jal Matrix_NewMtx -/* 10BA4 80B7A544 AFA20040 */ sw $v0, 0x0040($sp) -/* 10BA8 80B7A548 8FA30040 */ lw $v1, 0x0040($sp) +/* 10BA0 80B7A540 0C0346A2 */ jal Matrix_NewMtx +/* 10BA4 80B7A544 AFA20040 */ sw $v0, 0x0040($sp) +/* 10BA8 80B7A548 8FA30040 */ lw $v1, 0x0040($sp) /* 10BAC 80B7A54C 3C18DA38 */ lui $t8, 0xDA38 ## $t8 = DA380000 /* 10BB0 80B7A550 37180003 */ ori $t8, $t8, 0x0003 ## $t8 = DA380003 /* 10BB4 80B7A554 AC620004 */ sw $v0, 0x0004($v1) ## 00000004 -/* 10BB8 80B7A558 8FA70058 */ lw $a3, 0x0058($sp) +/* 10BB8 80B7A558 8FA70058 */ lw $a3, 0x0058($sp) /* 10BBC 80B7A55C 3C0580B8 */ lui $a1, %hi(D_80B7B324) ## $a1 = 80B80000 /* 10BC0 80B7A560 24A5B324 */ addiu $a1, $a1, %lo(D_80B7B324) ## $a1 = 80B7B324 /* 10BC4 80B7A564 8CE202D0 */ lw $v0, 0x02D0($a3) ## 000002D0 @@ -202,13 +202,13 @@ glabel func_80B7A278 /* 10BD0 80B7A570 ACEF02D0 */ sw $t7, 0x02D0($a3) ## 000002D0 /* 10BD4 80B7A574 AC580000 */ sw $t8, 0x0000($v0) ## 00000000 /* 10BD8 80B7A578 8E040000 */ lw $a0, 0x0000($s0) ## 00000000 -/* 10BDC 80B7A57C 0C0346A2 */ jal Matrix_NewMtx -/* 10BE0 80B7A580 AFA2003C */ sw $v0, 0x003C($sp) -/* 10BE4 80B7A584 8FA3003C */ lw $v1, 0x003C($sp) +/* 10BDC 80B7A57C 0C0346A2 */ jal Matrix_NewMtx +/* 10BE0 80B7A580 AFA2003C */ sw $v0, 0x003C($sp) +/* 10BE4 80B7A584 8FA3003C */ lw $v1, 0x003C($sp) /* 10BE8 80B7A588 3C0C0601 */ lui $t4, 0x0601 ## $t4 = 06010000 /* 10BEC 80B7A58C 258C53D0 */ addiu $t4, $t4, 0x53D0 ## $t4 = 060153D0 /* 10BF0 80B7A590 AC620004 */ sw $v0, 0x0004($v1) ## 00000004 -/* 10BF4 80B7A594 8FB90058 */ lw $t9, 0x0058($sp) +/* 10BF4 80B7A594 8FB90058 */ lw $t9, 0x0058($sp) /* 10BF8 80B7A598 3C04DE00 */ lui $a0, 0xDE00 ## $a0 = DE000000 /* 10BFC 80B7A59C 3C0E0601 */ lui $t6, 0x0601 ## $t6 = 06010000 /* 10C00 80B7A5A0 8F2202C0 */ lw $v0, 0x02C0($t9) ## 000002C0 @@ -218,33 +218,33 @@ glabel func_80B7A278 /* 10C10 80B7A5B0 AF2B02C0 */ sw $t3, 0x02C0($t9) ## 000002C0 /* 10C14 80B7A5B4 AC4C0004 */ sw $t4, 0x0004($v0) ## 00000004 /* 10C18 80B7A5B8 AC440000 */ sw $a0, 0x0000($v0) ## 00000000 -/* 10C1C 80B7A5BC 8FAD0058 */ lw $t5, 0x0058($sp) +/* 10C1C 80B7A5BC 8FAD0058 */ lw $t5, 0x0058($sp) /* 10C20 80B7A5C0 3C1880B8 */ lui $t8, %hi(D_80B7E0B6) ## $t8 = 80B80000 /* 10C24 80B7A5C4 8DA202D0 */ lw $v0, 0x02D0($t5) ## 000002D0 /* 10C28 80B7A5C8 244A0008 */ addiu $t2, $v0, 0x0008 ## $t2 = 00000008 /* 10C2C 80B7A5CC ADAA02D0 */ sw $t2, 0x02D0($t5) ## 000002D0 /* 10C30 80B7A5D0 AC4E0004 */ sw $t6, 0x0004($v0) ## 00000004 /* 10C34 80B7A5D4 AC440000 */ sw $a0, 0x0000($v0) ## 00000000 -/* 10C38 80B7A5D8 85EFE0AC */ lh $t7, %lo(D_80B7E0AC)($t7) -/* 10C3C 80B7A5DC 11E00007 */ beq $t7, $zero, .L80B7A5FC +/* 10C38 80B7A5D8 85EFE0AC */ lh $t7, %lo(D_80B7E0AC)($t7) +/* 10C3C 80B7A5DC 11E00007 */ beq $t7, $zero, .L80B7A5FC /* 10C40 80B7A5E0 00000000 */ nop -/* 10C44 80B7A5E4 9318E0B6 */ lbu $t8, %lo(D_80B7E0B6)($t8) +/* 10C44 80B7A5E4 9318E0B6 */ lbu $t8, %lo(D_80B7E0B6)($t8) /* 10C48 80B7A5E8 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 10C4C 80B7A5EC 17010003 */ bne $t8, $at, .L80B7A5FC +/* 10C4C 80B7A5EC 17010003 */ bne $t8, $at, .L80B7A5FC /* 10C50 80B7A5F0 00000000 */ nop -/* 10C54 80B7A5F4 0C2DB4D5 */ jal func_80B6D354 +/* 10C54 80B7A5F4 0C2DB4D5 */ jal func_80B6D354 /* 10C58 80B7A5F8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 .L80B7A5FC: /* 10C5C 80B7A5FC 3C0680B8 */ lui $a2, %hi(D_80B7B334) ## $a2 = 80B80000 /* 10C60 80B7A600 24C6B334 */ addiu $a2, $a2, %lo(D_80B7B334) ## $a2 = 80B7B334 /* 10C64 80B7A604 27A40048 */ addiu $a0, $sp, 0x0048 ## $a0 = FFFFFFE0 /* 10C68 80B7A608 8E050000 */ lw $a1, 0x0000($s0) ## 00000000 -/* 10C6C 80B7A60C 0C031AD5 */ jal func_800C6B54 +/* 10C6C 80B7A60C 0C031AD5 */ jal Graph_CloseDisps /* 10C70 80B7A610 24072459 */ addiu $a3, $zero, 0x2459 ## $a3 = 00002459 -/* 10C74 80B7A614 8FBF002C */ lw $ra, 0x002C($sp) -/* 10C78 80B7A618 8FB00028 */ lw $s0, 0x0028($sp) +/* 10C74 80B7A614 8FBF002C */ lw $ra, 0x002C($sp) +/* 10C78 80B7A618 8FB00028 */ lw $s0, 0x0028($sp) /* 10C7C 80B7A61C 27BD0068 */ addiu $sp, $sp, 0x0068 ## $sp = 00000000 -/* 10C80 80B7A620 03E00008 */ jr $ra +/* 10C80 80B7A620 03E00008 */ jr $ra /* 10C84 80B7A624 00000000 */ nop /* 10C88 80B7A628 00000000 */ nop /* 10C8C 80B7A62C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Item_B_Heart/ItemBHeart_Draw.s b/asm/non_matchings/overlays/actors/ovl_Item_B_Heart/ItemBHeart_Draw.s index 956a4da8c8..2928a95b00 100644 --- a/asm/non_matchings/overlays/actors/ovl_Item_B_Heart/ItemBHeart_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Item_B_Heart/ItemBHeart_Draw.s @@ -11,7 +11,7 @@ glabel ItemBHeart_Draw /* 00228 80B85378 27A40040 */ addiu $a0, $sp, 0x0040 ## $a0 = FFFFFFE0 /* 0022C 80B8537C A3A00057 */ sb $zero, 0x0057($sp) /* 00230 80B85380 240701FA */ addiu $a3, $zero, 0x01FA ## $a3 = 000001FA -/* 00234 80B85384 0C031AB1 */ jal func_800C6AC4 +/* 00234 80B85384 0C031AB1 */ jal Graph_OpenDisps /* 00238 80B85388 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 /* 0023C 80B8538C 8FA50064 */ lw $a1, 0x0064($sp) /* 00240 80B85390 93A80057 */ lbu $t0, 0x0057($sp) @@ -108,7 +108,7 @@ glabel ItemBHeart_Draw /* 00398 80B854E8 24C6557C */ addiu $a2, $a2, %lo(D_80B8557C) ## $a2 = 80B8557C /* 0039C 80B854EC 27A40040 */ addiu $a0, $sp, 0x0040 ## $a0 = FFFFFFE0 /* 003A0 80B854F0 24070231 */ addiu $a3, $zero, 0x0231 ## $a3 = 00000231 -/* 003A4 80B854F4 0C031AD5 */ jal func_800C6B54 +/* 003A4 80B854F4 0C031AD5 */ jal Graph_CloseDisps /* 003A8 80B854F8 8D850000 */ lw $a1, 0x0000($t4) ## 00000000 /* 003AC 80B854FC 8FBF001C */ lw $ra, 0x001C($sp) /* 003B0 80B85500 8FB00014 */ lw $s0, 0x0014($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Item_Shield/ItemShield_Draw.s b/asm/non_matchings/overlays/actors/ovl_Item_Shield/ItemShield_Draw.s index 86c7a6d925..68c0373ddc 100644 --- a/asm/non_matchings/overlays/actors/ovl_Item_Shield/ItemShield_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Item_Shield/ItemShield_Draw.s @@ -11,7 +11,7 @@ glabel ItemShield_Draw /* 0079C 80B870BC 27A40030 */ addiu $a0, $sp, 0x0030 ## $a0 = FFFFFFE8 /* 007A0 80B870C0 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 /* 007A4 80B870C4 240701C9 */ addiu $a3, $zero, 0x01C9 ## $a3 = 000001C9 -/* 007A8 80B870C8 0C031AB1 */ jal func_800C6AC4 +/* 007A8 80B870C8 0C031AB1 */ jal Graph_OpenDisps /* 007AC 80B870CC 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 /* 007B0 80B870D0 8FB9004C */ lw $t9, 0x004C($sp) /* 007B4 80B870D4 0C024F46 */ jal func_80093D18 @@ -56,7 +56,7 @@ glabel ItemShield_Draw /* 00850 80B87170 24C672C0 */ addiu $a2, $a2, %lo(D_80B872C0) ## $a2 = 80B872C0 /* 00854 80B87174 27A40030 */ addiu $a0, $sp, 0x0030 ## $a0 = FFFFFFE8 /* 00858 80B87178 240701D1 */ addiu $a3, $zero, 0x01D1 ## $a3 = 000001D1 -/* 0085C 80B8717C 0C031AD5 */ jal func_800C6B54 +/* 0085C 80B8717C 0C031AD5 */ jal Graph_CloseDisps /* 00860 80B87180 8D450000 */ lw $a1, 0x0000($t2) ## 00000000 .L80B87184: /* 00864 80B87184 8FBF001C */ lw $ra, 0x001C($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Magic_Dark/MagicDark_Draw.s b/asm/non_matchings/overlays/actors/ovl_Magic_Dark/MagicDark_Draw.s index 568c4159c0..8085004bca 100644 --- a/asm/non_matchings/overlays/actors/ovl_Magic_Dark/MagicDark_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Magic_Dark/MagicDark_Draw.s @@ -154,7 +154,7 @@ glabel MagicDark_Draw /* 00B28 80B87EF8 46122401 */ sub.s $f16, $f4, $f18 /* 00B2C 80B87EFC E7B00080 */ swc1 $f16, 0x0080($sp) /* 00B30 80B87F00 8E450000 */ lw $a1, 0x0000($s2) ## 00000000 -/* 00B34 80B87F04 0C031AB1 */ jal func_800C6AC4 +/* 00B34 80B87F04 0C031AB1 */ jal Graph_OpenDisps /* 00B38 80B87F08 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 /* 00B3C 80B87F0C 0C024F61 */ jal func_80093D84 /* 00B40 80B87F10 8E440000 */ lw $a0, 0x0000($s2) ## 00000000 @@ -254,7 +254,7 @@ glabel MagicDark_Draw /* 00CB8 80B88088 27A40058 */ addiu $a0, $sp, 0x0058 ## $a0 = FFFFFFD0 /* 00CBC 80B8808C AC4C0004 */ sw $t4, 0x0004($v0) ## 00000004 /* 00CC0 80B88090 8E450000 */ lw $a1, 0x0000($s2) ## 00000000 -/* 00CC4 80B88094 0C031AD5 */ jal func_800C6B54 +/* 00CC4 80B88094 0C031AD5 */ jal Graph_CloseDisps /* 00CC8 80B88098 24070283 */ addiu $a3, $zero, 0x0283 ## $a3 = 00000283 /* 00CCC 80B8809C 8FBF0024 */ lw $ra, 0x0024($sp) .L80B880A0: diff --git a/asm/non_matchings/overlays/actors/ovl_Magic_Dark/func_80B87A18.s b/asm/non_matchings/overlays/actors/ovl_Magic_Dark/func_80B87A18.s index 76a3f4a7ec..3677d08088 100644 --- a/asm/non_matchings/overlays/actors/ovl_Magic_Dark/func_80B87A18.s +++ b/asm/non_matchings/overlays/actors/ovl_Magic_Dark/func_80B87A18.s @@ -15,7 +15,7 @@ glabel func_80B87A18 /* 0067C 80B87A4C 24C68B20 */ addiu $a2, $a2, %lo(D_80B88B20) ## $a2 = 80B88B20 /* 00680 80B87A50 27A40070 */ addiu $a0, $sp, 0x0070 ## $a0 = FFFFFFE0 /* 00684 80B87A54 2407020D */ addiu $a3, $zero, 0x020D ## $a3 = 0000020D -/* 00688 80B87A58 0C031AB1 */ jal func_800C6AC4 +/* 00688 80B87A58 0C031AB1 */ jal Graph_OpenDisps /* 0068C 80B87A5C 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 /* 00690 80B87A60 0C024F61 */ jal func_80093D84 /* 00694 80B87A64 8E440000 */ lw $a0, 0x0000($s2) ## 00000000 @@ -149,7 +149,7 @@ glabel func_80B87A18 /* 00884 80B87C54 AFAF0014 */ sw $t7, 0x0014($sp) /* 00888 80B87C58 AFAE0010 */ sw $t6, 0x0010($sp) /* 0088C 80B87C5C 00408025 */ or $s0, $v0, $zero ## $s0 = 00000000 -/* 00890 80B87C60 0C0253D0 */ jal Draw_TwoTexScroll +/* 00890 80B87C60 0C0253D0 */ jal Gfx_TwoTexScroll /* 00894 80B87C64 00033040 */ sll $a2, $v1, 1 /* 00898 80B87C68 AE020004 */ sw $v0, 0x0004($s0) ## 00000004 /* 0089C 80B87C6C 8E2202D0 */ lw $v0, 0x02D0($s1) ## 000002D0 @@ -164,7 +164,7 @@ glabel func_80B87A18 /* 008C0 80B87C90 8E450000 */ lw $a1, 0x0000($s2) ## 00000000 /* 008C4 80B87C94 24C68B48 */ addiu $a2, $a2, %lo(D_80B88B48) ## $a2 = 80B88B48 /* 008C8 80B87C98 27A40070 */ addiu $a0, $sp, 0x0070 ## $a0 = FFFFFFE0 -/* 008CC 80B87C9C 0C031AD5 */ jal func_800C6B54 +/* 008CC 80B87C9C 0C031AD5 */ jal Graph_CloseDisps /* 008D0 80B87CA0 2407023A */ addiu $a3, $zero, 0x023A ## $a3 = 0000023A /* 008D4 80B87CA4 8FBF0044 */ lw $ra, 0x0044($sp) /* 008D8 80B87CA8 8FB00038 */ lw $s0, 0x0038($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Magic_Fire/MagicFire_Draw.s b/asm/non_matchings/overlays/actors/ovl_Magic_Fire/MagicFire_Draw.s index 8e978803e9..0f610a26e5 100644 --- a/asm/non_matchings/overlays/actors/ovl_Magic_Fire/MagicFire_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Magic_Fire/MagicFire_Draw.s @@ -15,7 +15,7 @@ glabel MagicFire_Draw /* 00538 80B892A8 8FBF0034 */ lw $ra, 0x0034($sp) /* 0053C 80B892AC 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 /* 00540 80B892B0 240702AA */ addiu $a3, $zero, 0x02AA ## $a3 = 000002AA -/* 00544 80B892B4 0C031AB1 */ jal func_800C6AC4 +/* 00544 80B892B4 0C031AB1 */ jal Graph_OpenDisps /* 00548 80B892B8 AFA500A4 */ sw $a1, 0x00A4($sp) /* 0054C 80B892BC 8FA300A4 */ lw $v1, 0x00A4($sp) /* 00550 80B892C0 0C024DF0 */ jal func_800937C0 @@ -338,7 +338,7 @@ glabel MagicFire_Draw /* 00A2C 80B8979C 310601FF */ andi $a2, $t0, 0x01FF ## $a2 = 00000000 /* 00A30 80B897A0 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 00A34 80B897A4 AFA300A4 */ sw $v1, 0x00A4($sp) -/* 00A38 80B897A8 0C0253D0 */ jal Draw_TwoTexScroll +/* 00A38 80B897A8 0C0253D0 */ jal Gfx_TwoTexScroll /* 00A3C 80B897AC AFA20040 */ sw $v0, 0x0040($sp) /* 00A40 80B897B0 8FA90040 */ lw $t1, 0x0040($sp) /* 00A44 80B897B4 8FA300A4 */ lw $v1, 0x00A4($sp) @@ -356,7 +356,7 @@ glabel MagicFire_Draw /* 00A74 80B897E4 24C6AFE8 */ addiu $a2, $a2, %lo(D_80B8AFE8) ## $a2 = 80B8AFE8 /* 00A78 80B897E8 27A40094 */ addiu $a0, $sp, 0x0094 ## $a0 = FFFFFFD4 /* 00A7C 80B897EC 240702EE */ addiu $a3, $zero, 0x02EE ## $a3 = 000002EE -/* 00A80 80B897F0 0C031AD5 */ jal func_800C6B54 +/* 00A80 80B897F0 0C031AD5 */ jal Graph_CloseDisps /* 00A84 80B897F4 8F250000 */ lw $a1, 0x0000($t9) ## 00000000 /* 00A88 80B897F8 8FAE00C0 */ lw $t6, 0x00C0($sp) /* 00A8C 80B897FC 3C01437F */ lui $at, 0x437F ## $at = 437F0000 diff --git a/asm/non_matchings/overlays/actors/ovl_Magic_Wind/MagicWind_Draw.s b/asm/non_matchings/overlays/actors/ovl_Magic_Wind/MagicWind_Draw.s index 6b24aaa568..93b91f7cac 100644 --- a/asm/non_matchings/overlays/actors/ovl_Magic_Wind/MagicWind_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Magic_Wind/MagicWind_Draw.s @@ -9,7 +9,7 @@ glabel MagicWind_Draw /* 006C8 80B8B7C8 24C6CE98 */ addiu $a2, $a2, %lo(D_80B8CE98) ## $a2 = 80B8CE98 /* 006CC 80B8B7CC 27A40034 */ addiu $a0, $sp, 0x0034 ## $a0 = FFFFFFE4 /* 006D0 80B8B7D0 24070295 */ addiu $a3, $zero, 0x0295 ## $a3 = 00000295 -/* 006D4 80B8B7D4 0C031AB1 */ jal func_800C6AC4 +/* 006D4 80B8B7D4 0C031AB1 */ jal Graph_OpenDisps /* 006D8 80B8B7D8 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 006DC 80B8B7DC 8FB80050 */ lw $t8, 0x0050($sp) /* 006E0 80B8B7E0 3C0F80B9 */ lui $t7, %hi(func_80B8B3C8) ## $t7 = 80B90000 @@ -18,7 +18,7 @@ glabel MagicWind_Draw /* 006EC 80B8B7EC 24050019 */ addiu $a1, $zero, 0x0019 ## $a1 = 00000019 /* 006F0 80B8B7F0 11F9000E */ beq $t7, $t9, .L80B8B82C /* 006F4 80B8B7F4 00000000 */ nop -/* 006F8 80B8B7F8 0C024DDD */ jal func_80093774 +/* 006F8 80B8B7F8 0C024DDD */ jal Gfx_CallSetupDL /* 006FC 80B8B7FC 8E0402D0 */ lw $a0, 0x02D0($s0) ## 000002D0 /* 00700 80B8B800 8FA40050 */ lw $a0, 0x0050($sp) /* 00704 80B8B804 AE0202D0 */ sw $v0, 0x02D0($s0) ## 000002D0 @@ -36,7 +36,7 @@ glabel MagicWind_Draw /* 00730 80B8B830 24C6CEAC */ addiu $a2, $a2, %lo(D_80B8CEAC) ## $a2 = 80B8CEAC /* 00734 80B8B834 27A40034 */ addiu $a0, $sp, 0x0034 ## $a0 = FFFFFFE4 /* 00738 80B8B838 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 0073C 80B8B83C 0C031AD5 */ jal func_800C6B54 +/* 0073C 80B8B83C 0C031AD5 */ jal Graph_CloseDisps /* 00740 80B8B840 240702A1 */ addiu $a3, $zero, 0x02A1 ## $a3 = 000002A1 /* 00744 80B8B844 8FBF002C */ lw $ra, 0x002C($sp) /* 00748 80B8B848 8FB00028 */ lw $s0, 0x0028($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Magic_Wind/func_80B8B5F4.s b/asm/non_matchings/overlays/actors/ovl_Magic_Wind/func_80B8B5F4.s index 726c7ea48a..70cb341c48 100644 --- a/asm/non_matchings/overlays/actors/ovl_Magic_Wind/func_80B8B5F4.s +++ b/asm/non_matchings/overlays/actors/ovl_Magic_Wind/func_80B8B5F4.s @@ -11,7 +11,7 @@ glabel func_80B8B5F4 /* 00518 80B8B618 24C6CE70 */ addiu $a2, $a2, %lo(D_80B8CE70) ## $a2 = 80B8CE70 /* 0051C 80B8B61C 27A40050 */ addiu $a0, $sp, 0x0050 ## $a0 = FFFFFFE8 /* 00520 80B8B620 24070267 */ addiu $a3, $zero, 0x0267 ## $a3 = 00000267 -/* 00524 80B8B624 0C031AB1 */ jal func_800C6AC4 +/* 00524 80B8B624 0C031AB1 */ jal Graph_OpenDisps /* 00528 80B8B628 AFA50060 */ sw $a1, 0x0060($sp) /* 0052C 80B8B62C 8FA20070 */ lw $v0, 0x0070($sp) /* 00530 80B8B630 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 @@ -49,7 +49,7 @@ glabel func_80B8B5F4 /* 005B0 80B8B6B0 AFB80010 */ sw $t8, 0x0010($sp) /* 005B4 80B8B6B4 AFB80024 */ sw $t8, 0x0024($sp) /* 005B8 80B8B6B8 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 005BC 80B8B6BC 0C0253D0 */ jal Draw_TwoTexScroll +/* 005BC 80B8B6BC 0C0253D0 */ jal Gfx_TwoTexScroll /* 005C0 80B8B6C0 AFA3004C */ sw $v1, 0x004C($sp) /* 005C4 80B8B6C4 8FAA004C */ lw $t2, 0x004C($sp) /* 005C8 80B8B6C8 1000002D */ beq $zero, $zero, .L80B8B780 @@ -95,7 +95,7 @@ glabel func_80B8B5F4 /* 00664 80B8B764 AFAD0028 */ sw $t5, 0x0028($sp) /* 00668 80B8B768 AFAE001C */ sw $t6, 0x001C($sp) /* 0066C 80B8B76C 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 00670 80B8B770 0C0253D0 */ jal Draw_TwoTexScroll +/* 00670 80B8B770 0C0253D0 */ jal Gfx_TwoTexScroll /* 00674 80B8B774 AFA30048 */ sw $v1, 0x0048($sp) /* 00678 80B8B778 8FA80048 */ lw $t0, 0x0048($sp) /* 0067C 80B8B77C AD020004 */ sw $v0, 0x0004($t0) ## 00000004 @@ -104,7 +104,7 @@ glabel func_80B8B5F4 /* 00684 80B8B784 24C6CE84 */ addiu $a2, $a2, %lo(D_80B8CE84) ## $a2 = 80B8CE84 /* 00688 80B8B788 27A40050 */ addiu $a0, $sp, 0x0050 ## $a0 = FFFFFFE8 /* 0068C 80B8B78C 8E050000 */ lw $a1, 0x0000($s0) ## 00000000 -/* 00690 80B8B790 0C031AD5 */ jal func_800C6B54 +/* 00690 80B8B790 0C031AD5 */ jal Graph_CloseDisps /* 00694 80B8B794 24070286 */ addiu $a3, $zero, 0x0286 ## $a3 = 00000286 /* 00698 80B8B798 8FBF003C */ lw $ra, 0x003C($sp) /* 0069C 80B8B79C 8FB00038 */ lw $s0, 0x0038($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Mir_Ray/MirRay_Draw.s b/asm/non_matchings/overlays/actors/ovl_Mir_Ray/MirRay_Draw.s index 33085529ea..44c8fe4fe7 100644 --- a/asm/non_matchings/overlays/actors/ovl_Mir_Ray/MirRay_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Mir_Ray/MirRay_Draw.s @@ -37,7 +37,7 @@ glabel MirRay_Draw /* 01120 80B8E170 8FBF0034 */ lw $ra, 0x0034($sp) /* 01124 80B8E174 8E850000 */ lw $a1, 0x0000($s4) ## 00000000 /* 01128 80B8E178 240703C6 */ addiu $a3, $zero, 0x03C6 ## $a3 = 000003C6 -/* 0112C 80B8E17C 0C031AB1 */ jal func_800C6AC4 +/* 0112C 80B8E17C 0C031AB1 */ jal Graph_OpenDisps /* 01130 80B8E180 00A09025 */ or $s2, $a1, $zero ## $s2 = 00000000 /* 01134 80B8E184 0C024F61 */ jal func_80093D84 /* 01138 80B8E188 8E840000 */ lw $a0, 0x0000($s4) ## 00000000 @@ -193,7 +193,7 @@ glabel MirRay_Draw /* 0137C 80B8E3CC 24C6E914 */ addiu $a2, $a2, %lo(D_80B8E914) ## $a2 = 80B8E914 /* 01380 80B8E3D0 8E850000 */ lw $a1, 0x0000($s4) ## 00000000 /* 01384 80B8E3D4 27A40064 */ addiu $a0, $sp, 0x0064 ## $a0 = FFFFFDE4 -/* 01388 80B8E3D8 0C031AD5 */ jal func_800C6B54 +/* 01388 80B8E3D8 0C031AD5 */ jal Graph_CloseDisps /* 0138C 80B8E3DC 24070403 */ addiu $a3, $zero, 0x0403 ## $a3 = 00000403 .L80B8E3E0: /* 01390 80B8E3E0 8FBF0034 */ lw $ra, 0x0034($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Bean/ObjBean_Draw.s b/asm/non_matchings/overlays/actors/ovl_Obj_Bean/ObjBean_Draw.s index 0f71634c6d..a10b4c80d1 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Bean/ObjBean_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Bean/ObjBean_Draw.s @@ -9,7 +9,7 @@ glabel ObjBean_Draw /* 0232C 80B90DAC 11C00006 */ beq $t6, $zero, .L80B90DC8 /* 02330 80B90DB0 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 02334 80B90DB4 24A50090 */ addiu $a1, $a1, 0x0090 ## $a1 = 06000090 -/* 02338 80B90DB8 0C00D498 */ jal Draw_DListOpa +/* 02338 80B90DB8 0C00D498 */ jal Gfx_DrawDListOpa /* 0233C 80B90DBC AFA60018 */ sw $a2, 0x0018($sp) /* 02340 80B90DC0 8FA60018 */ lw $a2, 0x0018($sp) @@ -20,7 +20,7 @@ glabel ObjBean_Draw /* 02350 80B90DD0 8FA4001C */ lw $a0, 0x001C($sp) /* 02354 80B90DD4 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 02358 80B90DD8 24A503F0 */ addiu $a1, $a1, 0x03F0 ## $a1 = 060003F0 -/* 0235C 80B90DDC 0C00D498 */ jal Draw_DListOpa +/* 0235C 80B90DDC 0C00D498 */ jal Gfx_DrawDListOpa /* 02360 80B90DE0 AFA60018 */ sw $a2, 0x0018($sp) /* 02364 80B90DE4 8FA60018 */ lw $a2, 0x0018($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B90C7C.s b/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B90C7C.s index a20f5b7b45..103e3addc7 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B90C7C.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B90C7C.s @@ -27,7 +27,7 @@ glabel func_80B90C7C /* 02260 80B90CE0 46006386 */ mov.s $f14, $f12 /* 02264 80B90CE4 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 02268 80B90CE8 24A50650 */ addiu $a1, $a1, 0x0650 ## $a1 = 06000650 -/* 0226C 80B90CEC 0C00D498 */ jal Draw_DListOpa +/* 0226C 80B90CEC 0C00D498 */ jal Gfx_DrawDListOpa /* 02270 80B90CF0 8FA4001C */ lw $a0, 0x001C($sp) /* 02274 80B90CF4 8FBF0014 */ lw $ra, 0x0014($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B90D04.s b/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B90D04.s index df9b47cc88..b95ac3381a 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B90D04.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Bean/func_80B90D04.s @@ -28,7 +28,7 @@ glabel func_80B90D04 /* 022EC 80B90D6C C48E01D4 */ lwc1 $f14, 0x01D4($a0) ## 000001D4 /* 022F0 80B90D70 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 /* 022F4 80B90D74 24A501B0 */ addiu $a1, $a1, 0x01B0 ## $a1 = 060001B0 -/* 022F8 80B90D78 0C00D498 */ jal Draw_DListOpa +/* 022F8 80B90D78 0C00D498 */ jal Gfx_DrawDListOpa /* 022FC 80B90D7C 8FA4001C */ lw $a0, 0x001C($sp) /* 02300 80B90D80 8FBF0014 */ lw $ra, 0x0014($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Bombiwa/ObjBombiwa_Destroy.s b/asm/non_matchings/overlays/actors/ovl_Obj_Bombiwa/ObjBombiwa_Destroy.s deleted file mode 100644 index 09fb4e368f..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Bombiwa/ObjBombiwa_Destroy.s +++ /dev/null @@ -1,14 +0,0 @@ -glabel ObjBombiwa_Destroy -/* 00120 80B91710 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00124 80B91714 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 -/* 00128 80B91718 AFBF0014 */ sw $ra, 0x0014($sp) -/* 0012C 80B9171C 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 00130 80B91720 0C0170EB */ jal ActorCollider_FreeCylinder - -/* 00134 80B91724 24E5014C */ addiu $a1, $a3, 0x014C ## $a1 = 0000014C -/* 00138 80B91728 8FBF0014 */ lw $ra, 0x0014($sp) -/* 0013C 80B9172C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00140 80B91730 03E00008 */ jr $ra -/* 00144 80B91734 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Bombiwa/ObjBombiwa_Draw.s b/asm/non_matchings/overlays/actors/ovl_Obj_Bombiwa/ObjBombiwa_Draw.s deleted file mode 100644 index 55780313d9..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Bombiwa/ObjBombiwa_Draw.s +++ /dev/null @@ -1,17 +0,0 @@ -glabel ObjBombiwa_Draw -/* 00458 80B91A48 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 0045C 80B91A4C AFA40018 */ sw $a0, 0x0018($sp) -/* 00460 80B91A50 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 00464 80B91A54 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00468 80B91A58 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 0046C 80B91A5C 0C00D498 */ jal Draw_DListOpa - -/* 00470 80B91A60 24A509E0 */ addiu $a1, $a1, 0x09E0 ## $a1 = 060009E0 -/* 00474 80B91A64 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00478 80B91A68 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 0047C 80B91A6C 03E00008 */ jr $ra -/* 00480 80B91A70 00000000 */ nop -/* 00484 80B91A74 00000000 */ nop -/* 00488 80B91A78 00000000 */ nop -/* 0048C 80B91A7C 00000000 */ nop - diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Bombiwa/ObjBombiwa_Init.s b/asm/non_matchings/overlays/actors/ovl_Obj_Bombiwa/ObjBombiwa_Init.s deleted file mode 100644 index 8cffc64b81..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Bombiwa/ObjBombiwa_Init.s +++ /dev/null @@ -1,60 +0,0 @@ -glabel ObjBombiwa_Init -/* 00058 80B91648 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 0005C 80B9164C AFA50024 */ sw $a1, 0x0024($sp) -/* 00060 80B91650 AFBF001C */ sw $ra, 0x001C($sp) -/* 00064 80B91654 AFB00018 */ sw $s0, 0x0018($sp) -/* 00068 80B91658 3C0580B9 */ lui $a1, %hi(D_80B91AD4) ## $a1 = 80B90000 -/* 0006C 80B9165C 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00070 80B91660 0C01E037 */ jal Actor_ProcessInitChain - -/* 00074 80B91664 24A51AD4 */ addiu $a1, $a1, %lo(D_80B91AD4) ## $a1 = 80B91AD4 -/* 00078 80B91668 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0007C 80B9166C 0C2E457C */ jal func_80B915F0 -/* 00080 80B91670 8FA50024 */ lw $a1, 0x0024($sp) -/* 00084 80B91674 8605001C */ lh $a1, 0x001C($s0) ## 0000001C -/* 00088 80B91678 8FA40024 */ lw $a0, 0x0024($sp) -/* 0008C 80B9167C 0C00B2D0 */ jal Flags_GetSwitch - -/* 00090 80B91680 30A5003F */ andi $a1, $a1, 0x003F ## $a1 = 00000000 -/* 00094 80B91684 10400005 */ beq $v0, $zero, .L80B9169C -/* 00098 80B91688 26040098 */ addiu $a0, $s0, 0x0098 ## $a0 = 00000098 -/* 0009C 80B9168C 0C00B55C */ jal Actor_Kill - -/* 000A0 80B91690 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 000A4 80B91694 1000001A */ beq $zero, $zero, .L80B91700 -/* 000A8 80B91698 8FBF001C */ lw $ra, 0x001C($sp) -.L80B9169C: -/* 000AC 80B9169C 3C0680B9 */ lui $a2, %hi(D_80B91ACC) ## $a2 = 80B90000 -/* 000B0 80B916A0 24C61ACC */ addiu $a2, $a2, %lo(D_80B91ACC) ## $a2 = 80B91ACC -/* 000B4 80B916A4 0C0187B5 */ jal func_80061ED4 -/* 000B8 80B916A8 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 000BC 80B916AC 860E00B6 */ lh $t6, 0x00B6($s0) ## 000000B6 -/* 000C0 80B916B0 3C014780 */ lui $at, 0x4780 ## $at = 47800000 -/* 000C4 80B916B4 55C0000A */ bnel $t6, $zero, .L80B916E0 -/* 000C8 80B916B8 3C01C348 */ lui $at, 0xC348 ## $at = C3480000 -/* 000CC 80B916BC 44816000 */ mtc1 $at, $f12 ## $f12 = -200.00 -/* 000D0 80B916C0 0C00CFBE */ jal Math_Rand_ZeroFloat - -/* 000D4 80B916C4 00000000 */ nop -/* 000D8 80B916C8 4600010D */ trunc.w.s $f4, $f0 -/* 000DC 80B916CC 44022000 */ mfc1 $v0, $f4 -/* 000E0 80B916D0 00000000 */ nop -/* 000E4 80B916D4 A6020032 */ sh $v0, 0x0032($s0) ## 00000032 -/* 000E8 80B916D8 A60200B6 */ sh $v0, 0x00B6($s0) ## 000000B6 -/* 000EC 80B916DC 3C01C348 */ lui $at, 0xC348 ## $at = C3480000 -.L80B916E0: -/* 000F0 80B916E0 44813000 */ mtc1 $at, $f6 ## $f6 = -200.00 -/* 000F4 80B916E4 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 -/* 000F8 80B916E8 44815000 */ mtc1 $at, $f10 ## $f10 = 20.00 -/* 000FC 80B916EC C608000C */ lwc1 $f8, 0x000C($s0) ## 0000000C -/* 00100 80B916F0 E60600BC */ swc1 $f6, 0x00BC($s0) ## 000000BC -/* 00104 80B916F4 460A4400 */ add.s $f16, $f8, $f10 -/* 00108 80B916F8 E6100028 */ swc1 $f16, 0x0028($s0) ## 00000028 -/* 0010C 80B916FC 8FBF001C */ lw $ra, 0x001C($sp) -.L80B91700: -/* 00110 80B91700 8FB00018 */ lw $s0, 0x0018($sp) -/* 00114 80B91704 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 00118 80B91708 03E00008 */ jr $ra -/* 0011C 80B9170C 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Bombiwa/ObjBombiwa_Update.s b/asm/non_matchings/overlays/actors/ovl_Obj_Bombiwa/ObjBombiwa_Update.s deleted file mode 100644 index a357967a45..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Bombiwa/ObjBombiwa_Update.s +++ /dev/null @@ -1,81 +0,0 @@ -glabel ObjBombiwa_Update -/* 00348 80B91938 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 0034C 80B9193C AFB00014 */ sw $s0, 0x0014($sp) -/* 00350 80B91940 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00354 80B91944 AFB10018 */ sw $s1, 0x0018($sp) -/* 00358 80B91948 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 -/* 0035C 80B9194C AFBF001C */ sw $ra, 0x001C($sp) -/* 00360 80B91950 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 00364 80B91954 0C00CDA1 */ jal func_80033684 -/* 00368 80B91958 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 0036C 80B9195C 1440000C */ bne $v0, $zero, .L80B91990 -/* 00370 80B91960 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00374 80B91964 9202015D */ lbu $v0, 0x015D($s0) ## 0000015D -/* 00378 80B91968 304E0002 */ andi $t6, $v0, 0x0002 ## $t6 = 00000000 -/* 0037C 80B9196C 51C0001F */ beql $t6, $zero, .L80B919EC -/* 00380 80B91970 3C014448 */ lui $at, 0x4448 ## $at = 44480000 -/* 00384 80B91974 8E0F0188 */ lw $t7, 0x0188($s0) ## 00000188 -/* 00388 80B91978 3C014000 */ lui $at, 0x4000 ## $at = 40000000 -/* 0038C 80B9197C 34210040 */ ori $at, $at, 0x0040 ## $at = 40000040 -/* 00390 80B91980 8DF80000 */ lw $t8, 0x0000($t7) ## 00000000 -/* 00394 80B91984 0301C824 */ and $t9, $t8, $at -/* 00398 80B91988 53200018 */ beql $t9, $zero, .L80B919EC -/* 0039C 80B9198C 3C014448 */ lui $at, 0x4448 ## $at = 44480000 -.L80B91990: -/* 003A0 80B91990 0C2E45CE */ jal func_80B91738 -/* 003A4 80B91994 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 003A8 80B91998 8605001C */ lh $a1, 0x001C($s0) ## 0000001C -/* 003AC 80B9199C 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 003B0 80B919A0 0C00B2DD */ jal Flags_SetSwitch - -/* 003B4 80B919A4 30A5003F */ andi $a1, $a1, 0x003F ## $a1 = 00000000 -/* 003B8 80B919A8 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 003BC 80B919AC 26050024 */ addiu $a1, $s0, 0x0024 ## $a1 = 00000024 -/* 003C0 80B919B0 24060050 */ addiu $a2, $zero, 0x0050 ## $a2 = 00000050 -/* 003C4 80B919B4 0C01AEB6 */ jal Audio_PlaySoundAtPosition - -/* 003C8 80B919B8 24072810 */ addiu $a3, $zero, 0x2810 ## $a3 = 00002810 -/* 003CC 80B919BC 8608001C */ lh $t0, 0x001C($s0) ## 0000001C -/* 003D0 80B919C0 00084BC3 */ sra $t1, $t0, 15 -/* 003D4 80B919C4 312A0001 */ andi $t2, $t1, 0x0001 ## $t2 = 00000000 -/* 003D8 80B919C8 11400003 */ beq $t2, $zero, .L80B919D8 -/* 003DC 80B919CC 00000000 */ nop -/* 003E0 80B919D0 0C01E221 */ jal func_80078884 -/* 003E4 80B919D4 24044802 */ addiu $a0, $zero, 0x4802 ## $a0 = 00004802 -.L80B919D8: -/* 003E8 80B919D8 0C00B55C */ jal Actor_Kill - -/* 003EC 80B919DC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 003F0 80B919E0 10000015 */ beq $zero, $zero, .L80B91A38 -/* 003F4 80B919E4 8FBF001C */ lw $ra, 0x001C($sp) -/* 003F8 80B919E8 3C014448 */ lui $at, 0x4448 ## $at = 44480000 -.L80B919EC: -/* 003FC 80B919EC 44813000 */ mtc1 $at, $f6 ## $f6 = 800.00 -/* 00400 80B919F0 C6040090 */ lwc1 $f4, 0x0090($s0) ## 00000090 -/* 00404 80B919F4 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 00408 80B919F8 304BFFFD */ andi $t3, $v0, 0xFFFD ## $t3 = 00000000 -/* 0040C 80B919FC 4606203C */ c.lt.s $f4, $f6 -/* 00410 80B91A00 34211E60 */ ori $at, $at, 0x1E60 ## $at = 00011E60 -/* 00414 80B91A04 A20B015D */ sb $t3, 0x015D($s0) ## 0000015D -/* 00418 80B91A08 02212821 */ addu $a1, $s1, $at -/* 0041C 80B91A0C 45000009 */ bc1f .L80B91A34 -/* 00420 80B91A10 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 00424 80B91A14 2606014C */ addiu $a2, $s0, 0x014C ## $a2 = 0000014C -/* 00428 80B91A18 AFA60020 */ sw $a2, 0x0020($sp) -/* 0042C 80B91A1C 0C01767D */ jal Actor_CollisionCheck_SetAC - ## CollisionCheck_setAC -/* 00430 80B91A20 AFA50024 */ sw $a1, 0x0024($sp) -/* 00434 80B91A24 8FA50024 */ lw $a1, 0x0024($sp) -/* 00438 80B91A28 8FA60020 */ lw $a2, 0x0020($sp) -/* 0043C 80B91A2C 0C017713 */ jal Actor_CollisionCheck_SetOT - ## CollisionCheck_setOT -/* 00440 80B91A30 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -.L80B91A34: -/* 00444 80B91A34 8FBF001C */ lw $ra, 0x001C($sp) -.L80B91A38: -/* 00448 80B91A38 8FB00014 */ lw $s0, 0x0014($sp) -/* 0044C 80B91A3C 8FB10018 */ lw $s1, 0x0018($sp) -/* 00450 80B91A40 03E00008 */ jr $ra -/* 00454 80B91A44 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Bombiwa/func_80B915F0.s b/asm/non_matchings/overlays/actors/ovl_Obj_Bombiwa/func_80B915F0.s deleted file mode 100644 index 4d34357b32..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Bombiwa/func_80B915F0.s +++ /dev/null @@ -1,28 +0,0 @@ -glabel func_80B915F0 -/* 00000 80B915F0 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 00004 80B915F4 00803025 */ or $a2, $a0, $zero ## $a2 = 00000000 -/* 00008 80B915F8 AFA50024 */ sw $a1, 0x0024($sp) -/* 0000C 80B915FC 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 00010 80B91600 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00014 80B91604 24C5014C */ addiu $a1, $a2, 0x014C ## $a1 = 0000014C -/* 00018 80B91608 AFA50018 */ sw $a1, 0x0018($sp) -/* 0001C 80B9160C 0C0170D9 */ jal ActorCollider_AllocCylinder - -/* 00020 80B91610 AFA60020 */ sw $a2, 0x0020($sp) -/* 00024 80B91614 3C0780B9 */ lui $a3, %hi(D_80B91AA0) ## $a3 = 80B90000 -/* 00028 80B91618 8FA60020 */ lw $a2, 0x0020($sp) -/* 0002C 80B9161C 24E71AA0 */ addiu $a3, $a3, %lo(D_80B91AA0) ## $a3 = 80B91AA0 -/* 00030 80B91620 8FA40024 */ lw $a0, 0x0024($sp) -/* 00034 80B91624 0C01712B */ jal ActorCollider_InitCylinder - -/* 00038 80B91628 8FA50018 */ lw $a1, 0x0018($sp) -/* 0003C 80B9162C 8FA40020 */ lw $a0, 0x0020($sp) -/* 00040 80B91630 0C0189B7 */ jal ActorCollider_Cylinder_Update - -/* 00044 80B91634 8FA50018 */ lw $a1, 0x0018($sp) -/* 00048 80B91638 8FBF0014 */ lw $ra, 0x0014($sp) -/* 0004C 80B9163C 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 00050 80B91640 03E00008 */ jr $ra -/* 00054 80B91644 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Bombiwa/func_80B91738.s b/asm/non_matchings/overlays/actors/ovl_Obj_Bombiwa/func_80B91738.s deleted file mode 100644 index f28386d437..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Bombiwa/func_80B91738.s +++ /dev/null @@ -1,141 +0,0 @@ -glabel func_80B91738 -/* 00148 80B91738 27BDFF40 */ addiu $sp, $sp, 0xFF40 ## $sp = FFFFFF40 -/* 0014C 80B9173C F7BE0070 */ sdc1 $f30, 0x0070($sp) -/* 00150 80B91740 3C014180 */ lui $at, 0x4180 ## $at = 41800000 -/* 00154 80B91744 4481F000 */ mtc1 $at, $f30 ## $f30 = 16.00 -/* 00158 80B91748 F7BC0068 */ sdc1 $f28, 0x0068($sp) -/* 0015C 80B9174C 3C014100 */ lui $at, 0x4100 ## $at = 41000000 -/* 00160 80B91750 4481E000 */ mtc1 $at, $f28 ## $f28 = 8.00 -/* 00164 80B91754 F7BA0060 */ sdc1 $f26, 0x0060($sp) -/* 00168 80B91758 3C014170 */ lui $at, 0x4170 ## $at = 41700000 -/* 0016C 80B9175C 4481D000 */ mtc1 $at, $f26 ## $f26 = 15.00 -/* 00170 80B91760 F7B80058 */ sdc1 $f24, 0x0058($sp) -/* 00174 80B91764 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 -/* 00178 80B91768 4481C000 */ mtc1 $at, $f24 ## $f24 = 5.00 -/* 0017C 80B9176C F7B60050 */ sdc1 $f22, 0x0050($sp) -/* 00180 80B91770 3C014120 */ lui $at, 0x4120 ## $at = 41200000 -/* 00184 80B91774 4481B000 */ mtc1 $at, $f22 ## $f22 = 10.00 -/* 00188 80B91778 AFB5008C */ sw $s5, 0x008C($sp) -/* 0018C 80B9177C AFB40088 */ sw $s4, 0x0088($sp) -/* 00190 80B91780 AFB00078 */ sw $s0, 0x0078($sp) -/* 00194 80B91784 F7B40048 */ sdc1 $f20, 0x0048($sp) -/* 00198 80B91788 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 -/* 0019C 80B9178C AFB60090 */ sw $s6, 0x0090($sp) -/* 001A0 80B91790 AFB30084 */ sw $s3, 0x0084($sp) -/* 001A4 80B91794 AFB20080 */ sw $s2, 0x0080($sp) -/* 001A8 80B91798 AFB1007C */ sw $s1, 0x007C($sp) -/* 001AC 80B9179C 3C1080B9 */ lui $s0, %hi(D_80B91AE4) ## $s0 = 80B90000 -/* 001B0 80B917A0 3C140600 */ lui $s4, 0x0600 ## $s4 = 06000000 -/* 001B4 80B917A4 3C1580B9 */ lui $s5, %hi(D_80B91AF4) ## $s5 = 80B90000 -/* 001B8 80B917A8 4481A000 */ mtc1 $at, $f20 ## $f20 = 0.50 -/* 001BC 80B917AC 00808825 */ or $s1, $a0, $zero ## $s1 = 00000000 -/* 001C0 80B917B0 00A0B025 */ or $s6, $a1, $zero ## $s6 = 00000000 -/* 001C4 80B917B4 AFBF0094 */ sw $ra, 0x0094($sp) -/* 001C8 80B917B8 26B51AF4 */ addiu $s5, $s5, %lo(D_80B91AF4) ## $s5 = 80B91AF4 -/* 001CC 80B917BC 269409E0 */ addiu $s4, $s4, 0x09E0 ## $s4 = 060009E0 -/* 001D0 80B917C0 26101AE4 */ addiu $s0, $s0, %lo(D_80B91AE4) ## $s0 = 80B91AE4 -/* 001D4 80B917C4 27B200B4 */ addiu $s2, $sp, 0x00B4 ## $s2 = FFFFFFF4 -/* 001D8 80B917C8 27B300A8 */ addiu $s3, $sp, 0x00A8 ## $s3 = FFFFFFE8 -.L80B917CC: -/* 001DC 80B917CC 0C03F66B */ jal Math_Rand_ZeroOne - ## Rand.Next() float -/* 001E0 80B917D0 00000000 */ nop -/* 001E4 80B917D4 46140101 */ sub.s $f4, $f0, $f20 -/* 001E8 80B917D8 C6280008 */ lwc1 $f8, 0x0008($s1) ## 00000008 -/* 001EC 80B917DC 46162182 */ mul.s $f6, $f4, $f22 -/* 001F0 80B917E0 46083280 */ add.s $f10, $f6, $f8 -/* 001F4 80B917E4 0C03F66B */ jal Math_Rand_ZeroOne - ## Rand.Next() float -/* 001F8 80B917E8 E7AA00B4 */ swc1 $f10, 0x00B4($sp) -/* 001FC 80B917EC 46180402 */ mul.s $f16, $f0, $f24 -/* 00200 80B917F0 C632000C */ lwc1 $f18, 0x000C($s1) ## 0000000C -/* 00204 80B917F4 46128100 */ add.s $f4, $f16, $f18 -/* 00208 80B917F8 461C2180 */ add.s $f6, $f4, $f28 -/* 0020C 80B917FC 0C03F66B */ jal Math_Rand_ZeroOne - ## Rand.Next() float -/* 00210 80B91800 E7A600B8 */ swc1 $f6, 0x00B8($sp) -/* 00214 80B91804 46140201 */ sub.s $f8, $f0, $f20 -/* 00218 80B91808 C6300010 */ lwc1 $f16, 0x0010($s1) ## 00000010 -/* 0021C 80B9180C 46164282 */ mul.s $f10, $f8, $f22 -/* 00220 80B91810 46105480 */ add.s $f18, $f10, $f16 -/* 00224 80B91814 0C03F66B */ jal Math_Rand_ZeroOne - ## Rand.Next() float -/* 00228 80B91818 E7B200BC */ swc1 $f18, 0x00BC($sp) -/* 0022C 80B9181C 46140101 */ sub.s $f4, $f0, $f20 -/* 00230 80B91820 461A2182 */ mul.s $f6, $f4, $f26 -/* 00234 80B91824 0C03F66B */ jal Math_Rand_ZeroOne - ## Rand.Next() float -/* 00238 80B91828 E7A600A8 */ swc1 $f6, 0x00A8($sp) -/* 0023C 80B9182C 461E0202 */ mul.s $f8, $f0, $f30 -/* 00240 80B91830 46184280 */ add.s $f10, $f8, $f24 -/* 00244 80B91834 0C03F66B */ jal Math_Rand_ZeroOne - ## Rand.Next() float -/* 00248 80B91838 E7AA00AC */ swc1 $f10, 0x00AC($sp) -/* 0024C 80B9183C 46140401 */ sub.s $f16, $f0, $f20 -/* 00250 80B91840 86020000 */ lh $v0, 0x0000($s0) ## 80B91AE4 -/* 00254 80B91844 02C02025 */ or $a0, $s6, $zero ## $a0 = 00000000 -/* 00258 80B91848 02402825 */ or $a1, $s2, $zero ## $a1 = FFFFFFF4 -/* 0025C 80B9184C 461A8482 */ mul.s $f18, $f16, $f26 -/* 00260 80B91850 2841000B */ slti $at, $v0, 0x000B -/* 00264 80B91854 02603025 */ or $a2, $s3, $zero ## $a2 = FFFFFFE8 -/* 00268 80B91858 02403825 */ or $a3, $s2, $zero ## $a3 = FFFFFFF4 -/* 0026C 80B9185C 240EFE70 */ addiu $t6, $zero, 0xFE70 ## $t6 = FFFFFE70 -/* 00270 80B91860 240F000A */ addiu $t7, $zero, 0x000A ## $t7 = 0000000A -/* 00274 80B91864 14200003 */ bne $at, $zero, .L80B91874 -/* 00278 80B91868 E7B200B0 */ swc1 $f18, 0x00B0($sp) -/* 0027C 80B9186C 10000002 */ beq $zero, $zero, .L80B91878 -/* 00280 80B91870 24030025 */ addiu $v1, $zero, 0x0025 ## $v1 = 00000025 -.L80B91874: -/* 00284 80B91874 24030021 */ addiu $v1, $zero, 0x0021 ## $v1 = 00000021 -.L80B91878: -/* 00288 80B91878 24180002 */ addiu $t8, $zero, 0x0002 ## $t8 = 00000002 -/* 0028C 80B9187C 24190001 */ addiu $t9, $zero, 0x0001 ## $t9 = 00000001 -/* 00290 80B91880 24080050 */ addiu $t0, $zero, 0x0050 ## $t0 = 00000050 -/* 00294 80B91884 2409FFFF */ addiu $t1, $zero, 0xFFFF ## $t1 = FFFFFFFF -/* 00298 80B91888 240A0163 */ addiu $t2, $zero, 0x0163 ## $t2 = 00000163 -/* 0029C 80B9188C AFAA0038 */ sw $t2, 0x0038($sp) -/* 002A0 80B91890 AFA90034 */ sw $t1, 0x0034($sp) -/* 002A4 80B91894 AFA80030 */ sw $t0, 0x0030($sp) -/* 002A8 80B91898 AFB90028 */ sw $t9, 0x0028($sp) -/* 002AC 80B9189C AFB8001C */ sw $t8, 0x001C($sp) -/* 002B0 80B918A0 AFAE0010 */ sw $t6, 0x0010($sp) -/* 002B4 80B918A4 AFA30014 */ sw $v1, 0x0014($sp) -/* 002B8 80B918A8 AFAF0018 */ sw $t7, 0x0018($sp) -/* 002BC 80B918AC AFA00020 */ sw $zero, 0x0020($sp) -/* 002C0 80B918B0 AFA20024 */ sw $v0, 0x0024($sp) -/* 002C4 80B918B4 AFA0002C */ sw $zero, 0x002C($sp) -/* 002C8 80B918B8 0C00A7A3 */ jal Effect_SpawnFragment - -/* 002CC 80B918BC AFB4003C */ sw $s4, 0x003C($sp) -/* 002D0 80B918C0 26100002 */ addiu $s0, $s0, 0x0002 ## $s0 = 80B91AE6 -/* 002D4 80B918C4 1615FFC1 */ bne $s0, $s5, .L80B917CC -/* 002D8 80B918C8 00000000 */ nop -/* 002DC 80B918CC 240B0064 */ addiu $t3, $zero, 0x0064 ## $t3 = 00000064 -/* 002E0 80B918D0 240C00A0 */ addiu $t4, $zero, 0x00A0 ## $t4 = 000000A0 -/* 002E4 80B918D4 240D0001 */ addiu $t5, $zero, 0x0001 ## $t5 = 00000001 -/* 002E8 80B918D8 AFAD0018 */ sw $t5, 0x0018($sp) -/* 002EC 80B918DC AFAC0014 */ sw $t4, 0x0014($sp) -/* 002F0 80B918E0 AFAB0010 */ sw $t3, 0x0010($sp) -/* 002F4 80B918E4 02C02025 */ or $a0, $s6, $zero ## $a0 = 00000000 -/* 002F8 80B918E8 26250024 */ addiu $a1, $s1, 0x0024 ## $a1 = 00000024 -/* 002FC 80B918EC 3C064270 */ lui $a2, 0x4270 ## $a2 = 42700000 -/* 00300 80B918F0 0C00CD20 */ jal func_80033480 -/* 00304 80B918F4 24070008 */ addiu $a3, $zero, 0x0008 ## $a3 = 00000008 -/* 00308 80B918F8 8FBF0094 */ lw $ra, 0x0094($sp) -/* 0030C 80B918FC D7B40048 */ ldc1 $f20, 0x0048($sp) -/* 00310 80B91900 D7B60050 */ ldc1 $f22, 0x0050($sp) -/* 00314 80B91904 D7B80058 */ ldc1 $f24, 0x0058($sp) -/* 00318 80B91908 D7BA0060 */ ldc1 $f26, 0x0060($sp) -/* 0031C 80B9190C D7BC0068 */ ldc1 $f28, 0x0068($sp) -/* 00320 80B91910 D7BE0070 */ ldc1 $f30, 0x0070($sp) -/* 00324 80B91914 8FB00078 */ lw $s0, 0x0078($sp) -/* 00328 80B91918 8FB1007C */ lw $s1, 0x007C($sp) -/* 0032C 80B9191C 8FB20080 */ lw $s2, 0x0080($sp) -/* 00330 80B91920 8FB30084 */ lw $s3, 0x0084($sp) -/* 00334 80B91924 8FB40088 */ lw $s4, 0x0088($sp) -/* 00338 80B91928 8FB5008C */ lw $s5, 0x008C($sp) -/* 0033C 80B9192C 8FB60090 */ lw $s6, 0x0090($sp) -/* 00340 80B91930 03E00008 */ jr $ra -/* 00344 80B91934 27BD00C0 */ addiu $sp, $sp, 0x00C0 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Comb/ObjComb_Destroy.s b/asm/non_matchings/overlays/actors/ovl_Obj_Comb/ObjComb_Destroy.s deleted file mode 100644 index e024fef6d4..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Comb/ObjComb_Destroy.s +++ /dev/null @@ -1,13 +0,0 @@ -glabel ObjComb_Destroy -/* 00428 80B91F88 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 0042C 80B91F8C 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 -/* 00430 80B91F90 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00434 80B91F94 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 00438 80B91F98 0C016F32 */ jal func_8005BCC8 -/* 0043C 80B91F9C 24E50150 */ addiu $a1, $a3, 0x0150 ## $a1 = 00000150 -/* 00440 80B91FA0 8FBF0014 */ lw $ra, 0x0014($sp) -/* 00444 80B91FA4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00448 80B91FA8 03E00008 */ jr $ra -/* 0044C 80B91FAC 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Comb/ObjComb_Draw.s b/asm/non_matchings/overlays/actors/ovl_Obj_Comb/ObjComb_Draw.s deleted file mode 100644 index 849b4fd9aa..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Comb/ObjComb_Draw.s +++ /dev/null @@ -1,107 +0,0 @@ -glabel ObjComb_Draw -/* 005BC 80B9211C 27BDFFB8 */ addiu $sp, $sp, 0xFFB8 ## $sp = FFFFFFB8 -/* 005C0 80B92120 AFBF001C */ sw $ra, 0x001C($sp) -/* 005C4 80B92124 AFB10018 */ sw $s1, 0x0018($sp) -/* 005C8 80B92128 AFB00014 */ sw $s0, 0x0014($sp) -/* 005CC 80B9212C AFA5004C */ sw $a1, 0x004C($sp) -/* 005D0 80B92130 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 -/* 005D4 80B92134 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 005D8 80B92138 3C0680B9 */ lui $a2, %hi(D_80B92330) ## $a2 = 80B90000 -/* 005DC 80B9213C 24C62330 */ addiu $a2, $a2, %lo(D_80B92330) ## $a2 = 80B92330 -/* 005E0 80B92140 27A40030 */ addiu $a0, $sp, 0x0030 ## $a0 = FFFFFFE8 -/* 005E4 80B92144 24070171 */ addiu $a3, $zero, 0x0171 ## $a3 = 00000171 -/* 005E8 80B92148 0C031AB1 */ jal func_800C6AC4 -/* 005EC 80B9214C 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 -/* 005F0 80B92150 8FAF004C */ lw $t7, 0x004C($sp) -/* 005F4 80B92154 0C024F46 */ jal func_80093D18 -/* 005F8 80B92158 8DE40000 */ lw $a0, 0x0000($t7) ## 00000000 -/* 005FC 80B9215C 3C0142EC */ lui $at, 0x42EC ## $at = 42EC0000 -/* 00600 80B92160 44812000 */ mtc1 $at, $f4 ## $f4 = 118.00 -/* 00604 80B92164 C6060054 */ lwc1 $f6, 0x0054($s0) ## 00000054 -/* 00608 80B92168 C60A0028 */ lwc1 $f10, 0x0028($s0) ## 00000028 -/* 0060C 80B9216C C60C0024 */ lwc1 $f12, 0x0024($s0) ## 00000024 -/* 00610 80B92170 46062202 */ mul.s $f8, $f4, $f6 -/* 00614 80B92174 8E06002C */ lw $a2, 0x002C($s0) ## 0000002C -/* 00618 80B92178 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 0061C 80B9217C 0C034261 */ jal Matrix_Translate -/* 00620 80B92180 46085380 */ add.s $f14, $f10, $f8 -/* 00624 80B92184 861800B6 */ lh $t8, 0x00B6($s0) ## 000000B6 -/* 00628 80B92188 3C0180B9 */ lui $at, %hi(D_80B92370) ## $at = 80B90000 -/* 0062C 80B9218C C4242370 */ lwc1 $f4, %lo(D_80B92370)($at) -/* 00630 80B92190 44988000 */ mtc1 $t8, $f16 ## $f16 = 0.00 -/* 00634 80B92194 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 -/* 00638 80B92198 468084A0 */ cvt.s.w $f18, $f16 -/* 0063C 80B9219C 46049302 */ mul.s $f12, $f18, $f4 -/* 00640 80B921A0 0C034348 */ jal Matrix_RotateY -/* 00644 80B921A4 00000000 */ nop -/* 00648 80B921A8 861900B4 */ lh $t9, 0x00B4($s0) ## 000000B4 -/* 0064C 80B921AC 3C0180B9 */ lui $at, %hi(D_80B92374) ## $at = 80B90000 -/* 00650 80B921B0 C4282374 */ lwc1 $f8, %lo(D_80B92374)($at) -/* 00654 80B921B4 44993000 */ mtc1 $t9, $f6 ## $f6 = 0.00 -/* 00658 80B921B8 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 -/* 0065C 80B921BC 468032A0 */ cvt.s.w $f10, $f6 -/* 00660 80B921C0 46085302 */ mul.s $f12, $f10, $f8 -/* 00664 80B921C4 0C0342DC */ jal Matrix_RotateX -/* 00668 80B921C8 00000000 */ nop -/* 0066C 80B921CC 860800B8 */ lh $t0, 0x00B8($s0) ## 000000B8 -/* 00670 80B921D0 3C0180B9 */ lui $at, %hi(D_80B92378) ## $at = 80B90000 -/* 00674 80B921D4 C4242378 */ lwc1 $f4, %lo(D_80B92378)($at) -/* 00678 80B921D8 44888000 */ mtc1 $t0, $f16 ## $f16 = 0.00 -/* 0067C 80B921DC 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 -/* 00680 80B921E0 468084A0 */ cvt.s.w $f18, $f16 -/* 00684 80B921E4 46049302 */ mul.s $f12, $f18, $f4 -/* 00688 80B921E8 0C0343B5 */ jal Matrix_RotateZ -/* 0068C 80B921EC 00000000 */ nop -/* 00690 80B921F0 3C0142EC */ lui $at, 0x42EC ## $at = 42EC0000 -/* 00694 80B921F4 44815000 */ mtc1 $at, $f10 ## $f10 = 118.00 -/* 00698 80B921F8 C6060054 */ lwc1 $f6, 0x0054($s0) ## 00000054 -/* 0069C 80B921FC 44806000 */ mtc1 $zero, $f12 ## $f12 = 0.00 -/* 006A0 80B92200 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 006A4 80B92204 460A3382 */ mul.s $f14, $f6, $f10 -/* 006A8 80B92208 44066000 */ mfc1 $a2, $f12 -/* 006AC 80B9220C 0C034261 */ jal Matrix_Translate -/* 006B0 80B92210 46007387 */ neg.s $f14, $f14 -/* 006B4 80B92214 C60C0050 */ lwc1 $f12, 0x0050($s0) ## 00000050 -/* 006B8 80B92218 C60E0054 */ lwc1 $f14, 0x0054($s0) ## 00000054 -/* 006BC 80B9221C 8E060058 */ lw $a2, 0x0058($s0) ## 00000058 -/* 006C0 80B92220 0C0342A3 */ jal Matrix_Scale -/* 006C4 80B92224 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 006C8 80B92228 8E2202C0 */ lw $v0, 0x02C0($s1) ## 000002C0 -/* 006CC 80B9222C 3C0ADA38 */ lui $t2, 0xDA38 ## $t2 = DA380000 -/* 006D0 80B92230 354A0003 */ ori $t2, $t2, 0x0003 ## $t2 = DA380003 -/* 006D4 80B92234 24490008 */ addiu $t1, $v0, 0x0008 ## $t1 = 00000008 -/* 006D8 80B92238 AE2902C0 */ sw $t1, 0x02C0($s1) ## 000002C0 -/* 006DC 80B9223C AC4A0000 */ sw $t2, 0x0000($v0) ## 00000000 -/* 006E0 80B92240 8FAB004C */ lw $t3, 0x004C($sp) -/* 006E4 80B92244 3C0580B9 */ lui $a1, %hi(D_80B92340) ## $a1 = 80B90000 -/* 006E8 80B92248 24A52340 */ addiu $a1, $a1, %lo(D_80B92340) ## $a1 = 80B92340 -/* 006EC 80B9224C 8D640000 */ lw $a0, 0x0000($t3) ## 00000000 -/* 006F0 80B92250 2406018A */ addiu $a2, $zero, 0x018A ## $a2 = 0000018A -/* 006F4 80B92254 0C0346A2 */ jal Matrix_NewMtx -/* 006F8 80B92258 AFA2002C */ sw $v0, 0x002C($sp) -/* 006FC 80B9225C 8FA3002C */ lw $v1, 0x002C($sp) -/* 00700 80B92260 3C0E0501 */ lui $t6, 0x0501 ## $t6 = 05010000 -/* 00704 80B92264 25CE95B0 */ addiu $t6, $t6, 0x95B0 ## $t6 = 050095B0 -/* 00708 80B92268 AC620004 */ sw $v0, 0x0004($v1) ## 00000004 -/* 0070C 80B9226C 8E2202C0 */ lw $v0, 0x02C0($s1) ## 000002C0 -/* 00710 80B92270 3C0DDE00 */ lui $t5, 0xDE00 ## $t5 = DE000000 -/* 00714 80B92274 00002025 */ or $a0, $zero, $zero ## $a0 = 00000000 -/* 00718 80B92278 244C0008 */ addiu $t4, $v0, 0x0008 ## $t4 = 00000008 -/* 0071C 80B9227C AE2C02C0 */ sw $t4, 0x02C0($s1) ## 000002C0 -/* 00720 80B92280 26050150 */ addiu $a1, $s0, 0x0150 ## $a1 = 00000150 -/* 00724 80B92284 AC4E0004 */ sw $t6, 0x0004($v0) ## 00000004 -/* 00728 80B92288 0C018A29 */ jal func_800628A4 -/* 0072C 80B9228C AC4D0000 */ sw $t5, 0x0000($v0) ## 00000000 -/* 00730 80B92290 8FAF004C */ lw $t7, 0x004C($sp) -/* 00734 80B92294 3C0680B9 */ lui $a2, %hi(D_80B92350) ## $a2 = 80B90000 -/* 00738 80B92298 24C62350 */ addiu $a2, $a2, %lo(D_80B92350) ## $a2 = 80B92350 -/* 0073C 80B9229C 27A40030 */ addiu $a0, $sp, 0x0030 ## $a0 = FFFFFFE8 -/* 00740 80B922A0 24070192 */ addiu $a3, $zero, 0x0192 ## $a3 = 00000192 -/* 00744 80B922A4 0C031AD5 */ jal func_800C6B54 -/* 00748 80B922A8 8DE50000 */ lw $a1, 0x0000($t7) ## 00000000 -/* 0074C 80B922AC 8FBF001C */ lw $ra, 0x001C($sp) -/* 00750 80B922B0 8FB00014 */ lw $s0, 0x0014($sp) -/* 00754 80B922B4 8FB10018 */ lw $s1, 0x0018($sp) -/* 00758 80B922B8 03E00008 */ jr $ra -/* 0075C 80B922BC 27BD0048 */ addiu $sp, $sp, 0x0048 ## $sp = 00000000 - diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Comb/ObjComb_Init.s b/asm/non_matchings/overlays/actors/ovl_Obj_Comb/ObjComb_Init.s deleted file mode 100644 index 4ee9f4cfb4..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Comb/ObjComb_Init.s +++ /dev/null @@ -1,31 +0,0 @@ -glabel ObjComb_Init -/* 003BC 80B91F1C 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 003C0 80B91F20 AFA50034 */ sw $a1, 0x0034($sp) -/* 003C4 80B91F24 AFBF0024 */ sw $ra, 0x0024($sp) -/* 003C8 80B91F28 AFB00020 */ sw $s0, 0x0020($sp) -/* 003CC 80B91F2C 3C0580B9 */ lui $a1, %hi(D_80B92314) ## $a1 = 80B90000 -/* 003D0 80B91F30 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 003D4 80B91F34 0C01E037 */ jal Actor_ProcessInitChain - -/* 003D8 80B91F38 24A52314 */ addiu $a1, $a1, %lo(D_80B92314) ## $a1 = 80B92314 -/* 003DC 80B91F3C 26050150 */ addiu $a1, $s0, 0x0150 ## $a1 = 00000150 -/* 003E0 80B91F40 AFA50028 */ sw $a1, 0x0028($sp) -/* 003E4 80B91F44 0C016EFE */ jal func_8005BBF8 -/* 003E8 80B91F48 8FA40034 */ lw $a0, 0x0034($sp) -/* 003EC 80B91F4C 3C0780B9 */ lui $a3, %hi(D_80B92304) ## $a3 = 80B90000 -/* 003F0 80B91F50 260E0170 */ addiu $t6, $s0, 0x0170 ## $t6 = 00000170 -/* 003F4 80B91F54 8FA50028 */ lw $a1, 0x0028($sp) -/* 003F8 80B91F58 AFAE0010 */ sw $t6, 0x0010($sp) -/* 003FC 80B91F5C 24E72304 */ addiu $a3, $a3, %lo(D_80B92304) ## $a3 = 80B92304 -/* 00400 80B91F60 8FA40034 */ lw $a0, 0x0034($sp) -/* 00404 80B91F64 0C017014 */ jal func_8005C050 -/* 00408 80B91F68 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 -/* 0040C 80B91F6C 0C2E47EC */ jal func_80B91FB0 -/* 00410 80B91F70 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00414 80B91F74 8FBF0024 */ lw $ra, 0x0024($sp) -/* 00418 80B91F78 8FB00020 */ lw $s0, 0x0020($sp) -/* 0041C 80B91F7C 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 00420 80B91F80 03E00008 */ jr $ra -/* 00424 80B91F84 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Comb/ObjComb_Update.s b/asm/non_matchings/overlays/actors/ovl_Obj_Comb/ObjComb_Update.s deleted file mode 100644 index 2590d5e10e..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Comb/ObjComb_Update.s +++ /dev/null @@ -1,33 +0,0 @@ -glabel ObjComb_Update -/* 00548 80B920A8 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 0054C 80B920AC AFBF0014 */ sw $ra, 0x0014($sp) -/* 00550 80B920B0 848E01B2 */ lh $t6, 0x01B2($a0) ## 000001B2 -/* 00554 80B920B4 25CF2EE0 */ addiu $t7, $t6, 0x2EE0 ## $t7 = 00002EE0 -/* 00558 80B920B8 A48F01B2 */ sh $t7, 0x01B2($a0) ## 000001B2 -/* 0055C 80B920BC AFA40018 */ sw $a0, 0x0018($sp) -/* 00560 80B920C0 8C99014C */ lw $t9, 0x014C($a0) ## 0000014C -/* 00564 80B920C4 0320F809 */ jalr $ra, $t9 -/* 00568 80B920C8 00000000 */ nop -/* 0056C 80B920CC 8FA60018 */ lw $a2, 0x0018($sp) -/* 00570 80B920D0 0C01DE1C */ jal Math_Sins - ## sins? -/* 00574 80B920D4 84C401B2 */ lh $a0, 0x01B2($a2) ## 000001B2 -/* 00578 80B920D8 8FA60018 */ lw $a2, 0x0018($sp) -/* 0057C 80B920DC 84D801B0 */ lh $t8, 0x01B0($a2) ## 000001B0 -/* 00580 80B920E0 84C80014 */ lh $t0, 0x0014($a2) ## 00000014 -/* 00584 80B920E4 44982000 */ mtc1 $t8, $f4 ## $f4 = 0.00 -/* 00588 80B920E8 44885000 */ mtc1 $t0, $f10 ## $f10 = 0.00 -/* 0058C 80B920EC 468021A0 */ cvt.s.w $f6, $f4 -/* 00590 80B920F0 46805420 */ cvt.s.w $f16, $f10 -/* 00594 80B920F4 46060202 */ mul.s $f8, $f0, $f6 -/* 00598 80B920F8 46104480 */ add.s $f18, $f8, $f16 -/* 0059C 80B920FC 4600910D */ trunc.w.s $f4, $f18 -/* 005A0 80B92100 440A2000 */ mfc1 $t2, $f4 -/* 005A4 80B92104 00000000 */ nop -/* 005A8 80B92108 A4CA00B4 */ sh $t2, 0x00B4($a2) ## 000000B4 -/* 005AC 80B9210C 8FBF0014 */ lw $ra, 0x0014($sp) -/* 005B0 80B92110 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 005B4 80B92114 03E00008 */ jr $ra -/* 005B8 80B92118 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Comb/func_80B91B60.s b/asm/non_matchings/overlays/actors/ovl_Obj_Comb/func_80B91B60.s deleted file mode 100644 index f3a13cb60e..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Comb/func_80B91B60.s +++ /dev/null @@ -1,206 +0,0 @@ -glabel func_80B91B60 -/* 00000 80B91B60 27BDFF18 */ addiu $sp, $sp, 0xFF18 ## $sp = FFFFFF18 -/* 00004 80B91B64 F7BE0070 */ sdc1 $f30, 0x0070($sp) -/* 00008 80B91B68 3C0141C8 */ lui $at, 0x41C8 ## $at = 41C80000 -/* 0000C 80B91B6C 4481F000 */ mtc1 $at, $f30 ## $f30 = 25.00 -/* 00010 80B91B70 F7BC0068 */ sdc1 $f28, 0x0068($sp) -/* 00014 80B91B74 3C014290 */ lui $at, 0x4290 ## $at = 42900000 -/* 00018 80B91B78 4481E000 */ mtc1 $at, $f28 ## $f28 = 72.00 -/* 0001C 80B91B7C F7BA0060 */ sdc1 $f26, 0x0060($sp) -/* 00020 80B91B80 3C0180B9 */ lui $at, %hi(D_80B92360) ## $at = 80B90000 -/* 00024 80B91B84 C43A2360 */ lwc1 $f26, %lo(D_80B92360)($at) -/* 00028 80B91B88 F7B80058 */ sdc1 $f24, 0x0058($sp) -/* 0002C 80B91B8C 3C0180B9 */ lui $at, %hi(D_80B92364) ## $at = 80B90000 -/* 00030 80B91B90 C4382364 */ lwc1 $f24, %lo(D_80B92364)($at) -/* 00034 80B91B94 AFBE0098 */ sw $s8, 0x0098($sp) -/* 00038 80B91B98 F7B60050 */ sdc1 $f22, 0x0050($sp) -/* 0003C 80B91B9C 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 -/* 00040 80B91BA0 AFB70094 */ sw $s7, 0x0094($sp) -/* 00044 80B91BA4 AFB60090 */ sw $s6, 0x0090($sp) -/* 00048 80B91BA8 AFB5008C */ sw $s5, 0x008C($sp) -/* 0004C 80B91BAC AFB30084 */ sw $s3, 0x0084($sp) -/* 00050 80B91BB0 AFB20080 */ sw $s2, 0x0080($sp) -/* 00054 80B91BB4 3C1E0501 */ lui $s8, 0x0501 ## $s8 = 05010000 -/* 00058 80B91BB8 248F0024 */ addiu $t7, $a0, 0x0024 ## $t7 = 00000024 -/* 0005C 80B91BBC 4481B000 */ mtc1 $at, $f22 ## $f22 = 0.50 -/* 00060 80B91BC0 AFBF009C */ sw $ra, 0x009C($sp) -/* 00064 80B91BC4 AFB40088 */ sw $s4, 0x0088($sp) -/* 00068 80B91BC8 AFB1007C */ sw $s1, 0x007C($sp) -/* 0006C 80B91BCC AFB00078 */ sw $s0, 0x0078($sp) -/* 00070 80B91BD0 F7B40048 */ sdc1 $f20, 0x0048($sp) -/* 00074 80B91BD4 AFA400E8 */ sw $a0, 0x00E8($sp) -/* 00078 80B91BD8 AFA500EC */ sw $a1, 0x00EC($sp) -/* 0007C 80B91BDC 00009025 */ or $s2, $zero, $zero ## $s2 = 00000000 -/* 00080 80B91BE0 AFAF00A8 */ sw $t7, 0x00A8($sp) -/* 00084 80B91BE4 27DE9940 */ addiu $s8, $s8, 0x9940 ## $s8 = 05009940 -/* 00088 80B91BE8 00009825 */ or $s3, $zero, $zero ## $s3 = 00000000 -/* 0008C 80B91BEC 27B500D0 */ addiu $s5, $sp, 0x00D0 ## $s5 = FFFFFFE8 -/* 00090 80B91BF0 27B600DC */ addiu $s6, $sp, 0x00DC ## $s6 = FFFFFFF4 -/* 00094 80B91BF4 27B700C4 */ addiu $s7, $sp, 0x00C4 ## $s7 = FFFFFFDC -/* 00098 80B91BF8 26524E20 */ addiu $s2, $s2, 0x4E20 ## $s2 = 00004E20 -.L80B91BFC: -/* 0009C 80B91BFC 00129400 */ sll $s2, $s2, 16 -/* 000A0 80B91C00 0C03F66B */ jal Math_Rand_ZeroOne - ## Rand.Next() float -/* 000A4 80B91C04 00129403 */ sra $s2, $s2, 16 -/* 000A8 80B91C08 3C014120 */ lui $at, 0x4120 ## $at = 41200000 -/* 000AC 80B91C0C 44812000 */ mtc1 $at, $f4 ## $f4 = 10.00 -/* 000B0 80B91C10 00122400 */ sll $a0, $s2, 16 -/* 000B4 80B91C14 00042403 */ sra $a0, $a0, 16 -/* 000B8 80B91C18 46040502 */ mul.s $f20, $f0, $f4 -/* 000BC 80B91C1C 0C01DE1C */ jal Math_Sins - ## sins? -/* 000C0 80B91C20 00000000 */ nop -/* 000C4 80B91C24 2678FFF1 */ addiu $t8, $s3, 0xFFF1 ## $t8 = FFFFFFF1 -/* 000C8 80B91C28 44984000 */ mtc1 $t8, $f8 ## $f8 = NaN -/* 000CC 80B91C2C 46140182 */ mul.s $f6, $f0, $f20 -/* 000D0 80B91C30 00122400 */ sll $a0, $s2, 16 -/* 000D4 80B91C34 00042403 */ sra $a0, $a0, 16 -/* 000D8 80B91C38 468042A0 */ cvt.s.w $f10, $f8 -/* 000DC 80B91C3C E7A600DC */ swc1 $f6, 0x00DC($sp) -/* 000E0 80B91C40 46185402 */ mul.s $f16, $f10, $f24 -/* 000E4 80B91C44 0C01DE0D */ jal Math_Coss - ## coss? -/* 000E8 80B91C48 E7B000E0 */ swc1 $f16, 0x00E0($sp) -/* 000EC 80B91C4C 46140482 */ mul.s $f18, $f0, $f20 -/* 000F0 80B91C50 02C02025 */ or $a0, $s6, $zero ## $a0 = FFFFFFF4 -/* 000F4 80B91C54 8FA500A8 */ lw $a1, 0x00A8($sp) -/* 000F8 80B91C58 02A03025 */ or $a2, $s5, $zero ## $a2 = FFFFFFE8 -/* 000FC 80B91C5C 0C01DFA7 */ jal Math_Vec3f_Sum - ## Vec3f_Add -/* 00100 80B91C60 E7B200E4 */ swc1 $f18, 0x00E4($sp) -/* 00104 80B91C64 0C03F66B */ jal Math_Rand_ZeroOne - ## Rand.Next() float -/* 00108 80B91C68 00000000 */ nop -/* 0010C 80B91C6C C7A600DC */ lwc1 $f6, 0x00DC($sp) -/* 00110 80B91C70 46160101 */ sub.s $f4, $f0, $f22 -/* 00114 80B91C74 46163202 */ mul.s $f8, $f6, $f22 -/* 00118 80B91C78 46082280 */ add.s $f10, $f4, $f8 -/* 0011C 80B91C7C 0C03F66B */ jal Math_Rand_ZeroOne - ## Rand.Next() float -/* 00120 80B91C80 E7AA00C4 */ swc1 $f10, 0x00C4($sp) -/* 00124 80B91C84 C7B200E0 */ lwc1 $f18, 0x00E0($sp) -/* 00128 80B91C88 46160401 */ sub.s $f16, $f0, $f22 -/* 0012C 80B91C8C 461A9182 */ mul.s $f6, $f18, $f26 -/* 00130 80B91C90 46068100 */ add.s $f4, $f16, $f6 -/* 00134 80B91C94 0C03F66B */ jal Math_Rand_ZeroOne - ## Rand.Next() float -/* 00138 80B91C98 E7A400C8 */ swc1 $f4, 0x00C8($sp) -/* 0013C 80B91C9C C7AA00E4 */ lwc1 $f10, 0x00E4($sp) -/* 00140 80B91CA0 46160201 */ sub.s $f8, $f0, $f22 -/* 00144 80B91CA4 46165482 */ mul.s $f18, $f10, $f22 -/* 00148 80B91CA8 46124400 */ add.s $f16, $f8, $f18 -/* 0014C 80B91CAC 0C03F66B */ jal Math_Rand_ZeroOne - ## Rand.Next() float -/* 00150 80B91CB0 E7B000CC */ swc1 $f16, 0x00CC($sp) -/* 00154 80B91CB4 461C0182 */ mul.s $f6, $f0, $f28 -/* 00158 80B91CB8 2410FF38 */ addiu $s0, $zero, 0xFF38 ## $s0 = FFFFFF38 -/* 0015C 80B91CBC 461E3100 */ add.s $f4, $f6, $f30 -/* 00160 80B91CC0 4600228D */ trunc.w.s $f10, $f4 -/* 00164 80B91CC4 44025000 */ mfc1 $v0, $f10 -/* 00168 80B91CC8 00000000 */ nop -/* 0016C 80B91CCC 00021C00 */ sll $v1, $v0, 16 -/* 00170 80B91CD0 00031C03 */ sra $v1, $v1, 16 -/* 00174 80B91CD4 28610028 */ slti $at, $v1, 0x0028 -/* 00178 80B91CD8 0002A400 */ sll $s4, $v0, 16 -/* 0017C 80B91CDC 10200003 */ beq $at, $zero, .L80B91CEC -/* 00180 80B91CE0 0014A403 */ sra $s4, $s4, 16 -/* 00184 80B91CE4 10000008 */ beq $zero, $zero, .L80B91D08 -/* 00188 80B91CE8 24110028 */ addiu $s1, $zero, 0x0028 ## $s1 = 00000028 -.L80B91CEC: -/* 0018C 80B91CEC 28610046 */ slti $at, $v1, 0x0046 -/* 00190 80B91CF0 10200004 */ beq $at, $zero, .L80B91D04 -/* 00194 80B91CF4 2410FEAC */ addiu $s0, $zero, 0xFEAC ## $s0 = FFFFFEAC -/* 00198 80B91CF8 2410FEE8 */ addiu $s0, $zero, 0xFEE8 ## $s0 = FFFFFEE8 -/* 0019C 80B91CFC 10000002 */ beq $zero, $zero, .L80B91D08 -/* 001A0 80B91D00 2411001E */ addiu $s1, $zero, 0x001E ## $s1 = 0000001E -.L80B91D04: -/* 001A4 80B91D04 24110014 */ addiu $s1, $zero, 0x0014 ## $s1 = 00000014 -.L80B91D08: -/* 001A8 80B91D08 0C03F66B */ jal Math_Rand_ZeroOne - ## Rand.Next() float -/* 001AC 80B91D0C 00000000 */ nop -/* 001B0 80B91D10 3C0180B9 */ lui $at, %hi(D_80B92368) ## $at = 80B90000 -/* 001B4 80B91D14 C4282368 */ lwc1 $f8, %lo(D_80B92368)($at) -/* 001B8 80B91D18 8FA400EC */ lw $a0, 0x00EC($sp) -/* 001BC 80B91D1C 02A02825 */ or $a1, $s5, $zero ## $a1 = FFFFFFE8 -/* 001C0 80B91D20 4608003C */ c.lt.s $f0, $f8 -/* 001C4 80B91D24 02E03025 */ or $a2, $s7, $zero ## $a2 = FFFFFFDC -/* 001C8 80B91D28 02A03825 */ or $a3, $s5, $zero ## $a3 = FFFFFFE8 -/* 001CC 80B91D2C 24080004 */ addiu $t0, $zero, 0x0004 ## $t0 = 00000004 -/* 001D0 80B91D30 45000003 */ bc1f .L80B91D40 -/* 001D4 80B91D34 24090050 */ addiu $t1, $zero, 0x0050 ## $t1 = 00000050 -/* 001D8 80B91D38 1000000A */ beq $zero, $zero, .L80B91D64 -/* 001DC 80B91D3C 24020060 */ addiu $v0, $zero, 0x0060 ## $v0 = 00000060 -.L80B91D40: -/* 001E0 80B91D40 3C0180B9 */ lui $at, %hi(D_80B9236C) ## $at = 80B90000 -/* 001E4 80B91D44 C432236C */ lwc1 $f18, %lo(D_80B9236C)($at) -/* 001E8 80B91D48 24020020 */ addiu $v0, $zero, 0x0020 ## $v0 = 00000020 -/* 001EC 80B91D4C 4612003C */ c.lt.s $f0, $f18 -/* 001F0 80B91D50 00000000 */ nop -/* 001F4 80B91D54 45000003 */ bc1f .L80B91D64 -/* 001F8 80B91D58 00000000 */ nop -/* 001FC 80B91D5C 10000001 */ beq $zero, $zero, .L80B91D64 -/* 00200 80B91D60 24020040 */ addiu $v0, $zero, 0x0040 ## $v0 = 00000040 -.L80B91D64: -/* 00204 80B91D64 240AFFFF */ addiu $t2, $zero, 0xFFFF ## $t2 = FFFFFFFF -/* 00208 80B91D68 240B0002 */ addiu $t3, $zero, 0x0002 ## $t3 = 00000002 -/* 0020C 80B91D6C AFAB0038 */ sw $t3, 0x0038($sp) -/* 00210 80B91D70 AFAA0034 */ sw $t2, 0x0034($sp) -/* 00214 80B91D74 AFB00010 */ sw $s0, 0x0010($sp) -/* 00218 80B91D78 AFA20014 */ sw $v0, 0x0014($sp) -/* 0021C 80B91D7C AFB10018 */ sw $s1, 0x0018($sp) -/* 00220 80B91D80 AFA8001C */ sw $t0, 0x001C($sp) -/* 00224 80B91D84 AFA00020 */ sw $zero, 0x0020($sp) -/* 00228 80B91D88 AFB40024 */ sw $s4, 0x0024($sp) -/* 0022C 80B91D8C AFA00028 */ sw $zero, 0x0028($sp) -/* 00230 80B91D90 AFA0002C */ sw $zero, 0x002C($sp) -/* 00234 80B91D94 AFA90030 */ sw $t1, 0x0030($sp) -/* 00238 80B91D98 0C00A7A3 */ jal Effect_SpawnFragment - -/* 0023C 80B91D9C AFBE003C */ sw $s8, 0x003C($sp) -/* 00240 80B91DA0 26730001 */ addiu $s3, $s3, 0x0001 ## $s3 = 00000001 -/* 00244 80B91DA4 2401001F */ addiu $at, $zero, 0x001F ## $at = 0000001F -/* 00248 80B91DA8 5661FF94 */ bnel $s3, $at, .L80B91BFC -/* 0024C 80B91DAC 26524E20 */ addiu $s2, $s2, 0x4E20 ## $s2 = 00009C40 -/* 00250 80B91DB0 8FAC00E8 */ lw $t4, 0x00E8($sp) -/* 00254 80B91DB4 3C014120 */ lui $at, 0x4120 ## $at = 41200000 -/* 00258 80B91DB8 44812000 */ mtc1 $at, $f4 ## $f4 = 10.00 -/* 0025C 80B91DBC C5900024 */ lwc1 $f16, 0x0024($t4) ## 00000024 -/* 00260 80B91DC0 240D0046 */ addiu $t5, $zero, 0x0046 ## $t5 = 00000046 -/* 00264 80B91DC4 240E003C */ addiu $t6, $zero, 0x003C ## $t6 = 0000003C -/* 00268 80B91DC8 E7B000D0 */ swc1 $f16, 0x00D0($sp) -/* 0026C 80B91DCC C5860028 */ lwc1 $f6, 0x0028($t4) ## 00000028 -/* 00270 80B91DD0 240F0001 */ addiu $t7, $zero, 0x0001 ## $t7 = 00000001 -/* 00274 80B91DD4 8FA400EC */ lw $a0, 0x00EC($sp) -/* 00278 80B91DD8 46043281 */ sub.s $f10, $f6, $f4 -/* 0027C 80B91DDC 02A02825 */ or $a1, $s5, $zero ## $a1 = FFFFFFE8 -/* 00280 80B91DE0 3C064220 */ lui $a2, 0x4220 ## $a2 = 42200000 -/* 00284 80B91DE4 24070006 */ addiu $a3, $zero, 0x0006 ## $a3 = 00000006 -/* 00288 80B91DE8 E7AA00D4 */ swc1 $f10, 0x00D4($sp) -/* 0028C 80B91DEC C588002C */ lwc1 $f8, 0x002C($t4) ## 0000002C -/* 00290 80B91DF0 AFAF0018 */ sw $t7, 0x0018($sp) -/* 00294 80B91DF4 AFAE0014 */ sw $t6, 0x0014($sp) -/* 00298 80B91DF8 AFAD0010 */ sw $t5, 0x0010($sp) -/* 0029C 80B91DFC 0C00CD20 */ jal func_80033480 -/* 002A0 80B91E00 E7A800D8 */ swc1 $f8, 0x00D8($sp) -/* 002A4 80B91E04 8FBF009C */ lw $ra, 0x009C($sp) -/* 002A8 80B91E08 D7B40048 */ ldc1 $f20, 0x0048($sp) -/* 002AC 80B91E0C D7B60050 */ ldc1 $f22, 0x0050($sp) -/* 002B0 80B91E10 D7B80058 */ ldc1 $f24, 0x0058($sp) -/* 002B4 80B91E14 D7BA0060 */ ldc1 $f26, 0x0060($sp) -/* 002B8 80B91E18 D7BC0068 */ ldc1 $f28, 0x0068($sp) -/* 002BC 80B91E1C D7BE0070 */ ldc1 $f30, 0x0070($sp) -/* 002C0 80B91E20 8FB00078 */ lw $s0, 0x0078($sp) -/* 002C4 80B91E24 8FB1007C */ lw $s1, 0x007C($sp) -/* 002C8 80B91E28 8FB20080 */ lw $s2, 0x0080($sp) -/* 002CC 80B91E2C 8FB30084 */ lw $s3, 0x0084($sp) -/* 002D0 80B91E30 8FB40088 */ lw $s4, 0x0088($sp) -/* 002D4 80B91E34 8FB5008C */ lw $s5, 0x008C($sp) -/* 002D8 80B91E38 8FB60090 */ lw $s6, 0x0090($sp) -/* 002DC 80B91E3C 8FB70094 */ lw $s7, 0x0094($sp) -/* 002E0 80B91E40 8FBE0098 */ lw $s8, 0x0098($sp) -/* 002E4 80B91E44 03E00008 */ jr $ra -/* 002E8 80B91E48 27BD00E8 */ addiu $sp, $sp, 0x00E8 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Comb/func_80B91E4C.s b/asm/non_matchings/overlays/actors/ovl_Obj_Comb/func_80B91E4C.s deleted file mode 100644 index 23bd2d93bc..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Comb/func_80B91E4C.s +++ /dev/null @@ -1,63 +0,0 @@ -glabel func_80B91E4C -/* 002EC 80B91E4C 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 002F0 80B91E50 AFBF0014 */ sw $ra, 0x0014($sp) -/* 002F4 80B91E54 AFA50024 */ sw $a1, 0x0024($sp) -/* 002F8 80B91E58 8482001C */ lh $v0, 0x001C($a0) ## 0000001C -/* 002FC 80B91E5C 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000 -/* 00300 80B91E60 3046001F */ andi $a2, $v0, 0x001F ## $a2 = 00000000 -/* 00304 80B91E64 00063400 */ sll $a2, $a2, 16 -/* 00308 80B91E68 00063403 */ sra $a2, $a2, 16 -/* 0030C 80B91E6C 1CC00002 */ bgtz $a2, .L80B91E78 -/* 00310 80B91E70 28C1001A */ slti $at, $a2, 0x001A -/* 00314 80B91E74 10200025 */ beq $at, $zero, .L80B91F0C -.L80B91E78: -/* 00318 80B91E78 24010006 */ addiu $at, $zero, 0x0006 ## $at = 00000006 -/* 0031C 80B91E7C 14C10013 */ bne $a2, $at, .L80B91ECC -/* 00320 80B91E80 8FA40024 */ lw $a0, 0x0024($sp) -/* 00324 80B91E84 00022A03 */ sra $a1, $v0, 8 -/* 00328 80B91E88 30A5003F */ andi $a1, $a1, 0x003F ## $a1 = 00000000 -/* 0032C 80B91E8C A7A6001E */ sh $a2, 0x001E($sp) -/* 00330 80B91E90 0C00B35B */ jal Flags_GetCollectible - -/* 00334 80B91E94 AFA70020 */ sw $a3, 0x0020($sp) -/* 00338 80B91E98 87A6001E */ lh $a2, 0x001E($sp) -/* 0033C 80B91E9C 10400003 */ beq $v0, $zero, .L80B91EAC -/* 00340 80B91EA0 8FA70020 */ lw $a3, 0x0020($sp) -/* 00344 80B91EA4 10000015 */ beq $zero, $zero, .L80B91EFC -/* 00348 80B91EA8 2406FFFF */ addiu $a2, $zero, 0xFFFF ## $a2 = FFFFFFFF -.L80B91EAC: -/* 0034C 80B91EAC 84EE001C */ lh $t6, 0x001C($a3) ## 0000001C -/* 00350 80B91EB0 000E7A03 */ sra $t7, $t6, 8 -/* 00354 80B91EB4 31F8003F */ andi $t8, $t7, 0x003F ## $t8 = 00000000 -/* 00358 80B91EB8 0018CA00 */ sll $t9, $t8, 8 -/* 0035C 80B91EBC 00D93025 */ or $a2, $a2, $t9 ## $a2 = FFFFFFFF -/* 00360 80B91EC0 00063400 */ sll $a2, $a2, 16 -/* 00364 80B91EC4 1000000D */ beq $zero, $zero, .L80B91EFC -/* 00368 80B91EC8 00063403 */ sra $a2, $a2, 16 -.L80B91ECC: -/* 0036C 80B91ECC A7A6001E */ sh $a2, 0x001E($sp) -/* 00370 80B91ED0 0C03F66B */ jal Math_Rand_ZeroOne - ## Rand.Next() float -/* 00374 80B91ED4 AFA70020 */ sw $a3, 0x0020($sp) -/* 00378 80B91ED8 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 -/* 0037C 80B91EDC 44812000 */ mtc1 $at, $f4 ## $f4 = 0.50 -/* 00380 80B91EE0 87A6001E */ lh $a2, 0x001E($sp) -/* 00384 80B91EE4 8FA70020 */ lw $a3, 0x0020($sp) -/* 00388 80B91EE8 4604003C */ c.lt.s $f0, $f4 -/* 0038C 80B91EEC 00000000 */ nop -/* 00390 80B91EF0 45000002 */ bc1f .L80B91EFC -/* 00394 80B91EF4 00000000 */ nop -/* 00398 80B91EF8 2406FFFF */ addiu $a2, $zero, 0xFFFF ## $a2 = FFFFFFFF -.L80B91EFC: -/* 0039C 80B91EFC 04C00003 */ bltz $a2, .L80B91F0C -/* 003A0 80B91F00 8FA40024 */ lw $a0, 0x0024($sp) -/* 003A4 80B91F04 0C007D52 */ jal Item_DropCollectible - -/* 003A8 80B91F08 24E50024 */ addiu $a1, $a3, 0x0024 ## $a1 = 00000024 -.L80B91F0C: -/* 003AC 80B91F0C 8FBF0014 */ lw $ra, 0x0014($sp) -/* 003B0 80B91F10 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 003B4 80B91F14 03E00008 */ jr $ra -/* 003B8 80B91F18 00000000 */ nop - - diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Comb/func_80B91FB0.s b/asm/non_matchings/overlays/actors/ovl_Obj_Comb/func_80B91FB0.s deleted file mode 100644 index 8f3e4998a7..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Comb/func_80B91FB0.s +++ /dev/null @@ -1,7 +0,0 @@ -glabel func_80B91FB0 -/* 00450 80B91FB0 3C0E80B9 */ lui $t6, %hi(func_80B91FC0) ## $t6 = 80B90000 -/* 00454 80B91FB4 25CE1FC0 */ addiu $t6, $t6, %lo(func_80B91FC0) ## $t6 = 80B91FC0 -/* 00458 80B91FB8 03E00008 */ jr $ra -/* 0045C 80B91FBC AC8E014C */ sw $t6, 0x014C($a0) ## 0000014C - - diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Comb/func_80B91FC0.s b/asm/non_matchings/overlays/actors/ovl_Obj_Comb/func_80B91FC0.s deleted file mode 100644 index 2ab4307bee..0000000000 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Comb/func_80B91FC0.s +++ /dev/null @@ -1,70 +0,0 @@ -glabel func_80B91FC0 -/* 00460 80B91FC0 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 00464 80B91FC4 AFBF001C */ sw $ra, 0x001C($sp) -/* 00468 80B91FC8 AFB10018 */ sw $s1, 0x0018($sp) -/* 0046C 80B91FCC AFB00014 */ sw $s0, 0x0014($sp) -/* 00470 80B91FD0 848E01B0 */ lh $t6, 0x01B0($a0) ## 000001B0 -/* 00474 80B91FD4 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 00478 80B91FD8 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 -/* 0047C 80B91FDC 25CFFFCE */ addiu $t7, $t6, 0xFFCE ## $t7 = FFFFFFCE -/* 00480 80B91FE0 A48F01B0 */ sh $t7, 0x01B0($a0) ## 000001B0 -/* 00484 80B91FE4 849801B0 */ lh $t8, 0x01B0($a0) ## 000001B0 -/* 00488 80B91FE8 34211E60 */ ori $at, $at, 0x1E60 ## $at = 00011E60 -/* 0048C 80B91FEC 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00490 80B91FF0 07010002 */ bgez $t8, .L80B91FFC -/* 00494 80B91FF4 02212821 */ addu $a1, $s1, $at -/* 00498 80B91FF8 A48001B0 */ sh $zero, 0x01B0($a0) ## 000001B0 -.L80B91FFC: -/* 0049C 80B91FFC 92030161 */ lbu $v1, 0x0161($s0) ## 00000161 -/* 004A0 80B92000 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 004A4 80B92004 30790002 */ andi $t9, $v1, 0x0002 ## $t9 = 00000000 -/* 004A8 80B92008 13200018 */ beq $t9, $zero, .L80B9206C -/* 004AC 80B9200C 00000000 */ nop -/* 004B0 80B92010 8E09016C */ lw $t1, 0x016C($s0) ## 0000016C -/* 004B4 80B92014 3068FFFD */ andi $t0, $v1, 0xFFFD ## $t0 = 00000000 -/* 004B8 80B92018 A2080161 */ sb $t0, 0x0161($s0) ## 00000161 -/* 004BC 80B9201C 8D2A0024 */ lw $t2, 0x0024($t1) ## 00000024 -/* 004C0 80B92020 3C014001 */ lui $at, 0x4001 ## $at = 40010000 -/* 004C4 80B92024 3421F866 */ ori $at, $at, 0xF866 ## $at = 4001F866 -/* 004C8 80B92028 8D420000 */ lw $v0, 0x0000($t2) ## 00000000 -/* 004CC 80B9202C 240C05DC */ addiu $t4, $zero, 0x05DC ## $t4 = 000005DC -/* 004D0 80B92030 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 004D4 80B92034 00415824 */ and $t3, $v0, $at -/* 004D8 80B92038 11600003 */ beq $t3, $zero, .L80B92048 -/* 004DC 80B9203C 00000000 */ nop -/* 004E0 80B92040 1000000C */ beq $zero, $zero, .L80B92074 -/* 004E4 80B92044 A60C01B0 */ sh $t4, 0x01B0($s0) ## 000001B0 -.L80B92048: -/* 004E8 80B92048 0C2E46D8 */ jal func_80B91B60 -/* 004EC 80B9204C 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 004F0 80B92050 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 004F4 80B92054 0C2E4793 */ jal func_80B91E4C -/* 004F8 80B92058 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 004FC 80B9205C 0C00B55C */ jal Actor_Kill - -/* 00500 80B92060 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00504 80B92064 10000004 */ beq $zero, $zero, .L80B92078 -/* 00508 80B92068 8E0D0130 */ lw $t5, 0x0130($s0) ## 00000130 -.L80B9206C: -/* 0050C 80B9206C 0C01767D */ jal Actor_CollisionCheck_SetAC - ## CollisionCheck_setAC -/* 00510 80B92070 26060150 */ addiu $a2, $s0, 0x0150 ## $a2 = 00000150 -.L80B92074: -/* 00514 80B92074 8E0D0130 */ lw $t5, 0x0130($s0) ## 00000130 -.L80B92078: -/* 00518 80B92078 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 0051C 80B9207C 34211E60 */ ori $at, $at, 0x1E60 ## $at = 00011E60 -/* 00520 80B92080 11A00004 */ beq $t5, $zero, .L80B92094 -/* 00524 80B92084 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 00528 80B92088 02212821 */ addu $a1, $s1, $at -/* 0052C 80B9208C 0C017713 */ jal Actor_CollisionCheck_SetOT - ## CollisionCheck_setOT -/* 00530 80B92090 26060150 */ addiu $a2, $s0, 0x0150 ## $a2 = 00000150 -.L80B92094: -/* 00534 80B92094 8FBF001C */ lw $ra, 0x001C($sp) -/* 00538 80B92098 8FB00014 */ lw $s0, 0x0014($sp) -/* 0053C 80B9209C 8FB10018 */ lw $s1, 0x0018($sp) -/* 00540 80B920A0 03E00008 */ jr $ra -/* 00544 80B920A4 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 - - diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Dekujr/ObjDekujr_Draw.s b/asm/non_matchings/overlays/actors/ovl_Obj_Dekujr/ObjDekujr_Draw.s index 0fa3f4887b..bbb40d1881 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Dekujr/ObjDekujr_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Dekujr/ObjDekujr_Draw.s @@ -10,7 +10,7 @@ glabel ObjDekujr_Draw /* 00454 80B92874 24C62A40 */ addiu $a2, $a2, %lo(D_80B92A40) ## $a2 = 80B92A40 /* 00458 80B92878 27A40058 */ addiu $a0, $sp, 0x0058 ## $a0 = FFFFFFE8 /* 0045C 80B9287C 24070172 */ addiu $a3, $zero, 0x0172 ## $a3 = 00000172 -/* 00460 80B92880 0C031AB1 */ jal func_800C6AC4 +/* 00460 80B92880 0C031AB1 */ jal Graph_OpenDisps /* 00464 80B92884 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 /* 00468 80B92888 0C024F46 */ jal func_80093D18 /* 0046C 80B9288C 8E240000 */ lw $a0, 0x0000($s1) ## 00000000 @@ -61,7 +61,7 @@ glabel ObjDekujr_Draw /* 00520 80B92940 AFA00020 */ sw $zero, 0x0020($sp) /* 00524 80B92944 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 00528 80B92948 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 0052C 80B9294C 0C0253D0 */ jal Draw_TwoTexScroll +/* 0052C 80B9294C 0C0253D0 */ jal Gfx_TwoTexScroll /* 00530 80B92950 AFA2004C */ sw $v0, 0x004C($sp) /* 00534 80B92954 8FA3004C */ lw $v1, 0x004C($sp) /* 00538 80B92958 3C09DA38 */ lui $t1, 0xDA38 ## $t1 = DA380000 @@ -91,7 +91,7 @@ glabel ObjDekujr_Draw /* 00598 80B929B8 8E250000 */ lw $a1, 0x0000($s1) ## 00000000 /* 0059C 80B929BC 24C62A7C */ addiu $a2, $a2, %lo(D_80B92A7C) ## $a2 = 80B92A7C /* 005A0 80B929C0 27A40058 */ addiu $a0, $sp, 0x0058 ## $a0 = FFFFFFE8 -/* 005A4 80B929C4 0C031AD5 */ jal func_800C6B54 +/* 005A4 80B929C4 0C031AD5 */ jal Graph_CloseDisps /* 005A8 80B929C8 24070199 */ addiu $a3, $zero, 0x0199 ## $a3 = 00000199 /* 005AC 80B929CC 8FBF003C */ lw $ra, 0x003C($sp) /* 005B0 80B929D0 8FB00034 */ lw $s0, 0x0034($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Hamishi/ObjHamishi_Draw.s b/asm/non_matchings/overlays/actors/ovl_Obj_Hamishi/ObjHamishi_Draw.s index 42abff5783..1b856c99d2 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Hamishi/ObjHamishi_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Hamishi/ObjHamishi_Draw.s @@ -9,7 +9,7 @@ glabel ObjHamishi_Draw /* 006D4 80B93664 24C637B0 */ addiu $a2, $a2, %lo(D_80B937B0) ## $a2 = 80B937B0 /* 006D8 80B93668 27A40034 */ addiu $a0, $sp, 0x0034 ## $a0 = FFFFFFEC /* 006DC 80B9366C 2407018F */ addiu $a3, $zero, 0x018F ## $a3 = 0000018F -/* 006E0 80B93670 0C031AB1 */ jal func_800C6AC4 +/* 006E0 80B93670 0C031AB1 */ jal Graph_OpenDisps /* 006E4 80B93674 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 /* 006E8 80B93678 8FAF004C */ lw $t7, 0x004C($sp) /* 006EC 80B9367C 0C024F46 */ jal func_80093D18 @@ -50,7 +50,7 @@ glabel ObjHamishi_Draw /* 00778 80B93708 24C637D8 */ addiu $a2, $a2, %lo(D_80B937D8) ## $a2 = 80B937D8 /* 0077C 80B9370C 27A40034 */ addiu $a0, $sp, 0x0034 ## $a0 = FFFFFFEC /* 00780 80B93710 2407019B */ addiu $a3, $zero, 0x019B ## $a3 = 0000019B -/* 00784 80B93714 0C031AD5 */ jal func_800C6B54 +/* 00784 80B93714 0C031AD5 */ jal Graph_CloseDisps /* 00788 80B93718 8DE50000 */ lw $a1, 0x0000($t7) ## 00000000 /* 0078C 80B9371C 8FBF001C */ lw $ra, 0x001C($sp) /* 00790 80B93720 8FB00018 */ lw $s0, 0x0018($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Hana/ObjHana_Draw.s b/asm/non_matchings/overlays/actors/ovl_Obj_Hana/ObjHana_Draw.s index aa673af80e..21d50176d4 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Hana/ObjHana_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Hana/ObjHana_Draw.s @@ -8,7 +8,7 @@ glabel ObjHana_Draw /* 001C8 80B93A28 31CF0003 */ andi $t7, $t6, 0x0003 ## $t7 = 00000000 /* 001CC 80B93A2C 000FC100 */ sll $t8, $t7, 4 /* 001D0 80B93A30 00B82821 */ addu $a1, $a1, $t8 -/* 001D4 80B93A34 0C00D498 */ jal Draw_DListOpa +/* 001D4 80B93A34 0C00D498 */ jal Gfx_DrawDListOpa /* 001D8 80B93A38 8CA53AA4 */ lw $a1, %lo(D_80B93AA4)($a1) /* 001DC 80B93A3C 8FBF0014 */ lw $ra, 0x0014($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Hsblock/ObjHsblock_Draw.s b/asm/non_matchings/overlays/actors/ovl_Obj_Hsblock/ObjHsblock_Draw.s index d70667a1a0..9c9e492bc6 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Hsblock/ObjHsblock_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Hsblock/ObjHsblock_Draw.s @@ -10,7 +10,7 @@ glabel ObjHsblock_Draw /* 00410 80B93F70 24C64154 */ addiu $a2, $a2, %lo(D_80B94154) ## $a2 = 80B94154 /* 00414 80B93F74 27A40034 */ addiu $a0, $sp, 0x0034 ## $a0 = FFFFFFE4 /* 00418 80B93F78 2407016D */ addiu $a3, $zero, 0x016D ## $a3 = 0000016D -/* 0041C 80B93F7C 0C031AB1 */ jal func_800C6AC4 +/* 0041C 80B93F7C 0C031AB1 */ jal Graph_OpenDisps /* 00420 80B93F80 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 /* 00424 80B93F84 0C024F46 */ jal func_80093D18 /* 00428 80B93F88 8E240000 */ lw $a0, 0x0000($s1) ## 00000000 @@ -78,7 +78,7 @@ glabel ObjHsblock_Draw /* 00518 80B94078 010A4021 */ addu $t0, $t0, $t2 /* 0051C 80B9407C 8D0840EC */ lw $t0, %lo(D_80B940EC)($t0) /* 00520 80B94080 AC480004 */ sw $t0, 0x0004($v0) ## 80160004 -/* 00524 80B94084 0C031AD5 */ jal func_800C6B54 +/* 00524 80B94084 0C031AD5 */ jal Graph_CloseDisps /* 00528 80B94088 8E250000 */ lw $a1, 0x0000($s1) ## 00000000 /* 0052C 80B9408C 8FBF001C */ lw $ra, 0x001C($sp) /* 00530 80B94090 8FB00014 */ lw $s0, 0x0014($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Ice_Poly/ObjIcePoly_Draw.s b/asm/non_matchings/overlays/actors/ovl_Obj_Ice_Poly/ObjIcePoly_Draw.s index 3795396727..0edd37741e 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Ice_Poly/ObjIcePoly_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Ice_Poly/ObjIcePoly_Draw.s @@ -1,27 +1,27 @@ glabel ObjIcePoly_Draw /* 0071C 80B9497C 27BDFF90 */ addiu $sp, $sp, 0xFF90 ## $sp = FFFFFF90 -/* 00720 80B94980 AFB10038 */ sw $s1, 0x0038($sp) +/* 00720 80B94980 AFB10038 */ sw $s1, 0x0038($sp) /* 00724 80B94984 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 -/* 00728 80B94988 AFBF003C */ sw $ra, 0x003C($sp) -/* 0072C 80B9498C AFB00034 */ sw $s0, 0x0034($sp) -/* 00730 80B94990 AFA40070 */ sw $a0, 0x0070($sp) +/* 00728 80B94988 AFBF003C */ sw $ra, 0x003C($sp) +/* 0072C 80B9498C AFB00034 */ sw $s0, 0x0034($sp) +/* 00730 80B94990 AFA40070 */ sw $a0, 0x0070($sp) /* 00734 80B94994 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 /* 00738 80B94998 3C0680B9 */ lui $a2, %hi(D_80B94BB0) ## $a2 = 80B90000 /* 0073C 80B9499C 24C64BB0 */ addiu $a2, $a2, %lo(D_80B94BB0) ## $a2 = 80B94BB0 /* 00740 80B949A0 27A40054 */ addiu $a0, $sp, 0x0054 ## $a0 = FFFFFFE4 /* 00744 80B949A4 240701A5 */ addiu $a3, $zero, 0x01A5 ## $a3 = 000001A5 -/* 00748 80B949A8 0C031AB1 */ jal func_800C6AC4 +/* 00748 80B949A8 0C031AB1 */ jal Graph_OpenDisps /* 0074C 80B949AC 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 -/* 00750 80B949B0 0C024F61 */ jal func_80093D84 +/* 00750 80B949B0 0C024F61 */ jal func_80093D84 /* 00754 80B949B4 8E240000 */ lw $a0, 0x0000($s1) ## 00000000 -/* 00758 80B949B8 8FA40070 */ lw $a0, 0x0070($sp) +/* 00758 80B949B8 8FA40070 */ lw $a0, 0x0070($sp) /* 0075C 80B949BC 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 00760 80B949C0 0C00BB60 */ jal func_8002ED80 +/* 00760 80B949C0 0C00BB60 */ jal func_8002ED80 /* 00764 80B949C4 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 /* 00768 80B949C8 24040500 */ addiu $a0, $zero, 0x0500 ## $a0 = 00000500 /* 0076C 80B949CC 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 00770 80B949D0 2406FB00 */ addiu $a2, $zero, 0xFB00 ## $a2 = FFFFFB00 -/* 00774 80B949D4 0C034421 */ jal Matrix_RotateXYZ +/* 00774 80B949D4 0C034421 */ jal Matrix_RotateZYX /* 00778 80B949D8 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 /* 0077C 80B949DC 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 /* 00780 80B949E0 3C0FDA38 */ lui $t7, 0xDA38 ## $t7 = DA380000 @@ -33,40 +33,40 @@ glabel ObjIcePoly_Draw /* 00798 80B949F8 3C0580B9 */ lui $a1, %hi(D_80B94BC4) ## $a1 = 80B90000 /* 0079C 80B949FC 24A54BC4 */ addiu $a1, $a1, %lo(D_80B94BC4) ## $a1 = 80B94BC4 /* 007A0 80B94A00 240601AC */ addiu $a2, $zero, 0x01AC ## $a2 = 000001AC -/* 007A4 80B94A04 0C0346A2 */ jal Matrix_NewMtx -/* 007A8 80B94A08 AFA20050 */ sw $v0, 0x0050($sp) -/* 007AC 80B94A0C 8FA30050 */ lw $v1, 0x0050($sp) +/* 007A4 80B94A04 0C0346A2 */ jal Matrix_NewMtx +/* 007A8 80B94A08 AFA20050 */ sw $v0, 0x0050($sp) +/* 007AC 80B94A0C 8FA30050 */ lw $v1, 0x0050($sp) /* 007B0 80B94A10 3C19DB06 */ lui $t9, 0xDB06 ## $t9 = DB060000 /* 007B4 80B94A14 37390020 */ ori $t9, $t9, 0x0020 ## $t9 = DB060020 /* 007B8 80B94A18 AC620004 */ sw $v0, 0x0004($v1) ## 00000004 /* 007BC 80B94A1C 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0 /* 007C0 80B94A20 3C030001 */ lui $v1, 0x0001 ## $v1 = 00010000 -/* 007C4 80B94A24 00711821 */ addu $v1, $v1, $s1 +/* 007C4 80B94A24 00711821 */ addu $v1, $v1, $s1 /* 007C8 80B94A28 24580008 */ addiu $t8, $v0, 0x0008 ## $t8 = 00000008 /* 007CC 80B94A2C AE1802D0 */ sw $t8, 0x02D0($s0) ## 000002D0 /* 007D0 80B94A30 AC590000 */ sw $t9, 0x0000($v0) ## 00000000 /* 007D4 80B94A34 8C631DE4 */ lw $v1, 0x1DE4($v1) ## 00011DE4 /* 007D8 80B94A38 8E240000 */ lw $a0, 0x0000($s1) ## 00000000 /* 007DC 80B94A3C 24090020 */ addiu $t1, $zero, 0x0020 ## $t1 = 00000020 -/* 007E0 80B94A40 00036040 */ sll $t4, $v1, 1 +/* 007E0 80B94A40 00036040 */ sll $t4, $v1, 1 /* 007E4 80B94A44 318D00FF */ andi $t5, $t4, 0x00FF ## $t5 = 00000000 /* 007E8 80B94A48 240A0010 */ addiu $t2, $zero, 0x0010 ## $t2 = 00000010 /* 007EC 80B94A4C 240B0001 */ addiu $t3, $zero, 0x0001 ## $t3 = 00000001 /* 007F0 80B94A50 240E0040 */ addiu $t6, $zero, 0x0040 ## $t6 = 00000040 /* 007F4 80B94A54 240F0020 */ addiu $t7, $zero, 0x0020 ## $t7 = 00000020 -/* 007F8 80B94A58 AFAF0028 */ sw $t7, 0x0028($sp) -/* 007FC 80B94A5C AFAE0024 */ sw $t6, 0x0024($sp) -/* 00800 80B94A60 AFAB0018 */ sw $t3, 0x0018($sp) -/* 00804 80B94A64 AFAA0014 */ sw $t2, 0x0014($sp) -/* 00808 80B94A68 AFAD0020 */ sw $t5, 0x0020($sp) -/* 0080C 80B94A6C AFA90010 */ sw $t1, 0x0010($sp) -/* 00810 80B94A70 AFA0001C */ sw $zero, 0x001C($sp) +/* 007F8 80B94A58 AFAF0028 */ sw $t7, 0x0028($sp) +/* 007FC 80B94A5C AFAE0024 */ sw $t6, 0x0024($sp) +/* 00800 80B94A60 AFAB0018 */ sw $t3, 0x0018($sp) +/* 00804 80B94A64 AFAA0014 */ sw $t2, 0x0014($sp) +/* 00808 80B94A68 AFAD0020 */ sw $t5, 0x0020($sp) +/* 0080C 80B94A6C AFA90010 */ sw $t1, 0x0010($sp) +/* 00810 80B94A70 AFA0001C */ sw $zero, 0x001C($sp) /* 00814 80B94A74 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 00818 80B94A78 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 0081C 80B94A7C AFA2004C */ sw $v0, 0x004C($sp) -/* 00820 80B94A80 0C0253D0 */ jal Draw_TwoTexScroll +/* 0081C 80B94A7C AFA2004C */ sw $v0, 0x004C($sp) +/* 00820 80B94A80 0C0253D0 */ jal Gfx_TwoTexScroll /* 00824 80B94A84 306700FF */ andi $a3, $v1, 0x00FF ## $a3 = 00000000 -/* 00828 80B94A88 8FA8004C */ lw $t0, 0x004C($sp) +/* 00828 80B94A88 8FA8004C */ lw $t0, 0x004C($sp) /* 0082C 80B94A8C 3C19FB00 */ lui $t9, 0xFB00 ## $t9 = FB000000 /* 00830 80B94A90 3C010032 */ lui $at, 0x0032 ## $at = 00320000 /* 00834 80B94A94 AD020004 */ sw $v0, 0x0004($t0) ## 00000004 @@ -76,7 +76,7 @@ glabel ObjIcePoly_Draw /* 00844 80B94AA4 24580008 */ addiu $t8, $v0, 0x0008 ## $t8 = 00000008 /* 00848 80B94AA8 AE1802D0 */ sw $t8, 0x02D0($s0) ## 000002D0 /* 0084C 80B94AAC AC590000 */ sw $t9, 0x0000($v0) ## 00000000 -/* 00850 80B94AB0 8FA90070 */ lw $t1, 0x0070($sp) +/* 00850 80B94AB0 8FA90070 */ lw $t1, 0x0070($sp) /* 00854 80B94AB4 25EF3EE0 */ addiu $t7, $t7, 0x3EE0 ## $t7 = 04033EE0 /* 00858 80B94AB8 3C0EDE00 */ lui $t6, 0xDE00 ## $t6 = DE000000 /* 0085C 80B94ABC 912B0150 */ lbu $t3, 0x0150($t1) ## 00000150 @@ -91,12 +91,12 @@ glabel ObjIcePoly_Draw /* 00880 80B94AE0 AE0D02D0 */ sw $t5, 0x02D0($s0) ## 000002D0 /* 00884 80B94AE4 AC4F0004 */ sw $t7, 0x0004($v0) ## 00000004 /* 00888 80B94AE8 AC4E0000 */ sw $t6, 0x0000($v0) ## 00000000 -/* 0088C 80B94AEC 0C031AD5 */ jal func_800C6B54 +/* 0088C 80B94AEC 0C031AD5 */ jal Graph_CloseDisps /* 00890 80B94AF0 8E250000 */ lw $a1, 0x0000($s1) ## 00000000 -/* 00894 80B94AF4 8FBF003C */ lw $ra, 0x003C($sp) -/* 00898 80B94AF8 8FB00034 */ lw $s0, 0x0034($sp) -/* 0089C 80B94AFC 8FB10038 */ lw $s1, 0x0038($sp) -/* 008A0 80B94B00 03E00008 */ jr $ra +/* 00894 80B94AF4 8FBF003C */ lw $ra, 0x003C($sp) +/* 00898 80B94AF8 8FB00034 */ lw $s0, 0x0034($sp) +/* 0089C 80B94AFC 8FB10038 */ lw $s1, 0x0038($sp) +/* 008A0 80B94B00 03E00008 */ jr $ra /* 008A4 80B94B04 27BD0070 */ addiu $sp, $sp, 0x0070 ## $sp = 00000000 /* 008A8 80B94B08 00000000 */ nop /* 008AC 80B94B0C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Kibako/ObjKibako_Draw.s b/asm/non_matchings/overlays/actors/ovl_Obj_Kibako/ObjKibako_Draw.s index 8c9d33f4b6..3ac285bced 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Kibako/ObjKibako_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Kibako/ObjKibako_Draw.s @@ -4,7 +4,7 @@ glabel ObjKibako_Draw /* 00B60 80B95800 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 /* 00B64 80B95804 AFBF0014 */ sw $ra, 0x0014($sp) /* 00B68 80B95808 3C050500 */ lui $a1, 0x0500 ## $a1 = 05000000 -/* 00B6C 80B9580C 0C00D498 */ jal Draw_DListOpa +/* 00B6C 80B9580C 0C00D498 */ jal Gfx_DrawDListOpa /* 00B70 80B95810 24A55290 */ addiu $a1, $a1, 0x5290 ## $a1 = 05005290 /* 00B74 80B95814 8FBF0014 */ lw $ra, 0x0014($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Kibako2/ObjKibako2_Draw.s b/asm/non_matchings/overlays/actors/ovl_Obj_Kibako2/ObjKibako2_Draw.s index 502d41b750..b9c5c669c7 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Kibako2/ObjKibako2_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Kibako2/ObjKibako2_Draw.s @@ -4,7 +4,7 @@ glabel ObjKibako2_Draw /* 005B4 80B95F84 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 /* 005B8 80B95F88 AFBF0014 */ sw $ra, 0x0014($sp) /* 005BC 80B95F8C 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 005C0 80B95F90 0C00D498 */ jal Draw_DListOpa +/* 005C0 80B95F90 0C00D498 */ jal Gfx_DrawDListOpa /* 005C4 80B95F94 24A50960 */ addiu $a1, $a1, 0x0960 ## $a1 = 06000960 /* 005C8 80B95F98 8FBF0014 */ lw $ra, 0x0014($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Lift/ObjLift_Draw.s b/asm/non_matchings/overlays/actors/ovl_Obj_Lift/ObjLift_Draw.s index 3fdadd8603..86f55b6f4e 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Lift/ObjLift_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Lift/ObjLift_Draw.s @@ -4,7 +4,7 @@ glabel ObjLift_Draw /* 008AC 80B9697C 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 /* 008B0 80B96980 AFBF0014 */ sw $ra, 0x0014($sp) /* 008B4 80B96984 3C050600 */ lui $a1, 0x0600 ## $a1 = 06000000 -/* 008B8 80B96988 0C00D498 */ jal Draw_DListOpa +/* 008B8 80B96988 0C00D498 */ jal Gfx_DrawDListOpa /* 008BC 80B9698C 24A50140 */ addiu $a1, $a1, 0x0140 ## $a1 = 06000140 /* 008C0 80B96990 8FBF0014 */ lw $ra, 0x0014($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Lift/func_80B96560.s b/asm/non_matchings/overlays/actors/ovl_Obj_Lift/func_80B96560.s index 088df3caf5..43f6fc13d6 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Lift/func_80B96560.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Lift/func_80B96560.s @@ -25,22 +25,22 @@ glabel func_80B96560 /* 004E8 80B965B8 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 /* 004EC 80B965BC 00084880 */ sll $t1, $t0, 2 /* 004F0 80B965C0 00695021 */ addu $t2, $v1, $t1 -/* 004F4 80B965C4 0C024BE2 */ jal func_80092F88 +/* 004F4 80B965C4 0C024BE2 */ jal Quake_Add /* 004F8 80B965C8 8D440790 */ lw $a0, 0x0790($t2) ## 00000790 /* 004FC 80B965CC 00022400 */ sll $a0, $v0, 16 /* 00500 80B965D0 AFA20030 */ sw $v0, 0x0030($sp) /* 00504 80B965D4 00042403 */ sra $a0, $a0, 16 -/* 00508 80B965D8 0C024B6B */ jal func_80092DAC +/* 00508 80B965D8 0C024B6B */ jal Quake_SetSpeed /* 0050C 80B965DC 24052710 */ addiu $a1, $zero, 0x2710 ## $a1 = 00002710 /* 00510 80B965E0 87A40032 */ lh $a0, 0x0032($sp) /* 00514 80B965E4 24050002 */ addiu $a1, $zero, 0x0002 ## $a1 = 00000002 /* 00518 80B965E8 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 /* 0051C 80B965EC 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 /* 00520 80B965F0 AFA00010 */ sw $zero, 0x0010($sp) -/* 00524 80B965F4 0C024B9C */ jal func_80092E70 +/* 00524 80B965F4 0C024B9C */ jal Quake_SetQuakeValues /* 00528 80B965F8 AFA4002C */ sw $a0, 0x002C($sp) /* 0052C 80B965FC 8FA4002C */ lw $a0, 0x002C($sp) -/* 00530 80B96600 0C024B7C */ jal func_80092DF0 +/* 00530 80B96600 0C024B7C */ jal Quake_SetCountdown /* 00534 80B96604 24050014 */ addiu $a1, $zero, 0x0014 ## $a1 = 00000014 /* 00538 80B96608 0C2E5993 */ jal func_80B9664C /* 0053C 80B9660C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Lightswitch/func_80B977D0.s b/asm/non_matchings/overlays/actors/ovl_Obj_Lightswitch/func_80B977D0.s index b9b7930ef2..886703c4d2 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Lightswitch/func_80B977D0.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Lightswitch/func_80B977D0.s @@ -10,7 +10,7 @@ glabel func_80B977D0 /* 00C50 80B977F0 24C68008 */ addiu $a2, $a2, %lo(D_80B98008) ## $a2 = 80B98008 /* 00C54 80B977F4 27A4004C */ addiu $a0, $sp, 0x004C ## $a0 = FFFFFFD4 /* 00C58 80B977F8 24070329 */ addiu $a3, $zero, 0x0329 ## $a3 = 00000329 -/* 00C5C 80B977FC 0C031AB1 */ jal func_800C6AC4 +/* 00C5C 80B977FC 0C031AB1 */ jal Graph_OpenDisps /* 00C60 80B97800 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 /* 00C64 80B97804 8FAF007C */ lw $t7, 0x007C($sp) /* 00C68 80B97808 0C024F46 */ jal func_80093D18 @@ -219,7 +219,7 @@ glabel func_80B977D0 /* 00F88 80B97B28 24C68068 */ addiu $a2, $a2, %lo(D_80B98068) ## $a2 = 80B98068 /* 00F8C 80B97B2C 27A4004C */ addiu $a0, $sp, 0x004C ## $a0 = FFFFFFD4 /* 00F90 80B97B30 2407036E */ addiu $a3, $zero, 0x036E ## $a3 = 0000036E -/* 00F94 80B97B34 0C031AD5 */ jal func_800C6B54 +/* 00F94 80B97B34 0C031AD5 */ jal Graph_CloseDisps /* 00F98 80B97B38 8DC50000 */ lw $a1, 0x0000($t6) ## 00000000 /* 00F9C 80B97B3C 8FBF001C */ lw $ra, 0x001C($sp) /* 00FA0 80B97B40 8FB00014 */ lw $s0, 0x0014($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Lightswitch/func_80B97B50.s b/asm/non_matchings/overlays/actors/ovl_Obj_Lightswitch/func_80B97B50.s index 43a783cfa1..b20ba32546 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Lightswitch/func_80B97B50.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Lightswitch/func_80B97B50.s @@ -10,7 +10,7 @@ glabel func_80B97B50 /* 00FD0 80B97B70 24C68080 */ addiu $a2, $a2, %lo(D_80B98080) ## $a2 = 80B98080 /* 00FD4 80B97B74 27A4004C */ addiu $a0, $sp, 0x004C ## $a0 = FFFFFFD4 /* 00FD8 80B97B78 2407037A */ addiu $a3, $zero, 0x037A ## $a3 = 0000037A -/* 00FDC 80B97B7C 0C031AB1 */ jal func_800C6AC4 +/* 00FDC 80B97B7C 0C031AB1 */ jal Graph_OpenDisps /* 00FE0 80B97B80 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 /* 00FE4 80B97B84 8FAF007C */ lw $t7, 0x007C($sp) /* 00FE8 80B97B88 0C024F61 */ jal func_80093D84 @@ -186,7 +186,7 @@ glabel func_80B97B50 /* 01290 80B97E30 24C680E0 */ addiu $a2, $a2, %lo(D_80B980E0) ## $a2 = 80B980E0 /* 01294 80B97E34 27A4004C */ addiu $a0, $sp, 0x004C ## $a0 = FFFFFFD4 /* 01298 80B97E38 240703B5 */ addiu $a3, $zero, 0x03B5 ## $a3 = 000003B5 -/* 0129C 80B97E3C 0C031AD5 */ jal func_800C6B54 +/* 0129C 80B97E3C 0C031AD5 */ jal Graph_CloseDisps /* 012A0 80B97E40 8DA50000 */ lw $a1, 0x0000($t5) ## 00000000 /* 012A4 80B97E44 8FBF001C */ lw $ra, 0x001C($sp) /* 012A8 80B97E48 8FB00014 */ lw $s0, 0x0014($sp) 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 index f95e716824..88788f9ced 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Oshihiki/ObjOshihiki_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Oshihiki/ObjOshihiki_Draw.s @@ -9,7 +9,7 @@ glabel ObjOshihiki_Draw /* 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 func_800C6AC4 +/* 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 @@ -137,7 +137,7 @@ glabel L80B9C8F8 /* 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 func_800C6B54 +/* 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) diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Switch/func_80B9E748.s b/asm/non_matchings/overlays/actors/ovl_Obj_Switch/func_80B9E748.s index f49d4264cd..fad49d7a6e 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Switch/func_80B9E748.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Switch/func_80B9E748.s @@ -9,7 +9,7 @@ glabel func_80B9E748 /* 01554 80B9E764 31F80007 */ andi $t8, $t7, 0x0007 ## $t8 = 00000000 /* 01558 80B9E768 0018C880 */ sll $t9, $t8, 2 /* 0155C 80B9E76C 00B92821 */ addu $a1, $a1, $t9 -/* 01560 80B9E770 0C00D498 */ jal Draw_DListOpa +/* 01560 80B9E770 0C00D498 */ jal Gfx_DrawDListOpa /* 01564 80B9E774 8CA5ED88 */ lw $a1, %lo(D_80B9ED88)($a1) /* 01568 80B9E778 8FBF0014 */ lw $ra, 0x0014($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Switch/func_80B9E788.s b/asm/non_matchings/overlays/actors/ovl_Obj_Switch/func_80B9E788.s index 235e6d4151..f2b867b73a 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Switch/func_80B9E788.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Switch/func_80B9E788.s @@ -4,7 +4,7 @@ glabel func_80B9E788 /* 01580 80B9E790 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 /* 01584 80B9E794 AFBF0014 */ sw $ra, 0x0014($sp) /* 01588 80B9E798 3C050500 */ lui $a1, 0x0500 ## $a1 = 05000000 -/* 0158C 80B9E79C 0C00D498 */ jal Draw_DListOpa +/* 0158C 80B9E79C 0C00D498 */ jal Gfx_DrawDListOpa /* 01590 80B9E7A0 24A55AD0 */ addiu $a1, $a1, 0x5AD0 ## $a1 = 05005AD0 /* 01594 80B9E7A4 8FBF0014 */ lw $ra, 0x0014($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Switch/func_80B9E7B4.s b/asm/non_matchings/overlays/actors/ovl_Obj_Switch/func_80B9E7B4.s index 9f45cac913..419d7e616e 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Switch/func_80B9E7B4.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Switch/func_80B9E7B4.s @@ -13,7 +13,7 @@ glabel func_80B9E7B4 /* 015D0 80B9E7E0 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 /* 015D4 80B9E7E4 27A40034 */ addiu $a0, $sp, 0x0034 ## $a0 = FFFFFFE4 /* 015D8 80B9E7E8 240705B3 */ addiu $a3, $zero, 0x05B3 ## $a3 = 000005B3 -/* 015DC 80B9E7EC 0C031AB1 */ jal func_800C6AC4 +/* 015DC 80B9E7EC 0C031AB1 */ jal Graph_OpenDisps /* 015E0 80B9E7F0 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 /* 015E4 80B9E7F4 8FA90054 */ lw $t1, 0x0054($sp) /* 015E8 80B9E7F8 0C024F46 */ jal func_80093D18 @@ -76,7 +76,7 @@ glabel func_80B9E7B4 /* 016CC 80B9E8DC 8FAC0054 */ lw $t4, 0x0054($sp) /* 016D0 80B9E8E0 27A40034 */ addiu $a0, $sp, 0x0034 ## $a0 = FFFFFFE4 /* 016D4 80B9E8E4 240705BF */ addiu $a3, $zero, 0x05BF ## $a3 = 000005BF -/* 016D8 80B9E8E8 0C031AD5 */ jal func_800C6B54 +/* 016D8 80B9E8E8 0C031AD5 */ jal Graph_CloseDisps /* 016DC 80B9E8EC 8D850000 */ lw $a1, 0x0000($t4) ## 00000000 /* 016E0 80B9E8F0 8FBF001C */ lw $ra, 0x001C($sp) /* 016E4 80B9E8F4 8FB00018 */ lw $s0, 0x0018($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Switch/func_80B9E904.s b/asm/non_matchings/overlays/actors/ovl_Obj_Switch/func_80B9E904.s index 357f354d68..b20dfdad32 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Switch/func_80B9E904.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Switch/func_80B9E904.s @@ -16,7 +16,7 @@ glabel func_80B9E904 /* 0172C 80B9E93C 24C6EEF0 */ addiu $a2, $a2, %lo(D_80B9EEF0) ## $a2 = 80B9EEF0 /* 01730 80B9E940 27A40080 */ addiu $a0, $sp, 0x0080 ## $a0 = FFFFFFE0 /* 01734 80B9E944 240705D6 */ addiu $a3, $zero, 0x05D6 ## $a3 = 000005D6 -/* 01738 80B9E948 0C031AB1 */ jal func_800C6AC4 +/* 01738 80B9E948 0C031AB1 */ jal Graph_OpenDisps /* 0173C 80B9E94C AFA50090 */ sw $a1, 0x0090($sp) /* 01740 80B9E950 0C024F61 */ jal func_80093D84 /* 01744 80B9E954 8E240000 */ lw $a0, 0x0000($s1) ## 00000000 @@ -54,14 +54,14 @@ glabel func_80B9E904 /* 017C4 80B9E9D4 AC4F0004 */ sw $t7, 0x0004($v0) ## 00000004 /* 017C8 80B9E9D8 8E250000 */ lw $a1, 0x0000($s1) ## 00000000 /* 017CC 80B9E9DC AFA90048 */ sw $t1, 0x0048($sp) -/* 017D0 80B9E9E0 0C031AD5 */ jal func_800C6B54 +/* 017D0 80B9E9E0 0C031AD5 */ jal Graph_CloseDisps /* 017D4 80B9E9E4 AFA8004C */ sw $t0, 0x004C($sp) /* 017D8 80B9E9E8 8E250000 */ lw $a1, 0x0000($s1) ## 00000000 /* 017DC 80B9E9EC 3C0680BA */ lui $a2, %hi(D_80B9EF2C) ## $a2 = 80BA0000 /* 017E0 80B9E9F0 24C6EF2C */ addiu $a2, $a2, %lo(D_80B9EF2C) ## $a2 = 80B9EF2C /* 017E4 80B9E9F4 27A40064 */ addiu $a0, $sp, 0x0064 ## $a0 = FFFFFFC4 /* 017E8 80B9E9F8 240705E3 */ addiu $a3, $zero, 0x05E3 ## $a3 = 000005E3 -/* 017EC 80B9E9FC 0C031AB1 */ jal func_800C6AC4 +/* 017EC 80B9E9FC 0C031AB1 */ jal Graph_OpenDisps /* 017F0 80B9EA00 AFA50074 */ sw $a1, 0x0074($sp) /* 017F4 80B9EA04 0C024F46 */ jal func_80093D18 /* 017F8 80B9EA08 8E240000 */ lw $a0, 0x0000($s1) ## 00000000 @@ -148,7 +148,7 @@ glabel func_80B9E904 /* 01938 80B9EB48 AFB90028 */ sw $t9, 0x0028($sp) /* 0193C 80B9EB4C AFAC0024 */ sw $t4, 0x0024($sp) /* 01940 80B9EB50 AFA20054 */ sw $v0, 0x0054($sp) -/* 01944 80B9EB54 0C0253D0 */ jal Draw_TwoTexScroll +/* 01944 80B9EB54 0C0253D0 */ jal Gfx_TwoTexScroll /* 01948 80B9EB58 AFAA0020 */ sw $t2, 0x0020($sp) /* 0194C 80B9EB5C 8FA30054 */ lw $v1, 0x0054($sp) /* 01950 80B9EB60 8FA80074 */ lw $t0, 0x0074($sp) @@ -167,7 +167,7 @@ glabel func_80B9E904 /* 01984 80B9EB94 8DADEDD4 */ lw $t5, %lo(D_80B9EDD4)($t5) /* 01988 80B9EB98 240705FD */ addiu $a3, $zero, 0x05FD ## $a3 = 000005FD /* 0198C 80B9EB9C AC4D0004 */ sw $t5, 0x0004($v0) ## 00000004 -/* 01990 80B9EBA0 0C031AD5 */ jal func_800C6B54 +/* 01990 80B9EBA0 0C031AD5 */ jal Graph_CloseDisps /* 01994 80B9EBA4 8E250000 */ lw $a1, 0x0000($s1) ## 00000000 /* 01998 80B9EBA8 8FBF003C */ lw $ra, 0x003C($sp) /* 0199C 80B9EBAC 8FB00034 */ lw $s0, 0x0034($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Syokudai/ObjSyokudai_Draw.s b/asm/non_matchings/overlays/actors/ovl_Obj_Syokudai/ObjSyokudai_Draw.s index e385c5fa53..6d7276951a 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Syokudai/ObjSyokudai_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Syokudai/ObjSyokudai_Draw.s @@ -21,7 +21,7 @@ glabel ObjSyokudai_Draw /* 00880 80B9FB30 24C6FE90 */ addiu $a2, $a2, %lo(D_80B9FE90) ## $a2 = 80B9FE90 /* 00884 80B9FB34 27A40070 */ addiu $a0, $sp, 0x0070 ## $a0 = FFFFFFE0 /* 00888 80B9FB38 240702C3 */ addiu $a3, $zero, 0x02C3 ## $a3 = 000002C3 -/* 0088C 80B9FB3C 0C031AB1 */ jal func_800C6AC4 +/* 0088C 80B9FB3C 0C031AB1 */ jal Graph_OpenDisps /* 00890 80B9FB40 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 /* 00894 80B9FB44 0C024F46 */ jal func_80093D18 /* 00898 80B9FB48 8E440000 */ lw $a0, 0x0000($s2) ## 00000000 @@ -112,7 +112,7 @@ glabel ObjSyokudai_Draw /* 009E4 80B9FC94 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 009E8 80B9FC98 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 /* 009EC 80B9FC9C 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 009F0 80B9FCA0 0C0253D0 */ jal Draw_TwoTexScroll +/* 009F0 80B9FCA0 0C0253D0 */ jal Gfx_TwoTexScroll /* 009F4 80B9FCA4 AFA20060 */ sw $v0, 0x0060($sp) /* 009F8 80B9FCA8 8FA30060 */ lw $v1, 0x0060($sp) /* 009FC 80B9FCAC 3C0AFA00 */ lui $t2, 0xFA00 ## $t2 = FA000000 @@ -189,7 +189,7 @@ glabel ObjSyokudai_Draw /* 00B14 80B9FDC4 24C6FECC */ addiu $a2, $a2, %lo(D_80B9FECC) ## $a2 = 80B9FECC /* 00B18 80B9FDC8 27A40070 */ addiu $a0, $sp, 0x0070 ## $a0 = FFFFFFE0 /* 00B1C 80B9FDCC 8E450000 */ lw $a1, 0x0000($s2) ## 00000000 -/* 00B20 80B9FDD0 0C031AD5 */ jal func_800C6B54 +/* 00B20 80B9FDD0 0C031AD5 */ jal Graph_CloseDisps /* 00B24 80B9FDD4 240702ED */ addiu $a3, $zero, 0x02ED ## $a3 = 000002ED /* 00B28 80B9FDD8 8FBF0044 */ lw $ra, 0x0044($sp) /* 00B2C 80B9FDDC 8FB00038 */ lw $s0, 0x0038($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Timeblock/ObjTimeblock_Draw.s b/asm/non_matchings/overlays/actors/ovl_Obj_Timeblock/ObjTimeblock_Draw.s index a88443055a..26bf82d921 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Timeblock/ObjTimeblock_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Timeblock/ObjTimeblock_Draw.s @@ -19,7 +19,7 @@ glabel ObjTimeblock_Draw /* 00A3C 80BA09DC AFAA0044 */ sw $t2, 0x0044($sp) /* 00A40 80BA09E0 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 /* 00A44 80BA09E4 240702FA */ addiu $a3, $zero, 0x02FA ## $a3 = 000002FA -/* 00A48 80BA09E8 0C031AB1 */ jal func_800C6AC4 +/* 00A48 80BA09E8 0C031AB1 */ jal Graph_OpenDisps /* 00A4C 80BA09EC 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 /* 00A50 80BA09F0 8FAC004C */ lw $t4, 0x004C($sp) /* 00A54 80BA09F4 0C024F46 */ jal func_80093D18 @@ -68,7 +68,7 @@ glabel ObjTimeblock_Draw /* 00B00 80BA0AA0 8FAD004C */ lw $t5, 0x004C($sp) /* 00B04 80BA0AA4 27A40030 */ addiu $a0, $sp, 0x0030 ## $a0 = FFFFFFE8 /* 00B08 80BA0AA8 24070304 */ addiu $a3, $zero, 0x0304 ## $a3 = 00000304 -/* 00B0C 80BA0AAC 0C031AD5 */ jal func_800C6B54 +/* 00B0C 80BA0AAC 0C031AD5 */ jal Graph_CloseDisps /* 00B10 80BA0AB0 8DA50000 */ lw $a1, 0x0000($t5) ## 00000000 .L80BA0AB4: /* 00B14 80BA0AB4 8FBF001C */ lw $ra, 0x001C($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Tsubo/func_80BA1B0C.s b/asm/non_matchings/overlays/actors/ovl_Obj_Tsubo/func_80BA1B0C.s index 43bf345979..b7a4c0825e 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Tsubo/func_80BA1B0C.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Tsubo/func_80BA1B0C.s @@ -9,7 +9,7 @@ glabel func_80BA1B0C /* 00DC8 80BA1B28 31F80001 */ andi $t8, $t7, 0x0001 ## $t8 = 00000000 /* 00DCC 80BA1B2C 0018C880 */ sll $t9, $t8, 2 /* 00DD0 80BA1B30 00B92821 */ addu $a1, $a1, $t9 -/* 00DD4 80BA1B34 0C00D498 */ jal Draw_DListOpa +/* 00DD4 80BA1B34 0C00D498 */ jal Gfx_DrawDListOpa /* 00DD8 80BA1B38 8CA51B84 */ lw $a1, %lo(D_80BA1B84)($a1) /* 00DDC 80BA1B3C 8FBF0014 */ lw $ra, 0x0014($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Obj_Warp2block/ObjWarp2block_Draw.s b/asm/non_matchings/overlays/actors/ovl_Obj_Warp2block/ObjWarp2block_Draw.s index a6a2afa772..ee48b2a9d0 100644 --- a/asm/non_matchings/overlays/actors/ovl_Obj_Warp2block/ObjWarp2block_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Obj_Warp2block/ObjWarp2block_Draw.s @@ -17,7 +17,7 @@ glabel ObjWarp2block_Draw /* 00940 80BA2730 24C6294C */ addiu $a2, $a2, %lo(D_80BA294C) ## $a2 = 80BA294C /* 00944 80BA2734 27A40030 */ addiu $a0, $sp, 0x0030 ## $a0 = FFFFFFE8 /* 00948 80BA2738 24070248 */ addiu $a3, $zero, 0x0248 ## $a3 = 00000248 -/* 0094C 80BA273C 0C031AB1 */ jal func_800C6AC4 +/* 0094C 80BA273C 0C031AB1 */ jal Graph_OpenDisps /* 00950 80BA2740 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 /* 00954 80BA2744 8FAB004C */ lw $t3, 0x004C($sp) /* 00958 80BA2748 0C024F46 */ jal func_80093D18 @@ -66,7 +66,7 @@ glabel ObjWarp2block_Draw /* 00A04 80BA27F4 8FAC004C */ lw $t4, 0x004C($sp) /* 00A08 80BA27F8 27A40030 */ addiu $a0, $sp, 0x0030 ## $a0 = FFFFFFE8 /* 00A0C 80BA27FC 24070252 */ addiu $a3, $zero, 0x0252 ## $a3 = 00000252 -/* 00A10 80BA2800 0C031AD5 */ jal func_800C6B54 +/* 00A10 80BA2800 0C031AD5 */ jal Graph_CloseDisps /* 00A14 80BA2804 8D850000 */ lw $a1, 0x0000($t4) ## 00000000 /* 00A18 80BA2808 8FBF001C */ lw $ra, 0x001C($sp) /* 00A1C 80BA280C 8FB00018 */ lw $s0, 0x0018($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Object_Kankyo/func_80BA3C94.s b/asm/non_matchings/overlays/actors/ovl_Object_Kankyo/func_80BA3C94.s index a104fb7f8a..dc81bb5056 100644 --- a/asm/non_matchings/overlays/actors/ovl_Object_Kankyo/func_80BA3C94.s +++ b/asm/non_matchings/overlays/actors/ovl_Object_Kankyo/func_80BA3C94.s @@ -40,10 +40,10 @@ glabel func_80BA3C94 /* 0128C 80BA3D2C 27A4007C */ addiu $a0, $sp, 0x007C ## $a0 = FFFFFFC4 /* 01290 80BA3D30 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 /* 01294 80BA3D34 24070327 */ addiu $a3, $zero, 0x0327 ## $a3 = 00000327 -/* 01298 80BA3D38 0C031AB1 */ jal func_800C6AC4 +/* 01298 80BA3D38 0C031AB1 */ jal Graph_OpenDisps /* 0129C 80BA3D3C 00A09025 */ or $s2, $a1, $zero ## $s2 = 00000000 /* 012A0 80BA3D40 8E4402D0 */ lw $a0, 0x02D0($s2) ## 000002D0 -/* 012A4 80BA3D44 0C024DDD */ jal func_80093774 +/* 012A4 80BA3D44 0C024DDD */ jal Gfx_CallSetupDL /* 012A8 80BA3D48 24050014 */ addiu $a1, $zero, 0x0014 ## $a1 = 00000014 /* 012AC 80BA3D4C 3C040405 */ lui $a0, 0x0405 ## $a0 = 04050000 /* 012B0 80BA3D50 2484C160 */ addiu $a0, $a0, 0xC160 ## $a0 = 0404C160 @@ -301,7 +301,7 @@ glabel func_80BA3C94 /* 01668 80BA4108 24C65A70 */ addiu $a2, $a2, %lo(D_80BA5A70) ## $a2 = 80BA5A70 /* 0166C 80BA410C 27A4007C */ addiu $a0, $sp, 0x007C ## $a0 = FFFFFFC4 /* 01670 80BA4110 8E850000 */ lw $a1, 0x0000($s4) ## 00000000 -/* 01674 80BA4114 0C031AD5 */ jal func_800C6B54 +/* 01674 80BA4114 0C031AD5 */ jal Graph_CloseDisps /* 01678 80BA4118 2407039A */ addiu $a3, $zero, 0x039A ## $a3 = 0000039A .L80BA411C: /* 0167C 80BA411C 8FBF003C */ lw $ra, 0x003C($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Object_Kankyo/func_80BA414C.s b/asm/non_matchings/overlays/actors/ovl_Object_Kankyo/func_80BA414C.s index 7ad836ee56..2b5454c8ca 100644 --- a/asm/non_matchings/overlays/actors/ovl_Object_Kankyo/func_80BA414C.s +++ b/asm/non_matchings/overlays/actors/ovl_Object_Kankyo/func_80BA414C.s @@ -43,7 +43,7 @@ glabel func_80BA414C /* 01750 80BA41F0 27A400B4 */ addiu $a0, $sp, 0x00B4 ## $a0 = FFFFFF9C /* 01754 80BA41F4 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 /* 01758 80BA41F8 240703BE */ addiu $a3, $zero, 0x03BE ## $a3 = 000003BE -/* 0175C 80BA41FC 0C031AB1 */ jal func_800C6AC4 +/* 0175C 80BA41FC 0C031AB1 */ jal Graph_OpenDisps /* 01760 80BA4200 00A09025 */ or $s2, $a1, $zero ## $s2 = 00000000 /* 01764 80BA4204 3C010001 */ lui $at, 0x0001 ## $at = 00010000 /* 01768 80BA4208 02611821 */ addu $v1, $s3, $at @@ -505,7 +505,7 @@ glabel func_80BA414C /* 01E24 80BA48C4 24C65AB8 */ addiu $a2, $a2, %lo(D_80BA5AB8) ## $a2 = 80BA5AB8 /* 01E28 80BA48C8 27A400B4 */ addiu $a0, $sp, 0x00B4 ## $a0 = FFFFFF9C /* 01E2C 80BA48CC 8E650000 */ lw $a1, 0x0000($s3) ## 00000000 -/* 01E30 80BA48D0 0C031AD5 */ jal func_800C6B54 +/* 01E30 80BA48D0 0C031AD5 */ jal Graph_CloseDisps /* 01E34 80BA48D4 24070467 */ addiu $a3, $zero, 0x0467 ## $a3 = 00000467 .L80BA48D8: /* 01E38 80BA48D8 8FBF005C */ lw $ra, 0x005C($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Object_Kankyo/func_80BA49BC.s b/asm/non_matchings/overlays/actors/ovl_Object_Kankyo/func_80BA49BC.s index 1ac143cbab..4141b3a583 100644 --- a/asm/non_matchings/overlays/actors/ovl_Object_Kankyo/func_80BA49BC.s +++ b/asm/non_matchings/overlays/actors/ovl_Object_Kankyo/func_80BA49BC.s @@ -9,7 +9,7 @@ glabel func_80BA49BC /* 01F38 80BA49D8 24C65AD0 */ addiu $a2, $a2, %lo(D_80BA5AD0) ## $a2 = 80BA5AD0 /* 01F3C 80BA49DC 27A40044 */ addiu $a0, $sp, 0x0044 ## $a0 = FFFFFFE4 /* 01F40 80BA49E0 2407049E */ addiu $a3, $zero, 0x049E ## $a3 = 0000049E -/* 01F44 80BA49E4 0C031AB1 */ jal func_800C6AC4 +/* 01F44 80BA49E4 0C031AB1 */ jal Graph_OpenDisps /* 01F48 80BA49E8 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 /* 01F4C 80BA49EC 8FAF0060 */ lw $t7, 0x0060($sp) /* 01F50 80BA49F0 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 @@ -137,7 +137,7 @@ glabel func_80BA49BC /* 02134 80BA4BD4 24C65B00 */ addiu $a2, $a2, %lo(D_80BA5B00) ## $a2 = 80BA5B00 /* 02138 80BA4BD8 27A40044 */ addiu $a0, $sp, 0x0044 ## $a0 = FFFFFFE4 /* 0213C 80BA4BDC 240704D1 */ addiu $a3, $zero, 0x04D1 ## $a3 = 000004D1 -/* 02140 80BA4BE0 0C031AD5 */ jal func_800C6B54 +/* 02140 80BA4BE0 0C031AD5 */ jal Graph_CloseDisps /* 02144 80BA4BE4 8D650000 */ lw $a1, 0x0000($t3) ## 00000000 /* 02148 80BA4BE8 8FBF001C */ lw $ra, 0x001C($sp) /* 0214C 80BA4BEC 8FB00018 */ lw $s0, 0x0018($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Object_Kankyo/func_80BA4D7C.s b/asm/non_matchings/overlays/actors/ovl_Object_Kankyo/func_80BA4D7C.s index 97aef1ec48..551d4c8df6 100644 --- a/asm/non_matchings/overlays/actors/ovl_Object_Kankyo/func_80BA4D7C.s +++ b/asm/non_matchings/overlays/actors/ovl_Object_Kankyo/func_80BA4D7C.s @@ -10,7 +10,7 @@ glabel func_80BA4D7C /* 022FC 80BA4D9C 24C65B34 */ addiu $a2, $a2, %lo(D_80BA5B34) ## $a2 = 80BA5B34 /* 02300 80BA4DA0 27A40048 */ addiu $a0, $sp, 0x0048 ## $a0 = FFFFFFC8 /* 02304 80BA4DA4 2407052C */ addiu $a3, $zero, 0x052C ## $a3 = 0000052C -/* 02308 80BA4DA8 0C031AB1 */ jal func_800C6AC4 +/* 02308 80BA4DA8 0C031AB1 */ jal Graph_OpenDisps /* 0230C 80BA4DAC AFA50058 */ sw $a1, 0x0058($sp) /* 02310 80BA4DB0 922E1D6C */ lbu $t6, 0x1D6C($s1) ## 00001D6C /* 02314 80BA4DB4 8FA80058 */ lw $t0, 0x0058($sp) @@ -360,7 +360,7 @@ glabel func_80BA4D7C /* 0283C 80BA52DC 24C65B64 */ addiu $a2, $a2, %lo(D_80BA5B64) ## $a2 = 80BA5B64 /* 02840 80BA52E0 27A40048 */ addiu $a0, $sp, 0x0048 ## $a0 = FFFFFFC8 /* 02844 80BA52E4 8E250000 */ lw $a1, 0x0000($s1) ## 00000000 -/* 02848 80BA52E8 0C031AD5 */ jal func_800C6B54 +/* 02848 80BA52E8 0C031AD5 */ jal Graph_CloseDisps /* 0284C 80BA52EC 24070598 */ addiu $a3, $zero, 0x0598 ## $a3 = 00000598 /* 02850 80BA52F0 8FBF001C */ lw $ra, 0x001C($sp) /* 02854 80BA52F4 8FB00014 */ lw $s0, 0x0014($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Object_Kankyo/func_80BA54AC.s b/asm/non_matchings/overlays/actors/ovl_Object_Kankyo/func_80BA54AC.s index aad33c3197..0d019775ce 100644 --- a/asm/non_matchings/overlays/actors/ovl_Object_Kankyo/func_80BA54AC.s +++ b/asm/non_matchings/overlays/actors/ovl_Object_Kankyo/func_80BA54AC.s @@ -95,7 +95,7 @@ glabel func_80BA54AC /* 02B80 80BA5620 24C65B98 */ addiu $a2, $a2, %lo(D_80BA5B98) ## $a2 = 80BA5B98 /* 02B84 80BA5624 27A400A0 */ addiu $a0, $sp, 0x00A0 ## $a0 = FFFFFF68 /* 02B88 80BA5628 24070603 */ addiu $a3, $zero, 0x0603 ## $a3 = 00000603 -/* 02B8C 80BA562C 0C031AB1 */ jal func_800C6AC4 +/* 02B8C 80BA562C 0C031AB1 */ jal Graph_OpenDisps /* 02B90 80BA5630 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 /* 02B94 80BA5634 92CE1659 */ lbu $t6, 0x1659($s6) ## 00001659 /* 02B98 80BA5638 00009825 */ or $s3, $zero, $zero ## $s3 = 00000000 @@ -231,7 +231,7 @@ glabel func_80BA54AC /* 02D9C 80BA583C AFA70020 */ sw $a3, 0x0020($sp) /* 02DA0 80BA5840 AFA80010 */ sw $t0, 0x0010($sp) /* 02DA4 80BA5844 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 02DA8 80BA5848 0C0253D0 */ jal Draw_TwoTexScroll +/* 02DA8 80BA5848 0C0253D0 */ jal Gfx_TwoTexScroll /* 02DAC 80BA584C 00408025 */ or $s0, $v0, $zero ## $s0 = 00000000 /* 02DB0 80BA5850 AE020004 */ sw $v0, 0x0004($s0) ## 00000004 /* 02DB4 80BA5854 8E2202D0 */ lw $v0, 0x02D0($s1) ## 000002D0 @@ -252,7 +252,7 @@ glabel func_80BA54AC /* 02DE8 80BA5888 24C65BC8 */ addiu $a2, $a2, %lo(D_80BA5BC8) ## $a2 = 80BA5BC8 /* 02DEC 80BA588C 27A400A0 */ addiu $a0, $sp, 0x00A0 ## $a0 = FFFFFF68 /* 02DF0 80BA5890 8E850000 */ lw $a1, 0x0000($s4) ## 00000000 -/* 02DF4 80BA5894 0C031AD5 */ jal func_800C6B54 +/* 02DF4 80BA5894 0C031AD5 */ jal Graph_CloseDisps /* 02DF8 80BA5898 24070647 */ addiu $a3, $zero, 0x0647 ## $a3 = 00000647 /* 02DFC 80BA589C 8FBF0074 */ lw $ra, 0x0074($sp) /* 02E00 80BA58A0 D7B40038 */ ldc1 $f20, 0x0038($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Oceff_Spot/OceffSpot_Draw.s b/asm/non_matchings/overlays/actors/ovl_Oceff_Spot/OceffSpot_Draw.s index 52430db71b..37abfd8e0f 100644 --- a/asm/non_matchings/overlays/actors/ovl_Oceff_Spot/OceffSpot_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Oceff_Spot/OceffSpot_Draw.s @@ -13,7 +13,7 @@ glabel OceffSpot_Draw /* 006A0 80BA6710 24C66F94 */ addiu $a2, $a2, %lo(D_80BA6F94) ## $a2 = 80BA6F94 /* 006A4 80BA6714 27A40054 */ addiu $a0, $sp, 0x0054 ## $a0 = FFFFFFE4 /* 006A8 80BA6718 240701D2 */ addiu $a3, $zero, 0x01D2 ## $a3 = 000001D2 -/* 006AC 80BA671C 0C031AB1 */ jal func_800C6AC4 +/* 006AC 80BA671C 0C031AB1 */ jal Graph_OpenDisps /* 006B0 80BA6720 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 /* 006B4 80BA6724 0C024F61 */ jal func_80093D84 /* 006B8 80BA6728 8E240000 */ lw $a0, 0x0000($s1) ## 00000000 @@ -62,7 +62,7 @@ glabel OceffSpot_Draw /* 00764 80BA67D4 AFAD0010 */ sw $t5, 0x0010($sp) /* 00768 80BA67D8 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 0076C 80BA67DC AFA20048 */ sw $v0, 0x0048($sp) -/* 00770 80BA67E0 0C0253D0 */ jal Draw_TwoTexScroll +/* 00770 80BA67E0 0C0253D0 */ jal Gfx_TwoTexScroll /* 00774 80BA67E4 00083040 */ sll $a2, $t0, 1 /* 00778 80BA67E8 8FA30048 */ lw $v1, 0x0048($sp) /* 0077C 80BA67EC 3C0D80BA */ lui $t5, %hi(D_80BA6EA8) ## $t5 = 80BA0000 @@ -78,7 +78,7 @@ glabel OceffSpot_Draw /* 007A4 80BA6814 8E250000 */ lw $a1, 0x0000($s1) ## 00000000 /* 007A8 80BA6818 24C66FBC */ addiu $a2, $a2, %lo(D_80BA6FBC) ## $a2 = 80BA6FBC /* 007AC 80BA681C 27A40054 */ addiu $a0, $sp, 0x0054 ## $a0 = FFFFFFE4 -/* 007B0 80BA6820 0C031AD5 */ jal func_800C6B54 +/* 007B0 80BA6820 0C031AD5 */ jal Graph_CloseDisps /* 007B4 80BA6824 240701E5 */ addiu $a3, $zero, 0x01E5 ## $a3 = 000001E5 /* 007B8 80BA6828 8FBF003C */ lw $ra, 0x003C($sp) /* 007BC 80BA682C 8FB00034 */ lw $s0, 0x0034($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Oceff_Storm/OceffStorm_Draw.s b/asm/non_matchings/overlays/actors/ovl_Oceff_Storm/OceffStorm_Draw.s index 1747b1fc4f..f817a833e8 100644 --- a/asm/non_matchings/overlays/actors/ovl_Oceff_Storm/OceffStorm_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Oceff_Storm/OceffStorm_Draw.s @@ -13,7 +13,7 @@ glabel OceffStorm_Draw /* 00580 80BA7660 24C68C48 */ addiu $a2, $a2, %lo(D_80BA8C48) ## $a2 = 80BA8C48 /* 00584 80BA7664 27A40068 */ addiu $a0, $sp, 0x0068 ## $a0 = FFFFFFE0 /* 00588 80BA7668 240701E6 */ addiu $a3, $zero, 0x01E6 ## $a3 = 000001E6 -/* 0058C 80BA766C 0C031AB1 */ jal func_800C6AC4 +/* 0058C 80BA766C 0C031AB1 */ jal Graph_OpenDisps /* 00590 80BA7670 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 /* 00594 80BA7674 0C024F61 */ jal func_80093D84 /* 00598 80BA7678 8E240000 */ lw $a0, 0x0000($s1) ## 00000000 @@ -113,7 +113,7 @@ glabel OceffStorm_Draw /* 00710 80BA77F0 AFAC0010 */ sw $t4, 0x0010($sp) /* 00714 80BA77F4 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 00718 80BA77F8 AFA2004C */ sw $v0, 0x004C($sp) -/* 0071C 80BA77FC 0C0253D0 */ jal Draw_TwoTexScroll +/* 0071C 80BA77FC 0C0253D0 */ jal Gfx_TwoTexScroll /* 00720 80BA7800 000A3080 */ sll $a2, $t2, 2 /* 00724 80BA7804 8FA8004C */ lw $t0, 0x004C($sp) /* 00728 80BA7808 3C0E80BB */ lui $t6, %hi(D_80BA8B90) ## $t6 = 80BB0000 @@ -129,7 +129,7 @@ glabel OceffStorm_Draw /* 00750 80BA7830 8E250000 */ lw $a1, 0x0000($s1) ## 00000000 /* 00754 80BA7834 24C68C70 */ addiu $a2, $a2, %lo(D_80BA8C70) ## $a2 = 80BA8C70 /* 00758 80BA7838 27A40068 */ addiu $a0, $sp, 0x0068 ## $a0 = FFFFFFE0 -/* 0075C 80BA783C 0C031AD5 */ jal func_800C6B54 +/* 0075C 80BA783C 0C031AD5 */ jal Graph_CloseDisps /* 00760 80BA7840 24070200 */ addiu $a3, $zero, 0x0200 ## $a3 = 00000200 /* 00764 80BA7844 8FA40088 */ lw $a0, 0x0088($sp) /* 00768 80BA7848 0C2E9D14 */ jal func_80BA7450 diff --git a/asm/non_matchings/overlays/actors/ovl_Oceff_Storm/func_80BA7450.s b/asm/non_matchings/overlays/actors/ovl_Oceff_Storm/func_80BA7450.s index 9812c54faa..352306971a 100644 --- a/asm/non_matchings/overlays/actors/ovl_Oceff_Storm/func_80BA7450.s +++ b/asm/non_matchings/overlays/actors/ovl_Oceff_Storm/func_80BA7450.s @@ -11,7 +11,7 @@ glabel func_80BA7450 /* 00394 80BA7474 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000 /* 00398 80BA7478 27A40064 */ addiu $a0, $sp, 0x0064 ## $a0 = FFFFFFE4 /* 0039C 80BA747C 240701C1 */ addiu $a3, $zero, 0x01C1 ## $a3 = 000001C1 -/* 003A0 80BA7480 0C031AB1 */ jal func_800C6AC4 +/* 003A0 80BA7480 0C031AB1 */ jal Graph_OpenDisps /* 003A4 80BA7484 AFA50074 */ sw $a1, 0x0074($sp) /* 003A8 80BA7488 8FA30074 */ lw $v1, 0x0074($sp) /* 003AC 80BA748C 3C0BE700 */ lui $t3, 0xE700 ## $t3 = E7000000 @@ -83,7 +83,7 @@ glabel func_80BA7450 /* 004B4 80BA7594 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 004B8 80BA7598 AFA30074 */ sw $v1, 0x0074($sp) /* 004BC 80BA759C AFA2004C */ sw $v0, 0x004C($sp) -/* 004C0 80BA75A0 0C0253D0 */ jal Draw_TwoTexScroll +/* 004C0 80BA75A0 0C0253D0 */ jal Gfx_TwoTexScroll /* 004C4 80BA75A4 000A30C0 */ sll $a2, $t2, 3 /* 004C8 80BA75A8 8FA8004C */ lw $t0, 0x004C($sp) /* 004CC 80BA75AC 8FA30074 */ lw $v1, 0x0074($sp) @@ -114,7 +114,7 @@ glabel func_80BA7450 /* 00530 80BA7610 24C68C34 */ addiu $a2, $a2, %lo(D_80BA8C34) ## $a2 = 80BA8C34 /* 00534 80BA7614 27A40064 */ addiu $a0, $sp, 0x0064 ## $a0 = FFFFFFE4 /* 00538 80BA7618 240701DD */ addiu $a3, $zero, 0x01DD ## $a3 = 000001DD -/* 0053C 80BA761C 0C031AD5 */ jal func_800C6B54 +/* 0053C 80BA761C 0C031AD5 */ jal Graph_CloseDisps /* 00540 80BA7620 8D850000 */ lw $a1, 0x0000($t4) ## 00000008 /* 00544 80BA7624 8FBF0034 */ lw $ra, 0x0034($sp) /* 00548 80BA7628 27BD0080 */ addiu $sp, $sp, 0x0080 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_Oceff_Wipe/OceffWipe_Draw.s b/asm/non_matchings/overlays/actors/ovl_Oceff_Wipe/OceffWipe_Draw.s index 4e6b4edf40..2dc8cc8789 100644 --- a/asm/non_matchings/overlays/actors/ovl_Oceff_Wipe/OceffWipe_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Oceff_Wipe/OceffWipe_Draw.s @@ -30,7 +30,7 @@ glabel OceffWipe_Draw /* 0018C 80BA8F1C 24C69AE0 */ addiu $a2, $a2, %lo(D_80BA9AE0) ## $a2 = 80BA9AE0 /* 00190 80BA8F20 27A40070 */ addiu $a0, $sp, 0x0070 ## $a0 = FFFFFFB8 /* 00194 80BA8F24 2407015A */ addiu $a3, $zero, 0x015A ## $a3 = 0000015A -/* 00198 80BA8F28 0C031AB1 */ jal func_800C6AC4 +/* 00198 80BA8F28 0C031AB1 */ jal Graph_OpenDisps /* 0019C 80BA8F2C 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 /* 001A0 80BA8F30 8FAA00B8 */ lw $t2, 0x00B8($sp) /* 001A4 80BA8F34 8542014C */ lh $v0, 0x014C($t2) ## 0000014C @@ -242,7 +242,7 @@ glabel OceffWipe_Draw /* 004BC 80BA924C AFB80010 */ sw $t8, 0x0010($sp) /* 004C0 80BA9250 AFA70020 */ sw $a3, 0x0020($sp) /* 004C4 80BA9254 AFB90028 */ sw $t9, 0x0028($sp) -/* 004C8 80BA9258 0C0253D0 */ jal Draw_TwoTexScroll +/* 004C8 80BA9258 0C0253D0 */ jal Gfx_TwoTexScroll /* 004CC 80BA925C AFA20054 */ sw $v0, 0x0054($sp) /* 004D0 80BA9260 8FA30054 */ lw $v1, 0x0054($sp) /* 004D4 80BA9264 3C1880BB */ lui $t8, %hi(D_80BA99E8) ## $t8 = 80BB0000 @@ -258,7 +258,7 @@ glabel OceffWipe_Draw /* 004FC 80BA928C 8E250000 */ lw $a1, 0x0000($s1) ## 00000000 /* 00500 80BA9290 24C69B08 */ addiu $a2, $a2, %lo(D_80BA9B08) ## $a2 = 80BA9B08 /* 00504 80BA9294 27A40070 */ addiu $a0, $sp, 0x0070 ## $a0 = FFFFFFB8 -/* 00508 80BA9298 0C031AD5 */ jal func_800C6B54 +/* 00508 80BA9298 0C031AD5 */ jal Graph_CloseDisps /* 0050C 80BA929C 2407018E */ addiu $a3, $zero, 0x018E ## $a3 = 0000018E /* 00510 80BA92A0 8FBF003C */ lw $ra, 0x003C($sp) /* 00514 80BA92A4 8FB00034 */ lw $s0, 0x0034($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Oceff_Wipe2/OceffWipe2_Draw.s b/asm/non_matchings/overlays/actors/ovl_Oceff_Wipe2/OceffWipe2_Draw.s index c49b405d27..1ee7b0ab51 100644 --- a/asm/non_matchings/overlays/actors/ovl_Oceff_Wipe2/OceffWipe2_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Oceff_Wipe2/OceffWipe2_Draw.s @@ -90,7 +90,7 @@ glabel OceffWipe2_Draw /* 00268 80BA9E18 24C6B2C0 */ addiu $a2, $a2, %lo(D_80BAB2C0) ## $a2 = 80BAB2C0 /* 0026C 80BA9E1C 27A40068 */ addiu $a0, $sp, 0x0068 ## $a0 = FFFFFFB8 /* 00270 80BA9E20 24070186 */ addiu $a3, $zero, 0x0186 ## $a3 = 00000186 -/* 00274 80BA9E24 0C031AB1 */ jal func_800C6AC4 +/* 00274 80BA9E24 0C031AB1 */ jal Graph_OpenDisps /* 00278 80BA9E28 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 /* 0027C 80BA9E2C 0C024F61 */ jal func_80093D84 /* 00280 80BA9E30 8E240000 */ lw $a0, 0x0000($s1) ## 00000000 @@ -188,7 +188,7 @@ glabel OceffWipe2_Draw /* 003F0 80BA9FA0 AFAA0028 */ sw $t2, 0x0028($sp) /* 003F4 80BA9FA4 AFA00020 */ sw $zero, 0x0020($sp) /* 003F8 80BA9FA8 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 003FC 80BA9FAC 0C0253D0 */ jal Draw_TwoTexScroll +/* 003FC 80BA9FAC 0C0253D0 */ jal Gfx_TwoTexScroll /* 00400 80BA9FB0 AFA20054 */ sw $v0, 0x0054($sp) /* 00404 80BA9FB4 8FA30054 */ lw $v1, 0x0054($sp) /* 00408 80BA9FB8 3C0C80BB */ lui $t4, %hi(D_80BAB238) ## $t4 = 80BB0000 @@ -204,7 +204,7 @@ glabel OceffWipe2_Draw /* 00430 80BA9FE0 8E250000 */ lw $a1, 0x0000($s1) ## 00000000 /* 00434 80BA9FE4 24C6B2E8 */ addiu $a2, $a2, %lo(D_80BAB2E8) ## $a2 = 80BAB2E8 /* 00438 80BA9FE8 27A40068 */ addiu $a0, $sp, 0x0068 ## $a0 = FFFFFFB8 -/* 0043C 80BA9FEC 0C031AD5 */ jal func_800C6B54 +/* 0043C 80BA9FEC 0C031AD5 */ jal Graph_CloseDisps /* 00440 80BA9FF0 240701A1 */ addiu $a3, $zero, 0x01A1 ## $a3 = 000001A1 /* 00444 80BA9FF4 8FBF003C */ lw $ra, 0x003C($sp) /* 00448 80BA9FF8 8FB00034 */ lw $s0, 0x0034($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Oceff_Wipe3/OceffWipe3_Draw.s b/asm/non_matchings/overlays/actors/ovl_Oceff_Wipe3/OceffWipe3_Draw.s index 1745f26ef6..a9069c40ad 100644 --- a/asm/non_matchings/overlays/actors/ovl_Oceff_Wipe3/OceffWipe3_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Oceff_Wipe3/OceffWipe3_Draw.s @@ -90,7 +90,7 @@ glabel OceffWipe3_Draw /* 00268 80BAB658 24C6CAE0 */ addiu $a2, $a2, %lo(D_80BACAE0) ## $a2 = 80BACAE0 /* 0026C 80BAB65C 27A40068 */ addiu $a0, $sp, 0x0068 ## $a0 = FFFFFFB8 /* 00270 80BAB660 24070157 */ addiu $a3, $zero, 0x0157 ## $a3 = 00000157 -/* 00274 80BAB664 0C031AB1 */ jal func_800C6AC4 +/* 00274 80BAB664 0C031AB1 */ jal Graph_OpenDisps /* 00278 80BAB668 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 /* 0027C 80BAB66C 0C024F61 */ jal func_80093D84 /* 00280 80BAB670 8E240000 */ lw $a0, 0x0000($s1) ## 00000000 @@ -190,7 +190,7 @@ glabel OceffWipe3_Draw /* 003F8 80BAB7E8 00073880 */ sll $a3, $a3, 2 /* 003FC 80BAB7EC AFB80028 */ sw $t8, 0x0028($sp) /* 00400 80BAB7F0 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 00404 80BAB7F4 0C0253D0 */ jal Draw_TwoTexScroll +/* 00404 80BAB7F4 0C0253D0 */ jal Gfx_TwoTexScroll /* 00408 80BAB7F8 AFA20054 */ sw $v0, 0x0054($sp) /* 0040C 80BAB7FC 8FA30054 */ lw $v1, 0x0054($sp) /* 00410 80BAB800 3C0E80BB */ lui $t6, %hi(D_80BACA58) ## $t6 = 80BB0000 @@ -206,7 +206,7 @@ glabel OceffWipe3_Draw /* 00438 80BAB828 8E250000 */ lw $a1, 0x0000($s1) ## 00000000 /* 0043C 80BAB82C 24C6CB08 */ addiu $a2, $a2, %lo(D_80BACB08) ## $a2 = 80BACB08 /* 00440 80BAB830 27A40068 */ addiu $a0, $sp, 0x0068 ## $a0 = FFFFFFB8 -/* 00444 80BAB834 0C031AD5 */ jal func_800C6B54 +/* 00444 80BAB834 0C031AD5 */ jal Graph_CloseDisps /* 00448 80BAB838 24070172 */ addiu $a3, $zero, 0x0172 ## $a3 = 00000172 /* 0044C 80BAB83C 8FBF003C */ lw $ra, 0x003C($sp) /* 00450 80BAB840 8FB00034 */ lw $s0, 0x0034($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_Oceff_Wipe4/OceffWipe4_Draw.s b/asm/non_matchings/overlays/actors/ovl_Oceff_Wipe4/OceffWipe4_Draw.s index 83227ee003..4f24a5016e 100644 --- a/asm/non_matchings/overlays/actors/ovl_Oceff_Wipe4/OceffWipe4_Draw.s +++ b/asm/non_matchings/overlays/actors/ovl_Oceff_Wipe4/OceffWipe4_Draw.s @@ -88,7 +88,7 @@ glabel OceffWipe4_Draw /* 00238 80BACE48 24C6DB80 */ addiu $a2, $a2, %lo(D_80BADB80) ## $a2 = 80BADB80 /* 0023C 80BACE4C 27A40068 */ addiu $a0, $sp, 0x0068 ## $a0 = FFFFFFB8 /* 00240 80BACE50 2407013A */ addiu $a3, $zero, 0x013A ## $a3 = 0000013A -/* 00244 80BACE54 0C031AB1 */ jal func_800C6AC4 +/* 00244 80BACE54 0C031AB1 */ jal Graph_OpenDisps /* 00248 80BACE58 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 /* 0024C 80BACE5C 0C024F61 */ jal func_80093D84 /* 00250 80BACE60 8E240000 */ lw $a0, 0x0000($s1) ## 00000000 @@ -191,7 +191,7 @@ glabel OceffWipe4_Draw /* 003CC 80BACFDC AFAE0010 */ sw $t6, 0x0010($sp) /* 003D0 80BACFE0 AFA20054 */ sw $v0, 0x0054($sp) /* 003D4 80BACFE4 AFA90020 */ sw $t1, 0x0020($sp) -/* 003D8 80BACFE8 0C0253D0 */ jal Draw_TwoTexScroll +/* 003D8 80BACFE8 0C0253D0 */ jal Gfx_TwoTexScroll /* 003DC 80BACFEC 00093040 */ sll $a2, $t1, 1 /* 003E0 80BACFF0 8FA30054 */ lw $v1, 0x0054($sp) /* 003E4 80BACFF4 3C0D80BB */ lui $t5, %hi(D_80BADAF8) ## $t5 = 80BB0000 @@ -207,7 +207,7 @@ glabel OceffWipe4_Draw /* 0040C 80BAD01C 8E250000 */ lw $a1, 0x0000($s1) ## 00000000 /* 00410 80BAD020 24C6DBA8 */ addiu $a2, $a2, %lo(D_80BADBA8) ## $a2 = 80BADBA8 /* 00414 80BAD024 27A40068 */ addiu $a0, $sp, 0x0068 ## $a0 = FFFFFFB8 -/* 00418 80BAD028 0C031AD5 */ jal func_800C6B54 +/* 00418 80BAD028 0C031AD5 */ jal Graph_CloseDisps /* 0041C 80BAD02C 24070158 */ addiu $a3, $zero, 0x0158 ## $a3 = 00000158 /* 00420 80BAD030 8FBF003C */ lw $ra, 0x003C($sp) /* 00424 80BAD034 8FB00034 */ lw $s0, 0x0034($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_80813820.s b/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_80813820.s index a30e661109..05b4cca492 100644 --- a/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_80813820.s +++ b/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_80813820.s @@ -15,7 +15,7 @@ glabel func_80813820 /* 00034 80813854 AFB00020 */ sw $s0, 0x0020($sp) /* 00038 80813858 24C6F420 */ addiu $a2, $a2, %lo(D_8082F420) ## $a2 = 8082F420 /* 0003C 8081385C 27A401F4 */ addiu $a0, $sp, 0x01F4 ## $a0 = FFFFFFC4 -/* 00040 80813860 0C031AB1 */ jal func_800C6AC4 +/* 00040 80813860 0C031AB1 */ jal Graph_OpenDisps /* 00044 80813864 240700F8 */ addiu $a3, $zero, 0x00F8 ## $a3 = 000000F8 /* 00048 80813868 3C010001 */ lui $at, 0x0001 ## $at = 00010000 /* 0004C 8081386C 34210760 */ ori $at, $at, 0x0760 ## $at = 00010760 @@ -2485,7 +2485,7 @@ glabel func_80813820 /* 02464 80815C84 24C6F4A0 */ addiu $a2, $a2, %lo(D_8082F4A0) ## $a2 = 8082F4A0 /* 02468 80815C88 27A401F4 */ addiu $a0, $sp, 0x01F4 ## $a0 = FFFFFFC4 /* 0246C 80815C8C 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 02470 80815C90 0C031AD5 */ jal func_800C6B54 +/* 02470 80815C90 0C031AD5 */ jal Graph_CloseDisps /* 02474 80815C94 2407035F */ addiu $a3, $zero, 0x035F ## $a3 = 0000035F /* 02478 80815C98 8FBF0044 */ lw $ra, 0x0044($sp) /* 0247C 80815C9C 8FB00020 */ lw $s0, 0x0020($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_80815FD4.s b/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_80815FD4.s index 075bad78d9..0fa309eab9 100644 --- a/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_80815FD4.s +++ b/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_80815FD4.s @@ -10,7 +10,7 @@ glabel func_80815FD4 /* 027D4 80815FF4 24C6F594 */ addiu $a2, $a2, %lo(D_8082F594) ## $a2 = 8082F594 /* 027D8 80815FF8 27A40044 */ addiu $a0, $sp, 0x0044 ## $a0 = FFFFFFEC /* 027DC 80815FFC 240700D0 */ addiu $a3, $zero, 0x00D0 ## $a3 = 000000D0 -/* 027E0 80816000 0C031AB1 */ jal func_800C6AC4 +/* 027E0 80816000 0C031AB1 */ jal Graph_OpenDisps /* 027E4 80816004 AFA50054 */ sw $a1, 0x0054($sp) /* 027E8 80816008 8FA30054 */ lw $v1, 0x0054($sp) /* 027EC 8081600C 8FA50060 */ lw $a1, 0x0060($sp) @@ -111,7 +111,7 @@ glabel func_80815FD4 /* 02968 80816188 24C6F5AC */ addiu $a2, $a2, %lo(D_8082F5AC) ## $a2 = 8082F5AC /* 0296C 8081618C 27A40044 */ addiu $a0, $sp, 0x0044 ## $a0 = FFFFFFEC /* 02970 80816190 240700DC */ addiu $a3, $zero, 0x00DC ## $a3 = 000000DC -/* 02974 80816194 0C031AD5 */ jal func_800C6B54 +/* 02974 80816194 0C031AD5 */ jal Graph_CloseDisps /* 02978 80816198 8D050000 */ lw $a1, 0x0000($t0) ## 00000008 /* 0297C 8081619C 8FBF0014 */ lw $ra, 0x0014($sp) /* 02980 808161A0 27BD0058 */ addiu $sp, $sp, 0x0058 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_808161AC.s b/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_808161AC.s index e8ef45baaf..5054e0e7ad 100644 --- a/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_808161AC.s +++ b/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_808161AC.s @@ -20,7 +20,7 @@ glabel func_808161AC /* 029D4 808161F4 27A400B4 */ addiu $a0, $sp, 0x00B4 ## $a0 = FFFFFFC4 /* 029D8 808161F8 24C6F5C4 */ addiu $a2, $a2, %lo(D_8082F5C4) ## $a2 = 8082F5C4 /* 029DC 808161FC 24070192 */ addiu $a3, $zero, 0x0192 ## $a3 = 00000192 -/* 029E0 80816200 0C031AB1 */ jal func_800C6AC4 +/* 029E0 80816200 0C031AB1 */ jal Graph_OpenDisps /* 029E4 80816204 AFA500C4 */ sw $a1, 0x00C4($sp) /* 029E8 80816208 8FA200F0 */ lw $v0, 0x00F0($sp) /* 029EC 8081620C 3C010001 */ lui $at, 0x0001 ## $at = 00010000 @@ -86,7 +86,7 @@ glabel func_808161AC /* 02ADC 808162FC AC580004 */ sw $t8, 0x0004($v0) ## 00000004 /* 02AE0 80816300 AC4F0000 */ sw $t7, 0x0000($v0) ## 00000000 /* 02AE4 80816304 8CB002C0 */ lw $s0, 0x02C0($a1) ## 000002C0 -/* 02AE8 80816308 0C031B08 */ jal func_800C6C20 +/* 02AE8 80816308 0C031B08 */ jal Graph_GfxPlusOne /* 02AEC 8081630C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 02AF0 80816310 8FA500C4 */ lw $a1, 0x00C4($sp) /* 02AF4 80816314 AFA200E4 */ sw $v0, 0x00E4($sp) @@ -106,7 +106,7 @@ glabel func_808161AC /* 02B2C 8081634C AFAC00E4 */ sw $t4, 0x00E4($sp) /* 02B30 80816350 AD600004 */ sw $zero, 0x0004($t3) ## 00000004 /* 02B34 80816354 AD6D0000 */ sw $t5, 0x0000($t3) ## 00000000 -/* 02B38 80816358 0C031B0A */ jal func_800C6C28 +/* 02B38 80816358 0C031B0A */ jal Graph_BranchDlist /* 02B3C 8081635C 8FA500E4 */ lw $a1, 0x00E4($sp) /* 02B40 80816360 8FAE00E4 */ lw $t6, 0x00E4($sp) /* 02B44 80816364 8FA800C4 */ lw $t0, 0x00C4($sp) @@ -1891,7 +1891,7 @@ glabel func_808161AC /* 044F0 80817D10 8FAA00F0 */ lw $t2, 0x00F0($sp) .L80817D14: /* 044F4 80817D14 2407035D */ addiu $a3, $zero, 0x035D ## $a3 = 0000035D -/* 044F8 80817D18 0C031AD5 */ jal func_800C6B54 +/* 044F8 80817D18 0C031AD5 */ jal Graph_CloseDisps /* 044FC 80817D1C 8D450000 */ lw $a1, 0x0000($t2) ## F682A21C /* 04500 80817D20 8FBF003C */ lw $ra, 0x003C($sp) /* 04504 80817D24 8FB00018 */ lw $s0, 0x0018($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_80817D50.s b/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_80817D50.s index 76ce01b96c..29a2b7ad72 100644 --- a/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_80817D50.s +++ b/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_80817D50.s @@ -10,7 +10,7 @@ glabel func_80817D50 /* 04550 80817D70 24C6F600 */ addiu $a2, $a2, %lo(D_8082F600) ## $a2 = 8082F600 /* 04554 80817D74 27A400A0 */ addiu $a0, $sp, 0x00A0 ## $a0 = FFFFFFC8 /* 04558 80817D78 24070044 */ addiu $a3, $zero, 0x0044 ## $a3 = 00000044 -/* 0455C 80817D7C 0C031AB1 */ jal func_800C6AC4 +/* 0455C 80817D7C 0C031AB1 */ jal Graph_OpenDisps /* 04560 80817D80 AFA500B0 */ sw $a1, 0x00B0($sp) /* 04564 80817D84 8FA800B0 */ lw $t0, 0x00B0($sp) /* 04568 80817D88 8FAA00E0 */ lw $t2, 0x00E0($sp) @@ -279,7 +279,7 @@ glabel func_80817D50 /* 04958 80818178 24C6F61C */ addiu $a2, $a2, %lo(D_8082F61C) ## $a2 = 8082F61C /* 0495C 8081817C 27A400A0 */ addiu $a0, $sp, 0x00A0 ## $a0 = FFFFFFC8 /* 04960 80818180 2407007A */ addiu $a3, $zero, 0x007A ## $a3 = 0000007A -/* 04964 80818184 0C031AD5 */ jal func_800C6B54 +/* 04964 80818184 0C031AD5 */ jal Graph_CloseDisps /* 04968 80818188 8F250000 */ lw $a1, 0x0000($t9) ## F2000000 /* 0496C 8081818C 8FBF0014 */ lw $ra, 0x0014($sp) /* 04970 80818190 27BD00D8 */ addiu $sp, $sp, 0x00D8 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_80818340.s b/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_80818340.s index 431ed3deb9..48b8e4d00d 100644 --- a/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_80818340.s +++ b/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_80818340.s @@ -16,7 +16,7 @@ glabel func_80818340 /* 04B58 80818378 24C6F638 */ addiu $a2, $a2, %lo(D_8082F638) ## $a2 = 8082F638 /* 04B5C 8081837C 27A4009C */ addiu $a0, $sp, 0x009C ## $a0 = FFFFFFC4 /* 04B60 80818380 240700DB */ addiu $a3, $zero, 0x00DB ## $a3 = 000000DB -/* 04B64 80818384 0C031AB1 */ jal func_800C6AC4 +/* 04B64 80818384 0C031AB1 */ jal Graph_OpenDisps /* 04B68 80818388 AFA500AC */ sw $a1, 0x00AC($sp) /* 04B6C 8081838C 8FA500AC */ lw $a1, 0x00AC($sp) /* 04B70 80818390 3C17E700 */ lui $s7, 0xE700 ## $s7 = E7000000 @@ -1443,7 +1443,7 @@ glabel func_80818340 /* 0603C 8081985C 24C6F6E8 */ addiu $a2, $a2, %lo(D_8082F6E8) ## $a2 = 8082F6E8 /* 06040 80819860 27A4009C */ addiu $a0, $sp, 0x009C ## $a0 = FFFFFFC4 /* 06044 80819864 24070261 */ addiu $a3, $zero, 0x0261 ## $a3 = 00000261 -/* 06048 80819868 0C031AD5 */ jal func_800C6B54 +/* 06048 80819868 0C031AD5 */ jal Graph_CloseDisps /* 0604C 8081986C 8D850000 */ lw $a1, 0x0000($t4) ## 00000000 /* 06050 80819870 8FBF0044 */ lw $ra, 0x0044($sp) /* 06054 80819874 8FB00020 */ lw $s0, 0x0020($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_808198A0.s b/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_808198A0.s index 11b6a6d506..642779b50f 100644 --- a/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_808198A0.s +++ b/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_808198A0.s @@ -7,7 +7,7 @@ glabel func_808198A0 /* 06094 808198B4 24C6F710 */ addiu $a2, $a2, %lo(D_8082F710) ## $a2 = 8082F710 /* 06098 808198B8 27A40080 */ addiu $a0, $sp, 0x0080 ## $a0 = FFFFFFE8 /* 0609C 808198BC AFA5009C */ sw $a1, 0x009C($sp) -/* 060A0 808198C0 0C031AB1 */ jal func_800C6AC4 +/* 060A0 808198C0 0C031AB1 */ jal Graph_OpenDisps /* 060A4 808198C4 24070045 */ addiu $a3, $zero, 0x0045 ## $a3 = 00000045 /* 060A8 808198C8 87A900A2 */ lh $t1, 0x00A2($sp) /* 060AC 808198CC 3C0E8012 */ lui $t6, 0x8012 ## $t6 = 80120000 @@ -357,7 +357,7 @@ glabel func_808198A0 /* 065D0 80819DF0 24180602 */ addiu $t8, $zero, 0x0602 ## $t8 = 00000602 /* 065D4 80819DF4 24C6F724 */ addiu $a2, $a2, %lo(D_8082F724) ## $a2 = 8082F724 /* 065D8 80819DF8 AC580004 */ sw $t8, 0x0004($v0) ## 80127200 -/* 065DC 80819DFC 0C031AD5 */ jal func_800C6B54 +/* 065DC 80819DFC 0C031AD5 */ jal Graph_CloseDisps /* 065E0 80819E00 AC4F0000 */ sw $t7, 0x0000($v0) ## 801271FC /* 065E4 80819E04 8FBF0014 */ lw $ra, 0x0014($sp) /* 065E8 80819E08 27BD0098 */ addiu $sp, $sp, 0x0098 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_80819E6C.s b/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_80819E6C.s index e9d24490d6..2b8f0b3cc6 100644 --- a/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_80819E6C.s +++ b/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_80819E6C.s @@ -13,7 +13,7 @@ glabel func_80819E6C /* 06678 80819E98 24C6F738 */ addiu $a2, $a2, %lo(D_8082F738) ## $a2 = 8082F738 /* 0667C 80819E9C 27A40088 */ addiu $a0, $sp, 0x0088 ## $a0 = FFFFFFD0 /* 06680 80819EA0 240700EA */ addiu $a3, $zero, 0x00EA ## $a3 = 000000EA -/* 06684 80819EA4 0C031AB1 */ jal func_800C6AC4 +/* 06684 80819EA4 0C031AB1 */ jal Graph_OpenDisps /* 06688 80819EA8 00A09825 */ or $s3, $a1, $zero ## $s3 = 00000000 /* 0668C 80819EAC 8FAF00B8 */ lw $t7, 0x00B8($sp) /* 06690 80819EB0 0C02526A */ jal func_800949A8 @@ -1012,7 +1012,7 @@ glabel func_80819E6C /* 074EC 8081AD0C 24C6F7D8 */ addiu $a2, $a2, %lo(D_8082F7D8) ## $a2 = 8082F7D8 /* 074F0 8081AD10 27A40088 */ addiu $a0, $sp, 0x0088 ## $a0 = FFFFFFD0 /* 074F4 8081AD14 24070204 */ addiu $a3, $zero, 0x0204 ## $a3 = 00000204 -/* 074F8 8081AD18 0C031AD5 */ jal func_800C6B54 +/* 074F8 8081AD18 0C031AD5 */ jal Graph_CloseDisps /* 074FC 8081AD1C 8DC50000 */ lw $a1, 0x0000($t6) ## 00000000 /* 07500 8081AD20 8FBF0034 */ lw $ra, 0x0034($sp) /* 07504 8081AD24 8FB0001C */ lw $s0, 0x001C($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_8081BB10.s b/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_8081BB10.s index 63a49523d0..17cad90967 100644 --- a/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_8081BB10.s +++ b/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_8081BB10.s @@ -9,7 +9,7 @@ glabel func_8081BB10 /* 0830C 8081BB2C AFB10024 */ sw $s1, 0x0024($sp) /* 08310 8081BB30 24C6F9C0 */ addiu $a2, $a2, %lo(D_8082F9C0) ## $a2 = 8082F9C0 /* 08314 8081BB34 27A401C4 */ addiu $a0, $sp, 0x01C4 ## $a0 = FFFFFFD4 -/* 08318 8081BB38 0C031AB1 */ jal func_800C6AC4 +/* 08318 8081BB38 0C031AB1 */ jal Graph_OpenDisps /* 0831C 8081BB3C 2407007B */ addiu $a3, $zero, 0x007B ## $a3 = 0000007B /* 08320 8081BB40 8FB101F0 */ lw $s1, 0x01F0($sp) /* 08324 8081BB44 3C010001 */ lui $at, 0x0001 ## $at = 00010000 @@ -1617,7 +1617,7 @@ glabel func_8081BB10 /* 09B4C 8081D36C ACD80004 */ sw $t8, 0x0004($a2) ## 80830004 /* 09B50 8081D370 ACC90000 */ sw $t1, 0x0000($a2) ## 80830000 /* 09B54 8081D374 3C068083 */ lui $a2, %hi(D_8082FA10) ## $a2 = 80830000 -/* 09B58 8081D378 0C031AD5 */ jal func_800C6B54 +/* 09B58 8081D378 0C031AD5 */ jal Graph_CloseDisps /* 09B5C 8081D37C 24C6FA10 */ addiu $a2, $a2, %lo(D_8082FA10) ## $a2 = 8082FA10 /* 09B60 8081D380 8FBF002C */ lw $ra, 0x002C($sp) /* 09B64 8081D384 8FB00020 */ lw $s0, 0x0020($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_8081D398.s b/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_8081D398.s index ab46640fb5..4b3f666e44 100644 --- a/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_8081D398.s +++ b/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_8081D398.s @@ -19,7 +19,7 @@ glabel func_8081D398 /* 09BBC 8081D3DC 24C6FA28 */ addiu $a2, $a2, %lo(D_8082FA28) ## $a2 = 8082FA28 /* 09BC0 8081D3E0 AFB60284 */ sw $s6, 0x0284($sp) /* 09BC4 8081D3E4 27A40260 */ addiu $a0, $sp, 0x0260 ## $a0 = FFFFFFD8 -/* 09BC8 8081D3E8 0C031AB1 */ jal func_800C6AC4 +/* 09BC8 8081D3E8 0C031AB1 */ jal Graph_OpenDisps /* 09BCC 8081D3EC 2407022C */ addiu $a3, $zero, 0x022C ## $a3 = 0000022C /* 09BD0 8081D3F0 96CE01D4 */ lhu $t6, 0x01D4($s6) ## 000001D4 /* 09BD4 8081D3F4 24010006 */ addiu $at, $zero, 0x0006 ## $at = 00000006 @@ -620,13 +620,13 @@ glabel func_8081D398 /* 0A4BC 8081DCDC 8FB101CC */ lw $s1, 0x01CC($sp) /* 0A4C0 8081DCE0 26390008 */ addiu $t9, $s1, 0x0008 ## $t9 = 0C000008 /* 0A4C4 8081DCE4 AFB901CC */ sw $t9, 0x01CC($sp) -/* 0A4C8 8081DCE8 0C034B88 */ jal func_800D2E20 +/* 0A4C8 8081DCE8 0C034B88 */ jal SysUcode_GetUcodeData /* 0A4CC 8081DCEC AE320000 */ sw $s2, 0x0000($s1) ## 0C000000 /* 0A4D0 8081DCF0 AE220004 */ sw $v0, 0x0004($s1) ## 0C000004 /* 0A4D4 8081DCF4 8FB101CC */ lw $s1, 0x01CC($sp) /* 0A4D8 8081DCF8 262E0008 */ addiu $t6, $s1, 0x0008 ## $t6 = 0C000008 /* 0A4DC 8081DCFC AFAE01CC */ sw $t6, 0x01CC($sp) -/* 0A4E0 8081DD00 0C034B85 */ jal func_800D2E14 +/* 0A4E0 8081DD00 0C034B85 */ jal SysUcode_GetUcode /* 0A4E4 8081DD04 AE330000 */ sw $s3, 0x0000($s1) ## 0C000000 /* 0A4E8 8081DD08 AE220004 */ sw $v0, 0x0004($s1) ## 0C000004 /* 0A4EC 8081DD0C 8FB801CC */ lw $t8, 0x01CC($sp) @@ -1897,7 +1897,7 @@ glabel func_8081D398 /* 0B78C 8081EFAC ACC00004 */ sw $zero, 0x0004($a2) ## 00000004 /* 0B790 8081EFB0 ACC30000 */ sw $v1, 0x0000($a2) ## 00000000 /* 0B794 8081EFB4 3C068083 */ lui $a2, %hi(D_8082FA40) ## $a2 = 80830000 -/* 0B798 8081EFB8 0C031AD5 */ jal func_800C6B54 +/* 0B798 8081EFB8 0C031AD5 */ jal Graph_CloseDisps /* 0B79C 8081EFBC 24C6FA40 */ addiu $a2, $a2, %lo(D_8082FA40) ## $a2 = 8082FA40 /* 0B7A0 8081EFC0 8FBF005C */ lw $ra, 0x005C($sp) /* 0B7A4 8081EFC4 8FB00038 */ lw $s0, 0x0038($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_8081F1F0.s b/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_8081F1F0.s index e32ba5fba6..e2fb902883 100644 --- a/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_8081F1F0.s +++ b/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_8081F1F0.s @@ -10,10 +10,10 @@ glabel func_8081F1F0 /* 0B9F0 8081F210 27A40038 */ addiu $a0, $sp, 0x0038 ## $a0 = FFFFFFE0 /* 0B9F4 8081F214 240701F0 */ addiu $a3, $zero, 0x01F0 ## $a3 = 000001F0 /* 0B9F8 8081F218 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 -/* 0B9FC 8081F21C 0C031AB1 */ jal func_800C6AC4 +/* 0B9FC 8081F21C 0C031AB1 */ jal Graph_OpenDisps /* 0BA00 8081F220 AFAF004C */ sw $t7, 0x004C($sp) /* 0BA04 8081F224 8E0402C0 */ lw $a0, 0x02C0($s0) ## 000002C0 -/* 0BA08 8081F228 0C031B08 */ jal func_800C6C20 +/* 0BA08 8081F228 0C031B08 */ jal Graph_GfxPlusOne /* 0BA0C 8081F22C AFA40050 */ sw $a0, 0x0050($sp) /* 0BA10 8081F230 AFA20054 */ sw $v0, 0x0054($sp) /* 0BA14 8081F234 8E0301BC */ lw $v1, 0x01BC($s0) ## 000001BC @@ -45,7 +45,7 @@ glabel func_8081F1F0 /* 0BA7C 8081F29C AD200004 */ sw $zero, 0x0004($t1) ## 00000004 /* 0BA80 8081F2A0 AD2B0000 */ sw $t3, 0x0000($t1) ## 00000000 /* 0BA84 8081F2A4 8FA50054 */ lw $a1, 0x0054($sp) -/* 0BA88 8081F2A8 0C031B0A */ jal func_800C6C28 +/* 0BA88 8081F2A8 0C031B0A */ jal Graph_BranchDlist /* 0BA8C 8081F2AC 8FA40050 */ lw $a0, 0x0050($sp) /* 0BA90 8081F2B0 8FAC0054 */ lw $t4, 0x0054($sp) /* 0BA94 8081F2B4 3C038016 */ lui $v1, 0x8016 ## $v1 = 80160000 @@ -59,7 +59,7 @@ glabel func_8081F1F0 /* 0BAB4 8081F2D4 35AE0001 */ ori $t6, $t5, 0x0001 ## $t6 = 00000001 /* 0BAB8 8081F2D8 A46E0116 */ sh $t6, 0x0116($v1) ## 80160116 /* 0BABC 8081F2DC 8FAF0058 */ lw $t7, 0x0058($sp) -/* 0BAC0 8081F2E0 0C031AD5 */ jal func_800C6B54 +/* 0BAC0 8081F2E0 0C031AD5 */ jal Graph_CloseDisps /* 0BAC4 8081F2E4 8DE50000 */ lw $a1, 0x0000($t7) ## 00000000 /* 0BAC8 8081F2E8 8FBF0024 */ lw $ra, 0x0024($sp) /* 0BACC 8081F2EC 8FB00020 */ lw $s0, 0x0020($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_8081F87C.s b/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_8081F87C.s index c25e0c4431..8e28638d3b 100644 --- a/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_8081F87C.s +++ b/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_8081F87C.s @@ -10,7 +10,7 @@ glabel func_8081F87C /* 0C07C 8081F89C 24C6FA98 */ addiu $a2, $a2, %lo(D_8082FA98) ## $a2 = 8082FA98 /* 0C080 8081F8A0 240702EC */ addiu $a3, $zero, 0x02EC ## $a3 = 000002EC /* 0C084 8081F8A4 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 0C088 8081F8A8 0C031AB1 */ jal func_800C6AC4 +/* 0C088 8081F8A8 0C031AB1 */ jal Graph_OpenDisps /* 0C08C 8081F8AC 27A4005C */ addiu $a0, $sp, 0x005C ## $a0 = FFFFFFEC /* 0C090 8081F8B0 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 /* 0C094 8081F8B4 3C0FFD18 */ lui $t7, 0xFD18 ## $t7 = FD180000 @@ -144,7 +144,7 @@ glabel func_8081F87C /* 0C274 8081FA94 24C6FAB4 */ addiu $a2, $a2, %lo(D_8082FAB4) ## $a2 = 8082FAB4 /* 0C278 8081FA98 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 0C27C 8081FA9C AC4B0000 */ sw $t3, 0x0000($v0) ## 00000000 -/* 0C280 8081FAA0 0C031AD5 */ jal func_800C6B54 +/* 0C280 8081FAA0 0C031AD5 */ jal Graph_CloseDisps /* 0C284 8081FAA4 AC4F0004 */ sw $t7, 0x0004($v0) ## 00000004 /* 0C288 8081FAA8 8FBF001C */ lw $ra, 0x001C($sp) /* 0C28C 8081FAAC 8FB00018 */ lw $s0, 0x0018($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_8081FE30.s b/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_8081FE30.s index eb66040fde..74eb3591d9 100644 --- a/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_8081FE30.s +++ b/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_8081FE30.s @@ -8,7 +8,7 @@ glabel func_8081FE30 /* 0C628 8081FE48 24C6FAEC */ addiu $a2, $a2, %lo(D_8082FAEC) ## $a2 = 8082FAEC /* 0C62C 8081FE4C 27A40064 */ addiu $a0, $sp, 0x0064 ## $a0 = FFFFFFE4 /* 0C630 8081FE50 240703BB */ addiu $a3, $zero, 0x03BB ## $a3 = 000003BB -/* 0C634 8081FE54 0C031AB1 */ jal func_800C6AC4 +/* 0C634 8081FE54 0C031AB1 */ jal Graph_OpenDisps /* 0C638 8081FE58 AFA50074 */ sw $a1, 0x0074($sp) /* 0C63C 8081FE5C 8FA50080 */ lw $a1, 0x0080($sp) /* 0C640 8081FE60 3C010001 */ lui $at, 0x0001 ## $at = 00010000 @@ -216,7 +216,7 @@ glabel func_8081FE30 /* 0C948 80820168 3C068083 */ lui $a2, %hi(D_8082FB08) ## $a2 = 80830000 /* 0C94C 8082016C 24C6FB08 */ addiu $a2, $a2, %lo(D_8082FB08) ## $a2 = 8082FB08 /* 0C950 80820170 240703D9 */ addiu $a3, $zero, 0x03D9 ## $a3 = 000003D9 -/* 0C954 80820174 0C031AD5 */ jal func_800C6B54 +/* 0C954 80820174 0C031AD5 */ jal Graph_CloseDisps /* 0C958 80820178 8F250000 */ lw $a1, 0x0000($t9) ## E7000000 /* 0C95C 8082017C 8FBF0014 */ lw $ra, 0x0014($sp) /* 0C960 80820180 27BD0080 */ addiu $sp, $sp, 0x0080 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_80820434.s b/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_80820434.s index 12a004a41c..7c9b006fdf 100644 --- a/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_80820434.s +++ b/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_80820434.s @@ -8,7 +8,7 @@ glabel func_80820434 /* 0CC2C 8082044C AFB10020 */ sw $s1, 0x0020($sp) /* 0CC30 80820450 24C6FB24 */ addiu $a2, $a2, %lo(D_8082FB24) ## $a2 = 8082FB24 /* 0CC34 80820454 27A400F8 */ addiu $a0, $sp, 0x00F8 ## $a0 = FFFFFFE0 -/* 0CC38 80820458 0C031AB1 */ jal func_800C6AC4 +/* 0CC38 80820458 0C031AB1 */ jal Graph_OpenDisps /* 0CC3C 8082045C 2407044C */ addiu $a3, $zero, 0x044C ## $a3 = 0000044C /* 0CC40 80820460 8FB10118 */ lw $s1, 0x0118($sp) /* 0CC44 80820464 3C010001 */ lui $at, 0x0001 ## $at = 00010000 @@ -1587,7 +1587,7 @@ glabel func_80820434 /* 0E3C8 80821BE8 24C6FC3C */ addiu $a2, $a2, %lo(D_8082FC3C) ## $a2 = 8082FC3C /* 0E3CC 80821BEC 27A400F8 */ addiu $a0, $sp, 0x00F8 ## $a0 = FFFFFFE0 /* 0E3D0 80821BF0 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 0E3D4 80821BF4 0C031AD5 */ jal func_800C6B54 +/* 0E3D4 80821BF4 0C031AD5 */ jal Graph_CloseDisps /* 0E3D8 80821BF8 24070629 */ addiu $a3, $zero, 0x0629 ## $a3 = 00000629 /* 0E3DC 80821BFC 8FBF0024 */ lw $ra, 0x0024($sp) /* 0E3E0 80821C00 8FB0001C */ lw $s0, 0x001C($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_80821C10.s b/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_80821C10.s index 78cac2313b..9b7700e8e7 100644 --- a/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_80821C10.s +++ b/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_80821C10.s @@ -7,7 +7,7 @@ glabel func_80821C10 /* 0E404 80821C24 24C6FC58 */ addiu $a2, $a2, %lo(D_8082FC58) ## $a2 = 8082FC58 /* 0E408 80821C28 27A400E0 */ addiu $a0, $sp, 0x00E0 ## $a0 = FFFFFFD8 /* 0E40C 80821C2C 2407068C */ addiu $a3, $zero, 0x068C ## $a3 = 0000068C -/* 0E410 80821C30 0C031AB1 */ jal func_800C6AC4 +/* 0E410 80821C30 0C031AB1 */ jal Graph_OpenDisps /* 0E414 80821C34 AFA500F0 */ sw $a1, 0x00F0($sp) /* 0E418 80821C38 3C0D8083 */ lui $t5, %hi(D_8082AE04) ## $t5 = 80830000 /* 0E41C 80821C3C 85ADAE04 */ lh $t5, %lo(D_8082AE04)($t5) @@ -1667,7 +1667,7 @@ glabel func_80821C10 /* 0FD04 80823524 24C6FCC8 */ addiu $a2, $a2, %lo(D_8082FCC8) ## $a2 = 8082FCC8 /* 0FD08 80823528 27A400E0 */ addiu $a0, $sp, 0x00E0 ## $a0 = FFFFFFD8 /* 0FD0C 8082352C 240707F0 */ addiu $a3, $zero, 0x07F0 ## $a3 = 000007F0 -/* 0FD10 80823530 0C031AD5 */ jal func_800C6B54 +/* 0FD10 80823530 0C031AD5 */ jal Graph_CloseDisps /* 0FD14 80823534 8DC50000 */ lw $a1, 0x0000($t6) ## 00000000 /* 0FD18 80823538 8FBF001C */ lw $ra, 0x001C($sp) /* 0FD1C 8082353C 27BD0108 */ addiu $sp, $sp, 0x0108 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_80825C14.s b/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_80825C14.s index 2718c46a0d..7500677c5c 100644 --- a/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_80825C14.s +++ b/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_80825C14.s @@ -7,7 +7,7 @@ glabel func_80825C14 /* 12408 80825C28 24C6FD40 */ addiu $a2, $a2, %lo(D_8082FD40) ## $a2 = 8082FD40 /* 1240C 80825C2C 27A400C8 */ addiu $a0, $sp, 0x00C8 ## $a0 = FFFFFFE8 /* 12410 80825C30 24070C32 */ addiu $a3, $zero, 0x0C32 ## $a3 = 00000C32 -/* 12414 80825C34 0C031AB1 */ jal func_800C6AC4 +/* 12414 80825C34 0C031AB1 */ jal Graph_OpenDisps /* 12418 80825C38 AFA500DC */ sw $a1, 0x00DC($sp) /* 1241C 80825C3C 0C025131 */ jal func_800944C4 /* 12420 80825C40 8FA400DC */ lw $a0, 0x00DC($sp) @@ -418,7 +418,7 @@ glabel func_80825C14 /* 12A74 80826294 24590008 */ addiu $t9, $v0, 0x0008 ## $t9 = 00000008 /* 12A78 80826298 ACB902C0 */ sw $t9, 0x02C0($a1) ## 000002C0 /* 12A7C 8082629C AC4F0004 */ sw $t7, 0x0004($v0) ## 00000004 -/* 12A80 808262A0 0C031AD5 */ jal func_800C6B54 +/* 12A80 808262A0 0C031AD5 */ jal Graph_CloseDisps /* 12A84 808262A4 AC580000 */ sw $t8, 0x0000($v0) ## 00000000 /* 12A88 808262A8 8FBF0014 */ lw $ra, 0x0014($sp) /* 12A8C 808262AC 27BD00E0 */ addiu $sp, $sp, 0x00E0 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_808262B8.s b/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_808262B8.s index c45709debc..82f5ed2d10 100644 --- a/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_808262B8.s +++ b/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_808262B8.s @@ -9,7 +9,7 @@ glabel func_808262B8 /* 12AB4 808262D4 24C6FD78 */ addiu $a2, $a2, %lo(D_8082FD78) ## $a2 = 8082FD78 /* 12AB8 808262D8 27A40048 */ addiu $a0, $sp, 0x0048 ## $a0 = FFFFFFE0 /* 12ABC 808262DC 24070C74 */ addiu $a3, $zero, 0x0C74 ## $a3 = 00000C74 -/* 12AC0 808262E0 0C031AB1 */ jal func_800C6AC4 +/* 12AC0 808262E0 0C031AB1 */ jal Graph_OpenDisps /* 12AC4 808262E4 AFA50058 */ sw $a1, 0x0058($sp) /* 12AC8 808262E8 26220014 */ addiu $v0, $s1, 0x0014 ## $v0 = 00000014 /* 12ACC 808262EC 804E0014 */ lb $t6, 0x0014($v0) ## 00000028 @@ -147,7 +147,7 @@ glabel func_808262B8 /* 12CC4 808264E4 24C6FD94 */ addiu $a2, $a2, %lo(D_8082FD94) ## $a2 = 8082FD94 /* 12CC8 808264E8 27A40048 */ addiu $a0, $sp, 0x0048 ## $a0 = FFFFFFE0 /* 12CCC 808264EC 8E250000 */ lw $a1, 0x0000($s1) ## 00000000 -/* 12CD0 808264F0 0C031AD5 */ jal func_800C6B54 +/* 12CD0 808264F0 0C031AD5 */ jal Graph_CloseDisps /* 12CD4 808264F4 24070CB6 */ addiu $a3, $zero, 0x0CB6 ## $a3 = 00000CB6 /* 12CD8 808264F8 8FBF001C */ lw $ra, 0x001C($sp) /* 12CDC 808264FC 8FB00014 */ lw $s0, 0x0014($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_808299A0.s b/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_808299A0.s index 0544a45713..d42f5f2371 100644 --- a/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_808299A0.s +++ b/asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_808299A0.s @@ -31,7 +31,7 @@ glabel func_808299A0 /* 161F4 80829A14 27A400B0 */ addiu $a0, $sp, 0x00B0 ## $a0 = FFFFFFD8 /* 161F8 80829A18 240700B6 */ addiu $a3, $zero, 0x00B6 ## $a3 = 000000B6 /* 161FC 80829A1C 01C99821 */ addu $s3, $t6, $t1 -/* 16200 80829A20 0C031AB1 */ jal func_800C6AC4 +/* 16200 80829A20 0C031AB1 */ jal Graph_OpenDisps /* 16204 80829A24 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 /* 16208 80829A28 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 /* 1620C 80829A2C 3C178083 */ lui $s7, %hi(D_80830530) ## $s7 = 80830000 @@ -417,7 +417,7 @@ glabel L80829C28 /* 1679C 80829FBC 24C605A8 */ addiu $a2, $a2, %lo(D_808305A8) ## $a2 = 808305A8 /* 167A0 80829FC0 27A400B0 */ addiu $a0, $sp, 0x00B0 ## $a0 = FFFFFFD8 /* 167A4 80829FC4 8EA50000 */ lw $a1, 0x0000($s5) ## 00000000 -/* 167A8 80829FC8 0C031AD5 */ jal func_800C6B54 +/* 167A8 80829FC8 0C031AD5 */ jal Graph_CloseDisps /* 167AC 80829FCC 2407011E */ addiu $a3, $zero, 0x011E ## $a3 = 0000011E /* 167B0 80829FD0 8FBF0054 */ lw $ra, 0x0054($sp) /* 167B4 80829FD4 D7B40018 */ ldc1 $f20, 0x0018($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80832264.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80832264.s index fbeb1c17a8..d1cd37d63e 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80832264.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80832264.s @@ -1,11 +1,11 @@ glabel func_80832264 /* 00054 80832264 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00058 80832268 AFBF0014 */ sw $ra, 0x0014($sp) -/* 0005C 8083226C 0C02901F */ jal func_800A407C +/* 00058 80832268 AFBF0014 */ sw $ra, 0x0014($sp) +/* 0005C 8083226C 0C02901F */ jal SkelAnime_ChangeLinkAnimDefaultStop /* 00060 80832270 24A501B4 */ addiu $a1, $a1, 0x01B4 ## $a1 = 000001B4 -/* 00064 80832274 8FBF0014 */ lw $ra, 0x0014($sp) +/* 00064 80832274 8FBF0014 */ lw $ra, 0x0014($sp) /* 00068 80832278 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 0006C 8083227C 03E00008 */ jr $ra +/* 0006C 8083227C 03E00008 */ jr $ra /* 00070 80832280 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80832284.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80832284.s index a0371afb3e..56f3da7e92 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80832284.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80832284.s @@ -1,11 +1,11 @@ glabel func_80832284 /* 00074 80832284 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00078 80832288 AFBF0014 */ sw $ra, 0x0014($sp) -/* 0007C 8083228C 0C029050 */ jal func_800A4140 +/* 00078 80832288 AFBF0014 */ sw $ra, 0x0014($sp) +/* 0007C 8083228C 0C029050 */ jal SkelAnime_ChangeLinkAnimDefaultRepeat /* 00080 80832290 24A501B4 */ addiu $a1, $a1, 0x01B4 ## $a1 = 000001B4 -/* 00084 80832294 8FBF0014 */ lw $ra, 0x0014($sp) +/* 00084 80832294 8FBF0014 */ lw $ra, 0x0014($sp) /* 00088 80832298 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 0008C 8083229C 03E00008 */ jr $ra +/* 0008C 8083229C 03E00008 */ jr $ra /* 00090 808322A0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808322A4.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_808322A4.s index af5cf8738f..83c671feab 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808322A4.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_808322A4.s @@ -1,14 +1,14 @@ glabel func_808322A4 /* 00094 808322A4 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00098 808322A8 AFBF0014 */ sw $ra, 0x0014($sp) -/* 0009C 808322AC AFA5001C */ sw $a1, 0x001C($sp) +/* 00098 808322A8 AFBF0014 */ sw $ra, 0x0014($sp) +/* 0009C 808322AC AFA5001C */ sw $a1, 0x001C($sp) /* 000A0 808322B0 3C073F2A */ lui $a3, 0x3F2A ## $a3 = 3F2A0000 /* 000A4 808322B4 34E7AAAB */ ori $a3, $a3, 0xAAAB ## $a3 = 3F2AAAAB -/* 000A8 808322B8 0C029067 */ jal func_800A419C +/* 000A8 808322B8 0C029067 */ jal SkelAnime_ChangeLinkAnimPlaybackRepeat /* 000AC 808322BC 24A501B4 */ addiu $a1, $a1, 0x01B4 ## $a1 = 000001B4 -/* 000B0 808322C0 8FBF0014 */ lw $ra, 0x0014($sp) +/* 000B0 808322C0 8FBF0014 */ lw $ra, 0x0014($sp) /* 000B4 808322C4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 000B8 808322C8 03E00008 */ jr $ra +/* 000B8 808322C8 03E00008 */ jr $ra /* 000BC 808322CC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808322D0.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_808322D0.s index 83b8d3ea7c..24810d04eb 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808322D0.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_808322D0.s @@ -1,14 +1,14 @@ glabel func_808322D0 /* 000C0 808322D0 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 000C4 808322D4 AFBF0014 */ sw $ra, 0x0014($sp) -/* 000C8 808322D8 AFA5001C */ sw $a1, 0x001C($sp) +/* 000C4 808322D4 AFBF0014 */ sw $ra, 0x0014($sp) +/* 000C8 808322D8 AFA5001C */ sw $a1, 0x001C($sp) /* 000CC 808322DC 3C073F2A */ lui $a3, 0x3F2A ## $a3 = 3F2A0000 /* 000D0 808322E0 34E7AAAB */ ori $a3, $a3, 0xAAAB ## $a3 = 3F2AAAAB -/* 000D4 808322E4 0C029037 */ jal func_800A40DC +/* 000D4 808322E4 0C029037 */ jal SkelAnime_ChangeLinkAnimPlaybackStop /* 000D8 808322E8 24A501B4 */ addiu $a1, $a1, 0x01B4 ## $a1 = 000001B4 -/* 000DC 808322EC 8FBF0014 */ lw $ra, 0x0014($sp) +/* 000DC 808322EC 8FBF0014 */ lw $ra, 0x0014($sp) /* 000E0 808322F0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 000E4 808322F4 03E00008 */ jr $ra +/* 000E4 808322F4 03E00008 */ jr $ra /* 000E8 808322F8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80832B0C.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80832B0C.s index 9f72d53850..0b83126ccc 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80832B0C.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80832B0C.s @@ -1,31 +1,31 @@ glabel func_80832B0C /* 008FC 80832B0C 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 00900 80832B10 AFBF0024 */ sw $ra, 0x0024($sp) -/* 00904 80832B14 AFA40028 */ sw $a0, 0x0028($sp) -/* 00908 80832B18 AFA5002C */ sw $a1, 0x002C($sp) -/* 0090C 80832B1C AFA60030 */ sw $a2, 0x0030($sp) +/* 00900 80832B10 AFBF0024 */ sw $ra, 0x0024($sp) +/* 00904 80832B14 AFA40028 */ sw $a0, 0x0028($sp) +/* 00908 80832B18 AFA5002C */ sw $a1, 0x002C($sp) +/* 0090C 80832B1C AFA60030 */ sw $a2, 0x0030($sp) /* 00910 80832B20 0C028800 */ jal SkelAnime_GetFrameCount - + /* 00914 80832B24 00C02025 */ or $a0, $a2, $zero ## $a0 = 00000000 /* 00918 80832B28 44823000 */ mtc1 $v0, $f6 ## $f6 = 0.00 /* 0091C 80832B2C 3C01C0C0 */ lui $at, 0xC0C0 ## $at = C0C00000 /* 00920 80832B30 44815000 */ mtc1 $at, $f10 ## $f10 = -6.00 -/* 00924 80832B34 46803220 */ cvt.s.w $f8, $f6 -/* 00928 80832B38 8FA5002C */ lw $a1, 0x002C($sp) +/* 00924 80832B34 46803220 */ cvt.s.w $f8, $f6 +/* 00928 80832B38 8FA5002C */ lw $a1, 0x002C($sp) /* 0092C 80832B3C 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 /* 00930 80832B40 240E0002 */ addiu $t6, $zero, 0x0002 ## $t6 = 00000002 -/* 00934 80832B44 AFAE0018 */ sw $t6, 0x0018($sp) -/* 00938 80832B48 8FA40028 */ lw $a0, 0x0028($sp) -/* 0093C 80832B4C E7A80014 */ swc1 $f8, 0x0014($sp) -/* 00940 80832B50 8FA60030 */ lw $a2, 0x0030($sp) +/* 00934 80832B44 AFAE0018 */ sw $t6, 0x0018($sp) +/* 00938 80832B48 8FA40028 */ lw $a0, 0x0028($sp) +/* 0093C 80832B4C E7A80014 */ swc1 $f8, 0x0014($sp) +/* 00940 80832B50 8FA60030 */ lw $a2, 0x0030($sp) /* 00944 80832B54 3C073F80 */ lui $a3, 0x3F80 ## $a3 = 3F800000 -/* 00948 80832B58 E7AA001C */ swc1 $f10, 0x001C($sp) +/* 00948 80832B58 E7AA001C */ swc1 $f10, 0x001C($sp) /* 0094C 80832B5C 24A501B4 */ addiu $a1, $a1, 0x01B4 ## $a1 = 000001B4 -/* 00950 80832B60 0C028FC2 */ jal func_800A3F08 -/* 00954 80832B64 E7A40010 */ swc1 $f4, 0x0010($sp) -/* 00958 80832B68 8FBF0024 */ lw $ra, 0x0024($sp) +/* 00950 80832B60 0C028FC2 */ jal SkelAnime_ChangeLinkAnim +/* 00954 80832B64 E7A40010 */ swc1 $f4, 0x0010($sp) +/* 00958 80832B68 8FBF0024 */ lw $ra, 0x0024($sp) /* 0095C 80832B6C 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 00960 80832B70 03E00008 */ jr $ra +/* 00960 80832B70 03E00008 */ jr $ra /* 00964 80832B74 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80832B78.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80832B78.s index 783288abf4..5ed86dc6d0 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80832B78.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80832B78.s @@ -1,32 +1,32 @@ glabel func_80832B78 /* 00968 80832B78 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 0096C 80832B7C AFBF0024 */ sw $ra, 0x0024($sp) -/* 00970 80832B80 AFA40028 */ sw $a0, 0x0028($sp) -/* 00974 80832B84 AFA5002C */ sw $a1, 0x002C($sp) -/* 00978 80832B88 AFA60030 */ sw $a2, 0x0030($sp) +/* 0096C 80832B7C AFBF0024 */ sw $ra, 0x0024($sp) +/* 00970 80832B80 AFA40028 */ sw $a0, 0x0028($sp) +/* 00974 80832B84 AFA5002C */ sw $a1, 0x002C($sp) +/* 00978 80832B88 AFA60030 */ sw $a2, 0x0030($sp) /* 0097C 80832B8C 0C028800 */ jal SkelAnime_GetFrameCount - + /* 00980 80832B90 00C02025 */ or $a0, $a2, $zero ## $a0 = 00000000 /* 00984 80832B94 44823000 */ mtc1 $v0, $f6 ## $f6 = 0.00 /* 00988 80832B98 3C01C0C0 */ lui $at, 0xC0C0 ## $at = C0C00000 /* 0098C 80832B9C 44815000 */ mtc1 $at, $f10 ## $f10 = -6.00 -/* 00990 80832BA0 46803220 */ cvt.s.w $f8, $f6 -/* 00994 80832BA4 8FA5002C */ lw $a1, 0x002C($sp) +/* 00990 80832BA0 46803220 */ cvt.s.w $f8, $f6 +/* 00994 80832BA4 8FA5002C */ lw $a1, 0x002C($sp) /* 00998 80832BA8 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 /* 0099C 80832BAC 3C073F2A */ lui $a3, 0x3F2A ## $a3 = 3F2A0000 /* 009A0 80832BB0 240E0002 */ addiu $t6, $zero, 0x0002 ## $t6 = 00000002 -/* 009A4 80832BB4 AFAE0018 */ sw $t6, 0x0018($sp) +/* 009A4 80832BB4 AFAE0018 */ sw $t6, 0x0018($sp) /* 009A8 80832BB8 34E7AAAB */ ori $a3, $a3, 0xAAAB ## $a3 = 3F2AAAAB -/* 009AC 80832BBC E7A80014 */ swc1 $f8, 0x0014($sp) -/* 009B0 80832BC0 8FA40028 */ lw $a0, 0x0028($sp) -/* 009B4 80832BC4 8FA60030 */ lw $a2, 0x0030($sp) -/* 009B8 80832BC8 E7AA001C */ swc1 $f10, 0x001C($sp) +/* 009AC 80832BBC E7A80014 */ swc1 $f8, 0x0014($sp) +/* 009B0 80832BC0 8FA40028 */ lw $a0, 0x0028($sp) +/* 009B4 80832BC4 8FA60030 */ lw $a2, 0x0030($sp) +/* 009B8 80832BC8 E7AA001C */ swc1 $f10, 0x001C($sp) /* 009BC 80832BCC 24A501B4 */ addiu $a1, $a1, 0x01B4 ## $a1 = 000001B4 -/* 009C0 80832BD0 0C028FC2 */ jal func_800A3F08 -/* 009C4 80832BD4 E7A40010 */ swc1 $f4, 0x0010($sp) -/* 009C8 80832BD8 8FBF0024 */ lw $ra, 0x0024($sp) +/* 009C0 80832BD0 0C028FC2 */ jal SkelAnime_ChangeLinkAnim +/* 009C4 80832BD4 E7A40010 */ swc1 $f4, 0x0010($sp) +/* 009C8 80832BD8 8FBF0024 */ lw $ra, 0x0024($sp) /* 009CC 80832BDC 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 009D0 80832BE0 03E00008 */ jr $ra +/* 009D0 80832BE0 03E00008 */ jr $ra /* 009D4 80832BE4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80832BE8.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80832BE8.s index 531dec8164..10a66c28bd 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80832BE8.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80832BE8.s @@ -3,18 +3,18 @@ glabel func_80832BE8 /* 009DC 80832BEC 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 /* 009E0 80832BF0 3C01C0C0 */ lui $at, 0xC0C0 ## $at = C0C00000 /* 009E4 80832BF4 44812000 */ mtc1 $at, $f4 ## $f4 = -6.00 -/* 009E8 80832BF8 AFBF0024 */ sw $ra, 0x0024($sp) -/* 009EC 80832BFC AFA5002C */ sw $a1, 0x002C($sp) +/* 009E8 80832BF8 AFBF0024 */ sw $ra, 0x0024($sp) +/* 009EC 80832BFC AFA5002C */ sw $a1, 0x002C($sp) /* 009F0 80832C00 24A501B4 */ addiu $a1, $a1, 0x01B4 ## $a1 = 000001B4 -/* 009F4 80832C04 AFA00018 */ sw $zero, 0x0018($sp) +/* 009F4 80832C04 AFA00018 */ sw $zero, 0x0018($sp) /* 009F8 80832C08 3C073F80 */ lui $a3, 0x3F80 ## $a3 = 3F800000 -/* 009FC 80832C0C E7A00010 */ swc1 $f0, 0x0010($sp) -/* 00A00 80832C10 E7A00014 */ swc1 $f0, 0x0014($sp) -/* 00A04 80832C14 0C028FC2 */ jal func_800A3F08 -/* 00A08 80832C18 E7A4001C */ swc1 $f4, 0x001C($sp) -/* 00A0C 80832C1C 8FBF0024 */ lw $ra, 0x0024($sp) +/* 009FC 80832C0C E7A00010 */ swc1 $f0, 0x0010($sp) +/* 00A00 80832C10 E7A00014 */ swc1 $f0, 0x0014($sp) +/* 00A04 80832C14 0C028FC2 */ jal SkelAnime_ChangeLinkAnim +/* 00A08 80832C18 E7A4001C */ swc1 $f4, 0x001C($sp) +/* 00A0C 80832C1C 8FBF0024 */ lw $ra, 0x0024($sp) /* 00A10 80832C20 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 00A14 80832C24 03E00008 */ jr $ra +/* 00A14 80832C24 03E00008 */ jr $ra /* 00A18 80832C28 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80832C2C.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80832C2C.s index d8b76c2364..8f390849f3 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80832C2C.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80832C2C.s @@ -1,19 +1,19 @@ glabel func_80832C2C /* 00A1C 80832C2C 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 /* 00A20 80832C30 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 00A24 80832C34 AFBF0024 */ sw $ra, 0x0024($sp) -/* 00A28 80832C38 AFA5002C */ sw $a1, 0x002C($sp) +/* 00A24 80832C34 AFBF0024 */ sw $ra, 0x0024($sp) +/* 00A28 80832C38 AFA5002C */ sw $a1, 0x002C($sp) /* 00A2C 80832C3C 240E0002 */ addiu $t6, $zero, 0x0002 ## $t6 = 00000002 -/* 00A30 80832C40 AFAE0018 */ sw $t6, 0x0018($sp) +/* 00A30 80832C40 AFAE0018 */ sw $t6, 0x0018($sp) /* 00A34 80832C44 24A501B4 */ addiu $a1, $a1, 0x01B4 ## $a1 = 000001B4 /* 00A38 80832C48 3C073F80 */ lui $a3, 0x3F80 ## $a3 = 3F800000 -/* 00A3C 80832C4C E7A00010 */ swc1 $f0, 0x0010($sp) -/* 00A40 80832C50 E7A00014 */ swc1 $f0, 0x0014($sp) -/* 00A44 80832C54 0C028FC2 */ jal func_800A3F08 -/* 00A48 80832C58 E7A0001C */ swc1 $f0, 0x001C($sp) -/* 00A4C 80832C5C 8FBF0024 */ lw $ra, 0x0024($sp) +/* 00A3C 80832C4C E7A00010 */ swc1 $f0, 0x0010($sp) +/* 00A40 80832C50 E7A00014 */ swc1 $f0, 0x0014($sp) +/* 00A44 80832C54 0C028FC2 */ jal SkelAnime_ChangeLinkAnim +/* 00A48 80832C58 E7A0001C */ swc1 $f0, 0x001C($sp) +/* 00A4C 80832C5C 8FBF0024 */ lw $ra, 0x0024($sp) /* 00A50 80832C60 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 00A54 80832C64 03E00008 */ jr $ra +/* 00A54 80832C64 03E00008 */ jr $ra /* 00A58 80832C68 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80832C6C.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80832C6C.s index 9a858b814e..8d7bcda509 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80832C6C.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80832C6C.s @@ -3,18 +3,18 @@ glabel func_80832C6C /* 00A60 80832C70 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 /* 00A64 80832C74 3C01C180 */ lui $at, 0xC180 ## $at = C1800000 /* 00A68 80832C78 44812000 */ mtc1 $at, $f4 ## $f4 = -16.00 -/* 00A6C 80832C7C AFBF0024 */ sw $ra, 0x0024($sp) -/* 00A70 80832C80 AFA5002C */ sw $a1, 0x002C($sp) +/* 00A6C 80832C7C AFBF0024 */ sw $ra, 0x0024($sp) +/* 00A70 80832C80 AFA5002C */ sw $a1, 0x002C($sp) /* 00A74 80832C84 24A501B4 */ addiu $a1, $a1, 0x01B4 ## $a1 = 000001B4 -/* 00A78 80832C88 AFA00018 */ sw $zero, 0x0018($sp) +/* 00A78 80832C88 AFA00018 */ sw $zero, 0x0018($sp) /* 00A7C 80832C8C 3C073F80 */ lui $a3, 0x3F80 ## $a3 = 3F800000 -/* 00A80 80832C90 E7A00010 */ swc1 $f0, 0x0010($sp) -/* 00A84 80832C94 E7A00014 */ swc1 $f0, 0x0014($sp) -/* 00A88 80832C98 0C028FC2 */ jal func_800A3F08 -/* 00A8C 80832C9C E7A4001C */ swc1 $f4, 0x001C($sp) -/* 00A90 80832CA0 8FBF0024 */ lw $ra, 0x0024($sp) +/* 00A80 80832C90 E7A00010 */ swc1 $f0, 0x0010($sp) +/* 00A84 80832C94 E7A00014 */ swc1 $f0, 0x0014($sp) +/* 00A88 80832C98 0C028FC2 */ jal SkelAnime_ChangeLinkAnim +/* 00A8C 80832C9C E7A4001C */ swc1 $f4, 0x001C($sp) +/* 00A90 80832CA0 8FBF0024 */ lw $ra, 0x0024($sp) /* 00A94 80832CA4 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 00A98 80832CA8 03E00008 */ jr $ra +/* 00A98 80832CA8 03E00008 */ jr $ra /* 00A9C 80832CAC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80832FFC.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80832FFC.s index 8c2175c412..f30355e4df 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80832FFC.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80832FFC.s @@ -1,19 +1,19 @@ glabel func_80832FFC /* 00DEC 80832FFC 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00DF0 80833000 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00DF4 80833004 AFA5001C */ sw $a1, 0x001C($sp) -/* 00DF8 80833008 AFA70024 */ sw $a3, 0x0024($sp) -/* 00DFC 8083300C AFA40018 */ sw $a0, 0x0018($sp) -/* 00E00 80833010 8FA70028 */ lw $a3, 0x0028($sp) -/* 00E04 80833014 0C029037 */ jal func_800A40DC +/* 00DF0 80833000 AFBF0014 */ sw $ra, 0x0014($sp) +/* 00DF4 80833004 AFA5001C */ sw $a1, 0x001C($sp) +/* 00DF8 80833008 AFA70024 */ sw $a3, 0x0024($sp) +/* 00DFC 8083300C AFA40018 */ sw $a0, 0x0018($sp) +/* 00E00 80833010 8FA70028 */ lw $a3, 0x0028($sp) +/* 00E04 80833014 0C029037 */ jal SkelAnime_ChangeLinkAnimPlaybackStop /* 00E08 80833018 24A501B4 */ addiu $a1, $a1, 0x01B4 ## $a1 = 000001B4 -/* 00E0C 8083301C 8FA40018 */ lw $a0, 0x0018($sp) -/* 00E10 80833020 8FA5001C */ lw $a1, 0x001C($sp) -/* 00E14 80833024 0C20CBD5 */ jal func_80832F54 -/* 00E18 80833028 8FA60024 */ lw $a2, 0x0024($sp) -/* 00E1C 8083302C 8FBF0014 */ lw $ra, 0x0014($sp) +/* 00E0C 8083301C 8FA40018 */ lw $a0, 0x0018($sp) +/* 00E10 80833020 8FA5001C */ lw $a1, 0x001C($sp) +/* 00E14 80833024 0C20CBD5 */ jal func_80832F54 +/* 00E18 80833028 8FA60024 */ lw $a2, 0x0024($sp) +/* 00E1C 8083302C 8FBF0014 */ lw $ra, 0x0014($sp) /* 00E20 80833030 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00E24 80833034 03E00008 */ jr $ra +/* 00E24 80833034 03E00008 */ jr $ra /* 00E28 80833038 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808330AC.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_808330AC.s index 55b2189945..28fc2ef8be 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808330AC.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_808330AC.s @@ -1,19 +1,19 @@ glabel func_808330AC /* 00E9C 808330AC 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 00EA0 808330B0 AFBF0014 */ sw $ra, 0x0014($sp) -/* 00EA4 808330B4 AFA5001C */ sw $a1, 0x001C($sp) -/* 00EA8 808330B8 AFA70024 */ sw $a3, 0x0024($sp) -/* 00EAC 808330BC AFA40018 */ sw $a0, 0x0018($sp) -/* 00EB0 808330C0 8FA70028 */ lw $a3, 0x0028($sp) -/* 00EB4 808330C4 0C029067 */ jal func_800A419C +/* 00EA0 808330B0 AFBF0014 */ sw $ra, 0x0014($sp) +/* 00EA4 808330B4 AFA5001C */ sw $a1, 0x001C($sp) +/* 00EA8 808330B8 AFA70024 */ sw $a3, 0x0024($sp) +/* 00EAC 808330BC AFA40018 */ sw $a0, 0x0018($sp) +/* 00EB0 808330C0 8FA70028 */ lw $a3, 0x0028($sp) +/* 00EB4 808330C4 0C029067 */ jal SkelAnime_ChangeLinkAnimPlaybackRepeat /* 00EB8 808330C8 24A501B4 */ addiu $a1, $a1, 0x01B4 ## $a1 = 000001B4 -/* 00EBC 808330CC 8FA40018 */ lw $a0, 0x0018($sp) -/* 00EC0 808330D0 8FA5001C */ lw $a1, 0x001C($sp) -/* 00EC4 808330D4 0C20CBD5 */ jal func_80832F54 -/* 00EC8 808330D8 8FA60024 */ lw $a2, 0x0024($sp) -/* 00ECC 808330DC 8FBF0014 */ lw $ra, 0x0014($sp) +/* 00EBC 808330CC 8FA40018 */ lw $a0, 0x0018($sp) +/* 00EC0 808330D0 8FA5001C */ lw $a1, 0x001C($sp) +/* 00EC4 808330D4 0C20CBD5 */ jal func_80832F54 +/* 00EC8 808330D8 8FA60024 */ lw $a2, 0x0024($sp) +/* 00ECC 808330DC 8FBF0014 */ lw $ra, 0x0014($sp) /* 00ED0 808330E0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 00ED4 808330E4 03E00008 */ jr $ra +/* 00ED4 808330E4 03E00008 */ jr $ra /* 00ED8 808330E8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083328C.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083328C.s index cbdd14247c..de8cc36ef9 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083328C.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083328C.s @@ -1,14 +1,14 @@ glabel func_8083328C /* 0107C 8083328C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 01080 80833290 AFBF0014 */ sw $ra, 0x0014($sp) -/* 01084 80833294 AFA5001C */ sw $a1, 0x001C($sp) +/* 01080 80833290 AFBF0014 */ sw $ra, 0x0014($sp) +/* 01084 80833294 AFA5001C */ sw $a1, 0x001C($sp) /* 01088 80833298 3C078085 */ lui $a3, %hi(D_808535E8) ## $a3 = 80850000 -/* 0108C 8083329C 8CE735E8 */ lw $a3, %lo(D_808535E8)($a3) -/* 01090 808332A0 0C029037 */ jal func_800A40DC +/* 0108C 8083329C 8CE735E8 */ lw $a3, %lo(D_808535E8)($a3) +/* 01090 808332A0 0C029037 */ jal SkelAnime_ChangeLinkAnimPlaybackStop /* 01094 808332A4 24A501B4 */ addiu $a1, $a1, 0x01B4 ## $a1 = 000001B4 -/* 01098 808332A8 8FBF0014 */ lw $ra, 0x0014($sp) +/* 01098 808332A8 8FBF0014 */ lw $ra, 0x0014($sp) /* 0109C 808332AC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 010A0 808332B0 03E00008 */ jr $ra +/* 010A0 808332B0 03E00008 */ jr $ra /* 010A4 808332B4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808340DC.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_808340DC.s index cbba9105e0..5f8354e5d8 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808340DC.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_808340DC.s @@ -1,58 +1,58 @@ glabel func_808340DC /* 01ECC 808340DC 27BDFFB0 */ addiu $sp, $sp, 0xFFB0 ## $sp = FFFFFFB0 -/* 01ED0 808340E0 AFB00028 */ sw $s0, 0x0028($sp) +/* 01ED0 808340E0 AFB00028 */ sw $s0, 0x0028($sp) /* 01ED4 808340E4 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 01ED8 808340E8 AFBF002C */ sw $ra, 0x002C($sp) -/* 01EDC 808340EC AFA50054 */ sw $a1, 0x0054($sp) -/* 01EE0 808340F0 0C20CDC9 */ jal func_80833724 +/* 01ED8 808340E8 AFBF002C */ sw $ra, 0x002C($sp) +/* 01EDC 808340EC AFA50054 */ sw $a1, 0x0054($sp) +/* 01EE0 808340F0 0C20CDC9 */ jal func_80833724 /* 01EE4 808340F4 90840152 */ lbu $a0, 0x0152($a0) ## 00000152 /* 01EE8 808340F8 3C058083 */ lui $a1, %hi(func_80834A2C) ## $a1 = 80830000 /* 01EEC 808340FC 24A54A2C */ addiu $a1, $a1, %lo(func_80834A2C) ## $a1 = 80834A2C /* 01EF0 80834100 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 01EF4 80834104 0C20CD8E */ jal func_80833638 -/* 01EF8 80834108 A3A20037 */ sb $v0, 0x0037($sp) +/* 01EF4 80834104 0C20CD8E */ jal func_80833638 +/* 01EF8 80834108 A3A20037 */ sb $v0, 0x0037($sp) /* 01EFC 8083410C 920E0159 */ lbu $t6, 0x0159($s0) ## 00000159 /* 01F00 80834110 24050005 */ addiu $a1, $zero, 0x0005 ## $a1 = 00000005 /* 01F04 80834114 92190158 */ lbu $t9, 0x0158($s0) ## 00000158 -/* 01F08 80834118 01C50019 */ multu $t6, $a1 +/* 01F08 80834118 01C50019 */ multu $t6, $a1 /* 01F0C 8083411C 3C048012 */ lui $a0, 0x8012 ## $a0 = 80120000 /* 01F10 80834120 24845C98 */ addiu $a0, $a0, 0x5C98 ## $a0 = 80125C98 -/* 01F14 80834124 83A70037 */ lb $a3, 0x0037($sp) +/* 01F14 80834124 83A70037 */ lb $a3, 0x0037($sp) /* 01F18 80834128 3C038085 */ lui $v1, %hi(D_80854164) ## $v1 = 80850000 /* 01F1C 8083412C 2406001E */ addiu $a2, $zero, 0x001E ## $a2 = 0000001E -/* 01F20 80834130 00007812 */ mflo $t7 -/* 01F24 80834134 008FC021 */ addu $t8, $a0, $t7 +/* 01F20 80834130 00007812 */ mflo $t7 +/* 01F24 80834134 008FC021 */ addu $t8, $a0, $t7 /* 01F28 80834138 93020000 */ lbu $v0, 0x0000($t8) ## 00000000 -/* 01F2C 8083413C 03250019 */ multu $t9, $a1 -/* 01F30 80834140 00004012 */ mflo $t0 -/* 01F34 80834144 00884821 */ addu $t1, $a0, $t0 +/* 01F2C 8083413C 03250019 */ multu $t9, $a1 +/* 01F30 80834140 00004012 */ mflo $t0 +/* 01F34 80834144 00884821 */ addu $t1, $a0, $t0 /* 01F38 80834148 912A0000 */ lbu $t2, 0x0000($t1) ## 00000000 /* 01F3C 8083414C 24040014 */ addiu $a0, $zero, 0x0014 ## $a0 = 00000014 -/* 01F40 80834150 000A5880 */ sll $t3, $t2, 2 -/* 01F44 80834154 016A5823 */ subu $t3, $t3, $t2 -/* 01F48 80834158 000B5840 */ sll $t3, $t3, 1 -/* 01F4C 8083415C 01626021 */ addu $t4, $t3, $v0 -/* 01F50 80834160 006C1821 */ addu $v1, $v1, $t4 -/* 01F54 80834164 10E6000A */ beq $a3, $a2, .L80834190 -/* 01F58 80834168 80634164 */ lb $v1, %lo(D_80854164)($v1) -/* 01F5C 8083416C 10E40008 */ beq $a3, $a0, .L80834190 +/* 01F40 80834150 000A5880 */ sll $t3, $t2, 2 +/* 01F44 80834154 016A5823 */ subu $t3, $t3, $t2 +/* 01F48 80834158 000B5840 */ sll $t3, $t3, 1 +/* 01F4C 8083415C 01626021 */ addu $t4, $t3, $v0 +/* 01F50 80834160 006C1821 */ addu $v1, $v1, $t4 +/* 01F54 80834164 10E6000A */ beq $a3, $a2, .L80834190 +/* 01F58 80834168 80634164 */ lb $v1, %lo(D_80854164)($v1) +/* 01F5C 8083416C 10E40008 */ beq $a3, $a0, .L80834190 /* 01F60 80834170 00000000 */ nop -/* 01F64 80834174 14E0000A */ bne $a3, $zero, .L808341A0 +/* 01F64 80834174 14E0000A */ bne $a3, $zero, .L808341A0 /* 01F68 80834178 00000000 */ nop /* 01F6C 8083417C 82020151 */ lb $v0, 0x0151($s0) ## 00000151 -/* 01F70 80834180 10C20003 */ beq $a2, $v0, .L80834190 +/* 01F70 80834180 10C20003 */ beq $a2, $v0, .L80834190 /* 01F74 80834184 00000000 */ nop -/* 01F78 80834188 14820005 */ bne $a0, $v0, .L808341A0 +/* 01F78 80834188 14820005 */ bne $a0, $v0, .L808341A0 /* 01F7C 8083418C 00000000 */ nop .L80834190: -/* 01F80 80834190 14E00003 */ bne $a3, $zero, .L808341A0 +/* 01F80 80834190 14E00003 */ bne $a3, $zero, .L808341A0 /* 01F84 80834194 2403000D */ addiu $v1, $zero, 0x000D ## $v1 = 0000000D -/* 01F88 80834198 10000001 */ beq $zero, $zero, .L808341A0 +/* 01F88 80834198 10000001 */ beq $zero, $zero, .L808341A0 /* 01F8C 8083419C 2403FFF3 */ addiu $v1, $zero, 0xFFF3 ## $v1 = FFFFFFF3 .L808341A0: -/* 01F90 808341A0 04600003 */ bltz $v1, .L808341B0 -/* 01F94 808341A4 00036823 */ subu $t5, $zero, $v1 -/* 01F98 808341A8 10000002 */ beq $zero, $zero, .L808341B4 +/* 01F90 808341A0 04600003 */ bltz $v1, .L808341B0 +/* 01F94 808341A4 00036823 */ subu $t5, $zero, $v1 +/* 01F98 808341A8 10000002 */ beq $zero, $zero, .L808341B4 /* 01F9C 808341AC A203015A */ sb $v1, 0x015A($s0) ## 0000015A .L808341B0: /* 01FA0 808341B0 A20D015A */ sb $t5, 0x015A($s0) ## 0000015A @@ -60,64 +60,64 @@ glabel func_808340DC /* 01FA4 808341B4 820E015A */ lb $t6, 0x015A($s0) ## 0000015A /* 01FA8 808341B8 3C068085 */ lui $a2, %hi(D_808540F4) ## $a2 = 80850000 /* 01FAC 808341BC 3C180400 */ lui $t8, 0x0400 ## $t8 = 04000000 -/* 01FB0 808341C0 000E78C0 */ sll $t7, $t6, 3 -/* 01FB4 808341C4 00CF3021 */ addu $a2, $a2, $t7 -/* 01FB8 808341C8 8CC640F4 */ lw $a2, %lo(D_808540F4)($a2) +/* 01FB0 808341C0 000E78C0 */ sll $t7, $t6, 3 +/* 01FB4 808341C4 00CF3021 */ addu $a2, $a2, $t7 +/* 01FB8 808341C8 8CC640F4 */ lw $a2, %lo(D_808540F4)($a2) /* 01FBC 808341CC 27182F30 */ addiu $t8, $t8, 0x2F30 ## $t8 = 04002F30 -/* 01FC0 808341D0 54D80007 */ bnel $a2, $t8, .L808341F0 +/* 01FC0 808341D0 54D80007 */ bnel $a2, $t8, .L808341F0 /* 01FC4 808341D4 00C02025 */ or $a0, $a2, $zero ## $a0 = 80850000 /* 01FC8 808341D8 8219014E */ lb $t9, 0x014E($s0) ## 0000014E -/* 01FCC 808341DC 57200004 */ bnel $t9, $zero, .L808341F0 +/* 01FCC 808341DC 57200004 */ bnel $t9, $zero, .L808341F0 /* 01FD0 808341E0 00C02025 */ or $a0, $a2, $zero ## $a0 = 80850000 /* 01FD4 808341E4 3C060400 */ lui $a2, 0x0400 ## $a2 = 04000000 /* 01FD8 808341E8 24C62F40 */ addiu $a2, $a2, 0x2F40 ## $a2 = 04002F40 /* 01FDC 808341EC 00C02025 */ or $a0, $a2, $zero ## $a0 = 04002F40 .L808341F0: -/* 01FE0 808341F0 AFA30038 */ sw $v1, 0x0038($sp) -/* 01FE4 808341F4 AFA6004C */ sw $a2, 0x004C($sp) +/* 01FE0 808341F0 AFA30038 */ sw $v1, 0x0038($sp) +/* 01FE4 808341F4 AFA6004C */ sw $a2, 0x004C($sp) /* 01FE8 808341F8 0C028800 */ jal SkelAnime_GetFrameCount - -/* 01FEC 808341FC A3A70037 */ sb $a3, 0x0037($sp) + +/* 01FEC 808341FC A3A70037 */ sb $a3, 0x0037($sp) /* 01FF0 80834200 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 -/* 01FF4 80834204 8FA30038 */ lw $v1, 0x0038($sp) -/* 01FF8 80834208 8FA6004C */ lw $a2, 0x004C($sp) -/* 01FFC 8083420C 468020A0 */ cvt.s.w $f2, $f4 -/* 02000 80834210 83A70037 */ lb $a3, 0x0037($sp) -/* 02004 80834214 8FA40054 */ lw $a0, 0x0054($sp) +/* 01FF4 80834204 8FA30038 */ lw $v1, 0x0038($sp) +/* 01FF8 80834208 8FA6004C */ lw $a2, 0x004C($sp) +/* 01FFC 8083420C 468020A0 */ cvt.s.w $f2, $f4 +/* 02000 80834210 83A70037 */ lb $a3, 0x0037($sp) +/* 02004 80834214 8FA40054 */ lw $a0, 0x0054($sp) /* 02008 80834218 260506C8 */ addiu $a1, $s0, 0x06C8 ## $a1 = 000006C8 /* 0200C 8083421C 24080002 */ addiu $t0, $zero, 0x0002 ## $t0 = 00000002 -/* 02010 80834220 04600006 */ bltz $v1, .L8083423C -/* 02014 80834224 46001386 */ mov.s $f14, $f2 +/* 02010 80834220 04600006 */ bltz $v1, .L8083423C +/* 02014 80834224 46001386 */ mov.s $f14, $f2 /* 02018 80834228 44808000 */ mtc1 $zero, $f16 ## $f16 = 0.00 /* 0201C 8083422C 3C018085 */ lui $at, %hi(D_8085535C) ## $at = 80850000 -/* 02020 80834230 C420535C */ lwc1 $f0, %lo(D_8085535C)($at) -/* 02024 80834234 10000006 */ beq $zero, $zero, .L80834250 -/* 02028 80834238 46008306 */ mov.s $f12, $f16 +/* 02020 80834230 C420535C */ lwc1 $f0, %lo(D_8085535C)($at) +/* 02024 80834234 10000006 */ beq $zero, $zero, .L80834250 +/* 02028 80834238 46008306 */ mov.s $f12, $f16 .L8083423C: /* 0202C 8083423C 44808000 */ mtc1 $zero, $f16 ## $f16 = 0.00 /* 02030 80834240 3C018085 */ lui $at, %hi(D_80855360) ## $at = 80850000 -/* 02034 80834244 C4205360 */ lwc1 $f0, %lo(D_80855360)($at) -/* 02038 80834248 46001306 */ mov.s $f12, $f2 -/* 0203C 8083424C 46008386 */ mov.s $f14, $f16 +/* 02034 80834244 C4205360 */ lwc1 $f0, %lo(D_80855360)($at) +/* 02038 80834248 46001306 */ mov.s $f12, $f2 +/* 0203C 8083424C 46008386 */ mov.s $f14, $f16 .L80834250: -/* 02040 80834250 50E00003 */ beql $a3, $zero, .L80834260 -/* 02044 80834254 44070000 */ mfc1 $a3, $f0 -/* 02048 80834258 46000000 */ add.s $f0, $f0, $f0 -/* 0204C 8083425C 44070000 */ mfc1 $a3, $f0 +/* 02040 80834250 50E00003 */ beql $a3, $zero, .L80834260 +/* 02044 80834254 44070000 */ mfc1 $a3, $f0 +/* 02048 80834258 46000000 */ add.s $f0, $f0, $f0 +/* 0204C 8083425C 44070000 */ mfc1 $a3, $f0 .L80834260: -/* 02050 80834260 E7AC0010 */ swc1 $f12, 0x0010($sp) -/* 02054 80834264 E7AE0014 */ swc1 $f14, 0x0014($sp) -/* 02058 80834268 AFA80018 */ sw $t0, 0x0018($sp) -/* 0205C 8083426C 0C028FC2 */ jal func_800A3F08 -/* 02060 80834270 E7B0001C */ swc1 $f16, 0x001C($sp) +/* 02050 80834260 E7AC0010 */ swc1 $f12, 0x0010($sp) +/* 02054 80834264 E7AE0014 */ swc1 $f14, 0x0014($sp) +/* 02058 80834268 AFA80018 */ sw $t0, 0x0018($sp) +/* 0205C 8083426C 0C028FC2 */ jal SkelAnime_ChangeLinkAnim +/* 02060 80834270 E7B0001C */ swc1 $f16, 0x001C($sp) /* 02064 80834274 8E09067C */ lw $t1, 0x067C($s0) ## 0000067C /* 02068 80834278 2401FEFF */ addiu $at, $zero, 0xFEFF ## $at = FFFFFEFF -/* 0206C 8083427C 01215024 */ and $t2, $t1, $at +/* 0206C 8083427C 01215024 */ and $t2, $t1, $at /* 02070 80834280 AE0A067C */ sw $t2, 0x067C($s0) ## 0000067C -/* 02074 80834284 8FBF002C */ lw $ra, 0x002C($sp) -/* 02078 80834288 8FB00028 */ lw $s0, 0x0028($sp) +/* 02074 80834284 8FBF002C */ lw $ra, 0x002C($sp) +/* 02078 80834288 8FB00028 */ lw $s0, 0x0028($sp) /* 0207C 8083428C 27BD0050 */ addiu $sp, $sp, 0x0050 ## $sp = 00000000 -/* 02080 80834290 03E00008 */ jr $ra +/* 02080 80834290 03E00008 */ jr $ra /* 02084 80834294 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80834758.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80834758.s index 49fa925958..8932e63059 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80834758.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80834758.s @@ -1,71 +1,71 @@ glabel func_80834758 /* 02548 80834758 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 0254C 8083475C AFBF002C */ sw $ra, 0x002C($sp) -/* 02550 80834760 AFB00028 */ sw $s0, 0x0028($sp) -/* 02554 80834764 AFA40038 */ sw $a0, 0x0038($sp) +/* 0254C 8083475C AFBF002C */ sw $ra, 0x002C($sp) +/* 02550 80834760 AFB00028 */ sw $s0, 0x0028($sp) +/* 02554 80834764 AFA40038 */ sw $a0, 0x0038($sp) /* 02558 80834768 8CAE067C */ lw $t6, 0x067C($a1) ## 0000067C /* 0255C 8083476C 3C0120C0 */ lui $at, 0x20C0 ## $at = 20C00000 /* 02560 80834770 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 -/* 02564 80834774 01C17824 */ and $t7, $t6, $at -/* 02568 80834778 15E00032 */ bne $t7, $zero, .L80834844 +/* 02564 80834774 01C17824 */ and $t7, $t6, $at +/* 02568 80834778 15E00032 */ bne $t7, $zero, .L80834844 /* 0256C 8083477C 3C190001 */ lui $t9, 0x0001 ## $t9 = 00010000 -/* 02570 80834780 0324C821 */ addu $t9, $t9, $a0 +/* 02570 80834780 0324C821 */ addu $t9, $t9, $a0 /* 02574 80834784 83391E5C */ lb $t9, 0x1E5C($t9) ## 00011E5C -/* 02578 80834788 5720002F */ bnel $t9, $zero, .L80834848 +/* 02578 80834788 5720002F */ bnel $t9, $zero, .L80834848 /* 0257C 8083478C 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 /* 02580 80834790 80A80154 */ lb $t0, 0x0154($a1) ## 00000154 /* 02584 80834794 80A90151 */ lb $t1, 0x0151($a1) ## 00000151 -/* 02588 80834798 5509002B */ bnel $t0, $t1, .L80834848 +/* 02588 80834798 5509002B */ bnel $t0, $t1, .L80834848 /* 0258C 8083479C 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 /* 02590 808347A0 80AA014E */ lb $t2, 0x014E($a1) ## 0000014E -/* 02594 808347A4 51400028 */ beql $t2, $zero, .L80834848 +/* 02594 808347A4 51400028 */ beql $t2, $zero, .L80834848 /* 02598 808347A8 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 0259C 808347AC 0C023A74 */ jal func_8008E9D0 +/* 0259C 808347AC 0C023A74 */ jal func_8008E9D0 /* 025A0 808347B0 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 025A4 808347B4 54400024 */ bnel $v0, $zero, .L80834848 +/* 025A4 808347B4 54400024 */ bnel $v0, $zero, .L80834848 /* 025A8 808347B8 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 025AC 808347BC 0C20CEF3 */ jal func_80833BCC +/* 025AC 808347BC 0C20CEF3 */ jal func_80833BCC /* 025B0 808347C0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 025B4 808347C4 1040001F */ beq $v0, $zero, .L80834844 +/* 025B4 808347C4 1040001F */ beq $v0, $zero, .L80834844 /* 025B8 808347C8 3C0B8086 */ lui $t3, %hi(D_80858AB4) ## $t3 = 80860000 -/* 025BC 808347CC 8D6B8AB4 */ lw $t3, %lo(D_80858AB4)($t3) +/* 025BC 808347CC 8D6B8AB4 */ lw $t3, %lo(D_80858AB4)($t3) /* 025C0 808347D0 2401FFEF */ addiu $at, $zero, 0xFFEF ## $at = FFFFFFEF -/* 025C4 808347D4 8FA40038 */ lw $a0, 0x0038($sp) +/* 025C4 808347D4 8FA40038 */ lw $a0, 0x0038($sp) /* 025C8 808347D8 956C0000 */ lhu $t4, 0x0000($t3) ## 80860000 -/* 025CC 808347DC 01816827 */ nor $t5, $t4, $at -/* 025D0 808347E0 55A00019 */ bnel $t5, $zero, .L80834848 +/* 025CC 808347DC 01816827 */ nor $t5, $t4, $at +/* 025D0 808347E0 55A00019 */ bnel $t5, $zero, .L80834848 /* 025D4 808347E4 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 025D8 808347E8 0C20D1B1 */ jal func_808346C4 +/* 025D8 808347E8 0C20D1B1 */ jal func_808346C4 /* 025DC 808347EC 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 025E0 808347F0 AFA20034 */ sw $v0, 0x0034($sp) +/* 025E0 808347F0 AFA20034 */ sw $v0, 0x0034($sp) /* 025E4 808347F4 0C028800 */ jal SkelAnime_GetFrameCount - + /* 025E8 808347F8 00402025 */ or $a0, $v0, $zero ## $a0 = 00000000 /* 025EC 808347FC 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 025F0 80834800 44803000 */ mtc1 $zero, $f6 ## $f6 = 0.00 /* 025F4 80834804 240E0002 */ addiu $t6, $zero, 0x0002 ## $t6 = 00000002 -/* 025F8 80834808 46802020 */ cvt.s.w $f0, $f4 -/* 025FC 8083480C AFAE0018 */ sw $t6, 0x0018($sp) -/* 02600 80834810 8FA40038 */ lw $a0, 0x0038($sp) +/* 025F8 80834808 46802020 */ cvt.s.w $f0, $f4 +/* 025FC 8083480C AFAE0018 */ sw $t6, 0x0018($sp) +/* 02600 80834810 8FA40038 */ lw $a0, 0x0038($sp) /* 02604 80834814 260506C8 */ addiu $a1, $s0, 0x06C8 ## $a1 = 000006C8 -/* 02608 80834818 8FA60034 */ lw $a2, 0x0034($sp) +/* 02608 80834818 8FA60034 */ lw $a2, 0x0034($sp) /* 0260C 8083481C 3C073F80 */ lui $a3, 0x3F80 ## $a3 = 3F800000 -/* 02610 80834820 E7A00010 */ swc1 $f0, 0x0010($sp) -/* 02614 80834824 E7A00014 */ swc1 $f0, 0x0014($sp) -/* 02618 80834828 0C028FC2 */ jal func_800A3F08 -/* 0261C 8083482C E7A6001C */ swc1 $f6, 0x001C($sp) +/* 02610 80834820 E7A00010 */ swc1 $f0, 0x0010($sp) +/* 02614 80834824 E7A00014 */ swc1 $f0, 0x0014($sp) +/* 02618 80834828 0C028FC2 */ jal SkelAnime_ChangeLinkAnim +/* 0261C 8083482C E7A6001C */ swc1 $f6, 0x001C($sp) /* 02620 80834830 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02624 80834834 0C00BDF7 */ jal func_8002F7DC +/* 02624 80834834 0C00BDF7 */ jal func_8002F7DC /* 02628 80834838 2405181F */ addiu $a1, $zero, 0x181F ## $a1 = 0000181F -/* 0262C 8083483C 10000002 */ beq $zero, $zero, .L80834848 +/* 0262C 8083483C 10000002 */ beq $zero, $zero, .L80834848 /* 02630 80834840 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 .L80834844: /* 02634 80834844 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 .L80834848: -/* 02638 80834848 8FBF002C */ lw $ra, 0x002C($sp) -/* 0263C 8083484C 8FB00028 */ lw $s0, 0x0028($sp) +/* 02638 80834848 8FBF002C */ lw $ra, 0x002C($sp) +/* 0263C 8083484C 8FB00028 */ lw $s0, 0x0028($sp) /* 02640 80834850 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 -/* 02644 80834854 03E00008 */ jr $ra +/* 02644 80834854 03E00008 */ jr $ra /* 02648 80834858 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80834894.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80834894.s index e19ec6e985..53b0646bff 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80834894.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80834894.s @@ -1,26 +1,26 @@ glabel func_80834894 /* 02684 80834894 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 02688 80834898 AFBF001C */ sw $ra, 0x001C($sp) -/* 0268C 8083489C AFB00018 */ sw $s0, 0x0018($sp) +/* 02688 80834898 AFBF001C */ sw $ra, 0x001C($sp) +/* 0268C 8083489C AFB00018 */ sw $s0, 0x0018($sp) /* 02690 808348A0 3C058083 */ lui $a1, %hi(func_80834C74) ## $a1 = 80830000 /* 02694 808348A4 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 02698 808348A8 0C20CD8E */ jal func_80833638 +/* 02698 808348A8 0C20CD8E */ jal func_80833638 /* 0269C 808348AC 24A54C74 */ addiu $a1, $a1, %lo(func_80834C74) ## $a1 = 80834C74 /* 026A0 808348B0 820E0154 */ lb $t6, 0x0154($s0) ## 00000154 -/* 026A4 808348B4 05C10003 */ bgez $t6, .L808348C4 +/* 026A4 808348B4 05C10003 */ bgez $t6, .L808348C4 /* 026A8 808348B8 00000000 */ nop -/* 026AC 808348BC 0C023B1C */ jal func_8008EC70 +/* 026AC 808348BC 0C023B1C */ jal func_8008EC70 /* 026B0 808348C0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 .L808348C4: -/* 026B4 808348C4 0C029502 */ jal func_800A5408 +/* 026B4 808348C4 0C029502 */ jal SkelAnime_AnimReverse /* 026B8 808348C8 260406C8 */ addiu $a0, $s0, 0x06C8 ## $a0 = 000006C8 /* 026BC 808348CC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 026C0 808348D0 0C00BDF7 */ jal func_8002F7DC +/* 026C0 808348D0 0C00BDF7 */ jal func_8002F7DC /* 026C4 808348D4 24051826 */ addiu $a1, $zero, 0x1826 ## $a1 = 00001826 -/* 026C8 808348D8 8FBF001C */ lw $ra, 0x001C($sp) -/* 026CC 808348DC 8FB00018 */ lw $s0, 0x0018($sp) +/* 026C8 808348D8 8FBF001C */ lw $ra, 0x001C($sp) +/* 026CC 808348DC 8FB00018 */ lw $s0, 0x0018($sp) /* 026D0 808348E0 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 026D4 808348E4 03E00008 */ jr $ra +/* 026D4 808348E4 03E00008 */ jr $ra /* 026D8 808348E8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80834BD4.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80834BD4.s index 4c275ba1f4..b513c9553f 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80834BD4.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80834BD4.s @@ -1,45 +1,45 @@ glabel func_80834BD4 /* 029C4 80834BD4 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 -/* 029C8 80834BD8 AFB00028 */ sw $s0, 0x0028($sp) +/* 029C8 80834BD8 AFB00028 */ sw $s0, 0x0028($sp) /* 029CC 80834BDC 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 029D0 80834BE0 AFA50044 */ sw $a1, 0x0044($sp) +/* 029D0 80834BE0 AFA50044 */ sw $a1, 0x0044($sp) /* 029D4 80834BE4 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 029D8 80834BE8 AFBF002C */ sw $ra, 0x002C($sp) +/* 029D8 80834BE8 AFBF002C */ sw $ra, 0x002C($sp) /* 029DC 80834BEC 260506C8 */ addiu $a1, $s0, 0x06C8 ## $a1 = 000006C8 -/* 029E0 80834BF0 0C028EF0 */ jal func_800A3BC0 -/* 029E4 80834BF4 AFA50034 */ sw $a1, 0x0034($sp) -/* 029E8 80834BF8 10400013 */ beq $v0, $zero, .L80834C48 -/* 029EC 80834BFC 8FA40044 */ lw $a0, 0x0044($sp) -/* 029F0 80834C00 0C20D1B1 */ jal func_808346C4 +/* 029E0 80834BF0 0C028EF0 */ jal func_800A3BC0 +/* 029E4 80834BF4 AFA50034 */ sw $a1, 0x0034($sp) +/* 029E8 80834BF8 10400013 */ beq $v0, $zero, .L80834C48 +/* 029EC 80834BFC 8FA40044 */ lw $a0, 0x0044($sp) +/* 029F0 80834C00 0C20D1B1 */ jal func_808346C4 /* 029F4 80834C04 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 029F8 80834C08 AFA2003C */ sw $v0, 0x003C($sp) +/* 029F8 80834C08 AFA2003C */ sw $v0, 0x003C($sp) /* 029FC 80834C0C 0C028800 */ jal SkelAnime_GetFrameCount - + /* 02A00 80834C10 00402025 */ or $a0, $v0, $zero ## $a0 = 00000000 /* 02A04 80834C14 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 02A08 80834C18 44803000 */ mtc1 $zero, $f6 ## $f6 = 0.00 /* 02A0C 80834C1C 240E0002 */ addiu $t6, $zero, 0x0002 ## $t6 = 00000002 -/* 02A10 80834C20 46802020 */ cvt.s.w $f0, $f4 -/* 02A14 80834C24 AFAE0018 */ sw $t6, 0x0018($sp) -/* 02A18 80834C28 8FA40044 */ lw $a0, 0x0044($sp) -/* 02A1C 80834C2C 8FA50034 */ lw $a1, 0x0034($sp) -/* 02A20 80834C30 8FA6003C */ lw $a2, 0x003C($sp) +/* 02A10 80834C20 46802020 */ cvt.s.w $f0, $f4 +/* 02A14 80834C24 AFAE0018 */ sw $t6, 0x0018($sp) +/* 02A18 80834C28 8FA40044 */ lw $a0, 0x0044($sp) +/* 02A1C 80834C2C 8FA50034 */ lw $a1, 0x0034($sp) +/* 02A20 80834C30 8FA6003C */ lw $a2, 0x003C($sp) /* 02A24 80834C34 3C073F80 */ lui $a3, 0x3F80 ## $a3 = 3F800000 -/* 02A28 80834C38 E7A00010 */ swc1 $f0, 0x0010($sp) -/* 02A2C 80834C3C E7A00014 */ swc1 $f0, 0x0014($sp) -/* 02A30 80834C40 0C028FC2 */ jal func_800A3F08 -/* 02A34 80834C44 E7A6001C */ swc1 $f6, 0x001C($sp) +/* 02A28 80834C38 E7A00010 */ swc1 $f0, 0x0010($sp) +/* 02A2C 80834C3C E7A00014 */ swc1 $f0, 0x0014($sp) +/* 02A30 80834C40 0C028FC2 */ jal SkelAnime_ChangeLinkAnim +/* 02A34 80834C44 E7A6001C */ swc1 $f6, 0x001C($sp) .L80834C48: /* 02A38 80834C48 8E0F067C */ lw $t7, 0x067C($s0) ## 0000067C /* 02A3C 80834C4C 3C010040 */ lui $at, 0x0040 ## $at = 00400000 /* 02A40 80834C50 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 02A44 80834C54 01E1C025 */ or $t8, $t7, $at ## $t8 = 00400000 -/* 02A48 80834C58 0C023A90 */ jal func_8008EA40 +/* 02A48 80834C58 0C023A90 */ jal func_8008EA40 /* 02A4C 80834C5C AE18067C */ sw $t8, 0x067C($s0) ## 0000067C -/* 02A50 80834C60 8FBF002C */ lw $ra, 0x002C($sp) -/* 02A54 80834C64 8FB00028 */ lw $s0, 0x0028($sp) +/* 02A50 80834C60 8FBF002C */ lw $ra, 0x002C($sp) +/* 02A54 80834C64 8FB00028 */ lw $s0, 0x0028($sp) /* 02A58 80834C68 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 -/* 02A5C 80834C6C 03E00008 */ jr $ra +/* 02A5C 80834C6C 03E00008 */ jr $ra /* 02A60 80834C70 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80834C74.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80834C74.s index fc4e29dce7..5e1dca0872 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80834C74.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80834C74.s @@ -1,51 +1,51 @@ glabel func_80834C74 /* 02A64 80834C74 3C0E8085 */ lui $t6, %hi(D_80853618) ## $t6 = 80850000 -/* 02A68 80834C78 8DCE3618 */ lw $t6, %lo(D_80853618)($t6) +/* 02A68 80834C78 8DCE3618 */ lw $t6, %lo(D_80853618)($t6) /* 02A6C 80834C7C 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 /* 02A70 80834C80 3C028085 */ lui $v0, %hi(D_80853614) ## $v0 = 80850000 /* 02A74 80834C84 24423614 */ addiu $v0, $v0, %lo(D_80853614) ## $v0 = 80853614 -/* 02A78 80834C88 AFB00018 */ sw $s0, 0x0018($sp) +/* 02A78 80834C88 AFB00018 */ sw $s0, 0x0018($sp) /* 02A7C 80834C8C 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 02A80 80834C90 AFBF001C */ sw $ra, 0x001C($sp) -/* 02A84 80834C94 AFA5002C */ sw $a1, 0x002C($sp) -/* 02A88 80834C98 15C00006 */ bne $t6, $zero, .L80834CB4 +/* 02A80 80834C90 AFBF001C */ sw $ra, 0x001C($sp) +/* 02A84 80834C94 AFA5002C */ sw $a1, 0x002C($sp) +/* 02A88 80834C98 15C00006 */ bne $t6, $zero, .L80834CB4 /* 02A8C 80834C9C AC4E0000 */ sw $t6, 0x0000($v0) ## 80853614 /* 02A90 80834CA0 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 02A94 80834CA4 0C028EF0 */ jal func_800A3BC0 +/* 02A94 80834CA4 0C028EF0 */ jal func_800A3BC0 /* 02A98 80834CA8 260506C8 */ addiu $a1, $s0, 0x06C8 ## $a1 = 000006C8 -/* 02A9C 80834CAC 5040001A */ beql $v0, $zero, .L80834D18 +/* 02A9C 80834CAC 5040001A */ beql $v0, $zero, .L80834D18 /* 02AA0 80834CB0 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 .L80834CB4: /* 02AA4 80834CB4 82180151 */ lb $t8, 0x0151($s0) ## 00000151 /* 02AA8 80834CB8 3C058085 */ lui $a1, %hi(D_80853EDC) ## $a1 = 80850000 /* 02AAC 80834CBC 260806C8 */ addiu $t0, $s0, 0x06C8 ## $t0 = 000006C8 -/* 02AB0 80834CC0 0018C880 */ sll $t9, $t8, 2 -/* 02AB4 80834CC4 00B92821 */ addu $a1, $a1, $t9 -/* 02AB8 80834CC8 8CA53EDC */ lw $a1, %lo(D_80853EDC)($a1) -/* 02ABC 80834CCC AFA80024 */ sw $t0, 0x0024($sp) -/* 02AC0 80834CD0 0C20CD8E */ jal func_80833638 +/* 02AB0 80834CC0 0018C880 */ sll $t9, $t8, 2 +/* 02AB4 80834CC4 00B92821 */ addu $a1, $a1, $t9 +/* 02AB8 80834CC8 8CA53EDC */ lw $a1, %lo(D_80853EDC)($a1) +/* 02ABC 80834CCC AFA80024 */ sw $t0, 0x0024($sp) +/* 02AC0 80834CD0 0C20CD8E */ jal func_80833638 /* 02AC4 80834CD4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 02AC8 80834CD8 9209015B */ lbu $t1, 0x015B($s0) ## 0000015B /* 02ACC 80834CDC 3C068085 */ lui $a2, %hi(D_80853914) ## $a2 = 80850000 -/* 02AD0 80834CE0 8FA4002C */ lw $a0, 0x002C($sp) -/* 02AD4 80834CE4 00095080 */ sll $t2, $t1, 2 -/* 02AD8 80834CE8 00CA3021 */ addu $a2, $a2, $t2 -/* 02ADC 80834CEC 8CC63914 */ lw $a2, %lo(D_80853914)($a2) -/* 02AE0 80834CF0 0C029050 */ jal func_800A4140 -/* 02AE4 80834CF4 8FA50024 */ lw $a1, 0x0024($sp) +/* 02AD0 80834CE0 8FA4002C */ lw $a0, 0x002C($sp) +/* 02AD4 80834CE4 00095080 */ sll $t2, $t1, 2 +/* 02AD8 80834CE8 00CA3021 */ addu $a2, $a2, $t2 +/* 02ADC 80834CEC 8CC63914 */ lw $a2, %lo(D_80853914)($a2) +/* 02AE0 80834CF0 0C029050 */ jal SkelAnime_ChangeLinkAnimDefaultRepeat +/* 02AE4 80834CF4 8FA50024 */ lw $a1, 0x0024($sp) /* 02AE8 80834CF8 8E19082C */ lw $t9, 0x082C($s0) ## 0000082C /* 02AEC 80834CFC A20006AC */ sb $zero, 0x06AC($s0) ## 000006AC -/* 02AF0 80834D00 8FA5002C */ lw $a1, 0x002C($sp) -/* 02AF4 80834D04 0320F809 */ jalr $ra, $t9 +/* 02AF0 80834D00 8FA5002C */ lw $a1, 0x002C($sp) +/* 02AF4 80834D04 0320F809 */ jalr $ra, $t9 /* 02AF8 80834D08 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02AFC 80834D0C 10000002 */ beq $zero, $zero, .L80834D18 +/* 02AFC 80834D0C 10000002 */ beq $zero, $zero, .L80834D18 /* 02B00 80834D10 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 /* 02B04 80834D14 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 .L80834D18: -/* 02B08 80834D18 8FBF001C */ lw $ra, 0x001C($sp) -/* 02B0C 80834D1C 8FB00018 */ lw $s0, 0x0018($sp) +/* 02B08 80834D18 8FBF001C */ lw $ra, 0x001C($sp) +/* 02B0C 80834D1C 8FB00018 */ lw $s0, 0x0018($sp) /* 02B10 80834D20 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 02B14 80834D24 03E00008 */ jr $ra +/* 02B14 80834D24 03E00008 */ jr $ra /* 02B18 80834D28 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80834D2C.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80834D2C.s index fe018d3e64..03e0e94281 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80834D2C.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80834D2C.s @@ -1,81 +1,81 @@ glabel func_80834D2C /* 02B1C 80834D2C 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 02B20 80834D30 AFBF001C */ sw $ra, 0x001C($sp) -/* 02B24 80834D34 AFB00018 */ sw $s0, 0x0018($sp) -/* 02B28 80834D38 AFA50024 */ sw $a1, 0x0024($sp) +/* 02B20 80834D30 AFBF001C */ sw $ra, 0x001C($sp) +/* 02B24 80834D34 AFB00018 */ sw $s0, 0x0018($sp) +/* 02B28 80834D38 AFA50024 */ sw $a1, 0x0024($sp) /* 02B2C 80834D3C 808E0151 */ lb $t6, 0x0151($a0) ## 00000151 /* 02B30 80834D40 24010014 */ addiu $at, $zero, 0x0014 ## $at = 00000014 /* 02B34 80834D44 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 02B38 80834D48 11C10014 */ beq $t6, $at, .L80834D9C +/* 02B38 80834D48 11C10014 */ beq $t6, $at, .L80834D9C /* 02B3C 80834D4C 00000000 */ nop -/* 02B40 80834D50 0C20D10B */ jal func_8083442C +/* 02B40 80834D50 0C20D10B */ jal func_8083442C /* 02B44 80834D54 00000000 */ nop -/* 02B48 80834D58 14400003 */ bne $v0, $zero, .L80834D68 +/* 02B48 80834D58 14400003 */ bne $v0, $zero, .L80834D68 /* 02B4C 80834D5C 00000000 */ nop -/* 02B50 80834D60 10000033 */ beq $zero, $zero, .L80834E30 +/* 02B50 80834D60 10000033 */ beq $zero, $zero, .L80834E30 /* 02B54 80834D64 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 .L80834D68: -/* 02B58 80834D68 0C023C41 */ jal func_8008F104 +/* 02B58 80834D68 0C023C41 */ jal func_8008F104 /* 02B5C 80834D6C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02B60 80834D70 14400004 */ bne $v0, $zero, .L80834D84 -/* 02B64 80834D74 8FA40024 */ lw $a0, 0x0024($sp) +/* 02B60 80834D70 14400004 */ bne $v0, $zero, .L80834D84 +/* 02B64 80834D74 8FA40024 */ lw $a0, 0x0024($sp) /* 02B68 80834D78 3C060400 */ lui $a2, 0x0400 ## $a2 = 04000000 -/* 02B6C 80834D7C 10000003 */ beq $zero, $zero, .L80834D8C +/* 02B6C 80834D7C 10000003 */ beq $zero, $zero, .L80834D8C /* 02B70 80834D80 24C626A0 */ addiu $a2, $a2, 0x26A0 ## $a2 = 040026A0 .L80834D84: /* 02B74 80834D84 3C060400 */ lui $a2, 0x0400 ## $a2 = 04000000 /* 02B78 80834D88 24C62CA0 */ addiu $a2, $a2, 0x2CA0 ## $a2 = 04002CA0 .L80834D8C: -/* 02B7C 80834D8C 0C02901F */ jal func_800A407C +/* 02B7C 80834D8C 0C02901F */ jal SkelAnime_ChangeLinkAnimDefaultStop /* 02B80 80834D90 260506C8 */ addiu $a1, $s0, 0x06C8 ## $a1 = 000006C8 -/* 02B84 80834D94 1000000D */ beq $zero, $zero, .L80834DCC +/* 02B84 80834D94 1000000D */ beq $zero, $zero, .L80834DCC /* 02B88 80834D98 8E18067C */ lw $t8, 0x067C($s0) ## 0000067C .L80834D9C: /* 02B8C 80834D9C 3C058083 */ lui $a1, %hi(func_80835884) ## $a1 = 80830000 /* 02B90 80834DA0 24A55884 */ addiu $a1, $a1, %lo(func_80835884) ## $a1 = 80835884 -/* 02B94 80834DA4 0C20CD8E */ jal func_80833638 +/* 02B94 80834DA4 0C20CD8E */ jal func_80833638 /* 02B98 80834DA8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 02B9C 80834DAC 240F000A */ addiu $t7, $zero, 0x000A ## $t7 = 0000000A /* 02BA0 80834DB0 A60F0834 */ sh $t7, 0x0834($s0) ## 00000834 /* 02BA4 80834DB4 3C060400 */ lui $a2, 0x0400 ## $a2 = 04000000 /* 02BA8 80834DB8 24C62628 */ addiu $a2, $a2, 0x2628 ## $a2 = 04002628 -/* 02BAC 80834DBC 8FA40024 */ lw $a0, 0x0024($sp) -/* 02BB0 80834DC0 0C02901F */ jal func_800A407C +/* 02BAC 80834DBC 8FA40024 */ lw $a0, 0x0024($sp) +/* 02BB0 80834DC0 0C02901F */ jal SkelAnime_ChangeLinkAnimDefaultStop /* 02BB4 80834DC4 260506C8 */ addiu $a1, $s0, 0x06C8 ## $a1 = 000006C8 /* 02BB8 80834DC8 8E18067C */ lw $t8, 0x067C($s0) ## 0000067C .L80834DCC: -/* 02BBC 80834DCC 8FA40024 */ lw $a0, 0x0024($sp) +/* 02BBC 80834DCC 8FA40024 */ lw $a0, 0x0024($sp) /* 02BC0 80834DD0 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 02BC4 80834DD4 0018CA00 */ sll $t9, $t8, 8 -/* 02BC8 80834DD8 07210005 */ bgez $t9, .L80834DF0 +/* 02BC4 80834DD4 0018CA00 */ sll $t9, $t8, 8 +/* 02BC8 80834DD8 07210005 */ bgez $t9, .L80834DF0 /* 02BCC 80834DDC 3C060400 */ lui $a2, 0x0400 ## $a2 = 04000000 -/* 02BD0 80834DE0 0C20C8A1 */ jal func_80832284 +/* 02BD0 80834DE0 0C20C8A1 */ jal func_80832284 /* 02BD4 80834DE4 24C63380 */ addiu $a2, $a2, 0x3380 ## $a2 = 04003380 -/* 02BD8 80834DE8 10000011 */ beq $zero, $zero, .L80834E30 +/* 02BD8 80834DE8 10000011 */ beq $zero, $zero, .L80834E30 /* 02BDC 80834DEC 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 .L80834DF0: /* 02BE0 80834DF0 96080088 */ lhu $t0, 0x0088($s0) ## 00000088 /* 02BE4 80834DF4 31090001 */ andi $t1, $t0, 0x0001 ## $t1 = 00000000 -/* 02BE8 80834DF8 5120000D */ beql $t1, $zero, .L80834E30 +/* 02BE8 80834DF8 5120000D */ beql $t1, $zero, .L80834E30 /* 02BEC 80834DFC 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -/* 02BF0 80834E00 0C20CED5 */ jal func_80833B54 +/* 02BF0 80834E00 0C20CED5 */ jal func_80833B54 /* 02BF4 80834E04 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 02BF8 80834E08 14400008 */ bne $v0, $zero, .L80834E2C -/* 02BFC 80834E0C 8FA40024 */ lw $a0, 0x0024($sp) +/* 02BF8 80834E08 14400008 */ bne $v0, $zero, .L80834E2C +/* 02BFC 80834E0C 8FA40024 */ lw $a0, 0x0024($sp) /* 02C00 80834E10 920A015B */ lbu $t2, 0x015B($s0) ## 0000015B /* 02C04 80834E14 3C068085 */ lui $a2, %hi(D_80853914) ## $a2 = 80850000 /* 02C08 80834E18 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 02C0C 80834E1C 000A5880 */ sll $t3, $t2, 2 -/* 02C10 80834E20 00CB3021 */ addu $a2, $a2, $t3 -/* 02C14 80834E24 0C20C8A1 */ jal func_80832284 -/* 02C18 80834E28 8CC63914 */ lw $a2, %lo(D_80853914)($a2) +/* 02C0C 80834E1C 000A5880 */ sll $t3, $t2, 2 +/* 02C10 80834E20 00CB3021 */ addu $a2, $a2, $t3 +/* 02C14 80834E24 0C20C8A1 */ jal func_80832284 +/* 02C18 80834E28 8CC63914 */ lw $a2, %lo(D_80853914)($a2) .L80834E2C: /* 02C1C 80834E2C 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 .L80834E30: -/* 02C20 80834E30 8FBF001C */ lw $ra, 0x001C($sp) -/* 02C24 80834E34 8FB00018 */ lw $s0, 0x0018($sp) +/* 02C20 80834E30 8FBF001C */ lw $ra, 0x001C($sp) +/* 02C24 80834E34 8FB00018 */ lw $s0, 0x0018($sp) /* 02C28 80834E38 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 02C2C 80834E3C 03E00008 */ jr $ra +/* 02C2C 80834E3C 03E00008 */ jr $ra /* 02C30 80834E40 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808351D4.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_808351D4.s index 878b6b4b18..c9ff437f37 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808351D4.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_808351D4.s @@ -1,149 +1,149 @@ glabel func_808351D4 /* 02FC4 808351D4 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 02FC8 808351D8 AFBF001C */ sw $ra, 0x001C($sp) -/* 02FCC 808351DC AFB00018 */ sw $s0, 0x0018($sp) +/* 02FC8 808351D8 AFBF001C */ sw $ra, 0x001C($sp) +/* 02FCC 808351DC AFB00018 */ sw $s0, 0x0018($sp) /* 02FD0 808351E0 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 02FD4 808351E4 0C023C41 */ jal func_8008F104 -/* 02FD8 808351E8 AFA50034 */ sw $a1, 0x0034($sp) -/* 02FDC 808351EC 14400003 */ bne $v0, $zero, .L808351FC +/* 02FD4 808351E4 0C023C41 */ jal func_8008F104 +/* 02FD8 808351E8 AFA50034 */ sw $a1, 0x0034($sp) +/* 02FDC 808351EC 14400003 */ bne $v0, $zero, .L808351FC /* 02FE0 808351F0 260406C0 */ addiu $a0, $s0, 0x06C0 ## $a0 = 000006C0 -/* 02FE4 808351F4 10000003 */ beq $zero, $zero, .L80835204 -/* 02FE8 808351F8 AFA0002C */ sw $zero, 0x002C($sp) +/* 02FE4 808351F4 10000003 */ beq $zero, $zero, .L80835204 +/* 02FE8 808351F8 AFA0002C */ sw $zero, 0x002C($sp) .L808351FC: /* 02FEC 808351FC 240E0001 */ addiu $t6, $zero, 0x0001 ## $t6 = 00000001 -/* 02FF0 80835200 AFAE002C */ sw $t6, 0x002C($sp) +/* 02FF0 80835200 AFAE002C */ sw $t6, 0x002C($sp) .L80835204: /* 02FF4 80835204 240504B0 */ addiu $a1, $zero, 0x04B0 ## $a1 = 000004B0 /* 02FF8 80835208 0C01DE2B */ jal Math_ApproxUpdateScaledS - + /* 02FFC 8083520C 24060190 */ addiu $a2, $zero, 0x0190 ## $a2 = 00000190 /* 03000 80835210 960F06AE */ lhu $t7, 0x06AE($s0) ## 000006AE /* 03004 80835214 82190836 */ lb $t9, 0x0836($s0) ## 00000836 /* 03008 80835218 35F80100 */ ori $t8, $t7, 0x0100 ## $t8 = 00000100 -/* 0300C 8083521C 17200014 */ bne $t9, $zero, .L80835270 +/* 0300C 8083521C 17200014 */ bne $t9, $zero, .L80835270 /* 03010 80835220 A61806AE */ sh $t8, 0x06AE($s0) ## 000006AE -/* 03014 80835224 0C20CCD4 */ jal func_80833350 +/* 03014 80835224 0C20CCD4 */ jal func_80833350 /* 03018 80835228 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0301C 8083522C 54400011 */ bnel $v0, $zero, .L80835274 +/* 0301C 8083522C 54400011 */ bnel $v0, $zero, .L80835274 /* 03020 80835230 260506C8 */ addiu $a1, $s0, 0x06C8 ## $a1 = 000006C8 /* 03024 80835234 8E0901BC */ lw $t1, 0x01BC($s0) ## 000001BC /* 03028 80835238 3C080400 */ lui $t0, 0x0400 ## $t0 = 04000000 /* 0302C 8083523C 250826E8 */ addiu $t0, $t0, 0x26E8 ## $t0 = 040026E8 -/* 03030 80835240 1509000B */ bne $t0, $t1, .L80835270 -/* 03034 80835244 8FA40034 */ lw $a0, 0x0034($sp) -/* 03038 80835248 8FAA002C */ lw $t2, 0x002C($sp) +/* 03030 80835240 1509000B */ bne $t0, $t1, .L80835270 +/* 03034 80835244 8FA40034 */ lw $a0, 0x0034($sp) +/* 03038 80835248 8FAA002C */ lw $t2, 0x002C($sp) /* 0303C 8083524C 3C068085 */ lui $a2, %hi(D_808543CC) ## $a2 = 80850000 /* 03040 80835250 260506C8 */ addiu $a1, $s0, 0x06C8 ## $a1 = 000006C8 -/* 03044 80835254 000A5880 */ sll $t3, $t2, 2 -/* 03048 80835258 00CB3021 */ addu $a2, $a2, $t3 -/* 0304C 8083525C 0C02901F */ jal func_800A407C -/* 03050 80835260 8CC643CC */ lw $a2, %lo(D_808543CC)($a2) +/* 03044 80835254 000A5880 */ sll $t3, $t2, 2 +/* 03048 80835258 00CB3021 */ addu $a2, $a2, $t3 +/* 0304C 8083525C 0C02901F */ jal SkelAnime_ChangeLinkAnimDefaultStop +/* 03050 80835260 8CC643CC */ lw $a2, %lo(D_808543CC)($a2) /* 03054 80835264 240CFFFF */ addiu $t4, $zero, 0xFFFF ## $t4 = FFFFFFFF -/* 03058 80835268 10000017 */ beq $zero, $zero, .L808352C8 +/* 03058 80835268 10000017 */ beq $zero, $zero, .L808352C8 /* 0305C 8083526C A20C0836 */ sb $t4, 0x0836($s0) ## 00000836 .L80835270: /* 03060 80835270 260506C8 */ addiu $a1, $s0, 0x06C8 ## $a1 = 000006C8 .L80835274: -/* 03064 80835274 AFA50024 */ sw $a1, 0x0024($sp) -/* 03068 80835278 0C028EF0 */ jal func_800A3BC0 -/* 0306C 8083527C 8FA40034 */ lw $a0, 0x0034($sp) -/* 03070 80835280 1040000B */ beq $v0, $zero, .L808352B0 -/* 03074 80835284 8FA50024 */ lw $a1, 0x0024($sp) -/* 03078 80835288 8FAD002C */ lw $t5, 0x002C($sp) +/* 03064 80835274 AFA50024 */ sw $a1, 0x0024($sp) +/* 03068 80835278 0C028EF0 */ jal func_800A3BC0 +/* 0306C 8083527C 8FA40034 */ lw $a0, 0x0034($sp) +/* 03070 80835280 1040000B */ beq $v0, $zero, .L808352B0 +/* 03074 80835284 8FA50024 */ lw $a1, 0x0024($sp) +/* 03078 80835288 8FAD002C */ lw $t5, 0x002C($sp) /* 0307C 8083528C 3C068085 */ lui $a2, %hi(D_808543D4) ## $a2 = 80850000 -/* 03080 80835290 8FA40034 */ lw $a0, 0x0034($sp) -/* 03084 80835294 000D7080 */ sll $t6, $t5, 2 -/* 03088 80835298 00CE3021 */ addu $a2, $a2, $t6 -/* 0308C 8083529C 0C029050 */ jal func_800A4140 -/* 03090 808352A0 8CC643D4 */ lw $a2, %lo(D_808543D4)($a2) +/* 03080 80835290 8FA40034 */ lw $a0, 0x0034($sp) +/* 03084 80835294 000D7080 */ sll $t6, $t5, 2 +/* 03088 80835298 00CE3021 */ addu $a2, $a2, $t6 +/* 0308C 8083529C 0C029050 */ jal SkelAnime_ChangeLinkAnimDefaultRepeat +/* 03090 808352A0 8CC643D4 */ lw $a2, %lo(D_808543D4)($a2) /* 03094 808352A4 240F0001 */ addiu $t7, $zero, 0x0001 ## $t7 = 00000001 -/* 03098 808352A8 10000007 */ beq $zero, $zero, .L808352C8 +/* 03098 808352A8 10000007 */ beq $zero, $zero, .L808352C8 /* 0309C 808352AC A20F0836 */ sb $t7, 0x0836($s0) ## 00000836 .L808352B0: /* 030A0 808352B0 82180836 */ lb $t8, 0x0836($s0) ## 00000836 /* 030A4 808352B4 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 /* 030A8 808352B8 24190002 */ addiu $t9, $zero, 0x0002 ## $t9 = 00000002 -/* 030AC 808352BC 57010003 */ bnel $t8, $at, .L808352CC +/* 030AC 808352BC 57010003 */ bnel $t8, $at, .L808352CC /* 030B0 808352C0 86020834 */ lh $v0, 0x0834($s0) ## 00000834 /* 030B4 808352C4 A2190836 */ sb $t9, 0x0836($s0) ## 00000836 .L808352C8: /* 030B8 808352C8 86020834 */ lh $v0, 0x0834($s0) ## 00000834 .L808352CC: /* 030BC 808352CC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 030C0 808352D0 2841000B */ slti $at, $v0, 0x000B -/* 030C4 808352D4 14200002 */ bne $at, $zero, .L808352E0 +/* 030C0 808352D0 2841000B */ slti $at, $v0, 0x000B +/* 030C4 808352D4 14200002 */ bne $at, $zero, .L808352E0 /* 030C8 808352D8 2448FFFF */ addiu $t0, $v0, 0xFFFF ## $t0 = FFFFFFFF /* 030CC 808352DC A6080834 */ sh $t0, 0x0834($s0) ## 00000834 .L808352E0: -/* 030D0 808352E0 0C20D3AE */ jal func_80834EB8 -/* 030D4 808352E4 8FA50034 */ lw $a1, 0x0034($sp) +/* 030D0 808352E0 0C20D3AE */ jal func_80834EB8 +/* 030D4 808352E4 8FA50034 */ lw $a1, 0x0034($sp) /* 030D8 808352E8 82090836 */ lb $t1, 0x0836($s0) ## 00000836 -/* 030DC 808352EC 59200033 */ blezl $t1, .L808353BC +/* 030DC 808352EC 59200033 */ blezl $t1, .L808353BC /* 030E0 808352F0 8E08067C */ lw $t0, 0x067C($s0) ## 0000067C /* 030E4 808352F4 860A0860 */ lh $t2, 0x0860($s0) ## 00000860 /* 030E8 808352F8 3C0B8085 */ lui $t3, %hi(D_80853618) ## $t3 = 80850000 -/* 030EC 808352FC 05400007 */ bltz $t2, .L8083531C +/* 030EC 808352FC 05400007 */ bltz $t2, .L8083531C /* 030F0 80835300 00000000 */ nop -/* 030F4 80835304 8D6B3618 */ lw $t3, %lo(D_80853618)($t3) -/* 030F8 80835308 5560002C */ bnel $t3, $zero, .L808353BC +/* 030F4 80835304 8D6B3618 */ lw $t3, %lo(D_80853618)($t3) +/* 030F8 80835308 5560002C */ bnel $t3, $zero, .L808353BC /* 030FC 8083530C 8E08067C */ lw $t0, 0x067C($s0) ## 0000067C -/* 03100 80835310 0C20D39F */ jal func_80834E7C -/* 03104 80835314 8FA40034 */ lw $a0, 0x0034($sp) -/* 03108 80835318 14400027 */ bne $v0, $zero, .L808353B8 +/* 03100 80835310 0C20D39F */ jal func_80834E7C +/* 03104 80835314 8FA40034 */ lw $a0, 0x0034($sp) +/* 03108 80835318 14400027 */ bne $v0, $zero, .L808353B8 .L8083531C: /* 0310C 8083531C 3C058083 */ lui $a1, %hi(func_808353D8) ## $a1 = 80830000 /* 03110 80835320 24A553D8 */ addiu $a1, $a1, %lo(func_808353D8) ## $a1 = 808353D8 -/* 03114 80835324 0C20CD8E */ jal func_80833638 +/* 03114 80835324 0C20CD8E */ jal func_80833638 /* 03118 80835328 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 0311C 8083532C 860C0860 */ lh $t4, 0x0860($s0) ## 00000860 -/* 03120 80835330 8FAD002C */ lw $t5, 0x002C($sp) -/* 03124 80835334 0582001B */ bltzl $t4, .L808353A4 +/* 03120 80835330 8FAD002C */ lw $t5, 0x002C($sp) +/* 03124 80835334 0582001B */ bltzl $t4, .L808353A4 /* 03128 80835338 2419000A */ addiu $t9, $zero, 0x000A ## $t9 = 0000000A -/* 0312C 8083533C 15A00011 */ bne $t5, $zero, .L80835384 -/* 03130 80835340 8FA40034 */ lw $a0, 0x0034($sp) -/* 03134 80835344 0C20D429 */ jal func_808350A4 +/* 0312C 8083533C 15A00011 */ bne $t5, $zero, .L80835384 +/* 03130 80835340 8FA40034 */ lw $a0, 0x0034($sp) +/* 03134 80835344 0C20D429 */ jal func_808350A4 /* 03138 80835348 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 0313C 8083534C 14400014 */ bne $v0, $zero, .L808353A0 +/* 0313C 8083534C 14400014 */ bne $v0, $zero, .L808353A0 /* 03140 80835350 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 03144 80835354 86020860 */ lh $v0, 0x0860($s0) ## 00000860 /* 03148 80835358 3C058085 */ lui $a1, %hi(D_808543DA) ## $a1 = 80850000 -/* 0314C 8083535C 04400003 */ bltz $v0, .L8083536C -/* 03150 80835360 00021823 */ subu $v1, $zero, $v0 -/* 03154 80835364 10000001 */ beq $zero, $zero, .L8083536C +/* 0314C 8083535C 04400003 */ bltz $v0, .L8083536C +/* 03150 80835360 00021823 */ subu $v1, $zero, $v0 +/* 03154 80835364 10000001 */ beq $zero, $zero, .L8083536C /* 03158 80835368 00401825 */ or $v1, $v0, $zero ## $v1 = 00000000 .L8083536C: -/* 0315C 8083536C 00037040 */ sll $t6, $v1, 1 -/* 03160 80835370 00AE2821 */ addu $a1, $a1, $t6 -/* 03164 80835374 0C00BDF7 */ jal func_8002F7DC -/* 03168 80835378 94A543DA */ lhu $a1, %lo(D_808543DA)($a1) -/* 0316C 8083537C 10000009 */ beq $zero, $zero, .L808353A4 +/* 0315C 8083536C 00037040 */ sll $t6, $v1, 1 +/* 03160 80835370 00AE2821 */ addu $a1, $a1, $t6 +/* 03164 80835374 0C00BDF7 */ jal func_8002F7DC +/* 03168 80835378 94A543DA */ lhu $a1, %lo(D_808543DA)($a1) +/* 0316C 8083537C 10000009 */ beq $zero, $zero, .L808353A4 /* 03170 80835380 2419000A */ addiu $t9, $zero, 0x000A ## $t9 = 0000000A .L80835384: /* 03174 80835384 960F0088 */ lhu $t7, 0x0088($s0) ## 00000088 -/* 03178 80835388 8FA40034 */ lw $a0, 0x0034($sp) +/* 03178 80835388 8FA40034 */ lw $a0, 0x0034($sp) /* 0317C 8083538C 31F80001 */ andi $t8, $t7, 0x0001 ## $t8 = 00000000 -/* 03180 80835390 53000004 */ beql $t8, $zero, .L808353A4 +/* 03180 80835390 53000004 */ beql $t8, $zero, .L808353A4 /* 03184 80835394 2419000A */ addiu $t9, $zero, 0x000A ## $t9 = 0000000A -/* 03188 80835398 0C20D429 */ jal func_808350A4 +/* 03188 80835398 0C20D429 */ jal func_808350A4 /* 0318C 8083539C 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 .L808353A0: /* 03190 808353A0 2419000A */ addiu $t9, $zero, 0x000A ## $t9 = 0000000A .L808353A4: /* 03194 808353A4 A6190834 */ sh $t9, 0x0834($s0) ## 00000834 -/* 03198 808353A8 0C20C884 */ jal func_80832210 +/* 03198 808353A8 0C20C884 */ jal func_80832210 /* 0319C 808353AC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 031A0 808353B0 10000005 */ beq $zero, $zero, .L808353C8 -/* 031A4 808353B4 8FBF001C */ lw $ra, 0x001C($sp) +/* 031A0 808353B0 10000005 */ beq $zero, $zero, .L808353C8 +/* 031A4 808353B4 8FBF001C */ lw $ra, 0x001C($sp) .L808353B8: /* 031A8 808353B8 8E08067C */ lw $t0, 0x067C($s0) ## 0000067C .L808353BC: /* 031AC 808353BC 35090200 */ ori $t1, $t0, 0x0200 ## $t1 = 00000200 /* 031B0 808353C0 AE09067C */ sw $t1, 0x067C($s0) ## 0000067C -/* 031B4 808353C4 8FBF001C */ lw $ra, 0x001C($sp) +/* 031B4 808353C4 8FBF001C */ lw $ra, 0x001C($sp) .L808353C8: -/* 031B8 808353C8 8FB00018 */ lw $s0, 0x0018($sp) +/* 031B8 808353C8 8FB00018 */ lw $s0, 0x0018($sp) /* 031BC 808353CC 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 031C0 808353D0 03E00008 */ jr $ra +/* 031C0 808353D0 03E00008 */ jr $ra /* 031C4 808353D4 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808353D8.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_808353D8.s index 230eb35071..6a61015ee3 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808353D8.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_808353D8.s @@ -1,126 +1,126 @@ glabel func_808353D8 /* 031C8 808353D8 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 031CC 808353DC AFB00018 */ sw $s0, 0x0018($sp) +/* 031CC 808353DC AFB00018 */ sw $s0, 0x0018($sp) /* 031D0 808353E0 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 031D4 808353E4 AFA5002C */ sw $a1, 0x002C($sp) +/* 031D4 808353E4 AFA5002C */ sw $a1, 0x002C($sp) /* 031D8 808353E8 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 031DC 808353EC AFBF001C */ sw $ra, 0x001C($sp) +/* 031DC 808353EC AFBF001C */ sw $ra, 0x001C($sp) /* 031E0 808353F0 260506C8 */ addiu $a1, $s0, 0x06C8 ## $a1 = 000006C8 -/* 031E4 808353F4 0C028EF0 */ jal func_800A3BC0 -/* 031E8 808353F8 AFA50024 */ sw $a1, 0x0024($sp) -/* 031EC 808353FC 0C023C41 */ jal func_8008F104 +/* 031E4 808353F4 0C028EF0 */ jal func_800A3BC0 +/* 031E8 808353F8 AFA50024 */ sw $a1, 0x0024($sp) +/* 031EC 808353FC 0C023C41 */ jal func_8008F104 /* 031F0 80835400 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 031F4 80835404 50400008 */ beql $v0, $zero, .L80835428 -/* 031F8 80835408 8FA4002C */ lw $a0, 0x002C($sp) -/* 031FC 8083540C 0C20D3EF */ jal func_80834FBC +/* 031F4 80835404 50400008 */ beql $v0, $zero, .L80835428 +/* 031F8 80835408 8FA4002C */ lw $a0, 0x002C($sp) +/* 031FC 8083540C 0C20D3EF */ jal func_80834FBC /* 03200 80835410 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 03204 80835414 54400004 */ bnel $v0, $zero, .L80835428 -/* 03208 80835418 8FA4002C */ lw $a0, 0x002C($sp) -/* 0320C 8083541C 10000055 */ beq $zero, $zero, .L80835574 +/* 03204 80835414 54400004 */ bnel $v0, $zero, .L80835428 +/* 03208 80835418 8FA4002C */ lw $a0, 0x002C($sp) +/* 0320C 8083541C 10000055 */ beq $zero, $zero, .L80835574 /* 03210 80835420 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -/* 03214 80835424 8FA4002C */ lw $a0, 0x002C($sp) +/* 03214 80835424 8FA4002C */ lw $a0, 0x002C($sp) .L80835428: -/* 03218 80835428 0C20D1D6 */ jal func_80834758 +/* 03218 80835428 0C20D1D6 */ jal func_80834758 /* 0321C 8083542C 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 03220 80835430 14400027 */ bne $v0, $zero, .L808354D0 +/* 03220 80835430 14400027 */ bne $v0, $zero, .L808354D0 /* 03224 80835434 3C0E8085 */ lui $t6, %hi(D_80853614) ## $t6 = 80850000 -/* 03228 80835438 8DCE3614 */ lw $t6, %lo(D_80853614)($t6) -/* 0322C 8083543C 55C0000D */ bnel $t6, $zero, .L80835474 +/* 03228 80835438 8DCE3614 */ lw $t6, %lo(D_80853614)($t6) +/* 0322C 8083543C 55C0000D */ bnel $t6, $zero, .L80835474 /* 03230 80835440 86020860 */ lh $v0, 0x0860($s0) ## 00000860 /* 03234 80835444 860F0860 */ lh $t7, 0x0860($s0) ## 00000860 /* 03238 80835448 3C188085 */ lui $t8, %hi(D_80853618) ## $t8 = 80850000 -/* 0323C 8083544C 05E10004 */ bgez $t7, .L80835460 +/* 0323C 8083544C 05E10004 */ bgez $t7, .L80835460 /* 03240 80835450 00000000 */ nop -/* 03244 80835454 8F183618 */ lw $t8, %lo(D_80853618)($t8) -/* 03248 80835458 57000006 */ bnel $t8, $zero, .L80835474 +/* 03244 80835454 8F183618 */ lw $t8, %lo(D_80853618)($t8) +/* 03248 80835458 57000006 */ bnel $t8, $zero, .L80835474 /* 0324C 8083545C 86020860 */ lh $v0, 0x0860($s0) ## 00000860 .L80835460: -/* 03250 80835460 0C20D391 */ jal func_80834E44 -/* 03254 80835464 8FA4002C */ lw $a0, 0x002C($sp) -/* 03258 80835468 5040001A */ beql $v0, $zero, .L808354D4 +/* 03250 80835460 0C20D391 */ jal func_80834E44 +/* 03254 80835464 8FA4002C */ lw $a0, 0x002C($sp) +/* 03258 80835468 5040001A */ beql $v0, $zero, .L808354D4 /* 0325C 8083546C 86020834 */ lh $v0, 0x0834($s0) ## 00000834 /* 03260 80835470 86020860 */ lh $v0, 0x0860($s0) ## 00000860 .L80835474: /* 03264 80835474 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 03268 80835478 04400003 */ bltz $v0, .L80835488 -/* 0326C 8083547C 0002C823 */ subu $t9, $zero, $v0 -/* 03270 80835480 10000002 */ beq $zero, $zero, .L8083548C +/* 03268 80835478 04400003 */ bltz $v0, .L80835488 +/* 0326C 8083547C 0002C823 */ subu $t9, $zero, $v0 +/* 03270 80835480 10000002 */ beq $zero, $zero, .L8083548C /* 03274 80835484 A6020860 */ sh $v0, 0x0860($s0) ## 00000860 .L80835488: /* 03278 80835488 A6190860 */ sh $t9, 0x0860($s0) ## 00000860 .L8083548C: -/* 0327C 8083548C 0C20D10B */ jal func_8083442C -/* 03280 80835490 8FA5002C */ lw $a1, 0x002C($sp) -/* 03284 80835494 50400037 */ beql $v0, $zero, .L80835574 +/* 0327C 8083548C 0C20D10B */ jal func_8083442C +/* 03280 80835490 8FA5002C */ lw $a1, 0x002C($sp) +/* 03284 80835494 50400037 */ beql $v0, $zero, .L80835574 /* 03288 80835498 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -/* 0328C 8083549C 0C023C41 */ jal func_8008F104 +/* 0328C 8083549C 0C023C41 */ jal func_8008F104 /* 03290 808354A0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 03294 808354A4 10400004 */ beq $v0, $zero, .L808354B8 -/* 03298 808354A8 8FA4002C */ lw $a0, 0x002C($sp) +/* 03294 808354A4 10400004 */ beq $v0, $zero, .L808354B8 +/* 03298 808354A8 8FA4002C */ lw $a0, 0x002C($sp) /* 0329C 808354AC 24080001 */ addiu $t0, $zero, 0x0001 ## $t0 = 00000001 -/* 032A0 808354B0 1000002F */ beq $zero, $zero, .L80835570 +/* 032A0 808354B0 1000002F */ beq $zero, $zero, .L80835570 /* 032A4 808354B4 A2080836 */ sb $t0, 0x0836($s0) ## 00000836 .L808354B8: /* 032A8 808354B8 3C060400 */ lui $a2, 0x0400 ## $a2 = 04000000 /* 032AC 808354BC 24C626B8 */ addiu $a2, $a2, 0x26B8 ## $a2 = 040026B8 -/* 032B0 808354C0 0C02901F */ jal func_800A407C -/* 032B4 808354C4 8FA50024 */ lw $a1, 0x0024($sp) -/* 032B8 808354C8 1000002A */ beq $zero, $zero, .L80835574 +/* 032B0 808354C0 0C02901F */ jal SkelAnime_ChangeLinkAnimDefaultStop +/* 032B4 808354C4 8FA50024 */ lw $a1, 0x0024($sp) +/* 032B8 808354C8 1000002A */ beq $zero, $zero, .L80835574 /* 032BC 808354CC 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 .L808354D0: /* 032C0 808354D0 86020834 */ lh $v0, 0x0834($s0) ## 00000834 .L808354D4: -/* 032C4 808354D4 10400002 */ beq $v0, $zero, .L808354E0 +/* 032C4 808354D4 10400002 */ beq $v0, $zero, .L808354E0 /* 032C8 808354D8 2449FFFF */ addiu $t1, $v0, 0xFFFF ## $t1 = 00000000 /* 032CC 808354DC A6090834 */ sh $t1, 0x0834($s0) ## 00000834 .L808354E0: -/* 032D0 808354E0 0C20CEF3 */ jal func_80833BCC +/* 032D0 808354E0 0C20CEF3 */ jal func_80833BCC /* 032D4 808354E4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 032D8 808354E8 54400009 */ bnel $v0, $zero, .L80835510 +/* 032D8 808354E8 54400009 */ bnel $v0, $zero, .L80835510 /* 032DC 808354EC 86020834 */ lh $v0, 0x0834($s0) ## 00000834 /* 032E0 808354F0 920A06AD */ lbu $t2, 0x06AD($s0) ## 000006AD -/* 032E4 808354F4 55400006 */ bnel $t2, $zero, .L80835510 +/* 032E4 808354F4 55400006 */ bnel $t2, $zero, .L80835510 /* 032E8 808354F8 86020834 */ lh $v0, 0x0834($s0) ## 00000834 /* 032EC 808354FC 8E0B067C */ lw $t3, 0x067C($s0) ## 0000067C -/* 032F0 80835500 000B62C0 */ sll $t4, $t3, 11 -/* 032F4 80835504 05810007 */ bgez $t4, .L80835524 +/* 032F0 80835500 000B62C0 */ sll $t4, $t3, 11 +/* 032F4 80835504 05810007 */ bgez $t4, .L80835524 /* 032F8 80835508 00000000 */ nop /* 032FC 8083550C 86020834 */ lh $v0, 0x0834($s0) ## 00000834 .L80835510: -/* 03300 80835510 14400002 */ bne $v0, $zero, .L8083551C +/* 03300 80835510 14400002 */ bne $v0, $zero, .L8083551C /* 03304 80835514 244D0001 */ addiu $t5, $v0, 0x0001 ## $t5 = 00000001 /* 03308 80835518 A60D0834 */ sh $t5, 0x0834($s0) ## 00000834 .L8083551C: -/* 0330C 8083551C 10000015 */ beq $zero, $zero, .L80835574 +/* 0330C 8083551C 10000015 */ beq $zero, $zero, .L80835574 /* 03310 80835520 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 .L80835524: -/* 03314 80835524 0C023C41 */ jal func_8008F104 +/* 03314 80835524 0C023C41 */ jal func_8008F104 /* 03318 80835528 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0331C 8083552C 10400007 */ beq $v0, $zero, .L8083554C +/* 0331C 8083552C 10400007 */ beq $v0, $zero, .L8083554C /* 03320 80835530 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 03324 80835534 3C058083 */ lui $a1, %hi(func_8083501C) ## $a1 = 80830000 /* 03328 80835538 24A5501C */ addiu $a1, $a1, %lo(func_8083501C) ## $a1 = 8083501C -/* 0332C 8083553C 0C20CD8E */ jal func_80833638 +/* 0332C 8083553C 0C20CD8E */ jal func_80833638 /* 03330 80835540 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 03334 80835544 1000000A */ beq $zero, $zero, .L80835570 +/* 03334 80835544 1000000A */ beq $zero, $zero, .L80835570 /* 03338 80835548 A6000834 */ sh $zero, 0x0834($s0) ## 00000834 .L8083554C: /* 0333C 8083554C 3C058083 */ lui $a1, %hi(func_80835588) ## $a1 = 80830000 -/* 03340 80835550 0C20CD8E */ jal func_80833638 +/* 03340 80835550 0C20CD8E */ jal func_80833638 /* 03344 80835554 24A55588 */ addiu $a1, $a1, %lo(func_80835588) ## $a1 = 80835588 /* 03348 80835558 3C060400 */ lui $a2, 0x0400 ## $a2 = 04000000 /* 0334C 8083555C 24C626B0 */ addiu $a2, $a2, 0x26B0 ## $a2 = 040026B0 -/* 03350 80835560 8FA4002C */ lw $a0, 0x002C($sp) -/* 03354 80835564 0C02901F */ jal func_800A407C -/* 03358 80835568 8FA50024 */ lw $a1, 0x0024($sp) +/* 03350 80835560 8FA4002C */ lw $a0, 0x002C($sp) +/* 03354 80835564 0C02901F */ jal SkelAnime_ChangeLinkAnimDefaultStop +/* 03358 80835568 8FA50024 */ lw $a1, 0x0024($sp) /* 0335C 8083556C A6000834 */ sh $zero, 0x0834($s0) ## 00000834 .L80835570: /* 03360 80835570 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 .L80835574: -/* 03364 80835574 8FBF001C */ lw $ra, 0x001C($sp) -/* 03368 80835578 8FB00018 */ lw $s0, 0x0018($sp) +/* 03364 80835574 8FBF001C */ lw $ra, 0x001C($sp) +/* 03368 80835578 8FB00018 */ lw $s0, 0x0018($sp) /* 0336C 8083557C 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 03370 80835580 03E00008 */ jr $ra +/* 03370 80835580 03E00008 */ jr $ra /* 03374 80835584 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80835688.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80835688.s index 5f09ac6d65..8fd9d23822 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80835688.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80835688.s @@ -1,28 +1,28 @@ glabel func_80835688 /* 03478 80835688 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 0347C 8083568C AFA5001C */ sw $a1, 0x001C($sp) +/* 0347C 8083568C AFA5001C */ sw $a1, 0x001C($sp) /* 03480 80835690 00802825 */ or $a1, $a0, $zero ## $a1 = 00000000 -/* 03484 80835694 AFBF0014 */ sw $ra, 0x0014($sp) -/* 03488 80835698 AFA40018 */ sw $a0, 0x0018($sp) +/* 03484 80835694 AFBF0014 */ sw $ra, 0x0014($sp) +/* 03488 80835698 AFA40018 */ sw $a0, 0x0018($sp) /* 0348C 8083569C 8CA603AC */ lw $a2, 0x03AC($a1) ## 000003AC -/* 03490 808356A0 AFA50018 */ sw $a1, 0x0018($sp) -/* 03494 808356A4 0C20D591 */ jal func_80835644 -/* 03498 808356A8 8FA4001C */ lw $a0, 0x001C($sp) -/* 0349C 808356AC 1440000A */ bne $v0, $zero, .L808356D8 -/* 034A0 808356B0 8FA40018 */ lw $a0, 0x0018($sp) +/* 03490 808356A0 AFA50018 */ sw $a1, 0x0018($sp) +/* 03494 808356A4 0C20D591 */ jal func_80835644 +/* 03498 808356A8 8FA4001C */ lw $a0, 0x001C($sp) +/* 0349C 808356AC 1440000A */ bne $v0, $zero, .L808356D8 +/* 034A0 808356B0 8FA40018 */ lw $a0, 0x0018($sp) /* 034A4 808356B4 3C058083 */ lui $a1, %hi(func_808356E8) ## $a1 = 80830000 -/* 034A8 808356B8 0C20CD8E */ jal func_80833638 +/* 034A8 808356B8 0C20CD8E */ jal func_80833638 /* 034AC 808356BC 24A556E8 */ addiu $a1, $a1, %lo(func_808356E8) ## $a1 = 808356E8 -/* 034B0 808356C0 8FA50018 */ lw $a1, 0x0018($sp) +/* 034B0 808356C0 8FA50018 */ lw $a1, 0x0018($sp) /* 034B4 808356C4 3C060400 */ lui $a2, 0x0400 ## $a2 = 04000000 /* 034B8 808356C8 24C62E10 */ addiu $a2, $a2, 0x2E10 ## $a2 = 04002E10 -/* 034BC 808356CC 8FA4001C */ lw $a0, 0x001C($sp) -/* 034C0 808356D0 0C029050 */ jal func_800A4140 +/* 034BC 808356CC 8FA4001C */ lw $a0, 0x001C($sp) +/* 034C0 808356D0 0C029050 */ jal SkelAnime_ChangeLinkAnimDefaultRepeat /* 034C4 808356D4 24A506C8 */ addiu $a1, $a1, 0x06C8 ## $a1 = 000006C8 .L808356D8: -/* 034C8 808356D8 8FBF0014 */ lw $ra, 0x0014($sp) +/* 034C8 808356D8 8FBF0014 */ lw $ra, 0x0014($sp) /* 034CC 808356DC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 034D0 808356E0 03E00008 */ jr $ra +/* 034D0 808356E0 03E00008 */ jr $ra /* 034D4 808356E4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808356E8.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_808356E8.s index e030140e11..60ebb0eab8 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808356E8.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_808356E8.s @@ -1,73 +1,73 @@ glabel func_808356E8 /* 034D8 808356E8 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 034DC 808356EC AFBF001C */ sw $ra, 0x001C($sp) -/* 034E0 808356F0 AFB10018 */ sw $s1, 0x0018($sp) -/* 034E4 808356F4 AFB00014 */ sw $s0, 0x0014($sp) +/* 034DC 808356EC AFBF001C */ sw $ra, 0x001C($sp) +/* 034E0 808356F0 AFB10018 */ sw $s1, 0x0018($sp) +/* 034E4 808356F4 AFB00014 */ sw $s0, 0x0014($sp) /* 034E8 808356F8 8C8E03AC */ lw $t6, 0x03AC($a0) ## 000003AC /* 034EC 808356FC 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 034F0 80835700 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 -/* 034F4 80835704 15C00004 */ bne $t6, $zero, .L80835718 -/* 034F8 80835708 AFAE0024 */ sw $t6, 0x0024($sp) +/* 034F4 80835704 15C00004 */ bne $t6, $zero, .L80835718 +/* 034F8 80835708 AFAE0024 */ sw $t6, 0x0024($sp) /* 034FC 8083570C 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 03500 80835710 0C20D191 */ jal func_80834644 +/* 03500 80835710 0C20D191 */ jal func_80834644 /* 03504 80835714 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 .L80835718: /* 03508 80835718 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 0350C 8083571C 0C20D1D6 */ jal func_80834758 +/* 0350C 8083571C 0C20D1D6 */ jal func_80834758 /* 03510 80835720 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 03514 80835724 50400004 */ beql $v0, $zero, .L80835738 +/* 03514 80835724 50400004 */ beql $v0, $zero, .L80835738 /* 03518 80835728 8E18067C */ lw $t8, 0x067C($s0) ## 0000067C -/* 0351C 8083572C 10000029 */ beq $zero, $zero, .L808357D4 +/* 0351C 8083572C 10000029 */ beq $zero, $zero, .L808357D4 /* 03520 80835730 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 /* 03524 80835734 8E18067C */ lw $t8, 0x067C($s0) ## 0000067C .L80835738: /* 03528 80835738 260506C8 */ addiu $a1, $s0, 0x06C8 ## $a1 = 000006C8 /* 0352C 8083573C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 03530 80835740 33190800 */ andi $t9, $t8, 0x0800 ## $t9 = 00000000 -/* 03534 80835744 13200021 */ beq $t9, $zero, .L808357CC +/* 03534 80835744 13200021 */ beq $t9, $zero, .L808357CC /* 03538 80835748 00000000 */ nop /* 0353C 8083574C 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 03540 80835750 0C028EF0 */ jal func_800A3BC0 -/* 03544 80835754 AFA50020 */ sw $a1, 0x0020($sp) -/* 03548 80835758 10400005 */ beq $v0, $zero, .L80835770 -/* 0354C 8083575C 8FA50020 */ lw $a1, 0x0020($sp) +/* 03540 80835750 0C028EF0 */ jal func_800A3BC0 +/* 03544 80835754 AFA50020 */ sw $a1, 0x0020($sp) +/* 03548 80835758 10400005 */ beq $v0, $zero, .L80835770 +/* 0354C 8083575C 8FA50020 */ lw $a1, 0x0020($sp) /* 03550 80835760 3C060400 */ lui $a2, 0x0400 ## $a2 = 04000000 /* 03554 80835764 24C62E10 */ addiu $a2, $a2, 0x2E10 ## $a2 = 04002E10 -/* 03558 80835768 0C029050 */ jal func_800A4140 +/* 03558 80835768 0C029050 */ jal SkelAnime_ChangeLinkAnimDefaultRepeat /* 0355C 8083576C 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 .L80835770: -/* 03560 80835770 8FA80024 */ lw $t0, 0x0024($sp) +/* 03560 80835770 8FA80024 */ lw $t0, 0x0024($sp) /* 03564 80835774 24010019 */ addiu $at, $zero, 0x0019 ## $at = 00000019 /* 03568 80835778 85090000 */ lh $t1, 0x0000($t0) ## 00000000 -/* 0356C 8083577C 15210011 */ bne $t1, $at, .L808357C4 +/* 0356C 8083577C 15210011 */ bne $t1, $at, .L808357C4 /* 03570 80835780 00000000 */ nop /* 03574 80835784 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 /* 03578 80835788 C6060060 */ lwc1 $f6, 0x0060($s0) ## 00000060 -/* 0357C 8083578C 4604303E */ c.le.s $f6, $f4 +/* 0357C 8083578C 4604303E */ c.le.s $f6, $f4 /* 03580 80835790 00000000 */ nop -/* 03584 80835794 4500000B */ bc1f .L808357C4 +/* 03584 80835794 4500000B */ bc1f .L808357C4 /* 03588 80835798 00000000 */ nop /* 0358C 8083579C C6100028 */ lwc1 $f16, 0x0028($s0) ## 00000028 /* 03590 808357A0 3C01C000 */ lui $at, 0xC000 ## $at = C0000000 /* 03594 808357A4 44814000 */ mtc1 $at, $f8 ## $f8 = -2.00 -/* 03598 808357A8 4600848D */ trunc.w.s $f18, $f16 +/* 03598 808357A8 4600848D */ trunc.w.s $f18, $f16 /* 0359C 808357AC 3C01BF00 */ lui $at, 0xBF00 ## $at = BF000000 /* 035A0 808357B0 44815000 */ mtc1 $at, $f10 ## $f10 = -0.50 /* 035A4 808357B4 E6080070 */ swc1 $f8, 0x0070($s0) ## 00000070 -/* 035A8 808357B8 440B9000 */ mfc1 $t3, $f18 +/* 035A8 808357B8 440B9000 */ mfc1 $t3, $f18 /* 035AC 808357BC E60A006C */ swc1 $f10, 0x006C($s0) ## 0000006C /* 035B0 808357C0 A60B0894 */ sh $t3, 0x0894($s0) ## 00000894 .L808357C4: -/* 035B4 808357C4 10000003 */ beq $zero, $zero, .L808357D4 +/* 035B4 808357C4 10000003 */ beq $zero, $zero, .L808357D4 /* 035B8 808357C8 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 .L808357CC: -/* 035BC 808357CC 0C20D217 */ jal func_8083485C +/* 035BC 808357CC 0C20D217 */ jal func_8083485C /* 035C0 808357D0 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 .L808357D4: -/* 035C4 808357D4 8FBF001C */ lw $ra, 0x001C($sp) -/* 035C8 808357D8 8FB00014 */ lw $s0, 0x0014($sp) -/* 035CC 808357DC 8FB10018 */ lw $s1, 0x0018($sp) -/* 035D0 808357E0 03E00008 */ jr $ra +/* 035C4 808357D4 8FBF001C */ lw $ra, 0x001C($sp) +/* 035C8 808357D8 8FB00014 */ lw $s0, 0x0014($sp) +/* 035CC 808357DC 8FB10018 */ lw $s1, 0x0018($sp) +/* 035D0 808357E0 03E00008 */ jr $ra /* 035D4 808357E4 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80835884.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80835884.s index 9c68f08440..6852f41d90 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80835884.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80835884.s @@ -1,31 +1,31 @@ glabel func_80835884 /* 03674 80835884 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 03678 80835888 AFA40020 */ sw $a0, 0x0020($sp) -/* 0367C 8083588C AFA50024 */ sw $a1, 0x0024($sp) +/* 03678 80835888 AFA40020 */ sw $a0, 0x0020($sp) +/* 0367C 8083588C AFA50024 */ sw $a1, 0x0024($sp) /* 03680 80835890 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 03684 80835894 8FA50020 */ lw $a1, 0x0020($sp) -/* 03688 80835898 AFBF0014 */ sw $ra, 0x0014($sp) +/* 03684 80835894 8FA50020 */ lw $a1, 0x0020($sp) +/* 03688 80835898 AFBF0014 */ sw $ra, 0x0014($sp) /* 0368C 8083589C 24A506C8 */ addiu $a1, $a1, 0x06C8 ## $a1 = 000006C8 -/* 03690 808358A0 0C028EF0 */ jal func_800A3BC0 -/* 03694 808358A4 AFA5001C */ sw $a1, 0x001C($sp) -/* 03698 808358A8 10400009 */ beq $v0, $zero, .L808358D0 -/* 0369C 808358AC 8FA40020 */ lw $a0, 0x0020($sp) +/* 03690 808358A0 0C028EF0 */ jal func_800A3BC0 +/* 03694 808358A4 AFA5001C */ sw $a1, 0x001C($sp) +/* 03698 808358A8 10400009 */ beq $v0, $zero, .L808358D0 +/* 0369C 808358AC 8FA40020 */ lw $a0, 0x0020($sp) /* 036A0 808358B0 3C058083 */ lui $a1, %hi(func_808358F0) ## $a1 = 80830000 -/* 036A4 808358B4 0C20CD8E */ jal func_80833638 +/* 036A4 808358B4 0C20CD8E */ jal func_80833638 /* 036A8 808358B8 24A558F0 */ addiu $a1, $a1, %lo(func_808358F0) ## $a1 = 808358F0 /* 036AC 808358BC 3C060400 */ lui $a2, 0x0400 ## $a2 = 04000000 /* 036B0 808358C0 24C62638 */ addiu $a2, $a2, 0x2638 ## $a2 = 04002638 -/* 036B4 808358C4 8FA40024 */ lw $a0, 0x0024($sp) -/* 036B8 808358C8 0C029050 */ jal func_800A4140 -/* 036BC 808358CC 8FA5001C */ lw $a1, 0x001C($sp) +/* 036B4 808358C4 8FA40024 */ lw $a0, 0x0024($sp) +/* 036B8 808358C8 0C029050 */ jal SkelAnime_ChangeLinkAnimDefaultRepeat +/* 036BC 808358CC 8FA5001C */ lw $a1, 0x001C($sp) .L808358D0: -/* 036C0 808358D0 8FA40020 */ lw $a0, 0x0020($sp) -/* 036C4 808358D4 0C20D3AE */ jal func_80834EB8 -/* 036C8 808358D8 8FA50024 */ lw $a1, 0x0024($sp) -/* 036CC 808358DC 8FBF0014 */ lw $ra, 0x0014($sp) +/* 036C0 808358D0 8FA40020 */ lw $a0, 0x0020($sp) +/* 036C4 808358D4 0C20D3AE */ jal func_80834EB8 +/* 036C8 808358D8 8FA50024 */ lw $a1, 0x0024($sp) +/* 036CC 808358DC 8FBF0014 */ lw $ra, 0x0014($sp) /* 036D0 808358E0 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 /* 036D4 808358E4 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -/* 036D8 808358E8 03E00008 */ jr $ra +/* 036D8 808358E8 03E00008 */ jr $ra /* 036DC 808358EC 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808358F0.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_808358F0.s index a7d29168e9..e32aecd73d 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808358F0.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_808358F0.s @@ -1,75 +1,75 @@ glabel func_808358F0 /* 036E0 808358F0 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 036E4 808358F4 AFBF001C */ sw $ra, 0x001C($sp) -/* 036E8 808358F8 AFB00018 */ sw $s0, 0x0018($sp) -/* 036EC 808358FC AFA50034 */ sw $a1, 0x0034($sp) +/* 036E4 808358F4 AFBF001C */ sw $ra, 0x001C($sp) +/* 036E8 808358F8 AFB00018 */ sw $s0, 0x0018($sp) +/* 036EC 808358FC AFA50034 */ sw $a1, 0x0034($sp) /* 036F0 80835900 8C8E01BC */ lw $t6, 0x01BC($a0) ## 000001BC /* 036F4 80835904 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 036F8 80835908 0C20CD39 */ jal func_808334E4 -/* 036FC 8083590C AFAE002C */ sw $t6, 0x002C($sp) -/* 03700 80835910 8FAF002C */ lw $t7, 0x002C($sp) -/* 03704 80835914 504F0012 */ beql $v0, $t7, .L80835960 -/* 03708 80835918 8FA40034 */ lw $a0, 0x0034($sp) -/* 0370C 8083591C 0C20CD4A */ jal func_80833528 +/* 036F8 80835908 0C20CD39 */ jal func_808334E4 +/* 036FC 8083590C AFAE002C */ sw $t6, 0x002C($sp) +/* 03700 80835910 8FAF002C */ lw $t7, 0x002C($sp) +/* 03704 80835914 504F0012 */ beql $v0, $t7, .L80835960 +/* 03708 80835918 8FA40034 */ lw $a0, 0x0034($sp) +/* 0370C 8083591C 0C20CD4A */ jal func_80833528 /* 03710 80835920 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 03714 80835924 8FB8002C */ lw $t8, 0x002C($sp) -/* 03718 80835928 5058000D */ beql $v0, $t8, .L80835960 -/* 0371C 8083592C 8FA40034 */ lw $a0, 0x0034($sp) -/* 03720 80835930 0C20CD6C */ jal func_808335B0 +/* 03714 80835924 8FB8002C */ lw $t8, 0x002C($sp) +/* 03718 80835928 5058000D */ beql $v0, $t8, .L80835960 +/* 0371C 8083592C 8FA40034 */ lw $a0, 0x0034($sp) +/* 03720 80835930 0C20CD6C */ jal func_808335B0 /* 03724 80835934 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 03728 80835938 8FB9002C */ lw $t9, 0x002C($sp) -/* 0372C 8083593C 50590008 */ beql $v0, $t9, .L80835960 -/* 03730 80835940 8FA40034 */ lw $a0, 0x0034($sp) -/* 03734 80835944 0C20CD7D */ jal func_808335F4 +/* 03728 80835938 8FB9002C */ lw $t9, 0x002C($sp) +/* 0372C 8083593C 50590008 */ beql $v0, $t9, .L80835960 +/* 03730 80835940 8FA40034 */ lw $a0, 0x0034($sp) +/* 03734 80835944 0C20CD7D */ jal func_808335F4 /* 03738 80835948 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0373C 8083594C 8FA8002C */ lw $t0, 0x002C($sp) -/* 03740 80835950 8FA40034 */ lw $a0, 0x0034($sp) -/* 03744 80835954 14480008 */ bne $v0, $t0, .L80835978 +/* 0373C 8083594C 8FA8002C */ lw $t0, 0x002C($sp) +/* 03740 80835950 8FA40034 */ lw $a0, 0x0034($sp) +/* 03744 80835954 14480008 */ bne $v0, $t0, .L80835978 /* 03748 80835958 00000000 */ nop -/* 0374C 8083595C 8FA40034 */ lw $a0, 0x0034($sp) +/* 0374C 8083595C 8FA40034 */ lw $a0, 0x0034($sp) .L80835960: /* 03750 80835960 920501B4 */ lbu $a1, 0x01B4($s0) ## 000001B4 /* 03754 80835964 8E0606E8 */ lw $a2, 0x06E8($s0) ## 000006E8 -/* 03758 80835968 0C028D1E */ jal func_800A3478 +/* 03758 80835968 0C028D1E */ jal SkelAnime_LoadAnimationType1 /* 0375C 8083596C 8E0701D4 */ lw $a3, 0x01D4($s0) ## 000001D4 -/* 03760 80835970 10000004 */ beq $zero, $zero, .L80835984 +/* 03760 80835970 10000004 */ beq $zero, $zero, .L80835984 /* 03764 80835974 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 .L80835978: -/* 03768 80835978 0C028EF0 */ jal func_800A3BC0 +/* 03768 80835978 0C028EF0 */ jal func_800A3BC0 /* 0376C 8083597C 260506C8 */ addiu $a1, $s0, 0x06C8 ## $a1 = 000006C8 /* 03770 80835980 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 .L80835984: -/* 03774 80835984 0C20D3AE */ jal func_80834EB8 -/* 03778 80835988 8FA50034 */ lw $a1, 0x0034($sp) +/* 03774 80835984 0C20D3AE */ jal func_80834EB8 +/* 03778 80835988 8FA50034 */ lw $a1, 0x0034($sp) /* 0377C 8083598C 3C098085 */ lui $t1, %hi(D_80853618) ## $t1 = 80850000 -/* 03780 80835990 8D293618 */ lw $t1, %lo(D_80853618)($t1) +/* 03780 80835990 8D293618 */ lw $t1, %lo(D_80853618)($t1) /* 03784 80835994 3C058083 */ lui $a1, %hi(func_808359FC) ## $a1 = 80830000 /* 03788 80835998 24A559FC */ addiu $a1, $a1, %lo(func_808359FC) ## $a1 = 808359FC -/* 0378C 8083599C 15200012 */ bne $t1, $zero, .L808359E8 +/* 0378C 8083599C 15200012 */ bne $t1, $zero, .L808359E8 /* 03790 808359A0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 03794 808359A4 260A06C8 */ addiu $t2, $s0, 0x06C8 ## $t2 = 000006C8 -/* 03798 808359A8 0C20CD8E */ jal func_80833638 -/* 0379C 808359AC AFAA0024 */ sw $t2, 0x0024($sp) +/* 03798 808359A8 0C20CD8E */ jal func_80833638 +/* 0379C 808359AC AFAA0024 */ sw $t2, 0x0024($sp) /* 037A0 808359B0 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 /* 037A4 808359B4 44813000 */ mtc1 $at, $f6 ## $f6 = 0.50 /* 037A8 808359B8 C6040870 */ lwc1 $f4, 0x0870($s0) ## 00000870 /* 037AC 808359BC 3C060400 */ lui $a2, 0x0400 ## $a2 = 04000000 /* 037B0 808359C0 24C62600 */ addiu $a2, $a2, 0x2600 ## $a2 = 04002600 -/* 037B4 808359C4 4606203C */ c.lt.s $f4, $f6 -/* 037B8 808359C8 8FA40034 */ lw $a0, 0x0034($sp) -/* 037BC 808359CC 45000004 */ bc1f .L808359E0 +/* 037B4 808359C4 4606203C */ c.lt.s $f4, $f6 +/* 037B8 808359C8 8FA40034 */ lw $a0, 0x0034($sp) +/* 037BC 808359CC 45000004 */ bc1f .L808359E0 /* 037C0 808359D0 00000000 */ nop /* 037C4 808359D4 3C060400 */ lui $a2, 0x0400 ## $a2 = 04000000 -/* 037C8 808359D8 10000001 */ beq $zero, $zero, .L808359E0 +/* 037C8 808359D8 10000001 */ beq $zero, $zero, .L808359E0 /* 037CC 808359DC 24C62608 */ addiu $a2, $a2, 0x2608 ## $a2 = 04002608 .L808359E0: -/* 037D0 808359E0 0C02901F */ jal func_800A407C -/* 037D4 808359E4 8FA50024 */ lw $a1, 0x0024($sp) +/* 037D0 808359E0 0C02901F */ jal SkelAnime_ChangeLinkAnimDefaultStop +/* 037D4 808359E4 8FA50024 */ lw $a1, 0x0024($sp) .L808359E8: -/* 037D8 808359E8 8FBF001C */ lw $ra, 0x001C($sp) -/* 037DC 808359EC 8FB00018 */ lw $s0, 0x0018($sp) +/* 037D8 808359E8 8FBF001C */ lw $ra, 0x001C($sp) +/* 037DC 808359EC 8FB00018 */ lw $s0, 0x0018($sp) /* 037E0 808359F0 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 037E4 808359F4 03E00008 */ jr $ra +/* 037E4 808359F4 03E00008 */ jr $ra /* 037E8 808359F8 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80835B60.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80835B60.s index eded448249..216b88776e 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80835B60.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80835B60.s @@ -1,47 +1,47 @@ glabel func_80835B60 /* 03950 80835B60 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0 -/* 03954 80835B64 AFB00018 */ sw $s0, 0x0018($sp) +/* 03954 80835B64 AFB00018 */ sw $s0, 0x0018($sp) /* 03958 80835B68 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 0395C 80835B6C AFBF001C */ sw $ra, 0x001C($sp) -/* 03960 80835B70 AFA50024 */ sw $a1, 0x0024($sp) +/* 0395C 80835B6C AFBF001C */ sw $ra, 0x001C($sp) +/* 03960 80835B70 AFA50024 */ sw $a1, 0x0024($sp) /* 03964 80835B74 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 03968 80835B78 0C20D1D6 */ jal func_80834758 +/* 03968 80835B78 0C20D1D6 */ jal func_80834758 /* 0396C 80835B7C 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 03970 80835B80 50400004 */ beql $v0, $zero, .L80835B94 +/* 03970 80835B80 50400004 */ beql $v0, $zero, .L80835B94 /* 03974 80835B84 8E0E067C */ lw $t6, 0x067C($s0) ## 0000067C -/* 03978 80835B88 1000001A */ beq $zero, $zero, .L80835BF4 +/* 03978 80835B88 1000001A */ beq $zero, $zero, .L80835BF4 /* 0397C 80835B8C 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 /* 03980 80835B90 8E0E067C */ lw $t6, 0x067C($s0) ## 0000067C .L80835B94: /* 03984 80835B94 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 03988 80835B98 3C058083 */ lui $a1, %hi(func_80835C08) ## $a1 = 80830000 -/* 0398C 80835B9C 000E7980 */ sll $t7, $t6, 6 -/* 03990 80835BA0 05E00014 */ bltz $t7, .L80835BF4 +/* 0398C 80835B9C 000E7980 */ sll $t7, $t6, 6 +/* 03990 80835BA0 05E00014 */ bltz $t7, .L80835BF4 /* 03994 80835BA4 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 03998 80835BA8 0C20CD8E */ jal func_80833638 +/* 03998 80835BA8 0C20CD8E */ jal func_80833638 /* 0399C 80835BAC 24A55C08 */ addiu $a1, $a1, %lo(func_80835C08) ## $a1 = 80835C08 /* 039A0 80835BB0 3C060400 */ lui $a2, 0x0400 ## $a2 = 04000000 /* 039A4 80835BB4 24C625F8 */ addiu $a2, $a2, 0x25F8 ## $a2 = 040025F8 -/* 039A8 80835BB8 8FA40024 */ lw $a0, 0x0024($sp) -/* 039AC 80835BBC 0C02901F */ jal func_800A407C +/* 039A8 80835BB8 8FA40024 */ lw $a0, 0x0024($sp) +/* 039AC 80835BBC 0C02901F */ jal SkelAnime_ChangeLinkAnimDefaultStop /* 039B0 80835BC0 260506C8 */ addiu $a1, $s0, 0x06C8 ## $a1 = 000006C8 /* 039B4 80835BC4 3C058012 */ lui $a1, 0x8012 ## $a1 = 80120000 /* 039B8 80835BC8 24A55EF8 */ addiu $a1, $a1, 0x5EF8 ## $a1 = 80125EF8 -/* 039BC 80835BCC 0C20D5FA */ jal func_808357E8 +/* 039BC 80835BCC 0C20D5FA */ jal func_808357E8 /* 039C0 80835BD0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 039C4 80835BD4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 039C8 80835BD8 0C00BDF7 */ jal func_8002F7DC +/* 039C8 80835BD8 0C00BDF7 */ jal func_8002F7DC /* 039CC 80835BDC 24050836 */ addiu $a1, $zero, 0x0836 ## $a1 = 00000836 /* 039D0 80835BE0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 039D4 80835BE4 0C20C9A6 */ jal func_80832698 +/* 039D4 80835BE4 0C20C9A6 */ jal func_80832698 /* 039D8 80835BE8 24056800 */ addiu $a1, $zero, 0x6800 ## $a1 = 00006800 -/* 039DC 80835BEC 10000001 */ beq $zero, $zero, .L80835BF4 +/* 039DC 80835BEC 10000001 */ beq $zero, $zero, .L80835BF4 /* 039E0 80835BF0 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 .L80835BF4: -/* 039E4 80835BF4 8FBF001C */ lw $ra, 0x001C($sp) -/* 039E8 80835BF8 8FB00018 */ lw $s0, 0x0018($sp) +/* 039E4 80835BF4 8FBF001C */ lw $ra, 0x001C($sp) +/* 039E8 80835BF8 8FB00018 */ lw $s0, 0x0018($sp) /* 039EC 80835BFC 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000 -/* 039F0 80835C00 03E00008 */ jr $ra +/* 039F0 80835C00 03E00008 */ jr $ra /* 039F4 80835C04 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80836670.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80836670.s index b25d84a2a1..d3be2da42b 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80836670.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80836670.s @@ -1,38 +1,38 @@ glabel func_80836670 /* 04460 80836670 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 04464 80836674 AFBF0024 */ sw $ra, 0x0024($sp) -/* 04468 80836678 AFB00020 */ sw $s0, 0x0020($sp) -/* 0446C 8083667C AFA5002C */ sw $a1, 0x002C($sp) +/* 04464 80836674 AFBF0024 */ sw $ra, 0x0024($sp) +/* 04468 80836678 AFB00020 */ sw $s0, 0x0020($sp) +/* 0446C 8083667C AFA5002C */ sw $a1, 0x002C($sp) /* 04470 80836680 8C8E067C */ lw $t6, 0x067C($a0) ## 0000067C /* 04474 80836684 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 04478 80836688 000E7A00 */ sll $t7, $t6, 8 -/* 0447C 8083668C 05E00029 */ bltz $t7, .L80836734 +/* 04478 80836688 000E7A00 */ sll $t7, $t6, 8 +/* 0447C 8083668C 05E00029 */ bltz $t7, .L80836734 /* 04480 80836690 00000000 */ nop /* 04484 80836694 8C980118 */ lw $t8, 0x0118($a0) ## 00000118 -/* 04488 80836698 13000026 */ beq $t8, $zero, .L80836734 +/* 04488 80836698 13000026 */ beq $t8, $zero, .L80836734 /* 0448C 8083669C 00000000 */ nop -/* 04490 808366A0 0C023C41 */ jal func_8008F104 +/* 04490 808366A0 0C023C41 */ jal func_8008F104 /* 04494 808366A4 00000000 */ nop -/* 04498 808366A8 10400022 */ beq $v0, $zero, .L80836734 -/* 0449C 808366AC 8FA4002C */ lw $a0, 0x002C($sp) +/* 04498 808366A8 10400022 */ beq $v0, $zero, .L80836734 +/* 0449C 808366AC 8FA4002C */ lw $a0, 0x002C($sp) /* 044A0 808366B0 3C068085 */ lui $a2, %hi(func_80850AEC) ## $a2 = 80850000 /* 044A4 808366B4 24C60AEC */ addiu $a2, $a2, %lo(func_80850AEC) ## $a2 = 80850AEC /* 044A8 808366B8 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 044AC 808366BC 0C20D716 */ jal func_80835C58 +/* 044AC 808366BC 0C20D716 */ jal func_80835C58 /* 044B0 808366C0 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 /* 044B4 808366C4 92190692 */ lbu $t9, 0x0692($s0) ## 00000692 /* 044B8 808366C8 3C060400 */ lui $a2, 0x0400 ## $a2 = 04000000 /* 044BC 808366CC 24C62C90 */ addiu $a2, $a2, 0x2C90 ## $a2 = 04002C90 /* 044C0 808366D0 37280080 */ ori $t0, $t9, 0x0080 ## $t0 = 00000080 /* 044C4 808366D4 A2080692 */ sb $t0, 0x0692($s0) ## 00000692 -/* 044C8 808366D8 8FA4002C */ lw $a0, 0x002C($sp) -/* 044CC 808366DC 0C20C899 */ jal func_80832264 +/* 044C8 808366D8 8FA4002C */ lw $a0, 0x002C($sp) +/* 044CC 808366DC 0C20C899 */ jal func_80832264 /* 044D0 808366E0 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 044D4 808366E4 8FA4002C */ lw $a0, 0x002C($sp) +/* 044D4 808366E4 8FA4002C */ lw $a0, 0x002C($sp) /* 044D8 808366E8 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 044DC 808366EC 0C20CBD5 */ jal func_80832F54 +/* 044DC 808366EC 0C20CBD5 */ jal func_80832F54 /* 044E0 808366F0 2406009B */ addiu $a2, $zero, 0x009B ## $a2 = 0000009B -/* 044E4 808366F4 0C20C889 */ jal func_80832224 +/* 044E4 808366F4 0C20C889 */ jal func_80832224 /* 044E8 808366F8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 044EC 808366FC 960A0088 */ lhu $t2, 0x0088($s0) ## 00000088 /* 044F0 80836700 960C06AE */ lhu $t4, 0x06AE($s0) ## 000006AE @@ -44,109 +44,109 @@ glabel func_80836670 /* 04508 80836718 A60D06AE */ sh $t5, 0x06AE($s0) ## 000006AE /* 0450C 8083671C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 04510 80836720 24056802 */ addiu $a1, $zero, 0x6802 ## $a1 = 00006802 -/* 04514 80836724 0C20C9A6 */ jal func_80832698 +/* 04514 80836724 0C20C9A6 */ jal func_80832698 /* 04518 80836728 A609083C */ sh $t1, 0x083C($s0) ## 0000083C -/* 0451C 8083672C 10000055 */ beq $zero, $zero, .L80836884 +/* 0451C 8083672C 10000055 */ beq $zero, $zero, .L80836884 /* 04520 80836730 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 .L80836734: -/* 04524 80836734 0C20D972 */ jal func_808365C8 +/* 04524 80836734 0C20D972 */ jal func_808365C8 /* 04528 80836738 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0452C 8083673C 1040000A */ beq $v0, $zero, .L80836768 +/* 0452C 8083673C 1040000A */ beq $v0, $zero, .L80836768 /* 04530 80836740 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 04534 80836744 0C20D0A6 */ jal func_80834298 -/* 04538 80836748 8FA5002C */ lw $a1, 0x002C($sp) +/* 04534 80836744 0C20D0A6 */ jal func_80834298 +/* 04538 80836748 8FA5002C */ lw $a1, 0x002C($sp) /* 0453C 8083674C 8E0E0674 */ lw $t6, 0x0674($s0) ## 00000674 /* 04540 80836750 3C0F8085 */ lui $t7, %hi(func_8084E604) ## $t7 = 80850000 /* 04544 80836754 25EFE604 */ addiu $t7, $t7, %lo(func_8084E604) ## $t7 = 8084E604 -/* 04548 80836758 55CF0004 */ bnel $t6, $t7, .L8083676C +/* 04548 80836758 55CF0004 */ bnel $t6, $t7, .L8083676C /* 0454C 8083675C 8E19082C */ lw $t9, 0x082C($s0) ## 0000082C -/* 04550 80836760 10000048 */ beq $zero, $zero, .L80836884 +/* 04550 80836760 10000048 */ beq $zero, $zero, .L80836884 /* 04554 80836764 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 .L80836768: /* 04558 80836768 8E19082C */ lw $t9, 0x082C($s0) ## 0000082C .L8083676C: /* 0455C 8083676C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 04560 80836770 8FA5002C */ lw $a1, 0x002C($sp) -/* 04564 80836774 0320F809 */ jalr $ra, $t9 +/* 04560 80836770 8FA5002C */ lw $a1, 0x002C($sp) +/* 04564 80836774 0320F809 */ jalr $ra, $t9 /* 04568 80836778 00000000 */ nop -/* 0456C 8083677C 54400004 */ bnel $v0, $zero, .L80836790 +/* 0456C 8083677C 54400004 */ bnel $v0, $zero, .L80836790 /* 04570 80836780 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 -/* 04574 80836784 1000003F */ beq $zero, $zero, .L80836884 +/* 04574 80836784 1000003F */ beq $zero, $zero, .L80836884 /* 04578 80836788 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 /* 0457C 8083678C 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 .L80836790: /* 04580 80836790 C6060830 */ lwc1 $f6, 0x0830($s0) ## 00000830 -/* 04584 80836794 46062032 */ c.eq.s $f4, $f6 +/* 04584 80836794 46062032 */ c.eq.s $f4, $f6 /* 04588 80836798 00000000 */ nop -/* 0458C 8083679C 45010021 */ bc1t .L80836824 +/* 0458C 8083679C 45010021 */ bc1t .L80836824 /* 04590 808367A0 00000000 */ nop -/* 04594 808367A4 0C20CCD4 */ jal func_80833350 +/* 04594 808367A4 0C20CCD4 */ jal func_80833350 /* 04598 808367A8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0459C 808367AC 10400006 */ beq $v0, $zero, .L808367C8 -/* 045A0 808367B0 8FA4002C */ lw $a0, 0x002C($sp) +/* 0459C 808367AC 10400006 */ beq $v0, $zero, .L808367C8 +/* 045A0 808367B0 8FA4002C */ lw $a0, 0x002C($sp) /* 045A4 808367B4 44804000 */ mtc1 $zero, $f8 ## $f8 = 0.00 /* 045A8 808367B8 C60A0838 */ lwc1 $f10, 0x0838($s0) ## 00000838 -/* 045AC 808367BC 460A4032 */ c.eq.s $f8, $f10 +/* 045AC 808367BC 460A4032 */ c.eq.s $f8, $f10 /* 045B0 808367C0 00000000 */ nop -/* 045B4 808367C4 45010007 */ bc1t .L808367E4 +/* 045B4 808367C4 45010007 */ bc1t .L808367E4 .L808367C8: /* 045B8 808367C8 3C188085 */ lui $t8, %hi(D_80853410) ## $t8 = 80850000 /* 045BC 808367CC 27183410 */ addiu $t8, $t8, %lo(D_80853410) ## $t8 = 80853410 /* 045C0 808367D0 920501B4 */ lbu $a1, 0x01B4($s0) ## 000001B4 /* 045C4 808367D4 8E0606E8 */ lw $a2, 0x06E8($s0) ## 000006E8 /* 045C8 808367D8 8E0701D4 */ lw $a3, 0x01D4($s0) ## 000001D4 -/* 045CC 808367DC 0C028D6D */ jal func_800A35B4 -/* 045D0 808367E0 AFB80010 */ sw $t8, 0x0010($sp) +/* 045CC 808367DC 0C028D6D */ jal SkelAnime_LoadAnimationType4 +/* 045D0 808367E0 AFB80010 */ sw $t8, 0x0010($sp) .L808367E4: /* 045D4 808367E4 26040830 */ addiu $a0, $s0, 0x0830 ## $a0 = 00000830 /* 045D8 808367E8 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 /* 045DC 808367EC 0C01DE80 */ jal Math_ApproxF - + /* 045E0 808367F0 3C063E80 */ lui $a2, 0x3E80 ## $a2 = 3E800000 /* 045E4 808367F4 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 /* 045E8 808367F8 44818000 */ mtc1 $at, $f16 ## $f16 = 1.00 /* 045EC 808367FC C6120830 */ lwc1 $f18, 0x0830($s0) ## 00000830 /* 045F0 80836800 920501B4 */ lbu $a1, 0x01B4($s0) ## 000001B4 /* 045F4 80836804 8E0601D4 */ lw $a2, 0x01D4($s0) ## 000001D4 -/* 045F8 80836808 46128101 */ sub.s $f4, $f16, $f18 +/* 045F8 80836808 46128101 */ sub.s $f4, $f16, $f18 /* 045FC 8083680C 8E0706E8 */ lw $a3, 0x06E8($s0) ## 000006E8 -/* 04600 80836810 8FA4002C */ lw $a0, 0x002C($sp) -/* 04604 80836814 0C028D37 */ jal func_800A34DC -/* 04608 80836818 E7A40010 */ swc1 $f4, 0x0010($sp) -/* 0460C 8083681C 10000019 */ beq $zero, $zero, .L80836884 +/* 04600 80836810 8FA4002C */ lw $a0, 0x002C($sp) +/* 04604 80836814 0C028D37 */ jal SkelAnime_LoadAnimationType2 +/* 04608 80836818 E7A40010 */ swc1 $f4, 0x0010($sp) +/* 0460C 8083681C 10000019 */ beq $zero, $zero, .L80836884 /* 04610 80836820 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 .L80836824: -/* 04614 80836824 0C20CCD4 */ jal func_80833350 +/* 04614 80836824 0C20CCD4 */ jal func_80833350 /* 04618 80836828 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0461C 8083682C 10400006 */ beq $v0, $zero, .L80836848 -/* 04620 80836830 8FA4002C */ lw $a0, 0x002C($sp) +/* 0461C 8083682C 10400006 */ beq $v0, $zero, .L80836848 +/* 04620 80836830 8FA4002C */ lw $a0, 0x002C($sp) /* 04624 80836834 44803000 */ mtc1 $zero, $f6 ## $f6 = 0.00 /* 04628 80836838 C6080838 */ lwc1 $f8, 0x0838($s0) ## 00000838 -/* 0462C 8083683C 46083032 */ c.eq.s $f6, $f8 +/* 0462C 8083683C 46083032 */ c.eq.s $f6, $f8 /* 04630 80836840 00000000 */ nop -/* 04634 80836844 45010009 */ bc1t .L8083686C +/* 04634 80836844 45010009 */ bc1t .L8083686C .L80836848: /* 04638 80836848 3C088085 */ lui $t0, %hi(D_80853410) ## $t0 = 80850000 /* 0463C 8083684C 25083410 */ addiu $t0, $t0, %lo(D_80853410) ## $t0 = 80853410 /* 04640 80836850 920501B4 */ lbu $a1, 0x01B4($s0) ## 000001B4 /* 04644 80836854 8E0601D4 */ lw $a2, 0x01D4($s0) ## 000001D4 /* 04648 80836858 8E0706E8 */ lw $a3, 0x06E8($s0) ## 000006E8 -/* 0464C 8083685C 0C028D52 */ jal func_800A3548 -/* 04650 80836860 AFA80010 */ sw $t0, 0x0010($sp) -/* 04654 80836864 10000007 */ beq $zero, $zero, .L80836884 +/* 0464C 8083685C 0C028D52 */ jal SkelAnime_LoadAnimationType3 +/* 04650 80836860 AFA80010 */ sw $t0, 0x0010($sp) +/* 04654 80836864 10000007 */ beq $zero, $zero, .L80836884 /* 04658 80836868 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 .L8083686C: -/* 0465C 8083686C 8FA4002C */ lw $a0, 0x002C($sp) +/* 0465C 8083686C 8FA4002C */ lw $a0, 0x002C($sp) /* 04660 80836870 920501B4 */ lbu $a1, 0x01B4($s0) ## 000001B4 /* 04664 80836874 8E0601D4 */ lw $a2, 0x01D4($s0) ## 000001D4 -/* 04668 80836878 0C028D1E */ jal func_800A3478 +/* 04668 80836878 0C028D1E */ jal SkelAnime_LoadAnimationType1 /* 0466C 8083687C 8E0706E8 */ lw $a3, 0x06E8($s0) ## 000006E8 /* 04670 80836880 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 .L80836884: -/* 04674 80836884 8FBF0024 */ lw $ra, 0x0024($sp) -/* 04678 80836888 8FB00020 */ lw $s0, 0x0020($sp) +/* 04674 80836884 8FBF0024 */ lw $ra, 0x0024($sp) +/* 04678 80836888 8FB00020 */ lw $s0, 0x0020($sp) /* 0467C 8083688C 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 04680 80836890 03E00008 */ jr $ra +/* 04680 80836890 03E00008 */ jr $ra /* 04684 80836894 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80837704.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80837704.s index 4e17eafd32..ac4d0941b3 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80837704.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80837704.s @@ -1,60 +1,60 @@ glabel func_80837704 /* 054F4 80837704 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 054F8 80837708 AFBF002C */ sw $ra, 0x002C($sp) -/* 054FC 8083770C AFB00028 */ sw $s0, 0x0028($sp) -/* 05500 80837710 AFA40038 */ sw $a0, 0x0038($sp) +/* 054F8 80837708 AFBF002C */ sw $ra, 0x002C($sp) +/* 054FC 8083770C AFB00028 */ sw $s0, 0x0028($sp) +/* 05500 80837710 AFA40038 */ sw $a0, 0x0038($sp) /* 05504 80837714 80A20842 */ lb $v0, 0x0842($a1) ## 00000842 /* 05508 80837718 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 -/* 0550C 8083771C 28410004 */ slti $at, $v0, 0x0004 -/* 05510 80837720 1420000A */ bne $at, $zero, .L8083774C -/* 05514 80837724 28410008 */ slti $at, $v0, 0x0008 -/* 05518 80837728 10200008 */ beq $at, $zero, .L8083774C +/* 0550C 8083771C 28410004 */ slti $at, $v0, 0x0004 +/* 05510 80837720 1420000A */ bne $at, $zero, .L8083774C +/* 05514 80837724 28410008 */ slti $at, $v0, 0x0008 +/* 05518 80837728 10200008 */ beq $at, $zero, .L8083774C /* 0551C 8083772C 00000000 */ nop -/* 05520 80837730 0C023C68 */ jal func_8008F1A0 +/* 05520 80837730 0C023C68 */ jal func_8008F1A0 /* 05524 80837734 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 05528 80837738 00027080 */ sll $t6, $v0, 2 +/* 05528 80837738 00027080 */ sll $t6, $v0, 2 /* 0552C 8083773C 3C068085 */ lui $a2, %hi(D_80854358) ## $a2 = 80850000 -/* 05530 80837740 00CE3021 */ addu $a2, $a2, $t6 -/* 05534 80837744 10000007 */ beq $zero, $zero, .L80837764 -/* 05538 80837748 8CC64358 */ lw $a2, %lo(D_80854358)($a2) +/* 05530 80837740 00CE3021 */ addu $a2, $a2, $t6 +/* 05534 80837744 10000007 */ beq $zero, $zero, .L80837764 +/* 05538 80837748 8CC64358 */ lw $a2, %lo(D_80854358)($a2) .L8083774C: -/* 0553C 8083774C 0C023C68 */ jal func_8008F1A0 +/* 0553C 8083774C 0C023C68 */ jal func_8008F1A0 /* 05540 80837750 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 05544 80837754 00027880 */ sll $t7, $v0, 2 +/* 05544 80837754 00027880 */ sll $t7, $v0, 2 /* 05548 80837758 3C068085 */ lui $a2, %hi(D_80854350) ## $a2 = 80850000 -/* 0554C 8083775C 00CF3021 */ addu $a2, $a2, $t7 -/* 05550 80837760 8CC64350 */ lw $a2, %lo(D_80854350)($a2) +/* 0554C 8083775C 00CF3021 */ addu $a2, $a2, $t7 +/* 05550 80837760 8CC64350 */ lw $a2, %lo(D_80854350)($a2) .L80837764: /* 05554 80837764 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 05558 80837768 0C20C8C6 */ jal func_80832318 -/* 0555C 8083776C AFA60034 */ sw $a2, 0x0034($sp) +/* 05558 80837768 0C20C8C6 */ jal func_80832318 +/* 0555C 8083776C AFA60034 */ sw $a2, 0x0034($sp) /* 05560 80837770 0C028800 */ jal SkelAnime_GetFrameCount - -/* 05564 80837774 8FA40034 */ lw $a0, 0x0034($sp) + +/* 05564 80837774 8FA40034 */ lw $a0, 0x0034($sp) /* 05568 80837778 44823000 */ mtc1 $v0, $f6 ## $f6 = 0.00 /* 0556C 8083777C 3C014100 */ lui $at, 0x4100 ## $at = 41000000 /* 05570 80837780 44812000 */ mtc1 $at, $f4 ## $f4 = 8.00 -/* 05574 80837784 46803220 */ cvt.s.w $f8, $f6 +/* 05574 80837784 46803220 */ cvt.s.w $f8, $f6 /* 05578 80837788 3C01C110 */ lui $at, 0xC110 ## $at = C1100000 /* 0557C 8083778C 44815000 */ mtc1 $at, $f10 ## $f10 = -9.00 /* 05580 80837790 24180002 */ addiu $t8, $zero, 0x0002 ## $t8 = 00000002 -/* 05584 80837794 AFB80018 */ sw $t8, 0x0018($sp) -/* 05588 80837798 8FA60034 */ lw $a2, 0x0034($sp) -/* 0558C 8083779C E7A80014 */ swc1 $f8, 0x0014($sp) -/* 05590 808377A0 8FA40038 */ lw $a0, 0x0038($sp) +/* 05584 80837794 AFB80018 */ sw $t8, 0x0018($sp) +/* 05588 80837798 8FA60034 */ lw $a2, 0x0034($sp) +/* 0558C 8083779C E7A80014 */ swc1 $f8, 0x0014($sp) +/* 05590 808377A0 8FA40038 */ lw $a0, 0x0038($sp) /* 05594 808377A4 260501B4 */ addiu $a1, $s0, 0x01B4 ## $a1 = 000001B4 /* 05598 808377A8 3C073F80 */ lui $a3, 0x3F80 ## $a3 = 3F800000 -/* 0559C 808377AC E7A40010 */ swc1 $f4, 0x0010($sp) -/* 055A0 808377B0 0C028FC2 */ jal func_800A3F08 -/* 055A4 808377B4 E7AA001C */ swc1 $f10, 0x001C($sp) -/* 055A8 808377B8 8FA40038 */ lw $a0, 0x0038($sp) +/* 0559C 808377AC E7A40010 */ swc1 $f4, 0x0010($sp) +/* 055A0 808377B0 0C028FC2 */ jal SkelAnime_ChangeLinkAnim +/* 055A4 808377B4 E7AA001C */ swc1 $f10, 0x001C($sp) +/* 055A8 808377B8 8FA40038 */ lw $a0, 0x0038($sp) /* 055AC 808377BC 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 055B0 808377C0 0C20DD4C */ jal func_80837530 +/* 055B0 808377C0 0C20DD4C */ jal func_80837530 /* 055B4 808377C4 24060200 */ addiu $a2, $zero, 0x0200 ## $a2 = 00000200 -/* 055B8 808377C8 8FBF002C */ lw $ra, 0x002C($sp) -/* 055BC 808377CC 8FB00028 */ lw $s0, 0x0028($sp) +/* 055B8 808377C8 8FBF002C */ lw $ra, 0x002C($sp) +/* 055BC 808377CC 8FB00028 */ lw $s0, 0x0028($sp) /* 055C0 808377D0 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 -/* 055C4 808377D4 03E00008 */ jr $ra +/* 055C4 808377D4 03E00008 */ jr $ra /* 055C8 808377D8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808382DC.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_808382DC.s index ea947b773c..fa9aca985a 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808382DC.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_808382DC.s @@ -1,99 +1,99 @@ glabel func_808382DC /* 060CC 808382DC 27BDFF90 */ addiu $sp, $sp, 0xFF90 ## $sp = FFFFFF90 -/* 060D0 808382E0 AFBF002C */ sw $ra, 0x002C($sp) -/* 060D4 808382E4 AFB00028 */ sw $s0, 0x0028($sp) -/* 060D8 808382E8 AFA50074 */ sw $a1, 0x0074($sp) +/* 060D0 808382E0 AFBF002C */ sw $ra, 0x002C($sp) +/* 060D4 808382E4 AFB00028 */ sw $s0, 0x0028($sp) +/* 060D8 808382E8 AFA50074 */ sw $a1, 0x0074($sp) /* 060DC 808382EC 808E0A86 */ lb $t6, 0x0A86($a0) ## 00000A86 /* 060E0 808382F0 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 060E4 808382F4 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 060E8 808382F8 11C00009 */ beq $t6, $zero, .L80838320 +/* 060E8 808382F8 11C00009 */ beq $t6, $zero, .L80838320 /* 060EC 808382FC 00000000 */ nop -/* 060F0 80838300 0C023A37 */ jal func_8008E8DC +/* 060F0 80838300 0C023A37 */ jal func_8008E8DC /* 060F4 80838304 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 060F8 80838308 14400187 */ bne $v0, $zero, .L80838928 -/* 060FC 8083830C 8FA40074 */ lw $a0, 0x0074($sp) -/* 06100 80838310 0C214C38 */ jal func_808530E0 +/* 060F8 80838308 14400187 */ bne $v0, $zero, .L80838928 +/* 060FC 8083830C 8FA40074 */ lw $a0, 0x0074($sp) +/* 06100 80838310 0C214C38 */ jal func_808530E0 /* 06104 80838314 2405FFF0 */ addiu $a1, $zero, 0xFFF0 ## $a1 = FFFFFFF0 -/* 06108 80838318 10000183 */ beq $zero, $zero, .L80838928 +/* 06108 80838318 10000183 */ beq $zero, $zero, .L80838928 /* 0610C 8083831C A2000A86 */ sb $zero, 0x0A86($s0) ## 00000A86 .L80838320: -/* 06110 80838320 0C00B721 */ jal func_8002DC84 +/* 06110 80838320 0C00B721 */ jal func_8002DC84 /* 06114 80838324 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 06118 80838328 C60406C4 */ lwc1 $f4, 0x06C4($s0) ## 000006C4 /* 0611C 8083832C C6060054 */ lwc1 $f6, 0x0054($s0) ## 00000054 /* 06120 80838330 3C014100 */ lui $at, 0x4100 ## $at = 41000000 /* 06124 80838334 44815000 */ mtc1 $at, $f10 ## $f10 = 8.00 -/* 06128 80838338 46062202 */ mul.s $f8, $f4, $f6 +/* 06128 80838338 46062202 */ mul.s $f8, $f4, $f6 /* 0612C 8083833C 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 06130 80838340 460A0401 */ sub.s $f16, $f0, $f10 +/* 06130 80838340 460A0401 */ sub.s $f16, $f0, $f10 /* 06134 80838344 24056805 */ addiu $a1, $zero, 0x6805 ## $a1 = 00006805 -/* 06138 80838348 4608803C */ c.lt.s $f16, $f8 +/* 06138 80838348 4608803C */ c.lt.s $f16, $f8 /* 0613C 8083834C 00000000 */ nop -/* 06140 80838350 45000002 */ bc1f .L8083835C +/* 06140 80838350 45000002 */ bc1f .L8083835C /* 06144 80838354 00000000 */ nop /* 06148 80838358 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 .L8083835C: -/* 0614C 8083835C 5440000F */ bnel $v0, $zero, .L8083839C +/* 0614C 8083835C 5440000F */ bnel $v0, $zero, .L8083839C /* 06150 80838360 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 06154 80838364 960F0088 */ lhu $t7, 0x0088($s0) ## 00000088 /* 06158 80838368 3C048085 */ lui $a0, %hi(D_808535E4) ## $a0 = 80850000 /* 0615C 8083836C 31F80100 */ andi $t8, $t7, 0x0100 ## $t8 = 00000000 -/* 06160 80838370 5700000A */ bnel $t8, $zero, .L8083839C +/* 06160 80838370 5700000A */ bnel $t8, $zero, .L8083839C /* 06164 80838374 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 06168 80838378 8C8435E4 */ lw $a0, %lo(D_808535E4)($a0) +/* 06168 80838378 8C8435E4 */ lw $a0, %lo(D_808535E4)($a0) /* 0616C 8083837C 24010009 */ addiu $at, $zero, 0x0009 ## $at = 00000009 -/* 06170 80838380 50810006 */ beql $a0, $at, .L8083839C +/* 06170 80838380 50810006 */ beql $a0, $at, .L8083839C /* 06174 80838384 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 06178 80838388 8E190680 */ lw $t9, 0x0680($s0) ## 00000680 -/* 0617C 8083838C 00194800 */ sll $t1, $t9, 0 -/* 06180 80838390 05230044 */ bgezl $t1, .L808384A4 +/* 0617C 8083838C 00194800 */ sll $t1, $t9, 0 +/* 06180 80838390 05230044 */ bgezl $t1, .L808384A4 /* 06184 80838394 920208A1 */ lbu $v0, 0x08A1($s0) ## 000008A1 /* 06188 80838398 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 .L8083839C: -/* 0618C 8083839C 0C20C9A6 */ jal func_80832698 -/* 06190 808383A0 AFA20068 */ sw $v0, 0x0068($sp) -/* 06194 808383A4 8FA20068 */ lw $v0, 0x0068($sp) -/* 06198 808383A8 8FA40074 */ lw $a0, 0x0074($sp) -/* 0619C 808383AC 50400008 */ beql $v0, $zero, .L808383D0 +/* 0618C 8083839C 0C20C9A6 */ jal func_80832698 +/* 06190 808383A0 AFA20068 */ sw $v0, 0x0068($sp) +/* 06194 808383A4 8FA20068 */ lw $v0, 0x0068($sp) +/* 06198 808383A8 8FA40074 */ lw $a0, 0x0074($sp) +/* 0619C 808383AC 50400008 */ beql $v0, $zero, .L808383D0 /* 061A0 808383B0 848200A4 */ lh $v0, 0x00A4($a0) ## 000000A4 -/* 061A4 808383B4 0C030322 */ jal func_800C0C88 -/* 061A8 808383B8 8FA40074 */ lw $a0, 0x0074($sp) -/* 061AC 808383BC 0C026528 */ jal func_800994A0 -/* 061B0 808383C0 8FA40074 */ lw $a0, 0x0074($sp) -/* 061B4 808383C4 1000002B */ beq $zero, $zero, .L80838474 +/* 061A4 808383B4 0C030322 */ jal func_800C0C88 +/* 061A8 808383B8 8FA40074 */ lw $a0, 0x0074($sp) +/* 061AC 808383BC 0C026528 */ jal func_800994A0 +/* 061B0 808383C0 8FA40074 */ lw $a0, 0x0074($sp) +/* 061B4 808383C4 1000002B */ beq $zero, $zero, .L80838474 /* 061B8 808383C8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 061BC 808383CC 848200A4 */ lh $v0, 0x00A4($a0) ## 000000A4 .L808383D0: /* 061C0 808383D0 24030003 */ addiu $v1, $zero, 0x0003 ## $v1 = 00000003 /* 061C4 808383D4 3C0A0001 */ lui $t2, 0x0001 ## $t2 = 00010000 -/* 061C8 808383D8 14620004 */ bne $v1, $v0, .L808383EC -/* 061CC 808383DC 01445021 */ addu $t2, $t2, $a0 +/* 061C8 808383D8 14620004 */ bne $v1, $v0, .L808383EC +/* 061CC 808383DC 01445021 */ addu $t2, $t2, $a0 /* 061D0 808383E0 814A1CBC */ lb $t2, 0x1CBC($t2) ## 00011CBC /* 061D4 808383E4 2401000F */ addiu $at, $zero, 0x000F ## $at = 0000000F -/* 061D8 808383E8 11410008 */ beq $t2, $at, .L8083840C +/* 061D8 808383E8 11410008 */ beq $t2, $at, .L8083840C .L808383EC: /* 061DC 808383EC 24010007 */ addiu $at, $zero, 0x0007 ## $at = 00000007 -/* 061E0 808383F0 1441001D */ bne $v0, $at, .L80838468 +/* 061E0 808383F0 1441001D */ bne $v0, $at, .L80838468 /* 061E4 808383F4 3C0B0001 */ lui $t3, 0x0001 ## $t3 = 00010000 -/* 061E8 808383F8 01645821 */ addu $t3, $t3, $a0 +/* 061E8 808383F8 01645821 */ addu $t3, $t3, $a0 /* 061EC 808383FC 816B1CBC */ lb $t3, 0x1CBC($t3) ## 00011CBC /* 061F0 80838400 2401000A */ addiu $at, $zero, 0x000A ## $at = 0000000A -/* 061F4 80838404 15610018 */ bne $t3, $at, .L80838468 +/* 061F4 80838404 15610018 */ bne $t3, $at, .L80838468 /* 061F8 80838408 00000000 */ nop .L8083840C: -/* 061FC 8083840C 14620004 */ bne $v1, $v0, .L80838420 +/* 061FC 8083840C 14620004 */ bne $v1, $v0, .L80838420 /* 06200 80838410 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 06204 80838414 3C028085 */ lui $v0, %hi(D_808544D4) ## $v0 = 80850000 -/* 06208 80838418 10000003 */ beq $zero, $zero, .L80838428 +/* 06208 80838418 10000003 */ beq $zero, $zero, .L80838428 /* 0620C 8083841C 244244D4 */ addiu $v0, $v0, %lo(D_808544D4) ## $v0 = 808544D4 .L80838420: /* 06210 80838420 3C028085 */ lui $v0, %hi(D_808544E4) ## $v0 = 80850000 /* 06214 80838424 244244E4 */ addiu $v0, $v0, %lo(D_808544E4) ## $v0 = 808544E4 .L80838428: /* 06218 80838428 24060DFF */ addiu $a2, $zero, 0x0DFF ## $a2 = 00000DFF -/* 0621C 8083842C 0C0302BD */ jal func_800C0AF4 -/* 06220 80838430 AFA20060 */ sw $v0, 0x0060($sp) -/* 06224 80838434 8FA20060 */ lw $v0, 0x0060($sp) +/* 0621C 8083842C 0C0302BD */ jal func_800C0AF4 +/* 06220 80838430 AFA20060 */ sw $v0, 0x0060($sp) +/* 06224 80838434 8FA20060 */ lw $v0, 0x0060($sp) /* 06228 80838438 3C0C8016 */ lui $t4, 0x8016 ## $t4 = 80160000 /* 0622C 8083843C 258CF9C8 */ addiu $t4, $t4, 0xF9C8 ## $t4 = 8015F9C8 /* 06230 80838440 8C4E0000 */ lw $t6, 0x0000($v0) ## 00000000 @@ -104,43 +104,43 @@ glabel func_808382DC /* 06244 80838454 8C4E0008 */ lw $t6, 0x0008($v0) ## 00000008 /* 06248 80838458 AD8E0008 */ sw $t6, 0x0008($t4) ## 8015F9D0 /* 0624C 8083845C 844F000C */ lh $t7, 0x000C($v0) ## 0000000C -/* 06250 80838460 8FA40074 */ lw $a0, 0x0074($sp) +/* 06250 80838460 8FA40074 */ lw $a0, 0x0074($sp) /* 06254 80838464 A42FF9D4 */ sh $t7, -0x062C($at) ## 8015F9D4 .L80838468: -/* 06258 80838468 0C0302D8 */ jal func_800C0B60 +/* 06258 80838468 0C0302D8 */ jal func_800C0B60 /* 0625C 8083846C 00000000 */ nop /* 06260 80838470 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 .L80838474: -/* 06264 80838474 0C20C9A6 */ jal func_80832698 +/* 06264 80838474 0C20C9A6 */ jal func_80832698 /* 06268 80838478 2405680C */ addiu $a1, $zero, 0x680C ## $a1 = 0000680C -/* 0626C 8083847C 8FB90074 */ lw $t9, 0x0074($sp) +/* 0626C 8083847C 8FB90074 */ lw $t9, 0x0074($sp) /* 06270 80838480 3C010001 */ lui $at, 0x0001 ## $at = 00010000 /* 06274 80838484 24180001 */ addiu $t8, $zero, 0x0001 ## $t8 = 00000001 -/* 06278 80838488 00390821 */ addu $at, $at, $t9 +/* 06278 80838488 00390821 */ addu $at, $at, $t9 /* 0627C 8083848C A0381DE9 */ sb $t8, 0x1DE9($at) ## 00011DE9 -/* 06280 80838490 0C01E221 */ jal func_80078884 +/* 06280 80838490 0C01E221 */ jal func_80078884 /* 06284 80838494 24045801 */ addiu $a0, $zero, 0x5801 ## $a0 = 00005801 -/* 06288 80838498 10000124 */ beq $zero, $zero, .L8083892C +/* 06288 80838498 10000124 */ beq $zero, $zero, .L8083892C /* 0628C 8083849C 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 /* 06290 808384A0 920208A1 */ lbu $v0, 0x08A1($s0) ## 000008A1 .L808384A4: -/* 06294 808384A4 10400023 */ beq $v0, $zero, .L80838534 -/* 06298 808384A8 28410002 */ slti $at, $v0, 0x0002 -/* 0629C 808384AC 10200003 */ beq $at, $zero, .L808384BC +/* 06294 808384A4 10400023 */ beq $v0, $zero, .L80838534 +/* 06298 808384A8 28410002 */ slti $at, $v0, 0x0002 +/* 0629C 808384AC 10200003 */ beq $at, $zero, .L808384BC /* 062A0 808384B0 27AA005C */ addiu $t2, $sp, 0x005C ## $t2 = FFFFFFEC /* 062A4 808384B4 82090A78 */ lb $t1, 0x0A78($s0) ## 00000A78 -/* 062A8 808384B8 1520001E */ bne $t1, $zero, .L80838534 +/* 062A8 808384B8 1520001E */ bne $t1, $zero, .L80838534 .L808384BC: /* 062AC 808384BC 3C0B8085 */ lui $t3, %hi(D_808544D0) ## $t3 = 80850000 /* 062B0 808384C0 256B44D0 */ addiu $t3, $t3, %lo(D_808544D0) ## $t3 = 808544D0 /* 062B4 808384C4 996D0002 */ lwr $t5, 0x0002($t3) ## 808544D2 /* 062B8 808384C8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 062BC 808384CC 0C20E0A0 */ jal func_80838280 +/* 062BC 808384CC 0C20E0A0 */ jal func_80838280 /* 062C0 808384D0 B94D0002 */ swr $t5, 0x0002($t2) ## FFFFFFEE /* 062C4 808384D4 920208A1 */ lbu $v0, 0x08A1($s0) ## 000008A1 /* 062C8 808384D8 24030003 */ addiu $v1, $zero, 0x0003 ## $v1 = 00000003 /* 062CC 808384DC 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 062D0 808384E0 14620004 */ bne $v1, $v0, .L808384F4 +/* 062D0 808384E0 14620004 */ bne $v1, $v0, .L808384F4 /* 062D4 808384E4 240A0014 */ addiu $t2, $zero, 0x0014 ## $t2 = 00000014 /* 062D8 808384E8 240E0028 */ addiu $t6, $zero, 0x0028 ## $t6 = 00000028 /* 062DC 808384EC A20E0891 */ sb $t6, 0x0891($s0) ## 00000891 @@ -149,276 +149,276 @@ glabel func_808382DC /* 062E4 808384F4 920F00B0 */ lbu $t7, 0x00B0($s0) ## 000000B0 /* 062E8 808384F8 921808A0 */ lbu $t8, 0x08A0($s0) ## 000008A0 /* 062EC 808384FC C61208A8 */ lwc1 $f18, 0x08A8($s0) ## 000008A8 -/* 062F0 80838500 03A23021 */ addu $a2, $sp, $v0 -/* 062F4 80838504 01F8C821 */ addu $t9, $t7, $t8 +/* 062F0 80838500 03A23021 */ addu $a2, $sp, $v0 +/* 062F4 80838504 01F8C821 */ addu $t9, $t7, $t8 /* 062F8 80838508 A21900B0 */ sb $t9, 0x00B0($s0) ## 000000B0 /* 062FC 8083850C 90C6005B */ lbu $a2, 0x005B($a2) ## 0000005B /* 06300 80838510 8E0708A4 */ lw $a3, 0x08A4($s0) ## 000008A4 -/* 06304 80838514 E7B20010 */ swc1 $f18, 0x0010($sp) +/* 06304 80838514 E7B20010 */ swc1 $f18, 0x0010($sp) /* 06308 80838518 860908A2 */ lh $t1, 0x08A2($s0) ## 000008A2 -/* 0630C 8083851C AFAA0018 */ sw $t2, 0x0018($sp) -/* 06310 80838520 8FA40074 */ lw $a0, 0x0074($sp) -/* 06314 80838524 0C20DF03 */ jal func_80837C0C -/* 06318 80838528 AFA90014 */ sw $t1, 0x0014($sp) -/* 0631C 8083852C 100000FF */ beq $zero, $zero, .L8083892C +/* 0630C 8083851C AFAA0018 */ sw $t2, 0x0018($sp) +/* 06310 80838520 8FA40074 */ lw $a0, 0x0074($sp) +/* 06314 80838524 0C20DF03 */ jal func_80837C0C +/* 06318 80838528 AFA90014 */ sw $t1, 0x0014($sp) +/* 0631C 8083852C 100000FF */ beq $zero, $zero, .L8083892C /* 06320 80838530 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 .L80838534: /* 06324 80838534 920805F5 */ lbu $t0, 0x05F5($s0) ## 000005F5 /* 06328 80838538 240500B4 */ addiu $a1, $zero, 0x00B4 ## $a1 = 000000B4 /* 0632C 8083853C 24060014 */ addiu $a2, $zero, 0x0014 ## $a2 = 00000014 /* 06330 80838540 31080080 */ andi $t0, $t0, 0x0080 ## $t0 = 00000000 -/* 06334 80838544 0008402B */ sltu $t0, $zero, $t0 -/* 06338 80838548 1500000F */ bne $t0, $zero, .L80838588 +/* 06334 80838544 0008402B */ sltu $t0, $zero, $t0 +/* 06338 80838548 1500000F */ bne $t0, $zero, .L80838588 /* 0633C 8083854C 24070064 */ addiu $a3, $zero, 0x0064 ## $a3 = 00000064 /* 06340 80838550 82030A78 */ lb $v1, 0x0A78($s0) ## 00000A78 -/* 06344 80838554 04630069 */ bgezl $v1, .L808386FC +/* 06344 80838554 04630069 */ bgezl $v1, .L808386FC /* 06348 80838558 920C0A87 */ lbu $t4, 0x0A87($s0) ## 00000A87 /* 0634C 8083855C 920B04A9 */ lbu $t3, 0x04A9($s0) ## 000004A9 /* 06350 80838560 316C0002 */ andi $t4, $t3, 0x0002 ## $t4 = 00000000 -/* 06354 80838564 51800065 */ beql $t4, $zero, .L808386FC +/* 06354 80838564 51800065 */ beql $t4, $zero, .L808386FC /* 06358 80838568 920C0A87 */ lbu $t4, 0x0A87($s0) ## 00000A87 /* 0635C 8083856C 8E0204C8 */ lw $v0, 0x04C8($s0) ## 000004C8 -/* 06360 80838570 50400062 */ beql $v0, $zero, .L808386FC +/* 06360 80838570 50400062 */ beql $v0, $zero, .L808386FC /* 06364 80838574 920C0A87 */ lbu $t4, 0x0A87($s0) ## 00000A87 /* 06368 80838578 904D0010 */ lbu $t5, 0x0010($v0) ## 00000011 -/* 0636C 8083857C 000D7080 */ sll $t6, $t5, 2 -/* 06370 80838580 05C3005E */ bgezl $t6, .L808386FC +/* 0636C 8083857C 000D7080 */ sll $t6, $t5, 2 +/* 06370 80838580 05C3005E */ bgezl $t6, .L808386FC /* 06374 80838584 920C0A87 */ lbu $t4, 0x0A87($s0) ## 00000A87 .L80838588: /* 06378 80838588 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0637C 8083858C AFA00010 */ sw $zero, 0x0010($sp) -/* 06380 80838590 0C20C993 */ jal func_8083264C -/* 06384 80838594 AFA80064 */ sw $t0, 0x0064($sp) -/* 06388 80838598 0C023A74 */ jal func_8008E9D0 +/* 0637C 8083858C AFA00010 */ sw $zero, 0x0010($sp) +/* 06380 80838590 0C20C993 */ jal func_8083264C +/* 06384 80838594 AFA80064 */ sw $t0, 0x0064($sp) +/* 06388 80838598 0C023A74 */ jal func_8008E9D0 /* 0638C 8083859C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 06390 808385A0 54400049 */ bnel $v0, $zero, .L808386C8 -/* 06394 808385A4 8FA90064 */ lw $t1, 0x0064($sp) +/* 06390 808385A0 54400049 */ bnel $v0, $zero, .L808386C8 +/* 06394 808385A4 8FA90064 */ lw $t1, 0x0064($sp) /* 06398 808385A8 820F0A78 */ lb $t7, 0x0A78($s0) ## 00000A78 /* 0639C 808385AC 3C198084 */ lui $t9, %hi(func_80843188) ## $t9 = 80840000 -/* 063A0 808385B0 05E2003B */ bltzl $t7, .L808386A0 +/* 063A0 808385B0 05E2003B */ bltzl $t7, .L808386A0 /* 063A4 808385B4 8E0F067C */ lw $t7, 0x067C($s0) ## 0000067C /* 063A8 808385B8 8E180674 */ lw $t8, 0x0674($s0) ## 00000674 /* 063AC 808385BC 27393188 */ addiu $t9, $t9, %lo(func_80843188) ## $t9 = 80843188 /* 063B0 808385C0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 063B4 808385C4 03194826 */ xor $t1, $t8, $t9 -/* 063B8 808385C8 2D290001 */ sltiu $t1, $t1, 0x0001 -/* 063BC 808385CC 0C20CCAE */ jal func_808332B8 -/* 063C0 808385D0 AFA90054 */ sw $t1, 0x0054($sp) -/* 063C4 808385D4 14400006 */ bne $v0, $zero, .L808385F0 -/* 063C8 808385D8 8FA40074 */ lw $a0, 0x0074($sp) +/* 063B4 808385C4 03194826 */ xor $t1, $t8, $t9 +/* 063B8 808385C8 2D290001 */ sltiu $t1, $t1, 0x0001 +/* 063BC 808385CC 0C20CCAE */ jal func_808332B8 +/* 063C0 808385D0 AFA90054 */ sw $t1, 0x0054($sp) +/* 063C4 808385D4 14400006 */ bne $v0, $zero, .L808385F0 +/* 063C8 808385D8 8FA40074 */ lw $a0, 0x0074($sp) /* 063CC 808385DC 3C068084 */ lui $a2, %hi(func_808435C4) ## $a2 = 80840000 /* 063D0 808385E0 24C635C4 */ addiu $a2, $a2, %lo(func_808435C4) ## $a2 = 808435C4 /* 063D4 808385E4 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 063D8 808385E8 0C20D716 */ jal func_80835C58 +/* 063D8 808385E8 0C20D716 */ jal func_80835C58 /* 063DC 808385EC 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 .L808385F0: -/* 063E0 808385F0 8FA20054 */ lw $v0, 0x0054($sp) +/* 063E0 808385F0 8FA20054 */ lw $v0, 0x0054($sp) /* 063E4 808385F4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 063E8 808385F8 3C058083 */ lui $a1, %hi(func_80834BD4) ## $a1 = 80830000 -/* 063EC 808385FC 00025600 */ sll $t2, $v0, 24 -/* 063F0 80838600 000A5E03 */ sra $t3, $t2, 24 -/* 063F4 80838604 1560001C */ bne $t3, $zero, .L80838678 +/* 063EC 808385FC 00025600 */ sll $t2, $v0, 24 +/* 063F0 80838600 000A5E03 */ sra $t3, $t2, 24 +/* 063F4 80838604 1560001C */ bne $t3, $zero, .L80838678 /* 063F8 80838608 A202084F */ sb $v0, 0x084F($s0) ## 0000084F -/* 063FC 8083860C 0C20CD8E */ jal func_80833638 +/* 063FC 8083860C 0C20CD8E */ jal func_80833638 /* 06400 80838610 24A54BD4 */ addiu $a1, $a1, %lo(func_80834BD4) ## $a1 = 80834BD4 /* 06404 80838614 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 /* 06408 80838618 44813000 */ mtc1 $at, $f6 ## $f6 = 0.50 /* 0640C 8083861C C6040870 */ lwc1 $f4, 0x0870($s0) ## 00000870 -/* 06410 80838620 4606203C */ c.lt.s $f4, $f6 +/* 06410 80838620 4606203C */ c.lt.s $f4, $f6 /* 06414 80838624 00000000 */ nop -/* 06418 80838628 45000008 */ bc1f .L8083864C +/* 06418 80838628 45000008 */ bc1f .L8083864C /* 0641C 8083862C 00000000 */ nop -/* 06420 80838630 0C023C68 */ jal func_8008F1A0 +/* 06420 80838630 0C023C68 */ jal func_8008F1A0 /* 06424 80838634 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 06428 80838638 00026080 */ sll $t4, $v0, 2 +/* 06428 80838638 00026080 */ sll $t4, $v0, 2 /* 0642C 8083863C 3C068085 */ lui $a2, %hi(D_808543BC) ## $a2 = 80850000 -/* 06430 80838640 00CC3021 */ addu $a2, $a2, $t4 -/* 06434 80838644 10000007 */ beq $zero, $zero, .L80838664 -/* 06438 80838648 8CC643BC */ lw $a2, %lo(D_808543BC)($a2) +/* 06430 80838640 00CC3021 */ addu $a2, $a2, $t4 +/* 06434 80838644 10000007 */ beq $zero, $zero, .L80838664 +/* 06438 80838648 8CC643BC */ lw $a2, %lo(D_808543BC)($a2) .L8083864C: -/* 0643C 8083864C 0C023C68 */ jal func_8008F1A0 +/* 0643C 8083864C 0C023C68 */ jal func_8008F1A0 /* 06440 80838650 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 06444 80838654 00026880 */ sll $t5, $v0, 2 +/* 06444 80838654 00026880 */ sll $t5, $v0, 2 /* 06448 80838658 3C068085 */ lui $a2, %hi(D_808543B4) ## $a2 = 80850000 -/* 0644C 8083865C 00CD3021 */ addu $a2, $a2, $t5 -/* 06450 80838660 8CC643B4 */ lw $a2, %lo(D_808543B4)($a2) +/* 0644C 8083865C 00CD3021 */ addu $a2, $a2, $t5 +/* 06450 80838660 8CC643B4 */ lw $a2, %lo(D_808543B4)($a2) .L80838664: -/* 06454 80838664 8FA40074 */ lw $a0, 0x0074($sp) -/* 06458 80838668 0C02901F */ jal func_800A407C +/* 06454 80838664 8FA40074 */ lw $a0, 0x0074($sp) +/* 06458 80838668 0C02901F */ jal SkelAnime_ChangeLinkAnimDefaultStop /* 0645C 8083866C 260506C8 */ addiu $a1, $s0, 0x06C8 ## $a1 = 000006C8 -/* 06460 80838670 1000000B */ beq $zero, $zero, .L808386A0 +/* 06460 80838670 1000000B */ beq $zero, $zero, .L808386A0 /* 06464 80838674 8E0F067C */ lw $t7, 0x067C($s0) ## 0000067C .L80838678: -/* 06468 80838678 0C023C68 */ jal func_8008F1A0 +/* 06468 80838678 0C023C68 */ jal func_8008F1A0 /* 0646C 8083867C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 06470 80838680 00027080 */ sll $t6, $v0, 2 +/* 06470 80838680 00027080 */ sll $t6, $v0, 2 /* 06474 80838684 3C068085 */ lui $a2, %hi(D_808543C4) ## $a2 = 80850000 -/* 06478 80838688 00CE3021 */ addu $a2, $a2, $t6 -/* 0647C 8083868C 8CC643C4 */ lw $a2, %lo(D_808543C4)($a2) -/* 06480 80838690 8FA40074 */ lw $a0, 0x0074($sp) -/* 06484 80838694 0C20C899 */ jal func_80832264 +/* 06478 80838688 00CE3021 */ addu $a2, $a2, $t6 +/* 0647C 8083868C 8CC643C4 */ lw $a2, %lo(D_808543C4)($a2) +/* 06480 80838690 8FA40074 */ lw $a0, 0x0074($sp) +/* 06484 80838694 0C20C899 */ jal func_80832264 /* 06488 80838698 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 0648C 8083869C 8E0F067C */ lw $t7, 0x067C($s0) ## 0000067C .L808386A0: /* 06490 808386A0 3C010020 */ lui $at, 0x0020 ## $at = 00200000 /* 06494 808386A4 34216000 */ ori $at, $at, 0x6000 ## $at = 00206000 -/* 06498 808386A8 01E1C024 */ and $t8, $t7, $at -/* 0649C 808386AC 17000005 */ bne $t8, $zero, .L808386C4 +/* 06498 808386A8 01E1C024 */ and $t8, $t7, $at +/* 0649C 808386AC 17000005 */ bne $t8, $zero, .L808386C4 /* 064A0 808386B0 3C01C190 */ lui $at, 0xC190 ## $at = C1900000 /* 064A4 808386B4 44815000 */ mtc1 $at, $f10 ## $f10 = -18.00 /* 064A8 808386B8 861900B6 */ lh $t9, 0x00B6($s0) ## 000000B6 /* 064AC 808386BC E60A0838 */ swc1 $f10, 0x0838($s0) ## 00000838 /* 064B0 808386C0 A619083C */ sh $t9, 0x083C($s0) ## 0000083C .L808386C4: -/* 064B4 808386C4 8FA90064 */ lw $t1, 0x0064($sp) +/* 064B4 808386C4 8FA90064 */ lw $t1, 0x0064($sp) .L808386C8: -/* 064B8 808386C8 11200009 */ beq $t1, $zero, .L808386F0 +/* 064B8 808386C8 11200009 */ beq $t1, $zero, .L808386F0 /* 064BC 808386CC 00000000 */ nop /* 064C0 808386D0 8E0A0620 */ lw $t2, 0x0620($s0) ## 00000620 /* 064C4 808386D4 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 /* 064C8 808386D8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 064CC 808386DC 914B0004 */ lbu $t3, 0x0004($t2) ## 00000004 -/* 064D0 808386E0 15610003 */ bne $t3, $at, .L808386F0 +/* 064D0 808386E0 15610003 */ bne $t3, $at, .L808386F0 /* 064D4 808386E4 00000000 */ nop -/* 064D8 808386E8 0C20E067 */ jal func_8083819C -/* 064DC 808386EC 8FA50074 */ lw $a1, 0x0074($sp) +/* 064D8 808386E8 0C20E067 */ jal func_8083819C +/* 064DC 808386EC 8FA50074 */ lw $a1, 0x0074($sp) .L808386F0: -/* 064E0 808386F0 1000008E */ beq $zero, $zero, .L8083892C +/* 064E0 808386F0 1000008E */ beq $zero, $zero, .L8083892C /* 064E4 808386F4 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 /* 064E8 808386F8 920C0A87 */ lbu $t4, 0x0A87($s0) ## 00000A87 .L808386FC: -/* 064EC 808386FC 15800012 */ bne $t4, $zero, .L80838748 +/* 064EC 808386FC 15800012 */ bne $t4, $zero, .L80838748 /* 064F0 80838700 00000000 */ nop -/* 064F4 80838704 1C600010 */ bgtz $v1, .L80838748 +/* 064F4 80838704 1C600010 */ bgtz $v1, .L80838748 /* 064F8 80838708 00000000 */ nop /* 064FC 8083870C 8E02067C */ lw $v0, 0x067C($s0) ## 0000067C -/* 06500 80838710 00026940 */ sll $t5, $v0, 5 -/* 06504 80838714 05A0000C */ bltz $t5, .L80838748 +/* 06500 80838710 00026940 */ sll $t5, $v0, 5 +/* 06504 80838714 05A0000C */ bltz $t5, .L80838748 /* 06508 80838718 00000000 */ nop /* 0650C 8083871C 920E0444 */ lbu $t6, 0x0444($s0) ## 00000444 -/* 06510 80838720 15C00009 */ bne $t6, $zero, .L80838748 +/* 06510 80838720 15C00009 */ bne $t6, $zero, .L80838748 /* 06514 80838724 00000000 */ nop /* 06518 80838728 920F04F4 */ lbu $t7, 0x04F4($s0) ## 000004F4 /* 0651C 8083872C 31F80002 */ andi $t8, $t7, 0x0002 ## $t8 = 00000000 -/* 06520 80838730 17000005 */ bne $t8, $zero, .L80838748 +/* 06520 80838730 17000005 */ bne $t8, $zero, .L80838748 /* 06524 80838734 00000000 */ nop /* 06528 80838738 92190574 */ lbu $t9, 0x0574($s0) ## 00000574 /* 0652C 8083873C 33290002 */ andi $t1, $t9, 0x0002 ## $t1 = 00000000 -/* 06530 80838740 51200004 */ beql $t1, $zero, .L80838754 +/* 06530 80838740 51200004 */ beql $t1, $zero, .L80838754 /* 06534 80838744 920A04A9 */ lbu $t2, 0x04A9($s0) ## 000004A9 .L80838748: -/* 06538 80838748 10000078 */ beq $zero, $zero, .L8083892C +/* 06538 80838748 10000078 */ beq $zero, $zero, .L8083892C /* 0653C 8083874C 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 /* 06540 80838750 920A04A9 */ lbu $t2, 0x04A9($s0) ## 000004A9 .L80838754: /* 06544 80838754 314B0002 */ andi $t3, $t2, 0x0002 ## $t3 = 00000000 -/* 06548 80838758 11600035 */ beq $t3, $zero, .L80838830 +/* 06548 80838758 11600035 */ beq $t3, $zero, .L80838830 /* 0654C 8083875C 00000000 */ nop /* 06550 80838760 8E0704A0 */ lw $a3, 0x04A0($s0) ## 000004A0 /* 06554 80838764 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 06558 80838768 2405083E */ addiu $a1, $zero, 0x083E ## $a1 = 0000083E /* 0655C 8083876C 8CEC0004 */ lw $t4, 0x0004($a3) ## 00000004 -/* 06560 80838770 000C69C0 */ sll $t5, $t4, 7 -/* 06564 80838774 05A30006 */ bgezl $t5, .L80838790 -/* 06568 80838778 00027100 */ sll $t6, $v0, 4 -/* 0656C 8083877C 0C00BDF7 */ jal func_8002F7DC -/* 06570 80838780 AFA70050 */ sw $a3, 0x0050($sp) -/* 06574 80838784 8FA70050 */ lw $a3, 0x0050($sp) +/* 06560 80838770 000C69C0 */ sll $t5, $t4, 7 +/* 06564 80838774 05A30006 */ bgezl $t5, .L80838790 +/* 06568 80838778 00027100 */ sll $t6, $v0, 4 +/* 0656C 8083877C 0C00BDF7 */ jal func_8002F7DC +/* 06570 80838780 AFA70050 */ sw $a3, 0x0050($sp) +/* 06574 80838784 8FA70050 */ lw $a3, 0x0050($sp) /* 06578 80838788 8E02067C */ lw $v0, 0x067C($s0) ## 0000067C -/* 0657C 8083878C 00027100 */ sll $t6, $v0, 4 +/* 0657C 8083878C 00027100 */ sll $t6, $v0, 4 .L80838790: -/* 06580 80838790 05C30004 */ bgezl $t6, .L808387A4 +/* 06580 80838790 05C30004 */ bgezl $t6, .L808387A4 /* 06584 80838794 920200B3 */ lbu $v0, 0x00B3($s0) ## 000000B3 -/* 06588 80838798 10000014 */ beq $zero, $zero, .L808387EC +/* 06588 80838798 10000014 */ beq $zero, $zero, .L808387EC /* 0658C 8083879C 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 /* 06590 808387A0 920200B3 */ lbu $v0, 0x00B3($s0) ## 000000B3 .L808387A4: /* 06594 808387A4 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 /* 06598 808387A8 24030003 */ addiu $v1, $zero, 0x0003 ## $v1 = 00000003 -/* 0659C 808387AC 14410003 */ bne $v0, $at, .L808387BC +/* 0659C 808387AC 14410003 */ bne $v0, $at, .L808387BC /* 065A0 808387B0 00000000 */ nop -/* 065A4 808387B4 1000000D */ beq $zero, $zero, .L808387EC +/* 065A4 808387B4 1000000D */ beq $zero, $zero, .L808387EC /* 065A8 808387B8 24060003 */ addiu $a2, $zero, 0x0003 ## $a2 = 00000003 .L808387BC: -/* 065AC 808387BC 14620003 */ bne $v1, $v0, .L808387CC +/* 065AC 808387BC 14620003 */ bne $v1, $v0, .L808387CC /* 065B0 808387C0 24010004 */ addiu $at, $zero, 0x0004 ## $at = 00000004 -/* 065B4 808387C4 10000009 */ beq $zero, $zero, .L808387EC +/* 065B4 808387C4 10000009 */ beq $zero, $zero, .L808387EC /* 065B8 808387C8 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 .L808387CC: -/* 065BC 808387CC 14410003 */ bne $v0, $at, .L808387DC +/* 065BC 808387CC 14410003 */ bne $v0, $at, .L808387DC /* 065C0 808387D0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 065C4 808387D4 10000005 */ beq $zero, $zero, .L808387EC +/* 065C4 808387D4 10000005 */ beq $zero, $zero, .L808387EC /* 065C8 808387D8 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 .L808387DC: -/* 065CC 808387DC 0C20E0A0 */ jal func_80838280 -/* 065D0 808387E0 AFA70050 */ sw $a3, 0x0050($sp) -/* 065D4 808387E4 8FA70050 */ lw $a3, 0x0050($sp) +/* 065CC 808387DC 0C20E0A0 */ jal func_80838280 +/* 065D0 808387E0 AFA70050 */ sw $a3, 0x0050($sp) +/* 065D4 808387E4 8FA70050 */ lw $a3, 0x0050($sp) /* 065D8 808387E8 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 .L808387EC: /* 065DC 808387EC 00E02025 */ or $a0, $a3, $zero ## $a0 = 00000000 /* 065E0 808387F0 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 065E4 808387F4 0C00B69E */ jal func_8002DA78 -/* 065E8 808387F8 AFA6004C */ sw $a2, 0x004C($sp) +/* 065E4 808387F4 0C00B69E */ jal func_8002DA78 +/* 065E8 808387F8 AFA6004C */ sw $a2, 0x004C($sp) /* 065EC 808387FC 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 /* 065F0 80838800 44818000 */ mtc1 $at, $f16 ## $f16 = 5.00 /* 065F4 80838804 240F0014 */ addiu $t7, $zero, 0x0014 ## $t7 = 00000014 -/* 065F8 80838808 AFAF0018 */ sw $t7, 0x0018($sp) -/* 065FC 8083880C 8FA6004C */ lw $a2, 0x004C($sp) -/* 06600 80838810 8FA40074 */ lw $a0, 0x0074($sp) +/* 065F8 80838808 AFAF0018 */ sw $t7, 0x0018($sp) +/* 065FC 8083880C 8FA6004C */ lw $a2, 0x004C($sp) +/* 06600 80838810 8FA40074 */ lw $a0, 0x0074($sp) /* 06604 80838814 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 06608 80838818 3C074080 */ lui $a3, 0x4080 ## $a3 = 40800000 -/* 0660C 8083881C AFA20014 */ sw $v0, 0x0014($sp) -/* 06610 80838820 0C20DF03 */ jal func_80837C0C -/* 06614 80838824 E7B00010 */ swc1 $f16, 0x0010($sp) -/* 06618 80838828 10000040 */ beq $zero, $zero, .L8083892C +/* 0660C 8083881C AFA20014 */ sw $v0, 0x0014($sp) +/* 06610 80838820 0C20DF03 */ jal func_80837C0C +/* 06614 80838824 E7B00010 */ swc1 $f16, 0x0010($sp) +/* 06618 80838828 10000040 */ beq $zero, $zero, .L8083892C /* 0661C 8083882C 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 .L80838830: -/* 06620 80838830 10600003 */ beq $v1, $zero, .L80838840 +/* 06620 80838830 10600003 */ beq $v1, $zero, .L80838840 /* 06624 80838834 00000000 */ nop -/* 06628 80838838 1000003C */ beq $zero, $zero, .L8083892C +/* 06628 80838838 1000003C */ beq $zero, $zero, .L8083892C /* 0662C 8083883C 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 .L80838840: -/* 06630 80838840 0C20E051 */ jal func_80838144 +/* 06630 80838840 0C20E051 */ jal func_80838144 /* 06634 80838844 00000000 */ nop /* 06638 80838848 8E050074 */ lw $a1, 0x0074($s0) ## 00000074 -/* 0663C 8083884C 8FA40074 */ lw $a0, 0x0074($sp) +/* 0663C 8083884C 8FA40074 */ lw $a0, 0x0074($sp) /* 06640 80838850 00401825 */ or $v1, $v0, $zero ## $v1 = 00000000 -/* 06644 80838854 10A00006 */ beq $a1, $zero, .L80838870 +/* 06644 80838854 10A00006 */ beq $a1, $zero, .L80838870 /* 06648 80838858 248407C0 */ addiu $a0, $a0, 0x07C0 ## $a0 = 000007C0 /* 0664C 8083885C 9206007C */ lbu $a2, 0x007C($s0) ## 0000007C -/* 06650 80838860 0C010842 */ jal func_80042108 -/* 06654 80838864 AFA20048 */ sw $v0, 0x0048($sp) -/* 06658 80838868 1440001C */ bne $v0, $zero, .L808388DC -/* 0665C 8083886C 8FA30048 */ lw $v1, 0x0048($sp) +/* 06650 80838860 0C010842 */ jal func_80042108 +/* 06654 80838864 AFA20048 */ sw $v0, 0x0048($sp) +/* 06658 80838868 1440001C */ bne $v0, $zero, .L808388DC +/* 0665C 8083886C 8FA30048 */ lw $v1, 0x0048($sp) .L80838870: -/* 06660 80838870 0460000F */ bltz $v1, .L808388B0 -/* 06664 80838874 8FA40074 */ lw $a0, 0x0074($sp) +/* 06660 80838870 0460000F */ bltz $v1, .L808388B0 +/* 06664 80838874 8FA40074 */ lw $a0, 0x0074($sp) /* 06668 80838878 8E050078 */ lw $a1, 0x0078($s0) ## 00000078 /* 0666C 8083887C 9206007D */ lbu $a2, 0x007D($s0) ## 0000007D -/* 06670 80838880 AFA30048 */ sw $v1, 0x0048($sp) -/* 06674 80838884 0C010842 */ jal func_80042108 +/* 06670 80838880 AFA30048 */ sw $v1, 0x0048($sp) +/* 06674 80838884 0C010842 */ jal func_80042108 /* 06678 80838888 248407C0 */ addiu $a0, $a0, 0x07C0 ## $a0 = 000007C0 -/* 0667C 8083888C 10400008 */ beq $v0, $zero, .L808388B0 -/* 06680 80838890 8FA30048 */ lw $v1, 0x0048($sp) +/* 0667C 8083888C 10400008 */ beq $v0, $zero, .L808388B0 +/* 06680 80838890 8FA30048 */ lw $v1, 0x0048($sp) /* 06684 80838894 3C198085 */ lui $t9, %hi(D_808544F4) ## $t9 = 80850000 -/* 06688 80838898 0323C821 */ addu $t9, $t9, $v1 -/* 0668C 8083889C 933944F4 */ lbu $t9, %lo(D_808544F4)($t9) +/* 06688 80838898 0323C821 */ addu $t9, $t9, $v1 +/* 0668C 8083889C 933944F4 */ lbu $t9, %lo(D_808544F4)($t9) /* 06690 808388A0 92180A79 */ lbu $t8, 0x0A79($s0) ## 00000A79 -/* 06694 808388A4 0319082A */ slt $at, $t8, $t9 -/* 06698 808388A8 5020000D */ beql $at, $zero, .L808388E0 +/* 06694 808388A4 0319082A */ slt $at, $t8, $t9 +/* 06698 808388A8 5020000D */ beql $at, $zero, .L808388E0 /* 0669C 808388AC 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 .L808388B0: -/* 066A0 808388B0 0460001B */ bltz $v1, .L80838920 +/* 066A0 808388B0 0460001B */ bltz $v1, .L80838920 /* 066A4 808388B4 00000000 */ nop /* 066A8 808388B8 8209014C */ lb $t1, 0x014C($s0) ## 0000014C /* 066AC 808388BC 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 /* 066B0 808388C0 3C0B8085 */ lui $t3, %hi(D_808544F4) ## $t3 = 80850000 -/* 066B4 808388C4 15210005 */ bne $t1, $at, .L808388DC -/* 066B8 808388C8 01635821 */ addu $t3, $t3, $v1 +/* 066B4 808388C4 15210005 */ bne $t1, $at, .L808388DC +/* 066B8 808388C8 01635821 */ addu $t3, $t3, $v1 /* 066BC 808388CC 920A0A79 */ lbu $t2, 0x0A79($s0) ## 00000A79 -/* 066C0 808388D0 916B44F4 */ lbu $t3, %lo(D_808544F4)($t3) -/* 066C4 808388D4 014B082A */ slt $at, $t2, $t3 -/* 066C8 808388D8 14200011 */ bne $at, $zero, .L80838920 +/* 066C0 808388D0 916B44F4 */ lbu $t3, %lo(D_808544F4)($t3) +/* 066C4 808388D4 014B082A */ slt $at, $t2, $t3 +/* 066C8 808388D8 14200011 */ bne $at, $zero, .L80838920 .L808388DC: /* 066CC 808388DC 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 .L808388E0: @@ -426,28 +426,28 @@ glabel func_808382DC /* 066D4 808388E4 240C0004 */ addiu $t4, $zero, 0x0004 ## $t4 = 00000004 /* 066D8 808388E8 A2000A79 */ sb $zero, 0x0A79($s0) ## 00000A79 /* 066DC 808388EC A20C00B0 */ sb $t4, 0x00B0($s0) ## 000000B0 -/* 066E0 808388F0 E7A80010 */ swc1 $f8, 0x0010($sp) +/* 066E0 808388F0 E7A80010 */ swc1 $f8, 0x0010($sp) /* 066E4 808388F4 860D00B6 */ lh $t5, 0x00B6($s0) ## 000000B6 /* 066E8 808388F8 240E0014 */ addiu $t6, $zero, 0x0014 ## $t6 = 00000014 -/* 066EC 808388FC AFAE0018 */ sw $t6, 0x0018($sp) -/* 066F0 80838900 8FA40074 */ lw $a0, 0x0074($sp) +/* 066EC 808388FC AFAE0018 */ sw $t6, 0x0018($sp) +/* 066F0 80838900 8FA40074 */ lw $a0, 0x0074($sp) /* 066F4 80838904 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 066F8 80838908 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 /* 066FC 8083890C 3C074080 */ lui $a3, 0x4080 ## $a3 = 40800000 -/* 06700 80838910 0C20DF03 */ jal func_80837C0C -/* 06704 80838914 AFAD0014 */ sw $t5, 0x0014($sp) -/* 06708 80838918 10000004 */ beq $zero, $zero, .L8083892C +/* 06700 80838910 0C20DF03 */ jal func_80837C0C +/* 06704 80838914 AFAD0014 */ sw $t5, 0x0014($sp) +/* 06708 80838918 10000004 */ beq $zero, $zero, .L8083892C /* 0670C 8083891C 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 .L80838920: -/* 06710 80838920 10000002 */ beq $zero, $zero, .L8083892C +/* 06710 80838920 10000002 */ beq $zero, $zero, .L8083892C /* 06714 80838924 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 .L80838928: /* 06718 80838928 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 .L8083892C: -/* 0671C 8083892C 8FBF002C */ lw $ra, 0x002C($sp) -/* 06720 80838930 8FB00028 */ lw $s0, 0x0028($sp) +/* 0671C 8083892C 8FBF002C */ lw $ra, 0x002C($sp) +/* 06720 80838930 8FB00028 */ lw $s0, 0x0028($sp) /* 06724 80838934 27BD0070 */ addiu $sp, $sp, 0x0070 ## $sp = 00000000 -/* 06728 80838938 03E00008 */ jr $ra +/* 06728 80838938 03E00008 */ jr $ra /* 0672C 8083893C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80838A14.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80838A14.s index abd6f8bf3e..603f435b31 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80838A14.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80838A14.s @@ -1,132 +1,132 @@ glabel func_80838A14 /* 06804 80838A14 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 -/* 06808 80838A18 AFBF001C */ sw $ra, 0x001C($sp) -/* 0680C 80838A1C AFB00018 */ sw $s0, 0x0018($sp) -/* 06810 80838A20 AFA50044 */ sw $a1, 0x0044($sp) +/* 06808 80838A18 AFBF001C */ sw $ra, 0x001C($sp) +/* 0680C 80838A1C AFB00018 */ sw $s0, 0x0018($sp) +/* 06810 80838A20 AFA50044 */ sw $a1, 0x0044($sp) /* 06814 80838A24 8C82067C */ lw $v0, 0x067C($a0) ## 0000067C /* 06818 80838A28 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 0681C 80838A2C 304E0800 */ andi $t6, $v0, 0x0800 ## $t6 = 00000000 -/* 06820 80838A30 55C000EC */ bnel $t6, $zero, .L80838DE4 +/* 06820 80838A30 55C000EC */ bnel $t6, $zero, .L80838DE4 /* 06824 80838A34 960C0088 */ lhu $t4, 0x0088($s0) ## 00000088 /* 06828 80838A38 908F088C */ lbu $t7, 0x088C($a0) ## 0000088C -/* 0682C 80838A3C 0002C100 */ sll $t8, $v0, 4 -/* 06830 80838A40 29E10002 */ slti $at, $t7, 0x0002 -/* 06834 80838A44 542000E7 */ bnel $at, $zero, .L80838DE4 +/* 0682C 80838A3C 0002C100 */ sll $t8, $v0, 4 +/* 06830 80838A40 29E10002 */ slti $at, $t7, 0x0002 +/* 06834 80838A44 542000E7 */ bnel $at, $zero, .L80838DE4 /* 06838 80838A48 960C0088 */ lhu $t4, 0x0088($s0) ## 00000088 -/* 0683C 80838A4C 07030008 */ bgezl $t8, .L80838A70 +/* 0683C 80838A4C 07030008 */ bgezl $t8, .L80838A70 /* 06840 80838A50 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 06844 80838A54 8C990678 */ lw $t9, 0x0678($a0) ## 00000678 /* 06848 80838A58 C4840884 */ lwc1 $f4, 0x0884($a0) ## 00000884 /* 0684C 80838A5C C7260014 */ lwc1 $f6, 0x0014($t9) ## 00000014 -/* 06850 80838A60 4606203C */ c.lt.s $f4, $f6 +/* 06850 80838A60 4606203C */ c.lt.s $f4, $f6 /* 06854 80838A64 00000000 */ nop -/* 06858 80838A68 450000DD */ bc1f .L80838DE0 +/* 06858 80838A68 450000DD */ bc1f .L80838DE0 /* 0685C 80838A6C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 .L80838A70: -/* 06860 80838A70 0C20CCAE */ jal func_808332B8 -/* 06864 80838A74 AFA0003C */ sw $zero, 0x003C($sp) -/* 06868 80838A78 1040001F */ beq $v0, $zero, .L80838AF8 -/* 0686C 80838A7C 8FA3003C */ lw $v1, 0x003C($sp) +/* 06860 80838A70 0C20CCAE */ jal func_808332B8 +/* 06864 80838A74 AFA0003C */ sw $zero, 0x003C($sp) +/* 06868 80838A78 1040001F */ beq $v0, $zero, .L80838AF8 +/* 0686C 80838A7C 8FA3003C */ lw $v1, 0x003C($sp) /* 06870 80838A80 3C014248 */ lui $at, 0x4248 ## $at = 42480000 /* 06874 80838A84 44815000 */ mtc1 $at, $f10 ## $f10 = 50.00 /* 06878 80838A88 C6080084 */ lwc1 $f8, 0x0084($s0) ## 00000084 -/* 0687C 80838A8C 460A403C */ c.lt.s $f8, $f10 +/* 0687C 80838A8C 460A403C */ c.lt.s $f8, $f10 /* 06880 80838A90 00000000 */ nop -/* 06884 80838A94 4502000F */ bc1fl .L80838AD4 +/* 06884 80838A94 4502000F */ bc1fl .L80838AD4 /* 06888 80838A98 820A014F */ lb $t2, 0x014F($s0) ## 0000014F /* 0688C 80838A9C 9208088C */ lbu $t0, 0x088C($s0) ## 0000088C -/* 06890 80838AA0 29010002 */ slti $at, $t0, 0x0002 -/* 06894 80838AA4 14200008 */ bne $at, $zero, .L80838AC8 +/* 06890 80838AA0 29010002 */ slti $at, $t0, 0x0002 +/* 06894 80838AA4 14200008 */ bne $at, $zero, .L80838AC8 /* 06898 80838AA8 00000000 */ nop /* 0689C 80838AAC 8E090678 */ lw $t1, 0x0678($s0) ## 00000678 /* 068A0 80838AB0 C6120884 */ lwc1 $f18, 0x0884($s0) ## 00000884 /* 068A4 80838AB4 C5300010 */ lwc1 $f16, 0x0010($t1) ## 00000010 -/* 068A8 80838AB8 4612803C */ c.lt.s $f16, $f18 +/* 068A8 80838AB8 4612803C */ c.lt.s $f16, $f18 /* 068AC 80838ABC 00000000 */ nop -/* 068B0 80838AC0 4502001F */ bc1fl .L80838B40 +/* 068B0 80838AC0 4502001F */ bc1fl .L80838B40 /* 068B4 80838AC4 9219007C */ lbu $t9, 0x007C($s0) ## 0000007C .L80838AC8: -/* 068B8 80838AC8 100000E4 */ beq $zero, $zero, .L80838E5C +/* 068B8 80838AC8 100000E4 */ beq $zero, $zero, .L80838E5C /* 068BC 80838ACC 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 /* 068C0 80838AD0 820A014F */ lb $t2, 0x014F($s0) ## 0000014F .L80838AD4: /* 068C4 80838AD4 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 068C8 80838AD8 15410005 */ bne $t2, $at, .L80838AF0 +/* 068C8 80838AD8 15410005 */ bne $t2, $at, .L80838AF0 /* 068CC 80838ADC 00000000 */ nop /* 068D0 80838AE0 920B088C */ lbu $t3, 0x088C($s0) ## 0000088C -/* 068D4 80838AE4 29610003 */ slti $at, $t3, 0x0003 -/* 068D8 80838AE8 54200015 */ bnel $at, $zero, .L80838B40 +/* 068D4 80838AE4 29610003 */ slti $at, $t3, 0x0003 +/* 068D8 80838AE8 54200015 */ bnel $at, $zero, .L80838B40 /* 068DC 80838AEC 9219007C */ lbu $t9, 0x007C($s0) ## 0000007C .L80838AF0: -/* 068E0 80838AF0 100000DA */ beq $zero, $zero, .L80838E5C +/* 068E0 80838AF0 100000DA */ beq $zero, $zero, .L80838E5C /* 068E4 80838AF4 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 .L80838AF8: /* 068E8 80838AF8 960C0088 */ lhu $t4, 0x0088($s0) ## 00000088 /* 068EC 80838AFC 318D0001 */ andi $t5, $t4, 0x0001 ## $t5 = 00000000 -/* 068F0 80838B00 11A0000C */ beq $t5, $zero, .L80838B34 +/* 068F0 80838B00 11A0000C */ beq $t5, $zero, .L80838B34 /* 068F4 80838B04 00000000 */ nop /* 068F8 80838B08 8E0E0678 */ lw $t6, 0x0678($s0) ## 00000678 /* 068FC 80838B0C C6040884 */ lwc1 $f4, 0x0884($s0) ## 00000884 /* 06900 80838B10 C5C60014 */ lwc1 $f6, 0x0014($t6) ## 00000014 -/* 06904 80838B14 4604303E */ c.le.s $f6, $f4 +/* 06904 80838B14 4604303E */ c.le.s $f6, $f4 /* 06908 80838B18 00000000 */ nop -/* 0690C 80838B1C 45020008 */ bc1fl .L80838B40 +/* 0690C 80838B1C 45020008 */ bc1fl .L80838B40 /* 06910 80838B20 9219007C */ lbu $t9, 0x007C($s0) ## 0000007C /* 06914 80838B24 8E0F067C */ lw $t7, 0x067C($s0) ## 0000067C -/* 06918 80838B28 000FC100 */ sll $t8, $t7, 4 -/* 0691C 80838B2C 07030004 */ bgezl $t8, .L80838B40 +/* 06918 80838B28 000FC100 */ sll $t8, $t7, 4 +/* 0691C 80838B2C 07030004 */ bgezl $t8, .L80838B40 /* 06920 80838B30 9219007C */ lbu $t9, 0x007C($s0) ## 0000007C .L80838B34: -/* 06924 80838B34 100000C9 */ beq $zero, $zero, .L80838E5C +/* 06924 80838B34 100000C9 */ beq $zero, $zero, .L80838E5C /* 06928 80838B38 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 /* 0692C 80838B3C 9219007C */ lbu $t9, 0x007C($s0) ## 0000007C .L80838B40: /* 06930 80838B40 24010032 */ addiu $at, $zero, 0x0032 ## $at = 00000032 /* 06934 80838B44 3C088085 */ lui $t0, %hi(D_808535F0) ## $t0 = 80850000 -/* 06938 80838B48 13210016 */ beq $t9, $at, .L80838BA4 +/* 06938 80838B48 13210016 */ beq $t9, $at, .L80838BA4 /* 0693C 80838B4C 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 06940 80838B50 8D0835F0 */ lw $t0, %lo(D_808535F0)($t0) +/* 06940 80838B50 8D0835F0 */ lw $t0, %lo(D_808535F0)($t0) /* 06944 80838B54 31090040 */ andi $t1, $t0, 0x0040 ## $t1 = 00000000 -/* 06948 80838B58 51200013 */ beql $t1, $zero, .L80838BA8 +/* 06948 80838B58 51200013 */ beql $t1, $zero, .L80838BA8 /* 0694C 80838B5C 9218088D */ lbu $t8, 0x088D($s0) ## 0000088D /* 06950 80838B60 920A088D */ lbu $t2, 0x088D($s0) ## 0000088D -/* 06954 80838B64 29410006 */ slti $at, $t2, 0x0006 -/* 06958 80838B68 1420001B */ bne $at, $zero, .L80838BD8 +/* 06954 80838B64 29410006 */ slti $at, $t2, 0x0006 +/* 06958 80838B68 1420001B */ bne $at, $zero, .L80838BD8 /* 0695C 80838B6C 00000000 */ nop /* 06960 80838B70 8E0B0680 */ lw $t3, 0x0680($s0) ## 00000680 /* 06964 80838B74 3C0D8086 */ lui $t5, %hi(D_80858AB4) ## $t5 = 80860000 /* 06968 80838B78 3C01FFFF */ lui $at, 0xFFFF ## $at = FFFF0000 /* 0696C 80838B7C 356C0004 */ ori $t4, $t3, 0x0004 ## $t4 = 00000004 /* 06970 80838B80 AE0C0680 */ sw $t4, 0x0680($s0) ## 00000680 -/* 06974 80838B84 8DAD8AB4 */ lw $t5, %lo(D_80858AB4)($t5) +/* 06974 80838B84 8DAD8AB4 */ lw $t5, %lo(D_80858AB4)($t5) /* 06978 80838B88 34217FFF */ ori $at, $at, 0x7FFF ## $at = FFFF7FFF /* 0697C 80838B8C 95AE000C */ lhu $t6, 0x000C($t5) ## 8086000C -/* 06980 80838B90 01C17827 */ nor $t7, $t6, $at -/* 06984 80838B94 15E00010 */ bne $t7, $zero, .L80838BD8 +/* 06980 80838B90 01C17827 */ nor $t7, $t6, $at +/* 06984 80838B94 15E00010 */ bne $t7, $zero, .L80838BD8 /* 06988 80838B98 00000000 */ nop -/* 0698C 80838B9C 1000000E */ beq $zero, $zero, .L80838BD8 +/* 0698C 80838B9C 1000000E */ beq $zero, $zero, .L80838BD8 /* 06990 80838BA0 24030001 */ addiu $v1, $zero, 0x0001 ## $v1 = 00000001 .L80838BA4: /* 06994 80838BA4 9218088D */ lbu $t8, 0x088D($s0) ## 0000088D .L80838BA8: /* 06998 80838BA8 3C198086 */ lui $t9, %hi(D_80858AB4) ## $t9 = 80860000 -/* 0699C 80838BAC 2B010006 */ slti $at, $t8, 0x0006 -/* 069A0 80838BB0 50200009 */ beql $at, $zero, .L80838BD8 +/* 0699C 80838BAC 2B010006 */ slti $at, $t8, 0x0006 +/* 069A0 80838BB0 50200009 */ beql $at, $zero, .L80838BD8 /* 069A4 80838BB4 24030001 */ addiu $v1, $zero, 0x0001 ## $v1 = 00000001 -/* 069A8 80838BB8 8F398AB4 */ lw $t9, %lo(D_80858AB4)($t9) +/* 069A8 80838BB8 8F398AB4 */ lw $t9, %lo(D_80858AB4)($t9) /* 069AC 80838BBC 3C01FFFF */ lui $at, 0xFFFF ## $at = FFFF0000 /* 069B0 80838BC0 34217FFF */ ori $at, $at, 0x7FFF ## $at = FFFF7FFF /* 069B4 80838BC4 9728000C */ lhu $t0, 0x000C($t9) ## 8086000C -/* 069B8 80838BC8 01014827 */ nor $t1, $t0, $at -/* 069BC 80838BCC 15200002 */ bne $t1, $zero, .L80838BD8 +/* 069B8 80838BC8 01014827 */ nor $t1, $t0, $at +/* 069BC 80838BCC 15200002 */ bne $t1, $zero, .L80838BD8 /* 069C0 80838BD0 00000000 */ nop /* 069C4 80838BD4 24030001 */ addiu $v1, $zero, 0x0001 ## $v1 = 00000001 .L80838BD8: -/* 069C8 80838BD8 1060009F */ beq $v1, $zero, .L80838E58 -/* 069CC 80838BDC 8FA40044 */ lw $a0, 0x0044($sp) +/* 069C8 80838BD8 1060009F */ beq $v1, $zero, .L80838E58 +/* 069CC 80838BDC 8FA40044 */ lw $a0, 0x0044($sp) /* 069D0 80838BE0 3C068084 */ lui $a2, %hi(func_80845668) ## $a2 = 80840000 /* 069D4 80838BE4 24C65668 */ addiu $a2, $a2, %lo(func_80845668) ## $a2 = 80845668 -/* 069D8 80838BE8 0C20D716 */ jal func_80835C58 +/* 069D8 80838BE8 0C20D716 */ jal func_80835C58 /* 069DC 80838BEC 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 /* 069E0 80838BF0 8E0A067C */ lw $t2, 0x067C($s0) ## 0000067C /* 069E4 80838BF4 8E0C0678 */ lw $t4, 0x0678($s0) ## 00000678 @@ -137,165 +137,165 @@ glabel func_80838A14 /* 069F8 80838C08 C5880014 */ lwc1 $f8, 0x0014($t4) ## 00000014 /* 069FC 80838C0C 3C060400 */ lui $a2, 0x0400 ## $a2 = 04000000 /* 06A00 80838C10 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 06A04 80838C14 4600403E */ c.le.s $f8, $f0 +/* 06A04 80838C14 4600403E */ c.le.s $f8, $f0 /* 06A08 80838C18 00000000 */ nop -/* 06A0C 80838C1C 45020006 */ bc1fl .L80838C38 +/* 06A0C 80838C1C 45020006 */ bc1fl .L80838C38 /* 06A10 80838C20 8E020074 */ lw $v0, 0x0074($s0) ## 00000074 /* 06A14 80838C24 44815000 */ mtc1 $at, $f10 ## $f10 = 1.00 /* 06A18 80838C28 24C62D48 */ addiu $a2, $a2, 0x2D48 ## $a2 = 04002D48 -/* 06A1C 80838C2C 10000059 */ beq $zero, $zero, .L80838D94 +/* 06A1C 80838C2C 10000059 */ beq $zero, $zero, .L80838D94 /* 06A20 80838C30 E60A0838 */ swc1 $f10, 0x0838($s0) ## 00000838 /* 06A24 80838C34 8E020074 */ lw $v0, 0x0074($s0) ## 00000074 .L80838C38: /* 06A28 80838C38 3C018085 */ lui $at, %hi(D_80855374) ## $at = 80850000 -/* 06A2C 80838C3C C42C5374 */ lwc1 $f12, %lo(D_80855374)($at) +/* 06A2C 80838C3C C42C5374 */ lwc1 $f12, %lo(D_80855374)($at) /* 06A30 80838C40 844D0008 */ lh $t5, 0x0008($v0) ## 00000008 /* 06A34 80838C44 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 /* 06A38 80838C48 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 06A3C 80838C4C 448D8000 */ mtc1 $t5, $f16 ## $f16 = 0.00 /* 06A40 80838C50 00000000 */ nop -/* 06A44 80838C54 468084A0 */ cvt.s.w $f18, $f16 -/* 06A48 80838C58 460C9102 */ mul.s $f4, $f18, $f12 +/* 06A44 80838C54 468084A0 */ cvt.s.w $f18, $f16 +/* 06A48 80838C58 460C9102 */ mul.s $f4, $f18, $f12 /* 06A4C 80838C5C 44819000 */ mtc1 $at, $f18 ## $f18 = 0.50 -/* 06A50 80838C60 E7A4002C */ swc1 $f4, 0x002C($sp) +/* 06A50 80838C60 E7A4002C */ swc1 $f4, 0x002C($sp) /* 06A54 80838C64 844E000C */ lh $t6, 0x000C($v0) ## 0000000C /* 06A58 80838C68 448E3000 */ mtc1 $t6, $f6 ## $f6 = 0.00 /* 06A5C 80838C6C 00000000 */ nop -/* 06A60 80838C70 46803220 */ cvt.s.w $f8, $f6 -/* 06A64 80838C74 460C4282 */ mul.s $f10, $f8, $f12 -/* 06A68 80838C78 E7AA0028 */ swc1 $f10, 0x0028($sp) +/* 06A60 80838C70 46803220 */ cvt.s.w $f8, $f6 +/* 06A64 80838C74 460C4282 */ mul.s $f10, $f8, $f12 +/* 06A68 80838C78 E7AA0028 */ swc1 $f10, 0x0028($sp) /* 06A6C 80838C7C C6100888 */ lwc1 $f16, 0x0888($s0) ## 00000888 /* 06A70 80838C80 8E0F067C */ lw $t7, 0x067C($s0) ## 0000067C -/* 06A74 80838C84 46128080 */ add.s $f2, $f16, $f18 +/* 06A74 80838C84 46128080 */ add.s $f2, $f16, $f18 /* 06A78 80838C88 35F84000 */ ori $t8, $t7, 0x4000 ## $t8 = 00004000 /* 06A7C 80838C8C AE18067C */ sw $t8, 0x067C($s0) ## 0000067C -/* 06A80 80838C90 E7A00034 */ swc1 $f0, 0x0034($sp) -/* 06A84 80838C94 0C20CCAE */ jal func_808332B8 -/* 06A88 80838C98 E7A20024 */ swc1 $f2, 0x0024($sp) -/* 06A8C 80838C9C C7A00034 */ lwc1 $f0, 0x0034($sp) -/* 06A90 80838CA0 1040000F */ beq $v0, $zero, .L80838CE0 -/* 06A94 80838CA4 C7A20024 */ lwc1 $f2, 0x0024($sp) +/* 06A80 80838C90 E7A00034 */ swc1 $f0, 0x0034($sp) +/* 06A84 80838C94 0C20CCAE */ jal func_808332B8 +/* 06A88 80838C98 E7A20024 */ swc1 $f2, 0x0024($sp) +/* 06A8C 80838C9C C7A00034 */ lwc1 $f0, 0x0034($sp) +/* 06A90 80838CA0 1040000F */ beq $v0, $zero, .L80838CE0 +/* 06A94 80838CA4 C7A20024 */ lwc1 $f2, 0x0024($sp) /* 06A98 80838CA8 8E190678 */ lw $t9, 0x0678($s0) ## 00000678 /* 06A9C 80838CAC 3C014270 */ lui $at, 0x4270 ## $at = 42700000 /* 06AA0 80838CB0 44812000 */ mtc1 $at, $f4 ## $f4 = 60.00 /* 06AA4 80838CB4 C7260008 */ lwc1 $f6, 0x0008($t9) ## 00000008 /* 06AA8 80838CB8 8E08067C */ lw $t0, 0x067C($s0) ## 0000067C /* 06AAC 80838CBC 3C01F7FF */ lui $at, 0xF7FF ## $at = F7FF0000 -/* 06AB0 80838CC0 46062202 */ mul.s $f8, $f4, $f6 +/* 06AB0 80838CC0 46062202 */ mul.s $f8, $f4, $f6 /* 06AB4 80838CC4 3421FFFF */ ori $at, $at, 0xFFFF ## $at = F7FFFFFF /* 06AB8 80838CC8 3C060400 */ lui $a2, 0x0400 ## $a2 = 04000000 -/* 06ABC 80838CCC 01014824 */ and $t1, $t0, $at +/* 06ABC 80838CCC 01014824 */ and $t1, $t0, $at /* 06AC0 80838CD0 24C632E8 */ addiu $a2, $a2, 0x32E8 ## $a2 = 040032E8 /* 06AC4 80838CD4 AE09067C */ sw $t1, 0x067C($s0) ## 0000067C -/* 06AC8 80838CD8 10000016 */ beq $zero, $zero, .L80838D34 -/* 06ACC 80838CDC 46080001 */ sub.s $f0, $f0, $f8 +/* 06AC8 80838CD8 10000016 */ beq $zero, $zero, .L80838D34 +/* 06ACC 80838CDC 46080001 */ sub.s $f0, $f0, $f8 .L80838CE0: /* 06AD0 80838CE0 8E020678 */ lw $v0, 0x0678($s0) ## 00000678 /* 06AD4 80838CE4 3C014224 */ lui $at, 0x4224 ## $at = 42240000 /* 06AD8 80838CE8 C44A0018 */ lwc1 $f10, 0x0018($v0) ## 00000018 -/* 06ADC 80838CEC 4600503E */ c.le.s $f10, $f0 +/* 06ADC 80838CEC 4600503E */ c.le.s $f10, $f0 /* 06AE0 80838CF0 00000000 */ nop -/* 06AE4 80838CF4 4502000A */ bc1fl .L80838D20 +/* 06AE4 80838CF4 4502000A */ bc1fl .L80838D20 /* 06AE8 80838CF8 44813000 */ mtc1 $at, $f6 ## $f6 = 41.00 /* 06AEC 80838CFC 3C01426C */ lui $at, 0x426C ## $at = 426C0000 /* 06AF0 80838D00 44818000 */ mtc1 $at, $f16 ## $f16 = 59.00 /* 06AF4 80838D04 C4520008 */ lwc1 $f18, 0x0008($v0) ## 00000008 /* 06AF8 80838D08 3C060400 */ lui $a2, 0x0400 ## $a2 = 04000000 /* 06AFC 80838D0C 24C62D40 */ addiu $a2, $a2, 0x2D40 ## $a2 = 04002D40 -/* 06B00 80838D10 46128102 */ mul.s $f4, $f16, $f18 -/* 06B04 80838D14 10000007 */ beq $zero, $zero, .L80838D34 -/* 06B08 80838D18 46040001 */ sub.s $f0, $f0, $f4 +/* 06B00 80838D10 46128102 */ mul.s $f4, $f16, $f18 +/* 06B04 80838D14 10000007 */ beq $zero, $zero, .L80838D34 +/* 06B08 80838D18 46040001 */ sub.s $f0, $f0, $f4 /* 06B0C 80838D1C 44813000 */ mtc1 $at, $f6 ## $f6 = 59.00 .L80838D20: /* 06B10 80838D20 C4480008 */ lwc1 $f8, 0x0008($v0) ## 00000008 /* 06B14 80838D24 3C060400 */ lui $a2, 0x0400 ## $a2 = 04000000 /* 06B18 80838D28 24C62D38 */ addiu $a2, $a2, 0x2D38 ## $a2 = 04002D38 -/* 06B1C 80838D2C 46083282 */ mul.s $f10, $f6, $f8 -/* 06B20 80838D30 460A0001 */ sub.s $f0, $f0, $f10 +/* 06B1C 80838D2C 46083282 */ mul.s $f10, $f6, $f8 +/* 06B20 80838D30 460A0001 */ sub.s $f0, $f0, $f10 .L80838D34: /* 06B24 80838D34 3C0142C8 */ lui $at, 0x42C8 ## $at = 42C80000 /* 06B28 80838D38 44819000 */ mtc1 $at, $f18 ## $f18 = 100.00 /* 06B2C 80838D3C C61000BC */ lwc1 $f16, 0x00BC($s0) ## 000000BC /* 06B30 80838D40 C6080024 */ lwc1 $f8, 0x0024($s0) ## 00000024 -/* 06B34 80838D44 46120102 */ mul.s $f4, $f0, $f18 +/* 06B34 80838D44 46120102 */ mul.s $f4, $f0, $f18 /* 06B38 80838D48 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 06B3C 80838D4C 46048181 */ sub.s $f6, $f16, $f4 +/* 06B3C 80838D4C 46048181 */ sub.s $f6, $f16, $f4 /* 06B40 80838D50 C6040028 */ lwc1 $f4, 0x0028($s0) ## 00000028 /* 06B44 80838D54 E60600BC */ swc1 $f6, 0x00BC($s0) ## 000000BC -/* 06B48 80838D58 C7AA002C */ lwc1 $f10, 0x002C($sp) +/* 06B48 80838D58 C7AA002C */ lwc1 $f10, 0x002C($sp) /* 06B4C 80838D5C C6060884 */ lwc1 $f6, 0x0884($s0) ## 00000884 -/* 06B50 80838D60 460A1482 */ mul.s $f18, $f2, $f10 -/* 06B54 80838D64 46062280 */ add.s $f10, $f4, $f6 +/* 06B50 80838D60 460A1482 */ mul.s $f18, $f2, $f10 +/* 06B54 80838D64 46062280 */ add.s $f10, $f4, $f6 /* 06B58 80838D68 E60A0028 */ swc1 $f10, 0x0028($s0) ## 00000028 -/* 06B5C 80838D6C 46124401 */ sub.s $f16, $f8, $f18 +/* 06B5C 80838D6C 46124401 */ sub.s $f16, $f8, $f18 /* 06B60 80838D70 C608002C */ lwc1 $f8, 0x002C($s0) ## 0000002C /* 06B64 80838D74 E6100024 */ swc1 $f16, 0x0024($s0) ## 00000024 -/* 06B68 80838D78 C7B20028 */ lwc1 $f18, 0x0028($sp) -/* 06B6C 80838D7C 46121402 */ mul.s $f16, $f2, $f18 -/* 06B70 80838D80 46104101 */ sub.s $f4, $f8, $f16 +/* 06B68 80838D78 C7B20028 */ lwc1 $f18, 0x0028($sp) +/* 06B6C 80838D7C 46121402 */ mul.s $f16, $f2, $f18 +/* 06B70 80838D80 46104101 */ sub.s $f4, $f8, $f16 /* 06B74 80838D84 E604002C */ swc1 $f4, 0x002C($s0) ## 0000002C -/* 06B78 80838D88 0C20C889 */ jal func_80832224 -/* 06B7C 80838D8C AFA60038 */ sw $a2, 0x0038($sp) -/* 06B80 80838D90 8FA60038 */ lw $a2, 0x0038($sp) +/* 06B78 80838D88 0C20C889 */ jal func_80832224 +/* 06B7C 80838D8C AFA60038 */ sw $a2, 0x0038($sp) +/* 06B80 80838D90 8FA60038 */ lw $a2, 0x0038($sp) .L80838D94: /* 06B84 80838D94 960A0088 */ lhu $t2, 0x0088($s0) ## 00000088 /* 06B88 80838D98 3C073FA6 */ lui $a3, 0x3FA6 ## $a3 = 3FA60000 /* 06B8C 80838D9C 34E76666 */ ori $a3, $a3, 0x6666 ## $a3 = 3FA66666 /* 06B90 80838DA0 354B0001 */ ori $t3, $t2, 0x0001 ## $t3 = 00000001 /* 06B94 80838DA4 A60B0088 */ sh $t3, 0x0088($s0) ## 00000088 -/* 06B98 80838DA8 8FA40044 */ lw $a0, 0x0044($sp) -/* 06B9C 80838DAC 0C029037 */ jal func_800A40DC +/* 06B98 80838DA8 8FA40044 */ lw $a0, 0x0044($sp) +/* 06B9C 80838DAC 0C029037 */ jal SkelAnime_ChangeLinkAnimPlaybackStop /* 06BA0 80838DB0 260501B4 */ addiu $a1, $s0, 0x01B4 ## $a1 = 000001B4 -/* 06BA4 80838DB4 0C028CC4 */ jal func_800A3310 -/* 06BA8 80838DB8 8FA40044 */ lw $a0, 0x0044($sp) +/* 06BA4 80838DB4 0C028CC4 */ jal func_800A3310 +/* 06BA8 80838DB8 8FA40044 */ lw $a0, 0x0044($sp) /* 06BAC 80838DBC 8603007E */ lh $v1, 0x007E($s0) ## 0000007E /* 06BB0 80838DC0 34018000 */ ori $at, $zero, 0x8000 ## $at = 00008000 /* 06BB4 80838DC4 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -/* 06BB8 80838DC8 00611821 */ addu $v1, $v1, $at -/* 06BBC 80838DCC 00031C00 */ sll $v1, $v1, 16 -/* 06BC0 80838DD0 00031C03 */ sra $v1, $v1, 16 +/* 06BB8 80838DC8 00611821 */ addu $v1, $v1, $at +/* 06BBC 80838DCC 00031C00 */ sll $v1, $v1, 16 +/* 06BC0 80838DD0 00031C03 */ sra $v1, $v1, 16 /* 06BC4 80838DD4 A603083C */ sh $v1, 0x083C($s0) ## 0000083C -/* 06BC8 80838DD8 10000020 */ beq $zero, $zero, .L80838E5C +/* 06BC8 80838DD8 10000020 */ beq $zero, $zero, .L80838E5C /* 06BCC 80838DDC A60300B6 */ sh $v1, 0x00B6($s0) ## 000000B6 .L80838DE0: /* 06BD0 80838DE0 960C0088 */ lhu $t4, 0x0088($s0) ## 00000088 .L80838DE4: /* 06BD4 80838DE4 318D0001 */ andi $t5, $t4, 0x0001 ## $t5 = 00000000 -/* 06BD8 80838DE8 51A0001C */ beql $t5, $zero, .L80838E5C +/* 06BD8 80838DE8 51A0001C */ beql $t5, $zero, .L80838E5C /* 06BDC 80838DEC 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 /* 06BE0 80838DF0 920E088C */ lbu $t6, 0x088C($s0) ## 0000088C /* 06BE4 80838DF4 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 06BE8 80838DF8 55C10018 */ bnel $t6, $at, .L80838E5C +/* 06BE8 80838DF8 55C10018 */ bnel $t6, $at, .L80838E5C /* 06BEC 80838DFC 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 /* 06BF0 80838E00 920F088D */ lbu $t7, 0x088D($s0) ## 0000088D -/* 06BF4 80838E04 29E10003 */ slti $at, $t7, 0x0003 -/* 06BF8 80838E08 14200013 */ bne $at, $zero, .L80838E58 +/* 06BF4 80838E04 29E10003 */ slti $at, $t7, 0x0003 +/* 06BF8 80838E08 14200013 */ bne $at, $zero, .L80838E58 /* 06BFC 80838E0C 3C018085 */ lui $at, %hi(D_80855378) ## $at = 80850000 -/* 06C00 80838E10 C42A5378 */ lwc1 $f10, %lo(D_80855378)($at) +/* 06C00 80838E10 C42A5378 */ lwc1 $f10, %lo(D_80855378)($at) /* 06C04 80838E14 C6060884 */ lwc1 $f6, 0x0884($s0) ## 00000884 /* 06C08 80838E18 3C0140B0 */ lui $at, 0x40B0 ## $at = 40B00000 /* 06C0C 80838E1C 44814000 */ mtc1 $at, $f8 ## $f8 = 5.50 -/* 06C10 80838E20 460A3482 */ mul.s $f18, $f6, $f10 +/* 06C10 80838E20 460A3482 */ mul.s $f18, $f6, $f10 /* 06C14 80838E24 3C050400 */ lui $a1, 0x0400 ## $a1 = 04000000 /* 06C18 80838E28 24A52FE0 */ addiu $a1, $a1, 0x2FE0 ## $a1 = 04002FE0 /* 06C1C 80838E2C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 06C20 80838E30 8FA70044 */ lw $a3, 0x0044($sp) -/* 06C24 80838E34 46089000 */ add.s $f0, $f18, $f8 -/* 06C28 80838E38 44060000 */ mfc1 $a2, $f0 -/* 06C2C 80838E3C 0C20E27A */ jal func_808389E8 +/* 06C20 80838E30 8FA70044 */ lw $a3, 0x0044($sp) +/* 06C24 80838E34 46089000 */ add.s $f0, $f18, $f8 +/* 06C28 80838E38 44060000 */ mfc1 $a2, $f0 +/* 06C2C 80838E3C 0C20E27A */ jal func_808389E8 /* 06C30 80838E40 00000000 */ nop /* 06C34 80838E44 3C014020 */ lui $at, 0x4020 ## $at = 40200000 /* 06C38 80838E48 44818000 */ mtc1 $at, $f16 ## $f16 = 2.50 /* 06C3C 80838E4C 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 -/* 06C40 80838E50 10000002 */ beq $zero, $zero, .L80838E5C +/* 06C40 80838E50 10000002 */ beq $zero, $zero, .L80838E5C /* 06C44 80838E54 E6100838 */ swc1 $f16, 0x0838($s0) ## 00000838 .L80838E58: /* 06C48 80838E58 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 .L80838E5C: -/* 06C4C 80838E5C 8FBF001C */ lw $ra, 0x001C($sp) -/* 06C50 80838E60 8FB00018 */ lw $s0, 0x0018($sp) +/* 06C4C 80838E5C 8FBF001C */ lw $ra, 0x001C($sp) +/* 06C50 80838E60 8FB00018 */ lw $s0, 0x0018($sp) /* 06C54 80838E64 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 -/* 06C58 80838E68 03E00008 */ jr $ra +/* 06C58 80838E68 03E00008 */ jr $ra /* 06C5C 80838E6C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083A9B8.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083A9B8.s index 4b9bdc7b4c..dce1b681a6 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083A9B8.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083A9B8.s @@ -1,25 +1,25 @@ glabel func_8083A9B8 /* 087A8 8083A9B8 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 087AC 8083A9BC AFA40018 */ sw $a0, 0x0018($sp) -/* 087B0 8083A9C0 AFA60020 */ sw $a2, 0x0020($sp) +/* 087AC 8083A9BC AFA40018 */ sw $a0, 0x0018($sp) +/* 087B0 8083A9C0 AFA60020 */ sw $a2, 0x0020($sp) /* 087B4 8083A9C4 00C02025 */ or $a0, $a2, $zero ## $a0 = 00000000 -/* 087B8 8083A9C8 AFBF0014 */ sw $ra, 0x0014($sp) -/* 087BC 8083A9CC AFA5001C */ sw $a1, 0x001C($sp) +/* 087B8 8083A9C8 AFBF0014 */ sw $ra, 0x0014($sp) +/* 087BC 8083A9CC AFA5001C */ sw $a1, 0x001C($sp) /* 087C0 8083A9D0 3C068085 */ lui $a2, %hi(func_8084BDFC) ## $a2 = 80850000 /* 087C4 8083A9D4 24C6BDFC */ addiu $a2, $a2, %lo(func_8084BDFC) ## $a2 = 8084BDFC -/* 087C8 8083A9D8 8FA50018 */ lw $a1, 0x0018($sp) -/* 087CC 8083A9DC 0C20D716 */ jal func_80835C58 +/* 087C8 8083A9D8 8FA50018 */ lw $a1, 0x0018($sp) +/* 087CC 8083A9DC 0C20D716 */ jal func_80835C58 /* 087D0 8083A9E0 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 087D4 8083A9E4 8FA50018 */ lw $a1, 0x0018($sp) +/* 087D4 8083A9E4 8FA50018 */ lw $a1, 0x0018($sp) /* 087D8 8083A9E8 3C073FA6 */ lui $a3, 0x3FA6 ## $a3 = 3FA60000 /* 087DC 8083A9EC 34E76666 */ ori $a3, $a3, 0x6666 ## $a3 = 3FA66666 -/* 087E0 8083A9F0 8FA40020 */ lw $a0, 0x0020($sp) -/* 087E4 8083A9F4 8FA6001C */ lw $a2, 0x001C($sp) -/* 087E8 8083A9F8 0C029037 */ jal func_800A40DC +/* 087E0 8083A9F0 8FA40020 */ lw $a0, 0x0020($sp) +/* 087E4 8083A9F4 8FA6001C */ lw $a2, 0x001C($sp) +/* 087E8 8083A9F8 0C029037 */ jal SkelAnime_ChangeLinkAnimPlaybackStop /* 087EC 8083A9FC 24A501B4 */ addiu $a1, $a1, 0x01B4 ## $a1 = 000001B4 -/* 087F0 8083AA00 8FBF0014 */ lw $ra, 0x0014($sp) +/* 087F0 8083AA00 8FBF0014 */ lw $ra, 0x0014($sp) /* 087F4 8083AA04 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 087F8 8083AA08 03E00008 */ jr $ra +/* 087F8 8083AA08 03E00008 */ jr $ra /* 087FC 8083AA0C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083AF44.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083AF44.s index 56768617f6..2db9b29c32 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083AF44.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083AF44.s @@ -1,56 +1,56 @@ glabel func_8083AF44 /* 08D34 8083AF44 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 08D38 8083AF48 AFA60038 */ sw $a2, 0x0038($sp) -/* 08D3C 8083AF4C AFBF0024 */ sw $ra, 0x0024($sp) -/* 08D40 8083AF50 AFB00020 */ sw $s0, 0x0020($sp) +/* 08D38 8083AF48 AFA60038 */ sw $a2, 0x0038($sp) +/* 08D3C 8083AF4C AFBF0024 */ sw $ra, 0x0024($sp) +/* 08D40 8083AF50 AFB00020 */ sw $s0, 0x0020($sp) /* 08D44 8083AF54 3C068085 */ lui $a2, %hi(func_808507F4) ## $a2 = 80850000 /* 08D48 8083AF58 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 08D4C 8083AF5C AFA50034 */ sw $a1, 0x0034($sp) +/* 08D4C 8083AF5C AFA50034 */ sw $a1, 0x0034($sp) /* 08D50 8083AF60 24C607F4 */ addiu $a2, $a2, %lo(func_808507F4) ## $a2 = 808507F4 -/* 08D54 8083AF64 0C20D779 */ jal func_80835DE4 +/* 08D54 8083AF64 0C20D779 */ jal func_80835DE4 /* 08D58 8083AF68 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 08D5C 8083AF6C 8FA30038 */ lw $v1, 0x0038($sp) -/* 08D60 8083AF70 8FAF0034 */ lw $t7, 0x0034($sp) +/* 08D5C 8083AF6C 8FA30038 */ lw $v1, 0x0038($sp) +/* 08D60 8083AF70 8FAF0034 */ lw $t7, 0x0034($sp) /* 08D64 8083AF74 3C188085 */ lui $t8, %hi(D_80854390) ## $t8 = 80850000 /* 08D68 8083AF78 27184390 */ addiu $t8, $t8, %lo(D_80854390) ## $t8 = 80854390 /* 08D6C 8083AF7C 246EFFFD */ addiu $t6, $v1, 0xFFFD ## $t6 = FFFFFFFD -/* 08D70 8083AF80 00781021 */ addu $v0, $v1, $t8 +/* 08D70 8083AF80 00781021 */ addu $v0, $v1, $t8 /* 08D74 8083AF84 A1EE084F */ sb $t6, 0x084F($t7) ## 0000084F -/* 08D78 8083AF88 AFA2002C */ sw $v0, 0x002C($sp) +/* 08D78 8083AF88 AFA2002C */ sw $v0, 0x002C($sp) /* 08D7C 8083AF8C 90450000 */ lbu $a1, 0x0000($v0) ## 00000000 /* 08D80 8083AF90 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 08D84 8083AF94 0C021DC2 */ jal func_80087708 +/* 08D84 8083AF94 0C021DC2 */ jal func_80087708 /* 08D88 8083AF98 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 -/* 08D8C 8083AF9C 8FA50034 */ lw $a1, 0x0034($sp) +/* 08D8C 8083AF9C 8FA50034 */ lw $a1, 0x0034($sp) /* 08D90 8083AFA0 3C060400 */ lui $a2, 0x0400 ## $a2 = 04000000 /* 08D94 8083AFA4 3C073F54 */ lui $a3, 0x3F54 ## $a3 = 3F540000 /* 08D98 8083AFA8 34E77AE1 */ ori $a3, $a3, 0x7AE1 ## $a3 = 3F547AE1 /* 08D9C 8083AFAC 24C62D28 */ addiu $a2, $a2, 0x2D28 ## $a2 = 04002D28 /* 08DA0 8083AFB0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 08DA4 8083AFB4 0C029037 */ jal func_800A40DC +/* 08DA4 8083AFB4 0C029037 */ jal SkelAnime_ChangeLinkAnimPlaybackStop /* 08DA8 8083AFB8 24A501B4 */ addiu $a1, $a1, 0x01B4 ## $a1 = 000001B4 -/* 08DAC 8083AFBC 8FB9002C */ lw $t9, 0x002C($sp) +/* 08DAC 8083AFBC 8FB9002C */ lw $t9, 0x002C($sp) /* 08DB0 8083AFC0 3C088085 */ lui $t0, %hi(D_80854395) ## $t0 = 80850000 /* 08DB4 8083AFC4 25084395 */ addiu $t0, $t0, %lo(D_80854395) ## $t0 = 80854395 -/* 08DB8 8083AFC8 1728000A */ bne $t9, $t0, .L8083AFF4 +/* 08DB8 8083AFC8 1728000A */ bne $t9, $t0, .L8083AFF4 /* 08DBC 8083AFCC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 08DC0 8083AFD0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 08DC4 8083AFD4 2405044C */ addiu $a1, $zero, 0x044C ## $a1 = 0000044C /* 08DC8 8083AFD8 2406FF9B */ addiu $a2, $zero, 0xFF9B ## $a2 = FFFFFF9B /* 08DCC 8083AFDC 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 08DD0 8083AFE0 0C02003E */ jal func_800800F8 -/* 08DD4 8083AFE4 AFA00010 */ sw $zero, 0x0010($sp) -/* 08DD8 8083AFE8 8FA90034 */ lw $t1, 0x0034($sp) -/* 08DDC 8083AFEC 10000003 */ beq $zero, $zero, .L8083AFFC +/* 08DD0 8083AFE0 0C02003E */ jal func_800800F8 +/* 08DD4 8083AFE4 AFA00010 */ sw $zero, 0x0010($sp) +/* 08DD8 8083AFE8 8FA90034 */ lw $t1, 0x0034($sp) +/* 08DDC 8083AFEC 10000003 */ beq $zero, $zero, .L8083AFFC /* 08DE0 8083AFF0 A522046C */ sh $v0, 0x046C($t1) ## 0000046C .L8083AFF4: -/* 08DE4 8083AFF4 0C20D7A9 */ jal func_80835EA4 +/* 08DE4 8083AFF4 0C20D7A9 */ jal func_80835EA4 /* 08DE8 8083AFF8 2405000A */ addiu $a1, $zero, 0x000A ## $a1 = 0000000A .L8083AFFC: -/* 08DEC 8083AFFC 8FBF0024 */ lw $ra, 0x0024($sp) -/* 08DF0 8083B000 8FB00020 */ lw $s0, 0x0020($sp) +/* 08DEC 8083AFFC 8FBF0024 */ lw $ra, 0x0024($sp) +/* 08DF0 8083B000 8FB00020 */ lw $s0, 0x0020($sp) /* 08DF4 8083B004 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 08DF8 8083B008 03E00008 */ jr $ra +/* 08DF8 8083B008 03E00008 */ jr $ra /* 08DFC 8083B00C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083BC04.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083BC04.s index 649d9333fa..a18c440088 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083BC04.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083BC04.s @@ -1,33 +1,33 @@ glabel func_8083BC04 /* 099F4 8083BC04 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 099F8 8083BC08 AFA40018 */ sw $a0, 0x0018($sp) -/* 099FC 8083BC0C AFBF0014 */ sw $ra, 0x0014($sp) -/* 09A00 8083BC10 AFA5001C */ sw $a1, 0x001C($sp) +/* 099F8 8083BC08 AFA40018 */ sw $a0, 0x0018($sp) +/* 099FC 8083BC0C AFBF0014 */ sw $ra, 0x0014($sp) +/* 09A00 8083BC10 AFA5001C */ sw $a1, 0x001C($sp) /* 09A04 8083BC14 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 /* 09A08 8083BC18 3C068084 */ lui $a2, %hi(func_80844708) ## $a2 = 80840000 /* 09A0C 8083BC1C 24C64708 */ addiu $a2, $a2, %lo(func_80844708) ## $a2 = 80844708 -/* 09A10 8083BC20 8FA50018 */ lw $a1, 0x0018($sp) -/* 09A14 8083BC24 0C20D716 */ jal func_80835C58 +/* 09A10 8083BC20 8FA50018 */ lw $a1, 0x0018($sp) +/* 09A14 8083BC24 0C20D716 */ jal func_80835C58 /* 09A18 8083BC28 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 /* 09A1C 8083BC2C 3C013FA0 */ lui $at, 0x3FA0 ## $at = 3FA00000 /* 09A20 8083BC30 44812000 */ mtc1 $at, $f4 ## $f4 = 1.25 /* 09A24 8083BC34 3C018085 */ lui $at, %hi(D_808535E8) ## $at = 80850000 -/* 09A28 8083BC38 C42635E8 */ lwc1 $f6, %lo(D_808535E8)($at) -/* 09A2C 8083BC3C 8FA20018 */ lw $v0, 0x0018($sp) +/* 09A28 8083BC38 C42635E8 */ lwc1 $f6, %lo(D_808535E8)($at) +/* 09A2C 8083BC3C 8FA20018 */ lw $v0, 0x0018($sp) /* 09A30 8083BC40 3C068085 */ lui $a2, %hi(D_80853A94) ## $a2 = 80850000 -/* 09A34 8083BC44 46062202 */ mul.s $f8, $f4, $f6 +/* 09A34 8083BC44 46062202 */ mul.s $f8, $f4, $f6 /* 09A38 8083BC48 904E015B */ lbu $t6, 0x015B($v0) ## 0000015B -/* 09A3C 8083BC4C 8FA4001C */ lw $a0, 0x001C($sp) +/* 09A3C 8083BC4C 8FA4001C */ lw $a0, 0x001C($sp) /* 09A40 8083BC50 244501B4 */ addiu $a1, $v0, 0x01B4 ## $a1 = 000001B4 -/* 09A44 8083BC54 000E7880 */ sll $t7, $t6, 2 -/* 09A48 8083BC58 00CF3021 */ addu $a2, $a2, $t7 -/* 09A4C 8083BC5C 8CC63A94 */ lw $a2, %lo(D_80853A94)($a2) -/* 09A50 8083BC60 44074000 */ mfc1 $a3, $f8 -/* 09A54 8083BC64 0C029037 */ jal func_800A40DC +/* 09A44 8083BC54 000E7880 */ sll $t7, $t6, 2 +/* 09A48 8083BC58 00CF3021 */ addu $a2, $a2, $t7 +/* 09A4C 8083BC5C 8CC63A94 */ lw $a2, %lo(D_80853A94)($a2) +/* 09A50 8083BC60 44074000 */ mfc1 $a3, $f8 +/* 09A54 8083BC64 0C029037 */ jal SkelAnime_ChangeLinkAnimPlaybackStop /* 09A58 8083BC68 00000000 */ nop -/* 09A5C 8083BC6C 8FBF0014 */ lw $ra, 0x0014($sp) +/* 09A5C 8083BC6C 8FBF0014 */ lw $ra, 0x0014($sp) /* 09A60 8083BC70 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 09A64 8083BC74 03E00008 */ jr $ra +/* 09A64 8083BC74 03E00008 */ jr $ra /* 09A68 8083BC78 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083BF50.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083BF50.s index 05ceb2df97..09cc6fa8f6 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083BF50.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083BF50.s @@ -1,99 +1,99 @@ glabel func_8083BF50 /* 09D40 8083BF50 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 09D44 8083BF54 AFBF002C */ sw $ra, 0x002C($sp) -/* 09D48 8083BF58 AFB00028 */ sw $s0, 0x0028($sp) -/* 09D4C 8083BF5C AFA5003C */ sw $a1, 0x003C($sp) +/* 09D44 8083BF54 AFBF002C */ sw $ra, 0x002C($sp) +/* 09D48 8083BF58 AFB00028 */ sw $s0, 0x0028($sp) +/* 09D4C 8083BF5C AFA5003C */ sw $a1, 0x003C($sp) /* 09D50 8083BF60 3C014040 */ lui $at, 0x4040 ## $at = 40400000 /* 09D54 8083BF64 44813000 */ mtc1 $at, $f6 ## $f6 = 3.00 /* 09D58 8083BF68 C4840868 */ lwc1 $f4, 0x0868($a0) ## 00000868 /* 09D5C 8083BF6C 44801000 */ mtc1 $zero, $f2 ## $f2 = 0.00 /* 09D60 8083BF70 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 09D64 8083BF74 46062001 */ sub.s $f0, $f4, $f6 +/* 09D64 8083BF74 46062001 */ sub.s $f0, $f4, $f6 /* 09D68 8083BF78 3C0141E8 */ lui $at, 0x41E8 ## $at = 41E80000 -/* 09D6C 8083BF7C 4602003C */ c.lt.s $f0, $f2 +/* 09D6C 8083BF7C 4602003C */ c.lt.s $f0, $f2 /* 09D70 8083BF80 00000000 */ nop -/* 09D74 8083BF84 45020005 */ bc1fl .L8083BF9C +/* 09D74 8083BF84 45020005 */ bc1fl .L8083BF9C /* 09D78 8083BF88 3C014160 */ lui $at, 0x4160 ## $at = 41600000 /* 09D7C 8083BF8C 44814000 */ mtc1 $at, $f8 ## $f8 = 14.00 /* 09D80 8083BF90 00000000 */ nop -/* 09D84 8083BF94 46080000 */ add.s $f0, $f0, $f8 +/* 09D84 8083BF94 46080000 */ add.s $f0, $f0, $f8 /* 09D88 8083BF98 3C014160 */ lui $at, 0x4160 ## $at = 41600000 .L8083BF9C: /* 09D8C 8083BF9C 44815000 */ mtc1 $at, $f10 ## $f10 = 14.00 /* 09D90 8083BFA0 3C0141D0 */ lui $at, 0x41D0 ## $at = 41D00000 -/* 09D94 8083BFA4 460A003C */ c.lt.s $f0, $f10 +/* 09D94 8083BFA4 460A003C */ c.lt.s $f0, $f10 /* 09D98 8083BFA8 00000000 */ nop -/* 09D9C 8083BFAC 45020014 */ bc1fl .L8083C000 +/* 09D9C 8083BFAC 45020014 */ bc1fl .L8083C000 /* 09DA0 8083BFB0 44812000 */ mtc1 $at, $f4 ## $f4 = 26.00 /* 09DA4 8083BFB4 3C014130 */ lui $at, 0x4130 ## $at = 41300000 /* 09DA8 8083BFB8 44816000 */ mtc1 $at, $f12 ## $f12 = 11.00 /* 09DAC 8083BFBC 920E015B */ lbu $t6, 0x015B($s0) ## 0000015B /* 09DB0 8083BFC0 3C068085 */ lui $a2, %hi(D_80853AC4) ## $a2 = 80850000 -/* 09DB4 8083BFC4 46006001 */ sub.s $f0, $f12, $f0 -/* 09DB8 8083BFC8 000E7880 */ sll $t7, $t6, 2 -/* 09DBC 8083BFCC 00CF3021 */ addu $a2, $a2, $t7 -/* 09DC0 8083BFD0 8CC63AC4 */ lw $a2, %lo(D_80853AC4)($a2) -/* 09DC4 8083BFD4 4602003C */ c.lt.s $f0, $f2 +/* 09DB4 8083BFC4 46006001 */ sub.s $f0, $f12, $f0 +/* 09DB8 8083BFC8 000E7880 */ sll $t7, $t6, 2 +/* 09DBC 8083BFCC 00CF3021 */ addu $a2, $a2, $t7 +/* 09DC0 8083BFD0 8CC63AC4 */ lw $a2, %lo(D_80853AC4)($a2) +/* 09DC4 8083BFD4 4602003C */ c.lt.s $f0, $f2 /* 09DC8 8083BFD8 3C013FB0 */ lui $at, 0x3FB0 ## $at = 3FB00000 -/* 09DCC 8083BFDC 45000005 */ bc1f .L8083BFF4 +/* 09DCC 8083BFDC 45000005 */ bc1f .L8083BFF4 /* 09DD0 8083BFE0 00000000 */ nop /* 09DD4 8083BFE4 44819000 */ mtc1 $at, $f18 ## $f18 = 1.38 -/* 09DD8 8083BFE8 46000407 */ neg.s $f16, $f0 -/* 09DDC 8083BFEC 46128002 */ mul.s $f0, $f16, $f18 +/* 09DD8 8083BFE8 46000407 */ neg.s $f16, $f0 +/* 09DDC 8083BFEC 46128002 */ mul.s $f0, $f16, $f18 /* 09DE0 8083BFF0 00000000 */ nop .L8083BFF4: -/* 09DE4 8083BFF4 10000014 */ beq $zero, $zero, .L8083C048 -/* 09DE8 8083BFF8 460C0003 */ div.s $f0, $f0, $f12 +/* 09DE4 8083BFF4 10000014 */ beq $zero, $zero, .L8083C048 +/* 09DE8 8083BFF8 460C0003 */ div.s $f0, $f0, $f12 /* 09DEC 8083BFFC 44812000 */ mtc1 $at, $f4 ## $f4 = 1.38 .L8083C000: /* 09DF0 8083C000 9218015B */ lbu $t8, 0x015B($s0) ## 0000015B /* 09DF4 8083C004 3C068085 */ lui $a2, %hi(D_80853ADC) ## $a2 = 80850000 -/* 09DF8 8083C008 46002001 */ sub.s $f0, $f4, $f0 -/* 09DFC 8083C00C 0018C880 */ sll $t9, $t8, 2 -/* 09E00 8083C010 00D93021 */ addu $a2, $a2, $t9 -/* 09E04 8083C014 8CC63ADC */ lw $a2, %lo(D_80853ADC)($a2) -/* 09E08 8083C018 4602003C */ c.lt.s $f0, $f2 +/* 09DF8 8083C008 46002001 */ sub.s $f0, $f4, $f0 +/* 09DFC 8083C00C 0018C880 */ sll $t9, $t8, 2 +/* 09E00 8083C010 00D93021 */ addu $a2, $a2, $t9 +/* 09E04 8083C014 8CC63ADC */ lw $a2, %lo(D_80853ADC)($a2) +/* 09E08 8083C018 4602003C */ c.lt.s $f0, $f2 /* 09E0C 8083C01C 3C014000 */ lui $at, 0x4000 ## $at = 40000000 -/* 09E10 8083C020 45020006 */ bc1fl .L8083C03C +/* 09E10 8083C020 45020006 */ bc1fl .L8083C03C /* 09E14 8083C024 3C014140 */ lui $at, 0x4140 ## $at = 41400000 /* 09E18 8083C028 44814000 */ mtc1 $at, $f8 ## $f8 = 12.00 -/* 09E1C 8083C02C 46000187 */ neg.s $f6, $f0 -/* 09E20 8083C030 46083002 */ mul.s $f0, $f6, $f8 +/* 09E1C 8083C02C 46000187 */ neg.s $f6, $f0 +/* 09E20 8083C030 46083002 */ mul.s $f0, $f6, $f8 /* 09E24 8083C034 00000000 */ nop /* 09E28 8083C038 3C014140 */ lui $at, 0x4140 ## $at = 41400000 .L8083C03C: /* 09E2C 8083C03C 44815000 */ mtc1 $at, $f10 ## $f10 = 12.00 /* 09E30 8083C040 00000000 */ nop -/* 09E34 8083C044 460A0003 */ div.s $f0, $f0, $f10 +/* 09E34 8083C044 460A0003 */ div.s $f0, $f0, $f10 .L8083C048: /* 09E38 8083C048 00C02025 */ or $a0, $a2, $zero ## $a0 = 80850000 -/* 09E3C 8083C04C AFA60034 */ sw $a2, 0x0034($sp) +/* 09E3C 8083C04C AFA60034 */ sw $a2, 0x0034($sp) /* 09E40 8083C050 0C028800 */ jal SkelAnime_GetFrameCount - -/* 09E44 8083C054 E7A00030 */ swc1 $f0, 0x0030($sp) -/* 09E48 8083C058 C7B20030 */ lwc1 $f18, 0x0030($sp) + +/* 09E44 8083C054 E7A00030 */ swc1 $f0, 0x0030($sp) +/* 09E48 8083C058 C7B20030 */ lwc1 $f18, 0x0030($sp) /* 09E4C 8083C05C 44828000 */ mtc1 $v0, $f16 ## $f16 = 0.00 /* 09E50 8083C060 44807000 */ mtc1 $zero, $f14 ## $f14 = 0.00 /* 09E54 8083C064 3C014080 */ lui $at, 0x4080 ## $at = 40800000 -/* 09E58 8083C068 46808420 */ cvt.s.w $f16, $f16 +/* 09E58 8083C068 46808420 */ cvt.s.w $f16, $f16 /* 09E5C 8083C06C 44816000 */ mtc1 $at, $f12 ## $f12 = 4.00 /* 09E60 8083C070 24080002 */ addiu $t0, $zero, 0x0002 ## $t0 = 00000002 -/* 09E64 8083C074 8FA60034 */ lw $a2, 0x0034($sp) -/* 09E68 8083C078 46126482 */ mul.s $f18, $f12, $f18 -/* 09E6C 8083C07C E7AE0010 */ swc1 $f14, 0x0010($sp) -/* 09E70 8083C080 8FA4003C */ lw $a0, 0x003C($sp) +/* 09E64 8083C074 8FA60034 */ lw $a2, 0x0034($sp) +/* 09E68 8083C078 46126482 */ mul.s $f18, $f12, $f18 +/* 09E6C 8083C07C E7AE0010 */ swc1 $f14, 0x0010($sp) +/* 09E70 8083C080 8FA4003C */ lw $a0, 0x003C($sp) /* 09E74 8083C084 260501B4 */ addiu $a1, $s0, 0x01B4 ## $a1 = 000001B4 /* 09E78 8083C088 3C073F80 */ lui $a3, 0x3F80 ## $a3 = 3F800000 -/* 09E7C 8083C08C E7B00014 */ swc1 $f16, 0x0014($sp) -/* 09E80 8083C090 AFA80018 */ sw $t0, 0x0018($sp) -/* 09E84 8083C094 0C028FC2 */ jal func_800A3F08 -/* 09E88 8083C098 E7B2001C */ swc1 $f18, 0x001C($sp) +/* 09E7C 8083C08C E7B00014 */ swc1 $f16, 0x0014($sp) +/* 09E80 8083C090 AFA80018 */ sw $t0, 0x0018($sp) +/* 09E84 8083C094 0C028FC2 */ jal SkelAnime_ChangeLinkAnim +/* 09E88 8083C098 E7B2001C */ swc1 $f18, 0x001C($sp) /* 09E8C 8083C09C 860900B6 */ lh $t1, 0x00B6($s0) ## 000000B6 /* 09E90 8083C0A0 A609083C */ sh $t1, 0x083C($s0) ## 0000083C -/* 09E94 8083C0A4 8FBF002C */ lw $ra, 0x002C($sp) -/* 09E98 8083C0A8 8FB00028 */ lw $s0, 0x0028($sp) +/* 09E94 8083C0A4 8FBF002C */ lw $ra, 0x002C($sp) +/* 09E98 8083C0A8 8FB00028 */ lw $s0, 0x0028($sp) /* 09E9C 8083C0AC 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 -/* 09EA0 8083C0B0 03E00008 */ jr $ra +/* 09EA0 8083C0B0 03E00008 */ jr $ra /* 09EA4 8083C0B4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083C2B0.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083C2B0.s index b981cc4f2c..82c6dc20f4 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083C2B0.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083C2B0.s @@ -1,87 +1,87 @@ glabel func_8083C2B0 /* 0A0A0 8083C2B0 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 /* 0A0A4 8083C2B4 3C0F0001 */ lui $t7, 0x0001 ## $t7 = 00010000 -/* 0A0A8 8083C2B8 AFBF002C */ sw $ra, 0x002C($sp) -/* 0A0AC 8083C2BC AFB00028 */ sw $s0, 0x0028($sp) -/* 0A0B0 8083C2C0 AFA5003C */ sw $a1, 0x003C($sp) -/* 0A0B4 8083C2C4 01E57821 */ addu $t7, $t7, $a1 +/* 0A0A8 8083C2B8 AFBF002C */ sw $ra, 0x002C($sp) +/* 0A0AC 8083C2BC AFB00028 */ sw $s0, 0x0028($sp) +/* 0A0B0 8083C2C0 AFA5003C */ sw $a1, 0x003C($sp) +/* 0A0B4 8083C2C4 01E57821 */ addu $t7, $t7, $a1 /* 0A0B8 8083C2C8 81EF1E5C */ lb $t7, 0x1E5C($t7) ## 00011E5C /* 0A0BC 8083C2CC 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 0A0C0 8083C2D0 55E00067 */ bnel $t7, $zero, .L8083C470 +/* 0A0C0 8083C2D0 55E00067 */ bnel $t7, $zero, .L8083C470 /* 0A0C4 8083C2D4 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 /* 0A0C8 8083C2D8 8098014E */ lb $t8, 0x014E($a0) ## 0000014E /* 0A0CC 8083C2DC 3C198086 */ lui $t9, %hi(D_80858AB4) ## $t9 = 80860000 -/* 0A0D0 8083C2E0 53000063 */ beql $t8, $zero, .L8083C470 +/* 0A0D0 8083C2E0 53000063 */ beql $t8, $zero, .L8083C470 /* 0A0D4 8083C2E4 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 0A0D8 8083C2E8 8F398AB4 */ lw $t9, %lo(D_80858AB4)($t9) +/* 0A0D8 8083C2E8 8F398AB4 */ lw $t9, %lo(D_80858AB4)($t9) /* 0A0DC 8083C2EC 2401FFEF */ addiu $at, $zero, 0xFFEF ## $at = FFFFFFEF /* 0A0E0 8083C2F0 97280000 */ lhu $t0, 0x0000($t9) ## 80860000 -/* 0A0E4 8083C2F4 01014827 */ nor $t1, $t0, $at -/* 0A0E8 8083C2F8 5520005D */ bnel $t1, $zero, .L8083C470 +/* 0A0E4 8083C2F4 01014827 */ nor $t1, $t0, $at +/* 0A0E8 8083C2F8 5520005D */ bnel $t1, $zero, .L8083C470 /* 0A0EC 8083C2FC 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 0A0F0 8083C300 0C023A74 */ jal func_8008E9D0 +/* 0A0F0 8083C300 0C023A74 */ jal func_8008E9D0 /* 0A0F4 8083C304 00000000 */ nop -/* 0A0F8 8083C308 14400008 */ bne $v0, $zero, .L8083C32C +/* 0A0F8 8083C308 14400008 */ bne $v0, $zero, .L8083C32C /* 0A0FC 8083C30C 00000000 */ nop -/* 0A100 8083C310 0C20CECB */ jal func_80833B2C +/* 0A100 8083C310 0C20CECB */ jal func_80833B2C /* 0A104 8083C314 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0A108 8083C318 54400055 */ bnel $v0, $zero, .L8083C470 +/* 0A108 8083C318 54400055 */ bnel $v0, $zero, .L8083C470 /* 0A10C 8083C31C 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 /* 0A110 8083C320 8E0A0664 */ lw $t2, 0x0664($s0) ## 00000664 -/* 0A114 8083C324 55400052 */ bnel $t2, $zero, .L8083C470 +/* 0A114 8083C324 55400052 */ bnel $t2, $zero, .L8083C470 /* 0A118 8083C328 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 .L8083C32C: -/* 0A11C 8083C32C 0C20C8C6 */ jal func_80832318 +/* 0A11C 8083C32C 0C20C8C6 */ jal func_80832318 /* 0A120 8083C330 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0A124 8083C334 8FA4003C */ lw $a0, 0x003C($sp) -/* 0A128 8083C338 0C20C8ED */ jal func_808323B4 +/* 0A124 8083C334 8FA4003C */ lw $a0, 0x003C($sp) +/* 0A128 8083C338 0C20C8ED */ jal func_808323B4 /* 0A12C 8083C33C 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 0A130 8083C340 3C068084 */ lui $a2, %hi(func_80843188) ## $a2 = 80840000 /* 0A134 8083C344 24C63188 */ addiu $a2, $a2, %lo(func_80843188) ## $a2 = 80843188 -/* 0A138 8083C348 8FA4003C */ lw $a0, 0x003C($sp) +/* 0A138 8083C348 8FA4003C */ lw $a0, 0x003C($sp) /* 0A13C 8083C34C 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 0A140 8083C350 0C20D716 */ jal func_80835C58 +/* 0A140 8083C350 0C20D716 */ jal func_80835C58 /* 0A144 8083C354 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 0A148 8083C358 10400042 */ beq $v0, $zero, .L8083C464 +/* 0A148 8083C358 10400042 */ beq $v0, $zero, .L8083C464 /* 0A14C 8083C35C 00000000 */ nop /* 0A150 8083C360 8E0B067C */ lw $t3, 0x067C($s0) ## 0000067C /* 0A154 8083C364 3C010040 */ lui $at, 0x0040 ## $at = 00400000 /* 0A158 8083C368 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 0A15C 8083C36C 01616025 */ or $t4, $t3, $at ## $t4 = 00400000 -/* 0A160 8083C370 0C023A74 */ jal func_8008E9D0 +/* 0A160 8083C370 0C023A74 */ jal func_8008E9D0 /* 0A164 8083C374 AE0C067C */ sw $t4, 0x067C($s0) ## 0000067C -/* 0A168 8083C378 14400009 */ bne $v0, $zero, .L8083C3A0 +/* 0A168 8083C378 14400009 */ bne $v0, $zero, .L8083C3A0 /* 0A16C 8083C37C 3C060400 */ lui $a2, 0x0400 ## $a2 = 04000000 -/* 0A170 8083C380 0C023A90 */ jal func_8008EA40 +/* 0A170 8083C380 0C023A90 */ jal func_8008EA40 /* 0A174 8083C384 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 0A178 8083C388 920D015B */ lbu $t5, 0x015B($s0) ## 0000015B /* 0A17C 8083C38C 3C068085 */ lui $a2, %hi(D_80853AF4) ## $a2 = 80850000 -/* 0A180 8083C390 000D7080 */ sll $t6, $t5, 2 -/* 0A184 8083C394 00CE3021 */ addu $a2, $a2, $t6 -/* 0A188 8083C398 10000002 */ beq $zero, $zero, .L8083C3A4 -/* 0A18C 8083C39C 8CC63AF4 */ lw $a2, %lo(D_80853AF4)($a2) +/* 0A180 8083C390 000D7080 */ sll $t6, $t5, 2 +/* 0A184 8083C394 00CE3021 */ addu $a2, $a2, $t6 +/* 0A188 8083C398 10000002 */ beq $zero, $zero, .L8083C3A4 +/* 0A18C 8083C39C 8CC63AF4 */ lw $a2, %lo(D_80853AF4)($a2) .L8083C3A0: /* 0A190 8083C3A0 24C62400 */ addiu $a2, $a2, 0x2400 ## $a2 = 80852400 .L8083C3A4: /* 0A194 8083C3A4 8E0F01BC */ lw $t7, 0x01BC($s0) ## 000001BC /* 0A198 8083C3A8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0A19C 8083C3AC 50CF0014 */ beql $a2, $t7, .L8083C400 +/* 0A19C 8083C3AC 50CF0014 */ beql $a2, $t7, .L8083C400 /* 0A1A0 8083C3B0 00C02025 */ or $a0, $a2, $zero ## $a0 = 80852400 -/* 0A1A4 8083C3B4 0C023A71 */ jal func_8008E9C4 -/* 0A1A8 8083C3B8 AFA60034 */ sw $a2, 0x0034($sp) -/* 0A1AC 8083C3BC 10400005 */ beq $v0, $zero, .L8083C3D4 -/* 0A1B0 8083C3C0 8FA60034 */ lw $a2, 0x0034($sp) +/* 0A1A4 8083C3B4 0C023A71 */ jal func_8008E9C4 +/* 0A1A8 8083C3B8 AFA60034 */ sw $a2, 0x0034($sp) +/* 0A1AC 8083C3BC 10400005 */ beq $v0, $zero, .L8083C3D4 +/* 0A1B0 8083C3C0 8FA60034 */ lw $a2, 0x0034($sp) /* 0A1B4 8083C3C4 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 /* 0A1B8 8083C3C8 44812000 */ mtc1 $at, $f4 ## $f4 = 1.00 -/* 0A1BC 8083C3CC 10000007 */ beq $zero, $zero, .L8083C3EC +/* 0A1BC 8083C3CC 10000007 */ beq $zero, $zero, .L8083C3EC /* 0A1C0 8083C3D0 E604086C */ swc1 $f4, 0x086C($s0) ## 0000086C .L8083C3D4: /* 0A1C4 8083C3D4 44803000 */ mtc1 $zero, $f6 ## $f6 = 0.00 /* 0A1C8 8083C3D8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 0A1CC 8083C3DC E606086C */ swc1 $f6, 0x086C($s0) ## 0000086C -/* 0A1D0 8083C3E0 0C20CF0F */ jal func_80833C3C -/* 0A1D4 8083C3E4 AFA60034 */ sw $a2, 0x0034($sp) -/* 0A1D8 8083C3E8 8FA60034 */ lw $a2, 0x0034($sp) +/* 0A1D0 8083C3E0 0C20CF0F */ jal func_80833C3C +/* 0A1D4 8083C3E4 AFA60034 */ sw $a2, 0x0034($sp) +/* 0A1D8 8083C3E8 8FA60034 */ lw $a2, 0x0034($sp) .L8083C3EC: /* 0A1DC 8083C3EC A60006C0 */ sh $zero, 0x06C0($s0) ## 000006C0 /* 0A1E0 8083C3F0 860206C0 */ lh $v0, 0x06C0($s0) ## 000006C0 @@ -90,41 +90,41 @@ glabel func_8083C2B0 /* 0A1EC 8083C3FC 00C02025 */ or $a0, $a2, $zero ## $a0 = 00000000 .L8083C400: /* 0A1F0 8083C400 0C028800 */ jal SkelAnime_GetFrameCount - -/* 0A1F4 8083C404 AFA60034 */ sw $a2, 0x0034($sp) + +/* 0A1F4 8083C404 AFA60034 */ sw $a2, 0x0034($sp) /* 0A1F8 8083C408 44824000 */ mtc1 $v0, $f8 ## $f8 = 0.00 /* 0A1FC 8083C40C 44805000 */ mtc1 $zero, $f10 ## $f10 = 0.00 /* 0A200 8083C410 24180002 */ addiu $t8, $zero, 0x0002 ## $t8 = 00000002 -/* 0A204 8083C414 46804020 */ cvt.s.w $f0, $f8 -/* 0A208 8083C418 8FA60034 */ lw $a2, 0x0034($sp) -/* 0A20C 8083C41C AFB80018 */ sw $t8, 0x0018($sp) -/* 0A210 8083C420 8FA4003C */ lw $a0, 0x003C($sp) +/* 0A204 8083C414 46804020 */ cvt.s.w $f0, $f8 +/* 0A208 8083C418 8FA60034 */ lw $a2, 0x0034($sp) +/* 0A20C 8083C41C AFB80018 */ sw $t8, 0x0018($sp) +/* 0A210 8083C420 8FA4003C */ lw $a0, 0x003C($sp) /* 0A214 8083C424 260501B4 */ addiu $a1, $s0, 0x01B4 ## $a1 = 000001B4 /* 0A218 8083C428 3C073F80 */ lui $a3, 0x3F80 ## $a3 = 3F800000 -/* 0A21C 8083C42C E7A00010 */ swc1 $f0, 0x0010($sp) -/* 0A220 8083C430 E7A00014 */ swc1 $f0, 0x0014($sp) -/* 0A224 8083C434 0C028FC2 */ jal func_800A3F08 -/* 0A228 8083C438 E7AA001C */ swc1 $f10, 0x001C($sp) -/* 0A22C 8083C43C 0C023A74 */ jal func_8008E9D0 +/* 0A21C 8083C42C E7A00010 */ swc1 $f0, 0x0010($sp) +/* 0A220 8083C430 E7A00014 */ swc1 $f0, 0x0014($sp) +/* 0A224 8083C434 0C028FC2 */ jal SkelAnime_ChangeLinkAnim +/* 0A228 8083C438 E7AA001C */ swc1 $f10, 0x001C($sp) +/* 0A22C 8083C43C 0C023A74 */ jal func_8008E9D0 /* 0A230 8083C440 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0A234 8083C444 10400004 */ beq $v0, $zero, .L8083C458 -/* 0A238 8083C448 8FA4003C */ lw $a0, 0x003C($sp) +/* 0A234 8083C444 10400004 */ beq $v0, $zero, .L8083C458 +/* 0A238 8083C448 8FA4003C */ lw $a0, 0x003C($sp) /* 0A23C 8083C44C 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 0A240 8083C450 0C20CBD5 */ jal func_80832F54 +/* 0A240 8083C450 0C20CBD5 */ jal func_80832F54 /* 0A244 8083C454 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 .L8083C458: /* 0A248 8083C458 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0A24C 8083C45C 0C00BDF7 */ jal func_8002F7DC +/* 0A24C 8083C45C 0C00BDF7 */ jal func_8002F7DC /* 0A250 8083C460 2405181F */ addiu $a1, $zero, 0x181F ## $a1 = 0000181F .L8083C464: -/* 0A254 8083C464 10000002 */ beq $zero, $zero, .L8083C470 +/* 0A254 8083C464 10000002 */ beq $zero, $zero, .L8083C470 /* 0A258 8083C468 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 /* 0A25C 8083C46C 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 .L8083C470: -/* 0A260 8083C470 8FBF002C */ lw $ra, 0x002C($sp) -/* 0A264 8083C474 8FB00028 */ lw $s0, 0x0028($sp) +/* 0A260 8083C470 8FBF002C */ lw $ra, 0x002C($sp) +/* 0A264 8083C474 8FB00028 */ lw $s0, 0x0028($sp) /* 0A268 8083C478 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 -/* 0A26C 8083C47C 03E00008 */ jr $ra +/* 0A26C 8083C47C 03E00008 */ jr $ra /* 0A270 8083C480 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083CBF0.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083CBF0.s index 5bf0b02324..a4124bb6ca 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083CBF0.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083CBF0.s @@ -1,47 +1,47 @@ glabel func_8083CBF0 /* 0A9E0 8083CBF0 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 0A9E4 8083CBF4 AFA40028 */ sw $a0, 0x0028($sp) -/* 0A9E8 8083CBF8 AFA60030 */ sw $a2, 0x0030($sp) +/* 0A9E4 8083CBF4 AFA40028 */ sw $a0, 0x0028($sp) +/* 0A9E8 8083CBF8 AFA60030 */ sw $a2, 0x0030($sp) /* 0A9EC 8083CBFC 00C02025 */ or $a0, $a2, $zero ## $a0 = 00000000 -/* 0A9F0 8083CC00 AFBF0024 */ sw $ra, 0x0024($sp) -/* 0A9F4 8083CC04 AFA5002C */ sw $a1, 0x002C($sp) +/* 0A9F0 8083CC00 AFBF0024 */ sw $ra, 0x0024($sp) +/* 0A9F4 8083CC04 AFA5002C */ sw $a1, 0x002C($sp) /* 0A9F8 8083CC08 3C068084 */ lui $a2, %hi(func_808423EC) ## $a2 = 80840000 /* 0A9FC 8083CC0C 24C623EC */ addiu $a2, $a2, %lo(func_808423EC) ## $a2 = 808423EC -/* 0AA00 8083CC10 8FA50028 */ lw $a1, 0x0028($sp) -/* 0AA04 8083CC14 0C20D716 */ jal func_80835C58 +/* 0AA00 8083CC10 8FA50028 */ lw $a1, 0x0028($sp) +/* 0AA04 8083CC14 0C20D716 */ jal func_80835C58 /* 0AA08 8083CC18 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 /* 0AA0C 8083CC1C 3C040400 */ lui $a0, 0x0400 ## $a0 = 04000000 /* 0AA10 8083CC20 0C028800 */ jal SkelAnime_GetFrameCount - + /* 0AA14 8083CC24 248424F8 */ addiu $a0, $a0, 0x24F8 ## $a0 = 040024F8 /* 0AA18 8083CC28 44823000 */ mtc1 $v0, $f6 ## $f6 = 0.00 /* 0AA1C 8083CC2C 3C01C0C0 */ lui $at, 0xC0C0 ## $at = C0C00000 /* 0AA20 8083CC30 44815000 */ mtc1 $at, $f10 ## $f10 = -6.00 -/* 0AA24 8083CC34 46803220 */ cvt.s.w $f8, $f6 -/* 0AA28 8083CC38 8FA50028 */ lw $a1, 0x0028($sp) +/* 0AA24 8083CC34 46803220 */ cvt.s.w $f8, $f6 +/* 0AA28 8083CC38 8FA50028 */ lw $a1, 0x0028($sp) /* 0AA2C 8083CC3C 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 /* 0AA30 8083CC40 3C060400 */ lui $a2, 0x0400 ## $a2 = 04000000 /* 0AA34 8083CC44 3C07400C */ lui $a3, 0x400C ## $a3 = 400C0000 /* 0AA38 8083CC48 240E0002 */ addiu $t6, $zero, 0x0002 ## $t6 = 00000002 -/* 0AA3C 8083CC4C AFAE0018 */ sw $t6, 0x0018($sp) +/* 0AA3C 8083CC4C AFAE0018 */ sw $t6, 0x0018($sp) /* 0AA40 8083CC50 34E7CCCD */ ori $a3, $a3, 0xCCCD ## $a3 = 400CCCCD /* 0AA44 8083CC54 24C624F8 */ addiu $a2, $a2, 0x24F8 ## $a2 = 040024F8 -/* 0AA48 8083CC58 E7A80014 */ swc1 $f8, 0x0014($sp) -/* 0AA4C 8083CC5C 8FA40030 */ lw $a0, 0x0030($sp) -/* 0AA50 8083CC60 E7AA001C */ swc1 $f10, 0x001C($sp) +/* 0AA48 8083CC58 E7A80014 */ swc1 $f8, 0x0014($sp) +/* 0AA4C 8083CC5C 8FA40030 */ lw $a0, 0x0030($sp) +/* 0AA50 8083CC60 E7AA001C */ swc1 $f10, 0x001C($sp) /* 0AA54 8083CC64 24A501B4 */ addiu $a1, $a1, 0x01B4 ## $a1 = 000001B4 -/* 0AA58 8083CC68 0C028FC2 */ jal func_800A3F08 -/* 0AA5C 8083CC6C E7A40010 */ swc1 $f4, 0x0010($sp) +/* 0AA58 8083CC68 0C028FC2 */ jal SkelAnime_ChangeLinkAnim +/* 0AA5C 8083CC6C E7A40010 */ swc1 $f4, 0x0010($sp) /* 0AA60 8083CC70 3C014100 */ lui $at, 0x4100 ## $at = 41000000 /* 0AA64 8083CC74 44818000 */ mtc1 $at, $f16 ## $f16 = 8.00 -/* 0AA68 8083CC78 8FAF0028 */ lw $t7, 0x0028($sp) +/* 0AA68 8083CC78 8FAF0028 */ lw $t7, 0x0028($sp) /* 0AA6C 8083CC7C E5F00838 */ swc1 $f16, 0x0838($t7) ## 00000838 -/* 0AA70 8083CC80 8FB90028 */ lw $t9, 0x0028($sp) -/* 0AA74 8083CC84 87B8002E */ lh $t8, 0x002E($sp) +/* 0AA70 8083CC80 8FB90028 */ lw $t9, 0x0028($sp) +/* 0AA74 8083CC84 87B8002E */ lh $t8, 0x002E($sp) /* 0AA78 8083CC88 A738083C */ sh $t8, 0x083C($t9) ## 0000083C -/* 0AA7C 8083CC8C 8FBF0024 */ lw $ra, 0x0024($sp) +/* 0AA7C 8083CC8C 8FBF0024 */ lw $ra, 0x0024($sp) /* 0AA80 8083CC90 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 0AA84 8083CC94 03E00008 */ jr $ra +/* 0AA84 8083CC94 03E00008 */ jr $ra /* 0AA88 8083CC98 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083CD00.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083CD00.s index 50cc9268b4..3a4468ca0d 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083CD00.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083CD00.s @@ -1,24 +1,24 @@ glabel func_8083CD00 /* 0AAF0 8083CD00 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 0AAF4 8083CD04 AFA40018 */ sw $a0, 0x0018($sp) -/* 0AAF8 8083CD08 AFBF0014 */ sw $ra, 0x0014($sp) -/* 0AAFC 8083CD0C AFA5001C */ sw $a1, 0x001C($sp) +/* 0AAF4 8083CD04 AFA40018 */ sw $a0, 0x0018($sp) +/* 0AAF8 8083CD08 AFBF0014 */ sw $ra, 0x0014($sp) +/* 0AAFC 8083CD0C AFA5001C */ sw $a1, 0x001C($sp) /* 0AB00 8083CD10 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 /* 0AB04 8083CD14 3C068084 */ lui $a2, %hi(func_8084251C) ## $a2 = 80840000 /* 0AB08 8083CD18 24C6251C */ addiu $a2, $a2, %lo(func_8084251C) ## $a2 = 8084251C -/* 0AB0C 8083CD1C 8FA50018 */ lw $a1, 0x0018($sp) -/* 0AB10 8083CD20 0C20D716 */ jal func_80835C58 +/* 0AB0C 8083CD1C 8FA50018 */ lw $a1, 0x0018($sp) +/* 0AB10 8083CD20 0C20D716 */ jal func_80835C58 /* 0AB14 8083CD24 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 0AB18 8083CD28 8FA50018 */ lw $a1, 0x0018($sp) +/* 0AB18 8083CD28 8FA50018 */ lw $a1, 0x0018($sp) /* 0AB1C 8083CD2C 3C060400 */ lui $a2, 0x0400 ## $a2 = 04000000 /* 0AB20 8083CD30 24C624E8 */ addiu $a2, $a2, 0x24E8 ## $a2 = 040024E8 -/* 0AB24 8083CD34 8FA4001C */ lw $a0, 0x001C($sp) +/* 0AB24 8083CD34 8FA4001C */ lw $a0, 0x001C($sp) /* 0AB28 8083CD38 3C074000 */ lui $a3, 0x4000 ## $a3 = 40000000 -/* 0AB2C 8083CD3C 0C029037 */ jal func_800A40DC +/* 0AB2C 8083CD3C 0C029037 */ jal SkelAnime_ChangeLinkAnimPlaybackStop /* 0AB30 8083CD40 24A501B4 */ addiu $a1, $a1, 0x01B4 ## $a1 = 000001B4 -/* 0AB34 8083CD44 8FBF0014 */ lw $ra, 0x0014($sp) +/* 0AB34 8083CD44 8FBF0014 */ lw $ra, 0x0014($sp) /* 0AB38 8083CD48 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 0AB3C 8083CD4C 03E00008 */ jr $ra +/* 0AB3C 8083CD4C 03E00008 */ jr $ra /* 0AB40 8083CD50 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083CD54.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083CD54.s index db7b9fb641..2fe32f4682 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083CD54.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083CD54.s @@ -1,49 +1,49 @@ glabel func_8083CD54 /* 0AB44 8083CD54 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 0AB48 8083CD58 AFA60038 */ sw $a2, 0x0038($sp) -/* 0AB4C 8083CD5C 87AE003A */ lh $t6, 0x003A($sp) -/* 0AB50 8083CD60 AFBF002C */ sw $ra, 0x002C($sp) -/* 0AB54 8083CD64 AFB00028 */ sw $s0, 0x0028($sp) -/* 0AB58 8083CD68 AFA40030 */ sw $a0, 0x0030($sp) +/* 0AB48 8083CD58 AFA60038 */ sw $a2, 0x0038($sp) +/* 0AB4C 8083CD5C 87AE003A */ lh $t6, 0x003A($sp) +/* 0AB50 8083CD60 AFBF002C */ sw $ra, 0x002C($sp) +/* 0AB54 8083CD64 AFB00028 */ sw $s0, 0x0028($sp) +/* 0AB58 8083CD68 AFA40030 */ sw $a0, 0x0030($sp) /* 0AB5C 8083CD6C 3C068084 */ lui $a2, %hi(func_80841BA8) ## $a2 = 80840000 /* 0AB60 8083CD70 A4AE083C */ sh $t6, 0x083C($a1) ## 0000083C /* 0AB64 8083CD74 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 -/* 0AB68 8083CD78 8FA40030 */ lw $a0, 0x0030($sp) +/* 0AB68 8083CD78 8FA40030 */ lw $a0, 0x0030($sp) /* 0AB6C 8083CD7C 24C61BA8 */ addiu $a2, $a2, %lo(func_80841BA8) ## $a2 = 80841BA8 -/* 0AB70 8083CD80 0C20D716 */ jal func_80835C58 +/* 0AB70 8083CD80 0C20D716 */ jal func_80835C58 /* 0AB74 8083CD84 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 /* 0AB78 8083CD88 240F04B0 */ addiu $t7, $zero, 0x04B0 ## $t7 = 000004B0 /* 0AB7C 8083CD8C A60F087E */ sh $t7, 0x087E($s0) ## 0000087E /* 0AB80 8083CD90 8618087E */ lh $t8, 0x087E($s0) ## 0000087E /* 0AB84 8083CD94 3C018085 */ lui $at, %hi(D_808535E8) ## $at = 80850000 -/* 0AB88 8083CD98 C42835E8 */ lwc1 $f8, %lo(D_808535E8)($at) +/* 0AB88 8083CD98 C42835E8 */ lwc1 $f8, %lo(D_808535E8)($at) /* 0AB8C 8083CD9C 44982000 */ mtc1 $t8, $f4 ## $f4 = 0.00 /* 0AB90 8083CDA0 9209015B */ lbu $t1, 0x015B($s0) ## 0000015B /* 0AB94 8083CDA4 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 0AB98 8083CDA8 468021A0 */ cvt.s.w $f6, $f4 +/* 0AB98 8083CDA8 468021A0 */ cvt.s.w $f6, $f4 /* 0AB9C 8083CDAC 3C01C0C0 */ lui $at, 0xC0C0 ## $at = C0C00000 /* 0ABA0 8083CDB0 44819000 */ mtc1 $at, $f18 ## $f18 = -6.00 /* 0ABA4 8083CDB4 3C068085 */ lui $a2, %hi(D_80853B84) ## $a2 = 80850000 -/* 0ABA8 8083CDB8 00095080 */ sll $t2, $t1, 2 -/* 0ABAC 8083CDBC 00CA3021 */ addu $a2, $a2, $t2 -/* 0ABB0 8083CDC0 46083282 */ mul.s $f10, $f6, $f8 +/* 0ABA8 8083CDB8 00095080 */ sll $t2, $t1, 2 +/* 0ABAC 8083CDBC 00CA3021 */ addu $a2, $a2, $t2 +/* 0ABB0 8083CDC0 46083282 */ mul.s $f10, $f6, $f8 /* 0ABB4 8083CDC4 260501B4 */ addiu $a1, $s0, 0x01B4 ## $a1 = 000001B4 /* 0ABB8 8083CDC8 3C073F80 */ lui $a3, 0x3F80 ## $a3 = 3F800000 -/* 0ABBC 8083CDCC 4600540D */ trunc.w.s $f16, $f10 -/* 0ABC0 8083CDD0 44088000 */ mfc1 $t0, $f16 +/* 0ABBC 8083CDCC 4600540D */ trunc.w.s $f16, $f10 +/* 0ABC0 8083CDD0 44088000 */ mfc1 $t0, $f16 /* 0ABC4 8083CDD4 00000000 */ nop /* 0ABC8 8083CDD8 A608087E */ sh $t0, 0x087E($s0) ## 0000087E -/* 0ABCC 8083CDDC AFA00018 */ sw $zero, 0x0018($sp) -/* 0ABD0 8083CDE0 8CC63B84 */ lw $a2, %lo(D_80853B84)($a2) -/* 0ABD4 8083CDE4 8FA40030 */ lw $a0, 0x0030($sp) -/* 0ABD8 8083CDE8 E7A00014 */ swc1 $f0, 0x0014($sp) -/* 0ABDC 8083CDEC E7A00010 */ swc1 $f0, 0x0010($sp) -/* 0ABE0 8083CDF0 0C028FC2 */ jal func_800A3F08 -/* 0ABE4 8083CDF4 E7B2001C */ swc1 $f18, 0x001C($sp) -/* 0ABE8 8083CDF8 8FBF002C */ lw $ra, 0x002C($sp) -/* 0ABEC 8083CDFC 8FB00028 */ lw $s0, 0x0028($sp) +/* 0ABCC 8083CDDC AFA00018 */ sw $zero, 0x0018($sp) +/* 0ABD0 8083CDE0 8CC63B84 */ lw $a2, %lo(D_80853B84)($a2) +/* 0ABD4 8083CDE4 8FA40030 */ lw $a0, 0x0030($sp) +/* 0ABD8 8083CDE8 E7A00014 */ swc1 $f0, 0x0014($sp) +/* 0ABDC 8083CDEC E7A00010 */ swc1 $f0, 0x0010($sp) +/* 0ABE0 8083CDF0 0C028FC2 */ jal SkelAnime_ChangeLinkAnim +/* 0ABE4 8083CDF4 E7B2001C */ swc1 $f18, 0x001C($sp) +/* 0ABE8 8083CDF8 8FBF002C */ lw $ra, 0x002C($sp) +/* 0ABEC 8083CDFC 8FB00028 */ lw $s0, 0x0028($sp) /* 0ABF0 8083CE00 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 0ABF4 8083CE04 03E00008 */ jr $ra +/* 0ABF4 8083CE04 03E00008 */ jr $ra /* 0ABF8 8083CE08 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083F070.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083F070.s index fa98e09c32..1884fbdab6 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083F070.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083F070.s @@ -1,25 +1,25 @@ glabel func_8083F070 /* 0CE60 8083F070 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8 -/* 0CE64 8083F074 AFA40018 */ sw $a0, 0x0018($sp) -/* 0CE68 8083F078 AFA60020 */ sw $a2, 0x0020($sp) +/* 0CE64 8083F074 AFA40018 */ sw $a0, 0x0018($sp) +/* 0CE68 8083F078 AFA60020 */ sw $a2, 0x0020($sp) /* 0CE6C 8083F07C 00C02025 */ or $a0, $a2, $zero ## $a0 = 00000000 -/* 0CE70 8083F080 AFBF0014 */ sw $ra, 0x0014($sp) -/* 0CE74 8083F084 AFA5001C */ sw $a1, 0x001C($sp) +/* 0CE70 8083F080 AFBF0014 */ sw $ra, 0x0014($sp) +/* 0CE74 8083F084 AFA5001C */ sw $a1, 0x001C($sp) /* 0CE78 8083F088 3C068085 */ lui $a2, %hi(func_8084C5F8) ## $a2 = 80850000 /* 0CE7C 8083F08C 24C6C5F8 */ addiu $a2, $a2, %lo(func_8084C5F8) ## $a2 = 8084C5F8 -/* 0CE80 8083F090 8FA50018 */ lw $a1, 0x0018($sp) -/* 0CE84 8083F094 0C20D76B */ jal func_80835DAC +/* 0CE80 8083F090 8FA50018 */ lw $a1, 0x0018($sp) +/* 0CE84 8083F094 0C20D76B */ jal func_80835DAC /* 0CE88 8083F098 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 0CE8C 8083F09C 8FA50018 */ lw $a1, 0x0018($sp) +/* 0CE8C 8083F09C 8FA50018 */ lw $a1, 0x0018($sp) /* 0CE90 8083F0A0 3C073FAA */ lui $a3, 0x3FAA ## $a3 = 3FAA0000 /* 0CE94 8083F0A4 34E7AAAB */ ori $a3, $a3, 0xAAAB ## $a3 = 3FAAAAAB -/* 0CE98 8083F0A8 8FA40020 */ lw $a0, 0x0020($sp) -/* 0CE9C 8083F0AC 8FA6001C */ lw $a2, 0x001C($sp) -/* 0CEA0 8083F0B0 0C029037 */ jal func_800A40DC +/* 0CE98 8083F0A8 8FA40020 */ lw $a0, 0x0020($sp) +/* 0CE9C 8083F0AC 8FA6001C */ lw $a2, 0x001C($sp) +/* 0CEA0 8083F0B0 0C029037 */ jal SkelAnime_ChangeLinkAnimPlaybackStop /* 0CEA4 8083F0B4 24A501B4 */ addiu $a1, $a1, 0x01B4 ## $a1 = 000001B4 -/* 0CEA8 8083F0B8 8FBF0014 */ lw $ra, 0x0014($sp) +/* 0CEA8 8083F0B8 8FBF0014 */ lw $ra, 0x0014($sp) /* 0CEAC 8083F0BC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000 -/* 0CEB0 8083F0C0 03E00008 */ jr $ra +/* 0CEB0 8083F0C0 03E00008 */ jr $ra /* 0CEB4 8083F0C4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083F570.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083F570.s index 209048dd2d..7b615a8ace 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083F570.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8083F570.s @@ -1,121 +1,121 @@ glabel func_8083F570 /* 0D360 8083F570 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 0D364 8083F574 AFBF002C */ sw $ra, 0x002C($sp) -/* 0D368 8083F578 AFB10028 */ sw $s1, 0x0028($sp) -/* 0D36C 8083F57C AFB00024 */ sw $s0, 0x0024($sp) +/* 0D364 8083F574 AFBF002C */ sw $ra, 0x002C($sp) +/* 0D368 8083F578 AFB10028 */ sw $s1, 0x0028($sp) +/* 0D36C 8083F57C AFB00024 */ sw $s0, 0x0024($sp) /* 0D370 8083F580 44801000 */ mtc1 $zero, $f2 ## $f2 = 0.00 /* 0D374 8083F584 C4800838 */ lwc1 $f0, 0x0838($a0) ## 00000838 /* 0D378 8083F588 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 0D37C 8083F58C 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 -/* 0D380 8083F590 46001032 */ c.eq.s $f2, $f0 +/* 0D380 8083F590 46001032 */ c.eq.s $f2, $f0 /* 0D384 8083F594 00000000 */ nop -/* 0D388 8083F598 4503005F */ bc1tl .L8083F718 +/* 0D388 8083F598 4503005F */ bc1tl .L8083F718 /* 0D38C 8083F59C 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 /* 0D390 8083F5A0 948E0088 */ lhu $t6, 0x0088($a0) ## 00000088 /* 0D394 8083F5A4 3C188085 */ lui $t8, %hi(D_808535F0) ## $t8 = 80850000 /* 0D398 8083F5A8 31CF0008 */ andi $t7, $t6, 0x0008 ## $t7 = 00000000 -/* 0D39C 8083F5AC 51E0005A */ beql $t7, $zero, .L8083F718 +/* 0D39C 8083F5AC 51E0005A */ beql $t7, $zero, .L8083F718 /* 0D3A0 8083F5B0 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 0D3A4 8083F5B4 8F1835F0 */ lw $t8, %lo(D_808535F0)($t8) +/* 0D3A4 8083F5B4 8F1835F0 */ lw $t8, %lo(D_808535F0)($t8) /* 0D3A8 8083F5B8 33190030 */ andi $t9, $t8, 0x0030 ## $t9 = 00000000 -/* 0D3AC 8083F5BC 53200056 */ beql $t9, $zero, .L8083F718 +/* 0D3AC 8083F5BC 53200056 */ beql $t9, $zero, .L8083F718 /* 0D3B0 8083F5C0 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 /* 0D3B4 8083F5C4 848800B6 */ lh $t0, 0x00B6($a0) ## 000000B6 /* 0D3B8 8083F5C8 8489007E */ lh $t1, 0x007E($a0) ## 0000007E -/* 0D3BC 8083F5CC 4602003C */ c.lt.s $f0, $f2 +/* 0D3BC 8083F5CC 4602003C */ c.lt.s $f0, $f2 /* 0D3C0 8083F5D0 34018000 */ ori $at, $zero, 0x8000 ## $at = 00008000 -/* 0D3C4 8083F5D4 01091023 */ subu $v0, $t0, $t1 -/* 0D3C8 8083F5D8 00021400 */ sll $v0, $v0, 16 -/* 0D3CC 8083F5DC 45000004 */ bc1f .L8083F5F0 -/* 0D3D0 8083F5E0 00021403 */ sra $v0, $v0, 16 -/* 0D3D4 8083F5E4 00411021 */ addu $v0, $v0, $at -/* 0D3D8 8083F5E8 00021400 */ sll $v0, $v0, 16 -/* 0D3DC 8083F5EC 00021403 */ sra $v0, $v0, 16 +/* 0D3C4 8083F5D4 01091023 */ subu $v0, $t0, $t1 +/* 0D3C8 8083F5D8 00021400 */ sll $v0, $v0, 16 +/* 0D3CC 8083F5DC 45000004 */ bc1f .L8083F5F0 +/* 0D3D0 8083F5E0 00021403 */ sra $v0, $v0, 16 +/* 0D3D4 8083F5E4 00411021 */ addu $v0, $v0, $at +/* 0D3D8 8083F5E8 00021400 */ sll $v0, $v0, 16 +/* 0D3DC 8083F5EC 00021403 */ sra $v0, $v0, 16 .L8083F5F0: -/* 0D3E0 8083F5F0 04400003 */ bltz $v0, .L8083F600 -/* 0D3E4 8083F5F4 00021823 */ subu $v1, $zero, $v0 -/* 0D3E8 8083F5F8 10000001 */ beq $zero, $zero, .L8083F600 +/* 0D3E0 8083F5F0 04400003 */ bltz $v0, .L8083F600 +/* 0D3E4 8083F5F4 00021823 */ subu $v1, $zero, $v0 +/* 0D3E8 8083F5F8 10000001 */ beq $zero, $zero, .L8083F600 /* 0D3EC 8083F5FC 00401825 */ or $v1, $v0, $zero ## $v1 = 00000000 .L8083F600: -/* 0D3F0 8083F600 28614001 */ slti $at, $v1, 0x4001 -/* 0D3F4 8083F604 14200043 */ bne $at, $zero, .L8083F714 +/* 0D3F0 8083F600 28614001 */ slti $at, $v1, 0x4001 +/* 0D3F4 8083F604 14200043 */ bne $at, $zero, .L8083F714 /* 0D3F8 8083F608 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 0D3FC 8083F60C 3C068085 */ lui $a2, %hi(func_8084C81C) ## $a2 = 80850000 /* 0D400 8083F610 24C6C81C */ addiu $a2, $a2, %lo(func_8084C81C) ## $a2 = 8084C81C /* 0D404 8083F614 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 0D408 8083F618 0C20D716 */ jal func_80835C58 +/* 0D408 8083F618 0C20D716 */ jal func_80835C58 /* 0D40C 8083F61C 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 /* 0D410 8083F620 44801000 */ mtc1 $zero, $f2 ## $f2 = 0.00 /* 0D414 8083F624 C6040838 */ lwc1 $f4, 0x0838($s0) ## 00000838 /* 0D418 8083F628 34018000 */ ori $at, $zero, 0x8000 ## $at = 00008000 /* 0D41C 8083F62C 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 0D420 8083F630 4604103C */ c.lt.s $f2, $f4 +/* 0D420 8083F630 4604103C */ c.lt.s $f2, $f4 /* 0D424 8083F634 3C060400 */ lui $a2, 0x0400 ## $a2 = 04000000 /* 0D428 8083F638 3C040400 */ lui $a0, 0x0400 ## $a0 = 04000000 -/* 0D42C 8083F63C 45020014 */ bc1fl .L8083F690 +/* 0D42C 8083F63C 45020014 */ bc1fl .L8083F690 /* 0D430 8083F640 860C007E */ lh $t4, 0x007E($s0) ## 0000007E /* 0D434 8083F644 860A007E */ lh $t2, 0x007E($s0) ## 0000007E /* 0D438 8083F648 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 0D43C 8083F64C 24C62700 */ addiu $a2, $a2, 0x2700 ## $a2 = 04002700 -/* 0D440 8083F650 01415821 */ addu $t3, $t2, $at -/* 0D444 8083F654 0C20C899 */ jal func_80832264 +/* 0D440 8083F650 01415821 */ addu $t3, $t2, $at +/* 0D444 8083F654 0C20C899 */ jal func_80832264 /* 0D448 8083F658 A60B00B6 */ sh $t3, 0x00B6($s0) ## 000000B6 /* 0D44C 8083F65C 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 0D450 8083F660 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 0D454 8083F664 0C20CBD5 */ jal func_80832F54 +/* 0D454 8083F664 0C20CBD5 */ jal func_80832F54 /* 0D458 8083F668 2406009D */ addiu $a2, $zero, 0x009D ## $a2 = 0000009D /* 0D45C 8083F66C 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 0D460 8083F670 24052581 */ addiu $a1, $zero, 0x2581 ## $a1 = 00002581 /* 0D464 8083F674 240603E7 */ addiu $a2, $zero, 0x03E7 ## $a2 = 000003E7 /* 0D468 8083F678 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 0D46C 8083F67C 0C02003E */ jal func_800800F8 -/* 0D470 8083F680 AFA00010 */ sw $zero, 0x0010($sp) -/* 0D474 8083F684 1000001E */ beq $zero, $zero, .L8083F700 +/* 0D46C 8083F67C 0C02003E */ jal func_800800F8 +/* 0D470 8083F680 AFA00010 */ sw $zero, 0x0010($sp) +/* 0D474 8083F684 1000001E */ beq $zero, $zero, .L8083F700 /* 0D478 8083F688 860E00B6 */ lh $t6, 0x00B6($s0) ## 000000B6 /* 0D47C 8083F68C 860C007E */ lh $t4, 0x007E($s0) ## 0000007E .L8083F690: /* 0D480 8083F690 24842708 */ addiu $a0, $a0, 0x2708 ## $a0 = 00002708 /* 0D484 8083F694 0C028800 */ jal SkelAnime_GetFrameCount - + /* 0D488 8083F698 A60C00B6 */ sh $t4, 0x00B6($s0) ## 000000B6 /* 0D48C 8083F69C 44823000 */ mtc1 $v0, $f6 ## $f6 = 0.00 /* 0D490 8083F6A0 44801000 */ mtc1 $zero, $f2 ## $f2 = 0.00 /* 0D494 8083F6A4 3C060400 */ lui $a2, 0x0400 ## $a2 = 04000000 -/* 0D498 8083F6A8 46803220 */ cvt.s.w $f8, $f6 +/* 0D498 8083F6A8 46803220 */ cvt.s.w $f8, $f6 /* 0D49C 8083F6AC 240D0002 */ addiu $t5, $zero, 0x0002 ## $t5 = 00000002 -/* 0D4A0 8083F6B0 AFAD0018 */ sw $t5, 0x0018($sp) +/* 0D4A0 8083F6B0 AFAD0018 */ sw $t5, 0x0018($sp) /* 0D4A4 8083F6B4 24C62708 */ addiu $a2, $a2, 0x2708 ## $a2 = 04002708 /* 0D4A8 8083F6B8 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 0D4AC 8083F6BC 260501B4 */ addiu $a1, $s0, 0x01B4 ## $a1 = 000001B4 -/* 0D4B0 8083F6C0 E7A80010 */ swc1 $f8, 0x0010($sp) +/* 0D4B0 8083F6C0 E7A80010 */ swc1 $f8, 0x0010($sp) /* 0D4B4 8083F6C4 3C07BF80 */ lui $a3, 0xBF80 ## $a3 = BF800000 -/* 0D4B8 8083F6C8 E7A20014 */ swc1 $f2, 0x0014($sp) -/* 0D4BC 8083F6CC 0C028FC2 */ jal func_800A3F08 -/* 0D4C0 8083F6D0 E7A2001C */ swc1 $f2, 0x001C($sp) +/* 0D4B8 8083F6C8 E7A20014 */ swc1 $f2, 0x0014($sp) +/* 0D4BC 8083F6CC 0C028FC2 */ jal SkelAnime_ChangeLinkAnim +/* 0D4C0 8083F6D0 E7A2001C */ swc1 $f2, 0x001C($sp) /* 0D4C4 8083F6D4 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 0D4C8 8083F6D8 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 0D4CC 8083F6DC 0C20CBD5 */ jal func_80832F54 +/* 0D4CC 8083F6DC 0C20CBD5 */ jal func_80832F54 /* 0D4D0 8083F6E0 2406009D */ addiu $a2, $zero, 0x009D ## $a2 = 0000009D /* 0D4D4 8083F6E4 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 0D4D8 8083F6E8 24052582 */ addiu $a1, $zero, 0x2582 ## $a1 = 00002582 /* 0D4DC 8083F6EC 240603E7 */ addiu $a2, $zero, 0x03E7 ## $a2 = 000003E7 /* 0D4E0 8083F6F0 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 0D4E4 8083F6F4 0C02003E */ jal func_800800F8 -/* 0D4E8 8083F6F8 AFA00010 */ sw $zero, 0x0010($sp) +/* 0D4E4 8083F6F4 0C02003E */ jal func_800800F8 +/* 0D4E8 8083F6F8 AFA00010 */ sw $zero, 0x0010($sp) /* 0D4EC 8083F6FC 860E00B6 */ lh $t6, 0x00B6($s0) ## 000000B6 .L8083F700: /* 0D4F0 8083F700 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0D4F4 8083F704 0C20C884 */ jal func_80832210 +/* 0D4F4 8083F704 0C20C884 */ jal func_80832210 /* 0D4F8 8083F708 A60E083C */ sh $t6, 0x083C($s0) ## 0000083C -/* 0D4FC 8083F70C 10000002 */ beq $zero, $zero, .L8083F718 +/* 0D4FC 8083F70C 10000002 */ beq $zero, $zero, .L8083F718 /* 0D500 8083F710 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 .L8083F714: /* 0D504 8083F714 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 .L8083F718: -/* 0D508 8083F718 8FBF002C */ lw $ra, 0x002C($sp) -/* 0D50C 8083F71C 8FB00024 */ lw $s0, 0x0024($sp) -/* 0D510 8083F720 8FB10028 */ lw $s1, 0x0028($sp) -/* 0D514 8083F724 03E00008 */ jr $ra +/* 0D508 8083F718 8FBF002C */ lw $ra, 0x002C($sp) +/* 0D50C 8083F71C 8FB00024 */ lw $s0, 0x0024($sp) +/* 0D510 8083F720 8FB10028 */ lw $s1, 0x0028($sp) +/* 0D514 8083F724 03E00008 */ jr $ra /* 0D518 8083F728 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808409CC.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_808409CC.s index 600aea03c2..cb64a54ce0 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808409CC.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_808409CC.s @@ -1,32 +1,32 @@ glabel func_808409CC /* 0E7BC 808409CC 27BDFFB8 */ addiu $sp, $sp, 0xFFB8 ## $sp = FFFFFFB8 -/* 0E7C0 808409D0 AFBF002C */ sw $ra, 0x002C($sp) -/* 0E7C4 808409D4 AFB00028 */ sw $s0, 0x0028($sp) -/* 0E7C8 808409D8 AFA40048 */ sw $a0, 0x0048($sp) +/* 0E7C0 808409D0 AFBF002C */ sw $ra, 0x002C($sp) +/* 0E7C4 808409D4 AFB00028 */ sw $s0, 0x0028($sp) +/* 0E7C8 808409D8 AFA40048 */ sw $a0, 0x0048($sp) /* 0E7CC 808409DC 8CAE0664 */ lw $t6, 0x0664($a1) ## 00000664 /* 0E7D0 808409E0 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 -/* 0E7D4 808409E4 55C0000D */ bnel $t6, $zero, .L80840A1C +/* 0E7D4 808409E4 55C0000D */ bnel $t6, $zero, .L80840A1C /* 0E7D8 808409E8 8E0F0680 */ lw $t7, 0x0680($s0) ## 00000680 /* 0E7DC 808409EC 0C01E72D */ jal Health_IsCritical /* 0E7E0 808409F0 00000000 */ nop -/* 0E7E4 808409F4 54400012 */ bnel $v0, $zero, .L80840A40 +/* 0E7E4 808409F4 54400012 */ bnel $v0, $zero, .L80840A40 /* 0E7E8 808409F8 8E190680 */ lw $t9, 0x0680($s0) ## 00000680 /* 0E7EC 808409FC 820306AC */ lb $v1, 0x06AC($s0) ## 000006AC /* 0E7F0 80840A00 24630001 */ addiu $v1, $v1, 0x0001 ## $v1 = 00000001 /* 0E7F4 80840A04 30630001 */ andi $v1, $v1, 0x0001 ## $v1 = 00000001 -/* 0E7F8 80840A08 00031E00 */ sll $v1, $v1, 24 -/* 0E7FC 80840A0C 00031E03 */ sra $v1, $v1, 24 -/* 0E800 80840A10 1060000A */ beq $v1, $zero, .L80840A3C +/* 0E7F8 80840A08 00031E00 */ sll $v1, $v1, 24 +/* 0E7FC 80840A0C 00031E03 */ sra $v1, $v1, 24 +/* 0E800 80840A10 1060000A */ beq $v1, $zero, .L80840A3C /* 0E804 80840A14 A20306AC */ sb $v1, 0x06AC($s0) ## 000006AC /* 0E808 80840A18 8E0F0680 */ lw $t7, 0x0680($s0) ## 00000680 .L80840A1C: /* 0E80C 80840A1C 3C01EFFF */ lui $at, 0xEFFF ## $at = EFFF0000 /* 0E810 80840A20 3421FFFF */ ori $at, $at, 0xFFFF ## $at = EFFFFFFF -/* 0E814 80840A24 01E1C024 */ and $t8, $t7, $at +/* 0E814 80840A24 01E1C024 */ and $t8, $t7, $at /* 0E818 80840A28 AE180680 */ sw $t8, 0x0680($s0) ## 00000680 -/* 0E81C 80840A2C 0C20CCCE */ jal func_80833338 +/* 0E81C 80840A2C 0C20CCCE */ jal func_80833338 /* 0E820 80840A30 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0E824 80840A34 10000048 */ beq $zero, $zero, .L80840B58 +/* 0E824 80840A34 10000048 */ beq $zero, $zero, .L80840B58 /* 0E828 80840A38 00403025 */ or $a2, $v0, $zero ## $a2 = 00000000 .L80840A3C: /* 0E82C 80840A3C 8E190680 */ lw $t9, 0x0680($s0) ## 00000680 @@ -35,66 +35,66 @@ glabel func_808409CC /* 0E834 80840A44 3C011000 */ lui $at, 0x1000 ## $at = 10000000 /* 0E838 80840A48 03214025 */ or $t0, $t9, $at ## $t0 = 10000000 /* 0E83C 80840A4C 312A0800 */ andi $t2, $t1, 0x0800 ## $t2 = 00000000 -/* 0E840 80840A50 11400005 */ beq $t2, $zero, .L80840A68 +/* 0E840 80840A50 11400005 */ beq $t2, $zero, .L80840A68 /* 0E844 80840A54 AE080680 */ sw $t0, 0x0680($s0) ## 00000680 -/* 0E848 80840A58 0C20CCCE */ jal func_80833338 +/* 0E848 80840A58 0C20CCCE */ jal func_80833338 /* 0E84C 80840A5C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0E850 80840A60 1000003D */ beq $zero, $zero, .L80840B58 +/* 0E850 80840A60 1000003D */ beq $zero, $zero, .L80840B58 /* 0E854 80840A64 00403025 */ or $a2, $v0, $zero ## $a2 = 00000000 .L80840A68: -/* 0E858 80840A68 8FAB0048 */ lw $t3, 0x0048($sp) +/* 0E858 80840A68 8FAB0048 */ lw $t3, 0x0048($sp) /* 0E85C 80840A6C 3C050001 */ lui $a1, 0x0001 ## $a1 = 00010000 -/* 0E860 80840A70 00AB2821 */ addu $a1, $a1, $t3 -/* 0E864 80840A74 1040000A */ beq $v0, $zero, .L80840AA0 +/* 0E860 80840A70 00AB2821 */ addu $a1, $a1, $t3 +/* 0E864 80840A74 1040000A */ beq $v0, $zero, .L80840AA0 /* 0E868 80840A78 90A51CBE */ lbu $a1, 0x1CBE($a1) ## 00011CBE /* 0E86C 80840A7C 820C06AC */ lb $t4, 0x06AC($s0) ## 000006AC /* 0E870 80840A80 24050007 */ addiu $a1, $zero, 0x0007 ## $a1 = 00000007 /* 0E874 80840A84 240DFFFF */ addiu $t5, $zero, 0xFFFF ## $t5 = FFFFFFFF -/* 0E878 80840A88 05800003 */ bltz $t4, .L80840A98 +/* 0E878 80840A88 05800003 */ bltz $t4, .L80840A98 /* 0E87C 80840A8C 00000000 */ nop -/* 0E880 80840A90 10000027 */ beq $zero, $zero, .L80840B30 +/* 0E880 80840A90 10000027 */ beq $zero, $zero, .L80840B30 /* 0E884 80840A94 A20D06AC */ sb $t5, 0x06AC($s0) ## 000006AC .L80840A98: -/* 0E888 80840A98 10000025 */ beq $zero, $zero, .L80840B30 +/* 0E888 80840A98 10000025 */ beq $zero, $zero, .L80840B30 /* 0E88C 80840A9C 24050008 */ addiu $a1, $zero, 0x0008 ## $a1 = 00000008 .L80840AA0: /* 0E890 80840AA0 0C03F66B */ jal Math_Rand_ZeroOne ## Rand.Next() float -/* 0E894 80840AA4 AFA50038 */ sw $a1, 0x0038($sp) +/* 0E894 80840AA4 AFA50038 */ sw $a1, 0x0038($sp) /* 0E898 80840AA8 3C0140A0 */ lui $at, 0x40A0 ## $at = 40A00000 /* 0E89C 80840AAC 44812000 */ mtc1 $at, $f4 ## $f4 = 5.00 -/* 0E8A0 80840AB0 8FA50038 */ lw $a1, 0x0038($sp) -/* 0E8A4 80840AB4 46040182 */ mul.s $f6, $f0, $f4 -/* 0E8A8 80840AB8 4600320D */ trunc.w.s $f8, $f6 -/* 0E8AC 80840ABC 44024000 */ mfc1 $v0, $f8 +/* 0E8A0 80840AB0 8FA50038 */ lw $a1, 0x0038($sp) +/* 0E8A4 80840AB4 46040182 */ mul.s $f6, $f0, $f4 +/* 0E8A8 80840AB8 4600320D */ trunc.w.s $f8, $f6 +/* 0E8AC 80840ABC 44024000 */ mfc1 $v0, $f8 /* 0E8B0 80840AC0 00000000 */ nop -/* 0E8B4 80840AC4 28410004 */ slti $at, $v0, 0x0004 -/* 0E8B8 80840AC8 10200019 */ beq $at, $zero, .L80840B30 +/* 0E8B4 80840AC4 28410004 */ slti $at, $v0, 0x0004 +/* 0E8B8 80840AC8 10200019 */ beq $at, $zero, .L80840B30 /* 0E8BC 80840ACC 00401825 */ or $v1, $v0, $zero ## $v1 = 00000000 -/* 0E8C0 80840AD0 10400003 */ beq $v0, $zero, .L80840AE0 +/* 0E8C0 80840AD0 10400003 */ beq $v0, $zero, .L80840AE0 /* 0E8C4 80840AD4 24010003 */ addiu $at, $zero, 0x0003 ## $at = 00000003 -/* 0E8C8 80840AD8 1441000D */ bne $v0, $at, .L80840B10 +/* 0E8C8 80840AD8 1441000D */ bne $v0, $at, .L80840B10 /* 0E8CC 80840ADC 00000000 */ nop .L80840AE0: /* 0E8D0 80840AE0 920F015D */ lbu $t7, 0x015D($s0) ## 0000015D /* 0E8D4 80840AE4 2401000A */ addiu $at, $zero, 0x000A ## $at = 0000000A -/* 0E8D8 80840AE8 15E10011 */ bne $t7, $at, .L80840B30 +/* 0E8D8 80840AE8 15E10011 */ bne $t7, $at, .L80840B30 /* 0E8DC 80840AEC 24010003 */ addiu $at, $zero, 0x0003 ## $at = 00000003 -/* 0E8E0 80840AF0 10410007 */ beq $v0, $at, .L80840B10 +/* 0E8E0 80840AF0 10410007 */ beq $v0, $at, .L80840B10 /* 0E8E4 80840AF4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0E8E8 80840AF8 AFA30034 */ sw $v1, 0x0034($sp) -/* 0E8EC 80840AFC 0C023C60 */ jal func_8008F180 -/* 0E8F0 80840B00 AFA50038 */ sw $a1, 0x0038($sp) -/* 0E8F4 80840B04 8FA30034 */ lw $v1, 0x0034($sp) -/* 0E8F8 80840B08 10400009 */ beq $v0, $zero, .L80840B30 -/* 0E8FC 80840B0C 8FA50038 */ lw $a1, 0x0038($sp) +/* 0E8E8 80840AF8 AFA30034 */ sw $v1, 0x0034($sp) +/* 0E8EC 80840AFC 0C023C60 */ jal func_8008F180 +/* 0E8F0 80840B00 AFA50038 */ sw $a1, 0x0038($sp) +/* 0E8F4 80840B04 8FA30034 */ lw $v1, 0x0034($sp) +/* 0E8F8 80840B08 10400009 */ beq $v0, $zero, .L80840B30 +/* 0E8FC 80840B0C 8FA50038 */ lw $a1, 0x0038($sp) .L80840B10: -/* 0E900 80840B10 14600006 */ bne $v1, $zero, .L80840B2C +/* 0E900 80840B10 14600006 */ bne $v1, $zero, .L80840B2C /* 0E904 80840B14 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0E908 80840B18 0C023C68 */ jal func_8008F1A0 -/* 0E90C 80840B1C AFA30034 */ sw $v1, 0x0034($sp) -/* 0E910 80840B20 10400002 */ beq $v0, $zero, .L80840B2C -/* 0E914 80840B24 8FA30034 */ lw $v1, 0x0034($sp) +/* 0E908 80840B18 0C023C68 */ jal func_8008F1A0 +/* 0E90C 80840B1C AFA30034 */ sw $v1, 0x0034($sp) +/* 0E910 80840B20 10400002 */ beq $v0, $zero, .L80840B2C +/* 0E914 80840B24 8FA30034 */ lw $v1, 0x0034($sp) /* 0E918 80840B28 24030004 */ addiu $v1, $zero, 0x0004 ## $v1 = 00000004 .L80840B2C: /* 0E91C 80840B2C 24650009 */ addiu $a1, $v1, 0x0009 ## $a1 = 0000000D @@ -102,10 +102,10 @@ glabel func_808409CC /* 0E920 80840B30 9208015B */ lbu $t0, 0x015B($s0) ## 0000015B /* 0E924 80840B34 3C198085 */ lui $t9, %hi(D_80853D7C) ## $t9 = 80850000 /* 0E928 80840B38 27393D7C */ addiu $t9, $t9, %lo(D_80853D7C) ## $t9 = 80853D7C -/* 0E92C 80840B3C 0005C0C0 */ sll $t8, $a1, 3 -/* 0E930 80840B40 03191821 */ addu $v1, $t8, $t9 +/* 0E92C 80840B3C 0005C0C0 */ sll $t8, $a1, 3 +/* 0E930 80840B40 03191821 */ addu $v1, $t8, $t9 /* 0E934 80840B44 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 0E938 80840B48 11010002 */ beq $t0, $at, .L80840B54 +/* 0E938 80840B48 11010002 */ beq $t0, $at, .L80840B54 /* 0E93C 80840B4C 00601025 */ or $v0, $v1, $zero ## $v0 = 00000004 /* 0E940 80840B50 24620004 */ addiu $v0, $v1, 0x0004 ## $v0 = 00000008 .L80840B54: @@ -113,32 +113,32 @@ glabel func_808409CC .L80840B58: /* 0E948 80840B58 00C02025 */ or $a0, $a2, $zero ## $a0 = 00000000 /* 0E94C 80840B5C 0C028800 */ jal SkelAnime_GetFrameCount - -/* 0E950 80840B60 AFA60044 */ sw $a2, 0x0044($sp) + +/* 0E950 80840B60 AFA60044 */ sw $a2, 0x0044($sp) /* 0E954 80840B64 3C018085 */ lui $at, %hi(D_8085540C) ## $at = 80850000 -/* 0E958 80840B68 C42A540C */ lwc1 $f10, %lo(D_8085540C)($at) +/* 0E958 80840B68 C42A540C */ lwc1 $f10, %lo(D_8085540C)($at) /* 0E95C 80840B6C 3C018085 */ lui $at, %hi(D_808535E8) ## $at = 80850000 -/* 0E960 80840B70 C43035E8 */ lwc1 $f16, %lo(D_808535E8)($at) +/* 0E960 80840B70 C43035E8 */ lwc1 $f16, %lo(D_808535E8)($at) /* 0E964 80840B74 44823000 */ mtc1 $v0, $f6 ## $f6 = 0.00 /* 0E968 80840B78 3C01C0C0 */ lui $at, 0xC0C0 ## $at = C0C00000 -/* 0E96C 80840B7C 46105482 */ mul.s $f18, $f10, $f16 +/* 0E96C 80840B7C 46105482 */ mul.s $f18, $f10, $f16 /* 0E970 80840B80 44815000 */ mtc1 $at, $f10 ## $f10 = -6.00 /* 0E974 80840B84 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 /* 0E978 80840B88 24090002 */ addiu $t1, $zero, 0x0002 ## $t1 = 00000002 -/* 0E97C 80840B8C AFA90018 */ sw $t1, 0x0018($sp) -/* 0E980 80840B90 8FA60044 */ lw $a2, 0x0044($sp) -/* 0E984 80840B94 46803220 */ cvt.s.w $f8, $f6 -/* 0E988 80840B98 44079000 */ mfc1 $a3, $f18 -/* 0E98C 80840B9C 8FA40048 */ lw $a0, 0x0048($sp) +/* 0E97C 80840B8C AFA90018 */ sw $t1, 0x0018($sp) +/* 0E980 80840B90 8FA60044 */ lw $a2, 0x0044($sp) +/* 0E984 80840B94 46803220 */ cvt.s.w $f8, $f6 +/* 0E988 80840B98 44079000 */ mfc1 $a3, $f18 +/* 0E98C 80840B9C 8FA40048 */ lw $a0, 0x0048($sp) /* 0E990 80840BA0 260501B4 */ addiu $a1, $s0, 0x01B4 ## $a1 = 000001B4 -/* 0E994 80840BA4 E7AA001C */ swc1 $f10, 0x001C($sp) -/* 0E998 80840BA8 E7A40010 */ swc1 $f4, 0x0010($sp) -/* 0E99C 80840BAC 0C028FC2 */ jal func_800A3F08 -/* 0E9A0 80840BB0 E7A80014 */ swc1 $f8, 0x0014($sp) -/* 0E9A4 80840BB4 8FBF002C */ lw $ra, 0x002C($sp) -/* 0E9A8 80840BB8 8FB00028 */ lw $s0, 0x0028($sp) +/* 0E994 80840BA4 E7AA001C */ swc1 $f10, 0x001C($sp) +/* 0E998 80840BA8 E7A40010 */ swc1 $f4, 0x0010($sp) +/* 0E99C 80840BAC 0C028FC2 */ jal SkelAnime_ChangeLinkAnim +/* 0E9A0 80840BB0 E7A80014 */ swc1 $f8, 0x0014($sp) +/* 0E9A4 80840BB4 8FBF002C */ lw $ra, 0x002C($sp) +/* 0E9A8 80840BB8 8FB00028 */ lw $s0, 0x0028($sp) /* 0E9AC 80840BBC 27BD0048 */ addiu $sp, $sp, 0x0048 ## $sp = 00000000 -/* 0E9B0 80840BC0 03E00008 */ jr $ra +/* 0E9B0 80840BC0 03E00008 */ jr $ra /* 0E9B4 80840BC4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80841BA8.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80841BA8.s index 220fb321f3..19a9cbe874 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80841BA8.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80841BA8.s @@ -1,33 +1,33 @@ glabel func_80841BA8 /* 0F998 80841BA8 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 0F99C 80841BAC AFB0001C */ sw $s0, 0x001C($sp) +/* 0F99C 80841BAC AFB0001C */ sw $s0, 0x001C($sp) /* 0F9A0 80841BB0 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 0F9A4 80841BB4 AFB10020 */ sw $s1, 0x0020($sp) +/* 0F9A4 80841BB4 AFB10020 */ sw $s1, 0x0020($sp) /* 0F9A8 80841BB8 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 -/* 0F9AC 80841BBC AFBF0024 */ sw $ra, 0x0024($sp) +/* 0F9AC 80841BBC AFBF0024 */ sw $ra, 0x0024($sp) /* 0F9B0 80841BC0 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 0F9B4 80841BC4 0C028EF0 */ jal func_800A3BC0 +/* 0F9B4 80841BC4 0C028EF0 */ jal func_800A3BC0 /* 0F9B8 80841BC8 260501B4 */ addiu $a1, $s0, 0x01B4 ## $a1 = 000001B4 -/* 0F9BC 80841BCC 0C023C68 */ jal func_8008F1A0 +/* 0F9BC 80841BCC 0C023C68 */ jal func_8008F1A0 /* 0F9C0 80841BD0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0F9C4 80841BD4 50400013 */ beql $v0, $zero, .L80841C24 +/* 0F9C4 80841BD4 50400013 */ beql $v0, $zero, .L80841C24 /* 0F9C8 80841BD8 3C073C93 */ lui $a3, 0x3C93 ## $a3 = 3C930000 -/* 0F9CC 80841BDC 0C20CCCE */ jal func_80833338 +/* 0F9CC 80841BDC 0C20CCCE */ jal func_80833338 /* 0F9D0 80841BE0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 0F9D4 80841BE4 8E0E01D8 */ lw $t6, 0x01D8($s0) ## 000001D8 /* 0F9D8 80841BE8 920701B4 */ lbu $a3, 0x01B4($s0) ## 000001B4 /* 0F9DC 80841BEC 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 0F9E0 80841BF0 00402825 */ or $a1, $v0, $zero ## $a1 = 00000000 /* 0F9E4 80841BF4 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 0F9E8 80841BF8 0C028CDB */ jal func_800A336C -/* 0F9EC 80841BFC AFAE0010 */ sw $t6, 0x0010($sp) +/* 0F9E8 80841BF8 0C028CDB */ jal SkelAnime_LoadLinkAnimetion +/* 0F9EC 80841BFC AFAE0010 */ sw $t6, 0x0010($sp) /* 0F9F0 80841C00 3C0F8085 */ lui $t7, %hi(D_80853410) ## $t7 = 80850000 /* 0F9F4 80841C04 25EF3410 */ addiu $t7, $t7, %lo(D_80853410) ## $t7 = 80853410 /* 0F9F8 80841C08 920501B4 */ lbu $a1, 0x01B4($s0) ## 000001B4 /* 0F9FC 80841C0C 8E0601D4 */ lw $a2, 0x01D4($s0) ## 000001D4 /* 0FA00 80841C10 8E0701D8 */ lw $a3, 0x01D8($s0) ## 000001D8 -/* 0FA04 80841C14 AFAF0010 */ sw $t7, 0x0010($sp) -/* 0FA08 80841C18 0C028D52 */ jal func_800A3548 +/* 0FA04 80841C14 AFAF0010 */ sw $t7, 0x0010($sp) +/* 0FA08 80841C18 0C028D52 */ jal SkelAnime_LoadAnimationType3 /* 0FA0C 80841C1C 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 0FA10 80841C20 3C073C93 */ lui $a3, 0x3C93 ## $a3 = 3C930000 .L80841C24: @@ -35,46 +35,46 @@ glabel func_80841BA8 /* 0FA18 80841C28 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 0FA1C 80841C2C 27A50034 */ addiu $a1, $sp, 0x0034 ## $a1 = FFFFFFFC /* 0FA20 80841C30 27A60032 */ addiu $a2, $sp, 0x0032 ## $a2 = FFFFFFFA -/* 0FA24 80841C34 0C20DC9A */ jal func_80837268 -/* 0FA28 80841C38 AFB10010 */ sw $s1, 0x0010($sp) +/* 0FA24 80841C34 0C20DC9A */ jal func_80837268 +/* 0FA28 80841C38 AFB10010 */ sw $s1, 0x0010($sp) /* 0FA2C 80841C3C 3C068085 */ lui $a2, %hi(D_80854414) ## $a2 = 80850000 /* 0FA30 80841C40 24C64414 */ addiu $a2, $a2, %lo(D_80854414) ## $a2 = 80854414 /* 0FA34 80841C44 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 0FA38 80841C48 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 0FA3C 80841C4C 0C20DCD2 */ jal func_80837348 +/* 0FA3C 80841C4C 0C20DCD2 */ jal func_80837348 /* 0FA40 80841C50 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 0FA44 80841C54 14400016 */ bne $v0, $zero, .L80841CB0 -/* 0FA48 80841C58 C7A40034 */ lwc1 $f4, 0x0034($sp) +/* 0FA44 80841C54 14400016 */ bne $v0, $zero, .L80841CB0 +/* 0FA48 80841C58 C7A40034 */ lwc1 $f4, 0x0034($sp) /* 0FA4C 80841C5C 44803000 */ mtc1 $zero, $f6 ## $f6 = 0.00 -/* 0FA50 80841C60 87B80032 */ lh $t8, 0x0032($sp) +/* 0FA50 80841C60 87B80032 */ lh $t8, 0x0032($sp) /* 0FA54 80841C64 260400B6 */ addiu $a0, $s0, 0x00B6 ## $a0 = 000000B6 -/* 0FA58 80841C68 46062032 */ c.eq.s $f4, $f6 -/* 0FA5C 80841C6C 87A50032 */ lh $a1, 0x0032($sp) -/* 0FA60 80841C70 45010007 */ bc1t .L80841C90 +/* 0FA58 80841C68 46062032 */ c.eq.s $f4, $f6 +/* 0FA5C 80841C6C 87A50032 */ lh $a1, 0x0032($sp) +/* 0FA60 80841C70 45010007 */ bc1t .L80841C90 /* 0FA64 80841C74 00000000 */ nop /* 0FA68 80841C78 A61800B6 */ sh $t8, 0x00B6($s0) ## 000000B6 /* 0FA6C 80841C7C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0FA70 80841C80 0C20F216 */ jal func_8083C858 +/* 0FA70 80841C80 0C20F216 */ jal func_8083C858 /* 0FA74 80841C84 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 0FA78 80841C88 10000008 */ beq $zero, $zero, .L80841CAC +/* 0FA78 80841C88 10000008 */ beq $zero, $zero, .L80841CAC /* 0FA7C 80841C8C 861900B6 */ lh $t9, 0x00B6($s0) ## 000000B6 .L80841C90: /* 0FA80 80841C90 0C01DE2B */ jal Math_ApproxUpdateScaledS - + /* 0FA84 80841C94 8606087E */ lh $a2, 0x087E($s0) ## 0000087E -/* 0FA88 80841C98 10400003 */ beq $v0, $zero, .L80841CA8 +/* 0FA88 80841C98 10400003 */ beq $v0, $zero, .L80841CA8 /* 0FA8C 80841C9C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 0FA90 80841CA0 0C20F03A */ jal func_8083C0E8 +/* 0FA90 80841CA0 0C20F03A */ jal func_8083C0E8 /* 0FA94 80841CA4 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 .L80841CA8: /* 0FA98 80841CA8 861900B6 */ lh $t9, 0x00B6($s0) ## 000000B6 .L80841CAC: /* 0FA9C 80841CAC A619083C */ sh $t9, 0x083C($s0) ## 0000083C .L80841CB0: -/* 0FAA0 80841CB0 8FBF0024 */ lw $ra, 0x0024($sp) -/* 0FAA4 80841CB4 8FB0001C */ lw $s0, 0x001C($sp) -/* 0FAA8 80841CB8 8FB10020 */ lw $s1, 0x0020($sp) -/* 0FAAC 80841CBC 03E00008 */ jr $ra +/* 0FAA0 80841CB0 8FBF0024 */ lw $ra, 0x0024($sp) +/* 0FAA4 80841CB4 8FB0001C */ lw $s0, 0x001C($sp) +/* 0FAA8 80841CB8 8FB10020 */ lw $s1, 0x0020($sp) +/* 0FAAC 80841CBC 03E00008 */ jr $ra /* 0FAB0 80841CC0 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808429B4.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_808429B4.s index 20394ae1c3..505fd54ac3 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808429B4.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_808429B4.s @@ -7,22 +7,22 @@ glabel func_808429B4 /* 107B8 808429C8 0C030129 */ jal func_800C04A4 /* 107BC 808429CC 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 107C0 808429D0 00402025 */ or $a0, $v0, $zero ## $a0 = 00000000 -/* 107C4 808429D4 0C024BE2 */ jal func_80092F88 +/* 107C4 808429D4 0C024BE2 */ jal Quake_Add /* 107C8 808429D8 24050003 */ addiu $a1, $zero, 0x0003 ## $a1 = 00000003 /* 107CC 808429DC 00022400 */ sll $a0, $v0, 16 /* 107D0 808429E0 AFA2002C */ sw $v0, 0x002C($sp) /* 107D4 808429E4 00042403 */ sra $a0, $a0, 16 -/* 107D8 808429E8 0C024B6B */ jal func_80092DAC +/* 107D8 808429E8 0C024B6B */ jal Quake_SetSpeed /* 107DC 808429EC 87A50036 */ lh $a1, 0x0036($sp) /* 107E0 808429F0 87A4002E */ lh $a0, 0x002E($sp) /* 107E4 808429F4 87A5003A */ lh $a1, 0x003A($sp) /* 107E8 808429F8 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 /* 107EC 808429FC 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 /* 107F0 80842A00 AFA00010 */ sw $zero, 0x0010($sp) -/* 107F4 80842A04 0C024B9C */ jal func_80092E70 +/* 107F4 80842A04 0C024B9C */ jal Quake_SetQuakeValues /* 107F8 80842A08 AFA40024 */ sw $a0, 0x0024($sp) /* 107FC 80842A0C 8FA40024 */ lw $a0, 0x0024($sp) -/* 10800 80842A10 0C024B7C */ jal func_80092DF0 +/* 10800 80842A10 0C024B7C */ jal Quake_SetCountdown /* 10804 80842A14 87A5003E */ lh $a1, 0x003E($sp) /* 10808 80842A18 8FBF001C */ lw $ra, 0x001C($sp) /* 1080C 80842A1C 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80843188.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80843188.s index 28be69e1b3..fe0ba25362 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80843188.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80843188.s @@ -1,300 +1,300 @@ glabel func_80843188 /* 10F78 80843188 27BDFFA8 */ addiu $sp, $sp, 0xFFA8 ## $sp = FFFFFFA8 -/* 10F7C 8084318C AFB00028 */ sw $s0, 0x0028($sp) +/* 10F7C 8084318C AFB00028 */ sw $s0, 0x0028($sp) /* 10F80 80843190 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 10F84 80843194 AFA5005C */ sw $a1, 0x005C($sp) +/* 10F84 80843194 AFA5005C */ sw $a1, 0x005C($sp) /* 10F88 80843198 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 10F8C 8084319C AFBF002C */ sw $ra, 0x002C($sp) +/* 10F8C 8084319C AFBF002C */ sw $ra, 0x002C($sp) /* 10F90 808431A0 260501B4 */ addiu $a1, $s0, 0x01B4 ## $a1 = 000001B4 -/* 10F94 808431A4 0C028EF0 */ jal func_800A3BC0 -/* 10F98 808431A8 AFA50034 */ sw $a1, 0x0034($sp) -/* 10F9C 808431AC 1040000F */ beq $v0, $zero, .L808431EC +/* 10F94 808431A4 0C028EF0 */ jal func_800A3BC0 +/* 10F98 808431A8 AFA50034 */ sw $a1, 0x0034($sp) +/* 10F9C 808431AC 1040000F */ beq $v0, $zero, .L808431EC /* 10FA0 808431B0 00000000 */ nop -/* 10FA4 808431B4 0C023A74 */ jal func_8008E9D0 +/* 10FA4 808431B4 0C023A74 */ jal func_8008E9D0 /* 10FA8 808431B8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 10FAC 808431BC 14400008 */ bne $v0, $zero, .L808431E0 -/* 10FB0 808431C0 8FA4005C */ lw $a0, 0x005C($sp) +/* 10FAC 808431BC 14400008 */ bne $v0, $zero, .L808431E0 +/* 10FB0 808431C0 8FA4005C */ lw $a0, 0x005C($sp) /* 10FB4 808431C4 920E015B */ lbu $t6, 0x015B($s0) ## 0000015B /* 10FB8 808431C8 3C068085 */ lui $a2, %hi(D_80853B0C) ## $a2 = 80850000 /* 10FBC 808431CC 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 10FC0 808431D0 000E7880 */ sll $t7, $t6, 2 -/* 10FC4 808431D4 00CF3021 */ addu $a2, $a2, $t7 -/* 10FC8 808431D8 0C20C8A1 */ jal func_80832284 -/* 10FCC 808431DC 8CC63B0C */ lw $a2, %lo(D_80853B0C)($a2) +/* 10FC0 808431D0 000E7880 */ sll $t7, $t6, 2 +/* 10FC4 808431D4 00CF3021 */ addu $a2, $a2, $t7 +/* 10FC8 808431D8 0C20C8A1 */ jal func_80832284 +/* 10FCC 808431DC 8CC63B0C */ lw $a2, %lo(D_80853B0C)($a2) .L808431E0: /* 10FD0 808431E0 24180001 */ addiu $t8, $zero, 0x0001 ## $t8 = 00000001 /* 10FD4 808431E4 A6180850 */ sh $t8, 0x0850($s0) ## 00000850 /* 10FD8 808431E8 A200084F */ sb $zero, 0x084F($s0) ## 0000084F .L808431EC: -/* 10FDC 808431EC 0C023A74 */ jal func_8008E9D0 +/* 10FDC 808431EC 0C023A74 */ jal func_8008E9D0 /* 10FE0 808431F0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 10FE4 808431F4 1440000D */ bne $v0, $zero, .L8084322C +/* 10FE4 808431F4 1440000D */ bne $v0, $zero, .L8084322C /* 10FE8 808431F8 00000000 */ nop /* 10FEC 808431FC 8E19067C */ lw $t9, 0x067C($s0) ## 0000067C /* 10FF0 80843200 3C010040 */ lui $at, 0x0040 ## $at = 00400000 /* 10FF4 80843204 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 10FF8 80843208 03214025 */ or $t0, $t9, $at ## $t0 = 00400000 /* 10FFC 8084320C AE08067C */ sw $t0, 0x067C($s0) ## 0000067C -/* 11000 80843210 0C20D99C */ jal func_80836670 -/* 11004 80843214 8FA5005C */ lw $a1, 0x005C($sp) +/* 11000 80843210 0C20D99C */ jal func_80836670 +/* 11004 80843214 8FA5005C */ lw $a1, 0x005C($sp) /* 11008 80843218 8E09067C */ lw $t1, 0x067C($s0) ## 0000067C /* 1100C 8084321C 3C01FFBF */ lui $at, 0xFFBF ## $at = FFBF0000 /* 11010 80843220 3421FFFF */ ori $at, $at, 0xFFFF ## $at = FFBFFFFF -/* 11014 80843224 01215024 */ and $t2, $t1, $at +/* 11014 80843224 01215024 */ and $t2, $t1, $at /* 11018 80843228 AE0A067C */ sw $t2, 0x067C($s0) ## 0000067C .L8084322C: -/* 1101C 8084322C 0C20DC87 */ jal func_8083721C +/* 1101C 8084322C 0C20DC87 */ jal func_8083721C /* 11020 80843230 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 11024 80843234 860B0850 */ lh $t3, 0x0850($s0) ## 00000850 /* 11028 80843238 3C028086 */ lui $v0, %hi(D_80858AB4) ## $v0 = 80860000 -/* 1102C 8084323C 516000D4 */ beql $t3, $zero, .L80843590 +/* 1102C 8084323C 516000D4 */ beql $t3, $zero, .L80843590 /* 11030 80843240 8E0B067C */ lw $t3, 0x067C($s0) ## 0000067C -/* 11034 80843244 8C428AB4 */ lw $v0, %lo(D_80858AB4)($v0) -/* 11038 80843248 8FA3005C */ lw $v1, 0x005C($sp) +/* 11034 80843244 8C428AB4 */ lw $v0, %lo(D_80858AB4)($v0) +/* 11038 80843248 8FA3005C */ lw $v1, 0x005C($sp) /* 1103C 8084324C 804C0015 */ lb $t4, 0x0015($v0) ## 80860015 -/* 11040 80843250 000C6880 */ sll $t5, $t4, 2 -/* 11044 80843254 01AC6823 */ subu $t5, $t5, $t4 -/* 11048 80843258 000D68C0 */ sll $t5, $t5, 3 -/* 1104C 8084325C 01AC6821 */ addu $t5, $t5, $t4 -/* 11050 80843260 000D6880 */ sll $t5, $t5, 2 +/* 11040 80843250 000C6880 */ sll $t5, $t4, 2 +/* 11044 80843254 01AC6823 */ subu $t5, $t5, $t4 +/* 11048 80843258 000D68C0 */ sll $t5, $t5, 3 +/* 1104C 8084325C 01AC6821 */ addu $t5, $t5, $t4 +/* 11050 80843260 000D6880 */ sll $t5, $t5, 2 /* 11054 80843264 448D2000 */ mtc1 $t5, $f4 ## $f4 = 0.00 /* 11058 80843268 00000000 */ nop -/* 1105C 8084326C 468021A0 */ cvt.s.w $f6, $f4 -/* 11060 80843270 E7A60054 */ swc1 $f6, 0x0054($sp) +/* 1105C 8084326C 468021A0 */ cvt.s.w $f6, $f4 +/* 11060 80843270 E7A60054 */ swc1 $f6, 0x0054($sp) /* 11064 80843274 804E0014 */ lb $t6, 0x0014($v0) ## 80860014 -/* 11068 80843278 000E0823 */ subu $at, $zero, $t6 -/* 1106C 8084327C 00017900 */ sll $t7, $at, 4 -/* 11070 80843280 01E17823 */ subu $t7, $t7, $at -/* 11074 80843284 000F78C0 */ sll $t7, $t7, 3 +/* 11068 80843278 000E0823 */ subu $at, $zero, $t6 +/* 1106C 8084327C 00017900 */ sll $t7, $at, 4 +/* 11070 80843280 01E17823 */ subu $t7, $t7, $at +/* 11074 80843284 000F78C0 */ sll $t7, $t7, 3 /* 11078 80843288 448F4000 */ mtc1 $t7, $f8 ## $f8 = 0.00 /* 1107C 8084328C 00000000 */ nop -/* 11080 80843290 468042A0 */ cvt.s.w $f10, $f8 -/* 11084 80843294 E7AA0050 */ swc1 $f10, 0x0050($sp) +/* 11080 80843290 468042A0 */ cvt.s.w $f10, $f8 +/* 11084 80843294 E7AA0050 */ swc1 $f10, 0x0050($sp) /* 11088 80843298 847807A0 */ lh $t8, 0x07A0($v1) ## 000007A0 -/* 1108C 8084329C 0018C880 */ sll $t9, $t8, 2 -/* 11090 808432A0 00794021 */ addu $t0, $v1, $t9 -/* 11094 808432A4 0C016A52 */ jal func_8005A948 +/* 1108C 8084329C 0018C880 */ sll $t9, $t8, 2 +/* 11090 808432A0 00794021 */ addu $t0, $v1, $t9 +/* 11094 808432A4 0C016A52 */ jal func_8005A948 /* 11098 808432A8 8D040790 */ lw $a0, 0x0790($t0) ## 00000790 /* 1109C 808432AC 860900B6 */ lh $t1, 0x00B6($s0) ## 000000B6 -/* 110A0 808432B0 01222023 */ subu $a0, $t1, $v0 -/* 110A4 808432B4 00042400 */ sll $a0, $a0, 16 -/* 110A8 808432B8 00042403 */ sra $a0, $a0, 16 +/* 110A0 808432B0 01222023 */ subu $a0, $t1, $v0 +/* 110A4 808432B4 00042400 */ sll $a0, $a0, 16 +/* 110A8 808432B8 00042403 */ sra $a0, $a0, 16 /* 110AC 808432BC 0C01DE0D */ jal Math_Coss ## coss? -/* 110B0 808432C0 A7A4004E */ sh $a0, 0x004E($sp) -/* 110B4 808432C4 E7A00040 */ swc1 $f0, 0x0040($sp) +/* 110B0 808432C0 A7A4004E */ sh $a0, 0x004E($sp) +/* 110B4 808432C4 E7A00040 */ swc1 $f0, 0x0040($sp) /* 110B8 808432C8 0C01DE1C */ jal Math_Sins ## sins? -/* 110BC 808432CC 87A4004E */ lh $a0, 0x004E($sp) -/* 110C0 808432D0 C7B00054 */ lwc1 $f16, 0x0054($sp) -/* 110C4 808432D4 C7B20040 */ lwc1 $f18, 0x0040($sp) -/* 110C8 808432D8 C7A60050 */ lwc1 $f6, 0x0050($sp) -/* 110CC 808432DC 87A4004E */ lh $a0, 0x004E($sp) -/* 110D0 808432E0 46128102 */ mul.s $f4, $f16, $f18 +/* 110BC 808432CC 87A4004E */ lh $a0, 0x004E($sp) +/* 110C0 808432D0 C7B00054 */ lwc1 $f16, 0x0054($sp) +/* 110C4 808432D4 C7B20040 */ lwc1 $f18, 0x0040($sp) +/* 110C8 808432D8 C7A60050 */ lwc1 $f6, 0x0050($sp) +/* 110CC 808432DC 87A4004E */ lh $a0, 0x004E($sp) +/* 110D0 808432E0 46128102 */ mul.s $f4, $f16, $f18 /* 110D4 808432E4 00000000 */ nop -/* 110D8 808432E8 46060202 */ mul.s $f8, $f0, $f6 -/* 110DC 808432EC 46044280 */ add.s $f10, $f8, $f4 -/* 110E0 808432F0 4600540D */ trunc.w.s $f16, $f10 -/* 110E4 808432F4 44058000 */ mfc1 $a1, $f16 +/* 110D8 808432E8 46060202 */ mul.s $f8, $f0, $f6 +/* 110DC 808432EC 46044280 */ add.s $f10, $f8, $f4 +/* 110E0 808432F0 4600540D */ trunc.w.s $f16, $f10 +/* 110E4 808432F4 44058000 */ mfc1 $a1, $f16 /* 110E8 808432F8 00000000 */ nop -/* 110EC 808432FC 00052C00 */ sll $a1, $a1, 16 -/* 110F0 80843300 00052C03 */ sra $a1, $a1, 16 +/* 110EC 808432FC 00052C00 */ sll $a1, $a1, 16 +/* 110F0 80843300 00052C03 */ sra $a1, $a1, 16 /* 110F4 80843304 0C01DE0D */ jal Math_Coss ## coss? -/* 110F8 80843308 A7A5004C */ sh $a1, 0x004C($sp) -/* 110FC 8084330C E7A00040 */ swc1 $f0, 0x0040($sp) +/* 110F8 80843308 A7A5004C */ sh $a1, 0x004C($sp) +/* 110FC 8084330C E7A00040 */ swc1 $f0, 0x0040($sp) /* 11100 80843310 0C01DE1C */ jal Math_Sins ## sins? -/* 11104 80843314 87A4004E */ lh $a0, 0x004E($sp) -/* 11108 80843318 C7B20050 */ lwc1 $f18, 0x0050($sp) -/* 1110C 8084331C C7A60040 */ lwc1 $f6, 0x0040($sp) -/* 11110 80843320 C7A40054 */ lwc1 $f4, 0x0054($sp) -/* 11114 80843324 87A5004C */ lh $a1, 0x004C($sp) -/* 11118 80843328 46069202 */ mul.s $f8, $f18, $f6 -/* 1111C 8084332C 28A10DAD */ slti $at, $a1, 0x0DAD -/* 11120 80843330 46040282 */ mul.s $f10, $f0, $f4 -/* 11124 80843334 460A4401 */ sub.s $f16, $f8, $f10 -/* 11128 80843338 4600848D */ trunc.w.s $f18, $f16 -/* 1112C 8084333C 44049000 */ mfc1 $a0, $f18 -/* 11130 80843340 14200002 */ bne $at, $zero, .L8084334C -/* 11134 80843344 A7A4004A */ sh $a0, 0x004A($sp) +/* 11104 80843314 87A4004E */ lh $a0, 0x004E($sp) +/* 11108 80843318 C7B20050 */ lwc1 $f18, 0x0050($sp) +/* 1110C 8084331C C7A60040 */ lwc1 $f6, 0x0040($sp) +/* 11110 80843320 C7A40054 */ lwc1 $f4, 0x0054($sp) +/* 11114 80843324 87A5004C */ lh $a1, 0x004C($sp) +/* 11118 80843328 46069202 */ mul.s $f8, $f18, $f6 +/* 1111C 8084332C 28A10DAD */ slti $at, $a1, 0x0DAD +/* 11120 80843330 46040282 */ mul.s $f10, $f0, $f4 +/* 11124 80843334 460A4401 */ sub.s $f16, $f8, $f10 +/* 11128 80843338 4600848D */ trunc.w.s $f18, $f16 +/* 1112C 8084333C 44049000 */ mfc1 $a0, $f18 +/* 11130 80843340 14200002 */ bne $at, $zero, .L8084334C +/* 11134 80843344 A7A4004A */ sh $a0, 0x004A($sp) /* 11138 80843348 24050DAC */ addiu $a1, $zero, 0x0DAC ## $a1 = 00000DAC .L8084334C: /* 1113C 8084334C 860C0044 */ lh $t4, 0x0044($s0) ## 00000044 -/* 11140 80843350 00AC1023 */ subu $v0, $a1, $t4 -/* 11144 80843354 04400003 */ bltz $v0, .L80843364 -/* 11148 80843358 00021823 */ subu $v1, $zero, $v0 -/* 1114C 8084335C 10000001 */ beq $zero, $zero, .L80843364 +/* 11140 80843350 00AC1023 */ subu $v0, $a1, $t4 +/* 11144 80843354 04400003 */ bltz $v0, .L80843364 +/* 11148 80843358 00021823 */ subu $v1, $zero, $v0 +/* 1114C 8084335C 10000001 */ beq $zero, $zero, .L80843364 /* 11150 80843360 00401825 */ or $v1, $v0, $zero ## $v1 = 00000000 .L80843364: /* 11154 80843364 44833000 */ mtc1 $v1, $f6 ## $f6 = 0.00 /* 11158 80843368 3C013E80 */ lui $at, 0x3E80 ## $at = 3E800000 /* 1115C 8084336C 44810000 */ mtc1 $at, $f0 ## $f0 = 0.25 -/* 11160 80843370 46803120 */ cvt.s.w $f4, $f6 -/* 11164 80843374 46002202 */ mul.s $f8, $f4, $f0 -/* 11168 80843378 4600428D */ trunc.w.s $f10, $f8 -/* 1116C 8084337C 44025000 */ mfc1 $v0, $f10 +/* 11160 80843370 46803120 */ cvt.s.w $f4, $f6 +/* 11164 80843374 46002202 */ mul.s $f8, $f4, $f0 +/* 11168 80843378 4600428D */ trunc.w.s $f10, $f8 +/* 1116C 8084337C 44025000 */ mfc1 $v0, $f10 /* 11170 80843380 00000000 */ nop -/* 11174 80843384 00027400 */ sll $t6, $v0, 16 -/* 11178 80843388 000E7C03 */ sra $t7, $t6, 16 -/* 1117C 8084338C 29E10064 */ slti $at, $t7, 0x0064 -/* 11180 80843390 00023400 */ sll $a2, $v0, 16 -/* 11184 80843394 10200002 */ beq $at, $zero, .L808433A0 -/* 11188 80843398 00063403 */ sra $a2, $a2, 16 +/* 11174 80843384 00027400 */ sll $t6, $v0, 16 +/* 11178 80843388 000E7C03 */ sra $t7, $t6, 16 +/* 1117C 8084338C 29E10064 */ slti $at, $t7, 0x0064 +/* 11180 80843390 00023400 */ sll $a2, $v0, 16 +/* 11184 80843394 10200002 */ beq $at, $zero, .L808433A0 +/* 11188 80843398 00063403 */ sra $a2, $a2, 16 /* 1118C 8084339C 24060064 */ addiu $a2, $zero, 0x0064 ## $a2 = 00000064 .L808433A0: /* 11190 808433A0 860806BE */ lh $t0, 0x06BE($s0) ## 000006BE -/* 11194 808433A4 0004C400 */ sll $t8, $a0, 16 -/* 11198 808433A8 0018CC03 */ sra $t9, $t8, 16 -/* 1119C 808433AC 03281023 */ subu $v0, $t9, $t0 -/* 111A0 808433B0 04400003 */ bltz $v0, .L808433C0 +/* 11194 808433A4 0004C400 */ sll $t8, $a0, 16 +/* 11198 808433A8 0018CC03 */ sra $t9, $t8, 16 +/* 1119C 808433AC 03281023 */ subu $v0, $t9, $t0 +/* 111A0 808433B0 04400003 */ bltz $v0, .L808433C0 /* 111A4 808433B4 26040044 */ addiu $a0, $s0, 0x0044 ## $a0 = 00000044 -/* 111A8 808433B8 10000002 */ beq $zero, $zero, .L808433C4 +/* 111A8 808433B8 10000002 */ beq $zero, $zero, .L808433C4 /* 111AC 808433BC 00401825 */ or $v1, $v0, $zero ## $v1 = 00000000 .L808433C0: -/* 111B0 808433C0 00021823 */ subu $v1, $zero, $v0 +/* 111B0 808433C0 00021823 */ subu $v1, $zero, $v0 .L808433C4: /* 111B4 808433C4 44838000 */ mtc1 $v1, $f16 ## $f16 = 0.00 /* 111B8 808433C8 00000000 */ nop -/* 111BC 808433CC 468084A0 */ cvt.s.w $f18, $f16 -/* 111C0 808433D0 46009182 */ mul.s $f6, $f18, $f0 -/* 111C4 808433D4 4600310D */ trunc.w.s $f4, $f6 -/* 111C8 808433D8 44022000 */ mfc1 $v0, $f4 +/* 111BC 808433CC 468084A0 */ cvt.s.w $f18, $f16 +/* 111C0 808433D0 46009182 */ mul.s $f6, $f18, $f0 +/* 111C4 808433D4 4600310D */ trunc.w.s $f4, $f6 +/* 111C8 808433D8 44022000 */ mfc1 $v0, $f4 /* 111CC 808433DC 00000000 */ nop -/* 111D0 808433E0 00025400 */ sll $t2, $v0, 16 -/* 111D4 808433E4 000A5C03 */ sra $t3, $t2, 16 -/* 111D8 808433E8 29610032 */ slti $at, $t3, 0x0032 -/* 111DC 808433EC 00023C00 */ sll $a3, $v0, 16 -/* 111E0 808433F0 10200002 */ beq $at, $zero, .L808433FC -/* 111E4 808433F4 00073C03 */ sra $a3, $a3, 16 +/* 111D0 808433E0 00025400 */ sll $t2, $v0, 16 +/* 111D4 808433E4 000A5C03 */ sra $t3, $t2, 16 +/* 111D8 808433E8 29610032 */ slti $at, $t3, 0x0032 +/* 111DC 808433EC 00023C00 */ sll $a3, $v0, 16 +/* 111E0 808433F0 10200002 */ beq $at, $zero, .L808433FC +/* 111E4 808433F4 00073C03 */ sra $a3, $a3, 16 /* 111E8 808433F8 24070032 */ addiu $a3, $zero, 0x0032 ## $a3 = 00000032 .L808433FC: /* 111EC 808433FC 0C01DE2B */ jal Math_ApproxUpdateScaledS - -/* 111F0 80843400 A7A70046 */ sh $a3, 0x0046($sp) -/* 111F4 80843404 87A70046 */ lh $a3, 0x0046($sp) + +/* 111F0 80843400 A7A70046 */ sh $a3, 0x0046($sp) +/* 111F4 80843404 87A70046 */ lh $a3, 0x0046($sp) /* 111F8 80843408 860C0044 */ lh $t4, 0x0044($s0) ## 00000044 /* 111FC 8084340C 260406BE */ addiu $a0, $s0, 0x06BE ## $a0 = 000006BE -/* 11200 80843410 00073400 */ sll $a2, $a3, 16 +/* 11200 80843410 00073400 */ sll $a2, $a3, 16 /* 11204 80843414 A60C06BC */ sh $t4, 0x06BC($s0) ## 000006BC -/* 11208 80843418 87A5004A */ lh $a1, 0x004A($sp) +/* 11208 80843418 87A5004A */ lh $a1, 0x004A($sp) /* 1120C 8084341C 0C01DE2B */ jal Math_ApproxUpdateScaledS - -/* 11210 80843420 00063403 */ sra $a2, $a2, 16 + +/* 11210 80843420 00063403 */ sra $a2, $a2, 16 /* 11214 80843424 820D084F */ lb $t5, 0x084F($s0) ## 0000084F /* 11218 80843428 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 1121C 8084342C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 11220 80843430 11A00014 */ beq $t5, $zero, .L80843484 +/* 11220 80843430 11A00014 */ beq $t5, $zero, .L80843484 /* 11224 80843434 00000000 */ nop -/* 11228 80843438 0C210B7D */ jal func_80842DF4 -/* 1122C 8084343C 8FA4005C */ lw $a0, 0x005C($sp) -/* 11230 80843440 1440000D */ bne $v0, $zero, .L80843478 +/* 11228 80843438 0C210B7D */ jal func_80842DF4 +/* 1122C 8084343C 8FA4005C */ lw $a0, 0x005C($sp) +/* 11230 80843440 1440000D */ bne $v0, $zero, .L80843478 /* 11234 80843444 240E0001 */ addiu $t6, $zero, 0x0001 ## $t6 = 00000001 /* 11238 80843448 3C014000 */ lui $at, 0x4000 ## $at = 40000000 /* 1123C 8084344C 44815000 */ mtc1 $at, $f10 ## $f10 = 2.00 /* 11240 80843450 C60801CC */ lwc1 $f8, 0x01CC($s0) ## 000001CC /* 11244 80843454 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 11248 80843458 460A403C */ c.lt.s $f8, $f10 +/* 11248 80843458 460A403C */ c.lt.s $f8, $f10 /* 1124C 8084345C 00000000 */ nop -/* 11250 80843460 4502004B */ bc1fl .L80843590 +/* 11250 80843460 4502004B */ bc1fl .L80843590 /* 11254 80843464 8E0B067C */ lw $t3, 0x067C($s0) ## 0000067C -/* 11258 80843468 0C20CE88 */ jal func_80833A20 +/* 11258 80843468 0C20CE88 */ jal func_80833A20 /* 1125C 8084346C 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 -/* 11260 80843470 10000047 */ beq $zero, $zero, .L80843590 +/* 11260 80843470 10000047 */ beq $zero, $zero, .L80843590 /* 11264 80843474 8E0B067C */ lw $t3, 0x067C($s0) ## 0000067C .L80843478: /* 11268 80843478 A60E0850 */ sh $t6, 0x0850($s0) ## 00000850 -/* 1126C 8084347C 10000043 */ beq $zero, $zero, .L8084358C +/* 1126C 8084347C 10000043 */ beq $zero, $zero, .L8084358C /* 11270 80843480 A200084F */ sb $zero, 0x084F($s0) ## 0000084F .L80843484: -/* 11274 80843484 0C210A59 */ jal func_80842964 -/* 11278 80843488 8FA5005C */ lw $a1, 0x005C($sp) -/* 1127C 8084348C 14400048 */ bne $v0, $zero, .L808435B0 +/* 11274 80843484 0C210A59 */ jal func_80842964 +/* 11278 80843488 8FA5005C */ lw $a1, 0x005C($sp) +/* 1127C 8084348C 14400048 */ bne $v0, $zero, .L808435B0 /* 11280 80843490 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 11284 80843494 0C20F0AC */ jal func_8083C2B0 -/* 11288 80843498 8FA5005C */ lw $a1, 0x005C($sp) -/* 1128C 8084349C 10400006 */ beq $v0, $zero, .L808434B8 +/* 11284 80843494 0C20F0AC */ jal func_8083C2B0 +/* 11288 80843498 8FA5005C */ lw $a1, 0x005C($sp) +/* 1128C 8084349C 10400006 */ beq $v0, $zero, .L808434B8 /* 11290 808434A0 3C01FFBF */ lui $at, 0xFFBF ## $at = FFBF0000 /* 11294 808434A4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 11298 808434A8 0C210A36 */ jal func_808428D8 -/* 1129C 808434AC 8FA5005C */ lw $a1, 0x005C($sp) -/* 112A0 808434B0 10000037 */ beq $zero, $zero, .L80843590 +/* 11298 808434A8 0C210A36 */ jal func_808428D8 +/* 1129C 808434AC 8FA5005C */ lw $a1, 0x005C($sp) +/* 112A0 808434B0 10000037 */ beq $zero, $zero, .L80843590 /* 112A4 808434B4 8E0B067C */ lw $t3, 0x067C($s0) ## 0000067C .L808434B8: /* 112A8 808434B8 8E0F067C */ lw $t7, 0x067C($s0) ## 0000067C /* 112AC 808434BC 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 0000FFFF /* 112B0 808434C0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 112B4 808434C4 01E1C024 */ and $t8, $t7, $at -/* 112B8 808434C8 0C20C8C6 */ jal func_80832318 +/* 112B4 808434C4 01E1C024 */ and $t8, $t7, $at +/* 112B8 808434C8 0C20C8C6 */ jal func_80832318 /* 112BC 808434CC AE18067C */ sw $t8, 0x067C($s0) ## 0000067C -/* 112C0 808434D0 0C023A74 */ jal func_8008E9D0 +/* 112C0 808434D0 0C023A74 */ jal func_8008E9D0 /* 112C4 808434D4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 112C8 808434D8 1040001A */ beq $v0, $zero, .L80843544 +/* 112C8 808434D8 1040001A */ beq $v0, $zero, .L80843544 /* 112CC 808434DC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 112D0 808434E0 0C20E818 */ jal func_8083A060 -/* 112D4 808434E4 8FA5005C */ lw $a1, 0x005C($sp) +/* 112D0 808434E0 0C20E818 */ jal func_8083A060 +/* 112D4 808434E4 8FA5005C */ lw $a1, 0x005C($sp) /* 112D8 808434E8 3C040400 */ lui $a0, 0x0400 ## $a0 = 04000000 /* 112DC 808434EC 0C028800 */ jal SkelAnime_GetFrameCount - + /* 112E0 808434F0 24842400 */ addiu $a0, $a0, 0x2400 ## $a0 = 04002400 /* 112E4 808434F4 44828000 */ mtc1 $v0, $f16 ## $f16 = 0.00 /* 112E8 808434F8 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 /* 112EC 808434FC 3C060400 */ lui $a2, 0x0400 ## $a2 = 04000000 -/* 112F0 80843500 468084A0 */ cvt.s.w $f18, $f16 +/* 112F0 80843500 468084A0 */ cvt.s.w $f18, $f16 /* 112F4 80843504 24190002 */ addiu $t9, $zero, 0x0002 ## $t9 = 00000002 -/* 112F8 80843508 AFB90018 */ sw $t9, 0x0018($sp) +/* 112F8 80843508 AFB90018 */ sw $t9, 0x0018($sp) /* 112FC 8084350C 24C62400 */ addiu $a2, $a2, 0x2400 ## $a2 = 04002400 -/* 11300 80843510 8FA4005C */ lw $a0, 0x005C($sp) -/* 11304 80843514 8FA50034 */ lw $a1, 0x0034($sp) -/* 11308 80843518 E7B20010 */ swc1 $f18, 0x0010($sp) +/* 11300 80843510 8FA4005C */ lw $a0, 0x005C($sp) +/* 11304 80843514 8FA50034 */ lw $a1, 0x0034($sp) +/* 11308 80843518 E7B20010 */ swc1 $f18, 0x0010($sp) /* 1130C 8084351C 3C073F80 */ lui $a3, 0x3F80 ## $a3 = 3F800000 -/* 11310 80843520 E7A00014 */ swc1 $f0, 0x0014($sp) -/* 11314 80843524 0C028FC2 */ jal func_800A3F08 -/* 11318 80843528 E7A0001C */ swc1 $f0, 0x001C($sp) -/* 1131C 8084352C 8FA4005C */ lw $a0, 0x005C($sp) +/* 11310 80843520 E7A00014 */ swc1 $f0, 0x0014($sp) +/* 11314 80843524 0C028FC2 */ jal SkelAnime_ChangeLinkAnim +/* 11318 80843528 E7A0001C */ swc1 $f0, 0x001C($sp) +/* 1131C 8084352C 8FA4005C */ lw $a0, 0x005C($sp) /* 11320 80843530 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 11324 80843534 0C20CBD5 */ jal func_80832F54 +/* 11324 80843534 0C20CBD5 */ jal func_80832F54 /* 11328 80843538 24060004 */ addiu $a2, $zero, 0x0004 ## $a2 = 00000004 -/* 1132C 8084353C 1000000F */ beq $zero, $zero, .L8084357C +/* 1132C 8084353C 1000000F */ beq $zero, $zero, .L8084357C /* 11330 80843540 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 .L80843544: /* 11334 80843544 82080154 */ lb $t0, 0x0154($s0) ## 00000154 -/* 11338 80843548 05030004 */ bgezl $t0, .L8084355C +/* 11338 80843548 05030004 */ bgezl $t0, .L8084355C /* 1133C 8084354C 9209015B */ lbu $t1, 0x015B($s0) ## 0000015B -/* 11340 80843550 0C023B1C */ jal func_8008EC70 +/* 11340 80843550 0C023B1C */ jal func_8008EC70 /* 11344 80843554 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 11348 80843558 9209015B */ lbu $t1, 0x015B($s0) ## 0000015B .L8084355C: /* 1134C 8084355C 3C058085 */ lui $a1, %hi(D_80853B24) ## $a1 = 80850000 /* 11350 80843560 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 11354 80843564 00095080 */ sll $t2, $t1, 2 -/* 11358 80843568 00AA2821 */ addu $a1, $a1, $t2 -/* 1135C 8084356C 8CA53B24 */ lw $a1, %lo(D_80853B24)($a1) -/* 11360 80843570 0C20E826 */ jal func_8083A098 -/* 11364 80843574 8FA6005C */ lw $a2, 0x005C($sp) +/* 11354 80843564 00095080 */ sll $t2, $t1, 2 +/* 11358 80843568 00AA2821 */ addu $a1, $a1, $t2 +/* 1135C 8084356C 8CA53B24 */ lw $a1, %lo(D_80853B24)($a1) +/* 11360 80843570 0C20E826 */ jal func_8083A098 +/* 11364 80843574 8FA6005C */ lw $a2, 0x005C($sp) /* 11368 80843578 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 .L8084357C: -/* 1136C 8084357C 0C00BDF7 */ jal func_8002F7DC +/* 1136C 8084357C 0C00BDF7 */ jal func_8002F7DC /* 11370 80843580 24051826 */ addiu $a1, $zero, 0x1826 ## $a1 = 00001826 -/* 11374 80843584 1000000B */ beq $zero, $zero, .L808435B4 -/* 11378 80843588 8FBF002C */ lw $ra, 0x002C($sp) +/* 11374 80843584 1000000B */ beq $zero, $zero, .L808435B4 +/* 11378 80843588 8FBF002C */ lw $ra, 0x002C($sp) .L8084358C: /* 1137C 8084358C 8E0B067C */ lw $t3, 0x067C($s0) ## 0000067C .L80843590: /* 11380 80843590 3C010040 */ lui $at, 0x0040 ## $at = 00400000 /* 11384 80843594 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 11388 80843598 01616025 */ or $t4, $t3, $at ## $t4 = 00400000 -/* 1138C 8084359C 0C023A90 */ jal func_8008EA40 +/* 1138C 8084359C 0C023A90 */ jal func_8008EA40 /* 11390 808435A0 AE0C067C */ sw $t4, 0x067C($s0) ## 0000067C /* 11394 808435A4 960D06AE */ lhu $t5, 0x06AE($s0) ## 000006AE /* 11398 808435A8 35AE00C1 */ ori $t6, $t5, 0x00C1 ## $t6 = 000000C1 /* 1139C 808435AC A60E06AE */ sh $t6, 0x06AE($s0) ## 000006AE .L808435B0: -/* 113A0 808435B0 8FBF002C */ lw $ra, 0x002C($sp) +/* 113A0 808435B0 8FBF002C */ lw $ra, 0x002C($sp) .L808435B4: -/* 113A4 808435B4 8FB00028 */ lw $s0, 0x0028($sp) +/* 113A4 808435B4 8FB00028 */ lw $s0, 0x0028($sp) /* 113A8 808435B8 27BD0058 */ addiu $sp, $sp, 0x0058 ## $sp = 00000000 -/* 113AC 808435BC 03E00008 */ jr $ra +/* 113AC 808435BC 03E00008 */ jr $ra /* 113B0 808435C0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808435C4.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_808435C4.s index bdeedcc427..fca7ec4f28 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808435C4.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_808435C4.s @@ -1,91 +1,91 @@ glabel func_808435C4 /* 113B4 808435C4 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 -/* 113B8 808435C8 AFBF002C */ sw $ra, 0x002C($sp) -/* 113BC 808435CC AFB10028 */ sw $s1, 0x0028($sp) -/* 113C0 808435D0 AFB00024 */ sw $s0, 0x0024($sp) +/* 113B8 808435C8 AFBF002C */ sw $ra, 0x002C($sp) +/* 113BC 808435CC AFB10028 */ sw $s1, 0x0028($sp) +/* 113C0 808435D0 AFB00024 */ sw $s0, 0x0024($sp) /* 113C4 808435D4 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 113C8 808435D8 0C20DC87 */ jal func_8083721C +/* 113C8 808435D8 0C20DC87 */ jal func_8083721C /* 113CC 808435DC 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 /* 113D0 808435E0 820E084F */ lb $t6, 0x084F($s0) ## 0000084F /* 113D4 808435E4 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 113D8 808435E8 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 113DC 808435EC 15C00018 */ bne $t6, $zero, .L80843650 +/* 113DC 808435EC 15C00018 */ bne $t6, $zero, .L80843650 /* 113E0 808435F0 260601B4 */ addiu $a2, $s0, 0x01B4 ## $a2 = 000001B4 /* 113E4 808435F4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 113E8 808435F8 0C20D99C */ jal func_80836670 +/* 113E8 808435F8 0C20D99C */ jal func_80836670 /* 113EC 808435FC 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 /* 113F0 80843600 3C018085 */ lui $at, %hi(D_808535E0) ## $at = 80850000 -/* 113F4 80843604 AC2235E0 */ sw $v0, %lo(D_808535E0)($at) +/* 113F4 80843604 AC2235E0 */ sw $v0, %lo(D_808535E0)($at) /* 113F8 80843608 8E0F082C */ lw $t7, 0x082C($s0) ## 0000082C /* 113FC 8084360C 3C188083 */ lui $t8, %hi(func_80834B5C) ## $t8 = 80830000 /* 11400 80843610 27184B5C */ addiu $t8, $t8, %lo(func_80834B5C) ## $t8 = 80834B5C -/* 11404 80843614 11F80006 */ beq $t7, $t8, .L80843630 +/* 11404 80843614 11F80006 */ beq $t7, $t8, .L80843630 /* 11408 80843618 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 1140C 8084361C 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 11410 80843620 260606C8 */ addiu $a2, $s0, 0x06C8 ## $a2 = 000006C8 -/* 11414 80843624 0C20DD28 */ jal func_808374A0 +/* 11414 80843624 0C20DD28 */ jal func_808374A0 /* 11418 80843628 3C074080 */ lui $a3, 0x4080 ## $a3 = 40800000 -/* 1141C 8084362C 18400032 */ blez $v0, .L808436F8 +/* 1141C 8084362C 18400032 */ blez $v0, .L808436F8 .L80843630: /* 11420 80843630 3C068084 */ lui $a2, %hi(func_80840450) ## $a2 = 80840000 /* 11424 80843634 24C60450 */ addiu $a2, $a2, %lo(func_80840450) ## $a2 = 80840450 /* 11428 80843638 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 1142C 8084363C 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 11430 80843640 0C20D716 */ jal func_80835C58 +/* 11430 80843640 0C20D716 */ jal func_80835C58 /* 11434 80843644 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 11438 80843648 1000002C */ beq $zero, $zero, .L808436FC -/* 1143C 8084364C 8FBF002C */ lw $ra, 0x002C($sp) +/* 11438 80843648 1000002C */ beq $zero, $zero, .L808436FC +/* 1143C 8084364C 8FBF002C */ lw $ra, 0x002C($sp) .L80843650: /* 11440 80843650 3C074080 */ lui $a3, 0x4080 ## $a3 = 40800000 -/* 11444 80843654 0C20DD28 */ jal func_808374A0 -/* 11448 80843658 AFA60030 */ sw $a2, 0x0030($sp) -/* 1144C 8084365C 50400027 */ beql $v0, $zero, .L808436FC -/* 11450 80843660 8FBF002C */ lw $ra, 0x002C($sp) -/* 11454 80843664 1C400004 */ bgtz $v0, .L80843678 +/* 11444 80843654 0C20DD28 */ jal func_808374A0 +/* 11448 80843658 AFA60030 */ sw $a2, 0x0030($sp) +/* 1144C 8084365C 50400027 */ beql $v0, $zero, .L808436FC +/* 11450 80843660 8FBF002C */ lw $ra, 0x002C($sp) +/* 11454 80843664 1C400004 */ bgtz $v0, .L80843678 /* 11458 80843668 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 1145C 8084366C 0C028EF0 */ jal func_800A3BC0 -/* 11460 80843670 8FA50030 */ lw $a1, 0x0030($sp) -/* 11464 80843674 10400020 */ beq $v0, $zero, .L808436F8 +/* 1145C 8084366C 0C028EF0 */ jal func_800A3BC0 +/* 11460 80843670 8FA50030 */ lw $a1, 0x0030($sp) +/* 11464 80843674 10400020 */ beq $v0, $zero, .L808436F8 .L80843678: /* 11468 80843678 3C068084 */ lui $a2, %hi(func_80843188) ## $a2 = 80840000 /* 1146C 8084367C 24C63188 */ addiu $a2, $a2, %lo(func_80843188) ## $a2 = 80843188 /* 11470 80843680 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 11474 80843684 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 11478 80843688 0C20D716 */ jal func_80835C58 +/* 11478 80843688 0C20D716 */ jal func_80835C58 /* 1147C 8084368C 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 /* 11480 80843690 8E19067C */ lw $t9, 0x067C($s0) ## 0000067C /* 11484 80843694 3C010040 */ lui $at, 0x0040 ## $at = 00400000 /* 11488 80843698 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 1148C 8084369C 03214025 */ or $t0, $t9, $at ## $t0 = 00400000 -/* 11490 808436A0 0C023A90 */ jal func_8008EA40 +/* 11490 808436A0 0C023A90 */ jal func_8008EA40 /* 11494 808436A4 AE08067C */ sw $t0, 0x067C($s0) ## 0000067C /* 11498 808436A8 9209015B */ lbu $t1, 0x015B($s0) ## 0000015B /* 1149C 808436AC 3C068085 */ lui $a2, %hi(D_80853AF4) ## $a2 = 80850000 -/* 114A0 808436B0 00095080 */ sll $t2, $t1, 2 -/* 114A4 808436B4 00CA3021 */ addu $a2, $a2, $t2 -/* 114A8 808436B8 8CC43AF4 */ lw $a0, %lo(D_80853AF4)($a2) +/* 114A0 808436B0 00095080 */ sll $t2, $t1, 2 +/* 114A4 808436B4 00CA3021 */ addu $a2, $a2, $t2 +/* 114A8 808436B8 8CC43AF4 */ lw $a0, %lo(D_80853AF4)($a2) /* 114AC 808436BC 0C028800 */ jal SkelAnime_GetFrameCount - -/* 114B0 808436C0 AFA40038 */ sw $a0, 0x0038($sp) + +/* 114B0 808436C0 AFA40038 */ sw $a0, 0x0038($sp) /* 114B4 808436C4 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00 /* 114B8 808436C8 44803000 */ mtc1 $zero, $f6 ## $f6 = 0.00 /* 114BC 808436CC 240B0002 */ addiu $t3, $zero, 0x0002 ## $t3 = 00000002 -/* 114C0 808436D0 46802020 */ cvt.s.w $f0, $f4 -/* 114C4 808436D4 8FA60038 */ lw $a2, 0x0038($sp) -/* 114C8 808436D8 AFAB0018 */ sw $t3, 0x0018($sp) +/* 114C0 808436D0 46802020 */ cvt.s.w $f0, $f4 +/* 114C4 808436D4 8FA60038 */ lw $a2, 0x0038($sp) +/* 114C8 808436D8 AFAB0018 */ sw $t3, 0x0018($sp) /* 114CC 808436DC 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 114D0 808436E0 8FA50030 */ lw $a1, 0x0030($sp) +/* 114D0 808436E0 8FA50030 */ lw $a1, 0x0030($sp) /* 114D4 808436E4 3C073F80 */ lui $a3, 0x3F80 ## $a3 = 3F800000 -/* 114D8 808436E8 E7A00010 */ swc1 $f0, 0x0010($sp) -/* 114DC 808436EC E7A00014 */ swc1 $f0, 0x0014($sp) -/* 114E0 808436F0 0C028FC2 */ jal func_800A3F08 -/* 114E4 808436F4 E7A6001C */ swc1 $f6, 0x001C($sp) +/* 114D8 808436E8 E7A00010 */ swc1 $f0, 0x0010($sp) +/* 114DC 808436EC E7A00014 */ swc1 $f0, 0x0014($sp) +/* 114E0 808436F0 0C028FC2 */ jal SkelAnime_ChangeLinkAnim +/* 114E4 808436F4 E7A6001C */ swc1 $f6, 0x001C($sp) .L808436F8: -/* 114E8 808436F8 8FBF002C */ lw $ra, 0x002C($sp) +/* 114E8 808436F8 8FBF002C */ lw $ra, 0x002C($sp) .L808436FC: -/* 114EC 808436FC 8FB00024 */ lw $s0, 0x0024($sp) -/* 114F0 80843700 8FB10028 */ lw $s1, 0x0028($sp) -/* 114F4 80843704 03E00008 */ jr $ra +/* 114EC 808436FC 8FB00024 */ lw $s0, 0x0024($sp) +/* 114F0 80843700 8FB10028 */ lw $s1, 0x0028($sp) +/* 114F4 80843704 03E00008 */ jr $ra /* 114F8 80843708 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80843AE8.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80843AE8.s index eb4f623f2b..d87849eb9a 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80843AE8.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80843AE8.s @@ -1,143 +1,143 @@ glabel func_80843AE8 /* 118D8 80843AE8 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 118DC 80843AEC AFBF002C */ sw $ra, 0x002C($sp) -/* 118E0 80843AF0 AFB00028 */ sw $s0, 0x0028($sp) -/* 118E4 80843AF4 AFA40030 */ sw $a0, 0x0030($sp) +/* 118DC 80843AEC AFBF002C */ sw $ra, 0x002C($sp) +/* 118E0 80843AF0 AFB00028 */ sw $s0, 0x0028($sp) +/* 118E4 80843AF4 AFA40030 */ sw $a0, 0x0030($sp) /* 118E8 80843AF8 84A20850 */ lh $v0, 0x0850($a1) ## 00000850 /* 118EC 80843AFC 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 -/* 118F0 80843B00 50400055 */ beql $v0, $zero, .L80843C58 +/* 118F0 80843B00 50400055 */ beql $v0, $zero, .L80843C58 /* 118F4 80843B04 8208084F */ lb $t0, 0x084F($s0) ## 0000084F -/* 118F8 80843B08 18400038 */ blez $v0, .L80843BEC +/* 118F8 80843B08 18400038 */ blez $v0, .L80843BEC /* 118FC 80843B0C 3C0C8016 */ lui $t4, 0x8016 ## $t4 = 80160000 /* 11900 80843B10 244EFFFF */ addiu $t6, $v0, 0xFFFF ## $t6 = FFFFFFFF /* 11904 80843B14 A4AE0850 */ sh $t6, 0x0850($a1) ## 00000850 /* 11908 80843B18 84AF0850 */ lh $t7, 0x0850($a1) ## 00000850 -/* 1190C 80843B1C 55E0006F */ bnel $t7, $zero, .L80843CDC -/* 11910 80843B20 8FBF002C */ lw $ra, 0x002C($sp) +/* 1190C 80843B1C 55E0006F */ bnel $t7, $zero, .L80843CDC +/* 11910 80843B20 8FBF002C */ lw $ra, 0x002C($sp) /* 11914 80843B24 8CB8067C */ lw $t8, 0x067C($a1) ## 0000067C /* 11918 80843B28 3C040400 */ lui $a0, 0x0400 ## $a0 = 04000000 -/* 1191C 80843B2C 0018C900 */ sll $t9, $t8, 4 -/* 11920 80843B30 07210016 */ bgez $t9, .L80843B8C +/* 1191C 80843B2C 0018C900 */ sll $t9, $t8, 4 +/* 11920 80843B30 07210016 */ bgez $t9, .L80843B8C /* 11924 80843B34 00000000 */ nop /* 11928 80843B38 3C040400 */ lui $a0, 0x0400 ## $a0 = 04000000 /* 1192C 80843B3C 0C028800 */ jal SkelAnime_GetFrameCount - + /* 11930 80843B40 24843328 */ addiu $a0, $a0, 0x3328 ## $a0 = 04003328 /* 11934 80843B44 44823000 */ mtc1 $v0, $f6 ## $f6 = 0.00 /* 11938 80843B48 3C01C180 */ lui $at, 0xC180 ## $at = C1800000 /* 1193C 80843B4C 44815000 */ mtc1 $at, $f10 ## $f10 = -16.00 -/* 11940 80843B50 46803220 */ cvt.s.w $f8, $f6 +/* 11940 80843B50 46803220 */ cvt.s.w $f8, $f6 /* 11944 80843B54 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 /* 11948 80843B58 3C060400 */ lui $a2, 0x0400 ## $a2 = 04000000 /* 1194C 80843B5C 24080002 */ addiu $t0, $zero, 0x0002 ## $t0 = 00000002 -/* 11950 80843B60 AFA80018 */ sw $t0, 0x0018($sp) +/* 11950 80843B60 AFA80018 */ sw $t0, 0x0018($sp) /* 11954 80843B64 24C63328 */ addiu $a2, $a2, 0x3328 ## $a2 = 04003328 -/* 11958 80843B68 E7A80014 */ swc1 $f8, 0x0014($sp) -/* 1195C 80843B6C 8FA40030 */ lw $a0, 0x0030($sp) +/* 11958 80843B68 E7A80014 */ swc1 $f8, 0x0014($sp) +/* 1195C 80843B6C 8FA40030 */ lw $a0, 0x0030($sp) /* 11960 80843B70 260501B4 */ addiu $a1, $s0, 0x01B4 ## $a1 = 000001B4 /* 11964 80843B74 3C073F80 */ lui $a3, 0x3F80 ## $a3 = 3F800000 -/* 11968 80843B78 E7AA001C */ swc1 $f10, 0x001C($sp) -/* 1196C 80843B7C 0C028FC2 */ jal func_800A3F08 -/* 11970 80843B80 E7A40010 */ swc1 $f4, 0x0010($sp) -/* 11974 80843B84 10000014 */ beq $zero, $zero, .L80843BD8 +/* 11968 80843B78 E7AA001C */ swc1 $f10, 0x001C($sp) +/* 1196C 80843B7C 0C028FC2 */ jal SkelAnime_ChangeLinkAnim +/* 11970 80843B80 E7A40010 */ swc1 $f4, 0x0010($sp) +/* 11974 80843B84 10000014 */ beq $zero, $zero, .L80843BD8 /* 11978 80843B88 240A0140 */ addiu $t2, $zero, 0x0140 ## $t2 = 00000140 .L80843B8C: /* 1197C 80843B8C 0C028800 */ jal SkelAnime_GetFrameCount - + /* 11980 80843B90 24842878 */ addiu $a0, $a0, 0x2878 ## $a0 = 00002878 /* 11984 80843B94 44829000 */ mtc1 $v0, $f18 ## $f18 = 0.00 /* 11988 80843B98 3C0142C6 */ lui $at, 0x42C6 ## $at = 42C60000 /* 1198C 80843B9C 44818000 */ mtc1 $at, $f16 ## $f16 = 99.00 -/* 11990 80843BA0 46809120 */ cvt.s.w $f4, $f18 +/* 11990 80843BA0 46809120 */ cvt.s.w $f4, $f18 /* 11994 80843BA4 44803000 */ mtc1 $zero, $f6 ## $f6 = 0.00 /* 11998 80843BA8 3C060400 */ lui $a2, 0x0400 ## $a2 = 04000000 /* 1199C 80843BAC 24090002 */ addiu $t1, $zero, 0x0002 ## $t1 = 00000002 -/* 119A0 80843BB0 AFA90018 */ sw $t1, 0x0018($sp) +/* 119A0 80843BB0 AFA90018 */ sw $t1, 0x0018($sp) /* 119A4 80843BB4 24C62878 */ addiu $a2, $a2, 0x2878 ## $a2 = 04002878 -/* 119A8 80843BB8 E7A40014 */ swc1 $f4, 0x0014($sp) -/* 119AC 80843BBC 8FA40030 */ lw $a0, 0x0030($sp) +/* 119A8 80843BB8 E7A40014 */ swc1 $f4, 0x0014($sp) +/* 119AC 80843BBC 8FA40030 */ lw $a0, 0x0030($sp) /* 119B0 80843BC0 260501B4 */ addiu $a1, $s0, 0x01B4 ## $a1 = 000001B4 /* 119B4 80843BC4 3C073F80 */ lui $a3, 0x3F80 ## $a3 = 3F800000 -/* 119B8 80843BC8 E7B00010 */ swc1 $f16, 0x0010($sp) -/* 119BC 80843BCC 0C028FC2 */ jal func_800A3F08 -/* 119C0 80843BD0 E7A6001C */ swc1 $f6, 0x001C($sp) +/* 119B8 80843BC8 E7B00010 */ swc1 $f16, 0x0010($sp) +/* 119BC 80843BCC 0C028FC2 */ jal SkelAnime_ChangeLinkAnim +/* 119C0 80843BD0 E7A6001C */ swc1 $f6, 0x001C($sp) /* 119C4 80843BD4 240A0140 */ addiu $t2, $zero, 0x0140 ## $t2 = 00000140 .L80843BD8: /* 119C8 80843BD8 3C018016 */ lui $at, 0x8016 ## $at = 80160000 /* 119CC 80843BDC A42AFA84 */ sh $t2, -0x057C($at) ## 8015FA84 /* 119D0 80843BE0 240BFFFF */ addiu $t3, $zero, 0xFFFF ## $t3 = FFFFFFFF -/* 119D4 80843BE4 1000003C */ beq $zero, $zero, .L80843CD8 +/* 119D4 80843BE4 1000003C */ beq $zero, $zero, .L80843CD8 /* 119D8 80843BE8 A60B0850 */ sh $t3, 0x0850($s0) ## 00000850 .L80843BEC: /* 119DC 80843BEC 858CFA84 */ lh $t4, -0x057C($t4) ## FFFFFA84 -/* 119E0 80843BF0 5580003A */ bnel $t4, $zero, .L80843CDC -/* 119E4 80843BF4 8FBF002C */ lw $ra, 0x002C($sp) +/* 119E0 80843BF0 5580003A */ bnel $t4, $zero, .L80843CDC +/* 119E4 80843BF4 8FBF002C */ lw $ra, 0x002C($sp) /* 119E8 80843BF8 8E0D067C */ lw $t5, 0x067C($s0) ## 0000067C /* 119EC 80843BFC 2401FF7F */ addiu $at, $zero, 0xFF7F ## $at = FFFFFF7F /* 119F0 80843C00 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 119F4 80843C04 01A17024 */ and $t6, $t5, $at -/* 119F8 80843C08 000EC100 */ sll $t8, $t6, 4 -/* 119FC 80843C0C 07010006 */ bgez $t8, .L80843C28 +/* 119F4 80843C04 01A17024 */ and $t6, $t5, $at +/* 119F8 80843C08 000EC100 */ sll $t8, $t6, 4 +/* 119FC 80843C0C 07010006 */ bgez $t8, .L80843C28 /* 11A00 80843C10 AE0E067C */ sw $t6, 0x067C($s0) ## 0000067C -/* 11A04 80843C14 8FA40030 */ lw $a0, 0x0030($sp) -/* 11A08 80843C18 0C20E3C6 */ jal func_80838F18 +/* 11A04 80843C14 8FA40030 */ lw $a0, 0x0030($sp) +/* 11A08 80843C18 0C20E3C6 */ jal func_80838F18 /* 11A0C 80843C1C 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 11A10 80843C20 10000004 */ beq $zero, $zero, .L80843C34 +/* 11A10 80843C20 10000004 */ beq $zero, $zero, .L80843C34 /* 11A14 80843C24 24190014 */ addiu $t9, $zero, 0x0014 ## $t9 = 00000014 .L80843C28: -/* 11A18 80843C28 0C214C20 */ jal func_80853080 -/* 11A1C 80843C2C 8FA50030 */ lw $a1, 0x0030($sp) +/* 11A18 80843C28 0C214C20 */ jal func_80853080 +/* 11A1C 80843C2C 8FA50030 */ lw $a1, 0x0030($sp) /* 11A20 80843C30 24190014 */ addiu $t9, $zero, 0x0014 ## $t9 = 00000014 .L80843C34: /* 11A24 80843C34 A2190A87 */ sb $t9, 0x0A87($s0) ## 00000A87 /* 11A28 80843C38 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 11A2C 80843C3C 0C20DEBF */ jal func_80837AFC +/* 11A2C 80843C3C 0C20DEBF */ jal func_80837AFC /* 11A30 80843C40 2405FFEC */ addiu $a1, $zero, 0xFFEC ## $a1 = FFFFFFEC -/* 11A34 80843C44 0C03D1FF */ jal func_800F47FC +/* 11A34 80843C44 0C03D1FF */ jal func_800F47FC /* 11A38 80843C48 00000000 */ nop -/* 11A3C 80843C4C 10000023 */ beq $zero, $zero, .L80843CDC -/* 11A40 80843C50 8FBF002C */ lw $ra, 0x002C($sp) +/* 11A3C 80843C4C 10000023 */ beq $zero, $zero, .L80843CDC +/* 11A40 80843C50 8FBF002C */ lw $ra, 0x002C($sp) /* 11A44 80843C54 8208084F */ lb $t0, 0x084F($s0) ## 0000084F .L80843C58: -/* 11A48 80843C58 8FAB0030 */ lw $t3, 0x0030($sp) +/* 11A48 80843C58 8FAB0030 */ lw $t3, 0x0030($sp) /* 11A4C 80843C5C 3C0C0001 */ lui $t4, 0x0001 ## $t4 = 00010000 -/* 11A50 80843C60 11000016 */ beq $t0, $zero, .L80843CBC -/* 11A54 80843C64 018B6021 */ addu $t4, $t4, $t3 +/* 11A50 80843C60 11000016 */ beq $t0, $zero, .L80843CBC +/* 11A54 80843C64 018B6021 */ addu $t4, $t4, $t3 /* 11A58 80843C68 2409003C */ addiu $t1, $zero, 0x003C ## $t1 = 0000003C /* 11A5C 80843C6C A6090850 */ sh $t1, 0x0850($s0) ## 00000850 /* 11A60 80843C70 3C078085 */ lui $a3, %hi(D_808545E4) ## $a3 = 80850000 /* 11A64 80843C74 240A0005 */ addiu $t2, $zero, 0x0005 ## $t2 = 00000005 -/* 11A68 80843C78 AFAA0010 */ sw $t2, 0x0010($sp) +/* 11A68 80843C78 AFAA0010 */ sw $t2, 0x0010($sp) /* 11A6C 80843C7C 24E745E4 */ addiu $a3, $a3, %lo(D_808545E4) ## $a3 = 808545E4 -/* 11A70 80843C80 8FA40030 */ lw $a0, 0x0030($sp) +/* 11A70 80843C80 8FA40030 */ lw $a0, 0x0030($sp) /* 11A74 80843C84 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 11A78 80843C88 0C20E5A0 */ jal func_80839680 +/* 11A78 80843C88 0C20E5A0 */ jal func_80839680 /* 11A7C 80843C8C 26060024 */ addiu $a2, $s0, 0x0024 ## $a2 = 00000024 /* 11A80 80843C90 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 11A84 80843C94 0C00BDF7 */ jal func_8002F7DC +/* 11A84 80843C94 0C00BDF7 */ jal func_8002F7DC /* 11A88 80843C98 240520A8 */ addiu $a1, $zero, 0x20A8 ## $a1 = 000020A8 -/* 11A8C 80843C9C 8FA40030 */ lw $a0, 0x0030($sp) +/* 11A8C 80843C9C 8FA40030 */ lw $a0, 0x0030($sp) /* 11A90 80843CA0 240526B4 */ addiu $a1, $zero, 0x26B4 ## $a1 = 000026B4 /* 11A94 80843CA4 2406007D */ addiu $a2, $zero, 0x007D ## $a2 = 0000007D /* 11A98 80843CA8 02003825 */ or $a3, $s0, $zero ## $a3 = 00000000 -/* 11A9C 80843CAC 0C02003E */ jal func_800800F8 -/* 11AA0 80843CB0 AFA00010 */ sw $zero, 0x0010($sp) -/* 11AA4 80843CB4 10000009 */ beq $zero, $zero, .L80843CDC -/* 11AA8 80843CB8 8FBF002C */ lw $ra, 0x002C($sp) +/* 11A9C 80843CAC 0C02003E */ jal func_800800F8 +/* 11AA0 80843CB0 AFA00010 */ sw $zero, 0x0010($sp) +/* 11AA4 80843CB4 10000009 */ beq $zero, $zero, .L80843CDC +/* 11AA8 80843CB8 8FBF002C */ lw $ra, 0x002C($sp) .L80843CBC: /* 11AAC 80843CBC 958C0A20 */ lhu $t4, 0x0A20($t4) ## 00000A20 /* 11AB0 80843CC0 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 /* 11AB4 80843CC4 240D0003 */ addiu $t5, $zero, 0x0003 ## $t5 = 00000003 -/* 11AB8 80843CC8 15810003 */ bne $t4, $at, .L80843CD8 +/* 11AB8 80843CC8 15810003 */ bne $t4, $at, .L80843CD8 /* 11ABC 80843CCC 3C010001 */ lui $at, 0x0001 ## $at = 00010000 -/* 11AC0 80843CD0 002B0821 */ addu $at, $at, $t3 +/* 11AC0 80843CD0 002B0821 */ addu $at, $at, $t3 /* 11AC4 80843CD4 A42D0A20 */ sh $t5, 0x0A20($at) ## 00010A20 .L80843CD8: -/* 11AC8 80843CD8 8FBF002C */ lw $ra, 0x002C($sp) +/* 11AC8 80843CD8 8FBF002C */ lw $ra, 0x002C($sp) .L80843CDC: -/* 11ACC 80843CDC 8FB00028 */ lw $s0, 0x0028($sp) +/* 11ACC 80843CDC 8FB00028 */ lw $s0, 0x0028($sp) /* 11AD0 80843CE0 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 11AD4 80843CE4 03E00008 */ jr $ra +/* 11AD4 80843CE4 03E00008 */ jr $ra /* 11AD8 80843CE8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084411C.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084411C.s index e38aa00a34..7e9286c43c 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084411C.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084411C.s @@ -2,408 +2,408 @@ glabel func_8084411C /* 11F0C 8084411C 3C0E8016 */ lui $t6, 0x8016 ## $t6 = 80160000 /* 11F10 80844120 81CEFA13 */ lb $t6, -0x05ED($t6) ## 8015FA13 /* 11F14 80844124 27BDFFB0 */ addiu $sp, $sp, 0xFFB0 ## $sp = FFFFFFB0 -/* 11F18 80844128 AFB00028 */ sw $s0, 0x0028($sp) -/* 11F1C 8084412C 29C10029 */ slti $at, $t6, 0x0029 +/* 11F18 80844128 AFB00028 */ sw $s0, 0x0028($sp) +/* 11F1C 8084412C 29C10029 */ slti $at, $t6, 0x0029 /* 11F20 80844130 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 11F24 80844134 AFBF002C */ sw $ra, 0x002C($sp) -/* 11F28 80844138 14200004 */ bne $at, $zero, .L8084414C -/* 11F2C 8084413C AFA50054 */ sw $a1, 0x0054($sp) +/* 11F24 80844134 AFBF002C */ sw $ra, 0x002C($sp) +/* 11F28 80844138 14200004 */ bne $at, $zero, .L8084414C +/* 11F2C 8084413C AFA50054 */ sw $a1, 0x0054($sp) /* 11F30 80844140 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 -/* 11F34 80844144 10000007 */ beq $zero, $zero, .L80844164 +/* 11F34 80844144 10000007 */ beq $zero, $zero, .L80844164 /* 11F38 80844148 E484006C */ swc1 $f4, 0x006C($a0) ## 0000006C .L8084414C: -/* 11F3C 8084414C 0C023A71 */ jal func_8008E9C4 +/* 11F3C 8084414C 0C023A71 */ jal func_8008E9C4 /* 11F40 80844150 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 11F44 80844154 10400003 */ beq $v0, $zero, .L80844164 +/* 11F44 80844154 10400003 */ beq $v0, $zero, .L80844164 /* 11F48 80844158 3C018085 */ lui $at, %hi(D_80855450) ## $at = 80850000 -/* 11F4C 8084415C C4265450 */ lwc1 $f6, %lo(D_80855450)($at) +/* 11F4C 8084415C C4265450 */ lwc1 $f6, %lo(D_80855450)($at) /* 11F50 80844160 E606006C */ swc1 $f6, 0x006C($s0) ## 0000006C .L80844164: -/* 11F54 80844164 8FAF0054 */ lw $t7, 0x0054($sp) +/* 11F54 80844164 8FAF0054 */ lw $t7, 0x0054($sp) /* 11F58 80844168 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 11F5C 8084416C 27A5004C */ addiu $a1, $sp, 0x004C ## $a1 = FFFFFFFC /* 11F60 80844170 27A6004A */ addiu $a2, $sp, 0x004A ## $a2 = FFFFFFFA /* 11F64 80844174 24070000 */ addiu $a3, $zero, 0x0000 ## $a3 = 00000000 -/* 11F68 80844178 0C20DC9A */ jal func_80837268 -/* 11F6C 8084417C AFAF0010 */ sw $t7, 0x0010($sp) +/* 11F68 80844178 0C20DC9A */ jal func_80837268 +/* 11F6C 8084417C AFAF0010 */ sw $t7, 0x0010($sp) /* 11F70 80844180 96180088 */ lhu $t8, 0x0088($s0) ## 00000088 /* 11F74 80844184 33190001 */ andi $t9, $t8, 0x0001 ## $t9 = 00000000 -/* 11F78 80844188 572000F0 */ bnel $t9, $zero, .L8084454C +/* 11F78 80844188 572000F0 */ bnel $t9, $zero, .L8084454C /* 11F7C 8084418C 920B015B */ lbu $t3, 0x015B($s0) ## 0000015B /* 11F80 80844190 8E08067C */ lw $t0, 0x067C($s0) ## 0000067C -/* 11F84 80844194 8FA40054 */ lw $a0, 0x0054($sp) +/* 11F84 80844194 8FA40054 */ lw $a0, 0x0054($sp) /* 11F88 80844198 31090800 */ andi $t1, $t0, 0x0800 ## $t1 = 00000000 -/* 11F8C 8084419C 5120001E */ beql $t1, $zero, .L80844218 +/* 11F8C 8084419C 5120001E */ beql $t1, $zero, .L80844218 /* 11F90 808441A0 260501B4 */ addiu $a1, $s0, 0x01B4 ## $a1 = 000001B4 /* 11F94 808441A4 8E0603AC */ lw $a2, 0x03AC($s0) ## 000003AC /* 11F98 808441A8 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 11F9C 808441AC 0C20D591 */ jal func_80835644 -/* 11FA0 808441B0 AFA60044 */ sw $a2, 0x0044($sp) -/* 11FA4 808441B4 14400017 */ bne $v0, $zero, .L80844214 -/* 11FA8 808441B8 8FA60044 */ lw $a2, 0x0044($sp) +/* 11F9C 808441AC 0C20D591 */ jal func_80835644 +/* 11FA0 808441B0 AFA60044 */ sw $a2, 0x0044($sp) +/* 11FA4 808441B4 14400017 */ bne $v0, $zero, .L80844214 +/* 11FA8 808441B8 8FA60044 */ lw $a2, 0x0044($sp) /* 11FAC 808441BC 84CA0000 */ lh $t2, 0x0000($a2) ## 00000000 /* 11FB0 808441C0 24010019 */ addiu $at, $zero, 0x0019 ## $at = 00000019 /* 11FB4 808441C4 3C0B8086 */ lui $t3, %hi(D_80858AB4) ## $t3 = 80860000 -/* 11FB8 808441C8 55410013 */ bnel $t2, $at, .L80844218 +/* 11FB8 808441C8 55410013 */ bnel $t2, $at, .L80844218 /* 11FBC 808441CC 260501B4 */ addiu $a1, $s0, 0x01B4 ## $a1 = 000001B4 -/* 11FC0 808441D0 8D6B8AB4 */ lw $t3, %lo(D_80858AB4)($t3) +/* 11FC0 808441D0 8D6B8AB4 */ lw $t3, %lo(D_80858AB4)($t3) /* 11FC4 808441D4 3C014000 */ lui $at, 0x4000 ## $at = 40000000 /* 11FC8 808441D8 956C000C */ lhu $t4, 0x000C($t3) ## 8086000C /* 11FCC 808441DC 318DC007 */ andi $t5, $t4, 0xC007 ## $t5 = 00000000 -/* 11FD0 808441E0 51A0000D */ beql $t5, $zero, .L80844218 +/* 11FD0 808441E0 51A0000D */ beql $t5, $zero, .L80844218 /* 11FD4 808441E4 260501B4 */ addiu $a1, $s0, 0x01B4 ## $a1 = 000001B4 /* 11FD8 808441E8 44810000 */ mtc1 $at, $f0 ## $f0 = 2.00 /* 11FDC 808441EC C6080838 */ lwc1 $f8, 0x0838($s0) ## 00000838 /* 11FE0 808441F0 C6100060 */ lwc1 $f16, 0x0060($s0) ## 00000060 -/* 11FE4 808441F4 8FA40054 */ lw $a0, 0x0054($sp) -/* 11FE8 808441F8 46004280 */ add.s $f10, $f8, $f0 +/* 11FE4 808441F4 8FA40054 */ lw $a0, 0x0054($sp) +/* 11FE8 808441F8 46004280 */ add.s $f10, $f8, $f0 /* 11FEC 808441FC 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 11FF0 80844200 46008480 */ add.s $f18, $f16, $f0 -/* 11FF4 80844204 44065000 */ mfc1 $a2, $f10 -/* 11FF8 80844208 44079000 */ mfc1 $a3, $f18 -/* 11FFC 8084420C 0C211027 */ jal func_8084409C +/* 11FF0 80844200 46008480 */ add.s $f18, $f16, $f0 +/* 11FF4 80844204 44065000 */ mfc1 $a2, $f10 +/* 11FF8 80844208 44079000 */ mfc1 $a3, $f18 +/* 11FFC 8084420C 0C211027 */ jal func_8084409C /* 12000 80844210 00000000 */ nop .L80844214: /* 12004 80844214 260501B4 */ addiu $a1, $s0, 0x01B4 ## $a1 = 000001B4 .L80844218: -/* 12008 80844218 AFA50038 */ sw $a1, 0x0038($sp) -/* 1200C 8084421C 0C028EF0 */ jal func_800A3BC0 -/* 12010 80844220 8FA40054 */ lw $a0, 0x0054($sp) +/* 12008 80844218 AFA50038 */ sw $a1, 0x0038($sp) +/* 1200C 8084421C 0C028EF0 */ jal func_800A3BC0 +/* 12010 80844220 8FA40054 */ lw $a0, 0x0054($sp) /* 12014 80844224 8E0E0680 */ lw $t6, 0x0680($s0) ## 00000680 /* 12018 80844228 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 1201C 8084422C 27A5004C */ addiu $a1, $sp, 0x004C ## $a1 = FFFFFFFC -/* 12020 80844230 000E7B00 */ sll $t7, $t6, 12 -/* 12024 80844234 05E20004 */ bltzl $t7, .L80844248 +/* 12020 80844230 000E7B00 */ sll $t7, $t6, 12 +/* 12024 80844234 05E20004 */ bltzl $t7, .L80844248 /* 12028 80844238 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 1202C 8084423C 0C20F7F8 */ jal func_8083DFE0 +/* 1202C 8084423C 0C20F7F8 */ jal func_8083DFE0 /* 12030 80844240 27A6004A */ addiu $a2, $sp, 0x004A ## $a2 = FFFFFFFA /* 12034 80844244 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 .L80844248: -/* 12038 80844248 0C20D99C */ jal func_80836670 -/* 1203C 8084424C 8FA50054 */ lw $a1, 0x0054($sp) +/* 12038 80844248 0C20D99C */ jal func_80836670 +/* 1203C 8084424C 8FA50054 */ lw $a1, 0x0054($sp) /* 12040 80844250 8E180680 */ lw $t8, 0x0680($s0) ## 00000680 /* 12044 80844254 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 12048 80844258 0018CB00 */ sll $t9, $t8, 12 -/* 1204C 8084425C 07210005 */ bgez $t9, .L80844274 +/* 12048 80844258 0018CB00 */ sll $t9, $t8, 12 +/* 1204C 8084425C 07210005 */ bgez $t9, .L80844274 /* 12050 80844260 00000000 */ nop /* 12054 80844264 8208084F */ lb $t0, 0x084F($s0) ## 0000084F /* 12058 80844268 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 1205C 8084426C 51010006 */ beql $t0, $at, .L80844288 +/* 1205C 8084426C 51010006 */ beql $t0, $at, .L80844288 /* 12060 80844270 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 .L80844274: -/* 12064 80844274 0C20EEE8 */ jal func_8083BBA0 -/* 12068 80844278 8FA50054 */ lw $a1, 0x0054($sp) -/* 1206C 8084427C 5440011E */ bnel $v0, $zero, .L808446F8 -/* 12070 80844280 8FBF002C */ lw $ra, 0x002C($sp) +/* 12064 80844274 0C20EEE8 */ jal func_8083BBA0 +/* 12068 80844278 8FA50054 */ lw $a1, 0x0054($sp) +/* 1206C 8084427C 5440011E */ bnel $v0, $zero, .L808446F8 +/* 12070 80844280 8FBF002C */ lw $ra, 0x002C($sp) /* 12074 80844284 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 .L80844288: /* 12078 80844288 C6040060 */ lwc1 $f4, 0x0060($s0) ## 00000060 -/* 1207C 8084428C 4600203C */ c.lt.s $f4, $f0 +/* 1207C 8084428C 4600203C */ c.lt.s $f4, $f0 /* 12080 80844290 00000000 */ nop -/* 12084 80844294 45020118 */ bc1fl .L808446F8 -/* 12088 80844298 8FBF002C */ lw $ra, 0x002C($sp) +/* 12084 80844294 45020118 */ bc1fl .L808446F8 +/* 12088 80844298 8FBF002C */ lw $ra, 0x002C($sp) /* 1208C 8084429C 86020850 */ lh $v0, 0x0850($s0) ## 00000850 /* 12090 808442A0 2401FFFF */ addiu $at, $zero, 0xFFFF ## $at = FFFFFFFF -/* 12094 808442A4 0440002E */ bltz $v0, .L80844360 +/* 12094 808442A4 0440002E */ bltz $v0, .L80844360 /* 12098 808442A8 00000000 */ nop /* 1209C 808442AC 96090088 */ lhu $t1, 0x0088($s0) ## 00000088 /* 120A0 808442B0 3C014448 */ lui $at, 0x4448 ## $at = 44480000 /* 120A4 808442B4 312A0008 */ andi $t2, $t1, 0x0008 ## $t2 = 00000000 -/* 120A8 808442B8 55400007 */ bnel $t2, $zero, .L808442D8 +/* 120A8 808442B8 55400007 */ bnel $t2, $zero, .L808442D8 /* 120AC 808442BC 44813000 */ mtc1 $at, $f6 ## $f6 = 800.00 -/* 120B0 808442C0 50400005 */ beql $v0, $zero, .L808442D8 +/* 120B0 808442C0 50400005 */ beql $v0, $zero, .L808442D8 /* 120B4 808442C4 44813000 */ mtc1 $at, $f6 ## $f6 = 800.00 /* 120B8 808442C8 860B0896 */ lh $t3, 0x0896($s0) ## 00000896 -/* 120BC 808442CC 5960010A */ blezl $t3, .L808446F8 -/* 120C0 808442D0 8FBF002C */ lw $ra, 0x002C($sp) +/* 120BC 808442CC 5960010A */ blezl $t3, .L808446F8 +/* 120C0 808442D0 8FBF002C */ lw $ra, 0x002C($sp) /* 120C4 808442D4 44813000 */ mtc1 $at, $f6 ## $f6 = 800.00 .L808442D8: /* 120C8 808442D8 3C018085 */ lui $at, %hi(D_80853600) ## $at = 80850000 -/* 120CC 808442DC C4283600 */ lwc1 $f8, %lo(D_80853600)($at) +/* 120CC 808442DC C4283600 */ lwc1 $f8, %lo(D_80853600)($at) /* 120D0 808442E0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 120D4 808442E4 4608303C */ c.lt.s $f6, $f8 +/* 120D4 808442E4 4608303C */ c.lt.s $f6, $f8 /* 120D8 808442E8 00000000 */ nop -/* 120DC 808442EC 45010005 */ bc1t .L80844304 +/* 120DC 808442EC 45010005 */ bc1t .L80844304 /* 120E0 808442F0 00000000 */ nop /* 120E4 808442F4 8E0C067C */ lw $t4, 0x067C($s0) ## 0000067C /* 120E8 808442F8 318D0004 */ andi $t5, $t4, 0x0004 ## $t5 = 00000000 -/* 120EC 808442FC 51A00009 */ beql $t5, $zero, .L80844324 +/* 120EC 808442FC 51A00009 */ beql $t5, $zero, .L80844324 /* 120F0 80844300 3C014100 */ lui $at, 0x4100 ## $at = 41000000 .L80844304: -/* 120F4 80844304 0C210F85 */ jal func_80843E14 +/* 120F4 80844304 0C210F85 */ jal func_80843E14 /* 120F8 80844308 24056807 */ addiu $a1, $zero, 0x6807 ## $a1 = 00006807 /* 120FC 8084430C 8E0E067C */ lw $t6, 0x067C($s0) ## 0000067C /* 12100 80844310 2401FFFB */ addiu $at, $zero, 0xFFFB ## $at = FFFFFFFB /* 12104 80844314 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 12108 80844318 01C17824 */ and $t7, $t6, $at +/* 12108 80844318 01C17824 */ and $t7, $t6, $at /* 1210C 8084431C AE0F067C */ sw $t7, 0x067C($s0) ## 0000067C /* 12110 80844320 3C014100 */ lui $at, 0x4100 ## $at = 41000000 .L80844324: /* 12114 80844324 44815000 */ mtc1 $at, $f10 ## $f10 = 8.00 /* 12118 80844328 3C060400 */ lui $a2, 0x0400 ## $a2 = 04000000 /* 1211C 8084432C 24180002 */ addiu $t8, $zero, 0x0002 ## $t8 = 00000002 -/* 12120 80844330 AFB80018 */ sw $t8, 0x0018($sp) +/* 12120 80844330 AFB80018 */ sw $t8, 0x0018($sp) /* 12124 80844334 24C63020 */ addiu $a2, $a2, 0x3020 ## $a2 = 04003020 -/* 12128 80844338 8FA40054 */ lw $a0, 0x0054($sp) -/* 1212C 8084433C 8FA50038 */ lw $a1, 0x0038($sp) +/* 12128 80844338 8FA40054 */ lw $a0, 0x0054($sp) +/* 1212C 8084433C 8FA50038 */ lw $a1, 0x0038($sp) /* 12130 80844340 3C073F80 */ lui $a3, 0x3F80 ## $a3 = 3F800000 -/* 12134 80844344 E7A00010 */ swc1 $f0, 0x0010($sp) -/* 12138 80844348 E7A00014 */ swc1 $f0, 0x0014($sp) -/* 1213C 8084434C 0C028FC2 */ jal func_800A3F08 -/* 12140 80844350 E7AA001C */ swc1 $f10, 0x001C($sp) +/* 12134 80844344 E7A00010 */ swc1 $f0, 0x0010($sp) +/* 12138 80844348 E7A00014 */ swc1 $f0, 0x0014($sp) +/* 1213C 8084434C 0C028FC2 */ jal SkelAnime_ChangeLinkAnim +/* 12140 80844350 E7AA001C */ swc1 $f10, 0x001C($sp) /* 12144 80844354 2419FFFF */ addiu $t9, $zero, 0xFFFF ## $t9 = FFFFFFFF -/* 12148 80844358 100000E6 */ beq $zero, $zero, .L808446F4 +/* 12148 80844358 100000E6 */ beq $zero, $zero, .L808446F4 /* 1214C 8084435C A6190850 */ sh $t9, 0x0850($s0) ## 00000850 .L80844360: -/* 12150 80844360 54410019 */ bnel $v0, $at, .L808443C8 +/* 12150 80844360 54410019 */ bnel $v0, $at, .L808443C8 /* 12154 80844364 960A0088 */ lhu $t2, 0x0088($s0) ## 00000088 /* 12158 80844368 86080896 */ lh $t0, 0x0896($s0) ## 00000896 /* 1215C 8084436C 3C0142F0 */ lui $at, 0x42F0 ## $at = 42F00000 /* 12160 80844370 44818000 */ mtc1 $at, $f16 ## $f16 = 120.00 /* 12164 80844374 44889000 */ mtc1 $t0, $f18 ## $f18 = 0.00 /* 12168 80844378 3C01438C */ lui $at, 0x438C ## $at = 438C0000 -/* 1216C 8084437C 46809120 */ cvt.s.w $f4, $f18 -/* 12170 80844380 4604803C */ c.lt.s $f16, $f4 +/* 1216C 8084437C 46809120 */ cvt.s.w $f4, $f18 +/* 12170 80844380 4604803C */ c.lt.s $f16, $f4 /* 12174 80844384 00000000 */ nop -/* 12178 80844388 4502000F */ bc1fl .L808443C8 +/* 12178 80844388 4502000F */ bc1fl .L808443C8 /* 1217C 8084438C 960A0088 */ lhu $t2, 0x0088($s0) ## 00000088 /* 12180 80844390 44813000 */ mtc1 $at, $f6 ## $f6 = 280.00 /* 12184 80844394 3C018085 */ lui $at, %hi(D_80853600) ## $at = 80850000 -/* 12188 80844398 C4283600 */ lwc1 $f8, %lo(D_80853600)($at) +/* 12188 80844398 C4283600 */ lwc1 $f8, %lo(D_80853600)($at) /* 1218C 8084439C 2409FFFE */ addiu $t1, $zero, 0xFFFE ## $t1 = FFFFFFFE /* 12190 808443A0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 12194 808443A4 4608303C */ c.lt.s $f6, $f8 +/* 12194 808443A4 4608303C */ c.lt.s $f6, $f8 /* 12198 808443A8 24056808 */ addiu $a1, $zero, 0x6808 ## $a1 = 00006808 -/* 1219C 808443AC 45020006 */ bc1fl .L808443C8 +/* 1219C 808443AC 45020006 */ bc1fl .L808443C8 /* 121A0 808443B0 960A0088 */ lhu $t2, 0x0088($s0) ## 00000088 -/* 121A4 808443B4 0C210F85 */ jal func_80843E14 +/* 121A4 808443B4 0C210F85 */ jal func_80843E14 /* 121A8 808443B8 A6090850 */ sh $t1, 0x0850($s0) ## 00000850 /* 121AC 808443BC 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 /* 121B0 808443C0 00000000 */ nop /* 121B4 808443C4 960A0088 */ lhu $t2, 0x0088($s0) ## 00000088 .L808443C8: /* 121B8 808443C8 314B0200 */ andi $t3, $t2, 0x0200 ## $t3 = 00000000 -/* 121BC 808443CC 516000CA */ beql $t3, $zero, .L808446F8 -/* 121C0 808443D0 8FBF002C */ lw $ra, 0x002C($sp) +/* 121BC 808443CC 516000CA */ beql $t3, $zero, .L808446F8 +/* 121C0 808443D0 8FBF002C */ lw $ra, 0x002C($sp) /* 121C4 808443D4 8E0C0680 */ lw $t4, 0x0680($s0) ## 00000680 -/* 121C8 808443D8 000C6B00 */ sll $t5, $t4, 12 -/* 121CC 808443DC 05A200C6 */ bltzl $t5, .L808446F8 -/* 121D0 808443E0 8FBF002C */ lw $ra, 0x002C($sp) +/* 121C8 808443D8 000C6B00 */ sll $t5, $t4, 12 +/* 121CC 808443DC 05A200C6 */ bltzl $t5, .L808446F8 +/* 121D0 808443E0 8FBF002C */ lw $ra, 0x002C($sp) /* 121D4 808443E4 8E0E067C */ lw $t6, 0x067C($s0) ## 0000067C /* 121D8 808443E8 3C010800 */ lui $at, 0x0800 ## $at = 08000000 /* 121DC 808443EC 34210800 */ ori $at, $at, 0x0800 ## $at = 08000800 -/* 121E0 808443F0 01C17824 */ and $t7, $t6, $at -/* 121E4 808443F4 55E000C0 */ bnel $t7, $zero, .L808446F8 -/* 121E8 808443F8 8FBF002C */ lw $ra, 0x002C($sp) +/* 121E0 808443F0 01C17824 */ and $t7, $t6, $at +/* 121E4 808443F4 55E000C0 */ bnel $t7, $zero, .L808446F8 +/* 121E8 808443F8 8FBF002C */ lw $ra, 0x002C($sp) /* 121EC 808443FC C60A0838 */ lwc1 $f10, 0x0838($s0) ## 00000838 /* 121F0 80844400 3C014316 */ lui $at, 0x4316 ## $at = 43160000 -/* 121F4 80844404 460A003C */ c.lt.s $f0, $f10 +/* 121F4 80844404 460A003C */ c.lt.s $f0, $f10 /* 121F8 80844408 00000000 */ nop -/* 121FC 8084440C 450200BA */ bc1fl .L808446F8 -/* 12200 80844410 8FBF002C */ lw $ra, 0x002C($sp) +/* 121FC 8084440C 450200BA */ bc1fl .L808446F8 +/* 12200 80844410 8FBF002C */ lw $ra, 0x002C($sp) /* 12204 80844414 44811000 */ mtc1 $at, $f2 ## $f2 = 150.00 /* 12208 80844418 C6000884 */ lwc1 $f0, 0x0884($s0) ## 00000884 -/* 1220C 8084441C 4600103E */ c.le.s $f2, $f0 +/* 1220C 8084441C 4600103E */ c.le.s $f2, $f0 /* 12210 80844420 00000000 */ nop -/* 12214 80844424 4502000E */ bc1fl .L80844460 +/* 12214 80844424 4502000E */ bc1fl .L80844460 /* 12218 80844428 9209088C */ lbu $t1, 0x088C($s0) ## 0000088C /* 1221C 8084442C 92180846 */ lbu $t8, 0x0846($s0) ## 00000846 /* 12220 80844430 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 12224 80844434 8FA50054 */ lw $a1, 0x0054($sp) -/* 12228 80844438 0218C821 */ addu $t9, $s0, $t8 +/* 12224 80844434 8FA50054 */ lw $a1, 0x0054($sp) +/* 12228 80844438 0218C821 */ addu $t9, $s0, $t8 /* 1222C 8084443C 8328084B */ lb $t0, 0x084B($t9) ## 0000084B /* 12230 80844440 3C068085 */ lui $a2, %hi(D_808535F0) ## $a2 = 80850000 -/* 12234 80844444 55000006 */ bnel $t0, $zero, .L80844460 +/* 12234 80844444 55000006 */ bnel $t0, $zero, .L80844460 /* 12238 80844448 9209088C */ lbu $t1, 0x088C($s0) ## 0000088C -/* 1223C 8084444C 0C20FB06 */ jal func_8083EC18 -/* 12240 80844450 8CC635F0 */ lw $a2, %lo(D_808535F0)($a2) -/* 12244 80844454 100000A8 */ beq $zero, $zero, .L808446F8 -/* 12248 80844458 8FBF002C */ lw $ra, 0x002C($sp) +/* 1223C 8084444C 0C20FB06 */ jal func_8083EC18 +/* 12240 80844450 8CC635F0 */ lw $a2, %lo(D_808535F0)($a2) +/* 12244 80844454 100000A8 */ beq $zero, $zero, .L808446F8 +/* 12248 80844458 8FBF002C */ lw $ra, 0x002C($sp) /* 1224C 8084445C 9209088C */ lbu $t1, 0x088C($s0) ## 0000088C .L80844460: -/* 12250 80844460 29210002 */ slti $at, $t1, 0x0002 -/* 12254 80844464 542000A4 */ bnel $at, $zero, .L808446F8 -/* 12258 80844468 8FBF002C */ lw $ra, 0x002C($sp) -/* 1225C 8084446C 4602003C */ c.lt.s $f0, $f2 +/* 12250 80844460 29210002 */ slti $at, $t1, 0x0002 +/* 12254 80844464 542000A4 */ bnel $at, $zero, .L808446F8 +/* 12258 80844468 8FBF002C */ lw $ra, 0x002C($sp) +/* 1225C 8084446C 4602003C */ c.lt.s $f0, $f2 /* 12260 80844470 3C01428C */ lui $at, 0x428C ## $at = 428C0000 -/* 12264 80844474 450200A0 */ bc1fl .L808446F8 -/* 12268 80844478 8FBF002C */ lw $ra, 0x002C($sp) +/* 12264 80844474 450200A0 */ bc1fl .L808446F8 +/* 12268 80844478 8FBF002C */ lw $ra, 0x002C($sp) /* 1226C 8084447C 8E0A0678 */ lw $t2, 0x0678($s0) ## 00000678 /* 12270 80844480 C6060028 */ lwc1 $f6, 0x0028($s0) ## 00000028 /* 12274 80844484 C6080080 */ lwc1 $f8, 0x0080($s0) ## 00000080 /* 12278 80844488 44819000 */ mtc1 $at, $f18 ## $f18 = 70.00 /* 1227C 8084448C C5500008 */ lwc1 $f16, 0x0008($t2) ## 00000008 -/* 12280 80844490 46083281 */ sub.s $f10, $f6, $f8 -/* 12284 80844494 46109102 */ mul.s $f4, $f18, $f16 -/* 12288 80844498 46005480 */ add.s $f18, $f10, $f0 -/* 1228C 8084449C 4612203C */ c.lt.s $f4, $f18 +/* 12280 80844490 46083281 */ sub.s $f10, $f6, $f8 +/* 12284 80844494 46109102 */ mul.s $f4, $f18, $f16 +/* 12288 80844498 46005480 */ add.s $f18, $f10, $f0 +/* 1228C 8084449C 4612203C */ c.lt.s $f4, $f18 /* 12290 808444A0 00000000 */ nop -/* 12294 808444A4 45020094 */ bc1fl .L808446F8 -/* 12298 808444A8 8FBF002C */ lw $ra, 0x002C($sp) -/* 1229C 808444AC 0C028CC4 */ jal func_800A3310 -/* 122A0 808444B0 8FA40054 */ lw $a0, 0x0054($sp) +/* 12294 808444A4 45020094 */ bc1fl .L808446F8 +/* 12298 808444A8 8FBF002C */ lw $ra, 0x002C($sp) +/* 1229C 808444AC 0C028CC4 */ jal func_800A3310 +/* 122A0 808444B0 8FA40054 */ lw $a0, 0x0054($sp) /* 122A4 808444B4 8E0B067C */ lw $t3, 0x067C($s0) ## 0000067C /* 122A8 808444B8 24056819 */ addiu $a1, $zero, 0x6819 ## $a1 = 00006819 /* 122AC 808444BC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 122B0 808444C0 316C0004 */ andi $t4, $t3, 0x0004 ## $t4 = 00000000 -/* 122B4 808444C4 11800005 */ beq $t4, $zero, .L808444DC +/* 122B4 808444C4 11800005 */ beq $t4, $zero, .L808444DC /* 122B8 808444C8 00000000 */ nop -/* 122BC 808444CC 0C20C9A6 */ jal func_80832698 +/* 122BC 808444CC 0C20C9A6 */ jal func_80832698 /* 122C0 808444D0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 122C4 808444D4 10000004 */ beq $zero, $zero, .L808444E8 +/* 122C4 808444D4 10000004 */ beq $zero, $zero, .L808444E8 /* 122C8 808444D8 C6100028 */ lwc1 $f16, 0x0028($s0) ## 00000028 .L808444DC: -/* 122CC 808444DC 0C20C9A6 */ jal func_80832698 +/* 122CC 808444DC 0C20C9A6 */ jal func_80832698 /* 122D0 808444E0 24056803 */ addiu $a1, $zero, 0x6803 ## $a1 = 00006803 /* 122D4 808444E4 C6100028 */ lwc1 $f16, 0x0028($s0) ## 00000028 .L808444E8: /* 122D8 808444E8 C6060884 */ lwc1 $f6, 0x0884($s0) ## 00000884 /* 122DC 808444EC 920D015B */ lbu $t5, 0x015B($s0) ## 0000015B /* 122E0 808444F0 3C0F8085 */ lui $t7, %hi(D_80853CBC) ## $t7 = 80850000 -/* 122E4 808444F4 46068200 */ add.s $f8, $f16, $f6 -/* 122E8 808444F8 000D7080 */ sll $t6, $t5, 2 -/* 122EC 808444FC 01EE7821 */ addu $t7, $t7, $t6 +/* 122E4 808444F4 46068200 */ add.s $f8, $f16, $f6 +/* 122E8 808444F8 000D7080 */ sll $t6, $t5, 2 +/* 122EC 808444FC 01EE7821 */ addu $t7, $t7, $t6 /* 122F0 80844500 8E060074 */ lw $a2, 0x0074($s0) ## 00000074 /* 122F4 80844504 E6080028 */ swc1 $f8, 0x0028($s0) ## 00000028 -/* 122F8 80844508 8DEF3CBC */ lw $t7, %lo(D_80853CBC)($t7) +/* 122F8 80844508 8DEF3CBC */ lw $t7, %lo(D_80853CBC)($t7) /* 122FC 8084450C 8E070888 */ lw $a3, 0x0888($s0) ## 00000888 -/* 12300 80844510 8FA40054 */ lw $a0, 0x0054($sp) +/* 12300 80844510 8FA40054 */ lw $a0, 0x0054($sp) /* 12304 80844514 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 12308 80844518 0C20E971 */ jal func_8083A5C4 -/* 1230C 8084451C AFAF0010 */ sw $t7, 0x0010($sp) +/* 12308 80844518 0C20E971 */ jal func_8083A5C4 +/* 1230C 8084451C AFAF0010 */ sw $t7, 0x0010($sp) /* 12310 80844520 8618083C */ lh $t8, 0x083C($s0) ## 0000083C /* 12314 80844524 34018000 */ ori $at, $zero, 0x8000 ## $at = 00008000 /* 12318 80844528 8E09067C */ lw $t1, 0x067C($s0) ## 0000067C -/* 1231C 8084452C 0301C821 */ addu $t9, $t8, $at +/* 1231C 8084452C 0301C821 */ addu $t9, $t8, $at /* 12320 80844530 A619083C */ sh $t9, 0x083C($s0) ## 0000083C /* 12324 80844534 8608083C */ lh $t0, 0x083C($s0) ## 0000083C /* 12328 80844538 352A2000 */ ori $t2, $t1, 0x2000 ## $t2 = 00002000 /* 1232C 8084453C AE0A067C */ sw $t2, 0x067C($s0) ## 0000067C -/* 12330 80844540 1000006C */ beq $zero, $zero, .L808446F4 +/* 12330 80844540 1000006C */ beq $zero, $zero, .L808446F4 /* 12334 80844544 A60800B6 */ sh $t0, 0x00B6($s0) ## 000000B6 /* 12338 80844548 920B015B */ lbu $t3, 0x015B($s0) ## 0000015B .L8084454C: /* 1233C 8084454C 8E0D0680 */ lw $t5, 0x0680($s0) ## 00000680 /* 12340 80844550 3C078085 */ lui $a3, %hi(D_80853A64) ## $a3 = 80850000 -/* 12344 80844554 000B6080 */ sll $t4, $t3, 2 -/* 12348 80844558 00EC3821 */ addu $a3, $a3, $t4 -/* 1234C 8084455C 000D7300 */ sll $t6, $t5, 12 -/* 12350 80844560 05C10015 */ bgez $t6, .L808445B8 -/* 12354 80844564 8CE73A64 */ lw $a3, %lo(D_80853A64)($a3) -/* 12358 80844568 0C023A71 */ jal func_8008E9C4 +/* 12344 80844554 000B6080 */ sll $t4, $t3, 2 +/* 12348 80844558 00EC3821 */ addu $a3, $a3, $t4 +/* 1234C 8084455C 000D7300 */ sll $t6, $t5, 12 +/* 12350 80844560 05C10015 */ bgez $t6, .L808445B8 +/* 12354 80844564 8CE73A64 */ lw $a3, %lo(D_80853A64)($a3) +/* 12358 80844568 0C023A71 */ jal func_8008E9C4 /* 1235C 8084456C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 12360 80844570 5040000A */ beql $v0, $zero, .L8084459C +/* 12360 80844570 5040000A */ beql $v0, $zero, .L8084459C /* 12364 80844574 8219084F */ lb $t9, 0x084F($s0) ## 0000084F /* 12368 80844578 820F084F */ lb $t7, 0x084F($s0) ## 0000084F /* 1236C 8084457C 3C078085 */ lui $a3, %hi(D_80853D54) ## $a3 = 80850000 -/* 12370 80844580 000FC080 */ sll $t8, $t7, 2 -/* 12374 80844584 030FC023 */ subu $t8, $t8, $t7 -/* 12378 80844588 0018C080 */ sll $t8, $t8, 2 -/* 1237C 8084458C 00F83821 */ addu $a3, $a3, $t8 -/* 12380 80844590 10000037 */ beq $zero, $zero, .L80844670 -/* 12384 80844594 8CE73D54 */ lw $a3, %lo(D_80853D54)($a3) +/* 12370 80844580 000FC080 */ sll $t8, $t7, 2 +/* 12374 80844584 030FC023 */ subu $t8, $t8, $t7 +/* 12378 80844588 0018C080 */ sll $t8, $t8, 2 +/* 1237C 8084458C 00F83821 */ addu $a3, $a3, $t8 +/* 12380 80844590 10000037 */ beq $zero, $zero, .L80844670 +/* 12384 80844594 8CE73D54 */ lw $a3, %lo(D_80853D54)($a3) /* 12388 80844598 8219084F */ lb $t9, 0x084F($s0) ## 0000084F .L8084459C: /* 1238C 8084459C 3C078085 */ lui $a3, %hi(D_80853D50) ## $a3 = 80850000 -/* 12390 808445A0 00194080 */ sll $t0, $t9, 2 -/* 12394 808445A4 01194023 */ subu $t0, $t0, $t9 -/* 12398 808445A8 00084080 */ sll $t0, $t0, 2 -/* 1239C 808445AC 00E83821 */ addu $a3, $a3, $t0 -/* 123A0 808445B0 1000002F */ beq $zero, $zero, .L80844670 -/* 123A4 808445B4 8CE73D50 */ lw $a3, %lo(D_80853D50)($a3) +/* 12390 808445A0 00194080 */ sll $t0, $t9, 2 +/* 12394 808445A4 01194023 */ subu $t0, $t0, $t9 +/* 12398 808445A8 00084080 */ sll $t0, $t0, 2 +/* 1239C 808445AC 00E83821 */ addu $a3, $a3, $t0 +/* 123A0 808445B0 1000002F */ beq $zero, $zero, .L80844670 +/* 123A4 808445B4 8CE73D50 */ lw $a3, %lo(D_80853D50)($a3) .L808445B8: /* 123A8 808445B8 8E0A01BC */ lw $t2, 0x01BC($s0) ## 000001BC /* 123AC 808445BC 3C090400 */ lui $t1, 0x0400 ## $t1 = 04000000 /* 123B0 808445C0 25293148 */ addiu $t1, $t1, 0x3148 ## $t1 = 04003148 -/* 123B4 808445C4 152A0004 */ bne $t1, $t2, .L808445D8 +/* 123B4 808445C4 152A0004 */ bne $t1, $t2, .L808445D8 /* 123B8 808445C8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 123BC 808445CC 3C070400 */ lui $a3, 0x0400 ## $a3 = 04000000 -/* 123C0 808445D0 10000027 */ beq $zero, $zero, .L80844670 +/* 123C0 808445D0 10000027 */ beq $zero, $zero, .L80844670 /* 123C4 808445D4 24E73150 */ addiu $a3, $a3, 0x3150 ## $a3 = 04003150 .L808445D8: -/* 123C8 808445D8 0C023A71 */ jal func_8008E9C4 -/* 123CC 808445DC AFA70040 */ sw $a3, 0x0040($sp) -/* 123D0 808445E0 10400008 */ beq $v0, $zero, .L80844604 -/* 123D4 808445E4 8FA70040 */ lw $a3, 0x0040($sp) +/* 123C8 808445D8 0C023A71 */ jal func_8008E9C4 +/* 123CC 808445DC AFA70040 */ sw $a3, 0x0040($sp) +/* 123D0 808445E0 10400008 */ beq $v0, $zero, .L80844604 +/* 123D4 808445E4 8FA70040 */ lw $a3, 0x0040($sp) /* 123D8 808445E8 3C070400 */ lui $a3, 0x0400 ## $a3 = 04000000 /* 123DC 808445EC 24E72538 */ addiu $a3, $a3, 0x2538 ## $a3 = 04002538 -/* 123E0 808445F0 AFA70040 */ sw $a3, 0x0040($sp) -/* 123E4 808445F4 0C20CF0F */ jal func_80833C3C +/* 123E0 808445F0 AFA70040 */ sw $a3, 0x0040($sp) +/* 123E4 808445F4 0C20CF0F */ jal func_80833C3C /* 123E8 808445F8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 123EC 808445FC 1000001C */ beq $zero, $zero, .L80844670 -/* 123F0 80844600 8FA70040 */ lw $a3, 0x0040($sp) +/* 123EC 808445FC 1000001C */ beq $zero, $zero, .L80844670 +/* 123F0 80844600 8FA70040 */ lw $a3, 0x0040($sp) .L80844604: /* 123F4 80844604 86020896 */ lh $v0, 0x0896($s0) ## 00000896 -/* 123F8 80844608 28410051 */ slti $at, $v0, 0x0051 -/* 123FC 8084460C 50200008 */ beql $at, $zero, .L80844630 -/* 12400 80844610 28410320 */ slti $at, $v0, 0x0320 +/* 123F8 80844608 28410051 */ slti $at, $v0, 0x0051 +/* 123FC 8084460C 50200008 */ beql $at, $zero, .L80844630 +/* 12400 80844610 28410320 */ slti $at, $v0, 0x0320 /* 12404 80844614 920B015B */ lbu $t3, 0x015B($s0) ## 0000015B /* 12408 80844618 3C078085 */ lui $a3, %hi(D_80853A7C) ## $a3 = 80850000 -/* 1240C 8084461C 000B6080 */ sll $t4, $t3, 2 -/* 12410 80844620 00EC3821 */ addu $a3, $a3, $t4 -/* 12414 80844624 10000012 */ beq $zero, $zero, .L80844670 -/* 12418 80844628 8CE73A7C */ lw $a3, %lo(D_80853A7C)($a3) -/* 1241C 8084462C 28410320 */ slti $at, $v0, 0x0320 +/* 1240C 8084461C 000B6080 */ sll $t4, $t3, 2 +/* 12410 80844620 00EC3821 */ addu $a3, $a3, $t4 +/* 12414 80844624 10000012 */ beq $zero, $zero, .L80844670 +/* 12418 80844628 8CE73A7C */ lw $a3, %lo(D_80853A7C)($a3) +/* 1241C 8084462C 28410320 */ slti $at, $v0, 0x0320 .L80844630: -/* 12420 80844630 50200010 */ beql $at, $zero, .L80844674 -/* 12424 80844634 8FA40054 */ lw $a0, 0x0054($sp) +/* 12420 80844630 50200010 */ beql $at, $zero, .L80844674 +/* 12424 80844634 8FA40054 */ lw $a0, 0x0054($sp) /* 12428 80844638 920D0846 */ lbu $t5, 0x0846($s0) ## 00000846 -/* 1242C 8084463C 020D7021 */ addu $t6, $s0, $t5 +/* 1242C 8084463C 020D7021 */ addu $t6, $s0, $t5 /* 12430 80844640 81CF084B */ lb $t7, 0x084B($t6) ## 0000084B -/* 12434 80844644 55E0000B */ bnel $t7, $zero, .L80844674 -/* 12438 80844648 8FA40054 */ lw $a0, 0x0054($sp) +/* 12434 80844644 55E0000B */ bnel $t7, $zero, .L80844674 +/* 12438 80844648 8FA40054 */ lw $a0, 0x0054($sp) /* 1243C 8084464C 8E18067C */ lw $t8, 0x067C($s0) ## 0000067C /* 12440 80844650 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 12444 80844654 33190800 */ andi $t9, $t8, 0x0800 ## $t9 = 00000000 -/* 12448 80844658 57200006 */ bnel $t9, $zero, .L80844674 -/* 1244C 8084465C 8FA40054 */ lw $a0, 0x0054($sp) -/* 12450 80844660 0C20EF01 */ jal func_8083BC04 -/* 12454 80844664 8FA50054 */ lw $a1, 0x0054($sp) -/* 12458 80844668 10000023 */ beq $zero, $zero, .L808446F8 -/* 1245C 8084466C 8FBF002C */ lw $ra, 0x002C($sp) +/* 12448 80844658 57200006 */ bnel $t9, $zero, .L80844674 +/* 1244C 8084465C 8FA40054 */ lw $a0, 0x0054($sp) +/* 12450 80844660 0C20EF01 */ jal func_8083BC04 +/* 12454 80844664 8FA50054 */ lw $a1, 0x0054($sp) +/* 12458 80844668 10000023 */ beq $zero, $zero, .L808446F8 +/* 1245C 8084466C 8FBF002C */ lw $ra, 0x002C($sp) .L80844670: -/* 12460 80844670 8FA40054 */ lw $a0, 0x0054($sp) +/* 12460 80844670 8FA40054 */ lw $a0, 0x0054($sp) .L80844674: /* 12464 80844674 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 12468 80844678 0C210F99 */ jal func_80843E64 -/* 1246C 8084467C AFA70040 */ sw $a3, 0x0040($sp) -/* 12470 80844680 8FA70040 */ lw $a3, 0x0040($sp) -/* 12474 80844684 18400016 */ blez $v0, .L808446E0 +/* 12468 80844678 0C210F99 */ jal func_80843E64 +/* 1246C 8084467C AFA70040 */ sw $a3, 0x0040($sp) +/* 12470 80844680 8FA70040 */ lw $a3, 0x0040($sp) +/* 12474 80844684 18400016 */ blez $v0, .L808446E0 /* 12478 80844688 00401825 */ or $v1, $v0, $zero ## $v1 = 00000000 /* 1247C 8084468C 9208015B */ lbu $t0, 0x015B($s0) ## 0000015B /* 12480 80844690 3C058085 */ lui $a1, %hi(D_80853A64) ## $a1 = 80850000 -/* 12484 80844694 AFA3003C */ sw $v1, 0x003C($sp) -/* 12488 80844698 00084880 */ sll $t1, $t0, 2 -/* 1248C 8084469C 00A92821 */ addu $a1, $a1, $t1 -/* 12490 808446A0 8CA53A64 */ lw $a1, %lo(D_80853A64)($a1) +/* 12484 80844694 AFA3003C */ sw $v1, 0x003C($sp) +/* 12488 80844698 00084880 */ sll $t1, $t0, 2 +/* 1248C 8084469C 00A92821 */ addu $a1, $a1, $t1 +/* 12490 808446A0 8CA53A64 */ lw $a1, %lo(D_80853A64)($a1) /* 12494 808446A4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 12498 808446A8 0C20E826 */ jal func_8083A098 -/* 1249C 808446AC 8FA60054 */ lw $a2, 0x0054($sp) +/* 12498 808446A8 0C20E826 */ jal func_8083A098 +/* 1249C 808446AC 8FA60054 */ lw $a2, 0x0054($sp) /* 124A0 808446B0 3C014100 */ lui $at, 0x4100 ## $at = 41000000 -/* 124A4 808446B4 8FA3003C */ lw $v1, 0x003C($sp) +/* 124A4 808446B4 8FA3003C */ lw $v1, 0x003C($sp) /* 124A8 808446B8 44815000 */ mtc1 $at, $f10 ## $f10 = 8.00 /* 124AC 808446BC 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 124B0 808446C0 14610004 */ bne $v1, $at, .L808446D4 +/* 124B0 808446C0 14610004 */ bne $v1, $at, .L808446D4 /* 124B4 808446C4 E60A01C4 */ swc1 $f10, 0x01C4($s0) ## 000001C4 /* 124B8 808446C8 240A000A */ addiu $t2, $zero, 0x000A ## $t2 = 0000000A -/* 124BC 808446CC 10000009 */ beq $zero, $zero, .L808446F4 +/* 124BC 808446CC 10000009 */ beq $zero, $zero, .L808446F4 /* 124C0 808446D0 A60A0850 */ sh $t2, 0x0850($s0) ## 00000850 .L808446D4: /* 124C4 808446D4 240B0014 */ addiu $t3, $zero, 0x0014 ## $t3 = 00000014 -/* 124C8 808446D8 10000006 */ beq $zero, $zero, .L808446F4 +/* 124C8 808446D8 10000006 */ beq $zero, $zero, .L808446F4 /* 124CC 808446DC A60B0850 */ sh $t3, 0x0850($s0) ## 00000850 .L808446E0: -/* 124D0 808446E0 14400004 */ bne $v0, $zero, .L808446F4 +/* 124D0 808446E0 14400004 */ bne $v0, $zero, .L808446F4 /* 124D4 808446E4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 124D8 808446E8 00E02825 */ or $a1, $a3, $zero ## $a1 = 00000000 -/* 124DC 808446EC 0C20E826 */ jal func_8083A098 -/* 124E0 808446F0 8FA60054 */ lw $a2, 0x0054($sp) +/* 124DC 808446EC 0C20E826 */ jal func_8083A098 +/* 124E0 808446F0 8FA60054 */ lw $a2, 0x0054($sp) .L808446F4: -/* 124E4 808446F4 8FBF002C */ lw $ra, 0x002C($sp) +/* 124E4 808446F4 8FBF002C */ lw $ra, 0x002C($sp) .L808446F8: -/* 124E8 808446F8 8FB00028 */ lw $s0, 0x0028($sp) +/* 124E8 808446F8 8FB00028 */ lw $s0, 0x0028($sp) /* 124EC 808446FC 27BD0050 */ addiu $sp, $sp, 0x0050 ## $sp = 00000000 -/* 124F0 80844700 03E00008 */ jr $ra +/* 124F0 80844700 03E00008 */ jr $ra /* 124F4 80844704 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80846660.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80846660.s index affbe2ced9..2e392f393b 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80846660.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80846660.s @@ -1,26 +1,26 @@ glabel func_80846660 /* 14450 80846660 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 14454 80846664 AFBF002C */ sw $ra, 0x002C($sp) -/* 14458 80846668 AFB00028 */ sw $s0, 0x0028($sp) +/* 14454 80846664 AFBF002C */ sw $ra, 0x002C($sp) +/* 14458 80846668 AFB00028 */ sw $s0, 0x0028($sp) /* 1445C 8084666C 3C068085 */ lui $a2, %hi(func_8084F710) ## $a2 = 80850000 /* 14460 80846670 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 /* 14464 80846674 24C6F710 */ addiu $a2, $a2, %lo(func_8084F710) ## $a2 = 8084F710 -/* 14468 80846678 AFA40030 */ sw $a0, 0x0030($sp) -/* 1446C 8084667C 0C20D716 */ jal func_80835C58 +/* 14468 80846678 AFA40030 */ sw $a0, 0x0030($sp) +/* 1446C 8084667C 0C20D716 */ jal func_80835C58 /* 14470 80846680 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 14474 80846684 8FA40030 */ lw $a0, 0x0030($sp) +/* 14474 80846684 8FA40030 */ lw $a0, 0x0030($sp) /* 14478 80846688 24010057 */ addiu $at, $zero, 0x0057 ## $at = 00000057 /* 1447C 8084668C 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 /* 14480 80846690 848E00A4 */ lh $t6, 0x00A4($a0) ## 000000A4 /* 14484 80846694 3C060400 */ lui $a2, 0x0400 ## $a2 = 04000000 /* 14488 80846698 24C63298 */ addiu $a2, $a2, 0x3298 ## $a2 = 04003298 -/* 1448C 8084669C 15C10008 */ bne $t6, $at, .L808466C0 +/* 1448C 8084669C 15C10008 */ bne $t6, $at, .L808466C0 /* 14490 808466A0 260501B4 */ addiu $a1, $s0, 0x01B4 ## $a1 = 000001B4 /* 14494 808466A4 3C0F8016 */ lui $t7, 0x8016 ## $t7 = 80160000 /* 14498 808466A8 8DEFF9C0 */ lw $t7, -0x0640($t7) ## 8015F9C0 /* 1449C 808466AC 24180001 */ addiu $t8, $zero, 0x0001 ## $t8 = 00000001 -/* 144A0 808466B0 29E10004 */ slti $at, $t7, 0x0004 -/* 144A4 808466B4 54200003 */ bnel $at, $zero, .L808466C4 +/* 144A0 808466B0 29E10004 */ slti $at, $t7, 0x0004 +/* 144A4 808466B4 54200003 */ bnel $at, $zero, .L808466C4 /* 144A8 808466B8 8E19067C */ lw $t9, 0x067C($s0) ## 0000067C /* 144AC 808466BC A218084F */ sb $t8, 0x084F($s0) ## 0000084F .L808466C0: @@ -33,21 +33,21 @@ glabel func_80846660 /* 144C4 808466D4 3C0141C0 */ lui $at, 0x41C0 ## $at = 41C00000 /* 144C8 808466D8 44812000 */ mtc1 $at, $f4 ## $f4 = 24.00 /* 144CC 808466DC 24090002 */ addiu $t1, $zero, 0x0002 ## $t1 = 00000002 -/* 144D0 808466E0 AFA90018 */ sw $t1, 0x0018($sp) -/* 144D4 808466E4 E7A0001C */ swc1 $f0, 0x001C($sp) -/* 144D8 808466E8 E7A00010 */ swc1 $f0, 0x0010($sp) +/* 144D0 808466E0 AFA90018 */ sw $t1, 0x0018($sp) +/* 144D4 808466E4 E7A0001C */ swc1 $f0, 0x001C($sp) +/* 144D8 808466E8 E7A00010 */ swc1 $f0, 0x0010($sp) /* 144DC 808466EC 34E7AAAB */ ori $a3, $a3, 0xAAAB ## $a3 = 3F2AAAAB -/* 144E0 808466F0 0C028FC2 */ jal func_800A3F08 -/* 144E4 808466F4 E7A40014 */ swc1 $f4, 0x0014($sp) +/* 144E0 808466F0 0C028FC2 */ jal SkelAnime_ChangeLinkAnim +/* 144E4 808466F4 E7A40014 */ swc1 $f4, 0x0014($sp) /* 144E8 808466F8 3C014448 */ lui $at, 0x4448 ## $at = 44480000 /* 144EC 808466FC 44814000 */ mtc1 $at, $f8 ## $f8 = 800.00 /* 144F0 80846700 C6060028 */ lwc1 $f6, 0x0028($s0) ## 00000028 -/* 144F4 80846704 46083280 */ add.s $f10, $f6, $f8 +/* 144F4 80846704 46083280 */ add.s $f10, $f6, $f8 /* 144F8 80846708 E60A0028 */ swc1 $f10, 0x0028($s0) ## 00000028 -/* 144FC 8084670C 8FBF002C */ lw $ra, 0x002C($sp) -/* 14500 80846710 8FB00028 */ lw $s0, 0x0028($sp) +/* 144FC 8084670C 8FBF002C */ lw $ra, 0x002C($sp) +/* 14500 80846710 8FB00028 */ lw $s0, 0x0028($sp) /* 14504 80846714 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 14508 80846718 03E00008 */ jr $ra +/* 14508 80846718 03E00008 */ jr $ra /* 1450C 8084671C 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808467D4.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_808467D4.s index 29d336d623..2fcd780fb1 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808467D4.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_808467D4.s @@ -1,12 +1,12 @@ glabel func_808467D4 /* 145C4 808467D4 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFFD0 -/* 145C8 808467D8 AFBF002C */ sw $ra, 0x002C($sp) -/* 145CC 808467DC AFB00028 */ sw $s0, 0x0028($sp) +/* 145C8 808467D8 AFBF002C */ sw $ra, 0x002C($sp) +/* 145CC 808467DC AFB00028 */ sw $s0, 0x0028($sp) /* 145D0 808467E0 3C068085 */ lui $a2, %hi(func_8084E9AC) ## $a2 = 80850000 /* 145D4 808467E4 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 -/* 145D8 808467E8 AFA40030 */ sw $a0, 0x0030($sp) +/* 145D8 808467E8 AFA40030 */ sw $a0, 0x0030($sp) /* 145DC 808467EC 24C6E9AC */ addiu $a2, $a2, %lo(func_8084E9AC) ## $a2 = 8084E9AC -/* 145E0 808467F0 0C20D716 */ jal func_80835C58 +/* 145E0 808467F0 0C20D716 */ jal func_80835C58 /* 145E4 808467F4 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 /* 145E8 808467F8 8E0E067C */ lw $t6, 0x067C($s0) ## 0000067C /* 145EC 808467FC 3C012000 */ lui $at, 0x2000 ## $at = 20000000 @@ -26,33 +26,33 @@ glabel func_808467D4 /* 14620 80846830 8D0600A0 */ lw $a2, 0x00A0($t0) ## 000000A0 /* 14624 80846834 3C073F2A */ lui $a3, 0x3F2A ## $a3 = 3F2A0000 /* 14628 80846838 24090002 */ addiu $t1, $zero, 0x0002 ## $t1 = 00000002 -/* 1462C 8084683C AFA90018 */ sw $t1, 0x0018($sp) +/* 1462C 8084683C AFA90018 */ sw $t1, 0x0018($sp) /* 14630 80846840 34E7AAAB */ ori $a3, $a3, 0xAAAB ## $a3 = 3F2AAAAB -/* 14634 80846844 8FA40030 */ lw $a0, 0x0030($sp) +/* 14634 80846844 8FA40030 */ lw $a0, 0x0030($sp) /* 14638 80846848 260501B4 */ addiu $a1, $s0, 0x01B4 ## $a1 = 000001B4 -/* 1463C 8084684C E7A0001C */ swc1 $f0, 0x001C($sp) -/* 14640 80846850 E7A00014 */ swc1 $f0, 0x0014($sp) -/* 14644 80846854 0C028FC2 */ jal func_800A3F08 -/* 14648 80846858 E7A00010 */ swc1 $f0, 0x0010($sp) -/* 1464C 8084685C 8FA40030 */ lw $a0, 0x0030($sp) +/* 1463C 8084684C E7A0001C */ swc1 $f0, 0x001C($sp) +/* 14640 80846850 E7A00014 */ swc1 $f0, 0x0014($sp) +/* 14644 80846854 0C028FC2 */ jal SkelAnime_ChangeLinkAnim +/* 14648 80846858 E7A00010 */ swc1 $f0, 0x0010($sp) +/* 1464C 8084685C 8FA40030 */ lw $a0, 0x0030($sp) /* 14650 80846860 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 14654 80846864 0C20CBD5 */ jal func_80832F54 +/* 14654 80846864 0C20CBD5 */ jal func_80832F54 /* 14658 80846868 2406028F */ addiu $a2, $zero, 0x028F ## $a2 = 0000028F /* 1465C 8084686C 3C0A8016 */ lui $t2, 0x8016 ## $t2 = 80160000 /* 14660 80846870 8D4AE664 */ lw $t2, -0x199C($t2) ## 8015E664 -/* 14664 80846874 8FA40030 */ lw $a0, 0x0030($sp) +/* 14664 80846874 8FA40030 */ lw $a0, 0x0030($sp) /* 14668 80846878 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 1466C 8084687C 55400004 */ bnel $t2, $zero, .L80846890 +/* 1466C 8084687C 55400004 */ bnel $t2, $zero, .L80846890 /* 14670 80846880 240B0014 */ addiu $t3, $zero, 0x0014 ## $t3 = 00000014 -/* 14674 80846884 0C2119C8 */ jal func_80846720 +/* 14674 80846884 0C2119C8 */ jal func_80846720 /* 14678 80846888 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 /* 1467C 8084688C 240B0014 */ addiu $t3, $zero, 0x0014 ## $t3 = 00000014 .L80846890: /* 14680 80846890 A60B0850 */ sh $t3, 0x0850($s0) ## 00000850 -/* 14684 80846894 8FBF002C */ lw $ra, 0x002C($sp) -/* 14688 80846898 8FB00028 */ lw $s0, 0x0028($sp) +/* 14684 80846894 8FBF002C */ lw $ra, 0x002C($sp) +/* 14688 80846898 8FB00028 */ lw $s0, 0x0028($sp) /* 1468C 8084689C 27BD0030 */ addiu $sp, $sp, 0x0030 ## $sp = 00000000 -/* 14690 808468A0 03E00008 */ jr $ra +/* 14690 808468A0 03E00008 */ jr $ra /* 14694 808468A4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80846AAC.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80846AAC.s index 04c7b0b147..cb66c1a079 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80846AAC.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80846AAC.s @@ -2,51 +2,51 @@ glabel func_80846AAC /* 1489C 80846AAC 3C0E8016 */ lui $t6, 0x8016 ## $t6 = 80160000 /* 148A0 80846AB0 8DCEE664 */ lw $t6, -0x199C($t6) ## 8015E664 /* 148A4 80846AB4 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 148A8 80846AB8 AFB10028 */ sw $s1, 0x0028($sp) -/* 148AC 80846ABC 000E7880 */ sll $t7, $t6, 2 -/* 148B0 80846AC0 01EE7823 */ subu $t7, $t7, $t6 -/* 148B4 80846AC4 000F7880 */ sll $t7, $t7, 2 -/* 148B8 80846AC8 01EE7821 */ addu $t7, $t7, $t6 -/* 148BC 80846ACC 000F7880 */ sll $t7, $t7, 2 +/* 148A8 80846AB8 AFB10028 */ sw $s1, 0x0028($sp) +/* 148AC 80846ABC 000E7880 */ sll $t7, $t6, 2 +/* 148B0 80846AC0 01EE7823 */ subu $t7, $t7, $t6 +/* 148B4 80846AC4 000F7880 */ sll $t7, $t7, 2 +/* 148B8 80846AC8 01EE7821 */ addu $t7, $t7, $t6 +/* 148BC 80846ACC 000F7880 */ sll $t7, $t7, 2 /* 148C0 80846AD0 3C188085 */ lui $t8, %hi(D_80853428) ## $t8 = 80850000 -/* 148C4 80846AD4 01EE7821 */ addu $t7, $t7, $t6 +/* 148C4 80846AD4 01EE7821 */ addu $t7, $t7, $t6 /* 148C8 80846AD8 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 -/* 148CC 80846ADC 000F7880 */ sll $t7, $t7, 2 +/* 148CC 80846ADC 000F7880 */ sll $t7, $t7, 2 /* 148D0 80846AE0 27183428 */ addiu $t8, $t8, %lo(D_80853428) ## $t8 = 80853428 -/* 148D4 80846AE4 AFBF002C */ sw $ra, 0x002C($sp) -/* 148D8 80846AE8 AFB00024 */ sw $s0, 0x0024($sp) -/* 148DC 80846AEC AFA60040 */ sw $a2, 0x0040($sp) -/* 148E0 80846AF0 01F8C821 */ addu $t9, $t7, $t8 +/* 148D4 80846AE4 AFBF002C */ sw $ra, 0x002C($sp) +/* 148D8 80846AE8 AFB00024 */ sw $s0, 0x0024($sp) +/* 148DC 80846AEC AFA60040 */ sw $a2, 0x0040($sp) +/* 148E0 80846AF0 01F8C821 */ addu $t9, $t7, $t8 /* 148E4 80846AF4 3C058085 */ lui $a1, %hi(D_80854708) ## $a1 = 80850000 /* 148E8 80846AF8 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 148EC 80846AFC AC990678 */ sw $t9, 0x0678($a0) ## 00000678 /* 148F0 80846B00 0C01E037 */ jal Actor_ProcessInitChain - + /* 148F4 80846B04 24A54708 */ addiu $a1, $a1, %lo(D_80854708) ## $a1 = 80854708 /* 148F8 80846B08 86090032 */ lh $t1, 0x0032($s0) ## 00000032 /* 148FC 80846B0C 2408001F */ addiu $t0, $zero, 0x001F ## $t0 = 0000001F /* 14900 80846B10 AE080670 */ sw $t0, 0x0670($s0) ## 00000670 /* 14904 80846B14 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 14908 80846B18 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 1490C 80846B1C 0C20D191 */ jal func_80834644 +/* 1490C 80846B1C 0C20D191 */ jal func_80834644 /* 14910 80846B20 A609083C */ sh $t1, 0x083C($s0) ## 0000083C /* 14914 80846B24 920A015B */ lbu $t2, 0x015B($s0) ## 0000015B /* 14918 80846B28 3C078085 */ lui $a3, %hi(D_80853914) ## $a3 = 80850000 /* 1491C 80846B2C 240C0009 */ addiu $t4, $zero, 0x0009 ## $t4 = 00000009 -/* 14920 80846B30 000A5880 */ sll $t3, $t2, 2 -/* 14924 80846B34 00EB3821 */ addu $a3, $a3, $t3 +/* 14920 80846B30 000A5880 */ sll $t3, $t2, 2 +/* 14924 80846B34 00EB3821 */ addu $a3, $a3, $t3 /* 14928 80846B38 260D01F8 */ addiu $t5, $s0, 0x01F8 ## $t5 = 000001F8 /* 1492C 80846B3C 260E0288 */ addiu $t6, $s0, 0x0288 ## $t6 = 00000288 /* 14930 80846B40 240F0016 */ addiu $t7, $zero, 0x0016 ## $t7 = 00000016 -/* 14934 80846B44 AFAF001C */ sw $t7, 0x001C($sp) -/* 14938 80846B48 AFAE0018 */ sw $t6, 0x0018($sp) -/* 1493C 80846B4C AFAD0014 */ sw $t5, 0x0014($sp) -/* 14940 80846B50 8CE73914 */ lw $a3, %lo(D_80853914)($a3) -/* 14944 80846B54 AFAC0010 */ sw $t4, 0x0010($sp) +/* 14934 80846B44 AFAF001C */ sw $t7, 0x001C($sp) +/* 14938 80846B48 AFAE0018 */ sw $t6, 0x0018($sp) +/* 1493C 80846B4C AFAD0014 */ sw $t5, 0x0014($sp) +/* 14940 80846B50 8CE73914 */ lw $a3, %lo(D_80853914)($a3) +/* 14944 80846B54 AFAC0010 */ sw $t4, 0x0010($sp) /* 14948 80846B58 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 1494C 80846B5C 260501B4 */ addiu $a1, $s0, 0x01B4 ## $a1 = 000001B4 -/* 14950 80846B60 0C028E6B */ jal func_800A39AC -/* 14954 80846B64 8FA60040 */ lw $a2, 0x0040($sp) +/* 14950 80846B60 0C028E6B */ jal SkelAnime_InitLinkAnimetion +/* 14954 80846B64 8FA60040 */ lw $a2, 0x0040($sp) /* 14958 80846B68 3C188085 */ lui $t8, %hi(D_80854730) ## $t8 = 80850000 /* 1495C 80846B6C 27184730 */ addiu $t8, $t8, %lo(D_80854730) ## $t8 = 80854730 /* 14960 80846B70 8F080000 */ lw $t0, 0x0000($t8) ## 80854730 @@ -54,20 +54,20 @@ glabel func_80846AAC /* 14968 80846B78 AA0801F2 */ swl $t0, 0x01F2($s0) ## 000001F2 /* 1496C 80846B7C BA0801F5 */ swr $t0, 0x01F5($s0) ## 000001F5 /* 14970 80846B80 97080004 */ lhu $t0, 0x0004($t8) ## 80854734 -/* 14974 80846B84 0C20CCCE */ jal func_80833338 +/* 14974 80846B84 0C20CCCE */ jal func_80833338 /* 14978 80846B88 A60801F6 */ sh $t0, 0x01F6($s0) ## 000001F6 /* 1497C 80846B8C 24090009 */ addiu $t1, $zero, 0x0009 ## $t1 = 00000009 /* 14980 80846B90 260A070C */ addiu $t2, $s0, 0x070C ## $t2 = 0000070C /* 14984 80846B94 260B079C */ addiu $t3, $s0, 0x079C ## $t3 = 0000079C /* 14988 80846B98 240C0016 */ addiu $t4, $zero, 0x0016 ## $t4 = 00000016 -/* 1498C 80846B9C AFAC001C */ sw $t4, 0x001C($sp) -/* 14990 80846BA0 AFAB0018 */ sw $t3, 0x0018($sp) -/* 14994 80846BA4 AFAA0014 */ sw $t2, 0x0014($sp) -/* 14998 80846BA8 AFA90010 */ sw $t1, 0x0010($sp) +/* 1498C 80846B9C AFAC001C */ sw $t4, 0x001C($sp) +/* 14990 80846BA0 AFAB0018 */ sw $t3, 0x0018($sp) +/* 14994 80846BA4 AFAA0014 */ sw $t2, 0x0014($sp) +/* 14998 80846BA8 AFA90010 */ sw $t1, 0x0010($sp) /* 1499C 80846BAC 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 149A0 80846BB0 260506C8 */ addiu $a1, $s0, 0x06C8 ## $a1 = 000006C8 -/* 149A4 80846BB4 8FA60040 */ lw $a2, 0x0040($sp) -/* 149A8 80846BB8 0C028E6B */ jal func_800A39AC +/* 149A4 80846BB4 8FA60040 */ lw $a2, 0x0040($sp) +/* 149A8 80846BB8 0C028E6B */ jal SkelAnime_InitLinkAnimetion /* 149AC 80846BBC 00403825 */ or $a3, $v0, $zero ## $a3 = 00000000 /* 149B0 80846BC0 3C0D8085 */ lui $t5, %hi(D_80854730) ## $t5 = 80850000 /* 149B4 80846BC4 25AD4730 */ addiu $t5, $t5, %lo(D_80854730) ## $t5 = 80854730 @@ -80,8 +80,8 @@ glabel func_80846AAC /* 149D0 80846BE0 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 149D4 80846BE4 26050670 */ addiu $a1, $s0, 0x0670 ## $a1 = 00000670 /* 149D8 80846BE8 A60F070A */ sh $t7, 0x070A($s0) ## 0000070A -/* 149DC 80846BEC AFB80014 */ sw $t8, 0x0014($sp) -/* 149E0 80846BF0 AFA00010 */ sw $zero, 0x0010($sp) +/* 149DC 80846BEC AFB80014 */ sw $t8, 0x0014($sp) +/* 149E0 80846BF0 AFA00010 */ sw $zero, 0x0010($sp) /* 149E4 80846BF4 24060002 */ addiu $a2, $zero, 0x0002 ## $a2 = 00000002 /* 149E8 80846BF8 0C009B35 */ jal Effect_Add ## Effect_Add @@ -92,56 +92,56 @@ glabel func_80846AAC /* 149FC 80846C0C 260400B4 */ addiu $a0, $s0, 0x00B4 ## $a0 = 000000B4 /* 14A00 80846C10 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 /* 14A04 80846C14 0C00AC78 */ jal ActorShape_Init - + /* 14A08 80846C18 8F270004 */ lw $a3, 0x0004($t9) ## 00000004 /* 14A0C 80846C1C 2408FFFF */ addiu $t0, $zero, 0xFFFF ## $t0 = FFFFFFFF /* 14A10 80846C20 A608046C */ sh $t0, 0x046C($s0) ## 0000046C /* 14A14 80846C24 26050498 */ addiu $a1, $s0, 0x0498 ## $a1 = 00000498 -/* 14A18 80846C28 AFA50030 */ sw $a1, 0x0030($sp) +/* 14A18 80846C28 AFA50030 */ sw $a1, 0x0030($sp) /* 14A1C 80846C2C 0C0170D9 */ jal ActorCollider_AllocCylinder - + /* 14A20 80846C30 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 14A24 80846C34 3C078085 */ lui $a3, %hi(D_80854624) ## $a3 = 80850000 -/* 14A28 80846C38 8FA50030 */ lw $a1, 0x0030($sp) +/* 14A28 80846C38 8FA50030 */ lw $a1, 0x0030($sp) /* 14A2C 80846C3C 24E74624 */ addiu $a3, $a3, %lo(D_80854624) ## $a3 = 80854624 /* 14A30 80846C40 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 14A34 80846C44 0C01712B */ jal ActorCollider_InitCylinder - + /* 14A38 80846C48 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 14A3C 80846C4C 260504E4 */ addiu $a1, $s0, 0x04E4 ## $a1 = 000004E4 -/* 14A40 80846C50 AFA50030 */ sw $a1, 0x0030($sp) -/* 14A44 80846C54 0C017406 */ jal func_8005D018 +/* 14A40 80846C50 AFA50030 */ sw $a1, 0x0030($sp) +/* 14A44 80846C54 0C017406 */ jal func_8005D018 /* 14A48 80846C58 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 14A4C 80846C5C 3C078085 */ lui $a3, %hi(D_80854650) ## $a3 = 80850000 -/* 14A50 80846C60 8FA50030 */ lw $a1, 0x0030($sp) +/* 14A50 80846C60 8FA50030 */ lw $a1, 0x0030($sp) /* 14A54 80846C64 24E74650 */ addiu $a3, $a3, %lo(D_80854650) ## $a3 = 80854650 /* 14A58 80846C68 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 14A5C 80846C6C 0C017441 */ jal func_8005D104 +/* 14A5C 80846C6C 0C017441 */ jal func_8005D104 /* 14A60 80846C70 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 14A64 80846C74 26050564 */ addiu $a1, $s0, 0x0564 ## $a1 = 00000564 -/* 14A68 80846C78 AFA50030 */ sw $a1, 0x0030($sp) -/* 14A6C 80846C7C 0C017406 */ jal func_8005D018 +/* 14A68 80846C78 AFA50030 */ sw $a1, 0x0030($sp) +/* 14A6C 80846C7C 0C017406 */ jal func_8005D018 /* 14A70 80846C80 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 14A74 80846C84 3C078085 */ lui $a3, %hi(D_80854650) ## $a3 = 80850000 -/* 14A78 80846C88 8FA50030 */ lw $a1, 0x0030($sp) +/* 14A78 80846C88 8FA50030 */ lw $a1, 0x0030($sp) /* 14A7C 80846C8C 24E74650 */ addiu $a3, $a3, %lo(D_80854650) ## $a3 = 80854650 /* 14A80 80846C90 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 14A84 80846C94 0C017441 */ jal func_8005D104 +/* 14A84 80846C94 0C017441 */ jal func_8005D104 /* 14A88 80846C98 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 /* 14A8C 80846C9C 260505E4 */ addiu $a1, $s0, 0x05E4 ## $a1 = 000005E4 -/* 14A90 80846CA0 AFA50030 */ sw $a1, 0x0030($sp) -/* 14A94 80846CA4 0C017406 */ jal func_8005D018 +/* 14A90 80846CA0 AFA50030 */ sw $a1, 0x0030($sp) +/* 14A94 80846CA4 0C017406 */ jal func_8005D018 /* 14A98 80846CA8 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 /* 14A9C 80846CAC 3C078085 */ lui $a3, %hi(D_808546A0) ## $a3 = 80850000 -/* 14AA0 80846CB0 8FA50030 */ lw $a1, 0x0030($sp) +/* 14AA0 80846CB0 8FA50030 */ lw $a1, 0x0030($sp) /* 14AA4 80846CB4 24E746A0 */ addiu $a3, $a3, %lo(D_808546A0) ## $a3 = 808546A0 /* 14AA8 80846CB8 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 14AAC 80846CBC 0C017441 */ jal func_8005D104 +/* 14AAC 80846CBC 0C017441 */ jal func_8005D104 /* 14AB0 80846CC0 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000 -/* 14AB4 80846CC4 8FBF002C */ lw $ra, 0x002C($sp) -/* 14AB8 80846CC8 8FB00024 */ lw $s0, 0x0024($sp) -/* 14ABC 80846CCC 8FB10028 */ lw $s1, 0x0028($sp) -/* 14AC0 80846CD0 03E00008 */ jr $ra +/* 14AB4 80846CC4 8FBF002C */ lw $ra, 0x002C($sp) +/* 14AB8 80846CC8 8FB00024 */ lw $s0, 0x0024($sp) +/* 14ABC 80846CCC 8FB10028 */ lw $s1, 0x0028($sp) +/* 14AC0 80846CD0 03E00008 */ jr $ra /* 14AC4 80846CD4 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80848F9C.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80848F9C.s index 0328921d1d..233edb27d7 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80848F9C.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80848F9C.s @@ -1,118 +1,118 @@ glabel func_80848F9C /* 16D8C 80848F9C 27BDFF80 */ addiu $sp, $sp, 0xFF80 ## $sp = FFFFFF80 /* 16D90 80848FA0 3C018086 */ lui $at, %hi(D_80858AB4) ## $at = 80860000 -/* 16D94 80848FA4 AFBF0024 */ sw $ra, 0x0024($sp) -/* 16D98 80848FA8 AFB00020 */ sw $s0, 0x0020($sp) -/* 16D9C 80848FAC AFA50084 */ sw $a1, 0x0084($sp) -/* 16DA0 80848FB0 AC268AB4 */ sw $a2, %lo(D_80858AB4)($at) +/* 16D94 80848FA4 AFBF0024 */ sw $ra, 0x0024($sp) +/* 16D98 80848FA8 AFB00020 */ sw $s0, 0x0020($sp) +/* 16D9C 80848FAC AFA50084 */ sw $a1, 0x0084($sp) +/* 16DA0 80848FB0 AC268AB4 */ sw $a2, %lo(D_80858AB4)($at) /* 16DA4 80848FB4 80820A86 */ lb $v0, 0x0A86($a0) ## 00000A86 /* 16DA8 80848FB8 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 16DAC 80848FBC 04410009 */ bgez $v0, .L80848FE4 +/* 16DAC 80848FBC 04410009 */ bgez $v0, .L80848FE4 /* 16DB0 80848FC0 244E0001 */ addiu $t6, $v0, 0x0001 ## $t6 = 00000001 /* 16DB4 80848FC4 A08E0A86 */ sb $t6, 0x0A86($a0) ## 00000A86 /* 16DB8 80848FC8 808F0A86 */ lb $t7, 0x0A86($a0) ## 00000A86 /* 16DBC 80848FCC 24180001 */ addiu $t8, $zero, 0x0001 ## $t8 = 00000001 -/* 16DC0 80848FD0 55E00005 */ bnel $t7, $zero, .L80848FE8 +/* 16DC0 80848FD0 55E00005 */ bnel $t7, $zero, .L80848FE8 /* 16DC4 80848FD4 26050008 */ addiu $a1, $s0, 0x0008 ## $a1 = 00000008 /* 16DC8 80848FD8 A0980A86 */ sb $t8, 0x0A86($a0) ## 00000A86 -/* 16DCC 80848FDC 0C01E221 */ jal func_80078884 +/* 16DCC 80848FDC 0C01E221 */ jal func_80078884 /* 16DD0 80848FE0 24045806 */ addiu $a0, $zero, 0x5806 ## $a0 = 00005806 .L80848FE4: /* 16DD4 80848FE4 26050008 */ addiu $a1, $s0, 0x0008 ## $a1 = 00000008 .L80848FE8: -/* 16DD8 80848FE8 AFA50034 */ sw $a1, 0x0034($sp) +/* 16DD8 80848FE8 AFA50034 */ sw $a1, 0x0034($sp) /* 16DDC 80848FEC 0C01DF90 */ jal Math_Vec3f_Copy ## Vec3f_Copy /* 16DE0 80848FF0 26040100 */ addiu $a0, $s0, 0x0100 ## $a0 = 00000100 /* 16DE4 80848FF4 92020A73 */ lbu $v0, 0x0A73($s0) ## 00000A73 /* 16DE8 80848FF8 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 16DEC 80848FFC 10400002 */ beq $v0, $zero, .L80849008 +/* 16DEC 80848FFC 10400002 */ beq $v0, $zero, .L80849008 /* 16DF0 80849000 2459FFFF */ addiu $t9, $v0, 0xFFFF ## $t9 = FFFFFFFF /* 16DF4 80849004 A2190A73 */ sb $t9, 0x0A73($s0) ## 00000A73 .L80849008: /* 16DF8 80849008 9202088E */ lbu $v0, 0x088E($s0) ## 0000088E -/* 16DFC 8084900C 10400002 */ beq $v0, $zero, .L80849018 +/* 16DFC 8084900C 10400002 */ beq $v0, $zero, .L80849018 /* 16E00 80849010 2448FFFF */ addiu $t0, $v0, 0xFFFF ## $t0 = FFFFFFFF /* 16E04 80849014 A208088E */ sb $t0, 0x088E($s0) ## 0000088E .L80849018: /* 16E08 80849018 92020A87 */ lbu $v0, 0x0A87($s0) ## 00000A87 -/* 16E0C 8084901C 10400002 */ beq $v0, $zero, .L80849028 +/* 16E0C 8084901C 10400002 */ beq $v0, $zero, .L80849028 /* 16E10 80849020 2449FFFF */ addiu $t1, $v0, 0xFFFF ## $t1 = FFFFFFFF /* 16E14 80849024 A2090A87 */ sb $t1, 0x0A87($s0) ## 00000A87 .L80849028: /* 16E18 80849028 82020A78 */ lb $v0, 0x0A78($s0) ## 00000A78 -/* 16E1C 8084902C 04410003 */ bgez $v0, .L8084903C +/* 16E1C 8084902C 04410003 */ bgez $v0, .L8084903C /* 16E20 80849030 244A0001 */ addiu $t2, $v0, 0x0001 ## $t2 = 00000001 -/* 16E24 80849034 10000004 */ beq $zero, $zero, .L80849048 +/* 16E24 80849034 10000004 */ beq $zero, $zero, .L80849048 /* 16E28 80849038 A20A0A78 */ sb $t2, 0x0A78($s0) ## 00000A78 .L8084903C: -/* 16E2C 8084903C 18400002 */ blez $v0, .L80849048 +/* 16E2C 8084903C 18400002 */ blez $v0, .L80849048 /* 16E30 80849040 244BFFFF */ addiu $t3, $v0, 0xFFFF ## $t3 = FFFFFFFF /* 16E34 80849044 A20B0A78 */ sb $t3, 0x0A78($s0) ## 00000A78 .L80849048: /* 16E38 80849048 92020890 */ lbu $v0, 0x0890($s0) ## 00000890 -/* 16E3C 8084904C 10400002 */ beq $v0, $zero, .L80849058 +/* 16E3C 8084904C 10400002 */ beq $v0, $zero, .L80849058 /* 16E40 80849050 244CFFFF */ addiu $t4, $v0, 0xFFFF ## $t4 = FFFFFFFF /* 16E44 80849054 A20C0890 */ sb $t4, 0x0890($s0) ## 00000890 .L80849058: -/* 16E48 80849058 0C211CF5 */ jal func_808473D4 -/* 16E4C 8084905C 8FA40084 */ lw $a0, 0x0084($sp) +/* 16E48 80849058 0C211CF5 */ jal func_808473D4 +/* 16E4C 8084905C 8FA40084 */ lw $a0, 0x0084($sp) /* 16E50 80849060 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 16E54 80849064 0C20DAFB */ jal func_80836BEC -/* 16E58 80849068 8FA50084 */ lw $a1, 0x0084($sp) +/* 16E54 80849064 0C20DAFB */ jal func_80836BEC +/* 16E58 80849068 8FA50084 */ lw $a1, 0x0084($sp) /* 16E5C 8084906C 82020151 */ lb $v0, 0x0151($s0) ## 00000151 /* 16E60 80849070 24010006 */ addiu $at, $zero, 0x0006 ## $at = 00000006 -/* 16E64 80849074 5441000A */ bnel $v0, $at, .L808490A0 +/* 16E64 80849074 5441000A */ bnel $v0, $at, .L808490A0 /* 16E68 80849078 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 /* 16E6C 8084907C 860D0860 */ lh $t5, 0x0860($s0) ## 00000860 -/* 16E70 80849080 8FA40084 */ lw $a0, 0x0084($sp) -/* 16E74 80849084 51A00006 */ beql $t5, $zero, .L808490A0 +/* 16E70 80849080 8FA40084 */ lw $a0, 0x0084($sp) +/* 16E74 80849084 51A00006 */ beql $t5, $zero, .L808490A0 /* 16E78 80849088 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 16E7C 8084908C 0C212281 */ jal func_80848A04 +/* 16E7C 8084908C 0C212281 */ jal func_80848A04 /* 16E80 80849090 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 16E84 80849094 10000009 */ beq $zero, $zero, .L808490BC +/* 16E84 80849094 10000009 */ beq $zero, $zero, .L808490BC /* 16E88 80849098 920F0891 */ lbu $t7, 0x0891($s0) ## 00000891 /* 16E8C 8084909C 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 .L808490A0: -/* 16E90 808490A0 54410006 */ bnel $v0, $at, .L808490BC +/* 16E90 808490A0 54410006 */ bnel $v0, $at, .L808490BC /* 16E94 808490A4 920F0891 */ lbu $t7, 0x0891($s0) ## 00000891 /* 16E98 808490A8 86020860 */ lh $v0, 0x0860($s0) ## 00000860 -/* 16E9C 808490AC 04410002 */ bgez $v0, .L808490B8 +/* 16E9C 808490AC 04410002 */ bgez $v0, .L808490B8 /* 16EA0 808490B0 244E0001 */ addiu $t6, $v0, 0x0001 ## $t6 = 00000001 /* 16EA4 808490B4 A60E0860 */ sh $t6, 0x0860($s0) ## 00000860 .L808490B8: /* 16EA8 808490B8 920F0891 */ lbu $t7, 0x0891($s0) ## 00000891 .L808490BC: -/* 16EAC 808490BC 51E00005 */ beql $t7, $zero, .L808490D4 +/* 16EAC 808490BC 51E00005 */ beql $t7, $zero, .L808490D4 /* 16EB0 808490C0 92180A60 */ lbu $t8, 0x0A60($s0) ## 00000A60 -/* 16EB4 808490C4 8FA40084 */ lw $a0, 0x0084($sp) -/* 16EB8 808490C8 0C2122D1 */ jal func_80848B44 +/* 16EB4 808490C4 8FA40084 */ lw $a0, 0x0084($sp) +/* 16EB8 808490C8 0C2122D1 */ jal func_80848B44 /* 16EBC 808490CC 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 16EC0 808490D0 92180A60 */ lbu $t8, 0x0A60($s0) ## 00000A60 .L808490D4: -/* 16EC4 808490D4 53000005 */ beql $t8, $zero, .L808490EC +/* 16EC4 808490D4 53000005 */ beql $t8, $zero, .L808490EC /* 16EC8 808490D8 92190692 */ lbu $t9, 0x0692($s0) ## 00000692 -/* 16ECC 808490DC 8FA40084 */ lw $a0, 0x0084($sp) -/* 16ED0 808490E0 0C21231D */ jal func_80848C74 +/* 16ECC 808490DC 8FA40084 */ lw $a0, 0x0084($sp) +/* 16ED0 808490E0 0C21231D */ jal func_80848C74 /* 16ED4 808490E4 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 16ED8 808490E8 92190692 */ lbu $t9, 0x0692($s0) ## 00000692 .L808490EC: /* 16EDC 808490EC 3C098016 */ lui $t1, 0x8016 ## $t1 = 80160000 /* 16EE0 808490F0 33280040 */ andi $t0, $t9, 0x0040 ## $t0 = 00000000 -/* 16EE4 808490F4 51000012 */ beql $t0, $zero, .L80849140 +/* 16EE4 808490F4 51000012 */ beql $t0, $zero, .L80849140 /* 16EE8 808490F8 8E0E0680 */ lw $t6, 0x0680($s0) ## 00000680 /* 16EEC 808490FC 8529FA28 */ lh $t1, -0x05D8($t1) ## 8015FA28 /* 16EF0 80849100 3C0A8016 */ lui $t2, 0x8016 ## $t2 = 80160000 -/* 16EF4 80849104 5120000E */ beql $t1, $zero, .L80849140 +/* 16EF4 80849104 5120000E */ beql $t1, $zero, .L80849140 /* 16EF8 80849108 8E0E0680 */ lw $t6, 0x0680($s0) ## 00000680 /* 16EFC 8084910C 854AFA50 */ lh $t2, -0x05B0($t2) ## 8015FA50 /* 16F00 80849110 240B0003 */ addiu $t3, $zero, 0x0003 ## $t3 = 00000003 /* 16F04 80849114 3C018016 */ lui $at, 0x8016 ## $at = 80160000 -/* 16F08 80849118 15400008 */ bne $t2, $zero, .L8084913C +/* 16F08 80849118 15400008 */ bne $t2, $zero, .L8084913C /* 16F0C 8084911C 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 16F10 80849120 A42BFA50 */ sh $t3, -0x05B0($at) ## 8015FA50 -/* 16F14 80849124 8FA40084 */ lw $a0, 0x0084($sp) -/* 16F18 80849128 0C211A80 */ jal func_80846A00 +/* 16F14 80849124 8FA40084 */ lw $a0, 0x0084($sp) +/* 16F18 80849128 0C211A80 */ jal func_80846A00 /* 16F1C 8084912C 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 /* 16F20 80849130 920C0692 */ lbu $t4, 0x0692($s0) ## 00000692 /* 16F24 80849134 318DFFBF */ andi $t5, $t4, 0xFFBF ## $t5 = 00000000 @@ -121,98 +121,98 @@ glabel func_80848F9C /* 16F2C 8084913C 8E0E0680 */ lw $t6, 0x0680($s0) ## 00000680 .L80849140: /* 16F30 80849140 31CF8000 */ andi $t7, $t6, 0x8000 ## $t7 = 00000000 -/* 16F34 80849144 51E00010 */ beql $t7, $zero, .L80849188 +/* 16F34 80849144 51E00010 */ beql $t7, $zero, .L80849188 /* 16F38 80849148 82030153 */ lb $v1, 0x0153($s0) ## 00000153 /* 16F3C 8084914C 96180088 */ lhu $t8, 0x0088($s0) ## 00000088 /* 16F40 80849150 33190001 */ andi $t9, $t8, 0x0001 ## $t9 = 00000000 -/* 16F44 80849154 57200006 */ bnel $t9, $zero, .L80849170 -/* 16F48 80849158 8FA40084 */ lw $a0, 0x0084($sp) -/* 16F4C 8084915C 0C20C884 */ jal func_80832210 +/* 16F44 80849154 57200006 */ bnel $t9, $zero, .L80849170 +/* 16F48 80849158 8FA40084 */ lw $a0, 0x0084($sp) +/* 16F4C 8084915C 0C20C884 */ jal func_80832210 /* 16F50 80849160 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 16F54 80849164 0C00B638 */ jal Actor_MoveForward - + /* 16F58 80849168 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 16F5C 8084916C 8FA40084 */ lw $a0, 0x0084($sp) +/* 16F5C 8084916C 8FA40084 */ lw $a0, 0x0084($sp) .L80849170: -/* 16F60 80849170 0C211EE8 */ jal func_80847BA0 +/* 16F60 80849170 0C211EE8 */ jal func_80847BA0 /* 16F64 80849174 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 16F68 80849178 26080498 */ addiu $t0, $s0, 0x0498 ## $t0 = 00000498 -/* 16F6C 8084917C 10000322 */ beq $zero, $zero, .L80849E08 -/* 16F70 80849180 AFA8002C */ sw $t0, 0x002C($sp) +/* 16F6C 8084917C 10000322 */ beq $zero, $zero, .L80849E08 +/* 16F70 80849180 AFA8002C */ sw $t0, 0x002C($sp) /* 16F74 80849184 82030153 */ lb $v1, 0x0153($s0) ## 00000153 .L80849188: /* 16F78 80849188 8202014F */ lb $v0, 0x014F($s0) ## 0000014F -/* 16F7C 8084918C 10620029 */ beq $v1, $v0, .L80849234 +/* 16F7C 8084918C 10620029 */ beq $v1, $v0, .L80849234 /* 16F80 80849190 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 16F84 80849194 54410015 */ bnel $v0, $at, .L808491EC +/* 16F84 80849194 54410015 */ bnel $v0, $at, .L808491EC /* 16F88 80849198 8E0E067C */ lw $t6, 0x067C($s0) ## 0000067C /* 16F8C 8084919C 8E09067C */ lw $t1, 0x067C($s0) ## 0000067C -/* 16F90 808491A0 8FA40084 */ lw $a0, 0x0084($sp) -/* 16F94 808491A4 00095100 */ sll $t2, $t1, 4 -/* 16F98 808491A8 0541000D */ bgez $t2, .L808491E0 +/* 16F90 808491A0 8FA40084 */ lw $a0, 0x0084($sp) +/* 16F94 808491A4 00095100 */ sll $t2, $t1, 4 +/* 16F98 808491A8 0541000D */ bgez $t2, .L808491E0 /* 16F9C 808491AC 00000000 */ nop -/* 16FA0 808491B0 0C20C8D0 */ jal func_80832340 +/* 16FA0 808491B0 0C20C8D0 */ jal func_80832340 /* 16FA4 808491B4 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 16FA8 808491B8 8E0B0678 */ lw $t3, 0x0678($s0) ## 00000678 /* 16FAC 808491BC C6060084 */ lwc1 $f6, 0x0084($s0) ## 00000084 /* 16FB0 808491C0 C564002C */ lwc1 $f4, 0x002C($t3) ## 0000002C -/* 16FB4 808491C4 4606203C */ c.lt.s $f4, $f6 +/* 16FB4 808491C4 4606203C */ c.lt.s $f4, $f6 /* 16FB8 808491C8 00000000 */ nop -/* 16FBC 808491CC 45000004 */ bc1f .L808491E0 +/* 16FBC 808491CC 45000004 */ bc1f .L808491E0 /* 16FC0 808491D0 00000000 */ nop /* 16FC4 808491D4 8E0C0680 */ lw $t4, 0x0680($s0) ## 00000680 /* 16FC8 808491D8 358D0400 */ ori $t5, $t4, 0x0400 ## $t5 = 00000400 /* 16FCC 808491DC AE0D0680 */ sw $t5, 0x0680($s0) ## 00000680 .L808491E0: -/* 16FD0 808491E0 10000013 */ beq $zero, $zero, .L80849230 +/* 16FD0 808491E0 10000013 */ beq $zero, $zero, .L80849230 /* 16FD4 808491E4 8202014F */ lb $v0, 0x014F($s0) ## 0000014F /* 16FD8 808491E8 8E0E067C */ lw $t6, 0x067C($s0) ## 0000067C .L808491EC: /* 16FDC 808491EC 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 16FE0 808491F0 000E7900 */ sll $t7, $t6, 4 -/* 16FE4 808491F4 05E3000F */ bgezl $t7, .L80849234 +/* 16FE0 808491F0 000E7900 */ sll $t7, $t6, 4 +/* 16FE4 808491F4 05E3000F */ bgezl $t7, .L80849234 /* 16FE8 808491F8 A2020153 */ sb $v0, 0x0153($s0) ## 00000153 -/* 16FEC 808491FC 10610005 */ beq $v1, $at, .L80849214 -/* 16FF0 80849200 8FA40084 */ lw $a0, 0x0084($sp) +/* 16FEC 808491FC 10610005 */ beq $v1, $at, .L80849214 +/* 16FF0 80849200 8FA40084 */ lw $a0, 0x0084($sp) /* 16FF4 80849204 96180088 */ lhu $t8, 0x0088($s0) ## 00000088 /* 16FF8 80849208 33190001 */ andi $t9, $t8, 0x0001 ## $t9 = 00000000 -/* 16FFC 8084920C 53200009 */ beql $t9, $zero, .L80849234 +/* 16FFC 8084920C 53200009 */ beql $t9, $zero, .L80849234 /* 17000 80849210 A2020153 */ sb $v0, 0x0153($s0) ## 00000153 .L80849214: -/* 17004 80849214 0C20F4DB */ jal func_8083D36C +/* 17004 80849214 0C20F4DB */ jal func_8083D36C /* 17008 80849218 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 1700C 8084921C 8E080680 */ lw $t0, 0x0680($s0) ## 00000680 /* 17010 80849220 2401FBFF */ addiu $at, $zero, 0xFBFF ## $at = FFFFFBFF /* 17014 80849224 8202014F */ lb $v0, 0x014F($s0) ## 0000014F -/* 17018 80849228 01014824 */ and $t1, $t0, $at +/* 17018 80849228 01014824 */ and $t1, $t0, $at /* 1701C 8084922C AE090680 */ sw $t1, 0x0680($s0) ## 00000680 .L80849230: /* 17020 80849230 A2020153 */ sb $v0, 0x0153($s0) ## 00000153 .L80849234: /* 17024 80849234 8E0A0118 */ lw $t2, 0x0118($s0) ## 00000118 -/* 17028 80849238 5540001A */ bnel $t2, $zero, .L808492A4 +/* 17028 80849238 5540001A */ bnel $t2, $zero, .L808492A4 /* 1702C 8084923C 82020844 */ lb $v0, 0x0844($s0) ## 00000844 /* 17030 80849240 8E0B067C */ lw $t3, 0x067C($s0) ## 0000067C -/* 17034 80849244 000B6200 */ sll $t4, $t3, 8 -/* 17038 80849248 05830016 */ bgezl $t4, .L808492A4 +/* 17034 80849244 000B6200 */ sll $t4, $t3, 8 +/* 17038 80849248 05830016 */ bgezl $t4, .L808492A4 /* 1703C 8084924C 82020844 */ lb $v0, 0x0844($s0) ## 00000844 /* 17040 80849250 8E0D0440 */ lw $t5, 0x0440($s0) ## 00000440 /* 17044 80849254 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 17048 80849258 AE0D0118 */ sw $t5, 0x0118($s0) ## 00000118 -/* 1704C 8084925C 0C20E8D8 */ jal func_8083A360 -/* 17050 80849260 8FA40084 */ lw $a0, 0x0084($sp) +/* 1704C 8084925C 0C20E8D8 */ jal func_8083A360 +/* 17050 80849260 8FA40084 */ lw $a0, 0x0084($sp) /* 17054 80849264 8E0E067C */ lw $t6, 0x067C($s0) ## 0000067C /* 17058 80849268 3C010080 */ lui $at, 0x0080 ## $at = 00800000 /* 1705C 8084926C 3C060400 */ lui $a2, 0x0400 ## $a2 = 04000000 /* 17060 80849270 01C17825 */ or $t7, $t6, $at ## $t7 = 00800000 /* 17064 80849274 AE0F067C */ sw $t7, 0x067C($s0) ## 0000067C -/* 17068 80849278 8FA40084 */ lw $a0, 0x0084($sp) +/* 17068 80849278 8FA40084 */ lw $a0, 0x0084($sp) /* 1706C 8084927C 24C633B8 */ addiu $a2, $a2, 0x33B8 ## $a2 = 040033B8 -/* 17070 80849280 0C20C899 */ jal func_80832264 +/* 17070 80849280 0C20C899 */ jal func_80832264 /* 17074 80849284 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 17078 80849288 8FA40084 */ lw $a0, 0x0084($sp) +/* 17078 80849288 8FA40084 */ lw $a0, 0x0084($sp) /* 1707C 8084928C 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 17080 80849290 0C20CBD5 */ jal func_80832F54 +/* 17080 80849290 0C20CBD5 */ jal func_80832F54 /* 17084 80849294 2406009B */ addiu $a2, $zero, 0x009B ## $a2 = 0000009B /* 17088 80849298 24180063 */ addiu $t8, $zero, 0x0063 ## $t8 = 00000063 /* 1708C 8084929C A6180850 */ sh $t8, 0x0850($s0) ## 00000850 @@ -220,127 +220,127 @@ glabel func_80848F9C .L808492A4: /* 17094 808492A4 260406C2 */ addiu $a0, $s0, 0x06C2 ## $a0 = 000006C2 /* 17098 808492A8 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 1709C 808492AC 14400003 */ bne $v0, $zero, .L808492BC +/* 1709C 808492AC 14400003 */ bne $v0, $zero, .L808492BC /* 170A0 808492B0 00000000 */ nop -/* 170A4 808492B4 10000007 */ beq $zero, $zero, .L808492D4 +/* 170A4 808492B4 10000007 */ beq $zero, $zero, .L808492D4 /* 170A8 808492B8 A2000845 */ sb $zero, 0x0845($s0) ## 00000845 .L808492BC: -/* 170AC 808492BC 04410004 */ bgez $v0, .L808492D0 +/* 170AC 808492BC 04410004 */ bgez $v0, .L808492D0 /* 170B0 808492C0 2448FFFF */ addiu $t0, $v0, 0xFFFF ## $t0 = FFFFFFFF /* 170B4 808492C4 24590001 */ addiu $t9, $v0, 0x0001 ## $t9 = 00000001 -/* 170B8 808492C8 10000002 */ beq $zero, $zero, .L808492D4 +/* 170B8 808492C8 10000002 */ beq $zero, $zero, .L808492D4 /* 170BC 808492CC A2190844 */ sb $t9, 0x0844($s0) ## 00000844 .L808492D0: /* 170C0 808492D0 A2080844 */ sb $t0, 0x0844($s0) ## 00000844 .L808492D4: /* 170C4 808492D4 0C01DE2B */ jal Math_ApproxUpdateScaledS - + /* 170C8 808492D8 24060190 */ addiu $a2, $zero, 0x0190 ## $a2 = 00000190 /* 170CC 808492DC 260403A8 */ addiu $a0, $s0, 0x03A8 ## $a0 = 000003A8 /* 170D0 808492E0 24050014 */ addiu $a1, $zero, 0x0014 ## $a1 = 00000014 /* 170D4 808492E4 24060050 */ addiu $a2, $zero, 0x0050 ## $a2 = 00000050 -/* 170D8 808492E8 0C00CB2D */ jal func_80032CB4 +/* 170D8 808492E8 0C00CB2D */ jal func_80032CB4 /* 170DC 808492EC 24070006 */ addiu $a3, $zero, 0x0006 ## $a3 = 00000006 -/* 170E0 808492F0 8FA90084 */ lw $t1, 0x0084($sp) +/* 170E0 808492F0 8FA90084 */ lw $t1, 0x0084($sp) /* 170E4 808492F4 3C010001 */ lui $at, 0x0001 ## $at = 00010000 /* 170E8 808492F8 3C0B0001 */ lui $t3, 0x0001 ## $t3 = 00010000 -/* 170EC 808492FC 01215021 */ addu $t2, $t1, $at -/* 170F0 80849300 AFAA002C */ sw $t2, 0x002C($sp) -/* 170F4 80849304 01695821 */ addu $t3, $t3, $t1 +/* 170EC 808492FC 01215021 */ addu $t2, $t1, $at +/* 170F0 80849300 AFAA002C */ sw $t2, 0x002C($sp) +/* 170F4 80849304 01695821 */ addu $t3, $t3, $t1 /* 170F8 80849308 8D6B1DE4 */ lw $t3, 0x1DE4($t3) ## 00011DE4 /* 170FC 8084930C 316C0020 */ andi $t4, $t3, 0x0020 ## $t4 = 00000000 -/* 17100 80849310 51800004 */ beql $t4, $zero, .L80849324 +/* 17100 80849310 51800004 */ beql $t4, $zero, .L80849324 /* 17104 80849314 24060003 */ addiu $a2, $zero, 0x0003 ## $a2 = 00000003 -/* 17108 80849318 10000002 */ beq $zero, $zero, .L80849324 +/* 17108 80849318 10000002 */ beq $zero, $zero, .L80849324 /* 1710C 8084931C 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 /* 17110 80849320 24060003 */ addiu $a2, $zero, 0x0003 ## $a2 = 00000003 .L80849324: /* 17114 80849324 860D03A8 */ lh $t5, 0x03A8($s0) ## 000003A8 /* 17118 80849328 920F015F */ lbu $t7, 0x015F($s0) ## 0000015F /* 1711C 8084932C 24010004 */ addiu $at, $zero, 0x0004 ## $at = 00000004 -/* 17120 80849330 00CD7021 */ addu $t6, $a2, $t5 -/* 17124 80849334 15E10003 */ bne $t7, $at, .L80849344 +/* 17120 80849330 00CD7021 */ addu $t6, $a2, $t5 +/* 17124 80849334 15E10003 */ bne $t7, $at, .L80849344 /* 17128 80849338 A60E00BA */ sh $t6, 0x00BA($s0) ## 000000BA -/* 1712C 8084933C 0C21400B */ jal func_8085002C +/* 1712C 8084933C 0C21400B */ jal func_8085002C /* 17130 80849340 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 .L80849344: -/* 17134 80849344 0C00B75B */ jal func_8002DD6C +/* 17134 80849344 0C00B75B */ jal func_8002DD6C /* 17138 80849348 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 1713C 8084934C 50400004 */ beql $v0, $zero, .L80849360 +/* 1713C 8084934C 50400004 */ beql $v0, $zero, .L80849360 /* 17140 80849350 921801E9 */ lbu $t8, 0x01E9($s0) ## 000001E9 -/* 17144 80849354 0C213FDF */ jal func_8084FF7C +/* 17144 80849354 0C213FDF */ jal func_8084FF7C /* 17148 80849358 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 1714C 8084935C 921801E9 */ lbu $t8, 0x01E9($s0) ## 000001E9 .L80849360: /* 17150 80849360 33190080 */ andi $t9, $t8, 0x0080 ## $t9 = 00000000 -/* 17154 80849364 172000A8 */ bne $t9, $zero, .L80849608 +/* 17154 80849364 172000A8 */ bne $t9, $zero, .L80849608 /* 17158 80849368 00000000 */ nop /* 1715C 8084936C 96080088 */ lhu $t0, 0x0088($s0) ## 00000088 /* 17160 80849370 3C098085 */ lui $t1, %hi(D_808535E4) ## $t1 = 80850000 /* 17164 80849374 310A0001 */ andi $t2, $t0, 0x0001 ## $t2 = 00000000 -/* 17168 80849378 5140000A */ beql $t2, $zero, .L808493A4 +/* 17168 80849378 5140000A */ beql $t2, $zero, .L808493A4 /* 1716C 8084937C 820C014F */ lb $t4, 0x014F($s0) ## 0000014F -/* 17170 80849380 8D2935E4 */ lw $t1, %lo(D_808535E4)($t1) +/* 17170 80849380 8D2935E4 */ lw $t1, %lo(D_808535E4)($t1) /* 17174 80849384 24010005 */ addiu $at, $zero, 0x0005 ## $at = 00000005 -/* 17178 80849388 55210006 */ bnel $t1, $at, .L808493A4 +/* 17178 80849388 55210006 */ bnel $t1, $at, .L808493A4 /* 1717C 8084938C 820C014F */ lb $t4, 0x014F($s0) ## 0000014F /* 17180 80849390 820B014F */ lb $t3, 0x014F($s0) ## 0000014F /* 17184 80849394 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 17188 80849398 5561000B */ bnel $t3, $at, .L808493C8 +/* 17188 80849398 5561000B */ bnel $t3, $at, .L808493C8 /* 1718C 8084939C 8607083C */ lh $a3, 0x083C($s0) ## 0000083C /* 17190 808493A0 820C014F */ lb $t4, 0x014F($s0) ## 0000014F .L808493A4: /* 17194 808493A4 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 17198 808493A8 55810064 */ bnel $t4, $at, .L8084953C +/* 17198 808493A8 55810064 */ bnel $t4, $at, .L8084953C /* 1719C 808493AC C6060838 */ lwc1 $f6, 0x0838($s0) ## 00000838 /* 171A0 808493B0 8E0D067C */ lw $t5, 0x067C($s0) ## 0000067C /* 171A4 808493B4 3C012800 */ lui $at, 0x2800 ## $at = 28000000 -/* 171A8 808493B8 01A17024 */ and $t6, $t5, $at -/* 171AC 808493BC 55C0005F */ bnel $t6, $zero, .L8084953C +/* 171A8 808493B8 01A17024 */ and $t6, $t5, $at +/* 171AC 808493BC 55C0005F */ bnel $t6, $zero, .L8084953C /* 171B0 808493C0 C6060838 */ lwc1 $f6, 0x0838($s0) ## 00000838 /* 171B4 808493C4 8607083C */ lh $a3, 0x083C($s0) ## 0000083C .L808493C8: /* 171B8 808493C8 860F0032 */ lh $t7, 0x0032($s0) ## 00000032 /* 171BC 808493CC C6000838 */ lwc1 $f0, 0x0838($s0) ## 00000838 /* 171C0 808493D0 26040068 */ addiu $a0, $s0, 0x0068 ## $a0 = 00000068 -/* 171C4 808493D4 01E71023 */ subu $v0, $t7, $a3 -/* 171C8 808493D8 00021400 */ sll $v0, $v0, 16 -/* 171CC 808493DC 00021403 */ sra $v0, $v0, 16 -/* 171D0 808493E0 04400003 */ bltz $v0, .L808493F0 -/* 171D4 808493E4 00023023 */ subu $a2, $zero, $v0 -/* 171D8 808493E8 10000001 */ beq $zero, $zero, .L808493F0 +/* 171C4 808493D4 01E71023 */ subu $v0, $t7, $a3 +/* 171C8 808493D8 00021400 */ sll $v0, $v0, 16 +/* 171CC 808493DC 00021403 */ sra $v0, $v0, 16 +/* 171D0 808493E0 04400003 */ bltz $v0, .L808493F0 +/* 171D4 808493E4 00023023 */ subu $a2, $zero, $v0 +/* 171D8 808493E8 10000001 */ beq $zero, $zero, .L808493F0 /* 171DC 808493EC 00403025 */ or $a2, $v0, $zero ## $a2 = 00000000 .L808493F0: -/* 171E0 808493F0 28C16001 */ slti $at, $a2, 0x6001 -/* 171E4 808493F4 1420000C */ bne $at, $zero, .L80849428 +/* 171E0 808493F0 28C16001 */ slti $at, $a2, 0x6001 +/* 171E4 808493F4 1420000C */ bne $at, $zero, .L80849428 /* 171E8 808493F8 3C063EB3 */ lui $a2, 0x3EB3 ## $a2 = 3EB30000 /* 171EC 808493FC 44804000 */ mtc1 $zero, $f8 ## $f8 = 0.00 /* 171F0 80849400 C60A0068 */ lwc1 $f10, 0x0068($s0) ## 00000068 /* 171F4 80849404 34018000 */ ori $at, $zero, 0x8000 ## $at = 00008000 -/* 171F8 80849408 460A4032 */ c.eq.s $f8, $f10 +/* 171F8 80849408 460A4032 */ c.eq.s $f8, $f10 /* 171FC 8084940C 00000000 */ nop -/* 17200 80849410 45030006 */ bc1tl .L8084942C -/* 17204 80849414 44050000 */ mfc1 $a1, $f0 -/* 17208 80849418 00E13821 */ addu $a3, $a3, $at -/* 1720C 8084941C 00073C00 */ sll $a3, $a3, 16 +/* 17200 80849410 45030006 */ bc1tl .L8084942C +/* 17204 80849414 44050000 */ mfc1 $a1, $f0 +/* 17208 80849418 00E13821 */ addu $a3, $a3, $at +/* 1720C 8084941C 00073C00 */ sll $a3, $a3, 16 /* 17210 80849420 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 17214 80849424 00073C03 */ sra $a3, $a3, 16 +/* 17214 80849424 00073C03 */ sra $a3, $a3, 16 .L80849428: -/* 17218 80849428 44050000 */ mfc1 $a1, $f0 +/* 17218 80849428 44050000 */ mfc1 $a1, $f0 .L8084942C: /* 1721C 8084942C 34C63333 */ ori $a2, $a2, 0x3333 ## $a2 = 3EB33333 -/* 17220 80849430 A7A7006E */ sh $a3, 0x006E($sp) +/* 17220 80849430 A7A7006E */ sh $a3, 0x006E($sp) /* 17224 80849434 0C01DE80 */ jal Math_ApproxF - -/* 17228 80849438 E7A00070 */ swc1 $f0, 0x0070($sp) -/* 1722C 8084943C 87A7006E */ lh $a3, 0x006E($sp) -/* 17230 80849440 10400009 */ beq $v0, $zero, .L80849468 -/* 17234 80849444 C7A00070 */ lwc1 $f0, 0x0070($sp) + +/* 17228 80849438 E7A00070 */ swc1 $f0, 0x0070($sp) +/* 1722C 8084943C 87A7006E */ lh $a3, 0x006E($sp) +/* 17230 80849440 10400009 */ beq $v0, $zero, .L80849468 +/* 17234 80849444 C7A00070 */ lwc1 $f0, 0x0070($sp) /* 17238 80849448 44808000 */ mtc1 $zero, $f16 ## $f16 = 0.00 /* 1723C 8084944C 00000000 */ nop -/* 17240 80849450 46100032 */ c.eq.s $f0, $f16 +/* 17240 80849450 46100032 */ c.eq.s $f0, $f16 /* 17244 80849454 00000000 */ nop -/* 17248 80849458 45020004 */ bc1fl .L8084946C +/* 17248 80849458 45020004 */ bc1fl .L8084946C /* 1724C 8084945C C60C0838 */ lwc1 $f12, 0x0838($s0) ## 00000838 /* 17250 80849460 8618083C */ lh $t8, 0x083C($s0) ## 0000083C /* 17254 80849464 A6180032 */ sh $t8, 0x0032($s0) ## 00000032 @@ -348,60 +348,60 @@ glabel func_80848F9C /* 17258 80849468 C60C0838 */ lwc1 $f12, 0x0838($s0) ## 00000838 .L8084946C: /* 1725C 8084946C 44809000 */ mtc1 $zero, $f18 ## $f18 = 0.00 -/* 17260 80849470 00072C00 */ sll $a1, $a3, 16 +/* 17260 80849470 00072C00 */ sll $a1, $a3, 16 /* 17264 80849474 3C01442F */ lui $at, 0x442F ## $at = 442F0000 -/* 17268 80849478 460C9032 */ c.eq.s $f18, $f12 -/* 1726C 8084947C 00052C03 */ sra $a1, $a1, 16 +/* 17268 80849478 460C9032 */ c.eq.s $f18, $f12 +/* 1726C 8084947C 00052C03 */ sra $a1, $a1, 16 /* 17270 80849480 26040032 */ addiu $a0, $s0, 0x0032 ## $a0 = 00000032 -/* 17274 80849484 4503001B */ bc1tl .L808494F4 +/* 17274 80849484 4503001B */ bc1tl .L808494F4 /* 17278 80849488 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 /* 1727C 8084948C 44812000 */ mtc1 $at, $f4 ## $f4 = 700.00 /* 17280 80849490 C6000068 */ lwc1 $f0, 0x0068($s0) ## 00000068 -/* 17284 80849494 46006085 */ abs.s $f2, $f12 +/* 17284 80849494 46006085 */ abs.s $f2, $f12 /* 17288 80849498 3C0142C8 */ lui $at, 0x42C8 ## $at = 42C80000 -/* 1728C 8084949C 46041182 */ mul.s $f6, $f2, $f4 +/* 1728C 8084949C 46041182 */ mul.s $f6, $f2, $f4 /* 17290 808494A0 44814000 */ mtc1 $at, $f8 ## $f8 = 100.00 -/* 17294 808494A4 46000005 */ abs.s $f0, $f0 -/* 17298 808494A8 46080282 */ mul.s $f10, $f0, $f8 -/* 1729C 808494AC 460A3401 */ sub.s $f16, $f6, $f10 -/* 172A0 808494B0 4600848D */ trunc.w.s $f18, $f16 -/* 172A4 808494B4 44029000 */ mfc1 $v0, $f18 +/* 17294 808494A4 46000005 */ abs.s $f0, $f0 +/* 17298 808494A8 46080282 */ mul.s $f10, $f0, $f8 +/* 1729C 808494AC 460A3401 */ sub.s $f16, $f6, $f10 +/* 172A0 808494B0 4600848D */ trunc.w.s $f18, $f16 +/* 172A4 808494B4 44029000 */ mfc1 $v0, $f18 /* 172A8 808494B8 00000000 */ nop -/* 172AC 808494BC 04410003 */ bgez $v0, .L808494CC -/* 172B0 808494C0 28410547 */ slti $at, $v0, 0x0547 -/* 172B4 808494C4 10000006 */ beq $zero, $zero, .L808494E0 +/* 172AC 808494BC 04410003 */ bgez $v0, .L808494CC +/* 172B0 808494C0 28410547 */ slti $at, $v0, 0x0547 +/* 172B4 808494C4 10000006 */ beq $zero, $zero, .L808494E0 /* 172B8 808494C8 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 .L808494CC: -/* 172BC 808494CC 14200003 */ bne $at, $zero, .L808494DC +/* 172BC 808494CC 14200003 */ bne $at, $zero, .L808494DC /* 172C0 808494D0 00403025 */ or $a2, $v0, $zero ## $a2 = 00000000 -/* 172C4 808494D4 10000001 */ beq $zero, $zero, .L808494DC +/* 172C4 808494D4 10000001 */ beq $zero, $zero, .L808494DC /* 172C8 808494D8 24060546 */ addiu $a2, $zero, 0x0546 ## $a2 = 00000546 .L808494DC: /* 172CC 808494DC 00C01025 */ or $v0, $a2, $zero ## $v0 = 00000546 .L808494E0: -/* 172D0 808494E0 00023400 */ sll $a2, $v0, 16 +/* 172D0 808494E0 00023400 */ sll $a2, $v0, 16 /* 172D4 808494E4 0C01DE2B */ jal Math_ApproxUpdateScaledS - -/* 172D8 808494E8 00063403 */ sra $a2, $a2, 16 + +/* 172D8 808494E8 00063403 */ sra $a2, $a2, 16 /* 172DC 808494EC C60C0838 */ lwc1 $f12, 0x0838($s0) ## 00000838 /* 172E0 808494F0 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 .L808494F4: /* 172E4 808494F4 00000000 */ nop -/* 172E8 808494F8 460C2032 */ c.eq.s $f4, $f12 +/* 172E8 808494F8 460C2032 */ c.eq.s $f4, $f12 /* 172EC 808494FC 00000000 */ nop -/* 172F0 80849500 45000011 */ bc1f .L80849548 +/* 172F0 80849500 45000011 */ bc1f .L80849548 /* 172F4 80849504 00000000 */ nop /* 172F8 80849508 C6000068 */ lwc1 $f0, 0x0068($s0) ## 00000068 /* 172FC 8084950C 44804000 */ mtc1 $zero, $f8 ## $f8 = 0.00 /* 17300 80849510 260400E4 */ addiu $a0, $s0, 0x00E4 ## $a0 = 000000E4 -/* 17304 80849514 46004032 */ c.eq.s $f8, $f0 +/* 17304 80849514 46004032 */ c.eq.s $f8, $f0 /* 17308 80849518 00000000 */ nop -/* 1730C 8084951C 4501000A */ bc1t .L80849548 +/* 1730C 8084951C 4501000A */ bc1t .L80849548 /* 17310 80849520 00000000 */ nop -/* 17314 80849524 44060000 */ mfc1 $a2, $f0 -/* 17318 80849528 0C03D04E */ jal func_800F4138 +/* 17314 80849524 44060000 */ mfc1 $a2, $f0 +/* 17318 80849528 0C03D04E */ jal func_800F4138 /* 1731C 8084952C 240500D0 */ addiu $a1, $zero, 0x00D0 ## $a1 = 000000D0 -/* 17320 80849530 10000005 */ beq $zero, $zero, .L80849548 +/* 17320 80849530 10000005 */ beq $zero, $zero, .L80849548 /* 17324 80849534 00000000 */ nop /* 17328 80849538 C6060838 */ lwc1 $f6, 0x0838($s0) ## 00000838 .L8084953C: @@ -409,31 +409,31 @@ glabel func_80848F9C /* 17330 80849540 E6060068 */ swc1 $f6, 0x0068($s0) ## 00000068 /* 17334 80849544 A6080032 */ sh $t0, 0x0032($s0) ## 00000032 .L80849548: -/* 17338 80849548 0C00B61A */ jal func_8002D868 +/* 17338 80849548 0C00B61A */ jal func_8002D868 /* 1733C 8084954C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 17340 80849550 44805000 */ mtc1 $zero, $f10 ## $f10 = 0.00 /* 17344 80849554 C61008AC */ lwc1 $f16, 0x08AC($s0) ## 000008AC -/* 17348 80849558 46105032 */ c.eq.s $f10, $f16 +/* 17348 80849558 46105032 */ c.eq.s $f10, $f16 /* 1734C 8084955C 00000000 */ nop -/* 17350 80849560 45010021 */ bc1t .L808495E8 +/* 17350 80849560 45010021 */ bc1t .L808495E8 /* 17354 80849564 00000000 */ nop -/* 17358 80849568 0C023A62 */ jal func_8008E988 -/* 1735C 8084956C 8FA40084 */ lw $a0, 0x0084($sp) -/* 17360 80849570 1440001D */ bne $v0, $zero, .L808495E8 +/* 17358 80849568 0C023A62 */ jal func_8008E988 +/* 1735C 8084956C 8FA40084 */ lw $a0, 0x0084($sp) +/* 17360 80849570 1440001D */ bne $v0, $zero, .L808495E8 /* 17364 80849574 00000000 */ nop /* 17368 80849578 8E0A067C */ lw $t2, 0x067C($s0) ## 0000067C /* 1736C 8084957C 3C010020 */ lui $at, 0x0020 ## $at = 00200000 /* 17370 80849580 34216000 */ ori $at, $at, 0x6000 ## $at = 00206000 -/* 17374 80849584 01414824 */ and $t1, $t2, $at -/* 17378 80849588 15200017 */ bne $t1, $zero, .L808495E8 +/* 17374 80849584 01414824 */ and $t1, $t2, $at +/* 17378 80849588 15200017 */ bne $t1, $zero, .L808495E8 /* 1737C 8084958C 00000000 */ nop /* 17380 80849590 8E020674 */ lw $v0, 0x0674($s0) ## 00000674 /* 17384 80849594 3C0B8084 */ lui $t3, %hi(func_80845668) ## $t3 = 80840000 /* 17388 80849598 256B5668 */ addiu $t3, $t3, %lo(func_80845668) ## $t3 = 80845668 -/* 1738C 8084959C 104B0012 */ beq $v0, $t3, .L808495E8 +/* 1738C 8084959C 104B0012 */ beq $v0, $t3, .L808495E8 /* 17390 808495A0 3C0C8085 */ lui $t4, %hi(func_808507F4) ## $t4 = 80850000 /* 17394 808495A4 258C07F4 */ addiu $t4, $t4, %lo(func_808507F4) ## $t4 = 808507F4 -/* 17398 808495A8 104C000F */ beq $v0, $t4, .L808495E8 +/* 17398 808495A8 104C000F */ beq $v0, $t4, .L808495E8 /* 1739C 808495AC 00000000 */ nop /* 173A0 808495B0 0C01DE1C */ jal Math_Sins ## sins? @@ -441,72 +441,72 @@ glabel func_80848F9C /* 173A8 808495B8 C60408AC */ lwc1 $f4, 0x08AC($s0) ## 000008AC /* 173AC 808495BC C612005C */ lwc1 $f18, 0x005C($s0) ## 0000005C /* 173B0 808495C0 860408B0 */ lh $a0, 0x08B0($s0) ## 000008B0 -/* 173B4 808495C4 46002202 */ mul.s $f8, $f4, $f0 -/* 173B8 808495C8 46089180 */ add.s $f6, $f18, $f8 +/* 173B4 808495C4 46002202 */ mul.s $f8, $f4, $f0 +/* 173B8 808495C8 46089180 */ add.s $f6, $f18, $f8 /* 173BC 808495CC 0C01DE0D */ jal Math_Coss ## coss? /* 173C0 808495D0 E606005C */ swc1 $f6, 0x005C($s0) ## 0000005C /* 173C4 808495D4 C61008AC */ lwc1 $f16, 0x08AC($s0) ## 000008AC /* 173C8 808495D8 C60A0064 */ lwc1 $f10, 0x0064($s0) ## 00000064 -/* 173CC 808495DC 46008102 */ mul.s $f4, $f16, $f0 -/* 173D0 808495E0 46045480 */ add.s $f18, $f10, $f4 +/* 173CC 808495DC 46008102 */ mul.s $f4, $f16, $f0 +/* 173D0 808495E0 46045480 */ add.s $f18, $f10, $f4 /* 173D4 808495E4 E6120064 */ swc1 $f18, 0x0064($s0) ## 00000064 .L808495E8: -/* 173D8 808495E8 0C00B5FB */ jal func_8002D7EC +/* 173D8 808495E8 0C00B5FB */ jal func_8002D7EC /* 173DC 808495EC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 173E0 808495F0 8FA40084 */ lw $a0, 0x0084($sp) -/* 173E4 808495F4 0C211EE8 */ jal func_80847BA0 +/* 173E0 808495F0 8FA40084 */ lw $a0, 0x0084($sp) +/* 173E4 808495F4 0C211EE8 */ jal func_80847BA0 /* 173E8 808495F8 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 173EC 808495FC 3C038085 */ lui $v1, %hi(D_808535F4) ## $v1 = 80850000 -/* 173F0 80849600 10000034 */ beq $zero, $zero, .L808496D4 +/* 173F0 80849600 10000034 */ beq $zero, $zero, .L808496D4 /* 173F4 80849604 246335F4 */ addiu $v1, $v1, %lo(D_808535F4) ## $v1 = 808535F4 .L80849608: /* 173F8 80849608 3C018085 */ lui $at, %hi(D_808535E4) ## $at = 80850000 -/* 173FC 8084960C AC2035E4 */ sw $zero, %lo(D_808535E4)($at) +/* 173FC 8084960C AC2035E4 */ sw $zero, %lo(D_808535E4)($at) /* 17400 80849610 8E03067C */ lw $v1, 0x067C($s0) ## 0000067C /* 17404 80849614 A2000A7A */ sb $zero, 0x0A7A($s0) ## 00000A7A /* 17408 80849618 306D0001 */ andi $t5, $v1, 0x0001 ## $t5 = 00000000 -/* 1740C 8084961C 15A00028 */ bne $t5, $zero, .L808496C0 -/* 17410 80849620 00037200 */ sll $t6, $v1, 8 -/* 17414 80849624 05C30027 */ bgezl $t6, .L808496C4 +/* 1740C 8084961C 15A00028 */ bne $t5, $zero, .L808496C0 +/* 17410 80849620 00037200 */ sll $t6, $v1, 8 +/* 17414 80849624 05C30027 */ bgezl $t6, .L808496C4 /* 17418 80849628 44804000 */ mtc1 $zero, $f8 ## $f8 = 0.00 /* 1741C 8084962C 8E020440 */ lw $v0, 0x0440($s0) ## 00000440 /* 17420 80849630 3C068085 */ lui $a2, %hi(D_80854814) ## $a2 = 80850000 /* 17424 80849634 24C64814 */ addiu $a2, $a2, %lo(D_80854814) ## $a2 = 80854814 /* 17428 80849638 944F0088 */ lhu $t7, 0x0088($v0) ## 00000088 -/* 1742C 8084963C 8FA40084 */ lw $a0, 0x0084($sp) +/* 1742C 8084963C 8FA40084 */ lw $a0, 0x0084($sp) /* 17430 80849640 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 17434 80849644 31F80001 */ andi $t8, $t7, 0x0001 ## $t8 = 00000000 -/* 17438 80849648 17000008 */ bne $t8, $zero, .L8084966C +/* 17438 80849648 17000008 */ bne $t8, $zero, .L8084966C /* 1743C 8084964C 27A7004C */ addiu $a3, $sp, 0x004C ## $a3 = FFFFFFCC /* 17440 80849650 27B9005C */ addiu $t9, $sp, 0x005C ## $t9 = FFFFFFDC /* 17444 80849654 27A80058 */ addiu $t0, $sp, 0x0058 ## $t0 = FFFFFFD8 -/* 17448 80849658 AFA80014 */ sw $t0, 0x0014($sp) -/* 1744C 8084965C 0C20E5BD */ jal func_808396F4 -/* 17450 80849660 AFB90010 */ sw $t9, 0x0010($sp) -/* 17454 80849664 10000006 */ beq $zero, $zero, .L80849680 -/* 17458 80849668 8FA6005C */ lw $a2, 0x005C($sp) +/* 17448 80849658 AFA80014 */ sw $t0, 0x0014($sp) +/* 1744C 8084965C 0C20E5BD */ jal func_808396F4 +/* 17450 80849660 AFB90010 */ sw $t9, 0x0010($sp) +/* 17454 80849664 10000006 */ beq $zero, $zero, .L80849680 +/* 17458 80849668 8FA6005C */ lw $a2, 0x005C($sp) .L8084966C: /* 1745C 8084966C 8C4A0078 */ lw $t2, 0x0078($v0) ## 00000078 -/* 17460 80849670 AFAA005C */ sw $t2, 0x005C($sp) +/* 17460 80849670 AFAA005C */ sw $t2, 0x005C($sp) /* 17464 80849674 9049007D */ lbu $t1, 0x007D($v0) ## 0000007D -/* 17468 80849678 AFA90058 */ sw $t1, 0x0058($sp) -/* 1746C 8084967C 8FA6005C */ lw $a2, 0x005C($sp) +/* 17468 80849678 AFA90058 */ sw $t1, 0x0058($sp) +/* 1746C 8084967C 8FA6005C */ lw $a2, 0x005C($sp) .L80849680: -/* 17470 80849680 8FA40084 */ lw $a0, 0x0084($sp) +/* 17470 80849680 8FA40084 */ lw $a0, 0x0084($sp) /* 17474 80849684 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 17478 80849688 50C0000E */ beql $a2, $zero, .L808496C4 +/* 17478 80849688 50C0000E */ beql $a2, $zero, .L808496C4 /* 1747C 8084968C 44804000 */ mtc1 $zero, $f8 ## $f8 = 0.00 -/* 17480 80849690 0C20E40D */ jal func_80839034 -/* 17484 80849694 8FA70058 */ lw $a3, 0x0058($sp) -/* 17488 80849698 10400009 */ beq $v0, $zero, .L808496C0 +/* 17480 80849690 0C20E40D */ jal func_80839034 +/* 17484 80849694 8FA70058 */ lw $a3, 0x0058($sp) +/* 17488 80849698 10400009 */ beq $v0, $zero, .L808496C0 /* 1748C 8084969C 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 /* 17490 808496A0 8C42FA90 */ lw $v0, -0x0570($v0) ## 8015FA90 /* 17494 808496A4 240C0001 */ addiu $t4, $zero, 0x0001 ## $t4 = 00000001 /* 17498 808496A8 844B0586 */ lh $t3, 0x0586($v0) ## 80160586 -/* 1749C 808496AC 51600004 */ beql $t3, $zero, .L808496C0 +/* 1749C 808496AC 51600004 */ beql $t3, $zero, .L808496C0 /* 174A0 808496B0 A44C0E60 */ sh $t4, 0x0E60($v0) ## 80160E60 -/* 174A4 808496B4 10000002 */ beq $zero, $zero, .L808496C0 +/* 174A4 808496B4 10000002 */ beq $zero, $zero, .L808496C0 /* 174A8 808496B8 A4400586 */ sh $zero, 0x0586($v0) ## 80160586 /* 174AC 808496BC A44C0E60 */ sh $t4, 0x0E60($v0) ## 80160E60 .L808496C0: @@ -518,293 +518,293 @@ glabel func_80848F9C /* 174C0 808496D0 E60808AC */ swc1 $f8, 0x08AC($s0) ## 000008AC .L808496D4: /* 174C4 808496D4 8C620000 */ lw $v0, 0x0000($v1) ## 808535F4 -/* 174C8 808496D8 5040003E */ beql $v0, $zero, .L808497D4 +/* 174C8 808496D8 5040003E */ beql $v0, $zero, .L808497D4 /* 174CC 808496DC 44804000 */ mtc1 $zero, $f8 ## $f8 = 0.00 /* 174D0 808496E0 820D014F */ lb $t5, 0x014F($s0) ## 0000014F /* 174D4 808496E4 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 /* 174D8 808496E8 244EFFFF */ addiu $t6, $v0, 0xFFFF ## $t6 = 8015FFFF -/* 174DC 808496EC 11A10038 */ beq $t5, $at, .L808497D0 +/* 174DC 808496EC 11A10038 */ beq $t5, $at, .L808497D0 /* 174E0 808496F0 3C0F8085 */ lui $t7, %hi(D_808535F8) ## $t7 = 80850000 /* 174E4 808496F4 AC6E0000 */ sw $t6, 0x0000($v1) ## 808535F4 -/* 174E8 808496F8 85EF35F8 */ lh $t7, %lo(D_808535F8)($t7) -/* 174EC 808496FC 000EC880 */ sll $t9, $t6, 2 -/* 174F0 80849700 55E0000E */ bnel $t7, $zero, .L8084973C +/* 174E8 808496F8 85EF35F8 */ lh $t7, %lo(D_808535F8)($t7) +/* 174EC 808496FC 000EC880 */ sll $t9, $t6, 2 +/* 174F0 80849700 55E0000E */ bnel $t7, $zero, .L8084973C /* 174F4 80849704 8C690000 */ lw $t1, 0x0000($v1) ## 808535F4 /* 174F8 80849708 8E08067C */ lw $t0, 0x067C($s0) ## 0000067C /* 174FC 8084970C 3C018085 */ lui $at, %hi(D_80854820) ## $at = 80850000 -/* 17500 80849710 00390821 */ addu $at, $at, $t9 -/* 17504 80849714 00085100 */ sll $t2, $t0, 4 -/* 17508 80849718 0540000C */ bltz $t2, .L8084974C -/* 1750C 8084971C C4204820 */ lwc1 $f0, %lo(D_80854820)($at) +/* 17500 80849710 00390821 */ addu $at, $at, $t9 +/* 17504 80849714 00085100 */ sll $t2, $t0, 4 +/* 17508 80849718 0540000C */ bltz $t2, .L8084974C +/* 1750C 8084971C C4204820 */ lwc1 $f0, %lo(D_80854820)($at) /* 17510 80849720 3C013E80 */ lui $at, 0x3E80 ## $at = 3E800000 /* 17514 80849724 44813000 */ mtc1 $at, $f6 ## $f6 = 0.25 /* 17518 80849728 00000000 */ nop -/* 1751C 8084972C 46060002 */ mul.s $f0, $f0, $f6 -/* 17520 80849730 10000006 */ beq $zero, $zero, .L8084974C +/* 1751C 8084972C 46060002 */ mul.s $f0, $f0, $f6 +/* 17520 80849730 10000006 */ beq $zero, $zero, .L8084974C /* 17524 80849734 00000000 */ nop /* 17528 80849738 8C690000 */ lw $t1, 0x0000($v1) ## 808535F4 .L8084973C: /* 1752C 8084973C 3C018085 */ lui $at, %hi(D_8085482C) ## $at = 80850000 -/* 17530 80849740 00095880 */ sll $t3, $t1, 2 -/* 17534 80849744 002B0821 */ addu $at, $at, $t3 -/* 17538 80849748 C420482C */ lwc1 $f0, %lo(D_8085482C)($at) +/* 17530 80849740 00095880 */ sll $t3, $t1, 2 +/* 17534 80849744 002B0821 */ addu $at, $at, $t3 +/* 17538 80849748 C420482C */ lwc1 $f0, %lo(D_8085482C)($at) .L8084974C: /* 1753C 8084974C 3C018085 */ lui $at, %hi(D_808554CC) ## $at = 80850000 -/* 17540 80849750 C43054CC */ lwc1 $f16, %lo(D_808554CC)($at) -/* 17544 80849754 44050000 */ mfc1 $a1, $f0 +/* 17540 80849750 C43054CC */ lwc1 $f16, %lo(D_808554CC)($at) +/* 17544 80849754 44050000 */ mfc1 $a1, $f0 /* 17548 80849758 260408AC */ addiu $a0, $s0, 0x08AC ## $a0 = 000008AC -/* 1754C 8084975C 46100282 */ mul.s $f10, $f0, $f16 -/* 17550 80849760 E7A00048 */ swc1 $f0, 0x0048($sp) -/* 17554 80849764 44065000 */ mfc1 $a2, $f10 +/* 1754C 8084975C 46100282 */ mul.s $f10, $f0, $f16 +/* 17550 80849760 E7A00048 */ swc1 $f0, 0x0048($sp) +/* 17554 80849764 44065000 */ mfc1 $a2, $f10 /* 17558 80849768 0C01DE80 */ jal Math_ApproxF - + /* 1755C 8084976C 00000000 */ nop /* 17560 80849770 8E0C067C */ lw $t4, 0x067C($s0) ## 0000067C -/* 17564 80849774 C7A00048 */ lwc1 $f0, 0x0048($sp) +/* 17564 80849774 C7A00048 */ lwc1 $f0, 0x0048($sp) /* 17568 80849778 3C014448 */ lui $at, 0x4448 ## $at = 44480000 -/* 1756C 8084977C 000C6900 */ sll $t5, $t4, 4 -/* 17570 80849780 05A30006 */ bgezl $t5, .L8084979C +/* 1756C 8084977C 000C6900 */ sll $t5, $t4, 4 +/* 17570 80849780 05A30006 */ bgezl $t5, .L8084979C /* 17574 80849784 44811000 */ mtc1 $at, $f2 ## $f2 = 800.00 /* 17578 80849788 3C0143C8 */ lui $at, 0x43C8 ## $at = 43C80000 /* 1757C 8084978C 44811000 */ mtc1 $at, $f2 ## $f2 = 400.00 -/* 17580 80849790 10000003 */ beq $zero, $zero, .L808497A0 +/* 17580 80849790 10000003 */ beq $zero, $zero, .L808497A0 /* 17584 80849794 00000000 */ nop /* 17588 80849798 44811000 */ mtc1 $at, $f2 ## $f2 = 400.00 .L8084979C: /* 1758C 8084979C 00000000 */ nop .L808497A0: -/* 17590 808497A0 46001102 */ mul.s $f4, $f2, $f0 +/* 17590 808497A0 46001102 */ mul.s $f4, $f2, $f0 /* 17594 808497A4 3C058085 */ lui $a1, %hi(D_808535FC) ## $a1 = 80850000 -/* 17598 808497A8 84A535FC */ lh $a1, %lo(D_808535FC)($a1) +/* 17598 808497A8 84A535FC */ lh $a1, %lo(D_808535FC)($a1) /* 1759C 808497AC 260408B0 */ addiu $a0, $s0, 0x08B0 ## $a0 = 000008B0 -/* 175A0 808497B0 4600248D */ trunc.w.s $f18, $f4 -/* 175A4 808497B4 44069000 */ mfc1 $a2, $f18 +/* 175A0 808497B0 4600248D */ trunc.w.s $f18, $f4 +/* 175A4 808497B4 44069000 */ mfc1 $a2, $f18 /* 175A8 808497B8 00000000 */ nop -/* 175AC 808497BC 00063400 */ sll $a2, $a2, 16 +/* 175AC 808497BC 00063400 */ sll $a2, $a2, 16 /* 175B0 808497C0 0C01DE2B */ jal Math_ApproxUpdateScaledS - -/* 175B4 808497C4 00063403 */ sra $a2, $a2, 16 -/* 175B8 808497C8 10000017 */ beq $zero, $zero, .L80849828 -/* 175BC 808497CC 8FA40084 */ lw $a0, 0x0084($sp) + +/* 175B4 808497C4 00063403 */ sra $a2, $a2, 16 +/* 175B8 808497C8 10000017 */ beq $zero, $zero, .L80849828 +/* 175BC 808497CC 8FA40084 */ lw $a0, 0x0084($sp) .L808497D0: /* 175C0 808497D0 44804000 */ mtc1 $zero, $f8 ## $f8 = 0.00 .L808497D4: /* 175C4 808497D4 C60608AC */ lwc1 $f6, 0x08AC($s0) ## 000008AC /* 175C8 808497D8 260408AC */ addiu $a0, $s0, 0x08AC ## $a0 = 000008AC -/* 175CC 808497DC 46064032 */ c.eq.s $f8, $f6 +/* 175CC 808497DC 46064032 */ c.eq.s $f8, $f6 /* 175D0 808497E0 00000000 */ nop -/* 175D4 808497E4 45030010 */ bc1tl .L80849828 -/* 175D8 808497E8 8FA40084 */ lw $a0, 0x0084($sp) +/* 175D4 808497E4 45030010 */ bc1tl .L80849828 +/* 175D8 808497E8 8FA40084 */ lw $a0, 0x0084($sp) /* 175DC 808497EC 8E0F067C */ lw $t7, 0x067C($s0) ## 0000067C /* 175E0 808497F0 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 175E4 808497F4 000FC100 */ sll $t8, $t7, 4 -/* 175E8 808497F8 07030006 */ bgezl $t8, .L80849814 +/* 175E4 808497F4 000FC100 */ sll $t8, $t7, 4 +/* 175E8 808497F8 07030006 */ bgezl $t8, .L80849814 /* 175EC 808497FC 44811000 */ mtc1 $at, $f2 ## $f2 = 1.00 /* 175F0 80849800 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 /* 175F4 80849804 44811000 */ mtc1 $at, $f2 ## $f2 = 0.50 -/* 175F8 80849808 10000004 */ beq $zero, $zero, .L8084981C -/* 175FC 8084980C 44061000 */ mfc1 $a2, $f2 +/* 175F8 80849808 10000004 */ beq $zero, $zero, .L8084981C +/* 175FC 8084980C 44061000 */ mfc1 $a2, $f2 /* 17600 80849810 44811000 */ mtc1 $at, $f2 ## $f2 = 0.50 .L80849814: /* 17604 80849814 00000000 */ nop -/* 17608 80849818 44061000 */ mfc1 $a2, $f2 +/* 17608 80849818 44061000 */ mfc1 $a2, $f2 .L8084981C: /* 1760C 8084981C 0C01DE80 */ jal Math_ApproxF - + /* 17610 80849820 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 -/* 17614 80849824 8FA40084 */ lw $a0, 0x0084($sp) +/* 17614 80849824 8FA40084 */ lw $a0, 0x0084($sp) .L80849828: -/* 17618 80849828 0C023A37 */ jal func_8008E8DC +/* 17618 80849828 0C023A37 */ jal func_8008E8DC /* 1761C 8084982C 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 17620 80849830 54400054 */ bnel $v0, $zero, .L80849984 -/* 17624 80849834 8FA70084 */ lw $a3, 0x0084($sp) +/* 17620 80849830 54400054 */ bnel $v0, $zero, .L80849984 +/* 17624 80849834 8FA70084 */ lw $a3, 0x0084($sp) /* 17628 80849838 8E190680 */ lw $t9, 0x0680($s0) ## 00000680 -/* 1762C 8084983C 8FA40084 */ lw $a0, 0x0084($sp) -/* 17630 80849840 00194340 */ sll $t0, $t9, 13 -/* 17634 80849844 0502004F */ bltzl $t0, .L80849984 -/* 17638 80849848 8FA70084 */ lw $a3, 0x0084($sp) -/* 1763C 8084984C 0C20F54F */ jal func_8083D53C +/* 1762C 8084983C 8FA40084 */ lw $a0, 0x0084($sp) +/* 17630 80849840 00194340 */ sll $t0, $t9, 13 +/* 17634 80849844 0502004F */ bltzl $t0, .L80849984 +/* 17638 80849848 8FA70084 */ lw $a3, 0x0084($sp) +/* 1763C 8084984C 0C20F54F */ jal func_8083D53C /* 17640 80849850 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 17644 80849854 920A0002 */ lbu $t2, 0x0002($s0) ## 00000002 /* 17648 80849858 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 /* 1764C 8084985C 3C098016 */ lui $t1, 0x8016 ## $t1 = 80160000 -/* 17650 80849860 5541002D */ bnel $t2, $at, .L80849918 +/* 17650 80849860 5541002D */ bnel $t2, $at, .L80849918 /* 17654 80849864 8E180118 */ lw $t8, 0x0118($s0) ## 00000118 /* 17658 80849868 8529E690 */ lh $t1, -0x1970($t1) ## 8015E690 -/* 1765C 8084986C 5520002A */ bnel $t1, $zero, .L80849918 +/* 1765C 8084986C 5520002A */ bnel $t1, $zero, .L80849918 /* 17660 80849870 8E180118 */ lw $t8, 0x0118($s0) ## 00000118 /* 17664 80849874 8E03067C */ lw $v1, 0x067C($s0) ## 0000067C /* 17668 80849878 3C010020 */ lui $at, 0x0020 ## $at = 00200000 /* 1766C 8084987C 34216000 */ ori $at, $at, 0x6000 ## $at = 00206000 -/* 17670 80849880 00615824 */ and $t3, $v1, $at -/* 17674 80849884 11600008 */ beq $t3, $zero, .L808498A8 -/* 17678 80849888 8FA40084 */ lw $a0, 0x0084($sp) -/* 1767C 8084988C 0C20C910 */ jal func_80832440 +/* 17670 80849880 00615824 */ and $t3, $v1, $at +/* 17674 80849884 11600008 */ beq $t3, $zero, .L808498A8 +/* 17678 80849888 8FA40084 */ lw $a0, 0x0084($sp) +/* 1767C 8084988C 0C20C910 */ jal func_80832440 /* 17680 80849890 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 17684 80849894 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 17688 80849898 0C20DEE7 */ jal func_80837B9C -/* 1768C 8084989C 8FA50084 */ lw $a1, 0x0084($sp) -/* 17690 808498A0 10000038 */ beq $zero, $zero, .L80849984 -/* 17694 808498A4 8FA70084 */ lw $a3, 0x0084($sp) +/* 17688 80849898 0C20DEE7 */ jal func_80837B9C +/* 1768C 8084989C 8FA50084 */ lw $a1, 0x0084($sp) +/* 17690 808498A0 10000038 */ beq $zero, $zero, .L80849984 +/* 17694 808498A4 8FA70084 */ lw $a3, 0x0084($sp) .L808498A8: /* 17698 808498A8 960C0088 */ lhu $t4, 0x0088($s0) ## 00000088 -/* 1769C 808498AC 00037100 */ sll $t6, $v1, 4 +/* 1769C 808498AC 00037100 */ sll $t6, $v1, 4 /* 176A0 808498B0 318D0001 */ andi $t5, $t4, 0x0001 ## $t5 = 00000000 -/* 176A4 808498B4 15A00003 */ bne $t5, $zero, .L808498C4 +/* 176A4 808498B4 15A00003 */ bne $t5, $zero, .L808498C4 /* 176A8 808498B8 00000000 */ nop -/* 176AC 808498BC 05C30031 */ bgezl $t6, .L80849984 -/* 176B0 808498C0 8FA70084 */ lw $a3, 0x0084($sp) +/* 176AC 808498BC 05C30031 */ bgezl $t6, .L80849984 +/* 176B0 808498C0 8FA70084 */ lw $a3, 0x0084($sp) .L808498C4: -/* 176B4 808498C4 0C20CCAE */ jal func_808332B8 +/* 176B4 808498C4 0C20CCAE */ jal func_808332B8 /* 176B8 808498C8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 176BC 808498CC 10400004 */ beq $v0, $zero, .L808498E0 -/* 176C0 808498D0 8FA40084 */ lw $a0, 0x0084($sp) +/* 176BC 808498CC 10400004 */ beq $v0, $zero, .L808498E0 +/* 176C0 808498D0 8FA40084 */ lw $a0, 0x0084($sp) /* 176C4 808498D4 3C060400 */ lui $a2, 0x0400 ## $a2 = 04000000 -/* 176C8 808498D8 1000000A */ beq $zero, $zero, .L80849904 +/* 176C8 808498D8 1000000A */ beq $zero, $zero, .L80849904 /* 176CC 808498DC 24C63310 */ addiu $a2, $a2, 0x3310 ## $a2 = 04003310 .L808498E0: /* 176D0 808498E0 920F0891 */ lbu $t7, 0x0891($s0) ## 00000891 /* 176D4 808498E4 3C020400 */ lui $v0, 0x0400 ## $v0 = 04000000 /* 176D8 808498E8 24422878 */ addiu $v0, $v0, 0x2878 ## $v0 = 04002878 -/* 176DC 808498EC 11E00004 */ beq $t7, $zero, .L80849900 +/* 176DC 808498EC 11E00004 */ beq $t7, $zero, .L80849900 /* 176E0 808498F0 00000000 */ nop /* 176E4 808498F4 3C020400 */ lui $v0, 0x0400 ## $v0 = 04000000 -/* 176E8 808498F8 10000001 */ beq $zero, $zero, .L80849900 +/* 176E8 808498F8 10000001 */ beq $zero, $zero, .L80849900 /* 176EC 808498FC 24422F08 */ addiu $v0, $v0, 0x2F08 ## $v0 = 04002F08 .L80849900: /* 176F0 80849900 00403025 */ or $a2, $v0, $zero ## $a2 = 04002F08 .L80849904: -/* 176F4 80849904 0C20D912 */ jal func_80836448 +/* 176F4 80849904 0C20D912 */ jal func_80836448 /* 176F8 80849908 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 176FC 8084990C 1000001D */ beq $zero, $zero, .L80849984 -/* 17700 80849910 8FA70084 */ lw $a3, 0x0084($sp) +/* 176FC 8084990C 1000001D */ beq $zero, $zero, .L80849984 +/* 17700 80849910 8FA70084 */ lw $a3, 0x0084($sp) /* 17704 80849914 8E180118 */ lw $t8, 0x0118($s0) ## 00000118 .L80849918: -/* 17708 80849918 8FB9002C */ lw $t9, 0x002C($sp) -/* 1770C 8084991C 57000012 */ bnel $t8, $zero, .L80849968 +/* 17708 80849918 8FB9002C */ lw $t9, 0x002C($sp) +/* 1770C 8084991C 57000012 */ bnel $t8, $zero, .L80849968 /* 17710 80849920 C6100028 */ lwc1 $f16, 0x0028($s0) ## 00000028 /* 17714 80849924 83281E15 */ lb $t0, 0x1E15($t9) ## 00001E15 /* 17718 80849928 24010014 */ addiu $at, $zero, 0x0014 ## $at = 00000014 -/* 1771C 8084992C 51010009 */ beql $t0, $at, .L80849954 +/* 1771C 8084992C 51010009 */ beql $t0, $at, .L80849954 /* 17720 80849930 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 17724 80849934 920A0A87 */ lbu $t2, 0x0A87($s0) ## 00000A87 /* 17728 80849938 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 1772C 8084993C 55400005 */ bnel $t2, $zero, .L80849954 +/* 1772C 8084993C 55400005 */ bnel $t2, $zero, .L80849954 /* 17730 80849940 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 17734 80849944 0C20E0B7 */ jal func_808382DC -/* 17738 80849948 8FA50084 */ lw $a1, 0x0084($sp) -/* 1773C 8084994C 14400005 */ bne $v0, $zero, .L80849964 +/* 17734 80849944 0C20E0B7 */ jal func_808382DC +/* 17738 80849948 8FA50084 */ lw $a1, 0x0084($sp) +/* 1773C 8084994C 14400005 */ bne $v0, $zero, .L80849964 /* 17740 80849950 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 .L80849954: -/* 17744 80849954 0C20EA84 */ jal func_8083AA10 -/* 17748 80849958 8FA50084 */ lw $a1, 0x0084($sp) -/* 1774C 8084995C 10000006 */ beq $zero, $zero, .L80849978 +/* 17744 80849954 0C20EA84 */ jal func_8083AA10 +/* 17748 80849958 8FA50084 */ lw $a1, 0x0084($sp) +/* 1774C 8084995C 10000006 */ beq $zero, $zero, .L80849978 /* 17750 80849960 00000000 */ nop .L80849964: /* 17754 80849964 C6100028 */ lwc1 $f16, 0x0028($s0) ## 00000028 .L80849968: -/* 17758 80849968 4600828D */ trunc.w.s $f10, $f16 -/* 1775C 8084996C 440B5000 */ mfc1 $t3, $f10 +/* 17758 80849968 4600828D */ trunc.w.s $f10, $f16 +/* 1775C 8084996C 440B5000 */ mfc1 $t3, $f10 /* 17760 80849970 00000000 */ nop /* 17764 80849974 A60B0894 */ sh $t3, 0x0894($s0) ## 00000894 .L80849978: -/* 17768 80849978 0C2123BE */ jal func_80848EF8 +/* 17768 80849978 0C2123BE */ jal func_80848EF8 /* 1776C 8084997C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 17770 80849980 8FA70084 */ lw $a3, 0x0084($sp) +/* 17770 80849980 8FA70084 */ lw $a3, 0x0084($sp) .L80849984: /* 17774 80849984 90E51D6C */ lbu $a1, 0x1D6C($a3) ## 00001D6C -/* 17778 80849988 50A0002F */ beql $a1, $zero, .L80849A48 +/* 17778 80849988 50A0002F */ beql $a1, $zero, .L80849A48 /* 1777C 8084998C 92030444 */ lbu $v1, 0x0444($s0) ## 00000444 /* 17780 80849990 92030444 */ lbu $v1, 0x0444($s0) ## 00000444 /* 17784 80849994 24010006 */ addiu $at, $zero, 0x0006 ## $at = 00000006 -/* 17788 80849998 5061002B */ beql $v1, $at, .L80849A48 +/* 17788 80849998 5061002B */ beql $v1, $at, .L80849A48 /* 1778C 8084999C 92030444 */ lbu $v1, 0x0444($s0) ## 00000444 /* 17790 808499A0 8E0C067C */ lw $t4, 0x067C($s0) ## 0000067C -/* 17794 808499A4 000C6A00 */ sll $t5, $t4, 8 -/* 17798 808499A8 05A20027 */ bltzl $t5, .L80849A48 +/* 17794 808499A4 000C6A00 */ sll $t5, $t4, 8 +/* 17798 808499A8 05A20027 */ bltzl $t5, .L80849A48 /* 1779C 808499AC 92030444 */ lbu $v1, 0x0444($s0) ## 00000444 /* 177A0 808499B0 8E020680 */ lw $v0, 0x0680($s0) ## 00000680 /* 177A4 808499B4 304E0080 */ andi $t6, $v0, 0x0080 ## $t6 = 00000000 -/* 177A8 808499B8 55C00023 */ bnel $t6, $zero, .L80849A48 +/* 177A8 808499B8 55C00023 */ bnel $t6, $zero, .L80849A48 /* 177AC 808499BC 92030444 */ lbu $v1, 0x0444($s0) ## 00000444 /* 177B0 808499C0 920F0002 */ lbu $t7, 0x0002($s0) ## 00000002 /* 177B4 808499C4 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 177B8 808499C8 55E1001F */ bnel $t7, $at, .L80849A48 +/* 177B8 808499C8 55E1001F */ bnel $t7, $at, .L80849A48 /* 177BC 808499CC 92030444 */ lbu $v1, 0x0444($s0) ## 00000444 /* 177C0 808499D0 8CE41D88 */ lw $a0, 0x1D88($a3) ## 00001D88 -/* 177C4 808499D4 1080000F */ beq $a0, $zero, .L80849A14 +/* 177C4 808499D4 1080000F */ beq $a0, $zero, .L80849A14 /* 177C8 808499D8 00000000 */ nop /* 177CC 808499DC 94980000 */ lhu $t8, 0x0000($a0) ## 00000000 /* 177D0 808499E0 3C198085 */ lui $t9, %hi(D_808547C4) ## $t9 = 80850000 /* 177D4 808499E4 00E02025 */ or $a0, $a3, $zero ## $a0 = 00000000 -/* 177D8 808499E8 0338C821 */ addu $t9, $t9, $t8 -/* 177DC 808499EC 833947C4 */ lb $t9, %lo(D_808547C4)($t9) +/* 177D8 808499E8 0338C821 */ addu $t9, $t9, $t8 +/* 177DC 808499EC 833947C4 */ lb $t9, %lo(D_808547C4)($t9) /* 177E0 808499F0 24060006 */ addiu $a2, $zero, 0x0006 ## $a2 = 00000006 -/* 177E4 808499F4 13200007 */ beq $t9, $zero, .L80849A14 +/* 177E4 808499F4 13200007 */ beq $t9, $zero, .L80849A14 /* 177E8 808499F8 00000000 */ nop -/* 177EC 808499FC 0C00B7D5 */ jal func_8002DF54 +/* 177EC 808499FC 0C00B7D5 */ jal func_8002DF54 /* 177F0 80849A00 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 177F4 80849A04 0C20C884 */ jal func_80832210 +/* 177F4 80849A04 0C20C884 */ jal func_80832210 /* 177F8 80849A08 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 177FC 80849A0C 1000000D */ beq $zero, $zero, .L80849A44 -/* 17800 80849A10 8FA70084 */ lw $a3, 0x0084($sp) +/* 177FC 80849A0C 1000000D */ beq $zero, $zero, .L80849A44 +/* 17800 80849A10 8FA70084 */ lw $a3, 0x0084($sp) .L80849A14: -/* 17804 80849A14 1460000B */ bne $v1, $zero, .L80849A44 +/* 17804 80849A14 1460000B */ bne $v1, $zero, .L80849A44 /* 17808 80849A18 30480400 */ andi $t0, $v0, 0x0400 ## $t0 = 00000000 -/* 1780C 80849A1C 15000009 */ bne $t0, $zero, .L80849A44 +/* 1780C 80849A1C 15000009 */ bne $t0, $zero, .L80849A44 /* 17810 80849A20 24010003 */ addiu $at, $zero, 0x0003 ## $at = 00000003 -/* 17814 80849A24 10A10007 */ beq $a1, $at, .L80849A44 +/* 17814 80849A24 10A10007 */ beq $a1, $at, .L80849A44 /* 17818 80849A28 00E02025 */ or $a0, $a3, $zero ## $a0 = 00000000 /* 1781C 80849A2C 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 17820 80849A30 0C00B7D5 */ jal func_8002DF54 +/* 17820 80849A30 0C00B7D5 */ jal func_8002DF54 /* 17824 80849A34 24060031 */ addiu $a2, $zero, 0x0031 ## $a2 = 00000031 -/* 17828 80849A38 0C20C884 */ jal func_80832210 +/* 17828 80849A38 0C20C884 */ jal func_80832210 /* 1782C 80849A3C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 17830 80849A40 8FA70084 */ lw $a3, 0x0084($sp) +/* 17830 80849A40 8FA70084 */ lw $a3, 0x0084($sp) .L80849A44: /* 17834 80849A44 92030444 */ lbu $v1, 0x0444($s0) ## 00000444 .L80849A48: -/* 17838 80849A48 10600015 */ beq $v1, $zero, .L80849AA0 +/* 17838 80849A48 10600015 */ beq $v1, $zero, .L80849AA0 /* 1783C 80849A4C 24010007 */ addiu $at, $zero, 0x0007 ## $at = 00000007 -/* 17840 80849A50 14610007 */ bne $v1, $at, .L80849A70 +/* 17840 80849A50 14610007 */ bne $v1, $at, .L80849A70 /* 17844 80849A54 240B0003 */ addiu $t3, $zero, 0x0003 ## $t3 = 00000003 /* 17848 80849A58 8E0A067C */ lw $t2, 0x067C($s0) ## 0000067C /* 1784C 80849A5C 3C010420 */ lui $at, 0x0420 ## $at = 04200000 /* 17850 80849A60 34216000 */ ori $at, $at, 0x6000 ## $at = 04206000 -/* 17854 80849A64 01414824 */ and $t1, $t2, $at -/* 17858 80849A68 55200004 */ bnel $t1, $zero, .L80849A7C +/* 17854 80849A64 01414824 */ and $t1, $t2, $at +/* 17858 80849A68 55200004 */ bnel $t1, $zero, .L80849A7C /* 1785C 80849A6C 8E0C0674 */ lw $t4, 0x0674($s0) ## 00000674 .L80849A70: -/* 17860 80849A70 1000000C */ beq $zero, $zero, .L80849AA4 +/* 17860 80849A70 1000000C */ beq $zero, $zero, .L80849AA4 /* 17864 80849A74 A20B06AD */ sb $t3, 0x06AD($s0) ## 000006AD /* 17868 80849A78 8E0C0674 */ lw $t4, 0x0674($s0) ## 00000674 .L80849A7C: /* 1786C 80849A7C 3C0D8085 */ lui $t5, %hi(func_80852E14) ## $t5 = 80850000 /* 17870 80849A80 25AD2E14 */ addiu $t5, $t5, %lo(func_80852E14) ## $t5 = 80852E14 -/* 17874 80849A84 118D0007 */ beq $t4, $t5, .L80849AA4 +/* 17874 80849A84 118D0007 */ beq $t4, $t5, .L80849AA4 /* 17878 80849A88 00E02025 */ or $a0, $a3, $zero ## $a0 = 00000000 /* 1787C 80849A8C 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 17880 80849A90 0C214A51 */ jal func_80852944 +/* 17880 80849A90 0C214A51 */ jal func_80852944 /* 17884 80849A94 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 17888 80849A98 10000002 */ beq $zero, $zero, .L80849AA4 -/* 1788C 80849A9C 8FA70084 */ lw $a3, 0x0084($sp) +/* 17888 80849A98 10000002 */ beq $zero, $zero, .L80849AA4 +/* 1788C 80849A9C 8FA70084 */ lw $a3, 0x0084($sp) .L80849AA0: /* 17890 80849AA0 A2000445 */ sb $zero, 0x0445($s0) ## 00000445 .L80849AA4: /* 17894 80849AA4 00E02025 */ or $a0, $a3, $zero ## $a0 = 00000000 -/* 17898 80849AA8 0C20F5BB */ jal func_8083D6EC +/* 17898 80849AA8 0C20F5BB */ jal func_8083D6EC /* 1789C 80849AAC 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 178A0 80849AB0 8E0E0664 */ lw $t6, 0x0664($s0) ## 00000664 /* 178A4 80849AB4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 178A8 80849AB8 55C0000A */ bnel $t6, $zero, .L80849AE4 +/* 178A8 80849AB8 55C0000A */ bnel $t6, $zero, .L80849AE4 /* 178AC 80849ABC 8E08067C */ lw $t0, 0x067C($s0) ## 0000067C /* 178B0 80849AC0 860F0690 */ lh $t7, 0x0690($s0) ## 00000690 -/* 178B4 80849AC4 55E00007 */ bnel $t7, $zero, .L80849AE4 +/* 178B4 80849AC4 55E00007 */ bnel $t7, $zero, .L80849AE4 /* 178B8 80849AC8 8E08067C */ lw $t0, 0x067C($s0) ## 0000067C /* 178BC 80849ACC 8E180680 */ lw $t8, 0x0680($s0) ## 00000680 /* 178C0 80849AD0 3C01FFDF */ lui $at, 0xFFDF ## $at = FFDF0000 /* 178C4 80849AD4 3421FFFD */ ori $at, $at, 0xFFFD ## $at = FFDFFFFD -/* 178C8 80849AD8 0301C824 */ and $t9, $t8, $at +/* 178C8 80849AD8 0301C824 */ and $t9, $t8, $at /* 178CC 80849ADC AE190680 */ sw $t9, 0x0680($s0) ## 00000680 /* 178D0 80849AE0 8E08067C */ lw $t0, 0x067C($s0) ## 0000067C .L80849AE4: @@ -812,26 +812,26 @@ glabel func_80848F9C /* 178D8 80849AE8 3421EDFD */ ori $at, $at, 0xEDFD ## $at = FFBFEDFD /* 178DC 80849AEC 8E090680 */ lw $t1, 0x0680($s0) ## 00000680 /* 178E0 80849AF0 920C0692 */ lbu $t4, 0x0692($s0) ## 00000692 -/* 178E4 80849AF4 01015024 */ and $t2, $t0, $at +/* 178E4 80849AF4 01015024 */ and $t2, $t0, $at /* 178E8 80849AF8 3C01FBBE */ lui $at, 0xFBBE ## $at = FBBE0000 /* 178EC 80849AFC 3421AC92 */ ori $at, $at, 0xAC92 ## $at = FBBEAC92 -/* 178F0 80849B00 01215824 */ and $t3, $t1, $at +/* 178F0 80849B00 01215824 */ and $t3, $t1, $at /* 178F4 80849B04 318DFFEF */ andi $t5, $t4, 0xFFEF ## $t5 = 00000000 /* 178F8 80849B08 AE0A067C */ sw $t2, 0x067C($s0) ## 0000067C /* 178FC 80849B0C AE0B0680 */ sw $t3, 0x0680($s0) ## 00000680 -/* 17900 80849B10 0C211CA6 */ jal func_80847298 +/* 17900 80849B10 0C211CA6 */ jal func_80847298 /* 17904 80849B14 A20D0692 */ sb $t5, 0x0692($s0) ## 00000692 -/* 17908 80849B18 8FA40084 */ lw $a0, 0x0084($sp) -/* 1790C 80849B1C 0C20CC57 */ jal func_8083315C +/* 17908 80849B18 8FA40084 */ lw $a0, 0x0084($sp) +/* 1790C 80849B1C 0C20CC57 */ jal func_8083315C /* 17910 80849B20 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 17914 80849B24 8E0E067C */ lw $t6, 0x067C($s0) ## 0000067C -/* 17918 80849B28 000E7900 */ sll $t7, $t6, 4 -/* 1791C 80849B2C 05E10006 */ bgez $t7, .L80849B48 +/* 17918 80849B28 000E7900 */ sll $t7, $t6, 4 +/* 1791C 80849B2C 05E10006 */ bgez $t7, .L80849B48 /* 17920 80849B30 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 /* 17924 80849B34 44812000 */ mtc1 $at, $f4 ## $f4 = 0.50 /* 17928 80849B38 3C038085 */ lui $v1, %hi(D_808535E8) ## $v1 = 80850000 /* 1792C 80849B3C 246335E8 */ addiu $v1, $v1, %lo(D_808535E8) ## $v1 = 808535E8 -/* 17930 80849B40 10000006 */ beq $zero, $zero, .L80849B5C +/* 17930 80849B40 10000006 */ beq $zero, $zero, .L80849B5C /* 17934 80849B44 E4640000 */ swc1 $f4, 0x0000($v1) ## 808535E8 .L80849B48: /* 17938 80849B48 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 @@ -845,63 +845,63 @@ glabel func_80848F9C /* 17954 80849B64 C4660000 */ lwc1 $f6, 0x0000($v1) ## 808535E8 /* 17958 80849B68 3C018085 */ lui $at, %hi(D_808535EC) ## $at = 80850000 /* 1795C 80849B6C 3C028085 */ lui $v0, %hi(D_80853618) ## $v0 = 80850000 -/* 17960 80849B70 46064403 */ div.s $f16, $f8, $f6 +/* 17960 80849B70 46064403 */ div.s $f16, $f8, $f6 /* 17964 80849B74 24423618 */ addiu $v0, $v0, %lo(D_80853618) ## $v0 = 80853618 -/* 17968 80849B78 E43035EC */ swc1 $f16, %lo(D_808535EC)($at) +/* 17968 80849B78 E43035EC */ swc1 $f16, %lo(D_808535EC)($at) /* 1796C 80849B7C AC400000 */ sw $zero, 0x0000($v0) ## 80853618 /* 17970 80849B80 3C018085 */ lui $at, %hi(D_80853614) ## $at = 80850000 -/* 17974 80849B84 AC203614 */ sw $zero, %lo(D_80853614)($at) +/* 17974 80849B84 AC203614 */ sw $zero, %lo(D_80853614)($at) /* 17978 80849B88 9219015F */ lbu $t9, 0x015F($s0) ## 0000015F /* 1797C 80849B8C 3C018086 */ lui $at, %hi(D_80858AA4) ## $at = 80860000 -/* 17980 80849B90 AC398AA4 */ sw $t9, %lo(D_80858AA4)($at) +/* 17980 80849B90 AC398AA4 */ sw $t9, %lo(D_80858AA4)($at) /* 17984 80849B94 92080692 */ lbu $t0, 0x0692($s0) ## 00000692 /* 17988 80849B98 310A0004 */ andi $t2, $t0, 0x0004 ## $t2 = 00000000 -/* 1798C 80849B9C 55400007 */ bnel $t2, $zero, .L80849BBC -/* 17990 80849BA0 8FA40084 */ lw $a0, 0x0084($sp) +/* 1798C 80849B9C 55400007 */ bnel $t2, $zero, .L80849BBC +/* 17990 80849BA0 8FA40084 */ lw $a0, 0x0084($sp) /* 17994 80849BA4 8E190674 */ lw $t9, 0x0674($s0) ## 00000674 /* 17998 80849BA8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 1799C 80849BAC 8FA50084 */ lw $a1, 0x0084($sp) -/* 179A0 80849BB0 0320F809 */ jalr $ra, $t9 +/* 1799C 80849BAC 8FA50084 */ lw $a1, 0x0084($sp) +/* 179A0 80849BB0 0320F809 */ jalr $ra, $t9 /* 179A4 80849BB4 00000000 */ nop -/* 179A8 80849BB8 8FA40084 */ lw $a0, 0x0084($sp) +/* 179A8 80849BB8 8FA40084 */ lw $a0, 0x0084($sp) .L80849BBC: -/* 179AC 80849BBC 0C2121AA */ jal func_808486A8 +/* 179AC 80849BBC 0C2121AA */ jal func_808486A8 /* 179B0 80849BC0 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 179B4 80849BC4 920201E9 */ lbu $v0, 0x01E9($s0) ## 000001E9 /* 179B8 80849BC8 30490008 */ andi $t1, $v0, 0x0008 ## $t1 = 00000000 -/* 179BC 80849BCC 1120000D */ beq $t1, $zero, .L80849C04 +/* 179BC 80849BCC 1120000D */ beq $t1, $zero, .L80849C04 /* 179C0 80849BD0 304B0004 */ andi $t3, $v0, 0x0004 ## $t3 = 00000000 -/* 179C4 80849BD4 11600005 */ beq $t3, $zero, .L80849BEC -/* 179C8 80849BD8 8FA40084 */ lw $a0, 0x0084($sp) +/* 179C4 80849BD4 11600005 */ beq $t3, $zero, .L80849BEC +/* 179C8 80849BD8 8FA40084 */ lw $a0, 0x0084($sp) /* 179CC 80849BDC 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 /* 179D0 80849BE0 44811000 */ mtc1 $at, $f2 ## $f2 = 1.00 -/* 179D4 80849BE4 10000004 */ beq $zero, $zero, .L80849BF8 -/* 179D8 80849BE8 44071000 */ mfc1 $a3, $f2 +/* 179D4 80849BE4 10000004 */ beq $zero, $zero, .L80849BF8 +/* 179D8 80849BE8 44071000 */ mfc1 $a3, $f2 .L80849BEC: /* 179DC 80849BEC 8E0C0678 */ lw $t4, 0x0678($s0) ## 00000678 /* 179E0 80849BF0 C5820008 */ lwc1 $f2, 0x0008($t4) ## 00000008 -/* 179E4 80849BF4 44071000 */ mfc1 $a3, $f2 +/* 179E4 80849BF4 44071000 */ mfc1 $a3, $f2 .L80849BF8: /* 179E8 80849BF8 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 179EC 80849BFC 0C028D88 */ jal func_800A3620 +/* 179EC 80849BFC 0C028D88 */ jal SkelAnime_LoadAnimationType5 /* 179F0 80849C00 260601B4 */ addiu $a2, $s0, 0x01B4 ## $a2 = 000001B4 .L80849C04: /* 179F4 80849C04 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 179F8 80849C08 0C20DA3B */ jal func_808368EC -/* 179FC 80849C0C 8FA50084 */ lw $a1, 0x0084($sp) +/* 179F8 80849C08 0C20DA3B */ jal func_808368EC +/* 179FC 80849C0C 8FA50084 */ lw $a1, 0x0084($sp) /* 17A00 80849C10 8E0D0004 */ lw $t5, 0x0004($s0) ## 00000004 /* 17A04 80849C14 24010100 */ addiu $at, $zero, 0x0100 ## $at = 00000100 /* 17A08 80849C18 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 17A0C 80849C1C 31AE0100 */ andi $t6, $t5, 0x0100 ## $t6 = 00000000 -/* 17A10 80849C20 15C10004 */ bne $t6, $at, .L80849C34 +/* 17A10 80849C20 15C10004 */ bne $t6, $at, .L80849C34 /* 17A14 80849C24 26050498 */ addiu $a1, $s0, 0x0498 ## $a1 = 00000498 /* 17A18 80849C28 44805000 */ mtc1 $zero, $f10 ## $f10 = 0.00 -/* 17A1C 80849C2C 10000006 */ beq $zero, $zero, .L80849C48 +/* 17A1C 80849C2C 10000006 */ beq $zero, $zero, .L80849C48 /* 17A20 80849C30 E60A0698 */ swc1 $f10, 0x0698($s0) ## 00000698 .L80849C34: /* 17A24 80849C34 AE000694 */ sw $zero, 0x0694($s0) ## 00000694 /* 17A28 80849C38 3C018085 */ lui $at, %hi(D_808554D0) ## $at = 80850000 -/* 17A2C 80849C3C C42454D0 */ lwc1 $f4, %lo(D_808554D0)($at) +/* 17A2C 80849C3C C42454D0 */ lwc1 $f4, %lo(D_808554D0)($at) /* 17A30 80849C40 A2000693 */ sb $zero, 0x0693($s0) ## 00000693 /* 17A34 80849C44 E6040698 */ swc1 $f4, 0x0698($s0) ## 00000698 .L80849C48: @@ -909,127 +909,127 @@ glabel func_80848F9C /* 17A3C 80849C4C 3C01FF7F */ lui $at, 0xFF7F ## $at = FF7F0000 /* 17A40 80849C50 24086000 */ addiu $t0, $zero, 0x6000 ## $t0 = 00006000 /* 17A44 80849C54 31F80800 */ andi $t8, $t7, 0x0800 ## $t8 = 00000000 -/* 17A48 80849C58 17000003 */ bne $t8, $zero, .L80849C68 +/* 17A48 80849C58 17000003 */ bne $t8, $zero, .L80849C68 /* 17A4C 80849C5C 3421FFFF */ ori $at, $at, 0xFFFF ## $at = FF7FFFFF /* 17A50 80849C60 AE000438 */ sw $zero, 0x0438($s0) ## 00000438 /* 17A54 80849C64 A6080436 */ sh $t0, 0x0436($s0) ## 00000436 .L80849C68: /* 17A58 80849C68 8E0A0118 */ lw $t2, 0x0118($s0) ## 00000118 -/* 17A5C 80849C6C 55400003 */ bnel $t2, $zero, .L80849C7C +/* 17A5C 80849C6C 55400003 */ bnel $t2, $zero, .L80849C7C /* 17A60 80849C70 8E020680 */ lw $v0, 0x0680($s0) ## 00000680 /* 17A64 80849C74 AE000440 */ sw $zero, 0x0440($s0) ## 00000440 /* 17A68 80849C78 8E020680 */ lw $v0, 0x0680($s0) ## 00000680 .L80849C7C: /* 17A6C 80849C7C A6000690 */ sh $zero, 0x0690($s0) ## 00000690 -/* 17A70 80849C80 0002C980 */ sll $t9, $v0, 6 -/* 17A74 80849C84 07220004 */ bltzl $t9, .L80849C98 -/* 17A78 80849C88 00414824 */ and $t1, $v0, $at +/* 17A70 80849C80 0002C980 */ sll $t9, $v0, 6 +/* 17A74 80849C84 07220004 */ bltzl $t9, .L80849C98 +/* 17A78 80849C88 00414824 */ and $t1, $v0, $at /* 17A7C 80849C8C AE0006A8 */ sw $zero, 0x06A8($s0) ## 000006A8 /* 17A80 80849C90 8E020680 */ lw $v0, 0x0680($s0) ## 00000680 -/* 17A84 80849C94 00414824 */ and $t1, $v0, $at +/* 17A84 80849C94 00414824 */ and $t1, $v0, $at .L80849C98: /* 17A88 80849C98 C6060930 */ lwc1 $f6, 0x0930($s0) ## 00000930 /* 17A8C 80849C9C C6100954 */ lwc1 $f16, 0x0954($s0) ## 00000954 /* 17A90 80849CA0 AE090680 */ sw $t1, 0x0680($s0) ## 00000680 /* 17A94 80849CA4 3C018085 */ lui $at, %hi(D_808554D4) ## $at = 80850000 -/* 17A98 80849CA8 C43254D4 */ lwc1 $f18, %lo(D_808554D4)($at) -/* 17A9C 80849CAC 46103280 */ add.s $f10, $f6, $f16 +/* 17A98 80849CA8 C43254D4 */ lwc1 $f18, %lo(D_808554D4)($at) +/* 17A9C 80849CAC 46103280 */ add.s $f10, $f6, $f16 /* 17AA0 80849CB0 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000 /* 17AA4 80849CB4 C6020028 */ lwc1 $f2, 0x0028($s0) ## 00000028 /* 17AA8 80849CB8 C6080104 */ lwc1 $f8, 0x0104($s0) ## 00000104 /* 17AAC 80849CBC 44812000 */ mtc1 $at, $f4 ## $f4 = 0.50 /* 17AB0 80849CC0 E61206A4 */ swc1 $f18, 0x06A4($s0) ## 000006A4 -/* 17AB4 80849CC4 46081001 */ sub.s $f0, $f2, $f8 -/* 17AB8 80849CC8 46045482 */ mul.s $f18, $f10, $f4 +/* 17AB4 80849CC4 46081001 */ sub.s $f0, $f2, $f8 +/* 17AB8 80849CC8 46045482 */ mul.s $f18, $f10, $f4 /* 17ABC 80849CCC 3C014120 */ lui $at, 0x4120 ## $at = 41200000 /* 17AC0 80849CD0 44813000 */ mtc1 $at, $f6 ## $f6 = 10.00 /* 17AC4 80849CD4 C6080960 */ lwc1 $f8, 0x0960($s0) ## 00000960 /* 17AC8 80849CD8 A200042C */ sb $zero, 0x042C($s0) ## 0000042C /* 17ACC 80849CDC A20008A1 */ sb $zero, 0x08A1($s0) ## 000008A1 -/* 17AD0 80849CE0 46064400 */ add.s $f16, $f8, $f6 +/* 17AD0 80849CE0 46064400 */ add.s $f16, $f8, $f6 /* 17AD4 80849CE4 AE000684 */ sw $zero, 0x0684($s0) ## 00000684 -/* 17AD8 80849CE8 46009300 */ add.s $f12, $f18, $f0 -/* 17ADC 80849CEC 46100000 */ add.s $f0, $f0, $f16 -/* 17AE0 80849CF0 460C0281 */ sub.s $f10, $f0, $f12 -/* 17AE4 80849CF4 4600510D */ trunc.w.s $f4, $f10 -/* 17AE8 80849CF8 440C2000 */ mfc1 $t4, $f4 +/* 17AD8 80849CE8 46009300 */ add.s $f12, $f18, $f0 +/* 17ADC 80849CEC 46100000 */ add.s $f0, $f0, $f16 +/* 17AE0 80849CF0 460C0281 */ sub.s $f10, $f0, $f12 +/* 17AE4 80849CF4 4600510D */ trunc.w.s $f4, $f10 +/* 17AE8 80849CF8 440C2000 */ mfc1 $t4, $f4 /* 17AEC 80849CFC 00000000 */ nop /* 17AF0 80849D00 A60C04DA */ sh $t4, 0x04DA($s0) ## 000004DA /* 17AF4 80849D04 860304DA */ lh $v1, 0x04DA($s0) ## 000004DA -/* 17AF8 80849D08 04610004 */ bgez $v1, .L80849D1C -/* 17AFC 80849D0C 00036823 */ subu $t5, $zero, $v1 -/* 17B00 80849D10 46000306 */ mov.s $f12, $f0 +/* 17AF8 80849D08 04610004 */ bgez $v1, .L80849D1C +/* 17AFC 80849D0C 00036823 */ subu $t5, $zero, $v1 +/* 17B00 80849D10 46000306 */ mov.s $f12, $f0 /* 17B04 80849D14 A60D04DA */ sh $t5, 0x04DA($s0) ## 000004DA /* 17B08 80849D18 C6020028 */ lwc1 $f2, 0x0028($s0) ## 00000028 .L80849D1C: -/* 17B0C 80849D1C 46026481 */ sub.s $f18, $f12, $f2 +/* 17B0C 80849D1C 46026481 */ sub.s $f18, $f12, $f2 /* 17B10 80849D20 8E18067C */ lw $t8, 0x067C($s0) ## 0000067C -/* 17B14 80849D24 4600920D */ trunc.w.s $f8, $f18 -/* 17B18 80849D28 00184240 */ sll $t0, $t8, 9 -/* 17B1C 80849D2C 440F4000 */ mfc1 $t7, $f8 -/* 17B20 80849D30 0501000C */ bgez $t0, .L80849D64 +/* 17B14 80849D24 4600920D */ trunc.w.s $f8, $f18 +/* 17B18 80849D28 00184240 */ sll $t0, $t8, 9 +/* 17B1C 80849D2C 440F4000 */ mfc1 $t7, $f8 +/* 17B20 80849D30 0501000C */ bgez $t0, .L80849D64 /* 17B24 80849D34 A60F04DC */ sh $t7, 0x04DC($s0) ## 000004DC /* 17B28 80849D38 860A04DA */ lh $t2, 0x04DA($s0) ## 000004DA /* 17B2C 80849D3C 3C018085 */ lui $at, %hi(D_808554D8) ## $at = 80850000 -/* 17B30 80849D40 C42A54D8 */ lwc1 $f10, %lo(D_808554D8)($at) +/* 17B30 80849D40 C42A54D8 */ lwc1 $f10, %lo(D_808554D8)($at) /* 17B34 80849D44 448A3000 */ mtc1 $t2, $f6 ## $f6 = 0.00 /* 17B38 80849D48 00000000 */ nop -/* 17B3C 80849D4C 46803420 */ cvt.s.w $f16, $f6 -/* 17B40 80849D50 460A8102 */ mul.s $f4, $f16, $f10 -/* 17B44 80849D54 4600248D */ trunc.w.s $f18, $f4 -/* 17B48 80849D58 44099000 */ mfc1 $t1, $f18 +/* 17B3C 80849D4C 46803420 */ cvt.s.w $f16, $f6 +/* 17B40 80849D50 460A8102 */ mul.s $f4, $f16, $f10 +/* 17B44 80849D54 4600248D */ trunc.w.s $f18, $f4 +/* 17B48 80849D58 44099000 */ mfc1 $t1, $f18 /* 17B4C 80849D5C 00000000 */ nop /* 17B50 80849D60 A60904DA */ sh $t1, 0x04DA($s0) ## 000004DA .L80849D64: /* 17B54 80849D64 0C0189B7 */ jal ActorCollider_Cylinder_Update - -/* 17B58 80849D68 AFA5002C */ sw $a1, 0x002C($sp) + +/* 17B58 80849D68 AFA5002C */ sw $a1, 0x002C($sp) /* 17B5C 80849D6C 8E0B0680 */ lw $t3, 0x0680($s0) ## 00000680 /* 17B60 80849D70 316C4000 */ andi $t4, $t3, 0x4000 ## $t4 = 00000000 -/* 17B64 80849D74 15800022 */ bne $t4, $zero, .L80849E00 +/* 17B64 80849D74 15800022 */ bne $t4, $zero, .L80849E00 /* 17B68 80849D78 00000000 */ nop /* 17B6C 80849D7C 8E03067C */ lw $v1, 0x067C($s0) ## 0000067C /* 17B70 80849D80 3C010080 */ lui $at, 0x0080 ## $at = 00800000 /* 17B74 80849D84 34216080 */ ori $at, $at, 0x6080 ## $at = 00806080 -/* 17B78 80849D88 00616824 */ and $t5, $v1, $at -/* 17B7C 80849D8C 15A00007 */ bne $t5, $zero, .L80849DAC -/* 17B80 80849D90 8FA40084 */ lw $a0, 0x0084($sp) +/* 17B78 80849D88 00616824 */ and $t5, $v1, $at +/* 17B7C 80849D8C 15A00007 */ bne $t5, $zero, .L80849DAC +/* 17B80 80849D90 8FA40084 */ lw $a0, 0x0084($sp) /* 17B84 80849D94 3C010001 */ lui $at, 0x0001 ## $at = 00010000 /* 17B88 80849D98 34211E60 */ ori $at, $at, 0x1E60 ## $at = 00011E60 -/* 17B8C 80849D9C 00812821 */ addu $a1, $a0, $at +/* 17B8C 80849D9C 00812821 */ addu $a1, $a0, $at /* 17B90 80849DA0 0C017713 */ jal Actor_CollisionCheck_SetOT ## CollisionCheck_setOT -/* 17B94 80849DA4 8FA6002C */ lw $a2, 0x002C($sp) +/* 17B94 80849DA4 8FA6002C */ lw $a2, 0x002C($sp) /* 17B98 80849DA8 8E03067C */ lw $v1, 0x067C($s0) ## 0000067C .L80849DAC: /* 17B9C 80849DAC 3C010400 */ lui $at, 0x0400 ## $at = 04000000 /* 17BA0 80849DB0 34210080 */ ori $at, $at, 0x0080 ## $at = 04000080 -/* 17BA4 80849DB4 00617824 */ and $t7, $v1, $at -/* 17BA8 80849DB8 15E00011 */ bne $t7, $zero, .L80849E00 +/* 17BA4 80849DB4 00617824 */ and $t7, $v1, $at +/* 17BA8 80849DB8 15E00011 */ bne $t7, $zero, .L80849E00 /* 17BAC 80849DBC 00000000 */ nop /* 17BB0 80849DC0 82180A78 */ lb $t8, 0x0A78($s0) ## 00000A78 /* 17BB4 80849DC4 3C010001 */ lui $at, 0x0001 ## $at = 00010000 /* 17BB8 80849DC8 34211E60 */ ori $at, $at, 0x1E60 ## $at = 00011E60 -/* 17BBC 80849DCC 1F00000C */ bgtz $t8, .L80849E00 -/* 17BC0 80849DD0 8FA40084 */ lw $a0, 0x0084($sp) -/* 17BC4 80849DD4 00812821 */ addu $a1, $a0, $at -/* 17BC8 80849DD8 AFA50030 */ sw $a1, 0x0030($sp) +/* 17BBC 80849DCC 1F00000C */ bgtz $t8, .L80849E00 +/* 17BC0 80849DD0 8FA40084 */ lw $a0, 0x0084($sp) +/* 17BC4 80849DD4 00812821 */ addu $a1, $a0, $at +/* 17BC8 80849DD8 AFA50030 */ sw $a1, 0x0030($sp) /* 17BCC 80849DDC 0C01767D */ jal Actor_CollisionCheck_SetAC ## CollisionCheck_setAC -/* 17BD0 80849DE0 8FA6002C */ lw $a2, 0x002C($sp) +/* 17BD0 80849DE0 8FA6002C */ lw $a2, 0x002C($sp) /* 17BD4 80849DE4 820A0A78 */ lb $t2, 0x0A78($s0) ## 00000A78 -/* 17BD8 80849DE8 8FA50030 */ lw $a1, 0x0030($sp) -/* 17BDC 80849DEC 8FA40084 */ lw $a0, 0x0084($sp) -/* 17BE0 80849DF0 05410003 */ bgez $t2, .L80849E00 +/* 17BD8 80849DE8 8FA50030 */ lw $a1, 0x0030($sp) +/* 17BDC 80849DEC 8FA40084 */ lw $a0, 0x0084($sp) +/* 17BE0 80849DF0 05410003 */ bgez $t2, .L80849E00 /* 17BE4 80849DF4 00000000 */ nop /* 17BE8 80849DF8 0C0175E7 */ jal Actor_CollisionCheck_SetAT ## CollisionCheck_setAT -/* 17BEC 80849DFC 8FA6002C */ lw $a2, 0x002C($sp) +/* 17BEC 80849DFC 8FA6002C */ lw $a2, 0x002C($sp) .L80849E00: -/* 17BF0 80849E00 0C028CBD */ jal func_800A32F4 -/* 17BF4 80849E04 8FA40084 */ lw $a0, 0x0084($sp) +/* 17BF0 80849E00 0C028CBD */ jal func_800A32F4 +/* 17BF4 80849E04 8FA40084 */ lw $a0, 0x0084($sp) .L80849E08: -/* 17BF8 80849E08 8FA40034 */ lw $a0, 0x0034($sp) +/* 17BF8 80849E08 8FA40034 */ lw $a0, 0x0034($sp) /* 17BFC 80849E0C 0C01DF90 */ jal Math_Vec3f_Copy ## Vec3f_Copy /* 17C00 80849E10 26050024 */ addiu $a1, $s0, 0x0024 ## $a1 = 00000024 @@ -1040,11 +1040,11 @@ glabel func_80848F9C /* 17C10 80849E20 8E19067C */ lw $t9, 0x067C($s0) ## 0000067C /* 17C14 80849E24 3C013000 */ lui $at, 0x3000 ## $at = 30000000 /* 17C18 80849E28 34210080 */ ori $at, $at, 0x0080 ## $at = 30000080 -/* 17C1C 80849E2C 03214824 */ and $t1, $t9, $at -/* 17C20 80849E30 11200004 */ beq $t1, $zero, .L80849E44 +/* 17C1C 80849E2C 03214824 */ and $t1, $t9, $at +/* 17C20 80849E30 11200004 */ beq $t1, $zero, .L80849E44 /* 17C24 80849E34 240C0032 */ addiu $t4, $zero, 0x0032 ## $t4 = 00000032 /* 17C28 80849E38 240B00FF */ addiu $t3, $zero, 0x00FF ## $t3 = 000000FF -/* 17C2C 80849E3C 10000002 */ beq $zero, $zero, .L80849E48 +/* 17C2C 80849E3C 10000002 */ beq $zero, $zero, .L80849E48 /* 17C30 80849E40 A20B00AE */ sb $t3, 0x00AE($s0) ## 000000AE .L80849E44: /* 17C34 80849E44 A20C00AE */ sb $t4, 0x00AE($s0) ## 000000AE @@ -1052,26 +1052,26 @@ glabel func_80848F9C /* 17C38 80849E48 920D0692 */ lbu $t5, 0x0692($s0) ## 00000692 /* 17C3C 80849E4C 31AEFFFB */ andi $t6, $t5, 0xFFFB ## $t6 = 00000000 /* 17C40 80849E50 A20E0692 */ sb $t6, 0x0692($s0) ## 00000692 -/* 17C44 80849E54 8FA5002C */ lw $a1, 0x002C($sp) -/* 17C48 80849E58 0C017150 */ jal func_8005C540 -/* 17C4C 80849E5C 8FA40084 */ lw $a0, 0x0084($sp) -/* 17C50 80849E60 8FA40084 */ lw $a0, 0x0084($sp) -/* 17C54 80849E64 0C017458 */ jal func_8005D160 +/* 17C44 80849E54 8FA5002C */ lw $a1, 0x002C($sp) +/* 17C48 80849E58 0C017150 */ jal func_8005C540 +/* 17C4C 80849E5C 8FA40084 */ lw $a0, 0x0084($sp) +/* 17C50 80849E60 8FA40084 */ lw $a0, 0x0084($sp) +/* 17C54 80849E64 0C017458 */ jal func_8005D160 /* 17C58 80849E68 260504E4 */ addiu $a1, $s0, 0x04E4 ## $a1 = 000004E4 -/* 17C5C 80849E6C 8FA40084 */ lw $a0, 0x0084($sp) -/* 17C60 80849E70 0C017458 */ jal func_8005D160 +/* 17C5C 80849E6C 8FA40084 */ lw $a0, 0x0084($sp) +/* 17C60 80849E70 0C017458 */ jal func_8005D160 /* 17C64 80849E74 26050564 */ addiu $a1, $s0, 0x0564 ## $a1 = 00000564 /* 17C68 80849E78 260505E4 */ addiu $a1, $s0, 0x05E4 ## $a1 = 000005E4 -/* 17C6C 80849E7C AFA50034 */ sw $a1, 0x0034($sp) -/* 17C70 80849E80 0C01746A */ jal func_8005D1A8 -/* 17C74 80849E84 8FA40084 */ lw $a0, 0x0084($sp) -/* 17C78 80849E88 8FA50034 */ lw $a1, 0x0034($sp) -/* 17C7C 80849E8C 0C017458 */ jal func_8005D160 -/* 17C80 80849E90 8FA40084 */ lw $a0, 0x0084($sp) -/* 17C84 80849E94 8FBF0024 */ lw $ra, 0x0024($sp) -/* 17C88 80849E98 8FB00020 */ lw $s0, 0x0020($sp) +/* 17C6C 80849E7C AFA50034 */ sw $a1, 0x0034($sp) +/* 17C70 80849E80 0C01746A */ jal func_8005D1A8 +/* 17C74 80849E84 8FA40084 */ lw $a0, 0x0084($sp) +/* 17C78 80849E88 8FA50034 */ lw $a1, 0x0034($sp) +/* 17C7C 80849E8C 0C017458 */ jal func_8005D160 +/* 17C80 80849E90 8FA40084 */ lw $a0, 0x0084($sp) +/* 17C84 80849E94 8FBF0024 */ lw $ra, 0x0024($sp) +/* 17C88 80849E98 8FB00020 */ lw $s0, 0x0020($sp) /* 17C8C 80849E9C 27BD0080 */ addiu $sp, $sp, 0x0080 ## $sp = 00000000 -/* 17C90 80849EA0 03E00008 */ jr $ra +/* 17C90 80849EA0 03E00008 */ jr $ra /* 17C94 80849EA4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084A0E8.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084A0E8.s index 9736fb7dd4..f887fa3db4 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084A0E8.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084A0E8.s @@ -12,7 +12,7 @@ glabel func_8084A0E8 /* 17F00 8084A110 24C652A0 */ addiu $a2, $a2, %lo(D_808552A0) ## $a2 = 808552A0 /* 17F04 8084A114 27A4007C */ addiu $a0, $sp, 0x007C ## $a0 = FFFFFFEC /* 17F08 8084A118 24074B1C */ addiu $a3, $zero, 0x4B1C ## $a3 = 00004B1C -/* 17F0C 8084A11C 0C031AB1 */ jal func_800C6AC4 +/* 17F0C 8084A11C 0C031AB1 */ jal Graph_OpenDisps /* 17F10 8084A120 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 /* 17F14 8084A124 8E2302C0 */ lw $v1, 0x02C0($s1) ## 000002C0 /* 17F18 8084A128 8FA5009C */ lw $a1, 0x009C($sp) @@ -274,7 +274,7 @@ glabel func_8084A0E8 /* 182FC 8084A50C 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 18300 8084A510 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 /* 18304 8084A514 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 18308 8084A518 0C0253D0 */ jal Draw_TwoTexScroll +/* 18308 8084A518 0C0253D0 */ jal Gfx_TwoTexScroll /* 1830C 8084A51C 00408025 */ or $s0, $v0, $zero ## $s0 = 00000000 /* 18310 8084A520 AE020004 */ sw $v0, 0x0004($s0) ## 00000004 /* 18314 8084A524 8E2202D0 */ lw $v0, 0x02D0($s1) ## 000002D0 @@ -312,7 +312,7 @@ glabel func_8084A0E8 /* 1838C 8084A59C 24C652E0 */ addiu $a2, $a2, %lo(D_808552E0) ## $a2 = 808552E0 /* 18390 8084A5A0 27A4007C */ addiu $a0, $sp, 0x007C ## $a0 = FFFFFFEC /* 18394 8084A5A4 24074B80 */ addiu $a3, $zero, 0x4B80 ## $a3 = 00004B80 -/* 18398 8084A5A8 0C031AD5 */ jal func_800C6B54 +/* 18398 8084A5A8 0C031AD5 */ jal Graph_CloseDisps /* 1839C 8084A5AC 8DC50000 */ lw $a1, 0x0000($t6) ## 00000008 /* 183A0 8084A5B0 8FBF003C */ lw $ra, 0x003C($sp) /* 183A4 8084A5B4 8FB00034 */ lw $s0, 0x0034($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084A5C4.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084A5C4.s index 8d9b1ca762..f29984a5ad 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084A5C4.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084A5C4.s @@ -9,7 +9,7 @@ glabel func_8084A5C4 /* 183D0 8084A5E0 24C652F0 */ addiu $a2, $a2, %lo(D_808552F0) ## $a2 = 808552F0 /* 183D4 8084A5E4 27A40094 */ addiu $a0, $sp, 0x0094 ## $a0 = FFFFFFE4 /* 183D8 8084A5E8 24074B92 */ addiu $a3, $zero, 0x4B92 ## $a3 = 00004B92 -/* 183DC 8084A5EC 0C031AB1 */ jal func_800C6AC4 +/* 183DC 8084A5EC 0C031AB1 */ jal Graph_OpenDisps /* 183E0 8084A5F0 AFA500A4 */ sw $a1, 0x00A4($sp) /* 183E4 8084A5F4 8E0F0680 */ lw $t7, 0x0680($s0) ## 00000680 /* 183E8 8084A5F8 3C198009 */ lui $t9, 0x8009 ## $t9 = 80090000 @@ -82,7 +82,7 @@ glabel func_8084A5C4 /* 184DC 8084A6EC 440C8000 */ mfc1 $t4, $f16 /* 184E0 8084A6F0 00000000 */ nop /* 184E4 8084A6F4 01AC7023 */ subu $t6, $t5, $t4 -/* 184E8 8084A6F8 0C024DC2 */ jal func_80093708 +/* 184E8 8084A6F8 0C024DC2 */ jal Gfx_SetFog2 /* 184EC 8084A6FC AFAE0018 */ sw $t6, 0x0018($sp) /* 184F0 8084A700 8FAF00A4 */ lw $t7, 0x00A4($sp) /* 184F4 8084A704 ADE202C0 */ sw $v0, 0x02C0($t7) ## 000002C0 @@ -309,7 +309,7 @@ glabel func_8084A5C4 /* 18844 8084AA54 AFA0001C */ sw $zero, 0x001C($sp) /* 18848 8084AA58 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 1884C 8084AA5C 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 18850 8084AA60 0C0253D0 */ jal Draw_TwoTexScroll +/* 18850 8084AA60 0C0253D0 */ jal Gfx_TwoTexScroll /* 18854 8084AA64 AFA20064 */ sw $v0, 0x0064($sp) /* 18858 8084AA68 C7AC0068 */ lwc1 $f12, 0x0068($sp) /* 1885C 8084AA6C 8FA80064 */ lw $t0, 0x0064($sp) @@ -365,7 +365,7 @@ glabel func_8084A5C4 /* 1891C 8084AB2C 24C65310 */ addiu $a2, $a2, %lo(D_80855310) ## $a2 = 80855310 /* 18920 8084AB30 27A40094 */ addiu $a0, $sp, 0x0094 ## $a0 = FFFFFFE4 /* 18924 8084AB34 24074C11 */ addiu $a3, $zero, 0x4C11 ## $a3 = 00004C11 -/* 18928 8084AB38 0C031AD5 */ jal func_800C6B54 +/* 18928 8084AB38 0C031AD5 */ jal Graph_CloseDisps /* 1892C 8084AB3C 8F050000 */ lw $a1, 0x0000($t8) ## 00000000 /* 18930 8084AB40 8FBF003C */ lw $ra, 0x003C($sp) /* 18934 8084AB44 8FB00038 */ lw $s0, 0x0038($sp) diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084BF1C.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084BF1C.s index af1ccab351..edbed9629a 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084BF1C.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084BF1C.s @@ -1,293 +1,293 @@ glabel func_8084BF1C /* 19D0C 8084BF1C 27BDFF78 */ addiu $sp, $sp, 0xFF78 ## $sp = FFFFFF78 -/* 19D10 8084BF20 AFBF002C */ sw $ra, 0x002C($sp) -/* 19D14 8084BF24 AFB00028 */ sw $s0, 0x0028($sp) -/* 19D18 8084BF28 AFA5008C */ sw $a1, 0x008C($sp) +/* 19D10 8084BF20 AFBF002C */ sw $ra, 0x002C($sp) +/* 19D14 8084BF24 AFB00028 */ sw $s0, 0x0028($sp) +/* 19D18 8084BF28 AFA5008C */ sw $a1, 0x008C($sp) /* 19D1C 8084BF2C C4840028 */ lwc1 $f4, 0x0028($a0) ## 00000028 /* 19D20 8084BF30 3C028086 */ lui $v0, %hi(D_80858AB4) ## $v0 = 80860000 -/* 19D24 8084BF34 8C428AB4 */ lw $v0, %lo(D_80858AB4)($v0) -/* 19D28 8084BF38 4600218D */ trunc.w.s $f6, $f4 +/* 19D24 8084BF34 8C428AB4 */ lw $v0, %lo(D_80858AB4)($v0) +/* 19D28 8084BF38 4600218D */ trunc.w.s $f6, $f4 /* 19D2C 8084BF3C 8C980680 */ lw $t8, 0x0680($a0) ## 00000680 /* 19D30 8084BF40 808A084F */ lb $t2, 0x084F($a0) ## 0000084F /* 19D34 8084BF44 80480015 */ lb $t0, 0x0015($v0) ## 80860015 -/* 19D38 8084BF48 440F3000 */ mfc1 $t7, $f6 +/* 19D38 8084BF48 440F3000 */ mfc1 $t7, $f6 /* 19D3C 8084BF4C 80490014 */ lb $t1, 0x0014($v0) ## 80860014 /* 19D40 8084BF50 37190040 */ ori $t9, $t8, 0x0040 ## $t9 = 00000040 /* 19D44 8084BF54 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 19D48 8084BF58 AC990680 */ sw $t9, 0x0680($a0) ## 00000680 -/* 19D4C 8084BF5C 11400018 */ beq $t2, $zero, .L8084BFC0 +/* 19D4C 8084BF5C 11400018 */ beq $t2, $zero, .L8084BFC0 /* 19D50 8084BF60 A48F0894 */ sh $t7, 0x0894($a0) ## 00000894 -/* 19D54 8084BF64 05000003 */ bltz $t0, .L8084BF74 -/* 19D58 8084BF68 00081823 */ subu $v1, $zero, $t0 -/* 19D5C 8084BF6C 10000001 */ beq $zero, $zero, .L8084BF74 +/* 19D54 8084BF64 05000003 */ bltz $t0, .L8084BF74 +/* 19D58 8084BF68 00081823 */ subu $v1, $zero, $t0 +/* 19D5C 8084BF6C 10000001 */ beq $zero, $zero, .L8084BF74 /* 19D60 8084BF70 01001825 */ or $v1, $t0, $zero ## $v1 = 00000000 .L8084BF74: -/* 19D64 8084BF74 05200003 */ bltz $t1, .L8084BF84 -/* 19D68 8084BF78 00091023 */ subu $v0, $zero, $t1 -/* 19D6C 8084BF7C 10000001 */ beq $zero, $zero, .L8084BF84 +/* 19D64 8084BF74 05200003 */ bltz $t1, .L8084BF84 +/* 19D68 8084BF78 00091023 */ subu $v0, $zero, $t1 +/* 19D6C 8084BF7C 10000001 */ beq $zero, $zero, .L8084BF84 /* 19D70 8084BF80 01201025 */ or $v0, $t1, $zero ## $v0 = 00000000 .L8084BF84: -/* 19D74 8084BF84 0062082A */ slt $at, $v1, $v0 -/* 19D78 8084BF88 1020000D */ beq $at, $zero, .L8084BFC0 +/* 19D74 8084BF84 0062082A */ slt $at, $v1, $v0 +/* 19D78 8084BF88 1020000D */ beq $at, $zero, .L8084BFC0 /* 19D7C 8084BF8C 00000000 */ nop -/* 19D80 8084BF90 05200003 */ bltz $t1, .L8084BFA0 -/* 19D84 8084BF94 00091023 */ subu $v0, $zero, $t1 -/* 19D88 8084BF98 10000001 */ beq $zero, $zero, .L8084BFA0 +/* 19D80 8084BF90 05200003 */ bltz $t1, .L8084BFA0 +/* 19D84 8084BF94 00091023 */ subu $v0, $zero, $t1 +/* 19D88 8084BF98 10000001 */ beq $zero, $zero, .L8084BFA0 /* 19D8C 8084BF9C 01201025 */ or $v0, $t1, $zero ## $v0 = 00000000 .L8084BFA0: /* 19D90 8084BFA0 44824000 */ mtc1 $v0, $f8 ## $f8 = 0.00 /* 19D94 8084BFA4 3C018085 */ lui $at, %hi(D_80855520) ## $at = 80850000 -/* 19D98 8084BFA8 C4305520 */ lwc1 $f16, %lo(D_80855520)($at) -/* 19D9C 8084BFAC 468042A0 */ cvt.s.w $f10, $f8 +/* 19D98 8084BFA8 C4305520 */ lwc1 $f16, %lo(D_80855520)($at) +/* 19D9C 8084BFAC 468042A0 */ cvt.s.w $f10, $f8 /* 19DA0 8084BFB0 00004025 */ or $t0, $zero, $zero ## $t0 = 00000000 -/* 19DA4 8084BFB4 46105002 */ mul.s $f0, $f10, $f16 -/* 19DA8 8084BFB8 1000000D */ beq $zero, $zero, .L8084BFF0 +/* 19DA4 8084BFB4 46105002 */ mul.s $f0, $f10, $f16 +/* 19DA8 8084BFB8 1000000D */ beq $zero, $zero, .L8084BFF0 /* 19DAC 8084BFBC 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 .L8084BFC0: -/* 19DB0 8084BFC0 05000003 */ bltz $t0, .L8084BFD0 -/* 19DB4 8084BFC4 00081023 */ subu $v0, $zero, $t0 -/* 19DB8 8084BFC8 10000001 */ beq $zero, $zero, .L8084BFD0 +/* 19DB0 8084BFC0 05000003 */ bltz $t0, .L8084BFD0 +/* 19DB4 8084BFC4 00081023 */ subu $v0, $zero, $t0 +/* 19DB8 8084BFC8 10000001 */ beq $zero, $zero, .L8084BFD0 /* 19DBC 8084BFCC 01001025 */ or $v0, $t0, $zero ## $v0 = 00000000 .L8084BFD0: /* 19DC0 8084BFD0 44829000 */ mtc1 $v0, $f18 ## $f18 = 0.00 /* 19DC4 8084BFD4 3C018085 */ lui $at, %hi(D_80855524) ## $at = 80850000 -/* 19DC8 8084BFD8 C4265524 */ lwc1 $f6, %lo(D_80855524)($at) -/* 19DCC 8084BFDC 46809120 */ cvt.s.w $f4, $f18 +/* 19DC8 8084BFD8 C4265524 */ lwc1 $f6, %lo(D_80855524)($at) +/* 19DCC 8084BFDC 46809120 */ cvt.s.w $f4, $f18 /* 19DD0 8084BFE0 00004825 */ or $t1, $zero, $zero ## $t1 = 00000000 -/* 19DD4 8084BFE4 46062002 */ mul.s $f0, $f4, $f6 +/* 19DD4 8084BFE4 46062002 */ mul.s $f0, $f4, $f6 /* 19DD8 8084BFE8 00000000 */ nop /* 19DDC 8084BFEC 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 .L8084BFF0: /* 19DE0 8084BFF0 44816000 */ mtc1 $at, $f12 ## $f12 = 1.00 /* 19DE4 8084BFF4 44805000 */ mtc1 $zero, $f10 ## $f10 = 0.00 /* 19DE8 8084BFF8 3C018085 */ lui $at, %hi(D_80855528) ## $at = 80850000 -/* 19DEC 8084BFFC 460C003C */ c.lt.s $f0, $f12 +/* 19DEC 8084BFFC 460C003C */ c.lt.s $f0, $f12 /* 19DF0 8084C000 00000000 */ nop -/* 19DF4 8084C004 45000003 */ bc1f .L8084C014 +/* 19DF4 8084C004 45000003 */ bc1f .L8084C014 /* 19DF8 8084C008 00000000 */ nop -/* 19DFC 8084C00C 10000007 */ beq $zero, $zero, .L8084C02C -/* 19E00 8084C010 46006006 */ mov.s $f0, $f12 +/* 19DFC 8084C00C 10000007 */ beq $zero, $zero, .L8084C02C +/* 19E00 8084C010 46006006 */ mov.s $f0, $f12 .L8084C014: -/* 19E04 8084C014 C4225528 */ lwc1 $f2, %lo(D_80855528)($at) -/* 19E08 8084C018 4600103C */ c.lt.s $f2, $f0 +/* 19E04 8084C014 C4225528 */ lwc1 $f2, %lo(D_80855528)($at) +/* 19E08 8084C018 4600103C */ c.lt.s $f2, $f0 /* 19E0C 8084C01C 00000000 */ nop -/* 19E10 8084C020 45020003 */ bc1fl .L8084C030 +/* 19E10 8084C020 45020003 */ bc1fl .L8084C030 /* 19E14 8084C024 C60801D0 */ lwc1 $f8, 0x01D0($s0) ## 000001D0 -/* 19E18 8084C028 46001006 */ mov.s $f0, $f2 +/* 19E18 8084C028 46001006 */ mov.s $f0, $f2 .L8084C02C: /* 19E1C 8084C02C C60801D0 */ lwc1 $f8, 0x01D0($s0) ## 000001D0 .L8084C030: /* 19E20 8084C030 3C01BF80 */ lui $at, 0xBF80 ## $at = BF800000 -/* 19E24 8084C034 4608503E */ c.le.s $f10, $f8 +/* 19E24 8084C034 4608503E */ c.le.s $f10, $f8 /* 19E28 8084C038 00000000 */ nop -/* 19E2C 8084C03C 45020004 */ bc1fl .L8084C050 +/* 19E2C 8084C03C 45020004 */ bc1fl .L8084C050 /* 19E30 8084C040 44811000 */ mtc1 $at, $f2 ## $f2 = -1.00 -/* 19E34 8084C044 10000003 */ beq $zero, $zero, .L8084C054 -/* 19E38 8084C048 46006086 */ mov.s $f2, $f12 +/* 19E34 8084C044 10000003 */ beq $zero, $zero, .L8084C054 +/* 19E38 8084C048 46006086 */ mov.s $f2, $f12 /* 19E3C 8084C04C 44811000 */ mtc1 $at, $f2 ## $f2 = -1.00 .L8084C050: /* 19E40 8084C050 00000000 */ nop .L8084C054: -/* 19E44 8084C054 46001402 */ mul.s $f16, $f2, $f0 +/* 19E44 8084C054 46001402 */ mul.s $f16, $f2, $f0 /* 19E48 8084C058 86030850 */ lh $v1, 0x0850($s0) ## 00000850 -/* 19E4C 8084C05C 04600036 */ bltz $v1, .L8084C138 +/* 19E4C 8084C05C 04600036 */ bltz $v1, .L8084C138 /* 19E50 8084C060 E61001D0 */ swc1 $f16, 0x01D0($s0) ## 000001D0 /* 19E54 8084C064 8E0B0074 */ lw $t3, 0x0074($s0) ## 00000074 -/* 19E58 8084C068 51600019 */ beql $t3, $zero, .L8084C0D0 +/* 19E58 8084C068 51600019 */ beql $t3, $zero, .L8084C0D0 /* 19E5C 8084C06C 8E0C0678 */ lw $t4, 0x0678($s0) ## 00000678 /* 19E60 8084C070 9205007C */ lbu $a1, 0x007C($s0) ## 0000007C -/* 19E64 8084C074 8FA4008C */ lw $a0, 0x008C($sp) +/* 19E64 8084C074 8FA4008C */ lw $a0, 0x008C($sp) /* 19E68 8084C078 24010032 */ addiu $at, $zero, 0x0032 ## $at = 00000032 -/* 19E6C 8084C07C 10A10013 */ beq $a1, $at, .L8084C0CC +/* 19E6C 8084C07C 10A10013 */ beq $a1, $at, .L8084C0CC /* 19E70 8084C080 248407C0 */ addiu $a0, $a0, 0x07C0 ## $a0 = 000007C0 -/* 19E74 8084C084 AFA80084 */ sw $t0, 0x0084($sp) +/* 19E74 8084C084 AFA80084 */ sw $t0, 0x0084($sp) /* 19E78 8084C088 0C00FAE1 */ jal DynaPolyInfo_GetActor ## DynaPolyInfo_getActor -/* 19E7C 8084C08C AFA90080 */ sw $t1, 0x0080($sp) -/* 19E80 8084C090 8FA80084 */ lw $t0, 0x0084($sp) -/* 19E84 8084C094 1040000D */ beq $v0, $zero, .L8084C0CC -/* 19E88 8084C098 8FA90080 */ lw $t1, 0x0080($sp) +/* 19E7C 8084C08C AFA90080 */ sw $t1, 0x0080($sp) +/* 19E80 8084C090 8FA80084 */ lw $t0, 0x0084($sp) +/* 19E84 8084C094 1040000D */ beq $v0, $zero, .L8084C0CC +/* 19E88 8084C098 8FA90080 */ lw $t1, 0x0080($sp) /* 19E8C 8084C09C 24440024 */ addiu $a0, $v0, 0x0024 ## $a0 = 00000024 /* 19E90 8084C0A0 24450100 */ addiu $a1, $v0, 0x0100 ## $a1 = 00000100 /* 19E94 8084C0A4 27A6006C */ addiu $a2, $sp, 0x006C ## $a2 = FFFFFFE4 -/* 19E98 8084C0A8 AFA80084 */ sw $t0, 0x0084($sp) +/* 19E98 8084C0A8 AFA80084 */ sw $t0, 0x0084($sp) /* 19E9C 8084C0AC 0C01DFB4 */ jal Math_Vec3f_Diff ## Vec3f_Sub -/* 19EA0 8084C0B0 AFA90080 */ sw $t1, 0x0080($sp) +/* 19EA0 8084C0B0 AFA90080 */ sw $t1, 0x0080($sp) /* 19EA4 8084C0B4 26040024 */ addiu $a0, $s0, 0x0024 ## $a0 = 00000024 /* 19EA8 8084C0B8 00803025 */ or $a2, $a0, $zero ## $a2 = 00000024 /* 19EAC 8084C0BC 0C01DFA7 */ jal Math_Vec3f_Sum ## Vec3f_Add /* 19EB0 8084C0C0 27A5006C */ addiu $a1, $sp, 0x006C ## $a1 = FFFFFFE4 -/* 19EB4 8084C0C4 8FA80084 */ lw $t0, 0x0084($sp) -/* 19EB8 8084C0C8 8FA90080 */ lw $t1, 0x0080($sp) +/* 19EB4 8084C0C4 8FA80084 */ lw $t0, 0x0084($sp) +/* 19EB8 8084C0C8 8FA90080 */ lw $t1, 0x0080($sp) .L8084C0CC: /* 19EBC 8084C0CC 8E0C0678 */ lw $t4, 0x0678($s0) ## 00000678 .L8084C0D0: /* 19EC0 8084C0D0 240D0007 */ addiu $t5, $zero, 0x0007 ## $t5 = 00000007 -/* 19EC4 8084C0D4 8FA4008C */ lw $a0, 0x008C($sp) +/* 19EC4 8084C0D4 8FA4008C */ lw $a0, 0x008C($sp) /* 19EC8 8084C0D8 C5920000 */ lwc1 $f18, 0x0000($t4) ## 00000000 -/* 19ECC 8084C0DC AFA90080 */ sw $t1, 0x0080($sp) -/* 19ED0 8084C0E0 AFA80084 */ sw $t0, 0x0084($sp) -/* 19ED4 8084C0E4 AFAD0014 */ sw $t5, 0x0014($sp) +/* 19ECC 8084C0DC AFA90080 */ sw $t1, 0x0080($sp) +/* 19ED0 8084C0E0 AFA80084 */ sw $t0, 0x0084($sp) +/* 19ED4 8084C0E4 AFAD0014 */ sw $t5, 0x0014($sp) /* 19ED8 8084C0E8 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 19EDC 8084C0EC 3C0641D0 */ lui $a2, 0x41D0 ## $a2 = 41D00000 /* 19EE0 8084C0F0 3C0740C0 */ lui $a3, 0x40C0 ## $a3 = 40C00000 -/* 19EE4 8084C0F4 0C00B92D */ jal func_8002E4B4 -/* 19EE8 8084C0F8 E7B20010 */ swc1 $f18, 0x0010($sp) +/* 19EE4 8084C0F4 0C00B92D */ jal func_8002E4B4 +/* 19EE8 8084C0F8 E7B20010 */ swc1 $f18, 0x0010($sp) /* 19EEC 8084C0FC 3C014248 */ lui $at, 0x4248 ## $at = 42480000 /* 19EF0 8084C100 44812000 */ mtc1 $at, $f4 ## $f4 = 50.00 /* 19EF4 8084C104 8E0E0678 */ lw $t6, 0x0678($s0) ## 00000678 /* 19EF8 8084C108 3C01C1A0 */ lui $at, 0xC1A0 ## $at = C1A00000 /* 19EFC 8084C10C 44813000 */ mtc1 $at, $f6 ## $f6 = -20.00 /* 19F00 8084C110 8DC7003C */ lw $a3, 0x003C($t6) ## 0000003C -/* 19F04 8084C114 8FA4008C */ lw $a0, 0x008C($sp) +/* 19F04 8084C114 8FA4008C */ lw $a0, 0x008C($sp) /* 19F08 8084C118 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 19F0C 8084C11C 3C0641D0 */ lui $a2, 0x41D0 ## $a2 = 41D00000 -/* 19F10 8084C120 E7A40010 */ swc1 $f4, 0x0010($sp) -/* 19F14 8084C124 0C20FCD8 */ jal func_8083F360 -/* 19F18 8084C128 E7A60014 */ swc1 $f6, 0x0014($sp) -/* 19F1C 8084C12C 8FA80084 */ lw $t0, 0x0084($sp) -/* 19F20 8084C130 8FA90080 */ lw $t1, 0x0080($sp) +/* 19F10 8084C120 E7A40010 */ swc1 $f4, 0x0010($sp) +/* 19F14 8084C124 0C20FCD8 */ jal func_8083F360 +/* 19F18 8084C128 E7A60014 */ swc1 $f6, 0x0014($sp) +/* 19F1C 8084C12C 8FA80084 */ lw $t0, 0x0084($sp) +/* 19F20 8084C130 8FA90080 */ lw $t1, 0x0080($sp) /* 19F24 8084C134 86030850 */ lh $v1, 0x0850($s0) ## 00000850 .L8084C138: -/* 19F28 8084C138 04600008 */ bltz $v1, .L8084C15C +/* 19F28 8084C138 04600008 */ bltz $v1, .L8084C15C /* 19F2C 8084C13C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 19F30 8084C140 8FA5008C */ lw $a1, 0x008C($sp) -/* 19F34 8084C144 AFA80084 */ sw $t0, 0x0084($sp) -/* 19F38 8084C148 0C20FEF0 */ jal func_8083FBC0 -/* 19F3C 8084C14C AFA90080 */ sw $t1, 0x0080($sp) -/* 19F40 8084C150 8FA80084 */ lw $t0, 0x0084($sp) -/* 19F44 8084C154 144000E7 */ bne $v0, $zero, .L8084C4F4 -/* 19F48 8084C158 8FA90080 */ lw $t1, 0x0080($sp) +/* 19F30 8084C140 8FA5008C */ lw $a1, 0x008C($sp) +/* 19F34 8084C144 AFA80084 */ sw $t0, 0x0084($sp) +/* 19F38 8084C148 0C20FEF0 */ jal func_8083FBC0 +/* 19F3C 8084C14C AFA90080 */ sw $t1, 0x0080($sp) +/* 19F40 8084C150 8FA80084 */ lw $t0, 0x0084($sp) +/* 19F44 8084C154 144000E7 */ bne $v0, $zero, .L8084C4F4 +/* 19F48 8084C158 8FA90080 */ lw $t1, 0x0080($sp) .L8084C15C: /* 19F4C 8084C15C 260501B4 */ addiu $a1, $s0, 0x01B4 ## $a1 = 000001B4 -/* 19F50 8084C160 AFA50030 */ sw $a1, 0x0030($sp) -/* 19F54 8084C164 8FA4008C */ lw $a0, 0x008C($sp) -/* 19F58 8084C168 AFA80084 */ sw $t0, 0x0084($sp) -/* 19F5C 8084C16C 0C028EF0 */ jal func_800A3BC0 -/* 19F60 8084C170 AFA90080 */ sw $t1, 0x0080($sp) -/* 19F64 8084C174 8FA80084 */ lw $t0, 0x0084($sp) -/* 19F68 8084C178 104000DE */ beq $v0, $zero, .L8084C4F4 -/* 19F6C 8084C17C 8FA90080 */ lw $t1, 0x0080($sp) +/* 19F50 8084C160 AFA50030 */ sw $a1, 0x0030($sp) +/* 19F54 8084C164 8FA4008C */ lw $a0, 0x008C($sp) +/* 19F58 8084C168 AFA80084 */ sw $t0, 0x0084($sp) +/* 19F5C 8084C16C 0C028EF0 */ jal func_800A3BC0 +/* 19F60 8084C170 AFA90080 */ sw $t1, 0x0080($sp) +/* 19F64 8084C174 8FA80084 */ lw $t0, 0x0084($sp) +/* 19F68 8084C178 104000DE */ beq $v0, $zero, .L8084C4F4 +/* 19F6C 8084C17C 8FA90080 */ lw $t1, 0x0080($sp) /* 19F70 8084C180 86030850 */ lh $v1, 0x0850($s0) ## 00000850 -/* 19F74 8084C184 04610008 */ bgez $v1, .L8084C1A8 +/* 19F74 8084C184 04610008 */ bgez $v1, .L8084C1A8 /* 19F78 8084C188 00000000 */ nop -/* 19F7C 8084C18C 04600003 */ bltz $v1, .L8084C19C -/* 19F80 8084C190 00031023 */ subu $v0, $zero, $v1 -/* 19F84 8084C194 10000001 */ beq $zero, $zero, .L8084C19C +/* 19F7C 8084C18C 04600003 */ bltz $v1, .L8084C19C +/* 19F80 8084C190 00031023 */ subu $v0, $zero, $v1 +/* 19F84 8084C194 10000001 */ beq $zero, $zero, .L8084C19C /* 19F88 8084C198 00601025 */ or $v0, $v1, $zero ## $v0 = 00000000 .L8084C19C: /* 19F8C 8084C19C 304F0001 */ andi $t7, $v0, 0x0001 ## $t7 = 00000000 -/* 19F90 8084C1A0 10000110 */ beq $zero, $zero, .L8084C5E4 +/* 19F90 8084C1A0 10000110 */ beq $zero, $zero, .L8084C5E4 /* 19F94 8084C1A4 A60F0850 */ sh $t7, 0x0850($s0) ## 00000850 .L8084C1A8: -/* 19F98 8084C1A8 51000099 */ beql $t0, $zero, .L8084C410 +/* 19F98 8084C1A8 51000099 */ beql $t0, $zero, .L8084C410 /* 19F9C 8084C1AC 8219084F */ lb $t9, 0x084F($s0) ## 0000084F /* 19FA0 8084C1B0 8204084F */ lb $a0, 0x084F($s0) ## 0000084F /* 19FA4 8084C1B4 3C018085 */ lui $at, %hi(D_80854890) ## $at = 80850000 -/* 19FA8 8084C1B8 1900004F */ blez $t0, .L8084C2F8 -/* 19FAC 8084C1BC 00831021 */ addu $v0, $a0, $v1 +/* 19FA8 8084C1B8 1900004F */ blez $t0, .L8084C2F8 +/* 19FAC 8084C1BC 00831021 */ addu $v0, $a0, $v1 /* 19FB0 8084C1C0 8E180678 */ lw $t8, 0x0678($s0) ## 00000678 /* 19FB4 8084C1C4 3C068085 */ lui $a2, %hi(D_8085488C) ## $a2 = 80850000 /* 19FB8 8084C1C8 24C6488C */ addiu $a2, $a2, %lo(D_8085488C) ## $a2 = 8085488C /* 19FBC 8084C1CC C7080040 */ lwc1 $f8, 0x0040($t8) ## 00000040 -/* 19FC0 8084C1D0 AFA20068 */ sw $v0, 0x0068($sp) -/* 19FC4 8084C1D4 8FA4008C */ lw $a0, 0x008C($sp) +/* 19FC0 8084C1D0 AFA20068 */ sw $v0, 0x0068($sp) +/* 19FC4 8084C1D4 8FA4008C */ lw $a0, 0x008C($sp) /* 19FC8 8084C1D8 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 19FCC 8084C1DC 27A7005C */ addiu $a3, $sp, 0x005C ## $a3 = FFFFFFD4 -/* 19FD0 8084C1E0 0C20E5CF */ jal func_8083973C -/* 19FD4 8084C1E4 E4284890 */ swc1 $f8, %lo(D_80854890)($at) +/* 19FD0 8084C1E0 0C20E5CF */ jal func_8083973C +/* 19FD4 8084C1E4 E4284890 */ swc1 $f8, %lo(D_80854890)($at) /* 19FD8 8084C1E8 C60A0028 */ lwc1 $f10, 0x0028($s0) ## 00000028 -/* 19FDC 8084C1EC 8FA20068 */ lw $v0, 0x0068($sp) -/* 19FE0 8084C1F0 46000086 */ mov.s $f2, $f0 -/* 19FE4 8084C1F4 4600503C */ c.lt.s $f10, $f0 -/* 19FE8 8084C1F8 0002C080 */ sll $t8, $v0, 2 -/* 19FEC 8084C1FC 4502002C */ bc1fl .L8084C2B0 +/* 19FDC 8084C1EC 8FA20068 */ lw $v0, 0x0068($sp) +/* 19FE0 8084C1F0 46000086 */ mov.s $f2, $f0 +/* 19FE4 8084C1F4 4600503C */ c.lt.s $f10, $f0 +/* 19FE8 8084C1F8 0002C080 */ sll $t8, $v0, 2 +/* 19FEC 8084C1FC 4502002C */ bc1fl .L8084C2B0 /* 19FF0 8084C200 8E0F0678 */ lw $t7, 0x0678($s0) ## 00000678 /* 19FF4 8084C204 8219084F */ lb $t9, 0x084F($s0) ## 0000084F /* 19FF8 8084C208 3C01FFDF */ lui $at, 0xFFDF ## $at = FFDF0000 /* 19FFC 8084C20C 3421FFFF */ ori $at, $at, 0xFFFF ## $at = FFDFFFFF -/* 1A000 8084C210 1320001D */ beq $t9, $zero, .L8084C288 +/* 1A000 8084C210 1320001D */ beq $t9, $zero, .L8084C288 /* 1A004 8084C214 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 1A008 8084C218 8E0A067C */ lw $t2, 0x067C($s0) ## 0000067C /* 1A00C 8084C21C 8E0C0678 */ lw $t4, 0x0678($s0) ## 00000678 /* 1A010 8084C220 E6020028 */ swc1 $f2, 0x0028($s0) ## 00000028 -/* 1A014 8084C224 01415824 */ and $t3, $t2, $at +/* 1A014 8084C224 01415824 */ and $t3, $t2, $at /* 1A018 8084C228 AE0B067C */ sw $t3, 0x067C($s0) ## 0000067C /* 1A01C 8084C22C 3C0D0400 */ lui $t5, 0x0400 ## $t5 = 04000000 /* 1A020 8084C230 25AD3000 */ addiu $t5, $t5, 0x3000 ## $t5 = 04003000 /* 1A024 8084C234 8E060074 */ lw $a2, 0x0074($s0) ## 00000074 /* 1A028 8084C238 8D87003C */ lw $a3, 0x003C($t4) ## 0000003C -/* 1A02C 8084C23C AFAD0010 */ sw $t5, 0x0010($sp) -/* 1A030 8084C240 8FA4008C */ lw $a0, 0x008C($sp) -/* 1A034 8084C244 0C20E971 */ jal func_8083A5C4 +/* 1A02C 8084C23C AFAD0010 */ sw $t5, 0x0010($sp) +/* 1A030 8084C240 8FA4008C */ lw $a0, 0x008C($sp) +/* 1A034 8084C244 0C20E971 */ jal func_8083A5C4 /* 1A038 8084C248 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 1A03C 8084C24C 860E083C */ lh $t6, 0x083C($s0) ## 0000083C /* 1A040 8084C250 34018000 */ ori $at, $zero, 0x8000 ## $at = 00008000 /* 1A044 8084C254 3C050400 */ lui $a1, 0x0400 ## $a1 = 04000000 -/* 1A048 8084C258 01C17821 */ addu $t7, $t6, $at +/* 1A048 8084C258 01C17821 */ addu $t7, $t6, $at /* 1A04C 8084C25C A60F083C */ sh $t7, 0x083C($s0) ## 0000083C /* 1A050 8084C260 8618083C */ lh $t8, 0x083C($s0) ## 0000083C /* 1A054 8084C264 24A53000 */ addiu $a1, $a1, 0x3000 ## $a1 = 04003000 /* 1A058 8084C268 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 1A05C 8084C26C A61800B6 */ sh $t8, 0x00B6($s0) ## 000000B6 -/* 1A060 8084C270 0C20EA6E */ jal func_8083A9B8 -/* 1A064 8084C274 8FA6008C */ lw $a2, 0x008C($sp) +/* 1A060 8084C270 0C20EA6E */ jal func_8083A9B8 +/* 1A064 8084C274 8FA6008C */ lw $a2, 0x008C($sp) /* 1A068 8084C278 8E19067C */ lw $t9, 0x067C($s0) ## 0000067C /* 1A06C 8084C27C 372A4000 */ ori $t2, $t9, 0x4000 ## $t2 = 00004000 -/* 1A070 8084C280 1000005E */ beq $zero, $zero, .L8084C3FC +/* 1A070 8084C280 1000005E */ beq $zero, $zero, .L8084C3FC /* 1A074 8084C284 AE0A067C */ sw $t2, 0x067C($s0) ## 0000067C .L8084C288: /* 1A078 8084C288 860C0850 */ lh $t4, 0x0850($s0) ## 00000850 /* 1A07C 8084C28C 8E0B0678 */ lw $t3, 0x0678($s0) ## 00000678 -/* 1A080 8084C290 8FA6008C */ lw $a2, 0x008C($sp) -/* 1A084 8084C294 000C6880 */ sll $t5, $t4, 2 -/* 1A088 8084C298 016D7021 */ addu $t6, $t3, $t5 -/* 1A08C 8084C29C 0C20FC1C */ jal func_8083F070 +/* 1A080 8084C290 8FA6008C */ lw $a2, 0x008C($sp) +/* 1A084 8084C294 000C6880 */ sll $t5, $t4, 2 +/* 1A088 8084C298 016D7021 */ addu $t6, $t3, $t5 +/* 1A08C 8084C29C 0C20FC1C */ jal func_8083F070 /* 1A090 8084C2A0 8DC500CC */ lw $a1, 0x00CC($t6) ## 000000CC -/* 1A094 8084C2A4 10000056 */ beq $zero, $zero, .L8084C400 +/* 1A094 8084C2A4 10000056 */ beq $zero, $zero, .L8084C400 /* 1A098 8084C2A8 860F0850 */ lh $t7, 0x0850($s0) ## 00000850 /* 1A09C 8084C2AC 8E0F0678 */ lw $t7, 0x0678($s0) ## 00000678 .L8084C2B0: -/* 1A0A0 8084C2B0 0302C023 */ subu $t8, $t8, $v0 -/* 1A0A4 8084C2B4 0018C040 */ sll $t8, $t8, 1 -/* 1A0A8 8084C2B8 01F8C821 */ addu $t9, $t7, $t8 +/* 1A0A0 8084C2B0 0302C023 */ subu $t8, $t8, $v0 +/* 1A0A4 8084C2B4 0018C040 */ sll $t8, $t8, 1 +/* 1A0A8 8084C2B8 01F8C821 */ addu $t9, $t7, $t8 /* 1A0AC 8084C2BC 8B2C004A */ lwl $t4, 0x004A($t9) ## 0000004A /* 1A0B0 8084C2C0 9B2C004D */ lwr $t4, 0x004D($t9) ## 0000004D /* 1A0B4 8084C2C4 8E0B0678 */ lw $t3, 0x0678($s0) ## 00000678 -/* 1A0B8 8084C2C8 00026880 */ sll $t5, $v0, 2 +/* 1A0B8 8084C2C8 00026880 */ sll $t5, $v0, 2 /* 1A0BC 8084C2CC AA0C01EC */ swl $t4, 0x01EC($s0) ## 000001EC /* 1A0C0 8084C2D0 BA0C01EF */ swr $t4, 0x01EF($s0) ## 000001EF /* 1A0C4 8084C2D4 972C004E */ lhu $t4, 0x004E($t9) ## 0000004E -/* 1A0C8 8084C2D8 016D7021 */ addu $t6, $t3, $t5 +/* 1A0C8 8084C2D8 016D7021 */ addu $t6, $t3, $t5 /* 1A0CC 8084C2DC 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 1A0D0 8084C2E0 A60C01F0 */ sh $t4, 0x01F0($s0) ## 000001F0 /* 1A0D4 8084C2E4 8DC600AC */ lw $a2, 0x00AC($t6) ## 000000AC -/* 1A0D8 8084C2E8 0C20C899 */ jal func_80832264 -/* 1A0DC 8084C2EC 8FA4008C */ lw $a0, 0x008C($sp) -/* 1A0E0 8084C2F0 10000043 */ beq $zero, $zero, .L8084C400 +/* 1A0D8 8084C2E8 0C20C899 */ jal func_80832264 +/* 1A0DC 8084C2EC 8FA4008C */ lw $a0, 0x008C($sp) +/* 1A0E0 8084C2F0 10000043 */ beq $zero, $zero, .L8084C400 /* 1A0E4 8084C2F4 860F0850 */ lh $t7, 0x0850($s0) ## 00000850 .L8084C2F8: /* 1A0E8 8084C2F8 C6100028 */ lwc1 $f16, 0x0028($s0) ## 00000028 /* 1A0EC 8084C2FC C6120080 */ lwc1 $f18, 0x0080($s0) ## 00000080 /* 1A0F0 8084C300 3C014170 */ lui $at, 0x4170 ## $at = 41700000 /* 1A0F4 8084C304 44813000 */ mtc1 $at, $f6 ## $f6 = 15.00 -/* 1A0F8 8084C308 46128101 */ sub.s $f4, $f16, $f18 +/* 1A0F8 8084C308 46128101 */ sub.s $f4, $f16, $f18 /* 1A0FC 8084C30C 38420001 */ xori $v0, $v0, 0x0001 ## $v0 = 00000001 -/* 1A100 8084C310 00027880 */ sll $t7, $v0, 2 -/* 1A104 8084C314 4606203C */ c.lt.s $f4, $f6 +/* 1A100 8084C310 00027880 */ sll $t7, $v0, 2 +/* 1A104 8084C314 4606203C */ c.lt.s $f4, $f6 /* 1A108 8084C318 00000000 */ nop -/* 1A10C 8084C31C 4502001B */ bc1fl .L8084C38C +/* 1A10C 8084C31C 4502001B */ bc1fl .L8084C38C /* 1A110 8084C320 8E0E0678 */ lw $t6, 0x0678($s0) ## 00000678 -/* 1A114 8084C324 10800005 */ beq $a0, $zero, .L8084C33C -/* 1A118 8084C328 8FA5008C */ lw $a1, 0x008C($sp) -/* 1A11C 8084C32C 0C20FEDF */ jal func_8083FB7C +/* 1A114 8084C324 10800005 */ beq $a0, $zero, .L8084C33C +/* 1A118 8084C328 8FA5008C */ lw $a1, 0x008C($sp) +/* 1A11C 8084C32C 0C20FEDF */ jal func_8083FB7C /* 1A120 8084C330 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 1A124 8084C334 10000032 */ beq $zero, $zero, .L8084C400 +/* 1A124 8084C334 10000032 */ beq $zero, $zero, .L8084C400 /* 1A128 8084C338 860F0850 */ lh $t7, 0x0850($s0) ## 00000850 .L8084C33C: -/* 1A12C 8084C33C 10600009 */ beq $v1, $zero, .L8084C364 +/* 1A12C 8084C33C 10600009 */ beq $v1, $zero, .L8084C364 /* 1A130 8084C340 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 1A134 8084C344 8E0F0678 */ lw $t7, 0x0678($s0) ## 00000678 /* 1A138 8084C348 86030850 */ lh $v1, 0x0850($s0) ## 00000850 @@ -299,67 +299,67 @@ glabel func_8084BF1C /* 1A150 8084C360 A61901F0 */ sh $t9, 0x01F0($s0) ## 000001F0 .L8084C364: /* 1A154 8084C364 8E0A0678 */ lw $t2, 0x0678($s0) ## 00000678 -/* 1A158 8084C368 00036080 */ sll $t4, $v1, 2 -/* 1A15C 8084C36C 8FA6008C */ lw $a2, 0x008C($sp) -/* 1A160 8084C370 014C5821 */ addu $t3, $t2, $t4 -/* 1A164 8084C374 0C20FC1C */ jal func_8083F070 +/* 1A158 8084C368 00036080 */ sll $t4, $v1, 2 +/* 1A15C 8084C36C 8FA6008C */ lw $a2, 0x008C($sp) +/* 1A160 8084C370 014C5821 */ addu $t3, $t2, $t4 +/* 1A164 8084C374 0C20FC1C */ jal func_8083F070 /* 1A168 8084C378 8D6500C4 */ lw $a1, 0x00C4($t3) ## 000000C4 /* 1A16C 8084C37C 240D0001 */ addiu $t5, $zero, 0x0001 ## $t5 = 00000001 -/* 1A170 8084C380 1000001E */ beq $zero, $zero, .L8084C3FC +/* 1A170 8084C380 1000001E */ beq $zero, $zero, .L8084C3FC /* 1A174 8084C384 A60D0850 */ sh $t5, 0x0850($s0) ## 00000850 /* 1A178 8084C388 8E0E0678 */ lw $t6, 0x0678($s0) ## 00000678 .L8084C38C: -/* 1A17C 8084C38C 01E27823 */ subu $t7, $t7, $v0 -/* 1A180 8084C390 000F7840 */ sll $t7, $t7, 1 -/* 1A184 8084C394 01CFC021 */ addu $t8, $t6, $t7 +/* 1A17C 8084C38C 01E27823 */ subu $t7, $t7, $v0 +/* 1A180 8084C390 000F7840 */ sll $t7, $t7, 1 +/* 1A184 8084C394 01CFC021 */ addu $t8, $t6, $t7 /* 1A188 8084C398 8B0A0062 */ lwl $t2, 0x0062($t8) ## 00000062 /* 1A18C 8084C39C 9B0A0065 */ lwr $t2, 0x0065($t8) ## 00000065 /* 1A190 8084C3A0 8E0C0678 */ lw $t4, 0x0678($s0) ## 00000678 -/* 1A194 8084C3A4 00025880 */ sll $t3, $v0, 2 +/* 1A194 8084C3A4 00025880 */ sll $t3, $v0, 2 /* 1A198 8084C3A8 AA0A01EC */ swl $t2, 0x01EC($s0) ## 000001EC /* 1A19C 8084C3AC BA0A01EF */ swr $t2, 0x01EF($s0) ## 000001EF /* 1A1A0 8084C3B0 970A0066 */ lhu $t2, 0x0066($t8) ## 00000066 -/* 1A1A4 8084C3B4 018B6821 */ addu $t5, $t4, $t3 +/* 1A1A4 8084C3B4 018B6821 */ addu $t5, $t4, $t3 /* 1A1A8 8084C3B8 A60A01F0 */ sh $t2, 0x01F0($s0) ## 000001F0 /* 1A1AC 8084C3BC 8DA400AC */ lw $a0, 0x00AC($t5) ## 000000AD /* 1A1B0 8084C3C0 0C028800 */ jal SkelAnime_GetFrameCount - -/* 1A1B4 8084C3C4 AFA40054 */ sw $a0, 0x0054($sp) + +/* 1A1B4 8084C3C4 AFA40054 */ sw $a0, 0x0054($sp) /* 1A1B8 8084C3C8 44824000 */ mtc1 $v0, $f8 ## $f8 = 0.00 /* 1A1BC 8084C3CC 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 /* 1A1C0 8084C3D0 240E0002 */ addiu $t6, $zero, 0x0002 ## $t6 = 00000002 -/* 1A1C4 8084C3D4 468042A0 */ cvt.s.w $f10, $f8 -/* 1A1C8 8084C3D8 AFAE0018 */ sw $t6, 0x0018($sp) -/* 1A1CC 8084C3DC 8FA60054 */ lw $a2, 0x0054($sp) -/* 1A1D0 8084C3E0 8FA4008C */ lw $a0, 0x008C($sp) -/* 1A1D4 8084C3E4 8FA50030 */ lw $a1, 0x0030($sp) +/* 1A1C4 8084C3D4 468042A0 */ cvt.s.w $f10, $f8 +/* 1A1C8 8084C3D8 AFAE0018 */ sw $t6, 0x0018($sp) +/* 1A1CC 8084C3DC 8FA60054 */ lw $a2, 0x0054($sp) +/* 1A1D0 8084C3E0 8FA4008C */ lw $a0, 0x008C($sp) +/* 1A1D4 8084C3E4 8FA50030 */ lw $a1, 0x0030($sp) /* 1A1D8 8084C3E8 3C07BF80 */ lui $a3, 0xBF80 ## $a3 = BF800000 -/* 1A1DC 8084C3EC E7AA0010 */ swc1 $f10, 0x0010($sp) -/* 1A1E0 8084C3F0 E7A00014 */ swc1 $f0, 0x0014($sp) -/* 1A1E4 8084C3F4 0C028FC2 */ jal func_800A3F08 -/* 1A1E8 8084C3F8 E7A0001C */ swc1 $f0, 0x001C($sp) +/* 1A1DC 8084C3EC E7AA0010 */ swc1 $f10, 0x0010($sp) +/* 1A1E0 8084C3F0 E7A00014 */ swc1 $f0, 0x0014($sp) +/* 1A1E4 8084C3F4 0C028FC2 */ jal SkelAnime_ChangeLinkAnim +/* 1A1E8 8084C3F8 E7A0001C */ swc1 $f0, 0x001C($sp) .L8084C3FC: /* 1A1EC 8084C3FC 860F0850 */ lh $t7, 0x0850($s0) ## 00000850 .L8084C400: /* 1A1F0 8084C400 39F80001 */ xori $t8, $t7, 0x0001 ## $t8 = 00000001 -/* 1A1F4 8084C404 10000077 */ beq $zero, $zero, .L8084C5E4 +/* 1A1F4 8084C404 10000077 */ beq $zero, $zero, .L8084C5E4 /* 1A1F8 8084C408 A6180850 */ sh $t8, 0x0850($s0) ## 00000850 /* 1A1FC 8084C40C 8219084F */ lb $t9, 0x084F($s0) ## 0000084F .L8084C410: -/* 1A200 8084C410 53200035 */ beql $t9, $zero, .L8084C4E8 +/* 1A200 8084C410 53200035 */ beql $t9, $zero, .L8084C4E8 /* 1A204 8084C414 8E0D0680 */ lw $t5, 0x0680($s0) ## 00000680 -/* 1A208 8084C418 51200033 */ beql $t1, $zero, .L8084C4E8 +/* 1A208 8084C418 51200033 */ beql $t1, $zero, .L8084C4E8 /* 1A20C 8084C41C 8E0D0680 */ lw $t5, 0x0680($s0) ## 00000680 /* 1A210 8084C420 8E020678 */ lw $v0, 0x0678($s0) ## 00000678 -/* 1A214 8084C424 00035080 */ sll $t2, $v1, 2 -/* 1A218 8084C428 0003C080 */ sll $t8, $v1, 2 -/* 1A21C 8084C42C 004A6021 */ addu $t4, $v0, $t2 -/* 1A220 8084C430 19200010 */ blez $t1, .L8084C474 +/* 1A214 8084C424 00035080 */ sll $t2, $v1, 2 +/* 1A218 8084C428 0003C080 */ sll $t8, $v1, 2 +/* 1A21C 8084C42C 004A6021 */ addu $t4, $v0, $t2 +/* 1A220 8084C430 19200010 */ blez $t1, .L8084C474 /* 1A224 8084C434 8D8600BC */ lw $a2, 0x00BC($t4) ## 000000BC -/* 1A228 8084C438 00035880 */ sll $t3, $v1, 2 -/* 1A22C 8084C43C 01635823 */ subu $t3, $t3, $v1 -/* 1A230 8084C440 000B5840 */ sll $t3, $t3, 1 -/* 1A234 8084C444 004B6821 */ addu $t5, $v0, $t3 +/* 1A228 8084C438 00035880 */ sll $t3, $v1, 2 +/* 1A22C 8084C43C 01635823 */ subu $t3, $t3, $v1 +/* 1A230 8084C440 000B5840 */ sll $t3, $t3, 1 +/* 1A234 8084C444 004B6821 */ addu $t5, $v0, $t3 /* 1A238 8084C448 89AF007A */ lwl $t7, 0x007A($t5) ## 0000007A /* 1A23C 8084C44C 99AF007D */ lwr $t7, 0x007D($t5) ## 0000007D /* 1A240 8084C450 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 @@ -367,14 +367,14 @@ glabel func_8084BF1C /* 1A248 8084C458 BA0F01EF */ swr $t7, 0x01EF($s0) ## 000001EF /* 1A24C 8084C45C 95AF007E */ lhu $t7, 0x007E($t5) ## 0000007E /* 1A250 8084C460 A60F01F0 */ sh $t7, 0x01F0($s0) ## 000001F0 -/* 1A254 8084C464 0C20C899 */ jal func_80832264 -/* 1A258 8084C468 8FA4008C */ lw $a0, 0x008C($sp) -/* 1A25C 8084C46C 1000005E */ beq $zero, $zero, .L8084C5E8 -/* 1A260 8084C470 8FBF002C */ lw $ra, 0x002C($sp) +/* 1A254 8084C464 0C20C899 */ jal func_80832264 +/* 1A258 8084C468 8FA4008C */ lw $a0, 0x008C($sp) +/* 1A25C 8084C46C 1000005E */ beq $zero, $zero, .L8084C5E8 +/* 1A260 8084C470 8FBF002C */ lw $ra, 0x002C($sp) .L8084C474: -/* 1A264 8084C474 0303C023 */ subu $t8, $t8, $v1 -/* 1A268 8084C478 0018C040 */ sll $t8, $t8, 1 -/* 1A26C 8084C47C 0058C821 */ addu $t9, $v0, $t8 +/* 1A264 8084C474 0303C023 */ subu $t8, $t8, $v1 +/* 1A268 8084C478 0018C040 */ sll $t8, $t8, 1 +/* 1A26C 8084C47C 0058C821 */ addu $t9, $v0, $t8 /* 1A270 8084C480 8B2C0086 */ lwl $t4, 0x0086($t9) ## 00000086 /* 1A274 8084C484 9B2C0089 */ lwr $t4, 0x0089($t9) ## 00000089 /* 1A278 8084C488 00C02025 */ or $a0, $a2, $zero ## $a0 = 00000000 @@ -383,101 +383,101 @@ glabel func_8084BF1C /* 1A284 8084C494 972C008A */ lhu $t4, 0x008A($t9) ## 0000008A /* 1A288 8084C498 A60C01F0 */ sh $t4, 0x01F0($s0) ## 000001F0 /* 1A28C 8084C49C 0C028800 */ jal SkelAnime_GetFrameCount - -/* 1A290 8084C4A0 AFA60050 */ sw $a2, 0x0050($sp) + +/* 1A290 8084C4A0 AFA60050 */ sw $a2, 0x0050($sp) /* 1A294 8084C4A4 44828000 */ mtc1 $v0, $f16 ## $f16 = 0.00 /* 1A298 8084C4A8 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 /* 1A29C 8084C4AC 44803000 */ mtc1 $zero, $f6 ## $f6 = 0.00 -/* 1A2A0 8084C4B0 468084A0 */ cvt.s.w $f18, $f16 +/* 1A2A0 8084C4B0 468084A0 */ cvt.s.w $f18, $f16 /* 1A2A4 8084C4B4 240B0002 */ addiu $t3, $zero, 0x0002 ## $t3 = 00000002 -/* 1A2A8 8084C4B8 AFAB0018 */ sw $t3, 0x0018($sp) -/* 1A2AC 8084C4BC 8FA60050 */ lw $a2, 0x0050($sp) -/* 1A2B0 8084C4C0 8FA4008C */ lw $a0, 0x008C($sp) -/* 1A2B4 8084C4C4 8FA50030 */ lw $a1, 0x0030($sp) -/* 1A2B8 8084C4C8 E7B20010 */ swc1 $f18, 0x0010($sp) +/* 1A2A8 8084C4B8 AFAB0018 */ sw $t3, 0x0018($sp) +/* 1A2AC 8084C4BC 8FA60050 */ lw $a2, 0x0050($sp) +/* 1A2B0 8084C4C0 8FA4008C */ lw $a0, 0x008C($sp) +/* 1A2B4 8084C4C4 8FA50030 */ lw $a1, 0x0030($sp) +/* 1A2B8 8084C4C8 E7B20010 */ swc1 $f18, 0x0010($sp) /* 1A2BC 8084C4CC 3C07BF80 */ lui $a3, 0xBF80 ## $a3 = BF800000 -/* 1A2C0 8084C4D0 E7A40014 */ swc1 $f4, 0x0014($sp) -/* 1A2C4 8084C4D4 0C028FC2 */ jal func_800A3F08 -/* 1A2C8 8084C4D8 E7A6001C */ swc1 $f6, 0x001C($sp) -/* 1A2CC 8084C4DC 10000042 */ beq $zero, $zero, .L8084C5E8 -/* 1A2D0 8084C4E0 8FBF002C */ lw $ra, 0x002C($sp) +/* 1A2C0 8084C4D0 E7A40014 */ swc1 $f4, 0x0014($sp) +/* 1A2C4 8084C4D4 0C028FC2 */ jal SkelAnime_ChangeLinkAnim +/* 1A2C8 8084C4D8 E7A6001C */ swc1 $f6, 0x001C($sp) +/* 1A2CC 8084C4DC 10000042 */ beq $zero, $zero, .L8084C5E8 +/* 1A2D0 8084C4E0 8FBF002C */ lw $ra, 0x002C($sp) /* 1A2D4 8084C4E4 8E0D0680 */ lw $t5, 0x0680($s0) ## 00000680 .L8084C4E8: /* 1A2D8 8084C4E8 35AE1000 */ ori $t6, $t5, 0x1000 ## $t6 = 00001000 -/* 1A2DC 8084C4EC 1000003D */ beq $zero, $zero, .L8084C5E4 +/* 1A2DC 8084C4EC 1000003D */ beq $zero, $zero, .L8084C5E4 /* 1A2E0 8084C4F0 AE0E0680 */ sw $t6, 0x0680($s0) ## 00000680 .L8084C4F4: /* 1A2E4 8084C4F4 86030850 */ lh $v1, 0x0850($s0) ## 00000850 /* 1A2E8 8084C4F8 2401FFFE */ addiu $at, $zero, 0xFFFE ## $at = FFFFFFFE -/* 1A2EC 8084C4FC 04630026 */ bgezl $v1, .L8084C598 +/* 1A2EC 8084C4FC 04630026 */ bgezl $v1, .L8084C598 /* 1A2F0 8084C500 44804000 */ mtc1 $zero, $f8 ## $f8 = 0.00 -/* 1A2F4 8084C504 1461000B */ bne $v1, $at, .L8084C534 +/* 1A2F4 8084C504 1461000B */ bne $v1, $at, .L8084C534 /* 1A2F8 8084C508 260401B4 */ addiu $a0, $s0, 0x01B4 ## $a0 = 000001B4 /* 1A2FC 8084C50C 3C054160 */ lui $a1, 0x4160 ## $a1 = 41600000 -/* 1A300 8084C510 0C02914C */ jal func_800A4530 -/* 1A304 8084C514 AFA40030 */ sw $a0, 0x0030($sp) -/* 1A308 8084C518 1440001A */ bne $v0, $zero, .L8084C584 -/* 1A30C 8084C51C 8FA40030 */ lw $a0, 0x0030($sp) -/* 1A310 8084C520 0C02914C */ jal func_800A4530 +/* 1A300 8084C510 0C02914C */ jal func_800A4530 +/* 1A304 8084C514 AFA40030 */ sw $a0, 0x0030($sp) +/* 1A308 8084C518 1440001A */ bne $v0, $zero, .L8084C584 +/* 1A30C 8084C51C 8FA40030 */ lw $a0, 0x0030($sp) +/* 1A310 8084C520 0C02914C */ jal func_800A4530 /* 1A314 8084C524 3C0541E8 */ lui $a1, 0x41E8 ## $a1 = 41E80000 -/* 1A318 8084C528 14400016 */ bne $v0, $zero, .L8084C584 +/* 1A318 8084C528 14400016 */ bne $v0, $zero, .L8084C584 /* 1A31C 8084C52C 00000000 */ nop /* 1A320 8084C530 86030850 */ lh $v1, 0x0850($s0) ## 00000850 .L8084C534: /* 1A324 8084C534 2401FFFC */ addiu $at, $zero, 0xFFFC ## $at = FFFFFFFC -/* 1A328 8084C538 1461002A */ bne $v1, $at, .L8084C5E4 +/* 1A328 8084C538 1461002A */ bne $v1, $at, .L8084C5E4 /* 1A32C 8084C53C 260401B4 */ addiu $a0, $s0, 0x01B4 ## $a0 = 000001B4 /* 1A330 8084C540 3C0541B0 */ lui $a1, 0x41B0 ## $a1 = 41B00000 -/* 1A334 8084C544 0C02914C */ jal func_800A4530 -/* 1A338 8084C548 AFA40030 */ sw $a0, 0x0030($sp) -/* 1A33C 8084C54C 1440000D */ bne $v0, $zero, .L8084C584 -/* 1A340 8084C550 8FA40030 */ lw $a0, 0x0030($sp) -/* 1A344 8084C554 0C02914C */ jal func_800A4530 +/* 1A334 8084C544 0C02914C */ jal func_800A4530 +/* 1A338 8084C548 AFA40030 */ sw $a0, 0x0030($sp) +/* 1A33C 8084C54C 1440000D */ bne $v0, $zero, .L8084C584 +/* 1A340 8084C550 8FA40030 */ lw $a0, 0x0030($sp) +/* 1A344 8084C554 0C02914C */ jal func_800A4530 /* 1A348 8084C558 3C05420C */ lui $a1, 0x420C ## $a1 = 420C0000 -/* 1A34C 8084C55C 14400009 */ bne $v0, $zero, .L8084C584 -/* 1A350 8084C560 8FA40030 */ lw $a0, 0x0030($sp) -/* 1A354 8084C564 0C02914C */ jal func_800A4530 +/* 1A34C 8084C55C 14400009 */ bne $v0, $zero, .L8084C584 +/* 1A350 8084C560 8FA40030 */ lw $a0, 0x0030($sp) +/* 1A354 8084C564 0C02914C */ jal func_800A4530 /* 1A358 8084C568 3C054244 */ lui $a1, 0x4244 ## $a1 = 42440000 -/* 1A35C 8084C56C 14400005 */ bne $v0, $zero, .L8084C584 -/* 1A360 8084C570 8FA40030 */ lw $a0, 0x0030($sp) -/* 1A364 8084C574 0C02914C */ jal func_800A4530 +/* 1A35C 8084C56C 14400005 */ bne $v0, $zero, .L8084C584 +/* 1A360 8084C570 8FA40030 */ lw $a0, 0x0030($sp) +/* 1A364 8084C574 0C02914C */ jal func_800A4530 /* 1A368 8084C578 3C05425C */ lui $a1, 0x425C ## $a1 = 425C0000 -/* 1A36C 8084C57C 5040001A */ beql $v0, $zero, .L8084C5E8 -/* 1A370 8084C580 8FBF002C */ lw $ra, 0x002C($sp) +/* 1A36C 8084C57C 5040001A */ beql $v0, $zero, .L8084C5E8 +/* 1A370 8084C580 8FBF002C */ lw $ra, 0x002C($sp) .L8084C584: -/* 1A374 8084C584 0C212FB9 */ jal func_8084BEE4 +/* 1A374 8084C584 0C212FB9 */ jal func_8084BEE4 /* 1A378 8084C588 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 1A37C 8084C58C 10000016 */ beq $zero, $zero, .L8084C5E8 -/* 1A380 8084C590 8FBF002C */ lw $ra, 0x002C($sp) +/* 1A37C 8084C58C 10000016 */ beq $zero, $zero, .L8084C5E8 +/* 1A380 8084C590 8FBF002C */ lw $ra, 0x002C($sp) /* 1A384 8084C594 44804000 */ mtc1 $zero, $f8 ## $f8 = 0.00 .L8084C598: /* 1A388 8084C598 C60A01D0 */ lwc1 $f10, 0x01D0($s0) ## 000001D0 /* 1A38C 8084C59C 260401B4 */ addiu $a0, $s0, 0x01B4 ## $a0 = 000001B4 /* 1A390 8084C5A0 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000 -/* 1A394 8084C5A4 460A403C */ c.lt.s $f8, $f10 +/* 1A394 8084C5A4 460A403C */ c.lt.s $f8, $f10 /* 1A398 8084C5A8 00000000 */ nop -/* 1A39C 8084C5AC 45020005 */ bc1fl .L8084C5C4 +/* 1A39C 8084C5AC 45020005 */ bc1fl .L8084C5C4 /* 1A3A0 8084C5B0 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 /* 1A3A4 8084C5B4 44810000 */ mtc1 $at, $f0 ## $f0 = 20.00 -/* 1A3A8 8084C5B8 10000004 */ beq $zero, $zero, .L8084C5CC -/* 1A3AC 8084C5BC 44050000 */ mfc1 $a1, $f0 +/* 1A3A8 8084C5B8 10000004 */ beq $zero, $zero, .L8084C5CC +/* 1A3AC 8084C5BC 44050000 */ mfc1 $a1, $f0 /* 1A3B0 8084C5C0 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 .L8084C5C4: /* 1A3B4 8084C5C4 00000000 */ nop -/* 1A3B8 8084C5C8 44050000 */ mfc1 $a1, $f0 +/* 1A3B8 8084C5C8 44050000 */ mfc1 $a1, $f0 .L8084C5CC: -/* 1A3BC 8084C5CC 0C02914C */ jal func_800A4530 +/* 1A3BC 8084C5CC 0C02914C */ jal func_800A4530 /* 1A3C0 8084C5D0 00000000 */ nop -/* 1A3C4 8084C5D4 50400004 */ beql $v0, $zero, .L8084C5E8 -/* 1A3C8 8084C5D8 8FBF002C */ lw $ra, 0x002C($sp) -/* 1A3CC 8084C5DC 0C212FB9 */ jal func_8084BEE4 +/* 1A3C4 8084C5D4 50400004 */ beql $v0, $zero, .L8084C5E8 +/* 1A3C8 8084C5D8 8FBF002C */ lw $ra, 0x002C($sp) +/* 1A3CC 8084C5DC 0C212FB9 */ jal func_8084BEE4 /* 1A3D0 8084C5E0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 .L8084C5E4: -/* 1A3D4 8084C5E4 8FBF002C */ lw $ra, 0x002C($sp) +/* 1A3D4 8084C5E4 8FBF002C */ lw $ra, 0x002C($sp) .L8084C5E8: -/* 1A3D8 8084C5E8 8FB00028 */ lw $s0, 0x0028($sp) +/* 1A3D8 8084C5E8 8FB00028 */ lw $s0, 0x0028($sp) /* 1A3DC 8084C5EC 27BD0088 */ addiu $sp, $sp, 0x0088 ## $sp = 00000000 -/* 1A3E0 8084C5F0 03E00008 */ jr $ra +/* 1A3E0 8084C5F0 03E00008 */ jr $ra /* 1A3E4 8084C5F4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084CC98.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084CC98.s index 71878a0298..2f48bfb755 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084CC98.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_8084CC98.s @@ -1,88 +1,88 @@ glabel func_8084CC98 /* 1AA88 8084CC98 27BDFFB0 */ addiu $sp, $sp, 0xFFB0 ## $sp = FFFFFFB0 -/* 1AA8C 8084CC9C AFBF0024 */ sw $ra, 0x0024($sp) -/* 1AA90 8084CCA0 AFB00020 */ sw $s0, 0x0020($sp) -/* 1AA94 8084CCA4 AFA50054 */ sw $a1, 0x0054($sp) +/* 1AA8C 8084CC9C AFBF0024 */ sw $ra, 0x0024($sp) +/* 1AA90 8084CCA0 AFB00020 */ sw $s0, 0x0020($sp) +/* 1AA94 8084CCA4 AFA50054 */ sw $a1, 0x0054($sp) /* 1AA98 8084CCA8 8C8E0440 */ lw $t6, 0x0440($a0) ## 00000440 /* 1AA9C 8084CCAC 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 /* 1AAA0 8084CCB0 3C053F80 */ lui $a1, 0x3F80 ## $a1 = 3F800000 -/* 1AAA4 8084CCB4 AFAE004C */ sw $t6, 0x004C($sp) +/* 1AAA4 8084CCB4 AFAE004C */ sw $t6, 0x004C($sp) /* 1AAA8 8084CCB8 8C8F0680 */ lw $t7, 0x0680($a0) ## 00000680 /* 1AAAC 8084CCBC 3C064120 */ lui $a2, 0x4120 ## $a2 = 41200000 /* 1AAB0 8084CCC0 35F80040 */ ori $t8, $t7, 0x0040 ## $t8 = 00000040 -/* 1AAB4 8084CCC4 0C2132FD */ jal func_8084CBF4 +/* 1AAB4 8084CCC4 0C2132FD */ jal func_8084CBF4 /* 1AAB8 8084CCC8 AC980680 */ sw $t8, 0x0680($a0) ## 00000680 /* 1AABC 8084CCCC 86190850 */ lh $t9, 0x0850($s0) ## 00000850 /* 1AAC0 8084CCD0 260501B4 */ addiu $a1, $s0, 0x01B4 ## $a1 = 000001B4 -/* 1AAC4 8084CCD4 8FA40054 */ lw $a0, 0x0054($sp) -/* 1AAC8 8084CCD8 1720003C */ bne $t9, $zero, .L8084CDCC +/* 1AAC4 8084CCD4 8FA40054 */ lw $a0, 0x0054($sp) +/* 1AAC8 8084CCD8 1720003C */ bne $t9, $zero, .L8084CDCC /* 1AACC 8084CCDC 00000000 */ nop -/* 1AAD0 8084CCE0 8FA40054 */ lw $a0, 0x0054($sp) -/* 1AAD4 8084CCE4 0C028EF0 */ jal func_800A3BC0 -/* 1AAD8 8084CCE8 AFA50030 */ sw $a1, 0x0030($sp) -/* 1AADC 8084CCEC 10400007 */ beq $v0, $zero, .L8084CD0C +/* 1AAD0 8084CCE0 8FA40054 */ lw $a0, 0x0054($sp) +/* 1AAD4 8084CCE4 0C028EF0 */ jal func_800A3BC0 +/* 1AAD8 8084CCE8 AFA50030 */ sw $a1, 0x0030($sp) +/* 1AADC 8084CCEC 10400007 */ beq $v0, $zero, .L8084CD0C /* 1AAE0 8084CCF0 3C0C8085 */ lui $t4, %hi(D_80854998) ## $t4 = 80850000 /* 1AAE4 8084CCF4 3C080400 */ lui $t0, 0x0400 ## $t0 = 04000000 /* 1AAE8 8084CCF8 250833B8 */ addiu $t0, $t0, 0x33B8 ## $t0 = 040033B8 /* 1AAEC 8084CCFC 24090063 */ addiu $t1, $zero, 0x0063 ## $t1 = 00000063 /* 1AAF0 8084CD00 AE0801BC */ sw $t0, 0x01BC($s0) ## 000001BC -/* 1AAF4 8084CD04 100001B2 */ beq $zero, $zero, .L8084D3D0 +/* 1AAF4 8084CD04 100001B2 */ beq $zero, $zero, .L8084D3D0 /* 1AAF8 8084CD08 A6090850 */ sh $t1, 0x0850($s0) ## 00000850 .L8084CD0C: /* 1AAFC 8084CD0C 820A043C */ lb $t2, 0x043C($s0) ## 0000043C /* 1AB00 8084CD10 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 /* 1AB04 8084CD14 258C4998 */ addiu $t4, $t4, %lo(D_80854998) ## $t4 = 80854998 -/* 1AB08 8084CD18 05410003 */ bgez $t2, .L8084CD28 +/* 1AB08 8084CD18 05410003 */ bgez $t2, .L8084CD28 /* 1AB0C 8084CD1C 3C014F80 */ lui $at, 0x4F80 ## $at = 4F800000 -/* 1AB10 8084CD20 10000001 */ beq $zero, $zero, .L8084CD28 +/* 1AB10 8084CD20 10000001 */ beq $zero, $zero, .L8084CD28 /* 1AB14 8084CD24 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 .L8084CD28: -/* 1AB18 8084CD28 00025840 */ sll $t3, $v0, 1 -/* 1AB1C 8084CD2C 016C1821 */ addu $v1, $t3, $t4 +/* 1AB18 8084CD28 00025840 */ sll $t3, $v0, 1 +/* 1AB1C 8084CD2C 016C1821 */ addu $v1, $t3, $t4 /* 1AB20 8084CD30 906D0000 */ lbu $t5, 0x0000($v1) ## 00000000 -/* 1AB24 8084CD34 8FA40030 */ lw $a0, 0x0030($sp) +/* 1AB24 8084CD34 8FA40030 */ lw $a0, 0x0030($sp) /* 1AB28 8084CD38 448D2000 */ mtc1 $t5, $f4 ## $f4 = 0.00 -/* 1AB2C 8084CD3C 05A10004 */ bgez $t5, .L8084CD50 -/* 1AB30 8084CD40 46802120 */ cvt.s.w $f4, $f4 +/* 1AB2C 8084CD3C 05A10004 */ bgez $t5, .L8084CD50 +/* 1AB30 8084CD40 46802120 */ cvt.s.w $f4, $f4 /* 1AB34 8084CD44 44813000 */ mtc1 $at, $f6 ## $f6 = 4294967296.00 /* 1AB38 8084CD48 00000000 */ nop -/* 1AB3C 8084CD4C 46062100 */ add.s $f4, $f4, $f6 +/* 1AB3C 8084CD4C 46062100 */ add.s $f4, $f4, $f6 .L8084CD50: -/* 1AB40 8084CD50 44052000 */ mfc1 $a1, $f4 -/* 1AB44 8084CD54 0C02914C */ jal func_800A4530 -/* 1AB48 8084CD58 AFA3002C */ sw $v1, 0x002C($sp) -/* 1AB4C 8084CD5C 10400006 */ beq $v0, $zero, .L8084CD78 -/* 1AB50 8084CD60 8FA3002C */ lw $v1, 0x002C($sp) +/* 1AB40 8084CD50 44052000 */ mfc1 $a1, $f4 +/* 1AB44 8084CD54 0C02914C */ jal func_800A4530 +/* 1AB48 8084CD58 AFA3002C */ sw $v1, 0x002C($sp) +/* 1AB4C 8084CD5C 10400006 */ beq $v0, $zero, .L8084CD78 +/* 1AB50 8084CD60 8FA3002C */ lw $v1, 0x002C($sp) /* 1AB54 8084CD64 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 1AB58 8084CD68 0C00BDF7 */ jal func_8002F7DC +/* 1AB58 8084CD68 0C00BDF7 */ jal func_8002F7DC /* 1AB5C 8084CD6C 24050831 */ addiu $a1, $zero, 0x0831 ## $a1 = 00000831 -/* 1AB60 8084CD70 10000198 */ beq $zero, $zero, .L8084D3D4 -/* 1AB64 8084CD74 8FBF0024 */ lw $ra, 0x0024($sp) +/* 1AB60 8084CD70 10000198 */ beq $zero, $zero, .L8084D3D4 +/* 1AB64 8084CD74 8FBF0024 */ lw $ra, 0x0024($sp) .L8084CD78: /* 1AB68 8084CD78 906E0001 */ lbu $t6, 0x0001($v1) ## 00000001 -/* 1AB6C 8084CD7C 8FA40030 */ lw $a0, 0x0030($sp) +/* 1AB6C 8084CD7C 8FA40030 */ lw $a0, 0x0030($sp) /* 1AB70 8084CD80 3C014F80 */ lui $at, 0x4F80 ## $at = 4F800000 /* 1AB74 8084CD84 448E4000 */ mtc1 $t6, $f8 ## $f8 = 0.00 -/* 1AB78 8084CD88 05C10004 */ bgez $t6, .L8084CD9C -/* 1AB7C 8084CD8C 46804220 */ cvt.s.w $f8, $f8 +/* 1AB78 8084CD88 05C10004 */ bgez $t6, .L8084CD9C +/* 1AB7C 8084CD8C 46804220 */ cvt.s.w $f8, $f8 /* 1AB80 8084CD90 44815000 */ mtc1 $at, $f10 ## $f10 = 4294967296.00 /* 1AB84 8084CD94 00000000 */ nop -/* 1AB88 8084CD98 460A4200 */ add.s $f8, $f8, $f10 +/* 1AB88 8084CD98 460A4200 */ add.s $f8, $f8, $f10 .L8084CD9C: -/* 1AB8C 8084CD9C 44054000 */ mfc1 $a1, $f8 -/* 1AB90 8084CDA0 0C02914C */ jal func_800A4530 +/* 1AB8C 8084CD9C 44054000 */ mfc1 $a1, $f8 +/* 1AB90 8084CDA0 0C02914C */ jal func_800A4530 /* 1AB94 8084CDA4 00000000 */ nop -/* 1AB98 8084CDA8 10400189 */ beq $v0, $zero, .L8084D3D0 -/* 1AB9C 8084CDAC 8FA40054 */ lw $a0, 0x0054($sp) -/* 1ABA0 8084CDB0 0C00B79D */ jal func_8002DE74 +/* 1AB98 8084CDA8 10400189 */ beq $v0, $zero, .L8084D3D0 +/* 1AB9C 8084CDAC 8FA40054 */ lw $a0, 0x0054($sp) +/* 1ABA0 8084CDB0 0C00B79D */ jal func_8002DE74 /* 1ABA4 8084CDB4 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 1ABA8 8084CDB8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 1ABAC 8084CDBC 0C00BDF7 */ jal func_8002F7DC +/* 1ABAC 8084CDBC 0C00BDF7 */ jal func_8002F7DC /* 1ABB0 8084CDC0 24050832 */ addiu $a1, $zero, 0x0832 ## $a1 = 00000832 -/* 1ABB4 8084CDC4 10000183 */ beq $zero, $zero, .L8084D3D4 -/* 1ABB8 8084CDC8 8FBF0024 */ lw $ra, 0x0024($sp) +/* 1ABB4 8084CDC4 10000183 */ beq $zero, $zero, .L8084D3D4 +/* 1ABB8 8084CDC8 8FBF0024 */ lw $ra, 0x0024($sp) .L8084CDCC: -/* 1ABBC 8084CDCC 0C00B79D */ jal func_8002DE74 +/* 1ABBC 8084CDCC 0C00B79D */ jal func_8002DE74 /* 1ABC0 8084CDD0 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 1ABC4 8084CDD4 3C0F8085 */ lui $t7, %hi(D_8085499C) ## $t7 = 80850000 /* 1ABC8 8084CDD8 25EF499C */ addiu $t7, $t7, %lo(D_8085499C) ## $t7 = 8085499C @@ -92,19 +92,19 @@ glabel func_8084CC98 /* 1ABD8 8084CDE8 BA1901EF */ swr $t9, 0x01EF($s0) ## 000001EF /* 1ABDC 8084CDEC 95F90004 */ lhu $t9, 0x0004($t7) ## 808549A0 /* 1ABE0 8084CDF0 A61901F0 */ sh $t9, 0x01F0($s0) ## 000001F0 -/* 1ABE4 8084CDF4 8FA8004C */ lw $t0, 0x004C($sp) +/* 1ABE4 8084CDF4 8FA8004C */ lw $t0, 0x004C($sp) /* 1ABE8 8084CDF8 8D030210 */ lw $v1, 0x0210($t0) ## 00000210 -/* 1ABEC 8084CDFC 10430039 */ beq $v0, $v1, .L8084CEE4 -/* 1ABF0 8084CE00 28610002 */ slti $at, $v1, 0x0002 -/* 1ABF4 8084CE04 10200003 */ beq $at, $zero, .L8084CE14 -/* 1ABF8 8084CE08 28410002 */ slti $at, $v0, 0x0002 -/* 1ABFC 8084CE0C 54200036 */ bnel $at, $zero, .L8084CEE8 +/* 1ABEC 8084CDFC 10430039 */ beq $v0, $v1, .L8084CEE4 +/* 1ABF0 8084CE00 28610002 */ slti $at, $v1, 0x0002 +/* 1ABF4 8084CE04 10200003 */ beq $at, $zero, .L8084CE14 +/* 1ABF8 8084CE08 28410002 */ slti $at, $v0, 0x0002 +/* 1ABFC 8084CE0C 54200036 */ bnel $at, $zero, .L8084CEE8 /* 1AC00 8084CE10 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 .L8084CE14: -/* 1AC04 8084CE14 00031400 */ sll $v0, $v1, 16 -/* 1AC08 8084CE18 00021403 */ sra $v0, $v0, 16 -/* 1AC0C 8084CE1C 28410002 */ slti $at, $v0, 0x0002 -/* 1AC10 8084CE20 1020001D */ beq $at, $zero, .L8084CE98 +/* 1AC04 8084CE14 00031400 */ sll $v0, $v1, 16 +/* 1AC08 8084CE18 00021403 */ sra $v0, $v0, 16 +/* 1AC0C 8084CE1C 28410002 */ slti $at, $v0, 0x0002 +/* 1AC10 8084CE20 1020001D */ beq $at, $zero, .L8084CE98 /* 1AC14 8084CE24 A6020850 */ sh $v0, 0x0850($s0) ## 00000850 /* 1AC18 8084CE28 0C03F66B */ jal Math_Rand_ZeroOne ## Rand.Next() float @@ -112,235 +112,235 @@ glabel func_8084CC98 /* 1AC20 8084CE30 24090001 */ addiu $t1, $zero, 0x0001 ## $t1 = 00000001 /* 1AC24 8084CE34 A6090850 */ sh $t1, 0x0850($s0) ## 00000850 /* 1AC28 8084CE38 3C018085 */ lui $at, %hi(D_80855530) ## $at = 80850000 -/* 1AC2C 8084CE3C C4305530 */ lwc1 $f16, %lo(D_80855530)($at) +/* 1AC2C 8084CE3C C4305530 */ lwc1 $f16, %lo(D_80855530)($at) /* 1AC30 8084CE40 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 /* 1AC34 8084CE44 3C018085 */ lui $at, %hi(D_80855534) ## $at = 80850000 -/* 1AC38 8084CE48 4610003C */ c.lt.s $f0, $f16 -/* 1AC3C 8084CE4C 8FA40054 */ lw $a0, 0x0054($sp) +/* 1AC38 8084CE48 4610003C */ c.lt.s $f0, $f16 +/* 1AC3C 8084CE4C 8FA40054 */ lw $a0, 0x0054($sp) /* 1AC40 8084CE50 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 1AC44 8084CE54 3C068085 */ lui $a2, %hi(D_8085498C) ## $a2 = 80850000 -/* 1AC48 8084CE58 45000003 */ bc1f .L8084CE68 +/* 1AC48 8084CE58 45000003 */ bc1f .L8084CE68 /* 1AC4C 8084CE5C 00000000 */ nop -/* 1AC50 8084CE60 10000007 */ beq $zero, $zero, .L8084CE80 +/* 1AC50 8084CE60 10000007 */ beq $zero, $zero, .L8084CE80 /* 1AC54 8084CE64 24020002 */ addiu $v0, $zero, 0x0002 ## $v0 = 00000002 .L8084CE68: -/* 1AC58 8084CE68 C4325534 */ lwc1 $f18, %lo(D_80855534)($at) -/* 1AC5C 8084CE6C 4612003C */ c.lt.s $f0, $f18 +/* 1AC58 8084CE68 C4325534 */ lwc1 $f18, %lo(D_80855534)($at) +/* 1AC5C 8084CE6C 4612003C */ c.lt.s $f0, $f18 /* 1AC60 8084CE70 00000000 */ nop -/* 1AC64 8084CE74 45020003 */ bc1fl .L8084CE84 -/* 1AC68 8084CE78 00025080 */ sll $t2, $v0, 2 +/* 1AC64 8084CE74 45020003 */ bc1fl .L8084CE84 +/* 1AC68 8084CE78 00025080 */ sll $t2, $v0, 2 /* 1AC6C 8084CE7C 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 .L8084CE80: -/* 1AC70 8084CE80 00025080 */ sll $t2, $v0, 2 +/* 1AC70 8084CE80 00025080 */ sll $t2, $v0, 2 .L8084CE84: -/* 1AC74 8084CE84 00CA3021 */ addu $a2, $a2, $t2 -/* 1AC78 8084CE88 0C20C899 */ jal func_80832264 -/* 1AC7C 8084CE8C 8CC6498C */ lw $a2, %lo(D_8085498C)($a2) -/* 1AC80 8084CE90 10000014 */ beq $zero, $zero, .L8084CEE4 +/* 1AC74 8084CE84 00CA3021 */ addu $a2, $a2, $t2 +/* 1AC78 8084CE88 0C20C899 */ jal func_80832264 +/* 1AC7C 8084CE8C 8CC6498C */ lw $a2, %lo(D_8085498C)($a2) +/* 1AC80 8084CE90 10000014 */ beq $zero, $zero, .L8084CEE4 /* 1AC84 8084CE94 86020850 */ lh $v0, 0x0850($s0) ## 00000850 .L8084CE98: /* 1AC88 8084CE98 860B0850 */ lh $t3, 0x0850($s0) ## 00000850 /* 1AC8C 8084CE9C 3C0D8085 */ lui $t5, %hi(D_8085493C) ## $t5 = 80850000 /* 1AC90 8084CEA0 260501B4 */ addiu $a1, $s0, 0x01B4 ## $a1 = 000001B4 -/* 1AC94 8084CEA4 000B6080 */ sll $t4, $t3, 2 -/* 1AC98 8084CEA8 01AC6821 */ addu $t5, $t5, $t4 -/* 1AC9C 8084CEAC 8DAD493C */ lw $t5, %lo(D_8085493C)($t5) +/* 1AC94 8084CEA4 000B6080 */ sll $t4, $t3, 2 +/* 1AC98 8084CEA8 01AC6821 */ addu $t5, $t5, $t4 +/* 1AC9C 8084CEAC 8DAD493C */ lw $t5, %lo(D_8085493C)($t5) /* 1ACA0 8084CEB0 3C064100 */ lui $a2, 0x4100 ## $a2 = 41000000 /* 1ACA4 8084CEB4 AE0D01BC */ sw $t5, 0x01BC($s0) ## 000001BC -/* 1ACA8 8084CEB8 0C028FBA */ jal func_800A3EE8 -/* 1ACAC 8084CEBC 8FA40054 */ lw $a0, 0x0054($sp) +/* 1ACA8 8084CEB8 0C028FBA */ jal SkelAnime_SetTransition +/* 1ACAC 8084CEBC 8FA40054 */ lw $a0, 0x0054($sp) /* 1ACB0 8084CEC0 86020850 */ lh $v0, 0x0850($s0) ## 00000850 -/* 1ACB4 8084CEC4 8FA40054 */ lw $a0, 0x0054($sp) -/* 1ACB8 8084CEC8 28410004 */ slti $at, $v0, 0x0004 -/* 1ACBC 8084CECC 50200006 */ beql $at, $zero, .L8084CEE8 +/* 1ACB4 8084CEC4 8FA40054 */ lw $a0, 0x0054($sp) +/* 1ACB8 8084CEC8 28410004 */ slti $at, $v0, 0x0004 +/* 1ACBC 8084CECC 50200006 */ beql $at, $zero, .L8084CEE8 /* 1ACC0 8084CED0 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 -/* 1ACC4 8084CED4 0C20D191 */ jal func_80834644 +/* 1ACC4 8084CED4 0C20D191 */ jal func_80834644 /* 1ACC8 8084CED8 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 1ACCC 8084CEDC A200084F */ sb $zero, 0x084F($s0) ## 0000084F /* 1ACD0 8084CEE0 86020850 */ lh $v0, 0x0850($s0) ## 00000850 .L8084CEE4: /* 1ACD4 8084CEE4 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 .L8084CEE8: -/* 1ACD8 8084CEE8 14410020 */ bne $v0, $at, .L8084CF6C -/* 1ACDC 8084CEEC 8FA8004C */ lw $t0, 0x004C($sp) +/* 1ACD8 8084CEE8 14410020 */ bne $v0, $at, .L8084CF6C +/* 1ACDC 8084CEEC 8FA8004C */ lw $t0, 0x004C($sp) /* 1ACE0 8084CEF0 3C0E8085 */ lui $t6, %hi(D_808535E0) ## $t6 = 80850000 -/* 1ACE4 8084CEF4 8DCE35E0 */ lw $t6, %lo(D_808535E0)($t6) -/* 1ACE8 8084CEF8 15C00005 */ bne $t6, $zero, .L8084CF10 +/* 1ACE4 8084CEF4 8DCE35E0 */ lw $t6, %lo(D_808535E0)($t6) +/* 1ACE8 8084CEF8 15C00005 */ bne $t6, $zero, .L8084CF10 /* 1ACEC 8084CEFC 00000000 */ nop -/* 1ACF0 8084CF00 0C20C893 */ jal func_8083224C -/* 1ACF4 8084CF04 8FA40054 */ lw $a0, 0x0054($sp) -/* 1ACF8 8084CF08 10400008 */ beq $v0, $zero, .L8084CF2C -/* 1ACFC 8084CF0C 8FA40054 */ lw $a0, 0x0054($sp) +/* 1ACF0 8084CF00 0C20C893 */ jal func_8083224C +/* 1ACF4 8084CF04 8FA40054 */ lw $a0, 0x0054($sp) +/* 1ACF8 8084CF08 10400008 */ beq $v0, $zero, .L8084CF2C +/* 1ACFC 8084CF0C 8FA40054 */ lw $a0, 0x0054($sp) .L8084CF10: /* 1AD00 8084CF10 3C060400 */ lui $a2, 0x0400 ## $a2 = 04000000 /* 1AD04 8084CF14 24C633C8 */ addiu $a2, $a2, 0x33C8 ## $a2 = 040033C8 -/* 1AD08 8084CF18 8FA40054 */ lw $a0, 0x0054($sp) -/* 1AD0C 8084CF1C 0C20C899 */ jal func_80832264 +/* 1AD08 8084CF18 8FA40054 */ lw $a0, 0x0054($sp) +/* 1AD0C 8084CF1C 0C20C899 */ jal func_80832264 /* 1AD10 8084CF20 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 1AD14 8084CF24 10000017 */ beq $zero, $zero, .L8084CF84 -/* 1AD18 8084CF28 8FA40054 */ lw $a0, 0x0054($sp) +/* 1AD14 8084CF24 10000017 */ beq $zero, $zero, .L8084CF84 +/* 1AD18 8084CF28 8FA40054 */ lw $a0, 0x0054($sp) .L8084CF2C: -/* 1AD1C 8084CF2C 0C028EF0 */ jal func_800A3BC0 +/* 1AD1C 8084CF2C 0C028EF0 */ jal func_800A3BC0 /* 1AD20 8084CF30 260501B4 */ addiu $a1, $s0, 0x01B4 ## $a1 = 000001B4 -/* 1AD24 8084CF34 10400003 */ beq $v0, $zero, .L8084CF44 +/* 1AD24 8084CF34 10400003 */ beq $v0, $zero, .L8084CF44 /* 1AD28 8084CF38 240F0063 */ addiu $t7, $zero, 0x0063 ## $t7 = 00000063 -/* 1AD2C 8084CF3C 10000010 */ beq $zero, $zero, .L8084CF80 +/* 1AD2C 8084CF3C 10000010 */ beq $zero, $zero, .L8084CF80 /* 1AD30 8084CF40 A60F0850 */ sh $t7, 0x0850($s0) ## 00000850 .L8084CF44: /* 1AD34 8084CF44 8E1901BC */ lw $t9, 0x01BC($s0) ## 000001BC /* 1AD38 8084CF48 3C180400 */ lui $t8, 0x0400 ## $t8 = 04000000 /* 1AD3C 8084CF4C 271833B8 */ addiu $t8, $t8, 0x33B8 ## $t8 = 040033B8 -/* 1AD40 8084CF50 1719000B */ bne $t8, $t9, .L8084CF80 +/* 1AD40 8084CF50 1719000B */ bne $t8, $t9, .L8084CF80 /* 1AD44 8084CF54 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 1AD48 8084CF58 3C058085 */ lui $a1, %hi(D_808549A4) ## $a1 = 80850000 -/* 1AD4C 8084CF5C 0C20CA49 */ jal func_80832924 +/* 1AD4C 8084CF5C 0C20CA49 */ jal func_80832924 /* 1AD50 8084CF60 24A549A4 */ addiu $a1, $a1, %lo(D_808549A4) ## $a1 = 808549A4 -/* 1AD54 8084CF64 10000007 */ beq $zero, $zero, .L8084CF84 -/* 1AD58 8084CF68 8FA40054 */ lw $a0, 0x0054($sp) +/* 1AD54 8084CF64 10000007 */ beq $zero, $zero, .L8084CF84 +/* 1AD58 8084CF68 8FA40054 */ lw $a0, 0x0054($sp) .L8084CF6C: /* 1AD5C 8084CF6C C5040214 */ lwc1 $f4, 0x0214($t0) ## 00000214 /* 1AD60 8084CF70 260501B4 */ addiu $a1, $s0, 0x01B4 ## $a1 = 000001B4 /* 1AD64 8084CF74 E60401CC */ swc1 $f4, 0x01CC($s0) ## 000001CC -/* 1AD68 8084CF78 0C028F27 */ jal func_800A3C9C -/* 1AD6C 8084CF7C 8FA40054 */ lw $a0, 0x0054($sp) +/* 1AD68 8084CF78 0C028F27 */ jal func_800A3C9C +/* 1AD6C 8084CF7C 8FA40054 */ lw $a0, 0x0054($sp) .L8084CF80: -/* 1AD70 8084CF80 8FA40054 */ lw $a0, 0x0054($sp) +/* 1AD70 8084CF80 8FA40054 */ lw $a0, 0x0054($sp) .L8084CF84: /* 1AD74 8084CF84 920501B4 */ lbu $a1, 0x01B4($s0) ## 000001B4 /* 1AD78 8084CF88 8E0601D8 */ lw $a2, 0x01D8($s0) ## 000001D8 -/* 1AD7C 8084CF8C 0C028D1E */ jal func_800A3478 +/* 1AD7C 8084CF8C 0C028D1E */ jal SkelAnime_LoadAnimationType1 /* 1AD80 8084CF90 8E0701D4 */ lw $a3, 0x01D4($s0) ## 000001D4 -/* 1AD84 8084CF94 8FA90054 */ lw $t1, 0x0054($sp) +/* 1AD84 8084CF94 8FA90054 */ lw $t1, 0x0054($sp) /* 1AD88 8084CF98 912A1D6C */ lbu $t2, 0x1D6C($t1) ## 00001D6C -/* 1AD8C 8084CF9C 55400005 */ bnel $t2, $zero, .L8084CFB4 +/* 1AD8C 8084CF9C 55400005 */ bnel $t2, $zero, .L8084CFB4 /* 1AD90 8084CFA0 920C0444 */ lbu $t4, 0x0444($s0) ## 00000444 /* 1AD94 8084CFA4 920B0444 */ lbu $t3, 0x0444($s0) ## 00000444 -/* 1AD98 8084CFA8 5160000A */ beql $t3, $zero, .L8084CFD4 +/* 1AD98 8084CFA8 5160000A */ beql $t3, $zero, .L8084CFD4 /* 1AD9C 8084CFAC 86020850 */ lh $v0, 0x0850($s0) ## 00000850 /* 1ADA0 8084CFB0 920C0444 */ lbu $t4, 0x0444($s0) ## 00000444 .L8084CFB4: /* 1ADA4 8084CFB4 24010007 */ addiu $at, $zero, 0x0007 ## $at = 00000007 -/* 1ADA8 8084CFB8 55810003 */ bnel $t4, $at, .L8084CFC8 +/* 1ADA8 8084CFB8 55810003 */ bnel $t4, $at, .L8084CFC8 /* 1ADAC 8084CFBC A20006AD */ sb $zero, 0x06AD($s0) ## 000006AD /* 1ADB0 8084CFC0 A2000444 */ sb $zero, 0x0444($s0) ## 00000444 /* 1ADB4 8084CFC4 A20006AD */ sb $zero, 0x06AD($s0) ## 000006AD .L8084CFC8: -/* 1ADB8 8084CFC8 10000011 */ beq $zero, $zero, .L8084D010 +/* 1ADB8 8084CFC8 10000011 */ beq $zero, $zero, .L8084D010 /* 1ADBC 8084CFCC A200084F */ sb $zero, 0x084F($s0) ## 0000084F /* 1ADC0 8084CFD0 86020850 */ lh $v0, 0x0850($s0) ## 00000850 .L8084CFD4: /* 1ADC4 8084CFD4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 1ADC8 8084CFD8 28410002 */ slti $at, $v0, 0x0002 -/* 1ADCC 8084CFDC 14200003 */ bne $at, $zero, .L8084CFEC -/* 1ADD0 8084CFE0 28410004 */ slti $at, $v0, 0x0004 -/* 1ADD4 8084CFE4 5420000B */ bnel $at, $zero, .L8084D014 -/* 1ADD8 8084CFE8 8FA7004C */ lw $a3, 0x004C($sp) +/* 1ADC8 8084CFD8 28410002 */ slti $at, $v0, 0x0002 +/* 1ADCC 8084CFDC 14200003 */ bne $at, $zero, .L8084CFEC +/* 1ADD0 8084CFE0 28410004 */ slti $at, $v0, 0x0004 +/* 1ADD4 8084CFE4 5420000B */ bnel $at, $zero, .L8084D014 +/* 1ADD8 8084CFE8 8FA7004C */ lw $a3, 0x004C($sp) .L8084CFEC: -/* 1ADDC 8084CFEC 0C20D99C */ jal func_80836670 -/* 1ADE0 8084CFF0 8FA50054 */ lw $a1, 0x0054($sp) +/* 1ADDC 8084CFEC 0C20D99C */ jal func_80836670 +/* 1ADE0 8084CFF0 8FA50054 */ lw $a1, 0x0054($sp) /* 1ADE4 8084CFF4 3C018085 */ lui $at, %hi(D_808535E0) ## $at = 80850000 -/* 1ADE8 8084CFF8 AC2235E0 */ sw $v0, %lo(D_808535E0)($at) +/* 1ADE8 8084CFF8 AC2235E0 */ sw $v0, %lo(D_808535E0)($at) /* 1ADEC 8084CFFC 3C0D8085 */ lui $t5, %hi(D_808535E0) ## $t5 = 80850000 -/* 1ADF0 8084D000 8DAD35E0 */ lw $t5, %lo(D_808535E0)($t5) -/* 1ADF4 8084D004 51A00003 */ beql $t5, $zero, .L8084D014 -/* 1ADF8 8084D008 8FA7004C */ lw $a3, 0x004C($sp) +/* 1ADF0 8084D000 8DAD35E0 */ lw $t5, %lo(D_808535E0)($t5) +/* 1ADF4 8084D004 51A00003 */ beql $t5, $zero, .L8084D014 +/* 1ADF8 8084D008 8FA7004C */ lw $a3, 0x004C($sp) /* 1ADFC 8084D00C A200084F */ sb $zero, 0x084F($s0) ## 0000084F .L8084D010: -/* 1AE00 8084D010 8FA7004C */ lw $a3, 0x004C($sp) +/* 1AE00 8084D010 8FA7004C */ lw $a3, 0x004C($sp) .L8084D014: /* 1AE04 8084D014 3C0141D8 */ lui $at, 0x41D8 ## $at = 41D80000 /* 1AE08 8084D018 920E0444 */ lbu $t6, 0x0444($s0) ## 00000444 /* 1AE0C 8084D01C C4E60024 */ lwc1 $f6, 0x0024($a3) ## 00000024 /* 1AE10 8084D020 C4E80258 */ lwc1 $f8, 0x0258($a3) ## 00000258 -/* 1AE14 8084D024 46083280 */ add.s $f10, $f6, $f8 +/* 1AE14 8084D024 46083280 */ add.s $f10, $f6, $f8 /* 1AE18 8084D028 44813000 */ mtc1 $at, $f6 ## $f6 = 27.00 /* 1AE1C 8084D02C E60A0024 */ swc1 $f10, 0x0024($s0) ## 00000024 /* 1AE20 8084D030 C4F2025C */ lwc1 $f18, 0x025C($a3) ## 0000025C /* 1AE24 8084D034 C4F00028 */ lwc1 $f16, 0x0028($a3) ## 00000028 -/* 1AE28 8084D038 46128100 */ add.s $f4, $f16, $f18 -/* 1AE2C 8084D03C 46062201 */ sub.s $f8, $f4, $f6 +/* 1AE28 8084D038 46128100 */ add.s $f4, $f16, $f18 +/* 1AE2C 8084D03C 46062201 */ sub.s $f8, $f4, $f6 /* 1AE30 8084D040 E6080028 */ swc1 $f8, 0x0028($s0) ## 00000028 /* 1AE34 8084D044 C4F00260 */ lwc1 $f16, 0x0260($a3) ## 00000260 /* 1AE38 8084D048 C4EA002C */ lwc1 $f10, 0x002C($a3) ## 0000002C -/* 1AE3C 8084D04C 46105480 */ add.s $f18, $f10, $f16 +/* 1AE3C 8084D04C 46105480 */ add.s $f18, $f10, $f16 /* 1AE40 8084D050 E612002C */ swc1 $f18, 0x002C($s0) ## 0000002C /* 1AE44 8084D054 84E200B6 */ lh $v0, 0x00B6($a3) ## 000000B6 /* 1AE48 8084D058 A60200B6 */ sh $v0, 0x00B6($s0) ## 000000B6 -/* 1AE4C 8084D05C 15C00014 */ bne $t6, $zero, .L8084D0B0 +/* 1AE4C 8084D05C 15C00014 */ bne $t6, $zero, .L8084D0B0 /* 1AE50 8084D060 A602083C */ sh $v0, 0x083C($s0) ## 0000083C -/* 1AE54 8084D064 0C20C893 */ jal func_8083224C -/* 1AE58 8084D068 8FA40054 */ lw $a0, 0x0054($sp) -/* 1AE5C 8084D06C 144000D8 */ bne $v0, $zero, .L8084D3D0 -/* 1AE60 8084D070 8FAF004C */ lw $t7, 0x004C($sp) +/* 1AE54 8084D064 0C20C893 */ jal func_8083224C +/* 1AE58 8084D068 8FA40054 */ lw $a0, 0x0054($sp) +/* 1AE5C 8084D06C 144000D8 */ bne $v0, $zero, .L8084D3D0 +/* 1AE60 8084D070 8FAF004C */ lw $t7, 0x004C($sp) /* 1AE64 8084D074 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 /* 1AE68 8084D078 C5E60068 */ lwc1 $f6, 0x0068($t7) ## 00000068 /* 1AE6C 8084D07C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 1AE70 8084D080 46062032 */ c.eq.s $f4, $f6 +/* 1AE70 8084D080 46062032 */ c.eq.s $f4, $f6 /* 1AE74 8084D084 00000000 */ nop -/* 1AE78 8084D088 45020005 */ bc1fl .L8084D0A0 +/* 1AE78 8084D088 45020005 */ bc1fl .L8084D0A0 /* 1AE7C 8084D08C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 1AE80 8084D090 0C20ED91 */ jal func_8083B644 -/* 1AE84 8084D094 8FA50054 */ lw $a1, 0x0054($sp) -/* 1AE88 8084D098 144000CD */ bne $v0, $zero, .L8084D3D0 +/* 1AE80 8084D090 0C20ED91 */ jal func_8083B644 +/* 1AE84 8084D094 8FA50054 */ lw $a1, 0x0054($sp) +/* 1AE88 8084D098 144000CD */ bne $v0, $zero, .L8084D3D0 /* 1AE8C 8084D09C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 .L8084D0A0: -/* 1AE90 8084D0A0 0C20F077 */ jal func_8083C1DC -/* 1AE94 8084D0A4 8FA50054 */ lw $a1, 0x0054($sp) -/* 1AE98 8084D0A8 144000C9 */ bne $v0, $zero, .L8084D3D0 -/* 1AE9C 8084D0AC 8FA7004C */ lw $a3, 0x004C($sp) +/* 1AE90 8084D0A0 0C20F077 */ jal func_8083C1DC +/* 1AE94 8084D0A4 8FA50054 */ lw $a1, 0x0054($sp) +/* 1AE98 8084D0A8 144000C9 */ bne $v0, $zero, .L8084D3D0 +/* 1AE9C 8084D0AC 8FA7004C */ lw $a3, 0x004C($sp) .L8084D0B0: /* 1AEA0 8084D0B0 3C188085 */ lui $t8, %hi(D_808535E0) ## $t8 = 80850000 -/* 1AEA4 8084D0B4 8F1835E0 */ lw $t8, %lo(D_808535E0)($t8) -/* 1AEA8 8084D0B8 5700005C */ bnel $t8, $zero, .L8084D22C +/* 1AEA4 8084D0B4 8F1835E0 */ lw $t8, %lo(D_808535E0)($t8) +/* 1AEA8 8084D0B8 5700005C */ bnel $t8, $zero, .L8084D22C /* 1AEAC 8084D0BC 8E09067C */ lw $t1, 0x067C($s0) ## 0000067C /* 1AEB0 8084D0C0 8219084F */ lb $t9, 0x084F($s0) ## 0000084F /* 1AEB4 8084D0C4 260606C8 */ addiu $a2, $s0, 0x06C8 ## $a2 = 000006C8 /* 1AEB8 8084D0C8 00C02825 */ or $a1, $a2, $zero ## $a1 = 000006C8 -/* 1AEBC 8084D0CC 13200034 */ beq $t9, $zero, .L8084D1A0 -/* 1AEC0 8084D0D0 8FA40054 */ lw $a0, 0x0054($sp) -/* 1AEC4 8084D0D4 0C028EF0 */ jal func_800A3BC0 -/* 1AEC8 8084D0D8 AFA60030 */ sw $a2, 0x0030($sp) -/* 1AECC 8084D0DC 10400007 */ beq $v0, $zero, .L8084D0FC -/* 1AED0 8084D0E0 8FA60030 */ lw $a2, 0x0030($sp) -/* 1AED4 8084D0E4 8FA8004C */ lw $t0, 0x004C($sp) +/* 1AEBC 8084D0CC 13200034 */ beq $t9, $zero, .L8084D1A0 +/* 1AEC0 8084D0D0 8FA40054 */ lw $a0, 0x0054($sp) +/* 1AEC4 8084D0D4 0C028EF0 */ jal func_800A3BC0 +/* 1AEC8 8084D0D8 AFA60030 */ sw $a2, 0x0030($sp) +/* 1AECC 8084D0DC 10400007 */ beq $v0, $zero, .L8084D0FC +/* 1AED0 8084D0E0 8FA60030 */ lw $a2, 0x0030($sp) +/* 1AED4 8084D0E4 8FA8004C */ lw $t0, 0x004C($sp) /* 1AED8 8084D0E8 2401FEFF */ addiu $at, $zero, 0xFEFF ## $at = FFFFFEFF /* 1AEDC 8084D0EC 8D0901F0 */ lw $t1, 0x01F0($t0) ## 000001F0 -/* 1AEE0 8084D0F0 01215024 */ and $t2, $t1, $at +/* 1AEE0 8084D0F0 01215024 */ and $t2, $t1, $at /* 1AEE4 8084D0F4 AD0A01F0 */ sw $t2, 0x01F0($t0) ## 000001F0 /* 1AEE8 8084D0F8 A200084F */ sb $zero, 0x084F($s0) ## 0000084F .L8084D0FC: /* 1AEEC 8084D0FC 8E0C06D0 */ lw $t4, 0x06D0($s0) ## 000006D0 /* 1AEF0 8084D100 3C0B0400 */ lui $t3, 0x0400 ## $t3 = 04000000 /* 1AEF4 8084D104 256B33B0 */ addiu $t3, $t3, 0x33B0 ## $t3 = 040033B0 -/* 1AEF8 8084D108 156C0012 */ bne $t3, $t4, .L8084D154 +/* 1AEF8 8084D108 156C0012 */ bne $t3, $t4, .L8084D154 /* 1AEFC 8084D10C 00C02025 */ or $a0, $a2, $zero ## $a0 = 00000000 /* 1AF00 8084D110 00C02025 */ or $a0, $a2, $zero ## $a0 = 00000000 -/* 1AF04 8084D114 0C02914C */ jal func_800A4530 +/* 1AF04 8084D114 0C02914C */ jal func_800A4530 /* 1AF08 8084D118 3C0541B8 */ lui $a1, 0x41B8 ## $a1 = 41B80000 -/* 1AF0C 8084D11C 10400006 */ beq $v0, $zero, .L8084D138 +/* 1AF0C 8084D11C 10400006 */ beq $v0, $zero, .L8084D138 /* 1AF10 8084D120 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 1AF14 8084D124 0C00BDF7 */ jal func_8002F7DC +/* 1AF14 8084D124 0C00BDF7 */ jal func_8002F7DC /* 1AF18 8084D128 2405181E */ addiu $a1, $zero, 0x181E ## $a1 = 0000181E /* 1AF1C 8084D12C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 1AF20 8084D130 0C20C9A6 */ jal func_80832698 +/* 1AF20 8084D130 0C20C9A6 */ jal func_80832698 /* 1AF24 8084D134 24056802 */ addiu $a1, $zero, 0x6802 ## $a1 = 00006802 .L8084D138: -/* 1AF28 8084D138 8FA40054 */ lw $a0, 0x0054($sp) +/* 1AF28 8084D138 8FA40054 */ lw $a0, 0x0054($sp) /* 1AF2C 8084D13C 920501B4 */ lbu $a1, 0x01B4($s0) ## 000001B4 /* 1AF30 8084D140 8E0601D4 */ lw $a2, 0x01D4($s0) ## 000001D4 -/* 1AF34 8084D144 0C028D1E */ jal func_800A3478 +/* 1AF34 8084D144 0C028D1E */ jal SkelAnime_LoadAnimationType1 /* 1AF38 8084D148 8E0706E8 */ lw $a3, 0x06E8($s0) ## 000006E8 -/* 1AF3C 8084D14C 10000037 */ beq $zero, $zero, .L8084D22C +/* 1AF3C 8084D14C 10000037 */ beq $zero, $zero, .L8084D22C /* 1AF40 8084D150 8E09067C */ lw $t1, 0x067C($s0) ## 0000067C .L8084D154: -/* 1AF44 8084D154 0C02914C */ jal func_800A4530 +/* 1AF44 8084D154 0C02914C */ jal func_800A4530 /* 1AF48 8084D158 3C054120 */ lui $a1, 0x4120 ## $a1 = 41200000 -/* 1AF4C 8084D15C 10400006 */ beq $v0, $zero, .L8084D178 +/* 1AF4C 8084D15C 10400006 */ beq $v0, $zero, .L8084D178 /* 1AF50 8084D160 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 1AF54 8084D164 0C00BDF7 */ jal func_8002F7DC +/* 1AF54 8084D164 0C00BDF7 */ jal func_8002F7DC /* 1AF58 8084D168 2405181E */ addiu $a1, $zero, 0x181E ## $a1 = 0000181E /* 1AF5C 8084D16C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 1AF60 8084D170 0C20C9A6 */ jal func_80832698 +/* 1AF60 8084D170 0C20C9A6 */ jal func_80832698 /* 1AF64 8084D174 24056802 */ addiu $a1, $zero, 0x6802 ## $a1 = 00006802 .L8084D178: /* 1AF68 8084D178 3C0D8085 */ lui $t5, %hi(D_80853410) ## $t5 = 80850000 @@ -348,131 +348,131 @@ glabel func_8084CC98 /* 1AF70 8084D180 920501B4 */ lbu $a1, 0x01B4($s0) ## 000001B4 /* 1AF74 8084D184 8E0601D4 */ lw $a2, 0x01D4($s0) ## 000001D4 /* 1AF78 8084D188 8E0706E8 */ lw $a3, 0x06E8($s0) ## 000006E8 -/* 1AF7C 8084D18C AFAD0010 */ sw $t5, 0x0010($sp) -/* 1AF80 8084D190 0C028D52 */ jal func_800A3548 -/* 1AF84 8084D194 8FA40054 */ lw $a0, 0x0054($sp) -/* 1AF88 8084D198 10000024 */ beq $zero, $zero, .L8084D22C +/* 1AF7C 8084D18C AFAD0010 */ sw $t5, 0x0010($sp) +/* 1AF80 8084D190 0C028D52 */ jal SkelAnime_LoadAnimationType3 +/* 1AF84 8084D194 8FA40054 */ lw $a0, 0x0054($sp) +/* 1AF88 8084D198 10000024 */ beq $zero, $zero, .L8084D22C /* 1AF8C 8084D19C 8E09067C */ lw $t1, 0x067C($s0) ## 0000067C .L8084D1A0: /* 1AF90 8084D1A0 8CE301F0 */ lw $v1, 0x01F0($a3) ## 000001F0 /* 1AF94 8084D1A4 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 /* 1AF98 8084D1A8 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 /* 1AF9C 8084D1AC 306E0200 */ andi $t6, $v1, 0x0200 ## $t6 = 00000000 -/* 1AFA0 8084D1B0 11C00003 */ beq $t6, $zero, .L8084D1C0 +/* 1AFA0 8084D1B0 11C00003 */ beq $t6, $zero, .L8084D1C0 /* 1AFA4 8084D1B4 306F0100 */ andi $t7, $v1, 0x0100 ## $t7 = 00000000 -/* 1AFA8 8084D1B8 10000001 */ beq $zero, $zero, .L8084D1C0 +/* 1AFA8 8084D1B8 10000001 */ beq $zero, $zero, .L8084D1C0 /* 1AFAC 8084D1BC 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 .L8084D1C0: -/* 1AFB0 8084D1C0 10400004 */ beq $v0, $zero, .L8084D1D4 -/* 1AFB4 8084D1C4 8FA40054 */ lw $a0, 0x0054($sp) +/* 1AFB0 8084D1C0 10400004 */ beq $v0, $zero, .L8084D1D4 +/* 1AFB4 8084D1C4 8FA40054 */ lw $a0, 0x0054($sp) /* 1AFB8 8084D1C8 3C060400 */ lui $a2, 0x0400 ## $a2 = 04000000 -/* 1AFBC 8084D1CC 10000010 */ beq $zero, $zero, .L8084D210 +/* 1AFBC 8084D1CC 10000010 */ beq $zero, $zero, .L8084D210 /* 1AFC0 8084D1D0 24C633B0 */ addiu $a2, $a2, 0x33B0 ## $a2 = 040033B0 .L8084D1D4: -/* 1AFC4 8084D1D4 11E00003 */ beq $t7, $zero, .L8084D1E4 +/* 1AFC4 8084D1D4 11E00003 */ beq $t7, $zero, .L8084D1E4 /* 1AFC8 8084D1D8 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000 -/* 1AFCC 8084D1DC 10000001 */ beq $zero, $zero, .L8084D1E4 +/* 1AFCC 8084D1DC 10000001 */ beq $zero, $zero, .L8084D1E4 /* 1AFD0 8084D1E0 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001 .L8084D1E4: -/* 1AFD4 8084D1E4 1040000A */ beq $v0, $zero, .L8084D210 +/* 1AFD4 8084D1E4 1040000A */ beq $v0, $zero, .L8084D210 /* 1AFD8 8084D1E8 00000000 */ nop /* 1AFDC 8084D1EC 86020850 */ lh $v0, 0x0850($s0) ## 00000850 -/* 1AFE0 8084D1F0 28410002 */ slti $at, $v0, 0x0002 -/* 1AFE4 8084D1F4 14200006 */ bne $at, $zero, .L8084D210 +/* 1AFE0 8084D1F0 28410002 */ slti $at, $v0, 0x0002 +/* 1AFE4 8084D1F4 14200006 */ bne $at, $zero, .L8084D210 /* 1AFE8 8084D1F8 24010063 */ addiu $at, $zero, 0x0063 ## $at = 00000063 -/* 1AFEC 8084D1FC 10410004 */ beq $v0, $at, .L8084D210 -/* 1AFF0 8084D200 0002C080 */ sll $t8, $v0, 2 +/* 1AFEC 8084D1FC 10410004 */ beq $v0, $at, .L8084D210 +/* 1AFF0 8084D200 0002C080 */ sll $t8, $v0, 2 /* 1AFF4 8084D204 3C068085 */ lui $a2, %hi(D_80854960) ## $a2 = 80850000 -/* 1AFF8 8084D208 00D83021 */ addu $a2, $a2, $t8 -/* 1AFFC 8084D20C 8CC64960 */ lw $a2, %lo(D_80854960)($a2) +/* 1AFF8 8084D208 00D83021 */ addu $a2, $a2, $t8 +/* 1AFFC 8084D20C 8CC64960 */ lw $a2, %lo(D_80854960)($a2) .L8084D210: -/* 1B000 8084D210 50C00006 */ beql $a2, $zero, .L8084D22C +/* 1B000 8084D210 50C00006 */ beql $a2, $zero, .L8084D22C /* 1B004 8084D214 8E09067C */ lw $t1, 0x067C($s0) ## 0000067C -/* 1B008 8084D218 0C02901F */ jal func_800A407C +/* 1B008 8084D218 0C02901F */ jal SkelAnime_ChangeLinkAnimDefaultStop /* 1B00C 8084D21C 260506C8 */ addiu $a1, $s0, 0x06C8 ## $a1 = 000006C8 /* 1B010 8084D220 24190001 */ addiu $t9, $zero, 0x0001 ## $t9 = 00000001 /* 1B014 8084D224 A219084F */ sb $t9, 0x084F($s0) ## 0000084F /* 1B018 8084D228 8E09067C */ lw $t1, 0x067C($s0) ## 0000067C .L8084D22C: -/* 1B01C 8084D22C 8FA40054 */ lw $a0, 0x0054($sp) -/* 1B020 8084D230 000952C0 */ sll $t2, $t1, 11 -/* 1B024 8084D234 05430023 */ bgezl $t2, .L8084D2C4 +/* 1B01C 8084D22C 8FA40054 */ lw $a0, 0x0054($sp) +/* 1B020 8084D230 000952C0 */ sll $t2, $t1, 11 +/* 1B024 8084D234 05430023 */ bgezl $t2, .L8084D2C4 /* 1B028 8084D238 92080444 */ lbu $t0, 0x0444($s0) ## 00000444 -/* 1B02C 8084D23C 0C20EB53 */ jal func_8083AD4C +/* 1B02C 8084D23C 0C20EB53 */ jal func_8083AD4C /* 1B030 8084D240 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 1B034 8084D244 1040000A */ beq $v0, $zero, .L8084D270 +/* 1B034 8084D244 1040000A */ beq $v0, $zero, .L8084D270 /* 1B038 8084D248 3C088086 */ lui $t0, %hi(D_80858AB4) ## $t0 = 80860000 -/* 1B03C 8084D24C 8D088AB4 */ lw $t0, %lo(D_80858AB4)($t0) +/* 1B03C 8084D24C 8D088AB4 */ lw $t0, %lo(D_80858AB4)($t0) /* 1B040 8084D250 950B000C */ lhu $t3, 0x000C($t0) ## 8086000C /* 1B044 8084D254 316C8000 */ andi $t4, $t3, 0x8000 ## $t4 = 00000000 -/* 1B048 8084D258 55800006 */ bnel $t4, $zero, .L8084D274 +/* 1B048 8084D258 55800006 */ bnel $t4, $zero, .L8084D274 /* 1B04C 8084D25C 8E0D067C */ lw $t5, 0x067C($s0) ## 0000067C -/* 1B050 8084D260 0C20CEF3 */ jal func_80833BCC +/* 1B050 8084D260 0C20CEF3 */ jal func_80833BCC /* 1B054 8084D264 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 1B058 8084D268 10400008 */ beq $v0, $zero, .L8084D28C -/* 1B05C 8084D26C 8FA40054 */ lw $a0, 0x0054($sp) +/* 1B058 8084D268 10400008 */ beq $v0, $zero, .L8084D28C +/* 1B05C 8084D26C 8FA40054 */ lw $a0, 0x0054($sp) .L8084D270: /* 1B060 8084D270 8E0D067C */ lw $t5, 0x067C($s0) ## 0000067C .L8084D274: /* 1B064 8084D274 3C01FFEF */ lui $at, 0xFFEF ## $at = FFEF0000 /* 1B068 8084D278 3421FFFF */ ori $at, $at, 0xFFFF ## $at = FFEFFFFF -/* 1B06C 8084D27C 01A17024 */ and $t6, $t5, $at +/* 1B06C 8084D27C 01A17024 */ and $t6, $t5, $at /* 1B070 8084D280 A20006AD */ sb $zero, 0x06AD($s0) ## 000006AD -/* 1B074 8084D284 10000052 */ beq $zero, $zero, .L8084D3D0 +/* 1B074 8084D284 10000052 */ beq $zero, $zero, .L8084D3D0 /* 1B078 8084D288 AE0E067C */ sw $t6, 0x067C($s0) ## 0000067C .L8084D28C: /* 1B07C 8084D28C 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 1B080 8084D290 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 -/* 1B084 8084D294 0C212AF6 */ jal func_8084ABD8 +/* 1B084 8084D294 0C212AF6 */ jal func_8084ABD8 /* 1B088 8084D298 2407EC78 */ addiu $a3, $zero, 0xEC78 ## $a3 = FFFFEC78 /* 1B08C 8084D29C 860F00B6 */ lh $t7, 0x00B6($s0) ## 000000B6 /* 1B090 8084D2A0 240AEC78 */ addiu $t2, $zero, 0xEC78 ## $t2 = FFFFEC78 /* 1B094 8084D2A4 A60A06B0 */ sh $t2, 0x06B0($s0) ## 000006B0 -/* 1B098 8084D2A8 004FC023 */ subu $t8, $v0, $t7 +/* 1B098 8084D2A8 004FC023 */ subu $t8, $v0, $t7 /* 1B09C 8084D2AC A61806BE */ sh $t8, 0x06BE($s0) ## 000006BE /* 1B0A0 8084D2B0 861906BE */ lh $t9, 0x06BE($s0) ## 000006BE /* 1B0A4 8084D2B4 27291388 */ addiu $t1, $t9, 0x1388 ## $t1 = 00001388 -/* 1B0A8 8084D2B8 10000045 */ beq $zero, $zero, .L8084D3D0 +/* 1B0A8 8084D2B8 10000045 */ beq $zero, $zero, .L8084D3D0 /* 1B0AC 8084D2BC A60906BE */ sh $t1, 0x06BE($s0) ## 000006BE /* 1B0B0 8084D2C0 92080444 */ lbu $t0, 0x0444($s0) ## 00000444 .L8084D2C4: /* 1B0B4 8084D2C4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 1B0B8 8084D2C8 5500000A */ bnel $t0, $zero, .L8084D2F4 +/* 1B0B8 8084D2C8 5500000A */ bnel $t0, $zero, .L8084D2F4 /* 1B0BC 8084D2CC 8E0B0664 */ lw $t3, 0x0664($s0) ## 00000664 -/* 1B0C0 8084D2D0 0C21326F */ jal func_8084C9BC -/* 1B0C4 8084D2D4 8FA50054 */ lw $a1, 0x0054($sp) -/* 1B0C8 8084D2D8 1440003D */ bne $v0, $zero, .L8084D3D0 +/* 1B0C0 8084D2D0 0C21326F */ jal func_8084C9BC +/* 1B0C4 8084D2D4 8FA50054 */ lw $a1, 0x0054($sp) +/* 1B0C8 8084D2D8 1440003D */ bne $v0, $zero, .L8084D3D0 /* 1B0CC 8084D2DC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 1B0D0 8084D2E0 0C20EC10 */ jal func_8083B040 -/* 1B0D4 8084D2E4 8FA50054 */ lw $a1, 0x0054($sp) -/* 1B0D8 8084D2E8 5440003A */ bnel $v0, $zero, .L8084D3D4 -/* 1B0DC 8084D2EC 8FBF0024 */ lw $ra, 0x0024($sp) +/* 1B0D0 8084D2E0 0C20EC10 */ jal func_8083B040 +/* 1B0D4 8084D2E4 8FA50054 */ lw $a1, 0x0054($sp) +/* 1B0D8 8084D2E8 5440003A */ bnel $v0, $zero, .L8084D3D4 +/* 1B0DC 8084D2EC 8FBF0024 */ lw $ra, 0x0024($sp) /* 1B0E0 8084D2F0 8E0B0664 */ lw $t3, 0x0664($s0) ## 00000664 .L8084D2F4: -/* 1B0E4 8084D2F4 11600026 */ beq $t3, $zero, .L8084D390 +/* 1B0E4 8084D2F4 11600026 */ beq $t3, $zero, .L8084D390 /* 1B0E8 8084D2F8 00000000 */ nop -/* 1B0EC 8084D2FC 0C00B75E */ jal func_8002DD78 +/* 1B0EC 8084D2FC 0C00B75E */ jal func_8002DD78 /* 1B0F0 8084D300 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 1B0F4 8084D304 1040001E */ beq $v0, $zero, .L8084D380 +/* 1B0F4 8084D304 1040001E */ beq $v0, $zero, .L8084D380 /* 1B0F8 8084D308 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 1B0FC 8084D30C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 1B100 8084D310 0C20F6E6 */ jal func_8083DB98 +/* 1B100 8084D310 0C20F6E6 */ jal func_8083DB98 /* 1B104 8084D314 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 /* 1B108 8084D318 860C00B6 */ lh $t4, 0x00B6($s0) ## 000000B6 /* 1B10C 8084D31C 240EB556 */ addiu $t6, $zero, 0xB556 ## $t6 = FFFFB556 -/* 1B110 8084D320 004C6823 */ subu $t5, $v0, $t4 +/* 1B110 8084D320 004C6823 */ subu $t5, $v0, $t4 /* 1B114 8084D324 A60D06BE */ sh $t5, 0x06BE($s0) ## 000006BE /* 1B118 8084D328 860306BE */ lh $v1, 0x06BE($s0) ## 000006BE -/* 1B11C 8084D32C 2861B556 */ slti $at, $v1, 0xB556 -/* 1B120 8084D330 50200004 */ beql $at, $zero, .L8084D344 -/* 1B124 8084D334 28614AAB */ slti $at, $v1, 0x4AAB -/* 1B128 8084D338 10000007 */ beq $zero, $zero, .L8084D358 +/* 1B11C 8084D32C 2861B556 */ slti $at, $v1, 0xB556 +/* 1B120 8084D330 50200004 */ beql $at, $zero, .L8084D344 +/* 1B124 8084D334 28614AAB */ slti $at, $v1, 0x4AAB +/* 1B128 8084D338 10000007 */ beq $zero, $zero, .L8084D358 /* 1B12C 8084D33C A60E06BE */ sh $t6, 0x06BE($s0) ## 000006BE -/* 1B130 8084D340 28614AAB */ slti $at, $v1, 0x4AAB +/* 1B130 8084D340 28614AAB */ slti $at, $v1, 0x4AAB .L8084D344: -/* 1B134 8084D344 14200003 */ bne $at, $zero, .L8084D354 +/* 1B134 8084D344 14200003 */ bne $at, $zero, .L8084D354 /* 1B138 8084D348 00601025 */ or $v0, $v1, $zero ## $v0 = 00000000 -/* 1B13C 8084D34C 10000001 */ beq $zero, $zero, .L8084D354 +/* 1B13C 8084D34C 10000001 */ beq $zero, $zero, .L8084D354 /* 1B140 8084D350 24024AAA */ addiu $v0, $zero, 0x4AAA ## $v0 = 00004AAA .L8084D354: /* 1B144 8084D354 A60206BE */ sh $v0, 0x06BE($s0) ## 000006BE @@ -481,40 +481,40 @@ glabel func_8084CC98 /* 1B14C 8084D35C 860F00B6 */ lh $t7, 0x00B6($s0) ## 000000B6 /* 1B150 8084D360 960906AE */ lhu $t1, 0x06AE($s0) ## 000006AE /* 1B154 8084D364 24791388 */ addiu $t9, $v1, 0x1388 ## $t9 = 00001388 -/* 1B158 8084D368 01E3C021 */ addu $t8, $t7, $v1 +/* 1B158 8084D368 01E3C021 */ addu $t8, $t7, $v1 /* 1B15C 8084D36C 352A0080 */ ori $t2, $t1, 0x0080 ## $t2 = 00000080 /* 1B160 8084D370 A6180046 */ sh $t8, 0x0046($s0) ## 00000046 /* 1B164 8084D374 A61906BE */ sh $t9, 0x06BE($s0) ## 000006BE -/* 1B168 8084D378 10000015 */ beq $zero, $zero, .L8084D3D0 +/* 1B168 8084D378 10000015 */ beq $zero, $zero, .L8084D3D0 /* 1B16C 8084D37C A60A06AE */ sh $t2, 0x06AE($s0) ## 000006AE .L8084D380: -/* 1B170 8084D380 0C20F6E6 */ jal func_8083DB98 +/* 1B170 8084D380 0C20F6E6 */ jal func_8083DB98 /* 1B174 8084D384 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 1B178 8084D388 10000012 */ beq $zero, $zero, .L8084D3D4 -/* 1B17C 8084D38C 8FBF0024 */ lw $ra, 0x0024($sp) +/* 1B178 8084D388 10000012 */ beq $zero, $zero, .L8084D3D4 +/* 1B17C 8084D38C 8FBF0024 */ lw $ra, 0x0024($sp) .L8084D390: -/* 1B180 8084D390 0C00B75E */ jal func_8002DD78 +/* 1B180 8084D390 0C00B75E */ jal func_8002DD78 /* 1B184 8084D394 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 1B188 8084D398 1040000D */ beq $v0, $zero, .L8084D3D0 -/* 1B18C 8084D39C 8FA40054 */ lw $a0, 0x0054($sp) +/* 1B188 8084D398 1040000D */ beq $v0, $zero, .L8084D3D0 +/* 1B18C 8084D39C 8FA40054 */ lw $a0, 0x0054($sp) /* 1B190 8084D3A0 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 1B194 8084D3A4 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001 -/* 1B198 8084D3A8 0C212AF6 */ jal func_8084ABD8 +/* 1B198 8084D3A8 0C212AF6 */ jal func_8084ABD8 /* 1B19C 8084D3AC 2407EC78 */ addiu $a3, $zero, 0xEC78 ## $a3 = FFFFEC78 /* 1B1A0 8084D3B0 860800B6 */ lh $t0, 0x00B6($s0) ## 000000B6 /* 1B1A4 8084D3B4 240EEC78 */ addiu $t6, $zero, 0xEC78 ## $t6 = FFFFEC78 /* 1B1A8 8084D3B8 A60E06B0 */ sh $t6, 0x06B0($s0) ## 000006B0 -/* 1B1AC 8084D3BC 00485823 */ subu $t3, $v0, $t0 +/* 1B1AC 8084D3BC 00485823 */ subu $t3, $v0, $t0 /* 1B1B0 8084D3C0 A60B06BE */ sh $t3, 0x06BE($s0) ## 000006BE /* 1B1B4 8084D3C4 860C06BE */ lh $t4, 0x06BE($s0) ## 000006BE /* 1B1B8 8084D3C8 258D1388 */ addiu $t5, $t4, 0x1388 ## $t5 = 00001388 /* 1B1BC 8084D3CC A60D06BE */ sh $t5, 0x06BE($s0) ## 000006BE .L8084D3D0: -/* 1B1C0 8084D3D0 8FBF0024 */ lw $ra, 0x0024($sp) +/* 1B1C0 8084D3D0 8FBF0024 */ lw $ra, 0x0024($sp) .L8084D3D4: -/* 1B1C4 8084D3D4 8FB00020 */ lw $s0, 0x0020($sp) +/* 1B1C4 8084D3D4 8FB00020 */ lw $s0, 0x0020($sp) /* 1B1C8 8084D3D8 27BD0050 */ addiu $sp, $sp, 0x0050 ## $sp = 00000000 -/* 1B1CC 8084D3DC 03E00008 */ jr $ra +/* 1B1CC 8084D3DC 03E00008 */ jr $ra /* 1B1D0 8084D3E0 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808507F4.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_808507F4.s index 5d42224759..e79536349e 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808507F4.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_808507F4.s @@ -1,127 +1,127 @@ glabel func_808507F4 /* 1E5E4 808507F4 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 1E5E8 808507F8 AFB00018 */ sw $s0, 0x0018($sp) +/* 1E5E8 808507F8 AFB00018 */ sw $s0, 0x0018($sp) /* 1E5EC 808507FC 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 1E5F0 80850800 AFA5002C */ sw $a1, 0x002C($sp) +/* 1E5F0 80850800 AFA5002C */ sw $a1, 0x002C($sp) /* 1E5F4 80850804 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 1E5F8 80850808 AFBF001C */ sw $ra, 0x001C($sp) +/* 1E5F8 80850808 AFBF001C */ sw $ra, 0x001C($sp) /* 1E5FC 8085080C 260501B4 */ addiu $a1, $s0, 0x01B4 ## $a1 = 000001B4 -/* 1E600 80850810 0C028EF0 */ jal func_800A3BC0 -/* 1E604 80850814 AFA50020 */ sw $a1, 0x0020($sp) -/* 1E608 80850818 5040004C */ beql $v0, $zero, .L8085094C +/* 1E600 80850810 0C028EF0 */ jal func_800A3BC0 +/* 1E604 80850814 AFA50020 */ sw $a1, 0x0020($sp) +/* 1E608 80850818 5040004C */ beql $v0, $zero, .L8085094C /* 1E60C 8085081C 86020850 */ lh $v0, 0x0850($s0) ## 00000850 /* 1E610 80850820 8203084F */ lb $v1, 0x084F($s0) ## 0000084F -/* 1E614 80850824 04630013 */ bgezl $v1, .L80850874 +/* 1E614 80850824 04630013 */ bgezl $v1, .L80850874 /* 1E618 80850828 86180850 */ lh $t8, 0x0850($s0) ## 00000850 /* 1E61C 8085082C 820E0154 */ lb $t6, 0x0154($s0) ## 00000154 /* 1E620 80850830 24010019 */ addiu $at, $zero, 0x0019 ## $at = 00000019 /* 1E624 80850834 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 1E628 80850838 11C10003 */ beq $t6, $at, .L80850848 +/* 1E628 80850838 11C10003 */ beq $t6, $at, .L80850848 /* 1E62C 8085083C 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 /* 1E630 80850840 844F13F0 */ lh $t7, 0x13F0($v0) ## 8015FA50 -/* 1E634 80850844 15E000A2 */ bne $t7, $zero, .L80850AD0 +/* 1E634 80850844 15E000A2 */ bne $t7, $zero, .L80850AD0 .L80850848: /* 1E638 80850848 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 1E63C 8085084C 0C20E7FF */ jal func_80839FFC -/* 1E640 80850850 8FA5002C */ lw $a1, 0x002C($sp) -/* 1E644 80850854 8FA4002C */ lw $a0, 0x002C($sp) -/* 1E648 80850858 0C030129 */ jal func_800C04A4 +/* 1E63C 8085084C 0C20E7FF */ jal func_80839FFC +/* 1E640 80850850 8FA5002C */ lw $a1, 0x002C($sp) +/* 1E644 80850854 8FA4002C */ lw $a0, 0x002C($sp) +/* 1E648 80850858 0C030129 */ jal func_800C04A4 /* 1E64C 8085085C 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 1E650 80850860 0C016C69 */ jal func_8005B1A4 +/* 1E650 80850860 0C016C69 */ jal func_8005B1A4 /* 1E654 80850864 00402025 */ or $a0, $v0, $zero ## $a0 = 00000000 -/* 1E658 80850868 10000099 */ beq $zero, $zero, .L80850AD0 +/* 1E658 80850868 10000099 */ beq $zero, $zero, .L80850AD0 /* 1E65C 8085086C 00000000 */ nop /* 1E660 80850870 86180850 */ lh $t8, 0x0850($s0) ## 00000850 .L80850874: -/* 1E664 80850874 8FA4002C */ lw $a0, 0x002C($sp) -/* 1E668 80850878 8FA50020 */ lw $a1, 0x0020($sp) -/* 1E66C 8085087C 17000023 */ bne $t8, $zero, .L8085090C -/* 1E670 80850880 00036880 */ sll $t5, $v1, 2 -/* 1E674 80850884 0003C880 */ sll $t9, $v1, 2 +/* 1E664 80850874 8FA4002C */ lw $a0, 0x002C($sp) +/* 1E668 80850878 8FA50020 */ lw $a1, 0x0020($sp) +/* 1E66C 8085087C 17000023 */ bne $t8, $zero, .L8085090C +/* 1E670 80850880 00036880 */ sll $t5, $v1, 2 +/* 1E674 80850884 0003C880 */ sll $t9, $v1, 2 /* 1E678 80850888 3C068085 */ lui $a2, %hi(D_80854A58) ## $a2 = 80850000 -/* 1E67C 8085088C 00D93021 */ addu $a2, $a2, $t9 +/* 1E67C 8085088C 00D93021 */ addu $a2, $a2, $t9 /* 1E680 80850890 3C073F54 */ lui $a3, 0x3F54 ## $a3 = 3F540000 /* 1E684 80850894 34E77AE1 */ ori $a3, $a3, 0x7AE1 ## $a3 = 3F547AE1 -/* 1E688 80850898 8CC64A58 */ lw $a2, %lo(D_80854A58)($a2) -/* 1E68C 8085089C 8FA4002C */ lw $a0, 0x002C($sp) -/* 1E690 808508A0 0C029037 */ jal func_800A40DC -/* 1E694 808508A4 8FA50020 */ lw $a1, 0x0020($sp) -/* 1E698 808508A8 8FA4002C */ lw $a0, 0x002C($sp) +/* 1E688 80850898 8CC64A58 */ lw $a2, %lo(D_80854A58)($a2) +/* 1E68C 8085089C 8FA4002C */ lw $a0, 0x002C($sp) +/* 1E690 808508A0 0C029037 */ jal SkelAnime_ChangeLinkAnimPlaybackStop +/* 1E694 808508A4 8FA50020 */ lw $a1, 0x0020($sp) +/* 1E698 808508A8 8FA4002C */ lw $a0, 0x002C($sp) /* 1E69C 808508AC 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 1E6A0 808508B0 0C211A80 */ jal func_80846A00 +/* 1E6A0 808508B0 0C211A80 */ jal func_80846A00 /* 1E6A4 808508B4 8206084F */ lb $a2, 0x084F($s0) ## 0000084F -/* 1E6A8 808508B8 10400010 */ beq $v0, $zero, .L808508FC +/* 1E6A8 808508B8 10400010 */ beq $v0, $zero, .L808508FC /* 1E6AC 808508BC 00000000 */ nop /* 1E6B0 808508C0 8E08067C */ lw $t0, 0x067C($s0) ## 0000067C /* 1E6B4 808508C4 820A084F */ lb $t2, 0x084F($s0) ## 0000084F /* 1E6B8 808508C8 3C013000 */ lui $at, 0x3000 ## $at = 30000000 /* 1E6BC 808508CC 01014825 */ or $t1, $t0, $at ## $t1 = 30000000 -/* 1E6C0 808508D0 15400005 */ bne $t2, $zero, .L808508E8 +/* 1E6C0 808508D0 15400005 */ bne $t2, $zero, .L808508E8 /* 1E6C4 808508D4 AE09067C */ sw $t1, 0x067C($s0) ## 0000067C /* 1E6C8 808508D8 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 /* 1E6CC 808508DC 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 /* 1E6D0 808508E0 804B13B3 */ lb $t3, 0x13B3($v0) ## 8015FA13 -/* 1E6D4 808508E4 1D600014 */ bgtz $t3, .L80850938 +/* 1E6D4 808508E4 1D600014 */ bgtz $t3, .L80850938 .L808508E8: /* 1E6D8 808508E8 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 /* 1E6DC 808508EC 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 /* 1E6E0 808508F0 240C0001 */ addiu $t4, $zero, 0x0001 ## $t4 = 00000001 -/* 1E6E4 808508F4 10000010 */ beq $zero, $zero, .L80850938 +/* 1E6E4 808508F4 10000010 */ beq $zero, $zero, .L80850938 /* 1E6E8 808508F8 A44C13F0 */ sh $t4, 0x13F0($v0) ## 8015FA50 .L808508FC: -/* 1E6EC 808508FC 0C021DB2 */ jal func_800876C8 -/* 1E6F0 80850900 8FA4002C */ lw $a0, 0x002C($sp) -/* 1E6F4 80850904 1000000D */ beq $zero, $zero, .L8085093C +/* 1E6EC 808508FC 0C021DB2 */ jal func_800876C8 +/* 1E6F0 80850900 8FA4002C */ lw $a0, 0x002C($sp) +/* 1E6F4 80850904 1000000D */ beq $zero, $zero, .L8085093C /* 1E6F8 80850908 86180850 */ lh $t8, 0x0850($s0) ## 00000850 .L8085090C: /* 1E6FC 8085090C 3C068085 */ lui $a2, %hi(D_80854A64) ## $a2 = 80850000 -/* 1E700 80850910 00CD3021 */ addu $a2, $a2, $t5 +/* 1E700 80850910 00CD3021 */ addu $a2, $a2, $t5 /* 1E704 80850914 3C073F54 */ lui $a3, 0x3F54 ## $a3 = 3F540000 /* 1E708 80850918 34E77AE1 */ ori $a3, $a3, 0x7AE1 ## $a3 = 3F547AE1 -/* 1E70C 8085091C 0C029067 */ jal func_800A419C -/* 1E710 80850920 8CC64A64 */ lw $a2, %lo(D_80854A64)($a2) +/* 1E70C 8085091C 0C029067 */ jal SkelAnime_ChangeLinkAnimPlaybackRepeat +/* 1E710 80850920 8CC64A64 */ lw $a2, %lo(D_80854A64)($a2) /* 1E714 80850924 820E084F */ lb $t6, 0x084F($s0) ## 0000084F /* 1E718 80850928 240FFFF6 */ addiu $t7, $zero, 0xFFF6 ## $t7 = FFFFFFF6 -/* 1E71C 8085092C 55C00003 */ bnel $t6, $zero, .L8085093C +/* 1E71C 8085092C 55C00003 */ bnel $t6, $zero, .L8085093C /* 1E720 80850930 86180850 */ lh $t8, 0x0850($s0) ## 00000850 /* 1E724 80850934 A60F0850 */ sh $t7, 0x0850($s0) ## 00000850 .L80850938: /* 1E728 80850938 86180850 */ lh $t8, 0x0850($s0) ## 00000850 .L8085093C: /* 1E72C 8085093C 27190001 */ addiu $t9, $t8, 0x0001 ## $t9 = 00000001 -/* 1E730 80850940 10000063 */ beq $zero, $zero, .L80850AD0 +/* 1E730 80850940 10000063 */ beq $zero, $zero, .L80850AD0 /* 1E734 80850944 A6190850 */ sh $t9, 0x0850($s0) ## 00000850 /* 1E738 80850948 86020850 */ lh $v0, 0x0850($s0) ## 00000850 .L8085094C: -/* 1E73C 8085094C 0441002B */ bgez $v0, .L808509FC +/* 1E73C 8085094C 0441002B */ bgez $v0, .L808509FC /* 1E740 80850950 24480001 */ addiu $t0, $v0, 0x0001 ## $t0 = 00000001 /* 1E744 80850954 A6080850 */ sh $t0, 0x0850($s0) ## 00000850 /* 1E748 80850958 86090850 */ lh $t1, 0x0850($s0) ## 00000850 /* 1E74C 8085095C 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 /* 1E750 80850960 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 -/* 1E754 80850964 1520005A */ bne $t1, $zero, .L80850AD0 +/* 1E754 80850964 1520005A */ bne $t1, $zero, .L80850AD0 /* 1E758 80850968 240A0001 */ addiu $t2, $zero, 0x0001 ## $t2 = 00000001 /* 1E75C 8085096C A04A13B3 */ sb $t2, 0x13B3($v0) ## 8015FA13 -/* 1E760 80850970 8FA4002C */ lw $a0, 0x002C($sp) +/* 1E760 80850970 8FA4002C */ lw $a0, 0x002C($sp) /* 1E764 80850974 24050002 */ addiu $a1, $zero, 0x0002 ## $a1 = 00000002 -/* 1E768 80850978 0C0302BD */ jal func_800C0AF4 +/* 1E768 80850978 0C0302BD */ jal func_800C0AF4 /* 1E76C 8085097C 240606FF */ addiu $a2, $zero, 0x06FF ## $a2 = 000006FF /* 1E770 80850980 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 /* 1E774 80850984 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 /* 1E778 80850988 C4441368 */ lwc1 $f4, 0x1368($v0) ## 8015F9C8 /* 1E77C 8085098C C448136C */ lwc1 $f8, 0x136C($v0) ## 8015F9CC /* 1E780 80850990 C4501370 */ lwc1 $f16, 0x1370($v0) ## 8015F9D0 -/* 1E784 80850994 4600218D */ trunc.w.s $f6, $f4 +/* 1E784 80850994 4600218D */ trunc.w.s $f6, $f4 /* 1E788 80850998 240B0001 */ addiu $t3, $zero, 0x0001 ## $t3 = 00000001 /* 1E78C 8085099C AC4B0E80 */ sw $t3, 0x0E80($v0) ## 8015F4E0 -/* 1E790 808509A0 4600428D */ trunc.w.s $f10, $f8 -/* 1E794 808509A4 440D3000 */ mfc1 $t5, $f6 +/* 1E790 808509A0 4600428D */ trunc.w.s $f10, $f8 +/* 1E794 808509A4 440D3000 */ mfc1 $t5, $f6 /* 1E798 808509A8 84481374 */ lh $t0, 0x1374($v0) ## 8015F9D4 -/* 1E79C 808509AC 4600848D */ trunc.w.s $f18, $f16 +/* 1E79C 808509AC 4600848D */ trunc.w.s $f18, $f16 /* 1E7A0 808509B0 AC4D0E64 */ sw $t5, 0x0E64($v0) ## 8015F4C4 -/* 1E7A4 808509B4 440F5000 */ mfc1 $t7, $f10 +/* 1E7A4 808509B4 440F5000 */ mfc1 $t7, $f10 /* 1E7A8 808509B8 844A1378 */ lh $t2, 0x1378($v0) ## 8015F9D8 -/* 1E7AC 808509BC 44199000 */ mfc1 $t9, $f18 +/* 1E7AC 808509BC 44199000 */ mfc1 $t9, $f18 /* 1E7B0 808509C0 904B137A */ lbu $t3, 0x137A($v0) ## 8015F9DA /* 1E7B4 808509C4 8C4C137C */ lw $t4, 0x137C($v0) ## 8015F9DC /* 1E7B8 808509C8 8C4D1380 */ lw $t5, 0x1380($v0) ## 8015F9E0 @@ -135,71 +135,71 @@ glabel func_808507F4 /* 1E7D8 808509E8 AC4B0E7C */ sw $t3, 0x0E7C($v0) ## 8015F4DC /* 1E7DC 808509EC AC4C0E84 */ sw $t4, 0x0E84($v0) ## 8015F4E4 /* 1E7E0 808509F0 AC4D0E88 */ sw $t5, 0x0E88($v0) ## 8015F4E8 -/* 1E7E4 808509F4 10000036 */ beq $zero, $zero, .L80850AD0 +/* 1E7E4 808509F4 10000036 */ beq $zero, $zero, .L80850AD0 /* 1E7E8 808509F8 A60E0850 */ sh $t6, 0x0850($s0) ## 00000850 .L808509FC: /* 1E7EC 808509FC 8203084F */ lb $v1, 0x084F($s0) ## 0000084F -/* 1E7F0 80850A00 04600033 */ bltz $v1, .L80850AD0 +/* 1E7F0 80850A00 04600033 */ bltz $v1, .L80850AD0 /* 1E7F4 80850A04 00000000 */ nop -/* 1E7F8 80850A08 14400007 */ bne $v0, $zero, .L80850A28 +/* 1E7F8 80850A08 14400007 */ bne $v0, $zero, .L80850A28 /* 1E7FC 80850A0C 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001 /* 1E800 80850A10 3C058085 */ lui $a1, %hi(D_80854A80) ## $a1 = 80850000 /* 1E804 80850A14 24A54A80 */ addiu $a1, $a1, %lo(D_80854A80) ## $a1 = 80854A80 -/* 1E808 80850A18 0C20CA49 */ jal func_80832924 +/* 1E808 80850A18 0C20CA49 */ jal func_80832924 /* 1E80C 80850A1C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 1E810 80850A20 1000002B */ beq $zero, $zero, .L80850AD0 +/* 1E810 80850A20 1000002B */ beq $zero, $zero, .L80850AD0 /* 1E814 80850A24 00000000 */ nop .L80850A28: -/* 1E818 80850A28 14410016 */ bne $v0, $at, .L80850A84 +/* 1E818 80850A28 14410016 */ bne $v0, $at, .L80850A84 /* 1E81C 80850A2C 3C0A8085 */ lui $t2, %hi(D_80854A7C) ## $t2 = 80850000 /* 1E820 80850A30 3C188085 */ lui $t8, %hi(D_80854A8C) ## $t8 = 80850000 /* 1E824 80850A34 27184A8C */ addiu $t8, $t8, %lo(D_80854A8C) ## $t8 = 80854A8C -/* 1E828 80850A38 000378C0 */ sll $t7, $v1, 3 -/* 1E82C 80850A3C 01F82821 */ addu $a1, $t7, $t8 -/* 1E830 80850A40 0C20CA49 */ jal func_80832924 +/* 1E828 80850A38 000378C0 */ sll $t7, $v1, 3 +/* 1E82C 80850A3C 01F82821 */ addu $a1, $t7, $t8 +/* 1E830 80850A40 0C20CA49 */ jal func_80832924 /* 1E834 80850A44 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 1E838 80850A48 8219084F */ lb $t9, 0x084F($s0) ## 0000084F /* 1E83C 80850A4C 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002 -/* 1E840 80850A50 8FA40020 */ lw $a0, 0x0020($sp) -/* 1E844 80850A54 1721001E */ bne $t9, $at, .L80850AD0 +/* 1E840 80850A50 8FA40020 */ lw $a0, 0x0020($sp) +/* 1E844 80850A54 1721001E */ bne $t9, $at, .L80850AD0 /* 1E848 80850A58 00000000 */ nop -/* 1E84C 80850A5C 0C02914C */ jal func_800A4530 +/* 1E84C 80850A5C 0C02914C */ jal func_800A4530 /* 1E850 80850A60 3C0541F0 */ lui $a1, 0x41F0 ## $a1 = 41F00000 -/* 1E854 80850A64 1040001A */ beq $v0, $zero, .L80850AD0 +/* 1E854 80850A64 1040001A */ beq $v0, $zero, .L80850AD0 /* 1E858 80850A68 00000000 */ nop /* 1E85C 80850A6C 8E08067C */ lw $t0, 0x067C($s0) ## 0000067C /* 1E860 80850A70 3C01CFFF */ lui $at, 0xCFFF ## $at = CFFF0000 /* 1E864 80850A74 3421FFFF */ ori $at, $at, 0xFFFF ## $at = CFFFFFFF -/* 1E868 80850A78 01014824 */ and $t1, $t0, $at -/* 1E86C 80850A7C 10000014 */ beq $zero, $zero, .L80850AD0 +/* 1E868 80850A78 01014824 */ and $t1, $t0, $at +/* 1E86C 80850A7C 10000014 */ beq $zero, $zero, .L80850AD0 /* 1E870 80850A80 AE09067C */ sw $t1, 0x067C($s0) ## 0000067C .L80850A84: -/* 1E874 80850A84 01435021 */ addu $t2, $t2, $v1 -/* 1E878 80850A88 914A4A7C */ lbu $t2, %lo(D_80854A7C)($t2) +/* 1E874 80850A84 01435021 */ addu $t2, $t2, $v1 +/* 1E878 80850A88 914A4A7C */ lbu $t2, %lo(D_80854A7C)($t2) /* 1E87C 80850A8C 244B0001 */ addiu $t3, $v0, 0x0001 ## $t3 = 00000001 /* 1E880 80850A90 A60B0850 */ sh $t3, 0x0850($s0) ## 00000850 -/* 1E884 80850A94 0142202A */ slt $a0, $t2, $v0 -/* 1E888 80850A98 1080000D */ beq $a0, $zero, .L80850AD0 -/* 1E88C 80850A9C 8FA50020 */ lw $a1, 0x0020($sp) -/* 1E890 80850AA0 00036080 */ sll $t4, $v1, 2 +/* 1E884 80850A94 0142202A */ slt $a0, $t2, $v0 +/* 1E888 80850A98 1080000D */ beq $a0, $zero, .L80850AD0 +/* 1E88C 80850A9C 8FA50020 */ lw $a1, 0x0020($sp) +/* 1E890 80850AA0 00036080 */ sll $t4, $v1, 2 /* 1E894 80850AA4 3C068085 */ lui $a2, %hi(D_80854A70) ## $a2 = 80850000 -/* 1E898 80850AA8 00CC3021 */ addu $a2, $a2, $t4 +/* 1E898 80850AA8 00CC3021 */ addu $a2, $a2, $t4 /* 1E89C 80850AAC 3C073F54 */ lui $a3, 0x3F54 ## $a3 = 3F540000 /* 1E8A0 80850AB0 34E77AE1 */ ori $a3, $a3, 0x7AE1 ## $a3 = 3F547AE1 -/* 1E8A4 80850AB4 8CC64A70 */ lw $a2, %lo(D_80854A70)($a2) -/* 1E8A8 80850AB8 0C029037 */ jal func_800A40DC -/* 1E8AC 80850ABC 8FA4002C */ lw $a0, 0x002C($sp) +/* 1E8A4 80850AB4 8CC64A70 */ lw $a2, %lo(D_80854A70)($a2) +/* 1E8A8 80850AB8 0C029037 */ jal SkelAnime_ChangeLinkAnimPlaybackStop +/* 1E8AC 80850ABC 8FA4002C */ lw $a0, 0x002C($sp) /* 1E8B0 80850AC0 860D00B6 */ lh $t5, 0x00B6($s0) ## 000000B6 /* 1E8B4 80850AC4 240EFFFF */ addiu $t6, $zero, 0xFFFF ## $t6 = FFFFFFFF /* 1E8B8 80850AC8 A20E084F */ sb $t6, 0x084F($s0) ## 0000084F /* 1E8BC 80850ACC A60D083C */ sh $t5, 0x083C($s0) ## 0000083C .L80850AD0: -/* 1E8C0 80850AD0 0C20DC87 */ jal func_8083721C +/* 1E8C0 80850AD0 0C20DC87 */ jal func_8083721C /* 1E8C4 80850AD4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 1E8C8 80850AD8 8FBF001C */ lw $ra, 0x001C($sp) -/* 1E8CC 80850ADC 8FB00018 */ lw $s0, 0x0018($sp) +/* 1E8C8 80850AD8 8FBF001C */ lw $ra, 0x001C($sp) +/* 1E8CC 80850ADC 8FB00018 */ lw $s0, 0x0018($sp) /* 1E8D0 80850AE0 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 1E8D4 80850AE4 03E00008 */ jr $ra +/* 1E8D4 80850AE4 03E00008 */ jr $ra /* 1E8D8 80850AE8 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80850F1C.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80850F1C.s index d3bbedfe2c..dac00da7b6 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80850F1C.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80850F1C.s @@ -1,36 +1,36 @@ glabel func_80850F1C /* 1ED0C 80850F1C 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 1ED10 80850F20 AFBF0024 */ sw $ra, 0x0024($sp) -/* 1ED14 80850F24 AFA40028 */ sw $a0, 0x0028($sp) -/* 1ED18 80850F28 AFA5002C */ sw $a1, 0x002C($sp) -/* 1ED1C 80850F2C AFA60030 */ sw $a2, 0x0030($sp) -/* 1ED20 80850F30 0C20CB6C */ jal func_80832DB0 +/* 1ED10 80850F20 AFBF0024 */ sw $ra, 0x0024($sp) +/* 1ED14 80850F24 AFA40028 */ sw $a0, 0x0028($sp) +/* 1ED18 80850F28 AFA5002C */ sw $a1, 0x002C($sp) +/* 1ED1C 80850F2C AFA60030 */ sw $a2, 0x0030($sp) +/* 1ED20 80850F30 0C20CB6C */ jal func_80832DB0 /* 1ED24 80850F34 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 /* 1ED28 80850F38 0C028800 */ jal SkelAnime_GetFrameCount - -/* 1ED2C 80850F3C 8FA40030 */ lw $a0, 0x0030($sp) + +/* 1ED2C 80850F3C 8FA40030 */ lw $a0, 0x0030($sp) /* 1ED30 80850F40 44823000 */ mtc1 $v0, $f6 ## $f6 = 0.00 /* 1ED34 80850F44 3C01C100 */ lui $at, 0xC100 ## $at = C1000000 /* 1ED38 80850F48 44815000 */ mtc1 $at, $f10 ## $f10 = -8.00 -/* 1ED3C 80850F4C 46803220 */ cvt.s.w $f8, $f6 -/* 1ED40 80850F50 8FA5002C */ lw $a1, 0x002C($sp) +/* 1ED3C 80850F4C 46803220 */ cvt.s.w $f8, $f6 +/* 1ED40 80850F50 8FA5002C */ lw $a1, 0x002C($sp) /* 1ED44 80850F54 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 /* 1ED48 80850F58 3C073F2A */ lui $a3, 0x3F2A ## $a3 = 3F2A0000 /* 1ED4C 80850F5C 240E0002 */ addiu $t6, $zero, 0x0002 ## $t6 = 00000002 -/* 1ED50 80850F60 AFAE0018 */ sw $t6, 0x0018($sp) +/* 1ED50 80850F60 AFAE0018 */ sw $t6, 0x0018($sp) /* 1ED54 80850F64 34E7AAAB */ ori $a3, $a3, 0xAAAB ## $a3 = 3F2AAAAB -/* 1ED58 80850F68 E7A80014 */ swc1 $f8, 0x0014($sp) -/* 1ED5C 80850F6C 8FA40028 */ lw $a0, 0x0028($sp) -/* 1ED60 80850F70 8FA60030 */ lw $a2, 0x0030($sp) -/* 1ED64 80850F74 E7AA001C */ swc1 $f10, 0x001C($sp) +/* 1ED58 80850F68 E7A80014 */ swc1 $f8, 0x0014($sp) +/* 1ED5C 80850F6C 8FA40028 */ lw $a0, 0x0028($sp) +/* 1ED60 80850F70 8FA60030 */ lw $a2, 0x0030($sp) +/* 1ED64 80850F74 E7AA001C */ swc1 $f10, 0x001C($sp) /* 1ED68 80850F78 24A501B4 */ addiu $a1, $a1, 0x01B4 ## $a1 = 000001B4 -/* 1ED6C 80850F7C 0C028FC2 */ jal func_800A3F08 -/* 1ED70 80850F80 E7A40010 */ swc1 $f4, 0x0010($sp) -/* 1ED74 80850F84 0C20C884 */ jal func_80832210 -/* 1ED78 80850F88 8FA4002C */ lw $a0, 0x002C($sp) -/* 1ED7C 80850F8C 8FBF0024 */ lw $ra, 0x0024($sp) +/* 1ED6C 80850F7C 0C028FC2 */ jal SkelAnime_ChangeLinkAnim +/* 1ED70 80850F80 E7A40010 */ swc1 $f4, 0x0010($sp) +/* 1ED74 80850F84 0C20C884 */ jal func_80832210 +/* 1ED78 80850F88 8FA4002C */ lw $a0, 0x002C($sp) +/* 1ED7C 80850F8C 8FBF0024 */ lw $ra, 0x0024($sp) /* 1ED80 80850F90 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 1ED84 80850F94 03E00008 */ jr $ra +/* 1ED84 80850F94 03E00008 */ jr $ra /* 1ED88 80850F98 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80850F9C.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80850F9C.s index dd7b44a2fd..3854a36347 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80850F9C.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80850F9C.s @@ -1,30 +1,30 @@ glabel func_80850F9C /* 1ED8C 80850F9C 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8 -/* 1ED90 80850FA0 AFBF0024 */ sw $ra, 0x0024($sp) -/* 1ED94 80850FA4 AFA40028 */ sw $a0, 0x0028($sp) -/* 1ED98 80850FA8 AFA5002C */ sw $a1, 0x002C($sp) -/* 1ED9C 80850FAC AFA60030 */ sw $a2, 0x0030($sp) -/* 1EDA0 80850FB0 0C20CB6C */ jal func_80832DB0 +/* 1ED90 80850FA0 AFBF0024 */ sw $ra, 0x0024($sp) +/* 1ED94 80850FA4 AFA40028 */ sw $a0, 0x0028($sp) +/* 1ED98 80850FA8 AFA5002C */ sw $a1, 0x002C($sp) +/* 1ED9C 80850FAC AFA60030 */ sw $a2, 0x0030($sp) +/* 1EDA0 80850FB0 0C20CB6C */ jal func_80832DB0 /* 1EDA4 80850FB4 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 /* 1EDA8 80850FB8 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 /* 1EDAC 80850FBC 3C01C100 */ lui $at, 0xC100 ## $at = C1000000 /* 1EDB0 80850FC0 44812000 */ mtc1 $at, $f4 ## $f4 = -8.00 -/* 1EDB4 80850FC4 8FA5002C */ lw $a1, 0x002C($sp) +/* 1EDB4 80850FC4 8FA5002C */ lw $a1, 0x002C($sp) /* 1EDB8 80850FC8 3C073F2A */ lui $a3, 0x3F2A ## $a3 = 3F2A0000 /* 1EDBC 80850FCC 34E7AAAB */ ori $a3, $a3, 0xAAAB ## $a3 = 3F2AAAAB -/* 1EDC0 80850FD0 8FA40028 */ lw $a0, 0x0028($sp) -/* 1EDC4 80850FD4 8FA60030 */ lw $a2, 0x0030($sp) -/* 1EDC8 80850FD8 AFA00018 */ sw $zero, 0x0018($sp) -/* 1EDCC 80850FDC E7A00010 */ swc1 $f0, 0x0010($sp) -/* 1EDD0 80850FE0 E7A00014 */ swc1 $f0, 0x0014($sp) +/* 1EDC0 80850FD0 8FA40028 */ lw $a0, 0x0028($sp) +/* 1EDC4 80850FD4 8FA60030 */ lw $a2, 0x0030($sp) +/* 1EDC8 80850FD8 AFA00018 */ sw $zero, 0x0018($sp) +/* 1EDCC 80850FDC E7A00010 */ swc1 $f0, 0x0010($sp) +/* 1EDD0 80850FE0 E7A00014 */ swc1 $f0, 0x0014($sp) /* 1EDD4 80850FE4 24A501B4 */ addiu $a1, $a1, 0x01B4 ## $a1 = 000001B4 -/* 1EDD8 80850FE8 0C028FC2 */ jal func_800A3F08 -/* 1EDDC 80850FEC E7A4001C */ swc1 $f4, 0x001C($sp) -/* 1EDE0 80850FF0 0C20C884 */ jal func_80832210 -/* 1EDE4 80850FF4 8FA4002C */ lw $a0, 0x002C($sp) -/* 1EDE8 80850FF8 8FBF0024 */ lw $ra, 0x0024($sp) +/* 1EDD8 80850FE8 0C028FC2 */ jal SkelAnime_ChangeLinkAnim +/* 1EDDC 80850FEC E7A4001C */ swc1 $f4, 0x001C($sp) +/* 1EDE0 80850FF0 0C20C884 */ jal func_80832210 +/* 1EDE4 80850FF4 8FA4002C */ lw $a0, 0x002C($sp) +/* 1EDE8 80850FF8 8FBF0024 */ lw $ra, 0x0024($sp) /* 1EDEC 80850FFC 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 1EDF0 80851000 03E00008 */ jr $ra +/* 1EDF0 80851000 03E00008 */ jr $ra /* 1EDF4 80851004 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808515A4.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_808515A4.s index c6402f57d4..92e0b87e96 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_808515A4.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_808515A4.s @@ -1,66 +1,66 @@ glabel func_808515A4 /* 1F394 808515A4 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 1F398 808515A8 AFBF002C */ sw $ra, 0x002C($sp) -/* 1F39C 808515AC AFB00028 */ sw $s0, 0x0028($sp) -/* 1F3A0 808515B0 AFA40038 */ sw $a0, 0x0038($sp) +/* 1F398 808515A8 AFBF002C */ sw $ra, 0x002C($sp) +/* 1F39C 808515AC AFB00028 */ sw $s0, 0x0028($sp) +/* 1F3A0 808515B0 AFA40038 */ sw $a0, 0x0038($sp) /* 1F3A4 808515B4 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 -/* 1F3A8 808515B8 AFA60040 */ sw $a2, 0x0040($sp) -/* 1F3AC 808515BC 0C20CCAE */ jal func_808332B8 +/* 1F3A8 808515B8 AFA60040 */ sw $a2, 0x0040($sp) +/* 1F3AC 808515BC 0C20CCAE */ jal func_808332B8 /* 1F3B0 808515C0 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000 -/* 1F3B4 808515C4 10400007 */ beq $v0, $zero, .L808515E4 +/* 1F3B4 808515C4 10400007 */ beq $v0, $zero, .L808515E4 /* 1F3B8 808515C8 3C068085 */ lui $a2, %hi(D_80853D34) ## $a2 = 80850000 -/* 1F3BC 808515CC 8FA40038 */ lw $a0, 0x0038($sp) +/* 1F3BC 808515CC 8FA40038 */ lw $a0, 0x0038($sp) /* 1F3C0 808515D0 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 1F3C4 808515D4 0C2144DA */ jal func_80851368 +/* 1F3C4 808515D4 0C2144DA */ jal func_80851368 /* 1F3C8 808515D8 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 1F3CC 808515DC 10000026 */ beq $zero, $zero, .L80851678 -/* 1F3D0 808515E0 8FBF002C */ lw $ra, 0x002C($sp) +/* 1F3CC 808515DC 10000026 */ beq $zero, $zero, .L80851678 +/* 1F3D0 808515E0 8FBF002C */ lw $ra, 0x002C($sp) .L808515E4: /* 1F3D4 808515E4 920E015B */ lbu $t6, 0x015B($s0) ## 0000015B /* 1F3D8 808515E8 92020446 */ lbu $v0, 0x0446($s0) ## 00000446 /* 1F3DC 808515EC 24010006 */ addiu $at, $zero, 0x0006 ## $at = 00000006 -/* 1F3E0 808515F0 000E7880 */ sll $t7, $t6, 2 -/* 1F3E4 808515F4 00CF3021 */ addu $a2, $a2, $t7 -/* 1F3E8 808515F8 10410004 */ beq $v0, $at, .L8085160C -/* 1F3EC 808515FC 8CC63D34 */ lw $a2, %lo(D_80853D34)($a2) +/* 1F3E0 808515F0 000E7880 */ sll $t7, $t6, 2 +/* 1F3E4 808515F4 00CF3021 */ addu $a2, $a2, $t7 +/* 1F3E8 808515F8 10410004 */ beq $v0, $at, .L8085160C +/* 1F3EC 808515FC 8CC63D34 */ lw $a2, %lo(D_80853D34)($a2) /* 1F3F0 80851600 2401002E */ addiu $at, $zero, 0x002E ## $at = 0000002E -/* 1F3F4 80851604 14410006 */ bne $v0, $at, .L80851620 +/* 1F3F4 80851604 14410006 */ bne $v0, $at, .L80851620 /* 1F3F8 80851608 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 .L8085160C: -/* 1F3FC 8085160C 8FA40038 */ lw $a0, 0x0038($sp) -/* 1F400 80851610 0C20C899 */ jal func_80832264 +/* 1F3FC 8085160C 8FA40038 */ lw $a0, 0x0038($sp) +/* 1F400 80851610 0C20C899 */ jal func_80832264 /* 1F404 80851614 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 1F408 80851618 10000014 */ beq $zero, $zero, .L8085166C +/* 1F408 80851618 10000014 */ beq $zero, $zero, .L8085166C /* 1F40C 8085161C 00000000 */ nop .L80851620: -/* 1F410 80851620 0C20CB6C */ jal func_80832DB0 -/* 1F414 80851624 AFA60034 */ sw $a2, 0x0034($sp) +/* 1F410 80851620 0C20CB6C */ jal func_80832DB0 +/* 1F414 80851624 AFA60034 */ sw $a2, 0x0034($sp) /* 1F418 80851628 0C028800 */ jal SkelAnime_GetFrameCount - -/* 1F41C 8085162C 8FA40034 */ lw $a0, 0x0034($sp) + +/* 1F41C 8085162C 8FA40034 */ lw $a0, 0x0034($sp) /* 1F420 80851630 44823000 */ mtc1 $v0, $f6 ## $f6 = 0.00 /* 1F424 80851634 3C01C080 */ lui $at, 0xC080 ## $at = C0800000 /* 1F428 80851638 44815000 */ mtc1 $at, $f10 ## $f10 = -4.00 -/* 1F42C 8085163C 46803220 */ cvt.s.w $f8, $f6 +/* 1F42C 8085163C 46803220 */ cvt.s.w $f8, $f6 /* 1F430 80851640 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 /* 1F434 80851644 3C073F2A */ lui $a3, 0x3F2A ## $a3 = 3F2A0000 /* 1F438 80851648 34E7AAAB */ ori $a3, $a3, 0xAAAB ## $a3 = 3F2AAAAB -/* 1F43C 8085164C 8FA60034 */ lw $a2, 0x0034($sp) -/* 1F440 80851650 8FA40038 */ lw $a0, 0x0038($sp) -/* 1F444 80851654 E7A80014 */ swc1 $f8, 0x0014($sp) +/* 1F43C 8085164C 8FA60034 */ lw $a2, 0x0034($sp) +/* 1F440 80851650 8FA40038 */ lw $a0, 0x0038($sp) +/* 1F444 80851654 E7A80014 */ swc1 $f8, 0x0014($sp) /* 1F448 80851658 260501B4 */ addiu $a1, $s0, 0x01B4 ## $a1 = 000001B4 -/* 1F44C 8085165C AFA00018 */ sw $zero, 0x0018($sp) -/* 1F450 80851660 E7AA001C */ swc1 $f10, 0x001C($sp) -/* 1F454 80851664 0C028FC2 */ jal func_800A3F08 -/* 1F458 80851668 E7A40010 */ swc1 $f4, 0x0010($sp) +/* 1F44C 8085165C AFA00018 */ sw $zero, 0x0018($sp) +/* 1F450 80851660 E7AA001C */ swc1 $f10, 0x001C($sp) +/* 1F454 80851664 0C028FC2 */ jal SkelAnime_ChangeLinkAnim +/* 1F458 80851668 E7A40010 */ swc1 $f4, 0x0010($sp) .L8085166C: -/* 1F45C 8085166C 0C20C884 */ jal func_80832210 +/* 1F45C 8085166C 0C20C884 */ jal func_80832210 /* 1F460 80851670 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 1F464 80851674 8FBF002C */ lw $ra, 0x002C($sp) +/* 1F464 80851674 8FBF002C */ lw $ra, 0x002C($sp) .L80851678: -/* 1F468 80851678 8FB00028 */ lw $s0, 0x0028($sp) +/* 1F468 80851678 8FB00028 */ lw $s0, 0x0028($sp) /* 1F46C 8085167C 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 -/* 1F470 80851680 03E00008 */ jr $ra +/* 1F470 80851680 03E00008 */ jr $ra /* 1F474 80851684 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80851B90.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80851B90.s index a83cabefc2..9b7319895d 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80851B90.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80851B90.s @@ -3,23 +3,23 @@ glabel func_80851B90 /* 1F984 80851B94 3C014140 */ lui $at, 0x4140 ## $at = 41400000 /* 1F988 80851B98 44810000 */ mtc1 $at, $f0 ## $f0 = 12.00 /* 1F98C 80851B9C 44802000 */ mtc1 $zero, $f4 ## $f4 = 0.00 -/* 1F990 80851BA0 AFA60030 */ sw $a2, 0x0030($sp) -/* 1F994 80851BA4 AFBF0024 */ sw $ra, 0x0024($sp) -/* 1F998 80851BA8 AFA5002C */ sw $a1, 0x002C($sp) +/* 1F990 80851BA0 AFA60030 */ sw $a2, 0x0030($sp) +/* 1F994 80851BA4 AFBF0024 */ sw $ra, 0x0024($sp) +/* 1F998 80851BA8 AFA5002C */ sw $a1, 0x002C($sp) /* 1F99C 80851BAC 3C060400 */ lui $a2, 0x0400 ## $a2 = 04000000 /* 1F9A0 80851BB0 3C07BF2A */ lui $a3, 0xBF2A ## $a3 = BF2A0000 /* 1F9A4 80851BB4 240E0002 */ addiu $t6, $zero, 0x0002 ## $t6 = 00000002 -/* 1F9A8 80851BB8 AFAE0018 */ sw $t6, 0x0018($sp) +/* 1F9A8 80851BB8 AFAE0018 */ sw $t6, 0x0018($sp) /* 1F9AC 80851BBC 34E7AAAB */ ori $a3, $a3, 0xAAAB ## $a3 = BF2AAAAB /* 1F9B0 80851BC0 24C62860 */ addiu $a2, $a2, 0x2860 ## $a2 = 04002860 /* 1F9B4 80851BC4 24A501B4 */ addiu $a1, $a1, 0x01B4 ## $a1 = 000001B4 -/* 1F9B8 80851BC8 E7A00010 */ swc1 $f0, 0x0010($sp) -/* 1F9BC 80851BCC E7A00014 */ swc1 $f0, 0x0014($sp) -/* 1F9C0 80851BD0 0C028FC2 */ jal func_800A3F08 -/* 1F9C4 80851BD4 E7A4001C */ swc1 $f4, 0x001C($sp) -/* 1F9C8 80851BD8 8FBF0024 */ lw $ra, 0x0024($sp) +/* 1F9B8 80851BC8 E7A00010 */ swc1 $f0, 0x0010($sp) +/* 1F9BC 80851BCC E7A00014 */ swc1 $f0, 0x0014($sp) +/* 1F9C0 80851BD0 0C028FC2 */ jal SkelAnime_ChangeLinkAnim +/* 1F9C4 80851BD4 E7A4001C */ swc1 $f4, 0x001C($sp) +/* 1F9C8 80851BD8 8FBF0024 */ lw $ra, 0x0024($sp) /* 1F9CC 80851BDC 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000 -/* 1F9D0 80851BE0 03E00008 */ jr $ra +/* 1F9D0 80851BE0 03E00008 */ jr $ra /* 1F9D4 80851BE4 00000000 */ nop diff --git a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80851BE8.s b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80851BE8.s index 3c358d9f10..ea60fd8225 100644 --- a/asm/non_matchings/overlays/actors/ovl_player_actor/func_80851BE8.s +++ b/asm/non_matchings/overlays/actors/ovl_player_actor/func_80851BE8.s @@ -1,53 +1,53 @@ glabel func_80851BE8 /* 1F9D8 80851BE8 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 1F9DC 80851BEC AFB00028 */ sw $s0, 0x0028($sp) +/* 1F9DC 80851BEC AFB00028 */ sw $s0, 0x0028($sp) /* 1F9E0 80851BF0 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 -/* 1F9E4 80851BF4 AFBF002C */ sw $ra, 0x002C($sp) +/* 1F9E4 80851BF4 AFBF002C */ sw $ra, 0x002C($sp) /* 1F9E8 80851BF8 24A501B4 */ addiu $a1, $a1, 0x01B4 ## $a1 = 000001B4 -/* 1F9EC 80851BFC AFA40038 */ sw $a0, 0x0038($sp) -/* 1F9F0 80851C00 AFA60040 */ sw $a2, 0x0040($sp) -/* 1F9F4 80851C04 0C028EF0 */ jal func_800A3BC0 -/* 1F9F8 80851C08 AFA50030 */ sw $a1, 0x0030($sp) +/* 1F9EC 80851BFC AFA40038 */ sw $a0, 0x0038($sp) +/* 1F9F0 80851C00 AFA60040 */ sw $a2, 0x0040($sp) +/* 1F9F4 80851C04 0C028EF0 */ jal func_800A3BC0 +/* 1F9F8 80851C08 AFA50030 */ sw $a1, 0x0030($sp) /* 1F9FC 80851C0C 860E0850 */ lh $t6, 0x0850($s0) ## 00000850 /* 1FA00 80851C10 25CF0001 */ addiu $t7, $t6, 0x0001 ## $t7 = 00000001 /* 1FA04 80851C14 A60F0850 */ sh $t7, 0x0850($s0) ## 00000850 /* 1FA08 80851C18 86030850 */ lh $v1, 0x0850($s0) ## 00000850 -/* 1FA0C 80851C1C 286100B4 */ slti $at, $v1, 0x00B4 -/* 1FA10 80851C20 1420001B */ bne $at, $zero, .L80851C90 +/* 1FA0C 80851C1C 286100B4 */ slti $at, $v1, 0x00B4 +/* 1FA10 80851C20 1420001B */ bne $at, $zero, .L80851C90 /* 1FA14 80851C24 240100B4 */ addiu $at, $zero, 0x00B4 ## $at = 000000B4 -/* 1FA18 80851C28 14610015 */ bne $v1, $at, .L80851C80 +/* 1FA18 80851C28 14610015 */ bne $v1, $at, .L80851C80 /* 1FA1C 80851C2C 3C040400 */ lui $a0, 0x0400 ## $a0 = 04000000 /* 1FA20 80851C30 0C028800 */ jal SkelAnime_GetFrameCount - + /* 1FA24 80851C34 24843298 */ addiu $a0, $a0, 0x3298 ## $a0 = 04003298 /* 1FA28 80851C38 44823000 */ mtc1 $v0, $f6 ## $f6 = 0.00 /* 1FA2C 80851C3C 3C014120 */ lui $at, 0x4120 ## $at = 41200000 /* 1FA30 80851C40 44812000 */ mtc1 $at, $f4 ## $f4 = 10.00 -/* 1FA34 80851C44 46803220 */ cvt.s.w $f8, $f6 +/* 1FA34 80851C44 46803220 */ cvt.s.w $f8, $f6 /* 1FA38 80851C48 3C01C100 */ lui $at, 0xC100 ## $at = C1000000 /* 1FA3C 80851C4C 44815000 */ mtc1 $at, $f10 ## $f10 = -8.00 /* 1FA40 80851C50 3C060400 */ lui $a2, 0x0400 ## $a2 = 04000000 /* 1FA44 80851C54 3C073F2A */ lui $a3, 0x3F2A ## $a3 = 3F2A0000 /* 1FA48 80851C58 24180002 */ addiu $t8, $zero, 0x0002 ## $t8 = 00000002 -/* 1FA4C 80851C5C AFB80018 */ sw $t8, 0x0018($sp) +/* 1FA4C 80851C5C AFB80018 */ sw $t8, 0x0018($sp) /* 1FA50 80851C60 34E7AAAB */ ori $a3, $a3, 0xAAAB ## $a3 = 3F2AAAAB /* 1FA54 80851C64 24C63298 */ addiu $a2, $a2, 0x3298 ## $a2 = 04003298 -/* 1FA58 80851C68 E7A80014 */ swc1 $f8, 0x0014($sp) -/* 1FA5C 80851C6C 8FA40038 */ lw $a0, 0x0038($sp) -/* 1FA60 80851C70 8FA50030 */ lw $a1, 0x0030($sp) -/* 1FA64 80851C74 E7A40010 */ swc1 $f4, 0x0010($sp) -/* 1FA68 80851C78 0C028FC2 */ jal func_800A3F08 -/* 1FA6C 80851C7C E7AA001C */ swc1 $f10, 0x001C($sp) +/* 1FA58 80851C68 E7A80014 */ swc1 $f8, 0x0014($sp) +/* 1FA5C 80851C6C 8FA40038 */ lw $a0, 0x0038($sp) +/* 1FA60 80851C70 8FA50030 */ lw $a1, 0x0030($sp) +/* 1FA64 80851C74 E7A40010 */ swc1 $f4, 0x0010($sp) +/* 1FA68 80851C78 0C028FC2 */ jal SkelAnime_ChangeLinkAnim +/* 1FA6C 80851C7C E7AA001C */ swc1 $f10, 0x001C($sp) .L80851C80: /* 1FA70 80851C80 3C058085 */ lui $a1, %hi(D_808551B4) ## $a1 = 80850000 /* 1FA74 80851C84 24A551B4 */ addiu $a1, $a1, %lo(D_808551B4) ## $a1 = 808551B4 -/* 1FA78 80851C88 0C20CA49 */ jal func_80832924 +/* 1FA78 80851C88 0C20CA49 */ jal func_80832924 /* 1FA7C 80851C8C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 .L80851C90: -/* 1FA80 80851C90 8FBF002C */ lw $ra, 0x002C($sp) -/* 1FA84 80851C94 8FB00028 */ lw $s0, 0x0028($sp) +/* 1FA80 80851C90 8FBF002C */ lw $ra, 0x002C($sp) +/* 1FA84 80851C94 8FB00028 */ lw $s0, 0x0028($sp) /* 1FA88 80851C98 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 -/* 1FA8C 80851C9C 03E00008 */ jr $ra +/* 1FA8C 80851C9C 03E00008 */ jr $ra /* 1FA90 80851CA0 00000000 */ nop diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Blast/func_8099EF08.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Blast/func_8099EF08.s index d7f8796e62..a2d87daa62 100644 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Blast/func_8099EF08.s +++ b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Blast/func_8099EF08.s @@ -11,7 +11,7 @@ glabel func_8099EF08 /* 0017C 8099EF2C 24C6F120 */ addiu $a2, $a2, %lo(D_8099F120) ## $a2 = 8099F120 /* 00180 8099EF30 27A40038 */ addiu $a0, $sp, 0x0038 ## $a0 = FFFFFFA0 /* 00184 8099EF34 240700AA */ addiu $a3, $zero, 0x00AA ## $a3 = 000000AA -/* 00188 8099EF38 0C031AB1 */ jal func_800C6AC4 +/* 00188 8099EF38 0C031AB1 */ jal Graph_OpenDisps /* 0018C 8099EF3C 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 00190 8099EF40 862F0052 */ lh $t7, 0x0052($s1) ## 00000052 /* 00194 8099EF44 3C01809A */ lui $at, %hi(D_8099F15C) ## $at = 809A0000 @@ -97,7 +97,7 @@ glabel func_8099EF08 /* 002D4 8099F084 8E2D0038 */ lw $t5, 0x0038($s1) ## 00000038 /* 002D8 8099F088 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 002DC 8099F08C 240700CC */ addiu $a3, $zero, 0x00CC ## $a3 = 000000CC -/* 002E0 8099F090 0C031AD5 */ jal func_800C6B54 +/* 002E0 8099F090 0C031AD5 */ jal Graph_CloseDisps /* 002E4 8099F094 AC4D0004 */ sw $t5, 0x0004($v0) ## 00000004 /* 002E8 8099F098 8FBF001C */ lw $ra, 0x001C($sp) /* 002EC 8099F09C 8FB00014 */ lw $s0, 0x0014($sp) diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Bomb/func_8099F274.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Bomb/func_8099F274.s index f2ce79afc1..7b78852c09 100644 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Bomb/func_8099F274.s +++ b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Bomb/func_8099F274.s @@ -10,7 +10,7 @@ glabel func_8099F274 /* 000E4 8099F294 24C6F5A0 */ addiu $a2, $a2, %lo(D_8099F5A0) ## $a2 = 8099F5A0 /* 000E8 8099F298 27A40048 */ addiu $a0, $sp, 0x0048 ## $a0 = FFFFFED8 /* 000EC 8099F29C 240700A8 */ addiu $a3, $zero, 0x00A8 ## $a3 = 000000A8 -/* 000F0 8099F2A0 0C031AB1 */ jal func_800C6AC4 +/* 000F0 8099F2A0 0C031AB1 */ jal Graph_OpenDisps /* 000F4 8099F2A4 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 000F8 8099F2A8 8FA20178 */ lw $v0, 0x0178($sp) /* 000FC 8099F2AC 3C0142C8 */ lui $at, 0x42C8 ## $at = 42C80000 @@ -146,7 +146,7 @@ glabel func_8099F274 /* 00300 8099F4B0 24C6F5B4 */ addiu $a2, $a2, %lo(D_8099F5B4) ## $a2 = 8099F5B4 /* 00304 8099F4B4 27A40048 */ addiu $a0, $sp, 0x0048 ## $a0 = FFFFFED8 /* 00308 8099F4B8 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 0030C 8099F4BC 0C031AD5 */ jal func_800C6B54 +/* 0030C 8099F4BC 0C031AD5 */ jal Graph_CloseDisps /* 00310 8099F4C0 240700D6 */ addiu $a3, $zero, 0x00D6 ## $a3 = 000000D6 /* 00314 8099F4C4 8FBF001C */ lw $ra, 0x001C($sp) /* 00318 8099F4C8 8FB00018 */ lw $s0, 0x0018($sp) diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Bomb2/func_8099F748.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Bomb2/func_8099F748.s index b6950e83b8..d7ee761cfb 100644 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Bomb2/func_8099F748.s +++ b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Bomb2/func_8099F748.s @@ -11,7 +11,7 @@ glabel func_8099F748 /* 0011C 8099F76C 24C6FF20 */ addiu $a2, $a2, %lo(D_8099FF20) ## $a2 = 8099FF20 /* 00120 8099F770 27A4003C */ addiu $a0, $sp, 0x003C ## $a0 = FFFFFEDC /* 00124 8099F774 2407012A */ addiu $a3, $zero, 0x012A ## $a3 = 0000012A -/* 00128 8099F778 0C031AB1 */ jal func_800C6AC4 +/* 00128 8099F778 0C031AB1 */ jal Graph_OpenDisps /* 0012C 8099F77C 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 /* 00130 8099F780 860F0040 */ lh $t7, 0x0040($s0) ## 00000040 /* 00134 8099F784 3C01809A */ lui $at, %hi(D_8099FF84) ## $at = 809A0000 @@ -127,7 +127,7 @@ glabel func_8099F748 /* 002E8 8099F938 24C6FF34 */ addiu $a2, $a2, %lo(D_8099FF34) ## $a2 = 8099FF34 /* 002EC 8099F93C 27A4003C */ addiu $a0, $sp, 0x003C ## $a0 = FFFFFEDC /* 002F0 8099F940 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 002F4 8099F944 0C031AD5 */ jal func_800C6B54 +/* 002F4 8099F944 0C031AD5 */ jal Graph_CloseDisps /* 002F8 8099F948 24070159 */ addiu $a3, $zero, 0x0159 ## $a3 = 00000159 /* 002FC 8099F94C 8FBF001C */ lw $ra, 0x001C($sp) /* 00300 8099F950 8FB00014 */ lw $s0, 0x0014($sp) diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Bomb2/func_8099F960.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Bomb2/func_8099F960.s index b00d0fe954..6779985361 100644 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Bomb2/func_8099F960.s +++ b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Bomb2/func_8099F960.s @@ -21,7 +21,7 @@ glabel func_8099F960 /* 0035C 8099F9AC 24C6FF48 */ addiu $a2, $a2, %lo(D_8099FF48) ## $a2 = 8099FF48 /* 00360 8099F9B0 27A4007C */ addiu $a0, $sp, 0x007C ## $a0 = FFFFFE84 /* 00364 8099F9B4 24070182 */ addiu $a3, $zero, 0x0182 ## $a3 = 00000182 -/* 00368 8099F9B8 0C031AB1 */ jal func_800C6AC4 +/* 00368 8099F9B8 0C031AB1 */ jal Graph_OpenDisps /* 0036C 8099F9BC 02402825 */ or $a1, $s2, $zero ## $a1 = 00000000 /* 00370 8099F9C0 868F0040 */ lh $t7, 0x0040($s4) ## 00000040 /* 00374 8099F9C4 868E0054 */ lh $t6, 0x0054($s4) ## 00000054 @@ -205,7 +205,7 @@ glabel func_8099F960 /* 00634 8099FC84 24C6FF70 */ addiu $a2, $a2, %lo(D_8099FF70) ## $a2 = 8099FF70 /* 00638 8099FC88 27A4007C */ addiu $a0, $sp, 0x007C ## $a0 = FFFFFE84 /* 0063C 8099FC8C 02402825 */ or $a1, $s2, $zero ## $a1 = 00000000 -/* 00640 8099FC90 0C031AD5 */ jal func_800C6B54 +/* 00640 8099FC90 0C031AD5 */ jal Graph_CloseDisps /* 00644 8099FC94 240701C8 */ addiu $a3, $zero, 0x01C8 ## $a3 = 000001C8 /* 00648 8099FC98 8FBF004C */ lw $ra, 0x004C($sp) /* 0064C 8099FC9C D7B40018 */ ldc1 $f20, 0x0018($sp) diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Bubble/func_809A01CC.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Bubble/func_809A01CC.s index bfc273be8d..e36468034a 100644 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Bubble/func_809A01CC.s +++ b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Bubble/func_809A01CC.s @@ -18,7 +18,7 @@ glabel func_809A01CC /* 001CC 809A020C 2407009A */ addiu $a3, $zero, 0x009A ## $a3 = 0000009A /* 001D0 809A0210 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 001D4 809A0214 46083283 */ div.s $f10, $f6, $f8 -/* 001D8 809A0218 0C031AB1 */ jal func_800C6AC4 +/* 001D8 809A0218 0C031AB1 */ jal Graph_OpenDisps /* 001DC 809A021C E7AA0050 */ swc1 $f10, 0x0050($sp) /* 001E0 809A0220 C62C0000 */ lwc1 $f12, 0x0000($s1) ## 00000000 /* 001E4 809A0224 C62E0004 */ lwc1 $f14, 0x0004($s1) ## 00000004 @@ -93,7 +93,7 @@ glabel func_809A01CC /* 002F8 809A0338 27A4003C */ addiu $a0, $sp, 0x003C ## $a0 = FFFFFFE4 /* 002FC 809A033C 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 00300 809A0340 240700B3 */ addiu $a3, $zero, 0x00B3 ## $a3 = 000000B3 -/* 00304 809A0344 0C031AD5 */ jal func_800C6B54 +/* 00304 809A0344 0C031AD5 */ jal Graph_CloseDisps /* 00308 809A0348 AC4F0004 */ sw $t7, 0x0004($v0) ## 00000004 /* 0030C 809A034C 8FBF001C */ lw $ra, 0x001C($sp) /* 00310 809A0350 8FB00014 */ lw $s0, 0x0014($sp) diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_D_Fire/func_809A0698.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_D_Fire/func_809A0698.s index 65d6cdd0c9..4ac54c4cd1 100644 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_D_Fire/func_809A0698.s +++ b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_D_Fire/func_809A0698.s @@ -20,7 +20,7 @@ glabel func_809A0698 /* 00190 809A06E0 27A40040 */ addiu $a0, $sp, 0x0040 ## $a0 = FFFFFED8 /* 00194 809A06E4 24070114 */ addiu $a3, $zero, 0x0114 ## $a3 = 00000114 /* 00198 809A06E8 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 0019C 809A06EC 0C031AB1 */ jal func_800C6AC4 +/* 0019C 809A06EC 0C031AB1 */ jal Graph_OpenDisps /* 001A0 809A06F0 AFA9005C */ sw $t1, 0x005C($sp) /* 001A4 809A06F4 8FA40168 */ lw $a0, 0x0168($sp) /* 001A8 809A06F8 3C010001 */ lui $at, 0x0001 ## $at = 00010000 @@ -151,7 +151,7 @@ glabel func_809A0698 /* 00394 809A08E4 24C60A28 */ addiu $a2, $a2, %lo(D_809A0A28) ## $a2 = 809A0A28 /* 00398 809A08E8 27A40040 */ addiu $a0, $sp, 0x0040 ## $a0 = FFFFFED8 /* 0039C 809A08EC 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 003A0 809A08F0 0C031AD5 */ jal func_800C6B54 +/* 003A0 809A08F0 0C031AD5 */ jal Graph_CloseDisps /* 003A4 809A08F4 2407014A */ addiu $a3, $zero, 0x014A ## $a3 = 0000014A /* 003A8 809A08F8 8FBF001C */ lw $ra, 0x001C($sp) /* 003AC 809A08FC 8FB00014 */ lw $s0, 0x0014($sp) diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Dead_Db/func_809A0BB8.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Dead_Db/func_809A0BB8.s index e99d386497..5c47267770 100644 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Dead_Db/func_809A0BB8.s +++ b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Dead_Db/func_809A0BB8.s @@ -11,7 +11,7 @@ glabel func_809A0BB8 /* 0013C 809A0BDC 24C60F50 */ addiu $a2, $a2, %lo(D_809A0F50) ## $a2 = 809A0F50 /* 00140 809A0BE0 27A40038 */ addiu $a0, $sp, 0x0038 ## $a0 = FFFFFF20 /* 00144 809A0BE4 240700C9 */ addiu $a3, $zero, 0x00C9 ## $a3 = 000000C9 -/* 00148 809A0BE8 0C031AB1 */ jal func_800C6AC4 +/* 00148 809A0BE8 0C031AB1 */ jal Graph_OpenDisps /* 0014C 809A0BEC 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 /* 00150 809A0BF0 860F0040 */ lh $t7, 0x0040($s0) ## 00000040 /* 00154 809A0BF4 3C01809A */ lui $at, %hi(D_809A0F80) ## $at = 809A0000 @@ -120,7 +120,7 @@ glabel func_809A0BB8 /* 002EC 809A0D8C 24C60F68 */ addiu $a2, $a2, %lo(D_809A0F68) ## $a2 = 809A0F68 /* 002F0 809A0D90 27A40038 */ addiu $a0, $sp, 0x0038 ## $a0 = FFFFFF20 /* 002F4 809A0D94 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 002F8 809A0D98 0C031AD5 */ jal func_800C6B54 +/* 002F8 809A0D98 0C031AD5 */ jal Graph_CloseDisps /* 002FC 809A0D9C 240700F7 */ addiu $a3, $zero, 0x00F7 ## $a3 = 000000F7 /* 00300 809A0DA0 8FBF001C */ lw $ra, 0x001C($sp) /* 00304 809A0DA4 8FB00014 */ lw $s0, 0x0014($sp) diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Dead_Dd/func_809A12B4.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Dead_Dd/func_809A12B4.s index 1139cf20d2..b7f505c759 100644 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Dead_Dd/func_809A12B4.s +++ b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Dead_Dd/func_809A12B4.s @@ -11,7 +11,7 @@ glabel func_809A12B4 /* 0002F8 809A12D8 24C6157C */ addiu $a2, %lo(D_809A157C) # addiu $a2, $a2, 0x157c /* 0002FC 809A12DC 27A40040 */ addiu $a0, $sp, 0x40 /* 000300 809A12E0 240700D6 */ li $a3, 214 -/* 000304 809A12E4 0C031AB1 */ jal func_800C6AC4 +/* 000304 809A12E4 0C031AB1 */ jal Graph_OpenDisps /* 000308 809A12E8 02202825 */ move $a1, $s1 /* 00030C 809A12EC 860F0040 */ lh $t7, 0x40($s0) /* 000310 809A12F0 3C01809A */ lui $at, %hi(D_809A15AC) # $at, 0x809a @@ -120,7 +120,7 @@ glabel func_809A12B4 /* 0004A8 809A1488 24C61594 */ addiu $a2, %lo(D_809A1594) # addiu $a2, $a2, 0x1594 /* 0004AC 809A148C 27A40040 */ addiu $a0, $sp, 0x40 /* 0004B0 809A1490 02202825 */ move $a1, $s1 -/* 0004B4 809A1494 0C031AD5 */ jal func_800C6B54 +/* 0004B4 809A1494 0C031AD5 */ jal Graph_CloseDisps /* 0004B8 809A1498 24070103 */ li $a3, 259 /* 0004BC 809A149C 8FBF001C */ lw $ra, 0x1c($sp) /* 0004C0 809A14A0 8FB00014 */ lw $s0, 0x14($sp) diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Dead_Ds/func_809A16F4.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Dead_Ds/func_809A16F4.s index dd676e7874..774108fd6d 100644 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Dead_Ds/func_809A16F4.s +++ b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Dead_Ds/func_809A16F4.s @@ -1,27 +1,27 @@ glabel func_809A16F4 /* 000E4 809A16F4 27BDFF28 */ addiu $sp, $sp, 0xFF28 ## $sp = FFFFFF28 -/* 000E8 809A16F8 AFB00024 */ sw $s0, 0x0024($sp) -/* 000EC 809A16FC AFBF002C */ sw $ra, 0x002C($sp) -/* 000F0 809A1700 AFB10028 */ sw $s1, 0x0028($sp) -/* 000F4 809A1704 AFA400D8 */ sw $a0, 0x00D8($sp) -/* 000F8 809A1708 AFA500DC */ sw $a1, 0x00DC($sp) +/* 000E8 809A16F8 AFB00024 */ sw $s0, 0x0024($sp) +/* 000EC 809A16FC AFBF002C */ sw $ra, 0x002C($sp) +/* 000F0 809A1700 AFB10028 */ sw $s1, 0x0028($sp) +/* 000F4 809A1704 AFA400D8 */ sw $a0, 0x00D8($sp) +/* 000F8 809A1708 AFA500DC */ sw $a1, 0x00DC($sp) /* 000FC 809A170C 8C850000 */ lw $a1, 0x0000($a0) ## 00000000 /* 00100 809A1710 00C08025 */ or $s0, $a2, $zero ## $s0 = 00000000 /* 00104 809A1714 3C06809A */ lui $a2, %hi(D_809A1A80) ## $a2 = 809A0000 /* 00108 809A1718 24C61A80 */ addiu $a2, $a2, %lo(D_809A1A80) ## $a2 = 809A1A80 /* 0010C 809A171C 27A40060 */ addiu $a0, $sp, 0x0060 ## $a0 = FFFFFF88 /* 00110 809A1720 2407009D */ addiu $a3, $zero, 0x009D ## $a3 = 0000009D -/* 00114 809A1724 0C031AB1 */ jal func_800C6AC4 +/* 00114 809A1724 0C031AB1 */ jal Graph_OpenDisps /* 00118 809A1728 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 /* 0011C 809A172C 860F0040 */ lh $t7, 0x0040($s0) ## 00000040 /* 00120 809A1730 3C01809A */ lui $at, %hi(D_809A1AC8) ## $at = 809A0000 -/* 00124 809A1734 C4281AC8 */ lwc1 $f8, %lo(D_809A1AC8)($at) +/* 00124 809A1734 C4281AC8 */ lwc1 $f8, %lo(D_809A1AC8)($at) /* 00128 809A1738 448F2000 */ mtc1 $t7, $f4 ## $f4 = 0.00 -/* 0012C 809A173C 8FB800D8 */ lw $t8, 0x00D8($sp) -/* 00130 809A1740 468021A0 */ cvt.s.w $f6, $f4 -/* 00134 809A1744 46083282 */ mul.s $f10, $f6, $f8 -/* 00138 809A1748 E7AA00D0 */ swc1 $f10, 0x00D0($sp) -/* 0013C 809A174C 0C0252F1 */ jal func_80094BC4 +/* 0012C 809A173C 8FB800D8 */ lw $t8, 0x00D8($sp) +/* 00130 809A1740 468021A0 */ cvt.s.w $f6, $f4 +/* 00134 809A1744 46083282 */ mul.s $f10, $f6, $f8 +/* 00138 809A1748 E7AA00D0 */ swc1 $f10, 0x00D0($sp) +/* 0013C 809A174C 0C0252F1 */ jal func_80094BC4 /* 00140 809A1750 8F040000 */ lw $a0, 0x0000($t8) ## 00000000 /* 00144 809A1754 8E2202D0 */ lw $v0, 0x02D0($s1) ## 000002D0 /* 00148 809A1758 3C08FA00 */ lui $t0, 0xFA00 ## $t0 = FA000000 @@ -46,129 +46,129 @@ glabel func_809A16F4 /* 00194 809A17A4 8E0E0008 */ lw $t6, 0x0008($s0) ## 00000008 /* 00198 809A17A8 ACCE0008 */ sw $t6, 0x0008($a2) ## FFFFFFA8 /* 0019C 809A17AC 860F0042 */ lh $t7, 0x0042($s0) ## 00000042 -/* 001A0 809A17B0 C7B00078 */ lwc1 $f16, 0x0078($sp) -/* 001A4 809A17B4 55E00057 */ bnel $t7, $zero, .L809A1914 +/* 001A0 809A17B0 C7B00078 */ lwc1 $f16, 0x0078($sp) +/* 001A4 809A17B4 55E00057 */ bnel $t7, $zero, .L809A1914 /* 001A8 809A17B8 C60C0000 */ lwc1 $f12, 0x0000($s0) ## 00000000 /* 001AC 809A17BC C612000C */ lwc1 $f18, 0x000C($s0) ## 0000000C -/* 001B0 809A17C0 C7A6007C */ lwc1 $f6, 0x007C($sp) +/* 001B0 809A17C0 C7A6007C */ lwc1 $f6, 0x007C($sp) /* 001B4 809A17C4 3C013FC0 */ lui $at, 0x3FC0 ## $at = 3FC00000 -/* 001B8 809A17C8 46128101 */ sub.s $f4, $f16, $f18 -/* 001BC 809A17CC C7B00080 */ lwc1 $f16, 0x0080($sp) -/* 001C0 809A17D0 8FA400D8 */ lw $a0, 0x00D8($sp) +/* 001B8 809A17C8 46128101 */ sub.s $f4, $f16, $f18 +/* 001BC 809A17CC C7B00080 */ lwc1 $f16, 0x0080($sp) +/* 001C0 809A17D0 8FA400D8 */ lw $a0, 0x00D8($sp) /* 001C4 809A17D4 27B80074 */ addiu $t8, $sp, 0x0074 ## $t8 = FFFFFF9C -/* 001C8 809A17D8 E7A40044 */ swc1 $f4, 0x0044($sp) +/* 001C8 809A17D8 E7A40044 */ swc1 $f4, 0x0044($sp) /* 001CC 809A17DC C6080010 */ lwc1 $f8, 0x0010($s0) ## 00000010 /* 001D0 809A17E0 248407C0 */ addiu $a0, $a0, 0x07C0 ## $a0 = 000007C0 /* 001D4 809A17E4 27A70044 */ addiu $a3, $sp, 0x0044 ## $a3 = FFFFFF6C -/* 001D8 809A17E8 46083281 */ sub.s $f10, $f6, $f8 +/* 001D8 809A17E8 46083281 */ sub.s $f10, $f6, $f8 /* 001DC 809A17EC 44813000 */ mtc1 $at, $f6 ## $f6 = 1.50 /* 001E0 809A17F0 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 /* 001E4 809A17F4 44814000 */ mtc1 $at, $f8 ## $f8 = 1.00 -/* 001E8 809A17F8 E7AA0048 */ swc1 $f10, 0x0048($sp) +/* 001E8 809A17F8 E7AA0048 */ swc1 $f10, 0x0048($sp) /* 001EC 809A17FC C6120014 */ lwc1 $f18, 0x0014($s0) ## 00000014 -/* 001F0 809A1800 AFA40034 */ sw $a0, 0x0034($sp) -/* 001F4 809A1804 AFB80014 */ sw $t8, 0x0014($sp) -/* 001F8 809A1808 46128101 */ sub.s $f4, $f16, $f18 -/* 001FC 809A180C E7A60010 */ swc1 $f6, 0x0010($sp) -/* 00200 809A1810 E7A80018 */ swc1 $f8, 0x0018($sp) -/* 00204 809A1814 0C00F519 */ jal func_8003D464 -/* 00208 809A1818 E7A4004C */ swc1 $f4, 0x004C($sp) -/* 0020C 809A181C 1040000C */ beq $v0, $zero, .L809A1850 -/* 00210 809A1820 8FA40034 */ lw $a0, 0x0034($sp) +/* 001F0 809A1800 AFA40034 */ sw $a0, 0x0034($sp) +/* 001F4 809A1804 AFB80014 */ sw $t8, 0x0014($sp) +/* 001F8 809A1808 46128101 */ sub.s $f4, $f16, $f18 +/* 001FC 809A180C E7A60010 */ swc1 $f6, 0x0010($sp) +/* 00200 809A1810 E7A80018 */ swc1 $f8, 0x0018($sp) +/* 00204 809A1814 0C00F519 */ jal func_8003D464 +/* 00208 809A1818 E7A4004C */ swc1 $f4, 0x004C($sp) +/* 0020C 809A181C 1040000C */ beq $v0, $zero, .L809A1850 +/* 00210 809A1820 8FA40034 */ lw $a0, 0x0034($sp) /* 00214 809A1824 8E050000 */ lw $a1, 0x0000($s0) ## 00000000 /* 00218 809A1828 8E060004 */ lw $a2, 0x0004($s0) ## 00000004 /* 0021C 809A182C 8E070008 */ lw $a3, 0x0008($s0) ## 00000008 /* 00220 809A1830 27B90088 */ addiu $t9, $sp, 0x0088 ## $t9 = FFFFFFB0 -/* 00224 809A1834 AFB90010 */ sw $t9, 0x0010($sp) -/* 00228 809A1838 0C00E28A */ jal func_80038A28 -/* 0022C 809A183C 8FA40074 */ lw $a0, 0x0074($sp) -/* 00230 809A1840 0C03423F */ jal Matrix_Put +/* 00224 809A1834 AFB90010 */ sw $t9, 0x0010($sp) +/* 00228 809A1838 0C00E28A */ jal func_80038A28 +/* 0022C 809A183C 8FA40074 */ lw $a0, 0x0074($sp) +/* 00230 809A1840 0C03423F */ jal Matrix_Put /* 00234 809A1844 27A40088 */ addiu $a0, $sp, 0x0088 ## $a0 = FFFFFFB0 -/* 00238 809A1848 10000023 */ beq $zero, $zero, .L809A18D8 +/* 00238 809A1848 10000023 */ beq $zero, $zero, .L809A18D8 /* 0023C 809A184C 27A40088 */ addiu $a0, $sp, 0x0088 ## $a0 = FFFFFFB0 .L809A1850: /* 00240 809A1850 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 /* 00244 809A1854 44818000 */ mtc1 $at, $f16 ## $f16 = 1.00 -/* 00248 809A1858 C7AA007C */ lwc1 $f10, 0x007C($sp) +/* 00248 809A1858 C7AA007C */ lwc1 $f10, 0x007C($sp) /* 0024C 809A185C 27A50074 */ addiu $a1, $sp, 0x0074 ## $a1 = FFFFFF9C /* 00250 809A1860 27A60078 */ addiu $a2, $sp, 0x0078 ## $a2 = FFFFFFA0 -/* 00254 809A1864 46105480 */ add.s $f18, $f10, $f16 -/* 00258 809A1868 0C00F224 */ jal func_8003C890 -/* 0025C 809A186C E7B2007C */ swc1 $f18, 0x007C($sp) -/* 00260 809A1870 8FA80074 */ lw $t0, 0x0074($sp) +/* 00254 809A1864 46105480 */ add.s $f18, $f10, $f16 +/* 00258 809A1868 0C00F224 */ jal func_8003C890 +/* 0025C 809A186C E7B2007C */ swc1 $f18, 0x007C($sp) +/* 00260 809A1870 8FA80074 */ lw $t0, 0x0074($sp) /* 00264 809A1874 3C013FC0 */ lui $at, 0x3FC0 ## $at = 3FC00000 /* 00268 809A1878 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 0026C 809A187C 51000010 */ beql $t0, $zero, .L809A18C0 +/* 0026C 809A187C 51000010 */ beql $t0, $zero, .L809A18C0 /* 00270 809A1880 C60C0000 */ lwc1 $f12, 0x0000($s0) ## 00000000 /* 00274 809A1884 44812000 */ mtc1 $at, $f4 ## $f4 = 1.50 /* 00278 809A1888 8E050000 */ lw $a1, 0x0000($s0) ## 00000000 /* 0027C 809A188C 8E070008 */ lw $a3, 0x0008($s0) ## 00000008 -/* 00280 809A1890 46040180 */ add.s $f6, $f0, $f4 +/* 00280 809A1890 46040180 */ add.s $f6, $f0, $f4 /* 00284 809A1894 27A90088 */ addiu $t1, $sp, 0x0088 ## $t1 = FFFFFFB0 -/* 00288 809A1898 AFA90010 */ sw $t1, 0x0010($sp) +/* 00288 809A1898 AFA90010 */ sw $t1, 0x0010($sp) /* 0028C 809A189C 01002025 */ or $a0, $t0, $zero ## $a0 = 00000000 -/* 00290 809A18A0 44063000 */ mfc1 $a2, $f6 -/* 00294 809A18A4 0C00E28A */ jal func_80038A28 +/* 00290 809A18A0 44063000 */ mfc1 $a2, $f6 +/* 00294 809A18A4 0C00E28A */ jal func_80038A28 /* 00298 809A18A8 00000000 */ nop -/* 0029C 809A18AC 0C03423F */ jal Matrix_Put +/* 0029C 809A18AC 0C03423F */ jal Matrix_Put /* 002A0 809A18B0 27A40088 */ addiu $a0, $sp, 0x0088 ## $a0 = FFFFFFB0 -/* 002A4 809A18B4 10000008 */ beq $zero, $zero, .L809A18D8 +/* 002A4 809A18B4 10000008 */ beq $zero, $zero, .L809A18D8 /* 002A8 809A18B8 27A40088 */ addiu $a0, $sp, 0x0088 ## $a0 = FFFFFFB0 /* 002AC 809A18BC C60C0000 */ lwc1 $f12, 0x0000($s0) ## 00000000 .L809A18C0: /* 002B0 809A18C0 C60E0004 */ lwc1 $f14, 0x0004($s0) ## 00000004 -/* 002B4 809A18C4 0C034261 */ jal Matrix_Translate +/* 002B4 809A18C4 0C034261 */ jal Matrix_Translate /* 002B8 809A18C8 8E060008 */ lw $a2, 0x0008($s0) ## 00000008 -/* 002BC 809A18CC 0C034236 */ jal Matrix_Get +/* 002BC 809A18CC 0C034236 */ jal Matrix_Get /* 002C0 809A18D0 27A40088 */ addiu $a0, $sp, 0x0088 ## $a0 = FFFFFFB0 /* 002C4 809A18D4 27A40088 */ addiu $a0, $sp, 0x0088 ## $a0 = FFFFFFB0 .L809A18D8: /* 002C8 809A18D8 27A50050 */ addiu $a1, $sp, 0x0050 ## $a1 = FFFFFF78 -/* 002CC 809A18DC 0C034899 */ jal func_800D2264 +/* 002CC 809A18DC 0C034899 */ jal func_800D2264 /* 002D0 809A18E0 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 002D4 809A18E4 87AA0050 */ lh $t2, 0x0050($sp) +/* 002D4 809A18E4 87AA0050 */ lh $t2, 0x0050($sp) /* 002D8 809A18E8 860D0042 */ lh $t5, 0x0042($s0) ## 00000042 /* 002DC 809A18EC A60A0044 */ sh $t2, 0x0044($s0) ## 00000044 -/* 002E0 809A18F0 87AB0052 */ lh $t3, 0x0052($sp) +/* 002E0 809A18F0 87AB0052 */ lh $t3, 0x0052($sp) /* 002E4 809A18F4 25AE0001 */ addiu $t6, $t5, 0x0001 ## $t6 = 00000001 /* 002E8 809A18F8 A60B0046 */ sh $t3, 0x0046($s0) ## 00000046 -/* 002EC 809A18FC 87AC0054 */ lh $t4, 0x0054($sp) +/* 002EC 809A18FC 87AC0054 */ lh $t4, 0x0054($sp) /* 002F0 809A1900 A60C0048 */ sh $t4, 0x0048($s0) ## 00000048 -/* 002F4 809A1904 C7A800BC */ lwc1 $f8, 0x00BC($sp) +/* 002F4 809A1904 C7A800BC */ lwc1 $f8, 0x00BC($sp) /* 002F8 809A1908 A60E0042 */ sh $t6, 0x0042($s0) ## 00000042 /* 002FC 809A190C E6080004 */ swc1 $f8, 0x0004($s0) ## 00000004 /* 00300 809A1910 C60C0000 */ lwc1 $f12, 0x0000($s0) ## 00000000 .L809A1914: /* 00304 809A1914 C60E0004 */ lwc1 $f14, 0x0004($s0) ## 00000004 /* 00308 809A1918 8E060008 */ lw $a2, 0x0008($s0) ## 00000008 -/* 0030C 809A191C 0C034261 */ jal Matrix_Translate +/* 0030C 809A191C 0C034261 */ jal Matrix_Translate /* 00310 809A1920 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 /* 00314 809A1924 86040044 */ lh $a0, 0x0044($s0) ## 00000044 /* 00318 809A1928 86050046 */ lh $a1, 0x0046($s0) ## 00000046 /* 0031C 809A192C 86060048 */ lh $a2, 0x0048($s0) ## 00000048 -/* 00320 809A1930 0C034421 */ jal Matrix_RotateXYZ +/* 00320 809A1930 0C034421 */ jal Matrix_RotateZYX /* 00324 809A1934 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 /* 00328 809A1938 3C01809A */ lui $at, %hi(D_809A1ACC) ## $at = 809A0000 -/* 0032C 809A193C C42C1ACC */ lwc1 $f12, %lo(D_809A1ACC)($at) -/* 00330 809A1940 0C0342DC */ jal Matrix_RotateX +/* 0032C 809A193C C42C1ACC */ lwc1 $f12, %lo(D_809A1ACC)($at) +/* 00330 809A1940 0C0342DC */ jal Matrix_RotateX /* 00334 809A1944 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001 -/* 00338 809A1948 C7AC00D0 */ lwc1 $f12, 0x00D0($sp) +/* 00338 809A1948 C7AC00D0 */ lwc1 $f12, 0x00D0($sp) /* 0033C 809A194C 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 00340 809A1950 44066000 */ mfc1 $a2, $f12 -/* 00344 809A1954 0C0342A3 */ jal Matrix_Scale -/* 00348 809A1958 46006386 */ mov.s $f14, $f12 +/* 00340 809A1950 44066000 */ mfc1 $a2, $f12 +/* 00344 809A1954 0C0342A3 */ jal Matrix_Scale +/* 00348 809A1958 46006386 */ mov.s $f14, $f12 /* 0034C 809A195C 8E2202D0 */ lw $v0, 0x02D0($s1) ## 000002D0 /* 00350 809A1960 3C18DA38 */ lui $t8, 0xDA38 ## $t8 = DA380000 /* 00354 809A1964 37180003 */ ori $t8, $t8, 0x0003 ## $t8 = DA380003 /* 00358 809A1968 244F0008 */ addiu $t7, $v0, 0x0008 ## $t7 = 00000008 /* 0035C 809A196C AE2F02D0 */ sw $t7, 0x02D0($s1) ## 000002D0 /* 00360 809A1970 AC580000 */ sw $t8, 0x0000($v0) ## 00000000 -/* 00364 809A1974 8FB900D8 */ lw $t9, 0x00D8($sp) +/* 00364 809A1974 8FB900D8 */ lw $t9, 0x00D8($sp) /* 00368 809A1978 3C05809A */ lui $a1, %hi(D_809A1A98) ## $a1 = 809A0000 /* 0036C 809A197C 24A51A98 */ addiu $a1, $a1, %lo(D_809A1A98) ## $a1 = 809A1A98 /* 00370 809A1980 240600F6 */ addiu $a2, $zero, 0x00F6 ## $a2 = 000000F6 /* 00374 809A1984 00408025 */ or $s0, $v0, $zero ## $s0 = 00000000 -/* 00378 809A1988 0C0346A2 */ jal Matrix_NewMtx +/* 00378 809A1988 0C0346A2 */ jal Matrix_NewMtx /* 0037C 809A198C 8F240000 */ lw $a0, 0x0000($t9) ## 00000000 /* 00380 809A1990 AE020004 */ sw $v0, 0x0004($s0) ## 00000004 /* 00384 809A1994 8E2202D0 */ lw $v0, 0x02D0($s1) ## 000002D0 @@ -188,17 +188,17 @@ glabel func_809A16F4 /* 003BC 809A19CC 3C0CDE00 */ lui $t4, 0xDE00 ## $t4 = DE000000 /* 003C0 809A19D0 AC4C0000 */ sw $t4, 0x0000($v0) ## 00000000 /* 003C4 809A19D4 AC4D0004 */ sw $t5, 0x0004($v0) ## 00000004 -/* 003C8 809A19D8 8FAE00D8 */ lw $t6, 0x00D8($sp) +/* 003C8 809A19D8 8FAE00D8 */ lw $t6, 0x00D8($sp) /* 003CC 809A19DC 3C06809A */ lui $a2, %hi(D_809A1AB0) ## $a2 = 809A0000 /* 003D0 809A19E0 24C61AB0 */ addiu $a2, $a2, %lo(D_809A1AB0) ## $a2 = 809A1AB0 /* 003D4 809A19E4 27A40060 */ addiu $a0, $sp, 0x0060 ## $a0 = FFFFFF88 /* 003D8 809A19E8 240700FF */ addiu $a3, $zero, 0x00FF ## $a3 = 000000FF -/* 003DC 809A19EC 0C031AD5 */ jal func_800C6B54 +/* 003DC 809A19EC 0C031AD5 */ jal Graph_CloseDisps /* 003E0 809A19F0 8DC50000 */ lw $a1, 0x0000($t6) ## 00000000 -/* 003E4 809A19F4 8FBF002C */ lw $ra, 0x002C($sp) -/* 003E8 809A19F8 8FB00024 */ lw $s0, 0x0024($sp) -/* 003EC 809A19FC 8FB10028 */ lw $s1, 0x0028($sp) -/* 003F0 809A1A00 03E00008 */ jr $ra +/* 003E4 809A19F4 8FBF002C */ lw $ra, 0x002C($sp) +/* 003E8 809A19F8 8FB00024 */ lw $s0, 0x0024($sp) +/* 003EC 809A19FC 8FB10028 */ lw $s1, 0x0028($sp) +/* 003F0 809A1A00 03E00008 */ jr $ra /* 003F4 809A1A04 27BD00D8 */ addiu $sp, $sp, 0x00D8 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Dt_Bubble/func_809A1F04.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Dt_Bubble/func_809A1F04.s index 305edb00a6..acfc28412e 100644 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Dt_Bubble/func_809A1F04.s +++ b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Dt_Bubble/func_809A1F04.s @@ -11,7 +11,7 @@ glabel func_809A1F04 /* 00278 809A1F28 24C62220 */ addiu $a2, $a2, %lo(D_809A2220) ## $a2 = 809A2220 /* 0027C 809A1F2C 27A4003C */ addiu $a0, $sp, 0x003C ## $a0 = FFFFFFE4 /* 00280 809A1F30 240700C9 */ addiu $a3, $zero, 0x00C9 ## $a3 = 000000C9 -/* 00284 809A1F34 0C031AB1 */ jal func_800C6AC4 +/* 00284 809A1F34 0C031AB1 */ jal Graph_OpenDisps /* 00288 809A1F38 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 /* 0028C 809A1F3C 860F0052 */ lh $t7, 0x0052($s0) ## 00000052 /* 00290 809A1F40 3C01809A */ lui $at, %hi(D_809A2268) ## $at = 809A0000 @@ -155,7 +155,7 @@ glabel func_809A1F04 /* 004A8 809A2158 01ED4021 */ addu $t0, $t7, $t5 /* 004AC 809A215C 01015821 */ addu $t3, $t0, $at /* 004B0 809A2160 27A4003C */ addiu $a0, $sp, 0x003C ## $a0 = FFFFFFE4 -/* 004B4 809A2164 0C031AD5 */ jal func_800C6B54 +/* 004B4 809A2164 0C031AD5 */ jal Graph_CloseDisps /* 004B8 809A2168 AC4B0004 */ sw $t3, 0x0004($v0) ## 00000004 /* 004BC 809A216C 8FBF001C */ lw $ra, 0x001C($sp) /* 004C0 809A2170 8FB00014 */ lw $s0, 0x0014($sp) diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Dust/func_809A2480.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Dust/func_809A2480.s index 609e3d32ab..2fcecc877b 100644 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Dust/func_809A2480.s +++ b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Dust/func_809A2480.s @@ -11,7 +11,7 @@ glabel func_809A2480 /* 001D4 809A24A4 24C62A70 */ addiu $a2, $a2, %lo(D_809A2A70) ## $a2 = 809A2A70 /* 001D8 809A24A8 27A40064 */ addiu $a0, $sp, 0x0064 ## $a0 = FFFFFEDC /* 001DC 809A24AC 24070141 */ addiu $a3, $zero, 0x0141 ## $a3 = 00000141 -/* 001E0 809A24B0 0C031AB1 */ jal func_800C6AC4 +/* 001E0 809A24B0 0C031AB1 */ jal Graph_OpenDisps /* 001E4 809A24B4 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 001E8 809A24B8 862F0052 */ lh $t7, 0x0052($s1) ## 00000052 /* 001EC 809A24BC 3C01809A */ lui $at, %hi(D_809A2A98) ## $at = 809A0000 @@ -95,7 +95,7 @@ glabel func_809A2480 /* 00324 809A25F4 030A5821 */ addu $t3, $t8, $t2 /* 00328 809A25F8 01616021 */ addu $t4, $t3, $at /* 0032C 809A25FC AC6C0004 */ sw $t4, 0x0004($v1) ## 00000004 -/* 00330 809A2600 0C024DDD */ jal func_80093774 +/* 00330 809A2600 0C024DDD */ jal Gfx_CallSetupDL /* 00334 809A2604 8E0402D0 */ lw $a0, 0x02D0($s0) ## 000002D0 /* 00338 809A2608 00401825 */ or $v1, $v0, $zero ## $v1 = 00000000 /* 0033C 809A260C AE0202D0 */ sw $v0, 0x02D0($s0) ## 000002D0 @@ -216,7 +216,7 @@ glabel func_809A2480 /* 004F8 809A27C8 24C62A84 */ addiu $a2, $a2, %lo(D_809A2A84) ## $a2 = 809A2A84 /* 004FC 809A27CC 27A40064 */ addiu $a0, $sp, 0x0064 ## $a0 = FFFFFEDC /* 00500 809A27D0 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 00504 809A27D4 0C031AD5 */ jal func_800C6B54 +/* 00504 809A27D4 0C031AD5 */ jal Graph_CloseDisps /* 00508 809A27D8 24070185 */ addiu $a3, $zero, 0x0185 ## $a3 = 00000185 /* 0050C 809A27DC 8FBF001C */ lw $ra, 0x001C($sp) /* 00510 809A27E0 8FB00014 */ lw $s0, 0x0014($sp) diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_En_Fire/func_809A2D28.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_En_Fire/func_809A2D28.s index 733bf8b92e..1305047d8e 100644 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_En_Fire/func_809A2D28.s +++ b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_En_Fire/func_809A2D28.s @@ -11,7 +11,7 @@ glabel func_809A2D28 /* 001EC 809A2D4C 24C63260 */ addiu $a2, $a2, %lo(D_809A3260) ## $a2 = 809A3260 /* 001F0 809A2D50 27A40068 */ addiu $a0, $sp, 0x0068 ## $a0 = FFFFFFD0 /* 001F4 809A2D54 240700A9 */ addiu $a3, $zero, 0x00A9 ## $a3 = 000000A9 -/* 001F8 809A2D58 0C031AB1 */ jal func_800C6AC4 +/* 001F8 809A2D58 0C031AB1 */ jal Graph_OpenDisps /* 001FC 809A2D5C 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 00200 809A2D60 C62C0000 */ lwc1 $f12, 0x0000($s1) ## 00000000 /* 00204 809A2D64 C62E0004 */ lwc1 $f14, 0x0004($s1) ## 00000004 @@ -171,7 +171,7 @@ glabel func_809A2D28 /* 00458 809A2FB8 AFAC0020 */ sw $t4, 0x0020($sp) /* 0045C 809A2FBC AFAE0028 */ sw $t6, 0x0028($sp) /* 00460 809A2FC0 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 00464 809A2FC4 0C0253D0 */ jal Draw_TwoTexScroll +/* 00464 809A2FC4 0C0253D0 */ jal Gfx_TwoTexScroll /* 00468 809A2FC8 AFA20058 */ sw $v0, 0x0058($sp) /* 0046C 809A2FCC 8FA30058 */ lw $v1, 0x0058($sp) /* 00470 809A2FD0 3C06809A */ lui $a2, %hi(D_809A3288) ## $a2 = 809A0000 @@ -206,7 +206,7 @@ glabel func_809A2D28 /* 004DC 809A303C AC4D0004 */ sw $t5, 0x0004($v0) ## 00000004 /* 004E0 809A3040 AC4C0000 */ sw $t4, 0x0000($v0) ## 00000000 .L809A3044: -/* 004E4 809A3044 0C031AD5 */ jal func_800C6B54 +/* 004E4 809A3044 0C031AD5 */ jal Graph_CloseDisps /* 004E8 809A3048 240700D5 */ addiu $a3, $zero, 0x00D5 ## $a3 = 000000D5 /* 004EC 809A304C 8FBF003C */ lw $ra, 0x003C($sp) /* 004F0 809A3050 8FB00034 */ lw $s0, 0x0034($sp) diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_En_Ice/func_809A35DC.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_En_Ice/func_809A35DC.s index 7a4a269296..d5c46589b9 100644 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_En_Ice/func_809A35DC.s +++ b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_En_Ice/func_809A35DC.s @@ -22,7 +22,7 @@ glabel func_809A35DC /* 002FC 809A362C 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 /* 00300 809A3630 E7AA008C */ swc1 $f10, 0x008C($sp) /* 00304 809A3634 8F181DE4 */ lw $t8, 0x1DE4($t8) ## 00011DE4 -/* 00308 809A3638 0C031AB1 */ jal func_800C6AC4 +/* 00308 809A3638 0C031AB1 */ jal Graph_OpenDisps /* 0030C 809A363C AFB8007C */ sw $t8, 0x007C($sp) /* 00310 809A3640 86190056 */ lh $t9, 0x0056($s0) ## 00000056 /* 00314 809A3644 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 @@ -145,7 +145,7 @@ glabel func_809A35DC /* 004DC 809A380C 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 004E0 809A3810 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 /* 004E4 809A3814 AFA2005C */ sw $v0, 0x005C($sp) -/* 004E8 809A3818 0C0253D0 */ jal Draw_TwoTexScroll +/* 004E8 809A3818 0C0253D0 */ jal Gfx_TwoTexScroll /* 004EC 809A381C 310700FF */ andi $a3, $t0, 0x00FF ## $a3 = 00000000 /* 004F0 809A3820 8FA3005C */ lw $v1, 0x005C($sp) /* 004F4 809A3824 3C0AFA00 */ lui $t2, 0xFA00 ## $t2 = FA000000 @@ -233,7 +233,7 @@ glabel func_809A35DC /* 00630 809A3960 24C63BFC */ addiu $a2, $a2, %lo(D_809A3BFC) ## $a2 = 809A3BFC /* 00634 809A3964 24070126 */ addiu $a3, $zero, 0x0126 ## $a3 = 00000126 /* 00638 809A3968 AC4E0004 */ sw $t6, 0x0004($v0) ## 00000004 -/* 0063C 809A396C 0C031AD5 */ jal func_800C6B54 +/* 0063C 809A396C 0C031AD5 */ jal Graph_CloseDisps /* 00640 809A3970 AC490000 */ sw $t1, 0x0000($v0) ## 00000000 /* 00644 809A3974 8FBF003C */ lw $ra, 0x003C($sp) /* 00648 809A3978 8FB00034 */ lw $s0, 0x0034($sp) diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Extra/func_809A3E00.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Extra/func_809A3E00.s index 6140be2392..f8467a1d1d 100644 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Extra/func_809A3E00.s +++ b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Extra/func_809A3E00.s @@ -28,7 +28,7 @@ glabel func_809A3E00 /* 0001A8 809A3E68 27A40040 */ addiu $a0, $sp, 0x40 /* 0001AC 809A3E6C 24C64080 */ addiu $a2, %lo(D_809A4080) # addiu $a2, $a2, 0x4080 /* 0001B0 809A3E70 00A08025 */ move $s0, $a1 -/* 0001B4 809A3E74 0C031AB1 */ jal func_800C6AC4 +/* 0001B4 809A3E74 0C031AB1 */ jal Graph_OpenDisps /* 0001B8 809A3E78 AFA80054 */ sw $t0, 0x54($sp) /* 0001BC 809A3E7C 8FA80054 */ lw $t0, 0x54($sp) /* 0001C0 809A3E80 3C018000 */ lui $at, 0x8000 @@ -117,7 +117,7 @@ glabel func_809A3E00 /* 00030C 809A3FCC AC590004 */ sw $t9, 4($v0) /* 000310 809A3FD0 8E450000 */ lw $a1, ($s2) /* 000314 809A3FD4 24C640A8 */ addiu $a2, %lo(D_809A40A8) # addiu $a2, $a2, 0x40a8 -/* 000318 809A3FD8 0C031AD5 */ jal func_800C6B54 +/* 000318 809A3FD8 0C031AD5 */ jal Graph_CloseDisps /* 00031C 809A3FDC 240700C2 */ li $a3, 194 /* 000320 809A3FE0 8FBF0024 */ lw $ra, 0x24($sp) /* 000324 809A3FE4 8FB00018 */ lw $s0, 0x18($sp) diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Fcircle/func_809A41DC.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Fcircle/func_809A41DC.s index f67524f562..e14b82bee8 100644 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Fcircle/func_809A41DC.s +++ b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Fcircle/func_809A41DC.s @@ -11,7 +11,7 @@ glabel func_809A41DC /* 000E0 809A4200 24C645A0 */ addiu $a2, $a2, %lo(D_809A45A0) ## $a2 = 809A45A0 /* 000E4 809A4204 27A40058 */ addiu $a0, $sp, 0x0058 ## $a0 = FFFFFFD8 /* 000E8 809A4208 24070095 */ addiu $a3, $zero, 0x0095 ## $a3 = 00000095 -/* 000EC 809A420C 0C031AB1 */ jal func_800C6AC4 +/* 000EC 809A420C 0C031AB1 */ jal Graph_OpenDisps /* 000F0 809A4210 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 000F4 809A4214 862F005C */ lh $t7, 0x005C($s1) ## 0000005C /* 000F8 809A4218 3C01809A */ lui $at, %hi(D_809A45DC) ## $at = 809A0000 @@ -114,7 +114,7 @@ glabel func_809A41DC /* 0027C 809A439C 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 00280 809A43A0 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 /* 00284 809A43A4 AFA20050 */ sw $v0, 0x0050($sp) -/* 00288 809A43A8 0C0253D0 */ jal Draw_TwoTexScroll +/* 00288 809A43A8 0C0253D0 */ jal Gfx_TwoTexScroll /* 0028C 809A43AC 3066007F */ andi $a2, $v1, 0x007F ## $a2 = 00000000 /* 00290 809A43B0 8FA80050 */ lw $t0, 0x0050($sp) /* 00294 809A43B4 3C18FA00 */ lui $t8, 0xFA00 ## $t8 = FA000000 @@ -188,7 +188,7 @@ glabel func_809A41DC /* 00398 809A44B8 AC590000 */ sw $t9, 0x0000($v0) ## 00000000 /* 0039C 809A44BC 8E290038 */ lw $t1, 0x0038($s1) ## 00000038 /* 003A0 809A44C0 240700BA */ addiu $a3, $zero, 0x00BA ## $a3 = 000000BA -/* 003A4 809A44C4 0C031AD5 */ jal func_800C6B54 +/* 003A4 809A44C4 0C031AD5 */ jal Graph_CloseDisps /* 003A8 809A44C8 AC490004 */ sw $t1, 0x0004($v0) ## 00000004 /* 003AC 809A44CC 8FBF003C */ lw $ra, 0x003C($sp) /* 003B0 809A44D0 8FB00034 */ lw $s0, 0x0034($sp) diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Fhg_Flash/func_809A49B8.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Fhg_Flash/func_809A49B8.s index 4c261424df..5923c33bc5 100644 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Fhg_Flash/func_809A49B8.s +++ b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Fhg_Flash/func_809A49B8.s @@ -27,7 +27,7 @@ glabel func_809A49B8 /* 003BC 809A4A1C 01284821 */ addu $t1, $t1, $t0 /* 003C0 809A4A20 8D2917B4 */ lw $t1, 0x17B4($t1) ## 000117B4 /* 003C4 809A4A24 27A4003C */ addiu $a0, $sp, 0x003C ## $a0 = FFFFFFDC -/* 003C8 809A4A28 0C031AB1 */ jal func_800C6AC4 +/* 003C8 809A4A28 0C031AB1 */ jal Graph_OpenDisps /* 003CC 809A4A2C AFA90050 */ sw $t1, 0x0050($sp) /* 003D0 809A4A30 C62C0000 */ lwc1 $f12, 0x0000($s1) ## 00000000 /* 003D4 809A4A34 C62E0004 */ lwc1 $f14, 0x0004($s1) ## 00000004 @@ -132,7 +132,7 @@ glabel func_809A49B8 /* 00560 809A4BC0 8E2A0038 */ lw $t2, 0x0038($s1) ## 00000038 /* 00564 809A4BC4 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 00568 809A4BC8 2407014A */ addiu $a3, $zero, 0x014A ## $a3 = 0000014A -/* 0056C 809A4BCC 0C031AD5 */ jal func_800C6B54 +/* 0056C 809A4BCC 0C031AD5 */ jal Graph_CloseDisps /* 00570 809A4BD0 AC4A0004 */ sw $t2, 0x0004($v0) ## 00000004 /* 00574 809A4BD4 8FBF001C */ lw $ra, 0x001C($sp) /* 00578 809A4BD8 8FB00014 */ lw $s0, 0x0014($sp) diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Fhg_Flash/func_809A4BE8.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Fhg_Flash/func_809A4BE8.s index 95d597dd5e..b9a0083f44 100644 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Fhg_Flash/func_809A4BE8.s +++ b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Fhg_Flash/func_809A4BE8.s @@ -18,7 +18,7 @@ glabel func_809A4BE8 /* 005C8 809A4C28 2407015A */ addiu $a3, $zero, 0x015A ## $a3 = 0000015A /* 005CC 809A4C2C 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 005D0 809A4C30 46083283 */ div.s $f10, $f6, $f8 -/* 005D4 809A4C34 0C031AB1 */ jal func_800C6AC4 +/* 005D4 809A4C34 0C031AB1 */ jal Graph_OpenDisps /* 005D8 809A4C38 E7AA0054 */ swc1 $f10, 0x0054($sp) /* 005DC 809A4C3C C62C0000 */ lwc1 $f12, 0x0000($s1) ## 00000000 /* 005E0 809A4C40 C62E0004 */ lwc1 $f14, 0x0004($s1) ## 00000004 @@ -138,7 +138,7 @@ glabel func_809A4BE8 /* 007A0 809A4E00 8E2B0038 */ lw $t3, 0x0038($s1) ## 00000038 /* 007A4 809A4E04 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 007A8 809A4E08 2407018F */ addiu $a3, $zero, 0x018F ## $a3 = 0000018F -/* 007AC 809A4E0C 0C031AD5 */ jal func_800C6B54 +/* 007AC 809A4E0C 0C031AD5 */ jal Graph_CloseDisps /* 007B0 809A4E10 AC4B0004 */ sw $t3, 0x0004($v0) ## 00000004 /* 007B4 809A4E14 8FBF001C */ lw $ra, 0x001C($sp) /* 007B8 809A4E18 8FB00014 */ lw $s0, 0x0014($sp) diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Fire_Tail/func_809A5858.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Fire_Tail/func_809A5858.s index 42766ecff1..037f44c1ff 100644 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Fire_Tail/func_809A5858.s +++ b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Fire_Tail/func_809A5858.s @@ -12,7 +12,7 @@ glabel func_809A5858 /* 00140 809A5880 24C65DE0 */ addiu $a2, $a2, %lo(D_809A5DE0) ## $a2 = 809A5DE0 /* 00144 809A5884 27A40080 */ addiu $a0, $sp, 0x0080 ## $a0 = FFFFFFC8 /* 00148 809A5888 240700B6 */ addiu $a3, $zero, 0x00B6 ## $a3 = 000000B6 -/* 0014C 809A588C 0C031AB1 */ jal func_800C6AC4 +/* 0014C 809A588C 0C031AB1 */ jal Graph_OpenDisps /* 00150 809A5890 02402825 */ or $a1, $s2, $zero ## $a1 = 00000000 /* 00154 809A5894 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 /* 00158 809A5898 00000000 */ nop @@ -310,7 +310,7 @@ glabel func_809A5858 /* 005C0 809A5D00 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 005C4 809A5D04 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 /* 005C8 809A5D08 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 005CC 809A5D0C 0C0253D0 */ jal Draw_TwoTexScroll +/* 005CC 809A5D0C 0C0253D0 */ jal Gfx_TwoTexScroll /* 005D0 809A5D10 AFA20068 */ sw $v0, 0x0068($sp) /* 005D4 809A5D14 8FA30068 */ lw $v1, 0x0068($sp) /* 005D8 809A5D18 3C06809A */ lui $a2, %hi(D_809A5E10) ## $a2 = 809A0000 @@ -339,7 +339,7 @@ glabel func_809A5858 /* 00630 809A5D70 AC4C0004 */ sw $t4, 0x0004($v0) ## 00000004 /* 00634 809A5D74 AC4B0000 */ sw $t3, 0x0000($v0) ## 00000000 .L809A5D78: -/* 00638 809A5D78 0C031AD5 */ jal func_800C6B54 +/* 00638 809A5D78 0C031AD5 */ jal Graph_CloseDisps /* 0063C 809A5D7C 24070111 */ addiu $a3, $zero, 0x0111 ## $a3 = 00000111 /* 00640 809A5D80 8FBF0044 */ lw $ra, 0x0044($sp) /* 00644 809A5D84 8FB00038 */ lw $s0, 0x0038($sp) diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_G_Magma2/func_809A6568.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_G_Magma2/func_809A6568.s index 06461d61ce..ec0bd5fbde 100644 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_G_Magma2/func_809A6568.s +++ b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_G_Magma2/func_809A6568.s @@ -27,7 +27,7 @@ glabel func_809A6568 /* 0022C 809A65CC 01284821 */ addu $t1, $t1, $t0 /* 00230 809A65D0 8D2917B4 */ lw $t1, 0x17B4($t1) ## 000117B4 /* 00234 809A65D4 27A4003C */ addiu $a0, $sp, 0x003C ## $a0 = FFFFFFDC -/* 00238 809A65D8 0C031AB1 */ jal func_800C6AC4 +/* 00238 809A65D8 0C031AB1 */ jal Graph_OpenDisps /* 0023C 809A65DC AFA90050 */ sw $t1, 0x0050($sp) /* 00240 809A65E0 C62C0000 */ lwc1 $f12, 0x0000($s1) ## 00000000 /* 00244 809A65E4 C62E0004 */ lwc1 $f14, 0x0004($s1) ## 00000004 @@ -70,12 +70,12 @@ glabel func_809A6568 /* 002D8 809A6678 17000006 */ bne $t8, $zero, .L809A6694 /* 002DC 809A667C 00000000 */ nop /* 002E0 809A6680 8E0402D0 */ lw $a0, 0x02D0($s0) ## 000002D0 -/* 002E4 809A6684 0C024DDD */ jal func_80093774 +/* 002E4 809A6684 0C024DDD */ jal Gfx_CallSetupDL /* 002E8 809A6688 2405003D */ addiu $a1, $zero, 0x003D ## $a1 = 0000003D /* 002EC 809A668C 10000004 */ beq $zero, $zero, .L809A66A0 /* 002F0 809A6690 AE0202D0 */ sw $v0, 0x02D0($s0) ## 000002D0 .L809A6694: -/* 002F4 809A6694 0C024DDD */ jal func_80093774 +/* 002F4 809A6694 0C024DDD */ jal Gfx_CallSetupDL /* 002F8 809A6698 8E0402D0 */ lw $a0, 0x02D0($s0) ## 000002D0 /* 002FC 809A669C AE0202D0 */ sw $v0, 0x02D0($s0) ## 000002D0 .L809A66A0: @@ -144,7 +144,7 @@ glabel func_809A6568 /* 003F8 809A6798 8E290038 */ lw $t1, 0x0038($s1) ## 00000038 /* 003FC 809A679C 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 00400 809A67A0 24070137 */ addiu $a3, $zero, 0x0137 ## $a3 = 00000137 -/* 00404 809A67A4 0C031AD5 */ jal func_800C6B54 +/* 00404 809A67A4 0C031AD5 */ jal Graph_CloseDisps /* 00408 809A67A8 AC490004 */ sw $t1, 0x0004($v0) ## 00000004 /* 0040C 809A67AC 8FBF001C */ lw $ra, 0x001C($sp) /* 00410 809A67B0 8FB00014 */ lw $s0, 0x0014($sp) diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_G_Ripple/func_809A6AD8.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_G_Ripple/func_809A6AD8.s index 83f5fd7d79..db16598537 100644 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_G_Ripple/func_809A6AD8.s +++ b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_G_Ripple/func_809A6AD8.s @@ -11,7 +11,7 @@ glabel func_809A6AD8 /* 0019C 809A6AFC 24C66EA0 */ addiu $a2, $a2, %lo(D_809A6EA0) ## $a2 = 809A6EA0 /* 001A0 809A6B00 27A40040 */ addiu $a0, $sp, 0x0040 ## $a0 = FFFFFF18 /* 001A4 809A6B04 240700C7 */ addiu $a3, $zero, 0x00C7 ## $a3 = 000000C7 -/* 001A8 809A6B08 0C031AB1 */ jal func_800C6AC4 +/* 001A8 809A6B08 0C031AB1 */ jal Graph_OpenDisps /* 001AC 809A6B0C 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 001B0 809A6B10 862F0042 */ lh $t7, 0x0042($s1) ## 00000042 /* 001B4 809A6B14 3C01809A */ lui $at, %hi(D_809A6ED0) ## $at = 809A0000 @@ -134,7 +134,7 @@ glabel func_809A6AD8 /* 00380 809A6CE0 24C66EB8 */ addiu $a2, $a2, %lo(D_809A6EB8) ## $a2 = 809A6EB8 /* 00384 809A6CE4 27A40040 */ addiu $a0, $sp, 0x0040 ## $a0 = FFFFFF18 /* 00388 809A6CE8 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 0038C 809A6CEC 0C031AD5 */ jal func_800C6B54 +/* 0038C 809A6CEC 0C031AD5 */ jal Graph_CloseDisps /* 00390 809A6CF0 240700F7 */ addiu $a3, $zero, 0x00F7 ## $a3 = 000000F7 /* 00394 809A6CF4 8FBF001C */ lw $ra, 0x001C($sp) /* 00398 809A6CF8 8FB00014 */ lw $s0, 0x0014($sp) diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_G_Spk/func_809A70A0.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_G_Spk/func_809A70A0.s index 749dd1aa4f..716f497607 100644 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_G_Spk/func_809A70A0.s +++ b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_G_Spk/func_809A70A0.s @@ -11,7 +11,7 @@ glabel func_809A70A0 /* 00194 809A70C4 24C674B0 */ addiu $a2, $a2, %lo(D_809A74B0) ## $a2 = 809A74B0 /* 00198 809A70C8 27A4003C */ addiu $a0, $sp, 0x003C ## $a0 = FFFFFEDC /* 0019C 809A70CC 240700D0 */ addiu $a3, $zero, 0x00D0 ## $a3 = 000000D0 -/* 001A0 809A70D0 0C031AB1 */ jal func_800C6AC4 +/* 001A0 809A70D0 0C031AB1 */ jal Graph_OpenDisps /* 001A4 809A70D4 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 /* 001A8 809A70D8 860F0052 */ lh $t7, 0x0052($s0) ## 00000052 /* 001AC 809A70DC 3C01809A */ lui $at, %hi(D_809A74D8) ## $at = 809A0000 @@ -129,7 +129,7 @@ glabel func_809A70A0 /* 00368 809A7298 24C674C4 */ addiu $a2, $a2, %lo(D_809A74C4) ## $a2 = 809A74C4 /* 0036C 809A729C 27A4003C */ addiu $a0, $sp, 0x003C ## $a0 = FFFFFEDC /* 00370 809A72A0 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 00374 809A72A4 0C031AD5 */ jal func_800C6B54 +/* 00374 809A72A4 0C031AD5 */ jal Graph_CloseDisps /* 00378 809A72A8 240700FF */ addiu $a3, $zero, 0x00FF ## $a3 = 000000FF /* 0037C 809A72AC 8FBF001C */ lw $ra, 0x001C($sp) /* 00380 809A72B0 8FB00014 */ lw $s0, 0x0014($sp) diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Hahen/func_809A7BFC.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Hahen/func_809A7BFC.s index 91cfc99dfc..54fe36373a 100644 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Hahen/func_809A7BFC.s +++ b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Hahen/func_809A7BFC.s @@ -18,7 +18,7 @@ glabel func_809A7BFC /* 0024C 809A7C3C 240700D0 */ addiu $a3, $zero, 0x00D0 ## $a3 = 000000D0 /* 00250 809A7C40 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 00254 809A7C44 46083282 */ mul.s $f10, $f6, $f8 -/* 00258 809A7C48 0C031AB1 */ jal func_800C6AC4 +/* 00258 809A7C48 0C031AB1 */ jal Graph_OpenDisps /* 0025C 809A7C4C E7AA0044 */ swc1 $f10, 0x0044($sp) /* 00260 809A7C50 86380048 */ lh $t8, 0x0048($s1) ## 00000048 /* 00264 809A7C54 2401FFFF */ addiu $at, $zero, 0xFFFF ## $at = FFFFFFFF @@ -97,7 +97,7 @@ glabel func_809A7BFC /* 00384 809A7D74 27A40030 */ addiu $a0, $sp, 0x0030 ## $a0 = FFFFFFE0 /* 00388 809A7D78 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 0038C 809A7D7C 240700EC */ addiu $a3, $zero, 0x00EC ## $a3 = 000000EC -/* 00390 809A7D80 0C031AD5 */ jal func_800C6B54 +/* 00390 809A7D80 0C031AD5 */ jal Graph_CloseDisps /* 00394 809A7D84 AC4B0004 */ sw $t3, 0x0004($v0) ## 00000004 /* 00398 809A7D88 8FBF001C */ lw $ra, 0x001C($sp) /* 0039C 809A7D8C 8FB00014 */ lw $s0, 0x0014($sp) diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Hahen/func_809A7D9C.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Hahen/func_809A7D9C.s index 54179111da..9f6e8ba933 100644 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Hahen/func_809A7D9C.s +++ b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Hahen/func_809A7D9C.s @@ -18,7 +18,7 @@ glabel func_809A7D9C /* 003EC 809A7DDC 240700FD */ addiu $a3, $zero, 0x00FD ## $a3 = 000000FD /* 003F0 809A7DE0 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 003F4 809A7DE4 46083282 */ mul.s $f10, $f6, $f8 -/* 003F8 809A7DE8 0C031AB1 */ jal func_800C6AC4 +/* 003F8 809A7DE8 0C031AB1 */ jal Graph_OpenDisps /* 003FC 809A7DEC E7AA004C */ swc1 $f10, 0x004C($sp) /* 00400 809A7DF0 86380048 */ lh $t8, 0x0048($s1) ## 00000048 /* 00404 809A7DF4 2401FFFF */ addiu $at, $zero, 0xFFFF ## $at = FFFFFFFF @@ -115,7 +115,7 @@ glabel func_809A7D9C /* 0056C 809A7F5C 27A40038 */ addiu $a0, $sp, 0x0038 ## $a0 = FFFFFFE0 /* 00570 809A7F60 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 00574 809A7F64 24070120 */ addiu $a3, $zero, 0x0120 ## $a3 = 00000120 -/* 00578 809A7F68 0C031AD5 */ jal func_800C6B54 +/* 00578 809A7F68 0C031AD5 */ jal Graph_CloseDisps /* 0057C 809A7F6C AC590004 */ sw $t9, 0x0004($v0) ## 00000004 /* 00580 809A7F70 8FBF001C */ lw $ra, 0x001C($sp) /* 00584 809A7F74 8FB00014 */ lw $s0, 0x0014($sp) diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_HitMark/func_809A824C.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_HitMark/func_809A824C.s index 1c03aff20a..b193a18c36 100644 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_HitMark/func_809A824C.s +++ b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_HitMark/func_809A824C.s @@ -11,7 +11,7 @@ glabel func_809A824C /* 00120 809A8270 24C68670 */ addiu $a2, $a2, %lo(D_809A8670) ## $a2 = 809A8670 /* 00124 809A8274 27A4003C */ addiu $a0, $sp, 0x003C ## $a0 = FFFFFEDC /* 00128 809A8278 24070129 */ addiu $a3, $zero, 0x0129 ## $a3 = 00000129 -/* 0012C 809A827C 0C031AB1 */ jal func_800C6AC4 +/* 0012C 809A827C 0C031AB1 */ jal Graph_OpenDisps /* 00130 809A8280 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 00134 809A8284 27A4011C */ addiu $a0, $sp, 0x011C ## $a0 = FFFFFFBC /* 00138 809A8288 8E250000 */ lw $a1, 0x0000($s1) ## 00000000 @@ -135,7 +135,7 @@ glabel func_809A824C /* 0030C 809A845C 24C68688 */ addiu $a2, $a2, %lo(D_809A8688) ## $a2 = 809A8688 /* 00310 809A8460 27A4003C */ addiu $a0, $sp, 0x003C ## $a0 = FFFFFEDC /* 00314 809A8464 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 00318 809A8468 0C031AD5 */ jal func_800C6B54 +/* 00318 809A8468 0C031AD5 */ jal Graph_CloseDisps /* 0031C 809A846C 24070155 */ addiu $a3, $zero, 0x0155 ## $a3 = 00000155 /* 00320 809A8470 8FBF001C */ lw $ra, 0x001C($sp) /* 00324 809A8474 8FB00014 */ lw $s0, 0x0014($sp) diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Ice_Piece/func_809A8850.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Ice_Piece/func_809A8850.s index d2979cf187..609371121b 100644 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Ice_Piece/func_809A8850.s +++ b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Ice_Piece/func_809A8850.s @@ -20,7 +20,7 @@ glabel func_809A8850 /* 00198 809A8898 E7AA007C */ swc1 $f10, 0x007C($sp) /* 0019C 809A889C 8C98009C */ lw $t8, 0x009C($a0) ## 0000009C /* 001A0 809A88A0 27A40060 */ addiu $a0, $sp, 0x0060 ## $a0 = FFFFFFD8 -/* 001A4 809A88A4 0C031AB1 */ jal func_800C6AC4 +/* 001A4 809A88A4 0C031AB1 */ jal Graph_OpenDisps /* 001A8 809A88A8 AFB80078 */ sw $t8, 0x0078($sp) /* 001AC 809A88AC 86020040 */ lh $v0, 0x0040($s0) ## 00000040 /* 001B0 809A88B0 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 @@ -135,7 +135,7 @@ glabel func_809A8850 /* 0035C 809A8A5C 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 00360 809A8A60 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 /* 00364 809A8A64 00408025 */ or $s0, $v0, $zero ## $s0 = 00000000 -/* 00368 809A8A68 0C0253D0 */ jal Draw_TwoTexScroll +/* 00368 809A8A68 0C0253D0 */ jal Gfx_TwoTexScroll /* 0036C 809A8A6C 306700FF */ andi $a3, $v1, 0x00FF ## $a3 = 00000000 /* 00370 809A8A70 AE020004 */ sw $v0, 0x0004($s0) ## 00000004 /* 00374 809A8A74 8E2202D0 */ lw $v0, 0x02D0($s1) ## 000002D0 @@ -150,7 +150,7 @@ glabel func_809A8850 /* 00398 809A8A98 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 /* 0039C 809A8A9C 240700D1 */ addiu $a3, $zero, 0x00D1 ## $a3 = 000000D1 /* 003A0 809A8AA0 AC4B0000 */ sw $t3, 0x0000($v0) ## 00000000 -/* 003A4 809A8AA4 0C031AD5 */ jal func_800C6B54 +/* 003A4 809A8AA4 0C031AD5 */ jal Graph_CloseDisps /* 003A8 809A8AA8 AC4C0004 */ sw $t4, 0x0004($v0) ## 00000004 /* 003AC 809A8AAC 8FBF003C */ lw $ra, 0x003C($sp) /* 003B0 809A8AB0 8FB00034 */ lw $s0, 0x0034($sp) diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Ice_Smoke/func_809A8D18.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Ice_Smoke/func_809A8D18.s index 14ae7d3240..39bd547e96 100644 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Ice_Smoke/func_809A8D18.s +++ b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Ice_Smoke/func_809A8D18.s @@ -19,7 +19,7 @@ glabel func_809A8D18 /* 0016C 809A8D5C AFAC0088 */ sw $t4, 0x0088($sp) /* 00170 809A8D60 8C850000 */ lw $a1, 0x0000($a0) ## 00000000 /* 00174 809A8D64 27A40068 */ addiu $a0, $sp, 0x0068 ## $a0 = FFFFFFD8 -/* 00178 809A8D68 0C031AB1 */ jal func_800C6AC4 +/* 00178 809A8D68 0C031AB1 */ jal Graph_OpenDisps /* 0017C 809A8D6C 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 /* 00180 809A8D70 8FA40090 */ lw $a0, 0x0090($sp) /* 00184 809A8D74 3C010001 */ lui $at, 0x0001 ## $at = 00010000 @@ -122,7 +122,7 @@ glabel func_809A8D18 /* 00300 809A8EF0 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 /* 00304 809A8EF4 AFA30050 */ sw $v1, 0x0050($sp) /* 00308 809A8EF8 00E23823 */ subu $a3, $a3, $v0 -/* 0030C 809A8EFC 0C0253D0 */ jal Draw_TwoTexScroll +/* 0030C 809A8EFC 0C0253D0 */ jal Gfx_TwoTexScroll /* 00310 809A8F00 00C23023 */ subu $a2, $a2, $v0 /* 00314 809A8F04 8FA80050 */ lw $t0, 0x0050($sp) /* 00318 809A8F08 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 @@ -195,7 +195,7 @@ glabel func_809A8D18 /* 00418 809A9008 24C69130 */ addiu $a2, $a2, %lo(D_809A9130) ## $a2 = 809A9130 /* 0041C 809A900C 27A40068 */ addiu $a0, $sp, 0x0068 ## $a0 = FFFFFFD8 /* 00420 809A9010 240700D2 */ addiu $a3, $zero, 0x00D2 ## $a3 = 000000D2 -/* 00424 809A9014 0C031AD5 */ jal func_800C6B54 +/* 00424 809A9014 0C031AD5 */ jal Graph_CloseDisps /* 00428 809A9018 8D850000 */ lw $a1, 0x0000($t4) ## 00000000 /* 0042C 809A901C 8FBF003C */ lw $ra, 0x003C($sp) /* 00430 809A9020 8FB00038 */ lw $s0, 0x0038($sp) diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_K_Fire/func_809A9280.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_K_Fire/func_809A9280.s index 48a21a5709..10dbe2fb99 100644 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_K_Fire/func_809A9280.s +++ b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_K_Fire/func_809A9280.s @@ -24,7 +24,7 @@ glabel func_809A9280 /* 00128 809A92D8 00000000 */ nop /* 0012C 809A92DC 46805420 */ cvt.s.w $f16, $f10 /* 00130 809A92E0 46008483 */ div.s $f18, $f16, $f0 -/* 00134 809A92E4 0C031AB1 */ jal func_800C6AC4 +/* 00134 809A92E4 0C031AB1 */ jal Graph_OpenDisps /* 00138 809A92E8 E7B20078 */ swc1 $f18, 0x0078($sp) /* 0013C 809A92EC C60C0000 */ lwc1 $f12, 0x0000($s0) ## 00000000 /* 00140 809A92F0 C60E0004 */ lwc1 $f14, 0x0004($s0) ## 00000004 @@ -68,7 +68,7 @@ glabel func_809A9280 /* 001D8 809A9388 AFA20060 */ sw $v0, 0x0060($sp) /* 001DC 809A938C 0000C012 */ mflo $t8 /* 001E0 809A9390 AFB80020 */ sw $t8, 0x0020($sp) -/* 001E4 809A9394 0C0253D0 */ jal Draw_TwoTexScroll +/* 001E4 809A9394 0C0253D0 */ jal Gfx_TwoTexScroll /* 001E8 809A9398 00000000 */ nop /* 001EC 809A939C 8FA30060 */ lw $v1, 0x0060($sp) /* 001F0 809A93A0 AC620004 */ sw $v0, 0x0004($v1) ## 00000004 @@ -162,7 +162,7 @@ glabel func_809A9280 /* 00344 809A94F4 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 /* 00348 809A94F8 240700DC */ addiu $a3, $zero, 0x00DC ## $a3 = 000000DC /* 0034C 809A94FC AC590000 */ sw $t9, 0x0000($v0) ## 00000000 -/* 00350 809A9500 0C031AD5 */ jal func_800C6B54 +/* 00350 809A9500 0C031AD5 */ jal Graph_CloseDisps /* 00354 809A9504 AC490004 */ sw $t1, 0x0004($v0) ## 00000004 /* 00358 809A9508 8FBF003C */ lw $ra, 0x003C($sp) /* 0035C 809A950C 8FB00034 */ lw $s0, 0x0034($sp) diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Kakera/func_809A9874.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Kakera/func_809A9874.s index 251415b720..9f19e4cd43 100644 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Kakera/func_809A9874.s +++ b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Kakera/func_809A9874.s @@ -20,7 +20,7 @@ glabel func_809A9874 /* 0023C 809A98BC 84D80058 */ lh $t8, 0x0058($a2) ## 00000058 /* 00240 809A98C0 3C06809B */ lui $a2, %hi(D_809AA618) ## $a2 = 809B0000 /* 00244 809A98C4 24C6A618 */ addiu $a2, $a2, %lo(D_809AA618) ## $a2 = 809AA618 -/* 00248 809A98C8 0C031AB1 */ jal func_800C6AC4 +/* 00248 809A98C8 0C031AB1 */ jal Graph_OpenDisps /* 0024C 809A98CC AFB80058 */ sw $t8, 0x0058($sp) /* 00250 809A98D0 86390054 */ lh $t9, 0x0054($s1) ## 00000054 /* 00254 809A98D4 2401FFFF */ addiu $at, $zero, 0xFFFF ## $at = FFFFFFFF @@ -204,7 +204,7 @@ glabel func_809A9874 /* 00500 809A9B80 24C6A654 */ addiu $a2, $a2, %lo(D_809AA654) ## $a2 = 809AA654 /* 00504 809A9B84 27A40044 */ addiu $a0, $sp, 0x0044 ## $a0 = FFFFFFDC /* 00508 809A9B88 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 -/* 0050C 809A9B8C 0C031AD5 */ jal func_800C6B54 +/* 0050C 809A9B8C 0C031AD5 */ jal Graph_CloseDisps /* 00510 809A9B90 2407012E */ addiu $a3, $zero, 0x012E ## $a3 = 0000012E /* 00514 809A9B94 8FBF001C */ lw $ra, 0x001C($sp) /* 00518 809A9B98 8FB00014 */ lw $s0, 0x0014($sp) diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_KiraKira/func_809AA9AC.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_KiraKira/func_809AA9AC.s index 4f10cccfc2..5760791f98 100644 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_KiraKira/func_809AA9AC.s +++ b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_KiraKira/func_809AA9AC.s @@ -18,7 +18,7 @@ glabel func_809AA9AC /* 001DC 809AA9EC E7AA01D8 */ swc1 $f10, 0x01D8($sp) /* 001E0 809AA9F0 8C910000 */ lw $s1, 0x0000($a0) ## 00000000 /* 001E4 809AA9F4 27A4003C */ addiu $a0, $sp, 0x003C ## $a0 = FFFFFE5C -/* 001E8 809AA9F8 0C031AB1 */ jal func_800C6AC4 +/* 001E8 809AA9F8 0C031AB1 */ jal Graph_OpenDisps /* 001EC 809AA9FC 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 /* 001F0 809AAA00 27A40194 */ addiu $a0, $sp, 0x0194 ## $a0 = FFFFFFB4 /* 001F4 809AAA04 8E050000 */ lw $a1, 0x0000($s0) ## 00000000 @@ -138,7 +138,7 @@ glabel func_809AA9AC /* 003B8 809AABC8 24C6AE28 */ addiu $a2, $a2, %lo(D_809AAE28) ## $a2 = 809AAE28 /* 003BC 809AABCC 27A4003C */ addiu $a0, $sp, 0x003C ## $a0 = FFFFFE5C /* 003C0 809AABD0 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 003C4 809AABD4 0C031AD5 */ jal func_800C6B54 +/* 003C4 809AABD4 0C031AD5 */ jal Graph_CloseDisps /* 003C8 809AABD8 2407012D */ addiu $a3, $zero, 0x012D ## $a3 = 0000012D /* 003CC 809AABDC 8FBF001C */ lw $ra, 0x001C($sp) /* 003D0 809AABE0 8FB00014 */ lw $s0, 0x0014($sp) diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Lightning/func_809AB078.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Lightning/func_809AB078.s index 02ffe4455a..721a50556c 100644 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Lightning/func_809AB078.s +++ b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Lightning/func_809AB078.s @@ -11,7 +11,7 @@ glabel func_809AB078 /* 001AC 809AB09C 24C6B560 */ addiu $a2, $a2, %lo(D_809AB560) ## $a2 = 809AB560 /* 001B0 809AB0A0 27A40040 */ addiu $a0, $sp, 0x0040 ## $a0 = FFFFFE58 /* 001B4 809AB0A4 240700E9 */ addiu $a3, $zero, 0x00E9 ## $a3 = 000000E9 -/* 001B8 809AB0A8 0C031AB1 */ jal func_800C6AC4 +/* 001B8 809AB0A8 0C031AB1 */ jal Graph_OpenDisps /* 001BC 809AB0AC 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 /* 001C0 809AB0B0 860F0052 */ lh $t7, 0x0052($s0) ## 00000052 /* 001C4 809AB0B4 86180056 */ lh $t8, 0x0056($s0) ## 00000056 @@ -170,7 +170,7 @@ glabel func_809AB078 /* 00420 809AB310 24C6B578 */ addiu $a2, $a2, %lo(D_809AB578) ## $a2 = 809AB578 /* 00424 809AB314 27A40040 */ addiu $a0, $sp, 0x0040 ## $a0 = FFFFFE58 /* 00428 809AB318 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 0042C 809AB31C 0C031AD5 */ jal func_800C6B54 +/* 0042C 809AB31C 0C031AD5 */ jal Graph_CloseDisps /* 00430 809AB320 24070119 */ addiu $a3, $zero, 0x0119 ## $a3 = 00000119 /* 00434 809AB324 8FBF001C */ lw $ra, 0x001C($sp) /* 00438 809AB328 8FB00014 */ lw $s0, 0x0014($sp) diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Sibuki/func_809AB7EC.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Sibuki/func_809AB7EC.s index 255e187d80..1f25a3ba19 100644 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Sibuki/func_809AB7EC.s +++ b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Sibuki/func_809AB7EC.s @@ -18,7 +18,7 @@ glabel func_809AB7EC /* 001FC 809AB82C 240700A3 */ addiu $a3, $zero, 0x00A3 ## $a3 = 000000A3 /* 00200 809AB830 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 /* 00204 809AB834 46083283 */ div.s $f10, $f6, $f8 -/* 00208 809AB838 0C031AB1 */ jal func_800C6AC4 +/* 00208 809AB838 0C031AB1 */ jal Graph_OpenDisps /* 0020C 809AB83C E7AA0050 */ swc1 $f10, 0x0050($sp) /* 00210 809AB840 C60C0000 */ lwc1 $f12, 0x0000($s0) ## 00000000 /* 00214 809AB844 C60E0004 */ lwc1 $f14, 0x0004($s0) ## 00000004 @@ -116,7 +116,7 @@ glabel func_809AB7EC /* 00384 809AB9B4 27A4003C */ addiu $a0, $sp, 0x003C ## $a0 = FFFFFFE4 /* 00388 809AB9B8 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 /* 0038C 809AB9BC 240700C6 */ addiu $a3, $zero, 0x00C6 ## $a3 = 000000C6 -/* 00390 809AB9C0 0C031AD5 */ jal func_800C6B54 +/* 00390 809AB9C0 0C031AD5 */ jal Graph_CloseDisps /* 00394 809AB9C4 AC4D0004 */ sw $t5, 0x0004($v0) ## 00000004 /* 00398 809AB9C8 8FBF001C */ lw $ra, 0x001C($sp) /* 0039C 809AB9CC 8FB00014 */ lw $s0, 0x0014($sp) diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Sibuki2/func_809ABE0C.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Sibuki2/func_809ABE0C.s index 8c783c00b0..72336dadd5 100644 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Sibuki2/func_809ABE0C.s +++ b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Sibuki2/func_809ABE0C.s @@ -18,7 +18,7 @@ glabel func_809ABE0C /* 000EC 809ABE4C 2407009E */ addiu $a3, $zero, 0x009E ## $a3 = 0000009E /* 000F0 809ABE50 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 /* 000F4 809ABE54 46083283 */ div.s $f10, $f6, $f8 -/* 000F8 809ABE58 0C031AB1 */ jal func_800C6AC4 +/* 000F8 809ABE58 0C031AB1 */ jal Graph_OpenDisps /* 000FC 809ABE5C E7AA0050 */ swc1 $f10, 0x0050($sp) /* 00100 809ABE60 C60C0000 */ lwc1 $f12, 0x0000($s0) ## 00000000 /* 00104 809ABE64 C60E0004 */ lwc1 $f14, 0x0004($s0) ## 00000004 @@ -129,7 +129,7 @@ glabel func_809ABE0C /* 002A8 809AC008 24C6C0C0 */ addiu $a2, $a2, %lo(D_809AC0C0) ## $a2 = 809AC0C0 /* 002AC 809AC00C 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 /* 002B0 809AC010 27A4003C */ addiu $a0, $sp, 0x003C ## $a0 = FFFFFFE4 -/* 002B4 809AC014 0C031AD5 */ jal func_800C6B54 +/* 002B4 809AC014 0C031AD5 */ jal Graph_CloseDisps /* 002B8 809AC018 AC4D0004 */ sw $t5, 0x0004($v0) ## 00000004 /* 002BC 809AC01C 8FBF001C */ lw $ra, 0x001C($sp) /* 002C0 809AC020 8FB00014 */ lw $s0, 0x0014($sp) diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Stick/func_809AC42C.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Stick/func_809AC42C.s index d160ce4a5c..0e50158028 100644 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Stick/func_809AC42C.s +++ b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Stick/func_809AC42C.s @@ -1,64 +1,64 @@ glabel func_809AC42C /* 0015C 809AC42C 27BDFFB0 */ addiu $sp, $sp, 0xFFB0 ## $sp = FFFFFFB0 -/* 00160 809AC430 AFB10018 */ sw $s1, 0x0018($sp) -/* 00164 809AC434 AFBF001C */ sw $ra, 0x001C($sp) -/* 00168 809AC438 AFB00014 */ sw $s0, 0x0014($sp) -/* 0016C 809AC43C AFA40050 */ sw $a0, 0x0050($sp) -/* 00170 809AC440 AFA50054 */ sw $a1, 0x0054($sp) +/* 00160 809AC430 AFB10018 */ sw $s1, 0x0018($sp) +/* 00164 809AC434 AFBF001C */ sw $ra, 0x001C($sp) +/* 00168 809AC438 AFB00014 */ sw $s0, 0x0014($sp) +/* 0016C 809AC43C AFA40050 */ sw $a0, 0x0050($sp) +/* 00170 809AC440 AFA50054 */ sw $a1, 0x0054($sp) /* 00174 809AC444 8C900000 */ lw $s0, 0x0000($a0) ## 00000000 /* 00178 809AC448 00C08825 */ or $s1, $a2, $zero ## $s1 = 00000000 /* 0017C 809AC44C 3C06809B */ lui $a2, %hi(D_809AC640) ## $a2 = 809B0000 /* 00180 809AC450 24C6C640 */ addiu $a2, $a2, %lo(D_809AC640) ## $a2 = 809AC640 /* 00184 809AC454 27A40034 */ addiu $a0, $sp, 0x0034 ## $a0 = FFFFFFE4 /* 00188 809AC458 24070099 */ addiu $a3, $zero, 0x0099 ## $a3 = 00000099 -/* 0018C 809AC45C 0C031AB1 */ jal func_800C6AC4 +/* 0018C 809AC45C 0C031AB1 */ jal Graph_OpenDisps /* 00190 809AC460 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 00194 809AC464 C62C0000 */ lwc1 $f12, 0x0000($s1) ## 00000000 /* 00198 809AC468 C62E0004 */ lwc1 $f14, 0x0004($s1) ## 00000004 /* 0019C 809AC46C 8E260008 */ lw $a2, 0x0008($s1) ## 00000008 -/* 001A0 809AC470 0C034261 */ jal Matrix_Translate +/* 001A0 809AC470 0C034261 */ jal Matrix_Translate /* 001A4 809AC474 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 /* 001A8 809AC478 3C0F8016 */ lui $t7, 0x8016 ## $t7 = 80160000 /* 001AC 809AC47C 8DEFE664 */ lw $t7, -0x199C($t7) ## 8015E664 /* 001B0 809AC480 3C01809B */ lui $at, %hi(D_809AC684) ## $at = 809B0000 -/* 001B4 809AC484 11E0000F */ beq $t7, $zero, .L809AC4C4 +/* 001B4 809AC484 11E0000F */ beq $t7, $zero, .L809AC4C4 /* 001B8 809AC488 00000000 */ nop /* 001BC 809AC48C 3C01809B */ lui $at, %hi(D_809AC67C) ## $at = 809B0000 -/* 001C0 809AC490 C42CC67C */ lwc1 $f12, %lo(D_809AC67C)($at) +/* 001C0 809AC490 C42CC67C */ lwc1 $f12, %lo(D_809AC67C)($at) /* 001C4 809AC494 3C01809B */ lui $at, %hi(D_809AC680) ## $at = 809B0000 -/* 001C8 809AC498 C42EC680 */ lwc1 $f14, %lo(D_809AC680)($at) -/* 001CC 809AC49C 44066000 */ mfc1 $a2, $f12 -/* 001D0 809AC4A0 0C0342A3 */ jal Matrix_Scale +/* 001C8 809AC498 C42EC680 */ lwc1 $f14, %lo(D_809AC680)($at) +/* 001CC 809AC49C 44066000 */ mfc1 $a2, $f12 +/* 001D0 809AC4A0 0C0342A3 */ jal Matrix_Scale /* 001D4 809AC4A4 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 /* 001D8 809AC4A8 00002025 */ or $a0, $zero, $zero ## $a0 = 00000000 /* 001DC 809AC4AC 86250042 */ lh $a1, 0x0042($s1) ## 00000042 /* 001E0 809AC4B0 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 001E4 809AC4B4 0C034421 */ jal Matrix_RotateXYZ +/* 001E4 809AC4B4 0C034421 */ jal Matrix_RotateZYX /* 001E8 809AC4B8 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 001EC 809AC4BC 10000017 */ beq $zero, $zero, .L809AC51C +/* 001EC 809AC4BC 10000017 */ beq $zero, $zero, .L809AC51C /* 001F0 809AC4C0 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 .L809AC4C4: -/* 001F4 809AC4C4 C42CC684 */ lwc1 $f12, %lo(D_809AC684)($at) +/* 001F4 809AC4C4 C42CC684 */ lwc1 $f12, %lo(D_809AC684)($at) /* 001F8 809AC4C8 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 001FC 809AC4CC 44066000 */ mfc1 $a2, $f12 -/* 00200 809AC4D0 0C0342A3 */ jal Matrix_Scale -/* 00204 809AC4D4 46006386 */ mov.s $f14, $f12 -/* 00208 809AC4D8 8FB80050 */ lw $t8, 0x0050($sp) +/* 001FC 809AC4CC 44066000 */ mfc1 $a2, $f12 +/* 00200 809AC4D0 0C0342A3 */ jal Matrix_Scale +/* 00204 809AC4D4 46006386 */ mov.s $f14, $f12 +/* 00208 809AC4D8 8FB80050 */ lw $t8, 0x0050($sp) /* 0020C 809AC4DC 00002025 */ or $a0, $zero, $zero ## $a0 = 00000000 /* 00210 809AC4E0 86250042 */ lh $a1, 0x0042($s1) ## 00000042 /* 00214 809AC4E4 8F06009C */ lw $a2, 0x009C($t8) ## 0000009C /* 00218 809AC4E8 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 0021C 809AC4EC 00C00821 */ addu $at, $a2, $zero -/* 00220 809AC4F0 00063080 */ sll $a2, $a2, 2 -/* 00224 809AC4F4 00C13021 */ addu $a2, $a2, $at -/* 00228 809AC4F8 000630C0 */ sll $a2, $a2, 3 -/* 0022C 809AC4FC 00C13023 */ subu $a2, $a2, $at -/* 00230 809AC500 00063100 */ sll $a2, $a2, 4 -/* 00234 809AC504 00C13021 */ addu $a2, $a2, $at -/* 00238 809AC508 00063100 */ sll $a2, $a2, 4 -/* 0023C 809AC50C 00063400 */ sll $a2, $a2, 16 -/* 00240 809AC510 0C034421 */ jal Matrix_RotateXYZ -/* 00244 809AC514 00063403 */ sra $a2, $a2, 16 +/* 0021C 809AC4EC 00C00821 */ addu $at, $a2, $zero +/* 00220 809AC4F0 00063080 */ sll $a2, $a2, 2 +/* 00224 809AC4F4 00C13021 */ addu $a2, $a2, $at +/* 00228 809AC4F8 000630C0 */ sll $a2, $a2, 3 +/* 0022C 809AC4FC 00C13023 */ subu $a2, $a2, $at +/* 00230 809AC500 00063100 */ sll $a2, $a2, 4 +/* 00234 809AC504 00C13021 */ addu $a2, $a2, $at +/* 00238 809AC508 00063100 */ sll $a2, $a2, 4 +/* 0023C 809AC50C 00063400 */ sll $a2, $a2, 16 +/* 00240 809AC510 0C034421 */ jal Matrix_RotateZYX +/* 00244 809AC514 00063403 */ sra $a2, $a2, 16 /* 00248 809AC518 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 .L809AC51C: /* 0024C 809AC51C 3C08DA38 */ lui $t0, 0xDA38 ## $t0 = DA380000 @@ -70,11 +70,11 @@ glabel func_809AC42C /* 00264 809AC534 24A5C654 */ addiu $a1, $a1, %lo(D_809AC654) ## $a1 = 809AC654 /* 00268 809AC538 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 0026C 809AC53C 240600B0 */ addiu $a2, $zero, 0x00B0 ## $a2 = 000000B0 -/* 00270 809AC540 0C0346A2 */ jal Matrix_NewMtx -/* 00274 809AC544 AFA20030 */ sw $v0, 0x0030($sp) -/* 00278 809AC548 8FA30030 */ lw $v1, 0x0030($sp) +/* 00270 809AC540 0C0346A2 */ jal Matrix_NewMtx +/* 00274 809AC544 AFA20030 */ sw $v0, 0x0030($sp) +/* 00278 809AC548 8FA30030 */ lw $v1, 0x0030($sp) /* 0027C 809AC54C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00280 809AC550 0C024F46 */ jal func_80093D18 +/* 00280 809AC550 0C024F46 */ jal func_80093D18 /* 00284 809AC554 AC620004 */ sw $v0, 0x0004($v1) ## 00000004 /* 00288 809AC558 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 /* 0028C 809AC55C 3C0ADB06 */ lui $t2, 0xDB06 ## $t2 = DB060000 @@ -83,13 +83,13 @@ glabel func_809AC42C /* 00298 809AC568 AE0902C0 */ sw $t1, 0x02C0($s0) ## 000002C0 /* 0029C 809AC56C AC4A0000 */ sw $t2, 0x0000($v0) ## 00000000 /* 002A0 809AC570 862C0040 */ lh $t4, 0x0040($s1) ## 00000040 -/* 002A4 809AC574 8FAB0050 */ lw $t3, 0x0050($sp) +/* 002A4 809AC574 8FAB0050 */ lw $t3, 0x0050($sp) /* 002A8 809AC578 3C0F0001 */ lui $t7, 0x0001 ## $t7 = 00010000 -/* 002AC 809AC57C 000C6900 */ sll $t5, $t4, 4 -/* 002B0 809AC580 01AC6821 */ addu $t5, $t5, $t4 -/* 002B4 809AC584 000D6880 */ sll $t5, $t5, 2 -/* 002B8 809AC588 016D7021 */ addu $t6, $t3, $t5 -/* 002BC 809AC58C 01EE7821 */ addu $t7, $t7, $t6 +/* 002AC 809AC57C 000C6900 */ sll $t5, $t4, 4 +/* 002B0 809AC580 01AC6821 */ addu $t5, $t5, $t4 +/* 002B4 809AC584 000D6880 */ sll $t5, $t5, 2 +/* 002B8 809AC588 016D7021 */ addu $t6, $t3, $t5 +/* 002BC 809AC58C 01EE7821 */ addu $t7, $t7, $t6 /* 002C0 809AC590 8DEF17B4 */ lw $t7, 0x17B4($t7) ## 000117B4 /* 002C4 809AC594 3C19DB06 */ lui $t9, 0xDB06 ## $t9 = DB060000 /* 002C8 809AC598 3C088012 */ lui $t0, 0x8012 ## $t0 = 80120000 @@ -112,12 +112,12 @@ glabel func_809AC42C /* 0030C 809AC5DC 27A40034 */ addiu $a0, $sp, 0x0034 ## $a0 = FFFFFFE4 /* 00310 809AC5E0 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 00314 809AC5E4 240700BC */ addiu $a3, $zero, 0x00BC ## $a3 = 000000BC -/* 00318 809AC5E8 0C031AD5 */ jal func_800C6B54 +/* 00318 809AC5E8 0C031AD5 */ jal Graph_CloseDisps /* 0031C 809AC5EC AC4C0004 */ sw $t4, 0x0004($v0) ## 00000004 -/* 00320 809AC5F0 8FBF001C */ lw $ra, 0x001C($sp) -/* 00324 809AC5F4 8FB00014 */ lw $s0, 0x0014($sp) -/* 00328 809AC5F8 8FB10018 */ lw $s1, 0x0018($sp) -/* 0032C 809AC5FC 03E00008 */ jr $ra +/* 00320 809AC5F0 8FBF001C */ lw $ra, 0x001C($sp) +/* 00324 809AC5F4 8FB00014 */ lw $s0, 0x0014($sp) +/* 00328 809AC5F8 8FB10018 */ lw $s1, 0x0018($sp) +/* 0032C 809AC5FC 03E00008 */ jr $ra /* 00330 809AC600 27BD0050 */ addiu $sp, $sp, 0x0050 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Stone1/func_809AC78C.s b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Stone1/func_809AC78C.s index 46d7984133..67af37d1ed 100644 --- a/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Stone1/func_809AC78C.s +++ b/asm/non_matchings/overlays/effects/ovl_Effect_Ss_Stone1/func_809AC78C.s @@ -18,7 +18,7 @@ glabel func_809AC78C /* 000CC 809AC7CC 24C6CA70 */ addiu $a2, $a2, %lo(D_809ACA70) ## $a2 = 809ACA70 /* 000D0 809AC7D0 27A40038 */ addiu $a0, $sp, 0x0038 ## $a0 = FFFFFFD0 /* 000D4 809AC7D4 2407009A */ addiu $a3, $zero, 0x009A ## $a3 = 0000009A -/* 000D8 809AC7D8 0C031AB1 */ jal func_800C6AC4 +/* 000D8 809AC7D8 0C031AB1 */ jal Graph_OpenDisps /* 000DC 809AC7DC 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 000E0 809AC7E0 8FA40068 */ lw $a0, 0x0068($sp) /* 000E4 809AC7E4 3C010001 */ lui $at, 0x0001 ## $at = 00010000 @@ -135,7 +135,7 @@ glabel func_809AC78C /* 00298 809AC998 02002825 */ or $a1, $s0, $zero ## $a1 = 00000000 /* 0029C 809AC99C 240700B7 */ addiu $a3, $zero, 0x00B7 ## $a3 = 000000B7 /* 002A0 809AC9A0 AC480000 */ sw $t0, 0x0000($v0) ## 00000000 -/* 002A4 809AC9A4 0C031AD5 */ jal func_800C6B54 +/* 002A4 809AC9A4 0C031AD5 */ jal Graph_CloseDisps /* 002A8 809AC9A8 AC490004 */ sw $t1, 0x0004($v0) ## 00000004 /* 002AC 809AC9AC 8FBF001C */ lw $ra, 0x001C($sp) /* 002B0 809AC9B0 8FB00014 */ lw $s0, 0x0014($sp) diff --git a/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_80806DB0.s b/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_80806DB0.s index 62a36e8683..420f13cbe6 100644 --- a/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_80806DB0.s +++ b/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_80806DB0.s @@ -9,7 +9,7 @@ glabel func_80806DB0 /* 0308C 80806DCC 24C62A90 */ addiu $a2, $a2, %lo(D_80812A90) ## $a2 = 80812A90 /* 03090 80806DD0 AFA50058 */ sw $a1, 0x0058($sp) /* 03094 80806DD4 27A40044 */ addiu $a0, $sp, 0x0044 ## $a0 = FFFFFFEC -/* 03098 80806DD8 0C031AB1 */ jal func_800C6AC4 +/* 03098 80806DD8 0C031AB1 */ jal Graph_OpenDisps /* 0309C 80806DDC 2407006E */ addiu $a3, $zero, 0x006E ## $a3 = 0000006E /* 030A0 80806DE0 8FA50058 */ lw $a1, 0x0058($sp) /* 030A4 80806DE4 3C0FFD90 */ lui $t7, 0xFD90 ## $t7 = FD900000 @@ -90,7 +90,7 @@ glabel func_80806DB0 /* 031D0 80806F10 24C62AA8 */ addiu $a2, $a2, %lo(D_80812AA8) ## $a2 = 80812AA8 /* 031D4 80806F14 24070077 */ addiu $a3, $zero, 0x0077 ## $a3 = 00000077 /* 031D8 80806F18 AC4E0004 */ sw $t6, 0x0004($v0) ## 00000004 -/* 031DC 80806F1C 0C031AD5 */ jal func_800C6B54 +/* 031DC 80806F1C 0C031AD5 */ jal Graph_CloseDisps /* 031E0 80806F20 AC490000 */ sw $t1, 0x0000($v0) ## 00000000 /* 031E4 80806F24 8FBF0014 */ lw $ra, 0x0014($sp) /* 031E8 80806F28 27BD0058 */ addiu $sp, $sp, 0x0058 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_8080723C.s b/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_8080723C.s index 00d0be4742..efcd00be63 100644 --- a/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_8080723C.s +++ b/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_8080723C.s @@ -9,7 +9,7 @@ glabel func_8080723C /* 03518 80807258 24C62AC0 */ addiu $a2, $a2, %lo(D_80812AC0) ## $a2 = 80812AC0 /* 0351C 8080725C 27A400FC */ addiu $a0, $sp, 0x00FC ## $a0 = FFFFFFDC /* 03520 80807260 240700CD */ addiu $a3, $zero, 0x00CD ## $a3 = 000000CD -/* 03524 80807264 0C031AB1 */ jal func_800C6AC4 +/* 03524 80807264 0C031AB1 */ jal Graph_OpenDisps /* 03528 80807268 AFA5010C */ sw $a1, 0x010C($sp) /* 0352C 8080726C 8FA8010C */ lw $t0, 0x010C($sp) /* 03530 80807270 3C04E700 */ lui $a0, 0xE700 ## $a0 = E7000000 @@ -752,7 +752,7 @@ glabel func_8080723C /* 04068 80807DA8 27A400FC */ addiu $a0, $sp, 0x00FC ## $a0 = FFFFFFDC .L80807DAC: /* 0406C 80807DAC 8E250000 */ lw $a1, 0x0000($s1) ## 00000000 -/* 04070 80807DB0 0C031AD5 */ jal func_800C6B54 +/* 04070 80807DB0 0C031AD5 */ jal Graph_CloseDisps /* 04074 80807DB4 24070133 */ addiu $a3, $zero, 0x0133 ## $a3 = 00000133 /* 04078 80807DB8 8FBF001C */ lw $ra, 0x001C($sp) /* 0407C 80807DBC 8FB00014 */ lw $s0, 0x0014($sp) diff --git a/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_80807DCC.s b/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_80807DCC.s index a4cfa279f9..a50976f87d 100644 --- a/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_80807DCC.s +++ b/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_80807DCC.s @@ -18,7 +18,7 @@ glabel func_80807DCC /* 040CC 80807E0C 24C62AF0 */ addiu $a2, $a2, %lo(D_80812AF0) ## $a2 = 80812AF0 /* 040D0 80807E10 27A40064 */ addiu $a0, $sp, 0x0064 ## $a0 = FFFFFFDC /* 040D4 80807E14 24070144 */ addiu $a3, $zero, 0x0144 ## $a3 = 00000144 -/* 040D8 80807E18 0C031AB1 */ jal func_800C6AC4 +/* 040D8 80807E18 0C031AB1 */ jal Graph_OpenDisps /* 040DC 80807E1C 00A0B025 */ or $s6, $a1, $zero ## $s6 = 00000000 /* 040E0 80807E20 0C02526A */ jal func_800949A8 /* 040E4 80807E24 8E840000 */ lw $a0, 0x0000($s4) ## 00000000 @@ -128,7 +128,7 @@ glabel func_80807DCC /* 0427C 80807FBC 24C62B08 */ addiu $a2, $a2, %lo(D_80812B08) ## $a2 = 80812B08 /* 04280 80807FC0 27A40064 */ addiu $a0, $sp, 0x0064 ## $a0 = FFFFFFDC /* 04284 80807FC4 8E850000 */ lw $a1, 0x0000($s4) ## 00000000 -/* 04288 80807FC8 0C031AD5 */ jal func_800C6B54 +/* 04288 80807FC8 0C031AD5 */ jal Graph_CloseDisps /* 0428C 80807FCC 2407015B */ addiu $a3, $zero, 0x015B ## $a3 = 0000015B /* 04290 80807FD0 8FBF003C */ lw $ra, 0x003C($sp) /* 04294 80807FD4 8FB00018 */ lw $s0, 0x0018($sp) diff --git a/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_80808000.s b/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_80808000.s index 0e54d814cd..b5ac8fcc91 100644 --- a/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_80808000.s +++ b/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_80808000.s @@ -8,7 +8,7 @@ glabel func_80808000 /* 042D8 80808018 24C62B20 */ addiu $a2, $a2, %lo(D_80812B20) ## $a2 = 80812B20 /* 042DC 8080801C 27A400C8 */ addiu $a0, $sp, 0x00C8 ## $a0 = FFFFFFD8 /* 042E0 80808020 24070170 */ addiu $a3, $zero, 0x0170 ## $a3 = 00000170 -/* 042E4 80808024 0C031AB1 */ jal func_800C6AC4 +/* 042E4 80808024 0C031AB1 */ jal Graph_OpenDisps /* 042E8 80808028 AFA500D8 */ sw $a1, 0x00D8($sp) /* 042EC 8080802C 0C201BCD */ jal func_80806F34 /* 042F0 80808030 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 @@ -1040,7 +1040,7 @@ glabel func_80808000 /* 0521C 80808F5C 8E050000 */ lw $a1, 0x0000($s0) ## 00000000 /* 05220 80808F60 24C62B9C */ addiu $a2, $a2, %lo(D_80812B9C) ## $a2 = 80812B9C /* 05224 80808F64 27A400C8 */ addiu $a0, $sp, 0x00C8 ## $a0 = FFFFFFD8 -/* 05228 80808F68 0C031AD5 */ jal func_800C6B54 +/* 05228 80808F68 0C031AD5 */ jal Graph_CloseDisps /* 0522C 80808F6C 24070226 */ addiu $a3, $zero, 0x0226 ## $a3 = 00000226 /* 05230 80808F70 8FBF0024 */ lw $ra, 0x0024($sp) /* 05234 80808F74 8FB00020 */ lw $s0, 0x0020($sp) diff --git a/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_808099C8.s b/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_808099C8.s index 8659622cfa..7c6116051e 100644 --- a/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_808099C8.s +++ b/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_808099C8.s @@ -10,7 +10,7 @@ glabel func_808099C8 /* 05CA8 808099E8 24C62C68 */ addiu $a2, $a2, %lo(D_80812C68) ## $a2 = 80812C68 /* 05CAC 808099EC 27A40194 */ addiu $a0, $sp, 0x0194 ## $a0 = FFFFFFDC /* 05CB0 808099F0 24070350 */ addiu $a3, $zero, 0x0350 ## $a3 = 00000350 -/* 05CB4 808099F4 0C031AB1 */ jal func_800C6AC4 +/* 05CB4 808099F4 0C031AB1 */ jal Graph_OpenDisps /* 05CB8 808099F8 AFA501A4 */ sw $a1, 0x01A4($sp) /* 05CBC 808099FC 3C108081 */ lui $s0, %hi(D_808126FC) ## $s0 = 80810000 /* 05CC0 80809A00 861026FC */ lh $s0, %lo(D_808126FC)($s0) @@ -1434,7 +1434,7 @@ glabel func_808099C8 /* 071C4 8080AF04 24C62CC8 */ addiu $a2, $a2, %lo(D_80812CC8) ## $a2 = 80812CC8 /* 071C8 8080AF08 27A40194 */ addiu $a0, $sp, 0x0194 ## $a0 = FFFFFFDC /* 071CC 8080AF0C 8E450000 */ lw $a1, 0x0000($s2) ## 00000000 -/* 071D0 8080AF10 0C031AD5 */ jal func_800C6B54 +/* 071D0 8080AF10 0C031AD5 */ jal Graph_CloseDisps /* 071D4 8080AF14 24070410 */ addiu $a3, $zero, 0x0410 ## $a3 = 00000410 /* 071D8 8080AF18 8FBF0024 */ lw $ra, 0x0024($sp) /* 071DC 8080AF1C 8FB00018 */ lw $s0, 0x0018($sp) diff --git a/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_8080D8CC.s b/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_8080D8CC.s index 02e80615c6..3ea64a416e 100644 --- a/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_8080D8CC.s +++ b/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_8080D8CC.s @@ -18,7 +18,7 @@ glabel func_8080D8CC /* 09BCC 8080D90C 24C62E00 */ addiu $a2, $a2, %lo(D_80812E00) ## $a2 = 80812E00 /* 09BD0 8080D910 27A400C4 */ addiu $a0, $sp, 0x00C4 ## $a0 = FFFFFFD4 /* 09BD4 8080D914 240706AD */ addiu $a3, $zero, 0x06AD ## $a3 = 000006AD -/* 09BD8 8080D918 0C031AB1 */ jal func_800C6AC4 +/* 09BD8 8080D918 0C031AB1 */ jal Graph_OpenDisps /* 09BDC 8080D91C 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 /* 09BE0 8080D920 8E2202C0 */ lw $v0, 0x02C0($s1) ## 000002C0 /* 09BE4 8080D924 3C16E700 */ lui $s6, 0xE700 ## $s6 = E7000000 @@ -490,7 +490,7 @@ glabel func_8080D8CC /* 0A2F8 8080E038 24C62E14 */ addiu $a2, $a2, %lo(D_80812E14) ## $a2 = 80812E14 /* 0A2FC 8080E03C 27A400C4 */ addiu $a0, $sp, 0x00C4 ## $a0 = FFFFFFD4 /* 0A300 8080E040 8E850000 */ lw $a1, 0x0000($s4) ## 00000000 -/* 0A304 8080E044 0C031AD5 */ jal func_800C6B54 +/* 0A304 8080E044 0C031AD5 */ jal Graph_CloseDisps /* 0A308 8080E048 24070705 */ addiu $a3, $zero, 0x0705 ## $a3 = 00000705 /* 0A30C 8080E04C 8FBF003C */ lw $ra, 0x003C($sp) /* 0A310 8080E050 8FB00020 */ lw $s0, 0x0020($sp) diff --git a/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_8080E074.s b/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_8080E074.s index 8c3f99b262..239bd49909 100644 --- a/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_8080E074.s +++ b/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_8080E074.s @@ -16,7 +16,7 @@ glabel func_8080E074 /* 0A36C 8080E0AC 24C62E28 */ addiu $a2, $a2, %lo(D_80812E28) ## $a2 = 80812E28 /* 0A370 8080E0B0 27A4027C */ addiu $a0, $sp, 0x027C ## $a0 = FFFFFFDC /* 0A374 8080E0B4 24070794 */ addiu $a3, $zero, 0x0794 ## $a3 = 00000794 -/* 0A378 8080E0B8 0C031AB1 */ jal func_800C6AC4 +/* 0A378 8080E0B8 0C031AB1 */ jal Graph_OpenDisps /* 0A37C 8080E0BC AFA5028C */ sw $a1, 0x028C($sp) /* 0A380 8080E0C0 8FA9028C */ lw $t1, 0x028C($sp) /* 0A384 8080E0C4 3C14E700 */ lui $s4, 0xE700 ## $s4 = E7000000 @@ -1347,7 +1347,7 @@ glabel func_8080E074 /* 0B7DC 8080F51C ACCF0000 */ sw $t7, 0x0000($a2) ## 00000000 /* 0B7E0 8080F520 3C068081 */ lui $a2, %hi(D_80812E3C) ## $a2 = 80810000 /* 0B7E4 8080F524 24C62E3C */ addiu $a2, $a2, %lo(D_80812E3C) ## $a2 = 80812E3C -/* 0B7E8 8080F528 0C031AD5 */ jal func_800C6B54 +/* 0B7E8 8080F528 0C031AD5 */ jal Graph_CloseDisps /* 0B7EC 8080F52C 8E650000 */ lw $a1, 0x0000($s3) ## 00000000 /* 0B7F0 8080F530 8FBF003C */ lw $ra, 0x003C($sp) /* 0B7F4 8080F534 8FB00018 */ lw $s0, 0x0018($sp) diff --git a/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_8080F560.s b/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_8080F560.s index e54fc5faa3..f235527eb7 100644 --- a/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_8080F560.s +++ b/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_8080F560.s @@ -9,7 +9,7 @@ glabel func_8080F560 /* 0B83C 8080F57C 24C62E50 */ addiu $a2, $a2, %lo(D_80812E50) ## $a2 = 80812E50 /* 0B840 8080F580 27A400EC */ addiu $a0, $sp, 0x00EC ## $a0 = FFFFFFDC /* 0B844 8080F584 240708AA */ addiu $a3, $zero, 0x08AA ## $a3 = 000008AA -/* 0B848 8080F588 0C031AB1 */ jal func_800C6AC4 +/* 0B848 8080F588 0C031AB1 */ jal Graph_OpenDisps /* 0B84C 8080F58C 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 /* 0B850 8080F590 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 /* 0B854 8080F594 3C0FE700 */ lui $t7, 0xE700 ## $t7 = E7000000 @@ -563,7 +563,7 @@ glabel func_8080F560 /* 0C0C4 8080FE04 24C62EA0 */ addiu $a2, $a2, %lo(D_80812EA0) ## $a2 = 80812EA0 /* 0C0C8 8080FE08 27A400EC */ addiu $a0, $sp, 0x00EC ## $a0 = FFFFFFDC /* 0C0CC 8080FE0C 8E250000 */ lw $a1, 0x0000($s1) ## 00000000 -/* 0C0D0 8080FE10 0C031AD5 */ jal func_800C6B54 +/* 0C0D0 8080FE10 0C031AD5 */ jal Graph_CloseDisps /* 0C0D4 8080FE14 24070930 */ addiu $a3, $zero, 0x0930 ## $a3 = 00000930 /* 0C0D8 8080FE18 8FBF002C */ lw $ra, 0x002C($sp) /* 0C0DC 8080FE1C 8FB00024 */ lw $s0, 0x0024($sp) diff --git a/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_808109B8.s b/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_808109B8.s index 5709fd7fed..daaf6055e5 100644 --- a/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_808109B8.s +++ b/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_808109B8.s @@ -9,7 +9,7 @@ glabel func_808109B8 /* 0CC94 808109D4 24C62EE4 */ addiu $a2, $a2, %lo(D_80812EE4) ## $a2 = 80812EE4 /* 0CC98 808109D8 27A4007C */ addiu $a0, $sp, 0x007C ## $a0 = FFFFFFDC /* 0CC9C 808109DC 24070AC1 */ addiu $a3, $zero, 0x0AC1 ## $a3 = 00000AC1 -/* 0CCA0 808109E0 0C031AB1 */ jal func_800C6AC4 +/* 0CCA0 808109E0 0C031AB1 */ jal Graph_OpenDisps /* 0CCA4 808109E4 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000 /* 0CCA8 808109E8 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0 /* 0CCAC 808109EC 3C0FE700 */ lui $t7, 0xE700 ## $t7 = E7000000 @@ -249,7 +249,7 @@ glabel func_808109B8 /* 0D044 80810D84 24C62F0C */ addiu $a2, $a2, %lo(D_80812F0C) ## $a2 = 80812F0C /* 0D048 80810D88 27A4007C */ addiu $a0, $sp, 0x007C ## $a0 = FFFFFFDC /* 0D04C 80810D8C 8E250000 */ lw $a1, 0x0000($s1) ## 00000000 -/* 0D050 80810D90 0C031AD5 */ jal func_800C6B54 +/* 0D050 80810D90 0C031AD5 */ jal Graph_CloseDisps /* 0D054 80810D94 24070B12 */ addiu $a3, $zero, 0x0B12 ## $a3 = 00000B12 /* 0D058 80810D98 8FBF002C */ lw $ra, 0x002C($sp) /* 0D05C 80810D9C 8FB00024 */ lw $s0, 0x0024($sp) diff --git a/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_80810DAC.s b/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_80810DAC.s index 0122a4f2ff..7fa2a1933d 100644 --- a/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_80810DAC.s +++ b/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_80810DAC.s @@ -8,7 +8,7 @@ glabel func_80810DAC /* 0D084 80810DC4 24C62F20 */ addiu $a2, $a2, %lo(D_80812F20) ## $a2 = 80812F20 /* 0D088 80810DC8 27A4007C */ addiu $a0, $sp, 0x007C ## $a0 = FFFFFFE4 /* 0D08C 80810DCC 24070B52 */ addiu $a3, $zero, 0x0B52 ## $a3 = 00000B52 -/* 0D090 80810DD0 0C031AB1 */ jal func_800C6AC4 +/* 0D090 80810DD0 0C031AB1 */ jal Graph_OpenDisps /* 0D094 80810DD4 AFA5008C */ sw $a1, 0x008C($sp) /* 0D098 80810DD8 8FA8008C */ lw $t0, 0x008C($sp) /* 0D09C 80810DDC 3C010002 */ lui $at, 0x0002 ## $at = 00020000 @@ -391,7 +391,7 @@ glabel func_80810DAC /* 0D640 80811380 8E050000 */ lw $a1, 0x0000($s0) ## 00000000 /* 0D644 80811384 24C62F34 */ addiu $a2, $a2, %lo(D_80812F34) ## $a2 = 80812F34 /* 0D648 80811388 27A4007C */ addiu $a0, $sp, 0x007C ## $a0 = FFFFFFE4 -/* 0D64C 8081138C 0C031AD5 */ jal func_800C6B54 +/* 0D64C 8081138C 0C031AD5 */ jal Graph_CloseDisps /* 0D650 80811390 24070BDB */ addiu $a3, $zero, 0x0BDB ## $a3 = 00000BDB /* 0D654 80811394 8FBF001C */ lw $ra, 0x001C($sp) /* 0D658 80811398 8FB00018 */ lw $s0, 0x0018($sp) diff --git a/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_808113A8.s b/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_808113A8.s index 7266a07c2a..6c82a645ad 100644 --- a/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_808113A8.s +++ b/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_808113A8.s @@ -412,8 +412,4 @@ glabel func_808113A8 /* 0DCCC 80811A0C 8FB20020 */ lw $s2, 0x0020($sp) /* 0DCD0 80811A10 03E00008 */ jr $ra /* 0DCD4 80811A14 27BD0078 */ addiu $sp, $sp, 0x0078 ## $sp = 00000000 -.L80811A18: -/* 0DCD8 80811A18 03E00008 */ jr $ra -/* 0DCDC 80811A1C AFA40000 */ sw $a0, 0x0000($sp) - diff --git a/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_80811A18.s b/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_80811A18.s new file mode 100644 index 0000000000..ce602cccce --- /dev/null +++ b/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_80811A18.s @@ -0,0 +1,3 @@ +glabel func_80811A18 +/* 0DCD8 80811A18 03E00008 */ jr $ra +/* 0DCDC 80811A1C AFA40000 */ sw $a0, 0x0000($sp) diff --git a/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_80811A20.s b/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_80811A20.s index 3ae3180c96..aec526e62f 100644 --- a/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_80811A20.s +++ b/asm/non_matchings/overlays/gamestates/ovl_file_choose/func_80811A20.s @@ -80,9 +80,9 @@ glabel func_80811A20 /* 0DDFC 80811B3C 0C02A89E */ jal func_800AA278 /* 0DE00 80811B40 8E050000 */ lw $a1, 0x0000($s0) ## 00000000 /* 0DE04 80811B44 3C0A8081 */ lui $t2, %hi(func_80810DAC) ## $t2 = 80810000 -/* 0DE08 80811B48 3C0B8081 */ lui $t3, %hi(.L80811A18) ## $t3 = 80810000 +/* 0DE08 80811B48 3C0B8081 */ lui $t3, %hi(func_80811A18) ## $t3 = 80810000 /* 0DE0C 80811B4C 254A0DAC */ addiu $t2, $t2, %lo(func_80810DAC) ## $t2 = 80810DAC -/* 0DE10 80811B50 256B1A18 */ addiu $t3, $t3, %lo(.L80811A18) ## $t3 = 80811A18 +/* 0DE10 80811B50 256B1A18 */ addiu $t3, $t3, %lo(func_80811A18) ## $t3 = 80811A18 /* 0DE14 80811B54 AE0A0004 */ sw $t2, 0x0004($s0) ## 00000004 /* 0DE18 80811B58 AE0B0008 */ sw $t3, 0x0008($s0) ## 00000008 /* 0DE1C 80811B5C 0C2044EA */ jal func_808113A8 diff --git a/asm/non_matchings/overlays/gamestates/ovl_select/func_80801AAC.s b/asm/non_matchings/overlays/gamestates/ovl_select/func_80801AAC.s index 8c47a86d66..d35d64343c 100644 --- a/asm/non_matchings/overlays/gamestates/ovl_select/func_80801AAC.s +++ b/asm/non_matchings/overlays/gamestates/ovl_select/func_80801AAC.s @@ -12,7 +12,7 @@ glabel func_80801AAC /* 00F44 80801AD4 24C63530 */ addiu $a2, $a2, %lo(D_80803530) ## $a2 = 80803530 /* 00F48 80801AD8 27A40054 */ addiu $a0, $sp, 0x0054 ## $a0 = FFFFFFE4 /* 00F4C 80801ADC 240703A2 */ addiu $a3, $zero, 0x03A2 ## $a3 = 000003A2 -/* 00F50 80801AE0 0C031AB1 */ jal func_800C6AC4 +/* 00F50 80801AE0 0C031AB1 */ jal Graph_OpenDisps /* 00F54 80801AE4 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 /* 00F58 80801AE8 8E2302C0 */ lw $v1, 0x02C0($s1) ## 000002C0 /* 00F5C 80801AEC 3C0FDB06 */ lui $t7, 0xDB06 ## $t7 = DB060000 @@ -70,7 +70,7 @@ glabel func_80801AAC /* 0102C 80801BBC 24C63540 */ addiu $a2, $a2, %lo(D_80803540) ## $a2 = 80803540 /* 01030 80801BC0 27C40054 */ addiu $a0, $s8, 0x0054 ## $a0 = FFFFFFE4 /* 01034 80801BC4 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 01038 80801BC8 0C031AD5 */ jal func_800C6B54 +/* 01038 80801BC8 0C031AD5 */ jal Graph_CloseDisps /* 0103C 80801BCC 240703C6 */ addiu $a3, $zero, 0x03C6 ## $a3 = 000003C6 /* 01040 80801BD0 8FDF0034 */ lw $ra, 0x0034($s8) ## FFFFFFC4 /* 01044 80801BD4 03C0E825 */ or $sp, $s8, $zero ## $sp = FFFFFF90 diff --git a/asm/non_matchings/overlays/gamestates/ovl_select/func_80801BF0.s b/asm/non_matchings/overlays/gamestates/ovl_select/func_80801BF0.s index c511b33ebd..3b4c86aa77 100644 --- a/asm/non_matchings/overlays/gamestates/ovl_select/func_80801BF0.s +++ b/asm/non_matchings/overlays/gamestates/ovl_select/func_80801BF0.s @@ -11,7 +11,7 @@ glabel func_80801BF0 /* 01084 80801C14 24C63550 */ addiu $a2, $a2, %lo(D_80803550) ## $a2 = 80803550 /* 01088 80801C18 27A40054 */ addiu $a0, $sp, 0x0054 ## $a0 = FFFFFFE4 /* 0108C 80801C1C 240703D1 */ addiu $a3, $zero, 0x03D1 ## $a3 = 000003D1 -/* 01090 80801C20 0C031AB1 */ jal func_800C6AC4 +/* 01090 80801C20 0C031AB1 */ jal Graph_OpenDisps /* 01094 80801C24 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 /* 01098 80801C28 8E2302C0 */ lw $v1, 0x02C0($s1) ## 000002C0 /* 0109C 80801C2C 3C18DB06 */ lui $t8, 0xDB06 ## $t8 = DB060000 @@ -59,7 +59,7 @@ glabel func_80801BF0 /* 01144 80801CD4 24C63560 */ addiu $a2, $a2, %lo(D_80803560) ## $a2 = 80803560 /* 01148 80801CD8 27C40054 */ addiu $a0, $s8, 0x0054 ## $a0 = FFFFFFE4 /* 0114C 80801CDC 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 01150 80801CE0 0C031AD5 */ jal func_800C6B54 +/* 01150 80801CE0 0C031AD5 */ jal Graph_CloseDisps /* 01154 80801CE4 240703EE */ addiu $a3, $zero, 0x03EE ## $a3 = 000003EE /* 01158 80801CE8 8FDF0034 */ lw $ra, 0x0034($s8) ## FFFFFFC4 /* 0115C 80801CEC 03C0E825 */ or $sp, $s8, $zero ## $sp = FFFFFF90 diff --git a/asm/non_matchings/overlays/gamestates/ovl_select/func_80801D04.s b/asm/non_matchings/overlays/gamestates/ovl_select/func_80801D04.s index 013444ecc1..5fda22ecd9 100644 --- a/asm/non_matchings/overlays/gamestates/ovl_select/func_80801D04.s +++ b/asm/non_matchings/overlays/gamestates/ovl_select/func_80801D04.s @@ -9,7 +9,7 @@ glabel func_80801D04 /* 01190 80801D20 24C63570 */ addiu $a2, $a2, %lo(D_80803570) ## $a2 = 80803570 /* 01194 80801D24 27A40038 */ addiu $a0, $sp, 0x0038 ## $a0 = FFFFFFE8 /* 01198 80801D28 240703F5 */ addiu $a3, $zero, 0x03F5 ## $a3 = 000003F5 -/* 0119C 80801D2C 0C031AB1 */ jal func_800C6AC4 +/* 0119C 80801D2C 0C031AB1 */ jal Graph_OpenDisps /* 011A0 80801D30 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 /* 011A4 80801D34 8E2302C0 */ lw $v1, 0x02C0($s1) ## 000002C0 /* 011A8 80801D38 3C0FDB06 */ lui $t7, 0xDB06 ## $t7 = DB060000 @@ -50,7 +50,7 @@ glabel func_80801D04 /* 0122C 80801DBC 24C63580 */ addiu $a2, $a2, %lo(D_80803580) ## $a2 = 80803580 /* 01230 80801DC0 27A40038 */ addiu $a0, $sp, 0x0038 ## $a0 = FFFFFFE8 /* 01234 80801DC4 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 01238 80801DC8 0C031AD5 */ jal func_800C6B54 +/* 01238 80801DC8 0C031AD5 */ jal Graph_CloseDisps /* 0123C 80801DCC 2407040D */ addiu $a3, $zero, 0x040D ## $a3 = 0000040D /* 01240 80801DD0 8FBF001C */ lw $ra, 0x001C($sp) /* 01244 80801DD4 8FB00014 */ lw $s0, 0x0014($sp) diff --git a/asm/non_matchings/overlays/gamestates/ovl_title/func_80800000.s b/asm/non_matchings/overlays/gamestates/ovl_title/func_80800000.s deleted file mode 100644 index 73ff91e289..0000000000 --- a/asm/non_matchings/overlays/gamestates/ovl_title/func_80800000.s +++ /dev/null @@ -1,91 +0,0 @@ -.rdata - -glabel D_808009C0 - .asciz "NOT MARIO CLUB VERSION" - .balign 4 - -glabel D_808009D8 - .asciz "[Creator:%s]" - .balign 4 - -glabel D_808009E8 - .asciz "[Date:%s]" - .balign 4 - - .text - -glabel func_80800000 -/* 00000 80800000 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0 -/* 00004 80800004 AFBF003C */ sw $ra, 0x003C($sp) -/* 00008 80800008 AFBE0038 */ sw $s8, 0x0038($sp) -/* 0000C 8080000C AFB10034 */ sw $s1, 0x0034($sp) -/* 00010 80800010 AFB00030 */ sw $s0, 0x0030($sp) -/* 00014 80800014 AFA40040 */ sw $a0, 0x0040($sp) -/* 00018 80800018 8C910000 */ lw $s1, 0x0000($a0) ## 00000000 -/* 0001C 8080001C 03A0F025 */ or $s8, $sp, $zero ## $s8 = FFFFFFC0 -/* 00020 80800020 0C025047 */ jal func_8009411C -/* 00024 80800024 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000 -/* 00028 80800028 27BDFFD0 */ addiu $sp, $sp, 0xFFD0 ## $sp = FFFFFF90 -/* 0002C 8080002C 27B00018 */ addiu $s0, $sp, 0x0018 ## $s0 = FFFFFFA8 -/* 00030 80800030 00408825 */ or $s1, $v0, $zero ## $s1 = 00000000 -/* 00034 80800034 0C03EEE3 */ jal GfxPrint_Ctor -/* 00038 80800038 02002025 */ or $a0, $s0, $zero ## $a0 = FFFFFFA8 -/* 0003C 8080003C 02002025 */ or $a0, $s0, $zero ## $a0 = FFFFFFA8 -/* 00040 80800040 0C03EF07 */ jal GfxPrint_Open -/* 00044 80800044 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000 -/* 00048 80800048 240F00FF */ addiu $t7, $zero, 0x00FF ## $t7 = 000000FF -/* 0004C 8080004C AFAF0010 */ sw $t7, 0x0010($sp) -/* 00050 80800050 02002025 */ or $a0, $s0, $zero ## $a0 = FFFFFFA8 -/* 00054 80800054 240500FF */ addiu $a1, $zero, 0x00FF ## $a1 = 000000FF -/* 00058 80800058 2406009B */ addiu $a2, $zero, 0x009B ## $a2 = 0000009B -/* 0005C 8080005C 0C03ECEB */ jal GfxPrint_SetColor -/* 00060 80800060 240700FF */ addiu $a3, $zero, 0x00FF ## $a3 = 000000FF -/* 00064 80800064 02002025 */ or $a0, $s0, $zero ## $a0 = FFFFFFA8 -/* 00068 80800068 24050009 */ addiu $a1, $zero, 0x0009 ## $a1 = 00000009 -/* 0006C 8080006C 0C03ED07 */ jal GfxPrint_SetPos -/* 00070 80800070 24060015 */ addiu $a2, $zero, 0x0015 ## $a2 = 00000015 -/* 00074 80800074 3C058080 */ lui $a1, %hi(D_808009C0) ## $a1 = 80800000 -/* 00078 80800078 24A509C0 */ addiu $a1, $a1, %lo(D_808009C0) ## $a1 = 808009C0 -/* 0007C 8080007C 0C03EF2D */ jal GfxPrint_Printf -/* 00080 80800080 02002025 */ or $a0, $s0, $zero ## $a0 = FFFFFFA8 -/* 00084 80800084 241800FF */ addiu $t8, $zero, 0x00FF ## $t8 = 000000FF -/* 00088 80800088 AFB80010 */ sw $t8, 0x0010($sp) -/* 0008C 8080008C 02002025 */ or $a0, $s0, $zero ## $a0 = FFFFFFA8 -/* 00090 80800090 240500FF */ addiu $a1, $zero, 0x00FF ## $a1 = 000000FF -/* 00094 80800094 240600FF */ addiu $a2, $zero, 0x00FF ## $a2 = 000000FF -/* 00098 80800098 0C03ECEB */ jal GfxPrint_SetColor -/* 0009C 8080009C 240700FF */ addiu $a3, $zero, 0x00FF ## $a3 = 000000FF -/* 000A0 808000A0 02002025 */ or $a0, $s0, $zero ## $a0 = FFFFFFA8 -/* 000A4 808000A4 24050007 */ addiu $a1, $zero, 0x0007 ## $a1 = 00000007 -/* 000A8 808000A8 0C03ED07 */ jal GfxPrint_SetPos -/* 000AC 808000AC 24060017 */ addiu $a2, $zero, 0x0017 ## $a2 = 00000017 -/* 000B0 808000B0 3C058080 */ lui $a1, %hi(D_808009D8) ## $a1 = 80800000 -/* 000B4 808000B4 3C068001 */ lui $a2, 0x8001 ## $a2 = 80010000 -/* 000B8 808000B8 24C62340 */ addiu $a2, $a2, 0x2340 ## $a2 = 80012340 -/* 000BC 808000BC 24A509D8 */ addiu $a1, $a1, %lo(D_808009D8) ## $a1 = 808009D8 -/* 000C0 808000C0 0C03EF2D */ jal GfxPrint_Printf -/* 000C4 808000C4 02002025 */ or $a0, $s0, $zero ## $a0 = FFFFFFA8 -/* 000C8 808000C8 02002025 */ or $a0, $s0, $zero ## $a0 = FFFFFFA8 -/* 000CC 808000CC 24050007 */ addiu $a1, $zero, 0x0007 ## $a1 = 00000007 -/* 000D0 808000D0 0C03ED07 */ jal GfxPrint_SetPos -/* 000D4 808000D4 24060018 */ addiu $a2, $zero, 0x0018 ## $a2 = 00000018 -/* 000D8 808000D8 3C058080 */ lui $a1, %hi(D_808009E8) ## $a1 = 80800000 -/* 000DC 808000DC 3C068001 */ lui $a2, 0x8001 ## $a2 = 80010000 -/* 000E0 808000E0 24C62350 */ addiu $a2, $a2, 0x2350 ## $a2 = 80012350 -/* 000E4 808000E4 24A509E8 */ addiu $a1, $a1, %lo(D_808009E8) ## $a1 = 808009E8 -/* 000E8 808000E8 0C03EF2D */ jal GfxPrint_Printf -/* 000EC 808000EC 02002025 */ or $a0, $s0, $zero ## $a0 = FFFFFFA8 -/* 000F0 808000F0 0C03EF19 */ jal GfxPrint_Close -/* 000F4 808000F4 02002025 */ or $a0, $s0, $zero ## $a0 = FFFFFFA8 -/* 000F8 808000F8 00408825 */ or $s1, $v0, $zero ## $s1 = 00000000 -/* 000FC 808000FC 0C03EF05 */ jal GfxPrint_Dtor -/* 00100 80800100 02002025 */ or $a0, $s0, $zero ## $a0 = FFFFFFA8 -/* 00104 80800104 8FD90040 */ lw $t9, 0x0040($s8) ## 00000000 -/* 00108 80800108 03C0E825 */ or $sp, $s8, $zero ## $sp = FFFFFFC0 -/* 0010C 8080010C AF310000 */ sw $s1, 0x0000($t9) ## 00000000 -/* 00110 80800110 8FDF003C */ lw $ra, 0x003C($s8) ## FFFFFFFC -/* 00114 80800114 8FD10034 */ lw $s1, 0x0034($s8) ## FFFFFFF4 -/* 00118 80800118 8FD00030 */ lw $s0, 0x0030($s8) ## FFFFFFF0 -/* 0011C 8080011C 8FDE0038 */ lw $s8, 0x0038($s8) ## FFFFFFF8 -/* 00120 80800120 03E00008 */ jr $ra -/* 00124 80800124 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000 \ No newline at end of file diff --git a/asm/non_matchings/overlays/gamestates/ovl_title/func_80800134.s b/asm/non_matchings/overlays/gamestates/ovl_title/func_80800134.s deleted file mode 100644 index c6b57724c0..0000000000 --- a/asm/non_matchings/overlays/gamestates/ovl_title/func_80800134.s +++ /dev/null @@ -1,38 +0,0 @@ -glabel func_80800134 -/* 00134 80800134 27BDFFB8 */ addiu $sp, $sp, 0xFFB8 ## $sp = FFFFFFB8 -/* 00138 80800138 44800000 */ mtc1 $zero, $f0 ## $f0 = 0.00 -/* 0013C 8080013C AFA70054 */ sw $a3, 0x0054($sp) -/* 00140 80800140 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 00144 80800144 44856000 */ mtc1 $a1, $f12 ## $f12 = 0.00 -/* 00148 80800148 44867000 */ mtc1 $a2, $f14 ## $f14 = 0.00 -/* 0014C 8080014C C7A40054 */ lwc1 $f4, 0x0054($sp) -/* 00150 80800150 44813000 */ mtc1 $at, $f6 ## $f6 = 1.00 -/* 00154 80800154 AFA40048 */ sw $a0, 0x0048($sp) -/* 00158 80800158 AFBF0014 */ sw $ra, 0x0014($sp) -/* 0015C 8080015C 248400A8 */ addiu $a0, $a0, 0x00A8 ## $a0 = 000000A8 -/* 00160 80800160 AFA4001C */ sw $a0, 0x001C($sp) -/* 00164 80800164 3C064120 */ lui $a2, 0x4120 ## $a2 = 41200000 -/* 00168 80800168 3C0541F0 */ lui $a1, 0x41F0 ## $a1 = 41F00000 -/* 0016C 8080016C 3C074648 */ lui $a3, 0x4648 ## $a3 = 46480000 -/* 00170 80800170 E7A00028 */ swc1 $f0, 0x0028($sp) -/* 00174 80800174 E7A00020 */ swc1 $f0, 0x0020($sp) -/* 00178 80800178 E7A00034 */ swc1 $f0, 0x0034($sp) -/* 0017C 8080017C E7A00030 */ swc1 $f0, 0x0030($sp) -/* 00180 80800180 E7A0002C */ swc1 $f0, 0x002C($sp) -/* 00184 80800184 E7AC0038 */ swc1 $f12, 0x0038($sp) -/* 00188 80800188 E7AE003C */ swc1 $f14, 0x003C($sp) -/* 0018C 8080018C E7A40040 */ swc1 $f4, 0x0040($sp) -/* 00190 80800190 0C02A918 */ jal func_800AA460 -/* 00194 80800194 E7A60024 */ swc1 $f6, 0x0024($sp) -/* 00198 80800198 8FA4001C */ lw $a0, 0x001C($sp) -/* 0019C 8080019C 27A50038 */ addiu $a1, $sp, 0x0038 ## $a1 = FFFFFFF0 -/* 001A0 808001A0 27A6002C */ addiu $a2, $sp, 0x002C ## $a2 = FFFFFFE4 -/* 001A4 808001A4 0C02A8D6 */ jal func_800AA358 -/* 001A8 808001A8 27A70020 */ addiu $a3, $sp, 0x0020 ## $a3 = FFFFFFD8 -/* 001AC 808001AC 8FA4001C */ lw $a0, 0x001C($sp) -/* 001B0 808001B0 0C02AA94 */ jal func_800AAA50 -/* 001B4 808001B4 2405000F */ addiu $a1, $zero, 0x000F ## $a1 = 0000000F -/* 001B8 808001B8 8FBF0014 */ lw $ra, 0x0014($sp) -/* 001BC 808001BC 27BD0048 */ addiu $sp, $sp, 0x0048 ## $sp = 00000000 -/* 001C0 808001C0 03E00008 */ jr $ra -/* 001C4 808001C4 00000000 */ nop diff --git a/asm/non_matchings/overlays/gamestates/ovl_title/func_808001C8.s b/asm/non_matchings/overlays/gamestates/ovl_title/func_808001C8.s deleted file mode 100644 index 46e2b766f0..0000000000 --- a/asm/non_matchings/overlays/gamestates/ovl_title/func_808001C8.s +++ /dev/null @@ -1,376 +0,0 @@ -.rdata - -glabel D_808009F4 - .asciz "../z_title.c" - .balign 4 - -glabel D_80800A04 - .asciz "../z_title.c" - .balign 4 - -glabel D_80800A14 - .asciz "../z_title.c" - .balign 4 - -.late_rodata - -glabel D_80800A9C - .word 0xC59AA92F -glabel D_80800AA0 - .word 0x457A28AB -glabel D_80800AA4 - .word 0x448BE2AE, 0x00000000, 0x00000000 - - .text - -glabel func_808001C8 -/* 001C8 808001C8 27BDFF10 */ addiu $sp, $sp, 0xFF10 ## $sp = FFFFFF10 -/* 001CC 808001CC AFBF0024 */ sw $ra, 0x0024($sp) -/* 001D0 808001D0 AFB00020 */ sw $s0, 0x0020($sp) -/* 001D4 808001D4 8C850000 */ lw $a1, 0x0000($a0) ## 00000000 -/* 001D8 808001D8 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 001DC 808001DC 3C068080 */ lui $a2, %hi(D_808009F4) ## $a2 = 80800000 -/* 001E0 808001E0 24C609F4 */ addiu $a2, $a2, %lo(D_808009F4) ## $a2 = 808009F4 -/* 001E4 808001E4 27A400A8 */ addiu $a0, $sp, 0x00A8 ## $a0 = FFFFFFB8 -/* 001E8 808001E8 2407018B */ addiu $a3, $zero, 0x018B ## $a3 = 0000018B -/* 001EC 808001EC 0C031AB1 */ jal func_800C6AC4 -/* 001F0 808001F0 AFA500B8 */ sw $a1, 0x00B8($sp) -/* 001F4 808001F4 3C01428A */ lui $at, 0x428A ## $at = 428A0000 -/* 001F8 808001F8 44810000 */ mtc1 $at, $f0 ## $f0 = 69.00 -/* 001FC 808001FC 3C018080 */ lui $at, %hi(D_80800A9C) ## $at = 80800000 -/* 00200 80800200 C4240A9C */ lwc1 $f4, %lo(D_80800A9C)($at) -/* 00204 80800204 3C018080 */ lui $at, %hi(D_80800AA0) ## $at = 80800000 -/* 00208 80800208 44801000 */ mtc1 $zero, $f2 ## $f2 = 0.00 -/* 0020C 8080020C C4260AA0 */ lwc1 $f6, %lo(D_80800AA0)($at) -/* 00210 80800210 3C018080 */ lui $at, %hi(D_80800AA4) ## $at = 80800000 -/* 00214 80800214 C4280AA4 */ lwc1 $f8, %lo(D_80800AA4)($at) -/* 00218 80800218 E7A000DC */ swc1 $f0, 0x00DC($sp) -/* 0021C 8080021C E7A000E0 */ swc1 $f0, 0x00E0($sp) -/* 00220 80800220 E7A000E4 */ swc1 $f0, 0x00E4($sp) -/* 00224 80800224 E7A400C4 */ swc1 $f4, 0x00C4($sp) -/* 00228 80800228 E7A600C8 */ swc1 $f6, 0x00C8($sp) -/* 0022C 8080022C E7A200D0 */ swc1 $f2, 0x00D0($sp) -/* 00230 80800230 E7A200D4 */ swc1 $f2, 0x00D4($sp) -/* 00234 80800234 E7A200D8 */ swc1 $f2, 0x00D8($sp) -/* 00238 80800238 E7A800CC */ swc1 $f8, 0x00CC($sp) -/* 0023C 8080023C 8E070000 */ lw $a3, 0x0000($s0) ## 00000000 -/* 00240 80800240 27A400D0 */ addiu $a0, $sp, 0x00D0 ## $a0 = FFFFFFE0 -/* 00244 80800244 27A500C4 */ addiu $a1, $sp, 0x00C4 ## $a1 = FFFFFFD4 -/* 00248 80800248 0C00BAAF */ jal func_8002EABC -/* 0024C 8080024C 27A600DC */ addiu $a2, $sp, 0x00DC ## $a2 = FFFFFFEC -/* 00250 80800250 8FA800B8 */ lw $t0, 0x00B8($sp) -/* 00254 80800254 3C0FDB02 */ lui $t7, 0xDB02 ## $t7 = DB020000 -/* 00258 80800258 24180018 */ addiu $t8, $zero, 0x0018 ## $t8 = 00000018 -/* 0025C 8080025C 8D0202C0 */ lw $v0, 0x02C0($t0) ## 000002C0 -/* 00260 80800260 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00264 80800264 24050000 */ addiu $a1, $zero, 0x0000 ## $a1 = 00000000 -/* 00268 80800268 244E0008 */ addiu $t6, $v0, 0x0008 ## $t6 = 00000008 -/* 0026C 8080026C AD0E02C0 */ sw $t6, 0x02C0($t0) ## 000002C0 -/* 00270 80800270 AC580004 */ sw $t8, 0x0004($v0) ## 00000004 -/* 00274 80800274 AC4F0000 */ sw $t7, 0x0000($v0) ## 00000000 -/* 00278 80800278 8D0202C0 */ lw $v0, 0x02C0($t0) ## 000002C0 -/* 0027C 8080027C 3C0F8080 */ lui $t7, %hi(D_808009B0) ## $t7 = 80800000 -/* 00280 80800280 3C0EDC08 */ lui $t6, 0xDC08 ## $t6 = DC080000 -/* 00284 80800284 24590008 */ addiu $t9, $v0, 0x0008 ## $t9 = 00000008 -/* 00288 80800288 AD1902C0 */ sw $t9, 0x02C0($t0) ## 000002C0 -/* 0028C 8080028C 35CE060A */ ori $t6, $t6, 0x060A ## $t6 = DC08060A -/* 00290 80800290 25EF09B0 */ addiu $t7, $t7, %lo(D_808009B0) ## $t7 = 808009B0 -/* 00294 80800294 AC4F0004 */ sw $t7, 0x0004($v0) ## 00000004 -/* 00298 80800298 AC4E0000 */ sw $t6, 0x0000($v0) ## 00000000 -/* 0029C 8080029C 8D0202C0 */ lw $v0, 0x02C0($t0) ## 000002C0 -/* 002A0 808002A0 3C0E8080 */ lui $t6, %hi(D_808009A8) ## $t6 = 80800000 -/* 002A4 808002A4 3C19DC08 */ lui $t9, 0xDC08 ## $t9 = DC080000 -/* 002A8 808002A8 24580008 */ addiu $t8, $v0, 0x0008 ## $t8 = 00000008 -/* 002AC 808002AC AD1802C0 */ sw $t8, 0x02C0($t0) ## 000002C0 -/* 002B0 808002B0 3739090A */ ori $t9, $t9, 0x090A ## $t9 = DC08090A -/* 002B4 808002B4 25CE09A8 */ addiu $t6, $t6, %lo(D_808009A8) ## $t6 = 808009A8 -/* 002B8 808002B8 AC4E0004 */ sw $t6, 0x0004($v0) ## 00000004 -/* 002BC 808002BC AC590000 */ sw $t9, 0x0000($v0) ## 00000000 -/* 002C0 808002C0 3C064316 */ lui $a2, 0x4316 ## $a2 = 43160000 -/* 002C4 808002C4 3C074396 */ lui $a3, 0x4396 ## $a3 = 43960000 -/* 002C8 808002C8 0C20004D */ jal func_80800134 -/* 002CC 808002CC AFA800B8 */ sw $t0, 0x00B8($sp) -/* 002D0 808002D0 0C024F46 */ jal func_80093D18 -/* 002D4 808002D4 8E040000 */ lw $a0, 0x0000($s0) ## 00000000 -/* 002D8 808002D8 3C01C254 */ lui $at, 0xC254 ## $at = C2540000 -/* 002DC 808002DC 44816000 */ mtc1 $at, $f12 ## $f12 = -53.00 -/* 002E0 808002E0 3C01C0A0 */ lui $at, 0xC0A0 ## $at = C0A00000 -/* 002E4 808002E4 44817000 */ mtc1 $at, $f14 ## $f14 = -5.00 -/* 002E8 808002E8 24060000 */ addiu $a2, $zero, 0x0000 ## $a2 = 00000000 -/* 002EC 808002EC 0C034261 */ jal Matrix_Translate -/* 002F0 808002F0 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 002F4 808002F4 3C013F80 */ lui $at, 0x3F80 ## $at = 3F800000 -/* 002F8 808002F8 44816000 */ mtc1 $at, $f12 ## $f12 = 1.00 -/* 002FC 808002FC 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 00300 80800300 44066000 */ mfc1 $a2, $f12 -/* 00304 80800304 0C0342A3 */ jal Matrix_Scale -/* 00308 80800308 46006386 */ mov.s $f14, $f12 -/* 0030C 8080030C 3C058080 */ lui $a1, %hi(D_808009A0) ## $a1 = 80800000 -/* 00310 80800310 84A509A0 */ lh $a1, %lo(D_808009A0)($a1) -/* 00314 80800314 00002025 */ or $a0, $zero, $zero ## $a0 = 00000000 -/* 00318 80800318 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 0031C 8080031C 0C034421 */ jal Matrix_RotateXYZ -/* 00320 80800320 24070001 */ addiu $a3, $zero, 0x0001 ## $a3 = 00000001 -/* 00324 80800324 8FA800B8 */ lw $t0, 0x00B8($sp) -/* 00328 80800328 3C18DA38 */ lui $t8, 0xDA38 ## $t8 = DA380000 -/* 0032C 8080032C 37180003 */ ori $t8, $t8, 0x0003 ## $t8 = DA380003 -/* 00330 80800330 8D0202C0 */ lw $v0, 0x02C0($t0) ## 000002C0 -/* 00334 80800334 3C058080 */ lui $a1, %hi(D_80800A04) ## $a1 = 80800000 -/* 00338 80800338 24A50A04 */ addiu $a1, $a1, %lo(D_80800A04) ## $a1 = 80800A04 -/* 0033C 8080033C 244F0008 */ addiu $t7, $v0, 0x0008 ## $t7 = 00000008 -/* 00340 80800340 AD0F02C0 */ sw $t7, 0x02C0($t0) ## 000002C0 -/* 00344 80800344 AC580000 */ sw $t8, 0x0000($v0) ## 00000000 -/* 00348 80800348 8E040000 */ lw $a0, 0x0000($s0) ## 00000000 -/* 0034C 8080034C 240601A8 */ addiu $a2, $zero, 0x01A8 ## $a2 = 000001A8 -/* 00350 80800350 AFA800B8 */ sw $t0, 0x00B8($sp) -/* 00354 80800354 0C0346A2 */ jal Matrix_NewMtx -/* 00358 80800358 AFA20098 */ sw $v0, 0x0098($sp) -/* 0035C 8080035C 8FA30098 */ lw $v1, 0x0098($sp) -/* 00360 80800360 8FA800B8 */ lw $t0, 0x00B8($sp) -/* 00364 80800364 3C0F0100 */ lui $t7, 0x0100 ## $t7 = 01000000 -/* 00368 80800368 AC620004 */ sw $v0, 0x0004($v1) ## 00000004 -/* 0036C 8080036C 8D0202C0 */ lw $v0, 0x02C0($t0) ## 000002C0 -/* 00370 80800370 25EF2720 */ addiu $t7, $t7, 0x2720 ## $t7 = 01002720 -/* 00374 80800374 3C0EDE00 */ lui $t6, 0xDE00 ## $t6 = DE000000 -/* 00378 80800378 24590008 */ addiu $t9, $v0, 0x0008 ## $t9 = 00000008 -/* 0037C 8080037C AD1902C0 */ sw $t9, 0x02C0($t0) ## 000002C0 -/* 00380 80800380 AC4F0004 */ sw $t7, 0x0004($v0) ## 00000004 -/* 00384 80800384 AC4E0000 */ sw $t6, 0x0000($v0) ## 00000000 -/* 00388 80800388 8E040000 */ lw $a0, 0x0000($s0) ## 00000000 -/* 0038C 8080038C 0C025131 */ jal func_800944C4 -/* 00390 80800390 AFA800B8 */ sw $t0, 0x00B8($sp) -/* 00394 80800394 8FA800B8 */ lw $t0, 0x00B8($sp) -/* 00398 80800398 3C05E700 */ lui $a1, 0xE700 ## $a1 = E7000000 -/* 0039C 8080039C 3C0EE300 */ lui $t6, 0xE300 ## $t6 = E3000000 -/* 003A0 808003A0 8D0202C0 */ lw $v0, 0x02C0($t0) ## 000002C0 -/* 003A4 808003A4 35CE0A01 */ ori $t6, $t6, 0x0A01 ## $t6 = E3000A01 -/* 003A8 808003A8 3C0F0010 */ lui $t7, 0x0010 ## $t7 = 00100000 -/* 003AC 808003AC 24580008 */ addiu $t8, $v0, 0x0008 ## $t8 = 00000008 -/* 003B0 808003B0 AD1802C0 */ sw $t8, 0x02C0($t0) ## 000002C0 -/* 003B4 808003B4 AC400004 */ sw $zero, 0x0004($v0) ## 00000004 -/* 003B8 808003B8 AC450000 */ sw $a1, 0x0000($v0) ## 00000000 -/* 003BC 808003BC 8D0202C0 */ lw $v0, 0x02C0($t0) ## 000002C0 -/* 003C0 808003C0 3C09F200 */ lui $t1, 0xF200 ## $t1 = F2000000 -/* 003C4 808003C4 3C1F070B */ lui $ra, 0x070B ## $ra = 070B0000 -/* 003C8 808003C8 24590008 */ addiu $t9, $v0, 0x0008 ## $t9 = 00000008 -/* 003CC 808003CC AD1902C0 */ sw $t9, 0x02C0($t0) ## 000002C0 -/* 003D0 808003D0 AC4F0004 */ sw $t7, 0x0004($v0) ## 00000004 -/* 003D4 808003D4 AC4E0000 */ sw $t6, 0x0000($v0) ## 00000000 -/* 003D8 808003D8 8D0202C0 */ lw $v0, 0x02C0($t0) ## 000002C0 -/* 003DC 808003DC 3C0E0C18 */ lui $t6, 0x0C18 ## $t6 = 0C180000 -/* 003E0 808003E0 3C19E200 */ lui $t9, 0xE200 ## $t9 = E2000000 -/* 003E4 808003E4 24580008 */ addiu $t8, $v0, 0x0008 ## $t8 = 00000008 -/* 003E8 808003E8 AD1802C0 */ sw $t8, 0x02C0($t0) ## 000002C0 -/* 003EC 808003EC 3739001C */ ori $t9, $t9, 0x001C ## $t9 = E200001C -/* 003F0 808003F0 35CE4340 */ ori $t6, $t6, 0x4340 ## $t6 = 0C184340 -/* 003F4 808003F4 AC4E0004 */ sw $t6, 0x0004($v0) ## 00000004 -/* 003F8 808003F8 AC590000 */ sw $t9, 0x0000($v0) ## 00000000 -/* 003FC 808003FC 8D0202C0 */ lw $v0, 0x02C0($t0) ## 000002C0 -/* 00400 80800400 3C19350C */ lui $t9, 0x350C ## $t9 = 350C0000 -/* 00404 80800404 3C18FC26 */ lui $t8, 0xFC26 ## $t8 = FC260000 -/* 00408 80800408 244F0008 */ addiu $t7, $v0, 0x0008 ## $t7 = 00000008 -/* 0040C 8080040C AD0F02C0 */ sw $t7, 0x02C0($t0) ## 000002C0 -/* 00410 80800410 37187E60 */ ori $t8, $t8, 0x7E60 ## $t8 = FC267E60 -/* 00414 80800414 3739F37F */ ori $t9, $t9, 0xF37F ## $t9 = 350CF37F -/* 00418 80800418 AC590004 */ sw $t9, 0x0004($v0) ## 00000004 -/* 0041C 8080041C AC580000 */ sw $t8, 0x0000($v0) ## 00000000 -/* 00420 80800420 8D0202C0 */ lw $v0, 0x02C0($t0) ## 000002C0 -/* 00424 80800424 3C18AAFF */ lui $t8, 0xAAFF ## $t8 = AAFF0000 -/* 00428 80800428 3718FFFF */ ori $t8, $t8, 0xFFFF ## $t8 = AAFFFFFF -/* 0042C 8080042C 244E0008 */ addiu $t6, $v0, 0x0008 ## $t6 = 00000008 -/* 00430 80800430 AD0E02C0 */ sw $t6, 0x02C0($t0) ## 000002C0 -/* 00434 80800434 3C0FFA00 */ lui $t7, 0xFA00 ## $t7 = FA000000 -/* 00438 80800438 AC4F0000 */ sw $t7, 0x0000($v0) ## 00000000 -/* 0043C 8080043C AC580004 */ sw $t8, 0x0004($v0) ## 00000004 -/* 00440 80800440 8D0202C0 */ lw $v0, 0x02C0($t0) ## 000002C0 -/* 00444 80800444 340FFF80 */ ori $t7, $zero, 0xFF80 ## $t7 = 0000FF80 -/* 00448 80800448 3C0EFB00 */ lui $t6, 0xFB00 ## $t6 = FB000000 -/* 0044C 8080044C 24590008 */ addiu $t9, $v0, 0x0008 ## $t9 = 00000008 -/* 00450 80800450 AD1902C0 */ sw $t9, 0x02C0($t0) ## 000002C0 -/* 00454 80800454 AC4F0004 */ sw $t7, 0x0004($v0) ## 00000004 -/* 00458 80800458 AC4E0000 */ sw $t6, 0x0000($v0) ## 00000000 -/* 0045C 8080045C 8D0202C0 */ lw $v0, 0x02C0($t0) ## 000002C0 -/* 00460 80800460 3C0E0100 */ lui $t6, 0x0100 ## $t6 = 01000000 -/* 00464 80800464 25CE1800 */ addiu $t6, $t6, 0x1800 ## $t6 = 01001800 -/* 00468 80800468 24580008 */ addiu $t8, $v0, 0x0008 ## $t8 = 00000008 -/* 0046C 8080046C AD1802C0 */ sw $t8, 0x02C0($t0) ## 000002C0 -/* 00470 80800470 3C19FD90 */ lui $t9, 0xFD90 ## $t9 = FD900000 -/* 00474 80800474 AC590000 */ sw $t9, 0x0000($v0) ## 00000000 -/* 00478 80800478 AC4E0004 */ sw $t6, 0x0004($v0) ## 00000004 -/* 0047C 8080047C 8D0202C0 */ lw $v0, 0x02C0($t0) ## 000002C0 -/* 00480 80800480 3C190701 */ lui $t9, 0x0701 ## $t9 = 07010000 -/* 00484 80800484 3C18F590 */ lui $t8, 0xF590 ## $t8 = F5900000 -/* 00488 80800488 244F0008 */ addiu $t7, $v0, 0x0008 ## $t7 = 00000008 -/* 0048C 8080048C AD0F02C0 */ sw $t7, 0x02C0($t0) ## 000002C0 -/* 00490 80800490 37180100 */ ori $t8, $t8, 0x0100 ## $t8 = F5900100 -/* 00494 80800494 37396C52 */ ori $t9, $t9, 0x6C52 ## $t9 = 07016C52 -/* 00498 80800498 AC590004 */ sw $t9, 0x0004($v0) ## 00000004 -/* 0049C 8080049C AC580000 */ sw $t8, 0x0000($v0) ## 00000000 -/* 004A0 808004A0 8D0202C0 */ lw $v0, 0x02C0($t0) ## 000002C0 -/* 004A4 808004A4 3C0FE600 */ lui $t7, 0xE600 ## $t7 = E6000000 -/* 004A8 808004A8 3C19F300 */ lui $t9, 0xF300 ## $t9 = F3000000 -/* 004AC 808004AC 244E0008 */ addiu $t6, $v0, 0x0008 ## $t6 = 00000008 -/* 004B0 808004B0 AD0E02C0 */ sw $t6, 0x02C0($t0) ## 000002C0 -/* 004B4 808004B4 AC400004 */ sw $zero, 0x0004($v0) ## 00000004 -/* 004B8 808004B8 AC4F0000 */ sw $t7, 0x0000($v0) ## 00000000 -/* 004BC 808004BC 8D0202C0 */ lw $v0, 0x02C0($t0) ## 000002C0 -/* 004C0 808004C0 3C0E071F */ lui $t6, 0x071F ## $t6 = 071F0000 -/* 004C4 808004C4 35CEF200 */ ori $t6, $t6, 0xF200 ## $t6 = 071FF200 -/* 004C8 808004C8 24580008 */ addiu $t8, $v0, 0x0008 ## $t8 = 00000008 -/* 004CC 808004CC AD1802C0 */ sw $t8, 0x02C0($t0) ## 000002C0 -/* 004D0 808004D0 AC4E0004 */ sw $t6, 0x0004($v0) ## 00000004 -/* 004D4 808004D4 AC590000 */ sw $t9, 0x0000($v0) ## 00000000 -/* 004D8 808004D8 8D0202C0 */ lw $v0, 0x02C0($t0) ## 000002C0 -/* 004DC 808004DC 3C19F588 */ lui $t9, 0xF588 ## $t9 = F5880000 -/* 004E0 808004E0 3C0E0101 */ lui $t6, 0x0101 ## $t6 = 01010000 -/* 004E4 808004E4 244F0008 */ addiu $t7, $v0, 0x0008 ## $t7 = 00000008 -/* 004E8 808004E8 AD0F02C0 */ sw $t7, 0x02C0($t0) ## 000002C0 -/* 004EC 808004EC AC400004 */ sw $zero, 0x0004($v0) ## 00000004 -/* 004F0 808004F0 AC450000 */ sw $a1, 0x0000($v0) ## 00000000 -/* 004F4 808004F4 8D0202C0 */ lw $v0, 0x02C0($t0) ## 000002C0 -/* 004F8 808004F8 35CE6C52 */ ori $t6, $t6, 0x6C52 ## $t6 = 01016C52 -/* 004FC 808004FC 37390900 */ ori $t9, $t9, 0x0900 ## $t9 = F5880900 -/* 00500 80800500 24580008 */ addiu $t8, $v0, 0x0008 ## $t8 = 00000008 -/* 00504 80800504 AD1802C0 */ sw $t8, 0x02C0($t0) ## 000002C0 -/* 00508 80800508 AC4E0004 */ sw $t6, 0x0004($v0) ## 00000004 -/* 0050C 8080050C AC590000 */ sw $t9, 0x0000($v0) ## 00000000 -/* 00510 80800510 8D0202C0 */ lw $v0, 0x02C0($t0) ## 000002C0 -/* 00514 80800514 3C180107 */ lui $t8, 0x0107 ## $t8 = 01070000 -/* 00518 80800518 3718C07C */ ori $t8, $t8, 0xC07C ## $t8 = 0107C07C -/* 0051C 8080051C 244F0008 */ addiu $t7, $v0, 0x0008 ## $t7 = 00000008 -/* 00520 80800520 AD0F02C0 */ sw $t7, 0x02C0($t0) ## 000002C0 -/* 00524 80800524 3C0A0100 */ lui $t2, 0x0100 ## $t2 = 01000000 -/* 00528 80800528 254A0000 */ addiu $t2, $t2, 0x0000 ## $t2 = 01000000 -/* 0052C 8080052C 37FFF056 */ ori $ra, $ra, 0xF056 ## $ra = 070BF056 -/* 00530 80800530 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 00534 80800534 2407005E */ addiu $a3, $zero, 0x005E ## $a3 = 0000005E -/* 00538 80800538 00002025 */ or $a0, $zero, $zero ## $a0 = 00000000 -/* 0053C 8080053C 3C0D0700 */ lui $t5, 0x0700 ## $t5 = 07000000 -/* 00540 80800540 3C0CF590 */ lui $t4, 0xF590 ## $t4 = F5900000 -/* 00544 80800544 240B0180 */ addiu $t3, $zero, 0x0180 ## $t3 = 00000180 -/* 00548 80800548 AC580004 */ sw $t8, 0x0004($v0) ## 00000004 -/* 0054C 8080054C AC490000 */ sw $t1, 0x0000($v0) ## 00000000 -.L80800550: -/* 00550 80800550 008B0019 */ multu $a0, $t3 -/* 00554 80800554 8D0202C0 */ lw $v0, 0x02C0($t0) ## 000002C0 -/* 00558 80800558 3C0EFD90 */ lui $t6, 0xFD90 ## $t6 = FD900000 -/* 0055C 8080055C 24E50002 */ addiu $a1, $a3, 0x0002 ## $a1 = 00000060 -/* 00560 80800560 24590008 */ addiu $t9, $v0, 0x0008 ## $t9 = 00000008 -/* 00564 80800564 AD1902C0 */ sw $t9, 0x02C0($t0) ## 000002C0 -/* 00568 80800568 AC4E0000 */ sw $t6, 0x0000($v0) ## 00000000 -/* 0056C 8080056C 3C01E448 */ lui $at, 0xE448 ## $at = E4480000 -/* 00570 80800570 34214000 */ ori $at, $at, 0x4000 ## $at = E4484000 -/* 00574 80800574 24C60001 */ addiu $a2, $a2, 0x0001 ## $a2 = 00000001 -/* 00578 80800578 00007812 */ mflo $t7 -/* 0057C 8080057C 014FC021 */ addu $t8, $t2, $t7 -/* 00580 80800580 AC580004 */ sw $t8, 0x0004($v0) ## 00000004 -/* 00584 80800584 8D0202C0 */ lw $v0, 0x02C0($t0) ## 000002C0 -/* 00588 80800588 3C0FE600 */ lui $t7, 0xE600 ## $t7 = E6000000 -/* 0058C 8080058C 30C6FFFF */ andi $a2, $a2, 0xFFFF ## $a2 = 00000001 -/* 00590 80800590 24590008 */ addiu $t9, $v0, 0x0008 ## $t9 = 00000008 -/* 00594 80800594 AD1902C0 */ sw $t9, 0x02C0($t0) ## 000002C0 -/* 00598 80800598 AC4D0004 */ sw $t5, 0x0004($v0) ## 00000004 -/* 0059C 8080059C AC4C0000 */ sw $t4, 0x0000($v0) ## 00000000 -/* 005A0 808005A0 8D0202C0 */ lw $v0, 0x02C0($t0) ## 000002C0 -/* 005A4 808005A4 3C19F300 */ lui $t9, 0xF300 ## $t9 = F3000000 -/* 005A8 808005A8 244E0008 */ addiu $t6, $v0, 0x0008 ## $t6 = 00000008 -/* 005AC 808005AC AD0E02C0 */ sw $t6, 0x02C0($t0) ## 000002C0 -/* 005B0 808005B0 AC400004 */ sw $zero, 0x0004($v0) ## 00000004 -/* 005B4 808005B4 AC4F0000 */ sw $t7, 0x0000($v0) ## 00000000 -/* 005B8 808005B8 8D0202C0 */ lw $v0, 0x02C0($t0) ## 000002C0 -/* 005BC 808005BC 3C0FE700 */ lui $t7, 0xE700 ## $t7 = E7000000 -/* 005C0 808005C0 24580008 */ addiu $t8, $v0, 0x0008 ## $t8 = 00000008 -/* 005C4 808005C4 AD1802C0 */ sw $t8, 0x02C0($t0) ## 000002C0 -/* 005C8 808005C8 AC5F0004 */ sw $ra, 0x0004($v0) ## 00000004 -/* 005CC 808005CC AC590000 */ sw $t9, 0x0000($v0) ## 00000000 -/* 005D0 808005D0 8D0202C0 */ lw $v0, 0x02C0($t0) ## 000002C0 -/* 005D4 808005D4 3C19F588 */ lui $t9, 0xF588 ## $t9 = F5880000 -/* 005D8 808005D8 37393000 */ ori $t9, $t9, 0x3000 ## $t9 = F5883000 -/* 005DC 808005DC 244E0008 */ addiu $t6, $v0, 0x0008 ## $t6 = 00000008 -/* 005E0 808005E0 AD0E02C0 */ sw $t6, 0x02C0($t0) ## 000002C0 -/* 005E4 808005E4 AC400004 */ sw $zero, 0x0004($v0) ## 00000004 -/* 005E8 808005E8 AC4F0000 */ sw $t7, 0x0000($v0) ## 00000000 -/* 005EC 808005EC 8D0202C0 */ lw $v0, 0x02C0($t0) ## 000002C0 -/* 005F0 808005F0 3C0F002F */ lui $t7, 0x002F ## $t7 = 002F0000 -/* 005F4 808005F4 35EFC004 */ ori $t7, $t7, 0xC004 ## $t7 = 002FC004 -/* 005F8 808005F8 24580008 */ addiu $t8, $v0, 0x0008 ## $t8 = 00000008 -/* 005FC 808005FC AD1802C0 */ sw $t8, 0x02C0($t0) ## 000002C0 -/* 00600 80800600 AC400004 */ sw $zero, 0x0004($v0) ## 00000004 -/* 00604 80800604 AC590000 */ sw $t9, 0x0000($v0) ## 00000000 -/* 00608 80800608 8D0202C0 */ lw $v0, 0x02C0($t0) ## 000002C0 -/* 0060C 8080060C 244E0008 */ addiu $t6, $v0, 0x0008 ## $t6 = 00000008 -/* 00610 80800610 AD0E02C0 */ sw $t6, 0x02C0($t0) ## 000002C0 -/* 00614 80800614 AC4F0004 */ sw $t7, 0x0004($v0) ## 00000004 -/* 00618 80800618 AC490000 */ sw $t1, 0x0000($v0) ## 00000000 -/* 0061C 8080061C 8D0202C0 */ lw $v0, 0x02C0($t0) ## 000002C0 -/* 00620 80800620 00047880 */ sll $t7, $a0, 2 -/* 00624 80800624 00C02025 */ or $a0, $a2, $zero ## $a0 = 00000001 -/* 00628 80800628 24580008 */ addiu $t8, $v0, 0x0008 ## $t8 = 00000008 -/* 0062C 8080062C AD1802C0 */ sw $t8, 0x02C0($t0) ## 000002C0 -/* 00630 80800630 861901DC */ lh $t9, 0x01DC($s0) ## 000001DC -/* 00634 80800634 332E007F */ andi $t6, $t9, 0x007F ## $t6 = 00000000 -/* 00638 80800638 01CFC023 */ subu $t8, $t6, $t7 -/* 0063C 8080063C 860E01DE */ lh $t6, 0x01DE($s0) ## 000001DE -/* 00640 80800640 33190FFF */ andi $t9, $t8, 0x0FFF ## $t9 = 00000008 -/* 00644 80800644 31CF0FFF */ andi $t7, $t6, 0x0FFF ## $t7 = 00000000 -/* 00648 80800648 000FC300 */ sll $t8, $t7, 12 -/* 0064C 8080064C 03097025 */ or $t6, $t8, $t1 ## $t6 = F2000008 -/* 00650 80800650 01D97825 */ or $t7, $t6, $t9 ## $t7 = F2000008 -/* 00654 80800654 3C180100 */ lui $t8, 0x0100 ## $t8 = 01000000 -/* 00658 80800658 AC580004 */ sw $t8, 0x0004($v0) ## 00000004 -/* 0065C 8080065C AC4F0000 */ sw $t7, 0x0000($v0) ## 00000000 -/* 00660 80800660 8D0202C0 */ lw $v0, 0x02C0($t0) ## 000002C0 -/* 00664 80800664 0005C880 */ sll $t9, $a1, 2 -/* 00668 80800668 332F0FFF */ andi $t7, $t9, 0x0FFF ## $t7 = 00000008 -/* 0066C 8080066C 244E0008 */ addiu $t6, $v0, 0x0008 ## $t6 = 00000008 -/* 00670 80800670 AD0E02C0 */ sw $t6, 0x02C0($t0) ## 000002C0 -/* 00674 80800674 01E1C025 */ or $t8, $t7, $at ## $t8 = E4484008 -/* 00678 80800678 3C010018 */ lui $at, 0x0018 ## $at = 00180000 -/* 0067C 8080067C 00077080 */ sll $t6, $a3, 2 -/* 00680 80800680 31D90FFF */ andi $t9, $t6, 0x0FFF ## $t9 = 00000008 -/* 00684 80800684 34214000 */ ori $at, $at, 0x4000 ## $at = 00184000 -/* 00688 80800688 03217825 */ or $t7, $t9, $at ## $t7 = 00184008 -/* 0068C 8080068C AC4F0004 */ sw $t7, 0x0004($v0) ## 00000004 -/* 00690 80800690 AC580000 */ sw $t8, 0x0000($v0) ## 00000000 -/* 00694 80800694 8D0202C0 */ lw $v0, 0x02C0($t0) ## 000002C0 -/* 00698 80800698 3C0EE100 */ lui $t6, 0xE100 ## $t6 = E1000000 -/* 0069C 8080069C 28C10010 */ slti $at, $a2, 0x0010 -/* 006A0 808006A0 24580008 */ addiu $t8, $v0, 0x0008 ## $t8 = 00000008 -/* 006A4 808006A4 AD1802C0 */ sw $t8, 0x02C0($t0) ## 000002C0 -/* 006A8 808006A8 AC400004 */ sw $zero, 0x0004($v0) ## 00000004 -/* 006AC 808006AC AC4E0000 */ sw $t6, 0x0000($v0) ## 00000000 -/* 006B0 808006B0 8D0202C0 */ lw $v0, 0x02C0($t0) ## 000002C0 -/* 006B4 808006B4 3C180400 */ lui $t8, 0x0400 ## $t8 = 04000000 -/* 006B8 808006B8 37180400 */ ori $t8, $t8, 0x0400 ## $t8 = 04000400 -/* 006BC 808006BC 24590008 */ addiu $t9, $v0, 0x0008 ## $t9 = 00000008 -/* 006C0 808006C0 AD1902C0 */ sw $t9, 0x02C0($t0) ## 000002C0 -/* 006C4 808006C4 3C0FF100 */ lui $t7, 0xF100 ## $t7 = F1000000 -/* 006C8 808006C8 30A7FFFF */ andi $a3, $a1, 0xFFFF ## $a3 = 00000060 -/* 006CC 808006CC AC4F0000 */ sw $t7, 0x0000($v0) ## 00000000 -/* 006D0 808006D0 1420FF9F */ bne $at, $zero, .L80800550 -/* 006D4 808006D4 AC580004 */ sw $t8, 0x0004($v0) ## 00000004 -/* 006D8 808006D8 860E01D6 */ lh $t6, 0x01D6($s0) ## 000001D6 -/* 006DC 808006DC 8E040000 */ lw $a0, 0x0000($s0) ## 00000000 -/* 006E0 808006E0 24190002 */ addiu $t9, $zero, 0x0002 ## $t9 = 00000002 -/* 006E4 808006E4 AFB90014 */ sw $t9, 0x0014($sp) -/* 006E8 808006E8 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 006EC 808006EC 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 006F0 808006F0 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 006F4 808006F4 0C01D9CB */ jal func_8007672C -/* 006F8 808006F8 AFAE0010 */ sw $t6, 0x0010($sp) -/* 006FC 808006FC 3C0F8080 */ lui $t7, %hi(D_808009A0) ## $t7 = 80800000 -/* 00700 80800700 85EF09A0 */ lh $t7, %lo(D_808009A0)($t7) -/* 00704 80800704 3C018080 */ lui $at, %hi(D_808009A0) ## $at = 80800000 -/* 00708 80800708 3C068080 */ lui $a2, %hi(D_80800A14) ## $a2 = 80800000 -/* 0070C 8080070C 25F8012C */ addiu $t8, $t7, 0x012C ## $t8 = 8080012C -/* 00710 80800710 A43809A0 */ sh $t8, %lo(D_808009A0)($at) -/* 00714 80800714 8E050000 */ lw $a1, 0x0000($s0) ## 00000000 -/* 00718 80800718 24C60A14 */ addiu $a2, $a2, %lo(D_80800A14) ## $a2 = 80800A14 -/* 0071C 8080071C 27A400A8 */ addiu $a0, $sp, 0x00A8 ## $a0 = FFFFFFB8 -/* 00720 80800720 0C031AD5 */ jal func_800C6B54 -/* 00724 80800724 240701E3 */ addiu $a3, $zero, 0x01E3 ## $a3 = 000001E3 -/* 00728 80800728 8FBF0024 */ lw $ra, 0x0024($sp) -/* 0072C 8080072C 8FB00020 */ lw $s0, 0x0020($sp) -/* 00730 80800730 27BD00F0 */ addiu $sp, $sp, 0x00F0 ## $sp = 00000000 -/* 00734 80800734 03E00008 */ jr $ra -/* 00738 80800738 00000000 */ nop diff --git a/asm/non_matchings/overlays/gamestates/ovl_title/func_8080073C.s b/asm/non_matchings/overlays/gamestates/ovl_title/func_8080073C.s deleted file mode 100644 index fcb96cbd5e..0000000000 --- a/asm/non_matchings/overlays/gamestates/ovl_title/func_8080073C.s +++ /dev/null @@ -1,86 +0,0 @@ -.rdata - -glabel D_80800A24 - .asciz "../z_title.c" - .balign 4 - -glabel D_80800A34 - .asciz "../z_title.c" - .balign 4 - - .text - -glabel func_8080073C -/* 0073C 8080073C 27BDFFB0 */ addiu $sp, $sp, 0xFFB0 ## $sp = FFFFFFB0 -/* 00740 80800740 AFBF001C */ sw $ra, 0x001C($sp) -/* 00744 80800744 AFB10018 */ sw $s1, 0x0018($sp) -/* 00748 80800748 AFB00014 */ sw $s0, 0x0014($sp) -/* 0074C 8080074C 8C850000 */ lw $a1, 0x0000($a0) ## 00000000 -/* 00750 80800750 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 00754 80800754 3C068080 */ lui $a2, %hi(D_80800A24) ## $a2 = 80800000 -/* 00758 80800758 24C60A24 */ addiu $a2, $a2, %lo(D_80800A24) ## $a2 = 80800A24 -/* 0075C 8080075C 27A40038 */ addiu $a0, $sp, 0x0038 ## $a0 = FFFFFFE8 -/* 00760 80800760 240701EE */ addiu $a3, $zero, 0x01EE ## $a3 = 000001EE -/* 00764 80800764 0C031AB1 */ jal func_800C6AC4 -/* 00768 80800768 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000 -/* 0076C 8080076C 8E2302C0 */ lw $v1, 0x02C0($s1) ## 000002C0 -/* 00770 80800770 3C0FDB06 */ lui $t7, 0xDB06 ## $t7 = DB060000 -/* 00774 80800774 3C19DB06 */ lui $t9, 0xDB06 ## $t9 = DB060000 -/* 00778 80800778 246E0008 */ addiu $t6, $v1, 0x0008 ## $t6 = 00000008 -/* 0077C 8080077C AE2E02C0 */ sw $t6, 0x02C0($s1) ## 000002C0 -/* 00780 80800780 AC600004 */ sw $zero, 0x0004($v1) ## 00000004 -/* 00784 80800784 AC6F0000 */ sw $t7, 0x0000($v1) ## 00000000 -/* 00788 80800788 8E2302C0 */ lw $v1, 0x02C0($s1) ## 000002C0 -/* 0078C 8080078C 37390004 */ ori $t9, $t9, 0x0004 ## $t9 = DB060004 -/* 00790 80800790 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000 -/* 00794 80800794 24780008 */ addiu $t8, $v1, 0x0008 ## $t8 = 00000008 -/* 00798 80800798 AE3802C0 */ sw $t8, 0x02C0($s1) ## 000002C0 -/* 0079C 8080079C AC790000 */ sw $t9, 0x0000($v1) ## 00000000 -/* 007A0 808007A0 8E0800A4 */ lw $t0, 0x00A4($s0) ## 000000A4 -/* 007A4 808007A4 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000 -/* 007A8 808007A8 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000 -/* 007AC 808007AC AC680004 */ sw $t0, 0x0004($v1) ## 00000004 -/* 007B0 808007B0 0C025492 */ jal func_80095248 -/* 007B4 808007B4 8E040000 */ lw $a0, 0x0000($s0) ## 00000000 -/* 007B8 808007B8 0C20004A */ jal func_80800128 -/* 007BC 808007BC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 007C0 808007C0 0C200072 */ jal func_808001C8 -/* 007C4 808007C4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 007C8 808007C8 3C098013 */ lui $t1, 0x8013 ## $t1 = 80130000 -/* 007CC 808007CC 8D29DBC0 */ lw $t1, -0x2440($t1) ## 8012DBC0 -/* 007D0 808007D0 51200008 */ beql $t1, $zero, .L808007F4 -/* 007D4 808007D4 920C01E1 */ lbu $t4, 0x01E1($s0) ## 000001E1 -/* 007D8 808007D8 8E2A02C0 */ lw $t2, 0x02C0($s1) ## 000002C0 -/* 007DC 808007DC 27A4002C */ addiu $a0, $sp, 0x002C ## $a0 = FFFFFFDC -/* 007E0 808007E0 0C200000 */ jal func_80800000 -/* 007E4 808007E4 AFAA002C */ sw $t2, 0x002C($sp) -/* 007E8 808007E8 8FAB002C */ lw $t3, 0x002C($sp) -/* 007EC 808007EC AE2B02C0 */ sw $t3, 0x02C0($s1) ## 000002C0 -/* 007F0 808007F0 920C01E1 */ lbu $t4, 0x01E1($s0) ## 000001E1 -.L808007F4: -/* 007F4 808007F4 3C068080 */ lui $a2, %hi(D_80800A34) ## $a2 = 80800000 -/* 007F8 808007F8 24C60A34 */ addiu $a2, $a2, %lo(D_80800A34) ## $a2 = 80800A34 -/* 007FC 808007FC 1180000E */ beq $t4, $zero, .L80800838 -/* 00800 80800800 27A40038 */ addiu $a0, $sp, 0x0038 ## $a0 = FFFFFFE8 -/* 00804 80800804 3C028016 */ lui $v0, 0x8016 ## $v0 = 80160000 -/* 00808 80800808 2442E660 */ addiu $v0, $v0, 0xE660 ## $v0 = 8015E660 -/* 0080C 8080080C 240300FF */ addiu $v1, $zero, 0x00FF ## $v1 = 000000FF -/* 00810 80800810 240D0001 */ addiu $t5, $zero, 0x0001 ## $t5 = 00000001 -/* 00814 80800814 A04313E0 */ sb $v1, 0x13E0($v0) ## 8015FA40 -/* 00818 80800818 A04313E1 */ sb $v1, 0x13E1($v0) ## 8015FA41 -/* 0081C 8080081C AC4D135C */ sw $t5, 0x135C($v0) ## 8015F9BC -/* 00820 80800820 3C0E8080 */ lui $t6, 0x8080 ## $t6 = 80800000 -/* 00824 80800824 25CE3CAC */ addiu $t6, $t6, 0x3CAC ## $t6 = 80803CAC -/* 00828 80800828 240F01D0 */ addiu $t7, $zero, 0x01D0 ## $t7 = 000001D0 -/* 0082C 8080082C AE000098 */ sw $zero, 0x0098($s0) ## 00000098 -/* 00830 80800830 AE0F0010 */ sw $t7, 0x0010($s0) ## 00000010 -/* 00834 80800834 AE0E000C */ sw $t6, 0x000C($s0) ## 0000000C -.L80800838: -/* 00838 80800838 8E050000 */ lw $a1, 0x0000($s0) ## 00000000 -/* 0083C 8080083C 0C031AD5 */ jal func_800C6B54 -/* 00840 80800840 2407021D */ addiu $a3, $zero, 0x021D ## $a3 = 0000021D -/* 00844 80800844 8FBF001C */ lw $ra, 0x001C($sp) -/* 00848 80800848 8FB00014 */ lw $s0, 0x0014($sp) -/* 0084C 8080084C 8FB10018 */ lw $s1, 0x0018($sp) -/* 00850 80800850 03E00008 */ jr $ra -/* 00854 80800854 27BD0050 */ addiu $sp, $sp, 0x0050 ## $sp = 00000000 diff --git a/asm/non_matchings/overlays/gamestates/ovl_title/func_80800878.s b/asm/non_matchings/overlays/gamestates/ovl_title/func_80800878.s deleted file mode 100644 index 1badaae37a..0000000000 --- a/asm/non_matchings/overlays/gamestates/ovl_title/func_80800878.s +++ /dev/null @@ -1,100 +0,0 @@ -.rdata - -glabel D_80800A44 - .asciz "../z_title.c" - .balign 4 - -glabel D_80800A54 - .asciz "z_title.c\n" - .balign 4 - -glabel D_80800A60 - .asciz "this->staticSegment != NULL" - .balign 4 - -glabel D_80800A7C - .asciz "../z_title.c" - .balign 4 - -glabel D_80800A8C - .asciz "../z_title.c" - .balign 4 - - .text - -glabel func_80800878 -/* 00878 80800878 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8 -/* 0087C 8080087C 3C0201AA */ lui $v0, 0x01AA ## $v0 = 01AA0000 -/* 00880 80800880 3C0E01AA */ lui $t6, 0x01AA ## $t6 = 01AA0000 -/* 00884 80800884 25CE3DC0 */ addiu $t6, $t6, 0x3DC0 ## $t6 = 01AA3DC0 -/* 00888 80800888 24421000 */ addiu $v0, $v0, 0x1000 ## $v0 = 01AA1000 -/* 0088C 8080088C AFBF0024 */ sw $ra, 0x0024($sp) -/* 00890 80800890 AFB00020 */ sw $s0, 0x0020($sp) -/* 00894 80800894 01C22823 */ subu $a1, $t6, $v0 -/* 00898 80800898 3C068080 */ lui $a2, %hi(D_80800A44) ## $a2 = 80800000 -/* 0089C 8080089C 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000 -/* 008A0 808008A0 24C60A44 */ addiu $a2, $a2, %lo(D_80800A44) ## $a2 = 80800A44 -/* 008A4 808008A4 AFA50028 */ sw $a1, 0x0028($sp) -/* 008A8 808008A8 AFA2002C */ sw $v0, 0x002C($sp) -/* 008AC 808008AC 0C031521 */ jal Game_Alloc -/* 008B0 808008B0 24070263 */ addiu $a3, $zero, 0x0263 ## $a3 = 00000263 -/* 008B4 808008B4 3C048080 */ lui $a0, %hi(D_80800A54) ## $a0 = 80800000 -/* 008B8 808008B8 AE0200A4 */ sw $v0, 0x00A4($s0) ## 000000A4 -/* 008BC 808008BC 0C00084C */ jal osSyncPrintf -/* 008C0 808008C0 24840A54 */ addiu $a0, $a0, %lo(D_80800A54) ## $a0 = 80800A54 -/* 008C4 808008C4 8E0400A4 */ lw $a0, 0x00A4($s0) ## 000000A4 -/* 008C8 808008C8 3C058080 */ lui $a1, %hi(D_80800A7C) ## $a1 = 80800000 -/* 008CC 808008CC 24A50A7C */ addiu $a1, $a1, %lo(D_80800A7C) ## $a1 = 80800A7C -/* 008D0 808008D0 14800005 */ bne $a0, $zero, .L808008E8 -/* 008D4 808008D4 24060266 */ addiu $a2, $zero, 0x0266 ## $a2 = 00000266 -/* 008D8 808008D8 3C048080 */ lui $a0, %hi(D_80800A60) ## $a0 = 80800000 -/* 008DC 808008DC 0C0007FC */ jal __assert -/* 008E0 808008E0 24840A60 */ addiu $a0, $a0, %lo(D_80800A60) ## $a0 = 80800A60 -/* 008E4 808008E4 8E0400A4 */ lw $a0, 0x00A4($s0) ## 000000A4 -.L808008E8: -/* 008E8 808008E8 3C078080 */ lui $a3, %hi(D_80800A8C) ## $a3 = 80800000 -/* 008EC 808008EC 240F0267 */ addiu $t7, $zero, 0x0267 ## $t7 = 00000267 -/* 008F0 808008F0 AFAF0010 */ sw $t7, 0x0010($sp) -/* 008F4 808008F4 24E70A8C */ addiu $a3, $a3, %lo(D_80800A8C) ## $a3 = 80800A8C -/* 008F8 808008F8 8FA5002C */ lw $a1, 0x002C($sp) -/* 008FC 808008FC 0C0006A8 */ jal DmaMgr_SendRequest1 -/* 00900 80800900 8FA60028 */ lw $a2, 0x0028($sp) -/* 00904 80800904 3C198016 */ lui $t9, 0x8016 ## $t9 = 80160000 -/* 00908 80800908 8F39FA90 */ lw $t9, -0x0570($t9) ## 8015FA90 -/* 0090C 8080090C 24180001 */ addiu $t8, $zero, 0x0001 ## $t8 = 00000001 -/* 00910 80800910 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00914 80800914 0C034204 */ jal Matrix_Init -/* 00918 80800918 A7380110 */ sh $t8, 0x0110($t9) ## 80160110 -/* 0091C 8080091C 260400A8 */ addiu $a0, $s0, 0x00A8 ## $a0 = 000000A8 -/* 00920 80800920 0C02A89E */ jal func_800AA278 -/* 00924 80800924 8E050000 */ lw $a1, 0x0000($s0) ## 00000000 -/* 00928 80800928 3C088080 */ lui $t0, %hi(func_8080073C) ## $t0 = 80800000 -/* 0092C 8080092C 3C098080 */ lui $t1, %hi(func_80800858) ## $t1 = 80800000 -/* 00930 80800930 2508073C */ addiu $t0, $t0, %lo(func_8080073C) ## $t0 = 8080073C -/* 00934 80800934 25290858 */ addiu $t1, $t1, %lo(func_80800858) ## $t1 = 80800858 -/* 00938 80800938 AE080004 */ sw $t0, 0x0004($s0) ## 00000004 -/* 0093C 8080093C AE090008 */ sw $t1, 0x0008($s0) ## 00000008 -/* 00940 80800940 A20001E1 */ sb $zero, 0x01E1($s0) ## 000001E1 -/* 00944 80800944 240A00FF */ addiu $t2, $zero, 0x00FF ## $t2 = 000000FF -/* 00948 80800948 3C018016 */ lui $at, 0x8016 ## $at = 80160000 -/* 0094C 8080094C AC2AF9B4 */ sw $t2, -0x064C($at) ## 8015F9B4 -/* 00950 80800950 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 -/* 00954 80800954 0C02A735 */ jal func_800A9CD4 -/* 00958 80800958 260501D0 */ addiu $a1, $s0, 0x01D0 ## $a1 = 000001D0 -/* 0095C 8080095C 240B0014 */ addiu $t3, $zero, 0x0014 ## $t3 = 00000014 -/* 00960 80800960 240C00FF */ addiu $t4, $zero, 0x00FF ## $t4 = 000000FF -/* 00964 80800964 240DFFFD */ addiu $t5, $zero, 0xFFFD ## $t5 = FFFFFFFD -/* 00968 80800968 240E003C */ addiu $t6, $zero, 0x003C ## $t6 = 0000003C -/* 0096C 8080096C A60001DC */ sh $zero, 0x01DC($s0) ## 000001DC -/* 00970 80800970 A60B01D4 */ sh $t3, 0x01D4($s0) ## 000001D4 -/* 00974 80800974 A60C01D6 */ sh $t4, 0x01D6($s0) ## 000001D6 -/* 00978 80800978 A60D01D8 */ sh $t5, 0x01D8($s0) ## 000001D8 -/* 0097C 8080097C A60E01DA */ sh $t6, 0x01DA($s0) ## 000001DA -/* 00980 80800980 8FBF0024 */ lw $ra, 0x0024($sp) -/* 00984 80800984 8FB00020 */ lw $s0, 0x0020($sp) -/* 00988 80800988 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000 -/* 0098C 8080098C 03E00008 */ jr $ra -/* 00990 80800990 00000000 */ nop -/* 00994 80800994 00000000 */ nop -/* 00998 80800998 00000000 */ nop -/* 0099C 8080099C 00000000 */ nop diff --git a/checksum.md5 b/checksum.md5 index 98da4b6798..4483a7ce34 100644 --- a/checksum.md5 +++ b/checksum.md5 @@ -1 +1 @@ -717179476af84133b14ff73af87db57a zelda_ocarina_mq_dbg.z64 +f0b7f35375f9cc8ca1b2d59d78e35405 zelda_ocarina_mq_dbg.z64 \ No newline at end of file diff --git a/data/code_8006C360.data.s b/data/code_8006C360.data.s deleted file mode 100644 index 20ab1ea6b7..0000000000 --- a/data/code_8006C360.data.s +++ /dev/null @@ -1,11 +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 purposee registers - -.section .data - -glabel D_8011F3F0 - .incbin "baserom.z64", 0xB96590, 0x440 diff --git a/data/code_8008E4E0.rodata.s b/data/code_8008E4E0.rodata.s deleted file mode 100644 index f1b5ddce69..0000000000 --- a/data/code_8008E4E0.rodata.s +++ /dev/null @@ -1,11 +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 purposee registers - -.section .rodata - -glabel D_8013E760 - .incbin "baserom.z64", 0xBB5900, 0x10 diff --git a/data/code_80092500.bss.s b/data/code_80092500.bss.s deleted file mode 100644 index 5b88b46466..0000000000 --- a/data/code_80092500.bss.s +++ /dev/null @@ -1,14 +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 purposee registers - -.section .bss - -glabel D_80160020 - .space 0x30 - -glabel D_80160050 - .space 0x60 diff --git a/data/code_80092500.data.s b/data/code_80092500.data.s deleted file mode 100644 index 0ae0ac1708..0000000000 --- a/data/code_80092500.data.s +++ /dev/null @@ -1,17 +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 purposee registers - -.section .data - -glabel D_80126250 - .incbin "baserom.z64", 0xB9D3F0, 0x4 - -glabel D_80126254 - .incbin "baserom.z64", 0xB9D3F4, 0x4 - -glabel D_80126258 - .incbin "baserom.z64", 0xB9D3F8, 0x28 diff --git a/data/code_80092500.rodata.s b/data/code_80092500.rodata.s deleted file mode 100644 index 66d56c13a5..0000000000 --- a/data/code_80092500.rodata.s +++ /dev/null @@ -1,55 +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 purposee registers - -.section .rodata - -.align 4 - -glabel D_8013E9E0 - .asciz "\x1b[43;30mquake: too many request %d is changed new one !!\n\x1b[m" - .balign 4 - -glabel D_8013EA20 - .asciz "\x1b[43;30mquake: stopped! 'coz camera [%d] killed!!\n\x1b[m" - .balign 4 - -glabel jtbl_8013EA58 - .word L80092D48 - .word L80092D50 - .word L80092D9C - .word L80092D58 - .word L80092D9C - .word L80092D9C - .word L80092D9C - .word L80092D60 - .word L80092D9C - .word L80092D9C - .word L80092D9C - .word L80092D9C - .word L80092D9C - .word L80092D9C - .word L80092D9C - .word L80092D68 - .word L80092D9C - .word L80092D9C - .word L80092D9C - .word L80092D9C - .word L80092D9C - .word L80092D9C - .word L80092D9C - .word L80092D9C - .word L80092D9C - .word L80092D9C - .word L80092D9C - .word L80092D9C - .word L80092D9C - .word L80092D9C - .word L80092D9C - .word L80092D70 - -glabel D_8013EAD8 - .float 0.005 diff --git a/data/code_800ACE70.data.s b/data/code_800ACE70.data.s deleted file mode 100644 index f3e9e74c73..0000000000 --- a/data/code_800ACE70.data.s +++ /dev/null @@ -1,20 +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 purposee registers - -.section .data - -glabel D_8012AC00 - .incbin "baserom.z64", 0xBA1DA0, 0x28 - -glabel D_8012AC28 - .incbin "baserom.z64", 0xBA1DC8, 0x18 - -glabel D_8012AC40 - .incbin "baserom.z64", 0xBA1DE0, 0x18 - -glabel D_8012AC58 - .incbin "baserom.z64", 0xBA1DF8, 0x38 diff --git a/data/code_800D31A0.data.s b/data/code_800D31A0.data.s deleted file mode 100644 index 2769270570..0000000000 --- a/data/code_800D31A0.data.s +++ /dev/null @@ -1,11 +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 purposee registers - -.section .data - -glabel D_8012DBC0 - .incbin "baserom.z64", 0xBA4D60, 0x10 diff --git a/data/code_800D31A0.rodata.s b/data/code_800D31A0.rodata.s deleted file mode 100644 index bc59589dd8..0000000000 --- a/data/code_800D31A0.rodata.s +++ /dev/null @@ -1,14 +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 purposee registers - -.section .rodata - -.align 4 - -glabel D_80146670 - .asciz "\x1b[31m\n**** Freeze!! ****\n\x1b[m" - .balign 4 diff --git a/data/code_800FCE80.bss.s b/data/code_800FCE80.bss.s deleted file mode 100644 index df9e1e6f2a..0000000000 --- a/data/code_800FCE80.bss.s +++ /dev/null @@ -1,11 +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 purposee registers - -.section .bss - -glabel D_80175600 - .space 0x10 diff --git a/data/code_800FCE80.data.s b/data/code_800FCE80.data.s deleted file mode 100644 index 0b7263e616..0000000000 --- a/data/code_800FCE80.data.s +++ /dev/null @@ -1,14 +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 purposee registers - -.section .data - -glabel D_801344A0 - .incbin "baserom.z64", 0xBAB640, 0x4 - -glabel D_801344A4 - .incbin "baserom.z64", 0xBAB644, 0xC diff --git a/data/code_800FCE80.rodata.s b/data/code_800FCE80.rodata.s deleted file mode 100644 index fad8418a7b..0000000000 --- a/data/code_800FCE80.rodata.s +++ /dev/null @@ -1,54 +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 purposee registers - -.section .rodata - -.align 4 - -glabel D_8014AAC0 - .float -0.33333334 - .float 0.2 - .float -0.14285715 - .float 0.11111111 - .float -0.09090909 - .float 0.07692308 - .float -0.06666667 - .float 0.05882353 - .float 0 - -glabel D_8014AAE4 - .float 0.41421354 - -glabel D_8014AAE8 - .float 2.4142137 - -glabel D_8014AAEC - .float 1.5707964 # M_PI / 2 - -glabel D_8014AAF0 - .float 0.7853982 # M_PI / 4 - -glabel D_8014AAF4 - .float 1.5707964 # M_PI / 2 - -glabel D_8014AAF8 - .float -1.5707964 # - M_PI / 2 - -glabel D_8014AAFC - .float 1.5707964 # M_PI / 2 - -glabel D_8014AB00 - .float -1.5707964 # - M_PI / 2 - -glabel D_8014AB04 - .float 3.1415927 # M_PI - -glabel D_8014AB08 - .float 3.1415927 # M_PI - -glabel D_8014AB0C - .float 1.5707964 # M_PI / 2 diff --git a/data/graph.bss.s b/data/graph.bss.s deleted file mode 100644 index 6d7d3f4256..0000000000 --- a/data/graph.bss.s +++ /dev/null @@ -1,29 +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 purposee registers - -.section .bss - -glabel D_801665D0 - .space 0x4 - -glabel D_801665D4 - .space 0x4 - -glabel D_801665D8 - .space 0x4 - -glabel D_801665DC - .space 0x4 - -glabel D_801665E0 - .space 0x10 - -glabel D_801665F0 - .space 0x58 - -glabel D_80166648 - .space 0x18 diff --git a/data/graph.data.s b/data/graph.data.s deleted file mode 100644 index 2fa2810cbf..0000000000 --- a/data/graph.data.s +++ /dev/null @@ -1,20 +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 purposee registers - -.section .data - -glabel D_8012D230 - .incbin "baserom.z64", 0xBA43D0, 0x18 - -glabel D_8012D248 - .incbin "baserom.z64", 0xBA43E8, 0x18 - -glabel D_8012D260 - .incbin "baserom.z64", 0xBA4400, 0x4 - -glabel D_8012D264 - .incbin "baserom.z64", 0xBA4404, 0xC diff --git a/data/graph.rodata.s b/data/graph.rodata.s deleted file mode 100644 index fa805d3366..0000000000 --- a/data/graph.rodata.s +++ /dev/null @@ -1,256 +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 purposee registers - -.section .rodata - -.align 4 - -glabel D_80145180 - .asciz "vtx_cnt=%d\n" - .balign 4 - -glabel D_8014518C - .asciz "spvtx_cnt=%d\n" - .balign 4 - -glabel D_8014519C - .asciz "tri1_cnt=%d\n" - .balign 4 - -glabel D_801451AC - .asciz "tri2_cnt=%d\n" - .balign 4 - -glabel D_801451BC - .asciz "quad_cnt=%d\n" - .balign 4 - -glabel D_801451CC - .asciz "line_cnt=%d\n" - .balign 4 - -glabel D_801451DC - .asciz "sync_err=%d\n" - .balign 4 - -glabel D_801451EC - .asciz "loaducode_cnt=%d\n" - .balign 4 - -glabel D_80145200 - .asciz "dl_depth=%d\n" - .balign 4 - -glabel D_80145210 - .asciz "dl_cnt=%d\n" - .balign 4 - -glabel D_8014521C - .asciz "../graph.c" - .balign 4 - -glabel D_80145228 - .asciz "game_init_func = %08x\n" - .balign 4 - -glabel D_80145240 - .asciz "\x1b[31m" - .balign 4 - -glabel D_80145248 - .asciz "RCPが帰ってきませんでした。" - .balign 4 - -glabel D_80145264 - .asciz "\x1b[m" - .balign 4 - -glabel D_80145268 - .asciz "RCP is HUNG UP!!" - .balign 4 - -glabel D_8014527C - .asciz "Oh! MY GOD!!" - .balign 4 - -glabel D_8014528C - .asciz "../graph.c" - .balign 4 - -glabel D_80145298 - .asciz "../graph.c" - .balign 4 - -glabel D_801452A4 - .asciz "../graph.c" - .balign 4 - -glabel D_801452B0 - .asciz "WORK_DISP 開始" - # EUC-JP: 開始 | Start - .balign 4 - -glabel D_801452C0 - .asciz "POLY_OPA_DISP 開始" - # EUC-JP: 開始 | Start - .balign 4 - -glabel D_801452D4 - .asciz "POLY_XLU_DISP 開始" - # EUC-JP: 開始 | Start - .balign 4 - -glabel D_801452E8 - .asciz "OVERLAY_DISP 開始" - # EUC-JP: 開始 | Start - .balign 4 - -glabel D_801452FC - .asciz "../graph.c" - .balign 4 - -glabel D_80145308 - .asciz "../graph.c" - .balign 4 - -glabel D_80145314 - .asciz "WORK_DISP 終了" - # EUC-JP: 終了 | End - .balign 4 - -glabel D_80145324 - .asciz "POLY_OPA_DISP 終了" - # EUC-JP: 終了 | End - .balign 4 - -glabel D_80145338 - .asciz "POLY_XLU_DISP 終了" - # EUC-JP: 終了 | End - .balign 4 - -glabel D_8014534C - .asciz "OVERLAY_DISP 終了" - # EUC-JP: 終了 | End - .balign 4 - -glabel D_80145360 - .asciz "../graph.c" - .balign 4 - -glabel D_8014536C - .asciz "../graph.c" - .balign 4 - -glabel D_80145378 - .asciz "../graph.c" - .balign 4 - -glabel D_80145384 - .asciz "do_count_fault" - .balign 4 - -glabel D_80145394 - .asciz "%c" - .balign 4 - -glabel D_80145398 - .asciz "\x1b[41;37mダイナミック領域先頭が破壊されています\n\x1b[m" - #ダイナミック領域先頭が破壊されています | Dynamic area head is destroyed - .balign 4 - -glabel D_801453CC - .asciz "../graph.c" - .balign 4 - -glabel D_801453D8 - .asciz "%c" - .balign 4 - -glabel D_801453DC - .asciz "\x1b[41;37mダイナミック領域末尾が破壊されています\n\x1b[m" - # EUC-JP: ダイナミック領域末尾が破壊されています | Dynamic region tail is destroyed - .balign 4 - -glabel D_80145410 - .asciz "../graph.c" - .balign 4 - -glabel D_8014541C - .asciz "%c" - .balign 4 - -glabel D_80145420 - .asciz "\x1b[41;37mゼルダ0は死んでしまった(graph_alloc is empty)\n\x1b[m" - # EUC-JP: ゼルダ0は死んでしまった | 'Zelda 0 is dead'? - .balign 4 - -glabel D_8014545C - .asciz "%c" - .balign 4 - -glabel D_80145460 - .asciz "\x1b[41;37mゼルダ1は死んでしまった(graph_alloc is empty)\n\x1b[m" - # EUC-JP: ゼルダ1は死んでしまった | 'Zelda 1 is dead'? - .balign 4 - -glabel D_8014549C - .asciz "%c" - .balign 4 - -glabel D_801454A0 - .asciz "\x1b[41;37mゼルダ4は死んでしまった(graph_alloc is empty)\n\x1b[m" - # EUC-JP: ゼルダ4は死んでしまった | 'Zelda 4 is dead'? - .balign 4 - -glabel D_801454DC - .asciz "\x1b[43;30mPRE-NMIによりリセットモードに移行します\n\x1b[m" - # EUC-JP: によりリセットモードに移行します | To reset mode - .balign 4 - -glabel D_80145510 - .asciz "グラフィックスレッド実行開始\n" - # EUC-JP: グラフィックスレッド実行開始 | Start graphic thread execution - .balign 4 - -glabel D_80145530 - .asciz "クラスサイズ＝%dバイト\n" - # EUC-JP: クラスサイズ＝%dバイト | Class size =%d bytes - .balign 4 - -glabel D_80145548 - .asciz "../graph.c" - .balign 4 - -glabel D_80145554 - .asciz "確保失敗\n" - # EUC-JP: 確保失敗 | Failure to secure - .balign 4 - -glabel D_80145560 - .asciz "CLASS SIZE= %d bytes" - .balign 4 - -glabel D_80145578 - .asciz "GAME CLASS MALLOC FAILED" - .balign 4 - -glabel D_80145594 - .asciz "../graph.c" - .balign 4 - -glabel D_801455A0 - .asciz "グラフィックスレッド実行終了\n" - # EUC-JP: グラフィックスレッド実行終了 | End of graphic thread execution - .balign 4 - -glabel D_801455C0 - .asciz "graph_alloc siz=%d thga size=%08x bufp=%08x head=%08x tail=%08x\n" - .balign 4 - -glabel D_80145604 - .asciz "graph_alloc siz=%d thga size=%08x bufp=%08x head=%08x tail=%08x\n" - .balign 4 diff --git a/data/overlays/actors/z_arrow_fire.data.s b/data/overlays/actors/z_arrow_fire.data.s deleted file mode 100644 index e5fcaba2e5..0000000000 --- a/data/overlays/actors/z_arrow_fire.data.s +++ /dev/null @@ -1,38 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers - -.section .data - -glabel D_808666E0 - .word 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000102, 0x01000001, 0x00000000, 0x00000000, 0x00010000, 0x00000000, 0x00000001, 0x00000000, 0x00000204, 0x02000101, 0x00000000, 0x00000000, 0x00010101, 0x00000001, 0x00000001, 0x00000000, 0x00000307, 0x03010102, 0x00000000, 0x00000000, 0x01010102, 0x00000002, 0x01010001, 0x00000000, 0x00010509, 0x04010103, 0x01000000, 0x00000000, 0x01020202, 0x00000104, 0x03020101, 0x00000000, 0x0001060C, 0x06010103, 0x01000000, 0x00000000, 0x02020202, 0x00000206, 0x05040101, 0x00000000, 0x0001080F, 0x07010103, 0x01000001, 0x00000000, 0x03030202, 0x00010408, 0x07060201, 0x00000000, 0x00010911, 0x08010103, 0x01000001, 0x00000001, 0x04040303, 0x0101050B, 0x0A080301, 0x00000000, 0x00020B14, 0x0A010103, 0x01000001, 0x00010102, 0x06060403, 0x0203070D, 0x0C0A0401, 0x00000000, 0x00030D17, 0x0B020103, 0x01010001, 0x00010205, 0x09080503, 0x0205090E, 0x0E0D0501, 0x00000000, 0x01050F18, 0x0C020102, 0x01010001, 0x00010408, 0x0D0B0502, 0x03070B0F, 0x0F0F0601, 0x00000000, 0x02081219, 0x0D030102, 0x00010001, 0x0001050B, 0x130F0702, 0x04080B0F, 0x10110801, 0x00000000, 0x030C1419, 0x0E040101, 0x00010001, 0x0001070F, 0x19140A03, 0x05090B0E, 0x10130A02, 0x00000001, 0x05121719, 0x0E040100, 0x00010102, 0x01020A13, 0x1F1A0F06, 0x06090A0C, 0x10150B03, 0x01000001, 0x08181B19, 0x0F050201, 0x01020102, 0x02040D18, 0x2721140A, 0x080A0A0C, 0x11160D04, 0x02020001, 0x0B1E1E19, 0x10070403, 0x02030202, 0x0408111D, 0x2F2A1B0F, 0x0A0B0B0D, 0x12180F06, 0x04040101, 0x0E242119, 0x11090606, 0x04040304, 0x070C1623, 0x38322214, 0x0E0D0E10, 0x141A1108, 0x06060102, 0x112A241A, 0x120B0909, 0x06050507, 0x0B111C29, 0x413B291B, 0x13101216, 0x181B1209, 0x08080304, 0x152F271B, 0x140E0C0C, 0x0907080B, 0x10172230, 0x4A433223, 0x1813161D, 0x1D1E140B, 0x0A0A0608, 0x1A342B1E, 0x17110F0F, 0x0C0B0D11, 0x171F2A38, 0x534C3B2B, 0x1E161C25, 0x2221160D, 0x0B0C0A0E, 0x21393023, 0x1B151211, 0x0F0F1217, 0x1E273240, 0x5C564534, 0x251B242F, 0x2924190F, 0x0E0E0F17, 0x293E372B, 0x21181513, 0x1113181E, 0x26303B48, 0x655F4E3E, 0x2D222D3A, 0x30271C13, 0x11111520, 0x32453F35, 0x281D1714, 0x14181E25, 0x2F3A4551, 0x6F695746, 0x362B3744, 0x372A1F17, 0x15151D2A, 0x3D4D483F, 0x31231A14, 0x171E252E, 0x38444F5B, 0x7974614F, 0x4036404C, 0x3C2D231D, 0x1A1A2637, 0x4957524A, 0x3A2A1D15, 0x1A252E37, 0x43505B66, 0x837F6C59, 0x4A414750, 0x3F2E2723, 0x21213245, 0x57625D54, 0x43312216, 0x1F2D3741, 0x4D5B6671, 0x8E8B7662, 0x544B4D51, 0x3F302C2C, 0x2B2D4054, 0x656D675E, 0x4C3A281A, 0x2536414B, 0x5867717B, 0x9896816C, 0x5E545150, 0x3F323337, 0x383C5063, 0x71777168, 0x56432F21, 0x2C3F4B56, 0x63727C86, 0xA2A08B76, 0x685D5651, 0x3F343A43, 0x484D5F70, 0x7D827B71, 0x5F4C3829, 0x34465462, 0x6F7C8690, 0xACA99581, 0x72655B53, 0x42394450, 0x585E6D7C, 0x878C8479, 0x68574334, 0x3D4E5E6E, 0x7B88919A, 0xB4B09E8C, 0x7C6E6155, 0x46414F5F, 0x676E7B87, 0x92958C80, 0x71625041, 0x4857697A, 0x86929BA3, 0xBBB7A796, 0x86776658, 0x4D4B5C6E, 0x777D8791, 0x9C9F9487, 0x7A6D5C4F, 0x54617486, 0x919CA4AB, 0xC2BBAFA1, 0x907F6C5D, 0x55576A7E, 0x8589929A, 0xA5A99D90, 0x8478695E, 0x5F697F93, 0x9DA6ACB2, 0xC8BFB6AC, 0x9A877465, 0x6064788D, 0x92949BA1, 0xADB2A89C, 0x8F83766C, 0x6A718AA1, 0xA9AFB2B8, 0xCEC3BDB6, 0xA4907E70, 0x6C72879B, 0x9C9CA2A8, 0xB5BBB3A9, 0x9B8E8279, 0x737693AE, 0xB4B6B9BE, 0xD5C9C5BF, 0xAF9C8B7E, 0x7A8094A5, 0xA4A0A7B0, 0xBDC5C0B7, 0xA8998E85, 0x7B7B9AB7, 0xBDBEC0C5, 0xDBCFCCC8, 0xBAA9998E, 0x898E9FAD, 0xA8A1ACB8, 0xC6CECCC5, 0xB6A4988F, 0x8381A0BE, 0xC4C6C8CD, 0xE0D4D3D1, 0xC5B7A89D, 0x989CA8B3, 0xABA2B0C0, 0xCED8D8D2, 0xC2AEA298, 0x8C89A6C3, 0xCACED1D5, 0xE5DBDAD8, 0xD0C4B6AB, 0xA6A8B1B8, 0xAEA4B5C7, 0xD6E0E3DE, 0xCDB7ABA2, 0x9590ACC9, 0xD0D5D9DC, 0xEBE1E0DE, 0xDAD1C4B9, 0xB2B2B8BC, 0xB1A7B9CE, 0xDEE8ECE8, 0xD6BDB3AC, 0x9E98B3CE, 0xD6DBE0E3, 0xF0E9E6E3, 0xE3DDD2C6, 0xBCBABEC0, 0xB4AABED5, 0xE5EFF3F0, 0xDDC2BBB6, 0xA79FB9D4, 0xDCE2E7E9, 0xF5F0ECE7, 0xEAE8DED2, 0xC6C1C2C3, 0xB7ADC4DD, 0xEBF3F8F5, 0xE1C6C2C1, 0xB1A7BFD8, 0xE1E7EDF0, 0xF9F5F1EB, 0xF0F0E9DD, 0xCFC7C7C6, 0xBBB1CBE5, 0xF0F5FBF7, 0xE3CACACC, 0xBBB0C5DC, 0xE5ECF4F6, 0xFCF9F5EE, 0xF5F7F0E7, 0xD7CDCCCB, 0xBFB7D2EB, 0xF4F7FBF6, 0xE4CDD2D6, 0xC6B9CBE0, 0xE9F1F9FB, 0xFDFCF8F2, 0xF9FAF6EE, 0xDFD5D3D0, 0xC5BDD9F0, 0xF7F9FBF4, 0xE5D0D9E0, 0xD1C2D2E4, 0xEDF5FCFE, 0xFEFDFAF4, 0xFBFCF9F3, 0xE6DDDAD7, 0xCBC3DEF4, 0xFAFBFCF3, 0xE5D3DEE8, 0xDBCDDAE9, 0xF2F8FEFF, 0xFEFDFCF6, 0xFCFDFCF7, 0xECE4E2DF, 0xD2C9E3F7, 0xFCFDFBF3, 0xE5D6E4EF, 0xE3D6E1EE, 0xF6FAFEFF, 0xFEFDFDF8, 0xFCFDFDFA, 0xF1EAE9E7, 0xD9CFE7F9, 0xFEFEFBF3, 0xE7DBE9F4, 0xEBDFE8F3, 0xF9FCFFFF, 0xFEFDFDFA, 0xFDFDFEFC, 0xF5EFEFEE, 0xE0D5ECFB, 0xFFFEFBF3, 0xE9E1EEF8, 0xF0E6EEF6, 0xFCFDFFFF, 0xFEFDFEFC, 0xFEFDFEFE, 0xF8F4F4F3, 0xE7DDF1FD, 0xFFFEFBF3, 0xECE7F3FC, 0xF5ECF2F9, 0xFDFEFFFF, 0xFEFDFFFE, 0xFFFDFEFE, 0xFAF7F8F7, 0xEDE5F5FE, 0xFFFEFBF5, 0xF0EDF7FD, 0xF9F1F5FA, 0xFEFFFFFF, 0xFEFDFFFF, 0xFFFEFEFF, 0xFCFAFAFA, 0xF2ECF8FE, 0xFFFEFCF7, 0xF4F3FAFE, 0xFBF6F8FB, 0xFEFFFFFF, 0xFEFDFFFF, 0xFFFEFEFF, 0xFDFCFCFC, 0xF7F2FBFF, 0xFFFEFCFA, 0xF8F7FCFF, 0xFEFAFBFC, 0xFFFFFFFF, 0xFEFEFFFF, 0xFFFFFFFF, 0xFEFDFEFD, 0xFAF7FCFF, 0xFFFEFDFC, 0xFCFBFDFF, 0xFFFDFDFD, 0xFFFFFFFF, 0xFFFEFFFF, 0xFFFFFFFF, 0xFFFEFEFE, 0xFCFAFDFF, 0xFFFEFEFE, 0xFEFDFEFF, 0xFFFFFEFD, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFDFCFEFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFE, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFEFEFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF -glabel D_80866EE0 - .word 0x2F3E56AB, 0xA4582102, 0x10417AB0, 0x805C312A, 0x32376DD4, 0xA2633907, 0x0B387DA2, 0x6D81470C, 0x3C5C60AC, 0xA5571801, 0x154C97B9, 0x68533236, 0x304276D6, 0x9B533108, 0x154A96B7, 0x7C9B400B, 0x3E756FAE, 0xAF5D1301, 0x1D59B4BF, 0x53432C38, 0x2F487DCC, 0x8A4A2406, 0x1F5DB0C8, 0x90B55110, 0x408B7FAA, 0xB76D1503, 0x286ACCBE, 0x43312030, 0x2B4C82BA, 0x77431607, 0x2B70C7D5, 0xA6B95B13, 0x409C93A6, 0xB87D1D08, 0x367FE1C1, 0x3C261629, 0x2A508AAB, 0x69410C0C, 0x3986DDDB, 0xB5AE6316, 0x40A0A7A1, 0xAA7D2610, 0x4596F1CD, 0x47281E36, 0x365C97A3, 0x63450713, 0x499DF0D8, 0xB49E721A, 0x409AB59F, 0x8A662D1C, 0x57AEFBDF, 0x6B404456, 0x536EA49B, 0x6A4D061E, 0x5CB6FCC6, 0x9A8E7F20, 0x428EBEA0, 0x623F2E2A, 0x69C6FFF0, 0x9A686569, 0x6F83AC92, 0x7F5D0B2A, 0x70CDFFB2, 0x77848D29, 0x4787C4A0, 0x401D2E3E, 0x7ED9FFFC, 0xC48F7973, 0x8598AE86, 0x9A701339, 0x85E1FFA6, 0x5E859534, 0x5189C99B, 0x2C0B3455, 0x92E9FFFA, 0xDCAB8071, 0x94ACAD7A, 0xB1882249, 0x9AF1FFB0, 0x6A8F9746, 0x6394CD8D, 0x290C416F, 0xA5EEFFF4, 0xDCB46B6D, 0xA1BFAD77, 0xB6A43A58, 0xAAF8FFC8, 0x84959963, 0x7BA4CE78, 0x351A588E, 0xB5E3F9F1, 0xCFAC6077, 0xABCFAC77, 0xA8C05A6A, 0xB2F3FFE1, 0xA3959471, 0x94B9D065, 0x473274A9, 0xBDCDECEF, 0xC2A05F86, 0xBADDAC78, 0x92D87C7D, 0xAFDEFDF1, 0xBC8C8971, 0xA6D2D45A, 0x584B95BB, 0xC1B3D5ED, 0xB8956697, 0xC5E9A670, 0x7AE6978F, 0xA4BEF0EF, 0xB9797360, 0xB1E8DD5D, 0x5D5FAFC7, 0xC49CB8E3, 0xAF8C78A5, 0xCBF19D5F, 0x6AE5A6A3, 0x9398DBE7, 0xB46A5841, 0xB8F2E871, 0x586DC1CD, 0xC78C9DD5, 0xAA878CB1, 0xD8F89249, 0x63DCABB3, 0x8576C5D8, 0xA95E4430, 0xC0EBEE91, 0x5378CACE, 0xC58087C5, 0xA4859EAE, 0xE1FD8A36, 0x60D0ACBD, 0x7765B9C5, 0x9C563A2B, 0xCED7E7B4, 0x5484C7CC, 0xB66F7CBB, 0x9F81A898, 0xE3FF8D2E, 0x63C8B0BA, 0x6D69B8B0, 0x93573B2E, 0xE0C2CED2, 0x6898C0C3, 0x97587EBC, 0x9D749570, 0xDEFF9D36, 0x67C8B4A8, 0x6682BD9B, 0x93643E37, 0xF0B4A8DE, 0x86A9B6B0, 0x70448BBE, 0x99617545, 0xD1FFB84E, 0x70CAB48C, 0x64A4BD8D, 0x96763D41, 0xFAAC82DA, 0xA7B6AE9A, 0x4D359AC0, 0x90494F27, 0xC0FFD675, 0x80CCAD6D, 0x63C1B681, 0x9C85374E, 0xFFA069C9, 0xC1BAA785, 0x3936A4B6, 0x7D342E18, 0xA9FFEEA5, 0x9AC59F56, 0x60D0A873, 0x9288315E, 0xFB8669B6, 0xD0B6A473, 0x3C47A39A, 0x6228241B, 0x8BFFF6CD, 0xB7BB8F47, 0x57CFA169, 0x77782C6B, 0xE56478AA, 0xD6AC9E64, 0x4E61977C, 0x4B232428, 0x6FFFEBE5, 0xD0AF813C, 0x44C2A266, 0x5B61296E, 0xC04188A8, 0xD4A09051, 0x5D788B61, 0x3E202234, 0x58F9D7DF, 0xDEA27332, 0x31AE9A6C, 0x3E4B2F62, 0x902688B3, 0xD0937A3F, 0x5D7D8B58, 0x37241F35, 0x46F2C5BF, 0xD7956528, 0x1E918E76, 0x3442424A, 0x601774C3, 0xCB8F6630, 0x48698261, 0x333C2729, 0x3CECBF95, 0xC2885420, 0x11717B78, 0x4952673A, 0x3D1153CD, 0xC994602F, 0x2D496F6D, 0x31674418, 0x32E7CA6C, 0xA77D4318, 0x09526672, 0x6B6F963E, 0x2B1036D0, 0xCAA26E3C, 0x1B2A5A7B, 0x3798700F, 0x2BDFD94D, 0x8C773712, 0x043C606C, 0x9086B955, 0x281225C9, 0xC7AD8954, 0x141B4085, 0x53CB9C10, 0x26D3E63A, 0x757A3B11, 0x0131666F, 0xAB87BA6A, 0x2E151FBF, 0xC1AEA16A, 0x1721388C, 0x81ECBB17, 0x23C1EE30, 0x6688561E, 0x02317381, 0xA36A9566, 0x3B171FB9, 0xB5A5AF7A, 0x1B384395, 0xABFBC81D, 0x20AAEB28, 0x61987838, 0x05358299, 0x85405D4E, 0x45181FB5, 0xA695B083, 0x1C55569C, 0xCEFFCF1E, 0x1A8CDA24, 0x62A39755, 0x0A398FAE, 0x601A2A2C, 0x49161FB1, 0x9A8BAC8A, 0x23736DA0, 0xE0FFD61E, 0x136BAF23, 0x70ABAD6D, 0x143D95BD, 0x41030D16, 0x41151DAA, 0x938BAA94, 0x2E8A8BA7, 0xE6FFD921, 0x0C4A7D2D, 0x7CACAB70, 0x244093C3, 0x38020F11, 0x2F151CA3, 0x9293ABA1, 0x3995AAB7, 0xEDF7D924, 0x072F5842, 0x83AE9C66, 0x3F498EC7, 0x420D2812, 0x1E151F9B, 0x989CB0B2, 0x4697C5CE, 0xF5F0D626, 0x061B435B, 0x85B18A5B, 0x5F568BCD, 0x54245213, 0x12172593, 0x9FA1BAC0, 0x5291D4E1, 0xFAF0D123, 0x0711416F, 0x82B2765B, 0x84668FCB, 0x684D8212, 0x1318308A, 0xA3A2C2C6, 0x5F88D3EE, 0xFEF6C81B, 0x0B104276, 0x85B06A72, 0xA97896C3, 0x7C81AC19, 0x24194083, 0xA2A0C6C4, 0x6A82CCF1, 0xFFFFB910, 0x14173E77, 0x8BAE6992, 0xC6879BB4, 0x92B3C933, 0x3C1D4F7D, 0x9DA2CCBE, 0x7381C6E6, 0xFFFFB111, 0x26233975, 0x92AF6DAF, 0xDB949AA3, 0xADDBDD64, 0x5927597B, 0x99AAD4B9, 0x7687C6D5, 0xFCFFB736, 0x432D3A78, 0x98B371BD, 0xE5A0989E, 0xCCF2EAA0, 0x753C5C80, 0x9DB9E3BC, 0x7896CFBF, 0xF6FFCB72, 0x64323F81, 0x9CBC70B4, 0xE3AC9EAD, 0xE6FBF6CF, 0x8B5C5C85, 0xA7C8F4C2, 0x7AA6D9A3, 0xF0FFE2A9, 0x8032448D, 0xA4C970A0, 0xDBB5AAC6, 0xF7FEFDE7, 0xA3806187, 0xB0D6FFC9, 0x7FB5D686, 0xE7FFF0D2, 0x8D2F4E98, 0xABD7768D, 0xCFB9B4E1, 0xF8F8FFE7, 0xB29B7089, 0xB7E4FFCD, 0x8CB8BF65, 0xD5FFF0D7, 0x8D34609D, 0xB4E48385, 0xC3BAB0F1, 0xE2E8FEDC, 0xB5A07A8D, 0xBDEFFFD0, 0x9AAB9543, 0xB9FFE9C3, 0x80447497, 0xC0EF9C90, 0xBDB997E5, 0xC2CCFBD4, 0xAB8F7387, 0xC8F8FFD4, 0xA4936324, 0x98FFE5B3, 0x6F577E8A, 0xCEFABCA8, 0xC0BC71C7, 0x9EADF4D2, 0x916D5D7B, 0xD4FEFFD6, 0xA575390F, 0x76FFE4A6, 0x656A7F7D, 0xDDFFDABF, 0xC8BF4CA1, 0x8095E8CC, 0x744A3B66, 0xDAFFFFD6, 0x9D5B1E04, 0x5DFDDF9A, 0x6075787A, 0xECFFF1CD, 0xCEC42E7C, 0x7087D6BF, 0x5A311F49, 0xD4FFFFD0, 0x8E4B1100, 0x50F7D892, 0x68767788, 0xF6FFFDCE, 0xCDC31E65, 0x6E88C3A8, 0x4922153A, 0xC3FFFDC4, 0x7F410B03, 0x4BEED08B, 0x747682A0, 0xFDFFFEBF, 0xBCB61456, 0x7792B18B, 0x3E19153D, 0xB5FFF8B2, 0x733B0908, 0x4DE0C487, 0x827797BC, 0xFFFFF8AB, 0x9E9B0E50, 0x869E9F6E, 0x3714184D, 0xB5FFF09E, 0x67380C11, 0x56CFB285, 0x8F7EADD4, 0xFFFFED96, 0x78730A53, 0x9CA98F57, 0x310F1C69, 0xC8FFE18A, 0x5D35161D, 0x64BC9E84, 0x978BBFE7, 0xFFFFDD81, 0x5348075A, 0xB5B07F48, 0x290A2088, 0xE1FFCF75, 0x5335272B, 0x74AD877F, 0x9C9DCFF3, 0xFFFEC86E, 0x35260864, 0xC6B16F3E, 0x200422A6, 0xF8FCB95F, 0x47373A3C, 0x86A36F73, 0x9FB0D9FA, 0xFFF7B15B, 0x21110E70, 0xCDAB6139, 0x160027C1, 0xFFF09F4C, 0x3B3A4B4D, 0x989D5B5D, 0x9DB5D9FE, 0xFFEA994C, 0x1509177B, 0xC8A15C3C, 0x0E022BD1, 0xFFE1873B, 0x2F3E5460, 0xA8954F44, 0x96A6CEFF, 0xFFD7823C, 0x0C0A2784, 0xB9956343, 0x0B0731DB, 0xFFCE722C, 0x22415672, 0xB58C4A31, 0x8A88BAFF, 0xFAC56E2E, 0x060F398F, 0xA989764A, 0x0A0C3AE1, 0xFFB85F20, 0x17425787, 0xBF824826, 0x775FA3FF, 0xF1B66121, 0x03164B98, 0x9A818E4A, 0x0A1040D4, 0xE8974D14, 0x11405495, 0xBB74401F, 0x603D86F1, 0xD7A35414, 0x02195694, 0x8476943E, 0x171A46C5, 0xCC7D3D0C, 0x0D3E599E, 0xAE6C371C, 0x4A2D72E3, 0xC38F4C0E, 0x03205F96, 0x766A792A, 0x242B4FB8, 0xB66A2E06, 0x0D3E66AA, 0x9B663322, 0x3B2D6CDD, 0xB47B450A, 0x062B6E9C, 0x6E705D17 -glabel D_808676E0 - .word 0x00420271, 0xFFBE0000, 0x060006C2, 0x3E52C2FF, 0x000002BC, 0x00000000, 0x07000800, 0x007800FF, 0x005D0271, 0x00000000, 0x080006C2, 0x575200FF, 0x00BD01DB, 0xFFB20000, 0x07000419, 0x5E3FD9FF, 0x00BD01DB, 0x004E0000, 0x09000419, 0x5E3F27FF, 0x01AF001B, 0x00000000, 0x08000005, 0x6B3500FF, 0x0131001B, 0x01310000, 0x0A000005, 0x4C354CFF, 0x000002BC, 0x00000000, 0x09000800, 0x007800FF, 0x00420271, 0x00420000, 0x0A0006C2, 0x3E523EFF, 0x004E01DB, 0x00BD0000, 0x0B000419, 0x273F5EFF, 0x0000001B, 0x01AF0000, 0x0C000005, 0x00356BFF, 0x000002BC, 0x00000000, 0x0B000800, 0x007800FF, 0x00000271, 0x005D0000, 0x0C0006C2, 0x005257FF, 0xFFB201DB, 0x00BD0000, 0x0D000419, 0xD93F5EFF, 0xFECF001B, 0x01310000, 0x0E000005, 0xB4354CFF, 0x000002BC, 0x00000000, 0x0D000800, 0x007800FF, 0xFFBE0271, 0x00420000, 0x0E0006C2, 0xC2523EFF, 0xFF4301DB, 0x004E0000, 0x0F000419, 0xA23F27FF, 0xFE51001B, 0x00000000, 0x10000005, 0x953500FF, 0xFFA30271, 0x00000000, 0x100006C2, 0xA95200FF, 0xFF4301DB, 0xFFB20000, 0x11000419, 0xA23FD9FF, 0xFE51001B, 0x00000000, 0x00000005, 0x953500FF, 0xFF4301DB, 0xFFB20000, 0x01000419, 0xA23FD9FF, 0xFECF001B, 0xFECF0000, 0x02000005, 0xB435B4FF, 0xFFA30271, 0x00000000, 0x000006C2, 0xA95200FF, 0x000002BC, 0x00000000, 0x01000800, 0x007800FF, 0xFFBE0271, 0xFFBE0000, 0x020006C2, 0xC252C2FF, 0xFFB201DB, 0xFF430000, 0x03000419, 0xD93FA2FF, 0x0000001B, 0xFE510000, 0x04000005, 0x003595FF, 0x000002BC, 0x00000000, 0x03000800, 0x007800FF, 0x00000271, 0xFFA30000, 0x040006C2, 0x0052A9FF, 0x004E01DB, 0xFF430000, 0x05000419, 0x273FA2FF -glabel D_808678E0 - .word 0x0000001B, 0xFE510000, 0x04000005, 0x003595FF, 0x004E01DB, 0xFF430000, 0x05000419, 0x273FA2FF, 0x0131001B, 0xFECF0000, 0x06000005, 0x4C35B4FF, 0x00000271, 0xFFA30000, 0x040006C2, 0x0052A9FF, 0x000002BC, 0x00000000, 0x05000800, 0x007800FF, 0x00420271, 0xFFBE0000, 0x060006C2, 0x3E52C2FF, 0x00BD01DB, 0xFFB20000, 0x07000419, 0x5E3FD9FF, 0x01AF001B, 0x00000000, 0x08000005, 0x6B3500FF, 0xFFBE0271, 0x00420000, 0x060006C2, 0xC2523EFF, 0x000002BC, 0x00000000, 0x07000800, 0x007800FF, 0xFFA30271, 0x00000000, 0x080006C2, 0xA95200FF -glabel D_80867990 - .word 0xE7000000, 0x00000000, 0xE3001001, 0x00000000, 0xD7000002, 0xFFFFFFFF, 0xFD900000 -.word D_808666E0 -.word 0xF5900000, 0x0705BC51, 0xE6000000, 0x00000000, 0xF3000000, 0x073FF200, 0xE7000000, 0x00000000, 0xF5880800, 0x0005BC51, 0xF2000000, 0x0007C0FC, 0xFD900000 -.word D_80866EE0 -.word 0xF5900100, 0x07058051, 0xE6000000, 0x00000000, 0xF3000000, 0x073FF200, 0xE7000000, 0x00000000, 0xF5880900, 0x01058051, 0xF2000000, 0x0107C0FC, 0xFC262A60, 0x350CE37F, 0xE200001C, 0x0C184B50, 0xD9F2FBFF, 0x00000000, 0xD9FFFFFF, 0x00020000, 0xDF000000, 0x00000000 -glabel D_80867A40 - .word 0x01020040 -.word D_808676E0 -.word 0x06000204, 0x00000406, 0x06060408, 0x0006080A, 0x060A080C, 0x00040E10, 0x06041008, 0x00081012, 0x0608120C, 0x000C1214, 0x06101618, 0x00101812, 0x0612181A, 0x00121A14, 0x06141A1C, 0x00181E20, 0x0618201A, 0x001A2022, 0x061A221C, 0x001C2224, 0x06202622, 0x00222628, 0x06222824, 0x002A2C2E, 0x06303234, 0x0030342C, 0x062C3436, 0x002C362E, 0x062E3638, 0x00343A3C, 0x06343C36, 0x00363C3E, 0x05363E38, 0x00000000, 0x0100B016 -.word D_808678E0 -.word 0x06000204, 0x0006080A, 0x06060A02, 0x00020A0C, 0x06020C04, 0x00040C0E, 0x05101214, 0x00000000, 0xDF000000, 0x00000000 -glabel Arrow_Fire_InitVars - .word 0x010A0700, 0x02000010, 0x00010000, 0x0000016C -.word ArrowFire_Init -.word ArrowFire_Destroy -.word ArrowFire_Update -.word ArrowFire_Draw -glabel D_80867B20 - .word 0x30F407D0, 0x00000000, 0x00000000, 0x00000000 - diff --git a/data/overlays/actors/z_arrow_fire.reloc.s b/data/overlays/actors/z_arrow_fire.reloc.s deleted file mode 100644 index a067183f5f..0000000000 --- a/data/overlays/actors/z_arrow_fire.reloc.s +++ /dev/null @@ -1,11 +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 purposee registers - -.section .rodata -glabel D_80867BD0 - -.incbin "baserom/ovl_Arrow_Fire", 0x1EC0, 0x00000100 diff --git a/data/overlays/actors/z_arrow_fire.rodata.s b/data/overlays/actors/z_arrow_fire.rodata.s deleted file mode 100644 index 03855e9754..0000000000 --- a/data/overlays/actors/z_arrow_fire.rodata.s +++ /dev/null @@ -1,53 +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 purposee registers - -.section .rodata - -glabel D_80867B30 - .asciz "../z_arrow_fire.c" - .balign 4 - -glabel D_80867B44 - .word 0x22BEC3CC, 0xC722203D, 0x2025730A, 0x00000000 -glabel D_80867B54 - .word 0xBEC3CCC7, 0x00000000 -glabel D_80867B5C - .asciz "../z_arrow_fire.c" - .balign 4 - -glabel D_80867B70 - .asciz "../z_arrow_fire.c" - .balign 4 - -glabel D_80867B84 - .asciz "../z_arrow_fire.c" - .balign 4 - -glabel D_80867B98 - .word 0x446D8000 -glabel D_80867B9C - .word 0x3EAAAAAB -glabel D_80867BA0 - .word 0x3D2AAAAB -glabel D_80867BA4 - .word 0x3DCCCCCD -glabel D_80867BA8 - .word 0x3D2AAAAB -glabel D_80867BAC - .word 0x38C90FDB -glabel D_80867BB0 - .word 0x38C90FDB -glabel D_80867BB4 - .word 0x38C90FDB -glabel D_80867BB8 - .word 0x3C23D70A -glabel D_80867BBC - .word 0x44BB8000 -glabel D_80867BC0 - .word 0x3E4CCCCD, 0x00000000, 0x00000000, 0x00000000 - - diff --git a/data/overlays/actors/z_arrow_ice.data.s b/data/overlays/actors/z_arrow_ice.data.s deleted file mode 100644 index 1da332a935..0000000000 --- a/data/overlays/actors/z_arrow_ice.data.s +++ /dev/null @@ -1,38 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers - -.section .data - -glabel D_808686C0 - .word 0x00061507, 0x00000000, 0x295A2B08, 0x10030F03, 0x0D070006, 0x00031625, 0x3F230012, 0x79590000, 0x00102C2A, 0x254A1B0E, 0xAFF66600, 0x00467E29, 0x08020000, 0x03383E0B, 0x0501000A, 0x31211C05, 0x00031C27, 0x4CA92F13, 0xB2EF5500, 0x057EBF37, 0x00000000, 0x0E493F13, 0x00000002, 0x335C3E03, 0x00000E07, 0x3C761200, 0x447E2200, 0x00426710, 0x00000000, 0x071C2208, 0x00000168, 0xE18F0F00, 0x00060E00, 0x0A100000, 0x0514022D, 0x1B020400, 0x00000000, 0x093A3F0A, 0x050010AE, 0xDA360000, 0x00070500, 0x00000000, 0x00001461, 0x3E050024, 0x24000000, 0x184E3755, 0x9132043C, 0x2F000000, 0x12020A54, 0x3C000200, 0x00000F3E, 0x2B041159, 0x2C000000, 0x030B22CE, 0xF9420000, 0x00000301, 0x371160EF, 0xAC6D2B00, 0x00000008, 0x05000D27, 0x06000000, 0x00001A91, 0x760B0000, 0x000B030A, 0x747DB0BD, 0xBDA31D00, 0x00000000, 0x00000000, 0x00000511, 0x01000209, 0x03020015, 0x583A0010, 0xC1E0892D, 0x532D0000, 0x03160600, 0x00050001, 0x15142E4E, 0x07000500, 0x100D004C, 0xB65C001B, 0xB2DF9417, 0x00000020, 0x57420400, 0x45882F00, 0x18093B3E, 0x01182F0D, 0x1405003F, 0xB75B001E, 0x5DC2E14F, 0x00000161, 0xBC4A005A, 0xECF84A00, 0x0011330F, 0x0044591C, 0x01001C7C, 0xB122001F, 0x5DE4FF71, 0x00000177, 0xBA3218D9, 0xFFC41700, 0x1E7B5A1C, 0x2B769635, 0x0044D5FA, 0x9E000530, 0xC7FFCE35, 0x00000035, 0x663441CF, 0xC9380000, 0x3D733C28, 0x3E709726, 0x0086FAF1, 0x9B170D4C, 0xC9812700, 0x000E1A02, 0x4C642544, 0x2B000000, 0x0D0E0508, 0x0A252F03, 0x00335297, 0xC75B014E, 0x77470600, 0x00160F00, 0x3A350016, 0x29070000, 0x0C3A3911, 0x00000003, 0x0100004B, 0x8F4B051C, 0x7F6C1C00, 0x00000000, 0x00000437, 0x2E030001, 0x2A6E6B2C, 0x0604000E, 0x0B000004, 0x19350814, 0x3E63813D, 0x13000000, 0x00000117, 0x06000000, 0x14362911, 0x312E021F, 0x13000000, 0x010C000C, 0x10B9EF72, 0x2D010000, 0x040C0C10, 0x02000000, 0x33410306, 0x3B30071D, 0x07000000, 0x00000000, 0x1BC2A129, 0x0D000000, 0x050E1112, 0x0100002E, 0xD2C22E00, 0x21593403, 0x00000000, 0x01010000, 0x0E451B00, 0x00000000, 0x0000060D, 0x00000061, 0xFFEA2E00, 0x3DA04200, 0x00000000, 0x06140B00, 0x00040200, 0x00000000, 0x00061B0C, 0x00000037, 0x8D620500, 0x2A8F5801, 0x00000000, 0x082E3404, 0x00000000, 0x00000003, 0x0A201B02, 0x00000000, 0x06000000, 0x11826503, 0x00060400, 0x07303402, 0x07010007, 0x2F1E0B0A, 0x09080000, 0x03000000, 0x00000000, 0x07452500, 0x0E361100, 0x000B0A00, 0x06000018, 0x3E170600, 0x00060F0D, 0x3E190000, 0x00000000, 0x00000000, 0x21360700, 0x00000000, 0x00000007, 0x09000000, 0x0A857124, 0x703C0000, 0x01000000, 0x00000000, 0x08050000, 0x00000000, 0x00000000, 0x00000000, 0x32D97112, 0x4A1B0001, 0x02050000, 0x00000000, 0x021A0A00, 0x00000613, 0x07000000, 0x00000000, 0x1E5D1700, 0x04000000, 0x37550400, 0x00000000, 0x14300600, 0x00003E5B, 0x08000000, 0x00000000, 0x2F2F0000, 0x00000007, 0x90840300, 0x0F070000, 0x06070000, 0x00055A62, 0x00000000, 0x00000020, 0xA77B0700, 0x0106000F, 0x612D0006, 0x1B030000, 0x00000001, 0x0000211A, 0x00000000, 0x0000002E, 0x944A0103, 0x3B390200, 0x04000011, 0x14000005, 0x302F0D10, 0x01000000, 0x00000000, 0x00000009, 0x10000015, 0x5D290000, 0x00000015, 0x09000027, 0x73510F09, 0x37410700, 0x00061408, 0x00000000, 0x25582D09, 0x12020E03, 0x0C070007, 0x00031627, 0x41240011, 0x795B0000, 0x00102D29, 0x244B1C0D, 0xB0F76600, 0x00467C28, 0x08020000, 0x02383E0B, 0x0401000A, 0x32231C04, 0x00031B28, 0x4CA83112, 0xB2EF5500, 0x057EBE38, 0x00000000, 0x0D493D13, 0x00000002, 0x325C3F03, 0x00000E08, 0x3D761200, 0x457F2200, 0x0043660F, 0x00000000, 0x071D2208, 0x00000168, 0xE1901000, 0x00070E00, 0x09110000, 0x0515022D, 0x1B020400, 0x00000000, 0x093B3E09, 0x050011AE, 0xD9370000, 0x00070500, 0x00000000, 0x00001462, 0x3E050024, 0x25000000, 0x184E3554, 0x9431043C, 0x2E000000, 0x12010955, 0x3C000300, 0x0000103E, 0x2B04115A, 0x2D000000, 0x030B22CE, 0xF9420000, 0x00000301, 0x361161EF, 0xAC6B2B00, 0x00000008, 0x05000D27, 0x07000000, 0x00001A8F, 0x760B0000, 0x000B030A, 0x727DB1BD, 0xBCA21C00, 0x00000000, 0x00000000, 0x00000610, 0x00000208, 0x03030016, 0x57390010, 0xC1E1892E, 0x522C0000, 0x03160600, 0x00060001, 0x14142F4E, 0x07000500, 0x100E004B, 0xB55C001B, 0xB0DD9416, 0x0000001F, 0x57430500, 0x468A3000, 0x16093B3E, 0x01192F0D, 0x1405003E, 0xB65B001D, 0x5CC1E04E, 0x0000005E, 0xBC4B0058, 0xEBFA4B00, 0x0011340E, 0x0045591C, 0x02001C7C, 0xB223001E, 0x5CE5FF71, 0x00000176, 0xB93216D8, 0xFFC21700, 0x1D7B5B1C, 0x2B759636, 0x0041D4FC, 0x9D000530, 0xC7FFCE36, 0x00000036, 0x663540CE, 0xC6360000, 0x3C743E29, 0x3E719827, 0x0085FAF0, 0x9B160D4E, 0xC9812600, 0x000F1A03, 0x4B642646, 0x2B000000, 0x0D0E0608, 0x0A253002, 0x00345299, 0xC85B014E, 0x75470600, 0x00160F00, 0x39350015, 0x29070000, 0x0C3A3911, 0x00000003, 0x0100004B, 0x914B051E, 0x7D6C1C01, 0x00000000, 0x00000437, 0x2E030001, 0x2A6F6A2A, 0x0604000E, 0x0B000003, 0x1A350814, 0x3E63813E, 0x13000000, 0x00000118, 0x07000000, 0x13382911, 0x302E0320, 0x14000000, 0x010D000C, 0x0FB9EE73, 0x2F000000, 0x040B0C11, 0x02000000, 0x36440307, 0x3B30071D, 0x07000000, 0x00000000, 0x1ABF9F29, 0x0E000000, 0x050F1112, 0x0100002D, 0xD3C42B00, 0x22593404, 0x00000000, 0x01010000, 0x0E451B00, 0x00000000, 0x0000070C, 0x00000061, 0xFFED2F00, 0x3EA04300, 0x00000000, 0x05140B00, 0x00030200, 0x00000000, 0x00061C0B, 0x00000037, 0x8F640500, 0x2A8F5901, 0x00000000, 0x082D3504, 0x00000000, 0x00010003, 0x0A201B02, 0x00000000, 0x07000000, 0x11826503, 0x00050400, 0x072F3503, 0x07010007, 0x2F1E0C0B, 0x09080000, 0x03000000, 0x00000000, 0x07462500, 0x0E361100, 0x000B0900, 0x04000018, 0x3E160600, 0x00060F0B, 0x3D190000, 0x00000000, 0x00000000, 0x21370600, 0x00000000, 0x00000007, 0x09000000, 0x0B866F22, 0x713C0000, 0x02000000, 0x00000000, 0x08060000, 0x00000000, 0x00000000, 0x00000000, 0x30D76F12, 0x4B1A0001, 0x02050000, 0x00000000, 0x021A0A00, 0x00000714, 0x08000000, 0x00000000, 0x1E5C1700, 0x03000000, 0x36560400, 0x00000000, 0x15300600, 0x00003F5D, 0x07000000, 0x00000000, 0x2E2F0000, 0x00000008, 0x8F840300, 0x0F060000, 0x06070000, 0x00065B61, 0x00000000, 0x00000020, 0xA67C0700, 0x0006000E, 0x612D0006, 0x1B030000, 0x00000001, 0x0001211B, 0x00000000, 0x0000002F, 0x93490103, 0x3B390200, 0x04000011, 0x13000005, 0x2F2E0C11, 0x02000000, 0x00000000, 0x00000008, 0x14030015, 0x5D2C0000, 0x00000115, 0x08000027, 0x724F0F0A, 0x353D0600 -glabel D_80868EC0 - .word 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x02030404, 0x04040303, 0x03030303, 0x03020202, 0x02020201, 0x01010000, 0x00000000, 0x01010305, 0x090B0D0D, 0x0C0B0A0A, 0x0A0A0B0A, 0x09080707, 0x07070707, 0x07070705, 0x04030201, 0x0304070B, 0x11141717, 0x16141313, 0x14151514, 0x110D0B0B, 0x0C0D0F12, 0x13141413, 0x110C0905, 0x07070B12, 0x181E2121, 0x201F1F20, 0x2225221D, 0x17120F0F, 0x13171D23, 0x292D2D2A, 0x2219120A, 0x07080C13, 0x1B202223, 0x22232629, 0x2C2B261F, 0x17121112, 0x18202B36, 0x4046453D, 0x3022150C, 0x07080D15, 0x1C202325, 0x272A2E33, 0x3431281E, 0x16121217, 0x202E3F4F, 0x595D5A4E, 0x3B27170C, 0x07090F16, 0x1C202327, 0x2B32383C, 0x3B34291E, 0x1613161E, 0x2D425866, 0x6D6E6856, 0x3F28160B, 0x070A1117, 0x1C20252A, 0x333B4245, 0x41382C21, 0x18161B28, 0x3D586E7A, 0x7D7A6F58, 0x3C231309, 0x070C1318, 0x1E222932, 0x3C464E4F, 0x4A413529, 0x1F1D2232, 0x4C6A8189, 0x88816D50, 0x331D0E07, 0x090F181F, 0x252B343F, 0x4A555E5F, 0x5C524537, 0x2B272D40, 0x5D7C9197, 0x91816444, 0x29160B07, 0x0F19222A, 0x323B4550, 0x5D6D787D, 0x796B5B49, 0x3C373E52, 0x7190A2A2, 0x93785537, 0x20110A0A, 0x1D28343E, 0x47505A64, 0x738698A1, 0x9C8D7761, 0x534E566D, 0x8DA6B0A6, 0x8D69472C, 0x190F0E13, 0x36434F57, 0x5F676E77, 0x869BB0BC, 0xBBAF9A84, 0x74717D93, 0xADBCBBA5, 0x835E412A, 0x1D1A1E27, 0x5360696E, 0x73777C82, 0x8C9EB3C5, 0xCECBBEAB, 0x9F9FA9BC, 0xCACEBFA0, 0x7A593F2F, 0x282B3545, 0x6F767778, 0x78787A7F, 0x8593A8C2, 0xD6DDDAD2, 0xCCCBD2DA, 0xDFD7BE9B, 0x775A473C, 0x3A445463, 0x7E7D7875, 0x716D6D71, 0x78849BBA, 0xD8EAEDED, 0xEBEBEDED, 0xEBDABB97, 0x7862554F, 0x5562727B, 0x7F766E67, 0x625D5C5F, 0x697991B2, 0xD6EFF7F5, 0xF3F4F7F7, 0xEDD5B496, 0x7F70696B, 0x74808787, 0x796C5F57, 0x514D4C52, 0x5E738EAF, 0xD1EAF1ED, 0xEBEDF4F4, 0xE6CCB099, 0x8A818087, 0x91959288, 0x7261534A, 0x4541434A, 0x597290AE, 0xCADCE0DC, 0xDADDE5E6, 0xD9C2AD9D, 0x9390949D, 0xA2A09584, 0x6C5A4B41, 0x3B3B3D46, 0x57718EA9, 0xBDC9CBCA, 0xCACED2CF, 0xC3B3A398, 0x92939AA1, 0xA39D907F, 0x6955453C, 0x38373C46, 0x58718DA5, 0xB7C1C5C6, 0xC9CCCAC2, 0xB4A59A91, 0x8D91979D, 0x9E998D7D, 0x6752423A, 0x38383C46, 0x576F8AA2, 0xB3BFC6CB, 0xCECCC5B7, 0xA7988D86, 0x83868E95, 0x98968D7D, 0x644F403B, 0x393A3E47, 0x566C859C, 0xAFBDC7CE, 0xCEC8BCAA, 0x9A8A7F78, 0x777A838D, 0x94958C7A, 0x5E4C423E, 0x3E3E4047, 0x54677D94, 0xA9BAC7CD, 0xC9C0AF9F, 0x8E80746D, 0x6B707A86, 0x91928975, 0x5A4B4543, 0x43434448, 0x5161768C, 0xA3B5C3C7, 0xC1B4A394, 0x85776D66, 0x63687480, 0x8C8D836F, 0x574D4848, 0x4848484A, 0x505D7087, 0x9DB1BDBE, 0xB6A9998B, 0x7F746A63, 0x62656F7B, 0x84847A67, 0x554F4D4D, 0x4D4D4E4F, 0x535F6F85, 0x9BAEB8B8, 0xAFA29488, 0x7E756B65, 0x62656D75, 0x7B797061, 0x56535353, 0x5556585A, 0x6069788A, 0x9EAEB6B4, 0xAB9F948A, 0x817A726B, 0x67686B6F, 0x726E665D, 0x585A5C5E, 0x62676C70, 0x767E8A98, 0xA6B2B6B4, 0xACA1978E, 0x89837C76, 0x716E6C6C, 0x6A66605C, 0x5F62686F, 0x7680888F, 0x94999FA7, 0xAFB6B7B5, 0xAEA49C96, 0x928E8983, 0x7D76716B, 0x67625F5D, 0x676D7681, 0x8E9BA6AD, 0xB0B1B1B2, 0xB4B7B9B6, 0xB1A8A29E, 0x9B999590, 0x877F7770, 0x6A656364, 0x71788392, 0xA3B2BDC3, 0xC3BFBAB7, 0xB6B8B9B7, 0xB3ABA6A3, 0xA3A19E98, 0x91888079, 0x736E6C6D, 0x7A818C9C, 0xAFBFC9CE, 0xCBC4BDB7, 0xB7B8BBBA, 0xB4ACA6A4, 0xA4A5A4A0, 0x9A958F89, 0x837E7A79, 0x868A94A3, 0xB5C4CED0, 0xCCC5BEBA, 0xBBBFC1BF, 0xB7AEA8A5, 0xA7A9ABAC, 0xACAAA8A4, 0x9D968D88, 0x8F9199A7, 0xB7C5CCCD, 0xC9C4C0BF, 0xC3C7C8C2, 0xB7ADA7A6, 0xA8ADB3BA, 0xBFC3C4BF, 0xB7AB9E94, 0x97979FAB, 0xB9C3C8C9, 0xC7C5C4C7, 0xCCCFCBC2, 0xB6ADA8A8, 0xADB5C1CD, 0xD8E0E0D9, 0xCCBBAB9E, 0x9C9DA4AE, 0xBAC1C5C6, 0xC6C7CAD0, 0xD4D3CBC0, 0xB5ADABAD, 0xB6C2D2E3, 0xF1F9F8ED, 0xDAC5B2A3, 0xA2A4ABB4, 0xBBC1C4C5, 0xC8CCD2D7, 0xD8D3CABE, 0xB4B0B0B6, 0xC1D2E5F7, 0xFFFFFFF5, 0xE0C9B6A9, 0xA9ABB1B7, 0xBDC1C4C7, 0xCBD1D8DC, 0xDAD4C9BF, 0xB7B4B7BF, 0xCEE1F5FF, 0xFFFFFFF5, 0xDEC8B7AD, 0xB0B2B7BC, 0xC0C3C7CB, 0xD1D8DEDF, 0xDCD6CDC4, 0xBEBBBFC9, 0xD9EDFFFF, 0xFFFFFFEE, 0xD9C6B9B1, 0xB6BABEC2, 0xC5C8CCD2, 0xD8DFE3E4, 0xE1DBD4CC, 0xC6C4C8D2, 0xE2F6FFFF, 0xFFFFF7E5, 0xD3C5BBB6, 0xBEC2C6C9, 0xCDD0D5DA, 0xE1E6EAEB, 0xE9E4DED6, 0xD0CED1DB, 0xEAFAFFFF, 0xFFFDEEDD, 0xCFC5BFBD, 0xC7CBCFD3, 0xD6DADEE3, 0xE9EFF4F7, 0xF4EFE7E0, 0xDBD8DBE4, 0xF2FFFFFF, 0xFFF4E6D8, 0xCEC7C4C4, 0xD1D5D9DD, 0xE0E3E7EB, 0xF0F7FEFF, 0xFFFAF2EA, 0xE5E3E6EE, 0xFAFFFFFF, 0xFAEDE0D7, 0xD0CDCCCD, 0xDCE0E3E6, 0xE9EBEDF0, 0xF5FBFFFF, 0xFFFFFBF4, 0xEFEEF2F9, 0xFFFFFFFE, 0xF4E8DFD8, 0xD4D3D5D7, 0xE6E9EBED, 0xEEEFF1F2, 0xF5F9FFFF, 0xFFFFFFFD, 0xFAFAFDFF, 0xFFFFFFFA, 0xF0E7E1DD, 0xDBDCDEE2, 0xEDEFEFF0, 0xF0F0F0F1, 0xF2F5FAFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFF7, 0xEFE9E5E2, 0xE2E4E7EB, 0xF1F1F0F0, 0xEFEEEEEF, 0xF0F3F6FC, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFDF6, 0xF0ECEAE8, 0xEAECEFF1, 0xF2F1EFEF, 0xEEEDEDED, 0xEFF1F5FA, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFBF6, 0xF2F0EFEF, 0xF1F2F3F3, 0xF3F1EFEE, 0xEDEDEDED, 0xEFF2F5FA, 0xFEFFFFFF, 0xFFFFFFFF, 0xFFFDFAF7, 0xF5F4F4F5, 0xF6F7F6F5, 0xF3F1F0EF, 0xEEEEEEEF, 0xF1F3F6FA, 0xFDFFFFFF, 0xFFFFFFFF, 0xFFFCFAF8, 0xF7F6F7F8, 0xF8F8F7F5, 0xF5F3F2F1, 0xF0F0F0F1, 0xF3F5F8FA, 0xFCFDFDFD, 0xFDFEFEFE, 0xFDFBFAF9, 0xF8F9F9FA, 0xFAF9F8F7, 0xF7F5F3F3, 0xF3F2F3F4, 0xF5F7F9FB, 0xFDFDFEFE, 0xFEFEFEFD, 0xFCFBFAFA, 0xF9FAFAFB, 0xFBFAF9F8, 0xF8F7F6F5, 0xF5F5F5F6, 0xF7F9FAFC, 0xFDFEFEFF, 0xFFFFFEFD, 0xFDFBFBFA, 0xFAFAFBFB, 0xFBFBFBFA, 0xFAF9F8F7, 0xF7F7F8F8, 0xF9FAFBFC, 0xFEFFFFFF, 0xFFFFFEFD, 0xFCFCFBFB, 0xFBFBFBFC, 0xFCFCFCFB, 0xFBFAFAFA, 0xFAFAFAFA, 0xFBFBFCFD, 0xFEFFFFFF, 0xFFFFFEFE, 0xFDFCFCFC, 0xFBFCFCFD, 0xFDFDFDFC, 0xFCFCFBFB, 0xFBFBFBFC, 0xFCFCFDFE, 0xFFFFFFFF, 0xFFFFFFFE, 0xFEFDFDFD, 0xFDFDFDFD, 0xFEFEFDFD, 0xFDFDFDFD, 0xFDFDFDFD, 0xFDFDFEFE, 0xFFFFFFFF, 0xFFFFFFFE, 0xFEFEFEFD, 0xFDFEFEFE, 0xFEFEFEFE, 0xFEFEFEFE, 0xFEFEFEFE, 0xFEFEFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFE, 0xFEFEFFFF, 0xFFFFFFFE, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF -glabel D_808696C0 - .word 0x00420271, 0xFFBE0000, 0x060006C2, 0x3E52C2FF, 0x000002BC, 0x00000000, 0x07000800, 0x007800FF, 0x005D0271, 0x00000000, 0x080006C2, 0x575200FF, 0x00BD01DB, 0xFFB20000, 0x07000419, 0x5E3FD9FF, 0x00BD01DB, 0x004E0000, 0x09000419, 0x5E3F27FF, 0x01AF001B, 0x00000000, 0x08000005, 0x6B3500FF, 0x0131001B, 0x01310000, 0x0A000005, 0x4C354CFF, 0x000002BC, 0x00000000, 0x09000800, 0x007800FF, 0x00420271, 0x00420000, 0x0A0006C2, 0x3E523EFF, 0x004E01DB, 0x00BD0000, 0x0B000419, 0x273F5EFF, 0x0000001B, 0x01AF0000, 0x0C000005, 0x00356BFF, 0x000002BC, 0x00000000, 0x0B000800, 0x007800FF, 0x00000271, 0x005D0000, 0x0C0006C2, 0x005257FF, 0xFFB201DB, 0x00BD0000, 0x0D000419, 0xD93F5EFF, 0xFECF001B, 0x01310000, 0x0E000005, 0xB4354CFF, 0x000002BC, 0x00000000, 0x0D000800, 0x007800FF, 0xFFBE0271, 0x00420000, 0x0E0006C2, 0xC2523EFF, 0xFF4301DB, 0x004E0000, 0x0F000419, 0xA23F27FF, 0xFE51001B, 0x00000000, 0x10000005, 0x953500FF, 0xFFA30271, 0x00000000, 0x100006C2, 0xA95200FF, 0xFF4301DB, 0xFFB20000, 0x11000419, 0xA23FD9FF, 0xFE51001B, 0x00000000, 0x00000005, 0x953500FF, 0xFF4301DB, 0xFFB20000, 0x01000419, 0xA23FD9FF, 0xFECF001B, 0xFECF0000, 0x02000005, 0xB435B4FF, 0xFFA30271, 0x00000000, 0x000006C2, 0xA95200FF, 0x000002BC, 0x00000000, 0x01000800, 0x007800FF, 0xFFBE0271, 0xFFBE0000, 0x020006C2, 0xC252C2FF, 0xFFB201DB, 0xFF430000, 0x03000419, 0xD93FA2FF, 0x0000001B, 0xFE510000, 0x04000005, 0x003595FF, 0x000002BC, 0x00000000, 0x03000800, 0x007800FF, 0x00000271, 0xFFA30000, 0x040006C2, 0x0052A9FF, 0x004E01DB, 0xFF430000, 0x05000419, 0x273FA2FF -glabel D_808698C0 - .word 0x0000001B, 0xFE510000, 0x04000005, 0x003595FF, 0x004E01DB, 0xFF430000, 0x05000419, 0x273FA2FF, 0x0131001B, 0xFECF0000, 0x06000005, 0x4C35B4FF, 0x00000271, 0xFFA30000, 0x040006C2, 0x0052A9FF, 0x000002BC, 0x00000000, 0x05000800, 0x007800FF, 0x00420271, 0xFFBE0000, 0x060006C2, 0x3E52C2FF, 0x00BD01DB, 0xFFB20000, 0x07000419, 0x5E3FD9FF, 0x01AF001B, 0x00000000, 0x08000005, 0x6B3500FF, 0xFFBE0271, 0x00420000, 0x060006C2, 0xC2523EFF, 0x000002BC, 0x00000000, 0x07000800, 0x007800FF, 0xFFA30271, 0x00000000, 0x080006C2, 0xA95200FF -glabel D_80869970 - .word 0xE7000000, 0x00000000, 0xE3001001, 0x00000000, 0xD7000002, 0xFFFFFFFF, 0xFD900000 -.word D_80868EC0 -.word 0xF5900000, 0x0705BC51, 0xE6000000, 0x00000000, 0xF3000000, 0x073FF200, 0xE7000000, 0x00000000, 0xF5880800, 0x0005BC51, 0xF2000000, 0x0007C0FC, 0xFD900000 -.word D_808686C0 -.word 0xF5900100, 0x0705B85D, 0xE6000000, 0x00000000, 0xF3000000, 0x073FF200, 0xE7000000, 0x00000000, 0xF5880900, 0x0105B85D, 0xF2000000, 0x0107C0FC, 0xFC262A60, 0x350CF37F, 0xE200001C, 0x0C184B50, 0xD9F2FBFF, 0x00000000, 0xD9FFFFFF, 0x00020000, 0xDF000000, 0x00000000 -glabel D_80869A20 - .word 0x01020040 -.word D_808696C0 -.word 0x06000204, 0x00000406, 0x06060408, 0x0006080A, 0x060A080C, 0x00040E10, 0x06041008, 0x00081012, 0x0608120C, 0x000C1214, 0x06101618, 0x00101812, 0x0612181A, 0x00121A14, 0x06141A1C, 0x00181E20, 0x0618201A, 0x001A2022, 0x061A221C, 0x001C2224, 0x06202622, 0x00222628, 0x06222824, 0x002A2C2E, 0x06303234, 0x0030342C, 0x062C3436, 0x002C362E, 0x062E3638, 0x00343A3C, 0x06343C36, 0x00363C3E, 0x05363E38, 0x00000000, 0x0100B016 -.word D_808698C0 -.word 0x06000204, 0x0006080A, 0x06060A02, 0x00020A0C, 0x06020C04, 0x00040C0E, 0x05101214, 0x00000000, 0xDF000000, 0x00000000 -glabel Arrow_Ice_InitVars - .word 0x010B0700, 0x02000010, 0x00010000, 0x0000016C -.word ArrowIce_Init -.word ArrowIce_Destroy -.word ArrowIce_Update -.word ArrowIce_Draw -glabel D_80869B00 - .word 0x30F407D0, 0x00000000, 0x00000000, 0x00000000 - diff --git a/data/overlays/actors/z_arrow_ice.reloc.s b/data/overlays/actors/z_arrow_ice.reloc.s deleted file mode 100644 index cfb049df5a..0000000000 --- a/data/overlays/actors/z_arrow_ice.reloc.s +++ /dev/null @@ -1,11 +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 purposee registers - -.section .rodata -glabel D_80869BB0 - -.incbin "baserom/ovl_Arrow_Ice", 0x1EE0, 0x00000100 diff --git a/data/overlays/actors/z_arrow_ice.rodata.s b/data/overlays/actors/z_arrow_ice.rodata.s deleted file mode 100644 index 8a8a7a26e9..0000000000 --- a/data/overlays/actors/z_arrow_ice.rodata.s +++ /dev/null @@ -1,57 +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 purposee registers - -.section .rodata - -glabel D_80869B10 - - .asciz "../z_arrow_ice.c" - .balign 4 - -glabel D_80869B24 - .word 0x22BEC3CC, 0xC722203D, 0x2025730A, 0x00000000 -glabel D_80869B34 - .word 0xBEC3CCC7, 0x00000000 -glabel D_80869B3C - - .asciz "../z_arrow_ice.c" - .balign 4 - -glabel D_80869B50 - - .asciz "../z_arrow_ice.c" - .balign 4 - -glabel D_80869B64 - - .asciz "../z_arrow_ice.c" - .balign 4 - -glabel D_80869B78 - .word 0x446D8000 -glabel D_80869B7C - .word 0x3EAAAAAB -glabel D_80869B80 - .word 0x3D2AAAAB -glabel D_80869B84 - .word 0x3DCCCCCD -glabel D_80869B88 - .word 0x3D2AAAAB -glabel D_80869B8C - .word 0x38C90FDB -glabel D_80869B90 - .word 0x38C90FDB -glabel D_80869B94 - .word 0x38C90FDB -glabel D_80869B98 - .word 0x3C23D70A -glabel D_80869B9C - .word 0x44BB8000 -glabel D_80869BA0 - .word 0x3E4CCCCD, 0x00000000, 0x00000000, 0x00000000 - - diff --git a/data/overlays/actors/z_arrow_light.data.s b/data/overlays/actors/z_arrow_light.data.s deleted file mode 100644 index 1f9e7f0af5..0000000000 --- a/data/overlays/actors/z_arrow_light.data.s +++ /dev/null @@ -1,38 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers - -.section .data - -glabel D_8086A6B0 - .word 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000102, 0x01000001, 0x00000000, 0x00000000, 0x00010000, 0x00000000, 0x00000001, 0x00000000, 0x00000204, 0x02000101, 0x00000000, 0x00000000, 0x00010101, 0x00000001, 0x00000001, 0x00000000, 0x00000307, 0x03010102, 0x00000000, 0x00000000, 0x01010102, 0x00000002, 0x01010001, 0x00000000, 0x00010509, 0x04010103, 0x01000000, 0x00000000, 0x01020202, 0x00000104, 0x03020101, 0x00000000, 0x0001060C, 0x06010103, 0x01000000, 0x00000000, 0x02020202, 0x00000206, 0x05040101, 0x00000000, 0x0001080F, 0x07010103, 0x01000001, 0x00000000, 0x03030202, 0x00010408, 0x07060201, 0x00000000, 0x00010911, 0x08010103, 0x01000001, 0x00000001, 0x04040303, 0x0101050B, 0x0A080301, 0x00000000, 0x00020B14, 0x0A010103, 0x01000001, 0x00010102, 0x06060403, 0x0203070D, 0x0C0A0401, 0x00000000, 0x00030D17, 0x0B020103, 0x01010001, 0x00010205, 0x09080503, 0x0205090E, 0x0E0D0501, 0x00000000, 0x01050F18, 0x0C020102, 0x01010001, 0x00010408, 0x0D0B0502, 0x03070B0F, 0x0F0F0601, 0x00000000, 0x02081219, 0x0D030102, 0x00010001, 0x0001050B, 0x130F0702, 0x04080B0F, 0x10110801, 0x00000000, 0x030C1419, 0x0E040101, 0x00010001, 0x0001070F, 0x19140A03, 0x05090B0E, 0x10130A02, 0x00000001, 0x05121719, 0x0E040100, 0x00010102, 0x01020A13, 0x1F1A0F06, 0x06090A0C, 0x10150B03, 0x01000001, 0x08181B19, 0x0F050201, 0x01020102, 0x02040D18, 0x2721140A, 0x080A0A0C, 0x11160D04, 0x02020001, 0x0B1E1E19, 0x10070403, 0x02030202, 0x0408111D, 0x2F2A1B0F, 0x0A0B0B0D, 0x12180F06, 0x04040101, 0x0E242119, 0x11090606, 0x04040304, 0x070C1623, 0x38322214, 0x0E0D0E10, 0x141A1108, 0x06060102, 0x112A241A, 0x120B0909, 0x06050507, 0x0B111C29, 0x413B291B, 0x13101216, 0x181B1209, 0x08080304, 0x152F271B, 0x140E0C0C, 0x0907080B, 0x10172230, 0x4A433223, 0x1813161D, 0x1D1E140B, 0x0A0A0608, 0x1A342B1E, 0x17110F0F, 0x0C0B0D11, 0x171F2A38, 0x534C3B2B, 0x1E161C25, 0x2221160D, 0x0B0C0A0E, 0x21393023, 0x1B151211, 0x0F0F1217, 0x1E273240, 0x5C564534, 0x251B242F, 0x2924190F, 0x0E0E0F17, 0x293E372B, 0x21181513, 0x1113181E, 0x26303B48, 0x655F4E3E, 0x2D222D3A, 0x30271C13, 0x11111520, 0x32453F35, 0x281D1714, 0x14181E25, 0x2F3A4551, 0x6F695746, 0x362B3744, 0x372A1F17, 0x15151D2A, 0x3D4D483F, 0x31231A14, 0x171E252E, 0x38444F5B, 0x7974614F, 0x4036404C, 0x3C2D231D, 0x1A1A2637, 0x4957524A, 0x3A2A1D15, 0x1A252E37, 0x43505B66, 0x837F6C59, 0x4A414750, 0x3F2E2723, 0x21213245, 0x57625D54, 0x43312216, 0x1F2D3741, 0x4D5B6671, 0x8E8B7662, 0x544B4D51, 0x3F302C2C, 0x2B2D4054, 0x656D675E, 0x4C3A281A, 0x2536414B, 0x5867717B, 0x9896816C, 0x5E545150, 0x3F323337, 0x383C5063, 0x71777168, 0x56432F21, 0x2C3F4B56, 0x63727C86, 0xA2A08B76, 0x685D5651, 0x3F343A43, 0x484D5F70, 0x7D827B71, 0x5F4C3829, 0x34465462, 0x6F7C8690, 0xACA99581, 0x72655B53, 0x42394450, 0x585E6D7C, 0x878C8479, 0x68574334, 0x3D4E5E6E, 0x7B88919A, 0xB4B09E8C, 0x7C6E6155, 0x46414F5F, 0x676E7B87, 0x92958C80, 0x71625041, 0x4857697A, 0x86929BA3, 0xBBB7A796, 0x86776658, 0x4D4B5C6E, 0x777D8791, 0x9C9F9487, 0x7A6D5C4F, 0x54617486, 0x919CA4AB, 0xC2BBAFA1, 0x907F6C5D, 0x55576A7E, 0x8589929A, 0xA5A99D90, 0x8478695E, 0x5F697F93, 0x9DA6ACB2, 0xC8BFB6AC, 0x9A877465, 0x6064788D, 0x92949BA1, 0xADB2A89C, 0x8F83766C, 0x6A718AA1, 0xA9AFB2B8, 0xCEC3BDB6, 0xA4907E70, 0x6C72879B, 0x9C9CA2A8, 0xB5BBB3A9, 0x9B8E8279, 0x737693AE, 0xB4B6B9BE, 0xD5C9C5BF, 0xAF9C8B7E, 0x7A8094A5, 0xA4A0A7B0, 0xBDC5C0B7, 0xA8998E85, 0x7B7B9AB7, 0xBDBEC0C5, 0xDBCFCCC8, 0xBAA9998E, 0x898E9FAD, 0xA8A1ACB8, 0xC6CECCC5, 0xB6A4988F, 0x8381A0BE, 0xC4C6C8CD, 0xE0D4D3D1, 0xC5B7A89D, 0x989CA8B3, 0xABA2B0C0, 0xCED8D8D2, 0xC2AEA298, 0x8C89A6C3, 0xCACED1D5, 0xE5DBDAD8, 0xD0C4B6AB, 0xA6A8B1B8, 0xAEA4B5C7, 0xD6E0E3DE, 0xCDB7ABA2, 0x9590ACC9, 0xD0D5D9DC, 0xEBE1E0DE, 0xDAD1C4B9, 0xB2B2B8BC, 0xB1A7B9CE, 0xDEE8ECE8, 0xD6BDB3AC, 0x9E98B3CE, 0xD6DBE0E3, 0xF0E9E6E3, 0xE3DDD2C6, 0xBCBABEC0, 0xB4AABED5, 0xE5EFF3F0, 0xDDC2BBB6, 0xA79FB9D4, 0xDCE2E7E9, 0xF5F0ECE7, 0xEAE8DED2, 0xC6C1C2C3, 0xB7ADC4DD, 0xEBF3F8F5, 0xE1C6C2C1, 0xB1A7BFD8, 0xE1E7EDF0, 0xF9F5F1EB, 0xF0F0E9DD, 0xCFC7C7C6, 0xBBB1CBE5, 0xF0F5FBF7, 0xE3CACACC, 0xBBB0C5DC, 0xE5ECF4F6, 0xFCF9F5EE, 0xF5F7F0E7, 0xD7CDCCCB, 0xBFB7D2EB, 0xF4F7FBF6, 0xE4CDD2D6, 0xC6B9CBE0, 0xE9F1F9FB, 0xFDFCF8F2, 0xF9FAF6EE, 0xDFD5D3D0, 0xC5BDD9F0, 0xF7F9FBF4, 0xE5D0D9E0, 0xD1C2D2E4, 0xEDF5FCFE, 0xFEFDFAF4, 0xFBFCF9F3, 0xE6DDDAD7, 0xCBC3DEF4, 0xFAFBFCF3, 0xE5D3DEE8, 0xDBCDDAE9, 0xF2F8FEFF, 0xFEFDFCF6, 0xFCFDFCF7, 0xECE4E2DF, 0xD2C9E3F7, 0xFCFDFBF3, 0xE5D6E4EF, 0xE3D6E1EE, 0xF6FAFEFF, 0xFEFDFDF8, 0xFCFDFDFA, 0xF1EAE9E7, 0xD9CFE7F9, 0xFEFEFBF3, 0xE7DBE9F4, 0xEBDFE8F3, 0xF9FCFFFF, 0xFEFDFDFA, 0xFDFDFEFC, 0xF5EFEFEE, 0xE0D5ECFB, 0xFFFEFBF3, 0xE9E1EEF8, 0xF0E6EEF6, 0xFCFDFFFF, 0xFEFDFEFC, 0xFEFDFEFE, 0xF8F4F4F3, 0xE7DDF1FD, 0xFFFEFBF3, 0xECE7F3FC, 0xF5ECF2F9, 0xFDFEFFFF, 0xFEFDFFFE, 0xFFFDFEFE, 0xFAF7F8F7, 0xEDE5F5FE, 0xFFFEFBF5, 0xF0EDF7FD, 0xF9F1F5FA, 0xFEFFFFFF, 0xFEFDFFFF, 0xFFFEFEFF, 0xFCFAFAFA, 0xF2ECF8FE, 0xFFFEFCF7, 0xF4F3FAFE, 0xFBF6F8FB, 0xFEFFFFFF, 0xFEFDFFFF, 0xFFFEFEFF, 0xFDFCFCFC, 0xF7F2FBFF, 0xFFFEFCFA, 0xF8F7FCFF, 0xFEFAFBFC, 0xFFFFFFFF, 0xFEFEFFFF, 0xFFFFFFFF, 0xFEFDFEFD, 0xFAF7FCFF, 0xFFFEFDFC, 0xFCFBFDFF, 0xFFFDFDFD, 0xFFFFFFFF, 0xFFFEFFFF, 0xFFFFFFFF, 0xFFFEFEFE, 0xFCFAFDFF, 0xFFFEFEFE, 0xFEFDFEFF, 0xFFFFFEFD, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFDFCFEFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFE, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFEFEFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF -glabel D_8086AEB0 - .word 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000001, 0x01000000, 0x00000102, 0x02010000, 0x00000001, 0x01010202, 0x00000000, 0x00000000, 0x00000202, 0x02000000, 0x01010205, 0x07050200, 0x00000001, 0x01010304, 0x02010000, 0x00000000, 0x00000305, 0x04010001, 0x05030307, 0x0A090401, 0x00000101, 0x01020206, 0x05030200, 0x00000000, 0x01010408, 0x08030003, 0x08080607, 0x09090602, 0x01000001, 0x01010104, 0x05060603, 0x02010002, 0x0505060A, 0x0C080404, 0x07090707, 0x06050709, 0x07010000, 0x01010101, 0x05080B0A, 0x06020205, 0x090A0A0C, 0x0F0E0A05, 0x05080905, 0x05040810, 0x10060000, 0x00010102, 0x050A1113, 0x0E080608, 0x0A0C0D10, 0x1514120D, 0x0E0C0D0B, 0x09080B15, 0x190F0402, 0x01000308, 0x0A0F161A, 0x180F0A0A, 0x0A0B0B12, 0x191B2A20, 0x221B1F1B, 0x1815141C, 0x22170806, 0x03030611, 0x1A1F201E, 0x1C140E0E, 0x0D0E0F11, 0x181D2F3D, 0x3F333532, 0x2C261F24, 0x2E230F0D, 0x0A090E18, 0x242E2D24, 0x1B141010, 0x11161813, 0x1618274A, 0x4E464948, 0x42383030, 0x39311712, 0x16151F24, 0x2331362A, 0x1B111013, 0x191D201C, 0x1E273145, 0x4F51565B, 0x584C4140, 0x4A3F1C14, 0x1E202D32, 0x242B3631, 0x22140F14, 0x1D23221D, 0x273C4A4E, 0x675F636D, 0x70645452, 0x564C2616, 0x2D363842, 0x38333F3F, 0x35241817, 0x242C2A25, 0x2F4F656C, 0x948A7E81, 0x887D6A63, 0x60583B2F, 0x4454575F, 0x5B555C5E, 0x56493E34, 0x39414644, 0x49627089, 0xBBBAA89B, 0x9B917A70, 0x67595152, 0x677A8184, 0x857F7A7C, 0x756D6A63, 0x5C5D626E, 0x767F8795, 0xC4D1CABB, 0xB5A68C82, 0x7D706B76, 0x8B969DA7, 0xAEA69592, 0x928C8B8A, 0x857D8094, 0xA5AAA8A5, 0xC4CEC9C7, 0xC2B69E94, 0x948F8991, 0x9EA4A9B7, 0xBEBDAFA2, 0xA2A49F9A, 0x99959BB7, 0xC9CECAC4, 0xD7CDC8C8, 0xCBC8B6AB, 0xAAAAA7A0, 0xA0A2ACBD, 0xC6CCC9BD, 0xB4BAB6A8, 0xA3A3AECF, 0xE3E4E0DE, 0xE6DBD4CE, 0xD0D0C6BA, 0xB6B6B3A7, 0x9FA7B4C7, 0xD5D7D8D3, 0xC9C9CDBF, 0xB1B2BED9, 0xF2ECE3E5, 0xECEAE1DA, 0xDBDDD7CB, 0xC2BFBCB4, 0xADB4C4D7, 0xE4E7E4DD, 0xD6D6E0DC, 0xC7BABFD4, 0xE9E8DFE2, 0xF0F4EDE8, 0xE6E7E7DD, 0xCFC9CAC9, 0xC8CEDCEA, 0xF3F6F1E7, 0xE0DEE3E7, 0xDAC2C3D6, 0xE4E8E3E5, 0xF7FBF8F1, 0xECEAEFEB, 0xDFDCDDE0, 0xE2E4E7EF, 0xF7FCFAF4, 0xEFE9E5E7, 0xE2CDC8D7, 0xE5E9EAEE, 0xFDFEFCF7, 0xF1EBEDF0, 0xE9E8EDF1, 0xF3F0EEF0, 0xF5FBFBF8, 0xF7F3E9E2, 0xDDD6D3E1, 0xEBEBEBF4, 0xFCFEFEFC, 0xF6F0F1F4, 0xEDEAF3FA, 0xFCF5EBEA, 0xF0F8F8F6, 0xF7F6EEE6, 0xE2E0E4ED, 0xEDE9E1EE, 0xFAFFFDFD, 0xFAF7F7F7, 0xF2EFF6FB, 0xFBF2E1DF, 0xEEF8F6F2, 0xF4F6F2EE, 0xEAE7ECF2, 0xEEE6E0E5, 0xF6FCFCFD, 0xFDFCFCF9, 0xF2F0F5FA, 0xFAF3DED8, 0xE8F7F7F3, 0xF4F8F7F6, 0xF2EEEEF0, 0xECE5E2E5, 0xF8FBF5F7, 0xFAFBFAF5, 0xEBE7F4FC, 0xFAF6E8DD, 0xE8F8FCF8, 0xF8F9FAFA, 0xF9F4EEE9, 0xE4DFE0E9, 0xF9FAF1EE, 0xF2F5F7F5, 0xEBE1EDFB, 0xFBFAF5EF, 0xF4FCFEFD, 0xFBF8F8FB, 0xFBF7F2EA, 0xE4DCD8E5, 0xF6FBF0EA, 0xECEFF3F2, 0xEDE5EAF9, 0xFDFCFDFC, 0xFCFDFDFC, 0xF9F5F7FA, 0xFCF9F6F2, 0xEBE0D6E1, 0xEDF9F5EE, 0xEDEEF0F0, 0xEEEBEFFA, 0xFEFEFFFC, 0xF9F6F8FB, 0xFAF7F6FA, 0xFDFDFBFA, 0xF7E8DCDB, 0xECF7F9F4, 0xF3F1F0EF, 0xECECF3FC, 0xFEFEFEF9, 0xF1EDEEF7, 0xFBFAF9FC, 0xFEFEFDFC, 0xFBF3DFE0, 0xF0F5FBFA, 0xF7F3F3F4, 0xF1EFF2F8, 0xFAFCFEFA, 0xF1EAE7F0, 0xFAFEFDFE, 0xFFFEFEFD, 0xFDFBE7E9, 0xF6FBFDFB, 0xF8F3F2F7, 0xF9F4EFF0, 0xF3F6FBFB, 0xF5EEEDF0, 0xFAFFFFFF, 0xFEFDFDFE, 0xFEFDF7F0, 0xF9FDFCFA, 0xF5ECEAF4, 0xFCF8ECE8, 0xEBEFF7FC, 0xF8F6F7F6, 0xF9FCFEFD, 0xFBFAF8FB, 0xFEFFFEF7, 0xF3FAFCF7, 0xEFE4E1EA, 0xF7F8EBE1, 0xE4EAEDF5, 0xF6F3F7F8, 0xF7F9FAF9, 0xF5F3F1F0, 0xF4FBFFFA, 0xECEEF6F4, 0xECE1DBE1, 0xEFF5EDE0, 0xE0E2E0E6, 0xEDEBEFF2, 0xF3F6F6F5, 0xEEECEDE6, 0xE2EEFEFA, 0xEAE3E6E6, 0xE5E2DEDF, 0xE7EDE7DD, 0xDBDDD8DA, 0xE5E6E8ED, 0xEEF2F4EF, 0xE3D9DFE4, 0xDDE2F7FB, 0xF2E5D8D2, 0xD4DDE3DB, 0xD7DCDCD4, 0xCFD1D5DC, 0xE6E7E8E8, 0xE5E9EBE3, 0xD1C5CEE0, 0xE2E2F3FD, 0xF8EAD6C2, 0xC1CDDCD7, 0xC5BFC4C1, 0xB7B9CCE7, 0xF0EDE2DD, 0xD8D4D7CA, 0xB4AFBFD6, 0xE4EBF2FC, 0xEEEAD8C2, 0xBABECCCF, 0xB9A1A3AA, 0xA6A2B0DB, 0xF0E9D8CE, 0xC6BFBDAE, 0x9292ACCC, 0xE0E4E3EB, 0xCFD5CFBF, 0xB3AEB1B6, 0xA68D8A95, 0x9A99A1C2, 0xE3DBC6BA, 0xB4ACA292, 0x757299C0, 0xD7D8CBC6, 0xA5B3BAB0, 0xA59A9293, 0x8C7A757E, 0x889198AE, 0xCACAB7A7, 0xA09C9480, 0x63597696, 0xAEC0BEA8, 0x8C959F97, 0x89807772, 0x6752536B, 0x79808896, 0xAEB8A894, 0x827E796B, 0x59556374, 0x849EB6A5, 0x918F8D7B, 0x6A676A66, 0x53363453, 0x6A6D6E76, 0x8A9D9E90, 0x73625D58, 0x5157605F, 0x5E749CA7, 0x96898163, 0x4E506064, 0x4A2A1E36, 0x565D5B5F, 0x697D8D8C, 0x714E4240, 0x44525E59, 0x5161869C, 0x81776D54, 0x3D3A4D5A, 0x46281B22, 0x363E424A, 0x545D6E7B, 0x714F3630, 0x313E4E4C, 0x44537384, 0x625B4E3E, 0x2E293646, 0x37201C20, 0x1E1D1F2D, 0x3E454A59, 0x5F4D2D20, 0x2229363E, 0x3B4A6A70, 0x453C3329, 0x211F2835, 0x2A1A1B20, 0x1307050F, 0x242C2933, 0x43442C18, 0x15151C2A, 0x3140655C, 0x251B1F1B, 0x15161F27, 0x261D1C20, 0x15040005, 0x141E1516, 0x26312716, 0x0E0C0D19, 0x28385556, 0x170D1511, 0x0A0B141E, 0x2222201F, 0x170B0403, 0x0D190F0B, 0x151F1B10, 0x0B08050C, 0x17264546, 0x130C140C, 0x03030C12, 0x13181F1C, 0x16100A07, 0x090E0F09, 0x11160F08, 0x0C0F0A09, 0x0F1B2E32, 0x12171D11, 0x0301070D, 0x0B0D1414, 0x110F110F, 0x0A07070A, 0x11150B04, 0x0C15130F, 0x0E0E1B23, 0x10172113, 0x0401050C, 0x0E09090B, 0x09090E13, 0x10090505, 0x0D120C04, 0x07141911, 0x0C0A1016, 0x09101811, 0x05020308, 0x0D090606, 0x0504060C, 0x110F0903, 0x060B0804, 0x030A100D, 0x0A090B0C, 0x05060A06, 0x01010204, 0x07080403, 0x02010307, 0x0A0D0B04, 0x02020302, 0x02030606, 0x04040708, 0x02020200, 0x00000201, 0x02030200, 0x00000102, 0x05060704, 0x01000001, 0x01020201, 0x00010406, 0x01000201, 0x00000000, 0x00000000, 0x00000001, 0x02020202, 0x01000000, 0x00000101, 0x00000102, 0x00000100, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000100, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 -glabel D_8086B6B0 - .word 0x00420271, 0xFFBE0000, 0x060006C2, 0x3E52C2FF, 0x000002BC, 0x00000000, 0x07000800, 0x007800FF, 0x005D0271, 0x00000000, 0x080006C2, 0x575200FF, 0x00BD01DB, 0xFFB20000, 0x07000419, 0x5E3FD9FF, 0x00BD01DB, 0x004E0000, 0x09000419, 0x5E3F27FF, 0x01AF001B, 0x00000000, 0x08000005, 0x6B3500FF, 0x0131001B, 0x01310000, 0x0A000005, 0x4C354CFF, 0x000002BC, 0x00000000, 0x09000800, 0x007800FF, 0x00420271, 0x00420000, 0x0A0006C2, 0x3E523EFF, 0x004E01DB, 0x00BD0000, 0x0B000419, 0x273F5EFF, 0x0000001B, 0x01AF0000, 0x0C000005, 0x00356BFF, 0x000002BC, 0x00000000, 0x0B000800, 0x007800FF, 0x00000271, 0x005D0000, 0x0C0006C2, 0x005257FF, 0xFFB201DB, 0x00BD0000, 0x0D000419, 0xD93F5EFF, 0xFECF001B, 0x01310000, 0x0E000005, 0xB4354CFF, 0x000002BC, 0x00000000, 0x0D000800, 0x007800FF, 0xFFBE0271, 0x00420000, 0x0E0006C2, 0xC2523EFF, 0xFF4301DB, 0x004E0000, 0x0F000419, 0xA23F27FF, 0xFE51001B, 0x00000000, 0x10000005, 0x953500FF, 0xFFA30271, 0x00000000, 0x100006C2, 0xA95200FF, 0xFF4301DB, 0xFFB20000, 0x11000419, 0xA23FD9FF, 0xFE51001B, 0x00000000, 0x00000005, 0x953500FF, 0xFF4301DB, 0xFFB20000, 0x01000419, 0xA23FD9FF, 0xFECF001B, 0xFECF0000, 0x02000005, 0xB435B4FF, 0xFFA30271, 0x00000000, 0x000006C2, 0xA95200FF, 0x000002BC, 0x00000000, 0x01000800, 0x007800FF, 0xFFBE0271, 0xFFBE0000, 0x020006C2, 0xC252C2FF, 0xFFB201DB, 0xFF430000, 0x03000419, 0xD93FA2FF, 0x0000001B, 0xFE510000, 0x04000005, 0x003595FF, 0x000002BC, 0x00000000, 0x03000800, 0x007800FF, 0x00000271, 0xFFA30000, 0x040006C2, 0x0052A9FF, 0x004E01DB, 0xFF430000, 0x05000419, 0x273FA2FF -glabel D_8086B8B0 - .word 0x0000001B, 0xFE510000, 0x04000005, 0x003595FF, 0x004E01DB, 0xFF430000, 0x05000419, 0x273FA2FF, 0x0131001B, 0xFECF0000, 0x06000005, 0x4C35B4FF, 0x00000271, 0xFFA30000, 0x040006C2, 0x0052A9FF, 0x000002BC, 0x00000000, 0x05000800, 0x007800FF, 0x00420271, 0xFFBE0000, 0x060006C2, 0x3E52C2FF, 0x00BD01DB, 0xFFB20000, 0x07000419, 0x5E3FD9FF, 0x01AF001B, 0x00000000, 0x08000005, 0x6B3500FF, 0xFFBE0271, 0x00420000, 0x060006C2, 0xC2523EFF, 0x000002BC, 0x00000000, 0x07000800, 0x007800FF, 0xFFA30271, 0x00000000, 0x080006C2, 0xA95200FF -glabel D_8086B960 - .word 0xE7000000, 0x00000000, 0xE3001001, 0x00000000, 0xD7000002, 0xFFFFFFFF, 0xFD900000 -.word D_8086A6B0 -.word 0xF5900000, 0x0705BC5D, 0xE6000000, 0x00000000, 0xF3000000, 0x073FF200, 0xE7000000, 0x00000000, 0xF5880800, 0x0005BC5D, 0xF2000000, 0x0007C0FC, 0xFD900000 -.word D_8086AEB0 -.word 0xF5900100, 0x0705B85E, 0xE6000000, 0x00000000, 0xF3000000, 0x073FF200, 0xE7000000, 0x00000000, 0xF5880900, 0x0105B85E, 0xF2000000, 0x0107C0FC, 0xFC262A60, 0x350CE37F, 0xE200001C, 0x0C184B50, 0xD9F2FBFF, 0x00000000, 0xD9FFFFFF, 0x00020000, 0xDF000000, 0x00000000 -glabel D_8086BA10 - .word 0x01020040 -.word D_8086B6B0 -.word 0x06000204, 0x00000406, 0x06060408, 0x0006080A, 0x060A080C, 0x00040E10, 0x06041008, 0x00081012, 0x0608120C, 0x000C1214, 0x06101618, 0x00101812, 0x0612181A, 0x00121A14, 0x06141A1C, 0x00181E20, 0x0618201A, 0x001A2022, 0x061A221C, 0x001C2224, 0x06202622, 0x00222628, 0x06222824, 0x002A2C2E, 0x06303234, 0x0030342C, 0x062C3436, 0x002C362E, 0x062E3638, 0x00343A3C, 0x06343C36, 0x00363C3E, 0x05363E38, 0x00000000, 0x0100B016 -.word D_8086B8B0 -.word 0x06000204, 0x0006080A, 0x06060A02, 0x00020A0C, 0x06020C04, 0x00040C0E, 0x05101214, 0x00000000, 0xDF000000, 0x00000000 -glabel Arrow_Light_InitVars - .word 0x010C0700, 0x02000010, 0x00010000, 0x0000016C -.word ArrowLight_Init -.word ArrowLight_Destroy -.word ArrowLight_Update -.word ArrowLight_Draw -glabel D_8086BAF0 - .word 0x30F407D0, 0x00000000, 0x00000000, 0x00000000 - diff --git a/data/overlays/actors/z_arrow_light.reloc.s b/data/overlays/actors/z_arrow_light.reloc.s deleted file mode 100644 index 419c81664f..0000000000 --- a/data/overlays/actors/z_arrow_light.reloc.s +++ /dev/null @@ -1,11 +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 purposee registers - -.section .rodata -glabel D_8086BBA0 - -.incbin "baserom/ovl_Arrow_Light", 0x1EF0, 0x00000100 diff --git a/data/overlays/actors/z_arrow_light.rodata.s b/data/overlays/actors/z_arrow_light.rodata.s deleted file mode 100644 index a06d95d41e..0000000000 --- a/data/overlays/actors/z_arrow_light.rodata.s +++ /dev/null @@ -1,57 +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 purposee registers - -.section .rodata - -glabel D_8086BB00 - - .asciz "../z_arrow_light.c" - .balign 4 - -glabel D_8086BB14 - .word 0x22BEC3CC, 0xC722203D, 0x2025730A, 0x00000000 -glabel D_8086BB24 - .word 0xBEC3CCC7, 0x00000000 -glabel D_8086BB2C - - .asciz "../z_arrow_light.c" - .balign 4 - -glabel D_8086BB40 - - .asciz "../z_arrow_light.c" - .balign 4 - -glabel D_8086BB54 - - .asciz "../z_arrow_light.c" - .balign 4 - -glabel D_8086BB68 - .word 0x446D8000 -glabel D_8086BB6C - .word 0x3EAAAAAB -glabel D_8086BB70 - .word 0x3D2AAAAB -glabel D_8086BB74 - .word 0x3DCCCCCD -glabel D_8086BB78 - .word 0x3D2AAAAB -glabel D_8086BB7C - .word 0x38C90FDB -glabel D_8086BB80 - .word 0x38C90FDB -glabel D_8086BB84 - .word 0x38C90FDB -glabel D_8086BB88 - .word 0x3C23D70A -glabel D_8086BB8C - .word 0x44BB8000 -glabel D_8086BB90 - .word 0x3E4CCCCD, 0x00000000, 0x00000000, 0x00000000 - - diff --git a/data/overlays/actors/z_bg_gate_shutter.data.s b/data/overlays/actors/z_bg_gate_shutter.data.s deleted file mode 100644 index ad3a0bc524..0000000000 --- a/data/overlays/actors/z_bg_gate_shutter.data.s +++ /dev/null @@ -1,16 +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 purposee registers - -.section .data - -glabel Bg_Gate_Shutter_InitVars - .word 0x01000700, 0x00000000, 0x01810000, 0x0000017C -.word BgGateShutter_Init -.word BgGateShutter_Destroy -.word BgGateShutter_Update -.word BgGateShutter_Draw - diff --git a/data/overlays/actors/z_bg_gate_shutter.reloc.s b/data/overlays/actors/z_bg_gate_shutter.reloc.s deleted file mode 100644 index 791f19b2db..0000000000 --- a/data/overlays/actors/z_bg_gate_shutter.reloc.s +++ /dev/null @@ -1,11 +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 purposee registers - -.section .rodata -glabel D_80878630 - -.incbin "baserom/ovl_Bg_Gate_Shutter", 0x4D0, 0x00000090 diff --git a/data/overlays/actors/z_bg_gate_shutter.rodata.s b/data/overlays/actors/z_bg_gate_shutter.rodata.s deleted file mode 100644 index dfbe7fefd7..0000000000 --- a/data/overlays/actors/z_bg_gate_shutter.rodata.s +++ /dev/null @@ -1,35 +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 purposee registers - -.section .rodata - -glabel D_808785B0 - .word 0x0A0A0000 -glabel D_808785B4 - - .asciz " ☆☆☆☆☆ 柵でたなぁ ☆☆☆☆☆ \n" - .balign 4 - -glabel D_808785E0 - - .asciz "../z_bg_gate_shutter.c" - .balign 4 - -glabel D_808785F8 - - .asciz "../z_bg_gate_shutter.c" - .balign 4 - -glabel D_80878610 - - .asciz "../z_bg_gate_shutter.c" - .balign 4 - -glabel D_80878628 - .word 0xC4ABE000, 0x00000000 - - diff --git a/data/overlays/actors/z_bg_gjyo_bridge.data.s b/data/overlays/actors/z_bg_gjyo_bridge.data.s deleted file mode 100644 index 1cb203ec1f..0000000000 --- a/data/overlays/actors/z_bg_gjyo_bridge.data.s +++ /dev/null @@ -1,18 +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 purposee registers - -.section .data - -glabel Bg_Gjyo_Bridge_InitVars - .word 0x01480600, 0x00000000, 0x01300000, 0x00000168 -.word BgGjyoBridge_Init -.word BgGjyoBridge_Destroy -.word BgGjyoBridge_Update -.word BgGjyoBridge_Draw -glabel D_80878B50 - .word 0xB0F80320, 0x48500064, 0x00000000, 0x00000000 - diff --git a/data/overlays/actors/z_bg_gjyo_bridge.reloc.s b/data/overlays/actors/z_bg_gjyo_bridge.reloc.s deleted file mode 100644 index 8fe13e8eab..0000000000 --- a/data/overlays/actors/z_bg_gjyo_bridge.reloc.s +++ /dev/null @@ -1,11 +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 purposee registers - -.section .rodata -glabel D_80878BB0 - -.incbin "baserom/ovl_Bg_Gjyo_Bridge", 0x4F0, 0x00000080 diff --git a/data/overlays/actors/z_bg_gjyo_bridge.rodata.s b/data/overlays/actors/z_bg_gjyo_bridge.rodata.s deleted file mode 100644 index 6dfaa6d8ab..0000000000 --- a/data/overlays/actors/z_bg_gjyo_bridge.rodata.s +++ /dev/null @@ -1,30 +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 purposee registers - -.section .rodata - -glabel D_80878B60 - - .asciz "../z_bg_gjyo_bridge.c" - .balign 4 - -glabel D_80878B78 - - .asciz "../z_bg_gjyo_bridge.c" - .balign 4 - -glabel D_80878B90 - - .asciz "../z_bg_gjyo_bridge.c" - .balign 4 - -glabel D_80878BA8 - .word 0x44A78000 -glabel D_80878BAC - .word 0x44CFC000 - - diff --git a/data/overlays/actors/z_bg_haka_megane.data.s b/data/overlays/actors/z_bg_haka_megane.data.s deleted file mode 100644 index 549be94316..0000000000 --- a/data/overlays/actors/z_bg_haka_megane.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 purposee registers - -.section .data - -glabel Bg_Haka_Megane_InitVars - .word 0x00AE0600, 0x000000B0, 0x00010000, 0x0000016C -.word BgHakaMegane_Init -.word BgHakaMegane_Destroy -.word BgHakaMegane_Update -.word 0x00000000 -glabel D_8087DD50 - .word 0x48500064 -glabel D_8087DD54 - .word 0x06001830, 0x06001AB8, 0x00000000, 0x06004330, 0x060044D0, 0x00000000, 0x06004780, 0x06004940, 0x00000000, 0x06004B00, 0x00000000, 0x06004CC0, 0x00000000 -glabel D_8087DD88 - .word 0x06001060, 0x06001920, 0x060003F0, 0x060040F0, 0x060043B0, 0x06001120, 0x060045A0, 0x060047F0, 0x060018F0, 0x060049B0, 0x06003CF0, 0x06004B70, 0x06002ED0, 0x00000000 - diff --git a/data/overlays/actors/z_bg_haka_megane.reloc.s b/data/overlays/actors/z_bg_haka_megane.reloc.s deleted file mode 100644 index 93d77a13c6..0000000000 --- a/data/overlays/actors/z_bg_haka_megane.reloc.s +++ /dev/null @@ -1,11 +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 purposee registers - -.section .rodata -glabel D_8087DDC0 - -.incbin "baserom/ovl_Bg_Haka_Megane", 0x380, 0x00000070 diff --git a/data/overlays/actors/z_bg_spot05_soko.data.s b/data/overlays/actors/z_bg_spot05_soko.data.s deleted file mode 100644 index 8022c06c6e..0000000000 --- a/data/overlays/actors/z_bg_spot05_soko.data.s +++ /dev/null @@ -1,20 +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 purposee registers - -.section .data - -glabel Bg_Spot05_Soko_InitVars - .word 0x018D0600, 0x00000000, 0x01610000, 0x0000016C -.word BgSpot05Soko_Init -.word BgSpot05Soko_Destroy -.word BgSpot05Soko_Update -.word BgSpot05Soko_Draw -glabel D_808AE720 - .word 0x48500064 -glabel D_808AE724 - .word 0x06000840, 0x06001190, 0x00000000 - diff --git a/data/overlays/actors/z_bg_spot05_soko.reloc.s b/data/overlays/actors/z_bg_spot05_soko.reloc.s deleted file mode 100644 index 05766685f3..0000000000 --- a/data/overlays/actors/z_bg_spot05_soko.reloc.s +++ /dev/null @@ -1,11 +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 purposee registers - -.section .rodata -glabel D_808AE730 - -.incbin "baserom/ovl_Bg_Spot05_Soko", 0x2C0, 0x00000050 diff --git a/data/overlays/actors/z_bg_spot09_obj.data.s b/data/overlays/actors/z_bg_spot09_obj.data.s deleted file mode 100644 index d139abbb9e..0000000000 --- a/data/overlays/actors/z_bg_spot09_obj.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 purposee registers - -.section .data - -glabel Bg_Spot09_Obj_InitVars - .word 0x00B80100, 0x00000000, 0x00AE0000, 0x00000168 -.word BgSpot09Obj_Init -.word BgSpot09Obj_Destroy -.word BgSpot09Obj_Update -.word BgSpot09Obj_Draw -glabel D_808B1F90 - .word 0x00000000, 0x06005520, 0x0600283C, 0x06008458, 0x06007580 -glabel D_808B1FA4 - .word func_808B1BEC -.word func_808B1AE0 -.word func_808B1BA0 -glabel D_808B1FB0 - .word 0xB0F41C20, 0xB0F80BB8, 0x30FC1C20 -glabel D_808B1FBC - .word 0xB0F41C20, 0xB0F80320, 0x30FC05DC -glabel D_808B1FC8 - .word 0x06000100, 0x06003970, 0x06001120, 0x06007D40, 0x06006210, 0x00000000 - diff --git a/data/overlays/actors/z_bg_spot09_obj.reloc.s b/data/overlays/actors/z_bg_spot09_obj.reloc.s deleted file mode 100644 index bd2caa08ac..0000000000 --- a/data/overlays/actors/z_bg_spot09_obj.reloc.s +++ /dev/null @@ -1,11 +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 purposee registers - -.section .rodata -glabel D_808B20D0 - -.incbin "baserom/ovl_Bg_Spot09_Obj", 0x5F0, 0x000000B0 diff --git a/data/overlays/actors/z_bg_spot09_obj.rodata.s b/data/overlays/actors/z_bg_spot09_obj.rodata.s deleted file mode 100644 index 5fa755b4eb..0000000000 --- a/data/overlays/actors/z_bg_spot09_obj.rodata.s +++ /dev/null @@ -1,38 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers - -.section .rodata - -glabel D_808B1FE0 - - .asciz "Spot09 Object [arg_data : 0x%04x](大工救出フラグ 0x%x)\n" - .balign 4 - -glabel D_808B2018 - - .asciz "Error : Spot 09 object の arg_data が判別出来ない(%s %d)(arg_data 0x%04x)\n" - .balign 4 - -glabel D_808B2064 - - .asciz "../z_bg_spot09_obj.c" - .balign 4 - -glabel D_808B207C - - .asciz "../z_bg_spot09_obj.c" - .balign 4 - -glabel D_808B2094 - - .asciz "../z_bg_spot09_obj.c" - .balign 4 - -glabel D_808B20AC - .word 0x2E2E2F7A, 0x5F62675F, 0x73706F74, 0x30395F6F, 0x626A2E63, 0x00000000, 0x00000000, 0x00000000, 0x00000000 - - diff --git a/data/overlays/actors/z_bg_spot12_gate.data.s b/data/overlays/actors/z_bg_spot12_gate.data.s deleted file mode 100644 index 8eda552b04..0000000000 --- a/data/overlays/actors/z_bg_spot12_gate.data.s +++ /dev/null @@ -1,18 +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 purposee registers - -.section .data - -glabel Bg_Spot12_Gate_InitVars - .word 0x01900100, 0x00000000, 0x01620000, 0x0000016C -.word BgSpot12Gate_Init -.word BgSpot12Gate_Destroy -.word BgSpot12Gate_Update -.word BgSpot12Gate_Draw -glabel D_808B3330 - .word 0xC8500064, 0xB0F409C4, 0xB0F801F4, 0x30FC04B0 - diff --git a/data/overlays/actors/z_bg_spot12_gate.reloc.s b/data/overlays/actors/z_bg_spot12_gate.reloc.s deleted file mode 100644 index 978444c5bd..0000000000 --- a/data/overlays/actors/z_bg_spot12_gate.reloc.s +++ /dev/null @@ -1,11 +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 purposee registers - -.section .rodata -glabel D_808B33A0 - -.incbin "baserom/ovl_Bg_Spot12_Gate", 0x410, 0x00000080 diff --git a/data/overlays/actors/z_bg_spot12_gate.rodata.s b/data/overlays/actors/z_bg_spot12_gate.rodata.s deleted file mode 100644 index cd8c467d28..0000000000 --- a/data/overlays/actors/z_bg_spot12_gate.rodata.s +++ /dev/null @@ -1,17 +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 purposee registers - -.section .rodata - -glabel D_808B3340 - .asciz "Warning : move BG 登録失敗(%s %d)(name %d)(arg_data 0x%04x)\n" - .balign 4 - -glabel D_808B3380 - .word 0x2E2E2F7A, 0x5F62675F, 0x73706F74, 0x31325F67, 0x6174652E, 0x63000000, 0x00000000, 0x00000000 - - diff --git a/data/overlays/actors/z_bg_spot12_saku.data.s b/data/overlays/actors/z_bg_spot12_saku.data.s deleted file mode 100644 index 175fddb609..0000000000 --- a/data/overlays/actors/z_bg_spot12_saku.data.s +++ /dev/null @@ -1,18 +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 purposee registers - -.section .data - -glabel Bg_Spot12_Saku_InitVars - .word 0x01910100, 0x00000000, 0x01620000, 0x0000016C -.word BgSpot12Saku_Init -.word BgSpot12Saku_Destroy -.word BgSpot12Saku_Update -.word BgSpot12Saku_Draw -glabel D_808B3840 - .word 0xC8500064, 0xB0F404B0, 0xB0F801F4, 0x30FC03E8 - diff --git a/data/overlays/actors/z_bg_spot12_saku.reloc.s b/data/overlays/actors/z_bg_spot12_saku.reloc.s deleted file mode 100644 index 48ee0e2b87..0000000000 --- a/data/overlays/actors/z_bg_spot12_saku.reloc.s +++ /dev/null @@ -1,11 +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 purposee registers - -.section .rodata -glabel D_808B38C0 - -.incbin "baserom/ovl_Bg_Spot12_Saku", 0x4A0, 0x000000A0 diff --git a/data/overlays/actors/z_bg_spot12_saku.rodata.s b/data/overlays/actors/z_bg_spot12_saku.rodata.s deleted file mode 100644 index 5d04132d4d..0000000000 --- a/data/overlays/actors/z_bg_spot12_saku.rodata.s +++ /dev/null @@ -1,29 +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 purposee registers - -.section .rodata - -glabel D_808B3850 - .asciz "Warning : move BG 登録失敗(%s %d)(name %d)(arg_data 0x%04x)\n" - .balign 4 - -glabel D_808B3890 - .asciz "../z_bg_spot12_saku.c" - .balign 4 - -glabel D_808B38A8 - .word 0x3DCCCCCD -glabel D_808B38AC - .word 0x3A83126F -glabel D_808B38B0 - .word 0x3DCCCCCD -glabel D_808B38B4 - .word 0x38D1B717 -glabel D_808B38B8 - .word 0x3BEA0EA2, 0x00000000 - - diff --git a/data/overlays/actors/z_bg_toki_swd.data.s b/data/overlays/actors/z_bg_toki_swd.data.s deleted file mode 100644 index cce1248200..0000000000 --- a/data/overlays/actors/z_bg_toki_swd.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 purposee registers - -.section .data - -glabel D_808BB2F0 - .word 0x00000009, 0x000001A9, 0x0000000A, 0x00000001, 0x000C0000, 0x01000000, 0x00000000, 0x00000000, 0x00000036, 0x00000034, 0x00000000, 0x00000036, 0x00000034, 0x00000000, 0x00000000, 0x00000000, 0x00000004, 0x00000001, 0x0002006E, 0x006F0000, 0x00000000, 0x00000000, 0xFFFFFFE3, 0xFFFFFFC5, 0x00000000, 0xFFFFFFE3, 0xFFFFFFC5, 0x00000000, 0x00000000, 0x00000000, 0x00000003, 0x00000001, 0x000A006E, 0x006F0000, 0x00000000, 0x00000000, 0x0000002E, 0xFFFFFFE6, 0x00000000, 0x0000002E, 0xFFFFFFE6, 0x00000000, 0x00000000, 0x00000000, 0x000003E8, 0x00000001, 0x000800E6, 0x00E700E7, 0x0000002D, 0x00000001, 0x000100D2, 0x00E600E6, 0x00000001, 0x00010000, 0x00F10000, 0x00000000, 0x42700000, 0xFFD60048, 0xFFD9018C, 0x00000000, 0x42700000, 0xFFD60048, 0xFFD9019D, 0x00000000, 0x42700000, 0xFFD60048, 0xFFD901AE, 0x00000000, 0x42700000, 0xFFD60048, 0xFFD902A8, 0x00000000, 0x42700000, 0xFFD60048, 0xFFD90000, 0x00000000, 0x42700000, 0xFFD60048, 0xFFD9007A, 0x00000000, 0x42700000, 0xFFD60048, 0xFFD90064, 0x00000000, 0x42700000, 0xFFD60048, 0xFFD90074, 0xFF000000, 0x42700000, 0xFFD60048, 0xFFD9005F, 0x00000001, 0x00010050, 0x01960000, 0x00000000, 0x42700000, 0xFFFF005F, 0xFFED2F73, 0x00000000, 0x42700000, 0xFFFF005F, 0xFFED6B2F, 0x00000000, 0x42700000, 0xFFFF005F, 0xFFED6169, 0x00000000, 0x42700000, 0xFFFF005F, 0xFFED0000, 0x00000000, 0x42700000, 0xFFFF005F, 0xFFED0005, 0x00000000, 0x42700000, 0xFFFF0081, 0xFFDE7961, 0x00000000, 0x42700000, 0xFFFF00AD, 0xFFED742F, 0x00000000, 0x42700000, 0xFFEF00D9, 0xFFEC2E64, 0x00000000, 0x42700000, 0xFFE80148, 0xFFF40000, 0x00000000, 0x42700000, 0xFFE501FD, 0xFFFE2F73, 0x00000000, 0x42700000, 0xFFD7032D, 0x000A6B2F, 0x00000000, 0x42700000, 0xFFC40505, 0x00266D61, 0x00000000, 0x42700000, 0xFFC60776, 0x005B0000, 0x00000000, 0x42700000, 0xFFCB09DE, 0x00850005, 0x00000000, 0x42700000, 0xFFDF0D75, 0x00C17961, 0x00000000, 0x42700000, 0x00000F78, 0x00E1742F, 0x00000000, 0x42700000, 0x000710DD, 0x00F56565, 0x00000000, 0x42700000, 0x000710DC, 0x00F50000, 0x00000000, 0x42700000, 0x000710DC, 0x00F52F73, 0xFF000000, 0x42700000, 0x000710DC, 0x00F56B2F, 0x00000002, 0x00010000, 0x010E0000, 0x0000001E, 0x42700000, 0xFFEC0055, 0xFFF72F73, 0x0000001E, 0x42700000, 0xFFEC0055, 0xFFF76B2F, 0x0000001E, 0x42700000, 0xFFEC0055, 0xFFF76169, 0x0000001E, 0x42700000, 0xFFEC0055, 0xFFF70000, 0x0000001E, 0x42700000, 0xFFEC0055, 0xFFF70005, 0x0000001E, 0x42700000, 0xFFEC0055, 0xFFF77961, 0x0000001E, 0x42700000, 0xFFEC0055, 0xFFF7742F, 0x0000001E, 0x42700000, 0xFFEC0055, 0xFFF72E64, 0xFF00001E, 0x42700000, 0xFFEC0055, 0xFFF70000, 0x00000002, 0x00010050, 0x01A90000, 0x00000005, 0x42700000, 0xFFFF0070, 0x00072F73, 0x00000005, 0x42700000, 0xFFFF0070, 0x00076B2F, 0x00000005, 0x42700000, 0xFFFF0070, 0x00076169, 0x00000005, 0x42700000, 0xFFFF0070, 0x00070000, 0x0000000F, 0x42700000, 0xFFFF0070, 0x00070005, 0x00000014, 0x42700000, 0xFFFF0075, 0x00077961, 0x00000019, 0x42700000, 0xFFFF0075, 0x0007742F, 0x00000019, 0x42700000, 0xFFFF0075, 0x00072E64, 0x00000014, 0x42700000, 0xFFFF0075, 0x00070000, 0x00000014, 0x42700000, 0xFFFF0075, 0x00072F73, 0x00000014, 0x42700000, 0xFFFF0075, 0x00076B2F, 0x00000014, 0x42700000, 0xFFFF0075, 0x00076D61, 0x00000014, 0x42700000, 0xFFFF0075, 0x00070000, 0x00000014, 0x42700000, 0xFFFF0075, 0x00070005, 0x00000014, 0x42700000, 0xFFFF0075, 0x00077961, 0x00000014, 0x42700000, 0xFFFF0075, 0x0007742F, 0x00000014, 0x42700000, 0xFFFF0075, 0x00076565, 0x00000014, 0x42700000, 0xFFFF0075, 0x00070000, 0x00000014, 0x42700000, 0xFFFF0075, 0x00072F73, 0xFF000014, 0x42700000, 0xFFFF0075, 0x00076B2F, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000000 -glabel D_808BB7A0 - .word 0x00000009, 0x00000170, 0x00000001, 0x00010000, 0x007E0000, 0x00000000, 0x42700000, 0xFFFF0065, 0xFF92616D, 0x00000000, 0x42200000, 0xFFFF0065, 0xFF926964, 0x00000000, 0x42200000, 0xFFFF0065, 0xFF9200FB, 0x00000000, 0x42200000, 0xFFFF0065, 0xFF920111, 0x00000000, 0x42200000, 0xFFFF0065, 0xFF93012D, 0x00000000, 0x42200000, 0xFFFF0047, 0xFF920033, 0x00000000, 0x42200000, 0xFFFF0048, 0xFF9200FB, 0x00000000, 0x42200000, 0xFFFF0048, 0xFF9200FB, 0x00000000, 0x42200000, 0xFFFF0048, 0xFF922F68, 0xFF000000, 0x42200000, 0xFFFF0048, 0xFF92612F, 0x00000001, 0x0001003A, 0x01530000, 0x00000000, 0x42700001, 0xFFF7006A, 0xFFFDA1BC, 0x00000000, 0x42700000, 0xFFF7006A, 0xFFFDA5F3, 0x00000000, 0x42700000, 0xFFF7006A, 0xFFFDA5EB, 0x00000000, 0x42700000, 0xFFF7006A, 0xFFFDA5A2, 0x00000000, 0x42700000, 0xFFBD006C, 0xFFCBBAEE, 0x00000000, 0x42700000, 0xFFBD006C, 0xFFCBC9B8, 0x00000000, 0x42700000, 0xFFBD006C, 0xFFCB0020, 0x00000000, 0x42700000, 0xFFBD006C, 0xFFCBA5A4, 0x00000000, 0x42700000, 0xFFBD006C, 0xFFCB0020, 0x00000000, 0x42700000, 0xFFAD0066, 0xFFD6A5E1, 0x00000000, 0x42700000, 0xFF8C0051, 0xFFEDA5D0, 0x00000000, 0x42700000, 0xFF8A0051, 0x00360020, 0x00000000, 0x42700000, 0xFF96004E, 0x0074A5A6, 0x00000000, 0x42700000, 0xFFE5004B, 0x00E2A5E5, 0x00000000, 0x42700000, 0x00790052, 0x0138C0AE, 0x00000000, 0x42700000, 0x0128004C, 0x0176A5E5, 0x00000000, 0x42700000, 0x02350050, 0x01010020, 0x00000000, 0x42700000, 0x02660050, 0xFFFFA5EB, 0x00000000, 0x42700000, 0x02520050, 0xFF6FA5E1, 0x00000000, 0x42700000, 0x01DB0050, 0xFE840020, 0x00000000, 0x42700000, 0x01430050, 0xFDFFA5E1, 0x00000000, 0x42700000, 0x00C00050, 0xFDC2A5D0, 0x00000000, 0x42700000, 0xFFD30050, 0xFDA40020, 0x00000000, 0x42700000, 0xFF720050, 0xFDB3A5A6, 0x00000000, 0x42700000, 0xFF1C0050, 0xFDCEA5E5, 0x00000000, 0x42700000, 0xFE88005D, 0xFE23C0AE, 0x00000000, 0x42700000, 0xFDB8005F, 0xFF49A5E5, 0x00000000, 0x42700000, 0xFD9B005F, 0xFFDE0020, 0xFF000000, 0x42700000, 0xFDAD005F, 0x00A1A5EB, 0x00000002, 0x00010000, 0x009B0000, 0x00000005, 0x4221999A, 0xFFFF006F, 0x0005A1BC, 0x00000005, 0x42200000, 0xFFFF006F, 0x0005A5F3, 0x00000005, 0x42200000, 0xFFFF006F, 0x0005A5EB, 0x0000000F, 0x42200000, 0xFFFF006F, 0x0005A5A2, 0x0000000F, 0x42200000, 0xFFFF006F, 0x0005BAEE, 0x0000000F, 0x42200000, 0xFFFF0068, 0x0008C9B8, 0x00000005, 0x42200000, 0xFFFF0068, 0x00080020, 0x0000001E, 0x42200000, 0xFFFF0068, 0x0008A5A4, 0x0000001E, 0x42200000, 0xFFFF0068, 0x00080020, 0xFF00001E, 0x42200000, 0xFFFF0068, 0x0008A5E1, 0x00000002, 0x0001003A, 0x01700000, 0x00000005, 0x42700001, 0x00000078, 0x000CA1BC, 0x00000005, 0x42700000, 0x00000078, 0x000CA5F3, 0x00000005, 0x42700000, 0x00000078, 0x000CA5EB, 0x0000000A, 0x42700000, 0x00000078, 0x000CA5A2, 0x00000005, 0x42700000, 0xFFFF005F, 0x000BBAEE, 0x00000005, 0x42700000, 0xFFFF005F, 0x000BC9B8, 0x00000005, 0x42700000, 0xFFFF005F, 0x000B0020, 0x00000005, 0x42700000, 0xFFFF005F, 0x000BA5A4, 0x00000005, 0x42700000, 0xFFFF005F, 0x000B0020, 0x0000000A, 0x42700000, 0xFFFD005F, 0x0008A5E1, 0x0000000A, 0x42700000, 0xFFFD005F, 0x0008A5D0, 0x0000000A, 0x42700000, 0xFFFD005F, 0x00080020, 0x0000000A, 0x42700000, 0xFFFD005F, 0x0008A5A6, 0x0000000A, 0x42700000, 0xFFFD005F, 0x0008A5E5, 0x0000000A, 0x42700000, 0xFFFD005F, 0x0008C0AE, 0x0000000A, 0x42700000, 0xFFFD005F, 0x0008A5E5, 0x0000000A, 0x42700000, 0xFFFD005F, 0x00080020, 0x0000000A, 0x42700000, 0xFFFD005F, 0x0008A5EB, 0x0000000A, 0x42700000, 0xFFFD005F, 0x0008A5E1, 0x0000000A, 0x42700000, 0xFFFD005F, 0x00080020, 0x0000000F, 0x42700000, 0xFFFD005F, 0x0008A5E1, 0x0000000F, 0x42700000, 0xFFFD005F, 0x0008A5D0, 0x0000000F, 0x42700000, 0xFFFD005F, 0x00080020, 0x0000000F, 0x42700000, 0xFFFD005F, 0x0008A5A6, 0x0000000F, 0x42700000, 0xFFFD005F, 0x0008A5E5, 0x0000000F, 0x42700000, 0xFFFD005F, 0x0008C0AE, 0x0000000F, 0x42700000, 0xFFFD005F, 0x0008A5E5, 0x0000000F, 0x42700000, 0xFFFD005F, 0x00080020, 0xFF00001E, 0x42700000, 0xFFFD005F, 0x0008A5EB, 0x0000000A, 0x00000001, 0x000C0000, 0x00B40000, 0x00000000, 0x00000000, 0x0000001C, 0xFFFFFFF6, 0x00000000, 0xFFFFFFF2, 0x00000009, 0x00000000, 0xBE6EEEEF, 0x00000000, 0x00000004, 0x00000001, 0x0002005A, 0x005B0000, 0x00000000, 0x00000000, 0xFFFFFFF2, 0x00000024, 0x00000000, 0xFFFFFFF2, 0x00000024, 0x00000000, 0x00000000, 0x00000000, 0x00000003, 0x00000001, 0x000A005A, 0x005B0000, 0x00000000, 0x00000000, 0xFFFFFFF8, 0xFFFFFFDD, 0x00000000, 0xFFFFFFF8, 0xFFFFFFDD, 0x00000000, 0x00000000, 0x00000000, 0x0000002D, 0x00000001, 0x000100BE, 0x00D200D2, 0x000003E8, 0x00000001, 0x000800D2, 0x00D300D3, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000000 -glabel D_808BBD90 - .word 0x0000000B, 0x00000BB8, 0x00000021, 0x00000001, 0x00010000, 0x0BB80000, 0x00000000, 0x00000000, 0xFFFFFFF8, 0xFFFFFFFF, 0x00000000, 0xFFFFFFF8, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000000, 0x0000000A, 0x00000003, 0x00050000, 0x00010000, 0x80000000, 0x00000000, 0x00000000, 0x00000334, 0x00000000, 0x00000000, 0x00000334, 0x00000000, 0x00000000, 0x00000001, 0x00020001, 0x00100000, 0x80000000, 0x00000000, 0x00000000, 0x00000334, 0x00000000, 0x00000000, 0x000002D0, 0x00000000, 0x00000000, 0x00000001, 0x00050010, 0x00B00000, 0x80000000, 0x00000000, 0x00000000, 0x000002D0, 0x00000000, 0x00000000, 0x000002D0, 0x00000000, 0x00000000, 0x00000001, 0x0000003E, 0x00000003, 0x00040028, 0x00467D74, 0x00000000, 0xFFFFFFFF, 0x00000031, 0x000002CF, 0x00000001, 0x0000002F, 0x000002AF, 0x3D888889, 0xBD888889, 0xBD888889, 0x00040046, 0x00DC8010, 0x00000000, 0x00000001, 0x0000002F, 0x000002AF, 0x00000000, 0x00000086, 0x00000015, 0xBBDA740E, 0x3F147AE1, 0x3BDA740E, 0x000200DC, 0x01108000, 0x00000000, 0x00000000, 0x00000086, 0x00000015, 0x00000000, 0x00000065, 0x00000002, 0x00000000, 0xBF227627, 0x00000000, 0x00000003, 0x00000001, 0x000C0154, 0x01550000, 0x00000000, 0xFFFFFFFF, 0x00000000, 0xFFFFFFFD, 0xFFFFFFFF, 0x00000000, 0xFFFFFFFD, 0x00000000, 0x00000000, 0x00000000, 0x00000013, 0x00000006, 0xFFFF0000, 0x0032FFFF, 0xFFFFFFFF, 0x70E60032, 0x003C0000, 0x00000000, 0xFFFF003C, 0x00FAFFFF, 0xFFFFFFFF, 0x70E700FA, 0x01040000, 0x00000000, 0xFFFF0104, 0x0122FFFF, 0xFFFFFFFF, 0x70E80122, 0x01400000, 0x00000000, 0x00000001, 0x00010000, 0x00FB0000, 0x00000000, 0x42700000, 0xFFC5000C, 0x02B20222, 0x00000000, 0x42700000, 0xFFC5000C, 0x02B200FA, 0x00000000, 0x42700000, 0xFFC5000C, 0x02B20000, 0x00000000, 0x42700000, 0xFFC5000C, 0x02B20000, 0x00000000, 0x42700000, 0xFFC5000C, 0x02B20000, 0x00000000, 0x42700000, 0xFFE10018, 0x02BD0000, 0x00000000, 0x42700000, 0xFFE10018, 0x02BD0000, 0x00000000, 0x42700000, 0xFFE10018, 0x02BD0000, 0x00000000, 0x42700000, 0xFFE10018, 0x02BD2D70, 0x00000000, 0x42700000, 0xFFE10018, 0x02BD0085, 0x00000000, 0x42700000, 0xFFE10018, 0x02BD01E6, 0xFF000000, 0x42700000, 0xFFE10018, 0x02BD0000, 0x00000001, 0x0001005A, 0x014B0000, 0x00000000, 0x42700000, 0xFF66005C, 0x00EC0222, 0x00000000, 0x42700000, 0xFF66005C, 0x00EC00FA, 0x00000000, 0x42700000, 0xFF66005C, 0x00EC0000, 0x00000000, 0x42700000, 0xFF66005C, 0x00EC0000, 0x00000000, 0x42700000, 0xFF66005C, 0x00EC0000, 0x00000000, 0x42700000, 0xFF66005C, 0x00EC0000, 0x00000000, 0x42700000, 0xFF66005C, 0x00EC0000, 0x00000000, 0x42700000, 0xFF66005C, 0x00EC0000, 0xFF000000, 0x42700000, 0xFF66005C, 0x00EC2D70, 0x00000001, 0x000100DC, 0x01EB0000, 0x00000000, 0x42700001, 0xFFFE007A, 0x00270222, 0x00000000, 0x42700001, 0xFFFE007A, 0x002700FA, 0x00000000, 0x42700001, 0xFFFE0066, 0x00270000, 0x00000000, 0x42700001, 0xFFFE005A, 0x00270000, 0x00000000, 0x42700001, 0xFFFE0051, 0x003E0000, 0x00000000, 0x42700001, 0xFFFE0051, 0x003E0000, 0x00000000, 0x42700001, 0xFFFE0051, 0x003E0000, 0x00000000, 0x42700001, 0xFFFE0051, 0x003E0000, 0x00000000, 0x42700001, 0xFFFE0051, 0x003E2D70, 0xFF000000, 0x42700001, 0xFFFE0051, 0x003E0085, 0x00000002, 0x00010000, 0x01180000, 0x0000001E, 0x42700000, 0x002B0034, 0x02CC0222, 0x0000001E, 0x42700000, 0x002B0034, 0x02CC00FA, 0x0000000A, 0x42700000, 0x002B0034, 0x02CC0000, 0x0000000A, 0x42700000, 0x002B0034, 0x02CC0000, 0x0000000A, 0x42700000, 0x002B0034, 0x02CC0000, 0x0000000A, 0x42700000, 0x003F0056, 0x02D20000, 0x0000001E, 0x42700000, 0x003F0056, 0x02D20000, 0x0000001E, 0x42700000, 0x003F0056, 0x02D20000, 0x0000001E, 0x42700000, 0x003F0056, 0x02D22D70, 0x0000001E, 0x42700000, 0x003F0055, 0x02D10085, 0x0000001E, 0x42700000, 0x003F0055, 0x02D101E6, 0xFF00001E, 0x42700000, 0x003E0055, 0x02D10000, 0x00000002, 0x0001005A, 0x01680000, 0x0000001E, 0x42700000, 0xFF970053, 0x016E0222, 0x0000001E, 0x42700000, 0xFF980053, 0x016C00FA, 0x0000001E, 0x42700000, 0xFFC10053, 0x01530000, 0x0000001E, 0x42700000, 0xFFF00063, 0x00FF0000, 0x0000001E, 0x42700000, 0xFFE2006F, 0x00B10000, 0x0000001E, 0x42700000, 0xFFB00070, 0x00790000, 0x0000001E, 0x42700000, 0xFFB00070, 0x00790000, 0x0000001E, 0x42700000, 0xFFB00070, 0x00790000, 0xFF00001E, 0x42700000, 0xFFB00070, 0x00792D70, 0x00000002, 0x000100DC, 0x02080000, 0x0000001E, 0x42700001, 0x00000089, 0xFFC90222, 0x0000001E, 0x42700001, 0x00000089, 0xFFC900FA, 0x0000001E, 0x42700001, 0x00000075, 0xFFC90000, 0x0000001E, 0x42700001, 0x00000069, 0xFFC90000, 0x0000001E, 0x42700001, 0x00000062, 0xFFE10000, 0x0000001E, 0x42700001, 0x00000062, 0xFFE10000, 0x0000001E, 0x42700001, 0x00000062, 0xFFE10000, 0x0000001E, 0x42700001, 0x00000062, 0xFFE10000, 0x0000001E, 0x42700001, 0x00000062, 0xFFE12D70, 0xFF00001E, 0x42700001, 0x00000062, 0xFFE10085, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000000 -glabel Bg_Toki_Swd_InitVars - .word 0x006C0600, 0x00000010, 0x005E0000, 0x0000019C -.word BgTokiSwd_Init -.word BgTokiSwd_Destroy -.word BgTokiSwd_Update -.word BgTokiSwd_Draw -glabel D_808BC3E0 - .word 0x0A000039, 0x12010000, 0x00000000, 0xFFCFFFFF, 0x00000000, 0xFFCFFFFF, 0x00000000, 0x00000100, 0x000A0046, 0x00000000, 0x00000000 -glabel D_808BC40C - .word 0x0A000023, 0x0064FF00 -glabel D_808BC414 - .word 0x48500019, 0x00000000, 0x00000000 - diff --git a/data/overlays/actors/z_bg_toki_swd.reloc.s b/data/overlays/actors/z_bg_toki_swd.reloc.s deleted file mode 100644 index 11b803e8ca..0000000000 --- a/data/overlays/actors/z_bg_toki_swd.reloc.s +++ /dev/null @@ -1,11 +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 purposee registers - -.section .rodata -glabel D_808BC460 - -.incbin "baserom/ovl_Bg_Toki_Swd", 0x1620, 0x000000A0 diff --git a/data/overlays/actors/z_bg_toki_swd.rodata.s b/data/overlays/actors/z_bg_toki_swd.rodata.s deleted file mode 100644 index 5d4e7c1725..0000000000 --- a/data/overlays/actors/z_bg_toki_swd.rodata.s +++ /dev/null @@ -1,23 +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 purposee registers - -.section .rodata - -glabel D_808BC420 - .asciz "../z_bg_toki_swd.c" - .balign 4 - -glabel D_808BC434 - .asciz "../z_bg_toki_swd.c" - .balign 4 - -glabel D_808BC448 - .asciz "../z_bg_toki_swd.c" - .balign 4 - -.balign 16 - diff --git a/data/overlays/actors/z_bg_zg.data.s b/data/overlays/actors/z_bg_zg.data.s deleted file mode 100644 index bc07cdaf9d..0000000000 --- a/data/overlays/actors/z_bg_zg.data.s +++ /dev/null @@ -1,23 +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 purposee registers - -.section .data - -glabel D_808C1010 - .word func_808C0CD4 -.word func_808C0D08 -glabel D_808C1018 - .word 0x485003E8 -glabel D_808C101C - .word func_808C0EEC -glabel Bg_Zg_InitVars - .word 0x01770400, 0x00000010, 0x01560000, 0x0000016C -.word BgZg_Init -.word BgZg_Destroy -.word BgZg_Update -.word BgZg_Draw - diff --git a/data/overlays/actors/z_bg_zg.reloc.s b/data/overlays/actors/z_bg_zg.reloc.s deleted file mode 100644 index b612e3c404..0000000000 --- a/data/overlays/actors/z_bg_zg.reloc.s +++ /dev/null @@ -1,11 +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 purposee registers - -.section .rodata -glabel D_808C10F0 - -.incbin "baserom/ovl_Bg_Zg", 0x4D0, 0x000000A0 diff --git a/data/overlays/actors/z_bg_zg.rodata.s b/data/overlays/actors/z_bg_zg.rodata.s deleted file mode 100644 index ff40292d05..0000000000 --- a/data/overlays/actors/z_bg_zg.rodata.s +++ /dev/null @@ -1,37 +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 purposee registers - -.section .rodata - -glabel D_808C1040 - .asciz "メインモードがおかしい!!!!!!!!!!!!!!!!!!!!!!!!!\n" - .balign 4 - -glabel D_808C107C - .asciz "../z_bg_zg.c" - .balign 4 - -glabel D_808C108C - .asciz "../z_bg_zg.c" - .balign 4 - -glabel D_808C109C - .asciz "../z_bg_zg.c" - .balign 4 - -glabel D_808C10AC - .asciz "描画モードがおかしい!!!!!!!!!!!!!!!!!!!!!!!!!\n" - .balign 4 - -glabel D_808C10E4 - .word 0x3F99999A -glabel D_808C10E8 - .word 0x3FA66666 -glabel D_808C10EC - .word 0x3F99999A - - diff --git a/data/overlays/actors/z_demo_geff.data.s b/data/overlays/actors/z_demo_geff.data.s deleted file mode 100644 index 4b1616aec8..0000000000 --- a/data/overlays/actors/z_demo_geff.data.s +++ /dev/null @@ -1,35 +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 purposee registers - -.section .data - -glabel D_80978570 - .word 0x01860186, 0x01860186, 0x01860186, 0x01860186, 0x01860000 -glabel D_80978584 - .word func_80978030 -.word func_80978030 -.word func_80978030 -.word func_80978030 -.word func_80978030 -.word func_80978030 -.word func_80978030 -.word func_80978030 -.word func_80978030 -glabel D_809785A8 - .word func_809783D4 -.word func_80978308 -glabel D_809785B0 - .word func_809784D4 -.word func_80978344 -glabel Demo_Geff_InitVars - .word 0x01B20900, 0x00000030, 0x01860000, 0x00000168 -.word DemoGeff_Init -.word DemoGeff_Destroy -.word DemoGeff_Update -.word DemoGeff_Draw -.word 0x00000000, 0x00000000 - diff --git a/data/overlays/actors/z_demo_geff.reloc.s b/data/overlays/actors/z_demo_geff.reloc.s deleted file mode 100644 index e71f06c6e9..0000000000 --- a/data/overlays/actors/z_demo_geff.reloc.s +++ /dev/null @@ -1,11 +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 purposee registers - -.section .rodata -glabel D_809787C0 - -.incbin "baserom/ovl_Demo_Geff", 0x980, 0x00000170 diff --git a/data/overlays/actors/z_demo_geff.rodata.s b/data/overlays/actors/z_demo_geff.rodata.s deleted file mode 100644 index cf738192db..0000000000 --- a/data/overlays/actors/z_demo_geff.rodata.s +++ /dev/null @@ -1,80 +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 purposee registers - -.section .rodata - -glabel D_809785E0 - .asciz "Demo_Geff_Actor_ct:arg_dataがおかしい!!!!!!!!!!!!\n" - .balign 4 - -glabel D_8097861C - .asciz "../z_demo_geff.c" - .balign 4 - -glabel D_80978630 - .asciz "../z_demo_geff.c" - .balign 4 - -glabel D_80978644 - .asciz "../z_demo_geff.c" - .balign 4 - -glabel D_80978658 - .asciz "../z_demo_geff.c" - .balign 4 - -glabel D_8097866C - .asciz "../z_demo_geff.c" - .balign 4 - -glabel D_80978680 - .asciz " Demo_Geff_main_init:初期化処理がおかしいarg_data = %d!\n" - .balign 4 - -glabel D_809786C4 - .asciz "Demo_Geff_main_bank:バンクを読めない arg_data = %d!\n" - .balign 4 - -glabel D_80978704 - .asciz "メインモードがおかしい!!!!!!!!!!!!!!!!!!!!!!!!!\n" - .balign 4 - -glabel D_80978740 - .asciz "描画モードがおかしい!!!!!!!!!!!!!!!!!!!!!!!!!\n" - .balign 4 - -glabel jtbl_80978778 -.word L80978064 -.word func_809780E0 -.word L8097816C -.word L80978064 -.word func_809780E0 -.word L8097816C -.word L80978064 -.word func_809780E0 -glabel D_80978798 - .word 0x3C23D70A -glabel D_8097879C - .word 0x3E99999A -glabel D_809787A0 - .word 0x3C23D70A -glabel D_809787A4 - .word 0x3E19999A -glabel D_809787A8 - .word 0x3E947AE1 -glabel D_809787AC - .word 0x3DF5C28F -glabel D_809787B0 - .word 0x3C23D70A -glabel D_809787B4 - .word 0x3DCCCCCD -glabel D_809787B8 - .word 0x3E19999A -glabel D_809787BC - .word 0x3E4CCCCD - - diff --git a/data/overlays/actors/z_door_ana.data.s b/data/overlays/actors/z_door_ana.data.s deleted file mode 100644 index e61713ef3e..0000000000 --- a/data/overlays/actors/z_door_ana.data.s +++ /dev/null @@ -1,20 +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 purposee registers - -.section .data - -glabel Door_Ana_InitVars - .word 0x009B0700, 0x02000000, 0x00020000, 0x0000019C -.word DoorAna_Init -.word DoorAna_Destroy -.word DoorAna_Update -.word DoorAna_Draw -glabel D_809944C0 - .word 0x0A000900, 0x00010000, 0x02000000, 0x00000000, 0x00000000, 0x00000048, 0x00000000, 0x00010000, 0x0032000A, 0x00000000, 0x00000000 -glabel D_809944EC - .word 0x036D003F, 0x0598059C, 0x05A005A4, 0x05A805AC, 0x05B005B4, 0x05B805BC, 0x05C005C4, 0x05FC0000, 0x00000000 - diff --git a/data/overlays/actors/z_door_ana.reloc.s b/data/overlays/actors/z_door_ana.reloc.s deleted file mode 100644 index db0febcfa3..0000000000 --- a/data/overlays/actors/z_door_ana.reloc.s +++ /dev/null @@ -1,11 +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 purposee registers - -.section .rodata -glabel D_80994550 - -.incbin "baserom/ovl_Door_Ana", 0x660, 0x00000090 diff --git a/data/overlays/actors/z_door_ana.rodata.s b/data/overlays/actors/z_door_ana.rodata.s deleted file mode 100644 index e435196162..0000000000 --- a/data/overlays/actors/z_door_ana.rodata.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 purposee registers - -.section .rodata - -glabel D_80994510 - - .asciz "../z_door_ana.c" - .balign 4 - -glabel D_80994520 - - .asciz "../z_door_ana.c" - .balign 4 - -glabel D_80994530 - - .asciz "../z_door_ana.c" - .balign 4 - -glabel D_80994540 - .word 0x471C4000, 0x00000000, 0x00000000, 0x00000000 - - diff --git a/data/overlays/actors/z_en_dog.data.s b/data/overlays/actors/z_en_dog.data.s deleted file mode 100644 index a33e77a76f..0000000000 --- a/data/overlays/actors/z_en_dog.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 purposee registers - -.section .data - -glabel En_Dog_InitVars - .word 0x019B0400, 0x00000000, 0x016B0000, 0x00000290 -.word EnDog_Init -.word EnDog_Destroy -.word EnDog_Update -.word EnDog_Draw -glabel D_809FBF10 - .word 0x06000939, 0x10010000, 0x00000000, 0x00000000, 0x00000000, 0xFFCFFFFF, 0x00000000, 0x00010100, 0x00100014, 0x00000000, 0x00000000 -glabel D_809FBF3C - .word 0x00000000, 0x00000000, 0x32000000 -glabel D_809FBF48 - .word 0x06001368, 0x3F800000, 0x00000000, 0xBF800000, 0x00000000, 0x00000000, 0x06001368, 0x3F800000, 0x00000000, 0xBF800000, 0x00000000, 0xC0C00000, 0x06000D78, 0x3F800000, 0x00000000, 0xBF800000, 0x00000000, 0xC0C00000, 0x06000278, 0x3F800000, 0x00000000, 0xBF800000, 0x00000000, 0xC0C00000, 0x06001150, 0x3F800000, 0x00000000, 0x40800000, 0x02000000, 0xC0C00000, 0x06001150, 0x3F800000, 0x40A00000, 0x41C80000, 0x04000000, 0xC0C00000, 0x06000928, 0x3F800000, 0x00000000, 0x40C00000, 0x02000000, 0xC0C00000, 0x06000C28, 0x3F800000, 0x00000000, 0xBF800000, 0x00000000, 0xC0C00000 -glabel D_809FC008 - .word 0x00000003, 0x00000005, 0x00000002 -glabel D_809FC014 - .word 0x00000028, 0x00000050, 0x00000014 -glabel D_809FC020 - .word 0xFFFFC800, 0x96643200, 0x00000000, 0x00000000 - diff --git a/data/overlays/actors/z_en_dog.reloc.s b/data/overlays/actors/z_en_dog.reloc.s deleted file mode 100644 index f77267065b..0000000000 --- a/data/overlays/actors/z_en_dog.reloc.s +++ /dev/null @@ -1,11 +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 purposee registers - -.section .rodata -glabel D_809FC080 - -.incbin "baserom/ovl_En_Dog", 0x10B0, 0x00000150 diff --git a/data/overlays/actors/z_en_dog.rodata.s b/data/overlays/actors/z_en_dog.rodata.s deleted file mode 100644 index 62684d78f9..0000000000 --- a/data/overlays/actors/z_en_dog.rodata.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 purposee registers - -.section .rodata - -glabel D_809FC030 - .asciz "../z_en_dog.c" - .balign 4 - -glabel D_809FC040 - .asciz "../z_en_dog.c" - .balign 4 - -glabel jtbl_809FC050 -.word L809FB178 -.word L809FB184 -.word L809FB190 -.word L809FB19C -.word L809FB1B0 -.word L809FB1A8 -glabel jtbl_809FC068 -.word L809FB260 -.word L809FB270 -.word L809FB280 -.word L809FB1E8 -.word L809FB288 -.word L809FB224 - - diff --git a/data/overlays/actors/z_en_ds.data.s b/data/overlays/actors/z_en_ds.data.s deleted file mode 100644 index e25cfb1e6c..0000000000 --- a/data/overlays/actors/z_en_ds.data.s +++ /dev/null @@ -1,18 +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 purposee registers - -.section .data - -glabel En_Ds_InitVars - .word 0x01490400, 0x00000009, 0x010F0000, 0x000001F0 -.word EnDs_Init -.word EnDs_Destroy -.word EnDs_Update -.word EnDs_Draw -glabel D_809FDB40 - .word 0x44898000, 0x43FA0000, 0x00000000, 0x00000000 - diff --git a/data/overlays/actors/z_en_ds.reloc.s b/data/overlays/actors/z_en_ds.reloc.s deleted file mode 100644 index ee25105444..0000000000 --- a/data/overlays/actors/z_en_ds.reloc.s +++ /dev/null @@ -1,11 +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 purposee registers - -.section .rodata -glabel D_809FDB50 - -.incbin "baserom/ovl_En_Ds", 0xB20, 0x000000E0 diff --git a/data/overlays/actors/z_en_lightbox.data.s b/data/overlays/actors/z_en_lightbox.data.s deleted file mode 100644 index 678fa31f26..0000000000 --- a/data/overlays/actors/z_en_lightbox.data.s +++ /dev/null @@ -1,16 +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 purposee registers - -.section .data - -glabel En_Lightbox_InitVars - .word 0x007C0600, 0x00000010, 0x00810000, 0x00000164 -.word EnLightbox_Init -.word EnLightbox_Destroy -.word EnLightbox_Update -.word EnLightbox_Draw - diff --git a/data/overlays/actors/z_en_lightbox.reloc.s b/data/overlays/actors/z_en_lightbox.reloc.s deleted file mode 100644 index 60affc2f04..0000000000 --- a/data/overlays/actors/z_en_lightbox.reloc.s +++ /dev/null @@ -1,11 +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 purposee registers - -.section .rodata -glabel D_80A9EE10 - -.incbin "baserom/ovl_En_Lightbox", 0x440, 0x00000030 diff --git a/data/overlays/actors/z_en_lightbox.rodata.s b/data/overlays/actors/z_en_lightbox.rodata.s deleted file mode 100644 index fc3c134c7b..0000000000 --- a/data/overlays/actors/z_en_lightbox.rodata.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 purposee registers - -.section .rodata - -glabel D_80A9EE00 - .word 0x3F333333, 0x00000000, 0x00000000, 0x00000000 - - diff --git a/data/overlays/actors/z_en_ru2.data.s b/data/overlays/actors/z_en_ru2.data.s deleted file mode 100644 index 70702ce4f0..0000000000 --- a/data/overlays/actors/z_en_ru2.data.s +++ /dev/null @@ -1,50 +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 purposee registers - -.section .data - -glabel D_80AF40E0 - .word 0x0A000900, 0x01000000, 0x00000000, 0x00000000, 0x00000000, 0x00000080, 0x00000000, 0x00010000, 0x001E0064, 0x00000000, 0x00000000 -glabel D_80AF410C - .word 0x06000F20, 0x060022E0, 0x06002AE0 -glabel D_80AF4118 - .word 0x00000000 -glabel D_80AF411C - .word 0x00000023, 0x00000D0A, 0x00000020, 0x00000001, 0x00010000, 0x0BB80000, 0x00000000, 0x00000000, 0xFFFFFFFC, 0x00000002, 0x00000000, 0xFFFFFFFC, 0x00000002, 0x00000000, 0x00000000, 0x00000000, 0x0000001F, 0x00000005, 0x00010000, 0x033D0000, 0x00000000, 0x00000000, 0x000000D8, 0x00000000, 0x00000000, 0x000000D8, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0002033D, 0x033E0000, 0x00000000, 0x00000000, 0x000000D8, 0x00000000, 0x00000000, 0x000000D8, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0004033E, 0x03820000, 0x00000000, 0x00000000, 0x000000D8, 0x00000000, 0x00000000, 0x000000D8, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00020382, 0x03B40000, 0x00000000, 0x00000000, 0x000000D8, 0x00000000, 0x00000000, 0x00000052, 0x00000000, 0x00000000, 0xC02B851F, 0x00000000, 0x000303B4, 0x0D0A0000, 0x00000000, 0x00000000, 0x00000052, 0x00000000, 0x00000000, 0x00000052, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000000A, 0x00000005, 0x000D0000, 0x00F00000, 0x00000000, 0x00000000, 0x00000006, 0x00000000, 0x00000000, 0x00000006, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x000500F0, 0x02080000, 0x40000000, 0x00000000, 0x00000006, 0x00000000, 0x00000000, 0x00000006, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00030208, 0x02260000, 0x40000000, 0x00000000, 0x00000006, 0x00000000, 0x00000000, 0x00000006, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00050226, 0x03210000, 0x40000000, 0x00000000, 0x00000006, 0x00000000, 0x00000000, 0x00000006, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00130321, 0x07A40000, 0xC0000000, 0x00000000, 0x00000006, 0x00000000, 0x00000000, 0x00000006, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000031, 0x00000001, 0x00010000, 0x0BB80000, 0x00000000, 0x00000000, 0xFFFFFFF0, 0xFFFFFF87, 0x00000000, 0xFFFFFFF0, 0xFFFFFF87, 0x00000000, 0x00000000, 0x00000000, 0x00000004, 0x00000005, 0x00050000, 0x01800000, 0x00000000, 0xFFFFFFA1, 0x00000000, 0x00000058, 0xFFFFFFA1, 0x00000000, 0x00000058, 0x00000000, 0x00000000, 0x00000000, 0x00060180, 0x01C60000, 0x00000000, 0xFFFFFFA1, 0x00000000, 0x00000058, 0xFFFFFFA1, 0x00000000, 0x00000058, 0x00000000, 0x00000000, 0x00000000, 0x000501C6, 0x022A0000, 0x00000000, 0xFFFFFFA1, 0x00000000, 0x00000058, 0xFFFFFFA1, 0x00000000, 0x00000058, 0x00000000, 0x00000000, 0x00000000, 0x0006022A, 0x02700000, 0x00000000, 0xFFFFFFA1, 0x00000000, 0x00000058, 0xFFFFFFA1, 0x00000000, 0x00000058, 0x00000000, 0x00000000, 0x00000000, 0x00050270, 0x0BB90000, 0x00000000, 0xFFFFFFA1, 0x00000000, 0x00000058, 0xFFFFFFA1, 0x00000000, 0x00000058, 0x00000000, 0x00000000, 0x00000000, 0x00000027, 0x00000001, 0x00010000, 0x0BB80000, 0x00000000, 0x00000000, 0x00000000, 0xFFFFFFFE, 0x00000000, 0x00000000, 0xFFFFFFFE, 0x00000000, 0x00000000, 0x00000000, 0x0000002A, 0x00000003, 0x00010000, 0x00920000, 0x00000000, 0x000000C3, 0x00000006, 0x00000000, 0x000000C3, 0x00000006, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00020092, 0x02F20000, 0x00000000, 0x000000C3, 0x00000006, 0x00000000, 0x000000C3, 0x00000006, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x000302F2, 0x0A440000, 0x00000000, 0x000000C3, 0x00000006, 0x00000000, 0x000000C3, 0x00000006, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000002D, 0x00000001, 0x0001032A, 0x03370337, 0x0000002D, 0x00000001, 0x00050339, 0x03570357, 0x0000002D, 0x00000001, 0x00010442, 0x04610461, 0x00000001, 0x00010000, 0x012D0000, 0x00000000, 0x432F65F8, 0xFD97001E, 0x00470000, 0x00000000, 0x432F65F8, 0xFD97001E, 0x00471FBC, 0x00000000, 0x432F65F8, 0xFD97001E, 0x0047D5E0, 0x00000000, 0x432F65F8, 0xFD97001E, 0x00470000, 0x00000000, 0x432F65F8, 0xFD97001E, 0x00471F98, 0x00000000, 0x432F65F8, 0xFD97001E, 0x00470000, 0x00000000, 0x4311CC7C, 0xFE38006B, 0x00380000, 0x00000000, 0x42726667, 0xFFB40036, 0x00470164, 0x00000000, 0x42726667, 0x00740036, 0x00602100, 0x00000000, 0x42726667, 0x00EC000B, 0x00400049, 0x00000000, 0x42726667, 0x00EC000B, 0x0040204C, 0x00000000, 0x42726667, 0x00EC000B, 0x0040E990, 0xFF000000, 0x42726667, 0x00EC000B, 0x00400000, 0x00000001, 0x00010107, 0x05CC0000, 0x00000000, 0x4228E87B, 0x00A10035, 0x001A0000, 0x00000000, 0x4228E87B, 0x00A10035, 0x001A1FBC, 0x00000000, 0x4228E87B, 0x00A10035, 0x001AD5E0, 0x00000000, 0x4228E87B, 0x00820009, 0x00600000, 0x00000000, 0x4228E87B, 0x00820009, 0x00601F98, 0x00000000, 0x4228E87B, 0x00820009, 0x00600000, 0x00000000, 0x4228E87B, 0x00820009, 0x00600000, 0xFF000000, 0x4228E87B, 0x00820009, 0x00600164, 0x00000001, 0x0001017F, 0x05C20000, 0x00000000, 0x428C743C, 0x00CF002D, 0x00220000, 0x00000000, 0x428C743C, 0x00CF002D, 0x00221FBC, 0x00000000, 0x428C743C, 0x00CF002D, 0x0022D5E0, 0x00000000, 0x428C743C, 0x00CF002D, 0x00220000, 0xFF000000, 0x428C743C, 0x00CF002D, 0x00221F98, 0x00000001, 0x000101C5, 0x06080000, 0x00000000, 0x42341BB1, 0xFFC6005A, 0x00460000, 0x00000000, 0x42341BB1, 0xFFC6005A, 0x00461FBC, 0x00000000, 0x42341BB1, 0xFFC6005A, 0x0046D5E0, 0x00000000, 0x42341BB1, 0xFFC6005A, 0x00460000, 0xFF000000, 0x42341BB1, 0xFFC6005A, 0x00461F98, 0x00000001, 0x00010229, 0x066C0000, 0x00000000, 0x428C743C, 0x00CF002D, 0x00220000, 0x00000000, 0x428C743C, 0x00CF002D, 0x00221FBC, 0x00000000, 0x428C743C, 0x00CF002D, 0x0022D5E0, 0x00000000, 0x428C743C, 0x00CF002D, 0x00220000, 0xFF000000, 0x428C743C, 0x00CF002D, 0x00221F98, 0x00000001, 0x0001026F, 0x06B20000, 0x00000000, 0x4271B55A, 0x00A1003B, 0x00000000, 0x00000000, 0x4271B55A, 0x00A1003B, 0x00001FBC, 0x00000000, 0x4271B55A, 0x00A1003B, 0x0000D5E0, 0x00000000, 0x4271B55A, 0x00A1003B, 0x00000000, 0xFF000000, 0x4271B55A, 0x00A1003B, 0x00001F98, 0x00000001, 0x000102B5, 0x06F80000, 0x00000000, 0x4271B55A, 0x00970052, 0x00230000, 0x00000000, 0x4271B55A, 0x00970052, 0x00231FBC, 0x00000000, 0x4271B55A, 0x00970052, 0x0023D5E0, 0x00000000, 0x4271B55A, 0x00970052, 0x00230000, 0xFF000000, 0x4271B55A, 0x00970052, 0x00231F98, 0x00000001, 0x000102FB, 0x03B00000, 0x00000000, 0x4271B55A, 0x00E60007, 0x00180000, 0x00000000, 0x4271B55A, 0x00E60007, 0x00181FBC, 0x00000000, 0x4271B55A, 0x00E60007, 0x0018D5E0, 0x00000000, 0x4271B55A, 0x00CF003E, 0x000F0000, 0x00000000, 0x428CDAA2, 0x00E600F0, 0x00181F98, 0x00000000, 0x428CDAA2, 0x00E600F0, 0x00180000, 0x00000000, 0x428CDAA2, 0x00E600F0, 0x00180000, 0xFF000000, 0x428CDAA2, 0x00E600F0, 0x00180164, 0x00000001, 0x00010337, 0x048D0000, 0x00000000, 0x42700000, 0x000D0356, 0x00020000, 0x00000000, 0x42700000, 0x00090355, 0x00051FBC, 0x00000000, 0x42700000, 0xFFFD0355, 0x0005D5E0, 0x00000000, 0x42700000, 0xFFF70355, 0xFFFA0000, 0x00000000, 0x42700000, 0xFFFE0354, 0xFFEF1F98, 0x00000000, 0x42700000, 0x00090354, 0xFFEF0000, 0x00000000, 0x42700000, 0x00100354, 0xFFFA0000, 0x00000000, 0x42700000, 0x00090354, 0x00050164, 0xFF000000, 0x42700000, 0xFFFD0353, 0x00052100, 0x00000005, 0x00010383, 0x08200000, 0x00000000, 0x4289332C, 0x00000021, 0xFFE50000, 0x00000000, 0x4289332C, 0x00000021, 0xFFE51FBC, 0x00000000, 0x4289332C, 0x00000044, 0xFFE6D5E0, 0x00000000, 0x4289332C, 0x00000067, 0xFFE60000, 0x00000000, 0x4289332C, 0x00000067, 0xFFE61F98, 0x00000000, 0x4289332C, 0x00000067, 0xFFE60000, 0x00000000, 0x4289332C, 0x00000067, 0xFFE60000, 0xFF000000, 0x4289332C, 0x00000067, 0xFFE60164, 0x00000002, 0x00010000, 0x014A0000, 0x001E0014, 0x432F65F8, 0xFD77FFB5, 0x00650000, 0x00E20014, 0x432F65F8, 0xFD74FFB5, 0x00621FBC, 0x001E0014, 0x432F65F8, 0xFD6EFFB5, 0x0057D5E0, 0x00E20014, 0x432F65F8, 0xFD5A007F, 0x00470000, 0x00000014, 0x432F65F8, 0xFD290000, 0x00471F98, 0x00000014, 0x4311CC7C, 0xFDFF0000, 0x002B0000, 0x0000001E, 0x42726667, 0xFEA30059, 0x002F0000, 0x0000001E, 0x42726667, 0x0006003D, 0x00010164, 0x0000001E, 0x42726667, 0x00210042, 0x001C2100, 0x0000001E, 0x42726667, 0x009E002A, 0x00010049, 0x0000001E, 0x42726667, 0x009E002A, 0x0001204C, 0x0000001E, 0x42726667, 0x009E002A, 0x0001E990, 0xFF00001E, 0x42726667, 0x009E002A, 0x00010000, 0x00000002, 0x00010107, 0x05E90000, 0x0000001E, 0x4228E87B, 0x0142003E, 0xFF860000, 0x0000001E, 0x4228E87B, 0x0142003E, 0xFF861FBC, 0x00000032, 0x4228E87B, 0x0142003E, 0xFF86D5E0, 0x00000032, 0x4228E87B, 0x00E8003F, 0xFFAD0000, 0x0000001E, 0x4228E87B, 0x00E8003F, 0xFFAD1F98, 0x000003E8, 0x4228E87B, 0x00E8003F, 0xFFAD0000, 0x0000001E, 0x4228E87B, 0x00E8003F, 0xFFAD0000, 0xFF00001E, 0x4228E87B, 0x00E8003F, 0xFFAD0164, 0x00000002, 0x0001017F, 0x05DF0000, 0x0000001E, 0x428C743C, 0x0033003E, 0xFF970000, 0x0000001E, 0x428C743C, 0x0033003E, 0xFF971FBC, 0x000003E8, 0x428C743C, 0x0033003E, 0xFF97D5E0, 0x0000001E, 0x428C743C, 0x0033003E, 0xFF970000, 0xFF00001E, 0x428C743C, 0x0033003E, 0xFF971F98, 0x00000002, 0x000101C5, 0x06250000, 0x0000001E, 0x42341BB1, 0x00660016, 0xFFE10000, 0x0000001E, 0x42341BB1, 0x00660016, 0xFFE11FBC, 0x000003E8, 0x42341BB1, 0x00660016, 0xFFE1D5E0, 0x0000001E, 0x42341BB1, 0x00660016, 0xFFE10000, 0xFF00001E, 0x42341BB1, 0x00660016, 0xFFE11F98, 0x00000002, 0x00010229, 0x06890000, 0x0000001E, 0x428C743C, 0x0033003E, 0xFF970000, 0x0000001E, 0x428C743C, 0x0033003E, 0xFF971FBC, 0x000003E8, 0x428C743C, 0x0033003E, 0xFF97D5E0, 0x0000001E, 0x428C743C, 0x0033003E, 0xFF970000, 0xFF00001E, 0x428C743C, 0x0033003E, 0xFF971F98, 0x00000002, 0x0001026F, 0x06CF0000, 0x0000001E, 0x4271B55A, 0x015B0016, 0x00000000, 0x0000001E, 0x4271B55A, 0x015B0016, 0x00001FBC, 0x000003E8, 0x4271B55A, 0x015B0016, 0x0000D5E0, 0x0000001E, 0x4271B55A, 0x015B0016, 0x00000000, 0xFF00001E, 0x4271B55A, 0x015B0016, 0x00001F98, 0x00000002, 0x000102B5, 0x07150000, 0x0000001E, 0x4271B55A, 0x0102FFE2, 0xFFCA0000, 0x0000001E, 0x4271B55A, 0x0102FFE2, 0xFFCA1FBC, 0x000003E8, 0x4271B55A, 0x0102FFE2, 0xFFCAD5E0, 0x0000001E, 0x4271B55A, 0x0102FFE2, 0xFFCA0000, 0xFF00001E, 0x4271B55A, 0x0102FFE2, 0xFFCA1F98, 0x00000002, 0x000102FB, 0x03CD0000, 0x0000001E, 0x4271B55A, 0x00600069, 0xFFE30000, 0x00000028, 0x4271B55A, 0x00600069, 0xFFE31FBC, 0x0000000F, 0x4271B55A, 0x00600069, 0xFFE3D5E0, 0x0000000F, 0x42701BC0, 0x006E00C4, 0xFFE60000, 0x00000014, 0x428CDAA2, 0x00B9018F, 0x00061F98, 0x0000001E, 0x428CDAA2, 0x00B9018F, 0x00060000, 0x0000001E, 0x428CDAA2, 0x00B9018F, 0x00060000, 0xFF00001E, 0x428CDAA2, 0x00B9018F, 0x00060164, 0x00000002, 0x00010337, 0x04BE0000, 0x00000032, 0x42700000, 0x00030006, 0xFFFA0000, 0x00000028, 0x42700000, 0x00030006, 0xFFFA1FBC, 0x0000001E, 0x424BFFF7, 0x00030006, 0xFFFAD5E0, 0x00000014, 0x41A4CC7E, 0x00030006, 0xFFFA0000, 0x00000033, 0x412CCC23, 0x00030006, 0xFFFA1F98, 0x00000032, 0x412665BD, 0x00030006, 0xFFFA0000, 0x00000032, 0x412665BD, 0x00030006, 0xFFFA0000, 0x00000032, 0x4123328A, 0x00030006, 0xFFFA0164, 0xFF000032, 0x412FFF56, 0x00030006, 0xFFFA2100, 0x00000006, 0x00010383, 0x083D0000, 0x0000001E, 0x4289332C, 0x00000064, 0x00050000, 0x0000001E, 0x4289332C, 0x00000065, 0x00061FBC, 0x0000001E, 0x4289332C, 0x00010063, 0x0029D5E0, 0x0000001E, 0x4289332C, 0x0000002A, 0x00100000, 0x0000001E, 0x4289332C, 0x0000002A, 0x00101F98, 0x000003E8, 0x4289332C, 0x0000002A, 0x00100000, 0x0000001E, 0x4289332C, 0x0000002A, 0x00100000, 0xFF00001E, 0x4289332C, 0x0000002A, 0x00100164, 0x0000003E, 0x00000001, 0x00040000, 0x0BB8C10F, 0x00000000, 0x0000004D, 0x00000050, 0xFFFFFFFE, 0x00000000, 0x00000050, 0x00000000, 0xBCD242E7, 0x00000000, 0x3CD242E7, 0x00000013, 0x0000000E, 0xFFFF0000, 0x018AFFFF, 0xFFFFFFFF, 0x4041018A, 0x01BC0000, 0x00000000, 0xFFFF01BC, 0x01D0FFFF, 0xFFFFFFFF, 0x404601D0, 0x021F0000, 0x00000000, 0xFFFF021F, 0x0234FFFF, 0xFFFFFFFF, 0x40490234, 0x02650000, 0x00000000, 0xFFFF0265, 0x027AFFFF, 0xFFFFFFFF, 0x4047027A, 0x02AC0000, 0x00000000, 0xFFFF02AC, 0x02C0FFFF, 0xFFFFFFFF, 0x404A02C0, 0x02EE0000, 0x00000000, 0xFFFF02EE, 0x043DFFFF, 0xFFFFFFFF, 0x003D043D, 0x04420000, 0x00000000, 0xFFFF0442, 0x047EFFFF, 0xFFFFFFFF, 0x4042047E, 0x04880000, 0x00000000, 0x000003E8, 0x00000001, 0x001504A6, 0x04BD04BD, 0x00000056, 0x00000001, 0x00440384, 0x03850000, 0x00000000, 0x00000000, 0xFFFFFFC7, 0x00000034, 0x00000000, 0xFFFFFFC7, 0x00000034, 0x00000000, 0x00000000, 0x00000000, 0x0000007C, 0x00000001, 0x00040320, 0x03520000, 0x00000000, 0x00000000, 0xFFFFFFC6, 0x00000030, 0x00000000, 0xFFFFFFC6, 0x00000030, 0x00000000, 0x00000000, 0x00000000, 0xFFFFFFFF, 0x00000000 -glabel D_80AF50BC - .word func_80AF2CB4 -.word func_80AF2CD4 -.word func_80AF2CF4 -.word func_80AF2D2C -.word func_80AF2D6C -.word func_80AF2DAC -.word func_80AF2DEC -.word func_80AF3144 -.word func_80AF3174 -.word func_80AF31C8 -.word func_80AF3604 -.word func_80AF3624 -.word func_80AF366C -.word func_80AF36AC -.word func_80AF3BC8 -.word func_80AF3C04 -.word func_80AF3C64 -.word func_80AF3CB8 -.word func_80AF3D0C -.word func_80AF3D60 -glabel D_80AF510C - .word func_80AF3F14 -.word func_80AF3F20 -.word func_80AF321C -glabel En_Ru2_InitVars - .word 0x00D20400, 0x00000010, 0x00CA0000, 0x00000314 -.word EnRu2_Init -.word EnRu2_Destroy -.word EnRu2_Update -.word EnRu2_Draw -.word 0x00000000, 0x00000000 - diff --git a/data/overlays/actors/z_en_ru2.reloc.s b/data/overlays/actors/z_en_ru2.reloc.s deleted file mode 100644 index 953647ce15..0000000000 --- a/data/overlays/actors/z_en_ru2.reloc.s +++ /dev/null @@ -1,11 +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 purposee registers - -.section .rodata -glabel D_80AF5290 - -.incbin "baserom/ovl_En_Ru2", 0x2D40, 0x000002D0 diff --git a/data/overlays/actors/z_en_ru2.rodata.s b/data/overlays/actors/z_en_ru2.rodata.s deleted file mode 100644 index 867fc783bc..0000000000 --- a/data/overlays/actors/z_en_ru2.rodata.s +++ /dev/null @@ -1,51 +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 purposee registers - -.section .rodata - -glabel D_80AF5140 - .asciz "../z_en_ru2_inKenjyanomaDemo02.c" - .balign 4 - -glabel D_80AF5164 - .asciz "../z_en_ru2_inKenjyanomaDemo02.c" - .balign 4 - -glabel D_80AF5188 - .asciz "En_Ru2_inEnding_Check_DemoMode:そんな動作は無い!!!!!!!!\n" - .balign 4 - -.balign 4 - -glabel D_80AF51C4 - .word 0xA4AAA4EC, 0xA4ACBEAE, 0xBEBEA4C0, 0xA1AA200A, 0x00000000 -glabel D_80AF51D8 - .word 0xA4A6A4AA, 0xA4EAA4E3, 0xA1BCA1AA, 0x200A0000 -glabel D_80AF51E8 - .asciz "メインモードがおかしい!!!!!!!!!!!!!!!!!!!!!!!!!\n" - .balign 4 - -.balign 4 - -glabel D_80AF5224 - .asciz "../z_en_ru2.c" - .balign 4 - -glabel D_80AF5234 - .asciz "../z_en_ru2.c" - .balign 4 - -glabel D_80AF5244 - .asciz "描画モードがおかしい!!!!!!!!!!!!!!!!!!!!!!!!!\n" - .balign 4 - -glabel D_80AF527C - .word 0x42A6AAAB -glabel D_80AF5280 - .word 0xC61C4000, 0x00000000, 0x00000000, 0x00000000 - - diff --git a/data/overlays/actors/z_en_tana.data.s b/data/overlays/actors/z_en_tana.data.s deleted file mode 100644 index bfaeed8ec2..0000000000 --- a/data/overlays/actors/z_en_tana.data.s +++ /dev/null @@ -1,27 +0,0 @@ -.include "macro.inc" - - # assembler directives - .set noat # allow manual use of $at - .set noreorder # don't insert nops after branches - .set gp=64 # allow use of 64-bit general purposee registers - -.section .data - -glabel En_Tana_InitVars - .word 0x00C20600, 0x00000009, 0x00B20000, 0x0000014C -.word EnTana_Init -.word EnTana_Destroy -.word EnTana_Update -.word 0x00000000 -glabel D_80B18200 - .word D_80B18230 -.word D_80B18238 -glabel D_80B18208 - .word func_80B17FC4 -.word func_80B1809C -.word func_80B1809C -glabel D_80B18214 - .word 0x06000B80, 0x060027E8, 0x060027E8 -glabel D_80B18220 - .word 0x00000000, 0x06000E08, 0x06001608, 0x00000000 - diff --git a/data/overlays/actors/z_en_tana.reloc.s b/data/overlays/actors/z_en_tana.reloc.s deleted file mode 100644 index b8a9b26409..0000000000 --- a/data/overlays/actors/z_en_tana.reloc.s +++ /dev/null @@ -1,11 +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 purposee registers - -.section .rodata -glabel D_80B182C0 - -.incbin "baserom/ovl_En_Tana", 0x390, 0x000000A0 diff --git a/data/overlays/actors/z_en_tana.rodata.s b/data/overlays/actors/z_en_tana.rodata.s deleted file mode 100644 index 4d24152e2d..0000000000 --- a/data/overlays/actors/z_en_tana.rodata.s +++ /dev/null @@ -1,41 +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 purposee registers - -.section .rodata - -glabel D_80B18230 - .word 0xCCDAA4CE, 0xC3AA0000 -glabel D_80B18238 - .word 0xC0D0A4CE, 0xC3AA0000 -glabel D_80B18240 - .asciz "☆☆☆ %s ☆☆☆\n" - .balign 4 - -glabel D_80B18254 - .asciz "../z_en_tana.c" - .balign 4 - -glabel D_80B18264 - .asciz "../z_en_tana.c" - .balign 4 - -glabel D_80B18274 - .asciz "../z_en_tana.c" - .balign 4 - -glabel D_80B18284 - .asciz "../z_en_tana.c" - .balign 4 - -glabel D_80B18294 - .asciz "../z_en_tana.c" - .balign 4 - -glabel D_80B182A4 - .word 0x2E2E2F7A, 0x5F656E5F, 0x74616E61, 0x2E630000, 0x00000000, 0x00000000, 0x00000000 - - diff --git a/data/overlays/actors/z_en_tk.data.s b/data/overlays/actors/z_en_tk.data.s deleted file mode 100644 index 8bd649aeca..0000000000 --- a/data/overlays/actors/z_en_tk.data.s +++ /dev/null @@ -1,42 +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 purposee registers - -.section .data - -glabel En_Tk_InitVars - .word 0x00850400, 0x00000009, 0x00890000, 0x00000770 -.word EnTk_Init -.word EnTk_Destroy -.word EnTk_Update -.word EnTk_Draw -glabel D_80B1D4D0 - .word 0x040539B0, 0x040535B0, 0x040531B0, 0x04052DB0, 0x040529B0, 0x040525B0, 0x040521B0, 0x04051DB0 -glabel D_80B1D4F0 - .word 0x00000000, 0x00000000, 0x00000000 -glabel D_80B1D4FC - .word 0x00000000, 0x3E99999A, 0x00000000 -glabel D_80B1D508 - .word 0x0A000039, 0x20010000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000100, 0x001E0034, 0x00000000, 0x00000000 -glabel D_80B1D534 - .word 0x00000000, 0x00000000, 0xFF000000 -glabel D_80B1D540 - .word 0x42100000, 0x41200000 -glabel D_80B1D548 - .word 0x00000000, 0x00000000, 0x00000000 -glabel D_80B1D554 - .word 0x00000000, 0x00000000, 0x00000000 -glabel D_80B1D560 - .word 0x00000000, 0x3E99999A, 0x00000000 -glabel D_80B1D56C - .word 0x00000000, 0x00000001, 0x00000002, 0x00000014, 0x00000006 -glabel D_80B1D580 - .word 0x00000000, 0x00000000, 0x458FC000 -glabel D_80B1D58C - .word 0x00000000, 0x00000000, 0x00000000 -glabel D_80B1D598 - .word 0x06003B40, 0x06004340, 0x06004B40, 0x00000000, 0x00000000, 0x00000000 - diff --git a/data/overlays/actors/z_en_tk.reloc.s b/data/overlays/actors/z_en_tk.reloc.s deleted file mode 100644 index e63a357638..0000000000 --- a/data/overlays/actors/z_en_tk.reloc.s +++ /dev/null @@ -1,11 +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 purposee registers - -.section .rodata -glabel D_80B1D690 - -.incbin "baserom/ovl_En_Tk", 0x1D90, 0x00000200 diff --git a/data/overlays/actors/z_en_tk.rodata.s b/data/overlays/actors/z_en_tk.rodata.s deleted file mode 100644 index 8b109d004a..0000000000 --- a/data/overlays/actors/z_en_tk.rodata.s +++ /dev/null @@ -1,70 +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 purposee registers - -.section .rodata - -glabel D_80B1D5B0 - .asciz "../z_en_tk_eff.c" - .balign 4 - -glabel D_80B1D5C4 - .asciz "../z_en_tk_eff.c" - .balign 4 - -glabel D_80B1D5D8 - .asciz "../z_en_tk_eff.c" - .balign 4 - -glabel D_80B1D5EC - .asciz "../z_en_tk.c" - .balign 4 - -glabel D_80B1D5FC - .asciz "../z_en_tk.c" - .balign 4 - -glabel D_80B1D60C - .asciz "../z_en_tk.c" - .balign 4 - -glabel D_80B1D61C - .asciz "../z_en_tk.c" - .balign 4 - -glabel D_80B1D62C - .word 0x3E4CCCCD -glabel D_80B1D630 - .word 0x3ECCCCCD -glabel D_80B1D634 - .word 0x461C4000 -glabel D_80B1D638 - .word 0x452AAAAB -glabel D_80B1D63C - .word 0x4622F983 -glabel jtbl_80B1D640 -.word L80B1C724 -.word L80B1C724 -.word L80B1C5EC -.word L80B1C724 -.word L80B1C614 -.word L80B1C6E4 -.word L80B1C724 -.word L80B1C724 -.word L80B1C724 -.word L80B1C724 -glabel D_80B1D668 - .word 0x3ECCCCCD, 0x00000000 -glabel D_80B1D670 - .word 0x3FE66666, 0x66666666 -glabel D_80B1D678 - .word 0x3FECCCCC, 0xCCCCCCCD -glabel D_80B1D680 - .word 0x3DCCCCCD -glabel D_80B1D684 - .word 0xBDCCCCCD, 0x00000000, 0x00000000 - - diff --git a/data/overlays/actors/z_en_wallmas.data.s b/data/overlays/actors/z_en_wallmas.data.s deleted file mode 100644 index fca4a005de..0000000000 --- a/data/overlays/actors/z_en_wallmas.data.s +++ /dev/null @@ -1,26 +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 purposee registers - -.section .data - -glabel En_Wallmas_InitVars - .word 0x00110500, 0x00000015, 0x000B0000, 0x00000314 -.word EnWallmas_Init -.word EnWallmas_Destroy -.word EnWallmas_Update -.word EnWallmas_Draw -glabel D_80B30D10 - .word 0x00000939, 0x10010000, 0x00000000, 0x00000000, 0x00000000, 0xFFCFFFFF, 0x00000000, 0x00010100, 0x001E0028, 0x00000000, 0x00000000 -glabel D_80B30D3C - .word 0x0400001E, 0x00289600 -glabel D_80B30D44 - .word 0x10020102, 0x10020210, 0x01020424, 0x02440402, 0x02240044, 0x00000104, 0x02020804, 0x00000400 -glabel D_80B30D64 - .word 0x89170030, 0xB04C157C, 0x386CFA24 -glabel D_80B30D70 - .word 0x00000000, 0x00000000, 0x00000000, 0x00000000 - diff --git a/data/overlays/actors/z_en_wallmas.reloc.s b/data/overlays/actors/z_en_wallmas.reloc.s deleted file mode 100644 index 05b0026c12..0000000000 --- a/data/overlays/actors/z_en_wallmas.reloc.s +++ /dev/null @@ -1,11 +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 purposee registers - -.section .rodata -glabel D_80B30E10 - -.incbin "baserom/ovl_En_Wallmas", 0x18F0, 0x00000210 diff --git a/data/overlays/actors/z_en_wallmas.rodata.s b/data/overlays/actors/z_en_wallmas.rodata.s deleted file mode 100644 index 937adf2ad8..0000000000 --- a/data/overlays/actors/z_en_wallmas.rodata.s +++ /dev/null @@ -1,41 +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 purposee registers - -.section .rodata - -glabel D_80B30D80 - .asciz "../z_en_wallmas.c" - .balign 4 - -glabel D_80B30D94 - .asciz "../z_en_wallmas.c" - .balign 4 - -glabel D_80B30DA8 - .asciz "../z_en_wallmas.c" - .balign 4 - -glabel D_80B30DBC - .asciz "../z_en_wallmas.c" - .balign 4 - -glabel D_80B30DD0 - .asciz "../z_en_wallmas.c" - .balign 4 - -glabel D_80B30DE4 - .asciz "../z_en_wallmas.c" - .balign 4 - -glabel D_80B30DF8 - .word 0x3BCCCCCD -glabel D_80B30DFC - .word 0x3F860A92 -glabel D_80B30E00 - .word 0x3E860A92, 0x00000000, 0x00000000, 0x00000000 - - diff --git a/data/overlays/actors/z_obj_bombiwa.data.s b/data/overlays/actors/z_obj_bombiwa.data.s deleted file mode 100644 index 8e75de6e79..0000000000 --- a/data/overlays/actors/z_obj_bombiwa.data.s +++ /dev/null @@ -1,26 +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 purposee registers - -.section .data - -glabel Obj_Bombiwa_InitVars - .word 0x01270600, 0x00000000, 0x01630000, 0x00000198 -.word ObjBombiwa_Init -.word ObjBombiwa_Destroy -.word ObjBombiwa_Update -.word ObjBombiwa_Draw -glabel D_80B91AA0 - .word 0x0C000D39, 0x20010000, 0x00000000, 0x00000000, 0x00000000, 0x4FC1FFFE, 0x00000000, 0x00010100, 0x00370046, 0x00000000, 0x00000000 -glabel D_80B91ACC - .word 0x0000000C, 0x003CFF00 -glabel D_80B91AD4 - .word 0xC8500064, 0xB0F407D0, 0xB0F8015E, 0x30FC03E8 -glabel D_80B91AE4 - .word 0x0011000E, 0x000A0008, 0x00070005, 0x00030002 -glabel D_80B91AF4 - .word 0x00000000, 0x00000000, 0x00000000 - diff --git a/data/overlays/actors/z_obj_bombiwa.reloc.s b/data/overlays/actors/z_obj_bombiwa.reloc.s deleted file mode 100644 index 924bca2fae..0000000000 --- a/data/overlays/actors/z_obj_bombiwa.reloc.s +++ /dev/null @@ -1,11 +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 purposee registers - -.section .rodata -glabel D_80B91B00 - -.incbin "baserom/ovl_Obj_Bombiwa", 0x510, 0x00000060 diff --git a/data/overlays/actors/z_obj_comb.data.s b/data/overlays/actors/z_obj_comb.data.s deleted file mode 100644 index a9cc43406d..0000000000 --- a/data/overlays/actors/z_obj_comb.data.s +++ /dev/null @@ -1,23 +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 purposee registers - -.section .data - -glabel Obj_Comb_InitVars - .word 0x019E0600, 0x00000000, 0x00020000, 0x000001B4 -.word ObjComb_Init -.word ObjComb_Destroy -.word ObjComb_Update -.word ObjComb_Draw -glabel D_80B922E0 - .word 0x00000000, 0x00000000, 0x00000000, 0x4001FFFE, 0x00000000, 0x00010100, 0x00000000, 0x00000000, 0x000F0064 -glabel D_80B92304 - .word 0x0A000909, 0x20000000, 0x00000001 -.word D_80B922E0 -glabel D_80B92314 - .word 0xC8500064, 0xB0F4044C, 0xB0F80064, 0x30FC0384, 0x00000000, 0x00000000, 0x00000000 - diff --git a/data/overlays/actors/z_obj_comb.reloc.s b/data/overlays/actors/z_obj_comb.reloc.s deleted file mode 100644 index 496dab5144..0000000000 --- a/data/overlays/actors/z_obj_comb.reloc.s +++ /dev/null @@ -1,11 +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 purposee registers - -.section .rodata -glabel D_80B92380 - -.incbin "baserom/ovl_Obj_Comb", 0x820, 0x000000A0 diff --git a/data/overlays/actors/z_obj_comb.rodata.s b/data/overlays/actors/z_obj_comb.rodata.s deleted file mode 100644 index 55967af28f..0000000000 --- a/data/overlays/actors/z_obj_comb.rodata.s +++ /dev/null @@ -1,37 +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 purposee registers - -.section .rodata - -glabel D_80B92330 - .asciz "../z_obj_comb.c" - .balign 4 - -glabel D_80B92340 - .asciz "../z_obj_comb.c" - .balign 4 - -glabel D_80B92350 - .asciz "../z_obj_comb.c" - .balign 4 - -glabel D_80B92360 - .word 0x3F19999A -glabel D_80B92364 - .word 0x3F333333 -glabel D_80B92368 - .word 0x3DCCCCCD -glabel D_80B9236C - .word 0x3F4CCCCD -glabel D_80B92370 - .word 0x38C90FDB -glabel D_80B92374 - .word 0x38C90FDB -glabel D_80B92378 - .word 0x38C90FDB, 0x00000000 - - diff --git a/data/overlays/gamestates/z_title.data.s b/data/overlays/gamestates/z_title.data.s deleted file mode 100644 index 3fd6874248..0000000000 --- a/data/overlays/gamestates/z_title.data.s +++ /dev/null @@ -1,15 +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 purposee registers - -.section .data - -glabel D_808009A0 - .word 0x00000000, 0x00000000 -glabel D_808009A8 - .word 0x64646400, 0x64646400 -glabel D_808009B0 - .word 0xFFFFFF00, 0xFFFFFF00, 0x45454500, 0x00000000 diff --git a/data/overlays/gamestates/z_title.reloc.s b/data/overlays/gamestates/z_title.reloc.s deleted file mode 100644 index 7dbe27a56e..0000000000 --- a/data/overlays/gamestates/z_title.reloc.s +++ /dev/null @@ -1,11 +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 purposee registers - -.section .rodata -glabel D_80800AB0 - -.incbin "baserom/ovl_title", 0xAB0, 0x000000E0 diff --git a/data/padmgr.bss.s b/data/padmgr.bss.s deleted file mode 100644 index ad5c89b723..0000000000 --- a/data/padmgr.bss.s +++ /dev/null @@ -1,11 +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 purposee registers - -.section .bss - -glabel D_8016A4F0 - .space 0x10 diff --git a/data/padmgr.data.s b/data/padmgr.data.s deleted file mode 100644 index f57e857025..0000000000 --- a/data/padmgr.data.s +++ /dev/null @@ -1,15 +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 purposee registers - -.section .data - -glabel D_8012D280 - .incbin "baserom.z64", 0xBA4420, 0x4 - -#errcnt -glabel D_8012D284 - .incbin "baserom.z64", 0xBA4424, 0xC diff --git a/data/z_debug.bss.s b/data/z_debug.bss.s deleted file mode 100644 index 08cab406d7..0000000000 --- a/data/z_debug.bss.s +++ /dev/null @@ -1,20 +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 purposee registers - -.section .bss - -glabel gGameInfo - .space 0x8 - -glabel D_8015FA98 - .space 0x3 - -glabel D_8015FA9B - .space 0x17D - -glabel D_8015FC18 - .space 0x98 diff --git a/data/z_debug.data.s b/data/z_debug.data.s deleted file mode 100644 index aeab7d5b89..0000000000 --- a/data/z_debug.data.s +++ /dev/null @@ -1,20 +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 purposee registers - -.section .data - -glabel D_8011E0B0 - .incbin "baserom.z64", 0xB95250, 0x4 - -glabel D_8011E0B4 - .incbin "baserom.z64", 0xB95254, 0x20 - -glabel D_8011E0D4 - .incbin "baserom.z64", 0xB95274, 0x74 - -glabel D_8011E148 - .incbin "baserom.z64", 0xB952E8, 0x28 diff --git a/data/code_80026B00.bss.s b/data/z_effect.bss.s similarity index 100% rename from data/code_80026B00.bss.s rename to data/z_effect.bss.s diff --git a/data/code_80026B00.data.s b/data/z_effect.data.s similarity index 100% rename from data/code_80026B00.data.s rename to data/z_effect.data.s diff --git a/data/z_elf_message.data.s b/data/z_elf_message.data.s deleted file mode 100644 index 6d6ef86d23..0000000000 --- a/data/z_elf_message.data.s +++ /dev/null @@ -1,14 +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 purposee registers - -.section .data - -glabel D_8011F3A0 - .incbin "baserom.z64", 0xB96540, 0x34 - -glabel D_8011F3D4 - .incbin "baserom.z64", 0xB96574, 0x1C diff --git a/data/z_game_dlftbls.data.s b/data/z_game_dlftbls.data.s deleted file mode 100644 index 2c2b63516f..0000000000 --- a/data/z_game_dlftbls.data.s +++ /dev/null @@ -1,26 +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 purposee registers - -.section .data - -glabel D_8011F830 - .incbin "baserom.z64", 0xB969D0, 0x30 - -glabel D_8011F860 - .incbin "baserom.z64", 0xB96A00, 0x30 - -glabel D_8011F890 - .incbin "baserom.z64", 0xB96A30, 0x30 - -glabel D_8011F8C0 - .incbin "baserom.z64", 0xB96A60, 0x30 - -glabel D_8011F8F0 - .incbin "baserom.z64", 0xB96A90, 0x30 - -glabel D_8011F920 - .incbin "baserom.z64", 0xB96AC0, 0x30 diff --git a/data/z_rcp.data.s b/data/z_rcp.data.s deleted file mode 100644 index 6f209282db..0000000000 --- a/data/z_rcp.data.s +++ /dev/null @@ -1,173 +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 purposee registers - -.section .data - -glabel D_80126280 - .incbin "baserom.z64", 0xB9D420, 0x60 - -glabel D_801262E0 - .incbin "baserom.z64", 0xB9D480, 0x60 - -glabel D_80126340 - .incbin "baserom.z64", 0xB9D4E0, 0x300 - -glabel D_80126640 - .incbin "baserom.z64", 0xB9D7E0, 0xF0 - -glabel D_80126730 - .incbin "baserom.z64", 0xB9D8D0, 0x30 - -glabel D_80126760 - .incbin "baserom.z64", 0xB9D900, 0x30 - -glabel D_80126790 - .incbin "baserom.z64", 0xB9D930, 0x30 - -glabel D_801267C0 - .incbin "baserom.z64", 0xB9D960, 0x90 - -glabel D_80126850 - .incbin "baserom.z64", 0xB9D9F0, 0x30 - -glabel D_80126880 - .incbin "baserom.z64", 0xB9DA20, 0x30 - -glabel D_801268B0 - .incbin "baserom.z64", 0xB9DA50, 0x30 - -glabel D_801268E0 - .incbin "baserom.z64", 0xB9DA80, 0x30 - -glabel D_80126910 - .incbin "baserom.z64", 0xB9DAB0, 0x30 - -glabel D_80126940 - .incbin "baserom.z64", 0xB9DAE0, 0x30 - -glabel D_80126970 - .incbin "baserom.z64", 0xB9DB10, 0x30 - -glabel D_801269A0 - .incbin "baserom.z64", 0xB9DB40, 0x30 - -glabel D_801269D0 - .incbin "baserom.z64", 0xB9DB70, 0x30 - -glabel D_80126A00 - .incbin "baserom.z64", 0xB9DBA0, 0x30 - -glabel D_80126A30 - .incbin "baserom.z64", 0xB9DBD0, 0x30 - -glabel D_80126A60 - .incbin "baserom.z64", 0xB9DC00, 0x30 - -glabel D_80126A90 - .incbin "baserom.z64", 0xB9DC30, 0x30 - -glabel D_80126AC0 - .incbin "baserom.z64", 0xB9DC60, 0x30 - -glabel D_80126AF0 - .incbin "baserom.z64", 0xB9DC90, 0x30 - -glabel D_80126B20 - .incbin "baserom.z64", 0xB9DCC0, 0x30 - -glabel D_80126B50 - .incbin "baserom.z64", 0xB9DCF0, 0x30 - -glabel D_80126B80 - .incbin "baserom.z64", 0xB9DD20, 0x30 - -glabel D_80126BB0 - .incbin "baserom.z64", 0xB9DD50, 0x30 - -glabel D_80126BE0 - .incbin "baserom.z64", 0xB9DD80, 0x30 - -glabel D_80126C10 - .incbin "baserom.z64", 0xB9DDB0, 0x30 - -glabel D_80126C40 - .incbin "baserom.z64", 0xB9DDE0, 0x30 - -glabel D_80126C70 - .incbin "baserom.z64", 0xB9DE10, 0x30 - -glabel D_80126CA0 - .incbin "baserom.z64", 0xB9DE40, 0x30 - -glabel D_80126CD0 - .incbin "baserom.z64", 0xB9DE70, 0x30 - -glabel D_80126D00 - .incbin "baserom.z64", 0xB9DEA0, 0x30 - -glabel D_80126D30 - .incbin "baserom.z64", 0xB9DED0, 0x30 - -glabel D_80126D60 - .incbin "baserom.z64", 0xB9DF00, 0x30 - -glabel D_80126D90 - .incbin "baserom.z64", 0xB9DF30, 0x30 - -glabel D_80126DC0 - .incbin "baserom.z64", 0xB9DF60, 0x30 - -glabel D_80126DF0 - .incbin "baserom.z64", 0xB9DF90, 0x90 - -glabel D_80126E80 - .incbin "baserom.z64", 0xB9E020, 0x30 - -glabel D_80126EB0 - .incbin "baserom.z64", 0xB9E050, 0x30 - -glabel D_80126EE0 - .incbin "baserom.z64", 0xB9E080, 0x30 - -glabel D_80126F10 - .incbin "baserom.z64", 0xB9E0B0, 0x30 - -glabel D_80126F40 - .incbin "baserom.z64", 0xB9E0E0, 0x10 - -glabel D_80126F50 - .incbin "baserom.z64", 0xB9E0F0, 0x20 - -glabel D_80126F70 - .incbin "baserom.z64", 0xB9E110, 0x18 - -glabel D_80126F88 - .incbin "baserom.z64", 0xB9E128, 0x18 - -glabel D_80126FA0 - .incbin "baserom.z64", 0xB9E140, 0x18 - -glabel D_80126FB8 - .incbin "baserom.z64", 0xB9E158, 0x18 - -glabel D_80126FD0 - .incbin "baserom.z64", 0xB9E170, 0x40 - -glabel D_80127010 - .incbin "baserom.z64", 0xB9E1B0, 0xC - -glabel D_8012701C - .incbin "baserom.z64", 0xB9E1BC, 0xC - -glabel D_80127028 - .incbin "baserom.z64", 0xB9E1C8, 0xC - -glabel D_80127034 - .incbin "baserom.z64", 0xB9E1D4, 0x64 - -glabel D_80127098 - .incbin "baserom.z64", 0xB9E238, 0x8 diff --git a/data/z_skelanime.bss.s b/data/z_skelanime.bss.s deleted file mode 100644 index 4bab651776..0000000000 --- a/data/z_skelanime.bss.s +++ /dev/null @@ -1,11 +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 purposee registers - -.section .bss - -glabel D_801600B0 - .space 0x10 diff --git a/data/z_skelanime.data.s b/data/z_skelanime.data.s deleted file mode 100644 index bfb86bc3c6..0000000000 --- a/data/z_skelanime.data.s +++ /dev/null @@ -1,14 +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 purposee registers - -.section .data - -glabel D_8012A480 - .incbin "baserom.z64", 0xBA1620, 0x4 - -glabel D_8012A484 - .incbin "baserom.z64", 0xBA1624, 0x1C diff --git a/data/z_view.data.s b/data/z_text.data.s similarity index 81% rename from data/z_view.data.s rename to data/z_text.data.s index ceb57e3a22..55419e9474 100644 --- a/data/z_view.data.s +++ b/data/z_text.data.s @@ -7,11 +7,11 @@ .section .data +# temporary file name, rename to something more appropriate when decompiled + glabel gLetterTLUT .incbin "baserom.z64", 0xBA18E0, 0x80 glabel gFontFF .incbin "baserom.z64", 0xBA1960, 0x430 -glabel D_8012ABF0 - .incbin "baserom.z64", 0xBA1D90, 0x10 diff --git a/diff.py b/diff.py old mode 100644 new mode 100755 index 5ba345632b..446dfb56be --- a/diff.py +++ b/diff.py @@ -16,14 +16,16 @@ def fail(msg): print(msg, file=sys.stderr) sys.exit(1) +MISSING_PREREQUISITES = "Missing prerequisite python module {}. " \ + "Run `python3 -m pip install --user colorama ansiwrap attrs watchdog python-Levenshtein` to install prerequisites (python-Levenshtein only needed for --algorithm=levenshtein)." + try: import attr from colorama import Fore, Style, Back import ansiwrap import watchdog except ModuleNotFoundError as e: - fail(f"Missing prerequisite python module {e.name}. " - "Run `python3 -m pip install --user colorama ansiwrap attrs watchdog` to install prerequisites.") + fail(MISSING_PREREQUISITES.format(e.name)) # Prefer to use diff_settings.py from the current working directory sys.path.insert(0, '.') @@ -66,6 +68,8 @@ parser.add_argument('-w', '--watch', dest='watch', action='store_true', "Recommended in combination with -m.") parser.add_argument('--width', dest='column_width', type=int, default=50, help="Sets the width of the left and right view column.") +parser.add_argument('--algorithm', dest='algorithm', default='difflib', + choices=['levenshtein', 'difflib'], help="Diff algorithm to use.") # Project-specific flags, e.g. different versions/make arguments. if hasattr(diff_settings, "add_custom_arguments"): @@ -106,6 +110,12 @@ FS_WATCH_EXTENSIONS = ['.c', '.h'] # ==== LOGIC ==== +if args.algorithm == 'levenshtein': + try: + import Levenshtein + except ModuleNotFoundError as e: + fail(MISSING_PREREQUISITES.format(e.name)) + binutils_prefix = None for binutils_cand in ['mips-linux-gnu-', 'mips64-elf-']: @@ -449,6 +459,32 @@ def color_branch_imms(br1, br2): br2 = f'{Fore.LIGHTBLUE_EX}{br2}{Style.RESET_ALL}' return br1, br2 +def diff_sequences_difflib(seq1, seq2): + differ = difflib.SequenceMatcher(a=seq1, b=seq2, autojunk=False) + return differ.get_opcodes() + +def diff_sequences(seq1, seq2): + if (args.algorithm != 'levenshtein' or len(seq1) * len(seq2) > 4 * 10**8 or + len(seq1) + len(seq2) >= 0x110000): + return diff_sequences_difflib(seq1, seq2) + + # The Levenshtein library assumes that we compare strings, not lists. Convert. + # (Per the check above we know we have fewer than 0x110000 unique elements, so chr() works.) + remapping = {} + def remap(seq): + seq = seq[:] + for i in range(len(seq)): + val = remapping.get(seq[i]) + if val is None: + val = chr(len(remapping)) + remapping[seq[i]] = val + seq[i] = val + return ''.join(seq) + + seq1 = remap(seq1) + seq2 = remap(seq2) + return Levenshtein.opcodes(seq1, seq2) + def do_diff(basedump, mydump): asm_lines1 = basedump.split('\n') asm_lines2 = mydump.split('\n') @@ -477,8 +513,7 @@ def do_diff(basedump, mydump): btset.add(bt + ":") sc.color_symbol(bt + ":") - differ: difflib.SequenceMatcher = difflib.SequenceMatcher(a=mnemonics1, b=mnemonics2, autojunk=False) - for (tag, i1, i2, j1, j2) in differ.get_opcodes(): + for (tag, i1, i2, j1, j2) in diff_sequences(mnemonics1, mnemonics2): lines1 = asm_lines1[i1:i2] lines2 = asm_lines2[j1:j2] @@ -791,7 +826,7 @@ def main(): display.progress("Building...") ret = run_make(make_target, capture_output=True) if ret.returncode != 0: - display.update(ret.stderr.decode() or ret.stdout.decode(), error=True) + display.update(ret.stderr.decode('utf-8-sig', 'replace') or ret.stdout.decode('utf-8-sig', 'replace'), error=True) continue mydump = run_objdump(mycmd) display.update(mydump, error=False) diff --git a/fixbaserom.py b/fixbaserom.py new file mode 100644 index 0000000000..3cc67be0a8 --- /dev/null +++ b/fixbaserom.py @@ -0,0 +1,63 @@ +import os.path +from os import path +import sys +import struct +import hashlib + + +# Determine if we have a ROM file +romFileName = "" +if (path.exists("baserom_original.z64")): + romFileName = "baserom_original.z64" +elif (path.exists("baserom_original.n64")): + romFileName = "baserom_original.n64" + +# Read in the original ROM +if (romFileName != ""): + print("File '" + romFileName + "' found.") + with open(romFileName, mode='rb') as file: + fileContent = bytearray(file.read()) + + # Check if ROM needs to be byte swapped + if (fileContent[0] == 0x40): + # Byte Swap ROM + # TODO: This is pretty slow at the moment. Look into optimizing it later... + print("ROM needs to be byte swapped...") + i = 0 + while (i < len(fileContent)): + tmp = struct.unpack_from("BBBB", fileContent, i) + struct.pack_into("BBBB", fileContent, i + 0, tmp[3], tmp[2], tmp[1], tmp[0]) + i += 4 + + perc = float(i) / float(len(fileContent)) + + if (i % (1024 * 1024 * 4) == 0): + print(str(perc * 100) + "%") + + print("Byte swapping done.") +else: + print("Error: Could not find baserom_original.z64/baserom_original.n64.") + sys.exit(1) + +# Strip the overdump +print("Stripping overdump...") +strippedContent = list(fileContent[0:0x3600000]) + +# Patch the header +print("Patching header...") +strippedContent[0x3E] = 0x50 + +# Check to see if the ROM is a "vanilla" Debug ROM +md5Hash = hashlib.md5(bytearray(strippedContent)).hexdigest() + +if (str(md5Hash) != "f0b7f35375f9cc8ca1b2d59d78e35405"): + print("Error: Expected a hash of f0b7f35375f9cc8ca1b2d59d78e35405 but got " + str(md5Hash) + ". The baserom is probably not \"vanilla\"") + sys.exit(1) + +# Write out our new ROM +print("Writing new ROM 'baserom.z64'.") +with open("baserom.z64", mode="wb") as file: + file.write(bytes(strippedContent)) + +print("Done!") + diff --git a/fixle.sh b/fixle.sh index bf4527540d..a1941b69ac 100644 --- a/fixle.sh +++ b/fixle.sh @@ -1,3 +1,5 @@ +#!/usr/bin/env bash + var="$1" if [ ! -n "$var" ] then diff --git a/format.sh b/format.sh new file mode 100755 index 0000000000..9967cc6f5d --- /dev/null +++ b/format.sh @@ -0,0 +1,28 @@ +#!/usr/bin/env bash + +FORMAT_OPTS="-i -style=file" +TIDY_OPTS="-p . --fix --fix-errors" +COMPILER_OPTS="-fno-builtin -std=gnu90 -Iinclude -Isrc -D_LANGUAGE_C -DNON_MATCHING" + +shopt -s globstar + +if (( $# > 0 )); then + echo "Formatting file(s) $*" + echo "Running clang-format..." + clang-format ${FORMAT_OPTS} "$@" + echo "Running clang-tidy..." + clang-tidy ${TIDY_OPTS} "$@" -- ${COMPILER_OPTS} &> /dev/null + echo "Adding missing final new lines..." + sed -i -e '$a\' "$@" + echo "Done formatting file(s) $*" + exit +fi + +echo "Formatting C files. This will take a bit" +echo "Running clang-format..." +clang-format ${FORMAT_OPTS} src/**/*.c +echo "Running clang-tidy..." +clang-tidy ${TIDY_OPTS} src/**/*.c -- ${COMPILER_OPTS} &> /dev/null +echo "Adding missing final new lines..." +find src/ -type f -name "*.c" -exec sed -i -e '$a\' {} \; +echo "Done formatting all files." diff --git a/include/alloca.h b/include/alloca.h new file mode 100644 index 0000000000..bb44ef0d2b --- /dev/null +++ b/include/alloca.h @@ -0,0 +1,7 @@ +#ifndef _ALLOCA_H_ +#define _ALLOCA_H_ + +void* alloca(unsigned int); +#define alloca __builtin_alloca + +#endif diff --git a/include/color.h b/include/color.h index c0b62c9179..94c3a20d12 100644 --- a/include/color.h +++ b/include/color.h @@ -1,18 +1,15 @@ #ifndef _COLOR_H_ #define _COLOR_H_ -typedef struct -{ +typedef struct { u8 r, g, b; } Color_RGB8; -typedef struct -{ +typedef struct { u8 r, g, b, a; } Color_RGBA8; -typedef struct -{ +typedef struct { f32 r, g, b, a; } Color_RGBAf; diff --git a/include/fp.h b/include/fp.h new file mode 100644 index 0000000000..7346d5e082 --- /dev/null +++ b/include/fp.h @@ -0,0 +1,34 @@ +#ifndef _FP_H_ +#define _FP_H_ +#include + +extern f32 qNaN0x3FFFFF; +extern f32 qNaN0x10000; +extern f32 sNaN0x3FFFFF; + +f32 floorf(f32 x); +f64 floor(f64 x); +s32 lfloorf(f32 x); +s32 lfloor(f64 x); + +f32 ceilf(f32 x); +f64 ceil(f64 x); +s32 lceilf(f32 x); +s32 lceil(f64 x); + +f32 truncf(f32 x); +f64 trunc(f64 x); +s32 ltruncf(f32 x); +s32 ltrunc(f64 x); + +f32 nearbyintf(f32 x); +f64 nearbyint(f64 x); +s32 lnearbyintf(f32 x); +s32 lnearbyint(f64 x); + +f32 roundf(f32 x); +f64 round(f64 x); +s32 lroundf(f32 x); +s32 lround(f64 x); + +#endif diff --git a/include/functions.h b/include/functions.h index a30733cd35..9dcdad1af9 100644 --- a/include/functions.h +++ b/include/functions.h @@ -1,7 +1,7 @@ #ifndef _FUNCTIONS_H_ #define _FUNCTIONS_H_ -#include +#include "z64.h" float fabsf(float f); #pragma intrinsic(fabsf) @@ -26,7 +26,8 @@ void DmaMgr_ThreadEntry(void* arg0); s32 DmaMgr_SendRequestImpl(DmaRequest* req, u32 ram, u32 vrom, u32 size, u32 unk, OSMesgQueue* queue, OSMesg msg); s32 DmaMgr_SendRequest0(u32 ram, u32 vrom, u32 size); void DmaMgr_Start(); -s32 DmaMgr_SendRequest2(DmaRequest* req, u32 ram, u32 vrom, u32 size, u32 unk5, OSMesgQueue* queue, OSMesg msg, const char* file, s32 line); +s32 DmaMgr_SendRequest2(DmaRequest* req, u32 ram, u32 vrom, u32 size, u32 unk5, OSMesgQueue* queue, OSMesg msg, + const char* file, s32 line); s32 DmaMgr_SendRequest1(void* ram0, u32 vrom, u32 size, const char* file, s32 line); void* Yaz0_FirstDMA(); void* Yaz0_NextDMA(void* curSrcPos); @@ -42,26 +43,29 @@ void isPrintfInit(); void osSyncPrintfUnused(const char* fmt, ...); void osSyncPrintf(const char* fmt, ...); void rmonPrintf(const char* fmt, ...); -u32 is_proutSyncPrintf(void* arg0, const char *str, s32 count); +u32 is_proutSyncPrintf(void* arg0, const char* str, s32 count); void func_80002384(const char* exp, const char* file, u32 line); OSPiHandle* osDriveRomInit(); void Yaz0_Old_DecompressImpl(Yaz0Header* hdr, u8* dst); -void StackCheck_Init(StackEntry* entry, void* stackTop, void* stackBottom, u32 initValue, s32 minSpace, const char* name); +void StackCheck_Init(StackEntry* entry, void* stackTop, void* stackBottom, u32 initValue, s32 minSpace, + const char* name); void StackCheck_Cleanup(StackEntry* entry); StackStatus StackCheck_GetState(StackEntry* entry); u32 StackCheck_CheckAll(); u32 StackCheck_Check(StackEntry* entry); -float LogUtils_CheckFloatRange(const char* exp, s32 arg1, const char* var1Name, float var1, const char* var2Name, float var2, const char* var3Name, float var3); -s32 LogUtils_CheckIntRange(const char* exp, s32 arg1, const char* var1Name, s32 var1, const char* var2Name, s32 var2, const char* var3Name, s32 var3); +float LogUtils_CheckFloatRange(const char* exp, s32 arg1, const char* var1Name, float var1, const char* var2Name, + float var2, const char* var3Name, float var3); +s32 LogUtils_CheckIntRange(const char* exp, s32 arg1, const char* var1Name, s32 var1, const char* var2Name, s32 var2, + const char* var3Name, s32 var3); void LogUtils_LogHexDump(void* ptr, s32 size0); -void LogUtils_LogPointer(s32 value, u32 max, void* ptr, const char *name, const char *file, s32 line); +void LogUtils_LogPointer(s32 value, u32 max, void* ptr, const char* name, const char* file, s32 line); void LogUtils_CheckBoundary(const char* name, s32 value, s32 unk, const char* file, s32 line); void LogUtils_CheckNullPointer(const char* exp, void* ptr, const char* file, s32 line); void LogUtils_CheckValidPointer(const char* exp, void* ptr0, const char* file, s32 line); void LogUtils_LogThreadId(const char* name, s32 line); void LogUtils_HungupThread(const char* name, s32 line); void LogUtils_ResetHungup(); -char* proutSprintf(char* dst, const char *fmt, size_t size); +char* proutSprintf(char* dst, const char* fmt, size_t size); s32 vsprintf(char* dst, const char* fmt, va_list args); s32 sprintf(char* dst, const char* fmt, ...); void __osPiCreateAccessQueue(void); @@ -88,55 +92,55 @@ void __osExceptionPreamble(); // ? __osException(?); void __osEnqueueAndYield(OSThread**); void __osEnqueueThread(OSThread**, OSThread*); -OSThread *__osPopThread(OSThread**); +OSThread* __osPopThread(OSThread**); // ? __osNop(?); void __osDispatchThread(); void __osCleanupThread(void); -void __osDequeueThread(OSThread **queue, OSThread *thread); -void osDestroyThread(OSThread *thread); -void bzero(void *__s, u32 __n); +void __osDequeueThread(OSThread** queue, OSThread* thread); +void osDestroyThread(OSThread* thread); +void bzero(void* __s, u32 __n); void osCreateThread(OSThread* thread, OSId id, void (*entry)(void*), void* arg, void* sp, OSPri pri); void __osSetSR(u32); u32 __osGetSR(); -void osWritebackDCache(void *vaddr, s32 nbytes); +void osWritebackDCache(void* vaddr, s32 nbytes); void* osViGetNextFramebuffer(); -void osCreatePiManager(OSPri pri, OSMesgQueue *cmdQ, OSMesg *cmdBuf, s32 cmdMsgCnt); +void osCreatePiManager(OSPri pri, OSMesgQueue* cmdQ, OSMesg* cmdBuf, s32 cmdMsgCnt); void __osDevMgrMain(void* arg); -s32 __osPiRawStartDma(s32 dir, u32 cart_addr, void *dram_addr, size_t size); +s32 __osPiRawStartDma(s32 dir, u32 cart_addr, void* dram_addr, size_t size); u32 osVirtualToPhysical(void* vaddr); void osViBlack(u8 active); -s32 __osSiRawReadIo(void *a0, u32 *a1); +s32 __osSiRawReadIo(void* a0, u32* a1); OSId osGetThreadId(OSThread* thread); OSIntMask osSetIntMask(OSIntMask); -void osViSetMode(OSViMode *mode); -u32 __osProbeTLB(void *); +void osViSetMode(OSViMode* mode); +u32 __osProbeTLB(void*); u32 osGetMemSize(void); -void osSetEventMesg(OSEvent e, OSMesgQueue *mq, OSMesg msg); -s32 _Printf(char *(*pfn)(char *, const char *, size_t), char *arg, const char *fmt, va_list ap); +void osSetEventMesg(OSEvent e, OSMesgQueue* mq, OSMesg msg); +s32 _Printf(char* (*pfn)(char*, const char*, size_t), char* arg, const char* fmt, va_list ap); void osUnmapTLBAll(void); s32 osEPiStartDma(OSPiHandle* handle, OSIoMesg* mb, s32 direction); -const u8 *strchr(const u8 *str, s32 ch); -size_t strlen(const u8 *str); -void *memcpy(void *dst, const void *src, size_t size); +const u8* strchr(const u8* str, s32 ch); +size_t strlen(const u8* str); +void* memcpy(void* dst, const void* src, size_t size); void osInvalICache(void* vaddr, s32 nbytes); void osCreateMesgQueue(OSMesgQueue* mq, OSMesg* msg, s32 count); void osInvalDCache(void* vaddr, s32 nbytes); u32 __osSiDeviceBusy(); void osSetThreadPri(OSThread* thread, OSPri pri); OSPri osGetThreadPri(OSThread* thread); -s32 __osEPiRawReadIo(OSPiHandle *handle, u32 devAddr, u32 *data); -void osViSwapBuffer(void *vaddr); -s32 __osEPiRawStartDma(OSPiHandle *handle, s32 direction, u32 cartAddr, void* dramAddr, size_t size); -u32 bcmp(void *__sl,void *__s2,u32 __n); +s32 __osEPiRawReadIo(OSPiHandle* handle, u32 devAddr, u32* data); +void osViSwapBuffer(void* vaddr); +s32 __osEPiRawStartDma(OSPiHandle* handle, s32 direction, u32 cartAddr, void* dramAddr, size_t size); +u32 bcmp(void* __sl, void* __s2, u32 __n); OSTime osGetTime(void); void __osTimerServicesInit(); void __osTimerInterrupt(); void __osSetTimerIntr(OSTime tim); -OSTime __osInsertTimer(OSTimer *a0); +OSTime __osInsertTimer(OSTimer* a0); u32 osGetCount(void); void __osSetGlobalIntMask(u32 mask); void __osSetCompare(u32); -void* bcopy(void *__src,void *__dest,u32 __n); +void* bcopy(void* __src, void* __dest, u32 __n); void __osResetGlobalIntMask(u32 mask); s32 __osDisableInt(void); void __osRestoreInt(s32); @@ -151,9 +155,9 @@ u32 __osGetFpcCsr(); s32 osEPiWriteIo(OSPiHandle* handle, u32 devAddr, u32 data); void osMapTLBRdb(void); u32 __osGetCause(); -s32 __osEPiRawWriteIo(OSPiHandle *handle, u32 devAddr, u32 data); +s32 __osEPiRawWriteIo(OSPiHandle* handle, u32 devAddr, u32 data); void osCreateViManager(OSPri pri); -void viMgrMain(void *vargs); +void viMgrMain(void* vargs); OSViContext* __osViGetCurrentContext(); void osStartThread(OSThread* thread); void osViSetYScale(float scale); @@ -223,8 +227,8 @@ void func_80028B74(GlobalContext*, Vec3f*, UNK_PTR, UNK_PTR, Color_RGB8*, Color_ // ? func_80028FD8(?); // ? func_80029060(?); void Effect_SpawnFragment(GlobalContext* globalCtx, Vec3f* burstDepthY, Vec3f* burstDepthX, Vec3f* burstOrigin, - s16 gravityInfluence, s16 u0, s16 rotSpeed, s16 burstVel, u8 u1, s16 scale, u8 u2, - s16 jitter, s32 duration, s16 u3, s16 objNumber, u32 dList); + s16 gravityInfluence, s16 u0, s16 rotSpeed, s16 burstVel, u8 u1, s16 scale, u8 u2, s16 jitter, + s32 duration, s16 u3, s16 objNumber, u32 dList); // ? func_800292DC(?); // ? func_80029320(?); // ? func_80029444(?); @@ -238,7 +242,8 @@ void Effect_SpawnFragment(GlobalContext* globalCtx, Vec3f* burstDepthY, Vec3f* b // ? func_8002A32C(?); // ? func_8002A3C4(?); void func_8002A65C(GlobalContext* globalCtx, Actor* actor, Vec3f* pos, u32 arg3, u32 arg4); -void func_8002A6B8(GlobalContext* globalCtx, Vec3f* pos, Vec3f* arg2, Vec3f* arg3, u32 arg4, s32 arg5, u32 arg6, u32 arg7, u32 arg8, u32 arg9, u32 arg10, u32 arg11, u32 arg12, u32 arg13, u32 arg14, u32 arg15); +void func_8002A6B8(GlobalContext* globalCtx, Vec3f* pos, Vec3f* arg2, Vec3f* arg3, u32 arg4, s32 arg5, u32 arg6, + u32 arg7, u32 arg8, u32 arg9, u32 arg10, u32 arg11, u32 arg12, u32 arg13, u32 arg14, u32 arg15); // ? func_8002A894(?); // ? func_8002A95C(?); // ? func_8002A9F4(?); @@ -268,10 +273,10 @@ void Flags_SetTempClear(GlobalContext* globalCtx, s32 flag); void Flags_UnsetTempClear(GlobalContext* globalCtx, s32 flag); s32 Flags_GetCollectible(GlobalContext* globalCtx, s32 flag); void Flags_SetCollectible(GlobalContext* globalCtx, s32 flag); -void TitleCard_InitBossName(GlobalContext* globalCtx, TitleCardContext* titleCtx, u32 texture, - s16 arg3, s16 arg4, u8 arg5, u8 arg6); -void TitleCard_InitPlaceName(GlobalContext* globalCtx, TitleCardContext* titleCtx, u32 texture, - s32 arg3, s32 arg4, s32 arg5, s32 arg6, s32 arg7); +void TitleCard_InitBossName(GlobalContext* globalCtx, TitleCardContext* titleCtx, u32 texture, s16 arg3, s16 arg4, + u8 arg5, u8 arg6); +void TitleCard_InitPlaceName(GlobalContext* globalCtx, TitleCardContext* titleCtx, u32 texture, s32 arg3, s32 arg4, + s32 arg5, s32 arg6, s32 arg7); s32 func_8002D53C(GlobalContext* globalCtx, TitleCardContext* titleCtx); void Actor_Kill(Actor* actor); void Actor_SetHeight(Actor* actor, f32 offset); @@ -357,18 +362,18 @@ void func_800304DC(GlobalContext* globalCtx, ActorContext* actorCtx, ActorEntry* void Actor_UpdateAll(GlobalContext* globalCtx, ActorContext* actorCtx); s32 func_800314D4(GlobalContext* globalCtx, Actor* actorB, Vec3f* arg2, f32 arg3); void func_80031B14(GlobalContext* globalCtx, ActorContext* actorCtx); -Actor* Actor_Spawn(ActorContext* actorCtx, GlobalContext* globalCtx, s16 actorId, - f32 posX, f32 posY, f32 posZ, s16 rotX, s16 rotY, s16 rotZ, s16 params); -Actor* Actor_SpawnAttached(ActorContext* actorCtx, Actor* attachedTo, GlobalContext* globalCtx, s16 actorId, - f32 posX, f32 posY, f32 posZ, s16 rotX, s16 rotY, s16 rotZ, s16 params); +Actor* Actor_Spawn(ActorContext* actorCtx, GlobalContext* globalCtx, s16 actorId, f32 posX, f32 posY, f32 posZ, + s16 rotX, s16 rotY, s16 rotZ, s16 params); +Actor* Actor_SpawnAttached(ActorContext* actorCtx, Actor* attachedTo, GlobalContext* globalCtx, s16 actorId, f32 posX, + f32 posY, f32 posZ, s16 rotX, s16 rotY, s16 rotZ, s16 params); void Actor_SpawnTransitionActors(GlobalContext* globalCtx, ActorContext* actorCtx); Actor* Actor_SpawnEntry(ActorContext* actorCtx, ActorEntry* actorEntry, GlobalContext* globalCtx); Actor* Actor_Delete(ActorContext* actorCtx, Actor* actor, GlobalContext* globalCtx); Actor* func_80032AF0(GlobalContext* globalCtx, ActorContext* actorCtx, Actor** actorPtr, Player* player); Actor* Actor_Find(ActorContext* actorCtx, s32 actorId, s32 actorType); void func_80032C7C(GlobalContext* globalCtx, Actor* actor); -void func_80033260(GlobalContext* globalCtx, Actor* actor, Vec3f* arg2, f32 arg3, - s32 arg4, f32 arg5, s16 arg6, s16 arg7, u8 arg8); +void func_80033260(GlobalContext* globalCtx, Actor* actor, Vec3f* arg2, f32 arg3, s32 arg4, f32 arg5, s16 arg6, + s16 arg7, u8 arg8); void func_80033480(GlobalContext* globalCtx, Vec3f* arg1, f32 arg2, s32 arg3, s16 arg4, s16 arg5, u8 arg6); Actor* func_80033640(GlobalContext* globalCtx, Collider* collider); Actor* func_80033684(GlobalContext* globalCtx, Actor* explosiveActor); @@ -389,12 +394,17 @@ void func_8003424C(GlobalContext* globalCtx, Vec3f* arg1); void func_8003426C(Actor* actor, s16 arg1, s16 arg2, s16 arg3, s16 arg4); Hilite* func_800342EC(Vec3f* object, GlobalContext* globalCtx); Hilite* func_8003435C(Vec3f* object, GlobalContext* globalCtx); +s32 func_800343CC(GlobalContext* globalCtx, Actor* actor, s16* arg2, f32 arg3, u16 (*unkFunc1)(GlobalContext*, Actor*), + s16 (*unkFunc2)(GlobalContext*, Actor*)); s16 func_800347E8(s16 arg0); -void func_80034BA0(GlobalContext* globalCtx, SkelAnime* skelAnime, void* unkFunc1, void* unkFunc2, Actor* actor, s16 alpha); -void func_80034CC4(GlobalContext* globalCtx, SkelAnime* skelAnime, void* unkFunc1, void* unkFunc2, Actor* actor, s16 alpha); +void func_80034BA0(GlobalContext* globalCtx, SkelAnime* skelAnime, SkelAnime_LimbUpdateMatrix2 unkFunc1, + SkelAnime_LimbAppendDlist2 unkFunc2, Actor* actor, s16 alpha); +void func_80034CC4(GlobalContext* globalCtx, SkelAnime* skelAnime, SkelAnime_LimbUpdateMatrix2 unkFunc1, + SkelAnime_LimbAppendDlist2 unkFunc2, Actor* actor, s16 alpha); +void func_80034EC0(SkelAnime* skelAnime, struct_80034EC0_Entry* arg1, s32 arg2); void Actor_Noop(Actor* actor, GlobalContext* globalCtx); -void Draw_DListOpa(GlobalContext* globalCtx, u32 dlist); -void Draw_DListXlu(GlobalContext* globalCtx, u32 dlist); +void Gfx_DrawDListOpa(GlobalContext* globalCtx, u32 dlist); +void Gfx_DrawDListXlu(GlobalContext* globalCtx, u32 dlist); Actor* Actor_FindNearby(GlobalContext* globalCtx, Actor* refActor, s16 actorId, u8 actorType, f32 range); s32 func_800354B4(GlobalContext* globalCtx, Actor* actor, f32 range, s16 arg3, s16 arg4, s16 arg5); void func_8003555C(GlobalContext* globalCtx, Vec3f* arg1, Vec3f* arg2, Vec3f* arg3); @@ -637,6 +647,7 @@ f32 func_800437F0(f32, f32); // ? func_8005A7A8(?); // ? func_8005A8C4(?); s16 func_8005A970(u32 gl790); +s16 func_8005A9F4(Camera* camera); // ? func_8005AA90(?); // ? func_8005AC48(?); // ? func_8005AC60(?); @@ -646,7 +657,7 @@ s16 func_8005A970(u32 gl790); // ? func_8005AFB4(?); // ? func_8005B044(?); // ? func_8005B1A4(?); -s32 CollisionBtlTbl_Get(s32 index); +s32 CollisionBtlTbl_Get(s32 index); // ? func_8005B280(?); // ? func_8005B2AC(?); // ? func_8005B65C(?); @@ -679,13 +690,15 @@ s32 func_8005BA74(UNK_TYPE, UNK_TYPE); // ? func_8005BB8C(?); // ? func_8005BBB0(?); // ? func_8005BBD4(?); +void func_8005C050(GlobalContext* globalCtx, Collider* collision, Actor* actor, UNK_TYPE arg3, UNK_TYPE arg4); // ? func_8005C2BC(?); s32 func_8005C318(GlobalContext* globalCtx, ColliderDimensions* dim); s32 func_8005C328(GlobalContext* globalCtx, ColliderDimensions* dest, ColliderDimensions* src); s32 ActorCollider_AllocCylinder(GlobalContext* globalCtx, ColliderCylinderMain* collision); s32 ActorCollider_FreeCylinder(GlobalContext* globalCtx, ColliderCylinderMain* collision); s32 func_8005C3F4(GlobalContext* globalCtx, ColliderCylinderMain* collision, ColliderCylinderInit* arg2); -s32 ActorCollider_InitCylinder(GlobalContext* globalCtx, ColliderCylinderMain* collision, Actor* actor, ColliderCylinderInit* src); +s32 ActorCollider_InitCylinder(GlobalContext* globalCtx, ColliderCylinderMain* collision, Actor* actor, + ColliderCylinderInit* src); s32 func_8005C508(GlobalContext* globalCtx, ColliderCylinderMain* collision); s32 func_8005C540(GlobalContext* globalCtx, ColliderCylinderMain* collision); s32 func_8005C578(GlobalContext* globalCtx, ColliderCylinderMain* collision); @@ -718,9 +731,12 @@ void func_8005D400(UNK_TYPE, UNK_TYPE); // ? func_8005D40C(?); // ? func_8005D4DC(?); // ? func_8005D62C(?); -s32 Actor_CollisionCheck_SetAT(GlobalContext* globalCtx, SubGlobalContext11E60* simpleBodyGroups, ColliderCylinderMain* collision); -s32 Actor_CollisionCheck_SetAC(GlobalContext* globalCtx, SubGlobalContext11E60* simpleBodyGroups, ColliderCylinderMain* collision); -s32 Actor_CollisionCheck_SetOT(GlobalContext* globalCtx, SubGlobalContext11E60* simpleBodyGroups, ColliderCylinderMain* collision); +s32 Actor_CollisionCheck_SetAT(GlobalContext* globalCtx, SubGlobalContext11E60* simpleBodyGroups, + ColliderCylinderMain* collision); +s32 Actor_CollisionCheck_SetAC(GlobalContext* globalCtx, SubGlobalContext11E60* simpleBodyGroups, + ColliderCylinderMain* collision); +s32 Actor_CollisionCheck_SetOT(GlobalContext* globalCtx, SubGlobalContext11E60* simpleBodyGroups, + ColliderCylinderMain* collision); // ? func_8005DF2C(?); // ? func_8005DF50(?); // ? func_8005DF74(?); @@ -741,8 +757,8 @@ s32 Actor_CollisionCheck_SetOT(GlobalContext* globalCtx, SubGlobalContext11E60* // ? func_80061C98(?); // ? func_80061E48(?); // ? func_80061E8C(?); -void func_80061ED4(SubActorStruct98 *sub98, ActorDamageChart *damageChart, SubActor98Init *subActor98Init); -// ? func_80061EFC(?); +void func_80061ED4(SubActorStruct98* sub98, ActorDamageChart* damageChart, Sub98Init4* sub98Init); +void func_80061EFC(SubActorStruct98* sub98, ActorDamageChart* damageChart, Sub98Init4* sub98Init); // ? func_80061F64(?); // ? func_800622E4(?); // ? func_80062530(?); @@ -758,16 +774,16 @@ void func_80062D60(GlobalContext*, Vec3f*); s32 func_80062ECC(f32, f32, f32, Vec3f*, Vec3f*, Vec3f*, Vec3f*, Vec3f*); void SaveContext_Init(void); // ? func_800636C0(?); -void func_8006375C(UNK_TYPE, UNK_TYPE, UNK_TYPE); +void func_8006375C(s32 arg0, s32 arg1, float* d_80855320); // ? func_8006376C(?); // ? func_80063828(?); // ? func_8006390C(?); // ? func_80063C04(?); // ? func_80063D7C(?); void DebugDisplay_Init(void); -DebugDispObject* DebugDisplay_AddObject(f32 posX, f32 posY, f32 posZ, s16 rotX, s16 rotY, s16 rotZ, - f32 scaleX, f32 scaleY, f32 scaleZ, u8 red, u8 green, u8 blue, u8 alpha, - s16 type, GraphicsContext* gfxCtx); +DebugDispObject* DebugDisplay_AddObject(f32 posX, f32 posY, f32 posZ, s16 rotX, s16 rotY, s16 rotZ, f32 scaleX, + f32 scaleY, f32 scaleZ, u8 red, u8 green, u8 blue, u8 alpha, s16 type, + GraphicsContext* gfxCtx); void DebugDisplay_DrawObjects(GlobalContext* globalCtx); void func_8006450C(GlobalContext* globalCtx, CutsceneContext* csCtx); void func_80064534(GlobalContext* globalCtx, CutsceneContext* csCtx); @@ -781,13 +797,13 @@ void func_800694A0(GlobalContext* globalCtx, s16 drawId); // ? func_8006BA00(?); // ? func_8006BA30(?); void Audio_PlaySoundAtPosition(GlobalContext* globalCtx, Vec3f* pos2, s32 radius, u16 sfxId); -// ? func_8006BBC0(?); -// ? func_8006BE88(?); -// ? func_8006BF1C(?); -// ? func_8006C0FC(?); +u16 ElfMessage_GetSariaText(GlobalContext* globalCtx); +u16 ElfMessage_GetCUpText(GlobalContext* globalCtx); +u16 Text_GetFaceReaction(GlobalContext* globalCtx, u32 reactionSet); // ? func_8006C3A0(?); // ? func_8006C3D0(?); void func_8006C438(GlobalContext* globalCtx, s16 arg1); +s32 func_8006C4A4(GlobalContext*, s32); // ? func_8006C510(?); // ? func_8006C5A8(?); // ? func_8006CBAC(?); @@ -814,6 +830,7 @@ void func_8006EE48(UNK_TYPE); // ? func_8006F0FC(?); // ? func_8006F140(?); f32 func_8006F93C(u16, u16, u16); +f32 func_8006F9BC(u16, u16, u16, u16, u16); // ? func_8006FB94(?); // ? func_8006FC88(?); // ? func_80070600(?); @@ -839,12 +856,13 @@ f32 func_800746DC(); // ? func_800766C4(?); // ? func_8007672C(?); // ? func_80076934(?); +void func_800773A8(GlobalContext* globalCtx, f32 arg1, f32 arg2, f32 arg3, f32 arg4); s32 func_800775CC(); void func_800775D8(); s32 func_800775E4(); void func_800775F0(u16); // ? func_80077600(?); -void Lib_MemSet(void* dest, size_t size, u8 val); +void Lib_MemSet(u8* dest, size_t size, u8 val); f32 Math_Coss(s16 angle); f32 Math_Sins(s16 angle); s32 Math_ApproxUpdateScaledS(s16* fp, s16 target, s16 step); @@ -879,9 +897,12 @@ void Health_InitData(GlobalContext* globalCtx); void Health_UpdateData(GlobalContext* globalCtx); void Interface_DrawHealth(GlobalContext* globalCtx); void Health_HandleCriticalAlarm(GlobalContext* globalCtx); -void Lights_InitPositionalLight(LightInfoPositional* info, s16 posX, s16 posY, s16 posZ, u8 red, u8 green, u8 blue, s16 radius, u32 type); -void Lights_InitType0PositionalLight(LightInfoPositional* info, s16 posX, s16 posY, s16 posZ, u8 red, u8 green, u8 blue, s16 radius); -void Lights_InitType2PositionalLight(LightInfoPositional* info, s16 posX, s16 posY, s16 posZ, u8 red, u8 green, u8 blue, s16 radius); +void Lights_InitPositionalLight(LightInfoPositional* info, s16 posX, s16 posY, s16 posZ, u8 red, u8 green, u8 blue, + s16 radius, u32 type); +void Lights_InitType0PositionalLight(LightInfoPositional* info, s16 posX, s16 posY, s16 posZ, u8 red, u8 green, u8 blue, + s16 radius); +void Lights_InitType2PositionalLight(LightInfoPositional* info, s16 posX, s16 posY, s16 posZ, u8 red, u8 green, u8 blue, + s16 radius); void Lights_SetPositionalLightColorAndRadius(LightInfoPositional* info, u8 red, u8 green, u8 blue, s16 radius); void Lights_InitDirectional(LightInfoDirectional* info, s8 dirX, s8 dirY, s8 dirZ, u8 red, u8 green, u8 blue); void Lights_MapperInit(LightMapper* mapper, u8 red, u8 green, u8 blue); @@ -919,10 +940,10 @@ u8 ZeldaArena_IsInitalized(); void MapMark_Init(GlobalContext* globalCtx); void MapMark_ClearPointers(GlobalContext* globalCtx); void MapMark_DrawConditionally(GlobalContext* globalCtx); -// ? func_8007BE60(?); -// ? func_8007BED4(?); -// ? func_8007BF08(?); -// ? func_8007BF10(?); +void PreNmiBuff_Init(PreNmiBuff* this); +void PreNmiBuff_SetReset(PreNmiBuff* this); +u32 PreNmiBuff_IsResetting(PreNmiBuff* this); +void MsgEvent_SendNullTask(); f32 func_8007BF90(Vec3f*, Vec3f*); // ? func_8007C028(?); // ? func_8007C058(?); @@ -985,6 +1006,9 @@ s32 func_80087708(GlobalContext* globalCtx, s16 arg1, s16 arg2); void func_80088B34(s16 arg0); void Interface_Draw(GlobalContext* globalCtx); void Interface_Update(GlobalContext* globalCtx); +Path* Path_GetByIndex(GlobalContext* globalCtx, s16 index, s16 max); +f32 Path_OrientAndGetDistSq(Actor* actor, Path* path, s16 waypoint, s16* yaw); +void Path_CopyLastPoint(Path* path, Vec3f* dest); // ? func_8008E6A0(?); // ? func_8008E6AC(?); // ? func_8008E750(?); @@ -1031,54 +1055,65 @@ u8 func_80090480(GlobalContext* globalCtx, Collider* collider, UNK_PTR a2, Vec3f // ? func_80091880(?); // ? func_80091A24(?); void PreNMI_Init(PreNMIContext* prenmiCtx); -// ? func_80092500(?); -// ? func_80092584(?); -// ? func_80092AB8(?); -// ? func_80092B48(?); -// ? func_80092BFC(?); -// ? func_80092C20(?); -void func_80092DAC(s16, s16); -void func_80092DF0(s16, s16); -// ? func_80092E3C(?); -void func_80092E70(s16, s16, UNK_TYPE, UNK_TYPE, UNK_TYPE); -// ? func_80092F38(?); -s16 func_80092F88(Camera*, UNK_TYPE); -// ? func_80092FAC(?); -// ? func_80092FF0(?); -// ? func_80093370(?); -// ? func_80093708(?); -// ? func_8009373C(?); -Gfx* func_80093774(Gfx* a0, u32 a1); -// ? func_800937C0(?); -// ? func_80093808(?); -// ? func_800938B4(?); -// ? func_8009398C(?); -// ? func_80093AD0(?); +Vec3f* Quake_AddVec(Vec3f* dst, Vec3f* arg1, struct_80045714* arg2); +void Quake_UpdateShakeInfo(QuakeRequest* req, ShakeInfo* shake, f32 y, f32 x); +s16 Quake_Callback1(QuakeRequest* req, ShakeInfo* shake); +s16 Quake_Callback2(QuakeRequest* req, ShakeInfo* shake); +s16 Quake_Callback3(QuakeRequest* req, ShakeInfo* shake); +s16 Quake_Callback4(QuakeRequest* req, ShakeInfo* shake); +s16 Quake_Callback5(QuakeRequest* req, ShakeInfo* shake); +s16 Quake_Callback6(QuakeRequest* req, ShakeInfo* shake); +s16 Quake_GetFreeIndex(); +QuakeRequest* Quake_AddImpl(Camera* cam, u32 callbackIdx); +void Quake_Remove(QuakeRequest* req); +QuakeRequest* Quake_GetRequest(s16 idx); +QuakeRequest* Quake_SetValue(s16 idx, s16 valueType, s16 value); +u32 Quake_SetSpeed(s16 idx, s16 value); +u32 Quake_SetCountdown(s16 idx, s16 value); +s16 Quake_GetCountdown(s16 idx); +u32 Quake_SetQuakeValues(s16 idx, s16 y, s16 x, s16 zoom, s16 rotZ); +u32 Quake_SetUnkValues(s16 idx, s16 arg1, SubQuakeRequest14 arg2); +void Quake_Init(); +s16 Quake_Add(Camera* cam, u32 callbackIdx); +u32 Quake_RemoveFromIdx(s16 idx); +s16 Quake_Calc(Camera* camera, UnkQuakeCalcStruct* camData); +Gfx* Gfx_SetFog(Gfx* gfx, s32 r, s32 g, s32 b, s32 a, s32 n, s32 f); +Gfx* Gfx_SetFogWithSync(Gfx* gfx, s32 r, s32 g, s32 b, s32 a, s32 n, s32 f); +Gfx* Gfx_SetFog2(Gfx* gfx, s32 r, s32 g, s32 b, s32 a, s32 n, s32 f); +Gfx* Gfx_CallSetupDL(Gfx* gfx, u32 i); +Gfx* func_800937C0(Gfx* gfx); +Gfx* func_80093808(Gfx* gfx); +void func_800938B4(GraphicsContext* gfxCtx); +void func_8009398C(GraphicsContext* gfxCtx); +void func_80093AD0(GraphicsContext* gfxCtx); void func_80093BA8(GraphicsContext* gfxCtx); -// ? func_80093C80(?); +void func_80093C80(GlobalContext* globalCtx); void func_80093D18(GraphicsContext* gfxCtx); void func_80093D84(GraphicsContext* gfxCtx); -// ? func_80093F34(?); -// ? func_80093F58(?); -void func_80094044(GraphicsContext *gfxCtx); -// ? func_800940B0(?); -// ? func_800942F0(?); -// ? func_8009435C(?); -// ? func_800944A0(?); -// ? func_80094520(?); -// ? func_8009457C(?); -// ? func_800945A0(?); -// ? func_80094678(?); -Gfx* func_800946E4(Gfx* a0); -// ? func_800947AC(?); -// ? func_80094A14(?); -// ? func_80094C50(?); -// ? func_80094DB8(?); +Gfx* func_80093F34(Gfx* gfx); +Gfx* func_80093F58(Gfx* gfx); +void func_80094044(GraphicsContext* gfxCtx); +void func_800940B0(GraphicsContext* gfxCtx); +void func_800942F0(GraphicsContext* gfxCtx); +void func_8009435C(GraphicsContext* gfxCtx); +Gfx* func_800944A0(Gfx* gfx); +void func_80094520(GraphicsContext* gfxCtx); +void func_8009457C(Gfx** gfxp); +void func_800945A0(GraphicsContext* gfxCtx); +void func_80094678(GraphicsContext* gfxCtx); +Gfx* func_800946E4(Gfx* gfx); +Gfx* func_800947AC(Gfx* gfx); +void func_80094A14(GraphicsContext* gfxCtx); +void func_80094C50(GraphicsContext* gfxCtx); +void Gfx_BranchTexScroll(Gfx** gfxp, u32 x, u32 y, s32 width, s32 height); Gfx* func_80094E78(GraphicsContext* gfxCtx, u32 x, u32 y); -Gfx* Draw_TexScroll(GraphicsContext* gfxCtx, u32 x, u32 y, s32 width, s32 height); -Gfx* Draw_TwoTexScroll(GraphicsContext* gfxCtx, s32 tile1, u32 x1, u32 y1, s32 width1, s32 height1, s32 tile2, u32 x2, u32 y2, s32 width2, s32 height2); -Gfx* Draw_TwoTexScrollEnvColor(GraphicsContext* gfxCtx, s32 tile1, u32 x1, u32 y1, s32 width1, s32 height1, s32 tile2, u32 x2, u32 y2, s32 width2, s32 height2, s32 red, s32 green, s32 blue, s32 alpha); -// ? func_80095248(?); +Gfx* Gfx_TexScroll(GraphicsContext* gfxCtx, u32 x, u32 y, s32 width, s32 height); +Gfx* Gfx_TwoTexScroll(GraphicsContext* gfxCtx, s32 tile1, u32 x1, u32 y1, s32 width1, s32 height1, s32 tile2, u32 x2, + u32 y2, s32 width2, s32 height2); +Gfx* Gfx_TwoTexScrollEnvColor(GraphicsContext* gfxCtx, s32 tile1, u32 x1, u32 y1, s32 width1, s32 height1, s32 tile2, + u32 x2, u32 y2, s32 width2, s32 height2, s32 r, s32 g, s32 b, s32 a); +void func_80095248(GraphicsContext* gfxCtx, u8 r, u8 g, u8 b); +void func_80095974(GraphicsContext* gfxCtx); void func_80095AA0(GlobalContext* globalCtx, Room* room, UNK_TYPE arg2, UNK_TYPE arg3); // ? func_8009638C(?); void func_80096FD4(GlobalContext* globalCtx, Room* room); @@ -1087,12 +1122,13 @@ s32 func_8009728C(GlobalContext* globalCtx, RoomContext* roomCtx, s32 roomNum); s32 func_800973FC(GlobalContext* globalCtx, RoomContext* roomCtx); void Room_Draw(GlobalContext* globalCtx, Room* room, u32 flags); void func_80097534(GlobalContext* globalCtx, RoomContext* roomCtx); -// ? func_800975D0(?); -// ? func_80097604(?); -// ? func_80097820(?); -// ? func_80097848(?); -// ? func_80097850(?); -// ? func_80097904(?); +void Sample_Calc(SampleContext* this); +void Sample_Draw(SampleContext* this); +void Sample_Update(SampleContext* this); +void Sample_Destroy(SampleContext* this); +void Sample_SetupView(SampleContext* this); +void Sample_LoadTitleStatic(SampleContext* this); +void Sample_Init(SampleContext* this); void Inventory_ChangeEquipment(s16 equipment, u16 value); u8 Inventory_DeleteEquipment(GlobalContext* globalCtx, s16 equipment); void Inventory_ChangeUpgrade(s16 upgrade, s16 value); @@ -1105,53 +1141,88 @@ s32 Scene_ExecuteCommands(GlobalContext* globalCtx, SceneCmd* sceneCmd); void func_80098CBC(GlobalContext* globalCtx, u8* nbTransitionActors); void func_800994A0(GlobalContext* globalCtx); void Scene_Draw(GlobalContext* globalCtx); -// ? func_800A08A0(?); -// ? func_800A0D94(?); -// ? func_800A106C(?); -// ? func_800A1344(?); -void SkelAnime_Draw(GlobalContext* globalCtx, u32 limbIndex, u32 adt, u8 limbDListCnt, void* internal0, void* internal1); -// ? func_800A180C(?); -void func_800A1AC8(GlobalContext *globalCtx, u32 limbIndex, u32 actorDrawTbl, u32 dListCount, void* posUpdateFunc, void *drawFunc, Actor* actor); -// ? func_800A1D8C(?); -// ? func_800A1FC8(?); -s32 SkelAnime_GetFrameCount(u32 animation); -// ? func_800A2044(?); -// ? func_800A24A0(?); -Gfx* func_800A273C(GlobalContext* globalCtx, u32 limbIndex, u32 adt, u8 limbDListCnt, void* internal0, void* internal1, Actor* actor, Gfx* gfx); -// ? func_800A2E70(?); -// ? func_800A32EC(?); -// ? func_800A3334(?); -// ? func_800A336C(?); -// ? func_800A3478(?); -// ? func_800A34DC(?); -// ? func_800A390C(?); -// ? func_800A39AC(?); -// ? func_800A3B8C(?); -// ? func_800A3BE4(?); -// ? func_800A3C9C(?); -// ? func_800A3F08(?); -// ? func_800A3D70(?); -// ? func_800A4478(?); -void SkelAnime_Init(GlobalContext* globalCtx, SkelAnime* skelAnime, u32 skeleton, u32 animation, u8 unk0, u8 unk1, u8 unk2); -void func_800A46F8(GlobalContext* globalCtx, SkelAnime* skelAnime, u32 skeleton, u32 animation, u8 unk0, u16* unk1, u8 unk2); -// ? func_800A4A20(?); -// ? func_800A4AD8(?); -// ? func_800A4D9C(?); -// ? func_800A4EE0(?); -// ? func_800A487C(?); -// ? func_800A49B0(?); +void SkelAnime_LodDraw(GlobalContext* globalCtx, Skeleton* skeleton, Vec3s* actorDrawTable, + SkelAnime_LimbUpdateMatrix updateMtxFunc, SkelAnime_LimbAppendDlist appendDlistFunc, + Actor* actor, s32 dListIndex); +void SkelAnime_LodDrawSV(GlobalContext* globalCtx, Skeleton* skeleton, Vec3s* actorDrawTable, s32 dListCount, + SkelAnime_LimbUpdateMatrix updateMtxFunc, SkelAnime_LimbAppendDlist appendDlistFunc, + Actor* actor, s32 dListIndex); +void SkelAnime_Draw(GlobalContext* globalCtx, Skeleton* skeleton, Vec3s* actorDrawTable, + SkelAnime_LimbUpdateMatrix updateMtxFunc, SkelAnime_LimbAppendDlist appendDlistFunc, Actor* actor); +void SkelAnime_DrawSV(GlobalContext* globalCtx, Skeleton* skeleton, Vec3s* actorDrawTable, s32 dListCount, + SkelAnime_LimbUpdateMatrix updateMtxFunc, SkelAnime_LimbAppendDlist appendDlistFunc, + Actor* actor); +s16 SkelAnime_GetFrameCount(GenericAnimationHeader* animationSeg); +Gfx* SkelAnime_Draw2(GlobalContext* globalCtx, Skeleton* skeleton, Vec3s* actorDrawTable, + SkelAnime_LimbUpdateMatrix2 updateMtxFunc, SkelAnime_LimbAppendDlist2 appendDlistFunc, + Actor* actor, Gfx* gfx); +Gfx* SkelAnime_DrawSV2(GlobalContext* globalCtx, Skeleton* skeleton, Vec3s* actorDrawTable, s32 dListCount, + SkelAnime_LimbUpdateMatrix2 updateMtxFunc, SkelAnime_LimbAppendDlist2 appendDlistFunc, + Actor* actor, Gfx* gfx); +void SkelAnime_InterpolateVec3s(s32, Vec3s*, Vec3s*, Vec3s*, f32); +void SkelAnime_AnimationCtxReset(AnimationContext* animationCtx); +void func_800A32F4(GlobalContext* globalCtx); +void func_800A3310(GlobalContext* globalCtx); +void SkelAnime_LoadLinkAnimetion(GlobalContext* globalCtx, LinkAnimetionEntry* linkAnimetionSeg, s32 frame, + s32 limbCount, void* ram); +void SkelAnime_LoadAnimationType1(GlobalContext* globalCtx, s32 vecCount, Vec3s* dst, Vec3s* src); +void SkelAnime_LoadAnimationType2(GlobalContext* globalCtx, s32 limbCount, Vec3s* arg2, Vec3s* arg3, f32 arg4); +void SkelAnime_LoadAnimationType3(GlobalContext* globalCtx, s32 vecCount, Vec3s* dst, Vec3s* src, u8* index); +void SkelAnime_LoadAnimationType4(GlobalContext* globalCtx, s32 vecCount, Vec3s* dst, Vec3s* src, u8* index); +void SkelAnime_LoadAnimationType5(GlobalContext* globalCtx, Actor* actor, SkelAnime* skelAnime, f32 arg3); +void func_800A390C(GlobalContext* globalCtx, AnimationContext* animationCtx); +void SkelAnime_InitLinkAnimetion(GlobalContext* globalCtx, SkelAnime* skelAnime, SkeletonHeader* skeletonHeaderSeg, + LinkAnimetionEntry* linkAnimetionEntrySeg, s32 flags, Vec3s* actorDrawTbl, Vec3s* arg6, + s32 limbBufCount); +void func_800A3B8C(SkelAnime* skelAnime); +s32 func_800A3BC0(GlobalContext* globalCtx, SkelAnime* skelAnime); +void func_800A3C9C(GlobalContext* globalCtx, SkelAnime* skelAnime); +void SkelAnime_SetTransition(GlobalContext* globalCtx, SkelAnime* skelAnime, f32 transitionRate); +void SkelAnime_ChangeLinkAnim(GlobalContext* globalCtx, SkelAnime* skelAnime, LinkAnimetionEntry* linkAnimetionEntrySeg, + f32 playbackSpeed, f32 frame, f32 frameCount, u8 arg6, f32 transitionRate); +void SkelAnime_ChangeLinkAnimDefaultStop(GlobalContext* globalCtx, SkelAnime* skelAnime, + LinkAnimetionEntry* linkAnimetionEntrySeg); +void SkelAnime_ChangeLinkAnimPlaybackStop(GlobalContext* globalCtx, SkelAnime* skelAnime, + LinkAnimetionEntry* linkAnimetionEntrySeg, f32 playbackSpeed); +void SkelAnime_ChangeLinkAnimDefaultRepeat(GlobalContext* globalCtx, SkelAnime* skelAnime, + LinkAnimetionEntry* linkAnimetionEntrySeg); +void SkelAnime_ChangeLinkAnimPlaybackRepeat(GlobalContext* globalCtx, SkelAnime* skelAnime, + LinkAnimetionEntry* linkAnimetionEntrySeg, f32 playbackSpeed); +void func_800A41FC(GlobalContext* globalCtx, SkelAnime* skelAnime); +void func_800A425C(GlobalContext* globalCtx, SkelAnime* skelAnime, LinkAnimetionEntry* linkAnimetionEntrySeg, + f32 frame); +void func_800A42A0(GlobalContext* globalCtx, SkelAnime* skelAnime, LinkAnimetionEntry* linkAnimetionEntrySeg, + f32 frame); +void func_800A42E4(GlobalContext* globalCtx, SkelAnime* skelAnime, f32 frame); +void func_800A431C(GlobalContext* globalCtx, SkelAnime* skelAnime, LinkAnimetionEntry* linkAnimetionEntrySeg, + f32 transitionFrame, LinkAnimetionEntry* linkAnimetionEntrySeg2, f32 frame, f32 transitionRate, + Vec3s* actorDrawTable); +void func_800A43B8(GlobalContext* globalCtx, SkelAnime* skelAnime, LinkAnimetionEntry* linkAnimetionEntrySeg, + f32 transitionFrame, LinkAnimetionEntry* linkAnimetionEntrySeg2, f32 frame, f32 transitionRate, + Vec3s* arg7); +s32 func_800A4530(SkelAnime* skelAnime, f32 arg1); +void SkelAnime_Init(GlobalContext* globalCtx, SkelAnime* skelAnime, SkeletonHeader* skeletonHeaderSeg, + AnimationHeader* animationseg, Vec3s* actorDrawTable, Vec3s* arg5, s32 limbCount); +void SkelAnime_InitSV(GlobalContext* globalCtx, SkelAnime* skelAnime, SkeletonHeader* skeletonHeaderSeg, + AnimationHeader* animationseg, Vec3s* actorDrawTable, Vec3s* arg5, s32 limbCount); +void SkelAnime_InitSkin(GlobalContext* globalCtx, SkelAnime* skelAnime, SkeletonHeader* skeletonHeaderSeg, + AnimationHeader* animationseg); s32 SkelAnime_FrameUpdateMatrix(SkelAnime* skelAnime); -// ? func_800A4C58(?); -// ? func_800A4FE4(?); -void SkelAnime_ChangeAnimation(SkelAnime* skelAnime, u32 animation, f32 playbackSpeed, f32 unk0, f32 frameCount, u8 unk1, f32 transitionRate); -void func_800A51E8(SkelAnime *skelAnime, u32 animation); -void func_800A5240(SkelAnime *skelAnime, u32 animation, f32 unk0); -void func_800A529C(SkelAnime *skelAnime, u32 animation, f32 unk0, Actor *actor); -// ? func_800A52F8(?); -// ? func_800A54FC(?); -UNK_TYPE func_800A56C8(SkelAnime* skelAnime, f32 arg1); -// ? func_800A56F0(?); -// ? func_800A5774(?); +void SkelAnime_ChangeAnimImpl(SkelAnime* skelAnime, AnimationHeader* animationseg, f32 playbackSpeed, f32 frame, + f32 frameCount, u8 unk1, f32 transitionRate, s8 unk2); +void SkelAnime_ChangeAnim(SkelAnime* skelAnime, AnimationHeader* animationseg, f32 playbackSpeed, f32 unk0, + f32 frameCount, u8 unk1, f32 transitionRate); +void SkelAnime_ChangeAnimDefaultStop(SkelAnime* skelAnime, AnimationHeader* animationseg); +void SkelAnime_ChangeAnimTransitionStop(SkelAnime* skelAnime, AnimationHeader* animationseg, f32 transitionRate); +void SkelAnime_ChangeAnimPlaybackStop(SkelAnime* skelAnime, AnimationHeader* animationseg, f32 playbackSpeed); +void SkelAnime_ChangeAnimDefaultRepeat(SkelAnime* skelAnime, AnimationHeader* animationseg); +void SkelAnime_ChangeAnimTransitionRepeat(SkelAnime* skelAnime, AnimationHeader* animationseg, f32 transitionRate); +void SkelAnime_ChangeAnimPlaybackRepeat(SkelAnime* skelAnime, AnimationHeader* animationseg, f32 playbackSpeed); +void SkelAnime_AnimReverse(SkelAnime* skelAnime); +void func_800A5428(SkelAnime* skelAnime, Vec3s* dst, Vec3s* src, u8* index); +void func_800A54FC(SkelAnime* skelAnime, Vec3f* pos, s16 angle); +s32 func_800A56C8(SkelAnime* skelAnime, f32 arg1); +void SkelAnime_Free(SkelAnime* skelAnime, GlobalContext* globalCtx); // ? func_800A57C0(?); // ? func_800A598C(?); // ? func_800A5E28(?); @@ -1192,27 +1263,36 @@ u32 func_800AA148(); void func_800AA15C(); void func_800AA16C(); void func_800AA178(u32); -// ? func_800AA190(?); +void func_800AA190(UnkViewStruct* arg0, Viewport* viewport); +View* func_800AA1F8(GraphicsContext* gfxCtx); +void func_800AA250(View* view); void func_800AA278(View*, GraphicsContext*); -// ? func_800AA358(?); -// ? func_800AA43C(?); -void func_800AA460(View*, f32, f32, f32); -// ? func_800AA4FC(?); -// ? func_800AA550(?); -void func_800AA76C(View*, f32, f32, f32); -void func_800AA78C(View*, f32, f32, f32); -void func_800AA7AC(View*, f32); -// ? func_800AA7B8(?); -// ? func_800AA814(?); -// ? func_800AA890(?); -// ? func_800AAA50(?); -// ? func_800AAA9C(?); -// ? func_800AB0A8(?); -// ? func_800AB2C4(?); -// ? func_800AB560(?); -// ? func_800AB944(?); +void func_800AA358(View* view, Vec3f* vec1, Vec3f* vec2, Vec3f* vec3); +void func_800AA3F0(View* view, Vec3f* vec1, Vec3f* vec2, Vec3f* vec3); +void func_800AA43C(View* view, f32 arg1); +void func_800AA454(View* view, f32* arg1); +void func_800AA460(View* view, f32 fieldOfView, f32 fogDistance, f32 zDepth); +void func_800AA48C(View* view, f32* fieldOfView, f32* fogDistance, f32* zDepth); +void func_800AA4A8(View* view, f32 fieldOfView, f32 fogDistance, f32 zDepth); +void func_800AA4E0(View* view, f32* fieldOfView, f32* fogDistance, f32* zDepth); +void func_800AA4FC(View* view, Viewport* viewport); +void func_800AA52C(View* view, Viewport* viewport); +void func_800AA550(View* view); +void func_800AA76C(View* view, f32 arg1, f32 arg2, f32 arg3); +void func_800AA78C(View* view, f32 arg1, f32 arg2, f32 arg3); +void func_800AA7AC(View* view, f32 arg1); +void func_800AA7B8(View* view); +void func_800AA814(View* view); +void func_800AA840(View* view, Vec3f vec1, Vec3f vec2, f32 arg3); +s32 func_800AA890(View* view, Mtx* mtx); +void func_800AAA50(View* view, s32 arg1); +s32 func_800AAA9C(View* view); +s32 func_800AB0A8(View* view); +s32 func_800AB2C4(View* view); +s32 func_800AB560(View* view); +s32 func_800AB944(View* view); // ? func_800AB9EC(?); -void func_800ABE74(f32, f32, f32); +s32 func_800ABE74(f32 eyeX, f32 eyeY, f32 eyeZ); // ? func_800AC030(?); // ? func_800AC2F4(?); // ? func_800AC89C(?); @@ -1341,14 +1421,14 @@ void KaleidoScopeCall_LoadPlayer(); void KaleidoScopeCall_Init(GlobalContext* globalCtx); void KaleidoScopeCall_Destroy(GlobalContext* globalCtx); void KaleidoScopeCall_Update(GlobalContext* globalCtx); -void KaleidoScopeCall_Draw(GlobalContext *globalCtx); +void KaleidoScopeCall_Draw(GlobalContext* globalCtx); // ? func_800BC450(?); // ? func_800BC490(?); s32 func_800BC56C(GlobalContext*, s16); // ? func_800BC5E0(?); void func_800BC88C(GlobalContext*); Gfx* func_800BC8A0(GlobalContext* globalCtx, Gfx* a1); -// ? func_800BC8EC(?); +void func_800BC8EC(GlobalContext*); UNK_TYPE func_800BCA64(UNK_ARGS); // ? func_800BD314(?); // ? func_800BED40(?); @@ -1372,10 +1452,10 @@ void func_800C0704(GlobalContext*, s16, f32); // ? func_800C078C(?); // ? func_800C0808(?); // ? func_800C0874(?); -void func_800C0C88(GlobalContext *globalCtx); +void func_800C0C88(GlobalContext* globalCtx); // ? func_800C0A44(?); // ? func_800C0A88(?); -// ? func_800C0AF4(?); +void func_800C0AF4(GlobalContext*, s8, s16); void func_800C0B60(GlobalContext* globalCtx); void func_800C0BB4(GlobalContext* globalCtx); // ? func_800C0CB8(?); @@ -1458,22 +1538,23 @@ void* GameAlloc_Malloc(GameAlloc* this, u32 size); void GameAlloc_Free(GameAlloc* this, void* data); void GameAlloc_Cleanup(GameAlloc* this); void GameAlloc_Init(GameAlloc* this); -// ? func_800C5850(?); -// ? func_800C58BC(?); -// ? func_800C5AB0(?); -// ? func_800C5B14(?); -// ? func_800C5C2C(?); -// ? func_800C5D08(?); -// ? func_800C5D94(?); -// ? func_800C5DC0(?); -// ? func_800C61D8(?); +void Graph_FaultClient(); +void Graph_DisassembleUCode(void* arg0); +void Graph_UCodeFaultClient(void* arg0); +void* Graph_InitTHGA(GraphicsContext* gfxCtx); +GameStateOverlay* Graph_GetNextGameState(); +void Graph_Init(GraphicsContext* gfxCtx); +void Graph_Destroy(GraphicsContext* gfxCtx); +void Graph_TaskSet00(GraphicsContext* gfxCtx); +void Graph_Update(GraphicsContext* gfxCtx, GameState* gameState); void Graph_ThreadEntry(void*); void* Graph_Alloc(GraphicsContext* gfxCtx, size_t size); -void func_800C6AC4(Gfx** a0, GraphicsContext* gfxCtx, char* file, s32 line); -void func_800C6B54(Gfx** a0, GraphicsContext* gfxCtx, char* file, s32 line); -Gfx* func_800C6C20(Gfx* a0); -// ? func_800C6C28(?); -// ? func_800C6C3C(?); +void* Graph_Alloc2(GraphicsContext* gfxCtx, size_t size); +void Graph_OpenDisps(Gfx** dispRefs, GraphicsContext* gfxCtx, const char* file, s32 line); +void Graph_CloseDisps(Gfx** dispRefs, GraphicsContext* gfxCtx, const char* file, s32 line); +Gfx* Graph_GfxPlusOne(Gfx* gfx); +Gfx* Graph_BranchDlist(Gfx* gfx, Gfx* dst); +void* Graph_DlistAlloc(Gfx** gfx, u32 size); ListAlloc* ListAlloc_Init(ListAlloc* this); void* ListAlloc_Alloc(ListAlloc* this, u32 size); void ListAlloc_Free(ListAlloc* this, void* data); @@ -1492,7 +1573,7 @@ void Main(void*); // ? func_800C7C14(?); // ? func_800C7DD0(?); void func_800C7E08(Input*, u32); -//void PadMgr_Init(PadMgr* padmgr, OSMesg mesg, UNK_TYPE arg2, OSId id, OSPri priority, void* stack); +// void PadMgr_Init(PadMgr* padmgr, OSMesg mesg, UNK_TYPE arg2, OSId id, OSPri priority, void* stack); // ? func_800C82A0(?); // ? func_800C84E4(?); // ? func_800C8534(?); @@ -1611,8 +1692,8 @@ void Matrix_Scale(f32 x, f32 y, f32 z, u8 mode); void Matrix_RotateX(f32 x, u8 mode); void Matrix_RotateY(f32 y, u8 mode); void Matrix_RotateZ(f32 z, u8 mode); -void Matrix_RotateXYZ(s16 x, s16 y, s16 z, u8 mode); -void func_800D1340(Vec3f* arg0, Vec3s* arg1); +void Matrix_RotateZYX(s16 x, s16 y, s16 z, u8 mode); +void Matrix_TranslateThenRotateZYX(Vec3f* arg0, Vec3s* arg1); 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); @@ -1629,10 +1710,10 @@ void func_800D2264(MtxF* mf, Vec3s* vec, s32 flag); void func_800D23FC(f32 f, Vec3f* vec, u8 mode); MtxF* Matrix_CheckFloats(MtxF* mf, char* file, s32 line); void func_800D2CEC(Mtx* mtx, f32 arg1, f32 arg2, f32 arg3, f32 arg4, f32 arg5, f32 arg6); -// ? func_800D2DF0(?); -// ? func_800D2DFC(?); -// ? func_800D2E14(?); -// ? func_800D2E20(?); +// ? SysUcode_GetUCodeBoot(?); +// ? SysUcode_GetUcodeBootSize(?); +// ? SysUcode_GetUcode(?); +// ? SysUcode_GetUcodeData(?); // ? func_800D2E30(?); // ? func_800D3140(?); // ? func_800D3140(?); @@ -1642,7 +1723,7 @@ void IrqMgr_AddClient(IrqMgr* this, IrqMgrClient* c, OSMesgQueue* msgQ); void IrqMgr_RemoveClient(IrqMgr* this, IrqMgrClient* c); void IrqMgr_SendMesgForClient(IrqMgr* this, OSMesg msg); void IrqMgr_JamMesgForClient(IrqMgr* this, OSMesg msg); -void IrqMgr_HandlePreNMI(IrqMgr *this); +void IrqMgr_HandlePreNMI(IrqMgr* this); void IrqMgr_CheckStack(); void IrqMgr_HandlePRENMI450(IrqMgr* this); void IrqMgr_HandlePRENMI480(IrqMgr* this); @@ -1678,7 +1759,7 @@ u32 Fault_ConvertAddress(FaultAddrConvClient*); void Fault_Sleep(u32); void Fault_PadCallback(Input*); void Fault_UpdatePadImpl(); -bool Fault_WaitForInputImpl(); +u32 Fault_WaitForInputImpl(); void Fault_WaitForInput(); void Fault_DrawRec(s32, s32, s32, s32, u16); void Fault_FillScreenBlack(); @@ -1724,7 +1805,7 @@ void FaultDrawer_VPrintf(const char*, char*); void FaultDrawer_Printf(const char*, ...); void FaultDrawer_DrawText(s32, s32, const char*, ...); void FaultDrawer_SetDrawerFB(void*, u16, u16); -void FaultDrawer_SetInputCallback(void(*)()); +void FaultDrawer_SetInputCallback(void (*)()); void FaultDrawer_SetDefault(); // ? func_800D7CD0(?); // ? func_800D7D04(?); @@ -2132,7 +2213,7 @@ void GfxPrint_SetPosPx(GfxPrint*, s32, s32); void GfxPrint_SetPos(GfxPrint*, s32, s32); void GfxPrint_SetBasePosPx(GfxPrint*, s32, s32); void GfxPrint_PrintCharImpl(GfxPrint*, u8); -void GfxPrint_PrintChar(GfxPrint*, char); +void GfxPrint_PrintChar(GfxPrint*, u8); void GfxPrint_PrintStringWithSize(GfxPrint*, const void*, size_t, size_t); GfxPrint* GfxPrint_Callback(GfxPrint*, const char*, size_t); void GfxPrint_Ctor(GfxPrint*); @@ -2143,14 +2224,14 @@ void GfxPrint_VPrintf(GfxPrint*, const char*, va_list); void GfxPrint_Printf(GfxPrint*, const char*, ...); void func_800FBCE0(); void func_800FBFD8(); -void *Overlay_AllocateAndLoad(u32 vRomStart, u32 vRomEnd, void *vRamStart, void *vRamEnd); +void* Overlay_AllocateAndLoad(u32 vRomStart, u32 vRomEnd, void* vRamStart, void* vRamEnd); // ? func_800FC258(?); -void Overlay_DoRelocation(void *allocatedVRamAddress, OverlayRelocationSection *overlayInfo, void *vRamAddress); -s32 Overlay_Load(u32 vRomStart, u32 vRomEnd, void *vRamStart, void *vRamEnd, void *allocatedVRamAddress); +void Overlay_DoRelocation(void* allocatedVRamAddress, OverlayRelocationSection* overlayInfo, void* vRamAddress); +s32 Overlay_Load(u32 vRomStart, u32 vRomEnd, void* vRamStart, void* vRamEnd, void* allocatedVRamAddress); // ? func_800FC800(?); // ? func_800FC83C(?); // ? func_800FCAB4(?); -void SystemHeap_Init(void *start, u32 size); +void SystemHeap_Init(void* start, u32 size); // ? func_800FCC00(?); // ? func_800FCC08(?); // ? func_800FCC10(?); @@ -2158,19 +2239,19 @@ void SystemHeap_Init(void *start, u32 size); // ? func_800FCC24(?); // ? func_800FCC6C(?); // ? func_800FCD40(?); -// ? func_800FCE80(?); -// ? func_800FCF34(?); -// ? func_800FCF54(?); -// ? func_800FCFA0(?); -// ? func_800FD0C4(?); -// ? func_800FD210(?); -f32 func_800FD250(f32 f12, f32 f14); -// ? func_800FD338(?); -// ? func_800FD390(?); -// ? func_800FD3C8(?); -// ? func_800FD400(?); -// ? func_800FD438(?); -// ? func_800FD470(?); +f32 Math_tanf(f32 x); +f32 Math_nearbyintf(f32 x); +f32 Math_atanf_taylor_q(f32 x); +f32 Math_atanf_taylor(f32 x); +f32 Math_atanf_cfrac(f32 x); +f32 Math_atanf(f32 x); +f32 Math_atan2f(f32 y, f32 x); +f32 Math_asinf(f32 x); +f32 Math_acosf(f32 x); +f32 ceilf(f32 x); +f32 truncf(f32 x); +f32 roundf(f32 x); +f32 nearbyintf(f32 x); void SystemArena_CheckPointer(void* ptr, u32 size, const char* name, const char* action); void* SystemArena_Malloc(u32 size); void* SystemArena_MallocDebug(u32 size, const char* file, s32 line); @@ -2213,10 +2294,10 @@ u8 __osMallocIsInitalized(Arena* arena); void __osMalloc_FreeBlockTest(Arena* arena, ArenaNode* node); void* __osMalloc_NoLockDebug(Arena* arena, u32 size, const char* file, s32 line); void* __osMallocDebug(Arena* arena, u32 size, const char* file, s32 line); -void* __osMallocRDebug(Arena *arena, u32 size, const char *file, s32 line); -void* __osMalloc_NoLock(Arena *arena, u32 size); +void* __osMallocRDebug(Arena* arena, u32 size, const char* file, s32 line); +void* __osMalloc_NoLock(Arena* arena, u32 size); void* __osMalloc(Arena* arena, u32 size); -void* __osMallocR(Arena *arena, u32 size); +void* __osMallocR(Arena* arena, u32 size); void __osFree_NoLock(Arena* arena, void* ptr); void __osFree(Arena* arena, void* ptr); void __osFree_NoLockDebug(Arena* arena, void* ptr, const char* file, s32 line); @@ -2272,7 +2353,7 @@ s16 sins(u16); // ? func_80101AA4(?); // ? func_80101B40(?); // ? func_80101B90(?); -// ? func_80101E34(?); +void func_80101E34(MtxF*, f32, f32, f32, f32, f32, f32, f32, f32, f32); // ? func_80101EB0(?); // ? func_801021E4(?); // ? osStopTimer(?); @@ -2289,11 +2370,12 @@ s16 sins(u16); // ? func_80103210(?); // ? func_8010328C(?); // ? func_801032B0(?); -void func_80103A70(UNK_PTR, Gfx*, Hilite*, f32, f32, f32, f32, f32, f32, f32, f32, f32, f32, f32, f32, f32, f32, f32, s32, s32); +void func_80103A70(UNK_PTR, Gfx*, Hilite*, f32, f32, f32, f32, f32, f32, f32, f32, f32, f32, f32, f32, f32, f32, f32, + s32, s32); // ? func_80103B30(?); // ? func_80103B60(?); // ? func_80103BB0(?); -// ? func_80103D58(?); +void func_80103D58(Mtx*, f32, f32, f32, f32, f32, f32, f32); // ? func_80103DC0(?); // ? func_80103E20(?); // ? func_80103FA4(?); @@ -2305,7 +2387,7 @@ void osDpSetStatus(u32 status); // ? func_801041E0(?); // ? func_801043B8(?); // ? func_80104450(?); -// ? func_801045A4(?); +void func_801045A4(Mtx*, f32, f32, f32, f32, f32, f32, f32); f32 cosf(f32); s16 coss(u16); void osViSetEvent(OSMesgQueue* mq, OSMesg m, u32 retraceCount); @@ -2347,7 +2429,7 @@ f32 absf(f32); // ? func_801069B0(?); u8 func_80106BC8(GlobalContext* globalCtx); // ? func_80106C88(?); -// ? func_80106CCC(?); +void func_80106CCC(GlobalContext*); // ? func_80106D40(?); // ? func_80106F1C(?); // ? func_80107244(?); @@ -2361,7 +2443,7 @@ u8 func_80106BC8(GlobalContext* globalCtx); // ? func_80109968(?); // ? func_80109B3C(?); // ? func_8010B0C0(?); -// ? func_8010B680(?); +void func_8010B680(GlobalContext*, u16, s32); void func_8010B720(GlobalContext* globalCtx, u16 textId); // ? func_8010B820(?); // ? func_8010BD58(?); @@ -2382,5 +2464,13 @@ void func_801109B0(GlobalContext* globalCtx); void func_80110F68(GlobalContext* globalCtx); void func_80112098(GlobalContext* globalCtx); -void func_80800878(TitleContext*); +void Title_Init(TitleContext*); +void Title_Destroy(TitleContext* this); +void func_80801E44(GameState*); // Select_Init +void func_80801E0C(GameState*); // Select_Destroy +void Opening_Init(OpeningContext* this); +void Opening_Destroy(OpeningContext* this); +void func_80811A20(GameState*); // FileChoose_Init +void func_80811A18(GameState*); // FileChoose_Destroy + #endif diff --git a/include/ichain.h b/include/ichain.h index 21ede465c7..8b11121911 100644 --- a/include/ichain.h +++ b/include/ichain.h @@ -1,8 +1,7 @@ #ifndef _ICHAIN_H_ #define _ICHAIN_H_ -typedef struct -{ +typedef struct { u32 cont: 1; u32 type: 4; u32 offset: 11; @@ -11,8 +10,7 @@ typedef struct #define OFFSETOF(structure, member) ((size_t)&(((structure*)0)->member)) -typedef enum -{ +typedef enum { /* 0x0 */ ICHAINTYPE_U8, // sets byte /* 0x1 */ ICHAINTYPE_S8, /* 0x2 */ ICHAINTYPE_U16, // sets short diff --git a/include/macros.h b/include/macros.h index ef435aca55..ecd8c5acf4 100644 --- a/include/macros.h +++ b/include/macros.h @@ -13,6 +13,7 @@ #define SQ(x) ((x)*(x)) #define ABS(x) ((x) >= 0 ? (x) : -(x)) #define DECR(x) ((x) == 0 ? 0 : ((x) -= 1)) +#define CLAMP(x,min,max) ((x) < (min) ? (min) : (x) > (max) ? (max) : (x)) #define PLAYER ((Player*)globalCtx->actorCtx.actorList[ACTORTYPE_PLAYER].first) @@ -34,4 +35,17 @@ #define CAPACITY(upg, value) gUpgradeCapacities[upg][value] #define CUR_CAPACITY(upg) CAPACITY(upg, CUR_UPG_VALUE(upg)) +#define SET_NEXT_GAMESTATE(curState, newInit, newStruct) \ + (curState)->init = newInit; \ + (curState)->size = sizeof(newStruct); + +#define LOG(exp, value, format, file, line) \ + LogUtils_LogThreadId(file, line); \ + osSyncPrintf(exp " = " format "\n", value); + +#define LOG_ADDRESS(exp, value, file, line) LOG(exp, value, "%08x", file, line) +#define LOG_STRING(string, file, line) LOG(#string, string, "%s", file, line) +#define LOG_TIME(exp, value, file, line) LOG(exp, value, "%lld", file, line) +#define LOG_NUM(exp, value, file, line) LOG(exp, value, "%d", file, line) + #endif diff --git a/include/math.h b/include/math.h index a2648c3352..1fbbe0ca77 100644 --- a/include/math.h +++ b/include/math.h @@ -2,6 +2,7 @@ #define _MATH_H_ #define M_PI 3.14159265358979323846f +#define M_SQRT2 1.41421356237309504880f #define FLT_MAX 340282346638528859811704183484516925440.0f float sinf(float); diff --git a/include/padmgr.h b/include/padmgr.h index ca5c7e42dc..dda4b210fc 100644 --- a/include/padmgr.h +++ b/include/padmgr.h @@ -6,8 +6,7 @@ #include -typedef struct -{ +typedef struct { /* 0x0000 */ OSContStatus pad_status[4]; /* 0x0010 */ OSMesg msgbuf1[1]; /* 0x0014 */ OSMesg msgbuf2[1]; @@ -24,10 +23,10 @@ typedef struct /* 0x02A8 */ u8 unk_2A8; /* 0x02A9 */ u8 unk_2A9; /* 0x02AA */ u8 unk_2AA[4]; - /* 0x02AA */ u8 unk_2AE[4]; //Looks like 1 if vibration pack, 2 if (maybe controller pack)? + /* 0x02AA */ u8 unk_2AE[4]; // Looks like 1 if vibration pack, 2 if (maybe controller pack)? /* 0x02B2 */ u8 unk_2B2[4]; /* 0x02B6 */ u8 unk_2B6[4]; - /* 0x02BA */ char unk_2BA[0x02]; //probably padding + /* 0x02BA */ char unk_2BA[0x02]; // probably padding /* 0x02BC */ unk_controller_t unk_controller[4]; /* 0x045C */ u8 unk_45C; /* 0x045D */ u8 unk_45D; @@ -37,5 +36,5 @@ typedef struct /* 0x0464 */ s32 unk_464; } PadMgr; // size = 0x468 - -#endif //_PADMGR_H_ + +#endif diff --git a/include/regs.h b/include/regs.h index 4c3ad34cb1..b76587458e 100644 --- a/include/regs.h +++ b/include/regs.h @@ -1,7 +1,12 @@ #ifndef _REGS_H_ #define _REGS_H_ -#define BASE_REG(n, r) gGameInfo->data[n * 96 + r] +#define REG_GROUPS 29 // number of REG groups, i.e. REG, SREG, OREG, etc. +#define REG_PAGES 6 +#define REG_PER_PAGE 16 +#define REG_PER_GROUP REG_PAGES * REG_PER_PAGE + +#define BASE_REG(n, r) gGameInfo->data[n * REG_PER_GROUP + r] #define REG(r) BASE_REG(0, r) #define SREG(r) BASE_REG(1, r) diff --git a/include/sched.h b/include/sched.h index 423724d968..2873a310d2 100644 --- a/include/sched.h +++ b/include/sched.h @@ -3,25 +3,22 @@ #include -typedef struct OSScTask -{ - /* 0x00 */ struct OSScTask* next; - /* 0x04 */ u32 state; - /* 0x08 */ u32 flags; - /* 0x0C */ void* framebuffer; - /* 0x10 */ OSTask list; - /* 0x58 */ OSMesgQueue* msgQ; - /* 0x5C */ OSMesg msg; -} OSScTask; +#define OS_SC_NEEDS_RDP 0x0001 +#define OS_SC_NEEDS_RSP 0x0002 +#define OS_SC_DRAM_DLIST 0x0004 +#define OS_SC_PARALLEL_TASK 0x0010 +#define OS_SC_LAST_TASK 0x0020 +#define OS_SC_SWAPBUFFER 0x0040 -typedef struct -{ +#define OS_SC_RCP_MASK 0x0003 +#define OS_SC_TYPE_MASK 0x0007 + +typedef struct { /* 0x00 */ char unk_00[0x12]; /* 0x12 */ s8 unk_12; } struct_800C8BC4; -typedef struct -{ +typedef struct { /* 0x0000 */ OSMesgQueue interruptQ; /* 0x0018 */ OSMesg intBuf[8]; /* 0x0038 */ OSMesgQueue cmdQ; @@ -39,4 +36,6 @@ typedef struct /* 0x0220 */ char unk_254[0x04]; } SchedContext; // size = 0x258 +extern SchedContext gSchedContext; + #endif diff --git a/include/segment_symbols.h b/include/segment_symbols.h index 0be701c23b..aed6d2f661 100644 --- a/include/segment_symbols.h +++ b/include/segment_symbols.h @@ -3,20 +3,20 @@ #include -#define DECLARE_SEGMENT(name) \ +#define DECLARE_SEGMENT(name) \ extern u8 _##name##SegmentStart[]; \ extern u8 _##name##SegmentEnd[]; -#define DECLARE_ROM_SEGMENT(name) \ +#define DECLARE_ROM_SEGMENT(name) \ extern u8 _##name##SegmentRomStart[]; \ extern u8 _##name##SegmentRomEnd[]; -#define DECLARE_BSS_SEGMENT(name) \ +#define DECLARE_BSS_SEGMENT(name) \ extern u8 _##name##SegmentBssStart[]; \ extern u8 _##name##SegmentBssEnd[]; #define DECLARE_OVERLAY_SEGMENT(name) \ - DECLARE_SEGMENT(ovl_##name) \ + DECLARE_SEGMENT(ovl_##name) \ DECLARE_ROM_SEGMENT(ovl_##name) DECLARE_SEGMENT(boot) @@ -921,6 +921,7 @@ DECLARE_ROM_SEGMENT(g_pn_55) DECLARE_ROM_SEGMENT(g_pn_56) DECLARE_ROM_SEGMENT(g_pn_57) +DECLARE_ROM_SEGMENT(nintendo_rogo_static) DECLARE_ROM_SEGMENT(title_static) DECLARE_ROM_SEGMENT(parameter_static) DECLARE_ROM_SEGMENT(vr_cloud2_static) @@ -1090,5 +1091,4 @@ DECLARE_ROM_SEGMENT(testroom_room_2) DECLARE_ROM_SEGMENT(testroom_room_3) DECLARE_ROM_SEGMENT(testroom_room_4) - #endif diff --git a/include/stdbool.h b/include/stdbool.h index 87f54e45b5..519806b310 100644 --- a/include/stdbool.h +++ b/include/stdbool.h @@ -1,13 +1,13 @@ #ifndef _STDBOOL #define _STDBOOL -#define __bool_true_false_are_defined 1 +#define __bool_true_false_are_defined 1 #ifndef __cplusplus -#define bool u32 -#define false 0 -#define true 1 +#define bool u32 +#define false 0 +#define true 1 #endif /* __cplusplus */ diff --git a/include/stddef.h b/include/stddef.h index 8b46557749..16bd97a1d7 100644 --- a/include/stddef.h +++ b/include/stddef.h @@ -1,7 +1,7 @@ #ifndef _STDDEF_H_ #define _STDDEF_H_ -#define NULL ((void *)0) +#define NULL ((void*)0) typedef unsigned long size_t; diff --git a/include/stdlib.h b/include/stdlib.h index 1c7666df84..81dc327572 100644 --- a/include/stdlib.h +++ b/include/stdlib.h @@ -1,14 +1,12 @@ #ifndef _STDLIB_H_ #define _STDLIB_H_ -typedef struct lldiv_t -{ +typedef struct lldiv_t { long long quot; long long rem; } lldiv_t; -typedef struct ldiv_t -{ +typedef struct ldiv_t { long quot; long rem; } ldiv_t; diff --git a/include/string.h b/include/string.h index 35b1ffa067..29ce60a57c 100644 --- a/include/string.h +++ b/include/string.h @@ -1,8 +1,10 @@ #ifndef _STRING_H_ #define _STRING_H_ + #include + void* memcpy(void*, const void*, size_t); -size_t strlen(const u8 *str); -const u8 *strchr(const u8 *str, s32 ch); +size_t strlen(const u8* str); +const u8* strchr(const u8* str, s32 ch); #endif diff --git a/include/ultra64/gbi.h b/include/ultra64/gbi.h index 9bbb9c63c7..f3f797e818 100644 --- a/include/ultra64/gbi.h +++ b/include/ultra64/gbi.h @@ -4201,7 +4201,7 @@ _DW({ \ #define gDPSetScissorFrac(pkt, mode, ulx, uly, lrx, lry) \ -{ \ +_DW({ \ Gfx *_g = (Gfx *)pkt; \ \ _g->words.w0 = _SHIFTL(G_SETSCISSOR, 24, 8) | \ @@ -4210,7 +4210,7 @@ _DW({ \ _g->words.w1 = _SHIFTL(mode, 24, 2) | \ _SHIFTL((int)((lrx)), 12, 12) | \ _SHIFTL((int)((lry)), 0, 12); \ -} +}) #define gsDPSetScissor(mode, ulx, uly, lrx, lry) \ { \ @@ -4482,6 +4482,16 @@ _DW({ \ #define gDPNoOpTag(pkt, tag) gDPParam(pkt, G_NOOP, tag) #define gsDPNoOpTag(tag) gsDPParam(G_NOOP, tag) +#define gDPNoOpHere(pkt, file, line) gDma1p(pkt, G_NOOP, file, line, 1) +#define gDPNoOpString(pkt, data, n) gDma1p(pkt, G_NOOP, data, n, 2) +#define gDPNoOpWord(pkt, data, n) gDma1p(pkt, G_NOOP, data, n, 3) +#define gDPNoOpFloat(pkt, data, n) gDma1p(pkt, G_NOOP, data, n, 4) +#define gDPNoOpQuiet(pkt) gDma1p(pkt, G_NOOP, 0, 0, 5) +#define gDPNoOpVerbose(pkt, n) gDma1p(pkt, G_NOOP, 0, n, 5) +#define gDPNoOpCallBack(pkt, callback) gDma1p(pkt, G_NOOP, callback, 0, 6) +#define gDPNoOpOpenDisp(pkt, file, line) gDma1p(pkt, G_NOOP, file, line, 7) +#define gDPNoOpCloseDisp(pkt, file, line) gDma1p(pkt, G_NOOP, file, line, 8) + #endif /* Private macro to wrap other macros in do {...} while (0) */ diff --git a/include/ultra64/mbi.h b/include/ultra64/mbi.h index 17213ea2bd..00b113595f 100644 --- a/include/ultra64/mbi.h +++ b/include/ultra64/mbi.h @@ -76,9 +76,11 @@ * **************************************************************************/ -#define M_GFXTASK 1 -#define M_AUDTASK 2 -#define M_VIDTASK 3 +#define M_NULTASK 0 +#define M_GFXTASK 1 +#define M_AUDTASK 2 +#define M_VIDTASK 3 +#define M_NJPEGTASK 4 #define M_HVQTASK 6 #define M_HVQMTASK 7 diff --git a/include/ultra64/types.h b/include/ultra64/types.h index 2f44e369fd..c793f8010a 100644 --- a/include/ultra64/types.h +++ b/include/ultra64/types.h @@ -24,15 +24,13 @@ typedef double f64; typedef long int Mtx_t[4][4]; -typedef union -{ +typedef union { Mtx_t m; long long int forc_structure_alignment; } Mtx; typedef float MtxF_t[4][4]; -typedef union -{ +typedef union { MtxF_t mf; struct { diff --git a/include/variables.h b/include/variables.h index a6d67c8693..4b7c8d30a7 100644 --- a/include/variables.h +++ b/include/variables.h @@ -54,7 +54,7 @@ extern u32 D_0403F070; extern u32 D_04042440; //extern ? D_04048160; extern u32 D_04048180; -extern u32 D_04049210; +extern Gfx D_04049210[]; extern u32 D_04049AD0; //extern ? D_0404D1C0; extern u32 D_0404D450; @@ -137,6 +137,7 @@ extern u32 __osTimerCounter; extern OSPiHandle __CartRomHandle; extern DmaEntry gDmaDataTable[0x60C]; //extern ? D_800D7288; +extern u8 D_801120C0[]; //extern ? D_80115440; //extern ? D_80115760; //extern ? D_80115770; @@ -185,7 +186,8 @@ extern EffectTableInfo EffectSS2Info; // 801158B0 //extern ? D_80115F68; //extern ? D_80115F6C; //extern ? D_80115F70; -extern ActorOverlay gActorOverlayTable[471]; // original name: "actor_dlftbls" +extern Gfx D_80116280[]; +extern ActorOverlay gActorOverlayTable[471]; // original name: "actor_dlftbls" 801162A0 extern s32 gMaxProfile; //extern ? D_80119E2C; //extern ? D_80119E52; @@ -259,17 +261,10 @@ extern s32 D_8011D3AC; //extern ? D_8011E096; //extern ? D_8011E098; //extern ? D_8011E09A; -//extern ? D_8011E0B0; -//extern ? D_8011E0B4; +extern s16 D_8011E0B0; +extern Color_RGBA8 D_8011E0B4[]; //extern ? D_8011E0D4; -//extern ? D_8011F3A0; -//extern ? D_8011F3D4; -//extern ? D_8011F830; -//extern ? D_8011F860; -//extern ? D_8011F890; -//extern ? D_8011F8C0; -//extern ? D_8011F8F0; -//extern ? D_8011F920; +extern GameStateOverlay gGameStateOverlayTable[6]; //extern ? D_8011FA60; //extern ? D_8011FA64; //extern ? D_8011FA68; @@ -480,54 +475,7 @@ extern s16 gSpoilingItemReverts[3]; //extern ? D_80126240; //extern ? D_80126250; //extern ? D_80126254; -//extern ? D_80126280; -//extern ? D_801262E0; -//extern ? D_80126340; -//extern ? D_80126640; -//extern ? D_80126730; -//extern ? D_80126760; -//extern ? D_80126790; -//extern ? D_801267C0; -//extern ? D_80126850; -//extern ? D_80126880; -//extern ? D_801268B0; -//extern ? D_801268E0; -//extern ? D_80126910; -//extern ? D_80126940; -//extern ? D_80126970; -//extern ? D_801269A0; -//extern ? D_801269D0; -//extern ? D_80126A00; -//extern ? D_80126A30; -//extern ? D_80126A60; -//extern ? D_80126A90; -//extern ? D_80126AC0; -//extern ? D_80126AF0; -//extern ? D_80126B20; -//extern ? D_80126B50; -//extern ? D_80126B80; -//extern ? D_80126BB0; -//extern ? D_80126BE0; -//extern ? D_80126C10; -//extern ? D_80126C40; -//extern ? D_80126C70; -//extern ? D_80126CA0; -//extern ? D_80126CD0; -//extern ? D_80126D00; -//extern ? D_80126D30; -//extern ? D_80126D60; -//extern ? D_80126D90; -//extern ? D_80126DC0; -//extern ? D_80126DF0; -//extern ? D_80126E80; -//extern ? D_80126EB0; -//extern ? D_80126EE0; -//extern ? D_80126F10; -//extern ? D_80126F40; -//extern ? D_80126F70; -//extern ? D_80126FA0; -//extern ? D_80126FD0; -extern Gfx D_80127098[]; +extern Gfx gEmptyDL[]; extern u32 gBitFlags[32]; extern u16 gEquipMasks[4]; extern u16 gEquipNegMasks[4]; @@ -544,8 +492,6 @@ extern u32 gObjectTableSize; extern RomFile gObjectTable[402]; extern EntranceInfo gEntranceTable[1556]; extern Scene gSceneTable[110]; -//extern ? D_8012A480; -//extern ? D_8012A484; //extern ? D_8012A4A0; //extern ? D_8012A4E0; //extern ? D_8012A4EC; @@ -565,10 +511,6 @@ extern Scene gSceneTable[110]; extern u8 gLetterTLUT[4][32]; // original name: "moji_tlut" extern u8 gFontFF[]; // original name: "font_ff" //extern ? D_8012ABF0; -//extern ? D_8012AC00; -//extern ? D_8012AC28; -//extern ? D_8012AC40; -//extern ? D_8012AC58; //extern ? D_8012AC90; //extern ? D_8012ACA0; //extern ? D_8012AD20; @@ -692,14 +634,12 @@ extern void* D_8012D1F0; extern u32 gScreenWidth; extern u32 gScreenHeight; extern u32 gSystemHeapSize; -extern s32 D_8012D280; -extern u32 D_8012D284; extern volatile u32 D_8012D290; //extern ? D_8012D2A0; extern Mtx gMtxClear; extern MtxF gMtxFClear; //extern ? D_8012DBB0; -//extern ? D_8012DBC0; +extern u32 D_8012DBC0; extern volatile u32 gIrqMgrResetStatus; extern u32 D_8012DBA0; extern u32 D_8012DBA4; @@ -1357,11 +1297,6 @@ extern f32 D_80136D44; //extern ? D_8013AC7C; //extern ? D_8013ACA0; //extern ? D_8013ACB8; -//extern ? D_8013AD40; -//extern ? D_8013AD50; -//extern ? D_8013AD54; -//extern ? D_8013AD60; -//extern ? D_8013AD70; //extern ? D_8013B830; //extern ? D_8013B844; //extern ? D_8013B858; @@ -2661,77 +2596,6 @@ extern char D_80141030[]; //extern ? D_8014575C; //extern ? D_80145780; //extern ? D_80145794; -extern char D_801457B0[]; -extern char D_801457F0[]; -extern char D_8014582C[]; -extern char D_80145860[]; -extern char D_80145894[]; -extern char D_8014589C[]; -extern char D_801458B0[]; -extern char D_801458CC[]; -extern char D_801458D0[]; -extern char D_801458D8[]; -extern char D_801458EC[]; -extern char D_80145914[]; -extern char D_80145918[]; -extern char D_80145920[]; -extern char D_80145934[]; -extern char D_80145944[]; -extern char D_80145948[]; -extern char D_80145950[]; -extern char D_80145964[]; -extern char D_8014598C[]; -extern char D_80145990[]; -extern char D_80145998[]; -extern char D_801459AC[]; -extern char D_801459CC[]; -extern char D_801459D0[]; -extern char D_801459D8[]; -extern char D_801459EC[]; -extern char D_80145A24[]; -extern char D_80145A28[]; -extern char D_80145A30[]; -extern char D_80145A44[]; -extern char D_80145A60[]; -extern char D_80145A64[]; -extern char D_80145A70[]; -extern char D_80145A80[]; -extern char D_80145A88[]; -extern char D_80145A9C[]; -extern char D_80145ABC[]; -extern char D_80145AC0[]; -extern char D_80145AC8[]; -extern char D_80145ADC[]; -extern char D_80145AEC[]; -//extern ? D_80145AF0; -//extern ? D_80145AF8; -//extern ? D_80145B0C; -//extern ? D_80145B1C; -//extern ? D_80145B20; -//extern ? D_80145B2C; -//extern ? D_80145B48; -//extern ? D_80145B50; -//extern ? D_80145B64; -//extern ? D_80145B80; -//extern ? D_80145B84; -//extern ? D_80145B8C; -//extern ? D_80145BA0; -//extern ? D_80145BB0; -//extern ? D_80145BB4; -//extern ? D_80145BC0; -//extern ? D_80145BD8; -//extern ? D_80145BE4; -//extern ? D_80145BF0; -//extern ? D_80145C10; -extern char D_80145C40[]; -extern char D_80145C58[]; -extern char D_80145C78[]; -extern char D_80145CA0[]; -extern char D_80145CA4[]; -extern char D_80145CB0[]; -extern char D_80145CD4[]; -extern char D_80145CF8[]; -extern char D_80145D18[]; //extern ? D_80145D40; //extern ? D_80145D54; //extern ? D_80145D60; @@ -3223,7 +3087,6 @@ extern char D_80146238[]; //extern ? D_8014AA38; //extern ? D_8014AA5C; //extern ? D_8014AA80; -//extern ? D_8014AAC0; //extern ? D_8014B210; //extern ? D_8014B280; //extern ? D_8014B2E0; @@ -3435,7 +3298,7 @@ extern char D_80146238[]; //extern ? D_80155500; //extern ? D_80155BF0; //extern ? D_80155C70; -//extern ? D_80155F50; +extern u8 D_80155F50[]; extern GlobalContext* D_80157DA0; //extern ? D_80157DA4; //extern ? D_80157DA8; @@ -3551,7 +3414,7 @@ extern GlobalContext* D_80157DA0; extern SaveContext gSaveContext; // 0x8015E660 extern u32 D_8015FA88; extern u32 D_8015FA8C; -extern GameInfo* gGameInfo; +extern GameInfo* gGameInfo; // 0x8015FA90 //extern ? D_8015FA98; //extern ? D_8015FA9B; //extern ? D_8015FC18; @@ -3589,7 +3452,6 @@ extern u8 D_8015FD70; //extern ? D_80160014; //extern ? D_80160018; //extern ? D_80160020; -//extern ? D_801600B0; //extern ? D_801600C0; extern u8 D_80161010; extern u8 D_801610D4; @@ -3630,7 +3492,7 @@ extern u8 D_801610DA; //extern ? D_80161360; //extern ? D_801613B0; //extern ? D_8016148C; -//extern ? D_80161490; +extern s32 D_80161490; //extern ? D_80161498; extern Color_RGBA8 D_801614B0; //extern ? D_801614B3; @@ -3651,13 +3513,12 @@ extern Color_RGBA8 D_801614B0; //extern ? D_801665E0; //extern ? D_801665F0; //extern ? D_80166648; -extern u8* gAppNmiBufferPtr; +extern PreNmiBuff* gAppNmiBufferPtr; //extern ? gSchedContext; //extern u8 gPadMgr[]; extern u8 D_80166B68; //extern ? D_80166D28; extern u32 gSegments[]; -extern u32 D_8016A4F0; //extern ? D_8016A500; //extern ? D_8016A504; //extern ? D_8016A508; @@ -3666,22 +3527,19 @@ extern u32 D_8016A4F0; //extern ? D_8016A514; //extern ? D_8016A518; //extern ? D_8016A51C; -//extern ? D_8016A520; -//extern ? D_8016A528; -//extern ? D_8016A530; -//extern ? D_8016A538; -//extern ? D_8016A540; -//extern ? D_8016A548; -//extern ? D_8016A550; -//extern ? D_8016A558; -//extern ? D_8016A55C; -//extern ? D_8016A560; -//extern ? D_8016A564; -//extern ? D_8016A568; -//extern ? D_8016A56C; +extern volatile OSTime D_8016A520; +extern volatile OSTime D_8016A528; +extern volatile OSTime D_8016A530; +extern volatile OSTime D_8016A538; +extern volatile OSTime D_8016A540; +extern volatile OSTime D_8016A548; +extern volatile OSTime D_8016A550; +extern volatile OSTime D_8016A558; +extern volatile OSTime D_8016A560; +extern volatile OSTime D_8016A568; //extern ? D_8016A570; //extern ? D_8016A574; -//extern ? D_8016A580; +extern volatile OSTime D_8016A580; //extern ? D_8016A588; //extern ? D_8016A590; //extern ? D_8016A594; @@ -3931,7 +3789,6 @@ extern u32 D_8016B5F5; //extern ? D_80174DBC; //extern ? D_80174DC0; //extern ? D_801755D0; -//extern ? D_80175600; extern u32 __osMalloc_FreeBlockTest_Enable; //extern ? D_80175640; //extern ? D_80175660; diff --git a/include/vt.h b/include/vt.h index c2d60246d4..46cbf05e73 100644 --- a/include/vt.h +++ b/include/vt.h @@ -21,11 +21,11 @@ #define VT_ESC "\x1b" #define VT_CSI "[" -#define VT_CUP(x, y) VT_ESC VT_CSI #y ";" #x "H" +#define VT_CUP(x, y) VT_ESC VT_CSI y ";" x "H" #define VT_ED(n) VT_ESC VT_CSI #n "J" #define VT_SGR(n) VT_ESC VT_CSI n "m" -//Add more macros if necessary +// Add more macros if necessary #define VT_COL(back, fore) VT_SGR(VT_COLOR(BACKGROUND, back) ";" VT_COLOR(FOREGROUND, fore)) #define VT_FGCOL(color) VT_SGR(VT_COLOR(FOREGROUND, color)) #define VT_BGCOL(color) VT_SGR(VT_COLOR(BACKGROUND, color)) diff --git a/include/z64.h b/include/z64.h index 46215b89ed..bb5569ffc6 100644 --- a/include/z64.h +++ b/include/z64.h @@ -11,6 +11,9 @@ #include #include #include +#include +#include +#include #include #include #include @@ -31,21 +34,22 @@ // Game Info aka. Static Context (dbg ram start: 80210A10) // Data normally accessed through REG macros (see regs.h) -typedef struct -{ - /* 0x00 */ char unk_00[0x14]; - /* 0x14 */ s16 data[0xAE0]; +typedef struct { + /* 0x00 */ s32 regPage; // 1 is first page + /* 0x04 */ s32 regGroup; // "register" group (R, RS, RO, RP etc.) + /* 0x08 */ s32 regCur; // selected register within page + /* 0x0C */ s32 dpadLast; + /* 0x10 */ s32 repeat; + /* 0x14 */ s16 data[REG_GROUPS * REG_PER_GROUP]; // 0xAE0 bytes } GameInfo; // size = 0x15D4 -typedef struct -{ +typedef struct { /* 0x00 */ u8 button_items[4]; /* 0x04 */ u8 c_button_slots[3]; /* 0x08 */ u16 equipment; } ItemEquips; // size = 0x0A -typedef struct -{ +typedef struct { /* 0x00 */ u32 chest; /* 0x04 */ u32 swch; /* 0x08 */ u32 clear; @@ -55,15 +59,13 @@ typedef struct /* 0x18 */ u32 rooms_2; } SaveSceneFlags; // size = 0x1C -typedef struct -{ +typedef struct { /* 0x00 */ s16 scene; /* 0x02 */ Vec3s pos; /* 0x08 */ s16 angle; } HorseData; // size = 0x0A -typedef struct -{ +typedef struct { /* 0x00 */ Vec3f pos; /* 0x0C */ s16 yaw; /* 0x0E */ s16 player_params; @@ -74,22 +76,19 @@ typedef struct /* 0x18 */ u32 temp_collect_flags; } RespawnData; // size = 0x1C -typedef enum -{ +typedef enum { /* 0x00 */ RESPAWN_MODE_DOWN, /* Normal Void Outs */ /* 0x01 */ RESPAWN_MODE_RETURN, /* Grotto Returnpoints */ /* 0x02 */ RESPAWN_MODE_TOP /* Farore's Wind */ } RespawnMode; -typedef enum -{ +typedef enum { /* 0x00 */ BTN_ENABLED, /* 0xFF */ BTN_DISABLED = 0xFF } ButtonStatus; // Save Context (dbg ram start: 8015E660) -typedef struct -{ +typedef struct { /* 0x0000 */ s32 entrance_index; /* 0x0004 */ s32 link_age; // 0: Adult; 1: Child /* 0x0008 */ s32 cutscene_index; @@ -129,8 +128,7 @@ typedef struct /* 0x00CF */ s8 defense_hearts; /* 0x00D0 */ s16 gs_tokens; /* 0x00D4 */ SaveSceneFlags scene_flags[124]; - struct - { + struct { /* 0x0E64 */ s32 pos_x; /* 0x0E68 */ s32 pos_y; /* 0x0E6C */ s32 pos_z; @@ -159,7 +157,9 @@ typedef struct /* 0x1360 */ s32 scene_setup_index; /* 0x1364 */ s32 respawn_flag; // "restart_flag" /* 0x1368 */ RespawnData respawn[3]; // "restart_data" - /* 0x13BC */ char unk_13BC[0x000B]; + /* 0x13BC */ char unk_13BC[0x0008]; + /* 0x13C4 */ s16 dogParams; + /* 0x13C6 */ char unk_13C6[0x0001]; /* 0x13C7 */ u8 unk_13C7; /* 0x13C8 */ u16 nayrus_love_timer; /* 0x13CA */ char unk_13CA[0x0002]; @@ -203,7 +203,7 @@ typedef struct /* 0x1418 */ u8 fade_duration; /* 0x1419 */ u8 unk_1419; // transition related /* 0x141A */ u16 environment_time; - /* 0x141C */ u8 unk_141C; + /* 0x141C */ u8 dogIsLost; /* 0x141D */ u8 transition_type; /* 0x141E */ char unk_141E[0x0002]; /* 0x1420 */ s16 world_map_area; @@ -211,8 +211,7 @@ typedef struct /* 0x1424 */ s16 health_accumulator; } SaveContext; // size = 0x1428 -typedef struct -{ +typedef struct { /* 0x00000 */ u16 headMagic; // 1234 /* 0x00008 */ Gfx polyOpaBuffer[0x17E0]; /* 0x0BF08 */ Gfx polyXluBuffer[0x800]; @@ -222,38 +221,66 @@ typedef struct /* 0x12408 */ u16 tailMagic; // 5678 } GfxPool; // size = 0x12410 -typedef struct -{ +typedef struct { /* 0x0000 */ u32 size; /* 0x0004 */ u8* bufp; /* 0x0008 */ u8* head; /* 0x000C */ u8* tail; } TwoHeadArena; // size = 0x10 -typedef struct -{ +typedef struct { /* 0x0000 */ u32 size; /* 0x0004 */ Gfx* bufp; /* 0x0008 */ Gfx* p; /* 0x000C */ Gfx* d; } TwoHeadGfxArena; // size = 0x10 -typedef struct -{ - /* 0x0000 */ char unk_00[0x01B4]; +typedef struct OSScTask { + /* 0x00 */ struct OSScTask* next; + /* 0x04 */ u32 state; + /* 0x08 */ u32 flags; + /* 0x0C */ void* framebuffer; + /* 0x10 */ OSTask list; + /* 0x50 */ OSMesgQueue* msgQ; + /* 0x54 */ OSMesg msg; +} OSScTask; + +typedef struct GraphicsContext { + /* 0x0000 */ Gfx* polyOpaBuffer; + /* 0x0004 */ Gfx* polyXluBuffer; + /* 0x0008 */ char unk_008[0x08]; + /* 0x0010 */ Gfx* overlayBuffer; + /* 0x0014 */ u32 unk_014; + /* 0x0018 */ char unk_018[0x20]; + /* 0x0038 */ OSMesg msgBuff[0x08]; + /* 0x0058 */ OSMesgQueue* schedMsgQ; + /* 0x005C */ OSMesgQueue queue; + /* 0x0074 */ char unk_074[0x04]; + /* 0x0078 */ OSScTask task; // size of OSScTask might be wrong + /* 0x00D0 */ char unk_0D0[0xE0]; + /* 0x01B0 */ Gfx* workBuffer; /* 0x01B4 */ TwoHeadGfxArena work; - /* 0x01C4 */ char unk_1C4[0x00E4]; + /* 0x01C4 */ char unk_01C4[0xC0]; + /* 0x0284 */ OSViMode* viMode; + /* 0x0288 */ char unk_0288[0x20]; /* 0x02A8 */ TwoHeadGfxArena overlay; /* 0x02B8 */ TwoHeadGfxArena polyOpa; /* 0x02C8 */ TwoHeadGfxArena polyXlu; -} GraphicsContext; + /* 0x02D8 */ u32 gfxPoolIdx; + /* 0x02DC */ u16* curFrameBuffer; + /* 0x02E0 */ char unk_2E0[0x04]; + /* 0x02E4 */ u32 viFeatures; + /* 0x02E8 */ s32 fbIdx; + /* 0x02EC */ void (*callback)(struct GraphicsContext*, u32); + /* 0x02F0 */ u32 callbackParam; + /* 0x02F4 */ f32 xScale; + /* 0x02F8 */ f32 yScale; + /* 0x02FC */ char unk_2FC[0x04]; +} GraphicsContext; // size = 0x300 -typedef struct -{ - /* 0x00 */ union - { - struct - { +typedef struct { + /* 0x00 */ union { + struct { u16 a : 1; u16 b : 1; u16 z : 1; @@ -276,8 +303,7 @@ typedef struct /* 0x03 */ s8 y; } RawInput; // size = 0x4 -typedef struct -{ +typedef struct { /* 0x00 */ RawInput raw; /* 0x04 */ u16 status; /* 0x06 */ RawInput rawPrev; @@ -292,22 +318,59 @@ typedef struct /* 0x16 */ char unk_16[0x02]; } Input; // size = 0x18 -typedef struct -{ - /* 0x0000 */ char unk_00[0x28]; +typedef struct { + /* 0x0000 */ s16 unk_0; + /* 0x0002 */ s16 unk_2; + /* 0x0004 */ u16 unk_4; + /* 0x0004 */ u16 unk_6; + /* 0x0008 */ s16 unk_8; + /* 0x000A */ s16 unk_A; + /* 0x000C */ u16 unk_C; + /* 0x000E */ u16 unk_E; +} UnkViewStruct; // size = 0x10, probably a viewport in disguise + +typedef struct { + /* 0x0000 */ s32 topY; // uly (upper left y) + /* 0x0004 */ s32 bottomY; // lry (lower right y) + /* 0x0008 */ s32 leftX; // ulx (upper left x) + /* 0x000C */ s32 rightX; // lrx (lower right x) +} Viewport; // size = 0x10 + +typedef struct { + /* 0x0000 */ s32 magic; // string literal "VIEW" / 0x56494557 + /* 0x0004 */ GraphicsContext* gfxCtx; + /* 0x0008 */ Viewport viewport; + /* 0x0018 */ f32 fieldOfView; // fovy + /* 0x001C */ f32 fogDistance; // near + /* 0x0020 */ f32 zDepth; // far + /* 0x0024 */ f32 unk_24; // scale /* 0x0028 */ Vec3f eye; - /* 0x0034 */ char unk_34[0xF4]; + /* 0x0034 */ Vec3f unk_34; + /* 0x0040 */ Vec3f unk_40; + /* 0x004C */ char unk_4C[0x04]; + /* 0x0050 */ Viewport unk_50; + /* 0x0060 */ Mtx unk_60; + /* 0x00A0 */ MtxF unk_A0; + /* 0x00E0 */ Mtx* unk_E0; + /* 0x00E4 */ MtxF* unk_E4; + /* 0x00E8 */ Vec3f unk_E8; + /* 0x00F4 */ Vec3f unk_F4; + /* 0x0100 */ f32 unk_100; + /* 0x0104 */ Vec3f unk_104; + /* 0x0110 */ Vec3f unk_110; + /* 0x011C */ u16 unk_11C; // normal + /* 0x011E */ u16 unk_11E; + /* 0x0120 */ s32 unk_120; + /* 0x0124 */ s32 unk_124; } View; // size = 0x128 -typedef struct -{ +typedef struct { f32 unk_00; s16 unk_04; s16 unk_06; } struct_80045714; // used in z_camera.c and code_8007BF90 -typedef struct -{ +typedef struct { /* 0x0000 */ s32 unk_00; /* 0x0004 */ s16 unk_04; /* 0x0006 */ s16 unk_06; @@ -364,49 +427,42 @@ typedef struct /* 0x016A */ s16 unk_16A; // unknown if used } Camera; // size = 0x16C -typedef struct -{ +typedef struct { /* 0x0000 */ Camera activeCameras[4]; /* 0x05B0 */ Camera* activeCameraPtrs[4]; /* 0x05C0 */ s16 unk_5C0; /* 0x05C2 */ s16 unk_5C2; } CameraContext; // size = 0x5C4 -typedef struct -{ +typedef struct { /* 0x00 */ u8 musicSeq; /* 0x01 */ u8 nighttimeSFX; /* 0x02 */ char unk_02[0x2]; } SoundContext; // size = 0x4 -typedef struct -{ +typedef struct { /* 0x00 */ char unk_00[0x50]; } StaticCollisionContext; // size = 0x50 -typedef struct -{ +typedef struct { /* 0x0000 */ char unk_00[0x04]; /* 0x0004 */ ActorMesh actorMeshArr[50]; /* 0x138C */ u16 flags[50]; /* 0x13F0 */ char unk_13F0[0x24]; } DynaCollisionContext; // size = 0x1414 -typedef struct -{ +typedef struct { /* 0x0000 */ StaticCollisionContext stat; /* 0x0050 */ DynaCollisionContext dyna; } CollisionContext; // size = 0x1464 -typedef struct -{ +typedef struct { /* 0x00 */ Vec3f pos; /* 0x0C */ f32 unk_0C; // radius? /* 0x10 */ Color_RGB8 color; } TargetContextEntry; // size = 0x14 -typedef struct -{ +typedef struct { /* 0x00 */ Vec3f naviRefPos; // possibly wrong /* 0x0C */ Vec3f targetCenterPos; /* 0x18 */ Color_RGBAf naviInner; @@ -426,8 +482,7 @@ typedef struct /* 0x94 */ Actor* unk_94; } TargetContext; // size = 0x98 -typedef struct -{ +typedef struct { /* 0x00 */ u32 texture; /* 0x04 */ s16 unk_4; /* 0x06 */ s16 unk_6; @@ -439,14 +494,12 @@ typedef struct /* 0x0E */ s16 unk_E; } TitleCardContext; // size = 0x10 -typedef struct -{ +typedef struct { /* 0x00 */ u32 length; // number of actors loaded of this type /* 0x04 */ Actor* first; // pointer to first actor of this type } ActorListEntry; // size = 0x08 -typedef struct -{ +typedef struct { /* 0x0000 */ u8 unk_00; /* 0x0001 */ char unk_01[0x01]; /* 0x0002 */ u8 unk_02; @@ -456,8 +509,7 @@ typedef struct /* 0x0009 */ char unk_09[0x03]; /* 0x000C */ ActorListEntry actorList[12]; /* 0x006C */ TargetContext targetCtx; - struct - { + struct { /* 0x0104 */ u32 swch; /* 0x0108 */ u32 tempSwch; /* 0x010C */ u32 unk0; @@ -473,19 +525,16 @@ typedef struct /* 0x013C */ void* absoluteSpace; // Space used to allocate actor overlays of alloc type 1 } ActorContext; // size = 0x140 -typedef struct -{ +typedef struct { /* 0x00 */ char unk_00[0x4]; /* 0x04 */ void* segment; /* 0x08 */ u8 state; /* 0x0C */ f32 unk_0C; /* 0x10 */ u16 frames; /* 0x12 */ u16 unk_12; - union - { + union { /* 0x14 */ s32 unk_14_all; - struct - { + struct { s16 unk_14; s16 unk_16; }; @@ -499,8 +548,7 @@ typedef struct /* 0x28 */ CsCmdActorAction* actorActions[10]; } CutsceneContext; // size = 0x50 -typedef struct -{ +typedef struct { /* 0x0000 */ View view; /* 0x0128 */ char unk_128[0xE188]; /* 0xE2B0 */ void* textboxSegment; // "fukidashiSegment" @@ -526,20 +574,7 @@ typedef struct /* 0xE40E */ char unk_E40E[0x0A]; } MessageContext; // size = 0xE418 -typedef struct -{ - /* 0x00 */ u32 vromAddr; // VROM address (source) - /* 0x04 */ void* dramAddr; // DRAM address (destination) - /* 0x08 */ u32 size; // File Transfer size - /* 0x0C */ char* filename; // Filename for debugging - /* 0x10 */ s32 line; // Line for debugging - /* 0x14 */ s32 unk_14; - /* 0x18 */ OSMesgQueue* notifyQueue; // Message queue for the notification message - /* 0x1C */ OSMesg notifyMsg; // Completion notification message -} DmaRequest; // size = 0x20 - -typedef struct -{ +typedef struct { /* 0x0000 */ View view; /* 0x0128 */ Vtx* vtx_128; /* 0x012C */ Vtx* vtx_12C; @@ -594,8 +629,7 @@ typedef struct /* 0x025E */ char unk_25E[0x002]; /* 0x0260 */ u8 unk_260; /* 0x0261 */ u8 unk_261; - struct - { + struct { /* 0x0262 */ u8 hGauge; // "h_gage"; unknown? /* 0x0263 */ u8 bButton; // "b_button" /* 0x0264 */ u8 aButton; // "a_button" @@ -611,8 +645,7 @@ typedef struct } restrictions; } InterfaceContext; // size = 0x270 -typedef struct -{ +typedef struct { /* 0x0000 */ View view; /* 0x0128 */ void* unk_128; /* 0x012C */ char unk_12C[0x03C]; @@ -637,8 +670,7 @@ typedef struct /* 0x025A */ char unk_25A[0x066]; } PauseContext; // size = 0x2C0 -typedef struct -{ +typedef struct { /* 0x00 */ s16 id; /* 0x04 */ void* segment; /* 0x08 */ DmaRequest dmaRequest; @@ -646,8 +678,7 @@ typedef struct /* 0x40 */ OSMesg loadMsg; } ObjectStatus; // size = 0x44 -typedef struct -{ +typedef struct { /* 0x0000 */ void* spaceStart; /* 0x0004 */ void* spaceEnd; // original name: "endSegment" /* 0x0008 */ u8 num; // number of objects in bank @@ -657,30 +688,26 @@ typedef struct /* 0x000C */ ObjectStatus status[OBJECT_EXCHANGE_BANK_MAX]; } ObjectContext; // size = 0x514 -typedef struct -{ +typedef struct { /* 0x00 */ Gfx* opa; /* 0x04 */ Gfx* xlu; } PolygonDlist; // size = 0x8 -typedef struct -{ +typedef struct { /* 0x00 */ u8 type; /* 0x01 */ u8 num; // number of dlist entries /* 0x04 */ void* start; /* 0x08 */ void* end; } Polygon; // size = 0xC -typedef struct -{ +typedef struct { /* 0x00 */ u8 type; /* 0x01 */ u8 num; // number of dlist entries /* 0x04 */ void* start; /* 0x08 */ void* end; } PolygonType0; // size = 0xC -typedef struct -{ +typedef struct { /* 0x00 */ u16 unk_00; /* 0x02 */ u8 id; /* 0x04 */ u32 source; @@ -694,15 +721,12 @@ typedef struct /* 0x18 */ u16 tlutCount; } BgImage; // size = 0x1C -typedef struct -{ +typedef struct { /* 0x00 */ u8 type; /* 0x01 */ u8 format; // 1 = single, 2 = multi /* 0x04 */ void* dlist; - union - { - struct - { + union { + struct { /* 0x08 */ u32 source; /* 0x0C */ u32 unk_0C; /* 0x10 */ u32 tlut; @@ -713,40 +737,35 @@ typedef struct /* 0x1A */ u16 mode0; /* 0x1C */ u16 tlutCount; } single; - struct - { + struct { /* 0x08 */ u8 count; /* 0x0C */ BgImage* list; } multi; }; } PolygonType1; -typedef struct -{ +typedef struct { /* 0x00 */ Vec3s pos; /* 0x06 */ s16 unk_06; /* 0x08 */ Gfx* opa; /* 0x0C */ Gfx* xlu; } PolygonDlist2; // size = 0x8 -typedef struct -{ +typedef struct { /* 0x00 */ u8 type; /* 0x01 */ u8 num; // number of dlist entries /* 0x04 */ void* start; /* 0x08 */ void* end; } PolygonType2; // size = 0xC -typedef union -{ +typedef union { Polygon polygon; PolygonType0 polygon0; PolygonType1 polygon1; PolygonType2 polygon2; } Mesh; // "Ground Shape" -typedef struct -{ +typedef struct { /* 0x00 */ s8 num; /* 0x01 */ u8 unk_01; /* 0x02 */ u8 unk_02; @@ -758,8 +777,7 @@ typedef struct /* 0x10 */ char unk_10[0x4]; } Room; // size = 0x14 -typedef struct -{ +typedef struct { /* 0x00 */ Room curRoom; /* 0x14 */ Room prevRoom; /* 0x28 */ void* bufPtrs[2]; @@ -771,21 +789,18 @@ typedef struct /* 0x70 */ OSMesg loadMsg; } RoomContext; // size = 0x74 -typedef struct -{ +typedef struct { /* 0x00 */ char unk_00[0x028C]; } SubGlobalContext11E60; // size = 0x28C -typedef struct -{ +typedef struct { /* 0x00 */ s16 id; /* 0x02 */ Vec3s pos; /* 0x08 */ Vec3s rot; /* 0x0E */ s16 params; } ActorEntry; // size = 0x10 -typedef struct -{ +typedef struct { /* 0x00 */ s8 frontRoom; // Room to switch to when triggered from the front of the object /* 0x01 */ s8 frontEffects; // How the camera reacts during the front transition /* 0x02 */ s8 backRoom; // Room to switch to when triggered from the back of the object @@ -796,34 +811,33 @@ typedef struct /* 0x0E */ s16 params; } TransitionActorEntry; // size = 0x10 -typedef struct -{ +typedef struct { /* 0x00 */ u8 spawn; /* 0x01 */ u8 room; } EntranceEntry; -typedef struct -{ +typedef struct { /* 0x00 */ u32 vromStart; /* 0x04 */ u32 vromEnd; } RomFile; // size = 0x8 -typedef struct GameAllocEntry -{ +typedef struct { + /* 0x00 */ void* read_buff; +} Sram; // size = 0x4 + +typedef struct GameAllocEntry { /* 0x00 */ struct GameAllocEntry* next; /* 0x04 */ struct GameAllocEntry* prev; /* 0x08 */ u32 size; /* 0x0C */ u32 unk_0C; -} GameAllocEntry; //size = 0x10 +} GameAllocEntry; // size = 0x10 -typedef struct -{ +typedef struct { /* 0x00 */ GameAllocEntry base; /* 0x10 */ GameAllocEntry* head; } GameAlloc; // size = 0x14 -typedef struct GameState -{ +typedef struct GameState { /* 0x00 */ GraphicsContext* gfxCtx; /* 0x04 */ void (*main)(struct GameState*); /* 0x08 */ void (*destroy)(struct GameState*); // "cleanup" @@ -837,19 +851,38 @@ typedef struct GameState /* 0xA0 */ u32 unk_A0; } GameState; // size = 0xA4 -typedef struct -{ +typedef struct { /* 0x0000 */ GameState state; - /* 0x00A4 */ char unk_A4[0x12C]; - /* 0x01D0 */ UNK_TYPE unk_1D0; - /* 0x01D4 */ char unk_1D4[0xD]; - /* 0x01E1 */ u8 unk_1E1; + /* 0x00A4 */ void* staticSegment; + /* 0x00A8 */ View view; + /* 0x01D0 */ Sram sram; + /* 0x01D4 */ u16 unk_1D4; // not used in mq dbg (some sort of timer that doesn't seem to affect anything) + /* 0x01D6 */ s16 coverAlpha; + /* 0x01D8 */ s16 addAlpha; // not used in mq dbg + /* 0x01DA */ u16 visibleDuration; // not used in mq dbg + /* 0x01DC */ s16 ult; + /* 0x01DE */ s16 uls; + /* 0x01E0 */ char unk_1E0; + /* 0x01E1 */ u8 exit; /* 0x01E2 */ char unk_1E2[6]; } TitleContext; // size = 0x1E8 -// Global Context (dbg ram start: 80212020) -typedef struct GlobalContext +typedef struct { + /* 0x0000 */ GameState state; + /* 0x00A4 */ void* staticSegment; + /* 0x00A8 */ View view; +} SampleContext; + +typedef struct { + /* 0x00 */ u8 byte0; + /* 0x01 */ u8 byte1; + /* 0x02 */ u8 byte2; + /* 0x03 */ u8 byte3; +} ElfMessage; // size = 0x4 + +// Global Context (dbg ram start: 80212020) +typedef struct GlobalContext { /* 0x00000 */ GameState state; /* 0x000A4 */ s16 sceneNum; /* 0x000A6 */ u8 sceneConfig; @@ -923,7 +956,8 @@ typedef struct GlobalContext /* 0x10B0B */ char unk_10B0B[0x7]; /* 0x10B12 */ u8 unk_10B12[4]; /* 0x10B16 */ u8 unk_10B16[4]; - /* 0x10B1A */ char unk_10B1A[0xC8A]; + /* 0x10B1A */ char unk_10B1A[0x6]; + /* 0x10B20 */ AnimationContext animationCtx; /* 0x117A4 */ ObjectContext objectCtx; /* 0x11CBC */ RoomContext roomCtx; /* 0x11D30 */ s16 unk_11D30[2]; @@ -947,8 +981,8 @@ typedef struct GlobalContext /* 0x11DFC */ UNK_PTR unk_11DFC; /* 0x11E00 */ EntranceEntry* setupEntranceList; /* 0x11E04 */ UNK_PTR setupExitList; - /* 0x11E08 */ UNK_PTR setupPathList; - /* 0x11E0C */ UNK_PTR naviMsgSegment; + /* 0x11E08 */ Path* setupPathList; + /* 0x11E0C */ ElfMessage* cUpElfMsgs; /* 0x11E10 */ char unk_11E10[0x4]; /* 0x11E14 */ u8 skyboxId; /* 0x11E15 */ s8 sceneLoadFlag; // "fade_direction" @@ -970,22 +1004,19 @@ typedef struct GlobalContext /* 0x12430 */ char unk_12430[0xE8]; } GlobalContext; // size = 0x12518 -typedef struct -{ +typedef struct { /* 0x0000 */ GameState state; /* 0x00A4 */ char unk_A4[4]; /* 0x00A8 */ View view; } OpeningContext; // size = 0x1D0 -typedef enum -{ +typedef enum { DPM_UNK = 0, DPM_PLAYER = 1, DPM_ENEMY = 2 } DynaPolyMoveFlag; -typedef struct LoadedParticleEntry -{ +typedef struct LoadedParticleEntry { /* 0x0000 */ Vec3f position; /* 0x000C */ Vec3f velocity; /* 0x0018 */ Vec3f acceleration; @@ -1003,38 +1034,22 @@ typedef struct LoadedParticleEntry /* 0x005F */ u8 type; } LoadedParticleEntry; // size = 0x60 -typedef struct -{ - /* 0x00 */ u8 limbCount; - /* 0x01 */ char unk_01[0x01]; - /* 0x02 */ u8 dListCount; - /* 0x03 */ char unk_03[0x01]; /* Probably Padding */ - /* 0x04 */ u32 limbIndex; - /* 0x08 */ u32 animCurrent; - /* 0x0C */ char unk_0C[0x04]; - /* 0x10 */ f32 animFrameCount; - /* 0x14 */ f32 unk_14; - /* 0x18 */ f32 animCurrentFrame; - /* 0x1C */ f32 animPlaybackSpeed; - /* 0x20 */ u32 actorDrawTbl; - /* 0x24 */ u32 unk_24; - /* 0x28 */ u32 unk_28; - /* 0x2C */ u32 unk_2C; - /* 0x30 */ void* funcUnk30; /* Some function pointer */ - /* 0x34 */ s32 unk_34; - /* 0x38 */ s32 unk_38; - /* 0x3C */ u16 unk_3C; - /* 0x3E */ u16 unk_3E; /* Probably Padding */ -} SkelAnime; // size = 0x40 +// Some animation related structure +typedef struct { + /* 0x00 */ AnimationHeader* animation; + /* 0x04 */ f32 playbackSpeed; + /* 0x08 */ f32 unk_08; + /* 0x0C */ f32 frameCount; + /* 0x10 */ u8 unk_10; + /* 0x14 */ f32 transitionRate; +} struct_80034EC0_Entry; // size = 0x18 -typedef struct -{ +typedef struct { /* 0x00 */ u32 unk_00; /* 0x04 */ u32(*init)(GlobalContext*, u32, LoadedParticleEntry*, void*); } ParticleOverlayInfo; -typedef struct -{ +typedef struct { /* 0x00 */ u32 vromStart; /* 0x04 */ u32 vromEnd; /* 0x0C */ void* vramStart; @@ -1044,15 +1059,13 @@ typedef struct /* 0x18 */ u32 unk_18; // Always 0x01000000? } ParticleOverlay; -typedef struct -{ +typedef struct { /* 0x00 */ LoadedParticleEntry* data_table; // Name from debug assert /* 0x04 */ s32 searchIndex; /* 0x08 */ s32 size; } EffectTableInfo; -typedef struct -{ +typedef struct { /* 0x00 */ s8 scene; /* 0x01 */ s8 spawn; /* 0x02 */ u16 continueBgm : 1; @@ -1061,8 +1074,7 @@ typedef struct /* 0x02 */ u16 fadeOutTransition : 7; } EntranceInfo; // size = 0x4 -typedef struct -{ +typedef struct { /* 0x00 */ void* loadedRamAddr; /* 0x04 */ u32 vromStart; // if applicable /* 0x08 */ u32 vromEnd; // if applicable @@ -1077,21 +1089,18 @@ typedef struct /* 0x2C */ u32 instanceSize; } GameStateOverlay; // size = 0x30 -typedef struct PreNMIContext -{ +typedef struct PreNMIContext { /* 0x00 */ GameState state; /* 0xA4 */ u32 timer; /* 0xA8 */ UNK_TYPE unk_A8; } PreNMIContext; // size = 0xAC -typedef struct -{ +typedef struct { /* 0x00 */ s8 chestFlag; // chest icon is only displayed if this flag is not set for the current room /* 0x01 */ u8 x, y; // coordinates to place the icon (top-left corner), relative to the minimap texture } MapMarkPoint; // size = 0x3 -typedef struct -{ +typedef struct { /* 0x00 */ s8 markType; // 0 for the chest icon, 1 for the boss skull icon, -1 for none /* 0x01 */ u8 count; // number of icons to display /* 0x02 */ MapMarkPoint points[12]; @@ -1099,8 +1108,7 @@ typedef struct typedef MapMarkData MapMarksData[3]; // size = 0x72 -typedef struct DebugDispObject -{ +typedef struct DebugDispObject { /* 0x00 */ Vec3f pos; /* 0x0C */ Vec3s rot; /* 0x14 */ Vec3f scale; @@ -1109,8 +1117,7 @@ typedef struct DebugDispObject /* 0x28 */ struct DebugDispObject* next; } DebugDispObject; // size = 0x2C -typedef struct -{ +typedef struct { /* 0x00 */ Vec3s colAbsMin; /* 0x06 */ Vec3s colAbsMax; /* 0x0C */ s16 nbVertices; @@ -1123,30 +1130,26 @@ typedef struct /* 0x28 */ void* waterBoxes; } CollisionHeader; -typedef enum -{ +typedef enum { MTXMODE_NEW, // generates a new matrix MTXMODE_APPLY // applies transformation to the current matrix } MatrixMode; -typedef struct FaultClient -{ +typedef struct FaultClient { struct FaultClient* next; u32 callback; u32 param1; u32 param2; } FaultClient; -typedef struct FaultAddrConvClient -{ +typedef struct FaultAddrConvClient { struct FaultAddrConvClient* next; u32 callback; u32 param; } FaultAddrConvClient; -typedef struct -{ +typedef struct { u32 (*callback)(u32, u32); u32 param0; u32 param1; @@ -1155,8 +1158,7 @@ typedef struct OSMesg msg; } FaultClientContext; -typedef struct FaultThreadStruct -{ +typedef struct FaultThreadStruct { OSThread thread; u8 unk_1B0[0x600]; OSMesgQueue queue; @@ -1177,8 +1179,7 @@ typedef struct FaultThreadStruct u8 unk_84C[4]; } FaultThreadStruct; -typedef struct -{ +typedef struct { u16* fb; u16 w; u16 h; @@ -1196,13 +1197,12 @@ typedef struct s8 charWPad; s8 charHPad; u16 printColors[10]; - u8 escCode; //bool + u8 escCode; // bool u8 osSyncPrintfEnabled; void(*inputCallback)(); } FaultDrawer; -typedef struct GfxPrint -{ +typedef struct GfxPrint { /* 0x00 */ struct GfxPrint*(*callback)(struct GfxPrint*, const char*, size_t); /* 0x04 */ Gfx* dlist; /* 0x08 */ u16 posX; @@ -1213,8 +1213,7 @@ typedef struct GfxPrint /* 0x10 */ Color_RGBA8 color; } GfxPrint; -typedef enum -{ +typedef enum { GFXPRINT_FLAG1 = 1, GFXPRINT_USE_RGBA16 = 2, GFXPRINT_FLAG4 = 4, @@ -1223,8 +1222,7 @@ typedef enum GFXPRINT_OPEN = 0x80 } GfxPrintFlag; -typedef struct StackEntry -{ +typedef struct StackEntry { /* 0x00 */ struct StackEntry* next; /* 0x04 */ struct StackEntry* prev; /* 0x08 */ u32 head; @@ -1234,16 +1232,14 @@ typedef struct StackEntry /* 0x18 */ const char* name; } StackEntry; -typedef enum -{ +typedef enum { STACK_STATUS_OK = 0, STACK_STATUS_WARNING = 1, STACK_STATUS_OVERFLOW = 2 } StackStatus; -typedef struct -{ - /* 0x00 */ u32 magic; //IS64 +typedef struct { + /* 0x00 */ u32 magic; // IS64 /* 0x04 */ u32 get; /* 0x08 */ u8 unk_08[0x14-0x08]; /* 0x14 */ u32 put; @@ -1251,22 +1247,11 @@ typedef struct /* 0x20 */ u8 data[0x10000-0x20]; } ISVDbg; -typedef struct -{ - /* 0x00 */ u32 vromStart; - /* 0x04 */ u32 vromEnd; - /* 0x08 */ u32 romStart; - /* 0x0C */ u32 romEnd; -} DmaEntry; - -typedef struct -{ +typedef struct { char name[0x18]; u32 mediaFormat; - union - { - struct - { + union { + struct { u16 cartId; u8 countryCode; u8 version; @@ -1275,18 +1260,17 @@ typedef struct }; } LocaleCartInfo; -typedef struct -{ - char magic[4]; //Yaz0 +typedef struct { + char magic[4]; // Yaz0 u32 decSize; - u32 compInfoOffset; //only used in yaz0_old.c - u32 uncompDataOffset; //only used in yaz0_old.c + u32 compInfoOffset; // only used in yaz0_old.c + u32 uncompDataOffset; // only used in yaz0_old.c u32 data[1]; } Yaz0Header; #define OS_SC_RETRACE_MSG 1 #define OS_SC_DONE_MSG 2 -#define OS_SC_NMI_MSG 3 //name is made up, 3 is OS_SC_RDP_DONE_MSG in the original sched.c +#define OS_SC_NMI_MSG 3 // name is made up, 3 is OS_SC_RDP_DONE_MSG in the original sched.c #define OS_SC_PRE_NMI_MSG 4 typedef struct { @@ -1294,16 +1278,14 @@ typedef struct { char misc[30]; } OSScMsg; -typedef struct IrqMgrClient -{ +typedef struct IrqMgrClient { struct IrqMgrClient* prev; OSMesgQueue* queue; } IrqMgrClient; -typedef struct -{ - /* 0x000 */ OSScMsg retraceMsg; //this apparently got moved from OSSched - /* 0x020 */ OSScMsg prenmiMsg; //this apparently got moved from OSSched +typedef struct { + /* 0x000 */ OSScMsg retraceMsg; // this apparently got moved from OSSched + /* 0x020 */ OSScMsg prenmiMsg; // this apparently got moved from OSSched /* 0x040 */ OSScMsg nmiMsg; /* 0x060 */ OSMesgQueue queue; /* 0x078 */ OSMesg msgBuf[8]; @@ -1313,22 +1295,20 @@ typedef struct /* 0x250 */ OSTime resetTime; /* 0x258 */ OSTimer timer; /* 0x278 */ OSTime retraceTime; -} IrqMgr; //size = 0x280 +} IrqMgr; // size = 0x280 struct ArenaNode; -typedef struct Arena -{ +typedef struct Arena { /* 0x00 */ struct ArenaNode* head; /* 0x04 */ void* start; /* 0x08 */ OSMesgQueue lock; /* 0x20 */ u8 unk_20; /* 0x21 */ u8 isInit; /* 0x22 */ u8 flag; -} Arena; //size = 0x24 +} Arena; // size = 0x24 -typedef struct ArenaNode -{ +typedef struct ArenaNode { /* 0x00 */ s16 magic; /* 0x02 */ s16 isFree; /* 0x04 */ u32 size; @@ -1339,8 +1319,8 @@ typedef struct ArenaNode /* 0x18 */ OSId threadId; /* 0x1C */ Arena* arena; /* 0x20 */ OSTime time; - /* 0x28 */ u8 unk_28[0x30-0x28]; //probably padding -} ArenaNode; //size = 0x30 + /* 0x28 */ u8 unk_28[0x30-0x28]; // probably padding +} ArenaNode; // size = 0x30 typedef struct OverlayRelocationSection { /* 0x00 */ u32 textSize; @@ -1349,41 +1329,114 @@ typedef struct OverlayRelocationSection { /* 0x0C */ u32 bssSize; /* 0x10 */ u32 nRelocations; /* 0x14 */ u32 relocations[1]; -} OverlayRelocationSection; /* size >= 0x18 */ +} OverlayRelocationSection; // size >= 0x18 -#define VEC3_ADD( V3A0, V3A1 ) \ -{ \ - V3A0.x += V3A1.x; \ - V3A0.y += V3A1.y; \ - V3A0.z += V3A1.z; \ -} - -#define VEC3_SUB( V3DST, V3A0, V3A1 ) \ -{ \ - V3DST.x = V3A0.x - V3A1.x; \ - V3DST.y = V3A0.y - V3A1.y; \ - V3DST.z = V3A0.z - V3A1.z; \ -} - -typedef struct -{ +typedef struct { /* 0x00 */ void* loadedRamAddr; /* 0x04 */ u32 vromStart; /* 0x08 */ u32 vromEnd; /* 0x0C */ u8* vramStart; /* 0x10 */ u8* vramEnd; - /* 0x14 */ u32 off; //loadedRamAddr - vram + /* 0x14 */ u32 off; // loadedRamAddr - vram /* 0x18 */ const char* name; -} KaleidoManagerOvl; //size = 0x1C +} KaleidoManagerOvl; // size = 0x1C #define KALEIDO_OVL_KALEIDO_SCOPE 0 #define KALEIDO_OVL_PLAYER_ACTOR 1 #define KALEIDO_OVL_COUNT 2 -typedef struct ListAlloc -{ +typedef struct ListAlloc { /* 0x00 */ struct ListAlloc* prev; /* 0x04 */ struct ListAlloc* next; -} ListAlloc; //size = 0x8 +} ListAlloc; // size = 0x8 + +typedef struct { + /* 0x00 */ u32 resetting; + /* 0x04 */ u32 resetCount; + /* 0x08 */ OSTime duration; + /* 0x10 */ OSTime resetTime; +} PreNmiBuff; // size = 0x18 (actually osAppNmiBuffer is 0x40 bytes large but the rest is unused) + +typedef struct { + /* 0x00 */ s16 unk_00; + /* 0x02 */ s16 unk_02; + /* 0x04 */ s16 unk_04; +} SubQuakeRequest14; + +typedef struct { + /* 0x00 */ s16 randIdx; + /* 0x02 */ s16 countdownMax; + /* 0x04 */ Camera* cam; + /* 0x08 */ u32 callbackIdx; + /* 0x0C */ s16 y; + /* 0x0E */ s16 x; + /* 0x10 */ s16 zoom; + /* 0x12 */ s16 rotZ; + /* 0x14 */ SubQuakeRequest14 unk_14; + /* 0x1A */ s16 speed; + /* 0x1C */ s16 unk_1C; + /* 0x1E */ s16 countdown; + /* 0x20 */ s16 camPtrIdx; +} QuakeRequest; // size = 0x24 + +typedef struct { + /* 0x00 */ Vec3f vec1; + /* 0x0C */ Vec3f vec2; + /* 0x18 */ s16 rotZ; + /* 0x1A */ s16 unk_1A; + /* 0x1C */ s16 zoom; +} ShakeInfo; // size = 0x1E + +typedef struct { + /* 0x00 */ Vec3f vec1; + /* 0x0C */ Vec3f vec2; + /* 0x18 */ s16 rotZ; + /* 0x1A */ s16 unk_1A; + /* 0x1C */ s16 zoom; + /* 0x20 */ f32 unk_20; +} UnkQuakeCalcStruct; // size = 0x24 + +typedef struct { + /* 0x00 */ u32 idx; + /* 0x04 */ void* ptr; +} UCodeInfo; // size = 0x8 + +typedef struct { + /* 0x00 */ u32 segments[NUM_SEGMENTS]; + /* 0x40 */ u32 dlStack[18]; + /* 0x88 */ u32 dlDepth; + /* 0x8C */ u32 dlCnt; + /* 0x90 */ u32 vtxCnt; + /* 0x94 */ u32 spvtxCnt; + /* 0x98 */ u32 tri1Cnt; + /* 0x9C */ u32 tri2Cnt; + /* 0xA0 */ u32 quadCnt; + /* 0xA4 */ u32 lineCnt; + /* 0xA8 */ u32 loaducodeCnt; + /* 0xAC */ u32 pipeSyncRequired; + /* 0xB0 */ u32 tileSyncRequired; + /* 0xB4 */ u32 loadSyncRequired; + /* 0xB8 */ u32 syncErr; + /* 0xBC */ u32 enableLog; + /* 0xC0 */ u32 ucodeInfoIdx; + /* 0xC4 */ u32 ucodeInfoCount; + /* 0xC8 */ UCodeInfo* ucodeInfo; + /* 0xCC */ u32 modeH; + /* 0xD0 */ u32 modeL; + /* 0xD4 */ u32 geometryMode; +} UCodeDisas; // size = 0xD8 + +typedef struct { + /* 0x00 */ u16* fb1; + /* 0x04 */ u16* swapbuffer; + /* 0x08 */ OSViMode* viMode; + /* 0x0C */ u32 features; + /* 0x10 */ u8 unk_10; + /* 0x11 */ u8 updateRate; + /* 0x12 */ u8 updateRate2; + /* 0x13 */ u8 unk_13; + /* 0x14 */ f32 xScale; + /* 0x18 */ f32 yScale; +} CfbInfo; // size = 0x1C #endif diff --git a/include/z64actor.h b/include/z64actor.h index 3a288d436e..a1f08721de 100644 --- a/include/z64actor.h +++ b/include/z64actor.h @@ -1,6 +1,9 @@ #ifndef _Z64ACTOR_H_ #define _Z64ACTOR_H_ +#include +#include + #define ACTOR_DLF_MAX 471 #define ACTOR_NUMBER_MAX 200 #define INVISIBLE_ACTOR_MAX 20 @@ -13,34 +16,12 @@ struct GlobalContext; // From z64light.h struct LightMapper; -typedef struct -{ - f32 x, y, z; -} Vec3f; - -typedef struct -{ - s16 x, y, z; -} Vec3s; - -typedef struct -{ - f32 x, y; -} Vec2f; - -typedef struct -{ - u32 x, y; -} Vec2i; - -typedef struct -{ +typedef struct { Vec3f pos; Vec3s rot; } PosRot; // size = 0x14 -typedef struct -{ +typedef struct { /* 0x00 */ char unk_00[0x8]; /* 0x08 */ Vec3s norm; // Normal vector /* 0x0E */ s16 dist; // Plane distance from origin @@ -48,8 +29,7 @@ typedef struct typedef void (*ActorFunc)(struct Actor*, struct GlobalContext*); -typedef struct -{ +typedef struct { /* 0x00 */ s16 id; /* 0x02 */ u8 type; // Classifies actor and determines when actor will execute /* 0x03 */ u8 room; // Room instance was spawned in. If value set to FF in rom, instance does not despawn when swapping rooms @@ -62,15 +42,13 @@ typedef struct /* 0x1C */ ActorFunc draw; // Draw function } ActorInit; // size = 0x20 -typedef enum -{ +typedef enum { ALLOCTYPE_NORMAL, ALLOCTYPE_ABSOLUTE, ALLOCTYPE_PERMANENT } AllocType; -typedef struct -{ +typedef struct { /* 0x00 */ u32 vromStart; /* 0x04 */ u32 vromEnd; /* 0x08 */ void* vramStart; @@ -82,25 +60,14 @@ typedef struct /* 0x1E */ s8 nbLoaded; // original name: "clients" } ActorOverlay; // size = 0x20 -typedef struct -{ - struct - { +typedef struct { + struct { char damage : 4; char effect : 4; } attack[32]; } ActorDamageChart; -typedef struct -{ - /* 0x00 */ u8 health; - /* 0x02 */ s16 unk_02; - /* 0x04 */ s16 unk_04; - /* 0x06 */ u8 mass; -} SubActor98Init; - -typedef struct -{ +typedef struct { /* 0x00 */ ActorDamageChart* damageChart; // For actors which contain a damage chart (example: Stalfos)... /* 0x04 */ Vec3f displacement; // Amount to correct velocity (0x5C) by when colliding into a body /* 0x10 */ s16 unk_10; @@ -114,8 +81,7 @@ typedef struct /* 0x1B */ u8 unk_1B; } SubActorStruct98; // size = 0x1C -typedef struct -{ +typedef struct { /* 0x00 */ Vec3s rot; // Current actor shape rotation /* 0x06 */ u8 unk_06; /* 0x08 */ f32 unk_08; // Model y axis offset. Represents model space units. collision mesh related @@ -125,8 +91,7 @@ typedef struct /* 0x15 */ u8 unk_15; } ActorShape; // size = 0x18 -typedef struct Actor -{ +typedef struct Actor { /* 0x000 */ s16 id; // Actor Id /* 0x002 */ u8 type; // Actor Type. Refer to the corresponding enum for values /* 0x003 */ s8 room; // Room number the actor is part of. FF denotes that the actor won't despawn on a room change @@ -159,8 +124,7 @@ typedef struct Actor /* 0x094 */ f32 yDistanceFromLink; /* 0x098 */ SubActorStruct98 sub_98; /* 0x0B4 */ ActorShape shape; - /* 0x0CC */ Vec3f unk_CC; // Used in Link, not Deku Babas - /* 0x0D8 */ Vec3f unk_D8; // Used in Link, not Deku Babas + /* 0x0CC */ Vec3f unk_CC[2]; /* 0x0E4 */ Vec3f unk_E4; // Stores result of some vector transformation involving actor xyz vector, and a matrix at Global Context + 11D60 /* 0x0F0 */ f32 unk_F0; // Related to above /* 0x0F4 */ f32 unk_F4; @@ -198,16 +162,29 @@ typedef struct Actor /* From here on, the structure and size varies for each actor */ } Actor; // size = 0x14C -typedef enum -{ +typedef struct { + /* 0x00 */ u8 health; + /* 0x02 */ s16 unk_02; + /* 0x04 */ s16 unk_04; + /* 0x06 */ u8 mass; +} Sub98Init4; + +typedef struct { + /* 0x00 */ u8 health; + /* 0x02 */ s16 unk_10; + /* 0x04 */ s16 unk_12; + /* 0x06 */ u16 unk_14; + /* 0x08 */ u8 mass; +} Sub98Init5; + +typedef enum { COLTYPE_CYLINDER = 1, COLTYPE_CYLINDER_GROUP = 0, COLTYPE_QUAD = 3, COLTYPE_TRIANGLE_GROUP = 2 } ColliderType; -typedef struct -{ +typedef struct { /* 0x00 */ Actor* actor; /* 0x04 */ Actor* at; /* 0x08 */ Actor* ac; @@ -220,15 +197,13 @@ typedef struct /* 0x15 */ u8 type; /* Cylinder Collection, Cylinder, Triangle Collection, Quad */ } Collider; // size = 0x18 -typedef struct -{ +typedef struct { /* 0x00 */ s32 flags; /* Toucher Attack Identifier Flags */ /* 0x04 */ u8 unk_04; /* 0x05 */ u8 damage; /* Damage or Stun Timer */ } ColliderTouch; // size = 0x08 -typedef struct -{ +typedef struct { /* 0x00 */ s32 flags; /* Collision Exclusion Mask */ /* 0x04 */ u8 effect; /* Damage Effect (Knockback, Fire, etc.) */ /* 0x05 */ u8 unk_05; @@ -237,8 +212,7 @@ typedef struct /* 0x0A */ s16 unk_0A; } ColliderBump; // size = 0x0C -typedef struct ColliderBody -{ +typedef struct ColliderBody { /* 0x00 */ ColliderTouch toucher; /* 0x08 */ ColliderBump bumper; /* 0x14 */ u8 flags; @@ -251,14 +225,12 @@ typedef struct ColliderBody /* 0x24 */ struct ColliderBody* colliding; } ColliderBody; // size = 0x28 -typedef struct ColliderBodyEntry -{ +typedef struct ColliderBodyEntry { /* 0x00 */ ColliderBody c; /* 0x28 */ char unk_28[0x18]; } ColliderBodyEntry; // size = 0x40 -typedef struct -{ +typedef struct { /* 0x00 */ u8 bodyFlags; /* 0x01 */ u8 unk_09[0x3]; /* 000000 */ /* 0x04 */ s32 toucherMask; /* Attack Toucher Exclusion Mask */ @@ -273,8 +245,7 @@ typedef struct /* 0x17 */ u8 unk_1F; /* 00 */ } ColliderBodyInfoInner; // size = 0x1A -typedef struct -{ +typedef struct { /* 0x00 */ u8 unk_00; /* 0x01 */ u8 colliderFlags; /* Collider Flags */ /* 0x02 */ u8 collideFlags; /* Collide Flags */ @@ -284,30 +255,26 @@ typedef struct /* 0x06 */ u8 unk_06[0x2]; /* 0000 */ } ColliderBodyInfo; // size = 0x08 -typedef struct -{ +typedef struct { /* 0x00 */ s16 radius; /* Cylinder Radius */ /* 0x02 */ s16 height; /* Cylinder Height */ /* 0x04 */ s16 yShift; /* Shift Cylinder on Y Axis */ /* 0x06 */ Vec3s position; /* {X, Y, Z} position of Cylinder */ } ColliderDimensions; // size = 0xC -typedef struct -{ +typedef struct { /* 0x00 */ Collider base; /* 0x18 */ ColliderBody body; /* 0x40 */ ColliderDimensions dim; } ColliderCylinderMain; // size = 0x4C -typedef struct -{ +typedef struct { /* 0x00 */ ColliderBodyInfo body; - /* 0x06 */ ColliderBodyInfoInner inner; - /* 0x20 */ ColliderDimensions dim; -} ColliderCylinderInit; // size = 0x2C + /* 0x08 */ ColliderBodyInfoInner inner; + /* 0x22 */ ColliderDimensions dim; +} ColliderCylinderInit; // size = 0x2E -typedef struct -{ +typedef struct { /* 0x00 */ Actor* actor; /* 0x04 */ char unk_04[0x10]; /* 0x14 */ Vec3f scale1; @@ -319,8 +286,7 @@ typedef struct /* 0x54 */ char unk_54[0x10]; } ActorMesh; // size = 0x64 -typedef struct -{ +typedef struct { /* 0x000 */ Actor actor; /* 0x14C */ u32 dynaPolyId; /* 0x150 */ f32 unk_150; @@ -329,86 +295,90 @@ typedef struct /* 0x15A */ u16 unk_15A; /* 0x15C */ u32 unk_15C; /* 0x160 */ u8 unk_160; + /* 0x162 */ s16 unk_162; } DynaPolyActor; // size = 0x164 -typedef struct -{ - /* 0x0000 */ Actor actor; - /* 0x014C */ s8 currentTunic; - /* 0x014D */ s8 currentSword; - /* 0x014E */ s8 currentShield; - /* 0x014F */ s8 currentBoots; - /* 0x0150 */ s8 unk_150; - /* 0x0151 */ s8 unk_151; - /* 0x0152 */ s8 unk_152; - /* 0x0153 */ s8 unk_153; - /* 0x0154 */ s8 unk_154; - /* 0x0155 */ char unk_155[0x008]; - /* 0x015D */ u8 unk_15D; - /* 0x015E */ u8 unk_15E; - /* 0x015F */ u8 currentMask; - /* 0x0160 */ char unk_160[0x050]; - /* 0x01B0 */ u32 unk_1B0; - /* 0x01B4 */ char unk_1B4[0x1F8]; - /* 0x03AC */ Actor* heldActor; - /* 0x03B0 */ char unk_3B0[0x084]; - /* 0x0434 */ u8 getItemId; - /* 0x0436 */ u16 getItemDirection; - /* 0x0438 */ Actor* interactRangeActor; - /* 0x043C */ s8 unk_43C; - /* 0x0440 */ Actor* rideActor; - /* 0x0444 */ u8 action; - /* 0x0445 */ char unk_445[0x003]; - /* 0x0448 */ Actor* unk_448; - /* 0x0445 */ char unk_44C[0x01E]; - /* 0x046A */ u16 unk_46A; - /* 0x046C */ char unk_46C[0x6E]; - /* 0x04DA */ s16 unk_4DA; - /* 0x04DC */ char unk_4DC[0x188]; - /* 0x0664 */ Actor* unk_664; - /* 0x0668 */ char unk_668[0x004]; - /* 0x066C */ s32 unk_66C; - /* 0x0670 */ char unk_670[0x00C]; - /* 0x067C */ u32 stateFlags1; - /* 0x0680 */ u32 stateFlags2; - /* 0x0684 */ char unk_684[0x008]; - /* 0x068C */ Actor* unk_68C; - /* 0x0690 */ char unk_690[0x002]; - /* 0x0692 */ u8 unk_692; - /* 0x0693 */ s8 exchangeItemId; - /* 0x0694 */ Actor* unk_694; - /* 0x0698 */ f32 unk_698; - /* 0x069C */ char unk_69C[0x008]; - /* 0x06A4 */ f32 unk_6A4; - /* 0x06A8 */ char unk_6A8[0x5]; - /* 0x06AD */ u8 unk_6AD; - /* 0x06AE */ char unk_6AE[0x186]; - /* 0x0834 */ s16 unk_834; - /* 0x0836 */ char unk_836[0x006]; - /* 0x083C */ s16 unk_83C; - /* 0x083E */ char unk_83E[0x004]; - /* 0x0842 */ s8 swordAnimation; - /* 0x0843 */ s8 swordState; - /* 0x0844 */ u8 unk_844; - /* 0x0845 */ u8 unk_845; - /* 0x0846 */ u8 unk_846; - /* 0x0847 */ char unk_847[0x004]; - /* 0x084B */ s8 unk_84B[UNK_SIZE]; - /* 0x084C */ char unk_84C[0x054]; - /* 0x08A0 */ u8 unk_8A0; - /* 0x08A1 */ u8 unk_8A1; - /* 0x08A2 */ u16 unk_8A2; - /* 0x08A4 */ f32 unk_8A4; - /* 0x08A8 */ f32 unk_8A8; - /* 0x08AC */ char unk_8AC[0x174]; - /* 0x0A20 */ MtxF mf_A20; - /* 0x0A60 */ char unk_A60[0x18]; - /* 0x0A78 */ s8 unk_A78; - /* 0x0A79 */ char unk_A79[0x1B]; -} Player; //size = 0xA94 +typedef struct { + /* 0x0000 */ Actor actor; + /* 0x014C */ s8 currentTunic; + /* 0x014D */ s8 currentSword; + /* 0x014E */ s8 currentShield; + /* 0x014F */ s8 currentBoots; + /* 0x0150 */ s8 unk_150; + /* 0x0151 */ s8 unk_151; + /* 0x0152 */ s8 unk_152; + /* 0x0153 */ s8 unk_153; + /* 0x0154 */ s8 unk_154; + /* 0x0155 */ char unk_155[0x008]; + /* 0x015D */ u8 unk_15D; + /* 0x015E */ u8 unk_15E; + /* 0x015F */ u8 currentMask; + /* 0x0160 */ char unk_160[0x050]; + /* 0x01B0 */ u32 unk_1B0; + /* 0x01B4 */ SkelAnime skelAnime; + /* 0x01F8 */ char unk_1F8[0x1B4]; + /* 0x03AC */ Actor* heldActor; + /* 0x03B0 */ char unk_3B0[0x084]; + /* 0x0434 */ u8 getItemId; + /* 0x0436 */ u16 getItemDirection; + /* 0x0438 */ Actor* interactRangeActor; + /* 0x043C */ s8 unk_43C; + /* 0x0440 */ Actor* rideActor; + /* 0x0444 */ u8 action; + /* 0x0445 */ char unk_445[0x003]; + /* 0x0448 */ Actor* unk_448; + /* 0x0445 */ char unk_44C[0x01E]; + /* 0x046A */ u16 unk_46A; + /* 0x046C */ char unk_46C[0x6E]; + /* 0x04DA */ s16 unk_4DA; + /* 0x04DC */ char unk_4DC[0x188]; + /* 0x0664 */ Actor* unk_664; + /* 0x0668 */ char unk_668[0x004]; + /* 0x066C */ s32 unk_66C; + /* 0x0670 */ char unk_670[0x00C]; + /* 0x067C */ u32 stateFlags1; + /* 0x0680 */ u32 stateFlags2; + /* 0x0684 */ char unk_684[0x008]; + /* 0x068C */ Actor* unk_68C; + /* 0x0690 */ char unk_690[0x002]; + /* 0x0692 */ u8 unk_692; + /* 0x0693 */ s8 exchangeItemId; + /* 0x0694 */ Actor* unk_694; + /* 0x0698 */ f32 unk_698; + /* 0x069C */ char unk_69C[0x008]; + /* 0x06A4 */ f32 unk_6A4; + /* 0x06A8 */ char unk_6A8[0x5]; + /* 0x06AD */ u8 unk_6AD; + /* 0x06AE */ char unk_6AE[0x1A]; + /* 0x06C8 */ SkelAnime skelAnime2; + /* 0x070C */ char unk_70C[0x128]; + /* 0x0834 */ s16 unk_834; + /* 0x0836 */ char unk_836[0x006]; + /* 0x083C */ s16 unk_83C; + /* 0x083E */ char unk_83E[0x004]; + /* 0x0842 */ s8 swordAnimation; + /* 0x0843 */ s8 swordState; + /* 0x0844 */ u8 unk_844; + /* 0x0845 */ u8 unk_845; + /* 0x0846 */ u8 unk_846; + /* 0x0847 */ char unk_847[0x004]; + /* 0x084B */ s8 unk_84B[UNK_SIZE]; + /* 0x084C */ char unk_84C[0x003]; + /* 0x084F */ s8 unk_84F; + /* 0x0850 */ char unk_850[0x050]; + /* 0x08A0 */ u8 unk_8A0; + /* 0x08A1 */ u8 unk_8A1; + /* 0x08A2 */ u16 unk_8A2; + /* 0x08A4 */ f32 unk_8A4; + /* 0x08A8 */ f32 unk_8A8; + /* 0x08AC */ char unk_8AC[0x174]; + /* 0x0A20 */ MtxF mf_A20; + /* 0x0A60 */ char unk_A60[0x18]; + /* 0x0A78 */ s8 unk_A78; + /* 0x0A79 */ char unk_A79[0x1B]; +} Player; // size = 0xA94 -typedef enum -{ +typedef enum { /* 0x00 */ ACTORTYPE_SWITCH, /* 0x01 */ ACTORTYPE_BG, /* 0x02 */ ACTORTYPE_PLAYER, @@ -423,8 +393,7 @@ typedef enum /* 0x0B */ ACTORTYPE_CHEST } ActorType; -typedef enum -{ +typedef enum { /* 0x0000 */ ACTOR_PLAYER, /* 0x0001 */ ACTOR_UNSET_1, /* 0x0002 */ ACTOR_EN_TEST, diff --git a/include/z64animation.h b/include/z64animation.h new file mode 100755 index 0000000000..598c25b362 --- /dev/null +++ b/include/z64animation.h @@ -0,0 +1,191 @@ +#ifndef _Z64_ANIMATION_H +#define _Z64_ANIMATION_H + +#include +#include +#include +#include + +#define LINK_ANIMETION_OFFSET(addr,offset) (((u32)&_link_animetionSegmentRomStart)+((u32)addr)-((u32)&link_animetion_segment)+((u32)offset)) +#define LIMB_DONE 0xFF +#define ANIMATION_ENTRY_MAX 50 + +#define ANIM_FLAG_UPDATEXZ 0x02 +#define ANIM_FLAG_UPDATEY 0x10 + +struct GlobalContext; +struct Actor; +typedef struct SkelAnime SkelAnime; + +typedef struct { + /* 0x000 */ Vec3s translation; // Translation relative to parent limb. root limb is a tranlation for entire model. + /* 0x006 */ u8 firstChildIndex; // The first child's index into the limb table. + /* 0x007 */ u8 nextLimbIndex; // The parent limb's next limb index into the limb table. + /* 0x008 */ Gfx* displayLists[1]; // Display lists for the limb. Index 0 is the normal display list, index 1 is the far model display list. +} SkelLimbEntry; // Size = 0xC or 0x10 + +typedef struct { + /* 0x000 */ SkelLimbEntry* limbs[1]; // One ore more limbs, index 0 is the root limb. +} Skeleton; // Size >= 4 + +typedef struct { + /* 0x000 */ Skeleton* skeletonSeg; // Segment address of SkelLimbIndex. + /* 0x004 */ u8 limbCount; // Number of limbs in the model. + /* 0x005 */ char unk_05[3]; // unknown, maybe padding? + /* 0x008 */ u8 dListCount; // Number of display lists in the model. +} SkeletonHeader; // Size = 0xC + +typedef s16 AnimationRotationValue; + +typedef struct { + /* 0x000 */ u16 x; + /* 0x002 */ u16 y; + /* 0x004 */ u16 z; +} AnimationRotationIndex; // size = 0x06 + +typedef struct { + s16 frameCount; + s16 unk_02; +} GenericAnimationHeader; + +typedef struct { + /* 0x000 */ GenericAnimationHeader genericHeader; + /* 0x004 */ u32 rotationValueSeg; // referenced as tbl + /* 0x008 */ u32 rotationIndexSeg; // referenced as ref_tbl + /* 0x00C */ u16 limit; +} AnimationHeader; // size = 0x10 + +typedef enum { + ANIMATION_LINKANIMETION, + ANIMATION_TYPE1, + ANIMATION_TYPE2, + ANIMATION_TYPE3, + ANIMATION_TYPE4, + ANIMATION_TYPE5 +} AnimationType; + +typedef struct { + /* 0x000 */ DmaRequest req; + /* 0x020 */ OSMesgQueue msgQueue; + /* 0x038 */ OSMesg msg; +} AnimationEntryType0; + +typedef struct { + /* 0x000 */ u8 unk_00; + /* 0x001 */ u8 vecCount; + /* 0x004 */ Vec3s* dst; + /* 0x008 */ Vec3s* src; +} AnimationEntryType1; + +typedef struct { + /* 0x000 */ u8 unk_00; + /* 0x001 */ u8 limbCount; + /* 0x004 */ Vec3s* unk_04; + /* 0x008 */ Vec3s* unk_08; + /* 0x00C */ f32 unk_0C; +} AnimationEntryType2; + +typedef struct { + /* 0x000 */ u8 unk_00; + /* 0x001 */ u8 vecCount; + /* 0x004 */ Vec3s* dst; + /* 0x008 */ Vec3s* src; + /* 0x00C */ u8* index; +} AnimationEntryType3; + +typedef struct { + /* 0x000 */ u8 unk_00; + /* 0x001 */ u8 vecCount; + /* 0x002 */ char unk_02[0x2]; + /* 0x004 */ Vec3s* dst; + /* 0x008 */ Vec3s* src; + /* 0x00C */ u8* index; +} AnimationEntryType4; + +typedef struct { + /* 0x000 */ struct Actor* actor; + /* 0x004 */ SkelAnime* skelAnime; + /* 0x008 */ f32 unk_08; +} AnimationEntryType5; + +typedef struct { + /* 0x000 */ u8 raw[0x3C]; +} AnimationEntryRaw; + +typedef union { + AnimationEntryRaw raw; + AnimationEntryType0 type0; + AnimationEntryType1 type1; + AnimationEntryType2 type2; + AnimationEntryType3 type3; + AnimationEntryType4 type4; + AnimationEntryType5 type5; +} AnimationEntryType; + +typedef struct { + /* 0x000 */ u8 type; + /* 0x001 */ u8 unk_01; + /* 0x004 */ AnimationEntryType types; +} AnimationEntry; // size = 0x40 + +typedef struct AnimationContext { + s16 animationCount; + char unk_02[2]; + AnimationEntry entries[ANIMATION_ENTRY_MAX]; +} AnimationContext; + +typedef struct { + GenericAnimationHeader genericHeader; + u32 animationSegAddress; +} LinkAnimetionEntry; + +struct SkelAnime { + /* 0x00 */ u8 limbCount; // joint_Num + /* modes 0 and 1 repeat the animation indefinitely + * modes 2 and 3 play the animaton once then stop + * modes >= 4 play the animation once, and always start at frame 0. + */ + /* 0x01 */ u8 mode; + /* 0x02 */ u8 dListCount; + /* 0x03 */ s8 unk_03; + /* 0x04 */ Skeleton* skeleton; + /* 0x08 */ + union { + AnimationHeader* animCurrentSeg; + LinkAnimetionEntry* linkAnimetionSeg; + GenericAnimationHeader* genericSeg; + }; + /* 0x0C */ f32 initialFrame; + /* 0x10 */ f32 animFrameCount; + /* 0x14 */ f32 totalFrames; + /* 0x18 */ f32 animCurrentFrame; + /* 0x1C */ f32 animPlaybackSpeed; + /* 0x20 */ Vec3s* actorDrawTbl; // now_joint + /* 0x24 */ Vec3s* transitionDrawTbl; // morf_joint + /* 0x28 */ f32 transCurrentFrame; + /* 0x2C */ f32 transitionStep; + /* 0x30 */ s32 (*animUpdate)(); + /* 0x34 */ s8 initFlags; + /* 0x35 */ u8 flags; + /* 0x36 */ s16 prevFrameRot; + /* 0x38 */ Vec3s prevFramePos; + /* 0x3E */ Vec3s unk_3E; +}; // size = 0x44 + +typedef s32 (*SkelAnime_LimbUpdateMatrix)(struct GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, + Vec3f* pos, Vec3s* rot, struct Actor* actor); + +typedef void (*SkelAnime_LimbAppendDlist)(struct GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, + Vec3s* rot, struct Actor* actor); + +typedef s32 (*SkelAnime_LimbUpdateMatrix2)(struct GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, + Vec3f* pos, Vec3s* rot, struct Actor* actor, Gfx** gfx); + +typedef void (*SkelAnime_LimbAppendDlist2)(struct GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, + Vec3s* rot, struct Actor* actor, Gfx** gfx); + +typedef void (*AnimationEntryCallback)(struct GlobalContext*, AnimationEntryType*); + +extern u32 link_animetion_segment; + +#endif diff --git a/include/z64cutscene.h b/include/z64cutscene.h index 97abc805ef..91be35f82e 100644 --- a/include/z64cutscene.h +++ b/include/z64cutscene.h @@ -1,16 +1,14 @@ #ifndef _Z64CUTSCENE_H_ #define _Z64CUTSCENE_H_ -typedef struct -{ +typedef struct { /* 0x00 */ u16 entrance; // entrance index upon which the cutscene should trigger /* 0x02 */ u8 ageRestriction; // 0 for adult only, 1 for child only, 2 for both ages /* 0x03 */ u8 flag; // event_chk_inf flag bound to the entrance cutscene /* 0x04 */ u32 segAddr; // segment offset location of the cutscene } EntranceCutscene; // size = 0x8 -typedef struct -{ +typedef struct { /* 0x00 */ s8 continueFlag; /* 0x01 */ s8 cameraRoll; /* 0x02 */ s16 nextPointFrame; @@ -18,38 +16,33 @@ typedef struct /* 0x08 */ Vec3s pos; } CutsceneCameraPoint; // size = 0x10 -typedef struct -{ +typedef struct { /* 0x00 */ u16 base; /* 0x02 */ u16 startFrame; /* 0x04 */ u16 endFrame; } CsCmdBase; -typedef struct -{ +typedef struct { /* 0x00 */ u8 unk_00; /* 0x01 */ u8 setting; /* 0x02 */ u16 startFrame; /* 0x04 */ u16 endFrame; } CsCmdEnvLighting; -typedef struct -{ +typedef struct { /* 0x00 */ u8 unk_00; /* 0x01 */ u8 sequence; /* 0x02 */ u16 startFrame; /* 0x04 */ u16 endFrame; } CsCmdMusicChange; -typedef struct -{ +typedef struct { /* 0x00 */ u16 type; /* 0x02 */ u16 startFrame; /* 0x04 */ u16 endFrame; } CsCmdMusicFade; -typedef struct -{ +typedef struct { /* 0x00 */ u16 unk_00; /* 0x02 */ u16 startFrame; /* 0x04 */ u16 endFrame; @@ -58,8 +51,7 @@ typedef struct /* 0x08 */ u8 unk_08; } CsCmdUnknown9; -typedef struct -{ +typedef struct { /* 0x00 */ u16 unk_00; /* 0x02 */ u16 startFrame; /* 0x04 */ u16 endFrame; @@ -67,8 +59,7 @@ typedef struct /* 0x07 */ u8 minute; } CsCmdDayTime; -typedef struct -{ +typedef struct { /* 0x00 */ u16 base; /* 0x02 */ u16 startFrame; /* 0x04 */ u16 endFrame; @@ -77,19 +68,17 @@ typedef struct /* 0x0A */ u16 textId2; } CsCmdTextbox; // size = 0xC -typedef struct -{ +typedef struct { /* 0x00 */ u16 action; /* 0x02 */ u16 startFrame; /* 0x04 */ u16 endFrame; /* 0x06 */ Vec3s rot; - /* 0x0C */ Vec3f startPos; - /* 0x18 */ Vec3f endPos; - /* 0x24 */ Vec3f normal; + /* 0x0C */ Vec3i startPos; + /* 0x18 */ Vec3i endPos; + /* 0x24 */ Vec3i normal; } CsCmdActorAction; // size = 0x30 -typedef enum -{ +typedef enum { CS_STATE_IDLE, CS_STATE_SKIPPABLE_INIT, CS_STATE_SKIPPABLE_EXEC, @@ -97,8 +86,7 @@ typedef enum CS_STATE_UNSKIPPABLE_EXEC } CutsceneState; -typedef enum -{ +typedef enum { CS_CMD_00 = 0x0000, CS_CMD_CAMERA_POS = 0x0001, CS_CMD_CAMERA_FOCUS = 0x0002, diff --git a/include/z64dma.h b/include/z64dma.h new file mode 100755 index 0000000000..b4e4607f68 --- /dev/null +++ b/include/z64dma.h @@ -0,0 +1,23 @@ +#ifndef _Z64_DMA_H_ +#define _Z64_DMA_H_ + +#include + +typedef struct { + /* 0x00 */ u32 vromAddr; // VROM address (source) + /* 0x04 */ void* dramAddr; // DRAM address (destination) + /* 0x08 */ u32 size; // File Transfer size + /* 0x0C */ char* filename; // Filename for debugging + /* 0x10 */ s32 line; // Line for debugging + /* 0x14 */ s32 unk_14; + /* 0x18 */ OSMesgQueue* notifyQueue; // Message queue for the notification message + /* 0x1C */ OSMesg notifyMsg; // Completion notification message +} DmaRequest; // size = 0x20 + +typedef struct { + /* 0x00 */ u32 vromStart; + /* 0x04 */ u32 vromEnd; + /* 0x08 */ u32 romStart; + /* 0x0C */ u32 romEnd; +} DmaEntry; +#endif diff --git a/include/z64effect.h b/include/z64effect.h index b7d11270e6..4f83f2e883 100644 --- a/include/z64effect.h +++ b/include/z64effect.h @@ -2,18 +2,17 @@ #define _Z64EFFECT_H_ #include -/* gz has trail related structs but they seem to be different in dbg*/ -typedef struct -{ +// gz has trail related structs but they seem to be different in dbg +typedef struct { /* 0x0000 */ char unk_00[0x184]; /* 0x0184 */ Color_RGBA8 p1Start; /* 0x0188 */ Color_RGBA8 p2Start; /* 0x018C */ Color_RGBA8 p1End; /* 0x0190 */ Color_RGBA8 p2End; - /* 0x0194 */ u32 unk_194; //these are proably bytes + /* 0x0194 */ u32 unk_194; // these are proably bytes /* 0x0198 */ u32 unk_198; /* 0x019C */ u32 unk_19C; /* 0x01A0 */ -} TrailEffect; //size = unk +} TrailEffect; // size = unk #endif diff --git a/include/z64item.h b/include/z64item.h index 1c8e84705e..39a70b8037 100644 --- a/include/z64item.h +++ b/include/z64item.h @@ -1,16 +1,14 @@ #ifndef _Z64ITEM_H_ #define _Z64ITEM_H_ -typedef enum -{ +typedef enum { /* 0x00 */ EQUIP_SWORD, /* 0x01 */ EQUIP_SHIELD, /* 0x02 */ EQUIP_TUNIC, /* 0x03 */ EQUIP_BOOTS } EquipmentType; -typedef enum -{ +typedef enum { /* 0x00 */ UPG_QUIVER, /* 0x01 */ UPG_BOMB_BAG, /* 0x02 */ UPG_STRENGTH, @@ -21,8 +19,7 @@ typedef enum /* 0x07 */ UPG_NUTS } UpgradeType; -typedef enum -{ +typedef enum { /* 0x00 */ SLOT_STICK, /* 0x01 */ SLOT_NUT, /* 0x02 */ SLOT_BOMB, @@ -50,8 +47,7 @@ typedef enum /* 0xFF */ SLOT_NONE = 0xFF } InventorySlot; -typedef enum -{ +typedef enum { /* 0x00 */ ITEM_STICK, /* 0x01 */ ITEM_NUT, /* 0x02 */ ITEM_BOMB, @@ -212,8 +208,7 @@ typedef enum } ItemID; // Get Item result may vary depending on context (chest/shop/scrub/drop) -typedef enum -{ +typedef enum { /* 0x00 */ GI_INVALID, // Link picks up chest and it sends him flying upwards /* 0x01 */ GI_BOMBS_5, /* 0x02 */ GI_NUTS_5, @@ -258,8 +253,8 @@ typedef enum /* 0x29 */ GI_SHIELD_DEKU, // or blue rupee if you have the shield /* 0x2A */ GI_SHIELD_HYLIAN, // or blue rupee if you have the shield /* 0x2B */ GI_SHIELD_MIRROR, - /* 0x2C */ GI_TUNIC_GORON, // or blue rupee if you have the tunic - /* 0x2D */ GI_TUNIC_ZORA, // or blue rupee if you have the tunic + /* 0x2C */ GI_TUNIC_GORON, // or blue rupee if you have the tunic + /* 0x2D */ GI_TUNIC_ZORA, // or blue rupee if you have the tunic /* 0x2E */ GI_BOOTS_IRON, /* 0x2F */ GI_BOOTS_HOVER, /* 0x30 */ GI_QUIVER_40, diff --git a/include/z64light.h b/include/z64light.h index 35e0bf8184..68a2e63945 100644 --- a/include/z64light.h +++ b/include/z64light.h @@ -4,15 +4,13 @@ #include #include -typedef struct z_Light_t -{ +typedef struct z_Light_t { /* 0x0 */ struct LightInfo* info; /* 0x4 */ struct z_Light_t* prev; /* 0x8 */ struct z_Light_t* next; } z_Light; -typedef struct -{ +typedef struct { /* 0x0 */ z_Light* lightsHead; /* 0x4 */ u8 ambientRed; /* 0x5 */ u8 ambientGreen; @@ -24,21 +22,18 @@ typedef struct /* 0xC */ s16 unk_0C; } LightingContext; -typedef struct -{ +typedef struct { /* 0x000 */ int numOccupied; /* 0x004 */ int nextFree; /* 0x008 */ z_Light lights[32]; } LightsList; -typedef struct -{ +typedef struct { /* 0x0 */ u8 type; /* 0x2 */ u16 params[6]; } LightInfo; -typedef struct -{ +typedef struct { /* 0x0 */ s8 dirX; /* 0x1 */ s8 dirY; /* 0x2 */ s8 dirZ; @@ -48,8 +43,7 @@ typedef struct /* 0x6 */ u16 pad[3]; } LightInfoDirectionalParams; -typedef struct -{ +typedef struct { /* 0x0 */ s16 posX; /* 0x2 */ s16 posY; /* 0x4 */ s16 posZ; @@ -60,8 +54,7 @@ typedef struct /* 0xA */ s16 radius; } LightInfoPositionalParams; -typedef struct -{ +typedef struct { /* 0x00 */ u8 numLights; /* 0x01 */ u8 enablePosLights; /* 0x02 */ UNK_TYPE1 pad2[6]; @@ -69,14 +62,12 @@ typedef struct /* 0x10 */ Light lights[7]; } LightMapper; -typedef struct -{ +typedef struct { /* 0x0 */ u8 type; /* 0x2 */ LightInfoDirectionalParams params; } LightInfoDirectional; -typedef struct -{ +typedef struct { /* 0x0 */ u8 type; /* 0x2 */ LightInfoPositionalParams params; } LightInfoPositional; diff --git a/include/z64object.h b/include/z64object.h index 102190fe40..54271d82f4 100644 --- a/include/z64object.h +++ b/include/z64object.h @@ -3,8 +3,7 @@ #define OBJECT_EXCHANGE_BANK_MAX 19 -typedef enum -{ +typedef enum { /* 0x0000 */ OBJECT_UNSET_0, /* 0x0001 */ OBJECT_GAMEPLAY_KEEP, /* 0x0002 */ OBJECT_GAMEPLAY_FIELD_KEEP, diff --git a/include/z64scene.h b/include/z64scene.h index 313565444a..c808395878 100644 --- a/include/z64scene.h +++ b/include/z64scene.h @@ -1,8 +1,7 @@ #ifndef _Z64SCENE_H_ #define _Z64SCENE_H_ -typedef struct -{ +typedef struct { /* 0x00 */ u32 sceneVromStart; /* 0x04 */ u32 sceneVromEnd; /* 0x08 */ u32 titleVromStart; @@ -13,50 +12,43 @@ typedef struct /* 0x13 */ u8 unk_13; } Scene; // size = 0x14 -typedef struct -{ +typedef struct { /* 0x00 */ u8 code; /* 0x01 */ u8 data1; /* 0x04 */ u32 data2; } SCmdBase; -typedef struct -{ +typedef struct { /* 0x00 */ u8 code; /* 0x01 */ u8 data1; /* 0x04 */ u32 segment; } SCmdSpawnList; -typedef struct -{ +typedef struct { /* 0x00 */ u8 code; /* 0x01 */ u8 num; /* 0x04 */ u32 segment; } SCmdActorList; -typedef struct -{ +typedef struct { /* 0x00 */ u8 code; /* 0x01 */ u8 data1; /* 0x04 */ u32 segment; } SCmdCsCameraList; -typedef struct -{ +typedef struct { /* 0x00 */ u8 code; /* 0x01 */ u8 data1; /* 0x04 */ u32 segment; } SCmdColHeader; -typedef struct -{ +typedef struct { /* 0x00 */ u8 code; /* 0x01 */ u8 num; /* 0x04 */ u32 segment; } SCmdRoomList; -typedef struct -{ +typedef struct { /* 0x00 */ u8 code; /* 0x01 */ u8 data1; /* 0x02 */ char pad[2]; @@ -66,71 +58,61 @@ typedef struct /* 0x07 */ u8 unk_07; } SCmdWindSettings; -typedef struct -{ +typedef struct { /* 0x00 */ u8 code; /* 0x01 */ u8 data1; /* 0x04 */ u32 segment; } SCmdEntranceList; -typedef struct -{ +typedef struct { /* 0x00 */ u8 code; - /* 0x01 */ u8 naviMsgNum; + /* 0x01 */ u8 cUpElfMsgNum; /* 0x04 */ u32 keepObjectId; } SCmdSpecialFiles; -typedef struct -{ +typedef struct { /* 0x00 */ u8 code; /* 0x01 */ u8 gpFlag1; /* 0x04 */ u32 gpFlag2; } SCmdRoomBehavior; -typedef struct -{ +typedef struct { /* 0x00 */ u8 code; /* 0x01 */ u8 data1; /* 0x04 */ u32 segment; } SCmdMesh; -typedef struct -{ +typedef struct { /* 0x00 */ u8 code; /* 0x01 */ u8 num; /* 0x04 */ u32 segment; } SCmdObjectList; -typedef struct -{ +typedef struct { /* 0x00 */ u8 code; /* 0x01 */ u8 num; /* 0x04 */ u32 segment; } SCmdLightList; -typedef struct -{ +typedef struct { /* 0x00 */ u8 code; /* 0x01 */ u8 data1; /* 0x04 */ u32 segment; } SCmdPathList; -typedef struct -{ +typedef struct { /* 0x00 */ u8 code; /* 0x01 */ u8 num; /* 0x04 */ u32 segment; } SCmdTransiActorList; -typedef struct -{ +typedef struct { /* 0x00 */ u8 code; /* 0x01 */ u8 num; /* 0x04 */ u32 segment; } SCmdLightSettingList; -typedef struct -{ +typedef struct { /* 0x00 */ u8 code; /* 0x01 */ u8 data1; /* 0x02 */ char pad[2]; @@ -139,8 +121,7 @@ typedef struct /* 0x06 */ u8 unk_06; } SCmdTimeSettings; -typedef struct -{ +typedef struct { /* 0x00 */ u8 code; /* 0x01 */ u8 data1; /* 0x02 */ char pad[2]; @@ -149,8 +130,7 @@ typedef struct /* 0x06 */ u8 unk_06; } SCmdSkyboxSettings; -typedef struct -{ +typedef struct { /* 0x00 */ u8 code; /* 0x01 */ u8 data1; /* 0x02 */ char pad[2]; @@ -158,22 +138,19 @@ typedef struct /* 0x05 */ u8 unk_05; } SCmdSkyboxDisables; -typedef struct -{ +typedef struct { /* 0x00 */ u8 code; /* 0x01 */ u8 data1; /* 0x04 */ u32 data2; } SCmdEndMarker; -typedef struct -{ +typedef struct { /* 0x00 */ u8 code; /* 0x01 */ u8 data1; /* 0x04 */ u32 segment; } SCmdExitList; -typedef struct -{ +typedef struct { /* 0x00 */ u8 code; /* 0x01 */ u8 bgmId; /* 0x02 */ char pad[4]; @@ -181,42 +158,36 @@ typedef struct /* 0x07 */ u8 musicSeq; } SCmdSoundSettings; -typedef struct -{ +typedef struct { /* 0x00 */ u8 code; /* 0x01 */ u8 data1; /* 0x02 */ char pad[5]; /* 0x07 */ u8 echo; } SCmdEchoSettings; -typedef struct -{ +typedef struct { /* 0x00 */ u8 code; /* 0x01 */ u8 data1; /* 0x04 */ u32 segment; } SCmdCutsceneData; -typedef struct -{ +typedef struct { /* 0x00 */ u8 code; /* 0x01 */ u8 data1; /* 0x04 */ u32 segment; } SCmdAltHeaders; -typedef struct -{ +typedef struct { /* 0x00 */ u8 code; /* 0x01 */ u8 cameraMovement; /* 0x04 */ u32 area; } SCmdMiscSettings; -typedef struct -{ +typedef struct { u8 headerType; } MeshHeaderBase; -typedef struct -{ +typedef struct { MeshHeaderBase base; u8 numEntries; @@ -224,174 +195,144 @@ typedef struct u32 dListEnd; } MeshHeader0; -typedef struct -{ +typedef struct { u32 opaqueDList; - u32 translucentDList; + u32 translucentDList; } MeshEntry0; -typedef struct -{ +typedef struct { MeshHeaderBase base; - u8 format; u32 entryRecord; } MeshHeader1Base; -typedef struct -{ +typedef struct { MeshHeader1Base base; - u32 imagePtr; // 0x08 - - u32 unknown; // 0x0C - u32 unknown2; // 0x10 - - u16 bgWidth; // 0x14 - u16 bgHeight; // 0x16 - - u8 imageFormat; // 0x18 - u8 imageSize; // 0x19 - u16 imagePal; // 0x1A - u16 imageFlip; // 0x1C - + u32 unknown; // 0x0C + u32 unknown2; // 0x10 + u16 bgWidth; // 0x14 + u16 bgHeight; // 0x16 + u8 imageFormat; // 0x18 + u8 imageSize; // 0x19 + u16 imagePal; // 0x1A + u16 imageFlip; // 0x1C } MeshHeader1Single; -typedef struct -{ +typedef struct { MeshHeader1Base base; - u8 bgCnt; u32 bgRecordPtr; - } MeshHeader1Multi; -typedef struct -{ +typedef struct { u16 unknown; // 0x00 - s8 bgID; // 0x02 - - u32 imagePtr; // 0x04 - u32 unknown2; // 0x08 - u32 unknown3; // 0x0C - - u16 bgWidth; // 0x10 - u16 bgHeight; // 0x12 - - u8 imageFmt; // 0x14 - u8 imageSize; // 0x15 - u16 imagePal; // 0x16 - u16 imageFlip; // 0x18 + s8 bgID; // 0x02 + u32 imagePtr; // 0x04 + u32 unknown2; // 0x08 + u32 unknown3; // 0x0C + u16 bgWidth; // 0x10 + u16 bgHeight; // 0x12 + u8 imageFmt; // 0x14 + u8 imageSize; // 0x15 + u16 imagePal; // 0x16 + u16 imageFlip; // 0x18 } BackgroundRecord; -typedef struct -{ - s16 playerXMax, playerZMax; - s16 playerXMin, playerZMin; - - u32 opaqueDList; - u32 translucentDList; +typedef struct { + s16 playerXMax, playerZMax; + s16 playerXMin, playerZMin; + u32 opaqueDList; + u32 translucentDList; } MeshEntry2; -typedef struct -{ +typedef struct { MeshHeaderBase base; - u8 numEntries; - u32 dListStart; - u32 dListEnd; + u32 dListStart; + u32 dListEnd; } MeshHeader2; -typedef struct -{ +typedef struct { u8 ambientClrR, ambientClrG, ambientClrB; - u8 diffuseClrA_R, diffuseClrA_G, diffuseClrA_B; u8 diffuseDirA_X, diffuseDirA_Y, diffuseDirA_Z; u8 diffuseClrB_R, diffuseClrB_G, diffuseClrB_B; u8 diffuseDirB_X, diffuseDirB_Y, diffuseDirB_Z; - u8 fogClrR, fogClrG, fogClrB; u16 unk; u16 drawDistance; } LightSettings; -typedef struct -{ +typedef struct { s16 absMinX, absMinY, absMinZ; s16 absMaxX, absMaxY, absMaxZ; - s16 numVerts; - s32 vtxSegmentOffset; - s16 numPolygons; - s32 polySegmentOffset; - s32 polyTypeDefSegmentOffset; - s32 camDataSegmentOffset; - - s16 numWaterBoxes; - s32 waterBoxSegmentOffset; + s16 numVerts; + s32 vtxSegmentOffset; + s16 numPolygons; + s32 polySegmentOffset; + s32 polyTypeDefSegmentOffset; + s32 camDataSegmentOffset; + s16 numWaterBoxes; + s32 waterBoxSegmentOffset; } ColHeader; -typedef struct -{ +typedef struct { s16 cameraSType; // 0x00 - s16 numCameras; // 0x02 - s32 camPosDataSeg; // 0x04 + s16 numCameras; // 0x02 + s32 camPosDataSeg; // 0x04 } CamData; -typedef struct -{ +typedef struct { u32 unknown; u32 camPosDataSeg; } CamPosDataEntry; /* -typedef union -{ +typedef union { _CamData data; long long int forceStructAlignment; } CamData; */ -typedef struct -{ +typedef struct { s16 posX, posY, posZ; - s16 rotX, rotY, rotZ; - s16 fov; - s16 jfifId; - s16 unk; - //s16 unk2; - //s32 unk; + s16 rotX, rotY, rotZ; + s16 fov; + s16 jfifId; + s16 unk; } CamPosData; /* -typedef union -{ +typedef union { _CamPosData data; long long int forceStructAlignment; } CamPosData; */ -typedef struct -{ +typedef struct { s16 type; - s16 vtxA, vtxB, vtxC; - s16 a, b, c, d; + s16 vtxA, vtxB, vtxC; + s16 a, b, c, d; } RoomPoly; -typedef struct -{ +typedef struct { s16 xMin; - s16 ySurface; - s16 zMin; - s16 xLength; - s16 zLength; - s32 properties; + s16 ySurface; + s16 zMin; + s16 xLength; + s16 zLength; + s32 properties; } WaterBoxHeader; -typedef union -{ +typedef struct { + /* 0x00 */ u8 count; // number of points in the path + /* 0x04 */ Vec3s* points; // Segment Address to the array of points +} Path; // size = 0x8 + +typedef union { SCmdBase base; SCmdSpawnList spawnList; SCmdActorList actorList; @@ -420,8 +361,7 @@ typedef union SCmdAltHeaders altHeaders; } SceneCmd; // size = 0x8 -typedef enum -{ +typedef enum { /* 0x00 */ SCENE_YDAN, /* 0x01 */ SCENE_DDAN, /* 0x02 */ SCENE_BDAN, diff --git a/include/z64vec.h b/include/z64vec.h new file mode 100644 index 0000000000..cd703f9f00 --- /dev/null +++ b/include/z64vec.h @@ -0,0 +1,22 @@ +#ifndef _Z64VEC_H_ +#define _Z64VEC_H_ + +#include + +typedef struct { + f32 x, y; +} Vec2f; + +typedef struct { + f32 x, y, z; +} Vec3f; + +typedef struct { + s16 x, y, z; +} Vec3s; + +typedef struct { + s32 x, y, z; +} Vec3i; + +#endif diff --git a/makefile b/makefile index 12d794b44d..2272230b53 100644 --- a/makefile +++ b/makefile @@ -26,8 +26,8 @@ OBJDUMP := $(MIPS_BINUTILS_PREFIX)objdump CC := $(QEMU_IRIX) -L tools/ido7.1_compiler tools/ido7.1_compiler/usr/bin/cc CC_OLD := $(QEMU_IRIX) -L tools/ido5.3_compiler tools/ido5.3_compiler/usr/bin/cc -# Check code syntax with host compiler (TODO: define NON_MATCHING because the non-matching code is utterly broken) -CC_CHECK := gcc -fno-builtin -fsyntax-only -fsigned-char -std=gnu90 -Wall -Wextra -Wno-format-security -Wno-unknown-pragmas -D _LANGUAGE_C -I include -include stdarg.h +# Check code syntax with host compiler +CC_CHECK := gcc -fno-builtin -fsyntax-only -fsigned-char -std=gnu90 -Wall -Wextra -Wno-format-security -Wno-unknown-pragmas -D _LANGUAGE_C -D NON_MATCHING -I include -include stdarg.h CPP := cpp MKLDSCRIPT := tools/mkldscript @@ -129,6 +129,11 @@ build/undefined_syms.txt: undefined_syms.txt clean: $(RM) $(ROM) $(ELF) -r build +setup: + make -C tools + python3 fixbaserom.py + python3 extract_baserom.py + python3 extract_assets.py #### Various Recipes #### @@ -157,10 +162,6 @@ build/assets/%.o: assets/%.c # $(CC_CHECK) $^ $(OBJCOPY) -O binary $@ $@.bin -#build/src/boot/%.o: src/boot/%.c -# $(CC) -c $(CFLAGS) $(OPTIMIZATION) -o $@ $^ -# @$(OBJDUMP) -d $@ > $(@:.o=.s) - build/src/overlays/%.o: src/overlays/%.c $(CC) -c $(CFLAGS) $(OPTIMIZATION) -o $@ $^ $(CC_CHECK) $^ diff --git a/progress.py b/progress.py index 8353eead4d..2da97b2e36 100644 --- a/progress.py +++ b/progress.py @@ -1,4 +1,24 @@ +#!/usr/bin/env python3 + import os +import re +import argparse + +parser = argparse.ArgumentParser(description="Computes current progress throughout the whole project.") +parser.add_argument("-m", "--matching", dest='matching', action='store_true', + help="Output matching progress instead of decompilation progress") +args = parser.parse_args() + +NON_MATCHING_PATTERN = "#ifdef\s+NON_MATCHING.*?#pragma\s+GLOBAL_ASM\s*\(\s*\"(.*?)\"\s*\).*?#endif" + +def GetNonMatchingFunctions(files): + functions = [] + + for file in files: + with open(file) as f: + functions += re.findall(NON_MATCHING_PATTERN, f.read(), re.DOTALL) + + return functions def ReadAllLines(fileName): lineList = list() @@ -7,27 +27,30 @@ def ReadAllLines(fileName): return lineList -def GetFiles(path): +def GetFiles(path, ext): files = [] for r, d, f in os.walk(path): for file in f: - if '.s' in file: + if file.endswith(ext): files.append(os.path.join(r, file)) return files +nonMatchingFunctions = GetNonMatchingFunctions(GetFiles("src", ".c")) if not args.matching else [] + def GetNonMatchingSize(path): size = 0 - asmFiles = GetFiles(path) + asmFiles = GetFiles(path, ".s") for asmFilePath in asmFiles: - asmLines = ReadAllLines(asmFilePath) + if asmFilePath not in nonMatchingFunctions: + asmLines = ReadAllLines(asmFilePath) - for asmLine in asmLines: - if (asmLine.startswith("/*")): - size += 4 + for asmLine in asmLines: + if (asmLine.startswith("/*")): + size += 4 return size @@ -65,28 +88,18 @@ nonMatchingASMBoot = GetNonMatchingSize("asm/non_matchings/boot") nonMatchingASMCode = GetNonMatchingSize("asm/non_matchings/code") + GetNonMatchingSize("asm/non_matchings/libultra_code") nonMatchingASMOvl = GetNonMatchingSize("asm/non_matchings/overlays") -codeSize = 1004128 # 1.00mb -bootSize = 36752 -#ovlSize = 3727584 # 3.727mb -ovlSize = 2812000 # .text section only -libultraSize = 40816 # This is temp -audioSize = 0 # This is temp -handwritten = 0 # This is temp - src -= nonMatchingASM code -= nonMatchingASMCode boot -= nonMatchingASMBoot ovl -= nonMatchingASMOvl asm += nonMatchingASM -#print(nonMatchingASM) -#asm = asm - (libultra_size + audio_size + handwritten - boot_size - code_size - ovl_size) -#asm = asm - (libultra_size + audio_size + handwritten) -#asm = -(libultra_size + audio_size + handwritten - boot_size - code_size - ovl_size) -#asm += codeSize -#asm += bootSize -#asm += ovlSize -#asm -= src +bootSize = 30704 # decompilable code only +codeSize = 1004128 # .text section except rsp bins (1.00mb) +ovlSize = 2812000 # .text sections +handwritten = 5840 # boot only + +asm -= handwritten total = src + asm srcPct = 100 * src / total @@ -97,12 +110,13 @@ ovlPct = 100 * ovl / ovlSize compiled_bytes = total bytesPerHeartPiece = compiled_bytes / 80 +adjective = "decompiled" if not args.matching else "matched" + print(str(total) + " total bytes of decompilable code\n") -print(str(src) + " bytes of code in src " + str(srcPct) + "%\n") -#print(str(asm) + " bytes of code in asm " + str(asmPct) + "%\n") -print(str(boot) + "/" + str(bootSize) + " bytes of code in boot " + str(bootPct) + "%\n") -print(str(code) + "/" + str(codeSize) + " bytes of code in code " + str(codePct) + "%\n") -print(str(ovl) + "/" + str(ovlSize) + " bytes of code in overlays " + str(ovlPct) + "%\n") +print(str(src) + " bytes " + adjective + " in src " + str(srcPct) + "%\n") +print(str(boot) + "/" + str(bootSize) + " bytes " + adjective + " in boot " + str(bootPct) + "%\n") +print(str(code) + "/" + str(codeSize) + " bytes " + adjective + " in code " + str(codePct) + "%\n") +print(str(ovl) + "/" + str(ovlSize) + " bytes " + adjective + " in overlays " + str(ovlPct) + "%\n") print("------------------------------------\n") heartPieces = int(src / bytesPerHeartPiece) diff --git a/spec b/spec index ac772e35b1..0ef4b9723d 100644 --- a/spec +++ b/spec @@ -280,9 +280,9 @@ beginseg include "build/data/z_eff_shield_particle.data.o" include "build/src/code/z_eff_spark.o" include "build/src/code/z_eff_ss_dead.o" - include "build/src/code/code_80026B00.o" - include "build/data/code_80026B00.data.o" - include "build/data/code_80026B00.bss.o" + include "build/src/code/z_effect.o" + include "build/data/z_effect.data.o" + include "build/data/z_effect.bss.o" include "build/src/code/z_effect_soft_sprite.o" include "build/data/z_effect_soft_sprite.data.o" include "build/src/code/z_effect_soft_sprite_old_init.o" @@ -308,21 +308,17 @@ beginseg include "build/src/code/z_common_data.o" include "build/data/z_common_data.bss.o" include "build/src/code/z_debug.o" - include "build/data/z_debug.data.o" - include "build/data/z_debug.bss.o" include "build/src/code/z_debug_display.o" include "build/src/code/z_demo.o" include "build/src/code/code_80069420.o" include "build/src/code/z_draw.o" include "build/asm/code_8006BA00.o" include "build/src/code/z_elf_message.o" - include "build/data/z_elf_message.data.o" - include "build/src/code/code_8006C360.o" - include "build/data/code_8006C360.data.o" + include "build/src/code/z_face_reaction.o" include "build/src/code/code_8006C3A0.o" include "build/src/code/code_8006C510.o" include "build/src/code/z_fcurve_data_skelanime.o" - include "build/data/z_game_dlftbls.data.o" + include "build/src/code/z_game_dlftbls.o" include "build/src/code/z_horse.o" include "build/src/code/z_jpeg.o" include "build/data/z_jpeg.data.o" @@ -342,8 +338,8 @@ beginseg include "build/src/code/z_malloc.o" include "build/src/code/z_map_mark.o" include "build/src/code/z_moji.o" - include "build/src/code/code_8007BE60.o" - include "build/src/code/code_8007BF10.o" + include "build/src/code/z_prenmi_buff.o" + include "build/src/code/z_msgevent.o" include "build/src/code/code_8007BF90.o" include "build/src/code/z_onepointdemo.o" include "build/data/z_onepointdemo.data.o" @@ -351,27 +347,20 @@ beginseg include "build/data/z_map_exp.data.o" include "build/data/z_map_exp.bss.o" include "build/src/code/z_parameter.o" - include "build/asm/code_8008E4E0.o" - include "build/data/code_8008E4E0.rodata.o" + include "build/src/code/z_path.o" include "build/asm/code_8008E6A0.o" include "build/src/code/z_player_lib.o" include "build/data/z_player_lib.data.o" include "build/data/z_player_lib.bss.o" include "build/src/code/z_prenmi.o" - include "build/asm/code_80092500.o" - include "build/data/code_80092500.data.o" - include "build/data/code_80092500.rodata.o" - include "build/data/code_80092500.bss.o" + include "build/src/code/z_quake.o" include "build/src/code/z_rcp.o" - include "build/data/z_rcp.data.o" include "build/src/code/z_room.o" include "build/src/code/z_sample.o" include "build/src/code/code_80097A00.o" include "build/src/code/z_scene.o" include "build/src/code/z_scene_table.o" include "build/src/code/z_skelanime.o" - include "build/data/z_skelanime.data.o" - include "build/data/z_skelanime.bss.o" include "build/src/code/z_skin.o" include "build/data/z_skin.bss.o" include "build/src/code/z_skin_awb.o" @@ -383,11 +372,10 @@ beginseg include "build/src/code/code_800A9D40.o" include "build/src/code/code_800A9F30.o" include "build/data/code_800A9F30.bss.o" + include "build/data/z_text.data.o" include "build/src/code/z_view.o" - include "build/data/z_view.data.o" include "build/src/code/z_vimode.o" - include "build/asm/code_800ACE70.o" - include "build/data/code_800ACE70.data.o" + include "build/src/code/code_800ACE70.o" include "build/src/code/z_vismono.o" include "build/asm/code_800AD920.o" include "build/src/code/z_vr_box.o" @@ -437,15 +425,10 @@ beginseg include "build/data/game.rodata.o" include "build/data/game.bss.o" include "build/src/code/gamealloc.o" - include "build/asm/graph.o" - include "build/data/graph.data.o" - include "build/data/graph.rodata.o" - include "build/data/graph.bss.o" + include "build/src/code/graph.o" include "build/src/code/listalloc.o" include "build/src/code/main.o" include "build/src/code/padmgr.o" - include "build/data/padmgr.data.o" - include "build/data/padmgr.bss.o" include "build/src/code/sched.o" include "build/data/sched.data.o" include "build/data/sched.bss.o" @@ -466,9 +449,7 @@ beginseg include "build/data/sys_ucode.data.o" include "build/asm/code_800D2E30.o" include "build/data/code_800D2E30.data.o" - include "build/asm/code_800D31A0.o" - include "build/data/code_800D31A0.data.o" - include "build/data/code_800D31A0.rodata.o" + include "build/src/code/code_800D31A0.o" include "build/src/code/irqmgr.o" include "build/src/code/debug_malloc.o" include "build/src/code/fault.o" @@ -514,10 +495,8 @@ beginseg include "build/src/code/code_800FC620.o" include "build/asm/code_800FCB50.o" include "build/asm/code_800FCD40.o" - include "build/asm/code_800FCE80.o" - include "build/data/code_800FCE80.data.o" - include "build/data/code_800FCE80.rodata.o" - include "build/data/code_800FCE80.bss.o" + include "build/src/code/code_800FCE80.o" + include "build/asm/fp.o" include "build/src/code/system_malloc.o" include "build/asm/code_800FD970.o" include "build/data/code_800FD970.data.o" @@ -617,8 +596,7 @@ endseg beginseg name "ovl_title" include "build/src/overlays/gamestates/ovl_title/z_title.o" - include "build/data/overlays/gamestates/z_title.data.o" - include "build/data/overlays/gamestates/z_title.reloc.o" + include "build/src/overlays/gamestates/ovl_title/z_title_reloc.o" address 0x80800000 endseg @@ -689,25 +667,19 @@ endseg beginseg name "ovl_Arrow_Fire" include "build/src/overlays/actors/ovl_Arrow_Fire/z_arrow_fire.o" - include "build/data/overlays/actors/z_arrow_fire.data.o" - include "build/data/overlays/actors/z_arrow_fire.rodata.o" - include "build/data/overlays/actors/z_arrow_fire.reloc.o" + include "build/src/overlays/actors/ovl_Arrow_Fire/z_arrow_fire_reloc.o" endseg beginseg name "ovl_Arrow_Ice" include "build/src/overlays/actors/ovl_Arrow_Ice/z_arrow_ice.o" - include "build/data/overlays/actors/z_arrow_ice.data.o" - include "build/data/overlays/actors/z_arrow_ice.rodata.o" - include "build/data/overlays/actors/z_arrow_ice.reloc.o" + include "build/src/overlays/actors/ovl_Arrow_Ice/z_arrow_ice_reloc.o" endseg beginseg name "ovl_Arrow_Light" include "build/src/overlays/actors/ovl_Arrow_Light/z_arrow_light.o" - include "build/data/overlays/actors/z_arrow_light.data.o" - include "build/data/overlays/actors/z_arrow_light.rodata.o" - include "build/data/overlays/actors/z_arrow_light.reloc.o" + include "build/src/overlays/actors/ovl_Arrow_Light/z_arrow_light_reloc.o" endseg beginseg @@ -797,17 +769,13 @@ endseg beginseg name "ovl_Bg_Gate_Shutter" include "build/src/overlays/actors/ovl_Bg_Gate_Shutter/z_bg_gate_shutter.o" - include "build/data/overlays/actors/z_bg_gate_shutter.data.o" - include "build/data/overlays/actors/z_bg_gate_shutter.rodata.o" - include "build/data/overlays/actors/z_bg_gate_shutter.reloc.o" + include "build/src/overlays/actors/ovl_Bg_Gate_Shutter/z_bg_gate_shutter_reloc.o" endseg beginseg name "ovl_Bg_Gjyo_Bridge" include "build/src/overlays/actors/ovl_Bg_Gjyo_Bridge/z_bg_gjyo_bridge.o" - include "build/data/overlays/actors/z_bg_gjyo_bridge.data.o" - include "build/data/overlays/actors/z_bg_gjyo_bridge.rodata.o" - include "build/data/overlays/actors/z_bg_gjyo_bridge.reloc.o" + include "build/src/overlays/actors/ovl_Bg_Gjyo_Bridge/z_bg_gjyo_bridge_reloc.o" endseg beginseg @@ -877,8 +845,7 @@ endseg beginseg name "ovl_Bg_Haka_Megane" include "build/src/overlays/actors/ovl_Bg_Haka_Megane/z_bg_haka_megane.o" - include "build/data/overlays/actors/z_bg_haka_megane.data.o" - include "build/data/overlays/actors/z_bg_haka_megane.reloc.o" + include "build/src/overlays/actors/ovl_Bg_Haka_Megane/z_bg_haka_megane_reloc.o" endseg beginseg @@ -1428,8 +1395,7 @@ endseg beginseg name "ovl_Bg_Spot05_Soko" include "build/src/overlays/actors/ovl_Bg_Spot05_Soko/z_bg_spot05_soko.o" - include "build/data/overlays/actors/z_bg_spot05_soko.data.o" - include "build/data/overlays/actors/z_bg_spot05_soko.reloc.o" + include "build/src/overlays/actors/ovl_Bg_Spot05_Soko/z_bg_spot05_soko_reloc.o" endseg beginseg @@ -1467,9 +1433,7 @@ endseg beginseg name "ovl_Bg_Spot09_Obj" include "build/src/overlays/actors/ovl_Bg_Spot09_Obj/z_bg_spot09_obj.o" - include "build/data/overlays/actors/z_bg_spot09_obj.data.o" - include "build/data/overlays/actors/z_bg_spot09_obj.rodata.o" - include "build/data/overlays/actors/z_bg_spot09_obj.reloc.o" + include "build/src/overlays/actors/ovl_Bg_Spot09_Obj/z_bg_spot09_obj_reloc.o" endseg beginseg @@ -1491,17 +1455,13 @@ endseg beginseg name "ovl_Bg_Spot12_Gate" include "build/src/overlays/actors/ovl_Bg_Spot12_Gate/z_bg_spot12_gate.o" - include "build/data/overlays/actors/z_bg_spot12_gate.data.o" - include "build/data/overlays/actors/z_bg_spot12_gate.rodata.o" - include "build/data/overlays/actors/z_bg_spot12_gate.reloc.o" + include "build/src/overlays/actors/ovl_Bg_Spot12_Gate/z_bg_spot12_gate_reloc.o" endseg beginseg name "ovl_Bg_Spot12_Saku" include "build/src/overlays/actors/ovl_Bg_Spot12_Saku/z_bg_spot12_saku.o" - include "build/data/overlays/actors/z_bg_spot12_saku.data.o" - include "build/data/overlays/actors/z_bg_spot12_saku.rodata.o" - include "build/data/overlays/actors/z_bg_spot12_saku.reloc.o" + include "build/src/overlays/actors/ovl_Bg_Spot12_Saku/z_bg_spot12_saku_reloc.o" endseg beginseg @@ -1598,9 +1558,7 @@ endseg beginseg name "ovl_Bg_Toki_Swd" include "build/src/overlays/actors/ovl_Bg_Toki_Swd/z_bg_toki_swd.o" - include "build/data/overlays/actors/z_bg_toki_swd.data.o" - include "build/data/overlays/actors/z_bg_toki_swd.rodata.o" - include "build/data/overlays/actors/z_bg_toki_swd.reloc.o" + include "build/src/overlays/actors/ovl_Bg_Toki_Swd/z_bg_toki_swd_reloc.o" endseg beginseg @@ -1651,9 +1609,7 @@ endseg beginseg name "ovl_Bg_Zg" include "build/src/overlays/actors/ovl_Bg_Zg/z_bg_zg.o" - include "build/data/overlays/actors/z_bg_zg.data.o" - include "build/data/overlays/actors/z_bg_zg.rodata.o" - include "build/data/overlays/actors/z_bg_zg.reloc.o" + include "build/src/overlays/actors/ovl_Bg_Zg/z_bg_zg_reloc.o" endseg beginseg @@ -1793,9 +1749,7 @@ endseg beginseg name "ovl_Demo_Geff" include "build/src/overlays/actors/ovl_Demo_Geff/z_demo_geff.o" - include "build/data/overlays/actors/z_demo_geff.data.o" - include "build/data/overlays/actors/z_demo_geff.rodata.o" - include "build/data/overlays/actors/z_demo_geff.reloc.o" + include "build/src/overlays/actors/ovl_Demo_Geff/z_demo_geff_reloc.o" endseg beginseg @@ -1880,9 +1834,7 @@ endseg beginseg name "ovl_Door_Ana" include "build/src/overlays/actors/ovl_Door_Ana/z_door_ana.o" - include "build/data/overlays/actors/z_door_ana.data.o" - include "build/data/overlays/actors/z_door_ana.rodata.o" - include "build/data/overlays/actors/z_door_ana.reloc.o" + include "build/src/overlays/actors/ovl_Door_Ana/z_door_ana_reloc.o" endseg beginseg @@ -2598,9 +2550,7 @@ endseg beginseg name "ovl_En_Dog" include "build/src/overlays/actors/ovl_En_Dog/z_en_dog.o" - include "build/data/overlays/actors/z_en_dog.data.o" - include "build/data/overlays/actors/z_en_dog.rodata.o" - include "build/data/overlays/actors/z_en_dog.reloc.o" + include "build/src/overlays/actors/ovl_En_Dog/z_en_dog_reloc.o" endseg beginseg @@ -2614,8 +2564,7 @@ endseg beginseg name "ovl_En_Ds" include "build/src/overlays/actors/ovl_En_Ds/z_en_ds.o" - include "build/data/overlays/actors/z_en_ds.data.o" - include "build/data/overlays/actors/z_en_ds.reloc.o" + include "build/src/overlays/actors/ovl_En_Ds/z_en_ds_reloc.o" endseg beginseg @@ -3186,9 +3135,7 @@ endseg beginseg name "ovl_En_Lightbox" include "build/src/overlays/actors/ovl_En_Lightbox/z_en_lightbox.o" - include "build/data/overlays/actors/z_en_lightbox.data.o" - include "build/data/overlays/actors/z_en_lightbox.rodata.o" - include "build/data/overlays/actors/z_en_lightbox.reloc.o" + include "build/src/overlays/actors/ovl_En_Lightbox/z_en_lightbox_reloc.o" endseg beginseg @@ -3503,9 +3450,7 @@ endseg beginseg name "ovl_En_Ru2" include "build/src/overlays/actors/ovl_En_Ru2/z_en_ru2.o" - include "build/data/overlays/actors/z_en_ru2.data.o" - include "build/data/overlays/actors/z_en_ru2.rodata.o" - include "build/data/overlays/actors/z_en_ru2.reloc.o" + include "build/src/overlays/actors/ovl_En_Ru2/z_en_ru2_reloc.o" endseg beginseg @@ -3671,9 +3616,7 @@ endseg beginseg name "ovl_En_Tana" include "build/src/overlays/actors/ovl_En_Tana/z_en_tana.o" - include "build/data/overlays/actors/z_en_tana.data.o" - include "build/data/overlays/actors/z_en_tana.rodata.o" - include "build/data/overlays/actors/z_en_tana.reloc.o" + include "build/src/overlays/actors/ovl_En_Tana/z_en_tana_reloc.o" endseg beginseg @@ -3695,9 +3638,7 @@ endseg beginseg name "ovl_En_Tk" include "build/src/overlays/actors/ovl_En_Tk/z_en_tk.o" - include "build/data/overlays/actors/z_en_tk.data.o" - include "build/data/overlays/actors/z_en_tk.rodata.o" - include "build/data/overlays/actors/z_en_tk.reloc.o" + include "build/src/overlays/actors/ovl_En_Tk/z_en_tk_reloc.o" endseg beginseg @@ -3803,7 +3744,7 @@ endseg beginseg name "ovl_En_Wallmas" include "build/src/overlays/actors/ovl_En_Wallmas/z_en_wallmas.o" - include "build/data/overlays/actors/z_en_wallmas.reloc.o" + include "build/src/overlays/actors/ovl_En_Wallmas/z_en_wallmas_reloc.o" endseg beginseg @@ -4050,16 +3991,13 @@ endseg beginseg name "ovl_Obj_Bombiwa" include "build/src/overlays/actors/ovl_Obj_Bombiwa/z_obj_bombiwa.o" - include "build/data/overlays/actors/z_obj_bombiwa.data.o" - include "build/data/overlays/actors/z_obj_bombiwa.reloc.o" + include "build/src/overlays/actors/ovl_Obj_Bombiwa/z_obj_bombiwa_reloc.o" endseg beginseg name "ovl_Obj_Comb" include "build/src/overlays/actors/ovl_Obj_Comb/z_obj_comb.o" - include "build/data/overlays/actors/z_obj_comb.data.o" - include "build/data/overlays/actors/z_obj_comb.rodata.o" - include "build/data/overlays/actors/z_obj_comb.reloc.o" + include "build/src/overlays/actors/ovl_Obj_Comb/z_obj_comb_reloc.o" endseg beginseg diff --git a/src/boot/assert.c b/src/boot/assert.c index dc09d1a1cc..00dcd4f344 100644 --- a/src/boot/assert.c +++ b/src/boot/assert.c @@ -1,7 +1,6 @@ #include -void __assert(const char* exp, const char* file, s32 line) -{ +void __assert(const char* exp, const char* file, s32 line) { char msg[256]; osSyncPrintf("Assertion failed: %s, file %s, line %d, thread %d\n", exp, file, line, osGetThreadId(NULL)); sprintf(msg, "ASSERT: %s:%d(%d)", file, line, osGetThreadId(NULL)); diff --git a/src/boot/boot_main.c b/src/boot/boot_main.c index f551d921be..06d4339195 100644 --- a/src/boot/boot_main.c +++ b/src/boot/boot_main.c @@ -7,14 +7,12 @@ u8 sIdleThreadStack[0x400]; StackEntry sIdleThreadInfo; u8 sBootThreadStack[0x400]; -void cleararena(void) -{ +void cleararena(void) { bzero(_dmadataSegmentStart, (u8*)osMemSize - OS_K0_TO_PHYSICAL(_dmadataSegmentStart)); } -void bootproc(void) -{ - StackCheck_Init(&sBootThreadInfo, sBootThreadStack, sBootThreadStack+sizeof(sBootThreadStack), 0, -1, "boot"); +void bootproc(void) { + StackCheck_Init(&sBootThreadInfo, sBootThreadStack, sBootThreadStack + sizeof(sBootThreadStack), 0, -1, "boot"); osMemSize = osGetMemSize(); cleararena(); @@ -25,8 +23,8 @@ void bootproc(void) osDriveRomInit(); isPrintfInit(); Locale_Init(); - - StackCheck_Init(&sIdleThreadInfo, sIdleThreadStack, sIdleThreadStack+sizeof(sIdleThreadStack), 0, 256, "idle"); - osCreateThread(&sIdleThread, 1, Idle_ThreadEntry, 0, sIdleThreadStack+sizeof(sIdleThreadStack), 10); + + StackCheck_Init(&sIdleThreadInfo, sIdleThreadStack, sIdleThreadStack + sizeof(sIdleThreadStack), 0, 256, "idle"); + osCreateThread(&sIdleThread, 1, Idle_ThreadEntry, 0, sIdleThreadStack + sizeof(sIdleThreadStack), 10); osStartThread(&sIdleThread); } diff --git a/src/boot/idle.c b/src/boot/idle.c index 7c6a9207aa..6ab012a4c3 100644 --- a/src/boot/idle.c +++ b/src/boot/idle.c @@ -17,15 +17,15 @@ u32 gViConfigFeatures = OS_VI_DITHER_FILTER_ON | OS_VI_GAMMA_OFF; f32 gViConfigXScale = 1.0; f32 gViConfigYScale = 1.0; -void Main_ThreadEntry(void* arg0) -{ +void Main_ThreadEntry(void* arg0) { OSTime var1; osSyncPrintf("mainx 実行開始\n"); DmaMgr_Start(); osSyncPrintf("codeセグメントロード中..."); var1 = osGetTime(); - DmaMgr_SendRequest1((u32)_dmadataSegmentEnd, (u32)_codeSegmentRomStart, _codeSegmentRomEnd - _codeSegmentRomStart, "../idle.c", 238); + DmaMgr_SendRequest1((u32)_dmadataSegmentEnd, (u32)_codeSegmentRomStart, _codeSegmentRomEnd - _codeSegmentRomStart, + "../idle.c", 238); var1 -= osGetTime(); osSyncPrintf("\rcodeセグメントロード中...完了\n"); osSyncPrintf("転送時間 %6.3f\n"); @@ -35,8 +35,7 @@ void Main_ThreadEntry(void* arg0) osSyncPrintf("mainx 実行終了\n"); } -void Idle_ThreadEntry(void* a0) -{ +void Idle_ThreadEntry(void* a0) { osSyncPrintf("アイドルスレッド(idleproc)実行開始\n"); osSyncPrintf("作製者 : %s\n", gBuildTeam); osSyncPrintf("作成日時 : %s\n", gBuildDate); @@ -57,8 +56,7 @@ void Idle_ThreadEntry(void* a0) gViConfigXScale = 1.0f; gViConfigYScale = 1.0f; - switch (osTvType) - { + switch (osTvType) { case 1: D_80013960 = 2; gViConfigMode = osViModeNtscLan1; @@ -82,11 +80,12 @@ void Idle_ThreadEntry(void* a0) osViBlack(1); osViSwapBuffer(0x803da80); osCreatePiManager(0x96, &gPiMgrCmdQ, sPiMgrCmdBuff, 0x32); - StackCheck_Init(&sMainStackInfo, sMainStack, sMainStack+sizeof(sMainStack), 0, 0x400, "main"); - osCreateThread(&sMainThread, 3, Main_ThreadEntry, a0, sMainStack+sizeof(sMainStack), 10); + StackCheck_Init(&sMainStackInfo, sMainStack, sMainStack + sizeof(sMainStack), 0, 0x400, "main"); + osCreateThread(&sMainThread, 3, Main_ThreadEntry, a0, sMainStack + sizeof(sMainStack), 10); osStartThread(&sMainThread); osSetThreadPri(NULL, 0); - while(1) + while (1) { ; + } } diff --git a/src/boot/is_debug.c b/src/boot/is_debug.c index 3f7a996b32..6214545275 100644 --- a/src/boot/is_debug.c +++ b/src/boot/is_debug.c @@ -1,82 +1,76 @@ #include #include -OSPiHandle* sISVHandle; //official name : is_Handle +OSPiHandle* sISVHandle; // official name : is_Handle #define gISVDbgPrnAdrs ((ISVDbg*)0xb3ff0000) #define ASCII_TO_U32(a, b, c, d) ((u32)((a << 24) | (b << 16) | (c << 8) | (d << 0))) -void isPrintfInit() -{ +void isPrintfInit() { sISVHandle = osCartRomInit(); osEPiWriteIo(sISVHandle, (u32)&gISVDbgPrnAdrs->put, 0); osEPiWriteIo(sISVHandle, (u32)&gISVDbgPrnAdrs->get, 0); - osEPiWriteIo(sISVHandle, (u32)&gISVDbgPrnAdrs->magic, ASCII_TO_U32('I','S','6','4')); + osEPiWriteIo(sISVHandle, (u32)&gISVDbgPrnAdrs->magic, ASCII_TO_U32('I', 'S', '6', '4')); } -void osSyncPrintfUnused(const char* fmt, ...) -{ +void osSyncPrintfUnused(const char* fmt, ...) { va_list args; va_start(args, fmt); _Printf(&is_proutSyncPrintf, NULL, fmt, args); } -void osSyncPrintf(const char* fmt, ...) -{ +void osSyncPrintf(const char* fmt, ...) { va_list args; va_start(args, fmt); _Printf(&is_proutSyncPrintf, NULL, fmt, args); } -//assumption -void rmonPrintf(const char* fmt, ...) -{ +// assumption +void rmonPrintf(const char* fmt, ...) { va_list args; va_start(args, fmt); _Printf(&is_proutSyncPrintf, NULL, fmt, args); } -u32 is_proutSyncPrintf(void* arg0, const char *str, s32 count) -{ +u32 is_proutSyncPrintf(void* arg0, const char* str, s32 count) { u32 data; s32 pos; s32 start; s32 end; osEPiReadIo(sISVHandle, (u32)&gISVDbgPrnAdrs->magic, &data); - if (data != ASCII_TO_U32('I','S','6','4')) + if (data != ASCII_TO_U32('I', 'S', '6', '4')) { return 1; + } osEPiReadIo(sISVHandle, (u32)&gISVDbgPrnAdrs->get, &data); pos = data; osEPiReadIo(sISVHandle, (u32)&gISVDbgPrnAdrs->put, &data); start = data; end = start + count; - if (end >= 0xffe0) - { + if (end >= 0xffe0) { end -= 0xffe0; - if (pos < end || start < pos) + if (pos < end || start < pos) { return 1; - } - else - { - if (start < pos && pos < end) + } + } else { + if (start < pos && pos < end) { return 1; + } } - while (count) - { + while (count) { u32 addr = (u32)&gISVDbgPrnAdrs->data + (start & 0xffffffc); s32 shift = ((3 - (start & 3)) * 8); - if (*str) - { + if (*str) { osEPiReadIo(sISVHandle, addr, &data); osEPiWriteIo(sISVHandle, addr, (*str << shift) | (data & ~(0xff << shift))); start++; - if (start >= 0xffe0) + if (start >= 0xffe0) { start -= 0xffe0; + } } count--; str++; @@ -85,9 +79,9 @@ u32 is_proutSyncPrintf(void* arg0, const char *str, s32 count) return 1; } -void func_80002384(const char* exp, const char* file, u32 line) -{ +void func_80002384(const char* exp, const char* file, u32 line) { osSyncPrintf("File:%s Line:%d %s \n", file, line, exp); - while (true) + while (true) { ; + } } diff --git a/src/boot/logutils.c b/src/boot/logutils.c index 9d0022824e..693109d324 100644 --- a/src/boot/logutils.c +++ b/src/boot/logutils.c @@ -2,22 +2,25 @@ #include #include -float LogUtils_CheckFloatRange(const char* exp, s32 arg1, const char* var1Name, float var1, const char* var2Name, float var2, const char* var3Name, float var3) -{ - if (var1 < var2 || var3 < var1) - osSyncPrintf("%s %d: range error %s(%f) < %s(%f) < %s(%f)\n", exp, arg1, var2Name, var2, var1Name, var1, var3Name, var3); +float LogUtils_CheckFloatRange(const char* exp, s32 arg1, const char* var1Name, float var1, const char* var2Name, + float var2, const char* var3Name, float var3) { + if (var1 < var2 || var3 < var1) { + osSyncPrintf("%s %d: range error %s(%f) < %s(%f) < %s(%f)\n", exp, arg1, var2Name, var2, var1Name, var1, + var3Name, var3); + } return var1; } -s32 LogUtils_CheckIntRange(const char* exp, s32 arg1, const char* var1Name, s32 var1, const char* var2Name, s32 var2, const char* var3Name, s32 var3) -{ - if (var1 < var2 || var3 < var1) - osSyncPrintf("%s %d: range error %s(%d) < %s(%d) < %s(%d)\n", exp, arg1, var2Name, var2, var1Name, var1, var3Name, var3); +s32 LogUtils_CheckIntRange(const char* exp, s32 arg1, const char* var1Name, s32 var1, const char* var2Name, s32 var2, + const char* var3Name, s32 var3) { + if (var1 < var2 || var3 < var1) { + osSyncPrintf("%s %d: range error %s(%d) < %s(%d) < %s(%d)\n", exp, arg1, var2Name, var2, var1Name, var1, + var3Name, var3); + } return var1; } -void LogUtils_LogHexDump(void* ptr, s32 size0) -{ +void LogUtils_LogHexDump(void* ptr, s32 size0) { u8* addr = (u8*)ptr; s32 size = (s32)size0; s32 rest; @@ -28,40 +31,39 @@ void LogUtils_LogHexDump(void* ptr, s32 size0) osSyncPrintf("address off +0 +1 +2 +3 +4 +5 +6 +7 +8 +9 +a +b +c +d +e +f 0123456789abcdef\n"); off = 0; - while (size > 0) - { + while (size > 0) { osSyncPrintf("%08x %04x", addr, off); rest = (size < 0x10) ? size : 0x10; i = 0; - while (true) - { - if(i < rest) + while (true) { + if (i < rest) { osSyncPrintf(" %02x", *((u8*)addr + i)); - else + } else { osSyncPrintf(" "); + } i++; - if (i > 0xf) + if (i > 0xf) { break; + } } osSyncPrintf(" "); i = 0; - while (true) - { - if(i < rest) - { - u8 a = *(addr+i); + while (true) { + if (i < rest) { + u8 a = *(addr + i); osSyncPrintf("%c", (a >= 0x20 && a < 0x7f) ? a : '.'); - } - else + } else { osSyncPrintf(" "); + } i++; - if (i > 0xf) + if (i > 0xf) { break; + } } osSyncPrintf("\n"); size -= rest; @@ -70,46 +72,42 @@ void LogUtils_LogHexDump(void* ptr, s32 size0) } } -void LogUtils_LogPointer(s32 value, u32 max, void* ptr, const char *name, const char *file, s32 line) -{ +void LogUtils_LogPointer(s32 value, u32 max, void* ptr, const char* name, const char* file, s32 line) { osSyncPrintf(VT_COL(RED, WHITE) "%s %d %s[%d] max=%u ptr=%08x\n" VT_RST, file, line, name, value, max, ptr); } -void LogUtils_CheckBoundary(const char* name, s32 value, s32 unk, const char* file, s32 line) -{ - u32 mask = (unk - 1); - if (value & mask) - osSyncPrintf(VT_COL(RED, WHITE) "%s %d:%s(%08x) は バウンダリ(%d)違反です\n" VT_RST, file, line, name, value, unk); +void LogUtils_CheckBoundary(const char* name, s32 value, s32 unk, const char* file, s32 line) { + u32 mask = (unk - 1); + if (value & mask) { + osSyncPrintf(VT_COL(RED, WHITE) "%s %d:%s(%08x) は バウンダリ(%d)違反です\n" VT_RST, file, line, name, value, + unk); + } } -void LogUtils_CheckNullPointer(const char* exp, void* ptr, const char* file, s32 line) -{ - if (!ptr) +void LogUtils_CheckNullPointer(const char* exp, void* ptr, const char* file, s32 line) { + if (!ptr) { osSyncPrintf(VT_COL(RED, WHITE) "%s %d:%s は はヌルポインタです\n" VT_RST, file, line, exp); + } } -//check valid pointer -void LogUtils_CheckValidPointer(const char* exp, void* ptr0, const char* file, s32 line) -{ +// check valid pointer +void LogUtils_CheckValidPointer(const char* exp, void* ptr0, const char* file, s32 line) { u32 ptr = (u32)ptr0; - if (!ptr || ptr < 0x80000000U || (0x80000000U + osMemSize) <= ptr) + if (!ptr || ptr < 0x80000000U || (0x80000000U + osMemSize) <= ptr) { osSyncPrintf(VT_COL(RED, WHITE) "%s %d:ポインタ %s(%08x) が異常です\n" VT_RST, file, line, exp, ptr); + } } -//there's probalby a macro like this : MACRO(exp) LogUtils_LogThreadId(__FILE__, __LINE__); osSyncPrintf(exp) -void LogUtils_LogThreadId(const char* name, s32 line) -{ +void LogUtils_LogThreadId(const char* name, s32 line) { osSyncPrintf("<%d %s %d>", osGetThreadId(NULL), name, line); } -void LogUtils_HungupThread(const char* name, s32 line) -{ +void LogUtils_HungupThread(const char* name, s32 line) { osSyncPrintf("*** HungUp in thread %d, [%s:%d] ***\n", osGetThreadId(NULL), name, line); Fault_AddHungupAndCrash(name, line); } -void LogUtils_ResetHungup() -{ +void LogUtils_ResetHungup() { osSyncPrintf("*** Reset ***\n"); Fault_AddHungupAndCrash("Reset", 0); -} \ No newline at end of file +} diff --git a/src/boot/stackcheck.c b/src/boot/stackcheck.c index d8d0b8fe2d..2ea3fad41b 100644 --- a/src/boot/stackcheck.c +++ b/src/boot/stackcheck.c @@ -5,137 +5,130 @@ StackEntry* sStackInfoListStart = NULL; StackEntry* sStackInfoListEnd = NULL; -void StackCheck_Init(StackEntry* entry, void* stackTop, void* stackBottom, u32 initValue, s32 minSpace, const char* name) -{ +void StackCheck_Init(StackEntry* entry, void* stackTop, void* stackBottom, u32 initValue, s32 minSpace, + const char* name) { StackEntry* iter; u32* addr; - if (!entry) + if (!entry) { sStackInfoListStart = NULL; - else - { + } else { entry->head = (u32)stackTop; entry->tail = (u32)stackBottom; entry->initValue = initValue; entry->minSpace = minSpace; entry->name = name; iter = sStackInfoListStart; - while (iter) - { - if (iter == entry) - { + while (iter) { + if (iter == entry) { osSyncPrintf(VT_COL(RED, WHITE) "stackcheck_init: %08x は既にリスト中にある\n" VT_RST, entry); return; } iter = iter->next; } - + entry->prev = sStackInfoListEnd; entry->next = NULL; - - if (sStackInfoListEnd) + + if (sStackInfoListEnd) { sStackInfoListEnd->next = entry; + } sStackInfoListEnd = entry; - if (!sStackInfoListStart) + if (!sStackInfoListStart) { sStackInfoListStart = entry; + } - if (entry->minSpace != -1) - { + if (entry->minSpace != -1) { addr = (u32*)entry->head; - while ((u32)addr < entry->tail) + while ((u32)addr < entry->tail) { *addr++ = entry->initValue; + } } } } -void StackCheck_Cleanup(StackEntry* entry) -{ +void StackCheck_Cleanup(StackEntry* entry) { bool inconsistency = false; - if (!entry->prev) - { - if (entry == sStackInfoListStart) + if (!entry->prev) { + if (entry == sStackInfoListStart) { sStackInfoListStart = entry->next; - else + } else { inconsistency = true; - } - else + } + } else { entry->prev->next = entry->next; - - if (!entry->next) - { - if (entry == sStackInfoListEnd) - sStackInfoListEnd = entry->prev; - else - inconsistency = true; } - if (inconsistency) + + if (!entry->next) { + if (entry == sStackInfoListEnd) { + sStackInfoListEnd = entry->prev; + } else { + inconsistency = true; + } + } + if (inconsistency) { osSyncPrintf(VT_COL(RED, WHITE) "stackcheck_cleanup: %08x リスト不整合です\n" VT_RST, entry); + } } -StackStatus StackCheck_GetState(StackEntry* entry) -{ +StackStatus StackCheck_GetState(StackEntry* entry) { u32* last; u32 used; u32 free; s32 ret; - for (last = (u32*)entry->head; (u32)last < entry->tail; last++) - { - if (entry->initValue != *last) + for (last = (u32*)entry->head; (u32)last < entry->tail; last++) { + if (entry->initValue != *last) { break; + } } used = entry->tail - (u32)last; free = (u32)last - entry->head; - if (free == 0) - { + if (free == 0) { ret = STACK_STATUS_OVERFLOW; osSyncPrintf(VT_FGCOL(RED)); - } - else if (free < entry->minSpace && entry->minSpace != -1) - { + } else if (free < entry->minSpace && entry->minSpace != -1) { ret = STACK_STATUS_WARNING; osSyncPrintf(VT_FGCOL(YELLOW)); - } - else - { + } else { osSyncPrintf(VT_FGCOL(GREEN)); ret = STACK_STATUS_OK; } - osSyncPrintf("head=%08x tail=%08x last=%08x used=%08x free=%08x [%s]\n", entry->head, entry->tail, last, used, free, entry->name ? entry->name : "(null)"); + osSyncPrintf("head=%08x tail=%08x last=%08x used=%08x free=%08x [%s]\n", entry->head, entry->tail, last, used, free, + entry->name ? entry->name : "(null)"); osSyncPrintf(VT_RST); - if (ret != STACK_STATUS_OK) + if (ret != STACK_STATUS_OK) { LogUtils_LogHexDump(entry->head, entry->tail - entry->head); + } return ret; } - -u32 StackCheck_CheckAll() -{ +u32 StackCheck_CheckAll() { u32 ret = 0; StackEntry* iter = sStackInfoListStart; - while(iter) - { + while (iter) { u32 state = StackCheck_GetState(iter); - if (state != STACK_STATUS_OK) + if (state != STACK_STATUS_OK) { ret = 1; + } iter = iter->next; } return ret; } -u32 StackCheck_Check(StackEntry* entry) -{ - if (!entry) +u32 StackCheck_Check(StackEntry* entry) { + if (!entry) { return StackCheck_CheckAll(); - else + } else { return StackCheck_GetState(entry); + } } diff --git a/src/boot/viconfig.c b/src/boot/viconfig.c index 9fe1efd40e..a31aa45371 100644 --- a/src/boot/viconfig.c +++ b/src/boot/viconfig.c @@ -2,35 +2,34 @@ #include #include -//this should probably go elsewhere but right now viconfig.o is the only object between idle and z_std_dma +// this should probably go elsewhere but right now viconfig.o is the only object between idle and z_std_dma OSPiHandle* gCartHandle = 0; -void ViConfig_UpdateVi(u32 arg0) -{ - if (arg0 != 0) - { +void ViConfig_UpdateVi(u32 arg0) { + if (arg0 != 0) { osSyncPrintf(VT_COL(YELLOW, BLACK) "osViSetYScale1(%f);\n" VT_RST, 1.0f); - if (osTvType == 0) + if (osTvType == 0) { osViSetMode(&osViModePalLan1); + } osViSetYScale(1.0f); - } - else - { + } else { osViSetMode(&gViConfigMode); - if (gViConfigAdditionalScanLines != 0) + if (gViConfigAdditionalScanLines != 0) { osViExtendVStart(gViConfigAdditionalScanLines); + } - if (gViConfigFeatures != 0) + if (gViConfigFeatures != 0) { osViSetSpecialFeatures(gViConfigFeatures); + } - if (gViConfigXScale != 1.0f) + if (gViConfigXScale != 1.0f) { osViSetXScale(gViConfigXScale); + } - if (gViConfigYScale != 1.0f) - { + if (gViConfigYScale != 1.0f) { osSyncPrintf(VT_COL(YELLOW, BLACK) "osViSetYScale3(%f);\n" VT_RST, gViConfigYScale); osViSetYScale(gViConfigYScale); } @@ -39,10 +38,10 @@ void ViConfig_UpdateVi(u32 arg0) gViConfigUseDefault = arg0; } -void ViConfig_UpdateBlack() -{ - if (gViConfigUseDefault != 0) +void ViConfig_UpdateBlack() { + if (gViConfigUseDefault != 0) { osViBlack(1); - else + } else { osViBlack(0); + } } diff --git a/src/boot/yaz0.c b/src/boot/yaz0.c index 03f4a720e0..379d4ca467 100644 --- a/src/boot/yaz0.c +++ b/src/boot/yaz0.c @@ -7,61 +7,51 @@ u32 sYaz0CurRomStart; u32 sYaz0CurSize; u32 sYaz0MaxPtr; -void* Yaz0_FirstDMA() -{ +void* Yaz0_FirstDMA() { u32 pad0; u32 pad1; u32 dmaSize; u32 curSize; sYaz0MaxPtr = sYaz0CurDataEnd - 0x19; - + curSize = sYaz0CurDataEnd - (u32)sYaz0DataBuffer; - dmaSize = (curSize > sYaz0CurSize) - ? sYaz0CurSize - : curSize; - + dmaSize = (curSize > sYaz0CurSize) ? sYaz0CurSize : curSize; + DmaMgr_DMARomToRam(sYaz0CurRomStart, sYaz0DataBuffer, dmaSize); sYaz0CurRomStart += dmaSize; sYaz0CurSize -= dmaSize; return sYaz0DataBuffer; } -void* Yaz0_NextDMA(void* curSrcPos) -{ +void* Yaz0_NextDMA(void* curSrcPos) { u8* dst; u32 restSize; u32 dmaSize; restSize = sYaz0CurDataEnd - (u32)curSrcPos; - dst = (restSize & 7) - ? (sYaz0DataBuffer - (restSize & 7)) + 8 - : sYaz0DataBuffer; + dst = (restSize & 7) ? (sYaz0DataBuffer - (restSize & 7)) + 8 : sYaz0DataBuffer; bcopy(curSrcPos, dst, restSize); dmaSize = (sYaz0CurDataEnd - (u32)dst) - restSize; - if (sYaz0CurSize < dmaSize) + if (sYaz0CurSize < dmaSize) { dmaSize = sYaz0CurSize; + } - if (dmaSize != 0) - { + if (dmaSize != 0) { DmaMgr_DMARomToRam(sYaz0CurRomStart, (u32)dst + restSize, dmaSize); sYaz0CurRomStart += dmaSize; sYaz0CurSize -= dmaSize; - if (!sYaz0CurSize) + if (!sYaz0CurSize) { sYaz0MaxPtr = (u32)dst + restSize + dmaSize; + } } return dst; } -#ifdef NON_MATCHING -// has an extra check at the start of the small compressed loop -// along with an extra move instruction -// maybe some regalloc differences besides these issues -void Yaz0_DecompressImpl(Yaz0Header* hdr, u8* dst) -{ +void Yaz0_DecompressImpl(Yaz0Header* hdr, u8* dst) { u32 bitIdx; u8* src; u8* dstEnd; @@ -69,54 +59,47 @@ void Yaz0_DecompressImpl(Yaz0Header* hdr, u8* dst) u32 nibble; u8* backPtr; s32 chunkSize; - u32 curDecBit; u32 off; bitIdx = 0; - src = hdr->data; + src = (u8*)hdr->data; dstEnd = dst + hdr->decSize; - do - { - if (bitIdx == 0) - { - if ((sYaz0MaxPtr < (u32)src) && (sYaz0CurSize != 0)) + do { + if (bitIdx == 0) { + if ((sYaz0MaxPtr < (u32)src) && (sYaz0CurSize != 0)) { src = Yaz0_NextDMA(src); + } chunkHeader = *src++; bitIdx = 8; } - curDecBit = chunkHeader & (1 << 7); - chunkHeader <<= 1; - - if (curDecBit) // uncompressed - { - *dst++ = *src++; - } - else // compressed - { + if (chunkHeader & (1 << 7)) { // uncompressed + *dst = *src; + dst++; + src++; + } else { // compressed + off = ((*src & 0xF) << 8 | *(src + 1)); nibble = *src >> 4; - backPtr = dst - (*(src + 1) | (*src & 0xF) << 8); + backPtr = dst - off; src += 2; - chunkSize = (nibble == 0) // N = chunkSize; B = back offset - ? *src++ + 0x12 // 3 bytes 0B BB NN - : nibble + 2; // 2 bytes NB BB + chunkSize = (nibble == 0) // N = chunkSize; B = back offset + ? *src++ + 0x12 // 3 bytes 0B BB NN + : nibble + 2; // 2 bytes NB BB - for (off = chunkSize; off > 0; off--) + do { *dst++ = *(backPtr++ - 1); + chunkSize--; + } while (chunkSize != 0); } - + chunkHeader <<= 1; bitIdx--; } while (dst != dstEnd); } -#else -#pragma GLOBAL_ASM("asm/non_matchings/boot/yaz0/Yaz0_DecompressImpl.s") -#endif -void Yaz0_Decompress(u32 romStart, void* dst, u32 size) -{ +void Yaz0_Decompress(u32 romStart, void* dst, u32 size) { sYaz0CurRomStart = romStart; sYaz0CurSize = size; sYaz0CurDataEnd = sYaz0DataBuffer + sizeof(sYaz0DataBuffer); diff --git a/src/boot/z_locale.c b/src/boot/z_locale.c index ecd8ce1df9..4d2956e3ed 100644 --- a/src/boot/z_locale.c +++ b/src/boot/z_locale.c @@ -6,16 +6,14 @@ u32 gCurrentRegion = 0; LocaleCartInfo sCartInfo; -//temporary +// temporary extern PadMgr gPadMgr; -void Locale_Init() -{ +void Locale_Init() { osEPiReadIo(gCartHandle, 0x38, &sCartInfo.mediaFormat); osEPiReadIo(gCartHandle, 0x3C, &sCartInfo.regionInfo); - switch (sCartInfo.countryCode) - { + switch (sCartInfo.countryCode) { case 'J': // "NTSC-U (North America)" gCurrentRegion = REGION_US; break; @@ -36,39 +34,39 @@ void Locale_Init() osSyncPrintf("z_locale_init:日本用かアメリカ用か３コンで判断させる\n"); } -void Locale_ResetRegion() -{ +void Locale_ResetRegion() { gCurrentRegion = REGION_NULL; } -u32 func_80001F48() -{ - PadMgr* padMgr = (PadMgr*)(u32)&gPadMgr; //cast required to match +u32 func_80001F48() { + PadMgr* padMgr = (PadMgr*)(u32)&gPadMgr; // cast required to match - if (gCurrentRegion == REGION_NATIVE) + if (gCurrentRegion == REGION_NATIVE) { return 0; + } - if (padMgr->unk_2A8 & 4) + if (padMgr->unk_2A8 & 4) { return 0; + } return 1; } -u32 func_80001F8C() -{ - PadMgr* padMgr = (PadMgr*)(u32)&gPadMgr; //cast required to match +u32 func_80001F8C() { + PadMgr* padMgr = (PadMgr*)(u32)&gPadMgr; // cast required to match - if (gCurrentRegion == REGION_NATIVE) + if (gCurrentRegion == REGION_NATIVE) { return 0; + } - if (padMgr->unk_2A8 & 4) + if (padMgr->unk_2A8 & 4) { return 1; + } return 0; } // This function appears to be unused? -u32 Locale_IsRegionNative() -{ +u32 Locale_IsRegionNative() { return gCurrentRegion == REGION_NATIVE; } diff --git a/src/boot/z_std_dma.c b/src/boot/z_std_dma.c index 39618b8aba..f5d01333a0 100644 --- a/src/boot/z_std_dma.c +++ b/src/boot/z_std_dma.c @@ -13,1564 +13,1563 @@ s32 sDmaMgrCurFileLine; u32 D_80009460 = 0; u32 sDmaMgrDmaBuffSize = 0x2000; u32 sDmaMgrDataExistError = 0; -const char* sDmaMgrFileNames[0x5FC] = -{ - "makerom", - "boot", - "dmadata", - "Audiobank", - "Audioseq", - "Audiotable", - "link_animetion", - "icon_item_static", - "icon_item_24_static", - "icon_item_field_static", - "icon_item_dungeon_static", - "icon_item_gameover_static", - "icon_item_nes_static", - "icon_item_ger_static", - "icon_item_fra_static", - "item_name_static", - "map_name_static", - "do_action_static", - "message_static", - "message_texture_static", - "nes_font_static", - "nes_message_data_static", - "ger_message_data_static", - "fra_message_data_static", - "staff_message_data_static", - "map_grand_static", - "map_i_static", - "map_48x85_static", - "code", - "ovl_title", - "ovl_select", - "ovl_opening", - "ovl_file_choose", - "ovl_kaleido_scope", - "ovl_player_actor", - "ovl_map_mark_data", - "ovl_En_Test", - "ovl_Arms_Hook", - "ovl_Arrow_Fire", - "ovl_Arrow_Ice", - "ovl_Arrow_Light", - "ovl_Bg_Bdan_Objects", - "ovl_Bg_Bdan_Switch", - "ovl_Bg_Bom_Guard", - "ovl_Bg_Bombwall", - "ovl_Bg_Bowl_Wall", - "ovl_Bg_Breakwall", - "ovl_Bg_Ddan_Jd", - "ovl_Bg_Ddan_Kd", - "ovl_Bg_Dodoago", - "ovl_Bg_Dy_Yoseizo", - "ovl_Bg_Ganon_Otyuka", - "ovl_Bg_Gate_Shutter", - "ovl_Bg_Gjyo_Bridge", - "ovl_Bg_Gnd_Darkmeiro", - "ovl_Bg_Gnd_Firemeiro", - "ovl_Bg_Gnd_Iceblock", - "ovl_Bg_Gnd_Nisekabe", - "ovl_Bg_Gnd_Soulmeiro", - "ovl_Bg_Haka", - "ovl_Bg_Haka_Gate", - "ovl_Bg_Haka_Huta", - "ovl_Bg_Haka_Megane", - "ovl_Bg_Haka_MeganeBG", - "ovl_Bg_Haka_Sgami", - "ovl_Bg_Haka_Ship", - "ovl_Bg_Haka_Trap", - "ovl_Bg_Haka_Tubo", - "ovl_Bg_Haka_Water", - "ovl_Bg_Haka_Zou", - "ovl_Bg_Heavy_Block", - "ovl_Bg_Hidan_Curtain", - "ovl_Bg_Hidan_Dalm", - "ovl_Bg_Hidan_Firewall", - "ovl_Bg_Hidan_Fslift", - "ovl_Bg_Hidan_Fwbig", - "ovl_Bg_Hidan_Hamstep", - "ovl_Bg_Hidan_Hrock", - "ovl_Bg_Hidan_Kousi", - "ovl_Bg_Hidan_Kowarerukabe", - "ovl_Bg_Hidan_Rock", - "ovl_Bg_Hidan_Rsekizou", - "ovl_Bg_Hidan_Sekizou", - "ovl_Bg_Hidan_Sima", - "ovl_Bg_Hidan_Syoku", - "ovl_Bg_Ice_Objects", - "ovl_Bg_Ice_Shelter", - "ovl_Bg_Ice_Shutter", - "ovl_Bg_Ice_Turara", - "ovl_Bg_Ingate", - "ovl_Bg_Jya_1flift", - "ovl_Bg_Jya_Amishutter", - "ovl_Bg_Jya_Bigmirror", - "ovl_Bg_Jya_Block", - "ovl_Bg_Jya_Bombchuiwa", - "ovl_Bg_Jya_Bombiwa", - "ovl_Bg_Jya_Cobra", - "ovl_Bg_Jya_Goroiwa", - "ovl_Bg_Jya_Haheniron", - "ovl_Bg_Jya_Ironobj", - "ovl_Bg_Jya_Kanaami", - "ovl_Bg_Jya_Lift", - "ovl_Bg_Jya_Megami", - "ovl_Bg_Jya_Zurerukabe", - "ovl_Bg_Menkuri_Eye", - "ovl_Bg_Menkuri_Kaiten", - "ovl_Bg_Menkuri_Nisekabe", - "ovl_Bg_Mizu_Bwall", - "ovl_Bg_Mizu_Movebg", - "ovl_Bg_Mizu_Shutter", - "ovl_Bg_Mizu_Uzu", - "ovl_Bg_Mizu_Water", - "ovl_Bg_Mjin", - "ovl_Bg_Mori_Bigst", - "ovl_Bg_Mori_Elevator", - "ovl_Bg_Mori_Hashigo", - "ovl_Bg_Mori_Hashira4", - "ovl_Bg_Mori_Hineri", - "ovl_Bg_Mori_Idomizu", - "ovl_Bg_Mori_Kaitenkabe", - "ovl_Bg_Mori_Rakkatenjo", - "ovl_Bg_Po_Event", - "ovl_Bg_Po_Syokudai", - "ovl_Bg_Pushbox", - "ovl_Bg_Relay_Objects", - "ovl_Bg_Spot00_Break", - "ovl_Bg_Spot00_Hanebasi", - "ovl_Bg_Spot01_Fusya", - "ovl_Bg_Spot01_Idohashira", - "ovl_Bg_Spot01_Idomizu", - "ovl_Bg_Spot01_Idosoko", - "ovl_Bg_Spot01_Objects2", - "ovl_Bg_Spot02_Objects", - "ovl_Bg_Spot03_Taki", - "ovl_Bg_Spot05_Soko", - "ovl_Bg_Spot06_Objects", - "ovl_Bg_Spot07_Taki", - "ovl_Bg_Spot08_Bakudankabe", - "ovl_Bg_Spot08_Iceblock", - "ovl_Bg_Spot09_Obj", - "ovl_Bg_Spot11_Bakudankabe", - "ovl_Bg_Spot11_Oasis", - "ovl_Bg_Spot12_Gate", - "ovl_Bg_Spot12_Saku", - "ovl_Bg_Spot15_Rrbox", - "ovl_Bg_Spot15_Saku", - "ovl_Bg_Spot16_Bombstone", - "ovl_Bg_Spot16_Doughnut", - "ovl_Bg_Spot17_Bakudankabe", - "ovl_Bg_Spot17_Funen", - "ovl_Bg_Spot18_Basket", - "ovl_Bg_Spot18_Futa", - "ovl_Bg_Spot18_Obj", - "ovl_Bg_Spot18_Shutter", - "ovl_Bg_Sst_Floor", - "ovl_Bg_Toki_Hikari", - "ovl_Bg_Toki_Swd", - "ovl_Bg_Treemouth", - "ovl_Bg_Umajump", - "ovl_Bg_Vb_Sima", - "ovl_Bg_Ydan_Hasi", - "ovl_Bg_Ydan_Maruta", - "ovl_Bg_Ydan_Sp", - "ovl_Bg_Zg", - "ovl_Boss_Dodongo", - "ovl_Boss_Fd", - "ovl_Boss_Fd2", - "ovl_Boss_Ganon", - "ovl_Boss_Ganon2", - "ovl_Boss_Ganondrof", - "ovl_Boss_Goma", - "ovl_Boss_Mo", - "ovl_Boss_Sst", - "ovl_Boss_Tw", - "ovl_Boss_Va", - "ovl_Demo_6K", - "ovl_Demo_Du", - "ovl_Demo_Ec", - "ovl_Demo_Effect", - "ovl_Demo_Ext", - "ovl_Demo_Geff", - "ovl_Demo_Gj", - "ovl_Demo_Go", - "ovl_Demo_Gt", - "ovl_Demo_Ik", - "ovl_Demo_Im", - "ovl_Demo_Kankyo", - "ovl_Demo_Kekkai", - "ovl_Demo_Sa", - "ovl_Demo_Shd", - "ovl_Demo_Tre_Lgt", - "ovl_Door_Ana", - "ovl_Door_Gerudo", - "ovl_Door_Killer", - "ovl_Door_Shutter", - "ovl_Door_Toki", - "ovl_Door_Warp1", - "ovl_Efc_Erupc", - "ovl_Eff_Dust", - "ovl_Effect_Ss_Blast", - "ovl_Effect_Ss_Bomb", - "ovl_Effect_Ss_Bomb2", - "ovl_Effect_Ss_Bubble", - "ovl_Effect_Ss_D_Fire", - "ovl_Effect_Ss_Dead_Db", - "ovl_Effect_Ss_Dead_Dd", - "ovl_Effect_Ss_Dead_Ds", - "ovl_Effect_Ss_Dead_Sound", - "ovl_Effect_Ss_Dt_Bubble", - "ovl_Effect_Ss_Dust", - "ovl_Effect_Ss_En_Fire", - "ovl_Effect_Ss_En_Ice", - "ovl_Effect_Ss_Extra", - "ovl_Effect_Ss_Fcircle", - "ovl_Effect_Ss_Fhg_Flash", - "ovl_Effect_Ss_Fire_Tail", - "ovl_Effect_Ss_G_Fire", - "ovl_Effect_Ss_G_Magma", - "ovl_Effect_Ss_G_Magma2", - "ovl_Effect_Ss_G_Ripple", - "ovl_Effect_Ss_G_Spk", - "ovl_Effect_Ss_G_Splash", - "ovl_Effect_Ss_Hahen", - "ovl_Effect_Ss_HitMark", - "ovl_Effect_Ss_Ice_Piece", - "ovl_Effect_Ss_Ice_Smoke", - "ovl_Effect_Ss_K_Fire", - "ovl_Effect_Ss_Kakera", - "ovl_Effect_Ss_KiraKira", - "ovl_Effect_Ss_Lightning", - "ovl_Effect_Ss_Sibuki", - "ovl_Effect_Ss_Sibuki2", - "ovl_Effect_Ss_Solder_Srch_Ball", - "ovl_Effect_Ss_Stick", - "ovl_Effect_Ss_Stone1", - "ovl_Elf_Msg", - "ovl_Elf_Msg2", - "ovl_En_Am", - "ovl_En_Ani", - "ovl_En_Anubice", - "ovl_En_Anubice_Fire", - "ovl_En_Anubice_Tag", - "ovl_En_Arow_Trap", - "ovl_En_Arrow", - "ovl_En_Attack_Niw", - "ovl_En_Ba", - "ovl_En_Bb", - "ovl_En_Bdfire", - "ovl_En_Bigokuta", - "ovl_En_Bili", - "ovl_En_Bird", - "ovl_En_Blkobj", - "ovl_En_Bom", - "ovl_En_Bom_Bowl_Man", - "ovl_En_Bom_Bowl_Pit", - "ovl_En_Bom_Chu", - "ovl_En_Bombf", - "ovl_En_Boom", - "ovl_En_Box", - "ovl_En_Brob", - "ovl_En_Bubble", - "ovl_En_Butte", - "ovl_En_Bw", - "ovl_En_Bx", - "ovl_En_Changer", - "ovl_En_Clear_Tag", - "ovl_En_Cow", - "ovl_En_Crow", - "ovl_En_Cs", - "ovl_En_Daiku", - "ovl_En_Daiku_Kakariko", - "ovl_En_Dekubaba", - "ovl_En_Dekunuts", - "ovl_En_Dh", - "ovl_En_Dha", - "ovl_En_Diving_Game", - "ovl_En_Dns", - "ovl_En_Dnt_Demo", - "ovl_En_Dnt_Jiji", - "ovl_En_Dnt_Nomal", - "ovl_En_Dodojr", - "ovl_En_Dodongo", - "ovl_En_Dog", - "ovl_En_Door", - "ovl_En_Ds", - "ovl_En_Du", - "ovl_En_Dy_Extra", - "ovl_En_Eg", - "ovl_En_Eiyer", - "ovl_En_Elf", - "ovl_En_Encount1", - "ovl_En_Encount2", - "ovl_En_Ex_Item", - "ovl_En_Ex_Ruppy", - "ovl_En_Fd", - "ovl_En_Fd_Fire", - "ovl_En_Fhg_Fire", - "ovl_En_Fire_Rock", - "ovl_En_Firefly", - "ovl_En_Fish", - "ovl_En_Floormas", - "ovl_En_Fr", - "ovl_En_Fu", - "ovl_En_Fw", - "ovl_En_Fz", - "ovl_En_G_Switch", - "ovl_En_Ganon_Mant", - "ovl_En_Ganon_Organ", - "ovl_En_Gb", - "ovl_En_Ge1", - "ovl_En_Ge2", - "ovl_En_Ge3", - "ovl_En_GeldB", - "ovl_En_GirlA", - "ovl_En_Gm", - "ovl_En_Go", - "ovl_En_Go2", - "ovl_En_Goma", - "ovl_En_Goroiwa", - "ovl_En_Gs", - "ovl_En_Guest", - "ovl_En_Hata", - "ovl_En_Heishi1", - "ovl_En_Heishi2", - "ovl_En_Heishi3", - "ovl_En_Heishi4", - "ovl_En_Hintnuts", - "ovl_En_Holl", - "ovl_En_Honotrap", - "ovl_En_Horse", - "ovl_En_Horse_Game_Check", - "ovl_En_Horse_Ganon", - "ovl_En_Horse_Link_Child", - "ovl_En_Horse_Normal", - "ovl_En_Horse_Zelda", - "ovl_En_Hs", - "ovl_En_Hs2", - "ovl_En_Hy", - "ovl_En_Ice_Hono", - "ovl_En_Ik", - "ovl_En_In", - "ovl_En_Insect", - "ovl_En_Ishi", - "ovl_En_It", - "ovl_En_Jj", - "ovl_En_Js", - "ovl_En_Jsjutan", - "ovl_En_Kakasi", - "ovl_En_Kakasi2", - "ovl_En_Kakasi3", - "ovl_En_Kanban", - "ovl_En_Karebaba", - "ovl_En_Ko", - "ovl_En_Kusa", - "ovl_En_Kz", - "ovl_En_Light", - "ovl_En_Lightbox", - "ovl_En_M_Fire1", - "ovl_En_M_Thunder", - "ovl_En_Ma1", - "ovl_En_Ma2", - "ovl_En_Ma3", - "ovl_En_Mag", - "ovl_En_Mb", - "ovl_En_Md", - "ovl_En_Mk", - "ovl_En_Mm", - "ovl_En_Mm2", - "ovl_En_Ms", - "ovl_En_Mu", - "ovl_En_Nb", - "ovl_En_Niw", - "ovl_En_Niw_Girl", - "ovl_En_Niw_Lady", - "ovl_En_Nutsball", - "ovl_En_Nwc", - "ovl_En_Ny", - "ovl_En_OE2", - "ovl_En_Okarina_Effect", - "ovl_En_Okarina_Tag", - "ovl_En_Okuta", - "ovl_En_Ossan", - "ovl_En_Owl", - "ovl_En_Part", - "ovl_En_Peehat", - "ovl_En_Po_Desert", - "ovl_En_Po_Field", - "ovl_En_Po_Relay", - "ovl_En_Po_Sisters", - "ovl_En_Poh", - "ovl_En_Pu_box", - "ovl_En_Rd", - "ovl_En_Reeba", - "ovl_En_River_Sound", - "ovl_En_Rl", - "ovl_En_Rr", - "ovl_En_Ru1", - "ovl_En_Ru2", - "ovl_En_Sa", - "ovl_En_Sb", - "ovl_En_Scene_Change", - "ovl_En_Sda", - "ovl_En_Shopnuts", - "ovl_En_Si", - "ovl_En_Siofuki", - "ovl_En_Skb", - "ovl_En_Skj", - "ovl_En_Skjneedle", - "ovl_En_Ssh", - "ovl_En_St", - "ovl_En_Sth", - "ovl_En_Stream", - "ovl_En_Sw", - "ovl_En_Syateki_Itm", - "ovl_En_Syateki_Man", - "ovl_En_Syateki_Niw", - "ovl_En_Ta", - "ovl_En_Takara_Man", - "ovl_En_Tana", - "ovl_En_Tg", - "ovl_En_Tite", - "ovl_En_Tk", - "ovl_En_Torch", - "ovl_En_Torch2", - "ovl_En_Toryo", - "ovl_En_Tp", - "ovl_En_Tr", - "ovl_En_Trap", - "ovl_En_Tubo_Trap", - "ovl_En_Vali", - "ovl_En_Vase", - "ovl_En_Vb_Ball", - "ovl_En_Viewer", - "ovl_En_Vm", - "ovl_En_Wall_Tubo", - "ovl_En_Wallmas", - "ovl_En_Weather_Tag", - "ovl_En_Weiyer", - "ovl_En_Wf", - "ovl_En_Wonder_Item", - "ovl_En_Wonder_Talk", - "ovl_En_Wonder_Talk2", - "ovl_En_Wood02", - "ovl_En_Xc", - "ovl_En_Yabusame_Mark", - "ovl_En_Yukabyun", - "ovl_En_Zf", - "ovl_En_Zl1", - "ovl_En_Zl2", - "ovl_En_Zl3", - "ovl_En_Zl4", - "ovl_En_Zo", - "ovl_En_fHG", - "ovl_End_Title", - "ovl_Fishing", - "ovl_Item_B_Heart", - "ovl_Item_Etcetera", - "ovl_Item_Inbox", - "ovl_Item_Ocarina", - "ovl_Item_Shield", - "ovl_Magic_Dark", - "ovl_Magic_Fire", - "ovl_Magic_Wind", - "ovl_Mir_Ray", - "ovl_Obj_Bean", - "ovl_Obj_Blockstop", - "ovl_Obj_Bombiwa", - "ovl_Obj_Comb", - "ovl_Obj_Dekujr", - "ovl_Obj_Elevator", - "ovl_Obj_Hamishi", - "ovl_Obj_Hana", - "ovl_Obj_Hsblock", - "ovl_Obj_Ice_Poly", - "ovl_Obj_Kibako", - "ovl_Obj_Kibako2", - "ovl_Obj_Lift", - "ovl_Obj_Lightswitch", - "ovl_Obj_Makekinsuta", - "ovl_Obj_Makeoshihiki", - "ovl_Obj_Mure", - "ovl_Obj_Mure2", - "ovl_Obj_Mure3", - "ovl_Obj_Oshihiki", - "ovl_Obj_Roomtimer", - "ovl_Obj_Switch", - "ovl_Obj_Syokudai", - "ovl_Obj_Timeblock", - "ovl_Obj_Tsubo", - "ovl_Obj_Warp2block", - "ovl_Object_Kankyo", - "ovl_Oceff_Spot", - "ovl_Oceff_Storm", - "ovl_Oceff_Wipe", - "ovl_Oceff_Wipe2", - "ovl_Oceff_Wipe3", - "ovl_Oceff_Wipe4", - "ovl_Shot_Sun", - "gameplay_keep", - "gameplay_field_keep", - "gameplay_dangeon_keep", - "gameplay_object_exchange_static", - "object_link_boy", - "object_link_child", - "object_box", - "object_human", - "object_okuta", - "object_poh", - "object_wallmaster", - "object_dy_obj", - "object_firefly", - "object_dodongo", - "object_fire", - "object_niw", - "object_tite", - "object_reeba", - "object_peehat", - "object_kingdodongo", - "object_horse", - "object_zf", - "object_goma", - "object_zl1", - "object_gol", - "object_bubble", - "object_dodojr", - "object_torch2", - "object_bl", - "object_tp", - "object_oA1", - "object_st", - "object_bw", - "object_ei", - "object_horse_normal", - "object_oB1", - "object_o_anime", - "object_spot04_objects", - "object_ddan_objects", - "object_hidan_objects", - "object_horse_ganon", - "object_oA2", - "object_spot00_objects", - "object_mb", - "object_bombf", - "object_sk2", - "object_oE1", - "object_oE_anime", - "object_oE2", - "object_ydan_objects", - "object_gnd", - "object_am", - "object_dekubaba", - "object_oA3", - "object_oA4", - "object_oA5", - "object_oA6", - "object_oA7", - "object_jj", - "object_oA8", - "object_oA9", - "object_oB2", - "object_oB3", - "object_oB4", - "object_horse_zelda", - "object_opening_demo1", - "object_warp1", - "object_b_heart", - "object_dekunuts", - "object_oE3", - "object_oE4", - "object_menkuri_objects", - "object_oE5", - "object_oE6", - "object_oE7", - "object_oE8", - "object_oE9", - "object_oE10", - "object_oE11", - "object_oE12", - "object_vali", - "object_oA10", - "object_oA11", - "object_mizu_objects", - "object_fhg", - "object_ossan", - "object_mori_hineri1", - "object_Bb", - "object_toki_objects", - "object_yukabyun", - "object_zl2", - "object_mjin", - "object_mjin_flash", - "object_mjin_dark", - "object_mjin_flame", - "object_mjin_ice", - "object_mjin_soul", - "object_mjin_wind", - "object_mjin_oka", - "object_haka_objects", - "object_spot06_objects", - "object_ice_objects", - "object_relay_objects", - "object_mori_hineri1a", - "object_mori_hineri2", - "object_mori_hineri2a", - "object_mori_objects", - "object_mori_tex", - "object_spot08_obj", - "object_warp2", - "object_hata", - "object_bird", - "object_wood02", - "object_lightbox", - "object_pu_box", - "object_trap", - "object_vase", - "object_im", - "object_ta", - "object_tk", - "object_xc", - "object_vm", - "object_bv", - "object_hakach_objects", - "object_efc_crystal_light", - "object_efc_fire_ball", - "object_efc_flash", - "object_efc_lgt_shower", - "object_efc_star_field", - "object_god_lgt", - "object_light_ring", - "object_triforce_spot", - "object_medal", - "object_bdan_objects", - "object_sd", - "object_rd", - "object_po_sisters", - "object_heavy_object", - "object_gndd", - "object_fd", - "object_du", - "object_fw", - "object_horse_link_child", - "object_spot02_objects", - "object_haka", - "object_ru1", - "object_syokudai", - "object_fd2", - "object_dh", - "object_rl", - "object_efc_tw", - "object_demo_tre_lgt", - "object_gi_key", - "object_mir_ray", - "object_brob", - "object_gi_jewel", - "object_spot09_obj", - "object_spot18_obj", - "object_bdoor", - "object_spot17_obj", - "object_shop_dungen", - "object_nb", - "object_mo", - "object_sb", - "object_gi_melody", - "object_gi_heart", - "object_gi_compass", - "object_gi_bosskey", - "object_gi_medal", - "object_gi_nuts", - "object_sa", - "object_gi_hearts", - "object_gi_arrowcase", - "object_gi_bombpouch", - "object_in", - "object_tr", - "object_spot16_obj", - "object_oE1s", - "object_oE4s", - "object_os_anime", - "object_gi_bottle", - "object_gi_stick", - "object_gi_map", - "object_oF1d_map", - "object_ru2", - "object_gi_shield_1", - "object_dekujr", - "object_gi_magicpot", - "object_gi_bomb_1", - "object_oF1s", - "object_ma2", - "object_gi_purse", - "object_hni", - "object_tw", - "object_rr", - "object_bxa", - "object_anubice", - "object_gi_gerudo", - "object_gi_arrow", - "object_gi_bomb_2", - "object_gi_egg", - "object_gi_scale", - "object_gi_shield_2", - "object_gi_hookshot", - "object_gi_ocarina", - "object_gi_milk", - "object_ma1", - "object_ganon", - "object_sst", - "object_ny", - "object_fr", - "object_gi_pachinko", - "object_gi_boomerang", - "object_gi_bow", - "object_gi_glasses", - "object_gi_liquid", - "object_ani", - "object_demo_6k", - "object_gi_shield_3", - "object_gi_letter", - "object_spot15_obj", - "object_jya_obj", - "object_gi_clothes", - "object_gi_bean", - "object_gi_fish", - "object_gi_saw", - "object_gi_hammer", - "object_gi_grass", - "object_gi_longsword", - "object_spot01_objects", - "object_md", - "object_km1", - "object_kw1", - "object_zo", - "object_kz", - "object_umajump", - "object_masterkokiri", - "object_masterkokirihead", - "object_mastergolon", - "object_masterzoora", - "object_aob", - "object_ik", - "object_ahg", - "object_cne", - "object_gi_niwatori", - "object_skj", - "object_gi_bottle_letter", - "object_bji", - "object_bba", - "object_gi_ocarina_0", - "object_ds", - "object_ane", - "object_boj", - "object_spot03_object", - "object_spot07_object", - "object_fz", - "object_bob", - "object_ge1", - "object_yabusame_point", - "object_gi_boots_2", - "object_gi_seed", - "object_gnd_magic", - "object_d_elevator", - "object_d_hsblock", - "object_d_lift", - "object_mamenoki", - "object_goroiwa", - "object_toryo", - "object_daiku", - "object_nwc", - "object_blkobj", - "object_gm", - "object_ms", - "object_hs", - "object_ingate", - "object_lightswitch", - "object_kusa", - "object_tsubo", - "object_gi_gloves", - "object_gi_coin", - "object_kanban", - "object_gjyo_objects", - "object_owl", - "object_mk", - "object_fu", - "object_gi_ki_tan_mask", - "object_gi_redead_mask", - "object_gi_skj_mask", - "object_gi_rabit_mask", - "object_gi_truth_mask", - "object_ganon_objects", - "object_siofuki", - "object_stream", - "object_mm", - "object_fa", - "object_os", - "object_gi_eye_lotion", - "object_gi_powder", - "object_gi_mushroom", - "object_gi_ticketstone", - "object_gi_brokensword", - "object_js", - "object_cs", - "object_gi_prescription", - "object_gi_bracelet", - "object_gi_soldout", - "object_gi_frog", - "object_mag", - "object_door_gerudo", - "object_gt", - "object_efc_erupc", - "object_zl2_anime1", - "object_zl2_anime2", - "object_gi_golonmask", - "object_gi_zoramask", - "object_gi_gerudomask", - "object_ganon2", - "object_ka", - "object_ts", - "object_zg", - "object_gi_hoverboots", - "object_gi_m_arrow", - "object_ds2", - "object_ec", - "object_fish", - "object_gi_sutaru", - "object_gi_goddess", - "object_ssh", - "object_bigokuta", - "object_bg", - "object_spot05_objects", - "object_spot12_obj", - "object_bombiwa", - "object_hintnuts", - "object_rs", - "object_spot00_break", - "object_gla", - "object_shopnuts", - "object_geldb", - "object_gr", - "object_dog", - "object_jya_iron", - "object_jya_door", - "object_spot01_objects2", - "object_spot11_obj", - "object_kibako2", - "object_dns", - "object_dnk", - "object_gi_fire", - "object_gi_insect", - "object_gi_butterfly", - "object_gi_ghost", - "object_gi_soul", - "object_bowl", - "object_po_field", - "object_demo_kekkai", - "object_efc_doughnut", - "object_gi_dekupouch", - "object_ganon_anime1", - "object_ganon_anime2", - "object_ganon_anime3", - "object_gi_rupy", - "object_spot01_matoya", - "object_spot01_matoyab", - "object_po_composer", - "object_mu", - "object_wf", - "object_skb", - "object_gj", - "object_geff", - "object_haka_door", - "object_gs", - "object_ps", - "object_bwall", - "object_crow", - "object_cow", - "object_cob", - "object_gi_sword_1", - "object_door_killer", - "object_ouke_haka", - "object_timeblock", - "object_zl4", - "g_pn_01", - "g_pn_02", - "g_pn_03", - "g_pn_04", - "g_pn_05", - "g_pn_06", - "g_pn_07", - "g_pn_08", - "g_pn_09", - "g_pn_10", - "g_pn_11", - "g_pn_12", - "g_pn_13", - "g_pn_14", - "g_pn_15", - "g_pn_16", - "g_pn_17", - "g_pn_18", - "g_pn_19", - "g_pn_20", - "g_pn_21", - "g_pn_22", - "g_pn_23", - "g_pn_24", - "g_pn_25", - "g_pn_26", - "g_pn_27", - "g_pn_28", - "g_pn_29", - "g_pn_30", - "g_pn_31", - "g_pn_32", - "g_pn_33", - "g_pn_34", - "g_pn_35", - "g_pn_36", - "g_pn_37", - "g_pn_38", - "g_pn_39", - "g_pn_40", - "g_pn_41", - "g_pn_42", - "g_pn_43", - "g_pn_44", - "g_pn_45", - "g_pn_46", - "g_pn_47", - "g_pn_48", - "g_pn_49", - "g_pn_50", - "g_pn_51", - "g_pn_52", - "g_pn_53", - "g_pn_54", - "g_pn_55", - "g_pn_56", - "g_pn_57", - "z_select_static", - "nintendo_rogo_static", - "title_static", - "parameter_static", - "vr_fine0_static", - "vr_fine0_pal_static", - "vr_fine1_static", - "vr_fine1_pal_static", - "vr_fine2_static", - "vr_fine2_pal_static", - "vr_fine3_static", - "vr_fine3_pal_static", - "vr_cloud0_static", - "vr_cloud0_pal_static", - "vr_cloud1_static", - "vr_cloud1_pal_static", - "vr_cloud2_static", - "vr_cloud2_pal_static", - "vr_cloud3_static", - "vr_cloud3_pal_static", - "vr_holy0_static", - "vr_holy0_pal_static", - "vr_holy1_static", - "vr_holy1_pal_static", - "vr_MDVR_static", - "vr_MDVR_pal_static", - "vr_MNVR_static", - "vr_MNVR_pal_static", - "vr_RUVR_static", - "vr_RUVR_pal_static", - "vr_LHVR_static", - "vr_LHVR_pal_static", - "vr_KHVR_static", - "vr_KHVR_pal_static", - "vr_K3VR_static", - "vr_K3VR_pal_static", - "vr_K4VR_static", - "vr_K4VR_pal_static", - "vr_K5VR_static", - "vr_K5VR_pal_static", - "vr_SP1a_static", - "vr_SP1a_pal_static", - "vr_MLVR_static", - "vr_MLVR_pal_static", - "vr_KKRVR_static", - "vr_KKRVR_pal_static", - "vr_KR3VR_static", - "vr_KR3VR_pal_static", - "vr_IPVR_static", - "vr_IPVR_pal_static", - "vr_KSVR_static", - "vr_KSVR_pal_static", - "vr_GLVR_static", - "vr_GLVR_pal_static", - "vr_ZRVR_static", - "vr_ZRVR_pal_static", - "vr_DGVR_static", - "vr_DGVR_pal_static", - "vr_ALVR_static", - "vr_ALVR_pal_static", - "vr_NSVR_static", - "vr_NSVR_pal_static", - "vr_LBVR_static", - "vr_LBVR_pal_static", - "vr_TTVR_static", - "vr_TTVR_pal_static", - "vr_FCVR_static", - "vr_FCVR_pal_static", - "elf_message_field", - "elf_message_ydan", - "syotes_scene", - "syotes_room_0", - "syotes2_scene", - "syotes2_room_0", - "depth_test_scene", - "depth_test_room_0", - "spot00_scene", - "spot00_room_0", - "spot01_scene", - "spot01_room_0", - "spot02_scene", - "spot02_room_0", - "spot02_room_1", - "spot03_scene", - "spot03_room_0", - "spot03_room_1", - "spot04_scene", - "spot04_room_0", - "spot04_room_1", - "spot04_room_2", - "spot05_scene", - "spot05_room_0", - "spot06_scene", - "spot06_room_0", - "spot07_scene", - "spot07_room_0", - "spot07_room_1", - "spot08_scene", - "spot08_room_0", - "spot09_scene", - "spot09_room_0", - "spot10_scene", - "spot10_room_0", - "spot10_room_1", - "spot10_room_2", - "spot10_room_3", - "spot10_room_4", - "spot10_room_5", - "spot10_room_6", - "spot10_room_7", - "spot10_room_8", - "spot10_room_9", - "spot11_scene", - "spot11_room_0", - "spot12_scene", - "spot12_room_0", - "spot12_room_1", - "spot13_scene", - "spot13_room_0", - "spot13_room_1", - "spot15_scene", - "spot15_room_0", - "spot16_scene", - "spot16_room_0", - "spot17_scene", - "spot17_room_0", - "spot17_room_1", - "spot18_scene", - "spot18_room_0", - "spot18_room_1", - "spot18_room_2", - "spot18_room_3", - "ydan_scene", - "ydan_room_0", - "ydan_room_1", - "ydan_room_2", - "ydan_room_3", - "ydan_room_4", - "ydan_room_5", - "ydan_room_6", - "ydan_room_7", - "ydan_room_8", - "ydan_room_9", - "ydan_room_10", - "ydan_room_11", - "ddan_scene", - "ddan_room_0", - "ddan_room_1", - "ddan_room_2", - "ddan_room_3", - "ddan_room_4", - "ddan_room_5", - "ddan_room_6", - "ddan_room_7", - "ddan_room_8", - "ddan_room_9", - "ddan_room_10", - "ddan_room_11", - "ddan_room_12", - "ddan_room_13", - "ddan_room_14", - "ddan_room_15", - "ddan_room_16", - "bdan_scene", - "bdan_room_0", - "bdan_room_1", - "bdan_room_2", - "bdan_room_3", - "bdan_room_4", - "bdan_room_5", - "bdan_room_6", - "bdan_room_7", - "bdan_room_8", - "bdan_room_9", - "bdan_room_10", - "bdan_room_11", - "bdan_room_12", - "bdan_room_13", - "bdan_room_14", - "bdan_room_15", - "Bmori1_scene", - "Bmori1_room_0", - "Bmori1_room_1", - "Bmori1_room_2", - "Bmori1_room_3", - "Bmori1_room_4", - "Bmori1_room_5", - "Bmori1_room_6", - "Bmori1_room_7", - "Bmori1_room_8", - "Bmori1_room_9", - "Bmori1_room_10", - "Bmori1_room_11", - "Bmori1_room_12", - "Bmori1_room_13", - "Bmori1_room_14", - "Bmori1_room_15", - "Bmori1_room_16", - "Bmori1_room_17", - "Bmori1_room_18", - "Bmori1_room_19", - "Bmori1_room_20", - "Bmori1_room_21", - "Bmori1_room_22", - "HIDAN_scene", - "HIDAN_room_0", - "HIDAN_room_1", - "HIDAN_room_2", - "HIDAN_room_3", - "HIDAN_room_4", - "HIDAN_room_5", - "HIDAN_room_6", - "HIDAN_room_7", - "HIDAN_room_8", - "HIDAN_room_9", - "HIDAN_room_10", - "HIDAN_room_11", - "HIDAN_room_12", - "HIDAN_room_13", - "HIDAN_room_14", - "HIDAN_room_15", - "HIDAN_room_16", - "HIDAN_room_17", - "HIDAN_room_18", - "HIDAN_room_19", - "HIDAN_room_20", - "HIDAN_room_21", - "HIDAN_room_22", - "HIDAN_room_23", - "HIDAN_room_24", - "HIDAN_room_25", - "HIDAN_room_26", - "MIZUsin_scene", - "MIZUsin_room_0", - "MIZUsin_room_1", - "MIZUsin_room_2", - "MIZUsin_room_3", - "MIZUsin_room_4", - "MIZUsin_room_5", - "MIZUsin_room_6", - "MIZUsin_room_7", - "MIZUsin_room_8", - "MIZUsin_room_9", - "MIZUsin_room_10", - "MIZUsin_room_11", - "MIZUsin_room_12", - "MIZUsin_room_13", - "MIZUsin_room_14", - "MIZUsin_room_15", - "MIZUsin_room_16", - "MIZUsin_room_17", - "MIZUsin_room_18", - "MIZUsin_room_19", - "MIZUsin_room_20", - "MIZUsin_room_21", - "MIZUsin_room_22", - "jyasinzou_scene", - "jyasinzou_room_0", - "jyasinzou_room_1", - "jyasinzou_room_2", - "jyasinzou_room_3", - "jyasinzou_room_4", - "jyasinzou_room_5", - "jyasinzou_room_6", - "jyasinzou_room_7", - "jyasinzou_room_8", - "jyasinzou_room_9", - "jyasinzou_room_10", - "jyasinzou_room_11", - "jyasinzou_room_12", - "jyasinzou_room_13", - "jyasinzou_room_14", - "jyasinzou_room_15", - "jyasinzou_room_16", - "jyasinzou_room_17", - "jyasinzou_room_18", - "jyasinzou_room_19", - "jyasinzou_room_20", - "jyasinzou_room_21", - "jyasinzou_room_22", - "jyasinzou_room_23", - "jyasinzou_room_24", - "jyasinzou_room_25", - "jyasinzou_room_26", - "jyasinzou_room_27", - "jyasinzou_room_28", - "HAKAdan_scene", - "HAKAdan_room_0", - "HAKAdan_room_1", - "HAKAdan_room_2", - "HAKAdan_room_3", - "HAKAdan_room_4", - "HAKAdan_room_5", - "HAKAdan_room_6", - "HAKAdan_room_7", - "HAKAdan_room_8", - "HAKAdan_room_9", - "HAKAdan_room_10", - "HAKAdan_room_11", - "HAKAdan_room_12", - "HAKAdan_room_13", - "HAKAdan_room_14", - "HAKAdan_room_15", - "HAKAdan_room_16", - "HAKAdan_room_17", - "HAKAdan_room_18", - "HAKAdan_room_19", - "HAKAdan_room_20", - "HAKAdan_room_21", - "HAKAdan_room_22", - "HAKAdanCH_scene", - "HAKAdanCH_room_0", - "HAKAdanCH_room_1", - "HAKAdanCH_room_2", - "HAKAdanCH_room_3", - "HAKAdanCH_room_4", - "HAKAdanCH_room_5", - "HAKAdanCH_room_6", - "ice_doukutu_scene", - "ice_doukutu_room_0", - "ice_doukutu_room_1", - "ice_doukutu_room_2", - "ice_doukutu_room_3", - "ice_doukutu_room_4", - "ice_doukutu_room_5", - "ice_doukutu_room_6", - "ice_doukutu_room_7", - "ice_doukutu_room_8", - "ice_doukutu_room_9", - "ice_doukutu_room_10", - "ice_doukutu_room_11", - "men_scene", - "men_room_0", - "men_room_1", - "men_room_2", - "men_room_3", - "men_room_4", - "men_room_5", - "men_room_6", - "men_room_7", - "men_room_8", - "men_room_9", - "men_room_10", - "ganontika_scene", - "ganontika_room_0", - "ganontika_room_1", - "ganontika_room_2", - "ganontika_room_3", - "ganontika_room_4", - "ganontika_room_5", - "ganontika_room_6", - "ganontika_room_7", - "ganontika_room_8", - "ganontika_room_9", - "ganontika_room_10", - "ganontika_room_11", - "ganontika_room_12", - "ganontika_room_13", - "ganontika_room_14", - "ganontika_room_15", - "ganontika_room_16", - "ganontika_room_17", - "ganontika_room_18", - "ganontika_room_19", - "market_day_scene", - "market_day_room_0", - "market_night_scene", - "market_night_room_0", - "testroom_scene", - "testroom_room_0", - "testroom_room_1", - "testroom_room_2", - "testroom_room_3", - "testroom_room_4", - "kenjyanoma_scene", - "kenjyanoma_room_0", - "tokinoma_scene", - "tokinoma_room_0", - "tokinoma_room_1", - "sutaru_scene", - "sutaru_room_0", - "link_home_scene", - "link_home_room_0", - "kokiri_shop_scene", - "kokiri_shop_room_0", - "kokiri_home_scene", - "kokiri_home_room_0", - "kakusiana_scene", - "kakusiana_room_0", - "kakusiana_room_1", - "kakusiana_room_2", - "kakusiana_room_3", - "kakusiana_room_4", - "kakusiana_room_5", - "kakusiana_room_6", - "kakusiana_room_7", - "kakusiana_room_8", - "kakusiana_room_9", - "kakusiana_room_10", - "kakusiana_room_11", - "kakusiana_room_12", - "kakusiana_room_13", - "entra_scene", - "entra_room_0", - "moribossroom_scene", - "moribossroom_room_0", - "moribossroom_room_1", - "syatekijyou_scene", - "syatekijyou_room_0", - "shop1_scene", - "shop1_room_0", - "hairal_niwa_scene", - "hairal_niwa_room_0", - "ganon_tou_scene", - "ganon_tou_room_0", - "sasatest_scene", - "sasatest_room_0", - "market_alley_scene", - "market_alley_room_0", - "spot20_scene", - "spot20_room_0", - "market_ruins_scene", - "market_ruins_room_0", - "entra_n_scene", - "entra_n_room_0", - "enrui_scene", - "enrui_room_0", - "market_alley_n_scene", - "market_alley_n_room_0", - "hiral_demo_scene", - "hiral_demo_room_0", - "kokiri_home3_scene", - "kokiri_home3_room_0", - "malon_stable_scene", - "malon_stable_room_0", - "kakariko_scene", - "kakariko_room_0", - "bdan_boss_scene", - "bdan_boss_room_0", - "bdan_boss_room_1", - "FIRE_bs_scene", - "FIRE_bs_room_0", - "FIRE_bs_room_1", - "hut_scene", - "hut_room_0", - "daiyousei_izumi_scene", - "daiyousei_izumi_room_0", - "hakaana_scene", - "hakaana_room_0", - "yousei_izumi_tate_scene", - "yousei_izumi_tate_room_0", - "yousei_izumi_yoko_scene", - "yousei_izumi_yoko_room_0", - "golon_scene", - "golon_room_0", - "zoora_scene", - "zoora_room_0", - "drag_scene", - "drag_room_0", - "alley_shop_scene", - "alley_shop_room_0", - "night_shop_scene", - "night_shop_room_0", - "impa_scene", - "impa_room_0", - "labo_scene", - "labo_room_0", - "tent_scene", - "tent_room_0", - "nakaniwa_scene", - "nakaniwa_room_0", - "ddan_boss_scene", - "ddan_boss_room_0", - "ddan_boss_room_1", - "ydan_boss_scene", - "ydan_boss_room_0", - "ydan_boss_room_1", - "HAKAdan_bs_scene", - "HAKAdan_bs_room_0", - "HAKAdan_bs_room_1", - "MIZUsin_bs_scene", - "MIZUsin_bs_room_0", - "MIZUsin_bs_room_1", - "ganon_scene", - "ganon_room_0", - "ganon_room_1", - "ganon_room_2", - "ganon_room_3", - "ganon_room_4", - "ganon_room_5", - "ganon_room_6", - "ganon_room_7", - "ganon_room_8", - "ganon_room_9", - "ganon_boss_scene", - "ganon_boss_room_0", - "jyasinboss_scene", - "jyasinboss_room_0", - "jyasinboss_room_1", - "jyasinboss_room_2", - "jyasinboss_room_3", - "kokiri_home4_scene", - "kokiri_home4_room_0", - "kokiri_home5_scene", - "kokiri_home5_room_0", - "ganon_final_scene", - "ganon_final_room_0", - "kakariko3_scene", - "kakariko3_room_0", - "hairal_niwa2_scene", - "hairal_niwa2_room_0", - "hakasitarelay_scene", - "hakasitarelay_room_0", - "hakasitarelay_room_1", - "hakasitarelay_room_2", - "hakasitarelay_room_3", - "hakasitarelay_room_4", - "hakasitarelay_room_5", - "hakasitarelay_room_6", - "shrine_scene", - "shrine_room_0", - "turibori_scene", - "turibori_room_0", - "shrine_n_scene", - "shrine_n_room_0", - "shrine_r_scene", - "shrine_r_room_0", - "hakaana2_scene", - "hakaana2_room_0", - "gerudoway_scene", - "gerudoway_room_0", - "gerudoway_room_1", - "gerudoway_room_2", - "gerudoway_room_3", - "gerudoway_room_4", - "gerudoway_room_5", - "hairal_niwa_n_scene", - "hairal_niwa_n_room_0", - "bowling_scene", - "bowling_room_0", - "hakaana_ouke_scene", - "hakaana_ouke_room_0", - "hakaana_ouke_room_1", - "hakaana_ouke_room_2", - "hylia_labo_scene", - "hylia_labo_room_0", - "souko_scene", - "souko_room_0", - "souko_room_1", - "souko_room_2", - "miharigoya_scene", - "miharigoya_room_0", - "mahouya_scene", - "mahouya_room_0", - "takaraya_scene", - "takaraya_room_0", - "takaraya_room_1", - "takaraya_room_2", - "takaraya_room_3", - "takaraya_room_4", - "takaraya_room_5", - "takaraya_room_6", - "ganon_sonogo_scene", - "ganon_sonogo_room_0", - "ganon_sonogo_room_1", - "ganon_sonogo_room_2", - "ganon_sonogo_room_3", - "ganon_sonogo_room_4", - "ganon_demo_scene", - "ganon_demo_room_0", - "besitu_scene", - "besitu_room_0", - "face_shop_scene", - "face_shop_room_0", - "kinsuta_scene", - "kinsuta_room_0", - "ganontikasonogo_scene", - "ganontikasonogo_room_0", - "ganontikasonogo_room_1", - "test01_scene", - "test01_room_0", - "bump_texture_static", - "anime_model_1_static", - "anime_model_2_static", - "anime_model_3_static", - "anime_model_4_static", - "anime_model_5_static", - "anime_model_6_static", - "anime_texture_1_static", - "anime_texture_2_static", - "anime_texture_3_static", - "anime_texture_4_static", - "anime_texture_5_static", - "anime_texture_6_static", +const char* sDmaMgrFileNames[0x5FC] = { + "makerom", + "boot", + "dmadata", + "Audiobank", + "Audioseq", + "Audiotable", + "link_animetion", + "icon_item_static", + "icon_item_24_static", + "icon_item_field_static", + "icon_item_dungeon_static", + "icon_item_gameover_static", + "icon_item_nes_static", + "icon_item_ger_static", + "icon_item_fra_static", + "item_name_static", + "map_name_static", + "do_action_static", + "message_static", + "message_texture_static", + "nes_font_static", + "nes_message_data_static", + "ger_message_data_static", + "fra_message_data_static", + "staff_message_data_static", + "map_grand_static", + "map_i_static", + "map_48x85_static", + "code", + "ovl_title", + "ovl_select", + "ovl_opening", + "ovl_file_choose", + "ovl_kaleido_scope", + "ovl_player_actor", + "ovl_map_mark_data", + "ovl_En_Test", + "ovl_Arms_Hook", + "ovl_Arrow_Fire", + "ovl_Arrow_Ice", + "ovl_Arrow_Light", + "ovl_Bg_Bdan_Objects", + "ovl_Bg_Bdan_Switch", + "ovl_Bg_Bom_Guard", + "ovl_Bg_Bombwall", + "ovl_Bg_Bowl_Wall", + "ovl_Bg_Breakwall", + "ovl_Bg_Ddan_Jd", + "ovl_Bg_Ddan_Kd", + "ovl_Bg_Dodoago", + "ovl_Bg_Dy_Yoseizo", + "ovl_Bg_Ganon_Otyuka", + "ovl_Bg_Gate_Shutter", + "ovl_Bg_Gjyo_Bridge", + "ovl_Bg_Gnd_Darkmeiro", + "ovl_Bg_Gnd_Firemeiro", + "ovl_Bg_Gnd_Iceblock", + "ovl_Bg_Gnd_Nisekabe", + "ovl_Bg_Gnd_Soulmeiro", + "ovl_Bg_Haka", + "ovl_Bg_Haka_Gate", + "ovl_Bg_Haka_Huta", + "ovl_Bg_Haka_Megane", + "ovl_Bg_Haka_MeganeBG", + "ovl_Bg_Haka_Sgami", + "ovl_Bg_Haka_Ship", + "ovl_Bg_Haka_Trap", + "ovl_Bg_Haka_Tubo", + "ovl_Bg_Haka_Water", + "ovl_Bg_Haka_Zou", + "ovl_Bg_Heavy_Block", + "ovl_Bg_Hidan_Curtain", + "ovl_Bg_Hidan_Dalm", + "ovl_Bg_Hidan_Firewall", + "ovl_Bg_Hidan_Fslift", + "ovl_Bg_Hidan_Fwbig", + "ovl_Bg_Hidan_Hamstep", + "ovl_Bg_Hidan_Hrock", + "ovl_Bg_Hidan_Kousi", + "ovl_Bg_Hidan_Kowarerukabe", + "ovl_Bg_Hidan_Rock", + "ovl_Bg_Hidan_Rsekizou", + "ovl_Bg_Hidan_Sekizou", + "ovl_Bg_Hidan_Sima", + "ovl_Bg_Hidan_Syoku", + "ovl_Bg_Ice_Objects", + "ovl_Bg_Ice_Shelter", + "ovl_Bg_Ice_Shutter", + "ovl_Bg_Ice_Turara", + "ovl_Bg_Ingate", + "ovl_Bg_Jya_1flift", + "ovl_Bg_Jya_Amishutter", + "ovl_Bg_Jya_Bigmirror", + "ovl_Bg_Jya_Block", + "ovl_Bg_Jya_Bombchuiwa", + "ovl_Bg_Jya_Bombiwa", + "ovl_Bg_Jya_Cobra", + "ovl_Bg_Jya_Goroiwa", + "ovl_Bg_Jya_Haheniron", + "ovl_Bg_Jya_Ironobj", + "ovl_Bg_Jya_Kanaami", + "ovl_Bg_Jya_Lift", + "ovl_Bg_Jya_Megami", + "ovl_Bg_Jya_Zurerukabe", + "ovl_Bg_Menkuri_Eye", + "ovl_Bg_Menkuri_Kaiten", + "ovl_Bg_Menkuri_Nisekabe", + "ovl_Bg_Mizu_Bwall", + "ovl_Bg_Mizu_Movebg", + "ovl_Bg_Mizu_Shutter", + "ovl_Bg_Mizu_Uzu", + "ovl_Bg_Mizu_Water", + "ovl_Bg_Mjin", + "ovl_Bg_Mori_Bigst", + "ovl_Bg_Mori_Elevator", + "ovl_Bg_Mori_Hashigo", + "ovl_Bg_Mori_Hashira4", + "ovl_Bg_Mori_Hineri", + "ovl_Bg_Mori_Idomizu", + "ovl_Bg_Mori_Kaitenkabe", + "ovl_Bg_Mori_Rakkatenjo", + "ovl_Bg_Po_Event", + "ovl_Bg_Po_Syokudai", + "ovl_Bg_Pushbox", + "ovl_Bg_Relay_Objects", + "ovl_Bg_Spot00_Break", + "ovl_Bg_Spot00_Hanebasi", + "ovl_Bg_Spot01_Fusya", + "ovl_Bg_Spot01_Idohashira", + "ovl_Bg_Spot01_Idomizu", + "ovl_Bg_Spot01_Idosoko", + "ovl_Bg_Spot01_Objects2", + "ovl_Bg_Spot02_Objects", + "ovl_Bg_Spot03_Taki", + "ovl_Bg_Spot05_Soko", + "ovl_Bg_Spot06_Objects", + "ovl_Bg_Spot07_Taki", + "ovl_Bg_Spot08_Bakudankabe", + "ovl_Bg_Spot08_Iceblock", + "ovl_Bg_Spot09_Obj", + "ovl_Bg_Spot11_Bakudankabe", + "ovl_Bg_Spot11_Oasis", + "ovl_Bg_Spot12_Gate", + "ovl_Bg_Spot12_Saku", + "ovl_Bg_Spot15_Rrbox", + "ovl_Bg_Spot15_Saku", + "ovl_Bg_Spot16_Bombstone", + "ovl_Bg_Spot16_Doughnut", + "ovl_Bg_Spot17_Bakudankabe", + "ovl_Bg_Spot17_Funen", + "ovl_Bg_Spot18_Basket", + "ovl_Bg_Spot18_Futa", + "ovl_Bg_Spot18_Obj", + "ovl_Bg_Spot18_Shutter", + "ovl_Bg_Sst_Floor", + "ovl_Bg_Toki_Hikari", + "ovl_Bg_Toki_Swd", + "ovl_Bg_Treemouth", + "ovl_Bg_Umajump", + "ovl_Bg_Vb_Sima", + "ovl_Bg_Ydan_Hasi", + "ovl_Bg_Ydan_Maruta", + "ovl_Bg_Ydan_Sp", + "ovl_Bg_Zg", + "ovl_Boss_Dodongo", + "ovl_Boss_Fd", + "ovl_Boss_Fd2", + "ovl_Boss_Ganon", + "ovl_Boss_Ganon2", + "ovl_Boss_Ganondrof", + "ovl_Boss_Goma", + "ovl_Boss_Mo", + "ovl_Boss_Sst", + "ovl_Boss_Tw", + "ovl_Boss_Va", + "ovl_Demo_6K", + "ovl_Demo_Du", + "ovl_Demo_Ec", + "ovl_Demo_Effect", + "ovl_Demo_Ext", + "ovl_Demo_Geff", + "ovl_Demo_Gj", + "ovl_Demo_Go", + "ovl_Demo_Gt", + "ovl_Demo_Ik", + "ovl_Demo_Im", + "ovl_Demo_Kankyo", + "ovl_Demo_Kekkai", + "ovl_Demo_Sa", + "ovl_Demo_Shd", + "ovl_Demo_Tre_Lgt", + "ovl_Door_Ana", + "ovl_Door_Gerudo", + "ovl_Door_Killer", + "ovl_Door_Shutter", + "ovl_Door_Toki", + "ovl_Door_Warp1", + "ovl_Efc_Erupc", + "ovl_Eff_Dust", + "ovl_Effect_Ss_Blast", + "ovl_Effect_Ss_Bomb", + "ovl_Effect_Ss_Bomb2", + "ovl_Effect_Ss_Bubble", + "ovl_Effect_Ss_D_Fire", + "ovl_Effect_Ss_Dead_Db", + "ovl_Effect_Ss_Dead_Dd", + "ovl_Effect_Ss_Dead_Ds", + "ovl_Effect_Ss_Dead_Sound", + "ovl_Effect_Ss_Dt_Bubble", + "ovl_Effect_Ss_Dust", + "ovl_Effect_Ss_En_Fire", + "ovl_Effect_Ss_En_Ice", + "ovl_Effect_Ss_Extra", + "ovl_Effect_Ss_Fcircle", + "ovl_Effect_Ss_Fhg_Flash", + "ovl_Effect_Ss_Fire_Tail", + "ovl_Effect_Ss_G_Fire", + "ovl_Effect_Ss_G_Magma", + "ovl_Effect_Ss_G_Magma2", + "ovl_Effect_Ss_G_Ripple", + "ovl_Effect_Ss_G_Spk", + "ovl_Effect_Ss_G_Splash", + "ovl_Effect_Ss_Hahen", + "ovl_Effect_Ss_HitMark", + "ovl_Effect_Ss_Ice_Piece", + "ovl_Effect_Ss_Ice_Smoke", + "ovl_Effect_Ss_K_Fire", + "ovl_Effect_Ss_Kakera", + "ovl_Effect_Ss_KiraKira", + "ovl_Effect_Ss_Lightning", + "ovl_Effect_Ss_Sibuki", + "ovl_Effect_Ss_Sibuki2", + "ovl_Effect_Ss_Solder_Srch_Ball", + "ovl_Effect_Ss_Stick", + "ovl_Effect_Ss_Stone1", + "ovl_Elf_Msg", + "ovl_Elf_Msg2", + "ovl_En_Am", + "ovl_En_Ani", + "ovl_En_Anubice", + "ovl_En_Anubice_Fire", + "ovl_En_Anubice_Tag", + "ovl_En_Arow_Trap", + "ovl_En_Arrow", + "ovl_En_Attack_Niw", + "ovl_En_Ba", + "ovl_En_Bb", + "ovl_En_Bdfire", + "ovl_En_Bigokuta", + "ovl_En_Bili", + "ovl_En_Bird", + "ovl_En_Blkobj", + "ovl_En_Bom", + "ovl_En_Bom_Bowl_Man", + "ovl_En_Bom_Bowl_Pit", + "ovl_En_Bom_Chu", + "ovl_En_Bombf", + "ovl_En_Boom", + "ovl_En_Box", + "ovl_En_Brob", + "ovl_En_Bubble", + "ovl_En_Butte", + "ovl_En_Bw", + "ovl_En_Bx", + "ovl_En_Changer", + "ovl_En_Clear_Tag", + "ovl_En_Cow", + "ovl_En_Crow", + "ovl_En_Cs", + "ovl_En_Daiku", + "ovl_En_Daiku_Kakariko", + "ovl_En_Dekubaba", + "ovl_En_Dekunuts", + "ovl_En_Dh", + "ovl_En_Dha", + "ovl_En_Diving_Game", + "ovl_En_Dns", + "ovl_En_Dnt_Demo", + "ovl_En_Dnt_Jiji", + "ovl_En_Dnt_Nomal", + "ovl_En_Dodojr", + "ovl_En_Dodongo", + "ovl_En_Dog", + "ovl_En_Door", + "ovl_En_Ds", + "ovl_En_Du", + "ovl_En_Dy_Extra", + "ovl_En_Eg", + "ovl_En_Eiyer", + "ovl_En_Elf", + "ovl_En_Encount1", + "ovl_En_Encount2", + "ovl_En_Ex_Item", + "ovl_En_Ex_Ruppy", + "ovl_En_Fd", + "ovl_En_Fd_Fire", + "ovl_En_Fhg_Fire", + "ovl_En_Fire_Rock", + "ovl_En_Firefly", + "ovl_En_Fish", + "ovl_En_Floormas", + "ovl_En_Fr", + "ovl_En_Fu", + "ovl_En_Fw", + "ovl_En_Fz", + "ovl_En_G_Switch", + "ovl_En_Ganon_Mant", + "ovl_En_Ganon_Organ", + "ovl_En_Gb", + "ovl_En_Ge1", + "ovl_En_Ge2", + "ovl_En_Ge3", + "ovl_En_GeldB", + "ovl_En_GirlA", + "ovl_En_Gm", + "ovl_En_Go", + "ovl_En_Go2", + "ovl_En_Goma", + "ovl_En_Goroiwa", + "ovl_En_Gs", + "ovl_En_Guest", + "ovl_En_Hata", + "ovl_En_Heishi1", + "ovl_En_Heishi2", + "ovl_En_Heishi3", + "ovl_En_Heishi4", + "ovl_En_Hintnuts", + "ovl_En_Holl", + "ovl_En_Honotrap", + "ovl_En_Horse", + "ovl_En_Horse_Game_Check", + "ovl_En_Horse_Ganon", + "ovl_En_Horse_Link_Child", + "ovl_En_Horse_Normal", + "ovl_En_Horse_Zelda", + "ovl_En_Hs", + "ovl_En_Hs2", + "ovl_En_Hy", + "ovl_En_Ice_Hono", + "ovl_En_Ik", + "ovl_En_In", + "ovl_En_Insect", + "ovl_En_Ishi", + "ovl_En_It", + "ovl_En_Jj", + "ovl_En_Js", + "ovl_En_Jsjutan", + "ovl_En_Kakasi", + "ovl_En_Kakasi2", + "ovl_En_Kakasi3", + "ovl_En_Kanban", + "ovl_En_Karebaba", + "ovl_En_Ko", + "ovl_En_Kusa", + "ovl_En_Kz", + "ovl_En_Light", + "ovl_En_Lightbox", + "ovl_En_M_Fire1", + "ovl_En_M_Thunder", + "ovl_En_Ma1", + "ovl_En_Ma2", + "ovl_En_Ma3", + "ovl_En_Mag", + "ovl_En_Mb", + "ovl_En_Md", + "ovl_En_Mk", + "ovl_En_Mm", + "ovl_En_Mm2", + "ovl_En_Ms", + "ovl_En_Mu", + "ovl_En_Nb", + "ovl_En_Niw", + "ovl_En_Niw_Girl", + "ovl_En_Niw_Lady", + "ovl_En_Nutsball", + "ovl_En_Nwc", + "ovl_En_Ny", + "ovl_En_OE2", + "ovl_En_Okarina_Effect", + "ovl_En_Okarina_Tag", + "ovl_En_Okuta", + "ovl_En_Ossan", + "ovl_En_Owl", + "ovl_En_Part", + "ovl_En_Peehat", + "ovl_En_Po_Desert", + "ovl_En_Po_Field", + "ovl_En_Po_Relay", + "ovl_En_Po_Sisters", + "ovl_En_Poh", + "ovl_En_Pu_box", + "ovl_En_Rd", + "ovl_En_Reeba", + "ovl_En_River_Sound", + "ovl_En_Rl", + "ovl_En_Rr", + "ovl_En_Ru1", + "ovl_En_Ru2", + "ovl_En_Sa", + "ovl_En_Sb", + "ovl_En_Scene_Change", + "ovl_En_Sda", + "ovl_En_Shopnuts", + "ovl_En_Si", + "ovl_En_Siofuki", + "ovl_En_Skb", + "ovl_En_Skj", + "ovl_En_Skjneedle", + "ovl_En_Ssh", + "ovl_En_St", + "ovl_En_Sth", + "ovl_En_Stream", + "ovl_En_Sw", + "ovl_En_Syateki_Itm", + "ovl_En_Syateki_Man", + "ovl_En_Syateki_Niw", + "ovl_En_Ta", + "ovl_En_Takara_Man", + "ovl_En_Tana", + "ovl_En_Tg", + "ovl_En_Tite", + "ovl_En_Tk", + "ovl_En_Torch", + "ovl_En_Torch2", + "ovl_En_Toryo", + "ovl_En_Tp", + "ovl_En_Tr", + "ovl_En_Trap", + "ovl_En_Tubo_Trap", + "ovl_En_Vali", + "ovl_En_Vase", + "ovl_En_Vb_Ball", + "ovl_En_Viewer", + "ovl_En_Vm", + "ovl_En_Wall_Tubo", + "ovl_En_Wallmas", + "ovl_En_Weather_Tag", + "ovl_En_Weiyer", + "ovl_En_Wf", + "ovl_En_Wonder_Item", + "ovl_En_Wonder_Talk", + "ovl_En_Wonder_Talk2", + "ovl_En_Wood02", + "ovl_En_Xc", + "ovl_En_Yabusame_Mark", + "ovl_En_Yukabyun", + "ovl_En_Zf", + "ovl_En_Zl1", + "ovl_En_Zl2", + "ovl_En_Zl3", + "ovl_En_Zl4", + "ovl_En_Zo", + "ovl_En_fHG", + "ovl_End_Title", + "ovl_Fishing", + "ovl_Item_B_Heart", + "ovl_Item_Etcetera", + "ovl_Item_Inbox", + "ovl_Item_Ocarina", + "ovl_Item_Shield", + "ovl_Magic_Dark", + "ovl_Magic_Fire", + "ovl_Magic_Wind", + "ovl_Mir_Ray", + "ovl_Obj_Bean", + "ovl_Obj_Blockstop", + "ovl_Obj_Bombiwa", + "ovl_Obj_Comb", + "ovl_Obj_Dekujr", + "ovl_Obj_Elevator", + "ovl_Obj_Hamishi", + "ovl_Obj_Hana", + "ovl_Obj_Hsblock", + "ovl_Obj_Ice_Poly", + "ovl_Obj_Kibako", + "ovl_Obj_Kibako2", + "ovl_Obj_Lift", + "ovl_Obj_Lightswitch", + "ovl_Obj_Makekinsuta", + "ovl_Obj_Makeoshihiki", + "ovl_Obj_Mure", + "ovl_Obj_Mure2", + "ovl_Obj_Mure3", + "ovl_Obj_Oshihiki", + "ovl_Obj_Roomtimer", + "ovl_Obj_Switch", + "ovl_Obj_Syokudai", + "ovl_Obj_Timeblock", + "ovl_Obj_Tsubo", + "ovl_Obj_Warp2block", + "ovl_Object_Kankyo", + "ovl_Oceff_Spot", + "ovl_Oceff_Storm", + "ovl_Oceff_Wipe", + "ovl_Oceff_Wipe2", + "ovl_Oceff_Wipe3", + "ovl_Oceff_Wipe4", + "ovl_Shot_Sun", + "gameplay_keep", + "gameplay_field_keep", + "gameplay_dangeon_keep", + "gameplay_object_exchange_static", + "object_link_boy", + "object_link_child", + "object_box", + "object_human", + "object_okuta", + "object_poh", + "object_wallmaster", + "object_dy_obj", + "object_firefly", + "object_dodongo", + "object_fire", + "object_niw", + "object_tite", + "object_reeba", + "object_peehat", + "object_kingdodongo", + "object_horse", + "object_zf", + "object_goma", + "object_zl1", + "object_gol", + "object_bubble", + "object_dodojr", + "object_torch2", + "object_bl", + "object_tp", + "object_oA1", + "object_st", + "object_bw", + "object_ei", + "object_horse_normal", + "object_oB1", + "object_o_anime", + "object_spot04_objects", + "object_ddan_objects", + "object_hidan_objects", + "object_horse_ganon", + "object_oA2", + "object_spot00_objects", + "object_mb", + "object_bombf", + "object_sk2", + "object_oE1", + "object_oE_anime", + "object_oE2", + "object_ydan_objects", + "object_gnd", + "object_am", + "object_dekubaba", + "object_oA3", + "object_oA4", + "object_oA5", + "object_oA6", + "object_oA7", + "object_jj", + "object_oA8", + "object_oA9", + "object_oB2", + "object_oB3", + "object_oB4", + "object_horse_zelda", + "object_opening_demo1", + "object_warp1", + "object_b_heart", + "object_dekunuts", + "object_oE3", + "object_oE4", + "object_menkuri_objects", + "object_oE5", + "object_oE6", + "object_oE7", + "object_oE8", + "object_oE9", + "object_oE10", + "object_oE11", + "object_oE12", + "object_vali", + "object_oA10", + "object_oA11", + "object_mizu_objects", + "object_fhg", + "object_ossan", + "object_mori_hineri1", + "object_Bb", + "object_toki_objects", + "object_yukabyun", + "object_zl2", + "object_mjin", + "object_mjin_flash", + "object_mjin_dark", + "object_mjin_flame", + "object_mjin_ice", + "object_mjin_soul", + "object_mjin_wind", + "object_mjin_oka", + "object_haka_objects", + "object_spot06_objects", + "object_ice_objects", + "object_relay_objects", + "object_mori_hineri1a", + "object_mori_hineri2", + "object_mori_hineri2a", + "object_mori_objects", + "object_mori_tex", + "object_spot08_obj", + "object_warp2", + "object_hata", + "object_bird", + "object_wood02", + "object_lightbox", + "object_pu_box", + "object_trap", + "object_vase", + "object_im", + "object_ta", + "object_tk", + "object_xc", + "object_vm", + "object_bv", + "object_hakach_objects", + "object_efc_crystal_light", + "object_efc_fire_ball", + "object_efc_flash", + "object_efc_lgt_shower", + "object_efc_star_field", + "object_god_lgt", + "object_light_ring", + "object_triforce_spot", + "object_medal", + "object_bdan_objects", + "object_sd", + "object_rd", + "object_po_sisters", + "object_heavy_object", + "object_gndd", + "object_fd", + "object_du", + "object_fw", + "object_horse_link_child", + "object_spot02_objects", + "object_haka", + "object_ru1", + "object_syokudai", + "object_fd2", + "object_dh", + "object_rl", + "object_efc_tw", + "object_demo_tre_lgt", + "object_gi_key", + "object_mir_ray", + "object_brob", + "object_gi_jewel", + "object_spot09_obj", + "object_spot18_obj", + "object_bdoor", + "object_spot17_obj", + "object_shop_dungen", + "object_nb", + "object_mo", + "object_sb", + "object_gi_melody", + "object_gi_heart", + "object_gi_compass", + "object_gi_bosskey", + "object_gi_medal", + "object_gi_nuts", + "object_sa", + "object_gi_hearts", + "object_gi_arrowcase", + "object_gi_bombpouch", + "object_in", + "object_tr", + "object_spot16_obj", + "object_oE1s", + "object_oE4s", + "object_os_anime", + "object_gi_bottle", + "object_gi_stick", + "object_gi_map", + "object_oF1d_map", + "object_ru2", + "object_gi_shield_1", + "object_dekujr", + "object_gi_magicpot", + "object_gi_bomb_1", + "object_oF1s", + "object_ma2", + "object_gi_purse", + "object_hni", + "object_tw", + "object_rr", + "object_bxa", + "object_anubice", + "object_gi_gerudo", + "object_gi_arrow", + "object_gi_bomb_2", + "object_gi_egg", + "object_gi_scale", + "object_gi_shield_2", + "object_gi_hookshot", + "object_gi_ocarina", + "object_gi_milk", + "object_ma1", + "object_ganon", + "object_sst", + "object_ny", + "object_fr", + "object_gi_pachinko", + "object_gi_boomerang", + "object_gi_bow", + "object_gi_glasses", + "object_gi_liquid", + "object_ani", + "object_demo_6k", + "object_gi_shield_3", + "object_gi_letter", + "object_spot15_obj", + "object_jya_obj", + "object_gi_clothes", + "object_gi_bean", + "object_gi_fish", + "object_gi_saw", + "object_gi_hammer", + "object_gi_grass", + "object_gi_longsword", + "object_spot01_objects", + "object_md", + "object_km1", + "object_kw1", + "object_zo", + "object_kz", + "object_umajump", + "object_masterkokiri", + "object_masterkokirihead", + "object_mastergolon", + "object_masterzoora", + "object_aob", + "object_ik", + "object_ahg", + "object_cne", + "object_gi_niwatori", + "object_skj", + "object_gi_bottle_letter", + "object_bji", + "object_bba", + "object_gi_ocarina_0", + "object_ds", + "object_ane", + "object_boj", + "object_spot03_object", + "object_spot07_object", + "object_fz", + "object_bob", + "object_ge1", + "object_yabusame_point", + "object_gi_boots_2", + "object_gi_seed", + "object_gnd_magic", + "object_d_elevator", + "object_d_hsblock", + "object_d_lift", + "object_mamenoki", + "object_goroiwa", + "object_toryo", + "object_daiku", + "object_nwc", + "object_blkobj", + "object_gm", + "object_ms", + "object_hs", + "object_ingate", + "object_lightswitch", + "object_kusa", + "object_tsubo", + "object_gi_gloves", + "object_gi_coin", + "object_kanban", + "object_gjyo_objects", + "object_owl", + "object_mk", + "object_fu", + "object_gi_ki_tan_mask", + "object_gi_redead_mask", + "object_gi_skj_mask", + "object_gi_rabit_mask", + "object_gi_truth_mask", + "object_ganon_objects", + "object_siofuki", + "object_stream", + "object_mm", + "object_fa", + "object_os", + "object_gi_eye_lotion", + "object_gi_powder", + "object_gi_mushroom", + "object_gi_ticketstone", + "object_gi_brokensword", + "object_js", + "object_cs", + "object_gi_prescription", + "object_gi_bracelet", + "object_gi_soldout", + "object_gi_frog", + "object_mag", + "object_door_gerudo", + "object_gt", + "object_efc_erupc", + "object_zl2_anime1", + "object_zl2_anime2", + "object_gi_golonmask", + "object_gi_zoramask", + "object_gi_gerudomask", + "object_ganon2", + "object_ka", + "object_ts", + "object_zg", + "object_gi_hoverboots", + "object_gi_m_arrow", + "object_ds2", + "object_ec", + "object_fish", + "object_gi_sutaru", + "object_gi_goddess", + "object_ssh", + "object_bigokuta", + "object_bg", + "object_spot05_objects", + "object_spot12_obj", + "object_bombiwa", + "object_hintnuts", + "object_rs", + "object_spot00_break", + "object_gla", + "object_shopnuts", + "object_geldb", + "object_gr", + "object_dog", + "object_jya_iron", + "object_jya_door", + "object_spot01_objects2", + "object_spot11_obj", + "object_kibako2", + "object_dns", + "object_dnk", + "object_gi_fire", + "object_gi_insect", + "object_gi_butterfly", + "object_gi_ghost", + "object_gi_soul", + "object_bowl", + "object_po_field", + "object_demo_kekkai", + "object_efc_doughnut", + "object_gi_dekupouch", + "object_ganon_anime1", + "object_ganon_anime2", + "object_ganon_anime3", + "object_gi_rupy", + "object_spot01_matoya", + "object_spot01_matoyab", + "object_po_composer", + "object_mu", + "object_wf", + "object_skb", + "object_gj", + "object_geff", + "object_haka_door", + "object_gs", + "object_ps", + "object_bwall", + "object_crow", + "object_cow", + "object_cob", + "object_gi_sword_1", + "object_door_killer", + "object_ouke_haka", + "object_timeblock", + "object_zl4", + "g_pn_01", + "g_pn_02", + "g_pn_03", + "g_pn_04", + "g_pn_05", + "g_pn_06", + "g_pn_07", + "g_pn_08", + "g_pn_09", + "g_pn_10", + "g_pn_11", + "g_pn_12", + "g_pn_13", + "g_pn_14", + "g_pn_15", + "g_pn_16", + "g_pn_17", + "g_pn_18", + "g_pn_19", + "g_pn_20", + "g_pn_21", + "g_pn_22", + "g_pn_23", + "g_pn_24", + "g_pn_25", + "g_pn_26", + "g_pn_27", + "g_pn_28", + "g_pn_29", + "g_pn_30", + "g_pn_31", + "g_pn_32", + "g_pn_33", + "g_pn_34", + "g_pn_35", + "g_pn_36", + "g_pn_37", + "g_pn_38", + "g_pn_39", + "g_pn_40", + "g_pn_41", + "g_pn_42", + "g_pn_43", + "g_pn_44", + "g_pn_45", + "g_pn_46", + "g_pn_47", + "g_pn_48", + "g_pn_49", + "g_pn_50", + "g_pn_51", + "g_pn_52", + "g_pn_53", + "g_pn_54", + "g_pn_55", + "g_pn_56", + "g_pn_57", + "z_select_static", + "nintendo_rogo_static", + "title_static", + "parameter_static", + "vr_fine0_static", + "vr_fine0_pal_static", + "vr_fine1_static", + "vr_fine1_pal_static", + "vr_fine2_static", + "vr_fine2_pal_static", + "vr_fine3_static", + "vr_fine3_pal_static", + "vr_cloud0_static", + "vr_cloud0_pal_static", + "vr_cloud1_static", + "vr_cloud1_pal_static", + "vr_cloud2_static", + "vr_cloud2_pal_static", + "vr_cloud3_static", + "vr_cloud3_pal_static", + "vr_holy0_static", + "vr_holy0_pal_static", + "vr_holy1_static", + "vr_holy1_pal_static", + "vr_MDVR_static", + "vr_MDVR_pal_static", + "vr_MNVR_static", + "vr_MNVR_pal_static", + "vr_RUVR_static", + "vr_RUVR_pal_static", + "vr_LHVR_static", + "vr_LHVR_pal_static", + "vr_KHVR_static", + "vr_KHVR_pal_static", + "vr_K3VR_static", + "vr_K3VR_pal_static", + "vr_K4VR_static", + "vr_K4VR_pal_static", + "vr_K5VR_static", + "vr_K5VR_pal_static", + "vr_SP1a_static", + "vr_SP1a_pal_static", + "vr_MLVR_static", + "vr_MLVR_pal_static", + "vr_KKRVR_static", + "vr_KKRVR_pal_static", + "vr_KR3VR_static", + "vr_KR3VR_pal_static", + "vr_IPVR_static", + "vr_IPVR_pal_static", + "vr_KSVR_static", + "vr_KSVR_pal_static", + "vr_GLVR_static", + "vr_GLVR_pal_static", + "vr_ZRVR_static", + "vr_ZRVR_pal_static", + "vr_DGVR_static", + "vr_DGVR_pal_static", + "vr_ALVR_static", + "vr_ALVR_pal_static", + "vr_NSVR_static", + "vr_NSVR_pal_static", + "vr_LBVR_static", + "vr_LBVR_pal_static", + "vr_TTVR_static", + "vr_TTVR_pal_static", + "vr_FCVR_static", + "vr_FCVR_pal_static", + "elf_message_field", + "elf_message_ydan", + "syotes_scene", + "syotes_room_0", + "syotes2_scene", + "syotes2_room_0", + "depth_test_scene", + "depth_test_room_0", + "spot00_scene", + "spot00_room_0", + "spot01_scene", + "spot01_room_0", + "spot02_scene", + "spot02_room_0", + "spot02_room_1", + "spot03_scene", + "spot03_room_0", + "spot03_room_1", + "spot04_scene", + "spot04_room_0", + "spot04_room_1", + "spot04_room_2", + "spot05_scene", + "spot05_room_0", + "spot06_scene", + "spot06_room_0", + "spot07_scene", + "spot07_room_0", + "spot07_room_1", + "spot08_scene", + "spot08_room_0", + "spot09_scene", + "spot09_room_0", + "spot10_scene", + "spot10_room_0", + "spot10_room_1", + "spot10_room_2", + "spot10_room_3", + "spot10_room_4", + "spot10_room_5", + "spot10_room_6", + "spot10_room_7", + "spot10_room_8", + "spot10_room_9", + "spot11_scene", + "spot11_room_0", + "spot12_scene", + "spot12_room_0", + "spot12_room_1", + "spot13_scene", + "spot13_room_0", + "spot13_room_1", + "spot15_scene", + "spot15_room_0", + "spot16_scene", + "spot16_room_0", + "spot17_scene", + "spot17_room_0", + "spot17_room_1", + "spot18_scene", + "spot18_room_0", + "spot18_room_1", + "spot18_room_2", + "spot18_room_3", + "ydan_scene", + "ydan_room_0", + "ydan_room_1", + "ydan_room_2", + "ydan_room_3", + "ydan_room_4", + "ydan_room_5", + "ydan_room_6", + "ydan_room_7", + "ydan_room_8", + "ydan_room_9", + "ydan_room_10", + "ydan_room_11", + "ddan_scene", + "ddan_room_0", + "ddan_room_1", + "ddan_room_2", + "ddan_room_3", + "ddan_room_4", + "ddan_room_5", + "ddan_room_6", + "ddan_room_7", + "ddan_room_8", + "ddan_room_9", + "ddan_room_10", + "ddan_room_11", + "ddan_room_12", + "ddan_room_13", + "ddan_room_14", + "ddan_room_15", + "ddan_room_16", + "bdan_scene", + "bdan_room_0", + "bdan_room_1", + "bdan_room_2", + "bdan_room_3", + "bdan_room_4", + "bdan_room_5", + "bdan_room_6", + "bdan_room_7", + "bdan_room_8", + "bdan_room_9", + "bdan_room_10", + "bdan_room_11", + "bdan_room_12", + "bdan_room_13", + "bdan_room_14", + "bdan_room_15", + "Bmori1_scene", + "Bmori1_room_0", + "Bmori1_room_1", + "Bmori1_room_2", + "Bmori1_room_3", + "Bmori1_room_4", + "Bmori1_room_5", + "Bmori1_room_6", + "Bmori1_room_7", + "Bmori1_room_8", + "Bmori1_room_9", + "Bmori1_room_10", + "Bmori1_room_11", + "Bmori1_room_12", + "Bmori1_room_13", + "Bmori1_room_14", + "Bmori1_room_15", + "Bmori1_room_16", + "Bmori1_room_17", + "Bmori1_room_18", + "Bmori1_room_19", + "Bmori1_room_20", + "Bmori1_room_21", + "Bmori1_room_22", + "HIDAN_scene", + "HIDAN_room_0", + "HIDAN_room_1", + "HIDAN_room_2", + "HIDAN_room_3", + "HIDAN_room_4", + "HIDAN_room_5", + "HIDAN_room_6", + "HIDAN_room_7", + "HIDAN_room_8", + "HIDAN_room_9", + "HIDAN_room_10", + "HIDAN_room_11", + "HIDAN_room_12", + "HIDAN_room_13", + "HIDAN_room_14", + "HIDAN_room_15", + "HIDAN_room_16", + "HIDAN_room_17", + "HIDAN_room_18", + "HIDAN_room_19", + "HIDAN_room_20", + "HIDAN_room_21", + "HIDAN_room_22", + "HIDAN_room_23", + "HIDAN_room_24", + "HIDAN_room_25", + "HIDAN_room_26", + "MIZUsin_scene", + "MIZUsin_room_0", + "MIZUsin_room_1", + "MIZUsin_room_2", + "MIZUsin_room_3", + "MIZUsin_room_4", + "MIZUsin_room_5", + "MIZUsin_room_6", + "MIZUsin_room_7", + "MIZUsin_room_8", + "MIZUsin_room_9", + "MIZUsin_room_10", + "MIZUsin_room_11", + "MIZUsin_room_12", + "MIZUsin_room_13", + "MIZUsin_room_14", + "MIZUsin_room_15", + "MIZUsin_room_16", + "MIZUsin_room_17", + "MIZUsin_room_18", + "MIZUsin_room_19", + "MIZUsin_room_20", + "MIZUsin_room_21", + "MIZUsin_room_22", + "jyasinzou_scene", + "jyasinzou_room_0", + "jyasinzou_room_1", + "jyasinzou_room_2", + "jyasinzou_room_3", + "jyasinzou_room_4", + "jyasinzou_room_5", + "jyasinzou_room_6", + "jyasinzou_room_7", + "jyasinzou_room_8", + "jyasinzou_room_9", + "jyasinzou_room_10", + "jyasinzou_room_11", + "jyasinzou_room_12", + "jyasinzou_room_13", + "jyasinzou_room_14", + "jyasinzou_room_15", + "jyasinzou_room_16", + "jyasinzou_room_17", + "jyasinzou_room_18", + "jyasinzou_room_19", + "jyasinzou_room_20", + "jyasinzou_room_21", + "jyasinzou_room_22", + "jyasinzou_room_23", + "jyasinzou_room_24", + "jyasinzou_room_25", + "jyasinzou_room_26", + "jyasinzou_room_27", + "jyasinzou_room_28", + "HAKAdan_scene", + "HAKAdan_room_0", + "HAKAdan_room_1", + "HAKAdan_room_2", + "HAKAdan_room_3", + "HAKAdan_room_4", + "HAKAdan_room_5", + "HAKAdan_room_6", + "HAKAdan_room_7", + "HAKAdan_room_8", + "HAKAdan_room_9", + "HAKAdan_room_10", + "HAKAdan_room_11", + "HAKAdan_room_12", + "HAKAdan_room_13", + "HAKAdan_room_14", + "HAKAdan_room_15", + "HAKAdan_room_16", + "HAKAdan_room_17", + "HAKAdan_room_18", + "HAKAdan_room_19", + "HAKAdan_room_20", + "HAKAdan_room_21", + "HAKAdan_room_22", + "HAKAdanCH_scene", + "HAKAdanCH_room_0", + "HAKAdanCH_room_1", + "HAKAdanCH_room_2", + "HAKAdanCH_room_3", + "HAKAdanCH_room_4", + "HAKAdanCH_room_5", + "HAKAdanCH_room_6", + "ice_doukutu_scene", + "ice_doukutu_room_0", + "ice_doukutu_room_1", + "ice_doukutu_room_2", + "ice_doukutu_room_3", + "ice_doukutu_room_4", + "ice_doukutu_room_5", + "ice_doukutu_room_6", + "ice_doukutu_room_7", + "ice_doukutu_room_8", + "ice_doukutu_room_9", + "ice_doukutu_room_10", + "ice_doukutu_room_11", + "men_scene", + "men_room_0", + "men_room_1", + "men_room_2", + "men_room_3", + "men_room_4", + "men_room_5", + "men_room_6", + "men_room_7", + "men_room_8", + "men_room_9", + "men_room_10", + "ganontika_scene", + "ganontika_room_0", + "ganontika_room_1", + "ganontika_room_2", + "ganontika_room_3", + "ganontika_room_4", + "ganontika_room_5", + "ganontika_room_6", + "ganontika_room_7", + "ganontika_room_8", + "ganontika_room_9", + "ganontika_room_10", + "ganontika_room_11", + "ganontika_room_12", + "ganontika_room_13", + "ganontika_room_14", + "ganontika_room_15", + "ganontika_room_16", + "ganontika_room_17", + "ganontika_room_18", + "ganontika_room_19", + "market_day_scene", + "market_day_room_0", + "market_night_scene", + "market_night_room_0", + "testroom_scene", + "testroom_room_0", + "testroom_room_1", + "testroom_room_2", + "testroom_room_3", + "testroom_room_4", + "kenjyanoma_scene", + "kenjyanoma_room_0", + "tokinoma_scene", + "tokinoma_room_0", + "tokinoma_room_1", + "sutaru_scene", + "sutaru_room_0", + "link_home_scene", + "link_home_room_0", + "kokiri_shop_scene", + "kokiri_shop_room_0", + "kokiri_home_scene", + "kokiri_home_room_0", + "kakusiana_scene", + "kakusiana_room_0", + "kakusiana_room_1", + "kakusiana_room_2", + "kakusiana_room_3", + "kakusiana_room_4", + "kakusiana_room_5", + "kakusiana_room_6", + "kakusiana_room_7", + "kakusiana_room_8", + "kakusiana_room_9", + "kakusiana_room_10", + "kakusiana_room_11", + "kakusiana_room_12", + "kakusiana_room_13", + "entra_scene", + "entra_room_0", + "moribossroom_scene", + "moribossroom_room_0", + "moribossroom_room_1", + "syatekijyou_scene", + "syatekijyou_room_0", + "shop1_scene", + "shop1_room_0", + "hairal_niwa_scene", + "hairal_niwa_room_0", + "ganon_tou_scene", + "ganon_tou_room_0", + "sasatest_scene", + "sasatest_room_0", + "market_alley_scene", + "market_alley_room_0", + "spot20_scene", + "spot20_room_0", + "market_ruins_scene", + "market_ruins_room_0", + "entra_n_scene", + "entra_n_room_0", + "enrui_scene", + "enrui_room_0", + "market_alley_n_scene", + "market_alley_n_room_0", + "hiral_demo_scene", + "hiral_demo_room_0", + "kokiri_home3_scene", + "kokiri_home3_room_0", + "malon_stable_scene", + "malon_stable_room_0", + "kakariko_scene", + "kakariko_room_0", + "bdan_boss_scene", + "bdan_boss_room_0", + "bdan_boss_room_1", + "FIRE_bs_scene", + "FIRE_bs_room_0", + "FIRE_bs_room_1", + "hut_scene", + "hut_room_0", + "daiyousei_izumi_scene", + "daiyousei_izumi_room_0", + "hakaana_scene", + "hakaana_room_0", + "yousei_izumi_tate_scene", + "yousei_izumi_tate_room_0", + "yousei_izumi_yoko_scene", + "yousei_izumi_yoko_room_0", + "golon_scene", + "golon_room_0", + "zoora_scene", + "zoora_room_0", + "drag_scene", + "drag_room_0", + "alley_shop_scene", + "alley_shop_room_0", + "night_shop_scene", + "night_shop_room_0", + "impa_scene", + "impa_room_0", + "labo_scene", + "labo_room_0", + "tent_scene", + "tent_room_0", + "nakaniwa_scene", + "nakaniwa_room_0", + "ddan_boss_scene", + "ddan_boss_room_0", + "ddan_boss_room_1", + "ydan_boss_scene", + "ydan_boss_room_0", + "ydan_boss_room_1", + "HAKAdan_bs_scene", + "HAKAdan_bs_room_0", + "HAKAdan_bs_room_1", + "MIZUsin_bs_scene", + "MIZUsin_bs_room_0", + "MIZUsin_bs_room_1", + "ganon_scene", + "ganon_room_0", + "ganon_room_1", + "ganon_room_2", + "ganon_room_3", + "ganon_room_4", + "ganon_room_5", + "ganon_room_6", + "ganon_room_7", + "ganon_room_8", + "ganon_room_9", + "ganon_boss_scene", + "ganon_boss_room_0", + "jyasinboss_scene", + "jyasinboss_room_0", + "jyasinboss_room_1", + "jyasinboss_room_2", + "jyasinboss_room_3", + "kokiri_home4_scene", + "kokiri_home4_room_0", + "kokiri_home5_scene", + "kokiri_home5_room_0", + "ganon_final_scene", + "ganon_final_room_0", + "kakariko3_scene", + "kakariko3_room_0", + "hairal_niwa2_scene", + "hairal_niwa2_room_0", + "hakasitarelay_scene", + "hakasitarelay_room_0", + "hakasitarelay_room_1", + "hakasitarelay_room_2", + "hakasitarelay_room_3", + "hakasitarelay_room_4", + "hakasitarelay_room_5", + "hakasitarelay_room_6", + "shrine_scene", + "shrine_room_0", + "turibori_scene", + "turibori_room_0", + "shrine_n_scene", + "shrine_n_room_0", + "shrine_r_scene", + "shrine_r_room_0", + "hakaana2_scene", + "hakaana2_room_0", + "gerudoway_scene", + "gerudoway_room_0", + "gerudoway_room_1", + "gerudoway_room_2", + "gerudoway_room_3", + "gerudoway_room_4", + "gerudoway_room_5", + "hairal_niwa_n_scene", + "hairal_niwa_n_room_0", + "bowling_scene", + "bowling_room_0", + "hakaana_ouke_scene", + "hakaana_ouke_room_0", + "hakaana_ouke_room_1", + "hakaana_ouke_room_2", + "hylia_labo_scene", + "hylia_labo_room_0", + "souko_scene", + "souko_room_0", + "souko_room_1", + "souko_room_2", + "miharigoya_scene", + "miharigoya_room_0", + "mahouya_scene", + "mahouya_room_0", + "takaraya_scene", + "takaraya_room_0", + "takaraya_room_1", + "takaraya_room_2", + "takaraya_room_3", + "takaraya_room_4", + "takaraya_room_5", + "takaraya_room_6", + "ganon_sonogo_scene", + "ganon_sonogo_room_0", + "ganon_sonogo_room_1", + "ganon_sonogo_room_2", + "ganon_sonogo_room_3", + "ganon_sonogo_room_4", + "ganon_demo_scene", + "ganon_demo_room_0", + "besitu_scene", + "besitu_room_0", + "face_shop_scene", + "face_shop_room_0", + "kinsuta_scene", + "kinsuta_room_0", + "ganontikasonogo_scene", + "ganontikasonogo_room_0", + "ganontikasonogo_room_1", + "test01_scene", + "test01_room_0", + "bump_texture_static", + "anime_model_1_static", + "anime_model_2_static", + "anime_model_3_static", + "anime_model_4_static", + "anime_model_5_static", + "anime_model_6_static", + "anime_texture_1_static", + "anime_texture_2_static", + "anime_texture_3_static", + "anime_texture_4_static", + "anime_texture_5_static", + "anime_texture_6_static", "softsprite_matrix_static", }; -s32 DmaMgr_CompareName(const char* name1, const char* name2) -{ - while (*name1 != 0u) - { - if (*name1 > *name2) +s32 DmaMgr_CompareName(const char* name1, const char* name2) { + while (*name1 != 0u) { + if (*name1 > *name2) { return 1; + } - if (*name1 < *name2) + if (*name1 < *name2) { return -1; + } name1++; name2++; } - if (*name2 > 0) + if (*name2 > 0) { return -1; + } return 0; } -s32 DmaMgr_DMARomToRam(u32 rom, u32 ram, u32 size) -{ +s32 DmaMgr_DMARomToRam(u32 rom, u32 ram, u32 size) { OSIoMesg ioMsg; OSMesgQueue queue; OSMesg msg; @@ -1579,15 +1578,15 @@ s32 DmaMgr_DMARomToRam(u32 rom, u32 ram, u32 size) u32 pad[2]; buffSize = sDmaMgrDmaBuffSize; - if (buffSize == 0) + if (buffSize == 0) { buffSize = 0x2000; + } osInvalICache((void*)ram, size); osInvalDCache((void*)ram, size); osCreateMesgQueue(&queue, &msg, 1); - while (size > buffSize) - { + while (size > buffSize) { if (1) {} // Necessary to match ioMsg.hdr.pri = OS_MESG_PRI_NORMAL; @@ -1596,22 +1595,24 @@ s32 DmaMgr_DMARomToRam(u32 rom, u32 ram, u32 size) ioMsg.dramAddr = (void*)ram; ioMsg.size = buffSize; - if (D_80009460 == 10) - osSyncPrintf("%10lld ノーマルＤＭＡ %08x %08x %08x (%d)\n", - OS_CYCLES_TO_USEC(osGetTime()), ioMsg.dramAddr, ioMsg.devAddr, ioMsg.size, gPiMgrCmdQ.validCount); + if (D_80009460 == 10) { + osSyncPrintf("%10lld ノーマルＤＭＡ %08x %08x %08x (%d)\n", OS_CYCLES_TO_USEC(osGetTime()), ioMsg.dramAddr, + ioMsg.devAddr, ioMsg.size, gPiMgrCmdQ.validCount); + } ret = osEPiStartDma(gCartHandle, &ioMsg, OS_READ); - if (ret) + if (ret) { goto DmaMgr_DMARomToRam_end; + } - if (D_80009460 == 10) - osSyncPrintf("%10lld ノーマルＤＭＡ START (%d)\n", - OS_CYCLES_TO_USEC(osGetTime()), gPiMgrCmdQ.validCount); + if (D_80009460 == 10) { + osSyncPrintf("%10lld ノーマルＤＭＡ START (%d)\n", OS_CYCLES_TO_USEC(osGetTime()), gPiMgrCmdQ.validCount); + } osRecvMesg(&queue, NULL, 1); - if (D_80009460 == 10) - osSyncPrintf("%10lld ノーマルＤＭＡ END (%d)\n", - OS_CYCLES_TO_USEC(osGetTime()), gPiMgrCmdQ.validCount); + if (D_80009460 == 10) { + osSyncPrintf("%10lld ノーマルＤＭＡ END (%d)\n", OS_CYCLES_TO_USEC(osGetTime()), gPiMgrCmdQ.validCount); + } size -= buffSize; rom += buffSize; @@ -1626,18 +1627,20 @@ s32 DmaMgr_DMARomToRam(u32 rom, u32 ram, u32 size) ioMsg.dramAddr = (void*)ram; ioMsg.size = size; - if (D_80009460 == 10) - osSyncPrintf("%10lld ノーマルＤＭＡ %08x %08x %08x (%d)\n", - OS_CYCLES_TO_USEC(osGetTime()), ioMsg.dramAddr, ioMsg.devAddr, ioMsg.size, gPiMgrCmdQ.validCount); + if (D_80009460 == 10) { + osSyncPrintf("%10lld ノーマルＤＭＡ %08x %08x %08x (%d)\n", OS_CYCLES_TO_USEC(osGetTime()), ioMsg.dramAddr, + ioMsg.devAddr, ioMsg.size, gPiMgrCmdQ.validCount); + } ret = osEPiStartDma(gCartHandle, &ioMsg, OS_READ); - if (ret) + if (ret) { goto DmaMgr_DMARomToRam_end; + } osRecvMesg(&queue, NULL, 1); - if (D_80009460 == 10) - osSyncPrintf("%10lld ノーマルＤＭＡ END (%d)\n", - OS_CYCLES_TO_USEC(osGetTime()), gPiMgrCmdQ.validCount); + if (D_80009460 == 10) { + osSyncPrintf("%10lld ノーマルＤＭＡ END (%d)\n", OS_CYCLES_TO_USEC(osGetTime()), gPiMgrCmdQ.validCount); + } DmaMgr_DMARomToRam_end: osInvalICache((void*)ram, size); @@ -1646,31 +1649,34 @@ DmaMgr_DMARomToRam_end: return ret; } -s32 DmaMgr_DmaCallback0(OSPiHandle* pihandle, OSIoMesg* mb, s32 direction) -{ +s32 DmaMgr_DmaCallback0(OSPiHandle* pihandle, OSIoMesg* mb, s32 direction) { s32 ret; - if (pihandle != gCartHandle) + if (pihandle != gCartHandle) { __assert("pihandle == carthandle", "../z_std_dma.c", 530); - - if (direction != OS_READ) - __assert("direction == OS_READ", "../z_std_dma.c", 531); - - if (mb == NULL) - __assert("mb != NULL", "../z_std_dma.c", 532); + } - if (D_80009460 == 10) - osSyncPrintf("%10lld サウンドＤＭＡ %08x %08x %08x (%d)\n", - OS_CYCLES_TO_USEC(osGetTime()), mb->dramAddr, mb->devAddr, mb->size, gPiMgrCmdQ.validCount); + if (direction != OS_READ) { + __assert("direction == OS_READ", "../z_std_dma.c", 531); + } + + if (mb == NULL) { + __assert("mb != NULL", "../z_std_dma.c", 532); + } + + if (D_80009460 == 10) { + osSyncPrintf("%10lld サウンドＤＭＡ %08x %08x %08x (%d)\n", OS_CYCLES_TO_USEC(osGetTime()), mb->dramAddr, + mb->devAddr, mb->size, gPiMgrCmdQ.validCount); + } ret = osEPiStartDma(pihandle, mb, direction); - if (ret) + if (ret) { osSyncPrintf("OOPS!!\n"); + } return ret; } -void DmaMgr_DmaCallback1(u32 ram, u32 rom, u32 size) -{ +void DmaMgr_DmaCallback1(u32 ram, u32 rom, u32 size) { OSPiHandle* handle; OSMesgQueue queue; OSMesg msg; @@ -1693,13 +1699,12 @@ void DmaMgr_DmaCallback1(u32 ram, u32 rom, u32 size) return; } -void DmaMgr_Error(DmaRequest* req, const char* file, const char* errorName, const char* errorDesc) -{ +void DmaMgr_Error(DmaRequest* req, const char* file, const char* errorName, const char* errorDesc) { u32 vrom; u32 ram; u32 size; - char buff1 [80]; - char buff2 [80]; + char buff1[80]; + char buff2[80]; vrom = req->vromAddr; ram = (u32)req->dramAddr; @@ -1708,60 +1713,61 @@ void DmaMgr_Error(DmaRequest* req, const char* file, const char* errorName, cons osSyncPrintf("%c", 7); osSyncPrintf(VT_FGCOL(RED)); osSyncPrintf("DMA致命的エラー(%s)\nROM:%X RAM:%X SIZE:%X %s\n", - errorDesc ? errorDesc : (errorName ? errorName : "???"), - vrom, ram, size, file ? file : "???"); + errorDesc ? errorDesc : (errorName ? errorName : "???"), vrom, ram, size, file ? file : "???"); - if (req->filename) + if (req->filename) { osSyncPrintf("DMA ERROR: %s %d", req->filename, req->line); - else if (sDmaMgrCurFileName) + } else if (sDmaMgrCurFileName) { osSyncPrintf("DMA ERROR: %s %d", sDmaMgrCurFileName, sDmaMgrCurFileLine); + } osSyncPrintf(VT_RST); - if (req->filename) + if (req->filename) { sprintf(buff1, "DMA ERROR: %s %d", req->filename, req->line); - else if (sDmaMgrCurFileName) + } else if (sDmaMgrCurFileName) { sprintf(buff1, "DMA ERROR: %s %d", sDmaMgrCurFileName, sDmaMgrCurFileLine); - else + } else { sprintf(buff1, "DMA ERROR: %s", errorName ? errorName : "???"); - + } + sprintf(buff2, "%07X %08X %X %s", vrom, ram, size, file ? file : "???"); Fault_AddHungupAndCrashImpl(buff1, buff2); } -const char* DmaMgr_GetFileNameImpl(u32 vrom) -{ +const char* DmaMgr_GetFileNameImpl(u32 vrom) { DmaEntry* iter; const char** name; iter = gDmaDataTable; name = sDmaMgrFileNames; - while (iter->vromEnd) - { - if (vrom >= iter->vromStart && vrom < iter->vromEnd) + while (iter->vromEnd) { + if (vrom >= iter->vromStart && vrom < iter->vromEnd) { return *name; + } iter++; name++; } - // BUG: since the devs forgot to return in case the file isn't found, the return value will be a pointer to the end of gDmaDataTable + // BUG: since the devs forgot to return in case the file isn't found, the return value will be a pointer to the end + // of gDmaDataTable } -const char* DmaMgr_GetFileName(u32 vrom) -{ +const char* DmaMgr_GetFileName(u32 vrom) { const char* ret = DmaMgr_GetFileNameImpl(vrom); - if (!ret) + if (!ret) { return "(unknown)"; + } - if (DmaMgr_CompareName(ret, "kanji") == 0 || DmaMgr_CompareName(ret, "link_animetion") == 0) + if (DmaMgr_CompareName(ret, "kanji") == 0 || DmaMgr_CompareName(ret, "link_animetion") == 0) { return NULL; + } return ret; } -void DmaMgr_ProcessMsg(DmaRequest* req) -{ +void DmaMgr_ProcessMsg(DmaRequest* req) { u32 vrom; void* ram; u32 size; @@ -1781,35 +1787,33 @@ void DmaMgr_ProcessMsg(DmaRequest* req) // defined in .rodata but not used "DMA ROM:%08X RAM:%08X SIZE:%08X %s\n"; - while (iter->vromEnd) - { - if (vrom >= iter->vromStart && vrom < iter->vromEnd) - { + while (iter->vromEnd) { + if (vrom >= iter->vromStart && vrom < iter->vromEnd) { if (1) {} // Necessary to match - if (iter->romEnd == 0) - { - if (iter->vromEnd < vrom + size) + if (iter->romEnd == 0) { + if (iter->vromEnd < vrom + size) { DmaMgr_Error(req, filename, "Segment Alignment Error", "セグメント境界をまたがってＤＭＡ転送することはできません"); + } DmaMgr_DMARomToRam(iter->romStart + (vrom - iter->vromStart), (u32)ram, size); found = true; "No Press ROM:%08X RAM:%08X SIZE:%08X\n"; - } - else - { + } else { romStart = iter->romStart; romSize = iter->romEnd - iter->romStart; - if (vrom != iter->vromStart) + if (vrom != iter->vromStart) { DmaMgr_Error(req, filename, "Can't Transfer Segment", "圧縮されたセグメントの途中からはＤＭＡ転送することはできません"); + } - if (size != iter->vromEnd - iter->vromStart) + if (size != iter->vromEnd - iter->vromStart) { DmaMgr_Error(req, filename, "Can't Transfer Segment", "圧縮されたセグメントの一部だけをＤＭＡ転送することはできません"); + } osSetThreadPri(NULL, 0x0A); Yaz0_Decompress(romStart, ram, romSize); @@ -1823,10 +1827,8 @@ void DmaMgr_ProcessMsg(DmaRequest* req) iter++; } - if (!found) - { - if (sDmaMgrDataExistError) - { + if (!found) { + if (sDmaMgrDataExistError) { DmaMgr_Error(req, NULL, "DATA DON'T EXIST", "該当するデータが存在しません"); return; } @@ -1837,25 +1839,23 @@ void DmaMgr_ProcessMsg(DmaRequest* req) } } -void DmaMgr_ThreadEntry(void* arg0) -{ +void DmaMgr_ThreadEntry(void* arg0) { OSMesg msg; DmaRequest* req; - + osSyncPrintf("ＤＭＡマネージャスレッド実行開始\n"); - while (true) - { + while (true) { osRecvMesg(&sDmaMgrMsgQueue, &msg, 1); req = (DmaRequest*)msg; - if (!req) + if (!req) { break; - + } + // strings present in .rodata but not actually used in the function, probably a removed function "ＤＭＡ登録受付 dmap=%08x\n"; DmaMgr_ProcessMsg(req); - if (req->notifyQueue) - { + if (req->notifyQueue) { osSendMesg(req->notifyQueue, req->notifyMsg, 0); "osSendMesg: dmap=%08x, mq=%08x, m=%08x \n"; } @@ -1863,13 +1863,13 @@ void DmaMgr_ThreadEntry(void* arg0) osSyncPrintf("ＤＭＡマネージャスレッド実行終了\n"); } -s32 DmaMgr_SendRequestImpl(DmaRequest* req, u32 ram, u32 vrom, u32 size, u32 unk, OSMesgQueue* queue, OSMesg msg) -{ +s32 DmaMgr_SendRequestImpl(DmaRequest* req, u32 ram, u32 vrom, u32 size, u32 unk, OSMesgQueue* queue, OSMesg msg) { static s32 sDmaMgrQueueFullLogged = 0; - if ((1 && (ram == 0)) || (osMemSize < ram + size + 0x80000000) || - (vrom & 1) || (vrom > 0x4000000U) || (size == 0) || (size & 1)) + if ((1 && (ram == 0)) || (osMemSize < ram + size + 0x80000000) || (vrom & 1) || (vrom > 0x4000000U) || + (size == 0) || (size & 1)) { DmaMgr_Error(req, NULL, "ILLIGAL DMA-FUNCTION CALL", "パラメータ異常です"); + } req->vromAddr = vrom; req->dramAddr = (void*)ram; @@ -1878,17 +1878,14 @@ s32 DmaMgr_SendRequestImpl(DmaRequest* req, u32 ram, u32 vrom, u32 size, u32 unk req->notifyQueue = queue; req->notifyMsg = msg; - if (1) - { - if ((sDmaMgrQueueFullLogged == 0) && (sDmaMgrMsgQueue.validCount >= sDmaMgrMsgQueue.msgCount)) - { + if (1) { + if ((sDmaMgrQueueFullLogged == 0) && (sDmaMgrMsgQueue.validCount >= sDmaMgrMsgQueue.msgCount)) { sDmaMgrQueueFullLogged++; osSyncPrintf("%c", 7); osSyncPrintf(VT_FGCOL(RED)); osSyncPrintf("dmaEntryMsgQが一杯です。キューサイズの再検討をおすすめします。"); - LogUtils_LogThreadId("../z_std_dma.c", 952); - osSyncPrintf("(sizeof(dmaEntryMsgBufs) / sizeof(dmaEntryMsgBufs[0])) = %d\n", - (sizeof(sDmaMgrMsgs) / sizeof(sDmaMgrMsgs[0]))); + LOG_NUM("(sizeof(dmaEntryMsgBufs) / sizeof(dmaEntryMsgBufs[0]))", ARRAY_COUNT(sDmaMgrMsgs), + "../z_std_dma.c", 952); osSyncPrintf(VT_RST); } } @@ -1897,8 +1894,7 @@ s32 DmaMgr_SendRequestImpl(DmaRequest* req, u32 ram, u32 vrom, u32 size, u32 unk return 0; } -s32 DmaMgr_SendRequest0(u32 ram, u32 vrom, u32 size) -{ +s32 DmaMgr_SendRequest0(u32 ram, u32 vrom, u32 size) { DmaRequest req; OSMesgQueue queue; OSMesg msg; @@ -1906,22 +1902,23 @@ s32 DmaMgr_SendRequest0(u32 ram, u32 vrom, u32 size) osCreateMesgQueue(&queue, &msg, 1); ret = DmaMgr_SendRequestImpl(&req, ram, vrom, size, 0, &queue, NULL); - if (ret == -1) + if (ret == -1) { return ret; - + } + osRecvMesg(&queue, NULL, 1); return 0; } -void DmaMgr_Start() -{ +void DmaMgr_Start() { const char** name; s32 idx; DmaEntry* iter; if (_dmadataSegmentRomStart) {} // Necessary to match - DmaMgr_DMARomToRam((u32)_dmadataSegmentRomStart, (u32)_dmadataSegmentStart, (u32)_dmadataSegmentRomEnd - (u32)_dmadataSegmentRomStart); + DmaMgr_DMARomToRam((u32)_dmadataSegmentRomStart, (u32)_dmadataSegmentStart, + (u32)_dmadataSegmentRomEnd - (u32)_dmadataSegmentRomStart); osSyncPrintf("dma_rom_ad[]\n"); sDmaMgrDataExistError = 0; @@ -1929,45 +1926,44 @@ void DmaMgr_Start() iter = gDmaDataTable; idx = 0; - while (iter->vromEnd != 0) - { - if (iter->romEnd != 0) + while (iter->vromEnd != 0) { + if (iter->romEnd != 0) { sDmaMgrDataExistError = 1; + } - osSyncPrintf("%3d %08x %08x %08x %08x %08x %c %s\n", - idx, iter->vromStart, iter->vromEnd, iter->romStart, iter->romEnd, - (iter->romEnd != 0) ? iter->romEnd - iter->romStart : iter->vromEnd - iter->vromStart, - (((iter->romEnd != 0) ? iter->romEnd - iter->romStart : 0) > 0x10000) ? '*' : ' ', - name ? *name : ""); + osSyncPrintf( + "%3d %08x %08x %08x %08x %08x %c %s\n", idx, iter->vromStart, iter->vromEnd, iter->romStart, iter->romEnd, + (iter->romEnd != 0) ? iter->romEnd - iter->romStart : iter->vromEnd - iter->vromStart, + (((iter->romEnd != 0) ? iter->romEnd - iter->romStart : 0) > 0x10000) ? '*' : ' ', name ? *name : ""); idx++; iter++; - if (name) + if (name) { name++; + } } - if ((u32)_bootSegmentRomStart != gDmaDataTable[0].vromEnd) - { - osSyncPrintf("_bootSegmentRomStart(%08x) != dma_rom_ad[0].rom_b(%08x)\n", _bootSegmentRomStart, gDmaDataTable[0].vromEnd); + if ((u32)_bootSegmentRomStart != gDmaDataTable[0].vromEnd) { + osSyncPrintf("_bootSegmentRomStart(%08x) != dma_rom_ad[0].rom_b(%08x)\n", _bootSegmentRomStart, + gDmaDataTable[0].vromEnd); Fault_AddHungupAndCrash("../z_std_dma.c", 1055); } - osCreateMesgQueue(&sDmaMgrMsgQueue, sDmaMgrMsgs, sizeof(sDmaMgrMsgs)/sizeof(sDmaMgrMsgs[0])); - StackCheck_Init(&sDmaMgrStackInfo, sDmaMgrStack, sDmaMgrStack+sizeof(sDmaMgrStack), 0, 0x100, "dmamgr"); - osCreateThread(&sDmaMgrThread, 0x12, &DmaMgr_ThreadEntry, 0, sDmaMgrStack+sizeof(sDmaMgrStack) ,0x10); + osCreateMesgQueue(&sDmaMgrMsgQueue, sDmaMgrMsgs, sizeof(sDmaMgrMsgs) / sizeof(sDmaMgrMsgs[0])); + StackCheck_Init(&sDmaMgrStackInfo, sDmaMgrStack, sDmaMgrStack + sizeof(sDmaMgrStack), 0, 0x100, "dmamgr"); + osCreateThread(&sDmaMgrThread, 0x12, &DmaMgr_ThreadEntry, 0, sDmaMgrStack + sizeof(sDmaMgrStack), 0x10); osStartThread(&sDmaMgrThread); } -s32 DmaMgr_SendRequest2(DmaRequest* req, u32 ram, u32 vrom, u32 size, u32 unk5, OSMesgQueue* queue, OSMesg msg, const char* file, s32 line) -{ +s32 DmaMgr_SendRequest2(DmaRequest* req, u32 ram, u32 vrom, u32 size, u32 unk5, OSMesgQueue* queue, OSMesg msg, + const char* file, s32 line) { req->filename = file; req->line = line; DmaMgr_SendRequestImpl(req, ram, vrom, size, unk5, queue, msg); } -s32 DmaMgr_SendRequest1(void* ram0, u32 vrom, u32 size, const char* file, s32 line) -{ +s32 DmaMgr_SendRequest1(void* ram0, u32 vrom, u32 size, const char* file, s32 line) { DmaRequest req; s32 ret; OSMesgQueue queue; @@ -1979,9 +1975,10 @@ s32 DmaMgr_SendRequest1(void* ram0, u32 vrom, u32 size, const char* file, s32 li req.line = line; osCreateMesgQueue(&queue, &msg, 1); ret = DmaMgr_SendRequestImpl(&req, ram, vrom, size, 0, &queue, 0); - if (ret == -1) + if (ret == -1) { return ret; - + } + osRecvMesg(&queue, NULL, 1); return 0; } diff --git a/src/buffers/gfxbuffers.c b/src/buffers/gfxbuffers.c index 6423e4c122..9a538bf311 100644 --- a/src/buffers/gfxbuffers.c +++ b/src/buffers/gfxbuffers.c @@ -4,7 +4,7 @@ u64 gGfxSPTaskOutputBuffer[0x3000]; // 0xC00 bytes -u8 gGfxSPTaskYieldBuffer[OS_YIELD_DATA_SIZE]; +u8 gGfxSPTaskYieldBuffer[OS_YIELD_DATA_SIZE]; // 0x400 bytes u8 gGfxSPTaskStack[0x400]; diff --git a/src/code/TwoHeadArena.c b/src/code/TwoHeadArena.c index b466954428..23cfa00f81 100644 --- a/src/code/TwoHeadArena.c +++ b/src/code/TwoHeadArena.c @@ -1,172 +1,141 @@ #include -void THGA_Ct(TwoHeadGfxArena* thga, Gfx* start, u32 size) -{ +void THGA_Ct(TwoHeadGfxArena* thga, Gfx* start, u32 size) { THA_Ct((TwoHeadArena*)thga, start, size); } -void THGA_Dt(TwoHeadGfxArena* thga) -{ +void THGA_Dt(TwoHeadGfxArena* thga) { THA_Dt((TwoHeadArena*)thga); } -u32 THGA_IsCrash(TwoHeadGfxArena* thga) -{ +u32 THGA_IsCrash(TwoHeadGfxArena* thga) { return THA_IsCrash((TwoHeadArena*)thga); } -void THGA_Init(TwoHeadGfxArena* thga) -{ +void THGA_Init(TwoHeadGfxArena* thga) { THA_Init((TwoHeadArena*)thga); } -s32 THGA_GetSize(TwoHeadGfxArena* thga) -{ +s32 THGA_GetSize(TwoHeadGfxArena* thga) { return THA_GetSize((TwoHeadArena*)thga); } -Gfx* THGA_GetHead(TwoHeadGfxArena* thga) -{ +Gfx* THGA_GetHead(TwoHeadGfxArena* thga) { return THA_GetHead((TwoHeadArena*)thga); } -void THGA_SetHead(TwoHeadGfxArena* thga, Gfx* start) -{ +void THGA_SetHead(TwoHeadGfxArena* thga, Gfx* start) { THA_SetHead((TwoHeadArena*)thga, start); } -Gfx* THGA_GetTail(TwoHeadGfxArena* thga) -{ +Gfx* THGA_GetTail(TwoHeadGfxArena* thga) { return THA_GetTail((TwoHeadArena*)thga); } -Gfx* THGA_AllocStartArray8(TwoHeadGfxArena* thga, u32 count) -{ +Gfx* THGA_AllocStartArray8(TwoHeadGfxArena* thga, u32 count) { return THA_AllocStart((TwoHeadArena*)thga, count * 8); } -Gfx* THGA_AllocStart8(TwoHeadGfxArena* thga) -{ +Gfx* THGA_AllocStart8(TwoHeadGfxArena* thga) { return THGA_AllocStartArray8(thga, 1); } -Gfx* THGA_AllocStart8Wrapper(TwoHeadGfxArena* thga) -{ +Gfx* THGA_AllocStart8Wrapper(TwoHeadGfxArena* thga) { return THGA_AllocStart8(thga); } -Gfx* THGA_AllocEnd(TwoHeadGfxArena* thga, u32 size) -{ +Gfx* THGA_AllocEnd(TwoHeadGfxArena* thga, u32 size) { return THA_AllocEnd((TwoHeadArena*)thga, size); } -Gfx* THGA_AllocEndArray64(TwoHeadGfxArena* thga, u32 count) -{ +Gfx* THGA_AllocEndArray64(TwoHeadGfxArena* thga, u32 count) { return THGA_AllocEnd(thga, count * 0x40); } -Gfx* THGA_AllocEnd64(TwoHeadGfxArena* thga) -{ +Gfx* THGA_AllocEnd64(TwoHeadGfxArena* thga) { return THGA_AllocEnd(thga, 0x40); } -Gfx* THGA_AllocEndArray16(TwoHeadGfxArena* thga, u32 count) -{ +Gfx* THGA_AllocEndArray16(TwoHeadGfxArena* thga, u32 count) { return THGA_AllocEnd(thga, count * 0x10); } -Gfx* THGA_AllocEnd16(TwoHeadGfxArena* thga) -{ +Gfx* THGA_AllocEnd16(TwoHeadGfxArena* thga) { return THGA_AllocEnd(thga, 0x10); } - - - - -void* THA_GetHead(TwoHeadArena* tha) -{ +void* THA_GetHead(TwoHeadArena* tha) { return tha->head; } -void THA_SetHead(TwoHeadArena* tha, void* start) -{ +void THA_SetHead(TwoHeadArena* tha, void* start) { tha->head = start; } -void* THA_GetTail(TwoHeadArena* tha) -{ +void* THA_GetTail(TwoHeadArena* tha) { return tha->tail; } -void* THA_AllocStart(TwoHeadArena* tha, u32 size) -{ +void* THA_AllocStart(TwoHeadArena* tha, u32 size) { void* start = tha->head; tha->head += size; return start; } -void* THA_AllocStart1(TwoHeadArena* tha) -{ +void* THA_AllocStart1(TwoHeadArena* tha) { return THA_AllocStart(tha, 1); } -void* THA_AllocEnd(TwoHeadArena* tha, u32 size) -{ +void* THA_AllocEnd(TwoHeadArena* tha, u32 size) { u32 mask; u32* temp; - if (size == 8) + if (size == 8) { mask = ~7; - else if (size == 4 || size == 12) + } else if (size == 4 || size == 12) { mask = ~3; - else if (size == 2 || size == 6 || size == 10 || size == 12 || size == 14) + } else if (size == 2 || size == 6 || size == 10 || size == 12 || size == 14) { mask = ~1; - else + } else { mask = (size >= 0x10) ? ~0xF : 0; + } temp = (u32*)&tha->tail; // required to match return tha->tail = (void*)(((*temp & mask) - size) & mask); } -void* THA_AllocEndAlign16(TwoHeadArena *tha, u32 size) -{ - void* ret = (void*)(u32)((((u32)tha->tail & ~0xF) - size) & ((~(0xF & 0xFFFFFFFFFFFFFFFF)) & 0xFFFFFFFFu)); // required to match +void* THA_AllocEndAlign16(TwoHeadArena* tha, u32 size) { + void* ret = (void*)(u32)((((u32)tha->tail & ~0xF) - size) & + ((~(0xF & 0xFFFFFFFFFFFFFFFF)) & 0xFFFFFFFFu)); // required to match tha->tail = ret; return ret; } -void* THA_AllocEndAlign(TwoHeadArena* tha, u32 size, u32 mask) -{ +void* THA_AllocEndAlign(TwoHeadArena* tha, u32 size, u32 mask) { void* ret = (void*)((((u32)tha->tail & mask) - size) & mask); tha->tail = ret; return ret; } -s32 THA_GetSize(TwoHeadArena* tha) -{ +s32 THA_GetSize(TwoHeadArena* tha) { return tha->tail - tha->head; } -u32 THA_IsCrash(TwoHeadArena* tha) -{ +u32 THA_IsCrash(TwoHeadArena* tha) { return THA_GetSize(tha) < 0; } -void THA_Init(TwoHeadArena* tha) -{ +void THA_Init(TwoHeadArena* tha) { tha->head = tha->bufp; tha->tail = tha->bufp + tha->size; } -void THA_Ct(TwoHeadArena* tha, void* ptr, u32 size) -{ +void THA_Ct(TwoHeadArena* tha, void* ptr, u32 size) { tha->bufp = ptr; tha->size = size; THA_Init(tha); } -void THA_Dt(TwoHeadArena* tha) -{ +void THA_Dt(TwoHeadArena* tha) { bzero(tha, sizeof(TwoHeadArena)); } diff --git a/src/code/__osMalloc.c b/src/code/__osMalloc.c index 0d8fec1799..d5501c663d 100644 --- a/src/code/__osMalloc.c +++ b/src/code/__osMalloc.c @@ -1,63 +1,53 @@ #include #include -#define FILL_ALLOCBLOCK (1 << 0) -#define FILL_FREEBLOCK (1 << 1) -#define CHECK_FREE_BLOCK (1 << 2) +#define FILL_ALLOCBLOCK (1 << 0) +#define FILL_FREEBLOCK (1 << 1) +#define CHECK_FREE_BLOCK (1 << 2) -#define NODE_MAGIC (0x7373) +#define NODE_MAGIC (0x7373) -#define BLOCK_UNINIT_MAGIC (0xAB) -#define BLOCK_UNINIT_MAGIC_32 (0xABABABAB) -#define BLOCK_ALLOC_MAGIC (0xCD) -#define BLOCK_ALLOC_MAGIC_32 (0xCDCDCDCD) -#define BLOCK_FREE_MAGIC (0xEF) -#define BLOCK_FREE_MAGIC_32 (0xEFEFEFEF) +#define BLOCK_UNINIT_MAGIC (0xAB) +#define BLOCK_UNINIT_MAGIC_32 (0xABABABAB) +#define BLOCK_ALLOC_MAGIC (0xCD) +#define BLOCK_ALLOC_MAGIC_32 (0xCDCDCDCD) +#define BLOCK_FREE_MAGIC (0xEF) +#define BLOCK_FREE_MAGIC_32 (0xEFEFEFEF) OSMesg sArenaLockMsg; u32 __osMalloc_FreeBlockTest_Enable; -bool ArenaImpl_GetFillAllocBlock(Arena* arena) -{ +bool ArenaImpl_GetFillAllocBlock(Arena* arena) { return (arena->flag & FILL_ALLOCBLOCK) != 0; } -bool ArenaImpl_GetFillFreeBlock(Arena* arena) -{ +bool ArenaImpl_GetFillFreeBlock(Arena* arena) { return (arena->flag & FILL_FREEBLOCK) != 0; } -bool ArenaImpl_GetCheckFreeBlock(Arena* arena) -{ +bool ArenaImpl_GetCheckFreeBlock(Arena* arena) { return (arena->flag & CHECK_FREE_BLOCK) != 0; } -void ArenaImpl_SetFillAllocBlock(Arena* arena) -{ +void ArenaImpl_SetFillAllocBlock(Arena* arena) { arena->flag |= FILL_ALLOCBLOCK; } -void ArenaImpl_SetFillFreeBlock(Arena* arena) -{ +void ArenaImpl_SetFillFreeBlock(Arena* arena) { arena->flag |= FILL_FREEBLOCK; } -void ArenaImpl_SetCheckFreeBlock(Arena* arena) -{ +void ArenaImpl_SetCheckFreeBlock(Arena* arena) { arena->flag |= CHECK_FREE_BLOCK; } -void ArenaImpl_UnsetFillAllocBlock(Arena* arena) -{ +void ArenaImpl_UnsetFillAllocBlock(Arena* arena) { arena->flag &= ~FILL_ALLOCBLOCK; } -void ArenaImpl_UnsetFillFreeBlock(Arena* arena) -{ +void ArenaImpl_UnsetFillFreeBlock(Arena* arena) { arena->flag &= ~FILL_FREEBLOCK; } -void ArenaImpl_UnsetCheckFreeBlock(Arena* arena) -{ +void ArenaImpl_UnsetCheckFreeBlock(Arena* arena) { arena->flag &= ~CHECK_FREE_BLOCK; } -void ArenaImpl_SetDebugInfo(ArenaNode* node, const char* file, s32 line, Arena* arena) -{ +void ArenaImpl_SetDebugInfo(ArenaNode* node, const char* file, s32 line, Arena* arena) { node->filename = file; node->line = line; node->threadId = osGetThreadId(NULL); @@ -65,28 +55,23 @@ void ArenaImpl_SetDebugInfo(ArenaNode* node, const char* file, s32 line, Arena* node->time = osGetTime(); } -void ArenaImpl_LockInit(Arena* arena) -{ +void ArenaImpl_LockInit(Arena* arena) { osCreateMesgQueue(&arena->lock, &sArenaLockMsg, 1); } -void ArenaImpl_Lock(Arena* arena) -{ +void ArenaImpl_Lock(Arena* arena) { osSendMesg(&arena->lock, NULL, OS_MESG_BLOCK); } -void ArenaImpl_Unlock(Arena* arena) -{ +void ArenaImpl_Unlock(Arena* arena) { osRecvMesg(&arena->lock, NULL, OS_MESG_BLOCK); } -ArenaNode* ArenaImpl_GetNextBlock(ArenaNode* node) -{ +ArenaNode* ArenaImpl_GetNextBlock(ArenaNode* node) { ArenaNode* ret; ret = node->next; - if (ret && (!ret || (ret->magic != NODE_MAGIC))) - { + if (ret && (!ret || (ret->magic != NODE_MAGIC))) { osSyncPrintf(VT_COL(RED, WHITE) "緊急事態！メモリリーク発見！ (block=%08x)\n" VT_RST, ret); ret = NULL; node->next = NULL; @@ -95,13 +80,11 @@ ArenaNode* ArenaImpl_GetNextBlock(ArenaNode* node) return ret; } -ArenaNode* ArenaImpl_GetPrevBlock(ArenaNode* node) -{ +ArenaNode* ArenaImpl_GetPrevBlock(ArenaNode* node) { ArenaNode* ret; ret = node->prev; - if (ret && (!ret || (ret->magic != NODE_MAGIC))) - { + if (ret && (!ret || (ret->magic != NODE_MAGIC))) { osSyncPrintf(VT_COL(RED, WHITE) "緊急事態！メモリリーク発見！ (block=%08x)\n" VT_RST, ret); ret = NULL; node->prev = NULL; @@ -110,16 +93,13 @@ ArenaNode* ArenaImpl_GetPrevBlock(ArenaNode* node) return ret; } -ArenaNode* ArenaImpl_GetLastBlock(Arena* arena) -{ +ArenaNode* ArenaImpl_GetLastBlock(Arena* arena) { ArenaNode* ret = NULL; ArenaNode* iter; - if (arena && arena->head && arena->head->magic == NODE_MAGIC) - { + if (arena && arena->head && arena->head->magic == NODE_MAGIC) { iter = arena->head; - while (iter) - { + while (iter) { ret = iter; iter = ArenaImpl_GetNextBlock(iter); } @@ -128,29 +108,25 @@ ArenaNode* ArenaImpl_GetLastBlock(Arena* arena) return ret; } -void __osMallocInit(Arena* arena, void* start, u32 size) -{ +void __osMallocInit(Arena* arena, void* start, u32 size) { bzero(arena, sizeof(Arena)); ArenaImpl_LockInit(arena); __osMallocAddBlock(arena, start, size); arena->isInit = true; } -void __osMallocAddBlock(Arena* arena, void* start, s32 size) -{ +void __osMallocAddBlock(Arena* arena, void* start, s32 size) { s32 diff; s32 size2; ArenaNode* firstNode; ArenaNode* lastNode; - - if (start) - { + + if (start) { firstNode = (ArenaNode*)ALIGN16((u32)start); diff = (s32)firstNode - (s32)start; size2 = (size - diff) & ~0xF; - if (size2 > (s32)sizeof(ArenaNode)) - { - func_80106860(firstNode, BLOCK_UNINIT_MAGIC, size2); //memset + if (size2 > (s32)sizeof(ArenaNode)) { + func_80106860(firstNode, BLOCK_UNINIT_MAGIC, size2); // memset firstNode->next = NULL; firstNode->prev = NULL; firstNode->size = size2 - sizeof(ArenaNode); @@ -158,13 +134,10 @@ void __osMallocAddBlock(Arena* arena, void* start, s32 size) firstNode->magic = NODE_MAGIC; ArenaImpl_Lock(arena); lastNode = ArenaImpl_GetLastBlock(arena); - if (!lastNode) - { + if (!lastNode) { arena->head = firstNode; arena->start = start; - } - else - { + } else { firstNode->prev = lastNode; lastNode->next = firstNode; } @@ -173,53 +146,47 @@ void __osMallocAddBlock(Arena* arena, void* start, s32 size) } } -void ArenaImpl_RemoveAllBlocks(Arena* arena) -{ +void ArenaImpl_RemoveAllBlocks(Arena* arena) { ArenaNode* iter; ArenaNode* next; ArenaImpl_Lock(arena); iter = arena->head; - while (iter) - { + while (iter) { next = ArenaImpl_GetNextBlock(iter); - func_80106860(iter, BLOCK_UNINIT_MAGIC, iter->size + sizeof(ArenaNode)); //memset + func_80106860(iter, BLOCK_UNINIT_MAGIC, iter->size + sizeof(ArenaNode)); // memset iter = next; } ArenaImpl_Unlock(arena); } -void __osMallocCleanup(Arena* arena) -{ +void __osMallocCleanup(Arena* arena) { ArenaImpl_RemoveAllBlocks(arena); bzero(arena, sizeof(*arena)); } -u8 __osMallocIsInitalized(Arena* arena) -{ +u8 __osMallocIsInitalized(Arena* arena) { return arena->isInit; } -void __osMalloc_FreeBlockTest(Arena *arena, ArenaNode *node) -{ - ArenaNode *node2; +void __osMalloc_FreeBlockTest(Arena* arena, ArenaNode* node) { + ArenaNode* node2; u32* start; u32* end; u32* iter; node2 = node; - if (__osMalloc_FreeBlockTest_Enable) - { + if (__osMalloc_FreeBlockTest_Enable) { start = (u32*)((u32)node + sizeof(ArenaNode)); - end = (u32*)((u32) start + node2->size); + end = (u32*)((u32)start + node2->size); iter = start; - while (iter < end) - { - if (*iter != BLOCK_UNINIT_MAGIC_32 && *iter != BLOCK_FREE_MAGIC_32) - { - osSyncPrintf(VT_COL(RED, WHITE) "緊急事態！メモリリーク検出！ (block=%08x s=%08x e=%08x p=%08x)\n" VT_RST, node, start, end, iter); + while (iter < end) { + if (*iter != BLOCK_UNINIT_MAGIC_32 && *iter != BLOCK_FREE_MAGIC_32) { + osSyncPrintf( + VT_COL(RED, WHITE) "緊急事態！メモリリーク検出！ (block=%08x s=%08x e=%08x p=%08x)\n" VT_RST, node, + start, end, iter); __osDisplayArena(arena); return; } @@ -228,31 +195,26 @@ void __osMalloc_FreeBlockTest(Arena *arena, ArenaNode *node) } } -//single instruction not matching, stack problem -#ifdef NON_MATCHING -void* __osMalloc_NoLockDebug(Arena *arena, u32 size, const char *file, s32 line) -{ - ArenaNode *iter; +void* __osMalloc_NoLockDebug(Arena* arena, u32 size, const char* file, s32 line) { + ArenaNode* iter; u32 blockSize; - ArenaNode *newNode; - void *ret; - ArenaNode *next; - u32 pad; + ArenaNode* newNode; + void* ret; + ArenaNode* next; ret = NULL; iter = arena->head; size = ALIGN16(size); - while (iter) - { - if (iter->isFree && iter->size >= size) - { - if ((arena->flag & CHECK_FREE_BLOCK) != 0) - __osMalloc_FreeBlockTest(arena, iter); + blockSize = ALIGN16(size) + sizeof(ArenaNode); - blockSize = ALIGN16(size) + sizeof(ArenaNode); - if (blockSize < iter->size) - { - newNode = (ArenaNode *)((u32)iter + blockSize); + while (iter) { + if (iter->isFree && iter->size >= size) { + if (arena->flag & CHECK_FREE_BLOCK) { + __osMalloc_FreeBlockTest(arena, iter); + } + + if (blockSize < iter->size) { + newNode = (ArenaNode*)((u32)iter + blockSize); newNode->next = ArenaImpl_GetNextBlock(iter); newNode->prev = iter; newNode->size = iter->size - blockSize; @@ -262,15 +224,17 @@ void* __osMalloc_NoLockDebug(Arena *arena, u32 size, const char *file, s32 line) iter->next = newNode; iter->size = size; next = ArenaImpl_GetNextBlock(newNode); - if (next) + if (next) { next->prev = newNode; + } } iter->isFree = false; ArenaImpl_SetDebugInfo(iter, file, line, arena); - ret = (void *)((u32)iter + sizeof(ArenaNode)); - if ((arena->flag & FILL_ALLOCBLOCK) != 0) + ret = (void*)((u32)iter + sizeof(ArenaNode)); + if (arena->flag & FILL_ALLOCBLOCK) { func_80106860(ret, BLOCK_ALLOC_MAGIC, size); + } break; } @@ -280,12 +244,8 @@ void* __osMalloc_NoLockDebug(Arena *arena, u32 size, const char *file, s32 line) return ret; } -#else -#pragma GLOBAL_ASM("asm/non_matchings/code/__osMalloc/__osMalloc_NoLockDebug.s") -#endif -void* __osMallocDebug(Arena* arena, u32 size, const char* file, s32 line) -{ +void* __osMallocDebug(Arena* arena, u32 size, const char* file, s32 line) { void* ret; ArenaImpl_Lock(arena); ret = __osMalloc_NoLockDebug(arena, size, file, line); @@ -293,31 +253,27 @@ void* __osMallocDebug(Arena* arena, u32 size, const char* file, s32 line) return ret; } -//stack + missing a move -#ifdef NON_MATCHING -void* __osMallocRDebug(Arena *arena, u32 size, const char *file, s32 line) -{ - ArenaNode *iter; +void* __osMallocRDebug(Arena* arena, u32 size, const char* file, s32 line) { + ArenaNode* iter; + ArenaNode* newNode; u32 blockSize; - ArenaNode *newNode; - ArenaNode *next; - void *ret; + ArenaNode* next; + void* ret; ret = NULL; size = ALIGN16(size); ArenaImpl_Lock(arena); - iter = ArenaImpl_GetLastBlock(arena);; - while (iter) - { - if (iter->isFree && iter->size >= size) - { - if ((arena->flag & CHECK_FREE_BLOCK) != 0) + iter = ArenaImpl_GetLastBlock(arena); + + while (iter) { + if (iter->isFree && iter->size >= size) { + if (arena->flag & CHECK_FREE_BLOCK) { __osMalloc_FreeBlockTest(arena, iter); + } blockSize = ALIGN16(size) + sizeof(ArenaNode); - if (blockSize < iter->size) - { - newNode = (ArenaNode *)((u32)iter + (iter->size - size)); + if (blockSize < iter->size) { + newNode = (ArenaNode*)((u32)iter + (iter->size - size)); newNode->next = ArenaImpl_GetNextBlock(iter); newNode->prev = iter; newNode->size = size; @@ -326,15 +282,19 @@ void* __osMallocRDebug(Arena *arena, u32 size, const char *file, s32 line) iter->next = newNode; iter->size -= blockSize; next = ArenaImpl_GetNextBlock(newNode); - if (next) + if (next) { next->prev = newNode; + } + + iter = newNode; } iter->isFree = false; ArenaImpl_SetDebugInfo(iter, file, line, arena); - ret = (void *)((u32)iter + sizeof(ArenaNode)); - if ((arena->flag & FILL_ALLOCBLOCK) != 0) + ret = (void*)((u32)iter + sizeof(ArenaNode)); + if (arena->flag & FILL_ALLOCBLOCK) { func_80106860(ret, BLOCK_ALLOC_MAGIC, size); + } break; } @@ -345,36 +305,28 @@ void* __osMallocRDebug(Arena *arena, u32 size, const char *file, s32 line) ArenaImpl_Unlock(arena); return ret; } -#else -#pragma GLOBAL_ASM("asm/non_matchings/code/__osMalloc/__osMallocRDebug.s") -#endif - -//same diff as __osMalloc_NoLockDebug -#ifdef NON_MATCHING -void* __osMalloc_NoLock(Arena *arena, u32 size) -{ - ArenaNode *iter; +void* __osMalloc_NoLock(Arena* arena, u32 size) { + ArenaNode* iter; u32 blockSize; - ArenaNode *newNode; - void *ret; - ArenaNode *next; - u32 pad; + ArenaNode* newNode; + void* ret; + ArenaNode* next; ret = NULL; iter = arena->head; size = ALIGN16(size); - while (iter) - { - if (iter->isFree && iter->size >= size) - { - if ((arena->flag & CHECK_FREE_BLOCK) != 0) - __osMalloc_FreeBlockTest(arena, iter); + blockSize = ALIGN16(size) + sizeof(ArenaNode); - blockSize = ALIGN16(size) + sizeof(ArenaNode); - if (blockSize < iter->size) - { - newNode = (ArenaNode *)((u32)iter + blockSize); + while (iter) { + + if (iter->isFree && iter->size >= size) { + if (arena->flag & CHECK_FREE_BLOCK) { + __osMalloc_FreeBlockTest(arena, iter); + } + + if (blockSize < iter->size) { + newNode = (ArenaNode*)((u32)iter + blockSize); newNode->next = ArenaImpl_GetNextBlock(iter); newNode->prev = iter; newNode->size = iter->size - blockSize; @@ -384,15 +336,17 @@ void* __osMalloc_NoLock(Arena *arena, u32 size) iter->next = newNode; iter->size = size; next = ArenaImpl_GetNextBlock(newNode); - if (next) + if (next) { next->prev = newNode; + } } iter->isFree = false; ArenaImpl_SetDebugInfo(iter, NULL, 0, arena); - ret = (void *)((u32)iter + sizeof(ArenaNode)); - if ((arena->flag & FILL_ALLOCBLOCK) != 0) + ret = (void*)((u32)iter + sizeof(ArenaNode)); + if (arena->flag & FILL_ALLOCBLOCK) { func_80106860(ret, BLOCK_ALLOC_MAGIC, size); + } break; } @@ -402,12 +356,8 @@ void* __osMalloc_NoLock(Arena *arena, u32 size) return ret; } -#else -#pragma GLOBAL_ASM("asm/non_matchings/code/__osMalloc/__osMalloc_NoLock.s") -#endif -void* __osMalloc(Arena* arena, u32 size) -{ +void* __osMalloc(Arena* arena, u32 size) { void* ret; ArenaImpl_Lock(arena); ret = __osMalloc_NoLock(arena, size); @@ -415,31 +365,27 @@ void* __osMalloc(Arena* arena, u32 size) return ret; } -//same diff as __osMallocRDebug -#ifdef NON_MATCHING -void* __osMallocR(Arena *arena, u32 size) -{ - ArenaNode *iter; +void* __osMallocR(Arena* arena, u32 size) { + ArenaNode* iter; + ArenaNode* newNode; u32 blockSize; - ArenaNode *newNode; - ArenaNode *next; - void *ret; + ArenaNode* next; + void* ret; ret = NULL; size = ALIGN16(size); ArenaImpl_Lock(arena); - iter = ArenaImpl_GetLastBlock(arena);; - while (iter) - { - if (iter->isFree && iter->size >= size) - { - if ((arena->flag & CHECK_FREE_BLOCK) != 0) + iter = ArenaImpl_GetLastBlock(arena); + + while (iter) { + if (iter->isFree && iter->size >= size) { + if (arena->flag & CHECK_FREE_BLOCK) { __osMalloc_FreeBlockTest(arena, iter); + } blockSize = ALIGN16(size) + sizeof(ArenaNode); - if (blockSize < iter->size) - { - newNode = (ArenaNode *)((u32)iter + (iter->size - size)); + if (blockSize < iter->size) { + newNode = (ArenaNode*)((u32)iter + (iter->size - size)); newNode->next = ArenaImpl_GetNextBlock(iter); newNode->prev = iter; newNode->size = size; @@ -448,15 +394,19 @@ void* __osMallocR(Arena *arena, u32 size) iter->next = newNode; iter->size -= blockSize; next = ArenaImpl_GetNextBlock(newNode); - if (next) + if (next) { next->prev = newNode; + } + + iter = newNode; } iter->isFree = false; ArenaImpl_SetDebugInfo(iter, NULL, 0, arena); - ret = (void *)((u32)iter + sizeof(ArenaNode)); - if ((arena->flag & FILL_ALLOCBLOCK) != 0) + ret = (void*)((u32)iter + sizeof(ArenaNode)); + if (arena->flag & FILL_ALLOCBLOCK) { func_80106860(ret, BLOCK_ALLOC_MAGIC, size); + } break; } @@ -467,37 +417,28 @@ void* __osMallocR(Arena *arena, u32 size) ArenaImpl_Unlock(arena); return ret; } -#else -#pragma GLOBAL_ASM("asm/non_matchings/code/__osMalloc/__osMallocR.s") -#endif - -//small reordering -#ifdef NON_MATCHING -void __osFree_NoLock(Arena* arena, void* ptr) -{ +void __osFree_NoLock(Arena* arena, void* ptr) { ArenaNode* node; ArenaNode* next; ArenaNode* prev; ArenaNode* newNext; - if (ptr) - { + if (ptr) { node = (ArenaNode*)((u32)ptr - sizeof(ArenaNode)); - if (node == NULL || node->magic != NODE_MAGIC) - { - osSyncPrintf(VT_COL(RED, WHITE) "__osFree:不正解放(%08x)\n" VT_RST, arena); //__osFree: Unauthorized release (%08x) + if (node == NULL || node->magic != NODE_MAGIC) { + osSyncPrintf(VT_COL(RED, WHITE) "__osFree:不正解放(%08x)\n" VT_RST, + ptr); // __osFree: Unauthorized release (%08x) return; } - if (node->isFree) - { - osSyncPrintf(VT_COL(RED, WHITE) "__osFree:二重解放(%08x)\n" VT_RST, arena); //__osFree: Double release (%08x) + if (node->isFree) { + osSyncPrintf(VT_COL(RED, WHITE) "__osFree:二重解放(%08x)\n" VT_RST, ptr); // __osFree: Double release (%08x) return; } - if (arena != node->arena && arena != NULL) - { - //__osFree:Tried to release in a different way than when it was secured (%08x:%08x) - osSyncPrintf(VT_COL(RED, WHITE) "__osFree:確保時と違う方法で解放しようとした (%08x:%08x)\n" VT_RST, arena, node->arena); + if (arena != node->arena && arena != NULL) { + // __osFree:Tried to release in a different way than when it was secured (%08x:%08x) + osSyncPrintf(VT_COL(RED, WHITE) "__osFree:確保時と違う方法で解放しようとした (%08x:%08x)\n" VT_RST, arena, + node->arena); return; } @@ -505,73 +446,66 @@ void __osFree_NoLock(Arena* arena, void* ptr) prev = ArenaImpl_GetPrevBlock(node); node->isFree = true; ArenaImpl_SetDebugInfo(node, NULL, 0, arena); - if ((arena->flag & FILL_FREEBLOCK) != 0) - { + if (arena->flag & FILL_FREEBLOCK) { func_80106860((u32)node + sizeof(ArenaNode), BLOCK_FREE_MAGIC, node->size); } - newNext = node->next; - if ((u32)next == (u32)node + sizeof(ArenaNode) + node->size && next->isFree) - { + newNext = next; + if ((u32)next == (u32)node + sizeof(ArenaNode) + node->size && next->isFree) { newNext = ArenaImpl_GetNextBlock(next); - if (newNext) + if (newNext) { newNext->prev = node; - + } + node->size += next->size + sizeof(ArenaNode); - if ((arena->flag & FILL_FREEBLOCK) != 0) + if (arena->flag & FILL_FREEBLOCK) { func_80106860(next, BLOCK_FREE_MAGIC, sizeof(ArenaNode)); + } node->next = newNext; + next = newNext; } - if (prev && prev->isFree && (u32)node == (u32)prev + sizeof(ArenaNode) + prev->size) - { - if (newNext) - newNext->prev = prev; - prev->next = newNext; + + if (prev && prev->isFree && (u32)node == (u32)prev + sizeof(ArenaNode) + prev->size) { + if (next) { + next->prev = prev; + } + prev->next = next; prev->size += node->size + sizeof(ArenaNode); - if ((arena->flag & FILL_FREEBLOCK) != 0) + if (arena->flag & FILL_FREEBLOCK) { func_80106860(node, BLOCK_FREE_MAGIC, sizeof(ArenaNode)); + } } - } - } -#else -#pragma GLOBAL_ASM("asm/non_matchings/code/__osMalloc/__osFree_NoLock.s") -#endif -void __osFree(Arena* arena, void* ptr) -{ +void __osFree(Arena* arena, void* ptr) { ArenaImpl_Lock(arena); __osFree_NoLock(arena, ptr); ArenaImpl_Unlock(arena); } -//small reordering -#ifdef NON_MATCHING -void __osFree_NoLockDebug(Arena* arena, void* ptr, const char* file, s32 line) -{ +void __osFree_NoLockDebug(Arena* arena, void* ptr, const char* file, s32 line) { ArenaNode* node; ArenaNode* next; ArenaNode* prev; ArenaNode* newNext; - if (ptr) - { + if (ptr) { node = (ArenaNode*)((u32)ptr - sizeof(ArenaNode)); - if (node == NULL || node->magic != NODE_MAGIC) - { - osSyncPrintf(VT_COL(RED, WHITE) "__osFree:不正解放(%08x) [%s:%d ]\n" VT_RST, arena, file, line); //__osFree: Unauthorized release (%08x) + if (node == NULL || node->magic != NODE_MAGIC) { + osSyncPrintf(VT_COL(RED, WHITE) "__osFree:不正解放(%08x) [%s:%d ]\n" VT_RST, ptr, file, + line); // __osFree: Unauthorized release (%08x) return; } - if (node->isFree) - { - osSyncPrintf(VT_COL(RED, WHITE) "__osFree:二重解放(%08x)\n" VT_RST, arena); //__osFree: Double release (%08x) + if (node->isFree) { + osSyncPrintf(VT_COL(RED, WHITE) "__osFree:二重解放(%08x) [%s:%d ]\n" VT_RST, ptr, file, + line); // __osFree: Double release (%08x) return; } - if (arena != node->arena && arena != NULL) - { - //__osFree:Tried to release in a different way than when it was secured (%08x:%08x) - osSyncPrintf(VT_COL(RED, WHITE) "__osFree:確保時と違う方法で解放しようとした (%08x:%08x)\n" VT_RST, arena, node->arena); + if (arena != node->arena && arena != NULL) { + // __osFree:Tried to release in a different way than when it was secured (%08x:%08x) + osSyncPrintf(VT_COL(RED, WHITE) "__osFree:確保時と違う方法で解放しようとした (%08x:%08x)\n" VT_RST, arena, + node->arena); return; } @@ -579,175 +513,145 @@ void __osFree_NoLockDebug(Arena* arena, void* ptr, const char* file, s32 line) prev = ArenaImpl_GetPrevBlock(node); node->isFree = true; ArenaImpl_SetDebugInfo(node, file, line, arena); - if ((arena->flag & FILL_FREEBLOCK) != 0) - { + if (arena->flag & FILL_FREEBLOCK) { func_80106860((u32)node + sizeof(ArenaNode), BLOCK_FREE_MAGIC, node->size); } newNext = node->next; - if ((u32)next == (u32)node + sizeof(ArenaNode) + node->size && next->isFree) - { + if ((u32)next == (u32)node + sizeof(ArenaNode) + node->size && next->isFree) { newNext = ArenaImpl_GetNextBlock(next); - if (newNext) + if (newNext) { newNext->prev = node; - + } + node->size += next->size + sizeof(ArenaNode); - if ((arena->flag & FILL_FREEBLOCK) != 0) + if (arena->flag & FILL_FREEBLOCK) { func_80106860(next, BLOCK_FREE_MAGIC, sizeof(ArenaNode)); + } node->next = newNext; + next = newNext; } - if (prev && prev->isFree && (u32)node == (u32)prev + sizeof(ArenaNode) + prev->size) - { - if (newNext) - newNext->prev = prev; - prev->next = newNext; + + if (prev && prev->isFree && (u32)node == (u32)prev + sizeof(ArenaNode) + prev->size) { + if (next) { + next->prev = prev; + } + prev->next = next; prev->size += node->size + sizeof(ArenaNode); - if ((arena->flag & FILL_FREEBLOCK) != 0) + if (arena->flag & FILL_FREEBLOCK) { func_80106860(node, BLOCK_FREE_MAGIC, sizeof(ArenaNode)); + } } - } - } -#else -#pragma GLOBAL_ASM("asm/non_matchings/code/__osMalloc/__osFree_NoLockDebug.s") -#endif -void __osFreeDebug(Arena* arena, void* ptr, const char* file, s32 line) -{ +void __osFreeDebug(Arena* arena, void* ptr, const char* file, s32 line) { ArenaImpl_Lock(arena); __osFree_NoLockDebug(arena, ptr, file, line); ArenaImpl_Unlock(arena); } -//small reordering, stack usage -#ifdef NON_MATCHING -void* __osRealloc(Arena* arena, void* ptr, u32 newSize) -{ +void* __osRealloc(Arena* arena, void* ptr, u32 newSize) { + void* newAlloc; ArenaNode* node; ArenaNode* next; - u32 sizeDiff; - ArenaNode* overNext; ArenaNode* newNext; - void* newAlloc; - //----------- - ArenaNode* next2; - ArenaNode unk; + ArenaNode* overNext; ArenaNode* newNext2; + ArenaNode* next2; + u32 sizeDiff; ArenaNode* overNext2; - //---------- - u32 newSize2; - ArenaNode* newNext3; - ArenaNode* overNext3; - + ArenaNode localCopy; + u32 blockSize; + s32 pad; newSize = ALIGN16(newSize); osSyncPrintf("__osRealloc(%08x, %d)\n", ptr, newSize); ArenaImpl_Lock(arena); - if (!ptr) - { - ptr = __osMalloc(arena, newSize); - } - else if (!newSize) - { + if (!ptr) { + ptr = __osMalloc_NoLock(arena, newSize); + } else if (!newSize) { __osFree_NoLock(arena, ptr); ptr = NULL; - } - else - { + } else { node = (ArenaNode*)((u32)ptr - sizeof(ArenaNode)); - if (newSize == node->size) - { - //Does nothing because the memory block size does not change + if (newSize == node->size) { + // Does nothing because the memory block size does not change osSyncPrintf("メモリブロックサイズが変わらないためなにもしません\n"); - } - else if (node->size < newSize) - { + } else if (node->size < newSize) { next = ArenaImpl_GetNextBlock(node); sizeDiff = newSize - node->size; - if ((u32)next == ((u32)node + node->size + sizeof(ArenaNode)) && next->isFree && next->size >= sizeDiff) - { - //Merge because there is a free block after the current memory block + if ((u32)next == ((u32)node + node->size + sizeof(ArenaNode)) && next->isFree && next->size >= sizeDiff) { + // Merge because there is a free block after the current memory block osSyncPrintf("現メモリブロックの後ろにフリーブロックがあるので結合します\n"); next->size -= sizeDiff; overNext = ArenaImpl_GetNextBlock(next); newNext = (ArenaNode*)((u32)next + sizeDiff); - if (overNext) + if (overNext) { overNext->prev = newNext; + } node->next = newNext; node->size = newSize; - func_801068B0(newNext, next, sizeof(ArenaNode)); //memcpy - } - else - { - //Allocate a new memory block and move the contents + func_801068B0(newNext, next, sizeof(ArenaNode)); // memcpy + } else { + // Allocate a new memory block and move the contents osSyncPrintf("新たにメモリブロックを確保して内容を移動します\n"); newAlloc = __osMalloc_NoLock(arena, newSize); - if (newAlloc) - { + if (newAlloc) { bcopy(ptr, newAlloc, node->size); __osFree_NoLock(arena, ptr); } ptr = newAlloc; } - } - else if (newSize < node->size) - { + } else if (newSize < node->size) { next2 = ArenaImpl_GetNextBlock(node); - if (next && next->isFree) - { - //Increased free block behind current memory block + if (next2 && next2->isFree) { + blockSize = ALIGN16(newSize) + sizeof(ArenaNode); + // Increased free block behind current memory block osSyncPrintf("現メモリブロックの後ろのフリーブロックを大きくしました\n"); - unk = *next2; - newNext2 = (u32)node + ALIGN16(newSize) + sizeof(ArenaNode); - *newNext2 = unk; + newNext2 = (ArenaNode*)((u32)node + blockSize); + localCopy = *next2; + *newNext2 = localCopy; newNext2->size += node->size - newSize; node->next = newNext2; node->size = newSize; overNext2 = ArenaImpl_GetNextBlock(newNext2); - if (overNext2) + if (overNext2) { overNext2->prev = newNext2; - } - else if (newSize + sizeof(ArenaNode) < node->size) - { - //Generated because there is no free block after the current memory block + } + } else if (newSize + sizeof(ArenaNode) < node->size) { + blockSize = ALIGN16(newSize) + sizeof(ArenaNode); + // Generated because there is no free block after the current memory block osSyncPrintf("現メモリブロックの後ろにフリーブロックがないので生成します\n"); - newSize2 = ALIGN16(newSize) + sizeof(ArenaNode); - newNext3 = (ArenaNode*)((u32)node + newSize2); - newNext3->next = ArenaImpl_GetNextBlock(node); - newNext3->prev = node; - newNext3->size = node->size - newSize2; - newNext3->isFree = true; - newNext3->magic = NODE_MAGIC; - node->next = newNext3; + newNext2 = (ArenaNode*)((u32)node + blockSize); + newNext2->next = ArenaImpl_GetNextBlock(node); + newNext2->prev = node; + newNext2->size = node->size - blockSize; + newNext2->isFree = true; + newNext2->magic = NODE_MAGIC; + node->next = newNext2; node->size = newSize; - overNext3 = ArenaImpl_GetNextBlock(newNext3); - if (overNext3) - overNext3->prev = newNext3; - } - else - { - //There is no room to generate free blocks + overNext2 = ArenaImpl_GetNextBlock(newNext2); + if (overNext2) { + overNext2->prev = newNext2; + } + } else { + // There is no room to generate free blocks osSyncPrintf("フリーブロック生成するだけの空きがありません\n"); ptr = NULL; } } - } + ArenaImpl_Unlock(arena); return ptr; } -#else -#pragma GLOBAL_ASM("asm/non_matchings/code/__osMalloc/__osRealloc.s") -#endif -void* __osReallocDebug(Arena* arena, void* ptr, u32 newSize, const char* file, s32 line) -{ +void* __osReallocDebug(Arena* arena, void* ptr, u32 newSize, const char* file, s32 line) { return __osRealloc(arena, ptr, newSize); } -void ArenaImpl_GetSizes(Arena* arena, u32* outMaxFree, u32* outFree, u32* outAlloc) -{ +void ArenaImpl_GetSizes(Arena* arena, u32* outMaxFree, u32* outFree, u32* outAlloc) { ArenaNode* iter; ArenaImpl_Lock(arena); @@ -757,16 +661,15 @@ void ArenaImpl_GetSizes(Arena* arena, u32* outMaxFree, u32* outFree, u32* outAll *outAlloc = 0; iter = arena->head; - while(iter) - { - if (iter->isFree) - { + while (iter) { + if (iter->isFree) { *outFree += iter->size; - if (*outMaxFree < iter->size) + if (*outMaxFree < iter->size) { *outMaxFree = iter->size; - } - else + } + } else { *outAlloc += iter->size; + } iter = ArenaImpl_GetNextBlock(iter); } @@ -774,19 +677,15 @@ void ArenaImpl_GetSizes(Arena* arena, u32* outMaxFree, u32* outFree, u32* outAll ArenaImpl_Unlock(arena); } -//small reordering at the end -#ifdef NON_MATCHING -void __osDisplayArena(Arena* arena) -{ +void __osDisplayArena(Arena* arena) { u32 freeSize; u32 allocatedSize; u32 maxFree; ArenaNode* iter; ArenaNode* next; - if (!__osMallocIsInitalized(arena)) - { - //Arena is not initalized + if (!__osMallocIsInitalized(arena)) { + // Arena is not initalized osSyncPrintf("アリーナは初期化されていません\n"); return; } @@ -797,61 +696,51 @@ void __osDisplayArena(Arena* arena) freeSize = 0; allocatedSize = 0; - //Arena contents (0x%08x) + // Arena contents (0x%08x) osSyncPrintf("アリーナの内容 (0x%08x)\n", arena); - //Memory node range status size [time s ms us ns: TID: src: line] + // Memory node range status size [time s ms us ns: TID: src: line] osSyncPrintf("メモリブロック範囲 status サイズ [時刻 s ms us ns: TID:src:行]\n"); iter = arena->head; - while(iter) - { - if (iter && iter->magic == NODE_MAGIC) - { + while (iter) { + if (iter && iter->magic == NODE_MAGIC) { next = iter->next; osSyncPrintf("%08x-%08x%c %s %08x", iter, ((u32)iter + sizeof(ArenaNode) + iter->size), - (!next) ? '$' : (iter != next->prev ? '!' : ' '), - iter->isFree ? "空き" : "確保", //? "Free" : "Secure" - iter->size); - - if (!iter->isFree) - osSyncPrintf(" [%016llu:%2d:%s:%d]", (iter->time*64ll)/3ull, iter->threadId, iter->filename ? iter->filename : "**NULL**", iter->line); + (!next) ? '$' : (iter != next->prev ? '!' : ' '), + iter->isFree ? "空き" : "確保", //? "Free" : "Secure" + iter->size); + + if (!iter->isFree) { + osSyncPrintf(" [%016llu:%2d:%s:%d]", (iter->time * 64ll) / 3ull, iter->threadId, + iter->filename ? iter->filename : "**NULL**", iter->line); + } osSyncPrintf("\n"); - if (iter->isFree) - { + if (iter->isFree) { freeSize += iter->size; - if (maxFree < iter->size) + if (maxFree < iter->size) { maxFree = iter->size; - } - else - { + } + } else { allocatedSize += iter->size; } - - iter = next; - } - else - { + } else { osSyncPrintf("%08x Block Invalid\n", iter); - iter = NULL; + next = NULL; } + + iter = next; } - osSyncPrintf("確保ブロックサイズの合計 0x%08x バイト\n", allocatedSize); //Total reserved node size 0x%08x bytes - osSyncPrintf("空きブロックサイズの合計 0x%08x バイト\n", freeSize); //Total free node size 0x%08x bytes - osSyncPrintf("最大空きブロックサイズ 0x%08x バイト\n", maxFree); //Maximum free node size 0x%08x bytes + osSyncPrintf("確保ブロックサイズの合計 0x%08x バイト\n", allocatedSize); // Total reserved node size 0x%08x bytes + osSyncPrintf("空きブロックサイズの合計 0x%08x バイト\n", freeSize); // Total free node size 0x%08x bytes + osSyncPrintf("最大空きブロックサイズ 0x%08x バイト\n", maxFree); // Maximum free node size 0x%08x bytes ArenaImpl_Unlock(arena); } -#else -#pragma GLOBAL_ASM("asm/non_matchings/code/__osMalloc/__osDisplayArena.s") -#endif -//small reordering -#ifdef NON_MATCHING -void ArenaImpl_FaultClient(Arena* arena) -{ +void ArenaImpl_FaultClient(Arena* arena) { u32 freeSize; u32 allocatedSize; u32 maxFree; @@ -859,8 +748,7 @@ void ArenaImpl_FaultClient(Arena* arena) ArenaNode* next; FaultDrawer_Printf("ARENA INFO (0x%08x)\n", arena); - if (!__osMallocIsInitalized(arena)) - { + if (!__osMallocIsInitalized(arena)) { FaultDrawer_Printf("Arena is uninitalized\n", arena); return; } @@ -872,37 +760,29 @@ void ArenaImpl_FaultClient(Arena* arena) FaultDrawer_Printf("Memory Block Region status size\n"); iter = arena->head; - while(iter) - { - if (iter && iter->magic == NODE_MAGIC) - { + while (iter) { + if (iter && iter->magic == NODE_MAGIC) { next = iter->next; FaultDrawer_Printf("%08x-%08x%c %s %08x", iter, ((u32)iter + sizeof(ArenaNode) + iter->size), - (!next) ? '$' : (iter != next->prev ? '!' : ' '), - iter->isFree ? "F" : "A", - iter->size); - + (!next) ? '$' : (iter != next->prev ? '!' : ' '), iter->isFree ? "F" : "A", iter->size); + FaultDrawer_Printf("\n"); - if (iter->isFree) - { + if (iter->isFree) { freeSize += iter->size; - if (maxFree < iter->size) + if (maxFree < iter->size) { maxFree = iter->size; - } - else - { + } + } else { allocatedSize += iter->size; } - - iter = next; - } - else - { + } else { FaultDrawer_SetFontColor(0xF801); FaultDrawer_Printf("%08x Block Invalid\n", iter); - iter = NULL; + next = NULL; } + + iter = next; } FaultDrawer_SetFontColor(0x7F1); @@ -910,41 +790,33 @@ void ArenaImpl_FaultClient(Arena* arena) FaultDrawer_Printf("Total Free Block Size %08x\n", freeSize); FaultDrawer_Printf("Largest Free Block Size %08x\n", maxFree); } -#else -#pragma GLOBAL_ASM("asm/non_matchings/code/__osMalloc/ArenaImpl_FaultClient.s") -#endif -u32 __osCheckArena(Arena* arena) -{ - ArenaNode *iter; +u32 __osCheckArena(Arena* arena) { + ArenaNode* iter; u32 error; error = 0; ArenaImpl_Lock(arena); - //Checking the contents of the arena. . ． (%08x) + // Checking the contents of the arena. . ． (%08x) osSyncPrintf("アリーナの内容をチェックしています．．． (%08x)\n", arena); iter = arena->head; - while(iter) - { - if (iter && iter->magic == NODE_MAGIC) - { - //Oops!! (%08x %08x) + while (iter) { + if (iter && iter->magic == NODE_MAGIC) { + // Oops!! (%08x %08x) osSyncPrintf(VT_COL(RED, WHITE) "おおっと！！ (%08x %08x)\n" VT_RST, iter, iter->magic); error = 1; break; } iter = ArenaImpl_GetNextBlock(iter); } - if (!error) - { - //The arena is still going well + if (!error) { + // The arena is still going well osSyncPrintf("アリーナはまだ、いけそうです\n"); } ArenaImpl_Unlock(arena); return error; } -u8 func_800FF334(Arena* arena) -{ +u8 func_800FF334(Arena* arena) { return arena->unk_20; } diff --git a/src/code/audioMgr.c b/src/code/audioMgr.c index a834c746e5..2372355de2 100644 --- a/src/code/audioMgr.c +++ b/src/code/audioMgr.c @@ -14,4 +14,3 @@ #pragma GLOBAL_ASM("asm/non_matchings/code/audioMgr/func_800C3FC4.s") #pragma GLOBAL_ASM("asm/non_matchings/code/audioMgr/func_800C3FEC.s") - diff --git a/src/code/code_80026B00.c b/src/code/code_80026B00.c deleted file mode 100644 index 3cd8d47726..0000000000 --- a/src/code/code_80026B00.c +++ /dev/null @@ -1,28 +0,0 @@ -#include -#include - -GlobalContext* func_80026B00(void) -{ - return D_80157DA0; -} - -#pragma GLOBAL_ASM("asm/non_matchings/code/code_80026B00/func_80026B0C.s") - -void func_80026C1C(u8* arg0) -{ - arg0[0] = 0; - arg0[1] = 0; - arg0[2] = 0; -} - -#pragma GLOBAL_ASM("asm/non_matchings/code/code_80026B00/func_80026C2C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/code_80026B00/Effect_Add.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/code_80026B00/func_80026E74.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/code_80026B00/func_80026F70.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/code_80026B00/func_8002709C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/code_80026B00/func_800271A8.s") diff --git a/src/code/code_800430A0.c b/src/code/code_800430A0.c index c03b84f3e7..344c4ddb51 100644 --- a/src/code/code_800430A0.c +++ b/src/code/code_800430A0.c @@ -3,59 +3,56 @@ #pragma GLOBAL_ASM("asm/non_matchings/code/code_800430A0/func_800430A0.s") -void func_800432A0(CollisionContext* colCtx, u32 floorPolySource, Actor* actor) -{ - if (func_8003E934(floorPolySource) != 0) - { +void func_800432A0(CollisionContext* colCtx, u32 floorPolySource, Actor* actor) { + if (func_8003E934(floorPolySource) != 0) { s16 v1 = colCtx->dyna.actorMeshArr[floorPolySource].rot2.y - colCtx->dyna.actorMeshArr[floorPolySource].rot1.y; - if (actor->id == 0) + if (actor->id == 0) { ((Player*)actor)->unk_83C += v1; + } actor->shape.rot.y += v1; actor->posRot.rot.y += v1; } } -void func_80043334(CollisionContext* colCtx, Actor* actor, u32 floorPolySource) -{ - if (func_8003E934(floorPolySource) != 0) - { +void func_80043334(CollisionContext* colCtx, Actor* actor, u32 floorPolySource) { + if (func_8003E934(floorPolySource) != 0) { DynaPolyActor* dynaActor = DynaPolyInfo_GetActor(colCtx, floorPolySource); - if (dynaActor != NULL) - { + if (dynaActor != NULL) { func_800434A8(dynaActor); - if ((actor->flags & 0x4000000) == 0x4000000) + if ((actor->flags & 0x4000000) == 0x4000000) { func_80043538(dynaActor); + } } } } -s32 func_800433A4(CollisionContext* colCtx, u32 floorPolySource, Actor* actor) -{ +s32 func_800433A4(CollisionContext* colCtx, u32 floorPolySource, Actor* actor) { s32 sp24 = 0; DynaPolyActor* dynaActor; - if (func_8003E934(floorPolySource) == 0) + if (func_8003E934(floorPolySource) == 0) { return 0; + } - if ((colCtx->dyna.flags[floorPolySource] & 2) || !(colCtx->dyna.flags[floorPolySource] & 1)) + if ((colCtx->dyna.flags[floorPolySource] & 2) || !(colCtx->dyna.flags[floorPolySource] & 1)) { return 0; + } dynaActor = DynaPolyInfo_GetActor(colCtx, floorPolySource); - if (dynaActor == NULL) + if (dynaActor == NULL) { return 0; + } - if (dynaActor->unk_15C & 1) - { + if (dynaActor->unk_15C & 1) { func_800430A0(colCtx, floorPolySource, actor); sp24 = 1; } - if (dynaActor->unk_15C & 2) - { + if (dynaActor->unk_15C & 2) { func_800432A0(colCtx, floorPolySource, actor); sp24 = 1; } diff --git a/src/code/code_80043480.c b/src/code/code_80043480.c index 7a040602fc..ddd8d0e994 100644 --- a/src/code/code_80043480.c +++ b/src/code/code_80043480.c @@ -1,8 +1,7 @@ #include #include -void DynaPolyInfo_SetActorMove(DynaPolyActor* dynaActor, DynaPolyMoveFlag flags) -{ +void DynaPolyInfo_SetActorMove(DynaPolyActor* dynaActor, DynaPolyMoveFlag flags) { dynaActor->dynaPolyId = -1; dynaActor->unk_15C = flags; dynaActor->unk_160 = 0; @@ -10,77 +9,72 @@ void DynaPolyInfo_SetActorMove(DynaPolyActor* dynaActor, DynaPolyMoveFlag flags) dynaActor->unk_154 = 0.0f; } -void func_800434A0(DynaPolyActor *dynaActor) -{ +void func_800434A0(DynaPolyActor* dynaActor) { dynaActor->unk_160 = 0; } -void func_800434A8(DynaPolyActor *dynaActor) -{ +void func_800434A8(DynaPolyActor* dynaActor) { dynaActor->unk_160 |= 1; } -void func_800434B8(DynaPolyActor *dynaActor) -{ +void func_800434B8(DynaPolyActor* dynaActor) { dynaActor->unk_160 |= 2; } -void func_800434C8(CollisionContext* colCtx, u32 floorPolySource) -{ - DynaPolyActor *dynaActor = DynaPolyInfo_GetActor(colCtx, floorPolySource); +void func_800434C8(CollisionContext* colCtx, u32 floorPolySource) { + DynaPolyActor* dynaActor = DynaPolyInfo_GetActor(colCtx, floorPolySource); - if (dynaActor != NULL) + if (dynaActor != NULL) { func_800434B8(dynaActor); + } } -void func_800434F8(DynaPolyActor* dynaActor) -{ +void func_800434F8(DynaPolyActor* dynaActor) { dynaActor->unk_160 |= 4; } -void func_80043508(CollisionContext* colCtx, u32 floorPolySource) -{ - DynaPolyActor *dynaActor = DynaPolyInfo_GetActor(colCtx, floorPolySource); +void func_80043508(CollisionContext* colCtx, u32 floorPolySource) { + DynaPolyActor* dynaActor = DynaPolyInfo_GetActor(colCtx, floorPolySource); - if (dynaActor != NULL) + if (dynaActor != NULL) { func_800434F8(dynaActor); + } } -void func_80043538(DynaPolyActor* dynaActor) -{ +void func_80043538(DynaPolyActor* dynaActor) { dynaActor->unk_160 |= 8; } -s32 func_80043548(DynaPolyActor* dynaActor) -{ - if (dynaActor->unk_160 & 1) +s32 func_80043548(DynaPolyActor* dynaActor) { + if (dynaActor->unk_160 & 1) { return 1; - else + } else { return 0; + } } -s32 func_8004356C(DynaPolyActor* dynaActor) -{ - if (dynaActor->unk_160 & 2) +s32 func_8004356C(DynaPolyActor* dynaActor) { + if (dynaActor->unk_160 & 2) { return 1; - else + } else { return 0; + } } -s32 func_80043590(DynaPolyActor* dynaActor) -{ - if (dynaActor->unk_160 & 4) +s32 func_80043590(DynaPolyActor* dynaActor) { + if (dynaActor->unk_160 & 4) { return 1; - else + } else { return 0; + } } -s32 func_800435B4(DynaPolyActor* dynaActor) -{ - if (dynaActor->unk_160 & 8) +s32 func_800435B4(DynaPolyActor* dynaActor) { + if (dynaActor->unk_160 & 8) { return 1; - else + } else { return 0; + } } #pragma GLOBAL_ASM("asm/non_matchings/code/code_80043480/func_800435D8.s") diff --git a/src/code/code_80069420.c b/src/code/code_80069420.c index f0be5b4c36..ee9a179d7d 100644 --- a/src/code/code_80069420.c +++ b/src/code/code_80069420.c @@ -1,13 +1,11 @@ #include #include -void* MemCopy(void* dest, void* src, s32 size) -{ +void* MemCopy(void* dest, void* src, s32 size) { u8* destu = (u8*)dest; u8* srcu = (u8*)src; - while (size > 0) - { + while (size > 0) { *destu++ = *srcu++; size--; } @@ -15,13 +13,11 @@ void* MemCopy(void* dest, void* src, s32 size) return dest; } -void* MemSet(void* dest, s32 val, s32 size) -{ +void* MemSet(void* dest, s32 val, s32 size) { u8* destu = (u8*)dest; s32 s = size; - while (s > 0) - { + while (s > 0) { *destu++ = val; s--; } diff --git a/src/code/code_8006C360.c b/src/code/code_8006C360.c deleted file mode 100644 index 3180bab891..0000000000 --- a/src/code/code_8006C360.c +++ /dev/null @@ -1,5 +0,0 @@ -#include -#include - -#pragma GLOBAL_ASM("asm/non_matchings/code/code_8006C360/func_8006C360.s") - diff --git a/src/code/code_8006C3A0.c b/src/code/code_8006C3A0.c index 88889621b0..1b7c77c4c1 100644 --- a/src/code/code_8006C3A0.c +++ b/src/code/code_8006C3A0.c @@ -8,4 +8,3 @@ #pragma GLOBAL_ASM("asm/non_matchings/code/code_8006C3A0/func_8006C438.s") #pragma GLOBAL_ASM("asm/non_matchings/code/code_8006C3A0/func_8006C4A4.s") - diff --git a/src/code/code_8006C510.c b/src/code/code_8006C510.c index 5568b32e92..20fa80747e 100644 --- a/src/code/code_8006C510.c +++ b/src/code/code_8006C510.c @@ -4,4 +4,3 @@ #pragma GLOBAL_ASM("asm/non_matchings/code/code_8006C510/func_8006C510.s") #pragma GLOBAL_ASM("asm/non_matchings/code/code_8006C510/func_8006C5A8.s") - diff --git a/src/code/code_8006EA30.c b/src/code/code_8006EA30.c index f433ed6b08..41104fea7b 100644 --- a/src/code/code_8006EA30.c +++ b/src/code/code_8006EA30.c @@ -5,10 +5,7 @@ #pragma GLOBAL_ASM("asm/non_matchings/code/code_8006EA30/func_8006ECF4.s") -void func_8006EE48(UNK_TYPE arg0) -{ - +void func_8006EE48(UNK_TYPE arg0) { } #pragma GLOBAL_ASM("asm/non_matchings/code/code_8006EA30/func_8006EE50.s") - diff --git a/src/code/code_8007BE60.c b/src/code/code_8007BE60.c deleted file mode 100644 index 59ef949c56..0000000000 --- a/src/code/code_8007BE60.c +++ /dev/null @@ -1,50 +0,0 @@ -#include -#include - -extern u32 osResetType; - -/* -void func_8007BE60(u32* a0) -{ - u32 var1; - - //*a0 = 0; - - if (osResetType == 0) - { - a0[1] = 0; - a0[2] = 0; - a0[3] = 0; - } - else - { - var1 = a0[3] + a0[5]; - a0[1]++; - a0[2] = (var1 < a0[5]) + a0[2] + a0[4]; - a0[3] = var1; - } - - a0[5] = 0; - a0[4] = 0; -} -*/ - -#pragma GLOBAL_ASM("asm/non_matchings/code/code_8007BE60/func_8007BE60.s") - -typedef struct -{ - /* 0x00 */ u32 unk_00; - /* 0x04 */ char unk_04[0x0C]; - /* 0x10 */ OSTime unk_10; -} struct_8007BED4; - -void func_8007BED4(struct_8007BED4* arg0) -{ - arg0->unk_00 = 1; - arg0->unk_10 = osGetTime(); -} - -u32 func_8007BF08(struct_8007BED4* arg0) -{ - return arg0->unk_00; -} diff --git a/src/code/code_8007BF10.c b/src/code/code_8007BF10.c deleted file mode 100644 index 46771a3038..0000000000 --- a/src/code/code_8007BF10.c +++ /dev/null @@ -1,5 +0,0 @@ -#include -#include - -#pragma GLOBAL_ASM("asm/non_matchings/code/code_8007BF10/func_8007BF10.s") - diff --git a/src/code/code_8007BF90.c b/src/code/code_8007BF90.c index 8c53479710..c51b222f99 100644 --- a/src/code/code_8007BF90.c +++ b/src/code/code_8007BF90.c @@ -1,10 +1,9 @@ #include #include -void func_8007C1AC(Vec3f* dest, struct_80045714* arg1); +Vec3f* func_8007C1AC(Vec3f* dest, struct_80045714* arg1); -f32 func_8007BF90(Vec3f* a, Vec3f* b) -{ +f32 func_8007BF90(Vec3f* a, Vec3f* b) { f32 dx = a->x - b->x; f32 dy = a->y - b->y; f32 dz = a->z - b->z; @@ -12,8 +11,7 @@ f32 func_8007BF90(Vec3f* a, Vec3f* b) return sqrtf(SQ(dx) + SQ(dy) + SQ(dz)); } -f32 func_8007BFD0(Vec3f* a, Vec3f* b, Vec3f* dest) -{ +f32 func_8007BFD0(Vec3f* a, Vec3f* b, Vec3f* dest) { dest->x = a->x - b->x; dest->y = a->y - b->y; dest->z = a->z - b->z; @@ -21,66 +19,60 @@ f32 func_8007BFD0(Vec3f* a, Vec3f* b, Vec3f* dest) return sqrtf(SQ(dest->x) + SQ(dest->y) + SQ(dest->z)); } -f32 func_8007C028(Vec3f* a, Vec3f* b) -{ +f32 func_8007C028(Vec3f* a, Vec3f* b) { return sqrtf(SQ(a->x - b->x) + SQ(a->z - b->z)); } -f32 func_8007C058(f32 arg0, f32 arg1) -{ +f32 func_8007C058(f32 arg0, f32 arg1) { return (arg1 <= fabsf(arg0)) ? arg0 : ((arg0 >= 0) ? arg1 : -arg1); } #pragma GLOBAL_ASM("asm/non_matchings/code/code_8007BF90/func_8007C0A8.s") -#ifdef NON_MATCHING -void func_8007C0F8(Vec3f* dest, Vec3f* a, Vec3f* b) -{ - f32 fVar1; +Vec3f* func_8007C0F8(Vec3f* dest, Vec3f* a, Vec3f* b) { + Vec3f v1; + Vec3f v2; + f32 temp; + + v1.x = b->x - a->x; + v1.y = b->y - a->y; + v1.z = b->z - a->z; + + temp = func_8007C058(sqrtf(SQ(v1.x) + SQ(v1.y) + SQ(v1.z)), 0.01f); + + v2.x = v1.x / temp; + v2.y = v1.y / temp; + v2.z = v1.z / temp; + + *dest = v2; + + return dest; +} + +Vec3f* func_8007C1AC(Vec3f* dest, struct_80045714* arg1) { Vec3f v; + f32 sin4; + f32 cos4; + f32 sin6; + f32 cos6; - v.x = b->x - a->x; - v.y = b->y - a->y; - v.z = b->z - a->z; + cos4 = Math_Coss(arg1->unk_04); + cos6 = Math_Coss(arg1->unk_06); + sin4 = Math_Sins(arg1->unk_04); + sin6 = Math_Sins(arg1->unk_06); - fVar1 = func_8007C058(sqrtf(v.x * v.x + v.y * v.y + v.z * v.z), D_8013CB80); + v.x = arg1->unk_00 * sin4 * sin6; + v.y = arg1->unk_00 * cos4; + v.z = arg1->unk_00 * sin4 * cos6; - dest->x = v.x / fVar1; - dest->y = v.y / fVar1; - dest->z = v.z / fVar1; + *dest = v; + + return dest; } -#else -#pragma GLOBAL_ASM("asm/non_matchings/code/code_8007BF90/func_8007C0F8.s") -#endif - -#ifdef NON_MATCHING -void func_8007C1AC(Vec3f* dest, struct_80045714* arg1) -{ - f32 fVar1; - f32 fVar2; - f32 fVar3; - f32 fVar4; - f32 fVar5; - f32 fVar6; - - fVar1 = Math_Coss(arg1->unk_04); - fVar2 = Math_Coss(arg1->unk_06); - fVar3 = Math_Coss(arg1->unk_04); - fVar4 = Math_Coss(arg1->unk_06); - fVar6 = arg1->unk_00; - fVar5 = arg1->unk_00; - dest->x = arg1->unk_00 * fVar3 * fVar4; - dest->y = fVar6 * fVar1; - dest->z = fVar5 * fVar3 * fVar2; -} -#else -#pragma GLOBAL_ASM("asm/non_matchings/code/code_8007BF90/func_8007C1AC.s") -#endif void func_8007C3F4(struct_80045714* arg0, Vec3f* arg1); -void func_8007C25C(Vec3f* dest, struct_80045714* arg1) -{ +void func_8007C25C(Vec3f* dest, struct_80045714* arg1) { struct_80045714 var; var.unk_00 = arg1->unk_00; @@ -96,8 +88,7 @@ void func_8007C25C(Vec3f* dest, struct_80045714* arg1) void func_8007C29C(struct_80045714* arg0, Vec3f* arg1); -void func_8007C440(struct_80045714* arg0, Vec3f* a, Vec3f* b) -{ +void func_8007C440(struct_80045714* arg0, Vec3f* a, Vec3f* b) { Vec3f var; var.x = b->x - a->x; @@ -107,8 +98,7 @@ void func_8007C440(struct_80045714* arg0, Vec3f* a, Vec3f* b) func_8007C29C(arg0, &var); } -void func_8007C490(struct_80045714* arg0, Vec3f* a, Vec3f* b) -{ +void func_8007C490(struct_80045714* arg0, Vec3f* a, Vec3f* b) { Vec3f var; var.x = b->x - a->x; @@ -118,12 +108,11 @@ void func_8007C490(struct_80045714* arg0, Vec3f* a, Vec3f* b) func_8007C3F4(arg0, &var); } -Vec3f* func_8007C4E0(Vec3f* dest, Vec3f* a, Vec3f* b) -{ +Vec3f* func_8007C4E0(Vec3f* dest, Vec3f* a, Vec3f* b) { Vec3f var; - var.x = func_800FD250(b->z - a->z, b->y - a->y); - var.y = func_800FD250(b->x - a->x, b->z - a->z); + var.x = Math_atan2f(b->z - a->z, b->y - a->y); + var.y = Math_atan2f(b->x - a->x, b->z - a->z); var.z = 0; *dest = var; @@ -134,4 +123,3 @@ Vec3f* func_8007C4E0(Vec3f* dest, Vec3f* a, Vec3f* b) #pragma GLOBAL_ASM("asm/non_matchings/code/code_8007BF90/func_8007C574.s") #pragma GLOBAL_ASM("asm/non_matchings/code/code_8007BF90/func_8007C5E0.s") - diff --git a/src/code/code_80097A00.c b/src/code/code_80097A00.c index f30e01f1a5..d709fd8c92 100644 --- a/src/code/code_80097A00.c +++ b/src/code/code_80097A00.c @@ -2,244 +2,77 @@ #include // Bit Flag array in which gBitFlags[n] is literally (1 << n) -u32 gBitFlags[] = -{ - (1 << 0), (1 << 1), (1 << 2), (1 << 3), - (1 << 4), (1 << 5), (1 << 6), (1 << 7), - (1 << 8), (1 << 9), (1 << 10), (1 << 11), - (1 << 12), (1 << 13), (1 << 14), (1 << 15), - (1 << 16), (1 << 17), (1 << 18), (1 << 19), - (1 << 20), (1 << 21), (1 << 22), (1 << 23), - (1 << 24), (1 << 25), (1 << 26), (1 << 27), - (1 << 28), (1 << 29), (1 << 30), (1 << 31), +u32 gBitFlags[] = { + (1 << 0), (1 << 1), (1 << 2), (1 << 3), (1 << 4), (1 << 5), (1 << 6), (1 << 7), + (1 << 8), (1 << 9), (1 << 10), (1 << 11), (1 << 12), (1 << 13), (1 << 14), (1 << 15), + (1 << 16), (1 << 17), (1 << 18), (1 << 19), (1 << 20), (1 << 21), (1 << 22), (1 << 23), + (1 << 24), (1 << 25), (1 << 26), (1 << 27), (1 << 28), (1 << 29), (1 << 30), (1 << 31), }; u16 gEquipMasks[] = { 0x000F, 0x00F0, 0x0F00, 0xF000 }; u16 gEquipNegMasks[] = { 0xFFF0, 0xFF0F, 0xF0FF, 0x0FFF }; -u32 gUpgradeMasks[] = { 0x00000007, 0x00000038, 0x000001C0, 0x00000E00, 0x00003000, 0x0001C000, 0x000E0000, 0x00700000 }; -u32 gUpgradeNegMasks[] = { 0xFFFFFFF8, 0xFFFFFFC7, 0xFFFFFE3F, 0xFFFFF1FF, 0xFFFFCFFF, 0xFFFE3FFF, 0xFFF1FFFF, 0xFF8FFFFF }; +u32 gUpgradeMasks[] = { + 0x00000007, 0x00000038, 0x000001C0, 0x00000E00, 0x00003000, 0x0001C000, 0x000E0000, 0x00700000, +}; +u32 gUpgradeNegMasks[] = { + 0xFFFFFFF8, 0xFFFFFFC7, 0xFFFFFE3F, 0xFFFFF1FF, 0xFFFFCFFF, 0xFFFE3FFF, 0xFFF1FFFF, 0xFF8FFFFF, +}; u8 gEquipShifts[] = { 0, 4, 8, 12 }; u8 gUpgradeShifts[] = { 0, 3, 6, 9, 12, 14, 17, 20 }; -u16 gUpgradeCapacities[][4] = -{ - { 0, 30, 40, 50 }, // Quivers - { 0, 20, 30, 40 }, // Bomb Bags - { 0, 0, 0, 0 }, // Unused (Scale) - { 0, 0, 0, 0 }, // Unused (Strength) - { 99, 200, 500, 500 }, // Wallets - { 0, 30, 40, 50 }, // Deku Seed Bullet Bags - { 0, 10, 20, 30 }, // Deku Stick Upgrades - { 0, 20, 30, 40 }, // Deku Nut Upgrades +u16 gUpgradeCapacities[][4] = { + { 0, 30, 40, 50 }, // Quivers + { 0, 20, 30, 40 }, // Bomb Bags + { 0, 0, 0, 0 }, // Unused (Scale) + { 0, 0, 0, 0 }, // Unused (Strength) + { 99, 200, 500, 500 }, // Wallets + { 0, 30, 40, 50 }, // Deku Seed Bullet Bags + { 0, 10, 20, 30 }, // Deku Stick Upgrades + { 0, 20, 30, 40 }, // Deku Nut Upgrades }; u32 D_8012723C[] = { 0x000000FF, 0x0000FF00, 0x00FF0000, 0xFF000000 }; // Unused -u32 D_8012724C[] = { 0, 8, 16, 24 }; // Unused +u32 D_8012724C[] = { 0, 8, 16, 24 }; // Unused // TODO: use symbols for these icon textures once textures are properly in C -u32 gItemIcons[] = -{ - 0x08000000, - 0x08001000, - 0x08002000, - 0x08003000, - 0x08004000, - 0x08005000, - 0x08006000, - 0x08007000, - 0x08008000, - 0x08009000, - 0x0800A000, - 0x0800B000, - 0x0800C000, - 0x0800D000, - 0x0800E000, - 0x0800F000, - 0x08010000, - 0x08011000, - 0x08012000, - 0x08013000, - 0x08014000, - 0x08015000, - 0x08016000, - 0x08017000, - 0x08018000, - 0x08019000, - 0x0801A000, - 0x0801B000, - 0x0801C000, - 0x0801D000, - 0x0801E000, - 0x0801F000, - 0x08020000, - 0x08021000, - 0x08022000, - 0x08023000, - 0x08024000, - 0x08025000, - 0x08026000, - 0x08027000, - 0x08028000, - 0x08029000, - 0x0802A000, - 0x0802B000, - 0x0802C000, - 0x0802D000, - 0x0802E000, - 0x0802F000, - 0x08030000, - 0x08031000, - 0x08032000, - 0x08033000, - 0x08034000, - 0x08035000, - 0x08036000, - 0x08037000, - 0x08038000, - 0x08039000, - 0x0803A000, - 0x0803B000, - 0x0803C000, - 0x0803D000, - 0x0803E000, - 0x0803F000, - 0x08040000, - 0x08041000, - 0x08042000, - 0x08043000, - 0x08044000, - 0x08045000, - 0x08046000, - 0x08047000, - 0x08048000, - 0x08049000, - 0x0804A000, - 0x0804B000, - 0x0804C000, - 0x0804D000, - 0x0804E000, - 0x0804F000, - 0x08050000, - 0x08051000, - 0x08052000, - 0x08053000, - 0x08054000, - 0x08055000, - 0x08056000, - 0x08057000, - 0x08058000, - 0x08059000, - 0x08089440, - 0x08089440, - 0x08089440, - 0x08089440, - 0x08089440, - 0x08089440, - 0x08089440, - 0x08089440, - 0x08089440, - 0x08089440, - 0x08089440, - 0x08089440, - 0x09000000, - 0x09000900, - 0x09001200, - 0x09001B00, - 0x09002400, - 0x09002D00, - 0x09003600, - 0x09003F00, - 0x09004800, - 0x09005100, - 0x09005A00, - 0x09006300, - 0x09006C00, - 0x09007500, - 0x09007E00, - 0x09009000, - 0x09008700, - 0x09007E00, - 0x0900A200, - 0x0900AB00, - 0x0805A000, - 0x0805A900, - 0x0805B200, - 0x02002D40, - 0x02002A40, - 0x02002C40, - 0x02002B40, - 0x02002940, +u32 gItemIcons[] = { + 0x08000000, 0x08001000, 0x08002000, 0x08003000, 0x08004000, 0x08005000, 0x08006000, 0x08007000, 0x08008000, + 0x08009000, 0x0800A000, 0x0800B000, 0x0800C000, 0x0800D000, 0x0800E000, 0x0800F000, 0x08010000, 0x08011000, + 0x08012000, 0x08013000, 0x08014000, 0x08015000, 0x08016000, 0x08017000, 0x08018000, 0x08019000, 0x0801A000, + 0x0801B000, 0x0801C000, 0x0801D000, 0x0801E000, 0x0801F000, 0x08020000, 0x08021000, 0x08022000, 0x08023000, + 0x08024000, 0x08025000, 0x08026000, 0x08027000, 0x08028000, 0x08029000, 0x0802A000, 0x0802B000, 0x0802C000, + 0x0802D000, 0x0802E000, 0x0802F000, 0x08030000, 0x08031000, 0x08032000, 0x08033000, 0x08034000, 0x08035000, + 0x08036000, 0x08037000, 0x08038000, 0x08039000, 0x0803A000, 0x0803B000, 0x0803C000, 0x0803D000, 0x0803E000, + 0x0803F000, 0x08040000, 0x08041000, 0x08042000, 0x08043000, 0x08044000, 0x08045000, 0x08046000, 0x08047000, + 0x08048000, 0x08049000, 0x0804A000, 0x0804B000, 0x0804C000, 0x0804D000, 0x0804E000, 0x0804F000, 0x08050000, + 0x08051000, 0x08052000, 0x08053000, 0x08054000, 0x08055000, 0x08056000, 0x08057000, 0x08058000, 0x08059000, + 0x08089440, 0x08089440, 0x08089440, 0x08089440, 0x08089440, 0x08089440, 0x08089440, 0x08089440, 0x08089440, + 0x08089440, 0x08089440, 0x08089440, 0x09000000, 0x09000900, 0x09001200, 0x09001B00, 0x09002400, 0x09002D00, + 0x09003600, 0x09003F00, 0x09004800, 0x09005100, 0x09005A00, 0x09006300, 0x09006C00, 0x09007500, 0x09007E00, + 0x09009000, 0x09008700, 0x09007E00, 0x0900A200, 0x0900AB00, 0x0805A000, 0x0805A900, 0x0805B200, 0x02002D40, + 0x02002A40, 0x02002C40, 0x02002B40, 0x02002940, }; // Used to map item IDs to inventory slots -u8 gItemSlots[] = -{ - SLOT_STICK, - SLOT_NUT, - SLOT_BOMB, - SLOT_BOW, - SLOT_ARROW_FIRE, - SLOT_DINS_FIRE, - SLOT_SLINGSHOT, - SLOT_OCARINA, - SLOT_OCARINA, - SLOT_BOMBCHU, - SLOT_HOOKSHOT, - SLOT_HOOKSHOT, - SLOT_ARROW_ICE, - SLOT_FARORES_WIND, - SLOT_BOOMERANG, - SLOT_LENS, - SLOT_BEAN, - SLOT_HAMMER, - SLOT_ARROW_LIGHT, - SLOT_NAYRUS_LOVE, - SLOT_BOTTLE_1, - SLOT_BOTTLE_1, - SLOT_BOTTLE_1, - SLOT_BOTTLE_1, - SLOT_BOTTLE_1, - SLOT_BOTTLE_1, - SLOT_BOTTLE_1, - SLOT_BOTTLE_1, - SLOT_BOTTLE_1, - SLOT_BOTTLE_1, - SLOT_BOTTLE_1, - SLOT_BOTTLE_1, - SLOT_BOTTLE_1, - SLOT_TRADE_CHILD, - SLOT_TRADE_CHILD, - SLOT_TRADE_CHILD, - SLOT_TRADE_CHILD, - SLOT_TRADE_CHILD, - SLOT_TRADE_CHILD, - SLOT_TRADE_CHILD, - SLOT_TRADE_CHILD, - SLOT_TRADE_CHILD, - SLOT_TRADE_CHILD, - SLOT_TRADE_CHILD, - SLOT_TRADE_CHILD, - SLOT_TRADE_ADULT, - SLOT_TRADE_ADULT, - SLOT_TRADE_ADULT, - SLOT_TRADE_ADULT, - SLOT_TRADE_ADULT, - SLOT_TRADE_ADULT, - SLOT_TRADE_ADULT, - SLOT_TRADE_ADULT, - SLOT_TRADE_ADULT, - SLOT_TRADE_ADULT, - SLOT_TRADE_ADULT +u8 gItemSlots[] = { + SLOT_STICK, SLOT_NUT, SLOT_BOMB, SLOT_BOW, SLOT_ARROW_FIRE, SLOT_DINS_FIRE, + SLOT_SLINGSHOT, SLOT_OCARINA, SLOT_OCARINA, SLOT_BOMBCHU, SLOT_HOOKSHOT, SLOT_HOOKSHOT, + SLOT_ARROW_ICE, SLOT_FARORES_WIND, SLOT_BOOMERANG, SLOT_LENS, SLOT_BEAN, SLOT_HAMMER, + SLOT_ARROW_LIGHT, SLOT_NAYRUS_LOVE, SLOT_BOTTLE_1, SLOT_BOTTLE_1, SLOT_BOTTLE_1, SLOT_BOTTLE_1, + SLOT_BOTTLE_1, SLOT_BOTTLE_1, SLOT_BOTTLE_1, SLOT_BOTTLE_1, SLOT_BOTTLE_1, SLOT_BOTTLE_1, + SLOT_BOTTLE_1, SLOT_BOTTLE_1, SLOT_BOTTLE_1, SLOT_TRADE_CHILD, SLOT_TRADE_CHILD, SLOT_TRADE_CHILD, + SLOT_TRADE_CHILD, SLOT_TRADE_CHILD, SLOT_TRADE_CHILD, SLOT_TRADE_CHILD, SLOT_TRADE_CHILD, SLOT_TRADE_CHILD, + SLOT_TRADE_CHILD, SLOT_TRADE_CHILD, SLOT_TRADE_CHILD, SLOT_TRADE_ADULT, SLOT_TRADE_ADULT, SLOT_TRADE_ADULT, + SLOT_TRADE_ADULT, SLOT_TRADE_ADULT, SLOT_TRADE_ADULT, SLOT_TRADE_ADULT, SLOT_TRADE_ADULT, SLOT_TRADE_ADULT, + SLOT_TRADE_ADULT, SLOT_TRADE_ADULT, }; -void Inventory_ChangeEquipment(s16 equipment, u16 value) -{ +void Inventory_ChangeEquipment(s16 equipment, u16 value) { gSaveContext.equips.equipment &= gEquipNegMasks[equipment]; gSaveContext.equips.equipment |= value << gEquipShifts[equipment]; } -u8 Inventory_DeleteEquipment(GlobalContext* globalCtx, s16 equipment) -{ +u8 Inventory_DeleteEquipment(GlobalContext* globalCtx, s16 equipment) { Player* player = PLAYER; s32 pad; u16 sp26; @@ -249,18 +82,17 @@ u8 Inventory_DeleteEquipment(GlobalContext* globalCtx, s16 equipment) // Translates to: "Erasing equipment item = %d zzz=%d" osSyncPrintf("装備アイテム抹消 = %d zzz=%d\n", equipment, sp26); - if (sp26) - { + if (sp26) { sp26 >>= gEquipShifts[equipment]; gSaveContext.equips.equipment &= gEquipNegMasks[equipment]; gSaveContext.equipment ^= gBitFlags[sp26 - 1] << gEquipShifts[equipment]; - if (equipment == EQUIP_TUNIC) + if (equipment == EQUIP_TUNIC) { gSaveContext.equips.equipment |= 0x0100; + } - if (equipment == EQUIP_SWORD) - { + if (equipment == EQUIP_SWORD) { gSaveContext.equips.button_items[0] = ITEM_NONE; gSaveContext.inf_table[29] = 1; } @@ -272,8 +104,7 @@ u8 Inventory_DeleteEquipment(GlobalContext* globalCtx, s16 equipment) return sp26; } -void Inventory_ChangeUpgrade(s16 upgrade, s16 value) -{ +void Inventory_ChangeUpgrade(s16 upgrade, s16 value) { gSaveContext.upgrades &= gUpgradeNegMasks[upgrade]; gSaveContext.upgrades |= value << gUpgradeShifts[upgrade]; } diff --git a/src/code/code_800A9D40.c b/src/code/code_800A9D40.c index 960994614d..c32d31d4e6 100644 --- a/src/code/code_800A9D40.c +++ b/src/code/code_800A9D40.c @@ -1,23 +1,20 @@ #include #include -typedef struct -{ +typedef struct { /* 0x00 */ OSPiHandle piHandle; /* 0x74 */ OSIoMesg ioMesg; /* 0x8C */ OSMesgQueue mesgQ; } struct_800A9D40; -struct_800A9D40 D_8012A690 = {0}; +struct_800A9D40 D_8012A690 = { 0 }; void func_800A9D40(u32 addr, u8 handleType, u8 handleDomain, u8 handleLatency, u8 handlePageSize, u8 handleRelDuration, - u8 handlePulse, u32 handleSpeed) -{ + u8 handlePulse, u32 handleSpeed) { u32 int_disabled; - OSPiHandle *handle = &D_8012A690.piHandle; - if ((u32) OS_PHYSICAL_TO_K1(addr) != (*handle).baseAddress) - { + OSPiHandle* handle = &D_8012A690.piHandle; + if ((u32)OS_PHYSICAL_TO_K1(addr) != (*handle).baseAddress) { D_8012A690.piHandle.type = handleType; (*handle).baseAddress = OS_PHYSICAL_TO_K1(addr); D_8012A690.piHandle.latency = handleLatency; @@ -37,8 +34,7 @@ void func_800A9D40(u32 addr, u8 handleType, u8 handleDomain, u8 handleLatency, u } } -void func_800A9E14(UNK_PTR dramAddr, size_t size, UNK_TYPE arg2) -{ +void func_800A9E14(UNK_PTR dramAddr, size_t size, UNK_TYPE arg2) { OSMesg mesg; osCreateMesgQueue(&D_8012A690.mesgQ, &mesg, 1); @@ -50,8 +46,7 @@ void func_800A9E14(UNK_PTR dramAddr, size_t size, UNK_TYPE arg2) osInvalDCache(dramAddr, size); } -void Sram_ReadWrite(UNK_TYPE arg0, UNK_PTR dramAddr, size_t size, UNK_TYPE arg3) -{ +void Sram_ReadWrite(UNK_TYPE arg0, UNK_PTR dramAddr, size_t size, UNK_TYPE arg3) { osSyncPrintf("ssSRAMReadWrite:%08x %08x %08x %d\n", arg0, dramAddr, size, arg3); func_800A9D40(arg0, 3, 1, 5, 0xd, 2, 0xc, 0); func_800A9E14(dramAddr, size, arg3); diff --git a/src/code/code_800A9F30.c b/src/code/code_800A9F30.c index c5248faca8..ddc8c02238 100644 --- a/src/code/code_800A9F30.c +++ b/src/code/code_800A9F30.c @@ -5,26 +5,23 @@ extern u8 D_80160FD0[]; extern PadMgr gPadMgr; -void func_800A9F30(s32 a, s32 b) -{ +void func_800A9F30(s32 a, s32 b) { func_800D2E30(&D_80160FD0); func_800C7948(a, &D_80160FD0); } -void func_800A9F6C(f32 a, u8 b, u8 c, u8 d) -{ +void func_800A9F6C(f32 a, u8 b, u8 c, u8 d) { s32 temp1, temp2; - if (1000000.0f < a) + if (1000000.0f < a) { temp1 = 1000; - else + } else { temp1 = sqrtf(a); + } - if ((temp1 < 1000) && (b != 0) && (d != 0)) - { + if ((temp1 < 1000) && (b != 0) && (d != 0)) { temp2 = b - (temp1 * 255) / 1000; - if (temp2 > 0) - { + if (temp2 > 0) { D_801610DA = temp2; D_80160FD0[0x10B] = c; D_80160FD0[0x10C] = d; @@ -35,49 +32,38 @@ void func_800A9F6C(f32 a, u8 b, u8 c, u8 d) #pragma GLOBAL_ASM("asm/non_matchings/code/code_800A9F30/func_800AA000.s") // this function is very similar to the one above but has a loop in it I can't figure out -void func_800AA0B4(void) -{ +void func_800AA0B4(void) { func_800D3140(&D_80160FD0); gPadMgr.unk_460 = func_800A9F30; gPadMgr.unk_464 = 0; - if (0) ; // Necessary to match + if (0) {} // Necessary to match } -#ifdef NON_MATCHING -void func_800AA0F0(void) -{ - if ((gPadMgr.unk_460 == func_800A9F30) && (gPadMgr.unk_464 == 0)) - { - // asm loads/writes directly to 0x80166D20 and 0x80166D24 - // but the compiler wants to reuse offsets from 0x801668C0 - gPadMgr.unk_460 = NULL; - gPadMgr.unk_464 = 0; +void func_800AA0F0(void) { + PadMgr* padmgr = &gPadMgr; + + if ((padmgr->unk_460 == func_800A9F30) && (padmgr->unk_464 == 0)) { + padmgr->unk_460 = NULL; + padmgr->unk_464 = 0; } func_800D3178(&D_80160FD0); } -#else -#pragma GLOBAL_ASM("asm/non_matchings/code/code_800A9F30/func_800AA0F0.s") -#endif -u32 func_800AA148(void) -{ +u32 func_800AA148(void) { return ((gPadMgr.unk_2AE[0] ^ 1) == 0); } -void func_800AA15C(void) -{ +void func_800AA15C(void) { D_801610D4 = 2; } -void func_800AA16C(void) -{ +void func_800AA16C(void) { D_801610D4 = 0; } -void func_800AA178(u32 a) -{ +void func_800AA178(u32 a) { D_801610D5 = !!a; } diff --git a/src/code/code_800ACE70.c b/src/code/code_800ACE70.c new file mode 100644 index 0000000000..31e93ad63b --- /dev/null +++ b/src/code/code_800ACE70.c @@ -0,0 +1,106 @@ +#include + +typedef struct { + /* 0x00 */ u32 type; + /* 0x04 */ u32 setScissor; + /* 0x08 */ union { + Color_RGBA8 c; + u32 rgba; + } color; + /* 0x0C */ u32 unk_0C; +} struct_801664F0; + +Gfx D_8012AC00[] = { + gsDPSetOtherMode(G_AD_PATTERN | G_CD_MAGICSQ | G_CK_NONE | G_TC_CONV | G_TF_POINT | G_TT_NONE | G_TL_TILE | + G_TD_CLAMP | G_TP_NONE | G_CYC_1CYCLE | G_PM_NPRIMITIVE, + G_AC_NONE | G_ZS_PRIM | G_RM_VISCVG | G_RM_VISCVG2), + gsDPFillRectangle(0, 0, SCREEN_WIDTH - 1, SCREEN_HEIGHT - 1), + gsDPPipeSync(), + gsDPSetBlendColor(0, 0, 0, 8), + gsSPEndDisplayList(), +}; + +Gfx D_8012AC28[] = { + gsDPSetOtherMode(G_AD_PATTERN | G_CD_MAGICSQ | G_CK_NONE | G_TC_CONV | G_TF_POINT | G_TT_NONE | G_TL_TILE | + G_TD_CLAMP | G_TP_NONE | G_CYC_1CYCLE | G_PM_NPRIMITIVE, + G_AC_NONE | G_ZS_PRIM | IM_RD | CVG_DST_CLAMP | ZMODE_OPA | FORCE_BL | + GBL_c1(G_BL_CLR_FOG, G_BL_A_FOG, G_BL_CLR_MEM, G_BL_A_MEM) | + GBL_c2(G_BL_CLR_FOG, G_BL_A_FOG, G_BL_CLR_MEM, G_BL_A_MEM)), + gsDPFillRectangle(0, 0, SCREEN_WIDTH - 1, SCREEN_HEIGHT - 1), + gsSPEndDisplayList(), +}; + +Gfx D_8012AC40[] = { + gsDPSetOtherMode(G_AD_PATTERN | G_CD_MAGICSQ | G_CK_NONE | G_TC_CONV | G_TF_POINT | G_TT_NONE | G_TL_TILE | + G_TD_CLAMP | G_TP_NONE | G_CYC_1CYCLE | G_PM_NPRIMITIVE, + G_AC_NONE | G_ZS_PRIM | IM_RD | CVG_DST_CLAMP | ZMODE_OPA | FORCE_BL | + GBL_c1(G_BL_CLR_IN, G_BL_0, G_BL_CLR_MEM, G_BL_A_MEM) | + GBL_c2(G_BL_CLR_IN, G_BL_0, G_BL_CLR_MEM, G_BL_A_MEM)), + + gsDPFillRectangle(0, 0, SCREEN_WIDTH - 1, SCREEN_HEIGHT - 1), + gsSPEndDisplayList(), +}; + +Gfx D_8012AC58[] = { + gsDPSetCombineMode(G_CC_PRIMITIVE, G_CC_PRIMITIVE), + gsDPSetOtherMode(G_AD_NOTPATTERN | G_CD_DISABLE | G_CK_NONE | G_TC_CONV | G_TF_POINT | G_TT_NONE | G_TL_TILE | + G_TD_CLAMP | G_TP_NONE | G_CYC_1CYCLE | G_PM_NPRIMITIVE, + G_AC_NONE | G_ZS_PRIM | G_RM_CLD_SURF | G_RM_CLD_SURF2), + gsDPFillRectangle(0, 0, SCREEN_WIDTH - 1, SCREEN_HEIGHT - 1), + gsDPSetOtherMode(G_AD_PATTERN | G_CD_MAGICSQ | G_CK_NONE | G_TC_CONV | G_TF_POINT | G_TT_NONE | G_TL_TILE | + G_TD_CLAMP | G_TP_NONE | G_CYC_1CYCLE | G_PM_NPRIMITIVE, + G_AC_NONE | G_ZS_PRIM | IM_RD | CVG_DST_CLAMP | ZMODE_OPA | FORCE_BL | + GBL_c1(G_BL_CLR_IN, G_BL_0, G_BL_CLR_MEM, G_BL_A_MEM) | + GBL_c2(G_BL_CLR_IN, G_BL_0, G_BL_CLR_MEM, G_BL_A_MEM)), + gsDPFillRectangle(0, 0, SCREEN_WIDTH - 1, SCREEN_HEIGHT - 1), + gsSPEndDisplayList(), +}; + +// Init func +void func_800ACE70(struct_801664F0* this) { + this->type = 0; + this->setScissor = false; + this->color.c.r = 0xFF; + this->color.c.g = 0xFF; + this->color.c.b = 0xFF; + this->color.c.a = 0xFF; +} + +// Destroy func +void func_800ACE90(struct_801664F0* this) { +} + +// Update func +void func_800ACE98(struct_801664F0* this, Gfx** gfxp) { + Gfx* gfx; + + gfx = *gfxp; + + gDPPipeSync(gfx++); + gDPSetPrimDepth(gfx++, -1, -1); + + if (this->setScissor == true) { + gDPSetScissor(gfx++, G_SC_NON_INTERLACE, 0, 0, SCREEN_WIDTH, SCREEN_HEIGHT); + } + + switch (this->type) { + case 1: + gSPDisplayList(gfx++, D_8012AC40); + break; + case 2: + gDPSetColor(gfx++, G_SETPRIMCOLOR, this->color.rgba); + gSPDisplayList(gfx++, D_8012AC58); + break; + case 3: + gDPSetColor(gfx++, G_SETBLENDCOLOR, this->color.rgba); + gSPDisplayList(gfx++, D_8012AC00); + break; + case 4: + gDPSetColor(gfx++, G_SETFOGCOLOR, this->color.rgba); + gSPDisplayList(gfx++, D_8012AC28); + break; + } + + gDPPipeSync(gfx++); + *gfxp = gfx; +} diff --git a/src/code/code_800D31A0.c b/src/code/code_800D31A0.c new file mode 100644 index 0000000000..3f73824402 --- /dev/null +++ b/src/code/code_800D31A0.c @@ -0,0 +1,24 @@ +#include +#include +#include + +extern PadMgr gPadMgr; + +u32 D_8012DBC0 = false; + +void func_800D31A0() { + osSyncPrintf(VT_FGCOL(RED) "\n**** Freeze!! ****\n" VT_RST); + while (true) { + func_800FF4AC(1000); // msleep + } +} + +void func_800D31F0() { + PadMgr* padMgr = (PadMgr*)(u32)&gPadMgr; // cast required to match + + D_8012DBC0 = (padMgr->unk_2A8 & 2) != 0; +} + +void func_800D3210() { + D_8012DBC0 = false; +} diff --git a/src/code/code_800FBCE0.c b/src/code/code_800FBCE0.c index 2516388830..2c17e6fa28 100644 --- a/src/code/code_800FBCE0.c +++ b/src/code/code_800FBCE0.c @@ -1,10 +1,13 @@ #include -#define printSpStatus(x, name) if (x & SP_STATUS_##name) osSyncPrintf(#name " ") -#define printDpStatus(x, name) if (x & DPC_STATUS_##name) osSyncPrintf(#name " ") +#define printSpStatus(x, name) \ + if (x & SP_STATUS_##name) \ + osSyncPrintf(#name " ") +#define printDpStatus(x, name) \ + if (x & DPC_STATUS_##name) \ + osSyncPrintf(#name " ") -void func_800FBCE0() -{ +void func_800FBCE0() { u32 spStatus = __osSpGetStatus(); u32 dpStatus = osDpGetStatus(); @@ -41,10 +44,9 @@ void func_800FBCE0() osSyncPrintf("\n"); } -void func_800FBFD8() -{ +void func_800FBFD8() { func_800FBCE0(); osDpSetStatus(DPC_SET_FREEZE | DPC_SET_FLUSH); __osSpSetStatus(SP_SET_HALT | SP_SET_SIG2 | SP_CLR_INTR_BREAK); func_800FBCE0(); -} \ No newline at end of file +} diff --git a/src/code/code_800FC620.c b/src/code/code_800FC620.c index 81f0f53e77..b0b16b8b7d 100644 --- a/src/code/code_800FC620.c +++ b/src/code/code_800FC620.c @@ -1,52 +1,44 @@ #include typedef void (*arg3_800FC868)(void*); -typedef void (*arg3_800FC8D8)(void*,u32); -typedef void (*arg3_800FC948)(void*,u32,u32,u32,u32,u32,u32,u32,u32); -typedef void (*arg3_800FCA18)(void*,u32); +typedef void (*arg3_800FC8D8)(void*, u32); +typedef void (*arg3_800FC948)(void*, u32, u32, u32, u32, u32, u32, u32, u32); +typedef void (*arg3_800FCA18)(void*, u32); -typedef struct InitFunc -{ +typedef struct InitFunc { s32 nextOffset; void (*func)(void); } InitFunc; -//.data -void *sInitFuncs = NULL; +// .data +void* sInitFuncs = NULL; -char sNew[4] = -{ - 'n', 'e', 'w', +char sNew[4] = { 'n', 'e', 'w' }; + +char D_80134488[0x18] = { + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7F, 0x80, 0x00, 0x00, + 0xFF, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, }; -char D_80134488[0x18] = -{ - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x7F, 0x80, 0x00, 0x00, 0xFF, 0x80, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, -}; - -s32 Overlay_Load(u32 vRomStart, u32 vRomEnd, void *vRamStart, void *vRamEnd, void *allocatedVRamAddr) -{ +s32 Overlay_Load(u32 vRomStart, u32 vRomEnd, void* vRamStart, void* vRamEnd, void* allocatedVRamAddr) { u32 pad; u32 end; u32 bssSize; - OverlayRelocationSection *ovl; + OverlayRelocationSection* ovl; u32 relocCnt; u32 ovlOffset; u32 size; - if(gOverlayLogSeverity >= 3) - { + if (gOverlayLogSeverity >= 3) { // Start loading dynamic link function osSyncPrintf("\nダイナミックリンクファンクションのロードを開始します\n"); } - if(gOverlayLogSeverity >= 3) - { + if (gOverlayLogSeverity >= 3) { size = vRomEnd - vRomStart; - //DMA transfer of TEXT, DATA, RODATA + rel (%08x-%08x) - osSyncPrintf("TEXT,DATA,RODATA+relをＤＭＡ転送します(%08x-%08x)\n", allocatedVRamAddr, (u32)allocatedVRamAddr + size); + // DMA transfer of TEXT, DATA, RODATA + rel (%08x-%08x) + osSyncPrintf("TEXT,DATA,RODATA+relをＤＭＡ転送します(%08x-%08x)\n", allocatedVRamAddr, + (u32)allocatedVRamAddr + size); } size = vRomEnd - vRomStart; @@ -56,13 +48,12 @@ s32 Overlay_Load(u32 vRomStart, u32 vRomEnd, void *vRamStart, void *vRamEnd, voi ovlOffset = ((s32*)end)[-1]; ovl = (OverlayRelocationSection*)((u32)end - ovlOffset); - if(gOverlayLogSeverity >= 3) - { - osSyncPrintf("TEXT(%08x), DATA(%08x), RODATA(%08x), BSS(%08x)\n", ovl->textSize, ovl->dataSize, ovl->rodataSize, ovl->bssSize); + if (gOverlayLogSeverity >= 3) { + osSyncPrintf("TEXT(%08x), DATA(%08x), RODATA(%08x), BSS(%08x)\n", ovl->textSize, ovl->dataSize, ovl->rodataSize, + ovl->bssSize); } - if(gOverlayLogSeverity >= 3) - { + if (gOverlayLogSeverity >= 3) { // Relocate osSyncPrintf("リロケーションします\n"); } @@ -70,10 +61,8 @@ s32 Overlay_Load(u32 vRomStart, u32 vRomEnd, void *vRamStart, void *vRamEnd, voi Overlay_DoRelocation(allocatedVRamAddr, ovl, vRamStart); bssSize = ovl->bssSize; - if(bssSize != 0) - { - if(gOverlayLogSeverity >= 3) - { + if (bssSize != 0) { + if (gOverlayLogSeverity >= 3) { // Clear BSS area (% 08x-% 08x) osSyncPrintf("BSS領域をクリアします(%08x-%08x)\n", end, end + ovl->bssSize); } @@ -85,8 +74,7 @@ s32 Overlay_Load(u32 vRomStart, u32 vRomEnd, void *vRamStart, void *vRamEnd, voi } size = (u32)&ovl->relocations[ovl->nRelocations] - (u32)ovl; - if(gOverlayLogSeverity >= 3) - { + if (gOverlayLogSeverity >= 3) { // Clear REL area (%08x-%08x) osSyncPrintf("REL領域をクリアします(%08x-%08x)\n", ovl, (u32)ovl + size); } @@ -97,8 +85,7 @@ s32 Overlay_Load(u32 vRomStart, u32 vRomEnd, void *vRamStart, void *vRamEnd, voi osWritebackDCache(allocatedVRamAddr, size); osInvalICache(allocatedVRamAddr, size); - if(gOverlayLogSeverity >= 3) - { + if (gOverlayLogSeverity >= 3) { // Finish loading dynamic link function osSyncPrintf("ダイナミックリンクファンクションのロードを終了します\n\n"); } @@ -106,10 +93,8 @@ s32 Overlay_Load(u32 vRomStart, u32 vRomEnd, void *vRamStart, void *vRamEnd, voi } // possibly some kind of new() function -void *func_800FC800(u32 size) -{ - if (size == 0) - { +void* func_800FC800(u32 size) { + if (size == 0) { size = 1; } @@ -117,106 +102,87 @@ void *func_800FC800(u32 size) } // possible some kind of delete() function -void func_800FC83C(void *ptr) -{ - if (ptr != NULL) - { +void func_800FC83C(void* ptr) { + if (ptr != NULL) { __osFree(&gSystemArena, ptr); } } -void func_800FC868(void *blk, u32 nBlk, u32 blkSize, arg3_800FC868 arg3) -{ +void func_800FC868(void* blk, u32 nBlk, u32 blkSize, arg3_800FC868 arg3) { u32 pos; - for (pos = (u32)blk; pos < (u32)blk + (nBlk * blkSize); pos = (u32)pos + (blkSize & ~0)) - { + for (pos = (u32)blk; pos < (u32)blk + (nBlk * blkSize); pos = (u32)pos + (blkSize & ~0)) { arg3((void*)pos); } } -void func_800FC8D8(void *blk, u32 nBlk, s32 blkSize, arg3_800FC8D8 arg3) -{ +void func_800FC8D8(void* blk, u32 nBlk, s32 blkSize, arg3_800FC8D8 arg3) { u32 pos; - for (pos = (u32)blk; pos < (u32)blk + (nBlk * blkSize); pos = (u32)pos + (blkSize & ~0)) - { + for (pos = (u32)blk; pos < (u32)blk + (nBlk * blkSize); pos = (u32)pos + (blkSize & ~0)) { arg3((void*)pos, 2); } } -void *func_800FC948(void *blk, u32 nBlk, u32 blkSize, arg3_800FC948 arg3) -{ +void* func_800FC948(void* blk, u32 nBlk, u32 blkSize, arg3_800FC948 arg3) { u32 pos; - if (blk == NULL) - { + if (blk == NULL) { blk = func_800FC800(nBlk * blkSize); } - if (blk != NULL && arg3 != NULL) - { + if (blk != NULL && arg3 != NULL) { pos = (u32)blk; - while(pos < (u32)blk + (nBlk * blkSize)) - { + while (pos < (u32)blk + (nBlk * blkSize)) { arg3((void*)pos, 0, 0, 0, 0, 0, 0, 0, 0); pos = (u32)pos + (blkSize & ~0); } - } return blk; } -void func_800FCA18(void *blk, u32 nBlk, u32 blkSize, arg3_800FCA18 arg3, s32 arg4) -{ +void func_800FCA18(void* blk, u32 nBlk, u32 blkSize, arg3_800FCA18 arg3, s32 arg4) { u32 pos; - u32 end ; + u32 end; s32 masked_arg2; - if (blk == 0) - { + if (blk == 0) { return; } - if (arg3 != 0) - { + if (arg3 != 0) { end = (u32)blk; masked_arg2 = (s32)(blkSize & ~0); pos = (u32)end + (nBlk * blkSize); - if (masked_arg2) { } + if (masked_arg2) {} - while (pos > end) - { + while (pos > end) { do { pos -= masked_arg2; arg3((void*)pos, 2); } while (0); } - if (!masked_arg2){ } + if (!masked_arg2) {} } - if (arg4 != 0) - { + if (arg4 != 0) { func_800FC83C(blk); } } -void func_800FCB34(void) -{ - InitFunc *initFunc; +void func_800FCB34(void) { + InitFunc* initFunc; u32 nextOffset; - InitFunc *prev; + InitFunc* prev; initFunc = (InitFunc*)&sInitFuncs; nextOffset = initFunc->nextOffset; prev = NULL; - while(nextOffset != 0) - { + while (nextOffset != 0) { initFunc = (InitFunc*)((s32)initFunc + nextOffset); - if(initFunc->func != NULL) - { + if (initFunc->func != NULL) { (*initFunc->func)(); } @@ -228,8 +194,7 @@ void func_800FCB34(void) sInitFuncs = prev; } -void SystemHeap_Init(void *start, u32 size) -{ +void SystemHeap_Init(void* start, u32 size) { SystemArena_Init(start, size); func_800FCB34(); -} \ No newline at end of file +} diff --git a/src/code/code_800FCE80.c b/src/code/code_800FCE80.c new file mode 100644 index 0000000000..5180c24447 --- /dev/null +++ b/src/code/code_800FCE80.c @@ -0,0 +1,161 @@ +#include +#include +#include + +s32 use_cfrac; + +f32 Math_tanf(f32 x) { + f32 sin = sinf(x); + f32 cos = cosf(x); + return sin / cos; +} + +f32 Math_floorf(f32 x) { + return floorf(x); +} + +f32 Math_ceilf(f32 x) { + return ceilf(x); +} + +f32 Math_roundf(f32 x) { + return roundf(x); +} + +f32 Math_truncf(f32 x) { + return truncf(x); +} + +f32 Math_nearbyintf(f32 x) { + return nearbyintf(x); +} + +/* Arctangent approximation using a Taylor series (one quadrant) */ +f32 Math_atanf_taylor_q(f32 x) { + static const f32 coeffs[] = { + -1.f / 3, +1.f / 5, -1.f / 7, +1.f / 9, -1.f / 11, +1.f / 13, -1.f / 15, +1.f / 17, 0.f, + }; + + f32 poly = x; + f32 sq = SQ(x); + f32 exp = x * sq; + const f32* c = coeffs; + f32 term; + + while (1) { + term = *c++ * exp; + if (poly + term == poly) { + break; + } + poly = poly + term; + exp = exp * sq; + } + + return poly; +} + +/* Ditto for two quadrants */ +f32 Math_atanf_taylor(f32 x) { + f32 t; + f32 q; + + if (x > 0.f) { + t = x; + } else if (x < 0.f) { + t = -x; + } else if (x == 0.f) { + return 0.f; + } else { + return qNaN0x10000; + } + + if (t <= M_SQRT2 - 1.f) { + return Math_atanf_taylor_q(x); + } + + if (t >= M_SQRT2 + 1.f) { + q = M_PI / 2 - Math_atanf_taylor_q(1.f / t); + } else { + q = M_PI / 4 - Math_atanf_taylor_q((1.f - t) / (1.f + t)); + } + + if (x > 0.f) { + return q; + } else { + return -q; + } +} + +/* Arctangent approximation using a continued fraction */ +f32 Math_atanf_cfrac(f32 x) { + s32 sector; + f32 z; + f32 conv; + f32 sq; + s32 i; + + if (x >= -1.f && x <= 1.f) { + sector = 0; + } else if (x > 1.f) { + sector = 1; + x = 1.f / x; + } else if (x < -1.f) { + sector = -1; + x = 1.f / x; + } else { + return qNaN0x10000; + } + + sq = SQ(x); + conv = 0.f; + z = 8.f; + for (i = 8; i != 0; i--) { + conv = SQ(z) * sq / (2.f * z + 1.f + conv); + z -= 1.f; + } + conv = x / (1.f + conv); + + if (sector == 0) { + return conv; + } else if (sector > 0) { + return M_PI / 2 - conv; + } else { + return -M_PI / 2 - conv; + } +} + +f32 Math_atanf(f32 x) { + if (use_cfrac == 0) { + return Math_atanf_taylor(x); + } else { + return Math_atanf_cfrac(x); + } +} + +f32 Math_atan2f(f32 y, f32 x) { + if (x == 0.f) { + if (y == 0.f) { + return 0.f; + } else if (y > 0.f) { + return M_PI / 2; + } else if (y < 0.f) { + return -M_PI / 2; + } else { + return qNaN0x10000; + } + } else if (x >= 0.f) { + return Math_atanf(y / x); + } else if (y < 0.f) { + return Math_atanf(y / x) - M_PI; + } else { + return M_PI - Math_atanf(-(y / x)); + } +} + +f32 Math_asinf(f32 x) { + return Math_atan2f(x, sqrtf(1.f - SQ(x))); +} + +f32 Math_acosf(f32 x) { + return M_PI / 2 - Math_asinf(x); +} diff --git a/src/code/db_camera.c b/src/code/db_camera.c index e0580f6b7c..b1e858e638 100644 --- a/src/code/db_camera.c +++ b/src/code/db_camera.c @@ -80,4 +80,3 @@ #pragma GLOBAL_ASM("asm/non_matchings/code/db_camera/func_800B958C.s") #pragma GLOBAL_ASM("asm/non_matchings/code/db_camera/func_800B9638.s") - diff --git a/src/code/debug_malloc.c b/src/code/debug_malloc.c index 6e63e1c4a6..789e382af6 100644 --- a/src/code/debug_malloc.c +++ b/src/code/debug_malloc.c @@ -1,131 +1,112 @@ #include -#define LOG_SEVERITY_NOLOG 0 -#define LOG_SEVERITY_ERROR 2 -#define LOG_SEVERITY_VERBOSE 3 +#define LOG_SEVERITY_NOLOG 0 +#define LOG_SEVERITY_ERROR 2 +#define LOG_SEVERITY_VERBOSE 3 s32 gDebugArenaLogSeverity = LOG_SEVERITY_ERROR; Arena sDebugArena; -void DebugArena_CheckPointer(void* ptr, u32 size, const char* name, const char* action) -{ - if (!ptr) - { - if (gDebugArenaLogSeverity >= LOG_SEVERITY_ERROR) - { +void DebugArena_CheckPointer(void* ptr, u32 size, const char* name, const char* action) { + if (!ptr) { + if (gDebugArenaLogSeverity >= LOG_SEVERITY_ERROR) { //"%s: %u bytes %s failed\n" osSyncPrintf("%s: %u バイトの%sに失敗しました\n", name, size, action); - __osDisplayArena(&sDebugArena); + __osDisplayArena(&sDebugArena); return; } - } - else if (gDebugArenaLogSeverity >= LOG_SEVERITY_VERBOSE) - { + } else if (gDebugArenaLogSeverity >= LOG_SEVERITY_VERBOSE) { //"%s: %u bytes %s succeeded\n" osSyncPrintf("%s: %u バイトの%sに成功しました\n", name, size, action); } } -void* DebugArena_Malloc(u32 size) -{ +void* DebugArena_Malloc(u32 size) { void* ptr; ptr = __osMalloc(&sDebugArena, size); - DebugArena_CheckPointer(ptr, size, "debug_malloc", "確保"); //Secure + DebugArena_CheckPointer(ptr, size, "debug_malloc", "確保"); // Secure return ptr; } -void* DebugArena_MallocDebug(u32 size, const char* file, s32 line) -{ +void* DebugArena_MallocDebug(u32 size, const char* file, s32 line) { void* ptr; ptr = __osMallocDebug(&sDebugArena, size, file, line); - DebugArena_CheckPointer(ptr, size, "debug_malloc_DEBUG", "確保"); //Secure + DebugArena_CheckPointer(ptr, size, "debug_malloc_DEBUG", "確保"); // Secure return ptr; } -void* DebugArena_MallocR(u32 size) -{ +void* DebugArena_MallocR(u32 size) { void* ptr; ptr = __osMallocR(&sDebugArena, size); - DebugArena_CheckPointer(ptr, size, "debug_malloc_r", "確保"); //Secure + DebugArena_CheckPointer(ptr, size, "debug_malloc_r", "確保"); // Secure return ptr; } -void* DebugArena_MallocRDebug(u32 size, const char* file, s32 line) -{ +void* DebugArena_MallocRDebug(u32 size, const char* file, s32 line) { void* ptr; ptr = __osMallocRDebug(&sDebugArena, size, file, line); - DebugArena_CheckPointer(ptr, size, "debug_malloc_r_DEBUG", "確保"); //Secure + DebugArena_CheckPointer(ptr, size, "debug_malloc_r_DEBUG", "確保"); // Secure return ptr; } -void* DebugArena_Realloc(void* ptr, u32 newSize) -{ +void* DebugArena_Realloc(void* ptr, u32 newSize) { ptr = __osRealloc(&sDebugArena, ptr, newSize); DebugArena_CheckPointer(ptr, newSize, "debug_realloc", "再確保"); // Re-securing return ptr; } -void* DebugArena_ReallocDebug(void* ptr, u32 newSize, const char* file, s32 line) -{ +void* DebugArena_ReallocDebug(void* ptr, u32 newSize, const char* file, s32 line) { ptr = __osReallocDebug(&sDebugArena, ptr, newSize, file, line); DebugArena_CheckPointer(ptr, newSize, "debug_realloc_DEBUG", "再確保"); // Re-securing return ptr; } -void DebugArena_Free(void* ptr) -{ +void DebugArena_Free(void* ptr) { __osFree(&sDebugArena, ptr); } -void DebugArena_FreeDebug(void* ptr, const char* file, s32 line) -{ +void DebugArena_FreeDebug(void* ptr, const char* file, s32 line) { __osFreeDebug(&sDebugArena, ptr, file, line); } -void* DebugArena_Calloc(u32 num, u32 size) -{ +void* DebugArena_Calloc(u32 num, u32 size) { void* ret; u32 n; - - n = num*size; + + n = num * size; ret = __osMalloc(&sDebugArena, n); - if (ret) + if (ret) { bzero(ret, n); + } DebugArena_CheckPointer(ret, n, "debug_calloc", "確保"); return ret; } -void DebugArena_Display() -{ - //Zelda heap display (devs forgot to change "Zelda" to "Debug" apparently) +void DebugArena_Display() { + // Zelda heap display (devs forgot to change "Zelda" to "Debug" apparently) osSyncPrintf("ゼルダヒープ表示\n"); __osDisplayArena(&sDebugArena); } -void DebugArena_GetSizes(u32* outMaxFree, u32* outFree, u32* outAlloc) -{ +void DebugArena_GetSizes(u32* outMaxFree, u32* outFree, u32* outAlloc) { ArenaImpl_GetSizes(&sDebugArena, outMaxFree, outFree, outAlloc); } -void DebugArena_Check() -{ +void DebugArena_Check() { __osCheckArena(&sDebugArena); } -void DebugArena_Init(void* start, u32 size) -{ +void DebugArena_Init(void* start, u32 size) { gDebugArenaLogSeverity = LOG_SEVERITY_NOLOG; __osMallocInit(&sDebugArena, start, size); } -void DebugArena_Cleanup() -{ +void DebugArena_Cleanup() { gDebugArenaLogSeverity = LOG_SEVERITY_NOLOG; __osMallocCleanup(&sDebugArena); } -u8 DebugArena_IsInitalized() -{ +u8 DebugArena_IsInitalized() { return __osMallocIsInitalized(&sDebugArena); } diff --git a/src/code/fault.c b/src/code/fault.c index 528d8beafd..05bee87d51 100644 --- a/src/code/fault.c +++ b/src/code/fault.c @@ -1,10 +1,10 @@ #include #include +#include #include -//data -const char* sExceptionNames[] = -{ +// data +const char* sExceptionNames[] = { "Interrupt", "TLB modification", "TLB exception on load", @@ -31,7 +31,7 @@ const char* sExceptionNames[] = "Inexact operation", }; -//bss +// bss FaultThreadStruct* sFaultStructPtr; u8 sFaultIsWaitingForInput; char sFaultStack[0x600]; @@ -40,76 +40,67 @@ FaultThreadStruct gFaultStruct; #pragma GLOBAL_ASM("asm/non_matchings/code/fault/pad_800D3F10.s") -void Fault_SleepImpl(u32 duration) -{ +void Fault_SleepImpl(u32 duration) { u64 value = (duration * OS_CPU_COUNTER) / 1000ull; func_800FF3A0(value); } -void Fault_ClientProcessThread(FaultClientContext* ctx) -{ - if (ctx->callback) +void Fault_ClientProcessThread(FaultClientContext* ctx) { + if (ctx->callback) { ctx->ret = ctx->callback(ctx->param0, ctx->param1); + } - if (ctx->queue) + if (ctx->queue) { osSendMesg(ctx->queue, ctx->msg, 1); + } } -#ifdef NON_MATCHING -void Fault_ProcessClientContext(FaultClientContext* ctx) -{ +void Fault_ProcessClientContext(FaultClientContext* ctx) { OSMesgQueue queue; OSMesg msg; - OSThread* t; - OSTimer timer; OSMesg recMsg; + OSThread* thread; + OSTimer timer; + u32 timerMsgVal; + + timerMsgVal = 666; + thread = NULL; osCreateMesgQueue(&queue, &msg, 1); ctx->queue = &queue; ctx->msg = NULL; - if (sFaultStructPtr->currClientThreadSp) - { + + if (sFaultStructPtr->currClientThreadSp != 0) { + thread = alloca(sizeof(OSThread)); + osCreateThread(thread, 2, Fault_ClientProcessThread, ctx, sFaultStructPtr->currClientThreadSp, 0x7E); + osStartThread(thread); + } else { Fault_ClientProcessThread(ctx); - t = NULL; - } - else - { - OSThread thread; - osCreateThread(&thread, 2, &Fault_ClientProcessThread, ctx, sFaultStructPtr->currClientThreadSp, 0x7E); - osStartThread(&thread); - t = &thread; } - while(true) - { - osSetTimer(&timer, OS_USEC_TO_CYCLES(1000000), 0, &queue, (OSMesg)0x29A); + while (true) { + osSetTimer(&timer, OS_USEC_TO_CYCLES(1000000), 0, &queue, (OSMesg)timerMsgVal); osRecvMesg(&queue, &recMsg, 1); - if (recMsg == (OSMesg)0x29A) + if (recMsg != (OSMesg)666) { break; + } - if (sFaultIsWaitingForInput) - { + if (!sFaultIsWaitingForInput) { ctx->ret = -1; break; } } osStopTimer(&timer); - if (t) - { - osStopThread(t); - //osDestroyThread(t); - osDestroyThread(t); + + if (thread != NULL) { + osStopThread(thread); + osDestroyThread(thread); } } -#else -#pragma GLOBAL_ASM("asm/non_matchings/code/fault/Fault_ProcessClientContext.s") -#endif - -u32 Fault_ProcessClient(u32 callback, u32 param0, u32 param1) -{ +u32 Fault_ProcessClient(u32 callback, u32 param0, u32 param1) { FaultClientContext a; a.callback = callback; a.param0 = param0; @@ -120,16 +111,19 @@ u32 Fault_ProcessClient(u32 callback, u32 param0, u32 param1) } #ifdef NON_MATCHING -void Fault_AddClient(FaultClient *client, void* callback, void* param0, void* param1) -{ - bool alreadyExist = false; - OSIntMask mask = osSetIntMask(1); - FaultClient* iter = sFaultStructPtr->clients; - while (iter) - { - if (iter == client) - { - alreadyExist = true; +// minor ordering differences +void Fault_AddClient(FaultClient* client, void* callback, void* param0, void* param1) { + OSIntMask mask; + u32 alreadyExists; + FaultClient* iter; + + alreadyExists = false; + mask = osSetIntMask(1); + + iter = sFaultStructPtr->clients; + while (iter) { + if (iter == client) { + alreadyExists = true; goto end; } iter = iter->next; @@ -143,8 +137,9 @@ void Fault_AddClient(FaultClient *client, void* callback, void* param0, void* pa end: osSetIntMask(mask); - if (alreadyExist) + if (alreadyExists) { osSyncPrintf(VT_COL(RED, WHITE) "fault_AddClient: %08x は既にリスト中にある\n" VT_RST, client); + } } #else #pragma GLOBAL_ASM("asm/non_matchings/code/fault/Fault_AddClient.s") @@ -183,11 +178,11 @@ void Fault_RemoveClient(FaultClient* client) { osSetIntMask(mask); - if (listIsEmpty) + if (listIsEmpty) { osSyncPrintf(VT_COL(RED, WHITE) "fault_RemoveClient: %08x リスト不整合です\n" VT_RST, client); + } } - #pragma GLOBAL_ASM("asm/non_matchings/code/fault/Fault_AddAddrConvClient.s") void Fault_RemoveAddrConvClient(FaultAddrConvClient* client) { @@ -224,24 +219,23 @@ void Fault_RemoveAddrConvClient(FaultAddrConvClient* client) { osSetIntMask(mask); if (listIsEmpty) { - osSyncPrintf(VT_COL(RED, WHITE) "fault_AddressConverterRemoveClient: %08x は既にリスト中にある\n" VT_RST, client); + osSyncPrintf(VT_COL(RED, WHITE) "fault_AddressConverterRemoveClient: %08x は既にリスト中にある\n" VT_RST, + client); } } -u32 Fault_ConvertAddress(FaultAddrConvClient* client) -{ +u32 Fault_ConvertAddress(FaultAddrConvClient* client) { u32 ret; FaultAddrConvClient* iter = sFaultStructPtr->addrConvClients; - while(iter) - { - if (iter->callback) - { + while (iter) { + if (iter->callback) { ret = Fault_ProcessClient(iter->callback, client, iter->param); - if (ret == -1) + if (ret == -1) { Fault_RemoveAddrConvClient(iter); - else if (ret) + } else if (ret) { return ret; + } } iter = iter->next; } @@ -249,131 +243,127 @@ u32 Fault_ConvertAddress(FaultAddrConvClient* client) return 0; } -void Fault_Sleep(u32 duration) -{ +void Fault_Sleep(u32 duration) { Fault_SleepImpl(duration); } -void Fault_PadCallback(Input* input) -{ - //BUG: this function is not called correctly and thus will crash from reading a bad pointer at 0x800C7E4C +void Fault_PadCallback(Input* input) { + // BUG: this function is not called correctly and thus will crash from reading a bad pointer at 0x800C7E4C func_800C7E08(input, 0); } -void Fault_UpdatePadImpl() -{ +void Fault_UpdatePadImpl() { sFaultStructPtr->padCallback(&sFaultStructPtr->padInput); } #ifdef NON_MATCHING -bool Fault_WaitForInputImpl() -{ +// ordering differences and possibly regalloc +u32 Fault_WaitForInputImpl() { u16 kDown; - bool exitDebugger; - + u32 exitDebugger; s32 count = 600; Input* curInput = &sFaultStructPtr->padInput; - while (true) - { - while (true) - { + + while (true) { + while (true) { Fault_Sleep(0x10); Fault_UpdatePadImpl(); + kDown = curInput->padPressed; - if (kDown == 0x20) + + if (kDown == 0x20) { sFaultStructPtr->faultActive = !sFaultStructPtr->faultActive; + } - if (!sFaultStructPtr->faultActive) + if (!sFaultStructPtr->faultActive) { break; + } - if (count-- < 1) + if (count-- < 1) { return false; + } } - if (kDown == 0x8000 || kDown == 0x100) - break; - if (kDown == 0x200) + if (kDown == 0x8000 || kDown == 0x100) { + return false; + } + + if (kDown == 0x200) { return true; - if (kDown == 0x800) + } + + if (kDown == 0x800) { FaultDrawer_SetOsSyncPrintfEnabled(true); - if (kDown == 0x400) + } + + if (kDown == 0x400) { FaultDrawer_SetOsSyncPrintfEnabled(false); + } } + return false; } #else #pragma GLOBAL_ASM("asm/non_matchings/code/fault/Fault_WaitForInputImpl.s") #endif -void Fault_WaitForInput() -{ +void Fault_WaitForInput() { sFaultIsWaitingForInput = 1; Fault_WaitForInputImpl(); sFaultIsWaitingForInput = 0; } -void Fault_DrawRec(s32 x, s32 y, s32 w, s32 h, u16 color) -{ +void Fault_DrawRec(s32 x, s32 y, s32 w, s32 h, u16 color) { FaultDrawer_DrawRecImpl(x, y, x + w - 1, y + h - 1, color); } -void Fault_FillScreenBlack() -{ +void Fault_FillScreenBlack() { FaultDrawer_SetForeColor(0xFFFF); FaultDrawer_SetBackColor(1); FaultDrawer_FillScreen(); FaultDrawer_SetBackColor(0); } -void Fault_FillScreenRed() -{ +void Fault_FillScreenRed() { FaultDrawer_SetForeColor(0xFFFF); FaultDrawer_SetBackColor(0xF001); FaultDrawer_FillScreen(); FaultDrawer_SetBackColor(0); } -void Fault_DrawCornerRec(u16 color) -{ +void Fault_DrawCornerRec(u16 color) { Fault_DrawRec(0x16, 0x10, 8, 1, color); } -void Fault_PrintFReg(s32 idx, f32 *value) -{ - u32 raw = *(u32*)value; - int v0 = ((raw & 0x7f800000) >> 0x17) - 0x7f; - - if ((v0 >= -0x7e && v0 < 0x80) || raw == 0) - FaultDrawer_Printf("F%02d:%14.7e ", idx, *value); - else - FaultDrawer_Printf("F%02d: %08x(16) ", idx, raw); -} - -#ifdef NON_MATCHING -void Fault_LogFReg(s32 idx, f32 *value) -{ +void Fault_PrintFReg(s32 idx, f32* value) { u32 raw = *(u32*)value; s32 v0 = ((raw & 0x7f800000) >> 0x17) - 0x7f; - if ((v0 >= -0x7e && v0 < 0x80) || raw == 0) - osSyncPrintf("F%02d:%14.7e ", idx, *value); - else - osSyncPrintf("F%02d: %08x(16) ", idx, raw); + if ((v0 >= -0x7e && v0 < 0x80) || raw == 0) { + FaultDrawer_Printf("F%02d:%14.7e ", idx, *value); + } else { + FaultDrawer_Printf("F%02d: %08x(16) ", idx, raw); + } } -#else -#pragma GLOBAL_ASM("asm/non_matchings/code/fault/Fault_LogFReg.s") -#endif -void Fault_PrintFPCR(u32 value) -{ +void Fault_LogFReg(s32 idx, f32* value) { + u32 raw = *(u32*)value; + s32 v0 = ((raw & 0x7f800000) >> 0x17) - 0x7f; + + if ((v0 >= -0x7e && v0 < 0x80) || raw == 0) { + osSyncPrintf("F%02d:%14.7e ", idx, *value); + } else { + osSyncPrintf("F%02d: %08x(16) ", idx, *(u32*)value); + } +} + +void Fault_PrintFPCR(u32 value) { s32 i; u32 flag = 0x20000; FaultDrawer_Printf("FPCSR:%08xH ", value); - for (i = 0; i < 6; i++) - { - if (value & flag) - { - FaultDrawer_Printf("(%s)", sExceptionNames[i+18]); + for (i = 0; i < 6; i++) { + if (value & flag) { + FaultDrawer_Printf("(%s)", sExceptionNames[i + 18]); break; } flag >>= 1; @@ -381,30 +371,28 @@ void Fault_PrintFPCR(u32 value) FaultDrawer_Printf("\n"); } -void Fault_LogFPCR(u32 value) -{ +void Fault_LogFPCR(u32 value) { s32 i; u32 flag = 0x20000; osSyncPrintf("FPCSR:%08xH ", value); - for (i = 0; i < 6; i++) - { - if (value & flag) - { - osSyncPrintf("(%s)\n", sExceptionNames[i+18]); + for (i = 0; i < 6; i++) { + if (value & flag) { + osSyncPrintf("(%s)\n", sExceptionNames[i + 18]); break; } flag >>= 1; } } -void Fault_PrintThreadContext(OSThread* t) -{ - __OSThreadContext *ctx; - s32 causeStrIdx = (s32) ((((u32) t->context.cause >> 2) & 0x1f) << 0x10) >> 0x10; - if (causeStrIdx == 0x17) +void Fault_PrintThreadContext(OSThread* t) { + __OSThreadContext* ctx; + s32 causeStrIdx = (s32)((((u32)t->context.cause >> 2) & 0x1f) << 0x10) >> 0x10; + if (causeStrIdx == 0x17) { causeStrIdx = 0x10; - if (causeStrIdx == 0x1f) + } + if (causeStrIdx == 0x1f) { causeStrIdx = 0x11; + } FaultDrawer_FillScreen(); FaultDrawer_SetCharPad(-2, 4); @@ -455,14 +443,15 @@ void Fault_PrintThreadContext(OSThread* t) FaultDrawer_SetCharPad(0, 0); } -void Fault_LogThreadContext(OSThread* t) -{ - __OSThreadContext *ctx; - s32 causeStrIdx = (s32) ((((u32) t->context.cause >> 2) & 0x1f) << 0x10) >> 0x10; - if (causeStrIdx == 0x17) +void Fault_LogThreadContext(OSThread* t) { + __OSThreadContext* ctx; + s32 causeStrIdx = (s32)((((u32)t->context.cause >> 2) & 0x1f) << 0x10) >> 0x10; + if (causeStrIdx == 0x17) { causeStrIdx = 0x10; - if (causeStrIdx == 0x1f) + } + if (causeStrIdx == 0x1f) { causeStrIdx = 0x11; + } ctx = &t->context; osSyncPrintf("\n"); @@ -508,26 +497,23 @@ void Fault_LogThreadContext(OSThread* t) osSyncPrintf("\n"); } -OSThread* Fault_FindFaultedThread() -{ +OSThread* Fault_FindFaultedThread() { OSThread* iter = func_80104140(); - while (iter->priority != -1) - { - if (iter->priority > 0 && iter->priority < 0x7f && (iter->flags & 3)) + while (iter->priority != -1) { + if (iter->priority > 0 && iter->priority < 0x7f && (iter->flags & 3)) { return iter; + } iter = iter->tlnext; } return NULL; } -void Fault_Wait5Seconds(void) -{ - OSTime start[2]; //to make the function allocate 0x28 bytes of stack instead of 0x20 +void Fault_Wait5Seconds(void) { + OSTime start[2]; // to make the function allocate 0x28 bytes of stack instead of 0x20 start[0] = osGetTime(); - do - { + do { Fault_Sleep(0x10); - } while ((osGetTime() - start[0]) < OS_USEC_TO_CYCLES(5000000)+1); //0xdf84759 + } while ((osGetTime() - start[0]) < OS_USEC_TO_CYCLES(5000000) + 1); // 0xdf84759 sFaultStructPtr->faultActive = true; } @@ -554,7 +540,7 @@ void Fault_DrawMemDumpPage(const char* title, u32* addr, u32 param_3) { Fault_FillScreenBlack(); FaultDrawer_SetCharPad(-2, 0); - FaultDrawer_DrawText(0x24, 0x12, "%s %08x", title? title : "PrintDump", alignedAddr); + FaultDrawer_DrawText(0x24, 0x12, "%s %08x", title ? title : "PrintDump", alignedAddr); if (alignedAddr >= (u32*)0x80000000 && alignedAddr < (u32*)0xC0000000) { for (y = 0x1C; y != 0xE2; y += 9) { FaultDrawer_DrawText(0x18, y, "%06x", writeAddr); @@ -567,65 +553,83 @@ void Fault_DrawMemDumpPage(const char* title, u32* addr, u32 param_3) { FaultDrawer_SetCharPad(0, 0); } - #ifdef NON_MATCHING -void Fault_DrawMemDump(u32 pc, u32 sp, u32 unk0, u32 unk1) -{ - s32 count; - u16 held; - s32 off; +// saved register and stack usage differences +// possibly some minor ordering and regalloc differences +void Fault_DrawMemDump(u32 pc, u32 sp, u32 unk0, u32 unk1) { + Input* curInput = &sFaultStructPtr->padInput; u32 addr = pc; - while (true) - { - if (addr < 0x80000000) + s32 count; + s32 off; + + while (true) { + if (addr < 0x80000000) { addr = 0x80000000; - if (addr > 0x807fff00) + } + if (addr > 0x807fff00) { addr = 0x807fff00; + } addr &= ~0xF; - Fault_DrawMemDumpPage("Dump", (u32*)addr); + Fault_DrawMemDumpPage("Dump", (u32*)addr, 0); count = 600; - while (sFaultStructPtr->faultActive) - { - if (count-- == 0) - return; - Fault_Sleep(0x10); - Fault_UpdatePadImpl(); - if ((sFaultStructPtr->padInput.padPressed | ~0x20) == ~0x20) - sFaultStructPtr->faultActive = false; - } - do - { - Fault_Sleep(0x10); - Fault_UpdatePadImpl(); - } while (sFaultStructPtr->padInput.padPressed == 0); - if ((sFaultStructPtr->padInput.padPressed | ~0x1000) == ~0) + while (sFaultStructPtr->faultActive) { + if (count == 0) { + return; + } + + count--; + Fault_Sleep(0x10); + Fault_UpdatePadImpl(); + if (!~(curInput->padPressed | ~0x20)) { + sFaultStructPtr->faultActive = false; + } + } + + do { + Fault_Sleep(0x10); + Fault_UpdatePadImpl(); + } while (curInput->padPressed == 0); + + if (!~(curInput->padPressed | ~0x1000)) { return; - held = sFaultStructPtr->padInput.status; - if ((held | ~0x8000) == ~0) + } + + if (!~(curInput->raw.pad | ~0x8000)) { return; + } off = 0x10; - if ((held | ~0x2000) == ~0) + if (!~(curInput->raw.pad | ~0x2000)) { off = 0x100; - if ((held | ~0x4000) == ~0) + } + if (!~(curInput->raw.pad | ~0x4000)) { off <<= 8; - if ((held | ~0x800) == ~0) + } + if (!~(curInput->raw.pad | ~0x800)) { addr -= off; - if ((held | ~0x400) == ~0) - addr -= off; - if ((held | ~0x8) == ~0) + } + if (!~(curInput->raw.pad | ~0x400)) { + addr += off; + } + if (!~(curInput->raw.pad | ~0x8)) { addr = pc; - if ((held | ~0x4) == ~0) + } + if (!~(curInput->raw.pad | ~0x4)) { addr = sp; - if ((held | ~0x2) == ~0) + } + if (!~(curInput->raw.pad | ~0x2)) { addr = unk0; - if ((held | ~0x1) == ~0) + } + if (!~(curInput->raw.pad | ~0x1)) { addr = unk1; - if ((held | ~0x20) == ~0) + } + if (!~(curInput->raw.pad | ~0x20)) { break; + } } + sFaultStructPtr->faultActive = true; } #else @@ -638,8 +642,7 @@ void Fault_DrawMemDump(u32 pc, u32 sp, u32 unk0, u32 unk1) #pragma GLOBAL_ASM("asm/non_matchings/code/fault/Fault_LogStackTrace.s") -void Fault_ResumeThread(OSThread* t) -{ +void Fault_ResumeThread(OSThread* t) { t->context.cause = 0; t->context.fpcsr = 0; t->context.pc += 4; @@ -649,38 +652,39 @@ void Fault_ResumeThread(OSThread* t) osStartThread(t); } -void Fault_CommitFB() -{ +void Fault_CommitFB() { u16* fb; osViSetYScale(1.0f); osViSetMode(&osViModeNtscLan1); - osViSetSpecialFeatures(0x42); //gama_disable|dither_fliter_enable_aa_mode3_disable + osViSetSpecialFeatures(0x42); // gama_disable|dither_fliter_enable_aa_mode3_disable osViBlack(false); - if (sFaultStructPtr->fb) + if (sFaultStructPtr->fb) { fb = sFaultStructPtr->fb; - else - { + } else { fb = (u16*)osViGetNextFramebuffer(); - if ((u32)fb == 0x80000000) + if ((u32)fb == 0x80000000) { fb = (u16*)((osMemSize | 0x80000000) - 0x25800); + } } osViSwapBuffer(fb); FaultDrawer_SetDrawerFB(fb, 0x140, 0xf0); } -void Fault_ProcessClients(void) -{ +void Fault_ProcessClients(void) { FaultClient* iter = sFaultStructPtr->clients; s32 idx = 0; - while(iter) - { - if (iter->callback) - { + + while (iter) { + if (iter->callback) { Fault_FillScreenBlack(); FaultDrawer_SetCharPad(-2, 0); - FaultDrawer_Printf("\x1a""8CallBack (%d) %08x %08x %08x\n""\x1a""7", idx++, iter, iter->param1, iter->param2); + FaultDrawer_Printf("\x1a" + "8CallBack (%d) %08x %08x %08x\n" + "\x1a" + "7", + idx++, iter, iter->param1, iter->param2); FaultDrawer_SetCharPad(0, 0); Fault_ProcessClient(iter->callback, iter->param1, iter->param2); Fault_WaitForInput(); @@ -690,71 +694,60 @@ void Fault_ProcessClients(void) } } -void Fault_UpdatePad() -{ +void Fault_UpdatePad() { Fault_UpdatePadImpl(); } #ifdef NON_MATCHING - -void Fault_ThreadEntry(u32 unused) -{ - OSThread *faultedThread; +// saved register and stack usage differences +void Fault_ThreadEntry(void* arg) { + OSThread* faultedThread; OSMesg msg; - //osSetEventMesg osSetEventMesg(OS_EVENT_CPU_BREAK, &sFaultStructPtr->queue, 1); osSetEventMesg(OS_EVENT_FAULT, &sFaultStructPtr->queue, 2); - while (true) - { - osRecvMesg(&sFaultStructPtr->queue, &msg, 1); - if (msg == (OSMesg)1) - { - sFaultStructPtr->msgId = 1; - osSyncPrintf("フォルトマネージャ:OS_EVENT_CPU_BREAKを受信しました\n"); - } - else if (msg == (OSMesg)2) - { - sFaultStructPtr->msgId = 2; - osSyncPrintf("フォルトマネージャ:OS_EVENT_FAULTを受信しました\n"); - } - else if (msg != (OSMesg)3) - { - sFaultStructPtr->msgId = (u8)3; - osSyncPrintf("フォルトマネージャ:不明なメッセージを受信しました\n"); - } + while (true) { + do { + osRecvMesg(&sFaultStructPtr->queue, &msg, 1); + + if (msg == (OSMesg)1) { + sFaultStructPtr->msgId = 1; + osSyncPrintf("フォルトマネージャ:OS_EVENT_CPU_BREAKを受信しました\n"); + } else if (1 && msg == (OSMesg)2) { + sFaultStructPtr->msgId = 2; + osSyncPrintf("フォルトマネージャ:OS_EVENT_FAULTを受信しました\n"); + } else if (msg == (OSMesg)3) { + Fault_UpdatePad(); + faultedThread = NULL; + continue; + } else { + sFaultStructPtr->msgId = 3; + osSyncPrintf("フォルトマネージャ:不明なメッセージを受信しました\n"); + } - if (msg == (OSMesg)3) - { - Fault_UpdatePad(); - faultedThread = NULL; - } - else - { faultedThread = __osGetCurrFaultedThread(); osSyncPrintf("__osGetCurrFaultedThread()=%08x\n", faultedThread); - if (!faultedThread) - { + + if (faultedThread == NULL) { faultedThread = Fault_FindFaultedThread(); osSyncPrintf("FindFaultedThread()=%08x\n", faultedThread); } - } - - if (!faultedThread) - continue; + } while (faultedThread == NULL); __osSetFpcCsr(__osGetFpcCsr() & -0xf81); sFaultStructPtr->faultedThread = faultedThread; - while (!sFaultStructPtr->faultHandlerEnabled) + + while (!sFaultStructPtr->faultHandlerEnabled) { Fault_Sleep(1000); + } + Fault_Sleep(500); Fault_CommitFB(); - if (sFaultStructPtr->faultActive) + if (sFaultStructPtr->faultActive) { Fault_Wait5Seconds(); - else - { + } else { Fault_DrawCornerRec(0xF801); Fault_WaitForButtonCombo(); } @@ -763,8 +756,7 @@ void Fault_ThreadEntry(u32 unused) FaultDrawer_SetForeColor(0xFFFF); FaultDrawer_SetBackColor(0); - do - { + do { Fault_PrintThreadContext(faultedThread); Fault_LogThreadContext(faultedThread); Fault_WaitForInput(); @@ -781,10 +773,9 @@ void Fault_ThreadEntry(u32 unused) FaultDrawer_DrawText(0x40, 0x64, " THANK YOU! "); FaultDrawer_DrawText(0x40, 0x6E, " You are great debugger!"); Fault_WaitForInput(); - } while (!sFaultStructPtr->exitDebugger); - while(!sFaultStructPtr->exitDebugger){} + while (!sFaultStructPtr->exitDebugger) {} Fault_ResumeThread(faultedThread); } @@ -793,14 +784,12 @@ void Fault_ThreadEntry(u32 unused) #pragma GLOBAL_ASM("asm/non_matchings/code/fault/Fault_ThreadEntry.s") #endif -void Fault_SetFB(void* fb, u16 w, u16 h) -{ +void Fault_SetFB(void* fb, u16 w, u16 h) { sFaultStructPtr->fb = fb; FaultDrawer_SetDrawerFB(fb, w, h); } -void Fault_Start(void) -{ +void Fault_Start(void) { sFaultStructPtr = &gFaultStruct; bzero(sFaultStructPtr, sizeof(FaultThreadStruct)); FaultDrawer_SetDefault(); @@ -814,13 +803,12 @@ void Fault_Start(void) sFaultStructPtr->faultActive = false; gFaultStruct.faultHandlerEnabled = true; osCreateMesgQueue(&sFaultStructPtr->queue, &sFaultStructPtr->msg, 1); - StackCheck_Init(sFaultThreadInfo, &sFaultStack, sFaultStack+sizeof(sFaultStack), 0, 0x100, "fault"); + StackCheck_Init(sFaultThreadInfo, &sFaultStack, sFaultStack + sizeof(sFaultStack), 0, 0x100, "fault"); osCreateThread(&sFaultStructPtr->thread, 2, &Fault_ThreadEntry, 0, sFaultThreadInfo, 0x7f); osStartThread(&sFaultStructPtr->thread); } -void Fault_HangupFaultClient(const char* arg0, const char* arg1) -{ +void Fault_HangupFaultClient(const char* arg0, const char* arg1) { osSyncPrintf("HungUp on Thread %d\n", osGetThreadId(0)); osSyncPrintf("%s\n", arg0 ? arg0 : "(NULL)"); osSyncPrintf("%s\n", arg1 ? arg1 : "(NULL)"); @@ -829,16 +817,14 @@ void Fault_HangupFaultClient(const char* arg0, const char* arg1) FaultDrawer_Printf("%s\n", arg1 ? arg1 : "(NULL)"); } -void Fault_AddHungupAndCrashImpl(const char* arg0, const char* arg1) -{ +void Fault_AddHungupAndCrashImpl(const char* arg0, const char* arg1) { FaultClient client; char padd[4]; Fault_AddClient(&client, &Fault_HangupFaultClient, arg0, arg1); - *(u32*)0x11111111 = 0; //trigger an exception + *(u32*)0x11111111 = 0; // trigger an exception } -void Fault_AddHungupAndCrash(const char* filename, u32 line) -{ +void Fault_AddHungupAndCrash(const char* filename, u32 line) { char msg[256]; sprintf(msg, "HungUp %s:%d", filename, line); Fault_AddHungupAndCrashImpl(msg, NULL); diff --git a/src/code/fault_drawer.c b/src/code/fault_drawer.c index 522f0b2ff4..ef7a784aea 100644 --- a/src/code/fault_drawer.c +++ b/src/code/fault_drawer.c @@ -2,277 +2,268 @@ #include #include -//rodata +// rodata const u32 sFaultDrawerFont[] = { - 0x00DFFD00, 0x0AEEFFA0, 0x0DF22DD0, 0x06611DC0, 0x01122DD0, 0x06719900, 0x011EED10, 0x077EF700, - 0x01562990, 0x05589760, 0x0DD22990, 0x05599770, 0x04DFFD40, 0x026EF700, 0x00000000, 0x00000000, - 0x08BFFB00, 0x0EFFFFC0, 0x0BF00FB0, 0x0FF00330, 0x0FF00FF0, 0x0FF00220, 0x0CFBBF60, 0x0FFCCE20, - 0x0DD44FF0, 0x0FF00220, 0x0FF00FF0, 0x0FF00330, 0x0CFBBF40, 0x0EF77740, 0x00000000, 0x00000000, - 0x00DFFD00, 0x0AEEFFA0, 0x0DF22DD0, 0x06611DC0, 0x01122DD0, 0x06719900, 0x011EED10, 0x077EF700, - 0x01562990, 0x05589760, 0x0DD22990, 0x05599770, 0x04DFFD40, 0x026EF700, 0x00000000, 0x00000000, - 0x08BFFB00, 0x000DE000, 0x0BF00FB0, 0x005DE600, 0x0FF00FF0, 0x055CC660, 0x0CFBBF60, 0x773FF377, - 0x0DD44FF0, 0xBB3FF3BB, 0x0FF00FF0, 0x099CCAA0, 0x0CFBBF40, 0x009DEA00, 0x00000000, 0x000DE000, - 0x04C22C40, 0x028D5020, 0x0CCAACC0, 0x21F91710, 0x04C22C40, 0x12493400, 0x00820800, 0x01975110, - 0x088A8880, 0x04615241, 0x00800800, 0x43117530, 0x00A20800, 0x60055600, 0x00000000, 0x04400040, - 0x00221100, 0x00000080, 0x000FB000, 0x00000880, 0x040DA400, 0x00008800, 0x08CDE880, 0x022AA220, - 0x08CDE880, 0x02AA2220, 0x040DA400, 0x0CD10000, 0x000FB000, 0x8C510000, 0x00221100, 0x81100000, - 0x00DFFD00, 0x0AEEFFA0, 0x0DF22DD0, 0x06611DC0, 0x01122DD0, 0x06719900, 0x011EED10, 0x077EF700, - 0x01562990, 0x05589760, 0x0DD22990, 0x05599770, 0x04DFFD40, 0x026EF700, 0x00000000, 0x00000000, - 0x00333300, 0x04489980, 0x033CC330, 0x00CD1088, 0x033CC330, 0x02BF62A8, 0x00333320, 0x01104C80, - 0x01100330, 0x0015C800, 0x033CC330, 0x02673220, 0x003FF300, 0x04409900, 0x00880000, 0x00000000, - 0x05DFFD10, 0x07FFFF60, 0x1CE00EC1, 0x0FF00990, 0x1EE11661, 0x0FF00110, 0x1EF45621, 0x0FF66710, - 0x1EF23661, 0x0FF08990, 0x1EF10FE1, 0x0FF00990, 0x16ECCE21, 0x07FBBB20, 0x01111110, 0x00000000, - 0x09B66FD0, 0x27D88E60, 0x0992ED10, 0x2FF02EE0, 0x099AE510, 0x2FF62EE0, 0x099B7510, 0x2FD64EE0, - 0x0DDAE510, 0x2FD04EE0, 0x0DD2ED10, 0x2FD00EE0, 0x09F66F90, 0x27D99F70, 0x00000000, 0x00000000, - 0x07FFFF00, 0x8F711FF0, 0x2FD00FF0, 0x8F711FF0, 0x2FD00770, 0x8E611EE0, 0x27DDDF60, 0x8E691EE0, - 0x27764AA0, 0x8EE99EE0, 0x2FD06E80, 0x8AE7FEA0, 0x07FA8E60, 0x88277A80, 0x00000000, 0x00000000, - 0x077CCFF0, 0x13266011, 0x077CCFF0, 0x03766510, 0x0239D720, 0x04533540, 0x002FF200, 0x01133110, - 0x005FB100, 0x00033000, 0x055EE550, 0x01133110, 0x055EEDD0, 0x02233000, 0x00088880, 0x8AABB888, - 0x00001100, 0x00044510, 0x04623320, 0x00440110, 0x04C89AA0, 0x00EEAB10, 0x0CE66720, 0x0EF55FB0, - 0x0EE00660, 0x0BF62B90, 0x0EE00660, 0x03FC8990, 0x04EEEEA0, 0x00773BB0, 0x00000000, 0x08888800, - 0x09900000, 0x00111000, 0x09922440, 0x00011000, 0x09908800, 0x26EFDE20, 0x099BB540, 0x2EC33CE2, - 0x0D9A2550, 0x2EC33CE2, 0x0DDAA550, 0x2EC33CE2, 0x09D6ED10, 0x26CBBC62, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, 0x00000000, 0x00011000, 0x05FBFFE0, 0x8E6116E8, 0x0FF40330, 0x8F7117F8, - 0x07FC8B30, 0x8E6996E8, 0x05733BA0, 0x8A6DD6A8, 0x0DD88A20, 0x08A779B2, 0x01100220, 0x00000000, - 0x00000080, 0x8A011000, 0x00000800, 0x80A11000, 0x07744F70, 0x80A99000, 0x0231DF20, 0x84E60004, - 0x0027DA20, 0xC8AA4C40, 0x00573B20, 0x00A11800, 0x05546F50, 0x00A99800, 0x02222080, 0x02001888, + 0x00DFFD00, 0x0AEEFFA0, 0x0DF22DD0, 0x06611DC0, 0x01122DD0, 0x06719900, 0x011EED10, 0x077EF700, 0x01562990, + 0x05589760, 0x0DD22990, 0x05599770, 0x04DFFD40, 0x026EF700, 0x00000000, 0x00000000, 0x08BFFB00, 0x0EFFFFC0, + 0x0BF00FB0, 0x0FF00330, 0x0FF00FF0, 0x0FF00220, 0x0CFBBF60, 0x0FFCCE20, 0x0DD44FF0, 0x0FF00220, 0x0FF00FF0, + 0x0FF00330, 0x0CFBBF40, 0x0EF77740, 0x00000000, 0x00000000, 0x00DFFD00, 0x0AEEFFA0, 0x0DF22DD0, 0x06611DC0, + 0x01122DD0, 0x06719900, 0x011EED10, 0x077EF700, 0x01562990, 0x05589760, 0x0DD22990, 0x05599770, 0x04DFFD40, + 0x026EF700, 0x00000000, 0x00000000, 0x08BFFB00, 0x000DE000, 0x0BF00FB0, 0x005DE600, 0x0FF00FF0, 0x055CC660, + 0x0CFBBF60, 0x773FF377, 0x0DD44FF0, 0xBB3FF3BB, 0x0FF00FF0, 0x099CCAA0, 0x0CFBBF40, 0x009DEA00, 0x00000000, + 0x000DE000, 0x04C22C40, 0x028D5020, 0x0CCAACC0, 0x21F91710, 0x04C22C40, 0x12493400, 0x00820800, 0x01975110, + 0x088A8880, 0x04615241, 0x00800800, 0x43117530, 0x00A20800, 0x60055600, 0x00000000, 0x04400040, 0x00221100, + 0x00000080, 0x000FB000, 0x00000880, 0x040DA400, 0x00008800, 0x08CDE880, 0x022AA220, 0x08CDE880, 0x02AA2220, + 0x040DA400, 0x0CD10000, 0x000FB000, 0x8C510000, 0x00221100, 0x81100000, 0x00DFFD00, 0x0AEEFFA0, 0x0DF22DD0, + 0x06611DC0, 0x01122DD0, 0x06719900, 0x011EED10, 0x077EF700, 0x01562990, 0x05589760, 0x0DD22990, 0x05599770, + 0x04DFFD40, 0x026EF700, 0x00000000, 0x00000000, 0x00333300, 0x04489980, 0x033CC330, 0x00CD1088, 0x033CC330, + 0x02BF62A8, 0x00333320, 0x01104C80, 0x01100330, 0x0015C800, 0x033CC330, 0x02673220, 0x003FF300, 0x04409900, + 0x00880000, 0x00000000, 0x05DFFD10, 0x07FFFF60, 0x1CE00EC1, 0x0FF00990, 0x1EE11661, 0x0FF00110, 0x1EF45621, + 0x0FF66710, 0x1EF23661, 0x0FF08990, 0x1EF10FE1, 0x0FF00990, 0x16ECCE21, 0x07FBBB20, 0x01111110, 0x00000000, + 0x09B66FD0, 0x27D88E60, 0x0992ED10, 0x2FF02EE0, 0x099AE510, 0x2FF62EE0, 0x099B7510, 0x2FD64EE0, 0x0DDAE510, + 0x2FD04EE0, 0x0DD2ED10, 0x2FD00EE0, 0x09F66F90, 0x27D99F70, 0x00000000, 0x00000000, 0x07FFFF00, 0x8F711FF0, + 0x2FD00FF0, 0x8F711FF0, 0x2FD00770, 0x8E611EE0, 0x27DDDF60, 0x8E691EE0, 0x27764AA0, 0x8EE99EE0, 0x2FD06E80, + 0x8AE7FEA0, 0x07FA8E60, 0x88277A80, 0x00000000, 0x00000000, 0x077CCFF0, 0x13266011, 0x077CCFF0, 0x03766510, + 0x0239D720, 0x04533540, 0x002FF200, 0x01133110, 0x005FB100, 0x00033000, 0x055EE550, 0x01133110, 0x055EEDD0, + 0x02233000, 0x00088880, 0x8AABB888, 0x00001100, 0x00044510, 0x04623320, 0x00440110, 0x04C89AA0, 0x00EEAB10, + 0x0CE66720, 0x0EF55FB0, 0x0EE00660, 0x0BF62B90, 0x0EE00660, 0x03FC8990, 0x04EEEEA0, 0x00773BB0, 0x00000000, + 0x08888800, 0x09900000, 0x00111000, 0x09922440, 0x00011000, 0x09908800, 0x26EFDE20, 0x099BB540, 0x2EC33CE2, + 0x0D9A2550, 0x2EC33CE2, 0x0DDAA550, 0x2EC33CE2, 0x09D6ED10, 0x26CBBC62, 0x00000000, 0x00000000, 0x00000000, + 0x00000000, 0x00000000, 0x00011000, 0x05FBFFE0, 0x8E6116E8, 0x0FF40330, 0x8F7117F8, 0x07FC8B30, 0x8E6996E8, + 0x05733BA0, 0x8A6DD6A8, 0x0DD88A20, 0x08A779B2, 0x01100220, 0x00000000, 0x00000080, 0x8A011000, 0x00000800, + 0x80A11000, 0x07744F70, 0x80A99000, 0x0231DF20, 0x84E60004, 0x0027DA20, 0xC8AA4C40, 0x00573B20, 0x00A11800, + 0x05546F50, 0x00A99800, 0x02222080, 0x02001888, }; -//data -FaultDrawer sFaultDrawerDefault = -{ - (u16*)0x803DA800, //fb - 320, 240, //w, h - 16, 223, //yStart, yEnd - 22, 297,//xStart, xEnd - 0xFFFF, 0x0000, //foreColor, backColor - 22, 16, //cursorX, cursorY - &sFaultDrawerFont, //font +// data +// clang-format off +FaultDrawer sFaultDrawerDefault = { + (u16*)0x803DA800, // fb + 320, 240, // w, h + 16, 223, // yStart, yEnd + 22, 297, // xStart, xEnd + 0xFFFF, 0x0000, // foreColor, backColor + 22, 16, // cursorX, cursorY + sFaultDrawerFont, // font 8, 8, 0, 0, - { //printColors + { // printColors 0x0001, 0xF801, 0x07C1, 0xFFC1, 0x003F, 0xF83F, 0x07FF, 0xFFFF, 0x7BDF, 0xB5AD }, - 0, //escCode - 0, //osSyncPrintfEnabled - NULL, //inputCallback + 0, // escCode + 0, // osSyncPrintfEnabled + NULL, // inputCallback }; +// clang-format on -//bss +// bss FaultDrawer sFaultDrawerStruct; char D_8016B6C0[0x20]; //? unused - -void FaultDrawer_SetOsSyncPrintfEnabled(u32 enabled) -{ +void FaultDrawer_SetOsSyncPrintfEnabled(u32 enabled) { sFaultDrawerStruct.osSyncPrintfEnabled = enabled; } -#ifdef NON_MATCHING -void FaultDrawer_DrawRecImpl(s32 xstart, s32 ystart, s32 xend, s32 yend, u16 color) -{ - if (sFaultDrawerStruct.w - xstart > 0 && sFaultDrawerStruct.h - ystart > 0) - { - s32 x, y; - for (y = 0; y < yend-ystart+1; y++) - for (x = 0; x < xend-xstart+1; x++) - sFaultDrawerStruct.fb[sFaultDrawerStruct.w*y+x] = color; +void FaultDrawer_DrawRecImpl(s32 xStart, s32 yStart, s32 xEnd, s32 yEnd, u16 color) { + u16* fb; + s32 x, y; + s32 xDiff = sFaultDrawerStruct.w - xStart; + s32 yDiff = sFaultDrawerStruct.h - yStart; + s32 xSize = xEnd - xStart + 1; + s32 ySize = yEnd - yStart + 1; + + if (xDiff > 0 && yDiff > 0) { + if (xDiff < xSize) { + xSize = xDiff; + } + + if (yDiff < ySize) { + ySize = yDiff; + } + + fb = sFaultDrawerStruct.fb + sFaultDrawerStruct.w * yStart + xStart; + for (y = 0; y < ySize; y++) { + for (x = 0; x < xSize; x++) { + *fb++ = color; + } + fb += sFaultDrawerStruct.w - xSize; + } osWritebackDCacheAll(); } } -#else -#pragma GLOBAL_ASM("asm/non_matchings/code/fault_drawer/FaultDrawer_DrawRecImpl.s") -#endif - -#ifdef NON_MATCHING -void FaultDrawer_DrawChar(char c) -{ +void FaultDrawer_DrawChar(char c) { + u16* fb; s32 x, y; - u32* dataStart = &sFaultDrawerStruct.fontData[(c >> 3) * 0x10 + (c & 4) >> 2]; - u16* fb = &sFaultDrawerStruct.fb[sFaultDrawerStruct.w * sFaultDrawerStruct.cursorY + sFaultDrawerStruct.cursorX]; + u32* dataPtr; + u32 data; + s32 cursorX = sFaultDrawerStruct.cursorX; + s32 cursorY = sFaultDrawerStruct.cursorY; + u32** fontData = &sFaultDrawerStruct.fontData; + s32 shift = c % 4; - if (sFaultDrawerStruct.xStart <= sFaultDrawerStruct.cursorX && - sFaultDrawerStruct.charW + sFaultDrawerStruct.cursorX -1 <= sFaultDrawerStruct.xEnd && - sFaultDrawerStruct.yStart <= sFaultDrawerStruct.cursorY && - sFaultDrawerStruct.charH + sFaultDrawerStruct.cursorY -1 <= sFaultDrawerStruct.yEnd && - sFaultDrawerStruct.charH != 0 - ) - { - for (y = 0; y < sFaultDrawerStruct.charH; y++) - { - u32 mask = 0x10000000 << (c & 3); - for (x = 0; x < sFaultDrawerStruct.charW; x++) - { - if ((mask & *dataStart)) + dataPtr = &fontData[0][(((c / 8) * 16) + ((c & 4) >> 2))]; + fb = sFaultDrawerStruct.fb + (sFaultDrawerStruct.w * cursorY) + cursorX; + + if ((sFaultDrawerStruct.xStart <= cursorX) && + ((sFaultDrawerStruct.charW + cursorX - 1) <= sFaultDrawerStruct.xEnd) && + (sFaultDrawerStruct.yStart <= cursorY) && + ((sFaultDrawerStruct.charH + cursorY - 1) <= sFaultDrawerStruct.yEnd)) { + for (y = 0; y < sFaultDrawerStruct.charH; y++) { + u32 mask = 0x10000000 << shift; + data = *dataPtr; + for (x = 0; x < sFaultDrawerStruct.charW; x++) { + if (mask & data) { fb[x] = sFaultDrawerStruct.foreColor; - else - if (sFaultDrawerStruct.backColor & 1) - fb[x] = sFaultDrawerStruct.backColor; + } else if (sFaultDrawerStruct.backColor & 1) { + fb[x] = sFaultDrawerStruct.backColor; + } mask >>= 4; } fb += sFaultDrawerStruct.w; - dataStart += 2; + dataPtr += 2; } } } -#else -#pragma GLOBAL_ASM("asm/non_matchings/code/fault_drawer/FaultDrawer_DrawChar.s") -#endif -s32 FaultDrawer_ColorToPrintColor(u16 color) -{ +s32 FaultDrawer_ColorToPrintColor(u16 color) { s32 i; - for (i = 0; i < 10; i++) - if (color == sFaultDrawerStruct.printColors[i]) + for (i = 0; i < 10; i++) { + if (color == sFaultDrawerStruct.printColors[i]) { return i; + } + } return -1; } -void FaultDrawer_UpdatePrintColor() -{ +void FaultDrawer_UpdatePrintColor() { s32 idx; - if (sFaultDrawerStruct.osSyncPrintfEnabled) - { + if (sFaultDrawerStruct.osSyncPrintfEnabled) { osSyncPrintf(VT_RST); idx = FaultDrawer_ColorToPrintColor(sFaultDrawerStruct.foreColor); - if (idx >= 0 && idx < 8) + if (idx >= 0 && idx < 8) { osSyncPrintf(VT_SGR("3%d"), idx); + } idx = FaultDrawer_ColorToPrintColor(sFaultDrawerStruct.backColor); - if (idx >= 0 && idx < 8) + if (idx >= 0 && idx < 8) { osSyncPrintf(VT_SGR("4%d"), idx); + } } } -void FaultDrawer_SetForeColor(u16 color) -{ +void FaultDrawer_SetForeColor(u16 color) { sFaultDrawerStruct.foreColor = color; FaultDrawer_UpdatePrintColor(); } -void FaultDrawer_SetBackColor(u16 color) -{ +void FaultDrawer_SetBackColor(u16 color) { sFaultDrawerStruct.backColor = color; FaultDrawer_UpdatePrintColor(); } -void FaultDrawer_SetFontColor(u16 color) -{ - FaultDrawer_SetForeColor((u16)(color | 1)); //force alpha to be set +void FaultDrawer_SetFontColor(u16 color) { + FaultDrawer_SetForeColor(color | 1); // force alpha to be set } -void FaultDrawer_SetCharPad(s8 padW, s8 padH) -{ +void FaultDrawer_SetCharPad(s8 padW, s8 padH) { sFaultDrawerStruct.charWPad = padW; sFaultDrawerStruct.charHPad = padH; } -void FaultDrawer_SetCursor(s32 x, s32 y) -{ - if (sFaultDrawerStruct.osSyncPrintfEnabled) - osSyncPrintf(VT_CUP(%d, %d), (y - sFaultDrawerStruct.yStart) / (sFaultDrawerStruct.charH + sFaultDrawerStruct.charHPad), (x - sFaultDrawerStruct.xStart) / (sFaultDrawerStruct.charW + sFaultDrawerStruct.charWPad)); +void FaultDrawer_SetCursor(s32 x, s32 y) { + if (sFaultDrawerStruct.osSyncPrintfEnabled) { + osSyncPrintf(VT_CUP("%d", "%d"), + (y - sFaultDrawerStruct.yStart) / (sFaultDrawerStruct.charH + sFaultDrawerStruct.charHPad), + (x - sFaultDrawerStruct.xStart) / (sFaultDrawerStruct.charW + sFaultDrawerStruct.charWPad)); + } sFaultDrawerStruct.cursorX = x; sFaultDrawerStruct.cursorY = y; } -void FaultDrawer_FillScreen() -{ - if (sFaultDrawerStruct.osSyncPrintfEnabled) +void FaultDrawer_FillScreen() { + if (sFaultDrawerStruct.osSyncPrintfEnabled) { osSyncPrintf(VT_CLS); + } - FaultDrawer_DrawRecImpl(sFaultDrawerStruct.xStart, sFaultDrawerStruct.yStart, sFaultDrawerStruct.xEnd, sFaultDrawerStruct.yEnd, sFaultDrawerStruct.backColor | 1); + FaultDrawer_DrawRecImpl(sFaultDrawerStruct.xStart, sFaultDrawerStruct.yStart, sFaultDrawerStruct.xEnd, + sFaultDrawerStruct.yEnd, sFaultDrawerStruct.backColor | 1); FaultDrawer_SetCursor(sFaultDrawerStruct.xStart, sFaultDrawerStruct.yStart); } -#ifdef NON_MATCHING -u32 FaultDrawer_FormatStringFunc(u32 arg0, const char* str, s32 count) -{ - while (count) - { - s32 curXStart; //s32? +u32 FaultDrawer_FormatStringFunc(u32 arg0, const char* str, s32 count) { + for (count; count != 0; count--, str++) { + s32 curXStart; s32 curXEnd; - if (sFaultDrawerStruct.escCode) - { + if (sFaultDrawerStruct.escCode) { sFaultDrawerStruct.escCode = false; - if (*str > 0x30 && *str < 0x3A) - FaultDrawer_SetForeColor(gFaultStruct.colors[*str + 12]); + if (*str > 0x30 && *str < 0x3A) { + FaultDrawer_SetForeColor(sFaultDrawerStruct.printColors[*str - 0x30]); + } curXStart = sFaultDrawerStruct.cursorX; curXEnd = sFaultDrawerStruct.xEnd - sFaultDrawerStruct.charW; - } - else - { - if (*str == '\n') - { - if (sFaultDrawerStruct.osSyncPrintfEnabled) - osSyncPrintf("\n"); + } else { + switch (*str) { + case '\n': + if (sFaultDrawerStruct.osSyncPrintfEnabled) { + osSyncPrintf("\n"); + } - sFaultDrawerStruct.cursorX = sFaultDrawerStruct.w; - curXStart = sFaultDrawerStruct.w; - curXEnd = sFaultDrawerStruct.xEnd - sFaultDrawerStruct.charW; - } - else if (*str == '\x1a') - { - sFaultDrawerStruct.escCode = true; - curXStart = sFaultDrawerStruct.cursorX; - curXEnd = sFaultDrawerStruct.xEnd - sFaultDrawerStruct.charW; - } - else - { - if (sFaultDrawerStruct.osSyncPrintfEnabled) - osSyncPrintf("%c", *str); + sFaultDrawerStruct.cursorX = sFaultDrawerStruct.w; + curXStart = sFaultDrawerStruct.cursorX; + curXEnd = sFaultDrawerStruct.xEnd - sFaultDrawerStruct.charW; + break; + case '\x1A': + sFaultDrawerStruct.escCode = true; + curXStart = sFaultDrawerStruct.cursorX; + curXEnd = sFaultDrawerStruct.xEnd - sFaultDrawerStruct.charW; + break; + default: + if (sFaultDrawerStruct.osSyncPrintfEnabled) { + osSyncPrintf("%c", *str); + } - FaultDrawer_DrawChar(*str); - sFaultDrawerStruct.cursorX += sFaultDrawerStruct.charW + sFaultDrawerStruct.charWPad; + FaultDrawer_DrawChar(*str); + sFaultDrawerStruct.cursorX += sFaultDrawerStruct.charW + sFaultDrawerStruct.charWPad; - curXStart = sFaultDrawerStruct.cursorX; - curXEnd = sFaultDrawerStruct.xEnd - sFaultDrawerStruct.charW; + curXStart = sFaultDrawerStruct.cursorX; + curXEnd = sFaultDrawerStruct.xEnd - sFaultDrawerStruct.charW; } } - if (curXEnd <= curXStart) - { - sFaultDrawerStruct.cursorY += sFaultDrawerStruct.charH + sFaultDrawerStruct.charHPad; + if (curXEnd <= curXStart) { sFaultDrawerStruct.cursorX = sFaultDrawerStruct.xStart; - if (sFaultDrawerStruct.yEnd - sFaultDrawerStruct.charH <= (u16)sFaultDrawerStruct.cursorY) //cast? - { - if (sFaultDrawerStruct.inputCallback) - { + sFaultDrawerStruct.cursorY += sFaultDrawerStruct.charH + sFaultDrawerStruct.charHPad; + if (sFaultDrawerStruct.yEnd - sFaultDrawerStruct.charH <= sFaultDrawerStruct.cursorY) { + if (sFaultDrawerStruct.inputCallback) { sFaultDrawerStruct.inputCallback(); FaultDrawer_FillScreen(); } sFaultDrawerStruct.cursorY = sFaultDrawerStruct.yStart; } } - - count--; - str++; } + osWritebackDCacheAll(); + return arg0; } -#else -#pragma GLOBAL_ASM("asm/non_matchings/code/fault_drawer/FaultDrawer_FormatStringFunc.s") -#endif -void FaultDrawer_VPrintf(const char* str, char* args) //va_list -{ +void FaultDrawer_VPrintf(const char* str, char* args) { // va_list _Printf(&FaultDrawer_FormatStringFunc, &sFaultDrawerStruct, str, args); } -void FaultDrawer_Printf(const char* fmt, ...) -{ +void FaultDrawer_Printf(const char* fmt, ...) { va_list args; va_start(args, fmt); FaultDrawer_VPrintf(fmt, args); } -void FaultDrawer_DrawText(s32 x, s32 y, const char* fmt, ...) -{ +void FaultDrawer_DrawText(s32 x, s32 y, const char* fmt, ...) { va_list args; va_start(args, fmt); @@ -280,25 +271,21 @@ void FaultDrawer_DrawText(s32 x, s32 y, const char* fmt, ...) FaultDrawer_VPrintf(fmt, args); } -void FaultDrawer_SetDrawerFB(void* fb, u16 w, u16 h) -{ - sFaultDrawerStruct.fb = (u16*)fb; +void FaultDrawer_SetDrawerFB(void* fb, u16 w, u16 h) { + sFaultDrawerStruct.fb = fb; sFaultDrawerStruct.w = w; sFaultDrawerStruct.h = h; } -void FaultDrawer_SetInputCallback(void(*callback)()) -{ +void FaultDrawer_SetInputCallback(void (*callback)()) { sFaultDrawerStruct.inputCallback = callback; } -void FaultDrawer_WritebackFBDCache() -{ - osWritebackDCache(sFaultDrawerStruct.fb, sFaultDrawerStruct.w*sFaultDrawerStruct.h*2); +void FaultDrawer_WritebackFBDCache() { + osWritebackDCache(sFaultDrawerStruct.fb, sFaultDrawerStruct.w * sFaultDrawerStruct.h * 2); } -void FaultDrawer_SetDefault() -{ +void FaultDrawer_SetDefault() { bcopy(&sFaultDrawerDefault, &sFaultDrawerStruct, sizeof(FaultDrawer)); sFaultDrawerStruct.fb = (u16*)((osMemSize | 0x80000000) - 0x25800); } diff --git a/src/code/gamealloc.c b/src/code/gamealloc.c index 87a32db16b..9ec6886b2f 100644 --- a/src/code/gamealloc.c +++ b/src/code/gamealloc.c @@ -1,26 +1,22 @@ #include -void GameAlloc_Log(GameAlloc* this) -{ +void GameAlloc_Log(GameAlloc* this) { GameAllocEntry* iter; osSyncPrintf("this = %08x\n", this); iter = this->base.next; - while (iter != &this->base) - { + while (iter != &this->base) { osSyncPrintf("ptr = %08x size = %d\n", iter, iter->size); iter = iter->next; } } -void* GameAlloc_MallocDebug(GameAlloc* this, u32 size, const char* file, s32 line) -{ +void* GameAlloc_MallocDebug(GameAlloc* this, u32 size, const char* file, s32 line) { GameAllocEntry* ptr; - ptr = SystemArena_MallocDebug(size+sizeof(GameAllocEntry), file, line); - if (ptr) - { + ptr = SystemArena_MallocDebug(size + sizeof(GameAllocEntry), file, line); + if (ptr) { ptr->size = size; ptr->prev = this->head; this->head->next = ptr; @@ -28,18 +24,16 @@ void* GameAlloc_MallocDebug(GameAlloc* this, u32 size, const char* file, s32 lin ptr->next = &this->base; this->base.prev = this->head; return ptr + 1; - } - else + } else { return NULL; + } } -void* GameAlloc_Malloc(GameAlloc* this, u32 size) -{ +void* GameAlloc_Malloc(GameAlloc* this, u32 size) { GameAllocEntry* ptr; - ptr = SystemArena_MallocDebug(size+sizeof(GameAllocEntry), "../gamealloc.c", 93); - if (ptr) - { + ptr = SystemArena_MallocDebug(size + sizeof(GameAllocEntry), "../gamealloc.c", 93); + if (ptr) { ptr->size = size; ptr->prev = this->head; this->head->next = ptr; @@ -47,17 +41,15 @@ void* GameAlloc_Malloc(GameAlloc* this, u32 size) ptr->next = &this->base; this->base.prev = this->head; return ptr + 1; - } - else + } else { return NULL; + } } -void GameAlloc_Free(GameAlloc* this, void* data) -{ +void GameAlloc_Free(GameAlloc* this, void* data) { GameAllocEntry* ptr; - if (data) - { + if (data) { ptr = &((GameAllocEntry*)data)[-1]; LogUtils_CheckNullPointer("ptr->prev", ptr->prev, "../gamealloc.c", 120); LogUtils_CheckNullPointer("ptr->next", ptr->next, "../gamealloc.c", 121); @@ -68,14 +60,12 @@ void GameAlloc_Free(GameAlloc* this, void* data) } } -void GameAlloc_Cleanup(GameAlloc* this) -{ +void GameAlloc_Cleanup(GameAlloc* this) { GameAllocEntry* next; GameAllocEntry* cur; next = this->base.next; - while (&this->base != next) - { + while (&this->base != next) { cur = next; next = next->next; SystemArena_FreeDebug(cur, "../gamealloc.c", 145); @@ -84,11 +74,9 @@ void GameAlloc_Cleanup(GameAlloc* this) this->head = &this->base; this->base.next = &this->base; this->base.prev = &this->base; - } -void GameAlloc_Init(GameAlloc* this) -{ +void GameAlloc_Init(GameAlloc* this) { this->head = &this->base; this->base.next = &this->base; this->base.prev = &this->base; diff --git a/src/code/gfxprint.c b/src/code/gfxprint.c index a1aaaced81..7d17af7900 100644 --- a/src/code/gfxprint.c +++ b/src/code/gfxprint.c @@ -1,159 +1,204 @@ #include #include -//.bss +// .bss u8 D_801755F0; -//.data -u16 sGfxPrintFontTLUT[64] = -{ - 0x0000, 0xFFFF, 0x0000, 0xFFFF, - 0x0000, 0xFFFF, 0x0000, 0xFFFF, - 0x0000, 0xFFFF, 0x0000, 0xFFFF, - 0x0000, 0xFFFF, 0x0000, 0xFFFF, - 0x0000, 0x0000, 0xFFFF, 0xFFFF, - 0x0000, 0x0000, 0xFFFF, 0xFFFF, - 0x0000, 0x0000, 0xFFFF, 0xFFFF, - 0x0000, 0x0000, 0xFFFF, 0xFFFF, - 0x0000, 0x0000, 0x0000, 0x0000, - 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, - 0x0000, 0x0000, 0x0000, 0x0000, - 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, - 0x0000, 0x0000, 0x0000, 0x0000, - 0x0000, 0x0000, 0x0000, 0x0000, - 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, - 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, +// .data +u16 sGfxPrintFontTLUT[64] = { + 0x0000, 0xFFFF, 0x0000, 0xFFFF, 0x0000, 0xFFFF, 0x0000, 0xFFFF, 0x0000, 0xFFFF, 0x0000, 0xFFFF, 0x0000, + 0xFFFF, 0x0000, 0xFFFF, 0x0000, 0x0000, 0xFFFF, 0xFFFF, 0x0000, 0x0000, 0xFFFF, 0xFFFF, 0x0000, 0x0000, + 0xFFFF, 0xFFFF, 0x0000, 0x0000, 0xFFFF, 0xFFFF, 0x0000, 0x0000, 0x0000, 0x0000, 0xFFFF, 0xFFFF, 0xFFFF, + 0xFFFF, 0x0000, 0x0000, 0x0000, 0x0000, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, }; -u16 sGfxPrintUnkTLUT[16] = -{ - 0xF801, 0xFBC1, 0xFFC1, 0x07C1, - 0x0421, 0x003F, 0x803F, 0xF83F, - 0xF801, 0xFBC1, 0xFFC1, 0x07C1, - 0x0421, 0x003F, 0x803F, 0xF83F, +u16 sGfxPrintUnkTLUT[16] = { + 0xF801, 0xFBC1, 0xFFC1, 0x07C1, 0x0421, 0x003F, 0x803F, 0xF83F, + 0xF801, 0xFBC1, 0xFFC1, 0x07C1, 0x0421, 0x003F, 0x803F, 0xF83F, }; u8 sGfxPrintUnkData[8] = { 0x00, 0x11, 0x22, 0x33, 0x44, 0x55, 0x66, 0x77 }; -u8 sGfxPrintFontData[(16*256)/2] = -{ - 0x00, 0xDF, 0xFD, 0x00, 0x0A, 0xEE, 0xFF, 0xA0, 0x0D, 0xF2, 0x2D, 0xD0, 0x06, 0x61, 0x1D, 0xC0, 0x01, 0x12, 0x2D, 0xD0, 0x06, 0x71, 0x99, 0x00, 0x01, 0x1E, 0xED, 0x10, 0x07, 0x7E, 0xF7, 0x00, - 0x01, 0x56, 0x29, 0x90, 0x05, 0x58, 0x97, 0x60, 0x0D, 0xD2, 0x29, 0x90, 0x05, 0x59, 0x97, 0x70, 0x04, 0xDF, 0xFD, 0x40, 0x02, 0x6E, 0xF7, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x08, 0xBF, 0xFB, 0x00, 0x0E, 0xFF, 0xFF, 0xC0, 0x0B, 0xF0, 0x0F, 0xB0, 0x0F, 0xF0, 0x03, 0x30, 0x0F, 0xF0, 0x0F, 0xF0, 0x0F, 0xF0, 0x02, 0x20, 0x0C, 0xFB, 0xBF, 0x60, 0x0F, 0xFC, 0xCE, 0x20, - 0x0D, 0xD4, 0x4F, 0xF0, 0x0F, 0xF0, 0x02, 0x20, 0x0F, 0xF0, 0x0F, 0xF0, 0x0F, 0xF0, 0x03, 0x30, 0x0C, 0xFB, 0xBF, 0x40, 0x0E, 0xF7, 0x77, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0xDF, 0xFD, 0x00, 0x0A, 0xEE, 0xFF, 0xA0, 0x0D, 0xF2, 0x2D, 0xD0, 0x06, 0x61, 0x1D, 0xC0, 0x01, 0x12, 0x2D, 0xD0, 0x06, 0x71, 0x99, 0x00, 0x01, 0x1E, 0xED, 0x10, 0x07, 0x7E, 0xF7, 0x00, - 0x01, 0x56, 0x29, 0x90, 0x05, 0x58, 0x97, 0x60, 0x0D, 0xD2, 0x29, 0x90, 0x05, 0x59, 0x97, 0x70, 0x04, 0xDF, 0xFD, 0x40, 0x02, 0x6E, 0xF7, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x08, 0xBF, 0xFB, 0x00, 0x00, 0x0D, 0xE0, 0x00, 0x0B, 0xF0, 0x0F, 0xB0, 0x00, 0x5D, 0xE6, 0x00, 0x0F, 0xF0, 0x0F, 0xF0, 0x05, 0x5C, 0xC6, 0x60, 0x0C, 0xFB, 0xBF, 0x60, 0x77, 0x3F, 0xF3, 0x77, - 0x0D, 0xD4, 0x4F, 0xF0, 0xBB, 0x3F, 0xF3, 0xBB, 0x0F, 0xF0, 0x0F, 0xF0, 0x09, 0x9C, 0xCA, 0xA0, 0x0C, 0xFB, 0xBF, 0x40, 0x00, 0x9D, 0xEA, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0D, 0xE0, 0x00, - 0x04, 0xC2, 0x2C, 0x40, 0x02, 0x8D, 0x50, 0x20, 0x0C, 0xCA, 0xAC, 0xC0, 0x21, 0xF9, 0x17, 0x10, 0x04, 0xC2, 0x2C, 0x40, 0x12, 0x49, 0x34, 0x00, 0x00, 0x82, 0x08, 0x00, 0x01, 0x97, 0x51, 0x10, - 0x08, 0x8A, 0x88, 0x80, 0x04, 0x61, 0x52, 0x41, 0x00, 0x80, 0x08, 0x00, 0x43, 0x11, 0x75, 0x30, 0x00, 0xA2, 0x08, 0x00, 0x60, 0x05, 0x56, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x40, 0x00, 0x40, - 0x00, 0x22, 0x11, 0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0x0F, 0xB0, 0x00, 0x00, 0x00, 0x08, 0x80, 0x04, 0x0D, 0xA4, 0x00, 0x00, 0x00, 0x88, 0x00, 0x08, 0xCD, 0xE8, 0x80, 0x02, 0x2A, 0xA2, 0x20, - 0x08, 0xCD, 0xE8, 0x80, 0x02, 0xAA, 0x22, 0x20, 0x04, 0x0D, 0xA4, 0x00, 0x0C, 0xD1, 0x00, 0x00, 0x00, 0x0F, 0xB0, 0x00, 0x8C, 0x51, 0x00, 0x00, 0x00, 0x22, 0x11, 0x00, 0x81, 0x10, 0x00, 0x00, - 0x00, 0xDF, 0xFD, 0x00, 0x0A, 0xEE, 0xFF, 0xA0, 0x0D, 0xF2, 0x2D, 0xD0, 0x06, 0x61, 0x1D, 0xC0, 0x01, 0x12, 0x2D, 0xD0, 0x06, 0x71, 0x99, 0x00, 0x01, 0x1E, 0xED, 0x10, 0x07, 0x7E, 0xF7, 0x00, - 0x01, 0x56, 0x29, 0x90, 0x05, 0x58, 0x97, 0x60, 0x0D, 0xD2, 0x29, 0x90, 0x05, 0x59, 0x97, 0x70, 0x04, 0xDF, 0xFD, 0x40, 0x02, 0x6E, 0xF7, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x33, 0x33, 0x00, 0x04, 0x48, 0x99, 0x80, 0x03, 0x3C, 0xC3, 0x30, 0x00, 0xCD, 0x10, 0x88, 0x03, 0x3C, 0xC3, 0x30, 0x02, 0xBF, 0x62, 0xA8, 0x00, 0x33, 0x33, 0x20, 0x01, 0x10, 0x4C, 0x80, - 0x01, 0x10, 0x03, 0x30, 0x00, 0x15, 0xC8, 0x00, 0x03, 0x3C, 0xC3, 0x30, 0x02, 0x67, 0x32, 0x20, 0x00, 0x3F, 0xF3, 0x00, 0x04, 0x40, 0x99, 0x00, 0x00, 0x88, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x05, 0xDF, 0xFD, 0x10, 0x07, 0xFF, 0xFF, 0x60, 0x1C, 0xE0, 0x0E, 0xC1, 0x0F, 0xF0, 0x09, 0x90, 0x1E, 0xE1, 0x16, 0x61, 0x0F, 0xF0, 0x01, 0x10, 0x1E, 0xF4, 0x56, 0x21, 0x0F, 0xF6, 0x67, 0x10, - 0x1E, 0xF2, 0x36, 0x61, 0x0F, 0xF0, 0x89, 0x90, 0x1E, 0xF1, 0x0F, 0xE1, 0x0F, 0xF0, 0x09, 0x90, 0x16, 0xEC, 0xCE, 0x21, 0x07, 0xFB, 0xBB, 0x20, 0x01, 0x11, 0x11, 0x10, 0x00, 0x00, 0x00, 0x00, - 0x09, 0xB6, 0x6F, 0xD0, 0x27, 0xD8, 0x8E, 0x60, 0x09, 0x92, 0xED, 0x10, 0x2F, 0xF0, 0x2E, 0xE0, 0x09, 0x9A, 0xE5, 0x10, 0x2F, 0xF6, 0x2E, 0xE0, 0x09, 0x9B, 0x75, 0x10, 0x2F, 0xD6, 0x4E, 0xE0, - 0x0D, 0xDA, 0xE5, 0x10, 0x2F, 0xD0, 0x4E, 0xE0, 0x0D, 0xD2, 0xED, 0x10, 0x2F, 0xD0, 0x0E, 0xE0, 0x09, 0xF6, 0x6F, 0x90, 0x27, 0xD9, 0x9F, 0x70, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x07, 0xFF, 0xFF, 0x00, 0x8F, 0x71, 0x1F, 0xF0, 0x2F, 0xD0, 0x0F, 0xF0, 0x8F, 0x71, 0x1F, 0xF0, 0x2F, 0xD0, 0x07, 0x70, 0x8E, 0x61, 0x1E, 0xE0, 0x27, 0xDD, 0xDF, 0x60, 0x8E, 0x69, 0x1E, 0xE0, - 0x27, 0x76, 0x4A, 0xA0, 0x8E, 0xE9, 0x9E, 0xE0, 0x2F, 0xD0, 0x6E, 0x80, 0x8A, 0xE7, 0xFE, 0xA0, 0x07, 0xFA, 0x8E, 0x60, 0x88, 0x27, 0x7A, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x07, 0x7C, 0xCF, 0xF0, 0x13, 0x26, 0x60, 0x11, 0x07, 0x7C, 0xCF, 0xF0, 0x03, 0x76, 0x65, 0x10, 0x02, 0x39, 0xD7, 0x20, 0x04, 0x53, 0x35, 0x40, 0x00, 0x2F, 0xF2, 0x00, 0x01, 0x13, 0x31, 0x10, - 0x00, 0x5F, 0xB1, 0x00, 0x00, 0x03, 0x30, 0x00, 0x05, 0x5E, 0xE5, 0x50, 0x01, 0x13, 0x31, 0x10, 0x05, 0x5E, 0xED, 0xD0, 0x02, 0x23, 0x30, 0x00, 0x00, 0x08, 0x88, 0x80, 0x8A, 0xAB, 0xB8, 0x88, - 0x00, 0x00, 0x11, 0x00, 0x00, 0x04, 0x45, 0x10, 0x04, 0x62, 0x33, 0x20, 0x00, 0x44, 0x01, 0x10, 0x04, 0xC8, 0x9A, 0xA0, 0x00, 0xEE, 0xAB, 0x10, 0x0C, 0xE6, 0x67, 0x20, 0x0E, 0xF5, 0x5F, 0xB0, - 0x0E, 0xE0, 0x06, 0x60, 0x0B, 0xF6, 0x2B, 0x90, 0x0E, 0xE0, 0x06, 0x60, 0x03, 0xFC, 0x89, 0x90, 0x04, 0xEE, 0xEE, 0xA0, 0x00, 0x77, 0x3B, 0xB0, 0x00, 0x00, 0x00, 0x00, 0x08, 0x88, 0x88, 0x00, - 0x09, 0x90, 0x00, 0x00, 0x00, 0x11, 0x10, 0x00, 0x09, 0x92, 0x24, 0x40, 0x00, 0x01, 0x10, 0x00, 0x09, 0x90, 0x88, 0x00, 0x26, 0xEF, 0xDE, 0x20, 0x09, 0x9B, 0xB5, 0x40, 0x2E, 0xC3, 0x3C, 0xE2, - 0x0D, 0x9A, 0x25, 0x50, 0x2E, 0xC3, 0x3C, 0xE2, 0x0D, 0xDA, 0xA5, 0x50, 0x2E, 0xC3, 0x3C, 0xE2, 0x09, 0xD6, 0xED, 0x10, 0x26, 0xCB, 0xBC, 0x62, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x10, 0x00, 0x05, 0xFB, 0xFF, 0xE0, 0x8E, 0x61, 0x16, 0xE8, 0x0F, 0xF4, 0x03, 0x30, 0x8F, 0x71, 0x17, 0xF8, - 0x07, 0xFC, 0x8B, 0x30, 0x8E, 0x69, 0x96, 0xE8, 0x05, 0x73, 0x3B, 0xA0, 0x8A, 0x6D, 0xD6, 0xA8, 0x0D, 0xD8, 0x8A, 0x20, 0x08, 0xA7, 0x79, 0xB2, 0x01, 0x10, 0x02, 0x20, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x80, 0x8A, 0x01, 0x10, 0x00, 0x00, 0x00, 0x08, 0x00, 0x80, 0xA1, 0x10, 0x00, 0x07, 0x74, 0x4F, 0x70, 0x80, 0xA9, 0x90, 0x00, 0x02, 0x31, 0xDF, 0x20, 0x84, 0xE6, 0x00, 0x04, - 0x00, 0x27, 0xDA, 0x20, 0xC8, 0xAA, 0x4C, 0x40, 0x00, 0x57, 0x3B, 0x20, 0x00, 0xA1, 0x18, 0x00, 0x05, 0x54, 0x6F, 0x50, 0x00, 0xA9, 0x98, 0x00, 0x02, 0x22, 0x20, 0x80, 0x02, 0x00, 0x18, 0x88, - 0x00, 0x04, 0x44, 0x40, 0x00, 0x04, 0x00, 0x00, 0x00, 0x04, 0x44, 0x40, 0x0C, 0x44, 0x44, 0x00, 0x00, 0x04, 0x40, 0x00, 0x88, 0xC0, 0x00, 0x00, 0x00, 0x0C, 0xC0, 0x00, 0x0C, 0x46, 0xA4, 0x40, - 0x00, 0x0C, 0xC0, 0x00, 0x08, 0x8E, 0xE0, 0x00, 0x02, 0x08, 0x80, 0x00, 0x80, 0xD0, 0x88, 0x00, 0x28, 0xA8, 0x80, 0x00, 0x88, 0xCD, 0x4C, 0x40, 0x0A, 0x88, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x06, 0xE0, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x88, 0x00, 0x80, 0x01, 0x06, 0x10, 0x00, 0x56, 0xE7, 0x50, 0x80, 0x02, 0x1F, 0xF1, 0x00, - 0x38, 0x8C, 0xB8, 0x00, 0x0B, 0xF6, 0x0B, 0x00, 0x94, 0xC0, 0x28, 0x00, 0x06, 0x07, 0x6A, 0x00, 0xCB, 0xA6, 0xC8, 0x00, 0x00, 0x47, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x0A, 0x80, 0x00, 0x00, 0x39, 0x14, 0x20, 0x02, 0x22, 0x24, 0x00, 0x08, 0xAE, 0xA8, 0x60, 0x04, 0x28, 0x99, 0x70, 0x07, 0x75, 0xD1, 0x04, 0x0F, 0xB3, 0x33, 0xD0, 0x00, 0xAE, 0xBE, 0xA4, - 0x25, 0x15, 0x20, 0xA0, 0x02, 0x61, 0x0C, 0x02, 0x20, 0x42, 0x08, 0x20, 0x2C, 0x30, 0x14, 0x02, 0x02, 0x28, 0x82, 0x00, 0x03, 0xAC, 0xC1, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x08, 0x12, 0x00, 0x08, 0x00, 0x28, 0x00, 0x0A, 0xCF, 0xEE, 0x20, 0x0B, 0x62, 0x2E, 0x20, 0x02, 0x10, 0x82, 0x40, 0x01, 0x44, 0xE4, 0x40, 0x03, 0x00, 0x0E, 0x00, 0x8D, 0xEA, 0xAC, 0x00, - 0x02, 0x10, 0x0A, 0x00, 0x01, 0xE0, 0x24, 0x00, 0x0C, 0x21, 0x02, 0x00, 0x09, 0x42, 0x21, 0x00, 0x00, 0xCC, 0xF4, 0x40, 0x02, 0xBF, 0xD4, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x04, 0x44, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x44, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x40, 0x00, 0x0C, 0xCC, 0xC4, 0x40, 0x00, 0x0C, 0xC0, 0x00, 0x00, 0x02, 0xA0, 0x40, - 0x00, 0x0C, 0xC0, 0x00, 0x04, 0xCE, 0x64, 0x40, 0x02, 0x08, 0x80, 0x00, 0x00, 0x90, 0x00, 0x40, 0x28, 0xA8, 0x80, 0x00, 0x08, 0x01, 0x04, 0x00, 0x0A, 0x88, 0x80, 0x00, 0x04, 0x44, 0x40, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x29, 0x00, 0x00, 0x00, 0x54, 0x44, 0x00, 0xEE, 0xFE, 0xE0, 0x00, 0x09, 0x3B, 0x3F, 0x00, - 0x21, 0xD8, 0x20, 0x00, 0x00, 0x54, 0x4F, 0x00, 0x18, 0x58, 0x20, 0x00, 0x00, 0x01, 0x86, 0x00, 0xC6, 0x7E, 0x40, 0x00, 0x00, 0xEF, 0x66, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x80, 0x04, 0x00, 0x00, 0xC0, 0x20, 0x00, 0xAA, 0xAA, 0xEA, 0x20, 0xEF, 0xFF, 0xFF, 0x00, 0x80, 0x44, 0x19, 0x30, 0x00, 0x49, 0x24, 0x00, 0xC5, 0x35, 0x1B, 0x10, 0x00, 0x4B, 0x24, 0x00, - 0x01, 0x35, 0xA0, 0x00, 0x8C, 0xA9, 0xAC, 0x80, 0x00, 0x2C, 0x00, 0x00, 0x04, 0x21, 0xA4, 0x00, 0x2A, 0x84, 0x00, 0x00, 0x73, 0x11, 0xF1, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x0B, 0x11, 0x19, 0x00, 0x00, 0x40, 0x00, 0x00, 0x8F, 0xEE, 0xEF, 0xE0, 0x0B, 0x76, 0x66, 0xD0, 0x1A, 0x00, 0x0B, 0x40, 0x4C, 0x40, 0x02, 0xD0, 0x28, 0x00, 0x1A, 0x40, 0x01, 0xD0, 0x2C, 0x10, - 0x00, 0x00, 0x38, 0x40, 0x00, 0x40, 0x28, 0x10, 0x00, 0x01, 0xA0, 0x40, 0x00, 0x42, 0x83, 0x00, 0x05, 0xFE, 0x44, 0x40, 0x03, 0xFD, 0x54, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x09, 0x99, 0x9B, 0x00, 0x00, 0x10, 0x20, 0x00, 0x07, 0x26, 0x21, 0x40, 0x2A, 0xFE, 0xEE, 0xA0, 0x8D, 0x8C, 0xA9, 0xC0, 0x00, 0x10, 0x20, 0x80, 0x32, 0x33, 0xB3, 0x60, 0x00, 0x19, 0x28, 0x00, - 0x00, 0x00, 0xA1, 0x40, 0x00, 0x10, 0xB1, 0x00, 0x00, 0x08, 0x34, 0x00, 0x00, 0x1A, 0x08, 0x00, 0x05, 0xF7, 0x40, 0x00, 0x8E, 0xF4, 0x44, 0xC0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x08, 0x14, 0x02, 0x80, 0x00, 0x04, 0x00, 0x00, 0x1D, 0x11, 0xDB, 0x00, 0xDD, 0xFD, 0xDD, 0xD0, 0x0C, 0x88, 0x07, 0x00, 0x02, 0x06, 0x00, 0x90, 0x48, 0x00, 0x34, 0x00, 0x2C, 0x04, 0x2C, 0x10, - 0x48, 0x11, 0x21, 0x40, 0x04, 0x84, 0x83, 0x40, 0x59, 0x03, 0x00, 0x50, 0x40, 0x0C, 0x10, 0x60, 0x42, 0xA9, 0x88, 0xC0, 0x40, 0x15, 0x80, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x11, 0x02, 0x00, 0x40, 0x08, 0x98, 0x88, 0x80, 0x08, 0xF9, 0x98, 0xC0, 0x06, 0x77, 0x75, 0x50, 0x02, 0x0C, 0x05, 0x00, 0x19, 0x98, 0xA8, 0xD0, 0x0B, 0x99, 0xCA, 0x80, 0x04, 0x54, 0x65, 0xC0, - 0x20, 0x08, 0x50, 0x20, 0x00, 0x10, 0x20, 0xC0, 0x31, 0x1C, 0x04, 0x20, 0x00, 0x01, 0x28, 0x40, 0x26, 0x63, 0xBB, 0xE0, 0x26, 0xEF, 0xE6, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x01, 0x02, 0x01, 0x00, 0xC8, 0xC0, 0x00, 0x00, 0x0F, 0x8A, 0x89, 0x80, 0xC3, 0xF3, 0x11, 0x30, 0x0F, 0x02, 0x01, 0x80, 0xC9, 0xC0, 0x00, 0x30, 0x0F, 0x02, 0x05, 0xA0, 0x00, 0x00, 0x00, 0x30, - 0x0E, 0x02, 0x05, 0xA0, 0x00, 0x00, 0x00, 0x30, 0x0E, 0x02, 0x52, 0x80, 0x00, 0x00, 0x03, 0x00, 0x2C, 0xDF, 0xA8, 0x80, 0x02, 0x33, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x03, 0x88, 0x00, 0x01, 0x02, 0x80, 0x00, 0x03, 0xFF, 0xF7, 0x00, 0x0F, 0x26, 0xE4, 0x72, 0xCC, 0x38, 0x00, 0x40, 0x0C, 0x38, 0x99, 0x00, 0x03, 0x0A, 0x31, 0x50, 0x0C, 0xB1, 0x82, 0x80, - 0x03, 0x28, 0x06, 0x00, 0x87, 0x88, 0x2A, 0xA0, 0x01, 0x05, 0xC2, 0x00, 0x85, 0x82, 0xC2, 0x80, 0x10, 0x00, 0x39, 0x10, 0x08, 0x51, 0xBF, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x80, 0x04, 0x00, 0x48, 0x9D, 0xCC, 0x40, 0xC9, 0xE6, 0x7F, 0x40, 0x40, 0x00, 0x94, 0x00, 0x5B, 0x21, 0x0C, 0xB0, 0x48, 0xAE, 0xCC, 0x40, 0xE1, 0x30, 0x0C, 0x30, 0x43, 0x01, 0xA4, 0x00, - 0xE1, 0x24, 0x5D, 0x30, 0x78, 0x8C, 0xD6, 0x10, 0xF1, 0x60, 0x94, 0x70, 0xD0, 0x40, 0x9C, 0x70, 0x0B, 0x8C, 0x53, 0x00, 0x0C, 0x9D, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x01, 0x39, 0x50, 0x00, 0x00, 0x88, 0xF0, 0x00, 0x2E, 0xAF, 0xC6, 0x00, 0x03, 0x01, 0x77, 0x60, 0x04, 0xF0, 0x41, 0x60, 0x03, 0x92, 0xF8, 0x12, 0x0F, 0xBD, 0x91, 0x40, 0x1B, 0x28, 0x60, 0x92, - 0x70, 0xF4, 0x01, 0xF0, 0x0A, 0xD4, 0x65, 0x82, 0x53, 0xE0, 0x01, 0xE0, 0x04, 0x10, 0x68, 0x60, 0x04, 0x2A, 0xBE, 0x00, 0x00, 0x4F, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x02, 0x3A, 0xEE, 0x00, 0xC8, 0xC0, 0x00, 0x00, 0x0D, 0x84, 0xA5, 0x00, 0xC1, 0xC2, 0x11, 0x00, 0x45, 0x0E, 0x27, 0x00, 0xD9, 0xC3, 0x00, 0x10, 0x07, 0xF8, 0x8D, 0x20, 0x01, 0x30, 0x00, 0x10, - 0xAC, 0x02, 0x25, 0xA0, 0x01, 0x22, 0x00, 0x10, 0x44, 0x20, 0x16, 0xA0, 0x13, 0x02, 0x00, 0x30, 0x04, 0x1B, 0xAA, 0x40, 0x21, 0x00, 0x23, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, +u8 sGfxPrintFontData[(16 * 256) / 2] = { + 0x00, 0xDF, 0xFD, 0x00, 0x0A, 0xEE, 0xFF, 0xA0, 0x0D, 0xF2, 0x2D, 0xD0, 0x06, 0x61, 0x1D, 0xC0, 0x01, 0x12, 0x2D, + 0xD0, 0x06, 0x71, 0x99, 0x00, 0x01, 0x1E, 0xED, 0x10, 0x07, 0x7E, 0xF7, 0x00, 0x01, 0x56, 0x29, 0x90, 0x05, 0x58, + 0x97, 0x60, 0x0D, 0xD2, 0x29, 0x90, 0x05, 0x59, 0x97, 0x70, 0x04, 0xDF, 0xFD, 0x40, 0x02, 0x6E, 0xF7, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0xBF, 0xFB, 0x00, 0x0E, 0xFF, 0xFF, 0xC0, 0x0B, 0xF0, 0x0F, 0xB0, + 0x0F, 0xF0, 0x03, 0x30, 0x0F, 0xF0, 0x0F, 0xF0, 0x0F, 0xF0, 0x02, 0x20, 0x0C, 0xFB, 0xBF, 0x60, 0x0F, 0xFC, 0xCE, + 0x20, 0x0D, 0xD4, 0x4F, 0xF0, 0x0F, 0xF0, 0x02, 0x20, 0x0F, 0xF0, 0x0F, 0xF0, 0x0F, 0xF0, 0x03, 0x30, 0x0C, 0xFB, + 0xBF, 0x40, 0x0E, 0xF7, 0x77, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xDF, 0xFD, 0x00, 0x0A, + 0xEE, 0xFF, 0xA0, 0x0D, 0xF2, 0x2D, 0xD0, 0x06, 0x61, 0x1D, 0xC0, 0x01, 0x12, 0x2D, 0xD0, 0x06, 0x71, 0x99, 0x00, + 0x01, 0x1E, 0xED, 0x10, 0x07, 0x7E, 0xF7, 0x00, 0x01, 0x56, 0x29, 0x90, 0x05, 0x58, 0x97, 0x60, 0x0D, 0xD2, 0x29, + 0x90, 0x05, 0x59, 0x97, 0x70, 0x04, 0xDF, 0xFD, 0x40, 0x02, 0x6E, 0xF7, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x08, 0xBF, 0xFB, 0x00, 0x00, 0x0D, 0xE0, 0x00, 0x0B, 0xF0, 0x0F, 0xB0, 0x00, 0x5D, 0xE6, 0x00, 0x0F, + 0xF0, 0x0F, 0xF0, 0x05, 0x5C, 0xC6, 0x60, 0x0C, 0xFB, 0xBF, 0x60, 0x77, 0x3F, 0xF3, 0x77, 0x0D, 0xD4, 0x4F, 0xF0, + 0xBB, 0x3F, 0xF3, 0xBB, 0x0F, 0xF0, 0x0F, 0xF0, 0x09, 0x9C, 0xCA, 0xA0, 0x0C, 0xFB, 0xBF, 0x40, 0x00, 0x9D, 0xEA, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0D, 0xE0, 0x00, 0x04, 0xC2, 0x2C, 0x40, 0x02, 0x8D, 0x50, 0x20, 0x0C, 0xCA, + 0xAC, 0xC0, 0x21, 0xF9, 0x17, 0x10, 0x04, 0xC2, 0x2C, 0x40, 0x12, 0x49, 0x34, 0x00, 0x00, 0x82, 0x08, 0x00, 0x01, + 0x97, 0x51, 0x10, 0x08, 0x8A, 0x88, 0x80, 0x04, 0x61, 0x52, 0x41, 0x00, 0x80, 0x08, 0x00, 0x43, 0x11, 0x75, 0x30, + 0x00, 0xA2, 0x08, 0x00, 0x60, 0x05, 0x56, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x40, 0x00, 0x40, 0x00, 0x22, 0x11, + 0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0x0F, 0xB0, 0x00, 0x00, 0x00, 0x08, 0x80, 0x04, 0x0D, 0xA4, 0x00, 0x00, 0x00, + 0x88, 0x00, 0x08, 0xCD, 0xE8, 0x80, 0x02, 0x2A, 0xA2, 0x20, 0x08, 0xCD, 0xE8, 0x80, 0x02, 0xAA, 0x22, 0x20, 0x04, + 0x0D, 0xA4, 0x00, 0x0C, 0xD1, 0x00, 0x00, 0x00, 0x0F, 0xB0, 0x00, 0x8C, 0x51, 0x00, 0x00, 0x00, 0x22, 0x11, 0x00, + 0x81, 0x10, 0x00, 0x00, 0x00, 0xDF, 0xFD, 0x00, 0x0A, 0xEE, 0xFF, 0xA0, 0x0D, 0xF2, 0x2D, 0xD0, 0x06, 0x61, 0x1D, + 0xC0, 0x01, 0x12, 0x2D, 0xD0, 0x06, 0x71, 0x99, 0x00, 0x01, 0x1E, 0xED, 0x10, 0x07, 0x7E, 0xF7, 0x00, 0x01, 0x56, + 0x29, 0x90, 0x05, 0x58, 0x97, 0x60, 0x0D, 0xD2, 0x29, 0x90, 0x05, 0x59, 0x97, 0x70, 0x04, 0xDF, 0xFD, 0x40, 0x02, + 0x6E, 0xF7, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x33, 0x33, 0x00, 0x04, 0x48, 0x99, 0x80, + 0x03, 0x3C, 0xC3, 0x30, 0x00, 0xCD, 0x10, 0x88, 0x03, 0x3C, 0xC3, 0x30, 0x02, 0xBF, 0x62, 0xA8, 0x00, 0x33, 0x33, + 0x20, 0x01, 0x10, 0x4C, 0x80, 0x01, 0x10, 0x03, 0x30, 0x00, 0x15, 0xC8, 0x00, 0x03, 0x3C, 0xC3, 0x30, 0x02, 0x67, + 0x32, 0x20, 0x00, 0x3F, 0xF3, 0x00, 0x04, 0x40, 0x99, 0x00, 0x00, 0x88, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, + 0xDF, 0xFD, 0x10, 0x07, 0xFF, 0xFF, 0x60, 0x1C, 0xE0, 0x0E, 0xC1, 0x0F, 0xF0, 0x09, 0x90, 0x1E, 0xE1, 0x16, 0x61, + 0x0F, 0xF0, 0x01, 0x10, 0x1E, 0xF4, 0x56, 0x21, 0x0F, 0xF6, 0x67, 0x10, 0x1E, 0xF2, 0x36, 0x61, 0x0F, 0xF0, 0x89, + 0x90, 0x1E, 0xF1, 0x0F, 0xE1, 0x0F, 0xF0, 0x09, 0x90, 0x16, 0xEC, 0xCE, 0x21, 0x07, 0xFB, 0xBB, 0x20, 0x01, 0x11, + 0x11, 0x10, 0x00, 0x00, 0x00, 0x00, 0x09, 0xB6, 0x6F, 0xD0, 0x27, 0xD8, 0x8E, 0x60, 0x09, 0x92, 0xED, 0x10, 0x2F, + 0xF0, 0x2E, 0xE0, 0x09, 0x9A, 0xE5, 0x10, 0x2F, 0xF6, 0x2E, 0xE0, 0x09, 0x9B, 0x75, 0x10, 0x2F, 0xD6, 0x4E, 0xE0, + 0x0D, 0xDA, 0xE5, 0x10, 0x2F, 0xD0, 0x4E, 0xE0, 0x0D, 0xD2, 0xED, 0x10, 0x2F, 0xD0, 0x0E, 0xE0, 0x09, 0xF6, 0x6F, + 0x90, 0x27, 0xD9, 0x9F, 0x70, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0xFF, 0xFF, 0x00, 0x8F, 0x71, + 0x1F, 0xF0, 0x2F, 0xD0, 0x0F, 0xF0, 0x8F, 0x71, 0x1F, 0xF0, 0x2F, 0xD0, 0x07, 0x70, 0x8E, 0x61, 0x1E, 0xE0, 0x27, + 0xDD, 0xDF, 0x60, 0x8E, 0x69, 0x1E, 0xE0, 0x27, 0x76, 0x4A, 0xA0, 0x8E, 0xE9, 0x9E, 0xE0, 0x2F, 0xD0, 0x6E, 0x80, + 0x8A, 0xE7, 0xFE, 0xA0, 0x07, 0xFA, 0x8E, 0x60, 0x88, 0x27, 0x7A, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x07, 0x7C, 0xCF, 0xF0, 0x13, 0x26, 0x60, 0x11, 0x07, 0x7C, 0xCF, 0xF0, 0x03, 0x76, 0x65, 0x10, 0x02, 0x39, + 0xD7, 0x20, 0x04, 0x53, 0x35, 0x40, 0x00, 0x2F, 0xF2, 0x00, 0x01, 0x13, 0x31, 0x10, 0x00, 0x5F, 0xB1, 0x00, 0x00, + 0x03, 0x30, 0x00, 0x05, 0x5E, 0xE5, 0x50, 0x01, 0x13, 0x31, 0x10, 0x05, 0x5E, 0xED, 0xD0, 0x02, 0x23, 0x30, 0x00, + 0x00, 0x08, 0x88, 0x80, 0x8A, 0xAB, 0xB8, 0x88, 0x00, 0x00, 0x11, 0x00, 0x00, 0x04, 0x45, 0x10, 0x04, 0x62, 0x33, + 0x20, 0x00, 0x44, 0x01, 0x10, 0x04, 0xC8, 0x9A, 0xA0, 0x00, 0xEE, 0xAB, 0x10, 0x0C, 0xE6, 0x67, 0x20, 0x0E, 0xF5, + 0x5F, 0xB0, 0x0E, 0xE0, 0x06, 0x60, 0x0B, 0xF6, 0x2B, 0x90, 0x0E, 0xE0, 0x06, 0x60, 0x03, 0xFC, 0x89, 0x90, 0x04, + 0xEE, 0xEE, 0xA0, 0x00, 0x77, 0x3B, 0xB0, 0x00, 0x00, 0x00, 0x00, 0x08, 0x88, 0x88, 0x00, 0x09, 0x90, 0x00, 0x00, + 0x00, 0x11, 0x10, 0x00, 0x09, 0x92, 0x24, 0x40, 0x00, 0x01, 0x10, 0x00, 0x09, 0x90, 0x88, 0x00, 0x26, 0xEF, 0xDE, + 0x20, 0x09, 0x9B, 0xB5, 0x40, 0x2E, 0xC3, 0x3C, 0xE2, 0x0D, 0x9A, 0x25, 0x50, 0x2E, 0xC3, 0x3C, 0xE2, 0x0D, 0xDA, + 0xA5, 0x50, 0x2E, 0xC3, 0x3C, 0xE2, 0x09, 0xD6, 0xED, 0x10, 0x26, 0xCB, 0xBC, 0x62, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x10, 0x00, + 0x05, 0xFB, 0xFF, 0xE0, 0x8E, 0x61, 0x16, 0xE8, 0x0F, 0xF4, 0x03, 0x30, 0x8F, 0x71, 0x17, 0xF8, 0x07, 0xFC, 0x8B, + 0x30, 0x8E, 0x69, 0x96, 0xE8, 0x05, 0x73, 0x3B, 0xA0, 0x8A, 0x6D, 0xD6, 0xA8, 0x0D, 0xD8, 0x8A, 0x20, 0x08, 0xA7, + 0x79, 0xB2, 0x01, 0x10, 0x02, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x8A, 0x01, 0x10, 0x00, 0x00, + 0x00, 0x08, 0x00, 0x80, 0xA1, 0x10, 0x00, 0x07, 0x74, 0x4F, 0x70, 0x80, 0xA9, 0x90, 0x00, 0x02, 0x31, 0xDF, 0x20, + 0x84, 0xE6, 0x00, 0x04, 0x00, 0x27, 0xDA, 0x20, 0xC8, 0xAA, 0x4C, 0x40, 0x00, 0x57, 0x3B, 0x20, 0x00, 0xA1, 0x18, + 0x00, 0x05, 0x54, 0x6F, 0x50, 0x00, 0xA9, 0x98, 0x00, 0x02, 0x22, 0x20, 0x80, 0x02, 0x00, 0x18, 0x88, 0x00, 0x04, + 0x44, 0x40, 0x00, 0x04, 0x00, 0x00, 0x00, 0x04, 0x44, 0x40, 0x0C, 0x44, 0x44, 0x00, 0x00, 0x04, 0x40, 0x00, 0x88, + 0xC0, 0x00, 0x00, 0x00, 0x0C, 0xC0, 0x00, 0x0C, 0x46, 0xA4, 0x40, 0x00, 0x0C, 0xC0, 0x00, 0x08, 0x8E, 0xE0, 0x00, + 0x02, 0x08, 0x80, 0x00, 0x80, 0xD0, 0x88, 0x00, 0x28, 0xA8, 0x80, 0x00, 0x88, 0xCD, 0x4C, 0x40, 0x0A, 0x88, 0x80, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x06, 0xE0, 0x08, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x08, 0x88, 0x00, 0x80, 0x01, 0x06, 0x10, 0x00, 0x56, 0xE7, 0x50, 0x80, 0x02, 0x1F, 0xF1, 0x00, 0x38, + 0x8C, 0xB8, 0x00, 0x0B, 0xF6, 0x0B, 0x00, 0x94, 0xC0, 0x28, 0x00, 0x06, 0x07, 0x6A, 0x00, 0xCB, 0xA6, 0xC8, 0x00, + 0x00, 0x47, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0A, 0x80, 0x00, 0x00, 0x39, 0x14, + 0x20, 0x02, 0x22, 0x24, 0x00, 0x08, 0xAE, 0xA8, 0x60, 0x04, 0x28, 0x99, 0x70, 0x07, 0x75, 0xD1, 0x04, 0x0F, 0xB3, + 0x33, 0xD0, 0x00, 0xAE, 0xBE, 0xA4, 0x25, 0x15, 0x20, 0xA0, 0x02, 0x61, 0x0C, 0x02, 0x20, 0x42, 0x08, 0x20, 0x2C, + 0x30, 0x14, 0x02, 0x02, 0x28, 0x82, 0x00, 0x03, 0xAC, 0xC1, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x08, 0x12, 0x00, 0x08, 0x00, 0x28, 0x00, 0x0A, 0xCF, 0xEE, 0x20, 0x0B, 0x62, 0x2E, 0x20, 0x02, 0x10, 0x82, + 0x40, 0x01, 0x44, 0xE4, 0x40, 0x03, 0x00, 0x0E, 0x00, 0x8D, 0xEA, 0xAC, 0x00, 0x02, 0x10, 0x0A, 0x00, 0x01, 0xE0, + 0x24, 0x00, 0x0C, 0x21, 0x02, 0x00, 0x09, 0x42, 0x21, 0x00, 0x00, 0xCC, 0xF4, 0x40, 0x02, 0xBF, 0xD4, 0x40, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x44, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x44, 0x40, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x40, 0x00, 0x0C, 0xCC, 0xC4, 0x40, 0x00, 0x0C, 0xC0, 0x00, 0x00, 0x02, 0xA0, + 0x40, 0x00, 0x0C, 0xC0, 0x00, 0x04, 0xCE, 0x64, 0x40, 0x02, 0x08, 0x80, 0x00, 0x00, 0x90, 0x00, 0x40, 0x28, 0xA8, + 0x80, 0x00, 0x08, 0x01, 0x04, 0x00, 0x0A, 0x88, 0x80, 0x00, 0x04, 0x44, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x29, 0x00, 0x00, 0x00, 0x54, 0x44, 0x00, + 0xEE, 0xFE, 0xE0, 0x00, 0x09, 0x3B, 0x3F, 0x00, 0x21, 0xD8, 0x20, 0x00, 0x00, 0x54, 0x4F, 0x00, 0x18, 0x58, 0x20, + 0x00, 0x00, 0x01, 0x86, 0x00, 0xC6, 0x7E, 0x40, 0x00, 0x00, 0xEF, 0x66, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x80, 0x04, 0x00, 0x00, 0xC0, 0x20, 0x00, 0xAA, 0xAA, 0xEA, 0x20, 0xEF, 0xFF, 0xFF, 0x00, 0x80, + 0x44, 0x19, 0x30, 0x00, 0x49, 0x24, 0x00, 0xC5, 0x35, 0x1B, 0x10, 0x00, 0x4B, 0x24, 0x00, 0x01, 0x35, 0xA0, 0x00, + 0x8C, 0xA9, 0xAC, 0x80, 0x00, 0x2C, 0x00, 0x00, 0x04, 0x21, 0xA4, 0x00, 0x2A, 0x84, 0x00, 0x00, 0x73, 0x11, 0xF1, + 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0B, 0x11, 0x19, 0x00, 0x00, 0x40, 0x00, 0x00, 0x8F, 0xEE, + 0xEF, 0xE0, 0x0B, 0x76, 0x66, 0xD0, 0x1A, 0x00, 0x0B, 0x40, 0x4C, 0x40, 0x02, 0xD0, 0x28, 0x00, 0x1A, 0x40, 0x01, + 0xD0, 0x2C, 0x10, 0x00, 0x00, 0x38, 0x40, 0x00, 0x40, 0x28, 0x10, 0x00, 0x01, 0xA0, 0x40, 0x00, 0x42, 0x83, 0x00, + 0x05, 0xFE, 0x44, 0x40, 0x03, 0xFD, 0x54, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x09, 0x99, 0x9B, + 0x00, 0x00, 0x10, 0x20, 0x00, 0x07, 0x26, 0x21, 0x40, 0x2A, 0xFE, 0xEE, 0xA0, 0x8D, 0x8C, 0xA9, 0xC0, 0x00, 0x10, + 0x20, 0x80, 0x32, 0x33, 0xB3, 0x60, 0x00, 0x19, 0x28, 0x00, 0x00, 0x00, 0xA1, 0x40, 0x00, 0x10, 0xB1, 0x00, 0x00, + 0x08, 0x34, 0x00, 0x00, 0x1A, 0x08, 0x00, 0x05, 0xF7, 0x40, 0x00, 0x8E, 0xF4, 0x44, 0xC0, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x08, 0x14, 0x02, 0x80, 0x00, 0x04, 0x00, 0x00, 0x1D, 0x11, 0xDB, 0x00, 0xDD, 0xFD, 0xDD, + 0xD0, 0x0C, 0x88, 0x07, 0x00, 0x02, 0x06, 0x00, 0x90, 0x48, 0x00, 0x34, 0x00, 0x2C, 0x04, 0x2C, 0x10, 0x48, 0x11, + 0x21, 0x40, 0x04, 0x84, 0x83, 0x40, 0x59, 0x03, 0x00, 0x50, 0x40, 0x0C, 0x10, 0x60, 0x42, 0xA9, 0x88, 0xC0, 0x40, + 0x15, 0x80, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x11, 0x02, 0x00, 0x40, 0x08, 0x98, 0x88, 0x80, + 0x08, 0xF9, 0x98, 0xC0, 0x06, 0x77, 0x75, 0x50, 0x02, 0x0C, 0x05, 0x00, 0x19, 0x98, 0xA8, 0xD0, 0x0B, 0x99, 0xCA, + 0x80, 0x04, 0x54, 0x65, 0xC0, 0x20, 0x08, 0x50, 0x20, 0x00, 0x10, 0x20, 0xC0, 0x31, 0x1C, 0x04, 0x20, 0x00, 0x01, + 0x28, 0x40, 0x26, 0x63, 0xBB, 0xE0, 0x26, 0xEF, 0xE6, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, + 0x02, 0x01, 0x00, 0xC8, 0xC0, 0x00, 0x00, 0x0F, 0x8A, 0x89, 0x80, 0xC3, 0xF3, 0x11, 0x30, 0x0F, 0x02, 0x01, 0x80, + 0xC9, 0xC0, 0x00, 0x30, 0x0F, 0x02, 0x05, 0xA0, 0x00, 0x00, 0x00, 0x30, 0x0E, 0x02, 0x05, 0xA0, 0x00, 0x00, 0x00, + 0x30, 0x0E, 0x02, 0x52, 0x80, 0x00, 0x00, 0x03, 0x00, 0x2C, 0xDF, 0xA8, 0x80, 0x02, 0x33, 0x30, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x88, 0x00, 0x01, 0x02, 0x80, 0x00, 0x03, 0xFF, 0xF7, 0x00, 0x0F, + 0x26, 0xE4, 0x72, 0xCC, 0x38, 0x00, 0x40, 0x0C, 0x38, 0x99, 0x00, 0x03, 0x0A, 0x31, 0x50, 0x0C, 0xB1, 0x82, 0x80, + 0x03, 0x28, 0x06, 0x00, 0x87, 0x88, 0x2A, 0xA0, 0x01, 0x05, 0xC2, 0x00, 0x85, 0x82, 0xC2, 0x80, 0x10, 0x00, 0x39, + 0x10, 0x08, 0x51, 0xBF, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x04, 0x00, 0x48, 0x9D, + 0xCC, 0x40, 0xC9, 0xE6, 0x7F, 0x40, 0x40, 0x00, 0x94, 0x00, 0x5B, 0x21, 0x0C, 0xB0, 0x48, 0xAE, 0xCC, 0x40, 0xE1, + 0x30, 0x0C, 0x30, 0x43, 0x01, 0xA4, 0x00, 0xE1, 0x24, 0x5D, 0x30, 0x78, 0x8C, 0xD6, 0x10, 0xF1, 0x60, 0x94, 0x70, + 0xD0, 0x40, 0x9C, 0x70, 0x0B, 0x8C, 0x53, 0x00, 0x0C, 0x9D, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x01, 0x39, 0x50, 0x00, 0x00, 0x88, 0xF0, 0x00, 0x2E, 0xAF, 0xC6, 0x00, 0x03, 0x01, 0x77, 0x60, 0x04, 0xF0, + 0x41, 0x60, 0x03, 0x92, 0xF8, 0x12, 0x0F, 0xBD, 0x91, 0x40, 0x1B, 0x28, 0x60, 0x92, 0x70, 0xF4, 0x01, 0xF0, 0x0A, + 0xD4, 0x65, 0x82, 0x53, 0xE0, 0x01, 0xE0, 0x04, 0x10, 0x68, 0x60, 0x04, 0x2A, 0xBE, 0x00, 0x00, 0x4F, 0x80, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x3A, 0xEE, 0x00, 0xC8, 0xC0, 0x00, 0x00, 0x0D, 0x84, 0xA5, + 0x00, 0xC1, 0xC2, 0x11, 0x00, 0x45, 0x0E, 0x27, 0x00, 0xD9, 0xC3, 0x00, 0x10, 0x07, 0xF8, 0x8D, 0x20, 0x01, 0x30, + 0x00, 0x10, 0xAC, 0x02, 0x25, 0xA0, 0x01, 0x22, 0x00, 0x10, 0x44, 0x20, 0x16, 0xA0, 0x13, 0x02, 0x00, 0x30, 0x04, + 0x1B, 0xAA, 0x40, 0x21, 0x00, 0x23, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; -#define gDPSetPrimColorMod(pkt, m, l, rgba) \ -_DW({ \ - Gfx *_g = (Gfx *)(pkt); \ - \ - _g->words.w0 = (_SHIFTL(G_SETPRIMCOLOR, 24, 8) | \ - _SHIFTL(m, 8, 8) | _SHIFTL(l, 0, 8)); \ - _g->words.w1 = (rgba); \ -}) +#define gDPSetPrimColorMod(pkt, m, l, rgba) \ + _DW({ \ + Gfx* _g = (Gfx*)(pkt); \ + \ + _g->words.w0 = (_SHIFTL(G_SETPRIMCOLOR, 24, 8) | _SHIFTL(m, 8, 8) | _SHIFTL(l, 0, 8)); \ + _g->words.w1 = (rgba); \ + }) #ifdef NON_MATCHING -void GfxPrint_InitDlist(GfxPrint* this) -{ - u32 palette; - u32 tile; +// regalloc and minor ordering differences +void GfxPrint_InitDlist(GfxPrint* this) { + s32 width = 16; + s32 height = 256; + s32 i; gDPPipeSync(this->dlist++); - gDPSetOtherMode(this->dlist++, 0xECF0, 0x504244); - gDPSetCombineLERP(this->dlist++, K5, K5, 0, TEXEL0, 0, 0, 0, TEXEL0, K5, K5, 0, TEXEL0, 0, 0, 0, TEXEL0); - gDPLoadTextureBlock(this->dlist++, sGfxPrintFontData, G_IM_FMT_CI, G_IM_SIZ_4b, 16, 256, 0, 0, 0, 0, 0, 0, 0); //? missmatch here - gDPLoadTLUT(this->dlist++, 64, 0x100, sGfxPrintFontTLUT); + gDPSetOtherMode(this->dlist++, + G_AD_DISABLE | G_CD_DISABLE | G_CK_NONE | G_TC_FILT | G_TF_BILERP | G_TT_IA16 | G_TL_TILE | + G_TD_CLAMP | G_TP_NONE | G_CYC_1CYCLE | G_PM_NPRIMITIVE, + G_AC_NONE | G_ZS_PRIM | G_RM_XLU_SURF | G_RM_XLU_SURF2); + gDPSetCombineMode(this->dlist++, G_CC_DECALRGBA, G_CC_DECALRGBA); - tile = 2; - palette = 1; - do - { - gDPSetTile(this->dlist++, G_IM_FMT_CI, G_IM_SIZ_4b, 1, 0x0, tile, palette++, G_TX_NOMIRROR | G_TX_CLAMP, 0, 0, G_TX_NOMIRROR | G_TX_CLAMP, 0, 0); - gDPSetTileSize(this->dlist++, tile, 0, 0, 15, 255); - tile+=2; + gDPSetTextureImage(this->dlist++, G_IM_FMT_CI, G_IM_SIZ_4b_LOAD_BLOCK, 1, sGfxPrintFontData); + gDPSetTile(this->dlist++, G_IM_FMT_CI, G_IM_SIZ_4b_LOAD_BLOCK, 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(this->dlist++); + gDPLoadBlock(this->dlist++, G_TX_LOADTILE, 0, 0, (((width) * (height) + G_IM_SIZ_4b_INCR) >> G_IM_SIZ_4b_SHIFT) - 1, + CALC_DXT(width, G_IM_SIZ_4b_BYTES)); + gDPPipeSync(this->dlist++); + gDPSetTile(this->dlist++, 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(this->dlist++, G_TX_RENDERTILE, 0, 0, ((width)-1) << G_TEXTURE_IMAGE_FRAC, + ((height)-1) << G_TEXTURE_IMAGE_FRAC); - } while (palette < 4); + gDPLoadTLUT(this->dlist++, 64, 256, sGfxPrintFontTLUT); + + for (i = 1; i < 4; i++) { + gDPSetTile(this->dlist++, G_IM_FMT_CI, G_IM_SIZ_4b, 1, 0, i * 2, i, 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(this->dlist++, i * 2, 0, 0, 60, 1020); + } gDPSetPrimColorMod(this->dlist++, 0, 0, *(u32*)&this->color); - gDPLoadTextureTile(this->dlist++, sGfxPrintUnkData, G_IM_FMT_CI, G_IM_SIZ_8b, 1, 0, 0, 0, 0, 7, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, 1, 3, 0, 0); - gDPLoadTLUT(this->dlist++, 16, 0x140, sGfxPrintUnkTLUT); - tile = 3; - do - { - gDPSetTile(this->dlist++, G_IM_FMT_CI, G_IM_SIZ_4b, tile, 0x0, G_TX_RENDERTILE, 4, G_TX_NOMIRROR | G_TX_WRAP, 3, 0, G_TX_NOMIRROR | G_TX_WRAP, 1, 0); - gDPSetTileSize(this->dlist++, tile, 0, 0, 1, 7); - tile += 2; - } while (tile != 9); + gDPSetTextureImage(this->dlist++, G_IM_FMT_CI, G_IM_SIZ_8b, 1, sGfxPrintUnkData); + gDPSetTile(this->dlist++, G_IM_FMT_CI, G_IM_SIZ_8b, 1, 0, G_TX_LOADTILE, 0, G_TX_NOMIRROR | G_TX_WRAP, 3, + G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, 1, G_TX_NOLOD); + gDPLoadSync(this->dlist++); + gDPLoadTile(this->dlist++, G_TX_LOADTILE, 0, 0, 2, 28); + gDPPipeSync(this->dlist++); + gDPSetTile(this->dlist++, G_IM_FMT_CI, G_IM_SIZ_8b, 1, 0, 1, 4, G_TX_NOMIRROR | G_TX_WRAP, 3, G_TX_NOLOD, + G_TX_NOMIRROR | G_TX_WRAP, 1, G_TX_NOLOD); + gDPSetTileSize(this->dlist++, 1, 0, 0, 4, 28); + + gDPLoadTLUT(this->dlist++, 16, 320, sGfxPrintUnkTLUT); + + for (i = 1; i < 4; i++) { + gDPSetTile(this->dlist++, G_IM_FMT_CI, G_IM_SIZ_4b, 1, 0, i * 2 + 1, 4, G_TX_NOMIRROR | G_TX_WRAP, 3, + G_TX_NOLOD, G_TX_NOMIRROR | G_TX_WRAP, 1, G_TX_NOLOD); + gDPSetTileSize(this->dlist++, i * 2 + 1, 0, 0, 4, 28); + } } #else #pragma GLOBAL_ASM("asm/non_matchings/code/gfxprint/GfxPrint_InitDlist.s") #endif - -void GfxPrint_SetColor(GfxPrint* this, u32 r, u32 g, u32 b, u32 a) -{ +void GfxPrint_SetColor(GfxPrint* this, u32 r, u32 g, u32 b, u32 a) { this->color.r = r; this->color.g = g; this->color.b = b; @@ -162,193 +207,141 @@ void GfxPrint_SetColor(GfxPrint* this, u32 r, u32 g, u32 b, u32 a) gDPSetPrimColorMod(this->dlist++, 0, 0, *(u32*)&this->color); } - -void GfxPrint_SetPosPx(GfxPrint* this, s32 x, s32 y) -{ +void GfxPrint_SetPosPx(GfxPrint* this, s32 x, s32 y) { this->posX = this->baseX + (x << 2); this->posY = this->baseY + (y << 2); } -void GfxPrint_SetPos(GfxPrint* this, s32 x, s32 y) -{ +void GfxPrint_SetPos(GfxPrint* this, s32 x, s32 y) { GfxPrint_SetPosPx(this, x << 3, y << 3); } -void GfxPrint_SetBasePosPx(GfxPrint* this, s32 x, s32 y) -{ +void GfxPrint_SetBasePosPx(GfxPrint* this, s32 x, s32 y) { this->baseX = x << 2; this->baseY = y << 2; } -//close from matching #ifdef NON_MATCHING -void GfxPrint_PrintCharImpl(GfxPrint* this, u8 c) -{ - u32 test; - u32 test2; - - if (this->flag & GFXPRINT_UPDATE_MODE) - { +// regalloc and ordering differences +void GfxPrint_PrintCharImpl(GfxPrint* this, u8 c) { + if (this->flag & GFXPRINT_UPDATE_MODE) { this->flag &= ~GFXPRINT_UPDATE_MODE; + gDPPipeSync(this->dlist++); - if (this->flag & GFXPRINT_USE_RGBA16) - { + if (this->flag & GFXPRINT_USE_RGBA16) { gDPSetTextureLUT(this->dlist++, G_TT_RGBA16); gDPSetCycleType(this->dlist++, G_CYC_2CYCLE); gDPSetRenderMode(this->dlist++, G_RM_OPA_CI, G_RM_XLU_SURF2); - gDPSetCombineLERP(this->dlist++, TEXEL0, K5, TEXEL1, COMBINED_ALPHA, TEXEL0, 0, TEXEL1, 0, K5, K5, 0, COMBINED, 0, 0, 0, COMBINED); - } - else - { + gDPSetCombineMode(this->dlist++, G_CC_INTERFERENCE, G_CC_PASS2); + } else { gDPSetTextureLUT(this->dlist++, G_TT_IA16); gDPSetCycleType(this->dlist++, G_CYC_1CYCLE); gDPSetRenderMode(this->dlist++, G_RM_XLU_SURF, G_RM_XLU_SURF2); - gDPSetCombineLERP(this->dlist++, TEXEL0, K5, PRIMITIVE, COMBINED_ALPHA, 0, 0, 0, TEXEL0, TEXEL0, K5, PRIMITIVE, COMBINED_ALPHA, 0, 0, 0, TEXEL0); + gDPSetCombineMode(this->dlist++, G_CC_MODULATEIDECALA_PRIM, G_CC_MODULATEIDECALA_PRIM); } } - test = (c & 4) << 6; - test2 = (c >> 3) << 8; - if (this->flag & GFXPRINT_FLAG4) - { + if (this->flag & GFXPRINT_FLAG4) { gDPSetPrimColorMod(this->dlist++, 0, 0, 0); - if (this->flag & GFXPRINT_FLAG64) - gSPTextureRectangle(this->dlist++, (this->posX+4)<<1, (this->posY+4)<<1, (this->posX+0x24)<<1, (this->posY+0x24)<<1, c<<1, test, test2, 512, 512); //c*2 ? - else - gSPTextureRectangle(this->dlist++, this->posX+4, this->posY+4, this->posX+0x24, this->posY+0x24, c<<1, test, test2, 1024, 1024); + if (this->flag & GFXPRINT_FLAG64) { + gSPTextureRectangle(this->dlist++, (this->posX + 4) << 1, (this->posY + 4) << 1, (this->posX + 4 + 32) << 1, + (this->posY + 4 + 32) << 1, c * 2, (u16)(c & 4) * 64, (u16)(c >> 3) * 256, 512, 512); + } else { + gSPTextureRectangle(this->dlist++, this->posX + 4, this->posY + 4, this->posX + 4 + 32, this->posY + 4 + 32, + c * 2, (u16)(c & 4) * 64, (u16)(c >> 3) * 256, 1024, 1024); + } gDPSetPrimColorMod(this->dlist++, 0, 0, *(u32*)&this->color); } - if (this->flag & GFXPRINT_FLAG64) - gSPTextureRectangle(this->dlist++, (this->posX)<<1, (this->posY)<<1, (this->posX + 0x20)<<1, (this->posY + 0x20)<<1, c << 1, test, test2, 512, 512); - else - gSPTextureRectangle(this->dlist++, this->posX, this->posY, this->posX + 0x20, this->posY + 0x20, c << 1, test, test2, 1024, 1024); - this->posX += 0x20; + if (this->flag & GFXPRINT_FLAG64) { + gSPTextureRectangle(this->dlist++, (this->posX) << 1, (this->posY) << 1, (this->posX + 32) << 1, + (this->posY + 32) << 1, c * 2, (u16)(c & 4) * 64, (u16)(c >> 3) * 256, 512, 512); + } else { + gSPTextureRectangle(this->dlist++, this->posX, this->posY, this->posX + 32, this->posY + 32, c * 2, + (u16)(c & 4) * 64, (u16)(c >> 3) * 256, 1024, 1024); + } + + this->posX += 32; } #else #pragma GLOBAL_ASM("asm/non_matchings/code/gfxprint/GfxPrint_PrintCharImpl.s") #endif +void GfxPrint_PrintChar(GfxPrint* this, u8 c) { + u8 charParam = c; -#ifdef NON_MATCHING -void GfxPrint_PrintChar(GfxPrint *this, char c) -{ - if (c == ' ') + if (c == ' ') { this->posX += 0x20; - else if (c > 0x20 && c < 0x7f) - GfxPrint_PrintCharImpl(this, c); - else if (c >= 0xa0 && c < 0xe0) - { - u8 charParam = c; - if ((this->flag & GFXPRINT_FLAG1) != 0) - { - if (c < 0xc0) + } else if (c > 0x20 && c < 0x7F) { + GfxPrint_PrintCharImpl(this, charParam); + } else if (c >= 0xA0 && c < 0xE0) { + if (this->flag & GFXPRINT_FLAG1) { + if (c < 0xC0) { charParam = c - 0x20; - else + } else { charParam = c + 0x20; + } } GfxPrint_PrintCharImpl(this, charParam); - } - else - { - switch(c) - { + } else { + switch (c) { case 0: - return; - case 1: - case 2: - case 3: - case 4: - case 5: - case 6: - case 7: - case 8: - return; - //tab - case 9: - { - u32 uVar1; + break; + case '\n': + this->posY += 0x20; + case '\r': + this->posX = this->baseX; + break; + case '\t': do { GfxPrint_PrintCharImpl(this, 0x20); - uVar1 = this->posX - this->baseX; - if (uVar1 < 0 && uVar1 != 0) - uVar1 -= 0x100; - } while (uVar1 != 0); - return; - } - //line feed - case 0xa: - { - this->posY += 0x20; - this->posX = this->baseX; - return; - } - /* - case 0xb: - case 0xc: - return; - */ - //carriage return - case 0xd: - { - this->posX = this->baseX; - return; - } - case 0x8a: - this->flag &= ~GFXPRINT_USE_RGBA16; - this->flag |= GFXPRINT_UPDATE_MODE; - return; - case 0x8b: + } while ((this->posX - this->baseX) % 256); + break; + case 0x8D: + this->flag |= GFXPRINT_FLAG1; + break; + case 0x8C: + this->flag &= ~GFXPRINT_FLAG1; + break; + case 0x8B: this->flag |= GFXPRINT_USE_RGBA16; this->flag |= GFXPRINT_UPDATE_MODE; - return; - case 0x8c: - this->flag &= ~GFXPRINT_FLAG1; - return; - case 0x8d: - this->flag |= GFXPRINT_FLAG1; - return; - case 0x8e: + break; + case 0x8A: + this->flag &= ~GFXPRINT_USE_RGBA16; + this->flag |= GFXPRINT_UPDATE_MODE; + break; + case 0x8E: default: - return; + break; } - } } -#else -#pragma GLOBAL_ASM("asm/non_matchings/code/gfxprint/GfxPrint_PrintChar.s") -#endif - - -void GfxPrint_PrintStringWithSize(GfxPrint* this, const void* buffer, size_t charSize, size_t charCount) -{ +void GfxPrint_PrintStringWithSize(GfxPrint* this, const void* buffer, size_t charSize, size_t charCount) { const char* str = (const char*)buffer; size_t count = charSize * charCount; - while (count) - { + while (count) { GfxPrint_PrintChar(this, *str++); count--; } } -void GfxPrint_PrintString(GfxPrint* this, const char* str) -{ - while (*str) +void GfxPrint_PrintString(GfxPrint* this, const char* str) { + while (*str) { GfxPrint_PrintChar(this, *(str++)); + } } -GfxPrint* GfxPrint_Callback(GfxPrint* this, const char* str, size_t size) -{ +GfxPrint* GfxPrint_Callback(GfxPrint* this, const char* str, size_t size) { GfxPrint_PrintStringWithSize(this, str, sizeof(char), size); return this; } -void GfxPrint_Ctor(GfxPrint* this) -{ +void GfxPrint_Ctor(GfxPrint* this) { this->flag &= ~GFXPRINT_OPEN; this->callback = &GfxPrint_Callback; @@ -364,31 +357,27 @@ void GfxPrint_Ctor(GfxPrint* this) this->flag |= GFXPRINT_FLAG4; this->flag |= GFXPRINT_UPDATE_MODE; - if ((D_801755F0 & GFXPRINT_FLAG64)) + if ((D_801755F0 & GFXPRINT_FLAG64)) { this->flag |= GFXPRINT_FLAG64; //? dsdx/dtdy - else + } else { this->flag &= ~GFXPRINT_FLAG64; + } } -void GfxPrint_Dtor(GfxPrint* this) -{ - +void GfxPrint_Dtor(GfxPrint* this) { } -void GfxPrint_Open(GfxPrint* this, Gfx* dlist) -{ - if (!(this->flag & GFXPRINT_OPEN)) - { +void GfxPrint_Open(GfxPrint* this, Gfx* dlist) { + if (!(this->flag & GFXPRINT_OPEN)) { this->flag |= GFXPRINT_OPEN; this->dlist = dlist; GfxPrint_InitDlist(this); - } - else + } else { osSyncPrintf("gfxprint_open:２重オープンです\n"); + } } -Gfx* GfxPrint_Close(GfxPrint* this) -{ +Gfx* GfxPrint_Close(GfxPrint* this) { Gfx* ret; this->flag &= ~GFXPRINT_OPEN; @@ -398,15 +387,13 @@ Gfx* GfxPrint_Close(GfxPrint* this) return ret; } -void GfxPrint_VPrintf(GfxPrint *this, const char *fmt, va_list args) -{ +void GfxPrint_VPrintf(GfxPrint* this, const char* fmt, va_list args) { func_800FF340(&this->callback, fmt, args); } -void GfxPrint_Printf(GfxPrint* this, const char* fmt, ...) -{ +void GfxPrint_Printf(GfxPrint* this, const char* fmt, ...) { va_list args; va_start(args, fmt); GfxPrint_VPrintf(this, fmt, args); -} \ No newline at end of file +} diff --git a/src/code/graph.c b/src/code/graph.c new file mode 100644 index 0000000000..fb3d80e069 --- /dev/null +++ b/src/code/graph.c @@ -0,0 +1,526 @@ +#include +#include +#include +#include +#include + +#define GFXPOOL_HEAD_MAGIC 0x1234 +#define GFXPOOL_TAIL_MAGIC 0x5678 + +OSTime sGraphUpdateTime; +OSTime sGraphSetTaskTime; +FaultClient sGraphFaultClient; +CfbInfo sGraphCfbInfos[3]; +FaultClient sGraphUcodeFaultClient; + +UCodeInfo D_8012D230[3] = { + { 1, D_80155F50 }, { 2, NULL }, { 3, D_801120C0 + 0xFB0 }, // D_80113070 +}; + +UCodeInfo D_8012D248[3] = { + { 1, D_80155F50 }, { 2, NULL }, { 3, D_801120C0 + 0xFB0 }, // D_80113070 +}; + +void Graph_FaultClient() { + void* nextFb; + void* newFb; + + nextFb = osViGetNextFramebuffer(); + newFb = ((u32)SysCfb_GetFbPtr(0) != (u32)nextFb) ? SysCfb_GetFbPtr(0) : SysCfb_GetFbPtr(1); + + osViSwapBuffer(newFb); + Fault_WaitForInput(); + osViSwapBuffer(nextFb); +} + +void Graph_DisassembleUCode(void* arg0) { + UCodeDisas disassembler; + + if (HREG(80) == 7 && HREG(81) != 0) { + func_800D7F5C(&disassembler); + disassembler.enableLog = HREG(83); + func_800DAC80(&disassembler, 3, D_8012D230); + func_800DAC90(&disassembler, D_80155F50); + func_800D8400(&disassembler, arg0); + HREG(93) = disassembler.dlCnt; + HREG(84) = disassembler.tri2Cnt * 2 + disassembler.tri1Cnt + (disassembler.quadCnt * 2) + disassembler.lineCnt; + HREG(85) = disassembler.vtxCnt; + HREG(86) = disassembler.spvtxCnt; + HREG(87) = disassembler.tri1Cnt; + HREG(88) = disassembler.tri2Cnt; + HREG(89) = disassembler.quadCnt; + HREG(90) = disassembler.lineCnt; + HREG(91) = disassembler.syncErr; + HREG(92) = disassembler.loaducodeCnt; + if (HREG(82) == 1 || HREG(82) == 2) { + osSyncPrintf("vtx_cnt=%d\n", disassembler.vtxCnt); + osSyncPrintf("spvtx_cnt=%d\n", disassembler.spvtxCnt); + osSyncPrintf("tri1_cnt=%d\n", disassembler.tri1Cnt); + osSyncPrintf("tri2_cnt=%d\n", disassembler.tri2Cnt); + osSyncPrintf("quad_cnt=%d\n", disassembler.quadCnt); + osSyncPrintf("line_cnt=%d\n", disassembler.lineCnt); + osSyncPrintf("sync_err=%d\n", disassembler.syncErr); + osSyncPrintf("loaducode_cnt=%d\n", disassembler.loaducodeCnt); + osSyncPrintf("dl_depth=%d\n", disassembler.dlDepth); + osSyncPrintf("dl_cnt=%d\n", disassembler.dlCnt); + } + func_800D7FC4(&disassembler); + } +} + +void Graph_UCodeFaultClient(void* arg0) { + UCodeDisas disassembler; + + func_800D7F5C(&disassembler); + disassembler.enableLog = true; + func_800DAC80(&disassembler, 3, D_8012D248); + func_800DAC90(&disassembler, D_80155F50); + func_800D8400(&disassembler, arg0); + func_800D7FC4(&disassembler); +} + +void* Graph_InitTHGA(GraphicsContext* gfxCtx) { + GfxPool* pool; + + pool = &gGfxPools[gfxCtx->gfxPoolIdx & 1]; + + pool->headMagic = GFXPOOL_HEAD_MAGIC; + pool->tailMagic = GFXPOOL_TAIL_MAGIC; + THGA_Ct(&gfxCtx->polyOpa, pool->polyOpaBuffer, sizeof(pool->polyOpaBuffer)); + THGA_Ct(&gfxCtx->polyXlu, pool->polyXluBuffer, sizeof(pool->polyXluBuffer)); + THGA_Ct(&gfxCtx->overlay, pool->overlayBuffer, sizeof(pool->overlayBuffer)); + THGA_Ct(&gfxCtx->work, pool->workBuffer, sizeof(pool->workBuffer)); + + gfxCtx->polyOpaBuffer = pool->polyOpaBuffer; + gfxCtx->polyXluBuffer = pool->polyXluBuffer; + gfxCtx->overlayBuffer = pool->overlayBuffer; + gfxCtx->workBuffer = pool->workBuffer; + + gfxCtx->curFrameBuffer = (u16*)SysCfb_GetFbPtr(gfxCtx->fbIdx % 2); + gfxCtx->unk_014 = 0; +} + +GameStateOverlay* Graph_GetNextGameState() { + void* gameStateInitFunc; + + gameStateInitFunc = func_800C546C(); + if (gameStateInitFunc == TitleSetup_Init) { + return &gGameStateOverlayTable[0]; + } + if (gameStateInitFunc == func_80801E44) { + return &gGameStateOverlayTable[1]; + } + if (gameStateInitFunc == Title_Init) { + return &gGameStateOverlayTable[2]; + } + if (gameStateInitFunc == func_800BCA64) { + return &gGameStateOverlayTable[3]; + } + if (gameStateInitFunc == Opening_Init) { + return &gGameStateOverlayTable[4]; + } + if (gameStateInitFunc == func_80811A20) { + return &gGameStateOverlayTable[5]; + } + + LOG_ADDRESS("game_init_func", gameStateInitFunc, "../graph.c", 696); + return NULL; +} + +void Graph_Init(GraphicsContext* gfxCtx) { + bzero(gfxCtx, sizeof(GraphicsContext)); + gfxCtx->gfxPoolIdx = 0; + gfxCtx->fbIdx = 0; + gfxCtx->viMode = NULL; + gfxCtx->viFeatures = gViConfigFeatures; + gfxCtx->xScale = gViConfigXScale; + gfxCtx->yScale = gViConfigYScale; + osCreateMesgQueue(&gfxCtx->queue, gfxCtx->msgBuff, ARRAY_COUNT(gfxCtx->msgBuff)); + func_800D31F0(); + Fault_AddClient(&sGraphFaultClient, Graph_FaultClient, 0, 0); +} + +void Graph_Destroy(GraphicsContext* gfxCtx) { + func_800D3210(); + Fault_RemoveClient(&sGraphFaultClient); +} + +// Close to matching, reordering at the end +#ifdef NON_MATCHING +void Graph_TaskSet00(GraphicsContext* gfxCtx) { + static u32 D_8012D260 = 0; + static s32 sGraphCfbInfoIdx = 0; + + OSTimer timer; + OSMesg msg; + OSMesgQueue* mq; + u32 temp; + OSTime time; + OSTask_t* task; + Gfx* dispRefs[3]; + OSScTask* scTask; + CfbInfo* cfb; + + mq = &gfxCtx->queue; + task = &gfxCtx->task.list.t; + scTask = &gfxCtx->task; + + D_8016A528 = osGetTime() - sGraphSetTaskTime - D_8016A558; + + osSetTimer(&timer, 140625000, 0, mq, 666); + + osRecvMesg(mq, &msg, OS_MESG_BLOCK); + osStopTimer(&timer); + if (msg == (OSMesg)666) { + osSyncPrintf(VT_FGCOL(RED)); + osSyncPrintf("RCPが帰ってきませんでした。"); // "RCP did not return." + osSyncPrintf(VT_RST); + LogUtils_LogHexDump(&HW_REG(SP_MEM_ADDR_REG, u32), 0x20); + LogUtils_LogHexDump(&DPC_START_REG, 0x20); + LogUtils_LogHexDump(gGfxSPTaskYieldBuffer, sizeof(gGfxSPTaskYieldBuffer)); + + SREG(6) = -1; + if (D_8012D260) { + temp = D_8012D260; + HREG(80) = 7; + HREG(81) = 1; + HREG(82) = 2; + D_8012D260 = temp; + Graph_DisassembleUCode(temp); + } + Fault_AddHungupAndCrashImpl("RCP is HUNG UP!!", "Oh! MY GOD!!"); + } + osRecvMesg(mq, &msg, OS_MESG_NOBLOCK); + D_8012D260 = gfxCtx->workBuffer; + if (gfxCtx->callback) { + gfxCtx->callback(gfxCtx, gfxCtx->callbackParam); + } + + time = osGetTime(); + if (D_8016A550) { + D_8016A558 = (D_8016A558 + time) - D_8016A550; + D_8016A550 = time; + } + D_8016A520 = D_8016A558; + D_8016A558 = 0; + sGraphSetTaskTime = osGetTime(); + + task->type = M_GFXTASK; + task->flags = OS_SC_DRAM_DLIST; + task->ucode_boot = SysUcode_GetUCodeBoot(); + task->ucode_boot_size = SysUcode_GetUcodeBootSize(); + task->ucode = SysUcode_GetUcode(); + task->ucode_data = SysUcode_GetUcodeData(); + task->ucode_size = 0x1000; + task->ucode_data_size = 0x800; + task->dram_stack = gGfxSPTaskStack; + task->dram_stack_size = sizeof(gGfxSPTaskStack); + task->output_buff = gGfxSPTaskOutputBuffer; + task->output_buff_size = gGfxSPTaskYieldBuffer; // ?? + task->data_ptr = gfxCtx->workBuffer; + + Graph_OpenDisps(dispRefs, gfxCtx, "../graph.c", 828); + task->data_size = (u32)gfxCtx->work.p - (u32)gfxCtx->workBuffer; + Graph_CloseDisps(dispRefs, gfxCtx, "../graph.c", 830); + + task->yield_data_ptr = gGfxSPTaskYieldBuffer; + task->yield_data_size = sizeof(gGfxSPTaskYieldBuffer); + + scTask->next = NULL; + scTask->flags = OS_SC_RCP_MASK | OS_SC_SWAPBUFFER | OS_SC_LAST_TASK; + if (SREG(33) & 1) { + SREG(33) &= ~1; + scTask->flags &= ~OS_SC_SWAPBUFFER; + gfxCtx->fbIdx--; + } + + scTask->msg = NULL; + scTask->msgQ = mq; + + cfb = sGraphCfbInfos + sGraphCfbInfoIdx++; + cfb->fb1 = gfxCtx->curFrameBuffer; + cfb->swapbuffer = gfxCtx->curFrameBuffer; + cfb->viMode = gfxCtx->viMode; + cfb->features = gfxCtx->viFeatures; + cfb->xScale = gfxCtx->xScale; + cfb->yScale = gfxCtx->yScale; + cfb->unk_10 = 0; + cfb->updateRate = R_UPDATE_RATE; + + scTask->framebuffer = cfb; + sGraphCfbInfoIdx = sGraphCfbInfoIdx % ARRAY_COUNT(sGraphCfbInfos); + gfxCtx->schedMsgQ = &gSchedContext.cmdQ; + + osSendMesg(&gSchedContext.cmdQ, scTask, OS_MESG_BLOCK); + func_800C95F8(&gSchedContext); // osScKickEntryMsg +} +#else +u32 D_8012D260 = 0; +u32 sGraphCfbInfoIdx = 0; +#pragma GLOBAL_ASM("asm/non_matchings/code/graph/Graph_TaskSet00.s") +#endif + +// Very close to matching, stack usage +#ifdef NON_MATCHING +void Graph_Update(GraphicsContext* gfxCtx, GameState* gameState) { + u32 problem; // 0xC4 -> 0xD4 + Gfx* dispRefs[5]; // 0xB0 -> 0xC0 + Gfx* dispRefs2[9]; // 0x8C -> 0x9C + Gfx* dispRefs3[9]; // 0x68 -> 0x78 + u64 time; + GfxPool* pool; // 0x4C -> 0x6C + + gameState->unk_A0 = 0; + Graph_InitTHGA(gfxCtx); + + Graph_OpenDisps(dispRefs, gfxCtx, "../graph.c", 966); + gDPNoOpString(gfxCtx->work.p++, "WORK_DISP 開始", 0); + gDPNoOpString(gfxCtx->polyOpa.p++, "POLY_OPA_DISP 開始", 0); + gDPNoOpString(gfxCtx->polyXlu.p++, "POLY_XLU_DISP 開始", 0); + gDPNoOpString(gfxCtx->overlay.p++, "OVERLAY_DISP 開始", 0); + Graph_CloseDisps(dispRefs, gfxCtx, "../graph.c", 975); + + func_800C4A98(gameState); // Game_ReqPadData + func_800C4AC8(gameState); // Game_SetGameFrame + + Graph_OpenDisps(dispRefs2, gfxCtx, "../graph.c", 987); + gDPNoOpString(gfxCtx->work.p++, "WORK_DISP 終了", 0); + gDPNoOpString(gfxCtx->polyOpa.p++, "POLY_OPA_DISP 終了", 0); + gDPNoOpString(gfxCtx->polyXlu.p++, "POLY_XLU_DISP 終了", 0); + gDPNoOpString(gfxCtx->overlay.p++, "OVERLAY_DISP 終了", 0); + Graph_CloseDisps(dispRefs2, gfxCtx, "../graph.c", 996); + + Graph_OpenDisps(dispRefs3, gfxCtx, "../graph.c", 999); + gSPBranchList(gfxCtx->work.p++, gfxCtx->polyOpaBuffer); + gSPBranchList(gfxCtx->polyOpa.p++, gfxCtx->polyXluBuffer); + gSPBranchList(gfxCtx->polyXlu.p++, gfxCtx->overlayBuffer); + gDPPipeSync(gfxCtx->overlay.p++); + gDPFullSync(gfxCtx->overlay.p++); + gSPEndDisplayList(gfxCtx->overlay.p++); + Graph_CloseDisps(dispRefs3, gfxCtx, "../graph.c", 1028); + + if (HREG(80) == 10 && HREG(93) == 2) { + HREG(80) = 7; + HREG(81) = -1; + HREG(83) = HREG(92); + } + if (HREG(80) == 7 && HREG(81) != 0) { + if (HREG(82) == 3) { + Fault_AddClient(&sGraphUcodeFaultClient, Graph_UCodeFaultClient, gfxCtx->workBuffer, "do_count_fault"); + } + + Graph_DisassembleUCode(gfxCtx->workBuffer); + + if (HREG(82) == 3) { + Fault_RemoveClient(&sGraphUcodeFaultClient); + } + + if (HREG(81) < 0) { + LogUtils_LogHexDump(&HW_REG(SP_MEM_ADDR_REG, u32), 0x20); + LogUtils_LogHexDump(&DPC_START_REG, 0x20); + } + + if (HREG(81) < 0) { + HREG(81) = 0; + } + } + + problem = false; + pool = &gGfxPools[gfxCtx->gfxPoolIdx & 1]; + if (pool->headMagic != GFXPOOL_HEAD_MAGIC) { + // BUG (?) : devs might've forgotten "problem = true;" + osSyncPrintf("%c", 7); + // Dynamic area head is destroyed + osSyncPrintf(VT_COL(RED, WHITE) "ダイナミック領域先頭が破壊されています\n" VT_RST); + Fault_AddHungupAndCrash("../graph.c", 1070); + } + if (pool->tailMagic != GFXPOOL_TAIL_MAGIC) { + problem = true; + osSyncPrintf("%c", 7); + // Dynamic region tail is destroyed + osSyncPrintf(VT_COL(RED, WHITE) "ダイナミック領域末尾が破壊されています\n" VT_RST); + Fault_AddHungupAndCrash("../graph.c", 1076); + } + + if (THGA_IsCrash(&gfxCtx->polyOpa)) { + problem = true; + osSyncPrintf("%c", 7); + // Zelda 0 is dead + osSyncPrintf(VT_COL(RED, WHITE) "ゼルダ0は死んでしまった(graph_alloc is empty)\n" VT_RST); + } + if (THGA_IsCrash(&gfxCtx->polyXlu)) { + problem = true; + osSyncPrintf("%c", 7); + // Zelda 1 is dead + osSyncPrintf(VT_COL(RED, WHITE) "ゼルダ1は死んでしまった(graph_alloc is empty)\n" VT_RST); + } + if (THGA_IsCrash(&gfxCtx->overlay)) { + problem = true; + osSyncPrintf("%c", 7); + // Zelda 4 is dead + osSyncPrintf(VT_COL(RED, WHITE) "ゼルダ4は死んでしまった(graph_alloc is empty)\n" VT_RST); + } + + if (!problem) { + Graph_TaskSet00(gfxCtx); + gfxCtx->gfxPoolIdx++; + gfxCtx->fbIdx++; + } + + func_800F3054(); + time = osGetTime(); + D_8016A538 = D_8016A568; + D_8016A530 = D_8016A560; + D_8016A540 = D_8016A580; + D_8016A568 = 0; + D_8016A560 = 0; + D_8016A580 = 0; + + if (sGraphUpdateTime != 0) { + D_8016A548 = time - sGraphUpdateTime; + } + sGraphUpdateTime = time; + + if (D_8012DBC0 && (!~(gameState->input[0].padPressed | ~Z_TRIG)) && + (!~(gameState->input[0].raw.pad | ~(L_TRIG | R_TRIG)))) { + gSaveContext.game_mode = 0; + SET_NEXT_GAMESTATE(gameState, func_80801E44, char[0x240]); // TODO : SelectContext + gameState->running = false; + } + + if (D_8012DBC0 && PreNmiBuff_IsResetting(gAppNmiBufferPtr) && !gameState->unk_A0) { + // To reset mode + osSyncPrintf(VT_COL(YELLOW, BLACK) "PRE-NMIによりリセットモードに移行します\n" VT_RST); + SET_NEXT_GAMESTATE(gameState, PreNMI_Init, PreNMIContext); + gameState->running = false; + } +} +#else +#pragma GLOBAL_ASM("asm/non_matchings/code/graph/Graph_Update.s") +#endif + +void Graph_ThreadEntry(void* arg0) { + GraphicsContext gfxCtx; + GameState* gameState; + u32 size; + GameStateOverlay* nextOvl; + GameStateOverlay* ovl; + char faultMsg[0x50]; + + nextOvl = &gGameStateOverlayTable[0]; + + // Start graphic thread execution + osSyncPrintf("グラフィックスレッド実行開始\n"); + Graph_Init(&gfxCtx); + + while (nextOvl) { + ovl = nextOvl; + Overlay_LoadGameState(ovl); + + size = ovl->instanceSize; + // Class size =%d bytes + osSyncPrintf("クラスサイズ＝%dバイト\n", size); + + gameState = SystemArena_MallocDebug(size, "../graph.c", 1196); + + if (!gameState) { + // Failure to secure + osSyncPrintf("確保失敗\n"); + + sprintf(faultMsg, "CLASS SIZE= %d bytes", size); + Fault_AddHungupAndCrashImpl("GAME CLASS MALLOC FAILED", faultMsg); + } + func_800C5080(gameState, ovl->init, &gfxCtx); // Game_Ct + + while (func_800C547C(gameState)) // Game_IsGameStateRunning + { + Graph_Update(&gfxCtx, gameState); + } + + nextOvl = Graph_GetNextGameState(gameState); + func_800C5360(gameState); // Game_Dt + SystemArena_FreeDebug(gameState, "../graph.c", 1227); + Overlay_FreeGameState(ovl); + } + Graph_Destroy(&gfxCtx); + // End of graphic thread execution + osSyncPrintf("グラフィックスレッド実行終了\n"); +} + +void* Graph_Alloc(GraphicsContext* gfxCtx, size_t size) { + TwoHeadGfxArena* thga = &gfxCtx->polyOpa; + + if (HREG(59) == 1) { + osSyncPrintf("graph_alloc siz=%d thga size=%08x bufp=%08x head=%08x tail=%08x\n", size, thga->size, thga->bufp, + thga->p, thga->d); + } + return THGA_AllocEnd(&gfxCtx->polyOpa, ALIGN16(size)); +} + +void* Graph_Alloc2(GraphicsContext* gfxCtx, size_t size) { + TwoHeadGfxArena* thga = &gfxCtx->polyOpa; + + if (HREG(59) == 1) { + osSyncPrintf("graph_alloc siz=%d thga size=%08x bufp=%08x head=%08x tail=%08x\n", size, thga->size, thga->bufp, + thga->p, thga->d); + } + return THGA_AllocEnd(&gfxCtx->polyOpa, ALIGN16(size)); +} + +void Graph_OpenDisps(Gfx** dispRefs, GraphicsContext* gfxCtx, const char* file, s32 line) { + if (HREG(80) == 7 && HREG(82) != 4) { + dispRefs[0] = gfxCtx->polyOpa.p; + dispRefs[1] = gfxCtx->polyXlu.p; + dispRefs[2] = gfxCtx->overlay.p; + + gDPNoOpOpenDisp(gfxCtx->polyOpa.p++, file, line); + gDPNoOpOpenDisp(gfxCtx->polyXlu.p++, file, line); + gDPNoOpOpenDisp(gfxCtx->overlay.p++, file, line); + } +} + +void Graph_CloseDisps(Gfx** dispRefs, GraphicsContext* gfxCtx, const char* file, s32 line) { + if (HREG(80) == 7 && HREG(82) != 4) { + if (dispRefs[0] + 1 == gfxCtx->polyOpa.p) { + gfxCtx->polyOpa.p = dispRefs[0]; + } else { + gDPNoOpCloseDisp(gfxCtx->polyOpa.p++, file, line); + } + + if (dispRefs[1] + 1 == gfxCtx->polyXlu.p) { + gfxCtx->polyXlu.p = dispRefs[1]; + } else { + gDPNoOpCloseDisp(gfxCtx->polyXlu.p++, file, line); + } + + if (dispRefs[2] + 1 == gfxCtx->overlay.p) { + gfxCtx->overlay.p = dispRefs[2]; + } else { + gDPNoOpCloseDisp(gfxCtx->overlay.p++, file, line); + } + } +} + +Gfx* Graph_GfxPlusOne(Gfx* gfx) { + return gfx + 1; +} + +Gfx* Graph_BranchDlist(Gfx* gfx, Gfx* dst) { + gSPBranchList(gfx, dst); + return dst; +} + +void* Graph_DlistAlloc(Gfx** gfx, u32 size) { + u8* ptr; + Gfx* dst; + + size = ((size + 7) & ~7), + + ptr = *gfx + 1; + + dst = (Gfx*)(ptr + size); + gSPBranchList(*gfx, dst); + + *gfx = dst; + return ptr; +} diff --git a/src/code/irqmgr.c b/src/code/irqmgr.c index eb7eb780b1..35be0e3535 100644 --- a/src/code/irqmgr.c +++ b/src/code/irqmgr.c @@ -6,18 +6,17 @@ volatile OSTime sIrqMgrResetTime = 0; volatile OSTime sIrqMgrRetraceTime = 0; u32 sIrqMgrRetraceCount = 0; -#define RETRACE_MSG 666 -#define PRE_NMI_MSG 669 -#define PRENMI450_MSG 671 -#define PRENMI480_MSG 672 -#define PRENMI500_MSG 673 +#define RETRACE_MSG 666 +#define PRE_NMI_MSG 669 +#define PRENMI450_MSG 671 +#define PRENMI480_MSG 672 +#define PRENMI500_MSG 673 -#define STATUS_IDLE 0 -#define STATUS_PRENMI 1 -#define STATUS_NMI 2 +#define STATUS_IDLE 0 +#define STATUS_PRENMI 1 +#define STATUS_NMI 2 -void IrqMgr_AddClient(IrqMgr* this, IrqMgrClient* c, OSMesgQueue* msgQ) -{ +void IrqMgr_AddClient(IrqMgr* this, IrqMgrClient* c, OSMesgQueue* msgQ) { u32 prevMask; LogUtils_CheckNullPointer("this", this, "../irqmgr.c", 96); @@ -32,15 +31,16 @@ void IrqMgr_AddClient(IrqMgr* this, IrqMgrClient* c, OSMesgQueue* msgQ) osSetIntMask(prevMask); - if (this->resetStatus > STATUS_IDLE) - osSendMesg(c->queue, (OSMesg)&this->prenmiMsg, OS_MESG_NOBLOCK); + if (this->resetStatus > STATUS_IDLE) { + osSendMesg(c->queue, (OSMesg) & this->prenmiMsg, OS_MESG_NOBLOCK); + } - if (this->resetStatus >= STATUS_NMI) - osSendMesg(c->queue, (OSMesg)&this->nmiMsg, OS_MESG_NOBLOCK); + if (this->resetStatus >= STATUS_NMI) { + osSendMesg(c->queue, (OSMesg) & this->nmiMsg, OS_MESG_NOBLOCK); + } } -void IrqMgr_RemoveClient(IrqMgr* this, IrqMgrClient* c) -{ +void IrqMgr_RemoveClient(IrqMgr* this, IrqMgrClient* c) { IrqMgrClient* iter; IrqMgrClient* lastIter; u32 prevMask; @@ -50,17 +50,16 @@ void IrqMgr_RemoveClient(IrqMgr* this, IrqMgrClient* c) LogUtils_CheckNullPointer("this", this, "../irqmgr.c", 129); LogUtils_CheckNullPointer("c", c, "../irqmgr.c", 130); - + prevMask = osSetIntMask(1); - while (iter) - { - if (iter == c) - { - if (lastIter) + while (iter) { + if (iter == c) { + if (lastIter) { lastIter->prev = c->prev; - else + } else { this->clients = c->prev; + } break; } lastIter = iter; @@ -70,160 +69,150 @@ void IrqMgr_RemoveClient(IrqMgr* this, IrqMgrClient* c) osSetIntMask(prevMask); } -void IrqMgr_SendMesgForClient(IrqMgr* this, OSMesg msg) -{ +void IrqMgr_SendMesgForClient(IrqMgr* this, OSMesg msg) { IrqMgrClient* iter; iter = this->clients; - while(iter) - { - if (iter->queue->validCount >= iter->queue->msgCount) - //irqmgr_SendMesgForClient: Message queue is overflowing mq=%08x cnt=%d - osSyncPrintf(VT_COL(RED, WHITE) "irqmgr_SendMesgForClient:メッセージキューがあふれています mq=%08x cnt=%d\n" VT_RST, iter->queue, iter->queue->validCount); - else + while (iter) { + if (iter->queue->validCount >= iter->queue->msgCount) { + // irqmgr_SendMesgForClient: Message queue is overflowing mq=%08x cnt=%d + osSyncPrintf( + VT_COL(RED, WHITE) "irqmgr_SendMesgForClient:メッセージキューがあふれています mq=%08x cnt=%d\n" VT_RST, + iter->queue, iter->queue->validCount); + } else { osSendMesg(iter->queue, msg, OS_MESG_NOBLOCK); - + } + iter = iter->prev; } } -void IrqMgr_JamMesgForClient(IrqMgr* this, OSMesg msg) -{ +void IrqMgr_JamMesgForClient(IrqMgr* this, OSMesg msg) { IrqMgrClient* iter; iter = this->clients; - while(iter) - { - if (iter->queue->validCount >= iter->queue->msgCount) - //irqmgr_JamMesgForClient: Message queue is overflowing mq=%08x cnt=%d - osSyncPrintf(VT_COL(RED, WHITE) "irqmgr_JamMesgForClient:メッセージキューがあふれています mq=%08x cnt=%d\n" VT_RST, iter->queue, iter->queue->validCount); - else - //mistake? the function's name suggests it would use osJamMesg + while (iter) { + if (iter->queue->validCount >= iter->queue->msgCount) { + // irqmgr_JamMesgForClient: Message queue is overflowing mq=%08x cnt=%d + osSyncPrintf( + VT_COL(RED, WHITE) "irqmgr_JamMesgForClient:メッセージキューがあふれています mq=%08x cnt=%d\n" VT_RST, + iter->queue, iter->queue->validCount); + } else { + // mistake? the function's name suggests it would use osJamMesg osSendMesg(iter->queue, msg, OS_MESG_NOBLOCK); - + } + iter = iter->prev; } } -void IrqMgr_HandlePreNMI(IrqMgr *this) -{ - u64 temp = STATUS_PRENMI; //required to match +void IrqMgr_HandlePreNMI(IrqMgr* this) { + u64 temp = STATUS_PRENMI; // required to match gIrqMgrResetStatus = temp; this->resetStatus = STATUS_PRENMI; sIrqMgrResetTime = this->resetTime = osGetTime(); osSetTimer(&this->timer, OS_USEC_TO_CYCLES(450000), 0ull, &this->queue, (OSMesg)PRENMI450_MSG); - IrqMgr_JamMesgForClient(this, (OSMesg)&this->prenmiMsg); + IrqMgr_JamMesgForClient(this, (OSMesg) & this->prenmiMsg); } -void IrqMgr_CheckStack() -{ - osSyncPrintf("irqmgr.c: PRENMIから0.5秒経過\n"); //0.5 seconds after PRENMI - if (StackCheck_Check(NULL) == 0) - { - osSyncPrintf("スタックは大丈夫みたいです\n"); //The stack looks ok - } - else - { +void IrqMgr_CheckStack() { + osSyncPrintf("irqmgr.c: PRENMIから0.5秒経過\n"); // 0.5 seconds after PRENMI + if (StackCheck_Check(NULL) == 0) { + osSyncPrintf("スタックは大丈夫みたいです\n"); // The stack looks ok + } else { osSyncPrintf("%c", 7); osSyncPrintf(VT_FGCOL(RED)); - osSyncPrintf("スタックがオーバーフローしたか危険な状態です\n"); //Stack overflow or dangerous - osSyncPrintf("早々にスタックサイズを増やすか、スタックを消費しないようにしてください\n"); //Increase stack size early or don't consume stack + osSyncPrintf("スタックがオーバーフローしたか危険な状態です\n"); // Stack overflow or dangerous + osSyncPrintf( + "早々にスタックサイズを増やすか、スタックを消費しないようにしてください\n"); // Increase stack size early or + // don't consume stack osSyncPrintf(VT_RST); } } -void IrqMgr_HandlePRENMI450(IrqMgr* this) -{ - u64 temp = STATUS_NMI; //required to match +void IrqMgr_HandlePRENMI450(IrqMgr* this) { + u64 temp = STATUS_NMI; // required to match gIrqMgrResetStatus = temp; this->resetStatus = STATUS_NMI; osSetTimer(&this->timer, OS_USEC_TO_CYCLES(30000), 0ull, &this->queue, (OSMesg)PRENMI480_MSG); - IrqMgr_SendMesgForClient(this, (OSMesg)&this->nmiMsg); + IrqMgr_SendMesgForClient(this, (OSMesg) & this->nmiMsg); } -void IrqMgr_HandlePRENMI480(IrqMgr* this) -{ +void IrqMgr_HandlePRENMI480(IrqMgr* this) { u32 ret; osSetTimer(&this->timer, OS_USEC_TO_CYCLES(20000), 0ull, &this->queue, (OSMesg)PRENMI500_MSG); - ret = func_801031F0(); //osAfterPreNMI - if (ret) - { - osSyncPrintf("osAfterPreNMIが %d を返しました！？\n", ret); //osAfterPreNMI returned %d !? + ret = func_801031F0(); // osAfterPreNMI + if (ret) { + osSyncPrintf("osAfterPreNMIが %d を返しました！？\n", ret); // osAfterPreNMI returned %d !? osSetTimer(&this->timer, OS_USEC_TO_CYCLES(1000), 0ull, &this->queue, (OSMesg)PRENMI480_MSG); } } -void IrqMgr_HandlePRENMI500(IrqMgr* this) -{ +void IrqMgr_HandlePRENMI500(IrqMgr* this) { IrqMgr_CheckStack(); } -void IrqMgr_HandleRetrace(IrqMgr* this) -{ - if (sIrqMgrRetraceTime == 0ull) - { - if (this->retraceTime == 0) +void IrqMgr_HandleRetrace(IrqMgr* this) { + if (sIrqMgrRetraceTime == 0ull) { + if (this->retraceTime == 0) { this->retraceTime = osGetTime(); - else + } else { sIrqMgrRetraceTime = osGetTime() - this->retraceTime; + } } sIrqMgrRetraceCount++; - IrqMgr_SendMesgForClient(this, (OSMesg)&this->retraceMsg); + IrqMgr_SendMesgForClient(this, (OSMesg) & this->retraceMsg); } -void IrqMgr_ThreadEntry(void* arg0) -{ +void IrqMgr_ThreadEntry(void* arg0) { OSMesg msg; IrqMgr* this; u8 exit; this = (IrqMgr*)arg0; msg = 0; - osSyncPrintf("ＩＲＱマネージャスレッド実行開始\n"); //Start IRQ manager thread execution + osSyncPrintf("ＩＲＱマネージャスレッド実行開始\n"); // Start IRQ manager thread execution exit = false; - while (!exit) - { + while (!exit) { osRecvMesg(&this->queue, &msg, OS_MESG_BLOCK); - switch ((u32)msg) - { + switch ((u32)msg) { case RETRACE_MSG: IrqMgr_HandleRetrace(this); break; case PRE_NMI_MSG: osSyncPrintf("PRE_NMI_MSG\n"); - osSyncPrintf("スケジューラ：PRE_NMIメッセージを受信\n"); //Scheduler: Receives PRE_NMI message + osSyncPrintf("スケジューラ：PRE_NMIメッセージを受信\n"); // Scheduler: Receives PRE_NMI message IrqMgr_HandlePreNMI(this); break; case PRENMI450_MSG: osSyncPrintf("PRENMI450_MSG\n"); - osSyncPrintf("スケジューラ：PRENMI450メッセージを受信\n"); //Scheduler: Receives PRENMI450 message + osSyncPrintf("スケジューラ：PRENMI450メッセージを受信\n"); // Scheduler: Receives PRENMI450 message IrqMgr_HandlePRENMI450(this); break; case PRENMI480_MSG: osSyncPrintf("PRENMI480_MSG\n"); - osSyncPrintf("スケジューラ：PRENMI480メッセージを受信\n"); //Scheduler: Receives PRENMI480 message + osSyncPrintf("スケジューラ：PRENMI480メッセージを受信\n"); // Scheduler: Receives PRENMI480 message IrqMgr_HandlePRENMI480(this); break; case PRENMI500_MSG: osSyncPrintf("PRENMI500_MSG\n"); - osSyncPrintf("スケジューラ：PRENMI500メッセージを受信\n"); //Scheduler: Receives PRENMI500 message + osSyncPrintf("スケジューラ：PRENMI500メッセージを受信\n"); // Scheduler: Receives PRENMI500 message exit = true; IrqMgr_HandlePRENMI500(this); break; default: - osSyncPrintf("irqmgr.c:予期しないメッセージを受け取りました(%08x)\n", msg); //Unexpected message received + osSyncPrintf("irqmgr.c:予期しないメッセージを受け取りました(%08x)\n", + msg); // Unexpected message received break; - } } - osSyncPrintf("ＩＲＱマネージャスレッド実行終了\n"); //End of IRQ manager thread execution + osSyncPrintf("ＩＲＱマネージャスレッド実行終了\n"); // End of IRQ manager thread execution } -void IrqMgr_Create(IrqMgr* this, void* stack, OSPri pri, u8 retraceCount) -{ +void IrqMgr_Create(IrqMgr* this, void* stack, OSPri pri, u8 retraceCount) { LogUtils_CheckNullPointer("this", this, "../irqmgr.c", 346); LogUtils_CheckNullPointer("stack", stack, "../irqmgr.c", 347); this->clients = NULL; diff --git a/src/code/listalloc.c b/src/code/listalloc.c index 20cc88e1c1..b7d97281c7 100644 --- a/src/code/listalloc.c +++ b/src/code/listalloc.c @@ -1,64 +1,66 @@ #include -ListAlloc* ListAlloc_Init(ListAlloc* this) -{ +ListAlloc* ListAlloc_Init(ListAlloc* this) { this->prev = NULL; this->next = NULL; return this; } -void* ListAlloc_Alloc(ListAlloc* this, u32 size) -{ +void* ListAlloc_Alloc(ListAlloc* this, u32 size) { ListAlloc* ptr; ListAlloc* next; - + ptr = SystemArena_MallocDebug(size + sizeof(ListAlloc), "../listalloc.c", 40); - if (!ptr) + if (!ptr) { return NULL; + } next = this->next; - if (next) + if (next) { next->next = ptr; - + } + ptr->prev = next; ptr->next = NULL; this->next = ptr; - if (!this->prev) + if (!this->prev) { this->prev = ptr; + } return (u8*)ptr + sizeof(ListAlloc); } -void ListAlloc_Free(ListAlloc* this, void* data) -{ +void ListAlloc_Free(ListAlloc* this, void* data) { ListAlloc* ptr; ptr = &((ListAlloc*)data)[-1]; - if (ptr->prev) + if (ptr->prev) { ptr->prev->next = ptr->next; + } - if (ptr->next) + if (ptr->next) { ptr->next->prev = ptr->prev; + } - if (this->prev == ptr) + if (this->prev == ptr) { this->prev = ptr->next; + } - if (this->next == ptr) + if (this->next == ptr) { this->next = ptr->prev; + } SystemArena_FreeDebug(ptr, "../listalloc.c", 72); } -void ListAlloc_FreeAll(ListAlloc* this) -{ +void ListAlloc_FreeAll(ListAlloc* this) { ListAlloc* iter; iter = this->prev; - while (iter) - { + while (iter) { ListAlloc_Free(this, (u8*)iter + sizeof(ListAlloc)); iter = this->prev; } diff --git a/src/code/loadfragment2.c b/src/code/loadfragment2.c index b47bae4c11..2a304bbeb8 100644 --- a/src/code/loadfragment2.c +++ b/src/code/loadfragment2.c @@ -1,20 +1,18 @@ #include -void *Overlay_AllocateAndLoad(u32 vRomStart, u32 vRomEnd, void *vRamStart, void *vRamEnd) -{ - void *allocatedVRamAddr; +void* Overlay_AllocateAndLoad(u32 vRomStart, u32 vRomEnd, void* vRamStart, void* vRamEnd) { + void* allocatedVRamAddr; allocatedVRamAddr = SystemArena_MallocRDebug((s32)vRamEnd - (s32)vRamStart, "../loadfragment2.c", 31); - if(gOverlayLogSeverity >= 3) - { - osSyncPrintf("OVL:SPEC(%08x-%08x) REAL(%08x-%08x) OFFSET(%08x)\n", vRamStart, vRamEnd, allocatedVRamAddr, ((u32)vRamEnd - (u32)vRamStart) + (u32)allocatedVRamAddr, (u32)vRamStart - (u32)allocatedVRamAddr); + if (gOverlayLogSeverity >= 3) { + osSyncPrintf("OVL:SPEC(%08x-%08x) REAL(%08x-%08x) OFFSET(%08x)\n", vRamStart, vRamEnd, allocatedVRamAddr, + ((u32)vRamEnd - (u32)vRamStart) + (u32)allocatedVRamAddr, (u32)vRamStart - (u32)allocatedVRamAddr); } - if(allocatedVRamAddr != NULL) - { + if (allocatedVRamAddr != NULL) { Overlay_Load(vRomStart, vRomEnd, vRamStart, vRamEnd, allocatedVRamAddr); } return allocatedVRamAddr; -} \ No newline at end of file +} diff --git a/src/code/logseverity.c b/src/code/logseverity.c index b62552e1b7..25bc68c46f 100644 --- a/src/code/logseverity.c +++ b/src/code/logseverity.c @@ -1,3 +1,3 @@ #include -s32 gOverlayLogSeverity = 2; \ No newline at end of file +s32 gOverlayLogSeverity = 2; diff --git a/src/code/main.c b/src/code/main.c index f69f62317d..5e2b9a89e9 100644 --- a/src/code/main.c +++ b/src/code/main.c @@ -7,7 +7,7 @@ u32 gScreenWidth = SCREEN_WIDTH; u32 gScreenHeight = SCREEN_HEIGHT; u32 gSystemHeapSize = 0; -u8* gAppNmiBufferPtr; +PreNmiBuff* gAppNmiBufferPtr; SchedContext gSchedContext; PadMgr gPadMgr; IrqMgr gIrqMgr; @@ -23,21 +23,19 @@ StackEntry sSchedStackInfo; StackEntry sAudioStackInfo; StackEntry sPadMgrStackInfo; StackEntry sIrqMgrStackInfo; -u8 gAudioMgr[0x298]; //type should be AudioMgr +u8 gAudioMgr[0x298]; // type should be AudioMgr OSMesgQueue sSiIntMsgQ; OSMesg sSiIntMsgBuf[1]; - -void Main_LogSystemHeap() -{ +void Main_LogSystemHeap() { osSyncPrintf(VT_FGCOL(GREEN)); - //System heap size% 08x (% dKB) Start address% 08x - osSyncPrintf("システムヒープサイズ %08x(%dKB) 開始アドレス %08x\n", gSystemHeapSize, gSystemHeapSize / 1024, gSystemHeap); + // System heap size% 08x (% dKB) Start address% 08x + osSyncPrintf("システムヒープサイズ %08x(%dKB) 開始アドレス %08x\n", gSystemHeapSize, gSystemHeapSize / 1024, + gSystemHeap); osSyncPrintf(VT_RST); } -void Main(void* arg0) -{ +void Main(void* arg0) { IrqMgrClient irqClient; OSMesgQueue irqMgrMsgQ; OSMesg irqMgrMsgBuf[60]; @@ -45,27 +43,24 @@ void Main(void* arg0) u32 fb; s32 debugHeap; s32 debugHeapSize; - s16 *msg; + s16* msg; - osSyncPrintf("mainproc 実行開始\n"); //Start running + osSyncPrintf("mainproc 実行開始\n"); // Start running gScreenWidth = SCREEN_WIDTH; gScreenHeight = SCREEN_HEIGHT; - gAppNmiBufferPtr = osAppNmiBuffer; - func_8007BE60(gAppNmiBufferPtr); + gAppNmiBufferPtr = (PreNmiBuff*)osAppNmiBuffer; + PreNmiBuff_Init(gAppNmiBufferPtr); Fault_Start(); SysCfb_Init(0); sysHeap = (u32)gSystemHeap; fb = SysCfb_GetFbPtr(0); gSystemHeapSize = (fb - sysHeap); - osSyncPrintf("システムヒープ初期化 %08x-%08x %08x\n", sysHeap, fb, gSystemHeapSize); //System heap initalization - SystemHeap_Init(sysHeap, gSystemHeapSize); //initializes the system heap - if (osMemSize >= 0x800000U) - { + osSyncPrintf("システムヒープ初期化 %08x-%08x %08x\n", sysHeap, fb, gSystemHeapSize); // System heap initalization + SystemHeap_Init(sysHeap, gSystemHeapSize); // initializes the system heap + if (osMemSize >= 0x800000U) { debugHeap = SysCfb_GetFbEnd(); - debugHeapSize = (s32) (0x80600000 - debugHeap); - } - else - { + debugHeapSize = (s32)(0x80600000 - debugHeap); + } else { debugHeapSize = 0x400; debugHeap = SystemArena_MallocDebug(debugHeapSize, "../main.c", 0x235); } @@ -81,43 +76,42 @@ void Main(void* arg0) Main_LogSystemHeap(); osCreateMesgQueue(&irqMgrMsgQ, irqMgrMsgBuf, 0x3c); - StackCheck_Init(&sIrqMgrStackInfo, sIrqMgrStack, sIrqMgrStack+sizeof(sIrqMgrStack), 0, 0x100, "irqmgr"); + StackCheck_Init(&sIrqMgrStackInfo, sIrqMgrStack, sIrqMgrStack + sizeof(sIrqMgrStack), 0, 0x100, "irqmgr"); IrqMgr_Create(&gIrqMgr, &sGraphStackInfo, 0x11, 1); - osSyncPrintf("タスクスケジューラの初期化\n"); //Initialize the task scheduler - StackCheck_Init(&sSchedStackInfo, sSchedStack, sSchedStack+sizeof(sSchedStack), 0, 0x100, "sched"); + osSyncPrintf("タスクスケジューラの初期化\n"); // Initialize the task scheduler + StackCheck_Init(&sSchedStackInfo, sSchedStack, sSchedStack + sizeof(sSchedStack), 0, 0x100, "sched"); func_800C9874(&gSchedContext, &sAudioStack, 0xf, D_80013960, 1, &gIrqMgr); IrqMgr_AddClient(&gIrqMgr, &irqClient, &irqMgrMsgQ); - StackCheck_Init(&sAudioStackInfo, sAudioStack, sAudioStack+sizeof(sAudioStack), 0, 0x100, "audio"); - func_800C3FEC(&gAudioMgr, sAudioStack+sizeof(sAudioStack), 0xc, 0xa, &gSchedContext, &gIrqMgr); + StackCheck_Init(&sAudioStackInfo, sAudioStack, sAudioStack + sizeof(sAudioStack), 0, 0x100, "audio"); + func_800C3FEC(&gAudioMgr, sAudioStack + sizeof(sAudioStack), 0xc, 0xa, &gSchedContext, &gIrqMgr); - StackCheck_Init(&sPadMgrStackInfo, sPadMgrStack, sPadMgrStack+sizeof(sPadMgrStack), 0, 0x100, "padmgr"); + StackCheck_Init(&sPadMgrStackInfo, sPadMgrStack, sPadMgrStack + sizeof(sPadMgrStack), 0, 0x100, "padmgr"); PadMgr_Init(&gPadMgr, &sSiIntMsgQ, &gIrqMgr, 7, 0xe, &sIrqMgrStack); func_800C3FC4(&gAudioMgr); - StackCheck_Init(&sGraphStackInfo, sGraphStack, sGraphStack+sizeof(sGraphStack), 0, 0x100, "graph"); - osCreateThread(&sGraphThread, 4, Graph_ThreadEntry, arg0, sGraphStack+sizeof(sGraphStack), 0xb); + StackCheck_Init(&sGraphStackInfo, sGraphStack, sGraphStack + sizeof(sGraphStack), 0, 0x100, "graph"); + osCreateThread(&sGraphThread, 4, Graph_ThreadEntry, arg0, sGraphStack + sizeof(sGraphStack), 0xb); osStartThread(&sGraphThread); osSetThreadPri(0, 0xf); - while (true) - { + while (true) { msg = NULL; osRecvMesg(&irqMgrMsgQ, &msg, OS_MESG_BLOCK); - if (msg == NULL) + if (msg == NULL) { break; - if (*msg == OS_SC_PRE_NMI_MSG) - { - osSyncPrintf("main.c: リセットされたみたいだよ\n"); //Looks like it's been reset - func_8007BED4(gAppNmiBufferPtr); + } + if (*msg == OS_SC_PRE_NMI_MSG) { + osSyncPrintf("main.c: リセットされたみたいだよ\n"); // Looks like it's been reset + PreNmiBuff_SetReset(gAppNmiBufferPtr); } } - osSyncPrintf("mainproc 後始末\n"); //Cleanup + osSyncPrintf("mainproc 後始末\n"); // Cleanup osDestroyThread(&sGraphThread); func_800FBFD8(); - osSyncPrintf("mainproc 実行終了\n"); //End of execution + osSyncPrintf("mainproc 実行終了\n"); // End of execution } diff --git a/src/code/padmgr.c b/src/code/padmgr.c index 0c0201c631..dc3e9c472a 100644 --- a/src/code/padmgr.c +++ b/src/code/padmgr.c @@ -1,130 +1,125 @@ #include #include +#include #include #include #include -OSMesgQueue* PadMgr_LockGetControllerQueue(PadMgr* padmgr) -{ +s32 D_8012D280 = 1; + +OSMesgQueue* PadMgr_LockGetControllerQueue(PadMgr* padmgr) { OSMesgQueue* ctrlrqueue = NULL; - if (D_8012D280 > 2) - //EUC-JP: ロック待ち | Waiting for lock - osSyncPrintf("%2d %d serialMsgQロック待ち %08x %08x %08x\n", osGetThreadId(NULL), padmgr->queue1.validCount, padmgr, &padmgr->queue1, &ctrlrqueue); + if (D_8012D280 > 2) { + // EUC-JP: ロック待ち | Waiting for lock + osSyncPrintf("%2d %d serialMsgQロック待ち %08x %08x %08x\n", osGetThreadId(NULL), + padmgr->queue1.validCount, padmgr, &padmgr->queue1, &ctrlrqueue); + } osRecvMesg(&padmgr->queue1, &ctrlrqueue, OS_MESG_BLOCK); - if (D_8012D280 > 2) - //EUC-JP: をロックしました | Locked - osSyncPrintf("%2d %d serialMsgQをロックしました %08x\n", osGetThreadId(NULL), padmgr->queue1.validCount, ctrlrqueue); + if (D_8012D280 > 2) { + // EUC-JP: をロックしました | Locked + osSyncPrintf("%2d %d serialMsgQをロックしました %08x\n", osGetThreadId(NULL), + padmgr->queue1.validCount, ctrlrqueue); + } return ctrlrqueue; } -void PadMgr_UnlockReleaseControllerQueue(PadMgr* padmgr, OSMesgQueue* ctrlrqueue) -{ - if (D_8012D280 > 2) - //EUC-JP: ロック解除します | Unlock - osSyncPrintf("%2d %d serialMsgQロック解除します %08x %08x %08x\n", osGetThreadId(NULL), padmgr->queue1.validCount, padmgr, &padmgr->queue1, ctrlrqueue); +void PadMgr_UnlockReleaseControllerQueue(PadMgr* padmgr, OSMesgQueue* ctrlrqueue) { + if (D_8012D280 > 2) { + // EUC-JP: ロック解除します | Unlock + osSyncPrintf("%2d %d serialMsgQロック解除します %08x %08x %08x\n", osGetThreadId(NULL), + padmgr->queue1.validCount, padmgr, &padmgr->queue1, ctrlrqueue); + } osSendMesg(&padmgr->queue1, ctrlrqueue, OS_MESG_BLOCK); - if (D_8012D280 > 2) - //EUC-JP: ロック解除しました | Unlocked - osSyncPrintf("%2d %d serialMsgQロック解除しました %08x %08x %08x\n", osGetThreadId(NULL), padmgr->queue1.validCount, padmgr, &padmgr->queue1, ctrlrqueue); + if (D_8012D280 > 2) { + // EUC-JP: ロック解除しました | Unlocked + osSyncPrintf("%2d %d serialMsgQロック解除しました %08x %08x %08x\n", osGetThreadId(NULL), + padmgr->queue1.validCount, padmgr, &padmgr->queue1, ctrlrqueue); + } } -void PadMgr_Lock2(PadMgr* padmgr) -{ - osRecvMesg(&padmgr->queue2, 0, OS_MESG_BLOCK); +void PadMgr_Lock2(PadMgr* padmgr) { + osRecvMesg(&padmgr->queue2, NULL, OS_MESG_BLOCK); } -void PadMgr_Unlock2(PadMgr* padmgr) -{ - osSendMesg(&padmgr->queue2, 0, OS_MESG_BLOCK); +void PadMgr_Unlock2(PadMgr* padmgr) { + osSendMesg(&padmgr->queue2, NULL, OS_MESG_BLOCK); } #ifdef NON_MATCHING -void func_800C740C(PadMgr* padmgr) -{ +// regalloc and minor ordering differences +void func_800C740C(PadMgr* padmgr) { + static u32 D_8012D284 = 0; + static u32 D_8016A4F0; + s32 temp; s32 var1; OSMesgQueue* ctrlrqueue; s32 var3; s32 var4; s32 i; + temp = 1; ctrlrqueue = PadMgr_LockGetControllerQueue(padmgr); var1 = 0; - for (i = 0; i < 4; i++) - { - if (padmgr->unk_2AA[i] != 0) - { - if (padmgr->pad_status[i].status & 1) - { - if (padmgr->unk_2AE[i] == 1) - { - if (padmgr->unk_2B2[i] != 0) - { - if (padmgr->unk_2B6[i] < 3) - { - osSyncPrintf(D_80145894); //"\x1b[33m" (probably formatting/debugger interface) - osSyncPrintf(D_8014589C, i + 1, D_801458B0); //"padmgr: %d[JPN]Con: ", "[JPN]Vibration pack jumble jumble" - osSyncPrintf(D_801458CC); //"\x1b[m" (probably formatting/debugger interface) - if (osSetVibration(&padmgr->unk_controller[i], 1) != 0) - { + for (i = 0; i < 4; i++) { + if (padmgr->unk_2AA[i] != 0) { + if (padmgr->pad_status[i].status & 1) { + if (padmgr->unk_2AE[i] == temp) { + if (padmgr->unk_2B2[i] != 0) { + if (padmgr->unk_2B6[i] < 3) { + osSyncPrintf(VT_FGCOL(YELLOW)); + osSyncPrintf("padmgr: %dコン: %s\n", i + 1, "振動パック ぶるぶるぶるぶる"); + osSyncPrintf(VT_RST); + + if (osSetVibration(&padmgr->unk_controller[i], temp) != 0) { padmgr->unk_2AE[i] = 0; - osSyncPrintf(D_801458D0); - osSyncPrintf(D_801458D8, i + 1, D_801458EC); //"A communication error has occurred with the vibraton pack" - osSyncPrintf(D_80145914); - } - else - { + osSyncPrintf(VT_FGCOL(YELLOW)); + osSyncPrintf("padmgr: %dコン: %s\n", i + 1, "振動パックで通信エラーが発生しました"); + osSyncPrintf(VT_RST); + } else { padmgr->unk_2B6[i] = 3; } + var1 = 1; } - } - else - { - if (padmgr->unk_2B6[i] != 0) - { - osSyncPrintf(D_80145918); - osSyncPrintf(D_80145920, i + 1, D_80145934); //"Stop vibration pack" - osSyncPrintf(D_80145944); - if (osSetVibration(&padmgr->unk_controller[i], 0) != 0) - { + } else { + if (padmgr->unk_2B6[i] != 0) { + osSyncPrintf(VT_FGCOL(YELLOW)); + osSyncPrintf("padmgr: %dコン: %s\n", i + 1, "振動パック 停止"); + osSyncPrintf(VT_RST); + + if (osSetVibration(&padmgr->unk_controller[i], 0) != 0) { padmgr->unk_2AE[i] = 0; - osSyncPrintf(D_80145948); - osSyncPrintf(D_80145950, i + 1, D_80145964); //"A communication error has occurred with the vibration pack" - osSyncPrintf(D_8014598C); - } - else - { + osSyncPrintf(VT_FGCOL(YELLOW)); + osSyncPrintf("padmgr: %dコン: %s\n", i + 1, "振動パックで通信エラーが発生しました"); + osSyncPrintf(VT_RST); + } else { padmgr->unk_2B6[i]--; } + var1 = 1; } } } - } - else - { - if (padmgr->unk_2AE[i] != 0) - { - if (padmgr->unk_2AE[i] == 1) - { - osSyncPrintf(D_80145990); - osSyncPrintf(D_80145998, i + 1, D_801459AC); //"Vibration pack seems to be pulled out" - osSyncPrintf(D_801459CC); + } else { + if (padmgr->unk_2AE[i] != 0) { + if (padmgr->unk_2AE[i] == 1) { + osSyncPrintf(VT_FGCOL(YELLOW)); + osSyncPrintf("padmgr: %dコン: %s\n", i + 1, "振動パックが抜かれたようです"); + osSyncPrintf(VT_RST); padmgr->unk_2AE[i] = 0; - } - else - { - osSyncPrintf(D_801459D0); - osSyncPrintf(D_80145A24); - osSyncPrintf(D_801459D8, i + 1, D_801459EC); //"It seems that a controller pack that is not a vibration pack was pulled out" + } else { + osSyncPrintf(VT_FGCOL(YELLOW)); + osSyncPrintf("padmgr: %dコン: %s\n", i + 1, + "振動パックではないコントローラパックが抜かれたようです"); + osSyncPrintf(VT_RST); padmgr->unk_2AE[i] = 0; } } @@ -132,35 +127,26 @@ void func_800C740C(PadMgr* padmgr) } } - if (!var1) - { + if (!var1) { var3 = D_8016A4F0 % 4; - if ((padmgr->unk_2AA[var3] != 0) && (padmgr->pad_status[var3].status & 1) && (padmgr->unk_2AE[var3] != 1)) - { + if ((padmgr->unk_2AA[var3] != 0) && (padmgr->pad_status[var3].status & 1) && (padmgr->unk_2AE[var3] != 1)) { var4 = osProbeVibrationPack(ctrlrqueue, &padmgr->unk_controller[var3], var3); - if (var4 == 0) - { + if (var4 == 0) { padmgr->unk_2AE[var3] = 1; osSetVibration(&padmgr->unk_controller[var3], 1); osSetVibration(&padmgr->unk_controller[var3], 0); - osSyncPrintf(D_80145A28); - osSyncPrintf(D_80145A30, var3 + 1, D_80145A44); //"Recognized vibration pack" - osSyncPrintf(D_80145A60); - } - else if (var4 == 11) - { + osSyncPrintf(VT_FGCOL(YELLOW)); + osSyncPrintf("padmgr: %dコン: %s\n", var3 + 1, "振動パックを認識しました"); + osSyncPrintf(VT_RST); + } else if (var4 == 11) { padmgr->unk_2AE[var3] = 2; - } - else if (var4 == 4) - { - LogUtils_LogThreadId(D_80145A64, 282); - ++D_8012D284; - osSyncPrintf(D_80145A70, D_8012D284); //"++errcnt = %d" - osSyncPrintf(D_80145A80); - osSyncPrintf(D_80145A88, var3 + 1, D_80145A9C); //"Controller pack communication error" - osSyncPrintf(D_80145ABC); + } else if (var4 == 4) { + LOG_NUM("++errcnt", ++D_8012D284, "../padmgr.c", 282); + osSyncPrintf(VT_FGCOL(YELLOW)); + osSyncPrintf("padmgr: %dコン: %s\n", var3 + 1, "コントローラパックの通信エラー"); + osSyncPrintf(VT_RST); } } } @@ -169,27 +155,25 @@ void func_800C740C(PadMgr* padmgr) PadMgr_UnlockReleaseControllerQueue(padmgr, ctrlrqueue); } #else +u32 D_8012D284 = 0; +u32 D_8016A4F0; #pragma GLOBAL_ASM("asm/non_matchings/code/padmgr/func_800C740C.s") #endif -//func_800A2300 in 1.0 -void func_800C7818(PadMgr* padmgr) -{ +// func_800A2300 in 1.0 +void func_800C7818(PadMgr* padmgr) { s32 i; OSMesgQueue* ctrlrqueue; ctrlrqueue = PadMgr_LockGetControllerQueue(padmgr); - for (i = 0; i < 4; i++) - { - if (osProbeVibrationPack(ctrlrqueue, &padmgr->unk_controller[i], i) == 0) - { - if ((gFaultStruct.msgId == 0) && (padmgr->unk_45D != 0)) - { - osSyncPrintf("\x1b[33m"); - //EUC-JP: コン | 'Con'? , EUC-JP: 振動パック 停止 | Stop vibration pack + for (i = 0; i < 4; i++) { + if (osProbeVibrationPack(ctrlrqueue, &padmgr->unk_controller[i], i) == 0) { + if ((gFaultStruct.msgId == 0) && (padmgr->unk_45D != 0)) { + osSyncPrintf(VT_FGCOL(YELLOW)); + // EUC-JP: コン | 'Con'? , EUC-JP: 振動パック 停止 | Stop vibration pack osSyncPrintf("padmgr: %dコン: %s\n", i + 1, "振動パック 停止"); - osSyncPrintf("\x1b[m"); + osSyncPrintf(VT_RST); } osSetVibration(&padmgr->unk_controller[i], 0); @@ -199,21 +183,19 @@ void func_800C7818(PadMgr* padmgr) PadMgr_UnlockReleaseControllerQueue(padmgr, ctrlrqueue); } -void func_800C7928(PadMgr* padmgr) -{ +void func_800C7928(PadMgr* padmgr) { padmgr->unk_45C = 3; } -void func_800C7934(PadMgr* padmgr, u32 a1, u32 a2) -{ +void func_800C7934(PadMgr* padmgr, u32 a1, u32 a2) { padmgr->unk_2B2[a1] = a2; padmgr->unk_45D = 0xF0; } #ifdef NON_MATCHING -//func_800A23CC in 1.0 -void func_800C7948(PadMgr* padmgr, u8* a1) -{ +// minor ordering difference +// 800A23CC in 1.0 +void func_800C7948(PadMgr* padmgr, u8* a1) { padmgr->unk_2B2[0] = a1[0]; padmgr->unk_2B2[1] = a1[1]; padmgr->unk_2B2[2] = a1[2]; @@ -229,46 +211,45 @@ void func_800C7948(PadMgr* padmgr, u8* a1) #pragma GLOBAL_ASM("asm/non_matchings/code/padmgr/func_800C7C14.s") -void func_800C7DD0(PadMgr* padmgr) -{ +void func_800C7DD0(PadMgr* padmgr) { osSyncPrintf("padmgr_HandlePreNMI()\n"); padmgr->unk_45E = 1; func_800C7928(padmgr); } #pragma GLOBAL_ASM("asm/non_matchings/code/padmgr/func_800C7E08.s") -//void func_800C7E08(Input*, u32); +// void func_800C7E08(Input*, u32); -//800A2918 in 1.0 -void PadMgr_Run(PadMgr* padmgr) -{ +// 800A2918 in 1.0 +void PadMgr_Run(PadMgr* padmgr) { s16* mesg; s32 bVar2; mesg = NULL; - //EUC-JP: コントローラスレッド実行開始 | Start of controller thread execution + // EUC-JP: コントローラスレッド実行開始 | Start of controller thread execution osSyncPrintf("コントローラスレッド実行開始\n"); bVar2 = 0; - while (bVar2 == 0) - { - if ((D_8012D280 > 2) && (padmgr->queue3.validCount == 0)) - //EUC-JP: コントローラスレッドイベント待ち | Waiting for controller thread event - osSyncPrintf("コントローラスレッドイベント待ち %lld\n" , (osGetTime() * 64) / 3000); + while (bVar2 == 0) { + if ((D_8012D280 > 2) && (padmgr->queue3.validCount == 0)) { + // EUC-JP: コントローラスレッドイベント待ち | Waiting for controller thread event + osSyncPrintf("コントローラスレッドイベント待ち %lld\n", (osGetTime() * 64) / 3000); + } osRecvMesg(&padmgr->queue3, &mesg, OS_MESG_BLOCK); LogUtils_CheckNullPointer("msg", mesg, "../padmgr.c", 563); - switch (*mesg) - { + switch (*mesg) { case OS_SC_RETRACE_MSG: - if (D_8012D280 > 2) + if (D_8012D280 > 2) { osSyncPrintf("padmgr_HandleRetraceMsg START %lld\n", (osGetTime() * 64) / 3000); + } func_800C7C14(padmgr); - if (D_8012D280 > 2) + if (D_8012D280 > 2) { osSyncPrintf("padmgr_HandleRetraceMsg END %lld\n", (osGetTime() * 64) / 3000); + } break; case OS_SC_PRE_NMI_MSG: @@ -281,14 +262,13 @@ void PadMgr_Run(PadMgr* padmgr) } IrqMgr_RemoveClient(padmgr->unk_78, &padmgr->unk_70); - //EUC-JP: コントローラスレッド実行終了 | Controller thread execution end + // EUC-JP: コントローラスレッド実行終了 | Controller thread execution end osSyncPrintf("コントローラスレッド実行終了\n"); } -//func_800A2A14 in 1.0 -void PadMgr_Init(PadMgr* padmgr, OSMesgQueue* ctrlrqueue, UNK_TYPE arg2, OSId id, OSPri priority, void* stack) -{ - //EUC-JP: パッドマネージャ作成 | Create pad manager +// func_800A2A14 in 1.0 +void PadMgr_Init(PadMgr* padmgr, OSMesgQueue* ctrlrqueue, UNK_TYPE arg2, OSId id, OSPri priority, void* stack) { + // EUC-JP: パッドマネージャ作成 | Create pad manager osSyncPrintf("パッドマネージャ作成 padmgr_Create()\n"); bzero(padmgr, sizeof(PadMgr)); padmgr->unk_78 = arg2; diff --git a/src/code/relocation.c b/src/code/relocation.c index 6e429742cd..80839b9d99 100644 --- a/src/code/relocation.c +++ b/src/code/relocation.c @@ -1,3 +1,3 @@ #include -#pragma GLOBAL_ASM("asm/non_matchings/code/relocation/Overlay_DoRelocation.s") \ No newline at end of file +#pragma GLOBAL_ASM("asm/non_matchings/code/relocation/Overlay_DoRelocation.s") diff --git a/src/code/sched.c b/src/code/sched.c index dcf38e22b9..af971ff2e2 100644 --- a/src/code/sched.c +++ b/src/code/sched.c @@ -4,14 +4,13 @@ #pragma GLOBAL_ASM("asm/non_matchings/code/sched/func_800C82A0.s") -void func_800C84E4(SchedContext* sc, UNK_TYPE arg1) -{ - if (sc->unk_24C != 0) - { +void func_800C84E4(SchedContext* sc, UNK_TYPE arg1) { + if (sc->unk_24C != 0) { sc->unk_24C = 0; - if (gIrqMgrResetStatus == 0) + if (gIrqMgrResetStatus == 0) { ViConfig_UpdateVi(0); + } } func_800C82A0(arg1); @@ -19,26 +18,25 @@ void func_800C84E4(SchedContext* sc, UNK_TYPE arg1) #pragma GLOBAL_ASM("asm/non_matchings/code/sched/func_800C8534.s") -void func_800C87CC(SchedContext* sc) -{ +void func_800C87CC(SchedContext* sc) { ViConfig_UpdateVi(1); } #pragma GLOBAL_ASM("asm/non_matchings/code/sched/func_800C87F0.s") -void func_800C8910(SchedContext* sc) -{ - if (!(sc->curRSPTask->state & 0x10)) - { - if (sc->curRSPTask->list.t.type == M_AUDTASK) +void func_800C8910(SchedContext* sc) { + if (!(sc->curRSPTask->state & 0x10)) { + if (sc->curRSPTask->list.t.type == M_AUDTASK) { __assert("sc->curRSPTask->list.t.type != M_AUDTASK", "../sched.c", 496); + } sc->curRSPTask->state |= 0x10; osSpTaskYield(); - if (D_8012D290 != 0) + if (D_8012D290 != 0) { osSyncPrintf("%08d:osSpTaskYield\n", (u32)((osGetTime() * 64) / 3000)); + } } } @@ -46,39 +44,37 @@ void func_800C8910(SchedContext* sc) #pragma GLOBAL_ASM("asm/non_matchings/code/sched/func_800C8A94.s") -typedef struct -{ - /* 0x00 */ char unk_00[0x04]; - /* 0x00 */ u32 unk_04; - /* 0x00 */ u32 unk_08; +typedef struct { + /* 0x00 */ char unk_00[0x04]; + /* 0x00 */ u32 unk_04; + /* 0x00 */ u32 unk_08; /* 0x0C */ UNK_TYPE unk_0C; - /* 0x10 */ char unk_10[0x40]; + /* 0x10 */ char unk_10[0x40]; /* 0x50 */ OSMesgQueue* msgQ; - /* 0x54 */ OSMesg msg; + /* 0x54 */ OSMesg msg; } struct_800C8C40; -void func_800C8BC4(SchedContext* sc, struct_800C8C40* arg1) -{ - if (sc->pendingSwapBuf1 == 0) - { +void func_800C8BC4(SchedContext* sc, struct_800C8C40* arg1) { + if (sc->pendingSwapBuf1 == 0) { sc->pendingSwapBuf1 = arg1->unk_0C; LogUtils_CheckValidPointer("sc->pending_swapbuffer1", sc->pendingSwapBuf1, "../sched.c", 618); - if ((sc->unk_240 == NULL) || (sc->unk_240->unk_12 < 1)) + if ((sc->unk_240 == NULL) || (sc->unk_240->unk_12 < 1)) { func_800C84E4(sc, arg1->unk_0C); + } } } -u32 func_800C8C40(SchedContext* sc, struct_800C8C40* arg1) -{ - if (!(arg1->unk_04 & 3)) - { - if (arg1->msgQ != NULL) +u32 func_800C8C40(SchedContext* sc, struct_800C8C40* arg1) { + if (!(arg1->unk_04 & 3)) { + if (arg1->msgQ != NULL) { osSendMesg(arg1->msgQ, arg1->msg, OS_MESG_BLOCK); + } - if (arg1->unk_08 & 0x40) + if (arg1->unk_08 & 0x40) { func_800C8BC4(sc, arg1); + } return 1; } @@ -96,18 +92,17 @@ u32 func_800C8C40(SchedContext* sc, struct_800C8C40* arg1) #pragma GLOBAL_ASM("asm/non_matchings/code/sched/func_800C94B4.s") -void func_800C95F8(OSMesgQueue* mq) -{ - if (D_8012D290 != 0) +void func_800C95F8(OSMesgQueue* mq) { + if (D_8012D290 != 0) { osSyncPrintf("osScKickEntryMsg\n"); + } osSendMesg(mq, 670, OS_MESG_BLOCK); } #pragma GLOBAL_ASM("asm/non_matchings/code/sched/func_800C9644.s") -void func_800C9874(SchedContext* sc, void* stack, OSPri priority, UNK_TYPE arg3, UNK_TYPE arg4, UNK_TYPE arg5) -{ +void func_800C9874(SchedContext* sc, void* stack, OSPri priority, UNK_TYPE arg3, UNK_TYPE arg4, UNK_TYPE arg5) { bzero(sc, sizeof(SchedContext)); sc->unk_24C = 1; osCreateMesgQueue(&sc->interruptQ, sc->intBuf, 8); diff --git a/src/code/speed_meter.c b/src/code/speed_meter.c index 3c5cecf9c2..ec5e93b070 100644 --- a/src/code/speed_meter.c +++ b/src/code/speed_meter.c @@ -1,36 +1,30 @@ #include #include -typedef struct -{ +typedef struct { /* 0x00 */ char unk_00[0x18]; - /* 0x18 */ s32 unk_18; - /* 0x1C */ s32 unk_1C; + /* 0x18 */ s32 unk_18; + /* 0x1C */ s32 unk_1C; } struct_801664D0; // size = 0x20 extern struct_801664D0 D_801664D0; -void func_800C9940(struct_801664D0* arg0, u32 arg1, u32 arg2) -{ +void func_800C9940(struct_801664D0* arg0, u32 arg1, u32 arg2) { LogUtils_CheckNullPointer("this", arg0, "../speed_meter.c", 181); arg0->unk_18 = arg1; arg0->unk_1C = arg2; } -void func_800C9998(struct_801664D0* arg0) -{ +void func_800C9998(struct_801664D0* arg0) { func_800C9940(arg0, 0x20, 0x16); } -void func_800C99BC(struct_801664D0* arg0) -{ - +void func_800C99BC(struct_801664D0* arg0) { } #pragma GLOBAL_ASM("asm/non_matchings/code/speed_meter/func_800C99C4.s") -typedef struct -{ +typedef struct { /* 0x00 */ u32 unk_00; /* 0x04 */ u32 unk_04; /* 0x08 */ u16 unk_08; @@ -41,8 +35,8 @@ typedef struct /* 0x18 */ u32 unk_18; } struct_800C9E08; -void func_800C9E08(struct_800C9E08* arg0, u32 arg1, u32 arg2, u16 arg3, u16 arg4, u32 arg5, u32 arg6, u32 arg7, u32 arg8) -{ +void func_800C9E08(struct_800C9E08* arg0, u32 arg1, u32 arg2, u16 arg3, u16 arg4, u32 arg5, u32 arg6, u32 arg7, + u32 arg8) { arg0->unk_00 = arg1; arg0->unk_04 = arg2; arg0->unk_08 = arg3; diff --git a/src/code/sys_cfb.c b/src/code/sys_cfb.c index 182e53f4d3..421037c383 100644 --- a/src/code/sys_cfb.c +++ b/src/code/sys_cfb.c @@ -1,66 +1,54 @@ #include -volatile u32 sSysCfbFbPtr[2]; //may not be volatile but it currently gets SysCfb_Init closer from matching +u32 sSysCfbFbPtr[2]; u32 sSysCfbEnd; -//small reaordering -#ifdef NON_MATCHING -void SysCfb_Init(s32 n64dd) -{ - if (osMemSize >= 0x800000U) - { - //8MB or more memory is installed +void SysCfb_Init(s32 n64dd) { + u32 screenSize; + u32 tmpFbEnd; + if (osMemSize >= 0x800000U) { + // 8MB or more memory is installed osSyncPrintf("８Ｍバイト以上のメモリが搭載されています\n"); - if (n64dd == 1) - { - //RAM 8M mode (N64DD compatible) + tmpFbEnd = 0x8044BE80; + if (n64dd == 1) { + // RAM 8M mode (N64DD compatible) osSyncPrintf("RAM 8M mode (N64DD対応)\n"); sSysCfbEnd = 0x805FB000; - } - else - { - //The margin for this version is% dK bytes + } else { + // The margin for this version is% dK bytes osSyncPrintf("このバージョンのマージンは %dK バイトです\n", (0x4BC00 / 1024)); - sSysCfbEnd = 0x8044BE80; + sSysCfbEnd = tmpFbEnd; } - } - else if (osMemSize >= 0x400000U) - { - sSysCfbEnd = 0x80400000; + } else if (osMemSize >= 0x400000U) { osSyncPrintf("RAM4M mode\n"); - } - else - { + sSysCfbEnd = 0x80400000; + } else { LogUtils_HungupThread("../sys_cfb.c", 0x162); } + screenSize = SCREEN_WIDTH * SCREEN_HEIGHT; sSysCfbEnd &= ~0x3f; - //The final address used by the system is% 08x + // The final address used by the system is% 08x osSyncPrintf("システムが使用する最終アドレスは %08x です\n", sSysCfbEnd); - sSysCfbFbPtr[0] = sSysCfbEnd - (SCREEN_WIDTH*SCREEN_HEIGHT*4); - sSysCfbFbPtr[1] = sSysCfbEnd - (SCREEN_WIDTH*SCREEN_HEIGHT*2); - //Frame buffer addresses are% 08x and% 08x + sSysCfbFbPtr[0] = sSysCfbEnd - (screenSize * 4); + sSysCfbFbPtr[1] = sSysCfbEnd - (screenSize * 2); + // Frame buffer addresses are% 08x and% 08x osSyncPrintf("フレームバッファのアドレスは %08x と %08x です\n", sSysCfbFbPtr[0], sSysCfbFbPtr[1]); } -#else -#pragma GLOBAL_ASM("asm/non_matchings/code/sys_cfb/SysCfb_Init.s") -#endif -void SysCfb_Reset() -{ +void SysCfb_Reset() { sSysCfbFbPtr[0] = 0; sSysCfbFbPtr[1] = 0; sSysCfbEnd = 0; } -u32 SysCfb_GetFbPtr(s32 idx) -{ - if (idx < 2) +u32 SysCfb_GetFbPtr(s32 idx) { + if (idx < 2) { return sSysCfbFbPtr[idx]; + } return 0; } -u32 SysCfb_GetFbEnd() -{ +u32 SysCfb_GetFbEnd() { return sSysCfbEnd; -} \ No newline at end of file +} diff --git a/src/code/sys_matrix.c b/src/code/sys_matrix.c index bd526cec71..c320a32862 100644 --- a/src/code/sys_matrix.c +++ b/src/code/sys_matrix.c @@ -1,96 +1,91 @@ #include #include -Mtx gMtxClear = -{ +// clang-format off +Mtx gMtxClear = { 65536, 0, 1, 0, 0, 65536, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, }; -MtxF gMtxFClear = -{ + +MtxF gMtxFClear = { 1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f, }; +// clang-format on -MtxF* sMatrixStack; // "Matrix_stack" +MtxF* sMatrixStack; // "Matrix_stack" MtxF* sCurrentMatrix; // "Matrix_now" -void Matrix_Init(GameState* gameState) -{ +void Matrix_Init(GameState* gameState) { sCurrentMatrix = Game_Alloc(gameState, 20 * sizeof(MtxF), "../sys_matrix.c", 153); sMatrixStack = sCurrentMatrix; } -void Matrix_Push(void) -{ +void Matrix_Push(void) { Matrix_MtxFCopy(sCurrentMatrix + 1, sCurrentMatrix); sCurrentMatrix++; } -void Matrix_Pull(void) -{ +void Matrix_Pull(void) { sCurrentMatrix--; - if (sCurrentMatrix < sMatrixStack) + if (sCurrentMatrix < sMatrixStack) { __assert("Matrix_now >= Matrix_stack", "../sys_matrix.c", 176); + } } -void Matrix_Get(MtxF* dest) -{ +void Matrix_Get(MtxF* dest) { Matrix_MtxFCopy(dest, sCurrentMatrix); } -void Matrix_Put(MtxF* src) -{ +void Matrix_Put(MtxF* src) { Matrix_MtxFCopy(sCurrentMatrix, src); } -MtxF* Matrix_GetCurrent(void) -{ +MtxF* Matrix_GetCurrent(void) { return sCurrentMatrix; } -void Matrix_Mult(MtxF* mf, u8 mode) -{ +void Matrix_Mult(MtxF* mf, u8 mode) { MtxF* cmf = Matrix_GetCurrent(); - if (mode == MTXMODE_APPLY) + if (mode == MTXMODE_APPLY) { func_800A6FA0(cmf, mf, cmf); - else + } else { Matrix_MtxFCopy(sCurrentMatrix, mf); + } } -#ifdef NON_MATCHING -// minor ordering and regalloc differences -void Matrix_Translate(f32 x, f32 y, f32 z, u8 mode) -{ +void Matrix_Translate(f32 x, f32 y, f32 z, u8 mode) { MtxF* cmf = sCurrentMatrix; + f32 tx; + f32 ty; - if (mode == MTXMODE_APPLY) - { - cmf->wx += cmf->xx * x + cmf->yx * y + cmf->zx * z; - cmf->wy += cmf->xy * x + cmf->yy * y + cmf->zy * z; - cmf->wz += cmf->xz * x + cmf->yz * y + cmf->zz * z; - cmf->ww += cmf->xw * x + cmf->yw * y + cmf->zw * z; - } - else - { + if (mode == MTXMODE_APPLY) { + tx = cmf->xx; + ty = cmf->yx; + cmf->wx += tx * x + ty * y + cmf->zx * z; + tx = cmf->xy; + ty = cmf->yy; + cmf->wy += tx * x + ty * y + cmf->zy * z; + tx = cmf->xz; + ty = cmf->yz; + cmf->wz += tx * x + ty * y + cmf->zz * z; + tx = cmf->xw; + ty = cmf->yw; + cmf->ww += tx * x + ty * y + cmf->zw * z; + } else { func_800A7A24(cmf, x, y, z); } } -#else -#pragma GLOBAL_ASM("asm/non_matchings/code/sys_matrix/Matrix_Translate.s") -#endif -void Matrix_Scale(f32 x, f32 y, f32 z, u8 mode) -{ +void Matrix_Scale(f32 x, f32 y, f32 z, u8 mode) { MtxF* cmf = sCurrentMatrix; - if (mode == MTXMODE_APPLY) - { + if (mode == MTXMODE_APPLY) { cmf->xx *= x; cmf->xy *= x; cmf->xz *= x; @@ -103,25 +98,20 @@ void Matrix_Scale(f32 x, f32 y, f32 z, u8 mode) cmf->xw *= x; cmf->yw *= y; cmf->zw *= z; - } - else - { + } else { func_800A76A4(cmf, x, y, z); } } -void Matrix_RotateX(f32 x, u8 mode) -{ +void Matrix_RotateX(f32 x, u8 mode) { MtxF* cmf; f32 sin; f32 cos; f32 temp1; f32 temp2; - if (mode == MTXMODE_APPLY) - { - if (x != 0) - { + if (mode == MTXMODE_APPLY) { + if (x != 0) { cmf = sCurrentMatrix; sin = sinf(x); @@ -147,18 +137,13 @@ void Matrix_RotateX(f32 x, u8 mode) cmf->yw = temp1 * cos + temp2 * sin; cmf->zw = temp2 * cos - temp1 * sin; } - } - else - { + } else { cmf = sCurrentMatrix; - if (x != 0) - { + if (x != 0) { sin = sinf(x); cos = cosf(x); - } - else - { + } else { sin = 0.0f; cos = 1.0f; } @@ -182,18 +167,15 @@ void Matrix_RotateX(f32 x, u8 mode) } } -void Matrix_RotateY(f32 y, u8 mode) -{ +void Matrix_RotateY(f32 y, u8 mode) { MtxF* cmf; f32 sin; f32 cos; f32 temp1; f32 temp2; - if (mode == MTXMODE_APPLY) - { - if (y != 0) - { + if (mode == MTXMODE_APPLY) { + if (y != 0) { cmf = sCurrentMatrix; sin = sinf(y); @@ -219,18 +201,13 @@ void Matrix_RotateY(f32 y, u8 mode) cmf->xw = temp1 * cos - temp2 * sin; cmf->zw = temp1 * sin + temp2 * cos; } - } - else - { + } else { cmf = sCurrentMatrix; - if (y != 0) - { + if (y != 0) { sin = sinf(y); cos = cosf(y); - } - else - { + } else { sin = 0.0f; cos = 1.0f; } @@ -254,18 +231,15 @@ void Matrix_RotateY(f32 y, u8 mode) } } -void Matrix_RotateZ(f32 z, u8 mode) -{ +void Matrix_RotateZ(f32 z, u8 mode) { MtxF* cmf; f32 sin; f32 cos; f32 temp1; f32 temp2; - if (mode == MTXMODE_APPLY) - { - if (z != 0) - { + if (mode == MTXMODE_APPLY) { + if (z != 0) { cmf = sCurrentMatrix; sin = sinf(z); @@ -291,18 +265,13 @@ void Matrix_RotateZ(f32 z, u8 mode) cmf->xw = temp1 * cos + temp2 * sin; cmf->yw = temp2 * cos - temp1 * sin; } - } - else - { + } else { cmf = sCurrentMatrix; - if (z != 0) - { + if (z != 0) { sin = sinf(z); cos = cosf(z); - } - else - { + } else { sin = 0.0f; cos = 1.0f; } @@ -326,16 +295,20 @@ void Matrix_RotateZ(f32 z, u8 mode) } } -void Matrix_RotateXYZ(s16 x, s16 y, s16 z, u8 mode) -{ +/* + * Rotates the top of the matrix stack by `z` degrees, then + * rotates that matrix by `y` degrees, then rotates that matrix + * by `x` degrees. (roll-pitch-yaw) + * Original Name: Matrix_RotateXYZ, changed to reflect rotation order. + */ +void Matrix_RotateZYX(s16 x, s16 y, s16 z, u8 mode) { MtxF* cmf = sCurrentMatrix; f32 temp1; f32 temp2; f32 sin; f32 cos; - if (mode == MTXMODE_APPLY) - { + if (mode == MTXMODE_APPLY) { sin = Math_Sins(z); cos = Math_Coss(z); @@ -359,8 +332,7 @@ void Matrix_RotateXYZ(s16 x, s16 y, s16 z, u8 mode) cmf->xw = temp1 * cos + temp2 * sin; cmf->yw = temp2 * cos - temp1 * sin; - if (y != 0) - { + if (y != 0) { sin = Math_Sins(y); cos = Math_Coss(y); @@ -385,8 +357,7 @@ void Matrix_RotateXYZ(s16 x, s16 y, s16 z, u8 mode) cmf->zw = temp1 * sin + temp2 * cos; } - if (x != 0) - { + if (x != 0) { sin = Math_Sins(x); cos = Math_Coss(x); @@ -410,52 +381,52 @@ void Matrix_RotateXYZ(s16 x, s16 y, s16 z, u8 mode) cmf->yw = temp1 * cos + temp2 * sin; cmf->zw = temp2 * cos - temp1 * sin; } - } - else - { + } else { func_800A7704(cmf, x, y, z); } } -void func_800D1340(Vec3f* arg0, Vec3s* arg1) -{ +/* + * Translates the top of the matrix stack by `translation` units, + * then rotates that matrix by `rotation` in Z-Y-X order (roll-pitch-yaw) + */ +void Matrix_TranslateThenRotateZYX(Vec3f* translation, Vec3s* rotation) { MtxF* cmf = sCurrentMatrix; f32 sin; f32 cos; f32 temp1; f32 temp2; - sin = Math_Sins(arg1->z); - cos = Math_Coss(arg1->z); + sin = Math_Sins(rotation->z); + cos = Math_Coss(rotation->z); temp1 = cmf->xx; temp2 = cmf->yx; - cmf->wx += temp1 * arg0->x + temp2 * arg0->y + cmf->zx * arg0->z; + cmf->wx += temp1 * translation->x + temp2 * translation->y + cmf->zx * translation->z; cmf->xx = temp1 * cos + temp2 * sin; cmf->yx = temp2 * cos - temp1 * sin; temp1 = cmf->xy; temp2 = cmf->yy; - cmf->wy += temp1 * arg0->x + temp2 * arg0->y + cmf->zy * arg0->z; + cmf->wy += temp1 * translation->x + temp2 * translation->y + cmf->zy * translation->z; cmf->xy = temp1 * cos + temp2 * sin; cmf->yy = temp2 * cos - temp1 * sin; temp1 = cmf->xz; temp2 = cmf->yz; - cmf->wz += temp1 * arg0->x + temp2 * arg0->y + cmf->zz * arg0->z; + cmf->wz += temp1 * translation->x + temp2 * translation->y + cmf->zz * translation->z; cmf->xz = temp1 * cos + temp2 * sin; cmf->yz = temp2 * cos - temp1 * sin; temp1 = cmf->xw; temp2 = cmf->yw; - cmf->ww += temp1 * arg0->x + temp2 * arg0->y + cmf->zw * arg0->z; + cmf->ww += temp1 * translation->x + temp2 * translation->y + cmf->zw * translation->z; cmf->xw = temp1 * cos + temp2 * sin; cmf->yw = temp2 * cos - temp1 * sin; - if (arg1->y != 0) - { - sin = Math_Sins(arg1->y); - cos = Math_Coss(arg1->y); + if (rotation->y != 0) { + sin = Math_Sins(rotation->y); + cos = Math_Coss(rotation->y); temp1 = cmf->xx; temp2 = cmf->zx; @@ -478,10 +449,9 @@ void func_800D1340(Vec3f* arg0, Vec3s* arg1) cmf->zw = temp1 * sin + temp2 * cos; } - if (arg1->x != 0) - { - sin = Math_Sins(arg1->x); - cos = Math_Coss(arg1->x); + if (rotation->x != 0) { + sin = Math_Sins(rotation->x); + cos = Math_Coss(rotation->x); temp1 = cmf->yx; temp2 = cmf->zx; @@ -507,8 +477,7 @@ void func_800D1340(Vec3f* arg0, Vec3s* arg1) #ifdef NON_MATCHING // regalloc differences -void func_800D1694(f32 x, f32 y, f32 z, Vec3s* vec) -{ +void func_800D1694(f32 x, f32 y, f32 z, Vec3s* vec) { MtxF* cmf = sCurrentMatrix; f32 sp30; f32 sp2C; @@ -528,8 +497,7 @@ void func_800D1694(f32 x, f32 y, f32 z, Vec3s* vec) cmf->zw = 0.0f; cmf->ww = 1.0f; - if (vec->x != 0) - { + if (vec->x != 0) { sp24 = Math_Sins(vec->x); sp28 = Math_Coss(vec->x); @@ -539,9 +507,7 @@ void func_800D1694(f32 x, f32 y, f32 z, Vec3s* vec) cmf->yz = sp2C * sp24; cmf->zx = sp30 * sp28; cmf->yx = sp30 * sp24; - } - else - { + } else { cmf->zz = sp2C; cmf->zx = sp30; cmf->zy = 0.0f; @@ -550,8 +516,7 @@ void func_800D1694(f32 x, f32 y, f32 z, Vec3s* vec) cmf->yy = 1.0f; } - if (vec->z != 0) - { + if (vec->z != 0) { sp24 = Math_Sins(vec->z); sp28 = Math_Coss(vec->z); @@ -568,9 +533,7 @@ void func_800D1694(f32 x, f32 y, f32 z, Vec3s* vec) sp2C = cmf->yy; cmf->xy = sp2C * sp24; cmf->yy = sp2C * sp28; - } - else - { + } else { cmf->xy = 0.0f; } } @@ -580,74 +543,73 @@ void func_800D1694(f32 x, f32 y, f32 z, Vec3s* vec) #ifdef NON_MATCHING // mostly regalloc differences -Mtx* Matrix_MtxFToMtx(MtxF* src, Mtx* dest) -{ +Mtx* Matrix_MtxFToMtx(MtxF* src, Mtx* dest) { u16* m1 = (u16*)&dest->m[0][0]; u16* m2 = (u16*)&dest->m[2][0]; s32 temp; temp = src->xx * 65536.0f; - m1[0] = (temp >> 0x10) & 0xFFFF;; + m1[0] = (temp >> 0x10) & 0xFFFF; m2[0] = temp & 0xFFFF; temp = src->xy * 65536.0f; - m1[1] = (temp >> 0x10) & 0xFFFF;; + m1[1] = (temp >> 0x10) & 0xFFFF; m2[1] = temp & 0xFFFF; temp = src->xz * 65536.0f; - m1[2] = (temp >> 0x10) & 0xFFFF;; + m1[2] = (temp >> 0x10) & 0xFFFF; m2[2] = temp & 0xFFFF; temp = src->xw * 65536.0f; - m1[3] = (temp >> 0x10) & 0xFFFF;; + m1[3] = (temp >> 0x10) & 0xFFFF; m2[3] = temp & 0xFFFF; temp = src->yx * 65536.0f; - m1[4] = (temp >> 0x10) & 0xFFFF;; + m1[4] = (temp >> 0x10) & 0xFFFF; m2[4] = temp & 0xFFFF; temp = src->yy * 65536.0f; - m1[5] = (temp >> 0x10) & 0xFFFF;; + m1[5] = (temp >> 0x10) & 0xFFFF; m2[5] = temp & 0xFFFF; temp = src->yz * 65536.0f; - m1[6] = (temp >> 0x10) & 0xFFFF;; + m1[6] = (temp >> 0x10) & 0xFFFF; m2[6] = temp & 0xFFFF; temp = src->yw * 65536.0f; - m1[7] = (temp >> 0x10) & 0xFFFF;; + m1[7] = (temp >> 0x10) & 0xFFFF; m2[7] = temp & 0xFFFF; temp = src->zx * 65536.0f; - m1[8] = (temp >> 0x10) & 0xFFFF;; + m1[8] = (temp >> 0x10) & 0xFFFF; m2[8] = temp & 0xFFFF; temp = src->zy * 65536.0f; - m1[9] = (temp >> 0x10) & 0xFFFF;; + m1[9] = (temp >> 0x10) & 0xFFFF; m2[9] = temp & 0xFFFF; temp = src->zz * 65536.0f; - m1[10] = (temp >> 0x10) & 0xFFFF;; + m1[10] = (temp >> 0x10) & 0xFFFF; m2[10] = temp & 0xFFFF; temp = src->zw * 65536.0f; - m1[11] = (temp >> 0x10) & 0xFFFF;; + m1[11] = (temp >> 0x10) & 0xFFFF; m2[11] = temp & 0xFFFF; temp = src->wx * 65536.0f; - m1[12] = (temp >> 0x10) & 0xFFFF;; + m1[12] = (temp >> 0x10) & 0xFFFF; m2[12] = temp & 0xFFFF; temp = src->wy * 65536.0f; - m1[13] = (temp >> 0x10) & 0xFFFF;; + m1[13] = (temp >> 0x10) & 0xFFFF; m2[13] = temp & 0xFFFF; temp = src->wz * 65536.0f; - m1[14] = (temp >> 0x10) & 0xFFFF;; + m1[14] = (temp >> 0x10) & 0xFFFF; m2[14] = temp & 0xFFFF; temp = src->ww * 65536.0f; - m1[15] = (temp >> 0x10) & 0xFFFF;; + m1[15] = (temp >> 0x10) & 0xFFFF; m2[15] = temp & 0xFFFF; return dest; @@ -656,23 +618,19 @@ Mtx* Matrix_MtxFToMtx(MtxF* src, Mtx* dest) #pragma GLOBAL_ASM("asm/non_matchings/code/sys_matrix/Matrix_MtxFToMtx.s") #endif -Mtx* Matrix_ToMtx(Mtx* dest, char* file, s32 line) -{ +Mtx* Matrix_ToMtx(Mtx* dest, char* file, s32 line) { return Matrix_MtxFToMtx(Matrix_CheckFloats(sCurrentMatrix, file, line), dest); } -Mtx* Matrix_NewMtx(GraphicsContext* gfxCtx, char* file, s32 line) -{ +Mtx* Matrix_NewMtx(GraphicsContext* gfxCtx, char* file, s32 line) { return Matrix_ToMtx(Graph_Alloc(gfxCtx, sizeof(Mtx)), file, line); } -Mtx* Matrix_MtxFToNewMtx(MtxF* src, GraphicsContext* gfxCtx) -{ +Mtx* Matrix_MtxFToNewMtx(MtxF* src, GraphicsContext* gfxCtx) { return Matrix_MtxFToMtx(src, Graph_Alloc(gfxCtx, sizeof(Mtx))); } -void Matrix_MultVec3f(Vec3f* src, Vec3f* dest) -{ +void Matrix_MultVec3f(Vec3f* src, Vec3f* dest) { MtxF* cmf = sCurrentMatrix; dest->x = cmf->wx + (cmf->xx * src->x + cmf->yx * src->y + cmf->zx * src->z); @@ -680,8 +638,7 @@ void Matrix_MultVec3f(Vec3f* src, Vec3f* dest) dest->z = cmf->wz + (cmf->xz * src->x + cmf->yz * src->y + cmf->zz * src->z); } -void Matrix_MtxFCopy(MtxF* dest, MtxF* src) -{ +void Matrix_MtxFCopy(MtxF* dest, MtxF* src) { dest->xx = src->xx; dest->xy = src->xy; dest->xz = src->xz; @@ -716,8 +673,7 @@ void Matrix_MtxFCopy(MtxF* dest, MtxF* src) dest->ww = src->ww; } -void Matrix_MtxToMtxF(Mtx* src, MtxF* dest) -{ +void Matrix_MtxToMtxF(Mtx* src, MtxF* dest) { u16* m1 = (u16*)&src->m[0][0]; u16* m2 = (u16*)&src->m[2][0]; @@ -739,15 +695,13 @@ void Matrix_MtxToMtxF(Mtx* src, MtxF* dest) dest->ww = ((m1[15] << 0x10) | m2[15]) * (1 / 65536.0f); } -void Matrix_MultVec3fExt(Vec3f* src, Vec3f* dest, MtxF* mf) -{ +void Matrix_MultVec3fExt(Vec3f* src, Vec3f* dest, MtxF* mf) { dest->x = mf->wx + (mf->xx * src->x + mf->yx * src->y + mf->zx * src->z); dest->y = mf->wy + (mf->xy * src->x + mf->yy * src->y + mf->zy * src->z); dest->z = mf->wz + (mf->xz * src->x + mf->yz * src->y + mf->zz * src->z); } -void Matrix_Reverse(MtxF* mf) -{ +void Matrix_Reverse(MtxF* mf) { f32 temp; temp = mf->xy; @@ -764,8 +718,7 @@ void Matrix_Reverse(MtxF* mf) } #ifdef NON_MATCHING -void func_800D1FD4(MtxF* mf) -{ +void func_800D1FD4(MtxF* mf) { MtxF* cmf = sCurrentMatrix; f32 temp; @@ -790,24 +743,24 @@ void func_800D1FD4(MtxF* mf) #ifdef NON_MATCHING // same differences as func_800D2264 -void func_800D20CC(MtxF* mf, Vec3s* vec, s32 flag) -{ - vec->x = func_800FD250(-mf->zy, sqrtf(SQ(mf->zx) + SQ(mf->zz))) * (32768 / M_PI); +void func_800D20CC(MtxF* mf, Vec3s* vec, s32 flag) { + vec->x = Math_atan2f(-mf->zy, sqrtf(SQ(mf->zx) + SQ(mf->zz))) * (32768 / M_PI); - if ((vec->x == 0x4000) || (vec->x == -0x4000)) - { + if ((vec->x == 0x4000) || (vec->x == -0x4000)) { vec->z = 0; - vec->y = func_800FD250(-mf->xz, mf->xx) * (32768 / M_PI); + vec->y = Math_atan2f(-mf->xz, mf->xx) * (32768 / M_PI); return; } - vec->y = func_800FD250(mf->zx, mf->zz) * (32768 / M_PI); + vec->y = Math_atan2f(mf->zx, mf->zz) * (32768 / M_PI); - if (!flag) - vec->z = func_800FD250(mf->xy, mf->yy) * (32768 / M_PI); - else - vec->z = func_800FD250(mf->xy / sqrtf(SQ(mf->xx) + SQ(mf->xz) + SQ(mf->xy)), - mf->yy / sqrtf(SQ(mf->yx) + SQ(mf->yz) + SQ(mf->yy))) * (32768 / M_PI); + if (!flag) { + vec->z = Math_atan2f(mf->xy, mf->yy) * (32768 / M_PI); + } else { + vec->z = Math_atan2f(mf->xy / sqrtf(SQ(mf->xx) + SQ(mf->xz) + SQ(mf->xy)), + mf->yy / sqrtf(SQ(mf->yx) + SQ(mf->yz) + SQ(mf->yy))) * + (32768 / M_PI); + } } #else #pragma GLOBAL_ASM("asm/non_matchings/code/sys_matrix/func_800D20CC.s") @@ -815,24 +768,24 @@ void func_800D20CC(MtxF* mf, Vec3s* vec, s32 flag) #ifdef NON_MATCHING // same differences as func_800D20CC -void func_800D2264(MtxF* mf, Vec3s* vec, s32 flag) -{ - vec->y = func_800FD250(-mf->xz, sqrtf(SQ(mf->xx) + SQ(mf->xy))) * (32768 / M_PI); +void func_800D2264(MtxF* mf, Vec3s* vec, s32 flag) { + vec->y = Math_atan2f(-mf->xz, sqrtf(SQ(mf->xx) + SQ(mf->xy))) * (32768 / M_PI); - if ((vec->y == 0x4000) || (vec->y == -0x4000)) - { + if ((vec->y == 0x4000) || (vec->y == -0x4000)) { vec->x = 0; - vec->z = func_800FD250(-mf->yx, mf->yy) * (32768 / M_PI); + vec->z = Math_atan2f(-mf->yx, mf->yy) * (32768 / M_PI); return; } - vec->z = func_800FD250(mf->xy, mf->xx) * (32768 / M_PI); + vec->z = Math_atan2f(mf->xy, mf->xx) * (32768 / M_PI); - if (!flag) - vec->x = func_800FD250(mf->yz, mf->zz) * (32768 / M_PI); - else - vec->x = func_800FD250(mf->yz / sqrtf(SQ(mf->yx) + SQ(mf->yy) + SQ(mf->yz)), - mf->zz / sqrtf(SQ(mf->zx) + SQ(mf->zy) + SQ(mf->zz))) * (32768 / M_PI); + if (!flag) { + vec->x = Math_atan2f(mf->yz, mf->zz) * (32768 / M_PI); + } else { + vec->x = Math_atan2f(mf->yz / sqrtf(SQ(mf->yx) + SQ(mf->yy) + SQ(mf->yz)), + mf->zz / sqrtf(SQ(mf->zx) + SQ(mf->zy) + SQ(mf->zz))) * + (32768 / M_PI); + } } #else #pragma GLOBAL_ASM("asm/non_matchings/code/sys_matrix/func_800D2264.s") @@ -840,8 +793,7 @@ void func_800D2264(MtxF* mf, Vec3s* vec, s32 flag) #ifdef NON_MATCHING // regalloc differences -void func_800D23FC(f32 f, Vec3f* vec, u8 mode) -{ +void func_800D23FC(f32 f, Vec3f* vec, u8 mode) { MtxF* cmf; f32 sin; f32 cos; @@ -851,10 +803,8 @@ void func_800D23FC(f32 f, Vec3f* vec, u8 mode) f32 temp3; f32 temp4; - if (mode == MTXMODE_APPLY) - { - if (f != 0) - { + if (mode == MTXMODE_APPLY) { + if (f != 0) { cmf = sCurrentMatrix; sin = sinf(f); @@ -884,13 +834,10 @@ void func_800D23FC(f32 f, Vec3f* vec, u8 mode) cmf->yz = temp2 * cos + vec->y * temp4 + sin * (temp3 * vec->x - temp1 * vec->z); cmf->zz = temp3 * cos + vec->z * temp4 + sin * (temp1 * vec->y - temp2 * vec->x); } - } - else - { + } else { cmf = sCurrentMatrix; - if (f != 0) - { + if (f != 0) { sin = sinf(f); cos = cosf(f); rCos = 1.0f - cos; @@ -921,9 +868,7 @@ void func_800D23FC(f32 f, Vec3f* vec, u8 mode) cmf->wy = 0.0f; cmf->wz = 0.0f; cmf->ww = 1.0f; - } - else - { + } else { cmf->xy = 0.0f; cmf->xz = 0.0f; cmf->xw = 0.0f; @@ -947,17 +892,16 @@ void func_800D23FC(f32 f, Vec3f* vec, u8 mode) #pragma GLOBAL_ASM("asm/non_matchings/code/sys_matrix/func_800D23FC.s") #endif -MtxF* Matrix_CheckFloats(MtxF* mf, char* file, s32 line) -{ +MtxF* Matrix_CheckFloats(MtxF* mf, char* file, s32 line) { s32 i, j; - for (i = 0; i < 4; i++) - { - for (j = 0; j < 4; j++) - { - if (!(-32768.0f <= mf->mf[i][j]) || !(mf->mf[i][j] < 32768.0f)) - { - osSyncPrintf("%s %d: [%s] =\n/ %12.6f %12.6f %12.6f %12.6f \\\n| %12.6f %12.6f %12.6f %12.6f |\n| %12.6f %12.6f %12.6f %12.6f |\n\\ %12.6f %12.6f %12.6f %12.6f /\n", file, line, "mf", mf->xx, mf->yx, mf->zx, mf->wx, mf->xy, mf->yy, mf->zy, mf->wy, mf->xz, mf->yz, mf->zz, mf->wz, mf->xw, mf->yw, mf->zw, mf->ww); + for (i = 0; i < 4; i++) { + for (j = 0; j < 4; j++) { + if (!(-32768.0f <= mf->mf[i][j]) || !(mf->mf[i][j] < 32768.0f)) { + osSyncPrintf("%s %d: [%s] =\n/ %12.6f %12.6f %12.6f %12.6f \\\n| %12.6f %12.6f %12.6f %12.6f |\n| " + "%12.6f %12.6f %12.6f %12.6f |\n\\ %12.6f %12.6f %12.6f %12.6f /\n", + file, line, "mf", mf->xx, mf->yx, mf->zx, mf->wx, mf->xy, mf->yy, mf->zy, mf->wy, mf->xz, + mf->yz, mf->zz, mf->wz, mf->xw, mf->yw, mf->zw, mf->ww); Fault_AddHungupAndCrash(file, line); } } @@ -966,8 +910,7 @@ MtxF* Matrix_CheckFloats(MtxF* mf, char* file, s32 line) return mf; } -void func_800D2A34(MtxF* mf, f32 arg1, f32 arg2, f32 arg3, f32 arg4) -{ +void func_800D2A34(MtxF* mf, f32 arg1, f32 arg2, f32 arg3, f32 arg4) { mf->xy = 0.0f; mf->xz = 0.0f; mf->xw = 0.0f; @@ -986,16 +929,14 @@ void func_800D2A34(MtxF* mf, f32 arg1, f32 arg2, f32 arg3, f32 arg4) mf->ww = 1.0f; } -void func_800D2A98(Mtx* mtx, f32 arg1, f32 arg2, f32 arg3, f32 arg4) -{ +void func_800D2A98(Mtx* mtx, f32 arg1, f32 arg2, f32 arg3, f32 arg4) { MtxF mf; func_800D2A34(&mf, arg1, arg2, arg3, arg4); func_801064E0(&mf, mtx); } -void func_800D2AE4(Mtx* mtx, f32 arg1, f32 arg2, f32 arg3, f32 arg4) -{ +void func_800D2AE4(Mtx* mtx, f32 arg1, f32 arg2, f32 arg3, f32 arg4) { u16* m1 = (u16*)&mtx->m[0][0]; u16* m2 = (u16*)&mtx->m[2][0]; u32 temp; @@ -1047,8 +988,7 @@ void func_800D2AE4(Mtx* mtx, f32 arg1, f32 arg2, f32 arg3, f32 arg4) m2[15] = 0; } -void func_800D2BD0(Mtx* mtx, f32 arg1, f32 arg2, f32 arg3, f32 arg4, f32 arg5, f32 arg6) -{ +void func_800D2BD0(Mtx* mtx, f32 arg1, f32 arg2, f32 arg3, f32 arg4, f32 arg5, f32 arg6) { u16* m1 = (u16*)&mtx->m[0][0]; u16* m2 = (u16*)&mtx->m[2][0]; u32 temp; @@ -1102,8 +1042,7 @@ void func_800D2BD0(Mtx* mtx, f32 arg1, f32 arg2, f32 arg3, f32 arg4, f32 arg5, f #ifdef NON_MATCHING // minor ordering and regalloc differences -void func_800D2CEC(Mtx* mtx, f32 arg1, f32 arg2, f32 arg3, f32 arg4, f32 arg5, f32 arg6) -{ +void func_800D2CEC(Mtx* mtx, f32 arg1, f32 arg2, f32 arg3, f32 arg4, f32 arg5, f32 arg6) { u16* m1 = (u16*)&mtx->m[0][0]; u16* m2 = (u16*)&mtx->m[2][0]; u32 temp; diff --git a/src/code/sys_ucode.c b/src/code/sys_ucode.c index f92a0d61e2..f23c7239a0 100644 --- a/src/code/sys_ucode.c +++ b/src/code/sys_ucode.c @@ -1,21 +1,17 @@ #include -u32 func_800D2DF0() -{ +u32 SysUcode_GetUCodeBoot() { return &D_80009320; } -u32 func_800D2DFC() -{ +u32 SysUcode_GetUcodeBootSize() { return (u32)&D_800093F0 - (u32)&D_80009320; } -u32 func_800D2E14() -{ +u32 SysUcode_GetUcode() { return D_8012DBA0; } -u32 func_800D2E20() -{ +u32 SysUcode_GetUcodeData() { return D_8012DBA4; } diff --git a/src/code/system_malloc.c b/src/code/system_malloc.c index d7c91bbf38..3c75b60654 100644 --- a/src/code/system_malloc.c +++ b/src/code/system_malloc.c @@ -1,131 +1,112 @@ #include -#define LOG_SEVERITY_NOLOG 0 -#define LOG_SEVERITY_ERROR 2 -#define LOG_SEVERITY_VERBOSE 3 +#define LOG_SEVERITY_NOLOG 0 +#define LOG_SEVERITY_ERROR 2 +#define LOG_SEVERITY_VERBOSE 3 s32 gSystemArenaLogSeverity = LOG_SEVERITY_NOLOG; Arena gSystemArena; -void SystemArena_CheckPointer(void* ptr, u32 size, const char* name, const char* action) -{ - if (!ptr) - { - if (gSystemArenaLogSeverity >= LOG_SEVERITY_ERROR) - { +void SystemArena_CheckPointer(void* ptr, u32 size, const char* name, const char* action) { + if (!ptr) { + if (gSystemArenaLogSeverity >= LOG_SEVERITY_ERROR) { //"%s: %u bytes %s failed\n" osSyncPrintf("%s: %u バイトの%sに失敗しました\n", name, size, action); __osDisplayArena(&gSystemArena); return; } - } - else if (gSystemArenaLogSeverity >= LOG_SEVERITY_VERBOSE) - { + } else if (gSystemArenaLogSeverity >= LOG_SEVERITY_VERBOSE) { //"%s: %u bytes %s succeeded\n" osSyncPrintf("%s: %u バイトの%sに成功しました\n", name, size, action); } } -void* SystemArena_Malloc(u32 size) -{ +void* SystemArena_Malloc(u32 size) { void* ptr; ptr = __osMalloc(&gSystemArena, size); - SystemArena_CheckPointer(ptr, size, "malloc", "確保"); //Secure + SystemArena_CheckPointer(ptr, size, "malloc", "確保"); // Secure return ptr; } -void* SystemArena_MallocDebug(u32 size, const char* file, s32 line) -{ +void* SystemArena_MallocDebug(u32 size, const char* file, s32 line) { void* ptr; ptr = __osMallocDebug(&gSystemArena, size, file, line); - SystemArena_CheckPointer(ptr, size, "malloc_DEBUG", "確保"); //Secure + SystemArena_CheckPointer(ptr, size, "malloc_DEBUG", "確保"); // Secure return ptr; } -void* SystemArena_MallocR(u32 size) -{ +void* SystemArena_MallocR(u32 size) { void* ptr; ptr = __osMallocR(&gSystemArena, size); - SystemArena_CheckPointer(ptr, size, "malloc_r", "確保"); //Secure + SystemArena_CheckPointer(ptr, size, "malloc_r", "確保"); // Secure return ptr; } -void* SystemArena_MallocRDebug(u32 size, const char* file, s32 line) -{ +void* SystemArena_MallocRDebug(u32 size, const char* file, s32 line) { void* ptr; ptr = __osMallocRDebug(&gSystemArena, size, file, line); - SystemArena_CheckPointer(ptr, size, "malloc_r_DEBUG", "確保"); //Secure + SystemArena_CheckPointer(ptr, size, "malloc_r_DEBUG", "確保"); // Secure return ptr; } -void* SystemArena_Realloc(void* ptr, u32 newSize) -{ +void* SystemArena_Realloc(void* ptr, u32 newSize) { ptr = __osRealloc(&gSystemArena, ptr, newSize); SystemArena_CheckPointer(ptr, newSize, "realloc", "再確保"); // Re-securing return ptr; } -void* SystemArena_ReallocDebug(void* ptr, u32 newSize, const char* file, s32 line) -{ +void* SystemArena_ReallocDebug(void* ptr, u32 newSize, const char* file, s32 line) { ptr = __osReallocDebug(&gSystemArena, ptr, newSize, file, line); SystemArena_CheckPointer(ptr, newSize, "realloc_DEBUG", "再確保"); // Re-securing return ptr; } -void SystemArena_Free(void* ptr) -{ +void SystemArena_Free(void* ptr) { __osFree(&gSystemArena, ptr); } -void SystemArena_FreeDebug(void* ptr, const char* file, s32 line) -{ +void SystemArena_FreeDebug(void* ptr, const char* file, s32 line) { __osFreeDebug(&gSystemArena, ptr, file, line); } -void* SystemArena_Calloc(u32 num, u32 size) -{ +void* SystemArena_Calloc(u32 num, u32 size) { void* ret; u32 n; - n = num*size; + n = num * size; ret = __osMalloc(&gSystemArena, n); - if (ret) + if (ret) { bzero(ret, n); + } SystemArena_CheckPointer(ret, n, "calloc", "確保"); return ret; } -void SystemArena_Display() -{ - //System heap display +void SystemArena_Display() { + // System heap display osSyncPrintf("システムヒープ表示\n"); __osDisplayArena(&gSystemArena); } -void SystemArena_GetSizes(u32* outMaxFree, u32* outFree, u32* outAlloc) -{ +void SystemArena_GetSizes(u32* outMaxFree, u32* outFree, u32* outAlloc) { ArenaImpl_GetSizes(&gSystemArena, outMaxFree, outFree, outAlloc); } -void SystemArena_Check() -{ +void SystemArena_Check() { __osCheckArena(&gSystemArena); } -void SystemArena_Init(void* start, u32 size) -{ +void SystemArena_Init(void* start, u32 size) { gSystemArenaLogSeverity = LOG_SEVERITY_NOLOG; __osMallocInit(&gSystemArena, start, size); } -void SystemArena_Cleanup() -{ +void SystemArena_Cleanup() { gSystemArenaLogSeverity = LOG_SEVERITY_NOLOG; __osMallocCleanup(&gSystemArena); } -u8 SystemArena_IsInitalized() -{ +u8 SystemArena_IsInitalized() { return __osMallocIsInitalized(&gSystemArena); } diff --git a/src/code/title_setup.c b/src/code/title_setup.c index 22ee8b1816..827987d33c 100644 --- a/src/code/title_setup.c +++ b/src/code/title_setup.c @@ -1,21 +1,17 @@ #include -void TitleSetup_InitImpl(GameState* gameState) -{ - //Zelda common data initalization +void TitleSetup_InitImpl(GameState* gameState) { + // Zelda common data initalization osSyncPrintf("ゼルダ共通データ初期化\n"); SaveContext_Init(); gameState->running = false; - gameState->init = func_80800878; gameState->size = sizeof(TitleContext); + SET_NEXT_GAMESTATE(gameState, Title_Init, TitleContext); } -void TitleSetup_Destroy(GameState* gameState) -{ - +void TitleSetup_Destroy(GameState* gameState) { } -void TitleSetup_Init(GameState* gameState) -{ +void TitleSetup_Init(GameState* gameState) { gameState->destroy = TitleSetup_Destroy; TitleSetup_InitImpl(gameState); -} \ No newline at end of file +} diff --git a/src/code/z_DLF.c b/src/code/z_DLF.c index 2117a771a0..ab09cbac5a 100644 --- a/src/code/z_DLF.c +++ b/src/code/z_DLF.c @@ -2,109 +2,110 @@ #include #include -void Overlay_LoadGameState(GameStateOverlay* overlayEntry) -{ - if (overlayEntry->loadedRamAddr != NULL) - { +void Overlay_LoadGameState(GameStateOverlay* overlayEntry) { + if (overlayEntry->loadedRamAddr != NULL) { // Translates to: "ALREADY LINKED" osSyncPrintf("既にリンクされています\n"); return; } - if (overlayEntry->vramStart == 0) + if (overlayEntry->vramStart == 0) { overlayEntry->unk_28 = 0; - else - { + } else { overlayEntry->loadedRamAddr = Overlay_AllocateAndLoad(overlayEntry->vromStart, overlayEntry->vromEnd, overlayEntry->vramStart, overlayEntry->vramEnd); - if (overlayEntry->loadedRamAddr == NULL) - { + if (overlayEntry->loadedRamAddr == NULL) { // Translates to: "LOADING FAILED" osSyncPrintf("ロードに失敗しました\n"); return; } osSyncPrintf(VT_FGCOL(GREEN)); - osSyncPrintf("OVL(d):Seg:%08x-%08x Ram:%08x-%08x Off:%08x %s\n", - overlayEntry->vramStart, overlayEntry->vramEnd, + osSyncPrintf("OVL(d):Seg:%08x-%08x Ram:%08x-%08x Off:%08x %s\n", overlayEntry->vramStart, overlayEntry->vramEnd, overlayEntry->loadedRamAddr, (u32)overlayEntry->loadedRamAddr + (u32)overlayEntry->vramEnd - (u32)overlayEntry->vramStart, - (u32)overlayEntry->vramStart - (u32)overlayEntry->loadedRamAddr, - ""); + (u32)overlayEntry->vramStart - (u32)overlayEntry->loadedRamAddr, ""); osSyncPrintf(VT_RST); - if (overlayEntry->unk_14 != NULL) + if (overlayEntry->unk_14 != NULL) { overlayEntry->unk_14 = (void*)((u32)overlayEntry->unk_14 - (s32)((u32)overlayEntry->vramStart - (u32)overlayEntry->loadedRamAddr)); - else + } else { overlayEntry->unk_14 = NULL; + } - if (overlayEntry->init != NULL) + if (overlayEntry->init != NULL) { overlayEntry->init = (void*)((u32)overlayEntry->init - (s32)((u32)overlayEntry->vramStart - (u32)overlayEntry->loadedRamAddr)); - else + } else { overlayEntry->init = NULL; + } - if (overlayEntry->destroy != NULL) + if (overlayEntry->destroy != NULL) { overlayEntry->destroy = (void*)((u32)overlayEntry->destroy - (s32)((u32)overlayEntry->vramStart - (u32)overlayEntry->loadedRamAddr)); - else + } else { overlayEntry->destroy = NULL; + } - if (overlayEntry->unk_20 != NULL) + if (overlayEntry->unk_20 != NULL) { overlayEntry->unk_20 = (void*)((u32)overlayEntry->unk_20 - (s32)((u32)overlayEntry->vramStart - (u32)overlayEntry->loadedRamAddr)); - else + } else { overlayEntry->unk_20 = NULL; + } - if (overlayEntry->unk_24 != NULL) + if (overlayEntry->unk_24 != NULL) { overlayEntry->unk_24 = (void*)((u32)overlayEntry->unk_24 - (s32)((u32)overlayEntry->vramStart - (u32)overlayEntry->loadedRamAddr)); - else + } else { overlayEntry->unk_24 = NULL; + } overlayEntry->unk_28 = 0; } } -void Overlay_FreeGameState(GameStateOverlay* overlayEntry) -{ - if (overlayEntry->loadedRamAddr != NULL) - { +void Overlay_FreeGameState(GameStateOverlay* overlayEntry) { + if (overlayEntry->loadedRamAddr != NULL) { s32 temp = overlayEntry->unk_28 != 0 ? -1 : 0; - if (temp == 0) - { - if (overlayEntry->unk_14 != NULL) + if (temp == 0) { + if (overlayEntry->unk_14 != NULL) { overlayEntry->unk_14 = (void*)((u32)overlayEntry->unk_14 + (s32)((u32)overlayEntry->vramStart - (u32)overlayEntry->loadedRamAddr)); - else + } else { overlayEntry->unk_14 = NULL; + } - if (overlayEntry->init != NULL) + if (overlayEntry->init != NULL) { overlayEntry->init = (void*)((u32)overlayEntry->init + (s32)((u32)overlayEntry->vramStart - (u32)overlayEntry->loadedRamAddr)); - else + } else { overlayEntry->init = NULL; + } - if (overlayEntry->destroy != NULL) + if (overlayEntry->destroy != NULL) { overlayEntry->destroy = (void*)((u32)overlayEntry->destroy + (s32)((u32)overlayEntry->vramStart - (u32)overlayEntry->loadedRamAddr)); - else + } else { overlayEntry->destroy = NULL; + } - if (overlayEntry->unk_20 != NULL) + if (overlayEntry->unk_20 != NULL) { overlayEntry->unk_20 = (void*)((u32)overlayEntry->unk_20 + (s32)((u32)overlayEntry->vramStart - (u32)overlayEntry->loadedRamAddr)); - else + } else { overlayEntry->unk_20 = NULL; + } - if (overlayEntry->unk_24 != NULL) + if (overlayEntry->unk_24 != NULL) { overlayEntry->unk_24 = (void*)((u32)overlayEntry->unk_24 + (s32)((u32)overlayEntry->vramStart - (u32)overlayEntry->loadedRamAddr)); - else + } else { overlayEntry->unk_24 = NULL; + } SystemArena_FreeDebug(overlayEntry->loadedRamAddr, "../z_DLF.c", 149); overlayEntry->loadedRamAddr = NULL; diff --git a/src/code/z_actor.c b/src/code/z_actor.c index 3b6698c300..c6ca917213 100644 --- a/src/code/z_actor.c +++ b/src/code/z_actor.c @@ -2,115 +2,108 @@ #include #include -void ActorShape_Init(ActorShape* shape, f32 arg1, void* shadowDrawFunc, f32 arg3) -{ +void ActorShape_Init(ActorShape* shape, f32 arg1, void* shadowDrawFunc, f32 arg3) { shape->unk_08 = arg1; shape->shadowDrawFunc = shadowDrawFunc; shape->unk_10 = arg3; shape->unk_14 = -1; } -void func_8002B200(Actor* actor, LightMapper* lightMapper, GlobalContext* globalCtx, u32 dlist, Color_RGBA8* color) -{ +void func_8002B200(Actor* actor, LightMapper* lightMapper, GlobalContext* globalCtx, Gfx* dlist, Color_RGBA8* color) { f32 temp1; f32 temp2; MtxF sp60; GraphicsContext* gfxCtx; - Gfx* gfxArr[4]; + Gfx* dispRefs[4]; - if (actor->floorPoly != NULL) - { + if (actor->floorPoly != NULL) { temp1 = actor->posRot.pos.y - actor->unk_80; - if (temp1 >= -50.0f && temp1 < 500.0f) - { + if (temp1 >= -50.0f && temp1 < 500.0f) { gfxCtx = globalCtx->state.gfxCtx; - func_800C6AC4(gfxArr, globalCtx->state.gfxCtx, "../z_actor.c", 1553); + Graph_OpenDisps(dispRefs, globalCtx->state.gfxCtx, "../z_actor.c", 1553); - gfxCtx->polyOpa.p = func_80093774(gfxCtx->polyOpa.p, 0x2C); + gfxCtx->polyOpa.p = Gfx_CallSetupDL(gfxCtx->polyOpa.p, 0x2C); - gDPSetCombineLERP(gfxCtx->polyOpa.p++, - 0, 0, 0, PRIMITIVE, TEXEL0, 0, PRIMITIVE, 0, - 0, 0, 0, COMBINED, 0, 0, 0, COMBINED); + gDPSetCombineLERP(gfxCtx->polyOpa.p++, 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) + if (color != NULL) { gDPSetPrimColor(gfxCtx->polyOpa.p++, 0, 0, color->r, color->g, color->b, (u32)(actor->shape.unk_14 * temp2) & 0xFF); - else - gDPSetPrimColor(gfxCtx->polyOpa.p++, 0, 0, 0, 0, 0, - (u32)(actor->shape.unk_14 * temp2) & 0xFF); + } else { + gDPSetPrimColor(gfxCtx->polyOpa.p++, 0, 0, 0, 0, 0, (u32)(actor->shape.unk_14 * temp2) & 0xFF); + } func_80038A28(actor->floorPoly, actor->posRot.pos.x, actor->unk_80, actor->posRot.pos.z, &sp60); Matrix_Put(&sp60); - if (dlist != (u32)&D_04049210) + if (dlist != D_04049210) { Matrix_RotateY(actor->shape.rot.y * (M_PI / 32768), MTXMODE_APPLY); + } 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(gfxCtx->polyOpa.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_actor.c", 1588), G_MTX_MODELVIEW | G_MTX_LOAD); + gSPMatrix(gfxCtx->polyOpa.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_actor.c", 1588), + G_MTX_MODELVIEW | G_MTX_LOAD); gSPDisplayList(gfxCtx->polyOpa.p++, dlist); - func_800C6B54(gfxArr, globalCtx->state.gfxCtx, "../z_actor.c", 1594); + Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_actor.c", 1594); } } } -void ActorShadow_DrawFunc_Circle(Actor* actor, LightMapper* lightMapper, GlobalContext* globalCtx) -{ +void ActorShadow_DrawFunc_Circle(Actor* actor, LightMapper* lightMapper, GlobalContext* globalCtx) { func_8002B200(actor, lightMapper, globalCtx, &D_04049210, NULL); } Color_RGBA8 D_80115F80 = { 0xFF, 0xFF, 0xFF, 0xFF }; -void ActorShadow_DrawFunc_WhiteCircle(Actor* actor, LightMapper* lightMapper, GlobalContext* globalCtx) -{ +void ActorShadow_DrawFunc_WhiteCircle(Actor* actor, LightMapper* lightMapper, GlobalContext* globalCtx) { func_8002B200(actor, lightMapper, globalCtx, &D_04049210, &D_80115F80); } -void ActorShadow_DrawFunc_Squiggly(Actor* actor, LightMapper* lightMapper, GlobalContext* globalCtx) -{ +void ActorShadow_DrawFunc_Squiggly(Actor* actor, LightMapper* lightMapper, GlobalContext* globalCtx) { func_8002B200(actor, lightMapper, globalCtx, &D_04049AD0, NULL); } -void func_8002B66C(GlobalContext* globalCtx, Light* light, MtxF* arg2, s32 arg3, f32 arg4, f32 arg5, f32 arg6) -{ +void func_8002B66C(GlobalContext* globalCtx, Light* light, MtxF* arg2, s32 arg3, f32 arg4, f32 arg5, f32 arg6) { GraphicsContext* gfxCtx = globalCtx->state.gfxCtx; f32 sp58; - Gfx* gfxArr[7]; + Gfx* dispRefs[7]; - func_800C6AC4(gfxArr, globalCtx->state.gfxCtx, "../z_actor.c", 1661); + Graph_OpenDisps(dispRefs, globalCtx->state.gfxCtx, "../z_actor.c", 1661); gDPSetPrimColor(gfxCtx->polyOpa.p++, 0, 0, 0, 0, 0, (u32)(((arg3 * 0.00005f) > 1.0f ? 1.0f : (arg3 * 0.00005f)) * arg4) & 0xFF); - sp58 = func_800FD250(light->l.dir[0], light->l.dir[2]); + sp58 = Math_atan2f(light->l.dir[0], light->l.dir[2]); arg6 *= (4.5f - (light->l.dir[1] * 0.035f)); arg6 = (arg6 < 1.0f) ? 1.0f : arg6; Matrix_Put(arg2); Matrix_RotateY(sp58, MTXMODE_APPLY); Matrix_Scale(arg5, 1.0f, arg5 * arg6, MTXMODE_APPLY); - gSPMatrix(gfxCtx->polyOpa.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_actor.c", 1687), G_MTX_MODELVIEW | G_MTX_LOAD); + gSPMatrix(gfxCtx->polyOpa.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_actor.c", 1687), + G_MTX_MODELVIEW | G_MTX_LOAD); gSPDisplayList(gfxCtx->polyOpa.p++, &D_04048180); - func_800C6B54(gfxArr, globalCtx->state.gfxCtx, "../z_actor.c", 1693); + Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_actor.c", 1693); } #ifdef NON_MATCHING -// this function still needs a lot of work -void ActorShadow_DrawFunc_Teardrop(Actor* actor, LightMapper* lightMapper, GlobalContext* globalCtx) -{ +// saved register, stack usage and minor ordering differences +void ActorShadow_DrawFunc_Teardrop(Actor* actor, LightMapper* lightMapper, GlobalContext* globalCtx) { GraphicsContext* gfxCtx; MtxF spE8; - Vec2f spE0; - s32 index; + f32 spE0[2]; + s32 i; f32* spAC; - Gfx* gfxArr[7]; + Gfx* dispRefs[4]; f32 temp_10; u8 temp_14; f32 temp_f0; @@ -129,32 +122,29 @@ void ActorShadow_DrawFunc_Teardrop(Actor* actor, LightMapper* lightMapper, Globa temp_f20 = actor->posRot.pos.y - actor->unk_80; - if (temp_f20 > 20.0f) - { + if (temp_f20 > 20.0f) { temp_10 = actor->shape.unk_10; - actor->shape.unk_10 *= 0.3f; temp_14 = actor->shape.unk_14; + actor->shape.unk_10 *= 0.3f; actor->shape.unk_14 *= ((temp_f20 - 20.0f) * 0.02f) > 1.0f ? 1.0f : ((temp_f20 - 20.0f) * 0.02f); ActorShadow_DrawFunc_Circle(actor, lightMapper, globalCtx); actor->shape.unk_10 = temp_10; actor->shape.unk_14 = temp_14; } - if (temp_f20 < 200.0f) - { - spAC = &spE0.x; + if (temp_f20 < 200.0f) { + phi_s7 = &actor->unk_CC[0]; + spAC = &spE0[0]; + temp_s6 = lightMapper->numLights; + temp_s6 -= 2; + gfxCtx = globalCtx->state.gfxCtx; - temp_s6 = lightMapper->numLights - 2; + Graph_OpenDisps(dispRefs, globalCtx->state.gfxCtx, "../z_actor.c", 1741); - func_800C6AC4(gfxArr, globalCtx->state.gfxCtx, "../z_actor.c", 1741); - - gfxCtx->polyOpa.p = func_80093774(gfxCtx->polyOpa.p, 0x2C); + gfxCtx->polyOpa.p = Gfx_CallSetupDL(gfxCtx->polyOpa.p, 0x2C); actor->shape.unk_15 = 0; - phi_s7 = &actor->unk_CC; - - for (index = 0; index < 2; index++) - { + for (i = 0; i < 2; i++) { phi_s7->y += 50.0f; *spAC = func_800BFCB8(globalCtx, &spE8, phi_s7); phi_s7->y -= 50.0f; @@ -163,33 +153,32 @@ void ActorShadow_DrawFunc_Teardrop(Actor* actor, LightMapper* lightMapper, Globa phi_f2 = phi_s7->y - *spAC; - if ((phi_f2 >= -1.0f) && (phi_f2 < 500.0f)) - { + if ((phi_f2 >= -1.0f) && (phi_f2 < 500.0f)) { phi_s0 = lightMapper->lights; - if (phi_f2 <= 0.0f) + if (phi_f2 <= 0.0f) { actor->shape.unk_15++; + } - if (30.0f < phi_f2) + if (30.0f < phi_f2) { phi_f2 = 30.0f; + } - temp_f24 = actor->shape.unk_14 * (1.0f - (phi_f2 * (1.f / 30))); + temp_f24 = actor->shape.unk_14 * (1.0f - (phi_f2 * (1.0f / 30))); - if (30.0f < phi_f2) + if (30.0f < phi_f2) { phi_f2 = 30.0f; + } - temp_f20_2 = 1.0f - (phi_f2 * (1.f / 70)); + temp_f20_2 = 1.0f - (phi_f2 * (1.0f / 70)); temp_f22_2 = (actor->shape.unk_10 * temp_f20_2) * actor->scale.x; phi_s2 = 0; - for (phi_s1 = 0; phi_s1 < temp_s6; phi_s1++) - { - if (phi_s0->l.dir[1] > 0) - { + for (phi_s1 = 0; phi_s1 < temp_s6; phi_s1++) { + if (phi_s0->l.dir[1] > 0) { temp_lo = ABS(phi_s0->l.dir[1]) * ((phi_s0->l.col[0] + phi_s0->l.col[1]) + phi_s0->l.col[2]); - if (temp_lo > 0) - { + if (temp_lo > 0) { func_8002B66C(globalCtx, phi_s0, &spE8, temp_lo, temp_f24, temp_f22_2, temp_f20_2); phi_s2 += temp_lo; } @@ -197,13 +186,13 @@ void ActorShadow_DrawFunc_Teardrop(Actor* actor, LightMapper* lightMapper, Globa phi_s0++; } - for (phi_s1 = 0; phi_s1 < 2; phi_s1++) - { - if (phi_s0->l.dir[1] > 0) - { - temp_a3 = (ABS(phi_s0->l.dir[1]) * ((phi_s0->l.col[0] + phi_s0->l.col[1]) + phi_s0->l.col[2])) - (phi_s2 * 8); - if (temp_a3 > 0) + for (phi_s1 = 0; phi_s1 < 2; phi_s1++) { + if (phi_s0->l.dir[1] > 0) { + temp_a3 = (ABS(phi_s0->l.dir[1]) * ((phi_s0->l.col[0] + phi_s0->l.col[1]) + phi_s0->l.col[2])) - + (phi_s2 * 8); + if (temp_a3 > 0) { func_8002B66C(globalCtx, phi_s0, &spE8, temp_a3, temp_f24, temp_f22_2, temp_f20_2); + } } phi_s0++; } @@ -213,46 +202,39 @@ void ActorShadow_DrawFunc_Teardrop(Actor* actor, LightMapper* lightMapper, Globa phi_s7++; } - if (!(actor->bgCheckFlags & 1)) + if (!(actor->bgCheckFlags & 1)) { actor->shape.unk_15 = 0; - else if (actor->shape.unk_15 == 3) - { - temp_f0 = actor->unk_CC.y - actor->unk_D8.y; - if ((spE0.x + temp_f0) < (spE0.y - temp_f0)) - actor->shape.unk_15 = 2; - else - actor->shape.unk_15 = 1; + } else if (actor->shape.unk_15 == 3) { + temp_f0 = actor->unk_CC[0].y - actor->unk_CC[1].y; + actor->shape.unk_15 = ((spE0[0] + temp_f0) < (spE0[1] - temp_f0)) ? 2 : 1; } - func_800C6B54(gfxArr, globalCtx->state.gfxCtx, "../z_actor.c", 1831); + Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_actor.c", 1831); } } #else #pragma GLOBAL_ASM("asm/non_matchings/code/z_actor/ActorShadow_DrawFunc_Teardrop.s") #endif -void func_8002BDB0(Actor* actor, s32 arg1, s32 arg2, UNK_PTR arg3, s32 arg4, UNK_PTR arg5) -{ - if (arg1 == arg2) - Matrix_MultVec3f(arg3, &actor->unk_CC); - else if (arg1 == arg4) - Matrix_MultVec3f(arg5, &actor->unk_D8); +void func_8002BDB0(Actor* actor, s32 arg1, s32 arg2, UNK_PTR arg3, s32 arg4, UNK_PTR arg5) { + if (arg1 == arg2) { + Matrix_MultVec3f(arg3, &actor->unk_CC[0]); + } else if (arg1 == arg4) { + Matrix_MultVec3f(arg5, &actor->unk_CC[1]); + } } -void func_8002BE04(GlobalContext* globalCtx, Vec3f* arg1, Vec3f* arg2, f32* arg3) -{ +void func_8002BE04(GlobalContext* globalCtx, Vec3f* arg1, Vec3f* arg2, f32* arg3) { func_800A6E10(&globalCtx->mf_11D60, arg1, arg2, arg3); *arg3 = (*arg3 < 1.0f) ? 1.0f : (1.0f / *arg3); } -typedef struct -{ +typedef struct { /* 0x00 */ Color_RGBA8 inner; /* 0x04 */ Color_RGBA8 outer; } NaviColor; // size = 0x8 -NaviColor sNaviColorList[] = -{ +NaviColor sNaviColorList[] = { { { 0x00, 0xFF, 0x00, 0xFF }, { 0x00, 0xFF, 0x00, 0x00 } }, { { 0x00, 0xFF, 0x00, 0xFF }, { 0x00, 0xFF, 0x00, 0x00 } }, { { 0xFF, 0xFF, 0xFF, 0xFF }, { 0x00, 0x00, 0xFF, 0x00 } }, @@ -269,21 +251,18 @@ NaviColor sNaviColorList[] = }; // unused -Gfx D_80115FF0[] = -{ +Gfx D_80115FF0[] = { gsSPEndDisplayList(), }; -void func_8002BE64(TargetContext* targetCtx, s32 index, f32 arg2, f32 arg3, f32 arg4) -{ +void func_8002BE64(TargetContext* targetCtx, s32 index, f32 arg2, f32 arg3, f32 arg4) { targetCtx->arr_50[index].pos.x = arg2; targetCtx->arr_50[index].pos.y = arg3; targetCtx->arr_50[index].pos.z = arg4; targetCtx->arr_50[index].unk_0C = targetCtx->unk_44; } -void func_8002BE98(TargetContext* targetCtx, s32 actorType, GlobalContext* globalCtx) -{ +void func_8002BE98(TargetContext* targetCtx, s32 actorType, GlobalContext* globalCtx) { TargetContextEntry* entry; NaviColor* naviColor; s32 i; @@ -295,8 +274,7 @@ void func_8002BE98(TargetContext* targetCtx, s32 actorType, GlobalContext* globa naviColor = &sNaviColorList[actorType]; entry = &targetCtx->arr_50[0]; - for (i = 0; i < ARRAY_COUNT(targetCtx->arr_50); i++) - { + for (i = 0; i < ARRAY_COUNT(targetCtx->arr_50); i++) { func_8002BE64(targetCtx, i, 0.0f, 0.0f, 0.0f); entry->color.r = naviColor->inner.r; entry->color.g = naviColor->inner.g; @@ -305,8 +283,7 @@ void func_8002BE98(TargetContext* targetCtx, s32 actorType, GlobalContext* globa } } -void func_8002BF60(TargetContext* targetCtx, Actor* actor, s32 actorType, GlobalContext* globalCtx) -{ +void func_8002BF60(TargetContext* targetCtx, Actor* actor, s32 actorType, GlobalContext* globalCtx) { NaviColor* naviColor = &sNaviColorList[actorType]; targetCtx->naviRefPos.x = actor->posRot2.pos.x; targetCtx->naviRefPos.y = actor->posRot2.pos.y + (actor->unk_4C * actor->scale.y); @@ -321,8 +298,7 @@ void func_8002BF60(TargetContext* targetCtx, Actor* actor, s32 actorType, Global targetCtx->naviOuter.a = naviColor->outer.a; } -void func_8002C0C0(TargetContext* targetCtx, Actor* actor, GlobalContext* globalCtx) -{ +void func_8002C0C0(TargetContext* targetCtx, Actor* actor, GlobalContext* globalCtx) { targetCtx->arrowPointedActor = NULL; targetCtx->targetedActor = NULL; targetCtx->unk_40 = 0.0f; @@ -335,143 +311,133 @@ void func_8002C0C0(TargetContext* targetCtx, Actor* actor, GlobalContext* global } #ifdef NON_MATCHING -// this function still needs some work -void func_8002C124(TargetContext* targetCtx, GlobalContext* globalCtx) -{ +// regalloc and minor ordering differences +void func_8002C124(TargetContext* targetCtx, GlobalContext* globalCtx) { Actor* actor; Player* player; GraphicsContext* gfxCtx; - Gfx* gfxArr[5]; + Gfx* dispRefs[4]; + TargetContextEntry* entry; s16 spCE; + f32 temp1; Vec3f spBC; s32 spB8; f32 spB4; s32 spB0; s32 spAC; - s32 i; - TargetContextEntry* entry; - f32 temp1; f32 var1; f32 var2; - Vec3f* vec; + s32 i; + actor = targetCtx->targetedActor; gfxCtx = globalCtx->state.gfxCtx; - func_800C6AC4(gfxArr, globalCtx->state.gfxCtx, "../z_actor.c", 2029); + Graph_OpenDisps(dispRefs, globalCtx->state.gfxCtx, "../z_actor.c", 2029); - if (targetCtx->unk_48 != 0) - { + if (targetCtx->unk_48 != 0) { player = PLAYER; spCE = 0xFF; var1 = 1.0f; - if (targetCtx->unk_4B != 0) + if (targetCtx->unk_4B != 0) { spB8 = 1; - else + } else { spB8 = 3; - - if (targetCtx->targetedActor != NULL) - { - Math_Vec3f_Copy(&targetCtx->targetCenterPos, &targetCtx->targetedActor->posRot2.pos); - var1 = (500.0f - targetCtx->unk_44) / 420.0f; } - else - { - targetCtx->unk_48 -= 0x78; - if (targetCtx->unk_48 < 0) + + if (actor != NULL) { + Math_Vec3f_Copy(&targetCtx->targetCenterPos, &actor->posRot2.pos); + var1 = (500.0f - targetCtx->unk_44) / 420.0f; + } else { + targetCtx->unk_48 -= 120; + if (targetCtx->unk_48 < 0) { targetCtx->unk_48 = 0; + } spCE = targetCtx->unk_48; } func_8002BE04(globalCtx, &targetCtx->targetCenterPos, &spBC, &spB4); - temp1 = ((spBC.x * spB4) * 160.0f) * var1; - spBC.x = (temp1 < -320.0f) ? -320.0f : ((temp1 > 320.0f) ? 320.0f : temp1); + temp1 = ((spBC.x * spB4) * 160) * var1; + spBC.x = (temp1 < -320) ? -320 : ((temp1 > 320) ? 320 : temp1); - temp1 = ((spBC.y * spB4) * 120.0f) * var1; - spBC.y = (temp1 < -240.0f) ? -240.0f : ((temp1 > 240.0f) ? 240.0f : temp1); + temp1 = ((spBC.y * spB4) * 120) * var1; + spBC.y = (temp1 < -240) ? -240 : ((temp1 > 240) ? 240 : temp1); - spBC.z *= var1; + spBC.z = spBC.z * var1; targetCtx->unk_4C--; - if (targetCtx->unk_4C < 0) + if (targetCtx->unk_4C < 0) { targetCtx->unk_4C = 2; + } func_8002BE64(targetCtx, targetCtx->unk_4C, spBC.x, spBC.y, spBC.z); - if ((!(player->stateFlags1 & 0x40)) || (targetCtx->targetedActor != player->unk_664)) - { - gfxCtx->overlay.p = func_80093774(gfxCtx->overlay.p, 0x39); + if ((!(player->stateFlags1 & 0x40)) || (actor != player->unk_664)) { + gfxCtx->overlay.p = Gfx_CallSetupDL(gfxCtx->overlay.p, 0x39); - for (spB0 = 0, spAC = targetCtx->unk_4C; spB0 < spB8; spB0++) - { + for (spB0 = 0, spAC = targetCtx->unk_4C; spB0 < spB8; spB0++) { entry = &targetCtx->arr_50[spAC]; - if (entry->unk_0C < 500.0f) - { - if (entry->unk_0C <= 120.0f) + if (entry->unk_0C < 500.0f) { + if (entry->unk_0C <= 120.0f) { var2 = 0.15f; - else + } else { var2 = ((entry->unk_0C - 120.0f) * 0.001f) + 0.15f; + } Matrix_Translate(entry->pos.x, entry->pos.y, 0.0f, MTXMODE_NEW); Matrix_Scale(var2, 0.15f, 1.0f, MTXMODE_APPLY); - gDPSetPrimColor(gfxCtx->overlay.p++, 0, 0, - entry->color.r, entry->color.g, entry->color.b, (u8)spCE); + gDPSetPrimColor(gfxCtx->overlay.p++, 0, 0, entry->color.r, entry->color.g, entry->color.b, + (u8)spCE); Matrix_RotateZ((targetCtx->unk_4B & 0x7F) * (M_PI / 64), MTXMODE_APPLY); - for (i = 0; i < 4; i++) - { + for (i = 0; i < 4; i++) { Matrix_RotateZ(M_PI / 2, MTXMODE_APPLY); Matrix_Push(); Matrix_Translate(entry->unk_0C, entry->unk_0C, 0.0f, MTXMODE_APPLY); - gSPMatrix(gfxCtx->overlay.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_actor.c", 2116), G_MTX_MODELVIEW | G_MTX_LOAD); + gSPMatrix(gfxCtx->overlay.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_actor.c", 2116), + G_MTX_MODELVIEW | G_MTX_LOAD); gSPDisplayList(gfxCtx->overlay.p++, &D_0404D450); Matrix_Pull(); } } spCE = spCE - (0xFF / 3); - if (spCE < 0) + if (spCE < 0) { spCE = 0; + } spAC = (spAC + 1) % 3; } } } actor = targetCtx->unk_94; - if ((actor != NULL) && !(actor->flags & 0x8000000)) - { + if ((actor != NULL) && !(actor->flags & 0x8000000)) { NaviColor* naviColor = &sNaviColorList[actor->type]; - gfxCtx->polyXlu.p = func_80093774(gfxCtx->polyXlu.p, 0x7); + gfxCtx->polyXlu.p = Gfx_CallSetupDL(gfxCtx->polyXlu.p, 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_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); + Matrix_Scale((iREG(27) + 35) / 1000.0f, (iREG(28) + 60) / 1000.0f, (iREG(29) + 50) / 1000.0f, MTXMODE_APPLY); - gDPSetPrimColor(gfxCtx->polyXlu.p++, 0, 0, - naviColor->inner.r, naviColor->inner.g, naviColor->inner.b, 0xFF); - gSPMatrix(gfxCtx->polyXlu.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_actor.c", 2153), G_MTX_MODELVIEW | G_MTX_LOAD); + gDPSetPrimColor(gfxCtx->polyXlu.p++, 0, 0, naviColor->inner.r, naviColor->inner.g, naviColor->inner.b, 0xFF); + gSPMatrix(gfxCtx->polyXlu.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_actor.c", 2153), + G_MTX_MODELVIEW | G_MTX_LOAD); gSPDisplayList(gfxCtx->polyXlu.p++, &D_0400CB70); } - func_800C6B54(gfxArr, globalCtx->state.gfxCtx, "../z_actor.c", 2158); + Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_actor.c", 2158); } #else #pragma GLOBAL_ASM("asm/non_matchings/code/z_actor/func_8002C124.s") #endif -void func_8002C7BC(TargetContext* targetCtx, Player* player, Actor* actorArg, GlobalContext* globalCtx) -{ +void func_8002C7BC(TargetContext* targetCtx, Player* player, Actor* actorArg, GlobalContext* globalCtx) { s32 pad; Actor* unkActor; s32 actorType; @@ -487,39 +453,37 @@ void func_8002C7BC(TargetContext* targetCtx, Player* player, Actor* actorArg, Gl unkActor = NULL; - if ((player->unk_664 != NULL) && (player->unk_84B[player->unk_846] == 2)) + if ((player->unk_664 != NULL) && (player->unk_84B[player->unk_846] == 2)) { targetCtx->unk_94 = NULL; - else - { + } else { func_80032AF0(globalCtx, &globalCtx->actorCtx, &unkActor, player); targetCtx->unk_94 = unkActor; } - if (targetCtx->unk_8C != NULL) - { + if (targetCtx->unk_8C != NULL) { unkActor = targetCtx->unk_8C; targetCtx->unk_8C = NULL; - } - else if (actorArg != NULL) + } else if (actorArg != NULL) { unkActor = actorArg; + } - if (unkActor != NULL) + if (unkActor != NULL) { actorType = unkActor->type; - else + } else { actorType = player->actor.type; + } - if ((unkActor != targetCtx->arrowPointedActor) || (actorType != targetCtx->activeType)) - { + if ((unkActor != targetCtx->arrowPointedActor) || (actorType != targetCtx->activeType)) { targetCtx->arrowPointedActor = unkActor; targetCtx->activeType = actorType; targetCtx->unk_40 = 1.0f; } - if (unkActor == NULL) + if (unkActor == NULL) { unkActor = &player->actor; + } - if (Math_ApproxF(&targetCtx->unk_40, 0.0f, 0.25f) == 0) - { + if (Math_ApproxF(&targetCtx->unk_40, 0.0f, 0.25f) == 0) { temp1 = 0.25f / targetCtx->unk_40; temp2 = unkActor->posRot.pos.x - targetCtx->naviRefPos.x; temp3 = (unkActor->posRot.pos.y + (unkActor->unk_4C * unkActor->scale.y)) - targetCtx->naviRefPos.y; @@ -527,26 +491,25 @@ void func_8002C7BC(TargetContext* targetCtx, Player* player, Actor* actorArg, Gl targetCtx->naviRefPos.x += temp2 * temp1; targetCtx->naviRefPos.y += temp3 * temp1; targetCtx->naviRefPos.z += temp4 * temp1; - } - else + } else { func_8002BF60(targetCtx, unkActor, actorType, globalCtx); - - if ((actorArg != NULL) && (targetCtx->unk_4B == 0)) - { - func_8002BE04(globalCtx, &actorArg->posRot2.pos, &sp50, &sp4C); - if (((sp50.z <= 0.0f) || (1.0f <= fabsf(sp50.x * sp4C))) || (1.0f <= fabsf(sp50.y * sp4C))) - actorArg = NULL; } - if (actorArg != NULL) - { - if (actorArg != targetCtx->targetedActor) - { + if ((actorArg != NULL) && (targetCtx->unk_4B == 0)) { + func_8002BE04(globalCtx, &actorArg->posRot2.pos, &sp50, &sp4C); + if (((sp50.z <= 0.0f) || (1.0f <= fabsf(sp50.x * sp4C))) || (1.0f <= fabsf(sp50.y * sp4C))) { + actorArg = NULL; + } + } + + if (actorArg != NULL) { + if (actorArg != targetCtx->targetedActor) { func_8002BE98(targetCtx, actorArg->type, globalCtx); targetCtx->targetedActor = actorArg; - if (actorArg->id == ACTOR_EN_BOOM) + if (actorArg->id == ACTOR_EN_BOOM) { targetCtx->unk_48 = 0; + } lockOnSfxId = ((actorArg->flags & 5) == 5) ? NA_SE_SY_LOCK_ON : NA_SE_SY_LOCK_ON_HUMAN; func_80078884(lockOnSfxId); @@ -556,21 +519,17 @@ void func_8002C7BC(TargetContext* targetCtx, Player* player, Actor* actorArg, Gl targetCtx->targetCenterPos.y = actorArg->posRot.pos.y - (actorArg->shape.unk_08 * actorArg->scale.y); targetCtx->targetCenterPos.z = actorArg->posRot.pos.z; - if (targetCtx->unk_4B == 0) - { + if (targetCtx->unk_4B == 0) { temp5 = (500.0f - targetCtx->unk_44) * 3.0f; temp6 = (temp5 < 30.0f) ? 30.0f : ((100.0f < temp5) ? 100.0f : temp5); - if (Math_ApproxF(&targetCtx->unk_44, 80.0f, temp6) != 0) + if (Math_ApproxF(&targetCtx->unk_44, 80.0f, temp6) != 0) { targetCtx->unk_4B++; - } - else - { + } + } else { targetCtx->unk_4B = (targetCtx->unk_4B + 3) | 0x80; targetCtx->unk_44 = 120.0f; } - } - else - { + } else { targetCtx->targetedActor = NULL; Math_ApproxF(&targetCtx->unk_44, 500.0f, 80.0f); } @@ -579,166 +538,155 @@ void func_8002C7BC(TargetContext* targetCtx, Player* player, Actor* actorArg, Gl /** * Tests if current scene switch flag is set. */ -s32 Flags_GetSwitch(GlobalContext* globalCtx, s32 flag) -{ - if (flag < 0x20) +s32 Flags_GetSwitch(GlobalContext* globalCtx, s32 flag) { + if (flag < 0x20) { return globalCtx->actorCtx.flags.swch & (1 << flag); - else + } else { return globalCtx->actorCtx.flags.tempSwch & (1 << flag); + } } /** * Sets current scene switch flag. */ -void Flags_SetSwitch(GlobalContext* globalCtx, s32 flag) -{ - if (flag < 0x20) +void Flags_SetSwitch(GlobalContext* globalCtx, s32 flag) { + if (flag < 0x20) { globalCtx->actorCtx.flags.swch |= (1 << flag); - else + } else { globalCtx->actorCtx.flags.tempSwch |= (1 << flag); + } } /** * Unsets current scene switch flag. */ -void Flags_UnsetSwitch(GlobalContext* globalCtx, s32 flag) -{ - if (flag < 0x20) +void Flags_UnsetSwitch(GlobalContext* globalCtx, s32 flag) { + if (flag < 0x20) { globalCtx->actorCtx.flags.swch &= ~(1 << flag); - else + } else { globalCtx->actorCtx.flags.tempSwch &= ~(1 << flag); + } } /** * Tests if current scene unknown flag is set. */ -s32 Flags_GetUnknown(GlobalContext* globalCtx, s32 flag) -{ - if (flag < 0x20) +s32 Flags_GetUnknown(GlobalContext* globalCtx, s32 flag) { + if (flag < 0x20) { return globalCtx->actorCtx.flags.unk0 & (1 << flag); - else + } else { return globalCtx->actorCtx.flags.unk1 & (1 << flag); + } } /** * Sets current scene unknown flag. */ -void Flags_SetUnknown(GlobalContext* globalCtx, s32 flag) -{ - if (flag < 0x20) +void Flags_SetUnknown(GlobalContext* globalCtx, s32 flag) { + if (flag < 0x20) { globalCtx->actorCtx.flags.unk0 |= (1 << flag); - else + } else { globalCtx->actorCtx.flags.unk1 |= (1 << flag); + } } /** * Unsets current scene unknown flag. */ -void Flags_UnsetUnknown(GlobalContext* globalCtx, s32 flag) -{ - if (flag < 0x20) +void Flags_UnsetUnknown(GlobalContext* globalCtx, s32 flag) { + if (flag < 0x20) { globalCtx->actorCtx.flags.unk0 &= ~(1 << flag); - else + } else { globalCtx->actorCtx.flags.unk1 &= ~(1 << flag); + } } /** * Tests if current scene chest flag is set. */ -s32 Flags_GetTreasure(GlobalContext* globalCtx, s32 flag) -{ +s32 Flags_GetTreasure(GlobalContext* globalCtx, s32 flag) { return globalCtx->actorCtx.flags.chest & (1 << flag); } /** * Sets current scene chest flag. */ -void Flags_SetTreasure(GlobalContext* globalCtx, s32 flag) -{ +void Flags_SetTreasure(GlobalContext* globalCtx, s32 flag) { globalCtx->actorCtx.flags.chest |= (1 << flag); } /** * Tests if current scene clear flag is set. */ -s32 Flags_GetClear(GlobalContext* globalCtx, s32 flag) -{ +s32 Flags_GetClear(GlobalContext* globalCtx, s32 flag) { return globalCtx->actorCtx.flags.clear & (1 << flag); } /** * Sets current scene clear flag. */ -void Flags_SetClear(GlobalContext* globalCtx, s32 flag) -{ +void Flags_SetClear(GlobalContext* globalCtx, s32 flag) { globalCtx->actorCtx.flags.clear |= (1 << flag); } /** * Unsets current scene clear flag. */ -void Flags_UnsetClear(GlobalContext* globalCtx, s32 flag) -{ +void Flags_UnsetClear(GlobalContext* globalCtx, s32 flag) { globalCtx->actorCtx.flags.clear &= ~(1 << flag); } /** * Tests if current scene temp clear flag is set. */ -s32 Flags_GetTempClear(GlobalContext* globalCtx, s32 flag) -{ +s32 Flags_GetTempClear(GlobalContext* globalCtx, s32 flag) { return globalCtx->actorCtx.flags.tempClear & (1 << flag); } /** * Sets current scene temp clear flag. */ -void Flags_SetTempClear(GlobalContext* globalCtx, s32 flag) -{ +void Flags_SetTempClear(GlobalContext* globalCtx, s32 flag) { globalCtx->actorCtx.flags.tempClear |= 1 << flag; } /** * Unsets current scene temp clear flag. */ -void Flags_UnsetTempClear(GlobalContext* globalCtx, s32 flag) -{ +void Flags_UnsetTempClear(GlobalContext* globalCtx, s32 flag) { globalCtx->actorCtx.flags.tempClear &= ~(1 << flag); } /** * Tests if current scene collectible flag is set. */ -s32 Flags_GetCollectible(GlobalContext* globalCtx, s32 flag) -{ - if (flag < 0x20) +s32 Flags_GetCollectible(GlobalContext* globalCtx, s32 flag) { + if (flag < 0x20) { return globalCtx->actorCtx.flags.collect & (1 << flag); - else + } else { return globalCtx->actorCtx.flags.tempCollect & (1 << flag); + } } /** * Sets current scene collectible flag. */ -void Flags_SetCollectible(GlobalContext* globalCtx, s32 flag) -{ - if (flag != 0) - { - if (flag < 0x20) +void Flags_SetCollectible(GlobalContext* globalCtx, s32 flag) { + if (flag != 0) { + if (flag < 0x20) { globalCtx->actorCtx.flags.collect |= 1 << flag; - else + } else { globalCtx->actorCtx.flags.tempCollect |= 1 << flag; + } } } -void func_8002CDE4(GlobalContext* globalCtx, TitleCardContext* titleCtx) -{ +void func_8002CDE4(GlobalContext* globalCtx, TitleCardContext* titleCtx) { titleCtx->delayA = titleCtx->delayB = titleCtx->unk_E = titleCtx->unk_C = 0; } -void TitleCard_InitBossName(GlobalContext* globalCtx, TitleCardContext* titleCtx, u32 texture, - s16 arg3, s16 arg4, u8 arg5, u8 arg6) -{ +void TitleCard_InitBossName(GlobalContext* globalCtx, TitleCardContext* titleCtx, u32 texture, s16 arg3, s16 arg4, + u8 arg5, u8 arg6) { titleCtx->texture = texture; titleCtx->unk_4 = arg3; titleCtx->unk_6 = arg4; @@ -748,14 +696,14 @@ void TitleCard_InitBossName(GlobalContext* globalCtx, TitleCardContext* titleCtx titleCtx->delayB = 0; } -void TitleCard_InitPlaceName(GlobalContext* globalCtx, TitleCardContext* titleCtx, u32 texture, - s32 arg3, s32 arg4, s32 arg5, s32 arg6, s32 arg7) -{ +void TitleCard_InitPlaceName(GlobalContext* globalCtx, TitleCardContext* titleCtx, u32 texture, s32 arg3, s32 arg4, + s32 arg5, s32 arg6, s32 arg7) { Scene* loadedScene = globalCtx->loadedScene; u32 size = loadedScene->titleVromEnd - loadedScene->titleVromStart; - if ((size != 0) && (size <= 0x3000)) + if ((size != 0) && (size <= 0x3000)) { DmaMgr_SendRequest1(texture, loadedScene->titleVromStart, size, "../z_actor.c", 2765); + } titleCtx->texture = texture; titleCtx->unk_4 = arg3; @@ -766,41 +714,31 @@ void TitleCard_InitPlaceName(GlobalContext* globalCtx, TitleCardContext* titleCt titleCtx->delayB = arg7; } -void TitleCard_Update(GlobalContext* globalCtx, TitleCardContext* titleCtx) -{ - if (DECR(titleCtx->delayB) == 0) - { - if (DECR(titleCtx->delayA) == 0) - { +void TitleCard_Update(GlobalContext* globalCtx, TitleCardContext* titleCtx) { + if (DECR(titleCtx->delayB) == 0) { + if (DECR(titleCtx->delayA) == 0) { Math_ApproxS(&titleCtx->unk_C, 0, 30); Math_ApproxS(&titleCtx->unk_E, 0, 70); - } - else - { + } else { Math_ApproxS(&titleCtx->unk_C, 255, 10); Math_ApproxS(&titleCtx->unk_E, 255, 20); } } } -#ifdef NON_MATCHING -// major ordering and stack usage differences -void TitleCard_Draw(GlobalContext* globalCtx, TitleCardContext* titleCtx) -{ +void TitleCard_Draw(GlobalContext* globalCtx, TitleCardContext* titleCtx) { s32 spCC; s32 spC8; s32 unk1; s32 spC0; - s32 unk2; + s32 sp38; s32 spB8; s32 spB4; s32 spB0; GraphicsContext* gfxCtx; - Gfx* gfxArr[4]; - s32 sp38; + Gfx* dispRefs[4]; - if (titleCtx->unk_C != 0) - { + if (titleCtx->unk_C != 0) { spCC = titleCtx->unk_8; spC8 = titleCtx->unk_9; spC0 = (titleCtx->unk_4 * 4) - (spCC * 2); @@ -808,66 +746,43 @@ void TitleCard_Draw(GlobalContext* globalCtx, TitleCardContext* titleCtx) sp38 = spCC * 2; gfxCtx = globalCtx->state.gfxCtx; - - func_800C6AC4(gfxArr, globalCtx->state.gfxCtx, "../z_actor.c", 2824); + Graph_OpenDisps(dispRefs, globalCtx->state.gfxCtx, "../z_actor.c", 2824); spB0 = spCC * spC8 * gSaveContext.language; - spC8 = (spCC * spC8 > 0x1000) ? 0x1000 / spCC : spC8; + spB4 = spB8 + (spC8 * 4); - spB4 = (spC8 * 4) + spB8; + if (1) {} // Necessary to match gfxCtx->overlay.p = func_80093808(gfxCtx->overlay.p); - gDPSetPrimColor(gfxCtx->overlay.p++, 0, 0, - (u8)titleCtx->unk_E, (u8)titleCtx->unk_E, - (u8)titleCtx->unk_E, (u8)titleCtx->unk_C); + gDPSetPrimColor(gfxCtx->overlay.p++, 0, 0, (u8)titleCtx->unk_E, (u8)titleCtx->unk_E, (u8)titleCtx->unk_E, + (u8)titleCtx->unk_C); - gDPLoadTextureBlock(gfxCtx->overlay.p++, - 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); + gDPLoadTextureBlock(gfxCtx->overlay.p++, 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(gfxCtx->overlay.p++, spC0, spB8, - ((sp38 * 2) + spC0) - 4, spB8 - 1, G_TX_RENDERTILE, - 0, 0, 1024, 1024); + gSPTextureRectangle(gfxCtx->overlay.p++, 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(gfxCtx->overlay.p++, - 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, + if (spC8 > 0) { + gDPLoadTextureBlock(gfxCtx->overlay.p++, 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(gfxCtx->overlay.p++, spC0, spB4, - ((sp38 * 2) + spC0) - 4, spB4 - 1, G_TX_RENDERTILE, - 0, 0, 1024, 1024); + gSPTextureRectangle(gfxCtx->overlay.p++, spC0, spB4, ((sp38 * 2) + spC0) - 4, spB4 + (spC8 * 4) - 1, + G_TX_RENDERTILE, 0, 0, 1024, 1024); } - func_800C6B54(gfxArr, globalCtx->state.gfxCtx, "../z_actor.c", 2880); + Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_actor.c", 2880); } } -#else -#pragma GLOBAL_ASM("asm/non_matchings/code/z_actor/TitleCard_Draw.s") -#endif -s32 func_8002D53C(GlobalContext* globalCtx, TitleCardContext* titleCtx) -{ - if ((globalCtx->actorCtx.titleCtx.delayB != 0) || - (globalCtx->actorCtx.titleCtx.unk_C != 0)) - { +s32 func_8002D53C(GlobalContext* globalCtx, TitleCardContext* titleCtx) { + if ((globalCtx->actorCtx.titleCtx.delayB != 0) || (globalCtx->actorCtx.titleCtx.unk_C != 0)) { titleCtx->delayA = 0; titleCtx->delayB = 0; return 0; @@ -876,20 +791,17 @@ s32 func_8002D53C(GlobalContext* globalCtx, TitleCardContext* titleCtx) return 1; } -void Actor_Kill(Actor* actor) -{ +void Actor_Kill(Actor* actor) { actor->draw = NULL; actor->update = NULL; actor->flags &= ~0x1; } -void Actor_InitPosRot(Actor* actor) -{ +void Actor_InitPosRot(Actor* actor) { actor->posRot = actor->initPosRot; } -void Actor_SetHeight(Actor* actor, f32 offset) -{ +void Actor_SetHeight(Actor* actor, f32 offset) { actor->posRot2.pos.x = actor->posRot.pos.x; actor->posRot2.pos.y = actor->posRot.pos.y + offset; actor->posRot2.pos.z = actor->posRot.pos.z; @@ -899,30 +811,25 @@ void Actor_SetHeight(Actor* actor, f32 offset) actor->posRot2.rot.z = actor->posRot.rot.z; } -void func_8002D5F4(Actor* actor) -{ +void func_8002D5F4(Actor* actor) { actor->posRot.rot = actor->shape.rot; } -void func_8002D610(Actor* actor) -{ +void func_8002D610(Actor* actor) { actor->shape.rot = actor->posRot.rot; } -void Actor_SetScale(Actor* actor, f32 scale) -{ +void Actor_SetScale(Actor* actor, f32 scale) { actor->scale.z = scale; actor->scale.y = scale; actor->scale.x = scale; } -void Actor_SetObjectDependency(GlobalContext* globalCtx, Actor* actor) -{ +void Actor_SetObjectDependency(GlobalContext* globalCtx, Actor* actor) { gSegments[6] = PHYSICAL_TO_VIRTUAL(globalCtx->objectCtx.status[actor->objBankIndex].segment); } -void Actor_Init(Actor* actor, GlobalContext* globalCtx) -{ +void Actor_Init(Actor* actor, GlobalContext* globalCtx) { Actor_InitPosRot(actor); func_8002D610(actor); Actor_SetHeight(actor, 0.0f); @@ -938,26 +845,21 @@ void Actor_Init(Actor* actor, GlobalContext* globalCtx) func_80061E48(&actor->sub_98); actor->floorPolySource = 0x32; ActorShape_Init(&actor->shape, 0.0f, NULL, 0.0f); - if (Object_IsLoaded(&globalCtx->objectCtx, actor->objBankIndex)) - { + if (Object_IsLoaded(&globalCtx->objectCtx, actor->objBankIndex)) { Actor_SetObjectDependency(globalCtx, actor); actor->init(actor, globalCtx); actor->init = NULL; } } -void Actor_Destroy(Actor* actor, GlobalContext* globalCtx) -{ +void Actor_Destroy(Actor* actor, GlobalContext* globalCtx) { ActorOverlay* overlayEntry; char* name; - if (actor->destroy != NULL) - { + if (actor->destroy != NULL) { actor->destroy(actor, globalCtx); actor->destroy = NULL; - } - else - { + } else { overlayEntry = actor->overlayEntry; name = overlayEntry->name != NULL ? overlayEntry->name : ""; @@ -966,111 +868,94 @@ void Actor_Destroy(Actor* actor, GlobalContext* globalCtx) } } -void func_8002D7EC(Actor* actor) -{ +void func_8002D7EC(Actor* actor) { f32 speedRate = R_UPDATE_RATE * 0.5f; actor->posRot.pos.x += (actor->velocity.x * speedRate) + actor->sub_98.displacement.x; actor->posRot.pos.y += (actor->velocity.y * speedRate) + actor->sub_98.displacement.y; actor->posRot.pos.z += (actor->velocity.z * speedRate) + actor->sub_98.displacement.z; } -void func_8002D868(Actor* actor) -{ +void func_8002D868(Actor* actor) { actor->velocity.x = Math_Sins(actor->posRot.rot.y) * actor->speedXZ; actor->velocity.z = Math_Coss(actor->posRot.rot.y) * actor->speedXZ; actor->velocity.y += actor->gravity; - if (actor->velocity.y < actor->minVelocityY) + if (actor->velocity.y < actor->minVelocityY) { actor->velocity.y = actor->minVelocityY; + } } -void Actor_MoveForward(Actor* actor) -{ +void Actor_MoveForward(Actor* actor) { func_8002D868(actor); func_8002D7EC(actor); } -void func_8002D908(Actor* actor) -{ +void func_8002D908(Actor* actor) { f32 sp24 = Math_Coss(actor->posRot.rot.x) * actor->speedXZ; actor->velocity.x = Math_Sins(actor->posRot.rot.y) * sp24; actor->velocity.y = Math_Sins(actor->posRot.rot.x) * actor->speedXZ; actor->velocity.z = Math_Coss(actor->posRot.rot.y) * sp24; } -void func_8002D97C(Actor* actor) -{ +void func_8002D97C(Actor* actor) { func_8002D908(actor); func_8002D7EC(actor); } -void func_8002D9A4(Actor* actor, f32 arg1) -{ +void func_8002D9A4(Actor* actor, f32 arg1) { actor->speedXZ = Math_Coss(actor->posRot.rot.x) * arg1; actor->velocity.y = -Math_Sins(actor->posRot.rot.x) * arg1; } -void func_8002D9F8(Actor* actor, UNK_PTR arg1) -{ +void func_8002D9F8(Actor* actor, UNK_PTR arg1) { Vec3f sp1C; - func_800A54FC(arg1, &sp1C, actor->shape.rot.y, actor); + func_800A54FC(arg1, &sp1C, actor->shape.rot.y); actor->posRot.pos.x += sp1C.x * actor->scale.x; actor->posRot.pos.y += sp1C.y * actor->scale.y; actor->posRot.pos.z += sp1C.z * actor->scale.z; } -s16 func_8002DA78(Actor* actorA, Actor* actorB) -{ +s16 func_8002DA78(Actor* actorA, Actor* actorB) { return Math_Vec3f_Yaw(&actorA->posRot.pos, &actorB->posRot.pos); } -s16 func_8002DA9C(Actor* actorA, Actor* actorB) -{ +s16 func_8002DA9C(Actor* actorA, Actor* actorB) { return Math_Vec3f_Yaw(&actorA->posRot2.pos, &actorB->posRot2.pos); } -s16 func_8002DAC0(Actor* actor, Vec3f* arg1) -{ +s16 func_8002DAC0(Actor* actor, Vec3f* arg1) { return Math_Vec3f_Yaw(&actor->posRot.pos, arg1); } -s16 func_8002DAE0(Actor* actorA, Actor* actorB) -{ +s16 func_8002DAE0(Actor* actorA, Actor* actorB) { return Math_Vec3f_Pitch(&actorA->posRot.pos, &actorB->posRot.pos); } -s16 func_8002DB04(Actor* actorA, Actor* actorB) -{ +s16 func_8002DB04(Actor* actorA, Actor* actorB) { return Math_Vec3f_Pitch(&actorA->posRot2.pos, &actorB->posRot2.pos); } -s16 func_8002DB28(Actor* actor, Vec3f* arg1) -{ +s16 func_8002DB28(Actor* actor, Vec3f* arg1) { return Math_Vec3f_Pitch(&actor->posRot.pos, arg1); } -f32 func_8002DB48(Actor* actorA, Actor* actorB) -{ +f32 func_8002DB48(Actor* actorA, Actor* actorB) { return Math_Vec3f_DistXYZ(&actorA->posRot.pos, &actorB->posRot.pos); } -f32 func_8002DB6C(Actor* actor, Vec3f* arg1) -{ +f32 func_8002DB6C(Actor* actor, Vec3f* arg1) { return Math_Vec3f_DistXYZ(&actor->posRot.pos, arg1); } -f32 func_8002DB8C(Actor* actorA, Actor* actorB) -{ +f32 func_8002DB8C(Actor* actorA, Actor* actorB) { return Math_Vec3f_DistXZ(&actorA->posRot.pos, &actorB->posRot.pos); } -f32 func_8002DBB0(Actor* actor, Vec3f* arg1) -{ +f32 func_8002DBB0(Actor* actor, Vec3f* arg1) { return Math_Vec3f_DistXZ(&actor->posRot.pos, arg1); } -void func_8002DBD0(Actor* actor, Vec3f* result, Vec3f* arg2) -{ +void func_8002DBD0(Actor* actor, Vec3f* result, Vec3f* arg2) { f32 cosRot2Y; f32 sinRot2Y; f32 deltaX; @@ -1086,72 +971,64 @@ void func_8002DBD0(Actor* actor, Vec3f* result, Vec3f* arg2) result->y = arg2->y - actor->posRot.pos.y; } -f32 Actor_HeightDiff(Actor* actorA, Actor* actorB) -{ +f32 Actor_HeightDiff(Actor* actorA, Actor* actorB) { return actorB->posRot.pos.y - actorA->posRot.pos.y; } -f32 func_8002DC84(Player* player) -{ +f32 func_8002DC84(Player* player) { f32 offset = (player->stateFlags1 & 0x800000) ? 32.0f : 0.0f; - if (LINK_IS_ADULT) + if (LINK_IS_ADULT) { return offset + 68.0f; - else + } else { return offset + 44.0f; + } } -f32 func_8002DCE4(Player* player) -{ - if (player->stateFlags1 & 0x800000) +f32 func_8002DCE4(Player* player) { + if (player->stateFlags1 & 0x800000) { return 8.0f; - else if (player->stateFlags1 & 0x8000000) + } else if (player->stateFlags1 & 0x8000000) { return (R_RUN_SPEED_LIMIT / 100.0f) * 0.6f; - else + } else { return R_RUN_SPEED_LIMIT / 100.0f; + } } -s32 func_8002DD6C(Player* player) -{ +s32 func_8002DD6C(Player* player) { return player->stateFlags1 & 0x8; } -s32 func_8002DD78(Player* player) -{ +s32 func_8002DD78(Player* player) { return func_8002DD6C(player) && player->unk_834; } -s32 func_8002DDA8(GlobalContext* globalCtx) -{ +s32 func_8002DDA8(GlobalContext* globalCtx) { Player* player = PLAYER; return (player->stateFlags1 & 0x800) || func_8002DD78(player); } -s32 func_8002DDE4(GlobalContext* globalCtx) -{ +s32 func_8002DDE4(GlobalContext* globalCtx) { Player* player = PLAYER; return player->stateFlags2 & 0x8; } -s32 func_8002DDF4(GlobalContext* globalCtx) -{ +s32 func_8002DDF4(GlobalContext* globalCtx) { Player* player = PLAYER; return player->stateFlags2 & 0x1000; } -typedef struct -{ - /* 0x000 */ Actor actor; - /* 0x14C */ char unk_14C[0xB4]; - /* 0x200 */ Actor* unk_200; - /* 0x204 */ f32 unk_204; - /* 0x208 */ f32 unk_208; - /* 0x20C */ f32 unk_20C; - /* 0x210 */ s16 unk_210; +typedef struct { + /* 0x000 */ Actor actor; + /* 0x14C */ char unk_14C[0xB4]; + /* 0x200 */ Actor* unk_200; + /* 0x204 */ f32 unk_204; + /* 0x208 */ f32 unk_208; + /* 0x20C */ f32 unk_20C; + /* 0x210 */ s16 unk_210; } ActorArmsHook; -void func_8002DE04(GlobalContext* globalCtx, Actor* actorA, Actor* actorB) -{ +void func_8002DE04(GlobalContext* globalCtx, Actor* actorA, Actor* actorB) { ActorArmsHook* hookActor; hookActor = (ActorArmsHook*)Actor_Find(&globalCtx->actorCtx, 0x0066, ACTORTYPE_ITEMACTION); @@ -1163,31 +1040,27 @@ void func_8002DE04(GlobalContext* globalCtx, Actor* actorA, Actor* actorB) actorA->flags &= ~0x2000; } -void func_8002DE74(GlobalContext* globalCtx, Player* player) -{ - if ((globalCtx->roomCtx.curRoom.unk_03 != 4) && func_800C0CB8(globalCtx)) +void func_8002DE74(GlobalContext* globalCtx, Player* player) { + if ((globalCtx->roomCtx.curRoom.unk_03 != 4) && func_800C0CB8(globalCtx)) { func_8005A77C(func_800C04A4(globalCtx, 0), 6); + } } -void func_8002DECC(GlobalContext* globalCtx, Player* player, Actor* actor) -{ +void func_8002DECC(GlobalContext* globalCtx, Player* player, Actor* actor) { player->rideActor = actor; player->stateFlags1 |= 0x800000; actor->attachedB = &player->actor; } -s32 func_8002DEEC(Player* player) -{ +s32 func_8002DEEC(Player* player) { return (player->stateFlags1 & 0x20000080) || player->action; } -void func_8002DF18(GlobalContext* globalCtx, ActorContext* actorCtx) -{ +void func_8002DF18(GlobalContext* globalCtx, ActorContext* actorCtx) { func_8006DC68(globalCtx, actorCtx); } -u32 func_8002DF38(GlobalContext* globalCtx, Actor* actor, u8 newAction) -{ +u32 func_8002DF38(GlobalContext* globalCtx, Actor* actor, u8 newAction) { Player* player = PLAYER; player->action = newAction; player->unk_448 = actor; @@ -1196,8 +1069,7 @@ u32 func_8002DF38(GlobalContext* globalCtx, Actor* actor, u8 newAction) return 1; } -s32 func_8002DF54(GlobalContext* globalCtx, Actor* actor, u8 arg2) -{ +s32 func_8002DF54(GlobalContext* globalCtx, Actor* actor, u8 arg2) { Player* player = PLAYER; func_8002DF38(globalCtx, actor, arg2); player->unk_46A = 1; @@ -1205,96 +1077,91 @@ s32 func_8002DF54(GlobalContext* globalCtx, Actor* actor, u8 arg2) return 1; } -void func_8002DF90(DynaPolyActor* dynaActor) -{ +void func_8002DF90(DynaPolyActor* dynaActor) { dynaActor->unk_154 = 0.0f; dynaActor->unk_150 = 0.0f; } -void func_8002DFA4(DynaPolyActor* dynaActor, f32 arg1, s16 arg2) -{ +void func_8002DFA4(DynaPolyActor* dynaActor, f32 arg1, s16 arg2) { dynaActor->unk_150 += arg1; dynaActor->unk_158 = arg2; } -s32 func_8002DFC8(Actor* actor, s16 arg1, GlobalContext* globalCtx) -{ +s32 func_8002DFC8(Actor* actor, s16 arg1, GlobalContext* globalCtx) { Player* player = PLAYER; s16 var = (s16)(actor->rotTowardsLinkY + 0x8000) - player->actor.shape.rot.y; - if (ABS(var) < arg1) + if (ABS(var) < arg1) { return 1; + } return 0; } -s32 func_8002E020(Actor* actorA, Actor* actorB, s16 arg2) -{ +s32 func_8002E020(Actor* actorA, Actor* actorB, s16 arg2) { s16 var = (s16)(func_8002DA78(actorA, actorB) + 0x8000) - actorB->shape.rot.y; - if (ABS(var) < arg2) + if (ABS(var) < arg2) { return 1; + } return 0; } -s32 func_8002E084(Actor* actor, s16 arg1) -{ +s32 func_8002E084(Actor* actor, s16 arg1) { s16 var = actor->rotTowardsLinkY - actor->shape.rot.y; - if (ABS(var) < arg1) + if (ABS(var) < arg1) { return 1; + } return 0; } -s32 func_8002E0D0(Actor* actorA, Actor* actorB, s16 arg2) -{ +s32 func_8002E0D0(Actor* actorA, Actor* actorB, s16 arg2) { s16 var = func_8002DA78(actorA, actorB) - actorA->shape.rot.y; - if (ABS(var) < arg2) + if (ABS(var) < arg2) { return 1; + } return 0; } -s32 func_8002E12C(Actor* actor, f32 arg1, s16 arg2) -{ +s32 func_8002E12C(Actor* actor, f32 arg1, s16 arg2) { s16 var = actor->rotTowardsLinkY - actor->shape.rot.y; - if (ABS(var) < arg2) - { + if (ABS(var) < arg2) { f32 xyzDistanceFromLink = sqrtf(SQ(actor->xzDistanceFromLink) + SQ(actor->yDistanceFromLink)); - if (xyzDistanceFromLink < arg1) + if (xyzDistanceFromLink < arg1) { return 1; + } } return 0; } -s32 func_8002E1A8(Actor* actorA, Actor* actorB, f32 arg2, s16 arg3) -{ - if (func_8002DB48(actorA, actorB) < arg2) - { +s32 func_8002E1A8(Actor* actorA, Actor* actorB, f32 arg2, s16 arg3) { + if (func_8002DB48(actorA, actorB) < arg2) { s16 var = func_8002DA78(actorA, actorB) - actorA->shape.rot.y; - if (ABS(var) < arg3) + if (ABS(var) < arg3) { return 1; + } } return 0; } -s32 func_8002E234(Actor* actor, f32 arg1, s32 arg2) -{ - if ((actor->bgCheckFlags & 0x1) && (arg1 < -11.0f)) - { +s32 func_8002E234(Actor* actor, f32 arg1, s32 arg2) { + if ((actor->bgCheckFlags & 0x1) && (arg1 < -11.0f)) { actor->bgCheckFlags &= ~0x1; actor->bgCheckFlags |= 0x4; - if ((actor->velocity.y < 0.0f) && (arg2 & 0x10)) + if ((actor->velocity.y < 0.0f) && (arg2 & 0x10)) { actor->velocity.y = 0.0f; + } return 0; } @@ -1305,8 +1172,7 @@ s32 func_8002E234(Actor* actor, f32 arg1, s32 arg2) UNK_TYPE D_8015BBA0; u32 D_8015BBA4; -s32 func_8002E2AC(GlobalContext* globalCtx, Actor* actor, Vec3f* arg2, s32 arg3) -{ +s32 func_8002E2AC(GlobalContext* globalCtx, Actor* actor, Vec3f* arg2, s32 arg3) { f32 sp34; u32 sp30; @@ -1315,25 +1181,22 @@ s32 func_8002E2AC(GlobalContext* globalCtx, Actor* actor, Vec3f* arg2, s32 arg3) actor->unk_80 = func_8003CA0C(globalCtx, &globalCtx->colCtx, &actor->floorPoly, &sp30, actor, arg2); actor->bgCheckFlags &= ~0x0086; - if (actor->unk_80 <= -32000.0f) + if (actor->unk_80 <= -32000.0f) { return func_8002E234(actor, -32000.0f, arg3); + } sp34 = actor->unk_80 - actor->posRot.pos.y; actor->floorPolySource = sp30; - if (sp34 >= 0.0f) - { + if (sp34 >= 0.0f) { actor->bgCheckFlags |= 0x80; - if (actor->bgCheckFlags & 0x10) - { - if (sp30 != D_8015BBA4) - { - if (sp34 > 15.0f) + if (actor->bgCheckFlags & 0x10) { + if (sp30 != D_8015BBA4) { + if (sp34 > 15.0f) { actor->bgCheckFlags |= 0x100; - } - else - { + } + } else { actor->posRot.pos.x = actor->pos4.x; actor->posRot.pos.z = actor->pos4.z; } @@ -1341,23 +1204,22 @@ s32 func_8002E2AC(GlobalContext* globalCtx, Actor* actor, Vec3f* arg2, s32 arg3) actor->posRot.pos.y = actor->unk_80; - if (actor->velocity.y <= 0.0f) - { - if (!(actor->bgCheckFlags & 0x1)) + if (actor->velocity.y <= 0.0f) { + if (!(actor->bgCheckFlags & 0x1)) { actor->bgCheckFlags |= 0x2; - else if ((arg3 & 0x8) && (actor->gravity < 0.0f)) + } else if ((arg3 & 0x8) && (actor->gravity < 0.0f)) { actor->velocity.y = -4.0f; - else + } else { actor->velocity.y = 0.0f; + } actor->bgCheckFlags |= 0x1; func_80043334(&globalCtx->colCtx, actor, actor->floorPolySource); } - } - else - { - if ((actor->bgCheckFlags & 0x1) && (sp34 >= -11.0f)) + } else { + if ((actor->bgCheckFlags & 0x1) && (sp34 >= -11.0f)) { func_80043334(&globalCtx->colCtx, actor, actor->floorPolySource); + } return func_8002E234(actor, sp34, arg3); } @@ -1365,8 +1227,7 @@ s32 func_8002E2AC(GlobalContext* globalCtx, Actor* actor, Vec3f* arg2, s32 arg3) return 1; } -void func_8002E4B4(GlobalContext* globalCtx, Actor* actor, f32 arg2, f32 arg3, f32 arg4, s32 arg5) -{ +void func_8002E4B4(GlobalContext* globalCtx, Actor* actor, f32 arg2, f32 arg3, f32 arg4, s32 arg5) { f32 sp74; s32 pad; Vec3f sp64; @@ -1379,58 +1240,50 @@ void func_8002E4B4(GlobalContext* globalCtx, Actor* actor, f32 arg2, f32 arg3, f sp74 = actor->posRot.pos.y - actor->pos4.y; - if ((actor->floorPolySource != 0x32) && (actor->bgCheckFlags & 1)) + if ((actor->floorPolySource != 0x32) && (actor->bgCheckFlags & 1)) { func_800433A4(&globalCtx->colCtx, actor->floorPolySource, actor); + } - if (arg5 & 1) - { - if ((!(arg5 & 0x80) && func_8003D52C(&globalCtx->colCtx, &sp64, &actor->posRot.pos, - &actor->pos4, arg3, &actor->wallPoly, &sp60, actor, arg2)) || - ((arg5 & 0x80) && func_8003D594(&globalCtx->colCtx, &sp64, &actor->posRot.pos, - &actor->pos4, arg3, &actor->wallPoly, &sp60, actor, arg2))) - { + if (arg5 & 1) { + if ((!(arg5 & 0x80) && func_8003D52C(&globalCtx->colCtx, &sp64, &actor->posRot.pos, &actor->pos4, arg3, + &actor->wallPoly, &sp60, actor, arg2)) || + ((arg5 & 0x80) && func_8003D594(&globalCtx->colCtx, &sp64, &actor->posRot.pos, &actor->pos4, arg3, + &actor->wallPoly, &sp60, actor, arg2))) { sp5C = actor->wallPoly; Math_Vec3f_Copy(&actor->posRot.pos, &sp64); actor->unk_7E = atan2s(sp5C->norm.z, sp5C->norm.x); actor->bgCheckFlags |= 8; actor->wallPolySource = sp60; - } - else + } else { actor->bgCheckFlags &= ~8; + } } sp64.x = actor->posRot.pos.x; sp64.z = actor->posRot.pos.z; - if (arg5 & 2) - { + if (arg5 & 2) { sp64.y = actor->pos4.y + 10.0f; - if (func_8003D7A0(&globalCtx->colCtx, &sp58, &sp64, (arg4 + sp74) - 10.0f, &D_8015BBA0, &D_8015BBA4, actor)) - { + if (func_8003D7A0(&globalCtx->colCtx, &sp58, &sp64, (arg4 + sp74) - 10.0f, &D_8015BBA0, &D_8015BBA4, actor)) { actor->bgCheckFlags |= 0x10; actor->posRot.pos.y = (sp58 + sp74) - 10.0f; - } - else + } else { actor->bgCheckFlags &= ~0x10; + } } - if (arg5 & 4) - { + if (arg5 & 4) { sp64.y = actor->pos4.y; func_8002E2AC(globalCtx, actor, &sp64, arg5); sp50 = actor->posRot.pos.y; - if (func_8004213C(globalCtx, &globalCtx->colCtx, actor->posRot.pos.x, actor->posRot.pos.z, &sp50, &sp54)) - { + if (func_8004213C(globalCtx, &globalCtx->colCtx, actor->posRot.pos.x, actor->posRot.pos.z, &sp50, &sp54)) { actor->unk_84 = sp50 - actor->posRot.pos.y; - if (actor->unk_84 < 0.0f) + if (actor->unk_84 < 0.0f) { actor->bgCheckFlags &= ~0x60; - else - { - if (!(actor->bgCheckFlags & 0x20)) - { + } else { + if (!(actor->bgCheckFlags & 0x20)) { actor->bgCheckFlags |= 0x40; - if (!(arg5 & 0x40)) - { + if (!(arg5 & 0x40)) { sp44.x = actor->posRot.pos.x; sp44.y = sp50; sp44.z = actor->posRot.pos.z; @@ -1441,9 +1294,7 @@ void func_8002E4B4(GlobalContext* globalCtx, Actor* actor, f32 arg2, f32 arg3, f } actor->bgCheckFlags |= 0x20; } - } - else - { + } else { actor->bgCheckFlags &= ~0x60; actor->unk_84 = -32000.0f; } @@ -1452,8 +1303,7 @@ void func_8002E4B4(GlobalContext* globalCtx, Actor* actor, f32 arg2, f32 arg3, f s32 D_8015BBA8[16]; -Gfx* func_8002E830(Vec3f* object, Vec3f* eye, Vec3f* lightDir, GraphicsContext* gfxCtx, Gfx* gfx, Hilite** hilite) -{ +Gfx* func_8002E830(Vec3f* object, Vec3f* eye, Vec3f* lightDir, GraphicsContext* gfxCtx, Gfx* gfx, Hilite** hilite) { Gfx* lookAt; f32 correctedEyeX; @@ -1463,20 +1313,15 @@ Gfx* func_8002E830(Vec3f* object, Vec3f* eye, Vec3f* lightDir, GraphicsContext* *hilite = Graph_Alloc(gfxCtx, sizeof(Hilite)); - if (HREG(80) == 6) + if (HREG(80) == 6) { osSyncPrintf("z_actor.c 3529 eye=[%f(%f) %f %f] object=[%f %f %f] light_direction=[%f %f %f]\n", - (f64)correctedEyeX, (f64)eye->x, (f64)eye->y, (f64)eye->z, - (f64)object->x, (f64)object->y, (f64) object->z, - (f64)lightDir->x, (f64)lightDir->y, (f64)lightDir->z); + (f64)correctedEyeX, (f64)eye->x, (f64)eye->y, (f64)eye->z, (f64)object->x, (f64)object->y, + (f64)object->z, (f64)lightDir->x, (f64)lightDir->y, (f64)lightDir->z); + } func_800ABE74(correctedEyeX, eye->y, eye->z); - func_80103A70(&D_8015BBA8, lookAt, *hilite, - correctedEyeX, eye->y, eye->z, - object->x, object->y, object->z, - 0.0f, 1.0f, 0.0f, - lightDir->x, lightDir->y, lightDir->z, - lightDir->x, lightDir->y, lightDir->z, - 0x10, 0x10); + func_80103A70(&D_8015BBA8, lookAt, *hilite, correctedEyeX, eye->y, eye->z, object->x, object->y, object->z, 0.0f, + 1.0f, 0.0f, lightDir->x, lightDir->y, lightDir->z, lightDir->x, lightDir->y, lightDir->z, 0x10, 0x10); gSPLookAt(gfx++, lookAt); gDPSetHilite1Tile(gfx++, 1, *hilite, 0x10, 0x10); @@ -1484,73 +1329,69 @@ Gfx* func_8002E830(Vec3f* object, Vec3f* eye, Vec3f* lightDir, GraphicsContext* return gfx; } -Hilite* func_8002EABC(Vec3f* object, Vec3f* eye, Vec3f* lightDir, GraphicsContext* gfxCtx) -{ +Hilite* func_8002EABC(Vec3f* object, Vec3f* eye, Vec3f* lightDir, GraphicsContext* gfxCtx) { Hilite* hilite; - Gfx* gfxArr[5]; + Gfx* dispRefs[5]; - func_800C6AC4(gfxArr, gfxCtx, "../z_actor.c", 4306); + Graph_OpenDisps(dispRefs, gfxCtx, "../z_actor.c", 4306); gfxCtx->polyOpa.p = func_8002E830(object, eye, lightDir, gfxCtx, gfxCtx->polyOpa.p, &hilite); - func_800C6B54(gfxArr, gfxCtx, "../z_actor.c", 4313); + Graph_CloseDisps(dispRefs, gfxCtx, "../z_actor.c", 4313); return hilite; } -Hilite* func_8002EB44(Vec3f* object, Vec3f* eye, Vec3f* lightDir, GraphicsContext* gfxCtx) -{ +Hilite* func_8002EB44(Vec3f* object, Vec3f* eye, Vec3f* lightDir, GraphicsContext* gfxCtx) { Hilite* hilite; - Gfx* gfxArr[5]; + Gfx* dispRefs[5]; - func_800C6AC4(gfxArr, gfxCtx, "../z_actor.c", 4332); + Graph_OpenDisps(dispRefs, gfxCtx, "../z_actor.c", 4332); gfxCtx->polyXlu.p = func_8002E830(object, eye, lightDir, gfxCtx, gfxCtx->polyXlu.p, &hilite); - func_800C6B54(gfxArr, gfxCtx, "../z_actor.c", 4339); + Graph_CloseDisps(dispRefs, gfxCtx, "../z_actor.c", 4339); return hilite; } -void func_8002EBCC(Actor* actor, GlobalContext* globalCtx, s32 flag) -{ +void func_8002EBCC(Actor* actor, GlobalContext* globalCtx, s32 flag) { Hilite* hilite; Vec3f lightDir; Gfx* displayListHead; Gfx* displayList; GraphicsContext* gfxCtx; - Gfx* gfxArr[4]; + Gfx* dispRefs[4]; lightDir.x = globalCtx->unk_10A4E; lightDir.y = globalCtx->unk_10A4F; lightDir.z = globalCtx->unk_10A50; - if (HREG(80) == 6) - osSyncPrintf("z_actor.c 3637 game_play->view.eye=[%f(%f) %f %f]\n", - (f64)globalCtx->view.eye.x, (f64)globalCtx->view.eye.y, (f64)globalCtx->view.eye.z); + if (HREG(80) == 6) { + osSyncPrintf("z_actor.c 3637 game_play->view.eye=[%f(%f) %f %f]\n", (f64)globalCtx->view.eye.x, + (f64)globalCtx->view.eye.y, (f64)globalCtx->view.eye.z); + } hilite = func_8002EABC(&actor->posRot.pos, &globalCtx->view.eye, &lightDir, globalCtx->state.gfxCtx); - if (flag != 0) - { + if (flag != 0) { displayList = Graph_Alloc(globalCtx->state.gfxCtx, 2 * sizeof(Gfx)); displayListHead = displayList; gfxCtx = globalCtx->state.gfxCtx; - func_800C6AC4(gfxArr, globalCtx->state.gfxCtx, "../z_actor.c", 4384); + Graph_OpenDisps(dispRefs, globalCtx->state.gfxCtx, "../z_actor.c", 4384); gDPSetHilite1Tile(displayListHead++, 1, hilite, 0x10, 0x10); gSPEndDisplayList(displayListHead); gSPSegment(gfxCtx->polyOpa.p++, 0x07, displayList); - func_800C6B54(gfxArr, globalCtx->state.gfxCtx, "../z_actor.c", 4394); + Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_actor.c", 4394); } } -void func_8002ED80(Actor* actor, GlobalContext* globalCtx, s32 flag) -{ +void func_8002ED80(Actor* actor, GlobalContext* globalCtx, s32 flag) { Hilite* hilite; Vec3f lightDir; Gfx* displayListHead; Gfx* displayList; GraphicsContext* gfxCtx; - Gfx* gfxArr[4]; + Gfx* dispRefs[4]; lightDir.x = globalCtx->unk_10A4E; lightDir.y = globalCtx->unk_10A4F; @@ -1558,38 +1399,34 @@ void func_8002ED80(Actor* actor, GlobalContext* globalCtx, s32 flag) hilite = func_8002EB44(&actor->posRot.pos, &globalCtx->view.eye, &lightDir, globalCtx->state.gfxCtx); - if (flag != 0) - { + if (flag != 0) { displayList = Graph_Alloc(globalCtx->state.gfxCtx, 2 * sizeof(Gfx)); displayListHead = displayList; gfxCtx = globalCtx->state.gfxCtx; - func_800C6AC4(gfxArr, globalCtx->state.gfxCtx, "../z_actor.c", 4429); + Graph_OpenDisps(dispRefs, globalCtx->state.gfxCtx, "../z_actor.c", 4429); gDPSetHilite1Tile(displayListHead++, 1, hilite, 0x10, 0x10); gSPEndDisplayList(displayListHead); gSPSegment(gfxCtx->polyXlu.p++, 0x07, displayList); - func_800C6B54(gfxArr, globalCtx->state.gfxCtx, "../z_actor.c", 4439); + Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_actor.c", 4439); } } -PosRot* func_8002EEE4(PosRot* arg0, Actor* actor) -{ +PosRot* func_8002EEE4(PosRot* arg0, Actor* actor) { *arg0 = actor->posRot2; return arg0; } -PosRot* func_8002EF14(PosRot* arg0, Actor* actor) -{ +PosRot* func_8002EF14(PosRot* arg0, Actor* actor) { *arg0 = actor->posRot; return arg0; } -PosRot* func_8002EF44(PosRot* arg0, Actor* actor) -{ +PosRot* func_8002EF44(PosRot* arg0, Actor* actor) { PosRot sp1C; Math_Vec3f_Copy(&sp1C.pos, &actor->posRot.pos); @@ -1601,24 +1438,24 @@ PosRot* func_8002EF44(PosRot* arg0, Actor* actor) #ifdef NON_MATCHING // single regalloc difference -f32 func_8002EFC0(Actor* actor, Player* player, s16 arg2) -{ +f32 func_8002EFC0(Actor* actor, Player* player, s16 arg2) { s16 var; s16 abs_var; var = (s16)(actor->rotTowardsLinkY - 0x8000) - arg2; abs_var = ABS(var); - if (player->unk_664 != NULL) - { - if ((abs_var > 0x4000) || (actor->flags & 0x8000000)) + if (player->unk_664 != NULL) { + if ((abs_var > 0x4000) || (actor->flags & 0x8000000)) { return FLT_MAX; - else + } else { return actor->waterSurfaceDist - actor->waterSurfaceDist * 0.8f * ((0x4000 - abs_var) * 3.0517578125e-05f); + } } - if (abs_var > 0x2AAA) + if (abs_var > 0x2AAA) { return FLT_MAX; + } return actor->waterSurfaceDist; } @@ -1627,48 +1464,38 @@ extern f32 func_8002EFC0(Actor* actor, Player* player, s16 arg2); #pragma GLOBAL_ASM("asm/non_matchings/code/z_actor/func_8002EFC0.s") #endif -typedef struct -{ +typedef struct { f32 unk_0, unk_4; } struct_80115FF8; // size = 0x8 -struct_80115FF8 D_80115FF8[] = -{ - { 4900.0f, 0.5f }, - { 28900.0f, 0.6666667f }, - { 78400.0f, 0.05f }, - { 122500.0f, 0.6666667f }, - { 490000.0f, 0.6666667f }, - { 1000000.0f, 0.6666667f }, - { 10000.0f, 0.94905096f }, - { 19600.0f, 0.85714287f }, - { 57600.0f, 0.41666666f }, - { 78400.0f, 0.001f }, +struct_80115FF8 D_80115FF8[] = { + { 4900.0f, 0.5f }, { 28900.0f, 0.6666667f }, { 78400.0f, 0.05f }, { 122500.0f, 0.6666667f }, + { 490000.0f, 0.6666667f }, { 1000000.0f, 0.6666667f }, { 10000.0f, 0.94905096f }, { 19600.0f, 0.85714287f }, + { 57600.0f, 0.41666666f }, { 78400.0f, 0.001f }, }; -u32 func_8002F090(Actor* actor, f32 arg1) -{ +u32 func_8002F090(Actor* actor, f32 arg1) { return arg1 < D_80115FF8[actor->unk_1F].unk_0; } -s32 func_8002F0C8(Actor* actor, Player* player, s32 flag) -{ +s32 func_8002F0C8(Actor* actor, Player* player, s32 flag) { s16 var; s16 abs_var; f32 dist; - if ((actor->update == NULL) || !(actor->flags & 1)) + if ((actor->update == NULL) || !(actor->flags & 1)) { return 1; + } - if (!flag) - { + if (!flag) { var = (s16)(actor->rotTowardsLinkY - 0x8000) - player->actor.shape.rot.y; abs_var = ABS(var); - if ((player->unk_664 == NULL) && (abs_var > 0x2AAA)) + if ((player->unk_664 == NULL) && (abs_var > 0x2AAA)) { dist = FLT_MAX; - else + } else { dist = actor->waterSurfaceDist; + } return !func_8002F090(actor, D_80115FF8[actor->unk_1F].unk_4 * dist); } @@ -1676,10 +1503,8 @@ s32 func_8002F0C8(Actor* actor, Player* player, s32 flag) return 0; } -u32 func_8002F194(Actor* actor, GlobalContext* globalCtx) -{ - if (actor->flags & 0x100) - { +u32 func_8002F194(Actor* actor, GlobalContext* globalCtx) { + if (actor->flags & 0x100) { actor->flags &= ~0x100; return 1; } @@ -1687,18 +1512,16 @@ u32 func_8002F194(Actor* actor, GlobalContext* globalCtx) return 0; } -s32 func_8002F1C4(Actor* actor, GlobalContext* globalCtx, f32 arg2, f32 arg3, u32 arg4) -{ +s32 func_8002F1C4(Actor* actor, GlobalContext* globalCtx, f32 arg2, f32 arg3, u32 arg4) { Player* player = PLAYER; // This is convoluted but it seems like it must be a single if statement to match - if ((player->actor.flags & 0x100) || - ((arg4 != 0) && func_8008E988(globalCtx)) || + if ((player->actor.flags & 0x100) || ((arg4 != 0) && func_8008E988(globalCtx)) || ((actor->unk_10C == 0) && - ((arg3 < fabsf(actor->yDistanceFromLink)) || - (player->unk_698 < actor->xzDistanceFromLink) || - (arg2 < actor->xzDistanceFromLink)))) + ((arg3 < fabsf(actor->yDistanceFromLink)) || (player->unk_698 < actor->xzDistanceFromLink) || + (arg2 < actor->xzDistanceFromLink)))) { return 0; + } player->unk_694 = actor; player->unk_698 = actor->xzDistanceFromLink; @@ -1707,38 +1530,33 @@ s32 func_8002F1C4(Actor* actor, GlobalContext* globalCtx, f32 arg2, f32 arg3, u3 return 1; } -s32 func_8002F298(Actor* actor, GlobalContext* globalCtx, f32 arg2, u32 arg3) -{ +s32 func_8002F298(Actor* actor, GlobalContext* globalCtx, f32 arg2, u32 arg3) { return func_8002F1C4(actor, globalCtx, arg2, arg2, arg3); } -s32 func_8002F2CC(Actor* actor, GlobalContext* globalCtx, f32 arg2) -{ +s32 func_8002F2CC(Actor* actor, GlobalContext* globalCtx, f32 arg2) { return func_8002F298(actor, globalCtx, arg2, 0); } -s32 func_8002F2F4(Actor* actor, GlobalContext* globalCtx) -{ +s32 func_8002F2F4(Actor* actor, GlobalContext* globalCtx) { f32 var1 = 50.0f + actor->sub_98.unk_10; return func_8002F2CC(actor, globalCtx, var1); } -u32 func_8002F334(Actor* actor, GlobalContext* globalCtx) -{ - if (func_8010BDBC(&globalCtx->msgCtx) == 2) +u32 func_8002F334(Actor* actor, GlobalContext* globalCtx) { + if (func_8010BDBC(&globalCtx->msgCtx) == 2) { return 1; - else + } else { return 0; + } } -s8 func_8002F368(GlobalContext* globalCtx) -{ +s8 func_8002F368(GlobalContext* globalCtx) { Player* player = PLAYER; return player->exchangeItemId; } -void func_8002F374(GlobalContext* globalCtx, Actor* actor, s16* arg2, s16* arg3) -{ +void func_8002F374(GlobalContext* globalCtx, Actor* actor, s16* arg2, s16* arg3) { Vec3f sp1C; f32 sp18; @@ -1747,31 +1565,26 @@ void func_8002F374(GlobalContext* globalCtx, Actor* actor, s16* arg2, s16* arg3) *arg3 = sp1C.y * sp18 * -120.0f + 120.0f; } -u32 func_8002F410(Actor* actor, GlobalContext* globalCtx) -{ - if (actor->attachedA != NULL) +u32 func_8002F410(Actor* actor, GlobalContext* globalCtx) { + if (actor->attachedA != NULL) { return 1; - else + } else { return 0; + } } -s32 func_8002F434(Actor* actor, GlobalContext* globalCtx, s32 getItemId, f32 xzRange, f32 yRange) -{ +s32 func_8002F434(Actor* actor, GlobalContext* globalCtx, s32 getItemId, f32 xzRange, f32 yRange) { Player* player = PLAYER; s16 var; s32 abs_var; - if (!(player->stateFlags1 & 0x3C7080) && func_8008F29C(player) < 0) - { + if (!(player->stateFlags1 & 0x3C7080) && func_8008F29C(player) < 0) { if ((((player->heldActor != NULL) || (actor == player->unk_694)) && (getItemId > 0) && (getItemId < 0x7E)) || - (!(player->stateFlags1 & 0x20000800))) - { - if ((actor->xzDistanceFromLink < xzRange) && (fabsf(actor->yDistanceFromLink) < yRange)) - { + (!(player->stateFlags1 & 0x20000800))) { + if ((actor->xzDistanceFromLink < xzRange) && (fabsf(actor->yDistanceFromLink) < yRange)) { var = actor->rotTowardsLinkY - player->actor.shape.rot.y; abs_var = ABS(var); - if ((getItemId != 0) || (player->getItemDirection < abs_var)) - { + if ((getItemId != 0) || (player->getItemDirection < abs_var)) { player->getItemId = getItemId; player->interactRangeActor = actor; player->getItemDirection = abs_var; @@ -1784,30 +1597,26 @@ s32 func_8002F434(Actor* actor, GlobalContext* globalCtx, s32 getItemId, f32 xzR return 0; } -void func_8002F554(Actor* actor, GlobalContext* globalCtx, s32 getItemId) -{ +void func_8002F554(Actor* actor, GlobalContext* globalCtx, s32 getItemId) { func_8002F434(actor, globalCtx, getItemId, 50.0f, 10.0f); } -void func_8002F580(Actor* actor, GlobalContext* globalCtx) -{ +void func_8002F580(Actor* actor, GlobalContext* globalCtx) { func_8002F554(actor, globalCtx, 0); } -u32 func_8002F5A0(Actor* actor, GlobalContext* globalCtx) -{ - if (actor->attachedA == NULL) +u32 func_8002F5A0(Actor* actor, GlobalContext* globalCtx) { + if (actor->attachedA == NULL) { return 1; - else + } else { return 0; + } } -void func_8002F5C4(Actor* actorA, Actor* actorB, GlobalContext* globalCtx) -{ +void func_8002F5C4(Actor* actorA, Actor* actorB, GlobalContext* globalCtx) { Actor* actorAttachedA = actorA->attachedA; - if (actorAttachedA->id == ACTOR_PLAYER) - { + if (actorAttachedA->id == ACTOR_PLAYER) { Player* player = (Player*)actorAttachedA; player->heldActor = actorB; player->interactRangeActor = actorB; @@ -1818,28 +1627,26 @@ void func_8002F5C4(Actor* actorA, Actor* actorB, GlobalContext* globalCtx) actorA->attachedA = NULL; } -void func_8002F5F0(Actor* actor, GlobalContext* globalCtx) -{ +void func_8002F5F0(Actor* actor, GlobalContext* globalCtx) { Player* player = PLAYER; - if (actor->waterSurfaceDist < player->unk_6A4) + if (actor->waterSurfaceDist < player->unk_6A4) { player->unk_6A4 = actor->waterSurfaceDist; + } } -u32 func_8002F618(GlobalContext* globalCtx, Actor* actor) -{ - if (actor->attachedB != NULL) +u32 func_8002F618(GlobalContext* globalCtx, Actor* actor) { + if (actor->attachedB != NULL) { return 1; - else + } else { return 0; + } } -u32 func_8002F63C(GlobalContext* globalCtx, Actor* actor, s32 arg2) -{ +u32 func_8002F63C(GlobalContext* globalCtx, Actor* actor, s32 arg2) { Player* player = PLAYER; - if (!(player->stateFlags1 & 0x003C7880)) - { + if (!(player->stateFlags1 & 0x003C7880)) { player->rideActor = actor; player->unk_43C = arg2; return 1; @@ -1848,16 +1655,15 @@ u32 func_8002F63C(GlobalContext* globalCtx, Actor* actor, s32 arg2) return 0; } -u32 func_8002F674(GlobalContext* globalCtx, Actor* actor) -{ - if (actor->attachedB == NULL) +u32 func_8002F674(GlobalContext* globalCtx, Actor* actor) { + if (actor->attachedB == NULL) { return 1; - else + } else { return 0; + } } -void func_8002F698(GlobalContext* globalCtx, u32 arg1, f32 arg2, s16 arg3, f32 arg4, u32 arg5, u32 arg6) -{ +void func_8002F698(GlobalContext* globalCtx, u32 arg1, f32 arg2, s16 arg3, f32 arg4, u32 arg5, u32 arg6) { Player* player = PLAYER; player->unk_8A0 = arg6; player->unk_8A1 = arg5; @@ -1866,97 +1672,84 @@ void func_8002F698(GlobalContext* globalCtx, u32 arg1, f32 arg2, s16 arg3, f32 a player->unk_8A8 = arg4; } -void func_8002F6D4(GlobalContext* globalCtx, u32 arg1, f32 arg2, s16 arg3, f32 arg4, u32 arg5) -{ +void func_8002F6D4(GlobalContext* globalCtx, u32 arg1, f32 arg2, s16 arg3, f32 arg4, u32 arg5) { func_8002F698(globalCtx, arg1, arg2, arg3, arg4, 2, arg5); } -void func_8002F71C(GlobalContext* globalCtx, u32 arg1, f32 arg2, s16 arg3, f32 arg4) -{ +void func_8002F71C(GlobalContext* globalCtx, u32 arg1, f32 arg2, s16 arg3, f32 arg4) { func_8002F6D4(globalCtx, arg1, arg2, arg3, arg4, 0); } -void func_8002F758(GlobalContext* globalCtx, u32 arg1, f32 arg2, s16 arg3, f32 arg4, u32 arg5) -{ +void func_8002F758(GlobalContext* globalCtx, u32 arg1, f32 arg2, s16 arg3, f32 arg4, u32 arg5) { func_8002F698(globalCtx, arg1, arg2, arg3, arg4, 1, arg5); } -void func_8002F7A0(GlobalContext* globalCtx, u32 arg1, f32 arg2, s16 arg3, f32 arg4) -{ +void func_8002F7A0(GlobalContext* globalCtx, u32 arg1, f32 arg2, s16 arg3, f32 arg4) { func_8002F758(globalCtx, arg1, arg2, arg3, arg4, 0); } -void func_8002F7DC(Actor* actor, u16 sfxId) -{ +void func_8002F7DC(Actor* actor, u16 sfxId) { Audio_PlaySoundGeneral(sfxId, &actor->unk_E4, 4, &D_801333E0, &D_801333E0, &D_801333E8); } -void Audio_PlayActorSound2(Actor* actor, u16 sfxId) -{ +void Audio_PlayActorSound2(Actor* actor, u16 sfxId) { func_80078914(&actor->unk_E4, sfxId); } -void func_8002F850(GlobalContext* globalCtx, Actor* actor) -{ +void func_8002F850(GlobalContext* globalCtx, Actor* actor) { s32 sfxId; - if (actor->bgCheckFlags & 0x20) - { - if (actor->unk_84 < 20.0f) + if (actor->bgCheckFlags & 0x20) { + if (actor->unk_84 < 20.0f) { sfxId = NA_SE_PL_WALK_WATER0; - else + } else { sfxId = NA_SE_PL_WALK_WATER1; - } - else + } + } else { sfxId = func_80041F34(&globalCtx->colCtx, actor->floorPoly, actor->floorPolySource, actor); + } func_80078914(&actor->unk_E4, NA_SE_EV_BOMB_BOUND); func_80078914(&actor->unk_E4, sfxId + 0x800); } -void func_8002F8F0(Actor* actor, u16 sfxId) -{ +void func_8002F8F0(Actor* actor, u16 sfxId) { actor->soundEffect = sfxId; actor->flags |= 0x80000; actor->flags &= ~0x10300000; } -void func_8002F91C(Actor* actor, u16 sfxId) -{ +void func_8002F91C(Actor* actor, u16 sfxId) { actor->soundEffect = sfxId; actor->flags |= 0x100000; actor->flags &= ~0x10280000; } -void func_8002F948(Actor* actor, u16 sfxId) -{ +void func_8002F948(Actor* actor, u16 sfxId) { actor->soundEffect = sfxId; actor->flags |= 0x200000; actor->flags &= ~0x10180000; } -void func_8002F974(Actor* actor, u16 sfxId) -{ +void func_8002F974(Actor* actor, u16 sfxId) { actor->flags &= ~0x10380000; actor->soundEffect = sfxId; } -void func_8002F994(Actor* actor, s32 sfxId) -{ +void func_8002F994(Actor* actor, s32 sfxId) { actor->flags |= 0x10000000; actor->flags &= ~0x00380000; - if (sfxId < NA_SE_PL_LAND_GRASS) + if (sfxId < NA_SE_PL_LAND_GRASS) { actor->soundEffect = NA_SE_PL_WALK_DIRT; - else if (sfxId < NA_SE_PL_DIVE_BUBBLE) + } else if (sfxId < NA_SE_PL_DIVE_BUBBLE) { actor->soundEffect = NA_SE_PL_WALK_CONCRETE; - else + } else { actor->soundEffect = NA_SE_PL_WALK_SAND; + } } -s32 func_8002F9EC(GlobalContext* globalCtx, Actor* actor, UNK_TYPE arg2, UNK_TYPE arg3, UNK_TYPE arg4) -{ - if (func_80041D4C(&globalCtx->colCtx, arg2, arg3) == 8) - { +s32 func_8002F9EC(GlobalContext* globalCtx, Actor* actor, UNK_TYPE arg2, UNK_TYPE arg3, UNK_TYPE arg4) { + if (func_80041D4C(&globalCtx->colCtx, arg2, arg3) == 8) { globalCtx->unk_11D30[0] = 1; func_8005DFAC(globalCtx, 0, arg4); Audio_PlayActorSound2(actor, NA_SE_IT_WALL_HIT_BUYO); @@ -1972,12 +1765,10 @@ z_Light* D_8015BC10; s32 D_8015BC14; f32 D_8015BC18; -void func_8002FA60(GlobalContext* globalCtx) -{ +void func_8002FA60(GlobalContext* globalCtx) { Vec3f lightPos; - if (gSaveContext.fw.set) - { + if (gSaveContext.fw.set) { gSaveContext.respawn[RESPAWN_MODE_TOP].data = 0x28; gSaveContext.respawn[RESPAWN_MODE_TOP].pos.x = gSaveContext.fw.pos_x; gSaveContext.respawn[RESPAWN_MODE_TOP].pos.y = gSaveContext.fw.pos_y; @@ -1988,9 +1779,7 @@ void func_8002FA60(GlobalContext* globalCtx) gSaveContext.respawn[RESPAWN_MODE_TOP].room_index = gSaveContext.fw.room_index; gSaveContext.respawn[RESPAWN_MODE_TOP].temp_swch_flags = gSaveContext.fw.temp_swch_flags; gSaveContext.respawn[RESPAWN_MODE_TOP].temp_collect_flags = gSaveContext.fw.temp_collect_flags; - } - else - { + } else { gSaveContext.respawn[RESPAWN_MODE_TOP].data = 0; gSaveContext.respawn[RESPAWN_MODE_TOP].pos.x = 0.0f; gSaveContext.respawn[RESPAWN_MODE_TOP].pos.y = 0.0f; @@ -2014,15 +1803,16 @@ Color_RGB8 D_80116060 = { 0xFF, 0xFF, 0xFF }; Color_RGB8 D_80116064 = { 0x64, 0xC8, 0x00 }; #ifdef NON_MATCHING -// this function still needs a lot of work -void func_8002FBAC(GlobalContext* globalCtx) -{ +// saved register, stack usage and minor ordering differences +// this also doesn't generate a few useless struct copies +void func_8002FBAC(GlobalContext* globalCtx) { GraphicsContext* gfxCtx; - Gfx* gfxArr[6]; + Gfx* dispRefs[6]; Vec3f lightPos; f32 spD8; f32 spD4; s32 spD0; + s32 spCC; f32 spC0; Vec3f spB4; Vec3f spA4; @@ -2040,57 +1830,53 @@ void func_8002FBAC(GlobalContext* globalCtx) gfxCtx = globalCtx->state.gfxCtx; - func_800C6AC4(gfxArr, globalCtx->state.gfxCtx, "../z_actor.c", 5308); + Graph_OpenDisps(dispRefs, globalCtx->state.gfxCtx, "../z_actor.c", 5308); - if (gSaveContext.respawn[RESPAWN_MODE_TOP].data != 0) - { - if (LINK_IS_ADULT) + if (gSaveContext.respawn[RESPAWN_MODE_TOP].data != 0) { + if (LINK_IS_ADULT) { spD8 = 80.0f; - else + } else { spD8 = 60.0f; + } spD0 = 0xFF; spD4 = 1.0f; temp_a3 = gSaveContext.respawn[RESPAWN_MODE_TOP].data - 0x28; + spCC = temp_a3; - if (temp_a3 < 0) - { + if (temp_a3 < 0) { gSaveContext.respawn[RESPAWN_MODE_TOP].data++; spD4 = ABS(gSaveContext.respawn[RESPAWN_MODE_TOP].data) * 0.025f; D_8015BC14 = 60; D_8015BC18 = 1.0f; - } - else if (D_8015BC14 != 0) - { + } else if (D_8015BC14 != 0) { D_8015BC14--; - } - else if (D_8015BC18 > 0.0f) - { + } else if (D_8015BC18 > 0.0f) { spC0 = D_8015BC18; temp_ret = Math_Vec3f_DistXYZAndStoreDiff(&gSaveContext.respawn[RESPAWN_MODE_DOWN].pos, - &gSaveContext.respawn[RESPAWN_MODE_TOP].pos, - &spB4); + &gSaveContext.respawn[RESPAWN_MODE_TOP].pos, &spB4); - if (temp_ret < 20.0f) - { + if (temp_ret < 20.0f) { D_8015BC18 = 0.0f; - Math_Vec3f_Copy(&gSaveContext.respawn[RESPAWN_MODE_TOP].pos, &gSaveContext.respawn[RESPAWN_MODE_DOWN].pos); - } - else - { + Math_Vec3f_Copy(&gSaveContext.respawn[RESPAWN_MODE_TOP].pos, + &gSaveContext.respawn[RESPAWN_MODE_DOWN].pos); + } else { sp9C = (1.0f / D_8015BC18) * temp_ret; phi_f14 = 20.0f / sp9C; phi_f14 = (phi_f14 < 0.05f) ? 0.05f : phi_f14; Math_ApproxF(&D_8015BC18, 0.0f, phi_f14); temp_f2 = ((D_8015BC18 / spC0) * temp_ret) / temp_ret; - gSaveContext.respawn[RESPAWN_MODE_TOP].pos.x = gSaveContext.respawn[RESPAWN_MODE_DOWN].pos.x + (spB4.x * temp_f2); - gSaveContext.respawn[RESPAWN_MODE_TOP].pos.y = gSaveContext.respawn[RESPAWN_MODE_DOWN].pos.y + (spB4.y * temp_f2); - gSaveContext.respawn[RESPAWN_MODE_TOP].pos.z = gSaveContext.respawn[RESPAWN_MODE_DOWN].pos.z + (spB4.z * temp_f2); + gSaveContext.respawn[RESPAWN_MODE_TOP].pos.x = + gSaveContext.respawn[RESPAWN_MODE_DOWN].pos.x + (spB4.x * temp_f2); + gSaveContext.respawn[RESPAWN_MODE_TOP].pos.y = + gSaveContext.respawn[RESPAWN_MODE_DOWN].pos.y + (spB4.y * temp_f2); + gSaveContext.respawn[RESPAWN_MODE_TOP].pos.z = + gSaveContext.respawn[RESPAWN_MODE_DOWN].pos.z + (spB4.z * temp_f2); temp_f12 = sp9C * 0.5f; temp_f14 = temp_ret - temp_f12; spD8 += sqrtf((temp_f12 * temp_f12) - (temp_f14 * temp_f14)) * 0.2f; - osSyncPrintf("-------- DISPLAY Y=%f\n", (f64)spD8); + osSyncPrintf("-------- DISPLAY Y=%f\n", spD8); } spA4.x = Math_Rand_CenteredFloat(6.0f) + gSaveContext.respawn[RESPAWN_MODE_TOP].pos.x; @@ -2099,21 +1885,18 @@ void func_8002FBAC(GlobalContext* globalCtx) func_80028BB0(globalCtx, &spA4, &D_80116048, &D_80116054, &D_80116060, &D_80116064, 1000, 0x10); - if (D_8015BC18 == 0.0f) - { + if (D_8015BC18 == 0.0f) { gSaveContext.respawn[RESPAWN_MODE_TOP] = gSaveContext.respawn[RESPAWN_MODE_DOWN]; gSaveContext.respawn[RESPAWN_MODE_TOP].player_params = 0x06FF; gSaveContext.respawn[RESPAWN_MODE_TOP].data = 0x28; } + // somehow this shouldn't be optimized out gSaveContext.respawn[RESPAWN_MODE_TOP].pos = gSaveContext.respawn[RESPAWN_MODE_TOP].pos; - } - else if (temp_a3 > 0) - { + } else if (temp_a3 > 0) { temp_f12 = temp_a3 * 0.1f; - if (temp_f12 < 1.0f) - { + if (temp_f12 < 1.0f) { sp7C.x = globalCtx->view.eye.x; sp7C.y = globalCtx->view.eye.y - spD8; sp7C.z = globalCtx->view.eye.z; @@ -2129,49 +1912,46 @@ void func_8002FBAC(GlobalContext* globalCtx) spD0 = 0xFF - (((temp_a3 * 0x10) - temp_a3) * 2); - if (spD0 < 0) - { + if (spD0 < 0) { gSaveContext.fw.set = 0; gSaveContext.respawn[RESPAWN_MODE_TOP].data = 0; spD0 = 0; - } - else - { + } else { gSaveContext.respawn[RESPAWN_MODE_TOP].data++; } - spD4 = temp_a3 * 0.200000000000000011102230246252 + 1.0f; + spD4 = spCC * 0.200000000000000011102230246252 + 1.0f; } if ((globalCtx->csCtx.state == 0) && (gSaveContext.respawn[RESPAWN_MODE_TOP].entrance_index == gSaveContext.entrance_index) && - (globalCtx->roomCtx.curRoom.num == gSaveContext.respawn[RESPAWN_MODE_TOP].room_index)) - { - gfxCtx->polyXlu.p = func_80093774(gfxCtx->polyXlu.p, 0x19); + (globalCtx->roomCtx.curRoom.num == gSaveContext.respawn[RESPAWN_MODE_TOP].room_index)) { + gfxCtx->polyXlu.p = Gfx_CallSetupDL(gfxCtx->polyXlu.p, 0x19); Matrix_Translate(gSaveContext.respawn[RESPAWN_MODE_TOP].pos.x, gSaveContext.respawn[RESPAWN_MODE_TOP].pos.y + spD8, - gSaveContext.respawn[RESPAWN_MODE_TOP].pos.z, - MTXMODE_NEW); + gSaveContext.respawn[RESPAWN_MODE_TOP].pos.z, MTXMODE_NEW); Matrix_Scale(0.025f * spD4, 0.025f * spD4, 0.025f * spD4, MTXMODE_APPLY); Matrix_Mult(&globalCtx->mf_11D60, MTXMODE_APPLY); Matrix_Push(); gDPPipeSync(gfxCtx->polyXlu.p++); - gDPSetPrimColor(gfxCtx->polyXlu.p++, 0x80, 0x80, 0xFF, 0xFF, 0xC8, spD0); + gDPSetPrimColor(gfxCtx->polyXlu.p++, 0x80, 0x80, 0xFF, 0xFF, 0xC8, spD0); gDPSetEnvColor(gfxCtx->polyXlu.p++, 0x64, 0xC8, 0x00, 0xFF); phi_f10 = (globalCtx->gameplayFrames * 1500) & 0xFFFF; Matrix_RotateZ((phi_f10 * M_PI) / 32768.0f, MTXMODE_APPLY); - gSPMatrix(gfxCtx->polyXlu.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_actor.c", 5458), G_MTX_MODELVIEW | G_MTX_LOAD); + gSPMatrix(gfxCtx->polyXlu.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_actor.c", 5458), + G_MTX_MODELVIEW | G_MTX_LOAD); gSPDisplayList(gfxCtx->polyXlu.p++, &D_04010130); Matrix_Pull(); phi_f6 = ~((globalCtx->gameplayFrames * 1200) & 0xFFFF); Matrix_RotateZ((phi_f6 * M_PI) / 32768.0f, MTXMODE_APPLY); - gSPMatrix(gfxCtx->polyXlu.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_actor.c", 5463), G_MTX_MODELVIEW | G_MTX_LOAD); + gSPMatrix(gfxCtx->polyXlu.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_actor.c", 5463), + G_MTX_MODELVIEW | G_MTX_LOAD); gSPDisplayList(gfxCtx->polyXlu.p++, &D_04010130); } @@ -2179,31 +1959,28 @@ void func_8002FBAC(GlobalContext* globalCtx) lightPos.y = gSaveContext.respawn[RESPAWN_MODE_TOP].pos.y + spD8; lightPos.z = gSaveContext.respawn[RESPAWN_MODE_TOP].pos.z; - Lights_InitType0PositionalLight(&D_8015BC00, lightPos.x, lightPos.y, lightPos.z, 0xFF, 0xFF, 0xFF, 500.0f * spD4); + Lights_InitType0PositionalLight(&D_8015BC00, lightPos.x, lightPos.y, lightPos.z, 0xFF, 0xFF, 0xFF, + 500.0f * spD4); - func_800C6B54(gfxArr, globalCtx->state.gfxCtx, "../z_actor.c", 5474); + Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_actor.c", 5474); } } #else #pragma GLOBAL_ASM("asm/non_matchings/code/z_actor/func_8002FBAC.s") #endif -void func_80030488(GlobalContext* globalCtx) -{ +void func_80030488(GlobalContext* globalCtx) { Lights_Remove(globalCtx, &globalCtx->lightCtx, D_8015BC10); } -void func_800304B0(GlobalContext* globalCtx) -{ - if (globalCtx->actorCtx.unk_03 != 0) - { +void func_800304B0(GlobalContext* globalCtx) { + if (globalCtx->actorCtx.unk_03 != 0) { globalCtx->actorCtx.unk_03 = 0; func_800876C8(globalCtx); } } -void func_800304DC(GlobalContext* globalCtx, ActorContext* actorCtx, ActorEntry* actorEntry) -{ +void func_800304DC(GlobalContext* globalCtx, ActorContext* actorCtx, ActorEntry* actorEntry) { ActorOverlay* overlayEntry; SaveSceneFlags* saveSceneFlags; s32 i; @@ -2217,8 +1994,7 @@ void func_800304DC(GlobalContext* globalCtx, ActorContext* actorCtx, ActorEntry* Matrix_MtxFCopy(&globalCtx->mf_11D60, &gMtxFClear); overlayEntry = &gActorOverlayTable[0]; - for (i = 0; i < ARRAY_COUNT(gActorOverlayTable); i++) - { + for (i = 0; i < ARRAY_COUNT(gActorOverlayTable); i++) { overlayEntry->loadedRamAddr = NULL; overlayEntry->nbLoaded = 0; overlayEntry++; @@ -2238,24 +2014,12 @@ void func_800304DC(GlobalContext* globalCtx, ActorContext* actorCtx, ActorEntry* func_8002FA60(globalCtx); } -u32 D_80116068[] = -{ - 0x100000C0, - 0x100000C0, - 0x00000000, - 0x100004C0, - 0x00000080, - 0x300000C0, - 0x10000080, - 0x00000000, - 0x300000C0, - 0x100004C0, - 0x00000000, - 0x100000C0, +u32 D_80116068[] = { + 0x100000C0, 0x100000C0, 0x00000000, 0x100004C0, 0x00000080, 0x300000C0, + 0x10000080, 0x00000000, 0x300000C0, 0x100004C0, 0x00000000, 0x100000C0, }; -void Actor_UpdateAll(GlobalContext* globalCtx, ActorContext* actorCtx) -{ +void Actor_UpdateAll(GlobalContext* globalCtx, ActorContext* actorCtx) { Actor* refActor; Actor* actor; Player* player; @@ -2268,91 +2032,79 @@ void Actor_UpdateAll(GlobalContext* globalCtx, ActorContext* actorCtx) player = PLAYER; - if (0) - { + if (0) { // This assert is optimized out but it exists due to its presence in rodata - if (gMaxProfile != ACTOR_DLF_MAX) + if (gMaxProfile != ACTOR_DLF_MAX) { __assert("MaxProfile == ACTOR_DLF_MAX", "../z_actor.c", UNK_LINE); + } } sp74 = NULL; unkFlag = 0; - if (globalCtx->nbSetupActors != 0) - { + if (globalCtx->nbSetupActors != 0) { actorEntry = &globalCtx->setupActorList[0]; - for (i = 0; i < globalCtx->nbSetupActors; i++) + for (i = 0; i < globalCtx->nbSetupActors; i++) { Actor_SpawnEntry(&globalCtx->actorCtx, actorEntry++, globalCtx); + } globalCtx->nbSetupActors = 0; } - if (actorCtx->unk_02 != 0) + if (actorCtx->unk_02 != 0) { actorCtx->unk_02--; + } - if (KREG(0) == -100) - { + if (KREG(0) == -100) { refActor = &PLAYER->actor; KREG(0) = 0; - Actor_Spawn(&globalCtx->actorCtx, globalCtx, ACTOR_EN_CLEAR_TAG, - refActor->posRot.pos.x, refActor->posRot.pos.y + 100.0f, refActor->posRot.pos.z, - 0, 0, 0, 1); + Actor_Spawn(&globalCtx->actorCtx, globalCtx, ACTOR_EN_CLEAR_TAG, refActor->posRot.pos.x, + refActor->posRot.pos.y + 100.0f, refActor->posRot.pos.z, 0, 0, 0, 1); } sp80 = &D_80116068[0]; - if (player->stateFlags2 & 0x8000000) + if (player->stateFlags2 & 0x8000000) { unkFlag = 0x2000000; + } - if ((player->stateFlags1 & 0x40) && ((player->actor.textId & 0xFF00) != 0x600)) + if ((player->stateFlags1 & 0x40) && ((player->actor.textId & 0xFF00) != 0x600)) { sp74 = player->unk_694; + } - for (i = 0; i < ARRAY_COUNT(actorCtx->actorList); i++, sp80++) - { + for (i = 0; i < ARRAY_COUNT(actorCtx->actorList); i++, sp80++) { unkCondition = (*sp80 & player->stateFlags1); actor = actorCtx->actorList[i].first; - while (actor != NULL) - { - if (actor->posRot.pos.y < -25000.0f) + while (actor != NULL) { + if (actor->posRot.pos.y < -25000.0f) { actor->posRot.pos.y = -25000.0f; + } actor->soundEffect = 0; - if (actor->init != NULL) - { - if (Object_IsLoaded(&globalCtx->objectCtx, actor->objBankIndex)) - { + if (actor->init != NULL) { + if (Object_IsLoaded(&globalCtx->objectCtx, actor->objBankIndex)) { Actor_SetObjectDependency(globalCtx, actor); actor->init(actor, globalCtx); actor->init = NULL; } actor = actor->next; - } - else if (!Object_IsLoaded(&globalCtx->objectCtx, actor->objBankIndex)) - { + } else if (!Object_IsLoaded(&globalCtx->objectCtx, actor->objBankIndex)) { Actor_Kill(actor); actor = actor->next; - } - else if ((unkFlag && !(actor->flags & unkFlag)) || - (!unkFlag && unkCondition && - (sp74 != actor) && (actor != player->unk_68C) && - (actor != player->heldActor) && (&player->actor != actor->attachedA))) - { + } else if ((unkFlag && !(actor->flags & unkFlag)) || + (!unkFlag && unkCondition && (sp74 != actor) && (actor != player->unk_68C) && + (actor != player->heldActor) && (&player->actor != actor->attachedA))) { func_80061E8C(&actor->sub_98); actor = actor->next; - } - else if (actor->update == NULL) - { - if (!actor->activelyDrawn) + } else if (actor->update == NULL) { + if (!actor->activelyDrawn) { actor = Actor_Delete(&globalCtx->actorCtx, actor, globalCtx); - else - { + } else { Actor_Destroy(actor, globalCtx); actor = actor->next; } - } - else - { + } else { Math_Vec3f_Copy(&actor->pos4, &actor->posRot.pos); actor->xzDistanceFromLink = func_8002DB8C(actor, &player->actor); actor->yDistanceFromLink = Actor_HeightDiff(actor, &player->actor); @@ -2361,19 +2113,21 @@ void Actor_UpdateAll(GlobalContext* globalCtx, ActorContext* actorCtx) actor->rotTowardsLinkY = func_8002DA78(actor, &player->actor); actor->flags &= ~0x1000000; - if ((DECR(actor->freeze) == 0) && (actor->flags & 0x50)) - { - if (actor == player->unk_664) + if ((DECR(actor->freeze) == 0) && (actor->flags & 0x50)) { + if (actor == player->unk_664) { actor->unk_10C = 1; - else + } else { actor->unk_10C = 0; + } - if ((actor->unk_10D != 0) && (player->unk_664 == NULL)) + if ((actor->unk_10D != 0) && (player->unk_664 == NULL)) { actor->unk_10D = 0; + } Actor_SetObjectDependency(globalCtx, actor); - if (actor->unk_114 != 0) + if (actor->unk_114 != 0) { actor->unk_114--; + } actor->update(actor, globalCtx); func_8003F8EC(globalCtx, &globalCtx->colCtx.dyna, actor); } @@ -2384,23 +2138,21 @@ void Actor_UpdateAll(GlobalContext* globalCtx, ActorContext* actorCtx) } } - if (i == ACTORTYPE_BG) + if (i == ACTORTYPE_BG) { func_8003F984(globalCtx, &globalCtx->colCtx.dyna); + } } actor = player->unk_664; - if ((actor != NULL) && (actor->update == NULL)) - { + if ((actor != NULL) && (actor->update == NULL)) { actor = NULL; func_8008EDF0(player); } - if ((actor == NULL) || (player->unk_66C < 5)) - { + if ((actor == NULL) || (player->unk_66C < 5)) { actor = NULL; - if (actorCtx->targetCtx.unk_4B != 0) - { + if (actorCtx->targetCtx.unk_4B != 0) { actorCtx->targetCtx.unk_4B = 0; func_80078884(NA_SE_SY_LOCK_OFF); } @@ -2411,13 +2163,11 @@ void Actor_UpdateAll(GlobalContext* globalCtx, ActorContext* actorCtx) func_8003FB64(globalCtx, &globalCtx->colCtx.dyna); } -void Actor_FaultPrint(Actor* actor, char* command) -{ +void Actor_FaultPrint(Actor* actor, char* command) { ActorOverlay* overlayEntry; char* name; - if ((actor == NULL) || (actor->overlayEntry == NULL)) - { + if ((actor == NULL) || (actor->overlayEntry == NULL)) { FaultDrawer_SetCursor(48, 24); FaultDrawer_Printf("ACTOR NAME is NULL"); } @@ -2428,47 +2178,41 @@ void Actor_FaultPrint(Actor* actor, char* command) // Translates to: "ACTOR NAME(%08x:%s)" osSyncPrintf("アクターの名前(%08x:%s)\n", actor, name); - if (command != NULL) + if (command != NULL) { // Translates to: "COMMAND:%s" osSyncPrintf("コメント:%s\n", command); + } FaultDrawer_SetCursor(48, 24); FaultDrawer_Printf("ACTOR NAME %08x:%s", actor, name); } -void Actor_Draw(GlobalContext* globalCtx, Actor* actor) -{ +void Actor_Draw(GlobalContext* globalCtx, Actor* actor) { FaultClient faultClient; LightMapper* lightMapper; GraphicsContext* gfxCtx; Camera* camera; - Gfx* gfxArr[3]; + Gfx* dispRefs[3]; Fault_AddClient(&faultClient, Actor_FaultPrint, actor, "Actor_draw"); gfxCtx = globalCtx->state.gfxCtx; - func_800C6AC4(gfxArr, globalCtx->state.gfxCtx, "../z_actor.c", 6035); + Graph_OpenDisps(dispRefs, globalCtx->state.gfxCtx, "../z_actor.c", 6035); lightMapper = Lights_CreateMapper(&globalCtx->lightCtx, globalCtx->state.gfxCtx); func_8007A474(lightMapper, globalCtx->lightCtx.lightsHead, (actor->flags & 0x400000) ? NULL : &actor->posRot.pos); func_80079EFC(lightMapper, globalCtx->state.gfxCtx); - if (actor->flags & 0x1000) - { + if (actor->flags & 0x1000) { camera = &globalCtx->cameraCtx.activeCameras[0]; func_800D1694(actor->posRot.pos.x + camera->unk_80.x, - actor->posRot.pos.y + (f32)((actor->shape.unk_08 * actor->scale.y) + camera->unk_80.y), - actor->posRot.pos.z + camera->unk_80.z, - &actor->shape.rot); - } - else - { - func_800D1694(actor->posRot.pos.x, - actor->posRot.pos.y + (actor->shape.unk_08 * actor->scale.y), - actor->posRot.pos.z, - &actor->shape.rot); + actor->posRot.pos.y + (f32)((actor->shape.unk_08 * actor->scale.y) + camera->unk_80.y), + actor->posRot.pos.z + camera->unk_80.z, &actor->shape.rot); + } else { + func_800D1694(actor->posRot.pos.x, actor->posRot.pos.y + (actor->shape.unk_08 * actor->scale.y), + actor->posRot.pos.z, &actor->shape.rot); } Matrix_Scale(actor->scale.x, actor->scale.y, actor->scale.z, MTXMODE_APPLY); @@ -2477,114 +2221,102 @@ void Actor_Draw(GlobalContext* globalCtx, Actor* actor) gSPSegment(gfxCtx->polyOpa.p++, 0x06, globalCtx->objectCtx.status[actor->objBankIndex].segment); gSPSegment(gfxCtx->polyXlu.p++, 0x06, globalCtx->objectCtx.status[actor->objBankIndex].segment); - if (actor->unk_114 != 0) - { + if (actor->unk_114 != 0) { // Must be inline data to match Color_RGBA8 sp2C = { 0x00, 0x00, 0x00, 0xFF }; - if (actor->unk_112 & 0x8000) + if (actor->unk_112 & 0x8000) { sp2C.r = sp2C.g = sp2C.b = ((actor->unk_112 & 0x1F00) >> 5) | 7; - else if (actor->unk_112 & 0x4000) + } else if (actor->unk_112 & 0x4000) { sp2C.r = ((actor->unk_112 & 0x1F00) >> 5) | 7; - else + } else { sp2C.b = ((actor->unk_112 & 0x1F00) >> 5) | 7; + } - if (actor->unk_112 & 0x2000) + if (actor->unk_112 & 0x2000) { func_80026860(globalCtx, &sp2C, actor->unk_114, actor->unk_112 & 0xFF); - else + } else { func_80026400(globalCtx, &sp2C, actor->unk_114, actor->unk_112 & 0xFF); + } } actor->draw(actor, globalCtx); - if (actor->unk_114 != 0) - { - if (actor->unk_112 & 0x2000) + if (actor->unk_114 != 0) { + if (actor->unk_112 & 0x2000) { func_80026A6C(globalCtx); - else + } else { func_80026608(globalCtx); + } } - if (actor->shape.shadowDrawFunc != NULL) + if (actor->shape.shadowDrawFunc != NULL) { actor->shape.shadowDrawFunc(actor, lightMapper, globalCtx); + } - func_800C6B54(gfxArr, globalCtx->state.gfxCtx, "../z_actor.c", 6119); + Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_actor.c", 6119); Fault_RemoveClient(&faultClient); } -void func_80030ED8(Actor* actor) -{ - if (actor->flags & 0x80000) +void func_80030ED8(Actor* actor) { + if (actor->flags & 0x80000) { Audio_PlaySoundGeneral(actor->soundEffect, &actor->unk_E4, 4, &D_801333E0, &D_801333E0, &D_801333E8); - else if (actor->flags & 0x100000) + } else if (actor->flags & 0x100000) { func_80078884(actor->soundEffect); - else if (actor->flags & 0x200000) + } else if (actor->flags & 0x200000) { func_800788CC(actor->soundEffect); - else if (actor->flags & 0x10000000) + } else if (actor->flags & 0x10000000) { func_800F4C58(&D_801333D4, 0x2021, (s8)(actor->soundEffect - 1)); - else + } else { func_80078914(&actor->unk_E4, actor->soundEffect); + } } -void func_80030FA8(GraphicsContext* gfxCtx) -{ - Gfx* gfxArr[5]; +void func_80030FA8(GraphicsContext* gfxCtx) { + Gfx* dispRefs[5]; - func_800C6AC4(gfxArr, gfxCtx, "../z_actor.c", 6161); + Graph_OpenDisps(dispRefs, gfxCtx, "../z_actor.c", 6161); - gDPLoadTextureBlock(gfxCtx->polyXlu.p++, - &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); + gDPLoadTextureBlock(gfxCtx->polyXlu.p++, &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(gfxCtx->polyXlu.p++, G_TX_RENDERTILE, 384, 224, 892, 732); gSPTextureRectangle(gfxCtx->polyXlu.p++, 0, 0, 1280, 960, G_TX_RENDERTILE, 2240, 1600, 576, 597); gDPPipeSync(gfxCtx->polyXlu.p++); - func_800C6B54(gfxArr, gfxCtx, "../z_actor.c", 6183); + Graph_CloseDisps(dispRefs, gfxCtx, "../z_actor.c", 6183); } -void func_8003115C(GlobalContext* globalCtx, s32 nbInvisibleActors, Actor** invisibleActors) -{ +void func_8003115C(GlobalContext* globalCtx, s32 nbInvisibleActors, Actor** invisibleActors) { Actor** invisibleActor; GraphicsContext* gfxCtx; s32 i; - Gfx* gfxArr[5]; + Gfx* dispRefs[5]; gfxCtx = globalCtx->state.gfxCtx; - func_800C6AC4(gfxArr, gfxCtx, "../z_actor.c", 6197); + Graph_OpenDisps(dispRefs, gfxCtx, "../z_actor.c", 6197); // Translates to: "MAGIC LENS START" - gDma1p(gfxCtx->polyOpa.p++, G_NOOP, "魔法のメガネ START", 0, 2); + gDPNoOpString(gfxCtx->polyOpa.p++, "魔法のメガネ START", 0); gDPPipeSync(gfxCtx->polyXlu.p++); - if (globalCtx->roomCtx.curRoom.showInvisActors == 0) - { + if (globalCtx->roomCtx.curRoom.showInvisActors == 0) { gDPSetOtherMode(gfxCtx->polyXlu.p++, - 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_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(gfxCtx->polyXlu.p++, G_CC_MODULATEIA_PRIM, G_CC_MODULATEIA_PRIM); gDPSetPrimColor(gfxCtx->polyXlu.p++, 0, 0, 0xFF, 0x00, 0x00, 0xFF); - } - else - { + } else { gDPSetOtherMode(gfxCtx->polyXlu.p++, - 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(gfxCtx->polyXlu.p++, - PRIMITIVE, TEXEL0, PRIM_LOD_FRAC, 0, PRIMITIVE, TEXEL0, PRIM_LOD_FRAC, 0, + 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(gfxCtx->polyXlu.p++, 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(gfxCtx->polyXlu.p++, 0, 0xFF, 0x4A, 0x4A, 0x4A, 0x4A); } @@ -2594,29 +2326,27 @@ void func_8003115C(GlobalContext* globalCtx, s32 nbInvisibleActors, Actor** invi func_80030FA8(gfxCtx); // Translates to: "MAGIC LENS INVISIBLE ACTOR DISPLAY START" - gDma1p(gfxCtx->polyOpa.p++, G_NOOP, "魔法のメガネ 見えないＡcｔｏｒ表示 START", nbInvisibleActors, 2); + gDPNoOpString(gfxCtx->polyOpa.p++, "魔法のメガネ 見えないＡcｔｏｒ表示 START", nbInvisibleActors); invisibleActor = &invisibleActors[0]; - for (i = 0; i < nbInvisibleActors; i++) - { + for (i = 0; i < nbInvisibleActors; i++) { // Translates to: "MAGIC LENS INVISIBLE ACTOR DISPLAY" - gDma1p(gfxCtx->polyOpa.p++, G_NOOP, "魔法のメガネ 見えないＡcｔｏｒ表示", i, 2); + gDPNoOpString(gfxCtx->polyOpa.p++, "魔法のメガネ 見えないＡcｔｏｒ表示", i); Actor_Draw(globalCtx, *(invisibleActor++)); } // Translates to: "MAGIC LENS INVISIBLE ACTOR DISPLAY END" - gDma1p(gfxCtx->polyOpa.p++, G_NOOP, "魔法のメガネ 見えないＡcｔｏｒ表示 END", nbInvisibleActors, 2); + gDPNoOpString(gfxCtx->polyOpa.p++, "魔法のメガネ 見えないＡcｔｏｒ表示 END", nbInvisibleActors); - if (globalCtx->roomCtx.curRoom.showInvisActors != 0) - { + if (globalCtx->roomCtx.curRoom.showInvisActors != 0) { // Translates to: "BLUE SPECTACLES (EXTERIOR)" - gDma1p(gfxCtx->polyOpa.p++, G_NOOP, "青い眼鏡(外側)", 0, 2); + gDPNoOpString(gfxCtx->polyOpa.p++, "青い眼鏡(外側)", 0); gDPPipeSync(gfxCtx->polyXlu.p++); gDPSetOtherMode(gfxCtx->polyXlu.p++, - 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_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(gfxCtx->polyXlu.p++, G_CC_MODULATEIA_PRIM, G_CC_MODULATEIA_PRIM); gDPSetPrimColor(gfxCtx->polyXlu.p++, 0, 0, 0xFF, 0x00, 0x00, 0xFF); @@ -2624,118 +2354,95 @@ void func_8003115C(GlobalContext* globalCtx, s32 nbInvisibleActors, Actor** invi func_80030FA8(gfxCtx); // Translates to: "BLUE SPECTACLES (EXTERIOR)" - gDma1p(gfxCtx->polyOpa.p++, G_NOOP, "青い眼鏡(外側)", 1, 2); + gDPNoOpString(gfxCtx->polyOpa.p++, "青い眼鏡(外側)", 1); } // Translates to: "MAGIC LENS END" - gDma1p(gfxCtx->polyOpa.p++, G_NOOP, "魔法のメガネ END", 0, 2); + gDPNoOpString(gfxCtx->polyOpa.p++, "魔法のメガネ END", 0); - func_800C6B54(gfxArr, gfxCtx, "../z_actor.c", 6284); + Graph_CloseDisps(dispRefs, gfxCtx, "../z_actor.c", 6284); } -s32 func_800314B0(GlobalContext* globalCtx, Actor* actor) -{ +s32 func_800314B0(GlobalContext* globalCtx, Actor* actor) { return func_800314D4(globalCtx, actor, &actor->unk_E4, actor->unk_F0); } -s32 func_800314D4(GlobalContext* globalCtx, Actor* actor, Vec3f* arg2, f32 arg3) -{ +s32 func_800314D4(GlobalContext* globalCtx, Actor* actor, Vec3f* arg2, f32 arg3) { f32 var; - if ((arg2->z > -actor->unk_F8) && (arg2->z < (actor->unk_F4 + actor->unk_F8))) - { + if ((arg2->z > -actor->unk_F8) && (arg2->z < (actor->unk_F4 + actor->unk_F8))) { var = (arg3 < 1.0f) ? 1.0f : 1.0f / arg3; - if ((((fabsf(arg2->x) - actor->unk_F8) * var) < 1.0f) && - (((arg2->y + actor->unk_FC) * var) > -1.0f) && - (((arg2->y - actor->unk_F8) * var) < 1.0f)) + if ((((fabsf(arg2->x) - actor->unk_F8) * var) < 1.0f) && (((arg2->y + actor->unk_FC) * var) > -1.0f) && + (((arg2->y - actor->unk_F8) * var) < 1.0f)) { return 1; + } } return 0; } -void func_800315AC(GlobalContext* globalCtx, ActorContext* actorCtx) -{ +void func_800315AC(GlobalContext* globalCtx, ActorContext* actorCtx) { s32 invisibleActorCounter; Actor* invisibleActors[INVISIBLE_ACTOR_MAX]; ActorListEntry* actorListEntry; GraphicsContext* gfxCtx; s32 i; - Gfx* gfxArr[5]; + Gfx* dispRefs[5]; Actor* actor; ActorOverlay* overlayEntry; char* actorName; - gfxCtx = globalCtx->state.gfxCtx; + gfxCtx = globalCtx->state.gfxCtx; invisibleActorCounter = 0; - func_800C6AC4(gfxArr, globalCtx->state.gfxCtx, "../z_actor.c", 6336); + Graph_OpenDisps(dispRefs, globalCtx->state.gfxCtx, "../z_actor.c", 6336); actorListEntry = &actorCtx->actorList[0]; - for (i = 0; i < ARRAY_COUNT(actorCtx->actorList); i++, actorListEntry++) - { + for (i = 0; i < ARRAY_COUNT(actorCtx->actorList); i++, actorListEntry++) { actor = actorListEntry->first; - while (actor != NULL) - { + while (actor != NULL) { overlayEntry = actor->overlayEntry; actorName = overlayEntry->name != NULL ? overlayEntry->name : ""; - gDma1p(gfxCtx->polyOpa.p++, G_NOOP, actorName, i, 2); - gDma1p(gfxCtx->polyXlu.p++, G_NOOP, actorName, i, 2); + gDPNoOpString(gfxCtx->polyOpa.p++, actorName, i); + gDPNoOpString(gfxCtx->polyXlu.p++, actorName, i); HREG(66) = i; - if ((HREG(64) != 1) || - ((HREG(65) != -1) && (HREG(65) != HREG(66))) || - (HREG(68) == 0)) - { + if ((HREG(64) != 1) || ((HREG(65) != -1) && (HREG(65) != HREG(66))) || (HREG(68) == 0)) { func_800A6E10(&globalCtx->mf_11D60, &actor->posRot.pos, &actor->unk_E4, &actor->unk_F0); } - if ((HREG(64) != 1) || - ((HREG(65) != -1) && (HREG(65) != HREG(66))) || - (HREG(69) == 0)) - { - if (actor->soundEffect != 0) + if ((HREG(64) != 1) || ((HREG(65) != -1) && (HREG(65) != HREG(66))) || (HREG(69) == 0)) { + if (actor->soundEffect != 0) { func_80030ED8(actor); + } } - if ((HREG(64) != 1) || - ((HREG(65) != -1) && (HREG(65) != HREG(66))) || - (HREG(70) == 0)) - { - if (func_800314B0(globalCtx, actor)) + if ((HREG(64) != 1) || ((HREG(65) != -1) && (HREG(65) != HREG(66))) || (HREG(70) == 0)) { + if (func_800314B0(globalCtx, actor)) { actor->flags |= 0x40; - else + } else { actor->flags &= ~0x40; + } } actor->activelyDrawn = 0; - if ((HREG(64) != 1) || - ((HREG(65) != -1) && (HREG(65) != HREG(66))) || - (HREG(71) == 0)) - { - if ((actor->init == NULL) && (actor->draw != NULL) && (actor->flags & 0x60)) - { + if ((HREG(64) != 1) || ((HREG(65) != -1) && (HREG(65) != HREG(66))) || (HREG(71) == 0)) { + if ((actor->init == NULL) && (actor->draw != NULL) && (actor->flags & 0x60)) { if ((actor->flags & 0x80) && - ((globalCtx->roomCtx.curRoom.showInvisActors == 0) || - (globalCtx->actorCtx.unk_03 != 0) || - (actor->room != globalCtx->roomCtx.curRoom.num))) - { - if (invisibleActorCounter >= INVISIBLE_ACTOR_MAX) + ((globalCtx->roomCtx.curRoom.showInvisActors == 0) || (globalCtx->actorCtx.unk_03 != 0) || + (actor->room != globalCtx->roomCtx.curRoom.num))) { + if (invisibleActorCounter >= INVISIBLE_ACTOR_MAX) { __assert("invisible_actor_counter < INVISIBLE_ACTOR_MAX", "../z_actor.c", 6464); + } invisibleActors[invisibleActorCounter] = actor; invisibleActorCounter++; - } - else - { - if ((HREG(64) != 1) || - ((HREG(65) != -1) && (HREG(65) != HREG(66))) || - (HREG(72) == 0)) - { + } else { + if ((HREG(64) != 1) || ((HREG(65) != -1) && (HREG(65) != HREG(66))) || (HREG(72) == 0)) { Actor_Draw(globalCtx, actor); actor->activelyDrawn = 1; } @@ -2747,48 +2454,50 @@ void func_800315AC(GlobalContext* globalCtx, ActorContext* actorCtx) } } - if ((HREG(64) != 1) || (HREG(73) != 0)) + if ((HREG(64) != 1) || (HREG(73) != 0)) { func_80026E74(globalCtx->state.gfxCtx); + } - if ((HREG(64) != 1) || (HREG(74) != 0)) + if ((HREG(64) != 1) || (HREG(74) != 0)) { func_80027BDC(globalCtx); + } - if ((HREG(64) != 1) || (HREG(72) != 0)) - { - if (globalCtx->actorCtx.unk_03 != 0) - { + if ((HREG(64) != 1) || (HREG(72) != 0)) { + if (globalCtx->actorCtx.unk_03 != 0) { func_8003115C(globalCtx, invisibleActorCounter, invisibleActors); - if ((globalCtx->csCtx.state != 0) || func_8008E988(globalCtx)) + if ((globalCtx->csCtx.state != 0) || func_8008E988(globalCtx)) { func_800304B0(globalCtx); + } } } func_8002FBAC(globalCtx); - if (IREG(32) == 0) + if (IREG(32) == 0) { func_8007ABBC(globalCtx); + } - if ((HREG(64) != 1) || (HREG(75) != 0)) + if ((HREG(64) != 1) || (HREG(75) != 0)) { TitleCard_Draw(globalCtx, &actorCtx->titleCtx); + } - if ((HREG(64) != 1) || (HREG(76) != 0)) + if ((HREG(64) != 1) || (HREG(76) != 0)) { func_8005D62C(globalCtx, &globalCtx->sub_11E60); + } - func_800C6B54(gfxArr, globalCtx->state.gfxCtx, "../z_actor.c", 6563); + Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_actor.c", 6563); } -void func_80031A28(GlobalContext* globalCtx, ActorContext* actorCtx) -{ +void func_80031A28(GlobalContext* globalCtx, ActorContext* actorCtx) { Actor* actor; s32 i; - for (i = 0; i < ARRAY_COUNT(actorCtx->actorList); i++) - { + for (i = 0; i < ARRAY_COUNT(actorCtx->actorList); i++) { actor = actorCtx->actorList[i].first; - while (actor != NULL) - { - if (!Object_IsLoaded(&globalCtx->objectCtx, actor->objBankIndex)) + while (actor != NULL) { + if (!Object_IsLoaded(&globalCtx->objectCtx, actor->objBankIndex)) { Actor_Kill(actor); + } actor = actor->next; } } @@ -2796,47 +2505,38 @@ void func_80031A28(GlobalContext* globalCtx, ActorContext* actorCtx) u8 sEnemyActorTypes[] = { ACTORTYPE_ENEMY, ACTORTYPE_BOSS }; -void Actor_FreezeAllEnemies(GlobalContext* globalCtx, ActorContext* actorCtx, s32 freezeValue) -{ +void Actor_FreezeAllEnemies(GlobalContext* globalCtx, ActorContext* actorCtx, s32 freezeValue) { Actor* actor; s32 i; - for (i = 0; i < ARRAY_COUNT(sEnemyActorTypes); i++) - { + for (i = 0; i < ARRAY_COUNT(sEnemyActorTypes); i++) { actor = actorCtx->actorList[sEnemyActorTypes[i]].first; - while (actor != NULL) - { + while (actor != NULL) { actor->freeze = freezeValue; actor = actor->next; } } } -void func_80031B14(GlobalContext* globalCtx, ActorContext* actorCtx) -{ +void func_80031B14(GlobalContext* globalCtx, ActorContext* actorCtx) { Actor* actor; s32 i; - for (i = 0; i < ARRAY_COUNT(actorCtx->actorList); i++) - { + for (i = 0; i < ARRAY_COUNT(actorCtx->actorList); i++) { actor = actorCtx->actorList[i].first; - while (actor != NULL) - { - if ((actor->room >= 0) && - (actor->room != globalCtx->roomCtx.curRoom.num) && - (actor->room != globalCtx->roomCtx.prevRoom.num)) - { - if (!actor->activelyDrawn) + while (actor != NULL) { + if ((actor->room >= 0) && (actor->room != globalCtx->roomCtx.curRoom.num) && + (actor->room != globalCtx->roomCtx.prevRoom.num)) { + if (!actor->activelyDrawn) { actor = Actor_Delete(actorCtx, actor, globalCtx); - else - { + } else { Actor_Kill(actor); Actor_Destroy(actor, globalCtx); actor = actor->next; } - } - else + } else { actor = actor->next; + } } } @@ -2846,27 +2546,24 @@ void func_80031B14(GlobalContext* globalCtx, ActorContext* actorCtx) globalCtx->msgCtx.unk_E3F4 = 0; } -void func_80031C3C(ActorContext* actorCtx, GlobalContext* globalCtx) -{ +void func_80031C3C(ActorContext* actorCtx, GlobalContext* globalCtx) { Actor* actor; s32 i; - for (i = 0; i < ARRAY_COUNT(actorCtx->actorList); i++) - { + for (i = 0; i < ARRAY_COUNT(actorCtx->actorList); i++) { actor = actorCtx->actorList[i].first; - while (actor != NULL) - { + while (actor != NULL) { Actor_Delete(actorCtx, actor, globalCtx); actor = actorCtx->actorList[i].first; } } - if (HREG(20) != 0) + if (HREG(20) != 0) { // Translates to: "ABSOLUTE MAGIC FIELD DEALLOCATION" osSyncPrintf("絶対魔法領域解放\n"); + } - if (actorCtx->absoluteSpace != NULL) - { + if (actorCtx->absoluteSpace != NULL) { ZeldaArena_FreeDebug(actorCtx->absoluteSpace, "../z_actor.c", 6731); actorCtx->absoluteSpace = NULL; } @@ -2880,8 +2577,7 @@ void func_80031C3C(ActorContext* actorCtx, GlobalContext* globalCtx) * Adds a given actor instance at the front of the actor list of the specified type. * Also sets the actor instance as being of that type. */ -void Actor_AddToTypeList(ActorContext* actorCtx, Actor* actorToAdd, u8 actorType) -{ +void Actor_AddToTypeList(ActorContext* actorCtx, Actor* actorToAdd, u8 actorType) { Actor* prevFirstActor; actorToAdd->type = actorType; @@ -2890,8 +2586,9 @@ void Actor_AddToTypeList(ActorContext* actorCtx, Actor* actorToAdd, u8 actorType actorCtx->actorList[actorType].length++; prevFirstActor = actorCtx->actorList[actorType].first; - if (prevFirstActor != NULL) + if (prevFirstActor != NULL) { prevFirstActor->prev = actorToAdd; + } actorCtx->actorList[actorType].first = actorToAdd; actorToAdd->next = prevFirstActor; @@ -2901,81 +2598,75 @@ void Actor_AddToTypeList(ActorContext* actorCtx, Actor* actorToAdd, u8 actorType * Removes a given actor instance from its actor list. * Also sets the temp clear flag of the current room if the actor removed was the last enemy loaded. */ -Actor* Actor_RemoveFromTypeList(GlobalContext* globalCtx, ActorContext* actorCtx, Actor* actorToRemove) -{ +Actor* Actor_RemoveFromTypeList(GlobalContext* globalCtx, ActorContext* actorCtx, Actor* actorToRemove) { Actor* newFirstActor; actorCtx->total--; actorCtx->actorList[actorToRemove->type].length--; - if (actorToRemove->prev != NULL) + if (actorToRemove->prev != NULL) { actorToRemove->prev->next = actorToRemove->next; - else + } else { actorCtx->actorList[actorToRemove->type].first = actorToRemove->next; + } newFirstActor = actorToRemove->next; - if (newFirstActor != NULL) + if (newFirstActor != NULL) { newFirstActor->prev = actorToRemove->prev; + } actorToRemove->next = NULL; actorToRemove->prev = NULL; - if ((actorToRemove->room == globalCtx->roomCtx.curRoom.num) && - (actorToRemove->type == ACTORTYPE_ENEMY) && - (actorCtx->actorList[ACTORTYPE_ENEMY].length == 0)) - { + if ((actorToRemove->room == globalCtx->roomCtx.curRoom.num) && (actorToRemove->type == ACTORTYPE_ENEMY) && + (actorCtx->actorList[ACTORTYPE_ENEMY].length == 0)) { Flags_SetTempClear(globalCtx, globalCtx->roomCtx.curRoom.num); } return newFirstActor; } -void Actor_FreeOverlay(ActorOverlay* actorOverlay) -{ +void Actor_FreeOverlay(ActorOverlay* actorOverlay) { osSyncPrintf(VT_FGCOL(CYAN)); - if (actorOverlay->nbLoaded == 0) - { - if (HREG(20) != 0) + if (actorOverlay->nbLoaded == 0) { + if (HREG(20) != 0) { // Translates to: "ACTOR CLIENT IS NOW 0" osSyncPrintf("アクタークライアントが０になりました\n"); + } - if (actorOverlay->loadedRamAddr != NULL) - { - if (actorOverlay->allocType & ALLOCTYPE_PERMANENT) - { - if (HREG(20) != 0) + if (actorOverlay->loadedRamAddr != NULL) { + if (actorOverlay->allocType & ALLOCTYPE_PERMANENT) { + if (HREG(20) != 0) { // Translates to: "OVERLAY WILL NOT BE DEALLOCATED" osSyncPrintf("オーバーレイ解放しません\n"); - } - else if (actorOverlay->allocType & ALLOCTYPE_ABSOLUTE) - { - if (HREG(20) != 0) + } + } else if (actorOverlay->allocType & ALLOCTYPE_ABSOLUTE) { + if (HREG(20) != 0) { // Translates to: "ABSOLUTE MAGIC FIELD RESERVED, SO DEALLOCATION WILL NOT OCCUR" osSyncPrintf("絶対魔法領域確保なので解放しません\n"); + } actorOverlay->loadedRamAddr = NULL; - } - else - { - if (HREG(20) != 0) + } else { + if (HREG(20) != 0) { // Translates to: "OVERLAY DEALLOCATED" osSyncPrintf("オーバーレイ解放します\n"); + } ZeldaArena_FreeDebug(actorOverlay->loadedRamAddr, "../z_actor.c", 6834); actorOverlay->loadedRamAddr = NULL; } } - } - else if (HREG(20) != 0) + } else if (HREG(20) != 0) { // Translates to: "%d OF ACTOR CLIENT REMAINS" osSyncPrintf("アクタークライアントはあと %d 残っています\n", actorOverlay->nbLoaded); + } osSyncPrintf(VT_RST); } -Actor* Actor_Spawn(ActorContext* actorCtx, GlobalContext* globalCtx, s16 actorId, - f32 posX, f32 posY, f32 posZ, s16 rotX, s16 rotY, s16 rotZ, s16 params) -{ +Actor* Actor_Spawn(ActorContext* actorCtx, GlobalContext* globalCtx, s16 actorId, f32 posX, f32 posY, f32 posZ, + s16 rotX, s16 rotY, s16 rotZ, s16 params) { s32 pad; Actor* actor; ActorInit* actorInit; @@ -2987,132 +2678,126 @@ Actor* Actor_Spawn(ActorContext* actorCtx, GlobalContext* globalCtx, s16 actorId overlayEntry = &gActorOverlayTable[actorId]; - if (actorId >= ACTOR_DLF_MAX) + if (actorId >= ACTOR_DLF_MAX) { __assert("profile < ACTOR_DLF_MAX", "../z_actor.c", 6883); + } name = overlayEntry->name != NULL ? overlayEntry->name : ""; overlaySize = (u32)overlayEntry->vramEnd - (u32)overlayEntry->vramStart; - if (HREG(20) != 0) + if (HREG(20) != 0) { // Translates to: "ACTOR CLASS ADDITION [%d:%s]" osSyncPrintf("アクタークラス追加 [%d:%s]\n", actorId, name); + } - if (actorCtx->total > ACTOR_NUMBER_MAX) - { + if (actorCtx->total > ACTOR_NUMBER_MAX) { // Translates to: "Ａｃｔｏｒ SET NUMBER EXCEEDED" osSyncPrintf(VT_COL(YELLOW, BLACK) "Ａｃｔｏｒセット数オーバー\n" VT_RST); return NULL; } - if (overlayEntry->vramStart == 0) - { - if (HREG(20) != 0) + if (overlayEntry->vramStart == 0) { + if (HREG(20) != 0) { // Translates to: "NOT AN OVERLAY" osSyncPrintf("オーバーレイではありません\n"); + } actorInit = overlayEntry->initInfo; - } - else - { - if (overlayEntry->loadedRamAddr != NULL) - { - if (HREG(20) != 0) + } else { + if (overlayEntry->loadedRamAddr != NULL) { + if (HREG(20) != 0) { // Translates to: "ALREADY LOADED" osSyncPrintf("既にロードされています\n"); - } - else - { - if (overlayEntry->allocType & ALLOCTYPE_ABSOLUTE) - { - if (overlaySize > AM_FIELD_SIZE) + } + } else { + if (overlayEntry->allocType & ALLOCTYPE_ABSOLUTE) { + if (overlaySize > AM_FIELD_SIZE) { __assert("actor_segsize <= AM_FIELD_SIZE", "../z_actor.c", 6934); + } - if (actorCtx->absoluteSpace == NULL) - { + if (actorCtx->absoluteSpace == NULL) { // Translates to: "AMF: ABSOLUTE MAGIC FIELD" actorCtx->absoluteSpace = ZeldaArena_MallocRDebug(AM_FIELD_SIZE, "AMF:絶対魔法領域", 0); - if (HREG(20) != 0) + if (HREG(20) != 0) { // Translates to: "ABSOLUTE MAGIC FIELD RESERVATION - %d BYTES RESERVED" osSyncPrintf("絶対魔法領域確保 %d バイト確保\n", AM_FIELD_SIZE); + } } overlayEntry->loadedRamAddr = actorCtx->absoluteSpace; - } - else if (overlayEntry->allocType & ALLOCTYPE_PERMANENT) + } else if (overlayEntry->allocType & ALLOCTYPE_PERMANENT) { overlayEntry->loadedRamAddr = ZeldaArena_MallocRDebug(overlaySize, name, 0); - else + } else { overlayEntry->loadedRamAddr = ZeldaArena_MallocDebug(overlaySize, name, 0); + } - if (overlayEntry->loadedRamAddr == NULL) - { + if (overlayEntry->loadedRamAddr == NULL) { // Translates to: "CANNOT RESERVE ACTOR PROGRAM MEMORY" osSyncPrintf(VT_COL(RED, WHITE) "Ａｃｔｏｒプログラムメモリが確保できません\n" VT_RST); return NULL; } - Overlay_Load(overlayEntry->vromStart, overlayEntry->vromEnd, - overlayEntry->vramStart, overlayEntry->vramEnd, - overlayEntry->loadedRamAddr); + Overlay_Load(overlayEntry->vromStart, overlayEntry->vromEnd, overlayEntry->vramStart, overlayEntry->vramEnd, + overlayEntry->loadedRamAddr); osSyncPrintf(VT_FGCOL(GREEN)); - osSyncPrintf("OVL(a):Seg:%08x-%08x Ram:%08x-%08x Off:%08x %s\n", - overlayEntry->vramStart, overlayEntry->vramEnd, - overlayEntry->loadedRamAddr, + osSyncPrintf("OVL(a):Seg:%08x-%08x Ram:%08x-%08x Off:%08x %s\n", overlayEntry->vramStart, + overlayEntry->vramEnd, overlayEntry->loadedRamAddr, (u32)overlayEntry->loadedRamAddr + (u32)overlayEntry->vramEnd - (u32)overlayEntry->vramStart, - (u32)overlayEntry->vramStart - (u32)overlayEntry->loadedRamAddr, - name); + (u32)overlayEntry->vramStart - (u32)overlayEntry->loadedRamAddr, name); osSyncPrintf(VT_RST); overlayEntry->nbLoaded = 0; } - actorInit = (ActorInit*)((u32)(overlayEntry->initInfo != NULL ? - (ActorInit*)((u32)overlayEntry->initInfo - (s32)((u32)overlayEntry->vramStart - (u32)overlayEntry->loadedRamAddr)) : - NULL)); + actorInit = + (ActorInit*)((u32)(overlayEntry->initInfo != NULL + ? (ActorInit*)((u32)overlayEntry->initInfo - (s32)((u32)overlayEntry->vramStart - + (u32)overlayEntry->loadedRamAddr)) + : NULL)); } objBankIndex = Object_GetIndex(&globalCtx->objectCtx, actorInit->objectId); if ((objBankIndex < 0) || - ((actorInit->type == ACTORTYPE_ENEMY) && (Flags_GetClear(globalCtx, globalCtx->roomCtx.curRoom.num)))) - { + ((actorInit->type == ACTORTYPE_ENEMY) && (Flags_GetClear(globalCtx, globalCtx->roomCtx.curRoom.num)))) { // Translates to: "NO DATA BANK!! (profilep->bank=%d)" - osSyncPrintf(VT_COL(RED, WHITE) "データバンク無し！！<データバンク＝%d>(profilep->bank=%d)\n" VT_RST, objBankIndex, actorInit->objectId); + osSyncPrintf(VT_COL(RED, WHITE) "データバンク無し！！<データバンク＝%d>(profilep->bank=%d)\n" VT_RST, + objBankIndex, actorInit->objectId); Actor_FreeOverlay(overlayEntry); return NULL; } actor = ZeldaArena_MallocDebug(actorInit->instanceSize, name, 1); - if (actor == NULL) - { + if (actor == NULL) { // Translates to: "ACTOR CLASS CANNOT BE RESERVED! %s " - osSyncPrintf(VT_COL(RED, WHITE) "Ａｃｔｏｒクラス確保できません！ %s <サイズ＝%dバイト>\n", VT_RST, name, actorInit->instanceSize); + osSyncPrintf(VT_COL(RED, WHITE) "Ａｃｔｏｒクラス確保できません！ %s <サイズ＝%dバイト>\n", VT_RST, name, + actorInit->instanceSize); Actor_FreeOverlay(overlayEntry); return NULL; } - if (overlayEntry->nbLoaded >= 255) + if (overlayEntry->nbLoaded >= 255) { __assert("actor_dlftbl->clients < 255", "../z_actor.c", 7031); + } overlayEntry->nbLoaded++; - if (HREG(20) != 0) + if (HREG(20) != 0) { // Translates to: "ACTOR CLIENT No. %d" osSyncPrintf("アクタークライアントは %d 個目です\n", overlayEntry->nbLoaded); + } Lib_MemSet(actor, actorInit->instanceSize, 0); actor->overlayEntry = overlayEntry; actor->id = actorInit->id; actor->flags = actorInit->flags; - if (actorInit->id == ACTOR_EN_PART) - { + if (actorInit->id == ACTOR_EN_PART) { actor->objBankIndex = rotZ; rotZ = 0; - } - else - { + } else { actor->objBankIndex = objBankIndex; } @@ -3138,26 +2823,24 @@ Actor* Actor_Spawn(ActorContext* actorCtx, GlobalContext* globalCtx, s16 actorId return actor; } -Actor* Actor_SpawnAttached(ActorContext* actorCtx, Actor* attachedTo, GlobalContext* globalCtx, s16 actorId, - f32 posX, f32 posY, f32 posZ, s16 rotX, s16 rotY, s16 rotZ, s16 params) -{ - Actor* spawnedActor = Actor_Spawn(actorCtx, globalCtx, actorId, - posX, posY, posZ, - rotX, rotY, rotZ, params); - if (spawnedActor == NULL) +Actor* Actor_SpawnAttached(ActorContext* actorCtx, Actor* attachedTo, GlobalContext* globalCtx, s16 actorId, f32 posX, + f32 posY, f32 posZ, s16 rotX, s16 rotY, s16 rotZ, s16 params) { + Actor* spawnedActor = Actor_Spawn(actorCtx, globalCtx, actorId, posX, posY, posZ, rotX, rotY, rotZ, params); + if (spawnedActor == NULL) { return NULL; + } attachedTo->attachedB = spawnedActor; spawnedActor->attachedA = attachedTo; - if (spawnedActor->room >= 0) + if (spawnedActor->room >= 0) { spawnedActor->room = attachedTo->room; + } return spawnedActor; } -void Actor_SpawnTransitionActors(GlobalContext* globalCtx, ActorContext* actorCtx) -{ +void Actor_SpawnTransitionActors(GlobalContext* globalCtx, ActorContext* actorCtx) { TransitionActorEntry* transitionActor; u8 nbTransitionActors; s32 i; @@ -3165,20 +2848,16 @@ void Actor_SpawnTransitionActors(GlobalContext* globalCtx, ActorContext* actorCt transitionActor = globalCtx->transitionActorList; nbTransitionActors = globalCtx->nbTransitionActors; - for (i = 0; i < nbTransitionActors; i++) - { - if (transitionActor->id >= 0) - { + for (i = 0; i < nbTransitionActors; i++) { + if (transitionActor->id >= 0) { if (((transitionActor->frontRoom >= 0) && ((transitionActor->frontRoom == globalCtx->roomCtx.curRoom.num) || (transitionActor->frontRoom == globalCtx->roomCtx.prevRoom.num))) || ((transitionActor->backRoom >= 0) && ((transitionActor->backRoom == globalCtx->roomCtx.curRoom.num) || - (transitionActor->backRoom == globalCtx->roomCtx.prevRoom.num)))) - { - Actor_Spawn(actorCtx, globalCtx, (s16)(transitionActor->id & 0x1FFF), - transitionActor->pos.x, transitionActor->pos.y, transitionActor->pos.z, - 0, transitionActor->rotY, 0, + (transitionActor->backRoom == globalCtx->roomCtx.prevRoom.num)))) { + Actor_Spawn(actorCtx, globalCtx, (s16)(transitionActor->id & 0x1FFF), transitionActor->pos.x, + transitionActor->pos.y, transitionActor->pos.z, 0, transitionActor->rotY, 0, (i << 0xA) + transitionActor->params); transitionActor->id = -transitionActor->id; @@ -3189,16 +2868,12 @@ void Actor_SpawnTransitionActors(GlobalContext* globalCtx, ActorContext* actorCt } } -Actor* Actor_SpawnEntry(ActorContext* actorCtx, ActorEntry* actorEntry, GlobalContext* globalCtx) -{ - return Actor_Spawn(actorCtx, globalCtx, actorEntry->id, - actorEntry->pos.x, actorEntry->pos.y, actorEntry->pos.z, - actorEntry->rot.x, actorEntry->rot.y, actorEntry->rot.z, - actorEntry->params); +Actor* Actor_SpawnEntry(ActorContext* actorCtx, ActorEntry* actorEntry, GlobalContext* globalCtx) { + return Actor_Spawn(actorCtx, globalCtx, actorEntry->id, actorEntry->pos.x, actorEntry->pos.y, actorEntry->pos.z, + actorEntry->rot.x, actorEntry->rot.y, actorEntry->rot.z, actorEntry->params); } -Actor* Actor_Delete(ActorContext* actorCtx, Actor* actor, GlobalContext* globalCtx) -{ +Actor* Actor_Delete(ActorContext* actorCtx, Actor* actor, GlobalContext* globalCtx) { char* name; Player* player; Actor* newFirstActor; @@ -3209,24 +2884,27 @@ Actor* Actor_Delete(ActorContext* actorCtx, Actor* actor, GlobalContext* globalC overlayEntry = actor->overlayEntry; name = overlayEntry->name != NULL ? overlayEntry->name : ""; - if (HREG(20) != 0) + if (HREG(20) != 0) { // Translates to: "ACTOR CLASS DELETED [%s]" osSyncPrintf("アクタークラス削除 [%s]\n", name); + } - if ((player != NULL) && (actor == player->unk_664)) - { + if ((player != NULL) && (actor == player->unk_664)) { func_8008EDF0(player); func_8005A444(func_800C04A4(globalCtx, func_800C030C(globalCtx)), 0); } - if (actor == actorCtx->targetCtx.arrowPointedActor) + if (actor == actorCtx->targetCtx.arrowPointedActor) { actorCtx->targetCtx.arrowPointedActor = NULL; + } - if (actor == actorCtx->targetCtx.unk_8C) + if (actor == actorCtx->targetCtx.unk_8C) { actorCtx->targetCtx.unk_8C = NULL; + } - if (actor == actorCtx->targetCtx.unk_90) + if (actor == actorCtx->targetCtx.unk_90) { actorCtx->targetCtx.unk_90 = NULL; + } func_800F89E8(&actor->unk_E4); Actor_Destroy(actor, globalCtx); @@ -3235,19 +2913,19 @@ Actor* Actor_Delete(ActorContext* actorCtx, Actor* actor, GlobalContext* globalC ZeldaArena_FreeDebug(actor, "../z_actor.c", 7242); - if (overlayEntry->vramStart == 0) - { - if (HREG(20) != 0) + if (overlayEntry->vramStart == 0) { + if (HREG(20) != 0) { // Translates to: "NOT AN OVERLAY" osSyncPrintf("オーバーレイではありません\n"); - } - else - { - if (overlayEntry->loadedRamAddr == NULL) + } + } else { + if (overlayEntry->loadedRamAddr == NULL) { __assert("actor_dlftbl->allocp != NULL", "../z_actor.c", 7251); + } - if (overlayEntry->nbLoaded <= 0) + if (overlayEntry->nbLoaded <= 0) { __assert("actor_dlftbl->clients > 0", "../z_actor.c", 7252); + } overlayEntry->nbLoaded--; Actor_FreeOverlay(overlayEntry); @@ -3256,8 +2934,7 @@ Actor* Actor_Delete(ActorContext* actorCtx, Actor* actor, GlobalContext* globalC return newFirstActor; } -s32 func_80032880(GlobalContext* globalCtx, Actor* actor) -{ +s32 func_80032880(GlobalContext* globalCtx, Actor* actor) { s16 sp1E; s16 sp1C; @@ -3273,49 +2950,37 @@ f32 D_8015BBF4; s32 D_8015BBF8; s16 D_8015BBFC; -void func_800328D4(GlobalContext* globalCtx, ActorContext* actorCtx, Player* player, u32 actorType) -{ +void func_800328D4(GlobalContext* globalCtx, ActorContext* actorCtx, Player* player, u32 actorType) { f32 var; Actor* actor; Actor* sp84; - CollisionPoly *sp80; + CollisionPoly* sp80; UNK_TYPE sp7C; Vec3f sp70; actor = actorCtx->actorList[actorType].first; sp84 = player->unk_664; - while (actor != NULL) - { - if ((actor->update != NULL) && ((Player*)actor != player) && ((actor->flags & 1) == 1)) - { - if ((actorType == ACTORTYPE_ENEMY) && ((actor->flags & 5) == 5) && - (actor->waterSurfaceDist < 250000.0f) && (actor->waterSurfaceDist < D_8015BBF4)) - { - actorCtx->targetCtx.unk_90 = actor; - D_8015BBF4 = actor->waterSurfaceDist; + while (actor != NULL) { + if ((actor->update != NULL) && ((Player*)actor != player) && ((actor->flags & 1) == 1)) { + if ((actorType == ACTORTYPE_ENEMY) && ((actor->flags & 5) == 5) && (actor->waterSurfaceDist < 250000.0f) && + (actor->waterSurfaceDist < D_8015BBF4)) { + actorCtx->targetCtx.unk_90 = actor; + D_8015BBF4 = actor->waterSurfaceDist; } - if (actor != sp84) - { + if (actor != sp84) { var = func_8002EFC0(actor, player, D_8015BBFC); - if ((var < D_8015BBF0) && - func_8002F090(actor, var) && - func_80032880(globalCtx, actor) && - (!func_8003DD6C(&globalCtx->colCtx, &player->actor.posRot2.pos, - &actor->posRot2.pos, &sp70, &sp80, 1, 1, 1, 1, &sp7C) || - func_80042048(&globalCtx->colCtx, sp80, sp7C))) - { - if (actor->unk_10D != 0) - { - if (actor->unk_10D < D_8015BBF8) - { + if ((var < D_8015BBF0) && func_8002F090(actor, var) && func_80032880(globalCtx, actor) && + (!func_8003DD6C(&globalCtx->colCtx, &player->actor.posRot2.pos, &actor->posRot2.pos, &sp70, &sp80, + 1, 1, 1, 1, &sp7C) || + func_80042048(&globalCtx->colCtx, sp80, sp7C))) { + if (actor->unk_10D != 0) { + if (actor->unk_10D < D_8015BBF8) { D_8015BBEC = actor; D_8015BBF8 = actor->unk_10D; } - } - else - { + } else { D_8015BBE8 = actor; D_8015BBF0 = var; } @@ -3327,24 +2992,12 @@ void func_800328D4(GlobalContext* globalCtx, ActorContext* actorCtx, Player* pla } } -u8 D_801160A0[] = -{ - ACTORTYPE_BOSS, - ACTORTYPE_ENEMY, - ACTORTYPE_BG, - ACTORTYPE_EXPLOSIVES, - ACTORTYPE_NPC, - ACTORTYPE_ITEMACTION, - ACTORTYPE_CHEST, - ACTORTYPE_SWITCH, - ACTORTYPE_PROP, - ACTORTYPE_MISC, - ACTORTYPE_DOOR, - ACTORTYPE_SWITCH, +u8 D_801160A0[] = { + ACTORTYPE_BOSS, ACTORTYPE_ENEMY, ACTORTYPE_BG, ACTORTYPE_EXPLOSIVES, ACTORTYPE_NPC, ACTORTYPE_ITEMACTION, + ACTORTYPE_CHEST, ACTORTYPE_SWITCH, ACTORTYPE_PROP, ACTORTYPE_MISC, ACTORTYPE_DOOR, ACTORTYPE_SWITCH, }; -Actor* func_80032AF0(GlobalContext* globalCtx, ActorContext* actorCtx, Actor** actorPtr, Player* player) -{ +Actor* func_80032AF0(GlobalContext* globalCtx, ActorContext* actorCtx, Actor** actorPtr, Player* player) { s32 i; u8* entry; @@ -3352,33 +3005,30 @@ Actor* func_80032AF0(GlobalContext* globalCtx, ActorContext* actorCtx, Actor** a D_8015BBF0 = D_8015BBF4 = FLT_MAX; D_8015BBF8 = 0x7FFFFFFF; - if (!func_8008E988(globalCtx)) - { + if (!func_8008E988(globalCtx)) { entry = &D_801160A0[0]; actorCtx->targetCtx.unk_90 = NULL; D_8015BBFC = player->actor.shape.rot.y; - for (i = 0; i < 3; i++) - { + for (i = 0; i < 3; i++) { func_800328D4(globalCtx, actorCtx, player, *entry); entry++; } - if (D_8015BBE8 == NULL) - { - for (i; i < ARRAY_COUNT(D_801160A0); i++) - { + if (D_8015BBE8 == NULL) { + for (i; i < ARRAY_COUNT(D_801160A0); i++) { func_800328D4(globalCtx, actorCtx, player, *entry); entry++; } } } - if (D_8015BBE8 == 0) + if (D_8015BBE8 == 0) { *actorPtr = D_8015BBEC; - else + } else { *actorPtr = D_8015BBE8; + } return *actorPtr; } @@ -3386,84 +3036,77 @@ Actor* func_80032AF0(GlobalContext* globalCtx, ActorContext* actorCtx, Actor** a /** * Finds the first actor instance of a specified id and type if there is one. */ -Actor* Actor_Find(ActorContext* actorCtx, s32 actorId, s32 actorType) -{ +Actor* Actor_Find(ActorContext* actorCtx, s32 actorId, s32 actorType) { Actor* actor = actorCtx->actorList[actorType].first; - while (actor != NULL) - { - if (actorId == actor->id) + while (actor != NULL) { + if (actorId == actor->id) { return actor; + } actor = actor->next; } return NULL; } -void func_80032C7C(GlobalContext* globalCtx, Actor* actor) -{ +void func_80032C7C(GlobalContext* globalCtx, Actor* actor) { globalCtx->actorCtx.unk_00 = 5; Audio_PlaySoundAtPosition(globalCtx, &actor->posRot.pos, 0x14, NA_SE_EN_LAST_DAMAGE); } -s16 func_80032CB4(s16* arg0, s16 arg1, s16 arg2, s16 arg3) -{ - if (DECR(arg0[1]) == 0) +s16 func_80032CB4(s16* arg0, s16 arg1, s16 arg2, s16 arg3) { + if (DECR(arg0[1]) == 0) { arg0[1] = Math_Rand_S16Offset(arg1, arg2); + } - if ((arg0[1] - arg3) > 0) + if ((arg0[1] - arg3) > 0) { arg0[0] = 0; - else if (((arg0[1] - arg3) > -2) || (arg0[1] < 2)) + } else if (((arg0[1] - arg3) > -2) || (arg0[1] < 2)) { arg0[0] = 1; - else + } else { arg0[0] = 2; - - return arg0[0]; -} - -s16 func_80032D60(s16* arg0, s16 arg1, s16 arg2, s16 arg3) -{ - if (DECR(arg0[1]) == 0) - { - arg0[1] = Math_Rand_S16Offset(arg1, arg2); - arg0[0]++; - - if ((arg0[0] % 3) == 0) - arg0[0] = (s32)(Math_Rand_ZeroOne() * arg3) * 3; } return arg0[0]; } -typedef struct -{ +s16 func_80032D60(s16* arg0, s16 arg1, s16 arg2, s16 arg3) { + if (DECR(arg0[1]) == 0) { + arg0[1] = Math_Rand_S16Offset(arg1, arg2); + arg0[0]++; + + if ((arg0[0] % 3) == 0) { + arg0[0] = (s32)(Math_Rand_ZeroOne() * arg3) * 3; + } + } + + return arg0[0]; +} + +typedef struct { /* 0x00 */ MtxF* unk_00; /* 0x04 */ s16* unk_04; - /* 0x08 */ s16 unk_08; + /* 0x08 */ s16 unk_08; /* 0x0A */ char unk_0A[0x02]; /* 0x0C */ s32* unk_0C; - /* 0x10 */ s32 unk_10; - /* 0x14 */ s32 unk_14; + /* 0x10 */ s32 unk_10; + /* 0x14 */ s32 unk_14; } struct_80032E24; -void func_80032E24(struct_80032E24* arg0, s32 arg1, GlobalContext* globalCtx) -{ +void func_80032E24(struct_80032E24* arg0, s32 arg1, GlobalContext* globalCtx) { u32 sp28; u32 sp24; u32 sp20; sp28 = (arg1 * sizeof(*arg0->unk_00)) + sizeof(*arg0->unk_00); arg0->unk_00 = ZeldaArena_MallocDebug(sp28, "../z_actor.c", 7540); - if (arg0->unk_00 != NULL) - { + if (arg0->unk_00 != NULL) { sp24 = (arg1 * sizeof(*arg0->unk_0C)) + sizeof(*arg0->unk_0C); arg0->unk_0C = ZeldaArena_MallocDebug(sp24, "../z_actor.c", 7543); - if (arg0->unk_0C != NULL) - { + if (arg0->unk_0C != NULL) { sp20 = (arg1 * sizeof(*arg0->unk_04)) + sizeof(*arg0->unk_04); arg0->unk_04 = ZeldaArena_MallocDebug(sp20, "../z_actor.c", 7546); - if (arg0->unk_04 != NULL) - { + if (arg0->unk_04 != NULL) { Lib_MemSet(arg0->unk_00, sp28, 0); Lib_MemSet(arg0->unk_0C, sp24, 0); Lib_MemSet(arg0->unk_04, sp20, 0); @@ -3473,35 +3116,35 @@ void func_80032E24(struct_80032E24* arg0, s32 arg1, GlobalContext* globalCtx) } } - if (arg0->unk_00 != NULL) + if (arg0->unk_00 != NULL) { ZeldaArena_FreeDebug(arg0->unk_00, "../z_actor.c", 7558); + } - if (arg0->unk_0C != NULL) + if (arg0->unk_0C != NULL) { ZeldaArena_FreeDebug(arg0->unk_0C, "../z_actor.c", 7561); + } - if (arg0->unk_04 != NULL) + if (arg0->unk_04 != NULL) { ZeldaArena_FreeDebug(arg0->unk_04, "../z_actor.c", 7564); + } } -void func_80032F54(struct_80032E24* arg0, s32 arg1, s32 arg2, s32 arg3, u32 arg4, s32* arg5, s16 arg6) -{ +void func_80032F54(struct_80032E24* arg0, s32 arg1, s32 arg2, s32 arg3, u32 arg4, s32* arg5, s16 arg6) { GlobalContext* globalCtx = func_80026B00(); - if ((globalCtx->actorCtx.unk_00 == 0) && (arg0->unk_10 > 0)) - { - if ((arg1 >= arg2) && (arg3 >= arg1) && (*arg5 != 0)) - { + if ((globalCtx->actorCtx.unk_00 == 0) && (arg0->unk_10 > 0)) { + if ((arg1 >= arg2) && (arg3 >= arg1) && (*arg5 != 0)) { arg0->unk_0C[arg0->unk_10] = *arg5; Matrix_Get(&arg0->unk_00[arg0->unk_10]); arg0->unk_04[arg0->unk_10] = arg6; arg0->unk_10++; } - if (arg1 != arg0->unk_14) + if (arg1 != arg0->unk_14) { arg0->unk_08++; + } - if (arg0->unk_08 >= arg4) - { + if (arg0->unk_08 >= arg4) { arg0->unk_08 = arg0->unk_10 - 1; arg0->unk_10 = -1; } @@ -3510,45 +3153,41 @@ void func_80032F54(struct_80032E24* arg0, s32 arg1, s32 arg2, s32 arg3, u32 arg4 arg0->unk_14 = arg1; } -typedef struct -{ - /* 0x000 */ Actor actor; - /* 0x14C */ u8 unk_14C; - /* 0x14E */ s16 unk_14E; - /* 0x150 */ s32 unk_150; - /* 0x154 */ f32 unk_154; - /* 0x158 */ f32 unk_158; +typedef struct { + /* 0x000 */ Actor actor; + /* 0x14C */ u8 unk_14C; + /* 0x14E */ s16 unk_14E; + /* 0x150 */ s32 unk_150; + /* 0x154 */ f32 unk_154; + /* 0x158 */ f32 unk_158; } ActorEnPart; -s32 func_8003305C(Actor* actor, struct_80032E24* arg1, GlobalContext* globalCtx, s16 params) -{ +s32 func_8003305C(Actor* actor, struct_80032E24* arg1, GlobalContext* globalCtx, s16 params) { ActorEnPart* spawnedEnPart; MtxF* mtx; s16 objBankIndex; - if (arg1->unk_10 != -1) + if (arg1->unk_10 != -1) { return 0; + } - while (arg1->unk_08 > 0) - { + while (arg1->unk_08 > 0) { Matrix_Put(&arg1->unk_00[arg1->unk_08]); Matrix_Scale(1.0f / actor->scale.x, 1.0f / actor->scale.y, 1.0f / actor->scale.z, MTXMODE_APPLY); Matrix_Get(&arg1->unk_00[arg1->unk_08]); - if (1) // Necessary to match - { - if (arg1->unk_04[arg1->unk_08] >= 0) + if (1) { // Necessary to match + if (arg1->unk_04[arg1->unk_08] >= 0) { objBankIndex = arg1->unk_04[arg1->unk_08]; - else + } else { objBankIndex = actor->objBankIndex; + } } mtx = &arg1->unk_00[arg1->unk_08]; spawnedEnPart = (ActorEnPart*)Actor_SpawnAttached(&globalCtx->actorCtx, actor, globalCtx, ACTOR_EN_PART, - mtx->wx, mtx->wy, mtx->wz, - 0, 0, objBankIndex, params); - if (spawnedEnPart != NULL) - { + mtx->wx, mtx->wy, mtx->wz, 0, 0, objBankIndex, params); + if (spawnedEnPart != NULL) { func_800D20CC(&arg1->unk_00[arg1->unk_08], &spawnedEnPart->actor.shape.rot, 0); spawnedEnPart->unk_150 = arg1->unk_0C[arg1->unk_08]; spawnedEnPart->actor.scale = actor->scale; @@ -3565,8 +3204,8 @@ s32 func_8003305C(Actor* actor, struct_80032E24* arg1, GlobalContext* globalCtx, return 1; } -void func_80033260(GlobalContext* globalCtx, Actor* actor, Vec3f* arg2, f32 arg3, s32 arg4, f32 arg5, s16 arg6, s16 arg7, u8 arg8) -{ +void func_80033260(GlobalContext* globalCtx, Actor* actor, Vec3f* arg2, f32 arg3, s32 arg4, f32 arg5, s16 arg6, + s16 arg7, u8 arg8) { Vec3f sp9C; Vec3f sp90 = { 0.0f, 0.0f, 0.0f }; Vec3f sp84 = { 0.0f, 0.3f, 0.0f }; @@ -3577,26 +3216,25 @@ void func_80033260(GlobalContext* globalCtx, Actor* actor, Vec3f* arg2, f32 arg3 sp9C.y = actor->unk_80; sp84.y += (Math_Rand_ZeroOne() - 0.5f) * 0.2f; - for (i = arg4; i >= 0; i--) - { + for (i = arg4; i >= 0; i--) { sp9C.x = (func_800CA720(var) * arg3) + arg2->x; sp9C.z = (func_800CA774(var) * arg3) + arg2->z; sp84.x = (Math_Rand_ZeroOne() - 0.5f) * arg5; sp84.z = (Math_Rand_ZeroOne() - 0.5f) * arg5; - if (arg6 == 0) + if (arg6 == 0) { func_8002857C(globalCtx, &sp9C, &sp90, &sp84); - else if (arg8 != 0) + } else if (arg8 != 0) { func_800286CC(globalCtx, &sp9C, &sp90, &sp84, arg6, arg7); - else + } else { func_8002865C(globalCtx, &sp9C, &sp90, &sp84, arg6, arg7); + } var += 6.28f / (arg4 + 1.0f); } } -void func_80033480(GlobalContext* globalCtx, Vec3f* arg1, f32 arg2, s32 arg3, s16 arg4, s16 arg5, u8 arg6) -{ +void func_80033480(GlobalContext* globalCtx, Vec3f* arg1, f32 arg2, s32 arg3, s16 arg4, s16 arg5, u8 arg6) { Vec3f sp94; Vec3f sp88 = { 0.0f, 0.0f, 0.0f }; Vec3f sp7C = { 0.0f, 0.3f, 0.0f }; @@ -3604,8 +3242,7 @@ void func_80033480(GlobalContext* globalCtx, Vec3f* arg1, f32 arg2, s32 arg3, s1 u32 var2; s32 i; - for (i = arg3; i >= 0; i--) - { + for (i = arg3; i >= 0; i--) { sp94.x = arg1->x + ((Math_Rand_ZeroOne() - 0.5f) * arg2); sp94.y = arg1->y + ((Math_Rand_ZeroOne() - 0.5f) * arg2); sp94.z = arg1->z + ((Math_Rand_ZeroOne() - 0.5f) * arg2); @@ -3613,17 +3250,16 @@ void func_80033480(GlobalContext* globalCtx, Vec3f* arg1, f32 arg2, s32 arg3, s1 var = (s16)((Math_Rand_ZeroOne() * arg4) * 0.2f) + arg4; var2 = arg6; - if (var2 != 0) + if (var2 != 0) { func_800286CC(globalCtx, &sp94, &sp88, &sp7C, var, arg5); - else + } else { func_8002865C(globalCtx, &sp94, &sp88, &sp7C, var, arg5); + } } } -Actor* func_80033640(GlobalContext* globalCtx, Collider* collider) -{ - if ((collider->collideFlags & 0x2) && (collider->ac->type == ACTORTYPE_EXPLOSIVES)) - { +Actor* func_80033640(GlobalContext* globalCtx, Collider* collider) { + if ((collider->collideFlags & 0x2) && (collider->ac->type == ACTORTYPE_EXPLOSIVES)) { collider->collideFlags &= ~0x2; return collider->ac; } @@ -3631,22 +3267,18 @@ Actor* func_80033640(GlobalContext* globalCtx, Collider* collider) return NULL; } -Actor* func_80033684(GlobalContext* globalCtx, Actor* explosiveActor) -{ +Actor* func_80033684(GlobalContext* globalCtx, Actor* explosiveActor) { Actor* actor = globalCtx->actorCtx.actorList[ACTORTYPE_EXPLOSIVES].first; - while (actor != NULL) - { - if ((actor == explosiveActor) || (actor->params != 1)) - { + while (actor != NULL) { + if ((actor == explosiveActor) || (actor->params != 1)) { actor = actor->next; - } - else - { - if (func_8002DB48(explosiveActor, actor) <= (actor->shape.rot.z * 10) + 80.0f) + } else { + if (func_8002DB48(explosiveActor, actor) <= (actor->shape.rot.z * 10) + 80.0f) { return actor; - else + } else { actor = actor->next; + } } } @@ -3657,21 +3289,18 @@ Actor* func_80033684(GlobalContext* globalCtx, Actor* explosiveActor) * Dynamically changes the type of a given actor instance. * This is done by moving it to the corresponding type list and setting its type variable accordingly. */ -void Actor_ChangeType(GlobalContext* globalCtx, ActorContext* actorCtx, Actor* actor, u8 actorType) -{ +void Actor_ChangeType(GlobalContext* globalCtx, ActorContext* actorCtx, Actor* actor, u8 actorType) { Actor_RemoveFromTypeList(globalCtx, actorCtx, actor); Actor_AddToTypeList(actorCtx, actor, actorType); } -typedef struct -{ - /* 0x000 */ Actor actor; - /* 0x14C */ char unk_14C[0xC4]; - /* 0x210 */ s16 unk_210; +typedef struct { + /* 0x000 */ Actor actor; + /* 0x14C */ char unk_14C[0xC4]; + /* 0x210 */ s16 unk_210; } Actor_80033780; -Actor_80033780* func_80033780(GlobalContext* globalCtx, Actor* refActor, f32 arg2) -{ +Actor_80033780* func_80033780(GlobalContext* globalCtx, Actor* refActor, f32 arg2) { Actor_80033780* itemActor; Vec3f spA8; f32 deltaX; @@ -3682,19 +3311,15 @@ Actor_80033780* func_80033780(GlobalContext* globalCtx, Actor* refActor, f32 arg Actor* actor; actor = globalCtx->actorCtx.actorList[ACTORTYPE_ITEMACTION].first; - while (actor != NULL) - { - if (((actor->id != ACTOR_ARMS_HOOK) && (actor->id != ACTOR_EN_ARROW)) || (actor == refActor)) + while (actor != NULL) { + if (((actor->id != ACTOR_ARMS_HOOK) && (actor->id != ACTOR_EN_ARROW)) || (actor == refActor)) { actor = actor->next; - else - { + } else { itemActor = (Actor_80033780*)actor; - if ((arg2 < Math_Vec3f_DistXYZ(&refActor->posRot.pos, &itemActor->actor.posRot.pos)) || (itemActor->unk_210 == 0)) - { + if ((arg2 < Math_Vec3f_DistXYZ(&refActor->posRot.pos, &itemActor->actor.posRot.pos)) || + (itemActor->unk_210 == 0)) { actor = actor->next; - } - else - { + } else { deltaX = Math_Sins(itemActor->actor.posRot.rot.y) * (itemActor->actor.speedXZ * 10.0f); deltaY = itemActor->actor.velocity.y + (itemActor->actor.gravity * 10.0f); deltaZ = Math_Coss(itemActor->actor.posRot.rot.y) * (itemActor->actor.speedXZ * 10.0f); @@ -3703,11 +3328,12 @@ Actor_80033780* func_80033780(GlobalContext* globalCtx, Actor* refActor, f32 arg spA8.y = itemActor->actor.posRot.pos.y + deltaY; spA8.z = itemActor->actor.posRot.pos.z + deltaZ; - if (func_80062ECC(refActor->sub_98.unk_10, refActor->sub_98.unk_12, 0.0f, - &refActor->posRot.pos, &itemActor->actor.posRot.pos, &spA8, &sp90, &sp84)) + if (func_80062ECC(refActor->sub_98.unk_10, refActor->sub_98.unk_12, 0.0f, &refActor->posRot.pos, + &itemActor->actor.posRot.pos, &spA8, &sp90, &sp84)) { return itemActor; - else + } else { actor = actor->next; + } } } } @@ -3718,12 +3344,10 @@ Actor_80033780* func_80033780(GlobalContext* globalCtx, Actor* refActor, f32 arg /** * Sets the actor's text id with a dynamic prefix based on the current scene. */ -void Actor_SetTextWithPrefix(GlobalContext* globalCtx, Actor* actor, s16 baseTextId) -{ +void Actor_SetTextWithPrefix(GlobalContext* globalCtx, Actor* actor, s16 baseTextId) { s16 prefix; - switch (globalCtx->sceneNum) - { + switch (globalCtx->sceneNum) { case SCENE_YDAN: case SCENE_YDAN_BOSS: case SCENE_MORIBOSSROOM: @@ -3797,8 +3421,7 @@ void Actor_SetTextWithPrefix(GlobalContext* globalCtx, Actor* actor, s16 baseTex actor->textId = prefix | baseTextId; } -s16 func_800339B8(Actor* actor, GlobalContext* globalCtx, f32 arg2, s16 arg3) -{ +s16 func_800339B8(Actor* actor, GlobalContext* globalCtx, f32 arg2, s16 arg3) { s16 ret; s16 sp44; f32 sp40; @@ -3820,36 +3443,32 @@ s16 func_800339B8(Actor* actor, GlobalContext* globalCtx, f32 arg2, s16 arg3) return ret; } -s32 func_80033A84(GlobalContext* globalCtx, Actor* actor) -{ +s32 func_80033A84(GlobalContext* globalCtx, Actor* actor) { Player* player = PLAYER; - if ((player->stateFlags1 & 0x10) && (actor->unk_10C != 0)) + if ((player->stateFlags1 & 0x10) && (actor->unk_10C != 0)) { return 1; - else + } else { return 0; + } } -s32 func_80033AB8(GlobalContext* globalCtx, Actor* actor) -{ +s32 func_80033AB8(GlobalContext* globalCtx, Actor* actor) { Player* player = PLAYER; - if ((player->stateFlags1 & 0x10) && (actor->unk_10C == 0)) + if ((player->stateFlags1 & 0x10) && (actor->unk_10C == 0)) { return 1; - else + } else { return 0; + } } -f32 func_80033AEC(Vec3f* arg0, Vec3f* arg1, f32 arg2, f32 arg3, f32 arg4, f32 arg5) -{ +f32 func_80033AEC(Vec3f* arg0, Vec3f* arg1, f32 arg2, f32 arg3, f32 arg4, f32 arg5) { f32 ret = 0.0f; - if (arg4 <= Math_Vec3f_DistXYZ(arg0, arg1)) - { + if (arg4 <= Math_Vec3f_DistXYZ(arg0, arg1)) { ret = Math_SmoothScaleMaxMinF(&arg1->x, arg0->x, arg2, arg3, 0.0f); ret += Math_SmoothScaleMaxMinF(&arg1->y, arg0->y, arg2, arg3, 0.0f); ret += Math_SmoothScaleMaxMinF(&arg1->z, arg0->z, arg2, arg3, 0.0f); - } - else if (arg5 < Math_Vec3f_DistXYZ(arg0, arg1)) - { + } else if (arg5 < Math_Vec3f_DistXYZ(arg0, arg1)) { ret = Math_SmoothScaleMaxMinF(&arg1->x, arg0->x, arg2, arg3, 0.0f); ret += Math_SmoothScaleMaxMinF(&arg1->y, arg0->y, arg2, arg3, 0.0f); ret += Math_SmoothScaleMaxMinF(&arg1->z, arg0->z, arg2, arg3, 0.0f); @@ -3858,20 +3477,19 @@ f32 func_80033AEC(Vec3f* arg0, Vec3f* arg1, f32 arg2, f32 arg3, f32 arg4, f32 ar return ret; } -void func_80033C30(Vec3f* arg0, Vec3f* arg1, u8 alpha, GlobalContext* globalCtx) -{ +void func_80033C30(Vec3f* arg0, Vec3f* arg1, u8 alpha, GlobalContext* globalCtx) { MtxF sp60; f32 var; Vec3f sp50; CollisionPoly* sp4C; GraphicsContext* gfxCtx = globalCtx->state.gfxCtx; - Gfx* gfxArr[4]; + Gfx* dispRefs[4]; - func_800C6AC4(gfxArr, globalCtx->state.gfxCtx, "../z_actor.c", 8120); + Graph_OpenDisps(dispRefs, globalCtx->state.gfxCtx, "../z_actor.c", 8120); - if (0) ; // Necessary to match + if (0) {} // Necessary to match - gfxCtx->polyOpa.p = func_80093774(gfxCtx->polyOpa.p, 0x2C); + gfxCtx->polyOpa.p = Gfx_CallSetupDL(gfxCtx->polyOpa.p, 0x2C); gDPSetPrimColor(gfxCtx->polyOpa.p++, 0, 0, 0x00, 0x00, 0x00, alpha); @@ -3881,60 +3499,55 @@ void func_80033C30(Vec3f* arg0, Vec3f* arg1, u8 alpha, GlobalContext* globalCtx) var = func_8003C8EC(globalCtx, &globalCtx->colCtx, &sp4C, &sp50); - if (sp4C != NULL) - { + if (sp4C != NULL) { func_80038A28(sp4C, arg0->x, var, arg0->z, &sp60); Matrix_Put(&sp60); - } - else + } else { Matrix_Translate(arg0->x, arg0->y, arg0->z, MTXMODE_NEW); + } Matrix_Scale(arg1->x, 1.0f, arg1->z, MTXMODE_APPLY); - gSPMatrix(gfxCtx->polyOpa.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_actor.c", 8149), G_MTX_MODELVIEW | G_MTX_LOAD); + gSPMatrix(gfxCtx->polyOpa.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_actor.c", 8149), + G_MTX_MODELVIEW | G_MTX_LOAD); gSPDisplayList(gfxCtx->polyOpa.p++, &D_04049210); - func_800C6B54(gfxArr, globalCtx->state.gfxCtx, "../z_actor.c", 8155); + Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_actor.c", 8155); } -void func_80033DB8(GlobalContext* globalCtx, s16 arg1, s16 arg2) -{ - s16 var = func_80092F88(&globalCtx->cameraCtx.activeCameras[0], 3); - func_80092DAC(var, 20000); - func_80092E70(var, arg1, 0, 0, 0); - func_80092DF0(var, arg2); +void func_80033DB8(GlobalContext* globalCtx, s16 arg1, s16 arg2) { + s16 var = Quake_Add(&globalCtx->cameraCtx.activeCameras[0], 3); + Quake_SetSpeed(var, 20000); + Quake_SetQuakeValues(var, arg1, 0, 0, 0); + Quake_SetCountdown(var, arg2); } -void func_80033E1C(GlobalContext* globalCtx, s16 arg1, s16 arg2, s16 arg3) -{ - s16 var = func_80092F88(&globalCtx->cameraCtx.activeCameras[0], 3); - func_80092DAC(var, arg3); - func_80092E70(var, arg1, 0, 0, 0); - func_80092DF0(var, arg2); +void func_80033E1C(GlobalContext* globalCtx, s16 arg1, s16 arg2, s16 arg3) { + s16 var = Quake_Add(&globalCtx->cameraCtx.activeCameras[0], 3); + Quake_SetSpeed(var, arg3); + Quake_SetQuakeValues(var, arg1, 0, 0, 0); + Quake_SetCountdown(var, arg2); } -void func_80033E88(Actor* actor, GlobalContext* globalCtx, s16 arg2, s16 arg3) -{ - if (arg2 >= 5) +void func_80033E88(Actor* actor, GlobalContext* globalCtx, s16 arg2, s16 arg3) { + if (arg2 >= 5) { func_800AA000(actor->waterSurfaceDist, 0xFF, 0x14, 0x96); - else + } else { func_800AA000(actor->waterSurfaceDist, 0xB4, 0x14, 0x64); + } func_80033DB8(globalCtx, arg2, arg3); } -f32 Math_Rand_ZeroFloat(f32 f) -{ +f32 Math_Rand_ZeroFloat(f32 f) { return Math_Rand_ZeroOne() * f; } -f32 Math_Rand_CenteredFloat(f32 f) -{ +f32 Math_Rand_CenteredFloat(f32 f) { return (Math_Rand_ZeroOne() - 0.5f) * f; } -typedef struct -{ +typedef struct { /* 0x00 */ f32 unk_00; /* 0x04 */ f32 unk_04; /* 0x08 */ f32 unk_08; @@ -3944,15 +3557,13 @@ typedef struct /* 0x18 */ u32 unk_18; } struct_801160DC; // size = 0x1C -struct_801160DC D_801160DC[3] = -{ - { 0.54f, 6000.0f, 5000.0f, 1.0f, 0.0f, 0x050011F0, 0x05001100 }, - { 0.644f, 12000.0f, 8000.0f, 1.0f, 0.0f, 0x06001530, 0x06001400 }, - { 0.64000005f, 8500.0f, 8000.0f, 1.75f, 0.1f, 0x050011F0, 0x05001100 }, +struct_801160DC D_801160DC[3] = { + { 0.54f, 6000.0f, 5000.0f, 1.0f, 0.0f, 0x050011F0, 0x05001100 }, + { 0.644f, 12000.0f, 8000.0f, 1.0f, 0.0f, 0x06001530, 0x06001400 }, + { 0.64000005f, 8500.0f, 8000.0f, 1.75f, 0.1f, 0x050011F0, 0x05001100 }, }; -void func_80033F54(GlobalContext* globalCtx, s32 arg1, s32 arg2) -{ +void func_80033F54(GlobalContext* globalCtx, s32 arg1, s32 arg2) { struct_801160DC* entry; s32 i; MtxF spB0; @@ -3961,13 +3572,13 @@ void func_80033F54(GlobalContext* globalCtx, s32 arg1, s32 arg2) f32 temp2; f32 temp3; GraphicsContext* gfxCtx; - Gfx* gfxArr[4]; + Gfx* dispRefs[4]; entry = &D_801160DC[arg2]; var = entry->unk_10; gfxCtx = globalCtx->state.gfxCtx; - func_800C6AC4(gfxArr, globalCtx->state.gfxCtx, "../z_actor.c", 8265); + Graph_OpenDisps(dispRefs, globalCtx->state.gfxCtx, "../z_actor.c", 8265); Matrix_Translate(0.0f, entry->unk_08, 500.0f, MTXMODE_APPLY); Matrix_Get(&spB0); @@ -3975,22 +3586,24 @@ void func_80033F54(GlobalContext* globalCtx, s32 arg1, s32 arg2) temp1 = sinf(entry->unk_00 - var) * -(10 - arg1) * 0.1f * entry->unk_04; temp2 = cosf(entry->unk_00 - var) * (10 - arg1) * 0.1f * entry->unk_04; - for (i = 0; i < 4; i++) - { + for (i = 0; i < 4; i++) { Matrix_Put(&spB0); Matrix_RotateZ(var, MTXMODE_APPLY); Matrix_Translate(temp1, temp2, 0.0f, MTXMODE_APPLY); - if (entry->unk_0C != 1.0f) + if (entry->unk_0C != 1.0f) { Matrix_Scale(entry->unk_0C, entry->unk_0C, entry->unk_0C, MTXMODE_APPLY); + } - gSPMatrix(gfxCtx->polyOpa.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_actor.c", 8299), G_MTX_MODELVIEW | G_MTX_LOAD); + gSPMatrix(gfxCtx->polyOpa.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_actor.c", 8299), + G_MTX_MODELVIEW | G_MTX_LOAD); gSPDisplayList(gfxCtx->polyOpa.p++, entry->unk_14); - if (i % 2) + if (i % 2) { temp3 = entry->unk_00 + entry->unk_00; - else + } else { temp3 = M_PI - (entry->unk_00 + entry->unk_00); + } var += temp3; } @@ -3998,28 +3611,27 @@ 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(gfxCtx->polyOpa.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_actor.c", 8314), G_MTX_MODELVIEW | G_MTX_LOAD); + gSPMatrix(gfxCtx->polyOpa.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_actor.c", 8314), + G_MTX_MODELVIEW | G_MTX_LOAD); gSPDisplayList(gfxCtx->polyOpa.p++, entry->unk_18); - func_800C6B54(gfxArr, globalCtx->state.gfxCtx, "../z_actor.c", 8319); + Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_actor.c", 8319); } -void func_8003424C(GlobalContext* globalCtx, Vec3f* arg1) -{ +void func_8003424C(GlobalContext* globalCtx, Vec3f* arg1) { func_80062D60(globalCtx, arg1); } -void func_8003426C(Actor* actor, s16 arg1, s16 arg2, s16 arg3, s16 arg4) -{ - if ((arg1 == 0x8000) && !(arg2 & 0x8000)) +void func_8003426C(Actor* actor, s16 arg1, s16 arg2, s16 arg3, s16 arg4) { + if ((arg1 == 0x8000) && !(arg2 & 0x8000)) { Audio_PlayActorSound2(actor, NA_SE_EN_LIGHT_ARROW_HIT); + } actor->unk_112 = arg1 | arg3 | ((arg2 & 0xF8) << 5) | arg4; actor->unk_114 = arg4; } -Hilite* func_800342EC(Vec3f* object, GlobalContext* globalCtx) -{ +Hilite* func_800342EC(Vec3f* object, GlobalContext* globalCtx) { Vec3f lightDir; lightDir.x = globalCtx->unk_10A4E; @@ -4029,8 +3641,7 @@ Hilite* func_800342EC(Vec3f* object, GlobalContext* globalCtx) return func_8002EABC(object, &globalCtx->view.eye, &lightDir, globalCtx->state.gfxCtx); } -Hilite* func_8003435C(Vec3f* object, GlobalContext* globalCtx) -{ +Hilite* func_8003435C(Vec3f* object, GlobalContext* globalCtx) { Vec3f lightDir; lightDir.x = globalCtx->unk_10A4E; @@ -4040,102 +3651,93 @@ Hilite* func_8003435C(Vec3f* object, GlobalContext* globalCtx) return func_8002EB44(object, &globalCtx->view.eye, &lightDir, globalCtx->state.gfxCtx); } -typedef s16 (*func_800343CC_arg4)(GlobalContext*, Actor*); -typedef s16 (*func_800343CC_arg5)(GlobalContext*, Actor*); - -s32 func_800343CC(GlobalContext* globalCtx, Actor* actor, s16* arg2, f32 arg3, func_800343CC_arg4 unkFunc1, func_800343CC_arg5 unkFunc2) -{ +s32 func_800343CC(GlobalContext* globalCtx, Actor* actor, s16* arg2, f32 arg3, u16 (*unkFunc1)(GlobalContext*, Actor*), + s16 (*unkFunc2)(GlobalContext*, Actor*)) { s16 sp26; s16 sp24; - if (func_8002F194(actor, globalCtx)) - { + if (func_8002F194(actor, globalCtx)) { *arg2 = 1; return 1; } - if (*arg2 != 0) - { + if (*arg2 != 0) { *arg2 = unkFunc2(globalCtx, actor); return 0; } func_8002F374(globalCtx, actor, &sp26, &sp24); - if ((sp26 < 0) || (sp26 > 0x140) || (sp24 < 0) || (sp24 > 0xF0)) + if ((sp26 < 0) || (sp26 > 0x140) || (sp24 < 0) || (sp24 > 0xF0)) { return 0; + } - if (!func_8002F2CC(actor, globalCtx, arg3)) + if (!func_8002F2CC(actor, globalCtx, arg3)) { return 0; + } actor->textId = unkFunc1(globalCtx, actor); return 0; } -typedef struct -{ - /* 0x00 */ s16 unk_00; - /* 0x02 */ s16 unk_02; - /* 0x04 */ s16 unk_04; - /* 0x06 */ s16 unk_06; - /* 0x08 */ s16 unk_08; - /* 0x0A */ s16 unk_0A; +typedef struct { + /* 0x00 */ s16 unk_00; + /* 0x02 */ s16 unk_02; + /* 0x04 */ s16 unk_04; + /* 0x06 */ s16 unk_06; + /* 0x08 */ s16 unk_08; + /* 0x0A */ s16 unk_0A; /* 0x0C */ char unk_0C[0x2]; - /* 0x0E */ s16 unk_0E; - /* 0x10 */ s16 unk_10; + /* 0x0E */ s16 unk_0E; + /* 0x10 */ s16 unk_10; /* 0x12 */ char unk_12[0x2]; - /* 0x14 */ f32 unk_14; + /* 0x14 */ f32 unk_14; /* 0x18 */ Vec3f unk_18; } struct_80034A14_arg1; -typedef struct -{ - /* 0x00 */ s16 unk_00; - /* 0x02 */ s16 unk_02; - /* 0x04 */ s16 unk_04; - /* 0x06 */ s16 unk_06; - /* 0x08 */ s16 unk_08; - /* 0x0A */ s16 unk_0A; - /* 0x0C */ u8 unk_0C; +typedef struct { + /* 0x00 */ s16 unk_00; + /* 0x02 */ s16 unk_02; + /* 0x04 */ s16 unk_04; + /* 0x06 */ s16 unk_06; + /* 0x08 */ s16 unk_08; + /* 0x0A */ s16 unk_0A; + /* 0x0C */ u8 unk_0C; } struct_80116130_0; // size = 0x10 -typedef struct -{ +typedef struct { /* 0x00 */ struct_80116130_0 sub_00; - /* 0x10 */ f32 unk_10; - /* 0x14 */ s16 unk_14; + /* 0x10 */ f32 unk_10; + /* 0x14 */ s16 unk_14; } struct_80116130; // size = 0x18 -struct_80116130 D_80116130[13] = -{ +struct_80116130 D_80116130[13] = { { { 0x2AA8, 0xF1C8, 0x18E2, 0x1554, 0x0000, 0x0000, 1 }, 170.0f, 0x3FFC }, { { 0x2AA8, 0xEAAC, 0x1554, 0x1554, 0xF8E4, 0x0E38, 1 }, 170.0f, 0x3FFC }, { { 0x31C4, 0xE390, 0x0E38, 0x0E38, 0xF1C8, 0x071C, 1 }, 170.0f, 0x3FFC }, { { 0x1554, 0xF1C8, 0x0000, 0x071C, 0xF8E4, 0x0000, 1 }, 170.0f, 0x3FFC }, { { 0x2AA8, 0xF8E4, 0x071C, 0x0E38, 0xD558, 0x2AA8, 1 }, 170.0f, 0x3FFC }, { { 0x0000, 0xE390, 0x2AA8, 0x3FFC, 0xF1C8, 0x0E38, 1 }, 170.0f, 0x3FFC }, - { { 0x2AA8, 0xF1C8, 0x0E38, 0x0E38, 0x0000, 0x0000, 1 }, 0.0f, 0x0000 }, - { { 0x2AA8, 0xF1C8, 0x0000, 0x0E38, 0x0000, 0x1C70, 1 }, 0.0f, 0x0000 }, - { { 0x2AA8, 0xF1C8, 0xF1C8, 0x0000, 0x0000, 0x0000, 1 }, 0.0f, 0x0000 }, - { { 0x071C, 0xF1C8, 0x0E38, 0x1C70, 0x0000, 0x0000, 1 }, 0.0f, 0x0000 }, - { { 0x0E38, 0xF1C8, 0x0000, 0x1C70, 0x0000, 0x0E38, 1 }, 0.0f, 0x0000 }, - { { 0x2AA8, 0xE390, 0x1C70, 0x0E38, 0xF1C8, 0x0E38, 1 }, 0.0f, 0x0000 }, - { { 0x18E2, 0xF1C8, 0x0E38, 0x0E38, 0x0000, 0x0000, 1 }, 0.0f, 0x0000 }, + { { 0x2AA8, 0xF1C8, 0x0E38, 0x0E38, 0x0000, 0x0000, 1 }, 0.0f, 0x0000 }, + { { 0x2AA8, 0xF1C8, 0x0000, 0x0E38, 0x0000, 0x1C70, 1 }, 0.0f, 0x0000 }, + { { 0x2AA8, 0xF1C8, 0xF1C8, 0x0000, 0x0000, 0x0000, 1 }, 0.0f, 0x0000 }, + { { 0x071C, 0xF1C8, 0x0E38, 0x1C70, 0x0000, 0x0000, 1 }, 0.0f, 0x0000 }, + { { 0x0E38, 0xF1C8, 0x0000, 0x1C70, 0x0000, 0x0E38, 1 }, 0.0f, 0x0000 }, + { { 0x2AA8, 0xE390, 0x1C70, 0x0E38, 0xF1C8, 0x0E38, 1 }, 0.0f, 0x0000 }, + { { 0x18E2, 0xF1C8, 0x0E38, 0x0E38, 0x0000, 0x0000, 1 }, 0.0f, 0x0000 }, }; #ifdef NON_MATCHING -// this function still needs a lot of work -void func_800344BC(Actor* actor, struct_80034A14_arg1* arg1, s16 arg2, s16 arg3, s16 arg4, s16 arg5, s16 arg6, s16 arg7, u8 arg8) -{ +// regalloc differences +void func_800344BC(Actor* actor, struct_80034A14_arg1* arg1, s16 arg2, s16 arg3, s16 arg4, s16 arg5, s16 arg6, s16 arg7, + u8 arg8) { s16 sp46; s16 sp44; - s16 temp1; - s16 sp40; s16 temp2; + s16 sp40; + s16 temp1; Vec3f sp30; - s16 temp3; - s16 temp4; sp30.x = actor->posRot.pos.x; sp30.y = actor->posRot.pos.y + arg1->unk_14; @@ -4143,51 +3745,57 @@ void func_800344BC(Actor* actor, struct_80034A14_arg1* arg1, s16 arg2, s16 arg3, sp46 = Math_Vec3f_Pitch(&sp30, &arg1->unk_18); sp44 = Math_Vec3f_Yaw(&sp30, &arg1->unk_18); + sp40 = Math_Vec3f_Yaw(&actor->posRot.pos, &arg1->unk_18) - actor->shape.rot.y; - temp1 = Math_Vec3f_Yaw(&actor->posRot.pos, &arg1->unk_18) - actor->shape.rot.y; + temp1 = (sp40 < -arg2) ? -arg2 : ((sp40 > arg2) ? arg2 : sp40); + Math_SmoothScaleMaxMinS(&arg1->unk_0A, temp1, 6, 2000, 1); - Math_SmoothScaleMaxMinS(&arg1->unk_0A, (temp1 < -arg2) ? -arg2 : ((temp1 > arg2) ? arg2 : temp1), 6, 2000, 1); + sp40 = (ABS(sp40) >= 0x8000) ? 0 : ((sp40 >= 0) ? sp40 : -sp40); + arg1->unk_0A = ((arg1->unk_0A < -sp40) ? -sp40 : ((arg1->unk_0A > sp40) ? sp40 : arg1->unk_0A)); - temp3 = (ABS(temp1) >= 0x8000) ? 0 : ((temp1 >= 0) ? temp1 : -temp1); - arg1->unk_0A = ((arg1->unk_0A < -temp3) ? -temp3 : ((arg1->unk_0A > temp3) ? temp3 : arg1->unk_0A)); + sp40 = sp40 - arg1->unk_0A; - sp40 = temp1 - arg1->unk_0A; - Math_SmoothScaleMaxMinS(&arg1->unk_10, (sp40 < -arg5) ? -arg5 : ((sp40 > arg5) ? arg5 : sp40), 6, 2000, 1); + temp1 = (sp40 < -arg5) ? -arg5 : ((sp40 > arg5) ? arg5 : sp40); + Math_SmoothScaleMaxMinS(&arg1->unk_10, temp1, 6, 2000, 1); - temp4 = (ABS(sp40) >= 0x8000) ? 0 : ((sp40 >= 0) ? sp40 : -sp40); - arg1->unk_10 = ((arg1->unk_10 < -temp4) ? -temp4 : ((arg1->unk_10 > temp4) ? temp4 : arg1->unk_10)); + sp40 = (ABS(sp40) >= 0x8000) ? 0 : ((sp40 >= 0) ? sp40 : -sp40); + arg1->unk_10 = ((arg1->unk_10 < -sp40) ? -sp40 : ((arg1->unk_10 > sp40) ? sp40 : arg1->unk_10)); - if (arg8 != 0) + if (arg8 != 0) { + if (arg3) {} // Seems necessary to match Math_SmoothScaleMaxMinS(&actor->shape.rot.y, sp44, 6, 2000, 1); + } - Math_SmoothScaleMaxMinS(&arg1->unk_08, (sp46 < arg4) ? arg4 : ((sp46 > arg3) ? arg3 : sp46), 6, 2000, 1); + temp1 = (sp46 < arg4) ? arg4 : ((sp46 > arg3) ? arg3 : sp46); + Math_SmoothScaleMaxMinS(&arg1->unk_08, temp1, 6, 2000, 1); temp2 = sp46 - arg1->unk_08; - Math_SmoothScaleMaxMinS(&arg1->unk_0E, (temp2 < arg7) ? arg4 : ((temp2 > arg6) ? arg3 : temp2), 6, 2000, 1); + + temp1 = (temp2 < arg7) ? arg7 : ((temp2 > arg6) ? arg6 : temp2); + Math_SmoothScaleMaxMinS(&arg1->unk_0E, temp1, 6, 2000, 1); } #else #pragma GLOBAL_ASM("asm/non_matchings/code/z_actor/func_800344BC.s") #endif -s16 func_800347E8(s16 arg0) -{ +s16 func_800347E8(s16 arg0) { return D_80116130[arg0].unk_14; } -s16 func_80034810(Actor* actor, struct_80034A14_arg1* arg1, f32 arg2, s16 arg3, s16 arg4) -{ +s16 func_80034810(Actor* actor, struct_80034A14_arg1* arg1, f32 arg2, s16 arg3, s16 arg4) { s32 pad; s16 var; s16 abs_var; - if (arg4 != 0) + if (arg4 != 0) { return arg4; + } - if (arg1->unk_00 != 0) + if (arg1->unk_00 != 0) { return 4; + } - if (arg2 < Math_Vec3f_DistXYZ(&actor->posRot.pos, &arg1->unk_18)) - { + if (arg2 < Math_Vec3f_DistXYZ(&actor->posRot.pos, &arg1->unk_18)) { arg1->unk_04 = 0; arg1->unk_06 = 0; return 1; @@ -4195,18 +3803,17 @@ s16 func_80034810(Actor* actor, struct_80034A14_arg1* arg1, f32 arg2, s16 arg3, var = Math_Vec3f_Yaw(&actor->posRot.pos, &arg1->unk_18); abs_var = ABS((s16)((f32)var - actor->shape.rot.y)); - if (arg3 >= abs_var) - { + if (arg3 >= abs_var) { arg1->unk_04 = 0; arg1->unk_06 = 0; return 2; } - if (DECR(arg1->unk_04) != 0) + if (DECR(arg1->unk_04) != 0) { return arg1->unk_02; + } - switch (arg1->unk_06) - { + switch (arg1->unk_06) { case 0: case 2: arg1->unk_04 = Math_Rand_S16Offset(30, 30); @@ -4221,16 +3828,14 @@ s16 func_80034810(Actor* actor, struct_80034A14_arg1* arg1, f32 arg2, s16 arg3, return 4; } -void func_80034A14(Actor* actor, struct_80034A14_arg1* arg1, s16 arg2, s16 arg3) -{ +void func_80034A14(Actor* actor, struct_80034A14_arg1* arg1, s16 arg2, s16 arg3) { struct_80116130_0 sp38; arg1->unk_02 = func_80034810(actor, arg1, D_80116130[arg2].unk_10, D_80116130[arg2].unk_14, arg3); sp38 = D_80116130[arg2].sub_00; - switch (arg1->unk_02) - { + switch (arg1->unk_02) { case 1: sp38.unk_00 = 0; sp38.unk_04 = 0; @@ -4243,12 +3848,11 @@ void func_80034A14(Actor* actor, struct_80034A14_arg1* arg1, s16 arg2, s16 arg3) sp38.unk_0C = 0; } - func_800344BC(actor, arg1, sp38.unk_00, sp38.unk_04, sp38.unk_02, - sp38.unk_06, sp38.unk_0A, sp38.unk_08, sp38.unk_0C); + func_800344BC(actor, arg1, sp38.unk_00, sp38.unk_04, sp38.unk_02, sp38.unk_06, sp38.unk_0A, sp38.unk_08, + sp38.unk_0C); } -Gfx* func_80034B28(GraphicsContext* gfxCtx) -{ +Gfx* func_80034B28(GraphicsContext* gfxCtx) { Gfx* displayList; displayList = Graph_Alloc(gfxCtx, sizeof(Gfx)); @@ -4259,19 +3863,16 @@ Gfx* func_80034B28(GraphicsContext* gfxCtx) #ifdef NON_MATCHING // doesn't generate the 2 useless move instructions before returning -Gfx* func_80034B54(GraphicsContext* gfxCtx) -{ +Gfx* func_80034B54(GraphicsContext* gfxCtx) { Gfx* displayList; Gfx* displayListHead; displayList = Graph_Alloc(gfxCtx, 2 * sizeof(Gfx)); displayListHead = displayList; - gDPSetRenderMode(displayListHead++, - AA_EN | Z_CMP | Z_UPD | IM_RD | CLR_ON_CVG | CVG_DST_WRAP | ZMODE_XLU | FORCE_BL | - GBL_c1(G_BL_CLR_FOG, G_BL_A_SHADE, G_BL_CLR_IN, G_BL_1MA), - AA_EN | Z_CMP | Z_UPD | IM_RD | CLR_ON_CVG | CVG_DST_WRAP | ZMODE_XLU | FORCE_BL | - GBL_c2(G_BL_CLR_IN, G_BL_A_IN, G_BL_CLR_MEM, G_BL_1MA)); + gDPSetRenderMode(displayListHead++, G_RM_FOG_SHADE_A, + AA_EN | Z_CMP | Z_UPD | IM_RD | CLR_ON_CVG | CVG_DST_WRAP | ZMODE_XLU | FORCE_BL | + GBL_c2(G_BL_CLR_IN, G_BL_A_IN, G_BL_CLR_MEM, G_BL_1MA)); gSPEndDisplayList(displayListHead); @@ -4281,12 +3882,12 @@ Gfx* func_80034B54(GraphicsContext* gfxCtx) #pragma GLOBAL_ASM("asm/non_matchings/code/z_actor/func_80034B54.s") #endif -void func_80034BA0(GlobalContext* globalCtx, SkelAnime* skelAnime, void* unkFunc1, void* unkFunc2, Actor* actor, s16 alpha) -{ +void func_80034BA0(GlobalContext* globalCtx, SkelAnime* skelAnime, SkelAnime_LimbUpdateMatrix2 unkFunc1, + SkelAnime_LimbAppendDlist2 unkFunc2, Actor* actor, s16 alpha) { GraphicsContext* gfxCtx = globalCtx->state.gfxCtx; - Gfx* gfxArr[4]; + Gfx* dispRefs[4]; - func_800C6AC4(gfxArr, globalCtx->state.gfxCtx, "../z_actor.c", 8831); + Graph_OpenDisps(dispRefs, globalCtx->state.gfxCtx, "../z_actor.c", 8831); func_80093D18(globalCtx->state.gfxCtx); @@ -4295,18 +3896,18 @@ void func_80034BA0(GlobalContext* globalCtx, SkelAnime* skelAnime, void* unkFunc gDPPipeSync(gfxCtx->polyOpa.p++); gSPSegment(gfxCtx->polyOpa.p++, 0x0C, func_80034B28(globalCtx->state.gfxCtx)); - gfxCtx->polyOpa.p = func_800A273C(globalCtx, skelAnime->limbIndex, skelAnime->actorDrawTbl, - skelAnime->dListCount, unkFunc1, unkFunc2, actor, gfxCtx->polyOpa.p); + gfxCtx->polyOpa.p = SkelAnime_DrawSV2(globalCtx, skelAnime->skeleton, skelAnime->actorDrawTbl, + skelAnime->dListCount, unkFunc1, unkFunc2, actor, gfxCtx->polyOpa.p); - func_800C6B54(gfxArr, globalCtx->state.gfxCtx, "../z_actor.c", 8860); + Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_actor.c", 8860); } -void func_80034CC4(GlobalContext* globalCtx, SkelAnime* skelAnime, void* unkFunc1, void* unkFunc2, Actor* actor, s16 alpha) -{ +void func_80034CC4(GlobalContext* globalCtx, SkelAnime* skelAnime, SkelAnime_LimbUpdateMatrix2 unkFunc1, + SkelAnime_LimbAppendDlist2 unkFunc2, Actor* actor, s16 alpha) { GraphicsContext* gfxCtx = globalCtx->state.gfxCtx; - Gfx* gfxArr[4]; + Gfx* dispRefs[4]; - func_800C6AC4(gfxArr, globalCtx->state.gfxCtx, "../z_actor.c", 8876); + Graph_OpenDisps(dispRefs, globalCtx->state.gfxCtx, "../z_actor.c", 8876); func_80093D84(globalCtx->state.gfxCtx); @@ -4314,29 +3915,26 @@ void func_80034CC4(GlobalContext* globalCtx, SkelAnime* skelAnime, void* unkFunc gDPSetEnvColor(gfxCtx->polyXlu.p++, 0x00, 0x00, 0x00, alpha); gSPSegment(gfxCtx->polyXlu.p++, 0x0C, func_80034B54(globalCtx->state.gfxCtx)); - gfxCtx->polyXlu.p = func_800A273C(globalCtx, skelAnime->limbIndex, skelAnime->actorDrawTbl, - skelAnime->dListCount, unkFunc1, unkFunc2, actor, gfxCtx->polyXlu.p); + gfxCtx->polyXlu.p = SkelAnime_DrawSV2(globalCtx, skelAnime->skeleton, skelAnime->actorDrawTbl, + skelAnime->dListCount, unkFunc1, unkFunc2, actor, gfxCtx->polyXlu.p); - func_800C6B54(gfxArr, globalCtx->state.gfxCtx, "../z_actor.c", 8904); + Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_actor.c", 8904); } -s16 func_80034DD4(Actor* actor, GlobalContext* globalCtx, s16 arg2, f32 arg3) -{ +s16 func_80034DD4(Actor* actor, GlobalContext* globalCtx, s16 arg2, f32 arg3) { Player* player = PLAYER; f32 var; - if ((globalCtx->csCtx.state != 0) || (D_8011D394 != 0)) + if ((globalCtx->csCtx.state != 0) || (D_8011D394 != 0)) { var = Math_Vec3f_DistXYZ(&actor->posRot.pos, &globalCtx->view.eye) * 0.25f; - else + } else { var = Math_Vec3f_DistXYZ(&actor->posRot.pos, &player->actor.posRot.pos); - - if (arg3 < var) - { - actor->flags &= ~0x1; - Math_SmoothScaleMaxMinS(&arg2, 0, 6, 0x14, 1); } - else - { + + if (arg3 < var) { + actor->flags &= ~1; + Math_SmoothScaleMaxMinS(&arg2, 0, 6, 0x14, 1); + } else { actor->flags |= 1; Math_SmoothScaleMaxMinS(&arg2, 0xFF, 6, 0x14, 1); } @@ -4344,78 +3942,53 @@ s16 func_80034DD4(Actor* actor, GlobalContext* globalCtx, s16 arg2, f32 arg3) return arg2; } -// Some animation related structure -typedef struct -{ - /* 0x00 */ u32 animation; - /* 0x04 */ f32 playbackSpeed; - /* 0x08 */ f32 unk_08; - /* 0x0C */ f32 frameCount; - /* 0x10 */ u8 unk_10; - /* 0x14 */ f32 transitionRate; -} struct_80034EC0_Entry; // size = 0x18 - -void func_80034EC0(SkelAnime* skelAnime, struct_80034EC0_Entry* arg1, s32 arg2) -{ +void func_80034EC0(SkelAnime* skelAnime, struct_80034EC0_Entry* arg1, s32 arg2) { f32 frameCount; arg1 += arg2; - if (arg1->frameCount > 0.0f) + if (arg1->frameCount > 0.0f) { frameCount = arg1->frameCount; - else + } else { frameCount = SkelAnime_GetFrameCount(arg1->animation); + } - SkelAnime_ChangeAnimation(skelAnime, arg1->animation, arg1->playbackSpeed, - arg1->unk_08, frameCount, arg1->unk_10, arg1->transitionRate); + SkelAnime_ChangeAnim(skelAnime, arg1->animation, arg1->playbackSpeed, arg1->unk_08, frameCount, arg1->unk_10, + arg1->transitionRate); } -void func_80034F54(GlobalContext* globalCtx, s16* arg1, s16* arg2, s32 arg3) -{ +void func_80034F54(GlobalContext* globalCtx, s16* arg1, s16* arg2, s32 arg3) { u32 frames = globalCtx->gameplayFrames; s32 i; - for (i = 0; i < arg3; i++) - { + for (i = 0; i < arg3; i++) { arg1[i] = (0x814 + 50 * i) * frames; arg2[i] = (0x940 + 50 * i) * frames; } } -void Actor_Noop(Actor* actor, GlobalContext* globalCtx) -{ - +void Actor_Noop(Actor* actor, GlobalContext* globalCtx) { } -s32 func_80035124(Actor* actor, GlobalContext* globalCtx) -{ +s32 func_80035124(Actor* actor, GlobalContext* globalCtx) { s32 ret = 0; - switch (actor->params) - { + switch (actor->params) { case 0: - if (func_8002F410(actor, globalCtx)) - { + if (func_8002F410(actor, globalCtx)) { actor->params = 1; - } - else if (!(actor->bgCheckFlags & 1)) - { + } else if (!(actor->bgCheckFlags & 1)) { Actor_MoveForward(actor); Math_SmoothScaleMaxMinF(&actor->speedXZ, 0.0f, 1.0f, 0.1f, 0.0f); - } - else if ((actor->bgCheckFlags & 2) && (actor->velocity.y < -4.0f)) - { + } else if ((actor->bgCheckFlags & 2) && (actor->velocity.y < -4.0f)) { ret = 1; - } - else - { + } else { actor->shape.rot.x = actor->shape.rot.z = 0; func_8002F580(actor, globalCtx); } break; case 1: - if (func_8002F5A0(actor, globalCtx)) - { + if (func_8002F5A0(actor, globalCtx)) { actor->params = 0; } break; @@ -4426,38 +3999,9 @@ s32 func_80035124(Actor* actor, GlobalContext* globalCtx) return ret; } -/* z_cheap_proc.c */ +#include "z_cheap_proc.c" -void Draw_DListOpa(GlobalContext* globalCtx, u32 dlist) -{ - GraphicsContext* gfxCtx = globalCtx->state.gfxCtx; - Gfx* gfxArr[4]; - - func_800C6AC4(gfxArr, globalCtx->state.gfxCtx, "../z_cheap_proc.c", 214); - - func_80093D18(globalCtx->state.gfxCtx); - gSPMatrix(gfxCtx->polyOpa.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_cheap_proc.c", 216), G_MTX_MODELVIEW | G_MTX_LOAD); - gSPDisplayList(gfxCtx->polyOpa.p++, dlist); - - func_800C6B54(gfxArr, globalCtx->state.gfxCtx, "../z_cheap_proc.c", 219); -} - -void Draw_DListXlu(GlobalContext* globalCtx, u32 dlist) -{ - GraphicsContext* gfxCtx = globalCtx->state.gfxCtx; - Gfx* gfxArr[4]; - - func_800C6AC4(gfxArr, globalCtx->state.gfxCtx, "../z_cheap_proc.c", 228); - - func_80093D84(globalCtx->state.gfxCtx); - gSPMatrix(gfxCtx->polyXlu.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_cheap_proc.c", 230), G_MTX_MODELVIEW | G_MTX_LOAD); - gSPDisplayList(gfxCtx->polyXlu.p++, dlist); - - func_800C6B54(gfxArr, globalCtx->state.gfxCtx, "../z_cheap_proc.c", 233); -} - -u8 func_800353E8(GlobalContext* globalCtx) -{ +u8 func_800353E8(GlobalContext* globalCtx) { Player* player = PLAYER; return player->unk_845; } @@ -4466,30 +4010,25 @@ u8 func_800353E8(GlobalContext* globalCtx) * Finds the first actor instance of a specified id and type within a given range from an actor if there is one. * If the id provided is -1, this will look for any actor of the specified type rather than a specific id. */ -Actor* Actor_FindNearby(GlobalContext* globalCtx, Actor* refActor, s16 actorId, u8 actorType, f32 range) -{ +Actor* Actor_FindNearby(GlobalContext* globalCtx, Actor* refActor, s16 actorId, u8 actorType, f32 range) { Actor* actor = globalCtx->actorCtx.actorList[actorType].first; - while (actor != NULL) - { - if (actor == refActor || ((actorId != -1) && (actorId != actor->id))) - { + while (actor != NULL) { + if (actor == refActor || ((actorId != -1) && (actorId != actor->id))) { actor = actor->next; - } - else - { - if (func_8002DB48(refActor, actor) <= range) + } else { + if (func_8002DB48(refActor, actor) <= range) { return actor; - else + } else { actor = actor->next; + } } } return NULL; } -s32 func_800354B4(GlobalContext* globalCtx, Actor* actor, f32 range, s16 arg3, s16 arg4, s16 arg5) -{ +s32 func_800354B4(GlobalContext* globalCtx, Actor* actor, f32 range, s16 arg3, s16 arg4, s16 arg5) { Player* player = PLAYER; s16 var1; s16 var2; @@ -4497,15 +4036,15 @@ s32 func_800354B4(GlobalContext* globalCtx, Actor* actor, f32 range, s16 arg3, s var1 = (s16)(actor->rotTowardsLinkY + 0x8000) - player->actor.shape.rot.y; var2 = actor->rotTowardsLinkY - arg5; - if ((actor->xzDistanceFromLink <= range) && (player->swordState != 0) && - (arg4 >= ABS(var1)) && (arg3 >= ABS(var2))) + if ((actor->xzDistanceFromLink <= range) && (player->swordState != 0) && (arg4 >= ABS(var1)) && + (arg3 >= ABS(var2))) { return 1; - else + } else { return 0; + } } -void func_8003555C(GlobalContext* globalCtx, Vec3f* arg1, Vec3f* arg2, Vec3f* arg3) -{ +void func_8003555C(GlobalContext* globalCtx, Vec3f* arg1, Vec3f* arg2, Vec3f* arg3) { Color_RGB8 color1; Color_RGB8 color2; @@ -4523,151 +4062,105 @@ void func_8003555C(GlobalContext* globalCtx, Vec3f* arg1, Vec3f* arg2, Vec3f* ar Vec3f D_80116268 = { 0.0f, -1.5f, 0.0f }; Vec3f D_80116274 = { 0.0f, -0.2f, 0.0f }; -// unused -Gfx D_80116280[] = -{ - gsDPSetRenderMode(AA_EN | Z_CMP | Z_UPD | IM_RD | CLR_ON_CVG | - CVG_DST_WRAP | ZMODE_XLU | FORCE_BL | - GBL_c1(G_BL_CLR_FOG, G_BL_A_SHADE, G_BL_CLR_IN, G_BL_1MA), - AA_EN | Z_CMP | Z_UPD | IM_RD | CLR_ON_CVG | - CVG_DST_WRAP | ZMODE_XLU | FORCE_BL | - GBL_c2(G_BL_CLR_IN, G_BL_A_IN, G_BL_CLR_MEM, G_BL_1MA)), +Gfx D_80116280[] = { + gsDPSetRenderMode(G_RM_FOG_SHADE_A, AA_EN | Z_CMP | Z_UPD | IM_RD | CLR_ON_CVG | CVG_DST_WRAP | ZMODE_XLU | + FORCE_BL | GBL_c2(G_BL_CLR_IN, G_BL_A_IN, G_BL_CLR_MEM, G_BL_1MA)), gsDPSetAlphaCompare(G_AC_THRESHOLD), gsSPEndDisplayList(), }; -void func_800355B8(GlobalContext* globalCtx, Vec3f* arg1) -{ +void func_800355B8(GlobalContext* globalCtx, Vec3f* arg1) { func_8003555C(globalCtx, arg1, &D_80116268, &D_80116274); } -u8 func_800355E4(GlobalContext* globalCtx, ColliderCylinderInit* colCylinderInit) -{ +u8 func_800355E4(GlobalContext* globalCtx, ColliderCylinderInit* colCylinderInit) { Player* player = PLAYER; - if ((colCylinderInit->inner.toucherDamage & 0x08) && (player->swordState != 0) && (player->swordAnimation == 0x16)) + if ((colCylinderInit->inner.toucherDamage & 0x08) && (player->swordState != 0) && + (player->swordAnimation == 0x16)) { return 1; - else + } else { return 0; + } } -u8 Actor_ApplyDamage(Actor* actor) -{ - if (actor->sub_98.damage >= actor->sub_98.health) +u8 Actor_ApplyDamage(Actor* actor) { + if (actor->sub_98.damage >= actor->sub_98.health) { actor->sub_98.health = 0; - else + } else { actor->sub_98.health -= actor->sub_98.damage; + } return actor->sub_98.health; } -void func_80035650(Actor* actor, ColliderBody* colBody, s32 freezeFlag) -{ - if (colBody->colliding == NULL) - { +void func_80035650(Actor* actor, ColliderBody* colBody, s32 freezeFlag) { + if (colBody->colliding == NULL) { actor->unk_116 = 0x00; - } - else if (freezeFlag && (colBody->colliding->toucher.flags & 0x10060000)) - { + } else if (freezeFlag && (colBody->colliding->toucher.flags & 0x10060000)) { actor->freeze = colBody->colliding->toucher.damage; actor->unk_116 = 0x00; - } - else if (colBody->colliding->toucher.flags & 0x0800) - { + } else if (colBody->colliding->toucher.flags & 0x0800) { actor->unk_116 = 0x01; - } - else if (colBody->colliding->toucher.flags & 0x1000) - { + } else if (colBody->colliding->toucher.flags & 0x1000) { actor->unk_116 = 0x02; - } - else if (colBody->colliding->toucher.flags & 0x4000) - { + } else if (colBody->colliding->toucher.flags & 0x4000) { actor->unk_116 = 0x04; - } - else if (colBody->colliding->toucher.flags & 0x8000) - { + } else if (colBody->colliding->toucher.flags & 0x8000) { actor->unk_116 = 0x08; - } - else if ((colBody->colliding->toucher.flags << 0xF) < 0) - { + } else if ((colBody->colliding->toucher.flags << 0xF) < 0) { actor->unk_116 = 0x10; - } - else if (colBody->colliding->toucher.flags & 0x2000) - { + } else if (colBody->colliding->toucher.flags & 0x2000) { actor->unk_116 = 0x20; - } - else if ((colBody->colliding->toucher.flags << 0xC) < 0) - { - if (freezeFlag) + } else if ((colBody->colliding->toucher.flags << 0xC) < 0) { + if (freezeFlag) { actor->freeze = colBody->colliding->toucher.damage; + } actor->unk_116 = 0x40; - } - else - { + } else { actor->unk_116 = 0x00; } } -void func_8003573C(Actor* actor, ColliderBody* colBody, s32 freezeFlag) -{ +void func_8003573C(Actor* actor, ColliderBody* colBody, s32 freezeFlag) { ColliderBody* curColBody; s32 flag; s32 i; actor->unk_116 = 0x00; - for (i = colBody->unk_18 - 1; i >= 0; i--) - { + for (i = colBody->unk_18 - 1; i >= 0; i--) { curColBody = &colBody->colBuf[i].c; - if (curColBody->colliding == NULL) - { + if (curColBody->colliding == NULL) { flag = 0x00; - } - else if (freezeFlag && (curColBody->colliding->toucher.flags & 0x10060000)) - { + } else if (freezeFlag && (curColBody->colliding->toucher.flags & 0x10060000)) { actor->freeze = curColBody->colliding->toucher.damage; flag = 0x00; - } - else if (curColBody->colliding->toucher.flags & 0x0800) - { + } else if (curColBody->colliding->toucher.flags & 0x0800) { flag = 0x01; - } - else if (curColBody->colliding->toucher.flags & 0x1000) - { + } else if (curColBody->colliding->toucher.flags & 0x1000) { flag = 0x02; - } - else if (curColBody->colliding->toucher.flags & 0x4000) - { + } else if (curColBody->colliding->toucher.flags & 0x4000) { flag = 0x04; - } - else if (curColBody->colliding->toucher.flags & 0x8000) - { + } else if (curColBody->colliding->toucher.flags & 0x8000) { flag = 0x08; - } - else if (curColBody->colliding->toucher.flags & 0x10000) - { + } else if (curColBody->colliding->toucher.flags & 0x10000) { flag = 0x10; - } - else if (curColBody->colliding->toucher.flags & 0x2000) - { + } else if (curColBody->colliding->toucher.flags & 0x2000) { flag = 0x20; - } - else if (curColBody->colliding->toucher.flags & 0x80000) - { - if (freezeFlag) + } else if (curColBody->colliding->toucher.flags & 0x80000) { + if (freezeFlag) { actor->freeze = curColBody->colliding->toucher.damage; + } flag = 0x40; - } - else - { + } else { flag = 0x00; } actor->unk_116 |= flag; } } -void func_80035844(Vec3f* arg0, Vec3f* arg1, s16* arg2, s32 arg3) -{ +void func_80035844(Vec3f* arg0, Vec3f* arg1, s16* arg2, s32 arg3) { f32 dx = arg1->x - arg0->x; f32 dz = arg1->z - arg0->z; f32 dy = arg3 ? (arg1->y - arg0->y) : (arg0->y - arg1->y); @@ -4679,17 +4172,14 @@ void func_80035844(Vec3f* arg0, Vec3f* arg1, s16* arg2, s32 arg3) /** * Spawns En_Part (Dissipating Flames) actor attached to the given actor. */ -ActorEnPart* func_800358DC(Actor* actor, Vec3f* spawnPos, Vec3s* spawnRot, Vec3f* arg3, s32 arg4, - s32 unused, GlobalContext* globalCtx, s16 params, s32 arg8) -{ +ActorEnPart* func_800358DC(Actor* actor, Vec3f* spawnPos, Vec3s* spawnRot, Vec3f* arg3, s32 arg4, s32 unused, + GlobalContext* globalCtx, s16 params, s32 arg8) { ActorEnPart* spawnedEnPart; spawnedEnPart = (ActorEnPart*)Actor_SpawnAttached(&globalCtx->actorCtx, actor, globalCtx, ACTOR_EN_PART, - spawnPos->x, spawnPos->y, spawnPos->z, - spawnRot->x, spawnRot->y, actor->objBankIndex, - params); - if (spawnedEnPart != NULL) - { + spawnPos->x, spawnPos->y, spawnPos->z, spawnRot->x, spawnRot->y, + actor->objBankIndex, params); + if (spawnedEnPart != NULL) { spawnedEnPart->actor.scale = actor->scale; spawnedEnPart->actor.speedXZ = arg3->x; spawnedEnPart->unk_150 = arg8; @@ -4703,8 +4193,7 @@ ActorEnPart* func_800358DC(Actor* actor, Vec3f* spawnPos, Vec3s* spawnRot, Vec3f return NULL; } -void func_800359B8(Actor* actor, s16 arg1, Vec3s* arg2) -{ +void func_800359B8(Actor* actor, s16 arg1, Vec3s* arg2) { f32 sp44; f32 sp40; f32 sp3C; @@ -4717,8 +4206,7 @@ void func_800359B8(Actor* actor, s16 arg1, Vec3s* arg2) CollisionPoly* floorPoly; s32 pad; - if (actor->floorPoly != NULL) - { + if (actor->floorPoly != NULL) { floorPoly = actor->floorPoly; sp44 = floorPoly->norm.x * (1.f / 32767); sp40 = floorPoly->norm.y * (1.f / 32767); @@ -4727,17 +4215,16 @@ void func_800359B8(Actor* actor, s16 arg1, Vec3s* arg2) sp38 = Math_Sins(arg1); sp34 = Math_Coss(arg1); sp28 = (-(sp44 * sp38) - (sp3C * sp34)); - arg2->x = -(s16)(func_800FD250(sp28 * sp40, 1.0f) * (32768 / M_PI)); + arg2->x = -(s16)(Math_atan2f(sp28 * sp40, 1.0f) * (32768 / M_PI)); sp2C = Math_Sins(arg1 - 16375); sp30 = Math_Coss(arg1 - 16375); sp24 = (-(sp44 * sp2C) - (sp3C * sp30)); - arg2->z = -(s16)(func_800FD250(sp24 * sp40, 1.0f) * (32768 / M_PI)); + arg2->z = -(s16)(Math_atan2f(sp24 * sp40, 1.0f) * (32768 / M_PI)); } } -void func_80035B18(GlobalContext* globalCtx, Actor* actor, u16 textId) -{ +void func_80035B18(GlobalContext* globalCtx, Actor* actor, u16 textId) { func_8010B720(globalCtx, textId); actor->textId = textId; } @@ -4745,496 +4232,458 @@ void func_80035B18(GlobalContext* globalCtx, Actor* actor, u16 textId) /** * Tests if event_chk_inf flag is set. */ -s32 Flags_GetEventChkInf(s32 flag) -{ +s32 Flags_GetEventChkInf(s32 flag) { return gSaveContext.event_chk_inf[flag >> 4] & (1 << (flag & 0xF)); } /** * Sets event_chk_inf flag. */ -void Flags_SetEventChkInf(s32 flag) -{ +void Flags_SetEventChkInf(s32 flag) { gSaveContext.event_chk_inf[flag >> 4] |= (1 << (flag & 0xF)); } /** * Tests if inf_table flag is set. */ -s32 Flags_GetInfTable(s32 flag) -{ +s32 Flags_GetInfTable(s32 flag) { return gSaveContext.inf_table[flag >> 4] & (1 << (flag & 0xF)); } /** * Sets inf_table flag. */ -void Flags_SetInfTable(s32 flag) -{ +void Flags_SetInfTable(s32 flag) { gSaveContext.inf_table[flag >> 4] |= (1 << (flag & 0xF)); } -u32 func_80035BFC(GlobalContext* globalCtx, s16 arg1) -{ +u32 func_80035BFC(GlobalContext* globalCtx, s16 arg1) { u16 retTextId = 0; - switch(arg1) - { + switch (arg1) { case 0: - if (Flags_GetEventChkInf(0x9)) - { - if (Flags_GetInfTable(0x5)) + if (Flags_GetEventChkInf(0x9)) { + if (Flags_GetInfTable(0x5)) { retTextId = 0x1048; - else + } else { retTextId = 0x1047; - } - else - { - if (Flags_GetEventChkInf(0x2)) - { - if (Flags_GetInfTable(0x3)) - retTextId = 0x1032; - else - retTextId = 0x1031; } - else - { - if (Flags_GetInfTable(0x0)) - { - if (Flags_GetInfTable(0x1)) - retTextId = 0x1003; - else - retTextId = 0x1002; + } else { + if (Flags_GetEventChkInf(0x2)) { + if (Flags_GetInfTable(0x3)) { + retTextId = 0x1032; + } else { + retTextId = 0x1031; } - else + } else { + if (Flags_GetInfTable(0x0)) { + if (Flags_GetInfTable(0x1)) { + retTextId = 0x1003; + } else { + retTextId = 0x1002; + } + } else { retTextId = 0x1001; + } } } break; case 1: - if (LINK_IS_CHILD) - { - if (Flags_GetEventChkInf(0x9)) - { - if (Flags_GetInfTable(0x10)) + if (LINK_IS_CHILD) { + if (Flags_GetEventChkInf(0x9)) { + if (Flags_GetInfTable(0x10)) { retTextId = 0x1046; - else + } else { retTextId = 0x1045; - } - else - { - if (Flags_GetEventChkInf(0x3)) - { - if (Flags_GetInfTable(0xE)) + } + } else { + if (Flags_GetEventChkInf(0x3)) { + if (Flags_GetInfTable(0xE)) { retTextId = 0x1034; - else + } else { retTextId = 0x1033; - } - else - { - if (Flags_GetInfTable(0xC)) + } + } else { + if (Flags_GetInfTable(0xC)) { retTextId = 0x1030; - else + } else { retTextId = 0x102F; + } } } - } - else - { - if (Flags_GetEventChkInf(0x5C)) - { - if (Flags_GetInfTable(0x19)) + } else { + if (Flags_GetEventChkInf(0x5C)) { + if (Flags_GetInfTable(0x19)) { retTextId = 0x1071; - else + } else { retTextId = 0x1070; - } - else - { - if (Flags_GetEventChkInf(0xB)) - { - if (Flags_GetInfTable(0x17)) - retTextId = 0x1068; - else - retTextId = 0x1067; } - else - { - if (Flags_GetInfTable(0x15)) + } else { + if (Flags_GetEventChkInf(0xB)) { + if (Flags_GetInfTable(0x17)) { + retTextId = 0x1068; + } else { + retTextId = 0x1067; + } + } else { + if (Flags_GetInfTable(0x15)) { retTextId = 0x1061; - else + } else { retTextId = 0x1060; + } } } } break; case 2: - if (LINK_IS_CHILD) - { - if (Flags_GetEventChkInf(0x9)) + if (LINK_IS_CHILD) { + if (Flags_GetEventChkInf(0x9)) { retTextId = 0x1042; - else + } else { retTextId = 0x1004; - } - else - { - if (Flags_GetEventChkInf(0x5C)) + } + } else { + if (Flags_GetEventChkInf(0x5C)) { retTextId = 0x1072; - else if (Flags_GetInfTable(0x41)) + } else if (Flags_GetInfTable(0x41)) { retTextId = 0x1055; - else + } else { retTextId = 0x1056; + } } break; case 3: - if (LINK_IS_CHILD) - { - if (Flags_GetEventChkInf(0x9)) + if (LINK_IS_CHILD) { + if (Flags_GetEventChkInf(0x9)) { retTextId = 0x1043; - else - { - if (Flags_GetInfTable(0x1E)) + } else { + if (Flags_GetInfTable(0x1E)) { retTextId = 0x1006; - else + } else { retTextId = 0x1005; + } } - } - else - { - if (Flags_GetEventChkInf(0x5C)) + } else { + if (Flags_GetEventChkInf(0x5C)) { retTextId = 0x1073; - else + } else { retTextId = 0x105A; + } } break; case 4: - if (LINK_IS_CHILD) - { - if (Flags_GetEventChkInf(0x9)) + if (LINK_IS_CHILD) { + if (Flags_GetEventChkInf(0x9)) { retTextId = 0x1042; - else + } else { retTextId = 0x1007; - } - else - { - if (Flags_GetEventChkInf(0x5C)) + } + } else { + if (Flags_GetEventChkInf(0x5C)) { retTextId = 0x1072; - else if (Flags_GetInfTable(0x47)) + } else if (Flags_GetInfTable(0x47)) { retTextId = 0x105E; - else + } else { retTextId = 0x105D; + } } break; case 5: - if (LINK_IS_CHILD) - { - if (Flags_GetEventChkInf(0x9)) + if (LINK_IS_CHILD) { + if (Flags_GetEventChkInf(0x9)) { retTextId = 0x1044; - else if (Flags_GetInfTable(0x22)) + } else if (Flags_GetInfTable(0x22)) { retTextId = 0x1009; - else + } else { retTextId = 0x1008; - } - else - { - if (Flags_GetEventChkInf(0x5C)) + } + } else { + if (Flags_GetEventChkInf(0x5C)) { retTextId = 0x1075; - else + } else { retTextId = 0x105B; + } } break; case 6: - if (LINK_IS_CHILD) - { - if (Flags_GetEventChkInf(0x9)) + if (LINK_IS_CHILD) { + if (Flags_GetEventChkInf(0x9)) { retTextId = 0x1042; - else if (Flags_GetInfTable(0x24)) + } else if (Flags_GetInfTable(0x24)) { retTextId = 0x100B; - else + } else { retTextId = 0x100A; - } - else - { - if (Flags_GetEventChkInf(0x5C)) + } + } else { + if (Flags_GetEventChkInf(0x5C)) { retTextId = 0x1056; - else + } else { retTextId = 0x105F; + } } break; case 7: - if (LINK_IS_CHILD) - { - if (Flags_GetEventChkInf(0x9)) + if (LINK_IS_CHILD) { + if (Flags_GetEventChkInf(0x9)) { retTextId = 0x1043; - else if (Flags_GetInfTable(0x26)) + } else if (Flags_GetInfTable(0x26)) { retTextId = 0x100D; - else + } else { retTextId = 0x100C; - } - else - { - if (Flags_GetEventChkInf(0x5C)) + } + } else { + if (Flags_GetEventChkInf(0x5C)) { retTextId = 0x1057; - else + } else { retTextId = 0x1057; + } } break; case 8: - if (LINK_IS_CHILD) - { - if (Flags_GetEventChkInf(0x9)) + if (LINK_IS_CHILD) { + if (Flags_GetEventChkInf(0x9)) { retTextId = 0x1043; - else if (Flags_GetInfTable(0x28)) + } else if (Flags_GetInfTable(0x28)) { retTextId = 0x1019; - else + } else { retTextId = 0x100E; - } - else - { - if (Flags_GetEventChkInf(0x5C)) + } + } else { + if (Flags_GetEventChkInf(0x5C)) { retTextId = 0x1077; - else if (Flags_GetInfTable(0x51)) + } else if (Flags_GetInfTable(0x51)) { retTextId = 0x1058; - else + } else { retTextId = 0x1059; + } } break; case 9: - if (LINK_IS_CHILD) - { - if (Flags_GetEventChkInf(0x9)) + if (LINK_IS_CHILD) { + if (Flags_GetEventChkInf(0x9)) { retTextId = 0x1049; - else + } else { retTextId = 0x1035; - } - else - { - if (Flags_GetEventChkInf(0x5C)) + } + } else { + if (Flags_GetEventChkInf(0x5C)) { retTextId = 0x1079; - else + } else { retTextId = 0x104e; + } } break; case 10: - if (LINK_IS_CHILD) - { - if (Flags_GetEventChkInf(0x9)) + if (LINK_IS_CHILD) { + if (Flags_GetEventChkInf(0x9)) { retTextId = 0x104A; - else + } else { retTextId = 0x1038; - } - else - { - if (Flags_GetEventChkInf(0x5C)) + } + } else { + if (Flags_GetEventChkInf(0x5C)) { retTextId = 0x1079; - else if (Flags_GetInfTable(0x59)) + } else if (Flags_GetInfTable(0x59)) { retTextId = 0x1050; - else + } else { retTextId = 0x104F; + } } break; case 11: - if (LINK_IS_CHILD) - { - if (Flags_GetEventChkInf(0x9)) + if (LINK_IS_CHILD) { + if (Flags_GetEventChkInf(0x9)) { retTextId = 0x104B; - else + } else { retTextId = 0x103C; - } - else - { - if (Flags_GetEventChkInf(0x5C)) + } + } else { + if (Flags_GetEventChkInf(0x5C)) { retTextId = 0x107b; - else + } else { retTextId = 0x1051; + } } break; case 12: - if (LINK_IS_CHILD) - { - if (Flags_GetEventChkInf(0x9)) + if (LINK_IS_CHILD) { + if (Flags_GetEventChkInf(0x9)) { retTextId = 0x104C; - else + } else { retTextId = 0x103D; - } - else - { - if (Flags_GetEventChkInf(0x5C)) + } + } else { + if (Flags_GetEventChkInf(0x5C)) { retTextId = 0x107C; - else + } else { retTextId = 0x1052; + } } break; case 13: - if (LINK_IS_CHILD) - { - if (Flags_GetEventChkInf(0x9)) + if (LINK_IS_CHILD) { + if (Flags_GetEventChkInf(0x9)) { retTextId = 0x104D; - else + } else { retTextId = 0x103E; - } - else - { - if (Flags_GetEventChkInf(0x5C)) + } + } else { + if (Flags_GetEventChkInf(0x5C)) { retTextId = 0x106E; - else if (Flags_GetInfTable(0x61)) + } else if (Flags_GetInfTable(0x61)) { retTextId = 0x1053; - else + } else { retTextId = 0x1054; + } } break; case 15: - if (Flags_GetEventChkInf(0x5C)) + if (Flags_GetEventChkInf(0x5C)) { retTextId = 0x1078; - else if (Flags_GetInfTable(0x66)) + } else if (Flags_GetInfTable(0x66)) { retTextId = 0x1066; - else + } else { retTextId = 0x1062; + } break; case 16: - if (globalCtx->sceneNum == SCENE_SPOT15) + if (globalCtx->sceneNum == SCENE_SPOT15) { retTextId = 0x7002; - else if (Flags_GetInfTable(0x6A)) + } else if (Flags_GetInfTable(0x6A)) { retTextId = 0x7004; - else if ((gSaveContext.day_time >= 0x4000) && (gSaveContext.day_time < 0xC556)) + } else if ((gSaveContext.day_time >= 0x4000) && (gSaveContext.day_time < 0xC556)) { retTextId = 0x7002; - else + } else { retTextId = 0x7003; + } break; case 17: - if (Flags_GetEventChkInf(0x9) && Flags_GetEventChkInf(0x25) && Flags_GetEventChkInf(0x37)) - { - if (Flags_GetInfTable(0x6c)) + if (Flags_GetEventChkInf(0x9) && Flags_GetEventChkInf(0x25) && Flags_GetEventChkInf(0x37)) { + if (Flags_GetInfTable(0x6c)) { retTextId = 0x7008; - else + } else { retTextId = 0x7007; - } - else + } + } else { retTextId = 0; + } break; case 19: retTextId = 0x702D; break; case 18: - if (Flags_GetEventChkInf(0x9) && Flags_GetEventChkInf(0x25) && Flags_GetEventChkInf(0x37)) + if (Flags_GetEventChkInf(0x9) && Flags_GetEventChkInf(0x25) && Flags_GetEventChkInf(0x37)) { retTextId = 0x7006; - else - { - if (Flags_GetEventChkInf(0x12)) - { - if (Flags_GetInfTable(0x71)) + } else { + if (Flags_GetEventChkInf(0x12)) { + if (Flags_GetInfTable(0x71)) { retTextId = 0x7072; - else + } else { retTextId = 0x7071; - } - else + } + } else { retTextId = 0x7029; + } } break; case 20: case 21: - if (Flags_GetEventChkInf(0x42)) + if (Flags_GetEventChkInf(0x42)) { retTextId = 0x2012; - else if (Flags_GetEventChkInf(0x41)) - { - if (Flags_GetInfTable(0x76)) + } else if (Flags_GetEventChkInf(0x41)) { + if (Flags_GetInfTable(0x76)) { retTextId = 0x2011; - else + } else { retTextId = 0x2010; - } - else if (Flags_GetEventChkInf(0x40)) + } + } else if (Flags_GetEventChkInf(0x40)) { retTextId = 0x200F; - else + } else { retTextId = 0x200E; + } break; case 24: - if (Flags_GetEventChkInf(0x9) && Flags_GetEventChkInf(0x25) && Flags_GetEventChkInf(0x37)) + if (Flags_GetEventChkInf(0x9) && Flags_GetEventChkInf(0x25) && Flags_GetEventChkInf(0x37)) { retTextId = 0x7044; - else + } else { retTextId = 0x7015; + } break; case 25: - if (Flags_GetEventChkInf(0x9) && Flags_GetEventChkInf(0x25) && Flags_GetEventChkInf(0x37)) + if (Flags_GetEventChkInf(0x9) && Flags_GetEventChkInf(0x25) && Flags_GetEventChkInf(0x37)) { retTextId = 0x7045; - else - { + } else { Flags_GetInfTable(0xC2); retTextId = 0x7016; } break; case 26: - if (Flags_GetEventChkInf(0x9) && Flags_GetEventChkInf(0x25) && Flags_GetEventChkInf(0x37)) + if (Flags_GetEventChkInf(0x9) && Flags_GetEventChkInf(0x25) && Flags_GetEventChkInf(0x37)) { retTextId = 0x7046; - else - { + } else { Flags_GetInfTable(0xc2); retTextId = 0x7018; } break; case 27: - if (Flags_GetEventChkInf(0x9) && Flags_GetEventChkInf(0x25) && Flags_GetEventChkInf(0x37)) + if (Flags_GetEventChkInf(0x9) && Flags_GetEventChkInf(0x25) && Flags_GetEventChkInf(0x37)) { retTextId = 0x7047; - else if (Flags_GetEventChkInf(0x14)) + } else if (Flags_GetEventChkInf(0x14)) { retTextId = 0x701A; - else if (Flags_GetEventChkInf(0x11)) - { - if (Flags_GetInfTable(0xC6)) + } else if (Flags_GetEventChkInf(0x11)) { + if (Flags_GetInfTable(0xC6)) { retTextId = 0x701C; - else + } else { retTextId = 0x701B; - } - else + } + } else { retTextId = 0x701A; + } break; case 28: - if (Flags_GetEventChkInf(0x9) && Flags_GetEventChkInf(0x25) && Flags_GetEventChkInf(0x37)) + if (Flags_GetEventChkInf(0x9) && Flags_GetEventChkInf(0x25) && Flags_GetEventChkInf(0x37)) { retTextId = 0x7048; - else - { + } else { Flags_GetInfTable(0xca); retTextId = 0x701D; } break; case 29: - if (Flags_GetEventChkInf(0x9) && Flags_GetEventChkInf(0x25) && Flags_GetEventChkInf(0x37)) + if (Flags_GetEventChkInf(0x9) && Flags_GetEventChkInf(0x25) && Flags_GetEventChkInf(0x37)) { retTextId = 0x7049; - else - { + } else { Flags_GetInfTable(0xcc); retTextId = 0x701F; } break; case 30: - if (Flags_GetEventChkInf(0x9) && Flags_GetEventChkInf(0x25) && Flags_GetEventChkInf(0x37)) + if (Flags_GetEventChkInf(0x9) && Flags_GetEventChkInf(0x25) && Flags_GetEventChkInf(0x37)) { retTextId = 0x704A; - else - { + } else { Flags_GetInfTable(0xCE); retTextId = 0x7021; } break; case 31: - if (Flags_GetEventChkInf(0x9) && Flags_GetEventChkInf(0x25) && Flags_GetEventChkInf(0x37)) + if (Flags_GetEventChkInf(0x9) && Flags_GetEventChkInf(0x25) && Flags_GetEventChkInf(0x37)) { retTextId = 0x704B; - else - { + } else { Flags_GetInfTable(0xD0); retTextId = 0x7023; } break; case 32: - if (Flags_GetEventChkInf(0x9) && Flags_GetEventChkInf(0x25) && Flags_GetEventChkInf(0x37)) + if (Flags_GetEventChkInf(0x9) && Flags_GetEventChkInf(0x25) && Flags_GetEventChkInf(0x37)) { retTextId = 0x704C; - else - { + } else { Flags_GetInfTable(0xD2); retTextId = 0x7025; } break; case 33: - if (Flags_GetEventChkInf(0x9) && Flags_GetEventChkInf(0x25) && Flags_GetEventChkInf(0x37)) + if (Flags_GetEventChkInf(0x9) && Flags_GetEventChkInf(0x25) && Flags_GetEventChkInf(0x37)) { retTextId = 0x704D; - else - { + } else { Flags_GetInfTable(0xD4); retTextId = 0x7027; } @@ -5244,213 +4693,212 @@ u32 func_80035BFC(GlobalContext* globalCtx, s16 arg1) retTextId = 0x403C; break; case 35: - if (Flags_GetInfTable(0xD8)) + if (Flags_GetInfTable(0xD8)) { retTextId = 0x5029; - else + } else { retTextId = 0x5028; + } break; case 37: retTextId = 0x5002; break; case 38: - if (LINK_IS_CHILD) - { - if (Flags_GetEventChkInf(0x25)) + if (LINK_IS_CHILD) { + if (Flags_GetEventChkInf(0x25)) { retTextId = 0x3027; - else if (Flags_GetEventChkInf(0x23)) + } else if (Flags_GetEventChkInf(0x23)) { retTextId = 0x3021; - else if (Flags_GetInfTable(0xE0)) + } else if (Flags_GetInfTable(0xE0)) { retTextId = 0x302A; - else + } else { retTextId = 0x3008; - } - else - { - if (Flags_GetEventChkInf(0x20)) + } + } else { + if (Flags_GetEventChkInf(0x20)) { retTextId = 0x4043; - else + } else { retTextId = 0x302A; + } } break; case 39: - if (LINK_IS_CHILD) - { - if (Flags_GetEventChkInf(0x25)) + if (LINK_IS_CHILD) { + if (Flags_GetEventChkInf(0x25)) { retTextId = 0x3027; - else if (Flags_GetEventChkInf(0x23)) + } else if (Flags_GetEventChkInf(0x23)) { retTextId = 0x3026; - else + } else { retTextId = 0x3009; - } - else - { - if (Flags_GetEventChkInf(0x2A)) + } + } else { + if (Flags_GetEventChkInf(0x2A)) { retTextId = 0x4043; - else + } else { retTextId = 0x302A; + } } break; case 40: - if (LINK_IS_CHILD) - { - if (Flags_GetEventChkInf(0x25)) + if (LINK_IS_CHILD) { + if (Flags_GetEventChkInf(0x25)) { retTextId = 0x3027; - else if (Flags_GetEventChkInf(0x23)) + } else if (Flags_GetEventChkInf(0x23)) { retTextId = 0x3026; - else if (Flags_GetInfTable(0xEB)) + } else if (Flags_GetInfTable(0xEB)) { retTextId = 0x302B; - else + } else { retTextId = 0x300A; - } - else - { - if (Flags_GetEventChkInf(0x2B)) + } + } else { + if (Flags_GetEventChkInf(0x2B)) { retTextId = 0x4043; - else + } else { retTextId = 0x302A; + } } break; case 41: - if (LINK_IS_CHILD) - { - if (Flags_GetEventChkInf(0x25)) + if (LINK_IS_CHILD) { + if (Flags_GetEventChkInf(0x25)) { retTextId = 0x3027; - else if (Flags_GetInfTable(0xF0)) + } else if (Flags_GetInfTable(0xF0)) { retTextId = 0x3015; - else + } else { retTextId = 0x3014; - } - else - { - if (Flags_GetEventChkInf(0x2C)) + } + } else { + if (Flags_GetEventChkInf(0x2C)) { retTextId = 0x4043; - else + } else { retTextId = 0x302A; + } } break; case 42: - if (LINK_IS_CHILD) - { - if (Flags_GetEventChkInf(0x25)) + if (LINK_IS_CHILD) { + if (Flags_GetEventChkInf(0x25)) { retTextId = 0x3027; - else if (Flags_GetInfTable(0xF4)) + } else if (Flags_GetInfTable(0xF4)) { retTextId = 0x3017; - else + } else { retTextId = 0x3016; - } - else - { - if (Flags_GetEventChkInf(0x2C)) + } + } else { + if (Flags_GetEventChkInf(0x2C)) { retTextId = 0x4043; - else + } else { retTextId = 0x302A; + } } break; case 43: - if (LINK_IS_CHILD) - { - if (Flags_GetEventChkInf(0x25)) + if (LINK_IS_CHILD) { + if (Flags_GetEventChkInf(0x25)) { retTextId = 0x3027; - else if (Flags_GetInfTable(0xF8)) + } else if (Flags_GetInfTable(0xF8)) { retTextId = 0x3019; - else + } else { retTextId = 0x3018; - } - else - { - if (Flags_GetEventChkInf(0x2D)) + } + } else { + if (Flags_GetEventChkInf(0x2D)) { retTextId = 0x4043; - else + } else { retTextId = 0x302A; + } } break; case 48: - if (Flags_GetEventChkInf(0x25)) + if (Flags_GetEventChkInf(0x25)) { retTextId = 0x3029; - else if (Flags_GetEventChkInf(0x20) && Flags_GetEventChkInf(0x21)) + } else if (Flags_GetEventChkInf(0x20) && Flags_GetEventChkInf(0x21)) { retTextId = 0x301B; - else + } else { retTextId = 0x301A; + } break; case 49: - if (Flags_GetEventChkInf(0x37)) + if (Flags_GetEventChkInf(0x37)) { retTextId = 0x402D; - else if (Flags_GetEventChkInf(0x30)) + } else if (Flags_GetEventChkInf(0x30)) { retTextId = 0x4007; - else + } else { retTextId = 0x4006; + } break; case 50: - if (Flags_GetEventChkInf(0x37)) + if (Flags_GetEventChkInf(0x37)) { retTextId = 0x402E; - else if (Flags_GetEventChkInf(0x30)) - { - if (Flags_GetInfTable(0x124)) + } else if (Flags_GetEventChkInf(0x30)) { + if (Flags_GetInfTable(0x124)) { retTextId = 0x4009; - else + } else { retTextId = 0x4008; - } - else + } + } else { retTextId = 0x4006; + } break; case 51: - if (Flags_GetEventChkInf(0x37)) + if (Flags_GetEventChkInf(0x37)) { retTextId = 0x402D; - else if (Flags_GetEventChkInf(0x31)) - { - if (Flags_GetInfTable(0x12A)) + } else if (Flags_GetEventChkInf(0x31)) { + if (Flags_GetInfTable(0x12A)) { retTextId = 0x400B; - else + } else { retTextId = 0x402F; - } - else if (Flags_GetEventChkInf(0x30)) + } + } else if (Flags_GetEventChkInf(0x30)) { retTextId = 0x400A; - else + } else { retTextId = 0x4006; + } break; case 52: - if (Flags_GetEventChkInf(0x37)) + if (Flags_GetEventChkInf(0x37)) { retTextId = 0x402E; - else if (Flags_GetEventChkInf(0x30)) + } else if (Flags_GetEventChkInf(0x30)) { retTextId = 0x400C; - else + } else { retTextId = 0x4006; + } break; case 53: - if (Flags_GetEventChkInf(0x37)) + if (Flags_GetEventChkInf(0x37)) { retTextId = 0x402D; - else if (Flags_GetEventChkInf(0x33)) + } else if (Flags_GetEventChkInf(0x33)) { retTextId = 0x4010; - else if (Flags_GetEventChkInf(0x30)) + } else if (Flags_GetEventChkInf(0x30)) { retTextId = 0x400F; - else + } else { retTextId = 0x4006; + } break; case 54: - if (Flags_GetEventChkInf(0x37)) + if (Flags_GetEventChkInf(0x37)) { retTextId = 0x402E; - else if (Flags_GetEventChkInf(0x30)) + } else if (Flags_GetEventChkInf(0x30)) { retTextId = 0x4011; - else + } else { retTextId = 0x4006; + } break; case 55: - if (LINK_IS_CHILD) - { - if (Flags_GetEventChkInf(0x37)) + if (LINK_IS_CHILD) { + if (Flags_GetEventChkInf(0x37)) { retTextId = 0x402B; - else if (Flags_GetEventChkInf(0x31)) - { - if (Flags_GetInfTable(0x138)) + } else if (Flags_GetEventChkInf(0x31)) { + if (Flags_GetInfTable(0x138)) { retTextId = 0x401C; - else + } else { retTextId = 0x401B; - } - else + } + } else { retTextId = 0x401A; - } - else + } + } else { retTextId = 0; + } break; case 58: retTextId = 0x500F; @@ -5462,79 +4910,77 @@ u32 func_80035BFC(GlobalContext* globalCtx, s16 arg1) retTextId = 0x5012; break; case 61: - if (Flags_GetInfTable(0x166)) + if (Flags_GetInfTable(0x166)) { retTextId = 0x5001; - else + } else { retTextId = 0x5000; + } break; case 62: retTextId = 0x5012; break; case 63: - if (Flags_GetInfTable(0x16A)) + if (Flags_GetInfTable(0x16A)) { retTextId = 0x5001; - else + } else { retTextId = 0x5000; + } break; case 71: - if (Flags_GetEventChkInf(0x16)) + if (Flags_GetEventChkInf(0x16)) { retTextId = 0x2049; - else if (Flags_GetEventChkInf(0x15)) + } else if (Flags_GetEventChkInf(0x15)) { retTextId = 0x2048; - else if (Flags_GetEventChkInf(0x14)) + } else if (Flags_GetEventChkInf(0x14)) { retTextId = 0x2047; - else if (Flags_GetEventChkInf(0x12) && !Flags_GetEventChkInf(0x14)) + } else if (Flags_GetEventChkInf(0x12) && !Flags_GetEventChkInf(0x14)) { retTextId = 0x2044; - else if (Flags_GetEventChkInf(0x10)) - { - if (Flags_GetEventChkInf(0x11)) + } else if (Flags_GetEventChkInf(0x10)) { + if (Flags_GetEventChkInf(0x11)) { retTextId = 0x2043; - else + } else { retTextId = 0x2042; - } - else + } + } else { retTextId = 0x2041; + } break; case 72: - if (LINK_IS_CHILD) - { - if (Flags_GetEventChkInf(0x14)) + if (LINK_IS_CHILD) { + if (Flags_GetEventChkInf(0x14)) { retTextId = 0x2040; - else if (Flags_GetInfTable(0x94)) + } else if (Flags_GetInfTable(0x94)) { retTextId = 0x2040; - else + } else { retTextId = 0x203F; - } - else - { - if (!Flags_GetEventChkInf(0x18)) - { - if (gSaveContext.night_flag) - retTextId = 0x204E; - else if (Flags_GetInfTable(0x9A)) - retTextId = 0x2031; - else - retTextId = 0x2030; } - else + } else { + if (!Flags_GetEventChkInf(0x18)) { + if (gSaveContext.night_flag) { + retTextId = 0x204E; + } else if (Flags_GetInfTable(0x9A)) { + retTextId = 0x2031; + } else { + retTextId = 0x2030; + } + } else { retTextId = 0; + } } break; } - if (retTextId == 0) + if (retTextId == 0) { retTextId = 1; + } return retTextId; } -void func_80036E50(u16 textId, s16 arg1) -{ - switch (arg1) - { +void func_80036E50(u16 textId, s16 arg1) { + switch (arg1) { case 0: - switch (textId) - { + switch (textId) { case 0x1001: Flags_SetInfTable(0x0); return; @@ -5551,14 +4997,14 @@ void func_80036E50(u16 textId, s16 arg1) } return; case 1: - switch (textId) - { + switch (textId) { case 0x102F: Flags_SetEventChkInf(0x2); Flags_SetInfTable(0xC); return; case 0x1033: - Audio_PlaySoundGeneral(NA_SE_SY_CORRECT_CHIME, &D_801333D4, 4, &D_801333E0, &D_801333E0, &D_801333E8); + Audio_PlaySoundGeneral(NA_SE_SY_CORRECT_CHIME, &D_801333D4, 4, &D_801333E0, &D_801333E0, + &D_801333E8); Flags_SetEventChkInf(0x4); Flags_SetInfTable(0xE); return; @@ -5578,132 +5024,160 @@ void func_80036E50(u16 textId, s16 arg1) } return; case 2: - if (textId == 0x1056) + if (textId == 0x1056) { Flags_SetInfTable(0x41); + } return; case 3: - if (textId == 0x1005) + if (textId == 0x1005) { Flags_SetInfTable(0x1E); + } return; case 4: - if (textId == 0x105D) + if (textId == 0x105D) { Flags_SetInfTable(0x47); + } return; case 5: - if (textId == 0x1008) + if (textId == 0x1008) { Flags_SetInfTable(0x22); + } return; case 6: - if (textId == 0x100A) + if (textId == 0x100A) { Flags_SetInfTable(0x24); + } return; case 7: - if (textId == 0x100C) + if (textId == 0x100C) { Flags_SetInfTable(0x26); + } return; case 8: - if (textId == 0x100E) + if (textId == 0x100E) { Flags_SetInfTable(0x28); - if (textId == 0x1059) + } + if (textId == 0x1059) { Flags_SetInfTable(0x51); + } return; case 10: - if (textId == 0x104F) + if (textId == 0x104F) { Flags_SetInfTable(0x59); + } return; case 13: - if (textId == 0x1054) + if (textId == 0x1054) { Flags_SetInfTable(0x61); + } return; case 15: - if (textId == 0x1062) + if (textId == 0x1062) { Flags_SetInfTable(0x66); + } return; case 16: - if (textId == 0x7002) + if (textId == 0x7002) { Flags_SetInfTable(0x6A); - if (textId == 0x7003) + } + if (textId == 0x7003) { Flags_SetInfTable(0x6A); + } return; case 17: - if (textId == 0x7007) + if (textId == 0x7007) { Flags_SetInfTable(0x6C); + } return; case 18: - if (textId == 0x7071) + if (textId == 0x7071) { Flags_SetInfTable(0x71); + } return; case 20: case 21: - if (textId == 0x2010) + if (textId == 0x2010) { Flags_SetInfTable(0x76); + } return; case 25: - if (textId == 0x7016) + if (textId == 0x7016) { Flags_SetInfTable(0xC2); + } return; case 26: - if (textId == 0x7018) + if (textId == 0x7018) { Flags_SetInfTable(0xC4); + } return; case 28: - if (textId == 0x701D) + if (textId == 0x701D) { Flags_SetInfTable(0xCA); + } return; case 29: - if (textId == 0x701F) + if (textId == 0x701F) { Flags_SetInfTable(0xCC); + } return; case 30: - if (textId == 0x7021) + if (textId == 0x7021) { Flags_SetInfTable(0xCE); + } return; case 31: - if (textId == 0x7023) + if (textId == 0x7023) { Flags_SetInfTable(0xD0); + } return; case 32: - if (textId == 0x7025) + if (textId == 0x7025) { Flags_SetInfTable(0xD2); + } return; case 33: - if (textId == 0x7027) + if (textId == 0x7027) { Flags_SetInfTable(0xD4); + } return; case 34: - if (textId == 0x403c) + if (textId == 0x403c) { Flags_SetInfTable(0xD6); + } return; case 35: - if (textId == 0x5028) + if (textId == 0x5028) { Flags_SetInfTable(0xD8); + } return; case 38: - if (textId == 0x3008) + if (textId == 0x3008) { Flags_SetInfTable(0xE0); + } return; case 40: - if (textId == 0x300B) + if (textId == 0x300B) { Flags_SetInfTable(0xEB); + } return; case 41: - if (textId == 0x3014) + if (textId == 0x3014) { Flags_SetInfTable(0xF0); + } return; case 42: - if (textId == 0x3016) + if (textId == 0x3016) { Flags_SetInfTable(0xF4); + } return; case 43: - if (textId == 0x3018) - { + if (textId == 0x3018) { Flags_SetEventChkInf(0x20); Flags_SetInfTable(0xF8); } return; case 48: - if (textId == 0x3020) - { + if (textId == 0x3020) { Flags_SetEventChkInf(0x22); Flags_SetInfTable(0x113); } @@ -5712,136 +5186,140 @@ void func_80036E50(u16 textId, s16 arg1) case 52: case 53: case 54: - if (textId == 0x4006) + if (textId == 0x4006) { Flags_SetEventChkInf(0x30); + } return; case 50: - if (textId == 0x4006) + if (textId == 0x4006) { Flags_SetEventChkInf(0x30); - if (textId == 0x4008) + } + if (textId == 0x4008) { Flags_SetInfTable(0x124); + } return; case 51: - if (textId == 0x4006) + if (textId == 0x4006) { Flags_SetEventChkInf(0x30); - if (textId == 0x400A) + } + if (textId == 0x400A) { Flags_SetEventChkInf(0x32); - if (textId == 0x402F) + } + if (textId == 0x402F) { Flags_SetInfTable(0x12A); + } return; case 55: - if (textId == 0x401B) - { + if (textId == 0x401B) { Flags_SetEventChkInf(0x33); Flags_SetInfTable(0x138); } return; case 61: - if (textId == 0x5000) + if (textId == 0x5000) { Flags_SetInfTable(0x166); + } return; case 63: - if (textId == 0x5013) + if (textId == 0x5013) { Flags_SetInfTable(0x16A); + } return; case 71: - if (textId == 0x2041) + if (textId == 0x2041) { Flags_SetEventChkInf(0x10); - if (textId == 0x2044) + } + if (textId == 0x2044) { Flags_SetEventChkInf(0x12); - if (textId == 0x2047) + } + if (textId == 0x2047) { Flags_SetEventChkInf(0x15); - if (textId == 0x2048) + } + if (textId == 0x2048) { Flags_SetEventChkInf(0x16); + } return; case 72: return; } } -s32 func_800374E0(GlobalContext* globalCtx, Actor* actor, u16 textId) -{ +s32 func_800374E0(GlobalContext* globalCtx, Actor* actor, u16 textId) { MessageContext* msgCtx = &globalCtx->msgCtx; s32 ret = 1; - switch (textId) - { + switch (textId) { case 0x1035: - if (msgCtx->choiceIndex == 0) - { - if (Flags_GetInfTable(0x2A)) + if (msgCtx->choiceIndex == 0) { + if (Flags_GetInfTable(0x2A)) { func_80035B18(globalCtx, actor, 0x1036); - else + } else { func_80035B18(globalCtx, actor, 0x1041); + } } - if (msgCtx->choiceIndex == 1) - { - if (Flags_GetInfTable(0x2B)) + if (msgCtx->choiceIndex == 1) { + if (Flags_GetInfTable(0x2B)) { func_80035B18(globalCtx, actor, 0x1037); - else + } else { func_80035B18(globalCtx, actor, 0x1041); + } } ret = 0; break; case 0x1038: - if (msgCtx->choiceIndex == 0) - { - if (Flags_GetInfTable(0x2E)) + if (msgCtx->choiceIndex == 0) { + if (Flags_GetInfTable(0x2E)) { func_80035B18(globalCtx, actor, 0x1039); - else + } else { func_80035B18(globalCtx, actor, 0x1041); + } } - if (msgCtx->choiceIndex == 1) - { - if (Flags_GetInfTable(0x2F)) + if (msgCtx->choiceIndex == 1) { + if (Flags_GetInfTable(0x2F)) { func_80035B18(globalCtx, actor, 0x103A); - else + } else { func_80035B18(globalCtx, actor, 0x1041); + } } - if (msgCtx->choiceIndex == 2) - { - if (Flags_GetInfTable(0x30)) + if (msgCtx->choiceIndex == 2) { + if (Flags_GetInfTable(0x30)) { func_80035B18(globalCtx, actor, 0x103B); - else + } else { func_80035B18(globalCtx, actor, 0x1041); + } } ret = 0; break; case 0x103E: - if (msgCtx->choiceIndex == 0) + if (msgCtx->choiceIndex == 0) { func_80035B18(globalCtx, actor, 0x103F); - if (msgCtx->choiceIndex == 1) + } + if (msgCtx->choiceIndex == 1) { func_80035B18(globalCtx, actor, 0x1040); + } ret = 0; break; case 0x1041: - if (msgCtx->unk_E2FA == 0x1035) - { - if (msgCtx->choiceIndex == 0) - { + if (msgCtx->unk_E2FA == 0x1035) { + if (msgCtx->choiceIndex == 0) { func_80035B18(globalCtx, actor, 0x1036); Flags_SetInfTable(0x2A); } - if (msgCtx->choiceIndex == 1) - { + if (msgCtx->choiceIndex == 1) { func_80035B18(globalCtx, actor, 0x1037); Flags_SetInfTable(0x2B); } } - if (msgCtx->unk_E2FA == 0x1038) - { - if (msgCtx->choiceIndex == 0) - { + if (msgCtx->unk_E2FA == 0x1038) { + if (msgCtx->choiceIndex == 0) { func_80035B18(globalCtx, actor, 0x1039); Flags_SetInfTable(0x2E); } - if (msgCtx->choiceIndex == 1) - { + if (msgCtx->choiceIndex == 1) { func_80035B18(globalCtx, actor, 0x103A); Flags_SetInfTable(0x2F); } - if (msgCtx->choiceIndex == 2) - { + if (msgCtx->choiceIndex == 2) { func_80035B18(globalCtx, actor, 0x103B); Flags_SetInfTable(0x30); } @@ -5849,81 +5327,88 @@ s32 func_800374E0(GlobalContext* globalCtx, Actor* actor, u16 textId) ret = 0; break; case 0x1062: - if (msgCtx->choiceIndex == 0) + if (msgCtx->choiceIndex == 0) { func_80035B18(globalCtx, actor, 0x1063); - if (msgCtx->choiceIndex == 1) + } + if (msgCtx->choiceIndex == 1) { func_80035B18(globalCtx, actor, 0x1064); + } ret = 0; break; case 0x2030: case 0x2031: - if (msgCtx->choiceIndex == 0) - { - if (gSaveContext.rupees >= 10) - { + if (msgCtx->choiceIndex == 0) { + if (gSaveContext.rupees >= 10) { func_80035B18(globalCtx, actor, 0x2034); Rupees_ChangeBy(-10); - } - else + } else { func_80035B18(globalCtx, actor, 0x2032); + } } - if (msgCtx->choiceIndex == 1) + if (msgCtx->choiceIndex == 1) { func_80035B18(globalCtx, actor, 0x2032); + } Flags_SetInfTable(0x9A); ret = 0; break; case 0x2036: case 0x2037: - if (msgCtx->choiceIndex == 0) + if (msgCtx->choiceIndex == 0) { func_80035B18(globalCtx, actor, 0x201F); - if (msgCtx->choiceIndex == 1) + } + if (msgCtx->choiceIndex == 1) { func_80035B18(globalCtx, actor, 0x205A); + } ret = 0; break; case 0x2038: - if (msgCtx->choiceIndex == 0) + if (msgCtx->choiceIndex == 0) { break; - if (msgCtx->choiceIndex == 1) + } + if (msgCtx->choiceIndex == 1) { func_80035B18(globalCtx, actor, 0x205A); + } ret = 0; break; case 0x2034: - if (msgCtx->choiceIndex != 0) + if (msgCtx->choiceIndex != 0) { break; + } func_80035B18(globalCtx, actor, 0x2035); ret = 0; break; case 0x2043: - if (Flags_GetEventChkInf(0x12)) + if (Flags_GetEventChkInf(0x12)) { break; + } func_80035B18(globalCtx, actor, 0x2044); ret = 0; break; case 0x205A: break; case 0x300A: - if (msgCtx->choiceIndex == 0) - { - if (Flags_GetEventChkInf(0x22)) + if (msgCtx->choiceIndex == 0) { + if (Flags_GetEventChkInf(0x22)) { func_80035B18(globalCtx, actor, 0x300B); - else + } else { func_80035B18(globalCtx, actor, 0x300C); + } } - if (msgCtx->choiceIndex == 1) + if (msgCtx->choiceIndex == 1) { func_80035B18(globalCtx, actor, 0x300D); + } ret = 0; break; case 0x301B: - if (msgCtx->choiceIndex == 0) - { + if (msgCtx->choiceIndex == 0) { func_80035B18(globalCtx, actor, 0x301D); } - if (msgCtx->choiceIndex == 1) - { - if (Flags_GetInfTable(0x113)) + if (msgCtx->choiceIndex == 1) { + if (Flags_GetInfTable(0x113)) { func_80035B18(globalCtx, actor, 0x301F); - else + } else { func_80035B18(globalCtx, actor, 0x301E); + } } ret = 0; break; @@ -5932,10 +5417,12 @@ s32 func_800374E0(GlobalContext* globalCtx, Actor* actor, u16 textId) ret = 0; break; case 0x400C: - if (msgCtx->choiceIndex == 0) + if (msgCtx->choiceIndex == 0) { func_80035B18(globalCtx, actor, 0x400D); - if (msgCtx->choiceIndex == 1) + } + if (msgCtx->choiceIndex == 1) { func_80035B18(globalCtx, actor, 0x400E); + } ret = 0; break; case 0x7007: @@ -5955,37 +5442,31 @@ s32 func_800374E0(GlobalContext* globalCtx, Actor* actor, u16 textId) return ret; } -u16 func_80037C30(GlobalContext* globalCtx, s16 arg1) -{ +u16 func_80037C30(GlobalContext* globalCtx, s16 arg1) { return func_80035BFC(globalCtx, arg1); } -s32 func_80037C5C(GlobalContext* globalCtx, s16 arg1, u16 textId) -{ +s32 func_80037C5C(GlobalContext* globalCtx, s16 arg1, u16 textId) { func_80036E50(textId, arg1); return 0; } -s32 func_80037C94(GlobalContext* globalCtx, Actor* actor, s32 arg2) -{ +s32 func_80037C94(GlobalContext* globalCtx, Actor* actor, s32 arg2) { return func_800374E0(globalCtx, actor, actor->textId); } -s32 func_80037CB8(GlobalContext* globalCtx, Actor* actor, s16 arg2) -{ +s32 func_80037CB8(GlobalContext* globalCtx, Actor* actor, s16 arg2) { MessageContext* msgCtx = &globalCtx->msgCtx; s32 ret = 0; - switch (func_8010BDBC(msgCtx)) - { + switch (func_8010BDBC(msgCtx)) { case 2: func_80037C5C(globalCtx, arg2, actor->textId); ret = 1; break; case 4: case 5: - if (func_80106BC8(globalCtx) && func_80037C94(globalCtx, actor, arg2)) - { + if (func_80106BC8(globalCtx) && func_80037C94(globalCtx, actor, arg2)) { Audio_PlaySoundGeneral(NA_SE_SY_CANCEL, &D_801333D4, 4, &D_801333E0, &D_801333E0, &D_801333E8); msgCtx->msgMode = 0x36; ret = 1; @@ -5996,58 +5477,57 @@ s32 func_80037CB8(GlobalContext* globalCtx, Actor* actor, s16 arg2) return ret; } -s32 func_80037D98(GlobalContext* globalCtx, Actor* actor, s16 arg2, s32* arg3) -{ +s32 func_80037D98(GlobalContext* globalCtx, Actor* actor, s16 arg2, s32* arg3) { s16 var; s16 sp2C; s16 sp2A; s16 abs_var; - if (func_8002F194(actor, globalCtx)) - { + if (func_8002F194(actor, globalCtx)) { *arg3 = 1; return 1; } - if (*arg3 == 1) - { - if (func_80037CB8(globalCtx, actor, arg2)) + if (*arg3 == 1) { + if (func_80037CB8(globalCtx, actor, arg2)) { *arg3 = 0; + } return 0; } func_8002F374(globalCtx, actor, &sp2C, &sp2A); - if (0) ; // Necessary to match + if (0) {} // Necessary to match - if ((sp2C < 0) || (sp2C > 320) || (sp2A < 0) || (sp2A > 240)) + if ((sp2C < 0) || (sp2C > 320) || (sp2A < 0) || (sp2A > 240)) { return 0; + } var = actor->rotTowardsLinkY - actor->shape.rot.y; abs_var = ABS(var); - if (abs_var >= 0x4300) + if (abs_var >= 0x4300) { return 0; - - if ((actor->waterSurfaceDist > 25600.0f) && (actor->unk_10C == 0)) - return 0; - - if (actor->waterSurfaceDist <= 6400.0f) - { - if (func_8002F2CC(actor, globalCtx, 80.0f)) - actor->textId = func_80037C30(globalCtx, arg2); } - else - { - if (func_8002F2F4(actor, globalCtx)) + + if ((actor->waterSurfaceDist > 25600.0f) && (actor->unk_10C == 0)) { + return 0; + } + + if (actor->waterSurfaceDist <= 6400.0f) { + if (func_8002F2CC(actor, globalCtx, 80.0f)) { actor->textId = func_80037C30(globalCtx, arg2); + } + } else { + if (func_8002F2F4(actor, globalCtx)) { + actor->textId = func_80037C30(globalCtx, arg2); + } } return 0; } -s32 func_80037F30(Vec3s* arg0, Vec3s* arg1) -{ +s32 func_80037F30(Vec3s* arg0, Vec3s* arg1) { Math_SmoothScaleMaxMinS(&arg0->y, 0, 6, 6200, 100); Math_SmoothScaleMaxMinS(&arg0->x, 0, 6, 6200, 100); Math_SmoothScaleMaxMinS(&arg1->y, 0, 6, 6200, 100); @@ -6055,8 +5535,7 @@ s32 func_80037F30(Vec3s* arg0, Vec3s* arg1) return 1; } -s32 func_80037FC8(Actor* actor, Vec3f* arg1, Vec3s* arg2, Vec3s* arg3) -{ +s32 func_80037FC8(Actor* actor, Vec3f* arg1, Vec3s* arg2, Vec3s* arg3) { s16 sp36; s16 sp34; s16 var; @@ -6070,8 +5549,9 @@ s32 func_80037FC8(Actor* actor, Vec3f* arg1, Vec3s* arg2, Vec3s* arg3) var = Math_SmoothScaleMaxMinS(&arg2->y, sp34, 6, 2000, 1); arg2->y = (arg2->y < -8000) ? -8000 : ((arg2->y > 8000) ? 8000 : arg2->y); - if (var && (ABS(arg2->y) < 8000)) + if (var && (ABS(arg2->y) < 8000)) { return 0; + } Math_SmoothScaleMaxMinS(&arg3->y, sp34 - arg2->y, 4, 2000, 1); arg3->y = (arg3->y < -12000) ? -12000 : ((arg3->y > 12000) ? 12000 : arg3->y); @@ -6079,8 +5559,7 @@ s32 func_80037FC8(Actor* actor, Vec3f* arg1, Vec3s* arg2, Vec3s* arg3) return 1; } -s32 func_80038154(GlobalContext* globalCtx, Actor* actor, Vec3s* arg2, Vec3s* arg3, f32 arg4) -{ +s32 func_80038154(GlobalContext* globalCtx, Actor* actor, Vec3s* arg2, Vec3s* arg3, f32 arg4) { Player* player = PLAYER; s32 pad; Vec3f sp2C; @@ -6090,29 +5569,27 @@ s32 func_80038154(GlobalContext* globalCtx, Actor* actor, Vec3s* arg2, Vec3s* ar actor->posRot2.pos = actor->posRot.pos; actor->posRot2.pos.y += arg4; - if (!(((globalCtx->csCtx.state != 0) || (D_8011D394 != 0)) && (gSaveContext.entrance_index == 0x00EE))) - { + if (!(((globalCtx->csCtx.state != 0) || (D_8011D394 != 0)) && (gSaveContext.entrance_index == 0x00EE))) { var = actor->rotTowardsLinkY - actor->shape.rot.y; abs_var = ABS(var); - if (abs_var >= 0x4300) - { + if (abs_var >= 0x4300) { func_80037F30(arg2, arg3); return 0; } } - if (((globalCtx->csCtx.state != 0) || (D_8011D394 != 0)) && (gSaveContext.entrance_index == 0x00EE)) + if (((globalCtx->csCtx.state != 0) || (D_8011D394 != 0)) && (gSaveContext.entrance_index == 0x00EE)) { sp2C = globalCtx->view.eye; - else + } else { sp2C = player->actor.posRot2.pos; + } func_80037FC8(actor, &sp2C, arg2, arg3); return 1; } -s32 func_80038290(GlobalContext* globalCtx, Actor* actor, Vec3s* arg2, Vec3s* arg3, Vec3f arg4) -{ +s32 func_80038290(GlobalContext* globalCtx, Actor* actor, Vec3s* arg2, Vec3s* arg3, Vec3f arg4) { Player* player = PLAYER; s32 pad; Vec3f sp24; @@ -6121,21 +5598,20 @@ s32 func_80038290(GlobalContext* globalCtx, Actor* actor, Vec3s* arg2, Vec3s* ar actor->posRot2.pos = arg4; - if (!(((globalCtx->csCtx.state != 0) || (D_8011D394 != 0)) && (gSaveContext.entrance_index == 0x00EE))) - { + if (!(((globalCtx->csCtx.state != 0) || (D_8011D394 != 0)) && (gSaveContext.entrance_index == 0x00EE))) { var = actor->rotTowardsLinkY - actor->shape.rot.y; abs_var = ABS(var); - if (abs_var >= 0x4300) - { + if (abs_var >= 0x4300) { func_80037F30(arg2, arg3); return 0; } } - if (((globalCtx->csCtx.state != 0) || (D_8011D394 != 0)) && (gSaveContext.entrance_index == 0x00EE)) + if (((globalCtx->csCtx.state != 0) || (D_8011D394 != 0)) && (gSaveContext.entrance_index == 0x00EE)) { sp24 = globalCtx->view.eye; - else + } else { sp24 = player->actor.posRot2.pos; + } func_80037FC8(actor, &sp24, arg2, arg3); diff --git a/src/code/z_actor_dlftbls.c b/src/code/z_actor_dlftbls.c index 2a15f876dd..29a18cf994 100644 --- a/src/code/z_actor_dlftbls.c +++ b/src/code/z_actor_dlftbls.c @@ -2,24 +2,19 @@ #include #include -#define ACTOR_OVERLAY(name, allocType) \ - { \ - (u32)_ovl_##name##SegmentRomStart, (u32)_ovl_##name##SegmentRomEnd, \ - _ovl_##name##SegmentStart, _ovl_##name##SegmentEnd, \ - NULL, &name##_InitVars, #name, allocType, 0 \ +#define ACTOR_OVERLAY(name, allocType) \ + { \ + (u32) _ovl_##name##SegmentRomStart, (u32)_ovl_##name##SegmentRomEnd, _ovl_##name##SegmentStart, \ + _ovl_##name##SegmentEnd, NULL, &name##_InitVars, #name, allocType, 0 \ } -#define ACTOR_OVERLAY_INTERNAL(name, allocType) \ - { \ - 0, 0, \ - NULL, NULL, \ - NULL, &name##_InitVars, #name, allocType, 0 \ - } +#define ACTOR_OVERLAY_INTERNAL(name, allocType) \ + { 0, 0, NULL, NULL, NULL, &name##_InitVars, #name, allocType, 0 } -#define ACTOR_OVERLAY_UNSET { 0 } +#define ACTOR_OVERLAY_UNSET \ + { 0 } -ActorOverlay gActorOverlayTable[] = -{ +ActorOverlay gActorOverlayTable[] = { ACTOR_OVERLAY_INTERNAL(Player, ALLOCTYPE_NORMAL), ACTOR_OVERLAY_UNSET, ACTOR_OVERLAY(En_Test, ALLOCTYPE_NORMAL), @@ -497,26 +492,21 @@ s32 gMaxProfile = 0; static FaultClient sFaultClient; -void ActorOverlayTable_LogPrint(void) -{ +void ActorOverlayTable_LogPrint(void) { ActorOverlay* overlayEntry; u32 i; osSyncPrintf("actor_dlftbls %u\n", gMaxProfile); osSyncPrintf("RomStart RomEnd SegStart SegEnd allocp profile segname\n"); - for (i = 0, overlayEntry = &gActorOverlayTable[0]; i < gMaxProfile; i++, overlayEntry++) - { - osSyncPrintf("%08x %08x %08x %08x %08x %08x %s\n", - overlayEntry->vromStart, overlayEntry->vromEnd, - overlayEntry->vramStart, overlayEntry->vramEnd, - overlayEntry->loadedRamAddr, &overlayEntry->initInfo->id, - overlayEntry->name != NULL ? overlayEntry->name : "?"); + for (i = 0, overlayEntry = &gActorOverlayTable[0]; i < gMaxProfile; i++, overlayEntry++) { + osSyncPrintf("%08x %08x %08x %08x %08x %08x %s\n", overlayEntry->vromStart, overlayEntry->vromEnd, + overlayEntry->vramStart, overlayEntry->vramEnd, overlayEntry->loadedRamAddr, + &overlayEntry->initInfo->id, overlayEntry->name != NULL ? overlayEntry->name : "?"); } } -void ActorOverlayTable_FaultPrint(void* arg0, void* arg1) -{ +void ActorOverlayTable_FaultPrint(void* arg0, void* arg1) { ActorOverlay* overlayEntry; u32 overlaySize; s32 i; @@ -526,26 +516,22 @@ void ActorOverlayTable_FaultPrint(void* arg0, void* arg1) FaultDrawer_Printf("actor_dlftbls %u\n", gMaxProfile); FaultDrawer_Printf("No. RamStart- RamEnd cn Name\n"); - for (i = 0, overlayEntry = &gActorOverlayTable[0]; i < gMaxProfile; i++, overlayEntry++) - { + for (i = 0, overlayEntry = &gActorOverlayTable[0]; i < gMaxProfile; i++, overlayEntry++) { overlaySize = (u32)overlayEntry->vramEnd - (u32)overlayEntry->vramStart; - if (overlayEntry->loadedRamAddr != NULL) - { - FaultDrawer_Printf("%3d %08x-%08x %3d %s\n", - i, overlayEntry->loadedRamAddr, (u32)overlayEntry->loadedRamAddr + overlaySize, - overlayEntry->nbLoaded, overlayEntry->name != NULL ? overlayEntry->name : ""); + if (overlayEntry->loadedRamAddr != NULL) { + FaultDrawer_Printf("%3d %08x-%08x %3d %s\n", i, overlayEntry->loadedRamAddr, + (u32)overlayEntry->loadedRamAddr + overlaySize, overlayEntry->nbLoaded, + overlayEntry->name != NULL ? overlayEntry->name : ""); } } } -void ActorOverlayTable_Init(void) -{ +void ActorOverlayTable_Init(void) { gMaxProfile = ACTOR_DLF_MAX; Fault_AddClient(&sFaultClient, ActorOverlayTable_FaultPrint, NULL, NULL); } -void ActorOverlayTable_Cleanup(void) -{ +void ActorOverlayTable_Cleanup(void) { Fault_RemoveClient(&sFaultClient); gMaxProfile = 0; } diff --git a/src/code/z_bgcheck.c b/src/code/z_bgcheck.c index d36b154c8a..12c66c975c 100644 --- a/src/code/z_bgcheck.c +++ b/src/code/z_bgcheck.c @@ -3,47 +3,41 @@ #pragma GLOBAL_ASM("asm/non_matchings/code/z_bgcheck/func_80038600.s") -void func_80038708(s16* puParm1, s16* puParm2, u16 uParm3) -{ - *puParm1 = *puParm2; - puParm1[1] = uParm3; +void func_80038708(s16* puParm1, s16* puParm2, u16 uParm3) { + *puParm1 = *puParm2; + puParm1[1] = uParm3; } -void func_8003871C(u16* puParm1) -{ - *puParm1 = 0xFFFF; +void func_8003871C(u16* puParm1) { + *puParm1 = 0xFFFF; } #pragma GLOBAL_ASM("asm/non_matchings/code/z_bgcheck/func_80038728.s") #pragma GLOBAL_ASM("asm/non_matchings/code/z_bgcheck/func_80038780.s") -void func_800387FC(u32 uParm1, u32* puParm2) -{ - *puParm2 = 0; - puParm2[1] = 0; +void func_800387FC(u32 uParm1, u32* puParm2) { + *puParm2 = 0; + puParm2[1] = 0; } #pragma GLOBAL_ASM("asm/non_matchings/code/z_bgcheck/func_8003880C.s") -void func_80038870(int iParm1) -{ - *(u32*)(iParm1 + 4) = 0; +void func_80038870(int iParm1) { + *(u32*)(iParm1 + 4) = 0; } -u32 func_80038878(s32 iParm1) -{ - u32 uVar1; - - uVar1 = *(u32*)(iParm1 + 4) & 0xffff; - *(int *)(iParm1 + 4) = *(u32*)(iParm1 + 4) + 1; - - if (*(int *)(iParm1 + 8) <= (int)uVar1) - { - return 0xffff; - } +u32 func_80038878(s32 iParm1) { + u32 uVar1; - return uVar1; + uVar1 = *(u32*)(iParm1 + 4) & 0xffff; + *(int*)(iParm1 + 4) = *(u32*)(iParm1 + 4) + 1; + + if (*(int*)(iParm1 + 8) <= (int)uVar1) { + return 0xffff; + } + + return uVar1; } #pragma GLOBAL_ASM("asm/non_matchings/code/z_bgcheck/func_800388A8.s") @@ -56,7 +50,6 @@ u32 func_80038878(s32 iParm1) #pragma GLOBAL_ASM("asm/non_matchings/code/z_bgcheck/func_80038A28.s") - #pragma GLOBAL_ASM("asm/non_matchings/code/z_bgcheck/func_80038B7C.s") #pragma GLOBAL_ASM("asm/non_matchings/code/z_bgcheck/func_80038BE0.s") @@ -175,12 +168,11 @@ u32 func_80038878(s32 iParm1) #pragma GLOBAL_ASM("asm/non_matchings/code/z_bgcheck/func_8003E214.s") -void func_8003E398(u16* puParm1) -{ - *puParm1 = 0; - puParm1[1] = 0; - *(u32*)(puParm1 + 2) = 0; - *(u32*)(puParm1 + 4) = 0; +void func_8003E398(u16* puParm1) { + *puParm1 = 0; + puParm1[1] = 0; + *(u32*)(puParm1 + 2) = 0; + *(u32*)(puParm1 + 4) = 0; } #pragma GLOBAL_ASM("asm/non_matchings/code/z_bgcheck/func_8003E3AC.s") @@ -195,15 +187,12 @@ void func_8003E398(u16* puParm1) #pragma GLOBAL_ASM("asm/non_matchings/code/z_bgcheck/func_8003E688.s") -void func_8003E6C4(u16* puParm1) -{ - *puParm1 = 0; - func_8003E688(); +void func_8003E6C4(u16* puParm1) { + *puParm1 = 0; + func_8003E688(); } - -void func_8003E6E4(u16* a0) -{ +void func_8003E6E4(u16* a0) { *a0 = 0; } @@ -211,21 +200,17 @@ void func_8003E6E4(u16* a0) #pragma GLOBAL_ASM("asm/non_matchings/code/z_bgcheck/func_8003E750.s") -void func_8003E804(int iParm1) -{ - func_8003E5B4(iParm1 + 0x14, iParm1 + 0x34); +void func_8003E804(int iParm1) { + func_8003E5B4(iParm1 + 0x14, iParm1 + 0x34); } - -void func_8003E82C(u32* a0) -{ +void func_8003E82C(u32* a0) { *a0 = 0; } #pragma GLOBAL_ASM("asm/non_matchings/code/z_bgcheck/func_8003E834.s") -void func_8003E888(u32* a0) -{ +void func_8003E888(u32* a0) { *a0 = 0; } @@ -235,8 +220,7 @@ void func_8003E888(u32* a0) /* NON-MATCHING -void func_8003E8EC(u32 uParm1, u32* iParm2) -{ +void func_8003E8EC(u32 uParm1, u32* iParm2) { iParm2[0x06] = iParm2[0x0E]; iParm2[0x05] = iParm2[0x0D]; iParm2[0x07] = iParm2[0x0F]; @@ -246,30 +230,28 @@ void func_8003E8EC(u32 uParm1, u32* iParm2) iParm2[0x0B] = iParm2[0x13]; iParm2[0x0C] = iParm2[0x14]; - + //int i; - //for (i = 0; i < 4; i++) - //{ + //for (i = 0; i < 4; i++) { //iParm2[0x06 + (i * 2)] = iParm2[0x0E + (i * 2)]; //iParm2[0x07 + (i * 2)] = iParm2[0x0D + (i * 2)]; //} } */ -u32 func_8003E934(int iParm1) -{ - if (!((-1 < iParm1) && (iParm1 < 0x32))) - return 0; +u32 func_8003E934(int iParm1) { + if (!((-1 < iParm1) && (iParm1 < 0x32))) { + return 0; + } - return 1; + return 1; } -void func_8003E954(u32 uParm1, u8* puParm2) -{ - *puParm2 = 1; - func_8003E82C(puParm2 + 0x13f0); - func_8003E888(puParm2 + 0x13f4); - func_800387FC(uParm1, puParm2 + 0x13f8); +void func_8003E954(u32 uParm1, u8* puParm2) { + *puParm2 = 1; + func_8003E82C(puParm2 + 0x13f0); + func_8003E888(puParm2 + 0x13f4); + func_800387FC(uParm1, puParm2 + 0x13f8); } #pragma GLOBAL_ASM("asm/non_matchings/code/z_bgcheck/func_8003E9A0.s") @@ -323,19 +305,16 @@ void func_8003E954(u32 uParm1, u8* puParm2) #pragma GLOBAL_ASM("asm/non_matchings/code/z_bgcheck/func_800418D0.s") #ifdef NON_MATCHING -void func_80041978(int iParm1, int iParm2) -{ - u8* puVar1; +void func_80041978(int iParm1, int iParm2) { + u8* puVar1; - puVar1 = *(u8 **)(iParm1 + 8); - if (puVar1 < puVar1 + iParm2) - { - *puVar1 = 0; - while (puVar1++ < (u8*)(*(int *)(iParm1 + 8) + iParm2)) - { - *puVar1 = 0; + puVar1 = *(u8**)(iParm1 + 8); + if (puVar1 < puVar1 + iParm2) { + *puVar1 = 0; + while (puVar1++ < (u8*)(*(int*)(iParm1 + 8) + iParm2)) { + *puVar1 = 0; + } } - } } #else #pragma GLOBAL_ASM("asm/non_matchings/code/z_bgcheck/func_80041978.s") @@ -343,12 +322,11 @@ void func_80041978(int iParm1, int iParm2) #pragma GLOBAL_ASM("asm/non_matchings/code/z_bgcheck/func_800419B0.s") -u32 func_80041A28(CollisionContext *a0, u32 a1, u32 a2) -{ - u32 uVar1; - - uVar1 = func_800419B0(a0, a1, a2, 0); - return uVar1 & 0xff; +u32 func_80041A28(CollisionContext* a0, u32 a1, u32 a2) { + u32 uVar1; + + uVar1 = func_800419B0(a0, a1, a2, 0); + return uVar1 & 0xff; } #pragma GLOBAL_ASM("asm/non_matchings/code/z_bgcheck/func_80041A4C.s") @@ -365,12 +343,11 @@ u32 func_80041A28(CollisionContext *a0, u32 a1, u32 a2) #pragma GLOBAL_ASM("asm/non_matchings/code/z_bgcheck/func_80041D4C.s") -u32 func_80041D94(u32 a0, u32 a1, u32 a2) -{ - u32 uVar1; - - uVar1 = func_800419B0(a0, a1, a2, 0); - return uVar1 >> 0x15 & 0x1f; +u32 func_80041D94(u32 a0, u32 a1, u32 a2) { + u32 uVar1; + + uVar1 = func_800419B0(a0, a1, a2, 0); + return uVar1 >> 0x15 & 0x1f; } #pragma GLOBAL_ASM("asm/non_matchings/code/z_bgcheck/func_80041DB8.s") @@ -385,12 +362,11 @@ u32 func_80041D94(u32 a0, u32 a1, u32 a2) #pragma GLOBAL_ASM("asm/non_matchings/code/z_bgcheck/func_80041EEC.s") -u32 func_80041F10(u32 a0, u32 a1, u32 a2) -{ - u32 uVar1; - - uVar1 = func_800419B0(a0, a1, a2, 1); - return uVar1 & 0xf; +u32 func_80041F10(u32 a0, u32 a1, u32 a2) { + u32 uVar1; + + uVar1 = func_800419B0(a0, a1, a2, 1); + return uVar1 & 0xf; } #pragma GLOBAL_ASM("asm/non_matchings/code/z_bgcheck/func_80041F34.s") @@ -409,29 +385,28 @@ u32 func_80041F10(u32 a0, u32 a1, u32 a2) #pragma GLOBAL_ASM("asm/non_matchings/code/z_bgcheck/func_800420E4.s") -u32 func_80042108(u32 a0, u32 a1, u32 a2) -{ - u32 result; - s32 var1; +u32 func_80042108(u32 a0, u32 a1, u32 a2) { + u32 result; + s32 var1; - var1 = func_800419B0(a0, a1, a2, 1); + var1 = func_800419B0(a0, a1, a2, 1); - if (var1 << 4 < 0) - result = 1; - else - result = 0; + if (var1 << 4 < 0) { + result = 1; + } else { + result = 0; + } - return result; + return result; } #pragma GLOBAL_ASM("asm/non_matchings/code/z_bgcheck/func_8004213C.s") #pragma GLOBAL_ASM("asm/non_matchings/code/z_bgcheck/func_80042244.s") -u8 func_80042538(CollisionContext *colCtx, s32 iParm2) -{ +u8 func_80042538(CollisionContext* colCtx, s32 iParm2) { u32 var1 = *(u32*)(iParm2 + 0xc); - return var1; + return var1; } #pragma GLOBAL_ASM("asm/non_matchings/code/z_bgcheck/func_80042548.s") @@ -451,4 +426,3 @@ u8 func_80042538(CollisionContext *colCtx, s32 iParm2) #pragma GLOBAL_ASM("asm/non_matchings/code/z_bgcheck/func_80042EF8.s") #pragma GLOBAL_ASM("asm/non_matchings/code/z_bgcheck/func_80042FC4.s") - diff --git a/src/code/z_camera.c b/src/code/z_camera.c index e1bece0fae..b48b58321a 100644 --- a/src/code/z_camera.c +++ b/src/code/z_camera.c @@ -2,20 +2,19 @@ #include #include -// Non-matchings functions marked with CLOSE are either a matter of regalloc or stack size and can possibly be fixed with the permutator. +// Non-matchings functions marked with CLOSE are either a matter of regalloc or stack size and can possibly be fixed +// with the permutator. -typedef struct -{ +typedef struct { Vec3f unk_00; Vec3f unk_0C; - CollisionPoly *unk_18; + CollisionPoly* unk_18; char unk_1C[0x8]; s32 unk_24; } struct_80043D18; // names for this struct's values come from a debug function, may want to rename -typedef struct -{ +typedef struct { s8 code; s8 z; u16 T; @@ -23,88 +22,77 @@ typedef struct Vec3s pos; } SplineData; // originally called SplinedatZ - // 47 lines #pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/func_800437F0.s") // had an attempt at this but didn't get very close -f32 func_8004389C(f32 a, f32 b, f32 c, f32 d) -{ - f32 temp1 = a - b; - f32 temp2; - f32 ret; - - if (fabsf(temp1) >= d) - { - temp2 = temp1 * c; - ret = b + temp2; - } - else - ret = a; +f32 func_8004389C(f32 a, f32 b, f32 c, f32 d) { + f32 temp1 = a - b; + f32 temp2; + f32 ret; - return ret; + if (fabsf(temp1) >= d) { + temp2 = temp1 * c; + ret = b + temp2; + } else { + ret = a; + } + + return ret; } -f32 func_800438DC(f32 a, f32 b, f32 c, f32 d) -{ - f32 temp1 = a - b; - f32 temp2; - f32 ret; - - if (fabsf(temp1) >= d) - { - temp2 = temp1 * c; - ret = b + temp2; - } - else - ret = b; +f32 func_800438DC(f32 a, f32 b, f32 c, f32 d) { + f32 temp1 = a - b; + f32 temp2; + f32 ret; - return ret; + if (fabsf(temp1) >= d) { + temp2 = temp1 * c; + ret = b + temp2; + } else { + ret = b; + } + + return ret; } -s16 func_8004391C(s16 a, s16 b, f32 c, s16 d) -{ - s16 temp1 = a - b; - s16 temp2; - s32 ret; - - if (ABS(temp1) >= d) - { - temp2 = temp1 * c + 0.5f; - ret = b + temp2; - } - else - ret = a; +s16 func_8004391C(s16 a, s16 b, f32 c, s16 d) { + s16 temp1 = a - b; + s16 temp2; + s32 ret; - return ret; + if (ABS(temp1) >= d) { + temp2 = temp1 * c + 0.5f; + ret = b + temp2; + } else { + ret = a; + } + + return ret; } -s16 func_800439AC(s16 a, s16 b, f32 c, s16 d) -{ - s16 temp1 = a - b; - s16 temp2; - s32 ret; - - if (ABS(temp1) >= d) - { - temp2 = temp1 * c + 0.5f; - ret = b + temp2; - } - else - ret = b; +s16 func_800439AC(s16 a, s16 b, f32 c, s16 d) { + s16 temp1 = a - b; + s16 temp2; + s32 ret; - return ret; + if (ABS(temp1) >= d) { + temp2 = temp1 * c + 0.5f; + ret = b + temp2; + } else { + ret = b; + } + + return ret; } -void func_80043A3C(Vec3f *a, Vec3f *b, f32 c, f32 d, f32 e) -{ +void func_80043A3C(Vec3f* a, Vec3f* b, f32 c, f32 d, f32 e) { b->x = func_8004389C(a->x, b->x, d, e); b->y = func_8004389C(a->y, b->y, c, e); b->z = func_8004389C(a->z, b->z, d, e); } -void func_80043ABC(Camera *camera) -{ +void func_80043ABC(Camera* camera) { camera->unk_C0.z = 100.0f; camera->unk_C0.y = OREG(7); camera->unk_C0.x = OREG(6); @@ -113,8 +101,7 @@ void func_80043ABC(Camera *camera) camera->unk_CC.z = OREG(4) * 0.01f; } -void func_80043B60(Camera *camera) -{ +void func_80043B60(Camera* camera) { camera->unk_C0.x = OREG(27); camera->unk_C0.z = OREG(27); camera->unk_C0.y = OREG(27); @@ -123,8 +110,7 @@ void func_80043B60(Camera *camera) camera->unk_CC.z = 0.001f; } -Vec3f *func_80043BC4(Vec3f *a, Vec3s *b) -{ +Vec3f* func_80043BC4(Vec3f* a, Vec3s* b) { Vec3f sp4; sp4.x = b->x; @@ -135,21 +121,19 @@ Vec3f *func_80043BC4(Vec3f *a, Vec3s *b) return a; } -Vec3f *func_80043C28(Vec3f *a, Vec3f *b, struct_80045714 *c) -{ +Vec3f* func_80043C28(Vec3f* a, Vec3f* b, struct_80045714* c) { Vec3f sp24, sp18; func_8007C25C(&sp18, c); sp24.x = b->x + sp18.x; sp24.y = b->y + sp18.y; sp24.z = b->z + sp18.z; - + *a = sp24; return a; } -Vec3f *func_80043CAC(Vec3f *a, Vec3f *b, Vec3f *c, f32 d) -{ +Vec3f* func_80043CAC(Vec3f* a, Vec3f* b, Vec3f* c, f32 d) { Vec3f sp4; sp4.x = b->x + (c->x * d); @@ -160,12 +144,11 @@ Vec3f *func_80043CAC(Vec3f *a, Vec3f *b, Vec3f *c, f32 d) return a; } -s32 func_80043D18(Camera *camera, Vec3f *b, struct_80043D18 *c) -{ - CollisionContext *colCtx; +s32 func_80043D18(Camera* camera, Vec3f* b, struct_80043D18* c) { + CollisionContext* colCtx; Vec3f sp68, sp5C, sp50; f32 temp_ret; - CollisionPoly *sp48; + CollisionPoly* sp48; s32 sp44; struct_80045714 sp3C; @@ -173,47 +156,44 @@ s32 func_80043D18(Camera *camera, Vec3f *b, struct_80043D18 *c) func_8007C490(&sp3C, b, &c->unk_00); sp3C.unk_00 += 8.0f; func_80043C28(&sp5C, b, &sp3C); - - if (func_8003DD6C(colCtx, b, &sp5C, &sp68, &c->unk_18, 1, 1, 1, -1, &c->unk_24) == 0) - { + + if (func_8003DD6C(colCtx, b, &sp5C, &sp68, &c->unk_18, 1, 1, 1, -1, &c->unk_24) == 0) { func_8007C0F8(&sp50, b, &c->unk_00); - + c->unk_0C.x = -sp50.x; c->unk_0C.y = -sp50.y; c->unk_0C.z = -sp50.z; - + sp68 = c->unk_00; sp68.y += 5.0f; temp_ret = func_8003CCA4(colCtx, &sp48, &sp44, &sp68); - - if ((c->unk_00.y - temp_ret) > 5.0f) - { + + if ((c->unk_00.y - temp_ret) > 5.0f) { c->unk_00.x += c->unk_0C.x; c->unk_00.y += c->unk_0C.y; c->unk_00.z += c->unk_0C.z; return 0; } - + c->unk_18 = sp48; sp68.y = temp_ret + 1.0f; c->unk_24 = sp44; } - + c->unk_0C.x = c->unk_18->norm.x * (1.f / 32767); c->unk_0C.y = c->unk_18->norm.y * (1.f / 32767); c->unk_0C.z = c->unk_18->norm.z * (1.f / 32767); c->unk_00.x = c->unk_0C.x + sp68.x; c->unk_00.y = c->unk_0C.y + sp68.y; c->unk_00.z = c->unk_0C.z + sp68.z; - + return sp44 + 1; } -void func_80043F34(Camera *camera, Vec3f *b, Vec3f *c) -{ +void func_80043F34(Camera* camera, Vec3f* b, Vec3f* c) { struct_80043D18 sp20; Vec3s unused; - + sp20.unk_00 = *c; func_80043D18(camera, b, &sp20); *c = sp20.unk_00; @@ -222,32 +202,31 @@ void func_80043F34(Camera *camera, Vec3f *b, Vec3f *c) // 242 lines #pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/func_80043F94.s") -void func_80044340(Camera *camera, Vec3f *b, Vec3f *c) -{ +void func_80044340(Camera* camera, Vec3f* b, Vec3f* c) { struct_80043D18 sp20; Vec3s unused; - + sp20.unk_00 = *c; func_80043F94(camera, b, &sp20); *c = sp20.unk_00; } -#ifdef NON_MATCHING f32 func_80038B7C(); + +#ifdef NON_MATCHING // ordering -s32 func_800443A0(Camera *camera, Vec3f *b, Vec3f *c) -{ +s32 func_800443A0(Camera* camera, Vec3f* b, Vec3f* c) { s32 sp4C; Vec3f sp40; s32 sp3C; s32 sp38; - CollisionPoly *sp34; - + CollisionPoly* sp34; + sp34 = NULL; // this is moved to the top when it should be done in the middle of the function args being loaded - if (func_8003DD6C(&camera->globalCtx->colCtx, b, c, &sp40, &sp34, 1, 1, 1, 0, &sp38) != 0) - { - if (func_80038B7C(sp34, b) < 0.0f) + if (func_8003DD6C(&camera->globalCtx->colCtx, b, c, &sp40, &sp34, 1, 1, 1, 0, &sp38) != 0) { + if (func_80038B7C(sp34, b) < 0.0f) { return 1; + } } return 0; } @@ -255,21 +234,17 @@ s32 func_800443A0(Camera *camera, Vec3f *b, Vec3f *c) #pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/func_800443A0.s") #endif -f32 func_8003C940(CollisionContext *, CollisionPoly **, s32 *, Vec3f *); -f32 func_80044434(Camera *camera, Vec3f *b, Vec3f *c, s32 *d) -{ +f32 func_8003C940(CollisionContext*, CollisionPoly**, s32*, Vec3f*); +f32 func_80044434(Camera* camera, Vec3f* b, Vec3f* c, s32* d) { s32 sp2C; // unused - CollisionPoly *sp28; + CollisionPoly* sp28; f32 temp_ret = func_8003C940(&camera->globalCtx->colCtx, &sp28, d, c); - - if (temp_ret == -32000.0f) - { + + if (temp_ret == -32000.0f) { b->x = 0.0f; b->z = 0.0f; b->y = 1.0f; - } - else - { + } else { b->x = sp28->norm.x * (1.f / 32767); b->y = sp28->norm.y * (1.f / 32767); b->z = sp28->norm.z * (1.f / 32767); @@ -278,32 +253,28 @@ f32 func_80044434(Camera *camera, Vec3f *b, Vec3f *c, s32 *d) return temp_ret; } -void func_80044510(Camera *camera, Vec3f *b) -{ +void func_80044510(Camera* camera, Vec3f* b) { Vec3f sp2C, sp20; s32 sp1C; sp2C = *b; sp2C.y += 80.0f; - + func_80044434(camera, &sp20, &sp2C, &sp1C); } // 125 lines (loop) #pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/func_80044568.s") -s16 func_80044740(Camera *camera, s32 b) -{ +s16 func_80044740(Camera* camera, s32 b) { return func_80041A4C(&camera->globalCtx->colCtx, b, 50); } -void func_8004476C(Camera *camera) -{ +void func_8004476C(Camera* camera) { func_80041C10(&camera->globalCtx->colCtx, camera->unk_148, 50); } -s32 func_8004479C(Camera *camera, s32 *b, Vec3f *c) -{ +s32 func_8004479C(Camera* camera, s32* b, Vec3f* c) { s32 temp_ret; PosRot sp20; s32 ret; @@ -311,78 +282,75 @@ s32 func_8004479C(Camera *camera, s32 *b, Vec3f *c) func_8002EF44(&sp20, &camera->player->actor); temp_ret = func_80041A28(&camera->globalCtx->colCtx, c, *b); - if (func_80041A4C(&camera->globalCtx->colCtx, temp_ret, *b) == 0) + if (func_80041A4C(&camera->globalCtx->colCtx, temp_ret, *b) == 0) { ret = -1; - else + } else { ret = temp_ret; + } return ret; } -s32 func_8004481C(Camera *camera, s16 *arg1) -{ - CollisionPoly *sp44; +s32 func_8004481C(Camera* camera, s16* arg1) { + CollisionPoly* sp44; s32 sp40; // unused s32 sp3C; PosRot sp28; func_8002EF44(&sp28, &camera->player->actor); sp28.pos.y += func_8002DC84(camera->player); - if (func_8003C940(&camera->globalCtx->colCtx, &sp44, &sp3C, &sp28.pos) == -32000.0f) - { + if (func_8003C940(&camera->globalCtx->colCtx, &sp44, &sp3C, &sp28.pos) == -32000.0f) { return 0; } *arg1 = func_80041B80(&camera->globalCtx->colCtx, sp44, sp3C); return func_80041C98(&camera->globalCtx->colCtx, sp44, sp3C); } -s32 func_800448CC(Camera *camera, f32 *b) -{ +s32 func_800448CC(Camera* camera, f32* b) { PosRot sp34; s32 sp30; s32 temp_ret; func_8002EF44(&sp34, &camera->player->actor); *b = sp34.pos.y; - - if (func_8004213C(camera->globalCtx, &camera->globalCtx->colCtx, sp34.pos.x, sp34.pos.z, b, &sp30) == 0) - { + + if (func_8004213C(camera->globalCtx, &camera->globalCtx->colCtx, sp34.pos.x, sp34.pos.z, b, &sp30) == 0) { *b = -32000.0f; return -1; } - if (!(camera->player->stateFlags1 & 0x8000000)) - { + if (!(camera->player->stateFlags1 & 0x8000000)) { *b = -32000.0f; return -1; } - + temp_ret = func_80042538(&camera->globalCtx->colCtx, sp30); - if ((temp_ret <= 0) || (func_80042548(&camera->globalCtx->colCtx, sp30) <= 0)) + if ((temp_ret <= 0) || (func_80042548(&camera->globalCtx->colCtx, sp30) <= 0)) { return -2; - + } + return temp_ret; } -f32 func_800449AC(Camera *camera, Vec3f *b, s32 *arg2) -{ +f32 func_800449AC(Camera* camera, Vec3f* b, s32* arg2) { PosRot sp2C; f32 sp28; s32 sp24; func_8002EF44(&sp2C, &camera->player->actor); sp28 = sp2C.pos.y; - - if (func_8004213C(camera->globalCtx, &camera->globalCtx->colCtx, b->x, b->z, &sp28, &sp24) == 0) + + if (func_8004213C(camera->globalCtx, &camera->globalCtx->colCtx, b->x, b->z, &sp28, &sp24) == 0) { return -32000.f; - if (sp28 < b->y) + } + if (sp28 < b->y) { return -32000.f; + } *arg2 = func_8004259C(&camera->globalCtx->colCtx, sp24); return sp28; } -s16 func_80044A74(Vec3f *a, Vec3f *b) -{ - return func_800FD250(b->x - a->x, b->z - a->z) * (180 / M_PI) * (32767.5f / 180) + 0.5f; +s16 func_80044A74(Vec3f* a, Vec3f* b) { + return Math_atan2f(b->x - a->x, b->z - a->z) * (180 / M_PI) * (32767.5f / 180) + 0.5f; } // 234 lines @@ -391,17 +359,17 @@ s16 func_80044A74(Vec3f *a, Vec3f *b) // 143 lines (extremely confusing) #pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/func_80044E68.s") -f32 func_800450A4(Camera *camera, f32 b) -{ +f32 func_800450A4(Camera* camera, f32 b) { f32 ret; - - if (camera->unk_100 < (OREG(41) * 0.01f)) + + if (camera->unk_100 < (OREG(41) * 0.01f)) { ret = OREG(41) * 0.01f; - else if (b <= camera->unk_100) + } else if (b <= camera->unk_100) { ret = b; - else + } else { ret = OREG(42) * 0.01f * camera->unk_100; - + } + return ret; } @@ -414,17 +382,15 @@ f32 func_800450A4(Camera *camera, f32 b) // 76 lines (unknown types) #pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/func_80045350.s") -void *func_8004545C(Vec3f *a, s32 b, s32 c, struct_80043D18 *d, struct_80043D18 *e) -{ +void* func_8004545C(Vec3f* a, s32 b, s32 c, struct_80043D18* d, struct_80043D18* e) { Vec3f sp24; - if (func_800427B4(d->unk_18, e->unk_18, b, c, &sp24) == 0) - { + if (func_800427B4(d->unk_18, e->unk_18, b, c, &sp24) == 0) { osSyncPrintf(VT_COL(YELLOW, BLACK) "camera: corner check no cross point %x %x\n" VT_RST, d, e); *a = d->unk_00; return a; } - + *a = sp24; return a; } @@ -434,8 +400,7 @@ void *func_8004545C(Vec3f *a, s32 b, s32 c, struct_80043D18 *d, struct_80043D18 #ifdef NON_MATCHING // CLOSE: stack is 4 bytes too big -f32 func_80045714(Vec3f *a, s16 b, s16 c, f32 arg3) -{ +f32 func_80045714(Vec3f* a, s16 b, s16 c, f32 arg3) { struct_80045714 sp1C; f32 sp18; @@ -445,131 +410,126 @@ f32 func_80045714(Vec3f *a, s16 b, s16 c, f32 arg3) return Math_Coss(b - c) * (sp18 * arg3); } #else -f32 func_80045714(Vec3f *a, s16 b, s16 c, f32 arg3); +f32 func_80045714(Vec3f* a, s16 b, s16 c, f32 arg3); #pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/func_80045714.s") #endif -#ifdef NON_MATCHING f32 func_8007C0A8(f32, f32); -// CLOSE: stack is slightly off, probably a temp var -s32 func_800457A8(Camera *camera, struct_80045714 *b, f32 c, s16 d) -{ + +s32 func_800457A8(Camera* camera, struct_80045714* b, f32 c, s16 d) { f32 unused; Vec3f sp50; Vec3f sp44; s32 unused2; + PosRot* sp2C; f32 temp_ret; - PosRot *sp2C; - + temp_ret = func_8002DC84(camera->player); sp50.x = 0.f; sp50.z = 0.f; sp50.y = temp_ret + c; - + sp2C = &camera->unk_94; - if (d != 0) - { + if (d != 0) { sp50.y -= func_8007C0A8(func_80045714(&camera->unk_108, sp2C->rot.y, b->unk_06, OREG(9)), temp_ret); } func_80043A3C(&sp50, &camera->unk_E4, camera->unk_CC.y, camera->unk_CC.x, 0.1f); - + sp44.x = sp2C->pos.x + camera->unk_E4.x; sp44.y = sp2C->pos.y + camera->unk_E4.y; sp44.z = sp2C->pos.z + camera->unk_E4.z; func_80043A3C(&sp44, &camera->unk_50, camera->unk_100, camera->unk_100, 0.2f); - + return 1; } -#else -#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/func_800457A8.s") -#endif + +f32 func_8007C028(Vec3f*, Vec3f*); #ifdef NON_MATCHING -f32 func_8007C028(Vec3f *, Vec3f *); -// CLOSE: regalloc, plus stack is slightly off, probably a temp var -s32 func_800458D4(Camera *camera, struct_80045714 *b, f32 c, f32 *d, s16 e) -{ +// CLOSE: regalloc +s32 func_800458D4(Camera* camera, struct_80045714* b, f32 c, f32* d, s16 e) { f32 phi_f2; Vec3f sp60; Vec3f sp54; f32 temp_ret; - PosRot *temp_s1; + PosRot* temp_s1; f32 sp48; - Vec3f sp3C; // unused + s32 pad[2]; sp60.y = func_8002DC84(camera->player) + c; sp60.x = 0.0f; sp60.z = 0.0f; - + temp_s1 = &camera->unk_94; - if (e != 0) + if (e != 0) { sp60.y -= func_80045714(&camera->unk_108, temp_s1->rot.y, b->unk_06, OREG(9)); - + } + sp48 = temp_s1->pos.y - *d; - temp_ret = func_800FD250(sp48, func_8007C028(&camera->unk_50, &camera->unk_5C)); // f2 and f14 are swapped - - if (OREG(32) * (M_PI / 180) < temp_ret) + temp_ret = Math_atan2f(sp48, func_8007C028(&camera->unk_50, &camera->unk_5C)); // f2 and f14 are swapped + + if (OREG(32) * (M_PI / 180) < temp_ret) { phi_f2 = 1.0f - sinf(temp_ret - OREG(32) * (M_PI / 180)); - else if (OREG(33) * (M_PI / 180) > temp_ret) + } else if (OREG(33) * (M_PI / 180) > temp_ret) { phi_f2 = 1.0f - sinf(OREG(33) * (M_PI / 180) - temp_ret); - else + } else { phi_f2 = 1.0f; - + } + sp60.y -= sp48 * phi_f2; func_80043A3C(&sp60, &camera->unk_E4, OREG(29) * 0.01f, OREG(30) * 0.01f, 0.1f); - + sp54.x = temp_s1->pos.x + camera->unk_E4.x; sp54.y = temp_s1->pos.y + camera->unk_E4.y; sp54.z = temp_s1->pos.z + camera->unk_E4.z; func_80043A3C(&sp54, &camera->unk_50, camera->unk_100, camera->unk_100, 0.2f); - + return 1; } #else #pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/func_800458D4.s") #endif -s32 func_80045B08(Camera *camera, struct_80045714 *b, f32 c, s16 d) -{ +s32 func_80045B08(Camera* camera, struct_80045714* b, f32 c, s16 d) { f32 phi_f2; Vec3f sp48; Vec3f sp3C; f32 sp38; // unused f32 temp_ret; - PosRot *temp_s1; + PosRot* temp_s1; sp48.y = func_8002DC84(camera->player) + c; sp48.x = 0.0f; sp48.z = 0.0f; - - temp_ret = Math_Sins((s32) d); + + temp_ret = Math_Sins((s32)d); temp_s1 = &camera->unk_94; - - if (temp_ret < 0.0f) + + if (temp_ret < 0.0f) { phi_f2 = Math_Coss(temp_s1->rot.y - b->unk_06); - else + } else { phi_f2 = -Math_Coss(temp_s1->rot.y - b->unk_06); - + } + sp48.y -= temp_ret * phi_f2 * OREG(9); func_80043A3C(&sp48, &camera->unk_E4, camera->unk_CC.y, camera->unk_CC.x, 0.1f); - + sp3C.x = temp_s1->pos.x + camera->unk_E4.x; sp3C.y = temp_s1->pos.y + camera->unk_E4.y; sp3C.z = temp_s1->pos.z + camera->unk_E4.z; func_80043A3C(&sp3C, &camera->unk_50, camera->unk_100, camera->unk_100, 0.2f); - + return 1; } -#ifdef NON_MATCHING +/* // someone who's not me can have fun with this function -s32 func_80045C74(Camera *camera, struct_80045714 *b, f32 c, f32 *d, s16 arg4) -{ +s32 func_80045C74(Camera* camera, struct_80045714* b, f32 c, f32* d, s16 arg4) { Vec3f sp70; Vec3f sp64; f32 sp54; - PosRot *sp3C; + PosRot* sp3C; f32 temp; f32 temp_f2; f32 temp_ret_3; @@ -579,217 +539,186 @@ s32 func_80045C74(Camera *camera, struct_80045714 *b, f32 c, f32 *d, s16 arg4) sp70.y = func_8002DC84(camera->player) + c; sp70.x = 0.0f; sp70.z = 0.0f; - - if (PREG(76) != 0) - { - if (arg4 != 0) - { + + if (PREG(76) != 0) { + if (arg4 != 0) { sp70.y -= func_80045714(&camera->unk_108, sp3C->rot.y, b->unk_06, OREG(9)); } } - + sp3C = &camera->unk_94; - - if ((sp3C->pos.y == camera->unk_104) || (camera->player->actor.gravity > -0.1f) || (camera->player->stateFlags1 & 0x200000)) - { + + if ((sp3C->pos.y == camera->unk_104) || (camera->player->actor.gravity > -0.1f) || + (camera->player->stateFlags1 & 0x200000)) { *d = func_8004389C(sp3C->pos.y, *d, OREG(43) * 0.01f, 0.1f); sp70.y -= sp3C->pos.y - *d; func_80043A3C(&sp70, &camera->unk_E4, camera->unk_CC.y, camera->unk_CC.x, 0.1f); - } - else - { + } else { temp = sp3C->pos.y - *d; - if (PREG(75) == 0) - { + if (PREG(75) == 0) { sp54 = func_8007C028(&camera->unk_50, &camera->unk_5C); - func_800FD250(temp, sp54); - temp_f2 = func_800FCE80(camera->unk_FC * 0.4f * (M_PI / 180)) * sp54; - - if (temp > temp_f2) - { + Math_atan2f(temp, sp54); + temp_f2 = Math_tanf(camera->unk_FC * 0.4f * (M_PI / 180)) * sp54; + + if (temp > temp_f2) { *d += temp - temp_f2; phi_f20 = temp_f2; - } - else - { + } else { phi_f20 = temp; - if (temp < -temp_f2) - { + if (temp < -temp_f2) { *d += temp + temp_f2; phi_f20 = -temp_f2; } } sp70.y -= phi_f20; - } - else - { - temp_ret_3 = func_800FD250(temp, func_8007C028(&camera->unk_50, &camera->unk_5C)); - + } else { + temp_ret_3 = Math_atan2f(temp, func_8007C028(&camera->unk_50, &camera->unk_5C)); + if (OREG(32) * (M_PI / 180) < temp_ret_3) phi_f16 = 1.0f - sinf(temp_ret_3 - OREG(32) * (M_PI / 180)); else if (temp_ret_3 < OREG(33) * (M_PI / 180)) phi_f16 = 1.0f - sinf(OREG(33) * (M_PI / 180) - temp_ret_3); else phi_f16 = 1.0f; - } - + sp70.y -= temp * phi_f16; } - + func_80043A3C(&sp70, &camera->unk_E4, OREG(29) * 0.01f, OREG(30) * 0.01f, 0.1f); camera->unk_CC.y = OREG(29) * 0.01f; camera->unk_CC.x = OREG(30) * 0.01f; } - + sp64.x = sp3C->pos.x + camera->unk_E4.x; sp64.y = sp3C->pos.y + camera->unk_E4.y; sp64.z = sp3C->pos.z + camera->unk_E4.z; func_80043A3C(&sp64, &camera->unk_50, camera->unk_100, camera->unk_100, 0.2f); - + return 1; } -#else +*/ #pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/func_80045C74.s") -#endif // 421 lines #pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/func_800460A8.s") -s32 func_800466F8(Camera *camera, struct_80045714 *b, f32 c, f32 *d, s16 e) -{ +s32 func_800466F8(Camera* camera, struct_80045714* b, f32 c, f32* d, s16 e) { s32 phi_v0; Vec3f sp60; Vec3f sp54; f32 sp50; // unused f32 sp4C; // unused f32 sp48; // I doubt this is a Vec3f - Player *sp44; + Player* sp44; PosRot sp30; sp48 = func_8002DC84(camera->player); sp44 = camera->player; func_8002EF44(&sp30, sp44->rideActor); - - if ((*(s32 *)((s32)(sp44->rideActor) + 0x1F0) & 4) != 0) // actors aren't this big, is rideActor a different type? + + if ((*(s32*)((s32)(sp44->rideActor) + 0x1F0) & 4) != 0) { // actors aren't this big, is rideActor a different type? phi_v0 = 1; - else + } else { phi_v0 = 0; - - if (phi_v0 != 0) - { + } + + if (phi_v0 != 0) { sp30.pos.y -= 49.f; *d = func_8004389C(sp30.pos.y, *d, 0.1f, 0.2f); camera->unk_100 = func_8004389C(0.4f, camera->unk_100, 0.2f, 0.02f); - } - else - { + } else { *d = func_8004389C(sp30.pos.y, *d, 0.5f, 0.2f); } - + sp60.x = 0.0f; sp60.z = 0.0f; sp60.y = sp48 + c; - - if (e != 0) + + if (e != 0) { sp60.y -= func_80045714(&camera->unk_108, camera->unk_94.rot.y, b->unk_06, OREG(9)); - + } + func_80043A3C(&sp60, &camera->unk_E4, camera->unk_CC.y, camera->unk_CC.x, 0.1f); - + sp54.x = camera->unk_E4.x + sp30.pos.x; sp54.y = camera->unk_E4.y + sp30.pos.y; sp54.z = camera->unk_E4.z + sp30.pos.z; func_80043A3C(&sp54, &camera->unk_50, camera->unk_100, camera->unk_100, 0.2f); - + return 1; } -void func_800468CC(Camera *camera, f32 b, f32 c, f32 d) -{ +void func_800468CC(Camera* camera, f32 b, f32 c, f32 d) { f32 sp1C; f32 phi_f12; - if (b < c) - { + if (b < c) { sp1C = c; phi_f12 = OREG(6); - } - else if (d < b) - { + } else if (d < b) { sp1C = d; phi_f12 = OREG(6); - } - else - { + } else { sp1C = b; phi_f12 = 1.0f; } - + camera->unk_C0.x = func_8004389C(phi_f12, camera->unk_C0.x, OREG(25) * 0.01f, 0.1f); func_8004389C(sp1C, camera->unk_DC, 1.f / camera->unk_C0.x, 0.2f); } -void func_800469C0(Camera *camera, f32 b, f32 c, f32 d, s16 e) -{ +void func_800469C0(Camera* camera, f32 b, f32 c, f32 d, s16 e) { f32 sp1C; f32 phi_f12; - if (b < c) - { + if (b < c) { sp1C = c; - - if (e != 0) + + if (e != 0) { phi_f12 = OREG(6) * 0.5f; - else + } else { phi_f12 = OREG(6); - } - else if (d < b) - { + } + } else if (d < b) { sp1C = d; - - if (e != 0) + + if (e != 0) { phi_f12 = OREG(6) * 0.5f; - else + } else { phi_f12 = OREG(6); - } - else - { + } + } else { sp1C = b; - - if (e != 0) + + if (e != 0) { phi_f12 = OREG(6); - else + } else { phi_f12 = 1.0f; + } } - + camera->unk_C0.x = func_8004389C(phi_f12, camera->unk_C0.x, OREG(25) * 0.01f, 0.1f); func_8004389C(sp1C, camera->unk_DC, 1.f / camera->unk_C0.x, 0.2f); } #ifdef NON_MATCHING // lots of regalloc and stack issues, but that's it -void func_80046B44(Camera *camera, s16 b, s16 c, s16 d) -{ +void func_80046B44(Camera* camera, s16 b, s16 c, s16 d) { s16 sp1C; s16 phi_v1; s16 phi_v0; f32 phi_a2; phi_v1 = ABS(b); - if (d > 0) - { + if (d > 0) { phi_v0 = Math_Coss(d) * d; - } - else - { + } else { phi_v0 = d; } sp1C = c - phi_v0; - if (ABS(sp1C) < phi_v1) - { + if (ABS(sp1C) < phi_v1) { phi_a2 = (1.0f / camera->unk_C0.y) * 3.0f; - } - else - { + } else { phi_a2 = (1.0f / camera->unk_C0.y) * func_800437F0(0.8f, 1.0f - phi_v0 * (1.0f / OREG(5))); } func_8004391C(sp1C, b, phi_a2, 0xa); @@ -800,33 +729,28 @@ void func_80046B44(Camera *camera, s16 b, s16 c, s16 d) #ifdef NON_MATCHING // stack, regalloc, tiny bit of ordering -s16 func_80046CB4(Camera *camera, s16 b, s16 c, f32 d, f32 e) -{ +s16 func_80046CB4(Camera* camera, s16 b, s16 c, f32 d, f32 e) { f32 sp34; s16 sp1C; f32 temp_ret; f32 phi_f14; - s16 temp; + s16 temp; - if (camera->unk_D8 > 0.001f) - { - temp = b - 0x7fff; // this is probably some kind of cast that I'm too stupid to know + if (camera->unk_D8 > 0.001f) { + temp = b - 0x7fff; // this is probably some kind of cast that I'm too stupid to know sp1C = c - temp; phi_f14 = (s16)(sp1C - 0x7fff) * 0.00003051851f; - } - else - { - temp = b - 0x7fff; + } else { + temp = b - 0x7fff; sp1C = c - temp; phi_f14 = OREG(48) * 0.01f; } temp_ret = func_800437F0(d, phi_f14); sp34 = ((1.0f - temp_ret) * e) + temp_ret; - if (sp34 < 0.0f) - { + if (sp34 < 0.0f) { sp34 = 0.0f; } - // ordering stuff here + // ordering stuff here return (s16)((sp1C * sp34) * (1.0f / camera->unk_C0.z) * func_800437F0(0.5f, camera->unk_E0)) + b; } #else @@ -836,8 +760,7 @@ s16 func_80046CB4(Camera *camera, s16 b, s16 c, f32 d, f32 e) // 364 lines #pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/func_80046E20.s") -s32 func_80047394(Camera *camera) -{ +s32 func_80047394(Camera* camera) { return 1; } @@ -850,13 +773,11 @@ s32 func_80047394(Camera *camera) // Very long function (1,444 lines), 1 jtbl #pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/func_80052E0C.s") -void Camera_DebugPrintSplineArray(char* name, s16 length, SplineData splines[]) -{ +void Camera_DebugPrintSplineArray(char* name, s16 length, SplineData splines[]) { s32 i; - + osSyncPrintf("static SplinedatZ %s[] = {\n", name); - for (i = 0; i < length; i++) - { + for (i = 0; i < length; i++) { osSyncPrintf(" /* key frame %2d */ {\n", i); osSyncPrintf(" /* code */ %d,\n", splines[i].code); osSyncPrintf(" /* z */ %d,\n", splines[i].z); @@ -868,8 +789,7 @@ void Camera_DebugPrintSplineArray(char* name, s16 length, SplineData splines[]) osSyncPrintf("};\n\n"); } -void Camera_Vec3fCopy(Vec3f *src, Vec3f *dst) -{ +void Camera_Vec3fCopy(Vec3f* src, Vec3f* dst) { dst->x = src->x; dst->y = src->y; dst->z = src->z; @@ -881,54 +801,38 @@ void Camera_Vec3fCopy(Vec3f *src, Vec3f *dst) // 225 lines #pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/func_80057C6C.s") -#ifdef NON_MATCHING -// still needs a bit of work, but should be functionally equivalent -void func_80057FC4(Camera *camera) -{ - if (camera != &camera->globalCtx->cameraCtx.activeCameras[0]) - { - camera->unk_142 = 33; - camera->unk_14C &= ~0x4; - camera->unk_154 = camera->unk_142; // compiler uses the same temp reg, but it should load from 142 right after being saved to - // maybe try camera->unk_154 = camera->unk_142 = 33 and make them have differing signs? - return; - } - // try putting these in a bunch of if else statements - if (*camera->globalCtx->roomCtx.curRoom.unk_08 != 1) - { - if (camera->globalCtx->roomCtx.curRoom.unk_03 != 0) - { - if (camera->globalCtx->roomCtx.curRoom.unk_03 == 1) - { - func_8005AD40(camera, 0, -99, 0, 0, 18, 10); - camera->unk_142 = 3; - camera->unk_154 = camera->unk_142; - return; - } - osSyncPrintf("camera: room type: default set etc (%d)\n", camera->globalCtx->roomCtx.curRoom.unk_03); - func_8005AD40(camera, 0, -99, 0, 0, 18, 10); - camera->unk_142 = 1; - camera->unk_154 = camera->unk_142; - return; - } - osSyncPrintf("camera: room type: default set field\n"); - func_8005AD40(camera, 0, -99, 0, 0, 18, 10); - camera->unk_142 = 1; - camera->unk_14C |= 4; - camera->unk_154 = camera->unk_142; - return; - } - osSyncPrintf("camera: room type: prerender\n"); - camera->unk_142 = 0x21; - camera->unk_14C &= 0xfffb; - camera->unk_154 = camera->unk_142; -} -#else -#pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/func_80057FC4.s") -#endif +s32 func_8005AD40(Camera* camera, s32 a, s16 b, f32 c, s16 d, s16 e, s16 f); -void Camera_Stub80058140(Camera *camera) -{ +void func_80057FC4(Camera* camera) { + if (camera != &camera->globalCtx->cameraCtx.activeCameras[0]) { + camera->unk_154 = camera->unk_142 = 33; + camera->unk_14C &= ~0x4; + } else if (camera->globalCtx->roomCtx.curRoom.mesh->polygon.type != 1) { + switch (camera->globalCtx->roomCtx.curRoom.unk_03) { + case 1: + func_8005AD40(camera, 0, -99, 0, 0, 18, 10); + camera->unk_154 = camera->unk_142 = 3; + break; + case 0: + osSyncPrintf("camera: room type: default set field\n"); + func_8005AD40(camera, 0, -99, 0, 0, 18, 10); + camera->unk_154 = camera->unk_142 = 1; + break; + default: + osSyncPrintf("camera: room type: default set etc (%d)\n", camera->globalCtx->roomCtx.curRoom.unk_03); + func_8005AD40(camera, 0, -99, 0, 0, 18, 10); + camera->unk_154 = camera->unk_142 = 1; + camera->unk_14C |= 4; + break; + } + } else { + osSyncPrintf("camera: room type: prerender\n"); + camera->unk_154 = camera->unk_142 = 33; + camera->unk_14C &= ~0x4; + } +} + +void Camera_Stub80058140(Camera* camera) { } // 135 lines (has lwl/lwr) @@ -943,13 +847,13 @@ void Camera_Stub80058140(Camera *camera) // 296 lines #pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/func_800588B4.s") -s32 func_80058CF8(Camera *camera) -{ +s32 func_80058CF8(Camera* camera) { camera->unk_152 &= ~1; - - if (camera->globalCtx->roomCtx.curRoom.unk_02 == 3) + + if (camera->globalCtx->roomCtx.curRoom.unk_02 == 3) { camera->unk_152 |= 1; - + } + return 1; } @@ -962,49 +866,47 @@ s32 func_80058CF8(Camera *camera) // Long function, 866 lines (lots of debug symbols) #pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/func_800591EC.s") -void func_80059EC8(Camera *camera) -{ - Camera *sp24 = camera->globalCtx->cameraCtx.activeCameraPtrs[0]; - Player *player = (Player *)camera->globalCtx->actorCtx.actorList[2].first; - - if (camera->unk_160 == 0) - { +void func_80059EC8(Camera* camera) { + Camera* sp24 = camera->globalCtx->cameraCtx.activeCameraPtrs[0]; + Player* player = (Player*)camera->globalCtx->actorCtx.actorList[2].first; + + if (camera->unk_160 == 0) { func_800C0314(camera->globalCtx, camera->unk_162, 7); - - if ((camera->unk_162 == 0) && (camera->unk_168 != 0)) - { + + if ((camera->unk_162 == 0) && (camera->unk_168 != 0)) { player->actor.freeze = 0; player->stateFlags1 &= ~0x20000000; - - if (player->action != 0) - { + + if (player->action != 0) { func_8002DF54(camera->globalCtx, &player->actor, 7); osSyncPrintf("camera: player demo end!!\n"); } - + sp24->unk_14C |= 8; } - if (camera->globalCtx->cameraCtx.activeCameraPtrs[camera->unk_14E]->unk_162 == camera->unk_164) + if (camera->globalCtx->cameraCtx.activeCameraPtrs[camera->unk_14E]->unk_162 == camera->unk_164) { camera->globalCtx->cameraCtx.activeCameraPtrs[camera->unk_14E]->unk_162 = camera->unk_162; - - if (camera->globalCtx->cameraCtx.activeCameraPtrs[camera->unk_162]->unk_14E == camera->unk_164) - camera->globalCtx->cameraCtx.activeCameraPtrs[camera->unk_162]->unk_14E = camera->unk_14E; + } - if (camera->globalCtx->cameraCtx.activeCameraPtrs[camera->unk_162]->unk_164 == 0) + if (camera->globalCtx->cameraCtx.activeCameraPtrs[camera->unk_162]->unk_14E == camera->unk_164) { + camera->globalCtx->cameraCtx.activeCameraPtrs[camera->unk_162]->unk_14E = camera->unk_14E; + } + + if (camera->globalCtx->cameraCtx.activeCameraPtrs[camera->unk_162]->unk_164 == 0) { camera->globalCtx->cameraCtx.activeCameraPtrs[camera->unk_162]->unk_15E = 0; - + } + camera->unk_162 = 0; camera->unk_14E = camera->unk_162; camera->unk_160 = -1; camera->globalCtx->unk_10B05 = 0; - + func_800C0384(camera->globalCtx, camera->unk_164); } } -s32 func_8005A02C(Camera *camera) -{ +s32 func_8005A02C(Camera* camera) { camera->unk_14C |= 0xC; camera->unk_14C &= ~(0x1000 | 0x8); return 1; @@ -1013,8 +915,7 @@ s32 func_8005A02C(Camera *camera) // 275 lines (has 2 jtbls) #pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/func_8005A04C.s") -void func_8005A444(Camera *camera, s16 b) -{ +void func_8005A444(Camera* camera, s16 b) { func_8005A04C(camera, b, 0); } @@ -1024,8 +925,7 @@ void func_8005A444(Camera *camera, s16 b) // 154 lines (unknown arrays) #pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/func_8005A548.s") -s32 func_8005A77C(Camera *camera, s16 b) -{ +s32 func_8005A77C(Camera* camera, s16 b) { return func_8005A548(camera, b, 0); } @@ -1047,95 +947,83 @@ s32 func_8005A77C(Camera *camera, s16 b) // 118 lines (has 1 jtbl) #pragma GLOBAL_ASM("asm/non_matchings/code/z_camera/func_8005AA90.s") -s32 func_8005AC48(Camera *camera, s16 b) -{ +s32 func_8005AC48(Camera* camera, s16 b) { camera->unk_14C = b; return 1; } -s32 func_8005AC60(Camera *camera) -{ +s32 func_8005AC60(Camera* camera) { camera->unk_15E = 0; return 1; } -s32 func_8005AC6C(Camera *camera, s32 b, s32 c, Player *d, s16 e) -{ +s32 func_8005AC6C(Camera* camera, s32 b, s32 c, Player* d, s16 e) { PosRot sp24; camera->unk_124 = b; camera->unk_128 = c; camera->unk_12C = e; - - if (camera->unk_12C != 0) - { + + if (camera->unk_12C != 0) { camera->player = d; func_8002EF44(&sp24, &d->actor); camera->unk_94 = sp24; - + camera->unk_156 = -1; camera->unk_D8 = 0.0f; camera->unk_E0 = 0.0f; } - + return 1; } -s16 func_8005ACFC(Camera *camera, s16 b) -{ +s16 func_8005ACFC(Camera* camera, s16 b) { camera->unk_14C |= b; return camera->unk_14C; } -s16 func_8005AD1C(Camera *camera, s16 b) -{ +s16 func_8005AD1C(Camera* camera, s16 b) { camera->unk_14C &= ~b; return camera->unk_14C; } -s32 func_8005AD40(Camera *camera, s32 a, s16 b, s16 c, s16 d, s16 e, s16 f) -{ - if ((camera->unk_142 == 43) || (camera->unk_142 == 29)) +s32 func_8005AD40(Camera* camera, s32 a, s16 b, f32 c, s16 d, s16 e, s16 f) { + if ((camera->unk_142 == 43) || (camera->unk_142 == 29)) { return 0; - + } + camera->unk_00 = a; camera->unk_06 = d; camera->unk_08 = e; camera->unk_0A = f; camera->unk_04 = b; - - if (b == -99) - { + + if (b == -99) { func_80045128(camera, camera->unk_144); return -99; } - - if (b == -1) - { + + if (b == -1) { func_8005A77C(camera, 29); osSyncPrintf(".... change default door camera (set %d)\n", 29); - } - else - { + } else { s32 ret = func_80044740(camera, b); camera->unk_14A |= 0x40; - - if (func_8005A77C(camera, ret) >= 0) - { + + if (func_8005A77C(camera, ret) >= 0) { camera->unk_148 = b; camera->unk_14A |= 4; } - + // this is likely important for labelling unk_148 and unk_142 osSyncPrintf("....change door camera ID %d (set %d)\n", camera->unk_148, camera->unk_142); } - + func_80045128(camera, camera->unk_144); return -1; } -s32 func_8005AE64(Camera *camera, Camera *otherCamera) -{ +s32 func_8005AE64(Camera* camera, Camera* otherCamera) { s32 unused; Vec3f sp30; @@ -1144,7 +1032,7 @@ s32 func_8005AE64(Camera *camera, Camera *otherCamera) camera->unk_E4.z = 0.0f; camera->unk_100 = 0.1f; camera->unk_50 = otherCamera->unk_50; - + sp30 = otherCamera->unk_5C; camera->unk_74 = sp30; camera->unk_5C = sp30; @@ -1153,9 +1041,8 @@ s32 func_8005AE64(Camera *camera, Camera *otherCamera) camera->unk_FC = otherCamera->unk_FC; camera->unk_15A = otherCamera->unk_15A; func_80043B60(camera); - - if (camera->player != NULL) - { + + if (camera->player != NULL) { func_8002EF14(&camera->unk_94, &camera->player->actor); camera->unk_E4.x = camera->unk_50.x - camera->unk_94.pos.x; camera->unk_E4.y = camera->unk_50.y - camera->unk_94.pos.y; @@ -1167,39 +1054,40 @@ s32 func_8005AE64(Camera *camera, Camera *otherCamera) return 1; } -s32 func_8005AFA8() -{ +s32 func_8005AFA8() { return D_8011D394; } -Vec3f *func_8005AFB4(Vec3f *dst, Camera *camera) -{ +Vec3f* func_8005AFB4(Vec3f* dst, Camera* camera) { *dst = camera->unk_80; return dst; } -void Camera_SetCameraData(Camera *camera, s16 b, s32 c, s32 d, s16 e, s16 f) // Unused -{ - if (b & 0x1) +// Unused +void Camera_SetCameraData(Camera* camera, s16 b, s32 c, s32 d, s16 e, s16 f) { + if (b & 0x1) { camera->unk_124 = c; - - if (b & 0x2) + } + + if (b & 0x2) { camera->unk_128 = d; - - if (b & 0x4) + } + + if (b & 0x4) { camera->unk_12C = e; - - if (b & 0x8) + } + + if (b & 0x8) { camera->unk_12E = f; - - if (b & 0x10) + } + + if (b & 0x10) { osSyncPrintf(VT_COL(RED, WHITE) "camera: setCameraData: last argument not alive!\n" VT_RST, b); + } } -s32 func_8005B044() -{ - if (QREG(0) == 0) - { +s32 func_8005B044() { + if (QREG(0) == 0) { QREG(2) = 1; QREG(10) = -1; QREG(11) = 100; @@ -1228,25 +1116,22 @@ s32 func_8005B044() QREG(57) = 30; QREG(58) = 0; } - + QREG(65) = 50; return 1; } -s32 func_8005B198() -{ +s32 func_8005B198() { return D_8011D3AC; } -s16 func_8005B1A4(Camera *camera) -{ +s16 func_8005B1A4(Camera* camera) { camera->unk_14C |= 0x8; - - if ((camera->unk_164 == 0) && (camera->globalCtx->cameraCtx.unk_5C0 != 0)) - { + + if ((camera->unk_164 == 0) && (camera->globalCtx->cameraCtx.unk_5C0 != 0)) { camera->globalCtx->cameraCtx.activeCameraPtrs[camera->globalCtx->cameraCtx.unk_5C0]->unk_14C |= 0x8; return camera->globalCtx->cameraCtx.unk_5C0; } - + return camera->unk_164; } diff --git a/src/code/z_cheap_proc.c b/src/code/z_cheap_proc.c new file mode 100644 index 0000000000..3b83d1b71d --- /dev/null +++ b/src/code/z_cheap_proc.c @@ -0,0 +1,30 @@ +#include +#include + +void Gfx_DrawDListOpa(GlobalContext* globalCtx, u32 dlist) { + GraphicsContext* gfxCtx = globalCtx->state.gfxCtx; + Gfx* dispRefs[4]; + + Graph_OpenDisps(dispRefs, globalCtx->state.gfxCtx, "../z_cheap_proc.c", 214); + + func_80093D18(globalCtx->state.gfxCtx); + gSPMatrix(gfxCtx->polyOpa.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_cheap_proc.c", 216), + G_MTX_MODELVIEW | G_MTX_LOAD); + gSPDisplayList(gfxCtx->polyOpa.p++, dlist); + + Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_cheap_proc.c", 219); +} + +void Gfx_DrawDListXlu(GlobalContext* globalCtx, u32 dlist) { + GraphicsContext* gfxCtx = globalCtx->state.gfxCtx; + Gfx* dispRefs[4]; + + Graph_OpenDisps(dispRefs, globalCtx->state.gfxCtx, "../z_cheap_proc.c", 228); + + func_80093D84(globalCtx->state.gfxCtx); + gSPMatrix(gfxCtx->polyXlu.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_cheap_proc.c", 230), + G_MTX_MODELVIEW | G_MTX_LOAD); + gSPDisplayList(gfxCtx->polyXlu.p++, dlist); + + Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_cheap_proc.c", 233); +} diff --git a/src/code/z_collision_check.c b/src/code/z_collision_check.c index 116059b18c..b8a70550db 100644 --- a/src/code/z_collision_check.c +++ b/src/code/z_collision_check.c @@ -7,15 +7,13 @@ #pragma GLOBAL_ASM("asm/non_matchings/code/z_collision_check/func_8005B65C.s") -s32 func_8005B6A0(GlobalContext* globalCtx, Collider* collision) -{ +s32 func_8005B6A0(GlobalContext* globalCtx, Collider* collision) { return 1; } #pragma GLOBAL_ASM("asm/non_matchings/code/z_collision_check/func_8005B6B0.s") -s32 func_8005B6EC(GlobalContext* globalCtx, Collider* collision, Actor* actor, ColliderBodyInfo* src) -{ +s32 func_8005B6EC(GlobalContext* globalCtx, Collider* collision, Actor* actor, ColliderBodyInfo* src) { collision->actor = actor; collision->unk_14 = src->unk_00; collision->colliderFlags = src->colliderFlags; @@ -26,8 +24,7 @@ s32 func_8005B6EC(GlobalContext* globalCtx, Collider* collision, Actor* actor, C return 1; } -s32 func_8005B72C(GlobalContext* globalCtx, Collider* collision, Actor* actor, ColliderBodyInfo* src) -{ +s32 func_8005B72C(GlobalContext* globalCtx, Collider* collision, Actor* actor, ColliderBodyInfo* src) { collision->actor = actor; collision->unk_14 = src->unk_00; collision->colliderFlags = src->colliderFlags; @@ -38,20 +35,17 @@ s32 func_8005B72C(GlobalContext* globalCtx, Collider* collision, Actor* actor, C return 1; } -void func_8005B76C(GlobalContext* globalCtx, Collider* collision) -{ +void func_8005B76C(GlobalContext* globalCtx, Collider* collision) { collision->at = NULL; collision->colliderFlags &= ~0x6; } -void func_8005B784(GlobalContext* globalCtx, Collider* collision) -{ +void func_8005B784(GlobalContext* globalCtx, Collider* collision) { collision->ac = NULL; collision->collideFlags &= ~0x82; } -void func_8005B79C(GlobalContext* globalCtx, Collider* collision) -{ +void func_8005B79C(GlobalContext* globalCtx, Collider* collision) { collision->ot = NULL; collision->maskA &= ~0x2; collision->maskB &= ~0x1; @@ -59,22 +53,18 @@ void func_8005B79C(GlobalContext* globalCtx, Collider* collision) #pragma GLOBAL_ASM("asm/non_matchings/code/z_collision_check/func_8005B7C0.s") -s32 func_8005B7E4(GlobalContext* globalCtx, ColliderTouch* touch) -{ +s32 func_8005B7E4(GlobalContext* globalCtx, ColliderTouch* touch) { return 1; } #pragma GLOBAL_ASM("asm/non_matchings/code/z_collision_check/func_8005B7F4.s") -void func_8005B818(GlobalContext* globalCtx, ColliderBody* body) -{ - +void func_8005B818(GlobalContext* globalCtx, ColliderBody* body) { } #pragma GLOBAL_ASM("asm/non_matchings/code/z_collision_check/func_8005B824.s") -s32 func_8005B850(GlobalContext* globalCtx, ColliderBump* bump) -{ +s32 func_8005B850(GlobalContext* globalCtx, ColliderBump* bump) { return 1; } @@ -82,15 +72,13 @@ s32 func_8005B850(GlobalContext* globalCtx, ColliderBump* bump) #pragma GLOBAL_ASM("asm/non_matchings/code/z_collision_check/func_8005B884.s") -s32 func_8005B904(GlobalContext* globalCtx, ColliderBody* body) -{ +s32 func_8005B904(GlobalContext* globalCtx, ColliderBody* body) { func_8005B7E4(globalCtx, &body->toucher); func_8005B850(globalCtx, &body->bumper); return 1; } -s32 func_8005B93C(GlobalContext* globalCtx, ColliderBody* body, ColliderBodyInfoInner* bodyInfoInner) -{ +s32 func_8005B93C(GlobalContext* globalCtx, ColliderBody* body, ColliderBodyInfoInner* bodyInfoInner) { body->flags = bodyInfoInner->bodyFlags; func_8005B7F4(globalCtx, &body->toucher, &bodyInfoInner->toucherMask); func_8005B860(globalCtx, &body->bumper, &bodyInfoInner->bumperMask); @@ -100,8 +88,7 @@ s32 func_8005B93C(GlobalContext* globalCtx, ColliderBody* body, ColliderBodyInfo return 1; } -void func_8005B9B0(GlobalContext* globalCtx, ColliderBody* body) -{ +void func_8005B9B0(GlobalContext* globalCtx, ColliderBody* body) { body->unk_18 = 0; body->unk_20 = 0; body->toucherFlags &= ~0x2; @@ -109,8 +96,7 @@ void func_8005B9B0(GlobalContext* globalCtx, ColliderBody* body) func_8005B818(globalCtx, body); } -void func_8005B9E8(GlobalContext* globalCtx, ColliderBody* body) -{ +void func_8005B9E8(GlobalContext* globalCtx, ColliderBody* body) { body->bumper.unk_0A = 0; body->bumperFlags &= ~0x2; body->bumperFlags &= ~0x80; @@ -120,15 +106,13 @@ void func_8005B9E8(GlobalContext* globalCtx, ColliderBody* body) body->bumper.unk_06 = body->bumper.unk_0A; } -void func_8005BA1C(GlobalContext* globalCtx, ColliderBody* body) -{ +void func_8005BA1C(GlobalContext* globalCtx, ColliderBody* body) { body->flags2 &= ~0x2; } #pragma GLOBAL_ASM("asm/non_matchings/code/z_collision_check/func_8005BA30.s") -s32 func_8005BA74(UNK_TYPE arg0, UNK_TYPE arg1) -{ +s32 func_8005BA74(UNK_TYPE arg0, UNK_TYPE arg1) { return 1; } @@ -158,73 +142,64 @@ s32 func_8005BA74(UNK_TYPE arg0, UNK_TYPE arg1) #pragma GLOBAL_ASM("asm/non_matchings/code/z_collision_check/func_8005C2BC.s") -s32 func_8005C318(GlobalContext* globalCtx, ColliderDimensions* dim) -{ +s32 func_8005C318(GlobalContext* globalCtx, ColliderDimensions* dim) { return 1; } -s32 func_8005C328(GlobalContext* globalCtx, ColliderDimensions* dest, ColliderDimensions* src) -{ +s32 func_8005C328(GlobalContext* globalCtx, ColliderDimensions* dest, ColliderDimensions* src) { *dest = *src; return 1; } -s32 ActorCollider_AllocCylinder(GlobalContext* globalCtx, ColliderCylinderMain* collision) -{ +s32 ActorCollider_AllocCylinder(GlobalContext* globalCtx, ColliderCylinderMain* collision) { func_8005B65C(globalCtx, &collision->base); func_8005B884(globalCtx, &collision->body); func_8005C2BC(globalCtx, &collision->dim); return 1; } -s32 ActorCollider_FreeCylinder(GlobalContext* globalCtx, ColliderCylinderMain* collision) -{ +s32 ActorCollider_FreeCylinder(GlobalContext* globalCtx, ColliderCylinderMain* collision) { func_8005B6A0(globalCtx, &collision->base); func_8005B904(globalCtx, &collision->body); func_8005C318(globalCtx, &collision->dim); return 1; } -s32 func_8005C3F4(GlobalContext* globalCtx, ColliderCylinderMain* collision, ColliderCylinderInit* src) -{ +s32 func_8005C3F4(GlobalContext* globalCtx, ColliderCylinderMain* collision, ColliderCylinderInit* src) { func_8005B6B0(globalCtx, &collision->base, &src->body); func_8005B93C(globalCtx, &collision->body, &src->inner); func_8005C328(globalCtx, &collision->dim, &src->dim); return 1; } -s32 func_8005C450(GlobalContext* globalCtx, ColliderCylinderMain* collision, Actor* actor, ColliderCylinderInit* src) -{ +s32 func_8005C450(GlobalContext* globalCtx, ColliderCylinderMain* collision, Actor* actor, ColliderCylinderInit* src) { func_8005B6EC(globalCtx, &collision->base, actor, &src->body); func_8005B93C(globalCtx, &collision->body, &src->inner); func_8005C328(globalCtx, &collision->dim, &src->dim); return 1; } -s32 ActorCollider_InitCylinder(GlobalContext* globalCtx, ColliderCylinderMain* collision, Actor* actor, ColliderCylinderInit* src) -{ +s32 ActorCollider_InitCylinder(GlobalContext* globalCtx, ColliderCylinderMain* collision, Actor* actor, + ColliderCylinderInit* src) { func_8005B72C(globalCtx, &collision->base, actor, &src->body); func_8005B93C(globalCtx, &collision->body, &src->inner); func_8005C328(globalCtx, &collision->dim, &src->dim); return 1; } -s32 func_8005C508(GlobalContext* globalCtx, ColliderCylinderMain* collision) -{ +s32 func_8005C508(GlobalContext* globalCtx, ColliderCylinderMain* collision) { func_8005B76C(globalCtx, &collision->base); func_8005B9B0(globalCtx, &collision->body); return 1; } -s32 func_8005C540(GlobalContext* globalCtx, ColliderCylinderMain* collision) -{ +s32 func_8005C540(GlobalContext* globalCtx, ColliderCylinderMain* collision) { func_8005B784(globalCtx, &collision->base); func_8005B9E8(globalCtx, &collision->body); return 1; } -s32 func_8005C578(GlobalContext* globalCtx, ColliderCylinderMain* collision) -{ +s32 func_8005C578(GlobalContext* globalCtx, ColliderCylinderMain* collision) { func_8005B79C(globalCtx, &collision->base); func_8005BA1C(globalCtx, &collision->body); return 1; @@ -232,8 +207,7 @@ s32 func_8005C578(GlobalContext* globalCtx, ColliderCylinderMain* collision) #pragma GLOBAL_ASM("asm/non_matchings/code/z_collision_check/func_8005C5B0.s") -s32 func_8005C5F8(UNK_TYPE arg0, UNK_TYPE arg1) -{ +s32 func_8005C5F8(UNK_TYPE arg0, UNK_TYPE arg1) { return 1; } @@ -269,55 +243,48 @@ s32 func_8005CEB4(GlobalContext* globalCtx, ColliderDimensions* dim) { #pragma GLOBAL_ASM("asm/non_matchings/code/z_collision_check/func_8005CF90.s") -s32 func_8005D018(GlobalContext* globalCtx, ColliderCylinderMain* collision) -{ +s32 func_8005D018(GlobalContext* globalCtx, ColliderCylinderMain* collision) { func_8005B65C(globalCtx, &collision->base); func_8005B884(globalCtx, &collision->body); func_8005CE6C(globalCtx, &collision->dim); return 1; } -s32 func_8005D060(GlobalContext* globalCtx, ColliderCylinderMain* collision) -{ +s32 func_8005D060(GlobalContext* globalCtx, ColliderCylinderMain* collision) { func_8005B6A0(globalCtx, &collision->base); func_8005B904(globalCtx, &collision->body); func_8005CEB4(globalCtx, &collision->dim); return 1; } -s32 func_8005D0A8(GlobalContext* globalCtx, ColliderCylinderMain* collision, Actor* actor, ColliderCylinderInit* src) -{ +s32 func_8005D0A8(GlobalContext* globalCtx, ColliderCylinderMain* collision, Actor* actor, ColliderCylinderInit* src) { func_8005B6EC(globalCtx, &collision->base, actor, &src->body); func_8005B93C(globalCtx, &collision->body, &src->inner); func_8005CF90(globalCtx, &collision->dim, &src->dim); return 1; } -s32 func_8005D104(GlobalContext* globalCtx, ColliderCylinderMain* collision, Actor* actor, ColliderCylinderInit* src) -{ +s32 func_8005D104(GlobalContext* globalCtx, ColliderCylinderMain* collision, Actor* actor, ColliderCylinderInit* src) { func_8005B72C(globalCtx, &collision->base, actor, &src->body); func_8005B93C(globalCtx, &collision->body, &src->inner); func_8005CF90(globalCtx, &collision->dim, &src->dim); return 1; } -s32 func_8005D160(GlobalContext* globalCtx, ColliderCylinderMain* collision) -{ +s32 func_8005D160(GlobalContext* globalCtx, ColliderCylinderMain* collision) { func_8005B76C(globalCtx, &collision->base); func_8005B9B0(globalCtx, &collision->body); func_8005CEC4(globalCtx, &collision->dim); return 1; } -s32 func_8005D1A8(GlobalContext* globalCtx, ColliderCylinderMain* collision) -{ +s32 func_8005D1A8(GlobalContext* globalCtx, ColliderCylinderMain* collision) { func_8005B784(globalCtx, &collision->base); func_8005B9E8(globalCtx, &collision->body); return 1; } -s32 func_8005D1E0(GlobalContext* globalCtx, ColliderCylinderMain* collision) -{ +s32 func_8005D1E0(GlobalContext* globalCtx, ColliderCylinderMain* collision) { func_8005B79C(globalCtx, &collision->base); func_8005BA1C(globalCtx, &collision->body); return 1; @@ -331,9 +298,7 @@ s32 func_8005D1E0(GlobalContext* globalCtx, ColliderCylinderMain* collision) #pragma GLOBAL_ASM("asm/non_matchings/code/z_collision_check/func_8005D3BC.s") -void func_8005D400(UNK_TYPE arg0, UNK_TYPE arg1) -{ - +void func_8005D400(UNK_TYPE arg0, UNK_TYPE arg1) { } #pragma GLOBAL_ASM("asm/non_matchings/code/z_collision_check/func_8005D40C.s") diff --git a/src/code/z_common_data.c b/src/code/z_common_data.c index 63802a7427..cb57394771 100644 --- a/src/code/z_common_data.c +++ b/src/code/z_common_data.c @@ -1,8 +1,7 @@ #include #include -void SaveContext_Init(void) -{ +void SaveContext_Init(void) { bzero(&gSaveContext, sizeof(gSaveContext)); D_8015FA88 = 0; D_8015FA8C = 0; @@ -14,8 +13,7 @@ void SaveContext_Init(void) gSaveContext.chamber_cutscene_num = 0; gSaveContext.next_day_time = 0xFFFF; gSaveContext.environment_time = 0; - gSaveContext.unk_141C = 1; + gSaveContext.dogIsLost = 1; gSaveContext.transition_type = 0xFF; gSaveContext.unk_13EE = 50; } - diff --git a/src/code/z_construct.c b/src/code/z_construct.c index 5555ed40f2..d14e6ef8c3 100644 --- a/src/code/z_construct.c +++ b/src/code/z_construct.c @@ -1,15 +1,13 @@ -#include +#include #include -void func_80110990(GlobalContext* globalCtx) -{ +void func_80110990(GlobalContext* globalCtx) { func_80080F44(globalCtx); } #ifdef NON_MATCHING // regalloc, stack usage and minor ordering differences -void func_801109B0(GlobalContext* globalCtx) -{ +void func_801109B0(GlobalContext* globalCtx) { InterfaceContext* interfaceCtx = &globalCtx->interfaceCtx; s32 parameterStart; s32 parameterSize; @@ -32,9 +30,9 @@ void func_801109B0(GlobalContext* globalCtx) interfaceCtx->unk_228 = XREG(95); interfaceCtx->minimapAlpha = 0; interfaceCtx->unk_260 = 0; - interfaceCtx->unk_244 = interfaceCtx->aAlpha = interfaceCtx->bAlpha = - interfaceCtx->cLeftAlpha = interfaceCtx->cDownAlpha = interfaceCtx->cRightAlpha = - interfaceCtx->healthAlpha = interfaceCtx->startAlpha = interfaceCtx->magicAlpha = 0; + interfaceCtx->unk_244 = interfaceCtx->aAlpha = interfaceCtx->bAlpha = interfaceCtx->cLeftAlpha = + interfaceCtx->cDownAlpha = interfaceCtx->cRightAlpha = interfaceCtx->healthAlpha = interfaceCtx->startAlpha = + interfaceCtx->magicAlpha = 0; parameterStart = _parameter_staticSegmentRomStart; parameterSize = _parameter_staticSegmentRomEnd - parameterStart; @@ -46,9 +44,10 @@ void func_801109B0(GlobalContext* globalCtx) osSyncPrintf("parameter->parameterSegment=%x", interfaceCtx->parameterSegment); - if (interfaceCtx->parameterSegment == NULL) + if (interfaceCtx->parameterSegment == NULL) { __assert("parameter->parameterSegment != NULL", "../z_construct.c", 161); - + } + DmaMgr_SendRequest1(interfaceCtx->parameterSegment, parameterStart, parameterSize, "../z_construct.c", 162); interfaceCtx->do_actionSegment = Game_Alloc(&globalCtx->state, 0x480, "../z_construct.c", 166); @@ -57,28 +56,33 @@ void func_801109B0(GlobalContext* globalCtx) osSyncPrintf("ＤＯアクション テクスチャ初期=%x\n", 0x480); osSyncPrintf("parameter->do_actionSegment=%x", interfaceCtx->do_actionSegment); - if (interfaceCtx->do_actionSegment == NULL) + if (interfaceCtx->do_actionSegment == NULL) { __assert("parameter->do_actionSegment != NULL", "../z_construct.c", 169); + } do_actionStart = _do_action_staticSegmentRomStart; - if (gSaveContext.language == 0) + if (gSaveContext.language == 0) { do_actionOffset = 0; - else if (gSaveContext.language == 1) + } else if (gSaveContext.language == 1) { do_actionOffset = 0x2B80; - else + } else { do_actionOffset = 0x5700; + } - DmaMgr_SendRequest1(interfaceCtx->do_actionSegment, do_actionStart + do_actionOffset, 0x300, "../z_construct.c", 174); + DmaMgr_SendRequest1(interfaceCtx->do_actionSegment, do_actionStart + do_actionOffset, 0x300, "../z_construct.c", + 174); - if (gSaveContext.language == 0) + if (gSaveContext.language == 0) { do_actionOffset = 0x480; - else if (gSaveContext.language == 1) + } else if (gSaveContext.language == 1) { do_actionOffset = 0x3000; - else + } else { do_actionOffset = 0x5B80; + } - DmaMgr_SendRequest1((void*)((u32)interfaceCtx->do_actionSegment + 0x300), do_actionStart + do_actionOffset, 0x180, "../z_construct.c", 178); + DmaMgr_SendRequest1((void*)((u32)interfaceCtx->do_actionSegment + 0x300), do_actionStart + do_actionOffset, 0x180, + "../z_construct.c", 178); interfaceCtx->icon_itemSegment = Game_Alloc(&globalCtx->state, 0x4000, "../z_construct.c", 190); @@ -86,69 +90,72 @@ void func_801109B0(GlobalContext* globalCtx) osSyncPrintf("アイコンアイテム テクスチャ初期=%x\n", 0x4000); osSyncPrintf("parameter->icon_itemSegment=%x\n", interfaceCtx->icon_itemSegment); - if (interfaceCtx->icon_itemSegment == NULL) + if (interfaceCtx->icon_itemSegment == NULL) { __assert("parameter->icon_itemSegment != NULL", "../z_construct.c", 193); + } - osSyncPrintf("Register_Item[%x, %x, %x, %x]\n", - gSaveContext.equips.button_items[0], gSaveContext.equips.button_items[1], - gSaveContext.equips.button_items[2], gSaveContext.equips.button_items[3]); + osSyncPrintf("Register_Item[%x, %x, %x, %x]\n", gSaveContext.equips.button_items[0], + gSaveContext.equips.button_items[1], gSaveContext.equips.button_items[2], + gSaveContext.equips.button_items[3]); - if (gSaveContext.equips.button_items[0] < 0xF0) + if (gSaveContext.equips.button_items[0] < 0xF0) { DmaMgr_SendRequest1(interfaceCtx->icon_itemSegment, - _icon_item_staticSegmentRomStart + gSaveContext.equips.button_items[0] * 0x80, - 0x1000, "../z_construct.c", 198); - else if (gSaveContext.equips.button_items[0] != 0xFF) + _icon_item_staticSegmentRomStart + gSaveContext.equips.button_items[0] * 0x80, 0x1000, + "../z_construct.c", 198); + } else if (gSaveContext.equips.button_items[0] != 0xFF) { DmaMgr_SendRequest1(interfaceCtx->icon_itemSegment, - _icon_item_staticSegmentRomStart + gSaveContext.equips.button_items[0] * 0x80, - 0x1000, "../z_construct.c", 203); + _icon_item_staticSegmentRomStart + gSaveContext.equips.button_items[0] * 0x80, 0x1000, + "../z_construct.c", 203); + } - if (gSaveContext.equips.button_items[1] < 0xF0) + if (gSaveContext.equips.button_items[1] < 0xF0) { DmaMgr_SendRequest1((void*)((u32)interfaceCtx->icon_itemSegment + 0x1000), - _icon_item_staticSegmentRomStart + gSaveContext.equips.button_items[1] * 0x80, - 0x1000, "../z_construct.c", 209); + _icon_item_staticSegmentRomStart + gSaveContext.equips.button_items[1] * 0x80, 0x1000, + "../z_construct.c", 209); + } - if (gSaveContext.equips.button_items[2] < 0xF0) + if (gSaveContext.equips.button_items[2] < 0xF0) { DmaMgr_SendRequest1((void*)((u32)interfaceCtx->icon_itemSegment + 0x2000), - _icon_item_staticSegmentRomStart + gSaveContext.equips.button_items[2] * 0x80, - 0x1000, "../z_construct.c", 214); + _icon_item_staticSegmentRomStart + gSaveContext.equips.button_items[2] * 0x80, 0x1000, + "../z_construct.c", 214); + } - if (gSaveContext.equips.button_items[3] < 0xF0) + if (gSaveContext.equips.button_items[3] < 0xF0) { DmaMgr_SendRequest1((void*)((u32)interfaceCtx->icon_itemSegment + 0x3000), - _icon_item_staticSegmentRomStart + gSaveContext.equips.button_items[3] * 0x80, - 0x1000, "../z_construct.c", 219); + _icon_item_staticSegmentRomStart + gSaveContext.equips.button_items[3] * 0x80, 0x1000, + "../z_construct.c", 219); + } osSyncPrintf("ＥＶＥＮＴ＝%d\n", gSaveContext.timer_1_state); - if ((gSaveContext.timer_1_state == 4) || (gSaveContext.timer_1_state == 8) || - (gSaveContext.timer_2_state == 4) || (gSaveContext.timer_2_state == 10)) - { + if ((gSaveContext.timer_1_state == 4) || (gSaveContext.timer_1_state == 8) || (gSaveContext.timer_2_state == 4) || + (gSaveContext.timer_2_state == 10)) { osSyncPrintf("restart_flag=%d\n", gSaveContext.respawn_flag); - if ((gSaveContext.respawn_flag == -1) || (gSaveContext.respawn_flag == 1)) - { - if (gSaveContext.timer_1_state == 4) - { + if ((gSaveContext.respawn_flag == -1) || (gSaveContext.respawn_flag == 1)) { + if (gSaveContext.timer_1_state == 4) { gSaveContext.timer_1_state = 1; gSaveContext.timer_x[0] = 140; gSaveContext.timer_y[0] = 80; } } - if ((gSaveContext.timer_1_state == 4) || (gSaveContext.timer_1_state == 8)) + if ((gSaveContext.timer_1_state == 4) || (gSaveContext.timer_1_state == 8)) { temp = 0; - else + } else { temp = 1; + } gSaveContext.timer_x[temp] = 26; - if (gSaveContext.health_capacity > 0xA0) + if (gSaveContext.health_capacity > 0xA0) { gSaveContext.timer_y[temp] = 54; - else + } else { gSaveContext.timer_y[temp] = 46; + } } - if ((gSaveContext.timer_1_state >= 11) && (gSaveContext.timer_1_state < 16)) - { + if ((gSaveContext.timer_1_state >= 11) && (gSaveContext.timer_1_state < 16)) { gSaveContext.timer_1_state = 0; // Translates to: "Timer Stop!!!!!!!!!!!!!!!!!!!!!!" osSyncPrintf("タイマー停止！！！！！！！！！！！！！！！！！！！！！ = %d\n", gSaveContext.timer_1_state); @@ -179,8 +186,7 @@ void func_801109B0(GlobalContext* globalCtx) #pragma GLOBAL_ASM("asm/non_matchings/code/z_construct/func_801109B0.s") #endif -void func_80110F68(GlobalContext* globalCtx) -{ +void func_80110F68(GlobalContext* globalCtx) { MessageContext* msgCtx = &globalCtx->msgCtx; s32 pad; @@ -202,16 +208,16 @@ void func_80110F68(GlobalContext* globalCtx) // Translates to: "Textbox game_alloc=%x" osSyncPrintf("吹き出しgame_alloc=%x\n", 0x2200); - if (msgCtx->textboxSegment == NULL) + if (msgCtx->textboxSegment == NULL) { __assert("message->fukidashiSegment != NULL", "../z_construct.c", 352); + } func_8006EF10(&globalCtx->msgCtx.unk_128); YREG(31) = 0; } -void func_80111070(void) -{ +void func_80111070(void) { YREG(8) = 0xA; YREG(14) = 0; YREG(15) = 0; @@ -526,8 +532,7 @@ void func_80111070(void) WREG(94) = 3; WREG(95) = 6; - if (gSaveContext.game_mode == 0) - { + if (gSaveContext.game_mode == 0) { VREG(0) = 0x34; VREG(1) = 0x24; VREG(2) = 0xD6; @@ -618,7 +623,6 @@ void func_80111070(void) VREG(92) = -0x3F; } -void func_80112098(GlobalContext* globalCtx) -{ +void func_80112098(GlobalContext* globalCtx) { func_80111070(); } diff --git a/src/code/z_debug.c b/src/code/z_debug.c index b5d078985c..adda7974bd 100644 --- a/src/code/z_debug.c +++ b/src/code/z_debug.c @@ -1,20 +1,249 @@ #include #include +#include -#pragma GLOBAL_ASM("asm/non_matchings/code/z_debug/func_800636C0.s") +typedef struct { + u8 x; + u8 y; + u8 colorId; + char text[0x15]; +} PrintTextBuffer; -void func_8006375C(UNK_TYPE arg0, UNK_TYPE arg1, UNK_TYPE arg2) -{ +typedef struct { + u16 push; + u16 held; +} InputCombo; +GameInfo* gGameInfo; +int D_8015FA94; // no known symbols +PrintTextBuffer D_8015FA98[0x16]; + +s16 D_8011E0B0 = 0; // PrintTextBuffer index +Color_RGBA8 printTextColors[] = { + { 0xFF, 0xFF, 0x20, 0xC0 }, { 0xFF, 0x96, 0x80, 0xC0 }, { 0x80, 0x60, 0x00, 0x40 }, { 0xC0, 0x80, 0x10, 0x80 }, + { 0xFF, 0xC0, 0x20, 0x80 }, { 0xE6, 0xE6, 0xDC, 0x40 }, { 0x80, 0x96, 0xFF, 0x80 }, { 0x80, 0xFF, 0x20, 0x80 }, +}; + +InputCombo inputCombos[REG_GROUPS] = { + { L_TRIG, U_CBUTTONS }, { L_TRIG, L_CBUTTONS }, { L_TRIG, D_CBUTTONS }, { L_TRIG, A_BUTTON }, + { R_TRIG, D_CBUTTONS }, { L_TRIG, R_CBUTTONS }, { L_TRIG, R_TRIG }, { L_TRIG, L_JPAD }, + { L_TRIG, R_JPAD }, { L_TRIG, U_JPAD }, { L_TRIG, B_BUTTON }, { L_TRIG, Z_TRIG }, + { L_TRIG, D_JPAD }, { R_TRIG, A_BUTTON }, { R_TRIG, B_BUTTON }, { R_TRIG, Z_TRIG }, + { R_TRIG, L_TRIG }, { R_TRIG, U_CBUTTONS }, { R_TRIG, R_CBUTTONS }, { R_TRIG, L_JPAD }, + { R_TRIG, L_CBUTTONS }, { R_TRIG, START_BUTTON }, { L_TRIG, START_BUTTON }, { R_TRIG, R_JPAD }, + { R_TRIG, U_JPAD }, { START_BUTTON, R_TRIG }, { START_BUTTON, A_BUTTON }, { START_BUTTON, B_BUTTON }, + { START_BUTTON, R_CBUTTONS }, +}; + +char regChar[] = " SOPQMYDUIZCNKXcsiWAVHGmnBdkb"; + +// initialize GameInfo +void func_800636C0() { + s32 i; + + gGameInfo = (GameInfo*)SystemArena_MallocDebug(sizeof(GameInfo), "../z_debug.c", 260); + gGameInfo->regPage = 0; + gGameInfo->regGroup = 0; + gGameInfo->regCur = 0; + gGameInfo->dpadLast = 0; + gGameInfo->repeat = 0; + for (i = 0; i < ARRAY_COUNT(gGameInfo->data); i++) { + gGameInfo->data[i] = 0; + } } -#pragma GLOBAL_ASM("asm/non_matchings/code/z_debug/func_8006376C.s") +// Called when free movement is active. +// 8011D394 to enable camera debugger +void func_8006375C(s32 arg0, s32 arg1, float* d_80855320) { +} -#pragma GLOBAL_ASM("asm/non_matchings/code/z_debug/func_80063828.s") +// Copy Camera Debugger Text +void func_8006376C(u8 x, u8 y, u8 colorId, const char* text) { + PrintTextBuffer* buf; + char* bufText; + s16 i; -#pragma GLOBAL_ASM("asm/non_matchings/code/z_debug/func_8006390C.s") + buf = &D_8015FA98[D_8011E0B0]; + if (D_8011E0B0 < 0x16) { + buf->x = x; + buf->y = y; + buf->colorId = colorId; -#pragma GLOBAL_ASM("asm/non_matchings/code/z_debug/func_80063C04.s") + i = 0; + bufText = buf->text; + while (*bufText++ = *text++) { + if (i++ > 0x14) { + break; + } + } -#pragma GLOBAL_ASM("asm/non_matchings/code/z_debug/func_80063D7C.s") + *bufText = '\0'; + D_8011E0B0++; + } +} +// Draw Text +void func_80063828(GfxPrint* gfxPrint) { + s32 i; + Color_RGBA8* color; + PrintTextBuffer* buffer; + char* text; + + i = 0; + if (D_8011E0B0 > 0) { + do { + buffer = &D_8015FA98[i]; + text = buffer->text; + + color = &printTextColors[buffer->colorId]; + GfxPrint_SetColor(gfxPrint, color->r, color->g, color->b, color->a); + GfxPrint_SetPos(gfxPrint, buffer->x, buffer->y); + GfxPrint_Printf(gfxPrint, "%s", text); + i += 1; + } while (i < D_8011E0B0); + } +} + +// Edit REG +void func_8006390C(Input* input) { + + s32 dpad; + s32 regGroup; + s32 increment; + InputCombo* input_combo; + s32 i; + + regGroup = (gGameInfo->regGroup * REG_PAGES + gGameInfo->regPage) * REG_PER_PAGE - REG_PER_PAGE; + dpad = input->raw.pad & 0xF00; + if (!~(input->raw.pad | ~L_TRIG) || !~(input->raw.pad | ~R_TRIG) || !~(input->raw.pad | ~START_BUTTON)) { + input_combo = inputCombos; + for (i = 0; i < REG_GROUPS; i++) { + if (~(~input_combo->push | input->raw.pad) || ~(~input_combo->held | input->padPressed)) { + input_combo++; + } else { + break; + } + } + + if (i < REG_GROUPS) { + if (i == gGameInfo->regGroup) { + gGameInfo->regPage = (gGameInfo->regPage + 1) % (REG_PAGES + 1); + return; + } + gGameInfo->regGroup = i; + gGameInfo->regPage = 0; + } + } else { + switch (gGameInfo->regPage - 1) { + case 0: + case 1: + case 2: + case 3: + case 4: + case 5: + + if (dpad == gGameInfo->dpadLast) { + gGameInfo->repeat--; + if (gGameInfo->repeat < 0) { + gGameInfo->repeat = 1; + } else { + dpad ^= gGameInfo->dpadLast; + } + } else { + gGameInfo->repeat = 0x10; + gGameInfo->dpadLast = dpad; + } + + increment = (dpad & R_JPAD) + ? (!~(input->raw.pad | ~(A_BUTTON | B_BUTTON)) + ? 1000 + : !~(input->raw.pad | ~A_BUTTON) ? 100 : !~(input->raw.pad | ~B_BUTTON) ? 10 : 1) + : (dpad & L_JPAD) ? (!~(input->raw.pad | ~(A_BUTTON | B_BUTTON)) + ? -1000 + : !~(input->raw.pad | ~A_BUTTON) + ? -100 + : !~(input->raw.pad | ~B_BUTTON) ? -10 : -1) + : 0; + + gGameInfo->data[gGameInfo->regCur + regGroup] += increment; + if (dpad & U_JPAD) { + gGameInfo->regCur--; + if (gGameInfo->regCur < 0) { + gGameInfo->regCur = REG_PER_PAGE - 1; + } + } else if (dpad & D_JPAD) { + gGameInfo->regCur++; + if (gGameInfo->regCur >= REG_PER_PAGE) { + gGameInfo->regCur = 0; + } + } + if (iREG(0)) { + iREG(0) = 0; + func_800AA000(0, iREG(1), iREG(2), iREG(3)); + } + } + } +} + +// Draw Memory Viewer +void func_80063C04(GfxPrint* gfxPrint) { + s32 i; + s32 page; + s32 regGroup; + s32 test; // removing affects stack + char name[3]; + + page = (gGameInfo->regPage * REG_PER_PAGE) - REG_PER_PAGE; + regGroup = (gGameInfo->regGroup * REG_PAGES + gGameInfo->regPage) * REG_PER_PAGE - REG_PER_PAGE; + + // set up register name string + name[0] = 'R'; + name[1] = regChar[gGameInfo->regGroup]; // r_group type char + name[2] = '\0'; + GfxPrint_SetColor(gfxPrint, 0, 0x80, 0x80, 0x80); + + for (i = 0; i != REG_PER_PAGE; i++) { + if (i == gGameInfo->regCur) { + GfxPrint_SetColor(gfxPrint, 0, 0xff, 0xff, 0xff); + } + GfxPrint_SetPos(gfxPrint, 3, i + 5); + GfxPrint_Printf(gfxPrint, "%s%02d%6d", &name, page + i, gGameInfo->data[i + regGroup]); + if (i == gGameInfo->regCur) { + GfxPrint_SetColor(gfxPrint, 0, 0x80, 0x80, 0x80); + } + } +} + +void func_80063D7C(GraphicsContext* gfxCtx) { + Gfx* sp7C; + Gfx* sp78; + Gfx* tempRet; + void* unk2[6]; + GfxPrint gfxPrint; + void* unk[2]; + Gfx* dispRefs[4]; // stores state of GfxCtx next ptrs + + Graph_OpenDisps(dispRefs, gfxCtx, "../z_debug.c", 628); + GfxPrint_Ctor(&gfxPrint); + sp78 = gfxCtx->polyOpa.p; + tempRet = Graph_GfxPlusOne(gfxCtx->polyOpa.p); + gSPDisplayList(gfxCtx->overlay.p++, tempRet); + GfxPrint_Open(&gfxPrint, tempRet); + + if ((OREG(0) == 1) || (OREG(0) == 8)) { + func_80063828(&gfxPrint); + } + + if (gGameInfo->regPage != 0) { + func_80063C04(&gfxPrint); + } + + D_8011E0B0 = 0; + sp7C = GfxPrint_Close(&gfxPrint); + gSPEndDisplayList(sp7C++); + Graph_BranchDlist(sp78, sp7C); + gfxCtx->polyOpa.p = sp7C; + if (0) {} + Graph_CloseDisps(dispRefs, gfxCtx, "../z_debug.c", 664); + GfxPrint_Dtor(&gfxPrint); +} diff --git a/src/code/z_debug_display.c b/src/code/z_debug_display.c index e961e9c742..914d70c890 100644 --- a/src/code/z_debug_display.c +++ b/src/code/z_debug_display.c @@ -1,25 +1,22 @@ #include #include -typedef struct -{ +typedef struct { /* 0x00 */ s16 drawType; // indicates which draw function to use when displaying the object - /* 0x04 */ u32 drawArg; // segment address (display list or texture) passed to the draw funciton when called -} DebugDispObjectInfo; // size = 0x8 + /* 0x04 */ u32 drawArg; // segment address (display list or texture) passed to the draw funciton when called +} DebugDispObjectInfo; // size = 0x8 typedef void (*DebugDispObject_DrawFunc)(DebugDispObject*, u32, GlobalContext*); static void DebugDisplay_DrawSpriteI8(DebugDispObject* dispObj, u32 texture, GlobalContext* globalCtx); static void DebugDisplay_DrawPolygon(DebugDispObject* dispObj, u32 dlist, GlobalContext* globalCtx); -static DebugDispObject_DrawFunc sDebugObjectDrawFuncTable[] = -{ +static DebugDispObject_DrawFunc sDebugObjectDrawFuncTable[] = { DebugDisplay_DrawSpriteI8, DebugDisplay_DrawPolygon, }; -static DebugDispObjectInfo sDebugObjectInfoTable[] = -{ +static DebugDispObjectInfo sDebugObjectInfoTable[] = { { 0, 0x040035F0 }, // Circle { 0, 0x040038F0 }, // Cross { 0, 0x040036F0 }, // Ball @@ -32,15 +29,13 @@ static Lights1 sDebugObjectLights = gdSPDefLights1(0x80, 0x80, 0x80, 0xFF, 0xFF, static DebugDispObject* sDebugObjectListHead; -void DebugDisplay_Init(void) -{ +void DebugDisplay_Init(void) { sDebugObjectListHead = NULL; } -DebugDispObject* DebugDisplay_AddObject(f32 posX, f32 posY, f32 posZ, s16 rotX, s16 rotY, s16 rotZ, - f32 scaleX, f32 scaleY, f32 scaleZ, u8 red, u8 green, u8 blue, u8 alpha, - s16 type, GraphicsContext* gfxCtx) -{ +DebugDispObject* DebugDisplay_AddObject(f32 posX, f32 posY, f32 posZ, s16 rotX, s16 rotY, s16 rotZ, f32 scaleX, + f32 scaleY, f32 scaleZ, u8 red, u8 green, u8 blue, u8 alpha, s16 type, + GraphicsContext* gfxCtx) { DebugDispObject* prevHead = sDebugObjectListHead; sDebugObjectListHead = Graph_Alloc(gfxCtx, sizeof(DebugDispObject)); @@ -64,25 +59,22 @@ DebugDispObject* DebugDisplay_AddObject(f32 posX, f32 posY, f32 posZ, s16 rotX, return sDebugObjectListHead; } -void DebugDisplay_DrawObjects(GlobalContext* globalCtx) -{ +void DebugDisplay_DrawObjects(GlobalContext* globalCtx) { DebugDispObject* dispObj = sDebugObjectListHead; DebugDispObjectInfo* objInfo; - while (dispObj != NULL) - { + while (dispObj != NULL) { objInfo = &sDebugObjectInfoTable[dispObj->type]; sDebugObjectDrawFuncTable[objInfo->drawType](dispObj, objInfo->drawArg, globalCtx); dispObj = dispObj->next; } } -static void DebugDisplay_DrawSpriteI8(DebugDispObject* dispObj, u32 texture, GlobalContext* globalCtx) -{ +static void DebugDisplay_DrawSpriteI8(DebugDispObject* dispObj, u32 texture, GlobalContext* globalCtx) { GraphicsContext* gfxCtx = globalCtx->state.gfxCtx; - Gfx* gfxArr[4]; + Gfx* dispRefs[4]; - func_800C6AC4(gfxArr, globalCtx->state.gfxCtx, "../z_debug_display.c", 169); + Graph_OpenDisps(dispRefs, globalCtx->state.gfxCtx, "../z_debug_display.c", 169); func_80094678(globalCtx->state.gfxCtx); @@ -91,30 +83,23 @@ static void DebugDisplay_DrawSpriteI8(DebugDispObject* dispObj, u32 texture, Glo 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_RotateXYZ(dispObj->rot.x, dispObj->rot.y, dispObj->rot.z, MTXMODE_APPLY); + Matrix_RotateZYX(dispObj->rot.x, dispObj->rot.y, dispObj->rot.z, MTXMODE_APPLY); - gDPLoadTextureBlock(gfxCtx->polyXlu.p++, - 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); + gDPLoadTextureBlock(gfxCtx->polyXlu.p++, 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(gfxCtx->polyXlu.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_debug_display.c", 189), G_MTX_MODELVIEW | G_MTX_LOAD); + gSPMatrix(gfxCtx->polyXlu.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_debug_display.c", 189), + G_MTX_MODELVIEW | G_MTX_LOAD); gSPDisplayList(gfxCtx->polyXlu.p++, &D_04004298); - func_800C6B54(gfxArr, globalCtx->state.gfxCtx, "../z_debug_display.c", 192); + Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_debug_display.c", 192); } -static void DebugDisplay_DrawPolygon(DebugDispObject* dispObj, u32 dlist, GlobalContext* globalCtx) -{ +static void DebugDisplay_DrawPolygon(DebugDispObject* dispObj, u32 dlist, GlobalContext* globalCtx) { GraphicsContext* gfxCtx = globalCtx->state.gfxCtx; - Gfx* gfxArr[4]; + Gfx* dispRefs[4]; - func_800C6AC4(gfxArr, globalCtx->state.gfxCtx, "../z_debug_display.c", 211); + Graph_OpenDisps(dispRefs, globalCtx->state.gfxCtx, "../z_debug_display.c", 211); func_8009435C(globalCtx->state.gfxCtx); gDPSetPrimColor(gfxCtx->polyXlu.p++, 0, 0, dispObj->color.r, dispObj->color.g, dispObj->color.b, dispObj->color.a); @@ -124,8 +109,9 @@ static void DebugDisplay_DrawPolygon(DebugDispObject* dispObj, u32 dlist, Global 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(gfxCtx->polyXlu.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_debug_display.c", 228), G_MTX_MODELVIEW | G_MTX_LOAD); + gSPMatrix(gfxCtx->polyXlu.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_debug_display.c", 228), + G_MTX_MODELVIEW | G_MTX_LOAD); gSPDisplayList(gfxCtx->polyXlu.p++, dlist); - func_800C6B54(gfxArr, globalCtx->state.gfxCtx, "../z_debug_display.c", 231); + Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_debug_display.c", 231); } diff --git a/src/code/z_demo.c b/src/code/z_demo.c index c24ab06ade..c2cad22064 100644 --- a/src/code/z_demo.c +++ b/src/code/z_demo.c @@ -13,70 +13,34 @@ void func_80068C3C(GlobalContext* globalCtx, CutsceneContext* csCtx); void func_80068D84(GlobalContext* globalCtx, CutsceneContext* csCtx); void func_80068DC0(GlobalContext* globalCtx, CutsceneContext* csCtx); -CutsceneStateHandler sCsStateHandlers1[] = -{ - func_80064720, - func_80064760, - func_80064720, - func_80068D84, - func_80064720, +CutsceneStateHandler sCsStateHandlers1[] = { + func_80064720, func_80064760, func_80064720, func_80068D84, func_80064720, }; -CutsceneStateHandler sCsStateHandlers2[] = -{ - func_80064720, - func_800647C0, - func_80068C3C, - func_80068DC0, - func_80068C3C, +CutsceneStateHandler sCsStateHandlers2[] = { + func_80064720, func_800647C0, func_80068C3C, func_80068DC0, func_80068C3C, }; u8 sTitleCsState = 0; // TODO: use symbols for these cutscene locations once scenes and rooms are in C -EntranceCutscene sEntranceCutsceneTable[] = -{ - { 0x0185, 2, 0xA0, 0x02013AA0 }, - { 0x013D, 2, 0xA1, 0x02007EA0 }, - { 0x00DB, 2, 0xA3, 0x0200A540 }, - { 0x0108, 2, 0xA4, 0x02003D70 }, - { 0x0138, 1, 0xA5, 0x02003F40 }, - { 0x014D, 2, 0xA6, 0x02008400 }, - { 0x0053, 2, 0xA7, 0x0200CE00 }, - { 0x0000, 2, 0xA8, 0x0200B650 }, - { 0x028A, 0, 0x18, 0x0200F9E0 }, - { 0x0292, 0, 0x18, 0x0200FF00 }, - { 0x028E, 0, 0x18, 0x02010550 }, - { 0x0476, 0, 0x18, 0x02010B30 }, - { 0x050F, 1, 0xA9, 0x0200BB80 }, - { 0x0102, 2, 0xB1, 0x02007A30 }, - { 0x0117, 2, 0xB2, 0x020031E0 }, - { 0x0129, 2, 0xB3, 0x02006490 }, - { 0x0157, 2, 0xB4, 0x02005BD0 }, - { 0x0028, 2, 0xB5, 0x02015600 }, - { 0x00E4, 2, 0xB6, 0x020070C0 }, - { 0x0225, 2, 0xB7, 0x02004A80 }, - { 0x0123, 2, 0xB8, 0x02007990 }, - { 0x0147, 2, 0xB9, 0x020076D0 }, - { 0x0138, 0, 0xBA, 0x02004280 }, - { 0x0574, 2, 0x5A, 0x020028E0 }, - { 0x0538, 2, 0xBB, 0x0201E790 }, - { 0x053C, 2, 0xBC, 0x0201EF70 }, - { 0x0540, 2, 0xBD, 0x02021380 }, - { 0x0544, 2, 0xBE, 0x0201E3E0 }, - { 0x0548, 2, 0xBF, 0x0201DF90 }, - { 0x054C, 2, 0xAD, 0x0201EB40 }, - { 0x008D, 0, 0xC0, 0x02002BB0 }, - { 0x03B4, 0, 0xC7, 0x020055C0 }, - { 0x0246, 2, 0xB9, 0x020076D0 }, +EntranceCutscene sEntranceCutsceneTable[] = { + { 0x0185, 2, 0xA0, 0x02013AA0 }, { 0x013D, 2, 0xA1, 0x02007EA0 }, { 0x00DB, 2, 0xA3, 0x0200A540 }, + { 0x0108, 2, 0xA4, 0x02003D70 }, { 0x0138, 1, 0xA5, 0x02003F40 }, { 0x014D, 2, 0xA6, 0x02008400 }, + { 0x0053, 2, 0xA7, 0x0200CE00 }, { 0x0000, 2, 0xA8, 0x0200B650 }, { 0x028A, 0, 0x18, 0x0200F9E0 }, + { 0x0292, 0, 0x18, 0x0200FF00 }, { 0x028E, 0, 0x18, 0x02010550 }, { 0x0476, 0, 0x18, 0x02010B30 }, + { 0x050F, 1, 0xA9, 0x0200BB80 }, { 0x0102, 2, 0xB1, 0x02007A30 }, { 0x0117, 2, 0xB2, 0x020031E0 }, + { 0x0129, 2, 0xB3, 0x02006490 }, { 0x0157, 2, 0xB4, 0x02005BD0 }, { 0x0028, 2, 0xB5, 0x02015600 }, + { 0x00E4, 2, 0xB6, 0x020070C0 }, { 0x0225, 2, 0xB7, 0x02004A80 }, { 0x0123, 2, 0xB8, 0x02007990 }, + { 0x0147, 2, 0xB9, 0x020076D0 }, { 0x0138, 0, 0xBA, 0x02004280 }, { 0x0574, 2, 0x5A, 0x020028E0 }, + { 0x0538, 2, 0xBB, 0x0201E790 }, { 0x053C, 2, 0xBC, 0x0201EF70 }, { 0x0540, 2, 0xBD, 0x02021380 }, + { 0x0544, 2, 0xBE, 0x0201E3E0 }, { 0x0548, 2, 0xBF, 0x0201DF90 }, { 0x054C, 2, 0xAD, 0x0201EB40 }, + { 0x008D, 0, 0xC0, 0x02002BB0 }, { 0x03B4, 0, 0xC7, 0x020055C0 }, { 0x0246, 2, 0xB9, 0x020076D0 }, { 0x05E8, 2, 0xC6, 0x0200C9D0 }, }; // Unused, seems to be an early list of dungeon entrance cutscene locations -u32 D_8011E304[] = -{ - 0x0200B650, 0x02015600, 0x02014F80, 0x02003F80, 0x02000330, 0x0201DA50 -}; +u32 D_8011E304[] = { 0x0200B650, 0x02015600, 0x02014F80, 0x02003F80, 0x02000330, 0x0201DA50 }; u16 D_8015FCC0; u16 D_8015FCC2; @@ -84,14 +48,13 @@ u16 D_8015FCC4; s16 D_8015FCC6; u8 D_8015FCC8; s16 D_8015FCCA; -u16 D_8015FCCC; // only written to, never read +u16 D_8015FCCC; // only written to, never read s8 D_8015FCD0[20]; // unreferenced -u8 D_8015FCE4; // only written to, never read +u8 D_8015FCE4; // only written to, never read void func_80068ECC(GlobalContext* globalCtx, CutsceneContext* csCtx); -void Cutscene_DrawDebugInfo(GlobalContext* globalCtx, Gfx** dlist, CutsceneContext* csCtx) -{ +void Cutscene_DrawDebugInfo(GlobalContext* globalCtx, Gfx** dlist, CutsceneContext* csCtx) { u8 pad[0x1C]; GfxPrint printer; u8 pad2[8]; @@ -110,65 +73,59 @@ void Cutscene_DrawDebugInfo(GlobalContext* globalCtx, Gfx** dlist, CutsceneConte GfxPrint_Dtor(&printer); } -void func_8006450C(GlobalContext* globalCtx, CutsceneContext* csCtx) -{ +void func_8006450C(GlobalContext* globalCtx, CutsceneContext* csCtx) { csCtx->state = CS_STATE_IDLE; csCtx->unk_0C = 0.0f; } -void func_80064520(GlobalContext* globalCtx, CutsceneContext* csCtx) -{ +void func_80064520(GlobalContext* globalCtx, CutsceneContext* csCtx) { csCtx->state = CS_STATE_SKIPPABLE_INIT; csCtx->linkAction = NULL; } -void func_80064534(GlobalContext* globalCtx, CutsceneContext* csCtx) -{ - if (csCtx->state != CS_STATE_UNSKIPPABLE_EXEC) +void func_80064534(GlobalContext* globalCtx, CutsceneContext* csCtx) { + if (csCtx->state != CS_STATE_UNSKIPPABLE_EXEC) { csCtx->state = CS_STATE_UNSKIPPABLE_INIT; + } } -void func_80064558(GlobalContext* globalCtx, CutsceneContext* csCtx) -{ - if (gSaveContext.cutscene_index < 0xFFF0) +void func_80064558(GlobalContext* globalCtx, CutsceneContext* csCtx) { + if (gSaveContext.cutscene_index < 0xFFF0) { sCsStateHandlers1[csCtx->state](globalCtx, csCtx); + } } #ifdef NON_MATCHING // minor ordering and regalloc differences -void func_800645A0(GlobalContext* globalCtx, CutsceneContext* csCtx) -{ +void func_800645A0(GlobalContext* globalCtx, CutsceneContext* csCtx) { CutsceneStateHandler handler; if (!~(globalCtx->state.input[0].padPressed | -0x201) && (csCtx->state == CS_STATE_IDLE) && - (gSaveContext.scene_setup_index >= 4)) - { + (gSaveContext.scene_setup_index >= 4)) { D_8015FCC8 = 0; gSaveContext.cutscene_index = 0xFFFD; gSaveContext.cutscene_trigger = 1; } if (!~(globalCtx->state.input[0].padPressed | -0x801) && (csCtx->state == CS_STATE_IDLE) && - (gSaveContext.scene_setup_index >= 4) && (D_8011D394 == 0)) - { + (gSaveContext.scene_setup_index >= 4) && (D_8011D394 == 0)) { D_8015FCC8 = 1; gSaveContext.cutscene_index = 0xFFFD; gSaveContext.cutscene_trigger = 1; } - if ((gSaveContext.cutscene_trigger != 0) && (globalCtx->sceneLoadFlag == 0x14)) + if ((gSaveContext.cutscene_trigger != 0) && (globalCtx->sceneLoadFlag == 0x14)) { gSaveContext.cutscene_trigger = 0; + } - if ((gSaveContext.cutscene_trigger != 0) && (csCtx->state == CS_STATE_IDLE)) - { + if ((gSaveContext.cutscene_trigger != 0) && (csCtx->state == CS_STATE_IDLE)) { // Translates to: "CUTSCENE START REQUEST ANNOUNCEMENT!" osSyncPrintf("\nデモ開始要求 発令！"); gSaveContext.cutscene_index = 0xFFFD; gSaveContext.cutscene_trigger = 1; } - if (gSaveContext.cutscene_index >= 0xFFF0) - { + if (gSaveContext.cutscene_index >= 0xFFF0) { func_80068ECC(globalCtx, csCtx); handler = sCsStateHandlers2[csCtx->state]; handler(globalCtx, csCtx); @@ -178,36 +135,29 @@ void func_800645A0(GlobalContext* globalCtx, CutsceneContext* csCtx) #pragma GLOBAL_ASM("asm/non_matchings/code/z_demo/func_800645A0.s") #endif -void func_80064720(GlobalContext* globalCtx, CutsceneContext* csCtx) -{ - +void func_80064720(GlobalContext* globalCtx, CutsceneContext* csCtx) { } -u32 func_8006472C(GlobalContext* globalCtx, CutsceneContext* csCtx, f32 target) -{ +u32 func_8006472C(GlobalContext* globalCtx, CutsceneContext* csCtx, f32 target) { return Math_ApproxF(&csCtx->unk_0C, target, 0.1f); } -void func_80064760(GlobalContext* globalCtx, CutsceneContext* csCtx) -{ +void func_80064760(GlobalContext* globalCtx, CutsceneContext* csCtx) { Interface_ChangeAlpha(1); func_800B3840(0x20); - if (func_8006472C(globalCtx, csCtx, 1.0f)) - { + if (func_8006472C(globalCtx, csCtx, 1.0f)) { func_800F68BC(1); csCtx->state++; } } -void func_800647C0(GlobalContext* globalCtx, CutsceneContext* csCtx) -{ +void func_800647C0(GlobalContext* globalCtx, CutsceneContext* csCtx) { func_80068C3C(globalCtx, csCtx); Interface_ChangeAlpha(1); func_800B3840(0x20); - if (func_8006472C(globalCtx, csCtx, 1.0f)) - { + if (func_8006472C(globalCtx, csCtx, 1.0f)) { func_800F68BC(1); csCtx->state++; } @@ -216,56 +166,53 @@ void func_800647C0(GlobalContext* globalCtx, CutsceneContext* csCtx) // Command 3: Misc. Actions #ifdef NON_MATCHING // regalloc and minor ordering differences -void func_80064824(GlobalContext* globalCtx, CutsceneContext* csCtx, CsCmdBase* cmd) -{ +void func_80064824(GlobalContext* globalCtx, CutsceneContext* csCtx, CsCmdBase* cmd) { Player* player = PLAYER; f32 temp; u8 sp3F; sp3F = 0; - if ((csCtx->frames < cmd->startFrame) || - (csCtx->frames >= cmd->endFrame) && (cmd->endFrame != cmd->startFrame)) + if ((csCtx->frames < cmd->startFrame) || (csCtx->frames >= cmd->endFrame) && (cmd->endFrame != cmd->startFrame)) { return; + } temp = func_8006F93C(cmd->endFrame - 1, cmd->startFrame, csCtx->frames); - if (csCtx->frames == cmd->startFrame) + if (csCtx->frames == cmd->startFrame) { sp3F = 1; + } - switch (cmd->base) - { + switch (cmd->base) { case 1: - if (sp3F != 0) - { + if (sp3F != 0) { func_800F6D58(0xE, 4, 0x3F); func_800F6D58(0xE, 1, 1); globalCtx->unk_10B12[0] = 0x14; } break; case 2: - if (sp3F != 0) - { + if (sp3F != 0) { func_800F6D58(0xF, 0, 0); func_800753C4(globalCtx, 3); D_8015FD70 = 1; } break; case 3: - if (sp3F != 0) - { + if (sp3F != 0) { func_8006C3D0(globalCtx, 0); - if (gSaveContext.entrance_index == 0x0053) + if (gSaveContext.entrance_index == 0x0053) { func_8006C3D0(globalCtx, 2); + } } break; case 6: - if (globalCtx->unk_10AC4 < 0x3200) + if (globalCtx->unk_10AC4 < 0x3200) { globalCtx->unk_10AC4 += 0x23; + } break; case 7: - if (sp3F != 0) - { + if (sp3F != 0) { globalCtx->unk_10A3D = 1; globalCtx->gloomySky = 1; globalCtx->unk_10A3C = 0; @@ -277,8 +224,9 @@ void func_80064824(GlobalContext* globalCtx, CutsceneContext* csCtx, CsCmdBase* } break; case 8: - if (globalCtx->unk_11D30[0] < 0x80) + if (globalCtx->unk_11D30[0] < 0x80) { globalCtx->unk_11D30[0] += 4; + } break; case 9: globalCtx->unk_10B12[3] = 0x10; @@ -287,55 +235,61 @@ void func_80064824(GlobalContext* globalCtx, CutsceneContext* csCtx, CsCmdBase* func_8006C3D0(globalCtx, 1); break; case 11: - if (globalCtx->unk_11D30[0] < 0x672) + if (globalCtx->unk_11D30[0] < 0x672) { globalCtx->unk_11D30[0] += 0x14; - if (csCtx->frames == 0x30F) + } + if (csCtx->frames == 0x30F) { func_80078884(NA_SE_EV_DEKU_DEATH); - else if (csCtx->frames == 0x2CD) + } else if (csCtx->frames == 0x2CD) { globalCtx->unk_11D30[0] = 0; + } break; case 12: - if (sp3F != 0) - { - if (csCtx->state != CS_STATE_UNSKIPPABLE_EXEC) + if (sp3F != 0) { + if (csCtx->state != CS_STATE_UNSKIPPABLE_EXEC) { csCtx->state = CS_STATE_UNSKIPPABLE_INIT; + } } break; case 13: - if (globalCtx->unk_11D30[1] == 0) + if (globalCtx->unk_11D30[1] == 0) { func_80078884(NA_SE_EV_TRIFORCE_FLASH); - if (globalCtx->unk_11D30[1] < 0xFF) + } + if (globalCtx->unk_11D30[1] < 0xFF) { globalCtx->unk_11D30[1] += 5; + } break; case 14: - if (sp3F != 0) + if (sp3F != 0) { func_800BC490(globalCtx, 1); + } break; case 15: - if (sp3F != 0) - TitleCard_InitPlaceName(globalCtx, &globalCtx->actorCtx.titleCtx, player->unk_1B0, - 0xA0, 0x78, 0x90, 0x18, 0x14); + if (sp3F != 0) { + TitleCard_InitPlaceName(globalCtx, &globalCtx->actorCtx.titleCtx, player->unk_1B0, 0xA0, 0x78, 0x90, + 0x18, 0x14); + } break; case 16: - if (sp3F != 0) - { - D_8015FCCA = func_80092F88(globalCtx->cameraCtx.activeCameraPtrs[globalCtx->cameraCtx.unk_5C0], 6); - func_80092DAC(D_8015FCCA, 0x7FFF); - func_80092E70(D_8015FCCA, 4, 0, 1000, 0); - func_80092DF0(D_8015FCCA, 800); + if (sp3F != 0) { + D_8015FCCA = Quake_Add(globalCtx->cameraCtx.activeCameraPtrs[globalCtx->cameraCtx.unk_5C0], 6); + Quake_SetSpeed(D_8015FCCA, 0x7FFF); + Quake_SetQuakeValues(D_8015FCCA, 4, 0, 1000, 0); + Quake_SetCountdown(D_8015FCCA, 800); } break; case 17: - if (sp3F != 0) - func_80092FAC(D_8015FCCA); + if (sp3F != 0) { + Quake_RemoveFromIdx(D_8015FCCA); + } break; case 18: globalCtx->unk_10B12[0] = 0; globalCtx->gloomySkyEvent = 2; - if (gSaveContext.day_time < 0x4AAB) + if (gSaveContext.day_time < 0x4AAB) { gSaveContext.day_time += 30; - if (globalCtx->unk_10B12[1] == 0) - { + } + if (globalCtx->unk_10B12[1] == 0) { D_8011FB30 = 0; func_800F6D58(14, 1, 0); } @@ -366,34 +320,30 @@ void func_80064824(GlobalContext* globalCtx, CutsceneContext* csCtx, CsCmdBase* break; case 25: gSaveContext.day_time += 30; - if ((gSaveContext.day_time & 0xFFFF) > 0xCAAA) + if ((gSaveContext.day_time & 0xFFFF) > 0xCAAA) { gSaveContext.day_time = 0xCAAA; + } break; case 26: - if ((gSaveContext.day_time < 0x3000) || (gSaveContext.day_time >= 0x4555)) - { - if ((gSaveContext.day_time >= 0x4555) && (gSaveContext.day_time < 0xAAAB)) + if ((gSaveContext.day_time < 0x3000) || (gSaveContext.day_time >= 0x4555)) { + if ((gSaveContext.day_time >= 0x4555) && (gSaveContext.day_time < 0xAAAB)) { globalCtx->unk_10AE3 = 1; - else if ((gSaveContext.day_time >= 0xAAAB) && (gSaveContext.day_time < 0xC556)) + } else if ((gSaveContext.day_time >= 0xAAAB) && (gSaveContext.day_time < 0xC556)) { globalCtx->unk_10AE3 = 2; - else + } else { globalCtx->unk_10AE3 = 3; + } } break; case 27: - if (globalCtx->state.frames & 8) - { - if (globalCtx->unk_10AB0[0] < 40) - { + if (globalCtx->state.frames & 8) { + if (globalCtx->unk_10AB0[0] < 40) { globalCtx->unk_10AB0[0] += 2; globalCtx->unk_10AB0[4] -= 3; globalCtx->unk_10AB0[5] -= 3; } - } - else - { - if (globalCtx->unk_10AB0[0] > 2) - { + } else { + if (globalCtx->unk_10AB0[0] > 2) { globalCtx->unk_10AB0[0] -= 2; globalCtx->unk_10AB0[4] += 3; globalCtx->unk_10AB0[5] += 3; @@ -413,18 +363,20 @@ void func_80064824(GlobalContext* globalCtx, CutsceneContext* csCtx, CsCmdBase* func_8006C3D0(globalCtx, 4); break; case 32: - if (sp3F != 0) + if (sp3F != 0) { globalCtx->unk_10B0A = 1; + } func_800788CC(0x20C0); break; case 33: gSaveContext.unk_1422 = 1; break; case 34: - if (!gSaveContext.night_flag) + if (!gSaveContext.night_flag) { gSaveContext.day_time -= D_8011FB40; - else + } else { gSaveContext.day_time -= D_8011FB40 * 2; + } break; case 35: func_800EE824(csCtx); @@ -437,62 +389,57 @@ void func_80064824(GlobalContext* globalCtx, CutsceneContext* csCtx, CsCmdBase* #endif // Command 4: Set Environment Lighting -void Cutscene_Command_SetLighting(GlobalContext* globalCtx, CutsceneContext* csCtx, CsCmdEnvLighting* cmd) -{ - if (csCtx->frames == cmd->startFrame) - { +void Cutscene_Command_SetLighting(GlobalContext* globalCtx, CutsceneContext* csCtx, CsCmdEnvLighting* cmd) { + if (csCtx->frames == cmd->startFrame) { globalCtx->unk_10AE3 = cmd->setting - 1; globalCtx->unk_10AFC = 1.0f; } } // Command 0x56: Play Background Music -void Cutscene_Command_PlayBGM(GlobalContext* globalCtx, CutsceneContext* csCtx, CsCmdMusicChange* cmd) -{ - if (csCtx->frames == cmd->startFrame) +void Cutscene_Command_PlayBGM(GlobalContext* globalCtx, CutsceneContext* csCtx, CsCmdMusicChange* cmd) { + if (csCtx->frames == cmd->startFrame) { func_800F595C(cmd->sequence - 1); + } } // Command 0x57: Stop Background Music -void Cutscene_Command_StopBGM(GlobalContext* globalCtx, CutsceneContext* csCtx, CsCmdMusicChange* cmd) -{ - if (csCtx->frames == cmd->startFrame) +void Cutscene_Command_StopBGM(GlobalContext* globalCtx, CutsceneContext* csCtx, CsCmdMusicChange* cmd) { + if (csCtx->frames == cmd->startFrame) { func_800F59E8(cmd->sequence - 1); + } } // Command 0x7C: Fade Background Music over duration -void Cutscene_Command_FadeBGM(GlobalContext* globalCtx, CutsceneContext* csCtx, CsCmdMusicFade* cmd) -{ +void Cutscene_Command_FadeBGM(GlobalContext* globalCtx, CutsceneContext* csCtx, CsCmdMusicFade* cmd) { u8 var1; - if ((csCtx->frames == cmd->startFrame) && (csCtx->frames < cmd->endFrame)) - { + if ((csCtx->frames == cmd->startFrame) && (csCtx->frames < cmd->endFrame)) { var1 = cmd->endFrame - cmd->startFrame; - if (cmd->type == 3) + if (cmd->type == 3) { Audio_SetBGM(var1 << 0x10 | 0x110000FF); - else + } else { Audio_SetBGM(var1 << 0x10 | 0x100000FF); + } } } // Command 9: ? -void Cutscene_Command_09(GlobalContext* globalCtx, CutsceneContext* csCtx, CsCmdUnknown9* cmd) -{ - if (csCtx->frames == cmd->startFrame) +void Cutscene_Command_09(GlobalContext* globalCtx, CutsceneContext* csCtx, CsCmdUnknown9* cmd) { + if (csCtx->frames == cmd->startFrame) { func_800AA000(0.0f, cmd->unk_06, cmd->unk_07, cmd->unk_08); + } } // Command 0x8C: Set Time of Day & Environment Time #ifdef NON_MATCHING // regalloc differences -void func_80065134(GlobalContext* globalCtx, CutsceneContext* csCtx, CsCmdDayTime* cmd) -{ +void func_80065134(GlobalContext* globalCtx, CutsceneContext* csCtx, CsCmdDayTime* cmd) { s16 temp1; s16 temp2; - if (csCtx->frames == cmd->startFrame) - { + if (csCtx->frames == cmd->startFrame) { temp1 = (cmd->hour * 60.0f) / 0.021972656f; temp2 = (cmd->minute + 1) / 0.021972656f; gSaveContext.environment_time = gSaveContext.day_time = temp1 + temp2; @@ -503,25 +450,22 @@ void func_80065134(GlobalContext* globalCtx, CutsceneContext* csCtx, CsCmdDayTim #endif // Command 0x3E8: Code Execution (& Terminates Cutscene?) -void Cutscene_Command_Terminator(GlobalContext* globalCtx, CutsceneContext* csCtx, CsCmdBase* cmd) -{ +void Cutscene_Command_Terminator(GlobalContext* globalCtx, CutsceneContext* csCtx, CsCmdBase* cmd) { Player* player = PLAYER; s32 temp = 0; - if ((gSaveContext.game_mode != 0) && (gSaveContext.game_mode != 3) && - (globalCtx->sceneNum != SCENE_SPOT00) && (csCtx->frames > 20) && - (!~(globalCtx->state.input[0].padPressed | 0xFFFF7FFF) || - !~(globalCtx->state.input[0].padPressed | -0x4001) || + if ((gSaveContext.game_mode != 0) && (gSaveContext.game_mode != 3) && (globalCtx->sceneNum != SCENE_SPOT00) && + (csCtx->frames > 20) && + (!~(globalCtx->state.input[0].padPressed | 0xFFFF7FFF) || !~(globalCtx->state.input[0].padPressed | -0x4001) || !~(globalCtx->state.input[0].padPressed | -0x1001)) && - (gSaveContext.file_num != 0xFEDC) && (globalCtx->sceneLoadFlag == 0)) - { + (gSaveContext.file_num != 0xFEDC) && (globalCtx->sceneLoadFlag == 0)) { Audio_PlaySoundGeneral(NA_SE_SY_PIECE_OF_HEART, &D_801333D4, 4, &D_801333E0, &D_801333E0, &D_801333E8); temp = 1; } if ((csCtx->frames == cmd->startFrame) || (temp != 0) || - ((csCtx->frames > 20) && (!~(globalCtx->state.input[0].padPressed | -0x1001)) && (gSaveContext.file_num != 0xFEDC))) - { + ((csCtx->frames > 20) && (!~(globalCtx->state.input[0].padPressed | -0x1001)) && + (gSaveContext.file_num != 0xFEDC))) { csCtx->state = CS_STATE_UNSKIPPABLE_EXEC; func_800F68BC(0); gSaveContext.unk_1410 = 1; @@ -529,13 +473,13 @@ void Cutscene_Command_Terminator(GlobalContext* globalCtx, CutsceneContext* csCt // Translates to: "FUTURE FORK DESIGNATION=No. [%d]" osSyncPrintf("\n分岐先指定！！=[%d]番", cmd->base); - if ((gSaveContext.game_mode != 0) && (csCtx->frames != cmd->startFrame)) + if ((gSaveContext.game_mode != 0) && (csCtx->frames != cmd->startFrame)) { gSaveContext.unk_13E7 = 1; + } gSaveContext.cutscene_index = 0; - switch (cmd->base) - { + switch (cmd->base) { case 1: globalCtx->nextEntranceIndex = 0x00A0; gSaveContext.cutscene_index = 0xFFF1; @@ -581,22 +525,19 @@ void Cutscene_Command_Terminator(GlobalContext* globalCtx, CutsceneContext* csCt case 8: gSaveContext.fw.set = 0; gSaveContext.respawn[RESPAWN_MODE_TOP].data = 0; - if (!(gSaveContext.event_chk_inf[4] & 0x20)) - { + if (!(gSaveContext.event_chk_inf[4] & 0x20)) { gSaveContext.event_chk_inf[4] |= 0x20; globalCtx->nextEntranceIndex = 0x00A0; globalCtx->sceneLoadFlag = 0x14; gSaveContext.cutscene_index = 0xFFF3; globalCtx->fadeOutTransition = 0xB; - } - else - { - if (gSaveContext.scene_setup_index < 4) - { - if (LINK_IS_CHILD) + } else { + if (gSaveContext.scene_setup_index < 4) { + if (LINK_IS_CHILD) { globalCtx->linkAgeOnLoad = 0; - else + } else { globalCtx->linkAgeOnLoad = 1; + } } globalCtx->nextEntranceIndex = 0x02CA; globalCtx->sceneLoadFlag = 0x14; @@ -1037,19 +978,14 @@ void Cutscene_Command_Terminator(GlobalContext* globalCtx, CutsceneContext* csCt globalCtx->fadeOutTransition = 3; break; case 95: - if ((gSaveContext.event_chk_inf[4] & 0x100) && - (gSaveContext.event_chk_inf[4] & 0x200) && - (gSaveContext.event_chk_inf[4] & 0x400)) - { + if ((gSaveContext.event_chk_inf[4] & 0x100) && (gSaveContext.event_chk_inf[4] & 0x200) && + (gSaveContext.event_chk_inf[4] & 0x400)) { globalCtx->nextEntranceIndex = 0x0053; globalCtx->sceneLoadFlag = 0x14; gSaveContext.cutscene_index = 0xFFF3; globalCtx->fadeOutTransition = 2; - } - else - { - switch (gSaveContext.scene_setup_index) - { + } else { + switch (gSaveContext.scene_setup_index) { case 8: globalCtx->nextEntranceIndex = 0x00FC; globalCtx->sceneLoadFlag = 0x14; @@ -1070,15 +1006,12 @@ void Cutscene_Command_Terminator(GlobalContext* globalCtx, CutsceneContext* csCt } break; case 96: - if (gBitFlags[4] & gSaveContext.quest_items) - { + if (gBitFlags[4] & gSaveContext.quest_items) { globalCtx->nextEntranceIndex = 0x006B; globalCtx->sceneLoadFlag = 0x14; gSaveContext.cutscene_index = 0xFFF1; globalCtx->fadeOutTransition = 5; - } - else - { + } else { gSaveContext.event_chk_inf[12] |= 0x100; globalCtx->nextEntranceIndex = 0x0610; globalCtx->sceneLoadFlag = 0x14; @@ -1087,15 +1020,12 @@ void Cutscene_Command_Terminator(GlobalContext* globalCtx, CutsceneContext* csCt } break; case 97: - if (gBitFlags[3] & gSaveContext.quest_items) - { + if (gBitFlags[3] & gSaveContext.quest_items) { globalCtx->nextEntranceIndex = 0x006B; globalCtx->sceneLoadFlag = 0x14; gSaveContext.cutscene_index = 0xFFF1; globalCtx->fadeOutTransition = 5; - } - else - { + } else { globalCtx->nextEntranceIndex = 0x0580; globalCtx->sceneLoadFlag = 0x14; globalCtx->fadeOutTransition = 3; @@ -1138,8 +1068,7 @@ void Cutscene_Command_Terminator(GlobalContext* globalCtx, CutsceneContext* csCt globalCtx->fadeOutTransition = 2; break; case 104: - switch (sTitleCsState) - { + switch (sTitleCsState) { case 0: globalCtx->nextEntranceIndex = 0x008D; globalCtx->sceneLoadFlag = 0x14; @@ -1206,16 +1135,13 @@ void Cutscene_Command_Terminator(GlobalContext* globalCtx, CutsceneContext* csCt break; case 113: if (Flags_GetEventChkInf(0xBB) && Flags_GetEventChkInf(0xBC) && Flags_GetEventChkInf(0xBD) && - Flags_GetEventChkInf(0xBE) && Flags_GetEventChkInf(0xBF) && Flags_GetEventChkInf(0xAD)) - { + Flags_GetEventChkInf(0xBE) && Flags_GetEventChkInf(0xBF) && Flags_GetEventChkInf(0xAD)) { globalCtx->csCtx.segment = SEGMENTED_TO_VIRTUAL(&D_0201DA50); globalCtx->csCtx.frames = 0; gSaveContext.cutscene_trigger = 1; gSaveContext.cutscene_index = 0xFFFF; csCtx->state = CS_STATE_UNSKIPPABLE_INIT; - } - else - { + } else { gSaveContext.cutscene_index = 0xFFFF; csCtx->state = CS_STATE_UNSKIPPABLE_INIT; } @@ -1232,14 +1158,11 @@ void Cutscene_Command_Terminator(GlobalContext* globalCtx, CutsceneContext* csCt gSaveContext.transition_type = 2; break; case 116: - if (gSaveContext.event_chk_inf[12] & 0x100) - { + if (gSaveContext.event_chk_inf[12] & 0x100) { globalCtx->nextEntranceIndex = 0x0580; globalCtx->sceneLoadFlag = 0x14; globalCtx->fadeOutTransition = 3; - } - else - { + } else { globalCtx->nextEntranceIndex = 0x0610; globalCtx->sceneLoadFlag = 0x14; globalCtx->fadeOutTransition = 3; @@ -1273,67 +1196,68 @@ void Cutscene_Command_Terminator(GlobalContext* globalCtx, CutsceneContext* csCt } // Command 0x2D: Transition Effects -void Cutscene_Command_TransitionFX(GlobalContext* globalCtx, CutsceneContext* csCtx, CsCmdBase* cmd) -{ +void Cutscene_Command_TransitionFX(GlobalContext* globalCtx, CutsceneContext* csCtx, CsCmdBase* cmd) { f32 temp; - if ((csCtx->frames >= cmd->startFrame) && (csCtx->frames <= cmd->endFrame)) - { + if ((csCtx->frames >= cmd->startFrame) && (csCtx->frames <= cmd->endFrame)) { globalCtx->unk_10B05 = 1; temp = func_8006F93C(cmd->endFrame, cmd->startFrame, csCtx->frames); - switch (cmd->base) - { + switch (cmd->base) { case 1: case 5: globalCtx->unk_10B06[0] = 0xA0; globalCtx->unk_10B06[1] = 0xA0; globalCtx->unk_10B06[2] = 0xA0; - if (cmd->base == 1) - { + if (cmd->base == 1) { globalCtx->unk_10B06[3] = 255.0f * temp; - if ((temp == 0.0f) && (gSaveContext.entrance_index == 0x006B)) - Audio_PlaySoundGeneral(NA_SE_SY_WHITE_OUT_S, &D_801333D4, 4, &D_801333E0, &D_801333E0, &D_801333E8); - else if ((temp == 0.0f) && - ((gSaveContext.entrance_index == 0x0053) || - (gSaveContext.entrance_index == 0x0138) || - (gSaveContext.entrance_index == 0x0371))) - Audio_PlaySoundGeneral(NA_SE_EV_WHITE_OUT, &D_801333D4, 4, &D_801333E0, &D_801333E0, &D_801333E8); - else if ((temp == 0.0f) && (globalCtx->sceneNum == SCENE_GANONTIKA)) + if ((temp == 0.0f) && (gSaveContext.entrance_index == 0x006B)) { + Audio_PlaySoundGeneral(NA_SE_SY_WHITE_OUT_S, &D_801333D4, 4, &D_801333E0, &D_801333E0, + &D_801333E8); + } else if ((temp == 0.0f) && + ((gSaveContext.entrance_index == 0x0053) || (gSaveContext.entrance_index == 0x0138) || + (gSaveContext.entrance_index == 0x0371))) { + Audio_PlaySoundGeneral(NA_SE_EV_WHITE_OUT, &D_801333D4, 4, &D_801333E0, &D_801333E0, + &D_801333E8); + } else if ((temp == 0.0f) && (globalCtx->sceneNum == SCENE_GANONTIKA)) { func_800788CC(NA_SE_EV_WHITE_OUT); - } - else + } + } else { globalCtx->unk_10B06[3] = (1.0f - temp) * 255.0f; + } break; case 2: case 6: globalCtx->unk_10B06[0] = 0; globalCtx->unk_10B06[1] = 0; globalCtx->unk_10B06[2] = 0xFF; - if (cmd->base == 2) + if (cmd->base == 2) { globalCtx->unk_10B06[3] = 255.0f * temp; - else + } else { globalCtx->unk_10B06[3] = (1.0f - temp) * 255.0f; + } break; case 3: case 7: globalCtx->unk_10B06[0] = 0xFF; globalCtx->unk_10B06[1] = 0; globalCtx->unk_10B06[2] = 0; - if (cmd->base == 3) + if (cmd->base == 3) { globalCtx->unk_10B06[3] = (1.0f - temp) * 255.0f; - else + } else { globalCtx->unk_10B06[3] = 255.0f * temp; + } break; case 4: case 8: globalCtx->unk_10B06[0] = 0; globalCtx->unk_10B06[1] = 0xFF; globalCtx->unk_10B06[2] = 0; - if (cmd->base == 4) + if (cmd->base == 4) { globalCtx->unk_10B06[3] = (1.0f - temp) * 255.0f; - else + } else { globalCtx->unk_10B06[3] = 255.0f * temp; + } break; case 9: gSaveContext.unk_1410 = 1; @@ -1343,10 +1267,11 @@ void Cutscene_Command_TransitionFX(GlobalContext* globalCtx, CutsceneContext* cs globalCtx->unk_10B06[0] = 0; globalCtx->unk_10B06[1] = 0; globalCtx->unk_10B06[2] = 0; - if (cmd->base == 10) + if (cmd->base == 10) { globalCtx->unk_10B06[3] = (1.0f - temp) * 255.0f; - else + } else { globalCtx->unk_10B06[3] = 255.0f * temp; + } break; case 12: gSaveContext.unk_1410 = 255.0f - (155.0f * temp); @@ -1362,8 +1287,7 @@ void Cutscene_Command_TransitionFX(GlobalContext* globalCtx, CutsceneContext* cs } // Command 0x1 & 0x5: Camera Positions -s32 Cutscene_Command_CameraPositions(GlobalContext* globalCtx, CutsceneContext* csCtx, u8* cmd, u8 relativeToLink) -{ +s32 Cutscene_Command_CameraPositions(GlobalContext* globalCtx, CutsceneContext* csCtx, u8* cmd, u8 relativeToLink) { s32 shouldContinue = 1; CsCmdBase* cmdBase = (CsCmdBase*)cmd; s32 size; @@ -1372,15 +1296,12 @@ s32 Cutscene_Command_CameraPositions(GlobalContext* globalCtx, CutsceneContext* size = 8; if ((cmdBase->startFrame < csCtx->frames) && (csCtx->frames < cmdBase->endFrame) && - ((csCtx->unk_18 < cmdBase->startFrame) || (csCtx->unk_18 >= 0xF000))) - { + ((csCtx->unk_18 < cmdBase->startFrame) || (csCtx->unk_18 >= 0xF000))) { csCtx->unk_1B = 1; csCtx->cameraPosition = (CutsceneCameraPoint*)cmd; - if (csCtx->unk_1A != 0) - { + if (csCtx->unk_1A != 0) { csCtx->unk_18 = cmdBase->startFrame; - if (D_8015FCC8 != 0) - { + if (D_8015FCC8 != 0) { func_800C0874(globalCtx, csCtx->unk_16, 0x25); func_800C0314(globalCtx, D_8015FCC6, 1); func_800C0314(globalCtx, csCtx->unk_16, 7); @@ -1391,10 +1312,10 @@ s32 Cutscene_Command_CameraPositions(GlobalContext* globalCtx, CutsceneContext* } } - while (shouldContinue) - { - if (((CutsceneCameraPoint*)cmd)->continueFlag == -1) - shouldContinue = 0; + while (shouldContinue) { + if (((CutsceneCameraPoint*)cmd)->continueFlag == -1) { + shouldContinue = 0; + } cmd += 0x10; size += 0x10; } @@ -1403,8 +1324,7 @@ s32 Cutscene_Command_CameraPositions(GlobalContext* globalCtx, CutsceneContext* } // Command 0x2 & 0x6: Camera Focus Points -s32 Cutscene_Command_CameraFocus(GlobalContext* globalCtx, CutsceneContext* csCtx, u8* cmd, u8 relativeToLink) -{ +s32 Cutscene_Command_CameraFocus(GlobalContext* globalCtx, CutsceneContext* csCtx, u8* cmd, u8 relativeToLink) { s32 shouldContinue = 1; CsCmdBase* cmdBase = (CsCmdBase*)cmd; s32 size; @@ -1413,15 +1333,12 @@ s32 Cutscene_Command_CameraFocus(GlobalContext* globalCtx, CutsceneContext* csCt size = 8; if ((cmdBase->startFrame < csCtx->frames) && (csCtx->frames < cmdBase->endFrame) && - ((D_8015FCC0 < cmdBase->startFrame) || (D_8015FCC0 >= 0xF000))) - { + ((D_8015FCC0 < cmdBase->startFrame) || (D_8015FCC0 >= 0xF000))) { csCtx->unk_1A = 1; csCtx->cameraFocus = (CutsceneCameraPoint*)cmd; - if (csCtx->unk_1B != 0) - { + if (csCtx->unk_1B != 0) { D_8015FCC0 = cmdBase->startFrame; - if (D_8015FCC8 != 0) - { + if (D_8015FCC8 != 0) { func_800C0874(globalCtx, csCtx->unk_16, 0x25); func_800C0314(globalCtx, D_8015FCC6, 1); func_800C0314(globalCtx, csCtx->unk_16, 7); @@ -1432,10 +1349,10 @@ s32 Cutscene_Command_CameraFocus(GlobalContext* globalCtx, CutsceneContext* csCt } } - while (shouldContinue) - { - if (((CutsceneCameraPoint*)cmd)->continueFlag == -1) - shouldContinue = 0; + while (shouldContinue) { + if (((CutsceneCameraPoint*)cmd)->continueFlag == -1) { + shouldContinue = 0; + } cmd += 0x10; size += 0x10; } @@ -1444,8 +1361,7 @@ s32 Cutscene_Command_CameraFocus(GlobalContext* globalCtx, CutsceneContext* csCt } // Command 0x7: ? (Related to camera positons) -s32 Cutscene_Command_07(GlobalContext* globalCtx, CutsceneContext* csCtx, u8* cmd, u8 unused) -{ +s32 Cutscene_Command_07(GlobalContext* globalCtx, CutsceneContext* csCtx, u8* cmd, u8 unused) { CsCmdBase* cmdBase = (CsCmdBase*)cmd; s32 size; Vec3f sp3C; @@ -1457,15 +1373,12 @@ s32 Cutscene_Command_07(GlobalContext* globalCtx, CutsceneContext* csCtx, u8* cm size = 8; if ((cmdBase->startFrame < csCtx->frames) && (csCtx->frames < cmdBase->endFrame) && - ((D_8015FCC2 < cmdBase->startFrame) || (D_8015FCC2 >= 0xF000))) - { + ((D_8015FCC2 < cmdBase->startFrame) || (D_8015FCC2 >= 0xF000))) { csCtx->unk_1B = 1; csCtx->cameraPosition = (CutsceneCameraPoint*)cmd; - if (csCtx->unk_1A != 0) - { + if (csCtx->unk_1A != 0) { D_8015FCC2 = cmdBase->startFrame; - if (D_8015FCC8 != 0) - { + if (D_8015FCC8 != 0) { sp2C = func_800C04A4(globalCtx, csCtx->unk_16); sp2C->player = NULL; func_800C0314(globalCtx, 0, 1); @@ -1491,8 +1404,7 @@ s32 Cutscene_Command_07(GlobalContext* globalCtx, CutsceneContext* csCtx, u8* cm } // Command 0x8: ? (Related to camera focus points) -s32 Cutscene_Command_08(GlobalContext* globalCtx, CutsceneContext* csCtx, u8* cmd, u8 unused) -{ +s32 Cutscene_Command_08(GlobalContext* globalCtx, CutsceneContext* csCtx, u8* cmd, u8 unused) { CsCmdBase* cmdBase = (CsCmdBase*)cmd; s32 size; Vec3f sp3C; @@ -1504,15 +1416,12 @@ s32 Cutscene_Command_08(GlobalContext* globalCtx, CutsceneContext* csCtx, u8* cm size = 8; if ((cmdBase->startFrame < csCtx->frames) && (csCtx->frames < cmdBase->endFrame) && - ((D_8015FCC4 < cmdBase->startFrame) || (D_8015FCC4 >= 0xF000))) - { + ((D_8015FCC4 < cmdBase->startFrame) || (D_8015FCC4 >= 0xF000))) { csCtx->unk_1A = 1; csCtx->cameraFocus = (CutsceneCameraPoint*)cmd; - if (csCtx->unk_1B != 0) - { + if (csCtx->unk_1B != 0) { D_8015FCC4 = cmdBase->startFrame; - if (D_8015FCC8 != 0) - { + if (D_8015FCC8 != 0) { sp2C = func_800C04A4(globalCtx, csCtx->unk_16); sp2C->player = NULL; func_800C0314(globalCtx, 0, 1); @@ -1536,81 +1445,70 @@ s32 Cutscene_Command_08(GlobalContext* globalCtx, CutsceneContext* csCtx, u8* cm } // Command 0x13: Textbox -void Cutscene_Command_Textbox(GlobalContext* globalCtx, CutsceneContext* csCtx, CsCmdTextbox* cmd) -{ +void Cutscene_Command_Textbox(GlobalContext* globalCtx, CutsceneContext* csCtx, CsCmdTextbox* cmd) { u8 dialogState; s16 originalCsFrames; - if ((cmd->startFrame < csCtx->frames) && (csCtx->frames <= cmd->endFrame)) - { - if (cmd->type != 2) - { - if (D_8011E1C0 != cmd->base) - { + if ((cmd->startFrame < csCtx->frames) && (csCtx->frames <= cmd->endFrame)) { + if (cmd->type != 2) { + if (D_8011E1C0 != cmd->base) { D_8011E1C0 = cmd->base; - if ((cmd->type == 3) && (gBitFlags[20] & gSaveContext.quest_items)) + if ((cmd->type == 3) && (gBitFlags[20] & gSaveContext.quest_items)) { func_8010B680(globalCtx, cmd->textId1, 0); - else if ((cmd->type == 4) && (gBitFlags[19] & gSaveContext.quest_items)) + } else if ((cmd->type == 4) && (gBitFlags[19] & gSaveContext.quest_items)) { func_8010B680(globalCtx, cmd->textId1, 0); - else + } else { func_8010B680(globalCtx, cmd->base, 0); + } return; } - } - else - { - if (D_8011E1C4 != cmd->base) - { + } else { + if (D_8011E1C4 != cmd->base) { D_8011E1C4 = cmd->base; func_8010BD58(globalCtx, cmd->base); return; } } - if (csCtx->frames >= cmd->endFrame) - { + if (csCtx->frames >= cmd->endFrame) { originalCsFrames = csCtx->frames; dialogState = func_8010BDBC(&globalCtx->msgCtx); - if ((dialogState != 2) && (dialogState != 0) && (dialogState != 7) && (dialogState != 8)) - { + if ((dialogState != 2) && (dialogState != 0) && (dialogState != 7) && (dialogState != 8)) { csCtx->frames--; - if ((dialogState == 4) && (func_80106BC8(globalCtx) != 0)) - { - if (globalCtx->msgCtx.choiceIndex == 0) - { - if (cmd->textId1 != 0xFFFF) + if ((dialogState == 4) && (func_80106BC8(globalCtx) != 0)) { + if (globalCtx->msgCtx.choiceIndex == 0) { + if (cmd->textId1 != 0xFFFF) { func_8010B720(globalCtx, cmd->textId1); - else + } else { csCtx->frames++; - } - else - { - if (cmd->textId2 != 0xFFFF) + } + } else { + if (cmd->textId2 != 0xFFFF) { func_8010B720(globalCtx, cmd->textId2); - else + } else { csCtx->frames++; + } } } - if (dialogState == 9) - { - if (cmd->textId1 != 0xFFFF) + if (dialogState == 9) { + if (cmd->textId1 != 0xFFFF) { func_8010B720(globalCtx, cmd->textId1); - else + } else { csCtx->frames++; + } } - if (dialogState == 5) - { - if (func_80106BC8(globalCtx) != 0) + if (dialogState == 5) { + if (func_80106BC8(globalCtx) != 0) { func_8010BD58(globalCtx, cmd->base); + } } } - if (csCtx->frames == originalCsFrames) - { + if (csCtx->frames == originalCsFrames) { Interface_ChangeAlpha(1); D_8011E1C0 = 0; D_8011E1C4 = 0; @@ -1619,8 +1517,7 @@ void Cutscene_Command_Textbox(GlobalContext* globalCtx, CutsceneContext* csCtx, } } -void Cutscene_ProcessCommands(GlobalContext* globalCtx, CutsceneContext* csCtx, u8* cutscenePtr) -{ +void Cutscene_ProcessCommands(GlobalContext* globalCtx, CutsceneContext* csCtx, u8* cutscenePtr) { s16 i; s32 totalEntries; s32 cmdType; @@ -1634,33 +1531,29 @@ void Cutscene_ProcessCommands(GlobalContext* globalCtx, CutsceneContext* csCtx, MemCopy(&cutsceneEndFrame, cutscenePtr, 4); cutscenePtr += 4; - if ((cutsceneEndFrame < csCtx->frames) && (csCtx->state != CS_STATE_UNSKIPPABLE_EXEC)) - { + if ((cutsceneEndFrame < csCtx->frames) && (csCtx->state != CS_STATE_UNSKIPPABLE_EXEC)) { csCtx->state = CS_STATE_UNSKIPPABLE_INIT; return; } - if (!~(globalCtx->state.input[0].padPressed | -0x101)) - { + if (!~(globalCtx->state.input[0].padPressed | -0x101)) { csCtx->state = CS_STATE_UNSKIPPABLE_INIT; return; } - for (i = 0; i < totalEntries; i++) - { + for (i = 0; i < totalEntries; i++) { MemCopy(&cmdType, cutscenePtr, 4); cutscenePtr += 4; - if (cmdType == -1) + if (cmdType == -1) { return; + } - switch (cmdType) - { + switch (cmdType) { case CS_CMD_MISC: MemCopy(&cmdEntries, cutscenePtr, 4); cutscenePtr += 4; - for (j = 0; j < cmdEntries; j++) - { + for (j = 0; j < cmdEntries; j++) { func_80064824(globalCtx, csCtx, (void*)cutscenePtr); cutscenePtr += 0x30; } @@ -1668,8 +1561,7 @@ void Cutscene_ProcessCommands(GlobalContext* globalCtx, CutsceneContext* csCtx, case CS_CMD_SET_LIGHTING: MemCopy(&cmdEntries, cutscenePtr, 4); cutscenePtr += 4; - for (j = 0; j < cmdEntries; j++) - { + for (j = 0; j < cmdEntries; j++) { Cutscene_Command_SetLighting(globalCtx, csCtx, (void*)cutscenePtr); cutscenePtr += 0x30; } @@ -1677,8 +1569,7 @@ void Cutscene_ProcessCommands(GlobalContext* globalCtx, CutsceneContext* csCtx, case CS_CMD_PLAYBGM: MemCopy(&cmdEntries, cutscenePtr, 4); cutscenePtr += 4; - for (j = 0; j < cmdEntries; j++) - { + for (j = 0; j < cmdEntries; j++) { Cutscene_Command_PlayBGM(globalCtx, csCtx, (void*)cutscenePtr); cutscenePtr += 0x30; } @@ -1686,8 +1577,7 @@ void Cutscene_ProcessCommands(GlobalContext* globalCtx, CutsceneContext* csCtx, case CS_CMD_STOPBGM: MemCopy(&cmdEntries, cutscenePtr, 4); cutscenePtr += 4; - for (j = 0; j < cmdEntries; j++) - { + for (j = 0; j < cmdEntries; j++) { Cutscene_Command_StopBGM(globalCtx, csCtx, (void*)cutscenePtr); cutscenePtr += 0x30; } @@ -1695,8 +1585,7 @@ void Cutscene_ProcessCommands(GlobalContext* globalCtx, CutsceneContext* csCtx, case CS_CMD_FADEBGM: MemCopy(&cmdEntries, cutscenePtr, 4); cutscenePtr += 4; - for (j = 0; j < cmdEntries; j++) - { + for (j = 0; j < cmdEntries; j++) { Cutscene_Command_FadeBGM(globalCtx, csCtx, (void*)cutscenePtr); cutscenePtr += 0x30; } @@ -1704,8 +1593,7 @@ void Cutscene_ProcessCommands(GlobalContext* globalCtx, CutsceneContext* csCtx, case CS_CMD_09: MemCopy(&cmdEntries, cutscenePtr, 4); cutscenePtr += 4; - for (j = 0; j < cmdEntries; j++) - { + for (j = 0; j < cmdEntries; j++) { Cutscene_Command_09(globalCtx, csCtx, (void*)cutscenePtr); cutscenePtr += 0xC; } @@ -1713,8 +1601,7 @@ void Cutscene_ProcessCommands(GlobalContext* globalCtx, CutsceneContext* csCtx, case CS_CMD_SETTIME: MemCopy(&cmdEntries, cutscenePtr, 4); cutscenePtr += 4; - for (j = 0; j < cmdEntries; j++) - { + for (j = 0; j < cmdEntries; j++) { func_80065134(globalCtx, csCtx, (void*)cutscenePtr); cutscenePtr += 0xC; } @@ -1722,11 +1609,11 @@ void Cutscene_ProcessCommands(GlobalContext* globalCtx, CutsceneContext* csCtx, case CS_CMD_SET_ACTOR_ACTION_0: MemCopy(&cmdEntries, cutscenePtr, 4); cutscenePtr += 4; - for (j = 0; j < cmdEntries; j++) - { + for (j = 0; j < cmdEntries; j++) { cmd = (CsCmdBase*)cutscenePtr; - if ((cmd->startFrame < csCtx->frames) && (csCtx->frames <= cmd->endFrame)) + if ((cmd->startFrame < csCtx->frames) && (csCtx->frames <= cmd->endFrame)) { csCtx->linkAction = (void*)cutscenePtr; + } cutscenePtr += 0x30; } break; @@ -1750,11 +1637,11 @@ void Cutscene_ProcessCommands(GlobalContext* globalCtx, CutsceneContext* csCtx, case 144: MemCopy(&cmdEntries, cutscenePtr, 4); cutscenePtr += 4; - for (j = 0; j < cmdEntries; j++) - { + for (j = 0; j < cmdEntries; j++) { cmd = (CsCmdBase*)cutscenePtr; - if ((cmd->startFrame < csCtx->frames) && (csCtx->frames <= cmd->endFrame)) + if ((cmd->startFrame < csCtx->frames) && (csCtx->frames <= cmd->endFrame)) { csCtx->actorActions[0] = (void*)cutscenePtr; + } cutscenePtr += 0x30; } break; @@ -1778,11 +1665,11 @@ void Cutscene_ProcessCommands(GlobalContext* globalCtx, CutsceneContext* csCtx, case 141: MemCopy(&cmdEntries, cutscenePtr, 4); cutscenePtr += 4; - for (j = 0; j < cmdEntries; j++) - { + for (j = 0; j < cmdEntries; j++) { cmd = (CsCmdBase*)cutscenePtr; - if ((cmd->startFrame < csCtx->frames) && (csCtx->frames <= cmd->endFrame)) + if ((cmd->startFrame < csCtx->frames) && (csCtx->frames <= cmd->endFrame)) { csCtx->actorActions[1] = (void*)cutscenePtr; + } cutscenePtr += 0x30; } break; @@ -1802,11 +1689,11 @@ void Cutscene_ProcessCommands(GlobalContext* globalCtx, CutsceneContext* csCtx, case 132: MemCopy(&cmdEntries, cutscenePtr, 4); cutscenePtr += 4; - for (j = 0; j < cmdEntries; j++) - { + for (j = 0; j < cmdEntries; j++) { cmd = (CsCmdBase*)cutscenePtr; - if ((cmd->startFrame < csCtx->frames) && (csCtx->frames <= cmd->endFrame)) + if ((cmd->startFrame < csCtx->frames) && (csCtx->frames <= cmd->endFrame)) { csCtx->actorActions[2] = (void*)cutscenePtr; + } cutscenePtr += 0x30; } break; @@ -1825,11 +1712,11 @@ void Cutscene_ProcessCommands(GlobalContext* globalCtx, CutsceneContext* csCtx, case 133: MemCopy(&cmdEntries, cutscenePtr, 4); cutscenePtr += 4; - for (j = 0; j < cmdEntries; j++) - { + for (j = 0; j < cmdEntries; j++) { cmd = (CsCmdBase*)cutscenePtr; - if ((cmd->startFrame < csCtx->frames) && (csCtx->frames <= cmd->endFrame)) + if ((cmd->startFrame < csCtx->frames) && (csCtx->frames <= cmd->endFrame)) { csCtx->actorActions[3] = (void*)cutscenePtr; + } cutscenePtr += 0x30; } break; @@ -1844,11 +1731,11 @@ void Cutscene_ProcessCommands(GlobalContext* globalCtx, CutsceneContext* csCtx, case 135: MemCopy(&cmdEntries, cutscenePtr, 4); cutscenePtr += 4; - for (j = 0; j < cmdEntries; j++) - { + for (j = 0; j < cmdEntries; j++) { cmd = (CsCmdBase*)cutscenePtr; - if ((cmd->startFrame < csCtx->frames) && (csCtx->frames <= cmd->endFrame)) + if ((cmd->startFrame < csCtx->frames) && (csCtx->frames <= cmd->endFrame)) { csCtx->actorActions[4] = (void*)cutscenePtr; + } cutscenePtr += 0x30; } break; @@ -1861,11 +1748,11 @@ void Cutscene_ProcessCommands(GlobalContext* globalCtx, CutsceneContext* csCtx, case 136: MemCopy(&cmdEntries, cutscenePtr, 4); cutscenePtr += 4; - for (j = 0; j < cmdEntries; j++) - { + for (j = 0; j < cmdEntries; j++) { cmd = (CsCmdBase*)cutscenePtr; - if ((cmd->startFrame < csCtx->frames) && (csCtx->frames <= cmd->endFrame)) + if ((cmd->startFrame < csCtx->frames) && (csCtx->frames <= cmd->endFrame)) { csCtx->actorActions[5] = (void*)cutscenePtr; + } cutscenePtr += 0x30; } break; @@ -1879,11 +1766,11 @@ void Cutscene_ProcessCommands(GlobalContext* globalCtx, CutsceneContext* csCtx, case 137: MemCopy(&cmdEntries, cutscenePtr, 4); cutscenePtr += 4; - for (j = 0; j < cmdEntries; j++) - { + for (j = 0; j < cmdEntries; j++) { cmd = (CsCmdBase*)cutscenePtr; - if ((cmd->startFrame < csCtx->frames) && (csCtx->frames <= cmd->endFrame)) + if ((cmd->startFrame < csCtx->frames) && (csCtx->frames <= cmd->endFrame)) { csCtx->actorActions[6] = (void*)cutscenePtr; + } cutscenePtr += 0x30; } break; @@ -1896,33 +1783,33 @@ void Cutscene_ProcessCommands(GlobalContext* globalCtx, CutsceneContext* csCtx, case 142: MemCopy(&cmdEntries, cutscenePtr, 4); cutscenePtr += 4; - for (j = 0; j < cmdEntries; j++) - { + for (j = 0; j < cmdEntries; j++) { cmd = (CsCmdBase*)cutscenePtr; - if ((cmd->startFrame < csCtx->frames) && (csCtx->frames <= cmd->endFrame)) + if ((cmd->startFrame < csCtx->frames) && (csCtx->frames <= cmd->endFrame)) { csCtx->actorActions[7] = (void*)cutscenePtr; + } cutscenePtr += 0x30; } break; case 62: MemCopy(&cmdEntries, cutscenePtr, 4); cutscenePtr += 4; - for (j = 0; j < cmdEntries; j++) - { + for (j = 0; j < cmdEntries; j++) { cmd = (CsCmdBase*)cutscenePtr; - if ((cmd->startFrame < csCtx->frames) && (csCtx->frames <= cmd->endFrame)) + if ((cmd->startFrame < csCtx->frames) && (csCtx->frames <= cmd->endFrame)) { csCtx->actorActions[8] = (void*)cutscenePtr; + } cutscenePtr += 0x30; } break; case CS_CMD_SET_ACTOR_ACTION_10: MemCopy(&cmdEntries, cutscenePtr, 4); cutscenePtr += 4; - for (j = 0; j < cmdEntries; j++) - { + for (j = 0; j < cmdEntries; j++) { cmd = (CsCmdBase*)cutscenePtr; - if ((cmd->startFrame < csCtx->frames) && (csCtx->frames <= cmd->endFrame)) + if ((cmd->startFrame < csCtx->frames) && (csCtx->frames <= cmd->endFrame)) { csCtx->actorActions[9] = (void*)cutscenePtr; + } cutscenePtr += 0x30; } break; @@ -1952,11 +1839,11 @@ void Cutscene_ProcessCommands(GlobalContext* globalCtx, CutsceneContext* csCtx, case CS_CMD_TEXTBOX: MemCopy(&cmdEntries, cutscenePtr, 4); cutscenePtr += 4; - for (j = 0; j < cmdEntries; j++) - { + for (j = 0; j < cmdEntries; j++) { cmd = (CsCmdBase*)cutscenePtr; - if (cmd->base != 0xFFFF) + if (cmd->base != 0xFFFF) { Cutscene_Command_Textbox(globalCtx, csCtx, (void*)cutscenePtr); + } cutscenePtr += 0xC; } break; @@ -1968,79 +1855,73 @@ void Cutscene_ProcessCommands(GlobalContext* globalCtx, CutsceneContext* csCtx, default: MemCopy(&cmdEntries, cutscenePtr, 4); cutscenePtr += 4; - for (j = 0; j < cmdEntries; j++) + for (j = 0; j < cmdEntries; j++) { cutscenePtr += 0x30; + } break; } } } -void func_80068C3C(GlobalContext* globalCtx, CutsceneContext* csCtx) -{ +void func_80068C3C(GlobalContext* globalCtx, CutsceneContext* csCtx) { Gfx* displayList; Gfx* prevDisplayList; GraphicsContext* gfxCtx; - Gfx* gfxArr[4]; + Gfx* dispRefs[4]; - if (0) ; // Necessary to match + if (0) {} // Necessary to match - if (gSaveContext.cutscene_index >= 0xFFF0) - { - if (0) ; // Also necessary to match + if (gSaveContext.cutscene_index >= 0xFFF0) { + if (0) {} // Also necessary to match - if (BREG(0) != 0) - { + if (BREG(0) != 0) { gfxCtx = globalCtx->state.gfxCtx; - func_800C6AC4(gfxArr, globalCtx->state.gfxCtx, "../z_demo.c", 4101); + Graph_OpenDisps(dispRefs, globalCtx->state.gfxCtx, "../z_demo.c", 4101); prevDisplayList = gfxCtx->polyOpa.p; - displayList = func_800C6C20(gfxCtx->polyOpa.p); + displayList = Graph_GfxPlusOne(gfxCtx->polyOpa.p); gSPDisplayList(gfxCtx->overlay.p++, displayList); Cutscene_DrawDebugInfo(globalCtx, &displayList, csCtx); gSPEndDisplayList(displayList++); - func_800C6C28(prevDisplayList, displayList); + Graph_BranchDlist(prevDisplayList, displayList); gfxCtx->polyOpa.p = displayList; - func_800C6B54(gfxArr, globalCtx->state.gfxCtx, "../z_demo.c", 4108); + Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_demo.c", 4108); } csCtx->frames++; - if (dREG(95) != 0) + if (dREG(95) != 0) { Cutscene_ProcessCommands(globalCtx, csCtx, D_8012D1F0); - else + } else { Cutscene_ProcessCommands(globalCtx, csCtx, globalCtx->csCtx.segment); + } } } -void func_80068D84(GlobalContext* globalCtx, CutsceneContext* csCtx) -{ - if (func_8006472C(globalCtx, csCtx, 0.0f)) - { +void func_80068D84(GlobalContext* globalCtx, CutsceneContext* csCtx) { + if (func_8006472C(globalCtx, csCtx, 0.0f)) { func_800F68BC(0); csCtx->state = CS_STATE_IDLE; } } -void func_80068DC0(GlobalContext* globalCtx, CutsceneContext* csCtx) -{ +void func_80068DC0(GlobalContext* globalCtx, CutsceneContext* csCtx) { s16 i; - if (func_8006472C(globalCtx, csCtx, 0.0f)) - { + if (func_8006472C(globalCtx, csCtx, 0.0f)) { csCtx->linkAction = NULL; - for (i = 0; i < 10; i++) + for (i = 0; i < 10; i++) { csCtx->actorActions[i] = NULL; + } // Translates to: "RIGHT HERE, HUH" osSyncPrintf("\n\n\n\n\nやっぱりここかいな"); gSaveContext.cutscene_index = 0; gSaveContext.game_mode = 0; - if (D_8015FCC8 != 0) - { - switch (gSaveContext.entrance_index) - { + if (D_8015FCC8 != 0) { + switch (gSaveContext.entrance_index) { case 0x028A: case 0x028E: case 0x0292: @@ -2058,15 +1939,14 @@ void func_80068DC0(GlobalContext* globalCtx, CutsceneContext* csCtx) } } -void func_80068ECC(GlobalContext* globalCtx, CutsceneContext* csCtx) -{ +void func_80068ECC(GlobalContext* globalCtx, CutsceneContext* csCtx) { u8 i; - if ((gSaveContext.cutscene_trigger != 0) && (csCtx->state == CS_STATE_IDLE) && !func_8008E988(globalCtx)) + if ((gSaveContext.cutscene_trigger != 0) && (csCtx->state == CS_STATE_IDLE) && !func_8008E988(globalCtx)) { gSaveContext.cutscene_index = 0xFFFD; + } - if ((gSaveContext.cutscene_index >= 0xFFF0) && (csCtx->state == CS_STATE_IDLE)) - { + if ((gSaveContext.cutscene_index >= 0xFFF0) && (csCtx->state == CS_STATE_IDLE)) { func_8006C438(globalCtx, 0); D_8011E1C0 = 0; @@ -2074,13 +1954,13 @@ void func_80068ECC(GlobalContext* globalCtx, CutsceneContext* csCtx) csCtx->unk_12 = 0; csCtx->linkAction = NULL; - for (i = 0; i < 10; i++) + for (i = 0; i < 10; i++) { csCtx->actorActions[i] = NULL; + } csCtx->state++; - if (csCtx->state == CS_STATE_SKIPPABLE_INIT) - { + if (csCtx->state == CS_STATE_SKIPPABLE_INIT) { func_800F68BC(1); csCtx->frames = 0xFFFF; @@ -2092,11 +1972,11 @@ void func_80068ECC(GlobalContext* globalCtx, CutsceneContext* csCtx) csCtx->unk_1B = 0; D_8015FCC6 = globalCtx->cameraCtx.unk_5C0; - if (D_8015FCC8 != 0) + if (D_8015FCC8 != 0) { csCtx->unk_14_all = func_800C0230(globalCtx); + } - if (gSaveContext.cutscene_trigger == 0) - { + if (gSaveContext.cutscene_trigger == 0) { Interface_ChangeAlpha(1); func_800B3840(0x20); func_800B38A4(0x20); @@ -2110,41 +1990,39 @@ void func_80068ECC(GlobalContext* globalCtx, CutsceneContext* csCtx) } } -void func_80069048(GlobalContext* globalCtx) -{ +void func_80069048(GlobalContext* globalCtx) { s16 i; D_8015FCCC = 0; - for (i = 0; i < 20; i++) ; // Empty Loop + for (i = 0; i < 20; i++) { + ; // Empty Loop + } D_8015FCE4 = 0; } -void func_8006907C(GlobalContext* globalCtx) -{ - if (D_8015FCCC != 0) +void func_8006907C(GlobalContext* globalCtx) { + if (D_8015FCCC != 0) { D_8015FCCC = 0; + } } -void Cutscene_HandleEntranceTriggers(GlobalContext* globalCtx) -{ +void Cutscene_HandleEntranceTriggers(GlobalContext* globalCtx) { EntranceCutscene* entranceCutscene; u8 requiredAge; s16 i; - for (i = 0; i < ARRAY_COUNT(sEntranceCutsceneTable); i++) - { + for (i = 0; i < ARRAY_COUNT(sEntranceCutsceneTable); i++) { entranceCutscene = &sEntranceCutsceneTable[i]; requiredAge = entranceCutscene->ageRestriction; - if (requiredAge == 2) + if (requiredAge == 2) { requiredAge = gSaveContext.link_age; + } if ((gSaveContext.entrance_index == entranceCutscene->entrance) && (!Flags_GetEventChkInf(entranceCutscene->flag) || (entranceCutscene->flag == 0x18)) && - (gSaveContext.cutscene_index < 0xFFF0) && - ((u8)gSaveContext.link_age == requiredAge) && - (gSaveContext.respawn_flag <= 0)) - { + (gSaveContext.cutscene_index < 0xFFF0) && ((u8)gSaveContext.link_age == requiredAge) && + (gSaveContext.respawn_flag <= 0)) { Flags_SetEventChkInf(entranceCutscene->flag); Cutscene_SetSegment(globalCtx, entranceCutscene->segAddr); gSaveContext.cutscene_trigger = 2; @@ -2156,42 +2034,31 @@ void Cutscene_HandleEntranceTriggers(GlobalContext* globalCtx) #ifdef NON_MATCHING // regalloc differences -void Cutscene_HandleConditionalTriggers(GlobalContext* globalCtx) -{ +void Cutscene_HandleConditionalTriggers(GlobalContext* globalCtx) { osSyncPrintf("\ngame_info.mode=[%d] restart_flag", gSaveContext.respawn_flag); - if ((gSaveContext.game_mode == 0) && (gSaveContext.respawn_flag <= 0) && (gSaveContext.cutscene_index < 0xFFF0)) - { - if ((gSaveContext.entrance_index == 0x01E1) && !Flags_GetEventChkInf(0xAC)) - { + if ((gSaveContext.game_mode == 0) && (gSaveContext.respawn_flag <= 0) && (gSaveContext.cutscene_index < 0xFFF0)) { + if ((gSaveContext.entrance_index == 0x01E1) && !Flags_GetEventChkInf(0xAC)) { Flags_SetEventChkInf(0xAC); gSaveContext.entrance_index = 0x0123; gSaveContext.cutscene_index = 0xFFF0; - } - else if ((gSaveContext.entrance_index == 0x00DB) && LINK_IS_ADULT && - (gSaveContext.event_chk_inf[4] & 0x0100) && (gSaveContext.event_chk_inf[4] & 0x0200) && - (gSaveContext.event_chk_inf[4] & 0x0400) && !Flags_GetEventChkInf(0xAA)) - { + } else if ((gSaveContext.entrance_index == 0x00DB) && LINK_IS_ADULT && + (gSaveContext.event_chk_inf[4] & 0x0100) && (gSaveContext.event_chk_inf[4] & 0x0200) && + (gSaveContext.event_chk_inf[4] & 0x0400) && !Flags_GetEventChkInf(0xAA)) { Flags_SetEventChkInf(0xAA); gSaveContext.cutscene_index = 0xFFF0; - } - else if ((gSaveContext.entrance_index == 0x05E0) && !Flags_GetEventChkInf(0xC1)) - { + } else if ((gSaveContext.entrance_index == 0x05E0) && !Flags_GetEventChkInf(0xC1)) { Flags_SetEventChkInf(0xC1); Item_Give(globalCtx, ITEM_OCARINA_FAIRY); gSaveContext.entrance_index = 0x011E; gSaveContext.cutscene_index = 0xFFF0; - } - else if ((gBitFlags[3] & gSaveContext.quest_items) && (gBitFlags[4] & gSaveContext.quest_items) && - LINK_IS_ADULT && !Flags_GetEventChkInf(0xC4) && - (gEntranceTable[gSaveContext.entrance_index].scene == 67)) - { + } else if ((gBitFlags[3] & gSaveContext.quest_items) && (gBitFlags[4] & gSaveContext.quest_items) && + LINK_IS_ADULT && !Flags_GetEventChkInf(0xC4) && + (gEntranceTable[gSaveContext.entrance_index].scene == 67)) { Flags_SetEventChkInf(0xC4); gSaveContext.entrance_index = 0x0053; gSaveContext.cutscene_index = 0xFFF8; - } - else if (!Flags_GetEventChkInf(0xC7) && (gEntranceTable[gSaveContext.entrance_index].scene == 79)) - { + } else if (!Flags_GetEventChkInf(0xC7) && (gEntranceTable[gSaveContext.entrance_index].scene == 79)) { Flags_SetEventChkInf(0xC7); gSaveContext.entrance_index = 0x0517; gSaveContext.cutscene_index = 0xFFF0; @@ -2202,10 +2069,10 @@ void Cutscene_HandleConditionalTriggers(GlobalContext* globalCtx) #pragma GLOBAL_ASM("asm/non_matchings/code/z_demo/Cutscene_HandleConditionalTriggers.s") #endif -void Cutscene_SetSegment(GlobalContext* globalCtx, u32 segment) -{ - if (SEGMENT_NUMBER(segment) != 0) +void Cutscene_SetSegment(GlobalContext* globalCtx, u32 segment) { + if (SEGMENT_NUMBER(segment) != 0) { globalCtx->csCtx.segment = SEGMENTED_TO_VIRTUAL(segment); - else + } else { globalCtx->csCtx.segment = (void*)segment; + } } diff --git a/src/code/z_draw.c b/src/code/z_draw.c index 9bc4bbd7a8..ce07d2b360 100644 --- a/src/code/z_draw.c +++ b/src/code/z_draw.c @@ -29,15 +29,13 @@ static void func_8006B54C(GlobalContext* globalCtx, s16 drawId); static void func_8006B6E4(GlobalContext* globalCtx, s16 drawId); static void func_8006B870(GlobalContext* globalCtx, s16 drawId); -typedef struct -{ - /* 0x00 */ void (*drawFunc)(GlobalContext*, s16); - /* 0x04 */ u32 dlists[8]; +typedef struct { + /* 0x00 */ void (*drawFunc)(GlobalContext*, s16); + /* 0x04 */ u32 dlists[8]; } DrawItemTableEntry; // size = 0x24 // TODO: use symbols for these dlists once objects are in C -static DrawItemTableEntry sDrawItemTable[] = -{ +static DrawItemTableEntry sDrawItemTable[] = { { func_8006AAA8, { 0x06000670, 0x06000750 } }, { func_8006A9CC, { 0x06000800 } }, { func_8006ABEC, { 0x06000A80, 0x06000AE0 } }, @@ -71,8 +69,10 @@ static DrawItemTableEntry sDrawItemTable[] = { func_8006A9CC, { 0x06000EE0 } }, { func_8006A9CC, { 0x060009A0 } }, { func_8006A9CC, { 0x06000B70 } }, - { func_8006B870, { 0x06001850, 0x06001750, 0x06001790, 0x060019A0, 0x060017B0, 0x06001A28, 0x060017D0, 0x06001AD8 } }, - { func_8006B870, { 0x06001850, 0x06001770, 0x060017F0, 0x060019A0, 0x06001810, 0x06001A28, 0x06001830, 0x06001AD8 } }, + { func_8006B870, + { 0x06001850, 0x06001750, 0x06001790, 0x060019A0, 0x060017B0, 0x06001A28, 0x060017D0, 0x06001AD8 } }, + { func_8006B870, + { 0x06001850, 0x06001770, 0x060017F0, 0x060019A0, 0x06001810, 0x06001A28, 0x06001830, 0x06001AD8 } }, { func_8006A9CC, { 0x06000F60 } }, { func_8006A9CC, { 0x06000340 } }, { func_8006A9CC, { 0x06000B90 } }, @@ -161,512 +161,526 @@ static DrawItemTableEntry sDrawItemTable[] = * Draw "Get Item" Model * Calls the corresponding draw function for the given draw ID */ -void func_800694A0(GlobalContext* globalCtx, s16 drawId) -{ +void func_800694A0(GlobalContext* globalCtx, s16 drawId) { sDrawItemTable[drawId].drawFunc(globalCtx, drawId); } // All remaining functions in this file are draw functions referenced in the table and called by the function above -static void func_800694E4(GlobalContext* globalCtx, s16 drawId) -{ +static void func_800694E4(GlobalContext* globalCtx, s16 drawId) { GraphicsContext* gfxCtx = globalCtx->state.gfxCtx; - Gfx* gfxArr[5]; + Gfx* dispRefs[5]; - func_800C6AC4(gfxArr, globalCtx->state.gfxCtx, "../z_draw.c", 556); + Graph_OpenDisps(dispRefs, globalCtx->state.gfxCtx, "../z_draw.c", 556); func_80093BA8(globalCtx->state.gfxCtx); - gSPMatrix(gfxCtx->polyOpa.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_draw.c", 560), G_MTX_MODELVIEW | G_MTX_LOAD); + gSPMatrix(gfxCtx->polyOpa.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_draw.c", 560), + G_MTX_MODELVIEW | G_MTX_LOAD); gSPDisplayList(gfxCtx->polyOpa.p++, sDrawItemTable[drawId].dlists[0]); - func_800C6B54(gfxArr, globalCtx->state.gfxCtx, "../z_draw.c", 565); + Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_draw.c", 565); } -static void func_800695C0(GlobalContext* globalCtx, s16 drawId) -{ +static void func_800695C0(GlobalContext* globalCtx, s16 drawId) { GraphicsContext* gfxCtx = globalCtx->state.gfxCtx; - Gfx* gfxArr[5]; + Gfx* dispRefs[5]; - func_800C6AC4(gfxArr, globalCtx->state.gfxCtx, "../z_draw.c", 572); + Graph_OpenDisps(dispRefs, globalCtx->state.gfxCtx, "../z_draw.c", 572); - gfxCtx->polyXlu.p = func_80093774(gfxCtx->polyXlu.p, 5); - gSPMatrix(gfxCtx->polyXlu.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_draw.c", 576), G_MTX_MODELVIEW | G_MTX_LOAD); + gfxCtx->polyXlu.p = Gfx_CallSetupDL(gfxCtx->polyXlu.p, 5); + gSPMatrix(gfxCtx->polyXlu.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_draw.c", 576), + G_MTX_MODELVIEW | G_MTX_LOAD); gSPDisplayList(gfxCtx->polyXlu.p++, sDrawItemTable[drawId].dlists[0]); - func_800C6B54(gfxArr, globalCtx->state.gfxCtx, "../z_draw.c", 581); + Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_draw.c", 581); } -static void func_8006969C(GlobalContext* globalCtx, s16 drawId) -{ +static void func_8006969C(GlobalContext* globalCtx, s16 drawId) { GraphicsContext* gfxCtx = globalCtx->state.gfxCtx; - Gfx* gfxArr[5]; + Gfx* dispRefs[5]; - func_800C6AC4(gfxArr, globalCtx->state.gfxCtx, "../z_draw.c", 588); + Graph_OpenDisps(dispRefs, globalCtx->state.gfxCtx, "../z_draw.c", 588); func_80093D18(globalCtx->state.gfxCtx); - gSPMatrix(gfxCtx->polyOpa.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_draw.c", 592), G_MTX_MODELVIEW | G_MTX_LOAD); + gSPMatrix(gfxCtx->polyOpa.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_draw.c", 592), + G_MTX_MODELVIEW | G_MTX_LOAD); gSPDisplayList(gfxCtx->polyOpa.p++, sDrawItemTable[drawId].dlists[0]); func_80093D84(globalCtx->state.gfxCtx); gSPSegment(gfxCtx->polyXlu.p++, 0x08, - Draw_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)); + 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(gfxCtx->polyXlu.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_draw.c", 615), G_MTX_MODELVIEW | G_MTX_LOAD); + gSPMatrix(gfxCtx->polyXlu.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_draw.c", 615), + G_MTX_MODELVIEW | G_MTX_LOAD); gSPDisplayList(gfxCtx->polyXlu.p++, sDrawItemTable[drawId].dlists[1]); Matrix_Pull(); - func_800C6B54(gfxArr, globalCtx->state.gfxCtx, "../z_draw.c", 621); + Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_draw.c", 621); } -static void func_80069880(GlobalContext* globalCtx, s16 drawId) -{ +static void func_80069880(GlobalContext* globalCtx, s16 drawId) { GraphicsContext* gfxCtx = globalCtx->state.gfxCtx; - Gfx* gfxArr[5]; + Gfx* dispRefs[5]; - func_800C6AC4(gfxArr, globalCtx->state.gfxCtx, "../z_draw.c", 628); + Graph_OpenDisps(dispRefs, globalCtx->state.gfxCtx, "../z_draw.c", 628); func_80093D18(globalCtx->state.gfxCtx); - gSPMatrix(gfxCtx->polyOpa.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_draw.c", 632), G_MTX_MODELVIEW | G_MTX_LOAD); + gSPMatrix(gfxCtx->polyOpa.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_draw.c", 632), + G_MTX_MODELVIEW | G_MTX_LOAD); gSPDisplayList(gfxCtx->polyOpa.p++, sDrawItemTable[drawId].dlists[0]); func_80093D84(globalCtx->state.gfxCtx); - gSPMatrix(gfxCtx->polyXlu.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_draw.c", 641), G_MTX_MODELVIEW | G_MTX_LOAD); + gSPMatrix(gfxCtx->polyXlu.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_draw.c", 641), + G_MTX_MODELVIEW | G_MTX_LOAD); gSPDisplayList(gfxCtx->polyXlu.p++, sDrawItemTable[drawId].dlists[1]); gSPSegment(gfxCtx->polyXlu.p++, 0x08, - Draw_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)); + 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(gfxCtx->polyXlu.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_draw.c", 656), G_MTX_MODELVIEW | G_MTX_LOAD); + gSPMatrix(gfxCtx->polyXlu.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_draw.c", 656), + G_MTX_MODELVIEW | G_MTX_LOAD); gSPDisplayList(gfxCtx->polyXlu.p++, sDrawItemTable[drawId].dlists[3]); gSPDisplayList(gfxCtx->polyXlu.p++, sDrawItemTable[drawId].dlists[2]); Matrix_Pull(); - func_800C6B54(gfxArr, globalCtx->state.gfxCtx, "../z_draw.c", 663); + Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_draw.c", 663); } -static void func_80069AC8(GlobalContext* globalCtx, s16 drawId) -{ +static void func_80069AC8(GlobalContext* globalCtx, s16 drawId) { GraphicsContext* gfxCtx = globalCtx->state.gfxCtx; - Gfx* gfxArr[5]; + Gfx* dispRefs[5]; - func_800C6AC4(gfxArr, globalCtx->state.gfxCtx, "../z_draw.c", 670); + Graph_OpenDisps(dispRefs, globalCtx->state.gfxCtx, "../z_draw.c", 670); func_80093D18(globalCtx->state.gfxCtx); - gSPMatrix(gfxCtx->polyOpa.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_draw.c", 674), G_MTX_MODELVIEW | G_MTX_LOAD); + gSPMatrix(gfxCtx->polyOpa.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_draw.c", 674), + G_MTX_MODELVIEW | G_MTX_LOAD); gSPDisplayList(gfxCtx->polyOpa.p++, sDrawItemTable[drawId].dlists[0]); func_80093D84(globalCtx->state.gfxCtx); - gSPMatrix(gfxCtx->polyXlu.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_draw.c", 683), G_MTX_MODELVIEW | G_MTX_LOAD); + gSPMatrix(gfxCtx->polyXlu.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_draw.c", 683), + G_MTX_MODELVIEW | G_MTX_LOAD); gSPDisplayList(gfxCtx->polyXlu.p++, sDrawItemTable[drawId].dlists[1]); gSPSegment(gfxCtx->polyXlu.p++, 0x08, - Draw_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)); + 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(gfxCtx->polyXlu.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_draw.c", 698), G_MTX_MODELVIEW | G_MTX_LOAD); + gSPMatrix(gfxCtx->polyXlu.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_draw.c", 698), + G_MTX_MODELVIEW | G_MTX_LOAD); gSPDisplayList(gfxCtx->polyXlu.p++, sDrawItemTable[drawId].dlists[2]); Matrix_Pull(); - func_800C6B54(gfxArr, globalCtx->state.gfxCtx, "../z_draw.c", 704); + Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_draw.c", 704); } -static void func_80069CF0(GlobalContext* globalCtx, s16 drawId) -{ +static void func_80069CF0(GlobalContext* globalCtx, s16 drawId) { GraphicsContext* gfxCtx = globalCtx->state.gfxCtx; - Gfx* gfxArr[5]; + Gfx* dispRefs[5]; - func_800C6AC4(gfxArr, globalCtx->state.gfxCtx, "../z_draw.c", 712); + Graph_OpenDisps(dispRefs, globalCtx->state.gfxCtx, "../z_draw.c", 712); func_80093D18(globalCtx->state.gfxCtx); gSPSegment(gfxCtx->polyOpa.p++, 0x08, - Draw_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(gfxCtx->polyOpa.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_draw.c", 723), G_MTX_MODELVIEW | G_MTX_LOAD); + 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(gfxCtx->polyOpa.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_draw.c", 723), + G_MTX_MODELVIEW | G_MTX_LOAD); gSPDisplayList(gfxCtx->polyOpa.p++, sDrawItemTable[drawId].dlists[0]); func_80093D84(globalCtx->state.gfxCtx); - gSPMatrix(gfxCtx->polyXlu.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_draw.c", 730), G_MTX_MODELVIEW | G_MTX_LOAD); + gSPMatrix(gfxCtx->polyXlu.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_draw.c", 730), + G_MTX_MODELVIEW | G_MTX_LOAD); gSPDisplayList(gfxCtx->polyXlu.p++, sDrawItemTable[drawId].dlists[1]); - - func_800C6B54(gfxArr, globalCtx->state.gfxCtx, "../z_draw.c", 735); + Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_draw.c", 735); } -static void func_80069EB0(GlobalContext* globalCtx, s16 drawId) -{ +static void func_80069EB0(GlobalContext* globalCtx, s16 drawId) { GraphicsContext* gfxCtx = globalCtx->state.gfxCtx; - Gfx* gfxArr[5]; + Gfx* dispRefs[5]; - func_800C6AC4(gfxArr, globalCtx->state.gfxCtx, "../z_draw.c", 742); + Graph_OpenDisps(dispRefs, globalCtx->state.gfxCtx, "../z_draw.c", 742); func_80093D18(globalCtx->state.gfxCtx); - gSPMatrix(gfxCtx->polyOpa.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_draw.c", 746), G_MTX_MODELVIEW | G_MTX_LOAD); + gSPMatrix(gfxCtx->polyOpa.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_draw.c", 746), + G_MTX_MODELVIEW | G_MTX_LOAD); gSPDisplayList(gfxCtx->polyOpa.p++, sDrawItemTable[drawId].dlists[0]); func_80093D84(globalCtx->state.gfxCtx); gSPSegment(gfxCtx->polyXlu.p++, 0x08, - Draw_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(gfxCtx->polyXlu.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_draw.c", 760), G_MTX_MODELVIEW | G_MTX_LOAD); + 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(gfxCtx->polyXlu.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_draw.c", 760), + G_MTX_MODELVIEW | G_MTX_LOAD); gSPDisplayList(gfxCtx->polyXlu.p++, sDrawItemTable[drawId].dlists[1]); - func_800C6B54(gfxArr, globalCtx->state.gfxCtx, "../z_draw.c", 765); + Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_draw.c", 765); } -static void func_8006A060(GlobalContext* globalCtx, s16 drawId) -{ +static void func_8006A060(GlobalContext* globalCtx, s16 drawId) { GraphicsContext* gfxCtx = globalCtx->state.gfxCtx; - Gfx* gfxArr[5]; + Gfx* dispRefs[5]; - func_800C6AC4(gfxArr, globalCtx->state.gfxCtx, "../z_draw.c", 772); + Graph_OpenDisps(dispRefs, globalCtx->state.gfxCtx, "../z_draw.c", 772); func_80093BA8(globalCtx->state.gfxCtx); - gSPMatrix(gfxCtx->polyOpa.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_draw.c", 776), G_MTX_MODELVIEW | G_MTX_LOAD); + gSPMatrix(gfxCtx->polyOpa.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_draw.c", 776), + G_MTX_MODELVIEW | G_MTX_LOAD); gSPDisplayList(gfxCtx->polyOpa.p++, sDrawItemTable[drawId].dlists[0]); gSPDisplayList(gfxCtx->polyOpa.p++, sDrawItemTable[drawId].dlists[1]); - func_800C6B54(gfxArr, globalCtx->state.gfxCtx, "../z_draw.c", 783); + Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_draw.c", 783); } -static void func_8006A158(GlobalContext* globalCtx, s16 drawId) -{ +static void func_8006A158(GlobalContext* globalCtx, s16 drawId) { GraphicsContext* gfxCtx = globalCtx->state.gfxCtx; - Gfx* gfxArr[5]; + Gfx* dispRefs[5]; - func_800C6AC4(gfxArr, globalCtx->state.gfxCtx, "../z_draw.c", 811); + Graph_OpenDisps(dispRefs, globalCtx->state.gfxCtx, "../z_draw.c", 811); func_80093D18(globalCtx->state.gfxCtx); - gSPMatrix(gfxCtx->polyOpa.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_draw.c", 815), G_MTX_MODELVIEW | G_MTX_LOAD); + gSPMatrix(gfxCtx->polyOpa.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_draw.c", 815), + G_MTX_MODELVIEW | G_MTX_LOAD); gSPDisplayList(gfxCtx->polyOpa.p++, sDrawItemTable[drawId].dlists[0]); - gfxCtx->polyXlu.p = func_80093774(gfxCtx->polyXlu.p, 5); - gSPMatrix(gfxCtx->polyXlu.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_draw.c", 822), G_MTX_MODELVIEW | G_MTX_LOAD); + gfxCtx->polyXlu.p = Gfx_CallSetupDL(gfxCtx->polyXlu.p, 5); + gSPMatrix(gfxCtx->polyXlu.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_draw.c", 822), + G_MTX_MODELVIEW | G_MTX_LOAD); gSPDisplayList(gfxCtx->polyXlu.p++, sDrawItemTable[drawId].dlists[1]); - func_800C6B54(gfxArr, globalCtx->state.gfxCtx, "../z_draw.c", 827); + Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_draw.c", 827); } -static void func_8006A2A0(GlobalContext* globalCtx, s16 drawId) -{ +static void func_8006A2A0(GlobalContext* globalCtx, s16 drawId) { GraphicsContext* gfxCtx = globalCtx->state.gfxCtx; - Gfx* gfxArr[5]; + Gfx* dispRefs[5]; - func_800C6AC4(gfxArr, globalCtx->state.gfxCtx, "../z_draw.c", 834); + Graph_OpenDisps(dispRefs, globalCtx->state.gfxCtx, "../z_draw.c", 834); func_80093D18(globalCtx->state.gfxCtx); gSPSegment(gfxCtx->polyOpa.p++, 0x08, - Draw_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(gfxCtx->polyOpa.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_draw.c", 845), G_MTX_MODELVIEW | G_MTX_LOAD); + 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(gfxCtx->polyOpa.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_draw.c", 845), + G_MTX_MODELVIEW | G_MTX_LOAD); gSPDisplayList(gfxCtx->polyOpa.p++, sDrawItemTable[drawId].dlists[1]); gSPDisplayList(gfxCtx->polyOpa.p++, sDrawItemTable[drawId].dlists[0]); gSPDisplayList(gfxCtx->polyOpa.p++, sDrawItemTable[drawId].dlists[2]); gSPDisplayList(gfxCtx->polyOpa.p++, sDrawItemTable[drawId].dlists[3]); func_80093D84(globalCtx->state.gfxCtx); - gSPMatrix(gfxCtx->polyXlu.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_draw.c", 855), G_MTX_MODELVIEW | G_MTX_LOAD); + gSPMatrix(gfxCtx->polyXlu.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_draw.c", 855), + G_MTX_MODELVIEW | G_MTX_LOAD); gSPDisplayList(gfxCtx->polyXlu.p++, sDrawItemTable[drawId].dlists[4]); gSPDisplayList(gfxCtx->polyXlu.p++, sDrawItemTable[drawId].dlists[5]); - func_800C6B54(gfxArr, globalCtx->state.gfxCtx, "../z_draw.c", 861); + Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_draw.c", 861); } -static void func_8006A4B0(GlobalContext* globalCtx, s16 drawId) -{ +static void func_8006A4B0(GlobalContext* globalCtx, s16 drawId) { GraphicsContext* gfxCtx = globalCtx->state.gfxCtx; - Gfx* gfxArr[5]; + Gfx* dispRefs[5]; - func_800C6AC4(gfxArr, globalCtx->state.gfxCtx, "../z_draw.c", 868); + Graph_OpenDisps(dispRefs, globalCtx->state.gfxCtx, "../z_draw.c", 868); func_80093D18(globalCtx->state.gfxCtx); gSPSegment(gfxCtx->polyOpa.p++, 0x08, - Draw_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(gfxCtx->polyOpa.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_draw.c", 878), G_MTX_MODELVIEW | G_MTX_LOAD); + 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(gfxCtx->polyOpa.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_draw.c", 878), + G_MTX_MODELVIEW | G_MTX_LOAD); gSPDisplayList(gfxCtx->polyOpa.p++, sDrawItemTable[drawId].dlists[0]); - func_800C6B54(gfxArr, globalCtx->state.gfxCtx, "../z_draw.c", 883); + Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_draw.c", 883); } -static void func_8006A5F0(GlobalContext* globalCtx, s16 drawId) -{ +static void func_8006A5F0(GlobalContext* globalCtx, s16 drawId) { GraphicsContext* gfxCtx = globalCtx->state.gfxCtx; - Gfx* gfxArr[5]; + Gfx* dispRefs[5]; - func_800C6AC4(gfxArr, globalCtx->state.gfxCtx, "../z_draw.c", 890); + Graph_OpenDisps(dispRefs, globalCtx->state.gfxCtx, "../z_draw.c", 890); func_80093D18(globalCtx->state.gfxCtx); gSPSegment(gfxCtx->polyOpa.p++, 0x08, - Draw_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(gfxCtx->polyOpa.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_draw.c", 901), G_MTX_MODELVIEW | G_MTX_LOAD); + 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(gfxCtx->polyOpa.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_draw.c", 901), + G_MTX_MODELVIEW | G_MTX_LOAD); gSPDisplayList(gfxCtx->polyOpa.p++, sDrawItemTable[drawId].dlists[0]); - func_800C6B54(gfxArr, globalCtx->state.gfxCtx, "../z_draw.c", 906); + Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_draw.c", 906); } -static void func_8006A73C(GlobalContext* globalCtx, s16 drawId) -{ +static void func_8006A73C(GlobalContext* globalCtx, s16 drawId) { GraphicsContext* gfxCtx = globalCtx->state.gfxCtx; - Gfx* gfxArr[5]; + Gfx* dispRefs[5]; - func_800C6AC4(gfxArr, globalCtx->state.gfxCtx, "../z_draw.c", 913); + Graph_OpenDisps(dispRefs, globalCtx->state.gfxCtx, "../z_draw.c", 913); func_80093D84(globalCtx->state.gfxCtx); gSPSegment(gfxCtx->polyXlu.p++, 0x08, - Draw_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(gfxCtx->polyXlu.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_draw.c", 924), G_MTX_MODELVIEW | G_MTX_LOAD); + 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(gfxCtx->polyXlu.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_draw.c", 924), + G_MTX_MODELVIEW | G_MTX_LOAD); gSPDisplayList(gfxCtx->polyXlu.p++, sDrawItemTable[drawId].dlists[0]); - func_800C6B54(gfxArr, globalCtx->state.gfxCtx, "../z_draw.c", 929); + Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_draw.c", 929); } -static void func_8006A88C(GlobalContext* globalCtx, s16 drawId) -{ +static void func_8006A88C(GlobalContext* globalCtx, s16 drawId) { GraphicsContext* gfxCtx = globalCtx->state.gfxCtx; - Gfx* gfxArr[5]; + Gfx* dispRefs[5]; - func_800C6AC4(gfxArr, globalCtx->state.gfxCtx, "../z_draw.c", 936); + Graph_OpenDisps(dispRefs, globalCtx->state.gfxCtx, "../z_draw.c", 936); func_80093D84(globalCtx->state.gfxCtx); gSPSegment(gfxCtx->polyXlu.p++, 0x08, - Draw_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(gfxCtx->polyXlu.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_draw.c", 947), G_MTX_MODELVIEW | G_MTX_LOAD); + 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(gfxCtx->polyXlu.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_draw.c", 947), + G_MTX_MODELVIEW | G_MTX_LOAD); gSPDisplayList(gfxCtx->polyXlu.p++, sDrawItemTable[drawId].dlists[0]); - func_800C6B54(gfxArr, globalCtx->state.gfxCtx, "../z_draw.c", 952); + Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_draw.c", 952); } -static void func_8006A9CC(GlobalContext* globalCtx, s16 drawId) -{ +static void func_8006A9CC(GlobalContext* globalCtx, s16 drawId) { GraphicsContext* gfxCtx = globalCtx->state.gfxCtx; - Gfx* gfxArr[5]; + Gfx* dispRefs[5]; - func_800C6AC4(gfxArr, globalCtx->state.gfxCtx, "../z_draw.c", 959); + Graph_OpenDisps(dispRefs, globalCtx->state.gfxCtx, "../z_draw.c", 959); func_80093D18(globalCtx->state.gfxCtx); - gSPMatrix(gfxCtx->polyOpa.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_draw.c", 963), G_MTX_MODELVIEW | G_MTX_LOAD); + gSPMatrix(gfxCtx->polyOpa.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_draw.c", 963), + G_MTX_MODELVIEW | G_MTX_LOAD); gSPDisplayList(gfxCtx->polyOpa.p++, sDrawItemTable[drawId].dlists[0]); - func_800C6B54(gfxArr, globalCtx->state.gfxCtx, "../z_draw.c", 968); + Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_draw.c", 968); } -static void func_8006AAA8(GlobalContext* globalCtx, s16 drawId) -{ +static void func_8006AAA8(GlobalContext* globalCtx, s16 drawId) { GraphicsContext* gfxCtx = globalCtx->state.gfxCtx; - Gfx* gfxArr[5]; + Gfx* dispRefs[5]; - func_800C6AC4(gfxArr, globalCtx->state.gfxCtx, "../z_draw.c", 975); + Graph_OpenDisps(dispRefs, globalCtx->state.gfxCtx, "../z_draw.c", 975); func_80093D18(globalCtx->state.gfxCtx); - gSPMatrix(gfxCtx->polyOpa.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_draw.c", 979), G_MTX_MODELVIEW | G_MTX_LOAD); + gSPMatrix(gfxCtx->polyOpa.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_draw.c", 979), + G_MTX_MODELVIEW | G_MTX_LOAD); gSPDisplayList(gfxCtx->polyOpa.p++, sDrawItemTable[drawId].dlists[0]); func_80093D84(globalCtx->state.gfxCtx); - gSPMatrix(gfxCtx->polyXlu.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_draw.c", 986), G_MTX_MODELVIEW | G_MTX_LOAD); + gSPMatrix(gfxCtx->polyXlu.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_draw.c", 986), + G_MTX_MODELVIEW | G_MTX_LOAD); gSPDisplayList(gfxCtx->polyXlu.p++, sDrawItemTable[drawId].dlists[1]); - func_800C6B54(gfxArr, globalCtx->state.gfxCtx, "../z_draw.c", 991); + Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_draw.c", 991); } -static void func_8006ABEC(GlobalContext* globalCtx, s16 drawId) -{ +static void func_8006ABEC(GlobalContext* globalCtx, s16 drawId) { GraphicsContext* gfxCtx = globalCtx->state.gfxCtx; - Gfx* gfxArr[5]; + Gfx* dispRefs[5]; - func_800C6AC4(gfxArr, globalCtx->state.gfxCtx, "../z_draw.c", 998); + Graph_OpenDisps(dispRefs, globalCtx->state.gfxCtx, "../z_draw.c", 998); func_80093D84(globalCtx->state.gfxCtx); - gSPMatrix(gfxCtx->polyXlu.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_draw.c", 1002), G_MTX_MODELVIEW | G_MTX_LOAD); + gSPMatrix(gfxCtx->polyXlu.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_draw.c", 1002), + G_MTX_MODELVIEW | G_MTX_LOAD); gSPDisplayList(gfxCtx->polyXlu.p++, sDrawItemTable[drawId].dlists[0]); gSPDisplayList(gfxCtx->polyXlu.p++, sDrawItemTable[drawId].dlists[1]); - func_800C6B54(gfxArr, globalCtx->state.gfxCtx, "../z_draw.c", 1008); + Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_draw.c", 1008); } -static void func_8006ACE4(GlobalContext* globalCtx, s16 drawId) -{ +static void func_8006ACE4(GlobalContext* globalCtx, s16 drawId) { GraphicsContext* gfxCtx = globalCtx->state.gfxCtx; - Gfx* gfxArr[5]; + Gfx* dispRefs[5]; - func_800C6AC4(gfxArr, globalCtx->state.gfxCtx, "../z_draw.c", 1015); + Graph_OpenDisps(dispRefs, globalCtx->state.gfxCtx, "../z_draw.c", 1015); func_80093D18(globalCtx->state.gfxCtx); - gSPMatrix(gfxCtx->polyOpa.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_draw.c", 1019), G_MTX_MODELVIEW | G_MTX_LOAD); + gSPMatrix(gfxCtx->polyOpa.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_draw.c", 1019), + G_MTX_MODELVIEW | G_MTX_LOAD); gSPDisplayList(gfxCtx->polyOpa.p++, sDrawItemTable[drawId].dlists[1]); gSPDisplayList(gfxCtx->polyOpa.p++, sDrawItemTable[drawId].dlists[0]); func_80093D84(globalCtx->state.gfxCtx); - gSPMatrix(gfxCtx->polyXlu.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_draw.c", 1027), G_MTX_MODELVIEW | G_MTX_LOAD); + gSPMatrix(gfxCtx->polyXlu.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_draw.c", 1027), + G_MTX_MODELVIEW | G_MTX_LOAD); gSPDisplayList(gfxCtx->polyXlu.p++, sDrawItemTable[drawId].dlists[2]); - func_800C6B54(gfxArr, globalCtx->state.gfxCtx, "../z_draw.c", 1032); + Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_draw.c", 1032); } -static void func_8006AE40(GlobalContext* globalCtx, s16 drawId) -{ +static void func_8006AE40(GlobalContext* globalCtx, s16 drawId) { GraphicsContext* gfxCtx = globalCtx->state.gfxCtx; - Gfx* gfxArr[5]; + Gfx* dispRefs[5]; - func_800C6AC4(gfxArr, globalCtx->state.gfxCtx, "../z_draw.c", 1039); + Graph_OpenDisps(dispRefs, globalCtx->state.gfxCtx, "../z_draw.c", 1039); func_80093D18(globalCtx->state.gfxCtx); - gSPMatrix(gfxCtx->polyOpa.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_draw.c", 1043), G_MTX_MODELVIEW | G_MTX_LOAD); + gSPMatrix(gfxCtx->polyOpa.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_draw.c", 1043), + G_MTX_MODELVIEW | G_MTX_LOAD); gSPDisplayList(gfxCtx->polyOpa.p++, sDrawItemTable[drawId].dlists[0]); func_80093D84(globalCtx->state.gfxCtx); - gSPMatrix(gfxCtx->polyXlu.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_draw.c", 1050), G_MTX_MODELVIEW | G_MTX_LOAD); + gSPMatrix(gfxCtx->polyXlu.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_draw.c", 1050), + G_MTX_MODELVIEW | G_MTX_LOAD); gSPDisplayList(gfxCtx->polyXlu.p++, sDrawItemTable[drawId].dlists[1]); gSPDisplayList(gfxCtx->polyXlu.p++, sDrawItemTable[drawId].dlists[2]); - func_800C6B54(gfxArr, globalCtx->state.gfxCtx, "../z_draw.c", 1056); + Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_draw.c", 1056); } -static void func_8006AF9C(GlobalContext* globalCtx, s16 drawId) -{ +static void func_8006AF9C(GlobalContext* globalCtx, s16 drawId) { GraphicsContext* gfxCtx = globalCtx->state.gfxCtx; - Gfx* gfxArr[5]; + Gfx* dispRefs[5]; - func_800C6AC4(gfxArr, globalCtx->state.gfxCtx, "../z_draw.c", 1063); + Graph_OpenDisps(dispRefs, globalCtx->state.gfxCtx, "../z_draw.c", 1063); func_80093D84(globalCtx->state.gfxCtx); gSPSegment(gfxCtx->polyXlu.p++, 0x08, - Draw_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(gfxCtx->polyXlu.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_draw.c", 1074), G_MTX_MODELVIEW | G_MTX_LOAD); + 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(gfxCtx->polyXlu.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_draw.c", 1074), + G_MTX_MODELVIEW | G_MTX_LOAD); gSPDisplayList(gfxCtx->polyXlu.p++, sDrawItemTable[drawId].dlists[0]); gSPDisplayList(gfxCtx->polyXlu.p++, sDrawItemTable[drawId].dlists[1]); gSPDisplayList(gfxCtx->polyXlu.p++, sDrawItemTable[drawId].dlists[2]); - func_800C6B54(gfxArr, globalCtx->state.gfxCtx, "../z_draw.c", 1081); + Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_draw.c", 1081); } -static void func_8006B124(GlobalContext* globalCtx, s16 drawId) -{ +static void func_8006B124(GlobalContext* globalCtx, s16 drawId) { GraphicsContext* gfxCtx = globalCtx->state.gfxCtx; - Gfx* gfxArr[5]; + Gfx* dispRefs[5]; - func_800C6AC4(gfxArr, globalCtx->state.gfxCtx, "../z_draw.c", 1088); + Graph_OpenDisps(dispRefs, globalCtx->state.gfxCtx, "../z_draw.c", 1088); func_80093D18(globalCtx->state.gfxCtx); - gSPMatrix(gfxCtx->polyOpa.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_draw.c", 1092), G_MTX_MODELVIEW | G_MTX_LOAD); + gSPMatrix(gfxCtx->polyOpa.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_draw.c", 1092), + G_MTX_MODELVIEW | G_MTX_LOAD); gSPDisplayList(gfxCtx->polyOpa.p++, sDrawItemTable[drawId].dlists[1]); gSPDisplayList(gfxCtx->polyOpa.p++, sDrawItemTable[drawId].dlists[0]); gSPDisplayList(gfxCtx->polyOpa.p++, sDrawItemTable[drawId].dlists[2]); gSPDisplayList(gfxCtx->polyOpa.p++, sDrawItemTable[drawId].dlists[3]); - func_800C6B54(gfxArr, globalCtx->state.gfxCtx, "../z_draw.c", 1100); + Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_draw.c", 1100); } -static void func_8006B24C(GlobalContext* globalCtx, s16 drawId) -{ +static void func_8006B24C(GlobalContext* globalCtx, s16 drawId) { GraphicsContext* gfxCtx = globalCtx->state.gfxCtx; - Gfx* gfxArr[5]; + Gfx* dispRefs[5]; - func_800C6AC4(gfxArr, globalCtx->state.gfxCtx, "../z_draw.c", 1108); + Graph_OpenDisps(dispRefs, globalCtx->state.gfxCtx, "../z_draw.c", 1108); func_80093D18(globalCtx->state.gfxCtx); - gSPMatrix(gfxCtx->polyOpa.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_draw.c", 1112), G_MTX_MODELVIEW | G_MTX_LOAD); + gSPMatrix(gfxCtx->polyOpa.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_draw.c", 1112), + G_MTX_MODELVIEW | G_MTX_LOAD); gSPDisplayList(gfxCtx->polyOpa.p++, sDrawItemTable[drawId].dlists[1]); gSPDisplayList(gfxCtx->polyOpa.p++, sDrawItemTable[drawId].dlists[0]); func_80093D84(globalCtx->state.gfxCtx); - gSPMatrix(gfxCtx->polyXlu.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_draw.c", 1120), G_MTX_MODELVIEW | G_MTX_LOAD); + gSPMatrix(gfxCtx->polyXlu.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_draw.c", 1120), + G_MTX_MODELVIEW | G_MTX_LOAD); gSPDisplayList(gfxCtx->polyXlu.p++, sDrawItemTable[drawId].dlists[3]); gSPDisplayList(gfxCtx->polyXlu.p++, sDrawItemTable[drawId].dlists[2]); - func_800C6B54(gfxArr, globalCtx->state.gfxCtx, "../z_draw.c", 1126); + Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_draw.c", 1126); } -static void func_8006B3C0(GlobalContext* globalCtx, s16 drawId) -{ +static void func_8006B3C0(GlobalContext* globalCtx, s16 drawId) { GraphicsContext* gfxCtx = globalCtx->state.gfxCtx; - Gfx* gfxArr[5]; + Gfx* dispRefs[5]; - func_800C6AC4(gfxArr, globalCtx->state.gfxCtx, "../z_draw.c", 1133); + Graph_OpenDisps(dispRefs, globalCtx->state.gfxCtx, "../z_draw.c", 1133); Matrix_Scale(0.7f, 0.7f, 0.7f, MTXMODE_APPLY); func_80093D18(globalCtx->state.gfxCtx); - gSPMatrix(gfxCtx->polyOpa.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_draw.c", 1140), G_MTX_MODELVIEW | G_MTX_LOAD); + gSPMatrix(gfxCtx->polyOpa.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_draw.c", 1140), + G_MTX_MODELVIEW | G_MTX_LOAD); gSPDisplayList(gfxCtx->polyOpa.p++, sDrawItemTable[drawId].dlists[1]); gSPDisplayList(gfxCtx->polyOpa.p++, sDrawItemTable[drawId].dlists[0]); func_80093D84(globalCtx->state.gfxCtx); - gSPMatrix(gfxCtx->polyXlu.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_draw.c", 1148), G_MTX_MODELVIEW | G_MTX_LOAD); + gSPMatrix(gfxCtx->polyXlu.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_draw.c", 1148), + G_MTX_MODELVIEW | G_MTX_LOAD); gSPDisplayList(gfxCtx->polyXlu.p++, sDrawItemTable[drawId].dlists[3]); gSPDisplayList(gfxCtx->polyXlu.p++, sDrawItemTable[drawId].dlists[2]); - func_800C6B54(gfxArr, globalCtx->state.gfxCtx, "../z_draw.c", 1154); + Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_draw.c", 1154); } -static void func_8006B54C(GlobalContext* globalCtx, s16 drawId) -{ +static void func_8006B54C(GlobalContext* globalCtx, s16 drawId) { GraphicsContext* gfxCtx = globalCtx->state.gfxCtx; - Gfx* gfxArr[5]; + Gfx* dispRefs[5]; - func_800C6AC4(gfxArr, globalCtx->state.gfxCtx, "../z_draw.c", 1162); + Graph_OpenDisps(dispRefs, globalCtx->state.gfxCtx, "../z_draw.c", 1162); func_80093D84(globalCtx->state.gfxCtx); gSPSegment(gfxCtx->polyXlu.p++, 0x08, - Draw_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(gfxCtx->polyXlu.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_draw.c", 1173), G_MTX_MODELVIEW | G_MTX_LOAD); + 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(gfxCtx->polyXlu.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_draw.c", 1173), + G_MTX_MODELVIEW | G_MTX_LOAD); gSPDisplayList(gfxCtx->polyXlu.p++, sDrawItemTable[drawId].dlists[2]); gSPDisplayList(gfxCtx->polyXlu.p++, sDrawItemTable[drawId].dlists[3]); gSPDisplayList(gfxCtx->polyXlu.p++, sDrawItemTable[drawId].dlists[1]); gSPDisplayList(gfxCtx->polyXlu.p++, sDrawItemTable[drawId].dlists[0]); - func_800C6B54(gfxArr, globalCtx->state.gfxCtx, "../z_draw.c", 1181); + Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_draw.c", 1181); } -static void func_8006B6E4(GlobalContext* globalCtx, s16 drawId) -{ +static void func_8006B6E4(GlobalContext* globalCtx, s16 drawId) { GraphicsContext* gfxCtx = globalCtx->state.gfxCtx; - Gfx* gfxArr[5]; + Gfx* dispRefs[5]; - func_800C6AC4(gfxArr, globalCtx->state.gfxCtx, "../z_draw.c", 1188); + Graph_OpenDisps(dispRefs, globalCtx->state.gfxCtx, "../z_draw.c", 1188); func_80093D18(globalCtx->state.gfxCtx); - gSPMatrix(gfxCtx->polyOpa.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_draw.c", 1192), G_MTX_MODELVIEW | G_MTX_LOAD); + gSPMatrix(gfxCtx->polyOpa.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_draw.c", 1192), + G_MTX_MODELVIEW | G_MTX_LOAD); gSPDisplayList(gfxCtx->polyOpa.p++, sDrawItemTable[drawId].dlists[1]); gSPDisplayList(gfxCtx->polyOpa.p++, sDrawItemTable[drawId].dlists[0]); func_80093D84(globalCtx->state.gfxCtx); - gSPMatrix(gfxCtx->polyXlu.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_draw.c", 1200), G_MTX_MODELVIEW | G_MTX_LOAD); + gSPMatrix(gfxCtx->polyXlu.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_draw.c", 1200), + G_MTX_MODELVIEW | G_MTX_LOAD); gSPDisplayList(gfxCtx->polyXlu.p++, sDrawItemTable[drawId].dlists[2]); gSPDisplayList(gfxCtx->polyXlu.p++, sDrawItemTable[drawId].dlists[3]); gSPDisplayList(gfxCtx->polyXlu.p++, sDrawItemTable[drawId].dlists[4]); - func_800C6B54(gfxArr, globalCtx->state.gfxCtx, "../z_draw.c", 1207); + Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_draw.c", 1207); } -static void func_8006B870(GlobalContext* globalCtx, s16 drawId) -{ +static void func_8006B870(GlobalContext* globalCtx, s16 drawId) { u32 pad; GraphicsContext* gfxCtx = globalCtx->state.gfxCtx; - Gfx* gfxArr[4]; + Gfx* dispRefs[4]; - func_800C6AC4(gfxArr, globalCtx->state.gfxCtx, "../z_draw.c", 1214); + Graph_OpenDisps(dispRefs, globalCtx->state.gfxCtx, "../z_draw.c", 1214); func_80093D18(globalCtx->state.gfxCtx); - gSPMatrix(gfxCtx->polyOpa.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_draw.c", 1218), G_MTX_MODELVIEW | G_MTX_LOAD); + gSPMatrix(gfxCtx->polyOpa.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_draw.c", 1218), + G_MTX_MODELVIEW | G_MTX_LOAD); gSPDisplayList(gfxCtx->polyOpa.p++, sDrawItemTable[drawId].dlists[1]); gSPDisplayList(gfxCtx->polyOpa.p++, sDrawItemTable[drawId].dlists[0]); gSPDisplayList(gfxCtx->polyOpa.p++, sDrawItemTable[drawId].dlists[2]); @@ -676,5 +690,5 @@ static void func_8006B870(GlobalContext* globalCtx, s16 drawId) gSPDisplayList(gfxCtx->polyOpa.p++, sDrawItemTable[drawId].dlists[6]); gSPDisplayList(gfxCtx->polyOpa.p++, sDrawItemTable[drawId].dlists[7]); - func_800C6B54(gfxArr, globalCtx->state.gfxCtx, "../z_draw.c", 1230); + Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_draw.c", 1230); } diff --git a/src/code/z_eff_blure.c b/src/code/z_eff_blure.c index eb7b016dc6..21f2bc75a2 100644 --- a/src/code/z_eff_blure.c +++ b/src/code/z_eff_blure.c @@ -9,15 +9,14 @@ #pragma GLOBAL_ASM("asm/non_matchings/code/z_eff_blure/func_80020A50.s") -void func_80020F60(u32 unused, GraphicsContext* gfxCtx) -{ - Gfx* gfxArr[5]; +void func_80020F60(u32 unused, GraphicsContext* gfxCtx) { + Gfx* dispRefs[5]; - func_800C6AC4(gfxArr, gfxCtx, D_80135180, 809); + Graph_OpenDisps(dispRefs, gfxCtx, D_80135180, 809); - gfxCtx->polyXlu.p = func_80093774(gfxCtx->polyXlu.p, 0x26); + gfxCtx->polyXlu.p = Gfx_CallSetupDL(gfxCtx->polyXlu.p, 0x26); - func_800C6B54(gfxArr, gfxCtx, D_80135194, 813); + Graph_CloseDisps(dispRefs, gfxCtx, D_80135194, 813); } #pragma GLOBAL_ASM("asm/non_matchings/code/z_eff_blure/func_80020FC0.s") @@ -29,4 +28,3 @@ void func_80020F60(u32 unused, GraphicsContext* gfxCtx) #pragma GLOBAL_ASM("asm/non_matchings/code/z_eff_blure/func_800224F4.s") #pragma GLOBAL_ASM("asm/non_matchings/code/z_eff_blure/func_80022A10.s") - diff --git a/src/code/z_eff_shield_particle.c b/src/code/z_eff_shield_particle.c index fd85f4abb7..d3f2591f82 100644 --- a/src/code/z_eff_shield_particle.c +++ b/src/code/z_eff_shield_particle.c @@ -8,4 +8,3 @@ #pragma GLOBAL_ASM("asm/non_matchings/code/z_eff_shield_particle/func_8002389C.s") #pragma GLOBAL_ASM("asm/non_matchings/code/z_eff_shield_particle/func_800245BC.s") - diff --git a/src/code/z_eff_spark.c b/src/code/z_eff_spark.c index f24a7f3ab6..5f7c2a65f5 100644 --- a/src/code/z_eff_spark.c +++ b/src/code/z_eff_spark.c @@ -3,12 +3,9 @@ #pragma GLOBAL_ASM("asm/non_matchings/code/z_eff_spark/func_80024B00.s") -void func_80024F0C(UNK_TYPE arg0) -{ - +void func_80024F0C(UNK_TYPE arg0) { } #pragma GLOBAL_ASM("asm/non_matchings/code/z_eff_spark/func_80024F14.s") #pragma GLOBAL_ASM("asm/non_matchings/code/z_eff_spark/func_80025000.s") - diff --git a/src/code/z_eff_ss_dead.c b/src/code/z_eff_ss_dead.c index c3228d70b1..f203e81e4e 100644 --- a/src/code/z_eff_ss_dead.c +++ b/src/code/z_eff_ss_dead.c @@ -12,4 +12,3 @@ #pragma GLOBAL_ASM("asm/non_matchings/code/z_eff_ss_dead/func_80026860.s") #pragma GLOBAL_ASM("asm/non_matchings/code/z_eff_ss_dead/func_80026A6C.s") - diff --git a/src/code/z_effect.c b/src/code/z_effect.c new file mode 100644 index 0000000000..dfe367d13c --- /dev/null +++ b/src/code/z_effect.c @@ -0,0 +1,26 @@ +#include +#include + +GlobalContext* func_80026B00(void) { + return D_80157DA0; +} + +#pragma GLOBAL_ASM("asm/non_matchings/code/z_effect/func_80026B0C.s") + +void func_80026C1C(u8* arg0) { + arg0[0] = 0; + arg0[1] = 0; + arg0[2] = 0; +} + +#pragma GLOBAL_ASM("asm/non_matchings/code/z_effect/func_80026C2C.s") + +#pragma GLOBAL_ASM("asm/non_matchings/code/z_effect/Effect_Add.s") + +#pragma GLOBAL_ASM("asm/non_matchings/code/z_effect/func_80026E74.s") + +#pragma GLOBAL_ASM("asm/non_matchings/code/z_effect/func_80026F70.s") + +#pragma GLOBAL_ASM("asm/non_matchings/code/z_effect/func_8002709C.s") + +#pragma GLOBAL_ASM("asm/non_matchings/code/z_effect/func_800271A8.s") diff --git a/src/code/z_effect_soft_sprite.c b/src/code/z_effect_soft_sprite.c index 833994f810..34b264bf42 100644 --- a/src/code/z_effect_soft_sprite.c +++ b/src/code/z_effect_soft_sprite.c @@ -7,8 +7,7 @@ void Effect_SS_Delete(LoadedParticleEntry* particle); #pragma GLOBAL_ASM("asm/non_matchings/code/z_effect_soft_sprite/func_800272B0.s") -void Effect_SS_Clear(GlobalContext* globalCtx) -{ +void Effect_SS_Clear(GlobalContext* globalCtx) { u32 i; LoadedParticleEntry* iter; ParticleOverlay* iter2; @@ -18,35 +17,36 @@ void Effect_SS_Clear(GlobalContext* globalCtx) EffectSS2Info.searchIndex = 0; EffectSS2Info.size = 0; - for (iter = EffectSS2Info.data_table; iter < EffectSS2Info.data_table + EffectSS2Info.size; iter++) + for (iter = EffectSS2Info.data_table; iter < EffectSS2Info.data_table + EffectSS2Info.size; iter++) { Effect_SS_Delete(iter); + } // Free memory from loaded particle overlays iter2 = &sParticleOverlayTable[0]; - for (i = 0; i < ARRAY_COUNT(sParticleOverlayTable); i++) - { + for (i = 0; i < ARRAY_COUNT(sParticleOverlayTable); i++) { addr = iter2->loadedRamAddr; - if (addr != NULL) + if (addr != NULL) { ZeldaArena_FreeDebug(addr, D_801357DC, 337); + } (iter2++)->loadedRamAddr = NULL; } } -void Effect_SS_Delete(LoadedParticleEntry* particle) -{ - if (particle->flags & 2) +void Effect_SS_Delete(LoadedParticleEntry* particle) { + if (particle->flags & 2) { func_800F89E8(particle); + } - if (particle->flags & 4) + if (particle->flags & 4) { func_800F89E8(&particle->unk_2C); + } Effect_SS_ResetEntry(particle); } -void Effect_SS_ResetEntry(LoadedParticleEntry* particle) -{ +void Effect_SS_ResetEntry(LoadedParticleEntry* particle) { u32 i; particle->type = 0x25; @@ -70,8 +70,9 @@ void Effect_SS_ResetEntry(LoadedParticleEntry* particle) particle->unk_38 = 0; particle->unk_3C = 0; - for (i = 0; i != 13; i++) + for (i = 0; i != 13; i++) { particle->unk_40[i] = 0; + } } #pragma GLOBAL_ASM("asm/non_matchings/code/z_effect_soft_sprite/func_800275D0.s") @@ -80,12 +81,10 @@ void Effect_SS_ResetEntry(LoadedParticleEntry* particle) #pragma GLOBAL_ASM("asm/non_matchings/code/z_effect_soft_sprite/func_80027798.s") -void Effect_SS_UpdateParticle(GlobalContext* globalCtx, s32 index) -{ +void Effect_SS_UpdateParticle(GlobalContext* globalCtx, s32 index) { LoadedParticleEntry* particle = &EffectSS2Info.data_table[index]; - if (particle->update != NULL) - { + if (particle->update != NULL) { particle->velocity.x += particle->acceleration.x; particle->velocity.y += particle->acceleration.y; particle->velocity.z += particle->acceleration.z; @@ -98,47 +97,43 @@ void Effect_SS_UpdateParticle(GlobalContext* globalCtx, s32 index) } } -void Effect_SS_UpdateAllParticles(GlobalContext* globalCtx) -{ +void Effect_SS_UpdateAllParticles(GlobalContext* globalCtx) { s32 i; - for (i = 0; i < EffectSS2Info.size; i++) - { - if (EffectSS2Info.data_table[i].life > -1) - { + for (i = 0; i < EffectSS2Info.size; i++) { + if (EffectSS2Info.data_table[i].life > -1) { EffectSS2Info.data_table[i].life--; - if (EffectSS2Info.data_table[i].life < 0) + if (EffectSS2Info.data_table[i].life < 0) { Effect_SS_Delete(&EffectSS2Info.data_table[i]); + } } - if (EffectSS2Info.data_table[i].life > -1) + if (EffectSS2Info.data_table[i].life > -1) { Effect_SS_UpdateParticle(globalCtx, i); + } } } -void Effect_SS_DrawParticle(GlobalContext* globalCtx, s32 index) -{ +void Effect_SS_DrawParticle(GlobalContext* globalCtx, s32 index) { LoadedParticleEntry* particle = &EffectSS2Info.data_table[index]; - if (particle->draw != NULL) + if (particle->draw != NULL) { particle->draw(globalCtx, index, particle); + } } #pragma GLOBAL_ASM("asm/non_matchings/code/z_effect_soft_sprite/func_80027BDC.s") -s16 func_80027DD4(s16 arg0, s16 arg1, s32 arg2) -{ - s16 ret = !arg2 ? arg1 : (arg0 + (s32) ((f32) (arg1 - arg0) / arg2)); +s16 func_80027DD4(s16 arg0, s16 arg1, s32 arg2) { + s16 ret = !arg2 ? arg1 : (arg0 + (s32)((f32)(arg1 - arg0) / arg2)); return ret; } -s16 func_80027E34(s16 a0, s16 a1, f32 a2) -{ +s16 func_80027E34(s16 a0, s16 a1, f32 a2) { return (a1 - a0) * a2 + a0; } -u8 func_80027E84(u8 a0, u8 a1, f32 a2) -{ +u8 func_80027E84(u8 a0, u8 a1, f32 a2) { return a2 * ((f32)a1 - (f32)a0) + a0; } diff --git a/src/code/z_effect_soft_sprite_old_init.c b/src/code/z_effect_soft_sprite_old_init.c index a385667eed..847e25e2fa 100644 --- a/src/code/z_effect_soft_sprite_old_init.c +++ b/src/code/z_effect_soft_sprite_old_init.c @@ -164,4 +164,3 @@ #pragma GLOBAL_ASM("asm/non_matchings/code/z_effect_soft_sprite_old_init/func_8002A9F4.s") #pragma GLOBAL_ASM("asm/non_matchings/code/z_effect_soft_sprite_old_init/func_8002AA44.s") - diff --git a/src/code/z_elf_message.c b/src/code/z_elf_message.c index dabceae8c1..ad7ae66c6b 100644 --- a/src/code/z_elf_message.c +++ b/src/code/z_elf_message.c @@ -1,14 +1,172 @@ #include #include -#pragma GLOBAL_ASM("asm/non_matchings/code/z_elf_message/func_8006BBC0.s") +// TODO: use macros to define elf messages once the format is fully documented +ElfMessage sChildSariaMsgs[] = { + { 0x66, 0x00, 0x03, 0x00 }, { 0x00, 0x37, 0x61, 0x00 }, { 0xE0, 0x00, 0x64, 0x00 }, { 0x00, 0x25, 0x62, 0x00 }, + { 0x00, 0x37, 0x63, 0x00 }, { 0x00, 0x43, 0x65, 0x00 }, { 0x06, 0x30, 0x66, 0x66 }, { 0x06, 0x30, 0x66, 0x67 }, + { 0x06, 0x30, 0x66, 0x68 }, { 0x06, 0x20, 0x67, 0x65 }, { 0x06, 0x30, 0x68, 0x69 }, { 0x06, 0x30, 0x68, 0x6A }, + { 0xE0, 0x00, 0x69, 0x00 }, +}; -#pragma GLOBAL_ASM("asm/non_matchings/code/z_elf_message/func_8006BE88.s") +ElfMessage sAdultSariaMsgs[] = { + { 0x06, 0x30, 0x6A, 0x66 }, { 0x06, 0x30, 0x6B, 0x67 }, { 0x06, 0x30, 0x6B, 0x68 }, + { 0x06, 0x30, 0x6C, 0x69 }, { 0x06, 0x30, 0x6C, 0x6A }, { 0xE0, 0x00, 0x6D, 0x00 }, +}; -#pragma GLOBAL_ASM("asm/non_matchings/code/z_elf_message/func_8006BF1C.s") +#ifdef NON_MATCHING +// minor ordering and regalloc differences +u32 ElfMessage_CheckCondition(ElfMessage* msg) { + u16 temp; -#pragma GLOBAL_ASM("asm/non_matchings/code/z_elf_message/func_8006C0FC.s") + switch (msg->byte0 & 0x1E) { + case 0: + temp = 1 << (msg->byte1 & 0x0F); + return ((msg->byte0 & 1) == 1) == !!(gSaveContext.event_chk_inf[(msg->byte1 & 0xF0) >> 4] & temp); + case 2: + return ((msg->byte0 & 1) == 1) == + !!(gBitFlags[msg->byte1 - ITEM_KEY_BOSS] & gSaveContext.dungeon_items[gSaveContext.dungeon_index]); + case 4: + return ((msg->byte0 & 1) == 1) == (msg->byte3 == INV_CONTENT(msg->byte1)); + case 6: + switch (msg->byte1 & 0xF0) { + case 0x00: + return ((msg->byte0 & 1) == 1) == ((msg->byte1 & 0x0F) == CUR_UPG_VALUE(UPG_STRENGTH)); + case 0x10: + return ((msg->byte0 & 1) == 1) == + !!((gBitFlags[msg->byte3 - ITEM_BOOTS_KOKIRI] << gEquipShifts[EQUIP_BOOTS]) & + gSaveContext.equipment); + case 0x20: + return ((msg->byte0 & 1) == 1) == + !!(gBitFlags[msg->byte3 - ITEM_SONG_MINUET + 6] & gSaveContext.quest_items); + case 0x30: + return ((msg->byte0 & 1) == 1) == + !!(gBitFlags[msg->byte3 - ITEM_MEDALLION_FOREST] & gSaveContext.quest_items); + case 0x40: + return ((msg->byte0 & 1) == 1) == !!gSaveContext.magic_acquired; + } + } -#pragma GLOBAL_ASM("asm/non_matchings/code/z_elf_message/func_8006C2B0.s") + // "Unplanned conditions" + LOG_STRING("企画外 条件", "../z_elf_message.c", 156); + __assert("0", "../z_elf_message.c", 157); -#pragma GLOBAL_ASM("asm/non_matchings/code/z_elf_message/func_8006C318.s") + return false; +} +#else +u32 ElfMessage_CheckCondition(ElfMessage* msg); +#pragma GLOBAL_ASM("asm/non_matchings/code/z_elf_message/ElfMessage_CheckCondition.s") +#endif + +u32 func_8006BE88(ElfMessage** msgp) { + u32 temp = true; + + while (((*msgp)->byte0 & 0xE0) == 0x20) { + if (!ElfMessage_CheckCondition(*msgp)) { + temp = false; + } + *msgp += 1; + } + + if (temp) { + return ElfMessage_CheckCondition(*msgp); + } else { + return false; + } +} + +u32 func_8006BF1C(ElfMessage** msgp) { + ElfMessage* msg; + u32 sp44[10]; + s32 temp1; + s32 temp2; + s32 temp3; + + msg = *msgp; + temp1 = 0; + temp2 = 0; + do { + sp44[temp2] = ElfMessage_CheckCondition(msg); + temp1 += sp44[temp2]; + temp2++; + msg++; + } while ((msg->byte0 & 0xE0) == 0x40); + + if (temp1 == 0) { + return false; + } + + temp3 = Math_Rand_ZeroFloat(temp1); + for (temp1 = 0; temp1 < temp2; temp1++) { + if (sp44[temp1]) { + if (temp3 > 0) { + temp3--; + } else { + return true; + } + } + *msgp += 1; + } + + return false; +} + +u16 ElfMessage_GetTextFromMsgs(ElfMessage* msg) { + while (true) { + switch (msg->byte0 & 0xE0) { + case 0x00: + if (ElfMessage_CheckCondition(msg)) { + return msg->byte2 | 0x100; + } + break; + case 0x20: + if (func_8006BE88(&msg)) { + return msg->byte2 | 0x100; + } + break; + case 0x40: + if (func_8006BF1C(&msg)) { + return msg->byte2 | 0x100; + } + break; + case 0x60: + if (ElfMessage_CheckCondition(msg)) { + msg += msg->byte2; + msg--; + } + break; + case 0xE0: + return msg->byte2 | 0x100; + default: + // "Unplanned conditions" + LOG_STRING("企画外 条件", "../z_elf_message.c", 281); + __assert("0", "../z_elf_message.c", 282); + } + msg++; + } +} + +u16 ElfMessage_GetSariaText(GlobalContext* globalCtx) { + Player* player = PLAYER; + ElfMessage* msgs; + + if (LINK_IS_CHILD) { + if (Actor_FindNearby(globalCtx, &player->actor, ACTOR_EN_SA, 4, 800.0f) == NULL) { + msgs = sChildSariaMsgs; + } else { + return 0x0160; // Special text about Saria preferring to talk to you face-to-face + } + } else { + msgs = sAdultSariaMsgs; + } + + return ElfMessage_GetTextFromMsgs(msgs); +} + +u16 ElfMessage_GetCUpText(GlobalContext* globalCtx) { + if (globalCtx->cUpElfMsgs == NULL) { + return 0; + } else { + return ElfMessage_GetTextFromMsgs(globalCtx->cUpElfMsgs); + } +} diff --git a/src/code/z_en_a_keep.c b/src/code/z_en_a_keep.c index 02bc0a16e8..84107e8a4c 100644 --- a/src/code/z_en_a_keep.c +++ b/src/code/z_en_a_keep.c @@ -1,8 +1,7 @@ #include #include -typedef enum -{ +typedef enum { /* 0x00 */ A_OBJ_BLOCK_SMALL, /* 0x01 */ A_OBJ_BLOCK_LARGE, /* 0x02 */ A_OBJ_BLOCK_HUGE, @@ -17,23 +16,22 @@ typedef enum /* 0x0B */ A_OBJ_KNOB } AObjType; -typedef struct -{ +typedef struct { /* 0x000 */ Actor actor; - /* 0x14C */ u32 dynaPolyId; - /* 0x150 */ f32 unk_150; - /* 0x154 */ f32 unk_154; - /* 0x158 */ s16 unk_158; - /* 0x15C */ u32 unk_15C; - /* 0x160 */ u8 unk_160; + /* 0x14C */ u32 dynaPolyId; + /* 0x150 */ f32 unk_150; + /* 0x154 */ f32 unk_154; + /* 0x158 */ s16 unk_158; + /* 0x15C */ u32 unk_15C; + /* 0x160 */ u8 unk_160; /* 0x164 */ ActorFunc updateFunc; - /* 0x168 */ s32 unk_168; - /* 0x16C */ s16 textId; - /* 0x16E */ s16 unk_16E; - /* 0x170 */ s16 unk_170; - /* 0x172 */ s16 unk_172; - /* 0x174 */ s16 unk_174; - /* 0x178 */ f32 unk_178; + /* 0x168 */ s32 unk_168; + /* 0x16C */ s16 textId; + /* 0x16E */ s16 unk_16E; + /* 0x170 */ s16 unk_170; + /* 0x172 */ s16 unk_172; + /* 0x174 */ s16 unk_174; + /* 0x178 */ f32 unk_178; /* 0x17C */ ColliderCylinderMain cylinderCollider; } ActorEnAObj; // size = 0x1C8 @@ -54,15 +52,13 @@ extern ColliderCylinderInit D_80115440; extern u32 D_8011546C[]; extern u32 D_80115484[]; -void En_A_Obj_SetNewUpdate(ActorEnAObj* this, ActorFunc newUpdateFunc) -{ +void En_A_Obj_SetNewUpdate(ActorEnAObj* this, ActorFunc newUpdateFunc) { this->updateFunc = newUpdateFunc; } #ifdef NON_MATCHING // minor ordering and regalloc differences -void En_A_Obj_Init(ActorEnAObj* this, GlobalContext* globalCtx) -{ +void En_A_Obj_Init(ActorEnAObj* this, GlobalContext* globalCtx) { u32 sp34; s16 type; s16 initialParams; @@ -77,8 +73,7 @@ void En_A_Obj_Init(ActorEnAObj* this, GlobalContext* globalCtx) this->textId = (initialParams >> 8) & 0xFF; this->actor.params = type; - switch (type & 0xFFFF) - { + switch (type & 0xFFFF) { case A_OBJ_BLOCK_SMALL: Actor_SetScale(&this->actor, 0.025f); break; @@ -99,8 +94,9 @@ void En_A_Obj_Init(ActorEnAObj* this, GlobalContext* globalCtx) break; } - if (this->actor.params >= 9) + if (this->actor.params >= 9) { sp28 = 12.0f; + } ActorShape_Init(&this->actor.shape, 0.0f, ActorShadow_DrawFunc_Circle, sp28); @@ -112,8 +108,7 @@ void En_A_Obj_Init(ActorEnAObj* this, GlobalContext* globalCtx) params = this->actor.params; this->actor.posRot2.pos = this->actor.posRot.pos; - switch (params) - { + switch (params) { case A_OBJ_BLOCK_LARGE: case A_OBJ_BLOCK_HUGE: this->dynaPolyId = 1; @@ -159,12 +154,12 @@ void En_A_Obj_Init(ActorEnAObj* this, GlobalContext* globalCtx) func_8001D234(this, params); break; } - - if (this->actor.params < 5) - this->actor.sub_98.mass = 0xFF; - if (this->dynaPolyId != -1) - { + if (this->actor.params < 5) { + this->actor.sub_98.mass = 0xFF; + } + + if (this->dynaPolyId != -1) { DynaPolyInfo_Alloc(D_8011546C[this->dynaPolyId], &sp34); this->dynaPolyId = DynaPolyInfo_RegisterActor(globalCtx, &globalCtx->colCtx.dyna, &this->actor, sp34); } @@ -173,51 +168,44 @@ void En_A_Obj_Init(ActorEnAObj* this, GlobalContext* globalCtx) #pragma GLOBAL_ASM("asm/non_matchings/code/z_en_a_keep/En_A_Obj_Init.s") #endif -void En_A_Obj_Destroy(ActorEnAObj* this, GlobalContext* globalCtx) -{ +void En_A_Obj_Destroy(ActorEnAObj* this, GlobalContext* globalCtx) { ColliderCylinderMain* cylinderCollider = &this->cylinderCollider; DynaPolyInfo_Free(globalCtx, &globalCtx->colCtx.dyna, this->dynaPolyId); - switch (this->actor.params) - { + switch (this->actor.params) { case A_OBJ_SIGNPOST_OBLONG: case A_OBJ_SIGNPOST_ARROW: ActorCollider_FreeCylinder(globalCtx, cylinderCollider); } } -void func_8001D204(ActorEnAObj* this, GlobalContext* globalCtx) -{ - if (func_8002F334(&this->actor, globalCtx)) +void func_8001D204(ActorEnAObj* this, GlobalContext* globalCtx) { + if (func_8002F334(&this->actor, globalCtx)) { func_8001D234(this, this->actor.params); + } } -void func_8001D234(ActorEnAObj* this, s16 params) -{ +void func_8001D234(ActorEnAObj* this, s16 params) { En_A_Obj_SetNewUpdate(this, (ActorFunc)func_8001D25C); } -void func_8001D25C(ActorEnAObj* this, GlobalContext* globalCtx) -{ +void func_8001D25C(ActorEnAObj* this, GlobalContext* globalCtx) { s16 var; - if (this->actor.textId != 0) - { + if (this->actor.textId != 0) { var = this->actor.rotTowardsLinkY - this->actor.shape.rot.y; - if ((ABS(var) < 0x2800) || - ((this->actor.params == 0xA) && (ABS(var) > 0x5800))) - { - if (func_8002F194(&this->actor, globalCtx)) + if ((ABS(var) < 0x2800) || ((this->actor.params == 0xA) && (ABS(var) > 0x5800))) { + if (func_8002F194(&this->actor, globalCtx)) { En_A_Obj_SetNewUpdate(this, (ActorFunc)func_8001D204); - else + } else { func_8002F2F4(&this->actor, globalCtx); + } } } } -void func_8001D310(ActorEnAObj* this, s16 params) -{ +void func_8001D310(ActorEnAObj* this, s16 params) { this->unk_16E = 0; this->unk_168 = 10; this->actor.posRot.rot.y = 0; @@ -225,41 +213,34 @@ void func_8001D310(ActorEnAObj* this, s16 params) En_A_Obj_SetNewUpdate(this, (ActorFunc)func_8001D360); } -void func_8001D360(ActorEnAObj* this, GlobalContext* globalCtx) -{ - if (this->unk_16E == 0) - { - if (this->unk_160 != 0) - { +void func_8001D360(ActorEnAObj* this, GlobalContext* globalCtx) { + if (this->unk_16E == 0) { + if (this->unk_160 != 0) { this->unk_16E++; this->unk_170 = 20; - if ((s16)(this->actor.rotTowardsLinkY + 0x4000) < 0) + if ((s16)(this->actor.rotTowardsLinkY + 0x4000) < 0) { this->unk_174 = -1000; - else + } else { this->unk_174 = 1000; + } - if (this->actor.rotTowardsLinkY < 0) + if (this->actor.rotTowardsLinkY < 0) { this->unk_172 = -this->unk_174; - else + } else { this->unk_172 = this->unk_174; + } } - } - else - { - if (this->unk_168 != 0) - { + } else { + if (this->unk_168 != 0) { this->unk_168--; - } - else - { + } else { this->actor.shape.rot.y += this->unk_172; this->actor.shape.rot.x += this->unk_174; this->unk_170--; this->actor.gravity = -1.0f; - if (this->unk_170 == 0) - { + if (this->unk_170 == 0) { this->actor.posRot.pos = this->actor.initPosRot.pos; this->unk_16E = 0; this->unk_168 = 10; @@ -271,82 +252,74 @@ void func_8001D360(ActorEnAObj* this, GlobalContext* globalCtx) } } -void func_8001D480(ActorEnAObj* this, s16 params) -{ +void func_8001D480(ActorEnAObj* this, s16 params) { En_A_Obj_SetNewUpdate(this, (ActorFunc)func_8001D4A8); } -void func_8001D4A8(ActorEnAObj* this, GlobalContext* globalCtx) -{ +void func_8001D4A8(ActorEnAObj* this, GlobalContext* globalCtx) { Math_SmoothScaleMaxMinF(&this->actor.speedXZ, 1.0f, 1.0f, 0.5f, 0.0f); this->actor.shape.rot.x = this->actor.shape.rot.x + (this->actor.posRot.rot.x >> 1); this->actor.shape.rot.z = this->actor.shape.rot.z + (this->actor.posRot.rot.z >> 1); - if ((this->actor.speedXZ != 0.0f) && (this->actor.bgCheckFlags & 0x8)) - { - if (1) // Necessary to match + if ((this->actor.speedXZ != 0.0f) && (this->actor.bgCheckFlags & 0x8)) { + if (1) { // Necessary to match this->actor.posRot.rot.y = ((this->actor.unk_7E - this->actor.posRot.rot.y) + this->actor.unk_7E) - 0x8000; + } this->actor.bgCheckFlags &= ~0x8; } - if (this->actor.bgCheckFlags & 0x2) - { - if (this->actor.velocity.y < -8.0f) - { + if (this->actor.bgCheckFlags & 0x2) { + if (this->actor.velocity.y < -8.0f) { this->actor.velocity.y *= -0.6f; this->actor.speedXZ *= 0.6f; this->actor.bgCheckFlags &= ~0x3; - } - else + } else { Actor_Kill(&this->actor); + } } } -void func_8001D5C8(ActorEnAObj* this, s16 params) -{ +void func_8001D5C8(ActorEnAObj* this, s16 params) { this->actor.unk_FC = 1200.0f; this->actor.unk_F8 = 720.0f; En_A_Obj_SetNewUpdate(this, (ActorFunc)func_8001D608); } -void func_8001D608(ActorEnAObj* this, GlobalContext* globalCtx) -{ +void func_8001D608(ActorEnAObj* this, GlobalContext* globalCtx) { this->actor.speedXZ += this->unk_150; this->actor.posRot.rot.y = this->unk_158; - this->actor.speedXZ = (this->actor.speedXZ < -2.5f) ? -2.5f : - ((this->actor.speedXZ > 2.5f) ? 2.5f : - this->actor.speedXZ); + this->actor.speedXZ = + (this->actor.speedXZ < -2.5f) ? -2.5f : ((this->actor.speedXZ > 2.5f) ? 2.5f : this->actor.speedXZ); Math_SmoothScaleMaxMinF(&this->actor.speedXZ, 0.0f, 1.0f, 1.0f, 0.0f); - if (this->actor.speedXZ != 0.0f) + if (this->actor.speedXZ != 0.0f) { Audio_PlayActorSound2(&this->actor, 0x200A); + } this->unk_154 = 0.0f; this->unk_150 = 0.0f; } -void En_A_Obj_Update(ActorEnAObj* this, GlobalContext* globalCtx) -{ +void En_A_Obj_Update(ActorEnAObj* this, GlobalContext* globalCtx) { ColliderCylinderMain* cylinderCollider; this->updateFunc(this, globalCtx); Actor_MoveForward(&this->actor); - if (this->actor.gravity != 0.0f) - { - if (this->actor.params != A_OBJ_KNOB) + if (this->actor.gravity != 0.0f) { + if (this->actor.params != A_OBJ_KNOB) { func_8002E4B4(globalCtx, &this->actor, 5.0f, 40.0f, 0.0f, 0x1D); - else + } else { func_8002E4B4(globalCtx, &this->actor, 5.0f, 20.0f, 0.0f, 0x1D); + } } this->actor.posRot2.pos = this->actor.posRot.pos; this->actor.posRot2.pos.y += this->unk_178; - switch (this->actor.params) - { + switch (this->actor.params) { case A_OBJ_SIGNPOST_OBLONG: case A_OBJ_SIGNPOST_ARROW: cylinderCollider = &this->cylinderCollider; @@ -355,24 +328,26 @@ void En_A_Obj_Update(ActorEnAObj* this, GlobalContext* globalCtx) } } -void En_A_Obj_Draw(ActorEnAObj* this, GlobalContext* globalCtx) -{ +void En_A_Obj_Draw(ActorEnAObj* this, GlobalContext* globalCtx) { s32 type = this->actor.params; GraphicsContext* gfxCtx = globalCtx->state.gfxCtx; - Gfx* gfxArr[4]; + Gfx* dispRefs[4]; - func_800C6AC4(gfxArr, globalCtx->state.gfxCtx, "../z_en_a_keep.c", 701); + Graph_OpenDisps(dispRefs, globalCtx->state.gfxCtx, "../z_en_a_keep.c", 701); func_80093D18(globalCtx->state.gfxCtx); - if (type > A_OBJ_KNOB) + if (type > A_OBJ_KNOB) { type = A_OBJ_KNOB; + } - if (this->actor.params == A_OBJ_KNOB) + if (this->actor.params == A_OBJ_KNOB) { gDPSetPrimColor(gfxCtx->polyOpa.p++, 0, 1, 0x3C, 0x3C, 0x3C, 0x32); + } - gSPMatrix(gfxCtx->polyOpa.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_a_keep.c", 712), G_MTX_MODELVIEW | G_MTX_LOAD); + gSPMatrix(gfxCtx->polyOpa.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_a_keep.c", 712), + G_MTX_MODELVIEW | G_MTX_LOAD); gSPDisplayList(gfxCtx->polyOpa.p++, D_80115484[type]); - func_800C6B54(gfxArr, globalCtx->state.gfxCtx, "../z_en_a_keep.c", 715); + Graph_CloseDisps(dispRefs, 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 3ce4c4b753..7d71802bb7 100644 --- a/src/code/z_en_item00.c +++ b/src/code/z_en_item00.c @@ -1,8 +1,7 @@ #include #include -typedef enum -{ +typedef enum { /* 0x00 */ DROP_RUPEE_GREEN, /* 0x01 */ DROP_RUPEE_BLUE, /* 0x02 */ DROP_RUPEE_RED, @@ -31,8 +30,7 @@ typedef enum /* 0x19 */ DROP_BOMBS_SPECIAL } DropType; -typedef struct -{ +typedef struct { /* 0x000 */ Actor actor; /* 0x14C */ ActorFunc updateFunc; /* 0x150 */ s16 collectibleFlag; @@ -65,15 +63,13 @@ extern u8 D_80115664[]; // Internal Actor Functions -void En_Item00_SetNewUpdate(ActorEnItem00* this, ActorFunc newUpdateFunc) -{ +void En_Item00_SetNewUpdate(ActorEnItem00* this, ActorFunc newUpdateFunc) { this->updateFunc = newUpdateFunc; } #ifdef NON_MATCHING // Very close to matching, just a single ordering issue -void En_Item00_Init(ActorEnItem00* this, GlobalContext* globalCtx) -{ +void En_Item00_Init(ActorEnItem00* this, GlobalContext* globalCtx) { s32 pad1; s32 pad2; f32 sp34; @@ -91,8 +87,7 @@ void En_Item00_Init(ActorEnItem00* this, GlobalContext* globalCtx) this->actor.params = this->actor.params & 0x00FF; - if (Flags_GetCollectible(globalCtx, this->collectibleFlag)) - { + if (Flags_GetCollectible(globalCtx, this->collectibleFlag)) { Actor_Kill(&this->actor); return; } @@ -103,8 +98,7 @@ void En_Item00_Init(ActorEnItem00* this, GlobalContext* globalCtx) this->unk_158 = 1; - switch (this->actor.params) - { + switch (this->actor.params) { case DROP_RUPEE_GREEN: case DROP_RUPEE_BLUE: case DROP_RUPEE_RED: @@ -216,8 +210,7 @@ void En_Item00_Init(ActorEnItem00* this, GlobalContext* globalCtx) this->unk_152 = 0; // MISMATCH: minor ordering issues here - if (!spawnParam8000) - { + if (!spawnParam8000) { En_Item00_SetNewUpdate(this, (ActorFunc)func_8001DFC8); this->unk_15A = -1; return; @@ -230,8 +223,7 @@ void En_Item00_Init(ActorEnItem00* this, GlobalContext* globalCtx) this->actor.velocity.y = 0.0f; this->actor.gravity = 0.0f; - switch (this->actor.params) - { + switch (this->actor.params) { case DROP_RUPEE_GREEN: Item_Give(globalCtx, ITEM_RUPEE_GREEN); break; @@ -297,8 +289,9 @@ void En_Item00_Init(ActorEnItem00* this, GlobalContext* globalCtx) break; } - if ((sp2C != 0) && !func_8002F410(&this->actor, globalCtx)) + if ((sp2C != 0) && !func_8002F410(&this->actor, globalCtx)) { func_8002F554(&this->actor, globalCtx, sp2C); + } En_Item00_SetNewUpdate(this, (ActorFunc)func_8001E5C8); this->updateFunc(this, globalCtx); @@ -307,147 +300,131 @@ void En_Item00_Init(ActorEnItem00* this, GlobalContext* globalCtx) #pragma GLOBAL_ASM("asm/non_matchings/code/z_en_item00/En_Item00_Init.s") #endif -void En_Item00_Destroy(ActorEnItem00* this, GlobalContext* globalCtx) -{ +void En_Item00_Destroy(ActorEnItem00* this, GlobalContext* globalCtx) { ColliderCylinderMain* cylinderCollider = &this->cylinderCollider; ActorCollider_FreeCylinder(globalCtx, cylinderCollider); } -void func_8001DFC8(ActorEnItem00* this, GlobalContext* globalCtx) -{ - if ((this->actor.params <= DROP_RUPEE_RED) || - ((this->actor.params == DROP_HEART) && (this->unk_15A < 0)) || - (this->actor.params == DROP_HEART_PIECE)) - { +void func_8001DFC8(ActorEnItem00* this, GlobalContext* globalCtx) { + if ((this->actor.params <= DROP_RUPEE_RED) || ((this->actor.params == DROP_HEART) && (this->unk_15A < 0)) || + (this->actor.params == DROP_HEART_PIECE)) { this->actor.shape.rot.y += 960; - } - else - { - if ((this->actor.params >= DROP_SHIELD_DEKU) && (this->actor.params != DROP_BOMBS_SPECIAL)) - { - if (this->unk_15A == -1) - { - if (!Math_SmoothScaleMaxMinS(&this->actor.shape.rot.x, this->actor.posRot.rot.x - 0x4000, 2, 3000, 1500)) + } else { + if ((this->actor.params >= DROP_SHIELD_DEKU) && (this->actor.params != DROP_BOMBS_SPECIAL)) { + if (this->unk_15A == -1) { + if (!Math_SmoothScaleMaxMinS(&this->actor.shape.rot.x, this->actor.posRot.rot.x - 0x4000, 2, 3000, + 1500)) { this->unk_15A = -2; - } - else - { - if (!Math_SmoothScaleMaxMinS(&this->actor.shape.rot.x, -this->actor.posRot.rot.x - 0x4000, 2, 3000, 1500)) + } + } else { + if (!Math_SmoothScaleMaxMinS(&this->actor.shape.rot.x, -this->actor.posRot.rot.x - 0x4000, 2, 3000, + 1500)) { this->unk_15A = -1; + } } Math_SmoothScaleMaxMinS(&this->actor.posRot.rot.x, 0, 2, 2500, 500); } } - if (this->actor.params == DROP_HEART_PIECE) + if (this->actor.params == DROP_HEART_PIECE) { this->actor.shape.unk_08 = Math_Sins(this->actor.shape.rot.y) * 150.0f + 850.0f; + } Math_SmoothScaleMaxMinF(&this->actor.speedXZ, 0.0f, 1.0f, 0.5f, 0.0f); - if (this->unk_154 == 0) - if ((this->actor.params != DROP_SMALL_KEY) && - (this->actor.params != DROP_HEART_PIECE) && - (this->actor.params != DROP_HEART_CONTAINER)) - { + if (this->unk_154 == 0) { + if ((this->actor.params != DROP_SMALL_KEY) && (this->actor.params != DROP_HEART_PIECE) && + (this->actor.params != DROP_HEART_CONTAINER)) { this->unk_154 = -1; } + } - if (this->unk_15A == 0) - if ((this->actor.params != DROP_SMALL_KEY) && - (this->actor.params != DROP_HEART_PIECE) && - (this->actor.params != DROP_HEART_CONTAINER)) - { + if (this->unk_15A == 0) { + if ((this->actor.params != DROP_SMALL_KEY) && (this->actor.params != DROP_HEART_PIECE) && + (this->actor.params != DROP_HEART_CONTAINER)) { Actor_Kill(&this->actor); } + } - if ((this->actor.gravity != 0.0f) && !(this->actor.bgCheckFlags & 0x0001)) + if ((this->actor.gravity != 0.0f) && !(this->actor.bgCheckFlags & 0x0001)) { En_Item00_SetNewUpdate(this, (ActorFunc)func_8001E1C8); + } } -void func_8001E1C8(ActorEnItem00* this, GlobalContext* globalCtx) -{ +void func_8001E1C8(ActorEnItem00* this, GlobalContext* globalCtx) { f32 originalVelocity; Vec3f pos; - if (this->actor.params <= DROP_RUPEE_RED) + if (this->actor.params <= DROP_RUPEE_RED) { this->actor.shape.rot.y += 960; + } - if (globalCtx->gameplayFrames & 1) - { + if (globalCtx->gameplayFrames & 1) { pos.x = this->actor.posRot.pos.x + Math_Rand_CenteredFloat(10.0f); pos.y = this->actor.posRot.pos.y + Math_Rand_CenteredFloat(10.0f); pos.z = this->actor.posRot.pos.z + Math_Rand_CenteredFloat(10.0f); func_80028B74(globalCtx, &pos, &D_80115518, &D_80115524, &D_80115510, &D_80115514); } - if (this->actor.bgCheckFlags & 0x0003) - { + if (this->actor.bgCheckFlags & 0x0003) { originalVelocity = this->actor.velocity.y; - if (originalVelocity > -2.0f) - { + if (originalVelocity > -2.0f) { En_Item00_SetNewUpdate(this, (ActorFunc)func_8001DFC8); this->actor.velocity.y = 0.0f; - } - else - { + } else { this->actor.velocity.y = originalVelocity * -0.8f; this->actor.bgCheckFlags = this->actor.bgCheckFlags & 0xFFFE; } } } -void func_8001E304(ActorEnItem00* this, GlobalContext* globalCtx) -{ +void func_8001E304(ActorEnItem00* this, GlobalContext* globalCtx) { s32 pad; Vec3f pos; s32 var1; this->unk_15A++; - if (this->actor.params == DROP_HEART) - { - if (this->actor.velocity.y < 0.0f) - { + if (this->actor.params == DROP_HEART) { + if (this->actor.velocity.y < 0.0f) { this->actor.speedXZ = 0.0f; this->actor.gravity = -0.4f; - if (this->actor.velocity.y < -1.5f) + if (this->actor.velocity.y < -1.5f) { this->actor.velocity.y = -1.5f; - this->actor.initPosRot.rot.z += (s16) ((this->actor.velocity.y + 3.0f) * 1000.0f); - this->actor.posRot.pos.x += Math_Coss(this->actor.rotTowardsLinkY) * (-3.0f * Math_Coss(this->actor.initPosRot.rot.z)); - this->actor.posRot.pos.z += Math_Sins(this->actor.rotTowardsLinkY) * (-3.0f * Math_Coss(this->actor.initPosRot.rot.z)); + } + this->actor.initPosRot.rot.z += (s16)((this->actor.velocity.y + 3.0f) * 1000.0f); + this->actor.posRot.pos.x += + Math_Coss(this->actor.rotTowardsLinkY) * (-3.0f * Math_Coss(this->actor.initPosRot.rot.z)); + this->actor.posRot.pos.z += + Math_Sins(this->actor.rotTowardsLinkY) * (-3.0f * Math_Coss(this->actor.initPosRot.rot.z)); } } - if (this->actor.params <= DROP_RUPEE_RED) - { + if (this->actor.params <= DROP_RUPEE_RED) { this->actor.shape.rot.y += 960; - } - else if ((this->actor.params >= DROP_SHIELD_DEKU) && (this->actor.params != DROP_BOMBS_SPECIAL)) - { + } else if ((this->actor.params >= DROP_SHIELD_DEKU) && (this->actor.params != DROP_BOMBS_SPECIAL)) { this->actor.posRot.rot.x -= 700; this->actor.shape.rot.y += 400; this->actor.shape.rot.x = this->actor.posRot.rot.x - 0x4000; } - if (this->actor.velocity.y <= 2.0f) - { + if (this->actor.velocity.y <= 2.0f) { var1 = (u16)this->actor.shape.rot.z + 10000; - if (var1 < 65535) + if (var1 < 65535) { this->actor.shape.rot.z += 10000; - else + } else { this->actor.shape.rot.z = -1; + } } - if (!(globalCtx->gameplayFrames & 1)) - { + if (!(globalCtx->gameplayFrames & 1)) { pos.x = this->actor.posRot.pos.x + (Math_Rand_ZeroOne() - 0.5f) * 10.0f; pos.y = this->actor.posRot.pos.y + (Math_Rand_ZeroOne() - 0.5f) * 10.0f; pos.z = this->actor.posRot.pos.z + (Math_Rand_ZeroOne() - 0.5f) * 10.0f; func_80028B74(globalCtx, &pos, &D_80115518, &D_80115524, &D_80115510, &D_80115514); } - if (this->actor.bgCheckFlags & 0x0003) - { + if (this->actor.bgCheckFlags & 0x0003) { En_Item00_SetNewUpdate(this, (ActorFunc)func_8001DFC8); this->actor.shape.rot.z = 0; this->actor.velocity.y = 0.0f; @@ -455,40 +432,36 @@ void func_8001E304(ActorEnItem00* this, GlobalContext* globalCtx) } } -void func_8001E5C8(ActorEnItem00* this, GlobalContext* globalCtx) -{ +void func_8001E5C8(ActorEnItem00* this, GlobalContext* globalCtx) { Player* player = PLAYER; - if (this->unk_152 != 0) - { - if (!func_8002F410(&this->actor, globalCtx)) - { + if (this->unk_152 != 0) { + if (!func_8002F410(&this->actor, globalCtx)) { func_8002F434(&this->actor, globalCtx, this->unk_152, 50.0f, 80.0f); this->unk_15A++; - } - else - { + } else { this->unk_152 = 0; } } - if (this->unk_15A == 0) - { + if (this->unk_15A == 0) { Actor_Kill(&this->actor); return; } this->actor.posRot.pos = player->actor.posRot.pos; - if (this->actor.params <= DROP_RUPEE_RED) + if (this->actor.params <= DROP_RUPEE_RED) { this->actor.shape.rot.y += 960; - else if (this->actor.params == DROP_HEART) + } else if (this->actor.params == DROP_HEART) { this->actor.shape.rot.y = 0; + } this->actor.posRot.pos.y += 40.0f + Math_Sins(this->unk_15A * 15000) * (this->unk_15A * 0.3f); - if LINK_IS_ADULT - this->actor.posRot.pos.y += 20.0f; + if + LINK_IS_ADULT + this->actor.posRot.pos.y += 20.0f; } extern s32 D_80157D90; @@ -497,8 +470,7 @@ extern s16 D_80157D94; #ifdef NON_MATCHING // Almost matching, just a few minor ordering issues -void En_Item00_Update(ActorEnItem00* this, GlobalContext* globalCtx) -{ +void En_Item00_Update(ActorEnItem00* this, GlobalContext* globalCtx) { s32 pad1; s32 pad2; s32 sp3C; @@ -509,11 +481,13 @@ void En_Item00_Update(ActorEnItem00* this, GlobalContext* globalCtx) sp3C = 0; sp3A = 0; - if (this->unk_15A > 0) + if (this->unk_15A > 0) { this->unk_15A--; + } - if ((this->unk_15A > 0) && (this->unk_15A < 41) && (this->unk_154 <= 0)) + if ((this->unk_15A > 0) && (this->unk_15A < 41) && (this->unk_154 <= 0)) { this->unk_156 = this->unk_15A; + } this->updateFunc(this, globalCtx); @@ -521,44 +495,34 @@ void En_Item00_Update(ActorEnItem00* this, GlobalContext* globalCtx) this->actor.scale.z = this->actor.scale.x; this->actor.scale.y = this->actor.scale.x; - if (this->actor.gravity) - { - if (this->actor.bgCheckFlags & 0x0003) - { + if (this->actor.gravity) { + if (this->actor.bgCheckFlags & 0x0003) { // Separate symbols seem to be used here for 0x80157D90 since the loads and stores are completely separate - if (D_80157D90 != globalCtx->gameplayFrames) - { + if (D_80157D90 != globalCtx->gameplayFrames) { D_80157D90_ = globalCtx->gameplayFrames; D_80157D94 = 0; - for (i = 0; i < 50; i++) - { - if (globalCtx->colCtx.dyna.flags[i] & 1) - { + for (i = 0; i < 50; i++) { + if (globalCtx->colCtx.dyna.flags[i] & 1) { dynaActor = globalCtx->colCtx.dyna.actorMeshArr[i].actor; if ((dynaActor != NULL) && (dynaActor->update != NULL) && ((dynaActor->posRot.pos.x != dynaActor->pos4.x) || (dynaActor->posRot.pos.y != dynaActor->pos4.y) || - (dynaActor->posRot.pos.z != dynaActor->pos4.z))) - { + (dynaActor->posRot.pos.z != dynaActor->pos4.z))) { D_80157D94++; break; } } } } - } - else - { + } else { sp3A = 1; Actor_MoveForward(&this->actor); } - if (sp3A || D_80157D94) - { + if (sp3A || D_80157D94) { func_8002E4B4(globalCtx, &this->actor, 10.0f, 15.0f, 15.0f, 0x1D); - if (this->actor.unk_80 <= -10000.0f) - { + if (this->actor.unk_80 <= -10000.0f) { Actor_Kill(&this->actor); return; } @@ -569,31 +533,33 @@ void En_Item00_Update(ActorEnItem00* this, GlobalContext* globalCtx) Actor_CollisionCheck_SetAC(globalCtx, &globalCtx->sub_11E60, &this->cylinderCollider); if ((this->actor.params == DROP_SHIELD_DEKU) || (this->actor.params == DROP_SHIELD_HYLIAN) || - (this->actor.params == DROP_TUNIC_ZORA) || (this->actor.params == DROP_TUNIC_GORON)) - { + (this->actor.params == DROP_TUNIC_ZORA) || (this->actor.params == DROP_TUNIC_GORON)) { f32 newUnkBC = Math_Coss(this->actor.shape.rot.x) * 37.0f; this->actor.shape.unk_08 = newUnkBC; - if (newUnkBC >= 0.0f) + if (newUnkBC >= 0.0f) { this->actor.shape.unk_08 = this->actor.shape.unk_08; - else + } else { this->actor.shape.unk_08 = -this->actor.shape.unk_08; + } } - if (this->unk_154 > 0) + if (this->unk_154 > 0) { return; + } // MISMATCH: The first function argument is loaded too early here - if (!((this->actor.xzDistanceFromLink <= 30.0f) && - (this->actor.yDistanceFromLink >= -50.0f) && - (this->actor.yDistanceFromLink <= 50.0f))) - if (!func_8002F410(&this->actor, globalCtx)) + if (!((this->actor.xzDistanceFromLink <= 30.0f) && (this->actor.yDistanceFromLink >= -50.0f) && + (this->actor.yDistanceFromLink <= 50.0f))) { + if (!func_8002F410(&this->actor, globalCtx)) { return; + } + } - if (globalCtx->unk_10A20 != 0) + if (globalCtx->unk_10A20 != 0) { return; + } - switch (this->actor.params) - { + switch (this->actor.params) { case DROP_RUPEE_GREEN: Item_Give(globalCtx, ITEM_RUPEE_GREEN); break; @@ -672,11 +638,11 @@ void En_Item00_Update(ActorEnItem00* this, GlobalContext* globalCtx) } // MISMATCH: The first function argument is also loaded too early here - if ((sp3C != 0) && !func_8002F410(&this->actor, globalCtx)) + if ((sp3C != 0) && !func_8002F410(&this->actor, globalCtx)) { func_8002F554(&this->actor, globalCtx, sp3C); + } - switch (this->actor.params) - { + switch (this->actor.params) { case DROP_HEART_PIECE: case DROP_HEART_CONTAINER: case DROP_SMALL_KEY: @@ -684,29 +650,22 @@ void En_Item00_Update(ActorEnItem00* this, GlobalContext* globalCtx) case DROP_SHIELD_HYLIAN: case DROP_TUNIC_ZORA: case DROP_TUNIC_GORON: - if (func_8002F410(&this->actor, globalCtx)) - { + if (func_8002F410(&this->actor, globalCtx)) { Flags_SetCollectible(globalCtx, this->collectibleFlag); Actor_Kill(&this->actor); } return; } - if ((this->actor.params <= DROP_RUPEE_RED) || (this->actor.params == DROP_RUPEE_ORANGE)) - { + if ((this->actor.params <= DROP_RUPEE_RED) || (this->actor.params == DROP_RUPEE_ORANGE)) { Audio_PlaySoundGeneral(NA_SE_SY_GET_RUPY, &D_801333D4, 4, &D_801333E0, &D_801333E0, &D_801333E8); - } - else if (sp3C != 0) - { - if (func_8002F410(&this->actor, globalCtx)) - { + } else if (sp3C != 0) { + if (func_8002F410(&this->actor, globalCtx)) { Flags_SetCollectible(globalCtx, this->collectibleFlag); Actor_Kill(&this->actor); } return; - } - else - { + } else { Audio_PlaySoundGeneral(NA_SE_SY_GET_ITEM, &D_801333D4, 4, &D_801333E0, &D_801333E0, &D_801333E8); } @@ -734,15 +693,12 @@ void func_8001F080(ActorEnItem00* this, GlobalContext* globalCtx); void func_8001F1F4(ActorEnItem00* this, GlobalContext* globalCtx); void func_8001F334(ActorEnItem00* this, GlobalContext* globalCtx); -void En_Item00_Draw(ActorEnItem00* this, GlobalContext* globalCtx) -{ +void En_Item00_Draw(ActorEnItem00* this, GlobalContext* globalCtx) { s32 pad; f32 unkFloat; - if (!(this->unk_156 & this->unk_158)) - { - switch (this->actor.params) - { + if (!(this->unk_156 & this->unk_158)) { + switch (this->actor.params) { case DROP_RUPEE_GREEN: case DROP_RUPEE_BLUE: case DROP_RUPEE_RED: @@ -757,20 +713,15 @@ void En_Item00_Draw(ActorEnItem00* this, GlobalContext* globalCtx) func_8001F1F4(this, globalCtx); break; case DROP_HEART: - if (this->unk_15A < 0) - { - if (this->unk_15A == -1) - { + if (this->unk_15A < 0) { + if (this->unk_15A == -1) { s8 bankIndex = Object_GetIndex(&globalCtx->objectCtx, OBJECT_GI_HEART); - if (Object_IsLoaded(&globalCtx->objectCtx, bankIndex)) - { + if (Object_IsLoaded(&globalCtx->objectCtx, bankIndex)) { this->actor.objBankIndex = bankIndex; Actor_SetObjectDependency(globalCtx, &this->actor); this->unk_15A = -2; } - } - else - { + } else { unkFloat = 16.0f; Matrix_Scale(unkFloat, unkFloat, unkFloat, MTXMODE_APPLY); func_800694A0(globalCtx, 0x08); @@ -813,141 +764,144 @@ void En_Item00_Draw(ActorEnItem00* this, GlobalContext* globalCtx) /** * Draw Function used for Rupee types of En_Item00. */ -void func_8001EF30(ActorEnItem00* this, GlobalContext* globalCtx) -{ +void func_8001EF30(ActorEnItem00* this, GlobalContext* globalCtx) { GraphicsContext* gfxCtx = globalCtx->state.gfxCtx; s32 iconNb; - Gfx* gfxArr[5]; + Gfx* dispRefs[5]; - func_800C6AC4(gfxArr, globalCtx->state.gfxCtx, "../z_en_item00.c", 1546); + Graph_OpenDisps(dispRefs, globalCtx->state.gfxCtx, "../z_en_item00.c", 1546); func_80093D18(globalCtx->state.gfxCtx); func_8002EBCC(&this->actor, globalCtx, 0); - if (1) // Necessary to match - { - if (this->actor.params <= DROP_RUPEE_RED) + if (1) { // Necessary to match + if (this->actor.params <= DROP_RUPEE_RED) { iconNb = this->actor.params; - else + } else { iconNb = this->actor.params - 0x10; + } } - gSPMatrix(gfxCtx->polyOpa.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_item00.c", 1562), G_MTX_MODELVIEW | G_MTX_LOAD); + gSPMatrix(gfxCtx->polyOpa.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_item00.c", 1562), + G_MTX_MODELVIEW | G_MTX_LOAD); gSPSegment(gfxCtx->polyOpa.p++, 0x08, SEGMENTED_TO_VIRTUAL(D_80115530[iconNb])); gSPDisplayList(gfxCtx->polyOpa.p++, &D_04042440); - func_800C6B54(gfxArr, globalCtx->state.gfxCtx, "../z_en_item00.c", 1568); + Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_en_item00.c", 1568); } /** * Draw Function used for most collectible types of En_Item00 (ammo, bombs, sticks, nuts, magic...). */ -void func_8001F080(ActorEnItem00* this, GlobalContext* globalCtx) -{ +void func_8001F080(ActorEnItem00* this, GlobalContext* globalCtx) { s32 iconNb; GraphicsContext* gfxCtx = globalCtx->state.gfxCtx; - Gfx* gfxArr[4]; + Gfx* dispRefs[4]; iconNb = this->actor.params - 3; - func_800C6AC4(gfxArr, globalCtx->state.gfxCtx, "../z_en_item00.c", 1594); + Graph_OpenDisps(dispRefs, globalCtx->state.gfxCtx, "../z_en_item00.c", 1594); gfxCtx->polyOpa.p = func_800BC8A0(globalCtx, gfxCtx->polyOpa.p); - if (this->actor.params == DROP_BOMBS_SPECIAL) + if (this->actor.params == DROP_BOMBS_SPECIAL) { iconNb = 1; - else if (this->actor.params >= DROP_ARROWS_SMALL) + } else if (this->actor.params >= DROP_ARROWS_SMALL) { iconNb -= 3; + } gfxCtx->polyOpa.p = func_800946E4(gfxCtx->polyOpa.p); gSPSegment(gfxCtx->polyOpa.p++, 0x08, SEGMENTED_TO_VIRTUAL(D_80115544[iconNb])); - gSPMatrix(gfxCtx->polyOpa.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_item00.c", 1607), G_MTX_MODELVIEW | G_MTX_LOAD); + gSPMatrix(gfxCtx->polyOpa.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_item00.c", 1607), + G_MTX_MODELVIEW | G_MTX_LOAD); gSPDisplayList(gfxCtx->polyOpa.p++, &D_0403F070); - func_800C6B54(gfxArr, globalCtx->state.gfxCtx, "../z_en_item00.c", 1611); + Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_en_item00.c", 1611); } /** * Draw Function used for the Heart Container type of En_Item00. */ -void func_8001F1F4(ActorEnItem00* this, GlobalContext* globalCtx) -{ +void func_8001F1F4(ActorEnItem00* this, GlobalContext* globalCtx) { GraphicsContext* gfxCtx = globalCtx->state.gfxCtx; - Gfx* gfxArr[5]; + Gfx* dispRefs[5]; - func_800C6AC4(gfxArr, globalCtx->state.gfxCtx, "../z_en_item00.c", 1623); + Graph_OpenDisps(dispRefs, globalCtx->state.gfxCtx, "../z_en_item00.c", 1623); func_80093D18(globalCtx->state.gfxCtx); func_8002EBCC(&this->actor, globalCtx, 0); - gSPMatrix(gfxCtx->polyOpa.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_item00.c", 1634), G_MTX_MODELVIEW | G_MTX_LOAD); + gSPMatrix(gfxCtx->polyOpa.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_item00.c", 1634), + G_MTX_MODELVIEW | G_MTX_LOAD); gSPDisplayList(gfxCtx->polyOpa.p++, &D_0403BBA0); func_80093D84(globalCtx->state.gfxCtx); func_8002ED80(&this->actor, globalCtx, 0); - gSPMatrix(gfxCtx->polyXlu.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_item00.c", 1644), G_MTX_MODELVIEW | G_MTX_LOAD); + gSPMatrix(gfxCtx->polyXlu.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_item00.c", 1644), + G_MTX_MODELVIEW | G_MTX_LOAD); gSPDisplayList(gfxCtx->polyXlu.p++, &D_0403BCD8); - func_800C6B54(gfxArr, globalCtx->state.gfxCtx, "../z_en_item00.c", 1647); + Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_en_item00.c", 1647); } /** * Draw Function used for the Piece of Heart type of En_Item00. */ -void func_8001F334(ActorEnItem00* this, GlobalContext* globalCtx) -{ +void func_8001F334(ActorEnItem00* this, GlobalContext* globalCtx) { GraphicsContext* gfxCtx = globalCtx->state.gfxCtx; - Gfx* gfxArr[5]; + Gfx* dispRefs[5]; - func_800C6AC4(gfxArr, globalCtx->state.gfxCtx, "../z_en_item00.c", 1658); + Graph_OpenDisps(dispRefs, globalCtx->state.gfxCtx, "../z_en_item00.c", 1658); func_80093D84(globalCtx->state.gfxCtx); func_8002ED80(&this->actor, globalCtx, 0); - gSPMatrix(gfxCtx->polyXlu.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_item00.c", 1670), G_MTX_MODELVIEW | G_MTX_LOAD); + gSPMatrix(gfxCtx->polyXlu.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_item00.c", 1670), + G_MTX_MODELVIEW | G_MTX_LOAD); gSPDisplayList(gfxCtx->polyXlu.p++, &D_0403B030); - func_800C6B54(gfxArr, globalCtx->state.gfxCtx, "../z_en_item00.c", 1673); + Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_en_item00.c", 1673); } /** * Converts a given drop type ID based on link's current age, health and owned items. * Returns a new drop type ID or -1 to cancel the drop. */ -s16 func_8001F404(s16 dropId) -{ - if (LINK_IS_ADULT) - { - if (dropId == DROP_SEEDS) +s16 func_8001F404(s16 dropId) { + if (LINK_IS_ADULT) { + if (dropId == DROP_SEEDS) { dropId = DROP_ARROWS_SMALL; - else if (dropId == DROP_STICK) + } else if (dropId == DROP_STICK) { dropId = DROP_RUPEE_GREEN; - } - else - { - if (dropId == DROP_ARROWS_SMALL || dropId == DROP_ARROWS_MEDIUM || dropId == DROP_ARROWS_LARGE) + } + } else { + if (dropId == DROP_ARROWS_SMALL || dropId == DROP_ARROWS_MEDIUM || dropId == DROP_ARROWS_LARGE) { dropId = DROP_SEEDS; + } } // This is convoluted but it seems like it must be a single condition to match + // clang-format off if (((dropId == DROP_BOMBS_A || dropId == DROP_BOMBS_SPECIAL || dropId == DROP_BOMBS_B) && INV_CONTENT(ITEM_BOMB) == ITEM_NONE) || ((dropId == DROP_ARROWS_SMALL || dropId == DROP_ARROWS_MEDIUM || dropId == DROP_ARROWS_LARGE) && INV_CONTENT(ITEM_BOW) == ITEM_NONE) || ((dropId == DROP_MAGIC_LARGE || dropId == DROP_MAGIC_SMALL) && gSaveContext.magic_level == 0) || - ((dropId == DROP_SEEDS) && INV_CONTENT(ITEM_SLINGSHOT) == ITEM_NONE)) + ((dropId == DROP_SEEDS) && INV_CONTENT(ITEM_SLINGSHOT) == ITEM_NONE)) { return -1; + } + // clang-format on - if (dropId == DROP_HEART && gSaveContext.health_capacity == gSaveContext.health) + if (dropId == DROP_HEART && gSaveContext.health_capacity == gSaveContext.health) { return DROP_RUPEE_GREEN; + } return dropId; } // External functions used by other actors to drop collectibles, which usually results in spawning an En_Item00 actor. -Actor* Item_DropCollectible(GlobalContext* globalCtx, Vec3f* spawnPos, s16 params) -{ +Actor* Item_DropCollectible(GlobalContext* globalCtx, Vec3f* spawnPos, s16 params) { s32 pad[2]; ActorEnItem00* spawnedActor = NULL; s16 param4000 = params & 0x4000; @@ -956,26 +910,21 @@ Actor* Item_DropCollectible(GlobalContext* globalCtx, Vec3f* spawnPos, s16 param params = params & 0x3FFF; - if (((params & 0x00FF) == DROP_FLEXIBLE) && !param4000) - { + if (((params & 0x00FF) == DROP_FLEXIBLE) && !param4000) { // TODO: Prevent the cast to ActorEnItem00 here since this is a different actor (En_Elf) - spawnedActor = (ActorEnItem00*) Actor_Spawn(&globalCtx->actorCtx, globalCtx, ACTOR_EN_ELF, - spawnPos->x, spawnPos->y + 40.0f, spawnPos->z, - 0, 0, 0, 0x0002); + spawnedActor = (ActorEnItem00*)Actor_Spawn(&globalCtx->actorCtx, globalCtx, ACTOR_EN_ELF, spawnPos->x, + spawnPos->y + 40.0f, spawnPos->z, 0, 0, 0, 0x0002); func_8002A9F4(globalCtx, spawnPos, 0x28E7, 1, 1, 0x28); - } - else - { - if (!param8000) + } else { + if (!param8000) { params = func_8001F404(params & 0x00FF); + } - if (params != -1) - { - spawnedActor = (ActorEnItem00*) Actor_Spawn(&globalCtx->actorCtx, globalCtx, ACTOR_EN_ITEM00, - spawnPos->x, spawnPos->y, spawnPos->z, - 0, 0, 0, params | param8000 | param3F00); - if ((spawnedActor != NULL) && !param8000) - { + if (params != -1) { + spawnedActor = + (ActorEnItem00*)Actor_Spawn(&globalCtx->actorCtx, globalCtx, ACTOR_EN_ITEM00, spawnPos->x, spawnPos->y, + spawnPos->z, 0, 0, 0, params | param8000 | param3F00); + if ((spawnedActor != NULL) && !param8000) { spawnedActor->actor.velocity.y = !param4000 ? 8.0f : -2.0f; spawnedActor->actor.speedXZ = 2.0f; spawnedActor->actor.gravity = -0.9f; @@ -985,8 +934,7 @@ Actor* Item_DropCollectible(GlobalContext* globalCtx, Vec3f* spawnPos, s16 param spawnedActor->unk_15A = 220; if ((spawnedActor->actor.params != DROP_SMALL_KEY) && (spawnedActor->actor.params != DROP_HEART_PIECE) && - (spawnedActor->actor.params != DROP_HEART_CONTAINER)) - { + (spawnedActor->actor.params != DROP_HEART_CONTAINER)) { spawnedActor->actor.room = -1; } spawnedActor->actor.flags |= 0x0010; @@ -994,11 +942,10 @@ Actor* Item_DropCollectible(GlobalContext* globalCtx, Vec3f* spawnPos, s16 param } } - return (Actor*) spawnedActor; + return (Actor*)spawnedActor; } -Actor* Item_DropCollectible2(GlobalContext* globalCtx, Vec3f* spawnPos, s16 params) -{ +Actor* Item_DropCollectible2(GlobalContext* globalCtx, Vec3f* spawnPos, s16 params) { ActorEnItem00* spawnedActor = NULL; s32 pad; s16 param4000 = params & 0x4000; @@ -1007,24 +954,18 @@ Actor* Item_DropCollectible2(GlobalContext* globalCtx, Vec3f* spawnPos, s16 para params = params & 0x3FFF; - if (((params & 0x00FF) == DROP_FLEXIBLE) && !param4000) - { + if (((params & 0x00FF) == DROP_FLEXIBLE) && !param4000) { // TODO: Prevent the cast to ActorEnItem00 here since this is a different actor (En_Elf) - spawnedActor = (ActorEnItem00*) Actor_Spawn(&globalCtx->actorCtx, globalCtx, ACTOR_EN_ELF, - spawnPos->x, spawnPos->y + 40.0f, spawnPos->z, - 0, 0, 0, 0x0002); + spawnedActor = (ActorEnItem00*)Actor_Spawn(&globalCtx->actorCtx, globalCtx, ACTOR_EN_ELF, spawnPos->x, + spawnPos->y + 40.0f, spawnPos->z, 0, 0, 0, 0x0002); func_8002A9F4(globalCtx, spawnPos, 0x28E7, 1, 1, 0x28); - } - else - { + } else { params = func_8001F404(params & 0x00FF); - if (params != -1) - { - spawnedActor = (ActorEnItem00*) Actor_Spawn(&globalCtx->actorCtx, globalCtx, ACTOR_EN_ITEM00, - spawnPos->x, spawnPos->y, spawnPos->z, - 0, 0, 0, params | param8000 | param3F00); - if ((spawnedActor != NULL) && !param8000) - { + if (params != -1) { + spawnedActor = + (ActorEnItem00*)Actor_Spawn(&globalCtx->actorCtx, globalCtx, ACTOR_EN_ITEM00, spawnPos->x, spawnPos->y, + spawnPos->z, 0, 0, 0, params | param8000 | param3F00); + if ((spawnedActor != NULL) && !param8000) { spawnedActor->actor.velocity.y = 0.0f; spawnedActor->actor.speedXZ = 0.0f; spawnedActor->actor.gravity = param4000 ? 0.0f : -0.9f; @@ -1034,11 +975,10 @@ Actor* Item_DropCollectible2(GlobalContext* globalCtx, Vec3f* spawnPos, s16 para } } - return (Actor*) spawnedActor; + return (Actor*)spawnedActor; } -void Item_DropCollectibleRandom(GlobalContext* globalCtx, Actor* fromActor, Vec3f* spawnPos, s16 params) -{ +void Item_DropCollectibleRandom(GlobalContext* globalCtx, Actor* fromActor, Vec3f* spawnPos, s16 params) { s32 pad; ActorEnItem00* spawnedActor; s16 dropQuantity; @@ -1050,133 +990,93 @@ void Item_DropCollectibleRandom(GlobalContext* globalCtx, Actor* fromActor, Vec3 param8000 = params & 0x8000; params = params & 0x7FFF; - if (fromActor != NULL) - { - if (fromActor->unk_116) - { - if (fromActor->unk_116 & 0x01) - { + if (fromActor != NULL) { + if (fromActor->unk_116) { + if (fromActor->unk_116 & 0x01) { params = 1 * 0x10; dropTableIndex = 0xB; - } - else if (fromActor->unk_116 & 0x02) - { + } else if (fromActor->unk_116 & 0x02) { params = 1 * 0x10; dropTableIndex = 0x6; - } - else if (fromActor->unk_116 & 0x04) - { + } else if (fromActor->unk_116 & 0x04) { params = 6 * 0x10; dropTableIndex = 0x9; - } - else if (fromActor->unk_116 & 0x08) - { + } else if (fromActor->unk_116 & 0x08) { params = 3 * 0x10; dropTableIndex = 0xB; - } - else if (fromActor->unk_116 & 0x10) - { + } else if (fromActor->unk_116 & 0x10) { params = 6 * 0x10; dropTableIndex = 0xC; - } - else if (fromActor->unk_116 & 0x20) - { + } else if (fromActor->unk_116 & 0x20) { params = 0 * 0x10; dropTableIndex = 0x0; - } - else if (fromActor->unk_116 & 0x40) - { + } else if (fromActor->unk_116 & 0x40) { params = 0 * 0x10; dropTableIndex = 0x1; } } - if (fromActor->unk_116 & 0x20) + if (fromActor->unk_116 & 0x20) { dropId = DROP_RUPEE_PURPLE; - else + } else { dropId = D_80115574[params + dropTableIndex]; - } - else + } + } else { dropId = D_80115574[params + dropTableIndex]; + } - if (dropId == DROP_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); + if (dropId == DROP_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); func_8002A9F4(globalCtx, spawnPos, 0x28E7, 1, 1, 0x28); return; - } - else if (gSaveContext.health <= 0x30) // 3 hearts or less - { + } else if (gSaveContext.health <= 0x30) { // 3 hearts or less params = 0xB * 0x10; dropTableIndex = 0x0; dropId = DROP_HEART; - } - else if (gSaveContext.health <= 0x50) // 5 hearts or less - { + } else if (gSaveContext.health <= 0x50) { // 5 hearts or less params = 0xA * 0x10; dropTableIndex = 0x0; dropId = DROP_HEART; - } - else if ((gSaveContext.magic_level != 0) && (gSaveContext.magic == 0)) // Empty magic meter - { + } else if ((gSaveContext.magic_level != 0) && (gSaveContext.magic == 0)) { // Empty magic meter params = 0xA * 0x10; dropTableIndex = 0x0; dropId = DROP_MAGIC_LARGE; - } - else if ((gSaveContext.magic_level != 0) && (gSaveContext.magic <= (gSaveContext.magic_level >> 1))) // Half magic or less - { + } else if ((gSaveContext.magic_level != 0) && + (gSaveContext.magic <= (gSaveContext.magic_level >> 1))) { // Half magic or less params = 0xA * 0x10; dropTableIndex = 0x0; dropId = DROP_MAGIC_SMALL; - } - else if (LINK_IS_CHILD && (AMMO(ITEM_SLINGSHOT) < 6)) // Child and less then 6 deku seeds - { + } else if (LINK_IS_CHILD && (AMMO(ITEM_SLINGSHOT) < 6)) { // Child and less then 6 deku seeds params = 0xA * 0x10; dropTableIndex = 0x0; dropId = DROP_SEEDS; - } - else if (LINK_IS_ADULT && (AMMO(ITEM_BOW) < 6)) // Adult and less than 6 arrows - { + } else if (LINK_IS_ADULT && (AMMO(ITEM_BOW) < 6)) { // Adult and less than 6 arrows params = 0xA * 0x10; dropTableIndex = 0x0; dropId = DROP_ARROWS_MEDIUM; - } - else if (AMMO(ITEM_BOMB) < 6) // Less than 6 bombs - { + } else if (AMMO(ITEM_BOMB) < 6) { // Less than 6 bombs params = 0xD * 0x10; dropTableIndex = 0x0; dropId = DROP_BOMBS_A; - } - else if (gSaveContext.rupees < 11) // Less than 11 Rupees - { + } else if (gSaveContext.rupees < 11) { // Less than 11 Rupees params = 0xA * 0x10; dropTableIndex = 0x0; dropId = DROP_RUPEE_RED; - } - else - { + } else { return; } } - if (dropId != 0xFF) - { + if (dropId != 0xFF) { dropQuantity = D_80115664[params + dropTableIndex]; - while (dropQuantity > 0) - { - if (!param8000) - { + while (dropQuantity > 0) { + if (!param8000) { dropId = func_8001F404(dropId); - if (dropId != 0xFF) - { - spawnedActor = (ActorEnItem00*) Actor_Spawn(&globalCtx->actorCtx, globalCtx, ACTOR_EN_ITEM00, - spawnPos->x, spawnPos->y, spawnPos->z, - 0, 0, 0, dropId); - if ((spawnedActor != NULL) && (dropId != 0xFF)) - { + if (dropId != 0xFF) { + spawnedActor = (ActorEnItem00*)Actor_Spawn(&globalCtx->actorCtx, globalCtx, ACTOR_EN_ITEM00, + spawnPos->x, spawnPos->y, spawnPos->z, 0, 0, 0, dropId); + if ((spawnedActor != NULL) && (dropId != 0xFF)) { spawnedActor->actor.velocity.y = 8.0f; spawnedActor->actor.speedXZ = 2.0f; spawnedActor->actor.gravity = -0.9f; @@ -1186,16 +1086,13 @@ void Item_DropCollectibleRandom(GlobalContext* globalCtx, Actor* fromActor, Vec3 spawnedActor->actor.flags |= 0x0010; if ((spawnedActor->actor.params != DROP_SMALL_KEY) && (spawnedActor->actor.params != DROP_HEART_PIECE) && - (spawnedActor->actor.params != DROP_HEART_CONTAINER)) - { + (spawnedActor->actor.params != DROP_HEART_CONTAINER)) { spawnedActor->actor.room = -1; } spawnedActor->unk_15A = 220; } } - } - else - { + } else { Item_DropCollectible(globalCtx, spawnPos, params | 0x8000); } dropQuantity--; diff --git a/src/code/z_face_reaction.c b/src/code/z_face_reaction.c new file mode 100644 index 0000000000..1bfe18b7ca --- /dev/null +++ b/src/code/z_face_reaction.c @@ -0,0 +1,70 @@ +#include +#include + +u16 sReactionTextIds[60][9] = { + { 0x0000, 0x7124, 0x7127, 0x7126, 0x7125, 0x7127, 0x7124, 0x7125, 0x7127 }, + { 0x0000, 0x7128, 0x7129, 0x7128, 0x7128, 0x7128, 0x7128, 0x712A, 0x712B }, + { 0x0000, 0x7128, 0x712B, 0x7128, 0x7128, 0x7129, 0x7128, 0x712B, 0x7128 }, + { 0x0000, 0x7128, 0x7129, 0x7128, 0x7128, 0x7128, 0x7128, 0x712A, 0x712B }, + { 0x0000, 0x7128, 0x7129, 0x712B, 0x7128, 0x7128, 0x7128, 0x7129, 0x7128 }, + { 0x0000, 0x712D, 0x712D, 0x712D, 0x712D, 0x712D, 0x712D, 0x712D, 0x712F }, + { 0x0000, 0x712C, 0x712C, 0x712C, 0x712E, 0x712C, 0x712C, 0x712F, 0x712F }, + { 0x0000, 0x712C, 0x712C, 0x712C, 0x712F, 0x712C, 0x712C, 0x712F, 0x712F }, + { 0x0000, 0x7130, 0x7132, 0x7133, 0x7130, 0x7130, 0x7131, 0x7132, 0x7131 }, + { 0x0000, 0x7134, 0x7137, 0x7135, 0x7134, 0x7136, 0x7135, 0x7134, 0x7135 }, + { 0x0000, 0x7138, 0x713A, 0x7138, 0x7139, 0x713A, 0x7138, 0x7139, 0x713B }, + { 0x0000, 0x7144, 0x7146, 0x7144, 0x7146, 0x7147, 0x7145, 0x7145, 0x7147 }, + { 0x0000, 0x7148, 0x7149, 0x7149, 0x714A, 0x714A, 0x714B, 0x7149, 0x714B }, + { 0x0000, 0x714C, 0x714D, 0x714C, 0x714C, 0x714E, 0x714C, 0x714E, 0x714F }, + { 0x0000, 0x7150, 0x7153, 0x7152, 0x7150, 0x7151, 0x7153, 0x7153, 0x7151 }, + { 0x0000, 0x7155, 0x7156, 0x7157, 0x7154, 0x7156, 0x7156, 0x7156, 0x7156 }, + { 0x0000, 0x715A, 0x7159, 0x715B, 0x715A, 0x715A, 0x7158, 0x7158, 0x715B }, + { 0x0000, 0x715E, 0x715D, 0x715D, 0x715F, 0x715E, 0x715C, 0x715C, 0x715D }, + { 0x0000, 0x7163, 0x7162, 0x7160, 0x7163, 0x7160, 0x7161, 0x7161, 0x7160 }, + { 0x0000, 0x7164, 0x7166, 0x7164, 0x7167, 0x7164, 0x7164, 0x7164, 0x7167 }, + { 0x0000, 0x716B, 0x7169, 0x7168, 0x716B, 0x716A, 0x716B, 0x716B, 0x716A }, + { 0x0000, 0x716C, 0x716D, 0x716F, 0x716C, 0x716E, 0x716E, 0x716E, 0x716F }, + { 0x0000, 0x7171, 0x7173, 0x7170, 0x7172, 0x0000, 0x0000, 0x0000, 0x0000 }, + { 0x0000, 0x7176, 0x7177, 0x7174, 0x7174, 0x7175, 0x7174, 0x7174, 0x7177 }, + { 0x0000, 0x7178, 0x7179, 0x7179, 0x717B, 0x717A, 0x717B, 0x717A, 0x717B }, + { 0x0000, 0x717D, 0x717C, 0x717C, 0x717D, 0x717F, 0x717C, 0x717E, 0x717D }, + { 0x0000, 0x7183, 0x7181, 0x7180, 0x7183, 0x7182, 0x7183, 0x7181, 0x7183 }, + { 0x0000, 0x7184, 0x7186, 0x7185, 0x7186, 0x7184, 0x7187, 0x7186, 0x7184 }, + { 0x0000, 0x71A4, 0x71A6, 0x71A5, 0x0000, 0x71A6, 0x71A6, 0x71A6, 0x71A7 }, + { 0x0000, 0x7188, 0x7188, 0x7189, 0x7188, 0x7189, 0x718B, 0x718A, 0x7189 }, + { 0x0000, 0x718C, 0x718C, 0x718D, 0x718C, 0x718E, 0x718F, 0x718D, 0x718C }, + { 0x0000, 0x7190, 0x7190, 0x7191, 0x7192, 0x7191, 0x7193, 0x7190, 0x7191 }, + { 0x0000, 0x7196, 0x7194, 0x7195, 0x7196, 0x7197, 0x7194, 0x7196, 0x7195 }, + { 0x0000, 0x7199, 0x719A, 0x7198, 0x7198, 0x719A, 0x719A, 0x719B, 0x7198 }, + { 0x0000, 0x719D, 0x719C, 0x719E, 0x719D, 0x719D, 0x719C, 0x719F, 0x719E }, + { 0x0000, 0x71A1, 0x71A0, 0x71A1, 0x71A2, 0x71A1, 0x71A2, 0x71A3, 0x71A2 }, + { 0x0000, 0x711C, 0x711E, 0x711C, 0x711F, 0x711E, 0x711C, 0x711D, 0x711F }, + { 0x0000, 0x7104, 0x7105, 0x7107, 0x7107, 0x7105, 0x7106, 0x7107, 0x7107 }, + { 0x0000, 0x7107, 0x7105, 0x7107, 0x7107, 0x7106, 0x7107, 0x7107, 0x7105 }, + { 0x0000, 0x7113, 0x7117, 0x7113, 0x7110, 0x7112, 0x7112, 0x7116, 0x7112 }, + { 0x0000, 0x7113, 0x7113, 0x7113, 0x7113, 0x7113, 0x7113, 0x7111, 0x7113 }, + { 0x0000, 0x7113, 0x7117, 0x7113, 0x7110, 0x7112, 0x7112, 0x7116, 0x7112 }, + { 0x0000, 0x7117, 0x7117, 0x7117, 0x7117, 0x7117, 0x7117, 0x7117, 0x7113 }, + { 0x0000, 0x7101, 0x7100, 0x7102, 0x7103, 0x7101, 0x7100, 0x7102, 0x7103 }, + { 0x0000, 0x7100, 0x7102, 0x7100, 0x7100, 0x7100, 0x7100, 0x7100, 0x7102 }, + { 0x0000, 0x710A, 0x7109, 0x7109, 0x710A, 0x710B, 0x7108, 0x7109, 0x710B }, + { 0x0000, 0x7117, 0x7112, 0x7113, 0x7110, 0x710C, 0x7117, 0x710E, 0x7112 }, + { 0x0000, 0x710D, 0x710F, 0x710C, 0x7112, 0x710D, 0x710C, 0x710C, 0x710F }, + { 0x0000, 0x710A, 0x7109, 0x711A, 0x710A, 0x7109, 0x7108, 0x710B, 0x7109 }, + { 0x0000, 0x710C, 0x710F, 0x7113, 0x7110, 0x710D, 0x7112, 0x7116, 0x710D }, + { 0x0000, 0x7115, 0x7114, 0x7114, 0x7115, 0x7114, 0x7114, 0x7116, 0x7117 }, + { 0x0000, 0x7113, 0x710F, 0x7113, 0x7110, 0x710C, 0x711A, 0x710D, 0x7112 }, + { 0x0000, 0x7101, 0x7102, 0x7103, 0x7101, 0x7100, 0x7100, 0x7102, 0x7100 }, + { 0x0000, 0x7112, 0x710E, 0x7112, 0x710E, 0x710D, 0x7112, 0x710E, 0x710F }, + { 0x0000, 0x7142, 0x7141, 0x7142, 0x7143, 0x7140, 0x7140, 0x7141, 0x7143 }, + { 0x0000, 0x713C, 0x713D, 0x713D, 0x713E, 0x713E, 0x713F, 0x713D, 0x713F }, + { 0x0000, 0x7101, 0x7102, 0x7103, 0x7101, 0x7100, 0x7100, 0x7102, 0x7100 }, + { 0x0000, 0x7113, 0x7117, 0x7113, 0x7110, 0x7112, 0x7112, 0x7116, 0x7112 }, + { 0x0000, 0x7104, 0x7105, 0x7107, 0x7105, 0x7105, 0x7105, 0x7107, 0x7107 }, + { 0x0000, 0x7104, 0x7105, 0x7107, 0x7105, 0x710C, 0x7105, 0x7107, 0x7107 }, +}; + +u16 Text_GetFaceReaction(GlobalContext* globalCtx, u32 reactionSet) { + u8 currentMask = func_8008F080(globalCtx); + return sReactionTextIds[reactionSet][currentMask]; +} diff --git a/src/code/z_fbdemo.c b/src/code/z_fbdemo.c index 8035620363..e2b6f3cefc 100644 --- a/src/code/z_fbdemo.c +++ b/src/code/z_fbdemo.c @@ -18,4 +18,3 @@ #pragma GLOBAL_ASM("asm/non_matchings/code/z_fbdemo/func_800B23E8.s") #pragma GLOBAL_ASM("asm/non_matchings/code/z_fbdemo/func_800B23F0.s") - diff --git a/src/code/z_fcurve_data_skelanime.c b/src/code/z_fcurve_data_skelanime.c index bb9c5e8cde..8feea0af9f 100644 --- a/src/code/z_fcurve_data_skelanime.c +++ b/src/code/z_fcurve_data_skelanime.c @@ -14,4 +14,3 @@ #pragma GLOBAL_ASM("asm/non_matchings/code/z_fcurve_data_skelanime/func_8006CBAC.s") #pragma GLOBAL_ASM("asm/non_matchings/code/z_fcurve_data_skelanime/func_8006CF6C.s") - diff --git a/src/code/z_game_dlftbls.c b/src/code/z_game_dlftbls.c new file mode 100644 index 0000000000..025cdda6d1 --- /dev/null +++ b/src/code/z_game_dlftbls.c @@ -0,0 +1,18 @@ +#include + +#define GAMESTATE_OVERLAY(name, init, destroy, size) \ + { \ + NULL, (u32)_ovl_##name##SegmentRomStart, (u32)_ovl_##name##SegmentRomEnd, _ovl_##name##SegmentStart, \ + _ovl_##name##SegmentEnd, 0, init, destroy, 0, 0, 0, size \ + } +#define GAMESTATE_OVERLAY_INTERNAL(init, destroy, size) \ + { NULL, 0, 0, NULL, NULL, 0, init, destroy, 0, 0, 0, size } + +GameStateOverlay gGameStateOverlayTable[] = { + GAMESTATE_OVERLAY_INTERNAL(TitleSetup_Init, TitleSetup_Destroy, sizeof(GameState)), + GAMESTATE_OVERLAY(select, func_80801E44, func_80801E0C, 0x240), // TODO : sizeof(SelectContext) + GAMESTATE_OVERLAY(title, Title_Init, Title_Destroy, sizeof(TitleContext)), + GAMESTATE_OVERLAY_INTERNAL(func_800BCA64, func_800BC8EC, sizeof(GlobalContext)), + GAMESTATE_OVERLAY(opening, Opening_Init, Opening_Destroy, sizeof(OpeningContext)), + GAMESTATE_OVERLAY(file_choose, func_80811A20, func_80811A18, 0x1CAE0), +}; diff --git a/src/code/z_horse.c b/src/code/z_horse.c index 69a0e6f3a8..44612269b9 100644 --- a/src/code/z_horse.c +++ b/src/code/z_horse.c @@ -2,22 +2,20 @@ #include #include -s32 func_8006CFC0(s32 scene) -{ +s32 func_8006CFC0(s32 scene) { s32 validScenes[] = { SCENE_SPOT00, SCENE_SPOT06, SCENE_SPOT09, SCENE_SPOT12, SCENE_SPOT20 }; s32 i; - for (i = 0; i < ARRAY_COUNT(validScenes); i++) - { - if (scene == validScenes[i]) + for (i = 0; i < ARRAY_COUNT(validScenes); i++) { + if (scene == validScenes[i]) { return 1; + } } return 0; } -void func_8006D074(GlobalContext* globalCtx) -{ +void func_8006D074(GlobalContext* globalCtx) { gSaveContext.horse_data.scene = SCENE_SPOT00; gSaveContext.horse_data.pos.x = -1840; gSaveContext.horse_data.pos.y = 72; @@ -25,10 +23,8 @@ void func_8006D074(GlobalContext* globalCtx) gSaveContext.horse_data.angle = -27353; } -void func_8006D0AC(GlobalContext* globalCtx) -{ - if (gSaveContext.horse_data.scene == SCENE_SPOT06) - { +void func_8006D0AC(GlobalContext* globalCtx) { + if (gSaveContext.horse_data.scene == SCENE_SPOT06) { gSaveContext.horse_data.scene = SCENE_SPOT06; gSaveContext.horse_data.pos.x = -2065; gSaveContext.horse_data.pos.y = -863; @@ -37,239 +33,209 @@ void func_8006D0AC(GlobalContext* globalCtx) } } -typedef struct -{ - /* 0x00 */ s16 scene; +typedef struct { + /* 0x00 */ s16 scene; /* 0x02 */ Vec3s pos; - /* 0x08 */ s16 angle; - /* 0x0A */ s16 type; + /* 0x08 */ s16 angle; + /* 0x0A */ s16 type; } HorseSpawn; -void func_8006D0EC(GlobalContext* globalCtx, Player* player) -{ +void func_8006D0EC(GlobalContext* globalCtx, Player* player) { s32 i; - HorseSpawn horseSpawns[] = - { - { 81, 0xFE34, 0x0064, 0x19F0, 0, 2 }, - { 87, 0xF877, 0xFBFF, 0x0300, 0, 2 }, - { 90, 0x0A06, 0xFEFD, 0x02FF, 0, 2 }, - { 93, 0xFEB8, 0x000A, 0x03B9, 0, 2 }, + HorseSpawn horseSpawns[] = { + { 81, 0xFE34, 0x0064, 0x19F0, 0, 2 }, { 87, 0xF877, 0xFBFF, 0x0300, 0, 2 }, + { 90, 0x0A06, 0xFEFD, 0x02FF, 0, 2 }, { 93, 0xFEB8, 0x000A, 0x03B9, 0, 2 }, { 99, 0x03A0, 0x0000, 0xF718, 0, 2 }, }; - if ((AREG(6) != 0) && (Flags_GetEventChkInf(0x18) || (DREG(1) != 0))) - { - player->rideActor = Actor_Spawn(&globalCtx->actorCtx, globalCtx, ACTOR_EN_HORSE, - player->actor.posRot.pos.x, player->actor.posRot.pos.y, player->actor.posRot.pos.z, - player->actor.shape.rot.x, player->actor.shape.rot.y, player->actor.shape.rot.z, 9); - if (player->rideActor == NULL) + if ((AREG(6) != 0) && (Flags_GetEventChkInf(0x18) || (DREG(1) != 0))) { + player->rideActor = + Actor_Spawn(&globalCtx->actorCtx, globalCtx, ACTOR_EN_HORSE, player->actor.posRot.pos.x, + player->actor.posRot.pos.y, player->actor.posRot.pos.z, player->actor.shape.rot.x, + player->actor.shape.rot.y, player->actor.shape.rot.z, 9); + if (player->rideActor == NULL) { __assert("player->ride.actor != NULL", "../z_horse.c", 343); + } func_8002DECC(globalCtx, player, player->rideActor); func_8002DE74(globalCtx, player); gSaveContext.horse_data.scene = globalCtx->sceneNum; - if (globalCtx->sceneNum == SCENE_SPOT12) + if (globalCtx->sceneNum == SCENE_SPOT12) { player->rideActor->room = -1; - } - else if ((globalCtx->sceneNum == SCENE_SPOT12) && (gSaveContext.minigame_state == 3)) - { + } + } else if ((globalCtx->sceneNum == SCENE_SPOT12) && (gSaveContext.minigame_state == 3)) { Actor* horseActor; gSaveContext.minigame_state = 0; - horseActor = Actor_Spawn(&globalCtx->actorCtx, globalCtx, ACTOR_EN_HORSE, - 3586.0f, 1413.0f, -402.0f, - 0, 0x4000, 0, 1); + horseActor = + Actor_Spawn(&globalCtx->actorCtx, globalCtx, ACTOR_EN_HORSE, 3586.0f, 1413.0f, -402.0f, 0, 0x4000, 0, 1); horseActor->room = -1; - } - else if ((gSaveContext.entrance_index == 1230) && (gSaveContext.event_chk_inf[1] & 0x100)) - { + } else if ((gSaveContext.entrance_index == 1230) && (gSaveContext.event_chk_inf[1] & 0x100)) { Actor* horseActor; - horseActor = Actor_Spawn(&globalCtx->actorCtx, globalCtx, ACTOR_EN_HORSE, - -25.0f, 0.0f, -1600.0f, - 0, -0x4000, 0, 1); - if (horseActor == NULL) + horseActor = + Actor_Spawn(&globalCtx->actorCtx, globalCtx, ACTOR_EN_HORSE, -25.0f, 0.0f, -1600.0f, 0, -0x4000, 0, 1); + if (horseActor == NULL) { __assert("horse_actor != NULL", "../z_horse.c", 389); - } - else if ((globalCtx->sceneNum == gSaveContext.horse_data.scene) && (Flags_GetEventChkInf(0x18) != 0 || DREG(1) != 0)) - { - // Translates to: "SET BY EXISTENCE OF HORSE %d %d %d" - osSyncPrintf("馬存在によるセット %d %d %d\n", gSaveContext.horse_data.scene, Flags_GetEventChkInf(0x18), DREG(1)); - - if (func_8006CFC0(gSaveContext.horse_data.scene)) - { - Actor* horseActor; - horseActor = Actor_Spawn(&globalCtx->actorCtx, globalCtx, ACTOR_EN_HORSE, - gSaveContext.horse_data.pos.x, gSaveContext.horse_data.pos.y, gSaveContext.horse_data.pos.z, - 0, gSaveContext.horse_data.angle, 0, 1); - if (horseActor == NULL) - __assert("horse_actor != NULL", "../z_horse.c", 414); - - if (globalCtx->sceneNum == SCENE_SPOT12) - horseActor->room = -1; } - else - { + } else if ((globalCtx->sceneNum == gSaveContext.horse_data.scene) && + (Flags_GetEventChkInf(0x18) != 0 || DREG(1) != 0)) { + // Translates to: "SET BY EXISTENCE OF HORSE %d %d %d" + osSyncPrintf("馬存在によるセット %d %d %d\n", gSaveContext.horse_data.scene, Flags_GetEventChkInf(0x18), + DREG(1)); + + if (func_8006CFC0(gSaveContext.horse_data.scene)) { + Actor* horseActor; + horseActor = Actor_Spawn(&globalCtx->actorCtx, globalCtx, ACTOR_EN_HORSE, gSaveContext.horse_data.pos.x, + gSaveContext.horse_data.pos.y, gSaveContext.horse_data.pos.z, 0, + gSaveContext.horse_data.angle, 0, 1); + if (horseActor == NULL) { + __assert("horse_actor != NULL", "../z_horse.c", 414); + } + + if (globalCtx->sceneNum == SCENE_SPOT12) { + horseActor->room = -1; + } + } else { osSyncPrintf(VT_COL(RED, WHITE)); // Translates to: "Horse_SetNormal():%d SET SPOT IS NO GOOD." osSyncPrintf("Horse_SetNormal():%d セットスポットまずいです。\n", gSaveContext.horse_data.scene); osSyncPrintf(VT_RST); func_8006D074(globalCtx); } - } - else if ((globalCtx->sceneNum == SCENE_SPOT20) && !Flags_GetEventChkInf(0x18) && (DREG(1) == 0)) - { + } else if ((globalCtx->sceneNum == SCENE_SPOT20) && !Flags_GetEventChkInf(0x18) && (DREG(1) == 0)) { Actor* horseActor; - horseActor = Actor_Spawn(&globalCtx->actorCtx, globalCtx, ACTOR_EN_HORSE, - 0.0f, 0.0f, -500.0f, - 0, 0, 0, 1); - if (horseActor == 0) + horseActor = Actor_Spawn(&globalCtx->actorCtx, globalCtx, ACTOR_EN_HORSE, 0.0f, 0.0f, -500.0f, 0, 0, 0, 1); + if (horseActor == 0) { __assert("horse_actor != NULL", "../z_horse.c", 443); - } - else if (Flags_GetEventChkInf(0x18) || (DREG(1) != 0)) - { - for (i = 0; i < ARRAY_COUNT(horseSpawns); i++) - { + } + } else if (Flags_GetEventChkInf(0x18) || (DREG(1) != 0)) { + for (i = 0; i < ARRAY_COUNT(horseSpawns); i++) { HorseSpawn* horseSpawn = &horseSpawns[i]; - if (horseSpawn->scene == globalCtx->sceneNum) - { + if (horseSpawn->scene == globalCtx->sceneNum) { Actor* horseActor; - horseActor = Actor_Spawn(&globalCtx->actorCtx, globalCtx, ACTOR_EN_HORSE, - horseSpawn->pos.x, horseSpawn->pos.y, horseSpawn->pos.z, - 0, horseSpawn->angle, 0, horseSpawn->type); - if (horseActor == NULL) + horseActor = + Actor_Spawn(&globalCtx->actorCtx, globalCtx, ACTOR_EN_HORSE, horseSpawn->pos.x, horseSpawn->pos.y, + horseSpawn->pos.z, 0, horseSpawn->angle, 0, horseSpawn->type); + if (horseActor == NULL) { __assert("horse_actor != NULL", "../z_horse.c", 466); + } - if (globalCtx->sceneNum == SCENE_SPOT12) + if (globalCtx->sceneNum == SCENE_SPOT12) { horseActor->room = -1; + } break; } } - } - else if (!Flags_GetEventChkInf(0x18)) - { - if ((DREG(1) == 0) && (globalCtx->sceneNum == SCENE_SOUKO) &&(gSaveContext.night_flag != 0)) - Actor_Spawn(&globalCtx->actorCtx, globalCtx, ACTOR_EN_HORSE, - 0.0f, 0.0f, -60.0f, - 0, 0x7360, 0, 1); + } else if (!Flags_GetEventChkInf(0x18)) { + if ((DREG(1) == 0) && (globalCtx->sceneNum == SCENE_SOUKO) && (gSaveContext.night_flag != 0)) { + Actor_Spawn(&globalCtx->actorCtx, globalCtx, ACTOR_EN_HORSE, 0.0f, 0.0f, -60.0f, 0, 0x7360, 0, 1); + } } } -typedef struct -{ - /* 0x00 */ s16 scene; - /* 0x04 */ s32 cutsceneIndex; +typedef struct { + /* 0x00 */ s16 scene; + /* 0x04 */ s32 cutsceneIndex; /* 0x08 */ Vec3s pos; - /* 0x0E */ s16 angle; - /* 0x10 */ s16 type; + /* 0x0E */ s16 angle; + /* 0x10 */ s16 type; } struct_8011F9B8; #ifdef NON_MATCHING // regalloc differences -void func_8006D684(GlobalContext* globalCtx, Player* player) -{ +void func_8006D684(GlobalContext* globalCtx, Player* player) { s32 pad; s32 i; Vec3s spawnPos; if ((gSaveContext.entrance_index == 0x028A || gSaveContext.entrance_index == 0x028E || gSaveContext.entrance_index == 0x0292 || gSaveContext.entrance_index == 0x0476) && - (gSaveContext.respawn_flag == 0)) - { - Vec3s spawnPositions[] = - { + (gSaveContext.respawn_flag == 0)) { + Vec3s spawnPositions[] = { { 0xF46F, 0x0139, 0x1E14 }, { 0xF894, 0x0139, 0x1B67 }, { 0xF035, 0x0139, 0x1B15 }, { 0xF6F7, 0x0139, 0x1766 }, }; - if (gSaveContext.entrance_index == 0x028A) + if (gSaveContext.entrance_index == 0x028A) { spawnPos = spawnPositions[0]; - else if (gSaveContext.entrance_index == 0x028E) + } else if (gSaveContext.entrance_index == 0x028E) { spawnPos = spawnPositions[1]; - else if (gSaveContext.entrance_index == 0x0292) + } else if (gSaveContext.entrance_index == 0x0292) { spawnPos = spawnPositions[2]; - else + } else { spawnPos = spawnPositions[3]; + } - player->rideActor = Actor_Spawn(&globalCtx->actorCtx, globalCtx, ACTOR_EN_HORSE, - spawnPos.x, spawnPos.y, spawnPos.z, - 0, player->actor.posRot.rot.y, 0, 7); - if (player->rideActor == NULL) + player->rideActor = Actor_Spawn(&globalCtx->actorCtx, globalCtx, ACTOR_EN_HORSE, spawnPos.x, spawnPos.y, + spawnPos.z, 0, player->actor.posRot.rot.y, 0, 7); + if (player->rideActor == NULL) { __assert("player->ride.actor != NULL", "../z_horse.c", 561); + } func_8002DECC(globalCtx, player, player->rideActor); func_8002DE74(globalCtx, player); gSaveContext.horse_data.scene = globalCtx->sceneNum; - } - else if ((globalCtx->sceneNum == SCENE_SPOT20) && ((gSaveContext.event_inf[0] & 0xF) == 6) && - (Flags_GetEventChkInf(0x18) == 0) && (DREG(1) == 0)) - { - player->rideActor = Actor_Spawn(&globalCtx->actorCtx, globalCtx, ACTOR_EN_HORSE, - 894.0f, 0.0f, -2084.0f, - 0, -0x7FFF, 0, 5); - if (player->rideActor == NULL) + } else if ((globalCtx->sceneNum == SCENE_SPOT20) && ((gSaveContext.event_inf[0] & 0xF) == 6) && + (Flags_GetEventChkInf(0x18) == 0) && (DREG(1) == 0)) { + player->rideActor = + Actor_Spawn(&globalCtx->actorCtx, globalCtx, ACTOR_EN_HORSE, 894.0f, 0.0f, -2084.0f, 0, -0x7FFF, 0, 5); + if (player->rideActor == NULL) { __assert("player->ride.actor != NULL", "../z_horse.c", 582); + } func_8002DECC(globalCtx, player, player->rideActor); func_8002DE74(globalCtx, player); gSaveContext.horse_data.scene = globalCtx->sceneNum; - if (globalCtx->sceneNum == SCENE_SPOT12) + if (globalCtx->sceneNum == SCENE_SPOT12) { player->rideActor->room = -1; - } - else - { - static struct_8011F9B8 D_8011F9B8[] = - { - { 93, 0xFFF0, 0x0E10, 0x0585, 0x0168, 0x8001, 8 }, - { 99, 0xFFF0, 0xFF06, 0x0001, 0xF9D4, 0x4000, 6 }, - { 99, 0xFFF1, 0x0000, 0x0000, 0x0000, 0x0000, 5 }, - { 99, 0xFFF5, 0x0000, 0x0000, 0x0000, 0x0000, 7 }, - { 81, 0xFFF3, 0xF46F, 0x0139, 0x1E14, 0x0000, 7 }, - { 81, 0xFFF4, 0xF894, 0x0139, 0x1B67, 0x0000, 7 }, - { 81, 0xFFF5, 0xF035, 0x0139, 0x1B15, 0x0000, 7 }, - { 81, 0xFFF6, 0xF035, 0x0139, 0x1B15, 0x0000, 7 }, + } + } else { + static struct_8011F9B8 D_8011F9B8[] = { + { 93, 0xFFF0, 0x0E10, 0x0585, 0x0168, 0x8001, 8 }, { 99, 0xFFF0, 0xFF06, 0x0001, 0xF9D4, 0x4000, 6 }, + { 99, 0xFFF1, 0x0000, 0x0000, 0x0000, 0x0000, 5 }, { 99, 0xFFF5, 0x0000, 0x0000, 0x0000, 0x0000, 7 }, + { 81, 0xFFF3, 0xF46F, 0x0139, 0x1E14, 0x0000, 7 }, { 81, 0xFFF4, 0xF894, 0x0139, 0x1B67, 0x0000, 7 }, + { 81, 0xFFF5, 0xF035, 0x0139, 0x1B15, 0x0000, 7 }, { 81, 0xFFF6, 0xF035, 0x0139, 0x1B15, 0x0000, 7 }, }; - for (i = 0; i < ARRAY_COUNT(D_8011F9B8); i++) - { - if ((globalCtx->sceneNum == D_8011F9B8[i].scene) && (gSaveContext.cutscene_index == D_8011F9B8[i].cutsceneIndex)) - { - if (D_8011F9B8[i].type == 7) - { - if ((globalCtx->sceneNum == 99) && (gSaveContext.cutscene_index == 0xFFF1)) - { + for (i = 0; i < ARRAY_COUNT(D_8011F9B8); i++) { + if ((globalCtx->sceneNum == D_8011F9B8[i].scene) && + (gSaveContext.cutscene_index == D_8011F9B8[i].cutsceneIndex)) { + if (D_8011F9B8[i].type == 7) { + if ((globalCtx->sceneNum == 99) && (gSaveContext.cutscene_index == 0xFFF1)) { D_8011F9B8[i].pos.x = player->actor.posRot.pos.x; D_8011F9B8[i].pos.y = player->actor.posRot.pos.y; D_8011F9B8[i].pos.z = player->actor.posRot.pos.z; } player->rideActor = Actor_Spawn(&globalCtx->actorCtx, globalCtx, ACTOR_EN_HORSE, - D_8011F9B8[i].pos.x, D_8011F9B8[i].pos.y, D_8011F9B8[i].pos.z, - 0, player->actor.posRot.rot.y, 0, D_8011F9B8[i].type); - if (player->rideActor == NULL) + D_8011F9B8[i].pos.x, D_8011F9B8[i].pos.y, D_8011F9B8[i].pos.z, 0, + player->actor.posRot.rot.y, 0, D_8011F9B8[i].type); + if (player->rideActor == NULL) { __assert("player->ride.actor != NULL", "../z_horse.c", 628); + } func_8002DECC(globalCtx, player, player->rideActor); func_8002DE74(globalCtx, player); - } - else if ((D_8011F9B8[i].type == 5) || (D_8011F9B8[i].type == 6) || (D_8011F9B8[i].type == 8)) - { + } else if ((D_8011F9B8[i].type == 5) || (D_8011F9B8[i].type == 6) || (D_8011F9B8[i].type == 8)) { Vec3f sp54; s32 temp; s32 pad2; temp = 0; - if (((gSaveContext.event_inf[0] & 0x10) >> 4) && D_8011F9B8[i].type == 6) + if (((gSaveContext.event_inf[0] & 0x10) >> 4) && D_8011F9B8[i].type == 6) { temp = 0x8000; + } player->rideActor = Actor_Spawn(&globalCtx->actorCtx, globalCtx, ACTOR_EN_HORSE, - D_8011F9B8[i].pos.x, D_8011F9B8[i].pos.y, D_8011F9B8[i].pos.z, - 0, D_8011F9B8[i].angle, 0, D_8011F9B8[i].type | temp); - if (player->rideActor == NULL) + D_8011F9B8[i].pos.x, D_8011F9B8[i].pos.y, D_8011F9B8[i].pos.z, 0, + D_8011F9B8[i].angle, 0, D_8011F9B8[i].type | temp); + if (player->rideActor == NULL) { __assert("player->ride.actor != NULL", "../z_horse.c", 667); + } player->actor.posRot.pos.x = D_8011F9B8[i].pos.x; player->actor.posRot.pos.y = D_8011F9B8[i].pos.y; @@ -285,12 +251,10 @@ void func_8006D684(GlobalContext* globalCtx, Player* player) sp54.z = player->actor.posRot.pos.z; func_800C04D8(globalCtx, globalCtx->cameraCtx.unk_5C0, &player->actor.posRot, &sp54); - } - else - { - Actor_Spawn(&globalCtx->actorCtx, globalCtx, ACTOR_EN_HORSE, - D_8011F9B8[i].pos.x, D_8011F9B8[i].pos.y, D_8011F9B8[i].pos.z, - 0, D_8011F9B8[i].angle, 0, D_8011F9B8[i].type); + } else { + Actor_Spawn(&globalCtx->actorCtx, globalCtx, ACTOR_EN_HORSE, D_8011F9B8[i].pos.x, + D_8011F9B8[i].pos.y, D_8011F9B8[i].pos.z, 0, D_8011F9B8[i].angle, 0, + D_8011F9B8[i].type); } break; } @@ -298,33 +262,24 @@ void func_8006D684(GlobalContext* globalCtx, Player* player) } } #else -Vec3s D_8011F9A0[] = -{ +Vec3s D_8011F9A0[] = { { 0xF46F, 0x0139, 0x1E14 }, { 0xF894, 0x0139, 0x1B67 }, { 0xF035, 0x0139, 0x1B15 }, { 0xF6F7, 0x0139, 0x1766 }, }; -struct_8011F9B8 D_8011F9B8[] = -{ - { 93, 0xFFF0, 0x0E10, 0x0585, 0x0168, 0x8001, 8 }, - { 99, 0xFFF0, 0xFF06, 0x0001, 0xF9D4, 0x4000, 6 }, - { 99, 0xFFF1, 0x0000, 0x0000, 0x0000, 0x0000, 5 }, - { 99, 0xFFF5, 0x0000, 0x0000, 0x0000, 0x0000, 7 }, - { 81, 0xFFF3, 0xF46F, 0x0139, 0x1E14, 0x0000, 7 }, - { 81, 0xFFF4, 0xF894, 0x0139, 0x1B67, 0x0000, 7 }, - { 81, 0xFFF5, 0xF035, 0x0139, 0x1B15, 0x0000, 7 }, - { 81, 0xFFF6, 0xF035, 0x0139, 0x1B15, 0x0000, 7 }, +struct_8011F9B8 D_8011F9B8[] = { + { 93, 0xFFF0, 0x0E10, 0x0585, 0x0168, 0x8001, 8 }, { 99, 0xFFF0, 0xFF06, 0x0001, 0xF9D4, 0x4000, 6 }, + { 99, 0xFFF1, 0x0000, 0x0000, 0x0000, 0x0000, 5 }, { 99, 0xFFF5, 0x0000, 0x0000, 0x0000, 0x0000, 7 }, + { 81, 0xFFF3, 0xF46F, 0x0139, 0x1E14, 0x0000, 7 }, { 81, 0xFFF4, 0xF894, 0x0139, 0x1B67, 0x0000, 7 }, + { 81, 0xFFF5, 0xF035, 0x0139, 0x1B15, 0x0000, 7 }, { 81, 0xFFF6, 0xF035, 0x0139, 0x1B15, 0x0000, 7 }, }; #pragma GLOBAL_ASM("asm/non_matchings/code/z_horse/func_8006D684.s") #endif -void func_8006DC68(GlobalContext* globalCtx, Player* player) -{ - if (LINK_IS_ADULT) - { - if (!func_8006CFC0(gSaveContext.horse_data.scene)) - { +void func_8006DC68(GlobalContext* globalCtx, Player* player) { + if (LINK_IS_ADULT) { + if (!func_8006CFC0(gSaveContext.horse_data.scene)) { osSyncPrintf(VT_COL(RED, WHITE)); // Translates to: "Horse_Set_Check():%d SET SPOT IS NO GOOD." osSyncPrintf("Horse_Set_Check():%d セットスポットまずいです。\n", gSaveContext.horse_data.scene); @@ -332,35 +287,31 @@ void func_8006DC68(GlobalContext* globalCtx, Player* player) func_8006D074(globalCtx); } - if (func_8006CFC0(globalCtx->sceneNum)) - { + if (func_8006CFC0(globalCtx->sceneNum)) { if ((gSaveContext.scene_setup_index > 3) || ((gSaveContext.entrance_index == 0x028A || gSaveContext.entrance_index == 0x028E || gSaveContext.entrance_index == 0x0292 || gSaveContext.entrance_index == 0x0476) && (gSaveContext.respawn_flag == 0)) || ((globalCtx->sceneNum == SCENE_SPOT20) && ((gSaveContext.event_inf[0] & 0xF) == 6) && - !Flags_GetEventChkInf(0x18) && (DREG(1) == 0))) - { + !Flags_GetEventChkInf(0x18) && (DREG(1) == 0))) { func_8006D684(globalCtx, player); - } - else - { + } else { func_8006D0EC(globalCtx, player); } } } } -void func_8006DD9C(Actor* actor, Vec3f* arg1, s16 arg2) -{ +void func_8006DD9C(Actor* actor, Vec3f* arg1, s16 arg2) { s16 x = Math_Vec3f_Yaw(&actor->posRot.pos, arg1) - actor->posRot.rot.y; - if (x > arg2) + if (x > arg2) { actor->posRot.rot.y += arg2; - else if (x < -arg2) + } else if (x < -arg2) { actor->posRot.rot.y -= arg2; - else + } else { actor->posRot.rot.y += x; + } actor->shape.rot.y = actor->posRot.rot.y; } diff --git a/src/code/z_jpeg.c b/src/code/z_jpeg.c index 93fe90b27f..5031ad8232 100644 --- a/src/code/z_jpeg.c +++ b/src/code/z_jpeg.c @@ -10,4 +10,3 @@ #pragma GLOBAL_ASM("asm/non_matchings/code/z_jpeg/func_8006E0EC.s") #pragma GLOBAL_ASM("asm/non_matchings/code/z_jpeg/func_8006E418.s") - diff --git a/src/code/z_kaleido_manager.c b/src/code/z_kaleido_manager.c index ad5761ec71..519639a151 100644 --- a/src/code/z_kaleido_manager.c +++ b/src/code/z_kaleido_manager.c @@ -1,15 +1,13 @@ #include #include -#define KALEIDO_OVERLAY(name) \ - { \ - NULL, (u32)_ovl_##name##SegmentRomStart, (u32)_ovl_##name##SegmentRomEnd, \ - _ovl_##name##SegmentStart, _ovl_##name##SegmentEnd, \ - 0, #name, \ +#define KALEIDO_OVERLAY(name) \ + { \ + NULL, (u32)_ovl_##name##SegmentRomStart, (u32)_ovl_##name##SegmentRomEnd, _ovl_##name##SegmentStart, \ + _ovl_##name##SegmentEnd, 0, #name, \ } -KaleidoManagerOvl gKaleidoMgrOverlayTable[] = -{ +KaleidoManagerOvl gKaleidoMgrOverlayTable[] = { KALEIDO_OVERLAY(kaleido_scope), KALEIDO_OVERLAY(player_actor), }; @@ -18,22 +16,21 @@ void* sKaleidoAreaPtr = NULL; KaleidoManagerOvl* gKaleidoMgrCurOvl = NULL; u32 D_8012D1E0 = 0; -void KaleidoManager_LoadOvl(KaleidoManagerOvl* ovl) -{ +void KaleidoManager_LoadOvl(KaleidoManagerOvl* ovl) { LogUtils_CheckNullPointer("KaleidoArea_allocp", sKaleidoAreaPtr, "../z_kaleido_manager.c", 99); ovl->loadedRamAddr = sKaleidoAreaPtr; Overlay_Load(ovl->vromStart, ovl->vromEnd, ovl->vramStart, ovl->vramEnd, ovl->loadedRamAddr); osSyncPrintf(VT_FGCOL(GREEN)); - osSyncPrintf("OVL(k):Seg:%08x-%08x Ram:%08x-%08x Off:%08x %s\n", ovl->vramStart, ovl->vramEnd, ovl->loadedRamAddr, ((u32)ovl->loadedRamAddr + ovl->vramEnd) - (u32)ovl->vramStart, (u32)ovl->vramStart - (u32)ovl->loadedRamAddr, ovl->name); + osSyncPrintf("OVL(k):Seg:%08x-%08x Ram:%08x-%08x Off:%08x %s\n", ovl->vramStart, ovl->vramEnd, ovl->loadedRamAddr, + ((u32)ovl->loadedRamAddr + ovl->vramEnd) - (u32)ovl->vramStart, + (u32)ovl->vramStart - (u32)ovl->loadedRamAddr, ovl->name); osSyncPrintf(VT_RST); ovl->off = (u32)ovl->loadedRamAddr - (u32)ovl->vramStart; gKaleidoMgrCurOvl = ovl; } -void KaleidoManager_ClearOvl(KaleidoManagerOvl* ovl) -{ - if (ovl->loadedRamAddr) - { +void KaleidoManager_ClearOvl(KaleidoManagerOvl* ovl) { + if (ovl->loadedRamAddr) { ovl->off = 0; bzero(ovl->loadedRamAddr, ovl->vramEnd - (u32)ovl->vramStart); ovl->loadedRamAddr = NULL; @@ -41,18 +38,17 @@ void KaleidoManager_ClearOvl(KaleidoManagerOvl* ovl) } } -void KaleidoManager_Init(GlobalContext* globalCtx) -{ +void KaleidoManager_Init(GlobalContext* globalCtx) { s32 largestOvl; s32 vramSize; u32 idx; largestOvl = 0; - for (idx = 0; idx < ARRAY_COUNT(gKaleidoMgrOverlayTable); idx++) - { + for (idx = 0; idx < ARRAY_COUNT(gKaleidoMgrOverlayTable); idx++) { vramSize = gKaleidoMgrOverlayTable[idx].vramEnd - (u32)gKaleidoMgrOverlayTable[idx].vramStart; - if (largestOvl < vramSize) + if (largestOvl < vramSize) { largestOvl = vramSize; + } } osSyncPrintf(VT_FGCOL(GREEN)); osSyncPrintf("KaleidoArea の最大サイズは %d バイトを確保します\n", largestOvl); @@ -64,46 +60,41 @@ void KaleidoManager_Init(GlobalContext* globalCtx) osSyncPrintf(VT_RST); gKaleidoMgrCurOvl = 0; } -void KaleidoManager_Destroy() -{ - if (gKaleidoMgrCurOvl) - { +void KaleidoManager_Destroy() { + if (gKaleidoMgrCurOvl) { KaleidoManager_ClearOvl(gKaleidoMgrCurOvl); gKaleidoMgrCurOvl = NULL; } sKaleidoAreaPtr = NULL; } -//NOTE: this function looks messed up and probably doesn't work like how the devs wanted it to work -void* KaleidoManager_GetRamAddr(void* vram) -{ +// NOTE: this function looks messed up and probably doesn't work like how the devs wanted it to work +void* KaleidoManager_GetRamAddr(void* vram) { KaleidoManagerOvl* iter; KaleidoManagerOvl* ovl; u32 idx; iter = gKaleidoMgrCurOvl; ovl = iter; - if (!ovl) - { + if (!ovl) { iter = &gKaleidoMgrOverlayTable[0]; - for (idx = 0; idx != ARRAY_COUNT(gKaleidoMgrOverlayTable); idx++) - { - if ((u32)vram >= (u32)iter->vramStart && (u32)iter->vramEnd >= (u32)vram) - { + for (idx = 0; idx != ARRAY_COUNT(gKaleidoMgrOverlayTable); idx++) { + if ((u32)vram >= (u32)iter->vramStart && (u32)iter->vramEnd >= (u32)vram) { KaleidoManager_LoadOvl(iter); ovl = iter; goto KaleidoManager_GetRamAddr_end; } - //BUG: devs probably forgot iter++ here + // BUG: devs probably forgot iter++ here } - - osSyncPrintf("異常\n"); //Abnormal + + osSyncPrintf("異常\n"); // Abnormal return NULL; } KaleidoManager_GetRamAddr_end: - if (!ovl || (u32)vram < (u32)ovl->vramStart || (u32)vram >= (u32)ovl->vramEnd) + if (!ovl || (u32)vram < (u32)ovl->vramStart || (u32)vram >= (u32)ovl->vramEnd) { return NULL; + } return (void*)((u32)vram + ovl->off); } diff --git a/src/code/z_kaleido_scope_call.c b/src/code/z_kaleido_scope_call.c index 7932415dfb..60928cc611 100644 --- a/src/code/z_kaleido_scope_call.c +++ b/src/code/z_kaleido_scope_call.c @@ -7,67 +7,54 @@ float D_80161398; u32 D_8016139C; void* D_801613A0; -extern void func_80826CB4(GlobalContext*); //KaleidoScope_Update -extern void func_808262B8(GlobalContext*); //KaleidoScope_Draw +extern void func_80826CB4(GlobalContext*); // KaleidoScope_Update +extern void func_808262B8(GlobalContext*); // KaleidoScope_Draw -void KaleidoScopeCall_LoadPlayer() -{ - if ((u32)gKaleidoMgrCurOvl != (u32)&gKaleidoMgrOverlayTable[KALEIDO_OVL_PLAYER_ACTOR]) - { - if (gKaleidoMgrCurOvl) - { +void KaleidoScopeCall_LoadPlayer() { + if ((u32)gKaleidoMgrCurOvl != (u32)&gKaleidoMgrOverlayTable[KALEIDO_OVL_PLAYER_ACTOR]) { + if (gKaleidoMgrCurOvl) { osSyncPrintf(VT_FGCOL(GREEN)); - osSyncPrintf("カレイド領域 強制排除\n"); //Kaleido area forced exclusion + osSyncPrintf("カレイド領域 強制排除\n"); // Kaleido area forced exclusion osSyncPrintf(VT_RST); KaleidoManager_ClearOvl(gKaleidoMgrCurOvl); } osSyncPrintf(VT_FGCOL(GREEN)); - osSyncPrintf("プレイヤーアクター搬入\n"); //Player actor import + osSyncPrintf("プレイヤーアクター搬入\n"); // Player actor import osSyncPrintf(VT_RST); KaleidoManager_LoadOvl(&gKaleidoMgrOverlayTable[KALEIDO_OVL_PLAYER_ACTOR]); } } -void KaleidoScopeCall_Init(GlobalContext* globalCtx) -{ - //Kaleidoscope replacement construct +void KaleidoScopeCall_Init(GlobalContext* globalCtx) { + // Kaleidoscope replacement construct osSyncPrintf("カレイド・スコープ入れ替え コンストラクト \n"); sKaleidoScopeUpdateFunc = KaleidoManager_GetRamAddr(func_80826CB4); sKaleidoScopeDrawFunc = KaleidoManager_GetRamAddr(func_808262B8); - //Note : the line numbers suggests there was a macro (see logutils.c) - LogUtils_LogThreadId("../z_kaleido_scope_call.c", 98); - osSyncPrintf("kaleido_scope_move = %08x\n", func_80826CB4); - LogUtils_LogThreadId("../z_kaleido_scope_call.c", 99); - osSyncPrintf("kaleido_scope_move_func = %08x\n", sKaleidoScopeUpdateFunc); - LogUtils_LogThreadId("../z_kaleido_scope_call.c", 100); - osSyncPrintf("kaleido_scope_draw = %08x\n", func_808262B8); - LogUtils_LogThreadId("../z_kaleido_scope_call.c", 101); - osSyncPrintf("kaleido_scope_draw_func = %08x\n", sKaleidoScopeDrawFunc); + + LOG_ADDRESS("kaleido_scope_move", func_80826CB4, "../z_kaleido_scope_call.c", 98); + LOG_ADDRESS("kaleido_scope_move_func", sKaleidoScopeUpdateFunc, "../z_kaleido_scope_call.c", 99); + LOG_ADDRESS("kaleido_scope_draw", func_808262B8, "../z_kaleido_scope_call.c", 100); + LOG_ADDRESS("kaleido_scope_draw_func", sKaleidoScopeDrawFunc, "../z_kaleido_scope_call.c", 101); func_8006ECF4(globalCtx); } -void KaleidoScopeCall_Destroy(GlobalContext* globalCtx) -{ - //Kaleidoscope replacement +void KaleidoScopeCall_Destroy(GlobalContext* globalCtx) { + // Kaleidoscope replacement osSyncPrintf("カレイド・スコープ入れ替え デストラクト \n"); func_8006EE48(globalCtx); } -//regalloc +// regalloc #ifdef NON_MATCHING -void KaleidoScopeCall_Update(GlobalContext* globalCtx) -{ +void KaleidoScopeCall_Update(GlobalContext* globalCtx) { u32 pad; PauseContext* pauseCtx; - + pauseCtx = &globalCtx->pauseCtx; - if (pauseCtx->state != 0 || pauseCtx->flag != 0) - { - if (pauseCtx->state == 1) - { - if (func_800B38FC() == 0) - { + if (pauseCtx->state != 0 || pauseCtx->flag != 0) { + if (pauseCtx->state == 1) { + if (func_800B38FC() == 0) { HREG(80) = 7; HREG(82) = 3; R_PAUSE_MENU_MODE = 1; @@ -75,45 +62,36 @@ void KaleidoScopeCall_Update(GlobalContext* globalCtx) pauseCtx->unk_1EC = 0; pauseCtx->state++; } - } - else if (pauseCtx->state == 8) - { + } else if (pauseCtx->state == 8) { HREG(80) = 7; HREG(82) = 3; R_PAUSE_MENU_MODE = 1; pauseCtx->unk_1E4 = 0; pauseCtx->unk_1EC = 0; pauseCtx->state++; - } - else if (pauseCtx->state == 2 || pauseCtx->state == 9) - { + } else if (pauseCtx->state == 2 || pauseCtx->state == 9) { osSyncPrintf("R_PAUSE_MENU_MODE=%d\n", R_PAUSE_MENU_MODE); - if (R_PAUSE_MENU_MODE >= 3) + if (R_PAUSE_MENU_MODE >= 3) { pauseCtx->state++; - } - else if (pauseCtx->state != 0) - { - if (&gKaleidoMgrOverlayTable[KALEIDO_OVL_KALEIDO_SCOPE] != gKaleidoMgrCurOvl) - { - if (gKaleidoMgrCurOvl) - { + } + } else if (pauseCtx->state != 0) { + if (&gKaleidoMgrOverlayTable[KALEIDO_OVL_KALEIDO_SCOPE] != gKaleidoMgrCurOvl) { + if (gKaleidoMgrCurOvl) { osSyncPrintf(VT_FGCOL(GREEN)); - osSyncPrintf("カレイド領域 プレイヤー 強制排除\n"); //Kaleid Zone Player Forced Elimination + osSyncPrintf("カレイド領域 プレイヤー 強制排除\n"); // Kaleid Zone Player Forced Elimination osSyncPrintf(VT_RST); KaleidoManager_ClearOvl(gKaleidoMgrCurOvl); } osSyncPrintf(VT_FGCOL(GREEN)); - osSyncPrintf("カレイド領域 カレイドスコープ搬入\n"); //Kaleid area Kaleidoscope loading + osSyncPrintf("カレイド領域 カレイドスコープ搬入\n"); // Kaleid area Kaleidoscope loading osSyncPrintf(VT_RST); KaleidoManager_LoadOvl(&gKaleidoMgrOverlayTable[KALEIDO_OVL_KALEIDO_SCOPE]); } - if (&gKaleidoMgrOverlayTable[KALEIDO_OVL_KALEIDO_SCOPE] == gKaleidoMgrCurOvl) - { + if (&gKaleidoMgrOverlayTable[KALEIDO_OVL_KALEIDO_SCOPE] == gKaleidoMgrCurOvl) { sKaleidoScopeUpdateFunc(globalCtx); - if (globalCtx->pauseCtx.state == 0 && globalCtx->pauseCtx.flag == 0) - { + if (globalCtx->pauseCtx.state == 0 && globalCtx->pauseCtx.flag == 0) { osSyncPrintf(VT_FGCOL(GREEN)); - osSyncPrintf("カレイド領域 カレイドスコープ排出\n"); //Kaleid area Kaleidoscope emission + osSyncPrintf("カレイド領域 カレイドスコープ排出\n"); // Kaleid area Kaleidoscope emission osSyncPrintf(VT_RST); KaleidoManager_ClearOvl(&gKaleidoMgrOverlayTable[KALEIDO_OVL_KALEIDO_SCOPE]); KaleidoScopeCall_LoadPlayer(); @@ -126,18 +104,16 @@ void KaleidoScopeCall_Update(GlobalContext* globalCtx) #pragma GLOBAL_ASM("asm/non_matchings/code/z_kaleido_scope_call/KaleidoScopeCall_Update.s") #endif -void KaleidoScopeCall_Draw(GlobalContext* globalCtx) -{ - KaleidoManagerOvl *kaleidoScopeOvl; +void KaleidoScopeCall_Draw(GlobalContext* globalCtx) { + KaleidoManagerOvl* kaleidoScopeOvl; - if (R_PAUSE_MENU_MODE >= 3) - { - if ((globalCtx->pauseCtx.state >= 4 && globalCtx->pauseCtx.state < 8) || (globalCtx->pauseCtx.state >= 11 && globalCtx->pauseCtx.state < 19)) - { + if (R_PAUSE_MENU_MODE >= 3) { + if ((globalCtx->pauseCtx.state >= 4 && globalCtx->pauseCtx.state < 8) || + (globalCtx->pauseCtx.state >= 11 && globalCtx->pauseCtx.state < 19)) { kaleidoScopeOvl = &gKaleidoMgrOverlayTable[KALEIDO_OVL_KALEIDO_SCOPE]; - if (gKaleidoMgrCurOvl == kaleidoScopeOvl) + if (gKaleidoMgrCurOvl == kaleidoScopeOvl) { sKaleidoScopeDrawFunc(globalCtx); + } } } - } diff --git a/src/code/z_kanfont.c b/src/code/z_kanfont.c index fb58245bd1..fc2c0b1e8f 100644 --- a/src/code/z_kanfont.c +++ b/src/code/z_kanfont.c @@ -6,4 +6,3 @@ #pragma GLOBAL_ASM("asm/non_matchings/code/z_kanfont/func_8006EEBC.s") #pragma GLOBAL_ASM("asm/non_matchings/code/z_kanfont/func_8006EF10.s") - diff --git a/src/code/z_kankyo.c b/src/code/z_kankyo.c index 94f8bf6dc7..7caa221e5d 100644 --- a/src/code/z_kankyo.c +++ b/src/code/z_kankyo.c @@ -31,8 +31,7 @@ #pragma GLOBAL_ASM("asm/non_matchings/code/z_kankyo/func_80073A5C.s") -f32 func_800746DC() -{ +f32 func_800746DC() { return Math_Rand_ZeroOne() - 0.5f; } @@ -70,23 +69,19 @@ f32 func_800746DC() #pragma GLOBAL_ASM("asm/non_matchings/code/z_kankyo/func_800773A8.s") -s32 func_800775CC() -{ +s32 func_800775CC() { return gSaveContext.unk_18; } -void func_800775D8() -{ +void func_800775D8() { gSaveContext.unk_18 = 0; } -s32 func_800775E4() -{ +s32 func_800775E4() { return gSaveContext.unk_14; } -void func_800775F0(u16 arg0) -{ +void func_800775F0(u16 arg0) { gSaveContext.unk_140E = arg0; } @@ -97,4 +92,3 @@ void func_800775F0(u16 arg0) #pragma GLOBAL_ASM("asm/non_matchings/code/z_kankyo/func_80077684.s") #pragma GLOBAL_ASM("asm/non_matchings/code/z_kankyo/func_800776E4.s") - diff --git a/src/code/z_lib.c b/src/code/z_lib.c index 7b8bcbc2cb..c76e400c8f 100644 --- a/src/code/z_lib.c +++ b/src/code/z_lib.c @@ -1,112 +1,94 @@ #include #include -#ifdef NON_MATCHING -void Lib_MemSet(void* dest, size_t size, u8 val) -{ - u8* destu = dest; - u32 i; +void Lib_MemSet(u8* dest, size_t size, u8 val) { + u32 i = 0; - for (i = 0; i < size; i++) - { - *destu++ = val; + // TODO: Convert this to while/for if possible + if (i == size) { + return; } + do { + *dest++ = val; + i++; + } while (i != size); } -#else -#pragma GLOBAL_ASM("asm/non_matchings/code/z_lib/Lib_MemSet.s") -#endif -f32 Math_Coss(s16 angle) -{ +f32 Math_Coss(s16 angle) { return coss(angle) * (1.0f / 32767); } -f32 Math_Sins(s16 angle) -{ +f32 Math_Sins(s16 angle) { return sins(angle) * (1.0f / 32767); } -s32 Math_ApproxUpdateScaledS(s16* pValue, s16 target, s16 step) -{ +s32 Math_ApproxUpdateScaledS(s16* pValue, s16 target, s16 step) { f32 updateScale; - if (step != 0) - { + if (step != 0) { updateScale = R_UPDATE_RATE * 0.5f; - if ((s16)(*pValue - target) > 0) + if ((s16)(*pValue - target) > 0) { step = -step; + } *pValue += (s16)(step * updateScale); - if (((s16)(*pValue - target) * step) >= 0) - { + if (((s16)(*pValue - target) * step) >= 0) { *pValue = target; return 1; } - } - else if (target == *pValue) - { + } else if (target == *pValue) { return 1; } return 0; } -s32 Math_ApproxS(s16* pValue, s16 target, s16 step) -{ - if (step != 0) - { - if (target < *pValue) +s32 Math_ApproxS(s16* pValue, s16 target, s16 step) { + if (step != 0) { + if (target < *pValue) { step = -step; + } *pValue += step; - if (((*pValue - target) * step) >= 0) - { + if (((*pValue - target) * step) >= 0) { *pValue = target; return 1; } - } - else if (target == *pValue) - { + } else if (target == *pValue) { return 1; } return 0; } -s32 Math_ApproxF(f32* pValue, f32 target, f32 step) -{ - if (step != 0.0f) - { - if (target < *pValue) +s32 Math_ApproxF(f32* pValue, f32 target, f32 step) { + if (step != 0.0f) { + if (target < *pValue) { step = -step; + } *pValue += step; - if (((*pValue - target) * step) >= 0) - { + if (((*pValue - target) * step) >= 0) { *pValue = target; return 1; } - } - else if (target == *pValue) - { + } else if (target == *pValue) { return 1; } return 0; } -s32 func_80077A90(s16* pValue, s16 target, s16 step) -{ +s32 func_80077A90(s16* pValue, s16 target, s16 step) { s16 orig = *pValue; *pValue += step; - if (((s16)(*pValue - target) * (s16)(orig - target)) <= 0) - { + if (((s16)(*pValue - target) * (s16)(orig - target)) <= 0) { *pValue = target; return 1; } @@ -114,14 +96,12 @@ s32 func_80077A90(s16* pValue, s16 target, s16 step) return 0; } -s32 func_80077AF8(s16* pValue, s16 target, s16 step) -{ +s32 func_80077AF8(s16* pValue, s16 target, s16 step) { s16 orig = *pValue; *pValue += step; - if (((*pValue - target) * ((s16)orig - target)) <= 0) - { + if (((*pValue - target) * ((s16)orig - target)) <= 0) { *pValue = target; return 1; } @@ -129,50 +109,41 @@ s32 func_80077AF8(s16* pValue, s16 target, s16 step) return 0; } -s32 func_80077B58(s16* pValue, s16 target, s16 step) -{ +s32 func_80077B58(s16* pValue, s16 target, s16 step) { s32 phi_v0 = target - *pValue; - if (phi_v0 < 0) + if (phi_v0 < 0) { step = -step; + } - if (phi_v0 >= 0x8000) - { + if (phi_v0 >= 0x8000) { step = -step; phi_v0 = 0xFFFF0001 - -phi_v0; - } - else if (phi_v0 <= -0x8000) - { + } else if (phi_v0 <= -0x8000) { phi_v0 += 0xFFFF; step = -step; } - if (step != 0) - { + if (step != 0) { *pValue += step; - if ((phi_v0 * step) <= 0) - { + if ((phi_v0 * step) <= 0) { *pValue = target; return 1; } - } - else if (target == *pValue) - { + } else if (target == *pValue) { return 1; } return 0; } -s32 func_80077C1C(f32* pValue, f32 target, f32 step) -{ +s32 func_80077C1C(f32* pValue, f32 target, f32 step) { f32 orig = *pValue; *pValue += step; - if (((*pValue - target) * (orig - target)) <= 0) - { + if (((*pValue - target) * (orig - target)) <= 0) { *pValue = target; return 1; } @@ -180,40 +151,34 @@ s32 func_80077C1C(f32* pValue, f32 target, f32 step) return 0; } -s32 func_80077C6C(f32* pValue, f32 target, f32 incrStep, f32 decrStep) -{ +s32 func_80077C6C(f32* pValue, f32 target, f32 incrStep, f32 decrStep) { f32 step = (target >= *pValue) ? incrStep : decrStep; - if (step != 0.0f) - { - if (target < *pValue) + if (step != 0.0f) { + if (target < *pValue) { step = -step; + } *pValue += step; - if (((*pValue - target) * step) >= 0) - { + if (((*pValue - target) * step) >= 0) { *pValue = target; return 1; } - } - else if (target == *pValue) - { + } else if (target == *pValue) { return 1; } return 0; } -typedef struct -{ +typedef struct { /* 0x00 */ char unk_00[0x14]; - /* 0x14 */ s8 unk_14; - /* 0x14 */ s8 unk_15; + /* 0x14 */ s8 unk_14; + /* 0x14 */ s8 unk_15; } struct_80077D10; -void func_80077D10(f32* arg0, s16* arg1, struct_80077D10* arg2) -{ +void func_80077D10(f32* arg0, s16* arg1, struct_80077D10* arg2) { f32 var1 = arg2->unk_14; f32 var2 = arg2->unk_15; @@ -223,60 +188,51 @@ void func_80077D10(f32* arg0, s16* arg1, struct_80077D10* arg2) *arg1 = atan2s(var2, -var1); } -s16 Math_Rand_S16Offset(s16 base, s16 range) -{ +s16 Math_Rand_S16Offset(s16 base, s16 range) { return (s16)(Math_Rand_ZeroOne() * range) + base; } -s16 Math_Rand_S16OffsetStride(s16 base, s16 stride, s16 range) -{ +s16 Math_Rand_S16OffsetStride(s16 base, s16 stride, s16 range) { return (s16)(Math_Rand_ZeroOne() * range) * stride + base; } -void Math_Vec3f_Copy(Vec3f* dest, Vec3f* src) -{ +void Math_Vec3f_Copy(Vec3f* dest, Vec3f* src) { dest->x = src->x; dest->y = src->y; dest->z = src->z; } -void Math_Vec3s_ToVec3f(Vec3f* dest, Vec3s* src) -{ +void Math_Vec3s_ToVec3f(Vec3f* dest, Vec3s* src) { dest->x = src->x; dest->y = src->y; dest->z = src->z; } -void Math_Vec3f_Sum(Vec3f* a, Vec3f* b, Vec3f* dest) -{ +void Math_Vec3f_Sum(Vec3f* a, Vec3f* b, Vec3f* dest) { dest->x = a->x + b->x; dest->y = a->y + b->y; dest->z = a->z + b->z; } -void Math_Vec3f_Diff(Vec3f* a, Vec3f* b, Vec3f* dest) -{ +void Math_Vec3f_Diff(Vec3f* a, Vec3f* b, Vec3f* dest) { dest->x = a->x - b->x; dest->y = a->y - b->y; dest->z = a->z - b->z; } -void Math_Vec3s_DiffToVec3f(Vec3f* dest, Vec3s* a, Vec3s* b) -{ +void Math_Vec3s_DiffToVec3f(Vec3f* dest, Vec3s* a, Vec3s* b) { dest->x = a->x - b->x; dest->y = a->y - b->y; dest->z = a->z - b->z; } -void Math_Vec3f_Scale(Vec3f* vec, f32 scaleF) -{ +void Math_Vec3f_Scale(Vec3f* vec, f32 scaleF) { vec->x *= scaleF; vec->y *= scaleF; vec->z *= scaleF; } -f32 Math_Vec3f_DistXYZ(Vec3f* a, Vec3f* b) -{ +f32 Math_Vec3f_DistXYZ(Vec3f* a, Vec3f* b) { f32 dx = b->x - a->x; f32 dy = b->y - a->y; f32 dz = b->z - a->z; @@ -284,8 +240,7 @@ f32 Math_Vec3f_DistXYZ(Vec3f* a, Vec3f* b) return sqrtf(SQ(dx) + SQ(dy) + SQ(dz)); } -f32 Math_Vec3f_DistXYZAndStoreDiff(Vec3f* a, Vec3f* b, Vec3f* dest) -{ +f32 Math_Vec3f_DistXYZAndStoreDiff(Vec3f* a, Vec3f* b, Vec3f* dest) { dest->x = b->x - a->x; dest->y = b->y - a->y; dest->z = b->z - a->z; @@ -293,29 +248,25 @@ f32 Math_Vec3f_DistXYZAndStoreDiff(Vec3f* a, Vec3f* b, Vec3f* dest) return sqrtf(SQ(dest->x) + SQ(dest->y) + SQ(dest->z)); } -f32 Math_Vec3f_DistXZ(Vec3f* a, Vec3f* b) -{ +f32 Math_Vec3f_DistXZ(Vec3f* a, Vec3f* b) { f32 dx = b->x - a->x; f32 dz = b->z - a->z; return sqrtf(SQ(dx) + SQ(dz)); } -f32 Math_Vec3f_DiffY(Vec3f* a, Vec3f* b) -{ +f32 Math_Vec3f_DiffY(Vec3f* a, Vec3f* b) { return b->y - a->y; } -s16 Math_Vec3f_Yaw(Vec3f* a, Vec3f* b) -{ +s16 Math_Vec3f_Yaw(Vec3f* a, Vec3f* b) { f32 dx = b->x - a->x; f32 dz = b->z - a->z; return atan2s(dz, dx); } -s16 Math_Vec3f_Pitch(Vec3f* a, Vec3f* b) -{ +s16 Math_Vec3f_Pitch(Vec3f* a, Vec3f* b) { return atan2s(Math_Vec3f_DistXZ(a, b), a->y - b->y); } @@ -331,69 +282,51 @@ void IChain_Apply_Vec3f(u8* ptr, InitChainEntry* ichain); void IChain_Apply_Vec3fdiv1000(u8* ptr, InitChainEntry* ichain); void IChain_Apply_Vec3s(u8* ptr, InitChainEntry* ichain); -void (*sInitChainHandlers[])(u8* ptr, InitChainEntry* ichain) = -{ - IChain_Apply_u8, - IChain_Apply_s8, - IChain_Apply_u16, - IChain_Apply_s16, - IChain_Apply_u32, - IChain_Apply_s32, - IChain_Apply_f32, - IChain_Apply_f32div1000, - IChain_Apply_Vec3f, - IChain_Apply_Vec3fdiv1000, - IChain_Apply_Vec3s, +void (*sInitChainHandlers[])(u8* ptr, InitChainEntry* ichain) = { + IChain_Apply_u8, IChain_Apply_s8, IChain_Apply_u16, IChain_Apply_s16, + IChain_Apply_u32, IChain_Apply_s32, IChain_Apply_f32, IChain_Apply_f32div1000, + IChain_Apply_Vec3f, IChain_Apply_Vec3fdiv1000, IChain_Apply_Vec3s, }; -void Actor_ProcessInitChain(Actor* actor, InitChainEntry* ichain) -{ - do sInitChainHandlers[ichain->type]((u8*)actor, ichain); - while ((ichain++)->cont); +void Actor_ProcessInitChain(Actor* actor, InitChainEntry* ichain) { + do { + sInitChainHandlers[ichain->type]((u8*)actor, ichain); + } while ((ichain++)->cont); } -void IChain_Apply_u8(u8* ptr, InitChainEntry* ichain) -{ +void IChain_Apply_u8(u8* ptr, InitChainEntry* ichain) { *(u8*)(ptr + ichain->offset) = ichain->value; } -void IChain_Apply_s8(u8* ptr, InitChainEntry* ichain) -{ +void IChain_Apply_s8(u8* ptr, InitChainEntry* ichain) { *(s8*)(ptr + ichain->offset) = ichain->value; } -void IChain_Apply_u16(u8* ptr, InitChainEntry* ichain) -{ +void IChain_Apply_u16(u8* ptr, InitChainEntry* ichain) { *(u16*)(ptr + ichain->offset) = ichain->value; } -void IChain_Apply_s16(u8* ptr, InitChainEntry* ichain) -{ +void IChain_Apply_s16(u8* ptr, InitChainEntry* ichain) { *(s16*)(ptr + ichain->offset) = ichain->value; } -void IChain_Apply_u32(u8* ptr, InitChainEntry* ichain) -{ +void IChain_Apply_u32(u8* ptr, InitChainEntry* ichain) { *(u32*)(ptr + ichain->offset) = ichain->value; } -void IChain_Apply_s32(u8* ptr, InitChainEntry* ichain) -{ +void IChain_Apply_s32(u8* ptr, InitChainEntry* ichain) { *(s32*)(ptr + ichain->offset) = ichain->value; } -void IChain_Apply_f32(u8* ptr, InitChainEntry* ichain) -{ +void IChain_Apply_f32(u8* ptr, InitChainEntry* ichain) { *(f32*)(ptr + ichain->offset) = ichain->value; } -void IChain_Apply_f32div1000(u8* ptr, InitChainEntry* ichain) -{ +void IChain_Apply_f32div1000(u8* ptr, InitChainEntry* ichain) { *(f32*)(ptr + ichain->offset) = ichain->value / 1000.0f; } -void IChain_Apply_Vec3f(u8* ptr, InitChainEntry* ichain) -{ +void IChain_Apply_Vec3f(u8* ptr, InitChainEntry* ichain) { Vec3f* vec; f32 val; @@ -405,8 +338,7 @@ void IChain_Apply_Vec3f(u8* ptr, InitChainEntry* ichain) vec->x = val; } -void IChain_Apply_Vec3fdiv1000(u8* ptr, InitChainEntry* ichain) -{ +void IChain_Apply_Vec3fdiv1000(u8* ptr, InitChainEntry* ichain) { Vec3f* vec; f32 val; @@ -419,8 +351,7 @@ void IChain_Apply_Vec3fdiv1000(u8* ptr, InitChainEntry* ichain) vec->x = val; } -void IChain_Apply_Vec3s(u8* ptr, InitChainEntry* ichain) -{ +void IChain_Apply_Vec3s(u8* ptr, InitChainEntry* ichain) { Vec3s* vec; s16 val; @@ -432,40 +363,37 @@ void IChain_Apply_Vec3s(u8* ptr, InitChainEntry* ichain) vec->x = val; } -f32 Math_SmoothScaleMaxMinF(f32* pValue, f32 target, f32 scale, f32 maxStep, f32 minStep) -{ +f32 Math_SmoothScaleMaxMinF(f32* pValue, f32 target, f32 scale, f32 maxStep, f32 minStep) { f32 var; - if (*pValue != target) - { + if (*pValue != target) { var = (target - *pValue) * scale; - if ((var >= minStep) || (var <= -minStep)) - { - if (var > maxStep) + if ((var >= minStep) || (var <= -minStep)) { + if (var > maxStep) { var = maxStep; + } - if (var < -maxStep) + if (var < -maxStep) { var = -maxStep; + } *pValue += var; - } - else - { - if (var < minStep) - { + } else { + if (var < minStep) { *pValue += minStep; var = minStep; - if (target < *pValue) + if (target < *pValue) { *pValue = target; + } } - if (var > -minStep) - { + if (var > -minStep) { *pValue += -minStep; - if (*pValue < target) + if (*pValue < target) { *pValue = target; + } } } } @@ -473,174 +401,159 @@ f32 Math_SmoothScaleMaxMinF(f32* pValue, f32 target, f32 scale, f32 maxStep, f32 return fabsf(target - *pValue); } -void Math_SmoothScaleMaxF(f32* pValue, f32 target, f32 scale, f32 maxStep) -{ +void Math_SmoothScaleMaxF(f32* pValue, f32 target, f32 scale, f32 maxStep) { f32 step; - if (*pValue != target) - { + if (*pValue != target) { step = (target - *pValue) * scale; - if (step > maxStep) + if (step > maxStep) { step = maxStep; - else if (step < -maxStep) + } else if (step < -maxStep) { step = -maxStep; + } *pValue += step; } } -void Math_SmoothDownscaleMaxF(f32* pValue, f32 scale, f32 maxStep) -{ +void Math_SmoothDownscaleMaxF(f32* pValue, f32 scale, f32 maxStep) { f32 step; step = *pValue * scale; - if (step > maxStep) + if (step > maxStep) { step = maxStep; - else if (step < -maxStep) + } else if (step < -maxStep) { step = -maxStep; + } *pValue -= step; } -f32 func_800784D8(f32* pValue, f32 target, f32 scale, f32 maxStep, f32 minStep) -{ +f32 func_800784D8(f32* pValue, f32 target, f32 scale, f32 maxStep, f32 minStep) { f32 step; f32 baseStep; step = 0.0f; baseStep = target - *pValue; - if (*pValue != target) - { - if (baseStep > 180.0f) + if (*pValue != target) { + if (baseStep > 180.0f) { baseStep = -(360.0f - baseStep); - else if (baseStep < -180.0f) + } else if (baseStep < -180.0f) { baseStep = 360.0f + baseStep; + } step = baseStep * scale; - if ((step >= minStep) || (step <= -minStep)) - { - if (step > maxStep) + if ((step >= minStep) || (step <= -minStep)) { + if (step > maxStep) { step = maxStep; + } - if (step < -maxStep) + if (step < -maxStep) { step = -maxStep; + } *pValue += step; - } - else - { - if (step < minStep) - { + } else { + if (step < minStep) { step = minStep; *pValue += step; - if (*pValue > target) + if (*pValue > target) { *pValue = target; + } } - if (step > -minStep) - { + if (step > -minStep) { step = -minStep; *pValue += step; - if (*pValue < target) + if (*pValue < target) { *pValue = target; + } } } } - if (*pValue >= 360.0f) + if (*pValue >= 360.0f) { *pValue -= 360.0f; + } - if (*pValue < 0.0f) + if (*pValue < 0.0f) { *pValue += 360.0f; + } return step; } -#ifdef NON_MATCHING -// regalloc differences -s16 Math_SmoothScaleMaxMinS(s16* pValue, s16 target, s16 invScale, s16 maxStep, s16 minStep) -{ +s16 Math_SmoothScaleMaxMinS(s16* pValue, s16 target, s16 invScale, s16 maxStep, s16 minStep) { + s16 step = 0; s16 diff = (target - *pValue); - s32 baseStep; - s16 step; - baseStep = diff / invScale; + s32 baseStep = diff / invScale; - if (*pValue != target) - { + if (*pValue != target) { step = baseStep; - if ((step > minStep) || (step < -minStep)) - { - if (step > maxStep) + if ((step > minStep) || (step < -minStep)) { + if (step > maxStep) { step = maxStep; + } - if (step < -maxStep) + if (step < -maxStep) { step = -maxStep; + } *pValue += step; - } - else - { - if (diff >= 0) - { + } else { + if (diff >= 0) { *pValue += minStep; - if ((s16)(target - *pValue) <= 0) + if ((s16)(target - *pValue) <= 0) { *pValue = target; - } - else - { + } + } else { *pValue -= minStep; - if ((s16)(target - *pValue) >= 0) + if ((s16)(target - *pValue) >= 0) { *pValue = target; + } } } } return diff; } -#else -#pragma GLOBAL_ASM("asm/non_matchings/code/z_lib/Math_SmoothScaleMaxMinS.s") -#endif -void Math_SmoothScaleMaxS(s16* pValue, s16 target, s16 invScale, s16 maxStep) -{ +void Math_SmoothScaleMaxS(s16* pValue, s16 target, s16 invScale, s16 maxStep) { s16 step = target - *pValue; step /= invScale; - if (step > maxStep) + if (step > maxStep) { *pValue += maxStep; - else if (step < -maxStep) + } else if (step < -maxStep) { *pValue -= maxStep; - else + } else { *pValue += step; + } } -void Color_RGBA8_Copy(Color_RGBA8* dst, Color_RGBA8* src) -{ +void Color_RGBA8_Copy(Color_RGBA8* dst, Color_RGBA8* src) { dst->r = src->r; dst->g = src->g; dst->b = src->b; dst->a = src->a; } -void func_80078884(u16 sfxId) -{ +void func_80078884(u16 sfxId) { Audio_PlaySoundGeneral(sfxId, &D_801333D4, 4, &D_801333E0, &D_801333E0, &D_801333E8); } -void func_800788CC(u16 sfxId) -{ +void func_800788CC(u16 sfxId) { Audio_PlaySoundGeneral(sfxId, &D_801333D4, 4, &D_801333E0, &D_801333E0, &D_801333E8); } -void func_80078914(Vec3f* arg0, u16 sfxId) -{ +void func_80078914(Vec3f* arg0, u16 sfxId) { Audio_PlaySoundGeneral(sfxId, arg0, 4, &D_801333E0, &D_801333E0, &D_801333E8); } diff --git a/src/code/z_lifemeter.c b/src/code/z_lifemeter.c index f67235c4a4..cd430e55ae 100644 --- a/src/code/z_lifemeter.c +++ b/src/code/z_lifemeter.c @@ -17,8 +17,7 @@ s16 D_8015FDC8[3]; s16 D_8015FDD0[6]; s16 D_8015FDE0[6]; -void Health_InitData(GlobalContext* globalCtx) -{ +void Health_InitData(GlobalContext* globalCtx) { InterfaceContext* interfaceCtx = &globalCtx->interfaceCtx; interfaceCtx->unk_228 = 0x140; @@ -49,29 +48,23 @@ void Health_InitData(GlobalContext* globalCtx) } #ifdef NON_MATCHING -// this function still needs some work -void Health_UpdateData(GlobalContext* globalCtx) -{ +// this function still needs some work but it should be functionally equivalent +void Health_UpdateData(GlobalContext* globalCtx) { InterfaceContext* interfaceCtx = &globalCtx->interfaceCtx; f32 temp_f0 = interfaceCtx->unk_1FE * 0.1f; s16 temp1, temp2, temp3; - if (0) ; + if (0) {} - if (interfaceCtx->unk_200 != 0) - { + if (interfaceCtx->unk_200 != 0) { interfaceCtx->unk_1FE--; - if (interfaceCtx->unk_1FE <= 0) - { + if (interfaceCtx->unk_1FE <= 0) { interfaceCtx->unk_1FE = 0; interfaceCtx->unk_200 = 0; } - } - else - { + } else { interfaceCtx->unk_1FE++; - if (interfaceCtx->unk_1FE >= 10) - { + if (interfaceCtx->unk_1FE >= 10) { interfaceCtx->unk_1FE = 10; interfaceCtx->unk_200 = 1; } @@ -153,21 +146,18 @@ void Health_UpdateData(GlobalContext* globalCtx) #pragma GLOBAL_ASM("asm/non_matchings/code/z_lifemeter/Health_UpdateData.s") #endif -s32 func_80078E18(GlobalContext* globalCtx) -{ +s32 func_80078E18(GlobalContext* globalCtx) { gSaveContext.health = globalCtx->interfaceCtx.unk_226; return 1; } -s32 func_80078E34(GlobalContext* globalCtx) -{ +s32 func_80078E34(GlobalContext* globalCtx) { InterfaceContext* interfaceCtx = &globalCtx->interfaceCtx; interfaceCtx->unk_228 = 0x140; interfaceCtx->unk_226 += 0x10; - if (interfaceCtx->unk_226 >= gSaveContext.health) - { + if (interfaceCtx->unk_226 >= gSaveContext.health) { interfaceCtx->unk_226 = gSaveContext.health; return 1; } @@ -175,21 +165,16 @@ s32 func_80078E34(GlobalContext* globalCtx) return 0; } -s32 func_80078E84(GlobalContext* globalCtx) -{ +s32 func_80078E84(GlobalContext* globalCtx) { InterfaceContext* interfaceCtx = &globalCtx->interfaceCtx; - if (interfaceCtx->unk_228 != 0) - { + if (interfaceCtx->unk_228 != 0) { interfaceCtx->unk_228--; - } - else - { + } else { interfaceCtx->unk_228 = 0x140; interfaceCtx->unk_226 -= 0x10; - if (interfaceCtx->unk_226 <= 0) - { + if (interfaceCtx->unk_226 <= 0) { interfaceCtx->unk_226 = 0; globalCtx->unk_11D58(globalCtx, -(gSaveContext.health + 1)); return 1; @@ -199,8 +184,7 @@ s32 func_80078E84(GlobalContext* globalCtx) return 0; } -void Interface_DrawHealth(GlobalContext* globalCtx) -{ +void Interface_DrawHealth(GlobalContext* globalCtx) { s32 pad[5]; u8* heartBgImg; u32 curColorSet; @@ -222,188 +206,131 @@ void Interface_DrawHealth(GlobalContext* globalCtx) s32 curCombineModeSet = 0; u8* curBgImgLoaded = NULL; s32 ddHeartCountMinusOne = gSaveContext.defense_hearts - 1; - Gfx* gfxArr[5]; + Gfx* dispRefs[5]; - func_800C6AC4(gfxArr, gfxCtx, "../z_lifemeter.c", 353); + Graph_OpenDisps(dispRefs, gfxCtx, "../z_lifemeter.c", 353); - if (!(gSaveContext.health % 0x10)) + if (!(gSaveContext.health % 0x10)) { fullHeartCount--; + } curColorSet = -1; offsetY = 0.0f; offsetX = 0.0f; - for (i = 0; i < totalHeartCount; i++) - { - if ((ddHeartCountMinusOne < 0) || (i > ddHeartCountMinusOne)) - { - if (i < fullHeartCount) - { - if (curColorSet != 0) - { + for (i = 0; i < totalHeartCount; i++) { + if ((ddHeartCountMinusOne < 0) || (i > ddHeartCountMinusOne)) { + if (i < fullHeartCount) { + if (curColorSet != 0) { curColorSet = 0; gDPPipeSync(gfxCtx->overlay.p++); - gDPSetPrimColor(gfxCtx->overlay.p++, 0, 0, - interfaceCtx->unk_20E[0], interfaceCtx->unk_20E[2], + gDPSetPrimColor(gfxCtx->overlay.p++, 0, 0, interfaceCtx->unk_20E[0], interfaceCtx->unk_20E[2], interfaceCtx->unk_20E[4], interfaceCtx->healthAlpha); - gDPSetEnvColor(gfxCtx->overlay.p++, - interfaceCtx->unk_21A[0], interfaceCtx->unk_21A[2], + gDPSetEnvColor(gfxCtx->overlay.p++, interfaceCtx->unk_21A[0], interfaceCtx->unk_21A[2], interfaceCtx->unk_21A[4], 0xFF); } - } - else if (i == fullHeartCount) - { - if (curColorSet != 1) - { + } else if (i == fullHeartCount) { + if (curColorSet != 1) { curColorSet = 1; gDPPipeSync(gfxCtx->overlay.p++); - gDPSetPrimColor(gfxCtx->overlay.p++, 0, 0, - interfaceCtx->unk_202[0], interfaceCtx->unk_202[1], + gDPSetPrimColor(gfxCtx->overlay.p++, 0, 0, interfaceCtx->unk_202[0], interfaceCtx->unk_202[1], interfaceCtx->unk_202[2], interfaceCtx->healthAlpha); - gDPSetEnvColor(gfxCtx->overlay.p++, - interfaceCtx->unk_208[0], interfaceCtx->unk_208[1], + gDPSetEnvColor(gfxCtx->overlay.p++, interfaceCtx->unk_208[0], interfaceCtx->unk_208[1], interfaceCtx->unk_208[2], 0xFF); } - } - else if (i > fullHeartCount) - { - if (curColorSet != 2) - { + } else if (i > fullHeartCount) { + if (curColorSet != 2) { curColorSet = 2; gDPPipeSync(gfxCtx->overlay.p++); - gDPSetPrimColor(gfxCtx->overlay.p++, 0, 0, - interfaceCtx->unk_20E[0], interfaceCtx->unk_20E[2], + gDPSetPrimColor(gfxCtx->overlay.p++, 0, 0, interfaceCtx->unk_20E[0], interfaceCtx->unk_20E[2], interfaceCtx->unk_20E[4], interfaceCtx->healthAlpha); - gDPSetEnvColor(gfxCtx->overlay.p++, - interfaceCtx->unk_21A[0], interfaceCtx->unk_21A[2], + gDPSetEnvColor(gfxCtx->overlay.p++, interfaceCtx->unk_21A[0], interfaceCtx->unk_21A[2], interfaceCtx->unk_21A[4], 0xFF); } - } - else - { - if (curColorSet != 3) - { + } else { + if (curColorSet != 3) { curColorSet = 3; gDPPipeSync(gfxCtx->overlay.p++); - gDPSetPrimColor(gfxCtx->overlay.p++, 0, 0, - interfaceCtx->unk_20E[1], interfaceCtx->unk_20E[3], + gDPSetPrimColor(gfxCtx->overlay.p++, 0, 0, interfaceCtx->unk_20E[1], interfaceCtx->unk_20E[3], interfaceCtx->unk_20E[5], interfaceCtx->healthAlpha); - gDPSetEnvColor(gfxCtx->overlay.p++, - interfaceCtx->unk_21A[1], interfaceCtx->unk_21A[3], + gDPSetEnvColor(gfxCtx->overlay.p++, interfaceCtx->unk_21A[1], interfaceCtx->unk_21A[3], interfaceCtx->unk_21A[5], 0xFF); } } - if (i < fullHeartCount) + if (i < fullHeartCount) { heartBgImg = D_02000400; - else if (i == fullHeartCount) + } else if (i == fullHeartCount) { heartBgImg = D_8011FFB0[curHeartFraction]; - else + } else { heartBgImg = D_02000000; - } - else - { - if (i < fullHeartCount) - { - if (curColorSet != 4) - { + } + } else { + if (i < fullHeartCount) { + if (curColorSet != 4) { curColorSet = 4; gDPPipeSync(gfxCtx->overlay.p++); - gDPSetPrimColor(gfxCtx->overlay.p++, 0, 0, - D_8015FDD0[0], D_8015FDD0[1], - D_8015FDD0[2], interfaceCtx->healthAlpha); - gDPSetEnvColor(gfxCtx->overlay.p++, - D_8015FDE0[0], D_8015FDE0[1], - D_8015FDE0[2], 0xFF); + gDPSetPrimColor(gfxCtx->overlay.p++, 0, 0, D_8015FDD0[0], D_8015FDD0[1], D_8015FDD0[2], + interfaceCtx->healthAlpha); + gDPSetEnvColor(gfxCtx->overlay.p++, D_8015FDE0[0], D_8015FDE0[1], D_8015FDE0[2], 0xFF); } - } - else if (i == fullHeartCount) - { - if (curColorSet != 5) - { + } else if (i == fullHeartCount) { + if (curColorSet != 5) { curColorSet = 5; gDPPipeSync(gfxCtx->overlay.p++); - gDPSetPrimColor(gfxCtx->overlay.p++, 0, 0, - D_8015FDC0[0], D_8015FDC0[1], - D_8015FDC0[2], interfaceCtx->healthAlpha); - gDPSetEnvColor(gfxCtx->overlay.p++, - D_8015FDC8[0], D_8015FDC8[1], - D_8015FDC8[2], 0xFF); + gDPSetPrimColor(gfxCtx->overlay.p++, 0, 0, D_8015FDC0[0], D_8015FDC0[1], D_8015FDC0[2], + interfaceCtx->healthAlpha); + gDPSetEnvColor(gfxCtx->overlay.p++, D_8015FDC8[0], D_8015FDC8[1], D_8015FDC8[2], 0xFF); } - } - else if (i > fullHeartCount) - { - if (curColorSet != 6) - { + } else if (i > fullHeartCount) { + if (curColorSet != 6) { curColorSet = 6; gDPPipeSync(gfxCtx->overlay.p++); - gDPSetPrimColor(gfxCtx->overlay.p++, 0, 0, - D_8015FDD0[0], D_8015FDD0[1], - D_8015FDD0[2], interfaceCtx->healthAlpha); - gDPSetEnvColor(gfxCtx->overlay.p++, - D_8015FDE0[0], D_8015FDE0[1], - D_8015FDE0[2], 0xFF); + gDPSetPrimColor(gfxCtx->overlay.p++, 0, 0, D_8015FDD0[0], D_8015FDD0[1], D_8015FDD0[2], + interfaceCtx->healthAlpha); + gDPSetEnvColor(gfxCtx->overlay.p++, D_8015FDE0[0], D_8015FDE0[1], D_8015FDE0[2], 0xFF); } - } - else - { - if (curColorSet != 7) - { + } else { + if (curColorSet != 7) { curColorSet = 7; gDPPipeSync(gfxCtx->overlay.p++); - gDPSetPrimColor(gfxCtx->overlay.p++, 0, 0, - D_8015FDD0[3], D_8015FDD0[4], - D_8015FDD0[5], interfaceCtx->healthAlpha); - gDPSetEnvColor(gfxCtx->overlay.p++, - D_8015FDE0[3], D_8015FDE0[4], - D_8015FDE0[5], 0xFF); + gDPSetPrimColor(gfxCtx->overlay.p++, 0, 0, D_8015FDD0[3], D_8015FDD0[4], D_8015FDD0[5], + interfaceCtx->healthAlpha); + gDPSetEnvColor(gfxCtx->overlay.p++, D_8015FDE0[3], D_8015FDE0[4], D_8015FDE0[5], 0xFF); } } - if (i < fullHeartCount) + if (i < fullHeartCount) { heartBgImg = D_02000900; - else if (i == fullHeartCount) + } else if (i == fullHeartCount) { heartBgImg = D_8011FFF0[curHeartFraction]; - else + } else { heartBgImg = D_02000500; + } } - if (curBgImgLoaded != heartBgImg) - { + if (curBgImgLoaded != heartBgImg) { curBgImgLoaded = heartBgImg; - gDPLoadTextureBlock(gfxCtx->overlay.p++, - 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, + gDPLoadTextureBlock(gfxCtx->overlay.p++, 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); } - if (i != fullHeartCount) - { - if ((ddHeartCountMinusOne < 0) || (i > ddHeartCountMinusOne)) - { - if (curCombineModeSet != 1) - { + if (i != fullHeartCount) { + if ((ddHeartCountMinusOne < 0) || (i > ddHeartCountMinusOne)) { + if (curCombineModeSet != 1) { curCombineModeSet = 1; func_80094520(gfxCtx); - gDPSetCombineLERP(gfxCtx->overlay.p++, - PRIMITIVE, ENVIRONMENT, TEXEL0, ENVIRONMENT, TEXEL0, 0, PRIMITIVE, 0, - PRIMITIVE, ENVIRONMENT, TEXEL0, ENVIRONMENT, TEXEL0, 0, PRIMITIVE, 0); + gDPSetCombineLERP(gfxCtx->overlay.p++, PRIMITIVE, ENVIRONMENT, TEXEL0, ENVIRONMENT, TEXEL0, 0, + PRIMITIVE, 0, PRIMITIVE, ENVIRONMENT, TEXEL0, ENVIRONMENT, TEXEL0, 0, PRIMITIVE, + 0); } - } - else - { - if (curCombineModeSet != 3) - { + } else { + if (curCombineModeSet != 3) { curCombineModeSet = 3; func_80094520(gfxCtx); - gDPSetCombineLERP(gfxCtx->overlay.p++, - ENVIRONMENT, PRIMITIVE, TEXEL0, PRIMITIVE, TEXEL0, 0, PRIMITIVE, 0, - ENVIRONMENT, PRIMITIVE, TEXEL0, PRIMITIVE, TEXEL0, 0, PRIMITIVE, 0); + gDPSetCombineLERP(gfxCtx->overlay.p++, ENVIRONMENT, PRIMITIVE, TEXEL0, PRIMITIVE, TEXEL0, 0, + PRIMITIVE, 0, ENVIRONMENT, PRIMITIVE, TEXEL0, PRIMITIVE, TEXEL0, 0, PRIMITIVE, 0); } } @@ -414,40 +341,28 @@ void Interface_DrawHealth(GlobalContext* globalCtx) temp4 *= 1024.0f; temp1 = 8.0f; temp1 *= 0.68f; - gSPTextureRectangle(gfxCtx->overlay.p++, - (s32)((temp2 - temp1) * 4), (s32)((temp3 - temp1) * 4), - (s32)((temp2 + temp1) * 4), (s32)((temp3 + temp1) * 4), - G_TX_RENDERTILE, - 0, 0, + gSPTextureRectangle(gfxCtx->overlay.p++, (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 - { - if ((ddHeartCountMinusOne < 0) || (i > ddHeartCountMinusOne)) - { - if (curCombineModeSet != 2) - { + } else { + if ((ddHeartCountMinusOne < 0) || (i > ddHeartCountMinusOne)) { + if (curCombineModeSet != 2) { curCombineModeSet = 2; func_80094A14(gfxCtx); - gDPSetCombineLERP(gfxCtx->overlay.p++, - PRIMITIVE, ENVIRONMENT, TEXEL0, ENVIRONMENT, TEXEL0, 0, PRIMITIVE, 0, - PRIMITIVE, ENVIRONMENT, TEXEL0, ENVIRONMENT, TEXEL0, 0, PRIMITIVE, 0); + gDPSetCombineLERP(gfxCtx->overlay.p++, PRIMITIVE, ENVIRONMENT, TEXEL0, ENVIRONMENT, TEXEL0, 0, + PRIMITIVE, 0, PRIMITIVE, ENVIRONMENT, TEXEL0, ENVIRONMENT, TEXEL0, 0, PRIMITIVE, + 0); } - } - else - { - if (curCombineModeSet != 4) - { + } else { + if (curCombineModeSet != 4) { curCombineModeSet = 4; func_80094A14(gfxCtx); - gDPSetCombineLERP(gfxCtx->overlay.p++, - ENVIRONMENT, PRIMITIVE, TEXEL0, PRIMITIVE, TEXEL0, 0, PRIMITIVE, 0, - ENVIRONMENT, PRIMITIVE, TEXEL0, PRIMITIVE, TEXEL0, 0, PRIMITIVE, 0); + gDPSetCombineLERP(gfxCtx->overlay.p++, ENVIRONMENT, PRIMITIVE, TEXEL0, PRIMITIVE, TEXEL0, 0, + PRIMITIVE, 0, ENVIRONMENT, PRIMITIVE, TEXEL0, PRIMITIVE, TEXEL0, 0, PRIMITIVE, 0); } } - if (1) - { + if (1) { 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); @@ -458,62 +373,55 @@ void Interface_DrawHealth(GlobalContext* globalCtx) } offsetX += 10.0f; - if (i == 9) - { + if (i == 9) { offsetY += 10.0f; offsetX = 0.0f; } } - func_800C6B54(gfxArr, gfxCtx, "../z_lifemeter.c", 606); + Graph_CloseDisps(dispRefs, gfxCtx, "../z_lifemeter.c", 606); } u32 Health_IsCritical(void); -void Health_HandleCriticalAlarm(GlobalContext* globalCtx) -{ +void Health_HandleCriticalAlarm(GlobalContext* globalCtx) { InterfaceContext* interfaceCtx = &globalCtx->interfaceCtx; - if (interfaceCtx->unk_22C != 0) - { + if (interfaceCtx->unk_22C != 0) { interfaceCtx->unk_22A--; - if (interfaceCtx->unk_22A <= 0) - { + if (interfaceCtx->unk_22A <= 0) { interfaceCtx->unk_22A = 0; interfaceCtx->unk_22C = 0; - if (!func_8008E988(globalCtx) && (globalCtx->pauseCtx.state == 0) && - (globalCtx->pauseCtx.flag == 0) && Health_IsCritical() && !func_800BFC84(globalCtx)) - { + if (!func_8008E988(globalCtx) && (globalCtx->pauseCtx.state == 0) && (globalCtx->pauseCtx.flag == 0) && + Health_IsCritical() && !func_800BFC84(globalCtx)) { func_80078884(NA_SE_SY_HITPOINT_ALARM); } } - } - else - { + } else { interfaceCtx->unk_22A++; - if (interfaceCtx->unk_22A >= 10) - { + if (interfaceCtx->unk_22A >= 10) { interfaceCtx->unk_22A = 10; interfaceCtx->unk_22C = 1; } } } -u32 Health_IsCritical(void) -{ +u32 Health_IsCritical(void) { s32 var; - if (gSaveContext.health_capacity <= 0x50) + if (gSaveContext.health_capacity <= 0x50) { var = 0x10; - else if (gSaveContext.health_capacity <= 0xA0) + } else if (gSaveContext.health_capacity <= 0xA0) { var = 0x18; - else if (gSaveContext.health_capacity <= 0xF0) + } else if (gSaveContext.health_capacity <= 0xF0) { var = 0x20; - else + } else { var = 0x2C; + } - if ((var >= gSaveContext.health) && (gSaveContext.health > 0)) + if ((var >= gSaveContext.health) && (gSaveContext.health > 0)) { return 1; - else + } else { return 0; + } } diff --git a/src/code/z_lights.c b/src/code/z_lights.c index af6dbad510..46e61fa250 100644 --- a/src/code/z_lights.c +++ b/src/code/z_lights.c @@ -3,8 +3,8 @@ extern LightsList sLightsList; -void Lights_InitPositionalLight(LightInfoPositional* info, s16 posX, s16 posY, s16 posZ, u8 red, u8 green, u8 blue, s16 radius, u32 type) -{ +void Lights_InitPositionalLight(LightInfoPositional* info, s16 posX, s16 posY, s16 posZ, u8 red, u8 green, u8 blue, + s16 radius, u32 type) { info->type = type; info->params.posX = posX; info->params.posY = posY; @@ -12,26 +12,24 @@ void Lights_InitPositionalLight(LightInfoPositional* info, s16 posX, s16 posY, s Lights_SetPositionalLightColorAndRadius(info, red, green, blue, radius); } -void Lights_InitType0PositionalLight(LightInfoPositional* info, s16 posX, s16 posY, s16 posZ, u8 red, u8 green, u8 blue, s16 radius) -{ +void Lights_InitType0PositionalLight(LightInfoPositional* info, s16 posX, s16 posY, s16 posZ, u8 red, u8 green, u8 blue, + s16 radius) { Lights_InitPositionalLight(info, posX, posY, posZ, red, green, blue, radius, 0); } -void Lights_InitType2PositionalLight(LightInfoPositional* info, s16 posX, s16 posY, s16 posZ, u8 red, u8 green, u8 blue, s16 radius) -{ +void Lights_InitType2PositionalLight(LightInfoPositional* info, s16 posX, s16 posY, s16 posZ, u8 red, u8 green, u8 blue, + s16 radius) { Lights_InitPositionalLight(info, posX, posY, posZ, red, green, blue, radius, 2); } -void Lights_SetPositionalLightColorAndRadius(LightInfoPositional* info, u8 red, u8 green, u8 blue, s16 radius) -{ +void Lights_SetPositionalLightColorAndRadius(LightInfoPositional* info, u8 red, u8 green, u8 blue, s16 radius) { info->params.red = red; info->params.green = green; info->params.blue = blue; info->params.radius = radius; } -void Lights_InitDirectional(LightInfoDirectional* info, s8 dirX, s8 dirY, s8 dirZ, u8 red, u8 green, u8 blue) -{ +void Lights_InitDirectional(LightInfoDirectional* info, s8 dirX, s8 dirY, s8 dirZ, u8 red, u8 green, u8 blue) { info->type = 1; info->params.dirX = dirX; info->params.dirY = dirY; @@ -41,8 +39,7 @@ void Lights_InitDirectional(LightInfoDirectional* info, s8 dirX, s8 dirY, s8 dir info->params.blue = blue; } -void Lights_MapperInit(LightMapper* mapper, u8 red, u8 green, u8 blue) -{ +void Lights_MapperInit(LightMapper* mapper, u8 red, u8 green, u8 blue) { mapper->ambient.l.col[0] = red; mapper->ambient.l.colc[0] = red; mapper->ambient.l.col[1] = green; @@ -54,22 +51,20 @@ void Lights_MapperInit(LightMapper* mapper, u8 red, u8 green, u8 blue) #pragma GLOBAL_ASM("asm/non_matchings/code/z_lights/func_80079EFC.s") -Light* Lights_MapperGetNextFreeSlot(LightMapper* mapper) -{ - if (6 < mapper->numLights) +Light* Lights_MapperGetNextFreeSlot(LightMapper* mapper) { + if (6 < mapper->numLights) { return NULL; + } return &mapper->lights[mapper->numLights++]; } #pragma GLOBAL_ASM("asm/non_matchings/code/z_lights/func_8007A084.s") -void func_8007A40C(LightMapper* mapper, LightInfoDirectionalParams* params, GlobalContext* globalCtx) -{ +void func_8007A40C(LightMapper* mapper, LightInfoDirectionalParams* params, GlobalContext* globalCtx) { Light* light = Lights_MapperGetNextFreeSlot(mapper); - if (light != NULL) - { + if (light != NULL) { light->l.col[0] = light->l.colc[0] = params->red; light->l.col[1] = light->l.colc[1] = params->green; light->l.col[2] = light->l.colc[2] = params->blue; @@ -81,25 +76,21 @@ void func_8007A40C(LightMapper* mapper, LightInfoDirectionalParams* params, Glob #pragma GLOBAL_ASM("asm/non_matchings/code/z_lights/func_8007A474.s") -z_Light* Lights_FindFreeSlot() -{ +z_Light* Lights_FindFreeSlot() { z_Light* ret; - if (0x1F < sLightsList.numOccupied) + if (0x1F < sLightsList.numOccupied) { return NULL; + } ret = &sLightsList.lights[sLightsList.nextFree]; - while (ret->info != NULL) - { + while (ret->info != NULL) { sLightsList.nextFree++; - if (sLightsList.nextFree < 0x20) - { + if (sLightsList.nextFree < 0x20) { ret++; - } - else - { + } else { sLightsList.nextFree = 0; ret = &sLightsList.lights[0]; } @@ -112,36 +103,32 @@ z_Light* Lights_FindFreeSlot() #ifdef NON_MATCHING // single ordering difference -void Lights_Free(z_Light* light) -{ - if (light != NULL) - { +void Lights_Free(z_Light* light) { + if (light != NULL) { sLightsList.numOccupied--; light->info = NULL; - sLightsList.nextFree = (light - sLightsList.lights) / sizeof(z_Light); //! @bug Due to pointer arithmetic, the division is unnecessary + sLightsList.nextFree = (light - sLightsList.lights) / + sizeof(z_Light); //! @bug Due to pointer arithmetic, the division is unnecessary } } #else #pragma GLOBAL_ASM("asm/non_matchings/code/z_lights/Lights_Free.s") #endif -void func_8007A614(GlobalContext* globalCtx, LightingContext* lightCtx) -{ +void func_8007A614(GlobalContext* globalCtx, LightingContext* lightCtx) { Lights_ClearHead(globalCtx, lightCtx); Lights_SetAmbientColor(lightCtx, 0x50, 0x50, 0x50); func_8007A698(lightCtx, 0, 0, 0, 0x3e4, 0x3200); bzero(&sLightsList, sizeof(sLightsList)); } -void Lights_SetAmbientColor(LightingContext* lightCtx, u8 red, u8 green, u8 blue) -{ +void Lights_SetAmbientColor(LightingContext* lightCtx, u8 red, u8 green, u8 blue) { lightCtx->ambientRed = red; lightCtx->ambientGreen = green; lightCtx->ambientBlue = blue; } -void func_8007A698(LightingContext* lightCtx, u8 arg1, u8 arg2, u8 arg3, s16 arg4, s16 arg5) -{ +void func_8007A698(LightingContext* lightCtx, u8 arg1, u8 arg2, u8 arg3, s16 arg4, s16 arg5) { lightCtx->unk_07 = arg1; lightCtx->unk_08 = arg2; lightCtx->unk_09 = arg3; @@ -149,38 +136,33 @@ void func_8007A698(LightingContext* lightCtx, u8 arg1, u8 arg2, u8 arg3, s16 arg lightCtx->unk_0C = arg5; } -LightMapper* Lights_CreateMapper(LightingContext* lightCtx, GraphicsContext* gfxCtx) -{ +LightMapper* Lights_CreateMapper(LightingContext* lightCtx, GraphicsContext* gfxCtx) { return func_8007A960(gfxCtx, lightCtx->ambientRed, lightCtx->ambientGreen, lightCtx->ambientBlue); } -void Lights_ClearHead(GlobalContext* globalCtx, LightingContext* lightCtx) -{ +void Lights_ClearHead(GlobalContext* globalCtx, LightingContext* lightCtx) { lightCtx->lightsHead = NULL; } -void Lights_RemoveAll(GlobalContext* globalCtx, LightingContext* lightCtx) -{ - while (lightCtx->lightsHead != NULL) - { +void Lights_RemoveAll(GlobalContext* globalCtx, LightingContext* lightCtx) { + while (lightCtx->lightsHead != NULL) { Lights_Remove(globalCtx, lightCtx, lightCtx->lightsHead); lightCtx->lightsHead = lightCtx->lightsHead->next; } } -z_Light* Lights_Insert(GlobalContext* globalCtx, LightingContext* lightCtx, LightInfo* info) -{ +z_Light* Lights_Insert(GlobalContext* globalCtx, LightingContext* lightCtx, LightInfo* info) { z_Light* light; light = Lights_FindFreeSlot(); - if (light != NULL) - { + if (light != NULL) { light->info = info; light->prev = NULL; light->next = lightCtx->lightsHead; - if (lightCtx->lightsHead != NULL) + if (lightCtx->lightsHead != NULL) { lightCtx->lightsHead->prev = light; + } lightCtx->lightsHead = light; } @@ -188,17 +170,17 @@ z_Light* Lights_Insert(GlobalContext* globalCtx, LightingContext* lightCtx, Ligh return light; } -void Lights_Remove(GlobalContext* globalCtx, LightingContext* lightCtx, z_Light* light) -{ - if (light != NULL) - { - if (light->prev != NULL) +void Lights_Remove(GlobalContext* globalCtx, LightingContext* lightCtx, z_Light* light) { + if (light != NULL) { + if (light->prev != NULL) { light->prev->next = light->next; - else + } else { lightCtx->lightsHead = light->next; + } - if (light->next != NULL) + if (light->next != NULL) { light->next->prev = light->prev; + } Lights_Free(light); } @@ -211,4 +193,3 @@ void Lights_Remove(GlobalContext* globalCtx, LightingContext* lightCtx, z_Light* #pragma GLOBAL_ASM("asm/non_matchings/code/z_lights/func_8007A9B4.s") #pragma GLOBAL_ASM("asm/non_matchings/code/z_lights/func_8007ABBC.s") - diff --git a/src/code/z_malloc.c b/src/code/z_malloc.c index 10a328c492..fd82cca8fa 100644 --- a/src/code/z_malloc.c +++ b/src/code/z_malloc.c @@ -1,131 +1,112 @@ #include -#define LOG_SEVERITY_NOLOG 0 -#define LOG_SEVERITY_ERROR 2 -#define LOG_SEVERITY_VERBOSE 3 +#define LOG_SEVERITY_NOLOG 0 +#define LOG_SEVERITY_ERROR 2 +#define LOG_SEVERITY_VERBOSE 3 s32 gZeldaArenaLogSeverity = LOG_SEVERITY_ERROR; Arena sZeldaArena; -void ZeldaArena_CheckPointer(void* ptr, u32 size, const char* name, const char* action) -{ - if (!ptr) - { - if (gZeldaArenaLogSeverity >= LOG_SEVERITY_ERROR) - { +void ZeldaArena_CheckPointer(void* ptr, u32 size, const char* name, const char* action) { + if (!ptr) { + if (gZeldaArenaLogSeverity >= LOG_SEVERITY_ERROR) { //"%s: %u bytes %s failed\n" osSyncPrintf("%s: %u バイトの%sに失敗しました\n", name, size, action); - __osDisplayArena(&sZeldaArena); + __osDisplayArena(&sZeldaArena); return; } - } - else if (gZeldaArenaLogSeverity >= LOG_SEVERITY_VERBOSE) - { + } else if (gZeldaArenaLogSeverity >= LOG_SEVERITY_VERBOSE) { //"%s: %u bytes %s succeeded\n" osSyncPrintf("%s: %u バイトの%sに成功しました\n", name, size, action); } } -void* ZeldaArena_Malloc(u32 size) -{ +void* ZeldaArena_Malloc(u32 size) { void* ptr; ptr = __osMalloc(&sZeldaArena, size); - ZeldaArena_CheckPointer(ptr, size, "zelda_malloc", "確保"); //Secure + ZeldaArena_CheckPointer(ptr, size, "zelda_malloc", "確保"); // Secure return ptr; } -void* ZeldaArena_MallocDebug(u32 size, const char* file, s32 line) -{ +void* ZeldaArena_MallocDebug(u32 size, const char* file, s32 line) { void* ptr; ptr = __osMallocDebug(&sZeldaArena, size, file, line); - ZeldaArena_CheckPointer(ptr, size, "zelda_malloc_DEBUG", "確保"); //Secure + ZeldaArena_CheckPointer(ptr, size, "zelda_malloc_DEBUG", "確保"); // Secure return ptr; } -void* ZeldaArena_MallocR(u32 size) -{ +void* ZeldaArena_MallocR(u32 size) { void* ptr; ptr = __osMallocR(&sZeldaArena, size); - ZeldaArena_CheckPointer(ptr, size, "zelda_malloc_r", "確保"); //Secure + ZeldaArena_CheckPointer(ptr, size, "zelda_malloc_r", "確保"); // Secure return ptr; } -void* ZeldaArena_MallocRDebug(u32 size, const char* file, s32 line) -{ +void* ZeldaArena_MallocRDebug(u32 size, const char* file, s32 line) { void* ptr; ptr = __osMallocRDebug(&sZeldaArena, size, file, line); - ZeldaArena_CheckPointer(ptr, size, "zelda_malloc_r_DEBUG", "確保"); //Secure + ZeldaArena_CheckPointer(ptr, size, "zelda_malloc_r_DEBUG", "確保"); // Secure return ptr; } -void* ZeldaArena_Realloc(void* ptr, u32 newSize) -{ +void* ZeldaArena_Realloc(void* ptr, u32 newSize) { ptr = __osRealloc(&sZeldaArena, ptr, newSize); ZeldaArena_CheckPointer(ptr, newSize, "zelda_realloc", "再確保"); // Re-securing return ptr; } -void* ZeldaArena_ReallocDebug(void* ptr, u32 newSize, const char* file, s32 line) -{ +void* ZeldaArena_ReallocDebug(void* ptr, u32 newSize, const char* file, s32 line) { ptr = __osReallocDebug(&sZeldaArena, ptr, newSize, file, line); ZeldaArena_CheckPointer(ptr, newSize, "zelda_realloc_DEBUG", "再確保"); // Re-securing return ptr; } -void ZeldaArena_Free(void* ptr) -{ +void ZeldaArena_Free(void* ptr) { __osFree(&sZeldaArena, ptr); } -void ZeldaArena_FreeDebug(void* ptr, const char* file, s32 line) -{ +void ZeldaArena_FreeDebug(void* ptr, const char* file, s32 line) { __osFreeDebug(&sZeldaArena, ptr, file, line); } -void* ZeldaArena_Calloc(u32 num, u32 size) -{ +void* ZeldaArena_Calloc(u32 num, u32 size) { void* ret; u32 n; - - n = num*size; + + n = num * size; ret = __osMalloc(&sZeldaArena, n); - if (ret) + if (ret) { bzero(ret, n); + } ZeldaArena_CheckPointer(ret, n, "zelda_calloc", "確保"); return ret; } -void ZeldaArena_Display() -{ - //Zelda heap display +void ZeldaArena_Display() { + // Zelda heap display osSyncPrintf("ゼルダヒープ表示\n"); __osDisplayArena(&sZeldaArena); } -void ZeldaArena_GetSizes(u32* outMaxFree, u32* outFree, u32* outAlloc) -{ +void ZeldaArena_GetSizes(u32* outMaxFree, u32* outFree, u32* outAlloc) { ArenaImpl_GetSizes(&sZeldaArena, outMaxFree, outFree, outAlloc); } -void ZeldaArena_Check() -{ +void ZeldaArena_Check() { __osCheckArena(&sZeldaArena); } -void ZeldaArena_Init(void* start, u32 size) -{ +void ZeldaArena_Init(void* start, u32 size) { gZeldaArenaLogSeverity = LOG_SEVERITY_NOLOG; __osMallocInit(&sZeldaArena, start, size); } -void ZeldaArena_Cleanup() -{ +void ZeldaArena_Cleanup() { gZeldaArenaLogSeverity = LOG_SEVERITY_NOLOG; __osMallocCleanup(&sZeldaArena); } -u8 ZeldaArena_IsInitalized() -{ +u8 ZeldaArena_IsInitalized() { return __osMallocIsInitalized(&sZeldaArena); } diff --git a/src/code/z_map_exp.c b/src/code/z_map_exp.c index 7498ffe7fe..b740bba3cb 100644 --- a/src/code/z_map_exp.c +++ b/src/code/z_map_exp.c @@ -22,4 +22,3 @@ #pragma GLOBAL_ASM("asm/non_matchings/code/z_map_exp/func_80082248.s") #pragma GLOBAL_ASM("asm/non_matchings/code/z_map_exp/func_8008226C.s") - diff --git a/src/code/z_map_mark.c b/src/code/z_map_mark.c index bd1187cf8b..698715ffee 100644 --- a/src/code/z_map_mark.c +++ b/src/code/z_map_mark.c @@ -2,8 +2,7 @@ #include #include -typedef struct -{ +typedef struct { /* 0x00 */ void* texture; /* 0x04 */ u32 imageFormat; /* 0x08 */ u32 imageSize; @@ -15,76 +14,69 @@ typedef struct /* 0x20 */ u32 dtdy; } MapMarkInfo; // size = 0x24 -typedef struct -{ +typedef struct { /* 0x00 */ void* loadedRamAddr; // original name: "allocp" - /* 0x04 */ u32 vromStart; - /* 0x08 */ u32 vromEnd; - /* 0x0C */ u32 vramStart; - /* 0x10 */ u32 vramEnd; - /* 0x14 */ u32 vramTable; + /* 0x04 */ u32 vromStart; + /* 0x08 */ u32 vromEnd; + /* 0x0C */ u32 vramStart; + /* 0x10 */ u32 vramEnd; + /* 0x14 */ u32 vramTable; } MapMarkDataOverlay; // size = 0x18 -static u32 sBaseImageSizes[] = { 0, 1, 2, 3 }; +static u32 sBaseImageSizes[] = { 0, 1, 2, 3 }; static u32 sLoadBlockImageSizes[] = { 2, 2, 2, 3 }; -static u32 sIncrImageSizes[] = { 3, 1, 0, 0 }; -static u32 sShiftImageSizes[] = { 2, 1, 0, 0 }; -static u32 sBytesImageSizes[] = { 0, 1, 2, 4 }; +static u32 sIncrImageSizes[] = { 3, 1, 0, 0 }; +static u32 sShiftImageSizes[] = { 2, 1, 0, 0 }; +static u32 sBytesImageSizes[] = { 0, 1, 2, 4 }; static u32 sLineBytesImageSizes[] = { 0, 1, 2, 2 }; -#define G_IM_SIZ_MARK sBaseImageSizes[markInfo->imageSize] -#define G_IM_SIZ_MARK_LOAD_BLOCK sLoadBlockImageSizes[markInfo->imageSize] -#define G_IM_SIZ_MARK_INCR sIncrImageSizes[markInfo->imageSize] -#define G_IM_SIZ_MARK_SHIFT sShiftImageSizes[markInfo->imageSize] -#define G_IM_SIZ_MARK_BYTES sBytesImageSizes[markInfo->imageSize] -#define G_IM_SIZ_MARK_LINE_BYTES sLineBytesImageSizes[markInfo->imageSize] +#define G_IM_SIZ_MARK sBaseImageSizes[markInfo->imageSize] +#define G_IM_SIZ_MARK_LOAD_BLOCK sLoadBlockImageSizes[markInfo->imageSize] +#define G_IM_SIZ_MARK_INCR sIncrImageSizes[markInfo->imageSize] +#define G_IM_SIZ_MARK_SHIFT sShiftImageSizes[markInfo->imageSize] +#define G_IM_SIZ_MARK_BYTES sBytesImageSizes[markInfo->imageSize] +#define G_IM_SIZ_MARK_LINE_BYTES sLineBytesImageSizes[markInfo->imageSize] -static MapMarkInfo sMapMarkInfoTable[] = -{ +static MapMarkInfo sMapMarkInfoTable[] = { { D_02002580, G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 8, 32, 32, 1024, 1024 }, // Chest Icon - { D_02002900, G_IM_FMT_IA, G_IM_SIZ_8b, 8, 8, 32, 32, 1024, 1024 }, // Boss Skull Icon + { D_02002900, G_IM_FMT_IA, G_IM_SIZ_8b, 8, 8, 32, 32, 1024, 1024 }, // Boss Skull Icon }; -static MapMarkDataOverlay sMapMarkDataOvl = -{ +static MapMarkDataOverlay sMapMarkDataOvl = { NULL, (u32)_ovl_map_mark_dataSegmentRomStart, (u32)_ovl_map_mark_dataSegmentRomEnd, (u32)_ovl_map_mark_dataSegmentStart, (u32)_ovl_map_mark_dataSegmentEnd, - (u32)gMapMarkDataTable + (u32)gMapMarkDataTable, }; static MapMarksData** sLoadedMarkDataTable; extern u8** D_8015FFD0; -void MapMark_Init(GlobalContext* globalCtx) -{ +void MapMark_Init(GlobalContext* globalCtx) { MapMarkDataOverlay* overlay = &sMapMarkDataOvl; u32 overlaySize = overlay->vramEnd - overlay->vramStart; overlay->loadedRamAddr = Game_Alloc(&globalCtx->state, overlaySize, "../z_map_mark.c", 235); LogUtils_CheckNullPointer("dlftbl->allocp", overlay->loadedRamAddr, "../z_map_mark.c", 236); - Overlay_Load(overlay->vromStart, overlay->vromEnd, - overlay->vramStart, overlay->vramEnd, - overlay->loadedRamAddr); + Overlay_Load(overlay->vromStart, overlay->vromEnd, overlay->vramStart, overlay->vramEnd, overlay->loadedRamAddr); sLoadedMarkDataTable = gMapMarkDataTable; - sLoadedMarkDataTable = (void*)(s32)((overlay->vramTable != 0) ? - (void*)(overlay->vramTable - (s32)(overlay->vramStart - (s32)overlay->loadedRamAddr)) : - NULL); + sLoadedMarkDataTable = + (void*)(s32)((overlay->vramTable != 0) + ? (void*)(overlay->vramTable - (s32)(overlay->vramStart - (s32)overlay->loadedRamAddr)) + : NULL); } -void MapMark_ClearPointers(GlobalContext* globalCtx) -{ +void MapMark_ClearPointers(GlobalContext* globalCtx) { sMapMarkDataOvl.loadedRamAddr = NULL; sLoadedMarkDataTable = NULL; } -void MapMark_Draw(GlobalContext* globalCtx) -{ +void MapMark_Draw(GlobalContext* globalCtx) { InterfaceContext* interfaceCtx; MapMarkData* mapMarkData; MapMarkPoint* markPoint; @@ -94,28 +86,27 @@ void MapMark_Draw(GlobalContext* globalCtx) s32 rectLeft; s32 rectTop; GraphicsContext* gfxCtx; - Gfx* gfxArr[4]; + Gfx* dispRefs[4]; dungeonId = gSaveContext.dungeon_index; interfaceCtx = &globalCtx->interfaceCtx; - if ((D_8015FFD0 != NULL) && (globalCtx->interfaceCtx.roomNum >= D_8015FFD0[7][dungeonId])) - { + if ((D_8015FFD0 != NULL) && (globalCtx->interfaceCtx.roomNum >= D_8015FFD0[7][dungeonId])) { // Translates to: "ROOM NUMBER EXCEEDED, YIKES %d/%d MapMarkDraw PROCESSING INTERRUPTED" - osSyncPrintf(VT_COL(RED, WHITE) "部屋番号がオーバーしてるで,ヤバイで %d/%d \nMapMarkDraw の処理を中断します\n", VT_RST, - globalCtx->interfaceCtx.roomNum, D_8015FFD0[7][dungeonId]); + osSyncPrintf(VT_COL(RED, WHITE) "部屋番号がオーバーしてるで,ヤバイで %d/%d \nMapMarkDraw の処理を中断します\n", + VT_RST, globalCtx->interfaceCtx.roomNum, D_8015FFD0[7][dungeonId]); return; } mapMarkData = &sLoadedMarkDataTable[dungeonId][interfaceCtx->roomNum][0]; gfxCtx = globalCtx->state.gfxCtx; - func_800C6AC4(gfxArr, globalCtx->state.gfxCtx, "../z_map_mark.c", 303); + Graph_OpenDisps(dispRefs, globalCtx->state.gfxCtx, "../z_map_mark.c", 303); - while (1) - { - if (mapMarkData->markType == -1) + while (1) { + if (mapMarkData->markType == -1) { break; + } gDPPipeSync(gfxCtx->overlay.p++); gDPSetTextureLUT(gfxCtx->overlay.p++, G_TT_NONE); @@ -123,44 +114,31 @@ void MapMark_Draw(GlobalContext* globalCtx) gDPSetEnvColor(gfxCtx->overlay.p++, 0x00, 0x00, 0x00, interfaceCtx->minimapAlpha); markPoint = &mapMarkData->points[0]; - for (i = 0; i < mapMarkData->count; i++) - { - if ((mapMarkData->markType != 0) || !Flags_GetTreasure(globalCtx, markPoint->chestFlag)) - { + for (i = 0; i < mapMarkData->count; i++) { + if ((mapMarkData->markType != 0) || !Flags_GetTreasure(globalCtx, markPoint->chestFlag)) { markInfo = &sMapMarkInfoTable[mapMarkData->markType]; gDPPipeSync(gfxCtx->overlay.p++); - gDPLoadTextureBlock(gfxCtx->overlay.p++, - 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); + gDPLoadTextureBlock(gfxCtx->overlay.p++, 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(gfxCtx->overlay.p++, - rectLeft, rectTop, - markInfo->rectWidth + rectLeft, rectTop + markInfo->rectHeight, - G_TX_RENDERTILE, - 0, 0, - markInfo->dsdx, markInfo->dtdy); + gSPTextureRectangle(gfxCtx->overlay.p++, rectLeft, rectTop, markInfo->rectWidth + rectLeft, + rectTop + markInfo->rectHeight, G_TX_RENDERTILE, 0, 0, markInfo->dsdx, + markInfo->dtdy); } markPoint++; } mapMarkData++; } - func_800C6B54(gfxArr, globalCtx->state.gfxCtx, "../z_map_mark.c", 339); + Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_map_mark.c", 339); } -void MapMark_DrawConditionally(GlobalContext* globalCtx) -{ - switch (globalCtx->sceneNum) - { +void MapMark_DrawConditionally(GlobalContext* globalCtx) { + switch (globalCtx->sceneNum) { case SCENE_YDAN: case SCENE_DDAN: case SCENE_BDAN: diff --git a/src/code/z_message_PAL.c b/src/code/z_message_PAL.c index cb490341f7..970f8bc243 100644 --- a/src/code/z_message_PAL.c +++ b/src/code/z_message_PAL.c @@ -82,4 +82,3 @@ #pragma GLOBAL_ASM("asm/non_matchings/code/z_message_PAL/func_80110460.s") #pragma GLOBAL_ASM("asm/non_matchings/code/z_message_PAL/func_801104C8.s") - diff --git a/src/code/z_moji.c b/src/code/z_moji.c index 754e8a1b64..d6966544fd 100644 --- a/src/code/z_moji.c +++ b/src/code/z_moji.c @@ -11,107 +11,96 @@ s32 D_80120124 = 0; UNK_TYPE D_8015FFC0; UNK_TYPE D_8015FFC4; -void func_8007B910(u32 red, u32 green, u32 blue, u32 alpha) -{ +void func_8007B910(u32 red, u32 green, u32 blue, u32 alpha) { sFontColorRed = red; sFontColorGreen = green; sFontColorBlue = blue; sFontColorAlpha = alpha; } -void func_8007B934(s32 arg0, s32 arg1) -{ - if (arg0 > 39) +void func_8007B934(s32 arg0, s32 arg1) { + if (arg0 > 39) { D_80120120 = 39 * 8; - else if (arg0 < 0) + } else if (arg0 < 0) { D_80120120 = 0; - else + } else { D_80120120 = arg0 * 8; + } - if (arg1 > 29) + if (arg1 > 29) { D_80120124 = 29 * 8; - else if (arg1 < 0) + } else if (arg1 < 0) { D_80120124 = 0; - else + } else { D_80120124 = arg1 * 8; + } } -void func_8007B9A4(GraphicsContext* gfxCtx, u8 arg1) -{ - Gfx* gfxArr[7]; +void func_8007B9A4(GraphicsContext* gfxCtx, u8 arg1) { + Gfx* dispRefs[7]; - func_800C6AC4(gfxArr, gfxCtx, "../z_moji.c", 86); + Graph_OpenDisps(dispRefs, gfxCtx, "../z_moji.c", 86); - if ((u32)gLetterTLUT & 0xF) + if ((u32)gLetterTLUT & 0xF) { osSyncPrintf("moji_tlut --> %X\n", gLetterTLUT); + } - if (D_8015FFC0 != (arg1 & 3)) - { + if (D_8015FFC0 != (arg1 & 3)) { gDPLoadTLUT(gfxCtx->polyOpa.p++, 16, 256, &gLetterTLUT[arg1 & 3]); D_8015FFC0 = arg1 & 3; } - gSPTextureRectangle(gfxCtx->polyOpa.p++, - 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); + gSPTextureRectangle(gfxCtx->polyOpa.p++, 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); - func_800C6B54(gfxArr, gfxCtx, "../z_moji.c", 123); + Graph_CloseDisps(dispRefs, gfxCtx, "../z_moji.c", 123); } -void func_8007BBA8(GraphicsContext* gfxCtx, u8* arg1) -{ +void func_8007BBA8(GraphicsContext* gfxCtx, u8* arg1) { s32 i; - Gfx* gfxArr[5]; + Gfx* dispRefs[5]; - func_800C6AC4(gfxArr, gfxCtx, "../z_moji.c", 137); + Graph_OpenDisps(dispRefs, gfxCtx, "../z_moji.c", 137); - if ((u32)gFontFF & 0xF) + if ((u32)gFontFF & 0xF) { osSyncPrintf("font_ff --> %X\n", gFontFF); + } gDPPipeSync(gfxCtx->polyOpa.p++); - gDPSetPrimColor(gfxCtx->polyOpa.p++, 0, 0, - sFontColorRed, sFontColorGreen, - sFontColorBlue, sFontColorAlpha); + gDPSetPrimColor(gfxCtx->polyOpa.p++, 0, 0, sFontColorRed, sFontColorGreen, sFontColorBlue, sFontColorAlpha); gDPSetTextureImage(gfxCtx->polyOpa.p++, G_IM_FMT_CI, G_IM_SIZ_16b, 1, (s32)gFontFF); - gDPSetTile(gfxCtx->polyOpa.p++, 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); + gDPSetTile(gfxCtx->polyOpa.p++, 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(gfxCtx->polyOpa.p++); gDPLoadBlock(gfxCtx->polyOpa.p++, G_TX_LOADTILE, 0, 0, 511, 2048); gDPPipeSync(gfxCtx->polyOpa.p++); - gDPSetTile(gfxCtx->polyOpa.p++, 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); + gDPSetTile(gfxCtx->polyOpa.p++, 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(gfxCtx->polyOpa.p++, G_TX_RENDERTILE, 0, 0, 60, 508); D_8015FFC0 = -1; - for (i = 0; arg1[i] != 0; i++) - { - switch (arg1[i]) - { + for (i = 0; arg1[i] != 0; i++) { + switch (arg1[i]) { case 9: D_80120120 = (((D_80120120 / 8) / 8) + 1) * 8 * 8; - if (D_80120120 >= 320) - { + if (D_80120120 >= 320) { D_80120120 = 0; D_80120124 += 8; - if (D_80120124 >= 240) + if (D_80120124 >= 240) { D_80120124 = 0; + } } break; case 10: case 13: D_80120120 = 0; D_80120124 += 8; - if (D_80120124 >= 240) + if (D_80120124 >= 240) { D_80120124 = 0; + } break; default: func_8007B9A4(gfxCtx, arg1[i]); @@ -119,5 +108,5 @@ void func_8007BBA8(GraphicsContext* gfxCtx, u8* arg1) } } - func_800C6B54(gfxArr, gfxCtx, "../z_moji.c", 181); + Graph_CloseDisps(dispRefs, gfxCtx, "../z_moji.c", 181); } diff --git a/src/code/z_msgevent.c b/src/code/z_msgevent.c new file mode 100644 index 0000000000..8995189f7f --- /dev/null +++ b/src/code/z_msgevent.c @@ -0,0 +1,22 @@ +#include +#include +#include + +void MsgEvent_SendNullTask() { + u32 pad[4]; + OSScTask task; + OSMesgQueue queue; + OSMesg msg; + u32 pad2[1]; + + task.next = NULL; + task.flags = OS_SC_RCP_MASK; + task.msgQ = &queue; + task.msg = NULL; + task.framebuffer = NULL; + task.list.t.type = M_NULTASK; + osCreateMesgQueue(task.msgQ, &msg, 1); + osSendMesg(&gSchedContext.cmdQ, &task, OS_MESG_BLOCK); + func_800C95F8(&gSchedContext); // osScKickEntryMsg + osRecvMesg(&queue, NULL, OS_MESG_BLOCK); +} diff --git a/src/code/z_onepointdemo.c b/src/code/z_onepointdemo.c index 639d878691..faf7ca6b7d 100644 --- a/src/code/z_onepointdemo.c +++ b/src/code/z_onepointdemo.c @@ -1,8 +1,7 @@ #include #include -typedef struct -{ +typedef struct { /* 0x00 */ u32 unk_00; /* 0x04 */ u32 unk_04; /* 0x08 */ s16 unk_08; @@ -13,29 +12,26 @@ typedef struct #pragma GLOBAL_ASM("asm/non_matchings/code/z_onepointdemo/func_8007C704.s") -void func_8007C76C(f32* pfParm1, s16 *puParm2) -{ - puParm2[0] = pfParm1[0]; - puParm2[1] = pfParm1[1]; - puParm2[2] = pfParm1[2]; +void func_8007C76C(f32* pfParm1, s16* puParm2) { + puParm2[0] = pfParm1[0]; + puParm2[1] = pfParm1[1]; + puParm2[2] = pfParm1[2]; } #pragma GLOBAL_ASM("asm/non_matchings/code/z_onepointdemo/func_8007C7A8.s") -void func_8007C7F8(u32 uParm1, u32 uParm2) -{ - u8 auStack4[4]; - u8 auStack8[4]; - - func_8003C940(uParm1, auStack4, auStack8, uParm2); +void func_8007C7F8(u32 uParm1, u32 uParm2) { + u8 auStack4[4]; + u8 auStack8[4]; + + func_8003C940(uParm1, auStack4, auStack8, uParm2); } -void func_8007C820(struct_8007C820* puParm1, s16 uParm2, s16 uParm3, u32 uParm4, u32 param_5) -{ - puParm1->unk_00 = uParm4; - puParm1->unk_04 = param_5; - puParm1->unk_08 = uParm2; - puParm1->unk_0A = uParm3; +void func_8007C820(struct_8007C820* puParm1, s16 uParm2, s16 uParm3, u32 uParm4, u32 param_5) { + puParm1->unk_00 = uParm4; + puParm1->unk_04 = param_5; + puParm1->unk_08 = uParm2; + puParm1->unk_0A = uParm3; } #pragma GLOBAL_ASM("asm/non_matchings/code/z_onepointdemo/func_8007C850.s") @@ -52,18 +48,15 @@ void func_8007C820(struct_8007C820* puParm1, s16 uParm2, s16 uParm3, u32 uParm4, #pragma GLOBAL_ASM("asm/non_matchings/code/z_onepointdemo/func_800806BC.s") -void func_8008070C() -{ +void func_8008070C() { D_80120130 = 0; } -void func_80080718() -{ +void func_80080718() { D_80120130 = 1; } #pragma GLOBAL_ASM("asm/non_matchings/code/z_onepointdemo/func_80080728.s") -void func_80080788(UNK_TYPE arg0, UNK_TYPE arg1) -{ +void func_80080788(UNK_TYPE arg0, UNK_TYPE arg1) { } diff --git a/src/code/z_parameter.c b/src/code/z_parameter.c index cb5fb307c5..d94f95a3a8 100644 --- a/src/code/z_parameter.c +++ b/src/code/z_parameter.c @@ -2,117 +2,115 @@ #include #include -typedef struct -{ +typedef struct { /* 0x00 */ u8 scene; /* 0x01 */ u8 flags1; /* 0x02 */ u8 flags2; /* 0x03 */ u8 flags3; } RestrictionFlags; -RestrictionFlags sRestrictionFlags[] = -{ - { SCENE_SPOT00, 0x00, 0x00, 0x10 }, - { SCENE_SPOT01, 0x00, 0x00, 0x10 }, - { SCENE_SPOT02, 0x00, 0x00, 0x10 }, - { SCENE_SPOT03, 0x00, 0x00, 0x10 }, - { SCENE_SPOT04, 0x00, 0x00, 0x10 }, - { SCENE_SPOT05, 0x00, 0x00, 0x10 }, - { SCENE_SPOT06, 0x00, 0x00, 0x10 }, - { SCENE_SPOT07, 0x00, 0x00, 0x10 }, - { SCENE_SPOT08, 0x00, 0x00, 0x10 }, - { SCENE_SPOT09, 0x00, 0x00, 0x10 }, - { SCENE_SPOT10, 0x00, 0x00, 0x10 }, - { SCENE_SPOT11, 0x00, 0x00, 0x10 }, - { SCENE_SPOT12, 0x00, 0x00, 0x10 }, - { SCENE_SPOT13, 0x00, 0x00, 0x10 }, - { SCENE_SPOT15, 0x00, 0x00, 0x10 }, - { SCENE_GANON_TOU, 0x00, 0x00, 0x10 }, - { SCENE_SPOT16, 0x00, 0x00, 0x10 }, - { SCENE_SPOT17, 0x00, 0x00, 0x10 }, - { SCENE_SPOT18, 0x00, 0x00, 0x10 }, - { SCENE_SPOT20, 0x00, 0x00, 0x10 }, - { SCENE_TOKINOMA, 0x00, 0x10, 0x15 }, - { SCENE_KENJYANOMA, 0xA2, 0xAA, 0xAA }, - { SCENE_SYATEKIJYOU, 0x11, 0x55, 0x55 }, - { SCENE_HAIRAL_NIWA, 0x11, 0x55, 0x55 }, - { SCENE_HAIRAL_NIWA_N, 0x11, 0x55, 0x55 }, - { SCENE_HAKAANA, 0x00, 0x00, 0xD0 }, - { SCENE_HAKAANA2, 0x00, 0x00, 0xD0 }, - { SCENE_HAKAANA_OUKE, 0x00, 0x00, 0xD0 }, - { SCENE_DAIYOUSEI_IZUMI, 0x00, 0x00, 0x10 }, - { SCENE_YOUSEI_IZUMI_TATE, 0x00, 0x00, 0xD0 }, - { SCENE_YOUSEI_IZUMI_YOKO, 0x00, 0x00, 0x10 }, - { SCENE_GANON_FINAL, 0x00, 0x05, 0x50 }, - { SCENE_NAKANIWA, 0x00, 0x05, 0x54 }, - { SCENE_TURIBORI, 0x11, 0x55, 0x55 }, - { SCENE_BOWLING, 0x11, 0x55, 0x55 }, - { SCENE_SOUKO, 0x00, 0x10, 0x15 }, - { SCENE_MIHARIGOYA, 0x00, 0x10, 0x14 }, - { SCENE_MAHOUYA, 0x10, 0x15, 0x55 }, - { SCENE_TAKARAYA, 0x10, 0x15, 0x55 }, - { SCENE_KINSUTA, 0x00, 0x10, 0x15 }, - { SCENE_ENTRA, 0x00, 0x10, 0x15 }, - { SCENE_ENTRA_N, 0x00, 0x10, 0x15 }, - { SCENE_ENRUI, 0x00, 0x10, 0xD5 }, - { SCENE_MARKET_DAY, 0x00, 0x10, 0x15 }, - { SCENE_MARKET_NIGHT, 0x00, 0x10, 0x15 }, - { SCENE_MARKET_RUINS, 0x00, 0x10, 0xD5 }, - { SCENE_MARKET_ALLEY, 0x00, 0x10, 0x15 }, - { SCENE_MARKET_ALLEY_N, 0x00, 0x10, 0x15 }, - { SCENE_SHRINE, 0x00, 0x10, 0x15 }, - { SCENE_SHRINE_N, 0x00, 0x10, 0x15 }, - { SCENE_SHRINE_R, 0x00, 0x10, 0xD5 }, - { SCENE_LINK_HOME, 0x10, 0x10, 0x15 }, - { SCENE_KAKARIKO, 0x10, 0x10, 0x15 }, - { SCENE_KAKARIKO3, 0x10, 0x10, 0x15 }, - { SCENE_KOKIRI_HOME, 0x10, 0x10, 0x15 }, - { SCENE_KOKIRI_HOME3, 0x10, 0x10, 0x15 }, - { SCENE_KOKIRI_HOME4, 0x10, 0x10, 0x15 }, - { SCENE_KOKIRI_HOME5, 0x10, 0x10, 0x15 }, - { SCENE_MALON_STABLE, 0x10, 0x10, 0x15 }, - { SCENE_HUT, 0x10, 0x10, 0x15 }, - { SCENE_IMPA, 0x10, 0x10, 0x15 }, - { SCENE_LABO, 0x10, 0x10, 0x15 }, - { SCENE_HYLIA_LABO, 0x00, 0x10, 0x15 }, - { SCENE_TENT, 0x10, 0x10, 0x15 }, - { SCENE_SHOP1, 0x10, 0x10, 0x15 }, - { SCENE_KOKIRI_SHOP, 0x10, 0x10, 0x15 }, - { SCENE_GOLON, 0x10, 0x10, 0x15 }, - { SCENE_ZOORA, 0x10, 0x10, 0x15 }, - { SCENE_DRAG, 0x10, 0x10, 0x15 }, - { SCENE_ALLEY_SHOP, 0x10, 0x10, 0x15 }, - { SCENE_NIGHT_SHOP, 0x10, 0x10, 0x15 }, - { SCENE_FACE_SHOP, 0x10, 0x10, 0x15 }, - { SCENE_MEN, 0x00, 0x03, 0x10 }, - { SCENE_YDAN, 0x00, 0x00, 0x00 }, - { SCENE_YDAN_BOSS, 0x00, 0x45, 0x50 }, - { SCENE_DDAN, 0x00, 0x00, 0x00 }, - { SCENE_DDAN_BOSS, 0x00, 0x45, 0x50 }, - { SCENE_BDAN, 0x00, 0x00, 0x00 }, - { SCENE_BDAN_BOSS, 0x00, 0x45, 0x50 }, - { SCENE_BMORI1, 0x00, 0x00, 0x00 }, - { SCENE_MORIBOSSROOM, 0x00, 0x45, 0x50 }, - { SCENE_HAKADANCH, 0x00, 0x00, 0x00 }, - { SCENE_HAKADAN, 0x00, 0x00, 0x00 }, - { SCENE_HAKADAN_BS, 0x00, 0x45, 0x50 }, - { SCENE_HIDAN, 0x00, 0x00, 0x00 }, - { SCENE_FIRE_BS, 0x00, 0x45, 0x50 }, - { SCENE_MIZUSIN, 0x00, 0x00, 0x00 }, - { SCENE_MIZUSIN_BS, 0x00, 0x45, 0x50 }, - { SCENE_JYASINZOU, 0x00, 0x00, 0x00 }, - { SCENE_JYASINBOSS, 0x00, 0x45, 0x50 }, - { SCENE_GANON, 0x00, 0x00, 0x00 }, - { SCENE_GANON_BOSS, 0x00, 0x45, 0x50 }, - { SCENE_ICE_DOUKUTO, 0x00, 0x00, 0xC0 }, - { SCENE_HAKASITARELAY, 0x00, 0x03, 0x14 }, - { SCENE_GANONTIKA, 0x00, 0x03, 0x10 }, - { SCENE_GANON_DEMO, 0x00, 0x45, 0x50 }, - { SCENE_GANON_SONOGO, 0x00, 0x05, 0x50 }, - { SCENE_GANONTIKA_SONOGO, 0x00, 0x05, 0x50 }, - { SCENE_GERUDOWAY, 0x00, 0x00, 0x10 }, - { SCENE_KAKUSIANA, 0x00, 0x00, 0xD0 }, - { 0xFF, 0x00, 0x00, 0x00 }, +RestrictionFlags sRestrictionFlags[] = { + { SCENE_SPOT00, 0x00, 0x00, 0x10 }, + { SCENE_SPOT01, 0x00, 0x00, 0x10 }, + { SCENE_SPOT02, 0x00, 0x00, 0x10 }, + { SCENE_SPOT03, 0x00, 0x00, 0x10 }, + { SCENE_SPOT04, 0x00, 0x00, 0x10 }, + { SCENE_SPOT05, 0x00, 0x00, 0x10 }, + { SCENE_SPOT06, 0x00, 0x00, 0x10 }, + { SCENE_SPOT07, 0x00, 0x00, 0x10 }, + { SCENE_SPOT08, 0x00, 0x00, 0x10 }, + { SCENE_SPOT09, 0x00, 0x00, 0x10 }, + { SCENE_SPOT10, 0x00, 0x00, 0x10 }, + { SCENE_SPOT11, 0x00, 0x00, 0x10 }, + { SCENE_SPOT12, 0x00, 0x00, 0x10 }, + { SCENE_SPOT13, 0x00, 0x00, 0x10 }, + { SCENE_SPOT15, 0x00, 0x00, 0x10 }, + { SCENE_GANON_TOU, 0x00, 0x00, 0x10 }, + { SCENE_SPOT16, 0x00, 0x00, 0x10 }, + { SCENE_SPOT17, 0x00, 0x00, 0x10 }, + { SCENE_SPOT18, 0x00, 0x00, 0x10 }, + { SCENE_SPOT20, 0x00, 0x00, 0x10 }, + { SCENE_TOKINOMA, 0x00, 0x10, 0x15 }, + { SCENE_KENJYANOMA, 0xA2, 0xAA, 0xAA }, + { SCENE_SYATEKIJYOU, 0x11, 0x55, 0x55 }, + { SCENE_HAIRAL_NIWA, 0x11, 0x55, 0x55 }, + { SCENE_HAIRAL_NIWA_N, 0x11, 0x55, 0x55 }, + { SCENE_HAKAANA, 0x00, 0x00, 0xD0 }, + { SCENE_HAKAANA2, 0x00, 0x00, 0xD0 }, + { SCENE_HAKAANA_OUKE, 0x00, 0x00, 0xD0 }, + { SCENE_DAIYOUSEI_IZUMI, 0x00, 0x00, 0x10 }, + { SCENE_YOUSEI_IZUMI_TATE, 0x00, 0x00, 0xD0 }, + { SCENE_YOUSEI_IZUMI_YOKO, 0x00, 0x00, 0x10 }, + { SCENE_GANON_FINAL, 0x00, 0x05, 0x50 }, + { SCENE_NAKANIWA, 0x00, 0x05, 0x54 }, + { SCENE_TURIBORI, 0x11, 0x55, 0x55 }, + { SCENE_BOWLING, 0x11, 0x55, 0x55 }, + { SCENE_SOUKO, 0x00, 0x10, 0x15 }, + { SCENE_MIHARIGOYA, 0x00, 0x10, 0x14 }, + { SCENE_MAHOUYA, 0x10, 0x15, 0x55 }, + { SCENE_TAKARAYA, 0x10, 0x15, 0x55 }, + { SCENE_KINSUTA, 0x00, 0x10, 0x15 }, + { SCENE_ENTRA, 0x00, 0x10, 0x15 }, + { SCENE_ENTRA_N, 0x00, 0x10, 0x15 }, + { SCENE_ENRUI, 0x00, 0x10, 0xD5 }, + { SCENE_MARKET_DAY, 0x00, 0x10, 0x15 }, + { SCENE_MARKET_NIGHT, 0x00, 0x10, 0x15 }, + { SCENE_MARKET_RUINS, 0x00, 0x10, 0xD5 }, + { SCENE_MARKET_ALLEY, 0x00, 0x10, 0x15 }, + { SCENE_MARKET_ALLEY_N, 0x00, 0x10, 0x15 }, + { SCENE_SHRINE, 0x00, 0x10, 0x15 }, + { SCENE_SHRINE_N, 0x00, 0x10, 0x15 }, + { SCENE_SHRINE_R, 0x00, 0x10, 0xD5 }, + { SCENE_LINK_HOME, 0x10, 0x10, 0x15 }, + { SCENE_KAKARIKO, 0x10, 0x10, 0x15 }, + { SCENE_KAKARIKO3, 0x10, 0x10, 0x15 }, + { SCENE_KOKIRI_HOME, 0x10, 0x10, 0x15 }, + { SCENE_KOKIRI_HOME3, 0x10, 0x10, 0x15 }, + { SCENE_KOKIRI_HOME4, 0x10, 0x10, 0x15 }, + { SCENE_KOKIRI_HOME5, 0x10, 0x10, 0x15 }, + { SCENE_MALON_STABLE, 0x10, 0x10, 0x15 }, + { SCENE_HUT, 0x10, 0x10, 0x15 }, + { SCENE_IMPA, 0x10, 0x10, 0x15 }, + { SCENE_LABO, 0x10, 0x10, 0x15 }, + { SCENE_HYLIA_LABO, 0x00, 0x10, 0x15 }, + { SCENE_TENT, 0x10, 0x10, 0x15 }, + { SCENE_SHOP1, 0x10, 0x10, 0x15 }, + { SCENE_KOKIRI_SHOP, 0x10, 0x10, 0x15 }, + { SCENE_GOLON, 0x10, 0x10, 0x15 }, + { SCENE_ZOORA, 0x10, 0x10, 0x15 }, + { SCENE_DRAG, 0x10, 0x10, 0x15 }, + { SCENE_ALLEY_SHOP, 0x10, 0x10, 0x15 }, + { SCENE_NIGHT_SHOP, 0x10, 0x10, 0x15 }, + { SCENE_FACE_SHOP, 0x10, 0x10, 0x15 }, + { SCENE_MEN, 0x00, 0x03, 0x10 }, + { SCENE_YDAN, 0x00, 0x00, 0x00 }, + { SCENE_YDAN_BOSS, 0x00, 0x45, 0x50 }, + { SCENE_DDAN, 0x00, 0x00, 0x00 }, + { SCENE_DDAN_BOSS, 0x00, 0x45, 0x50 }, + { SCENE_BDAN, 0x00, 0x00, 0x00 }, + { SCENE_BDAN_BOSS, 0x00, 0x45, 0x50 }, + { SCENE_BMORI1, 0x00, 0x00, 0x00 }, + { SCENE_MORIBOSSROOM, 0x00, 0x45, 0x50 }, + { SCENE_HAKADANCH, 0x00, 0x00, 0x00 }, + { SCENE_HAKADAN, 0x00, 0x00, 0x00 }, + { SCENE_HAKADAN_BS, 0x00, 0x45, 0x50 }, + { SCENE_HIDAN, 0x00, 0x00, 0x00 }, + { SCENE_FIRE_BS, 0x00, 0x45, 0x50 }, + { SCENE_MIZUSIN, 0x00, 0x00, 0x00 }, + { SCENE_MIZUSIN_BS, 0x00, 0x45, 0x50 }, + { SCENE_JYASINZOU, 0x00, 0x00, 0x00 }, + { SCENE_JYASINBOSS, 0x00, 0x45, 0x50 }, + { SCENE_GANON, 0x00, 0x00, 0x00 }, + { SCENE_GANON_BOSS, 0x00, 0x45, 0x50 }, + { SCENE_ICE_DOUKUTO, 0x00, 0x00, 0xC0 }, + { SCENE_HAKASITARELAY, 0x00, 0x03, 0x14 }, + { SCENE_GANONTIKA, 0x00, 0x03, 0x10 }, + { SCENE_GANON_DEMO, 0x00, 0x45, 0x50 }, + { SCENE_GANON_SONOGO, 0x00, 0x05, 0x50 }, + { SCENE_GANONTIKA_SONOGO, 0x00, 0x05, 0x50 }, + { SCENE_GERUDOWAY, 0x00, 0x00, 0x10 }, + { SCENE_KAKUSIANA, 0x00, 0x00, 0xD0 }, + { 0xFF, 0x00, 0x00, 0x00 }, }; s16 sHBAScoreTier = 0; @@ -128,249 +126,264 @@ s16 sMagicBorderR = 0xFF; s16 sMagicBorderG = 0xFF; s16 sMagicBorderB = 0xFF; -s16 sExtraItemBases[] = -{ - ITEM_STICK, ITEM_STICK, ITEM_NUT, ITEM_NUT, ITEM_BOMB, ITEM_BOMB, - ITEM_BOMB, ITEM_BOMB, ITEM_BOW, ITEM_BOW, ITEM_BOW, ITEM_SEEDS, - ITEM_BOMBCHU, ITEM_BOMBCHU, ITEM_STICK, ITEM_STICK, ITEM_NUT, ITEM_NUT, +s16 sExtraItemBases[] = { + ITEM_STICK, ITEM_STICK, ITEM_NUT, ITEM_NUT, ITEM_BOMB, ITEM_BOMB, ITEM_BOMB, ITEM_BOMB, ITEM_BOW, + ITEM_BOW, ITEM_BOW, ITEM_SEEDS, ITEM_BOMBCHU, ITEM_BOMBCHU, ITEM_STICK, ITEM_STICK, ITEM_NUT, ITEM_NUT, }; s16 D_80125A58 = 0; s16 D_80125A5C = 0; -Gfx sSetupDL_80125A60[] = -{ +Gfx sSetupDL_80125A60[] = { gsDPPipeSync(), - gsSPClearGeometryMode(G_ZBUFFER | G_SHADE | G_CULL_BOTH | G_FOG | G_LIGHTING | - G_TEXTURE_GEN | G_TEXTURE_GEN_LINEAR | G_SHADING_SMOOTH | G_LOD), - gsDPSetOtherMode(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_1PRIMITIVE, + gsSPClearGeometryMode(G_ZBUFFER | G_SHADE | G_CULL_BOTH | G_FOG | G_LIGHTING | G_TEXTURE_GEN | + G_TEXTURE_GEN_LINEAR | G_SHADING_SMOOTH | G_LOD), + gsDPSetOtherMode(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_1PRIMITIVE, G_AC_NONE | G_ZS_PIXEL | G_RM_CLD_SURF | G_RM_CLD_SURF2), - gsDPSetCombineLERP(0, 0, 0, PRIMITIVE, 0, 0, 0, PRIMITIVE, 0, 0, 0, PRIMITIVE, 0, 0, 0, PRIMITIVE), + gsDPSetCombineMode(G_CC_PRIMITIVE, G_CC_PRIMITIVE), gsSPEndDisplayList(), }; // original name: "alpha_change" -void Interface_ChangeAlpha(u16 alphaType) -{ - if (alphaType != gSaveContext.unk_13EA) - { +void Interface_ChangeAlpha(u16 alphaType) { + if (alphaType != gSaveContext.unk_13EA) { osSyncPrintf("ＡＬＰＨＡーＴＹＰＥ＝%d LAST_TIME_TYPE=%d\n", alphaType, gSaveContext.unk_13EE); gSaveContext.unk_13EA = gSaveContext.unk_13E8 = alphaType; gSaveContext.unk_13EC = 1; } } -void func_80082644(GlobalContext* globalCtx, s16 alpha) -{ +void func_80082644(GlobalContext* globalCtx, s16 alpha) { InterfaceContext* interfaceCtx = &globalCtx->interfaceCtx; - if (gSaveContext.button_status[0] == BTN_DISABLED) - { - if (interfaceCtx->bAlpha != 0x46) + if (gSaveContext.button_status[0] == BTN_DISABLED) { + if (interfaceCtx->bAlpha != 0x46) { interfaceCtx->bAlpha = 0x46; - } - else - { - if (interfaceCtx->bAlpha != 0xFF) + } + } else { + if (interfaceCtx->bAlpha != 0xFF) { interfaceCtx->bAlpha = alpha; + } } - if (gSaveContext.button_status[1] == BTN_DISABLED) - { - if (interfaceCtx->cLeftAlpha != 0x46) + if (gSaveContext.button_status[1] == BTN_DISABLED) { + if (interfaceCtx->cLeftAlpha != 0x46) { interfaceCtx->cLeftAlpha = 0x46; - } - else - { - if (interfaceCtx->cLeftAlpha != 0xFF) + } + } else { + if (interfaceCtx->cLeftAlpha != 0xFF) { interfaceCtx->cLeftAlpha = alpha; + } } - if (gSaveContext.button_status[2] == BTN_DISABLED) - { - if (interfaceCtx->cDownAlpha != 0x46) + if (gSaveContext.button_status[2] == BTN_DISABLED) { + if (interfaceCtx->cDownAlpha != 0x46) { interfaceCtx->cDownAlpha = 0x46; - } - else - { - if (interfaceCtx->cDownAlpha != 0xFF) + } + } else { + if (interfaceCtx->cDownAlpha != 0xFF) { interfaceCtx->cDownAlpha = alpha; + } } - if (gSaveContext.button_status[3] == BTN_DISABLED) - { - if (interfaceCtx->cRightAlpha != 0x46) + if (gSaveContext.button_status[3] == BTN_DISABLED) { + if (interfaceCtx->cRightAlpha != 0x46) { interfaceCtx->cRightAlpha = 0x46; - } - else - { - if (interfaceCtx->cRightAlpha != 0xFF) + } + } else { + if (interfaceCtx->cRightAlpha != 0xFF) { interfaceCtx->cRightAlpha = alpha; + } } - if (gSaveContext.button_status[4] == BTN_DISABLED) - { - if (interfaceCtx->aAlpha != 0x46) + if (gSaveContext.button_status[4] == BTN_DISABLED) { + if (interfaceCtx->aAlpha != 0x46) { interfaceCtx->aAlpha = 0x46; - } - else - { - if (interfaceCtx->aAlpha != 0xFF) + } + } else { + if (interfaceCtx->aAlpha != 0xFF) { interfaceCtx->aAlpha = alpha; + } } } -void func_8008277C(GlobalContext* globalCtx, s16 maxAlpha, s16 alpha) -{ +void func_8008277C(GlobalContext* globalCtx, s16 maxAlpha, s16 alpha) { InterfaceContext* interfaceCtx = &globalCtx->interfaceCtx; - if (gSaveContext.unk_13E7 != 0) - { + if (gSaveContext.unk_13E7 != 0) { func_80082644(globalCtx, alpha); return; } - if ((interfaceCtx->bAlpha != 0) && (interfaceCtx->bAlpha > maxAlpha)) + if ((interfaceCtx->bAlpha != 0) && (interfaceCtx->bAlpha > maxAlpha)) { interfaceCtx->bAlpha = maxAlpha; + } - if ((interfaceCtx->aAlpha != 0) && (interfaceCtx->aAlpha > maxAlpha)) + if ((interfaceCtx->aAlpha != 0) && (interfaceCtx->aAlpha > maxAlpha)) { interfaceCtx->aAlpha = maxAlpha; + } - if ((interfaceCtx->cLeftAlpha != 0) && (interfaceCtx->cLeftAlpha > maxAlpha)) + if ((interfaceCtx->cLeftAlpha != 0) && (interfaceCtx->cLeftAlpha > maxAlpha)) { interfaceCtx->cLeftAlpha = maxAlpha; + } - if ((interfaceCtx->cDownAlpha != 0) && (interfaceCtx->cDownAlpha > maxAlpha)) + if ((interfaceCtx->cDownAlpha != 0) && (interfaceCtx->cDownAlpha > maxAlpha)) { interfaceCtx->cDownAlpha = maxAlpha; + } - if ((interfaceCtx->cRightAlpha != 0) && (interfaceCtx->cRightAlpha > maxAlpha)) + if ((interfaceCtx->cRightAlpha != 0) && (interfaceCtx->cRightAlpha > maxAlpha)) { interfaceCtx->cRightAlpha = maxAlpha; + } } -void func_80082850(GlobalContext* globalCtx, s16 maxAlpha) -{ +void func_80082850(GlobalContext* globalCtx, s16 maxAlpha) { InterfaceContext* interfaceCtx = &globalCtx->interfaceCtx; s16 alpha; alpha = 0xFF - maxAlpha; - switch (gSaveContext.unk_13E8) - { + switch (gSaveContext.unk_13E8) { case 1: case 2: case 8: osSyncPrintf("a_alpha=%d, c_alpha=%d → ", interfaceCtx->aAlpha, interfaceCtx->cLeftAlpha); - if (gSaveContext.unk_13E8 == 8) - { - if (interfaceCtx->bAlpha != 0xFF) + if (gSaveContext.unk_13E8 == 8) { + if (interfaceCtx->bAlpha != 0xFF) { interfaceCtx->bAlpha = alpha; - } - else - { - if ((interfaceCtx->bAlpha != 0) && (interfaceCtx->bAlpha > maxAlpha)) + } + } else { + if ((interfaceCtx->bAlpha != 0) && (interfaceCtx->bAlpha > maxAlpha)) { interfaceCtx->bAlpha = maxAlpha; + } } - if ((interfaceCtx->aAlpha != 0) && (interfaceCtx->aAlpha > maxAlpha)) + if ((interfaceCtx->aAlpha != 0) && (interfaceCtx->aAlpha > maxAlpha)) { interfaceCtx->aAlpha = maxAlpha; + } - if ((interfaceCtx->cLeftAlpha != 0) && (interfaceCtx->cLeftAlpha > maxAlpha)) + if ((interfaceCtx->cLeftAlpha != 0) && (interfaceCtx->cLeftAlpha > maxAlpha)) { interfaceCtx->cLeftAlpha = maxAlpha; + } - if ((interfaceCtx->cDownAlpha != 0) && (interfaceCtx->cDownAlpha > maxAlpha)) + if ((interfaceCtx->cDownAlpha != 0) && (interfaceCtx->cDownAlpha > maxAlpha)) { interfaceCtx->cDownAlpha = maxAlpha; + } - if ((interfaceCtx->cRightAlpha != 0) && (interfaceCtx->cRightAlpha > maxAlpha)) + if ((interfaceCtx->cRightAlpha != 0) && (interfaceCtx->cRightAlpha > maxAlpha)) { interfaceCtx->cRightAlpha = maxAlpha; + } - if ((interfaceCtx->healthAlpha != 0) && (interfaceCtx->healthAlpha > maxAlpha)) + if ((interfaceCtx->healthAlpha != 0) && (interfaceCtx->healthAlpha > maxAlpha)) { interfaceCtx->healthAlpha = maxAlpha; + } - if ((interfaceCtx->magicAlpha != 0) && (interfaceCtx->magicAlpha > maxAlpha)) + if ((interfaceCtx->magicAlpha != 0) && (interfaceCtx->magicAlpha > maxAlpha)) { interfaceCtx->magicAlpha = maxAlpha; + } - if ((interfaceCtx->minimapAlpha != 0) && (interfaceCtx->minimapAlpha > maxAlpha)) + if ((interfaceCtx->minimapAlpha != 0) && (interfaceCtx->minimapAlpha > maxAlpha)) { interfaceCtx->minimapAlpha = maxAlpha; + } osSyncPrintf("a_alpha=%d, c_alpha=%d\n", interfaceCtx->aAlpha, interfaceCtx->cLeftAlpha); break; case 3: - if ((interfaceCtx->aAlpha != 0) && (interfaceCtx->aAlpha > maxAlpha)) + if ((interfaceCtx->aAlpha != 0) && (interfaceCtx->aAlpha > maxAlpha)) { interfaceCtx->aAlpha = maxAlpha; + } func_8008277C(globalCtx, maxAlpha, alpha); - if ((interfaceCtx->magicAlpha != 0) && (interfaceCtx->magicAlpha > maxAlpha)) + if ((interfaceCtx->magicAlpha != 0) && (interfaceCtx->magicAlpha > maxAlpha)) { interfaceCtx->magicAlpha = maxAlpha; + } - if ((interfaceCtx->minimapAlpha != 0) && (interfaceCtx->minimapAlpha > maxAlpha)) + if ((interfaceCtx->minimapAlpha != 0) && (interfaceCtx->minimapAlpha > maxAlpha)) { interfaceCtx->minimapAlpha = maxAlpha; + } - if (interfaceCtx->healthAlpha != 0xFF) + if (interfaceCtx->healthAlpha != 0xFF) { interfaceCtx->healthAlpha = alpha; + } break; case 4: - if ((interfaceCtx->bAlpha != 0) && (interfaceCtx->bAlpha > maxAlpha)) + if ((interfaceCtx->bAlpha != 0) && (interfaceCtx->bAlpha > maxAlpha)) { interfaceCtx->bAlpha = maxAlpha; + } - if ((interfaceCtx->aAlpha != 0) && (interfaceCtx->aAlpha > maxAlpha)) + if ((interfaceCtx->aAlpha != 0) && (interfaceCtx->aAlpha > maxAlpha)) { interfaceCtx->aAlpha = maxAlpha; + } - if ((interfaceCtx->cLeftAlpha != 0) && (interfaceCtx->cLeftAlpha > maxAlpha)) + if ((interfaceCtx->cLeftAlpha != 0) && (interfaceCtx->cLeftAlpha > maxAlpha)) { interfaceCtx->cLeftAlpha = maxAlpha; + } - if ((interfaceCtx->cDownAlpha != 0) && (interfaceCtx->cDownAlpha > maxAlpha)) + if ((interfaceCtx->cDownAlpha != 0) && (interfaceCtx->cDownAlpha > maxAlpha)) { interfaceCtx->cDownAlpha = maxAlpha; + } - if ((interfaceCtx->cRightAlpha != 0) && (interfaceCtx->cRightAlpha > maxAlpha)) + if ((interfaceCtx->cRightAlpha != 0) && (interfaceCtx->cRightAlpha > maxAlpha)) { interfaceCtx->cRightAlpha = maxAlpha; + } - if ((interfaceCtx->healthAlpha != 0) && (interfaceCtx->healthAlpha > maxAlpha)) + if ((interfaceCtx->healthAlpha != 0) && (interfaceCtx->healthAlpha > maxAlpha)) { interfaceCtx->healthAlpha = maxAlpha; + } - if ((interfaceCtx->magicAlpha != 0) && (interfaceCtx->magicAlpha > maxAlpha)) + if ((interfaceCtx->magicAlpha != 0) && (interfaceCtx->magicAlpha > maxAlpha)) { interfaceCtx->magicAlpha = maxAlpha; + } - if ((interfaceCtx->minimapAlpha != 0) && (interfaceCtx->minimapAlpha > maxAlpha)) + if ((interfaceCtx->minimapAlpha != 0) && (interfaceCtx->minimapAlpha > maxAlpha)) { interfaceCtx->minimapAlpha = maxAlpha; + } - if (interfaceCtx->aAlpha != 0xFF) + if (interfaceCtx->aAlpha != 0xFF) { interfaceCtx->aAlpha = alpha; + } break; case 5: func_8008277C(globalCtx, maxAlpha, alpha); - if ((interfaceCtx->minimapAlpha != 0) && (interfaceCtx->minimapAlpha > maxAlpha)) + if ((interfaceCtx->minimapAlpha != 0) && (interfaceCtx->minimapAlpha > maxAlpha)) { interfaceCtx->minimapAlpha = maxAlpha; + } - if (interfaceCtx->aAlpha != 0xFF) + if (interfaceCtx->aAlpha != 0xFF) { interfaceCtx->aAlpha = alpha; + } - if (interfaceCtx->healthAlpha != 0xFF) + if (interfaceCtx->healthAlpha != 0xFF) { interfaceCtx->healthAlpha = alpha; + } - if (interfaceCtx->magicAlpha != 0xFF) + if (interfaceCtx->magicAlpha != 0xFF) { interfaceCtx->magicAlpha = alpha; + } break; case 6: func_8008277C(globalCtx, maxAlpha, alpha); - if (interfaceCtx->aAlpha != 0xFF) + if (interfaceCtx->aAlpha != 0xFF) { interfaceCtx->aAlpha = alpha; + } - if (interfaceCtx->healthAlpha != 0xFF) + if (interfaceCtx->healthAlpha != 0xFF) { interfaceCtx->healthAlpha = alpha; + } - if (interfaceCtx->magicAlpha != 0xFF) + if (interfaceCtx->magicAlpha != 0xFF) { interfaceCtx->magicAlpha = alpha; + } - switch (globalCtx->sceneNum) - { + switch (globalCtx->sceneNum) { case SCENE_SPOT00: case SCENE_SPOT01: case SCENE_SPOT02: @@ -391,158 +404,199 @@ void func_80082850(GlobalContext* globalCtx, s16 maxAlpha) case SCENE_SPOT18: case SCENE_SPOT20: case SCENE_GANON_TOU: - if (interfaceCtx->minimapAlpha < 0xAA) + if (interfaceCtx->minimapAlpha < 0xAA) { interfaceCtx->minimapAlpha = alpha; - else + } else { interfaceCtx->minimapAlpha = 0xAA; + } break; default: - if (interfaceCtx->minimapAlpha != 0xFF) + if (interfaceCtx->minimapAlpha != 0xFF) { interfaceCtx->minimapAlpha = alpha; + } break; } break; case 7: - if ((interfaceCtx->minimapAlpha != 0) && (interfaceCtx->minimapAlpha > maxAlpha)) + if ((interfaceCtx->minimapAlpha != 0) && (interfaceCtx->minimapAlpha > maxAlpha)) { interfaceCtx->minimapAlpha = maxAlpha; + } func_80082644(globalCtx, alpha); - if (interfaceCtx->healthAlpha != 0xFF) + if (interfaceCtx->healthAlpha != 0xFF) { interfaceCtx->healthAlpha = alpha; + } - if (interfaceCtx->magicAlpha != 0xFF) + if (interfaceCtx->magicAlpha != 0xFF) { interfaceCtx->magicAlpha = alpha; + } break; case 9: - if ((interfaceCtx->bAlpha != 0) && (interfaceCtx->bAlpha > maxAlpha)) + if ((interfaceCtx->bAlpha != 0) && (interfaceCtx->bAlpha > maxAlpha)) { interfaceCtx->bAlpha = maxAlpha; + } - if ((interfaceCtx->aAlpha != 0) && (interfaceCtx->aAlpha > maxAlpha)) + if ((interfaceCtx->aAlpha != 0) && (interfaceCtx->aAlpha > maxAlpha)) { interfaceCtx->aAlpha = maxAlpha; + } - if ((interfaceCtx->cLeftAlpha != 0) && (interfaceCtx->cLeftAlpha > maxAlpha)) + if ((interfaceCtx->cLeftAlpha != 0) && (interfaceCtx->cLeftAlpha > maxAlpha)) { interfaceCtx->cLeftAlpha = maxAlpha; + } - if ((interfaceCtx->cDownAlpha != 0) && (interfaceCtx->cDownAlpha > maxAlpha)) + if ((interfaceCtx->cDownAlpha != 0) && (interfaceCtx->cDownAlpha > maxAlpha)) { interfaceCtx->cDownAlpha = maxAlpha; + } - if ((interfaceCtx->cRightAlpha != 0) && (interfaceCtx->cRightAlpha > maxAlpha)) + if ((interfaceCtx->cRightAlpha != 0) && (interfaceCtx->cRightAlpha > maxAlpha)) { interfaceCtx->cRightAlpha = maxAlpha; + } - if ((interfaceCtx->minimapAlpha != 0) && (interfaceCtx->minimapAlpha > maxAlpha)) + if ((interfaceCtx->minimapAlpha != 0) && (interfaceCtx->minimapAlpha > maxAlpha)) { interfaceCtx->minimapAlpha = maxAlpha; + } - if (interfaceCtx->healthAlpha != 0xFF) + if (interfaceCtx->healthAlpha != 0xFF) { interfaceCtx->healthAlpha = alpha; + } - if (interfaceCtx->magicAlpha != 0xFF) + if (interfaceCtx->magicAlpha != 0xFF) { interfaceCtx->magicAlpha = alpha; + } break; case 10: - if ((interfaceCtx->aAlpha != 0) && (interfaceCtx->aAlpha > maxAlpha)) + if ((interfaceCtx->aAlpha != 0) && (interfaceCtx->aAlpha > maxAlpha)) { interfaceCtx->aAlpha = maxAlpha; + } - if ((interfaceCtx->cLeftAlpha != 0) && (interfaceCtx->cLeftAlpha > maxAlpha)) + if ((interfaceCtx->cLeftAlpha != 0) && (interfaceCtx->cLeftAlpha > maxAlpha)) { interfaceCtx->cLeftAlpha = maxAlpha; + } - if ((interfaceCtx->cDownAlpha != 0) && (interfaceCtx->cDownAlpha > maxAlpha)) + if ((interfaceCtx->cDownAlpha != 0) && (interfaceCtx->cDownAlpha > maxAlpha)) { interfaceCtx->cDownAlpha = maxAlpha; + } - if ((interfaceCtx->cRightAlpha != 0) && (interfaceCtx->cRightAlpha > maxAlpha)) + if ((interfaceCtx->cRightAlpha != 0) && (interfaceCtx->cRightAlpha > maxAlpha)) { interfaceCtx->cRightAlpha = maxAlpha; + } - if ((interfaceCtx->healthAlpha != 0) && (interfaceCtx->healthAlpha > maxAlpha)) + if ((interfaceCtx->healthAlpha != 0) && (interfaceCtx->healthAlpha > maxAlpha)) { interfaceCtx->healthAlpha = maxAlpha; + } - if ((interfaceCtx->magicAlpha != 0) && (interfaceCtx->magicAlpha > maxAlpha)) + if ((interfaceCtx->magicAlpha != 0) && (interfaceCtx->magicAlpha > maxAlpha)) { interfaceCtx->magicAlpha = maxAlpha; + } - if ((interfaceCtx->minimapAlpha != 0) && (interfaceCtx->minimapAlpha > maxAlpha)) + if ((interfaceCtx->minimapAlpha != 0) && (interfaceCtx->minimapAlpha > maxAlpha)) { interfaceCtx->minimapAlpha = maxAlpha; + } - if (interfaceCtx->bAlpha != 0xFF) + if (interfaceCtx->bAlpha != 0xFF) { interfaceCtx->bAlpha = alpha; + } break; case 11: - if ((interfaceCtx->bAlpha != 0) && (interfaceCtx->bAlpha > maxAlpha)) + if ((interfaceCtx->bAlpha != 0) && (interfaceCtx->bAlpha > maxAlpha)) { interfaceCtx->bAlpha = maxAlpha; + } - if ((interfaceCtx->aAlpha != 0) && (interfaceCtx->aAlpha > maxAlpha)) + if ((interfaceCtx->aAlpha != 0) && (interfaceCtx->aAlpha > maxAlpha)) { interfaceCtx->aAlpha = maxAlpha; + } - if ((interfaceCtx->cLeftAlpha != 0) && (interfaceCtx->cLeftAlpha > maxAlpha)) + if ((interfaceCtx->cLeftAlpha != 0) && (interfaceCtx->cLeftAlpha > maxAlpha)) { interfaceCtx->cLeftAlpha = maxAlpha; + } - if ((interfaceCtx->cDownAlpha != 0) && (interfaceCtx->cDownAlpha > maxAlpha)) + if ((interfaceCtx->cDownAlpha != 0) && (interfaceCtx->cDownAlpha > maxAlpha)) { interfaceCtx->cDownAlpha = maxAlpha; + } - if ((interfaceCtx->cRightAlpha != 0) && (interfaceCtx->cRightAlpha > maxAlpha)) + if ((interfaceCtx->cRightAlpha != 0) && (interfaceCtx->cRightAlpha > maxAlpha)) { interfaceCtx->cRightAlpha = maxAlpha; + } - if ((interfaceCtx->minimapAlpha != 0) && (interfaceCtx->minimapAlpha > maxAlpha)) + if ((interfaceCtx->minimapAlpha != 0) && (interfaceCtx->minimapAlpha > maxAlpha)) { interfaceCtx->minimapAlpha = maxAlpha; + } - if ((interfaceCtx->magicAlpha!= 0) && (interfaceCtx->magicAlpha > maxAlpha)) + if ((interfaceCtx->magicAlpha != 0) && (interfaceCtx->magicAlpha > maxAlpha)) { interfaceCtx->magicAlpha = maxAlpha; + } - if (interfaceCtx->healthAlpha != 0xFF) + if (interfaceCtx->healthAlpha != 0xFF) { interfaceCtx->healthAlpha = alpha; + } break; case 12: - if (interfaceCtx->aAlpha != 0xFF) + if (interfaceCtx->aAlpha != 0xFF) { interfaceCtx->aAlpha = alpha; + } - if (interfaceCtx->bAlpha != 0xFF) + if (interfaceCtx->bAlpha != 0xFF) { interfaceCtx->bAlpha = alpha; + } - if (interfaceCtx->minimapAlpha != 0xFF) + if (interfaceCtx->minimapAlpha != 0xFF) { interfaceCtx->minimapAlpha = alpha; + } - if ((interfaceCtx->cLeftAlpha != 0) && (interfaceCtx->cLeftAlpha > maxAlpha)) + if ((interfaceCtx->cLeftAlpha != 0) && (interfaceCtx->cLeftAlpha > maxAlpha)) { interfaceCtx->cLeftAlpha = maxAlpha; + } - if ((interfaceCtx->cDownAlpha != 0) && (interfaceCtx->cDownAlpha > maxAlpha)) + if ((interfaceCtx->cDownAlpha != 0) && (interfaceCtx->cDownAlpha > maxAlpha)) { interfaceCtx->cDownAlpha = maxAlpha; + } - if ((interfaceCtx->cRightAlpha != 0) && (interfaceCtx->cRightAlpha > maxAlpha)) + if ((interfaceCtx->cRightAlpha != 0) && (interfaceCtx->cRightAlpha > maxAlpha)) { interfaceCtx->cRightAlpha = maxAlpha; + } - if ((interfaceCtx->magicAlpha != 0) && (interfaceCtx->magicAlpha > maxAlpha)) + if ((interfaceCtx->magicAlpha != 0) && (interfaceCtx->magicAlpha > maxAlpha)) { interfaceCtx->magicAlpha = maxAlpha; + } - if ((interfaceCtx->healthAlpha != 0) && (interfaceCtx->healthAlpha > maxAlpha)) + if ((interfaceCtx->healthAlpha != 0) && (interfaceCtx->healthAlpha > maxAlpha)) { interfaceCtx->healthAlpha = maxAlpha; + } break; case 13: func_8008277C(globalCtx, maxAlpha, alpha); - if ((interfaceCtx->minimapAlpha != 0) && (interfaceCtx->minimapAlpha > maxAlpha)) + if ((interfaceCtx->minimapAlpha != 0) && (interfaceCtx->minimapAlpha > maxAlpha)) { interfaceCtx->minimapAlpha = maxAlpha; + } - if ((interfaceCtx->aAlpha != 0) && (interfaceCtx->aAlpha > maxAlpha)) + if ((interfaceCtx->aAlpha != 0) && (interfaceCtx->aAlpha > maxAlpha)) { interfaceCtx->aAlpha = maxAlpha; + } - if (interfaceCtx->healthAlpha != 0xFF) + if (interfaceCtx->healthAlpha != 0xFF) { interfaceCtx->healthAlpha = alpha; + } - if (interfaceCtx->magicAlpha != 0xFF) + if (interfaceCtx->magicAlpha != 0xFF) { interfaceCtx->magicAlpha = alpha; + } break; } - if ((globalCtx->roomCtx.curRoom.unk_03 == 1) && (interfaceCtx->minimapAlpha >= 0xFF)) + if ((globalCtx->roomCtx.curRoom.unk_03 == 1) && (interfaceCtx->minimapAlpha >= 0xFF)) { interfaceCtx->minimapAlpha = 0xFF; + } } -void func_80083108(GlobalContext* globalCtx) -{ +void func_80083108(GlobalContext* globalCtx) { MessageContext* msgCtx = &globalCtx->msgCtx; Player* player = PLAYER; InterfaceContext* interfaceCtx = &globalCtx->interfaceCtx; @@ -552,86 +606,72 @@ void func_80083108(GlobalContext* globalCtx) sp28 = 0; if ((gSaveContext.cutscene_index < 0xFFF0) || - ((globalCtx->sceneNum == SCENE_SPOT20) && (gSaveContext.cutscene_index == 0xFFF0))) - { + ((globalCtx->sceneNum == SCENE_SPOT20) && (gSaveContext.cutscene_index == 0xFFF0))) { gSaveContext.unk_13E7 = 0; if ((player->stateFlags1 & 0x00800000) || (globalCtx->unk_11E5C >= 2) || - ((globalCtx->sceneNum == SCENE_BOWLING) && Flags_GetSwitch(globalCtx, 0x38))) - { - if (gSaveContext.equips.button_items[0] != ITEM_NONE) - { + ((globalCtx->sceneNum == SCENE_BOWLING) && Flags_GetSwitch(globalCtx, 0x38))) { + if (gSaveContext.equips.button_items[0] != ITEM_NONE) { gSaveContext.unk_13E7 = 1; - if (gSaveContext.button_status[0] == BTN_DISABLED) - { - gSaveContext.button_status[0] = gSaveContext.button_status[1] = - gSaveContext.button_status[2] = gSaveContext.button_status[3] = BTN_ENABLED; + if (gSaveContext.button_status[0] == BTN_DISABLED) { + gSaveContext.button_status[0] = gSaveContext.button_status[1] = gSaveContext.button_status[2] = + gSaveContext.button_status[3] = BTN_ENABLED; } if ((gSaveContext.equips.button_items[0] != ITEM_SLINGSHOT) && (gSaveContext.equips.button_items[0] != ITEM_BOW) && (gSaveContext.equips.button_items[0] != ITEM_BOMBCHU) && - (gSaveContext.equips.button_items[0] != ITEM_NONE)) - { + (gSaveContext.equips.button_items[0] != ITEM_NONE)) { gSaveContext.button_status[0] = gSaveContext.equips.button_items[0]; - if ((globalCtx->sceneNum == SCENE_BOWLING) && Flags_GetSwitch(globalCtx, 0x38)) - { + if ((globalCtx->sceneNum == SCENE_BOWLING) && Flags_GetSwitch(globalCtx, 0x38)) { gSaveContext.equips.button_items[0] = ITEM_BOMBCHU; Interface_LoadItemIcon1(globalCtx, 0); - } - else - { + } else { gSaveContext.equips.button_items[0] = ITEM_BOW; - if (globalCtx->unk_11E5C >= 2) - { - if (LINK_AGE_IN_YEARS == YEARS_CHILD) + if (globalCtx->unk_11E5C >= 2) { + if (LINK_AGE_IN_YEARS == YEARS_CHILD) { gSaveContext.equips.button_items[0] = ITEM_SLINGSHOT; + } Interface_LoadItemIcon1(globalCtx, 0); - } - else - { - if (gSaveContext.items[SLOT_BOW] == ITEM_NONE) + } else { + if (gSaveContext.items[SLOT_BOW] == ITEM_NONE) { gSaveContext.equips.button_items[0] = ITEM_NONE; - else + } else { Interface_LoadItemIcon1(globalCtx, 0); + } } } - gSaveContext.button_status[1] = gSaveContext.button_status[2] = gSaveContext.button_status[3] = BTN_DISABLED; + gSaveContext.button_status[1] = gSaveContext.button_status[2] = gSaveContext.button_status[3] = + BTN_DISABLED; Interface_ChangeAlpha(6); } - if (globalCtx->unk_1241B != 0) + if (globalCtx->unk_1241B != 0) { Interface_ChangeAlpha(1); - else if (gSaveContext.minigame_state == 1) + } else if (gSaveContext.minigame_state == 1) { Interface_ChangeAlpha(8); - else if (globalCtx->unk_11E5C >= 2) + } else if (globalCtx->unk_11E5C >= 2) { Interface_ChangeAlpha(8); - else if ((globalCtx->sceneNum == SCENE_BOWLING) && Flags_GetSwitch(globalCtx, 0x38)) + } else if ((globalCtx->sceneNum == SCENE_BOWLING) && Flags_GetSwitch(globalCtx, 0x38)) { Interface_ChangeAlpha(8); - else if (player->stateFlags1 & 0x00800000) + } else if (player->stateFlags1 & 0x00800000) { Interface_ChangeAlpha(12); - } - else - { - if (player->stateFlags1 & 0x00800000) + } + } else { + if (player->stateFlags1 & 0x00800000) { Interface_ChangeAlpha(12); + } } - } - else if (globalCtx->sceneNum == SCENE_KENJYANOMA) - { + } else if (globalCtx->sceneNum == SCENE_KENJYANOMA) { Interface_ChangeAlpha(1); - } - else if (globalCtx->sceneNum == SCENE_TURIBORI) - { + } else if (globalCtx->sceneNum == SCENE_TURIBORI) { gSaveContext.unk_13E7 = 2; - if (globalCtx->interfaceCtx.unk_260 != 0) - { - if (gSaveContext.equips.button_items[0] != ITEM_FISHING_POLE) - { + if (globalCtx->interfaceCtx.unk_260 != 0) { + if (gSaveContext.equips.button_items[0] != ITEM_FISHING_POLE) { gSaveContext.button_status[0] = gSaveContext.equips.button_items[0]; gSaveContext.equips.button_items[0] = ITEM_FISHING_POLE; gSaveContext.unk_13EA = 0; @@ -639,78 +679,69 @@ void func_80083108(GlobalContext* globalCtx) Interface_ChangeAlpha(12); } - if (gSaveContext.unk_13EA != 12) + if (gSaveContext.unk_13EA != 12) { Interface_ChangeAlpha(12); - } - else if (gSaveContext.equips.button_items[0] == ITEM_FISHING_POLE) - { + } + } else if (gSaveContext.equips.button_items[0] == ITEM_FISHING_POLE) { gSaveContext.equips.button_items[0] = gSaveContext.button_status[0]; gSaveContext.unk_13EA = 0; - if (gSaveContext.equips.button_items[0] != ITEM_NONE) + if (gSaveContext.equips.button_items[0] != ITEM_NONE) { Interface_LoadItemIcon1(globalCtx, 0); + } - gSaveContext.button_status[0] = gSaveContext.button_status[1] = - gSaveContext.button_status[2] = gSaveContext.button_status[3] = BTN_DISABLED; + gSaveContext.button_status[0] = gSaveContext.button_status[1] = gSaveContext.button_status[2] = + gSaveContext.button_status[3] = BTN_DISABLED; Interface_ChangeAlpha(50); - } - else - { - if (gSaveContext.button_status[0] == BTN_ENABLED) + } else { + if (gSaveContext.button_status[0] == BTN_ENABLED) { gSaveContext.unk_13EA = 0; + } - gSaveContext.button_status[0] = gSaveContext.button_status[1] = - gSaveContext.button_status[2] = gSaveContext.button_status[3] = BTN_DISABLED; + gSaveContext.button_status[0] = gSaveContext.button_status[1] = gSaveContext.button_status[2] = + gSaveContext.button_status[3] = BTN_DISABLED; Interface_ChangeAlpha(50); } - } - else if (msgCtx->msgMode == 0) - { - if ((func_8008F2F8(globalCtx) >= 2) && (func_8008F2F8(globalCtx) < 5)) - { - if (gSaveContext.button_status[0] != BTN_DISABLED) + } else if (msgCtx->msgMode == 0) { + if ((func_8008F2F8(globalCtx) >= 2) && (func_8008F2F8(globalCtx) < 5)) { + if (gSaveContext.button_status[0] != BTN_DISABLED) { sp28 = 1; + } gSaveContext.button_status[0] = BTN_DISABLED; - for (i = 1; i < 4; i++) - { - if (func_8008F2F8(globalCtx) == 2) - { + for (i = 1; i < 4; i++) { + if (func_8008F2F8(globalCtx) == 2) { if ((gSaveContext.equips.button_items[i] != ITEM_HOOKSHOT) && - (gSaveContext.equips.button_items[i] != ITEM_LONGSHOT)) - { - if (gSaveContext.button_status[i] == BTN_ENABLED) + (gSaveContext.equips.button_items[i] != ITEM_LONGSHOT)) { + if (gSaveContext.button_status[i] == BTN_ENABLED) { sp28 = 1; + } gSaveContext.button_status[i] = BTN_DISABLED; - } - else - { - if (gSaveContext.button_status[i] == BTN_DISABLED) + } else { + if (gSaveContext.button_status[i] == BTN_DISABLED) { sp28 = 1; + } gSaveContext.button_status[i] = BTN_ENABLED; } - } - else - { - if (gSaveContext.button_status[i] == BTN_ENABLED) + } else { + if (gSaveContext.button_status[i] == BTN_ENABLED) { sp28 = 1; + } gSaveContext.button_status[i] = BTN_DISABLED; } } - if (sp28) + if (sp28) { gSaveContext.unk_13EA = 0; + } Interface_ChangeAlpha(50); - } - else if ((player->stateFlags1 & 0x00200000) || (player->stateFlags2 & 0x00040000)) - { - if (gSaveContext.button_status[0] != BTN_DISABLED) - { + } else if ((player->stateFlags1 & 0x00200000) || (player->stateFlags2 & 0x00040000)) { + if (gSaveContext.button_status[0] != BTN_DISABLED) { gSaveContext.button_status[0] = BTN_DISABLED; gSaveContext.button_status[1] = BTN_DISABLED; gSaveContext.button_status[2] = BTN_DISABLED; @@ -718,341 +749,278 @@ void func_80083108(GlobalContext* globalCtx) gSaveContext.unk_13EA = 0; Interface_ChangeAlpha(50); } - } - else if ((gSaveContext.event_inf[0] & 0xF) == 1) - { - if (player->stateFlags1 & 0x00800000) - { + } else if ((gSaveContext.event_inf[0] & 0xF) == 1) { + if (player->stateFlags1 & 0x00800000) { if ((gSaveContext.equips.button_items[0] != ITEM_NONE) && - (gSaveContext.equips.button_items[0] != ITEM_BOW)) - { - if (gSaveContext.items[SLOT_BOW] == ITEM_NONE) - { + (gSaveContext.equips.button_items[0] != ITEM_BOW)) { + if (gSaveContext.items[SLOT_BOW] == ITEM_NONE) { gSaveContext.equips.button_items[0] = ITEM_NONE; - } - else - { + } else { gSaveContext.equips.button_items[0] = ITEM_BOW; sp28 = 1; } } + } else { + do { + sp28 = 1; + + if ((gSaveContext.equips.button_items[0] == ITEM_NONE) || + (gSaveContext.equips.button_items[0] == ITEM_BOW)) { + + if ((gSaveContext.equips.button_items[0] != ITEM_SWORD_KOKIRI) && + (gSaveContext.equips.button_items[0] != ITEM_SWORD_MASTER) && + (gSaveContext.equips.button_items[0] != ITEM_SWORD_BGS) && + (gSaveContext.equips.button_items[0] != ITEM_SWORD_KNIFE)) { + gSaveContext.equips.button_items[0] = gSaveContext.button_status[0]; + } else { + gSaveContext.button_status[0] = gSaveContext.equips.button_items[0]; + } + } + } while (0); // Necessary to match } - else do - { - sp28 = 1; - if ((gSaveContext.equips.button_items[0] == ITEM_NONE) || - (gSaveContext.equips.button_items[0] == ITEM_BOW)) - { - - if ((gSaveContext.equips.button_items[0] != ITEM_SWORD_KOKIRI) && - (gSaveContext.equips.button_items[0] != ITEM_SWORD_MASTER) && - (gSaveContext.equips.button_items[0] != ITEM_SWORD_BGS) && - (gSaveContext.equips.button_items[0] != ITEM_SWORD_KNIFE)) - { - gSaveContext.equips.button_items[0] = gSaveContext.button_status[0]; - } - else - { - gSaveContext.button_status[0] = gSaveContext.equips.button_items[0]; - } - } - } while (0); // Necessary to match - - if (sp28) - { + if (sp28) { Interface_LoadItemIcon1(globalCtx, 0); sp28 = 0; } - for (i = 1; i < 4; i++) - { + for (i = 1; i < 4; i++) { if ((gSaveContext.equips.button_items[i] != ITEM_OCARINA_FAIRY) && - (gSaveContext.equips.button_items[i] != ITEM_OCARINA_TIME)) - { - if (gSaveContext.button_status[i] == BTN_ENABLED) + (gSaveContext.equips.button_items[i] != ITEM_OCARINA_TIME)) { + if (gSaveContext.button_status[i] == BTN_ENABLED) { sp28 = 1; + } gSaveContext.button_status[i] = BTN_DISABLED; - } - else - { - if (gSaveContext.button_status[i] == BTN_DISABLED) + } else { + if (gSaveContext.button_status[i] == BTN_DISABLED) { sp28 = 1; + } gSaveContext.button_status[i] = BTN_ENABLED; } } - if (sp28) + if (sp28) { gSaveContext.unk_13EA = 0; + } Interface_ChangeAlpha(50); - } - else - { - if (interfaceCtx->restrictions.bButton == 0) - { + } else { + if (interfaceCtx->restrictions.bButton == 0) { if ((gSaveContext.equips.button_items[0] == ITEM_SLINGSHOT) || (gSaveContext.equips.button_items[0] == ITEM_BOW) || (gSaveContext.equips.button_items[0] == ITEM_BOMBCHU) || - (gSaveContext.equips.button_items[0] == ITEM_NONE)) - { - if ((gSaveContext.equips.button_items[0] != ITEM_NONE) || (gSaveContext.inf_table[29] == 0)) - { + (gSaveContext.equips.button_items[0] == ITEM_NONE)) { + if ((gSaveContext.equips.button_items[0] != ITEM_NONE) || (gSaveContext.inf_table[29] == 0)) { gSaveContext.equips.button_items[0] = gSaveContext.button_status[0]; sp28 = 1; - if (gSaveContext.equips.button_items[0] != ITEM_NONE) + if (gSaveContext.equips.button_items[0] != ITEM_NONE) { Interface_LoadItemIcon1(globalCtx, 0); + } } - } - else if ((gSaveContext.button_status[0] & 0xFF) == BTN_DISABLED) - { + } else if ((gSaveContext.button_status[0] & 0xFF) == BTN_DISABLED) { sp28 = 1; if (((gSaveContext.button_status[0] & 0xFF) == BTN_DISABLED) || - ((gSaveContext.button_status[0] & 0xFF) == BTN_ENABLED)) - { + ((gSaveContext.button_status[0] & 0xFF) == BTN_ENABLED)) { gSaveContext.button_status[0] = BTN_ENABLED; - } - else - { + } else { gSaveContext.equips.button_items[0] = gSaveContext.button_status[0] & 0xFF; } } - } - else if (interfaceCtx->restrictions.bButton == 1) - { + } else if (interfaceCtx->restrictions.bButton == 1) { if ((gSaveContext.equips.button_items[0] == ITEM_SLINGSHOT) || (gSaveContext.equips.button_items[0] == ITEM_BOW) || (gSaveContext.equips.button_items[0] == ITEM_BOMBCHU) || - (gSaveContext.equips.button_items[0] == ITEM_NONE)) - { - if ((gSaveContext.equips.button_items[0] != ITEM_NONE) || (gSaveContext.inf_table[29] == 0)) - { + (gSaveContext.equips.button_items[0] == ITEM_NONE)) { + if ((gSaveContext.equips.button_items[0] != ITEM_NONE) || (gSaveContext.inf_table[29] == 0)) { gSaveContext.equips.button_items[0] = gSaveContext.button_status[0]; sp28 = 1; - if (gSaveContext.equips.button_items[0] != ITEM_NONE) + if (gSaveContext.equips.button_items[0] != ITEM_NONE) { Interface_LoadItemIcon1(globalCtx, 0); + } } - } - else - { - if (gSaveContext.button_status[0] == BTN_ENABLED) + } else { + if (gSaveContext.button_status[0] == BTN_ENABLED) { sp28 = 1; + } gSaveContext.button_status[0] = BTN_DISABLED; } } - if (interfaceCtx->restrictions.bottles != 0) - { - for (i = 1; i < 4; i++) - { + if (interfaceCtx->restrictions.bottles != 0) { + for (i = 1; i < 4; i++) { if ((gSaveContext.equips.button_items[i] >= ITEM_BOTTLE) && - (gSaveContext.equips.button_items[i] <= ITEM_POE)) - { - if (gSaveContext.button_status[i] == BTN_ENABLED) + (gSaveContext.equips.button_items[i] <= ITEM_POE)) { + if (gSaveContext.button_status[i] == BTN_ENABLED) { sp28 = 1; + } gSaveContext.button_status[i] = BTN_DISABLED; } } - } - else if (interfaceCtx->restrictions.bottles == 0) - { - for (i = 1; i < 4; i++) - { + } else if (interfaceCtx->restrictions.bottles == 0) { + for (i = 1; i < 4; i++) { if ((gSaveContext.equips.button_items[i] >= ITEM_BOTTLE) && - (gSaveContext.equips.button_items[i] <= ITEM_POE)) - { - if (gSaveContext.button_status[i] == BTN_DISABLED) + (gSaveContext.equips.button_items[i] <= ITEM_POE)) { + if (gSaveContext.button_status[i] == BTN_DISABLED) { sp28 = 1; + } gSaveContext.button_status[i] = BTN_ENABLED; } } } - if (interfaceCtx->restrictions.tradeItems != 0) - { - for (i = 1; i < 4; i++) - { + if (interfaceCtx->restrictions.tradeItems != 0) { + for (i = 1; i < 4; i++) { if ((gSaveContext.equips.button_items[i] >= ITEM_WEIRD_EGG) && - (gSaveContext.equips.button_items[i] <= ITEM_CLAIM_CHECK)) - { - if (gSaveContext.button_status[i] == BTN_ENABLED) + (gSaveContext.equips.button_items[i] <= ITEM_CLAIM_CHECK)) { + if (gSaveContext.button_status[i] == BTN_ENABLED) { sp28 = 1; + } gSaveContext.button_status[i] = BTN_DISABLED; } } - } - else if (interfaceCtx->restrictions.tradeItems == 0) - { - for (i = 1; i < 4; i++) - { + } else if (interfaceCtx->restrictions.tradeItems == 0) { + for (i = 1; i < 4; i++) { if ((gSaveContext.equips.button_items[i] >= ITEM_WEIRD_EGG) && - (gSaveContext.equips.button_items[i] <= ITEM_CLAIM_CHECK)) - { - if (gSaveContext.button_status[i] == BTN_DISABLED) + (gSaveContext.equips.button_items[i] <= ITEM_CLAIM_CHECK)) { + if (gSaveContext.button_status[i] == BTN_DISABLED) { sp28 = 1; + } gSaveContext.button_status[i] = BTN_ENABLED; } } } - if (interfaceCtx->restrictions.hookshot != 0) - { - for (i = 1; i < 4; i++) - { + if (interfaceCtx->restrictions.hookshot != 0) { + for (i = 1; i < 4; i++) { if ((gSaveContext.equips.button_items[i] == ITEM_HOOKSHOT) || - (gSaveContext.equips.button_items[i] == ITEM_LONGSHOT)) - { - if (gSaveContext.button_status[i] == BTN_ENABLED) + (gSaveContext.equips.button_items[i] == ITEM_LONGSHOT)) { + if (gSaveContext.button_status[i] == BTN_ENABLED) { sp28 = 1; + } gSaveContext.button_status[i] = BTN_DISABLED; } } - } - else if (interfaceCtx->restrictions.hookshot == 0) - { - for (i = 1; i < 4; i++) - { + } else if (interfaceCtx->restrictions.hookshot == 0) { + for (i = 1; i < 4; i++) { if ((gSaveContext.equips.button_items[i] == ITEM_HOOKSHOT) || - (gSaveContext.equips.button_items[i] == ITEM_LONGSHOT)) - { - if (gSaveContext.button_status[i] == BTN_DISABLED) + (gSaveContext.equips.button_items[i] == ITEM_LONGSHOT)) { + if (gSaveContext.button_status[i] == BTN_DISABLED) { sp28 = 1; + } gSaveContext.button_status[i] = BTN_ENABLED; } } } - if (interfaceCtx->restrictions.ocarina != 0) - { - for (i = 1; i < 4; i++) - { + if (interfaceCtx->restrictions.ocarina != 0) { + for (i = 1; i < 4; i++) { if ((gSaveContext.equips.button_items[i] == ITEM_OCARINA_FAIRY) || - (gSaveContext.equips.button_items[i] == ITEM_OCARINA_TIME)) - { - if (gSaveContext.button_status[i] == BTN_ENABLED) + (gSaveContext.equips.button_items[i] == ITEM_OCARINA_TIME)) { + if (gSaveContext.button_status[i] == BTN_ENABLED) { sp28 = 1; + } gSaveContext.button_status[i] = BTN_DISABLED; } } - } - else if (interfaceCtx->restrictions.ocarina == 0) - { - for (i = 1; i < 4; i++) - { + } else if (interfaceCtx->restrictions.ocarina == 0) { + for (i = 1; i < 4; i++) { if ((gSaveContext.equips.button_items[i] == ITEM_OCARINA_FAIRY) || - (gSaveContext.equips.button_items[i] == ITEM_OCARINA_TIME)) - { - if (gSaveContext.button_status[i] == BTN_DISABLED) + (gSaveContext.equips.button_items[i] == ITEM_OCARINA_TIME)) { + if (gSaveContext.button_status[i] == BTN_DISABLED) { sp28 = 1; + } gSaveContext.button_status[i] = BTN_ENABLED; } } } - if (interfaceCtx->restrictions.farores != 0) - { - for (i = 1; i < 4; i++) - { - if (gSaveContext.equips.button_items[i] == ITEM_FARORES_WIND) - { - if (gSaveContext.button_status[i] == BTN_ENABLED) + if (interfaceCtx->restrictions.farores != 0) { + for (i = 1; i < 4; i++) { + if (gSaveContext.equips.button_items[i] == ITEM_FARORES_WIND) { + if (gSaveContext.button_status[i] == BTN_ENABLED) { sp28 = 1; + } gSaveContext.button_status[i] = BTN_DISABLED; osSyncPrintf("***(i=%d)*** ", i); } } - } - else if (interfaceCtx->restrictions.farores == 0) - { - for (i = 1; i < 4; i++) - { - if (gSaveContext.equips.button_items[i] == ITEM_FARORES_WIND) - { - if (gSaveContext.button_status[i] == BTN_DISABLED) + } else if (interfaceCtx->restrictions.farores == 0) { + for (i = 1; i < 4; i++) { + if (gSaveContext.equips.button_items[i] == ITEM_FARORES_WIND) { + if (gSaveContext.button_status[i] == BTN_DISABLED) { sp28 = 1; + } gSaveContext.button_status[i] = BTN_ENABLED; } } } - if (interfaceCtx->restrictions.dinsNayrus != 0) - { - for (i = 1; i < 4; i++) - { + if (interfaceCtx->restrictions.dinsNayrus != 0) { + for (i = 1; i < 4; i++) { if ((gSaveContext.equips.button_items[i] == ITEM_DINS_FIRE) || - (gSaveContext.equips.button_items[i] == ITEM_NAYRUS_LOVE)) - { - if (gSaveContext.button_status[i] == BTN_ENABLED) + (gSaveContext.equips.button_items[i] == ITEM_NAYRUS_LOVE)) { + if (gSaveContext.button_status[i] == BTN_ENABLED) { sp28 = 1; + } gSaveContext.button_status[i] = BTN_DISABLED; } } - } - else if (interfaceCtx->restrictions.dinsNayrus == 0) - { - for (i = 1; i < 4; i++) - { + } else if (interfaceCtx->restrictions.dinsNayrus == 0) { + for (i = 1; i < 4; i++) { if ((gSaveContext.equips.button_items[i] == ITEM_DINS_FIRE) || - (gSaveContext.equips.button_items[i] == ITEM_NAYRUS_LOVE)) - { - if (gSaveContext.button_status[i] == BTN_DISABLED) + (gSaveContext.equips.button_items[i] == ITEM_NAYRUS_LOVE)) { + if (gSaveContext.button_status[i] == BTN_DISABLED) { sp28 = 1; + } gSaveContext.button_status[i] = BTN_ENABLED; } } } - if (interfaceCtx->restrictions.all != 0) - { - for (i = 1; i < 4; i++) - { + if (interfaceCtx->restrictions.all != 0) { + for (i = 1; i < 4; i++) { if ((gSaveContext.equips.button_items[i] != ITEM_OCARINA_FAIRY) && (gSaveContext.equips.button_items[i] != ITEM_OCARINA_TIME) && !((gSaveContext.equips.button_items[i] >= ITEM_BOTTLE) && (gSaveContext.equips.button_items[i] <= ITEM_POE)) && !((gSaveContext.equips.button_items[i] >= ITEM_WEIRD_EGG) && - (gSaveContext.equips.button_items[i] <= ITEM_CLAIM_CHECK))) - { + (gSaveContext.equips.button_items[i] <= ITEM_CLAIM_CHECK))) { if ((globalCtx->sceneNum != SCENE_TAKARAYA) || - (gSaveContext.equips.button_items[i] != ITEM_LENS)) - { - if (gSaveContext.button_status[i] == BTN_ENABLED) + (gSaveContext.equips.button_items[i] != ITEM_LENS)) { + if (gSaveContext.button_status[i] == BTN_ENABLED) { sp28 = 1; + } gSaveContext.button_status[i] = BTN_DISABLED; - } - else - { - if (gSaveContext.button_status[i] == BTN_DISABLED) + } else { + if (gSaveContext.button_status[i] == BTN_DISABLED) { sp28 = 1; + } gSaveContext.button_status[i] = BTN_ENABLED; } } } - } - else if (interfaceCtx->restrictions.all == 0) - { - for (i = 1; i < 4; i++) - { + } else if (interfaceCtx->restrictions.all == 0) { + for (i = 1; i < 4; i++) { if ((gSaveContext.equips.button_items[i] != ITEM_DINS_FIRE) && (gSaveContext.equips.button_items[i] != ITEM_HOOKSHOT) && (gSaveContext.equips.button_items[i] != ITEM_LONGSHOT) && @@ -1063,10 +1031,10 @@ void func_80083108(GlobalContext* globalCtx) !((gSaveContext.equips.button_items[i] >= ITEM_BOTTLE) && (gSaveContext.equips.button_items[i] <= ITEM_POE)) && !((gSaveContext.equips.button_items[i] >= ITEM_WEIRD_EGG) && - (gSaveContext.equips.button_items[i] <= ITEM_CLAIM_CHECK))) - { - if (gSaveContext.button_status[i] == BTN_DISABLED) + (gSaveContext.equips.button_items[i] <= ITEM_CLAIM_CHECK))) { + if (gSaveContext.button_status[i] == BTN_DISABLED) { sp28 = 1; + } gSaveContext.button_status[i] = BTN_ENABLED; } @@ -1076,44 +1044,39 @@ void func_80083108(GlobalContext* globalCtx) } } - if (sp28) - { + if (sp28) { gSaveContext.unk_13EA = 0; - if ((globalCtx->sceneLoadFlag == 0) && (globalCtx->unk_1241B == 0)) - { + if ((globalCtx->sceneLoadFlag == 0) && (globalCtx->unk_1241B == 0)) { Interface_ChangeAlpha(50); osSyncPrintf("???????? alpha_change( 50 ); ?????\n"); - } - else - { + } else { osSyncPrintf("game_play->fade_direction || game_play->fbdemo_wipe_modem"); } } } -void Interface_SetSceneRestrictions(GlobalContext* globalCtx) -{ +void Interface_SetSceneRestrictions(GlobalContext* globalCtx) { InterfaceContext* interfaceCtx = &globalCtx->interfaceCtx; s16 i; u8 currentScene; + // clang-format off interfaceCtx->restrictions.hGauge = interfaceCtx->restrictions.bButton = interfaceCtx->restrictions.aButton = interfaceCtx->restrictions.bottles = - interfaceCtx->restrictions.tradeItems = interfaceCtx->restrictions.hookshot = + interfaceCtx->restrictions.tradeItems = interfaceCtx->restrictions.hookshot = interfaceCtx->restrictions.ocarina = interfaceCtx->restrictions.warpSongs = interfaceCtx->restrictions.sunsSong = interfaceCtx->restrictions.farores = interfaceCtx->restrictions.dinsNayrus = interfaceCtx->restrictions.all = 0; + // clang-format on i = 0; // Translates to: "Data settings related to button display scene_data_ID=%d\n" osSyncPrintf("ボタン表示関係データ設定 scene_data_ID=%d\n", globalCtx->sceneNum); - do - { + do { currentScene = (u8)globalCtx->sceneNum; - if (sRestrictionFlags[i].scene == currentScene) - { + if (sRestrictionFlags[i].scene == currentScene) { interfaceCtx->restrictions.hGauge = (sRestrictionFlags[i].flags1 & 0xC0) >> 6; interfaceCtx->restrictions.bButton = (sRestrictionFlags[i].flags1 & 0x30) >> 4; interfaceCtx->restrictions.aButton = (sRestrictionFlags[i].flags1 & 0x0C) >> 2; @@ -1128,104 +1091,76 @@ void Interface_SetSceneRestrictions(GlobalContext* globalCtx) interfaceCtx->restrictions.all = (sRestrictionFlags[i].flags3 & 0x03) >> 0; osSyncPrintf(VT_FGCOL(YELLOW)); - osSyncPrintf("parameter->button_status = %x,%x,%x\n", - sRestrictionFlags[i].flags1, sRestrictionFlags[i].flags2, sRestrictionFlags[i].flags3); - osSyncPrintf("h_gage=%d, b_button=%d, a_button=%d, c_bottle=%d\n", - interfaceCtx->restrictions.hGauge, interfaceCtx->restrictions.bButton, - interfaceCtx->restrictions.aButton, interfaceCtx->restrictions.bottles); - osSyncPrintf("c_warasibe=%d, c_hook=%d, c_ocarina=%d, c_warp=%d\n", - interfaceCtx->restrictions.tradeItems, interfaceCtx->restrictions.hookshot, - interfaceCtx->restrictions.ocarina, interfaceCtx->restrictions.warpSongs); - osSyncPrintf("c_sunmoon=%d, m_wind=%d, m_magic=%d, another=%d\n", - interfaceCtx->restrictions.sunsSong, interfaceCtx->restrictions.farores, - interfaceCtx->restrictions.dinsNayrus, interfaceCtx->restrictions.all); + osSyncPrintf("parameter->button_status = %x,%x,%x\n", sRestrictionFlags[i].flags1, + sRestrictionFlags[i].flags2, sRestrictionFlags[i].flags3); + osSyncPrintf("h_gage=%d, b_button=%d, a_button=%d, c_bottle=%d\n", interfaceCtx->restrictions.hGauge, + interfaceCtx->restrictions.bButton, interfaceCtx->restrictions.aButton, + interfaceCtx->restrictions.bottles); + osSyncPrintf("c_warasibe=%d, c_hook=%d, c_ocarina=%d, c_warp=%d\n", interfaceCtx->restrictions.tradeItems, + interfaceCtx->restrictions.hookshot, interfaceCtx->restrictions.ocarina, + interfaceCtx->restrictions.warpSongs); + osSyncPrintf("c_sunmoon=%d, m_wind=%d, m_magic=%d, another=%d\n", interfaceCtx->restrictions.sunsSong, + interfaceCtx->restrictions.farores, interfaceCtx->restrictions.dinsNayrus, + interfaceCtx->restrictions.all); osSyncPrintf(VT_RST); return; } i++; - } - while (sRestrictionFlags[i].scene != 0xFF); + } while (sRestrictionFlags[i].scene != 0xFF); } -Gfx* Draw_TextureIA8(Gfx* displayListHead, void* texture, s16 textureWidth, s16 textureHeight, - s16 rectLeft, s16 rectTop, s16 rectWidth, s16 rectHeight, u16 dsdx, u16 dtdy) -{ - gDPLoadTextureBlock(displayListHead++, - texture, - G_IM_FMT_IA, - G_IM_SIZ_8b, - textureWidth, 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); +Gfx* Gfx_TextureIA8(Gfx* displayListHead, void* texture, s16 textureWidth, s16 textureHeight, s16 rectLeft, s16 rectTop, + s16 rectWidth, s16 rectHeight, u16 dsdx, u16 dtdy) { + gDPLoadTextureBlock(displayListHead++, texture, G_IM_FMT_IA, G_IM_SIZ_8b, textureWidth, 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); - gSPTextureRectangle(displayListHead++, - rectLeft * 4, rectTop * 4, - (rectLeft + rectWidth) * 4, (rectTop + rectHeight) * 4, - G_TX_RENDERTILE, - 0, 0, - dsdx, dtdy); + gSPTextureRectangle(displayListHead++, rectLeft * 4, rectTop * 4, (rectLeft + rectWidth) * 4, + (rectTop + rectHeight) * 4, G_TX_RENDERTILE, 0, 0, dsdx, dtdy); return displayListHead; } -Gfx* Draw_TextureI8(Gfx* displayListHead, void* texture, s16 textureWidth, s16 textureHeight, - s16 rectLeft, s16 rectTop, s16 rectWidth, s16 rectHeight, u16 dsdx, u16 dtdy) -{ - gDPLoadTextureBlock(displayListHead++, - texture, - G_IM_FMT_I, - G_IM_SIZ_8b, - textureWidth, 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); +Gfx* Gfx_TextureI8(Gfx* displayListHead, void* texture, s16 textureWidth, s16 textureHeight, s16 rectLeft, s16 rectTop, + s16 rectWidth, s16 rectHeight, u16 dsdx, u16 dtdy) { + gDPLoadTextureBlock(displayListHead++, texture, G_IM_FMT_I, G_IM_SIZ_8b, textureWidth, 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); - gSPTextureRectangle(displayListHead++, - rectLeft * 4, rectTop * 4, - (rectLeft + rectWidth) * 4, (rectTop + rectHeight) * 4, - G_TX_RENDERTILE, - 0, 0, - dsdx, dtdy); + gSPTextureRectangle(displayListHead++, rectLeft * 4, rectTop * 4, (rectLeft + rectWidth) * 4, + (rectTop + rectHeight) * 4, G_TX_RENDERTILE, 0, 0, dsdx, dtdy); return displayListHead; } #ifdef NON_MATCHING // regalloc differences -void Inventory_SwapAgeEquipment(void) -{ +void Inventory_SwapAgeEquipment(void) { s16 i; u16 temp; - if (LINK_AGE_IN_YEARS == YEARS_CHILD) - { - for (i = 0; i < 4; i++) - { - if (i != 0) + if (LINK_AGE_IN_YEARS == YEARS_CHILD) { + for (i = 0; i < 4; i++) { + if (i != 0) { gSaveContext.child_equips.button_items[i] = gSaveContext.equips.button_items[i]; - else + } else { gSaveContext.child_equips.button_items[i] = ITEM_SWORD_KOKIRI; + } - if (i != 0) - gSaveContext.child_equips.c_button_slots[i-1] = gSaveContext.equips.c_button_slots[i-1]; + if (i != 0) { + gSaveContext.child_equips.c_button_slots[i - 1] = gSaveContext.equips.c_button_slots[i - 1]; + } } gSaveContext.child_equips.equipment = gSaveContext.equips.equipment; - if (gSaveContext.adult_equips.button_items[0] == ITEM_NONE) - { + if (gSaveContext.adult_equips.button_items[0] == ITEM_NONE) { gSaveContext.equips.button_items[0] = ITEM_SWORD_MASTER; - if (gSaveContext.items[SLOT_NUT] != ITEM_NONE) - { + if (gSaveContext.items[SLOT_NUT] != ITEM_NONE) { gSaveContext.equips.button_items[1] = ITEM_NUT; gSaveContext.equips.c_button_slots[0] = SLOT_NUT; - } - else - { + } else { gSaveContext.equips.c_button_slots[0] = SLOT_NONE; gSaveContext.equips.button_items[1] = ITEM_NONE; } @@ -1235,57 +1170,50 @@ void Inventory_SwapAgeEquipment(void) gSaveContext.equips.c_button_slots[2] = SLOT_OCARINA; gSaveContext.equips.equipment = 0x1122; gSaveContext.equips.button_items[3] = gSaveContext.items[SLOT_OCARINA]; - } - else - { - for (i = 0; i < 4; i++) - { + } else { + for (i = 0; i < 4; i++) { gSaveContext.equips.button_items[i] = gSaveContext.adult_equips.button_items[i]; - if (i != 0) - gSaveContext.equips.c_button_slots[i-1] = gSaveContext.adult_equips.c_button_slots[i-1]; + if (i != 0) { + gSaveContext.equips.c_button_slots[i - 1] = gSaveContext.adult_equips.c_button_slots[i - 1]; + } if (((gSaveContext.equips.button_items[i] >= ITEM_BOTTLE) && (gSaveContext.equips.button_items[i] <= ITEM_POE)) || ((gSaveContext.equips.button_items[i] >= ITEM_WEIRD_EGG) && - (gSaveContext.equips.button_items[i] <= ITEM_CLAIM_CHECK))) - { - osSyncPrintf("Register_Item_Pt(%d)=%d\n", i, gSaveContext.equips.c_button_slots[i-1]); - gSaveContext.equips.button_items[i] = gSaveContext.items[gSaveContext.equips.c_button_slots[i-1]]; + (gSaveContext.equips.button_items[i] <= ITEM_CLAIM_CHECK))) { + osSyncPrintf("Register_Item_Pt(%d)=%d\n", i, gSaveContext.equips.c_button_slots[i - 1]); + gSaveContext.equips.button_items[i] = gSaveContext.items[gSaveContext.equips.c_button_slots[i - 1]]; } } gSaveContext.equips.equipment = gSaveContext.adult_equips.equipment; } - } - else - { - for (i = 0; i < 4; i++) - { + } else { + for (i = 0; i < 4; i++) { gSaveContext.adult_equips.button_items[i] = gSaveContext.equips.button_items[i]; - if (i != 0) - gSaveContext.adult_equips.c_button_slots[i-1] = gSaveContext.equips.c_button_slots[i-1]; + if (i != 0) { + gSaveContext.adult_equips.c_button_slots[i - 1] = gSaveContext.equips.c_button_slots[i - 1]; + } } gSaveContext.adult_equips.equipment = gSaveContext.equips.equipment; - if (gSaveContext.child_equips.button_items[0] != ITEM_NONE) - { - for (i = 0; i < 4; i++) - { + if (gSaveContext.child_equips.button_items[0] != ITEM_NONE) { + for (i = 0; i < 4; i++) { gSaveContext.equips.button_items[i] = gSaveContext.child_equips.button_items[i]; - if (i != 0) - gSaveContext.equips.c_button_slots[i-1] = gSaveContext.child_equips.c_button_slots[i-1]; + if (i != 0) { + gSaveContext.equips.c_button_slots[i - 1] = gSaveContext.child_equips.c_button_slots[i - 1]; + } if (((gSaveContext.equips.button_items[i] >= ITEM_BOTTLE) && (gSaveContext.equips.button_items[i] <= ITEM_POE)) || ((gSaveContext.equips.button_items[i] >= ITEM_WEIRD_EGG) && - (gSaveContext.equips.button_items[i] <= ITEM_CLAIM_CHECK))) - { - osSyncPrintf("Register_Item_Pt(%d)=%d\n", i, gSaveContext.equips.c_button_slots[i-1]); - gSaveContext.equips.button_items[i] = gSaveContext.items[gSaveContext.equips.c_button_slots[i-1]]; + (gSaveContext.equips.button_items[i] <= ITEM_CLAIM_CHECK))) { + osSyncPrintf("Register_Item_Pt(%d)=%d\n", i, gSaveContext.equips.c_button_slots[i - 1]); + gSaveContext.equips.button_items[i] = gSaveContext.items[gSaveContext.equips.c_button_slots[i - 1]]; } } @@ -1296,19 +1224,18 @@ void Inventory_SwapAgeEquipment(void) } temp = gEquipMasks[EQUIP_SHIELD] & gSaveContext.equips.equipment; - if (temp != 0) - { + if (temp != 0) { temp >>= gEquipShifts[EQUIP_SHIELD]; - if (!(gBitFlags[temp + 3] & gSaveContext.equipment)) + if (!(gBitFlags[temp + 3] & gSaveContext.equipment)) { gSaveContext.equips.equipment &= gEquipNegMasks[EQUIP_SHIELD]; + } } } #else #pragma GLOBAL_ASM("asm/non_matchings/code/z_parameter/Inventory_SwapAgeEquipment.s") #endif -void Interface_InitHorsebackArchery(GlobalContext* globalCtx) -{ +void Interface_InitHorsebackArchery(GlobalContext* globalCtx) { InterfaceContext* interfaceCtx = &globalCtx->interfaceCtx; gSaveContext.minigame_state = 1; @@ -1317,21 +1244,20 @@ void Interface_InitHorsebackArchery(GlobalContext* globalCtx) interfaceCtx->hbaAmmo = 20; } -void func_800849EC(GlobalContext* globalCtx) -{ +void func_800849EC(GlobalContext* globalCtx) { gSaveContext.equipment |= gBitFlags[2] << gEquipShifts[0]; gSaveContext.equipment ^= 8 << gEquipShifts[0]; - if (gBitFlags[3] & gSaveContext.equipment) + if (gBitFlags[3] & gSaveContext.equipment) { gSaveContext.equips.button_items[0] = ITEM_SWORD_KNIFE; - else + } else { gSaveContext.equips.button_items[0] = ITEM_SWORD_BGS; + } Interface_LoadItemIcon1(globalCtx, 0); } -void Interface_LoadItemIcon1(GlobalContext* globalCtx, u16 button) -{ +void Interface_LoadItemIcon1(GlobalContext* globalCtx, u16 button) { InterfaceContext* interfaceCtx = &globalCtx->interfaceCtx; osCreateMesgQueue(&interfaceCtx->loadQueue, &interfaceCtx->loadMsg, OS_MESG_BLOCK); @@ -1341,8 +1267,7 @@ void Interface_LoadItemIcon1(GlobalContext* globalCtx, u16 button) osRecvMesg(&interfaceCtx->loadQueue, NULL, OS_MESG_BLOCK); } -void Interface_LoadItemIcon2(GlobalContext* globalCtx, u16 button) -{ +void Interface_LoadItemIcon2(GlobalContext* globalCtx, u16 button) { InterfaceContext* interfaceCtx = &globalCtx->interfaceCtx; osCreateMesgQueue(&interfaceCtx->loadQueue, &interfaceCtx->loadMsg, OS_MESG_BLOCK); @@ -1352,42 +1277,33 @@ void Interface_LoadItemIcon2(GlobalContext* globalCtx, u16 button) osRecvMesg(&interfaceCtx->loadQueue, NULL, OS_MESG_BLOCK); } -void func_80084BF4(GlobalContext* globalCtx, u16 flag) -{ - if (flag) - { +void func_80084BF4(GlobalContext* globalCtx, u16 flag) { + if (flag) { if ((gSaveContext.equips.button_items[0] == ITEM_SLINGSHOT) || (gSaveContext.equips.button_items[0] == ITEM_BOW) || (gSaveContext.equips.button_items[0] == ITEM_BOMBCHU) || (gSaveContext.equips.button_items[0] == ITEM_FISHING_POLE) || - (gSaveContext.button_status[0] == BTN_DISABLED)) - { + (gSaveContext.button_status[0] == BTN_DISABLED)) { if ((gSaveContext.equips.button_items[0] == ITEM_SLINGSHOT) || (gSaveContext.equips.button_items[0] == ITEM_BOW) || (gSaveContext.equips.button_items[0] == ITEM_BOMBCHU) || - (gSaveContext.equips.button_items[0] == ITEM_FISHING_POLE)) - { + (gSaveContext.equips.button_items[0] == ITEM_FISHING_POLE)) { gSaveContext.equips.button_items[0] = gSaveContext.button_status[0]; Interface_LoadItemIcon1(globalCtx, 0); } - } - else if (gSaveContext.equips.button_items[0] == ITEM_NONE) - { - if ((gSaveContext.equips.button_items[0] != ITEM_NONE) || (gSaveContext.inf_table[29] == 0)) - { + } else if (gSaveContext.equips.button_items[0] == ITEM_NONE) { + if ((gSaveContext.equips.button_items[0] != ITEM_NONE) || (gSaveContext.inf_table[29] == 0)) { gSaveContext.equips.button_items[0] = gSaveContext.button_status[0]; Interface_LoadItemIcon1(globalCtx, 0); } } - gSaveContext.button_status[0] = gSaveContext.button_status[1] = - gSaveContext.button_status[2] = gSaveContext.button_status[3] = BTN_ENABLED; + gSaveContext.button_status[0] = gSaveContext.button_status[1] = gSaveContext.button_status[2] = + gSaveContext.button_status[3] = BTN_ENABLED; Interface_ChangeAlpha(7); - } - else - { - gSaveContext.button_status[0] = gSaveContext.button_status[1] = - gSaveContext.button_status[2] = gSaveContext.button_status[3] = BTN_ENABLED; + } else { + gSaveContext.button_status[0] = gSaveContext.button_status[1] = gSaveContext.button_status[2] = + gSaveContext.button_status[3] = BTN_ENABLED; func_80083108(globalCtx); } } @@ -1396,8 +1312,7 @@ s16 sAmmoRefillCounts[] = { 5, 10, 20, 30, 5, 10, 30, 0, 5, 20, 1, 5, 20, 50, 20 #ifdef NON_MATCHING // regalloc, minor ordering and stack usage differences -u8 Item_Give(GlobalContext* globalCtx, u8 item) -{ +u8 Item_Give(GlobalContext* globalCtx, u8 item) { s16 i; s16 slot; s16 oldItem; @@ -1406,15 +1321,15 @@ u8 Item_Give(GlobalContext* globalCtx, u8 item) s8 bombCount; slot = SLOT(item); - if (item >= ITEM_STICKS_5) + if (item >= ITEM_STICKS_5) { slot = SLOT(sExtraItemBases[item - ITEM_STICKS_5]); + } osSyncPrintf(VT_FGCOL(YELLOW)); osSyncPrintf("item_get_setting=%d pt=%d z=%x\n", item, slot, gSaveContext.items[slot]); osSyncPrintf(VT_RST); - if ((item >= ITEM_MEDALLION_FOREST) && (item <= ITEM_MEDALLION_LIGHT)) - { + if ((item >= ITEM_MEDALLION_FOREST) && (item <= ITEM_MEDALLION_LIGHT)) { gSaveContext.quest_items |= gBitFlags[item - ITEM_MEDALLION_FOREST]; osSyncPrintf(VT_FGCOL(YELLOW)); @@ -1422,27 +1337,24 @@ u8 Item_Give(GlobalContext* globalCtx, u8 item) osSyncPrintf("封印 = %x\n", gSaveContext.quest_items); osSyncPrintf(VT_RST); - if (item == ITEM_MEDALLION_WATER) + if (item == ITEM_MEDALLION_WATER) { func_8006D0AC(globalCtx); + } return ITEM_NONE; - } - else if ((item >= ITEM_SONG_MINUET) && (item <= ITEM_SONG_STORMS)) - { + } else if ((item >= ITEM_SONG_MINUET) && (item <= ITEM_SONG_STORMS)) { gSaveContext.quest_items |= gBitFlags[item - ITEM_SONG_MINUET + 6]; osSyncPrintf(VT_FGCOL(YELLOW)); // Translates to: "Musical scores = %x" osSyncPrintf("楽譜 = %x\n", gSaveContext.quest_items); // Translates to: "Musical scores = %x (%x) (%x)" - osSyncPrintf("楽譜 = %x (%x) (%x)\n", gSaveContext.quest_items, - gBitFlags[item - ITEM_SONG_MINUET + 6], gBitFlags[item - ITEM_SONG_MINUET]); + osSyncPrintf("楽譜 = %x (%x) (%x)\n", gSaveContext.quest_items, gBitFlags[item - ITEM_SONG_MINUET + 6], + gBitFlags[item - ITEM_SONG_MINUET]); osSyncPrintf(VT_RST); return ITEM_NONE; - } - else if ((item >= ITEM_KOKIRI_EMERALD) && (item <= ITEM_ZORA_SAPPHIRE)) - { + } else if ((item >= ITEM_KOKIRI_EMERALD) && (item <= ITEM_ZORA_SAPPHIRE)) { gSaveContext.quest_items |= gBitFlags[item - ITEM_KOKIRI_EMERALD + 18]; osSyncPrintf(VT_FGCOL(YELLOW)); @@ -1451,9 +1363,7 @@ u8 Item_Give(GlobalContext* globalCtx, u8 item) osSyncPrintf(VT_RST); return ITEM_NONE; - } - else if ((item == ITEM_STONE_OF_AGONY) || (item == ITEM_GERUDO_CARD)) - { + } else if ((item == ITEM_STONE_OF_AGONY) || (item == ITEM_GERUDO_CARD)) { gSaveContext.quest_items |= gBitFlags[item - ITEM_STONE_OF_AGONY + 21]; osSyncPrintf(VT_FGCOL(YELLOW)); @@ -1462,9 +1372,7 @@ u8 Item_Give(GlobalContext* globalCtx, u8 item) osSyncPrintf(VT_RST); return ITEM_NONE; - } - else if (item == ITEM_SKULL_TOKEN) - { + } else if (item == ITEM_SKULL_TOKEN) { gSaveContext.quest_items |= gBitFlags[item - ITEM_SKULL_TOKEN + 23]; gSaveContext.gs_tokens++; @@ -1474,27 +1382,20 @@ u8 Item_Give(GlobalContext* globalCtx, u8 item) osSyncPrintf(VT_RST); return ITEM_NONE; - } - else if ((item >= ITEM_SWORD_KOKIRI) && (item <= ITEM_SWORD_BGS)) - { + } else if ((item >= ITEM_SWORD_KOKIRI) && (item <= ITEM_SWORD_BGS)) { gSaveContext.equipment |= gBitFlags[item - ITEM_SWORD_KOKIRI] << gEquipShifts[EQUIP_SWORD]; - if (item == ITEM_SWORD_BGS) - { + if (item == ITEM_SWORD_BGS) { gSaveContext.bgs_hits_left = 8; - if (ALL_EQUIP_VALUE(EQUIP_SWORD) == 0xF) - { + if (ALL_EQUIP_VALUE(EQUIP_SWORD) == 0xF) { gSaveContext.equipment ^= 8 << gEquipShifts[EQUIP_SWORD]; - if (gSaveContext.equips.button_items[0] == ITEM_SWORD_KNIFE) - { + if (gSaveContext.equips.button_items[0] == ITEM_SWORD_KNIFE) { gSaveContext.equips.button_items[0] = ITEM_SWORD_BGS; Interface_LoadItemIcon1(globalCtx, 0); } } - } - else if (item == ITEM_SWORD_MASTER) - { + } else if (item == ITEM_SWORD_MASTER) { gSaveContext.equips.button_items[0] = ITEM_SWORD_MASTER; gSaveContext.equips.equipment &= 0xFFF0; gSaveContext.equips.equipment |= 0x0002; @@ -1502,481 +1403,353 @@ u8 Item_Give(GlobalContext* globalCtx, u8 item) } return ITEM_NONE; - } - else if ((item >= ITEM_SHIELD_DEKU) && (item <= ITEM_SHIELD_MIRROR)) - { + } else if ((item >= ITEM_SHIELD_DEKU) && (item <= ITEM_SHIELD_MIRROR)) { gSaveContext.equipment |= (gBitFlags[item - ITEM_SHIELD_DEKU] << gEquipShifts[EQUIP_SHIELD]); return ITEM_NONE; - } - else if ((item >= ITEM_TUNIC_KOKIRI) && (item <= ITEM_TUNIC_ZORA)) - { + } else if ((item >= ITEM_TUNIC_KOKIRI) && (item <= ITEM_TUNIC_ZORA)) { gSaveContext.equipment |= (gBitFlags[item - ITEM_TUNIC_KOKIRI] << gEquipShifts[EQUIP_TUNIC]); return ITEM_NONE; - } - else if ((item >= ITEM_BOOTS_KOKIRI) && (item <= ITEM_BOOTS_HOVER)) - { + } else if ((item >= ITEM_BOOTS_KOKIRI) && (item <= ITEM_BOOTS_HOVER)) { gSaveContext.equipment |= (gBitFlags[item - ITEM_BOOTS_KOKIRI] << gEquipShifts[EQUIP_BOOTS]); return ITEM_NONE; - } - else if ((item == ITEM_KEY_BOSS) || (item == ITEM_COMPASS) || (item == ITEM_DUNGEON_MAP)) - { + } else if ((item == ITEM_KEY_BOSS) || (item == ITEM_COMPASS) || (item == ITEM_DUNGEON_MAP)) { gSaveContext.dungeon_items[gSaveContext.dungeon_index] |= gBitFlags[item - ITEM_KEY_BOSS]; return ITEM_NONE; - } - else if (item == ITEM_KEY_SMALL) - { - if (gSaveContext.dungeon_keys[gSaveContext.dungeon_index] < 0) - { + } else if (item == ITEM_KEY_SMALL) { + if (gSaveContext.dungeon_keys[gSaveContext.dungeon_index] < 0) { gSaveContext.dungeon_keys[gSaveContext.dungeon_index] = 1; return ITEM_NONE; - } - else - { + } else { gSaveContext.dungeon_keys[gSaveContext.dungeon_index]++; return ITEM_NONE; } - } - else if ((item == ITEM_QUIVER_30) || (item == ITEM_BOW)) - { - if (CUR_UPG_VALUE(UPG_QUIVER) == 0) - { + } else if ((item == ITEM_QUIVER_30) || (item == ITEM_BOW)) { + if (CUR_UPG_VALUE(UPG_QUIVER) == 0) { Inventory_ChangeUpgrade(UPG_QUIVER, 1); INV_CONTENT(ITEM_BOW) = ITEM_BOW; AMMO(ITEM_BOW) = CAPACITY(UPG_QUIVER, 1); return ITEM_NONE; - } - else - { + } else { AMMO(ITEM_BOW)++; - if (AMMO(ITEM_BOW) > CUR_CAPACITY(UPG_QUIVER)) + if (AMMO(ITEM_BOW) > CUR_CAPACITY(UPG_QUIVER)) { AMMO(ITEM_BOW) = CUR_CAPACITY(UPG_QUIVER); + } } - } - else if (item == ITEM_QUIVER_40) - { + } else if (item == ITEM_QUIVER_40) { Inventory_ChangeUpgrade(UPG_QUIVER, 2); AMMO(ITEM_BOW) = CAPACITY(UPG_QUIVER, 2); return ITEM_NONE; - } - else if (item == ITEM_QUIVER_50) - { + } else if (item == ITEM_QUIVER_50) { Inventory_ChangeUpgrade(UPG_QUIVER, 3); AMMO(ITEM_BOW) = CAPACITY(UPG_QUIVER, 3); return ITEM_NONE; - } - else if (item == ITEM_BULLET_BAG_40) - { + } else if (item == ITEM_BULLET_BAG_40) { Inventory_ChangeUpgrade(UPG_BULLET_BAG, 2); AMMO(ITEM_SLINGSHOT) = CAPACITY(UPG_BULLET_BAG, 2); return ITEM_NONE; - } - else if (item == ITEM_BULLET_BAG_50) - { + } else if (item == ITEM_BULLET_BAG_50) { Inventory_ChangeUpgrade(UPG_BULLET_BAG, 3); AMMO(ITEM_SLINGSHOT) = CAPACITY(UPG_BULLET_BAG, 3); return ITEM_NONE; - } - else if (item == ITEM_BOMB_BAG_20) - { - if (CUR_UPG_VALUE(UPG_BOMB_BAG) == 0) - { + } else if (item == ITEM_BOMB_BAG_20) { + if (CUR_UPG_VALUE(UPG_BOMB_BAG) == 0) { Inventory_ChangeUpgrade(UPG_BOMB_BAG, 1); INV_CONTENT(ITEM_BOMB) = ITEM_BOMB; AMMO(ITEM_BOMB) = CAPACITY(UPG_BOMB_BAG, 1); return ITEM_NONE; - } - else - { + } else { AMMO(ITEM_BOMB)++; - if (AMMO(ITEM_BOMB) > CUR_CAPACITY(UPG_BOMB_BAG)) + if (AMMO(ITEM_BOMB) > CUR_CAPACITY(UPG_BOMB_BAG)) { AMMO(ITEM_BOMB) = CUR_CAPACITY(UPG_BOMB_BAG); + } } - } - else if (item == ITEM_BOMB_BAG_30) - { + } else if (item == ITEM_BOMB_BAG_30) { Inventory_ChangeUpgrade(UPG_BOMB_BAG, 2); AMMO(ITEM_BOMB) = CAPACITY(UPG_BOMB_BAG, 2); return ITEM_NONE; - } - else if (item == ITEM_BOMB_BAG_40) - { + } else if (item == ITEM_BOMB_BAG_40) { Inventory_ChangeUpgrade(UPG_BOMB_BAG, 3); AMMO(ITEM_BOMB) = CAPACITY(UPG_BOMB_BAG, 3); return ITEM_NONE; - } - else if (item == ITEM_BRACELET) - { + } else if (item == ITEM_BRACELET) { Inventory_ChangeUpgrade(UPG_STRENGTH, 1); return ITEM_NONE; - } - else if (item == ITEM_GAUNTLETS_SILVER) - { + } else if (item == ITEM_GAUNTLETS_SILVER) { Inventory_ChangeUpgrade(UPG_STRENGTH, 2); return ITEM_NONE; - } - else if (item == ITEM_GAUNTLETS_GOLD) - { + } else if (item == ITEM_GAUNTLETS_GOLD) { Inventory_ChangeUpgrade(UPG_STRENGTH, 3); return ITEM_NONE; - } - else if (item == ITEM_SCALE_SILVER) - { + } else if (item == ITEM_SCALE_SILVER) { Inventory_ChangeUpgrade(UPG_SCALE, 1); return ITEM_NONE; - } - else if (item == ITEM_SCALE_GOLDEN) - { + } else if (item == ITEM_SCALE_GOLDEN) { Inventory_ChangeUpgrade(UPG_SCALE, 2); return ITEM_NONE; - } - else if (item == ITEM_WALLET_ADULT) - { + } else if (item == ITEM_WALLET_ADULT) { Inventory_ChangeUpgrade(UPG_WALLET, 1); return ITEM_NONE; - } - else if (item == ITEM_WALLET_GIANT) - { + } else if (item == ITEM_WALLET_GIANT) { Inventory_ChangeUpgrade(UPG_WALLET, 2); return ITEM_NONE; - } - else if (item == ITEM_STICK_UPGRADE_20) - { - if (gSaveContext.items[slot] == ITEM_NONE) + } else if (item == ITEM_STICK_UPGRADE_20) { + if (gSaveContext.items[slot] == ITEM_NONE) { INV_CONTENT(ITEM_STICK) = ITEM_STICK; + } Inventory_ChangeUpgrade(UPG_STICKS, 2); AMMO(ITEM_STICK) = CAPACITY(UPG_STICKS, 2); return ITEM_NONE; - } - else if (item == ITEM_STICK_UPGRADE_30) - { - if (gSaveContext.items[slot] == ITEM_NONE) + } else if (item == ITEM_STICK_UPGRADE_30) { + if (gSaveContext.items[slot] == ITEM_NONE) { INV_CONTENT(ITEM_STICK) = ITEM_STICK; + } Inventory_ChangeUpgrade(UPG_STICKS, 3); AMMO(ITEM_STICK) = CAPACITY(UPG_STICKS, 3); return ITEM_NONE; - } - else if (item == ITEM_NUT_UPGRADE_30) - { - if (gSaveContext.items[slot] == ITEM_NONE) + } else if (item == ITEM_NUT_UPGRADE_30) { + if (gSaveContext.items[slot] == ITEM_NONE) { INV_CONTENT(ITEM_NUT) = ITEM_NUT; + } Inventory_ChangeUpgrade(UPG_NUTS, 2); AMMO(ITEM_NUT) = CAPACITY(UPG_NUTS, 2); return ITEM_NONE; - } - else if (item == ITEM_NUT_UPGRADE_40) - { - if (gSaveContext.items[slot] == ITEM_NONE) + } else if (item == ITEM_NUT_UPGRADE_40) { + if (gSaveContext.items[slot] == ITEM_NONE) { INV_CONTENT(ITEM_NUT) = ITEM_NUT; + } Inventory_ChangeUpgrade(UPG_NUTS, 3); AMMO(ITEM_NUT) = CAPACITY(UPG_NUTS, 3); return ITEM_NONE; - } - else if (item == ITEM_LONGSHOT) - { + } else if (item == ITEM_LONGSHOT) { INV_CONTENT(item) = item; - for (i = 1; i < 4; i++) - { - if (gSaveContext.equips.button_items[i] == ITEM_HOOKSHOT) - { + for (i = 1; i < 4; i++) { + if (gSaveContext.equips.button_items[i] == ITEM_HOOKSHOT) { gSaveContext.equips.button_items[i] = ITEM_LONGSHOT; Interface_LoadItemIcon1(globalCtx, i); } } return ITEM_NONE; - } - else if (item == ITEM_STICK) - { - if (gSaveContext.items[slot] == ITEM_NONE) - { + } else if (item == ITEM_STICK) { + if (gSaveContext.items[slot] == ITEM_NONE) { Inventory_ChangeUpgrade(UPG_STICKS, 1); AMMO(ITEM_STICK) = 1; - } - else - { + } else { AMMO(ITEM_STICK)++; - if (AMMO(ITEM_STICK) > CUR_CAPACITY(UPG_STICKS)) + if (AMMO(ITEM_STICK) > CUR_CAPACITY(UPG_STICKS)) { AMMO(ITEM_STICK) = CUR_CAPACITY(UPG_STICKS); + } } - } - else if ((item == ITEM_STICKS_5) || (item == ITEM_STICKS_10)) - { - if (gSaveContext.items[slot] == ITEM_NONE) - { + } else if ((item == ITEM_STICKS_5) || (item == ITEM_STICKS_10)) { + if (gSaveContext.items[slot] == ITEM_NONE) { Inventory_ChangeUpgrade(UPG_STICKS, 1); AMMO(ITEM_STICK) = sAmmoRefillCounts[item - ITEM_STICKS_5]; - } - else - { + } else { AMMO(ITEM_STICK) += sAmmoRefillCounts[item - ITEM_STICKS_5]; - if (AMMO(ITEM_STICK) > CUR_CAPACITY(UPG_STICKS)) + if (AMMO(ITEM_STICK) > CUR_CAPACITY(UPG_STICKS)) { AMMO(ITEM_STICK) = CUR_CAPACITY(UPG_STICKS); + } } item = ITEM_STICK; - } - else if (item == ITEM_NUT) - { - if (gSaveContext.items[slot] == ITEM_NONE) - { + } else if (item == ITEM_NUT) { + if (gSaveContext.items[slot] == ITEM_NONE) { Inventory_ChangeUpgrade(UPG_NUTS, 1); AMMO(ITEM_NUT) = ITEM_NUT; - } - else - { + } else { AMMO(ITEM_NUT)++; - if (AMMO(ITEM_NUT) > CUR_CAPACITY(UPG_NUTS)) + if (AMMO(ITEM_NUT) > CUR_CAPACITY(UPG_NUTS)) { AMMO(ITEM_NUT) = CUR_CAPACITY(UPG_NUTS); + } } - } - else if ((item == ITEM_NUTS_5) || (item == ITEM_NUTS_10)) - { - if (gSaveContext.items[slot] == ITEM_NONE) - { + } else if ((item == ITEM_NUTS_5) || (item == ITEM_NUTS_10)) { + if (gSaveContext.items[slot] == ITEM_NONE) { Inventory_ChangeUpgrade(UPG_NUTS, 1); AMMO(ITEM_NUT) += sAmmoRefillCounts[item - ITEM_NUTS_5]; // Translates to: "Deku Nuts %d(%d)=%d BS_count=%d" - osSyncPrintf("デクの実 %d(%d)=%d BS_count=%d\n", - item, ITEM_NUTS_5, item - ITEM_NUTS_5, sAmmoRefillCounts[item - ITEM_NUTS_5]); - } - else - { + osSyncPrintf("デクの実 %d(%d)=%d BS_count=%d\n", item, ITEM_NUTS_5, item - ITEM_NUTS_5, + sAmmoRefillCounts[item - ITEM_NUTS_5]); + } else { AMMO(ITEM_NUT) += sAmmoRefillCounts[item - ITEM_NUTS_5]; - if (AMMO(ITEM_NUT) > CUR_CAPACITY(UPG_NUTS)) + if (AMMO(ITEM_NUT) > CUR_CAPACITY(UPG_NUTS)) { AMMO(ITEM_NUT) = CUR_CAPACITY(UPG_NUTS); + } } item = ITEM_NUT; - } - else if (item == ITEM_BOMB) - { + } else if (item == ITEM_BOMB) { // Translates to: "Bomb Bomb Bomb Bomb Bomb Bomb Bomb" osSyncPrintf(" 爆弾 爆弾 爆弾 爆弾 爆弾 爆弾 爆弾 \n"); bombCount = AMMO(ITEM_BOMB) + 1; AMMO(ITEM_BOMB) = bombCount; - if (bombCount > CUR_CAPACITY(UPG_BOMB_BAG)) + if (bombCount > CUR_CAPACITY(UPG_BOMB_BAG)) { AMMO(ITEM_BOMB) = CUR_CAPACITY(UPG_BOMB_BAG); + } return ITEM_NONE; - } - else if ((item >= ITEM_BOMBS_5) && (item <= ITEM_BOMBS_30)) - { + } else if ((item >= ITEM_BOMBS_5) && (item <= ITEM_BOMBS_30)) { bombCount = AMMO(ITEM_BOMB) + sAmmoRefillCounts[item - ITEM_BOMBS_5]; AMMO(ITEM_BOMB) = bombCount; - if (bombCount > CUR_CAPACITY(UPG_BOMB_BAG)) + if (bombCount > CUR_CAPACITY(UPG_BOMB_BAG)) { AMMO(ITEM_BOMB) = CUR_CAPACITY(UPG_BOMB_BAG); + } return ITEM_NONE; - } - else if (item == ITEM_BOMBCHU) - { - if (gSaveContext.items[slot] == ITEM_NONE) - { + } else if (item == ITEM_BOMBCHU) { + if (gSaveContext.items[slot] == ITEM_NONE) { INV_CONTENT(ITEM_BOMBCHU) = ITEM_BOMBCHU; AMMO(ITEM_BOMBCHU) = 10; return ITEM_NONE; - } - else - { + } else { AMMO(ITEM_BOMBCHU) += 10; - if (AMMO(ITEM_BOMBCHU) > 50) + if (AMMO(ITEM_BOMBCHU) > 50) { AMMO(ITEM_BOMBCHU) = 50; + } return ITEM_NONE; } - } - else if ((item == ITEM_BOMBCHUS_5) || (item == ITEM_BOMBCHUS_20)) - { - if (gSaveContext.items[slot] == ITEM_NONE) - { + } else if ((item == ITEM_BOMBCHUS_5) || (item == ITEM_BOMBCHUS_20)) { + if (gSaveContext.items[slot] == ITEM_NONE) { INV_CONTENT(ITEM_BOMBCHU) = ITEM_BOMBCHU; AMMO(ITEM_BOMBCHU) += sAmmoRefillCounts[item - ITEM_BOMBCHUS_5 + 8]; return ITEM_NONE; - } - else - { + } else { AMMO(ITEM_BOMBCHU) += sAmmoRefillCounts[item - ITEM_BOMBCHUS_5 + 8]; - if (AMMO(ITEM_BOMBCHU) > 50) + if (AMMO(ITEM_BOMBCHU) > 50) { AMMO(ITEM_BOMBCHU) = 50; + } return ITEM_NONE; } - } - else if ((item >= ITEM_ARROWS_SMALL) && (item <= ITEM_ARROWS_LARGE)) - { + } else if ((item >= ITEM_ARROWS_SMALL) && (item <= ITEM_ARROWS_LARGE)) { AMMO(ITEM_BOW) += sAmmoRefillCounts[item - ITEM_ARROWS_SMALL + 4]; - if ((AMMO(ITEM_BOW) >= CUR_CAPACITY(UPG_QUIVER)) || (AMMO(ITEM_BOW) < 0)) + if ((AMMO(ITEM_BOW) >= CUR_CAPACITY(UPG_QUIVER)) || (AMMO(ITEM_BOW) < 0)) { AMMO(ITEM_BOW) = CUR_CAPACITY(UPG_QUIVER); + } osSyncPrintf("%d本 Item_MaxGet=%d\n", AMMO(ITEM_BOW), CUR_CAPACITY(UPG_QUIVER)); return ITEM_BOW; - } - else if (item == ITEM_SLINGSHOT) - { + } else if (item == ITEM_SLINGSHOT) { Inventory_ChangeUpgrade(UPG_BULLET_BAG, 1); INV_CONTENT(ITEM_SLINGSHOT) = ITEM_SLINGSHOT; AMMO(ITEM_SLINGSHOT) = 30; return ITEM_NONE; - } - else if (item == ITEM_SEEDS) - { + } else if (item == ITEM_SEEDS) { AMMO(ITEM_SLINGSHOT) += 5; - if (AMMO(ITEM_SLINGSHOT) >= CUR_CAPACITY(UPG_BULLET_BAG)) + if (AMMO(ITEM_SLINGSHOT) >= CUR_CAPACITY(UPG_BULLET_BAG)) { AMMO(ITEM_SLINGSHOT) = CUR_CAPACITY(UPG_BULLET_BAG); + } - if (!(gSaveContext.item_get_inf[1] & 8)) - { + if (!(gSaveContext.item_get_inf[1] & 8)) { gSaveContext.item_get_inf[1] |= 8; return ITEM_NONE; } return ITEM_SEEDS; - } - else if (item == ITEM_SEEDS_30) - { + } else if (item == ITEM_SEEDS_30) { AMMO(ITEM_SLINGSHOT) += 30; - if (AMMO(ITEM_SLINGSHOT) >= CUR_CAPACITY(UPG_BULLET_BAG)) + if (AMMO(ITEM_SLINGSHOT) >= CUR_CAPACITY(UPG_BULLET_BAG)) { AMMO(ITEM_SLINGSHOT) = CUR_CAPACITY(UPG_BULLET_BAG); + } - if (!(gSaveContext.item_get_inf[1] & 8)) - { + if (!(gSaveContext.item_get_inf[1] & 8)) { gSaveContext.item_get_inf[1] |= 8; return ITEM_NONE; } return ITEM_SEEDS; - } - else if (item == ITEM_OCARINA_FAIRY) - { + } else if (item == ITEM_OCARINA_FAIRY) { INV_CONTENT(ITEM_OCARINA_FAIRY) = ITEM_OCARINA_FAIRY; return ITEM_NONE; - } - else if (item == ITEM_OCARINA_TIME) - { + } else if (item == ITEM_OCARINA_TIME) { INV_CONTENT(ITEM_OCARINA_TIME) = ITEM_OCARINA_TIME; - for (i = 1; i < 4; i++) - { - if (gSaveContext.equips.button_items[i] == ITEM_OCARINA_FAIRY) - { + for (i = 1; i < 4; i++) { + if (gSaveContext.equips.button_items[i] == ITEM_OCARINA_FAIRY) { gSaveContext.equips.button_items[i] = ITEM_OCARINA_TIME; Interface_LoadItemIcon1(globalCtx, i); } } return ITEM_NONE; - } - else if (item == ITEM_BEAN) - { - if (gSaveContext.items[slot] == ITEM_NONE) - { + } else if (item == ITEM_BEAN) { + if (gSaveContext.items[slot] == ITEM_NONE) { INV_CONTENT(item) = item; AMMO(ITEM_BEAN) = 1; BEANS_BOUGHT = 1; - } - else - { + } else { AMMO(ITEM_BEAN)++; BEANS_BOUGHT++; } return ITEM_NONE; - } - else if ((item == ITEM_HEART_PIECE_2) || (item == ITEM_HEART_PIECE)) - { + } else if ((item == ITEM_HEART_PIECE_2) || (item == ITEM_HEART_PIECE)) { gSaveContext.quest_items += 0x10000000; return ITEM_NONE; - } - else if (item == ITEM_HEART_CONTAINER) - { + } else if (item == ITEM_HEART_CONTAINER) { gSaveContext.health_capacity += 0x10; gSaveContext.health += 0x10; return ITEM_NONE; - } - else if (item == ITEM_HEART) - { + } else if (item == ITEM_HEART) { // Translates to: "Recovery Heart" osSyncPrintf("回復ハート回復ハート回復ハート\n"); Health_ChangeBy(globalCtx, 0x10); return item; - } - else if (item == ITEM_MAGIC_SMALL) - { - if (gSaveContext.unk_13F0 != 10) + } else if (item == ITEM_MAGIC_SMALL) { + if (gSaveContext.unk_13F0 != 10) { func_80087680(globalCtx); + } func_80087708(globalCtx, 12, 5); - if (!(gSaveContext.inf_table[25] & 0x100)) - { + if (!(gSaveContext.inf_table[25] & 0x100)) { gSaveContext.inf_table[25] |= 0x100; return ITEM_NONE; } return item; - } - else if (item == ITEM_MAGIC_LARGE) - { - if (gSaveContext.unk_13F0 != 10) + } else if (item == ITEM_MAGIC_LARGE) { + if (gSaveContext.unk_13F0 != 10) { func_80087680(globalCtx); + } func_80087708(globalCtx, 24, 5); - if (!(gSaveContext.inf_table[25] & 0x100)) - { + if (!(gSaveContext.inf_table[25] & 0x100)) { gSaveContext.inf_table[25] |= 0x100; return ITEM_NONE; } return item; - } - else if ((item >= ITEM_RUPEE_GREEN) && (item <= ITEM_INVALID_8)) - { + } else if ((item >= ITEM_RUPEE_GREEN) && (item <= ITEM_INVALID_8)) { Rupees_ChangeBy(sAmmoRefillCounts[item - ITEM_RUPEE_GREEN + 10]); return ITEM_NONE; - } - else if (item == ITEM_BOTTLE) - { - for (i = 0; i < 4; i++) - { - if (gSaveContext.items[SLOT(item) + i] == ITEM_NONE) - { + } else if (item == ITEM_BOTTLE) { + for (i = 0; i < 4; i++) { + if (gSaveContext.items[SLOT(item) + i] == ITEM_NONE) { gSaveContext.items[SLOT(item) + i] = item; return ITEM_NONE; } } - } - else if (((item >= ITEM_POTION_RED) && (item <= ITEM_POE)) || (item == ITEM_MILK)) - { + } else if (((item >= ITEM_POTION_RED) && (item <= ITEM_POE)) || (item == ITEM_MILK)) { bottleSlot = SLOT(item); - if ((item != ITEM_MILK_BOTTLE) && (item != ITEM_LETTER_RUTO)) - { - if (item == ITEM_MILK) - { + if ((item != ITEM_MILK_BOTTLE) && (item != ITEM_LETTER_RUTO)) { + if (item == ITEM_MILK) { item = ITEM_MILK_BOTTLE; bottleSlot = SLOT(item); } - for (i = 0; i < 4; i++) - { - if (gSaveContext.items[bottleSlot + i] == ITEM_BOTTLE) - { + for (i = 0; i < 4; i++) { + if (gSaveContext.items[bottleSlot + i] == ITEM_BOTTLE) { // Translates to: "Item_Pt(1)=%d Item_Pt(2)=%d Item_Pt(3)=%d Empty Bottle=%d Content=%d" osSyncPrintf("Item_Pt(1)=%d Item_Pt(2)=%d Item_Pt(3)=%d 空瓶=%d 中味=%d\n", - gSaveContext.equips.c_button_slots[0], - gSaveContext.equips.c_button_slots[1], - gSaveContext.equips.c_button_slots[2], - bottleSlot + i, item); + gSaveContext.equips.c_button_slots[0], gSaveContext.equips.c_button_slots[1], + gSaveContext.equips.c_button_slots[2], bottleSlot + i, item); - if ((bottleSlot + i) == gSaveContext.equips.c_button_slots[0]) - { + if ((bottleSlot + i) == gSaveContext.equips.c_button_slots[0]) { gSaveContext.equips.button_items[1] = item; Interface_LoadItemIcon2(globalCtx, 1); gSaveContext.button_status[1] = BTN_ENABLED; - } - else if ((bottleSlot + i) == gSaveContext.equips.c_button_slots[1]) - { + } else if ((bottleSlot + i) == gSaveContext.equips.c_button_slots[1]) { gSaveContext.equips.button_items[2] = item; Interface_LoadItemIcon2(globalCtx, 2); gSaveContext.button_status[2] = BTN_ENABLED; - } - else if ((bottleSlot + i) == gSaveContext.equips.c_button_slots[2]) - { + } else if ((bottleSlot + i) == gSaveContext.equips.c_button_slots[2]) { gSaveContext.equips.button_items[3] = item; Interface_LoadItemIcon1(globalCtx, 3); gSaveContext.button_status[3] = BTN_ENABLED; @@ -1986,40 +1759,29 @@ u8 Item_Give(GlobalContext* globalCtx, u8 item) return ITEM_NONE; } } - } - else - { - for (i = 0; i < 4; i++) - { - if (gSaveContext.items[bottleSlot + i] == ITEM_NONE) - { + } else { + for (i = 0; i < 4; i++) { + if (gSaveContext.items[bottleSlot + i] == ITEM_NONE) { gSaveContext.items[bottleSlot + i] = item; return ITEM_NONE; } } } - } - else if ((item >= ITEM_WEIRD_EGG) && (item <= ITEM_CLAIM_CHECK)) - { - if (item == ITEM_SAW) + } else if ((item >= ITEM_WEIRD_EGG) && (item <= ITEM_CLAIM_CHECK)) { + if (item == ITEM_SAW) { gSaveContext.item_get_inf[1] |= 0x8000; + } prevTradeItem = INV_CONTENT(item); INV_CONTENT(item) = item; - if (prevTradeItem != ITEM_NONE) - { - for (i = 1; i < 4; i++) - { - if (prevTradeItem == gSaveContext.equips.button_items[i]) - { - if (item != ITEM_SOLD_OUT) - { + if (prevTradeItem != ITEM_NONE) { + for (i = 1; i < 4; i++) { + if (prevTradeItem == gSaveContext.equips.button_items[i]) { + if (item != ITEM_SOLD_OUT) { gSaveContext.equips.button_items[i] = item; Interface_LoadItemIcon1(globalCtx, i); - } - else - { + } else { gSaveContext.equips.button_items[i] = ITEM_NONE; } return ITEM_NONE; @@ -2040,222 +1802,166 @@ u8 Item_Give(GlobalContext* globalCtx, u8 item) #pragma GLOBAL_ASM("asm/non_matchings/code/z_parameter/Item_Give.s") #endif -u8 Item_CheckObtainability(u8 item) -{ +u8 Item_CheckObtainability(u8 item) { s16 i; s16 slot; s32 bottleSlot; slot = SLOT(item); - if (item >= ITEM_STICKS_5) + if (item >= ITEM_STICKS_5) { slot = SLOT(sExtraItemBases[item - ITEM_STICKS_5]); + } osSyncPrintf(VT_FGCOL(GREEN)); osSyncPrintf("item_get_non_setting=%d pt=%d z=%x\n", item, slot, gSaveContext.items[slot]); osSyncPrintf(VT_RST); - if ((item >= ITEM_MEDALLION_FOREST) && (item <= ITEM_MEDALLION_LIGHT)) - { + if ((item >= ITEM_MEDALLION_FOREST) && (item <= ITEM_MEDALLION_LIGHT)) { return ITEM_NONE; - } - else if ((item >= ITEM_KOKIRI_EMERALD) && (item <= ITEM_SKULL_TOKEN)) - { + } else if ((item >= ITEM_KOKIRI_EMERALD) && (item <= ITEM_SKULL_TOKEN)) { return ITEM_NONE; - } - else if ((item >= ITEM_SWORD_KOKIRI) && (item <= ITEM_SWORD_BGS)) - { - if (item == ITEM_SWORD_BGS) + } else if ((item >= ITEM_SWORD_KOKIRI) && (item <= ITEM_SWORD_BGS)) { + if (item == ITEM_SWORD_BGS) { return ITEM_NONE; - else if ((gBitFlags[item - ITEM_SWORD_KOKIRI] << gEquipShifts[EQUIP_SWORD]) & gSaveContext.equipment) + } else if ((gBitFlags[item - ITEM_SWORD_KOKIRI] << gEquipShifts[EQUIP_SWORD]) & gSaveContext.equipment) { return item; - else + } else { return ITEM_NONE; - } - else if ((item >= ITEM_SHIELD_DEKU) && (item <= ITEM_SHIELD_MIRROR)) - { - if ((gBitFlags[item - ITEM_SHIELD_DEKU] << gEquipShifts[EQUIP_SHIELD]) & gSaveContext.equipment) + } + } else if ((item >= ITEM_SHIELD_DEKU) && (item <= ITEM_SHIELD_MIRROR)) { + if ((gBitFlags[item - ITEM_SHIELD_DEKU] << gEquipShifts[EQUIP_SHIELD]) & gSaveContext.equipment) { return item; - else + } else { return ITEM_NONE; - } - else if ((item >= ITEM_TUNIC_KOKIRI) && (item <= ITEM_TUNIC_ZORA)) - { - if ((gBitFlags[item - ITEM_TUNIC_KOKIRI] << gEquipShifts[EQUIP_TUNIC]) & gSaveContext.equipment) + } + } else if ((item >= ITEM_TUNIC_KOKIRI) && (item <= ITEM_TUNIC_ZORA)) { + if ((gBitFlags[item - ITEM_TUNIC_KOKIRI] << gEquipShifts[EQUIP_TUNIC]) & gSaveContext.equipment) { return item; - else + } else { return ITEM_NONE; - } - else if ((item >= ITEM_BOOTS_KOKIRI) && (item <= ITEM_BOOTS_HOVER)) - { - if ((gBitFlags[item - ITEM_BOOTS_KOKIRI] << gEquipShifts[EQUIP_BOOTS]) & gSaveContext.equipment) + } + } else if ((item >= ITEM_BOOTS_KOKIRI) && (item <= ITEM_BOOTS_HOVER)) { + if ((gBitFlags[item - ITEM_BOOTS_KOKIRI] << gEquipShifts[EQUIP_BOOTS]) & gSaveContext.equipment) { return item; - else + } else { return ITEM_NONE; - } - else if ((item == ITEM_KEY_BOSS) || (item == ITEM_COMPASS) || (item == ITEM_DUNGEON_MAP)) - { + } + } else if ((item == ITEM_KEY_BOSS) || (item == ITEM_COMPASS) || (item == ITEM_DUNGEON_MAP)) { return ITEM_NONE; - } - else if (item == ITEM_KEY_SMALL) - { + } else if (item == ITEM_KEY_SMALL) { return ITEM_NONE; - } - else if ((item >= ITEM_SLINGSHOT) && (item <= ITEM_BOMBCHU)) - { + } else if ((item >= ITEM_SLINGSHOT) && (item <= ITEM_BOMBCHU)) { return ITEM_NONE; - } - else if ((item == ITEM_BOMBCHUS_5) || (item == ITEM_BOMBCHUS_20)) - { + } else if ((item == ITEM_BOMBCHUS_5) || (item == ITEM_BOMBCHUS_20)) { return ITEM_NONE; - } - else if ((item == ITEM_QUIVER_30) || (item == ITEM_BOW)) - { - if (CUR_UPG_VALUE(UPG_QUIVER) == 0) + } else if ((item == ITEM_QUIVER_30) || (item == ITEM_BOW)) { + if (CUR_UPG_VALUE(UPG_QUIVER) == 0) { return ITEM_NONE; - else + } else { return 0; - } - else if ((item == ITEM_QUIVER_40) || (item == ITEM_QUIVER_50)) - { + } + } else if ((item == ITEM_QUIVER_40) || (item == ITEM_QUIVER_50)) { return ITEM_NONE; - } - else if ((item == ITEM_BULLET_BAG_40) || (item == ITEM_BULLET_BAG_50)) - { + } else if ((item == ITEM_BULLET_BAG_40) || (item == ITEM_BULLET_BAG_50)) { return ITEM_NONE; - } - else if ((item == ITEM_BOMB_BAG_20) || (item == ITEM_BOMB)) - { - if (CUR_UPG_VALUE(UPG_BOMB_BAG) == 0) + } else if ((item == ITEM_BOMB_BAG_20) || (item == ITEM_BOMB)) { + if (CUR_UPG_VALUE(UPG_BOMB_BAG) == 0) { return ITEM_NONE; - else + } else { return 0; - } - else if ((item >= ITEM_STICK_UPGRADE_20) && (item <= ITEM_NUT_UPGRADE_40)) - { + } + } else if ((item >= ITEM_STICK_UPGRADE_20) && (item <= ITEM_NUT_UPGRADE_40)) { return ITEM_NONE; - } - else if ((item >= ITEM_BOMB_BAG_30) && (item <= ITEM_WALLET_GIANT)) - { + } else if ((item >= ITEM_BOMB_BAG_30) && (item <= ITEM_WALLET_GIANT)) { return ITEM_NONE; - } - else if (item == ITEM_LONGSHOT) - { + } else if (item == ITEM_LONGSHOT) { return ITEM_NONE; - } - else if ((item == ITEM_SEEDS) || (item == ITEM_SEEDS_30)) - { - if (!(gSaveContext.item_get_inf[1] & 0x8)) + } else if ((item == ITEM_SEEDS) || (item == ITEM_SEEDS_30)) { + if (!(gSaveContext.item_get_inf[1] & 0x8)) { return ITEM_NONE; - else + } else { return ITEM_SEEDS; - } - else if (item == ITEM_BEAN) - { + } + } else if (item == ITEM_BEAN) { return ITEM_NONE; - } - else if ((item == ITEM_HEART_PIECE_2) || (item == ITEM_HEART_PIECE)) - { + } else if ((item == ITEM_HEART_PIECE_2) || (item == ITEM_HEART_PIECE)) { return ITEM_NONE; - } - else if (item == ITEM_HEART_CONTAINER) - { + } else if (item == ITEM_HEART_CONTAINER) { return ITEM_NONE; - } - else if (item == ITEM_HEART) - { + } else if (item == ITEM_HEART) { return ITEM_HEART; - } - else if ((item == ITEM_MAGIC_SMALL) || (item == ITEM_MAGIC_LARGE)) - { + } else if ((item == ITEM_MAGIC_SMALL) || (item == ITEM_MAGIC_LARGE)) { // Translates to: "Magic Pot Get_Inf_Table( 25, 0x0100)=%d" osSyncPrintf("魔法の壷 Get_Inf_Table( 25, 0x0100)=%d\n", gSaveContext.inf_table[25] & 0x100); - if (!(gSaveContext.inf_table[25] & 0x100)) + if (!(gSaveContext.inf_table[25] & 0x100)) { return ITEM_NONE; - else + } else { return item; - } - else if ((item >= ITEM_RUPEE_GREEN) && (item <= ITEM_INVALID_8)) - { + } + } else if ((item >= ITEM_RUPEE_GREEN) && (item <= ITEM_INVALID_8)) { return ITEM_NONE; - } - else if (item == ITEM_BOTTLE) - { + } else if (item == ITEM_BOTTLE) { return ITEM_NONE; - } - else if (((item >= ITEM_POTION_RED) && (item <= ITEM_POE)) || (item == ITEM_MILK)) - { + } else if (((item >= ITEM_POTION_RED) && (item <= ITEM_POE)) || (item == ITEM_MILK)) { bottleSlot = SLOT(item); - if ((item != ITEM_MILK_BOTTLE) && (item != ITEM_LETTER_RUTO)) - { - if (item == ITEM_MILK) - { + if ((item != ITEM_MILK_BOTTLE) && (item != ITEM_LETTER_RUTO)) { + if (item == ITEM_MILK) { item = ITEM_MILK_BOTTLE; bottleSlot = SLOT(item); } - for (i = 0; i < 4; i++) - { - if (gSaveContext.items[bottleSlot + i] == ITEM_BOTTLE) + for (i = 0; i < 4; i++) { + if (gSaveContext.items[bottleSlot + i] == ITEM_BOTTLE) { return ITEM_NONE; + } + } + } else { + for (i = 0; i < 4; i++) { + if (gSaveContext.items[bottleSlot + i] == ITEM_NONE) { + return ITEM_NONE; + } } } - else - { - for (i = 0; i < 4; i++) - { - if (gSaveContext.items[bottleSlot + i] == ITEM_NONE) - return ITEM_NONE; - } - } - } - else if ((item >= ITEM_WEIRD_EGG) && (item <= ITEM_CLAIM_CHECK)) - { + } else if ((item >= ITEM_WEIRD_EGG) && (item <= ITEM_CLAIM_CHECK)) { return ITEM_NONE; } return gSaveContext.items[slot]; } -void Inventory_DeleteItem(u16 item, u16 invSlot) -{ +void Inventory_DeleteItem(u16 item, u16 invSlot) { s16 i; - if (item == ITEM_BEAN) + if (item == ITEM_BEAN) { BEANS_BOUGHT = 0; // Beans bought + } gSaveContext.items[invSlot] = ITEM_NONE; osSyncPrintf("\nItem_Register(%d)\n", invSlot, gSaveContext.items[invSlot]); - for (i = 1; i < 4; i++) - { - if (gSaveContext.equips.button_items[i] == item) - { + for (i = 1; i < 4; i++) { + if (gSaveContext.equips.button_items[i] == item) { gSaveContext.equips.button_items[i] = ITEM_NONE; - gSaveContext.equips.c_button_slots[i-1] = SLOT_NONE; + gSaveContext.equips.c_button_slots[i - 1] = SLOT_NONE; } } } #ifdef NON_MATCHING // regalloc differences -s32 Inventory_ReplaceItem(GlobalContext* globalCtx, u16 oldItem, u16 newItem) -{ +s32 Inventory_ReplaceItem(GlobalContext* globalCtx, u16 oldItem, u16 newItem) { s16 i; s16 j; - for (i = 0; i < ARRAY_COUNT(gSaveContext.items); i++) - { - if (gSaveContext.items[i] == oldItem) - { + for (i = 0; i < ARRAY_COUNT(gSaveContext.items); i++) { + if (gSaveContext.items[i] == oldItem) { gSaveContext.items[i] = newItem; // Translates to: "Item Purge (%d)" osSyncPrintf("アイテム消去(%d)", i); - for (j = 1; j < 4; j++) - { - if (gSaveContext.equips.button_items[j] == oldItem) - { + for (j = 1; j < 4; j++) { + if (gSaveContext.equips.button_items[j] == oldItem) { gSaveContext.equips.button_items[j] = newItem; Interface_LoadItemIcon1(globalCtx, j); break; @@ -2271,54 +1977,55 @@ s32 Inventory_ReplaceItem(GlobalContext* globalCtx, u16 oldItem, u16 newItem) #pragma GLOBAL_ASM("asm/non_matchings/code/z_parameter/Inventory_ReplaceItem.s") #endif -s32 Inventory_HasEmptyBottle(void) -{ +s32 Inventory_HasEmptyBottle(void) { u8* items = gSaveContext.items; - if (items[SLOT_BOTTLE_1] == ITEM_BOTTLE) + if (items[SLOT_BOTTLE_1] == ITEM_BOTTLE) { return 1; - else if (items[SLOT_BOTTLE_2] == ITEM_BOTTLE) + } else if (items[SLOT_BOTTLE_2] == ITEM_BOTTLE) { return 1; - else if (items[SLOT_BOTTLE_3] == ITEM_BOTTLE) + } else if (items[SLOT_BOTTLE_3] == ITEM_BOTTLE) { return 1; - else if (items[SLOT_BOTTLE_4] == ITEM_BOTTLE) + } else if (items[SLOT_BOTTLE_4] == ITEM_BOTTLE) { return 1; - else + } else { return 0; + } } -s32 Inventory_HasSpecificBottle(u8 bottleItem) -{ +s32 Inventory_HasSpecificBottle(u8 bottleItem) { u8* items = gSaveContext.items; - if (items[SLOT_BOTTLE_1] == bottleItem) + if (items[SLOT_BOTTLE_1] == bottleItem) { return 1; - else if (items[SLOT_BOTTLE_2] == bottleItem) + } else if (items[SLOT_BOTTLE_2] == bottleItem) { return 1; - else if (items[SLOT_BOTTLE_3] == bottleItem) + } else if (items[SLOT_BOTTLE_3] == bottleItem) { return 1; - else if (items[SLOT_BOTTLE_4] == bottleItem) + } else if (items[SLOT_BOTTLE_4] == bottleItem) { return 1; - else + } else { return 0; + } } #ifdef NON_MATCHING // save context pointer isn't reused after Interface_LoadItemIcon1 when it should be -void Inventory_UpdateBottleItem(GlobalContext* globalCtx, u8 item, u8 cButton) -{ - osSyncPrintf("item_no=%x, c_no=%x, Pt=%x Item_Register=%x\n", - item, cButton, gSaveContext.equips.c_button_slots[cButton-1], - gSaveContext.items[gSaveContext.equips.c_button_slots[cButton-1]]); +void Inventory_UpdateBottleItem(GlobalContext* globalCtx, u8 item, u8 cButton) { + osSyncPrintf("item_no=%x, c_no=%x, Pt=%x Item_Register=%x\n", item, cButton, + gSaveContext.equips.c_button_slots[cButton - 1], + gSaveContext.items[gSaveContext.equips.c_button_slots[cButton - 1]]); // Special case to only empty half of a Lon Lon Milk Bottle - if ((gSaveContext.items[gSaveContext.equips.c_button_slots[cButton-1]] == ITEM_MILK_BOTTLE) && (item == ITEM_BOTTLE)) + if ((gSaveContext.items[gSaveContext.equips.c_button_slots[cButton - 1]] == ITEM_MILK_BOTTLE) && + (item == ITEM_BOTTLE)) { item = ITEM_MILK_HALF; + } - gSaveContext.items[gSaveContext.equips.c_button_slots[cButton-1]] = item; + gSaveContext.items[gSaveContext.equips.c_button_slots[cButton - 1]] = item; gSaveContext.equips.button_items[cButton] = item; - if (1) ; // Improves codegen but may not be necessary + if (1) {} // Improves codegen but may not be necessary Interface_LoadItemIcon1(globalCtx, cButton); @@ -2331,25 +2038,20 @@ void Inventory_UpdateBottleItem(GlobalContext* globalCtx, u8 item, u8 cButton) #ifdef NON_MATCHING // mostly regalloc, minor ordering, and stack usage differences -s32 Inventory_ConsumeFairy(GlobalContext* globalCtx) -{ +s32 Inventory_ConsumeFairy(GlobalContext* globalCtx) { s32 bottleSlot; s16 i; s16 j; bottleSlot = SLOT(ITEM_FAIRY); - for (i = 0; i < 4; i++) - { - if (gSaveContext.items[bottleSlot + i] == ITEM_FAIRY) - { - for (j = 1; j < 4; j++) - { - if (gSaveContext.equips.button_items[j] == ITEM_FAIRY) - { + for (i = 0; i < 4; i++) { + if (gSaveContext.items[bottleSlot + i] == ITEM_FAIRY) { + for (j = 1; j < 4; j++) { + if (gSaveContext.equips.button_items[j] == ITEM_FAIRY) { gSaveContext.equips.button_items[j] = ITEM_BOTTLE; Interface_LoadItemIcon1(globalCtx, j); - bottleSlot = gSaveContext.equips.c_button_slots[j-1]; + bottleSlot = gSaveContext.equips.c_button_slots[j - 1]; break; } } @@ -2366,12 +2068,10 @@ s32 Inventory_ConsumeFairy(GlobalContext* globalCtx) #pragma GLOBAL_ASM("asm/non_matchings/code/z_parameter/Inventory_ConsumeFairy.s") #endif -void func_80086D5C(s32* buf, u16 size) -{ +void func_80086D5C(s32* buf, u16 size) { u16 i; - for (i = 0; i < size; i++) - { + for (i = 0; i < size; i++) { buf[i] = 0; } } @@ -2380,27 +2080,26 @@ u32 sDoActionTextures[] = { 0x07000000, 0x07000180 }; #ifdef NON_MATCHING // 0x80000000 is reused in the 2 *_TO_VIRTUAL macros when it shouldn't -void Interface_LoadActionLabel(InterfaceContext* interfaceCtx, u16 action, s16 arg2) -{ - if (action >= 0x1D) +void Interface_LoadActionLabel(InterfaceContext* interfaceCtx, u16 action, s16 arg2) { + if (action >= 0x1D) { action = 0x0A; + } - if (gSaveContext.language != 0) + if (gSaveContext.language != 0) { action += 0x1D; + } - if (gSaveContext.language == 2) + if (gSaveContext.language == 2) { action += 0x1D; + } - if ((action != 0x0A) && (action != 0x27) && (action != 0x44)) - { + if ((action != 0x0A) && (action != 0x27) && (action != 0x44)) { osCreateMesgQueue(&interfaceCtx->loadQueue, &interfaceCtx->loadMsg, OS_MESG_BLOCK); DmaMgr_SendRequest2(&interfaceCtx->dmaRequest_160, (u32)interfaceCtx->do_actionSegment + (arg2 * 0x180), - (u32)_do_action_staticSegmentRomStart + (action * 0x180), - 0x180, 0, &interfaceCtx->loadQueue, NULL, "../z_parameter.c", 2145); + (u32)_do_action_staticSegmentRomStart + (action * 0x180), 0x180, 0, + &interfaceCtx->loadQueue, NULL, "../z_parameter.c", 2145); osRecvMesg(&interfaceCtx->loadQueue, NULL, OS_MESG_BLOCK); - } - else - { + } else { gSegments[7] = PHYSICAL_TO_VIRTUAL(interfaceCtx->do_actionSegment); func_80086D5C(SEGMENTED_TO_VIRTUAL(sDoActionTextures[arg2]), 0x180 / 4); } @@ -2410,186 +2109,176 @@ void Interface_LoadActionLabel(InterfaceContext* interfaceCtx, u16 action, s16 a #pragma GLOBAL_ASM("asm/non_matchings/code/z_parameter/Interface_LoadActionLabel.s") #endif -void Interface_SetDoAction(GlobalContext* globalCtx, u16 action) -{ +void Interface_SetDoAction(GlobalContext* globalCtx, u16 action) { InterfaceContext* interfaceCtx = &globalCtx->interfaceCtx; PauseContext* pauseCtx = &globalCtx->pauseCtx; - if (interfaceCtx->unk_1F0 != action) - { + if (interfaceCtx->unk_1F0 != action) { interfaceCtx->unk_1F0 = action; interfaceCtx->unk_1EC = 1; interfaceCtx->unk_1F4 = 0.0f; Interface_LoadActionLabel(interfaceCtx, action, 1); - if (pauseCtx->state != 0) + if (pauseCtx->state != 0) { interfaceCtx->unk_1EC = 3; + } } } -void Interface_SetNaviCall(GlobalContext* globalCtx, u16 naviCallState) -{ +void Interface_SetNaviCall(GlobalContext* globalCtx, u16 naviCallState) { InterfaceContext* interfaceCtx = &globalCtx->interfaceCtx; - if (((naviCallState == 0x1D) || (naviCallState == 0x1E)) && - !interfaceCtx->naviCalling && - (globalCtx->csCtx.state == 0)) - { - // Whitespace matters for codegen here - if (naviCallState == 0x1E) Audio_PlaySoundGeneral(NA_SE_VO_NAVY_CALL, &D_801333D4, 4, &D_801333E0, &D_801333E0, &D_801333E8); - if (naviCallState == 0x1D) func_800F4524(&D_801333D4, NA_SE_VO_NA_HELLO_2, 32); + if (((naviCallState == 0x1D) || (naviCallState == 0x1E)) && !interfaceCtx->naviCalling && + (globalCtx->csCtx.state == 0)) { + // clang-format off + // NOLINTNEXTLINE + if (naviCallState == 0x1E) Audio_PlaySoundGeneral(NA_SE_VO_NAVY_CALL, &D_801333D4, 4, + &D_801333E0, &D_801333E0, &D_801333E8); + // clang-format on + + if (naviCallState == 0x1D) { + func_800F4524(&D_801333D4, NA_SE_VO_NA_HELLO_2, 32); + } interfaceCtx->naviCalling = 1; sCUpInvisible = 0; sCUpTimer = 10; - } - else if ((naviCallState == 0x1F) && - interfaceCtx->naviCalling) - { + } else if ((naviCallState == 0x1F) && interfaceCtx->naviCalling) { interfaceCtx->naviCalling = 0; } } -void Interface_LoadActionLabelB(GlobalContext* globalCtx, u16 action) -{ +void Interface_LoadActionLabelB(GlobalContext* globalCtx, u16 action) { InterfaceContext* interfaceCtx = &globalCtx->interfaceCtx; - if (gSaveContext.language != 0) + if (gSaveContext.language != 0) { action += 0x1D; + } - if (gSaveContext.language == 2) + if (gSaveContext.language == 2) { action += 0x1D; + } interfaceCtx->unk_1FC = action; osCreateMesgQueue(&interfaceCtx->loadQueue, &interfaceCtx->loadMsg, OS_MESG_BLOCK); DmaMgr_SendRequest2(&interfaceCtx->dmaRequest_160, (u32)interfaceCtx->do_actionSegment + 0x180, - (u32)_do_action_staticSegmentRomStart + (action * 0x180), - 0x180, 0, &interfaceCtx->loadQueue, NULL, "../z_parameter.c", 2228); + (u32)_do_action_staticSegmentRomStart + (action * 0x180), 0x180, 0, &interfaceCtx->loadQueue, + NULL, "../z_parameter.c", 2228); osRecvMesg(&interfaceCtx->loadQueue, NULL, OS_MESG_BLOCK); interfaceCtx->unk_1FA = 1; } -s32 Health_ChangeBy(GlobalContext* globalCtx, s16 healthChange) -{ +s32 Health_ChangeBy(GlobalContext* globalCtx, s16 healthChange) { u16 heartCount; u16 healthLevel; // Translates to: "＊＊＊＊＊ Fluctuation=%d (now=%d, max=%d) ＊＊＊" - osSyncPrintf("＊＊＊＊＊ 増減=%d (now=%d, max=%d) ＊＊＊", healthChange, gSaveContext.health, gSaveContext.health_capacity); + osSyncPrintf("＊＊＊＊＊ 増減=%d (now=%d, max=%d) ＊＊＊", healthChange, gSaveContext.health, + gSaveContext.health_capacity); - // Whitespace matters for codegen here - if (healthChange > 0) Audio_PlaySoundGeneral(NA_SE_SY_HP_RECOVER, &D_801333D4, 4, &D_801333E0, &D_801333E0, &D_801333E8); - else if ((gSaveContext.double_defense != 0) && (healthChange < 0)) - { + // clang-format off + // NOLINTNEXTLINE + if (healthChange > 0) Audio_PlaySoundGeneral(NA_SE_SY_HP_RECOVER, &D_801333D4, 4, + &D_801333E0, &D_801333E0, &D_801333E8); + else if ((gSaveContext.double_defense != 0) && (healthChange < 0)) { healthChange >>= 1; // Translates to: "Heart decrease halved!!＝%d" osSyncPrintf("ハート減少半分！！＝%d\n", healthChange); } + // clang-format on gSaveContext.health += healthChange; - if (gSaveContext.health > gSaveContext.health_capacity) + if (gSaveContext.health > gSaveContext.health_capacity) { gSaveContext.health = gSaveContext.health_capacity; + } heartCount = gSaveContext.health % 0x10; healthLevel = heartCount; - if (heartCount != 0) - { - if (heartCount > 10) + if (heartCount != 0) { + if (heartCount > 10) { healthLevel = 3; - else if (heartCount > 5) + } else if (heartCount > 5) { healthLevel = 2; - else + } else { healthLevel = 1; + } } // Translates to: "Life=%d ＊＊＊ %d ＊＊＊＊＊＊" osSyncPrintf(" ライフ=%d ＊＊＊ %d ＊＊＊＊＊＊\n", gSaveContext.health, healthLevel); - if (gSaveContext.health <= 0) - { + if (gSaveContext.health <= 0) { gSaveContext.health = 0; return 0; - } - else - { + } else { return 1; } } -void Health_GiveHearts(s16 hearts) -{ +void Health_GiveHearts(s16 hearts) { gSaveContext.health_capacity += hearts * 0x10; } -void Rupees_ChangeBy(s16 rupeeChange) -{ +void Rupees_ChangeBy(s16 rupeeChange) { gSaveContext.rupee_accumulator += rupeeChange; } -void Inventory_ChangeAmmo(s16 item, s16 ammoChange) -{ +void Inventory_ChangeAmmo(s16 item, s16 ammoChange) { // Translates to: "Item = (%d) Amount = (%d + %d)" osSyncPrintf("アイテム = (%d) 数 = (%d + %d) ", item, AMMO(item), ammoChange); - if (item == ITEM_STICK) - { + if (item == ITEM_STICK) { AMMO(ITEM_STICK) += ammoChange; - if (AMMO(ITEM_STICK) >= CUR_CAPACITY(UPG_STICKS)) + if (AMMO(ITEM_STICK) >= CUR_CAPACITY(UPG_STICKS)) { AMMO(ITEM_STICK) = CUR_CAPACITY(UPG_STICKS); - else if (AMMO(ITEM_STICK) < 0) + } else if (AMMO(ITEM_STICK) < 0) { AMMO(ITEM_STICK) = 0; - } - else if (item == ITEM_NUT) - { + } + } else if (item == ITEM_NUT) { AMMO(ITEM_NUT) += ammoChange; - if (AMMO(ITEM_NUT) >= CUR_CAPACITY(UPG_NUTS)) + if (AMMO(ITEM_NUT) >= CUR_CAPACITY(UPG_NUTS)) { AMMO(ITEM_NUT) = CUR_CAPACITY(UPG_NUTS); - else if (AMMO(ITEM_NUT) < 0) + } else if (AMMO(ITEM_NUT) < 0) { AMMO(ITEM_NUT) = 0; - } - else if (item == ITEM_BOMBCHU) - { + } + } else if (item == ITEM_BOMBCHU) { AMMO(ITEM_BOMBCHU) += ammoChange; - if (AMMO(ITEM_BOMBCHU) >= 50) + if (AMMO(ITEM_BOMBCHU) >= 50) { AMMO(ITEM_BOMBCHU) = 50; - else if (AMMO(ITEM_BOMBCHU) < 0) + } else if (AMMO(ITEM_BOMBCHU) < 0) { AMMO(ITEM_BOMBCHU) = 0; - } - else if (item == ITEM_BOW) - { + } + } else if (item == ITEM_BOW) { AMMO(ITEM_BOW) += ammoChange; - if (AMMO(ITEM_BOW) >= CUR_CAPACITY(UPG_QUIVER)) + if (AMMO(ITEM_BOW) >= CUR_CAPACITY(UPG_QUIVER)) { AMMO(ITEM_BOW) = CUR_CAPACITY(UPG_QUIVER); - else if (AMMO(ITEM_BOW) < 0) + } else if (AMMO(ITEM_BOW) < 0) { AMMO(ITEM_BOW) = 0; - } - else if ((item == ITEM_SLINGSHOT) || (item == ITEM_SEEDS)) - { + } + } else if ((item == ITEM_SLINGSHOT) || (item == ITEM_SEEDS)) { AMMO(ITEM_SLINGSHOT) += ammoChange; - if (AMMO(ITEM_SLINGSHOT) >= CUR_CAPACITY(UPG_BULLET_BAG)) + if (AMMO(ITEM_SLINGSHOT) >= CUR_CAPACITY(UPG_BULLET_BAG)) { AMMO(ITEM_SLINGSHOT) = CUR_CAPACITY(UPG_BULLET_BAG); - else if (AMMO(ITEM_SLINGSHOT) < 0) + } else if (AMMO(ITEM_SLINGSHOT) < 0) { AMMO(ITEM_SLINGSHOT) = 0; - } - else if (item == ITEM_BOMB) - { + } + } else if (item == ITEM_BOMB) { AMMO(ITEM_BOMB) += ammoChange; - if (AMMO(ITEM_BOMB) >= CUR_CAPACITY(UPG_BOMB_BAG)) + if (AMMO(ITEM_BOMB) >= CUR_CAPACITY(UPG_BOMB_BAG)) { AMMO(ITEM_BOMB) = CUR_CAPACITY(UPG_BOMB_BAG); - else if (AMMO(ITEM_BOMB) < 0) + } else if (AMMO(ITEM_BOMB) < 0) { AMMO(ITEM_BOMB) = 0; - } - else if (item == ITEM_BEAN) - { + } + } else if (item == ITEM_BEAN) { AMMO(ITEM_BEAN) += ammoChange; } @@ -2597,109 +2286,96 @@ void Inventory_ChangeAmmo(s16 item, s16 ammoChange) osSyncPrintf("合計 = (%d)\n", AMMO(item)); } -void func_80087680(GlobalContext* globalCtx) -{ - if (gSaveContext.magic_acquired) - { +void func_80087680(GlobalContext* globalCtx) { + if (gSaveContext.magic_acquired) { gSaveContext.unk_13F2 = gSaveContext.unk_13F0; gSaveContext.unk_13F6 = (gSaveContext.double_magic * 0x30) + 0x30; gSaveContext.unk_13F0 = 9; } } -void func_800876C8(GlobalContext* globalCtx) -{ - if ((gSaveContext.unk_13F0 != 8) && (gSaveContext.unk_13F0 != 9)) - { - if (gSaveContext.unk_13F0 == 10) +void func_800876C8(GlobalContext* globalCtx) { + if ((gSaveContext.unk_13F0 != 8) && (gSaveContext.unk_13F0 != 9)) { + if (gSaveContext.unk_13F0 == 10) { gSaveContext.unk_13F2 = gSaveContext.unk_13F0; + } gSaveContext.unk_13F0 = 5; } } -s32 func_80087708(GlobalContext* globalCtx, s16 arg1, s16 arg2) -{ - if (!gSaveContext.magic_acquired) - return 0; - - if ((arg2 != 5) && (gSaveContext.magic - arg1) < 0) - { - if (gSaveContext.unk_13F4 != 0) - Audio_PlaySoundGeneral(NA_SE_SY_ERROR, &D_801333D4, 4, &D_801333E0, &D_801333E0, &D_801333E8); +s32 func_80087708(GlobalContext* globalCtx, s16 arg1, s16 arg2) { + if (!gSaveContext.magic_acquired) { return 0; } - switch (arg2) - { + if ((arg2 != 5) && (gSaveContext.magic - arg1) < 0) { + if (gSaveContext.unk_13F4 != 0) { + Audio_PlaySoundGeneral(NA_SE_SY_ERROR, &D_801333D4, 4, &D_801333E0, &D_801333E0, &D_801333E8); + } + return 0; + } + + switch (arg2) { case 0: case 2: - if ((gSaveContext.unk_13F0 == 0) || (gSaveContext.unk_13F0 == 7)) - { - if (gSaveContext.unk_13F0 == 7) + if ((gSaveContext.unk_13F0 == 0) || (gSaveContext.unk_13F0 == 7)) { + if (gSaveContext.unk_13F0 == 7) { globalCtx->actorCtx.unk_03 = 0; + } gSaveContext.unk_13F8 = gSaveContext.magic - arg1; gSaveContext.unk_13F0 = 1; return 1; - } - else - { + } else { Audio_PlaySoundGeneral(NA_SE_SY_ERROR, &D_801333D4, 4, &D_801333E0, &D_801333E0, &D_801333E8); return 0; } case 1: - if ((gSaveContext.unk_13F0 == 0) || (gSaveContext.unk_13F0 == 7)) - { - if (gSaveContext.unk_13F0 == 7) + if ((gSaveContext.unk_13F0 == 0) || (gSaveContext.unk_13F0 == 7)) { + if (gSaveContext.unk_13F0 == 7) { globalCtx->actorCtx.unk_03 = 0; + } gSaveContext.unk_13F8 = gSaveContext.magic - arg1; gSaveContext.unk_13F0 = 6; return 1; - } - else - { + } else { Audio_PlaySoundGeneral(NA_SE_SY_ERROR, &D_801333D4, 4, &D_801333E0, &D_801333E0, &D_801333E8); return 0; } case 3: - if (gSaveContext.unk_13F0 == 0) - { - if (gSaveContext.magic != 0) - { + if (gSaveContext.unk_13F0 == 0) { + if (gSaveContext.magic != 0) { globalCtx->interfaceCtx.unk_230 = 80; gSaveContext.unk_13F0 = 7; return 1; + } else { + return 0; } - else - return 0; - } - else - { - if (gSaveContext.unk_13F0 == 7) + } else { + if (gSaveContext.unk_13F0 == 7) { return 1; - else + } else { return 0; + } } case 4: - if ((gSaveContext.unk_13F0 == 0) || (gSaveContext.unk_13F0 == 7)) - { - if (gSaveContext.unk_13F0 == 7) + if ((gSaveContext.unk_13F0 == 0) || (gSaveContext.unk_13F0 == 7)) { + if (gSaveContext.unk_13F0 == 7) { globalCtx->actorCtx.unk_03 = 0; + } gSaveContext.unk_13F8 = gSaveContext.magic - arg1; gSaveContext.unk_13F0 = 4; return 1; - } - else - { + } else { Audio_PlaySoundGeneral(NA_SE_SY_ERROR, &D_801333D4, 4, &D_801333E0, &D_801333E0, &D_801333E8); return 0; } case 5: - if (gSaveContext.unk_13F4 >= gSaveContext.magic) - { + if (gSaveContext.unk_13F4 >= gSaveContext.magic) { gSaveContext.unk_13F8 = gSaveContext.magic + arg1; - if (gSaveContext.unk_13F8 >= gSaveContext.unk_13F4) + if (gSaveContext.unk_13F8 >= gSaveContext.unk_13F4) { gSaveContext.unk_13F8 = gSaveContext.unk_13F4; + } gSaveContext.unk_13F0 = 10; return 1; @@ -2712,10 +2388,8 @@ s32 func_80087708(GlobalContext* globalCtx, s16 arg1, s16 arg2) #ifdef NON_MATCHING // this function still needs some work -void Interface_UpdateMagicBar(GlobalContext* globalCtx) -{ - static s16 sMagicBorderColors[][3] = - { +void Interface_UpdateMagicBar(GlobalContext* globalCtx) { + static s16 sMagicBorderColors[][3] = { { 0xFF, 0xFF, 0xFF }, { 0x96, 0x96, 0x96 }, { 0xFF, 0xFF, 0x96 }, @@ -2727,40 +2401,35 @@ void Interface_UpdateMagicBar(GlobalContext* globalCtx) s16* color; s16 maxMagic; - switch (gSaveContext.unk_13F0) - { + switch (gSaveContext.unk_13F0) { case 8: maxMagic = gSaveContext.magic_level * 0x30; - if (gSaveContext.unk_13F4 != maxMagic) - { - if (gSaveContext.unk_13F4 < maxMagic) - { + if (gSaveContext.unk_13F4 != maxMagic) { + if (gSaveContext.unk_13F4 < maxMagic) { gSaveContext.unk_13F4 += 8; - if (gSaveContext.unk_13F4 > maxMagic) + if (gSaveContext.unk_13F4 > maxMagic) { gSaveContext.unk_13F4 = maxMagic; - } - else - { + } + } else { gSaveContext.unk_13F4 -= 8; - if (gSaveContext.unk_13F4 <= maxMagic) + if (gSaveContext.unk_13F4 <= maxMagic) { gSaveContext.unk_13F4 = maxMagic; + } } - } - else - { + } else { gSaveContext.unk_13F0 = 9; } break; case 9: gSaveContext.magic += 4; - if (gSaveContext.game_mode == 0 && gSaveContext.scene_setup_index < 4) + if (gSaveContext.game_mode == 0 && gSaveContext.scene_setup_index < 4) { Audio_PlaySoundGeneral(0x401F, &D_801333D4, 4, &D_801333E0, &D_801333E0, &D_801333E8); + } // Translates to: "Storage MAGIC_NOW=%d (%d)" osSyncPrintf("蓄電 MAGIC_NOW=%d (%d)\n", gSaveContext.magic, gSaveContext.unk_13F6); - if (gSaveContext.magic >= gSaveContext.unk_13F6) - { + if (gSaveContext.magic >= gSaveContext.unk_13F6) { gSaveContext.magic = gSaveContext.unk_13F6; gSaveContext.unk_13F0 = gSaveContext.unk_13F2; gSaveContext.unk_13F2 = 0; @@ -2772,16 +2441,13 @@ void Interface_UpdateMagicBar(GlobalContext* globalCtx) break; case 2: gSaveContext.magic -= 2; - if (gSaveContext.magic <= 0) - { + if (gSaveContext.magic <= 0) { gSaveContext.magic = 0; gSaveContext.unk_13F0 = 3; sMagicBorderB = 0xFF; sMagicBorderG = 0xFF; sMagicBorderR = 0xFF; - } - else if (gSaveContext.magic == gSaveContext.unk_13F8) - { + } else if (gSaveContext.magic == gSaveContext.unk_13F8) { gSaveContext.unk_13F0 = 3; sMagicBorderB = 0xFF; sMagicBorderG = 0xFF; @@ -2792,31 +2458,34 @@ void Interface_UpdateMagicBar(GlobalContext* globalCtx) case 6: color = sMagicBorderColors[sMagicBorderIndexes[sMagicBorderStep]]; - if (sMagicBorderR >= color[0]) + if (sMagicBorderR >= color[0]) { sMagicBorderR -= ABS(sMagicBorderR - color[0]) / sMagicBorderRatio; - else + } else { sMagicBorderR += ABS(sMagicBorderR - color[0]) / sMagicBorderRatio; + } - if (sMagicBorderG >= color[1]) + if (sMagicBorderG >= color[1]) { sMagicBorderG -= ABS(sMagicBorderG - color[1]) / sMagicBorderRatio; - else + } else { sMagicBorderG += ABS(sMagicBorderG - color[1]) / sMagicBorderRatio; + } - if (sMagicBorderB >= color[2]) + if (sMagicBorderB >= color[2]) { sMagicBorderB -= ABS(sMagicBorderB - color[2]) / sMagicBorderRatio; - else + } else { sMagicBorderB += ABS(sMagicBorderB - color[2]) / sMagicBorderRatio; + } sMagicBorderRatio--; - if (sMagicBorderRatio == 0) - { + if (sMagicBorderRatio == 0) { sMagicBorderR = color[0]; sMagicBorderG = color[1]; sMagicBorderB = color[2]; sMagicBorderRatio = YREG(40 + sMagicBorderStep); sMagicBorderStep++; - if (sMagicBorderStep >= 4) + if (sMagicBorderStep >= 4) { sMagicBorderStep = 0; + } } break; case 5: @@ -2826,32 +2495,24 @@ void Interface_UpdateMagicBar(GlobalContext* globalCtx) gSaveContext.unk_13F0 = 0; break; case 7: - if ((globalCtx->pauseCtx.state == 0) && - (globalCtx->pauseCtx.flag == 0) && - (globalCtx->msgCtx.msgMode == 0) && - (globalCtx->unk_10A20 == 0) && - (globalCtx->sceneLoadFlag == 0) && - (globalCtx->unk_1241B == 0) && - (func_800BFC84(globalCtx) == 0)) - { - if ((gSaveContext.magic == 0) || - ((func_8008F2F8(globalCtx) >= 2) && - (func_8008F2F8(globalCtx) < 5)) || + if ((globalCtx->pauseCtx.state == 0) && (globalCtx->pauseCtx.flag == 0) && + (globalCtx->msgCtx.msgMode == 0) && (globalCtx->unk_10A20 == 0) && (globalCtx->sceneLoadFlag == 0) && + (globalCtx->unk_1241B == 0) && (func_800BFC84(globalCtx) == 0)) { + if ((gSaveContext.magic == 0) || ((func_8008F2F8(globalCtx) >= 2) && (func_8008F2F8(globalCtx) < 5)) || ((gSaveContext.equips.button_items[1] != ITEM_LENS) && (gSaveContext.equips.button_items[2] != ITEM_LENS) && (gSaveContext.equips.button_items[3] != ITEM_LENS)) || - (globalCtx->actorCtx.unk_03 == 0)) - { + (globalCtx->actorCtx.unk_03 == 0)) { globalCtx->actorCtx.unk_03 = 0; - Audio_PlaySoundGeneral(NA_SE_SY_GLASSMODE_OFF, &D_801333D4, 4, &D_801333E0, &D_801333E0, &D_801333E8); + Audio_PlaySoundGeneral(NA_SE_SY_GLASSMODE_OFF, &D_801333D4, 4, &D_801333E0, &D_801333E0, + &D_801333E8); gSaveContext.unk_13F0 = 0; sMagicBorderR = sMagicBorderG = sMagicBorderB = 0xFF; break; } globalCtx->interfaceCtx.unk_230--; - if (globalCtx->interfaceCtx.unk_230 == 0) - { + if (globalCtx->interfaceCtx.unk_230 == 0) { gSaveContext.magic--; globalCtx->interfaceCtx.unk_230 = 80; } @@ -2859,38 +2520,40 @@ void Interface_UpdateMagicBar(GlobalContext* globalCtx) color = sMagicBorderColors[sMagicBorderIndexes[sMagicBorderStep]]; - if (sMagicBorderR >= color[0]) + if (sMagicBorderR >= color[0]) { sMagicBorderR -= ABS(sMagicBorderR - color[0]) / sMagicBorderRatio; - else + } else { sMagicBorderR += ABS(sMagicBorderR - color[0]) / sMagicBorderRatio; + } - if (sMagicBorderG >= color[1]) + if (sMagicBorderG >= color[1]) { sMagicBorderG -= ABS(sMagicBorderG - color[1]) / sMagicBorderRatio; - else + } else { sMagicBorderG += ABS(sMagicBorderG - color[1]) / sMagicBorderRatio; + } - if (sMagicBorderB >= color[2]) + if (sMagicBorderB >= color[2]) { sMagicBorderB -= ABS(sMagicBorderB - color[2]) / sMagicBorderRatio; - else + } else { sMagicBorderB += ABS(sMagicBorderB - color[2]) / sMagicBorderRatio; + } sMagicBorderRatio--; - if (sMagicBorderRatio == 0) - { + if (sMagicBorderRatio == 0) { sMagicBorderR = color[0]; sMagicBorderG = color[1]; sMagicBorderB = color[2]; sMagicBorderRatio = YREG(40 + sMagicBorderStep); sMagicBorderStep++; - if (sMagicBorderStep >= 4) + if (sMagicBorderStep >= 4) { sMagicBorderStep = 0; + } } break; case 10: gSaveContext.magic += 4; Audio_PlaySoundGeneral(0x401F, &D_801333D4, 4, &D_801333E0, &D_801333E0, &D_801333E8); - if (gSaveContext.magic >= gSaveContext.unk_13F8) - { + if (gSaveContext.magic >= gSaveContext.unk_13F8) { gSaveContext.magic = gSaveContext.unk_13F8; gSaveContext.unk_13F0 = gSaveContext.unk_13F2; gSaveContext.unk_13F2 = 0; @@ -2902,8 +2565,7 @@ void Interface_UpdateMagicBar(GlobalContext* globalCtx) } } #else -s16 sMagicBorderColors[][3] = -{ +s16 sMagicBorderColors[][3] = { { 0xFF, 0xFF, 0xFF }, { 0x96, 0x96, 0x96 }, { 0xFF, 0xFF, 0x96 }, @@ -2916,195 +2578,145 @@ void Interface_UpdateMagicBar(GlobalContext* globalCtx); #pragma GLOBAL_ASM("asm/non_matchings/code/z_parameter/Interface_UpdateMagicBar.s") #endif -void Interface_DrawMagicBar(GlobalContext* globalCtx) -{ +void Interface_DrawMagicBar(GlobalContext* globalCtx) { InterfaceContext* interfaceCtx = &globalCtx->interfaceCtx; s16 magicBarY; GraphicsContext* gfxCtx; - Gfx* gfxArr[4]; + Gfx* dispRefs[4]; gfxCtx = globalCtx->state.gfxCtx; - func_800C6AC4(gfxArr, globalCtx->state.gfxCtx, "../z_parameter.c", 2650); + Graph_OpenDisps(dispRefs, globalCtx->state.gfxCtx, "../z_parameter.c", 2650); - if (gSaveContext.magic_level != 0) - { - if (gSaveContext.health_capacity > 0xA0) + if (gSaveContext.magic_level != 0) { + if (gSaveContext.health_capacity > 0xA0) { magicBarY = R_MAGIC_BAR_LARGE_Y; - else + } else { magicBarY = R_MAGIC_BAR_SMALL_Y; + } func_80094520(globalCtx->state.gfxCtx); - gDPSetPrimColor(gfxCtx->overlay.p++, 0, 0, sMagicBorderR, sMagicBorderG, sMagicBorderB, interfaceCtx->magicAlpha); + gDPSetPrimColor(gfxCtx->overlay.p++, 0, 0, sMagicBorderR, sMagicBorderG, sMagicBorderB, + interfaceCtx->magicAlpha); gDPSetEnvColor(gfxCtx->overlay.p++, 0x64, 0x32, 0x32, 0xFF); - gfxCtx->overlay.p = Draw_TextureIA8(gfxCtx->overlay.p, - D_020038C0, - 8, 16, - R_MAGIC_BAR_X, magicBarY, - 8, 16, - 1024, 1024); + gfxCtx->overlay.p = + Gfx_TextureIA8(gfxCtx->overlay.p, D_020038C0, 8, 16, R_MAGIC_BAR_X, magicBarY, 8, 16, 1024, 1024); - gfxCtx->overlay.p = Draw_TextureIA8(gfxCtx->overlay.p, - D_02003940, - 24, 16, - R_MAGIC_BAR_X + 8, magicBarY, - gSaveContext.unk_13F4, 16, - 1024, 1024); + gfxCtx->overlay.p = Gfx_TextureIA8(gfxCtx->overlay.p, D_02003940, 24, 16, R_MAGIC_BAR_X + 8, magicBarY, + gSaveContext.unk_13F4, 16, 1024, 1024); gDPSetTextureImage(gfxCtx->overlay.p++, G_IM_FMT_IA, G_IM_SIZ_16b, 1, D_020038C0); - gDPSetTile(gfxCtx->overlay.p++, 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); + gDPSetTile(gfxCtx->overlay.p++, 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(gfxCtx->overlay.p++); gDPLoadBlock(gfxCtx->overlay.p++, G_TX_LOADTILE, 0, 0, 63, 2048); gDPPipeSync(gfxCtx->overlay.p++); - gDPSetTile(gfxCtx->overlay.p++, 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); + gDPSetTile(gfxCtx->overlay.p++, 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(gfxCtx->overlay.p++, G_TX_RENDERTILE, 0, 0, 28, 60); - gSPTextureRectangle(gfxCtx->overlay.p++, - ((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); + gSPTextureRectangle(gfxCtx->overlay.p++, ((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(gfxCtx->overlay.p++); - gDPSetCombineLERP(gfxCtx->overlay.p++, - PRIMITIVE, ENVIRONMENT, TEXEL0, ENVIRONMENT, 0, 0, 0, PRIMITIVE, + gDPSetCombineLERP(gfxCtx->overlay.p++, PRIMITIVE, ENVIRONMENT, TEXEL0, ENVIRONMENT, 0, 0, 0, PRIMITIVE, PRIMITIVE, ENVIRONMENT, TEXEL0, ENVIRONMENT, 0, 0, 0, PRIMITIVE); gDPSetEnvColor(gfxCtx->overlay.p++, 0x00, 0x00, 0x00, 0xFF); - if (gSaveContext.unk_13F0 == 4) - { + if (gSaveContext.unk_13F0 == 4) { // Yellow part of the bar being used when casting a spell gDPSetPrimColor(gfxCtx->overlay.p++, 0, 0, 0xFA, 0xFA, 0x00, interfaceCtx->magicAlpha); - gDPLoadMultiBlock_4b(gfxCtx->overlay.p++, - 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, + gDPLoadMultiBlock_4b(gfxCtx->overlay.p++, 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(gfxCtx->overlay.p++, - 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); + gSPTextureRectangle(gfxCtx->overlay.p++, 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(gfxCtx->overlay.p++); - gDPSetPrimColor(gfxCtx->overlay.p++, 0, 0, - R_MAGIC_FILL_COLOR(0), R_MAGIC_FILL_COLOR(1), + gDPSetPrimColor(gfxCtx->overlay.p++, 0, 0, R_MAGIC_FILL_COLOR(0), R_MAGIC_FILL_COLOR(1), R_MAGIC_FILL_COLOR(2), interfaceCtx->magicAlpha); - gSPTextureRectangle(gfxCtx->overlay.p++, - 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 - { + gSPTextureRectangle(gfxCtx->overlay.p++, 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(gfxCtx->overlay.p++, 0, 0, - R_MAGIC_FILL_COLOR(0), R_MAGIC_FILL_COLOR(1), + gDPSetPrimColor(gfxCtx->overlay.p++, 0, 0, R_MAGIC_FILL_COLOR(0), R_MAGIC_FILL_COLOR(1), R_MAGIC_FILL_COLOR(2), interfaceCtx->magicAlpha); - gDPLoadMultiBlock_4b(gfxCtx->overlay.p++, - 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, + gDPLoadMultiBlock_4b(gfxCtx->overlay.p++, 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(gfxCtx->overlay.p++, - 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); + gSPTextureRectangle(gfxCtx->overlay.p++, 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); } } - func_800C6B54(gfxArr, globalCtx->state.gfxCtx, "../z_parameter.c", 2731); + Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_parameter.c", 2731); } -void func_80088AA0(s16 arg0) -{ +void func_80088AA0(s16 arg0) { gSaveContext.timer_x[1] = 140; gSaveContext.timer_y[1] = 80; D_80125A5C = 0; gSaveContext.timer_2_value = arg0; - if (arg0 != 0) + if (arg0 != 0) { gSaveContext.timer_2_state = 1; - else + } else { gSaveContext.timer_2_state = 7; -} - -void func_80088AF0(GlobalContext* globalCtx) -{ - if (gSaveContext.timer_2_state != 0) - { - if (gSaveContext.event_inf[1] & 1) - gSaveContext.timer_2_value = 239; - else - gSaveContext.timer_2_value = 1; } } -void func_80088B34(s16 arg0) -{ +void func_80088AF0(GlobalContext* globalCtx) { + if (gSaveContext.timer_2_state != 0) { + if (gSaveContext.event_inf[1] & 1) { + gSaveContext.timer_2_value = 239; + } else { + gSaveContext.timer_2_value = 1; + } + } +} + +void func_80088B34(s16 arg0) { gSaveContext.timer_x[0] = 140; gSaveContext.timer_y[0] = 80; D_80125A5C = 0; gSaveContext.timer_1_value = arg0; - if (arg0 != 0) + if (arg0 != 0) { gSaveContext.timer_1_state = 5; - else + } else { gSaveContext.timer_1_state = 11; + } } -void Interface_DrawActionLabel(GraphicsContext* gfxCtx, void* texture) -{ - Gfx* gfxArr[5]; +void Interface_DrawActionLabel(GraphicsContext* gfxCtx, void* texture) { + Gfx* dispRefs[5]; - func_800C6AC4(gfxArr, gfxCtx, "../z_parameter.c", 2820); + Graph_OpenDisps(dispRefs, gfxCtx, "../z_parameter.c", 2820); gDPSetTextureImage(gfxCtx->overlay.p++, G_IM_FMT_IA, G_IM_SIZ_16b, 1, texture); - gDPSetTile(gfxCtx->overlay.p++, 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); + gDPSetTile(gfxCtx->overlay.p++, 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(gfxCtx->overlay.p++); gDPLoadBlock(gfxCtx->overlay.p++, G_TX_LOADTILE, 0, 0, 191, 683); gDPPipeSync(gfxCtx->overlay.p++); - gDPSetTile(gfxCtx->overlay.p++, 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); + gDPSetTile(gfxCtx->overlay.p++, 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(gfxCtx->overlay.p++, G_TX_RENDERTILE, 0, 0, 188, 60); gSP1Quadrangle(gfxCtx->overlay.p++, 0, 2, 3, 1, 0); - func_800C6B54(gfxArr, gfxCtx, "../z_parameter.c", 2829); + Graph_CloseDisps(dispRefs, gfxCtx, "../z_parameter.c", 2829); } u8* sCUpLabelTextures[] = { D_02002FC0, D_02002FC0, D_02002FC0 }; @@ -3113,8 +2725,7 @@ s16 sStartButtonLeftPos[] = { 132, 130, 130 }; #ifdef NON_MATCHING // regalloc and ordering differences -void Interface_DrawItemButtons(GlobalContext* globalCtx) -{ +void Interface_DrawItemButtons(GlobalContext* globalCtx) { InterfaceContext* interfaceCtx = &globalCtx->interfaceCtx; Player* player = PLAYER; f32 temp; @@ -3122,178 +2733,125 @@ void Interface_DrawItemButtons(GlobalContext* globalCtx) s16 cUpAlpha; s32 pad; GraphicsContext* gfxCtx; - Gfx* gfxArr[4]; + Gfx* dispRefs[4]; gfxCtx = globalCtx->state.gfxCtx; - func_800C6AC4(gfxArr, globalCtx->state.gfxCtx, "../z_parameter.c", 2900); + Graph_OpenDisps(dispRefs, globalCtx->state.gfxCtx, "../z_parameter.c", 2900); // B Button Color & Texture // Also loads the Item Button Texture reused by other buttons afterwards gDPPipeSync(gfxCtx->overlay.p++); - gDPSetCombineLERP(gfxCtx->overlay.p++, - TEXEL0, 0, PRIMITIVE, 0, TEXEL0, 0, PRIMITIVE, 0, - TEXEL0, 0, PRIMITIVE, 0, TEXEL0, 0, PRIMITIVE, 0); - gDPSetPrimColor(gfxCtx->overlay.p++, 0, 0, - R_B_BTN_COLOR(0), R_B_BTN_COLOR(1), - R_B_BTN_COLOR(2), interfaceCtx->bAlpha); + gDPSetCombineMode(gfxCtx->overlay.p++, G_CC_MODULATEIA_PRIM, G_CC_MODULATEIA_PRIM); + gDPSetPrimColor(gfxCtx->overlay.p++, 0, 0, R_B_BTN_COLOR(0), R_B_BTN_COLOR(1), R_B_BTN_COLOR(2), + interfaceCtx->bAlpha); gDPSetEnvColor(gfxCtx->overlay.p++, 0x00, 0x00, 0x00, 0xFF); - gfxCtx->overlay.p = Draw_TextureIA8(gfxCtx->overlay.p, - &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); + gfxCtx->overlay.p = + Gfx_TextureIA8(gfxCtx->overlay.p, &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(gfxCtx->overlay.p++); - gDPSetPrimColor(gfxCtx->overlay.p++, 0, 0, - R_C_BTN_COLOR(0), R_C_BTN_COLOR(1), - R_C_BTN_COLOR(2), interfaceCtx->cLeftAlpha); - gSPTextureRectangle(gfxCtx->overlay.p++, - 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); + gDPSetPrimColor(gfxCtx->overlay.p++, 0, 0, R_C_BTN_COLOR(0), R_C_BTN_COLOR(1), R_C_BTN_COLOR(2), + interfaceCtx->cLeftAlpha); + gSPTextureRectangle(gfxCtx->overlay.p++, 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(gfxCtx->overlay.p++, 0, 0, - R_C_BTN_COLOR(0), R_C_BTN_COLOR(1), - R_C_BTN_COLOR(2), interfaceCtx->cDownAlpha); - gSPTextureRectangle(gfxCtx->overlay.p++, - 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); + gDPSetPrimColor(gfxCtx->overlay.p++, 0, 0, R_C_BTN_COLOR(0), R_C_BTN_COLOR(1), R_C_BTN_COLOR(2), + interfaceCtx->cDownAlpha); + gSPTextureRectangle(gfxCtx->overlay.p++, 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(gfxCtx->overlay.p++, 0, 0, - R_C_BTN_COLOR(0), R_C_BTN_COLOR(1), - R_C_BTN_COLOR(2), interfaceCtx->cRightAlpha); - gSPTextureRectangle(gfxCtx->overlay.p++, - 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); + gDPSetPrimColor(gfxCtx->overlay.p++, 0, 0, R_C_BTN_COLOR(0), R_C_BTN_COLOR(1), R_C_BTN_COLOR(2), + interfaceCtx->cRightAlpha); + gSPTextureRectangle(gfxCtx->overlay.p++, 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 ((globalCtx->pauseCtx.state < 8) || (globalCtx->pauseCtx.state >= 18)) - { - if ((globalCtx->pauseCtx.state != 0) || (globalCtx->pauseCtx.flag != 0)) - { + if ((globalCtx->pauseCtx.state < 8) || (globalCtx->pauseCtx.state >= 18)) { + if ((globalCtx->pauseCtx.state != 0) || (globalCtx->pauseCtx.flag != 0)) { // Start Button Texture, Color & Label gDPPipeSync(gfxCtx->overlay.p++); gDPSetPrimColor(gfxCtx->overlay.p++, 0, 0, 0x78, 0x78, 0x78, interfaceCtx->startAlpha); - gSPTextureRectangle(gfxCtx->overlay.p++, - sStartButtonLeftPos[gSaveContext.language] << 2, 156, - (sStartButtonLeftPos[gSaveContext.language] + 22) << 2, 68, - G_TX_RENDERTILE, - 0, 0, - 1462, 1462); + gSPTextureRectangle(gfxCtx->overlay.p++, sStartButtonLeftPos[gSaveContext.language] << 2, 156, + (sStartButtonLeftPos[gSaveContext.language] + 22) << 2, 68, G_TX_RENDERTILE, 0, 0, 1462, + 1462); gDPPipeSync(gfxCtx->overlay.p++); gDPSetPrimColor(gfxCtx->overlay.p++, 0, 0, 0xFF, 0xFF, 0xFF, interfaceCtx->startAlpha); gDPSetEnvColor(gfxCtx->overlay.p++, 0x00, 0x00, 0x00, 0x00); - gDPSetCombineLERP(gfxCtx->overlay.p++, - PRIMITIVE, ENVIRONMENT, TEXEL0, ENVIRONMENT, TEXEL0, 0, PRIMITIVE, 0, - PRIMITIVE, ENVIRONMENT, TEXEL0, ENVIRONMENT, TEXEL0, 0, PRIMITIVE, 0); + gDPSetCombineLERP(gfxCtx->overlay.p++, PRIMITIVE, ENVIRONMENT, TEXEL0, ENVIRONMENT, TEXEL0, 0, PRIMITIVE, 0, + PRIMITIVE, ENVIRONMENT, TEXEL0, ENVIRONMENT, TEXEL0, 0, PRIMITIVE, 0); - gDPSetTextureImage(gfxCtx->overlay.p++, G_IM_FMT_IA, G_IM_SIZ_16b, 1, (u32)interfaceCtx->do_actionSegment + 0x300); - gDPSetTile(gfxCtx->overlay.p++, 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); + gDPSetTextureImage(gfxCtx->overlay.p++, G_IM_FMT_IA, G_IM_SIZ_16b, 1, + (u32)interfaceCtx->do_actionSegment + 0x300); + gDPSetTile(gfxCtx->overlay.p++, 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(gfxCtx->overlay.p++); gDPLoadBlock(gfxCtx->overlay.p++, G_TX_LOADTILE, 0, 0, 191, 683); gDPPipeSync(gfxCtx->overlay.p++); - gDPSetTile(gfxCtx->overlay.p++, 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); + gDPSetTile(gfxCtx->overlay.p++, 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(gfxCtx->overlay.p++, G_TX_RENDERTILE, 0, 0, 48, 16); temp = R_START_LABEL_DD(gSaveContext.language) / 100.0f; - gSPTextureRectangle(gfxCtx->overlay.p++, - R_START_LABEL_X(gSaveContext.language) << 2, + gSPTextureRectangle(gfxCtx->overlay.p++, R_START_LABEL_X(gSaveContext.language) << 2, R_START_LABEL_Y(gSaveContext.language) << 2, (R_START_LABEL_X(gSaveContext.language) + (s16)(16 / temp)) << 2, - (R_START_LABEL_Y(gSaveContext.language) + (s16)(48 / temp)) << 2, - G_TX_RENDERTILE, - 0, 0, - (s16)(1024 / temp), - (s16)(1024 / temp)); + (R_START_LABEL_Y(gSaveContext.language) + (s16)(48 / temp)) << 2, G_TX_RENDERTILE, 0, 0, + (s16)(1024 / temp), (s16)(1024 / temp)); } } - if (interfaceCtx->naviCalling && (globalCtx->pauseCtx.state == 0) && - (globalCtx->pauseCtx.flag == 0) && (globalCtx->csCtx.state == 0)) - { - if (!sCUpInvisible) - { + if (interfaceCtx->naviCalling && (globalCtx->pauseCtx.state == 0) && (globalCtx->pauseCtx.flag == 0) && + (globalCtx->csCtx.state == 0)) { + if (!sCUpInvisible) { // C-Up Button Texture, Color & Label (Navi Text) gDPPipeSync(gfxCtx->overlay.p++); - if ((gSaveContext.unk_13EA == 1) || (gSaveContext.unk_13EA == 2) || (gSaveContext.unk_13EA == 5)) + if ((gSaveContext.unk_13EA == 1) || (gSaveContext.unk_13EA == 2) || (gSaveContext.unk_13EA == 5)) { cUpAlpha = 0; - else if ((player->stateFlags2 & 0x00200000) || (func_8008F2F8(globalCtx) == 4) || (player->stateFlags2 & 0x00040000)) + } else if ((player->stateFlags2 & 0x00200000) || (func_8008F2F8(globalCtx) == 4) || + (player->stateFlags2 & 0x00040000)) { cUpAlpha = 0x46; - else + } else { cUpAlpha = interfaceCtx->healthAlpha; + } - gDPSetPrimColor(gfxCtx->overlay.p++, 0, 0, - R_C_BTN_COLOR(0), R_C_BTN_COLOR(1), - R_C_BTN_COLOR(2), cUpAlpha); - gDPSetCombineLERP(gfxCtx->overlay.p++, - TEXEL0, 0, PRIMITIVE, 0, TEXEL0, 0, PRIMITIVE, 0, - TEXEL0, 0, PRIMITIVE, 0, TEXEL0, 0, PRIMITIVE, 0); - gSPTextureRectangle(gfxCtx->overlay.p++, - 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); + gDPSetPrimColor(gfxCtx->overlay.p++, 0, 0, R_C_BTN_COLOR(0), R_C_BTN_COLOR(1), R_C_BTN_COLOR(2), cUpAlpha); + gDPSetCombineMode(gfxCtx->overlay.p++, G_CC_MODULATEIA_PRIM, G_CC_MODULATEIA_PRIM); + gSPTextureRectangle(gfxCtx->overlay.p++, 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(gfxCtx->overlay.p++); gDPSetPrimColor(gfxCtx->overlay.p++, 0, 0, 0xFF, 0xFF, 0xFF, cUpAlpha); gDPSetEnvColor(gfxCtx->overlay.p++, 0x00, 0x00, 0x00, 0x00); - gDPSetCombineLERP(gfxCtx->overlay.p++, - PRIMITIVE, ENVIRONMENT, TEXEL0, ENVIRONMENT, TEXEL0, 0, PRIMITIVE, 0, + gDPSetCombineLERP(gfxCtx->overlay.p++, PRIMITIVE, ENVIRONMENT, TEXEL0, ENVIRONMENT, TEXEL0, 0, PRIMITIVE, 0, PRIMITIVE, ENVIRONMENT, TEXEL0, ENVIRONMENT, TEXEL0, 0, PRIMITIVE, 0); - gDPSetTextureImage(gfxCtx->overlay.p++, G_IM_FMT_IA, G_IM_SIZ_16b, 1, sCUpLabelTextures[gSaveContext.language]); - gDPSetTile(gfxCtx->overlay.p++, 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); + gDPSetTextureImage(gfxCtx->overlay.p++, G_IM_FMT_IA, G_IM_SIZ_16b, 1, + sCUpLabelTextures[gSaveContext.language]); + gDPSetTile(gfxCtx->overlay.p++, 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(gfxCtx->overlay.p++); gDPLoadBlock(gfxCtx->overlay.p++, G_TX_LOADTILE, 0, 0, 63, 1024); gDPPipeSync(gfxCtx->overlay.p++); - gDPSetTile(gfxCtx->overlay.p++, 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); + gDPSetTile(gfxCtx->overlay.p++, 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(gfxCtx->overlay.p++, G_TX_RENDERTILE, 0, 0, 124, 28); - gSPTextureRectangle(gfxCtx->overlay.p++, - R_C_UP_ICON_X << 2, R_C_UP_ICON_Y << 2, - (R_C_UP_ICON_X + 8) << 2, (R_C_UP_ICON_Y + 32) << 2, - G_TX_RENDERTILE, - 0, 0, - 1024, 1024); + gSPTextureRectangle(gfxCtx->overlay.p++, R_C_UP_ICON_X << 2, R_C_UP_ICON_Y << 2, (R_C_UP_ICON_X + 8) << 2, + (R_C_UP_ICON_Y + 32) << 2, G_TX_RENDERTILE, 0, 0, 1024, 1024); } sCUpTimer--; - if (sCUpTimer == 0) - { + if (sCUpTimer == 0) { sCUpTimer = 10; sCUpInvisible ^= 1; } @@ -3302,185 +2860,145 @@ void Interface_DrawItemButtons(GlobalContext* globalCtx) gDPPipeSync(gfxCtx->overlay.p++); // Empty C Button Arrows - for (i = 1; i < 4; i++) - { - if (gSaveContext.equips.button_items[i] > 0xF0) - { - if (i == 1) - gDPSetPrimColor(gfxCtx->overlay.p++, 0, 0, - R_C_BTN_COLOR(0), R_C_BTN_COLOR(1), - R_C_BTN_COLOR(2), interfaceCtx->cLeftAlpha); - else if (i == 2) - gDPSetPrimColor(gfxCtx->overlay.p++, 0, 0, - R_C_BTN_COLOR(0), R_C_BTN_COLOR(1), - R_C_BTN_COLOR(2), interfaceCtx->cDownAlpha); - else - gDPSetPrimColor(gfxCtx->overlay.p++, 0, 0, - R_C_BTN_COLOR(0), R_C_BTN_COLOR(1), - R_C_BTN_COLOR(2), interfaceCtx->cRightAlpha); + for (i = 1; i < 4; i++) { + if (gSaveContext.equips.button_items[i] > 0xF0) { + if (i == 1) { + gDPSetPrimColor(gfxCtx->overlay.p++, 0, 0, R_C_BTN_COLOR(0), R_C_BTN_COLOR(1), R_C_BTN_COLOR(2), + interfaceCtx->cLeftAlpha); + } else if (i == 2) { + gDPSetPrimColor(gfxCtx->overlay.p++, 0, 0, R_C_BTN_COLOR(0), R_C_BTN_COLOR(1), R_C_BTN_COLOR(2), + interfaceCtx->cDownAlpha); + } else { + gDPSetPrimColor(gfxCtx->overlay.p++, 0, 0, R_C_BTN_COLOR(0), R_C_BTN_COLOR(1), R_C_BTN_COLOR(2), + interfaceCtx->cRightAlpha); + } - gfxCtx->overlay.p = Draw_TextureIA8(gfxCtx->overlay.p, - &D_02000A00[i + 1], - 0x20, 0x20, - R_ITEM_BTN_X(i), R_ITEM_BTN_Y(i), - R_ITEM_BTN_WIDTH(i), R_ITEM_BTN_WIDTH(i), - R_ITEM_BTN_DD(i) * 2, R_ITEM_BTN_DD(i) * 2); + gfxCtx->overlay.p = + Gfx_TextureIA8(gfxCtx->overlay.p, &D_02000A00[i + 1], 0x20, 0x20, R_ITEM_BTN_X(i), R_ITEM_BTN_Y(i), + R_ITEM_BTN_WIDTH(i), R_ITEM_BTN_WIDTH(i), R_ITEM_BTN_DD(i) * 2, R_ITEM_BTN_DD(i) * 2); } } - func_800C6B54(gfxArr, globalCtx->state.gfxCtx, "../z_parameter.c", 3071); + Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_parameter.c", 3071); } #else void Interface_DrawItemButtons(GlobalContext* globalCtx); #pragma GLOBAL_ASM("asm/non_matchings/code/z_parameter/Interface_DrawItemButtons.s") #endif -void Interface_DrawItemIconTexture(GlobalContext* globalCtx, void* texture, s16 button) -{ +void Interface_DrawItemIconTexture(GlobalContext* globalCtx, void* texture, s16 button) { GraphicsContext* gfxCtx; - Gfx* gfxArr[4]; + Gfx* dispRefs[4]; gfxCtx = globalCtx->state.gfxCtx; - func_800C6AC4(gfxArr, globalCtx->state.gfxCtx, "../z_parameter.c", 3079); + Graph_OpenDisps(dispRefs, globalCtx->state.gfxCtx, "../z_parameter.c", 3079); - gDPLoadTextureBlock(gfxCtx->overlay.p++, - 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); + gDPLoadTextureBlock(gfxCtx->overlay.p++, 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(gfxCtx->overlay.p++, - R_ITEM_ICON_X(button) << 2, - R_ITEM_ICON_Y(button) << 2, + gSPTextureRectangle(gfxCtx->overlay.p++, 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); + (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); - func_800C6B54(gfxArr, globalCtx->state.gfxCtx, "../z_parameter.c", 3094); + Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_parameter.c", 3094); } -void Interface_DrawAmmoCount(GlobalContext* globalCtx, s16 button, s16 alpha) -{ +void Interface_DrawAmmoCount(GlobalContext* globalCtx, s16 button, s16 alpha) { s16 item; s16 ammo; GraphicsContext* gfxCtx; s16 i; - Gfx* gfxArr[3]; + Gfx* dispRefs[3]; gfxCtx = globalCtx->state.gfxCtx; - func_800C6AC4(gfxArr, globalCtx->state.gfxCtx, "../z_parameter.c", 3105); + Graph_OpenDisps(dispRefs, globalCtx->state.gfxCtx, "../z_parameter.c", 3105); item = gSaveContext.equips.button_items[button]; - if ((item == ITEM_STICK) || (item == ITEM_NUT) || - (item == ITEM_BOMB) || (item == ITEM_BOW) || - ((item >= ITEM_BOW_ARROW_FIRE) && (item <= ITEM_BOW_ARROW_LIGHT)) || - (item == ITEM_SLINGSHOT) || (item == ITEM_BOMBCHU) || (item == ITEM_BEAN)) - { - if ((item >= ITEM_BOW_ARROW_FIRE) && (item <= ITEM_BOW_ARROW_LIGHT)) + if ((item == ITEM_STICK) || (item == ITEM_NUT) || (item == ITEM_BOMB) || (item == ITEM_BOW) || + ((item >= ITEM_BOW_ARROW_FIRE) && (item <= ITEM_BOW_ARROW_LIGHT)) || (item == ITEM_SLINGSHOT) || + (item == ITEM_BOMBCHU) || (item == ITEM_BEAN)) { + if ((item >= ITEM_BOW_ARROW_FIRE) && (item <= ITEM_BOW_ARROW_LIGHT)) { item = ITEM_BOW; + } ammo = AMMO(item); gDPPipeSync(gfxCtx->overlay.p++); - if ((button == 0) && (gSaveContext.minigame_state == 1)) - { + if ((button == 0) && (gSaveContext.minigame_state == 1)) { ammo = globalCtx->interfaceCtx.hbaAmmo; - } - else if ((button == 0) && (globalCtx->unk_11E5C >= 2)) - { + } else if ((button == 0) && (globalCtx->unk_11E5C >= 2)) { ammo = globalCtx->unk_11E5C - 1; - } - else if ((button == 0) && (globalCtx->sceneNum == SCENE_BOWLING) && Flags_GetSwitch(globalCtx, 0x38)) - { + } else if ((button == 0) && (globalCtx->sceneNum == SCENE_BOWLING) && Flags_GetSwitch(globalCtx, 0x38)) { ammo = globalCtx->bombchuBowlingAmmo; - if (ammo < 0) + if (ammo < 0) { ammo = 0; - } - else if (((item == ITEM_BOW) && (AMMO(item) == CUR_CAPACITY(UPG_QUIVER))) || - ((item == ITEM_BOMB) && (AMMO(item) == CUR_CAPACITY(UPG_BOMB_BAG))) || - ((item == ITEM_SLINGSHOT) && (AMMO(item) == CUR_CAPACITY(UPG_BULLET_BAG))) || - ((item == ITEM_STICK) && (AMMO(item) == CUR_CAPACITY(UPG_STICKS))) || - ((item == ITEM_NUT) && (AMMO(item) == CUR_CAPACITY(UPG_NUTS))) || - ((item == ITEM_BOMBCHU) && (ammo == 50)) || - ((item == ITEM_BEAN) && (ammo == 15))) - { + } + } else if (((item == ITEM_BOW) && (AMMO(item) == CUR_CAPACITY(UPG_QUIVER))) || + ((item == ITEM_BOMB) && (AMMO(item) == CUR_CAPACITY(UPG_BOMB_BAG))) || + ((item == ITEM_SLINGSHOT) && (AMMO(item) == CUR_CAPACITY(UPG_BULLET_BAG))) || + ((item == ITEM_STICK) && (AMMO(item) == CUR_CAPACITY(UPG_STICKS))) || + ((item == ITEM_NUT) && (AMMO(item) == CUR_CAPACITY(UPG_NUTS))) || + ((item == ITEM_BOMBCHU) && (ammo == 50)) || ((item == ITEM_BEAN) && (ammo == 15))) { gDPSetPrimColor(gfxCtx->overlay.p++, 0, 0, 0x78, 0xFF, 0x00, alpha); } - if (ammo == 0) + if (ammo == 0) { gDPSetPrimColor(gfxCtx->overlay.p++, 0, 0, 0x64, 0x64, 0x64, alpha); + } - for (i = 0; ammo >= 10; i++) + for (i = 0; ammo >= 10; i++) { ammo -= 10; + } - if (i != 0) - gfxCtx->overlay.p = Draw_TextureIA8(gfxCtx->overlay.p, - &D_020035C0[i], - 8, 8, - R_ITEM_AMMO_X(button), R_ITEM_AMMO_Y(button), - 8, 8, - 1024, 1024); + if (i != 0) { + gfxCtx->overlay.p = Gfx_TextureIA8(gfxCtx->overlay.p, &D_020035C0[i], 8, 8, R_ITEM_AMMO_X(button), + R_ITEM_AMMO_Y(button), 8, 8, 1024, 1024); + } - gfxCtx->overlay.p = Draw_TextureIA8(gfxCtx->overlay.p, - &D_020035C0[ammo], - 8, 8, - R_ITEM_AMMO_X(button) + 6, R_ITEM_AMMO_Y(button), - 8, 8, - 1024, 1024); + gfxCtx->overlay.p = Gfx_TextureIA8(gfxCtx->overlay.p, &D_020035C0[ammo], 8, 8, R_ITEM_AMMO_X(button) + 6, + R_ITEM_AMMO_Y(button), 8, 8, 1024, 1024); } - func_800C6B54(gfxArr, globalCtx->state.gfxCtx, "../z_parameter.c", 3158); + Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_parameter.c", 3158); } -void Interface_DrawActionButton(GlobalContext* globalCtx) -{ +void Interface_DrawActionButton(GlobalContext* globalCtx) { InterfaceContext* interfaceCtx = &globalCtx->interfaceCtx; GraphicsContext* gfxCtx; - Gfx* gfxArr[4]; + Gfx* dispRefs[4]; gfxCtx = globalCtx->state.gfxCtx; - func_800C6AC4(gfxArr, globalCtx->state.gfxCtx, "../z_parameter.c", 3172); + Graph_OpenDisps(dispRefs, globalCtx->state.gfxCtx, "../z_parameter.c", 3172); Matrix_Translate(0.0f, 0.0f, XREG(18) / 10.0f, MTXMODE_NEW); Matrix_Scale(1.0f, 1.0f, 1.0f, MTXMODE_APPLY); Matrix_RotateX(interfaceCtx->unk_1F4 / 10000.0f, MTXMODE_APPLY); - if (1) ; // Necessary to match + if (1) {} // Necessary to match - gSPMatrix(gfxCtx->overlay.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_parameter.c", 3177), G_MTX_MODELVIEW | G_MTX_LOAD); + gSPMatrix(gfxCtx->overlay.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_parameter.c", 3177), + G_MTX_MODELVIEW | G_MTX_LOAD); gSPVertex(gfxCtx->overlay.p++, interfaceCtx->vtx_128, 4, 0); - gDPLoadTextureBlock(gfxCtx->overlay.p++, - &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); + gDPLoadTextureBlock(gfxCtx->overlay.p++, &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(gfxCtx->overlay.p++, 0, 2, 3, 1, 0); - func_800C6B54(gfxArr, globalCtx->state.gfxCtx, "../z_parameter.c", 3187); + Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_parameter.c", 3187); } -void Interface_InitVertices(GlobalContext* globalCtx) -{ +void Interface_InitVertices(GlobalContext* globalCtx) { InterfaceContext* interfaceCtx = &globalCtx->interfaceCtx; s16 i; interfaceCtx->vtx_128 = Graph_Alloc(globalCtx->state.gfxCtx, 8 * sizeof(Vtx)); + // clang-format off interfaceCtx->vtx_128[0].v.ob[0] = interfaceCtx->vtx_128[2].v.ob[0] = -14; interfaceCtx->vtx_128[1].v.ob[0] = @@ -3501,8 +3019,7 @@ void Interface_InitVertices(GlobalContext* globalCtx) interfaceCtx->vtx_128[6].v.ob[1] = interfaceCtx->vtx_128[7].v.ob[1] = interfaceCtx->vtx_128[4].v.ob[1] - XREG(28); - for (i = 0; i < 8; i += 4) - { + for (i = 0; i < 8; i += 4) { interfaceCtx->vtx_128[i].v.ob[2] = interfaceCtx->vtx_128[i+1].v.ob[2] = interfaceCtx->vtx_128[i+2].v.ob[2] = interfaceCtx->vtx_128[i+3].v.ob[2] = 0; @@ -3554,10 +3071,10 @@ void Interface_InitVertices(GlobalContext* globalCtx) interfaceCtx->vtx_12C[2].v.cn[2] = interfaceCtx->vtx_12C[3].v.cn[2] = interfaceCtx->vtx_12C[0].v.cn[3] = interfaceCtx->vtx_12C[1].v.cn[3] = interfaceCtx->vtx_12C[2].v.cn[3] = interfaceCtx->vtx_12C[3].v.cn[3] = 0xFF; + // clang-format on } -void func_8008A8B8(GlobalContext* globalCtx, s32 arg1, s32 arg2, s32 arg3, s32 arg4) -{ +void func_8008A8B8(GlobalContext* globalCtx, s32 arg1, s32 arg2, s32 arg3, s32 arg4) { InterfaceContext* interfaceCtx = &globalCtx->interfaceCtx; Vec3f sp40; Vec3f sp34; @@ -3578,13 +3095,13 @@ void func_8008A8B8(GlobalContext* globalCtx, s32 arg1, s32 arg2, s32 arg3, s32 a func_800AB560(&interfaceCtx->view); } -void func_8008A994(InterfaceContext* interfaceCtx) -{ +void func_8008A994(InterfaceContext* interfaceCtx) { s32 sp18[4]; - // Whitespace matters for codegen here - sp18[1] = 240; sp18[3] = 320; + // clang-format off + sp18[1] = SCREEN_HEIGHT; sp18[3] = SCREEN_WIDTH; sp18[0] = 0; sp18[2] = 0; + // clang-format on func_800AA4FC(&interfaceCtx->view, sp18); func_800AB2C4(&interfaceCtx->view); @@ -3598,13 +3115,8 @@ s16 sTimerDigitLeftPos[] = { 16, 25, 34, 42, 51 }; s16 sDigitWidth[] = { 9, 9, 8, 9, 9 }; // unused, most likely colors -s16 D_80125B1C[][3] = -{ - { 0x00, 0x96, 0x00 }, - { 0x64, 0xFF, 0x00 }, - { 0xFF, 0xFF, 0xFF }, - { 0x00, 0x00, 0x00 }, - { 0xFF, 0xFF, 0xFF }, +s16 D_80125B1C[][3] = { + { 0x00, 0x96, 0x00 }, { 0x64, 0xFF, 0x00 }, { 0xFF, 0xFF, 0xFF }, { 0x00, 0x00, 0x00 }, { 0xFF, 0xFF, 0xFF }, }; s16 sRupeeDigitsFirst[] = { 1, 0, 0 }; @@ -3612,14 +3124,13 @@ s16 sRupeeDigitsCount[] = { 2, 3, 3 }; s16 sSpoilingItemEntrances[] = { 0x01AD, 0x0153, 0x0153 }; -u16 D_80125B54 = 0xC220; // unused -u16 D_80125B58 = 0xC20C; // unused +u16 D_80125B54 = 0xC220; // unused +u16 D_80125B58 = 0xC20C; // unused s16 D_80125B5C[] = { 91, 91 }; // unused #ifdef NON_MATCHING // mostly regalloc, minor ordering and stack usage differences -void Interface_Draw(GlobalContext* globalCtx) -{ +void Interface_Draw(GlobalContext* globalCtx) { static s16 D_8015FFE0; static s16 D_8015FFE2; static s16 D_8015FFE4; @@ -3636,19 +3147,18 @@ void Interface_Draw(GlobalContext* globalCtx) s16 phi_s0; s16 sp274; GraphicsContext* gfxCtx; - Gfx* gfxArr[4]; + Gfx* dispRefs[4]; s32 pad; gfxCtx = globalCtx->state.gfxCtx; - func_800C6AC4(gfxArr, globalCtx->state.gfxCtx, "../z_parameter.c", 3405); + Graph_OpenDisps(dispRefs, globalCtx->state.gfxCtx, "../z_parameter.c", 3405); gSPSegment(gfxCtx->overlay.p++, 0x02, interfaceCtx->parameterSegment); gSPSegment(gfxCtx->overlay.p++, 0x07, interfaceCtx->do_actionSegment); gSPSegment(gfxCtx->overlay.p++, 0x08, interfaceCtx->icon_itemSegment); gSPSegment(gfxCtx->overlay.p++, 0x0B, interfaceCtx->mapSegment); - if (pauseCtx->flag == 0) - { + if (pauseCtx->flag == 0) { Interface_InitVertices(globalCtx); func_8008A994(interfaceCtx); Interface_DrawHealth(globalCtx); @@ -3658,15 +3168,9 @@ void Interface_Draw(GlobalContext* globalCtx) // Rupee Icon gDPSetPrimColor(gfxCtx->overlay.p++, 0, 0, 0xC8, 0xFF, 0x64, interfaceCtx->magicAlpha); gDPSetEnvColor(gfxCtx->overlay.p++, 0x00, 0x50, 0x00, 0xFF); - gfxCtx->overlay.p = Draw_TextureIA8(gfxCtx->overlay.p, - D_02001F00, - 16, 16, - 26, 206, - 16, 16, - 1024, 1024); + gfxCtx->overlay.p = Gfx_TextureIA8(gfxCtx->overlay.p, D_02001F00, 16, 16, 26, 206, 16, 16, 1024, 1024); - switch (globalCtx->sceneNum) - { + switch (globalCtx->sceneNum) { case SCENE_BMORI1: case SCENE_HIDAN: case SCENE_MIZUSIN: @@ -3681,53 +3185,38 @@ void Interface_Draw(GlobalContext* globalCtx) case SCENE_GANON_SONOGO: case SCENE_GANONTIKA_SONOGO: case SCENE_TAKARAYA: - if (gSaveContext.dungeon_keys[gSaveContext.dungeon_index] >= 0) - { + if (gSaveContext.dungeon_keys[gSaveContext.dungeon_index] >= 0) { // Small Key Icon gDPPipeSync(gfxCtx->overlay.p++); gDPSetPrimColor(gfxCtx->overlay.p++, 0, 0, 0xC8, 0xE6, 0xFF, interfaceCtx->magicAlpha); gDPSetEnvColor(gfxCtx->overlay.p++, 0x00, 0x00, 0x14, 0xFF); - gfxCtx->overlay.p = Draw_TextureIA8(gfxCtx->overlay.p, - D_02001E00, - 16, 16, - 26, 190, - 16, 16, - 1024, 1024); + gfxCtx->overlay.p = + Gfx_TextureIA8(gfxCtx->overlay.p, D_02001E00, 16, 16, 26, 190, 16, 16, 1024, 1024); // Small Key Counter gDPPipeSync(gfxCtx->overlay.p++); gDPSetPrimColor(gfxCtx->overlay.p++, 0, 0, 0xFF, 0xFF, 0xFF, interfaceCtx->magicAlpha); - gDPSetCombineLERP(gfxCtx->overlay.p++, - 0, 0, 0, PRIMITIVE, TEXEL0, 0, PRIMITIVE, 0, - 0, 0, 0, PRIMITIVE, TEXEL0, 0, PRIMITIVE, 0); + gDPSetCombineLERP(gfxCtx->overlay.p++, 0, 0, 0, PRIMITIVE, TEXEL0, 0, PRIMITIVE, 0, 0, 0, 0, + PRIMITIVE, TEXEL0, 0, PRIMITIVE, 0); interfaceCtx->counterDigits[2] = 0; interfaceCtx->counterDigits[3] = gSaveContext.dungeon_keys[gSaveContext.dungeon_index]; - while (interfaceCtx->counterDigits[3] >= 10) - { + while (interfaceCtx->counterDigits[3] >= 10) { interfaceCtx->counterDigits[2]++; interfaceCtx->counterDigits[3] -= 10; } phi_s2 = 42; - if (interfaceCtx->counterDigits[2] != 0) - { - gfxCtx->overlay.p = Draw_TextureI8(gfxCtx->overlay.p, - &D_02003040[interfaceCtx->counterDigits[2]], - 8, 16, - phi_s2, 190, - 8, 16, - 1024, 1024); + if (interfaceCtx->counterDigits[2] != 0) { + gfxCtx->overlay.p = + Gfx_TextureI8(gfxCtx->overlay.p, &D_02003040[interfaceCtx->counterDigits[2]], 8, 16, phi_s2, + 190, 8, 16, 1024, 1024); phi_s2 = 50; } - gfxCtx->overlay.p = Draw_TextureI8(gfxCtx->overlay.p, - &D_02003040[interfaceCtx->counterDigits[3]], - 8, 16, - phi_s2, 190, - 8, 16, - 1024, 1024); + gfxCtx->overlay.p = Gfx_TextureI8(gfxCtx->overlay.p, &D_02003040[interfaceCtx->counterDigits[3]], 8, + 16, phi_s2, 190, 8, 16, 1024, 1024); } phi_s2 = 42; @@ -3742,31 +3231,30 @@ void Interface_Draw(GlobalContext* globalCtx) // Rupee Counter gDPPipeSync(gfxCtx->overlay.p++); - if (gSaveContext.rupees == CUR_CAPACITY(UPG_WALLET)) + if (gSaveContext.rupees == CUR_CAPACITY(UPG_WALLET)) { gDPSetPrimColor(gfxCtx->overlay.p++, 0, 0, 0x78, 0xFF, 0x00, interfaceCtx->magicAlpha); - else if (gSaveContext.rupees != 0) + } else if (gSaveContext.rupees != 0) { gDPSetPrimColor(gfxCtx->overlay.p++, 0, 0, 0xFF, 0xFF, 0xFF, interfaceCtx->magicAlpha); - else + } else { gDPSetPrimColor(gfxCtx->overlay.p++, 0, 0, 0x64, 0x64, 0x64, interfaceCtx->magicAlpha); + } - gDPSetCombineLERP(gfxCtx->overlay.p++, - 0, 0, 0, PRIMITIVE, TEXEL0, 0, PRIMITIVE, 0, - 0, 0, 0, PRIMITIVE, TEXEL0, 0, PRIMITIVE, 0); + gDPSetCombineLERP(gfxCtx->overlay.p++, 0, 0, 0, PRIMITIVE, TEXEL0, 0, PRIMITIVE, 0, 0, 0, 0, PRIMITIVE, TEXEL0, + 0, PRIMITIVE, 0); interfaceCtx->counterDigits[0] = interfaceCtx->counterDigits[1] = 0; interfaceCtx->counterDigits[2] = gSaveContext.rupees; - if ((interfaceCtx->counterDigits[2] >= 10000) || (interfaceCtx->counterDigits[2] < 0)) + if ((interfaceCtx->counterDigits[2] >= 10000) || (interfaceCtx->counterDigits[2] < 0)) { interfaceCtx->counterDigits[2] &= 0xDDD; + } - while (interfaceCtx->counterDigits[2] >= 100) - { + while (interfaceCtx->counterDigits[2] >= 100) { interfaceCtx->counterDigits[2] -= 100; interfaceCtx->counterDigits[0]++; } - while (interfaceCtx->counterDigits[2] >= 10) - { + while (interfaceCtx->counterDigits[2] >= 10) { interfaceCtx->counterDigits[2] -= 10; interfaceCtx->counterDigits[1]++; } @@ -3774,21 +3262,17 @@ void Interface_Draw(GlobalContext* globalCtx) phi_s0 = sRupeeDigitsFirst[CUR_UPG_VALUE(UPG_WALLET)]; phi_s1 = sRupeeDigitsCount[CUR_UPG_VALUE(UPG_WALLET)]; - for (phi_s3 = 0; phi_s3 < phi_s1; phi_s3++, phi_s0++, phi_s2 += 8) - { - gfxCtx->overlay.p = Draw_TextureI8(gfxCtx->overlay.p, - &D_02003040[interfaceCtx->counterDigits[phi_s0]], - 8, 16, - phi_s2, 206, - 8, 16, - 1024, 1024); + for (phi_s3 = 0; phi_s3 < phi_s1; phi_s3++, phi_s0++, phi_s2 += 8) { + gfxCtx->overlay.p = Gfx_TextureI8(gfxCtx->overlay.p, &D_02003040[interfaceCtx->counterDigits[phi_s0]], 8, + 16, phi_s2, 206, 8, 16, 1024, 1024); } Interface_DrawMagicBar(globalCtx); Interface_DrawMinimap(globalCtx); - if ((R_PAUSE_MENU_MODE != 2) && (R_PAUSE_MENU_MODE != 3)) + if ((R_PAUSE_MENU_MODE != 2) && (R_PAUSE_MENU_MODE != 3)) { func_8002C124(&globalCtx->actorCtx.targetCtx, globalCtx); // Draw Z-Target + } func_80094520(globalCtx->state.gfxCtx); @@ -3796,214 +3280,179 @@ void Interface_Draw(GlobalContext* globalCtx) gDPPipeSync(gfxCtx->overlay.p++); gDPSetPrimColor(gfxCtx->overlay.p++, 0, 0, 0xFF, 0xFF, 0xFF, interfaceCtx->bAlpha); - gDPSetCombineLERP(gfxCtx->overlay.p++, - TEXEL0, 0, PRIMITIVE, 0, TEXEL0, 0, PRIMITIVE, 0, - TEXEL0, 0, PRIMITIVE, 0, TEXEL0, 0, PRIMITIVE, 0); + gDPSetCombineMode(gfxCtx->overlay.p++, G_CC_MODULATEIA_PRIM, G_CC_MODULATEIA_PRIM); - if (interfaceCtx->unk_1FA == 0) - { + if (interfaceCtx->unk_1FA == 0) { // B Button Icon & possibly Ammo Count - if (gSaveContext.equips.button_items[0] != ITEM_NONE) - { + if (gSaveContext.equips.button_items[0] != ITEM_NONE) { Interface_DrawItemIconTexture(globalCtx, (void*)(u32)interfaceCtx->icon_itemSegment, 0); if ((player->stateFlags1 & 0x00800000) || (globalCtx->unk_11E5C >= 2) || - ((globalCtx->sceneNum == SCENE_BOWLING) && Flags_GetSwitch(globalCtx, 0x38))) - { + ((globalCtx->sceneNum == SCENE_BOWLING) && Flags_GetSwitch(globalCtx, 0x38))) { gDPPipeSync(gfxCtx->overlay.p++); - gDPSetCombineLERP(gfxCtx->overlay.p++, - PRIMITIVE, ENVIRONMENT, TEXEL0, ENVIRONMENT, TEXEL0, 0, PRIMITIVE, 0, - PRIMITIVE, ENVIRONMENT, TEXEL0, ENVIRONMENT, TEXEL0, 0, PRIMITIVE, 0); + gDPSetCombineLERP(gfxCtx->overlay.p++, PRIMITIVE, ENVIRONMENT, TEXEL0, ENVIRONMENT, TEXEL0, 0, + PRIMITIVE, 0, PRIMITIVE, ENVIRONMENT, TEXEL0, ENVIRONMENT, TEXEL0, 0, PRIMITIVE, + 0); Interface_DrawAmmoCount(globalCtx, 0, interfaceCtx->bAlpha); } } - } - else - { + } else { // B Button Do Action Label gDPPipeSync(gfxCtx->overlay.p++); - gDPSetCombineLERP(gfxCtx->overlay.p++, - PRIMITIVE, ENVIRONMENT, TEXEL0, ENVIRONMENT, TEXEL0, 0, PRIMITIVE, 0, + gDPSetCombineLERP(gfxCtx->overlay.p++, PRIMITIVE, ENVIRONMENT, TEXEL0, ENVIRONMENT, TEXEL0, 0, PRIMITIVE, 0, PRIMITIVE, ENVIRONMENT, TEXEL0, ENVIRONMENT, TEXEL0, 0, PRIMITIVE, 0); gDPSetPrimColor(gfxCtx->overlay.p++, 0, 0, 0xFF, 0xFF, 0xFF, interfaceCtx->bAlpha); - gDPSetTextureImage(gfxCtx->overlay.p++, G_IM_FMT_IA, G_IM_SIZ_16b, 1, (u32)interfaceCtx->do_actionSegment + 0x180); - gDPSetTile(gfxCtx->overlay.p++, 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); + gDPSetTextureImage(gfxCtx->overlay.p++, G_IM_FMT_IA, G_IM_SIZ_16b, 1, + (u32)interfaceCtx->do_actionSegment + 0x180); + gDPSetTile(gfxCtx->overlay.p++, 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(gfxCtx->overlay.p++); gDPLoadBlock(gfxCtx->overlay.p++, G_TX_LOADTILE, 0, 0, 191, 683); gDPPipeSync(gfxCtx->overlay.p++); - gDPSetTile(gfxCtx->overlay.p++, 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); + gDPSetTile(gfxCtx->overlay.p++, 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(gfxCtx->overlay.p++, G_TX_RENDERTILE, 0, 0, 188, 60); R_B_LABEL_DD = 1024.0f / (WREG(37 + gSaveContext.language) / 100.0f); - gSPTextureRectangle(gfxCtx->overlay.p++, - 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) << 2, - G_TX_RENDERTILE, - 0, 0, - R_B_LABEL_DD, R_B_LABEL_DD); + gSPTextureRectangle(gfxCtx->overlay.p++, 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) << 2, G_TX_RENDERTILE, 0, 0, R_B_LABEL_DD, + R_B_LABEL_DD); } gDPPipeSync(gfxCtx->overlay.p++); // C-Left Button Icon & Ammo Count - if (gSaveContext.equips.button_items[1] < 0xF0) - { + if (gSaveContext.equips.button_items[1] < 0xF0) { gDPSetPrimColor(gfxCtx->overlay.p++, 0, 0, 0xFF, 0xFF, 0xFF, interfaceCtx->cLeftAlpha); - gDPSetCombineLERP(gfxCtx->overlay.p++, - TEXEL0, 0, PRIMITIVE, 0, TEXEL0, 0, PRIMITIVE, 0, - TEXEL0, 0, PRIMITIVE, 0, TEXEL0, 0, PRIMITIVE, 0); + gDPSetCombineMode(gfxCtx->overlay.p++, G_CC_MODULATEIA_PRIM, G_CC_MODULATEIA_PRIM); Interface_DrawItemIconTexture(globalCtx, (void*)((u32)interfaceCtx->icon_itemSegment + 0x1000), 1); gDPPipeSync(gfxCtx->overlay.p++); - gDPSetCombineLERP(gfxCtx->overlay.p++, - PRIMITIVE, ENVIRONMENT, TEXEL0, ENVIRONMENT, TEXEL0, 0, PRIMITIVE, 0, - PRIMITIVE, ENVIRONMENT, TEXEL0, ENVIRONMENT, TEXEL0, 0, PRIMITIVE, 0); + gDPSetCombineLERP(gfxCtx->overlay.p++, PRIMITIVE, ENVIRONMENT, TEXEL0, ENVIRONMENT, TEXEL0, 0, PRIMITIVE, 0, + PRIMITIVE, ENVIRONMENT, TEXEL0, ENVIRONMENT, TEXEL0, 0, PRIMITIVE, 0); Interface_DrawAmmoCount(globalCtx, 1, interfaceCtx->cLeftAlpha); } gDPPipeSync(gfxCtx->overlay.p++); // C-Down Button Icon & Ammo Count - if (gSaveContext.equips.button_items[2] < 0xF0) - { + if (gSaveContext.equips.button_items[2] < 0xF0) { gDPSetPrimColor(gfxCtx->overlay.p++, 0, 0, 0xFF, 0xFF, 0xFF, interfaceCtx->cDownAlpha); - gDPSetCombineLERP(gfxCtx->overlay.p++, - TEXEL0, 0, PRIMITIVE, 0, TEXEL0, 0, PRIMITIVE, 0, - TEXEL0, 0, PRIMITIVE, 0, TEXEL0, 0, PRIMITIVE, 0); + gDPSetCombineMode(gfxCtx->overlay.p++, G_CC_MODULATEIA_PRIM, G_CC_MODULATEIA_PRIM); Interface_DrawItemIconTexture(globalCtx, (void*)((u32)interfaceCtx->icon_itemSegment + 0x2000), 2); gDPPipeSync(gfxCtx->overlay.p++); - gDPSetCombineLERP(gfxCtx->overlay.p++, - PRIMITIVE, ENVIRONMENT, TEXEL0, ENVIRONMENT, TEXEL0, 0, PRIMITIVE, 0, - PRIMITIVE, ENVIRONMENT, TEXEL0, ENVIRONMENT, TEXEL0, 0, PRIMITIVE, 0); + gDPSetCombineLERP(gfxCtx->overlay.p++, PRIMITIVE, ENVIRONMENT, TEXEL0, ENVIRONMENT, TEXEL0, 0, PRIMITIVE, 0, + PRIMITIVE, ENVIRONMENT, TEXEL0, ENVIRONMENT, TEXEL0, 0, PRIMITIVE, 0); Interface_DrawAmmoCount(globalCtx, 2, interfaceCtx->cDownAlpha); } gDPPipeSync(gfxCtx->overlay.p++); // C-Right Button Icon & Ammo Count - if (gSaveContext.equips.button_items[3] < 0xF0) - { + if (gSaveContext.equips.button_items[3] < 0xF0) { gDPSetPrimColor(gfxCtx->overlay.p++, 0, 0, 0xFF, 0xFF, 0xFF, interfaceCtx->cRightAlpha); - gDPSetCombineLERP(gfxCtx->overlay.p++, - TEXEL0, 0, PRIMITIVE, 0, TEXEL0, 0, PRIMITIVE, 0, - TEXEL0, 0, PRIMITIVE, 0, TEXEL0, 0, PRIMITIVE, 0); + gDPSetCombineMode(gfxCtx->overlay.p++, G_CC_MODULATEIA_PRIM, G_CC_MODULATEIA_PRIM); Interface_DrawItemIconTexture(globalCtx, (void*)((u32)interfaceCtx->icon_itemSegment + 0x3000), 3); gDPPipeSync(gfxCtx->overlay.p++); - gDPSetCombineLERP(gfxCtx->overlay.p++, - PRIMITIVE, ENVIRONMENT, TEXEL0, ENVIRONMENT, TEXEL0, 0, PRIMITIVE, 0, - PRIMITIVE, ENVIRONMENT, TEXEL0, ENVIRONMENT, TEXEL0, 0, PRIMITIVE, 0); + gDPSetCombineLERP(gfxCtx->overlay.p++, PRIMITIVE, ENVIRONMENT, TEXEL0, ENVIRONMENT, TEXEL0, 0, PRIMITIVE, 0, + PRIMITIVE, ENVIRONMENT, TEXEL0, ENVIRONMENT, TEXEL0, 0, PRIMITIVE, 0); Interface_DrawAmmoCount(globalCtx, 3, interfaceCtx->cRightAlpha); } // 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); + func_8008A8B8(globalCtx, R_A_BTN_Y, R_A_BTN_Y + 45, R_A_BTN_X, R_A_BTN_X + 45); gSPClearGeometryMode(gfxCtx->overlay.p++, G_CULL_BOTH); - gDPSetCombineLERP(gfxCtx->overlay.p++, - TEXEL0, 0, PRIMITIVE, 0, TEXEL0, 0, PRIMITIVE, 0, - TEXEL0, 0, PRIMITIVE, 0, TEXEL0, 0, PRIMITIVE, 0); - gDPSetPrimColor(gfxCtx->overlay.p++, 0, 0, - R_A_BTN_COLOR(0), R_A_BTN_COLOR(1), - R_A_BTN_COLOR(2), interfaceCtx->aAlpha); + gDPSetCombineMode(gfxCtx->overlay.p++, G_CC_MODULATEIA_PRIM, G_CC_MODULATEIA_PRIM); + gDPSetPrimColor(gfxCtx->overlay.p++, 0, 0, R_A_BTN_COLOR(0), R_A_BTN_COLOR(1), R_A_BTN_COLOR(2), + interfaceCtx->aAlpha); Interface_DrawActionButton(globalCtx); gDPPipeSync(gfxCtx->overlay.p++); - func_8008A8B8(globalCtx, - R_A_ICON_Y, R_A_ICON_Y + 45, - R_A_ICON_X, R_A_ICON_X + 45); + func_8008A8B8(globalCtx, R_A_ICON_Y, R_A_ICON_Y + 45, R_A_ICON_X, R_A_ICON_X + 45); gSPSetGeometryMode(gfxCtx->overlay.p++, G_CULL_BACK); - gDPSetCombineLERP(gfxCtx->overlay.p++, - PRIMITIVE, ENVIRONMENT, TEXEL0, ENVIRONMENT, TEXEL0, 0, PRIMITIVE, 0, + gDPSetCombineLERP(gfxCtx->overlay.p++, PRIMITIVE, ENVIRONMENT, TEXEL0, ENVIRONMENT, TEXEL0, 0, PRIMITIVE, 0, PRIMITIVE, ENVIRONMENT, TEXEL0, ENVIRONMENT, TEXEL0, 0, PRIMITIVE, 0); gDPSetPrimColor(gfxCtx->overlay.p++, 0, 0, 0xFF, 0xFF, 0xFF, interfaceCtx->aAlpha); gDPSetEnvColor(gfxCtx->overlay.p++, 0x00, 0x00, 0x00, 0x00); 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(gfxCtx->overlay.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_parameter.c", 3701), G_MTX_MODELVIEW | G_MTX_LOAD); + gSPMatrix(gfxCtx->overlay.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_parameter.c", 3701), + G_MTX_MODELVIEW | G_MTX_LOAD); gSPVertex(gfxCtx->overlay.p++, &interfaceCtx->vtx_128[4], 4, 0); - if ((interfaceCtx->unk_1EC < 2) || (interfaceCtx->unk_1EC == 3)) + if ((interfaceCtx->unk_1EC < 2) || (interfaceCtx->unk_1EC == 3)) { Interface_DrawActionLabel(globalCtx->state.gfxCtx, (void*)(u32)interfaceCtx->do_actionSegment); - else + } else { Interface_DrawActionLabel(globalCtx->state.gfxCtx, (void*)((u32)interfaceCtx->do_actionSegment + 0x180)); + } gDPPipeSync(gfxCtx->overlay.p++); func_8008A994(interfaceCtx); - if ((pauseCtx->state == 6) && (pauseCtx->unk_1E4 == 3)) - { + if ((pauseCtx->state == 6) && (pauseCtx->unk_1E4 == 3)) { // Inventory Equip Effects gSPSegment(gfxCtx->overlay.p++, 0x08, pauseCtx->unk_128); func_80094A14(globalCtx->state.gfxCtx); - gDPSetCombineLERP(gfxCtx->overlay.p++, - TEXEL0, 0, PRIMITIVE, 0, TEXEL0, 0, PRIMITIVE, 0, - TEXEL0, 0, PRIMITIVE, 0, TEXEL0, 0, PRIMITIVE, 0); + gDPSetCombineMode(gfxCtx->overlay.p++, G_CC_MODULATEIA_PRIM, G_CC_MODULATEIA_PRIM); gSPMatrix(gfxCtx->overlay.p++, &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] = pauseCtx->vtx_168[16].v.ob[0] + WREG(90) / 10; + pauseCtx->vtx_168[17].v.ob[0] = pauseCtx->vtx_168[19].v.ob[0] = + pauseCtx->vtx_168[16].v.ob[0] + WREG(90) / 10; pauseCtx->vtx_168[16].v.ob[1] = pauseCtx->vtx_168[17].v.ob[1] = pauseCtx->unk_256 / 10; - pauseCtx->vtx_168[18].v.ob[1] = pauseCtx->vtx_168[19].v.ob[1] = pauseCtx->vtx_168[16].v.ob[1] - WREG(90) / 10; + pauseCtx->vtx_168[18].v.ob[1] = pauseCtx->vtx_168[19].v.ob[1] = + pauseCtx->vtx_168[16].v.ob[1] - WREG(90) / 10; - if (pauseCtx->unk_24E < 0xBF) - { + if (pauseCtx->unk_24E < 0xBF) { // Normal Equip (icon goes from the inventory slot to the C button when equipping it) gDPSetPrimColor(gfxCtx->overlay.p++, 0, 0, 0xFF, 0xFF, 0xFF, pauseCtx->unk_258); gSPVertex(gfxCtx->overlay.p++, &pauseCtx->vtx_168[16], 4, 0); gDPSetTextureImage(gfxCtx->overlay.p++, G_IM_FMT_RGBA, G_IM_SIZ_32b, 1, gItemIcons[pauseCtx->unk_24E]); - gDPSetTile(gfxCtx->overlay.p++, 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); + gDPSetTile(gfxCtx->overlay.p++, 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(gfxCtx->overlay.p++); gDPLoadBlock(gfxCtx->overlay.p++, G_TX_LOADTILE, 0, 0, 1023, 128); gDPPipeSync(gfxCtx->overlay.p++); - gDPSetTile(gfxCtx->overlay.p++, 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); + gDPSetTile(gfxCtx->overlay.p++, 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(gfxCtx->overlay.p++, G_TX_RENDERTILE, 0, 0, 124, 124); - } - else - { + } else { // Magic Arrow Equip Effect phi_s3_2 = pauseCtx->unk_24E - 0xBF; - gDPSetPrimColor(gfxCtx->overlay.p++, 0, 0, - sMagicArrowEffectsR[phi_s3_2], sMagicArrowEffectsG[phi_s3_2], + gDPSetPrimColor(gfxCtx->overlay.p++, 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)) - { + if ((pauseCtx->unk_258 > 0) && (pauseCtx->unk_258 < 0xFF)) { phi_s3_2 = (pauseCtx->unk_258 / 8) / 2; - pauseCtx->vtx_168[16].v.ob[0] = pauseCtx->vtx_168[18].v.ob[0] = pauseCtx->vtx_168[16].v.ob[0] - phi_s3_2; - pauseCtx->vtx_168[17].v.ob[0] = pauseCtx->vtx_168[19].v.ob[0] = pauseCtx->vtx_168[16].v.ob[0] + phi_s3_2 * 2 + 32; - pauseCtx->vtx_168[16].v.ob[1] = pauseCtx->vtx_168[17].v.ob[1] = pauseCtx->vtx_168[16].v.ob[1] + phi_s3_2; - pauseCtx->vtx_168[18].v.ob[1] = pauseCtx->vtx_168[19].v.ob[1] = pauseCtx->vtx_168[16].v.ob[1] - phi_s3_2 * 2 - 32; + pauseCtx->vtx_168[16].v.ob[0] = pauseCtx->vtx_168[18].v.ob[0] = + pauseCtx->vtx_168[16].v.ob[0] - phi_s3_2; + pauseCtx->vtx_168[17].v.ob[0] = pauseCtx->vtx_168[19].v.ob[0] = + pauseCtx->vtx_168[16].v.ob[0] + phi_s3_2 * 2 + 32; + pauseCtx->vtx_168[16].v.ob[1] = pauseCtx->vtx_168[17].v.ob[1] = + pauseCtx->vtx_168[16].v.ob[1] + phi_s3_2; + pauseCtx->vtx_168[18].v.ob[1] = pauseCtx->vtx_168[19].v.ob[1] = + pauseCtx->vtx_168[16].v.ob[1] - phi_s3_2 * 2 - 32; } gSPVertex(gfxCtx->overlay.p++, &pauseCtx->vtx_168[16], 4, 0); gDPSetTextureImage(gfxCtx->overlay.p++, G_IM_FMT_IA, G_IM_SIZ_16b, 1, D_080895C0); - gDPSetTile(gfxCtx->overlay.p++, 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); + gDPSetTile(gfxCtx->overlay.p++, 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(gfxCtx->overlay.p++); gDPLoadBlock(gfxCtx->overlay.p++, G_TX_LOADTILE, 0, 0, 511, 512); gDPPipeSync(gfxCtx->overlay.p++); - gDPSetTile(gfxCtx->overlay.p++, 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); + gDPSetTile(gfxCtx->overlay.p++, 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(gfxCtx->overlay.p++, G_TX_RENDERTILE, 0, 0, 124, 124); } @@ -4012,108 +3461,81 @@ void Interface_Draw(GlobalContext* globalCtx) func_80094520(globalCtx->state.gfxCtx); - if ((globalCtx->pauseCtx.state == 0) && (globalCtx->pauseCtx.flag == 0)) - { - if (gSaveContext.minigame_state != 1) - { + if ((globalCtx->pauseCtx.state == 0) && (globalCtx->pauseCtx.flag == 0)) { + if (gSaveContext.minigame_state != 1) { // Carrots rendering if the action corresponds to riding a horse - if (interfaceCtx->unk_1EE == 8) - { + if (interfaceCtx->unk_1EE == 8) { // Load Carrot Icon gDPSetTextureImage(gfxCtx->overlay.p++, G_IM_FMT_RGBA, G_IM_SIZ_32b, 1, &D_02002100); - gDPSetTile(gfxCtx->overlay.p++, 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); + gDPSetTile(gfxCtx->overlay.p++, 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(gfxCtx->overlay.p++); gDPLoadBlock(gfxCtx->overlay.p++, G_TX_LOADTILE, 0, 0, 255, 256); gDPPipeSync(gfxCtx->overlay.p++); - gDPSetTile(gfxCtx->overlay.p++, 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); + gDPSetTile(gfxCtx->overlay.p++, 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(gfxCtx->overlay.p++, G_TX_RENDERTILE, 0, 0, 60, 60); // Draw 6 carrots phi_s1 = ZREG(14); - for (phi_s3 = 1; phi_s3 < 7; phi_s3++) - { + for (phi_s3 = 1; phi_s3 < 7; phi_s3++) { // Carrot Color (based on availability) - if ((interfaceCtx->unk_23A == 0) || (interfaceCtx->unk_23A < phi_s3)) + if ((interfaceCtx->unk_23A == 0) || (interfaceCtx->unk_23A < phi_s3)) { gDPSetPrimColor(gfxCtx->overlay.p++, 0, 0, 0x00, 0x96, 0xFF, interfaceCtx->aAlpha); - else + } else { gDPSetPrimColor(gfxCtx->overlay.p++, 0, 0, 0xFF, 0xFF, 0xFF, interfaceCtx->aAlpha); + } - gSPTextureRectangle(gfxCtx->overlay.p++, - phi_s1 << 2, ZREG(15) << 2, - (phi_s1 + 16) << 2, (ZREG(15) + 16) << 2, - G_TX_RENDERTILE, - 0, 0, - 1024, 1024); + gSPTextureRectangle(gfxCtx->overlay.p++, phi_s1 << 2, ZREG(15) << 2, (phi_s1 + 16) << 2, + (ZREG(15) + 16) << 2, G_TX_RENDERTILE, 0, 0, 1024, 1024); phi_s1 += 16; } } - } - else - { + } else { // Score for the Horseback Archery gDPSetPrimColor(gfxCtx->overlay.p++, 0, 0, 0xFF, 0xFF, 0xFF, interfaceCtx->bAlpha); // Target Icon gDPSetTextureImage(gfxCtx->overlay.p++, G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, D_02002600); - gDPSetTile(gfxCtx->overlay.p++, 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); + gDPSetTile(gfxCtx->overlay.p++, 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(gfxCtx->overlay.p++); gDPLoadBlock(gfxCtx->overlay.p++, G_TX_LOADTILE, 0, 0, 383, 342); gDPPipeSync(gfxCtx->overlay.p++); - gDPSetTile(gfxCtx->overlay.p++, 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); + gDPSetTile(gfxCtx->overlay.p++, 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(gfxCtx->overlay.p++, G_TX_RENDERTILE, 0, 0, 92, 60); - gSPTextureRectangle(gfxCtx->overlay.p++, - (WREG(32) + 28) << 2, ZREG(15) << 2, - (WREG(32) + 52) << 2, (ZREG(15) + 16) << 2, - G_TX_RENDERTILE, - 0, 0, - 1024, 1024); + gSPTextureRectangle(gfxCtx->overlay.p++, (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(gfxCtx->overlay.p++); - gDPSetCombineLERP(gfxCtx->overlay.p++, - 0, 0, 0, PRIMITIVE, TEXEL0, 0, PRIMITIVE, 0, - 0, 0, 0, PRIMITIVE, TEXEL0, 0, PRIMITIVE, 0); + gDPSetCombineMode(gfxCtx->overlay.p++, 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)) - { - gfxCtx->overlay.p = Draw_TextureI8(gfxCtx->overlay.p, - &D_02003040[sHBAScoreDigits[phi_s3]], - 8, 16, - phi_s1, ZREG(15) - 2, - sDigitWidth[0], VREG(42), - VREG(43) * 2, VREG(43) * 2); + for (phi_s3 = 0; phi_s3 < 4; phi_s3++) { + if (sHBAScoreDigits[phi_s3] != 0 || (phi_s0 != 0) || (phi_s3 >= 3)) { + gfxCtx->overlay.p = + Gfx_TextureI8(gfxCtx->overlay.p, &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(gfxCtx->overlay.p++); - gDPSetCombineLERP(gfxCtx->overlay.p++, - TEXEL0, 0, PRIMITIVE, 0, TEXEL0, 0, PRIMITIVE, 0, - TEXEL0, 0, PRIMITIVE, 0, TEXEL0, 0, PRIMITIVE, 0); + gDPSetCombineMode(gfxCtx->overlay.p++, G_CC_MODULATEIA_PRIM, G_CC_MODULATEIA_PRIM); } } - if ((gSaveContext.timer_2_state == 5) && (func_8010BDBC(&globalCtx->msgCtx) == 5)) - { + if ((gSaveContext.timer_2_state == 5) && (func_8010BDBC(&globalCtx->msgCtx) == 5)) { // Trade quest timer reached 0 gSaveContext.cutscene_index = 0; globalCtx->sceneLoadFlag = 0x14; @@ -4124,28 +3546,24 @@ void Interface_Draw(GlobalContext* globalCtx) if ((gSaveContext.equips.button_items[0] != ITEM_SWORD_KOKIRI) && (gSaveContext.equips.button_items[0] != ITEM_SWORD_MASTER) && (gSaveContext.equips.button_items[0] != ITEM_SWORD_BGS) && - (gSaveContext.equips.button_items[0] != ITEM_SWORD_KNIFE)) - { - if (gSaveContext.button_status[0] != BTN_ENABLED) + (gSaveContext.equips.button_items[0] != ITEM_SWORD_KNIFE)) { + if (gSaveContext.button_status[0] != BTN_ENABLED) { gSaveContext.equips.button_items[0] = gSaveContext.button_status[0]; - else + } else { gSaveContext.equips.button_items[0] = ITEM_NONE; + } } // Revert any spoiling trade quest items - for (phi_s3 = 0; phi_s3 < ARRAY_COUNT(gSpoilingItems); phi_s3++) - { - if (INV_CONTENT(ITEM_POCKET_EGG) == gSpoilingItems[phi_s3]) - { + for (phi_s3 = 0; phi_s3 < ARRAY_COUNT(gSpoilingItems); phi_s3++) { + if (INV_CONTENT(ITEM_POCKET_EGG) == gSpoilingItems[phi_s3]) { gSaveContext.event_inf[0] &= 0x7F80; osSyncPrintf("EVENT_INF=%x\n", gSaveContext.event_inf[0]); globalCtx->nextEntranceIndex = sSpoilingItemEntrances[phi_s3]; INV_CONTENT(gSpoilingItemReverts[phi_s3]) = gSpoilingItemReverts[phi_s3]; - for (phi_s0 = 1; phi_s0 < 4; phi_s0++) - { - if (gSaveContext.equips.button_items[phi_s0] == gSpoilingItems[phi_s3]) - { + for (phi_s0 = 1; phi_s0 < 4; phi_s0++) { + if (gSaveContext.equips.button_items[phi_s0] == gSpoilingItems[phi_s3]) { gSaveContext.equips.button_items[phi_s0] = gSpoilingItemReverts[phi_s3]; Interface_LoadItemIcon1(globalCtx, phi_s0); } @@ -4154,21 +3572,13 @@ void Interface_Draw(GlobalContext* globalCtx) } } - if ((globalCtx->pauseCtx.state == 0) && - (globalCtx->pauseCtx.flag == 0) && - (globalCtx->unk_10A20 == 0) && - (msgCtx->msgMode == 0) && - !(player->stateFlags2 & 0x01000000) && - (globalCtx->sceneLoadFlag == 0) && - (globalCtx->unk_1241B == 0) && - (func_800BFC84(globalCtx) == 0) && - (gSaveContext.minigame_state != 1) && + if ((globalCtx->pauseCtx.state == 0) && (globalCtx->pauseCtx.flag == 0) && (globalCtx->unk_10A20 == 0) && + (msgCtx->msgMode == 0) && !(player->stateFlags2 & 0x01000000) && (globalCtx->sceneLoadFlag == 0) && + (globalCtx->unk_1241B == 0) && (func_800BFC84(globalCtx) == 0) && (gSaveContext.minigame_state != 1) && (globalCtx->unk_11E5C < 2) && - !((globalCtx->sceneNum == SCENE_BOWLING) && Flags_GetSwitch(globalCtx, 0x38))) - { + !((globalCtx->sceneNum == SCENE_BOWLING) && Flags_GetSwitch(globalCtx, 0x38))) { sp274 = 0; - switch (gSaveContext.timer_1_state) - { + switch (gSaveContext.timer_1_state) { case 1: gSaveContext.timer_1_state = 2; gSaveContext.timer_1_value = gSaveContext.health >> 1; @@ -4176,8 +3586,7 @@ void Interface_Draw(GlobalContext* globalCtx) break; case 2: D_8015FFE2--; - if (D_8015FFE2 == 0) - { + if (D_8015FFE2 == 0) { gSaveContext.timer_1_state = 3; D_8015FFE2 = 20; } @@ -4185,21 +3594,22 @@ void Interface_Draw(GlobalContext* globalCtx) case 5: case 11: D_8015FFE0 = D_8015FFE2 = 20; - if (gSaveContext.timer_1_state == 5) + if (gSaveContext.timer_1_state == 5) { gSaveContext.timer_1_state = 6; - else + } else { gSaveContext.timer_1_state = 12; + } break; case 6: case 12: D_8015FFE2--; - if (D_8015FFE2 == 0) - { + if (D_8015FFE2 == 0) { D_8015FFE2 = 20; - if (gSaveContext.timer_1_state == 6) + if (gSaveContext.timer_1_state == 6) { gSaveContext.timer_1_state = 7; - else + } else { gSaveContext.timer_1_state = 13; + } } break; case 3: @@ -4207,71 +3617,69 @@ void Interface_Draw(GlobalContext* globalCtx) phi_s3 = (gSaveContext.timer_x[0] - 26) / D_8015FFE2; gSaveContext.timer_x[0] -= phi_s3; - if (gSaveContext.health_capacity > 0xA0) + if (gSaveContext.health_capacity > 0xA0) { phi_s3 = (gSaveContext.timer_y[0] - 54) / D_8015FFE2; - else + } else { phi_s3 = (gSaveContext.timer_y[0] - 46) / D_8015FFE2; + } gSaveContext.timer_y[0] -= phi_s3; D_8015FFE2--; - if (D_8015FFE2 == 0) - { + if (D_8015FFE2 == 0) { gSaveContext.timer_x[0] = 26; D_8015FFE2 = 20; - if (gSaveContext.health_capacity > 0xA0) + if (gSaveContext.health_capacity > 0xA0) { gSaveContext.timer_y[0] = 54; - else + } else { gSaveContext.timer_y[0] = 46; + } - if (gSaveContext.timer_1_state == 3) + if (gSaveContext.timer_1_state == 3) { gSaveContext.timer_1_state = 4; - else + } else { gSaveContext.timer_1_state = 8; + } } case 4: case 8: - if ((gSaveContext.timer_1_state == 4) || (gSaveContext.timer_1_state == 8)) - { - if (gSaveContext.health_capacity > 0xA0) + if ((gSaveContext.timer_1_state == 4) || (gSaveContext.timer_1_state == 8)) { + if (gSaveContext.health_capacity > 0xA0) { gSaveContext.timer_y[0] = 54; - else + } else { gSaveContext.timer_y[0] = 46; + } } - if ((gSaveContext.timer_1_state >= 3) && (msgCtx->unk_E300 == 0)) - { + if ((gSaveContext.timer_1_state >= 3) && (msgCtx->unk_E300 == 0)) { D_8015FFE0--; - if (D_8015FFE0 == 0) - { - if (gSaveContext.timer_1_value != 0) + if (D_8015FFE0 == 0) { + if (gSaveContext.timer_1_value != 0) { gSaveContext.timer_1_value--; + } D_8015FFE0 = 20; - if (gSaveContext.timer_1_value == 0) - { + if (gSaveContext.timer_1_value == 0) { gSaveContext.timer_1_state = 10; - if (D_80125A5C != 0) - { + if (D_80125A5C != 0) { gSaveContext.health = 0; globalCtx->unk_11D58(globalCtx, -(gSaveContext.health + 2)); } D_80125A5C = 0; - } - else if (gSaveContext.timer_1_value > 60) - { - if (sTimerDigits[4] == 1) - Audio_PlaySoundGeneral(NA_SE_SY_MESSAGE_WOMAN, &D_801333D4, 4, &D_801333E0, &D_801333E0, &D_801333E8); - } - else if (gSaveContext.timer_1_value >= 11) - { - if (sTimerDigits[4] & 1) - Audio_PlaySoundGeneral(NA_SE_SY_WARNING_COUNT_N, &D_801333D4, 4, &D_801333E0, &D_801333E0, &D_801333E8); - } - else - { - Audio_PlaySoundGeneral(NA_SE_SY_WARNING_COUNT_E, &D_801333D4, 4, &D_801333E0, &D_801333E0, &D_801333E8); + } else if (gSaveContext.timer_1_value > 60) { + if (sTimerDigits[4] == 1) { + Audio_PlaySoundGeneral(NA_SE_SY_MESSAGE_WOMAN, &D_801333D4, 4, &D_801333E0, + &D_801333E0, &D_801333E8); + } + } else if (gSaveContext.timer_1_value >= 11) { + if (sTimerDigits[4] & 1) { + Audio_PlaySoundGeneral(NA_SE_SY_WARNING_COUNT_N, &D_801333D4, 4, &D_801333E0, + &D_801333E0, &D_801333E8); + } + } else { + Audio_PlaySoundGeneral(NA_SE_SY_WARNING_COUNT_E, &D_801333D4, 4, &D_801333E0, + &D_801333E0, &D_801333E8); } } } @@ -4280,70 +3688,65 @@ void Interface_Draw(GlobalContext* globalCtx) phi_s3 = (gSaveContext.timer_x[0] - 26) / D_8015FFE2; gSaveContext.timer_x[0] -= phi_s3; - if (gSaveContext.health_capacity > 0xA0) + if (gSaveContext.health_capacity > 0xA0) { phi_s3 = (gSaveContext.timer_y[0] - 54) / D_8015FFE2; - else + } else { phi_s3 = (gSaveContext.timer_y[0] - 46) / D_8015FFE2; + } gSaveContext.timer_y[0] -= phi_s3; D_8015FFE2--; - if (D_8015FFE2 == 0) - { + if (D_8015FFE2 == 0) { gSaveContext.timer_x[0] = 26; D_8015FFE2 = 20; - if (gSaveContext.health_capacity > 0xA0) + if (gSaveContext.health_capacity > 0xA0) { gSaveContext.timer_y[0] = 54; - else + } else { gSaveContext.timer_y[0] = 46; + } gSaveContext.timer_1_state = 14; } case 14: - if (gSaveContext.timer_1_state == 14) - { - if (gSaveContext.health_capacity > 0xA0) + if (gSaveContext.timer_1_state == 14) { + if (gSaveContext.health_capacity > 0xA0) { gSaveContext.timer_y[0] = 54; - else + } else { gSaveContext.timer_y[0] = 46; + } } - if (gSaveContext.timer_1_state >= 3) - { + if (gSaveContext.timer_1_state >= 3) { D_8015FFE0--; - if (D_8015FFE0 == 0) - { + if (D_8015FFE0 == 0) { gSaveContext.timer_1_value++; D_8015FFE0 = 20; - if (gSaveContext.timer_1_value == 3599) - { + if (gSaveContext.timer_1_value == 3599) { gSaveContext.timer_1_state = 15; D_8015FFE2 = 40; - } - else - { - Audio_PlaySoundGeneral(NA_SE_SY_WARNING_COUNT_N, &D_801333D4, 4, &D_801333E0, &D_801333E0, &D_801333E8); + } else { + Audio_PlaySoundGeneral(NA_SE_SY_WARNING_COUNT_N, &D_801333D4, 4, &D_801333E0, + &D_801333E0, &D_801333E8); } } } break; case 10: - if (gSaveContext.timer_2_state != 0) - { + if (gSaveContext.timer_2_state != 0) { gSaveContext.timer_x[1] = 140; gSaveContext.timer_y[1] = 80; D_8015FFE4 = D_8015FFE6 = 20; - if (gSaveContext.timer_2_state < 7) + if (gSaveContext.timer_2_state < 7) { gSaveContext.timer_2_state = 2; - else + } else { gSaveContext.timer_2_state = 8; + } gSaveContext.timer_1_state = 0; - } - else - { + } else { gSaveContext.timer_1_state = 0; } break; @@ -4351,28 +3754,28 @@ void Interface_Draw(GlobalContext* globalCtx) break; default: sp274 = 1; - switch (gSaveContext.timer_2_state) - { + switch (gSaveContext.timer_2_state) { case 1: case 7: gSaveContext.timer_x[1] = 140; gSaveContext.timer_y[1] = 80; D_8015FFE4 = D_8015FFE6 = 20; - if (gSaveContext.timer_2_state == 1) + if (gSaveContext.timer_2_state == 1) { gSaveContext.timer_2_state = 2; - else + } else { gSaveContext.timer_2_state = 8; + } break; case 2: case 8: D_8015FFE6--; - if (D_8015FFE6 == 0) - { + if (D_8015FFE6 == 0) { D_8015FFE6 = 20; - if (gSaveContext.timer_2_state == 2) + if (gSaveContext.timer_2_state == 2) { gSaveContext.timer_2_state = 3; - else + } else { gSaveContext.timer_2_state = 9; + } } break; case 3: @@ -4383,94 +3786,83 @@ void Interface_Draw(GlobalContext* globalCtx) phi_s3 = (gSaveContext.timer_x[1] - 26) / D_8015FFE2; gSaveContext.timer_x[1] -= phi_s3; - if (gSaveContext.health_capacity > 0xA0) + if (gSaveContext.health_capacity > 0xA0) { phi_s3 = (gSaveContext.timer_y[1] - 54) / D_8015FFE6; - else + } else { phi_s3 = (gSaveContext.timer_y[1] - 46) / D_8015FFE6; + } gSaveContext.timer_y[1] -= phi_s3; D_8015FFE6--; - if (D_8015FFE6 == 0) - { + if (D_8015FFE6 == 0) { gSaveContext.timer_x[1] = 26; D_8015FFE6 = 20; - if (gSaveContext.health_capacity > 0xA0) + if (gSaveContext.health_capacity > 0xA0) { gSaveContext.timer_y[1] = 54; - else + } else { gSaveContext.timer_y[1] = 46; + } - if (gSaveContext.timer_2_state == 3) + if (gSaveContext.timer_2_state == 3) { gSaveContext.timer_2_state = 4; - else + } else { gSaveContext.timer_2_state = 10; + } } case 4: case 10: - if ((gSaveContext.timer_2_state == 4) || (gSaveContext.timer_2_state == 10)) - { - if (gSaveContext.health_capacity > 0xA0) + if ((gSaveContext.timer_2_state == 4) || (gSaveContext.timer_2_state == 10)) { + if (gSaveContext.health_capacity > 0xA0) { gSaveContext.timer_y[1] = 54; - else + } else { gSaveContext.timer_y[1] = 46; + } } - if (gSaveContext.timer_2_state >= 3) - { + if (gSaveContext.timer_2_state >= 3) { D_8015FFE4--; - if (D_8015FFE4 == 0) - { + if (D_8015FFE4 == 0) { D_8015FFE4 = 20; - if (gSaveContext.timer_2_state == 4) - { + if (gSaveContext.timer_2_state == 4) { gSaveContext.timer_2_value--; osSyncPrintf("TOTAL_EVENT_TM=%d\n", gSaveContext.timer_2_value); - if (gSaveContext.timer_2_value <= 0) - { + if (gSaveContext.timer_2_value <= 0) { if (!Flags_GetSwitch(globalCtx, 0x37) || ((globalCtx->sceneNum != SCENE_GANON_DEMO) && (globalCtx->sceneNum != SCENE_GANON_FINAL) && (globalCtx->sceneNum != SCENE_GANON_SONOGO) && - (globalCtx->sceneNum != SCENE_GANONTIKA_SONOGO))) - { + (globalCtx->sceneNum != SCENE_GANONTIKA_SONOGO))) { gSaveContext.timer_2_state = 5; gSaveContext.cutscene_index = 0; D_8015FFE6 = 40; func_8010B680(globalCtx, 0x71B0, 0); func_8002DF54(globalCtx, 0, 8); - } - else - { + } else { gSaveContext.timer_2_state = 6; D_8015FFE6 = 40; } - } - else - { - if (gSaveContext.timer_2_value > 60) - { - if (sTimerDigits[4] == 1) - Audio_PlaySoundGeneral(NA_SE_SY_MESSAGE_WOMAN, &D_801333D4, 4, &D_801333E0, &D_801333E0, &D_801333E8); - } - else if (gSaveContext.timer_2_value > 10) - { - if (sTimerDigits[4] & 1) - Audio_PlaySoundGeneral(NA_SE_SY_WARNING_COUNT_N, &D_801333D4, 4, &D_801333E0, &D_801333E0, &D_801333E8); - } - else - { - Audio_PlaySoundGeneral(NA_SE_SY_WARNING_COUNT_E, &D_801333D4, 4, &D_801333E0, &D_801333E0, &D_801333E8); + } else { + if (gSaveContext.timer_2_value > 60) { + if (sTimerDigits[4] == 1) { + Audio_PlaySoundGeneral(NA_SE_SY_MESSAGE_WOMAN, &D_801333D4, 4, + &D_801333E0, &D_801333E0, &D_801333E8); + } + } else if (gSaveContext.timer_2_value > 10) { + if (sTimerDigits[4] & 1) { + Audio_PlaySoundGeneral(NA_SE_SY_WARNING_COUNT_N, &D_801333D4, 4, + &D_801333E0, &D_801333E0, &D_801333E8); + } + } else { + Audio_PlaySoundGeneral(NA_SE_SY_WARNING_COUNT_E, &D_801333D4, 4, + &D_801333E0, &D_801333E0, &D_801333E8); } } - } - else - { + } else { gSaveContext.timer_2_value++; - if (gSaveContext.event_inf[1] & 1) - { - if (gSaveContext.timer_2_value == 240) - { + if (gSaveContext.event_inf[1] & 1) { + if (gSaveContext.timer_2_value == 240) { func_8010B680(globalCtx, 0x6083, 0); gSaveContext.timer_2_state = 0; gSaveContext.event_inf[1] &= ~1; @@ -4478,45 +3870,43 @@ void Interface_Draw(GlobalContext* globalCtx) } } - if ((gSaveContext.timer_2_value % 60) == 0) - { - Audio_PlaySoundGeneral(NA_SE_SY_WARNING_COUNT_N, &D_801333D4, 4, &D_801333E0, &D_801333E0, &D_801333E8); + if ((gSaveContext.timer_2_value % 60) == 0) { + Audio_PlaySoundGeneral(NA_SE_SY_WARNING_COUNT_N, &D_801333D4, 4, &D_801333E0, + &D_801333E0, &D_801333E8); } } } break; case 6: D_8015FFE6--; - if (D_8015FFE6 == 0) + if (D_8015FFE6 == 0) { gSaveContext.timer_2_state = 0; + } break; - } + } } if (((gSaveContext.timer_1_state != 0) && (gSaveContext.timer_1_state != 10)) || - (gSaveContext.timer_2_state != 0)) - { + (gSaveContext.timer_2_state != 0)) { sTimerDigits[0] = sTimerDigits[1] = sTimerDigits[3] = 0; sTimerDigits[2] = 10; // digit 10 is used as ':' (colon) - if (gSaveContext.timer_1_state != 0) + if (gSaveContext.timer_1_state != 0) { sTimerDigits[4] = gSaveContext.timer_1_value; - else + } else { sTimerDigits[4] = gSaveContext.timer_2_value; + } - while (sTimerDigits[4] >= 60) - { + while (sTimerDigits[4] >= 60) { sTimerDigits[1]++; - if (sTimerDigits[1] >= 10) - { + if (sTimerDigits[1] >= 10) { sTimerDigits[1] -= 10; sTimerDigits[0]++; } sTimerDigits[4] -= 60; } - while (sTimerDigits[4] >= 10) - { + while (sTimerDigits[4] >= 10) { sTimerDigits[4] -= 10; sTimerDigits[3]++; } @@ -4525,61 +3915,49 @@ void Interface_Draw(GlobalContext* globalCtx) gDPPipeSync(gfxCtx->overlay.p++); gDPSetPrimColor(gfxCtx->overlay.p++, 0, 0, 0xFF, 0xFF, 0xFF, 0xFF); gDPSetEnvColor(gfxCtx->overlay.p++, 0x00, 0x00, 0x00, 0x00); - gfxCtx->overlay.p = Draw_TextureIA8(gfxCtx->overlay.p, - D_02002000, - 16, 16, - gSaveContext.timer_x[sp274], - gSaveContext.timer_y[sp274] + 2, - 16, 16, - 1024, 1024); + gfxCtx->overlay.p = Gfx_TextureIA8(gfxCtx->overlay.p, D_02002000, 16, 16, gSaveContext.timer_x[sp274], + gSaveContext.timer_y[sp274] + 2, 16, 16, 1024, 1024); // Timer Counter gDPPipeSync(gfxCtx->overlay.p++); - gDPSetCombineLERP(gfxCtx->overlay.p++, - 0, 0, 0, PRIMITIVE, TEXEL0, 0, PRIMITIVE, 0, - 0, 0, 0, PRIMITIVE, TEXEL0, 0, PRIMITIVE, 0); + gDPSetCombineMode(gfxCtx->overlay.p++, G_CC_MODULATEIA_PRIM, G_CC_MODULATEIA_PRIM); - if (gSaveContext.timer_1_state != 0) - { - if ((gSaveContext.timer_1_value < 10) && (gSaveContext.timer_1_state < 11)) + if (gSaveContext.timer_1_state != 0) { + if ((gSaveContext.timer_1_value < 10) && (gSaveContext.timer_1_state < 11)) { gDPSetPrimColor(gfxCtx->overlay.p++, 0, 0, 0xFF, 0x32, 0x00, 0xFF); - else + } else { gDPSetPrimColor(gfxCtx->overlay.p++, 0, 0, 0xFF, 0xFF, 0xFF, 0xFF); - } - else - { - if ((gSaveContext.timer_2_value < 10) && (gSaveContext.timer_2_state < 6)) + } + } else { + if ((gSaveContext.timer_2_value < 10) && (gSaveContext.timer_2_state < 6)) { gDPSetPrimColor(gfxCtx->overlay.p++, 0, 0, 0xFF, 0x32, 0x00, 0xFF); - else + } else { gDPSetPrimColor(gfxCtx->overlay.p++, 0, 0, 0xFF, 0xFF, 0x00, 0xFF); + } } - for (phi_s3 = 0; phi_s3 < 5; phi_s3++) - { - gfxCtx->overlay.p = Draw_TextureI8(gfxCtx->overlay.p, - &D_02003040[sTimerDigits[phi_s3]], - 8, 16, - gSaveContext.timer_x[sp274] + sTimerDigitLeftPos[phi_s3], - gSaveContext.timer_y[sp274], - sDigitWidth[phi_s3], VREG(42), - VREG(43) * 2, VREG(43) * 2); + for (phi_s3 = 0; phi_s3 < 5; phi_s3++) { + gfxCtx->overlay.p = Gfx_TextureI8(gfxCtx->overlay.p, &D_02003040[sTimerDigits[phi_s3]], 8, 16, + gSaveContext.timer_x[sp274] + sTimerDigitLeftPos[phi_s3], + gSaveContext.timer_y[sp274], sDigitWidth[phi_s3], VREG(42), + VREG(43) * 2, VREG(43) * 2); } } } } - if (pauseCtx->flag == 3) + if (pauseCtx->flag == 3) { func_8002AAB0(globalCtx); + } - if (interfaceCtx->unk_244 != 0) - { + if (interfaceCtx->unk_244 != 0) { gDPPipeSync(gfxCtx->overlay.p++); gSPDisplayList(gfxCtx->overlay.p++, sSetupDL_80125A60); gDPSetPrimColor(gfxCtx->overlay.p++, 0, 0, 0x00, 0x00, 0x00, interfaceCtx->unk_244); gDPFillRectangle(gfxCtx->overlay.p++, 0, 0, gScreenWidth - 1, gScreenHeight - 1); } - func_800C6B54(gfxArr, globalCtx->state.gfxCtx, "../z_parameter.c", 4269); + Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_parameter.c", 4269); } #else s16 D_8015FFE0; @@ -4592,52 +3970,40 @@ s16 sTimerDigits[5]; #ifdef NON_MATCHING // regalloc and minor ordering differences -void Interface_Update(GlobalContext* globalCtx) -{ +void Interface_Update(GlobalContext* globalCtx) { static u8 D_80125B60 = 0; static s16 D_80125B64 = 0; MessageContext* msgCtx = &globalCtx->msgCtx; InterfaceContext* interfaceCtx = &globalCtx->interfaceCtx; Player* player = PLAYER; - s16 alpha; // sp+0x3A + s16 alpha; // sp+0x3A s16 alpha1; // sp+0x38 u16 action; Input* input = &globalCtx->state.input[2]; - if (!~(input->padPressed | -0x201)) - { + if (!~(input->padPressed | -0x201)) { gSaveContext.language = 0; osSyncPrintf("J_N=%x J_N=%x\n", gSaveContext.language, &gSaveContext.language); - } - else if (!~(input->padPressed | -0x801)) - { + } else if (!~(input->padPressed | -0x801)) { gSaveContext.language = 1; osSyncPrintf("J_N=%x J_N=%x\n", gSaveContext.language, &gSaveContext.language); - } - else if (!~(input->padPressed | -0x101)) - { + } else if (!~(input->padPressed | -0x101)) { gSaveContext.language = 2; osSyncPrintf("J_N=%x J_N=%x\n", gSaveContext.language, &gSaveContext.language); } - if ((globalCtx->pauseCtx.state == 0) && (globalCtx->pauseCtx.flag == 0)) - { + if ((globalCtx->pauseCtx.state == 0) && (globalCtx->pauseCtx.flag == 0)) { if ((gSaveContext.minigame_state == 1) || (gSaveContext.scene_setup_index < 4) || - ((globalCtx->sceneNum == SCENE_SPOT20) && (gSaveContext.scene_setup_index == 4))) - { - if ((msgCtx->msgMode == 0) || - ((msgCtx->msgMode != 0) && (globalCtx->sceneNum == SCENE_BOWLING))) - { - if (globalCtx->unk_10A20 == 0) - { + ((globalCtx->sceneNum == SCENE_SPOT20) && (gSaveContext.scene_setup_index == 4))) { + if ((msgCtx->msgMode == 0) || ((msgCtx->msgMode != 0) && (globalCtx->sceneNum == SCENE_BOWLING))) { + if (globalCtx->unk_10A20 == 0) { func_80083108(globalCtx); } } } } - switch (gSaveContext.unk_13E8) - { + switch (gSaveContext.unk_13E8) { case 1: case 2: case 3: @@ -4652,35 +4018,40 @@ void Interface_Update(GlobalContext* globalCtx) case 12: case 13: alpha = 0xFF - (gSaveContext.unk_13EC << 5); - if (alpha < 0) + if (alpha < 0) { alpha = 0; + } func_80082850(globalCtx, alpha); gSaveContext.unk_13EC++; - if (alpha == 0) + if (alpha == 0) { gSaveContext.unk_13E8 = 0; + } break; case 50: alpha = 0xFF - (gSaveContext.unk_13EC << 5); - if (alpha < 0) + if (alpha < 0) { alpha = 0; + } alpha1 = 0xFF - alpha; - if (alpha1 >= 0xFF) + if (alpha1 >= 0xFF) { alpha1 = 0xFF; + } osSyncPrintf("case 50 : alpha=%d alpha1=%d\n", alpha, alpha1); func_80082644(globalCtx, alpha1); - if (interfaceCtx->healthAlpha != 0xFF) + if (interfaceCtx->healthAlpha != 0xFF) { interfaceCtx->healthAlpha = alpha1; + } - if (interfaceCtx->magicAlpha != 0xFF) + if (interfaceCtx->magicAlpha != 0xFF) { interfaceCtx->magicAlpha = alpha1; + } - switch (globalCtx->sceneNum) - { + switch (globalCtx->sceneNum) { case SCENE_SPOT00: case SCENE_SPOT01: case SCENE_SPOT02: @@ -4701,20 +4072,23 @@ void Interface_Update(GlobalContext* globalCtx) case SCENE_SPOT18: case SCENE_SPOT20: case SCENE_GANON_TOU: - if (interfaceCtx->minimapAlpha < 0xAA) + if (interfaceCtx->minimapAlpha < 0xAA) { interfaceCtx->minimapAlpha = alpha1; - else + } else { interfaceCtx->minimapAlpha = 0xAA; + } break; default: - if (interfaceCtx->minimapAlpha != 0xFF) + if (interfaceCtx->minimapAlpha != 0xFF) { interfaceCtx->minimapAlpha = alpha1; + } break; } gSaveContext.unk_13EC++; - if (alpha1 == 0xFF) + if (alpha1 == 0xFF) { gSaveContext.unk_13E8 = 0; + } break; case 52: @@ -4727,20 +4101,20 @@ void Interface_Update(GlobalContext* globalCtx) func_8008226C(globalCtx); - if (gSaveContext.health_accumulator != 0) - { + if (gSaveContext.health_accumulator != 0) { gSaveContext.health_accumulator -= 4; gSaveContext.health += 4; - if ((gSaveContext.health & 0xF) < 4) + if ((gSaveContext.health & 0xF) < 4) { Audio_PlaySoundGeneral(NA_SE_SY_HP_RECOVER, &D_801333D4, 4, &D_801333E0, &D_801333E0, &D_801333E8); + } osSyncPrintf("now_life=%d max_life=%d\n", gSaveContext.health, gSaveContext.health_capacity); - if (gSaveContext.health >= gSaveContext.health_capacity) - { + if (gSaveContext.health >= gSaveContext.health_capacity) { gSaveContext.health = gSaveContext.health_capacity; - osSyncPrintf("S_Private.now_life=%d S_Private.max_life=%d\n", gSaveContext.health, gSaveContext.health_capacity); + osSyncPrintf("S_Private.now_life=%d S_Private.max_life=%d\n", gSaveContext.health, + gSaveContext.health_capacity); gSaveContext.health_accumulator = 0; } } @@ -4748,119 +4122,92 @@ void Interface_Update(GlobalContext* globalCtx) Health_HandleCriticalAlarm(globalCtx); D_80125A58 = func_8008F2F8(globalCtx); - if (D_80125A58 == 1) - { - if (CUR_EQUIP_VALUE(EQUIP_TUNIC) == 2) - { + if (D_80125A58 == 1) { + if (CUR_EQUIP_VALUE(EQUIP_TUNIC) == 2) { D_80125A58 = 0; } - } - else if ((func_8008F2F8(globalCtx) >= 2) && (func_8008F2F8(globalCtx) < 5)) - { - if (CUR_EQUIP_VALUE(EQUIP_TUNIC) == 3) - { + } else if ((func_8008F2F8(globalCtx) >= 2) && (func_8008F2F8(globalCtx) < 5)) { + if (CUR_EQUIP_VALUE(EQUIP_TUNIC) == 3) { D_80125A58 = 0; } } Health_UpdateData(globalCtx); - if ((gSaveContext.timer_1_state >= 3) && - (globalCtx->pauseCtx.state == 0) && - (globalCtx->pauseCtx.flag == 0) && - (msgCtx->msgMode == 0) && - !(player->stateFlags2 & 0x01000000) && - (globalCtx->sceneLoadFlag == 0) && - (globalCtx->unk_1241B == 0) && - (func_800BFC84(globalCtx) == 0)) - { + if ((gSaveContext.timer_1_state >= 3) && (globalCtx->pauseCtx.state == 0) && (globalCtx->pauseCtx.flag == 0) && + (msgCtx->msgMode == 0) && !(player->stateFlags2 & 0x01000000) && (globalCtx->sceneLoadFlag == 0) && + (globalCtx->unk_1241B == 0) && (func_800BFC84(globalCtx) == 0)) {} - } - - if (gSaveContext.rupee_accumulator != 0) - { - if (gSaveContext.rupee_accumulator > 0) - { - if (gSaveContext.rupees < CUR_CAPACITY(UPG_WALLET)) - { + if (gSaveContext.rupee_accumulator != 0) { + if (gSaveContext.rupee_accumulator > 0) { + if (gSaveContext.rupees < CUR_CAPACITY(UPG_WALLET)) { gSaveContext.rupee_accumulator--; gSaveContext.rupees++; Audio_PlaySoundGeneral(NA_SE_SY_RUPY_COUNT, &D_801333D4, 4, &D_801333E0, &D_801333E0, &D_801333E8); - } - else - { + } else { // Translates to: "Rupee Amount MAX = %d" osSyncPrintf("ルピー数ＭＡＸ = %d\n", CUR_CAPACITY(UPG_WALLET)); gSaveContext.rupees = CUR_CAPACITY(UPG_WALLET); gSaveContext.rupee_accumulator = 0; } - } - else if (gSaveContext.rupees != 0) - { - if (gSaveContext.rupee_accumulator <= -50) - { + } else if (gSaveContext.rupees != 0) { + if (gSaveContext.rupee_accumulator <= -50) { gSaveContext.rupee_accumulator += 10; gSaveContext.rupees -= 10; - if (gSaveContext.rupees < 0) + if (gSaveContext.rupees < 0) { gSaveContext.rupees = 0; + } Audio_PlaySoundGeneral(NA_SE_SY_RUPY_COUNT, &D_801333D4, 4, &D_801333E0, &D_801333E0, &D_801333E8); - } - else - { + } else { gSaveContext.rupee_accumulator++; gSaveContext.rupees--; Audio_PlaySoundGeneral(NA_SE_SY_RUPY_COUNT, &D_801333D4, 4, &D_801333E0, &D_801333E0, &D_801333E8); } - } - else - { + } else { gSaveContext.rupee_accumulator = 0; } } - switch (interfaceCtx->unk_1EC) - { + switch (interfaceCtx->unk_1EC) { case 1: interfaceCtx->unk_1F4 = interfaceCtx->unk_1F4 + (31400.0f / WREG(5)); - if (interfaceCtx->unk_1F4 >= 15700.0f) - { + if (interfaceCtx->unk_1F4 >= 15700.0f) { interfaceCtx->unk_1F4 = -15700.0f; interfaceCtx->unk_1EC = 2; } break; case 2: interfaceCtx->unk_1F4 = interfaceCtx->unk_1F4 + (31400.0f / WREG(5)); - if (interfaceCtx->unk_1F4 >= 0.0f) - { + if (interfaceCtx->unk_1F4 >= 0.0f) { interfaceCtx->unk_1F4 = 0.0f; interfaceCtx->unk_1EC = 0; interfaceCtx->unk_1EE = interfaceCtx->unk_1F0; action = interfaceCtx->unk_1EE; - if ((action == 0x1D) || (action == 0x1E)) + if ((action == 0x1D) || (action == 0x1E)) { action = 0xA; + } Interface_LoadActionLabel(interfaceCtx, action, 0); } break; case 3: interfaceCtx->unk_1F4 = interfaceCtx->unk_1F4 + (31400.0f / WREG(5)); - if (interfaceCtx->unk_1F4 >= 15700.0f) - { + if (interfaceCtx->unk_1F4 >= 15700.0f) { interfaceCtx->unk_1F4 = -15700.0f; interfaceCtx->unk_1EC = 2; } break; case 4: interfaceCtx->unk_1F4 = interfaceCtx->unk_1F4 + (31400.0f / WREG(5)); - if (interfaceCtx->unk_1F4 >= 0.0f) - { + if (interfaceCtx->unk_1F4 >= 0.0f) { interfaceCtx->unk_1F4 = 0.0f; interfaceCtx->unk_1EC = 0; interfaceCtx->unk_1EE = interfaceCtx->unk_1F0; action = interfaceCtx->unk_1EE; - if ((action == 0x1D) || (action == 0x1E)) + if ((action == 0x1D) || (action == 0x1E)) { action = 0xA; + } Interface_LoadActionLabel(interfaceCtx, action, 0); } break; @@ -4870,10 +4217,8 @@ void Interface_Update(GlobalContext* globalCtx) if ((globalCtx->pauseCtx.state == 0) && (globalCtx->pauseCtx.flag == 0) && (msgCtx->msgMode == 0) && (globalCtx->sceneLoadFlag == 0) && (globalCtx->unk_10A20 == 0) && (globalCtx->unk_1241B == 0) && - ((globalCtx->csCtx.state == 0) || (func_8008E988(globalCtx) == 0))) - { - if ((gSaveContext.magic_acquired != 0) && (gSaveContext.magic_level == 0)) - { + ((globalCtx->csCtx.state == 0) || (func_8008E988(globalCtx) == 0))) { + if ((gSaveContext.magic_acquired != 0) && (gSaveContext.magic_level == 0)) { gSaveContext.magic_level = gSaveContext.double_magic + 1; gSaveContext.unk_13F0 = 8; osSyncPrintf(VT_FGCOL(YELLOW)); @@ -4889,40 +4234,31 @@ void Interface_Update(GlobalContext* globalCtx) Interface_UpdateMagicBar(globalCtx); } - if (gSaveContext.timer_1_state == 0) - { - if (((D_80125A58 == 1) || (D_80125A58 == 2) || (D_80125A58 == 4)) && - ((gSaveContext.health >> 1) != 0)) - { + if (gSaveContext.timer_1_state == 0) { + if (((D_80125A58 == 1) || (D_80125A58 == 2) || (D_80125A58 == 4)) && ((gSaveContext.health >> 1) != 0)) { gSaveContext.timer_1_state = 1; gSaveContext.timer_x[0] = 140; gSaveContext.timer_y[0] = 80; D_80125A5C = 1; } - } - else - { - if (((D_80125A58 == 0) || (D_80125A58 == 3)) && - (gSaveContext.timer_1_state < 5)) - { + } else { + if (((D_80125A58 == 0) || (D_80125A58 == 3)) && (gSaveContext.timer_1_state < 5)) { gSaveContext.timer_1_state = 0; } } - if (gSaveContext.minigame_state == 1) - { + if (gSaveContext.minigame_state == 1) { gSaveContext.minigame_score += interfaceCtx->unk_23C; interfaceCtx->unk_23C = 0; - if (sHBAScoreTier == 0) - { - if (gSaveContext.minigame_score >= 1000) + if (sHBAScoreTier == 0) { + if (gSaveContext.minigame_score >= 1000) { sHBAScoreTier++; - } - else if (sHBAScoreTier == 1) - { - if (gSaveContext.minigame_score >= 1500) + } + } else if (sHBAScoreTier == 1) { + if (gSaveContext.minigame_score >= 1500) { sHBAScoreTier++; + } } sHBAScoreDigits[1] = 0; @@ -4930,74 +4266,60 @@ void Interface_Update(GlobalContext* globalCtx) sHBAScoreDigits[2] = 0; sHBAScoreDigits[3] = gSaveContext.minigame_score; - while (sHBAScoreDigits[3] >= 1000) - { + while (sHBAScoreDigits[3] >= 1000) { sHBAScoreDigits[0]++; sHBAScoreDigits[3] -= 1000; } - while (sHBAScoreDigits[3] >= 100) - { + while (sHBAScoreDigits[3] >= 100) { sHBAScoreDigits[1]++; sHBAScoreDigits[3] -= 100; } - while (sHBAScoreDigits[3] >= 10) - { + while (sHBAScoreDigits[3] >= 10) { sHBAScoreDigits[2]++; sHBAScoreDigits[3] -= 10; } } - if (gSaveContext.unk_1422 != 0) - { - if ((msgCtx->unk_E3F0 != 0x31) && (gSaveContext.unk_1422 == 1)) + if (gSaveContext.unk_1422 != 0) { + if ((msgCtx->unk_E3F0 != 0x31) && (gSaveContext.unk_1422 == 1)) { globalCtx->msgCtx.unk_E3EE = 4; + } - if (globalCtx->unk_10A26 != 0) - { - if (gSaveContext.unk_1422 != 2) - { + if (globalCtx->unk_10A26 != 0) { + if (gSaveContext.unk_1422 != 2) { D_80125B60 = 0; - if ((gSaveContext.day_time >= 0x4555) && (gSaveContext.day_time <= 0xC001)) + if ((gSaveContext.day_time >= 0x4555) && (gSaveContext.day_time <= 0xC001)) { D_80125B60 = 1; + } gSaveContext.unk_1422 = 2; D_80125B64 = D_8011FB40; D_8011FB40 = 400; - } - else if ((D_80125B60 == 0) && (gSaveContext.day_time >= 0x4555) && (gSaveContext.day_time <= 0xC001)) - { + } else if ((D_80125B60 == 0) && (gSaveContext.day_time >= 0x4555) && (gSaveContext.day_time <= 0xC001)) { + gSaveContext.unk_1422 = 0; + D_8011FB40 = D_80125B64; + globalCtx->msgCtx.unk_E3EE = 4; + } else if (gSaveContext.day_time > 0xC001) { gSaveContext.unk_1422 = 0; D_8011FB40 = D_80125B64; globalCtx->msgCtx.unk_E3EE = 4; } - else if (gSaveContext.day_time > 0xC001) - { - gSaveContext.unk_1422 = 0; - D_8011FB40 = D_80125B64; - globalCtx->msgCtx.unk_E3EE = 4; - } - } - else if ((globalCtx->roomCtx.curRoom.unk_03 != 1) && (interfaceCtx->restrictions.sunsSong != 3)) - { - if ((gSaveContext.day_time >= 0x4555) && (gSaveContext.day_time < 0xC001)) - { + } else if ((globalCtx->roomCtx.curRoom.unk_03 != 1) && (interfaceCtx->restrictions.sunsSong != 3)) { + if ((gSaveContext.day_time >= 0x4555) && (gSaveContext.day_time < 0xC001)) { gSaveContext.next_day_time = 0; globalCtx->fadeOutTransition = 4; gSaveContext.transition_type = 2; globalCtx->unk_11DE9 = 1; - } - else - { + } else { gSaveContext.next_day_time = 0x8001; globalCtx->fadeOutTransition = 5; gSaveContext.transition_type = 3; globalCtx->unk_11DE9 = 1; } - if (globalCtx->sceneNum == SCENE_SPOT13) - { + if (globalCtx->sceneNum == SCENE_SPOT13) { globalCtx->fadeOutTransition = 0xE; gSaveContext.transition_type = 0xE; } @@ -5009,9 +4331,7 @@ void Interface_Update(GlobalContext* globalCtx) func_800F6964(30); gSaveContext.seq_index = 0xFF; gSaveContext.night_sfx = 0xFF; - } - else - { + } else { gSaveContext.unk_1422 = 3; } } diff --git a/src/code/z_path.c b/src/code/z_path.c new file mode 100644 index 0000000000..03dc6d6f60 --- /dev/null +++ b/src/code/z_path.c @@ -0,0 +1,46 @@ +#include +#include + +Path* Path_GetByIndex(GlobalContext* globalCtx, s16 index, s16 max) { + Path* path; + + if (index != max) { + path = &globalCtx->setupPathList[index]; + } else { + path = NULL; + } + + return path; +} + +f32 Path_OrientAndGetDistSq(Actor* actor, Path* path, s16 waypoint, s16* yaw) { + f32 dx; + f32 dz; + Vec3s* pointPos; + + if (path == NULL) { + return -1.0; + } + + pointPos = SEGMENTED_TO_VIRTUAL(path->points); + pointPos = &pointPos[waypoint]; + + dx = pointPos->x - actor->posRot.pos.x; + dz = pointPos->z - actor->posRot.pos.z; + + *yaw = Math_atan2f(dx, dz) * (32768 / M_PI); + + return SQ(dx) + SQ(dz); +} + +void Path_CopyLastPoint(Path* path, Vec3f* dest) { + Vec3s* pointPos; + + if (path != NULL) { + pointPos = &((Vec3s*)SEGMENTED_TO_VIRTUAL(path->points))[path->count - 1]; + + dest->x = pointPos->x; + dest->y = pointPos->y; + dest->z = pointPos->z; + } +} diff --git a/src/code/z_play.c b/src/code/z_play.c index 96378ada9f..99d454e6fb 100644 --- a/src/code/z_play.c +++ b/src/code/z_play.c @@ -1,39 +1,33 @@ #include #include -void func_800BC450(GlobalContext* globalCtx) -{ - func_8005A7A8(globalCtx->cameraCtx.activeCameraPtrs[globalCtx->cameraCtx.unk_5C0], - globalCtx->unk_1242B - 1, globalCtx); +void func_800BC450(GlobalContext* globalCtx) { + func_8005A7A8(globalCtx->cameraCtx.activeCameraPtrs[globalCtx->cameraCtx.unk_5C0], globalCtx->unk_1242B - 1, + globalCtx); } #pragma GLOBAL_ASM("asm/non_matchings/code/z_play/func_800BC490.s") -s32 func_800BC56C(GlobalContext* globalCtx, s16 arg1) -{ +s32 func_800BC56C(GlobalContext* globalCtx, s16 arg1) { return arg1 == globalCtx->unk_1242B; } -void func_800BC590(GlobalContext* globalCtx) -{ +void func_800BC590(GlobalContext* globalCtx) { osSyncPrintf("Game_play_shop_pr_vr_switch_set()\n"); - if (YREG(15) == 0x10) - { + if (YREG(15) == 0x10) { globalCtx->unk_1242B = 2; } } #pragma GLOBAL_ASM("asm/non_matchings/code/z_play/func_800BC5E0.s") -void func_800BC88C(GlobalContext* globalCtx) -{ +void func_800BC88C(GlobalContext* globalCtx) { globalCtx->unk_123F0 = -1; } -Gfx* func_800BC8A0(GlobalContext* globalCtx, Gfx* a1) -{ - func_80093708(a1, globalCtx->lightCtx.unk_07, globalCtx->lightCtx.unk_08, - globalCtx->lightCtx.unk_09, 0, globalCtx->lightCtx.unk_0A, 1000); +Gfx* func_800BC8A0(GlobalContext* globalCtx, Gfx* a1) { + Gfx_SetFog2(a1, globalCtx->lightCtx.unk_07, globalCtx->lightCtx.unk_08, globalCtx->lightCtx.unk_09, 0, + globalCtx->lightCtx.unk_0A, 1000); } #pragma GLOBAL_ASM("asm/non_matchings/code/z_play/func_800BC8EC.s") @@ -48,8 +42,7 @@ Gfx* func_800BC8A0(GlobalContext* globalCtx, Gfx* a1) #pragma GLOBAL_ASM("asm/non_matchings/code/z_play/func_800BFAE4.s") -s32 func_800BFC84(GlobalContext* globalCtx) -{ +s32 func_800BFC84(GlobalContext* globalCtx) { return globalCtx->csCtx.state != 0 || func_8008E988(globalCtx) != 0; } @@ -59,14 +52,13 @@ s32 func_800BFC84(GlobalContext* globalCtx) #pragma GLOBAL_ASM("asm/non_matchings/code/z_play/func_800BFEC4.s") -void func_800BFF0C(GlobalContext* globalCtx, s32 a1) -{ +void func_800BFF0C(GlobalContext* globalCtx, s32 a1) { globalCtx->curSpawn = a1; globalCtx->linkActorEntry = NULL; globalCtx->unk_11DFC = NULL; globalCtx->setupEntranceList = NULL; globalCtx->setupExitList = NULL; - globalCtx->naviMsgSegment = NULL; + globalCtx->cUpElfMsgs = NULL; globalCtx->setupPathList = NULL; globalCtx->nbSetupActors = 0; Object_InitBank(globalCtx, &globalCtx->objectCtx); @@ -85,8 +77,7 @@ void func_800BFF0C(GlobalContext* globalCtx, s32 a1) #pragma GLOBAL_ASM("asm/non_matchings/code/z_play/func_800C0230.s") -s16 func_800C030C(GlobalContext* globalCtx) -{ +s16 func_800C030C(GlobalContext* globalCtx) { return globalCtx->cameraCtx.unk_5C0; } @@ -120,8 +111,7 @@ s16 func_800C030C(GlobalContext* globalCtx) #pragma GLOBAL_ASM("asm/non_matchings/code/z_play/func_800C0AF4.s") -void func_800C0B60(GlobalContext* globalCtx) -{ +void func_800C0B60(GlobalContext* globalCtx) { gSaveContext.respawn[RESPAWN_MODE_DOWN].temp_swch_flags = globalCtx->actorCtx.flags.tempSwch; gSaveContext.respawn[RESPAWN_MODE_DOWN].temp_collect_flags = globalCtx->actorCtx.flags.tempCollect; gSaveContext.respawn_flag = 1; @@ -130,48 +120,35 @@ void func_800C0B60(GlobalContext* globalCtx) globalCtx->fadeOutTransition = 2; } -void func_800C0BB4(GlobalContext* globalCtx) -{ +void func_800C0BB4(GlobalContext* globalCtx) { gSaveContext.respawn_flag = -1; globalCtx->sceneLoadFlag = 0x14; - if (globalCtx->sceneNum == SCENE_GANON_SONOGO || - globalCtx->sceneNum == SCENE_GANON_FINAL || - globalCtx->sceneNum == SCENE_GANONTIKA_SONOGO || - globalCtx->sceneNum == SCENE_GANON_DEMO) - { + if (globalCtx->sceneNum == SCENE_GANON_SONOGO || globalCtx->sceneNum == SCENE_GANON_FINAL || + globalCtx->sceneNum == SCENE_GANONTIKA_SONOGO || globalCtx->sceneNum == SCENE_GANON_DEMO) { globalCtx->nextEntranceIndex = 0x043F; Item_Give(globalCtx, ITEM_SWORD_MASTER); - } - else if (gSaveContext.entrance_index == 0x028A || - gSaveContext.entrance_index == 0x028E || - gSaveContext.entrance_index == 0x0292 || - gSaveContext.entrance_index == 0x0476) - { + } else if (gSaveContext.entrance_index == 0x028A || gSaveContext.entrance_index == 0x028E || + gSaveContext.entrance_index == 0x0292 || gSaveContext.entrance_index == 0x0476) { globalCtx->nextEntranceIndex = 0x01F9; - } - else - { + } else { globalCtx->nextEntranceIndex = gSaveContext.entrance_index; } globalCtx->fadeOutTransition = 2; } -void func_800C0C88(GlobalContext* globalCtx) -{ +void func_800C0C88(GlobalContext* globalCtx) { func_800C0AF4(globalCtx, 0, 0xDFF); func_800C0BB4(globalCtx); } #pragma GLOBAL_ASM("asm/non_matchings/code/z_play/func_800C0CB8.s") -s32 func_800C0D28(GlobalContext* globalCtx) -{ +s32 func_800C0D28(GlobalContext* globalCtx) { return globalCtx->unk_7B8 != 0; } #pragma GLOBAL_ASM("asm/non_matchings/code/z_play/func_800C0D34.s") #pragma GLOBAL_ASM("asm/non_matchings/code/z_play/func_800C0DB4.s") - diff --git a/src/code/z_player_call.c b/src/code/z_player_call.c index 3adf3bc21a..cf525ff24c 100644 --- a/src/code/z_player_call.c +++ b/src/code/z_player_call.c @@ -15,8 +15,7 @@ void PlayerCall_Destroy(Player* player, GlobalContext* globalCtx); void PlayerCall_Update(Player* player, GlobalContext* globalCtx); void PlayerCall_Draw(Player* player, GlobalContext* globalCtx); -const ActorInit Player_InitVars = -{ +const ActorInit Player_InitVars = { ACTOR_PLAYER, ACTORTYPE_PLAYER, 0, @@ -29,35 +28,30 @@ const ActorInit Player_InitVars = (ActorFunc)PlayerCall_Draw, }; -void PlayerCall_InitFuncPtrs() -{ +void PlayerCall_InitFuncPtrs() { sPlayerCallInitFunc = KaleidoManager_GetRamAddr(func_80846CD8); sPlayerCallDestroyFunc = KaleidoManager_GetRamAddr(func_8084AB54); sPlayerCallUpdateFunc = KaleidoManager_GetRamAddr(func_80849EA8); sPlayerCallDrawFunc = KaleidoManager_GetRamAddr(func_8084A5C4); } -void PlayerCall_Init(Player* player, GlobalContext* globalCtx) -{ +void PlayerCall_Init(Player* player, GlobalContext* globalCtx) { KaleidoScopeCall_LoadPlayer(); PlayerCall_InitFuncPtrs(); sPlayerCallInitFunc(player, globalCtx); } -void PlayerCall_Destroy(Player* player, GlobalContext* globalCtx) -{ +void PlayerCall_Destroy(Player* player, GlobalContext* globalCtx) { KaleidoScopeCall_LoadPlayer(); sPlayerCallDestroyFunc(player, globalCtx); } -void PlayerCall_Update(Player* player, GlobalContext* globalCtx) -{ +void PlayerCall_Update(Player* player, GlobalContext* globalCtx) { KaleidoScopeCall_LoadPlayer(); sPlayerCallUpdateFunc(player, globalCtx); } -void PlayerCall_Draw(Player* player, GlobalContext* globalCtx) -{ +void PlayerCall_Draw(Player* player, GlobalContext* globalCtx) { KaleidoScopeCall_LoadPlayer(); sPlayerCallDrawFunc(player, globalCtx); } diff --git a/src/code/z_player_lib.c b/src/code/z_player_lib.c index 06d2741ff5..4ddb530fe8 100644 --- a/src/code/z_player_lib.c +++ b/src/code/z_player_lib.c @@ -3,33 +3,22 @@ #pragma GLOBAL_ASM("asm/non_matchings/code/z_player_lib/func_8008E750.s") -UNK_TYPE func_8008E8DC(GlobalContext* globalCtx, Player* player) -{ - return ( - player->stateFlags1 & 0x20000080 || - player->action || - globalCtx->sceneLoadFlag == 0x14 || - player->stateFlags1 & 1 || - player->unk_692 & 0x80 || - gSaveContext.unk_13F0 && - func_8008F0D8(player, player->unk_154) >= 0 - ); - +UNK_TYPE func_8008E8DC(GlobalContext* globalCtx, Player* player) { + return (player->stateFlags1 & 0x20000080 || player->action || globalCtx->sceneLoadFlag == 0x14 || + player->stateFlags1 & 1 || player->unk_692 & 0x80 || + gSaveContext.unk_13F0 && func_8008F0D8(player, player->unk_154) >= 0); } -UNK_TYPE func_8008E988(GlobalContext* globalCtx) -{ +UNK_TYPE func_8008E988(GlobalContext* globalCtx) { Player* player = PLAYER; return func_8008E8DC(globalCtx, player) || player->unk_6AD == 4; } -UNK_TYPE func_8008E9C4(Player* player) -{ +UNK_TYPE func_8008E9C4(Player* player) { return player->stateFlags1 & 0x10; } -UNK_TYPE func_8008E9D0(Player* player) -{ +UNK_TYPE func_8008E9D0(Player* player) { return LINK_IS_CHILD && player->currentShield == 2; } @@ -41,8 +30,7 @@ UNK_TYPE func_8008E9D0(Player* player) #pragma GLOBAL_ASM("asm/non_matchings/code/z_player_lib/func_8008EC04.s") -void func_8008EC70(Player* player) -{ +void func_8008EC70(Player* player) { player->unk_154 = player->unk_151; func_8008EC04(player, func_8008E9F8(player, player->unk_151)); player->unk_6AD = 0; @@ -50,19 +38,16 @@ void func_8008EC70(Player* player) #pragma GLOBAL_ASM("asm/non_matchings/code/z_player_lib/func_8008ECAC.s") -void func_8008ED9C(GlobalContext* globalCtx, Player* player, UNK_TYPE item, UNK_TYPE arg2) -{ +void func_8008ED9C(GlobalContext* globalCtx, Player* player, UNK_TYPE item, UNK_TYPE arg2) { Inventory_UpdateBottleItem(globalCtx, item, player->unk_150); - if (item != ITEM_BOTTLE) - { + if (item != ITEM_BOTTLE) { player->unk_152 = item; player->unk_151 = arg2; } player->unk_154 = arg2; } -void func_8008EDF0(Player* player) -{ +void func_8008EDF0(Player* player) { player->unk_664 = NULL; player->stateFlags2 &= ~0x2000; } @@ -71,8 +56,7 @@ void func_8008EDF0(Player* player) #pragma GLOBAL_ASM("asm/non_matchings/code/z_player_lib/func_8008EEAC.s") -UNK_TYPE func_8008EF44(GlobalContext* globalCtx, UNK_TYPE arg1) -{ +UNK_TYPE func_8008EF44(GlobalContext* globalCtx, UNK_TYPE arg1) { globalCtx->unk_11E5C = (arg1 + 1); return 1; } @@ -81,69 +65,56 @@ UNK_TYPE func_8008EF44(GlobalContext* globalCtx, UNK_TYPE arg1) #pragma GLOBAL_ASM("asm/non_matchings/code/z_player_lib/func_8008F034.s") -u8 func_8008F080(GlobalContext* globalCtx) -{ +u8 func_8008F080(GlobalContext* globalCtx) { Player* player = PLAYER; return player->currentMask; } -void func_8008F08C(GlobalContext* globalCtx) -{ +void func_8008F08C(GlobalContext* globalCtx) { Player* player = PLAYER; player->currentMask = 0; } -UNK_TYPE func_8008F098(GlobalContext* globalCtx) -{ +UNK_TYPE func_8008F098(GlobalContext* globalCtx) { Player* player = PLAYER; return player->currentShield == 3; } -UNK_TYPE func_8008F0AC(GlobalContext* globalCtx) -{ +UNK_TYPE func_8008F0AC(GlobalContext* globalCtx) { Player* player = PLAYER; return player->unk_15D == 0xa && player->currentShield == 3; } -s32 func_8008F0D8(Player* player, UNK_TYPE arg1) -{ +s32 func_8008F0D8(Player* player, UNK_TYPE arg1) { s32 temp_v0 = arg1 - 0x15; - if (temp_v0 >= 0 && temp_v0 < 6) - { + if (temp_v0 >= 0 && temp_v0 < 6) { return temp_v0; } return -1; } -UNK_TYPE func_8008F104(Player* player) -{ +UNK_TYPE func_8008F104(Player* player) { return player->unk_151 == 0x10 || player->unk_151 == 0x11; } -UNK_TYPE func_8008F128(Player* player) -{ +UNK_TYPE func_8008F128(Player* player) { return func_8008F104(player) && player->heldActor == NULL; } -s32 func_8008F158(UNK_TYPE arg0) -{ +s32 func_8008F158(UNK_TYPE arg0) { s32 temp_v0 = arg0 - 2; - if (temp_v0 > 0 && temp_v0 < 6) - { + if (temp_v0 > 0 && temp_v0 < 6) { return temp_v0; } return 0; } -void func_8008F180(Player* player) -{ +void func_8008F180(Player* player) { func_8008F158(player->unk_151); } -UNK_TYPE func_8008F1A0(Player* player) -{ - if (player->unk_151 >= 5 && player->unk_151 < 8) - { +UNK_TYPE func_8008F1A0(Player* player) { + if (player->unk_151 >= 5 && player->unk_151 < 8) { return 1; } return 0; @@ -151,33 +122,27 @@ UNK_TYPE func_8008F1A0(Player* player) #pragma GLOBAL_ASM("asm/non_matchings/code/z_player_lib/func_8008F1CC.s") -s32 func_8008F224(Player* player, UNK_TYPE arg1) -{ +s32 func_8008F224(Player* player, UNK_TYPE arg1) { s32 temp_v0 = arg1 - 0x1E; - if (temp_v0 >= 0 && temp_v0 < 0xD) - { + if (temp_v0 >= 0 && temp_v0 < 0xD) { return temp_v0; } return -1; } -void func_8008F250(Player* player) -{ +void func_8008F250(Player* player) { func_8008F224(player, player->unk_151); } -s32 func_8008F270(Player* player, UNK_TYPE arg1) -{ +s32 func_8008F270(Player* player, UNK_TYPE arg1) { s32 temp_v0 = arg1 - 0x12; - if (temp_v0 >= 0 && temp_v0 < 2) - { + if (temp_v0 >= 0 && temp_v0 < 2) { return temp_v0; } return -1; } -s32 func_8008F29C(Player* player) -{ +s32 func_8008F29C(Player* player) { return func_8008F270(player, player->unk_151); } diff --git a/src/code/z_prenmi.c b/src/code/z_prenmi.c index 1ea8137044..286c6328ff 100644 --- a/src/code/z_prenmi.c +++ b/src/code/z_prenmi.c @@ -2,23 +2,20 @@ #include #include -void func_80092320(PreNMIContext* prenmiCtx) -{ +void func_80092320(PreNMIContext* prenmiCtx) { prenmiCtx->state.running = false; prenmiCtx->state.init = NULL; prenmiCtx->state.size = 0; } -void PreNMI_Update(PreNMIContext* prenmiCtx) -{ +void PreNMI_Update(PreNMIContext* prenmiCtx) { osSyncPrintf(VT_COL(YELLOW, BLACK) "prenmi_move\n" VT_RST); // Strings existing only in rodata ("../z_prenmi.c"); ("(int)volume = %d\n"); - if (prenmiCtx->timer == 0) - { + if (prenmiCtx->timer == 0) { ViConfig_UpdateVi(1); func_80092320(prenmiCtx); return; @@ -27,39 +24,35 @@ void PreNMI_Update(PreNMIContext* prenmiCtx) prenmiCtx->timer--; } -void PreNMI_Draw(PreNMIContext* prenmiCtx) -{ +void PreNMI_Draw(PreNMIContext* prenmiCtx) { GraphicsContext* gfxCtx = prenmiCtx->state.gfxCtx; - Gfx* gfxArr[5]; + Gfx* dispRefs[5]; osSyncPrintf(VT_COL(YELLOW, BLACK) "prenmi_draw\n" VT_RST); - func_800C6AC4(gfxArr, gfxCtx, "../z_prenmi.c", 96); + Graph_OpenDisps(dispRefs, gfxCtx, "../z_prenmi.c", 96); gSPSegment(gfxCtx->polyOpa.p++, 0x00, NULL); func_80095248(gfxCtx, 0, 0, 0); func_800940B0(gfxCtx); - gDPSetFillColor(gfxCtx->polyOpa.p++, -1); - gDPFillRectangle(gfxCtx->polyOpa.p++, 0, prenmiCtx->timer + 100, 319, prenmiCtx->timer + 100); + gDPSetFillColor(gfxCtx->polyOpa.p++, + (GPACK_RGBA5551(0xFF, 0xFF, 0xFF, 1) << 16) | GPACK_RGBA5551(0xFF, 0xFF, 0xFF, 1)); + gDPFillRectangle(gfxCtx->polyOpa.p++, 0, prenmiCtx->timer + 100, SCREEN_WIDTH - 1, prenmiCtx->timer + 100); - func_800C6B54(gfxArr, gfxCtx, "../z_prenmi.c", 112); + Graph_CloseDisps(dispRefs, gfxCtx, "../z_prenmi.c", 112); } -void PreNMI_Main(PreNMIContext* prenmiCtx) -{ +void PreNMI_Main(PreNMIContext* prenmiCtx) { PreNMI_Update(prenmiCtx); PreNMI_Draw(prenmiCtx); prenmiCtx->state.unk_A0 = 1; } -void PreNMI_Destroy(PreNMIContext* prenmiCtx) -{ - +void PreNMI_Destroy(PreNMIContext* prenmiCtx) { } -void PreNMI_Init(PreNMIContext* prenmiCtx) -{ +void PreNMI_Init(PreNMIContext* prenmiCtx) { prenmiCtx->state.main = PreNMI_Main; prenmiCtx->state.destroy = PreNMI_Destroy; prenmiCtx->timer = 30; diff --git a/src/code/z_prenmi_buff.c b/src/code/z_prenmi_buff.c new file mode 100644 index 0000000000..9c5924bc98 --- /dev/null +++ b/src/code/z_prenmi_buff.c @@ -0,0 +1,27 @@ +#include +#include + +#define COLD_RESET 0 +#define NMI 1 + +void PreNmiBuff_Init(PreNmiBuff* this) { + this->resetting = false; + if (osResetType == COLD_RESET) { + this->resetCount = 0; + this->duration = 0; + } else { + this->resetCount++; + this->duration += this->resetTime; + } + + this->resetTime = 0; +} + +void PreNmiBuff_SetReset(PreNmiBuff* this) { + this->resetting = true; + this->resetTime = osGetTime(); +} + +u32 PreNmiBuff_IsResetting(PreNmiBuff* this) { + return this->resetting; +} diff --git a/src/code/z_quake.c b/src/code/z_quake.c new file mode 100644 index 0000000000..50db67ec5f --- /dev/null +++ b/src/code/z_quake.c @@ -0,0 +1,391 @@ +#include +#include + +QuakeRequest sQuakeRequest[4]; +s16 D_80126250 = 1; +s16 sQuakeRequestCount = 0; +s16 (*sQuakeCallbacks[])(QuakeRequest*, ShakeInfo*) = { + NULL, Quake_Callback1, Quake_Callback2, Quake_Callback3, Quake_Callback4, Quake_Callback5, Quake_Callback6, +}; + +Vec3f* Quake_AddVec(Vec3f* dst, Vec3f* arg1, struct_80045714* arg2) { + Vec3f vec1; + Vec3f vec2; + + func_8007C25C(&vec2, arg2); + vec1.x = arg1->x + vec2.x; + vec1.y = arg1->y + vec2.y; + vec1.z = arg1->z + vec2.z; + *dst = vec1; + return dst; +} + +void Quake_UpdateShakeInfo(QuakeRequest* req, ShakeInfo* shake, f32 y, f32 x) { + Vec3f* unk50 = &req->cam->unk_50; + Vec3f* unk5C = &req->cam->unk_5C; + + Vec3f vec; + struct_80045714 struc2; + struct_80045714 struc1; + Vec3f vec2; + + if (req->unk_1C) { + vec.x = 0; + vec.y = 0; + vec.z = 0; + func_8007C490(&struc1, unk5C, unk50); + struc2.unk_00 = req->y * y; + struc2.unk_04 = struc1.unk_04 + req->unk_14.unk_00 + 0x4000; + struc2.unk_06 = struc1.unk_06 + req->unk_14.unk_02; + Quake_AddVec(&vec, &vec, &struc2); + struc2.unk_00 = req->x * x; + struc2.unk_04 = struc1.unk_04 + req->unk_14.unk_00; + struc2.unk_06 = struc1.unk_06 + req->unk_14.unk_02 + 0x4000; + Quake_AddVec(&vec, &vec, &struc2); + } else { + vec.x = 0; + vec.y = req->y * y; + vec.z = 0; + struc2.unk_00 = req->x * x; + struc2.unk_04 = req->unk_14.unk_00; + struc2.unk_06 = req->unk_14.unk_02; + Quake_AddVec(&vec, &vec, &struc2); + } + + vec2 = vec; + shake->vec2 = vec2; + shake->vec1 = vec2; + shake->unk_1A = (f32)0x8000 * y; + shake->rotZ = req->rotZ * y; + shake->zoom = req->zoom * y; +} + +s16 Quake_Callback1(QuakeRequest* req, ShakeInfo* shake) { + u32 pad; + if (req->countdown > 0) { + f32 a = Math_Sins(req->speed * req->countdown); + Quake_UpdateShakeInfo(req, shake, a, Math_Rand_ZeroOne() * a); + req->countdown--; + } + return req->countdown; +} + +s16 Quake_Callback5(QuakeRequest* req, ShakeInfo* shake) { + if (req->countdown > 0) { + f32 a = Math_Sins(req->speed * req->countdown); + Quake_UpdateShakeInfo(req, shake, a, a); + req->countdown--; + } + return req->countdown; +} + +s16 Quake_Callback6(QuakeRequest* req, ShakeInfo* shake) { + u32 pad; + f32 a; + + req->countdown--; + a = Math_Sins(req->speed * ((req->countdown & 0xF) + 500)); + Quake_UpdateShakeInfo(req, shake, a, Math_Rand_ZeroOne() * a); + return 1; +} + +s16 Quake_Callback3(QuakeRequest* req, ShakeInfo* shake) { + if (req->countdown > 0) { + f32 a = Math_Sins(req->speed * req->countdown) * ((f32)req->countdown / (f32)req->countdownMax); + Quake_UpdateShakeInfo(req, shake, a, a); + req->countdown--; + } + return req->countdown; +} + +s16 Quake_Callback2(QuakeRequest* req, ShakeInfo* shake) { + if (req->countdown > 0) { + f32 a = Math_Rand_ZeroOne(); + Quake_UpdateShakeInfo(req, shake, a, Math_Rand_ZeroOne() * a); + req->countdown--; + } + return req->countdown; +} + +s16 Quake_Callback4(QuakeRequest* req, ShakeInfo* shake) { + if (req->countdown > 0) { + f32 a = Math_Rand_ZeroOne() * ((f32)req->countdown / (f32)req->countdownMax); + Quake_UpdateShakeInfo(req, shake, a, Math_Rand_ZeroOne() * a); + req->countdown--; + } + return req->countdown; +} + +s16 Quake_GetFreeIndex() { + s32 i; + s32 ret; + s32 min = 0x10000; + + for (i = 0; i < ARRAY_COUNT(sQuakeRequest); i++) { + if (sQuakeRequest[i].callbackIdx == 0) { + ret = i; + min = 0x20000; + break; + } + + if (sQuakeRequest[i].countdown < min) { + min = sQuakeRequest[i].countdown; + ret = i; + } + } + + if (min != 0x20000) { + osSyncPrintf(VT_COL(YELLOW, BLACK) "quake: too many request %d is changed new one !!\n" VT_RST, ret); + } + + return ret; +} + +QuakeRequest* Quake_AddImpl(Camera* cam, u32 callbackIdx) { + s16 idx = Quake_GetFreeIndex(); + QuakeRequest* req = sQuakeRequest + idx; + + func_80106860(req, 0, sizeof(QuakeRequest)); // memset + req->cam = cam; + req->camPtrIdx = cam->unk_164; + req->callbackIdx = callbackIdx; + req->unk_1C = 1; + req->randIdx = ((s16)(Math_Rand_ZeroOne() * (f32)0x10000) & ~3) + idx; + sQuakeRequestCount++; + + return req; +} + +void Quake_Remove(QuakeRequest* req) { + req->callbackIdx = 0; + req->countdown = -1; + sQuakeRequestCount--; +} + +QuakeRequest* Quake_GetRequest(s16 idx) { + QuakeRequest* req = sQuakeRequest + (idx & 3); + if (req->callbackIdx == 0) { + return NULL; + } + + if (idx != req->randIdx) { + return NULL; + } + + return req; +} + +QuakeRequest* Quake_SetValue(s16 idx, s16 valueType, s16 value) { + QuakeRequest* req; + + req = Quake_GetRequest(idx); + if (req == NULL) { + return NULL; + } else { + switch (valueType) { + case 1: + req->speed = value; + break; + case 2: + req->y = value; + break; + case 4: + req->x = value; + break; + case 8: + req->zoom = value; + break; + case 0x10: + req->rotZ = value; + break; + case 0x20: + req->unk_14.unk_00 = value; + break; + case 0x40: + req->unk_14.unk_02 = value; + break; + case 0x80: + req->unk_14.unk_04 = value; + break; + case 0x100: + req->countdown = value; + req->countdownMax = req->countdown; + break; + case 0x200: + req->unk_1C = value; + break; + } + } +} + +u32 Quake_SetSpeed(s16 idx, s16 value) { + QuakeRequest* req = Quake_GetRequest(idx); + if (req) { + req->speed = value; + return true; + } + return false; +} + +u32 Quake_SetCountdown(s16 idx, s16 value) { + QuakeRequest* req = Quake_GetRequest(idx); + if (req) { + req->countdown = value; + req->countdownMax = req->countdown; + return true; + } + return false; +} + +s16 Quake_GetCountdown(s16 idx) { + QuakeRequest* req = Quake_GetRequest(idx); + if (req) { + return req->countdown; + } + return 0; +} + +u32 Quake_SetQuakeValues(s16 idx, s16 y, s16 x, s16 zoom, s16 rotZ) { + QuakeRequest* req = Quake_GetRequest(idx); + if (req) { + req->y = y; + req->x = x; + req->zoom = zoom; + req->rotZ = rotZ; + return true; + } + return false; +} + +u32 Quake_SetUnkValues(s16 idx, s16 arg1, SubQuakeRequest14 arg2) { + QuakeRequest* req = Quake_GetRequest(idx); + if (req) { + req->unk_1C = arg1; + + req->unk_14 = arg2; + return true; + } + return false; +} + +void Quake_Init() { + s16 i; + for (i = 0; i < ARRAY_COUNT(sQuakeRequest); i++) { + sQuakeRequest[i].callbackIdx = 0; + sQuakeRequest[i].countdown = 0; + } + D_80126250 = 1; + sQuakeRequestCount = 0; +} + +s16 Quake_Add(Camera* cam, u32 callbackIdx) { + return Quake_AddImpl(cam, callbackIdx)->randIdx; +} + +u32 Quake_RemoveFromIdx(s16 idx) { + QuakeRequest* req = Quake_GetRequest(idx); + if (req) { + Quake_Remove(req); + return true; + } + return false; +} + +s16 Quake_Calc(Camera* camera, UnkQuakeCalcStruct* camData) { + f32 max; + f32 max2; + QuakeRequest* req; + ShakeInfo shake; + f32 absSpeedDiv; + s16* temp; + u32 pad2; + s32 idx; + s32 ret; + u32 eq; + Vec3f vec; + GlobalContext* globalCtx; + + globalCtx = camera->globalCtx; + vec.x = 0.0f; + vec.y = 0.0f; + vec.z = 0.0f; + camData->rotZ = 0; + camData->unk_1A = 0; + camData->zoom = 0; + camData->vec1.x = 0.0f; + camData->vec1.y = 0.0f; + camData->vec1.z = 0.0f; + camData->vec2.x = 0.0f; + camData->vec2.y = 0.0f; + camData->vec2.z = 0.0f; + camData->unk_20 = 0.0f; + + if (sQuakeRequestCount == 0) { + return 0; + } + + ret = 0; + for (idx = 0; idx < ARRAY_COUNT(sQuakeRequest); idx++) { + req = &sQuakeRequest[idx]; + if (req->callbackIdx != 0) { + if (globalCtx->cameraCtx.activeCameraPtrs[req->camPtrIdx] == 0) { + osSyncPrintf(VT_COL(YELLOW, BLACK) "quake: stopped! 'coz camera [%d] killed!!\n" VT_RST, + req->camPtrIdx); + Quake_Remove(req); + } else { + temp = &camera->unk_164; + eq = req->cam->unk_164 != *temp; + absSpeedDiv = ABS(req->speed) / (f32)0x8000; + if (sQuakeCallbacks[req->callbackIdx](req, &shake) == 0) { + Quake_Remove(req); + } else if (eq == 0) { + if (fabsf(camData->vec1.x) < fabsf(shake.vec1.x)) { + camData->vec1.x = shake.vec1.x; + } + if (fabsf(camData->vec1.y) < fabsf(shake.vec1.y)) { + camData->vec1.y = shake.vec1.y; + } + if (fabsf(camData->vec1.z) < fabsf(shake.vec1.z)) { + camData->vec1.z = shake.vec1.z; + } + if (fabsf(camData->vec2.x) < fabsf(shake.vec2.x)) { + camData->vec2.x = shake.vec2.x; + } + if (fabsf(camData->vec2.y) < fabsf(shake.vec2.y)) { + camData->vec2.y = shake.vec2.y; + } + if (fabsf(camData->vec2.z) < fabsf(shake.vec2.z)) { + camData->vec2.z = shake.vec2.z; + } + if (camData->rotZ < shake.rotZ) { + camData->rotZ = shake.rotZ; + camData->unk_1A = shake.unk_1A; + } + if (camData->zoom < shake.zoom) { + camData->zoom = shake.zoom; + } + + max = func_8007BF90(&shake.vec1, &vec) * absSpeedDiv; + max2 = func_8007BF90(&shake.vec2, &vec) * absSpeedDiv; + if (max < max2) { + max = max2; + } + max2 = (camData->rotZ * 0.005f) * absSpeedDiv; + if (max < max2) { + max = max2; + } + max2 = (camData->zoom * 0.005f) * absSpeedDiv; + if (max < max2) { + max = max2; + } + if (camData->unk_20 < max) { + camData->unk_20 = max; + } + + ret++; + } + } + } + } + return ret; +} diff --git a/src/code/z_rcp.c b/src/code/z_rcp.c index 27d7503152..7544056559 100644 --- a/src/code/z_rcp.c +++ b/src/code/z_rcp.c @@ -1,161 +1,1412 @@ #include #include -#pragma GLOBAL_ASM("asm/non_matchings/code/z_rcp/func_80093370.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/z_rcp/func_8009352C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/z_rcp/func_80093708.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/z_rcp/func_8009373C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/z_rcp/func_80093774.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/z_rcp/func_80093794.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/z_rcp/func_800937C0.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/z_rcp/func_800937E4.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/z_rcp/func_80093808.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/z_rcp/func_80093848.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/z_rcp/func_800938B4.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/z_rcp/func_80093920.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/z_rcp/func_8009398C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/z_rcp/func_800939F8.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/z_rcp/func_80093A64.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/z_rcp/func_80093AD0.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/z_rcp/func_80093B3C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/z_rcp/func_80093BA8.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/z_rcp/func_80093C14.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/z_rcp/func_80093C80.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/z_rcp/func_80093D18.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/z_rcp/func_80093D84.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/z_rcp/func_80093DF0.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/z_rcp/func_80093E5C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/z_rcp/func_80093EC8.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/z_rcp/func_80093F34.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/z_rcp/func_80093F58.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/z_rcp/func_80093F7C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/z_rcp/func_80093FD8.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/z_rcp/func_80094044.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/z_rcp/func_800940B0.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/z_rcp/func_8009411C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/z_rcp/func_80094140.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/z_rcp/func_800941AC.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/z_rcp/func_80094218.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/z_rcp/func_80094284.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/z_rcp/func_800942F0.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/z_rcp/func_8009435C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/z_rcp/func_800943C8.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/z_rcp/func_80094434.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/z_rcp/func_800944A0.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/z_rcp/func_800944C4.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/z_rcp/func_80094520.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/z_rcp/func_8009457C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/z_rcp/func_800945A0.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/z_rcp/func_8009460C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/z_rcp/func_80094678.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/z_rcp/func_800946E4.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/z_rcp/func_80094708.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/z_rcp/func_8009472C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/z_rcp/func_8009476C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/z_rcp/func_800947AC.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/z_rcp/func_80094944.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/z_rcp/func_80094968.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/z_rcp/func_800949A8.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/z_rcp/func_80094A14.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/z_rcp/func_80094A80.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/z_rcp/func_80094AEC.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/z_rcp/func_80094B58.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/z_rcp/func_80094BC4.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/z_rcp/func_80094C50.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/z_rcp/func_80094CBC.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/z_rcp/func_80094D28.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/z_rcp/func_80094D4C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/z_rcp/func_80094DB8.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/z_rcp/func_80094E54.s") - -Gfx* func_80094E78(GraphicsContext* gfxCtx, u32 x, u32 y) -{ - return Draw_TexScroll(gfxCtx, x, y, 0, 0); +Gfx sSetupDL[] = { + /* 0x00 */ + gsDPPipeSync(), + gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON), + gsDPSetCombineLERP(PRIMITIVE, ENVIRONMENT, TEXEL0, ENVIRONMENT, PRIMITIVE, 0, TEXEL0, 0, 0, 0, 0, COMBINED, 0, 0, 0, + COMBINED), + gsDPSetOtherMode(G_AD_NOISE | G_CD_NOISE | G_CK_NONE | G_TC_FILT | G_TF_BILERP | G_TT_NONE | G_TL_TILE | + G_TD_CLAMP | G_TP_PERSP | G_CYC_2CYCLE | G_PM_NPRIMITIVE, + G_AC_NONE | G_ZS_PIXEL | G_RM_FOG_SHADE_A | G_RM_ZB_CLD_SURF2), + gsSPLoadGeometryMode(G_ZBUFFER | G_SHADE | G_CULL_BACK | G_FOG | G_SHADING_SMOOTH), + gsSPEndDisplayList(), + + /* 0x01 */ + gsDPPipeSync(), + gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_OFF), + gsDPSetCombineMode(G_CC_SHADE, G_CC_PASS2), + gsDPSetOtherMode(G_AD_NOTPATTERN | 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_2CYCLE | G_PM_NPRIMITIVE, + G_AC_NONE | G_ZS_PIXEL | G_RM_FOG_SHADE_A | G_RM_AA_OPA_SURF2), + gsSPLoadGeometryMode(G_SHADE | G_CULL_BACK | G_FOG | G_LIGHTING | G_SHADING_SMOOTH), + gsSPEndDisplayList(), + + /* 0x02 */ + gsDPPipeSync(), + gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_OFF), + gsDPSetCombineMode(G_CC_SHADE, G_CC_SHADE), + gsDPSetOtherMode(G_AD_NOTPATTERN | 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_1CYCLE | G_PM_NPRIMITIVE, + G_AC_NONE | G_ZS_PIXEL | G_RM_AA_ZB_OPA_SURF | G_RM_AA_ZB_OPA_SURF2), + gsSPLoadGeometryMode(G_ZBUFFER | G_SHADE | G_CULL_BACK | G_LIGHTING | G_SHADING_SMOOTH), + gsSPEndDisplayList(), + + /* 0x03 */ + gsDPPipeSync(), + gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_OFF), + gsDPSetCombineMode(G_CC_SHADE, G_CC_PASS2), + gsDPSetOtherMode(G_AD_NOTPATTERN | 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_2CYCLE | G_PM_NPRIMITIVE, + G_AC_NONE | G_ZS_PIXEL | G_RM_FOG_SHADE_A | G_RM_AA_ZB_OPA_SURF2), + gsSPLoadGeometryMode(G_ZBUFFER | G_SHADE | G_CULL_BACK | G_FOG | G_LIGHTING | G_SHADING_SMOOTH), + gsSPEndDisplayList(), + + /* 0x04 */ + gsDPPipeSync(), + gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_OFF), + gsDPSetCombineLERP(PRIMITIVE, 0, SHADE, 0, 0, 0, 0, PRIMITIVE, PRIMITIVE, 0, SHADE, 0, 0, 0, 0, PRIMITIVE), + gsDPSetOtherMode(G_AD_NOTPATTERN | 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_1CYCLE | G_PM_NPRIMITIVE, + G_AC_NONE | G_ZS_PIXEL | G_RM_AA_ZB_XLU_SURF | G_RM_AA_ZB_XLU_SURF2), + gsSPLoadGeometryMode(G_ZBUFFER | G_SHADE | G_CULL_BACK | G_LIGHTING | G_SHADING_SMOOTH), + gsSPEndDisplayList(), + + /* 0x05 */ + gsDPPipeSync(), + gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON), + gsDPSetCombineMode(G_CC_MODULATEI_PRIM, G_CC_MODULATEI_PRIM), + gsDPSetOtherMode(G_AD_NOTPATTERN | 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_1CYCLE | G_PM_NPRIMITIVE, + G_AC_NONE | G_ZS_PIXEL | G_RM_AA_ZB_XLU_SURF | G_RM_AA_ZB_XLU_SURF2), + gsSPLoadGeometryMode(G_ZBUFFER | G_SHADE | G_CULL_BACK | G_LIGHTING | G_SHADING_SMOOTH), + gsSPEndDisplayList(), + + /* 0x06 */ + gsDPPipeSync(), + gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON), + gsDPSetCombineMode(G_CC_DECALRGBA, G_CC_PASS2), + gsDPSetOtherMode(G_AD_NOTPATTERN | 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_2CYCLE | G_PM_NPRIMITIVE, + G_AC_NONE | G_ZS_PIXEL | G_RM_FOG_SHADE_A | G_RM_AA_TEX_EDGE2), + gsSPLoadGeometryMode(G_SHADE | G_FOG | G_LIGHTING | G_SHADING_SMOOTH), + gsSPEndDisplayList(), + + /* 0x07 */ + gsDPPipeSync(), + gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON), + gsDPSetCombineMode(G_CC_MODULATEIA_PRIM, G_CC_MODULATEIA_PRIM), + gsDPSetOtherMode(G_AD_NOTPATTERN | 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_1CYCLE | G_PM_NPRIMITIVE, + G_AC_NONE | G_ZS_PIXEL | G_RM_AA_XLU_SURF | G_RM_AA_XLU_SURF2), + gsSPLoadGeometryMode(G_SHADE | G_LIGHTING | G_SHADING_SMOOTH), + gsSPEndDisplayList(), + + /* 0x08 */ + gsDPPipeSync(), + gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_OFF), + gsDPSetCombineMode(G_CC_SHADE, G_CC_SHADE), + gsDPSetOtherMode(G_AD_NOTPATTERN | 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_1CYCLE | G_PM_NPRIMITIVE, + G_AC_NONE | G_ZS_PIXEL | G_RM_AA_OPA_SURF | G_RM_AA_OPA_SURF2), + gsSPLoadGeometryMode(G_SHADE | G_CULL_BACK | G_LIGHTING | G_SHADING_SMOOTH), + gsSPEndDisplayList(), + + /* 0x09 */ + gsDPPipeSync(), + gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON), + gsDPSetCombineMode(G_CC_MODULATEIA, G_CC_MODULATEIA2), + gsDPSetOtherMode(G_AD_NOTPATTERN | 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_2CYCLE | G_PM_NPRIMITIVE, + G_AC_NONE | G_ZS_PIXEL | G_RM_FOG_SHADE_A | G_RM_AA_XLU_SURF2), + gsSPLoadGeometryMode(G_SHADE | G_FOG | G_LIGHTING | G_SHADING_SMOOTH), + gsSPEndDisplayList(), + + /* 0x0A */ + gsDPPipeSync(), + gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON), + gsDPSetCombineMode(G_CC_MODULATEIDECALA, G_CC_MODULATEIDECALA), + gsDPSetOtherMode(G_AD_NOTPATTERN | 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_1CYCLE | G_PM_NPRIMITIVE, + G_AC_NONE | G_ZS_PIXEL | G_RM_AA_OPA_SURF | G_RM_AA_OPA_SURF2), + gsSPLoadGeometryMode(G_SHADE | G_CULL_BACK | G_LIGHTING | G_SHADING_SMOOTH), + gsSPEndDisplayList(), + + /* 0x0B */ + gsDPPipeSync(), + gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON), + gsDPSetCombineMode(G_CC_MODULATEIDECALA, G_CC_MODULATEIA_PRIM2), + gsDPSetOtherMode(G_AD_NOTPATTERN | 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_2CYCLE | G_PM_NPRIMITIVE, + G_AC_NONE | G_ZS_PIXEL | G_RM_FOG_SHADE_A | G_RM_AA_OPA_SURF2), + gsSPLoadGeometryMode(G_SHADE | G_CULL_BACK | G_FOG | G_LIGHTING | G_SHADING_SMOOTH), + gsSPEndDisplayList(), + + /* 0x0C */ + gsDPPipeSync(), + gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON), + gsDPSetCombineMode(G_CC_MODULATEI_PRIM, G_CC_MODULATEI_PRIM), + gsDPSetOtherMode(G_AD_NOTPATTERN | 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_1CYCLE | G_PM_NPRIMITIVE, + G_AC_NONE | G_ZS_PIXEL | G_RM_AA_OPA_SURF | G_RM_AA_OPA_SURF2), + gsSPLoadGeometryMode(G_SHADE | G_CULL_BACK | G_LIGHTING | G_SHADING_SMOOTH), + gsSPEndDisplayList(), + + /* 0x0D */ + gsDPPipeSync(), + gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON), + gsDPSetCombineMode(G_CC_MODULATEIA_PRIM, G_CC_MODULATEIA_PRIM), + gsDPSetOtherMode(G_AD_NOTPATTERN | 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_1CYCLE | G_PM_NPRIMITIVE, + G_AC_NONE | G_ZS_PIXEL | G_RM_XLU_SURF | G_RM_XLU_SURF2), + gsSPLoadGeometryMode(G_SHADE | G_CULL_BACK | G_LIGHTING | G_SHADING_SMOOTH), + gsSPEndDisplayList(), + + /* 0x0E */ + gsDPPipeSync(), + gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON), + gsDPSetCombineMode(G_CC_DECALRGBA, G_CC_DECALRGBA), + gsDPSetOtherMode(G_AD_NOTPATTERN | 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_1CYCLE | G_PM_NPRIMITIVE, + G_AC_NONE | G_ZS_PIXEL | G_RM_AA_ZB_TEX_EDGE | G_RM_AA_ZB_TEX_EDGE2), + gsSPLoadGeometryMode(G_ZBUFFER | G_SHADE | G_LIGHTING | G_SHADING_SMOOTH), + gsSPEndDisplayList(), + + /* 0x0F */ + gsDPPipeSync(), + gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON), + gsDPSetCombineMode(G_CC_DECALRGBA, G_CC_PASS2), + gsDPSetOtherMode(G_AD_NOTPATTERN | 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_2CYCLE | G_PM_NPRIMITIVE, + G_AC_NONE | G_ZS_PIXEL | G_RM_FOG_SHADE_A | G_RM_AA_ZB_TEX_EDGE2), + gsSPLoadGeometryMode(G_ZBUFFER | G_SHADE | G_FOG | G_LIGHTING | G_SHADING_SMOOTH), + gsSPEndDisplayList(), + + /* 0x10 */ + gsDPPipeSync(), + gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON), + gsDPSetCombineMode(G_CC_MODULATEIA_PRIM, G_CC_MODULATEIA_PRIM2), + gsDPSetOtherMode(G_AD_NOTPATTERN | 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_2CYCLE | G_PM_NPRIMITIVE, + G_AC_NONE | G_ZS_PIXEL | G_RM_FOG_SHADE_A | G_RM_AA_ZB_XLU_SURF2), + gsSPLoadGeometryMode(G_ZBUFFER | G_SHADE | G_FOG | G_LIGHTING | G_SHADING_SMOOTH), + gsSPEndDisplayList(), + + /* 0x11 */ + gsDPPipeSync(), + gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON), + gsDPSetCombineMode(G_CC_MODULATEIDECALA, G_CC_MODULATEIDECALA), + gsDPSetOtherMode(G_AD_NOTPATTERN | 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_1CYCLE | G_PM_NPRIMITIVE, + G_AC_NONE | G_ZS_PIXEL | G_RM_AA_ZB_TEX_EDGE | G_RM_AA_ZB_TEX_EDGE2), + gsSPLoadGeometryMode(G_ZBUFFER | G_SHADE | G_LIGHTING | G_SHADING_SMOOTH), + gsSPEndDisplayList(), + + /* 0x12 */ + gsDPPipeSync(), + gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON), + gsDPSetCombineMode(G_CC_MODULATEIDECALA, G_CC_PASS2), + gsDPSetOtherMode(G_AD_NOTPATTERN | 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_2CYCLE | G_PM_NPRIMITIVE, + G_AC_NONE | G_ZS_PIXEL | G_RM_FOG_SHADE_A | G_RM_AA_ZB_TEX_EDGE2), + gsSPLoadGeometryMode(G_ZBUFFER | G_SHADE | G_CULL_BACK | G_FOG | G_LIGHTING | G_SHADING_SMOOTH), + gsSPEndDisplayList(), + + /* 0x13 */ + gsDPPipeSync(), + gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON), + gsDPSetCombineMode(G_CC_MODULATEIA_PRIM, G_CC_MODULATEIA_PRIM), + gsDPSetOtherMode(G_AD_NOTPATTERN | 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_1CYCLE | G_PM_NPRIMITIVE, + G_AC_NONE | G_ZS_PIXEL | AA_EN | Z_CMP | IM_RD | CVG_DST_FULL | ZMODE_OPA | CVG_X_ALPHA | + FORCE_BL | GBL_c1(G_BL_CLR_IN, G_BL_A_IN, G_BL_CLR_MEM, G_BL_1MA) | + GBL_c2(G_BL_CLR_IN, G_BL_A_IN, G_BL_CLR_MEM, G_BL_1MA)), + gsSPLoadGeometryMode(G_ZBUFFER | G_SHADE | G_LIGHTING | G_SHADING_SMOOTH), + gsSPEndDisplayList(), + + /* 0x14 */ + gsDPPipeSync(), + gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON), + gsDPSetCombineMode(G_CC_MODULATEIA_PRIM, G_CC_MODULATEIA_PRIM), + gsDPSetOtherMode(G_AD_NOTPATTERN | 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_1CYCLE | G_PM_NPRIMITIVE, + G_AC_THRESHOLD | G_ZS_PIXEL | G_RM_ZB_CLD_SURF | G_RM_ZB_CLD_SURF2), + gsSPLoadGeometryMode(G_ZBUFFER | G_SHADE | G_SHADING_SMOOTH), + gsSPEndDisplayList(), + + /* 0x15 */ + gsDPPipeSync(), + gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON), + gsDPSetCombineMode(G_CC_MODULATEIA, G_CC_MODULATEIA), + gsDPSetOtherMode(G_AD_NOTPATTERN | 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_1CYCLE | G_PM_NPRIMITIVE, + G_AC_NONE | G_ZS_PIXEL | G_RM_AA_ZB_XLU_SURF | G_RM_AA_ZB_XLU_SURF2), + gsSPLoadGeometryMode(G_ZBUFFER | G_SHADE | G_LIGHTING | G_SHADING_SMOOTH), + gsSPEndDisplayList(), + + /* 0x16 */ + gsDPPipeSync(), + gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON), + gsDPSetCombineMode(G_CC_MODULATEIA, G_CC_MODULATEIA2), + gsDPSetOtherMode(G_AD_NOTPATTERN | 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_2CYCLE | G_PM_NPRIMITIVE, + G_AC_NONE | G_ZS_PIXEL | G_RM_FOG_SHADE_A | G_RM_AA_ZB_XLU_SURF2), + gsSPLoadGeometryMode(G_ZBUFFER | G_SHADE | G_LIGHTING | G_SHADING_SMOOTH), + gsSPEndDisplayList(), + + /* 0x17 */ + gsDPPipeSync(), + gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON), + gsDPSetCombineMode(G_CC_MODULATEIDECALA, G_CC_MODULATEIDECALA), + gsDPSetOtherMode(G_AD_NOTPATTERN | 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_1CYCLE | G_PM_NPRIMITIVE, + G_AC_NONE | G_ZS_PIXEL | G_RM_AA_ZB_OPA_SURF | G_RM_AA_ZB_OPA_SURF2), + gsSPLoadGeometryMode(G_ZBUFFER | G_SHADE | G_CULL_BACK | G_LIGHTING | G_SHADING_SMOOTH), + gsSPEndDisplayList(), + + /* 0x18 */ + gsDPPipeSync(), + gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON), + gsDPSetCombineMode(G_CC_MODULATEIDECALA, G_CC_MODULATEIA2), + gsDPSetOtherMode(G_AD_NOTPATTERN | 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_2CYCLE | G_PM_NPRIMITIVE, + G_AC_NONE | G_ZS_PIXEL | G_RM_FOG_SHADE_A | G_RM_AA_ZB_OPA_SURF2), + gsSPLoadGeometryMode(G_ZBUFFER | G_SHADE | G_CULL_BACK | G_FOG | G_LIGHTING | G_SHADING_SMOOTH), + gsSPEndDisplayList(), + + /* 0x19 */ + gsDPPipeSync(), + gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON), + gsDPSetCombineMode(G_CC_MODULATEIDECALA, G_CC_MODULATEIA_PRIM2), + gsDPSetOtherMode(G_AD_NOTPATTERN | 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_2CYCLE | G_PM_NPRIMITIVE, + G_AC_NONE | G_ZS_PIXEL | G_RM_FOG_SHADE_A | G_RM_AA_ZB_OPA_SURF2), + gsSPLoadGeometryMode(G_ZBUFFER | G_SHADE | G_CULL_BACK | G_FOG | G_LIGHTING | G_SHADING_SMOOTH), + gsSPEndDisplayList(), + + /* 0x1A */ + gsDPPipeSync(), + gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON), + gsDPSetCombineMode(G_CC_MODULATEI_PRIM, G_CC_MODULATEI_PRIM), + gsDPSetOtherMode(G_AD_NOTPATTERN | 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_1CYCLE | G_PM_NPRIMITIVE, + G_AC_NONE | G_ZS_PIXEL | G_RM_AA_ZB_OPA_SURF | G_RM_AA_ZB_OPA_SURF2), + gsSPLoadGeometryMode(G_ZBUFFER | G_SHADE | G_CULL_BACK | G_LIGHTING | G_SHADING_SMOOTH), + gsSPEndDisplayList(), + + /* 0x1B */ + gsDPPipeSync(), + gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON), + gsDPSetCombineMode(G_CC_MODULATEI_PRIM, G_CC_MODULATEI_PRIM), + gsDPSetOtherMode(G_AD_NOTPATTERN | 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_1CYCLE | G_PM_NPRIMITIVE, + G_AC_NONE | G_ZS_PIXEL | G_RM_AA_ZB_XLU_SURF | G_RM_AA_ZB_XLU_SURF2), + gsSPLoadGeometryMode(G_ZBUFFER | G_SHADE | G_CULL_BACK | G_SHADING_SMOOTH), + gsSPEndDisplayList(), + + /* 0x1C */ + gsDPPipeSync(), + gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON), + gsDPSetCombineMode(G_CC_MODULATEIDECALA_PRIM, G_CC_MODULATEIDECALA_PRIM), + gsDPSetOtherMode(G_AD_DISABLE | G_CD_MAGICSQ | G_CK_NONE | G_TC_FILT | G_TF_BILERP | G_TT_RGBA16 | G_TL_TILE | + G_TD_CLAMP | G_TP_NONE | G_CYC_1CYCLE | G_PM_NPRIMITIVE, + G_AC_THRESHOLD | G_ZS_PIXEL | G_RM_AA_TEX_EDGE | G_RM_AA_TEX_EDGE2), + gsSPLoadGeometryMode(G_SHADE | G_SHADING_SMOOTH), + gsSPEndDisplayList(), + + /* 0x1D */ + gsDPPipeSync(), + gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON), + gsDPSetCombineLERP(TEXEL0, 0, SHADE, 0, TEXEL0, 0, SHADE, 0, NOISE, 0, COMBINED, 0, 0, 0, 0, COMBINED), + gsDPSetOtherMode(G_AD_NOTPATTERN | 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_2CYCLE | G_PM_NPRIMITIVE, + G_AC_NONE | G_ZS_PIXEL | G_RM_PASS | G_RM_AA_ZB_OPA_SURF2), + gsSPLoadGeometryMode(G_ZBUFFER | G_SHADE | G_CULL_BACK | G_LIGHTING | G_SHADING_SMOOTH), + gsSPEndDisplayList(), + + /* 0x1E */ + gsDPPipeSync(), + gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_OFF), + gsDPSetCombineMode(G_CC_PRIMITIVE, G_CC_PRIMITIVE), + gsDPSetOtherMode(G_AD_NOTPATTERN | 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_1CYCLE | G_PM_NPRIMITIVE, + G_AC_NONE | G_ZS_PIXEL | G_RM_AA_ZB_XLU_LINE | G_RM_AA_ZB_XLU_LINE2), + gsSPLoadGeometryMode(G_ZBUFFER | G_SHADE | G_SHADING_SMOOTH), + gsSPEndDisplayList(), + + /* 0x1F */ + gsDPPipeSync(), + gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON), + gsDPSetCombineMode(G_CC_HILITERGBA, G_CC_HILITERGBA), + gsDPSetOtherMode(G_AD_NOTPATTERN | 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_1CYCLE | G_PM_NPRIMITIVE, + G_AC_NONE | G_ZS_PIXEL | G_RM_AA_ZB_OPA_SURF | G_RM_AA_ZB_OPA_SURF2), + gsSPLoadGeometryMode(G_ZBUFFER | G_SHADE | G_CULL_BACK | G_LIGHTING | G_TEXTURE_GEN | G_SHADING_SMOOTH), + gsSPEndDisplayList(), + + /* 0x20 */ + gsDPPipeSync(), + gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON), + gsDPSetCombineMode(G_CC_HILITERGBA, G_CC_HILITERGBA), + gsDPSetOtherMode(G_AD_NOTPATTERN | 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_1CYCLE | G_PM_NPRIMITIVE, + G_AC_NONE | G_ZS_PIXEL | G_RM_AA_ZB_OPA_SURF | G_RM_AA_ZB_OPA_SURF2), + gsSPLoadGeometryMode(G_ZBUFFER | G_SHADE | G_CULL_BACK | G_LIGHTING | G_TEXTURE_GEN | G_TEXTURE_GEN_LINEAR | + G_SHADING_SMOOTH), + gsSPEndDisplayList(), + + /* 0x21 */ + gsDPPipeSync(), + gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON), + gsDPSetCombineLERP(TEXEL0, 0, PRIMITIVE, SHADE, 1, 0, TEXEL0, SHADE, ENVIRONMENT, COMBINED, TEXEL0, COMBINED, + ENVIRONMENT, COMBINED, TEXEL0, COMBINED), + gsDPSetOtherMode(G_AD_NOTPATTERN | 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_2CYCLE | G_PM_NPRIMITIVE, + G_AC_NONE | G_ZS_PIXEL | G_RM_PASS | G_RM_AA_ZB_OPA_SURF2), + gsSPLoadGeometryMode(G_ZBUFFER | G_SHADE | G_CULL_BACK | G_LIGHTING | G_TEXTURE_GEN | G_TEXTURE_GEN_LINEAR | + G_SHADING_SMOOTH), + gsSPEndDisplayList(), + + /* 0x22 */ + gsDPPipeSync(), + gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON), + gsDPSetCombineMode(G_CC_DECALRGB, G_CC_DECALRGB), + gsDPSetOtherMode(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_PIXEL | G_RM_OPA_SURF | G_RM_OPA_SURF2), + gsSPLoadGeometryMode(G_SHADE | G_SHADING_SMOOTH), + gsSPEndDisplayList(), + + /* 0x23 */ + gsDPPipeSync(), + gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON), + gsDPSetCombineMode(G_CC_DECALRGBA, G_CC_DECALRGBA), + gsDPSetOtherMode(G_AD_NOTPATTERN | 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_1CYCLE | G_PM_NPRIMITIVE, + G_AC_NONE | G_ZS_PIXEL | G_RM_AA_ZB_XLU_DECAL | G_RM_AA_ZB_XLU_DECAL2), + gsSPLoadGeometryMode(G_ZBUFFER | G_SHADE | G_CULL_BACK | G_SHADING_SMOOTH), + gsSPEndDisplayList(), + + /* 0x24 */ + gsDPPipeSync(), + gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_OFF), + gsDPSetCombineMode(G_CC_SHADE, G_CC_SHADE), + gsDPSetOtherMode(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_FILL | G_PM_NPRIMITIVE, + G_AC_THRESHOLD | G_ZS_PIXEL | G_RM_NOOP | G_RM_NOOP2), + gsSPLoadGeometryMode(G_SHADE | G_SHADING_SMOOTH), + gsSPEndDisplayList(), + + /* 0x25 */ + gsDPPipeSync(), + gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_OFF), + gsDPSetCombineLERP(PRIMITIVE, 0, SHADE, 0, 0, 0, 0, PRIMITIVE, 0, 0, 0, COMBINED, 0, 0, 0, COMBINED), + gsDPSetOtherMode(G_AD_NOTPATTERN | 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_2CYCLE | G_PM_NPRIMITIVE, + G_AC_NONE | G_ZS_PIXEL | G_RM_FOG_SHADE_A | G_RM_AA_ZB_OPA_SURF2), + gsSPLoadGeometryMode(G_ZBUFFER | G_SHADE | G_CULL_BACK | G_FOG | G_LIGHTING | G_SHADING_SMOOTH), + gsSPEndDisplayList(), + + /* 0x26 */ + gsDPPipeSync(), + gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_OFF), + gsDPSetCombineMode(G_CC_SHADE, G_CC_SHADE), + gsDPSetOtherMode(G_AD_NOTPATTERN | 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_1CYCLE | G_PM_NPRIMITIVE, + G_AC_NONE | G_ZS_PIXEL | G_RM_AA_ZB_XLU_SURF | G_RM_AA_ZB_XLU_SURF2), + gsSPLoadGeometryMode(G_ZBUFFER | G_SHADE | G_SHADING_SMOOTH), + gsSPEndDisplayList(), + + /* 0x27 */ + gsDPPipeSync(), + gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON), + gsDPSetCombineMode(G_CC_MODULATEIA_PRIM, G_CC_MODULATEIA_PRIM), + gsDPSetOtherMode(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_PIXEL | G_RM_XLU_SURF | G_RM_XLU_SURF2), + gsSPLoadGeometryMode(G_SHADING_SMOOTH), + gsSPEndDisplayList(), + + /* 0x28 */ + gsDPPipeSync(), + gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON), + gsDPSetCombineLERP(TEXEL1, TEXEL0, PRIMITIVE_ALPHA, TEXEL0, TEXEL1, TEXEL0, PRIMITIVE, TEXEL0, 0, 0, 0, COMBINED, 0, + 0, 0, COMBINED), + gsDPSetOtherMode(G_AD_NOTPATTERN | 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_2CYCLE | G_PM_NPRIMITIVE, + G_AC_NONE | G_ZS_PIXEL | G_RM_OPA_SURF | G_RM_OPA_SURF2), + gsSPLoadGeometryMode(G_SHADE | G_CULL_FRONT | G_SHADING_SMOOTH), + gsSPEndDisplayList(), + + /* 0x29 */ + gsDPPipeSync(), + gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON), + gsDPSetCombineMode(G_CC_MODULATEIA, G_CC_MODULATEIA), + gsDPSetOtherMode(G_AD_NOTPATTERN | 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_1CYCLE | G_PM_NPRIMITIVE, + G_AC_NONE | G_ZS_PIXEL | G_RM_ZB_XLU_SURF | G_RM_ZB_XLU_SURF2), + gsSPLoadGeometryMode(G_ZBUFFER | G_SHADE | G_SHADING_SMOOTH), + gsSPEndDisplayList(), + + /* 0x2A */ + gsDPPipeSync(), + gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON), + gsDPSetCombineMode(G_CC_MODULATEIDECALA, G_CC_MODULATEIDECALA), + gsDPSetOtherMode(G_AD_NOTPATTERN | 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_1CYCLE | G_PM_NPRIMITIVE, + G_AC_NONE | G_ZS_PIXEL | G_RM_XLU_SURF | G_RM_XLU_SURF2), + gsSPLoadGeometryMode(G_SHADE | G_CULL_BACK | G_SHADING_SMOOTH), + gsSPEndDisplayList(), + + /* 0x2B */ + gsDPPipeSync(), + gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON), + gsDPSetCombineMode(G_CC_MODULATEIDECALA_PRIM, G_CC_MODULATEIDECALA_PRIM), + gsDPSetOtherMode(G_AD_DISABLE | G_CD_MAGICSQ | G_CK_NONE | G_TC_FILT | G_TF_BILERP | G_TT_RGBA16 | G_TL_TILE | + G_TD_CLAMP | G_TP_NONE | G_CYC_1CYCLE | G_PM_NPRIMITIVE, + G_AC_THRESHOLD | G_ZS_PIXEL | G_RM_XLU_SURF | G_RM_XLU_SURF2), + gsSPLoadGeometryMode(G_SHADE | G_SHADING_SMOOTH), + gsSPEndDisplayList(), + + /* 0x2C */ + gsDPPipeSync(), + gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON), + gsDPSetCombineMode(G_CC_MODULATEIA_PRIM, G_CC_PASS2), + gsDPSetOtherMode(G_AD_NOTPATTERN | 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_2CYCLE | G_PM_NPRIMITIVE, + G_AC_NONE | G_ZS_PIXEL | G_RM_FOG_SHADE_A | G_RM_ZB_OVL_SURF2), + gsSPLoadGeometryMode(G_ZBUFFER | G_SHADE | G_CULL_BACK | G_FOG | G_SHADING_SMOOTH), + gsSPEndDisplayList(), + + /* 0x2D */ + gsDPPipeSync(), + gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON), + gsDPSetCombineLERP(0, 0, 0, PRIMITIVE, 0, 0, 0, TEXEL0, 0, 0, 0, PRIMITIVE, 0, 0, 0, TEXEL0), + gsDPSetOtherMode(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_PIXEL | G_RM_XLU_SURF | G_RM_XLU_SURF2), + gsSPLoadGeometryMode(G_SHADE | G_SHADING_SMOOTH), + gsSPEndDisplayList(), + + /* 0x2E */ + gsDPPipeSync(), + gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON), + gsDPSetCombineLERP(0, 0, 0, PRIMITIVE, 0, 0, 0, TEXEL0, 0, 0, 0, PRIMITIVE, 0, 0, 0, TEXEL0), + gsDPSetOtherMode(G_AD_NOTPATTERN | 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_1CYCLE | G_PM_NPRIMITIVE, + G_AC_NONE | G_ZS_PIXEL | G_RM_XLU_SURF | G_RM_XLU_SURF2), + gsSPLoadGeometryMode(G_SHADE | G_SHADING_SMOOTH), + gsSPEndDisplayList(), + + /* 0x2F */ + gsDPPipeSync(), + gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON), + gsDPSetCombineMode(G_CC_MODULATEI_PRIM, G_CC_MODULATEI_PRIM), + gsDPSetOtherMode(G_AD_NOTPATTERN | 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_1CYCLE | G_PM_NPRIMITIVE, + G_AC_NONE | G_ZS_PIXEL | G_RM_ZB_XLU_SURF | G_RM_ZB_XLU_SURF2), + gsSPLoadGeometryMode(G_ZBUFFER | G_SHADE | G_SHADING_SMOOTH), + gsSPEndDisplayList(), + + /* 0x30 */ + gsDPPipeSync(), + gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_OFF), + gsDPSetCombineMode(G_CC_PRIMITIVE, G_CC_PRIMITIVE), + gsDPSetOtherMode(G_AD_NOTPATTERN | 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_1CYCLE | G_PM_NPRIMITIVE, + G_AC_NONE | G_ZS_PIXEL | G_RM_AA_XLU_SURF | G_RM_AA_XLU_SURF2), + gsSPLoadGeometryMode(G_SHADE | G_CULL_BACK | G_SHADING_SMOOTH), + gsSPEndDisplayList(), + + /* 0x31 */ + gsDPPipeSync(), + gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_OFF), + gsDPSetCombineLERP(PRIMITIVE, 0, SHADE, 0, 0, 0, 0, PRIMITIVE, PRIMITIVE, 0, SHADE, 0, 0, 0, 0, PRIMITIVE), + gsDPSetOtherMode(G_AD_NOTPATTERN | 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_1CYCLE | G_PM_NPRIMITIVE, + G_AC_NONE | G_ZS_PIXEL | G_RM_AA_XLU_SURF | G_RM_AA_XLU_SURF2), + gsSPLoadGeometryMode(G_SHADE | G_CULL_BACK | G_LIGHTING | G_SHADING_SMOOTH), + gsSPEndDisplayList(), + + /* 0x32 */ + gsDPPipeSync(), + gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON), + gsDPSetCombineMode(G_CC_MODULATEIA_PRIM, G_CC_MODULATEIA_PRIM), + gsDPSetOtherMode(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_PIXEL | G_RM_OPA_SURF | G_RM_OPA_SURF2), + gsSPLoadGeometryMode(G_CULL_BACK), + gsSPEndDisplayList(), + + /* 0x33 */ + gsDPPipeSync(), + gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON), + gsDPSetCombineMode(G_CC_MODULATEIA_PRIM, G_CC_MODULATEIA_PRIM), + gsDPSetOtherMode(G_AD_NOTPATTERN | 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_1CYCLE | G_PM_NPRIMITIVE, + G_AC_NONE | G_ZS_PIXEL | G_RM_XLU_SURF | G_RM_XLU_SURF2), + gsSPLoadGeometryMode(G_CULL_BACK), + gsSPEndDisplayList(), + + /* 0x34 */ + gsDPPipeSync(), + gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON), + gsDPSetCombineMode(G_CC_MODULATEIA_PRIM, G_CC_MODULATEIA_PRIM), + gsDPSetOtherMode(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_PIXEL | G_RM_XLU_SURF | G_RM_XLU_SURF2), + gsSPLoadGeometryMode(G_CULL_BACK), + gsSPEndDisplayList(), + + /* 0x35 */ + gsDPPipeSync(), + gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON), + gsDPSetCombineLERP(TEXEL1, TEXEL0, ENV_ALPHA, TEXEL0, TEXEL1, TEXEL0, ENVIRONMENT, TEXEL0, PRIMITIVE, ENVIRONMENT, + COMBINED, ENVIRONMENT, COMBINED, 0, PRIMITIVE, 0), + gsDPSetOtherMode(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_2CYCLE | G_PM_NPRIMITIVE, + G_AC_THRESHOLD | G_ZS_PIXEL | G_RM_OPA_SURF | G_RM_OPA_SURF2), + gsSPLoadGeometryMode(G_CULL_BACK), + gsSPEndDisplayList(), + + /* 0x36 */ + gsDPPipeSync(), + gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON), + gsDPSetCombineLERP(TEXEL1, TEXEL0, ENV_ALPHA, TEXEL0, TEXEL1, TEXEL0, ENVIRONMENT, TEXEL0, PRIMITIVE, ENVIRONMENT, + COMBINED, ENVIRONMENT, COMBINED, 0, PRIMITIVE, 0), + gsDPSetOtherMode(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_2CYCLE | G_PM_NPRIMITIVE, + G_AC_THRESHOLD | G_ZS_PIXEL | G_RM_PASS | G_RM_XLU_SURF2), + gsSPLoadGeometryMode(G_CULL_BACK), + gsSPEndDisplayList(), + + /* 0x37 */ + gsDPPipeSync(), + gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON), + gsDPSetCombineLERP(TEXEL1, TEXEL0, ENV_ALPHA, TEXEL0, TEXEL1, TEXEL0, ENVIRONMENT, TEXEL0, PRIMITIVE, ENVIRONMENT, + COMBINED, ENVIRONMENT, COMBINED, 0, PRIMITIVE, 0), + gsDPSetOtherMode(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_2CYCLE | G_PM_NPRIMITIVE, + G_AC_THRESHOLD | G_ZS_PIXEL | G_RM_PASS | G_RM_XLU_SURF2), + gsSPLoadGeometryMode(G_CULL_BACK), + gsSPEndDisplayList(), + + /* 0x38 */ + gsDPPipeSync(), + gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON), + gsDPSetCombineMode(G_CC_MODULATEIA_PRIM, G_CC_MODULATEIA_PRIM), + gsDPSetOtherMode(G_AD_DISABLE | G_CD_MAGICSQ | G_CK_NONE | G_TC_FILT | G_TF_POINT | G_TT_NONE | G_TL_TILE | + G_TD_CLAMP | G_TP_NONE | G_CYC_1CYCLE | G_PM_NPRIMITIVE, + G_AC_THRESHOLD | G_ZS_PIXEL | G_RM_XLU_SURF | G_RM_XLU_SURF2), + gsSPLoadGeometryMode(G_SHADE | G_CULL_BACK | G_SHADING_SMOOTH), + gsSPEndDisplayList(), + + /* 0x39 */ + gsDPPipeSync(), + gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_OFF), + gsDPSetCombineMode(G_CC_PRIMITIVE, G_CC_PRIMITIVE), + gsDPSetOtherMode(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_PIXEL | G_RM_CLD_SURF | G_RM_CLD_SURF2), + gsSPLoadGeometryMode(G_SHADING_SMOOTH), + gsSPEndDisplayList(), + + /* 0x3A */ + gsDPPipeSync(), + gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_OFF), + gsDPSetCombineLERP(PRIMITIVE, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0), + gsDPSetOtherMode(G_AD_NOTPATTERN | 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_1CYCLE | G_PM_NPRIMITIVE, + G_AC_NONE | G_ZS_PIXEL | G_RM_CLD_SURF | G_RM_CLD_SURF2), + gsSPLoadGeometryMode(G_ZBUFFER | G_SHADE | G_CULL_BACK | G_SHADING_SMOOTH), + gsSPEndDisplayList(), + + /* 0x3B */ + gsDPPipeSync(), + gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON), + gsDPSetCombineLERP(TEXEL0, 0, PRIMITIVE, SHADE, 1, 0, TEXEL0, SHADE, ENVIRONMENT, COMBINED, TEXEL0, COMBINED, + ENVIRONMENT, COMBINED, TEXEL0, COMBINED), + gsDPSetOtherMode(G_AD_NOTPATTERN | 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_2CYCLE | G_PM_NPRIMITIVE, + G_AC_NONE | G_ZS_PIXEL | G_RM_PASS | G_RM_AA_OPA_SURF2), + gsSPLoadGeometryMode(G_SHADE | G_CULL_BACK | G_LIGHTING | G_TEXTURE_GEN | G_TEXTURE_GEN_LINEAR | G_SHADING_SMOOTH), + gsSPEndDisplayList(), + + /* 0x3C */ + gsDPPipeSync(), + gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON), + gsDPSetCombineLERP(PRIMITIVE, ENVIRONMENT, TEXEL0, ENVIRONMENT, PRIMITIVE, 0, TEXEL0, 0, PRIMITIVE, ENVIRONMENT, + TEXEL0, ENVIRONMENT, PRIMITIVE, 0, TEXEL0, 0), + gsDPSetOtherMode(G_AD_NOTPATTERN | 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_1CYCLE | G_PM_NPRIMITIVE, + G_AC_NONE | G_ZS_PIXEL | G_RM_ZB_CLD_SURF | G_RM_ZB_CLD_SURF2), + gsSPLoadGeometryMode(G_ZBUFFER | G_SHADE | G_CULL_BACK | G_SHADING_SMOOTH), + gsSPEndDisplayList(), + + /* 0x3D */ + gsDPPipeSync(), + gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON), + gsDPSetCombineLERP(PRIMITIVE, ENVIRONMENT, TEXEL0, ENVIRONMENT, PRIMITIVE, 0, TEXEL0, 0, PRIMITIVE, ENVIRONMENT, + TEXEL0, ENVIRONMENT, PRIMITIVE, 0, TEXEL0, 0), + gsDPSetOtherMode(G_AD_NOISE | G_CD_NOISE | G_CK_NONE | G_TC_FILT | G_TF_BILERP | G_TT_NONE | G_TL_TILE | + G_TD_CLAMP | G_TP_PERSP | G_CYC_1CYCLE | G_PM_NPRIMITIVE, + G_AC_NONE | G_ZS_PIXEL | G_RM_ZB_CLD_SURF | G_RM_ZB_CLD_SURF2), + gsSPLoadGeometryMode(G_ZBUFFER | G_SHADE | G_CULL_BACK | G_SHADING_SMOOTH), + gsSPEndDisplayList(), + + /* 0x3E */ + gsDPPipeSync(), + gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON), + gsDPSetCombineMode(G_CC_MODULATEIDECALA, G_CC_MODULATEIA_PRIM2), + gsDPSetOtherMode(G_AD_NOTPATTERN | G_CD_DISABLE | G_CK_NONE | G_TC_FILT | G_TF_BILERP | G_TT_NONE | G_TL_TILE | + G_TD_CLAMP | G_TP_PERSP | G_CYC_2CYCLE | G_PM_NPRIMITIVE, + G_AC_NONE | G_ZS_PIXEL | G_RM_FOG_SHADE_A | G_RM_AA_ZB_OPA_SURF2), + gsSPLoadGeometryMode(G_ZBUFFER | G_SHADE | G_CULL_BACK | G_FOG | G_LIGHTING | G_SHADING_SMOOTH), + gsSPEndDisplayList(), + + /* 0x3F */ + gsDPPipeSync(), + gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON), + gsDPSetCombineMode(G_CC_MODULATEIA_PRIM, G_CC_MODULATEIA_PRIM), + gsDPSetOtherMode(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_PIXEL | Z_UPD | IM_RD | CVG_DST_SAVE | ZMODE_OPA | FORCE_BL | + GBL_c1(G_BL_CLR_IN, G_BL_A_IN, G_BL_CLR_MEM, G_BL_1MA) | + GBL_c2(G_BL_CLR_IN, G_BL_A_IN, G_BL_CLR_MEM, G_BL_1MA)), + gsSPLoadGeometryMode(G_ZBUFFER | G_SHADE | G_SHADING_SMOOTH), + gsSPEndDisplayList(), + + /* 0x40 */ + gsDPPipeSync(), + gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_OFF), + gsDPSetCombineMode(G_CC_DECALRGBA, G_CC_PASS2), + gsDPSetOtherMode(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_2CYCLE | G_PM_NPRIMITIVE, + G_AC_THRESHOLD | G_ZS_PIXEL | G_RM_PASS | G_RM_XLU_SURF2), + gsSPLoadGeometryMode(G_SHADE | G_SHADING_SMOOTH), + gsSPEndDisplayList(), + + /* 0x41 */ + gsDPPipeSync(), + gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON), + gsDPSetCombineMode(G_CC_MODULATEIA_PRIM, G_CC_MODULATEIA_PRIM), + gsDPSetOtherMode(G_AD_NOTPATTERN | 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_1CYCLE | G_PM_NPRIMITIVE, + G_AC_THRESHOLD | G_ZS_PIXEL | G_RM_CLD_SURF | G_RM_CLD_SURF2), + gsSPLoadGeometryMode(G_SHADE | G_SHADING_SMOOTH), + gsSPEndDisplayList(), + + /* 0x42 */ + gsDPPipeSync(), + gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON), + gsDPSetCombineMode(G_CC_DECALRGBA, G_CC_DECALRGBA), + gsDPSetOtherMode(G_AD_NOTPATTERN | 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_1CYCLE | G_PM_NPRIMITIVE, + G_AC_THRESHOLD | G_ZS_PIXEL | Z_CMP | Z_UPD | CVG_DST_FULL | ZMODE_OPA | CVG_X_ALPHA | + ALPHA_CVG_SEL | G_RM_PASS | GBL_c2(G_BL_CLR_IN, G_BL_0, G_BL_CLR_IN, G_BL_1)), + gsSPLoadGeometryMode(G_ZBUFFER | G_SHADE | G_SHADING_SMOOTH), + gsSPEndDisplayList(), + + /* 0x43 */ + gsDPPipeSync(), + gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON), + gsDPSetCombineMode(G_CC_MODULATEIA_PRIM, G_CC_MODULATEIA_PRIM), + gsDPSetOtherMode(G_AD_NOTPATTERN | 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_1CYCLE | G_PM_NPRIMITIVE, + G_AC_THRESHOLD | G_ZS_PIXEL | Z_CMP | Z_UPD | CVG_DST_FULL | ZMODE_OPA | CVG_X_ALPHA | + ALPHA_CVG_SEL | G_RM_PASS | GBL_c2(G_BL_CLR_IN, G_BL_0, G_BL_CLR_IN, G_BL_1)), + gsSPLoadGeometryMode(G_ZBUFFER | G_SHADE | G_SHADING_SMOOTH), + gsSPEndDisplayList(), + + /* 0x44 */ + gsDPPipeSync(), + gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON), + gsDPSetCombineMode(G_CC_DECALRGBA, G_CC_DECALRGBA), + gsDPSetOtherMode(G_AD_NOTPATTERN | 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_1CYCLE | G_PM_NPRIMITIVE, + G_AC_THRESHOLD | G_ZS_PIXEL | Z_CMP | Z_UPD | IM_RD | CVG_DST_FULL | ZMODE_OPA | CVG_X_ALPHA | + ALPHA_CVG_SEL | GBL_c1(G_BL_CLR_IN, G_BL_A_IN, G_BL_CLR_MEM, G_BL_A_MEM) | + GBL_c2(G_BL_CLR_IN, G_BL_A_IN, G_BL_CLR_MEM, G_BL_A_MEM)), + gsSPLoadGeometryMode(G_ZBUFFER | G_SHADE | G_SHADING_SMOOTH), + gsSPEndDisplayList(), + + /* 0x45 */ + gsDPPipeSync(), + gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON), + gsDPSetCombineMode(G_CC_MODULATEIA_PRIM, G_CC_MODULATEIA_PRIM), + gsDPSetOtherMode(G_AD_NOTPATTERN | 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_1CYCLE | G_PM_NPRIMITIVE, + G_AC_THRESHOLD | G_ZS_PIXEL | Z_CMP | Z_UPD | IM_RD | CVG_DST_FULL | ZMODE_OPA | CVG_X_ALPHA | + ALPHA_CVG_SEL | GBL_c1(G_BL_CLR_IN, G_BL_A_IN, G_BL_CLR_MEM, G_BL_A_MEM) | + GBL_c2(G_BL_CLR_IN, G_BL_A_IN, G_BL_CLR_MEM, G_BL_A_MEM)), + gsSPLoadGeometryMode(G_ZBUFFER | G_SHADE | G_SHADING_SMOOTH), + gsSPEndDisplayList(), + + /* 0x46 */ + gsDPPipeSync(), + gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON), + gsDPSetCombineMode(G_CC_DECALRGBA, G_CC_DECALRGBA), + gsDPSetOtherMode(G_AD_NOTPATTERN | 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_1CYCLE | G_PM_NPRIMITIVE, + G_AC_THRESHOLD | G_ZS_PIXEL | Z_CMP | Z_UPD | CVG_DST_FULL | ZMODE_OPA | CVG_X_ALPHA | + ALPHA_CVG_SEL | G_RM_PASS | GBL_c2(G_BL_CLR_IN, G_BL_0, G_BL_CLR_IN, G_BL_1)), + gsSPLoadGeometryMode(G_ZBUFFER | G_SHADE | G_FOG | G_SHADING_SMOOTH), + gsSPEndDisplayList(), +}; + +Gfx sFillSetupDL[] = { + gsDPPipeSync(), + gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_OFF), + gsDPSetCombineMode(G_CC_SHADE, G_CC_SHADE), + gsDPSetOtherMode(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), + gsSPLoadGeometryMode(G_ZBUFFER | G_SHADE | G_CULL_BACK | G_LIGHTING | G_SHADING_SMOOTH), + gsDPSetScissor(G_SC_NON_INTERLACE, 0, 0, SCREEN_WIDTH, SCREEN_HEIGHT), + gsDPSetBlendColor(0x00, 0x00, 0x00, 0x08), + gsSPClipRatio(FRUSTRATIO_2), + gsSPEndDisplayList(), +}; + +// unused? +Gfx D_80127030[] = { + gsDPPipeSync(), + gsDPSetFillColor((GPACK_RGBA5551(0xFF, 0xFF, 0xF0, 0) << 16) | GPACK_RGBA5551(0xFF, 0xFF, 0xF0, 0)), + gsDPFillRectangle(0, 0, SCREEN_WIDTH - 1, SCREEN_HEIGHT - 1), + gsDPSetDepthSource(G_ZS_PIXEL), + gsDPPipeSync(), + gsSPEndDisplayList(), +}; + +// unused? +Gfx D_80127060[] = { + gsDPPipeSync(), + gsDPSetCycleType(G_CYC_FILL), + gsDPSetRenderMode(G_RM_NOOP, G_RM_NOOP2), + gsDPSetFillColor((GPACK_RGBA5551(0x00, 0x00, 0x00, 1) << 16) | GPACK_RGBA5551(0x00, 0x00, 0x00, 1)), + gsDPFillRectangle(0, 0, SCREEN_WIDTH - 1, SCREEN_HEIGHT - 1), + gsDPPipeSync(), + gsSPEndDisplayList(), +}; + +Gfx gEmptyDL[] = { + gsSPEndDisplayList(), +}; + +Gfx* Gfx_SetFog(Gfx* gfx, s32 r, s32 g, s32 b, s32 a, s32 n, s32 f) { + if (f == n) { + f++; + } + + if (n == f) { + __assert("n != f", "../z_rcp.c", 1155); + } + + gDPSetFogColor(gfx++, r, g, b, a); + + if (n >= 1000) { + gSPFogFactor(gfx++, 0, 0); // gSPFogPosition(gfx++, ?, ?) + } else if (n >= 997) { + gSPFogFactor(gfx++, 0x7FFF, 0x8100); // gSPFogPosition(gfx++, ?, ?) + } else if (n < 0) { + gSPFogFactor(gfx++, 0, 255); // gSPFogPosition(gfx++, ?, ?) + } else { + gSPFogPosition(gfx++, n, f); + } + + return gfx; } -Gfx* Draw_TexScroll(GraphicsContext* gfxCtx, u32 x, u32 y, s32 width, s32 height) -{ +Gfx* Gfx_SetFogWithSync(Gfx* gfx, s32 r, s32 g, s32 b, s32 a, s32 n, s32 f) { + if (f == n) { + f++; + } + + if (n == f) { + __assert("n != f", "../z_rcp.c", 1187); + } + + gDPPipeSync(gfx++); + gDPSetFogColor(gfx++, r, g, b, a); + + if (n >= 1000) { + gSPFogFactor(gfx++, 0, 0); // gSPFogPosition(gfx++, ?, ?) + } else if (n >= 997) { + gSPFogFactor(gfx++, 0x7FFF, 0x8100); // gSPFogPosition(gfx++, ?, ?) + } else if (n < 0) { + gSPFogFactor(gfx++, 0, 255); // gSPFogPosition(gfx++, ?, ?) + } else { + gSPFogPosition(gfx++, n, f); + } + + return gfx; +} + +Gfx* Gfx_SetFog2(Gfx* gfx, s32 r, s32 g, s32 b, s32 a, s32 n, s32 f) { + return Gfx_SetFog(gfx, r, g, b, a, n, f); +} + +Gfx* Gfx_CallSetupDLImpl(Gfx* gfx, u32 i) { + gSPDisplayList(gfx++, &sSetupDL[6 * i]); + return gfx; +} + +Gfx* Gfx_CallSetupDL(Gfx* gfx, u32 i) { + return Gfx_CallSetupDLImpl(gfx, i); +} + +void Gfx_CallSetupDLAtPtr(Gfx** gfxp, u32 i) { + *gfxp = Gfx_CallSetupDL(*gfxp, i); +} + +Gfx* func_800937C0(Gfx* gfx) { + gSPDisplayList(gfx++, &sSetupDL[6 * 0x39]); + return gfx; +} + +Gfx* func_800937E4(Gfx* gfx) { + gSPDisplayList(gfx++, &sSetupDL[6 * 0x39]); + return gfx; +} + +Gfx* func_80093808(Gfx* gfx) { + gSPDisplayList(gfx++, &sSetupDL[6 * 0x34]); + gDPSetColorDither(gfx++, G_CD_DISABLE); + return gfx; +} + +void func_80093848(GraphicsContext* gfxCtx) { + Gfx* dispRefs[5]; + + Graph_OpenDisps(dispRefs, gfxCtx, "../z_rcp.c", 1293); + + gSPDisplayList(gfxCtx->polyOpa.p++, &sSetupDL[6 * 0x3A]); + + Graph_CloseDisps(dispRefs, gfxCtx, "../z_rcp.c", 1297); +} + +void func_800938B4(GraphicsContext* gfxCtx) { + Gfx* dispRefs[5]; + + Graph_OpenDisps(dispRefs, gfxCtx, "../z_rcp.c", 1309); + + gSPDisplayList(gfxCtx->polyOpa.p++, &sSetupDL[6 * 0x39]); + + Graph_CloseDisps(dispRefs, gfxCtx, "../z_rcp.c", 1313); +} + +void func_80093920(GraphicsContext* gfxCtx) { + Gfx* dispRefs[5]; + + Graph_OpenDisps(dispRefs, gfxCtx, "../z_rcp.c", 1325); + + gSPDisplayList(gfxCtx->polyOpa.p++, &sSetupDL[6 * 0x32]); + + Graph_CloseDisps(dispRefs, gfxCtx, "../z_rcp.c", 1329); +} + +void func_8009398C(GraphicsContext* gfxCtx) { + Gfx* dispRefs[5]; + + Graph_OpenDisps(dispRefs, gfxCtx, "../z_rcp.c", 1341); + + gSPDisplayList(gfxCtx->polyOpa.p++, &sSetupDL[6 * 0x33]); + + Graph_CloseDisps(dispRefs, gfxCtx, "../z_rcp.c", 1345); +} + +void func_800939F8(GraphicsContext* gfxCtx) { + Gfx* dispRefs[5]; + + Graph_OpenDisps(dispRefs, gfxCtx, "../z_rcp.c", 1357); + + gSPDisplayList(gfxCtx->polyXlu.p++, &sSetupDL[6 * 0x34]); + + Graph_CloseDisps(dispRefs, gfxCtx, "../z_rcp.c", 1361); +} + +void func_80093A64(GraphicsContext* gfxCtx) { + Gfx* dispRefs[5]; + + Graph_OpenDisps(dispRefs, gfxCtx, "../z_rcp.c", 1373); + + gSPDisplayList(gfxCtx->polyOpa.p++, &sSetupDL[6 * 0x35]); + + Graph_CloseDisps(dispRefs, gfxCtx, "../z_rcp.c", 1377); +} + +void func_80093AD0(GraphicsContext* gfxCtx) { + Gfx* dispRefs[5]; + + Graph_OpenDisps(dispRefs, gfxCtx, "../z_rcp.c", 1389); + + gSPDisplayList(gfxCtx->polyOpa.p++, &sSetupDL[6 * 0x36]); + + Graph_CloseDisps(dispRefs, gfxCtx, "../z_rcp.c", 1393); +} + +void func_80093B3C(GraphicsContext* gfxCtx) { + Gfx* dispRefs[5]; + + Graph_OpenDisps(dispRefs, gfxCtx, "../z_rcp.c", 1405); + + gSPDisplayList(gfxCtx->polyXlu.p++, &sSetupDL[6 * 0x37]); + + Graph_CloseDisps(dispRefs, gfxCtx, "../z_rcp.c", 1409); +} + +void func_80093BA8(GraphicsContext* gfxCtx) { + Gfx* dispRefs[5]; + + Graph_OpenDisps(dispRefs, gfxCtx, "../z_rcp.c", 1421); + + gSPDisplayList(gfxCtx->polyOpa.p++, &sSetupDL[6 * 0x1A]); + + Graph_CloseDisps(dispRefs, gfxCtx, "../z_rcp.c", 1425); +} + +void func_80093C14(GraphicsContext* gfxCtx) { + Gfx* dispRefs[5]; + + Graph_OpenDisps(dispRefs, gfxCtx, "../z_rcp.c", 1439); + + gSPDisplayList(gfxCtx->polyXlu.p++, &sSetupDL[6 * 0x19]); + + Graph_CloseDisps(dispRefs, gfxCtx, "../z_rcp.c", 1443); +} + +void func_80093C80(GlobalContext* globalCtx) { + GraphicsContext* gfxCtx; + Gfx* dispRefs[5]; + + gfxCtx = globalCtx->state.gfxCtx; + func_80093D18(gfxCtx); + + if (globalCtx->roomCtx.curRoom.unk_03 == 3) { + Graph_OpenDisps(dispRefs, gfxCtx, "../z_rcp.c", 1460); + + gDPSetColorDither(gfxCtx->polyOpa.p++, G_CD_DISABLE); + + Graph_CloseDisps(dispRefs, gfxCtx, "../z_rcp.c", 1462); + } +} + +void func_80093D18(GraphicsContext* gfxCtx) { + Gfx* dispRefs[5]; + + Graph_OpenDisps(dispRefs, gfxCtx, "../z_rcp.c", 1475); + + gSPDisplayList(gfxCtx->polyOpa.p++, &sSetupDL[6 * 0x19]); + + Graph_CloseDisps(dispRefs, gfxCtx, "../z_rcp.c", 1479); +} + +void func_80093D84(GraphicsContext* gfxCtx) { + Gfx* dispRefs[5]; + + Graph_OpenDisps(dispRefs, gfxCtx, "../z_rcp.c", 1491); + + gSPDisplayList(gfxCtx->polyXlu.p++, &sSetupDL[6 * 0x19]); + + Graph_CloseDisps(dispRefs, gfxCtx, "../z_rcp.c", 1495); +} + +void func_80093DF0(GraphicsContext* gfxCtx) { + Gfx* dispRefs[5]; + + Graph_OpenDisps(dispRefs, gfxCtx, "../z_rcp.c", 1507); + + gSPDisplayList(gfxCtx->polyOpa.p++, &sSetupDL[6 * 0x1F]); + + Graph_CloseDisps(dispRefs, gfxCtx, "../z_rcp.c", 1511); +} + +void func_80093E5C(GraphicsContext* gfxCtx) { + Gfx* dispRefs[5]; + + Graph_OpenDisps(dispRefs, gfxCtx, "../z_rcp.c", 1523); + + gSPDisplayList(gfxCtx->polyOpa.p++, &sSetupDL[6 * 0x20]); + + Graph_CloseDisps(dispRefs, gfxCtx, "../z_rcp.c", 1527); +} + +void func_80093EC8(GraphicsContext* gfxCtx) { + Gfx* dispRefs[5]; + + Graph_OpenDisps(dispRefs, gfxCtx, "../z_rcp.c", 1539); + + gSPDisplayList(gfxCtx->polyOpa.p++, &sSetupDL[6 * 0x21]); + + Graph_CloseDisps(dispRefs, gfxCtx, "../z_rcp.c", 1543); +} + +Gfx* func_80093F34(Gfx* gfx) { + gSPDisplayList(gfx++, &sSetupDL[6 * 0x40]); + return gfx; +} + +Gfx* func_80093F58(Gfx* gfx) { + gSPDisplayList(gfx++, &sSetupDL[6 * 0x22]); + return gfx; +} + +void func_80093F7C(GraphicsContext* gfxCtx) { + Gfx* dispRefs[5]; + + Graph_OpenDisps(dispRefs, gfxCtx, "../z_rcp.c", 1569); + + gfxCtx->polyOpa.p = func_80093F58(gfxCtx->polyOpa.p); + + Graph_CloseDisps(dispRefs, gfxCtx, "../z_rcp.c", 1573); +} + +void func_80093FD8(GraphicsContext* gfxCtx) { + Gfx* dispRefs[5]; + + Graph_OpenDisps(dispRefs, gfxCtx, "../z_rcp.c", 1585); + + gSPDisplayList(gfxCtx->polyOpa.p++, &sSetupDL[6 * 0x23]); + + Graph_CloseDisps(dispRefs, gfxCtx, "../z_rcp.c", 1589); +} + +void func_80094044(GraphicsContext* gfxCtx) { + Gfx* dispRefs[5]; + + Graph_OpenDisps(dispRefs, gfxCtx, "../z_rcp.c", 1601); + + gSPDisplayList(gfxCtx->polyXlu.p++, &sSetupDL[6 * 0x2C]); + + Graph_CloseDisps(dispRefs, gfxCtx, "../z_rcp.c", 1605); +} + +void func_800940B0(GraphicsContext* gfxCtx) { + Gfx* dispRefs[5]; + + Graph_OpenDisps(dispRefs, gfxCtx, "../z_rcp.c", 1617); + + gSPDisplayList(gfxCtx->polyOpa.p++, &sSetupDL[6 * 0x24]); + + Graph_CloseDisps(dispRefs, gfxCtx, "../z_rcp.c", 1621); +} + +Gfx* func_8009411C(Gfx* gfx) { + gSPDisplayList(gfx++, &sSetupDL[6 * 0x1C]); + return gfx; +} + +void func_80094140(GraphicsContext* gfxCtx) { + Gfx* dispRefs[5]; + + Graph_OpenDisps(dispRefs, gfxCtx, "../z_rcp.c", 1640); + + gSPDisplayList(gfxCtx->polyOpa.p++, &sSetupDL[6 * 0x1C]); + + Graph_CloseDisps(dispRefs, gfxCtx, "../z_rcp.c", 1644); +} + +void func_800941AC(GraphicsContext* gfxCtx) { + Gfx* dispRefs[5]; + + Graph_OpenDisps(dispRefs, gfxCtx, "../z_rcp.c", 1651); + + gSPDisplayList(gfxCtx->polyOpa.p++, &sSetupDL[6 * 0x2B]); + + Graph_CloseDisps(dispRefs, gfxCtx, "../z_rcp.c", 1655); +} + +void func_80094218(GraphicsContext* gfxCtx) { + Gfx* dispRefs[5]; + + Graph_OpenDisps(dispRefs, gfxCtx, "../z_rcp.c", 1670); + + gSPDisplayList(gfxCtx->polyOpa.p++, &sSetupDL[6 * 0x2D]); + + Graph_CloseDisps(dispRefs, gfxCtx, "../z_rcp.c", 1674); +} + +void func_80094284(GraphicsContext* gfxCtx) { + Gfx* dispRefs[5]; + + Graph_OpenDisps(dispRefs, gfxCtx, "../z_rcp.c", 1681); + + gSPDisplayList(gfxCtx->overlay.p++, &sSetupDL[6 * 0x2E]); + + Graph_CloseDisps(dispRefs, gfxCtx, "../z_rcp.c", 1685); +} + +void func_800942F0(GraphicsContext* gfxCtx) { + Gfx* dispRefs[5]; + + Graph_OpenDisps(dispRefs, gfxCtx, "../z_rcp.c", 1700); + + gSPDisplayList(gfxCtx->polyXlu.p++, &sSetupDL[6 * 0x26]); + + Graph_CloseDisps(dispRefs, gfxCtx, "../z_rcp.c", 1704); +} + +void func_8009435C(GraphicsContext* gfxCtx) { + Gfx* dispRefs[5]; + + Graph_OpenDisps(dispRefs, gfxCtx, "../z_rcp.c", 1722); + + gSPDisplayList(gfxCtx->polyXlu.p++, &sSetupDL[6 * 0x04]); + + Graph_CloseDisps(dispRefs, gfxCtx, "../z_rcp.c", 1726); +} + +void func_800943C8(GraphicsContext* gfxCtx) { + Gfx* dispRefs[5]; + + Graph_OpenDisps(dispRefs, gfxCtx, "../z_rcp.c", 1758); + + gSPDisplayList(gfxCtx->polyOpa.p++, &sSetupDL[6 * 0x25]); + + Graph_CloseDisps(dispRefs, gfxCtx, "../z_rcp.c", 1762); +} + +void func_80094434(GraphicsContext* gfxCtx) { + Gfx* dispRefs[5]; + + Graph_OpenDisps(dispRefs, gfxCtx, "../z_rcp.c", 1775); + + gSPDisplayList(gfxCtx->polyOpa.p++, &sSetupDL[6 * 0x02]); + + Graph_CloseDisps(dispRefs, gfxCtx, "../z_rcp.c", 1779); +} + +Gfx* func_800944A0(Gfx* gfx) { + gSPDisplayList(gfx++, &sSetupDL[6 * 0x27]); + return gfx; +} + +void func_800944C4(GraphicsContext* gfxCtx) { + Gfx* dispRefs[5]; + + Graph_OpenDisps(dispRefs, gfxCtx, "../z_rcp.c", 1799); + + gfxCtx->polyOpa.p = func_800944A0(gfxCtx->polyOpa.p); + + Graph_CloseDisps(dispRefs, gfxCtx, "../z_rcp.c", 1801); +} + +void func_80094520(GraphicsContext* gfxCtx) { + Gfx* dispRefs[5]; + + Graph_OpenDisps(dispRefs, gfxCtx, "../z_rcp.c", 1809); + + gfxCtx->overlay.p = func_800944A0(gfxCtx->overlay.p); + + Graph_CloseDisps(dispRefs, gfxCtx, "../z_rcp.c", 1811); +} + +void func_8009457C(Gfx** gfxp) { + Gfx* gfx = *gfxp; + gSPDisplayList(gfx++, &sSetupDL[6 * 0x27]); + *gfxp = gfx; +} + +void func_800945A0(GraphicsContext* gfxCtx) { + Gfx* dispRefs[5]; + + Graph_OpenDisps(dispRefs, gfxCtx, "../z_rcp.c", 1837); + + gSPDisplayList(gfxCtx->polyOpa.p++, &sSetupDL[6 * 0x28]); + + Graph_CloseDisps(dispRefs, gfxCtx, "../z_rcp.c", 1841); +} + +void func_8009460C(GraphicsContext* gfxCtx) { + Gfx* dispRefs[5]; + + Graph_OpenDisps(dispRefs, gfxCtx, "../z_rcp.c", 1853); + + gSPDisplayList(gfxCtx->polyOpa.p++, &sSetupDL[6 * 0x29]); + + Graph_CloseDisps(dispRefs, gfxCtx, "../z_rcp.c", 1857); +} + +void func_80094678(GraphicsContext* gfxCtx) { + Gfx* dispRefs[5]; + + Graph_OpenDisps(dispRefs, gfxCtx, "../z_rcp.c", 1869); + + gSPDisplayList(gfxCtx->polyXlu.p++, &sSetupDL[6 * 0x2F]); + + Graph_CloseDisps(dispRefs, gfxCtx, "../z_rcp.c", 1873); +} + +Gfx* func_800946E4(Gfx* gfx) { + gSPDisplayList(gfx++, &sSetupDL[6 * 0x42]); + return gfx; +} + +Gfx* func_80094708(Gfx* gfx) { + gSPDisplayList(gfx++, &sSetupDL[6 * 0x43]); + return gfx; +} + +Gfx* func_8009472C(Gfx* gfx) { + gSPDisplayList(gfx++, &sSetupDL[6 * 0x44]); + gDPSetColorDither(gfx++, G_CD_DISABLE); + return gfx; +} + +Gfx* func_8009476C(Gfx* gfx) { + gSPDisplayList(gfx++, &sSetupDL[6 * 0x45]); + gDPSetColorDither(gfx++, G_CD_DISABLE); + return gfx; +} + +Gfx* func_800947AC(Gfx* gfx) { + gSPDisplayList(gfx++, &sSetupDL[6 * 0x41]); + gDPSetColorDither(gfx++, G_CD_DISABLE); + + // clang-format off + switch (HREG(21)) { + case 1: gDPSetAlphaDither(gfx++, G_AD_DISABLE); break; + case 2: gDPSetAlphaDither(gfx++, G_AD_PATTERN); break; + case 3: gDPSetAlphaDither(gfx++, G_AD_NOTPATTERN); break; + case 4: gDPSetAlphaDither(gfx++, G_AD_NOISE); break; + } + + switch (HREG(22)) { + case 1: gDPSetColorDither(gfx++, G_CD_DISABLE); break; + case 2: gDPSetColorDither(gfx++, G_CD_MAGICSQ); break; + case 3: gDPSetColorDither(gfx++, G_CD_BAYER); break; + case 4: gDPSetColorDither(gfx++, G_CD_NOISE); break; + } + // clang-format on + + return gfx; +} + +Gfx* func_80094944(Gfx* gfx) { + gSPDisplayList(gfx++, &sSetupDL[6 * 0x46]); + return gfx; +} + +Gfx* func_80094968(Gfx* gfx) { + gSPDisplayList(gfx++, &sSetupDL[6 * 0x14]); + gDPSetColorDither(gfx++, G_CD_DISABLE); + return gfx; +} + +void func_800949A8(GraphicsContext* gfxCtx) { + Gfx* dispRefs[5]; + + Graph_OpenDisps(dispRefs, gfxCtx, "../z_rcp.c", 1953); + + gSPDisplayList(gfxCtx->polyOpa.p++, &sSetupDL[6 * 0x2A]); + + Graph_CloseDisps(dispRefs, gfxCtx, "../z_rcp.c", 1957); +} + +void func_80094A14(GraphicsContext* gfxCtx) { + Gfx* dispRefs[5]; + + Graph_OpenDisps(dispRefs, gfxCtx, "../z_rcp.c", 1964); + + gSPDisplayList(gfxCtx->overlay.p++, &sSetupDL[6 * 0x2A]); + + Graph_CloseDisps(dispRefs, gfxCtx, "../z_rcp.c", 1968); +} + +void func_80094A80(GraphicsContext* gfxCtx) { + Gfx* dispRefs[5]; + + Graph_OpenDisps(dispRefs, gfxCtx, "../z_rcp.c", 1992); + + gSPDisplayList(gfxCtx->polyOpa.p++, &sSetupDL[6 * 0x30]); + + Graph_CloseDisps(dispRefs, gfxCtx, "../z_rcp.c", 1996); +} + +void func_80094AEC(GraphicsContext* gfxCtx) { + Gfx* dispRefs[5]; + + Graph_OpenDisps(dispRefs, gfxCtx, "../z_rcp.c", 2008); + + gSPDisplayList(gfxCtx->polyXlu.p++, &sSetupDL[6 * 0x31]); + + Graph_CloseDisps(dispRefs, gfxCtx, "../z_rcp.c", 2012); +} + +void func_80094B58(GraphicsContext* gfxCtx) { + Gfx* dispRefs[5]; + + Graph_OpenDisps(dispRefs, gfxCtx, "../z_rcp.c", 2024); + + gSPDisplayList(gfxCtx->polyXlu.p++, &sSetupDL[6 * 0x1B]); + + Graph_CloseDisps(dispRefs, gfxCtx, "../z_rcp.c", 2028); +} + +void func_80094BC4(GraphicsContext* gfxCtx) { + Gfx* dispRefs[5]; + + Graph_OpenDisps(dispRefs, gfxCtx, "../z_rcp.c", 2040); + + gSPDisplayList(gfxCtx->polyXlu.p++, &sSetupDL[6 * 0x3C]); + gDPSetColorDither(gfxCtx->polyXlu.p++, G_CD_DISABLE); + + Graph_CloseDisps(dispRefs, gfxCtx, "../z_rcp.c", 2043); +} + +void func_80094C50(GraphicsContext* gfxCtx) { + Gfx* dispRefs[5]; + + Graph_OpenDisps(dispRefs, gfxCtx, "../z_rcp.c", 2056); + + gSPDisplayList(gfxCtx->polyXlu.p++, &sSetupDL[6 * 0x3D]); + + Graph_CloseDisps(dispRefs, gfxCtx, "../z_rcp.c", 2058); +} + +void func_80094CBC(GraphicsContext* gfxCtx) { + Gfx* dispRefs[5]; + + Graph_OpenDisps(dispRefs, gfxCtx, "../z_rcp.c", 2086); + + gSPDisplayList(gfxCtx->polyOpa.p++, &sSetupDL[6 * 0x38]); + + Graph_CloseDisps(dispRefs, gfxCtx, "../z_rcp.c", 2090); +} + +void func_80094D28(Gfx** gfxp) { + Gfx* gfx = *gfxp; + gSPDisplayList(gfx++, &sSetupDL[6 * 0x38]); + *gfxp = gfx; +} + +void func_80094D4C(GraphicsContext* gfxCtx) { + Gfx* dispRefs[5]; + + Graph_OpenDisps(dispRefs, gfxCtx, "../z_rcp.c", 2112); + + gSPDisplayList(gfxCtx->polyOpa.p++, &sSetupDL[6 * 0x3B]); + + Graph_CloseDisps(dispRefs, gfxCtx, "../z_rcp.c", 2116); +} + +#ifdef NON_MATCHING +// regalloc differences +void Gfx_BranchTexScroll(Gfx** gfxp, u32 x, u32 y, s32 width, s32 height) { + Gfx* displayList = Graph_DlistAlloc(gfxp, 3 * sizeof(Gfx)); + + gDPTileSync(displayList); + gDPSetTileSize(displayList + 1, 0, x, y, (x + ((width - 1) << 2)), (y + ((height - 1) << 2))); + gSPEndDisplayList(displayList + 2); +} +#else +#pragma GLOBAL_ASM("asm/non_matchings/code/z_rcp/Gfx_BranchTexScroll.s") +#endif + +void func_80094E54(Gfx** gfxp, u32 x, u32 y) { + Gfx_BranchTexScroll(gfxp, x, y, 0, 0); +} + +Gfx* func_80094E78(GraphicsContext* gfxCtx, u32 x, u32 y) { + return Gfx_TexScroll(gfxCtx, x, y, 0, 0); +} + +Gfx* Gfx_TexScroll(GraphicsContext* gfxCtx, u32 x, u32 y, s32 width, s32 height) { Gfx* displayList = Graph_Alloc(gfxCtx, 3 * sizeof(Gfx)); x %= 2048; y %= 2048; gDPTileSync(displayList); - gDPSetTileSize(displayList+1, 0, x, y, - (x+((width-1)<<2)), (y+((height-1)<<2))); - gSPEndDisplayList(displayList+2); + gDPSetTileSize(displayList + 1, 0, x, y, (x + ((width - 1) << 2)), (y + ((height - 1) << 2))); + gSPEndDisplayList(displayList + 2); return displayList; } -Gfx* Draw_TwoTexScroll(GraphicsContext* gfxCtx, s32 tile1, u32 x1, u32 y1, s32 width1, s32 height1, - s32 tile2, u32 x2, u32 y2, s32 width2, s32 height2) -{ +Gfx* Gfx_TwoTexScroll(GraphicsContext* gfxCtx, s32 tile1, u32 x1, u32 y1, s32 width1, s32 height1, s32 tile2, u32 x2, + u32 y2, s32 width2, s32 height2) { Gfx* displayList = Graph_Alloc(gfxCtx, 5 * sizeof(Gfx)); x1 %= 2048; @@ -164,20 +1415,16 @@ Gfx* Draw_TwoTexScroll(GraphicsContext* gfxCtx, s32 tile1, u32 x1, u32 y1, s32 w y2 %= 2048; gDPTileSync(displayList); - gDPSetTileSize(displayList+1, tile1, x1, y1, - (x1+((width1-1)<<2)), (y1+((height1-1)<<2))); - gDPTileSync(displayList+2); - gDPSetTileSize(displayList+3, tile2, x2, y2, - (x2+((width2-1)<<2)), (y2+((height2-1)<<2))); - gSPEndDisplayList(displayList+4); + gDPSetTileSize(displayList + 1, tile1, x1, y1, (x1 + ((width1 - 1) << 2)), (y1 + ((height1 - 1) << 2))); + gDPTileSync(displayList + 2); + gDPSetTileSize(displayList + 3, tile2, x2, y2, (x2 + ((width2 - 1) << 2)), (y2 + ((height2 - 1) << 2))); + gSPEndDisplayList(displayList + 4); return displayList; } -Gfx* Draw_TwoTexScrollEnvColor(GraphicsContext* gfxCtx, s32 tile1, u32 x1, u32 y1, s32 width1, s32 height1, - s32 tile2, u32 x2, u32 y2, s32 width2, s32 height2, - s32 red, s32 green, s32 blue, s32 alpha) -{ +Gfx* Gfx_TwoTexScrollEnvColor(GraphicsContext* gfxCtx, s32 tile1, u32 x1, u32 y1, s32 width1, s32 height1, s32 tile2, + u32 x2, u32 y2, s32 width2, s32 height2, s32 r, s32 g, s32 b, s32 a) { Gfx* displayList = Graph_Alloc(gfxCtx, 6 * sizeof(Gfx)); x1 %= 2048; @@ -186,20 +1433,131 @@ Gfx* Draw_TwoTexScrollEnvColor(GraphicsContext* gfxCtx, s32 tile1, u32 x1, u32 y y2 %= 2048; gDPTileSync(displayList); - gDPSetTileSize(displayList+1, tile1, x1, y1, - (x1+((width1-1)<<2)), (y1+((height1-1)<<2))); - gDPTileSync(displayList+2); - gDPSetTileSize(displayList+3, tile2, x2, y2, - (x2+((width2-1)<<2)), (y2+((height2-1)<<2))); - gDPSetEnvColor(displayList+4, red, green, blue, alpha); - gSPEndDisplayList(displayList+5); + gDPSetTileSize(displayList + 1, tile1, x1, y1, (x1 + ((width1 - 1) << 2)), (y1 + ((height1 - 1) << 2))); + gDPTileSync(displayList + 2); + gDPSetTileSize(displayList + 3, tile2, x2, y2, (x2 + ((width2 - 1) << 2)), (y2 + ((height2 - 1) << 2))); + gDPSetEnvColor(displayList + 4, r, g, b, a); + gSPEndDisplayList(displayList + 5); return displayList; } -#pragma GLOBAL_ASM("asm/non_matchings/code/z_rcp/func_800951D0.s") +Gfx* Gfx_EnvColor(GraphicsContext* gfxCtx, s32 r, s32 g, s32 b, s32 a) { + Gfx* displayList = Graph_Alloc(gfxCtx, 2 * sizeof(Gfx)); -#pragma GLOBAL_ASM("asm/non_matchings/code/z_rcp/func_80095248.s") + gDPSetEnvColor(displayList, r, g, b, a); + gSPEndDisplayList(displayList + 1); -#pragma GLOBAL_ASM("asm/non_matchings/code/z_rcp/func_80095974.s") + return displayList; +} +void func_80095248(GraphicsContext* gfxCtx, u8 r, u8 g, u8 b) { + Gfx* dispRefs[5]; + s32 ret; + + Graph_OpenDisps(dispRefs, gfxCtx, "../z_rcp.c", 2386); + + gSPDisplayList(gfxCtx->polyOpa.p++, sFillSetupDL); + gSPDisplayList(gfxCtx->polyXlu.p++, sFillSetupDL); + gSPDisplayList(gfxCtx->overlay.p++, sFillSetupDL); + gDPSetScissorFrac(gfxCtx->polyOpa.p++, G_SC_NON_INTERLACE, 0, 0, (s32)gScreenWidth * 4.0f, + (s32)gScreenHeight * 4.0f); + gDPSetScissorFrac(gfxCtx->polyXlu.p++, G_SC_NON_INTERLACE, 0, 0, (s32)gScreenWidth * 4.0f, + (s32)gScreenHeight * 4.0f); + gDPSetScissorFrac(gfxCtx->overlay.p++, G_SC_NON_INTERLACE, 0, 0, (s32)gScreenWidth * 4.0f, + (s32)gScreenHeight * 4.0f); + + gDPSetColorImage(gfxCtx->polyOpa.p++, G_IM_FMT_RGBA, G_IM_SIZ_16b, gScreenWidth, gfxCtx->curFrameBuffer); + gDPSetColorImage(gfxCtx->polyOpa.p++, G_IM_FMT_RGBA, G_IM_SIZ_16b, gScreenWidth, gfxCtx->curFrameBuffer); + gDPSetColorImage(gfxCtx->polyXlu.p++, G_IM_FMT_RGBA, G_IM_SIZ_16b, gScreenWidth, gfxCtx->curFrameBuffer); + gDPSetColorImage(gfxCtx->overlay.p++, G_IM_FMT_RGBA, G_IM_SIZ_16b, gScreenWidth, gfxCtx->curFrameBuffer); + + gDPSetDepthImage(gfxCtx->polyOpa.p++, gZBuffer); + gDPSetDepthImage(gfxCtx->polyXlu.p++, gZBuffer); + gDPSetDepthImage(gfxCtx->overlay.p++, gZBuffer); + + if ((R_PAUSE_MENU_MODE < 2) && (D_80161490 < 2)) { + ret = func_800B38FC(); + + if (HREG(80) == 16) { + if (HREG(95) != 16) { + HREG(81) = 3; + HREG(82) = 3; + HREG(83) = 0; + HREG(84) = 0; + HREG(85) = 0; + HREG(86) = 0; + HREG(87) = 0; + HREG(88) = 0; + HREG(89) = 0; + HREG(90) = 0; + HREG(91) = 0; + HREG(92) = 0; + HREG(93) = 0; + HREG(94) = 0; + HREG(95) = 16; + } + + if (HREG(81) & 1) { + HREG(83) = ret; + } + + if (HREG(81) & 2) { + HREG(84) = r; + HREG(85) = g; + HREG(86) = b; + } + + if (HREG(82) & 1) { + ret = HREG(83); + } + + if (HREG(82) & 2) { + r = HREG(84); + g = HREG(85); + b = HREG(86); + } + } + + gDPSetColorImage(gfxCtx->polyOpa.p++, G_IM_FMT_RGBA, G_IM_SIZ_16b, gScreenWidth, gZBuffer); + gDPSetCycleType(gfxCtx->polyOpa.p++, G_CYC_FILL); + gDPSetRenderMode(gfxCtx->polyOpa.p++, G_RM_NOOP, G_RM_NOOP2); + gDPSetFillColor(gfxCtx->polyOpa.p++, + (GPACK_RGBA5551(0xFF, 0xFF, 0xF0, 0) << 16) | GPACK_RGBA5551(0xFF, 0xFF, 0xF0, 0)); + gDPFillRectangle(gfxCtx->polyOpa.p++, 0, ret, gScreenWidth - 1, gScreenHeight - ret - 1); + gDPPipeSync(gfxCtx->polyOpa.p++); + + gDPSetColorImage(gfxCtx->polyOpa.p++, G_IM_FMT_RGBA, G_IM_SIZ_16b, gScreenWidth, gfxCtx->curFrameBuffer); + gDPSetCycleType(gfxCtx->polyOpa.p++, G_CYC_FILL); + gDPSetRenderMode(gfxCtx->polyOpa.p++, G_RM_NOOP, G_RM_NOOP2); + gDPSetFillColor(gfxCtx->polyOpa.p++, (GPACK_RGBA5551(r, g, b, 1) << 16) | GPACK_RGBA5551(r, g, b, 1)); + gDPFillRectangle(gfxCtx->polyOpa.p++, 0, ret, gScreenWidth - 1, gScreenHeight - ret - 1); + gDPPipeSync(gfxCtx->polyOpa.p++); + + if (ret > 0) { + gDPPipeSync(gfxCtx->overlay.p++); + gDPSetCycleType(gfxCtx->overlay.p++, G_CYC_FILL); + gDPSetRenderMode(gfxCtx->overlay.p++, G_RM_NOOP, G_RM_NOOP2); + gDPSetFillColor(gfxCtx->overlay.p++, (GPACK_RGBA5551(r, g, b, 1) << 16) | GPACK_RGBA5551(r, g, b, 1)); + gDPFillRectangle(gfxCtx->overlay.p++, 0, 0, gScreenWidth - 1, ret - 1); + gDPFillRectangle(gfxCtx->overlay.p++, 0, gScreenHeight - ret, gScreenWidth - 1, gScreenHeight - 1); + gDPPipeSync(gfxCtx->overlay.p++); + } + } + + Graph_CloseDisps(dispRefs, gfxCtx, "../z_rcp.c", 2497); +} + +void func_80095974(GraphicsContext* gfxCtx) { + Gfx* dispRefs[5]; + + Graph_OpenDisps(dispRefs, gfxCtx, "../z_rcp.c", 2503); + + gSPDisplayList(gfxCtx->polyOpa.p++, sFillSetupDL); + gDPSetScissorFrac(gfxCtx->polyOpa.p++, G_SC_NON_INTERLACE, 0, 0, (s32)gScreenWidth * 4.0f, + (s32)gScreenHeight * 4.0f); + gDPSetDepthImage(gfxCtx->polyOpa.p++, gZBuffer); + gDPSetColorImage(gfxCtx->polyOpa.p++, G_IM_FMT_RGBA, G_IM_SIZ_16b, gScreenWidth, gfxCtx->curFrameBuffer); + + Graph_CloseDisps(dispRefs, gfxCtx, "../z_rcp.c", 2513); +} diff --git a/src/code/z_room.c b/src/code/z_room.c index bbcb3d6f49..690ce974c4 100644 --- a/src/code/z_room.c +++ b/src/code/z_room.c @@ -9,55 +9,48 @@ void func_80096F6C(GlobalContext* globalCtx, Room* room, u32 flags); Vec3f D_801270A0 = { 0.0f, 0.0f, 0.0f }; // unused -Gfx D_801270B0[] = -{ +Gfx D_801270B0[] = { gsDPPipeSync(), gsSPClearGeometryMode(G_ZBUFFER | G_CULL_BOTH | G_FOG | G_LIGHTING | G_TEXTURE_GEN | G_TEXTURE_GEN_LINEAR | G_LOD), gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_OFF), - gsDPSetCombineLERP(0, 0, 0, SHADE, 0, 0, 0, SHADE, 0, 0, 0, SHADE, 0, 0, 0, SHADE), - gsDPSetOtherMode(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, + gsDPSetCombineMode(G_CC_SHADE, G_CC_SHADE), + gsDPSetOtherMode(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), gsSPLoadGeometryMode(G_ZBUFFER | G_SHADE | G_CULL_BACK | G_LIGHTING | G_SHADING_SMOOTH), - gsDPSetScissor(G_SC_NON_INTERLACE, 0, 0, 320, 240), + gsDPSetScissor(G_SC_NON_INTERLACE, 0, 0, SCREEN_WIDTH, SCREEN_HEIGHT), gsSPClipRatio(FRUSTRATIO_1), gsSPEndDisplayList(), }; -void (*sRoomDrawHandlers[])(GlobalContext* globalCtx, Room* room, u32 flags) = -{ +void (*sRoomDrawHandlers[])(GlobalContext* globalCtx, Room* room, u32 flags) = { func_80095AB4, func_80096F6C, func_80095D04, }; -void func_80095AA0(GlobalContext* globalCtx, Room* room, UNK_TYPE arg2, UNK_TYPE arg3) -{ - +void func_80095AA0(GlobalContext* globalCtx, Room* room, UNK_TYPE arg2, UNK_TYPE arg3) { } // Room Draw Polygon Type 0 -void func_80095AB4(GlobalContext* globalCtx, Room* room, u32 flags) -{ +void func_80095AB4(GlobalContext* globalCtx, Room* room, u32 flags) { s32 i; PolygonType0* polygon0; PolygonDlist* polygonDlist; GraphicsContext* gfxCtx; - Gfx* gfxArr[4]; + Gfx* dispRefs[4]; gfxCtx = globalCtx->state.gfxCtx; - func_800C6AC4(gfxArr, globalCtx->state.gfxCtx, "../z_room.c", 193); + Graph_OpenDisps(dispRefs, globalCtx->state.gfxCtx, "../z_room.c", 193); - if (flags & 1) - { + if (flags & 1) { func_800342EC(&D_801270A0, globalCtx); gSPSegment(gfxCtx->polyOpa.p++, 0x03, room->segment); func_80093C80(globalCtx); gSPMatrix(gfxCtx->polyOpa.p++, &gMtxClear, G_MTX_MODELVIEW | G_MTX_LOAD); } - if (flags & 2) - { + if (flags & 2) { func_8003435C(&D_801270A0, globalCtx); gSPSegment(gfxCtx->polyXlu.p++, 0x03, room->segment); func_80093D84(globalCtx->state.gfxCtx); @@ -66,35 +59,34 @@ void func_80095AB4(GlobalContext* globalCtx, Room* room, u32 flags) polygon0 = &room->mesh->polygon0; polygonDlist = SEGMENTED_TO_VIRTUAL(polygon0->start); - for (i = 0; i < polygon0->num; i++) - { - if ((flags & 1) && (polygonDlist->opa != NULL)) + for (i = 0; i < polygon0->num; i++) { + if ((flags & 1) && (polygonDlist->opa != NULL)) { gSPDisplayList(gfxCtx->polyOpa.p++, polygonDlist->opa); + } - if ((flags & 2) && (polygonDlist->xlu != NULL)) + if ((flags & 2) && (polygonDlist->xlu != NULL)) { gSPDisplayList(gfxCtx->polyXlu.p++, polygonDlist->xlu); + } polygonDlist++; } - func_800C6B54(gfxArr, globalCtx->state.gfxCtx, "../z_room.c", 239); + Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_room.c", 239); } #define SHAPE_SORT_MAX 64 -typedef struct struct_80095D04 -{ +typedef struct struct_80095D04 { /* 0x00 */ PolygonDlist2* unk_00; - /* 0x04 */ f32 unk_04; + /* 0x04 */ f32 unk_04; /* 0x08 */ struct struct_80095D04* unk_08; /* 0x0C */ struct struct_80095D04* unk_0C; } struct_80095D04; // size = 0x10 // Room Draw Polygon Type 2 #ifdef NON_MATCHING -// this function still needs some work -void func_80095D04(GlobalContext* globalCtx, Room* room, u32 flags) -{ +// this function still needs some work but it should be functionally equivalent +void func_80095D04(GlobalContext* globalCtx, Room* room, u32 flags) { PolygonType2* polygon2; PolygonDlist2* polygonDlist; struct_80095D04 spB8[SHAPE_SORT_MAX]; @@ -113,23 +105,21 @@ void func_80095D04(GlobalContext* globalCtx, Room* room, u32 flags) f32 temp_f0; f32 temp_f2; GraphicsContext* gfxCtx; - Gfx* sp5C[4]; + Gfx* dispRefs[4]; spB0 = NULL; spB4 = NULL; gfxCtx = globalCtx->state.gfxCtx; - func_800C6AC4(sp5C, globalCtx->state.gfxCtx, "../z_room.c", 287); + Graph_OpenDisps(dispRefs, globalCtx->state.gfxCtx, "../z_room.c", 287); - if (flags & 1) - { + if (flags & 1) { func_800342EC(&D_801270A0, globalCtx); gSPSegment(gfxCtx->polyOpa.p++, 0x03, room->segment); func_80093C80(globalCtx); gSPMatrix(gfxCtx->polyOpa.p++, &gMtxClear, G_MTX_MODELVIEW | G_MTX_LOAD); } - if (flags & 2) - { + if (flags & 2) { func_8003435C(&D_801270A0, globalCtx); gSPSegment(gfxCtx->polyXlu.p++, 0x03, room->segment); func_80093D84(globalCtx->state.gfxCtx); @@ -139,58 +129,51 @@ void func_80095D04(GlobalContext* globalCtx, Room* room, u32 flags) spA4 = &spB8[0]; polygonDlist = SEGMENTED_TO_VIRTUAL(room->mesh->polygon2.start); polygon2 = &room->mesh->polygon2; - if (polygon2->num > SHAPE_SORT_MAX) + if (polygon2->num > SHAPE_SORT_MAX) { __assert("polygon2->num <= SHAPE_SORT_MAX", "../z_room.c", 317); + } sp78 = polygonDlist; - for (sp9C = 0; sp9C < polygon2->num; sp9C++) - { + for (sp9C = 0; sp9C < polygon2->num; sp9C++) { sp90.x = polygonDlist->pos.x; sp90.y = polygonDlist->pos.y; sp90.z = polygonDlist->pos.z; func_800A6E10(&globalCtx->mf_11D60, &sp90, &sp84, &sp80); temp_f0 = polygonDlist->unk_06; - if (-temp_f0 < sp84.z) - { + if (-temp_f0 < sp84.z) { temp_f2 = sp84.z - temp_f0; - if (temp_f2 < globalCtx->lightCtx.unk_0C) - { + if (temp_f2 < globalCtx->lightCtx.unk_0C) { spA4->unk_00 = polygonDlist; spA4->unk_04 = temp_f2; phi_v0 = spB4; - if (spB4 == 0) - { + if (spB4 == 0) { spB0 = spA4; spB4 = spA4; spA4->unk_0C = NULL; spA4->unk_08 = NULL; - } - else - { - do - { - if (spA4->unk_04 < phi_v0->unk_04) + } else { + do { + if (spA4->unk_04 < phi_v0->unk_04) { break; + } phi_v0 = phi_v0->unk_0C; } while (phi_v0 != NULL); - if (phi_v0 == NULL) - { + if (phi_v0 == NULL) { spA4->unk_08 = spB0; spA4->unk_0C = NULL; spB0->unk_0C = spA4; spB0 = spA4; - } - else - { + } else { phi_a0 = phi_v0->unk_08; spA4->unk_08 = phi_a0; - if (phi_a0 == NULL) + if (phi_a0 == NULL) { spB4 = spA4; - else + } else { phi_a0->unk_0C = spA4; + } phi_v0->unk_08 = spA4; - spA4->unk_0C = (void *) phi_v0; + spA4->unk_0C = (void*)phi_v0; } } spA4 = spA4++; @@ -202,37 +185,35 @@ void func_80095D04(GlobalContext* globalCtx, Room* room, u32 flags) iREG(87) = polygon2->num; sp9C = 1; - while (spB4 != NULL) - { + while (spB4 != NULL) { phi_s0 = spB4->unk_00; - if (iREG(86) != 0) - { + if (iREG(86) != 0) { phi_v1 = 0; - while (phi_v1 < polygon2->num) - { - if (phi_s0 == sp78) + while (phi_v1 < polygon2->num) { + if (phi_s0 == sp78) { break; + } phi_v1++; sp78++; } - if (((iREG(86) == 1) && (iREG(89) > sp9C)) || - ((iREG(86) == 2) && (iREG(89) == sp9C))) - { - if ((flags & 1) && (phi_s0->opa != NULL)) + if (((iREG(86) == 1) && (iREG(89) > sp9C)) || ((iREG(86) == 2) && (iREG(89) == sp9C))) { + if ((flags & 1) && (phi_s0->opa != NULL)) { gSPDisplayList(gfxCtx->polyOpa.p++, phi_s0->opa); + } - if ((flags & 2) && (phi_s0->xlu != NULL)) + if ((flags & 2) && (phi_s0->xlu != NULL)) { gSPDisplayList(gfxCtx->polyXlu.p++, phi_s0->xlu); + } } - } - else - { - if ((flags & 1) && (phi_s0->opa != NULL)) + } else { + if ((flags & 1) && (phi_s0->opa != NULL)) { gSPDisplayList(gfxCtx->polyOpa.p++, phi_s0->opa); + } - if ((flags & 2) && (phi_s0->xlu != NULL)) + if ((flags & 2) && (phi_s0->xlu != NULL)) { gSPDisplayList(gfxCtx->polyXlu.p++, phi_s0->xlu); + } } spB4 = spB4->unk_0C; @@ -241,7 +222,7 @@ void func_80095D04(GlobalContext* globalCtx, Room* room, u32 flags) iREG(88) = sp9C - 1; - func_800C6B54(sp5C, globalCtx->state.gfxCtx, "../z_room.c", 430); + Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_room.c", 430); } #else #pragma GLOBAL_ASM("asm/non_matchings/code/z_room/func_80095D04.s") @@ -251,14 +232,12 @@ void func_80095D04(GlobalContext* globalCtx, Room* room, u32 flags) #ifdef NON_MATCHING // long multiplication by 64 doesn't quite match -s32 func_80096238(void* data) -{ +s32 func_80096238(void* data) { OSTime timeBefore; OSTime timeAfter; OSTime time; - if (*(u32*)data == JPEG_MARKER) - { + if (*(u32*)data == JPEG_MARKER) { // Translates to: "EXPANDING JPEG DATA" osSyncPrintf("JPEGデータを展開します\n"); // Translates to: "JPEG DATA ADDRESS %08x" @@ -267,8 +246,7 @@ s32 func_80096238(void* data) osSyncPrintf("ワークバッファアドレス（Ｚバッファ）%08x\n", gZBuffer); timeBefore = osGetTime(); - if (!func_8006E418(data, gZBuffer, gGfxSPTaskOutputBuffer, sizeof(gGfxSPTaskOutputBuffer))) - { + if (!func_8006E418(data, gZBuffer, gGfxSPTaskOutputBuffer, sizeof(gGfxSPTaskOutputBuffer))) { timeAfter = osGetTime(); time = ((timeAfter - timeBefore) * 64) / 3000; @@ -280,9 +258,7 @@ s32 func_80096238(void* data) osSyncPrintf("元のバッファのサイズが150キロバイト無いと暴走するでしょう。\n"); bcopy(gZBuffer, data, sizeof(gZBuffer)); - } - else - { + } else { // Translates to: "FAILURE! WHY IS IT 〜" osSyncPrintf("失敗！なんで〜\n"); } @@ -296,8 +272,8 @@ s32 func_80096238(void* data) #ifdef NON_MATCHING // pointer arithmetic doesn't quite match -void func_8009638C(Gfx** displayList, u32 source, u32 tlut, u16 width, u16 height, u8 fmt, u8 siz, u16 mode0, u16 tlutCount, f32 frameX, f32 frameY) -{ +void func_8009638C(Gfx** displayList, u32 source, u32 tlut, u16 width, u16 height, u8 fmt, u8 siz, u16 mode0, + u16 tlutCount, f32 frameX, f32 frameY) { Gfx* displayListHead; uObjBg* bg; @@ -305,7 +281,7 @@ void func_8009638C(Gfx** displayList, u32 source, u32 tlut, u16 width, u16 heigh func_80096238(SEGMENTED_TO_VIRTUAL(source)); displayListHead++; - gSPBranchList(displayListHead, displayListHead+5); + gSPBranchList(displayListHead, displayListHead + 5); bg = (void*)displayListHead; bg->b.imageX = 0; bg->b.imageW = width * 4; @@ -320,46 +296,33 @@ void func_8009638C(Gfx** displayList, u32 source, u32 tlut, u16 width, u16 heigh bg->b.imagePal = 0; bg->b.imageFlip = 0; - if (fmt == G_IM_FMT_CI) - { - displayListHead = (void*)(bg+1); + if (fmt == G_IM_FMT_CI) { + displayListHead = (void*)(bg + 1); gDPLoadTLUT(displayListHead++, tlutCount, 256, tlut); - } - else - { - displayListHead = (void*)(bg+1); + } else { + displayListHead = (void*)(bg + 1); gDPPipeSync(displayListHead++); } - if ((fmt == G_IM_FMT_RGBA) && (SREG(26) == 0)) - { + if ((fmt == G_IM_FMT_RGBA) && (SREG(26) == 0)) { bg->b.frameW = width * 4; bg->b.frameH = height * 4; func_80104B00(bg); - gDPSetOtherMode(displayListHead++, - mode0 | G_AD_PATTERN | G_CD_MAGICSQ | G_CK_NONE | G_TC_CONV | G_TF_POINT | - G_TT_NONE | G_TL_TILE | G_TD_CLAMP | G_TP_NONE | G_CYC_COPY | G_PM_NPRIMITIVE, + gDPSetOtherMode(displayListHead++, mode0 | G_TL_TILE | G_TD_CLAMP | G_TP_NONE | G_CYC_COPY | G_PM_NPRIMITIVE, G_AC_THRESHOLD | G_ZS_PIXEL | G_RM_NOOP | G_RM_NOOP2); gSPBgRectCopy(displayListHead++, bg); - } - else - { + } else { bg->s.frameW = width * 4; bg->s.frameH = height * 4; bg->s.scaleW = 1024; bg->s.scaleH = 1024; bg->s.imageYorig = bg->b.imageY; - gDPSetOtherMode(displayListHead++, - mode0 | G_AD_DISABLE | G_CD_DISABLE | G_CK_NONE | G_TC_FILT | G_TF_POINT | - G_TT_NONE | G_TL_TILE | G_TD_CLAMP | G_TP_NONE | G_CYC_1CYCLE | G_PM_NPRIMITIVE, - G_AC_THRESHOLD | G_ZS_PIXEL | AA_EN | - CVG_DST_CLAMP | ZMODE_OPA | CVG_X_ALPHA | ALPHA_CVG_SEL | - GBL_c1(G_BL_CLR_IN, G_BL_A_IN, G_BL_CLR_BL, G_BL_1MA) | - GBL_c2(G_BL_CLR_IN, G_BL_A_IN, G_BL_CLR_BL, G_BL_1MA)); - gDPSetCombineLERP(displayListHead++, - 0, 0, 0, TEXEL0, 0, 0, 0, 1, - 0, 0, 0, TEXEL0, 0, 0, 0, 1); - gSPObjRenderMode(displayListHead++, 0x0C); // unknown object render mode? + gDPSetOtherMode(displayListHead++, mode0 | G_TL_TILE | G_TD_CLAMP | G_TP_NONE | G_CYC_1CYCLE | G_PM_NPRIMITIVE, + G_AC_THRESHOLD | G_ZS_PIXEL | AA_EN | CVG_DST_CLAMP | ZMODE_OPA | CVG_X_ALPHA | ALPHA_CVG_SEL | + GBL_c1(G_BL_CLR_IN, G_BL_A_IN, G_BL_CLR_BL, G_BL_1MA) | + GBL_c2(G_BL_CLR_IN, G_BL_A_IN, G_BL_CLR_BL, G_BL_1MA)); + gDPSetCombineLERP(displayListHead++, 0, 0, 0, TEXEL0, 0, 0, 0, 1, 0, 0, 0, TEXEL0, 0, 0, 0, 1); + gSPObjRenderMode(displayListHead++, G_OBJRM_ANTIALIAS | G_OBJRM_BILERP); gSPBgRect1Cyc(displayListHead++, bg); } @@ -367,13 +330,13 @@ void func_8009638C(Gfx** displayList, u32 source, u32 tlut, u16 width, u16 heigh *displayList = displayListHead; } #else -void func_8009638C(Gfx** displayList, u32 source, u32 tlut, u16 width, u16 height, u8 fmt, u8 siz, u16 mode0, u16 tlutCount, f32 frameX, f32 frameY); +void func_8009638C(Gfx** displayList, u32 source, u32 tlut, u16 width, u16 height, u8 fmt, u8 siz, u16 mode0, + u16 tlutCount, f32 frameX, f32 frameY); #pragma GLOBAL_ASM("asm/non_matchings/code/z_room/func_8009638C.s") #endif // Room Draw Polygon Type 1 - Single Format -void func_80096680(GlobalContext* globalCtx, Room* room, u32 flags) -{ +void func_80096680(GlobalContext* globalCtx, Room* room, u32 flags) { Camera* camera; Gfx* spA8; PolygonType1* polygon1; @@ -383,10 +346,10 @@ void func_80096680(GlobalContext* globalCtx, Room* room, u32 flags) u32 sp94; u32 sp90; GraphicsContext* gfxCtx; - Gfx* gfxArr[4]; + Gfx* dispRefs[4]; gfxCtx = globalCtx->state.gfxCtx; - func_800C6AC4(gfxArr, globalCtx->state.gfxCtx, "../z_room.c", 628); + Graph_OpenDisps(dispRefs, globalCtx->state.gfxCtx, "../z_room.c", 628); camera = globalCtx->cameraCtx.activeCameraPtrs[globalCtx->cameraCtx.unk_5C0]; polygon1 = &room->mesh->polygon1; @@ -396,62 +359,53 @@ void func_80096680(GlobalContext* globalCtx, Room* room, u32 flags) sp94 = (flags & 1) && polygonDlist->opa && !(SREG(25) & 2); sp90 = (flags & 2) && polygonDlist->xlu && !(SREG(25) & 4); - if (sp94 || sp98) - { + if (sp94 || sp98) { gSPSegment(gfxCtx->polyOpa.p++, 0x03, room->segment); - if (sp94) - { + if (sp94) { func_80093D18(globalCtx->state.gfxCtx); gSPMatrix(gfxCtx->polyOpa.p++, &gMtxClear, G_MTX_MODELVIEW | G_MTX_LOAD); gSPDisplayList(gfxCtx->polyOpa.p++, polygonDlist->opa); } - if (sp98) - { + if (sp98) { // gSPLoadUcodeL(gfxCtx->polyOpa.p++, rspS2DEX)? gSPLoadUcodeEx(gfxCtx->polyOpa.p++, D_00113070, D_001579A0, 0x800); - if (1) - { + if (1) { Vec3f sp60; spA8 = gfxCtx->polyOpa.p; 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, + 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); + (sp60.x + sp60.z) * 1.2f + sp60.y * 0.6f, sp60.y * 2.4f + (sp60.x + sp60.z) * 0.3f); gfxCtx->polyOpa.p = spA8; } - // gSPLoadUcode(gfxCtx->polyOpa.p++, func_800D2E14(), func_800D2E20())? - gSPLoadUcodeEx(gfxCtx->polyOpa.p++, func_800D2E14(), func_800D2E20(), 0x800); + // gSPLoadUcode(gfxCtx->polyOpa.p++, SysUcode_GetUcode(), SysUcode_GetUcodeData())? + gSPLoadUcodeEx(gfxCtx->polyOpa.p++, SysUcode_GetUcode(), SysUcode_GetUcodeData(), 0x800); } } - if (sp90) - { + if (sp90) { gSPSegment(gfxCtx->polyXlu.p++, 0x03, room->segment); func_80093D84(globalCtx->state.gfxCtx); gSPMatrix(gfxCtx->polyXlu.p++, &gMtxClear, G_MTX_MODELVIEW | G_MTX_LOAD); gSPDisplayList(gfxCtx->polyXlu.p++, polygonDlist->xlu); } - func_800C6B54(gfxArr, globalCtx->state.gfxCtx, "../z_room.c", 691); + Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_room.c", 691); } -typedef struct -{ +typedef struct { char unk_00[0x0E]; - s16 unk_0E; + s16 unk_0E; } struct_80041C10_ret; extern struct_80041C10_ret* func_80041C10(CollisionContext*, s32, s32); -BgImage* func_80096A74(PolygonType1* polygon1, GlobalContext* globalCtx) -{ +BgImage* func_80096A74(PolygonType1* polygon1, GlobalContext* globalCtx) { Camera* camera; s32 camId; s16 camId2; @@ -462,17 +416,18 @@ BgImage* func_80096A74(PolygonType1* polygon1, GlobalContext* globalCtx) camera = globalCtx->cameraCtx.activeCameraPtrs[globalCtx->cameraCtx.unk_5C0]; camId = camera->unk_148; camId2 = func_80041C10(&globalCtx->colCtx, camId, 50)->unk_0E; - if (camId2 >= 0) + if (camId2 >= 0) { camId = camId2; + } player = PLAYER; player->actor.params = (player->actor.params & 0xFF00) | camId; bgImage = SEGMENTED_TO_VIRTUAL(polygon1->multi.list); - for (i = 0; i < polygon1->multi.count; i++) - { - if (bgImage->id == camId) + for (i = 0; i < polygon1->multi.count; i++) { + if (bgImage->id == camId) { return bgImage; + } bgImage++; } @@ -486,8 +441,7 @@ BgImage* func_80096A74(PolygonType1* polygon1, GlobalContext* globalCtx) // Room Draw Polygon Type 1 - Multi Format #ifdef NON_MATCHING // regalloc differences -void func_80096B6C(GlobalContext* globalCtx, Room* room, u32 flags) -{ +void func_80096B6C(GlobalContext* globalCtx, Room* room, u32 flags) { Camera* camera; Gfx* spA8; BgImage* bgImage; @@ -498,10 +452,10 @@ void func_80096B6C(GlobalContext* globalCtx, Room* room, u32 flags) u32 sp90; u32 sp8C; GraphicsContext* gfxCtx; - Gfx* gfxArr[4]; + Gfx* dispRefs[4]; gfxCtx = globalCtx->state.gfxCtx; - func_800C6AC4(gfxArr, globalCtx->state.gfxCtx, "../z_room.c", 752); + Graph_OpenDisps(dispRefs, globalCtx->state.gfxCtx, "../z_room.c", 752); camera = globalCtx->cameraCtx.activeCameraPtrs[globalCtx->cameraCtx.unk_5C0]; sp98 = (camera->unk_142 ^ 25) == 0; @@ -512,78 +466,68 @@ void func_80096B6C(GlobalContext* globalCtx, Room* room, u32 flags) sp90 = (flags & 1) && polygonDlist->opa && !(SREG(25) & 2); sp8C = (flags & 2) && polygonDlist->xlu && !(SREG(25) & 4); - if (sp90 || sp94) - { + if (sp90 || sp94) { gSPSegment(gfxCtx->polyOpa.p++, 0x03, room->segment); - if (sp90) - { + if (sp90) { func_80093D18(globalCtx->state.gfxCtx); gSPMatrix(gfxCtx->polyOpa.p++, &gMtxClear, G_MTX_MODELVIEW | G_MTX_LOAD); gSPDisplayList(gfxCtx->polyOpa.p++, polygonDlist->opa); } - if (sp94) - { + if (sp94) { // gSPLoadUcodeL(gfxCtx->polyOpa.p++, rspS2DEX)? gSPLoadUcodeEx(gfxCtx->polyOpa.p++, D_00113070, D_001579A0, 0x800); - if (1) - { + if (1) { Vec3f sp5C; spA8 = gfxCtx->polyOpa.p; 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); + 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); gfxCtx->polyOpa.p = spA8; } - // gSPLoadUcode(gfxCtx->polyOpa.p++, func_800D2E14(), func_800D2E20())? - gSPLoadUcodeEx(gfxCtx->polyOpa.p++, func_800D2E14(), func_800D2E20(), 0x800); + // gSPLoadUcode(gfxCtx->polyOpa.p++, SysUcode_GetUcode(), SysUcode_GetUcodeData())? + gSPLoadUcodeEx(gfxCtx->polyOpa.p++, SysUcode_GetUcode(), SysUcode_GetUcodeData(), 0x800); } } - if (sp8C) - { + if (sp8C) { gSPSegment(gfxCtx->polyXlu.p++, 0x03, room->segment); func_80093D84(globalCtx->state.gfxCtx); gSPMatrix(gfxCtx->polyXlu.p++, &gMtxClear, G_MTX_MODELVIEW | G_MTX_LOAD); gSPDisplayList(gfxCtx->polyXlu.p++, polygonDlist->xlu); } - func_800C6B54(gfxArr, globalCtx->state.gfxCtx, "../z_room.c", 819); + Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_room.c", 819); } #else #pragma GLOBAL_ASM("asm/non_matchings/code/z_room/func_80096B6C.s") #endif // Room Draw Polygon Type 1 -void func_80096F6C(GlobalContext* globalCtx, Room* room, u32 flags) -{ +void func_80096F6C(GlobalContext* globalCtx, Room* room, u32 flags) { PolygonType1* polygon1 = &room->mesh->polygon1; - if (polygon1->format == 1) + if (polygon1->format == 1) { func_80096680(globalCtx, room, flags); - else if (polygon1->format == 2) + } else if (polygon1->format == 2) { func_80096B6C(globalCtx, room, flags); - else + } else { LogUtils_HungupThread("../z_room.c", 841); + } } -void func_80096FD4(GlobalContext* globalCtx, Room* room) -{ +void func_80096FD4(GlobalContext* globalCtx, Room* room) { room->num = -1; room->segment = NULL; } #ifdef NON_MATCHING // regalloc differences -u32 func_80096FE8(GlobalContext* globalCtx, RoomContext* roomCtx) -{ +u32 func_80096FE8(GlobalContext* globalCtx, RoomContext* roomCtx) { RomFile* roomList; TransitionActorEntry* transitionActor; s32 i, j; @@ -598,32 +542,31 @@ u32 func_80096FE8(GlobalContext* globalCtx, RoomContext* roomCtx) maxRoomSize = 0; roomList = globalCtx->roomList; - for (i = 0; i < globalCtx->nbRooms; i++) - { + for (i = 0; i < globalCtx->nbRooms; i++) { roomSize = roomList[i].vromEnd - roomList[i].vromStart; osSyncPrintf("ROOM%d size=%d\n", i, roomSize); - if (maxRoomSize < roomSize) + if (maxRoomSize < roomSize) { maxRoomSize = roomSize; + } } - if (globalCtx->nbTransitionActors != 0) - { + if (globalCtx->nbTransitionActors != 0) { j = 0; roomList = globalCtx->roomList; transitionActor = &globalCtx->transitionActorList[0]; - LogUtils_LogThreadId("../z_room.c", 912); - osSyncPrintf("game_play->room_rom_address.num = %d\n", globalCtx->nbRooms); - for (j = 0; j < globalCtx->nbTransitionActors; j++) - { + LOG_NUM("game_play->room_rom_address.num", globalCtx->nbRooms, "../z_room.c", 912); + + for (j = 0; j < globalCtx->nbTransitionActors; j++) { frontRoom = transitionActor->frontRoom; backRoom = transitionActor->backRoom; frontRoomSize = (frontRoom < 0) ? 0 : roomList[frontRoom].vromEnd - roomList[frontRoom].vromStart; backRoomSize = (backRoom < 0) ? 0 : roomList[backRoom].vromEnd - roomList[backRoom].vromStart; cumulRoomSize = (frontRoom != backRoom) ? frontRoomSize + backRoomSize : frontRoomSize; - osSyncPrintf("DOOR%d=<%d> ROOM1=<%d, %d> ROOM2=<%d, %d>\n", - j, cumulRoomSize, frontRoom, frontRoomSize, backRoom, backRoomSize); - if (maxRoomSize < cumulRoomSize) + osSyncPrintf("DOOR%d=<%d> ROOM1=<%d, %d> ROOM2=<%d, %d>\n", j, cumulRoomSize, frontRoom, frontRoomSize, + backRoom, backRoomSize); + if (maxRoomSize < cumulRoomSize) { maxRoomSize = cumulRoomSize; + } transitionActor++; } } @@ -641,10 +584,11 @@ u32 func_80096FE8(GlobalContext* globalCtx, RoomContext* roomCtx) roomCtx->unk_30 = 0; roomCtx->status = 0; - if (gSaveContext.respawn_flag > 0) - nextRoomNum = gSaveContext.respawn[gSaveContext.respawn_flag-1].room_index; - else + if (gSaveContext.respawn_flag > 0) { + nextRoomNum = gSaveContext.respawn[gSaveContext.respawn_flag - 1].room_index; + } else { nextRoomNum = globalCtx->setupEntranceList[globalCtx->curSpawn].room; + } func_8009728C(globalCtx, roomCtx, nextRoomNum); return maxRoomSize; @@ -653,30 +597,29 @@ u32 func_80096FE8(GlobalContext* globalCtx, RoomContext* roomCtx) #pragma GLOBAL_ASM("asm/non_matchings/code/z_room/func_80096FE8.s") #endif -s32 func_8009728C(GlobalContext* globalCtx, RoomContext* roomCtx, s32 roomNum) -{ +s32 func_8009728C(GlobalContext* globalCtx, RoomContext* roomCtx, s32 roomNum) { u32 size; - if (0) ; // Necessary to match + if (0) {} // Necessary to match - if (roomCtx->status == 0) - { + if (roomCtx->status == 0) { roomCtx->prevRoom = roomCtx->curRoom; roomCtx->curRoom.num = roomNum; roomCtx->curRoom.segment = NULL; roomCtx->status = 1; - if (roomNum >= globalCtx->nbRooms) + if (roomNum >= globalCtx->nbRooms) { __assert("read_room_ID < game_play->room_rom_address.num", "../z_room.c", 1009); + } size = globalCtx->roomList[roomNum].vromEnd - globalCtx->roomList[roomNum].vromStart; roomCtx->unk_34 = (void*)ALIGN16((s32)roomCtx->bufPtrs[roomCtx->unk_30] - ((size + 8) * roomCtx->unk_30 + 7)); - if (0) ; // Also necessary to match + if (0) {} // Also necessary to match osCreateMesgQueue(&roomCtx->loadQueue, &roomCtx->loadMsg, 1); - DmaMgr_SendRequest2(&roomCtx->dmaRequest, roomCtx->unk_34, globalCtx->roomList[roomNum].vromStart, size, - 0, &roomCtx->loadQueue, NULL, "../z_room.c", 1036); + DmaMgr_SendRequest2(&roomCtx->dmaRequest, roomCtx->unk_34, globalCtx->roomList[roomNum].vromStart, size, 0, + &roomCtx->loadQueue, NULL, "../z_room.c", 1036); roomCtx->unk_30 ^= 1; return 1; @@ -685,12 +628,9 @@ s32 func_8009728C(GlobalContext* globalCtx, RoomContext* roomCtx, s32 roomNum) return 0; } -s32 func_800973FC(GlobalContext* globalCtx, RoomContext* roomCtx) -{ - if (roomCtx->status == 1) - { - if (!osRecvMesg(&roomCtx->loadQueue, NULL, OS_MESG_NOBLOCK)) - { +s32 func_800973FC(GlobalContext* globalCtx, RoomContext* roomCtx) { + if (roomCtx->status == 1) { + if (!osRecvMesg(&roomCtx->loadQueue, NULL, OS_MESG_NOBLOCK)) { roomCtx->status = 0; roomCtx->curRoom.segment = roomCtx->unk_34; gSegments[3] = PHYSICAL_TO_VIRTUAL2(roomCtx->unk_34); @@ -708,25 +648,24 @@ s32 func_800973FC(GlobalContext* globalCtx, RoomContext* roomCtx) return 1; } -void Room_Draw(GlobalContext* globalCtx, Room* room, u32 flags) -{ - if (room->segment != NULL) - { +void Room_Draw(GlobalContext* globalCtx, Room* room, u32 flags) { + if (room->segment != NULL) { gSegments[3] = PHYSICAL_TO_VIRTUAL(room->segment); - if (room->mesh->polygon.type >= ARRAY_COUNTU(sRoomDrawHandlers)) + if (room->mesh->polygon.type >= ARRAY_COUNTU(sRoomDrawHandlers)) { __assert("this->ground_shape->polygon.type < number(Room_Draw_Proc)", "../z_room.c", 1125); + } sRoomDrawHandlers[room->mesh->polygon.type](globalCtx, room, flags); } } -void func_80097534(GlobalContext* globalCtx, RoomContext* roomCtx) -{ +void func_80097534(GlobalContext* globalCtx, RoomContext* roomCtx) { roomCtx->prevRoom.num = -1; roomCtx->prevRoom.segment = NULL; func_80031B14(globalCtx, &globalCtx->actorCtx); Actor_SpawnTransitionActors(globalCtx, &globalCtx->actorCtx); func_80080E04(globalCtx, roomCtx->curRoom.num); - if (!((globalCtx->sceneNum >= SCENE_SPOT00) && (globalCtx->sceneNum <= SCENE_SPOT20))) + if (!((globalCtx->sceneNum >= SCENE_SPOT00) && (globalCtx->sceneNum <= SCENE_SPOT20))) { func_800807A0(globalCtx); + } func_800F66C0(globalCtx->roomCtx.curRoom.echo); } diff --git a/src/code/z_sample.c b/src/code/z_sample.c index 441d8451a9..ee7bf3caa0 100644 --- a/src/code/z_sample.c +++ b/src/code/z_sample.c @@ -1,17 +1,109 @@ #include #include +#include -#pragma GLOBAL_ASM("asm/non_matchings/code/z_sample/func_800975D0.s") +void Sample_Calc(SampleContext* this) { + if (!~(this->state.input[0].padPressed | ~START_BUTTON)) { + SET_NEXT_GAMESTATE(&this->state, func_800BCA64, GlobalContext); + this->state.running = false; + } +} -#pragma GLOBAL_ASM("asm/non_matchings/code/z_sample/func_80097604.s") +// very close from matching, the only difference is the place of "mtx" in the stack +#ifdef NON_MATCHING +void Sample_Draw(SampleContext* this) { + u32 pad; + GraphicsContext* gfxCtx = this->state.gfxCtx; + View* view = &this->view; + Gfx* dispRefs[4]; + Mtx* mtx; -#pragma GLOBAL_ASM("asm/non_matchings/code/z_sample/func_80097820.s") + Graph_OpenDisps(dispRefs, gfxCtx, "../z_sample.c", 62); -#pragma GLOBAL_ASM("asm/non_matchings/code/z_sample/func_80097848.s") + gSPSegment(gfxCtx->polyOpa.p++, 0x00, NULL); + gSPSegment(gfxCtx->polyOpa.p++, 0x01, this->staticSegment); -#pragma GLOBAL_ASM("asm/non_matchings/code/z_sample/func_80097850.s") + func_80095248(gfxCtx, 0, 0, 0); -#pragma GLOBAL_ASM("asm/non_matchings/code/z_sample/func_80097904.s") + view->unk_120 = 7; + func_800AAA50(view, 15); -#pragma GLOBAL_ASM("asm/non_matchings/code/z_sample/func_80097974.s") + mtx = Graph_Alloc(gfxCtx, sizeof(Mtx)); + func_80103D58(mtx, SREG(37), SREG(38), SREG(39), 1.0f, SREG(40), SREG(41), SREG(42)); + gSPMatrix(gfxCtx->polyOpa.p++, mtx, G_MTX_LOAD); + gfxCtx->polyOpa.p = Gfx_SetFog2(gfxCtx->polyOpa.p, 0xFF, 0xFF, 0xFF, 0, 0, 0); + func_80093D18(gfxCtx); + + gDPSetCycleType(gfxCtx->polyOpa.p++, G_CYC_1CYCLE); + gDPSetRenderMode(gfxCtx->polyOpa.p++, G_RM_AA_ZB_OPA_SURF, G_RM_AA_ZB_OPA_SURF2); + gDPSetCombineMode(gfxCtx->polyOpa.p++, G_CC_PRIMITIVE, G_CC_PRIMITIVE); + gDPSetPrimColor(gfxCtx->polyOpa.p++, 0, 0, 0xFF, 0xFF, 0x00, 0x00); + + Graph_CloseDisps(dispRefs, gfxCtx, "../z_sample.c", 111); +} +#else +#pragma GLOBAL_ASM("asm/non_matchings/code/z_sample/Sample_Draw.s") +#endif + +void Sample_Update(SampleContext* this) { + Sample_Draw(this); + Sample_Calc(this); +} + +void Sample_Destroy(SampleContext* this) { +} + +void Sample_SetupView(SampleContext* this) { + View* view; + GraphicsContext* gfxCtx; + u32 v0[4]; + Vec3f v1; + Vec3f v2; + Vec3f v3; + + view = &this->view; + gfxCtx = this->state.gfxCtx; + func_800AA278(view, gfxCtx); + + // clang-format off + v0[1] = SCREEN_HEIGHT; v0[3] = SCREEN_WIDTH; + v0[0] = 0; v0[2] = 0; + // clang-format on + + func_800AA4FC(view, &v0); + func_800AA460(view, 60, 10, 12800); + + v1.x = 0; + v1.y = 0; + v2.x = 0; + v2.y = 0; + v2.z = 0; + v3.x = 0; + v3.z = 0; + v1.z = 3000; + v3.y = 1; + + func_800AA358(view, &v1, &v2, &v3); +} + +void Sample_LoadTitleStatic(SampleContext* this) { + u32 size = _title_staticSegmentRomEnd - _title_staticSegmentRomStart; + + this->staticSegment = Game_Alloc(&this->state, size, "../z_sample.c", 163); + DmaMgr_SendRequest1(this->staticSegment, _title_staticSegmentRomStart, size, "../z_sample.c", 164); +} + +void Sample_Init(SampleContext* this) { + this->state.main = Sample_Update; + this->state.destroy = Sample_Destroy; + R_UPDATE_RATE = 1; + Sample_SetupView(this); + Sample_LoadTitleStatic(this); + SREG(37) = 0; + SREG(38) = 0; + SREG(39) = 0; + SREG(40) = 0; + SREG(41) = 0; + SREG(42) = 0; +} diff --git a/src/code/z_scene.c b/src/code/z_scene.c index 2bd5522961..6ad51d2ee3 100644 --- a/src/code/z_scene.c +++ b/src/code/z_scene.c @@ -4,26 +4,31 @@ RomFile sNaviMsgFiles[]; -s32 Object_Spawn(ObjectContext* objectCtx, s16 objectId) -{ +s32 Object_Spawn(ObjectContext* objectCtx, s16 objectId) { u32 size; objectCtx->status[objectCtx->num].id = objectId; size = gObjectTable[objectId].vromEnd - gObjectTable[objectId].vromStart; - osSyncPrintf("OBJECT[%d] SIZE %fK SEG=%x\n", - objectId, (f64)(size / 1024.0f), objectCtx->status[objectCtx->num].segment); + osSyncPrintf("OBJECT[%d] SIZE %fK SEG=%x\n", objectId, (f64)(size / 1024.0f), + objectCtx->status[objectCtx->num].segment); - osSyncPrintf("num=%d adrs=%x end=%x\n", - objectCtx->num, (s32)objectCtx->status[objectCtx->num].segment + size, objectCtx->spaceEnd); + osSyncPrintf("num=%d adrs=%x end=%x\n", objectCtx->num, (s32)objectCtx->status[objectCtx->num].segment + size, + objectCtx->spaceEnd); - if (!((objectCtx->num < OBJECT_EXCHANGE_BANK_MAX) && (((s32)objectCtx->status[objectCtx->num].segment + size) < (s32)objectCtx->spaceEnd))) - __assert("this->num < OBJECT_EXCHANGE_BANK_MAX && (this->status[this->num].Segment + size) < this->endSegment", "../z_scene.c", 142); + if (!((objectCtx->num < OBJECT_EXCHANGE_BANK_MAX) && + (((s32)objectCtx->status[objectCtx->num].segment + size) < (s32)objectCtx->spaceEnd))) { + __assert("this->num < OBJECT_EXCHANGE_BANK_MAX && (this->status[this->num].Segment + size) < this->endSegment", + "../z_scene.c", 142); + } - DmaMgr_SendRequest1(objectCtx->status[objectCtx->num].segment, gObjectTable[objectId].vromStart, size, "../z_scene.c", 145); + DmaMgr_SendRequest1(objectCtx->status[objectCtx->num].segment, gObjectTable[objectId].vromStart, size, + "../z_scene.c", 145); - if (objectCtx->num < OBJECT_EXCHANGE_BANK_MAX - 1) - objectCtx->status[objectCtx->num + 1].segment = (void*)ALIGN16((s32)objectCtx->status[objectCtx->num].segment + size); + if (objectCtx->num < OBJECT_EXCHANGE_BANK_MAX - 1) { + objectCtx->status[objectCtx->num + 1].segment = + (void*)ALIGN16((s32)objectCtx->status[objectCtx->num].segment + size); + } objectCtx->num++; objectCtx->unk_09 = objectCtx->num; @@ -31,35 +36,33 @@ s32 Object_Spawn(ObjectContext* objectCtx, s16 objectId) return objectCtx->num - 1; } -void Object_InitBank(GlobalContext* globalCtx, ObjectContext* objectCtx) -{ +void Object_InitBank(GlobalContext* globalCtx, ObjectContext* objectCtx) { GlobalContext* globalCtx2 = globalCtx; // Needs to be a new variable to match (possibly a sub struct?) u32 spaceSize; s32 i; - if (globalCtx2->sceneNum == SCENE_SPOT00) + if (globalCtx2->sceneNum == SCENE_SPOT00) { spaceSize = 1024000; - else if (globalCtx2->sceneNum == SCENE_GANON_DEMO) - { - if (gSaveContext.scene_setup_index != 4) + } else if (globalCtx2->sceneNum == SCENE_GANON_DEMO) { + if (gSaveContext.scene_setup_index != 4) { spaceSize = 1177600; - else + } else { spaceSize = 1024000; - } - else if (globalCtx2->sceneNum == SCENE_JYASINBOSS) + } + } else if (globalCtx2->sceneNum == SCENE_JYASINBOSS) { spaceSize = 1075200; - else if (globalCtx2->sceneNum == SCENE_KENJYANOMA) + } else if (globalCtx2->sceneNum == SCENE_KENJYANOMA) { spaceSize = 1075200; - else if (globalCtx2->sceneNum == SCENE_GANON_BOSS) + } else if (globalCtx2->sceneNum == SCENE_GANON_BOSS) { spaceSize = 1075200; - else + } else { spaceSize = 1024000; + } objectCtx->num = objectCtx->unk_09 = 0; objectCtx->mainKeepIndex = objectCtx->subKeepIndex = 0; - for (i = 0; i < OBJECT_EXCHANGE_BANK_MAX; i++) - { + for (i = 0; i < OBJECT_EXCHANGE_BANK_MAX; i++) { objectCtx->status[i].id = 0; } @@ -68,37 +71,32 @@ void Object_InitBank(GlobalContext* globalCtx, ObjectContext* objectCtx) osSyncPrintf("オブジェクト入れ替えバンク情報 %8.3fKB\n", (f64)(spaceSize / 1024.0f)); osSyncPrintf(VT_RST); - objectCtx->spaceStart = objectCtx->status[0].segment = Game_Alloc(&globalCtx->state, spaceSize, "../z_scene.c", 219); + objectCtx->spaceStart = objectCtx->status[0].segment = + Game_Alloc(&globalCtx->state, spaceSize, "../z_scene.c", 219); objectCtx->spaceEnd = (void*)((s32)objectCtx->spaceStart + spaceSize); objectCtx->mainKeepIndex = Object_Spawn(objectCtx, OBJECT_GAMEPLAY_KEEP); gSegments[4] = PHYSICAL_TO_VIRTUAL(objectCtx->status[objectCtx->mainKeepIndex].segment); } -void Object_UpdateBank(ObjectContext* objectCtx) -{ +void Object_UpdateBank(ObjectContext* objectCtx) { s32 i; ObjectStatus* status; RomFile* objectFile; u32 size; status = &objectCtx->status[0]; - for (i = 0; i < objectCtx->num; i++) - { - if (status->id < 0) - { - if (status->dmaRequest.vromAddr == 0) - { + for (i = 0; i < objectCtx->num; i++) { + if (status->id < 0) { + if (status->dmaRequest.vromAddr == 0) { osCreateMesgQueue(&status->loadQueue, &status->loadMsg, 1); objectFile = &gObjectTable[-status->id]; size = objectFile->vromEnd - objectFile->vromStart; - osSyncPrintf("OBJECT EXCHANGE BANK-%2d SIZE %8.3fK SEG=%08x\n", - i, (f64)(size / 1024.0f), status->segment); - DmaMgr_SendRequest2(&status->dmaRequest, status->segment, objectFile->vromStart, size, - 0, &status->loadQueue, NULL, "../z_scene.c", 266); - } - else if (!osRecvMesg(&status->loadQueue, NULL, OS_MESG_NOBLOCK)) - { + osSyncPrintf("OBJECT EXCHANGE BANK-%2d SIZE %8.3fK SEG=%08x\n", i, (f64)(size / 1024.0f), + status->segment); + DmaMgr_SendRequest2(&status->dmaRequest, status->segment, objectFile->vromStart, size, 0, + &status->loadQueue, NULL, "../z_scene.c", 266); + } else if (!osRecvMesg(&status->loadQueue, NULL, OS_MESG_NOBLOCK)) { status->id = -status->id; } } @@ -106,47 +104,43 @@ void Object_UpdateBank(ObjectContext* objectCtx) } } -s32 Object_GetIndex(ObjectContext* objectCtx, s16 objectId) -{ +s32 Object_GetIndex(ObjectContext* objectCtx, s16 objectId) { s32 i; - for (i = 0; i < objectCtx->num; i++) - { - if (ABS(objectCtx->status[i].id) == objectId) + for (i = 0; i < objectCtx->num; i++) { + if (ABS(objectCtx->status[i].id) == objectId) { return i; + } } return -1; } -s32 Object_IsLoaded(ObjectContext* objectCtx, s32 bankIndex) -{ - if (objectCtx->status[bankIndex].id > 0) +s32 Object_IsLoaded(ObjectContext* objectCtx, s32 bankIndex) { + if (objectCtx->status[bankIndex].id > 0) { return 1; - else + } else { return 0; + } } -void func_800981B8(ObjectContext* objectCtx) -{ +void func_800981B8(ObjectContext* objectCtx) { s32 i; s32 id; u32 size; - for (i = 0; i < objectCtx->num; i++) - { + for (i = 0; i < objectCtx->num; i++) { id = objectCtx->status[i].id; size = gObjectTable[id].vromEnd - gObjectTable[id].vromStart; - osSyncPrintf("OBJECT[%d] SIZE %fK SEG=%x\n", - objectCtx->status[i].id, (f64)(size / 1024.0f), objectCtx->status[i].segment); - osSyncPrintf("num=%d adrs=%x end=%x\n", - objectCtx->num, (s32)objectCtx->status[i].segment + size, objectCtx->spaceEnd); + osSyncPrintf("OBJECT[%d] SIZE %fK SEG=%x\n", objectCtx->status[i].id, (f64)(size / 1024.0f), + objectCtx->status[i].segment); + osSyncPrintf("num=%d adrs=%x end=%x\n", objectCtx->num, (s32)objectCtx->status[i].segment + size, + objectCtx->spaceEnd); DmaMgr_SendRequest1(objectCtx->status[i].segment, gObjectTable[id].vromStart, size, "../z_scene.c", 342); } } -void* func_800982FC(ObjectContext* objectCtx, s32 bankIndex, s16 objectId) -{ +void* func_800982FC(ObjectContext* objectCtx, s32 bankIndex, s16 objectId) { ObjectStatus* status = &objectCtx->status[bankIndex]; RomFile* objectFile = &gObjectTable[objectId]; u32 size; @@ -156,14 +150,15 @@ void* func_800982FC(ObjectContext* objectCtx, s32 bankIndex, s16 objectId) status->dmaRequest.vromAddr = 0; size = objectFile->vromEnd - objectFile->vromStart; - osSyncPrintf("OBJECT EXCHANGE NO=%2d BANK=%3d SIZE=%8.3fK\n", - bankIndex, objectId, (f64)(size / 1024.0f)); + osSyncPrintf("OBJECT EXCHANGE NO=%2d BANK=%3d SIZE=%8.3fK\n", bankIndex, objectId, (f64)(size / 1024.0f)); - if (1) // Necessary to match + if (1) { // Necessary to match nextPtr = (void*)ALIGN16((s32)status->segment + size); + } - if (nextPtr >= objectCtx->spaceEnd) + if (nextPtr >= objectCtx->spaceEnd) { __assert("nextptr < this->endSegment", "../z_scene.c", 381); + } // Translates to: "OBJECT EXCHANGE FREE SIZE=%08x" osSyncPrintf("オブジェクト入れ替え空きサイズ=%08x\n", (s32)objectCtx->spaceEnd - (s32)nextPtr); @@ -171,25 +166,21 @@ void* func_800982FC(ObjectContext* objectCtx, s32 bankIndex, s16 objectId) return nextPtr; } -s32 Scene_ExecuteCommands(GlobalContext* globalCtx, SceneCmd* sceneCmd) -{ +s32 Scene_ExecuteCommands(GlobalContext* globalCtx, SceneCmd* sceneCmd) { u32 cmdCode; - while (1) - { + while (1) { cmdCode = sceneCmd->base.code; - osSyncPrintf("*** Scene_Word = { code=%d, data1=%02x, data2=%04x } ***\n", - cmdCode, sceneCmd->base.data1, sceneCmd->base.data2); + osSyncPrintf("*** Scene_Word = { code=%d, data1=%02x, data2=%04x } ***\n", cmdCode, sceneCmd->base.data1, + sceneCmd->base.data2); - if (cmdCode == 0x14) + if (cmdCode == 0x14) { break; - - if (cmdCode <= 0x19) - { - gSceneCmdHandlers[cmdCode](globalCtx, sceneCmd); } - else - { + + if (cmdCode <= 0x19) { + gSceneCmdHandlers[cmdCode](globalCtx, sceneCmd); + } else { osSyncPrintf(VT_FGCOL(RED)); // Translates to: "code VARIABLE IS ABNORMAL" osSyncPrintf("code の値が異常です\n"); @@ -205,8 +196,7 @@ s32 Scene_ExecuteCommands(GlobalContext* globalCtx, SceneCmd* sceneCmd) // Scene Command 0x00: Link Spawn List #ifdef NON_MATCHING // regalloc differences -void func_80098508(GlobalContext* globalCtx, SceneCmd* cmd) -{ +void func_80098508(GlobalContext* globalCtx, SceneCmd* cmd) { ActorEntry* linkEntry = (ActorEntry*)SEGMENTED_TO_VIRTUAL(cmd->spawnList.segment) + globalCtx->setupEntranceList[globalCtx->curSpawn].spawn; s16 linkObjectId; @@ -227,21 +217,18 @@ void func_80098508(GlobalContext* globalCtx, SceneCmd* cmd); #endif // Scene Command 0x01: Actor List -void func_800985DC(GlobalContext* globalCtx, SceneCmd* cmd) -{ +void func_800985DC(GlobalContext* globalCtx, SceneCmd* cmd) { globalCtx->nbSetupActors = cmd->actorList.num; globalCtx->setupActorList = SEGMENTED_TO_VIRTUAL(cmd->actorList.segment); } // Scene Command 0x02: Cutscene Camera List -void func_80098630(GlobalContext* globalCtx, SceneCmd* cmd) -{ +void func_80098630(GlobalContext* globalCtx, SceneCmd* cmd) { globalCtx->unk_11DFC = SEGMENTED_TO_VIRTUAL(cmd->csCameraList.segment); } // Scene Command 0x03: Collision Header -void func_80098674(GlobalContext* globalCtx, SceneCmd* cmd) -{ +void func_80098674(GlobalContext* globalCtx, SceneCmd* cmd) { CollisionHeader* colHeader; colHeader = SEGMENTED_TO_VIRTUAL(cmd->colHeader.segment); @@ -256,34 +243,30 @@ void func_80098674(GlobalContext* globalCtx, SceneCmd* cmd) } // Scene Command 0x04: Room List -void func_800987A4(GlobalContext* globalCtx, SceneCmd* cmd) -{ +void func_800987A4(GlobalContext* globalCtx, SceneCmd* cmd) { globalCtx->nbRooms = cmd->roomList.num; globalCtx->roomList = SEGMENTED_TO_VIRTUAL(cmd->roomList.segment); } // Scene Command 0x06: Entrance List -void func_800987F8(GlobalContext* globalCtx, SceneCmd* cmd) -{ +void func_800987F8(GlobalContext* globalCtx, SceneCmd* cmd) { globalCtx->setupEntranceList = SEGMENTED_TO_VIRTUAL(cmd->entranceList.segment); } // Scene Command 0x07: Special Files -void func_8009883C(GlobalContext* globalCtx, SceneCmd* cmd) -{ - if (cmd->specialFiles.keepObjectId != 0) - { +void func_8009883C(GlobalContext* globalCtx, SceneCmd* cmd) { + if (cmd->specialFiles.keepObjectId != 0) { globalCtx->objectCtx.subKeepIndex = Object_Spawn(&globalCtx->objectCtx, cmd->specialFiles.keepObjectId); gSegments[5] = PHYSICAL_TO_VIRTUAL(globalCtx->objectCtx.status[globalCtx->objectCtx.subKeepIndex].segment); } - if (cmd->specialFiles.naviMsgNum != 0) - globalCtx->naviMsgSegment = func_800BFE5C(globalCtx, &sNaviMsgFiles[cmd->specialFiles.naviMsgNum - 1]); + if (cmd->specialFiles.cUpElfMsgNum != 0) { + globalCtx->cUpElfMsgs = func_800BFE5C(globalCtx, &sNaviMsgFiles[cmd->specialFiles.cUpElfMsgNum - 1]); + } } // Scene Command 0x08: Room Behavior -void func_80098904(GlobalContext* globalCtx, SceneCmd* cmd) -{ +void func_80098904(GlobalContext* globalCtx, SceneCmd* cmd) { globalCtx->roomCtx.curRoom.unk_03 = cmd->roomBehavior.gpFlag1; globalCtx->roomCtx.curRoom.unk_02 = cmd->roomBehavior.gpFlag2 & 0xFF; globalCtx->roomCtx.curRoom.showInvisActors = (cmd->roomBehavior.gpFlag2 >> 8) & 1; @@ -291,16 +274,14 @@ void func_80098904(GlobalContext* globalCtx, SceneCmd* cmd) } // Scene Command 0x0A: Mesh Header -void func_80098958(GlobalContext* globalCtx, SceneCmd* cmd) -{ +void func_80098958(GlobalContext* globalCtx, SceneCmd* cmd) { globalCtx->roomCtx.curRoom.mesh = SEGMENTED_TO_VIRTUAL(cmd->mesh.segment); } // Scene Command 0x0B: Object List #ifdef NON_MATCHING -// this function still needs some work -void func_8009899C(GlobalContext* globalCtx, SceneCmd* cmd) -{ +// this function still needs some work but it should be functionally equivalent +void func_8009899C(GlobalContext* globalCtx, SceneCmd* cmd) { s32 i, j, k; s16* objectEntry; ObjectStatus* status; @@ -313,21 +294,16 @@ void func_8009899C(GlobalContext* globalCtx, SceneCmd* cmd) k = 0; status = status2; i = globalCtx->objectCtx.unk_09; - while (i < globalCtx->objectCtx.num) - { - if (status->id != *objectEntry) - { + while (i < globalCtx->objectCtx.num) { + if (status->id != *objectEntry) { status3 = status2; - for (j = i; j < globalCtx->objectCtx.num; j++) - { + for (j = i; j < globalCtx->objectCtx.num; j++) { status3->id = 0; status3++; } globalCtx->objectCtx.num = i; func_80031A28(globalCtx, &globalCtx->actorCtx); - } - else - { + } else { i++; status++; k++; @@ -336,14 +312,15 @@ void func_8009899C(GlobalContext* globalCtx, SceneCmd* cmd) } } - if (cmd->objectList.num > OBJECT_EXCHANGE_BANK_MAX) + if (cmd->objectList.num > OBJECT_EXCHANGE_BANK_MAX) { __assert("scene_info->object_bank.num <= OBJECT_EXCHANGE_BANK_MAX", "../z_scene.c", 705); + } - while (k < cmd->objectList.num) - { + while (k < cmd->objectList.num) { nextPtr = func_800982FC(&globalCtx->objectCtx, i, *objectEntry); - if (i < OBJECT_EXCHANGE_BANK_MAX - 1) + if (i < OBJECT_EXCHANGE_BANK_MAX - 1) { globalCtx->objectCtx.status[i + 1].segment = nextPtr; + } k++; objectEntry++; status++; @@ -357,75 +334,69 @@ void func_8009899C(GlobalContext* globalCtx, SceneCmd* cmd); #endif // Scene Command 0x0C: Light List -void func_80098B74(GlobalContext* globalCtx, SceneCmd* cmd) -{ +void func_80098B74(GlobalContext* globalCtx, SceneCmd* cmd) { s32 i; LightInfo* lightInfo; lightInfo = SEGMENTED_TO_VIRTUAL(cmd->lightList.segment); - for (i = 0; i < cmd->lightList.num; i++) - { + for (i = 0; i < cmd->lightList.num; i++) { Lights_Insert(globalCtx, &globalCtx->lightCtx, lightInfo); lightInfo++; } } // Scene Command 0x0D: Path List -void func_80098C24(GlobalContext* globalCtx, SceneCmd* cmd) -{ +void func_80098C24(GlobalContext* globalCtx, SceneCmd* cmd) { globalCtx->setupPathList = SEGMENTED_TO_VIRTUAL(cmd->pathList.segment); } // Scene Command 0x0E: Transition Actor List -void func_80098C68(GlobalContext* globalCtx, SceneCmd* cmd) -{ +void func_80098C68(GlobalContext* globalCtx, SceneCmd* cmd) { globalCtx->nbTransitionActors = cmd->transiActorList.num; globalCtx->transitionActorList = SEGMENTED_TO_VIRTUAL(cmd->transiActorList.segment); } -void func_80098CBC(GlobalContext* globalCtx, u8* nbTransitionActors) -{ +void func_80098CBC(GlobalContext* globalCtx, u8* nbTransitionActors) { *nbTransitionActors = 0; } // Scene Command 0x0F: Light Setting List -void func_80098CC8(GlobalContext* globalCtx, SceneCmd* cmd) -{ +void func_80098CC8(GlobalContext* globalCtx, SceneCmd* cmd) { globalCtx->nbLightSettings = cmd->lightSettingList.num; globalCtx->lightSettingsList = SEGMENTED_TO_VIRTUAL(cmd->lightSettingList.segment); } // Scene Command 0x11: Skybox Settings -void func_80098D1C(GlobalContext* globalCtx, SceneCmd* cmd) -{ +void func_80098D1C(GlobalContext* globalCtx, SceneCmd* cmd) { globalCtx->skyboxId = cmd->skyboxSettings.skyboxId; globalCtx->gloomySky = globalCtx->unk_10A3C = cmd->skyboxSettings.unk_05; globalCtx->unk_10A42 = cmd->skyboxSettings.unk_06; } // Scene Command 0x12: Skybox Disables -void func_80098D5C(GlobalContext* globalCtx, SceneCmd* cmd) -{ +void func_80098D5C(GlobalContext* globalCtx, SceneCmd* cmd) { globalCtx->skyDisabled = cmd->skyboxDisables.unk_04; globalCtx->sunMoonDisabled = cmd->skyboxDisables.unk_05; } // Scene Command 0x10: Time Settings -void func_80098D80(GlobalContext* globalCtx, SceneCmd* cmd) -{ +void func_80098D80(GlobalContext* globalCtx, SceneCmd* cmd) { u32 dayTime; - if ((cmd->timeSettings.hour != 0xFF) && (cmd->timeSettings.min != 0xFF)) + if ((cmd->timeSettings.hour != 0xFF) && (cmd->timeSettings.min != 0xFF)) { gSaveContext.environment_time = gSaveContext.day_time = ((cmd->timeSettings.hour + (cmd->timeSettings.min / 60.0f)) * 60.0f) / 0.021972656f; + } - if (cmd->timeSettings.unk_06 != 0xFF) + if (cmd->timeSettings.unk_06 != 0xFF) { globalCtx->unk_10A26 = cmd->timeSettings.unk_06; - else + } else { globalCtx->unk_10A26 = 0; + } - if (gSaveContext.unk_1422 == 0) + if (gSaveContext.unk_1422 == 0) { D_8011FB40 = globalCtx->unk_10A26; + } dayTime = gSaveContext.day_time; globalCtx->unk_10A28 = -(Math_Sins(dayTime - 0x8000) * 120.0f) * 25.0f; @@ -435,23 +406,22 @@ void func_80098D80(GlobalContext* globalCtx, SceneCmd* cmd) globalCtx->unk_10A30 = (Math_Coss(dayTime - 0x8000) * 20.0f) * 25.0f; if (((globalCtx->unk_10A26 == 0) && (gSaveContext.cutscene_index < 0xFFF0)) || - (gSaveContext.entrance_index == 0x0604)) - { + (gSaveContext.entrance_index == 0x0604)) { gSaveContext.environment_time = gSaveContext.day_time; - if ((gSaveContext.environment_time >= 0x2AAC) && (gSaveContext.environment_time < 0x4555)) + if ((gSaveContext.environment_time >= 0x2AAC) && (gSaveContext.environment_time < 0x4555)) { gSaveContext.environment_time = 0x3556; - else if ((gSaveContext.environment_time >= 0x4555) && (gSaveContext.environment_time < 0x5556)) + } else if ((gSaveContext.environment_time >= 0x4555) && (gSaveContext.environment_time < 0x5556)) { gSaveContext.environment_time = 0x5556; - else if ((gSaveContext.environment_time >= 0xAAAB) && (gSaveContext.environment_time < 0xB556)) + } else if ((gSaveContext.environment_time >= 0xAAAB) && (gSaveContext.environment_time < 0xB556)) { gSaveContext.environment_time = 0xB556; - else if ((gSaveContext.environment_time >= 0xC001) && (gSaveContext.environment_time < 0xCAAC)) + } else if ((gSaveContext.environment_time >= 0xC001) && (gSaveContext.environment_time < 0xCAAC)) { gSaveContext.environment_time = 0xCAAC; + } } } // Scene Command 0x05: Wind Settings -void func_80099090(GlobalContext* globalCtx, SceneCmd* cmd) -{ +void func_80099090(GlobalContext* globalCtx, SceneCmd* cmd) { s8 temp1 = cmd->windSettings.unk_04; s8 temp2 = cmd->windSettings.unk_05; s8 temp3 = cmd->windSettings.unk_06; @@ -463,38 +433,33 @@ void func_80099090(GlobalContext* globalCtx, SceneCmd* cmd) } // Scene Command 0x13: Exit List -void func_800990F0(GlobalContext* globalCtx, SceneCmd* cmd) -{ +void func_800990F0(GlobalContext* globalCtx, SceneCmd* cmd) { globalCtx->setupExitList = SEGMENTED_TO_VIRTUAL(cmd->exitList.segment); } // Scene Command 0x09: Undefined -void func_80099134(GlobalContext* globalCtx, SceneCmd* cmd) -{ - +void func_80099134(GlobalContext* globalCtx, SceneCmd* cmd) { } // Scene Command 0x15: Sound Settings -void func_80099140(GlobalContext* globalCtx, SceneCmd* cmd) -{ +void func_80099140(GlobalContext* globalCtx, SceneCmd* cmd) { globalCtx->soundCtx.musicSeq = cmd->soundSettings.musicSeq; globalCtx->soundCtx.nighttimeSFX = cmd->soundSettings.nighttimeSFX; - if (gSaveContext.seq_index == 0xFF) + if (gSaveContext.seq_index == 0xFF) { Audio_SetBGM(cmd->soundSettings.bgmId | 0xF0000000); + } } // Scene Command 0x16: Echo Setting -void func_8009918C(GlobalContext* globalCtx, SceneCmd* cmd) -{ +void func_8009918C(GlobalContext* globalCtx, SceneCmd* cmd) { globalCtx->roomCtx.curRoom.echo = cmd->echoSettings.echo; } // Scene Command 0x18: Alternate Headers #ifdef NON_MATCHING // minor ordering and regalloc differences -void func_800991A0(GlobalContext* globalCtx, SceneCmd* cmd) -{ +void func_800991A0(GlobalContext* globalCtx, SceneCmd* cmd) { SceneCmd** altHeaders; SceneCmd* altHeader; @@ -502,31 +467,25 @@ void func_800991A0(GlobalContext* globalCtx, SceneCmd* cmd) osSyncPrintf("\n[ZU]sceneset time =[%X]", gSaveContext.cutscene_index); osSyncPrintf("\n[ZU]sceneset counter=[%X]", gSaveContext.scene_setup_index); - if (gSaveContext.scene_setup_index != 0) - { + if (gSaveContext.scene_setup_index != 0) { altHeaders = SEGMENTED_TO_VIRTUAL(cmd->altHeaders.segment); altHeader = altHeaders[gSaveContext.scene_setup_index - 1]; - if (altHeader != NULL) - { + if (altHeader != NULL) { Scene_ExecuteCommands(globalCtx, SEGMENTED_TO_VIRTUAL(altHeader)); (cmd + 1)->base.code = 0x14; - } - else - { + } else { // Translates to: "COUGHH! THERE IS NO SPECIFIED DATAAAAA!" osSyncPrintf("\nげぼはっ！ 指定されたデータがないでええっす！"); - if (gSaveContext.scene_setup_index == 3) - { + if (gSaveContext.scene_setup_index == 3) { altHeaders = SEGMENTED_TO_VIRTUAL(cmd->altHeaders.segment); altHeader = altHeaders[gSaveContext.scene_setup_index - 2]; // Translates to: "USING ADULT DAY DATA THERE!" osSyncPrintf("\nそこで、大人の昼データを使用するでええっす！！"); - if (altHeader != NULL) - { + if (altHeader != NULL) { Scene_ExecuteCommands(globalCtx, SEGMENTED_TO_VIRTUAL(altHeader)); (cmd + 1)->base.code = 0x14; } @@ -540,73 +499,47 @@ void func_800991A0(GlobalContext* globalCtx, SceneCmd* cmd); #endif // Scene Command 0x17: Cutscene Data -void func_8009934C(GlobalContext* globalCtx, SceneCmd* cmd) -{ +void func_8009934C(GlobalContext* globalCtx, SceneCmd* cmd) { osSyncPrintf("\ngame_play->demo_play.data=[%x]", globalCtx->csCtx.segment); globalCtx->csCtx.segment = SEGMENTED_TO_VIRTUAL(cmd->cutsceneData.segment); } // Scene Command 0x19: Misc. Settings (Camera & World Map Area) -void func_800993C0(GlobalContext* globalCtx, SceneCmd* cmd) -{ +void func_800993C0(GlobalContext* globalCtx, SceneCmd* cmd) { YREG(15) = cmd->miscSettings.cameraMovement; gSaveContext.world_map_area = cmd->miscSettings.area; - if ((globalCtx->sceneNum == SCENE_SHOP1) || (globalCtx->sceneNum == SCENE_SYATEKIJYOU)) - { - if (LINK_AGE_IN_YEARS == YEARS_ADULT) - { + if ((globalCtx->sceneNum == SCENE_SHOP1) || (globalCtx->sceneNum == SCENE_SYATEKIJYOU)) { + if (LINK_AGE_IN_YEARS == YEARS_ADULT) { gSaveContext.world_map_area = 1; } } if (((globalCtx->sceneNum >= SCENE_SPOT00) && (globalCtx->sceneNum <= SCENE_GANON_TOU)) || - ((globalCtx->sceneNum >= SCENE_ENTRA) && (globalCtx->sceneNum <= SCENE_SHRINE_R))) - { - if (gSaveContext.cutscene_index < 0xFFF0) - { + ((globalCtx->sceneNum >= SCENE_ENTRA) && (globalCtx->sceneNum <= SCENE_SHRINE_R))) { + if (gSaveContext.cutscene_index < 0xFFF0) { gSaveContext.world_map_area_data |= gBitFlags[gSaveContext.world_map_area]; - osSyncPrintf("０００ ａｒｅａ＿ａｒｒｉｖａｌ＝%x (%d)\n", gSaveContext.world_map_area_data, gSaveContext.world_map_area); + osSyncPrintf("０００ ａｒｅａ＿ａｒｒｉｖａｌ＝%x (%d)\n", gSaveContext.world_map_area_data, + gSaveContext.world_map_area); } } } -void (*gSceneCmdHandlers[])(GlobalContext*, SceneCmd*) = -{ - func_80098508, - func_800985DC, - func_80098630, - func_80098674, - func_800987A4, - func_80099090, - func_800987F8, - func_8009883C, - func_80098904, - func_80099134, - func_80098958, - func_8009899C, - func_80098B74, - func_80098C24, - func_80098C68, - func_80098CC8, - func_80098D80, - func_80098D1C, - func_80098D5C, - func_800990F0, - NULL, - func_80099140, - func_8009918C, - func_8009934C, - func_800991A0, - func_800993C0, +void (*gSceneCmdHandlers[])(GlobalContext*, SceneCmd*) = { + func_80098508, func_800985DC, func_80098630, func_80098674, func_800987A4, func_80099090, func_800987F8, + func_8009883C, func_80098904, func_80099134, func_80098958, func_8009899C, func_80098B74, func_80098C24, + func_80098C68, func_80098CC8, func_80098D80, func_80098D1C, func_80098D5C, func_800990F0, NULL, + func_80099140, func_8009918C, func_8009934C, func_800991A0, func_800993C0, }; -#define ROM_FILE(name) { (u32)_##name##SegmentRomStart, (u32)_##name##SegmentRomEnd } -#define ROM_FILE_EMPTY(name) { (u32)_##name##SegmentRomStart, (u32)_##name##SegmentRomStart } -#define ROM_FILE_UNSET { 0 } +#define ROM_FILE(name) \ + { (u32) _##name##SegmentRomStart, (u32)_##name##SegmentRomEnd } +#define ROM_FILE_EMPTY(name) \ + { (u32) _##name##SegmentRomStart, (u32)_##name##SegmentRomStart } +#define ROM_FILE_UNSET \ + { 0 } -RomFile sNaviMsgFiles[] = -{ +RomFile sNaviMsgFiles[] = { ROM_FILE(elf_message_field), ROM_FILE(elf_message_ydan), ROM_FILE_UNSET, @@ -616,8 +549,7 @@ s16 gLinkObjectIds[] = { OBJECT_LINK_BOY, OBJECT_LINK_CHILD }; u32 gObjectTableSize = 402; -RomFile gObjectTable[] = -{ +RomFile gObjectTable[] = { ROM_FILE_UNSET, ROM_FILE(gameplay_keep), ROM_FILE(gameplay_field_keep), diff --git a/src/code/z_scene_table.c b/src/code/z_scene_table.c index 54d69eb8c5..f4893ac56f 100644 --- a/src/code/z_scene_table.c +++ b/src/code/z_scene_table.c @@ -1,1582 +1,538 @@ #include #include -EntranceInfo gEntranceTable[] = -{ - { 0x00, 0x00, 0, 1, 0x02, 0x02 }, - { 0x00, 0x00, 0, 1, 0x02, 0x02 }, - { 0x00, 0x00, 0, 1, 0x02, 0x02 }, - { 0x00, 0x00, 0, 1, 0x02, 0x02 }, - { 0x01, 0x00, 0, 1, 0x02, 0x02 }, - { 0x01, 0x00, 0, 1, 0x02, 0x02 }, - { 0x01, 0x00, 0, 1, 0x02, 0x02 }, - { 0x01, 0x00, 0, 1, 0x02, 0x02 }, - { 0x0B, 0x00, 0, 1, 0x02, 0x02 }, - { 0x0B, 0x00, 0, 1, 0x02, 0x02 }, - { 0x0B, 0x00, 0, 1, 0x02, 0x02 }, - { 0x0B, 0x00, 0, 1, 0x02, 0x02 }, - { 0x14, 0x00, 1, 1, 0x02, 0x02 }, - { 0x14, 0x00, 1, 1, 0x02, 0x02 }, - { 0x14, 0x00, 1, 1, 0x02, 0x02 }, - { 0x14, 0x00, 1, 1, 0x02, 0x02 }, - { 0x05, 0x00, 0, 1, 0x02, 0x02 }, - { 0x05, 0x00, 0, 1, 0x02, 0x02 }, - { 0x05, 0x00, 0, 1, 0x02, 0x02 }, - { 0x05, 0x00, 0, 1, 0x02, 0x02 }, - { 0x6E, 0x00, 0, 1, 0x02, 0x02 }, - { 0x6E, 0x00, 0, 1, 0x02, 0x02 }, - { 0x6E, 0x00, 0, 1, 0x02, 0x02 }, - { 0x6E, 0x00, 0, 1, 0x02, 0x02 }, - { 0x6C, 0x00, 0, 1, 0x02, 0x02 }, - { 0x6C, 0x00, 0, 1, 0x02, 0x02 }, - { 0x6C, 0x00, 0, 1, 0x02, 0x02 }, - { 0x6C, 0x00, 0, 1, 0x02, 0x02 }, - { 0x68, 0x00, 0, 1, 0x02, 0x02 }, - { 0x68, 0x00, 0, 1, 0x02, 0x02 }, - { 0x68, 0x00, 0, 1, 0x02, 0x02 }, - { 0x68, 0x00, 0, 1, 0x02, 0x02 }, - { 0x69, 0x00, 0, 1, 0x02, 0x02 }, - { 0x69, 0x00, 0, 1, 0x02, 0x02 }, - { 0x69, 0x00, 0, 1, 0x02, 0x02 }, - { 0x69, 0x00, 0, 1, 0x02, 0x02 }, - { 0x6D, 0x00, 0, 1, 0x02, 0x02 }, - { 0x6D, 0x00, 0, 1, 0x02, 0x02 }, - { 0x6D, 0x00, 0, 1, 0x02, 0x02 }, - { 0x6D, 0x00, 0, 1, 0x02, 0x02 }, - { 0x02, 0x00, 0, 1, 0x02, 0x02 }, - { 0x02, 0x00, 0, 1, 0x02, 0x02 }, - { 0x02, 0x00, 0, 1, 0x02, 0x02 }, - { 0x02, 0x00, 0, 1, 0x02, 0x02 }, - { 0x02, 0x00, 0, 1, 0x02, 0x02 }, - { 0x41, 0x00, 0, 1, 0x02, 0x26 }, - { 0x41, 0x00, 0, 1, 0x02, 0x26 }, - { 0x41, 0x00, 0, 1, 0x02, 0x26 }, - { 0x41, 0x00, 0, 1, 0x02, 0x26 }, - { 0x41, 0x00, 0, 1, 0x02, 0x02 }, - { 0x41, 0x00, 0, 1, 0x02, 0x02 }, - { 0x1B, 0x00, 1, 1, 0x03, 0x03 }, - { 0x1C, 0x00, 1, 1, 0x02, 0x02 }, - { 0x1D, 0x00, 1, 1, 0x03, 0x03 }, - { 0x1D, 0x00, 1, 1, 0x02, 0x02 }, - { 0x07, 0x00, 0, 1, 0x02, 0x02 }, - { 0x07, 0x00, 0, 1, 0x02, 0x02 }, - { 0x07, 0x00, 0, 1, 0x02, 0x02 }, - { 0x07, 0x00, 0, 1, 0x02, 0x02 }, - { 0x42, 0x00, 0, 1, 0x04, 0x20 }, - { 0x42, 0x00, 0, 1, 0x04, 0x20 }, - { 0x42, 0x00, 0, 1, 0x04, 0x20 }, - { 0x42, 0x00, 0, 1, 0x04, 0x20 }, - { 0x3E, 0x00, 0, 1, 0x02, 0x02 }, - { 0x3E, 0x00, 0, 1, 0x02, 0x02 }, - { 0x3E, 0x00, 0, 1, 0x02, 0x02 }, - { 0x3E, 0x00, 0, 1, 0x02, 0x02 }, - { 0x38, 0x00, 0, 1, 0x04, 0x20 }, - { 0x38, 0x00, 0, 1, 0x04, 0x20 }, - { 0x38, 0x00, 0, 1, 0x04, 0x20 }, - { 0x38, 0x00, 0, 1, 0x04, 0x20 }, - { 0x6A, 0x00, 0, 1, 0x02, 0x02 }, - { 0x6A, 0x00, 0, 1, 0x02, 0x02 }, - { 0x6A, 0x00, 0, 1, 0x02, 0x02 }, - { 0x6A, 0x00, 0, 1, 0x02, 0x02 }, - { 0x40, 0x00, 0, 1, 0x02, 0x26 }, - { 0x40, 0x00, 0, 1, 0x02, 0x26 }, - { 0x40, 0x00, 0, 1, 0x02, 0x26 }, - { 0x40, 0x00, 0, 1, 0x02, 0x26 }, - { 0x4C, 0x00, 0, 1, 0x04, 0x20 }, - { 0x4C, 0x00, 0, 1, 0x04, 0x20 }, - { 0x4C, 0x00, 0, 1, 0x04, 0x20 }, - { 0x4C, 0x00, 0, 1, 0x04, 0x20 }, - { 0x43, 0x00, 0, 1, 0x02, 0x02 }, - { 0x43, 0x00, 0, 1, 0x02, 0x02 }, - { 0x43, 0x00, 0, 1, 0x02, 0x02 }, - { 0x43, 0x00, 0, 1, 0x02, 0x02 }, - { 0x43, 0x00, 0, 1, 0x02, 0x02 }, - { 0x43, 0x00, 0, 1, 0x02, 0x02 }, - { 0x43, 0x00, 0, 1, 0x02, 0x02 }, - { 0x43, 0x00, 0, 1, 0x02, 0x02 }, - { 0x43, 0x00, 0, 1, 0x02, 0x02 }, - { 0x43, 0x00, 0, 1, 0x02, 0x02 }, - { 0x43, 0x00, 0, 1, 0x02, 0x02 }, - { 0x43, 0x00, 0, 1, 0x0B, 0x0B }, - { 0x43, 0x00, 0, 1, 0x02, 0x02 }, - { 0x43, 0x00, 0, 1, 0x02, 0x02 }, - { 0x43, 0x00, 0, 1, 0x02, 0x02 }, - { 0x43, 0x00, 0, 1, 0x02, 0x02 }, - { 0x10, 0x00, 0, 1, 0x04, 0x20 }, - { 0x10, 0x00, 0, 1, 0x04, 0x20 }, - { 0x10, 0x00, 0, 1, 0x04, 0x20 }, - { 0x10, 0x00, 0, 1, 0x04, 0x20 }, - { 0x1E, 0x03, 1, 1, 0x03, 0x03 }, - { 0x1F, 0x03, 1, 1, 0x02, 0x02 }, - { 0x1E, 0x03, 1, 1, 0x02, 0x02 }, - { 0x1F, 0x03, 1, 1, 0x02, 0x02 }, - { 0x44, 0x00, 0, 1, 0x07, 0x07 }, - { 0x44, 0x00, 0, 1, 0x07, 0x07 }, - { 0x44, 0x00, 0, 1, 0x07, 0x07 }, - { 0x44, 0x00, 0, 1, 0x07, 0x07 }, - { 0x44, 0x00, 0, 1, 0x0D, 0x02 }, - { 0x44, 0x00, 0, 1, 0x0D, 0x02 }, - { 0x44, 0x00, 0, 1, 0x03, 0x03 }, - { 0x4E, 0x00, 0, 1, 0x04, 0x20 }, - { 0x4E, 0x00, 0, 1, 0x04, 0x20 }, - { 0x4E, 0x00, 0, 1, 0x04, 0x20 }, - { 0x4E, 0x00, 0, 1, 0x04, 0x20 }, - { 0x6B, 0x00, 0, 1, 0x22, 0x22 }, - { 0x6B, 0x00, 0, 1, 0x22, 0x22 }, - { 0x6B, 0x00, 0, 1, 0x22, 0x22 }, - { 0x6B, 0x00, 0, 1, 0x22, 0x22 }, - { 0x45, 0x00, 0, 1, 0x22, 0x04 }, - { 0x46, 0x00, 0, 1, 0x22, 0x04 }, - { 0x45, 0x00, 0, 1, 0x22, 0x04 }, - { 0x46, 0x00, 0, 1, 0x22, 0x04 }, - { 0x4D, 0x00, 0, 1, 0x02, 0x02 }, - { 0x4D, 0x00, 0, 1, 0x02, 0x02 }, - { 0x4D, 0x00, 0, 1, 0x02, 0x02 }, - { 0x4D, 0x00, 0, 1, 0x02, 0x02 }, - { 0x06, 0x00, 0, 1, 0x02, 0x02 }, - { 0x06, 0x00, 0, 1, 0x02, 0x02 }, - { 0x06, 0x00, 0, 1, 0x02, 0x02 }, - { 0x06, 0x00, 0, 1, 0x02, 0x02 }, - { 0x06, 0x00, 0, 1, 0x02, 0x02 }, - { 0x06, 0x00, 0, 1, 0x02, 0x02 }, - { 0x09, 0x00, 0, 1, 0x02, 0x02 }, - { 0x09, 0x00, 0, 1, 0x02, 0x02 }, - { 0x09, 0x00, 0, 1, 0x02, 0x02 }, - { 0x09, 0x00, 0, 1, 0x02, 0x02 }, - { 0x09, 0x00, 0, 1, 0x02, 0x02 }, - { 0x17, 0x00, 1, 1, 0x02, 0x02 }, - { 0x17, 0x00, 1, 1, 0x02, 0x02 }, - { 0x17, 0x00, 1, 1, 0x02, 0x02 }, - { 0x17, 0x00, 1, 1, 0x02, 0x02 }, - { 0x17, 0x00, 0, 1, 0x02, 0x02 }, - { 0x17, 0x00, 0, 1, 0x02, 0x02 }, - { 0x17, 0x00, 0, 1, 0x02, 0x02 }, - { 0x65, 0x00, 0, 1, 0x02, 0x02 }, - { 0x65, 0x00, 0, 1, 0x02, 0x02 }, - { 0x65, 0x00, 0, 1, 0x02, 0x02 }, - { 0x65, 0x00, 0, 1, 0x02, 0x02 }, - { 0x08, 0x00, 0, 1, 0x04, 0x04 }, - { 0x08, 0x00, 0, 1, 0x04, 0x04 }, - { 0x08, 0x00, 0, 1, 0x04, 0x04 }, - { 0x08, 0x00, 0, 1, 0x04, 0x04 }, - { 0x27, 0x00, 0, 1, 0x04, 0x04 }, - { 0x27, 0x00, 0, 1, 0x04, 0x04 }, - { 0x27, 0x00, 0, 1, 0x04, 0x04 }, - { 0x27, 0x00, 0, 1, 0x04, 0x04 }, - { 0x47, 0x00, 0, 1, 0x03, 0x03 }, - { 0x47, 0x00, 0, 1, 0x03, 0x03 }, - { 0x47, 0x00, 0, 1, 0x03, 0x03 }, - { 0x47, 0x00, 0, 1, 0x03, 0x03 }, - { 0x47, 0x00, 0, 1, 0x0A, 0x0A }, - { 0x47, 0x00, 0, 1, 0x02, 0x0A }, - { 0x47, 0x00, 1, 1, 0x0A, 0x0A }, - { 0x47, 0x00, 0, 1, 0x0B, 0x0B }, - { 0x47, 0x00, 0, 1, 0x03, 0x03 }, - { 0x47, 0x00, 0, 1, 0x02, 0x02 }, - { 0x47, 0x00, 0, 1, 0x02, 0x02 }, - { 0x47, 0x00, 0, 1, 0x03, 0x03 }, - { 0x47, 0x00, 0, 1, 0x03, 0x03 }, - { 0x1E, 0x00, 1, 1, 0x03, 0x03 }, - { 0x1F, 0x00, 1, 1, 0x02, 0x02 }, - { 0x1E, 0x00, 1, 1, 0x02, 0x02 }, - { 0x1F, 0x00, 1, 1, 0x02, 0x02 }, - { 0x20, 0x00, 1, 1, 0x03, 0x03 }, - { 0x21, 0x00, 1, 1, 0x02, 0x02 }, - { 0x22, 0x00, 1, 1, 0x02, 0x02 }, - { 0x22, 0x00, 1, 1, 0x02, 0x02 }, - { 0x20, 0x00, 0, 1, 0x08, 0x08 }, - { 0x67, 0x00, 0, 1, 0x02, 0x02 }, - { 0x2C, 0x00, 0, 1, 0x04, 0x20 }, - { 0x2C, 0x00, 0, 1, 0x04, 0x20 }, - { 0x2C, 0x00, 0, 1, 0x04, 0x20 }, - { 0x2C, 0x00, 0, 1, 0x04, 0x20 }, - { 0x34, 0x00, 0, 1, 0x04, 0x04 }, - { 0x34, 0x00, 0, 1, 0x04, 0x04 }, - { 0x34, 0x00, 0, 1, 0x04, 0x04 }, - { 0x34, 0x00, 0, 1, 0x04, 0x04 }, - { 0x34, 0x00, 0, 1, 0x04, 0x02 }, - { 0x34, 0x00, 0, 1, 0x10, 0x10 }, - { 0x2D, 0x00, 0, 1, 0x04, 0x04 }, - { 0x2D, 0x00, 0, 1, 0x04, 0x04 }, - { 0x2D, 0x00, 0, 1, 0x04, 0x04 }, - { 0x2D, 0x00, 0, 1, 0x04, 0x04 }, - { 0x01, 0x01, 1, 0, 0x02, 0x02 }, - { 0x01, 0x01, 1, 0, 0x02, 0x02 }, - { 0x01, 0x01, 1, 0, 0x02, 0x02 }, - { 0x01, 0x01, 1, 0, 0x02, 0x02 }, - { 0x26, 0x00, 0, 1, 0x04, 0x04 }, - { 0x26, 0x00, 0, 1, 0x04, 0x04 }, - { 0x26, 0x00, 0, 1, 0x04, 0x04 }, - { 0x26, 0x00, 0, 1, 0x04, 0x04 }, - { 0x51, 0x00, 0, 1, 0x03, 0x03 }, - { 0x51, 0x00, 0, 1, 0x02, 0x02 }, - { 0x51, 0x00, 0, 1, 0x03, 0x03 }, - { 0x51, 0x00, 0, 1, 0x02, 0x02 }, - { 0x51, 0x00, 0, 1, 0x04, 0x02 }, - { 0x51, 0x00, 0, 1, 0x21, 0x21 }, - { 0x51, 0x00, 0, 1, 0x21, 0x21 }, - { 0x51, 0x00, 0, 1, 0x23, 0x23 }, - { 0x51, 0x00, 0, 1, 0x03, 0x03 }, - { 0x51, 0x00, 1, 1, 0x02, 0x02 }, - { 0x51, 0x00, 0, 1, 0x23, 0x23 }, - { 0x51, 0x00, 0, 1, 0x03, 0x03 }, - { 0x51, 0x00, 0, 1, 0x29, 0x29 }, - { 0x51, 0x00, 1, 1, 0x03, 0x03 }, - { 0x52, 0x00, 0, 1, 0x03, 0x03 }, - { 0x52, 0x00, 0, 1, 0x02, 0x02 }, - { 0x52, 0x00, 0, 1, 0x03, 0x03 }, - { 0x52, 0x00, 0, 1, 0x02, 0x02 }, - { 0x52, 0x00, 0, 1, 0x26, 0x26 }, - { 0x52, 0x00, 0, 1, 0x21, 0x21 }, - { 0x52, 0x00, 1, 1, 0x21, 0x21 }, - { 0x52, 0x00, 0, 1, 0x21, 0x21 }, - { 0x52, 0x00, 1, 1, 0x02, 0x02 }, - { 0x53, 0x00, 0, 1, 0x03, 0x03 }, - { 0x53, 0x00, 0, 1, 0x02, 0x02 }, - { 0x53, 0x00, 0, 1, 0x03, 0x03 }, - { 0x53, 0x00, 0, 1, 0x02, 0x02 }, - { 0x53, 0x00, 0, 1, 0x04, 0x02 }, - { 0x53, 0x00, 1, 1, 0x02, 0x02 }, - { 0x54, 0x00, 1, 1, 0x03, 0x03 }, - { 0x54, 0x00, 1, 1, 0x02, 0x02 }, - { 0x54, 0x00, 1, 1, 0x03, 0x03 }, - { 0x54, 0x00, 1, 1, 0x02, 0x02 }, - { 0x55, 0x00, 0, 1, 0x03, 0x03 }, - { 0x55, 0x00, 0, 1, 0x02, 0x02 }, - { 0x55, 0x00, 0, 1, 0x03, 0x03 }, - { 0x55, 0x00, 0, 1, 0x02, 0x02 }, - { 0x55, 0x00, 1, 1, 0x0A, 0x0A }, - { 0x55, 0x00, 0, 1, 0x0A, 0x0A }, - { 0x55, 0x00, 1, 1, 0x0A, 0x0A }, - { 0x55, 0x00, 0, 1, 0x0D, 0x0A }, - { 0x55, 0x00, 0, 1, 0x0A, 0x0A }, - { 0x55, 0x00, 0, 1, 0x0A, 0x0A }, - { 0x55, 0x00, 1, 1, 0x02, 0x02 }, - { 0x55, 0x00, 1, 1, 0x02, 0x02 }, - { 0x55, 0x00, 1, 1, 0x02, 0x02 }, - { 0x55, 0x00, 1, 1, 0x02, 0x02 }, - { 0x56, 0x00, 1, 1, 0x02, 0x02 }, - { 0x56, 0x00, 1, 1, 0x02, 0x02 }, - { 0x56, 0x00, 1, 1, 0x02, 0x02 }, - { 0x56, 0x00, 1, 1, 0x02, 0x02 }, - { 0x56, 0x00, 0, 1, 0x03, 0x03 }, - { 0x56, 0x00, 0, 1, 0x00, 0x00 }, - { 0x57, 0x00, 1, 1, 0x03, 0x03 }, - { 0x57, 0x00, 1, 1, 0x02, 0x02 }, - { 0x57, 0x00, 1, 1, 0x03, 0x03 }, - { 0x57, 0x00, 1, 1, 0x02, 0x02 }, - { 0x57, 0x00, 0, 1, 0x03, 0x03 }, - { 0x57, 0x00, 1, 1, 0x02, 0x02 }, - { 0x58, 0x00, 0, 1, 0x02, 0x02 }, - { 0x58, 0x00, 0, 1, 0x02, 0x02 }, - { 0x58, 0x00, 0, 1, 0x02, 0x02 }, - { 0x58, 0x00, 0, 1, 0x02, 0x02 }, - { 0x58, 0x00, 1, 1, 0x02, 0x02 }, - { 0x58, 0x00, 1, 1, 0x02, 0x02 }, - { 0x59, 0x00, 0, 1, 0x03, 0x03 }, - { 0x59, 0x00, 0, 1, 0x02, 0x02 }, - { 0x59, 0x00, 0, 1, 0x03, 0x03 }, - { 0x59, 0x00, 0, 1, 0x02, 0x02 }, - { 0x59, 0x00, 0, 1, 0x0D, 0x00 }, - { 0x59, 0x00, 0, 1, 0x02, 0x02 }, - { 0x59, 0x00, 1, 1, 0x02, 0x02 }, - { 0x59, 0x00, 0, 1, 0x02, 0x02 }, - { 0x59, 0x00, 1, 1, 0x02, 0x02 }, - { 0x5A, 0x00, 0, 1, 0x03, 0x03 }, - { 0x5A, 0x00, 0, 1, 0x02, 0x02 }, - { 0x5A, 0x00, 0, 1, 0x03, 0x03 }, - { 0x5A, 0x00, 0, 1, 0x02, 0x02 }, - { 0x5A, 0x00, 1, 1, 0x0C, 0x0A }, - { 0x5A, 0x00, 1, 1, 0x0A, 0x0A }, - { 0x5A, 0x00, 1, 1, 0x02, 0x02 }, - { 0x5B, 0x00, 0, 1, 0x02, 0x02 }, - { 0x5B, 0x00, 0, 1, 0x02, 0x02 }, - { 0x5B, 0x00, 0, 1, 0x02, 0x02 }, - { 0x5B, 0x00, 0, 1, 0x02, 0x02 }, - { 0x5B, 0x00, 0, 1, 0x02, 0x02 }, - { 0x5C, 0x00, 1, 1, 0x0F, 0x0F }, - { 0x5C, 0x00, 1, 1, 0x0F, 0x0F }, - { 0x5C, 0x00, 1, 1, 0x0F, 0x0F }, - { 0x5C, 0x00, 1, 1, 0x0F, 0x0F }, - { 0x5C, 0x00, 1, 1, 0x02, 0x02 }, - { 0x5C, 0x00, 1, 1, 0x0F, 0x0F }, - { 0x5D, 0x00, 1, 1, 0x03, 0x03 }, - { 0x5D, 0x00, 1, 1, 0x02, 0x02 }, - { 0x5D, 0x00, 1, 1, 0x03, 0x03 }, - { 0x5D, 0x00, 1, 1, 0x02, 0x02 }, - { 0x5D, 0x00, 1, 1, 0x21, 0x21 }, - { 0x5D, 0x00, 1, 1, 0x02, 0x02 }, - { 0x5D, 0x00, 1, 1, 0x02, 0x02 }, - { 0x5E, 0x00, 1, 1, 0x0E, 0x0E }, - { 0x5E, 0x00, 1, 1, 0x0E, 0x0E }, - { 0x5E, 0x00, 1, 1, 0x0E, 0x0E }, - { 0x5E, 0x00, 1, 1, 0x0E, 0x0E }, - { 0x0E, 0x01, 1, 1, 0x02, 0x02 }, - { 0x0E, 0x01, 1, 1, 0x02, 0x02 }, - { 0x0E, 0x01, 1, 1, 0x02, 0x02 }, - { 0x0E, 0x01, 1, 1, 0x02, 0x02 }, - { 0x5F, 0x00, 0, 1, 0x03, 0x03 }, - { 0x5F, 0x00, 0, 1, 0x02, 0x02 }, - { 0x64, 0x00, 0, 1, 0x02, 0x02 }, - { 0x64, 0x00, 0, 1, 0x02, 0x02 }, - { 0x64, 0x00, 0, 1, 0x04, 0x02 }, - { 0x60, 0x00, 0, 1, 0x03, 0x03 }, - { 0x60, 0x00, 0, 1, 0x02, 0x02 }, - { 0x60, 0x00, 0, 1, 0x03, 0x03 }, - { 0x60, 0x00, 0, 1, 0x02, 0x02 }, - { 0x60, 0x00, 1, 1, 0x0A, 0x0A }, - { 0x60, 0x00, 0, 1, 0x03, 0x03 }, - { 0x60, 0x00, 0, 1, 0x02, 0x02 }, - { 0x60, 0x00, 1, 1, 0x02, 0x02 }, - { 0x60, 0x00, 1, 1, 0x03, 0x03 }, - { 0x60, 0x00, 1, 1, 0x03, 0x03 }, - { 0x61, 0x00, 0, 1, 0x02, 0x02 }, - { 0x61, 0x00, 0, 1, 0x02, 0x02 }, - { 0x61, 0x00, 0, 1, 0x02, 0x02 }, - { 0x61, 0x00, 0, 1, 0x02, 0x02 }, - { 0x61, 0x00, 0, 1, 0x03, 0x03 }, - { 0x61, 0x00, 0, 1, 0x02, 0x02 }, - { 0x62, 0x00, 0, 1, 0x02, 0x02 }, - { 0x62, 0x00, 0, 1, 0x02, 0x02 }, - { 0x62, 0x00, 0, 1, 0x02, 0x02 }, - { 0x62, 0x00, 0, 1, 0x02, 0x02 }, - { 0x62, 0x00, 0, 1, 0x02, 0x02 }, - { 0x62, 0x00, 1, 1, 0x02, 0x02 }, - { 0x58, 0x03, 0, 1, 0x00, 0x00 }, - { 0x58, 0x03, 0, 1, 0x00, 0x00 }, - { 0x58, 0x03, 0, 1, 0x00, 0x00 }, - { 0x58, 0x03, 0, 1, 0x00, 0x00 }, - { 0x63, 0x00, 0, 1, 0x03, 0x03 }, - { 0x63, 0x00, 0, 1, 0x02, 0x02 }, - { 0x63, 0x00, 0, 1, 0x03, 0x03 }, - { 0x63, 0x00, 0, 1, 0x02, 0x02 }, - { 0x63, 0x00, 0, 1, 0x20, 0x20 }, - { 0x63, 0x00, 0, 1, 0x2A, 0x2A }, - { 0x63, 0x00, 1, 1, 0x02, 0x02 }, - { 0x63, 0x00, 1, 1, 0x02, 0x02 }, - { 0x63, 0x00, 1, 1, 0x02, 0x02 }, - { 0x63, 0x00, 1, 1, 0x02, 0x02 }, - { 0x63, 0x00, 1, 1, 0x02, 0x02 }, - { 0x63, 0x00, 1, 1, 0x02, 0x02 }, - { 0x63, 0x00, 1, 1, 0x02, 0x02 }, - { 0x63, 0x00, 1, 1, 0x02, 0x02 }, - { 0x04, 0x00, 0, 1, 0x02, 0x02 }, - { 0x04, 0x00, 0, 1, 0x02, 0x02 }, - { 0x04, 0x00, 0, 1, 0x02, 0x02 }, - { 0x04, 0x00, 0, 1, 0x02, 0x02 }, - { 0x03, 0x00, 0, 1, 0x02, 0x02 }, - { 0x03, 0x00, 0, 1, 0x02, 0x02 }, - { 0x03, 0x00, 0, 1, 0x02, 0x02 }, - { 0x03, 0x00, 0, 1, 0x02, 0x02 }, - { 0x42, 0x01, 0, 1, 0x04, 0x20 }, - { 0x42, 0x01, 0, 1, 0x04, 0x20 }, - { 0x42, 0x01, 0, 1, 0x04, 0x20 }, - { 0x42, 0x01, 0, 1, 0x04, 0x20 }, - { 0x23, 0x00, 0, 1, 0x03, 0x03 }, - { 0x24, 0x00, 0, 1, 0x02, 0x02 }, - { 0x25, 0x00, 0, 1, 0x02, 0x02 }, - { 0x25, 0x00, 0, 1, 0x02, 0x02 }, - { 0x04, 0x01, 1, 1, 0x02, 0x02 }, - { 0x04, 0x01, 1, 1, 0x02, 0x02 }, - { 0x04, 0x01, 1, 1, 0x02, 0x02 }, - { 0x04, 0x01, 1, 1, 0x02, 0x02 }, - { 0x0E, 0x00, 1, 1, 0x02, 0x02 }, - { 0x0E, 0x00, 1, 1, 0x02, 0x02 }, - { 0x0E, 0x00, 1, 1, 0x02, 0x02 }, - { 0x0E, 0x00, 1, 1, 0x02, 0x02 }, - { 0x51, 0x01, 0, 1, 0x03, 0x03 }, - { 0x51, 0x01, 0, 1, 0x02, 0x02 }, - { 0x51, 0x01, 0, 1, 0x03, 0x03 }, - { 0x51, 0x01, 0, 1, 0x02, 0x02 }, - { 0x51, 0x02, 1, 1, 0x03, 0x03 }, - { 0x51, 0x02, 1, 1, 0x02, 0x02 }, - { 0x51, 0x02, 1, 1, 0x03, 0x03 }, - { 0x51, 0x02, 1, 1, 0x02, 0x02 }, - { 0x51, 0x03, 0, 1, 0x02, 0x02 }, - { 0x51, 0x03, 0, 1, 0x02, 0x02 }, - { 0x51, 0x03, 0, 1, 0x02, 0x02 }, - { 0x51, 0x03, 0, 1, 0x02, 0x02 }, - { 0x51, 0x04, 1, 1, 0x03, 0x03 }, - { 0x51, 0x04, 1, 1, 0x02, 0x02 }, - { 0x51, 0x04, 1, 1, 0x03, 0x03 }, - { 0x51, 0x04, 1, 1, 0x02, 0x02 }, - { 0x51, 0x05, 0, 1, 0x03, 0x03 }, - { 0x51, 0x05, 0, 1, 0x02, 0x02 }, - { 0x51, 0x05, 0, 1, 0x03, 0x03 }, - { 0x51, 0x05, 0, 1, 0x02, 0x02 }, - { 0x52, 0x01, 0, 1, 0x03, 0x03 }, - { 0x52, 0x01, 0, 1, 0x02, 0x02 }, - { 0x52, 0x01, 0, 1, 0x03, 0x03 }, - { 0x52, 0x01, 0, 1, 0x02, 0x02 }, - { 0x52, 0x02, 0, 1, 0x03, 0x03 }, - { 0x52, 0x02, 0, 1, 0x02, 0x02 }, - { 0x52, 0x02, 0, 1, 0x03, 0x03 }, - { 0x52, 0x02, 0, 1, 0x02, 0x02 }, - { 0x54, 0x01, 1, 1, 0x03, 0x03 }, - { 0x54, 0x01, 1, 1, 0x03, 0x03 }, - { 0x54, 0x01, 1, 1, 0x03, 0x03 }, - { 0x54, 0x01, 1, 1, 0x03, 0x03 }, - { 0x54, 0x02, 0, 1, 0x03, 0x03 }, - { 0x54, 0x02, 0, 1, 0x02, 0x02 }, - { 0x54, 0x02, 0, 1, 0x03, 0x03 }, - { 0x54, 0x02, 0, 1, 0x02, 0x02 }, - { 0x58, 0x01, 0, 1, 0x02, 0x02 }, - { 0x58, 0x01, 0, 1, 0x02, 0x02 }, - { 0x58, 0x01, 0, 1, 0x02, 0x02 }, - { 0x58, 0x01, 0, 1, 0x02, 0x02 }, - { 0x5A, 0x01, 0, 1, 0x03, 0x03 }, - { 0x5A, 0x01, 0, 1, 0x02, 0x02 }, - { 0x5A, 0x01, 0, 1, 0x03, 0x03 }, - { 0x5A, 0x01, 0, 1, 0x02, 0x02 }, - { 0x5B, 0x01, 1, 1, 0x02, 0x02 }, - { 0x5B, 0x01, 1, 1, 0x02, 0x02 }, - { 0x5B, 0x01, 1, 1, 0x02, 0x02 }, - { 0x5B, 0x01, 1, 1, 0x02, 0x02 }, - { 0x5B, 0x02, 0, 1, 0x02, 0x02 }, - { 0x5B, 0x02, 0, 1, 0x02, 0x02 }, - { 0x5B, 0x02, 0, 1, 0x02, 0x02 }, - { 0x5B, 0x02, 0, 1, 0x02, 0x02 }, - { 0x5B, 0x03, 0, 1, 0x02, 0x02 }, - { 0x5B, 0x03, 0, 1, 0x02, 0x02 }, - { 0x5B, 0x03, 0, 1, 0x02, 0x02 }, - { 0x5B, 0x03, 0, 1, 0x02, 0x02 }, - { 0x0E, 0x02, 1, 1, 0x02, 0x02 }, - { 0x0E, 0x02, 1, 1, 0x02, 0x02 }, - { 0x0E, 0x02, 1, 1, 0x02, 0x02 }, - { 0x0E, 0x02, 1, 1, 0x02, 0x02 }, - { 0x60, 0x01, 0, 1, 0x03, 0x03 }, - { 0x60, 0x01, 0, 1, 0x02, 0x02 }, - { 0x60, 0x01, 0, 1, 0x03, 0x03 }, - { 0x60, 0x01, 0, 1, 0x02, 0x02 }, - { 0x60, 0x02, 0, 1, 0x03, 0x03 }, - { 0x60, 0x02, 0, 1, 0x02, 0x02 }, - { 0x60, 0x02, 0, 1, 0x03, 0x03 }, - { 0x60, 0x02, 0, 1, 0x02, 0x02 }, - { 0x62, 0x01, 0, 1, 0x02, 0x02 }, - { 0x62, 0x01, 0, 1, 0x02, 0x02 }, - { 0x62, 0x01, 0, 1, 0x02, 0x02 }, - { 0x62, 0x01, 0, 1, 0x02, 0x02 }, - { 0x38, 0x01, 0, 1, 0x04, 0x20 }, - { 0x38, 0x01, 0, 1, 0x04, 0x20 }, - { 0x38, 0x01, 0, 1, 0x04, 0x20 }, - { 0x38, 0x01, 0, 1, 0x04, 0x20 }, - { 0x1A, 0x05, 1, 1, 0x02, 0x02 }, - { 0x1A, 0x05, 1, 1, 0x02, 0x02 }, - { 0x1A, 0x05, 1, 1, 0x02, 0x02 }, - { 0x1A, 0x05, 1, 1, 0x02, 0x02 }, - { 0x20, 0x08, 0, 1, 0x04, 0x02 }, - { 0x21, 0x08, 0, 1, 0x04, 0x02 }, - { 0x22, 0x08, 0, 1, 0x04, 0x02 }, - { 0x22, 0x08, 0, 1, 0x04, 0x02 }, - { 0x20, 0x09, 0, 1, 0x04, 0x02 }, - { 0x21, 0x09, 0, 1, 0x04, 0x02 }, - { 0x22, 0x09, 0, 1, 0x04, 0x02 }, - { 0x22, 0x09, 0, 1, 0x04, 0x02 }, - { 0x20, 0x0A, 0, 1, 0x04, 0x02 }, - { 0x21, 0x0A, 0, 1, 0x04, 0x02 }, - { 0x22, 0x0A, 0, 1, 0x04, 0x02 }, - { 0x22, 0x0A, 0, 1, 0x04, 0x02 }, - { 0x54, 0x03, 1, 1, 0x03, 0x03 }, - { 0x54, 0x03, 1, 1, 0x02, 0x02 }, - { 0x54, 0x03, 1, 1, 0x03, 0x03 }, - { 0x54, 0x03, 1, 1, 0x02, 0x02 }, - { 0x54, 0x04, 0, 1, 0x2C, 0x2C }, - { 0x54, 0x04, 0, 1, 0x2C, 0x2C }, - { 0x54, 0x04, 0, 1, 0x2C, 0x2C }, - { 0x54, 0x04, 0, 1, 0x2C, 0x2C }, - { 0x5C, 0x01, 0, 1, 0x03, 0x03 }, - { 0x5C, 0x01, 0, 1, 0x02, 0x02 }, - { 0x5C, 0x01, 0, 1, 0x03, 0x03 }, - { 0x5C, 0x01, 0, 1, 0x02, 0x02 }, - { 0x5C, 0x02, 0, 0, 0x03, 0x03 }, - { 0x5C, 0x02, 0, 0, 0x02, 0x02 }, - { 0x5C, 0x02, 0, 0, 0x03, 0x03 }, - { 0x5C, 0x02, 0, 0, 0x02, 0x02 }, - { 0x5C, 0x03, 0, 0, 0x03, 0x03 }, - { 0x5C, 0x03, 0, 0, 0x02, 0x02 }, - { 0x5C, 0x03, 0, 0, 0x03, 0x03 }, - { 0x5C, 0x03, 0, 0, 0x02, 0x02 }, - { 0x5C, 0x04, 0, 1, 0x02, 0x02 }, - { 0x5C, 0x04, 0, 1, 0x02, 0x02 }, - { 0x5C, 0x04, 0, 1, 0x02, 0x02 }, - { 0x5C, 0x04, 0, 1, 0x02, 0x02 }, - { 0x5C, 0x05, 0, 1, 0x03, 0x03 }, - { 0x5C, 0x05, 0, 1, 0x02, 0x02 }, - { 0x5C, 0x05, 0, 1, 0x03, 0x03 }, - { 0x5C, 0x05, 0, 1, 0x02, 0x02 }, - { 0x5C, 0x06, 1, 0, 0x0F, 0x0F }, - { 0x5C, 0x06, 1, 0, 0x0F, 0x0F }, - { 0x5C, 0x06, 1, 0, 0x0F, 0x0F }, - { 0x5C, 0x06, 1, 0, 0x0F, 0x0F }, - { 0x51, 0x06, 0, 1, 0x03, 0x03 }, - { 0x51, 0x06, 0, 1, 0x02, 0x02 }, - { 0x51, 0x06, 0, 1, 0x03, 0x03 }, - { 0x51, 0x06, 0, 1, 0x02, 0x02 }, - { 0x51, 0x07, 0, 1, 0x03, 0x03 }, - { 0x51, 0x07, 0, 1, 0x02, 0x02 }, - { 0x51, 0x07, 0, 1, 0x03, 0x03 }, - { 0x51, 0x07, 0, 1, 0x02, 0x02 }, - { 0x52, 0x03, 0, 1, 0x04, 0x02 }, - { 0x52, 0x03, 0, 1, 0x04, 0x02 }, - { 0x52, 0x03, 0, 1, 0x04, 0x02 }, - { 0x52, 0x03, 0, 1, 0x04, 0x02 }, - { 0x53, 0x01, 0, 1, 0x02, 0x02 }, - { 0x53, 0x01, 0, 1, 0x02, 0x02 }, - { 0x53, 0x01, 0, 1, 0x02, 0x02 }, - { 0x53, 0x01, 0, 1, 0x02, 0x02 }, - { 0x55, 0x01, 0, 1, 0x03, 0x03 }, - { 0x55, 0x01, 0, 1, 0x02, 0x02 }, - { 0x55, 0x01, 0, 1, 0x03, 0x03 }, - { 0x55, 0x01, 0, 1, 0x02, 0x02 }, - { 0x55, 0x02, 0, 1, 0x02, 0x02 }, - { 0x55, 0x02, 0, 1, 0x02, 0x02 }, - { 0x55, 0x02, 0, 1, 0x02, 0x02 }, - { 0x55, 0x02, 0, 1, 0x02, 0x02 }, - { 0x55, 0x03, 0, 1, 0x04, 0x04 }, - { 0x55, 0x03, 0, 1, 0x04, 0x04 }, - { 0x55, 0x03, 0, 1, 0x04, 0x04 }, - { 0x55, 0x03, 0, 1, 0x04, 0x04 }, - { 0x56, 0x01, 0, 1, 0x12, 0x12 }, - { 0x56, 0x01, 0, 1, 0x02, 0x02 }, - { 0x56, 0x01, 0, 1, 0x12, 0x12 }, - { 0x56, 0x01, 0, 1, 0x02, 0x02 }, - { 0x57, 0x01, 0, 1, 0x03, 0x03 }, - { 0x57, 0x01, 0, 1, 0x02, 0x02 }, - { 0x57, 0x01, 0, 1, 0x03, 0x03 }, - { 0x57, 0x01, 0, 1, 0x02, 0x02 }, - { 0x57, 0x02, 0, 1, 0x13, 0x13 }, - { 0x57, 0x02, 0, 1, 0x02, 0x02 }, - { 0x57, 0x02, 0, 1, 0x13, 0x13 }, - { 0x57, 0x02, 0, 1, 0x02, 0x02 }, - { 0x59, 0x01, 0, 1, 0x02, 0x02 }, - { 0x59, 0x01, 0, 1, 0x02, 0x02 }, - { 0x59, 0x01, 0, 1, 0x02, 0x02 }, - { 0x59, 0x01, 0, 1, 0x02, 0x02 }, - { 0x59, 0x02, 0, 1, 0x03, 0x03 }, - { 0x59, 0x02, 0, 1, 0x02, 0x02 }, - { 0x59, 0x02, 0, 1, 0x03, 0x03 }, - { 0x59, 0x02, 0, 1, 0x02, 0x02 }, - { 0x5A, 0x02, 1, 1, 0x03, 0x03 }, - { 0x5A, 0x02, 1, 1, 0x02, 0x02 }, - { 0x5A, 0x02, 1, 1, 0x03, 0x03 }, - { 0x5A, 0x02, 1, 1, 0x02, 0x02 }, - { 0x5A, 0x03, 1, 1, 0x03, 0x03 }, - { 0x5A, 0x03, 1, 1, 0x02, 0x02 }, - { 0x5A, 0x03, 1, 1, 0x03, 0x03 }, - { 0x5A, 0x03, 1, 1, 0x02, 0x02 }, - { 0x5D, 0x01, 0, 1, 0x03, 0x03 }, - { 0x5D, 0x01, 0, 1, 0x02, 0x02 }, - { 0x5D, 0x01, 0, 1, 0x03, 0x03 }, - { 0x5D, 0x01, 0, 1, 0x02, 0x02 }, - { 0x5D, 0x02, 0, 1, 0x03, 0x03 }, - { 0x5D, 0x02, 0, 1, 0x02, 0x02 }, - { 0x5D, 0x02, 0, 1, 0x03, 0x03 }, - { 0x5D, 0x02, 0, 1, 0x02, 0x02 }, - { 0x5D, 0x03, 0, 1, 0x03, 0x03 }, - { 0x5D, 0x03, 0, 1, 0x02, 0x02 }, - { 0x5D, 0x03, 0, 1, 0x03, 0x03 }, - { 0x5D, 0x03, 0, 1, 0x02, 0x02 }, - { 0x5F, 0x01, 0, 1, 0x03, 0x03 }, - { 0x5F, 0x01, 0, 1, 0x02, 0x02 }, - { 0x64, 0x01, 0, 1, 0x05, 0x05 }, - { 0x64, 0x01, 0, 1, 0x05, 0x05 }, - { 0x5F, 0x01, 0, 1, 0x00, 0x00 }, - { 0x60, 0x03, 0, 1, 0x03, 0x03 }, - { 0x60, 0x03, 0, 1, 0x02, 0x02 }, - { 0x60, 0x03, 0, 1, 0x03, 0x03 }, - { 0x60, 0x03, 0, 1, 0x02, 0x02 }, - { 0x61, 0x01, 0, 1, 0x02, 0x02 }, - { 0x61, 0x01, 0, 1, 0x02, 0x02 }, - { 0x61, 0x01, 0, 1, 0x02, 0x02 }, - { 0x61, 0x01, 0, 1, 0x02, 0x02 }, - { 0x61, 0x02, 0, 1, 0x02, 0x02 }, - { 0x61, 0x02, 0, 1, 0x02, 0x02 }, - { 0x61, 0x02, 0, 1, 0x02, 0x02 }, - { 0x61, 0x02, 0, 1, 0x02, 0x02 }, - { 0x03, 0x01, 1, 1, 0x02, 0x02 }, - { 0x03, 0x01, 1, 1, 0x02, 0x02 }, - { 0x03, 0x01, 1, 1, 0x02, 0x02 }, - { 0x03, 0x01, 1, 1, 0x02, 0x02 }, - { 0x00, 0x01, 1, 0, 0x02, 0x02 }, - { 0x00, 0x01, 1, 0, 0x02, 0x02 }, - { 0x00, 0x01, 1, 0, 0x02, 0x02 }, - { 0x00, 0x01, 1, 0, 0x02, 0x02 }, - { 0x0E, 0x03, 1, 1, 0x02, 0x02 }, - { 0x0E, 0x03, 1, 1, 0x02, 0x02 }, - { 0x0E, 0x03, 1, 1, 0x02, 0x02 }, - { 0x0E, 0x03, 1, 1, 0x02, 0x02 }, - { 0x20, 0x01, 0, 1, 0x03, 0x03 }, - { 0x21, 0x01, 0, 1, 0x02, 0x02 }, - { 0x22, 0x01, 0, 1, 0x02, 0x02 }, - { 0x22, 0x01, 0, 1, 0x02, 0x02 }, - { 0x20, 0x02, 0, 1, 0x03, 0x03 }, - { 0x21, 0x02, 0, 1, 0x02, 0x02 }, - { 0x22, 0x02, 0, 1, 0x02, 0x02 }, - { 0x22, 0x02, 0, 1, 0x02, 0x02 }, - { 0x20, 0x03, 1, 1, 0x03, 0x03 }, - { 0x21, 0x03, 1, 1, 0x02, 0x02 }, - { 0x22, 0x03, 1, 1, 0x02, 0x02 }, - { 0x22, 0x03, 1, 1, 0x02, 0x02 }, - { 0x55, 0x04, 0, 0, 0x04, 0x04 }, - { 0x55, 0x04, 0, 0, 0x04, 0x04 }, - { 0x55, 0x04, 0, 0, 0x04, 0x04 }, - { 0x55, 0x04, 0, 0, 0x04, 0x04 }, - { 0x55, 0x05, 0, 0, 0x04, 0x04 }, - { 0x55, 0x05, 0, 0, 0x04, 0x04 }, - { 0x55, 0x05, 0, 0, 0x04, 0x04 }, - { 0x55, 0x05, 0, 0, 0x04, 0x04 }, - { 0x1B, 0x02, 0, 0, 0x02, 0x02 }, - { 0x1C, 0x02, 0, 0, 0x02, 0x02 }, - { 0x1D, 0x02, 0, 0, 0x02, 0x02 }, - { 0x1D, 0x02, 0, 0, 0x02, 0x02 }, - { 0x34, 0x01, 0, 1, 0x04, 0x04 }, - { 0x34, 0x01, 0, 1, 0x04, 0x04 }, - { 0x34, 0x01, 0, 1, 0x04, 0x04 }, - { 0x34, 0x01, 0, 1, 0x04, 0x04 }, - { 0x1B, 0x01, 0, 1, 0x03, 0x03 }, - { 0x1C, 0x01, 0, 1, 0x02, 0x02 }, - { 0x1D, 0x01, 0, 1, 0x02, 0x02 }, - { 0x1D, 0x01, 0, 1, 0x02, 0x02 }, - { 0x51, 0x08, 1, 1, 0x03, 0x03 }, - { 0x51, 0x08, 1, 1, 0x02, 0x02 }, - { 0x51, 0x08, 1, 1, 0x03, 0x03 }, - { 0x51, 0x08, 1, 1, 0x02, 0x02 }, - { 0x51, 0x09, 0, 1, 0x03, 0x03 }, - { 0x51, 0x09, 0, 1, 0x03, 0x03 }, - { 0x51, 0x09, 0, 1, 0x03, 0x03 }, - { 0x51, 0x09, 0, 1, 0x03, 0x03 }, - { 0x51, 0x0A, 0, 1, 0x03, 0x03 }, - { 0x51, 0x0A, 0, 1, 0x03, 0x03 }, - { 0x51, 0x0A, 0, 1, 0x03, 0x03 }, - { 0x51, 0x0A, 0, 1, 0x03, 0x03 }, - { 0x55, 0x06, 0, 1, 0x02, 0x02 }, - { 0x55, 0x06, 0, 1, 0x02, 0x02 }, - { 0x55, 0x06, 0, 1, 0x02, 0x02 }, - { 0x55, 0x06, 0, 1, 0x02, 0x02 }, - { 0x51, 0x0B, 0, 1, 0x05, 0x05 }, - { 0x51, 0x0B, 0, 1, 0x04, 0x02 }, - { 0x51, 0x0B, 0, 1, 0x05, 0x05 }, - { 0x51, 0x0B, 0, 1, 0x04, 0x02 }, - { 0x51, 0x0C, 0, 1, 0x05, 0x05 }, - { 0x51, 0x0C, 0, 1, 0x04, 0x02 }, - { 0x51, 0x0C, 0, 1, 0x05, 0x05 }, - { 0x51, 0x0C, 0, 1, 0x04, 0x02 }, - { 0x51, 0x0D, 0, 1, 0x05, 0x05 }, - { 0x51, 0x0D, 0, 1, 0x04, 0x02 }, - { 0x51, 0x0D, 0, 1, 0x05, 0x05 }, - { 0x51, 0x0D, 0, 1, 0x04, 0x02 }, - { 0x45, 0x01, 0, 1, 0x03, 0x03 }, - { 0x46, 0x01, 0, 1, 0x02, 0x02 }, - { 0x45, 0x01, 0, 1, 0x03, 0x03 }, - { 0x46, 0x01, 0, 1, 0x02, 0x02 }, - { 0x1E, 0x01, 1, 1, 0x03, 0x03 }, - { 0x1F, 0x01, 1, 1, 0x02, 0x02 }, - { 0x1E, 0x01, 1, 1, 0x02, 0x02 }, - { 0x1F, 0x01, 1, 1, 0x02, 0x02 }, - { 0x20, 0x04, 1, 1, 0x03, 0x03 }, - { 0x21, 0x04, 1, 1, 0x02, 0x02 }, - { 0x22, 0x04, 1, 1, 0x02, 0x02 }, - { 0x22, 0x04, 1, 1, 0x02, 0x02 }, - { 0x20, 0x05, 0, 1, 0x04, 0x02 }, - { 0x21, 0x05, 0, 1, 0x04, 0x02 }, - { 0x22, 0x05, 0, 1, 0x04, 0x02 }, - { 0x22, 0x05, 0, 1, 0x04, 0x02 }, - { 0x52, 0x04, 0, 1, 0x02, 0x02 }, - { 0x52, 0x04, 0, 1, 0x02, 0x02 }, - { 0x52, 0x04, 0, 1, 0x02, 0x02 }, - { 0x52, 0x04, 0, 1, 0x02, 0x02 }, - { 0x5D, 0x04, 0, 1, 0x03, 0x03 }, - { 0x5D, 0x04, 0, 1, 0x02, 0x02 }, - { 0x5D, 0x04, 0, 1, 0x03, 0x03 }, - { 0x5D, 0x04, 0, 1, 0x02, 0x02 }, - { 0x63, 0x01, 0, 0, 0x03, 0x03 }, - { 0x63, 0x01, 0, 0, 0x02, 0x02 }, - { 0x63, 0x01, 0, 0, 0x03, 0x03 }, - { 0x63, 0x01, 0, 0, 0x02, 0x02 }, - { 0x07, 0x01, 0, 1, 0x02, 0x02 }, - { 0x07, 0x01, 0, 1, 0x02, 0x02 }, - { 0x07, 0x01, 0, 1, 0x02, 0x02 }, - { 0x07, 0x01, 0, 1, 0x02, 0x02 }, - { 0x07, 0x02, 1, 1, 0x02, 0x02 }, - { 0x07, 0x02, 1, 1, 0x02, 0x02 }, - { 0x07, 0x02, 1, 1, 0x02, 0x02 }, - { 0x07, 0x02, 1, 1, 0x02, 0x02 }, - { 0x5D, 0x05, 0, 1, 0x03, 0x03 }, - { 0x5D, 0x05, 0, 1, 0x02, 0x02 }, - { 0x5D, 0x05, 0, 1, 0x03, 0x03 }, - { 0x5D, 0x05, 0, 1, 0x02, 0x02 }, - { 0x5D, 0x06, 0, 1, 0x03, 0x03 }, - { 0x5D, 0x06, 0, 1, 0x02, 0x02 }, - { 0x5D, 0x06, 0, 1, 0x03, 0x03 }, - { 0x5D, 0x06, 0, 1, 0x02, 0x02 }, - { 0x5D, 0x07, 0, 1, 0x03, 0x03 }, - { 0x5D, 0x07, 0, 1, 0x02, 0x02 }, - { 0x5D, 0x07, 0, 1, 0x03, 0x03 }, - { 0x5D, 0x07, 0, 1, 0x02, 0x02 }, - { 0x5D, 0x08, 0, 1, 0x03, 0x03 }, - { 0x5D, 0x08, 0, 1, 0x02, 0x02 }, - { 0x5D, 0x08, 0, 1, 0x03, 0x03 }, - { 0x5D, 0x08, 0, 1, 0x02, 0x02 }, - { 0x43, 0x02, 0, 1, 0x0A, 0x0A }, - { 0x43, 0x02, 0, 1, 0x0A, 0x0A }, - { 0x43, 0x02, 0, 1, 0x0A, 0x0A }, - { 0x43, 0x02, 0, 1, 0x0A, 0x0A }, - { 0x44, 0x01, 0, 1, 0x02, 0x02 }, - { 0x44, 0x01, 0, 1, 0x02, 0x02 }, - { 0x44, 0x01, 0, 1, 0x02, 0x02 }, - { 0x44, 0x01, 0, 1, 0x02, 0x02 }, - { 0x5D, 0x09, 0, 1, 0x03, 0x03 }, - { 0x5D, 0x09, 0, 1, 0x02, 0x02 }, - { 0x5D, 0x09, 0, 1, 0x03, 0x03 }, - { 0x5D, 0x09, 0, 1, 0x02, 0x02 }, - { 0x5D, 0x0A, 0, 1, 0x03, 0x03 }, - { 0x5D, 0x0A, 0, 1, 0x02, 0x02 }, - { 0x5D, 0x0A, 0, 1, 0x03, 0x03 }, - { 0x5D, 0x0A, 0, 1, 0x02, 0x02 }, - { 0x5D, 0x0B, 0, 1, 0x03, 0x03 }, - { 0x5D, 0x0B, 0, 1, 0x02, 0x02 }, - { 0x5D, 0x0B, 0, 1, 0x03, 0x03 }, - { 0x5D, 0x0B, 0, 1, 0x02, 0x02 }, - { 0x5D, 0x0C, 0, 1, 0x03, 0x03 }, - { 0x5D, 0x0C, 0, 1, 0x02, 0x02 }, - { 0x5D, 0x0C, 0, 1, 0x03, 0x03 }, - { 0x5D, 0x0C, 0, 1, 0x02, 0x02 }, - { 0x63, 0x02, 0, 1, 0x03, 0x03 }, - { 0x63, 0x02, 0, 1, 0x02, 0x02 }, - { 0x63, 0x02, 0, 1, 0x03, 0x03 }, - { 0x63, 0x02, 0, 1, 0x02, 0x02 }, - { 0x63, 0x03, 0, 1, 0x03, 0x03 }, - { 0x63, 0x03, 0, 1, 0x02, 0x02 }, - { 0x63, 0x03, 0, 1, 0x03, 0x03 }, - { 0x63, 0x03, 0, 1, 0x02, 0x02 }, - { 0x42, 0x00, 0, 1, 0x02, 0x02 }, - { 0x42, 0x00, 0, 1, 0x02, 0x02 }, - { 0x42, 0x00, 0, 1, 0x02, 0x02 }, - { 0x42, 0x00, 0, 1, 0x02, 0x02 }, - { 0x56, 0x00, 0, 1, 0x02, 0x02 }, - { 0x47, 0x00, 0, 1, 0x02, 0x02 }, - { 0x42, 0x00, 0, 1, 0x02, 0x02 }, - { 0x42, 0x00, 0, 1, 0x02, 0x02 }, - { 0x42, 0x00, 0, 1, 0x02, 0x02 }, - { 0x42, 0x00, 0, 1, 0x02, 0x02 }, - { 0x42, 0x00, 0, 1, 0x02, 0x02 }, - { 0x06, 0x01, 1, 1, 0x02, 0x02 }, - { 0x06, 0x01, 1, 1, 0x02, 0x02 }, - { 0x06, 0x01, 1, 1, 0x02, 0x02 }, - { 0x06, 0x01, 1, 1, 0x02, 0x02 }, - { 0x36, 0x00, 0, 1, 0x04, 0x20 }, - { 0x36, 0x00, 0, 1, 0x04, 0x20 }, - { 0x36, 0x00, 0, 1, 0x04, 0x20 }, - { 0x36, 0x00, 0, 1, 0x04, 0x20 }, - { 0x2A, 0x00, 0, 1, 0x04, 0x20 }, - { 0x2A, 0x00, 0, 1, 0x04, 0x20 }, - { 0x2A, 0x00, 0, 1, 0x04, 0x20 }, - { 0x2A, 0x00, 0, 1, 0x04, 0x20 }, - { 0x13, 0x00, 1, 1, 0x02, 0x02 }, - { 0x13, 0x00, 1, 1, 0x02, 0x02 }, - { 0x13, 0x00, 1, 1, 0x02, 0x02 }, - { 0x13, 0x00, 1, 1, 0x02, 0x02 }, - { 0x15, 0x00, 1, 1, 0x02, 0x02 }, - { 0x15, 0x00, 1, 1, 0x02, 0x02 }, - { 0x15, 0x00, 1, 1, 0x02, 0x02 }, - { 0x15, 0x00, 1, 1, 0x02, 0x02 }, - { 0x57, 0x06, 0, 1, 0x04, 0x02 }, - { 0x57, 0x06, 0, 1, 0x04, 0x02 }, - { 0x57, 0x06, 0, 1, 0x04, 0x02 }, - { 0x57, 0x06, 0, 1, 0x04, 0x02 }, - { 0x3A, 0x00, 0, 1, 0x02, 0x20 }, - { 0x3A, 0x00, 0, 1, 0x02, 0x20 }, - { 0x3A, 0x00, 0, 1, 0x02, 0x20 }, - { 0x3A, 0x00, 0, 1, 0x02, 0x20 }, - { 0x51, 0x0E, 1, 1, 0x03, 0x03 }, - { 0x51, 0x0E, 1, 1, 0x03, 0x03 }, - { 0x51, 0x0E, 1, 1, 0x03, 0x03 }, - { 0x51, 0x0E, 1, 1, 0x03, 0x03 }, - { 0x3B, 0x00, 0, 1, 0x02, 0x02 }, - { 0x3B, 0x00, 0, 1, 0x02, 0x02 }, - { 0x3B, 0x00, 0, 1, 0x02, 0x02 }, - { 0x3B, 0x00, 0, 1, 0x02, 0x02 }, - { 0x3B, 0x00, 0, 1, 0x02, 0x02 }, - { 0x3B, 0x00, 0, 1, 0x02, 0x02 }, - { 0x3B, 0x00, 0, 1, 0x02, 0x02 }, - { 0x3F, 0x00, 0, 1, 0x02, 0x26 }, - { 0x3F, 0x00, 0, 1, 0x02, 0x26 }, - { 0x3F, 0x00, 0, 1, 0x02, 0x26 }, - { 0x3F, 0x00, 0, 1, 0x02, 0x26 }, - { 0x43, 0x03, 0, 1, 0x02, 0x02 }, - { 0x43, 0x03, 0, 1, 0x02, 0x02 }, - { 0x43, 0x03, 0, 1, 0x02, 0x02 }, - { 0x43, 0x03, 0, 1, 0x02, 0x02 }, - { 0x43, 0x04, 0, 1, 0x02, 0x02 }, - { 0x43, 0x04, 0, 1, 0x02, 0x02 }, - { 0x43, 0x04, 0, 1, 0x02, 0x02 }, - { 0x43, 0x04, 0, 1, 0x02, 0x02 }, - { 0x58, 0x04, 0, 1, 0x2C, 0x2C }, - { 0x58, 0x04, 0, 1, 0x2C, 0x2C }, - { 0x58, 0x04, 0, 1, 0x2C, 0x2C }, - { 0x58, 0x04, 0, 1, 0x2C, 0x2C }, - { 0x1A, 0x02, 1, 1, 0x02, 0x02 }, - { 0x1A, 0x02, 1, 1, 0x02, 0x02 }, - { 0x1A, 0x02, 1, 1, 0x02, 0x02 }, - { 0x1A, 0x02, 1, 1, 0x02, 0x02 }, - { 0x1A, 0x03, 1, 1, 0x02, 0x02 }, - { 0x1A, 0x03, 1, 1, 0x02, 0x02 }, - { 0x1A, 0x03, 1, 1, 0x02, 0x02 }, - { 0x1A, 0x03, 1, 1, 0x02, 0x02 }, - { 0x1A, 0x04, 1, 1, 0x02, 0x02 }, - { 0x1A, 0x04, 1, 1, 0x02, 0x02 }, - { 0x1A, 0x04, 1, 1, 0x02, 0x02 }, - { 0x1A, 0x04, 1, 1, 0x02, 0x02 }, - { 0x55, 0x07, 0, 0, 0x04, 0x04 }, - { 0x55, 0x07, 0, 0, 0x04, 0x04 }, - { 0x55, 0x07, 0, 0, 0x04, 0x04 }, - { 0x55, 0x07, 0, 0, 0x04, 0x04 }, - { 0x55, 0x08, 0, 0, 0x04, 0x04 }, - { 0x55, 0x08, 0, 0, 0x04, 0x04 }, - { 0x55, 0x08, 0, 0, 0x04, 0x04 }, - { 0x55, 0x08, 0, 0, 0x04, 0x04 }, - { 0x5F, 0x02, 0, 1, 0x02, 0x02 }, - { 0x5F, 0x02, 0, 1, 0x02, 0x02 }, - { 0x64, 0x02, 0, 1, 0x02, 0x02 }, - { 0x64, 0x02, 0, 1, 0x02, 0x02 }, - { 0x5F, 0x02, 0, 1, 0x00, 0x00 }, - { 0x52, 0x05, 0, 1, 0x04, 0x02 }, - { 0x52, 0x05, 0, 1, 0x04, 0x02 }, - { 0x52, 0x05, 0, 1, 0x04, 0x02 }, - { 0x52, 0x05, 0, 1, 0x04, 0x02 }, - { 0x52, 0x06, 0, 1, 0x04, 0x02 }, - { 0x52, 0x06, 0, 1, 0x04, 0x02 }, - { 0x52, 0x06, 0, 1, 0x04, 0x02 }, - { 0x52, 0x06, 0, 1, 0x04, 0x02 }, - { 0x52, 0x07, 0, 1, 0x04, 0x02 }, - { 0x52, 0x07, 0, 1, 0x04, 0x02 }, - { 0x52, 0x07, 0, 1, 0x04, 0x02 }, - { 0x52, 0x07, 0, 1, 0x04, 0x02 }, - { 0x52, 0x08, 0, 1, 0x04, 0x02 }, - { 0x52, 0x08, 0, 1, 0x04, 0x02 }, - { 0x52, 0x08, 0, 1, 0x04, 0x02 }, - { 0x52, 0x08, 0, 1, 0x04, 0x02 }, - { 0x53, 0x02, 0, 1, 0x04, 0x02 }, - { 0x53, 0x02, 0, 1, 0x04, 0x02 }, - { 0x53, 0x02, 0, 1, 0x04, 0x02 }, - { 0x53, 0x02, 0, 1, 0x04, 0x02 }, - { 0x53, 0x03, 0, 1, 0x03, 0x03 }, - { 0x53, 0x03, 0, 1, 0x03, 0x03 }, - { 0x53, 0x03, 0, 1, 0x03, 0x03 }, - { 0x53, 0x03, 0, 1, 0x03, 0x03 }, - { 0x53, 0x04, 0, 1, 0x03, 0x03 }, - { 0x53, 0x04, 0, 1, 0x03, 0x03 }, - { 0x53, 0x04, 0, 1, 0x03, 0x03 }, - { 0x53, 0x04, 0, 1, 0x03, 0x03 }, - { 0x53, 0x05, 0, 1, 0x03, 0x03 }, - { 0x53, 0x05, 0, 1, 0x03, 0x03 }, - { 0x53, 0x05, 0, 1, 0x03, 0x03 }, - { 0x53, 0x05, 0, 1, 0x03, 0x03 }, - { 0x5E, 0x01, 1, 1, 0x0E, 0x0E }, - { 0x5E, 0x01, 1, 1, 0x0E, 0x0E }, - { 0x5E, 0x01, 1, 1, 0x0E, 0x0E }, - { 0x5E, 0x01, 1, 1, 0x0E, 0x0E }, - { 0x5E, 0x02, 0, 1, 0x0E, 0x0E }, - { 0x5E, 0x02, 0, 1, 0x0E, 0x0E }, - { 0x5E, 0x02, 0, 1, 0x0E, 0x0E }, - { 0x5E, 0x02, 0, 1, 0x0E, 0x0E }, - { 0x3C, 0x00, 0, 1, 0x03, 0x03 }, - { 0x3C, 0x00, 0, 1, 0x03, 0x03 }, - { 0x3C, 0x00, 0, 1, 0x03, 0x03 }, - { 0x3C, 0x00, 0, 1, 0x03, 0x03 }, - { 0x3D, 0x00, 0, 1, 0x02, 0x02 }, - { 0x3D, 0x00, 0, 1, 0x02, 0x02 }, - { 0x3D, 0x00, 0, 1, 0x02, 0x02 }, - { 0x3D, 0x00, 0, 1, 0x02, 0x02 }, - { 0x3D, 0x00, 0, 1, 0x02, 0x02 }, - { 0x3D, 0x00, 0, 1, 0x02, 0x02 }, - { 0x3D, 0x00, 0, 1, 0x02, 0x02 }, - { 0x63, 0x04, 0, 1, 0x04, 0x02 }, - { 0x63, 0x04, 0, 1, 0x04, 0x02 }, - { 0x63, 0x04, 0, 1, 0x04, 0x02 }, - { 0x63, 0x04, 0, 1, 0x04, 0x02 }, - { 0x2E, 0x00, 0, 1, 0x04, 0x20 }, - { 0x2E, 0x00, 0, 1, 0x04, 0x20 }, - { 0x2E, 0x00, 0, 1, 0x04, 0x20 }, - { 0x2E, 0x00, 0, 1, 0x04, 0x20 }, - { 0x2F, 0x00, 0, 1, 0x04, 0x04 }, - { 0x2F, 0x00, 0, 1, 0x04, 0x04 }, - { 0x2F, 0x00, 0, 1, 0x04, 0x04 }, - { 0x2F, 0x00, 0, 1, 0x04, 0x04 }, - { 0x30, 0x00, 0, 0, 0x04, 0x20 }, - { 0x30, 0x00, 0, 0, 0x04, 0x20 }, - { 0x30, 0x00, 0, 1, 0x04, 0x20 }, - { 0x30, 0x00, 0, 1, 0x04, 0x20 }, - { 0x31, 0x00, 0, 1, 0x04, 0x20 }, - { 0x31, 0x00, 0, 1, 0x04, 0x20 }, - { 0x31, 0x00, 0, 1, 0x04, 0x20 }, - { 0x31, 0x00, 0, 1, 0x04, 0x20 }, - { 0x1E, 0x04, 0, 1, 0x04, 0x02 }, - { 0x1F, 0x04, 0, 1, 0x04, 0x02 }, - { 0x1E, 0x04, 0, 1, 0x04, 0x02 }, - { 0x1F, 0x04, 0, 1, 0x04, 0x02 }, - { 0x32, 0x00, 0, 1, 0x02, 0x02 }, - { 0x32, 0x00, 0, 1, 0x02, 0x02 }, - { 0x32, 0x00, 0, 1, 0x02, 0x02 }, - { 0x32, 0x00, 0, 1, 0x02, 0x02 }, - { 0x59, 0x05, 0, 1, 0x03, 0x03 }, - { 0x59, 0x05, 0, 1, 0x03, 0x03 }, - { 0x59, 0x05, 0, 1, 0x03, 0x03 }, - { 0x59, 0x05, 0, 1, 0x03, 0x03 }, - { 0x35, 0x00, 0, 1, 0x04, 0x02 }, - { 0x35, 0x00, 0, 1, 0x04, 0x02 }, - { 0x35, 0x00, 0, 1, 0x04, 0x02 }, - { 0x35, 0x00, 0, 1, 0x04, 0x02 }, - { 0x37, 0x00, 0, 1, 0x04, 0x20 }, - { 0x37, 0x00, 0, 1, 0x04, 0x20 }, - { 0x37, 0x00, 0, 1, 0x04, 0x20 }, - { 0x37, 0x00, 0, 1, 0x04, 0x20 }, - { 0x39, 0x00, 0, 1, 0x04, 0x04 }, - { 0x39, 0x00, 0, 1, 0x04, 0x04 }, - { 0x39, 0x00, 0, 1, 0x04, 0x04 }, - { 0x39, 0x00, 0, 1, 0x04, 0x04 }, - { 0x5D, 0x0D, 0, 1, 0x03, 0x03 }, - { 0x5D, 0x0D, 0, 1, 0x02, 0x02 }, - { 0x5D, 0x0D, 0, 1, 0x03, 0x03 }, - { 0x5D, 0x0D, 0, 1, 0x02, 0x02 }, - { 0x5D, 0x0E, 0, 1, 0x03, 0x05 }, - { 0x5D, 0x0E, 0, 1, 0x02, 0x04 }, - { 0x5D, 0x0E, 0, 1, 0x03, 0x05 }, - { 0x5D, 0x0E, 0, 1, 0x02, 0x04 }, - { 0x5D, 0x0F, 1, 1, 0x0F, 0x0F }, - { 0x5D, 0x0F, 1, 1, 0x0F, 0x0F }, - { 0x5D, 0x0F, 1, 1, 0x0F, 0x0F }, - { 0x5D, 0x0F, 1, 1, 0x0F, 0x0F }, - { 0x5D, 0x10, 0, 1, 0x02, 0x02 }, - { 0x5D, 0x10, 0, 1, 0x02, 0x02 }, - { 0x5D, 0x10, 0, 1, 0x02, 0x02 }, - { 0x5D, 0x10, 0, 1, 0x02, 0x02 }, - { 0x5D, 0x11, 0, 1, 0x02, 0x02 }, - { 0x5D, 0x11, 0, 1, 0x02, 0x02 }, - { 0x5D, 0x11, 0, 1, 0x02, 0x02 }, - { 0x5D, 0x11, 0, 1, 0x02, 0x02 }, - { 0x20, 0x06, 0, 1, 0x04, 0x02 }, - { 0x21, 0x06, 0, 1, 0x04, 0x02 }, - { 0x22, 0x06, 0, 1, 0x04, 0x02 }, - { 0x22, 0x06, 0, 1, 0x04, 0x02 }, - { 0x20, 0x07, 0, 1, 0x04, 0x02 }, - { 0x21, 0x07, 0, 1, 0x04, 0x02 }, - { 0x22, 0x07, 0, 1, 0x04, 0x02 }, - { 0x22, 0x07, 0, 1, 0x04, 0x02 }, - { 0x1E, 0x02, 0, 1, 0x04, 0x02 }, - { 0x1F, 0x02, 0, 1, 0x04, 0x02 }, - { 0x1E, 0x02, 0, 1, 0x03, 0x03 }, - { 0x1F, 0x02, 0, 1, 0x02, 0x02 }, - { 0x58, 0x02, 0, 1, 0x02, 0x02 }, - { 0x58, 0x02, 0, 1, 0x02, 0x02 }, - { 0x58, 0x02, 0, 1, 0x02, 0x02 }, - { 0x58, 0x02, 0, 1, 0x02, 0x02 }, - { 0x57, 0x03, 0, 1, 0x03, 0x03 }, - { 0x57, 0x03, 0, 1, 0x03, 0x03 }, - { 0x57, 0x03, 0, 1, 0x03, 0x03 }, - { 0x57, 0x03, 0, 1, 0x03, 0x03 }, - { 0x57, 0x04, 0, 1, 0x04, 0x02 }, - { 0x57, 0x04, 0, 1, 0x04, 0x02 }, - { 0x57, 0x04, 0, 1, 0x04, 0x02 }, - { 0x57, 0x04, 0, 1, 0x04, 0x02 }, - { 0x5A, 0x04, 0, 1, 0x04, 0x02 }, - { 0x5A, 0x04, 0, 1, 0x04, 0x02 }, - { 0x5A, 0x04, 0, 1, 0x04, 0x02 }, - { 0x5A, 0x04, 0, 1, 0x04, 0x02 }, - { 0x59, 0x03, 0, 1, 0x03, 0x03 }, - { 0x59, 0x03, 0, 1, 0x02, 0x02 }, - { 0x59, 0x03, 0, 1, 0x03, 0x03 }, - { 0x59, 0x03, 0, 1, 0x02, 0x02 }, - { 0x59, 0x04, 0, 1, 0x02, 0x02 }, - { 0x59, 0x04, 0, 1, 0x02, 0x02 }, - { 0x59, 0x04, 0, 1, 0x02, 0x02 }, - { 0x59, 0x04, 0, 1, 0x02, 0x02 }, - { 0x0E, 0x04, 1, 1, 0x02, 0x02 }, - { 0x0E, 0x04, 1, 1, 0x02, 0x02 }, - { 0x0E, 0x04, 1, 1, 0x02, 0x02 }, - { 0x0E, 0x04, 1, 1, 0x02, 0x02 }, - { 0x0E, 0x05, 1, 1, 0x02, 0x02 }, - { 0x0E, 0x05, 1, 1, 0x02, 0x02 }, - { 0x0E, 0x05, 1, 1, 0x02, 0x02 }, - { 0x0E, 0x05, 1, 1, 0x02, 0x02 }, - { 0x0E, 0x06, 1, 1, 0x02, 0x02 }, - { 0x0E, 0x06, 1, 1, 0x02, 0x02 }, - { 0x0E, 0x06, 1, 1, 0x02, 0x02 }, - { 0x0E, 0x06, 1, 1, 0x02, 0x02 }, - { 0x30, 0x01, 0, 0, 0x04, 0x20 }, - { 0x30, 0x01, 0, 0, 0x04, 0x20 }, - { 0x30, 0x01, 0, 1, 0x04, 0x20 }, - { 0x30, 0x01, 0, 1, 0x04, 0x20 }, - { 0x30, 0x02, 0, 0, 0x04, 0x20 }, - { 0x30, 0x02, 0, 0, 0x04, 0x20 }, - { 0x30, 0x02, 0, 1, 0x04, 0x20 }, - { 0x30, 0x02, 0, 1, 0x04, 0x20 }, - { 0x06, 0x02, 0, 0, 0x02, 0x02 }, - { 0x06, 0x02, 0, 0, 0x02, 0x02 }, - { 0x06, 0x02, 0, 0, 0x02, 0x02 }, - { 0x06, 0x02, 0, 0, 0x02, 0x02 }, - { 0x06, 0x03, 0, 0, 0x02, 0x02 }, - { 0x06, 0x03, 0, 0, 0x02, 0x02 }, - { 0x06, 0x03, 0, 0, 0x02, 0x02 }, - { 0x06, 0x03, 0, 0, 0x02, 0x02 }, - { 0x06, 0x04, 0, 1, 0x02, 0x02 }, - { 0x06, 0x04, 0, 1, 0x02, 0x02 }, - { 0x06, 0x04, 0, 1, 0x02, 0x02 }, - { 0x06, 0x04, 0, 1, 0x02, 0x02 }, - { 0x62, 0x02, 0, 1, 0x04, 0x02 }, - { 0x62, 0x02, 0, 1, 0x04, 0x02 }, - { 0x62, 0x02, 0, 1, 0x04, 0x02 }, - { 0x62, 0x02, 0, 1, 0x04, 0x02 }, - { 0x4A, 0x00, 0, 1, 0x03, 0x03 }, - { 0x4A, 0x00, 0, 1, 0x02, 0x02 }, - { 0x4A, 0x00, 0, 1, 0x03, 0x03 }, - { 0x4A, 0x00, 0, 1, 0x02, 0x02 }, - { 0x4A, 0x00, 0, 1, 0x03, 0x03 }, - { 0x4A, 0x00, 0, 1, 0x03, 0x03 }, - { 0x4A, 0x00, 0, 1, 0x03, 0x03 }, - { 0x02, 0x01, 1, 1, 0x02, 0x02 }, - { 0x02, 0x01, 1, 1, 0x02, 0x02 }, - { 0x02, 0x01, 1, 1, 0x02, 0x02 }, - { 0x02, 0x01, 1, 1, 0x02, 0x02 }, - { 0x12, 0x00, 1, 0, 0x02, 0x02 }, - { 0x12, 0x00, 1, 0, 0x02, 0x02 }, - { 0x12, 0x00, 1, 0, 0x02, 0x02 }, - { 0x12, 0x00, 1, 0, 0x02, 0x02 }, - { 0x11, 0x00, 1, 0, 0x02, 0x02 }, - { 0x11, 0x00, 1, 0, 0x02, 0x02 }, - { 0x11, 0x00, 1, 0, 0x02, 0x02 }, - { 0x11, 0x00, 1, 0, 0x02, 0x02 }, - { 0x18, 0x00, 1, 1, 0x02, 0x02 }, - { 0x18, 0x00, 1, 1, 0x02, 0x02 }, - { 0x18, 0x00, 1, 1, 0x02, 0x02 }, - { 0x18, 0x00, 1, 1, 0x02, 0x02 }, - { 0x16, 0x00, 1, 1, 0x02, 0x02 }, - { 0x16, 0x00, 1, 1, 0x02, 0x02 }, - { 0x16, 0x00, 1, 1, 0x02, 0x02 }, - { 0x16, 0x00, 1, 1, 0x02, 0x02 }, - { 0x0A, 0x00, 0, 1, 0x02, 0x02 }, - { 0x0A, 0x00, 0, 1, 0x02, 0x02 }, - { 0x0A, 0x00, 0, 1, 0x02, 0x02 }, - { 0x0A, 0x00, 0, 1, 0x02, 0x02 }, - { 0x19, 0x00, 1, 1, 0x02, 0x02 }, - { 0x19, 0x00, 1, 1, 0x02, 0x02 }, - { 0x19, 0x00, 1, 1, 0x02, 0x02 }, - { 0x19, 0x00, 1, 1, 0x02, 0x02 }, - { 0x05, 0x01, 1, 1, 0x03, 0x02 }, - { 0x05, 0x01, 1, 1, 0x02, 0x02 }, - { 0x05, 0x01, 1, 1, 0x03, 0x02 }, - { 0x05, 0x01, 1, 1, 0x02, 0x02 }, - { 0x0A, 0x01, 1, 1, 0x02, 0x02 }, - { 0x0A, 0x01, 1, 1, 0x02, 0x02 }, - { 0x0A, 0x01, 1, 1, 0x02, 0x02 }, - { 0x0A, 0x01, 1, 1, 0x02, 0x02 }, - { 0x0A, 0x02, 0, 1, 0x02, 0x02 }, - { 0x0A, 0x02, 0, 1, 0x02, 0x02 }, - { 0x0A, 0x02, 0, 1, 0x02, 0x02 }, - { 0x0A, 0x02, 0, 1, 0x02, 0x02 }, - { 0x63, 0x05, 0, 1, 0x04, 0x02 }, - { 0x63, 0x05, 0, 1, 0x04, 0x02 }, - { 0x63, 0x05, 0, 1, 0x04, 0x02 }, - { 0x63, 0x05, 0, 1, 0x04, 0x02 }, - { 0x28, 0x00, 0, 1, 0x04, 0x04 }, - { 0x28, 0x00, 0, 1, 0x04, 0x04 }, - { 0x28, 0x00, 0, 1, 0x04, 0x04 }, - { 0x28, 0x00, 0, 1, 0x04, 0x04 }, - { 0x29, 0x00, 0, 1, 0x04, 0x04 }, - { 0x29, 0x00, 0, 1, 0x04, 0x04 }, - { 0x29, 0x00, 0, 1, 0x04, 0x04 }, - { 0x29, 0x00, 0, 1, 0x04, 0x04 }, - { 0x2B, 0x00, 0, 1, 0x04, 0x20 }, - { 0x2B, 0x00, 0, 1, 0x04, 0x20 }, - { 0x2B, 0x00, 0, 1, 0x04, 0x20 }, - { 0x2B, 0x00, 0, 1, 0x04, 0x20 }, - { 0x1A, 0x00, 1, 1, 0x02, 0x02 }, - { 0x1A, 0x00, 1, 1, 0x02, 0x02 }, - { 0x1A, 0x00, 1, 1, 0x02, 0x02 }, - { 0x1A, 0x00, 1, 1, 0x02, 0x02 }, - { 0x55, 0x09, 0, 0, 0x04, 0x04 }, - { 0x55, 0x09, 0, 0, 0x04, 0x04 }, - { 0x55, 0x09, 0, 0, 0x04, 0x04 }, - { 0x55, 0x09, 0, 0, 0x04, 0x04 }, - { 0x55, 0x0A, 0, 0, 0x04, 0x04 }, - { 0x55, 0x0A, 0, 0, 0x04, 0x04 }, - { 0x55, 0x0A, 0, 0, 0x04, 0x04 }, - { 0x55, 0x0A, 0, 0, 0x04, 0x04 }, - { 0x52, 0x09, 0, 1, 0x04, 0x04 }, - { 0x52, 0x09, 0, 1, 0x04, 0x04 }, - { 0x52, 0x09, 0, 1, 0x04, 0x04 }, - { 0x52, 0x09, 0, 1, 0x04, 0x04 }, - { 0x48, 0x00, 0, 1, 0x02, 0x26 }, - { 0x48, 0x00, 0, 1, 0x02, 0x26 }, - { 0x48, 0x00, 0, 1, 0x02, 0x26 }, - { 0x48, 0x00, 0, 1, 0x02, 0x26 }, - { 0x48, 0x01, 0, 1, 0x04, 0x20 }, - { 0x48, 0x01, 0, 1, 0x04, 0x20 }, - { 0x48, 0x01, 0, 1, 0x04, 0x20 }, - { 0x48, 0x01, 0, 1, 0x04, 0x20 }, - { 0x55, 0x0B, 0, 1, 0x04, 0x02 }, - { 0x55, 0x0B, 0, 1, 0x04, 0x02 }, - { 0x55, 0x0B, 0, 1, 0x04, 0x02 }, - { 0x55, 0x0B, 0, 1, 0x04, 0x02 }, - { 0x60, 0x04, 0, 1, 0x02, 0x02 }, - { 0x60, 0x04, 0, 1, 0x02, 0x02 }, - { 0x60, 0x04, 0, 1, 0x02, 0x02 }, - { 0x60, 0x04, 0, 1, 0x02, 0x02 }, - { 0x49, 0x00, 0, 1, 0x02, 0x20 }, - { 0x49, 0x00, 0, 1, 0x02, 0x20 }, - { 0x49, 0x00, 0, 1, 0x02, 0x20 }, - { 0x49, 0x00, 0, 1, 0x02, 0x20 }, - { 0x52, 0x0A, 0, 1, 0x04, 0x02 }, - { 0x52, 0x0A, 0, 1, 0x04, 0x02 }, - { 0x52, 0x0A, 0, 1, 0x04, 0x02 }, - { 0x52, 0x0A, 0, 1, 0x04, 0x02 }, - { 0x0D, 0x00, 0, 1, 0x04, 0x02 }, - { 0x0D, 0x00, 0, 1, 0x04, 0x02 }, - { 0x0D, 0x00, 0, 1, 0x04, 0x02 }, - { 0x0D, 0x00, 0, 1, 0x04, 0x02 }, - { 0x0D, 0x00, 0, 1, 0x04, 0x02 }, - { 0x0D, 0x00, 0, 1, 0x04, 0x02 }, - { 0x0D, 0x00, 0, 1, 0x04, 0x02 }, - { 0x0D, 0x00, 0, 1, 0x04, 0x02 }, - { 0x0D, 0x00, 0, 1, 0x04, 0x02 }, - { 0x0D, 0x00, 0, 1, 0x04, 0x02 }, - { 0x0D, 0x00, 0, 1, 0x04, 0x02 }, - { 0x23, 0x01, 0, 1, 0x04, 0x02 }, - { 0x24, 0x01, 0, 1, 0x04, 0x02 }, - { 0x25, 0x01, 0, 1, 0x04, 0x02 }, - { 0x25, 0x01, 0, 1, 0x04, 0x02 }, - { 0x51, 0x0F, 0, 1, 0x05, 0x05 }, - { 0x51, 0x0F, 0, 1, 0x04, 0x02 }, - { 0x51, 0x0F, 0, 1, 0x05, 0x05 }, - { 0x51, 0x0F, 0, 1, 0x04, 0x02 }, - { 0x60, 0x05, 0, 1, 0x04, 0x02 }, - { 0x60, 0x05, 0, 1, 0x04, 0x02 }, - { 0x60, 0x05, 0, 1, 0x04, 0x02 }, - { 0x60, 0x05, 0, 1, 0x04, 0x02 }, - { 0x5F, 0x04, 0, 1, 0x03, 0x03 }, - { 0x5F, 0x04, 0, 1, 0x02, 0x02 }, - { 0x64, 0x04, 0, 1, 0x02, 0x02 }, - { 0x64, 0x04, 0, 1, 0x02, 0x02 }, - { 0x61, 0x03, 0, 1, 0x02, 0x02 }, - { 0x61, 0x03, 0, 1, 0x02, 0x02 }, - { 0x61, 0x03, 0, 1, 0x02, 0x02 }, - { 0x61, 0x03, 0, 1, 0x02, 0x02 }, - { 0x0C, 0x00, 0, 1, 0x02, 0x02 }, - { 0x0C, 0x00, 0, 1, 0x02, 0x02 }, - { 0x0C, 0x00, 0, 1, 0x02, 0x02 }, - { 0x0C, 0x00, 0, 1, 0x02, 0x02 }, - { 0x0C, 0x01, 0, 1, 0x02, 0x02 }, - { 0x0C, 0x01, 0, 1, 0x02, 0x02 }, - { 0x0C, 0x01, 0, 1, 0x02, 0x02 }, - { 0x0C, 0x01, 0, 1, 0x02, 0x02 }, - { 0x0C, 0x02, 0, 1, 0x02, 0x02 }, - { 0x0C, 0x02, 0, 1, 0x02, 0x02 }, - { 0x0C, 0x02, 0, 1, 0x02, 0x02 }, - { 0x0C, 0x02, 0, 1, 0x02, 0x02 }, - { 0x0C, 0x03, 0, 1, 0x02, 0x02 }, - { 0x0C, 0x03, 0, 1, 0x02, 0x02 }, - { 0x0C, 0x03, 0, 1, 0x02, 0x02 }, - { 0x0C, 0x03, 0, 1, 0x02, 0x02 }, - { 0x0C, 0x04, 0, 1, 0x02, 0x02 }, - { 0x0C, 0x04, 0, 1, 0x02, 0x02 }, - { 0x0C, 0x04, 0, 1, 0x02, 0x02 }, - { 0x0C, 0x04, 0, 1, 0x02, 0x02 }, - { 0x0C, 0x05, 0, 1, 0x02, 0x02 }, - { 0x0C, 0x05, 0, 1, 0x02, 0x02 }, - { 0x0C, 0x05, 0, 1, 0x02, 0x02 }, - { 0x0C, 0x05, 0, 1, 0x02, 0x02 }, - { 0x0C, 0x06, 0, 1, 0x02, 0x02 }, - { 0x0C, 0x06, 0, 1, 0x02, 0x02 }, - { 0x0C, 0x06, 0, 1, 0x02, 0x02 }, - { 0x0C, 0x06, 0, 1, 0x02, 0x02 }, - { 0x0C, 0x07, 0, 1, 0x02, 0x02 }, - { 0x0C, 0x07, 0, 1, 0x02, 0x02 }, - { 0x0C, 0x07, 0, 1, 0x02, 0x02 }, - { 0x0C, 0x07, 0, 1, 0x02, 0x02 }, - { 0x0C, 0x08, 0, 1, 0x02, 0x02 }, - { 0x0C, 0x08, 0, 1, 0x02, 0x02 }, - { 0x0C, 0x08, 0, 1, 0x02, 0x02 }, - { 0x0C, 0x08, 0, 1, 0x02, 0x02 }, - { 0x0C, 0x09, 0, 1, 0x02, 0x02 }, - { 0x0C, 0x09, 0, 1, 0x02, 0x02 }, - { 0x0C, 0x09, 0, 1, 0x02, 0x02 }, - { 0x0C, 0x09, 0, 1, 0x02, 0x02 }, - { 0x0C, 0x0A, 0, 1, 0x02, 0x02 }, - { 0x0C, 0x0A, 0, 1, 0x02, 0x02 }, - { 0x0C, 0x0A, 0, 1, 0x02, 0x02 }, - { 0x0C, 0x0A, 0, 1, 0x02, 0x02 }, - { 0x0C, 0x0B, 0, 1, 0x02, 0x02 }, - { 0x0C, 0x0B, 0, 1, 0x02, 0x02 }, - { 0x0C, 0x0B, 0, 1, 0x02, 0x02 }, - { 0x0C, 0x0B, 0, 1, 0x02, 0x02 }, - { 0x0E, 0x07, 1, 1, 0x02, 0x02 }, - { 0x0E, 0x07, 1, 1, 0x02, 0x02 }, - { 0x0E, 0x07, 1, 1, 0x02, 0x02 }, - { 0x0E, 0x07, 1, 1, 0x02, 0x02 }, - { 0x1A, 0x01, 1, 1, 0x02, 0x02 }, - { 0x1A, 0x01, 1, 1, 0x02, 0x02 }, - { 0x1A, 0x01, 1, 1, 0x02, 0x02 }, - { 0x1A, 0x01, 1, 1, 0x02, 0x02 }, - { 0x3B, 0x01, 0, 1, 0x02, 0x02 }, - { 0x3B, 0x01, 0, 1, 0x02, 0x02 }, - { 0x3B, 0x01, 0, 1, 0x02, 0x02 }, - { 0x3B, 0x01, 0, 1, 0x02, 0x02 }, - { 0x3B, 0x02, 0, 1, 0x02, 0x02 }, - { 0x3B, 0x02, 0, 1, 0x02, 0x02 }, - { 0x3B, 0x02, 0, 1, 0x02, 0x02 }, - { 0x3B, 0x02, 0, 1, 0x02, 0x02 }, - { 0x5B, 0x04, 0, 1, 0x02, 0x02 }, - { 0x5B, 0x04, 0, 1, 0x02, 0x02 }, - { 0x5B, 0x04, 0, 1, 0x02, 0x02 }, - { 0x5B, 0x04, 0, 1, 0x02, 0x02 }, - { 0x63, 0x06, 0, 0, 0x02, 0x26 }, - { 0x63, 0x06, 0, 0, 0x02, 0x26 }, - { 0x63, 0x06, 0, 0, 0x02, 0x26 }, - { 0x63, 0x06, 0, 0, 0x02, 0x26 }, - { 0x63, 0x07, 0, 0, 0x2E, 0x2E }, - { 0x63, 0x07, 0, 0, 0x2E, 0x2E }, - { 0x63, 0x07, 0, 0, 0x2E, 0x2E }, - { 0x63, 0x07, 0, 0, 0x2E, 0x2E }, - { 0x5B, 0x05, 0, 1, 0x02, 0x02 }, - { 0x5B, 0x05, 0, 1, 0x02, 0x02 }, - { 0x5B, 0x05, 0, 1, 0x02, 0x02 }, - { 0x5B, 0x05, 0, 1, 0x02, 0x02 }, - { 0x5B, 0x06, 0, 1, 0x2C, 0x2C }, - { 0x5B, 0x06, 0, 1, 0x2C, 0x2C }, - { 0x5B, 0x06, 0, 1, 0x2C, 0x2C }, - { 0x5B, 0x06, 0, 1, 0x2C, 0x2C }, - { 0x5B, 0x07, 0, 1, 0x2C, 0x2C }, - { 0x5B, 0x07, 0, 1, 0x2C, 0x2C }, - { 0x5B, 0x07, 0, 1, 0x2C, 0x2C }, - { 0x5B, 0x07, 0, 1, 0x2C, 0x2C }, - { 0x5B, 0x08, 0, 0, 0x02, 0x02 }, - { 0x5B, 0x08, 0, 0, 0x02, 0x02 }, - { 0x5B, 0x08, 0, 0, 0x02, 0x02 }, - { 0x5B, 0x08, 0, 0, 0x02, 0x02 }, - { 0x62, 0x03, 0, 1, 0x2C, 0x2C }, - { 0x62, 0x03, 0, 1, 0x2C, 0x2C }, - { 0x62, 0x03, 0, 1, 0x2C, 0x2C }, - { 0x62, 0x03, 0, 1, 0x2C, 0x2C }, - { 0x57, 0x05, 0, 1, 0x02, 0x02 }, - { 0x57, 0x05, 0, 1, 0x02, 0x02 }, - { 0x57, 0x05, 0, 1, 0x02, 0x02 }, - { 0x57, 0x05, 0, 1, 0x02, 0x02 }, - { 0x07, 0x03, 0, 1, 0x02, 0x02 }, - { 0x07, 0x03, 0, 1, 0x02, 0x02 }, - { 0x07, 0x03, 0, 1, 0x02, 0x02 }, - { 0x07, 0x03, 0, 1, 0x02, 0x02 }, - { 0x52, 0x0B, 0, 1, 0x04, 0x02 }, - { 0x52, 0x0B, 0, 1, 0x04, 0x02 }, - { 0x52, 0x0B, 0, 1, 0x04, 0x02 }, - { 0x52, 0x0B, 0, 1, 0x04, 0x02 }, - { 0x3B, 0x03, 0, 1, 0x02, 0x02 }, - { 0x3B, 0x03, 0, 1, 0x02, 0x02 }, - { 0x3B, 0x03, 0, 1, 0x02, 0x02 }, - { 0x3B, 0x03, 0, 1, 0x02, 0x02 }, - { 0x61, 0x04, 0, 1, 0x02, 0x02 }, - { 0x61, 0x04, 0, 1, 0x02, 0x02 }, - { 0x61, 0x04, 0, 1, 0x02, 0x02 }, - { 0x61, 0x04, 0, 1, 0x02, 0x02 }, - { 0x5F, 0x03, 0, 1, 0x03, 0x03 }, - { 0x5F, 0x03, 0, 1, 0x02, 0x02 }, - { 0x64, 0x03, 0, 1, 0x02, 0x02 }, - { 0x64, 0x03, 0, 1, 0x02, 0x02 }, - { 0x5F, 0x03, 0, 1, 0x00, 0x00 }, - { 0x52, 0x0C, 0, 1, 0x04, 0x02 }, - { 0x52, 0x0C, 0, 1, 0x04, 0x02 }, - { 0x52, 0x0C, 0, 1, 0x04, 0x02 }, - { 0x52, 0x0C, 0, 1, 0x04, 0x02 }, - { 0x48, 0x02, 1, 1, 0x04, 0x20 }, - { 0x48, 0x02, 1, 1, 0x04, 0x20 }, - { 0x48, 0x02, 1, 1, 0x04, 0x20 }, - { 0x48, 0x02, 1, 1, 0x04, 0x20 }, - { 0x4B, 0x00, 0, 1, 0x04, 0x20 }, - { 0x4B, 0x00, 0, 1, 0x04, 0x20 }, - { 0x4B, 0x00, 0, 1, 0x04, 0x20 }, - { 0x4B, 0x00, 0, 1, 0x04, 0x20 }, - { 0x53, 0x06, 0, 1, 0x03, 0x03 }, - { 0x53, 0x06, 0, 1, 0x03, 0x03 }, - { 0x53, 0x06, 0, 1, 0x03, 0x03 }, - { 0x53, 0x06, 0, 1, 0x03, 0x03 }, - { 0x51, 0x10, 0, 1, 0x0B, 0x0B }, - { 0x51, 0x10, 0, 1, 0x0B, 0x0B }, - { 0x51, 0x10, 0, 1, 0x0B, 0x0B }, - { 0x51, 0x10, 0, 1, 0x0B, 0x0B }, - { 0x52, 0x0D, 0, 1, 0x03, 0x03 }, - { 0x52, 0x0D, 0, 1, 0x02, 0x02 }, - { 0x52, 0x0D, 0, 1, 0x03, 0x03 }, - { 0x52, 0x0D, 0, 1, 0x02, 0x02 }, - { 0x4F, 0x00, 0, 1, 0x03, 0x03 }, - { 0x4F, 0x00, 0, 1, 0x03, 0x03 }, - { 0x4F, 0x00, 0, 1, 0x03, 0x03 }, - { 0x4F, 0x00, 0, 1, 0x03, 0x03 }, - { 0x4F, 0x00, 0, 1, 0x03, 0x03 }, - { 0x1A, 0x06, 1, 1, 0x02, 0x02 }, - { 0x1A, 0x06, 1, 1, 0x02, 0x02 }, - { 0x1A, 0x06, 1, 1, 0x02, 0x02 }, - { 0x1A, 0x06, 1, 1, 0x02, 0x02 }, - { 0x66, 0x00, 0, 1, 0x02, 0x02 }, - { 0x66, 0x00, 0, 1, 0x02, 0x02 }, - { 0x66, 0x00, 0, 1, 0x02, 0x02 }, - { 0x66, 0x00, 0, 1, 0x02, 0x02 }, - { 0x1A, 0x07, 1, 1, 0x02, 0x02 }, - { 0x1A, 0x07, 1, 1, 0x02, 0x02 }, - { 0x1A, 0x07, 1, 1, 0x02, 0x02 }, - { 0x1A, 0x07, 1, 1, 0x02, 0x02 }, - { 0x32, 0x01, 0, 1, 0x02, 0x02 }, - { 0x32, 0x01, 0, 1, 0x02, 0x02 }, - { 0x32, 0x01, 0, 1, 0x02, 0x02 }, - { 0x32, 0x01, 0, 1, 0x02, 0x02 }, - { 0x2C, 0x01, 0, 1, 0x04, 0x20 }, - { 0x2C, 0x01, 0, 1, 0x04, 0x20 }, - { 0x2C, 0x01, 0, 1, 0x04, 0x20 }, - { 0x2C, 0x01, 0, 1, 0x04, 0x20 }, - { 0x33, 0x00, 0, 1, 0x04, 0x20 }, - { 0x33, 0x00, 0, 1, 0x04, 0x20 }, - { 0x33, 0x00, 0, 1, 0x04, 0x20 }, - { 0x33, 0x00, 0, 1, 0x04, 0x20 }, - { 0x0D, 0x01, 0, 0, 0x04, 0x02 }, - { 0x0D, 0x01, 0, 0, 0x04, 0x02 }, - { 0x0D, 0x01, 0, 0, 0x04, 0x02 }, - { 0x0D, 0x01, 0, 0, 0x04, 0x02 }, - { 0x0D, 0x02, 0, 1, 0x04, 0x02 }, - { 0x0D, 0x02, 0, 1, 0x04, 0x02 }, - { 0x0D, 0x02, 0, 1, 0x04, 0x02 }, - { 0x0D, 0x02, 0, 1, 0x04, 0x02 }, - { 0x0D, 0x03, 0, 1, 0x04, 0x02 }, - { 0x0D, 0x03, 0, 1, 0x04, 0x02 }, - { 0x0D, 0x03, 0, 1, 0x04, 0x02 }, - { 0x0D, 0x03, 0, 1, 0x04, 0x02 }, - { 0x0D, 0x04, 0, 1, 0x04, 0x02 }, - { 0x0D, 0x04, 0, 1, 0x04, 0x02 }, - { 0x0D, 0x04, 0, 1, 0x04, 0x02 }, - { 0x0D, 0x04, 0, 1, 0x04, 0x02 }, - { 0x0D, 0x05, 0, 1, 0x04, 0x02 }, - { 0x0D, 0x05, 0, 1, 0x04, 0x02 }, - { 0x0D, 0x05, 0, 1, 0x04, 0x02 }, - { 0x0D, 0x05, 0, 1, 0x04, 0x02 }, - { 0x0D, 0x06, 0, 1, 0x04, 0x02 }, - { 0x0D, 0x06, 0, 1, 0x04, 0x02 }, - { 0x0D, 0x06, 0, 1, 0x04, 0x02 }, - { 0x0D, 0x06, 0, 1, 0x04, 0x02 }, - { 0x0D, 0x07, 0, 1, 0x04, 0x02 }, - { 0x0D, 0x07, 0, 1, 0x04, 0x02 }, - { 0x0D, 0x07, 0, 1, 0x04, 0x02 }, - { 0x0D, 0x07, 0, 1, 0x04, 0x02 }, - { 0x50, 0x00, 0, 1, 0x04, 0x20 }, - { 0x50, 0x00, 0, 1, 0x04, 0x20 }, - { 0x50, 0x00, 0, 1, 0x04, 0x20 }, - { 0x50, 0x00, 0, 1, 0x04, 0x20 }, - { 0x52, 0x0E, 0, 1, 0x03, 0x03 }, - { 0x52, 0x0E, 0, 1, 0x02, 0x02 }, - { 0x52, 0x0E, 0, 1, 0x03, 0x03 }, - { 0x52, 0x0E, 0, 1, 0x02, 0x02 }, - { 0x63, 0x08, 0, 0, 0x20, 0x20 }, - { 0x63, 0x08, 0, 0, 0x20, 0x20 }, - { 0x63, 0x08, 0, 0, 0x20, 0x20 }, - { 0x63, 0x08, 0, 0, 0x20, 0x20 }, - { 0x63, 0x09, 0, 0, 0x02, 0x02 }, - { 0x63, 0x09, 0, 0, 0x02, 0x02 }, - { 0x63, 0x09, 0, 0, 0x02, 0x02 }, - { 0x63, 0x09, 0, 0, 0x02, 0x02 }, - { 0x57, 0x07, 0, 1, 0x2C, 0x2C }, - { 0x57, 0x07, 0, 1, 0x2C, 0x2C }, - { 0x57, 0x07, 0, 1, 0x2C, 0x2C }, - { 0x57, 0x07, 0, 1, 0x2C, 0x2C }, - { 0x61, 0x05, 0, 1, 0x02, 0x02 }, - { 0x61, 0x05, 0, 1, 0x02, 0x02 }, - { 0x61, 0x05, 0, 1, 0x02, 0x02 }, - { 0x61, 0x05, 0, 1, 0x02, 0x02 }, - { 0x53, 0x07, 0, 1, 0x03, 0x03 }, - { 0x53, 0x07, 0, 1, 0x03, 0x03 }, - { 0x53, 0x07, 0, 1, 0x03, 0x03 }, - { 0x53, 0x07, 0, 1, 0x03, 0x03 }, - { 0x0F, 0x00, 1, 1, 0x02, 0x02 }, - { 0x0F, 0x00, 1, 1, 0x02, 0x02 }, - { 0x0F, 0x00, 1, 1, 0x02, 0x02 }, - { 0x0F, 0x00, 1, 1, 0x02, 0x02 }, - { 0x0C, 0x0C, 0, 1, 0x02, 0x02 }, - { 0x0C, 0x0C, 0, 1, 0x02, 0x02 }, - { 0x0C, 0x0C, 0, 1, 0x02, 0x02 }, - { 0x0C, 0x0C, 0, 1, 0x02, 0x02 }, - { 0x41, 0x01, 0, 1, 0x02, 0x02 }, - { 0x41, 0x01, 0, 1, 0x02, 0x02 }, - { 0x41, 0x01, 0, 1, 0x02, 0x02 }, - { 0x41, 0x01, 0, 1, 0x02, 0x02 }, - { 0x3D, 0x01, 0, 1, 0x04, 0x04 }, - { 0x3D, 0x01, 0, 1, 0x04, 0x04 }, - { 0x3D, 0x01, 0, 1, 0x04, 0x04 }, - { 0x3D, 0x01, 0, 1, 0x04, 0x04 }, - { 0x5C, 0x07, 0, 1, 0x03, 0x03 }, - { 0x5C, 0x07, 0, 1, 0x02, 0x02 }, - { 0x5C, 0x07, 0, 1, 0x03, 0x03 }, - { 0x5C, 0x07, 0, 1, 0x02, 0x02 }, - { 0x53, 0x08, 0, 1, 0x03, 0x03 }, - { 0x53, 0x08, 0, 1, 0x03, 0x03 }, - { 0x53, 0x08, 0, 1, 0x03, 0x03 }, - { 0x53, 0x08, 0, 1, 0x03, 0x03 }, - { 0x03, 0x02, 0, 1, 0x02, 0x02 }, - { 0x03, 0x02, 0, 1, 0x02, 0x02 }, - { 0x03, 0x02, 0, 1, 0x02, 0x02 }, - { 0x03, 0x02, 0, 1, 0x02, 0x02 }, - { 0x3D, 0x02, 0, 1, 0x02, 0x02 }, - { 0x3D, 0x02, 0, 1, 0x02, 0x02 }, - { 0x3D, 0x02, 0, 1, 0x02, 0x02 }, - { 0x3D, 0x02, 0, 1, 0x02, 0x02 }, - { 0x43, 0x05, 0, 1, 0x02, 0x02 }, - { 0x43, 0x05, 0, 1, 0x02, 0x02 }, - { 0x43, 0x05, 0, 1, 0x02, 0x02 }, - { 0x43, 0x05, 0, 1, 0x02, 0x02 }, - { 0x43, 0x06, 0, 1, 0x02, 0x02 }, - { 0x43, 0x06, 0, 1, 0x02, 0x02 }, - { 0x43, 0x06, 0, 1, 0x02, 0x02 }, - { 0x43, 0x06, 0, 1, 0x02, 0x02 }, - { 0x51, 0x11, 0, 1, 0x03, 0x03 }, - { 0x51, 0x11, 0, 1, 0x02, 0x02 }, - { 0x51, 0x11, 0, 1, 0x03, 0x03 }, - { 0x51, 0x11, 0, 1, 0x02, 0x02 }, - { 0x3E, 0x01, 0, 1, 0x02, 0x02 }, - { 0x3E, 0x01, 0, 1, 0x02, 0x02 }, - { 0x3E, 0x01, 0, 1, 0x02, 0x02 }, - { 0x3E, 0x01, 0, 1, 0x02, 0x02 }, - { 0x3E, 0x02, 0, 1, 0x02, 0x02 }, - { 0x3E, 0x02, 0, 1, 0x02, 0x02 }, - { 0x3E, 0x02, 0, 1, 0x02, 0x02 }, - { 0x3E, 0x02, 0, 1, 0x02, 0x02 }, - { 0x3E, 0x03, 0, 1, 0x02, 0x02 }, - { 0x3E, 0x03, 0, 1, 0x02, 0x02 }, - { 0x3E, 0x03, 0, 1, 0x02, 0x02 }, - { 0x3E, 0x03, 0, 1, 0x02, 0x02 }, - { 0x3E, 0x04, 0, 1, 0x02, 0x02 }, - { 0x3E, 0x04, 0, 1, 0x02, 0x02 }, - { 0x3E, 0x04, 0, 1, 0x02, 0x02 }, - { 0x3E, 0x04, 0, 1, 0x02, 0x02 }, - { 0x3E, 0x05, 0, 1, 0x02, 0x03 }, - { 0x3E, 0x05, 0, 1, 0x02, 0x03 }, - { 0x3E, 0x05, 0, 1, 0x02, 0x03 }, - { 0x3E, 0x05, 0, 1, 0x02, 0x03 }, - { 0x3E, 0x06, 0, 1, 0x02, 0x02 }, - { 0x3E, 0x06, 0, 1, 0x02, 0x02 }, - { 0x3E, 0x06, 0, 1, 0x02, 0x02 }, - { 0x3E, 0x06, 0, 1, 0x02, 0x02 }, - { 0x3E, 0x07, 0, 1, 0x02, 0x02 }, - { 0x3E, 0x07, 0, 1, 0x02, 0x02 }, - { 0x3E, 0x07, 0, 1, 0x02, 0x02 }, - { 0x3E, 0x07, 0, 1, 0x02, 0x02 }, - { 0x3E, 0x08, 0, 1, 0x02, 0x02 }, - { 0x3E, 0x08, 0, 1, 0x02, 0x02 }, - { 0x3E, 0x08, 0, 1, 0x02, 0x02 }, - { 0x3E, 0x08, 0, 1, 0x02, 0x02 }, - { 0x3E, 0x09, 0, 1, 0x02, 0x02 }, - { 0x3E, 0x09, 0, 1, 0x02, 0x02 }, - { 0x3E, 0x09, 0, 1, 0x02, 0x02 }, - { 0x3E, 0x09, 0, 1, 0x02, 0x02 }, - { 0x3E, 0x0A, 0, 1, 0x02, 0x02 }, - { 0x3E, 0x0A, 0, 1, 0x02, 0x02 }, - { 0x3E, 0x0A, 0, 1, 0x02, 0x02 }, - { 0x3E, 0x0A, 0, 1, 0x02, 0x02 }, - { 0x3E, 0x0B, 0, 1, 0x02, 0x02 }, - { 0x3E, 0x0B, 0, 1, 0x02, 0x02 }, - { 0x3E, 0x0B, 0, 1, 0x02, 0x02 }, - { 0x3E, 0x0B, 0, 1, 0x02, 0x02 }, - { 0x3E, 0x0C, 0, 1, 0x02, 0x02 }, - { 0x3E, 0x0C, 0, 1, 0x02, 0x02 }, - { 0x3E, 0x0C, 0, 1, 0x02, 0x02 }, - { 0x3E, 0x0C, 0, 1, 0x02, 0x02 }, - { 0x37, 0x01, 0, 1, 0x04, 0x20 }, - { 0x37, 0x01, 0, 1, 0x04, 0x20 }, - { 0x37, 0x01, 0, 1, 0x04, 0x20 }, - { 0x37, 0x01, 0, 1, 0x04, 0x20 }, - { 0x08, 0x01, 0, 1, 0x04, 0x04 }, - { 0x08, 0x01, 0, 1, 0x04, 0x04 }, - { 0x08, 0x01, 0, 1, 0x04, 0x04 }, - { 0x08, 0x01, 0, 1, 0x04, 0x04 }, - { 0x4C, 0x01, 0, 1, 0x04, 0x20 }, - { 0x4C, 0x01, 0, 1, 0x04, 0x20 }, - { 0x4C, 0x01, 0, 1, 0x04, 0x20 }, - { 0x4C, 0x01, 0, 1, 0x04, 0x20 }, - { 0x63, 0x0A, 0, 1, 0x04, 0x02 }, - { 0x63, 0x0A, 0, 1, 0x04, 0x02 }, - { 0x63, 0x0A, 0, 1, 0x04, 0x02 }, - { 0x63, 0x0A, 0, 1, 0x04, 0x02 }, - { 0x09, 0x01, 0, 1, 0x02, 0x02 }, - { 0x09, 0x01, 0, 1, 0x02, 0x02 }, - { 0x09, 0x01, 0, 1, 0x02, 0x02 }, - { 0x09, 0x01, 0, 1, 0x02, 0x02 }, - { 0x52, 0x0F, 0, 1, 0x03, 0x03 }, - { 0x52, 0x0F, 0, 1, 0x02, 0x02 }, - { 0x52, 0x0F, 0, 1, 0x03, 0x03 }, - { 0x52, 0x0F, 0, 1, 0x02, 0x02 }, - { 0x5B, 0x09, 0, 0, 0x02, 0x02 }, - { 0x5B, 0x09, 0, 0, 0x02, 0x02 }, - { 0x5B, 0x09, 0, 0, 0x02, 0x02 }, - { 0x5B, 0x09, 0, 0, 0x02, 0x02 }, - { 0x4C, 0x02, 0, 1, 0x04, 0x20 }, - { 0x4C, 0x02, 0, 1, 0x04, 0x20 }, - { 0x4C, 0x02, 0, 1, 0x04, 0x20 }, - { 0x4C, 0x02, 0, 1, 0x04, 0x20 }, - { 0x55, 0x0C, 0, 1, 0x04, 0x02 }, - { 0x55, 0x0C, 0, 1, 0x04, 0x02 }, - { 0x55, 0x0C, 0, 1, 0x04, 0x02 }, - { 0x55, 0x0C, 0, 1, 0x04, 0x02 }, - { 0x17, 0x02, 1, 1, 0x02, 0x02 }, - { 0x17, 0x02, 1, 1, 0x02, 0x02 }, - { 0x17, 0x02, 1, 1, 0x02, 0x02 }, - { 0x17, 0x02, 1, 1, 0x02, 0x02 }, - { 0x4A, 0x01, 0, 0, 0x03, 0x03 }, - { 0x4A, 0x01, 0, 0, 0x02, 0x02 }, - { 0x4A, 0x01, 0, 0, 0x03, 0x03 }, - { 0x4A, 0x01, 0, 0, 0x02, 0x02 }, - { 0x43, 0x07, 0, 1, 0x02, 0x02 }, - { 0x43, 0x07, 0, 1, 0x02, 0x02 }, - { 0x43, 0x07, 0, 1, 0x02, 0x02 }, - { 0x43, 0x07, 0, 1, 0x02, 0x02 }, - { 0x5D, 0x12, 0, 1, 0x02, 0x02 }, - { 0x5D, 0x12, 0, 1, 0x02, 0x02 }, - { 0x5D, 0x12, 0, 1, 0x02, 0x02 }, - { 0x5D, 0x12, 0, 1, 0x02, 0x02 }, - { 0x3E, 0x0D, 0, 1, 0x02, 0x02 }, - { 0x3E, 0x0D, 0, 1, 0x02, 0x02 }, - { 0x3E, 0x0D, 0, 1, 0x02, 0x02 }, - { 0x3E, 0x0D, 0, 1, 0x02, 0x02 }, - { 0x56, 0x02, 0, 1, 0x12, 0x12 }, - { 0x56, 0x02, 0, 1, 0x02, 0x02 }, - { 0x56, 0x02, 0, 1, 0x12, 0x12 }, - { 0x56, 0x02, 0, 1, 0x02, 0x02 }, - { 0x57, 0x08, 0, 1, 0x02, 0x02 }, - { 0x57, 0x08, 0, 1, 0x02, 0x02 }, - { 0x57, 0x08, 0, 1, 0x02, 0x02 }, - { 0x57, 0x08, 0, 1, 0x02, 0x02 }, - { 0x56, 0x03, 0, 1, 0x03, 0x03 }, - { 0x56, 0x03, 0, 1, 0x03, 0x03 }, - { 0x56, 0x03, 0, 1, 0x03, 0x03 }, - { 0x56, 0x03, 0, 1, 0x03, 0x03 }, - { 0x57, 0x09, 0, 1, 0x03, 0x03 }, - { 0x57, 0x09, 0, 1, 0x03, 0x03 }, - { 0x57, 0x09, 0, 1, 0x03, 0x03 }, - { 0x57, 0x09, 0, 1, 0x03, 0x03 }, - { 0x5C, 0x08, 0, 1, 0x03, 0x03 }, - { 0x5C, 0x08, 0, 1, 0x03, 0x03 }, - { 0x5C, 0x08, 0, 1, 0x03, 0x03 }, - { 0x5C, 0x08, 0, 1, 0x03, 0x03 }, +EntranceInfo gEntranceTable[] = { + { 0x00, 0x00, 0, 1, 0x02, 0x02 }, { 0x00, 0x00, 0, 1, 0x02, 0x02 }, { 0x00, 0x00, 0, 1, 0x02, 0x02 }, + { 0x00, 0x00, 0, 1, 0x02, 0x02 }, { 0x01, 0x00, 0, 1, 0x02, 0x02 }, { 0x01, 0x00, 0, 1, 0x02, 0x02 }, + { 0x01, 0x00, 0, 1, 0x02, 0x02 }, { 0x01, 0x00, 0, 1, 0x02, 0x02 }, { 0x0B, 0x00, 0, 1, 0x02, 0x02 }, + { 0x0B, 0x00, 0, 1, 0x02, 0x02 }, { 0x0B, 0x00, 0, 1, 0x02, 0x02 }, { 0x0B, 0x00, 0, 1, 0x02, 0x02 }, + { 0x14, 0x00, 1, 1, 0x02, 0x02 }, { 0x14, 0x00, 1, 1, 0x02, 0x02 }, { 0x14, 0x00, 1, 1, 0x02, 0x02 }, + { 0x14, 0x00, 1, 1, 0x02, 0x02 }, { 0x05, 0x00, 0, 1, 0x02, 0x02 }, { 0x05, 0x00, 0, 1, 0x02, 0x02 }, + { 0x05, 0x00, 0, 1, 0x02, 0x02 }, { 0x05, 0x00, 0, 1, 0x02, 0x02 }, { 0x6E, 0x00, 0, 1, 0x02, 0x02 }, + { 0x6E, 0x00, 0, 1, 0x02, 0x02 }, { 0x6E, 0x00, 0, 1, 0x02, 0x02 }, { 0x6E, 0x00, 0, 1, 0x02, 0x02 }, + { 0x6C, 0x00, 0, 1, 0x02, 0x02 }, { 0x6C, 0x00, 0, 1, 0x02, 0x02 }, { 0x6C, 0x00, 0, 1, 0x02, 0x02 }, + { 0x6C, 0x00, 0, 1, 0x02, 0x02 }, { 0x68, 0x00, 0, 1, 0x02, 0x02 }, { 0x68, 0x00, 0, 1, 0x02, 0x02 }, + { 0x68, 0x00, 0, 1, 0x02, 0x02 }, { 0x68, 0x00, 0, 1, 0x02, 0x02 }, { 0x69, 0x00, 0, 1, 0x02, 0x02 }, + { 0x69, 0x00, 0, 1, 0x02, 0x02 }, { 0x69, 0x00, 0, 1, 0x02, 0x02 }, { 0x69, 0x00, 0, 1, 0x02, 0x02 }, + { 0x6D, 0x00, 0, 1, 0x02, 0x02 }, { 0x6D, 0x00, 0, 1, 0x02, 0x02 }, { 0x6D, 0x00, 0, 1, 0x02, 0x02 }, + { 0x6D, 0x00, 0, 1, 0x02, 0x02 }, { 0x02, 0x00, 0, 1, 0x02, 0x02 }, { 0x02, 0x00, 0, 1, 0x02, 0x02 }, + { 0x02, 0x00, 0, 1, 0x02, 0x02 }, { 0x02, 0x00, 0, 1, 0x02, 0x02 }, { 0x02, 0x00, 0, 1, 0x02, 0x02 }, + { 0x41, 0x00, 0, 1, 0x02, 0x26 }, { 0x41, 0x00, 0, 1, 0x02, 0x26 }, { 0x41, 0x00, 0, 1, 0x02, 0x26 }, + { 0x41, 0x00, 0, 1, 0x02, 0x26 }, { 0x41, 0x00, 0, 1, 0x02, 0x02 }, { 0x41, 0x00, 0, 1, 0x02, 0x02 }, + { 0x1B, 0x00, 1, 1, 0x03, 0x03 }, { 0x1C, 0x00, 1, 1, 0x02, 0x02 }, { 0x1D, 0x00, 1, 1, 0x03, 0x03 }, + { 0x1D, 0x00, 1, 1, 0x02, 0x02 }, { 0x07, 0x00, 0, 1, 0x02, 0x02 }, { 0x07, 0x00, 0, 1, 0x02, 0x02 }, + { 0x07, 0x00, 0, 1, 0x02, 0x02 }, { 0x07, 0x00, 0, 1, 0x02, 0x02 }, { 0x42, 0x00, 0, 1, 0x04, 0x20 }, + { 0x42, 0x00, 0, 1, 0x04, 0x20 }, { 0x42, 0x00, 0, 1, 0x04, 0x20 }, { 0x42, 0x00, 0, 1, 0x04, 0x20 }, + { 0x3E, 0x00, 0, 1, 0x02, 0x02 }, { 0x3E, 0x00, 0, 1, 0x02, 0x02 }, { 0x3E, 0x00, 0, 1, 0x02, 0x02 }, + { 0x3E, 0x00, 0, 1, 0x02, 0x02 }, { 0x38, 0x00, 0, 1, 0x04, 0x20 }, { 0x38, 0x00, 0, 1, 0x04, 0x20 }, + { 0x38, 0x00, 0, 1, 0x04, 0x20 }, { 0x38, 0x00, 0, 1, 0x04, 0x20 }, { 0x6A, 0x00, 0, 1, 0x02, 0x02 }, + { 0x6A, 0x00, 0, 1, 0x02, 0x02 }, { 0x6A, 0x00, 0, 1, 0x02, 0x02 }, { 0x6A, 0x00, 0, 1, 0x02, 0x02 }, + { 0x40, 0x00, 0, 1, 0x02, 0x26 }, { 0x40, 0x00, 0, 1, 0x02, 0x26 }, { 0x40, 0x00, 0, 1, 0x02, 0x26 }, + { 0x40, 0x00, 0, 1, 0x02, 0x26 }, { 0x4C, 0x00, 0, 1, 0x04, 0x20 }, { 0x4C, 0x00, 0, 1, 0x04, 0x20 }, + { 0x4C, 0x00, 0, 1, 0x04, 0x20 }, { 0x4C, 0x00, 0, 1, 0x04, 0x20 }, { 0x43, 0x00, 0, 1, 0x02, 0x02 }, + { 0x43, 0x00, 0, 1, 0x02, 0x02 }, { 0x43, 0x00, 0, 1, 0x02, 0x02 }, { 0x43, 0x00, 0, 1, 0x02, 0x02 }, + { 0x43, 0x00, 0, 1, 0x02, 0x02 }, { 0x43, 0x00, 0, 1, 0x02, 0x02 }, { 0x43, 0x00, 0, 1, 0x02, 0x02 }, + { 0x43, 0x00, 0, 1, 0x02, 0x02 }, { 0x43, 0x00, 0, 1, 0x02, 0x02 }, { 0x43, 0x00, 0, 1, 0x02, 0x02 }, + { 0x43, 0x00, 0, 1, 0x02, 0x02 }, { 0x43, 0x00, 0, 1, 0x0B, 0x0B }, { 0x43, 0x00, 0, 1, 0x02, 0x02 }, + { 0x43, 0x00, 0, 1, 0x02, 0x02 }, { 0x43, 0x00, 0, 1, 0x02, 0x02 }, { 0x43, 0x00, 0, 1, 0x02, 0x02 }, + { 0x10, 0x00, 0, 1, 0x04, 0x20 }, { 0x10, 0x00, 0, 1, 0x04, 0x20 }, { 0x10, 0x00, 0, 1, 0x04, 0x20 }, + { 0x10, 0x00, 0, 1, 0x04, 0x20 }, { 0x1E, 0x03, 1, 1, 0x03, 0x03 }, { 0x1F, 0x03, 1, 1, 0x02, 0x02 }, + { 0x1E, 0x03, 1, 1, 0x02, 0x02 }, { 0x1F, 0x03, 1, 1, 0x02, 0x02 }, { 0x44, 0x00, 0, 1, 0x07, 0x07 }, + { 0x44, 0x00, 0, 1, 0x07, 0x07 }, { 0x44, 0x00, 0, 1, 0x07, 0x07 }, { 0x44, 0x00, 0, 1, 0x07, 0x07 }, + { 0x44, 0x00, 0, 1, 0x0D, 0x02 }, { 0x44, 0x00, 0, 1, 0x0D, 0x02 }, { 0x44, 0x00, 0, 1, 0x03, 0x03 }, + { 0x4E, 0x00, 0, 1, 0x04, 0x20 }, { 0x4E, 0x00, 0, 1, 0x04, 0x20 }, { 0x4E, 0x00, 0, 1, 0x04, 0x20 }, + { 0x4E, 0x00, 0, 1, 0x04, 0x20 }, { 0x6B, 0x00, 0, 1, 0x22, 0x22 }, { 0x6B, 0x00, 0, 1, 0x22, 0x22 }, + { 0x6B, 0x00, 0, 1, 0x22, 0x22 }, { 0x6B, 0x00, 0, 1, 0x22, 0x22 }, { 0x45, 0x00, 0, 1, 0x22, 0x04 }, + { 0x46, 0x00, 0, 1, 0x22, 0x04 }, { 0x45, 0x00, 0, 1, 0x22, 0x04 }, { 0x46, 0x00, 0, 1, 0x22, 0x04 }, + { 0x4D, 0x00, 0, 1, 0x02, 0x02 }, { 0x4D, 0x00, 0, 1, 0x02, 0x02 }, { 0x4D, 0x00, 0, 1, 0x02, 0x02 }, + { 0x4D, 0x00, 0, 1, 0x02, 0x02 }, { 0x06, 0x00, 0, 1, 0x02, 0x02 }, { 0x06, 0x00, 0, 1, 0x02, 0x02 }, + { 0x06, 0x00, 0, 1, 0x02, 0x02 }, { 0x06, 0x00, 0, 1, 0x02, 0x02 }, { 0x06, 0x00, 0, 1, 0x02, 0x02 }, + { 0x06, 0x00, 0, 1, 0x02, 0x02 }, { 0x09, 0x00, 0, 1, 0x02, 0x02 }, { 0x09, 0x00, 0, 1, 0x02, 0x02 }, + { 0x09, 0x00, 0, 1, 0x02, 0x02 }, { 0x09, 0x00, 0, 1, 0x02, 0x02 }, { 0x09, 0x00, 0, 1, 0x02, 0x02 }, + { 0x17, 0x00, 1, 1, 0x02, 0x02 }, { 0x17, 0x00, 1, 1, 0x02, 0x02 }, { 0x17, 0x00, 1, 1, 0x02, 0x02 }, + { 0x17, 0x00, 1, 1, 0x02, 0x02 }, { 0x17, 0x00, 0, 1, 0x02, 0x02 }, { 0x17, 0x00, 0, 1, 0x02, 0x02 }, + { 0x17, 0x00, 0, 1, 0x02, 0x02 }, { 0x65, 0x00, 0, 1, 0x02, 0x02 }, { 0x65, 0x00, 0, 1, 0x02, 0x02 }, + { 0x65, 0x00, 0, 1, 0x02, 0x02 }, { 0x65, 0x00, 0, 1, 0x02, 0x02 }, { 0x08, 0x00, 0, 1, 0x04, 0x04 }, + { 0x08, 0x00, 0, 1, 0x04, 0x04 }, { 0x08, 0x00, 0, 1, 0x04, 0x04 }, { 0x08, 0x00, 0, 1, 0x04, 0x04 }, + { 0x27, 0x00, 0, 1, 0x04, 0x04 }, { 0x27, 0x00, 0, 1, 0x04, 0x04 }, { 0x27, 0x00, 0, 1, 0x04, 0x04 }, + { 0x27, 0x00, 0, 1, 0x04, 0x04 }, { 0x47, 0x00, 0, 1, 0x03, 0x03 }, { 0x47, 0x00, 0, 1, 0x03, 0x03 }, + { 0x47, 0x00, 0, 1, 0x03, 0x03 }, { 0x47, 0x00, 0, 1, 0x03, 0x03 }, { 0x47, 0x00, 0, 1, 0x0A, 0x0A }, + { 0x47, 0x00, 0, 1, 0x02, 0x0A }, { 0x47, 0x00, 1, 1, 0x0A, 0x0A }, { 0x47, 0x00, 0, 1, 0x0B, 0x0B }, + { 0x47, 0x00, 0, 1, 0x03, 0x03 }, { 0x47, 0x00, 0, 1, 0x02, 0x02 }, { 0x47, 0x00, 0, 1, 0x02, 0x02 }, + { 0x47, 0x00, 0, 1, 0x03, 0x03 }, { 0x47, 0x00, 0, 1, 0x03, 0x03 }, { 0x1E, 0x00, 1, 1, 0x03, 0x03 }, + { 0x1F, 0x00, 1, 1, 0x02, 0x02 }, { 0x1E, 0x00, 1, 1, 0x02, 0x02 }, { 0x1F, 0x00, 1, 1, 0x02, 0x02 }, + { 0x20, 0x00, 1, 1, 0x03, 0x03 }, { 0x21, 0x00, 1, 1, 0x02, 0x02 }, { 0x22, 0x00, 1, 1, 0x02, 0x02 }, + { 0x22, 0x00, 1, 1, 0x02, 0x02 }, { 0x20, 0x00, 0, 1, 0x08, 0x08 }, { 0x67, 0x00, 0, 1, 0x02, 0x02 }, + { 0x2C, 0x00, 0, 1, 0x04, 0x20 }, { 0x2C, 0x00, 0, 1, 0x04, 0x20 }, { 0x2C, 0x00, 0, 1, 0x04, 0x20 }, + { 0x2C, 0x00, 0, 1, 0x04, 0x20 }, { 0x34, 0x00, 0, 1, 0x04, 0x04 }, { 0x34, 0x00, 0, 1, 0x04, 0x04 }, + { 0x34, 0x00, 0, 1, 0x04, 0x04 }, { 0x34, 0x00, 0, 1, 0x04, 0x04 }, { 0x34, 0x00, 0, 1, 0x04, 0x02 }, + { 0x34, 0x00, 0, 1, 0x10, 0x10 }, { 0x2D, 0x00, 0, 1, 0x04, 0x04 }, { 0x2D, 0x00, 0, 1, 0x04, 0x04 }, + { 0x2D, 0x00, 0, 1, 0x04, 0x04 }, { 0x2D, 0x00, 0, 1, 0x04, 0x04 }, { 0x01, 0x01, 1, 0, 0x02, 0x02 }, + { 0x01, 0x01, 1, 0, 0x02, 0x02 }, { 0x01, 0x01, 1, 0, 0x02, 0x02 }, { 0x01, 0x01, 1, 0, 0x02, 0x02 }, + { 0x26, 0x00, 0, 1, 0x04, 0x04 }, { 0x26, 0x00, 0, 1, 0x04, 0x04 }, { 0x26, 0x00, 0, 1, 0x04, 0x04 }, + { 0x26, 0x00, 0, 1, 0x04, 0x04 }, { 0x51, 0x00, 0, 1, 0x03, 0x03 }, { 0x51, 0x00, 0, 1, 0x02, 0x02 }, + { 0x51, 0x00, 0, 1, 0x03, 0x03 }, { 0x51, 0x00, 0, 1, 0x02, 0x02 }, { 0x51, 0x00, 0, 1, 0x04, 0x02 }, + { 0x51, 0x00, 0, 1, 0x21, 0x21 }, { 0x51, 0x00, 0, 1, 0x21, 0x21 }, { 0x51, 0x00, 0, 1, 0x23, 0x23 }, + { 0x51, 0x00, 0, 1, 0x03, 0x03 }, { 0x51, 0x00, 1, 1, 0x02, 0x02 }, { 0x51, 0x00, 0, 1, 0x23, 0x23 }, + { 0x51, 0x00, 0, 1, 0x03, 0x03 }, { 0x51, 0x00, 0, 1, 0x29, 0x29 }, { 0x51, 0x00, 1, 1, 0x03, 0x03 }, + { 0x52, 0x00, 0, 1, 0x03, 0x03 }, { 0x52, 0x00, 0, 1, 0x02, 0x02 }, { 0x52, 0x00, 0, 1, 0x03, 0x03 }, + { 0x52, 0x00, 0, 1, 0x02, 0x02 }, { 0x52, 0x00, 0, 1, 0x26, 0x26 }, { 0x52, 0x00, 0, 1, 0x21, 0x21 }, + { 0x52, 0x00, 1, 1, 0x21, 0x21 }, { 0x52, 0x00, 0, 1, 0x21, 0x21 }, { 0x52, 0x00, 1, 1, 0x02, 0x02 }, + { 0x53, 0x00, 0, 1, 0x03, 0x03 }, { 0x53, 0x00, 0, 1, 0x02, 0x02 }, { 0x53, 0x00, 0, 1, 0x03, 0x03 }, + { 0x53, 0x00, 0, 1, 0x02, 0x02 }, { 0x53, 0x00, 0, 1, 0x04, 0x02 }, { 0x53, 0x00, 1, 1, 0x02, 0x02 }, + { 0x54, 0x00, 1, 1, 0x03, 0x03 }, { 0x54, 0x00, 1, 1, 0x02, 0x02 }, { 0x54, 0x00, 1, 1, 0x03, 0x03 }, + { 0x54, 0x00, 1, 1, 0x02, 0x02 }, { 0x55, 0x00, 0, 1, 0x03, 0x03 }, { 0x55, 0x00, 0, 1, 0x02, 0x02 }, + { 0x55, 0x00, 0, 1, 0x03, 0x03 }, { 0x55, 0x00, 0, 1, 0x02, 0x02 }, { 0x55, 0x00, 1, 1, 0x0A, 0x0A }, + { 0x55, 0x00, 0, 1, 0x0A, 0x0A }, { 0x55, 0x00, 1, 1, 0x0A, 0x0A }, { 0x55, 0x00, 0, 1, 0x0D, 0x0A }, + { 0x55, 0x00, 0, 1, 0x0A, 0x0A }, { 0x55, 0x00, 0, 1, 0x0A, 0x0A }, { 0x55, 0x00, 1, 1, 0x02, 0x02 }, + { 0x55, 0x00, 1, 1, 0x02, 0x02 }, { 0x55, 0x00, 1, 1, 0x02, 0x02 }, { 0x55, 0x00, 1, 1, 0x02, 0x02 }, + { 0x56, 0x00, 1, 1, 0x02, 0x02 }, { 0x56, 0x00, 1, 1, 0x02, 0x02 }, { 0x56, 0x00, 1, 1, 0x02, 0x02 }, + { 0x56, 0x00, 1, 1, 0x02, 0x02 }, { 0x56, 0x00, 0, 1, 0x03, 0x03 }, { 0x56, 0x00, 0, 1, 0x00, 0x00 }, + { 0x57, 0x00, 1, 1, 0x03, 0x03 }, { 0x57, 0x00, 1, 1, 0x02, 0x02 }, { 0x57, 0x00, 1, 1, 0x03, 0x03 }, + { 0x57, 0x00, 1, 1, 0x02, 0x02 }, { 0x57, 0x00, 0, 1, 0x03, 0x03 }, { 0x57, 0x00, 1, 1, 0x02, 0x02 }, + { 0x58, 0x00, 0, 1, 0x02, 0x02 }, { 0x58, 0x00, 0, 1, 0x02, 0x02 }, { 0x58, 0x00, 0, 1, 0x02, 0x02 }, + { 0x58, 0x00, 0, 1, 0x02, 0x02 }, { 0x58, 0x00, 1, 1, 0x02, 0x02 }, { 0x58, 0x00, 1, 1, 0x02, 0x02 }, + { 0x59, 0x00, 0, 1, 0x03, 0x03 }, { 0x59, 0x00, 0, 1, 0x02, 0x02 }, { 0x59, 0x00, 0, 1, 0x03, 0x03 }, + { 0x59, 0x00, 0, 1, 0x02, 0x02 }, { 0x59, 0x00, 0, 1, 0x0D, 0x00 }, { 0x59, 0x00, 0, 1, 0x02, 0x02 }, + { 0x59, 0x00, 1, 1, 0x02, 0x02 }, { 0x59, 0x00, 0, 1, 0x02, 0x02 }, { 0x59, 0x00, 1, 1, 0x02, 0x02 }, + { 0x5A, 0x00, 0, 1, 0x03, 0x03 }, { 0x5A, 0x00, 0, 1, 0x02, 0x02 }, { 0x5A, 0x00, 0, 1, 0x03, 0x03 }, + { 0x5A, 0x00, 0, 1, 0x02, 0x02 }, { 0x5A, 0x00, 1, 1, 0x0C, 0x0A }, { 0x5A, 0x00, 1, 1, 0x0A, 0x0A }, + { 0x5A, 0x00, 1, 1, 0x02, 0x02 }, { 0x5B, 0x00, 0, 1, 0x02, 0x02 }, { 0x5B, 0x00, 0, 1, 0x02, 0x02 }, + { 0x5B, 0x00, 0, 1, 0x02, 0x02 }, { 0x5B, 0x00, 0, 1, 0x02, 0x02 }, { 0x5B, 0x00, 0, 1, 0x02, 0x02 }, + { 0x5C, 0x00, 1, 1, 0x0F, 0x0F }, { 0x5C, 0x00, 1, 1, 0x0F, 0x0F }, { 0x5C, 0x00, 1, 1, 0x0F, 0x0F }, + { 0x5C, 0x00, 1, 1, 0x0F, 0x0F }, { 0x5C, 0x00, 1, 1, 0x02, 0x02 }, { 0x5C, 0x00, 1, 1, 0x0F, 0x0F }, + { 0x5D, 0x00, 1, 1, 0x03, 0x03 }, { 0x5D, 0x00, 1, 1, 0x02, 0x02 }, { 0x5D, 0x00, 1, 1, 0x03, 0x03 }, + { 0x5D, 0x00, 1, 1, 0x02, 0x02 }, { 0x5D, 0x00, 1, 1, 0x21, 0x21 }, { 0x5D, 0x00, 1, 1, 0x02, 0x02 }, + { 0x5D, 0x00, 1, 1, 0x02, 0x02 }, { 0x5E, 0x00, 1, 1, 0x0E, 0x0E }, { 0x5E, 0x00, 1, 1, 0x0E, 0x0E }, + { 0x5E, 0x00, 1, 1, 0x0E, 0x0E }, { 0x5E, 0x00, 1, 1, 0x0E, 0x0E }, { 0x0E, 0x01, 1, 1, 0x02, 0x02 }, + { 0x0E, 0x01, 1, 1, 0x02, 0x02 }, { 0x0E, 0x01, 1, 1, 0x02, 0x02 }, { 0x0E, 0x01, 1, 1, 0x02, 0x02 }, + { 0x5F, 0x00, 0, 1, 0x03, 0x03 }, { 0x5F, 0x00, 0, 1, 0x02, 0x02 }, { 0x64, 0x00, 0, 1, 0x02, 0x02 }, + { 0x64, 0x00, 0, 1, 0x02, 0x02 }, { 0x64, 0x00, 0, 1, 0x04, 0x02 }, { 0x60, 0x00, 0, 1, 0x03, 0x03 }, + { 0x60, 0x00, 0, 1, 0x02, 0x02 }, { 0x60, 0x00, 0, 1, 0x03, 0x03 }, { 0x60, 0x00, 0, 1, 0x02, 0x02 }, + { 0x60, 0x00, 1, 1, 0x0A, 0x0A }, { 0x60, 0x00, 0, 1, 0x03, 0x03 }, { 0x60, 0x00, 0, 1, 0x02, 0x02 }, + { 0x60, 0x00, 1, 1, 0x02, 0x02 }, { 0x60, 0x00, 1, 1, 0x03, 0x03 }, { 0x60, 0x00, 1, 1, 0x03, 0x03 }, + { 0x61, 0x00, 0, 1, 0x02, 0x02 }, { 0x61, 0x00, 0, 1, 0x02, 0x02 }, { 0x61, 0x00, 0, 1, 0x02, 0x02 }, + { 0x61, 0x00, 0, 1, 0x02, 0x02 }, { 0x61, 0x00, 0, 1, 0x03, 0x03 }, { 0x61, 0x00, 0, 1, 0x02, 0x02 }, + { 0x62, 0x00, 0, 1, 0x02, 0x02 }, { 0x62, 0x00, 0, 1, 0x02, 0x02 }, { 0x62, 0x00, 0, 1, 0x02, 0x02 }, + { 0x62, 0x00, 0, 1, 0x02, 0x02 }, { 0x62, 0x00, 0, 1, 0x02, 0x02 }, { 0x62, 0x00, 1, 1, 0x02, 0x02 }, + { 0x58, 0x03, 0, 1, 0x00, 0x00 }, { 0x58, 0x03, 0, 1, 0x00, 0x00 }, { 0x58, 0x03, 0, 1, 0x00, 0x00 }, + { 0x58, 0x03, 0, 1, 0x00, 0x00 }, { 0x63, 0x00, 0, 1, 0x03, 0x03 }, { 0x63, 0x00, 0, 1, 0x02, 0x02 }, + { 0x63, 0x00, 0, 1, 0x03, 0x03 }, { 0x63, 0x00, 0, 1, 0x02, 0x02 }, { 0x63, 0x00, 0, 1, 0x20, 0x20 }, + { 0x63, 0x00, 0, 1, 0x2A, 0x2A }, { 0x63, 0x00, 1, 1, 0x02, 0x02 }, { 0x63, 0x00, 1, 1, 0x02, 0x02 }, + { 0x63, 0x00, 1, 1, 0x02, 0x02 }, { 0x63, 0x00, 1, 1, 0x02, 0x02 }, { 0x63, 0x00, 1, 1, 0x02, 0x02 }, + { 0x63, 0x00, 1, 1, 0x02, 0x02 }, { 0x63, 0x00, 1, 1, 0x02, 0x02 }, { 0x63, 0x00, 1, 1, 0x02, 0x02 }, + { 0x04, 0x00, 0, 1, 0x02, 0x02 }, { 0x04, 0x00, 0, 1, 0x02, 0x02 }, { 0x04, 0x00, 0, 1, 0x02, 0x02 }, + { 0x04, 0x00, 0, 1, 0x02, 0x02 }, { 0x03, 0x00, 0, 1, 0x02, 0x02 }, { 0x03, 0x00, 0, 1, 0x02, 0x02 }, + { 0x03, 0x00, 0, 1, 0x02, 0x02 }, { 0x03, 0x00, 0, 1, 0x02, 0x02 }, { 0x42, 0x01, 0, 1, 0x04, 0x20 }, + { 0x42, 0x01, 0, 1, 0x04, 0x20 }, { 0x42, 0x01, 0, 1, 0x04, 0x20 }, { 0x42, 0x01, 0, 1, 0x04, 0x20 }, + { 0x23, 0x00, 0, 1, 0x03, 0x03 }, { 0x24, 0x00, 0, 1, 0x02, 0x02 }, { 0x25, 0x00, 0, 1, 0x02, 0x02 }, + { 0x25, 0x00, 0, 1, 0x02, 0x02 }, { 0x04, 0x01, 1, 1, 0x02, 0x02 }, { 0x04, 0x01, 1, 1, 0x02, 0x02 }, + { 0x04, 0x01, 1, 1, 0x02, 0x02 }, { 0x04, 0x01, 1, 1, 0x02, 0x02 }, { 0x0E, 0x00, 1, 1, 0x02, 0x02 }, + { 0x0E, 0x00, 1, 1, 0x02, 0x02 }, { 0x0E, 0x00, 1, 1, 0x02, 0x02 }, { 0x0E, 0x00, 1, 1, 0x02, 0x02 }, + { 0x51, 0x01, 0, 1, 0x03, 0x03 }, { 0x51, 0x01, 0, 1, 0x02, 0x02 }, { 0x51, 0x01, 0, 1, 0x03, 0x03 }, + { 0x51, 0x01, 0, 1, 0x02, 0x02 }, { 0x51, 0x02, 1, 1, 0x03, 0x03 }, { 0x51, 0x02, 1, 1, 0x02, 0x02 }, + { 0x51, 0x02, 1, 1, 0x03, 0x03 }, { 0x51, 0x02, 1, 1, 0x02, 0x02 }, { 0x51, 0x03, 0, 1, 0x02, 0x02 }, + { 0x51, 0x03, 0, 1, 0x02, 0x02 }, { 0x51, 0x03, 0, 1, 0x02, 0x02 }, { 0x51, 0x03, 0, 1, 0x02, 0x02 }, + { 0x51, 0x04, 1, 1, 0x03, 0x03 }, { 0x51, 0x04, 1, 1, 0x02, 0x02 }, { 0x51, 0x04, 1, 1, 0x03, 0x03 }, + { 0x51, 0x04, 1, 1, 0x02, 0x02 }, { 0x51, 0x05, 0, 1, 0x03, 0x03 }, { 0x51, 0x05, 0, 1, 0x02, 0x02 }, + { 0x51, 0x05, 0, 1, 0x03, 0x03 }, { 0x51, 0x05, 0, 1, 0x02, 0x02 }, { 0x52, 0x01, 0, 1, 0x03, 0x03 }, + { 0x52, 0x01, 0, 1, 0x02, 0x02 }, { 0x52, 0x01, 0, 1, 0x03, 0x03 }, { 0x52, 0x01, 0, 1, 0x02, 0x02 }, + { 0x52, 0x02, 0, 1, 0x03, 0x03 }, { 0x52, 0x02, 0, 1, 0x02, 0x02 }, { 0x52, 0x02, 0, 1, 0x03, 0x03 }, + { 0x52, 0x02, 0, 1, 0x02, 0x02 }, { 0x54, 0x01, 1, 1, 0x03, 0x03 }, { 0x54, 0x01, 1, 1, 0x03, 0x03 }, + { 0x54, 0x01, 1, 1, 0x03, 0x03 }, { 0x54, 0x01, 1, 1, 0x03, 0x03 }, { 0x54, 0x02, 0, 1, 0x03, 0x03 }, + { 0x54, 0x02, 0, 1, 0x02, 0x02 }, { 0x54, 0x02, 0, 1, 0x03, 0x03 }, { 0x54, 0x02, 0, 1, 0x02, 0x02 }, + { 0x58, 0x01, 0, 1, 0x02, 0x02 }, { 0x58, 0x01, 0, 1, 0x02, 0x02 }, { 0x58, 0x01, 0, 1, 0x02, 0x02 }, + { 0x58, 0x01, 0, 1, 0x02, 0x02 }, { 0x5A, 0x01, 0, 1, 0x03, 0x03 }, { 0x5A, 0x01, 0, 1, 0x02, 0x02 }, + { 0x5A, 0x01, 0, 1, 0x03, 0x03 }, { 0x5A, 0x01, 0, 1, 0x02, 0x02 }, { 0x5B, 0x01, 1, 1, 0x02, 0x02 }, + { 0x5B, 0x01, 1, 1, 0x02, 0x02 }, { 0x5B, 0x01, 1, 1, 0x02, 0x02 }, { 0x5B, 0x01, 1, 1, 0x02, 0x02 }, + { 0x5B, 0x02, 0, 1, 0x02, 0x02 }, { 0x5B, 0x02, 0, 1, 0x02, 0x02 }, { 0x5B, 0x02, 0, 1, 0x02, 0x02 }, + { 0x5B, 0x02, 0, 1, 0x02, 0x02 }, { 0x5B, 0x03, 0, 1, 0x02, 0x02 }, { 0x5B, 0x03, 0, 1, 0x02, 0x02 }, + { 0x5B, 0x03, 0, 1, 0x02, 0x02 }, { 0x5B, 0x03, 0, 1, 0x02, 0x02 }, { 0x0E, 0x02, 1, 1, 0x02, 0x02 }, + { 0x0E, 0x02, 1, 1, 0x02, 0x02 }, { 0x0E, 0x02, 1, 1, 0x02, 0x02 }, { 0x0E, 0x02, 1, 1, 0x02, 0x02 }, + { 0x60, 0x01, 0, 1, 0x03, 0x03 }, { 0x60, 0x01, 0, 1, 0x02, 0x02 }, { 0x60, 0x01, 0, 1, 0x03, 0x03 }, + { 0x60, 0x01, 0, 1, 0x02, 0x02 }, { 0x60, 0x02, 0, 1, 0x03, 0x03 }, { 0x60, 0x02, 0, 1, 0x02, 0x02 }, + { 0x60, 0x02, 0, 1, 0x03, 0x03 }, { 0x60, 0x02, 0, 1, 0x02, 0x02 }, { 0x62, 0x01, 0, 1, 0x02, 0x02 }, + { 0x62, 0x01, 0, 1, 0x02, 0x02 }, { 0x62, 0x01, 0, 1, 0x02, 0x02 }, { 0x62, 0x01, 0, 1, 0x02, 0x02 }, + { 0x38, 0x01, 0, 1, 0x04, 0x20 }, { 0x38, 0x01, 0, 1, 0x04, 0x20 }, { 0x38, 0x01, 0, 1, 0x04, 0x20 }, + { 0x38, 0x01, 0, 1, 0x04, 0x20 }, { 0x1A, 0x05, 1, 1, 0x02, 0x02 }, { 0x1A, 0x05, 1, 1, 0x02, 0x02 }, + { 0x1A, 0x05, 1, 1, 0x02, 0x02 }, { 0x1A, 0x05, 1, 1, 0x02, 0x02 }, { 0x20, 0x08, 0, 1, 0x04, 0x02 }, + { 0x21, 0x08, 0, 1, 0x04, 0x02 }, { 0x22, 0x08, 0, 1, 0x04, 0x02 }, { 0x22, 0x08, 0, 1, 0x04, 0x02 }, + { 0x20, 0x09, 0, 1, 0x04, 0x02 }, { 0x21, 0x09, 0, 1, 0x04, 0x02 }, { 0x22, 0x09, 0, 1, 0x04, 0x02 }, + { 0x22, 0x09, 0, 1, 0x04, 0x02 }, { 0x20, 0x0A, 0, 1, 0x04, 0x02 }, { 0x21, 0x0A, 0, 1, 0x04, 0x02 }, + { 0x22, 0x0A, 0, 1, 0x04, 0x02 }, { 0x22, 0x0A, 0, 1, 0x04, 0x02 }, { 0x54, 0x03, 1, 1, 0x03, 0x03 }, + { 0x54, 0x03, 1, 1, 0x02, 0x02 }, { 0x54, 0x03, 1, 1, 0x03, 0x03 }, { 0x54, 0x03, 1, 1, 0x02, 0x02 }, + { 0x54, 0x04, 0, 1, 0x2C, 0x2C }, { 0x54, 0x04, 0, 1, 0x2C, 0x2C }, { 0x54, 0x04, 0, 1, 0x2C, 0x2C }, + { 0x54, 0x04, 0, 1, 0x2C, 0x2C }, { 0x5C, 0x01, 0, 1, 0x03, 0x03 }, { 0x5C, 0x01, 0, 1, 0x02, 0x02 }, + { 0x5C, 0x01, 0, 1, 0x03, 0x03 }, { 0x5C, 0x01, 0, 1, 0x02, 0x02 }, { 0x5C, 0x02, 0, 0, 0x03, 0x03 }, + { 0x5C, 0x02, 0, 0, 0x02, 0x02 }, { 0x5C, 0x02, 0, 0, 0x03, 0x03 }, { 0x5C, 0x02, 0, 0, 0x02, 0x02 }, + { 0x5C, 0x03, 0, 0, 0x03, 0x03 }, { 0x5C, 0x03, 0, 0, 0x02, 0x02 }, { 0x5C, 0x03, 0, 0, 0x03, 0x03 }, + { 0x5C, 0x03, 0, 0, 0x02, 0x02 }, { 0x5C, 0x04, 0, 1, 0x02, 0x02 }, { 0x5C, 0x04, 0, 1, 0x02, 0x02 }, + { 0x5C, 0x04, 0, 1, 0x02, 0x02 }, { 0x5C, 0x04, 0, 1, 0x02, 0x02 }, { 0x5C, 0x05, 0, 1, 0x03, 0x03 }, + { 0x5C, 0x05, 0, 1, 0x02, 0x02 }, { 0x5C, 0x05, 0, 1, 0x03, 0x03 }, { 0x5C, 0x05, 0, 1, 0x02, 0x02 }, + { 0x5C, 0x06, 1, 0, 0x0F, 0x0F }, { 0x5C, 0x06, 1, 0, 0x0F, 0x0F }, { 0x5C, 0x06, 1, 0, 0x0F, 0x0F }, + { 0x5C, 0x06, 1, 0, 0x0F, 0x0F }, { 0x51, 0x06, 0, 1, 0x03, 0x03 }, { 0x51, 0x06, 0, 1, 0x02, 0x02 }, + { 0x51, 0x06, 0, 1, 0x03, 0x03 }, { 0x51, 0x06, 0, 1, 0x02, 0x02 }, { 0x51, 0x07, 0, 1, 0x03, 0x03 }, + { 0x51, 0x07, 0, 1, 0x02, 0x02 }, { 0x51, 0x07, 0, 1, 0x03, 0x03 }, { 0x51, 0x07, 0, 1, 0x02, 0x02 }, + { 0x52, 0x03, 0, 1, 0x04, 0x02 }, { 0x52, 0x03, 0, 1, 0x04, 0x02 }, { 0x52, 0x03, 0, 1, 0x04, 0x02 }, + { 0x52, 0x03, 0, 1, 0x04, 0x02 }, { 0x53, 0x01, 0, 1, 0x02, 0x02 }, { 0x53, 0x01, 0, 1, 0x02, 0x02 }, + { 0x53, 0x01, 0, 1, 0x02, 0x02 }, { 0x53, 0x01, 0, 1, 0x02, 0x02 }, { 0x55, 0x01, 0, 1, 0x03, 0x03 }, + { 0x55, 0x01, 0, 1, 0x02, 0x02 }, { 0x55, 0x01, 0, 1, 0x03, 0x03 }, { 0x55, 0x01, 0, 1, 0x02, 0x02 }, + { 0x55, 0x02, 0, 1, 0x02, 0x02 }, { 0x55, 0x02, 0, 1, 0x02, 0x02 }, { 0x55, 0x02, 0, 1, 0x02, 0x02 }, + { 0x55, 0x02, 0, 1, 0x02, 0x02 }, { 0x55, 0x03, 0, 1, 0x04, 0x04 }, { 0x55, 0x03, 0, 1, 0x04, 0x04 }, + { 0x55, 0x03, 0, 1, 0x04, 0x04 }, { 0x55, 0x03, 0, 1, 0x04, 0x04 }, { 0x56, 0x01, 0, 1, 0x12, 0x12 }, + { 0x56, 0x01, 0, 1, 0x02, 0x02 }, { 0x56, 0x01, 0, 1, 0x12, 0x12 }, { 0x56, 0x01, 0, 1, 0x02, 0x02 }, + { 0x57, 0x01, 0, 1, 0x03, 0x03 }, { 0x57, 0x01, 0, 1, 0x02, 0x02 }, { 0x57, 0x01, 0, 1, 0x03, 0x03 }, + { 0x57, 0x01, 0, 1, 0x02, 0x02 }, { 0x57, 0x02, 0, 1, 0x13, 0x13 }, { 0x57, 0x02, 0, 1, 0x02, 0x02 }, + { 0x57, 0x02, 0, 1, 0x13, 0x13 }, { 0x57, 0x02, 0, 1, 0x02, 0x02 }, { 0x59, 0x01, 0, 1, 0x02, 0x02 }, + { 0x59, 0x01, 0, 1, 0x02, 0x02 }, { 0x59, 0x01, 0, 1, 0x02, 0x02 }, { 0x59, 0x01, 0, 1, 0x02, 0x02 }, + { 0x59, 0x02, 0, 1, 0x03, 0x03 }, { 0x59, 0x02, 0, 1, 0x02, 0x02 }, { 0x59, 0x02, 0, 1, 0x03, 0x03 }, + { 0x59, 0x02, 0, 1, 0x02, 0x02 }, { 0x5A, 0x02, 1, 1, 0x03, 0x03 }, { 0x5A, 0x02, 1, 1, 0x02, 0x02 }, + { 0x5A, 0x02, 1, 1, 0x03, 0x03 }, { 0x5A, 0x02, 1, 1, 0x02, 0x02 }, { 0x5A, 0x03, 1, 1, 0x03, 0x03 }, + { 0x5A, 0x03, 1, 1, 0x02, 0x02 }, { 0x5A, 0x03, 1, 1, 0x03, 0x03 }, { 0x5A, 0x03, 1, 1, 0x02, 0x02 }, + { 0x5D, 0x01, 0, 1, 0x03, 0x03 }, { 0x5D, 0x01, 0, 1, 0x02, 0x02 }, { 0x5D, 0x01, 0, 1, 0x03, 0x03 }, + { 0x5D, 0x01, 0, 1, 0x02, 0x02 }, { 0x5D, 0x02, 0, 1, 0x03, 0x03 }, { 0x5D, 0x02, 0, 1, 0x02, 0x02 }, + { 0x5D, 0x02, 0, 1, 0x03, 0x03 }, { 0x5D, 0x02, 0, 1, 0x02, 0x02 }, { 0x5D, 0x03, 0, 1, 0x03, 0x03 }, + { 0x5D, 0x03, 0, 1, 0x02, 0x02 }, { 0x5D, 0x03, 0, 1, 0x03, 0x03 }, { 0x5D, 0x03, 0, 1, 0x02, 0x02 }, + { 0x5F, 0x01, 0, 1, 0x03, 0x03 }, { 0x5F, 0x01, 0, 1, 0x02, 0x02 }, { 0x64, 0x01, 0, 1, 0x05, 0x05 }, + { 0x64, 0x01, 0, 1, 0x05, 0x05 }, { 0x5F, 0x01, 0, 1, 0x00, 0x00 }, { 0x60, 0x03, 0, 1, 0x03, 0x03 }, + { 0x60, 0x03, 0, 1, 0x02, 0x02 }, { 0x60, 0x03, 0, 1, 0x03, 0x03 }, { 0x60, 0x03, 0, 1, 0x02, 0x02 }, + { 0x61, 0x01, 0, 1, 0x02, 0x02 }, { 0x61, 0x01, 0, 1, 0x02, 0x02 }, { 0x61, 0x01, 0, 1, 0x02, 0x02 }, + { 0x61, 0x01, 0, 1, 0x02, 0x02 }, { 0x61, 0x02, 0, 1, 0x02, 0x02 }, { 0x61, 0x02, 0, 1, 0x02, 0x02 }, + { 0x61, 0x02, 0, 1, 0x02, 0x02 }, { 0x61, 0x02, 0, 1, 0x02, 0x02 }, { 0x03, 0x01, 1, 1, 0x02, 0x02 }, + { 0x03, 0x01, 1, 1, 0x02, 0x02 }, { 0x03, 0x01, 1, 1, 0x02, 0x02 }, { 0x03, 0x01, 1, 1, 0x02, 0x02 }, + { 0x00, 0x01, 1, 0, 0x02, 0x02 }, { 0x00, 0x01, 1, 0, 0x02, 0x02 }, { 0x00, 0x01, 1, 0, 0x02, 0x02 }, + { 0x00, 0x01, 1, 0, 0x02, 0x02 }, { 0x0E, 0x03, 1, 1, 0x02, 0x02 }, { 0x0E, 0x03, 1, 1, 0x02, 0x02 }, + { 0x0E, 0x03, 1, 1, 0x02, 0x02 }, { 0x0E, 0x03, 1, 1, 0x02, 0x02 }, { 0x20, 0x01, 0, 1, 0x03, 0x03 }, + { 0x21, 0x01, 0, 1, 0x02, 0x02 }, { 0x22, 0x01, 0, 1, 0x02, 0x02 }, { 0x22, 0x01, 0, 1, 0x02, 0x02 }, + { 0x20, 0x02, 0, 1, 0x03, 0x03 }, { 0x21, 0x02, 0, 1, 0x02, 0x02 }, { 0x22, 0x02, 0, 1, 0x02, 0x02 }, + { 0x22, 0x02, 0, 1, 0x02, 0x02 }, { 0x20, 0x03, 1, 1, 0x03, 0x03 }, { 0x21, 0x03, 1, 1, 0x02, 0x02 }, + { 0x22, 0x03, 1, 1, 0x02, 0x02 }, { 0x22, 0x03, 1, 1, 0x02, 0x02 }, { 0x55, 0x04, 0, 0, 0x04, 0x04 }, + { 0x55, 0x04, 0, 0, 0x04, 0x04 }, { 0x55, 0x04, 0, 0, 0x04, 0x04 }, { 0x55, 0x04, 0, 0, 0x04, 0x04 }, + { 0x55, 0x05, 0, 0, 0x04, 0x04 }, { 0x55, 0x05, 0, 0, 0x04, 0x04 }, { 0x55, 0x05, 0, 0, 0x04, 0x04 }, + { 0x55, 0x05, 0, 0, 0x04, 0x04 }, { 0x1B, 0x02, 0, 0, 0x02, 0x02 }, { 0x1C, 0x02, 0, 0, 0x02, 0x02 }, + { 0x1D, 0x02, 0, 0, 0x02, 0x02 }, { 0x1D, 0x02, 0, 0, 0x02, 0x02 }, { 0x34, 0x01, 0, 1, 0x04, 0x04 }, + { 0x34, 0x01, 0, 1, 0x04, 0x04 }, { 0x34, 0x01, 0, 1, 0x04, 0x04 }, { 0x34, 0x01, 0, 1, 0x04, 0x04 }, + { 0x1B, 0x01, 0, 1, 0x03, 0x03 }, { 0x1C, 0x01, 0, 1, 0x02, 0x02 }, { 0x1D, 0x01, 0, 1, 0x02, 0x02 }, + { 0x1D, 0x01, 0, 1, 0x02, 0x02 }, { 0x51, 0x08, 1, 1, 0x03, 0x03 }, { 0x51, 0x08, 1, 1, 0x02, 0x02 }, + { 0x51, 0x08, 1, 1, 0x03, 0x03 }, { 0x51, 0x08, 1, 1, 0x02, 0x02 }, { 0x51, 0x09, 0, 1, 0x03, 0x03 }, + { 0x51, 0x09, 0, 1, 0x03, 0x03 }, { 0x51, 0x09, 0, 1, 0x03, 0x03 }, { 0x51, 0x09, 0, 1, 0x03, 0x03 }, + { 0x51, 0x0A, 0, 1, 0x03, 0x03 }, { 0x51, 0x0A, 0, 1, 0x03, 0x03 }, { 0x51, 0x0A, 0, 1, 0x03, 0x03 }, + { 0x51, 0x0A, 0, 1, 0x03, 0x03 }, { 0x55, 0x06, 0, 1, 0x02, 0x02 }, { 0x55, 0x06, 0, 1, 0x02, 0x02 }, + { 0x55, 0x06, 0, 1, 0x02, 0x02 }, { 0x55, 0x06, 0, 1, 0x02, 0x02 }, { 0x51, 0x0B, 0, 1, 0x05, 0x05 }, + { 0x51, 0x0B, 0, 1, 0x04, 0x02 }, { 0x51, 0x0B, 0, 1, 0x05, 0x05 }, { 0x51, 0x0B, 0, 1, 0x04, 0x02 }, + { 0x51, 0x0C, 0, 1, 0x05, 0x05 }, { 0x51, 0x0C, 0, 1, 0x04, 0x02 }, { 0x51, 0x0C, 0, 1, 0x05, 0x05 }, + { 0x51, 0x0C, 0, 1, 0x04, 0x02 }, { 0x51, 0x0D, 0, 1, 0x05, 0x05 }, { 0x51, 0x0D, 0, 1, 0x04, 0x02 }, + { 0x51, 0x0D, 0, 1, 0x05, 0x05 }, { 0x51, 0x0D, 0, 1, 0x04, 0x02 }, { 0x45, 0x01, 0, 1, 0x03, 0x03 }, + { 0x46, 0x01, 0, 1, 0x02, 0x02 }, { 0x45, 0x01, 0, 1, 0x03, 0x03 }, { 0x46, 0x01, 0, 1, 0x02, 0x02 }, + { 0x1E, 0x01, 1, 1, 0x03, 0x03 }, { 0x1F, 0x01, 1, 1, 0x02, 0x02 }, { 0x1E, 0x01, 1, 1, 0x02, 0x02 }, + { 0x1F, 0x01, 1, 1, 0x02, 0x02 }, { 0x20, 0x04, 1, 1, 0x03, 0x03 }, { 0x21, 0x04, 1, 1, 0x02, 0x02 }, + { 0x22, 0x04, 1, 1, 0x02, 0x02 }, { 0x22, 0x04, 1, 1, 0x02, 0x02 }, { 0x20, 0x05, 0, 1, 0x04, 0x02 }, + { 0x21, 0x05, 0, 1, 0x04, 0x02 }, { 0x22, 0x05, 0, 1, 0x04, 0x02 }, { 0x22, 0x05, 0, 1, 0x04, 0x02 }, + { 0x52, 0x04, 0, 1, 0x02, 0x02 }, { 0x52, 0x04, 0, 1, 0x02, 0x02 }, { 0x52, 0x04, 0, 1, 0x02, 0x02 }, + { 0x52, 0x04, 0, 1, 0x02, 0x02 }, { 0x5D, 0x04, 0, 1, 0x03, 0x03 }, { 0x5D, 0x04, 0, 1, 0x02, 0x02 }, + { 0x5D, 0x04, 0, 1, 0x03, 0x03 }, { 0x5D, 0x04, 0, 1, 0x02, 0x02 }, { 0x63, 0x01, 0, 0, 0x03, 0x03 }, + { 0x63, 0x01, 0, 0, 0x02, 0x02 }, { 0x63, 0x01, 0, 0, 0x03, 0x03 }, { 0x63, 0x01, 0, 0, 0x02, 0x02 }, + { 0x07, 0x01, 0, 1, 0x02, 0x02 }, { 0x07, 0x01, 0, 1, 0x02, 0x02 }, { 0x07, 0x01, 0, 1, 0x02, 0x02 }, + { 0x07, 0x01, 0, 1, 0x02, 0x02 }, { 0x07, 0x02, 1, 1, 0x02, 0x02 }, { 0x07, 0x02, 1, 1, 0x02, 0x02 }, + { 0x07, 0x02, 1, 1, 0x02, 0x02 }, { 0x07, 0x02, 1, 1, 0x02, 0x02 }, { 0x5D, 0x05, 0, 1, 0x03, 0x03 }, + { 0x5D, 0x05, 0, 1, 0x02, 0x02 }, { 0x5D, 0x05, 0, 1, 0x03, 0x03 }, { 0x5D, 0x05, 0, 1, 0x02, 0x02 }, + { 0x5D, 0x06, 0, 1, 0x03, 0x03 }, { 0x5D, 0x06, 0, 1, 0x02, 0x02 }, { 0x5D, 0x06, 0, 1, 0x03, 0x03 }, + { 0x5D, 0x06, 0, 1, 0x02, 0x02 }, { 0x5D, 0x07, 0, 1, 0x03, 0x03 }, { 0x5D, 0x07, 0, 1, 0x02, 0x02 }, + { 0x5D, 0x07, 0, 1, 0x03, 0x03 }, { 0x5D, 0x07, 0, 1, 0x02, 0x02 }, { 0x5D, 0x08, 0, 1, 0x03, 0x03 }, + { 0x5D, 0x08, 0, 1, 0x02, 0x02 }, { 0x5D, 0x08, 0, 1, 0x03, 0x03 }, { 0x5D, 0x08, 0, 1, 0x02, 0x02 }, + { 0x43, 0x02, 0, 1, 0x0A, 0x0A }, { 0x43, 0x02, 0, 1, 0x0A, 0x0A }, { 0x43, 0x02, 0, 1, 0x0A, 0x0A }, + { 0x43, 0x02, 0, 1, 0x0A, 0x0A }, { 0x44, 0x01, 0, 1, 0x02, 0x02 }, { 0x44, 0x01, 0, 1, 0x02, 0x02 }, + { 0x44, 0x01, 0, 1, 0x02, 0x02 }, { 0x44, 0x01, 0, 1, 0x02, 0x02 }, { 0x5D, 0x09, 0, 1, 0x03, 0x03 }, + { 0x5D, 0x09, 0, 1, 0x02, 0x02 }, { 0x5D, 0x09, 0, 1, 0x03, 0x03 }, { 0x5D, 0x09, 0, 1, 0x02, 0x02 }, + { 0x5D, 0x0A, 0, 1, 0x03, 0x03 }, { 0x5D, 0x0A, 0, 1, 0x02, 0x02 }, { 0x5D, 0x0A, 0, 1, 0x03, 0x03 }, + { 0x5D, 0x0A, 0, 1, 0x02, 0x02 }, { 0x5D, 0x0B, 0, 1, 0x03, 0x03 }, { 0x5D, 0x0B, 0, 1, 0x02, 0x02 }, + { 0x5D, 0x0B, 0, 1, 0x03, 0x03 }, { 0x5D, 0x0B, 0, 1, 0x02, 0x02 }, { 0x5D, 0x0C, 0, 1, 0x03, 0x03 }, + { 0x5D, 0x0C, 0, 1, 0x02, 0x02 }, { 0x5D, 0x0C, 0, 1, 0x03, 0x03 }, { 0x5D, 0x0C, 0, 1, 0x02, 0x02 }, + { 0x63, 0x02, 0, 1, 0x03, 0x03 }, { 0x63, 0x02, 0, 1, 0x02, 0x02 }, { 0x63, 0x02, 0, 1, 0x03, 0x03 }, + { 0x63, 0x02, 0, 1, 0x02, 0x02 }, { 0x63, 0x03, 0, 1, 0x03, 0x03 }, { 0x63, 0x03, 0, 1, 0x02, 0x02 }, + { 0x63, 0x03, 0, 1, 0x03, 0x03 }, { 0x63, 0x03, 0, 1, 0x02, 0x02 }, { 0x42, 0x00, 0, 1, 0x02, 0x02 }, + { 0x42, 0x00, 0, 1, 0x02, 0x02 }, { 0x42, 0x00, 0, 1, 0x02, 0x02 }, { 0x42, 0x00, 0, 1, 0x02, 0x02 }, + { 0x56, 0x00, 0, 1, 0x02, 0x02 }, { 0x47, 0x00, 0, 1, 0x02, 0x02 }, { 0x42, 0x00, 0, 1, 0x02, 0x02 }, + { 0x42, 0x00, 0, 1, 0x02, 0x02 }, { 0x42, 0x00, 0, 1, 0x02, 0x02 }, { 0x42, 0x00, 0, 1, 0x02, 0x02 }, + { 0x42, 0x00, 0, 1, 0x02, 0x02 }, { 0x06, 0x01, 1, 1, 0x02, 0x02 }, { 0x06, 0x01, 1, 1, 0x02, 0x02 }, + { 0x06, 0x01, 1, 1, 0x02, 0x02 }, { 0x06, 0x01, 1, 1, 0x02, 0x02 }, { 0x36, 0x00, 0, 1, 0x04, 0x20 }, + { 0x36, 0x00, 0, 1, 0x04, 0x20 }, { 0x36, 0x00, 0, 1, 0x04, 0x20 }, { 0x36, 0x00, 0, 1, 0x04, 0x20 }, + { 0x2A, 0x00, 0, 1, 0x04, 0x20 }, { 0x2A, 0x00, 0, 1, 0x04, 0x20 }, { 0x2A, 0x00, 0, 1, 0x04, 0x20 }, + { 0x2A, 0x00, 0, 1, 0x04, 0x20 }, { 0x13, 0x00, 1, 1, 0x02, 0x02 }, { 0x13, 0x00, 1, 1, 0x02, 0x02 }, + { 0x13, 0x00, 1, 1, 0x02, 0x02 }, { 0x13, 0x00, 1, 1, 0x02, 0x02 }, { 0x15, 0x00, 1, 1, 0x02, 0x02 }, + { 0x15, 0x00, 1, 1, 0x02, 0x02 }, { 0x15, 0x00, 1, 1, 0x02, 0x02 }, { 0x15, 0x00, 1, 1, 0x02, 0x02 }, + { 0x57, 0x06, 0, 1, 0x04, 0x02 }, { 0x57, 0x06, 0, 1, 0x04, 0x02 }, { 0x57, 0x06, 0, 1, 0x04, 0x02 }, + { 0x57, 0x06, 0, 1, 0x04, 0x02 }, { 0x3A, 0x00, 0, 1, 0x02, 0x20 }, { 0x3A, 0x00, 0, 1, 0x02, 0x20 }, + { 0x3A, 0x00, 0, 1, 0x02, 0x20 }, { 0x3A, 0x00, 0, 1, 0x02, 0x20 }, { 0x51, 0x0E, 1, 1, 0x03, 0x03 }, + { 0x51, 0x0E, 1, 1, 0x03, 0x03 }, { 0x51, 0x0E, 1, 1, 0x03, 0x03 }, { 0x51, 0x0E, 1, 1, 0x03, 0x03 }, + { 0x3B, 0x00, 0, 1, 0x02, 0x02 }, { 0x3B, 0x00, 0, 1, 0x02, 0x02 }, { 0x3B, 0x00, 0, 1, 0x02, 0x02 }, + { 0x3B, 0x00, 0, 1, 0x02, 0x02 }, { 0x3B, 0x00, 0, 1, 0x02, 0x02 }, { 0x3B, 0x00, 0, 1, 0x02, 0x02 }, + { 0x3B, 0x00, 0, 1, 0x02, 0x02 }, { 0x3F, 0x00, 0, 1, 0x02, 0x26 }, { 0x3F, 0x00, 0, 1, 0x02, 0x26 }, + { 0x3F, 0x00, 0, 1, 0x02, 0x26 }, { 0x3F, 0x00, 0, 1, 0x02, 0x26 }, { 0x43, 0x03, 0, 1, 0x02, 0x02 }, + { 0x43, 0x03, 0, 1, 0x02, 0x02 }, { 0x43, 0x03, 0, 1, 0x02, 0x02 }, { 0x43, 0x03, 0, 1, 0x02, 0x02 }, + { 0x43, 0x04, 0, 1, 0x02, 0x02 }, { 0x43, 0x04, 0, 1, 0x02, 0x02 }, { 0x43, 0x04, 0, 1, 0x02, 0x02 }, + { 0x43, 0x04, 0, 1, 0x02, 0x02 }, { 0x58, 0x04, 0, 1, 0x2C, 0x2C }, { 0x58, 0x04, 0, 1, 0x2C, 0x2C }, + { 0x58, 0x04, 0, 1, 0x2C, 0x2C }, { 0x58, 0x04, 0, 1, 0x2C, 0x2C }, { 0x1A, 0x02, 1, 1, 0x02, 0x02 }, + { 0x1A, 0x02, 1, 1, 0x02, 0x02 }, { 0x1A, 0x02, 1, 1, 0x02, 0x02 }, { 0x1A, 0x02, 1, 1, 0x02, 0x02 }, + { 0x1A, 0x03, 1, 1, 0x02, 0x02 }, { 0x1A, 0x03, 1, 1, 0x02, 0x02 }, { 0x1A, 0x03, 1, 1, 0x02, 0x02 }, + { 0x1A, 0x03, 1, 1, 0x02, 0x02 }, { 0x1A, 0x04, 1, 1, 0x02, 0x02 }, { 0x1A, 0x04, 1, 1, 0x02, 0x02 }, + { 0x1A, 0x04, 1, 1, 0x02, 0x02 }, { 0x1A, 0x04, 1, 1, 0x02, 0x02 }, { 0x55, 0x07, 0, 0, 0x04, 0x04 }, + { 0x55, 0x07, 0, 0, 0x04, 0x04 }, { 0x55, 0x07, 0, 0, 0x04, 0x04 }, { 0x55, 0x07, 0, 0, 0x04, 0x04 }, + { 0x55, 0x08, 0, 0, 0x04, 0x04 }, { 0x55, 0x08, 0, 0, 0x04, 0x04 }, { 0x55, 0x08, 0, 0, 0x04, 0x04 }, + { 0x55, 0x08, 0, 0, 0x04, 0x04 }, { 0x5F, 0x02, 0, 1, 0x02, 0x02 }, { 0x5F, 0x02, 0, 1, 0x02, 0x02 }, + { 0x64, 0x02, 0, 1, 0x02, 0x02 }, { 0x64, 0x02, 0, 1, 0x02, 0x02 }, { 0x5F, 0x02, 0, 1, 0x00, 0x00 }, + { 0x52, 0x05, 0, 1, 0x04, 0x02 }, { 0x52, 0x05, 0, 1, 0x04, 0x02 }, { 0x52, 0x05, 0, 1, 0x04, 0x02 }, + { 0x52, 0x05, 0, 1, 0x04, 0x02 }, { 0x52, 0x06, 0, 1, 0x04, 0x02 }, { 0x52, 0x06, 0, 1, 0x04, 0x02 }, + { 0x52, 0x06, 0, 1, 0x04, 0x02 }, { 0x52, 0x06, 0, 1, 0x04, 0x02 }, { 0x52, 0x07, 0, 1, 0x04, 0x02 }, + { 0x52, 0x07, 0, 1, 0x04, 0x02 }, { 0x52, 0x07, 0, 1, 0x04, 0x02 }, { 0x52, 0x07, 0, 1, 0x04, 0x02 }, + { 0x52, 0x08, 0, 1, 0x04, 0x02 }, { 0x52, 0x08, 0, 1, 0x04, 0x02 }, { 0x52, 0x08, 0, 1, 0x04, 0x02 }, + { 0x52, 0x08, 0, 1, 0x04, 0x02 }, { 0x53, 0x02, 0, 1, 0x04, 0x02 }, { 0x53, 0x02, 0, 1, 0x04, 0x02 }, + { 0x53, 0x02, 0, 1, 0x04, 0x02 }, { 0x53, 0x02, 0, 1, 0x04, 0x02 }, { 0x53, 0x03, 0, 1, 0x03, 0x03 }, + { 0x53, 0x03, 0, 1, 0x03, 0x03 }, { 0x53, 0x03, 0, 1, 0x03, 0x03 }, { 0x53, 0x03, 0, 1, 0x03, 0x03 }, + { 0x53, 0x04, 0, 1, 0x03, 0x03 }, { 0x53, 0x04, 0, 1, 0x03, 0x03 }, { 0x53, 0x04, 0, 1, 0x03, 0x03 }, + { 0x53, 0x04, 0, 1, 0x03, 0x03 }, { 0x53, 0x05, 0, 1, 0x03, 0x03 }, { 0x53, 0x05, 0, 1, 0x03, 0x03 }, + { 0x53, 0x05, 0, 1, 0x03, 0x03 }, { 0x53, 0x05, 0, 1, 0x03, 0x03 }, { 0x5E, 0x01, 1, 1, 0x0E, 0x0E }, + { 0x5E, 0x01, 1, 1, 0x0E, 0x0E }, { 0x5E, 0x01, 1, 1, 0x0E, 0x0E }, { 0x5E, 0x01, 1, 1, 0x0E, 0x0E }, + { 0x5E, 0x02, 0, 1, 0x0E, 0x0E }, { 0x5E, 0x02, 0, 1, 0x0E, 0x0E }, { 0x5E, 0x02, 0, 1, 0x0E, 0x0E }, + { 0x5E, 0x02, 0, 1, 0x0E, 0x0E }, { 0x3C, 0x00, 0, 1, 0x03, 0x03 }, { 0x3C, 0x00, 0, 1, 0x03, 0x03 }, + { 0x3C, 0x00, 0, 1, 0x03, 0x03 }, { 0x3C, 0x00, 0, 1, 0x03, 0x03 }, { 0x3D, 0x00, 0, 1, 0x02, 0x02 }, + { 0x3D, 0x00, 0, 1, 0x02, 0x02 }, { 0x3D, 0x00, 0, 1, 0x02, 0x02 }, { 0x3D, 0x00, 0, 1, 0x02, 0x02 }, + { 0x3D, 0x00, 0, 1, 0x02, 0x02 }, { 0x3D, 0x00, 0, 1, 0x02, 0x02 }, { 0x3D, 0x00, 0, 1, 0x02, 0x02 }, + { 0x63, 0x04, 0, 1, 0x04, 0x02 }, { 0x63, 0x04, 0, 1, 0x04, 0x02 }, { 0x63, 0x04, 0, 1, 0x04, 0x02 }, + { 0x63, 0x04, 0, 1, 0x04, 0x02 }, { 0x2E, 0x00, 0, 1, 0x04, 0x20 }, { 0x2E, 0x00, 0, 1, 0x04, 0x20 }, + { 0x2E, 0x00, 0, 1, 0x04, 0x20 }, { 0x2E, 0x00, 0, 1, 0x04, 0x20 }, { 0x2F, 0x00, 0, 1, 0x04, 0x04 }, + { 0x2F, 0x00, 0, 1, 0x04, 0x04 }, { 0x2F, 0x00, 0, 1, 0x04, 0x04 }, { 0x2F, 0x00, 0, 1, 0x04, 0x04 }, + { 0x30, 0x00, 0, 0, 0x04, 0x20 }, { 0x30, 0x00, 0, 0, 0x04, 0x20 }, { 0x30, 0x00, 0, 1, 0x04, 0x20 }, + { 0x30, 0x00, 0, 1, 0x04, 0x20 }, { 0x31, 0x00, 0, 1, 0x04, 0x20 }, { 0x31, 0x00, 0, 1, 0x04, 0x20 }, + { 0x31, 0x00, 0, 1, 0x04, 0x20 }, { 0x31, 0x00, 0, 1, 0x04, 0x20 }, { 0x1E, 0x04, 0, 1, 0x04, 0x02 }, + { 0x1F, 0x04, 0, 1, 0x04, 0x02 }, { 0x1E, 0x04, 0, 1, 0x04, 0x02 }, { 0x1F, 0x04, 0, 1, 0x04, 0x02 }, + { 0x32, 0x00, 0, 1, 0x02, 0x02 }, { 0x32, 0x00, 0, 1, 0x02, 0x02 }, { 0x32, 0x00, 0, 1, 0x02, 0x02 }, + { 0x32, 0x00, 0, 1, 0x02, 0x02 }, { 0x59, 0x05, 0, 1, 0x03, 0x03 }, { 0x59, 0x05, 0, 1, 0x03, 0x03 }, + { 0x59, 0x05, 0, 1, 0x03, 0x03 }, { 0x59, 0x05, 0, 1, 0x03, 0x03 }, { 0x35, 0x00, 0, 1, 0x04, 0x02 }, + { 0x35, 0x00, 0, 1, 0x04, 0x02 }, { 0x35, 0x00, 0, 1, 0x04, 0x02 }, { 0x35, 0x00, 0, 1, 0x04, 0x02 }, + { 0x37, 0x00, 0, 1, 0x04, 0x20 }, { 0x37, 0x00, 0, 1, 0x04, 0x20 }, { 0x37, 0x00, 0, 1, 0x04, 0x20 }, + { 0x37, 0x00, 0, 1, 0x04, 0x20 }, { 0x39, 0x00, 0, 1, 0x04, 0x04 }, { 0x39, 0x00, 0, 1, 0x04, 0x04 }, + { 0x39, 0x00, 0, 1, 0x04, 0x04 }, { 0x39, 0x00, 0, 1, 0x04, 0x04 }, { 0x5D, 0x0D, 0, 1, 0x03, 0x03 }, + { 0x5D, 0x0D, 0, 1, 0x02, 0x02 }, { 0x5D, 0x0D, 0, 1, 0x03, 0x03 }, { 0x5D, 0x0D, 0, 1, 0x02, 0x02 }, + { 0x5D, 0x0E, 0, 1, 0x03, 0x05 }, { 0x5D, 0x0E, 0, 1, 0x02, 0x04 }, { 0x5D, 0x0E, 0, 1, 0x03, 0x05 }, + { 0x5D, 0x0E, 0, 1, 0x02, 0x04 }, { 0x5D, 0x0F, 1, 1, 0x0F, 0x0F }, { 0x5D, 0x0F, 1, 1, 0x0F, 0x0F }, + { 0x5D, 0x0F, 1, 1, 0x0F, 0x0F }, { 0x5D, 0x0F, 1, 1, 0x0F, 0x0F }, { 0x5D, 0x10, 0, 1, 0x02, 0x02 }, + { 0x5D, 0x10, 0, 1, 0x02, 0x02 }, { 0x5D, 0x10, 0, 1, 0x02, 0x02 }, { 0x5D, 0x10, 0, 1, 0x02, 0x02 }, + { 0x5D, 0x11, 0, 1, 0x02, 0x02 }, { 0x5D, 0x11, 0, 1, 0x02, 0x02 }, { 0x5D, 0x11, 0, 1, 0x02, 0x02 }, + { 0x5D, 0x11, 0, 1, 0x02, 0x02 }, { 0x20, 0x06, 0, 1, 0x04, 0x02 }, { 0x21, 0x06, 0, 1, 0x04, 0x02 }, + { 0x22, 0x06, 0, 1, 0x04, 0x02 }, { 0x22, 0x06, 0, 1, 0x04, 0x02 }, { 0x20, 0x07, 0, 1, 0x04, 0x02 }, + { 0x21, 0x07, 0, 1, 0x04, 0x02 }, { 0x22, 0x07, 0, 1, 0x04, 0x02 }, { 0x22, 0x07, 0, 1, 0x04, 0x02 }, + { 0x1E, 0x02, 0, 1, 0x04, 0x02 }, { 0x1F, 0x02, 0, 1, 0x04, 0x02 }, { 0x1E, 0x02, 0, 1, 0x03, 0x03 }, + { 0x1F, 0x02, 0, 1, 0x02, 0x02 }, { 0x58, 0x02, 0, 1, 0x02, 0x02 }, { 0x58, 0x02, 0, 1, 0x02, 0x02 }, + { 0x58, 0x02, 0, 1, 0x02, 0x02 }, { 0x58, 0x02, 0, 1, 0x02, 0x02 }, { 0x57, 0x03, 0, 1, 0x03, 0x03 }, + { 0x57, 0x03, 0, 1, 0x03, 0x03 }, { 0x57, 0x03, 0, 1, 0x03, 0x03 }, { 0x57, 0x03, 0, 1, 0x03, 0x03 }, + { 0x57, 0x04, 0, 1, 0x04, 0x02 }, { 0x57, 0x04, 0, 1, 0x04, 0x02 }, { 0x57, 0x04, 0, 1, 0x04, 0x02 }, + { 0x57, 0x04, 0, 1, 0x04, 0x02 }, { 0x5A, 0x04, 0, 1, 0x04, 0x02 }, { 0x5A, 0x04, 0, 1, 0x04, 0x02 }, + { 0x5A, 0x04, 0, 1, 0x04, 0x02 }, { 0x5A, 0x04, 0, 1, 0x04, 0x02 }, { 0x59, 0x03, 0, 1, 0x03, 0x03 }, + { 0x59, 0x03, 0, 1, 0x02, 0x02 }, { 0x59, 0x03, 0, 1, 0x03, 0x03 }, { 0x59, 0x03, 0, 1, 0x02, 0x02 }, + { 0x59, 0x04, 0, 1, 0x02, 0x02 }, { 0x59, 0x04, 0, 1, 0x02, 0x02 }, { 0x59, 0x04, 0, 1, 0x02, 0x02 }, + { 0x59, 0x04, 0, 1, 0x02, 0x02 }, { 0x0E, 0x04, 1, 1, 0x02, 0x02 }, { 0x0E, 0x04, 1, 1, 0x02, 0x02 }, + { 0x0E, 0x04, 1, 1, 0x02, 0x02 }, { 0x0E, 0x04, 1, 1, 0x02, 0x02 }, { 0x0E, 0x05, 1, 1, 0x02, 0x02 }, + { 0x0E, 0x05, 1, 1, 0x02, 0x02 }, { 0x0E, 0x05, 1, 1, 0x02, 0x02 }, { 0x0E, 0x05, 1, 1, 0x02, 0x02 }, + { 0x0E, 0x06, 1, 1, 0x02, 0x02 }, { 0x0E, 0x06, 1, 1, 0x02, 0x02 }, { 0x0E, 0x06, 1, 1, 0x02, 0x02 }, + { 0x0E, 0x06, 1, 1, 0x02, 0x02 }, { 0x30, 0x01, 0, 0, 0x04, 0x20 }, { 0x30, 0x01, 0, 0, 0x04, 0x20 }, + { 0x30, 0x01, 0, 1, 0x04, 0x20 }, { 0x30, 0x01, 0, 1, 0x04, 0x20 }, { 0x30, 0x02, 0, 0, 0x04, 0x20 }, + { 0x30, 0x02, 0, 0, 0x04, 0x20 }, { 0x30, 0x02, 0, 1, 0x04, 0x20 }, { 0x30, 0x02, 0, 1, 0x04, 0x20 }, + { 0x06, 0x02, 0, 0, 0x02, 0x02 }, { 0x06, 0x02, 0, 0, 0x02, 0x02 }, { 0x06, 0x02, 0, 0, 0x02, 0x02 }, + { 0x06, 0x02, 0, 0, 0x02, 0x02 }, { 0x06, 0x03, 0, 0, 0x02, 0x02 }, { 0x06, 0x03, 0, 0, 0x02, 0x02 }, + { 0x06, 0x03, 0, 0, 0x02, 0x02 }, { 0x06, 0x03, 0, 0, 0x02, 0x02 }, { 0x06, 0x04, 0, 1, 0x02, 0x02 }, + { 0x06, 0x04, 0, 1, 0x02, 0x02 }, { 0x06, 0x04, 0, 1, 0x02, 0x02 }, { 0x06, 0x04, 0, 1, 0x02, 0x02 }, + { 0x62, 0x02, 0, 1, 0x04, 0x02 }, { 0x62, 0x02, 0, 1, 0x04, 0x02 }, { 0x62, 0x02, 0, 1, 0x04, 0x02 }, + { 0x62, 0x02, 0, 1, 0x04, 0x02 }, { 0x4A, 0x00, 0, 1, 0x03, 0x03 }, { 0x4A, 0x00, 0, 1, 0x02, 0x02 }, + { 0x4A, 0x00, 0, 1, 0x03, 0x03 }, { 0x4A, 0x00, 0, 1, 0x02, 0x02 }, { 0x4A, 0x00, 0, 1, 0x03, 0x03 }, + { 0x4A, 0x00, 0, 1, 0x03, 0x03 }, { 0x4A, 0x00, 0, 1, 0x03, 0x03 }, { 0x02, 0x01, 1, 1, 0x02, 0x02 }, + { 0x02, 0x01, 1, 1, 0x02, 0x02 }, { 0x02, 0x01, 1, 1, 0x02, 0x02 }, { 0x02, 0x01, 1, 1, 0x02, 0x02 }, + { 0x12, 0x00, 1, 0, 0x02, 0x02 }, { 0x12, 0x00, 1, 0, 0x02, 0x02 }, { 0x12, 0x00, 1, 0, 0x02, 0x02 }, + { 0x12, 0x00, 1, 0, 0x02, 0x02 }, { 0x11, 0x00, 1, 0, 0x02, 0x02 }, { 0x11, 0x00, 1, 0, 0x02, 0x02 }, + { 0x11, 0x00, 1, 0, 0x02, 0x02 }, { 0x11, 0x00, 1, 0, 0x02, 0x02 }, { 0x18, 0x00, 1, 1, 0x02, 0x02 }, + { 0x18, 0x00, 1, 1, 0x02, 0x02 }, { 0x18, 0x00, 1, 1, 0x02, 0x02 }, { 0x18, 0x00, 1, 1, 0x02, 0x02 }, + { 0x16, 0x00, 1, 1, 0x02, 0x02 }, { 0x16, 0x00, 1, 1, 0x02, 0x02 }, { 0x16, 0x00, 1, 1, 0x02, 0x02 }, + { 0x16, 0x00, 1, 1, 0x02, 0x02 }, { 0x0A, 0x00, 0, 1, 0x02, 0x02 }, { 0x0A, 0x00, 0, 1, 0x02, 0x02 }, + { 0x0A, 0x00, 0, 1, 0x02, 0x02 }, { 0x0A, 0x00, 0, 1, 0x02, 0x02 }, { 0x19, 0x00, 1, 1, 0x02, 0x02 }, + { 0x19, 0x00, 1, 1, 0x02, 0x02 }, { 0x19, 0x00, 1, 1, 0x02, 0x02 }, { 0x19, 0x00, 1, 1, 0x02, 0x02 }, + { 0x05, 0x01, 1, 1, 0x03, 0x02 }, { 0x05, 0x01, 1, 1, 0x02, 0x02 }, { 0x05, 0x01, 1, 1, 0x03, 0x02 }, + { 0x05, 0x01, 1, 1, 0x02, 0x02 }, { 0x0A, 0x01, 1, 1, 0x02, 0x02 }, { 0x0A, 0x01, 1, 1, 0x02, 0x02 }, + { 0x0A, 0x01, 1, 1, 0x02, 0x02 }, { 0x0A, 0x01, 1, 1, 0x02, 0x02 }, { 0x0A, 0x02, 0, 1, 0x02, 0x02 }, + { 0x0A, 0x02, 0, 1, 0x02, 0x02 }, { 0x0A, 0x02, 0, 1, 0x02, 0x02 }, { 0x0A, 0x02, 0, 1, 0x02, 0x02 }, + { 0x63, 0x05, 0, 1, 0x04, 0x02 }, { 0x63, 0x05, 0, 1, 0x04, 0x02 }, { 0x63, 0x05, 0, 1, 0x04, 0x02 }, + { 0x63, 0x05, 0, 1, 0x04, 0x02 }, { 0x28, 0x00, 0, 1, 0x04, 0x04 }, { 0x28, 0x00, 0, 1, 0x04, 0x04 }, + { 0x28, 0x00, 0, 1, 0x04, 0x04 }, { 0x28, 0x00, 0, 1, 0x04, 0x04 }, { 0x29, 0x00, 0, 1, 0x04, 0x04 }, + { 0x29, 0x00, 0, 1, 0x04, 0x04 }, { 0x29, 0x00, 0, 1, 0x04, 0x04 }, { 0x29, 0x00, 0, 1, 0x04, 0x04 }, + { 0x2B, 0x00, 0, 1, 0x04, 0x20 }, { 0x2B, 0x00, 0, 1, 0x04, 0x20 }, { 0x2B, 0x00, 0, 1, 0x04, 0x20 }, + { 0x2B, 0x00, 0, 1, 0x04, 0x20 }, { 0x1A, 0x00, 1, 1, 0x02, 0x02 }, { 0x1A, 0x00, 1, 1, 0x02, 0x02 }, + { 0x1A, 0x00, 1, 1, 0x02, 0x02 }, { 0x1A, 0x00, 1, 1, 0x02, 0x02 }, { 0x55, 0x09, 0, 0, 0x04, 0x04 }, + { 0x55, 0x09, 0, 0, 0x04, 0x04 }, { 0x55, 0x09, 0, 0, 0x04, 0x04 }, { 0x55, 0x09, 0, 0, 0x04, 0x04 }, + { 0x55, 0x0A, 0, 0, 0x04, 0x04 }, { 0x55, 0x0A, 0, 0, 0x04, 0x04 }, { 0x55, 0x0A, 0, 0, 0x04, 0x04 }, + { 0x55, 0x0A, 0, 0, 0x04, 0x04 }, { 0x52, 0x09, 0, 1, 0x04, 0x04 }, { 0x52, 0x09, 0, 1, 0x04, 0x04 }, + { 0x52, 0x09, 0, 1, 0x04, 0x04 }, { 0x52, 0x09, 0, 1, 0x04, 0x04 }, { 0x48, 0x00, 0, 1, 0x02, 0x26 }, + { 0x48, 0x00, 0, 1, 0x02, 0x26 }, { 0x48, 0x00, 0, 1, 0x02, 0x26 }, { 0x48, 0x00, 0, 1, 0x02, 0x26 }, + { 0x48, 0x01, 0, 1, 0x04, 0x20 }, { 0x48, 0x01, 0, 1, 0x04, 0x20 }, { 0x48, 0x01, 0, 1, 0x04, 0x20 }, + { 0x48, 0x01, 0, 1, 0x04, 0x20 }, { 0x55, 0x0B, 0, 1, 0x04, 0x02 }, { 0x55, 0x0B, 0, 1, 0x04, 0x02 }, + { 0x55, 0x0B, 0, 1, 0x04, 0x02 }, { 0x55, 0x0B, 0, 1, 0x04, 0x02 }, { 0x60, 0x04, 0, 1, 0x02, 0x02 }, + { 0x60, 0x04, 0, 1, 0x02, 0x02 }, { 0x60, 0x04, 0, 1, 0x02, 0x02 }, { 0x60, 0x04, 0, 1, 0x02, 0x02 }, + { 0x49, 0x00, 0, 1, 0x02, 0x20 }, { 0x49, 0x00, 0, 1, 0x02, 0x20 }, { 0x49, 0x00, 0, 1, 0x02, 0x20 }, + { 0x49, 0x00, 0, 1, 0x02, 0x20 }, { 0x52, 0x0A, 0, 1, 0x04, 0x02 }, { 0x52, 0x0A, 0, 1, 0x04, 0x02 }, + { 0x52, 0x0A, 0, 1, 0x04, 0x02 }, { 0x52, 0x0A, 0, 1, 0x04, 0x02 }, { 0x0D, 0x00, 0, 1, 0x04, 0x02 }, + { 0x0D, 0x00, 0, 1, 0x04, 0x02 }, { 0x0D, 0x00, 0, 1, 0x04, 0x02 }, { 0x0D, 0x00, 0, 1, 0x04, 0x02 }, + { 0x0D, 0x00, 0, 1, 0x04, 0x02 }, { 0x0D, 0x00, 0, 1, 0x04, 0x02 }, { 0x0D, 0x00, 0, 1, 0x04, 0x02 }, + { 0x0D, 0x00, 0, 1, 0x04, 0x02 }, { 0x0D, 0x00, 0, 1, 0x04, 0x02 }, { 0x0D, 0x00, 0, 1, 0x04, 0x02 }, + { 0x0D, 0x00, 0, 1, 0x04, 0x02 }, { 0x23, 0x01, 0, 1, 0x04, 0x02 }, { 0x24, 0x01, 0, 1, 0x04, 0x02 }, + { 0x25, 0x01, 0, 1, 0x04, 0x02 }, { 0x25, 0x01, 0, 1, 0x04, 0x02 }, { 0x51, 0x0F, 0, 1, 0x05, 0x05 }, + { 0x51, 0x0F, 0, 1, 0x04, 0x02 }, { 0x51, 0x0F, 0, 1, 0x05, 0x05 }, { 0x51, 0x0F, 0, 1, 0x04, 0x02 }, + { 0x60, 0x05, 0, 1, 0x04, 0x02 }, { 0x60, 0x05, 0, 1, 0x04, 0x02 }, { 0x60, 0x05, 0, 1, 0x04, 0x02 }, + { 0x60, 0x05, 0, 1, 0x04, 0x02 }, { 0x5F, 0x04, 0, 1, 0x03, 0x03 }, { 0x5F, 0x04, 0, 1, 0x02, 0x02 }, + { 0x64, 0x04, 0, 1, 0x02, 0x02 }, { 0x64, 0x04, 0, 1, 0x02, 0x02 }, { 0x61, 0x03, 0, 1, 0x02, 0x02 }, + { 0x61, 0x03, 0, 1, 0x02, 0x02 }, { 0x61, 0x03, 0, 1, 0x02, 0x02 }, { 0x61, 0x03, 0, 1, 0x02, 0x02 }, + { 0x0C, 0x00, 0, 1, 0x02, 0x02 }, { 0x0C, 0x00, 0, 1, 0x02, 0x02 }, { 0x0C, 0x00, 0, 1, 0x02, 0x02 }, + { 0x0C, 0x00, 0, 1, 0x02, 0x02 }, { 0x0C, 0x01, 0, 1, 0x02, 0x02 }, { 0x0C, 0x01, 0, 1, 0x02, 0x02 }, + { 0x0C, 0x01, 0, 1, 0x02, 0x02 }, { 0x0C, 0x01, 0, 1, 0x02, 0x02 }, { 0x0C, 0x02, 0, 1, 0x02, 0x02 }, + { 0x0C, 0x02, 0, 1, 0x02, 0x02 }, { 0x0C, 0x02, 0, 1, 0x02, 0x02 }, { 0x0C, 0x02, 0, 1, 0x02, 0x02 }, + { 0x0C, 0x03, 0, 1, 0x02, 0x02 }, { 0x0C, 0x03, 0, 1, 0x02, 0x02 }, { 0x0C, 0x03, 0, 1, 0x02, 0x02 }, + { 0x0C, 0x03, 0, 1, 0x02, 0x02 }, { 0x0C, 0x04, 0, 1, 0x02, 0x02 }, { 0x0C, 0x04, 0, 1, 0x02, 0x02 }, + { 0x0C, 0x04, 0, 1, 0x02, 0x02 }, { 0x0C, 0x04, 0, 1, 0x02, 0x02 }, { 0x0C, 0x05, 0, 1, 0x02, 0x02 }, + { 0x0C, 0x05, 0, 1, 0x02, 0x02 }, { 0x0C, 0x05, 0, 1, 0x02, 0x02 }, { 0x0C, 0x05, 0, 1, 0x02, 0x02 }, + { 0x0C, 0x06, 0, 1, 0x02, 0x02 }, { 0x0C, 0x06, 0, 1, 0x02, 0x02 }, { 0x0C, 0x06, 0, 1, 0x02, 0x02 }, + { 0x0C, 0x06, 0, 1, 0x02, 0x02 }, { 0x0C, 0x07, 0, 1, 0x02, 0x02 }, { 0x0C, 0x07, 0, 1, 0x02, 0x02 }, + { 0x0C, 0x07, 0, 1, 0x02, 0x02 }, { 0x0C, 0x07, 0, 1, 0x02, 0x02 }, { 0x0C, 0x08, 0, 1, 0x02, 0x02 }, + { 0x0C, 0x08, 0, 1, 0x02, 0x02 }, { 0x0C, 0x08, 0, 1, 0x02, 0x02 }, { 0x0C, 0x08, 0, 1, 0x02, 0x02 }, + { 0x0C, 0x09, 0, 1, 0x02, 0x02 }, { 0x0C, 0x09, 0, 1, 0x02, 0x02 }, { 0x0C, 0x09, 0, 1, 0x02, 0x02 }, + { 0x0C, 0x09, 0, 1, 0x02, 0x02 }, { 0x0C, 0x0A, 0, 1, 0x02, 0x02 }, { 0x0C, 0x0A, 0, 1, 0x02, 0x02 }, + { 0x0C, 0x0A, 0, 1, 0x02, 0x02 }, { 0x0C, 0x0A, 0, 1, 0x02, 0x02 }, { 0x0C, 0x0B, 0, 1, 0x02, 0x02 }, + { 0x0C, 0x0B, 0, 1, 0x02, 0x02 }, { 0x0C, 0x0B, 0, 1, 0x02, 0x02 }, { 0x0C, 0x0B, 0, 1, 0x02, 0x02 }, + { 0x0E, 0x07, 1, 1, 0x02, 0x02 }, { 0x0E, 0x07, 1, 1, 0x02, 0x02 }, { 0x0E, 0x07, 1, 1, 0x02, 0x02 }, + { 0x0E, 0x07, 1, 1, 0x02, 0x02 }, { 0x1A, 0x01, 1, 1, 0x02, 0x02 }, { 0x1A, 0x01, 1, 1, 0x02, 0x02 }, + { 0x1A, 0x01, 1, 1, 0x02, 0x02 }, { 0x1A, 0x01, 1, 1, 0x02, 0x02 }, { 0x3B, 0x01, 0, 1, 0x02, 0x02 }, + { 0x3B, 0x01, 0, 1, 0x02, 0x02 }, { 0x3B, 0x01, 0, 1, 0x02, 0x02 }, { 0x3B, 0x01, 0, 1, 0x02, 0x02 }, + { 0x3B, 0x02, 0, 1, 0x02, 0x02 }, { 0x3B, 0x02, 0, 1, 0x02, 0x02 }, { 0x3B, 0x02, 0, 1, 0x02, 0x02 }, + { 0x3B, 0x02, 0, 1, 0x02, 0x02 }, { 0x5B, 0x04, 0, 1, 0x02, 0x02 }, { 0x5B, 0x04, 0, 1, 0x02, 0x02 }, + { 0x5B, 0x04, 0, 1, 0x02, 0x02 }, { 0x5B, 0x04, 0, 1, 0x02, 0x02 }, { 0x63, 0x06, 0, 0, 0x02, 0x26 }, + { 0x63, 0x06, 0, 0, 0x02, 0x26 }, { 0x63, 0x06, 0, 0, 0x02, 0x26 }, { 0x63, 0x06, 0, 0, 0x02, 0x26 }, + { 0x63, 0x07, 0, 0, 0x2E, 0x2E }, { 0x63, 0x07, 0, 0, 0x2E, 0x2E }, { 0x63, 0x07, 0, 0, 0x2E, 0x2E }, + { 0x63, 0x07, 0, 0, 0x2E, 0x2E }, { 0x5B, 0x05, 0, 1, 0x02, 0x02 }, { 0x5B, 0x05, 0, 1, 0x02, 0x02 }, + { 0x5B, 0x05, 0, 1, 0x02, 0x02 }, { 0x5B, 0x05, 0, 1, 0x02, 0x02 }, { 0x5B, 0x06, 0, 1, 0x2C, 0x2C }, + { 0x5B, 0x06, 0, 1, 0x2C, 0x2C }, { 0x5B, 0x06, 0, 1, 0x2C, 0x2C }, { 0x5B, 0x06, 0, 1, 0x2C, 0x2C }, + { 0x5B, 0x07, 0, 1, 0x2C, 0x2C }, { 0x5B, 0x07, 0, 1, 0x2C, 0x2C }, { 0x5B, 0x07, 0, 1, 0x2C, 0x2C }, + { 0x5B, 0x07, 0, 1, 0x2C, 0x2C }, { 0x5B, 0x08, 0, 0, 0x02, 0x02 }, { 0x5B, 0x08, 0, 0, 0x02, 0x02 }, + { 0x5B, 0x08, 0, 0, 0x02, 0x02 }, { 0x5B, 0x08, 0, 0, 0x02, 0x02 }, { 0x62, 0x03, 0, 1, 0x2C, 0x2C }, + { 0x62, 0x03, 0, 1, 0x2C, 0x2C }, { 0x62, 0x03, 0, 1, 0x2C, 0x2C }, { 0x62, 0x03, 0, 1, 0x2C, 0x2C }, + { 0x57, 0x05, 0, 1, 0x02, 0x02 }, { 0x57, 0x05, 0, 1, 0x02, 0x02 }, { 0x57, 0x05, 0, 1, 0x02, 0x02 }, + { 0x57, 0x05, 0, 1, 0x02, 0x02 }, { 0x07, 0x03, 0, 1, 0x02, 0x02 }, { 0x07, 0x03, 0, 1, 0x02, 0x02 }, + { 0x07, 0x03, 0, 1, 0x02, 0x02 }, { 0x07, 0x03, 0, 1, 0x02, 0x02 }, { 0x52, 0x0B, 0, 1, 0x04, 0x02 }, + { 0x52, 0x0B, 0, 1, 0x04, 0x02 }, { 0x52, 0x0B, 0, 1, 0x04, 0x02 }, { 0x52, 0x0B, 0, 1, 0x04, 0x02 }, + { 0x3B, 0x03, 0, 1, 0x02, 0x02 }, { 0x3B, 0x03, 0, 1, 0x02, 0x02 }, { 0x3B, 0x03, 0, 1, 0x02, 0x02 }, + { 0x3B, 0x03, 0, 1, 0x02, 0x02 }, { 0x61, 0x04, 0, 1, 0x02, 0x02 }, { 0x61, 0x04, 0, 1, 0x02, 0x02 }, + { 0x61, 0x04, 0, 1, 0x02, 0x02 }, { 0x61, 0x04, 0, 1, 0x02, 0x02 }, { 0x5F, 0x03, 0, 1, 0x03, 0x03 }, + { 0x5F, 0x03, 0, 1, 0x02, 0x02 }, { 0x64, 0x03, 0, 1, 0x02, 0x02 }, { 0x64, 0x03, 0, 1, 0x02, 0x02 }, + { 0x5F, 0x03, 0, 1, 0x00, 0x00 }, { 0x52, 0x0C, 0, 1, 0x04, 0x02 }, { 0x52, 0x0C, 0, 1, 0x04, 0x02 }, + { 0x52, 0x0C, 0, 1, 0x04, 0x02 }, { 0x52, 0x0C, 0, 1, 0x04, 0x02 }, { 0x48, 0x02, 1, 1, 0x04, 0x20 }, + { 0x48, 0x02, 1, 1, 0x04, 0x20 }, { 0x48, 0x02, 1, 1, 0x04, 0x20 }, { 0x48, 0x02, 1, 1, 0x04, 0x20 }, + { 0x4B, 0x00, 0, 1, 0x04, 0x20 }, { 0x4B, 0x00, 0, 1, 0x04, 0x20 }, { 0x4B, 0x00, 0, 1, 0x04, 0x20 }, + { 0x4B, 0x00, 0, 1, 0x04, 0x20 }, { 0x53, 0x06, 0, 1, 0x03, 0x03 }, { 0x53, 0x06, 0, 1, 0x03, 0x03 }, + { 0x53, 0x06, 0, 1, 0x03, 0x03 }, { 0x53, 0x06, 0, 1, 0x03, 0x03 }, { 0x51, 0x10, 0, 1, 0x0B, 0x0B }, + { 0x51, 0x10, 0, 1, 0x0B, 0x0B }, { 0x51, 0x10, 0, 1, 0x0B, 0x0B }, { 0x51, 0x10, 0, 1, 0x0B, 0x0B }, + { 0x52, 0x0D, 0, 1, 0x03, 0x03 }, { 0x52, 0x0D, 0, 1, 0x02, 0x02 }, { 0x52, 0x0D, 0, 1, 0x03, 0x03 }, + { 0x52, 0x0D, 0, 1, 0x02, 0x02 }, { 0x4F, 0x00, 0, 1, 0x03, 0x03 }, { 0x4F, 0x00, 0, 1, 0x03, 0x03 }, + { 0x4F, 0x00, 0, 1, 0x03, 0x03 }, { 0x4F, 0x00, 0, 1, 0x03, 0x03 }, { 0x4F, 0x00, 0, 1, 0x03, 0x03 }, + { 0x1A, 0x06, 1, 1, 0x02, 0x02 }, { 0x1A, 0x06, 1, 1, 0x02, 0x02 }, { 0x1A, 0x06, 1, 1, 0x02, 0x02 }, + { 0x1A, 0x06, 1, 1, 0x02, 0x02 }, { 0x66, 0x00, 0, 1, 0x02, 0x02 }, { 0x66, 0x00, 0, 1, 0x02, 0x02 }, + { 0x66, 0x00, 0, 1, 0x02, 0x02 }, { 0x66, 0x00, 0, 1, 0x02, 0x02 }, { 0x1A, 0x07, 1, 1, 0x02, 0x02 }, + { 0x1A, 0x07, 1, 1, 0x02, 0x02 }, { 0x1A, 0x07, 1, 1, 0x02, 0x02 }, { 0x1A, 0x07, 1, 1, 0x02, 0x02 }, + { 0x32, 0x01, 0, 1, 0x02, 0x02 }, { 0x32, 0x01, 0, 1, 0x02, 0x02 }, { 0x32, 0x01, 0, 1, 0x02, 0x02 }, + { 0x32, 0x01, 0, 1, 0x02, 0x02 }, { 0x2C, 0x01, 0, 1, 0x04, 0x20 }, { 0x2C, 0x01, 0, 1, 0x04, 0x20 }, + { 0x2C, 0x01, 0, 1, 0x04, 0x20 }, { 0x2C, 0x01, 0, 1, 0x04, 0x20 }, { 0x33, 0x00, 0, 1, 0x04, 0x20 }, + { 0x33, 0x00, 0, 1, 0x04, 0x20 }, { 0x33, 0x00, 0, 1, 0x04, 0x20 }, { 0x33, 0x00, 0, 1, 0x04, 0x20 }, + { 0x0D, 0x01, 0, 0, 0x04, 0x02 }, { 0x0D, 0x01, 0, 0, 0x04, 0x02 }, { 0x0D, 0x01, 0, 0, 0x04, 0x02 }, + { 0x0D, 0x01, 0, 0, 0x04, 0x02 }, { 0x0D, 0x02, 0, 1, 0x04, 0x02 }, { 0x0D, 0x02, 0, 1, 0x04, 0x02 }, + { 0x0D, 0x02, 0, 1, 0x04, 0x02 }, { 0x0D, 0x02, 0, 1, 0x04, 0x02 }, { 0x0D, 0x03, 0, 1, 0x04, 0x02 }, + { 0x0D, 0x03, 0, 1, 0x04, 0x02 }, { 0x0D, 0x03, 0, 1, 0x04, 0x02 }, { 0x0D, 0x03, 0, 1, 0x04, 0x02 }, + { 0x0D, 0x04, 0, 1, 0x04, 0x02 }, { 0x0D, 0x04, 0, 1, 0x04, 0x02 }, { 0x0D, 0x04, 0, 1, 0x04, 0x02 }, + { 0x0D, 0x04, 0, 1, 0x04, 0x02 }, { 0x0D, 0x05, 0, 1, 0x04, 0x02 }, { 0x0D, 0x05, 0, 1, 0x04, 0x02 }, + { 0x0D, 0x05, 0, 1, 0x04, 0x02 }, { 0x0D, 0x05, 0, 1, 0x04, 0x02 }, { 0x0D, 0x06, 0, 1, 0x04, 0x02 }, + { 0x0D, 0x06, 0, 1, 0x04, 0x02 }, { 0x0D, 0x06, 0, 1, 0x04, 0x02 }, { 0x0D, 0x06, 0, 1, 0x04, 0x02 }, + { 0x0D, 0x07, 0, 1, 0x04, 0x02 }, { 0x0D, 0x07, 0, 1, 0x04, 0x02 }, { 0x0D, 0x07, 0, 1, 0x04, 0x02 }, + { 0x0D, 0x07, 0, 1, 0x04, 0x02 }, { 0x50, 0x00, 0, 1, 0x04, 0x20 }, { 0x50, 0x00, 0, 1, 0x04, 0x20 }, + { 0x50, 0x00, 0, 1, 0x04, 0x20 }, { 0x50, 0x00, 0, 1, 0x04, 0x20 }, { 0x52, 0x0E, 0, 1, 0x03, 0x03 }, + { 0x52, 0x0E, 0, 1, 0x02, 0x02 }, { 0x52, 0x0E, 0, 1, 0x03, 0x03 }, { 0x52, 0x0E, 0, 1, 0x02, 0x02 }, + { 0x63, 0x08, 0, 0, 0x20, 0x20 }, { 0x63, 0x08, 0, 0, 0x20, 0x20 }, { 0x63, 0x08, 0, 0, 0x20, 0x20 }, + { 0x63, 0x08, 0, 0, 0x20, 0x20 }, { 0x63, 0x09, 0, 0, 0x02, 0x02 }, { 0x63, 0x09, 0, 0, 0x02, 0x02 }, + { 0x63, 0x09, 0, 0, 0x02, 0x02 }, { 0x63, 0x09, 0, 0, 0x02, 0x02 }, { 0x57, 0x07, 0, 1, 0x2C, 0x2C }, + { 0x57, 0x07, 0, 1, 0x2C, 0x2C }, { 0x57, 0x07, 0, 1, 0x2C, 0x2C }, { 0x57, 0x07, 0, 1, 0x2C, 0x2C }, + { 0x61, 0x05, 0, 1, 0x02, 0x02 }, { 0x61, 0x05, 0, 1, 0x02, 0x02 }, { 0x61, 0x05, 0, 1, 0x02, 0x02 }, + { 0x61, 0x05, 0, 1, 0x02, 0x02 }, { 0x53, 0x07, 0, 1, 0x03, 0x03 }, { 0x53, 0x07, 0, 1, 0x03, 0x03 }, + { 0x53, 0x07, 0, 1, 0x03, 0x03 }, { 0x53, 0x07, 0, 1, 0x03, 0x03 }, { 0x0F, 0x00, 1, 1, 0x02, 0x02 }, + { 0x0F, 0x00, 1, 1, 0x02, 0x02 }, { 0x0F, 0x00, 1, 1, 0x02, 0x02 }, { 0x0F, 0x00, 1, 1, 0x02, 0x02 }, + { 0x0C, 0x0C, 0, 1, 0x02, 0x02 }, { 0x0C, 0x0C, 0, 1, 0x02, 0x02 }, { 0x0C, 0x0C, 0, 1, 0x02, 0x02 }, + { 0x0C, 0x0C, 0, 1, 0x02, 0x02 }, { 0x41, 0x01, 0, 1, 0x02, 0x02 }, { 0x41, 0x01, 0, 1, 0x02, 0x02 }, + { 0x41, 0x01, 0, 1, 0x02, 0x02 }, { 0x41, 0x01, 0, 1, 0x02, 0x02 }, { 0x3D, 0x01, 0, 1, 0x04, 0x04 }, + { 0x3D, 0x01, 0, 1, 0x04, 0x04 }, { 0x3D, 0x01, 0, 1, 0x04, 0x04 }, { 0x3D, 0x01, 0, 1, 0x04, 0x04 }, + { 0x5C, 0x07, 0, 1, 0x03, 0x03 }, { 0x5C, 0x07, 0, 1, 0x02, 0x02 }, { 0x5C, 0x07, 0, 1, 0x03, 0x03 }, + { 0x5C, 0x07, 0, 1, 0x02, 0x02 }, { 0x53, 0x08, 0, 1, 0x03, 0x03 }, { 0x53, 0x08, 0, 1, 0x03, 0x03 }, + { 0x53, 0x08, 0, 1, 0x03, 0x03 }, { 0x53, 0x08, 0, 1, 0x03, 0x03 }, { 0x03, 0x02, 0, 1, 0x02, 0x02 }, + { 0x03, 0x02, 0, 1, 0x02, 0x02 }, { 0x03, 0x02, 0, 1, 0x02, 0x02 }, { 0x03, 0x02, 0, 1, 0x02, 0x02 }, + { 0x3D, 0x02, 0, 1, 0x02, 0x02 }, { 0x3D, 0x02, 0, 1, 0x02, 0x02 }, { 0x3D, 0x02, 0, 1, 0x02, 0x02 }, + { 0x3D, 0x02, 0, 1, 0x02, 0x02 }, { 0x43, 0x05, 0, 1, 0x02, 0x02 }, { 0x43, 0x05, 0, 1, 0x02, 0x02 }, + { 0x43, 0x05, 0, 1, 0x02, 0x02 }, { 0x43, 0x05, 0, 1, 0x02, 0x02 }, { 0x43, 0x06, 0, 1, 0x02, 0x02 }, + { 0x43, 0x06, 0, 1, 0x02, 0x02 }, { 0x43, 0x06, 0, 1, 0x02, 0x02 }, { 0x43, 0x06, 0, 1, 0x02, 0x02 }, + { 0x51, 0x11, 0, 1, 0x03, 0x03 }, { 0x51, 0x11, 0, 1, 0x02, 0x02 }, { 0x51, 0x11, 0, 1, 0x03, 0x03 }, + { 0x51, 0x11, 0, 1, 0x02, 0x02 }, { 0x3E, 0x01, 0, 1, 0x02, 0x02 }, { 0x3E, 0x01, 0, 1, 0x02, 0x02 }, + { 0x3E, 0x01, 0, 1, 0x02, 0x02 }, { 0x3E, 0x01, 0, 1, 0x02, 0x02 }, { 0x3E, 0x02, 0, 1, 0x02, 0x02 }, + { 0x3E, 0x02, 0, 1, 0x02, 0x02 }, { 0x3E, 0x02, 0, 1, 0x02, 0x02 }, { 0x3E, 0x02, 0, 1, 0x02, 0x02 }, + { 0x3E, 0x03, 0, 1, 0x02, 0x02 }, { 0x3E, 0x03, 0, 1, 0x02, 0x02 }, { 0x3E, 0x03, 0, 1, 0x02, 0x02 }, + { 0x3E, 0x03, 0, 1, 0x02, 0x02 }, { 0x3E, 0x04, 0, 1, 0x02, 0x02 }, { 0x3E, 0x04, 0, 1, 0x02, 0x02 }, + { 0x3E, 0x04, 0, 1, 0x02, 0x02 }, { 0x3E, 0x04, 0, 1, 0x02, 0x02 }, { 0x3E, 0x05, 0, 1, 0x02, 0x03 }, + { 0x3E, 0x05, 0, 1, 0x02, 0x03 }, { 0x3E, 0x05, 0, 1, 0x02, 0x03 }, { 0x3E, 0x05, 0, 1, 0x02, 0x03 }, + { 0x3E, 0x06, 0, 1, 0x02, 0x02 }, { 0x3E, 0x06, 0, 1, 0x02, 0x02 }, { 0x3E, 0x06, 0, 1, 0x02, 0x02 }, + { 0x3E, 0x06, 0, 1, 0x02, 0x02 }, { 0x3E, 0x07, 0, 1, 0x02, 0x02 }, { 0x3E, 0x07, 0, 1, 0x02, 0x02 }, + { 0x3E, 0x07, 0, 1, 0x02, 0x02 }, { 0x3E, 0x07, 0, 1, 0x02, 0x02 }, { 0x3E, 0x08, 0, 1, 0x02, 0x02 }, + { 0x3E, 0x08, 0, 1, 0x02, 0x02 }, { 0x3E, 0x08, 0, 1, 0x02, 0x02 }, { 0x3E, 0x08, 0, 1, 0x02, 0x02 }, + { 0x3E, 0x09, 0, 1, 0x02, 0x02 }, { 0x3E, 0x09, 0, 1, 0x02, 0x02 }, { 0x3E, 0x09, 0, 1, 0x02, 0x02 }, + { 0x3E, 0x09, 0, 1, 0x02, 0x02 }, { 0x3E, 0x0A, 0, 1, 0x02, 0x02 }, { 0x3E, 0x0A, 0, 1, 0x02, 0x02 }, + { 0x3E, 0x0A, 0, 1, 0x02, 0x02 }, { 0x3E, 0x0A, 0, 1, 0x02, 0x02 }, { 0x3E, 0x0B, 0, 1, 0x02, 0x02 }, + { 0x3E, 0x0B, 0, 1, 0x02, 0x02 }, { 0x3E, 0x0B, 0, 1, 0x02, 0x02 }, { 0x3E, 0x0B, 0, 1, 0x02, 0x02 }, + { 0x3E, 0x0C, 0, 1, 0x02, 0x02 }, { 0x3E, 0x0C, 0, 1, 0x02, 0x02 }, { 0x3E, 0x0C, 0, 1, 0x02, 0x02 }, + { 0x3E, 0x0C, 0, 1, 0x02, 0x02 }, { 0x37, 0x01, 0, 1, 0x04, 0x20 }, { 0x37, 0x01, 0, 1, 0x04, 0x20 }, + { 0x37, 0x01, 0, 1, 0x04, 0x20 }, { 0x37, 0x01, 0, 1, 0x04, 0x20 }, { 0x08, 0x01, 0, 1, 0x04, 0x04 }, + { 0x08, 0x01, 0, 1, 0x04, 0x04 }, { 0x08, 0x01, 0, 1, 0x04, 0x04 }, { 0x08, 0x01, 0, 1, 0x04, 0x04 }, + { 0x4C, 0x01, 0, 1, 0x04, 0x20 }, { 0x4C, 0x01, 0, 1, 0x04, 0x20 }, { 0x4C, 0x01, 0, 1, 0x04, 0x20 }, + { 0x4C, 0x01, 0, 1, 0x04, 0x20 }, { 0x63, 0x0A, 0, 1, 0x04, 0x02 }, { 0x63, 0x0A, 0, 1, 0x04, 0x02 }, + { 0x63, 0x0A, 0, 1, 0x04, 0x02 }, { 0x63, 0x0A, 0, 1, 0x04, 0x02 }, { 0x09, 0x01, 0, 1, 0x02, 0x02 }, + { 0x09, 0x01, 0, 1, 0x02, 0x02 }, { 0x09, 0x01, 0, 1, 0x02, 0x02 }, { 0x09, 0x01, 0, 1, 0x02, 0x02 }, + { 0x52, 0x0F, 0, 1, 0x03, 0x03 }, { 0x52, 0x0F, 0, 1, 0x02, 0x02 }, { 0x52, 0x0F, 0, 1, 0x03, 0x03 }, + { 0x52, 0x0F, 0, 1, 0x02, 0x02 }, { 0x5B, 0x09, 0, 0, 0x02, 0x02 }, { 0x5B, 0x09, 0, 0, 0x02, 0x02 }, + { 0x5B, 0x09, 0, 0, 0x02, 0x02 }, { 0x5B, 0x09, 0, 0, 0x02, 0x02 }, { 0x4C, 0x02, 0, 1, 0x04, 0x20 }, + { 0x4C, 0x02, 0, 1, 0x04, 0x20 }, { 0x4C, 0x02, 0, 1, 0x04, 0x20 }, { 0x4C, 0x02, 0, 1, 0x04, 0x20 }, + { 0x55, 0x0C, 0, 1, 0x04, 0x02 }, { 0x55, 0x0C, 0, 1, 0x04, 0x02 }, { 0x55, 0x0C, 0, 1, 0x04, 0x02 }, + { 0x55, 0x0C, 0, 1, 0x04, 0x02 }, { 0x17, 0x02, 1, 1, 0x02, 0x02 }, { 0x17, 0x02, 1, 1, 0x02, 0x02 }, + { 0x17, 0x02, 1, 1, 0x02, 0x02 }, { 0x17, 0x02, 1, 1, 0x02, 0x02 }, { 0x4A, 0x01, 0, 0, 0x03, 0x03 }, + { 0x4A, 0x01, 0, 0, 0x02, 0x02 }, { 0x4A, 0x01, 0, 0, 0x03, 0x03 }, { 0x4A, 0x01, 0, 0, 0x02, 0x02 }, + { 0x43, 0x07, 0, 1, 0x02, 0x02 }, { 0x43, 0x07, 0, 1, 0x02, 0x02 }, { 0x43, 0x07, 0, 1, 0x02, 0x02 }, + { 0x43, 0x07, 0, 1, 0x02, 0x02 }, { 0x5D, 0x12, 0, 1, 0x02, 0x02 }, { 0x5D, 0x12, 0, 1, 0x02, 0x02 }, + { 0x5D, 0x12, 0, 1, 0x02, 0x02 }, { 0x5D, 0x12, 0, 1, 0x02, 0x02 }, { 0x3E, 0x0D, 0, 1, 0x02, 0x02 }, + { 0x3E, 0x0D, 0, 1, 0x02, 0x02 }, { 0x3E, 0x0D, 0, 1, 0x02, 0x02 }, { 0x3E, 0x0D, 0, 1, 0x02, 0x02 }, + { 0x56, 0x02, 0, 1, 0x12, 0x12 }, { 0x56, 0x02, 0, 1, 0x02, 0x02 }, { 0x56, 0x02, 0, 1, 0x12, 0x12 }, + { 0x56, 0x02, 0, 1, 0x02, 0x02 }, { 0x57, 0x08, 0, 1, 0x02, 0x02 }, { 0x57, 0x08, 0, 1, 0x02, 0x02 }, + { 0x57, 0x08, 0, 1, 0x02, 0x02 }, { 0x57, 0x08, 0, 1, 0x02, 0x02 }, { 0x56, 0x03, 0, 1, 0x03, 0x03 }, + { 0x56, 0x03, 0, 1, 0x03, 0x03 }, { 0x56, 0x03, 0, 1, 0x03, 0x03 }, { 0x56, 0x03, 0, 1, 0x03, 0x03 }, + { 0x57, 0x09, 0, 1, 0x03, 0x03 }, { 0x57, 0x09, 0, 1, 0x03, 0x03 }, { 0x57, 0x09, 0, 1, 0x03, 0x03 }, + { 0x57, 0x09, 0, 1, 0x03, 0x03 }, { 0x5C, 0x08, 0, 1, 0x03, 0x03 }, { 0x5C, 0x08, 0, 1, 0x03, 0x03 }, + { 0x5C, 0x08, 0, 1, 0x03, 0x03 }, { 0x5C, 0x08, 0, 1, 0x03, 0x03 }, }; -#define TITLED_SCENE(name, title, unk_10, config, unk_12) \ -{ \ - (u32)_##name##SegmentRomStart, (u32)_##name##SegmentRomEnd, \ - (u32)_##title##SegmentRomStart, (u32)_##title##SegmentRomEnd, \ - unk_10, config, unk_12 \ -} +#define TITLED_SCENE(name, title, unk_10, config, unk_12) \ + { \ + (u32) _##name##SegmentRomStart, (u32)_##name##SegmentRomEnd, (u32)_##title##SegmentRomStart, \ + (u32)_##title##SegmentRomEnd, unk_10, config, unk_12 \ + } #define UNTITLED_SCENE(name, unk_10, config, unk_12) \ -{ \ - (u32)_##name##SegmentRomStart, (u32)_##name##SegmentRomEnd, \ - 0, 0, \ - unk_10, config, unk_12 \ -} + { (u32) _##name##SegmentRomStart, (u32)_##name##SegmentRomEnd, 0, 0, unk_10, config, unk_12 } -Scene gSceneTable[] = -{ +Scene gSceneTable[] = { TITLED_SCENE(ydan_scene, g_pn_06, 1, 19, 2), TITLED_SCENE(ddan_scene, g_pn_08, 1, 20, 3), TITLED_SCENE(bdan_scene, g_pn_07, 1, 21, 4), @@ -1689,14 +645,13 @@ Scene gSceneTable[] = UNTITLED_SCENE(testroom_scene, 0, 0, 0), }; -Gfx sDefaultDisplayList[] = -{ - gsSPSegment(0x08, D_80127098), - gsSPSegment(0x09, D_80127098), - gsSPSegment(0x0A, D_80127098), - gsSPSegment(0x0B, D_80127098), - gsSPSegment(0x0C, D_80127098), - gsSPSegment(0x0D, D_80127098), +Gfx sDefaultDisplayList[] = { + gsSPSegment(0x08, gEmptyDL), + gsSPSegment(0x09, gEmptyDL), + gsSPSegment(0x0A, gEmptyDL), + gsSPSegment(0x0B, gEmptyDL), + gsSPSegment(0x0C, gEmptyDL), + gsSPSegment(0x0D, gEmptyDL), gsDPPipeSync(), gsDPSetPrimColor(0, 0, 0x80, 0x80, 0x80, 0x80), gsDPSetEnvColor(0x80, 0x80, 0x80, 0x80), @@ -1704,60 +659,55 @@ Gfx sDefaultDisplayList[] = }; // Computes next entrance index based on age and day time to set the fade out transition -void func_800994A0(GlobalContext* globalCtx) -{ +void func_800994A0(GlobalContext* globalCtx) { s16 computedEntranceIndex; - if (gSaveContext.night_flag) - { - if (LINK_IS_CHILD) + if (gSaveContext.night_flag) { + if (LINK_IS_CHILD) { computedEntranceIndex = globalCtx->nextEntranceIndex + 1; - else + } else { computedEntranceIndex = globalCtx->nextEntranceIndex + 3; - } - else - { - if (LINK_IS_CHILD) + } + } else { + if (LINK_IS_CHILD) { computedEntranceIndex = globalCtx->nextEntranceIndex; - else + } else { computedEntranceIndex = globalCtx->nextEntranceIndex + 2; + } } globalCtx->fadeOutTransition = gEntranceTable[computedEntranceIndex].fadeOutTransition; } // Scene Draw Config 0 -void func_80099550(GlobalContext* globalCtx) -{ +void func_80099550(GlobalContext* globalCtx) { GraphicsContext* gfxCtx = globalCtx->state.gfxCtx; - Gfx* gfxArr[4]; + Gfx* dispRefs[4]; - func_800C6AC4(gfxArr, globalCtx->state.gfxCtx, "../z_scene_table.c", 4725); + Graph_OpenDisps(dispRefs, globalCtx->state.gfxCtx, "../z_scene_table.c", 4725); gSPDisplayList(gfxCtx->polyOpa.p++, sDefaultDisplayList); gSPDisplayList(gfxCtx->polyXlu.p++, sDefaultDisplayList); - func_800C6B54(gfxArr, globalCtx->state.gfxCtx, "../z_scene_table.c", 4735); + Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_scene_table.c", 4735); } u32 D_8012A2F8[] = { 0x0200BA18, 0x0200CA18 }; // Scene Draw Config 19 -void func_800995DC(GlobalContext* globalCtx) -{ +void func_800995DC(GlobalContext* globalCtx) { u32 gameplayFrames; GraphicsContext* gfxCtx; - Gfx* gfxArr[4]; + Gfx* dispRefs[4]; gameplayFrames = globalCtx->gameplayFrames; gfxCtx = globalCtx->state.gfxCtx; - func_800C6AC4(gfxArr, globalCtx->state.gfxCtx, "../z_scene_table.c", 4763); + Graph_OpenDisps(dispRefs, globalCtx->state.gfxCtx, "../z_scene_table.c", 4763); gSPSegment(gfxCtx->polyXlu.p++, 0x09, - Draw_TwoTexScroll(globalCtx->state.gfxCtx, - 0, 127 - (gameplayFrames % 128), (gameplayFrames * 1) % 128, 32, 32, - 1, gameplayFrames % 128, (gameplayFrames * 1) % 128, 32, 32)); + Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 127 - (gameplayFrames % 128), (gameplayFrames * 1) % 128, + 32, 32, 1, gameplayFrames % 128, (gameplayFrames * 1) % 128, 32, 32)); gDPPipeSync(gfxCtx->polyXlu.p++); gDPSetEnvColor(gfxCtx->polyXlu.p++, 0x80, 0x80, 0x80, 0x80); @@ -1766,59 +716,54 @@ void func_800995DC(GlobalContext* globalCtx) gSPSegment(gfxCtx->polyOpa.p++, 0x08, SEGMENTED_TO_VIRTUAL(D_8012A2F8[gSaveContext.night_flag])); - func_800C6B54(gfxArr, globalCtx->state.gfxCtx, "../z_scene_table.c", 4783); + Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_scene_table.c", 4783); } // Scene Draw Config 28 -void func_80099760(GlobalContext* globalCtx) -{ +void func_80099760(GlobalContext* globalCtx) { u32 gameplayFrames; GraphicsContext* gfxCtx; - Gfx* gfxArr[4]; + Gfx* dispRefs[4]; gfxCtx = globalCtx->state.gfxCtx; - func_800C6AC4(gfxArr, globalCtx->state.gfxCtx, "../z_scene_table.c", 4845); + Graph_OpenDisps(dispRefs, globalCtx->state.gfxCtx, "../z_scene_table.c", 4845); gameplayFrames = globalCtx->gameplayFrames; gSPSegment(gfxCtx->polyXlu.p++, 0x08, - Draw_TwoTexScroll(globalCtx->state.gfxCtx, - 0, (gameplayFrames * 2) % 256, 0, 64, 32, - 1, 0, (gameplayFrames * 2) % 128, 64, 32)); + Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, (gameplayFrames * 2) % 256, 0, 64, 32, 1, 0, + (gameplayFrames * 2) % 128, 64, 32)); gDPPipeSync(gfxCtx->polyXlu.p++); gDPSetEnvColor(gfxCtx->polyXlu.p++, 0x80, 0x80, 0x80, 0x80); - func_800C6B54(gfxArr, globalCtx->state.gfxCtx, "../z_scene_table.c", 4859); + Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_scene_table.c", 4859); } u32 D_8012A300[] = { 0x02012378, 0x02013378 }; u32 D_8012A308[] = { 0x02011F78, 0x02014778, 0x02014378, 0x02013F78, 0x02014B78, 0x02013B78, 0x02012F78, 0x02012B78 }; // Scene Draw Config 20 -void func_80099878(GlobalContext* globalCtx) -{ +void func_80099878(GlobalContext* globalCtx) { u32 gameplayFrames; s32 pad; Gfx* displayListHead; GraphicsContext* gfxCtx; - Gfx* gfxArr[4]; + Gfx* dispRefs[4]; displayListHead = Graph_Alloc(globalCtx->state.gfxCtx, 6 * sizeof(Gfx)); gfxCtx = globalCtx->state.gfxCtx; - func_800C6AC4(gfxArr, globalCtx->state.gfxCtx, "../z_scene_table.c", 4905); + Graph_OpenDisps(dispRefs, globalCtx->state.gfxCtx, "../z_scene_table.c", 4905); gameplayFrames = globalCtx->gameplayFrames; gSPSegment(gfxCtx->polyOpa.p++, 0x08, SEGMENTED_TO_VIRTUAL(D_8012A300[gSaveContext.night_flag])); gSPSegment(gfxCtx->polyOpa.p++, 0x09, SEGMENTED_TO_VIRTUAL(D_8012A308[(s32)(gameplayFrames & 14) >> 1])); gSPSegment(gfxCtx->polyXlu.p++, 0x09, - Draw_TwoTexScroll(globalCtx->state.gfxCtx, - 0, (gameplayFrames * 1) % 256, 0, 64, 32, - 1, 0, (gameplayFrames * 1) % 128, 64, 32)); + Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, (gameplayFrames * 1) % 256, 0, 64, 32, 1, 0, + (gameplayFrames * 1) % 128, 64, 32)); gSPSegment(gfxCtx->polyOpa.p++, 0x0A, - Draw_TwoTexScroll(globalCtx->state.gfxCtx, - 0, 0, (gameplayFrames * 1) % 128, 32, 32, - 1, 0, (gameplayFrames * 2) % 128, 32, 32)); + Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 0, (gameplayFrames * 1) % 128, 32, 32, 1, 0, + (gameplayFrames * 2) % 128, 32, 32)); { s32 pad2[2]; } // Necessary to match stack usage @@ -1837,35 +782,32 @@ void func_80099878(GlobalContext* globalCtx) gDPSetEnvColor(displayListHead++, 0xFF, 0xFF, 0xFF, globalCtx->unk_11D30[1]); gSPEndDisplayList(displayListHead); - func_800C6B54(gfxArr, globalCtx->state.gfxCtx, "../z_scene_table.c", 4956); + Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_scene_table.c", 4956); } // Scene Draw Config 30 -void func_80099BD8(GlobalContext* globalCtx) -{ +void func_80099BD8(GlobalContext* globalCtx) { f32 temp; Gfx* displayListHead; GraphicsContext* gfxCtx; - Gfx* gfxArr[4]; + Gfx* dispRefs[4]; displayListHead = Graph_Alloc(globalCtx->state.gfxCtx, 18 * sizeof(Gfx)); gfxCtx = globalCtx->state.gfxCtx; - func_800C6AC4(gfxArr, globalCtx->state.gfxCtx, "../z_scene_table.c", 5069); + Graph_OpenDisps(dispRefs, globalCtx->state.gfxCtx, "../z_scene_table.c", 5069); temp = globalCtx->unk_11D30[0] / 255.0f; gSPSegment(gfxCtx->polyXlu.p++, 0x08, displayListHead); gSPSegment(gfxCtx->polyOpa.p++, 0x08, displayListHead); - gDPSetPrimColor(displayListHead++, 0, 0, - 0xFF - (u8)(185.0f * temp), 0xFF - (u8)(145.0f * temp), + gDPSetPrimColor(displayListHead++, 0, 0, 0xFF - (u8)(185.0f * temp), 0xFF - (u8)(145.0f * temp), 0xFF - (u8)(105.0f * temp), 0xFF); gSPEndDisplayList(displayListHead++); gSPSegment(gfxCtx->polyXlu.p++, 0x09, displayListHead); gSPSegment(gfxCtx->polyOpa.p++, 0x09, displayListHead); - gDPSetPrimColor(displayListHead++, 0, 0, - 0x4C + (u8)(6.0f * temp), 0x4C + (u8)(34.0f * temp), + gDPSetPrimColor(displayListHead++, 0, 0, 0x4C + (u8)(6.0f * temp), 0x4C + (u8)(34.0f * temp), 0x4C + (u8)(74.0f * temp), 0xFF); gSPEndDisplayList(displayListHead++); @@ -1877,8 +819,7 @@ void func_80099BD8(GlobalContext* globalCtx) gSPSegment(gfxCtx->polyOpa.p++, 0x0B, displayListHead); gSPSegment(gfxCtx->polyXlu.p++, 0x0B, displayListHead); - gDPSetPrimColor(displayListHead++, 0, 0, - 0x59 + (u8)(166.0f * temp), 0x59 + (u8)(166.0f * temp), + gDPSetPrimColor(displayListHead++, 0, 0, 0x59 + (u8)(166.0f * temp), 0x59 + (u8)(166.0f * temp), 0x59 + (u8)(166.0f * temp), 0xFF); gDPPipeSync(displayListHead++); gDPSetEnvColor(displayListHead++, 0, 0, 0, globalCtx->unk_11D30[0]); @@ -1886,8 +827,7 @@ void func_80099BD8(GlobalContext* globalCtx) gSPSegment(gfxCtx->polyOpa.p++, 0x0C, displayListHead); gSPSegment(gfxCtx->polyXlu.p++, 0x0C, displayListHead); - gDPSetPrimColor(displayListHead++, 0, 0, - 0xFF + (u8)(179.0f * temp), 0xFF + (u8)(179.0f * temp), + gDPSetPrimColor(displayListHead++, 0, 0, 0xFF + (u8)(179.0f * temp), 0xFF + (u8)(179.0f * temp), 0xFF + (u8)(179.0f * temp), 0xFF); gDPPipeSync(displayListHead++); gDPSetEnvColor(displayListHead++, 0, 0, 0, globalCtx->unk_11D30[0]); @@ -1899,10 +839,9 @@ void func_80099BD8(GlobalContext* globalCtx) gDPSetEnvColor(displayListHead++, 0, 0, 0, globalCtx->unk_11D30[1]); gSPEndDisplayList(displayListHead); - func_800C6B54(gfxArr, globalCtx->state.gfxCtx, "../z_scene_table.c", 5145); + Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_scene_table.c", 5145); - if (gSaveContext.scene_setup_index == 5) - { + if (gSaveContext.scene_setup_index == 5) { D_8015FCF0 = 1; D_8015FCF8.x = -20.0f; D_8015FCF8.y = 1220.0f; @@ -1914,38 +853,30 @@ void func_80099BD8(GlobalContext* globalCtx) } // Scene Draw Config 31 -void func_8009A45C(GlobalContext* globalCtx) -{ +void func_8009A45C(GlobalContext* globalCtx) { u32 gameplayFrames; GraphicsContext* gfxCtx; - Gfx* gfxArr[4]; + Gfx* dispRefs[4]; gfxCtx = globalCtx->state.gfxCtx; - func_800C6AC4(gfxArr, globalCtx->state.gfxCtx, "../z_scene_table.c", 5171); + Graph_OpenDisps(dispRefs, globalCtx->state.gfxCtx, "../z_scene_table.c", 5171); gameplayFrames = globalCtx->gameplayFrames; gSPSegment(gfxCtx->polyXlu.p++, 0x08, - Draw_TexScroll(globalCtx->state.gfxCtx, - 0, (gameplayFrames * 1) % 64, 256, 16)); + Gfx_TexScroll(globalCtx->state.gfxCtx, 0, (gameplayFrames * 1) % 64, 256, 16)); gSPSegment(gfxCtx->polyXlu.p++, 0x09, - Draw_TwoTexScroll(globalCtx->state.gfxCtx, - 0, 127 - (gameplayFrames % 128), (gameplayFrames * 1) % 128, 32, 32, - 1, gameplayFrames % 128, (gameplayFrames * 1) % 128, 32, 32)); - gSPSegment(gfxCtx->polyOpa.p++, 0x0A, - Draw_TwoTexScroll(globalCtx->state.gfxCtx, - 0, 0, 0, 32, 32, - 1, 0, 127 - (gameplayFrames * 1) % 128, 32, 32)); + Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 127 - (gameplayFrames % 128), (gameplayFrames * 1) % 128, + 32, 32, 1, gameplayFrames % 128, (gameplayFrames * 1) % 128, 32, 32)); + gSPSegment( + gfxCtx->polyOpa.p++, 0x0A, + Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 0, 0, 32, 32, 1, 0, 127 - (gameplayFrames * 1) % 128, 32, 32)); gSPSegment(gfxCtx->polyOpa.p++, 0x0B, - Draw_TexScroll(globalCtx->state.gfxCtx, - 0, (gameplayFrames * 1) % 128, 32, 32)); + Gfx_TexScroll(globalCtx->state.gfxCtx, 0, (gameplayFrames * 1) % 128, 32, 32)); gSPSegment(gfxCtx->polyXlu.p++, 0x0C, - Draw_TwoTexScroll(globalCtx->state.gfxCtx, - 0, 0, (gameplayFrames * 50) % 2048, 8, 512, - 1, 0, (gameplayFrames * 60) % 2048, 8, 512)); + Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 0, (gameplayFrames * 50) % 2048, 8, 512, 1, 0, + (gameplayFrames * 60) % 2048, 8, 512)); gSPSegment(gfxCtx->polyOpa.p++, 0x0D, - Draw_TwoTexScroll(globalCtx->state.gfxCtx, - 0, 0, 0, 32, 64, - 1, 0, (gameplayFrames * 1) % 128, 32, 32)); + Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 0, 0, 32, 64, 1, 0, (gameplayFrames * 1) % 128, 32, 32)); gDPPipeSync(gfxCtx->polyXlu.p++); gDPSetEnvColor(gfxCtx->polyXlu.p++, 0x80, 0x80, 0x80, 0x80); @@ -1953,35 +884,31 @@ void func_8009A45C(GlobalContext* globalCtx) gDPPipeSync(gfxCtx->polyOpa.p++); gDPSetEnvColor(gfxCtx->polyOpa.p++, 0x80, 0x80, 0x80, 0x80); - func_800C6B54(gfxArr, globalCtx->state.gfxCtx, "../z_scene_table.c", 5212); + Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_scene_table.c", 5212); } // Scene Draw Config 32 -void func_8009A798(GlobalContext* globalCtx) -{ +void func_8009A798(GlobalContext* globalCtx) { u32 gameplayFrames; GraphicsContext* gfxCtx; - Gfx* gfxArr[4]; + Gfx* dispRefs[4]; gfxCtx = globalCtx->state.gfxCtx; - func_800C6AC4(gfxArr, globalCtx->state.gfxCtx, "../z_scene_table.c", 5226); + Graph_OpenDisps(dispRefs, globalCtx->state.gfxCtx, "../z_scene_table.c", 5226); gameplayFrames = globalCtx->gameplayFrames; gSPSegment(gfxCtx->polyXlu.p++, 0x08, - Draw_TexScroll(globalCtx->state.gfxCtx, - 0, (gameplayFrames * 2) % 256, 64, 64)); + Gfx_TexScroll(globalCtx->state.gfxCtx, 0, (gameplayFrames * 2) % 256, 64, 64)); gDPPipeSync(gfxCtx->polyOpa.p++); gDPSetEnvColor(gfxCtx->polyOpa.p++, 0x80, 0x80, 0x80, 0x80); gSPSegment(gfxCtx->polyOpa.p++, 0x0A, - Draw_TwoTexScroll(globalCtx->state.gfxCtx, - 0, 127 - gameplayFrames % 128, (gameplayFrames * 1) % 128, 32, 32, - 1, gameplayFrames % 128, (gameplayFrames * 1) % 128, 32, 32)); + Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 127 - gameplayFrames % 128, (gameplayFrames * 1) % 128, 32, + 32, 1, gameplayFrames % 128, (gameplayFrames * 1) % 128, 32, 32)); gSPSegment(gfxCtx->polyXlu.p++, 0x09, - Draw_TwoTexScroll(globalCtx->state.gfxCtx, - 0, 127 - (gameplayFrames * 1) % 128, (gameplayFrames * 1) % 256, 32, 64, - 1, 0, 0, 32, 128)); + Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 127 - (gameplayFrames * 1) % 128, + (gameplayFrames * 1) % 256, 32, 64, 1, 0, 0, 32, 128)); gDPPipeSync(gfxCtx->polyOpa.p++); gDPSetEnvColor(gfxCtx->polyOpa.p++, 0x80, 0x80, 0x80, 0x80); @@ -1989,28 +916,25 @@ void func_8009A798(GlobalContext* globalCtx) gDPPipeSync(gfxCtx->polyXlu.p++); gDPSetEnvColor(gfxCtx->polyXlu.p++, 0x80, 0x80, 0x80, 0x80); - func_800C6B54(gfxArr, globalCtx->state.gfxCtx, "../z_scene_table.c", 5264); + Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_scene_table.c", 5264); } // Scene Draw Config 33 -void func_8009A9DC(GlobalContext* globalCtx) -{ +void func_8009A9DC(GlobalContext* globalCtx) { u32 gameplayFrames; GraphicsContext* gfxCtx; - Gfx* gfxArr[4]; + Gfx* dispRefs[4]; gfxCtx = globalCtx->state.gfxCtx; - func_800C6AC4(gfxArr, globalCtx->state.gfxCtx, "../z_scene_table.c", 5278); + Graph_OpenDisps(dispRefs, globalCtx->state.gfxCtx, "../z_scene_table.c", 5278); gameplayFrames = globalCtx->gameplayFrames; gSPSegment(gfxCtx->polyXlu.p++, 0x08, - Draw_TwoTexScroll(globalCtx->state.gfxCtx, - 0, 127 - gameplayFrames % 128, (gameplayFrames * 3) % 256, 32, 64, - 1, gameplayFrames % 128, (gameplayFrames * 3) % 256, 32, 64)); + Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 127 - gameplayFrames % 128, (gameplayFrames * 3) % 256, 32, + 64, 1, gameplayFrames % 128, (gameplayFrames * 3) % 256, 32, 64)); gSPSegment(gfxCtx->polyXlu.p++, 0x09, - Draw_TwoTexScroll(globalCtx->state.gfxCtx, - 0, 127 - gameplayFrames % 128, (gameplayFrames * 3) % 128, 32, 32, - 1, gameplayFrames % 128, (gameplayFrames * 3) % 128, 32, 32)); + Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 127 - gameplayFrames % 128, (gameplayFrames * 3) % 128, 32, + 32, 1, gameplayFrames % 128, (gameplayFrames * 3) % 128, 32, 32)); gDPPipeSync(gfxCtx->polyOpa.p++); gDPSetEnvColor(gfxCtx->polyOpa.p++, 0x80, 0x80, 0x80, 0x80); @@ -2018,23 +942,20 @@ void func_8009A9DC(GlobalContext* globalCtx) gDPPipeSync(gfxCtx->polyXlu.p++); gDPSetEnvColor(gfxCtx->polyXlu.p++, 0x80, 0x80, 0x80, 0x80); - func_800C6B54(gfxArr, globalCtx->state.gfxCtx, "../z_scene_table.c", 5301); + Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_scene_table.c", 5301); } // Scene Draw Config 48 -void func_8009AB98(GlobalContext* globalCtx) -{ +void func_8009AB98(GlobalContext* globalCtx) { u32 gameplayFrames; GraphicsContext* gfxCtx; - Gfx* gfxArr[4]; + Gfx* dispRefs[4]; gfxCtx = globalCtx->state.gfxCtx; - func_800C6AC4(gfxArr, globalCtx->state.gfxCtx, "../z_scene_table.c", 5317); + Graph_OpenDisps(dispRefs, globalCtx->state.gfxCtx, "../z_scene_table.c", 5317); gameplayFrames = globalCtx->gameplayFrames; - gSPSegment(gfxCtx->polyXlu.p++, 0x08, - Draw_TexScroll(globalCtx->state.gfxCtx, - 0, gameplayFrames % 64, 256, 16)); + gSPSegment(gfxCtx->polyXlu.p++, 0x08, Gfx_TexScroll(globalCtx->state.gfxCtx, 0, gameplayFrames % 64, 256, 16)); gDPPipeSync(gfxCtx->polyXlu.p++); gDPSetEnvColor(gfxCtx->polyXlu.p++, 0x80, 0x80, 0x80, 0x80); @@ -2042,27 +963,23 @@ void func_8009AB98(GlobalContext* globalCtx) gDPPipeSync(gfxCtx->polyOpa.p++); gDPSetEnvColor(gfxCtx->polyOpa.p++, 0x80, 0x80, 0x80, 0x80); - func_800C6B54(gfxArr, globalCtx->state.gfxCtx, "../z_scene_table.c", 5330); + Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_scene_table.c", 5330); } // Scene Draw Config 39 -void func_8009ACA8(GlobalContext* globalCtx) -{ +void func_8009ACA8(GlobalContext* globalCtx) { u32 gameplayFrames; GraphicsContext* gfxCtx; - Gfx* gfxArr[4]; + Gfx* dispRefs[4]; gfxCtx = globalCtx->state.gfxCtx; - func_800C6AC4(gfxArr, globalCtx->state.gfxCtx, "../z_scene_table.c", 5346); + Graph_OpenDisps(dispRefs, globalCtx->state.gfxCtx, "../z_scene_table.c", 5346); gameplayFrames = globalCtx->gameplayFrames; gSPSegment(gfxCtx->polyXlu.p++, 0x08, - Draw_TwoTexScroll(globalCtx->state.gfxCtx, - 0, 127 - gameplayFrames % 128, (gameplayFrames * 3) % 128, 32, 32, - 1, gameplayFrames % 128, (gameplayFrames * 3) % 128, 32, 32)); - gSPSegment(gfxCtx->polyXlu.p++, 0x09, - Draw_TexScroll(globalCtx->state.gfxCtx, - 0, gameplayFrames % 64, 256, 16)); + Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 127 - gameplayFrames % 128, (gameplayFrames * 3) % 128, 32, + 32, 1, gameplayFrames % 128, (gameplayFrames * 3) % 128, 32, 32)); + gSPSegment(gfxCtx->polyXlu.p++, 0x09, Gfx_TexScroll(globalCtx->state.gfxCtx, 0, gameplayFrames % 64, 256, 16)); gDPPipeSync(gfxCtx->polyOpa.p++); gDPSetEnvColor(gfxCtx->polyOpa.p++, 0x80, 0x80, 0x80, 0x80); @@ -2070,31 +987,29 @@ void func_8009ACA8(GlobalContext* globalCtx) gDPPipeSync(gfxCtx->polyXlu.p++); gDPSetEnvColor(gfxCtx->polyXlu.p++, 0x80, 0x80, 0x80, 0x80); - func_800C6B54(gfxArr, globalCtx->state.gfxCtx, "../z_scene_table.c", 5367); + Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_scene_table.c", 5367); } // Scene Draw Config 24 -void func_8009AE30(GlobalContext* globalCtx) -{ +void func_8009AE30(GlobalContext* globalCtx) { u32 gameplayFrames; GraphicsContext* gfxCtx; - Gfx* gfxArr[4]; + Gfx* dispRefs[4]; gfxCtx = globalCtx->state.gfxCtx; - func_800C6AC4(gfxArr, globalCtx->state.gfxCtx, "../z_scene_table.c", 5384); + Graph_OpenDisps(dispRefs, globalCtx->state.gfxCtx, "../z_scene_table.c", 5384); gameplayFrames = globalCtx->gameplayFrames; - if (globalCtx->sceneNum == SCENE_HAKADAN_BS) + if (globalCtx->sceneNum == SCENE_HAKADAN_BS) { gSPSegment(gfxCtx->polyOpa.p++, 0x08, - Draw_TwoTexScroll(globalCtx->state.gfxCtx, - 0, (gameplayFrames * 2) % 128, 0, 32, 32, - 1, (gameplayFrames * 2) % 128, 0, 32, 32)); - else + Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, (gameplayFrames * 2) % 128, 0, 32, 32, 1, + (gameplayFrames * 2) % 128, 0, 32, 32)); + } else { gSPSegment(gfxCtx->polyXlu.p++, 0x08, - Draw_TwoTexScroll(globalCtx->state.gfxCtx, - 0, (gameplayFrames * 2) % 128, 0, 32, 32, - 1, (gameplayFrames * 2) % 128, 0, 32, 32)); + Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, (gameplayFrames * 2) % 128, 0, 32, 32, 1, + (gameplayFrames * 2) % 128, 0, 32, 32)); + } gDPPipeSync(gfxCtx->polyOpa.p++); gDPSetEnvColor(gfxCtx->polyOpa.p++, 0x80, 0x80, 0x80, 0x80); @@ -2102,48 +1017,45 @@ void func_8009AE30(GlobalContext* globalCtx) gDPPipeSync(gfxCtx->polyXlu.p++); gDPSetEnvColor(gfxCtx->polyXlu.p++, 0x80, 0x80, 0x80, 0x80); - func_800C6B54(gfxArr, globalCtx->state.gfxCtx, "../z_scene_table.c", 5416); + Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_scene_table.c", 5416); } u32 D_8012A328[] = { 0x0200BD20, 0x0200B920 }; // Scene Draw Config 40 -void func_8009AFE0(GlobalContext* globalCtx) -{ +void func_8009AFE0(GlobalContext* globalCtx) { u32 gameplayFrames; GraphicsContext* gfxCtx; - Gfx* gfxArr[4]; + Gfx* dispRefs[4]; gfxCtx = globalCtx->state.gfxCtx; - func_800C6AC4(gfxArr, globalCtx->state.gfxCtx, "../z_scene_table.c", 5490); + Graph_OpenDisps(dispRefs, globalCtx->state.gfxCtx, "../z_scene_table.c", 5490); gameplayFrames = globalCtx->gameplayFrames; gSPSegment(gfxCtx->polyOpa.p++, 0x09, - Draw_TexScroll(globalCtx->state.gfxCtx, - 0, (gameplayFrames * 3) % 128, 32, 32)); + Gfx_TexScroll(globalCtx->state.gfxCtx, 0, (gameplayFrames * 3) % 128, 32, 32)); { s32 pad[2]; } // Necessary to match stack usage gSPSegment(gfxCtx->polyXlu.p++, 0x08, SEGMENTED_TO_VIRTUAL(D_8012A328[gSaveContext.night_flag])); - func_800C6B54(gfxArr, globalCtx->state.gfxCtx, "../z_scene_table.c", 5507); + Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_scene_table.c", 5507); } u32 D_8012A330[] = { 0x02014C30, 0x02015830 }; // Scene Draw Config 23 -void func_8009B0FC(GlobalContext* globalCtx) -{ +void func_8009B0FC(GlobalContext* globalCtx) { u32 gameplayFrames; s32 spB0; s32 spAC; GraphicsContext* gfxCtx; - Gfx* gfxArr[4]; + Gfx* dispRefs[4]; gfxCtx = globalCtx->state.gfxCtx; - func_800C6AC4(gfxArr, globalCtx->state.gfxCtx, "../z_scene_table.c", 5535); + Graph_OpenDisps(dispRefs, globalCtx->state.gfxCtx, "../z_scene_table.c", 5535); - if (1) ; // Necessary to match + if (1) {} // Necessary to match spB0 = (globalCtx->unk_11D30[1] >> 8) & 0xFF; spAC = globalCtx->unk_11D30[1] & 0xFF; @@ -2151,102 +1063,74 @@ void func_8009B0FC(GlobalContext* globalCtx) gSPSegment(gfxCtx->polyXlu.p++, 0x08, SEGMENTED_TO_VIRTUAL(D_8012A330[gSaveContext.night_flag])); - if (spB0 == 1) + if (spB0 == 1) { gSPSegment(gfxCtx->polyOpa.p++, 0x08, - Draw_TwoTexScrollEnvColor(globalCtx->state.gfxCtx, - 0, gameplayFrames * 1, 0, 32, 32, - 1, 0, 0, 32, 32, - 0, 0, 0, spAC)); - else if (spB0 < 1) + 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(gfxCtx->polyOpa.p++, 0x08, - Draw_TwoTexScrollEnvColor(globalCtx->state.gfxCtx, - 0, gameplayFrames * 1, 0, 32, 32, - 1, 0, 0, 32, 32, - 0, 0, 0, 0xFF)); - else + Gfx_TwoTexScrollEnvColor(globalCtx->state.gfxCtx, 0, gameplayFrames * 1, 0, 32, 32, 1, 0, 0, 32, 32, + 0, 0, 0, 0xFF)); + } else { gSPSegment(gfxCtx->polyOpa.p++, 0x08, - Draw_TwoTexScrollEnvColor(globalCtx->state.gfxCtx, - 0, gameplayFrames * 1, 0, 32, 32, - 1, 0, 0, 32, 32, - 0, 0, 0, 0xA0)); - - if (spB0 == 2) - gSPSegment(gfxCtx->polyOpa.p++, 0x09, - Draw_TwoTexScrollEnvColor(globalCtx->state.gfxCtx, - 0, gameplayFrames * 1, 0, 32, 32, - 1, 0, 0, 32, 32, - 0, 0, 0, spAC)); - else if (spB0 < 2) - gSPSegment(gfxCtx->polyOpa.p++, 0x09, - Draw_TwoTexScrollEnvColor(globalCtx->state.gfxCtx, - 0, gameplayFrames * 1, 0, 32, 32, - 1, 0, 0, 32, 32, - 0, 0, 0, 0xFF)); - else - gSPSegment(gfxCtx->polyOpa.p++, 0x09, - Draw_TwoTexScrollEnvColor(globalCtx->state.gfxCtx, - 0, gameplayFrames * 1, 0, 32, 32, - 1, 0, 0, 32, 32, - 0, 0, 0, 0xA0)); - - if (spB0 != 0) - { - gSPSegment(gfxCtx->polyOpa.p++, 0x0A, - Draw_TwoTexScrollEnvColor(globalCtx->state.gfxCtx, - 0, gameplayFrames * 1, 0, 32, 32, - 1, 0, 0, 32, 32, - 0, 0, 0, 0xA0)); - gSPSegment(gfxCtx->polyOpa.p++, 0x0B, - Draw_TwoTexScrollEnvColor(globalCtx->state.gfxCtx, - 0, gameplayFrames * 3, 0, 32, 32, - 1, 0, 0, 32, 32, - 0, 0, 0, 0xB4)); + Gfx_TwoTexScrollEnvColor(globalCtx->state.gfxCtx, 0, gameplayFrames * 1, 0, 32, 32, 1, 0, 0, 32, 32, + 0, 0, 0, 0xA0)); } - else - { + + if (spB0 == 2) { + gSPSegment(gfxCtx->polyOpa.p++, 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(gfxCtx->polyOpa.p++, 0x09, + Gfx_TwoTexScrollEnvColor(globalCtx->state.gfxCtx, 0, gameplayFrames * 1, 0, 32, 32, 1, 0, 0, 32, 32, + 0, 0, 0, 0xFF)); + } else { + gSPSegment(gfxCtx->polyOpa.p++, 0x09, + Gfx_TwoTexScrollEnvColor(globalCtx->state.gfxCtx, 0, gameplayFrames * 1, 0, 32, 32, 1, 0, 0, 32, 32, + 0, 0, 0, 0xA0)); + } + + if (spB0 != 0) { gSPSegment(gfxCtx->polyOpa.p++, 0x0A, - Draw_TwoTexScrollEnvColor(globalCtx->state.gfxCtx, - 0, (gameplayFrames * 1) % 128, 0, 32, 32, - 1, 0, 0, 32, 32, - 0, 0, 0, 0xA0 + (s32)((spAC / 200.0f) * 95.0f))); + Gfx_TwoTexScrollEnvColor(globalCtx->state.gfxCtx, 0, gameplayFrames * 1, 0, 32, 32, 1, 0, 0, 32, 32, + 0, 0, 0, 0xA0)); gSPSegment(gfxCtx->polyOpa.p++, 0x0B, - Draw_TwoTexScrollEnvColor(globalCtx->state.gfxCtx, - 0, gameplayFrames * 3, 0, 32, 32, - 1, 0, 0, 32, 32, - 0, 0, 0, 0xB9 + (s32)((spAC / 200.0f) * 70.0f))); + Gfx_TwoTexScrollEnvColor(globalCtx->state.gfxCtx, 0, gameplayFrames * 3, 0, 32, 32, 1, 0, 0, 32, 32, + 0, 0, 0, 0xB4)); + } else { + gSPSegment(gfxCtx->polyOpa.p++, 0x0A, + Gfx_TwoTexScrollEnvColor(globalCtx->state.gfxCtx, 0, (gameplayFrames * 1) % 128, 0, 32, 32, 1, 0, 0, + 32, 32, 0, 0, 0, 0xA0 + (s32)((spAC / 200.0f) * 95.0f))); + gSPSegment(gfxCtx->polyOpa.p++, 0x0B, + Gfx_TwoTexScrollEnvColor(globalCtx->state.gfxCtx, 0, gameplayFrames * 3, 0, 32, 32, 1, 0, 0, 32, 32, + 0, 0, 0, 0xB9 + (s32)((spAC / 200.0f) * 70.0f))); } gSPSegment(gfxCtx->polyXlu.p++, 0x0C, - Draw_TwoTexScrollEnvColor(globalCtx->state.gfxCtx, - 0, gameplayFrames * 1, gameplayFrames * 1, 32, 32, - 1, 0, 127 - (gameplayFrames * 1), 32, 32, - 0, 0, 0, 0x80)); + Gfx_TwoTexScrollEnvColor(globalCtx->state.gfxCtx, 0, gameplayFrames * 1, gameplayFrames * 1, 32, 32, 1, + 0, 127 - (gameplayFrames * 1), 32, 32, 0, 0, 0, 0x80)); gSPSegment(gfxCtx->polyXlu.p++, 0x0D, - Draw_TwoTexScrollEnvColor(globalCtx->state.gfxCtx, - 0, gameplayFrames * 4, 0, 32, 32, - 1, gameplayFrames * 4, 0, 32, 32, - 0, 0, 0, 0x80)); + Gfx_TwoTexScrollEnvColor(globalCtx->state.gfxCtx, 0, gameplayFrames * 4, 0, 32, 32, 1, + gameplayFrames * 4, 0, 32, 32, 0, 0, 0, 0x80)); { s32 pad[2]; } // Necessary to match stack usage - func_800C6B54(gfxArr, globalCtx->state.gfxCtx, "../z_scene_table.c", 5644); + Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_scene_table.c", 5644); } // Scene Draw Config 29 -void func_8009B86C(GlobalContext* globalCtx) -{ +void func_8009B86C(GlobalContext* globalCtx) { u32 gameplayFrames; GraphicsContext* gfxCtx; - Gfx* gfxArr[4]; + Gfx* dispRefs[4]; gfxCtx = globalCtx->state.gfxCtx; - func_800C6AC4(gfxArr, globalCtx->state.gfxCtx, "../z_scene_table.c", 5791); + Graph_OpenDisps(dispRefs, globalCtx->state.gfxCtx, "../z_scene_table.c", 5791); gameplayFrames = globalCtx->gameplayFrames; gSPSegment(gfxCtx->polyOpa.p++, 0x08, - Draw_TwoTexScroll(globalCtx->state.gfxCtx, - 0, gameplayFrames * 1, 0, 32, 32, - 1, 0, 0, 32, 32)); + Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, gameplayFrames * 1, 0, 32, 32, 1, 0, 0, 32, 32)); gDPPipeSync(gfxCtx->polyOpa.p++); gDPSetEnvColor(gfxCtx->polyOpa.p++, 0x80, 0x80, 0x80, globalCtx->unk_11D30[0]); @@ -2254,50 +1138,45 @@ void func_8009B86C(GlobalContext* globalCtx) gDPPipeSync(gfxCtx->polyXlu.p++); gDPSetEnvColor(gfxCtx->polyXlu.p++, 0x80, 0x80, 0x80, 0x91); - func_800C6B54(gfxArr, globalCtx->state.gfxCtx, "../z_scene_table.c", 5808); + Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_scene_table.c", 5808); } // Scene Draw Config 34 -void func_8009B9BC(GlobalContext* globalCtx) -{ +void func_8009B9BC(GlobalContext* globalCtx) { u32 gameplayFrames; GraphicsContext* gfxCtx; - Gfx* gfxArr[4]; + Gfx* dispRefs[4]; gfxCtx = globalCtx->state.gfxCtx; - func_800C6AC4(gfxArr, globalCtx->state.gfxCtx, "../z_scene_table.c", 5822); + Graph_OpenDisps(dispRefs, globalCtx->state.gfxCtx, "../z_scene_table.c", 5822); gameplayFrames = globalCtx->gameplayFrames; - gSPSegment(gfxCtx->polyOpa.p++, 0x08, - Draw_TexScroll(globalCtx->state.gfxCtx, - 0, gameplayFrames % 64, 4, 16)); + gSPSegment(gfxCtx->polyOpa.p++, 0x08, Gfx_TexScroll(globalCtx->state.gfxCtx, 0, gameplayFrames % 64, 4, 16)); gDPPipeSync(gfxCtx->polyOpa.p++); gDPSetEnvColor(gfxCtx->polyOpa.p++, 0x80, 0x80, 0x80, 0x80); - func_800C6B54(gfxArr, globalCtx->state.gfxCtx, "../z_scene_table.c", 5836); + Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_scene_table.c", 5836); } // Scene Draw Config 35 -void func_8009BAA4(GlobalContext* globalCtx) -{ +void func_8009BAA4(GlobalContext* globalCtx) { u32 gameplayFrames; GraphicsContext* gfxCtx; - Gfx* gfxArr[4]; + Gfx* dispRefs[4]; gfxCtx = globalCtx->state.gfxCtx; - func_800C6AC4(gfxArr, globalCtx->state.gfxCtx, "../z_scene_table.c", 5850); + Graph_OpenDisps(dispRefs, globalCtx->state.gfxCtx, "../z_scene_table.c", 5850); gameplayFrames = globalCtx->gameplayFrames; gSPSegment(gfxCtx->polyXlu.p++, 0x08, - Draw_TwoTexScroll(globalCtx->state.gfxCtx, - 0, 127 - gameplayFrames % 128, (gameplayFrames * 3) % 128, 32, 32, - 1, gameplayFrames % 128, (gameplayFrames * 3) % 128, 32, 32)); + 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) + if (globalCtx->sceneNum == SCENE_HAIRAL_NIWA) { gSPSegment(gfxCtx->polyXlu.p++, 0x09, - Draw_TexScroll(globalCtx->state.gfxCtx, - 0, (gameplayFrames * 10) % 256, 32, 64)); + Gfx_TexScroll(globalCtx->state.gfxCtx, 0, (gameplayFrames * 10) % 256, 32, 64)); + } gDPPipeSync(gfxCtx->polyOpa.p++); gDPSetEnvColor(gfxCtx->polyOpa.p++, 0x80, 0x80, 0x80, 0x80); @@ -2305,41 +1184,37 @@ void func_8009BAA4(GlobalContext* globalCtx) gDPPipeSync(gfxCtx->polyXlu.p++); gDPSetEnvColor(gfxCtx->polyXlu.p++, 0x80, 0x80, 0x80, 0x80); - func_800C6B54(gfxArr, globalCtx->state.gfxCtx, "../z_scene_table.c", 5876); + Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_scene_table.c", 5876); } // Scene Draw Config 36 -void func_8009BC44(GlobalContext* globalCtx) -{ +void func_8009BC44(GlobalContext* globalCtx) { u32 gameplayFrames; s8 sp83; GraphicsContext* gfxCtx; - Gfx* gfxArr[4]; + Gfx* dispRefs[4]; - if (1) ; // Necessary to match + if (1) {} // Necessary to match sp83 = coss((globalCtx->gameplayFrames * 1500) & 0xFFFF) >> 8; gfxCtx = globalCtx->state.gfxCtx; - func_800C6AC4(gfxArr, globalCtx->state.gfxCtx, "../z_scene_table.c", 5894); + Graph_OpenDisps(dispRefs, globalCtx->state.gfxCtx, "../z_scene_table.c", 5894); gameplayFrames = globalCtx->gameplayFrames; - if (globalCtx->sceneNum == SCENE_GANON_TOU) - { + if (globalCtx->sceneNum == SCENE_GANON_TOU) { gSPSegment(gfxCtx->polyXlu.p++, 0x09, - Draw_TexScroll(globalCtx->state.gfxCtx, - 0, (gameplayFrames * 1) % 256, 64, 64)); + Gfx_TexScroll(globalCtx->state.gfxCtx, 0, (gameplayFrames * 1) % 256, 64, 64)); gSPSegment(gfxCtx->polyXlu.p++, 0x08, - Draw_TwoTexScroll(globalCtx->state.gfxCtx, - 0, 0, 255 - (gameplayFrames * 1) % 256, 64, 64, - 1, 0, (gameplayFrames * 1) % 256, 64, 64)); + Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 0, 255 - (gameplayFrames * 1) % 256, 64, 64, 1, 0, + (gameplayFrames * 1) % 256, 64, 64)); } gSPSegment(gfxCtx->polyOpa.p++, 0x0B, - Draw_TwoTexScroll(globalCtx->state.gfxCtx, - 0, 255 - (gameplayFrames * 1) % 128, (gameplayFrames * 1) % 128, 32, 32, - 1, (gameplayFrames * 1) % 128, (gameplayFrames * 1) % 128, 32, 32)); + 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(gfxCtx->polyOpa.p++); gDPSetEnvColor(gfxCtx->polyOpa.p++, 0x80, 0x80, 0x80, 0x80); @@ -2351,30 +1226,27 @@ void func_8009BC44(GlobalContext* globalCtx) gDPPipeSync(gfxCtx->polyOpa.p++); gDPSetEnvColor(gfxCtx->polyOpa.p++, sp83, sp83, sp83, 0x80); - func_800C6B54(gfxArr, globalCtx->state.gfxCtx, "../z_scene_table.c", 5930); + Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_scene_table.c", 5930); } // Screen Shake for Ganon's Tower Collapse #ifdef NON_MATCHING // regalloc differences -void func_8009BEEC(GlobalContext* globalCtx) -{ +void func_8009BEEC(GlobalContext* globalCtx) { s32 var; - if (globalCtx->gameplayFrames % 128 == 13) - { - var = func_80092F88(globalCtx->cameraCtx.activeCameraPtrs[globalCtx->cameraCtx.unk_5C0], 2); - func_80092DAC(var, 10000); - func_80092E70(var, 4, 0, 0, 0); - func_80092DF0(var, 127); + if (globalCtx->gameplayFrames % 128 == 13) { + var = Quake_Add(globalCtx->cameraCtx.activeCameraPtrs[globalCtx->cameraCtx.unk_5C0], 2); + Quake_SetSpeed(var, 10000); + Quake_SetQuakeValues(var, 4, 0, 0, 0); + Quake_SetCountdown(var, 127); } - if ((globalCtx->gameplayFrames % 64 == 0) && (Math_Rand_ZeroOne() > 0.6f)) - { - var = func_80092F88(globalCtx->cameraCtx.activeCameraPtrs[globalCtx->cameraCtx.unk_5C0], 3); - func_80092DAC(var, 32000.0f + (Math_Rand_ZeroOne() * 3000.0f)); - func_80092E70(var, 10.0f - (Math_Rand_ZeroOne() * 9.0f), 0, 0, 0); - func_80092DF0(var, 48.0f - (Math_Rand_ZeroOne() * 15.0f)); + if ((globalCtx->gameplayFrames % 64 == 0) && (Math_Rand_ZeroOne() > 0.6f)) { + var = Quake_Add(globalCtx->cameraCtx.activeCameraPtrs[globalCtx->cameraCtx.unk_5C0], 3); + Quake_SetSpeed(var, 32000.0f + (Math_Rand_ZeroOne() * 3000.0f)); + Quake_SetQuakeValues(var, 10.0f - (Math_Rand_ZeroOne() * 9.0f), 0, 0, 0); + Quake_SetCountdown(var, 48.0f - (Math_Rand_ZeroOne() * 15.0f)); } } #else @@ -2383,33 +1255,29 @@ void func_8009BEEC(GlobalContext* globalCtx); #endif // Scene Draw Config 38 -void func_8009C0AC(GlobalContext* globalCtx) -{ +void func_8009C0AC(GlobalContext* globalCtx) { u32 gameplayFrames; s8 sp7B; GraphicsContext* gfxCtx; - Gfx* gfxArr[4]; + Gfx* dispRefs[4]; - if (1) ; // Necessary to match + if (1) {} // Necessary to match sp7B = coss((globalCtx->gameplayFrames * 1500) & 0xFFFF) >> 8; gfxCtx = globalCtx->state.gfxCtx; - func_800C6AC4(gfxArr, globalCtx->state.gfxCtx, "../z_scene_table.c", 5968); + Graph_OpenDisps(dispRefs, globalCtx->state.gfxCtx, "../z_scene_table.c", 5968); gameplayFrames = globalCtx->gameplayFrames; gSPSegment(gfxCtx->polyOpa.p++, 0x08, - Draw_TwoTexScroll(globalCtx->state.gfxCtx, - 0, 0, (gameplayFrames * 1) % 512, 64, 128, - 1, 0, 511 - (gameplayFrames * 1) % 512, 64, 128)); + Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 0, (gameplayFrames * 1) % 512, 64, 128, 1, 0, + 511 - (gameplayFrames * 1) % 512, 64, 128)); gSPSegment(gfxCtx->polyOpa.p++, 0x09, - Draw_TwoTexScroll(globalCtx->state.gfxCtx, - 0, 0, (gameplayFrames * 1) % 256, 32, 64, - 1, 0, 255 - (gameplayFrames * 1) % 256, 32, 64)); + Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 0, (gameplayFrames * 1) % 256, 32, 64, 1, 0, + 255 - (gameplayFrames * 1) % 256, 32, 64)); gSPSegment(gfxCtx->polyXlu.p++, 0x0A, - Draw_TwoTexScroll(globalCtx->state.gfxCtx, - 0, 0, (gameplayFrames * 20) % 2048, 16, 512, - 1, 0, (gameplayFrames * 30) % 2048, 16, 512)); + Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 0, (gameplayFrames * 20) % 2048, 16, 512, 1, 0, + (gameplayFrames * 30) % 2048, 16, 512)); gDPPipeSync(gfxCtx->polyOpa.p++); gDPSetEnvColor(gfxCtx->polyOpa.p++, 0x80, 0x80, 0x80, 0x80); @@ -2421,15 +1289,11 @@ void func_8009C0AC(GlobalContext* globalCtx) gDPPipeSync(gfxCtx->polyOpa.p++); gDPSetEnvColor(gfxCtx->polyOpa.p++, sp7B, sp7B, sp7B, 0x80); - func_800C6B54(gfxArr, globalCtx->state.gfxCtx, "../z_scene_table.c", 6004); + Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_scene_table.c", 6004); - if (Flags_GetSwitch(globalCtx, 0x37)) - { - if ((globalCtx->sceneNum == SCENE_GANON_DEMO) || - (globalCtx->sceneNum == SCENE_GANON_FINAL) || - (globalCtx->sceneNum == SCENE_GANON_SONOGO) || - (globalCtx->sceneNum == SCENE_GANONTIKA_SONOGO)) - { + if (Flags_GetSwitch(globalCtx, 0x37)) { + if ((globalCtx->sceneNum == SCENE_GANON_DEMO) || (globalCtx->sceneNum == SCENE_GANON_FINAL) || + (globalCtx->sceneNum == SCENE_GANON_SONOGO) || (globalCtx->sceneNum == SCENE_GANONTIKA_SONOGO)) { func_8009BEEC(globalCtx); } } @@ -2438,27 +1302,24 @@ void func_8009C0AC(GlobalContext* globalCtx) u32 D_8012A338[] = { 0x0200FAC0, 0x0200F8C0 }; // Scene Draw Config 37 -void func_8009C3EC(GlobalContext* globalCtx) -{ +void func_8009C3EC(GlobalContext* globalCtx) { u32 gameplayFrames; GraphicsContext* gfxCtx; - Gfx* gfxArr[4]; + Gfx* dispRefs[4]; - if (0) ; // Necessary to match + if (0) {} // Necessary to match gfxCtx = globalCtx->state.gfxCtx; - func_800C6AC4(gfxArr, globalCtx->state.gfxCtx, "../z_scene_table.c", 6042); + Graph_OpenDisps(dispRefs, globalCtx->state.gfxCtx, "../z_scene_table.c", 6042); gameplayFrames = globalCtx->gameplayFrames; gSPSegment(gfxCtx->polyXlu.p++, 0x08, SEGMENTED_TO_VIRTUAL(D_8012A338[gSaveContext.night_flag])); gSPSegment(gfxCtx->polyOpa.p++, 0x09, - Draw_TwoTexScroll(globalCtx->state.gfxCtx, - 0, 127 - gameplayFrames % 128, (gameplayFrames * 1) % 128, 32, 32, - 1, gameplayFrames % 128, (gameplayFrames * 1) % 128, 32, 32)); + Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 127 - gameplayFrames % 128, (gameplayFrames * 1) % 128, 32, + 32, 1, gameplayFrames % 128, (gameplayFrames * 1) % 128, 32, 32)); gSPSegment(gfxCtx->polyXlu.p++, 0x0A, - Draw_TwoTexScroll(globalCtx->state.gfxCtx, - 0, 127 - gameplayFrames % 128, (gameplayFrames * 1) % 128, 32, 32, - 1, gameplayFrames % 128, (gameplayFrames * 1) % 128, 32, 32)); + 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]; } // Necessary to match stack usage @@ -2468,35 +1329,30 @@ void func_8009C3EC(GlobalContext* globalCtx) gDPPipeSync(gfxCtx->polyXlu.p++); gDPSetEnvColor(gfxCtx->polyXlu.p++, 0x80, 0x80, 0x80, 0x80); - func_800C6B54(gfxArr, globalCtx->state.gfxCtx, "../z_scene_table.c", 6076); + Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_scene_table.c", 6076); } // Scene Draw Config 42 -void func_8009C608(GlobalContext* globalCtx) -{ +void func_8009C608(GlobalContext* globalCtx) { u32 gameplayFrames; GraphicsContext* gfxCtx; - Gfx* gfxArr[4]; + Gfx* dispRefs[4]; gfxCtx = globalCtx->state.gfxCtx; - func_800C6AC4(gfxArr, globalCtx->state.gfxCtx, "../z_scene_table.c", 6151); + Graph_OpenDisps(dispRefs, globalCtx->state.gfxCtx, "../z_scene_table.c", 6151); gameplayFrames = globalCtx->gameplayFrames; gSPSegment(gfxCtx->polyXlu.p++, 0x08, - Draw_TexScroll(globalCtx->state.gfxCtx, - 0, (gameplayFrames * 1) % 64, 256, 16)); + Gfx_TexScroll(globalCtx->state.gfxCtx, 0, (gameplayFrames * 1) % 64, 256, 16)); gSPSegment(gfxCtx->polyXlu.p++, 0x09, - Draw_TwoTexScroll(globalCtx->state.gfxCtx, - 0, 0, (gameplayFrames * 60) % 2048, 8, 512, - 1, 0, (gameplayFrames * 50) % 2048, 8, 512)); + Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 0, (gameplayFrames * 60) % 2048, 8, 512, 1, 0, + (gameplayFrames * 50) % 2048, 8, 512)); gSPSegment(gfxCtx->polyOpa.p++, 0x0A, - Draw_TwoTexScroll(globalCtx->state.gfxCtx, - 0, 127 - (gameplayFrames * 1) % 128, 0, 32, 32, - 1, (gameplayFrames * 1) % 128, 0, 32, 32)); + Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 127 - (gameplayFrames * 1) % 128, 0, 32, 32, 1, + (gameplayFrames * 1) % 128, 0, 32, 32)); gSPSegment(gfxCtx->polyXlu.p++, 0x0B, - Draw_TwoTexScroll(globalCtx->state.gfxCtx, - 0, 0, 1023 - (gameplayFrames * 6) % 1024, 16, 256, - 1, 0, 1023 - (gameplayFrames * 3) % 1024, 16, 256)); + Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 0, 1023 - (gameplayFrames * 6) % 1024, 16, 256, 1, 0, + 1023 - (gameplayFrames * 3) % 1024, 16, 256)); gDPPipeSync(gfxCtx->polyOpa.p++); gDPSetEnvColor(gfxCtx->polyOpa.p++, 0x80, 0x80, 0x80, 0x80); @@ -2504,31 +1360,26 @@ void func_8009C608(GlobalContext* globalCtx) gDPPipeSync(gfxCtx->polyXlu.p++); gDPSetEnvColor(gfxCtx->polyXlu.p++, 0x80, 0x80, 0x80, 0x80); - func_800C6B54(gfxArr, globalCtx->state.gfxCtx, "../z_scene_table.c", 6187); + Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_scene_table.c", 6187); } // Scene Draw Config 43 -void func_8009C8B8(GlobalContext* globalCtx) -{ +void func_8009C8B8(GlobalContext* globalCtx) { u32 gameplayFrames; GraphicsContext* gfxCtx; - Gfx* gfxArr[4]; + Gfx* dispRefs[4]; gfxCtx = globalCtx->state.gfxCtx; - func_800C6AC4(gfxArr, globalCtx->state.gfxCtx, "../z_scene_table.c", 6201); + Graph_OpenDisps(dispRefs, globalCtx->state.gfxCtx, "../z_scene_table.c", 6201); gameplayFrames = globalCtx->gameplayFrames; gSPSegment(gfxCtx->polyOpa.p++, 0x08, - Draw_TwoTexScroll(globalCtx->state.gfxCtx, - 0, 0, 0, 32, 32, - 1, 0, (gameplayFrames * 1) % 128, 32, 32)); + Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 0, 0, 32, 32, 1, 0, (gameplayFrames * 1) % 128, 32, 32)); gSPSegment(gfxCtx->polyXlu.p++, 0x0A, - Draw_TwoTexScroll(globalCtx->state.gfxCtx, - 0, 127 - gameplayFrames % 128, (gameplayFrames * 1) % 128, 32, 32, - 1, gameplayFrames % 128, (gameplayFrames * 1) % 128, 32, 32)); + Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 127 - gameplayFrames % 128, (gameplayFrames * 1) % 128, 32, + 32, 1, gameplayFrames % 128, (gameplayFrames * 1) % 128, 32, 32)); gSPSegment(gfxCtx->polyXlu.p++, 0x09, - Draw_TexScroll(globalCtx->state.gfxCtx, - 0, 255 - (gameplayFrames * 10) % 256, 32, 64)); + Gfx_TexScroll(globalCtx->state.gfxCtx, 0, 255 - (gameplayFrames * 10) % 256, 32, 64)); gDPPipeSync(gfxCtx->polyOpa.p++); gDPSetEnvColor(gfxCtx->polyOpa.p++, 0x80, 0x80, 0x80, 0x80); @@ -2536,24 +1387,22 @@ void func_8009C8B8(GlobalContext* globalCtx) gDPPipeSync(gfxCtx->polyXlu.p++); gDPSetEnvColor(gfxCtx->polyXlu.p++, 0x80, 0x80, 0x80, 0x80); - func_800C6B54(gfxArr, globalCtx->state.gfxCtx, "../z_scene_table.c", 6232); + Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_scene_table.c", 6232); } // Scene Draw Config 47 -void func_8009CAC0(GlobalContext* globalCtx) -{ +void func_8009CAC0(GlobalContext* globalCtx) { u32 gameplayFrames; GraphicsContext* gfxCtx; - Gfx* gfxArr[4]; + Gfx* dispRefs[4]; gfxCtx = globalCtx->state.gfxCtx; - func_800C6AC4(gfxArr, globalCtx->state.gfxCtx, "../z_scene_table.c", 6249); + Graph_OpenDisps(dispRefs, globalCtx->state.gfxCtx, "../z_scene_table.c", 6249); gameplayFrames = globalCtx->gameplayFrames; gSPSegment(gfxCtx->polyXlu.p++, 0x08, - Draw_TwoTexScroll(globalCtx->state.gfxCtx, - 0, 127 - gameplayFrames % 128, (gameplayFrames * 1) % 128, 32, 32, - 1, gameplayFrames % 128, (gameplayFrames * 1) % 128, 32, 32)); + Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 127 - gameplayFrames % 128, (gameplayFrames * 1) % 128, 32, + 32, 1, gameplayFrames % 128, (gameplayFrames * 1) % 128, 32, 32)); gDPPipeSync(gfxCtx->polyOpa.p++); gDPSetEnvColor(gfxCtx->polyOpa.p++, 0x80, 0x80, 0x80, 0x80); @@ -2561,33 +1410,30 @@ void func_8009CAC0(GlobalContext* globalCtx) gDPPipeSync(gfxCtx->polyXlu.p++); gDPSetEnvColor(gfxCtx->polyXlu.p++, 0x80, 0x80, 0x80, 0x80); - func_800C6B54(gfxArr, globalCtx->state.gfxCtx, "../z_scene_table.c", 6264); + Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_scene_table.c", 6264); } u32 D_8012A340[] = { 0x0200F8C0, 0x020100C0 }; // Scene Draw Config 27 -void func_8009CC00(GlobalContext* globalCtx) -{ +void func_8009CC00(GlobalContext* globalCtx) { u32 gameplayFrames; GraphicsContext* gfxCtx; - Gfx* gfxArr[4]; + Gfx* dispRefs[4]; - if (0) ; // Necessary to match + if (0) {} // Necessary to match gfxCtx = globalCtx->state.gfxCtx; - func_800C6AC4(gfxArr, globalCtx->state.gfxCtx, "../z_scene_table.c", 6290); + Graph_OpenDisps(dispRefs, globalCtx->state.gfxCtx, "../z_scene_table.c", 6290); gameplayFrames = globalCtx->gameplayFrames; gSPSegment(gfxCtx->polyXlu.p++, 0x08, SEGMENTED_TO_VIRTUAL(D_8012A340[gSaveContext.night_flag])); gSPSegment(gfxCtx->polyOpa.p++, 0x09, - Draw_TwoTexScroll(globalCtx->state.gfxCtx, - 0, 127 - gameplayFrames % 128, (gameplayFrames * 1) % 128, 32, 32, - 1, gameplayFrames % 128, (gameplayFrames * 1) % 128, 32, 32)); + Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 127 - gameplayFrames % 128, (gameplayFrames * 1) % 128, 32, + 32, 1, gameplayFrames % 128, (gameplayFrames * 1) % 128, 32, 32)); gSPSegment(gfxCtx->polyXlu.p++, 0x0A, - Draw_TwoTexScroll(globalCtx->state.gfxCtx, - 0, 127 - gameplayFrames % 128, (gameplayFrames * 1) % 128, 32, 32, - 1, gameplayFrames % 128, (gameplayFrames * 1) % 128, 32, 32)); + 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]; } // Necessary to match stack usage @@ -2597,13 +1443,11 @@ void func_8009CC00(GlobalContext* globalCtx) gDPPipeSync(gfxCtx->polyXlu.p++); gDPSetEnvColor(gfxCtx->polyXlu.p++, 0x80, 0x80, 0x80, 0x80); - func_800C6B54(gfxArr, globalCtx->state.gfxCtx, "../z_scene_table.c", 6320); + Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_scene_table.c", 6320); } -Gfx* Draw_TwoTexScrollPrimColor(GraphicsContext* gfxCtx, s32 tile1, u32 x1, u32 y1, s32 width1, s32 height1, - s32 tile2, u32 x2, u32 y2, s32 width2, s32 height2, - s32 red, s32 green, s32 blue, s32 alpha) -{ +Gfx* Gfx_TwoTexScrollPrimColor(GraphicsContext* gfxCtx, s32 tile1, u32 x1, u32 y1, s32 width1, s32 height1, s32 tile2, + u32 x2, u32 y2, s32 width2, s32 height2, s32 r, s32 g, s32 b, s32 a) { Gfx* displayList = Graph_Alloc(gfxCtx, 10 * sizeof(Gfx)); x1 %= 2048; @@ -2612,33 +1456,30 @@ Gfx* Draw_TwoTexScrollPrimColor(GraphicsContext* gfxCtx, s32 tile1, u32 x1, u32 y2 %= 2048; gDPTileSync(displayList); - gDPSetTileSize(displayList+1, tile1, x1, y1, - (x1+((width1-1)<<2)), (y1+((height1-1)<<2))); - gDPTileSync(displayList+2); - gDPSetTileSize(displayList+3, tile2, x2, y2, - (x2+((width2-1)<<2)), (y2+((height2-1)<<2))); - gDPSetPrimColor(displayList+4, 0, 0, red, green, blue, alpha); - gSPEndDisplayList(displayList+5); + gDPSetTileSize(displayList + 1, tile1, x1, y1, (x1 + ((width1 - 1) << 2)), (y1 + ((height1 - 1) << 2))); + gDPTileSync(displayList + 2); + gDPSetTileSize(displayList + 3, tile2, x2, y2, (x2 + ((width2 - 1) << 2)), (y2 + ((height2 - 1) << 2))); + gDPSetPrimColor(displayList + 4, 0, 0, r, g, b, a); + gSPEndDisplayList(displayList + 5); return displayList; } // Scene Draw Config 50 -void func_8009CF84(GlobalContext* globalCtx) -{ +void func_8009CF84(GlobalContext* globalCtx) { u32 gameplayFrames; GraphicsContext* gfxCtx; - Gfx* gfxArr[4]; + Gfx* dispRefs[4]; gfxCtx = globalCtx->state.gfxCtx; - func_800C6AC4(gfxArr, globalCtx->state.gfxCtx, "../z_scene_table.c", 6433); + Graph_OpenDisps(dispRefs, globalCtx->state.gfxCtx, "../z_scene_table.c", 6433); gameplayFrames = globalCtx->gameplayFrames; gSPSegment(gfxCtx->polyXlu.p++, 0x08, - Draw_TwoTexScrollPrimColor(globalCtx->state.gfxCtx, - 0, 127 - gameplayFrames % 128, (gameplayFrames * 1) % 128, 32, 32, - 1, gameplayFrames % 128, (gameplayFrames * 1) % 128, 32, 32, - 0xFF, 0xFF, 0xFF, globalCtx->unk_11D30[0] + 127)); + Gfx_TwoTexScrollPrimColor(globalCtx->state.gfxCtx, 0, 127 - gameplayFrames % 128, + (gameplayFrames * 1) % 128, 32, 32, 1, gameplayFrames % 128, + (gameplayFrames * 1) % 128, 32, 32, 0xFF, 0xFF, 0xFF, + globalCtx->unk_11D30[0] + 127)); gDPPipeSync(gfxCtx->polyOpa.p++); gDPSetEnvColor(gfxCtx->polyOpa.p++, 0x80, 0x80, 0x80, 0x80); @@ -2646,33 +1487,27 @@ void func_8009CF84(GlobalContext* globalCtx) gDPPipeSync(gfxCtx->polyXlu.p++); gDPSetEnvColor(gfxCtx->polyXlu.p++, 0x80, 0x80, 0x80, 0x80); - func_800C6B54(gfxArr, globalCtx->state.gfxCtx, "../z_scene_table.c", 6449); + Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_scene_table.c", 6449); } // Scene Draw Config 41 -void func_8009D0E8(GlobalContext* globalCtx) -{ +void func_8009D0E8(GlobalContext* globalCtx) { u32 gameplayFrames; GraphicsContext* gfxCtx; - Gfx* gfxArr[4]; + Gfx* dispRefs[4]; gfxCtx = globalCtx->state.gfxCtx; - func_800C6AC4(gfxArr, globalCtx->state.gfxCtx, "../z_scene_table.c", 6463); + Graph_OpenDisps(dispRefs, globalCtx->state.gfxCtx, "../z_scene_table.c", 6463); gameplayFrames = globalCtx->gameplayFrames; gSPSegment(gfxCtx->polyXlu.p++, 0x08, - Draw_TexScroll(globalCtx->state.gfxCtx, - 127 - (gameplayFrames * 4) % 128, 0, 32, 32)); - gSPSegment(gfxCtx->polyOpa.p++, 0x09, - Draw_TexScroll(globalCtx->state.gfxCtx, - 0, (gameplayFrames * 5) % 64, 16, 16)); + Gfx_TexScroll(globalCtx->state.gfxCtx, 127 - (gameplayFrames * 4) % 128, 0, 32, 32)); + gSPSegment(gfxCtx->polyOpa.p++, 0x09, Gfx_TexScroll(globalCtx->state.gfxCtx, 0, (gameplayFrames * 5) % 64, 16, 16)); gSPSegment(gfxCtx->polyOpa.p++, 0x0A, - Draw_TexScroll(globalCtx->state.gfxCtx, - 0, 63 - (gameplayFrames * 2) % 64, 16, 16)); - gSPSegment(gfxCtx->polyXlu.p++, 0x0B, - Draw_TwoTexScroll(globalCtx->state.gfxCtx, - 0, 0, 127 - (gameplayFrames * 3) % 128, 32, 32, - 1, 0, 0, 32, 32)); + Gfx_TexScroll(globalCtx->state.gfxCtx, 0, 63 - (gameplayFrames * 2) % 64, 16, 16)); + gSPSegment( + gfxCtx->polyXlu.p++, 0x0B, + Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 0, 127 - (gameplayFrames * 3) % 128, 32, 32, 1, 0, 0, 32, 32)); gDPPipeSync(gfxCtx->polyOpa.p++); gDPSetEnvColor(gfxCtx->polyOpa.p++, 0x80, 0x80, 0x80, 0x80); @@ -2680,20 +1515,19 @@ void func_8009D0E8(GlobalContext* globalCtx) gDPPipeSync(gfxCtx->polyXlu.p++); gDPSetEnvColor(gfxCtx->polyXlu.p++, 0x80, 0x80, 0x80, 0x80); - func_800C6B54(gfxArr, globalCtx->state.gfxCtx, "../z_scene_table.c", 6491); + Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_scene_table.c", 6491); } u32 D_8012A348[] = { 0x02005210, 0x02005010 }; // Scene Draw Config 44 -void func_8009D31C(GlobalContext* globalCtx) -{ +void func_8009D31C(GlobalContext* globalCtx) { GraphicsContext* gfxCtx; - Gfx* gfxArr[4]; + Gfx* dispRefs[4]; s32 pad[2]; gfxCtx = globalCtx->state.gfxCtx; - func_800C6AC4(gfxArr, globalCtx->state.gfxCtx, "../z_scene_table.c", 6515); + Graph_OpenDisps(dispRefs, globalCtx->state.gfxCtx, "../z_scene_table.c", 6515); gSPSegment(gfxCtx->polyXlu.p++, 0x08, SEGMENTED_TO_VIRTUAL(D_8012A348[gSaveContext.night_flag])); @@ -2703,26 +1537,26 @@ void func_8009D31C(GlobalContext* globalCtx) gDPPipeSync(gfxCtx->polyXlu.p++); gDPSetEnvColor(gfxCtx->polyXlu.p++, 0x80, 0x80, 0x80, 0x80); - func_800C6B54(gfxArr, globalCtx->state.gfxCtx, "../z_scene_table.c", 6528); + Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_scene_table.c", 6528); } u32 D_8012A350[] = { 0x02006550, 0x02003550 }; u32 D_8012A358[] = { 0x02002350, 0x02001350 }; // Scene Draw Config 45 -void func_8009D438(GlobalContext* globalCtx) -{ +void func_8009D438(GlobalContext* globalCtx) { s32 var; GraphicsContext* gfxCtx; - Gfx* gfxArr[4]; + Gfx* dispRefs[4]; gfxCtx = globalCtx->state.gfxCtx; - func_800C6AC4(gfxArr, globalCtx->state.gfxCtx, "../z_scene_table.c", 6560); + Graph_OpenDisps(dispRefs, globalCtx->state.gfxCtx, "../z_scene_table.c", 6560); - if (LINK_IS_ADULT) + if (LINK_IS_ADULT) { var = 1; - else + } else { var = gSaveContext.night_flag; + } gSPSegment(gfxCtx->polyOpa.p++, 0x08, SEGMENTED_TO_VIRTUAL(D_8012A358[var])); gSPSegment(gfxCtx->polyOpa.p++, 0x09, SEGMENTED_TO_VIRTUAL(D_8012A350[var])); @@ -2733,27 +1567,24 @@ void func_8009D438(GlobalContext* globalCtx) gDPPipeSync(gfxCtx->polyXlu.p++); gDPSetEnvColor(gfxCtx->polyXlu.p++, 0x80, 0x80, 0x80, 0x80); - func_800C6B54(gfxArr, globalCtx->state.gfxCtx, "../z_scene_table.c", 6581); + Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_scene_table.c", 6581); } // Scene Draw Config 46 -void func_8009D5B4(GlobalContext* globalCtx) -{ +void func_8009D5B4(GlobalContext* globalCtx) { u32 gameplayFrames; GraphicsContext* gfxCtx; - Gfx* gfxArr[4]; + Gfx* dispRefs[4]; gfxCtx = globalCtx->state.gfxCtx; - func_800C6AC4(gfxArr, globalCtx->state.gfxCtx, "../z_scene_table.c", 6595); + Graph_OpenDisps(dispRefs, globalCtx->state.gfxCtx, "../z_scene_table.c", 6595); gameplayFrames = globalCtx->gameplayFrames; gSPSegment(gfxCtx->polyOpa.p++, 0x08, - Draw_TexScroll(globalCtx->state.gfxCtx, - 0, (gameplayFrames * 3) % 128, 32, 32)); + Gfx_TexScroll(globalCtx->state.gfxCtx, 0, (gameplayFrames * 3) % 128, 32, 32)); gSPSegment(gfxCtx->polyXlu.p++, 0x09, - Draw_TwoTexScroll(globalCtx->state.gfxCtx, - 0, 0, 1023 - (gameplayFrames * 3) % 1024, 16, 256, - 1, 0, 1023 - (gameplayFrames * 6) % 1024, 16, 256)); + Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 0, 1023 - (gameplayFrames * 3) % 1024, 16, 256, 1, 0, + 1023 - (gameplayFrames * 6) % 1024, 16, 256)); gDPPipeSync(gfxCtx->polyOpa.p++); gDPSetEnvColor(gfxCtx->polyOpa.p++, 0x80, 0x80, 0x80, 0x80); @@ -2761,33 +1592,30 @@ void func_8009D5B4(GlobalContext* globalCtx) gDPPipeSync(gfxCtx->polyXlu.p++); gDPSetEnvColor(gfxCtx->polyXlu.p++, 0x80, 0x80, 0x80, 0x80); - func_800C6B54(gfxArr, globalCtx->state.gfxCtx, "../z_scene_table.c", 6615); + Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_scene_table.c", 6615); } u32 D_8012A360[] = { 0x02014D90, 0x02014590 }; // Scene Draw Config 22 -void func_8009D758(GlobalContext* globalCtx) -{ +void func_8009D758(GlobalContext* globalCtx) { u32 gameplayFrames; GraphicsContext* gfxCtx; - Gfx* gfxArr[4]; + Gfx* dispRefs[4]; - if (0) ; // Necessary to match + if (0) {} // Necessary to match gfxCtx = globalCtx->state.gfxCtx; - func_800C6AC4(gfxArr, globalCtx->state.gfxCtx, "../z_scene_table.c", 6640); + Graph_OpenDisps(dispRefs, globalCtx->state.gfxCtx, "../z_scene_table.c", 6640); gameplayFrames = globalCtx->gameplayFrames; gSPSegment(gfxCtx->polyXlu.p++, 0x08, SEGMENTED_TO_VIRTUAL(D_8012A360[gSaveContext.night_flag])); gSPSegment(gfxCtx->polyXlu.p++, 0x09, - Draw_TwoTexScroll(globalCtx->state.gfxCtx, - 0, 127 - gameplayFrames % 128, (gameplayFrames * 1) % 128, 32, 32, - 1, gameplayFrames % 128, (gameplayFrames * 1) % 128, 32, 32)); + Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 127 - gameplayFrames % 128, (gameplayFrames * 1) % 128, 32, + 32, 1, gameplayFrames % 128, (gameplayFrames * 1) % 128, 32, 32)); gSPSegment(gfxCtx->polyOpa.p++, 0x0A, - Draw_TwoTexScroll(globalCtx->state.gfxCtx, - 0, 127 - gameplayFrames % 128, (gameplayFrames * 1) % 128, 32, 32, - 1, gameplayFrames % 128, (gameplayFrames * 1) % 128, 32, 32)); + 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]; } // Necessary to match stack usage @@ -2797,48 +1625,44 @@ void func_8009D758(GlobalContext* globalCtx) gDPPipeSync(gfxCtx->polyXlu.p++); gDPSetEnvColor(gfxCtx->polyXlu.p++, 0x80, 0x80, 0x80, 0x80); - func_800C6B54(gfxArr, globalCtx->state.gfxCtx, "../z_scene_table.c", 6671); + Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_scene_table.c", 6671); } u32 D_8012A368[] = { 0x02018920, 0x02018020 }; // Scene Draw Config 25 -void func_8009D974(GlobalContext* globalCtx) -{ +void func_8009D974(GlobalContext* globalCtx) { GraphicsContext* gfxCtx; - Gfx* gfxArr[4]; + Gfx* dispRefs[4]; s32 pad[2]; gfxCtx = globalCtx->state.gfxCtx; - func_800C6AC4(gfxArr, globalCtx->state.gfxCtx, "../z_scene_table.c", 6752); + Graph_OpenDisps(dispRefs, globalCtx->state.gfxCtx, "../z_scene_table.c", 6752); gSPSegment(gfxCtx->polyXlu.p++, 0x08, SEGMENTED_TO_VIRTUAL(D_8012A368[gSaveContext.night_flag])); - func_800C6B54(gfxArr, globalCtx->state.gfxCtx, "../z_scene_table.c", 6762); + Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_scene_table.c", 6762); } // Scene Draw Config 1 -void func_8009DA30(GlobalContext* globalCtx) -{ +void func_8009DA30(GlobalContext* globalCtx) { u32 gameplayFrames; Gfx* displayListHead; GraphicsContext* gfxCtx; - Gfx* gfxArr[4]; + Gfx* dispRefs[4]; displayListHead = Graph_Alloc(globalCtx->state.gfxCtx, 3 * sizeof(Gfx)); gfxCtx = globalCtx->state.gfxCtx; - func_800C6AC4(gfxArr, globalCtx->state.gfxCtx, "../z_scene_table.c", 6814); + Graph_OpenDisps(dispRefs, globalCtx->state.gfxCtx, "../z_scene_table.c", 6814); gameplayFrames = globalCtx->gameplayFrames; gSPSegment(gfxCtx->polyXlu.p++, 0x08, - Draw_TwoTexScroll(globalCtx->state.gfxCtx, - 0, 127 - gameplayFrames % 128, (gameplayFrames * 3) % 128, 32, 32, - 1, gameplayFrames % 128, (gameplayFrames * 3) % 128, 32, 32)); + Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 127 - gameplayFrames % 128, (gameplayFrames * 3) % 128, 32, + 32, 1, gameplayFrames % 128, (gameplayFrames * 3) % 128, 32, 32)); gSPSegment(gfxCtx->polyXlu.p++, 0x09, - Draw_TwoTexScroll(globalCtx->state.gfxCtx, - 0, 127 - gameplayFrames % 128, (gameplayFrames * 10) % 128, 32, 32, - 1, gameplayFrames % 128, (gameplayFrames * 10) % 128, 32, 32)); + Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 127 - gameplayFrames % 128, (gameplayFrames * 10) % 128, 32, + 32, 1, gameplayFrames % 128, (gameplayFrames * 10) % 128, 32, 32)); gDPPipeSync(gfxCtx->polyOpa.p++); gDPSetEnvColor(gfxCtx->polyOpa.p++, 0x80, 0x80, 0x80, 0x80); @@ -2848,21 +1672,17 @@ void func_8009DA30(GlobalContext* globalCtx) gSPSegment(gfxCtx->polyXlu.p++, 0x0A, displayListHead); - if ((gSaveContext.day_time >= 0x4AAC) && (gSaveContext.day_time <= 0xC555)) - { + if ((gSaveContext.day_time >= 0x4AAC) && (gSaveContext.day_time <= 0xC555)) { gSPEndDisplayList(displayListHead); - } - else - { - if (gSaveContext.day_time > 0xC555) - { - if (globalCtx->unk_11D30[0] != 255) + } else { + if (gSaveContext.day_time > 0xC555) { + if (globalCtx->unk_11D30[0] != 255) { Math_ApproxS(&globalCtx->unk_11D30[0], 255, 5); - } - else if (gSaveContext.day_time >= 0x4000) - { - if (globalCtx->unk_11D30[0] != 0) + } + } else if (gSaveContext.day_time >= 0x4000) { + if (globalCtx->unk_11D30[0] != 0) { Math_ApproxS(&globalCtx->unk_11D30[0], 0, 10); + } } gDPSetPrimColor(displayListHead++, 0, 0, 0xFF, 0xFF, 0xFF, globalCtx->unk_11D30[0]); @@ -2870,20 +1690,19 @@ void func_8009DA30(GlobalContext* globalCtx) gSPEndDisplayList(displayListHead); } - func_800C6B54(gfxArr, globalCtx->state.gfxCtx, "../z_scene_table.c", 6866); + Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_scene_table.c", 6866); } u32 D_8012A370[] = { 0x02015B50, 0x02016B50 }; // Scene Draw Config 2 -void func_8009DD5C(GlobalContext* globalCtx) -{ +void func_8009DD5C(GlobalContext* globalCtx) { GraphicsContext* gfxCtx; - Gfx* gfxArr[4]; + Gfx* dispRefs[4]; s32 pad[2]; gfxCtx = globalCtx->state.gfxCtx; - func_800C6AC4(gfxArr, globalCtx->state.gfxCtx, "../z_scene_table.c", 6890); + Graph_OpenDisps(dispRefs, globalCtx->state.gfxCtx, "../z_scene_table.c", 6890); gSPSegment(gfxCtx->polyOpa.p++, 0x08, SEGMENTED_TO_VIRTUAL(D_8012A370[gSaveContext.night_flag])); @@ -2893,32 +1712,28 @@ void func_8009DD5C(GlobalContext* globalCtx) gDPPipeSync(gfxCtx->polyXlu.p++); gDPSetEnvColor(gfxCtx->polyXlu.p++, 0x80, 0x80, 0x80, 0x80); - func_800C6B54(gfxArr, globalCtx->state.gfxCtx, "../z_scene_table.c", 6903); + Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_scene_table.c", 6903); } // Scene Draw Config 3 -void func_8009DE78(GlobalContext* globalCtx) -{ +void func_8009DE78(GlobalContext* globalCtx) { u32 gameplayFrames; GraphicsContext* gfxCtx; - Gfx* gfxArr[4]; + Gfx* dispRefs[4]; gfxCtx = globalCtx->state.gfxCtx; - func_800C6AC4(gfxArr, globalCtx->state.gfxCtx, "../z_scene_table.c", 6917); + Graph_OpenDisps(dispRefs, globalCtx->state.gfxCtx, "../z_scene_table.c", 6917); gameplayFrames = globalCtx->gameplayFrames; gSPSegment(gfxCtx->polyXlu.p++, 0x08, - Draw_TwoTexScroll(globalCtx->state.gfxCtx, - 0, 127 - gameplayFrames % 128, (gameplayFrames * 6) % 128, 32, 32, - 1, gameplayFrames % 128, (gameplayFrames * 6) % 128, 32, 32)); + Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 127 - gameplayFrames % 128, (gameplayFrames * 6) % 128, 32, + 32, 1, gameplayFrames % 128, (gameplayFrames * 6) % 128, 32, 32)); gSPSegment(gfxCtx->polyXlu.p++, 0x09, - Draw_TwoTexScroll(globalCtx->state.gfxCtx, - 0, 127 - gameplayFrames % 128, (gameplayFrames * 3) % 128, 32, 32, - 1, gameplayFrames % 128, (gameplayFrames * 3) % 128, 32, 32)); + Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 127 - gameplayFrames % 128, (gameplayFrames * 3) % 128, 32, + 32, 1, gameplayFrames % 128, (gameplayFrames * 3) % 128, 32, 32)); gSPSegment(gfxCtx->polyXlu.p++, 0x0A, - Draw_TwoTexScroll(globalCtx->state.gfxCtx, - 0, 127 - gameplayFrames % 128, (gameplayFrames * 1) % 128, 32, 32, - 1, gameplayFrames % 128, (gameplayFrames * 1) % 128, 32, 32)); + Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 127 - gameplayFrames % 128, (gameplayFrames * 1) % 128, 32, + 32, 1, gameplayFrames % 128, (gameplayFrames * 1) % 128, 32, 32)); gDPPipeSync(gfxCtx->polyOpa.p++); gDPSetEnvColor(gfxCtx->polyOpa.p++, 0x80, 0x80, 0x80, 0x80); @@ -2926,18 +1741,17 @@ void func_8009DE78(GlobalContext* globalCtx) gDPPipeSync(gfxCtx->polyXlu.p++); gDPSetEnvColor(gfxCtx->polyXlu.p++, 0x80, 0x80, 0x80, 0x80); - func_800C6B54(gfxArr, globalCtx->state.gfxCtx, "../z_scene_table.c", 6948); + Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_scene_table.c", 6948); } // Scene Draw Config 4 -void func_8009E0B8(GlobalContext* globalCtx) -{ +void func_8009E0B8(GlobalContext* globalCtx) { u32 gameplayFrames; u8 spA3; u16 spA0; Gfx* displayListHead; GraphicsContext* gfxCtx; - Gfx* gfxArr[4]; + Gfx* dispRefs[4]; spA3 = 128; spA0 = 500; @@ -2945,17 +1759,15 @@ void func_8009E0B8(GlobalContext* globalCtx) displayListHead = Graph_Alloc(globalCtx->state.gfxCtx, 6 * sizeof(Gfx)); gfxCtx = globalCtx->state.gfxCtx; - func_800C6AC4(gfxArr, globalCtx->state.gfxCtx, "../z_scene_table.c", 6965); + Graph_OpenDisps(dispRefs, globalCtx->state.gfxCtx, "../z_scene_table.c", 6965); gameplayFrames = globalCtx->gameplayFrames; gSPSegment(gfxCtx->polyXlu.p++, 0x09, - Draw_TwoTexScroll(globalCtx->state.gfxCtx, - 0, 127 - gameplayFrames % 128, (gameplayFrames * 1) % 128, 32, 32, - 1, gameplayFrames % 128, (gameplayFrames * 1) % 128, 32, 32)); + Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 127 - gameplayFrames % 128, (gameplayFrames * 1) % 128, 32, + 32, 1, gameplayFrames % 128, (gameplayFrames * 1) % 128, 32, 32)); gSPSegment(gfxCtx->polyXlu.p++, 0x08, - Draw_TwoTexScroll(globalCtx->state.gfxCtx, - 0, 127 - gameplayFrames % 128, (gameplayFrames * 10) % 128, 32, 32, - 1, gameplayFrames % 128, (gameplayFrames * 10) % 128, 32, 32)); + Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 127 - gameplayFrames % 128, (gameplayFrames * 10) % 128, 32, + 32, 1, gameplayFrames % 128, (gameplayFrames * 10) % 128, 32, 32)); gDPPipeSync(gfxCtx->polyOpa.p++); gDPSetEnvColor(gfxCtx->polyOpa.p++, 0x80, 0x80, 0x80, 0x80); @@ -2963,12 +1775,13 @@ void func_8009E0B8(GlobalContext* globalCtx) gDPPipeSync(gfxCtx->polyXlu.p++); gDPSetEnvColor(gfxCtx->polyXlu.p++, 0x80, 0x80, 0x80, 0x80); - if (gSaveContext.scene_setup_index == 4) + if (gSaveContext.scene_setup_index == 4) { spA3 = 255 - (u8)globalCtx->unk_11D30[0]; - else if (gSaveContext.scene_setup_index == 6) + } else if (gSaveContext.scene_setup_index == 6) { spA0 = globalCtx->unk_11D30[0] + 500; - else if (((gSaveContext.scene_setup_index < 4) || LINK_IS_ADULT) && (gSaveContext.event_chk_inf[0] & 0x80)) + } else if (((gSaveContext.scene_setup_index < 4) || LINK_IS_ADULT) && (gSaveContext.event_chk_inf[0] & 0x80)) { spA0 = 2150; + } gSPSegment(gfxCtx->polyOpa.p++, 0x0A, displayListHead); gDPPipeSync(displayListHead++); @@ -2982,66 +1795,58 @@ void func_8009E0B8(GlobalContext* globalCtx) gSPEndDisplayList(displayListHead); gSPSegment(gfxCtx->polyOpa.p++, 0x0C, - Draw_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)); + 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)); - func_800C6B54(gfxArr, globalCtx->state.gfxCtx, "../z_scene_table.c", 7044); + Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_scene_table.c", 7044); } // Scene Draw Config 5 -void func_8009E54C(GlobalContext* globalCtx) -{ +void func_8009E54C(GlobalContext* globalCtx) { u32 gameplayFrames; GraphicsContext* gfxCtx; - Gfx* gfxArr[4]; + Gfx* dispRefs[4]; gfxCtx = globalCtx->state.gfxCtx; - func_800C6AC4(gfxArr, globalCtx->state.gfxCtx, "../z_scene_table.c", 7058); + Graph_OpenDisps(dispRefs, globalCtx->state.gfxCtx, "../z_scene_table.c", 7058); - if ((gSaveContext.scene_setup_index > 3) || - (LINK_IS_ADULT && !(gSaveContext.event_chk_inf[6] & 0x200))) + if ((gSaveContext.scene_setup_index > 3) || (LINK_IS_ADULT && !(gSaveContext.event_chk_inf[6] & 0x200))) { globalCtx->unk_11D30[0] = 87; + } gameplayFrames = globalCtx->gameplayFrames; gSPSegment(gfxCtx->polyOpa.p++, 0x08, - Draw_TwoTexScrollEnvColor(globalCtx->state.gfxCtx, - 0, gameplayFrames, gameplayFrames, 32, 32, - 1, 0, 0, 32, 32, - 0, 0, 0, globalCtx->unk_11D30[0] + 0xA8)); + Gfx_TwoTexScrollEnvColor(globalCtx->state.gfxCtx, 0, gameplayFrames, gameplayFrames, 32, 32, 1, 0, 0, 32, + 32, 0, 0, 0, globalCtx->unk_11D30[0] + 0xA8)); gSPSegment(gfxCtx->polyOpa.p++, 0x09, - Draw_TwoTexScrollEnvColor(globalCtx->state.gfxCtx, - 0, -gameplayFrames, -gameplayFrames, 32, 32, - 1, 0, 0, 16, 64, - 0, 0, 0, globalCtx->unk_11D30[0] + 0xA8)); + Gfx_TwoTexScrollEnvColor(globalCtx->state.gfxCtx, 0, -gameplayFrames, -gameplayFrames, 32, 32, 1, 0, 0, + 16, 64, 0, 0, 0, globalCtx->unk_11D30[0] + 0xA8)); gDPPipeSync(gfxCtx->polyOpa.p++); gDPSetEnvColor(gfxCtx->polyOpa.p++, 0xFF, 0xFF, 0xFF, 0x80); - func_800C6B54(gfxArr, globalCtx->state.gfxCtx, "../z_scene_table.c", 7097); + Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_scene_table.c", 7097); } u32 D_8012A378[] = { 0x02008F98, 0x02008FD8 }; // Scene Draw Config 6 -void func_8009E730(GlobalContext* globalCtx) -{ +void func_8009E730(GlobalContext* globalCtx) { u32 gameplayFrames; u32 var; GraphicsContext* gfxCtx; - Gfx* gfxArr[4]; + Gfx* dispRefs[4]; gfxCtx = globalCtx->state.gfxCtx; - func_800C6AC4(gfxArr, globalCtx->state.gfxCtx, "../z_scene_table.c", 7123); + Graph_OpenDisps(dispRefs, globalCtx->state.gfxCtx, "../z_scene_table.c", 7123); gameplayFrames = globalCtx->gameplayFrames; var = 127 - (gameplayFrames * 1) % 128; - if (LINK_IS_ADULT) + if (LINK_IS_ADULT) { var = 0; + } gSPSegment(gfxCtx->polyOpa.p++, 0x0C, - Draw_TwoTexScroll(globalCtx->state.gfxCtx, - 0, 0, 0, 64, 32, - 1, 0, var, 64, 32)); + Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 0, 0, 64, 32, 1, 0, var, 64, 32)); gDPPipeSync(gfxCtx->polyOpa.p++); gDPSetEnvColor(gfxCtx->polyOpa.p++, 0x80, 0x80, 0x80, 0x80); @@ -3050,32 +1855,27 @@ void func_8009E730(GlobalContext* globalCtx) { s32 pad[2]; } // Necessary to match stack usage - func_800C6B54(gfxArr, globalCtx->state.gfxCtx, "../z_scene_table.c", 7147); + Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_scene_table.c", 7147); } // Scene Draw Config 7 -void func_8009E8C0(GlobalContext* globalCtx) -{ +void func_8009E8C0(GlobalContext* globalCtx) { u32 gameplayFrames; GraphicsContext* gfxCtx; - Gfx* gfxArr[4]; + Gfx* dispRefs[4]; gfxCtx = globalCtx->state.gfxCtx; - func_800C6AC4(gfxArr, globalCtx->state.gfxCtx, "../z_scene_table.c", 7161); + Graph_OpenDisps(dispRefs, globalCtx->state.gfxCtx, "../z_scene_table.c", 7161); gameplayFrames = globalCtx->gameplayFrames; gSPSegment(gfxCtx->polyOpa.p++, 0x08, - Draw_TwoTexScroll(globalCtx->state.gfxCtx, - 0, (gameplayFrames * 1) % 128, 0, 32, 32, - 1, 0, 0, 32, 32)); + Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, (gameplayFrames * 1) % 128, 0, 32, 32, 1, 0, 0, 32, 32)); gSPSegment(gfxCtx->polyXlu.p++, 0x09, - Draw_TwoTexScroll(globalCtx->state.gfxCtx, - 0, 0, 255 - (gameplayFrames * 2) % 256, 64, 64, - 1, 0, 255 - (gameplayFrames * 2) % 256, 64, 64)); + Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 0, 255 - (gameplayFrames * 2) % 256, 64, 64, 1, 0, + 255 - (gameplayFrames * 2) % 256, 64, 64)); gSPSegment(gfxCtx->polyXlu.p++, 0x0A, - Draw_TwoTexScroll(globalCtx->state.gfxCtx, - 0, 0, (gameplayFrames * 1) % 128, 32, 32, - 1, 0, (gameplayFrames * 1) % 128, 32, 32)); + Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 0, (gameplayFrames * 1) % 128, 32, 32, 1, 0, + (gameplayFrames * 1) % 128, 32, 32)); gDPPipeSync(gfxCtx->polyOpa.p++); gDPSetEnvColor(gfxCtx->polyOpa.p++, 0x80, 0x80, 0x80, 0x80); @@ -3083,44 +1883,37 @@ void func_8009E8C0(GlobalContext* globalCtx) gDPPipeSync(gfxCtx->polyXlu.p++); gDPSetEnvColor(gfxCtx->polyXlu.p++, 0x80, 0x80, 0x80, 0x80); - func_800C6B54(gfxArr, globalCtx->state.gfxCtx, "../z_scene_table.c", 7192); + Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_scene_table.c", 7192); } // Scene Draw Config 8 -void func_8009EAD8(GlobalContext* globalCtx) -{ +void func_8009EAD8(GlobalContext* globalCtx) { u32 gameplayFrames; GraphicsContext* gfxCtx; - Gfx* gfxArr[4]; + Gfx* dispRefs[4]; gfxCtx = globalCtx->state.gfxCtx; - func_800C6AC4(gfxArr, globalCtx->state.gfxCtx, "../z_scene_table.c", 7206); + Graph_OpenDisps(dispRefs, globalCtx->state.gfxCtx, "../z_scene_table.c", 7206); gameplayFrames = globalCtx->gameplayFrames; gSPSegment(gfxCtx->polyXlu.p++, 0x08, - Draw_TwoTexScroll(globalCtx->state.gfxCtx, - 0, 0, (gameplayFrames * 3) % 1024, 32, 256, - 1, 0, (gameplayFrames * 3) % 1024, 32, 256)); + Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 0, (gameplayFrames * 3) % 1024, 32, 256, 1, 0, + (gameplayFrames * 3) % 1024, 32, 256)); gSPSegment(gfxCtx->polyXlu.p++, 0x09, - Draw_TwoTexScroll(globalCtx->state.gfxCtx, - 0, 0, (gameplayFrames * 1) % 256, 64, 64, - 1, 0, (gameplayFrames * 1) % 256, 64, 64)); + Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 0, (gameplayFrames * 1) % 256, 64, 64, 1, 0, + (gameplayFrames * 1) % 256, 64, 64)); gSPSegment(gfxCtx->polyXlu.p++, 0x0A, - Draw_TwoTexScroll(globalCtx->state.gfxCtx, - 0, 0, (gameplayFrames * 2) % 128, 32, 32, - 1, 0, (gameplayFrames * 2) % 128, 32, 32)); - gSPSegment(gfxCtx->polyOpa.p++, 0x0B, - Draw_TwoTexScroll(globalCtx->state.gfxCtx, - 0, 0, 0, 32, 32, - 1, 0, 127 - (gameplayFrames * 3) % 128, 32, 32)); + Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 0, (gameplayFrames * 2) % 128, 32, 32, 1, 0, + (gameplayFrames * 2) % 128, 32, 32)); + gSPSegment( + gfxCtx->polyOpa.p++, 0x0B, + Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 0, 0, 32, 32, 1, 0, 127 - (gameplayFrames * 3) % 128, 32, 32)); gSPSegment(gfxCtx->polyXlu.p++, 0x0C, - Draw_TwoTexScroll(globalCtx->state.gfxCtx, - 0, 0, (gameplayFrames * 1) % 128, 32, 32, - 1, 0, (gameplayFrames * 1) % 128, 32, 32)); + Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 0, (gameplayFrames * 1) % 128, 32, 32, 1, 0, + (gameplayFrames * 1) % 128, 32, 32)); gSPSegment(gfxCtx->polyXlu.p++, 0x0D, - Draw_TwoTexScroll(globalCtx->state.gfxCtx, - 0, 0, (gameplayFrames * 1) % 64, 16, 16, - 1, 0, (gameplayFrames * 1) % 64, 16, 16)); + Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 0, (gameplayFrames * 1) % 64, 16, 16, 1, 0, + (gameplayFrames * 1) % 64, 16, 16)); gDPPipeSync(gfxCtx->polyOpa.p++); gDPSetEnvColor(gfxCtx->polyOpa.p++, 0x80, 0x80, 0x80, 0x80); @@ -3128,30 +1921,27 @@ void func_8009EAD8(GlobalContext* globalCtx) gDPPipeSync(gfxCtx->polyXlu.p++); gDPSetEnvColor(gfxCtx->polyXlu.p++, 0x80, 0x80, 0x80, 0x80); - func_800C6B54(gfxArr, globalCtx->state.gfxCtx, "../z_scene_table.c", 7260); + Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_scene_table.c", 7260); } // Scene Draw Config 9 -void func_8009EE44(GlobalContext* globalCtx) -{ +void func_8009EE44(GlobalContext* globalCtx) { u32 gameplayFrames; GraphicsContext* gfxCtx; - Gfx* gfxArr[4]; + Gfx* dispRefs[4]; - if (0) ; // Necessary to match + if (0) {} // Necessary to match gfxCtx = globalCtx->state.gfxCtx; - func_800C6AC4(gfxArr, globalCtx->state.gfxCtx, "../z_scene_table.c", 7274); + Graph_OpenDisps(dispRefs, globalCtx->state.gfxCtx, "../z_scene_table.c", 7274); gameplayFrames = globalCtx->gameplayFrames; gSPSegment(gfxCtx->polyXlu.p++, 0x08, - Draw_TwoTexScroll(globalCtx->state.gfxCtx, - 0, gameplayFrames % 128, 0, 32, 16, - 1, gameplayFrames % 128, 0, 32, 16)); + Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, gameplayFrames % 128, 0, 32, 16, 1, gameplayFrames % 128, 0, + 32, 16)); gSPSegment(gfxCtx->polyXlu.p++, 0x09, - Draw_TwoTexScroll(globalCtx->state.gfxCtx, - 0, 127 - gameplayFrames % 128, gameplayFrames % 128, 32, 32, - 1, gameplayFrames % 128, gameplayFrames % 128, 32, 32)); + Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 127 - gameplayFrames % 128, gameplayFrames % 128, 32, 32, 1, + gameplayFrames % 128, gameplayFrames % 128, 32, 32)); gDPPipeSync(gfxCtx->polyXlu.p++); gDPSetEnvColor(gfxCtx->polyXlu.p++, 0x80, 0x80, 0x80, 0x80); @@ -3159,34 +1949,29 @@ void func_8009EE44(GlobalContext* globalCtx) gDPPipeSync(gfxCtx->polyOpa.p++); gDPSetEnvColor(gfxCtx->polyOpa.p++, 0x80, 0x80, 0x80, 0x80); - if ((globalCtx->unk_11D30[0] == 0) && (INV_CONTENT(ITEM_COJIRO) == ITEM_COJIRO)) - { - if (globalCtx->unk_11D30[1] == 50) - { + if ((globalCtx->unk_11D30[0] == 0) && (INV_CONTENT(ITEM_COJIRO) == ITEM_COJIRO)) { + if (globalCtx->unk_11D30[1] == 50) { func_8002F7DC(&PLAYER->actor, NA_SE_EV_CHICKEN_CRY_M); globalCtx->unk_11D30[0] = 1; } globalCtx->unk_11D30[1]++; } - func_800C6B54(gfxArr, globalCtx->state.gfxCtx, "../z_scene_table.c", 7309); + Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_scene_table.c", 7309); } // Scene Draw Config 10 -void func_8009F074(GlobalContext* globalCtx) -{ +void func_8009F074(GlobalContext* globalCtx) { u32 gameplayFrames; GraphicsContext* gfxCtx; - Gfx* gfxArr[4]; + Gfx* dispRefs[4]; gfxCtx = globalCtx->state.gfxCtx; - func_800C6AC4(gfxArr, globalCtx->state.gfxCtx, "../z_scene_table.c", 7323); + Graph_OpenDisps(dispRefs, globalCtx->state.gfxCtx, "../z_scene_table.c", 7323); gameplayFrames = globalCtx->gameplayFrames; gSPSegment(gfxCtx->polyOpa.p++, 0x08, - Draw_TwoTexScroll(globalCtx->state.gfxCtx, - 0, 0, 0, 32, 32, - 1, 0, 127 - gameplayFrames % 128, 32, 32)); + Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 0, 0, 32, 32, 1, 0, 127 - gameplayFrames % 128, 32, 32)); gDPPipeSync(gfxCtx->polyOpa.p++); gDPSetEnvColor(gfxCtx->polyOpa.p++, 0x80, 0x80, 0x80, 0x80); @@ -3194,45 +1979,41 @@ void func_8009F074(GlobalContext* globalCtx) gDPPipeSync(gfxCtx->polyXlu.p++); gDPSetEnvColor(gfxCtx->polyXlu.p++, 0x80, 0x80, 0x80, 0x80); - func_800C6B54(gfxArr, globalCtx->state.gfxCtx, "../z_scene_table.c", 7339); + Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_scene_table.c", 7339); } u32 D_8012A380[] = { 0x02009678, 0x0200DE78 }; // Scene Draw Config 11 -void func_8009F1B4(GlobalContext* globalCtx) -{ +void func_8009F1B4(GlobalContext* globalCtx) { GraphicsContext* gfxCtx; - Gfx* gfxArr[4]; + Gfx* dispRefs[4]; s32 pad[2]; gfxCtx = globalCtx->state.gfxCtx; - func_800C6AC4(gfxArr, globalCtx->state.gfxCtx, "../z_scene_table.c", 7363); + Graph_OpenDisps(dispRefs, globalCtx->state.gfxCtx, "../z_scene_table.c", 7363); gSPSegment(gfxCtx->polyOpa.p++, 0x08, SEGMENTED_TO_VIRTUAL(D_8012A380[gSaveContext.night_flag])); - func_800C6B54(gfxArr, globalCtx->state.gfxCtx, "../z_scene_table.c", 7371); + Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_scene_table.c", 7371); } // Scene Draw Config 12 -void func_8009F270(GlobalContext* globalCtx) -{ +void func_8009F270(GlobalContext* globalCtx) { u32 gameplayFrames; GraphicsContext* gfxCtx; - Gfx* gfxArr[4]; + Gfx* dispRefs[4]; gfxCtx = globalCtx->state.gfxCtx; - func_800C6AC4(gfxArr, globalCtx->state.gfxCtx, "../z_scene_table.c", 7385); + Graph_OpenDisps(dispRefs, globalCtx->state.gfxCtx, "../z_scene_table.c", 7385); gameplayFrames = globalCtx->gameplayFrames; gSPSegment(gfxCtx->polyOpa.p++, 0x08, - Draw_TwoTexScroll(globalCtx->state.gfxCtx, - 0, 0, gameplayFrames % 128, 32, 32, - 1, 0, gameplayFrames % 128, 32, 32)); + Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 0, gameplayFrames % 128, 32, 32, 1, 0, gameplayFrames % 128, + 32, 32)); gSPSegment(gfxCtx->polyXlu.p++, 0x09, - Draw_TwoTexScroll(globalCtx->state.gfxCtx, - 0, 0, gameplayFrames % 128, 32, 32, - 1, 0, gameplayFrames % 128, 32, 32)); + Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 0, gameplayFrames % 128, 32, 32, 1, 0, gameplayFrames % 128, + 32, 32)); gDPPipeSync(gfxCtx->polyOpa.p++); gDPSetEnvColor(gfxCtx->polyOpa.p++, 0x80, 0x80, 0x80, 0x80); @@ -3240,28 +2021,25 @@ void func_8009F270(GlobalContext* globalCtx) gDPPipeSync(gfxCtx->polyXlu.p++); gDPSetEnvColor(gfxCtx->polyXlu.p++, 0x80, 0x80, 0x80, 0x80); - func_800C6B54(gfxArr, globalCtx->state.gfxCtx, "../z_scene_table.c", 7409); + Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_scene_table.c", 7409); } // Scene Draw Config 13 -void func_8009F40C(GlobalContext* globalCtx) -{ +void func_8009F40C(GlobalContext* globalCtx) { u32 gameplayFrames; GraphicsContext* gfxCtx; - Gfx* gfxArr[4]; + Gfx* dispRefs[4]; gfxCtx = globalCtx->state.gfxCtx; - func_800C6AC4(gfxArr, globalCtx->state.gfxCtx, "../z_scene_table.c", 7423); + Graph_OpenDisps(dispRefs, globalCtx->state.gfxCtx, "../z_scene_table.c", 7423); gameplayFrames = globalCtx->gameplayFrames; gSPSegment(gfxCtx->polyXlu.p++, 0x08, - Draw_TwoTexScroll(globalCtx->state.gfxCtx, - 0, 127 - gameplayFrames % 128, (gameplayFrames * 10) % 128, 32, 32, - 1, gameplayFrames % 128, (gameplayFrames * 10) % 128, 32, 32)); + Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 127 - gameplayFrames % 128, (gameplayFrames * 10) % 128, 32, + 32, 1, gameplayFrames % 128, (gameplayFrames * 10) % 128, 32, 32)); gSPSegment(gfxCtx->polyXlu.p++, 0x09, - Draw_TwoTexScroll(globalCtx->state.gfxCtx, - 0, 127 - gameplayFrames % 128, (gameplayFrames * 3) % 128, 32, 32, - 1, gameplayFrames % 128, (gameplayFrames * 3) % 128, 32, 32)); + Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 127 - gameplayFrames % 128, (gameplayFrames * 3) % 128, 32, + 32, 1, gameplayFrames % 128, (gameplayFrames * 3) % 128, 32, 32)); gDPPipeSync(gfxCtx->polyOpa.p++); gDPSetEnvColor(gfxCtx->polyOpa.p++, 0x80, 0x80, 0x80, 0x80); @@ -3269,38 +2047,33 @@ void func_8009F40C(GlobalContext* globalCtx) gDPPipeSync(gfxCtx->polyXlu.p++); gDPSetEnvColor(gfxCtx->polyXlu.p++, 0x80, 0x80, 0x80, 0x80); - func_800C6B54(gfxArr, globalCtx->state.gfxCtx, "../z_scene_table.c", 7443); + Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_scene_table.c", 7443); } // Scene Draw Config 14 -void func_8009F5D4(GlobalContext* globalCtx) -{ +void func_8009F5D4(GlobalContext* globalCtx) { Gfx* displayListHead; GraphicsContext* gfxCtx; - Gfx* gfxArr[4]; + Gfx* dispRefs[4]; displayListHead = Graph_Alloc(globalCtx->state.gfxCtx, 3 * sizeof(Gfx)); gfxCtx = globalCtx->state.gfxCtx; - func_800C6AC4(gfxArr, globalCtx->state.gfxCtx, "../z_scene_table.c", 7461); + Graph_OpenDisps(dispRefs, globalCtx->state.gfxCtx, "../z_scene_table.c", 7461); gSPSegment(gfxCtx->polyXlu.p++, 0x08, displayListHead); - if ((gSaveContext.day_time >= 0x4AAC) && (gSaveContext.day_time <= 0xC000)) - { + if ((gSaveContext.day_time >= 0x4AAC) && (gSaveContext.day_time <= 0xC000)) { gSPEndDisplayList(displayListHead); - } - else - { - if (gSaveContext.day_time > 0xC000) - { - if (globalCtx->unk_11D30[0] != 255) + } else { + if (gSaveContext.day_time > 0xC000) { + if (globalCtx->unk_11D30[0] != 255) { Math_ApproxS(&globalCtx->unk_11D30[0], 255, 5); - } - else if (gSaveContext.day_time >= 0x4000) - { - if (globalCtx->unk_11D30[0] != 0) + } + } else if (gSaveContext.day_time >= 0x4000) { + if (globalCtx->unk_11D30[0] != 0) { Math_ApproxS(&globalCtx->unk_11D30[0], 0, 10); + } } gDPSetPrimColor(displayListHead++, 0, 0, 0xFF, 0xFF, 0xFF, globalCtx->unk_11D30[0]); @@ -3314,32 +2087,30 @@ void func_8009F5D4(GlobalContext* globalCtx) gDPPipeSync(gfxCtx->polyXlu.p++); gDPSetEnvColor(gfxCtx->polyXlu.p++, 0x80, 0x80, 0x80, 0x80); - func_800C6B54(gfxArr, globalCtx->state.gfxCtx, "../z_scene_table.c", 7495); + Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_scene_table.c", 7495); } // Scene Draw Config 15 -void func_8009F7D4(GlobalContext* globalCtx) -{ +void func_8009F7D4(GlobalContext* globalCtx) { s8 sp6F; s8 sp6E; u32 gameplayFrames; GraphicsContext* gfxCtx; - Gfx* gfxArr[4]; + Gfx* dispRefs[4]; sp6F = coss((globalCtx->gameplayFrames * 1500) & 0xFFFF) >> 8; sp6E = coss((globalCtx->gameplayFrames * 1500) & 0xFFFF) >> 8; gfxCtx = globalCtx->state.gfxCtx; - func_800C6AC4(gfxArr, globalCtx->state.gfxCtx, "../z_scene_table.c", 7512); + Graph_OpenDisps(dispRefs, globalCtx->state.gfxCtx, "../z_scene_table.c", 7512); gameplayFrames = globalCtx->gameplayFrames; sp6F = (sp6F >> 1) + 192; sp6E = (sp6E >> 1) + 192; gSPSegment(gfxCtx->polyOpa.p++, 0x08, - Draw_TwoTexScroll(globalCtx->state.gfxCtx, - 0, 0, gameplayFrames % 128, 32, 32, - 1, 0, gameplayFrames % 128, 32, 32)); + Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 0, gameplayFrames % 128, 32, 32, 1, 0, gameplayFrames % 128, + 32, 32)); gDPPipeSync(gfxCtx->polyOpa.p++); gDPSetEnvColor(gfxCtx->polyOpa.p++, sp6F, sp6E, 0xFF, 0x80); @@ -3347,26 +2118,24 @@ void func_8009F7D4(GlobalContext* globalCtx) gDPPipeSync(gfxCtx->polyXlu.p++); gDPSetEnvColor(gfxCtx->polyXlu.p++, 0x80, 0x80, 0x80, 0x80); - func_800C6B54(gfxArr, globalCtx->state.gfxCtx, "../z_scene_table.c", 7530); + Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_scene_table.c", 7530); } u32 D_8012A388[] = { 0x02009808, 0x02008FC8 }; // Scene Draw Config 16 -void func_8009F9D0(GlobalContext* globalCtx) -{ +void func_8009F9D0(GlobalContext* globalCtx) { u32 gameplayFrames; GraphicsContext* gfxCtx; - Gfx* gfxArr[4]; + Gfx* dispRefs[4]; gfxCtx = globalCtx->state.gfxCtx; - func_800C6AC4(gfxArr, globalCtx->state.gfxCtx, "../z_scene_table.c", 7555); + Graph_OpenDisps(dispRefs, globalCtx->state.gfxCtx, "../z_scene_table.c", 7555); gameplayFrames = globalCtx->gameplayFrames; gSPSegment(gfxCtx->polyOpa.p++, 0x08, - Draw_TwoTexScroll(globalCtx->state.gfxCtx, - 0, 0, 127 - gameplayFrames % 128, 32, 32, - 1, gameplayFrames % 128, 0, 32, 32)); + Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 0, 127 - gameplayFrames % 128, 32, 32, 1, + gameplayFrames % 128, 0, 32, 32)); gDPPipeSync(gfxCtx->polyOpa.p++); gDPSetEnvColor(gfxCtx->polyOpa.p++, 0x80, 0x80, 0x80, 0x80); @@ -3378,20 +2147,19 @@ void func_8009F9D0(GlobalContext* globalCtx) { s32 pad[2]; } // Necessary to match stack usage - func_800C6B54(gfxArr, globalCtx->state.gfxCtx, "../z_scene_table.c", 7578); + Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_scene_table.c", 7578); } u32 D_8012A390[] = { 0x020081E0, 0x0200FBE0 }; // Scene Draw Config 17 -void func_8009FB74(GlobalContext* globalCtx) -{ +void func_8009FB74(GlobalContext* globalCtx) { GraphicsContext* gfxCtx; - Gfx* gfxArr[4]; + Gfx* dispRefs[4]; s32 pad[2]; gfxCtx = globalCtx->state.gfxCtx; - func_800C6AC4(gfxArr, globalCtx->state.gfxCtx, "../z_scene_table.c", 7602); + Graph_OpenDisps(dispRefs, globalCtx->state.gfxCtx, "../z_scene_table.c", 7602); gSPSegment(gfxCtx->polyOpa.p++, 0x08, SEGMENTED_TO_VIRTUAL(D_8012A390[gSaveContext.night_flag])); @@ -3401,28 +2169,26 @@ void func_8009FB74(GlobalContext* globalCtx) gDPPipeSync(gfxCtx->polyXlu.p++); gDPSetEnvColor(gfxCtx->polyXlu.p++, 0x80, 0x80, 0x80, 0x80); - func_800C6B54(gfxArr, globalCtx->state.gfxCtx, "../z_scene_table.c", 7615); + Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_scene_table.c", 7615); } // Scene Draw Config 18 -void func_8009FC90(GlobalContext* globalCtx) -{ +void func_8009FC90(GlobalContext* globalCtx) { u32 gameplayFrames; GraphicsContext* gfxCtx; - Gfx* gfxArr[4]; + Gfx* dispRefs[4]; gfxCtx = globalCtx->state.gfxCtx; - func_800C6AC4(gfxArr, globalCtx->state.gfxCtx, "../z_scene_table.c", 7630); + Graph_OpenDisps(dispRefs, globalCtx->state.gfxCtx, "../z_scene_table.c", 7630); gameplayFrames = globalCtx->gameplayFrames; gSPSegment(gfxCtx->polyOpa.p++, 0x08, - Draw_TwoTexScroll(globalCtx->state.gfxCtx, - 0, 0, 127 - gameplayFrames % 128, 32, 32, - 1, 127 - gameplayFrames % 128, 0, 32, 32)); + Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 0, 127 - gameplayFrames % 128, 32, 32, 1, + 127 - gameplayFrames % 128, 0, 32, 32)); gSPSegment(gfxCtx->polyOpa.p++, 0x09, - Draw_TwoTexScroll(globalCtx->state.gfxCtx, - 0, (gameplayFrames * 3) % 128, 127 - (gameplayFrames * 6) % 128, 32, 32, - 1, (gameplayFrames * 6) % 128, 127 - (gameplayFrames * 3) % 128, 32, 32)); + 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(gfxCtx->polyOpa.p++); gDPSetEnvColor(gfxCtx->polyOpa.p++, 0x80, 0x80, 0x80, 0x40); @@ -3430,7 +2196,7 @@ void func_8009FC90(GlobalContext* globalCtx) gDPPipeSync(gfxCtx->polyXlu.p++); gDPSetEnvColor(gfxCtx->polyXlu.p++, 0x80, 0x80, 0x80, 0x40); - func_800C6B54(gfxArr, globalCtx->state.gfxCtx, "../z_scene_table.c", 7653); + Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_scene_table.c", 7653); } f32 D_8012A398 = 0.0f; @@ -3438,35 +2204,29 @@ f32 D_8012A398 = 0.0f; // Scene Draw Config 21 #ifdef NON_MATCHING // regalloc differences and single equivalent instruction difference -void func_8009FE58(GlobalContext* globalCtx) -{ +void func_8009FE58(GlobalContext* globalCtx) { static s16 D_8012A39C = 538; static s16 D_8012A3A0 = 4272; u32 gameplayFrames; f32 temp; GraphicsContext* gfxCtx; - Gfx* gfxArr[4]; + Gfx* dispRefs[4]; gfxCtx = globalCtx->state.gfxCtx; - func_800C6AC4(gfxArr, globalCtx->state.gfxCtx, "../z_scene_table.c", 7712); + Graph_OpenDisps(dispRefs, globalCtx->state.gfxCtx, "../z_scene_table.c", 7712); gameplayFrames = globalCtx->gameplayFrames; - if (globalCtx->sceneNum == SCENE_BDAN) - { + if (globalCtx->sceneNum == SCENE_BDAN) { gSPSegment(gfxCtx->polyOpa.p++, 0x08, - Draw_TwoTexScroll(globalCtx->state.gfxCtx, - 0, gameplayFrames % 128, (gameplayFrames * 2) % 128, 32, 32, - 1, 127 - gameplayFrames % 128, (gameplayFrames * 2) % 128, 32, 32)); + Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, gameplayFrames % 128, (gameplayFrames * 2) % 128, 32, + 32, 1, 127 - gameplayFrames % 128, (gameplayFrames * 2) % 128, 32, 32)); gSPSegment(gfxCtx->polyOpa.p++, 0x0B, - Draw_TwoTexScroll(globalCtx->state.gfxCtx, - 0, 0, 255 - (gameplayFrames * 4) % 256, 32, 64, - 1, 0, 255 - (gameplayFrames * 4) % 256, 32, 64)); - } - else - { + Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 0, 255 - (gameplayFrames * 4) % 256, 32, 64, 1, 0, + 255 - (gameplayFrames * 4) % 256, 32, 64)); + } else { gSPSegment(gfxCtx->polyOpa.p++, 0x08, - Draw_TexScroll(globalCtx->state.gfxCtx, - (127 - (gameplayFrames * 1)) % 128, (gameplayFrames * 1) % 128, 32, 32)); + Gfx_TexScroll(globalCtx->state.gfxCtx, (127 - (gameplayFrames * 1)) % 128, + (gameplayFrames * 1) % 128, 32, 32)); } gDPPipeSync(gfxCtx->polyOpa.p++); @@ -3475,43 +2235,32 @@ void func_8009FE58(GlobalContext* globalCtx) gDPPipeSync(gfxCtx->polyXlu.p++); gDPSetEnvColor(gfxCtx->polyXlu.p++, 0x80, 0x80, 0x80, 0x80); - if (func_800C0D28(globalCtx) != 1) - { + if (func_800C0D28(globalCtx) != 1) { D_8012A39C += 1820; D_8012A3A0 += 1820; temp = 0.020000001f; - func_800AA76C(&globalCtx->view, - Math_Coss(D_8012A39C) * (0.00009587531f * temp), - Math_Sins(D_8012A39C) * (0.00009587531f * temp), - Math_Sins(D_8012A3A0) * (0.00009587531f * temp)); - func_800AA78C(&globalCtx->view, - 1.0f + (Math_Sins(D_8012A3A0) * (0.79999995f * temp)), + func_800AA76C(&globalCtx->view, Math_Coss(D_8012A39C) * (0.00009587531f * temp), + Math_Sins(D_8012A39C) * (0.00009587531f * temp), Math_Sins(D_8012A3A0) * (0.00009587531f * temp)); + func_800AA78C(&globalCtx->view, 1.0f + (Math_Sins(D_8012A3A0) * (0.79999995f * temp)), 1.0f + (Math_Coss(D_8012A3A0) * (0.39999998f * temp)), 1.0f + (Math_Coss(D_8012A39C) * (1 * temp))); func_800AA7AC(&globalCtx->view, 0.95f); - switch (globalCtx->unk_11D30[0]) - { + switch (globalCtx->unk_11D30[0]) { case 0: break; case 1: - if (globalCtx->unk_11D30[1] < 1200) - { + if (globalCtx->unk_11D30[1] < 1200) { globalCtx->unk_11D30[1] += 200; - } - else - { + } else { globalCtx->unk_11D30[0]++; } break; case 2: - if (globalCtx->unk_11D30[1] > 0) - { + if (globalCtx->unk_11D30[1] > 0) { globalCtx->unk_11D30[1] -= 30; - } - else - { + } else { globalCtx->unk_11D30[1] = 0; globalCtx->unk_11D30[0] = 0; } @@ -3521,14 +2270,15 @@ void func_8009FE58(GlobalContext* globalCtx) D_8012A398 += 0.15f + (globalCtx->unk_11D30[1] * 0.001f); } - if (globalCtx->roomCtx.curRoom.num == 2) + if (globalCtx->roomCtx.curRoom.num == 2) { Matrix_Scale(1, sinf(D_8012A398) * 0.8f, 1, MTXMODE_NEW); - else + } else { Matrix_Scale(1.005f, sinf(D_8012A398) * 0.8f, 1.005f, MTXMODE_NEW); + } gSPSegment(gfxCtx->polyOpa.p++, 0x0D, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_scene_table.c", 7809)); - func_800C6B54(gfxArr, globalCtx->state.gfxCtx, "../z_scene_table.c", 7811); + Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_scene_table.c", 7811); } #else s16 D_8012A39C = 538; @@ -3538,28 +2288,24 @@ void func_8009FE58(GlobalContext* globalCtx); #endif // Scene Draw Config 26 -void func_800A0334(GlobalContext* globalCtx) -{ +void func_800A0334(GlobalContext* globalCtx) { u32 gameplayFrames; GraphicsContext* gfxCtx; - Gfx* gfxArr[4]; + Gfx* dispRefs[4]; gfxCtx = globalCtx->state.gfxCtx; - func_800C6AC4(gfxArr, globalCtx->state.gfxCtx, "../z_scene_table.c", 7825); + Graph_OpenDisps(dispRefs, globalCtx->state.gfxCtx, "../z_scene_table.c", 7825); gameplayFrames = globalCtx->gameplayFrames; gSPSegment(gfxCtx->polyXlu.p++, 0x08, - Draw_TwoTexScroll(globalCtx->state.gfxCtx, - 0, 127 - gameplayFrames % 128, (gameplayFrames * 1) % 512, 32, 128, - 1, gameplayFrames % 128, (gameplayFrames * 1) % 512, 32, 128)); + Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 127 - gameplayFrames % 128, (gameplayFrames * 1) % 512, 32, + 128, 1, gameplayFrames % 128, (gameplayFrames * 1) % 512, 32, 128)); gSPSegment(gfxCtx->polyXlu.p++, 0x09, - Draw_TwoTexScroll(globalCtx->state.gfxCtx, - 0, 127 - gameplayFrames % 128, (gameplayFrames * 1) % 128, 32, 32, - 1, gameplayFrames % 128, (gameplayFrames * 1) % 128, 32, 32)); + Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 127 - gameplayFrames % 128, (gameplayFrames * 1) % 128, 32, + 32, 1, gameplayFrames % 128, (gameplayFrames * 1) % 128, 32, 32)); gSPSegment(gfxCtx->polyOpa.p++, 0x0A, - Draw_TwoTexScroll(globalCtx->state.gfxCtx, - 0, 127 - gameplayFrames % 128, (gameplayFrames * 1) % 128, 32, 32, - 1, gameplayFrames % 128, (gameplayFrames * 1) % 128, 32, 32)); + Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 127 - gameplayFrames % 128, (gameplayFrames * 1) % 128, 32, + 32, 1, gameplayFrames % 128, (gameplayFrames * 1) % 128, 32, 32)); gDPPipeSync(gfxCtx->polyOpa.p++); gDPSetEnvColor(gfxCtx->polyOpa.p++, 0x80, 0x80, 0x80, 0x80); @@ -3567,38 +2313,33 @@ void func_800A0334(GlobalContext* globalCtx) gDPPipeSync(gfxCtx->polyXlu.p++); gDPSetEnvColor(gfxCtx->polyXlu.p++, 0x80, 0x80, 0x80, 0x80); - func_800C6B54(gfxArr, globalCtx->state.gfxCtx, "../z_scene_table.c", 7852); + Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_scene_table.c", 7852); } // Scene Draw Config 52 -void func_800A055C(GlobalContext* globalCtx) -{ +void func_800A055C(GlobalContext* globalCtx) { func_8009BEEC(globalCtx); } // Scene Draw Config 51 -void func_800A057C(GlobalContext* globalCtx) -{ +void func_800A057C(GlobalContext* globalCtx) { func_8009BEEC(globalCtx); } // Scene Draw Config 49 -void func_800A059C(GlobalContext* globalCtx) -{ +void func_800A059C(GlobalContext* globalCtx) { u32 gameplayFrames; GraphicsContext* gfxCtx; - Gfx* gfxArr[4]; + Gfx* dispRefs[4]; gfxCtx = globalCtx->state.gfxCtx; - func_800C6AC4(gfxArr, globalCtx->state.gfxCtx, "../z_scene_table.c", 7893); + Graph_OpenDisps(dispRefs, globalCtx->state.gfxCtx, "../z_scene_table.c", 7893); gameplayFrames = globalCtx->gameplayFrames; gSPSegment(gfxCtx->polyOpa.p++, 0x08, - Draw_TexScroll(globalCtx->state.gfxCtx, - 127 - (gameplayFrames * 2) % 128, 0, 32, 64)); + Gfx_TexScroll(globalCtx->state.gfxCtx, 127 - (gameplayFrames * 2) % 128, 0, 32, 64)); gSPSegment(gfxCtx->polyOpa.p++, 0x09, - Draw_TexScroll(globalCtx->state.gfxCtx, - 0, (gameplayFrames * 2) % 512, 128, 128)); + Gfx_TexScroll(globalCtx->state.gfxCtx, 0, (gameplayFrames * 2) % 512, 128, 128)); gDPPipeSync(gfxCtx->polyOpa.p++); gDPSetEnvColor(gfxCtx->polyOpa.p++, 0x80, 0x80, 0x80, 0x80); @@ -3606,75 +2347,26 @@ void func_800A059C(GlobalContext* globalCtx) gDPPipeSync(gfxCtx->polyXlu.p++); gDPSetEnvColor(gfxCtx->polyXlu.p++, 0x80, 0x80, 0x80, 0x80); - func_800C6B54(gfxArr, globalCtx->state.gfxCtx, "../z_scene_table.c", 7910); + Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_scene_table.c", 7910); } -void (*sSceneDrawHandlers[])(GlobalContext*) = -{ - func_80099550, - func_8009DA30, - func_8009DD5C, - func_8009DE78, - func_8009E0B8, - func_8009E54C, - func_8009E730, - func_8009E8C0, - func_8009EAD8, - func_8009EE44, - func_8009F074, - func_8009F1B4, - func_8009F270, - func_8009F40C, - func_8009F5D4, - func_8009F7D4, - func_8009F9D0, - func_8009FB74, - func_8009FC90, - func_800995DC, - func_80099878, - func_8009FE58, - func_8009D758, - func_8009B0FC, - func_8009AE30, - func_8009D974, - func_800A0334, - func_8009CC00, - func_80099760, - func_8009B86C, - func_80099BD8, - func_8009A45C, - func_8009A798, - func_8009A9DC, - func_8009B9BC, - func_8009BAA4, - func_8009BC44, - func_8009C3EC, - func_8009C0AC, - func_8009ACA8, - func_8009AFE0, - func_8009D0E8, - func_8009C608, - func_8009C8B8, - func_8009D31C, - func_8009D438, - func_8009D5B4, - func_8009CAC0, - func_8009AB98, - func_800A059C, - func_8009CF84, - func_800A057C, - func_800A055C, +void (*sSceneDrawHandlers[])(GlobalContext*) = { + func_80099550, func_8009DA30, func_8009DD5C, func_8009DE78, func_8009E0B8, func_8009E54C, func_8009E730, + func_8009E8C0, func_8009EAD8, func_8009EE44, func_8009F074, func_8009F1B4, func_8009F270, func_8009F40C, + func_8009F5D4, func_8009F7D4, func_8009F9D0, func_8009FB74, func_8009FC90, func_800995DC, func_80099878, + func_8009FE58, func_8009D758, func_8009B0FC, func_8009AE30, func_8009D974, func_800A0334, func_8009CC00, + func_80099760, func_8009B86C, func_80099BD8, func_8009A45C, func_8009A798, func_8009A9DC, func_8009B9BC, + func_8009BAA4, func_8009BC44, func_8009C3EC, func_8009C0AC, func_8009ACA8, func_8009AFE0, func_8009D0E8, + func_8009C608, func_8009C8B8, func_8009D31C, func_8009D438, func_8009D5B4, func_8009CAC0, func_8009AB98, + func_800A059C, func_8009CF84, func_800A057C, func_800A055C, }; -void Scene_Draw(GlobalContext* globalCtx) -{ +void Scene_Draw(GlobalContext* globalCtx) { GraphicsContext* gfxCtx; - Gfx* gfxArr[4]; + Gfx* dispRefs[4]; - if (HREG(80) == 0x11) - { - if (HREG(95) != 0x11) - { + if (HREG(80) == 0x11) { + if (HREG(95) != 0x11) { HREG(95) = 0x11; HREG(81) = 1; HREG(82) = 1; @@ -3692,19 +2384,19 @@ void Scene_Draw(GlobalContext* globalCtx) } gfxCtx = globalCtx->state.gfxCtx; - func_800C6AC4(gfxArr, globalCtx->state.gfxCtx, "../z_scene_table.c", 8104); + Graph_OpenDisps(dispRefs, globalCtx->state.gfxCtx, "../z_scene_table.c", 8104); - if (HREG(81) == 1) - { + if (HREG(81) == 1) { gSPDisplayList(gfxCtx->polyOpa.p++, sDefaultDisplayList); gSPDisplayList(gfxCtx->polyXlu.p++, sDefaultDisplayList); } - func_800C6B54(gfxArr, globalCtx->state.gfxCtx, "../z_scene_table.c", 8109); + Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_scene_table.c", 8109); - if (HREG(82) == 1) + if (HREG(82) == 1) { sSceneDrawHandlers[globalCtx->sceneConfig](globalCtx); - } - else + } + } else { sSceneDrawHandlers[globalCtx->sceneConfig](globalCtx); + } } diff --git a/src/code/z_skelanime.c b/src/code/z_skelanime.c index 9b51b29cbb..099fa122e8 100644 --- a/src/code/z_skelanime.c +++ b/src/code/z_skelanime.c @@ -1,177 +1,1760 @@ #include #include +#include -#pragma GLOBAL_ASM("asm/non_matchings/code/z_skelanime/func_800A08A0.s") +s32 func_800A3D70(GlobalContext*, SkelAnime*); +s32 func_800A3E0C(GlobalContext*, SkelAnime*); +s32 func_800A4D9C(SkelAnime* skelAnime); +s32 func_800A4EE0(SkelAnime* skelAnime); +s32 func_800A4E38(SkelAnime* skelAnime); +void SkelAnime_CopyVec3s(SkelAnime* skelAnime, Vec3s* dst, Vec3s* src); +void SkelAnime_LinkAnimetionLoaded(GlobalContext* globalCtx, AnimationEntryType0* entry); +void SkelAnime_AnimationType1Loaded(GlobalContext* globalCtx, AnimationEntryType1* entry); +void SkelAnime_AnimationType2Loaded(GlobalContext* globalCtx, AnimationEntryType2* entry); +void SkelAnime_AnimationType3Loaded(GlobalContext* globalCtx, AnimationEntryType3* entry); +void SkelAnime_AnimationType4Loaded(GlobalContext* globalCtx, AnimationEntryType4* entry); +void SkelAnime_AnimationType5Loaded(GlobalContext* globalCtx, AnimationEntryType5* entry); -#pragma GLOBAL_ASM("asm/non_matchings/code/z_skelanime/func_800A0B40.s") +//.data +u32 D_8012A480 = 0; +static AnimationEntryCallback sAnimationLoadDone[] = { + &SkelAnime_LinkAnimetionLoaded, &SkelAnime_AnimationType1Loaded, &SkelAnime_AnimationType2Loaded, + &SkelAnime_AnimationType3Loaded, &SkelAnime_AnimationType4Loaded, &SkelAnime_AnimationType5Loaded, +}; -#pragma GLOBAL_ASM("asm/non_matchings/code/z_skelanime/func_800A0D94.s") +//.bss +u32 D_801600B0; -#pragma GLOBAL_ASM("asm/non_matchings/code/z_skelanime/func_800A106C.s") +/* + * Draws the limb at `limbIndex` with a level of detail display lists index by `dListIndex` + */ +void SkelAnime_LodDrawLimb(GlobalContext* globalCtx, s32 limbIndex, Skeleton* skeleton, Vec3s* actorDrawTable, + SkelAnime_LimbUpdateMatrix updateMtxFunc, SkelAnime_LimbAppendDlist appendDlistFunc, + Actor* actor, s32 dListIndex) { + SkelLimbEntry* limbEntry; + Gfx* dList; + Vec3f pos; + Vec3s rot; + GraphicsContext* gfxCtx; + Gfx* dispRefs[4]; -#pragma GLOBAL_ASM("asm/non_matchings/code/z_skelanime/func_800A1344.s") + gfxCtx = globalCtx->state.gfxCtx; + Graph_OpenDisps(dispRefs, globalCtx->state.gfxCtx, "../z_skelanime.c", 773); + Matrix_Push(); + limbEntry = SEGMENTED_TO_VIRTUAL(skeleton->limbs[limbIndex]); + limbIndex++; + rot = actorDrawTable[limbIndex]; -#pragma GLOBAL_ASM("asm/non_matchings/code/z_skelanime/SkelAnime_Draw.s") + pos.x = limbEntry->translation.x; + pos.y = limbEntry->translation.y; + pos.z = limbEntry->translation.z; -#pragma GLOBAL_ASM("asm/non_matchings/code/z_skelanime/func_800A180C.s") + dList = limbEntry->displayLists[dListIndex]; + if ((updateMtxFunc == NULL) || (updateMtxFunc(globalCtx, limbIndex, &dList, &pos, &rot, actor) == 0)) { + Matrix_TranslateThenRotateZYX(&pos, &rot); + if (dList != NULL) { + do { + if (1) { + gSPMatrix(gfxCtx->polyOpa.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_skelanime.c", 805), + G_MTX_LOAD); -#pragma GLOBAL_ASM("asm/non_matchings/code/z_skelanime/func_800A1AC8.s") + gSPDisplayList(gfxCtx->polyOpa.p++, dList); + } + } while (0); + } + } -#pragma GLOBAL_ASM("asm/non_matchings/code/z_skelanime/func_800A1D8C.s") + if (appendDlistFunc != NULL) { + appendDlistFunc(globalCtx, limbIndex, &dList, &rot, actor); + } -#pragma GLOBAL_ASM("asm/non_matchings/code/z_skelanime/func_800A1FC8.s") + if (limbEntry->firstChildIndex != LIMB_DONE) { + SkelAnime_LodDrawLimb(globalCtx, limbEntry->firstChildIndex, skeleton, actorDrawTable, updateMtxFunc, + appendDlistFunc, actor, dListIndex); + } -#pragma GLOBAL_ASM("asm/non_matchings/code/z_skelanime/SkelAnime_GetFrameCount.s") + Matrix_Pull(); -#pragma GLOBAL_ASM("asm/non_matchings/code/z_skelanime/func_800A2044.s") + if (limbEntry->nextLimbIndex != LIMB_DONE) { + SkelAnime_LodDrawLimb(globalCtx, limbEntry->nextLimbIndex, skeleton, actorDrawTable, updateMtxFunc, + appendDlistFunc, actor, dListIndex); + } -#pragma GLOBAL_ASM("asm/non_matchings/code/z_skelanime/func_800A2288.s") + Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_skelanime.c", 821); +} -#pragma GLOBAL_ASM("asm/non_matchings/code/z_skelanime/func_800A24A0.s") +/* + * Draws the Skeleton described by `skeleton` with a level of detail display list indexed by `dListIndex` + */ +void SkelAnime_LodDraw(GlobalContext* globalCtx, Skeleton* skeleton, Vec3s* actorDrawTable, + SkelAnime_LimbUpdateMatrix updateMtxFunc, SkelAnime_LimbAppendDlist appendDlistFunc, + Actor* actor, s32 dListIndex) { + SkelLimbEntry* limbEntry; + char pad[4]; + Gfx* dList; + Vec3f pos; + Vec3s rot; + GraphicsContext* gfxCtx; + Gfx* dispRefs[4]; -#pragma GLOBAL_ASM("asm/non_matchings/code/z_skelanime/func_800A273C.s") + if (skeleton == NULL) { + osSyncPrintf(VT_FGCOL(RED)); + osSyncPrintf("Si2_Lod_draw():skelがNULLです。\n"); // Si2_Lod_draw (): skel is NULL. + osSyncPrintf(VT_RST); + return; + } + gfxCtx = globalCtx->state.gfxCtx; + Graph_OpenDisps(dispRefs, globalCtx->state.gfxCtx, "../z_skelanime.c", 849); + Matrix_Push(); + limbEntry = SEGMENTED_TO_VIRTUAL(skeleton->limbs[0]); + pos.x = actorDrawTable->x; + pos.y = actorDrawTable->y; + pos.z = actorDrawTable->z; + + rot = actorDrawTable[1]; + dList = limbEntry->displayLists[dListIndex]; + + if ((updateMtxFunc == NULL) || (updateMtxFunc(globalCtx, 1, &dList, &pos, &rot, actor) == 0)) { + Matrix_TranslateThenRotateZYX(&pos, &rot); + if (dList != NULL) { + gSPMatrix(gfxCtx->polyOpa.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_skelanime.c", 881), G_MTX_LOAD); + + gSPDisplayList(gfxCtx->polyOpa.p++, dList); + } + } + if (appendDlistFunc != NULL) { + appendDlistFunc(globalCtx, 1, &dList, &rot, actor); + } + + if (limbEntry->firstChildIndex != 0xFF) { + SkelAnime_LodDrawLimb(globalCtx, limbEntry->firstChildIndex, skeleton, actorDrawTable, updateMtxFunc, + appendDlistFunc, actor, dListIndex); + } + + Matrix_Pull(); + Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_skelanime.c", 894); +} + +/* + * Draws the limb at `limbIndex` with a level of detail display lists index by `dListIndex`, Limb matrices come + * from a dynamic allocation from the graph arena. + */ +void SkelAnime_LodDrawLimbSV(GlobalContext* globalCtx, s32 limbIndex, Skeleton* skeleton, Vec3s* actorDrawTable, + SkelAnime_LimbUpdateMatrix updateMtxFunc, SkelAnime_LimbAppendDlist appendDlistFunc, + Actor* actor, s32 dListIndex, Mtx** mtx) { + SkelLimbEntry* limbEntry; + Gfx* dList[2]; + Vec3f pos; + Vec3s rot; + GraphicsContext* gfxCtx; + Gfx* dispRefs[4]; + + Matrix_Push(); + + limbEntry = SEGMENTED_TO_VIRTUAL(skeleton->limbs[limbIndex]); + limbIndex++; + + rot = actorDrawTable[limbIndex]; + + pos.x = limbEntry->translation.x; + pos.y = limbEntry->translation.y; + pos.z = limbEntry->translation.z; + // Double assignment here would not work. + dList[0] = limbEntry->displayLists[dListIndex]; + dList[1] = dList[0]; + + if ((updateMtxFunc == NULL) || (updateMtxFunc(globalCtx, limbIndex, &dList[1], &pos, &rot, actor) == 0)) { + Matrix_TranslateThenRotateZYX(&pos, &rot); + if (dList[1] != NULL) { + Matrix_ToMtx(*mtx, "../z_skelanime.c", 945); + gfxCtx = globalCtx->state.gfxCtx; + Graph_OpenDisps(dispRefs, globalCtx->state.gfxCtx, "../z_skelanime.c", 946); + gSPMatrix(gfxCtx->polyOpa.p++, *mtx, G_MTX_LOAD); + gSPDisplayList(gfxCtx->polyOpa.p++, dList[1]); + Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_skelanime.c", 949); + (*mtx)++; + } else if (dList[0] != NULL) { + Matrix_ToMtx(*mtx, "../z_skelanime.c", 954); + (*mtx)++; + } + } + if (appendDlistFunc != NULL) { + appendDlistFunc(globalCtx, limbIndex, &dList[0], &rot, actor); + } + if (limbEntry->firstChildIndex != LIMB_DONE) { + SkelAnime_LodDrawLimbSV(globalCtx, limbEntry->firstChildIndex, skeleton, actorDrawTable, updateMtxFunc, + appendDlistFunc, actor, dListIndex, mtx); + } + + Matrix_Pull(); + + if (limbEntry->nextLimbIndex != LIMB_DONE) { + SkelAnime_LodDrawLimbSV(globalCtx, limbEntry->nextLimbIndex, skeleton, actorDrawTable, updateMtxFunc, + appendDlistFunc, actor, dListIndex, mtx); + } +} + +/* + * Draws the Skeleton described by `skeleton` with a level of detail display list indexed by `dListIndex` + * Matricies for the limbs are dynamically allocted from the graph arena. The dynamic allocation occurs + * because the Skeleton is too large to be supported by the normal matrix stack. + */ +void SkelAnime_LodDrawSV(GlobalContext* globalCtx, Skeleton* skeleton, Vec3s* actorDrawTable, s32 dListCount, + SkelAnime_LimbUpdateMatrix updateMtxFunc, SkelAnime_LimbAppendDlist appendDlistFunc, + Actor* actor, s32 dListIndex) { + SkelLimbEntry* limbEntry; + char pad[4]; + Gfx* dList[2]; + Vec3f pos; + Vec3s rot; + Mtx* mtx; + GraphicsContext* gfxCtx; + Gfx* dispRefs[4]; + + mtx = Graph_Alloc(globalCtx->state.gfxCtx, dListCount * sizeof(Mtx)); + + if (skeleton == NULL) { + osSyncPrintf(VT_FGCOL(RED)); + osSyncPrintf("Si2_Lod_draw_SV():skelがNULLです。\n"); // Si2_Lod_draw_SV (): skel is NULL. + osSyncPrintf(VT_RST); + return; + } + gfxCtx = globalCtx->state.gfxCtx; + Graph_OpenDisps(dispRefs, globalCtx->state.gfxCtx, "../z_skelanime.c", 1000); + gSPSegment(gfxCtx->polyOpa.p++, 0xD, mtx); + Matrix_Push(); + + limbEntry = SEGMENTED_TO_VIRTUAL(skeleton->limbs[0]); + pos.x = actorDrawTable->x; + pos.y = actorDrawTable->y; + pos.z = actorDrawTable->z; + + rot = actorDrawTable[1]; + + dList[0] = limbEntry->displayLists[dListIndex]; + dList[1] = dList[0]; + + if ((updateMtxFunc == 0) || (updateMtxFunc(globalCtx, 1, &dList[1], &pos, &rot, actor) == 0)) { + Matrix_TranslateThenRotateZYX(&pos, &rot); + if (dList[1] != NULL) { + Matrix_ToMtx(mtx, "../z_skelanime.c", 1033); + gSPMatrix(gfxCtx->polyOpa.p++, mtx, G_MTX_LOAD); + gSPDisplayList(gfxCtx->polyOpa.p++, dList[1]); + mtx++; + } else if (dList[0] != NULL) { + Matrix_ToMtx(mtx, "../z_skelanime.c", 1040); + mtx++; + } + } + + if (appendDlistFunc != NULL) { + appendDlistFunc(globalCtx, 1, &dList[0], &rot, actor); + } + if (limbEntry->firstChildIndex != LIMB_DONE) { + SkelAnime_LodDrawLimbSV(globalCtx, limbEntry->firstChildIndex, skeleton, actorDrawTable, updateMtxFunc, + appendDlistFunc, actor, dListIndex, &mtx); + } + + Matrix_Pull(); + + Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_skelanime.c", 1053); +} + +/* + * Draws the limb of the Skeleton `skeleton` at `limbIndex` + */ +void SkelAnime_DrawLimb(GlobalContext* globalCtx, s32 limbIndex, Skeleton* skeleton, Vec3s* actorDrawTable, + SkelAnime_LimbUpdateMatrix updateMtxFunc, SkelAnime_LimbAppendDlist appendDlistFunc, + Actor* actor) { + SkelLimbEntry* limbEntry; + Gfx* dList; + Vec3f pos; + Vec3s rot; + GraphicsContext* gfxCtx; + Gfx* dispRefs[4]; + + gfxCtx = globalCtx->state.gfxCtx; + + Graph_OpenDisps(dispRefs, globalCtx->state.gfxCtx, "../z_skelanime.c", 1076); + Matrix_Push(); + + limbEntry = SEGMENTED_TO_VIRTUAL(skeleton->limbs[limbIndex]); + limbIndex++; + rot = actorDrawTable[limbIndex]; + pos.x = limbEntry->translation.x; + pos.y = limbEntry->translation.y; + pos.z = limbEntry->translation.z; + dList = limbEntry->displayLists[0]; + + if ((updateMtxFunc == NULL) || (updateMtxFunc(globalCtx, limbIndex, &dList, &pos, &rot, actor) == 0)) { + Matrix_TranslateThenRotateZYX(&pos, &rot); + if (dList != NULL) { + do { + if (1) { + gSPMatrix(gfxCtx->polyOpa.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_skelanime.c", 1103), + G_MTX_LOAD); + gSPDisplayList(gfxCtx->polyOpa.p++, dList); + } + } while (0); + } + } + + if (appendDlistFunc != NULL) { + appendDlistFunc(globalCtx, limbIndex, &dList, &rot, actor); + } + + if (limbEntry->firstChildIndex != LIMB_DONE) { + SkelAnime_DrawLimb(globalCtx, limbEntry->firstChildIndex, skeleton, actorDrawTable, updateMtxFunc, + appendDlistFunc, actor); + } + + Matrix_Pull(); + + if (limbEntry->nextLimbIndex != LIMB_DONE) { + SkelAnime_DrawLimb(globalCtx, limbEntry->nextLimbIndex, skeleton, actorDrawTable, updateMtxFunc, + appendDlistFunc, actor); + } + + Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_skelanime.c", 1121); +} + +void SkelAnime_Draw(GlobalContext* globalCtx, Skeleton* skeleton, Vec3s* actorDrawTable, + SkelAnime_LimbUpdateMatrix updateMtxFunc, SkelAnime_LimbAppendDlist appendDlistFunc, Actor* actor) { + SkelLimbEntry* rootLimb; + char pad[4]; + Gfx* dList; + Vec3f pos; + Vec3s rot; + GraphicsContext* gfxCtx; + Gfx* dispRefs[4]; + + if (skeleton == NULL) { + osSyncPrintf(VT_FGCOL(RED)); + osSyncPrintf("Si2_draw():skelがNULLです。\n"); // Si2_draw (): skel is NULL. + osSyncPrintf(VT_RST); + return; + } + + gfxCtx = globalCtx->state.gfxCtx; + + Graph_OpenDisps(dispRefs, globalCtx->state.gfxCtx, "../z_skelanime.c", 1148); + Matrix_Push(); + rootLimb = SEGMENTED_TO_VIRTUAL(skeleton->limbs[0]); + + pos.x = actorDrawTable[0].x; + pos.y = actorDrawTable[0].y; + pos.z = actorDrawTable[0].z; + + rot = actorDrawTable[1]; + dList = rootLimb->displayLists[0]; + + if ((updateMtxFunc == NULL) || (updateMtxFunc(globalCtx, 1, &dList, &pos, &rot, actor) == 0)) { + Matrix_TranslateThenRotateZYX(&pos, &rot); + if (dList != NULL) { + gSPMatrix(gfxCtx->polyOpa.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_skelanime.c", 1176), + G_MTX_LOAD); + gSPDisplayList(gfxCtx->polyOpa.p++, dList); + } + } + + if (appendDlistFunc != NULL) { + appendDlistFunc(globalCtx, 1, &dList, &rot, actor); + } + + if (rootLimb->firstChildIndex != LIMB_DONE) { + SkelAnime_DrawLimb(globalCtx, rootLimb->firstChildIndex, skeleton, actorDrawTable, updateMtxFunc, + appendDlistFunc, actor); + } + + Matrix_Pull(); + + Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_skelanime.c", 1190); +} + +void SkelAnime_DrawLimbSV(GlobalContext* globalCtx, s32 limbIndex, Skeleton* skeleton, Vec3s* actorDrawTable, + SkelAnime_LimbUpdateMatrix updateMtxFunc, SkelAnime_LimbAppendDlist appendDlistFunc, + Actor* actor, Mtx** limbMatricies) { + SkelLimbEntry* limbEntry; + Gfx* dList[2]; + Vec3f pos; + Vec3s rot; + GraphicsContext* gfxCtx; + Gfx* dispRefs[4]; + + gfxCtx = globalCtx->state.gfxCtx; + Graph_OpenDisps(dispRefs, globalCtx->state.gfxCtx, "../z_skelanime.c", 1214); + Matrix_Push(); + + limbEntry = SEGMENTED_TO_VIRTUAL(skeleton->limbs[limbIndex]); + limbIndex++; + rot = actorDrawTable[limbIndex]; + + pos.x = limbEntry->translation.x; + pos.y = limbEntry->translation.y; + pos.z = limbEntry->translation.z; + + dList[0] = limbEntry->displayLists[0]; + dList[1] = dList[0]; + + if ((updateMtxFunc == NULL) || (updateMtxFunc(globalCtx, limbIndex, &dList[1], &pos, &rot, actor) == 0)) { + Matrix_TranslateThenRotateZYX(&pos, &rot); + if (dList[1] != NULL) { + Matrix_ToMtx(*limbMatricies, "../z_skelanime.c", 1242); + gSPMatrix(gfxCtx->polyOpa.p++, *limbMatricies, G_MTX_LOAD); + gSPDisplayList(gfxCtx->polyOpa.p++, dList[1]); + (*limbMatricies)++; + } else if (dList[0] != NULL) { + Matrix_ToMtx(*limbMatricies, "../z_skelanime.c", 1249); + (*limbMatricies)++; + } + } + + if (appendDlistFunc != NULL) { + appendDlistFunc(globalCtx, limbIndex, &dList[0], &rot, actor); + } + + if (limbEntry->firstChildIndex != LIMB_DONE) { + SkelAnime_DrawLimbSV(globalCtx, limbEntry->firstChildIndex, skeleton, actorDrawTable, updateMtxFunc, + appendDlistFunc, actor, limbMatricies); + } + + Matrix_Pull(); + + if (limbEntry->nextLimbIndex != LIMB_DONE) { + SkelAnime_DrawLimbSV(globalCtx, limbEntry->nextLimbIndex, skeleton, actorDrawTable, updateMtxFunc, + appendDlistFunc, actor, limbMatricies); + } + + Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_skelanime.c", 1265); +} + +void SkelAnime_DrawSV(GlobalContext* globalCtx, Skeleton* skeleton, Vec3s* actorDrawTable, s32 dListCount, + SkelAnime_LimbUpdateMatrix updateMtxFunc, SkelAnime_LimbAppendDlist appendDlistFunc, + Actor* actor) { + SkelLimbEntry* limbEntry; + char pad[4]; + Gfx* dList[2]; + Vec3f pos; + Vec3s rot; + Mtx* mtx; + GraphicsContext* gfxCtx; + Gfx* dispRefs[4]; + + mtx = Graph_Alloc(globalCtx->state.gfxCtx, dListCount * sizeof(Mtx)); + + if (skeleton == NULL) { + osSyncPrintf(VT_FGCOL(RED)); + osSyncPrintf("Si2_draw_SV():skelがNULLです。\n"); // Si2_draw_SV (): skel is NULL. + osSyncPrintf(VT_RST); + return; + } + + gfxCtx = globalCtx->state.gfxCtx; + + Graph_OpenDisps(dispRefs, globalCtx->state.gfxCtx, "../z_skelanime.c", 1294); + + gSPSegment(gfxCtx->polyOpa.p++, 0xD, mtx); + + Matrix_Push(); + + limbEntry = SEGMENTED_TO_VIRTUAL(skeleton->limbs[0]); + + pos.x = actorDrawTable->x; + pos.y = actorDrawTable->y; + pos.z = actorDrawTable->z; + + rot = actorDrawTable[1]; + + dList[0] = limbEntry->displayLists[0]; + dList[1] = dList[0]; + + if ((updateMtxFunc == NULL) || (updateMtxFunc(globalCtx, 1, &dList[1], &pos, &rot, actor) == 0)) { + Matrix_TranslateThenRotateZYX(&pos, &rot); + if (dList[1] != NULL) { + Matrix_ToMtx(mtx, "../z_skelanime.c", 1327); + gSPMatrix(gfxCtx->polyOpa.p++, mtx, G_MTX_LOAD); + gSPDisplayList(gfxCtx->polyOpa.p++, dList[1]); + mtx++; + } else { + if (dList[0] != NULL) { + Matrix_ToMtx(mtx, "../z_skelanime.c", 1334); + mtx++; + } + } + } + + if (appendDlistFunc != NULL) { + appendDlistFunc(globalCtx, 1, &dList[0], &rot, actor); + } + + if (limbEntry->firstChildIndex != LIMB_DONE) { + SkelAnime_DrawLimbSV(globalCtx, limbEntry->firstChildIndex, skeleton, actorDrawTable, updateMtxFunc, + appendDlistFunc, actor, &mtx); + } + + Matrix_Pull(); + Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_skelanime.c", 1347); +} + +/* + * Copies the rotation values from the rotation value table, indexed by the rotation index table + * When a rotation index is >= the animation limit, the output rotation value is copied from the frame's + * rotation value list, otherwise it is copied from the initial rotation value list + */ +void SkelAnime_AnimateFrame(AnimationHeader* animationSeg, s32 currentFrame, s32 limbCount, Vec3s* dst) { + AnimationRotationIndex* index; + AnimationRotationValue* rotationValueTable; + AnimationRotationValue* frameRotationValueTable; + AnimationHeader* animationHeader; + + s32 i; + u16 limit; + + animationHeader = SEGMENTED_TO_VIRTUAL(animationSeg); + index = SEGMENTED_TO_VIRTUAL(animationHeader->rotationIndexSeg); + rotationValueTable = SEGMENTED_TO_VIRTUAL(animationHeader->rotationValueSeg); + frameRotationValueTable = &rotationValueTable[currentFrame]; + limit = animationHeader->limit; + + for (i = 0; i < limbCount; i++, dst++, index++) { + if ((dst == NULL) || (index == NULL) || (frameRotationValueTable == NULL) || (rotationValueTable == NULL)) { + if (1) {} // Necessary to match. + LOG_ADDRESS("out", dst, "../z_skelanime.c", 1392); + LOG_ADDRESS("ref_tbl", index, "../z_skelanime.c", 1393); + LOG_ADDRESS("frame_tbl", frameRotationValueTable, "../z_skelanime.c", 1394); + LOG_ADDRESS("tbl", rotationValueTable, "../z_skelanime.c", 1395); + } + + dst->x = index->x >= limit ? frameRotationValueTable[index->x] : rotationValueTable[index->x]; + dst->y = index->y >= limit ? frameRotationValueTable[index->y] : rotationValueTable[index->y]; + dst->z = index->z >= limit ? frameRotationValueTable[index->z] : rotationValueTable[index->z]; + } +} + +s16 SkelAnime_GetTotalFrames(GenericAnimationHeader* animationSeg) { + GenericAnimationHeader* animation = SEGMENTED_TO_VIRTUAL(animationSeg); + return animation->frameCount; +} + +s16 SkelAnime_GetFrameCount(GenericAnimationHeader* animationSeg) { + GenericAnimationHeader* animation = SEGMENTED_TO_VIRTUAL(animationSeg); + // Loads an unsigned half for some reason. + return (u16)animation->frameCount - 1; +} + +/* + * Draws the Skeleton `skeleton`'s limb at index `limbIndex`. Appends all generated graphics commands to + * `gfx`. Returns a pointer to the next gfx to be appended to. + */ +Gfx* SkelAnime_Draw2Limb(GlobalContext* globalCtx, s32 limbIndex, Skeleton* skeleton, Vec3s* actorDrawTable, + SkelAnime_LimbUpdateMatrix2 updateMtxFunc, SkelAnime_LimbAppendDlist2 appendDlistFunc, + Actor* actor, Gfx* gfx) { + SkelLimbEntry* limbEntry; + Gfx* dList; + Vec3f pos; + Vec3s rot; + + Matrix_Push(); + + limbEntry = SEGMENTED_TO_VIRTUAL(skeleton->limbs[limbIndex]); + limbIndex++; + + rot = actorDrawTable[limbIndex]; + + pos.x = limbEntry->translation.x; + pos.y = limbEntry->translation.y; + pos.z = limbEntry->translation.z; + + dList = limbEntry->displayLists[0]; + + if ((updateMtxFunc == NULL) || (updateMtxFunc(globalCtx, limbIndex, &dList, &pos, &rot, actor, &gfx) == 0)) { + Matrix_TranslateThenRotateZYX(&pos, &rot); + if (dList != NULL) { + gSPMatrix(gfx++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_skelanime.c", 1489), G_MTX_LOAD); + gSPDisplayList(gfx++, dList); + } + } + + if (appendDlistFunc != NULL) { + appendDlistFunc(globalCtx, limbIndex, &dList, &rot, actor, &gfx); + } + + if (limbEntry->firstChildIndex != LIMB_DONE) { + gfx = SkelAnime_Draw2Limb(globalCtx, limbEntry->firstChildIndex, skeleton, actorDrawTable, updateMtxFunc, + appendDlistFunc, actor, gfx); + } + + Matrix_Pull(); + + if (limbEntry->nextLimbIndex != LIMB_DONE) { + gfx = SkelAnime_Draw2Limb(globalCtx, limbEntry->nextLimbIndex, skeleton, actorDrawTable, updateMtxFunc, + appendDlistFunc, actor, gfx); + } + + return gfx; +} + +/* + * Draws the Skeleton `skeleton` Appends all generated graphics to `gfx`, and returns a pointer to the + * next gfx to be appended to. + */ +Gfx* SkelAnime_Draw2(GlobalContext* globalCtx, Skeleton* skeleton, Vec3s* actorDrawTable, + SkelAnime_LimbUpdateMatrix2 updateMtxFunc, SkelAnime_LimbAppendDlist2 appendDlistFunc, + Actor* actor, Gfx* gfx) { + SkelLimbEntry* limbEntry; + char pad[4]; + Gfx* dList; + Vec3f pos; + Vec3s rot; + + if (skeleton == NULL) { + osSyncPrintf(VT_FGCOL(RED)); + osSyncPrintf("Si2_draw2():skelがNULLです。NULLを返します。\n"); // Si2_draw2 (): skel is NULL. Returns NULL. + osSyncPrintf(VT_RST); + return NULL; + } + + Matrix_Push(); + + limbEntry = SEGMENTED_TO_VIRTUAL(skeleton->limbs[0]); + + pos.x = actorDrawTable->x; + pos.y = actorDrawTable->y; + pos.z = actorDrawTable->z; + + rot = actorDrawTable[1]; + + dList = limbEntry->displayLists[0]; + + if ((updateMtxFunc == NULL) || (updateMtxFunc(globalCtx, 1, &dList, &pos, &rot, actor, &gfx) == 0)) { + Matrix_TranslateThenRotateZYX(&pos, &rot); + if (dList != NULL) { + gSPMatrix(gfx++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_skelanime.c", 1558), G_MTX_LOAD); + gSPDisplayList(gfx++, dList); + } + } + + if (appendDlistFunc != NULL) { + appendDlistFunc(globalCtx, 1, &dList, &rot, actor, &gfx); + } + + if (limbEntry->firstChildIndex != LIMB_DONE) { + gfx = SkelAnime_Draw2Limb(globalCtx, limbEntry->firstChildIndex, skeleton, actorDrawTable, updateMtxFunc, + appendDlistFunc, actor, gfx); + } + + Matrix_Pull(); + + return gfx; +} + +Gfx* SkelAnime_DrawLimbSV2(GlobalContext* globalCtx, s32 limbIndex, Skeleton* skeleton, Vec3s* actorDrawTable, + SkelAnime_LimbUpdateMatrix2 updateMtxFunc, SkelAnime_LimbAppendDlist2 appendDlistFunc, + Actor* actor, Mtx** mtx, Gfx* gfx) { + SkelLimbEntry* limbEntry; + Gfx* dList1; + Gfx* dList2; + Vec3f pos; + Vec3s rot; + char pad[4]; + + Matrix_Push(); + + limbEntry = SEGMENTED_TO_VIRTUAL(skeleton->limbs[limbIndex]); + limbIndex++; + rot = actorDrawTable[limbIndex]; + + pos.x = limbEntry->translation.x; + pos.y = limbEntry->translation.y; + pos.z = limbEntry->translation.z; + + dList1 = dList2 = limbEntry->displayLists[0]; + if ((updateMtxFunc == NULL) || (updateMtxFunc(globalCtx, limbIndex, &dList1, &pos, &rot, actor, &gfx) == 0)) { + Matrix_TranslateThenRotateZYX(&pos, &rot); + if (dList1 != NULL) { + Matrix_ToMtx(*mtx, "../z_skelanime.c", 1623); + gSPMatrix(gfx++, *mtx, G_MTX_LOAD); + gSPDisplayList(gfx++, dList1); + (*mtx)++; + } else { + if (dList2 != NULL) { + Matrix_ToMtx(*mtx, "../z_skelanime.c", 1630); + (*mtx)++; + } + } + } + if (appendDlistFunc != NULL) { + appendDlistFunc(globalCtx, limbIndex, &dList2, &rot, actor, &gfx); + } + if (limbEntry->firstChildIndex != LIMB_DONE) { + gfx = SkelAnime_DrawLimbSV2(globalCtx, limbEntry->firstChildIndex, skeleton, actorDrawTable, updateMtxFunc, + appendDlistFunc, actor, mtx, gfx); + } + + Matrix_Pull(); + + if (limbEntry->nextLimbIndex != LIMB_DONE) { + gfx = SkelAnime_DrawLimbSV2(globalCtx, limbEntry->nextLimbIndex, skeleton, actorDrawTable, updateMtxFunc, + appendDlistFunc, actor, mtx, gfx); + } + + return gfx; +} + +/* + * Draws the Skeleton `skeleton` Appends all generated graphics to `gfx`, and returns a pointer to the + * next gfx to be appended to. Allocates matricies for display lists on the graph heap. + */ +Gfx* SkelAnime_DrawSV2(GlobalContext* globalCtx, Skeleton* skeleton, Vec3s* actorDrawTable, s32 dListCount, + SkelAnime_LimbUpdateMatrix2 updateMtxFunc, SkelAnime_LimbAppendDlist2 appendDlistFunc, + Actor* actor, Gfx* gfx) { + SkelLimbEntry* limbEntry; + char pad[4]; + Gfx* dList1; + Gfx* dList2; + Vec3f pos; + Vec3s rot; + Mtx* mtx; + + mtx = Graph_Alloc(globalCtx->state.gfxCtx, dListCount * sizeof(*mtx)); + if (skeleton == NULL) { + osSyncPrintf(VT_FGCOL(RED)); + osSyncPrintf( + "Si2_draw2_SV():skelがNULLです。NULLを返します。\n"); // Si2_draw2_SV (): skel is NULL. Returns NULL. + osSyncPrintf(VT_RST); + return NULL; + } + + gSPSegment(gfx++, 0xD, mtx); + Matrix_Push(); + limbEntry = SEGMENTED_TO_VIRTUAL(skeleton->limbs[0]); + + pos.x = actorDrawTable->x; + pos.y = actorDrawTable->y; + pos.z = actorDrawTable->z; + + rot = actorDrawTable[1]; + + dList1 = dList2 = limbEntry->displayLists[0]; + + if ((updateMtxFunc == NULL) || (updateMtxFunc(globalCtx, 1, &dList1, &pos, &rot, actor, &gfx) == 0)) { + Matrix_TranslateThenRotateZYX(&pos, &rot); + if (dList1 != NULL) { + Matrix_ToMtx(mtx, "../z_skelanime.c", 1710); + gSPMatrix(gfx++, mtx, G_MTX_LOAD); + gSPDisplayList(gfx++, dList1); + mtx++; + } else { + if (dList2 != NULL) { + Matrix_ToMtx(mtx, "../z_skelanime.c", 1717); + mtx++; + } + } + } + if (appendDlistFunc != NULL) { + appendDlistFunc(globalCtx, 1, &dList2, &rot, actor, &gfx); + } + if (limbEntry->firstChildIndex != LIMB_DONE) { + gfx = SkelAnime_DrawLimbSV2(globalCtx, limbEntry->firstChildIndex, skeleton, actorDrawTable, updateMtxFunc, + appendDlistFunc, actor, &mtx, gfx); + } + + Matrix_Pull(); + + return gfx; +} + +#ifdef NON_MATCHING +// Function is unused. This is functionally equivilent, misplace andi which caused regalloc +s32 func_800A29BC(s32 arg0, s32 arg1, Vec3s* arg2) { + s16* temp_t1; + s16* temp_a3; + AnimationHeader* temp_v0; + s32 phi_v0; + s32 t; + + temp_v0 = SEGMENTED_TO_VIRTUAL(arg0); + t = temp_v0->genericHeader.unk_02; + temp_a3 = SEGMENTED_TO_VIRTUAL(temp_v0->rotationIndexSeg); + temp_t1 = SEGMENTED_TO_VIRTUAL(temp_v0->rotationValueSeg); + + arg2->x = arg1 < temp_a3[0] ? ((s16*)((arg1 * 2) + (u32)temp_t1))[temp_a3[1]] : temp_t1[temp_a3[1]]; + arg2->y = arg1 < temp_a3[2] ? ((s16*)((arg1 * 2) + (u32)temp_t1))[temp_a3[3]] : temp_t1[temp_a3[3]]; + arg2->z = arg1 < temp_a3[4] ? ((s16*)((arg1 * 2) + (u32)temp_t1))[temp_a3[5]] : temp_t1[temp_a3[5]]; + + phi_v0 = 1; + arg2++; + temp_a3 += 6; + + if (t > 0) { + if (t & 1) { + phi_v0++; + arg2->x = arg1 < temp_a3[0] ? ((s16*)((arg1 * 2) + (u32)temp_t1))[temp_a3[1]] : temp_t1[temp_a3[1]]; + arg2->y = arg1 < temp_a3[2] ? ((s16*)((arg1 * 2) + (u32)temp_t1))[temp_a3[3]] : temp_t1[temp_a3[3]]; + arg2->z = arg1 < temp_a3[4] ? ((s16*)((arg1 * 2) + (u32)temp_t1))[temp_a3[5]] : temp_t1[temp_a3[5]]; + temp_a3 += 6; + arg2++; + if (t + 1 == phi_v0) { + goto ret; + } + } + do { + phi_v0 += 2; + arg2->x = arg1 < temp_a3[0] ? ((s16*)((arg1 * 2) + (u32)temp_t1))[temp_a3[1]] : temp_t1[temp_a3[1]]; + arg2->y = arg1 < temp_a3[2] ? ((s16*)((arg1 * 2) + (u32)temp_t1))[temp_a3[3]] : temp_t1[temp_a3[3]]; + arg2->z = arg1 < temp_a3[4] ? ((s16*)((arg1 * 2) + (u32)temp_t1))[temp_a3[5]] : temp_t1[temp_a3[5]]; + temp_a3 += 6; + arg2++; + arg2->x = arg1 < temp_a3[0] ? ((s16*)((arg1 * 2) + (u32)temp_t1))[temp_a3[1]] : temp_t1[temp_a3[1]]; + arg2->y = arg1 < temp_a3[2] ? ((s16*)((arg1 * 2) + (u32)temp_t1))[temp_a3[3]] : temp_t1[temp_a3[3]]; + arg2->z = arg1 < temp_a3[4] ? ((s16*)((arg1 * 2) + (u32)temp_t1))[temp_a3[5]] : temp_t1[temp_a3[5]]; + temp_a3 += 6; + arg2++; + } while (phi_v0 != t + 1); + } +ret: + return t; +} +#else #pragma GLOBAL_ASM("asm/non_matchings/code/z_skelanime/func_800A29BC.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/z_skelanime/func_800A2DBC.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/z_skelanime/func_800A2DF4.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/z_skelanime/func_800A2E2C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/z_skelanime/func_800A2E70.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/z_skelanime/func_800A32EC.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/z_skelanime/func_800A32F4.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/z_skelanime/func_800A3310.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/z_skelanime/func_800A3334.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/z_skelanime/func_800A336C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/z_skelanime/func_800A3478.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/z_skelanime/func_800A34DC.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/z_skelanime/func_800A3548.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/z_skelanime/func_800A35B4.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/z_skelanime/func_800A3620.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/z_skelanime/func_800A3678.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/z_skelanime/func_800A36A4.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/z_skelanime/func_800A3714.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/z_skelanime/func_800A3770.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/z_skelanime/func_800A37F0.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/z_skelanime/func_800A3874.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/z_skelanime/func_800A390C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/z_skelanime/func_800A39AC.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/z_skelanime/func_800A3B8C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/z_skelanime/func_800A3BC0.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/z_skelanime/func_800A3BE4.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/z_skelanime/func_800A3C9C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/z_skelanime/func_800A3D70.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/z_skelanime/func_800A3E0C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/z_skelanime/func_800A3EE8.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/z_skelanime/func_800A3F08.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/z_skelanime/func_800A407C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/z_skelanime/func_800A40DC.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/z_skelanime/func_800A4140.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/z_skelanime/func_800A419C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/z_skelanime/func_800A41FC.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/z_skelanime/func_800A422C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/z_skelanime/func_800A425C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/z_skelanime/func_800A42A0.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/z_skelanime/func_800A42E4.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/z_skelanime/func_800A431C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/z_skelanime/func_800A43B8.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/z_skelanime/func_800A4454.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/z_skelanime/func_800A4478.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/z_skelanime/func_800A4530.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/z_skelanime/SkelAnime_Init.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/z_skelanime/func_800A46F8.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/z_skelanime/func_800A487C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/z_skelanime/func_800A49B0.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/z_skelanime/SkelAnime_FrameUpdateMatrix.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/z_skelanime/func_800A4A20.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/z_skelanime/func_800A4AD8.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/z_skelanime/func_800A4C58.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/z_skelanime/func_800A4D9C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/z_skelanime/func_800A4E38.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/z_skelanime/func_800A4EE0.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/z_skelanime/func_800A4FE4.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/z_skelanime/SkelAnime_ChangeAnimation.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/z_skelanime/func_800A51E8.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/z_skelanime/func_800A5240.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/z_skelanime/func_800A529C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/z_skelanime/func_800A52F8.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/z_skelanime/func_800A534C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/z_skelanime/func_800A5384.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/z_skelanime/func_800A53DC.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/z_skelanime/func_800A5408.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/z_skelanime/func_800A5428.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/z_skelanime/func_800A5490.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/z_skelanime/func_800A54FC.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/z_skelanime/func_800A56C8.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/z_skelanime/func_800A56F0.s") - -#pragma GLOBAL_ASM("asm/non_matchings/code/z_skelanime/func_800A5774.s") - +#endif + +s16 func_800A2DBC(GenericAnimationHeader* animationSeg) { + GenericAnimationHeader* animation = SEGMENTED_TO_VIRTUAL(animationSeg); + + return animation->unk_02; +} + +/* + * Appears to be unused anywhere in the game. Appears to be a clone of + * SkelAnime_GetTotalFrames + */ +s16 SkelAnime_GetTotalFrames2(GenericAnimationHeader* animationSeg) { + GenericAnimationHeader* animation = SEGMENTED_TO_VIRTUAL(animationSeg); + + return animation->frameCount; +} + +/* + * Appears to be unused anywhere in the game. Appears to be a clone of + * SkelAnime_GetFrameCount + */ +s16 SkelAnime_GetFrameCount2(GenericAnimationHeader* animationSeg) { + GenericAnimationHeader* animation = SEGMENTED_TO_VIRTUAL(animationSeg); + + return animation->frameCount - 1; +} + +void SkelAnime_InterpolateVec3s(s32 limbCount, Vec3s* dst, Vec3s* vec2, Vec3s* vec3, f32 unkf) { + s32 i; + s16 dist; + s16 temp2; + + if (unkf < 1.0f) { + for (i = 0; i < limbCount; i++, dst++, vec2++, vec3++) { + temp2 = vec2->x; + dist = vec3->x - temp2; + dst->x = (s16)(dist * unkf) + temp2; + temp2 = vec2->y; + dist = vec3->y - temp2; + dst->y = (s16)(dist * unkf) + temp2; + temp2 = vec2->z; + dist = vec3->z - temp2; + dst->z = (s16)(dist * unkf) + temp2; + } + } else { + for (i = 0; i < limbCount; i++, dst++, vec3++) { + dst->x = vec3->x; + dst->y = vec3->y; + dst->z = vec3->z; + } + } +} + +void SkelAnime_AnimationCtxReset(AnimationContext* animationCtx) { + animationCtx->animationCount = 0; +} + +void func_800A32F4(GlobalContext* globalCtx) { + D_801600B0 <<= 1; +} + +void func_800A3310(GlobalContext* globalCtx) { + u32* D_8012A480Ptr = &D_8012A480; + + *D_8012A480Ptr |= D_801600B0; +} + +AnimationEntry* SkelAnime_NextEntry(AnimationContext* animationCtx, AnimationType type) { + AnimationEntry* entry; + s16 index = animationCtx->animationCount; + + if (index >= ANIMATION_ENTRY_MAX) { + return NULL; + } + animationCtx->animationCount = index + 1; + entry = &animationCtx->entries[index]; + entry->type = type; + return entry; +} + +/* + * The next 6 functions are coordinate with the AnimationType enum + */ + +void SkelAnime_LoadLinkAnimetion(GlobalContext* globalCtx, LinkAnimetionEntry* linkAnimetionSeg, s32 frame, + s32 limbCount, void* ram) { + AnimationEntry* entry; + LinkAnimetionEntry* linkAnimetionEntry; + char pad[4]; + + entry = SkelAnime_NextEntry(&globalCtx->animationCtx, ANIMATION_LINKANIMETION); + + if (entry != NULL) { + linkAnimetionEntry = SEGMENTED_TO_VIRTUAL(linkAnimetionSeg); + osCreateMesgQueue(&entry->types.type0.msgQueue, &entry->types.type0.msg, 1); + DmaMgr_SendRequest2( + &entry->types.type0.req, ram, + LINK_ANIMETION_OFFSET(linkAnimetionEntry->animationSegAddress, ((sizeof(Vec3s) * limbCount + 2) * frame)), + sizeof(Vec3s) * limbCount + 2, 0, &entry->types.type0.msgQueue, NULL, "../z_skelanime.c", 2004); + } +} + +void SkelAnime_LoadAnimationType1(GlobalContext* globalCtx, s32 vecCount, Vec3s* dst, Vec3s* src) { + AnimationEntry* entry = SkelAnime_NextEntry(&globalCtx->animationCtx, ANIMATION_TYPE1); + if (entry != NULL) { + entry->types.type1.unk_00 = D_801600B0; + entry->types.type1.vecCount = vecCount; + entry->types.type1.dst = dst; + entry->types.type1.src = src; + } +} + +void SkelAnime_LoadAnimationType2(GlobalContext* globalCtx, s32 limbCount, Vec3s* arg2, Vec3s* arg3, f32 arg4) { + AnimationEntry* entry = SkelAnime_NextEntry(&globalCtx->animationCtx, ANIMATION_TYPE2); + if (entry != NULL) { + entry->types.type2.unk_00 = D_801600B0; + entry->types.type2.limbCount = limbCount; + entry->types.type2.unk_04 = arg2; + entry->types.type2.unk_08 = arg3; + entry->types.type2.unk_0C = arg4; + } +} + +void SkelAnime_LoadAnimationType3(GlobalContext* globalCtx, s32 vecCount, Vec3s* dst, Vec3s* src, u8* index) { + AnimationEntry* entry = SkelAnime_NextEntry(&globalCtx->animationCtx, ANIMATION_TYPE3); + if (entry != NULL) { + entry->types.type3.unk_00 = D_801600B0; + entry->types.type3.vecCount = vecCount; + entry->types.type3.dst = dst; + entry->types.type3.src = src; + entry->types.type3.index = index; + } +} + +void SkelAnime_LoadAnimationType4(GlobalContext* globalCtx, s32 vecCount, Vec3s* dst, Vec3s* src, u8* index) { + AnimationEntry* entry = SkelAnime_NextEntry(&globalCtx->animationCtx, ANIMATION_TYPE4); + if (entry != NULL) { + entry->types.type4.unk_00 = D_801600B0; + entry->types.type4.vecCount = vecCount; + entry->types.type4.dst = dst; + entry->types.type4.src = src; + entry->types.type4.index = index; + } +} + +void SkelAnime_LoadAnimationType5(GlobalContext* globalCtx, Actor* actor, SkelAnime* skelAnime, f32 arg3) { + AnimationEntry* entry = SkelAnime_NextEntry(&globalCtx->animationCtx, ANIMATION_TYPE5); + if (entry != NULL) { + entry->types.type5.actor = actor; + entry->types.type5.skelAnime = skelAnime; + entry->types.type5.unk_08 = arg3; + } +} + +/* The next functions are callbacks to loading animations */ + +void SkelAnime_LinkAnimetionLoaded(GlobalContext* globalCtx, AnimationEntryType0* entry) { + osRecvMesg(&entry->msgQueue, NULL, OS_MESG_BLOCK); +} + +void SkelAnime_AnimationType1Loaded(GlobalContext* globalCtx, AnimationEntryType1* entry) { + s32 i; + Vec3s* dst; + Vec3s* src; + AnimationEntryRaw* genericEntry = (AnimationEntryRaw*)entry; + + if ((genericEntry->raw[0] & D_8012A480) != 0) { + return; + } + + for (dst = entry->dst, src = entry->src, i = 0; i < genericEntry->raw[1]; i++) { + *dst++ = *src++; + } +} + +void SkelAnime_AnimationType2Loaded(GlobalContext* globalCtx, AnimationEntryType2* entry) { + if ((entry->unk_00 & D_8012A480) == 0) { + SkelAnime_InterpolateVec3s(entry->limbCount, entry->unk_04, entry->unk_04, entry->unk_08, entry->unk_0C); + } +} + +void SkelAnime_AnimationType3Loaded(GlobalContext* globalCtx, AnimationEntryType3* entry) { + s32 i; + Vec3s* dst; + Vec3s* src; + u8* index; + AnimationEntryRaw* rawEntry = (AnimationEntryRaw*)entry; + + if ((rawEntry->raw[0] & D_8012A480) == 0) { + for (dst = entry->dst, src = entry->src, index = entry->index, i = 0; i < rawEntry->raw[1]; i++, dst++, src++) { + if (*index++) { + *dst = *src; + } + } + } +} + +void SkelAnime_AnimationType4Loaded(GlobalContext* globalCtx, AnimationEntryType4* entry) { + s32 i; + Vec3s* dst; + Vec3s* src; + u8* index; + AnimationEntryRaw* rawEntry = (AnimationEntryRaw*)entry; + + if ((rawEntry->raw[0] & D_8012A480) == 0) { + for (dst = entry->dst, src = entry->src, index = entry->index, i = 0; i < rawEntry->raw[1]; i++, dst++, src++) { + if (*index++ < 1U) { + *dst = *src; + } + } + } +} + +void SkelAnime_AnimationType5Loaded(GlobalContext* globalCtx, AnimationEntryType5* entry) { + char pad[4]; + Actor* actor = entry->actor; + Vec3f pos; + + func_800A54FC(entry->skelAnime, &pos, actor->shape.rot.y); + actor->posRot.pos.x += pos.x * actor->scale.x; + actor->posRot.pos.y += pos.y * actor->scale.y * entry->unk_08; + actor->posRot.pos.z += pos.z * actor->scale.z; +} + +void func_800A390C(GlobalContext* globalCtx, AnimationContext* animationCtx) { + AnimationEntry* entry; + + for (entry = animationCtx->entries; animationCtx->animationCount != 0; entry++, animationCtx->animationCount--) { + sAnimationLoadDone[entry->type](globalCtx, &entry->types); + } + + D_801600B0 = 1; + D_8012A480 = 0; +} + +void SkelAnime_InitLinkAnimetion(GlobalContext* globalCtx, SkelAnime* skelAnime, SkeletonHeader* skeletonHeaderSeg, + LinkAnimetionEntry* linkAnimetionEntrySeg, s32 flags, Vec3s* actorDrawTbl, + Vec3s* transitionDrawTbl, s32 limbBufCount) { + char pad[8]; + SkeletonHeader* skeletonHeader; + size_t allocSize; + s32 limbCount; + s32 headerCount; + + skeletonHeader = SEGMENTED_TO_VIRTUAL(skeletonHeaderSeg); + headerCount = skeletonHeader->limbCount; + skelAnime->initFlags = flags; + limbCount = (flags & 2) ? headerCount : 1; + + if (flags & 1) { + limbCount += headerCount; + } + if (flags & 4) { + limbCount += headerCount; + } + + skelAnime->limbCount = limbCount; + skelAnime->dListCount = skeletonHeader->dListCount; + + allocSize = limbCount * sizeof(Vec3s); + skelAnime->skeleton = SEGMENTED_TO_VIRTUAL(skeletonHeader->skeletonSeg); + + if (flags & 8) { + allocSize += 2; + } + + if (actorDrawTbl == NULL) { + skelAnime->actorDrawTbl = ZeldaArena_MallocDebug(allocSize, "../z_skelanime.c", 2364); + skelAnime->transitionDrawTbl = ZeldaArena_MallocDebug(allocSize, "../z_skelanime.c", 2365); + } else { + if (limbBufCount != limbCount) { + __assert("joint_buff_num == joint_num", "../z_skelanime.c", 2369); + } + + skelAnime->actorDrawTbl = (Vec3s*)ALIGN16((u32)actorDrawTbl); + skelAnime->transitionDrawTbl = (Vec3s*)ALIGN16((u32)transitionDrawTbl); + } + + if ((skelAnime->actorDrawTbl == NULL) || (skelAnime->transitionDrawTbl == NULL)) { + osSyncPrintf(VT_FGCOL(RED)); + osSyncPrintf( + "Skeleton_Info_Rom_SV_ct メモリアロケーションエラー\n"); // Skeleton_Info_Rom_SV_ct Memory allocation error + osSyncPrintf(VT_RST); + } + + SkelAnime_ChangeLinkAnim(globalCtx, skelAnime, linkAnimetionEntrySeg, 1.0f, 0.0f, 0.0f, 0, 0.0f); +} + +void func_800A3B8C(SkelAnime* skelAnime) { + if (skelAnime->mode < 2) { + skelAnime->animUpdate = &func_800A3D70; + } else { + skelAnime->animUpdate = &func_800A3E0C; + } + skelAnime->transCurrentFrame = 0.0f; +} + +s32 func_800A3BC0(GlobalContext* globalCtx, SkelAnime* skelAnime) { + return skelAnime->animUpdate(globalCtx, skelAnime); +} + +s32 func_800A3BE4(GlobalContext* globalCtx, SkelAnime* skelAnime) { + f32 prevUnk28 = skelAnime->transCurrentFrame; + f32 updateRate = R_UPDATE_RATE * 0.5f; + + skelAnime->transCurrentFrame -= skelAnime->transitionStep * updateRate; + + if (skelAnime->transCurrentFrame <= 0.0f) { + func_800A3B8C(skelAnime); + } + + SkelAnime_LoadAnimationType2(globalCtx, skelAnime->limbCount, skelAnime->actorDrawTbl, skelAnime->transitionDrawTbl, + 1.0f - (skelAnime->transCurrentFrame / prevUnk28)); + return 0; +} + +void func_800A3C9C(GlobalContext* globalCtx, SkelAnime* skelAnime) { + f32 updateRate; + + SkelAnime_LoadLinkAnimetion(globalCtx, skelAnime->linkAnimetionSeg, skelAnime->animCurrentFrame, + skelAnime->limbCount, skelAnime->actorDrawTbl); + if (skelAnime->transCurrentFrame != 0) { + updateRate = R_UPDATE_RATE * 0.5f; + skelAnime->transCurrentFrame -= skelAnime->transitionStep * updateRate; + if (skelAnime->transCurrentFrame <= 0.0f) { + skelAnime->transCurrentFrame = 0.0f; + return; + } + SkelAnime_LoadAnimationType2(globalCtx, skelAnime->limbCount, skelAnime->actorDrawTbl, + skelAnime->transitionDrawTbl, skelAnime->transCurrentFrame); + } +} + +s32 func_800A3D70(GlobalContext* globalCtx, SkelAnime* skelAnime) { + f32 updateRate = R_UPDATE_RATE * 0.5f; + + skelAnime->animCurrentFrame += skelAnime->animPlaybackSpeed * updateRate; + if (skelAnime->animCurrentFrame < 0.0f) { + skelAnime->animCurrentFrame += skelAnime->totalFrames; + } else if (skelAnime->totalFrames <= skelAnime->animCurrentFrame) { + skelAnime->animCurrentFrame -= skelAnime->totalFrames; + } + func_800A3C9C(globalCtx, skelAnime); + return 0; +} + +s32 func_800A3E0C(GlobalContext* globalCtx, SkelAnime* skelAnime) { + f32 updateRate = R_UPDATE_RATE * 0.5f; + + if (skelAnime->animCurrentFrame == skelAnime->animFrameCount) { + func_800A3C9C(globalCtx, skelAnime); + return 1; + } + skelAnime->animCurrentFrame += skelAnime->animPlaybackSpeed * updateRate; + if (0.0f < ((skelAnime->animCurrentFrame - skelAnime->animFrameCount) * skelAnime->animPlaybackSpeed)) { + skelAnime->animCurrentFrame = skelAnime->animFrameCount; + } else { + if (skelAnime->animCurrentFrame < 0.0f) { + skelAnime->animCurrentFrame += skelAnime->totalFrames; + } else if (skelAnime->totalFrames <= skelAnime->animCurrentFrame) { + skelAnime->animCurrentFrame -= skelAnime->totalFrames; + } + } + func_800A3C9C(globalCtx, skelAnime); + return 0; +} + +void SkelAnime_SetTransition(GlobalContext* globalCtx, SkelAnime* skelAnime, f32 transitionRate) { + skelAnime->transCurrentFrame = 1.0f; + skelAnime->transitionStep = 1.0f / transitionRate; +} + +void SkelAnime_ChangeLinkAnim(GlobalContext* globalCtx, SkelAnime* skelAnime, LinkAnimetionEntry* linkAnimetionEntrySeg, + f32 playbackSpeed, f32 frame, f32 frameCount, u8 animationMode, f32 transitionRate) { + + skelAnime->mode = animationMode; + if ((transitionRate != 0.0f) && + ((linkAnimetionEntrySeg != skelAnime->linkAnimetionSeg) || (frame != skelAnime->animCurrentFrame))) { + if (transitionRate < 0) { + func_800A3B8C(skelAnime); + SkelAnime_CopyVec3s(skelAnime, skelAnime->transitionDrawTbl, skelAnime->actorDrawTbl); + transitionRate = -transitionRate; + } else { + skelAnime->animUpdate = &func_800A3BE4; + SkelAnime_LoadLinkAnimetion(globalCtx, linkAnimetionEntrySeg, (s32)frame, skelAnime->limbCount, + skelAnime->transitionDrawTbl); + } + skelAnime->transCurrentFrame = 1.0f; + skelAnime->transitionStep = 1.0f / transitionRate; + } else { + func_800A3B8C(skelAnime); + SkelAnime_LoadLinkAnimetion(globalCtx, linkAnimetionEntrySeg, (s32)frame, skelAnime->limbCount, + skelAnime->actorDrawTbl); + skelAnime->transCurrentFrame = 0.0f; + } + + skelAnime->linkAnimetionSeg = linkAnimetionEntrySeg; + skelAnime->animCurrentFrame = 0.0f; + skelAnime->initialFrame = frame; + skelAnime->animCurrentFrame = frame; + skelAnime->animFrameCount = frameCount; + skelAnime->totalFrames = SkelAnime_GetTotalFrames(linkAnimetionEntrySeg); + skelAnime->animPlaybackSpeed = playbackSpeed; +} + +void SkelAnime_ChangeLinkAnimDefaultStop(GlobalContext* globalCtx, SkelAnime* skelAnime, + LinkAnimetionEntry* linkAnimetionEntrySeg) { + SkelAnime_ChangeLinkAnim(globalCtx, skelAnime, linkAnimetionEntrySeg, 1.0f, 0.0f, + SkelAnime_GetFrameCount(&linkAnimetionEntrySeg->genericHeader), 2, 0.0f); +} + +void SkelAnime_ChangeLinkAnimPlaybackStop(GlobalContext* globalCtx, SkelAnime* skelAnime, + LinkAnimetionEntry* linkAnimetionEntrySeg, f32 playbackSpeed) { + SkelAnime_ChangeLinkAnim(globalCtx, skelAnime, linkAnimetionEntrySeg, playbackSpeed, 0.0f, + SkelAnime_GetFrameCount(&linkAnimetionEntrySeg->genericHeader), 2, 0.0f); +} + +void SkelAnime_ChangeLinkAnimDefaultRepeat(GlobalContext* globalCtx, SkelAnime* skelAnime, + LinkAnimetionEntry* linkAnimetionEntrySeg) { + SkelAnime_ChangeLinkAnim(globalCtx, skelAnime, linkAnimetionEntrySeg, 1.0f, 0.0f, + SkelAnime_GetFrameCount(&linkAnimetionEntrySeg->genericHeader), 0, 0.0f); +} + +void SkelAnime_ChangeLinkAnimPlaybackRepeat(GlobalContext* globalCtx, SkelAnime* skelAnime, + LinkAnimetionEntry* linkAnimetionEntrySeg, f32 playbackSpeed) { + SkelAnime_ChangeLinkAnim(globalCtx, skelAnime, linkAnimetionEntrySeg, playbackSpeed, 0.0f, + SkelAnime_GetFrameCount(&linkAnimetionEntrySeg->genericHeader), 0, 0.0f); +} + +void func_800A41FC(GlobalContext* globalCtx, SkelAnime* skelAnime) { + SkelAnime_LoadAnimationType1(globalCtx, skelAnime->limbCount, skelAnime->transitionDrawTbl, + skelAnime->actorDrawTbl); +} + +void func_800A422C(GlobalContext* globalCtx, SkelAnime* skelAnime) { + SkelAnime_LoadAnimationType1(globalCtx, skelAnime->limbCount, skelAnime->actorDrawTbl, + skelAnime->transitionDrawTbl); +} + +void func_800A425C(GlobalContext* globalCtx, SkelAnime* skelAnime, LinkAnimetionEntry* linkAnimetionEntrySeg, + f32 frame) { + SkelAnime_LoadLinkAnimetion(globalCtx, linkAnimetionEntrySeg, (s32)frame, skelAnime->limbCount, + skelAnime->transitionDrawTbl); +} + +void func_800A42A0(GlobalContext* globalCtx, SkelAnime* skelAnime, LinkAnimetionEntry* linkAnimetionEntrySeg, + f32 frame) { + SkelAnime_LoadLinkAnimetion(globalCtx, linkAnimetionEntrySeg, (s32)frame, skelAnime->limbCount, + skelAnime->actorDrawTbl); +} + +void func_800A42E4(GlobalContext* globalCtx, SkelAnime* skelAnime, f32 frame) { + SkelAnime_LoadAnimationType2(globalCtx, skelAnime->limbCount, skelAnime->actorDrawTbl, skelAnime->transitionDrawTbl, + frame); +} + +void func_800A431C(GlobalContext* globalCtx, SkelAnime* skelAnime, LinkAnimetionEntry* linkAnimetionEntrySeg, + f32 transitionFrame, LinkAnimetionEntry* linkAnimetionEntrySeg2, f32 frame, f32 transitionRate, + Vec3s* actorDrawTbl) { + Vec3s* alignedActorDrawTbl; + SkelAnime_LoadLinkAnimetion(globalCtx, linkAnimetionEntrySeg, (s32)transitionFrame, skelAnime->limbCount, + skelAnime->actorDrawTbl); + + alignedActorDrawTbl = (Vec3s*)ALIGN16((u32)actorDrawTbl); + + SkelAnime_LoadLinkAnimetion(globalCtx, linkAnimetionEntrySeg2, (s32)frame, skelAnime->limbCount, + alignedActorDrawTbl); + SkelAnime_LoadAnimationType2(globalCtx, skelAnime->limbCount, skelAnime->actorDrawTbl, alignedActorDrawTbl, + transitionRate); +} + +void func_800A43B8(GlobalContext* globalCtx, SkelAnime* skelAnime, LinkAnimetionEntry* linkAnimetionEntrySeg, + f32 transitionFrame, LinkAnimetionEntry* linkAnimetionEntrySeg2, f32 frame, f32 transitionRate, + Vec3s* actorDrawTbl) { + Vec3s* alignedActorDrawTbl; + + SkelAnime_LoadLinkAnimetion(globalCtx, linkAnimetionEntrySeg, (s32)transitionFrame, skelAnime->limbCount, + skelAnime->transitionDrawTbl); + + alignedActorDrawTbl = (Vec3s*)ALIGN16((u32)actorDrawTbl); + + SkelAnime_LoadLinkAnimetion(globalCtx, linkAnimetionEntrySeg2, (s32)frame, skelAnime->limbCount, + alignedActorDrawTbl); + SkelAnime_LoadAnimationType2(globalCtx, skelAnime->limbCount, skelAnime->transitionDrawTbl, alignedActorDrawTbl, + transitionRate); +} + +void SkelAnime_SetModeStop(SkelAnime* skelAnime) { + skelAnime->mode = 2; + func_800A3B8C(skelAnime); +} + +s32 func_800A4478(SkelAnime* skelAnime, f32 arg1, f32 updateRate) { + f32 updateSpeed; + f32 temp_f12; + f32 nextFrame; + + updateSpeed = skelAnime->animPlaybackSpeed * updateRate; + nextFrame = skelAnime->animCurrentFrame - updateSpeed; + if (nextFrame < 0.0f) { + nextFrame += skelAnime->totalFrames; + } else if (skelAnime->totalFrames <= nextFrame) { + nextFrame -= skelAnime->totalFrames; + } + + if ((arg1 == 0.0f) && (updateSpeed > 0.0f)) { + arg1 = skelAnime->totalFrames; + } + + temp_f12 = (nextFrame + updateSpeed) - arg1; + if ((0.0f <= (temp_f12 * updateSpeed)) && (((temp_f12 - updateSpeed) * updateSpeed) < 0.0f)) { + return 1; + } + return 0; +} + +s32 func_800A4530(SkelAnime* skelAnime, f32 arg1) { + f32 updateRate = R_UPDATE_RATE * 0.5f; + + return func_800A4478(skelAnime, arg1, updateRate); +} + +void SkelAnime_Init(GlobalContext* globalCtx, SkelAnime* skelAnime, SkeletonHeader* skeletonHeaderSeg, + AnimationHeader* animationSeg, Vec3s* actorDrawTable, Vec3s* transitionDrawTable, s32 limbCount) { + SkeletonHeader* skeletonHeader; + + skeletonHeader = SEGMENTED_TO_VIRTUAL(skeletonHeaderSeg); + skelAnime->limbCount = skeletonHeader->limbCount + 1; + skelAnime->skeleton = SEGMENTED_TO_VIRTUAL(skeletonHeader->skeletonSeg); + if (actorDrawTable == NULL) { + skelAnime->actorDrawTbl = + ZeldaArena_MallocDebug(skelAnime->limbCount * sizeof(*skelAnime->actorDrawTbl), "../z_skelanime.c", 2968); + skelAnime->transitionDrawTbl = ZeldaArena_MallocDebug( + skelAnime->limbCount * sizeof(*skelAnime->transitionDrawTbl), "../z_skelanime.c", 2969); + } else { + if (limbCount != skelAnime->limbCount) { + __assert("joint_buff_num == this->joint_num", "../z_skelanime.c", 2973); + } + skelAnime->actorDrawTbl = actorDrawTable; + skelAnime->transitionDrawTbl = transitionDrawTable; + } + if ((skelAnime->actorDrawTbl == NULL) || (skelAnime->transitionDrawTbl == NULL)) { + osSyncPrintf(VT_FGCOL(RED)); + osSyncPrintf("Skeleton_Info2_ct メモリアロケーションエラー\n"); // Skeleton_Info2_ct memory allocation error + osSyncPrintf(VT_RST); + } + + if (animationSeg != NULL) { + SkelAnime_ChangeAnimDefaultRepeat(skelAnime, animationSeg); + } +} + +void SkelAnime_InitSV(GlobalContext* globalCtx, SkelAnime* skelAnime, SkeletonHeader* skeletonHeaderSeg, + AnimationHeader* animationSeg, Vec3s* actorDrawTable, Vec3s* transitionDrawTable, s32 limbCount) { + SkeletonHeader* skeletonHeader; + + skeletonHeader = SEGMENTED_TO_VIRTUAL(skeletonHeaderSeg); + skelAnime->limbCount = skeletonHeader->limbCount + 1; + skelAnime->dListCount = skeletonHeader->dListCount; + skelAnime->skeleton = SEGMENTED_TO_VIRTUAL(skeletonHeader->skeletonSeg); + + if (actorDrawTable == NULL) { + skelAnime->actorDrawTbl = + ZeldaArena_MallocDebug(skelAnime->limbCount * sizeof(*skelAnime->actorDrawTbl), "../z_skelanime.c", 3047); + + skelAnime->transitionDrawTbl = ZeldaArena_MallocDebug( + skelAnime->limbCount * sizeof(*skelAnime->transitionDrawTbl), "../z_skelanime.c", 3048); + } else { + if (limbCount != skelAnime->limbCount) { + __assert("joint_buff_num == this->joint_num", "../z_skelanime.c", 3052); + } + skelAnime->actorDrawTbl = actorDrawTable; + skelAnime->transitionDrawTbl = transitionDrawTable; + } + if ((skelAnime->actorDrawTbl == NULL) || (skelAnime->transitionDrawTbl == NULL)) { + osSyncPrintf(VT_FGCOL(RED)); + osSyncPrintf( + "Skeleton_Info_Rom_SV_ct メモリアロケーションエラー\n"); // Skeleton_Info_Rom_SV_ct Memory allocation error + osSyncPrintf(VT_RST); + } + + if (animationSeg != NULL) { + SkelAnime_ChangeAnimDefaultRepeat(skelAnime, animationSeg); + } +} + +void SkelAnime_InitSkin(GlobalContext* globalCtx, SkelAnime* skelAnime, SkeletonHeader* skeletonHeaderSeg, + AnimationHeader* animationSeg) { + SkeletonHeader* skeletonHeader; + + skeletonHeader = SEGMENTED_TO_VIRTUAL(skeletonHeaderSeg); + skelAnime->limbCount = skeletonHeader->limbCount + 1; + skelAnime->skeleton = SEGMENTED_TO_VIRTUAL(skeletonHeader->skeletonSeg); + skelAnime->actorDrawTbl = + ZeldaArena_MallocDebug(skelAnime->limbCount * sizeof(*skelAnime->actorDrawTbl), "../z_skelanime.c", 3120); + skelAnime->transitionDrawTbl = + ZeldaArena_MallocDebug(skelAnime->limbCount * sizeof(*skelAnime->transitionDrawTbl), "../z_skelanime.c", 3121); + if ((skelAnime->actorDrawTbl == NULL) || (skelAnime->transitionDrawTbl == NULL)) { + osSyncPrintf(VT_FGCOL(RED)); + osSyncPrintf( + "Skeleton_Info2_skin2_ct メモリアロケーションエラー\n"); // Skeleton_Info2_skin2_ct Memory allocation error + osSyncPrintf(VT_RST); + } + + if (animationSeg != NULL) { + SkelAnime_ChangeAnimDefaultRepeat(skelAnime, animationSeg); + } +} + +void func_800A49B0(SkelAnime* skelAnime) { + if (skelAnime->mode < 2) { + skelAnime->animUpdate = &func_800A4D9C; + } else if (skelAnime->mode < 4) { + skelAnime->animUpdate = &func_800A4EE0; + } else { + skelAnime->animUpdate = &func_800A4E38; + } +} + +s32 SkelAnime_FrameUpdateMatrix(SkelAnime* skelAnime) { + return skelAnime->animUpdate(skelAnime); +} + +s32 func_800A4A20(SkelAnime* skelAnime) { + f32 prevUnk28; + f32 updateRate; + + prevUnk28 = skelAnime->transCurrentFrame; + updateRate = R_UPDATE_RATE * (1.0f / 3.0f); + skelAnime->transCurrentFrame -= skelAnime->transitionStep * updateRate; + if (skelAnime->transCurrentFrame <= 0.0f) { + func_800A49B0(skelAnime); + skelAnime->transCurrentFrame = 0.0f; + } + SkelAnime_InterpolateVec3s(skelAnime->limbCount, skelAnime->actorDrawTbl, skelAnime->actorDrawTbl, + skelAnime->transitionDrawTbl, 1.0f - (skelAnime->transCurrentFrame / prevUnk28)); + return 0; +} + +s32 func_800A4AD8(SkelAnime* skelAnime) { + s16 temp_a2; + s16 temp_a1; + f32 sp28; + f32 phi_f2; + f32 updateRate; + + temp_a2 = (s16)(skelAnime->transCurrentFrame * 16384.0f); + updateRate = R_UPDATE_RATE * (1.0f / 3.0f); + skelAnime->transCurrentFrame -= skelAnime->transitionStep * updateRate; + if (skelAnime->transCurrentFrame <= 0.0f) { + func_800A49B0(skelAnime); + skelAnime->transCurrentFrame = 0.0f; + } + temp_a1 = (s16)(skelAnime->transCurrentFrame * 16384.0f); + if (skelAnime->unk_03 < 0) { + sp28 = 1.0f - Math_Coss(temp_a2); + phi_f2 = 1.0f - Math_Coss(temp_a1); + } else { + sp28 = Math_Sins(temp_a2); + phi_f2 = Math_Sins(temp_a1); + } + if (phi_f2 != 0.0f) { + phi_f2 /= sp28; + } else { + phi_f2 = 0.0f; + } + SkelAnime_InterpolateVec3s(skelAnime->limbCount, skelAnime->actorDrawTbl, skelAnime->actorDrawTbl, + skelAnime->transitionDrawTbl, 1.0f - phi_f2); + return 0; +} + +void func_800A4C58(SkelAnime* skelAnime) { + s32 t; + f32 updateRate; + char pad[4]; + Vec3s sp38[98]; + f32 temp_f10; + f32 temp_f2; + + SkelAnime_AnimateFrame(skelAnime->animCurrentSeg, skelAnime->animCurrentFrame, skelAnime->limbCount, + skelAnime->actorDrawTbl); + if (skelAnime->mode & 0x1) { + t = (s32)skelAnime->animCurrentFrame; + temp_f10 = t; + temp_f2 = skelAnime->animCurrentFrame - temp_f10; + t++; + if (t >= (s32)skelAnime->totalFrames) { + t = 0; + } + SkelAnime_AnimateFrame(skelAnime->animCurrentSeg, t, skelAnime->limbCount, sp38); + SkelAnime_InterpolateVec3s(skelAnime->limbCount, skelAnime->actorDrawTbl, skelAnime->actorDrawTbl, sp38, + temp_f2); + } + if (skelAnime->transCurrentFrame != 0) { + updateRate = R_UPDATE_RATE * (1.0f / 3.0f); + skelAnime->transCurrentFrame -= skelAnime->transitionStep * updateRate; + if (skelAnime->transCurrentFrame <= 0.0f) { + skelAnime->transCurrentFrame = 0.0f; + return; + } + SkelAnime_InterpolateVec3s(skelAnime->limbCount, skelAnime->actorDrawTbl, skelAnime->actorDrawTbl, + skelAnime->transitionDrawTbl, skelAnime->transCurrentFrame); + } +} + +s32 func_800A4D9C(SkelAnime* skelAnime) { + f32 updateRate = R_UPDATE_RATE * (1.0f / 3.0f); + skelAnime->animCurrentFrame += skelAnime->animPlaybackSpeed * updateRate; + if (skelAnime->animCurrentFrame < 0.0f) { + skelAnime->animCurrentFrame += skelAnime->totalFrames; + } else if (skelAnime->totalFrames <= skelAnime->animCurrentFrame) { + skelAnime->animCurrentFrame -= skelAnime->totalFrames; + } + func_800A4C58(skelAnime); + return 0; +} + +s32 func_800A4E38(SkelAnime* skelAnime) { + f32 updateRate = R_UPDATE_RATE * (1.0f / 3.0f); + skelAnime->animCurrentFrame += skelAnime->animPlaybackSpeed * updateRate; + if (skelAnime->animCurrentFrame < skelAnime->initialFrame) { + skelAnime->animCurrentFrame = + (skelAnime->animCurrentFrame - skelAnime->initialFrame) + skelAnime->animFrameCount; + } else if (skelAnime->animFrameCount <= skelAnime->animCurrentFrame) { + skelAnime->animCurrentFrame = + (skelAnime->animCurrentFrame - skelAnime->animFrameCount) + skelAnime->initialFrame; + } + + func_800A4C58(skelAnime); + return 0; +} + +s32 func_800A4EE0(SkelAnime* skelAnime) { + f32 updateRate; + + updateRate = R_UPDATE_RATE * (1.0f / 3.0f); + if (skelAnime->animCurrentFrame == skelAnime->animFrameCount) { + + SkelAnime_AnimateFrame(skelAnime->animCurrentSeg, (s32)skelAnime->animCurrentFrame, skelAnime->limbCount, + skelAnime->actorDrawTbl); + func_800A4C58(skelAnime); + return 1; + } + skelAnime->animCurrentFrame += skelAnime->animPlaybackSpeed * updateRate; + if (0.0f < ((skelAnime->animCurrentFrame - skelAnime->animFrameCount) * skelAnime->animPlaybackSpeed)) { + skelAnime->animCurrentFrame = skelAnime->animFrameCount; + } else { + if (skelAnime->animCurrentFrame < 0.0f) { + skelAnime->animCurrentFrame += skelAnime->totalFrames; + } else { + if (skelAnime->totalFrames <= skelAnime->animCurrentFrame) { + skelAnime->animCurrentFrame -= skelAnime->totalFrames; + } + } + } + func_800A4C58(skelAnime); + return 0; +} + +void SkelAnime_ChangeAnimImpl(SkelAnime* skelAnime, AnimationHeader* animationSeg, f32 playbackSpeed, f32 frame, + f32 frameCount, u8 animationType, f32 transitionRate, s8 unk2) { + skelAnime->mode = animationType; + if ((transitionRate != 0.0f) && + ((animationSeg != skelAnime->animCurrentSeg) || (frame != skelAnime->animCurrentFrame))) { + if (transitionRate < 0) { + func_800A49B0(skelAnime); + SkelAnime_CopyVec3s(skelAnime, skelAnime->transitionDrawTbl, skelAnime->actorDrawTbl); + transitionRate = -transitionRate; + } else { + if (unk2 != 0) { + skelAnime->animUpdate = &func_800A4AD8; + skelAnime->unk_03 = unk2; + } else { + skelAnime->animUpdate = &func_800A4A20; + } + SkelAnime_AnimateFrame(animationSeg, frame, skelAnime->limbCount, skelAnime->transitionDrawTbl); + } + skelAnime->transCurrentFrame = 1.0f; + skelAnime->transitionStep = 1.0f / transitionRate; + } else { + func_800A49B0(skelAnime); + SkelAnime_AnimateFrame(animationSeg, frame, skelAnime->limbCount, skelAnime->actorDrawTbl); + skelAnime->transCurrentFrame = 0.0f; + } + + skelAnime->animCurrentSeg = animationSeg; + skelAnime->initialFrame = frame; + skelAnime->animFrameCount = frameCount; + skelAnime->totalFrames = SkelAnime_GetTotalFrames(&animationSeg->genericHeader); + if (skelAnime->mode >= 4) { + skelAnime->animCurrentFrame = 0.0f; + } else { + skelAnime->animCurrentFrame = frame; + if (skelAnime->mode < 2) { + skelAnime->animFrameCount = skelAnime->totalFrames - 1.0f; + } + } + skelAnime->animPlaybackSpeed = playbackSpeed; +} + +void SkelAnime_ChangeAnim(SkelAnime* skelAnime, AnimationHeader* animationSeg, f32 playbackSpeed, f32 frame, + f32 frameCount, u8 mode, f32 transitionRate) { + SkelAnime_ChangeAnimImpl(skelAnime, animationSeg, playbackSpeed, frame, frameCount, mode, transitionRate, 0); +} + +void SkelAnime_ChangeAnimDefaultStop(SkelAnime* skelAnime, AnimationHeader* animationSeg) { + SkelAnime_ChangeAnim(skelAnime, animationSeg, 1.0f, 0.0f, SkelAnime_GetFrameCount(&animationSeg->genericHeader), 2, + 0.0f); +} + +void SkelAnime_ChangeAnimTransitionStop(SkelAnime* skelAnime, AnimationHeader* animationSeg, f32 transitionRate) { + SkelAnime_ChangeAnim(skelAnime, animationSeg, 1.0f, 0, SkelAnime_GetFrameCount(&animationSeg->genericHeader), 2, + transitionRate); +} + +void SkelAnime_ChangeAnimPlaybackStop(SkelAnime* skelAnime, AnimationHeader* animationSeg, f32 playbackSpeed) { + SkelAnime_ChangeAnim(skelAnime, animationSeg, playbackSpeed, 0.0f, + SkelAnime_GetFrameCount(&animationSeg->genericHeader), 2, 0.0f); +} + +void SkelAnime_ChangeAnimDefaultRepeat(SkelAnime* skelAnime, AnimationHeader* animationSeg) { + SkelAnime_ChangeAnim(skelAnime, animationSeg, 1.0f, 0.0f, SkelAnime_GetFrameCount(&animationSeg->genericHeader), 0, + 0.0f); +} + +void SkelAnime_ChangeAnimTransitionRepeat(SkelAnime* skelAnime, AnimationHeader* animationSeg, f32 transitionRate) { + SkelAnime_ChangeAnim(skelAnime, animationSeg, 1.0f, 0.0f, 0.0f, 0, transitionRate); +} + +void SkelAnime_ChangeAnimPlaybackRepeat(SkelAnime* skelAnime, AnimationHeader* animationSeg, f32 playbackSpeed) { + SkelAnime_ChangeAnim(skelAnime, animationSeg, playbackSpeed, 0.0f, + SkelAnime_GetFrameCount(&animationSeg->genericHeader), 0, 0.0f); +} + +void SkelAnime_AnimSetStop(SkelAnime* skelAnime) { + skelAnime->mode = 2; + skelAnime->animFrameCount = skelAnime->totalFrames; + func_800A49B0(skelAnime); +} + +void SkelAnime_AnimReverse(SkelAnime* skelAnime) { + f32 initialFrame = skelAnime->initialFrame; + + skelAnime->initialFrame = skelAnime->animFrameCount; + skelAnime->animPlaybackSpeed = -skelAnime->animPlaybackSpeed; + skelAnime->animFrameCount = initialFrame; +} + +void func_800A5428(SkelAnime* skelAnime, Vec3s* dst, Vec3s* src, u8* index) { + s32 i; + for (i = 0; i < skelAnime->limbCount; i++, dst++, src++) { + if (*index++) { + *dst = *src; + } + } +} + +void func_800A5490(SkelAnime* skelAnime, Vec3s* dst, Vec3s* src, u8* arg3) { + s32 i; + for (i = 0; i < skelAnime->limbCount; i++, dst++, src++) { + if (*arg3++ < 1U) { + *dst = *src; + } + } +} + +/* + * Moves `pos` backwards on the xz plane from `angle` + */ +void func_800A54FC(SkelAnime* skelAnime, Vec3f* pos, s16 angle) { + f32 x; + f32 z; + f32 sin; + f32 cos; + + if (skelAnime->flags & 0x10) { + pos->z = 0.0f; + pos->x = 0.0f; + } else { + // `angle` rotation around y axis. + x = skelAnime->actorDrawTbl->x; + z = skelAnime->actorDrawTbl->z; + sin = Math_Sins(angle); + cos = Math_Coss(angle); + pos->x = x * cos + z * sin; + pos->z = z * cos - x * sin; + x = skelAnime->prevFramePos.x; + z = skelAnime->prevFramePos.z; + // `prevFrameRot` rotation around y axis. + sin = Math_Sins(skelAnime->prevFrameRot); + cos = Math_Coss(skelAnime->prevFrameRot); + pos->x -= x * cos + z * sin; + pos->z -= z * cos - x * sin; + } + + skelAnime->prevFrameRot = angle; + skelAnime->prevFramePos.x = skelAnime->actorDrawTbl->x; + skelAnime->actorDrawTbl->x = skelAnime->unk_3E.x; + skelAnime->prevFramePos.z = skelAnime->actorDrawTbl->z; + skelAnime->actorDrawTbl->z = skelAnime->unk_3E.z; + if (skelAnime->flags & ANIM_FLAG_UPDATEXZ) { + if (skelAnime->flags & ANIM_FLAG_UPDATEY) { + pos->y = 0.0f; + } else { + pos->y = skelAnime->actorDrawTbl->y - skelAnime->prevFramePos.y; + } + skelAnime->prevFramePos.y = skelAnime->actorDrawTbl->y; + skelAnime->actorDrawTbl->y = skelAnime->unk_3E.y; + } else { + pos->y = 0.0f; + skelAnime->prevFramePos.y = skelAnime->actorDrawTbl->y; + } + skelAnime->flags &= ~ANIM_FLAG_UPDATEY; +} + +s32 func_800A56C8(SkelAnime* skelAnime, f32 arg1) { + return func_800A4478(skelAnime, arg1, 1.0f); +} + +void SkelAnime_Free(SkelAnime* skelAnime, GlobalContext* globalCtx) { + if (skelAnime->actorDrawTbl != NULL) { + ZeldaArena_FreeDebug(skelAnime->actorDrawTbl, "../z_skelanime.c", 3729); + } else { + osSyncPrintf("now_joint あきまへん！！\n"); // now_joint Akimane! ! + } + + if (skelAnime->transitionDrawTbl != NULL) { + ZeldaArena_FreeDebug(skelAnime->transitionDrawTbl, "../z_skelanime.c", 3731); + } else { + osSyncPrintf("morf_joint あきまへん！！\n"); // "morf_joint Akimane !!" + } +} + +void SkelAnime_CopyVec3s(SkelAnime* skelAnime, Vec3s* dst, Vec3s* src) { + s32 i; + for (i = 0; i < skelAnime->limbCount; i++) { + *dst++ = *src++; + } +} diff --git a/src/code/z_skin.c b/src/code/z_skin.c index 617a633c13..ca907bb17e 100644 --- a/src/code/z_skin.c +++ b/src/code/z_skin.c @@ -20,4 +20,3 @@ #pragma GLOBAL_ASM("asm/non_matchings/code/z_skin/func_800A63CC.s") #pragma GLOBAL_ASM("asm/non_matchings/code/z_skin/func_800A6408.s") - diff --git a/src/code/z_skin_awb.c b/src/code/z_skin_awb.c index aaffdcadb9..4e4530025f 100644 --- a/src/code/z_skin_awb.c +++ b/src/code/z_skin_awb.c @@ -10,4 +10,3 @@ #pragma GLOBAL_ASM("asm/non_matchings/code/z_skin_awb/func_800A698C.s") #pragma GLOBAL_ASM("asm/non_matchings/code/z_skin_awb/func_800A6AC4.s") - diff --git a/src/code/z_skin_matrix.c b/src/code/z_skin_matrix.c index 2c7a215fe7..27d703f301 100644 --- a/src/code/z_skin_matrix.c +++ b/src/code/z_skin_matrix.c @@ -40,4 +40,3 @@ #pragma GLOBAL_ASM("asm/non_matchings/code/z_skin_matrix/func_800A7EC0.s") #pragma GLOBAL_ASM("asm/non_matchings/code/z_skin_matrix/func_800A8030.s") - diff --git a/src/code/z_sram.c b/src/code/z_sram.c index dd9578f0ee..0f2bcaa64f 100644 --- a/src/code/z_sram.c +++ b/src/code/z_sram.c @@ -24,4 +24,3 @@ #pragma GLOBAL_ASM("asm/non_matchings/code/z_sram/func_800A9CD4.s") #pragma GLOBAL_ASM("asm/non_matchings/code/z_sram/func_800A9D28.s") - diff --git a/src/code/z_view.c b/src/code/z_view.c index 84eb4770d2..18336b98a2 100644 --- a/src/code/z_view.c +++ b/src/code/z_view.c @@ -1,63 +1,602 @@ #include #include +#include -#pragma GLOBAL_ASM("asm/non_matchings/code/z_view/func_800AA190.s") +volatile u32 D_8012ABF0 = 1; -#pragma GLOBAL_ASM("asm/non_matchings/code/z_view/func_800AA1F8.s") +// TODO replace UnkViewStruct with Viewport and match with that instead +void func_800AA190(UnkViewStruct* arg0, Viewport* viewport) { + s32 xLen; + s32 yLen; -#pragma GLOBAL_ASM("asm/non_matchings/code/z_view/func_800AA250.s") + xLen = viewport->rightX - viewport->leftX; + yLen = viewport->bottomY - viewport->topY; + arg0->unk_0 = (xLen * 2); + arg0->unk_2 = (yLen * 2); + arg0->unk_4 = 0x01FF; + arg0->unk_6 = 0; + arg0->unk_8 = (((viewport->leftX * 2) + xLen) * 2); + arg0->unk_A = (((viewport->topY * 2) + yLen) * 2); + arg0->unk_C = 0x01FF; + arg0->unk_E = 0; +} -#pragma GLOBAL_ASM("asm/non_matchings/code/z_view/func_800AA278.s") +View* func_800AA1F8(GraphicsContext* gfxCtx) { + View* view = SystemArena_MallocDebug(sizeof(View), "../z_view.c", 285); + if (view != NULL) { + func_80106860(view, 0, sizeof(View)); // TODO prototype this + func_800AA278(view, gfxCtx); + } + return view; +} -#pragma GLOBAL_ASM("asm/non_matchings/code/z_view/func_800AA358.s") +void func_800AA250(View* view) { + SystemArena_FreeDebug(view, "../z_view.c", 297); +} -#pragma GLOBAL_ASM("asm/non_matchings/code/z_view/func_800AA3F0.s") +void func_800AA278(View* view, GraphicsContext* gfxCtx) { + view->gfxCtx = gfxCtx; + view->viewport.topY = 0; + view->viewport.bottomY = 240; + view->viewport.leftX = 0; + view->viewport.rightX = 320; + view->magic = 0x56494557; //"VIEW" + view->eye.x = 0.0f; + view->eye.y = 0.0f; + view->unk_24 = 1.0f; + view->fieldOfView = 60.0f; + view->fogDistance = 10.0f; + view->zDepth = 12800.0f; + view->unk_34.x = 0.0f; + view->unk_40.x = 0.0f; + view->unk_40.y = 1.0f; + view->unk_40.z = 0.0f; + view->eye.z = -1.0f; -#pragma GLOBAL_ASM("asm/non_matchings/code/z_view/func_800AA43C.s") + if (D_8012ABF0 != 0) { + if (&D_8012ABF0) {} + osSyncPrintf("\nview: initialize ---\n", gfxCtx, view); + D_8012ABF0 = 0; + } + view->unk_124 = 0; + view->unk_120 = 7; + func_800AA7B8(view); +} -#pragma GLOBAL_ASM("asm/non_matchings/code/z_view/func_800AA454.s") +void func_800AA358(View* view, Vec3f* vec1, Vec3f* vec2, Vec3f* vec3) { + if (vec1->x == vec2->x && vec1->z == vec2->z) { + vec1->x += 0.1f; + } + view->eye = *vec1; + view->unk_34 = *vec2; + view->unk_40 = *vec3; + view->unk_120 |= 1; +} -#pragma GLOBAL_ASM("asm/non_matchings/code/z_view/func_800AA460.s") +void func_800AA3F0(View* view, Vec3f* vec1, Vec3f* vec2, Vec3f* vec3) { + view->eye = *vec1; + view->unk_34 = *vec2; + view->unk_40 = *vec3; +} -#pragma GLOBAL_ASM("asm/non_matchings/code/z_view/func_800AA48C.s") +void func_800AA43C(View* view, f32 arg1) { + view->unk_120 |= 4; + view->unk_24 = arg1; +} -#pragma GLOBAL_ASM("asm/non_matchings/code/z_view/func_800AA4A8.s") +void func_800AA454(View* view, f32* arg1) { + *arg1 = view->unk_24; +} -#pragma GLOBAL_ASM("asm/non_matchings/code/z_view/func_800AA4E0.s") +void func_800AA460(View* view, f32 fieldOfView, f32 fogDistance, f32 zDepth) { + view->fieldOfView = fieldOfView; + view->fogDistance = fogDistance; + view->zDepth = zDepth; + view->unk_120 |= 4; +} -#pragma GLOBAL_ASM("asm/non_matchings/code/z_view/func_800AA4FC.s") +void func_800AA48C(View* view, f32* fieldOfView, f32* fogDistance, f32* zDepth) { + *fieldOfView = view->fieldOfView; + *fogDistance = view->fogDistance; + *zDepth = view->zDepth; +} -#pragma GLOBAL_ASM("asm/non_matchings/code/z_view/func_800AA52C.s") +void func_800AA4A8(View* view, f32 fieldOfView, f32 fogDistance, f32 zDepth) { + view->fieldOfView = fieldOfView; + view->fogDistance = fogDistance; + view->zDepth = zDepth; + view->unk_120 |= 8; + view->unk_24 = 1.0f; +} +void func_800AA4E0(View* view, f32* fieldOfView, f32* fogDistance, f32* zDepth) { + *fieldOfView = view->fieldOfView; + *fogDistance = view->fogDistance; + *zDepth = view->zDepth; +} + +void func_800AA4FC(View* view, Viewport* viewport) { + view->viewport = *viewport; + view->unk_120 |= 2; +} + +void func_800AA52C(View* view, Viewport* viewport) { + *viewport = view->viewport; +} + +#ifdef NON_MATCHING +// regalloc, zeros optimised out +void func_800AA550(View* view) { + s32 phi_v1; + s32 phi_v1_2; + s32 pad; + s32 ulx; + s32 uly; + s32 lrx; + s32 lry; + GraphicsContext* gfxCtx; + s32 temp_a0; + Gfx* dispRefs[4]; + + gfxCtx = view->gfxCtx; + phi_v1 = func_800B38FC(); + if (phi_v1 < 0) { + phi_v1 = 0; + } + if (phi_v1 >= 0x79) { + phi_v1 = 0x78; + } + ulx = view->viewport.leftX + 0; + uly = view->viewport.topY + phi_v1; + lrx = view->viewport.rightX - 0; + lry = view->viewport.bottomY - phi_v1; + if (ulx < 0) { + __assert("ulx >= 0", "../z_view.c", 454); + } + if (uly < 0) { + __assert("uly >= 0", "../z_view.c", 455); + } + if (lrx > SCREEN_WIDTH) { + __assert("lrx <= SCREEN_WD", "../z_view.c", 456); + } + if (lry > SCREEN_HEIGHT) { + __assert("lry <= SCREEN_HT", "../z_view.c", 457); + } + Graph_OpenDisps(dispRefs, gfxCtx, "../z_view.c", 459); + gDPPipeSync(gfxCtx->polyOpa.p++); + gDPSetScissor(gfxCtx->polyOpa.p++, G_SC_NON_INTERLACE, ulx, uly, lrx, lry); + gDPPipeSync(gfxCtx->polyXlu.p++); + gDPSetScissor(gfxCtx->polyXlu.p++, G_SC_NON_INTERLACE, ulx, uly, lrx, lry); + Graph_CloseDisps(dispRefs, gfxCtx, "../z_view.c", 472); +} +#else #pragma GLOBAL_ASM("asm/non_matchings/code/z_view/func_800AA550.s") +#endif -#pragma GLOBAL_ASM("asm/non_matchings/code/z_view/func_800AA76C.s") +void func_800AA76C(View* view, f32 arg1, f32 arg2, f32 arg3) { + view->unk_E8.x = arg1; + view->unk_E8.y = arg2; + view->unk_E8.z = arg3; +} -#pragma GLOBAL_ASM("asm/non_matchings/code/z_view/func_800AA78C.s") +void func_800AA78C(View* view, f32 arg1, f32 arg2, f32 arg3) { + view->unk_F4.x = arg1; + view->unk_F4.y = arg2; + view->unk_F4.z = arg3; +} -#pragma GLOBAL_ASM("asm/non_matchings/code/z_view/func_800AA7AC.s") +void func_800AA7AC(View* view, f32 arg1) { + view->unk_100 = arg1; +} -#pragma GLOBAL_ASM("asm/non_matchings/code/z_view/func_800AA7B8.s") +void func_800AA7B8(View* view) { + view->unk_E8.x = 0.0f; + view->unk_E8.y = 0.0f; + view->unk_E8.z = 0.0f; + view->unk_F4.x = 1.0f; + view->unk_F4.y = 1.0f; + view->unk_F4.z = 1.0f; + view->unk_104 = view->unk_E8; + view->unk_110 = view->unk_F4; + view->unk_100 = 0.0f; +} -#pragma GLOBAL_ASM("asm/non_matchings/code/z_view/func_800AA814.s") +void func_800AA814(View* view) { + view->unk_E8.x = 0.0f; + view->unk_E8.y = 0.0f; + view->unk_E8.z = 0.0f; + view->unk_F4.x = 1.0f; + view->unk_F4.y = 1.0f; + view->unk_F4.z = 1.0f; + view->unk_100 = 1.0f; +} -#pragma GLOBAL_ASM("asm/non_matchings/code/z_view/func_800AA840.s") +void func_800AA840(View* view, Vec3f vec1, Vec3f vec2, f32 arg3) { + view->unk_E8 = vec1; + view->unk_F4 = vec2; + view->unk_100 = arg3; +} -#pragma GLOBAL_ASM("asm/non_matchings/code/z_view/func_800AA890.s") +s32 func_800AA890(View* view, Mtx* mtx) { + MtxF mtxF; -#pragma GLOBAL_ASM("asm/non_matchings/code/z_view/func_800AAA50.s") + if (view->unk_100 == 0.0f) { + return 0; + } else if (view->unk_100 == 1.0f) { + view->unk_104 = view->unk_E8; + view->unk_110 = view->unk_F4; + view->unk_100 = 0.0f; + } else { + view->unk_104.x += ((view->unk_E8.x - view->unk_104.x) * view->unk_100); + view->unk_104.y += ((view->unk_E8.y - view->unk_104.y) * view->unk_100); + view->unk_104.z += ((view->unk_E8.z - view->unk_104.z) * view->unk_100); + view->unk_110.x += ((view->unk_F4.x - view->unk_110.x) * view->unk_100); + view->unk_110.y += ((view->unk_F4.y - view->unk_110.y) * view->unk_100); + view->unk_110.z += ((view->unk_F4.z - view->unk_110.z) * view->unk_100); + } + Matrix_MtxToMtxF(mtx, &mtxF); + Matrix_Put(&mtxF); + Matrix_RotateX(view->unk_104.x, 1); + Matrix_RotateY(view->unk_104.y, 1); + Matrix_RotateZ(view->unk_104.z, 1); + Matrix_Scale(view->unk_110.x, view->unk_110.y, view->unk_110.z, MTXMODE_APPLY); + Matrix_RotateZ(-view->unk_104.z, 1); + Matrix_RotateY(-view->unk_104.y, 1); + Matrix_RotateX(-view->unk_104.x, 1); + Matrix_ToMtx(mtx, "../z_view.c", 566); + return 1; +} + +void func_800AAA50(View* view, s32 arg1) { + arg1 = (view->unk_120 & arg1) | arg1 >> 4; + if (arg1 & 8) { + func_800AB0A8(view); + } else { + func_800AAA9C(view); + } +} + +#ifdef NON_MATCHING +// Just one stack var +s32 func_800AAA9C(View* view) { + s32 pad; + s32 pad1; + s32 ylen; + Viewport* viewport; + Mtx* projection; + MtxF* viewing; + Gfx* dispRefs[6]; + s32 xlen; + GraphicsContext* gfxCtx; + s32 i; + MtxF mtxF; + MtxF mtxFv; + + gfxCtx = view->gfxCtx; + Graph_OpenDisps(dispRefs, gfxCtx, "../z_view.c", 596); + viewport = Graph_Alloc(gfxCtx, sizeof(Viewport)); + LogUtils_CheckNullPointer("vp", viewport, "../z_view.c", 601); + func_800AA190(viewport, &view->viewport); + view->unk_50 = *viewport; + func_800AA550(view); + + gSPViewport(gfxCtx->polyOpa.p++, viewport); + gSPViewport(gfxCtx->polyXlu.p++, viewport); + + projection = Graph_Alloc(gfxCtx, sizeof(Mtx)); + LogUtils_CheckNullPointer("projection", projection, "../z_view.c", 616); + view->unk_E0 = projection; + xlen = view->viewport.rightX - view->viewport.leftX; + ylen = view->viewport.bottomY - view->viewport.topY; + if (HREG(80) == 0xB) { + if (HREG(94) != 0xB) { + HREG(94) = 0xB; + HREG(83) = 0x3C; + HREG(84) = 0x3415; + HREG(85) = 0xA; + HREG(86) = 0x3200; + HREG(87) = 0x64; + } + guPerspective(projection, &view->unk_11C, HREG(83), HREG(84) / 10000.0f, HREG(85), HREG(86), HREG(87) / 100.0f); + } else { + guPerspective(projection, &view->unk_11C, view->fieldOfView, (f32)xlen / (f32)ylen, view->fogDistance, + view->zDepth, view->unk_24); + } + if (QREG(88) & 1) { + osSyncPrintf("fovy %f near %f far %f scale %f aspect %f normal %08x\n", view->fieldOfView, view->fogDistance, + view->zDepth, view->unk_24, (f32)xlen / (f32)ylen, view->unk_11C); + Matrix_MtxToMtxF(projection, &mtxF); + osSyncPrintf("projection\n"); + for (i = 0; i < 4; i++) { + osSyncPrintf(" %f %f %f %f\n", mtxF.mf[i][0], mtxF.mf[i][1], mtxF.mf[i][2], + mtxF.mf[i][3]); + } + osSyncPrintf("\n"); + } + view->unk_60 = *projection; + + func_800AA890(view, projection); + + gSPPerspNormalize(gfxCtx->polyOpa.p++, view->unk_11C); + gSPMatrix(gfxCtx->polyOpa.p++, projection, G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_PROJECTION); + gSPPerspNormalize(gfxCtx->polyXlu.p++, view->unk_11C); + gSPMatrix(gfxCtx->polyXlu.p++, projection, G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_PROJECTION); + + viewing = Graph_Alloc(gfxCtx, sizeof(MtxF)); + LogUtils_CheckNullPointer("viewing", viewing, "../z_view.c", 667); + view->unk_E4 = viewing; + if (view->eye.x == view->unk_34.x && view->eye.y == view->unk_34.y && view->eye.z == view->unk_34.z) { + view->eye.x += 1.0f; + view->eye.y += 1.0f; + view->eye.z += 1.0f; + } + func_800ABE74(view->eye.x, view->eye.y, view->eye.z); + func_80101E34(viewing, view->eye.x, view->eye.y, view->eye.z, view->unk_34.x, view->unk_34.y, view->unk_34.z, + view->unk_40.x, view->unk_40.y, view->unk_40.z); + view->unk_A0 = *viewing; + + if (QREG(88) & 2) { + Matrix_MtxToMtxF(view->unk_E4, &mtxFv); + osSyncPrintf("viewing\n"); + for (i = 0; i < 4; i++) { + osSyncPrintf(" %f %f %f %f\n", mtxFv.mf[i][0], mtxFv.mf[i][1], mtxFv.mf[i][2], + mtxFv.mf[i][3]); + } + osSyncPrintf("\n"); + } + + gSPMatrix(gfxCtx->polyOpa.p++, viewing, G_MTX_NOPUSH | G_MTX_MUL | G_MTX_PROJECTION); + gSPMatrix(gfxCtx->polyXlu.p++, viewing, G_MTX_NOPUSH | G_MTX_MUL | G_MTX_PROJECTION); + + Graph_CloseDisps(dispRefs, gfxCtx, "../z_view.c", 711); + return 1; +} +#else #pragma GLOBAL_ASM("asm/non_matchings/code/z_view/func_800AAA9C.s") +#endif -#pragma GLOBAL_ASM("asm/non_matchings/code/z_view/func_800AB0A8.s") +s32 func_800AB0A8(View* view) { + Viewport* viewport; + Mtx* projection; + s32 pad; + s32 pad1; + GraphicsContext* gfxCtx; + Gfx* dispRefs[3]; + gfxCtx = view->gfxCtx; + Graph_OpenDisps(dispRefs, gfxCtx, "../z_view.c", 726); + viewport = Graph_Alloc(gfxCtx, sizeof(Viewport)); + LogUtils_CheckNullPointer("vp", viewport, "../z_view.c", 730); + func_800AA190(viewport, &view->viewport); + view->unk_50 = *viewport; + func_800AA550(view); + + gSPViewport(gfxCtx->polyOpa.p++, viewport); + gSPViewport(gfxCtx->polyXlu.p++, viewport); + gSPViewport(gfxCtx->overlay.p++, viewport); + + projection = Graph_Alloc(gfxCtx, sizeof(Mtx)); + LogUtils_CheckNullPointer("projection", projection, "../z_view.c", 744); + view->unk_E0 = projection; + func_801045A4(projection, -(f32)(s32)gScreenWidth * 0.5f, (f32)(s32)gScreenWidth * 0.5f, + -(f32)(s32)gScreenHeight * 0.5f, (f32)(s32)gScreenHeight * 0.5f, view->fogDistance, view->zDepth, + view->unk_24); + + view->unk_60 = *projection; + + gSPMatrix(gfxCtx->polyOpa.p++, projection, G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_PROJECTION); + gSPMatrix(gfxCtx->polyXlu.p++, projection, G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_PROJECTION); + + Graph_CloseDisps(dispRefs, gfxCtx, "../z_view.c", 762); + return 1; +} + +#ifdef NON_MATCHING +// saved registers allocated differently, everything else is OK +s32 func_800AB2C4(View* view) { + Mtx* projection; + f32 pad; + f32 pad1; + Viewport* viewport; + Gfx* dispRefs[4]; + GraphicsContext* gfxCtx; + + gfxCtx = view->gfxCtx; + Graph_OpenDisps(dispRefs, gfxCtx, "../z_view.c", 777); + viewport = Graph_Alloc(gfxCtx, sizeof(Viewport)); + LogUtils_CheckNullPointer("vp", viewport, "../z_view.c", 781); + func_800AA190(viewport, &view->viewport); + view->unk_50 = *viewport; + + gDPPipeSync(gfxCtx->overlay.p++); + gDPSetScissor(gfxCtx->overlay.p++, G_SC_NON_INTERLACE, view->viewport.leftX, view->viewport.topY, + view->viewport.rightX, view->viewport.bottomY); + gSPViewport(gfxCtx->overlay.p++, viewport); + + projection = Graph_Alloc(gfxCtx, sizeof(Mtx)); + LogUtils_CheckNullPointer("projection", projection, "../z_view.c", 791); + view->unk_E0 = projection; + func_801045A4(projection, -(f32)(s32)gScreenWidth * 0.5f, (f32)(s32)gScreenWidth * 0.5f, + -(f32)(s32)gScreenHeight * 0.5f, (f32)(s32)gScreenHeight * 0.5f, view->fogDistance, view->zDepth, + view->unk_24); + view->unk_60 = *projection; + + gSPMatrix(gfxCtx->overlay.p++, projection, G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_PROJECTION); + + Graph_CloseDisps(dispRefs, gfxCtx, "../z_view.c", 801); + return 1; +} +#else #pragma GLOBAL_ASM("asm/non_matchings/code/z_view/func_800AB2C4.s") +#endif +#ifdef NON_MATCHING +// regalloc +s32 func_800AB560(View* view) { + s32 pad; + s32 pad1; + s32 pad2; + s32 pad3; + GraphicsContext* gfxCtx; + Viewport* viewport; + Mtx* projection; + MtxF* viewing; + Gfx* dispRefs[6]; + f32 aspect; + + gfxCtx = view->gfxCtx; + Graph_OpenDisps(dispRefs, gfxCtx, "../z_view.c", 816); + + viewport = Graph_Alloc(gfxCtx, sizeof(Viewport)); + LogUtils_CheckNullPointer("vp", viewport, "../z_view.c", 821); + + func_800AA190(viewport, &view->viewport); + view->unk_50 = *viewport; + gDPPipeSync(gfxCtx->overlay.p++); + gDPSetScissor(gfxCtx->overlay.p++, G_SC_NON_INTERLACE, view->viewport.leftX, view->viewport.topY, + view->viewport.rightX, view->viewport.bottomY); + gSPViewport(gfxCtx->overlay.p++, viewport); + + projection = Graph_Alloc(gfxCtx, sizeof(Mtx)); + LogUtils_CheckNullPointer("projection", projection, "../z_view.c", 833); + + view->unk_E0 = projection; + guPerspective(projection, &view->unk_11C, view->fieldOfView, + (f32)(view->viewport.rightX - view->viewport.leftX) / + (f32)(view->viewport.bottomY - view->viewport.topY), + view->fogDistance, view->zDepth, view->unk_24); + view->unk_60 = *projection; + gSPPerspNormalize(gfxCtx->overlay.p++, view->unk_11C); + gSPMatrix(gfxCtx->overlay.p++, projection, G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_PROJECTION); + + viewing = Graph_Alloc(gfxCtx, sizeof(MtxF)); + LogUtils_CheckNullPointer("viewing", viewing, "../z_view.c", 848); + + view->unk_E4 = viewing; + if (view->eye.x == view->unk_34.x && view->eye.y == view->unk_34.y && view->eye.z == view->unk_34.z) { + view->eye.x += 1.0f; + view->eye.y += 1.0f; + view->eye.z += 1.0f; + } + func_800ABE74(view->eye.x, view->eye.y, view->eye.z); + func_80101E34(viewing, view->eye.x, view->eye.y, view->eye.z, view->unk_34.x, view->unk_34.y, view->unk_34.z, + view->unk_40.x, view->unk_40.y, view->unk_40.z); + view->unk_A0 = *viewing; + gSPMatrix(gfxCtx->overlay.p++, viewing, G_MTX_NOPUSH | G_MTX_MUL | G_MTX_PROJECTION); + + Graph_CloseDisps(dispRefs, gfxCtx, "../z_view.c", 871); + return 1; +} +#else #pragma GLOBAL_ASM("asm/non_matchings/code/z_view/func_800AB560.s") +#endif -#pragma GLOBAL_ASM("asm/non_matchings/code/z_view/func_800AB944.s") +s32 func_800AB944(View* view) { + Gfx* dispRefs[5]; + Graph_OpenDisps(dispRefs, view->gfxCtx, "../z_view.c", 878); + func_800ABE74(view->eye.x, view->eye.y, view->eye.z); + func_80101E34(view->unk_E4, view->eye.x, view->eye.y, view->eye.z, view->unk_34.x, view->unk_34.y, view->unk_34.z, + view->unk_40.x, view->unk_40.y, view->unk_40.z); + + Graph_CloseDisps(dispRefs, view->gfxCtx, "../z_view.c", 886); + return 1; +} + +#ifdef NON_MATCHING +// saved register usage is wrong, relatively minor reorderings, regalloc +s32 func_800AB9EC(View* view, s32 arg1, Gfx** p) { + Viewport* viewport; + Mtx* projection; + Mtx* projection2; + MtxF* viewing; + GraphicsContext* gfxCtx; + Gfx* pLocal; + + gfxCtx = view->gfxCtx; + pLocal = *p; + arg1 = (view->unk_120 & arg1) | arg1 >> 4; + if (arg1 & 2) { + viewport = Graph_Alloc(view->gfxCtx, sizeof(Viewport)); + LogUtils_CheckNullPointer("vp", viewport, "../z_view.c", 910); + func_800AA190(viewport, &view->viewport); + + view->unk_50 = *viewport; + + gDPPipeSync(pLocal++); + gDPSetScissor(pLocal++, G_SC_NON_INTERLACE, view->viewport.leftX, view->viewport.topY, view->viewport.rightX, + view->viewport.bottomY); + gSPViewport(pLocal++, viewport); + } + if (arg1 & 8) { + projection = Graph_Alloc(gfxCtx, sizeof(Mtx)); + LogUtils_CheckNullPointer("projection", projection, "../z_view.c", 921); + view->unk_E0 = projection; + func_801045A4(projection, -(f32)(s32)gScreenWidth * 0.5f, (f32)(s32)gScreenWidth * 0.5f, + -(f32)(s32)gScreenHeight * 0.5f, (f32)(s32)gScreenHeight * 0.5f, view->fogDistance, view->zDepth, + view->unk_24); + + view->unk_60 = *projection; + + gSPMatrix(pLocal++, projection, G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_PROJECTION); + } else if (arg1 & 6) { + projection2 = Graph_Alloc(gfxCtx, sizeof(Mtx)); + LogUtils_CheckNullPointer("projection", projection2, "../z_view.c", 932); + view->unk_E0 = projection2; + guPerspective(projection2, &view->unk_11C, view->fieldOfView, + (f32)(view->viewport.rightX - view->viewport.leftX) / + (f32)(view->viewport.bottomY - view->viewport.topY), + view->fogDistance, view->zDepth, view->unk_24); + + view->unk_60 = *projection2; + + gSPPerspNormalize(pLocal++, view->unk_11C); + gSPMatrix(pLocal++, projection2, G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_PROJECTION); + } + if (arg1 & 1) { + viewing = Graph_Alloc(gfxCtx, sizeof(MtxF)); + LogUtils_CheckNullPointer("viewing", viewing, "../z_view.c", 948); + view->unk_E4 = viewing; + func_800ABE74(view->eye.x, view->eye.y, view->eye.z); + func_80101E34(viewing, view->eye.x, view->eye.y, view->eye.z, view->unk_34.x, view->unk_34.y, view->unk_34.z, + view->unk_40.x, view->unk_40.y, view->unk_40.z); + + view->unk_A0 = *viewing; + + gSPMatrix(pLocal++, viewing, G_MTX_NOPUSH | G_MTX_MUL | G_MTX_PROJECTION); + } + view->unk_120 = 0; + *p = pLocal; + return 1; +} +#else #pragma GLOBAL_ASM("asm/non_matchings/code/z_view/func_800AB9EC.s") +#endif -#pragma GLOBAL_ASM("asm/non_matchings/code/z_view/func_800ABE74.s") +s32 func_800ABE74(f32 eyeX, f32 eyeY, f32 eyeZ) { + s32 errorCode = 0; + if ((eyeX * eyeX) + (eyeY * eyeY) + (eyeZ * eyeZ) > 1073676288.0f) { + errorCode = 3; + } else { + f32 absEyeX; + f32 absEyeY; + f32 absEyeZ; + absEyeX = ABS(eyeX); + absEyeY = ABS(eyeY); + absEyeZ = ABS(eyeZ); + if (((18900.0f < absEyeX) || (18900.0f < absEyeY)) || (18900.0f < absEyeZ)) { + errorCode = 2; + } else if (((16000.0f < absEyeX) || (16000.0f < absEyeY)) || (16000.0f < absEyeZ)) { + errorCode = 1; + } + } + if (errorCode != 0) { + osSyncPrintf(VT_FGCOL(RED)); + // Is too large + osSyncPrintf("eye が大きすぎます eye=[%8.3f %8.3f %8.3f] error=%d\n", eyeX, eyeY, eyeZ, errorCode); + osSyncPrintf(VT_RST); + } + return errorCode; +} diff --git a/src/code/z_vimode.c b/src/code/z_vimode.c index e15d619ac5..1fa3ba4521 100644 --- a/src/code/z_vimode.c +++ b/src/code/z_vimode.c @@ -16,4 +16,3 @@ #pragma GLOBAL_ASM("asm/non_matchings/code/z_vimode/func_800ACA98.s") #pragma GLOBAL_ASM("asm/non_matchings/code/z_vimode/func_800ACAF8.s") - diff --git a/src/code/z_vismono.c b/src/code/z_vismono.c index 75956af41a..239e81ce06 100644 --- a/src/code/z_vismono.c +++ b/src/code/z_vismono.c @@ -12,4 +12,3 @@ #pragma GLOBAL_ASM("asm/non_matchings/code/z_vismono/func_800AD5C0.s") #pragma GLOBAL_ASM("asm/non_matchings/code/z_vismono/func_800AD870.s") - diff --git a/src/code/z_vr_box.c b/src/code/z_vr_box.c index c468b4b299..8008c6aca7 100644 --- a/src/code/z_vr_box.c +++ b/src/code/z_vr_box.c @@ -12,4 +12,3 @@ #pragma GLOBAL_ASM("asm/non_matchings/code/z_vr_box/func_800AF218.s") #pragma GLOBAL_ASM("asm/non_matchings/code/z_vr_box/func_800B0E50.s") - diff --git a/src/code/z_vr_box_draw.c b/src/code/z_vr_box_draw.c index 6af1a46ea1..4161c46157 100644 --- a/src/code/z_vr_box_draw.c +++ b/src/code/z_vr_box_draw.c @@ -6,4 +6,3 @@ #pragma GLOBAL_ASM("asm/non_matchings/code/z_vr_box_draw/func_800B10C4.s") #pragma GLOBAL_ASM("asm/non_matchings/code/z_vr_box_draw/func_800B1744.s") - diff --git a/src/libultra_boot_O1/__osDequeueThread.c b/src/libultra_boot_O1/__osDequeueThread.c index 8c6e493f24..50b6aeeff8 100644 --- a/src/libultra_boot_O1/__osDequeueThread.c +++ b/src/libultra_boot_O1/__osDequeueThread.c @@ -1,19 +1,16 @@ #include -void __osDequeueThread(OSThread **queue, OSThread *thread) -{ - register OSThread **a2; - register OSThread *a3; +void __osDequeueThread(OSThread** queue, OSThread* thread) { + register OSThread** a2; + register OSThread* a3; a2 = queue; a3 = *a2; - while (a3 != NULL) - { - if (a3 == thread) - { + while (a3 != NULL) { + if (a3 == thread) { *a2 = thread->next; return; } a2 = &a3->next; a3 = *a2; } -} \ No newline at end of file +} diff --git a/src/libultra_boot_O1/__osGetHWIntrRoutine.c b/src/libultra_boot_O1/__osGetHWIntrRoutine.c index ae01749be1..a9b633adb4 100644 --- a/src/libultra_boot_O1/__osGetHWIntrRoutine.c +++ b/src/libultra_boot_O1/__osGetHWIntrRoutine.c @@ -1,7 +1,6 @@ #include -void __osGetHWIntrRoutine(s32 idx, OSMesgQueue** outQueue, OSMesg* outMsg) -{ +void __osGetHWIntrRoutine(s32 idx, OSMesgQueue** outQueue, OSMesg* outMsg) { *outQueue = __osHwIntTable[idx].queue; *outMsg = __osHwIntTable[idx].msg; } diff --git a/src/libultra_boot_O1/__osResetGlobalIntMask.c b/src/libultra_boot_O1/__osResetGlobalIntMask.c index b89026781f..9479289fb1 100644 --- a/src/libultra_boot_O1/__osResetGlobalIntMask.c +++ b/src/libultra_boot_O1/__osResetGlobalIntMask.c @@ -1,10 +1,9 @@ #include -void __osResetGlobalIntMask(u32 mask) -{ +void __osResetGlobalIntMask(u32 mask) { register s32 prevInt; prevInt = __osDisableInt(); __OSGlobalIntMask &= ~(mask & ~0x401); __osRestoreInt(prevInt); -} \ No newline at end of file +} diff --git a/src/libultra_boot_O1/__osSetGlobalIntMask.c b/src/libultra_boot_O1/__osSetGlobalIntMask.c index cccce7a842..15200ac55e 100644 --- a/src/libultra_boot_O1/__osSetGlobalIntMask.c +++ b/src/libultra_boot_O1/__osSetGlobalIntMask.c @@ -1,10 +1,9 @@ #include -void __osSetGlobalIntMask(u32 mask) -{ +void __osSetGlobalIntMask(u32 mask) { register s32 prevInt; prevInt = __osDisableInt(); __OSGlobalIntMask |= mask; __osRestoreInt(prevInt); -} \ No newline at end of file +} diff --git a/src/libultra_boot_O1/__osSetHWIntrRoutine.c b/src/libultra_boot_O1/__osSetHWIntrRoutine.c index a2def2038d..48f5a85dbb 100644 --- a/src/libultra_boot_O1/__osSetHWIntrRoutine.c +++ b/src/libultra_boot_O1/__osSetHWIntrRoutine.c @@ -1,7 +1,6 @@ #include -void __osSetHWIntrRoutine(s32 idx, OSMesgQueue* queue, OSMesg msg) -{ +void __osSetHWIntrRoutine(s32 idx, OSMesgQueue* queue, OSMesg msg) { register int prevInt; prevInt = __osDisableInt(); diff --git a/src/libultra_boot_O1/initialize.c b/src/libultra_boot_O1/initialize.c index f3f8117c71..903a9212aa 100644 --- a/src/libultra_boot_O1/initialize.c +++ b/src/libultra_boot_O1/initialize.c @@ -1,12 +1,11 @@ #include #include -typedef struct -{ - u32 ins_00; //lui k0, 0x8000 - u32 ins_04; //addiu k0, k0, 0x39e0 - u32 ins_08; //jr k0 ; __osException - u32 ins_0C; //nop +typedef struct { + u32 ins_00; // lui k0, 0x8000 + u32 ins_04; // addiu k0, k0, 0x39e0 + u32 ins_08; // jr k0 ; __osException + u32 ins_0C; // nop } struct_exceptionPreamble; u64 osClockRate = 62500000; @@ -16,14 +15,13 @@ u32 __OSGlobalIntMask = 0x003FFF01; u32 D_800145C0; -void __createSpeedParam(void) -{ +void __createSpeedParam(void) { __Dom1SpeedParam.type = DEVICE_TYPE_INIT; __Dom1SpeedParam.latency = HW_REG(PI_BSD_DOM1_LAT_REG, u32); __Dom1SpeedParam.pulse = HW_REG(PI_BSD_DOM1_PWD_REG, u32); __Dom1SpeedParam.pageSize = HW_REG(PI_BSD_DOM1_PGS_REG, u32); __Dom1SpeedParam.relDuration = HW_REG(PI_BSD_DOM1_RLS_REG, u32); - + __Dom2SpeedParam.type = DEVICE_TYPE_INIT; __Dom2SpeedParam.latency = HW_REG(PI_BSD_DOM2_LAT_REG, u32); __Dom2SpeedParam.pulse = HW_REG(PI_BSD_DOM2_PWD_REG, u32); @@ -31,25 +29,26 @@ void __createSpeedParam(void) __Dom2SpeedParam.relDuration = HW_REG(PI_BSD_DOM2_RLS_REG, u32); } -void __osInitialize_common(void) -{ +void __osInitialize_common(void) { u32 sp2C; D_800145C0 = 1; __osSetSR(__osGetSR() | 0x20000000); __osSetFpcCsr(0x1000800); __osSetWatchLo(0x4900000); - - while (__osSiRawReadIo((void*)0x1fc007fc, &sp2C)) - ; - while (__osSiRawWriteIo((void*)0x1fc007fc, sp2C | 8)) + while (__osSiRawReadIo((void*)0x1fc007fc, &sp2C)) { ; - - *(struct_exceptionPreamble*)0x80000000 = *(struct_exceptionPreamble*)__osExceptionPreamble; //TLB miss - *(struct_exceptionPreamble*)0x80000080 = *(struct_exceptionPreamble*)__osExceptionPreamble; //XTLB miss - *(struct_exceptionPreamble*)0x80000100 = *(struct_exceptionPreamble*)__osExceptionPreamble; //cache errors - *(struct_exceptionPreamble*)0x80000180 = *(struct_exceptionPreamble*)__osExceptionPreamble; //general exceptions + } + + while (__osSiRawWriteIo((void*)0x1fc007fc, sp2C | 8)) { + ; + } + + *(struct_exceptionPreamble*)0x80000000 = *(struct_exceptionPreamble*)__osExceptionPreamble; // TLB miss + *(struct_exceptionPreamble*)0x80000080 = *(struct_exceptionPreamble*)__osExceptionPreamble; // XTLB miss + *(struct_exceptionPreamble*)0x80000100 = *(struct_exceptionPreamble*)__osExceptionPreamble; // cache errors + *(struct_exceptionPreamble*)0x80000180 = *(struct_exceptionPreamble*)__osExceptionPreamble; // general exceptions osWritebackDCache(0x80000000, 0x190); osInvalICache(0x80000000, 0x190); @@ -59,25 +58,28 @@ void __osInitialize_common(void) osClockRate = (u64)((osClockRate * 3ll) / 4ull); - if (!osResetType) + if (!osResetType) { bzero(osAppNmiBuffer, 0x40); + } - if (osTvType == 0) + if (osTvType == 0) { osViClock = VI_PAL_CLOCK; - else if (osTvType == 2) + } else if (osTvType == 2) { osViClock = VI_MPAL_CLOCK; - else + } else { osViClock = VI_NTSC_CLOCK; + } - if (__osGetCause() & 0x1000) - while (true) + if (__osGetCause() & 0x1000) { + while (true) { ; + } + } HW_REG(AI_CONTROL_REG, u32) = 1; HW_REG(AI_DACRATE_REG, u32) = 0x3fff; HW_REG(AI_BITRATE_REG, u32) = 0xf; } -void __osInitialize_autodetect() -{ +void __osInitialize_autodetect() { } diff --git a/src/libultra_boot_O1/osCreateMesgQueue.c b/src/libultra_boot_O1/osCreateMesgQueue.c index 3f5ccb4b73..3282c16ffe 100644 --- a/src/libultra_boot_O1/osCreateMesgQueue.c +++ b/src/libultra_boot_O1/osCreateMesgQueue.c @@ -1,7 +1,6 @@ #include -void osCreateMesgQueue(OSMesgQueue* mq, OSMesg* msg, s32 count) -{ +void osCreateMesgQueue(OSMesgQueue* mq, OSMesg* msg, s32 count) { mq->mtqueue = __osThreadTail; mq->fullqueue = __osThreadTail; mq->validCount = 0; diff --git a/src/libultra_boot_O1/osCreateThread.c b/src/libultra_boot_O1/osCreateThread.c index d46cf33353..d62f0c2cc6 100644 --- a/src/libultra_boot_O1/osCreateThread.c +++ b/src/libultra_boot_O1/osCreateThread.c @@ -1,13 +1,12 @@ #include OSThread* __osThreadTail[2] = { NULL, (OSThread*)-1 }; -OSThread *__osRunQueue = __osThreadTail; -OSThread *__osActiveQueue = __osThreadTail; -OSThread *__osRunningThread = NULL; +OSThread* __osRunQueue = __osThreadTail; +OSThread* __osActiveQueue = __osThreadTail; +OSThread* __osRunningThread = NULL; OSThread* __osFaultedThread = NULL; -void osCreateThread(OSThread* thread, OSId id, void (*entry)(void*), void* arg, void* sp, OSPri pri) -{ +void osCreateThread(OSThread* thread, OSId id, void (*entry)(void*), void* arg, void* sp, OSPri pri) { register u32 s0; u32 t8; diff --git a/src/libultra_boot_O1/osDestroyThread.c b/src/libultra_boot_O1/osDestroyThread.c index d5ad074d18..5fa3186647 100644 --- a/src/libultra_boot_O1/osDestroyThread.c +++ b/src/libultra_boot_O1/osDestroyThread.c @@ -1,30 +1,27 @@ #include -void osDestroyThread(OSThread *thread) -{ +void osDestroyThread(OSThread* thread) { register s32 int_disabled; - - register OSThread *s1; - register OSThread *s2; + + register OSThread* s1; + register OSThread* s2; int_disabled = __osDisableInt(); - if (thread == NULL) + if (thread == NULL) { thread = __osRunningThread; - else if (thread->state != OS_STATE_STOPPED) + } else if (thread->state != OS_STATE_STOPPED) { __osDequeueThread(thread->queue, thread); + } - if (__osActiveQueue == thread) + if (__osActiveQueue == thread) { __osActiveQueue = __osActiveQueue->tlnext; - else - { + } else { s1 = __osActiveQueue; - while (s1->priority != -1) - { + while (s1->priority != -1) { s2 = s1->tlnext; - if (s2 == thread) - { + if (s2 == thread) { s1->tlnext = thread->tlnext; break; } @@ -32,8 +29,9 @@ void osDestroyThread(OSThread *thread) } } - if (thread == __osRunningThread) + if (thread == __osRunningThread) { __osDispatchThread(); + } __osRestoreInt(int_disabled); } diff --git a/src/libultra_boot_O1/osGetMemSize.c b/src/libultra_boot_O1/osGetMemSize.c index dba9d90f72..f1f175224a 100644 --- a/src/libultra_boot_O1/osGetMemSize.c +++ b/src/libultra_boot_O1/osGetMemSize.c @@ -2,8 +2,7 @@ #define STEP 0x100000 -u32 osGetMemSize(void) -{ +u32 osGetMemSize(void) { u32* ptr; u32 size; u32 data0; @@ -11,21 +10,21 @@ u32 osGetMemSize(void) size = 0x400000; - while(size < 0x800000) - { + while (size < 0x800000) { ptr = (u32*)(0xA0000000 + size); data0 = *ptr; - data1 = ptr[STEP/4-1]; + data1 = ptr[STEP / 4 - 1]; *ptr ^= ~0; - ptr[STEP/4-1] ^= ~0; + ptr[STEP / 4 - 1] ^= ~0; - if ((*ptr != (data0 ^ ~0)) || (ptr[STEP/4-1] != (data1 ^ ~0))) + if ((*ptr != (data0 ^ ~0)) || (ptr[STEP / 4 - 1] != (data1 ^ ~0))) { return size; + } *ptr = data0; - ptr[STEP/4-1] = data1; + ptr[STEP / 4 - 1] = data1; size += STEP; } diff --git a/src/libultra_boot_O1/osGetThreadId.c b/src/libultra_boot_O1/osGetThreadId.c index 9a0ca9dce8..5c2dd5d092 100644 --- a/src/libultra_boot_O1/osGetThreadId.c +++ b/src/libultra_boot_O1/osGetThreadId.c @@ -1,9 +1,9 @@ #include -OSId osGetThreadId(OSThread* thread) -{ - if (thread == NULL) +OSId osGetThreadId(OSThread* thread) { + if (thread == NULL) { thread = __osRunningThread; + } return thread->id; } diff --git a/src/libultra_boot_O1/osGetThreadPri.c b/src/libultra_boot_O1/osGetThreadPri.c index 4d8f97f6e7..d6a7c91607 100644 --- a/src/libultra_boot_O1/osGetThreadPri.c +++ b/src/libultra_boot_O1/osGetThreadPri.c @@ -1,9 +1,9 @@ #include -OSPri osGetThreadPri(OSThread* thread) -{ - if (thread == NULL) +OSPri osGetThreadPri(OSThread* thread) { + if (thread == NULL) { thread = __osRunningThread; + } return thread->priority; } diff --git a/src/libultra_boot_O1/osGetTime.c b/src/libultra_boot_O1/osGetTime.c index a2fd07510e..9cf6e53079 100644 --- a/src/libultra_boot_O1/osGetTime.c +++ b/src/libultra_boot_O1/osGetTime.c @@ -1,7 +1,6 @@ #include -OSTime osGetTime(void) -{ +OSTime osGetTime(void) { u32 sp34; u32 sp30; u64 t1; diff --git a/src/libultra_boot_O1/osJamMesg.c b/src/libultra_boot_O1/osJamMesg.c index 47c7390a89..87c49979d2 100644 --- a/src/libultra_boot_O1/osJamMesg.c +++ b/src/libultra_boot_O1/osJamMesg.c @@ -1,6 +1,6 @@ #include -s32 osJamMesg(OSMesgQueue *mq, OSMesg msg, s32 flag) { +s32 osJamMesg(OSMesgQueue* mq, OSMesg msg, s32 flag) { register s32 int_disabled; int_disabled = __osDisableInt(); while (mq->validCount >= mq->msgCount) { diff --git a/src/libultra_boot_O1/osRecvMesg.c b/src/libultra_boot_O1/osRecvMesg.c index 7f78cbd27f..f49716cd63 100644 --- a/src/libultra_boot_O1/osRecvMesg.c +++ b/src/libultra_boot_O1/osRecvMesg.c @@ -1,13 +1,10 @@ #include -s32 osRecvMesg(OSMesgQueue* mq, OSMesg* msg, s32 flag) -{ +s32 osRecvMesg(OSMesgQueue* mq, OSMesg* msg, s32 flag) { register s32 s0 = __osDisableInt(); - while (mq->validCount == 0) - { - if (flag == OS_MESG_NOBLOCK) - { + while (mq->validCount == 0) { + if (flag == OS_MESG_NOBLOCK) { __osRestoreInt(s0); return -1; } @@ -15,14 +12,16 @@ s32 osRecvMesg(OSMesgQueue* mq, OSMesg* msg, s32 flag) __osEnqueueAndYield(mq); } - if (msg != NULL) + if (msg != NULL) { *msg = mq->msg[mq->first]; + } mq->first = (mq->first + 1) % mq->msgCount; mq->validCount--; - if (mq->fullqueue->next != NULL) + if (mq->fullqueue->next != NULL) { osStartThread(__osPopThread(&mq->fullqueue)); + } __osRestoreInt(s0); diff --git a/src/libultra_boot_O1/osSendMesg.c b/src/libultra_boot_O1/osSendMesg.c index 0355f08ff4..53b9147546 100644 --- a/src/libultra_boot_O1/osSendMesg.c +++ b/src/libultra_boot_O1/osSendMesg.c @@ -1,19 +1,14 @@ #include -s32 osSendMesg(OSMesgQueue* mq, OSMesg mesg, s32 flag) -{ +s32 osSendMesg(OSMesgQueue* mq, OSMesg mesg, s32 flag) { register u32 s0 = __osDisableInt(); register u32 index; - while (mq->validCount >= mq->msgCount) - { - if (flag == OS_MESG_BLOCK) - { + while (mq->validCount >= mq->msgCount) { + if (flag == OS_MESG_BLOCK) { __osRunningThread->state = 8; __osEnqueueAndYield(&mq->fullqueue); - } - else - { + } else { __osRestoreInt(s0); return -1; } @@ -23,8 +18,9 @@ s32 osSendMesg(OSMesgQueue* mq, OSMesg mesg, s32 flag) mq->msg[index] = mesg; mq->validCount++; - if (mq->mtqueue->next != NULL) + if (mq->mtqueue->next != NULL) { osStartThread(__osPopThread(&mq->mtqueue)); + } __osRestoreInt(s0); diff --git a/src/libultra_boot_O1/osSetEventMesg.c b/src/libultra_boot_O1/osSetEventMesg.c index a40a50a2e3..97123969de 100644 --- a/src/libultra_boot_O1/osSetEventMesg.c +++ b/src/libultra_boot_O1/osSetEventMesg.c @@ -4,23 +4,21 @@ __OSEventState __osEventStateTab[16]; u32 __osPreNMI = 0; -void osSetEventMesg(OSEvent e, OSMesgQueue *mq, OSMesg msg) -{ +void osSetEventMesg(OSEvent e, OSMesgQueue* mq, OSMesg msg) { register u32 int_disabled; - __OSEventState *msgs; - + __OSEventState* msgs; + int_disabled = __osDisableInt(); msgs = __osEventStateTab + e; msgs->queue = mq; msgs->msg = msg; - if (e == OS_EVENT_PRENMI) - { - if (__osShutdown && !__osPreNMI) + if (e == OS_EVENT_PRENMI) { + if (__osShutdown && !__osPreNMI) { osSendMesg(mq, msg, 0); + } __osPreNMI = true; } __osRestoreInt(int_disabled); - } diff --git a/src/libultra_boot_O1/osSetThreadPri.c b/src/libultra_boot_O1/osSetThreadPri.c index 158eb3a63e..483488e507 100644 --- a/src/libultra_boot_O1/osSetThreadPri.c +++ b/src/libultra_boot_O1/osSetThreadPri.c @@ -1,22 +1,19 @@ #include -void osSetThreadPri(OSThread* thread, OSPri pri) -{ +void osSetThreadPri(OSThread* thread, OSPri pri) { register u32 s0 = __osDisableInt(); - if (thread == NULL) + if (thread == NULL) { thread = __osRunningThread; + } - if (thread->priority != pri) - { + if (thread->priority != pri) { thread->priority = pri; - if (thread != __osRunningThread && thread->state != 1) - { + if (thread != __osRunningThread && thread->state != 1) { __osDequeueThread(thread->queue, thread); __osEnqueueThread(thread->queue, thread); } - if (__osRunningThread->priority < __osRunQueue->priority) - { + if (__osRunningThread->priority < __osRunQueue->priority) { __osRunningThread->state = 2; __osEnqueueAndYield(&__osRunQueue); } diff --git a/src/libultra_boot_O1/osStartThread.c b/src/libultra_boot_O1/osStartThread.c index bbb514e3e4..f64fa902d9 100644 --- a/src/libultra_boot_O1/osStartThread.c +++ b/src/libultra_boot_O1/osStartThread.c @@ -1,38 +1,29 @@ #include -void osStartThread(OSThread* thread) -{ +void osStartThread(OSThread* thread) { register u32 s0 = __osDisableInt(); - switch (thread->state) - { - case 8: - thread->state = 2; - __osEnqueueThread(&__osRunQueue, thread); - break; - case 1: - if (thread->queue == NULL || thread->queue == &__osRunQueue) - { + switch (thread->state) { + case 8: thread->state = 2; __osEnqueueThread(&__osRunQueue, thread); - } - else - { - thread->state = 8; - __osEnqueueThread(thread->queue, thread); - __osEnqueueThread(&__osRunQueue, __osPopThread(thread->queue)); - } - break; + break; + case 1: + if (thread->queue == NULL || thread->queue == &__osRunQueue) { + thread->state = 2; + __osEnqueueThread(&__osRunQueue, thread); + } else { + thread->state = 8; + __osEnqueueThread(thread->queue, thread); + __osEnqueueThread(&__osRunQueue, __osPopThread(thread->queue)); + } + break; } - if (__osRunningThread == NULL) - { + if (__osRunningThread == NULL) { __osDispatchThread(); - } - else - { - if (__osRunningThread->priority < __osRunQueue->priority) - { + } else { + if (__osRunningThread->priority < __osRunQueue->priority) { __osRunningThread->state = 2; __osEnqueueAndYield(&__osRunQueue); } diff --git a/src/libultra_boot_O1/osStopThread.c b/src/libultra_boot_O1/osStopThread.c index 4f3ecd905b..4d5db6afde 100644 --- a/src/libultra_boot_O1/osStopThread.c +++ b/src/libultra_boot_O1/osStopThread.c @@ -1,26 +1,25 @@ #include -void osStopThread(OSThread* thread) -{ +void osStopThread(OSThread* thread) { register u32 s0 = __osDisableInt(); register u32 state; - if (thread == NULL) + if (thread == NULL) { state = 4; - else + } else { state = thread->state; + } - switch (state) - { - case 4: - __osRunningThread->state = 1; - __osEnqueueAndYield(NULL); - break; - case 2: - case 8: - thread->state = 1; - __osDequeueThread(thread->queue, thread); - break; + switch (state) { + case 4: + __osRunningThread->state = 1; + __osEnqueueAndYield(NULL); + break; + case 2: + case 8: + thread->state = 1; + __osDequeueThread(thread->queue, thread); + break; } __osRestoreInt(s0); diff --git a/src/libultra_boot_O1/osViExtendVStart.c b/src/libultra_boot_O1/osViExtendVStart.c index 3180311ad7..8a09b2ae9d 100644 --- a/src/libultra_boot_O1/osViExtendVStart.c +++ b/src/libultra_boot_O1/osViExtendVStart.c @@ -1,6 +1,5 @@ #include -void osViExtendVStart(u32 arg0) -{ +void osViExtendVStart(u32 arg0) { __additional_scanline = arg0; } diff --git a/src/libultra_boot_O1/osViModePalLan1.c b/src/libultra_boot_O1/osViModePalLan1.c index c516be9a29..47c6c915eb 100644 --- a/src/libultra_boot_O1/osViModePalLan1.c +++ b/src/libultra_boot_O1/osViModePalLan1.c @@ -1,33 +1,32 @@ #include -OSViMode osViModePalLan1 = -{ - 0x10, //type - { //comRegs - 0x311E, //ctrl - 0x140, //width - 0x4541E3A, //burst - 0x271, //vSync - 0x170C69, //hSync - 0xC6F0C6D, //leap - 0x800300, //hStart - 0x200, //xScale - 0 //vCurrent +OSViMode osViModePalLan1 = { + 0x10, // type + { + // comRegs + 0x311E, // ctrl + 0x140, // width + 0x4541E3A, // burst + 0x271, // vSync + 0x170C69, // hSync + 0xC6F0C6D, // leap + 0x800300, // hStart + 0x200, // xScale + 0 // vCurrent }, - { //fldRegs - { - 0x280, //origin - 0x400, //yScale - 0x5F0239, //vStart - 0x9026B, //vBurst - 2, //vIntr - }, - { - 0x280, //origin - 0x400, //yScale - 0x5F0239, //vStart - 0x9026B, //vBurst - 2 //vIntr - } - } + { // fldRegs + { + 0x280, // origin + 0x400, // yScale + 0x5F0239, // vStart + 0x9026B, // vBurst + 2, // vIntr + }, + { + 0x280, // origin + 0x400, // yScale + 0x5F0239, // vStart + 0x9026B, // vBurst + 2 // vIntr + } }, }; diff --git a/src/libultra_boot_O1/osVirtualToPhysical.c b/src/libultra_boot_O1/osVirtualToPhysical.c index e6d65f3a72..b7c118b4bc 100644 --- a/src/libultra_boot_O1/osVirtualToPhysical.c +++ b/src/libultra_boot_O1/osVirtualToPhysical.c @@ -1,12 +1,13 @@ #include -u32 osVirtualToPhysical(void* vaddr) -{ - if ((u32)vaddr >= 0x80000000 && (u32)vaddr < 0xA0000000) +u32 osVirtualToPhysical(void* vaddr) { + if ((u32)vaddr >= 0x80000000 && (u32)vaddr < 0xA0000000) { return (u32)vaddr & 0x1FFFFFFF; + } - if ((u32)vaddr >= 0xA0000000 && (u32)vaddr < 0xC0000000) + if ((u32)vaddr >= 0xA0000000 && (u32)vaddr < 0xC0000000) { return (u32)vaddr & 0x1FFFFFFF; + } return __osProbeTLB(vaddr); } diff --git a/src/libultra_boot_O1/osYieldThread.c b/src/libultra_boot_O1/osYieldThread.c index 7ed1597790..e289cc9731 100644 --- a/src/libultra_boot_O1/osYieldThread.c +++ b/src/libultra_boot_O1/osYieldThread.c @@ -1,7 +1,6 @@ #include -void osYieldThread() -{ +void osYieldThread() { register u32 prevInt; prevInt = __osDisableInt(); diff --git a/src/libultra_boot_O1/piacs.c b/src/libultra_boot_O1/piacs.c index ab1db132a0..e48cfbcc0b 100644 --- a/src/libultra_boot_O1/piacs.c +++ b/src/libultra_boot_O1/piacs.c @@ -5,24 +5,22 @@ u32 __osPiAccessQueueEnabled = 0; OSMesg piAccessBuf; OSMesgQueue __osPiAccessQueue; -void __osPiCreateAccessQueue(void) -{ +void __osPiCreateAccessQueue(void) { __osPiAccessQueueEnabled = 1; osCreateMesgQueue(&__osPiAccessQueue, &piAccessBuf, 1); osSendMesg(&__osPiAccessQueue, NULL, OS_MESG_NOBLOCK); } -void __osPiGetAccess(void) -{ +void __osPiGetAccess(void) { OSMesg mesg; - if (!__osPiAccessQueueEnabled) + if (!__osPiAccessQueueEnabled) { __osPiCreateAccessQueue(); + } osRecvMesg(&__osPiAccessQueue, &mesg, OS_MESG_BLOCK); } -void __osPiRelAccess(void) -{ +void __osPiRelAccess(void) { osSendMesg(&__osPiAccessQueue, 0, OS_MESG_NOBLOCK); } diff --git a/src/libultra_boot_O1/timerintr.c b/src/libultra_boot_O1/timerintr.c index 020dc31324..83c882a3b2 100644 --- a/src/libultra_boot_O1/timerintr.c +++ b/src/libultra_boot_O1/timerintr.c @@ -7,8 +7,7 @@ u32 __osViIntrCount; u32 __osTimerCounter; OSTimer* __osTimerList = &__osBaseTimer; -void __osTimerServicesInit() -{ +void __osTimerServicesInit() { __osCurrentTime = 0; __osBaseCounter = 0; __osViIntrCount = 0; @@ -20,9 +19,8 @@ void __osTimerServicesInit() __osTimerList->msg = NULL; } -void __osTimerInterrupt() -{ - OSTimer *sp24; +void __osTimerInterrupt() { + OSTimer* sp24; u32 sp20; u32 sp1c; if (__osTimerList->next == __osTimerList) { @@ -58,13 +56,13 @@ void __osTimerInterrupt() } } -void __osSetTimerIntr(OSTime tim) -{ +void __osSetTimerIntr(OSTime tim) { OSTime NewTime; u32 savedMask; - if (tim < 468) + if (tim < 468) { tim = 468; + } savedMask = __osDisableInt(); @@ -74,9 +72,8 @@ void __osSetTimerIntr(OSTime tim) __osRestoreInt(savedMask); } -OSTime __osInsertTimer(OSTimer *a0) -{ - OSTimer *sp34; +OSTime __osInsertTimer(OSTimer* a0) { + OSTimer* sp34; u64 sp28; s32 intDisabled; intDisabled = __osDisableInt(); diff --git a/src/libultra_boot_O2/_Ldtob.c b/src/libultra_boot_O2/_Ldtob.c index 4a72dfd337..57a49cc8cc 100644 --- a/src/libultra_boot_O2/_Ldtob.c +++ b/src/libultra_boot_O2/_Ldtob.c @@ -5,8 +5,8 @@ #define BUFF_LEN 0x20 -s16 _Ldunscale(s16 *, _Pft *); -void _Genld(_Pft *, u8, u8 *, s16, s16); +s16 _Ldunscale(s16*, _Pft*); +void _Genld(_Pft*, u8, u8*, s16, s16); const double D_800122E0[] = { 10e0L, 10e1L, 10e3L, 10e7L, 10e15L, 10e31L, 10e63L, 10e127L, 10e255L }; @@ -43,9 +43,9 @@ const double D_800122E0[] = { 10e0L, 10e1L, 10e3L, 10e7L, 10e15L, 10e31L, 10e63L #define _D3 3 #endif -void _Ldtob(_Pft *args, u8 type) { +void _Ldtob(_Pft* args, u8 type) { u8 buff[BUFF_LEN]; - u8 *ptr; + u8* ptr; u32 sp70; f64 val; /* maybe struct? */ @@ -159,9 +159,9 @@ void _Ldtob(_Pft *args, u8 type) { _Genld((_Pft*)args, type, ptr, nsig, exp); } -s16 _Ldunscale(s16 *pex, _Pft *px) { +s16 _Ldunscale(s16* pex, _Pft* px) { - unsigned short *ps = (unsigned short *) px; + unsigned short* ps = (unsigned short*)px; short xchar = (ps[_D0] & _DMASK) >> _DOFF; if (xchar == _DMAX) { /* NaN or INF */ *pex = 0; @@ -179,16 +179,15 @@ s16 _Ldunscale(s16 *pex, _Pft *px) { } } -void _Genld(_Pft *px, u8 code, u8 *p, s16 nsig, s16 xexp) { +void _Genld(_Pft* px, u8 code, u8* p, s16 nsig, s16 xexp) { u8 point = '.'; if (nsig <= 0) { nsig = 1, - p = (u8 *) "0"; + p = (u8*)"0"; } - if (code == 'f' - || ((code == 'g' || code == 'G') && (-4 <= xexp) && (xexp < px->prec))) { /* 'f' format */ + if (code == 'f' || ((code == 'g' || code == 'G') && (-4 <= xexp) && (xexp < px->prec))) { /* 'f' format */ ++xexp; /* change to leading digit count */ if (code != 'f') { /* fixup for 'g' */ if (!(px->flags & FLAGS_HASH) && nsig < px->prec) { @@ -257,7 +256,7 @@ void _Genld(_Pft *px, u8 code, u8 *p, s16 nsig, s16 xexp) { px->n1 += nsig; px->nz1 = px->prec - nsig; } - p = (u8 *) &px->s[px->n1]; /* put exponent */ + p = (u8*)&px->s[px->n1]; /* put exponent */ *p++ = code; if (0 <= xexp) { *p++ = '+'; @@ -273,11 +272,10 @@ void _Genld(_Pft *px, u8 code, u8 *p, s16 nsig, s16 xexp) { } *p++ = xexp / 10 + '0', xexp %= 10; *p++ = xexp + '0'; - px->n2 = p - (u8 *) &px->s[px->n1]; + px->n2 = p - (u8*)&px->s[px->n1]; } if ((px->flags & (FLAGS_ZERO | FLAGS_MINUS)) == FLAGS_ZERO) { /* pad with leading zeros */ - int n = - px->n0 + px->n1 + px->nz1 + px->n2 + px->nz2; + int n = px->n0 + px->n1 + px->nz1 + px->n2 + px->nz2; if (n < px->width) { px->nz0 = px->width - n; diff --git a/src/libultra_boot_O2/_Litob.c b/src/libultra_boot_O2/_Litob.c index 15206217c6..5b2329cd34 100644 --- a/src/libultra_boot_O2/_Litob.c +++ b/src/libultra_boot_O2/_Litob.c @@ -8,28 +8,31 @@ u8 D_8000AF70[] = "0123456789abcdef"; u8 D_8000AF84[] = "0123456789ABCDEF"; -void _Litob(_Pft *args, u8 type) { +void _Litob(_Pft* args, u8 type) { u8 buff[BUFF_LEN]; - const u8 *num_map; + const u8* num_map; s32 base; s32 buff_ind; u64 num; lldiv_t quotrem; - if (type == 'X') + if (type == 'X') { num_map = D_8000AF84; - else + } else { num_map = D_8000AF70; + } base = (type == 'o') ? 8 : ((type != 'x' && type != 'X') ? 10 : 16); buff_ind = BUFF_LEN; num = args->v.ll; - if ((type == 'd' || type == 'i') && args->v.ll < 0) + if ((type == 'd' || type == 'i') && args->v.ll < 0) { num = -num; + } - if (num != 0 || args->prec != 0) + if (num != 0 || args->prec != 0) { buff[--buff_ind] = num_map[num % base]; + } args->v.ll = num / base; @@ -43,12 +46,14 @@ void _Litob(_Pft *args, u8 type) { memcpy(args->s, buff + buff_ind, args->n1); - if (args->n1 < args->prec) + if (args->n1 < args->prec) { args->nz0 = args->prec - args->n1; + } if (args->prec < 0 && (args->flags & (FLAGS_ZERO | FLAGS_MINUS)) == FLAGS_ZERO) { buff_ind = args->width - args->n0 - args->nz0 - args->n1; - if (buff_ind > 0) + if (buff_ind > 0) { args->nz0 += buff_ind; + } } } diff --git a/src/libultra_boot_O2/_Printf.c b/src/libultra_boot_O2/_Printf.c index cbb803bbdc..a5f922d562 100644 --- a/src/libultra_boot_O2/_Printf.c +++ b/src/libultra_boot_O2/_Printf.c @@ -3,38 +3,37 @@ #include #include -#define ATOI(i, a) \ - for (i = 0; *a >= '0' && *a <= '9'; a++) \ - if (i < 999) \ +#define ATOI(i, a) \ + for (i = 0; *a >= '0' && *a <= '9'; a++) \ + if (i < 999) \ i = *a + i * 10 - '0'; -#define _PROUT(fmt, _size) \ - if (_size > 0) { \ - arg = (void*)pfn(arg, fmt, _size); \ - if (arg != 0) \ - x.nchar += _size; \ - else \ - return x.nchar; \ +#define _PROUT(fmt, _size) \ + if (_size > 0) { \ + arg = (void*)pfn(arg, fmt, _size); \ + if (arg != 0) \ + x.nchar += _size; \ + else \ + return x.nchar; \ } -#define _PAD(m, src, extracond) \ - if (extracond && m > 0) { \ - int i; \ - int j; \ - for (j = m; j > 0; j -= i) { \ - if ((u32) j > 32) \ - i = 32; \ - else \ - i = j; \ - _PROUT(src, i); \ - } \ +#define _PAD(m, src, extracond) \ + if (extracond && m > 0) { \ + int i; \ + int j; \ + for (j = m; j > 0; j -= i) { \ + if ((u32)j > 32) \ + i = 32; \ + else \ + i = j; \ + _PROUT(src, i); \ + } \ } char spaces[] = " "; char zeroes[] = "00000000000000000000000000000000"; -void _Putfld(_Pft *, va_list *, u8, u8 *); +void _Putfld(_Pft*, va_list*, u8, u8*); -s32 _Printf(char *(*pfn)(char *, const char *, size_t), char *arg, const char *fmt, va_list ap) -{ +s32 _Printf(char* (*pfn)(char*, const char*, size_t), char* arg, const char* fmt, va_list ap) { _Pft x; x.nchar = 0; while (1) { @@ -47,15 +46,15 @@ s32 _Printf(char *(*pfn)(char *, const char *, size_t), char *arg, const char *f u8 ac[0x20]; - s = (u8 *)fmt; + s = (u8*)fmt; while ((c = *s) != 0 && c != '%') { s++; } - _PROUT(fmt, s - (u8 *)fmt); + _PROUT(fmt, s - (u8*)fmt); if (c == 0) { return x.nchar; } - fmt = (char *) ++s; + fmt = (char*)++s; x.flags = 0; for (; (t = strchr(fchar, *s)) != NULL; s++) { x.flags |= fbit[t - fchar]; @@ -92,23 +91,21 @@ s32 _Printf(char *(*pfn)(char *, const char *, size_t), char *arg, const char *f s++; } _Putfld(&x, &ap, *s, ac); - x.width -= x.n0 + x.nz0 + x.n1 + x.nz1 - + x.n2 + x.nz2; + x.width -= x.n0 + x.nz0 + x.n1 + x.nz1 + x.n2 + x.nz2; _PAD(x.width, spaces, !(x.flags & FLAGS_MINUS)); - _PROUT((char *) ac, x.n0); + _PROUT((char*)ac, x.n0); _PAD(x.nz0, zeroes, 1); _PROUT(x.s, x.n1); _PAD(x.nz1, zeroes, 1); - _PROUT((char *) (&x.s[x.n1]), x.n2) + _PROUT((char*)(&x.s[x.n1]), x.n2) _PAD(x.nz2, zeroes, 1); _PAD(x.width, spaces, x.flags & FLAGS_MINUS); - fmt = (char *) s + 1; + fmt = (char*)s + 1; } } void _Putfld(_Pft* px, va_list* pap, u8 code, u8* ac) { - px->n0 = px->nz0 = px->n1 = px->nz1 = px->n2 = - px->nz2 = 0; + px->n0 = px->nz0 = px->n1 = px->nz1 = px->n2 = px->nz2 = 0; switch (code) { @@ -127,7 +124,7 @@ void _Putfld(_Pft* px, va_list* pap, u8 code, u8* ac) { } if (px->qual == 'h') { - px->v.ll = (s16) px->v.ll; + px->v.ll = (s16)px->v.ll; } if (px->v.ll < 0) { @@ -138,7 +135,7 @@ void _Putfld(_Pft* px, va_list* pap, u8 code, u8* ac) { ac[px->n0++] = ' '; } - px->s = (char *) &ac[px->n0]; + px->s = (char*)&ac[px->n0]; _Litob(px, code); break; @@ -156,9 +153,9 @@ void _Putfld(_Pft* px, va_list* pap, u8 code, u8* ac) { } if (px->qual == 'h') { - px->v.ll = (u16) px->v.ll; + px->v.ll = (u16)px->v.ll; } else if (px->qual == 0) { - px->v.ll = (u32) px->v.ll; + px->v.ll = (u32)px->v.ll; } if (px->flags & FLAGS_HASH) { @@ -168,7 +165,7 @@ void _Putfld(_Pft* px, va_list* pap, u8 code, u8* ac) { ac[px->n0++] = code; } } - px->s = (char *) &ac[px->n0]; + px->s = (char*)&ac[px->n0]; _Litob(px, code); break; @@ -189,30 +186,30 @@ void _Putfld(_Pft* px, va_list* pap, u8 code, u8* ac) { } } - px->s = (char *) &ac[px->n0]; + px->s = (char*)&ac[px->n0]; _Ldtob(px, code); break; case 'n': if (px->qual == 'h') { - *(va_arg(*pap, u16 *)) = px->nchar; + *(va_arg(*pap, u16*)) = px->nchar; } else if (px->qual == 'l') { - *va_arg(*pap, u32 *) = px->nchar; + *va_arg(*pap, u32*) = px->nchar; } else if (px->qual == 'L') { - *va_arg(*pap, u64 *) = px->nchar; + *va_arg(*pap, u64*) = px->nchar; } else { - *va_arg(*pap, u32 *) = px->nchar; + *va_arg(*pap, u32*) = px->nchar; } break; case 'p': - px->v.ll = (long) va_arg(*pap, void *); - px->s = (char *) &ac[px->n0]; + px->v.ll = (long)va_arg(*pap, void*); + px->s = (char*)&ac[px->n0]; _Litob(px, 'x'); break; case 's': - px->s = va_arg(*pap, char *); + px->s = va_arg(*pap, char*); px->n1 = strlen(px->s); if (px->prec >= 0 && px->n1 > px->prec) { px->n1 = px->prec; @@ -227,4 +224,4 @@ void _Putfld(_Pft* px, va_list* pap, u8 code, u8* ac) { ac[px->n0++] = code; break; } -} \ No newline at end of file +} diff --git a/src/libultra_boot_O2/__osDevMgrMain.c b/src/libultra_boot_O2/__osDevMgrMain.c index b3d8cd971d..9065b903c0 100644 --- a/src/libultra_boot_O2/__osDevMgrMain.c +++ b/src/libultra_boot_O2/__osDevMgrMain.c @@ -1,8 +1,7 @@ #include #include -void __osDevMgrMain(void* arg) -{ +void __osDevMgrMain(void* arg) { OSIoMesg* ioMesg; OSMesg sp70; OSMesg sp6C; @@ -16,17 +15,16 @@ void __osDevMgrMain(void* arg) arg0 = (OSMgrArgs*)arg; ioMesg = NULL; - while (true) - { + while (true) { osRecvMesg(arg0->cmdQueue, (OSMesg)&ioMesg, OS_MESG_BLOCK); - if ((ioMesg->piHandle != NULL) && (ioMesg->piHandle->type == DEVICE_TYPE_64DD) && - ((ioMesg->piHandle->transferInfo.cmdType == 0) || (ioMesg->piHandle->transferInfo.cmdType == 1))) - { + if ((ioMesg->piHandle != NULL) && (ioMesg->piHandle->type == DEVICE_TYPE_64DD) && + ((ioMesg->piHandle->transferInfo.cmdType == 0) || (ioMesg->piHandle->transferInfo.cmdType == 1))) { transfer = &ioMesg->piHandle->transferInfo; block = &transfer->block[transfer->blockNum]; transfer->sectorNum = -1; - if (transfer->transferMode != 3) + if (transfer->transferMode != 3) { block->dramAddr = (void*)((u32)block->dramAddr - block->sectorSize); + } phi_s2 = ((transfer->transferMode == 2) && (ioMesg->piHandle->transferInfo.cmdType == 0)) ? 1 : 0; @@ -34,38 +32,36 @@ void __osDevMgrMain(void* arg) __osResetGlobalIntMask(0x00100401); __osEPiRawWriteIo(ioMesg->piHandle, 0x05000510, transfer->bmCtlShadow | 0x80000000); - while (true) - { + while (true) { osRecvMesg(arg0->eventQueue, &sp70, OS_MESG_BLOCK); transfer = &ioMesg->piHandle->transferInfo; block = &transfer->block[transfer->blockNum]; - if (block->errStatus == 0x1D) - { + if (block->errStatus == 0x1D) { __osEPiRawWriteIo(ioMesg->piHandle, 0x05000510, transfer->bmCtlShadow | 0x10000000); __osEPiRawWriteIo(ioMesg->piHandle, 0x05000510, transfer->bmCtlShadow); __osEPiRawReadIo(ioMesg->piHandle, 0x05000508, &sp54); - if (sp54 & 0x02000000) + if (sp54 & 0x02000000) { __osEPiRawWriteIo(ioMesg->piHandle, 0x05000510, transfer->bmCtlShadow | 0x1000000); + } block->errStatus = 4; HW_REG(PI_STATUS_REG, u32) = PI_STATUS_CLEAR_INTR; __osSetGlobalIntMask(0x00100C01); } osSendMesg(ioMesg->hdr.retQueue, ioMesg, OS_MESG_NOBLOCK); - if ((phi_s2 != 1) || (ioMesg->piHandle->transferInfo.block[0].errStatus != 0)) + if ((phi_s2 != 1) || (ioMesg->piHandle->transferInfo.block[0].errStatus != 0)) { break; + } phi_s2 = 0; } osSendMesg(arg0->acccessQueue, 0, OS_MESG_NOBLOCK); - if (ioMesg->piHandle->transferInfo.blockNum == 1) + if (ioMesg->piHandle->transferInfo.blockNum == 1) { osYieldThread(); - } - else - { - switch (ioMesg->hdr.type) - { + } + } else { + switch (ioMesg->hdr.type) { case 11: osRecvMesg(arg0->acccessQueue, &sp6C, OS_MESG_BLOCK); phi_s0 = arg0->piDmaCallback(OS_READ, ioMesg->devAddr, ioMesg->dramAddr, ioMesg->size); @@ -76,11 +72,13 @@ void __osDevMgrMain(void* arg) break; case 15: osRecvMesg(arg0->acccessQueue, &sp6C, OS_MESG_BLOCK); - phi_s0 = arg0->epiDmaCallback(ioMesg->piHandle, OS_READ, ioMesg->devAddr, ioMesg->dramAddr, ioMesg->size); + phi_s0 = arg0->epiDmaCallback(ioMesg->piHandle, OS_READ, ioMesg->devAddr, ioMesg->dramAddr, + ioMesg->size); break; case 16: osRecvMesg(arg0->acccessQueue, &sp6C, OS_MESG_BLOCK); - phi_s0 = arg0->epiDmaCallback(ioMesg->piHandle, OS_WRITE, ioMesg->devAddr, ioMesg->dramAddr, ioMesg->size); + phi_s0 = arg0->epiDmaCallback(ioMesg->piHandle, OS_WRITE, ioMesg->devAddr, ioMesg->dramAddr, + ioMesg->size); break; case 10: osSendMesg(ioMesg->hdr.retQueue, ioMesg, OS_MESG_NOBLOCK); @@ -91,8 +89,7 @@ void __osDevMgrMain(void* arg) break; } - if (phi_s0 == 0) - { + if (phi_s0 == 0) { osRecvMesg(arg0->eventQueue, &sp70, OS_MESG_BLOCK); osSendMesg(ioMesg->hdr.retQueue, ioMesg, OS_MESG_NOBLOCK); osSendMesg(arg0->acccessQueue, NULL, OS_MESG_NOBLOCK); diff --git a/src/libultra_boot_O2/__osEPiRawReadIo.c b/src/libultra_boot_O2/__osEPiRawReadIo.c index d448810157..b1e9b88d00 100644 --- a/src/libultra_boot_O2/__osEPiRawReadIo.c +++ b/src/libultra_boot_O2/__osEPiRawReadIo.c @@ -1,45 +1,49 @@ #include #include -s32 __osEPiRawReadIo(OSPiHandle* handle, u32 devAddr, u32* data) -{ +s32 __osEPiRawReadIo(OSPiHandle* handle, u32 devAddr, u32* data) { s32 status; OSPiHandle* curHandle; - while (status = HW_REG(PI_STATUS_REG, u32), status & (PI_STATUS_BUSY | PI_STATUS_IOBUSY | PI_STATUS_ERROR)) + while (status = HW_REG(PI_STATUS_REG, u32), status & (PI_STATUS_BUSY | PI_STATUS_IOBUSY | PI_STATUS_ERROR)) { ; + } - if (__osCurrentHandle[handle->domain]->type != handle->type) - { + if (__osCurrentHandle[handle->domain]->type != handle->type) { curHandle = __osCurrentHandle[handle->domain]; - if (handle->domain == 0) - { - if (curHandle->latency != handle->latency) + if (handle->domain == 0) { + if (curHandle->latency != handle->latency) { HW_REG(PI_BSD_DOM1_LAT_REG, u32) = handle->latency; + } - if (curHandle->pageSize != handle->pageSize) + if (curHandle->pageSize != handle->pageSize) { HW_REG(PI_BSD_DOM1_PGS_REG, u32) = handle->pageSize; + } - if (curHandle->relDuration != handle->relDuration) + if (curHandle->relDuration != handle->relDuration) { HW_REG(PI_BSD_DOM1_RLS_REG, u32) = handle->relDuration; + } - if (curHandle->pulse != handle->pulse) + if (curHandle->pulse != handle->pulse) { HW_REG(PI_BSD_DOM1_PWD_REG, u32) = handle->pulse; - } - else - { - if (curHandle->latency != handle->latency) + } + } else { + if (curHandle->latency != handle->latency) { HW_REG(PI_BSD_DOM2_LAT_REG, u32) = handle->latency; + } - if (curHandle->pageSize != handle->pageSize) + if (curHandle->pageSize != handle->pageSize) { HW_REG(PI_BSD_DOM2_PGS_REG, u32) = handle->pageSize; + } - if (curHandle->relDuration != handle->relDuration) + if (curHandle->relDuration != handle->relDuration) { HW_REG(PI_BSD_DOM2_RLS_REG, u32) = handle->relDuration; + } - if (curHandle->pulse != handle->pulse) + if (curHandle->pulse != handle->pulse) { HW_REG(PI_BSD_DOM2_PWD_REG, u32) = handle->pulse; + } } curHandle->type = handle->type; diff --git a/src/libultra_boot_O2/__osEPiRawStartDma.c b/src/libultra_boot_O2/__osEPiRawStartDma.c index dcd5f44d9b..cc28a6ca9d 100644 --- a/src/libultra_boot_O2/__osEPiRawStartDma.c +++ b/src/libultra_boot_O2/__osEPiRawStartDma.c @@ -1,45 +1,49 @@ #include #include -s32 __osEPiRawStartDma(OSPiHandle* handle, s32 direction, u32 cartAddr, void* dramAddr, size_t size) -{ +s32 __osEPiRawStartDma(OSPiHandle* handle, s32 direction, u32 cartAddr, void* dramAddr, size_t size) { s32 status; OSPiHandle* curHandle; - while (status = HW_REG(PI_STATUS_REG, u32), status & (PI_STATUS_BUSY | PI_STATUS_IOBUSY | PI_STATUS_ERROR)) + while (status = HW_REG(PI_STATUS_REG, u32), status & (PI_STATUS_BUSY | PI_STATUS_IOBUSY | PI_STATUS_ERROR)) { ; + } - if (__osCurrentHandle[handle->domain]->type != handle->type) - { + if (__osCurrentHandle[handle->domain]->type != handle->type) { curHandle = __osCurrentHandle[handle->domain]; - if (handle->domain == 0) - { - if (curHandle->latency != handle->latency) + if (handle->domain == 0) { + if (curHandle->latency != handle->latency) { HW_REG(PI_BSD_DOM1_LAT_REG, u32) = handle->latency; + } - if (curHandle->pageSize != handle->pageSize) + if (curHandle->pageSize != handle->pageSize) { HW_REG(PI_BSD_DOM1_PGS_REG, u32) = handle->pageSize; + } - if (curHandle->relDuration != handle->relDuration) + if (curHandle->relDuration != handle->relDuration) { HW_REG(PI_BSD_DOM1_RLS_REG, u32) = handle->relDuration; + } - if (curHandle->pulse != handle->pulse) + if (curHandle->pulse != handle->pulse) { HW_REG(PI_BSD_DOM1_PWD_REG, u32) = handle->pulse; - } - else - { - if (curHandle->latency != handle->latency) + } + } else { + if (curHandle->latency != handle->latency) { HW_REG(PI_BSD_DOM2_LAT_REG, u32) = handle->latency; + } - if (curHandle->pageSize != handle->pageSize) + if (curHandle->pageSize != handle->pageSize) { HW_REG(PI_BSD_DOM2_PGS_REG, u32) = handle->pageSize; + } - if (curHandle->relDuration != handle->relDuration) + if (curHandle->relDuration != handle->relDuration) { HW_REG(PI_BSD_DOM2_RLS_REG, u32) = handle->relDuration; + } - if (curHandle->pulse != handle->pulse) + if (curHandle->pulse != handle->pulse) { HW_REG(PI_BSD_DOM2_PWD_REG, u32) = handle->pulse; + } } curHandle->type = handle->type; @@ -52,17 +56,16 @@ s32 __osEPiRawStartDma(OSPiHandle* handle, s32 direction, u32 cartAddr, void* dr HW_REG(PI_DRAM_ADDR_REG, void*) = (void*)osVirtualToPhysical(dramAddr); HW_REG(PI_CART_ADDR_REG, void*) = (void*)((handle->baseAddress | cartAddr) & 0x1fffffff); - switch (direction) - { - case OS_READ: - HW_REG(PI_WR_LEN_REG, u32) = size - 1; - break; - case OS_WRITE: - HW_REG(PI_RD_LEN_REG, u32) = size - 1; - break; - default: - return -1; - break; + switch (direction) { + case OS_READ: + HW_REG(PI_WR_LEN_REG, u32) = size - 1; + break; + case OS_WRITE: + HW_REG(PI_RD_LEN_REG, u32) = size - 1; + break; + default: + return -1; + break; } return 0; diff --git a/src/libultra_boot_O2/__osEPiRawWriteIo.c b/src/libultra_boot_O2/__osEPiRawWriteIo.c index 517c7397aa..08d817bfa3 100644 --- a/src/libultra_boot_O2/__osEPiRawWriteIo.c +++ b/src/libultra_boot_O2/__osEPiRawWriteIo.c @@ -1,45 +1,49 @@ #include #include -s32 __osEPiRawWriteIo(OSPiHandle* handle, u32 devAddr, u32 data) -{ +s32 __osEPiRawWriteIo(OSPiHandle* handle, u32 devAddr, u32 data) { s32 status; OSPiHandle* curHandle; - while (status = HW_REG(PI_STATUS_REG, u32), status & (PI_STATUS_BUSY | PI_STATUS_IOBUSY | PI_STATUS_ERROR)) + while (status = HW_REG(PI_STATUS_REG, u32), status & (PI_STATUS_BUSY | PI_STATUS_IOBUSY | PI_STATUS_ERROR)) { ; + } - if (__osCurrentHandle[handle->domain]->type != handle->type) - { + if (__osCurrentHandle[handle->domain]->type != handle->type) { curHandle = __osCurrentHandle[handle->domain]; - if (handle->domain == 0) - { - if (curHandle->latency != handle->latency) + if (handle->domain == 0) { + if (curHandle->latency != handle->latency) { HW_REG(PI_BSD_DOM1_LAT_REG, u32) = handle->latency; + } - if (curHandle->pageSize != handle->pageSize) + if (curHandle->pageSize != handle->pageSize) { HW_REG(PI_BSD_DOM1_PGS_REG, u32) = handle->pageSize; + } - if (curHandle->relDuration != handle->relDuration) + if (curHandle->relDuration != handle->relDuration) { HW_REG(PI_BSD_DOM1_RLS_REG, u32) = handle->relDuration; + } - if (curHandle->pulse != handle->pulse) + if (curHandle->pulse != handle->pulse) { HW_REG(PI_BSD_DOM1_PWD_REG, u32) = handle->pulse; - } - else - { - if (curHandle->latency != handle->latency) + } + } else { + if (curHandle->latency != handle->latency) { HW_REG(PI_BSD_DOM2_LAT_REG, u32) = handle->latency; + } - if (curHandle->pageSize != handle->pageSize) + if (curHandle->pageSize != handle->pageSize) { HW_REG(PI_BSD_DOM2_PGS_REG, u32) = handle->pageSize; + } - if (curHandle->relDuration != handle->relDuration) + if (curHandle->relDuration != handle->relDuration) { HW_REG(PI_BSD_DOM2_RLS_REG, u32) = handle->relDuration; + } - if (curHandle->pulse != handle->pulse) + if (curHandle->pulse != handle->pulse) { HW_REG(PI_BSD_DOM2_PWD_REG, u32) = handle->pulse; + } } curHandle->type = handle->type; diff --git a/src/libultra_boot_O2/__osPiRawStartDma.c b/src/libultra_boot_O2/__osPiRawStartDma.c index 0957a0ebcb..589a63b3ba 100644 --- a/src/libultra_boot_O2/__osPiRawStartDma.c +++ b/src/libultra_boot_O2/__osPiRawStartDma.c @@ -1,30 +1,27 @@ #include #include -s32 __osPiRawStartDma(s32 dir, u32 cart_addr, void *dram_addr, size_t size) -{ +s32 __osPiRawStartDma(s32 dir, u32 cart_addr, void* dram_addr, size_t size) { register int status; status = HW_REG(PI_STATUS_REG, u32); - while (status & (PI_STATUS_BUSY | PI_STATUS_IOBUSY | PI_STATUS_ERROR)) - { + while (status & (PI_STATUS_BUSY | PI_STATUS_IOBUSY | PI_STATUS_ERROR)) { status = HW_REG(PI_STATUS_REG, u32); } - HW_REG(PI_DRAM_ADDR_REG, void *) = (void *)osVirtualToPhysical(dram_addr); + HW_REG(PI_DRAM_ADDR_REG, void*) = (void*)osVirtualToPhysical(dram_addr); - HW_REG(PI_CART_ADDR_REG, void *) = (void *)((osRomBase | cart_addr) & 0x1fffffff); + HW_REG(PI_CART_ADDR_REG, void*) = (void*)((osRomBase | cart_addr) & 0x1fffffff); - switch (dir) - { - case OS_READ: - HW_REG(PI_WR_LEN_REG, u32) = size - 1; - break; - case OS_WRITE: - HW_REG(PI_RD_LEN_REG, u32) = size - 1; - break; - default: - return -1; - break; + switch (dir) { + case OS_READ: + HW_REG(PI_WR_LEN_REG, u32) = size - 1; + break; + case OS_WRITE: + HW_REG(PI_RD_LEN_REG, u32) = size - 1; + break; + default: + return -1; + break; } return 0; -} \ No newline at end of file +} diff --git a/src/libultra_boot_O2/__osSiDeviceBusy.c b/src/libultra_boot_O2/__osSiDeviceBusy.c index 983bd071d0..8bb777745d 100644 --- a/src/libultra_boot_O2/__osSiDeviceBusy.c +++ b/src/libultra_boot_O2/__osSiDeviceBusy.c @@ -1,12 +1,12 @@ #include #include -u32 __osSiDeviceBusy() -{ +u32 __osSiDeviceBusy() { register u32 status; status = HW_REG(SI_STATUS_REG, u32); - if (status & (SI_STATUS_DMA_BUSY | SI_STATUS_IO_READ_BUSY)) + if (status & (SI_STATUS_DMA_BUSY | SI_STATUS_IO_READ_BUSY)) { return true; - else + } else { return false; + } } diff --git a/src/libultra_boot_O2/__osSiRawReadIo.c b/src/libultra_boot_O2/__osSiRawReadIo.c index c3bb394f03..fa26c8e2aa 100644 --- a/src/libultra_boot_O2/__osSiRawReadIo.c +++ b/src/libultra_boot_O2/__osSiRawReadIo.c @@ -1,10 +1,10 @@ #include #include -s32 __osSiRawReadIo(void *a0, u32 *a1) -{ - if (__osSiDeviceBusy()) +s32 __osSiRawReadIo(void* a0, u32* a1) { + if (__osSiDeviceBusy()) { return -1; + } *a1 = HW_REG((u32)a0, u32); return 0; -} \ No newline at end of file +} diff --git a/src/libultra_boot_O2/__osSiRawWriteIo.c b/src/libultra_boot_O2/__osSiRawWriteIo.c index c7ff8eab78..7658b5a97b 100644 --- a/src/libultra_boot_O2/__osSiRawWriteIo.c +++ b/src/libultra_boot_O2/__osSiRawWriteIo.c @@ -1,10 +1,10 @@ #include #include -s32 __osSiRawWriteIo(void *a0, u32 a1) -{ - if (__osSiDeviceBusy()) +s32 __osSiRawWriteIo(void* a0, u32 a1) { + if (__osSiDeviceBusy()) { return -1; + } HW_REG((u32)a0, u32) = a1; return 0; -} \ No newline at end of file +} diff --git a/src/libultra_boot_O2/__osViGetCurrentContext.c b/src/libultra_boot_O2/__osViGetCurrentContext.c index b629c77f73..fea88be8fd 100644 --- a/src/libultra_boot_O2/__osViGetCurrentContext.c +++ b/src/libultra_boot_O2/__osViGetCurrentContext.c @@ -1,6 +1,5 @@ #include -OSViContext* __osViGetCurrentContext() -{ +OSViContext* __osViGetCurrentContext() { return __osViCurr; } diff --git a/src/libultra_boot_O2/__osViInit.c b/src/libultra_boot_O2/__osViInit.c index a660a1de26..becce34ab9 100644 --- a/src/libultra_boot_O2/__osViInit.c +++ b/src/libultra_boot_O2/__osViInit.c @@ -1,12 +1,11 @@ #include #include -OSViContext vi[2] = {0}; +OSViContext vi[2] = { 0 }; OSViContext* __osViCurr = &vi[0]; OSViContext* __osViNext = &vi[1]; -void __osViInit() -{ +void __osViInit() { bzero(vi, sizeof(vi)); __osViCurr = &vi[0]; __osViNext = &vi[1]; @@ -15,19 +14,21 @@ void __osViInit() __osViCurr->retraceCount = 1; __osViNext->buffer = (void*)0x80000000; __osViCurr->buffer = (void*)0x80000000; - - if (osTvType == 0) + + if (osTvType == 0) { __osViNext->modep = &osViModePalLan1; - else if (osTvType == 2) + } else if (osTvType == 2) { __osViNext->modep = &osViModeMpalLan1; - else + } else { __osViNext->modep = &osViModeNtscLan1; + } __osViNext->state = 0x20; __osViNext->features = __osViNext->modep->comRegs.ctrl; - while (HW_REG(VI_CURRENT_REG, u32) > 10) + while (HW_REG(VI_CURRENT_REG, u32) > 10) { ; + } HW_REG(VI_CONTROL_REG, u32) = 0; __osViSwapContext(); diff --git a/src/libultra_boot_O2/__osViSwapContext.c b/src/libultra_boot_O2/__osViSwapContext.c index 93f8ede354..4dcc4c8703 100644 --- a/src/libultra_boot_O2/__osViSwapContext.c +++ b/src/libultra_boot_O2/__osViSwapContext.c @@ -1,10 +1,9 @@ #include #include -void __osViSwapContext() -{ - register OSViMode *s0; - register OSViContext *s1; +void __osViSwapContext() { + register OSViMode* s0; + register OSViContext* s1; u32 origin; u32 hStart; u32 vstart; diff --git a/src/libultra_boot_O2/osCartRomInit.c b/src/libultra_boot_O2/osCartRomInit.c index 5492a61f5a..eef5be9fdb 100644 --- a/src/libultra_boot_O2/osCartRomInit.c +++ b/src/libultra_boot_O2/osCartRomInit.c @@ -3,8 +3,7 @@ OSPiHandle __CartRomHandle; -OSPiHandle* osCartRomInit() -{ +OSPiHandle* osCartRomInit() { register u32 a; register s32 status; register u32 prevInt; @@ -17,8 +16,7 @@ OSPiHandle* osCartRomInit() __osPiGetAccess(); - if (!D_8000AF10) - { + if (!D_8000AF10) { __osPiRelAccess(); return &__CartRomHandle; } @@ -30,8 +28,9 @@ OSPiHandle* osCartRomInit() __CartRomHandle.speed = 0; bzero(&__CartRomHandle.transferInfo, sizeof(__OSTranxInfo)); - while (status = HW_REG(PI_STATUS_REG, u32), status & PI_STATUS_ERROR) + while (status = HW_REG(PI_STATUS_REG, u32), status & PI_STATUS_ERROR) { ; + } lastLatency = HW_REG(PI_BSD_DOM1_LAT_REG, u32); lastPageSize = HW_REG(PI_BSD_DOM1_PGS_REG, u32); diff --git a/src/libultra_boot_O2/osDriveRomInit.c b/src/libultra_boot_O2/osDriveRomInit.c index 2428161e82..4dd49a6299 100644 --- a/src/libultra_boot_O2/osDriveRomInit.c +++ b/src/libultra_boot_O2/osDriveRomInit.c @@ -3,8 +3,7 @@ OSPiHandle __DriveRomHandle; -OSPiHandle* osDriveRomInit() -{ +OSPiHandle* osDriveRomInit() { register s32 status; register u32 a; register s32 prevInt; @@ -12,8 +11,7 @@ OSPiHandle* osDriveRomInit() __osPiGetAccess(); - if (!D_8000AC70) - { + if (!D_8000AC70) { __osPiRelAccess(); return &__DriveRomHandle; } @@ -25,8 +23,9 @@ OSPiHandle* osDriveRomInit() __DriveRomHandle.speed = 0; bzero(&__DriveRomHandle.transferInfo, sizeof(__OSTranxInfo)); - while (status = HW_REG(PI_STATUS_REG, u32), status & PI_STATUS_ERROR) + while (status = HW_REG(PI_STATUS_REG, u32), status & PI_STATUS_ERROR) { ; + } HW_REG(PI_BSD_DOM1_LAT_REG, u32) = 0xff; HW_REG(PI_BSD_DOM1_PGS_REG, u32) = 0; diff --git a/src/libultra_boot_O2/osEPiReadIo.c b/src/libultra_boot_O2/osEPiReadIo.c index 9953c8529f..964330c305 100644 --- a/src/libultra_boot_O2/osEPiReadIo.c +++ b/src/libultra_boot_O2/osEPiReadIo.c @@ -1,7 +1,6 @@ #include -s32 osEPiReadIo(OSPiHandle* handle, u32 devAddr, u32* data) -{ +s32 osEPiReadIo(OSPiHandle* handle, u32 devAddr, u32* data) { register s32 ret; __osPiGetAccess(); @@ -9,4 +8,4 @@ s32 osEPiReadIo(OSPiHandle* handle, u32 devAddr, u32* data) __osPiRelAccess(); return ret; -} \ No newline at end of file +} diff --git a/src/libultra_boot_O2/osEPiStartDma.c b/src/libultra_boot_O2/osEPiStartDma.c index a2c2b8d5a7..83fc694a34 100644 --- a/src/libultra_boot_O2/osEPiStartDma.c +++ b/src/libultra_boot_O2/osEPiStartDma.c @@ -1,21 +1,23 @@ #include -s32 osEPiStartDma(OSPiHandle* handle, OSIoMesg* mb, s32 direction) -{ +s32 osEPiStartDma(OSPiHandle* handle, OSIoMesg* mb, s32 direction) { s32 ret; - if (!__osPiDevMgr.initialized) + if (!__osPiDevMgr.initialized) { return -1; + } mb->piHandle = handle; - if (direction == OS_READ) + if (direction == OS_READ) { mb->hdr.type = 0xf; - else + } else { mb->hdr.type = 0x10; + } - if (mb->hdr.pri == 1) + if (mb->hdr.pri == 1) { ret = osJamMesg(osPiGetCmdQueue(), (OSMesg)mb, 0); - else + } else { ret = osSendMesg(osPiGetCmdQueue(), (OSMesg)mb, 0); + } return ret; -} \ No newline at end of file +} diff --git a/src/libultra_boot_O2/osEPiWriteIo.c b/src/libultra_boot_O2/osEPiWriteIo.c index ef1cc385f4..5d4f61a2fc 100644 --- a/src/libultra_boot_O2/osEPiWriteIo.c +++ b/src/libultra_boot_O2/osEPiWriteIo.c @@ -1,7 +1,6 @@ #include -s32 osEPiWriteIo(OSPiHandle* handle, u32 devAddr, u32 data) -{ +s32 osEPiWriteIo(OSPiHandle* handle, u32 devAddr, u32 data) { register s32 ret; __osPiGetAccess(); diff --git a/src/libultra_boot_O2/osPiGetCmdQueue.c b/src/libultra_boot_O2/osPiGetCmdQueue.c index 159c423783..1f097a9269 100644 --- a/src/libultra_boot_O2/osPiGetCmdQueue.c +++ b/src/libultra_boot_O2/osPiGetCmdQueue.c @@ -1,9 +1,9 @@ #include -OSMesgQueue* osPiGetCmdQueue() -{ - if (!__osPiDevMgr.initialized) +OSMesgQueue* osPiGetCmdQueue() { + if (!__osPiDevMgr.initialized) { return NULL; + } return __osPiDevMgr.cmdQueue; } diff --git a/src/libultra_boot_O2/osViBlack.c b/src/libultra_boot_O2/osViBlack.c index 4a122496c2..753619b8b1 100644 --- a/src/libultra_boot_O2/osViBlack.c +++ b/src/libultra_boot_O2/osViBlack.c @@ -1,8 +1,7 @@ #include // TODO: name magic constants -void osViBlack(u8 active) -{ +void osViBlack(u8 active) { register u32 int_disabled = __osDisableInt(); if (active) { __osViNext->state |= 0x20; diff --git a/src/libultra_boot_O2/osViGetNextFramebuffer.c b/src/libultra_boot_O2/osViGetNextFramebuffer.c index 83eaa2705f..a8b642603a 100644 --- a/src/libultra_boot_O2/osViGetNextFramebuffer.c +++ b/src/libultra_boot_O2/osViGetNextFramebuffer.c @@ -1,9 +1,8 @@ #include -void* osViGetNextFramebuffer() -{ +void* osViGetNextFramebuffer() { s32 prevInt = __osDisableInt(); void* buff = __osViNext->buffer; __osRestoreInt(prevInt); return buff; -} \ No newline at end of file +} diff --git a/src/libultra_boot_O2/osViModeFpalLan1.c b/src/libultra_boot_O2/osViModeFpalLan1.c index c620ad53d9..47b36d7ad9 100644 --- a/src/libultra_boot_O2/osViModeFpalLan1.c +++ b/src/libultra_boot_O2/osViModeFpalLan1.c @@ -1,33 +1,32 @@ #include -OSViMode osViModeFpalLan1 = -{ - 0x2C, //type - { //comRegs - 0x311E, //ctrl - 0x140, //width - 0x4541E3A, //burst - 0x271, //vSync - 0x170C69, //hSync - 0xC6F0C6D, //leap - 0x800300, //hStart - 0x200, //xScale - 0 //vCurrent +OSViMode osViModeFpalLan1 = { + 0x2C, // type + { + // comRegs + 0x311E, // ctrl + 0x140, // width + 0x4541E3A, // burst + 0x271, // vSync + 0x170C69, // hSync + 0xC6F0C6D, // leap + 0x800300, // hStart + 0x200, // xScale + 0 // vCurrent }, - { //fldRegs - { - 0x280, //origin - 0x400, //yScale - 0x2F0269, //vStart - 0x9026B, //vBurst - 2, //vIntr - }, - { - 0x280, //origin - 0x400, //yScale - 0x2F0269, //vStart - 0x9026B, //vBurst - 2 //vIntr - } - } + { // fldRegs + { + 0x280, // origin + 0x400, // yScale + 0x2F0269, // vStart + 0x9026B, // vBurst + 2, // vIntr + }, + { + 0x280, // origin + 0x400, // yScale + 0x2F0269, // vStart + 0x9026B, // vBurst + 2 // vIntr + } }, }; diff --git a/src/libultra_boot_O2/osViModeMpalLan1.c b/src/libultra_boot_O2/osViModeMpalLan1.c index 805cd450b3..7557468f82 100644 --- a/src/libultra_boot_O2/osViModeMpalLan1.c +++ b/src/libultra_boot_O2/osViModeMpalLan1.c @@ -1,33 +1,34 @@ #include -OSViMode osViModeMpalLan1 = -{ - 0x1E, //type - { //comRegs - 0x311E, //ctrl - 0x140, //width - 0x4651E39, //burst - 0x20D, //vSync - 0x40C11, //hSync - 0xC190C1A, //leap - 0x6C02EC, //hStart - 0x200, //xScale - 0, //vCurrent +OSViMode osViModeMpalLan1 = { + 0x1E, // type + { + // comRegs + 0x311E, // ctrl + 0x140, // width + 0x4651E39, // burst + 0x20D, // vSync + 0x40C11, // hSync + 0xC190C1A, // leap + 0x6C02EC, // hStart + 0x200, // xScale + 0, // vCurrent }, - { //fldRegs - { //[0] - 0x280, //origin - 0x400, //yScale - 0x2501FF, //vStart - 0xE0204, //vBurst - 2, //vIntr - }, - { //[1] - 0x280, //origin - 0x400, //yScale - 0x2501FF, //vStart - 0xE0204, //vBurst - 2, //vIntr - } - } + { // fldRegs + { + // [0] + 0x280, // origin + 0x400, // yScale + 0x2501FF, // vStart + 0xE0204, // vBurst + 2, // vIntr + }, + { + // [1] + 0x280, // origin + 0x400, // yScale + 0x2501FF, // vStart + 0xE0204, // vBurst + 2, // vIntr + } }, }; diff --git a/src/libultra_boot_O2/osViModeNtscLan1.c b/src/libultra_boot_O2/osViModeNtscLan1.c index 99573758e8..1026faae8f 100644 --- a/src/libultra_boot_O2/osViModeNtscLan1.c +++ b/src/libultra_boot_O2/osViModeNtscLan1.c @@ -1,33 +1,34 @@ #include -OSViMode osViModeNtscLan1 = -{ - 2, //type - { //comRegs - 0x311E, //ctrl - 0x140, //width - 0x3E52239, //burst - 0x20D, //vSync - 0xC15, //hSync - 0xC150C15, //leap - 0x6C02EC, //hStart - 0x200, //xScale - 0, //vCurrent +OSViMode osViModeNtscLan1 = { + 2, // type + { + // comRegs + 0x311E, // ctrl + 0x140, // width + 0x3E52239, // burst + 0x20D, // vSync + 0xC15, // hSync + 0xC150C15, // leap + 0x6C02EC, // hStart + 0x200, // xScale + 0, // vCurrent }, - { //fldRegs - { //[0] - 0x280, //origin - 0x400, //yScale - 0x2501FF, //vStart - 0xE0204, //vBurst - 2, //vIntr - }, - { //[1] - 0x280, //origin - 0x400, //yScale - 0x2501FF, //vStart - 0xE0204, //vBurst - 2, //vIntr - } - } + { // fldRegs + { + // [0] + 0x280, // origin + 0x400, // yScale + 0x2501FF, // vStart + 0xE0204, // vBurst + 2, // vIntr + }, + { + // [1] + 0x280, // origin + 0x400, // yScale + 0x2501FF, // vStart + 0xE0204, // vBurst + 2, // vIntr + } }, }; diff --git a/src/libultra_boot_O2/osViSetMode.c b/src/libultra_boot_O2/osViSetMode.c index 5d29da826e..6b7a5e21a2 100644 --- a/src/libultra_boot_O2/osViSetMode.c +++ b/src/libultra_boot_O2/osViSetMode.c @@ -1,7 +1,6 @@ #include -void osViSetMode(OSViMode *mode) -{ +void osViSetMode(OSViMode* mode) { register u32 int_disabled = __osDisableInt(); __osViNext->modep = mode; __osViNext->state = 1; diff --git a/src/libultra_boot_O2/osViSetSpecialFeatures.c b/src/libultra_boot_O2/osViSetSpecialFeatures.c index 06d040a513..ab949ba317 100644 --- a/src/libultra_boot_O2/osViSetSpecialFeatures.c +++ b/src/libultra_boot_O2/osViSetSpecialFeatures.c @@ -1,7 +1,6 @@ #include -void osViSetSpecialFeatures(u32 func) -{ +void osViSetSpecialFeatures(u32 func) { register u32 int_disabled = __osDisableInt(); if (func & OS_VI_GAMMA_ON) { __osViNext->features |= OS_VI_GAMMA; diff --git a/src/libultra_boot_O2/osViSetXScale.c b/src/libultra_boot_O2/osViSetXScale.c index 128b64c991..3c3103c462 100644 --- a/src/libultra_boot_O2/osViSetXScale.c +++ b/src/libultra_boot_O2/osViSetXScale.c @@ -1,7 +1,6 @@ #include -void osViSetXScale(f32 value) -{ +void osViSetXScale(f32 value) { register u32 nomValue; register u32 saveMask; diff --git a/src/libultra_boot_O2/osViSetYScale.c b/src/libultra_boot_O2/osViSetYScale.c index bf34f28e16..91f12fed2c 100644 --- a/src/libultra_boot_O2/osViSetYScale.c +++ b/src/libultra_boot_O2/osViSetYScale.c @@ -1,7 +1,6 @@ #include -void osViSetYScale(float scale) -{ +void osViSetYScale(float scale) { register s32 prevInt; prevInt = __osDisableInt(); diff --git a/src/libultra_boot_O2/osViSwapBuffer.c b/src/libultra_boot_O2/osViSwapBuffer.c index eb6b05d31d..c671a50f00 100644 --- a/src/libultra_boot_O2/osViSwapBuffer.c +++ b/src/libultra_boot_O2/osViSwapBuffer.c @@ -1,7 +1,6 @@ #include -void osViSwapBuffer(void *vaddr) -{ +void osViSwapBuffer(void* vaddr) { u32 int_disabled = __osDisableInt(); __osViNext->buffer = vaddr; __osViNext->state |= 0x10; // TODO: figure out what this flag means diff --git a/src/libultra_boot_O2/pimgr.c b/src/libultra_boot_O2/pimgr.c index c15d7b9194..581f66f480 100644 --- a/src/libultra_boot_O2/pimgr.c +++ b/src/libultra_boot_O2/pimgr.c @@ -1,6 +1,6 @@ #include -OSMgrArgs __osPiDevMgr = {0}; +OSMgrArgs __osPiDevMgr = { 0 }; OSPiHandle __Dom1SpeedParam; OSPiHandle __Dom2SpeedParam; @@ -11,31 +11,27 @@ OSMesg piEventBuf[2]; OSThread __osThreadSave; OSPiHandle* __osPiTable = NULL; -OSPiHandle* __osCurrentHandle[] = -{ +OSPiHandle* __osCurrentHandle[] = { &__Dom1SpeedParam, &__Dom2SpeedParam, }; - -void osCreatePiManager(OSPri pri, OSMesgQueue *cmdQ, OSMesg *cmdBuf, s32 cmdMsgCnt) -{ +void osCreatePiManager(OSPri pri, OSMesgQueue* cmdQ, OSMesg* cmdBuf, s32 cmdMsgCnt) { u32 int_disabled; OSPri newPri; OSPri currentPri; - if (!__osPiDevMgr.initialized) - { + if (!__osPiDevMgr.initialized) { osCreateMesgQueue(cmdQ, cmdBuf, cmdMsgCnt); osCreateMesgQueue(&piEventQueue, piEventBuf, 1); - if (!__osPiAccessQueueEnabled) + if (!__osPiAccessQueueEnabled) { __osPiCreateAccessQueue(); + } osSetEventMesg(OS_EVENT_PI, &piEventQueue, (OSMesg)0x22222222); newPri = -1; currentPri = osGetThreadPri(NULL); - if (currentPri < pri) - { + if (currentPri < pri) { newPri = currentPri; osSetThreadPri(NULL, pri); } @@ -49,12 +45,13 @@ void osCreatePiManager(OSPri pri, OSMesgQueue *cmdQ, OSMesg *cmdBuf, s32 cmdMsgC __osPiDevMgr.piDmaCallback = __osPiRawStartDma; __osPiDevMgr.epiDmaCallback = __osEPiRawStartDma; - osCreateThread(&piThread, 0, __osDevMgrMain, (void *)&__osPiDevMgr, piStackThread + sizeof(piStackThread), pri); + osCreateThread(&piThread, 0, __osDevMgrMain, (void*)&__osPiDevMgr, piStackThread + sizeof(piStackThread), pri); osStartThread(&piThread); __osRestoreInt(int_disabled); - if (newPri != -1) + if (newPri != -1) { osSetThreadPri(NULL, newPri); + } } } diff --git a/src/libultra_boot_O2/sprintf.c b/src/libultra_boot_O2/sprintf.c index 58510a35c2..2ff0b33e06 100644 --- a/src/libultra_boot_O2/sprintf.c +++ b/src/libultra_boot_O2/sprintf.c @@ -1,26 +1,25 @@ #include -char* proutSprintf(char* dst, const char *fmt, size_t size) -{ +char* proutSprintf(char* dst, const char* fmt, size_t size) { return (char*)memcpy(dst, fmt, size) + size; } -s32 vsprintf(char* dst, const char* fmt, va_list args) -{ +s32 vsprintf(char* dst, const char* fmt, va_list args) { s32 ret = _Printf(&proutSprintf, dst, fmt, args); - if (ret > -1) + if (ret > -1) { dst[ret] = 0; + } return ret; } -s32 sprintf(char* dst, const char* fmt, ...) -{ +s32 sprintf(char* dst, const char* fmt, ...) { s32 ret; va_list args; va_start(args, fmt); ret = _Printf(&proutSprintf, dst, fmt, args); - if (ret > -1) + if (ret > -1) { dst[ret] = 0; + } return ret; } diff --git a/src/libultra_boot_O2/string.c b/src/libultra_boot_O2/string.c index 771caf1a3d..529ba37d8f 100644 --- a/src/libultra_boot_O2/string.c +++ b/src/libultra_boot_O2/string.c @@ -1,33 +1,30 @@ #include -const u8 *strchr(const u8 *str, s32 ch) -{ +const u8* strchr(const u8* str, s32 ch) { u8 c = ch; - while (*str != c) - { - if (*str == 0) + while (*str != c) { + if (*str == 0) { return NULL; + } str++; } return str; } -size_t strlen(const u8 *str) -{ - const u8 *ptr = str; - while (*ptr) +size_t strlen(const u8* str) { + const u8* ptr = str; + while (*ptr) { ptr++; + } return ptr - str; } -void *memcpy(void *dst, const void *src, size_t size) -{ - u8 *_dst = dst; - const u8 *_src = src; - while (size > 0) - { +void* memcpy(void* dst, const void* src, size_t size) { + u8* _dst = dst; + const u8* _src = src; + while (size > 0) { *_dst++ = *_src++; size--; } return dst; -} \ No newline at end of file +} diff --git a/src/libultra_boot_O2/vimgr.c b/src/libultra_boot_O2/vimgr.c index de54494f99..d2839078ef 100644 --- a/src/libultra_boot_O2/vimgr.c +++ b/src/libultra_boot_O2/vimgr.c @@ -1,7 +1,6 @@ #include -typedef struct -{ +typedef struct { u16 unk00; u8 unk02; u32 unk04; @@ -16,18 +15,16 @@ OSMesgQueue viEventQueue; OSMesg viEventBuf[6]; viMesgStruct viRetraceMsg; viMesgStruct viCounterMsg; -OSMgrArgs __osViDevMgr = {0}; +OSMgrArgs __osViDevMgr = { 0 }; u32 __additional_scanline = 0; void viMgrMain(void*); -void osCreateViManager(OSPri pri) -{ +void osCreateViManager(OSPri pri) { u32 int_disabled; OSPri newPri; OSPri currentPri; - if (!__osViDevMgr.initialized) - { + if (!__osViDevMgr.initialized) { __osTimerServicesInit(); __additional_scanline = 0; osCreateMesgQueue(&viEventQueue, viEventBuf, 5); @@ -41,8 +38,7 @@ void osCreateViManager(OSPri pri) osSetEventMesg(OS_EVENT_COUNTER, &viEventQueue, &viCounterMsg); newPri = -1; currentPri = osGetThreadPri(NULL); - if (currentPri < pri) - { + if (currentPri < pri) { newPri = currentPri; osSetThreadPri(NULL, pri); } @@ -56,19 +52,17 @@ void osCreateViManager(OSPri pri) __osViDevMgr.piDmaCallback = NULL; __osViDevMgr.epiDmaCallback = NULL; - osCreateThread(&viThread, 0, &viMgrMain, &__osViDevMgr, viThreadStack+sizeof(viThreadStack), pri); + osCreateThread(&viThread, 0, &viMgrMain, &__osViDevMgr, viThreadStack + sizeof(viThreadStack), pri); __osViInit(); osStartThread(&viThread); __osRestoreInt(int_disabled); - if (newPri != -1) - { + if (newPri != -1) { osSetThreadPri(NULL, newPri); } } } -void viMgrMain(void* vargs) -{ +void viMgrMain(void* vargs) { OSMgrArgs* args; static u16 viRetrace; u32 addTime; @@ -77,49 +71,47 @@ void viMgrMain(void* vargs) temp = 0; mesg = NULL; - viRetrace = __osViGetCurrentContext()->retraceCount; - if (viRetrace == 0) + viRetrace = __osViGetCurrentContext()->retraceCount; + if (viRetrace == 0) { viRetrace = 1; + } args = (OSMgrArgs*)vargs; - while (1) - { + while (1) { osRecvMesg(args->eventQueue, (OSMesg)&mesg, OS_MESG_BLOCK); - switch (mesg->unk00) - { - case 13: - __osViSwapContext(); - viRetrace--; - if (!viRetrace) - { - OSViContext* ctx = __osViGetCurrentContext(); - if (ctx->mq) - osSendMesg(ctx->mq, ctx->msg, OS_MESG_NOBLOCK); - viRetrace = ctx->retraceCount; - } + switch (mesg->unk00) { + case 13: + __osViSwapContext(); + viRetrace--; + if (!viRetrace) { + OSViContext* ctx = __osViGetCurrentContext(); + if (ctx->mq) { + osSendMesg(ctx->mq, ctx->msg, OS_MESG_NOBLOCK); + } + viRetrace = ctx->retraceCount; + } - __osViIntrCount++; + __osViIntrCount++; - // block optimized out since temp is always 0, - // but it changes register allocation and ordering for __osCurrentTime - if (temp != 0) - { - addTime = osGetCount(); - __osCurrentTime = addTime; - temp = 0; - } + // block optimized out since temp is always 0, + // but it changes register allocation and ordering for __osCurrentTime + if (temp != 0) { + addTime = osGetCount(); + __osCurrentTime = addTime; + temp = 0; + } - addTime = __osBaseCounter; - __osBaseCounter = osGetCount(); - addTime = __osBaseCounter - addTime; - __osCurrentTime = __osCurrentTime + addTime; + addTime = __osBaseCounter; + __osBaseCounter = osGetCount(); + addTime = __osBaseCounter - addTime; + __osCurrentTime = __osCurrentTime + addTime; - break; + break; - case 14: - __osTimerInterrupt(); - break; + case 14: + __osTimerInterrupt(); + break; } } } diff --git a/src/libultra_code/__osSiCreateAccessQueue.c b/src/libultra_code/__osSiCreateAccessQueue.c index e2d0c8e337..b1ed321afc 100644 --- a/src/libultra_code/__osSiCreateAccessQueue.c +++ b/src/libultra_code/__osSiCreateAccessQueue.c @@ -7,13 +7,13 @@ OSMesg osSiMesgBuff[SIAccessQueueSize]; OSMesgQueue gOsSiMessageQueue; u32 gOsSiAccessQueueCreated = 0; -void __osSiCreateAccessQueue() { //func_80100B50 +void __osSiCreateAccessQueue() { gOsSiAccessQueueCreated = 1; osCreateMesgQueue(&gOsSiMessageQueue, &osSiMesgBuff[0], SIAccessQueueSize - 1); osSendMesg(&gOsSiMessageQueue, NULL, OS_MESG_NOBLOCK); } -void __osSiGetAccess() { //func_80100BA0 +void __osSiGetAccess() { OSMesg sp1c; if (!gOsSiAccessQueueCreated) { __osSiCreateAccessQueue(); @@ -21,6 +21,6 @@ void __osSiGetAccess() { //func_80100BA0 osRecvMesg(&gOsSiMessageQueue, &sp1c, OS_MESG_BLOCK); } -void __osSiRelAccess() { //func_80100BE4 +void __osSiRelAccess() { osSendMesg(&gOsSiMessageQueue, NULL, OS_MESG_NOBLOCK); } diff --git a/src/libultra_code/__osSiRawStartDma.c b/src/libultra_code/__osSiRawStartDma.c index 537a0fba2f..d440366575 100644 --- a/src/libultra_code/__osSiRawStartDma.c +++ b/src/libultra_code/__osSiRawStartDma.c @@ -1,21 +1,20 @@ #include "libultra_internal.h" #include -s32 __osSiRawStartDma(s32 dir, void *addr) //func_801013F0 -{ - if (HW_REG(SI_STATUS_REG, u32) & (SI_STATUS_DMA_BUSY | SI_STATUS_IO_READ_BUSY)){ +s32 __osSiRawStartDma(s32 dir, void* addr) { + if (HW_REG(SI_STATUS_REG, u32) & (SI_STATUS_DMA_BUSY | SI_STATUS_IO_READ_BUSY)) { return -1; } - if (dir == OS_WRITE){ + if (dir == OS_WRITE) { osWritebackDCache(addr, 0x40); } HW_REG(SI_DRAM_ADDR_REG, void*) = (void*)osVirtualToPhysical(addr); - if (dir == OS_READ){ + if (dir == OS_READ) { HW_REG(SI_PIF_ADDR_RD64B_REG, void*) = (void*)PIF_RAM_START; - }else{ + } else { HW_REG(SI_PIF_ADDR_WR64B_REG, void*) = (void*)PIF_RAM_START; } - if (dir == OS_READ){ + if (dir == OS_READ) { osInvalDCache(addr, 0x40); } return 0; diff --git a/src/libultra_code/__osSpGetStatus.c b/src/libultra_code/__osSpGetStatus.c index 61b5053b24..cd68e408c7 100644 --- a/src/libultra_code/__osSpGetStatus.c +++ b/src/libultra_code/__osSpGetStatus.c @@ -2,7 +2,6 @@ #include #include -u32 __osSpGetStatus() -{ +u32 __osSpGetStatus() { return HW_REG(SP_STATUS_REG, u32); } diff --git a/src/libultra_code/__osSpSetStatus.c b/src/libultra_code/__osSpSetStatus.c index 3bd9c84d3c..01cf1adc1a 100644 --- a/src/libultra_code/__osSpSetStatus.c +++ b/src/libultra_code/__osSpSetStatus.c @@ -2,7 +2,6 @@ #include #include -void __osSpSetStatus(u32 a0) -{ +void __osSpSetStatus(u32 a0) { HW_REG(SP_STATUS_REG, u32) = a0; } diff --git a/src/libultra_code/code_80101B40.c.ignore b/src/libultra_code/code_80101B40.c.ignore index f0780cb743..908f84f9ef 100644 --- a/src/libultra_code/code_80101B40.c.ignore +++ b/src/libultra_code/code_80101B40.c.ignore @@ -1,8 +1,7 @@ #include #include -void func_80101B40(u32* a0) -{ +void func_80101B40(u32* a0) { a0[0] = 0x3F800000; // Float? a0[1] = 0; a0[2] = 0; diff --git a/src/libultra_code/code_80103B30.c b/src/libultra_code/code_80103B30.c index 2e17bf58d8..5137e4e26c 100644 --- a/src/libultra_code/code_80103B30.c +++ b/src/libultra_code/code_80103B30.c @@ -2,14 +2,14 @@ #include #include -u32 func_80103B30() -{ +u32 func_80103B30() { register u32 status; status = HW_REG(SP_STATUS_REG, u32); - if (status & 0x1C) + if (status & 0x1C) { return 1; + } return 0; } diff --git a/src/libultra_code/code_80104140.c b/src/libultra_code/code_80104140.c index c2ccd0c8d0..aa9fed857e 100644 --- a/src/libultra_code/code_80104140.c +++ b/src/libultra_code/code_80104140.c @@ -1,6 +1,5 @@ #include -OSThread* func_80104140() -{ +OSThread* func_80104140() { return __osActiveQueue; } diff --git a/src/libultra_code/code_801064C0.c b/src/libultra_code/code_801064C0.c index 04eafa5d8b..23b73d853e 100644 --- a/src/libultra_code/code_801064C0.c +++ b/src/libultra_code/code_801064C0.c @@ -1,7 +1,6 @@ #include #include -OSThread* __osGetCurrFaultedThread() -{ +OSThread* __osGetCurrFaultedThread() { return __osFaultedThread; } diff --git a/src/libultra_code/code_80106760.c b/src/libultra_code/code_80106760.c index e6626dfb34..e9f44fd633 100644 --- a/src/libultra_code/code_80106760.c +++ b/src/libultra_code/code_80106760.c @@ -1,8 +1,7 @@ #include #include -u32* func_80106760() -{ +u32* func_80106760() { register u32 sMask = __osDisableInt(); u32* var1; diff --git a/src/libultra_code/code_801067A0.c b/src/libultra_code/code_801067A0.c index 2257881abb..0ea5f968cd 100644 --- a/src/libultra_code/code_801067A0.c +++ b/src/libultra_code/code_801067A0.c @@ -2,14 +2,14 @@ #include #include -s32 func_801067A0(u32 a0) -{ +s32 func_801067A0(u32 a0) { register u32 spStatus; spStatus = HW_REG(SP_STATUS_REG, u32); - if (!(spStatus & SP_STATUS_HALT)) + if (!(spStatus & SP_STATUS_HALT)) { return -1; + } HW_REG(SP_PC_REG, u32) = a0; diff --git a/src/libultra_code/guPerspectiveF.c b/src/libultra_code/guPerspectiveF.c index caef68560f..503bcc25a4 100644 --- a/src/libultra_code/guPerspectiveF.c +++ b/src/libultra_code/guPerspectiveF.c @@ -1,7 +1,6 @@ #include "libultra_internal.h" -void guPerspectiveF(float mf[4][4], u16 *perspNorm, float fovy, float aspect, float near, float far, - float scale) { +void guPerspectiveF(float mf[4][4], u16* perspNorm, float fovy, float aspect, float near, float far, float scale) { float yscale; int row; int col; @@ -23,14 +22,14 @@ void guPerspectiveF(float mf[4][4], u16 *perspNorm, float fovy, float aspect, fl if (near + far <= 2.0) { *perspNorm = 65535; } else { - *perspNorm = (double) (1 << 17) / (near + far); - if (*perspNorm <= 0) + *perspNorm = (double)(1 << 17) / (near + far); + if (*perspNorm <= 0) { *perspNorm = 1; + } } } } -void guPerspective(Mtx *m, u16 *perspNorm, float fovy, float aspect, float near, float far, - float scale) { +void guPerspective(Mtx* m, u16* perspNorm, float fovy, float aspect, float near, float far, float scale) { float mat[4][4]; guPerspectiveF(mat, perspNorm, fovy, aspect, near, far, scale); guMtxF2L(mat, m); diff --git a/src/libultra_code/osContInit.c b/src/libultra_code/osContInit.c index dcccfb765c..33cc136b8f 100644 --- a/src/libultra_code/osContInit.c +++ b/src/libultra_code/osContInit.c @@ -5,19 +5,19 @@ pif_data_buffer_t _osPifInternalBuff; u8 _osCont_lastPollType; -u8 _osCont_numControllers; //always 4 +u8 _osCont_numControllers; // always 4 -//Not sure if the following is a struct together with the last two variables +// Not sure if the following is a struct together with the last two variables u16 unk_80175812; u32 unk_80175814; -u8 unk_80175818[0x20]; +u8 unk_80175818[0x20]; u32 gOsContInitialized = 0; OSMesgQueue _osContMesgQueue; OSMesg _osContMesgBuff[4]; #define HALF_SECOND OS_USEC_TO_CYCLES(500000) -s32 osContInit(OSMesgQueue *mq, u8 *ctl_present_bitfield, OSContStatus *status) { //func_80100C10 +s32 osContInit(OSMesgQueue* mq, u8* ctl_present_bitfield, OSContStatus* status) { OSMesg mesg; s32 ret = 0; OSTime currentTime; @@ -47,8 +47,8 @@ s32 osContInit(OSMesgQueue *mq, u8 *ctl_present_bitfield, OSContStatus *status) return ret; } -void __osContGetInitData(u8 *ctl_present_bitfield, OSContStatus *status) { //func_80100D6C - PIF_IO_slot_t *slot_ptr; +void __osContGetInitData(u8* ctl_present_bitfield, OSContStatus* status) { + PIF_IO_slot_t* slot_ptr; PIF_IO_slot_t slot; s32 i; u8 bitfield_temp; @@ -66,11 +66,11 @@ void __osContGetInitData(u8 *ctl_present_bitfield, OSContStatus *status) { //fun *ctl_present_bitfield = bitfield_temp; } -void __osPackRequestData(u8 command) { //func_80100E18 - PIF_IO_slot_t *slot_ptr; +void __osPackRequestData(u8 command) { + PIF_IO_slot_t* slot_ptr; PIF_IO_slot_t slot; s32 i; - for(i = 0; i < 0xF; i++) { + for (i = 0; i < 0xF; i++) { _osPifInternalBuff.words[i] = 0; } _osPifInternalBuff.status_control = 1; diff --git a/src/libultra_code/osContStartReadData.c b/src/libultra_code/osContStartReadData.c index a96bc6f288..9bd0bfbd23 100644 --- a/src/libultra_code/osContStartReadData.c +++ b/src/libultra_code/osContStartReadData.c @@ -3,12 +3,10 @@ #include -s32 osContStartReadData(OSMesgQueue *mq) //func_80100EF0 -{ +s32 osContStartReadData(OSMesgQueue* mq) { s32 ret; - __osSiGetAccess(); //__osSiGetAccess - if (_osCont_lastPollType != 1) - { + __osSiGetAccess(); // __osSiGetAccess + if (_osCont_lastPollType != 1) { __osPackReadData(); __osSiRawStartDma(OS_WRITE, &_osPifInternalBuff); osRecvMesg(mq, NULL, OS_MESG_BLOCK); @@ -19,8 +17,8 @@ s32 osContStartReadData(OSMesgQueue *mq) //func_80100EF0 return ret; } -void osContGetReadData(OSContPad *pad) { //func_80100F74 - PIF_IO_slot_t *slot_ptr; +void osContGetReadData(OSContPad* pad) { + PIF_IO_slot_t* slot_ptr; PIF_IO_slot_t slot; s32 i; slot_ptr = _osPifInternalBuff.slots; @@ -35,12 +33,12 @@ void osContGetReadData(OSContPad *pad) { //func_80100F74 }; } -void __osPackReadData() { //func_80101000 - PIF_IO_slot_t *slot_ptr; +void __osPackReadData() { + PIF_IO_slot_t* slot_ptr; PIF_IO_slot_t slot; s32 i; slot_ptr = _osPifInternalBuff.slots; - for(i = 0; i < 0xF; i++) { + for (i = 0; i < 0xF; i++) { _osPifInternalBuff.words[i] = 0; } _osPifInternalBuff.status_control = 1; @@ -51,7 +49,7 @@ void __osPackReadData() { //func_80101000 slot.button = 0xFFFF; slot.rawStickX = 0xFF; slot.rawStickY = 0xFF; - for(i = 0; i < _osCont_numControllers; i++) { + for (i = 0; i < _osCont_numControllers; i++) { *slot_ptr++ = slot; } slot_ptr->hdr.slot_type = 0xFE; diff --git a/src/libultra_code/osDpGetStatus.c b/src/libultra_code/osDpGetStatus.c index 636bdd2f96..f9c87f1fb2 100644 --- a/src/libultra_code/osDpGetStatus.c +++ b/src/libultra_code/osDpGetStatus.c @@ -1,6 +1,5 @@ #include -u32 osDpGetStatus(void) -{ +u32 osDpGetStatus(void) { return DPC_STATUS_REG; } diff --git a/src/libultra_code/osDpSetStatus.c b/src/libultra_code/osDpSetStatus.c index 9a5f189a55..d57ca509e3 100644 --- a/src/libultra_code/osDpSetStatus.c +++ b/src/libultra_code/osDpSetStatus.c @@ -1,6 +1,5 @@ #include -void osDpSetStatus(u32 status) -{ +void osDpSetStatus(u32 status) { DPC_STATUS_REG = status; } diff --git a/src/libultra_code/osVibrationPack.c b/src/libultra_code/osVibrationPack.c index b00f25de80..033f04500e 100644 --- a/src/libultra_code/osVibrationPack.c +++ b/src/libultra_code/osVibrationPack.c @@ -5,25 +5,24 @@ pif_data_buffer_t osPifBuffers[4]; -//func_800CF990 in 1.0 -s32 osSetVibration(unk_controller_t *arg0, u32 vibrate) //func_80100780 -{ +// func_800CF990 in 1.0 +s32 osSetVibration(unk_controller_t* arg0, u32 vibrate) { s32 i; s32 ret; - u8 *buf; - + u8* buf; + buf = (u8*)&osPifBuffers[arg0->ctrlridx]; - if (!(arg0->unk0 & 8)){ + if (!(arg0->unk0 & 8)) { return 5; } __osSiGetAccess(); osPifBuffers[arg0->ctrlridx].status_control = 1; buf += arg0->ctrlridx; - for(i=0; i<0x20; i++){ - ((PIF_mempak_wr_t*)buf)->data[i+2] = vibrate; + for (i = 0; i < 0x20; i++) { + ((PIF_mempak_wr_t*)buf)->data[i + 2] = vibrate; } - - _osCont_lastPollType = (u8)0xfe; //last controller poll type? + + _osCont_lastPollType = (u8)0xfe; // last controller poll type? __osSiRawStartDma(OS_WRITE, &osPifBuffers[arg0->ctrlridx]); osRecvMesg(arg0->ctrlrqueue, NULL, OS_MESG_BLOCK); __osSiRawStartDma(OS_READ, &osPifBuffers[arg0->ctrlridx]); @@ -31,11 +30,11 @@ s32 osSetVibration(unk_controller_t *arg0, u32 vibrate) //func_80100780 ret = ((PIF_mempak_wr_t*)buf)->hdr.status_hi_bytes_rec_lo & 0xc0; if (!ret) { if (!vibrate) { - if (((PIF_mempak_wr_t*)buf)->data[0x22] != 0){ + if (((PIF_mempak_wr_t*)buf)->data[0x22] != 0) { ret = 4; } - }else{ - if (((PIF_mempak_wr_t*)buf)->data[0x22] != 0xeb){ + } else { + if (((PIF_mempak_wr_t*)buf)->data[0x22] != 0xeb) { ret = 4; } } @@ -44,19 +43,18 @@ s32 osSetVibration(unk_controller_t *arg0, u32 vibrate) //func_80100780 return ret; } -void osSetUpMempakWrite(s32 ctrlridx, pif_data_buffer_t* buf) //func_801009F4 -{ +void osSetUpMempakWrite(s32 ctrlridx, pif_data_buffer_t* buf) { u8* buf_ptr = (u8*)buf; PIF_mempak_wr_t mempakwr; s32 i; mempakwr.hdr.slot_type = 0xFF; mempakwr.hdr.bytes_send = 0x23; mempakwr.hdr.status_hi_bytes_rec_lo = 1; - mempakwr.hdr.command = 3; //write mempak + mempakwr.hdr.command = 3; // write mempak mempakwr.data[0] = 0xC0; - mempakwr.data[1] = (u8)(func_80106170(0x600) | 0xC000); //yes, this is correct - if(ctrlridx != 0){ - for(i=0; ictrlrqueue = ctrlrqueue; unk_controller->ctrlridx = ctrlridx; unk_controller->bytes[0x65] = (u8)0xff; unk_controller->unk0 = 0; - + ret = func_80104C80(unk_controller, 0xfe); - if (ret == 2){ + if (ret == 2) { ret = func_80104C80(unk_controller, 0x80); } - if (ret != 0){ + if (ret != 0) { return ret; } ret = func_80105F40(ctrlrqueue, ctrlridx, 0x400, &sp24); ret = ret; - if (ret == 2){ + if (ret == 2) { ret = 4; //"Controller pack communication error" } - if (ret != 0){ + if (ret != 0) { return ret; } - if (sp24.unk[0x1F] == 0xfe){ - return 0xb; //possibly controller pack? (Some other valid return value other than vibration pack) + if (sp24.unk[0x1F] == 0xfe) { + return 0xb; // possibly controller pack? (Some other valid return value other than vibration pack) } ret = func_80104C80(unk_controller, 0x80); - if (ret == 2){ + if (ret == 2) { ret = 4; //"Controller pack communication error" } - if (ret != 0){ + if (ret != 0) { return ret; } ret = func_80105F40(ctrlrqueue, ctrlridx, 0x400, &sp24); - if (ret == 2){ + if (ret == 2) { ret = 4; //"Controller pack communication error" } - if (ret != 0){ + if (ret != 0) { return ret; } - if (sp24.unk[0x1F] != 0x80){ - return 0xb; //possibly controller pack? (Some other valid return value other than vibration pack) + if (sp24.unk[0x1F] != 0x80) { + return 0xb; // possibly controller pack? (Some other valid return value other than vibration pack) } - if ((unk_controller->unk0 & 8) == 0){ + if ((unk_controller->unk0 & 8) == 0) { osSetUpMempakWrite(ctrlridx, &osPifBuffers[ctrlridx]); } unk_controller->unk0 = 8; return 0; //"Recognized vibration pack" } - 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 d81d0c84f7..2c4c6d6d47 100644 --- a/src/overlays/actors/ovl_Arms_Hook/z_arms_hook.c +++ b/src/overlays/actors/ovl_Arms_Hook/z_arms_hook.c @@ -1,6 +1,6 @@ #include "z_arms_hook.h" -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x00000030 void ArmsHook_Init(ArmsHook* this, GlobalContext* globalCtx); @@ -9,8 +9,7 @@ void ArmsHook_Update(ArmsHook* this, GlobalContext* globalCtx); void ArmsHook_Draw(ArmsHook* this, GlobalContext* globalCtx); /* -const ActorInit Arms_Hook_InitVars = -{ +const ActorInit Arms_Hook_InitVars = { ACTOR_ARMS_HOOK, ACTORTYPE_ITEMACTION, ROOM, diff --git a/src/overlays/actors/ovl_Arms_Hook/z_arms_hook.h b/src/overlays/actors/ovl_Arms_Hook/z_arms_hook.h index 59af6ae3bf..9e3a512f45 100644 --- a/src/overlays/actors/ovl_Arms_Hook/z_arms_hook.h +++ b/src/overlays/actors/ovl_Arms_Hook/z_arms_hook.h @@ -4,8 +4,7 @@ #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ Actor actor; /* 0x014C */ char unk_14C[0xCC]; } ArmsHook; // size = 0x0218 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 5bf11cac9f..8a0df9e5db 100644 --- a/src/overlays/actors/ovl_Arrow_Fire/z_arrow_fire.c +++ b/src/overlays/actors/ovl_Arrow_Fire/z_arrow_fire.c @@ -1,6 +1,13 @@ -#include "z_arrow_fire.h" +/* + * File: z_arrow_fire.c + * Overlay: ovl_Arrow_Fire + * Description: Fire Arrow actor. Spawned by and attached to a normal arrow. + */ -#define ROOM 0x00 +#include "z_arrow_fire.h" +#include "../ovl_En_Arrow/z_en_arrow.h" + +#define ROOM 0x00 #define FLAGS 0x02000010 void ArrowFire_Init(ArrowFire* this, GlobalContext* globalCtx); @@ -8,9 +15,13 @@ void ArrowFire_Destroy(ArrowFire* this, GlobalContext* globalCtx); void ArrowFire_Update(ArrowFire* this, GlobalContext* globalCtx); void ArrowFire_Draw(ArrowFire* this, GlobalContext* globalCtx); -/* -const ActorInit Arrow_Fire_InitVars = -{ +void ArrowFire_Charge(ArrowFire* this, GlobalContext* globalCtx); +void ArrowFire_Fly(ArrowFire* this, GlobalContext* globalCtx); +void ArrowFire_Hit(ArrowFire* this, GlobalContext* globalCtx); + +#include "z_arrow_fire_gfx.c" + +const ActorInit Arrow_Fire_InitVars = { ACTOR_ARROW_FIRE, ACTORTYPE_ITEMACTION, ROOM, @@ -22,21 +33,213 @@ const ActorInit Arrow_Fire_InitVars = (ActorFunc)ArrowFire_Update, (ActorFunc)ArrowFire_Draw, }; -*/ -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Arrow_Fire/func_80865D10.s") -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Arrow_Fire/ArrowFire_Init.s") +static InitChainEntry initChain[] = { + ICHAIN_F32(unk_F4, 2000, ICHAIN_STOP), +}; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Arrow_Fire/ArrowFire_Destroy.s") +void ArrowFire_SetupAction(ArrowFire* this, ActorFunc* actionFunc) { + this->actionFunc = actionFunc; +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Arrow_Fire/func_80865DD8.s") +void ArrowFire_Init(ArrowFire* this, GlobalContext* globalCtx) { + Actor_ProcessInitChain(&this->actor, initChain); + this->radius = 0; + this->unk_158 = 1.0f; + ArrowFire_SetupAction(&this->actor, ArrowFire_Charge); + Actor_SetScale(this, 0.01f); + this->alpha = 0xA0; + this->timer = 0; + this->unk_15C = 0.0f; +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Arrow_Fire/func_80865ECC.s") +void ArrowFire_Destroy(ArrowFire* this, GlobalContext* globalCtx) { + func_800876C8(globalCtx); + // Translates to: ""Disappearance" = Disappearance" + LOG_STRING("消滅", "../z_arrow_fire.c", 421); +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Arrow_Fire/func_80865F1C.s") +void ArrowFire_Charge(ArrowFire* this, GlobalContext* globalCtx) { + EnArrow* arrow; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Arrow_Fire/func_808660E8.s") + arrow = this->actor.attachedA; + if ((arrow == NULL) || (arrow->actor.update == NULL)) { + Actor_Kill(&this->actor); + return; + } -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Arrow_Fire/ArrowFire_Update.s") + if (this->radius < 10) { + this->radius += 1; + } + // copy position and rotation from the attached arrow + this->actor.posRot.pos = arrow->actor.posRot.pos; + this->actor.shape.rot = arrow->actor.shape.rot; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Arrow_Fire/ArrowFire_Draw.s") + func_8002F974(&this->actor, NA_SE_PL_ARROW_CHARGE_FIRE); + + // If arrow's attached is null, Link has fired the arrow + if (arrow->actor.attachedA == NULL) { + this->unkPos = this->actor.posRot.pos; + this->radius = 10; + ArrowFire_SetupAction(this, ArrowFire_Fly); + this->alpha = 0xFF; + } +} + +void func_80865ECC(Vec3f* unkPos, Vec3f* firePos, f32 scale) { + unkPos->x += ((firePos->x - unkPos->x) * scale); + unkPos->y += ((firePos->y - unkPos->y) * scale); + unkPos->z += ((firePos->z - unkPos->z) * scale); +} + +void ArrowFire_Hit(ArrowFire* this, GlobalContext* globalCtx) { + f32 scale; + f32 offset; + u16 timer; + + if (this->actor.unk_F0 < 50.0f) { + scale = 10.0f; + } else { + if (950.0f < this->actor.unk_F0) { + scale = 310.0f; + } else { + scale = this->actor.unk_F0; + scale = ((scale - 50.0f) * (1.0f / 3.0f)) + 10.0f; + } + } + + timer = this->timer; + if (timer != 0) { + this->timer -= 1; + + if (this->timer >= 8) { + offset = ((this->timer - 8) * (1.0f / 24.0f)); + offset = SQ(offset); + this->radius = (((1.0f - offset) * scale) + 10.0f); + this->unk_158 += ((2.0f - this->unk_158) * 0.1f); + if (this->timer < 16) { + if (1) {} + this->alpha = ((this->timer * 0x23) - 0x118); + } + } + } + + if (this->timer >= 9) { + if (this->unk_15C < 1.0f) { + this->unk_15C += 0.25f; + } + } else { + if (this->unk_15C > 0.0f) { + this->unk_15C -= 0.125f; + } + } + + if (this->timer < 8) { + this->alpha = 0; + } + + if (this->timer == 0) { + this->timer = 255; + Actor_Kill(&this->actor); + } +} + +void ArrowFire_Fly(ArrowFire* this, GlobalContext* globalCtx) { + EnArrow* arrow; + f32 distanceScaled; + s32 pad; + + arrow = this->actor.attachedA; + if ((arrow == NULL) || (arrow->actor.update == NULL)) { + Actor_Kill(&this->actor); + return; + } + // copy position and rotation from the attached arrow + this->actor.posRot.pos = arrow->actor.posRot.pos; + this->actor.shape.rot = arrow->actor.shape.rot; + distanceScaled = Math_Vec3f_DistXYZ(&this->unkPos, &this->actor.posRot.pos) * (1.0f / 24.0f); + this->unk_158 = distanceScaled; + if (distanceScaled < 1.0f) { + this->unk_158 = 1.0f; + } + func_80865ECC(&this->unkPos, &this->actor.posRot.pos, 0.05f); + + if (arrow->hitWall & 1) { + Audio_PlayActorSound2(&this->actor, NA_SE_IT_EXPLOSION_FRAME); + ArrowFire_SetupAction(this, ArrowFire_Hit); + this->timer = 32; + this->alpha = 0xFF; + } else if (arrow->timer < 34) { + if (this->alpha < 0x23) { + Actor_Kill(&this->actor); + } else { + this->alpha -= 0x19; + } + } +} + +void ArrowFire_Update(ArrowFire* this, GlobalContext* globalCtx) { + if (globalCtx->msgCtx.msgMode == 0xD || globalCtx->msgCtx.msgMode == 0x11) { + Actor_Kill(&this->actor); + } else { + this->actionFunc(this, globalCtx); + } +} + +void ArrowFire_Draw(ArrowFire* this, GlobalContext* globalCtx) { + s32 pad1; + s32 pad2; + u32 stateFrames; + GraphicsContext* gfxCtx; + Actor* tranform; + EnArrow* arrow; + Gfx* dispRefs[4]; + + stateFrames = globalCtx->state.frames; + arrow = this->actor.attachedA; + if (1) {} + + if ((arrow != NULL) && (arrow->actor.update != NULL) && (this->timer < 255)) { + if (1) {} + tranform = (arrow->hitWall & 2) ? &this->actor : &arrow->actor; + // clang-format off + gfxCtx = globalCtx->state.gfxCtx; Graph_OpenDisps(dispRefs, globalCtx->state.gfxCtx, "../z_arrow_fire.c", 618); + // clang-format on + Matrix_Translate(tranform->posRot.pos.x, tranform->posRot.pos.y, tranform->posRot.pos.z, MTXMODE_NEW); + Matrix_RotateY(tranform->shape.rot.y * (M_PI / 32768), MTXMODE_APPLY); + Matrix_RotateX(tranform->shape.rot.x * (M_PI / 32768), MTXMODE_APPLY); + Matrix_RotateZ(tranform->shape.rot.z * (M_PI / 32768), MTXMODE_APPLY); + Matrix_Scale(0.01f, 0.01f, 0.01f, MTXMODE_APPLY); + + // Draw red effect over the screen when arrow hits + if (this->unk_15C > 0) { + gfxCtx->polyXlu.p = func_800937C0(gfxCtx->polyXlu.p); + gDPSetPrimColor(gfxCtx->polyXlu.p++, 0, 0, (s32)(40.0f * this->unk_15C) & 0xFF, 0x00, 0x00, + (s32)(150.0f * this->unk_15C) & 0xFF); + gDPSetAlphaDither(gfxCtx->polyXlu.p++, G_AD_DISABLE); + gDPSetColorDither(gfxCtx->polyXlu.p++, G_CD_DISABLE); + gDPFillRectangle(gfxCtx->polyXlu.p++, 0, 0, SCREEN_WIDTH - 1, SCREEN_HEIGHT - 1); + } + + // Draw fire on the arrow + func_80093D84(globalCtx->state.gfxCtx); + gDPSetPrimColor(gfxCtx->polyXlu.p++, 0x80, 0x80, 0xFF, 0xC8, 0x00, this->alpha); + gDPSetEnvColor(gfxCtx->polyXlu.p++, 0xFF, 0x00, 0x00, 0x80); + Matrix_RotateZYX(0x4000, 0x0, 0x0, MTXMODE_APPLY); + if (this->timer != 0) { + Matrix_Translate(0.0f, 0.0f, 0.0f, MTXMODE_APPLY); + } else { + Matrix_Translate(0.0f, 1500.0f, 0.0f, MTXMODE_APPLY); + } + 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(gfxCtx->polyXlu.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_arrow_fire.c", 666), + G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + gSPDisplayList(gfxCtx->polyXlu.p++, textureDL); + gSPDisplayList(gfxCtx->polyXlu.p++, + Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 255 - (stateFrames * 2) % 256, 0, 64, 32, 1, + 255 - stateFrames % 256, 511 - (stateFrames * 10) % 512, 64, 64)); + gSPDisplayList(gfxCtx->polyXlu.p++, vertexDL); + Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_arrow_fire.c", 682); + } +} diff --git a/src/overlays/actors/ovl_Arrow_Fire/z_arrow_fire.h b/src/overlays/actors/ovl_Arrow_Fire/z_arrow_fire.h index be16627ada..345d7409ed 100644 --- a/src/overlays/actors/ovl_Arrow_Fire/z_arrow_fire.h +++ b/src/overlays/actors/ovl_Arrow_Fire/z_arrow_fire.h @@ -4,10 +4,15 @@ #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ Actor actor; - /* 0x014C */ char unk_14C[0x20]; + /* 0x014C */ Vec3f unkPos; + /* 0x0158 */ f32 unk_158; + /* 0x015C */ f32 unk_15C; + /* 0x0160 */ ActorFunc actionFunc; + /* 0x0164 */ s16 radius; + /* 0x0166 */ u16 timer; + /* 0x0168 */ u8 alpha; } ArrowFire; // size = 0x016C extern const ActorInit Arrow_Fire_InitVars; diff --git a/src/overlays/actors/ovl_Arrow_Fire/z_arrow_fire_gfx.c b/src/overlays/actors/ovl_Arrow_Fire/z_arrow_fire_gfx.c new file mode 100644 index 0000000000..0b6990d9fc --- /dev/null +++ b/src/overlays/actors/ovl_Arrow_Fire/z_arrow_fire_gfx.c @@ -0,0 +1,190 @@ +#include "z_arrow_fire.h" + +static UNK_TYPE texture1[] = { + 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, + 0x00000000, 0x00000001, 0x00000000, 0x00000102, 0x01000001, 0x00000000, 0x00000000, 0x00010000, 0x00000000, + 0x00000001, 0x00000000, 0x00000204, 0x02000101, 0x00000000, 0x00000000, 0x00010101, 0x00000001, 0x00000001, + 0x00000000, 0x00000307, 0x03010102, 0x00000000, 0x00000000, 0x01010102, 0x00000002, 0x01010001, 0x00000000, + 0x00010509, 0x04010103, 0x01000000, 0x00000000, 0x01020202, 0x00000104, 0x03020101, 0x00000000, 0x0001060C, + 0x06010103, 0x01000000, 0x00000000, 0x02020202, 0x00000206, 0x05040101, 0x00000000, 0x0001080F, 0x07010103, + 0x01000001, 0x00000000, 0x03030202, 0x00010408, 0x07060201, 0x00000000, 0x00010911, 0x08010103, 0x01000001, + 0x00000001, 0x04040303, 0x0101050B, 0x0A080301, 0x00000000, 0x00020B14, 0x0A010103, 0x01000001, 0x00010102, + 0x06060403, 0x0203070D, 0x0C0A0401, 0x00000000, 0x00030D17, 0x0B020103, 0x01010001, 0x00010205, 0x09080503, + 0x0205090E, 0x0E0D0501, 0x00000000, 0x01050F18, 0x0C020102, 0x01010001, 0x00010408, 0x0D0B0502, 0x03070B0F, + 0x0F0F0601, 0x00000000, 0x02081219, 0x0D030102, 0x00010001, 0x0001050B, 0x130F0702, 0x04080B0F, 0x10110801, + 0x00000000, 0x030C1419, 0x0E040101, 0x00010001, 0x0001070F, 0x19140A03, 0x05090B0E, 0x10130A02, 0x00000001, + 0x05121719, 0x0E040100, 0x00010102, 0x01020A13, 0x1F1A0F06, 0x06090A0C, 0x10150B03, 0x01000001, 0x08181B19, + 0x0F050201, 0x01020102, 0x02040D18, 0x2721140A, 0x080A0A0C, 0x11160D04, 0x02020001, 0x0B1E1E19, 0x10070403, + 0x02030202, 0x0408111D, 0x2F2A1B0F, 0x0A0B0B0D, 0x12180F06, 0x04040101, 0x0E242119, 0x11090606, 0x04040304, + 0x070C1623, 0x38322214, 0x0E0D0E10, 0x141A1108, 0x06060102, 0x112A241A, 0x120B0909, 0x06050507, 0x0B111C29, + 0x413B291B, 0x13101216, 0x181B1209, 0x08080304, 0x152F271B, 0x140E0C0C, 0x0907080B, 0x10172230, 0x4A433223, + 0x1813161D, 0x1D1E140B, 0x0A0A0608, 0x1A342B1E, 0x17110F0F, 0x0C0B0D11, 0x171F2A38, 0x534C3B2B, 0x1E161C25, + 0x2221160D, 0x0B0C0A0E, 0x21393023, 0x1B151211, 0x0F0F1217, 0x1E273240, 0x5C564534, 0x251B242F, 0x2924190F, + 0x0E0E0F17, 0x293E372B, 0x21181513, 0x1113181E, 0x26303B48, 0x655F4E3E, 0x2D222D3A, 0x30271C13, 0x11111520, + 0x32453F35, 0x281D1714, 0x14181E25, 0x2F3A4551, 0x6F695746, 0x362B3744, 0x372A1F17, 0x15151D2A, 0x3D4D483F, + 0x31231A14, 0x171E252E, 0x38444F5B, 0x7974614F, 0x4036404C, 0x3C2D231D, 0x1A1A2637, 0x4957524A, 0x3A2A1D15, + 0x1A252E37, 0x43505B66, 0x837F6C59, 0x4A414750, 0x3F2E2723, 0x21213245, 0x57625D54, 0x43312216, 0x1F2D3741, + 0x4D5B6671, 0x8E8B7662, 0x544B4D51, 0x3F302C2C, 0x2B2D4054, 0x656D675E, 0x4C3A281A, 0x2536414B, 0x5867717B, + 0x9896816C, 0x5E545150, 0x3F323337, 0x383C5063, 0x71777168, 0x56432F21, 0x2C3F4B56, 0x63727C86, 0xA2A08B76, + 0x685D5651, 0x3F343A43, 0x484D5F70, 0x7D827B71, 0x5F4C3829, 0x34465462, 0x6F7C8690, 0xACA99581, 0x72655B53, + 0x42394450, 0x585E6D7C, 0x878C8479, 0x68574334, 0x3D4E5E6E, 0x7B88919A, 0xB4B09E8C, 0x7C6E6155, 0x46414F5F, + 0x676E7B87, 0x92958C80, 0x71625041, 0x4857697A, 0x86929BA3, 0xBBB7A796, 0x86776658, 0x4D4B5C6E, 0x777D8791, + 0x9C9F9487, 0x7A6D5C4F, 0x54617486, 0x919CA4AB, 0xC2BBAFA1, 0x907F6C5D, 0x55576A7E, 0x8589929A, 0xA5A99D90, + 0x8478695E, 0x5F697F93, 0x9DA6ACB2, 0xC8BFB6AC, 0x9A877465, 0x6064788D, 0x92949BA1, 0xADB2A89C, 0x8F83766C, + 0x6A718AA1, 0xA9AFB2B8, 0xCEC3BDB6, 0xA4907E70, 0x6C72879B, 0x9C9CA2A8, 0xB5BBB3A9, 0x9B8E8279, 0x737693AE, + 0xB4B6B9BE, 0xD5C9C5BF, 0xAF9C8B7E, 0x7A8094A5, 0xA4A0A7B0, 0xBDC5C0B7, 0xA8998E85, 0x7B7B9AB7, 0xBDBEC0C5, + 0xDBCFCCC8, 0xBAA9998E, 0x898E9FAD, 0xA8A1ACB8, 0xC6CECCC5, 0xB6A4988F, 0x8381A0BE, 0xC4C6C8CD, 0xE0D4D3D1, + 0xC5B7A89D, 0x989CA8B3, 0xABA2B0C0, 0xCED8D8D2, 0xC2AEA298, 0x8C89A6C3, 0xCACED1D5, 0xE5DBDAD8, 0xD0C4B6AB, + 0xA6A8B1B8, 0xAEA4B5C7, 0xD6E0E3DE, 0xCDB7ABA2, 0x9590ACC9, 0xD0D5D9DC, 0xEBE1E0DE, 0xDAD1C4B9, 0xB2B2B8BC, + 0xB1A7B9CE, 0xDEE8ECE8, 0xD6BDB3AC, 0x9E98B3CE, 0xD6DBE0E3, 0xF0E9E6E3, 0xE3DDD2C6, 0xBCBABEC0, 0xB4AABED5, + 0xE5EFF3F0, 0xDDC2BBB6, 0xA79FB9D4, 0xDCE2E7E9, 0xF5F0ECE7, 0xEAE8DED2, 0xC6C1C2C3, 0xB7ADC4DD, 0xEBF3F8F5, + 0xE1C6C2C1, 0xB1A7BFD8, 0xE1E7EDF0, 0xF9F5F1EB, 0xF0F0E9DD, 0xCFC7C7C6, 0xBBB1CBE5, 0xF0F5FBF7, 0xE3CACACC, + 0xBBB0C5DC, 0xE5ECF4F6, 0xFCF9F5EE, 0xF5F7F0E7, 0xD7CDCCCB, 0xBFB7D2EB, 0xF4F7FBF6, 0xE4CDD2D6, 0xC6B9CBE0, + 0xE9F1F9FB, 0xFDFCF8F2, 0xF9FAF6EE, 0xDFD5D3D0, 0xC5BDD9F0, 0xF7F9FBF4, 0xE5D0D9E0, 0xD1C2D2E4, 0xEDF5FCFE, + 0xFEFDFAF4, 0xFBFCF9F3, 0xE6DDDAD7, 0xCBC3DEF4, 0xFAFBFCF3, 0xE5D3DEE8, 0xDBCDDAE9, 0xF2F8FEFF, 0xFEFDFCF6, + 0xFCFDFCF7, 0xECE4E2DF, 0xD2C9E3F7, 0xFCFDFBF3, 0xE5D6E4EF, 0xE3D6E1EE, 0xF6FAFEFF, 0xFEFDFDF8, 0xFCFDFDFA, + 0xF1EAE9E7, 0xD9CFE7F9, 0xFEFEFBF3, 0xE7DBE9F4, 0xEBDFE8F3, 0xF9FCFFFF, 0xFEFDFDFA, 0xFDFDFEFC, 0xF5EFEFEE, + 0xE0D5ECFB, 0xFFFEFBF3, 0xE9E1EEF8, 0xF0E6EEF6, 0xFCFDFFFF, 0xFEFDFEFC, 0xFEFDFEFE, 0xF8F4F4F3, 0xE7DDF1FD, + 0xFFFEFBF3, 0xECE7F3FC, 0xF5ECF2F9, 0xFDFEFFFF, 0xFEFDFFFE, 0xFFFDFEFE, 0xFAF7F8F7, 0xEDE5F5FE, 0xFFFEFBF5, + 0xF0EDF7FD, 0xF9F1F5FA, 0xFEFFFFFF, 0xFEFDFFFF, 0xFFFEFEFF, 0xFCFAFAFA, 0xF2ECF8FE, 0xFFFEFCF7, 0xF4F3FAFE, + 0xFBF6F8FB, 0xFEFFFFFF, 0xFEFDFFFF, 0xFFFEFEFF, 0xFDFCFCFC, 0xF7F2FBFF, 0xFFFEFCFA, 0xF8F7FCFF, 0xFEFAFBFC, + 0xFFFFFFFF, 0xFEFEFFFF, 0xFFFFFFFF, 0xFEFDFEFD, 0xFAF7FCFF, 0xFFFEFDFC, 0xFCFBFDFF, 0xFFFDFDFD, 0xFFFFFFFF, + 0xFFFEFFFF, 0xFFFFFFFF, 0xFFFEFEFE, 0xFCFAFDFF, 0xFFFEFEFE, 0xFEFDFEFF, 0xFFFFFEFD, 0xFFFFFFFF, 0xFFFFFFFF, + 0xFFFFFFFF, 0xFFFFFFFF, 0xFDFCFEFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFE, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, + 0xFFFFFFFF, 0xFEFEFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, + 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, + 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, + 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, + 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, + 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, + 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, +}; + +static UNK_TYPE texture2[] = { + 0x2F3E56AB, 0xA4582102, 0x10417AB0, 0x805C312A, 0x32376DD4, 0xA2633907, 0x0B387DA2, 0x6D81470C, 0x3C5C60AC, + 0xA5571801, 0x154C97B9, 0x68533236, 0x304276D6, 0x9B533108, 0x154A96B7, 0x7C9B400B, 0x3E756FAE, 0xAF5D1301, + 0x1D59B4BF, 0x53432C38, 0x2F487DCC, 0x8A4A2406, 0x1F5DB0C8, 0x90B55110, 0x408B7FAA, 0xB76D1503, 0x286ACCBE, + 0x43312030, 0x2B4C82BA, 0x77431607, 0x2B70C7D5, 0xA6B95B13, 0x409C93A6, 0xB87D1D08, 0x367FE1C1, 0x3C261629, + 0x2A508AAB, 0x69410C0C, 0x3986DDDB, 0xB5AE6316, 0x40A0A7A1, 0xAA7D2610, 0x4596F1CD, 0x47281E36, 0x365C97A3, + 0x63450713, 0x499DF0D8, 0xB49E721A, 0x409AB59F, 0x8A662D1C, 0x57AEFBDF, 0x6B404456, 0x536EA49B, 0x6A4D061E, + 0x5CB6FCC6, 0x9A8E7F20, 0x428EBEA0, 0x623F2E2A, 0x69C6FFF0, 0x9A686569, 0x6F83AC92, 0x7F5D0B2A, 0x70CDFFB2, + 0x77848D29, 0x4787C4A0, 0x401D2E3E, 0x7ED9FFFC, 0xC48F7973, 0x8598AE86, 0x9A701339, 0x85E1FFA6, 0x5E859534, + 0x5189C99B, 0x2C0B3455, 0x92E9FFFA, 0xDCAB8071, 0x94ACAD7A, 0xB1882249, 0x9AF1FFB0, 0x6A8F9746, 0x6394CD8D, + 0x290C416F, 0xA5EEFFF4, 0xDCB46B6D, 0xA1BFAD77, 0xB6A43A58, 0xAAF8FFC8, 0x84959963, 0x7BA4CE78, 0x351A588E, + 0xB5E3F9F1, 0xCFAC6077, 0xABCFAC77, 0xA8C05A6A, 0xB2F3FFE1, 0xA3959471, 0x94B9D065, 0x473274A9, 0xBDCDECEF, + 0xC2A05F86, 0xBADDAC78, 0x92D87C7D, 0xAFDEFDF1, 0xBC8C8971, 0xA6D2D45A, 0x584B95BB, 0xC1B3D5ED, 0xB8956697, + 0xC5E9A670, 0x7AE6978F, 0xA4BEF0EF, 0xB9797360, 0xB1E8DD5D, 0x5D5FAFC7, 0xC49CB8E3, 0xAF8C78A5, 0xCBF19D5F, + 0x6AE5A6A3, 0x9398DBE7, 0xB46A5841, 0xB8F2E871, 0x586DC1CD, 0xC78C9DD5, 0xAA878CB1, 0xD8F89249, 0x63DCABB3, + 0x8576C5D8, 0xA95E4430, 0xC0EBEE91, 0x5378CACE, 0xC58087C5, 0xA4859EAE, 0xE1FD8A36, 0x60D0ACBD, 0x7765B9C5, + 0x9C563A2B, 0xCED7E7B4, 0x5484C7CC, 0xB66F7CBB, 0x9F81A898, 0xE3FF8D2E, 0x63C8B0BA, 0x6D69B8B0, 0x93573B2E, + 0xE0C2CED2, 0x6898C0C3, 0x97587EBC, 0x9D749570, 0xDEFF9D36, 0x67C8B4A8, 0x6682BD9B, 0x93643E37, 0xF0B4A8DE, + 0x86A9B6B0, 0x70448BBE, 0x99617545, 0xD1FFB84E, 0x70CAB48C, 0x64A4BD8D, 0x96763D41, 0xFAAC82DA, 0xA7B6AE9A, + 0x4D359AC0, 0x90494F27, 0xC0FFD675, 0x80CCAD6D, 0x63C1B681, 0x9C85374E, 0xFFA069C9, 0xC1BAA785, 0x3936A4B6, + 0x7D342E18, 0xA9FFEEA5, 0x9AC59F56, 0x60D0A873, 0x9288315E, 0xFB8669B6, 0xD0B6A473, 0x3C47A39A, 0x6228241B, + 0x8BFFF6CD, 0xB7BB8F47, 0x57CFA169, 0x77782C6B, 0xE56478AA, 0xD6AC9E64, 0x4E61977C, 0x4B232428, 0x6FFFEBE5, + 0xD0AF813C, 0x44C2A266, 0x5B61296E, 0xC04188A8, 0xD4A09051, 0x5D788B61, 0x3E202234, 0x58F9D7DF, 0xDEA27332, + 0x31AE9A6C, 0x3E4B2F62, 0x902688B3, 0xD0937A3F, 0x5D7D8B58, 0x37241F35, 0x46F2C5BF, 0xD7956528, 0x1E918E76, + 0x3442424A, 0x601774C3, 0xCB8F6630, 0x48698261, 0x333C2729, 0x3CECBF95, 0xC2885420, 0x11717B78, 0x4952673A, + 0x3D1153CD, 0xC994602F, 0x2D496F6D, 0x31674418, 0x32E7CA6C, 0xA77D4318, 0x09526672, 0x6B6F963E, 0x2B1036D0, + 0xCAA26E3C, 0x1B2A5A7B, 0x3798700F, 0x2BDFD94D, 0x8C773712, 0x043C606C, 0x9086B955, 0x281225C9, 0xC7AD8954, + 0x141B4085, 0x53CB9C10, 0x26D3E63A, 0x757A3B11, 0x0131666F, 0xAB87BA6A, 0x2E151FBF, 0xC1AEA16A, 0x1721388C, + 0x81ECBB17, 0x23C1EE30, 0x6688561E, 0x02317381, 0xA36A9566, 0x3B171FB9, 0xB5A5AF7A, 0x1B384395, 0xABFBC81D, + 0x20AAEB28, 0x61987838, 0x05358299, 0x85405D4E, 0x45181FB5, 0xA695B083, 0x1C55569C, 0xCEFFCF1E, 0x1A8CDA24, + 0x62A39755, 0x0A398FAE, 0x601A2A2C, 0x49161FB1, 0x9A8BAC8A, 0x23736DA0, 0xE0FFD61E, 0x136BAF23, 0x70ABAD6D, + 0x143D95BD, 0x41030D16, 0x41151DAA, 0x938BAA94, 0x2E8A8BA7, 0xE6FFD921, 0x0C4A7D2D, 0x7CACAB70, 0x244093C3, + 0x38020F11, 0x2F151CA3, 0x9293ABA1, 0x3995AAB7, 0xEDF7D924, 0x072F5842, 0x83AE9C66, 0x3F498EC7, 0x420D2812, + 0x1E151F9B, 0x989CB0B2, 0x4697C5CE, 0xF5F0D626, 0x061B435B, 0x85B18A5B, 0x5F568BCD, 0x54245213, 0x12172593, + 0x9FA1BAC0, 0x5291D4E1, 0xFAF0D123, 0x0711416F, 0x82B2765B, 0x84668FCB, 0x684D8212, 0x1318308A, 0xA3A2C2C6, + 0x5F88D3EE, 0xFEF6C81B, 0x0B104276, 0x85B06A72, 0xA97896C3, 0x7C81AC19, 0x24194083, 0xA2A0C6C4, 0x6A82CCF1, + 0xFFFFB910, 0x14173E77, 0x8BAE6992, 0xC6879BB4, 0x92B3C933, 0x3C1D4F7D, 0x9DA2CCBE, 0x7381C6E6, 0xFFFFB111, + 0x26233975, 0x92AF6DAF, 0xDB949AA3, 0xADDBDD64, 0x5927597B, 0x99AAD4B9, 0x7687C6D5, 0xFCFFB736, 0x432D3A78, + 0x98B371BD, 0xE5A0989E, 0xCCF2EAA0, 0x753C5C80, 0x9DB9E3BC, 0x7896CFBF, 0xF6FFCB72, 0x64323F81, 0x9CBC70B4, + 0xE3AC9EAD, 0xE6FBF6CF, 0x8B5C5C85, 0xA7C8F4C2, 0x7AA6D9A3, 0xF0FFE2A9, 0x8032448D, 0xA4C970A0, 0xDBB5AAC6, + 0xF7FEFDE7, 0xA3806187, 0xB0D6FFC9, 0x7FB5D686, 0xE7FFF0D2, 0x8D2F4E98, 0xABD7768D, 0xCFB9B4E1, 0xF8F8FFE7, + 0xB29B7089, 0xB7E4FFCD, 0x8CB8BF65, 0xD5FFF0D7, 0x8D34609D, 0xB4E48385, 0xC3BAB0F1, 0xE2E8FEDC, 0xB5A07A8D, + 0xBDEFFFD0, 0x9AAB9543, 0xB9FFE9C3, 0x80447497, 0xC0EF9C90, 0xBDB997E5, 0xC2CCFBD4, 0xAB8F7387, 0xC8F8FFD4, + 0xA4936324, 0x98FFE5B3, 0x6F577E8A, 0xCEFABCA8, 0xC0BC71C7, 0x9EADF4D2, 0x916D5D7B, 0xD4FEFFD6, 0xA575390F, + 0x76FFE4A6, 0x656A7F7D, 0xDDFFDABF, 0xC8BF4CA1, 0x8095E8CC, 0x744A3B66, 0xDAFFFFD6, 0x9D5B1E04, 0x5DFDDF9A, + 0x6075787A, 0xECFFF1CD, 0xCEC42E7C, 0x7087D6BF, 0x5A311F49, 0xD4FFFFD0, 0x8E4B1100, 0x50F7D892, 0x68767788, + 0xF6FFFDCE, 0xCDC31E65, 0x6E88C3A8, 0x4922153A, 0xC3FFFDC4, 0x7F410B03, 0x4BEED08B, 0x747682A0, 0xFDFFFEBF, + 0xBCB61456, 0x7792B18B, 0x3E19153D, 0xB5FFF8B2, 0x733B0908, 0x4DE0C487, 0x827797BC, 0xFFFFF8AB, 0x9E9B0E50, + 0x869E9F6E, 0x3714184D, 0xB5FFF09E, 0x67380C11, 0x56CFB285, 0x8F7EADD4, 0xFFFFED96, 0x78730A53, 0x9CA98F57, + 0x310F1C69, 0xC8FFE18A, 0x5D35161D, 0x64BC9E84, 0x978BBFE7, 0xFFFFDD81, 0x5348075A, 0xB5B07F48, 0x290A2088, + 0xE1FFCF75, 0x5335272B, 0x74AD877F, 0x9C9DCFF3, 0xFFFEC86E, 0x35260864, 0xC6B16F3E, 0x200422A6, 0xF8FCB95F, + 0x47373A3C, 0x86A36F73, 0x9FB0D9FA, 0xFFF7B15B, 0x21110E70, 0xCDAB6139, 0x160027C1, 0xFFF09F4C, 0x3B3A4B4D, + 0x989D5B5D, 0x9DB5D9FE, 0xFFEA994C, 0x1509177B, 0xC8A15C3C, 0x0E022BD1, 0xFFE1873B, 0x2F3E5460, 0xA8954F44, + 0x96A6CEFF, 0xFFD7823C, 0x0C0A2784, 0xB9956343, 0x0B0731DB, 0xFFCE722C, 0x22415672, 0xB58C4A31, 0x8A88BAFF, + 0xFAC56E2E, 0x060F398F, 0xA989764A, 0x0A0C3AE1, 0xFFB85F20, 0x17425787, 0xBF824826, 0x775FA3FF, 0xF1B66121, + 0x03164B98, 0x9A818E4A, 0x0A1040D4, 0xE8974D14, 0x11405495, 0xBB74401F, 0x603D86F1, 0xD7A35414, 0x02195694, + 0x8476943E, 0x171A46C5, 0xCC7D3D0C, 0x0D3E599E, 0xAE6C371C, 0x4A2D72E3, 0xC38F4C0E, 0x03205F96, 0x766A792A, + 0x242B4FB8, 0xB66A2E06, 0x0D3E66AA, 0x9B663322, 0x3B2D6CDD, 0xB47B450A, 0x062B6E9C, 0x6E705D17 +}; + +static UNK_TYPE vertices1[] = { + 0x00420271, 0xFFBE0000, 0x060006C2, 0x3E52C2FF, 0x000002BC, 0x00000000, 0x07000800, 0x007800FF, 0x005D0271, + 0x00000000, 0x080006C2, 0x575200FF, 0x00BD01DB, 0xFFB20000, 0x07000419, 0x5E3FD9FF, 0x00BD01DB, 0x004E0000, + 0x09000419, 0x5E3F27FF, 0x01AF001B, 0x00000000, 0x08000005, 0x6B3500FF, 0x0131001B, 0x01310000, 0x0A000005, + 0x4C354CFF, 0x000002BC, 0x00000000, 0x09000800, 0x007800FF, 0x00420271, 0x00420000, 0x0A0006C2, 0x3E523EFF, + 0x004E01DB, 0x00BD0000, 0x0B000419, 0x273F5EFF, 0x0000001B, 0x01AF0000, 0x0C000005, 0x00356BFF, 0x000002BC, + 0x00000000, 0x0B000800, 0x007800FF, 0x00000271, 0x005D0000, 0x0C0006C2, 0x005257FF, 0xFFB201DB, 0x00BD0000, + 0x0D000419, 0xD93F5EFF, 0xFECF001B, 0x01310000, 0x0E000005, 0xB4354CFF, 0x000002BC, 0x00000000, 0x0D000800, + 0x007800FF, 0xFFBE0271, 0x00420000, 0x0E0006C2, 0xC2523EFF, 0xFF4301DB, 0x004E0000, 0x0F000419, 0xA23F27FF, + 0xFE51001B, 0x00000000, 0x10000005, 0x953500FF, 0xFFA30271, 0x00000000, 0x100006C2, 0xA95200FF, 0xFF4301DB, + 0xFFB20000, 0x11000419, 0xA23FD9FF, 0xFE51001B, 0x00000000, 0x00000005, 0x953500FF, 0xFF4301DB, 0xFFB20000, + 0x01000419, 0xA23FD9FF, 0xFECF001B, 0xFECF0000, 0x02000005, 0xB435B4FF, 0xFFA30271, 0x00000000, 0x000006C2, + 0xA95200FF, 0x000002BC, 0x00000000, 0x01000800, 0x007800FF, 0xFFBE0271, 0xFFBE0000, 0x020006C2, 0xC252C2FF, + 0xFFB201DB, 0xFF430000, 0x03000419, 0xD93FA2FF, 0x0000001B, 0xFE510000, 0x04000005, 0x003595FF, 0x000002BC, + 0x00000000, 0x03000800, 0x007800FF, 0x00000271, 0xFFA30000, 0x040006C2, 0x0052A9FF, 0x004E01DB, 0xFF430000, + 0x05000419, 0x273FA2FF, +}; + +static UNK_TYPE vertices2[] = { + 0x0000001B, 0xFE510000, 0x04000005, 0x003595FF, 0x004E01DB, 0xFF430000, 0x05000419, 0x273FA2FF, 0x0131001B, + 0xFECF0000, 0x06000005, 0x4C35B4FF, 0x00000271, 0xFFA30000, 0x040006C2, 0x0052A9FF, 0x000002BC, 0x00000000, + 0x05000800, 0x007800FF, 0x00420271, 0xFFBE0000, 0x060006C2, 0x3E52C2FF, 0x00BD01DB, 0xFFB20000, 0x07000419, + 0x5E3FD9FF, 0x01AF001B, 0x00000000, 0x08000005, 0x6B3500FF, 0xFFBE0271, 0x00420000, 0x060006C2, 0xC2523EFF, + 0x000002BC, 0x00000000, 0x07000800, 0x007800FF, 0xFFA30271, 0x00000000, 0x080006C2, 0xA95200FF, +}; + +static Gfx textureDL[] = { + gsDPPipeSync(), + gsDPSetTextureLUT(G_TT_NONE), + gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON), + gsDPLoadTextureBlock(texture1, G_IM_FMT_I, G_IM_SIZ_8b, 32, 64, 0, G_TX_NOMIRROR | G_TX_WRAP, + G_TX_MIRROR | G_TX_WRAP, 5, 6, 1, 15), + gsDPLoadMultiBlock(texture2, 0x0100, 1, G_IM_FMT_I, G_IM_SIZ_8b, 32, 64, 0, G_TX_NOMIRROR | G_TX_WRAP, + G_TX_MIRROR | G_TX_WRAP, 5, 6, 1, G_TX_NOLOD), + gsDPSetCombineLERP(TEXEL1, PRIMITIVE, ENV_ALPHA, TEXEL0, TEXEL1, 1, ENVIRONMENT, TEXEL0, PRIMITIVE, ENVIRONMENT, + COMBINED, ENVIRONMENT, COMBINED, 0, PRIMITIVE, 0), + gsDPSetRenderMode(G_RM_PASS, G_RM_ZB_CLD_SURF2), + gsSPClearGeometryMode(G_CULL_BACK | G_FOG | G_TEXTURE_GEN | G_TEXTURE_GEN_LINEAR), + gsSPSetGeometryMode(G_LIGHTING), + gsSPEndDisplayList(), +}; + +static Gfx vertexDL[] = { + gsSPVertex(vertices1, 32, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSP2Triangles(3, 2, 4, 0, 3, 4, 5, 0), + gsSP2Triangles(5, 4, 6, 0, 2, 7, 8, 0), + gsSP2Triangles(2, 8, 4, 0, 4, 8, 9, 0), + gsSP2Triangles(4, 9, 6, 0, 6, 9, 10, 0), + gsSP2Triangles(8, 11, 12, 0, 8, 12, 9, 0), + gsSP2Triangles(9, 12, 13, 0, 9, 13, 10, 0), + gsSP2Triangles(10, 13, 14, 0, 12, 15, 16, 0), + gsSP2Triangles(12, 16, 13, 0, 13, 16, 17, 0), + gsSP2Triangles(13, 17, 14, 0, 14, 17, 18, 0), + gsSP2Triangles(16, 19, 17, 0, 17, 19, 20, 0), + gsSP2Triangles(17, 20, 18, 0, 21, 22, 23, 0), + gsSP2Triangles(24, 25, 26, 0, 24, 26, 22, 0), + gsSP2Triangles(22, 26, 27, 0, 22, 27, 23, 0), + gsSP2Triangles(23, 27, 28, 0, 26, 29, 30, 0), + gsSP2Triangles(26, 30, 27, 0, 27, 30, 31, 0), + gsSP1Triangle(27, 31, 28, 0), + gsSPVertex(vertices2, 11, 0), + gsSP2Triangles(0, 1, 2, 0, 3, 4, 5, 0), + gsSP2Triangles(3, 5, 1, 0, 1, 5, 6, 0), + gsSP2Triangles(1, 6, 2, 0, 2, 6, 7, 0), + gsSP1Triangle(8, 9, 10, 0), + gsSPEndDisplayList(), +}; 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 466249a739..ce37b01a1e 100644 --- a/src/overlays/actors/ovl_Arrow_Ice/z_arrow_ice.c +++ b/src/overlays/actors/ovl_Arrow_Ice/z_arrow_ice.c @@ -1,6 +1,13 @@ -#include "z_arrow_ice.h" +/* + * File: z_arrow_ice.c + * Overlay: ovl_Arrow_Ice + * Description: Ice Arrow actor. Spawned by and attached to a normal arrow. + */ -#define ROOM 0x00 +#include "z_arrow_ice.h" +#include "../ovl_En_Arrow/z_en_arrow.h" + +#define ROOM 0x00 #define FLAGS 0x02000010 void ArrowIce_Init(ArrowIce* this, GlobalContext* globalCtx); @@ -8,9 +15,13 @@ void ArrowIce_Destroy(ArrowIce* this, GlobalContext* globalCtx); void ArrowIce_Update(ArrowIce* this, GlobalContext* globalCtx); void ArrowIce_Draw(ArrowIce* this, GlobalContext* globalCtx); -/* -const ActorInit Arrow_Ice_InitVars = -{ +void ArrowIce_Charge(ArrowIce* this, GlobalContext* globalCtx); +void ArrowIce_Fly(ArrowIce* this, GlobalContext* globalCtx); +void ArrowIce_Hit(ArrowIce* this, GlobalContext* globalCtx); + +#include "z_arrow_ice_gfx.c" + +const ActorInit Arrow_Ice_InitVars = { ACTOR_ARROW_ICE, ACTORTYPE_ITEMACTION, ROOM, @@ -22,21 +33,213 @@ const ActorInit Arrow_Ice_InitVars = (ActorFunc)ArrowIce_Update, (ActorFunc)ArrowIce_Draw, }; -*/ -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Arrow_Ice/func_80867CD0.s") -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Arrow_Ice/ArrowIce_Init.s") +static InitChainEntry initChain[] = { + ICHAIN_F32(unk_F4, 2000, ICHAIN_STOP), +}; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Arrow_Ice/ArrowIce_Destroy.s") +void ArrowIce_SetupAction(ArrowIce* this, ActorFunc* actionFunc) { + this->actionFunc = actionFunc; +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Arrow_Ice/func_80867D98.s") +void ArrowIce_Init(ArrowIce* this, GlobalContext* globalCtx) { + Actor_ProcessInitChain(&this->actor, initChain); + this->radius = 0; + this->unk_160 = 1.0f; + ArrowIce_SetupAction(this, ArrowIce_Charge); + Actor_SetScale(&this->actor, 0.01f); + this->alpha = 0x64; + this->timer = 0; + this->unk_164 = 0.0f; +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Arrow_Ice/func_80867E8C.s") +void ArrowIce_Destroy(ArrowIce* this, GlobalContext* globalCtx) { + func_800876C8(globalCtx); + // Translates to: ""Disappearance" = Disappearance" + LOG_STRING("消滅", "../z_arrow_ice.c", 415); +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Arrow_Ice/func_80867EDC.s") +void ArrowIce_Charge(ArrowIce* this, GlobalContext* globalCtx) { + EnArrow* arrow; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Arrow_Ice/func_808680A8.s") + arrow = this->actor.attachedA; + if ((arrow == NULL) || (arrow->actor.update == NULL)) { + Actor_Kill(&this->actor); + return; + } -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Arrow_Ice/ArrowIce_Update.s") + if (this->radius < 10) { + this->radius += 1; + } + // copy position and rotation from the attached arrow + this->actor.posRot.pos = arrow->actor.posRot.pos; + this->actor.shape.rot = arrow->actor.shape.rot; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Arrow_Ice/ArrowIce_Draw.s") + func_8002F974(&this->actor, NA_SE_PL_ARROW_CHARGE_ICE); + + // If arrow's attached is null, Link has fired the arrow + if (arrow->actor.attachedA == NULL) { + this->unkPos = this->actor.posRot.pos; + this->radius = 10; + ArrowIce_SetupAction(this, ArrowIce_Fly); + this->alpha = 0xFF; + } +} + +void func_80867E8C(Vec3f* unkPos, Vec3f* icePos, f32 scale) { + unkPos->x += ((icePos->x - unkPos->x) * scale); + unkPos->y += ((icePos->y - unkPos->y) * scale); + unkPos->z += ((icePos->z - unkPos->z) * scale); +} + +void ArrowIce_Hit(ArrowIce* this, GlobalContext* globalCtx) { + f32 scale; + f32 offset; + u16 timer; + + if (this->actor.unk_F0 < 50.0f) { + scale = 10.0f; + } else { + if (950.0f < this->actor.unk_F0) { + scale = 310.0f; + } else { + scale = this->actor.unk_F0; + scale = ((scale - 50.0f) * (1.0f / 3.0f)) + 10.0f; + } + } + + timer = this->timer; + if (timer != 0) { + this->timer -= 1; + + if (this->timer >= 8) { + offset = ((this->timer - 8) * (1.0f / 24.0f)); + offset = SQ(offset); + this->radius = (((1.0f - offset) * scale) + 10.0f); + this->unk_160 += ((2.0f - this->unk_160) * 0.1f); + if (this->timer < 16) { + if (1) {} + this->alpha = ((this->timer * 0x23) - 0x118); + } + } + } + + if (this->timer >= 9) { + if (this->unk_164 < 1.0f) { + this->unk_164 += 0.25f; + } + } else { + if (this->unk_164 > 0.0f) { + this->unk_164 -= 0.125f; + } + } + + if (this->timer < 8) { + this->alpha = 0; + } + + if (this->timer == 0) { + this->timer = 255; + Actor_Kill(&this->actor); + } +} + +void ArrowIce_Fly(ArrowIce* this, GlobalContext* globalCtx) { + EnArrow* arrow; + f32 distanceScaled; + s32 pad; + + arrow = this->actor.attachedA; + if ((arrow == NULL) || (arrow->actor.update == NULL)) { + Actor_Kill(&this->actor); + return; + } + // copy position and rotation from the attached arrow + this->actor.posRot.pos = arrow->actor.posRot.pos; + this->actor.shape.rot = arrow->actor.shape.rot; + distanceScaled = Math_Vec3f_DistXYZ(&this->unkPos, &this->actor.posRot.pos) * (1.0f / 24.0f); + this->unk_160 = distanceScaled; + if (distanceScaled < 1.0f) { + this->unk_160 = 1.0f; + } + func_80867E8C(&this->unkPos, &this->actor.posRot.pos, 0.05f); + + if (arrow->hitWall & 1) { + Audio_PlayActorSound2(&this->actor, NA_SE_IT_EXPLOSION_ICE); + ArrowIce_SetupAction(this, ArrowIce_Hit); + this->timer = 32; + this->alpha = 0xFF; + } else if (arrow->timer < 34) { + if (this->alpha < 0x23) { + Actor_Kill(&this->actor); + } else { + this->alpha -= 0x19; + } + } +} + +void ArrowIce_Update(ArrowIce* this, GlobalContext* globalCtx) { + if (globalCtx->msgCtx.msgMode == 0xD || globalCtx->msgCtx.msgMode == 0x11) { + Actor_Kill(&this->actor); + } else { + this->actionFunc(this, globalCtx); + } +} + +void ArrowIce_Draw(ArrowIce* this, GlobalContext* globalCtx) { + s32 pad1; + s32 pad2; + Actor* tranform; + u32 stateFrames; + GraphicsContext* gfxCtx; + EnArrow* arrow; + Gfx* dispRefs[4]; + + stateFrames = globalCtx->state.frames; + arrow = this->actor.attachedA; + if (1) {} + + if ((arrow != NULL) && (arrow->actor.update != NULL) && (this->timer < 255)) { + if (1) {} + tranform = (arrow->hitWall & 2) ? &this->actor : &arrow->actor; + // clang-format off + gfxCtx = globalCtx->state.gfxCtx; Graph_OpenDisps(dispRefs, globalCtx->state.gfxCtx, "../z_arrow_ice.c", 610); + // clang-format on + Matrix_Translate(tranform->posRot.pos.x, tranform->posRot.pos.y, tranform->posRot.pos.z, MTXMODE_NEW); + Matrix_RotateY(tranform->shape.rot.y * (M_PI / 32768), MTXMODE_APPLY); + Matrix_RotateX(tranform->shape.rot.x * (M_PI / 32768), MTXMODE_APPLY); + Matrix_RotateZ(tranform->shape.rot.z * (M_PI / 32768), MTXMODE_APPLY); + Matrix_Scale(0.01f, 0.01f, 0.01f, MTXMODE_APPLY); + + // Draw blue effect over the screen when arrow hits + if (this->unk_164 > 0) { + gfxCtx->polyXlu.p = func_800937C0(gfxCtx->polyXlu.p); + gDPSetPrimColor(gfxCtx->polyXlu.p++, 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(gfxCtx->polyXlu.p++, G_AD_DISABLE); + gDPSetColorDither(gfxCtx->polyXlu.p++, G_CD_DISABLE); + gDPFillRectangle(gfxCtx->polyXlu.p++, 0, 0, SCREEN_WIDTH - 1, SCREEN_HEIGHT - 1); + } + + // Draw ice on the arrow + func_80093D84(globalCtx->state.gfxCtx); + gDPSetPrimColor(gfxCtx->polyXlu.p++, 0x80, 0x80, 0xAA, 0xFF, 0xFF, this->alpha); + gDPSetEnvColor(gfxCtx->polyXlu.p++, 0x00, 0x00, 0xFF, 0x80); + Matrix_RotateZYX(0x4000, 0x0, 0x0, MTXMODE_APPLY); + if (this->timer != 0) { + Matrix_Translate(0.0f, 0.0f, 0.0f, MTXMODE_APPLY); + } else { + Matrix_Translate(0.0f, 1500.0f, 0.0f, MTXMODE_APPLY); + } + 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(gfxCtx->polyXlu.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_arrow_ice.c", 660), + G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + gSPDisplayList(gfxCtx->polyXlu.p++, textureDL); + gSPDisplayList(gfxCtx->polyXlu.p++, + 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(gfxCtx->polyXlu.p++, vertexDL); + Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_arrow_ice.c", 676); + } +} diff --git a/src/overlays/actors/ovl_Arrow_Ice/z_arrow_ice.h b/src/overlays/actors/ovl_Arrow_Ice/z_arrow_ice.h index e521d49c7a..7a15734797 100644 --- a/src/overlays/actors/ovl_Arrow_Ice/z_arrow_ice.h +++ b/src/overlays/actors/ovl_Arrow_Ice/z_arrow_ice.h @@ -4,10 +4,15 @@ #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ Actor actor; - /* 0x014C */ char unk_14C[0x20]; + /* 0x014C */ s16 radius; + /* 0x014E */ u16 timer; + /* 0x0150 */ u8 alpha; + /* 0x0154 */ Vec3f unkPos; + /* 0x0160 */ f32 unk_160; + /* 0x0164 */ f32 unk_164; + /* 0x0168 */ ActorFunc actionFunc; } ArrowIce; // size = 0x016C extern const ActorInit Arrow_Ice_InitVars; diff --git a/src/overlays/actors/ovl_Arrow_Ice/z_arrow_ice_gfx.c b/src/overlays/actors/ovl_Arrow_Ice/z_arrow_ice_gfx.c new file mode 100644 index 0000000000..85836388a3 --- /dev/null +++ b/src/overlays/actors/ovl_Arrow_Ice/z_arrow_ice_gfx.c @@ -0,0 +1,190 @@ +#include "z_arrow_ice.h" + +static UNK_TYPE texture1[] = { + 0x00061507, 0x00000000, 0x295A2B08, 0x10030F03, 0x0D070006, 0x00031625, 0x3F230012, 0x79590000, 0x00102C2A, + 0x254A1B0E, 0xAFF66600, 0x00467E29, 0x08020000, 0x03383E0B, 0x0501000A, 0x31211C05, 0x00031C27, 0x4CA92F13, + 0xB2EF5500, 0x057EBF37, 0x00000000, 0x0E493F13, 0x00000002, 0x335C3E03, 0x00000E07, 0x3C761200, 0x447E2200, + 0x00426710, 0x00000000, 0x071C2208, 0x00000168, 0xE18F0F00, 0x00060E00, 0x0A100000, 0x0514022D, 0x1B020400, + 0x00000000, 0x093A3F0A, 0x050010AE, 0xDA360000, 0x00070500, 0x00000000, 0x00001461, 0x3E050024, 0x24000000, + 0x184E3755, 0x9132043C, 0x2F000000, 0x12020A54, 0x3C000200, 0x00000F3E, 0x2B041159, 0x2C000000, 0x030B22CE, + 0xF9420000, 0x00000301, 0x371160EF, 0xAC6D2B00, 0x00000008, 0x05000D27, 0x06000000, 0x00001A91, 0x760B0000, + 0x000B030A, 0x747DB0BD, 0xBDA31D00, 0x00000000, 0x00000000, 0x00000511, 0x01000209, 0x03020015, 0x583A0010, + 0xC1E0892D, 0x532D0000, 0x03160600, 0x00050001, 0x15142E4E, 0x07000500, 0x100D004C, 0xB65C001B, 0xB2DF9417, + 0x00000020, 0x57420400, 0x45882F00, 0x18093B3E, 0x01182F0D, 0x1405003F, 0xB75B001E, 0x5DC2E14F, 0x00000161, + 0xBC4A005A, 0xECF84A00, 0x0011330F, 0x0044591C, 0x01001C7C, 0xB122001F, 0x5DE4FF71, 0x00000177, 0xBA3218D9, + 0xFFC41700, 0x1E7B5A1C, 0x2B769635, 0x0044D5FA, 0x9E000530, 0xC7FFCE35, 0x00000035, 0x663441CF, 0xC9380000, + 0x3D733C28, 0x3E709726, 0x0086FAF1, 0x9B170D4C, 0xC9812700, 0x000E1A02, 0x4C642544, 0x2B000000, 0x0D0E0508, + 0x0A252F03, 0x00335297, 0xC75B014E, 0x77470600, 0x00160F00, 0x3A350016, 0x29070000, 0x0C3A3911, 0x00000003, + 0x0100004B, 0x8F4B051C, 0x7F6C1C00, 0x00000000, 0x00000437, 0x2E030001, 0x2A6E6B2C, 0x0604000E, 0x0B000004, + 0x19350814, 0x3E63813D, 0x13000000, 0x00000117, 0x06000000, 0x14362911, 0x312E021F, 0x13000000, 0x010C000C, + 0x10B9EF72, 0x2D010000, 0x040C0C10, 0x02000000, 0x33410306, 0x3B30071D, 0x07000000, 0x00000000, 0x1BC2A129, + 0x0D000000, 0x050E1112, 0x0100002E, 0xD2C22E00, 0x21593403, 0x00000000, 0x01010000, 0x0E451B00, 0x00000000, + 0x0000060D, 0x00000061, 0xFFEA2E00, 0x3DA04200, 0x00000000, 0x06140B00, 0x00040200, 0x00000000, 0x00061B0C, + 0x00000037, 0x8D620500, 0x2A8F5801, 0x00000000, 0x082E3404, 0x00000000, 0x00000003, 0x0A201B02, 0x00000000, + 0x06000000, 0x11826503, 0x00060400, 0x07303402, 0x07010007, 0x2F1E0B0A, 0x09080000, 0x03000000, 0x00000000, + 0x07452500, 0x0E361100, 0x000B0A00, 0x06000018, 0x3E170600, 0x00060F0D, 0x3E190000, 0x00000000, 0x00000000, + 0x21360700, 0x00000000, 0x00000007, 0x09000000, 0x0A857124, 0x703C0000, 0x01000000, 0x00000000, 0x08050000, + 0x00000000, 0x00000000, 0x00000000, 0x32D97112, 0x4A1B0001, 0x02050000, 0x00000000, 0x021A0A00, 0x00000613, + 0x07000000, 0x00000000, 0x1E5D1700, 0x04000000, 0x37550400, 0x00000000, 0x14300600, 0x00003E5B, 0x08000000, + 0x00000000, 0x2F2F0000, 0x00000007, 0x90840300, 0x0F070000, 0x06070000, 0x00055A62, 0x00000000, 0x00000020, + 0xA77B0700, 0x0106000F, 0x612D0006, 0x1B030000, 0x00000001, 0x0000211A, 0x00000000, 0x0000002E, 0x944A0103, + 0x3B390200, 0x04000011, 0x14000005, 0x302F0D10, 0x01000000, 0x00000000, 0x00000009, 0x10000015, 0x5D290000, + 0x00000015, 0x09000027, 0x73510F09, 0x37410700, 0x00061408, 0x00000000, 0x25582D09, 0x12020E03, 0x0C070007, + 0x00031627, 0x41240011, 0x795B0000, 0x00102D29, 0x244B1C0D, 0xB0F76600, 0x00467C28, 0x08020000, 0x02383E0B, + 0x0401000A, 0x32231C04, 0x00031B28, 0x4CA83112, 0xB2EF5500, 0x057EBE38, 0x00000000, 0x0D493D13, 0x00000002, + 0x325C3F03, 0x00000E08, 0x3D761200, 0x457F2200, 0x0043660F, 0x00000000, 0x071D2208, 0x00000168, 0xE1901000, + 0x00070E00, 0x09110000, 0x0515022D, 0x1B020400, 0x00000000, 0x093B3E09, 0x050011AE, 0xD9370000, 0x00070500, + 0x00000000, 0x00001462, 0x3E050024, 0x25000000, 0x184E3554, 0x9431043C, 0x2E000000, 0x12010955, 0x3C000300, + 0x0000103E, 0x2B04115A, 0x2D000000, 0x030B22CE, 0xF9420000, 0x00000301, 0x361161EF, 0xAC6B2B00, 0x00000008, + 0x05000D27, 0x07000000, 0x00001A8F, 0x760B0000, 0x000B030A, 0x727DB1BD, 0xBCA21C00, 0x00000000, 0x00000000, + 0x00000610, 0x00000208, 0x03030016, 0x57390010, 0xC1E1892E, 0x522C0000, 0x03160600, 0x00060001, 0x14142F4E, + 0x07000500, 0x100E004B, 0xB55C001B, 0xB0DD9416, 0x0000001F, 0x57430500, 0x468A3000, 0x16093B3E, 0x01192F0D, + 0x1405003E, 0xB65B001D, 0x5CC1E04E, 0x0000005E, 0xBC4B0058, 0xEBFA4B00, 0x0011340E, 0x0045591C, 0x02001C7C, + 0xB223001E, 0x5CE5FF71, 0x00000176, 0xB93216D8, 0xFFC21700, 0x1D7B5B1C, 0x2B759636, 0x0041D4FC, 0x9D000530, + 0xC7FFCE36, 0x00000036, 0x663540CE, 0xC6360000, 0x3C743E29, 0x3E719827, 0x0085FAF0, 0x9B160D4E, 0xC9812600, + 0x000F1A03, 0x4B642646, 0x2B000000, 0x0D0E0608, 0x0A253002, 0x00345299, 0xC85B014E, 0x75470600, 0x00160F00, + 0x39350015, 0x29070000, 0x0C3A3911, 0x00000003, 0x0100004B, 0x914B051E, 0x7D6C1C01, 0x00000000, 0x00000437, + 0x2E030001, 0x2A6F6A2A, 0x0604000E, 0x0B000003, 0x1A350814, 0x3E63813E, 0x13000000, 0x00000118, 0x07000000, + 0x13382911, 0x302E0320, 0x14000000, 0x010D000C, 0x0FB9EE73, 0x2F000000, 0x040B0C11, 0x02000000, 0x36440307, + 0x3B30071D, 0x07000000, 0x00000000, 0x1ABF9F29, 0x0E000000, 0x050F1112, 0x0100002D, 0xD3C42B00, 0x22593404, + 0x00000000, 0x01010000, 0x0E451B00, 0x00000000, 0x0000070C, 0x00000061, 0xFFED2F00, 0x3EA04300, 0x00000000, + 0x05140B00, 0x00030200, 0x00000000, 0x00061C0B, 0x00000037, 0x8F640500, 0x2A8F5901, 0x00000000, 0x082D3504, + 0x00000000, 0x00010003, 0x0A201B02, 0x00000000, 0x07000000, 0x11826503, 0x00050400, 0x072F3503, 0x07010007, + 0x2F1E0C0B, 0x09080000, 0x03000000, 0x00000000, 0x07462500, 0x0E361100, 0x000B0900, 0x04000018, 0x3E160600, + 0x00060F0B, 0x3D190000, 0x00000000, 0x00000000, 0x21370600, 0x00000000, 0x00000007, 0x09000000, 0x0B866F22, + 0x713C0000, 0x02000000, 0x00000000, 0x08060000, 0x00000000, 0x00000000, 0x00000000, 0x30D76F12, 0x4B1A0001, + 0x02050000, 0x00000000, 0x021A0A00, 0x00000714, 0x08000000, 0x00000000, 0x1E5C1700, 0x03000000, 0x36560400, + 0x00000000, 0x15300600, 0x00003F5D, 0x07000000, 0x00000000, 0x2E2F0000, 0x00000008, 0x8F840300, 0x0F060000, + 0x06070000, 0x00065B61, 0x00000000, 0x00000020, 0xA67C0700, 0x0006000E, 0x612D0006, 0x1B030000, 0x00000001, + 0x0001211B, 0x00000000, 0x0000002F, 0x93490103, 0x3B390200, 0x04000011, 0x13000005, 0x2F2E0C11, 0x02000000, + 0x00000000, 0x00000008, 0x14030015, 0x5D2C0000, 0x00000115, 0x08000027, 0x724F0F0A, 0x353D0600, +}; + +static UNK_TYPE texture2[] = { + 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, + 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x02030404, + 0x04040303, 0x03030303, 0x03020202, 0x02020201, 0x01010000, 0x00000000, 0x01010305, 0x090B0D0D, 0x0C0B0A0A, + 0x0A0A0B0A, 0x09080707, 0x07070707, 0x07070705, 0x04030201, 0x0304070B, 0x11141717, 0x16141313, 0x14151514, + 0x110D0B0B, 0x0C0D0F12, 0x13141413, 0x110C0905, 0x07070B12, 0x181E2121, 0x201F1F20, 0x2225221D, 0x17120F0F, + 0x13171D23, 0x292D2D2A, 0x2219120A, 0x07080C13, 0x1B202223, 0x22232629, 0x2C2B261F, 0x17121112, 0x18202B36, + 0x4046453D, 0x3022150C, 0x07080D15, 0x1C202325, 0x272A2E33, 0x3431281E, 0x16121217, 0x202E3F4F, 0x595D5A4E, + 0x3B27170C, 0x07090F16, 0x1C202327, 0x2B32383C, 0x3B34291E, 0x1613161E, 0x2D425866, 0x6D6E6856, 0x3F28160B, + 0x070A1117, 0x1C20252A, 0x333B4245, 0x41382C21, 0x18161B28, 0x3D586E7A, 0x7D7A6F58, 0x3C231309, 0x070C1318, + 0x1E222932, 0x3C464E4F, 0x4A413529, 0x1F1D2232, 0x4C6A8189, 0x88816D50, 0x331D0E07, 0x090F181F, 0x252B343F, + 0x4A555E5F, 0x5C524537, 0x2B272D40, 0x5D7C9197, 0x91816444, 0x29160B07, 0x0F19222A, 0x323B4550, 0x5D6D787D, + 0x796B5B49, 0x3C373E52, 0x7190A2A2, 0x93785537, 0x20110A0A, 0x1D28343E, 0x47505A64, 0x738698A1, 0x9C8D7761, + 0x534E566D, 0x8DA6B0A6, 0x8D69472C, 0x190F0E13, 0x36434F57, 0x5F676E77, 0x869BB0BC, 0xBBAF9A84, 0x74717D93, + 0xADBCBBA5, 0x835E412A, 0x1D1A1E27, 0x5360696E, 0x73777C82, 0x8C9EB3C5, 0xCECBBEAB, 0x9F9FA9BC, 0xCACEBFA0, + 0x7A593F2F, 0x282B3545, 0x6F767778, 0x78787A7F, 0x8593A8C2, 0xD6DDDAD2, 0xCCCBD2DA, 0xDFD7BE9B, 0x775A473C, + 0x3A445463, 0x7E7D7875, 0x716D6D71, 0x78849BBA, 0xD8EAEDED, 0xEBEBEDED, 0xEBDABB97, 0x7862554F, 0x5562727B, + 0x7F766E67, 0x625D5C5F, 0x697991B2, 0xD6EFF7F5, 0xF3F4F7F7, 0xEDD5B496, 0x7F70696B, 0x74808787, 0x796C5F57, + 0x514D4C52, 0x5E738EAF, 0xD1EAF1ED, 0xEBEDF4F4, 0xE6CCB099, 0x8A818087, 0x91959288, 0x7261534A, 0x4541434A, + 0x597290AE, 0xCADCE0DC, 0xDADDE5E6, 0xD9C2AD9D, 0x9390949D, 0xA2A09584, 0x6C5A4B41, 0x3B3B3D46, 0x57718EA9, + 0xBDC9CBCA, 0xCACED2CF, 0xC3B3A398, 0x92939AA1, 0xA39D907F, 0x6955453C, 0x38373C46, 0x58718DA5, 0xB7C1C5C6, + 0xC9CCCAC2, 0xB4A59A91, 0x8D91979D, 0x9E998D7D, 0x6752423A, 0x38383C46, 0x576F8AA2, 0xB3BFC6CB, 0xCECCC5B7, + 0xA7988D86, 0x83868E95, 0x98968D7D, 0x644F403B, 0x393A3E47, 0x566C859C, 0xAFBDC7CE, 0xCEC8BCAA, 0x9A8A7F78, + 0x777A838D, 0x94958C7A, 0x5E4C423E, 0x3E3E4047, 0x54677D94, 0xA9BAC7CD, 0xC9C0AF9F, 0x8E80746D, 0x6B707A86, + 0x91928975, 0x5A4B4543, 0x43434448, 0x5161768C, 0xA3B5C3C7, 0xC1B4A394, 0x85776D66, 0x63687480, 0x8C8D836F, + 0x574D4848, 0x4848484A, 0x505D7087, 0x9DB1BDBE, 0xB6A9998B, 0x7F746A63, 0x62656F7B, 0x84847A67, 0x554F4D4D, + 0x4D4D4E4F, 0x535F6F85, 0x9BAEB8B8, 0xAFA29488, 0x7E756B65, 0x62656D75, 0x7B797061, 0x56535353, 0x5556585A, + 0x6069788A, 0x9EAEB6B4, 0xAB9F948A, 0x817A726B, 0x67686B6F, 0x726E665D, 0x585A5C5E, 0x62676C70, 0x767E8A98, + 0xA6B2B6B4, 0xACA1978E, 0x89837C76, 0x716E6C6C, 0x6A66605C, 0x5F62686F, 0x7680888F, 0x94999FA7, 0xAFB6B7B5, + 0xAEA49C96, 0x928E8983, 0x7D76716B, 0x67625F5D, 0x676D7681, 0x8E9BA6AD, 0xB0B1B1B2, 0xB4B7B9B6, 0xB1A8A29E, + 0x9B999590, 0x877F7770, 0x6A656364, 0x71788392, 0xA3B2BDC3, 0xC3BFBAB7, 0xB6B8B9B7, 0xB3ABA6A3, 0xA3A19E98, + 0x91888079, 0x736E6C6D, 0x7A818C9C, 0xAFBFC9CE, 0xCBC4BDB7, 0xB7B8BBBA, 0xB4ACA6A4, 0xA4A5A4A0, 0x9A958F89, + 0x837E7A79, 0x868A94A3, 0xB5C4CED0, 0xCCC5BEBA, 0xBBBFC1BF, 0xB7AEA8A5, 0xA7A9ABAC, 0xACAAA8A4, 0x9D968D88, + 0x8F9199A7, 0xB7C5CCCD, 0xC9C4C0BF, 0xC3C7C8C2, 0xB7ADA7A6, 0xA8ADB3BA, 0xBFC3C4BF, 0xB7AB9E94, 0x97979FAB, + 0xB9C3C8C9, 0xC7C5C4C7, 0xCCCFCBC2, 0xB6ADA8A8, 0xADB5C1CD, 0xD8E0E0D9, 0xCCBBAB9E, 0x9C9DA4AE, 0xBAC1C5C6, + 0xC6C7CAD0, 0xD4D3CBC0, 0xB5ADABAD, 0xB6C2D2E3, 0xF1F9F8ED, 0xDAC5B2A3, 0xA2A4ABB4, 0xBBC1C4C5, 0xC8CCD2D7, + 0xD8D3CABE, 0xB4B0B0B6, 0xC1D2E5F7, 0xFFFFFFF5, 0xE0C9B6A9, 0xA9ABB1B7, 0xBDC1C4C7, 0xCBD1D8DC, 0xDAD4C9BF, + 0xB7B4B7BF, 0xCEE1F5FF, 0xFFFFFFF5, 0xDEC8B7AD, 0xB0B2B7BC, 0xC0C3C7CB, 0xD1D8DEDF, 0xDCD6CDC4, 0xBEBBBFC9, + 0xD9EDFFFF, 0xFFFFFFEE, 0xD9C6B9B1, 0xB6BABEC2, 0xC5C8CCD2, 0xD8DFE3E4, 0xE1DBD4CC, 0xC6C4C8D2, 0xE2F6FFFF, + 0xFFFFF7E5, 0xD3C5BBB6, 0xBEC2C6C9, 0xCDD0D5DA, 0xE1E6EAEB, 0xE9E4DED6, 0xD0CED1DB, 0xEAFAFFFF, 0xFFFDEEDD, + 0xCFC5BFBD, 0xC7CBCFD3, 0xD6DADEE3, 0xE9EFF4F7, 0xF4EFE7E0, 0xDBD8DBE4, 0xF2FFFFFF, 0xFFF4E6D8, 0xCEC7C4C4, + 0xD1D5D9DD, 0xE0E3E7EB, 0xF0F7FEFF, 0xFFFAF2EA, 0xE5E3E6EE, 0xFAFFFFFF, 0xFAEDE0D7, 0xD0CDCCCD, 0xDCE0E3E6, + 0xE9EBEDF0, 0xF5FBFFFF, 0xFFFFFBF4, 0xEFEEF2F9, 0xFFFFFFFE, 0xF4E8DFD8, 0xD4D3D5D7, 0xE6E9EBED, 0xEEEFF1F2, + 0xF5F9FFFF, 0xFFFFFFFD, 0xFAFAFDFF, 0xFFFFFFFA, 0xF0E7E1DD, 0xDBDCDEE2, 0xEDEFEFF0, 0xF0F0F0F1, 0xF2F5FAFF, + 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFF7, 0xEFE9E5E2, 0xE2E4E7EB, 0xF1F1F0F0, 0xEFEEEEEF, 0xF0F3F6FC, 0xFFFFFFFF, + 0xFFFFFFFF, 0xFFFFFDF6, 0xF0ECEAE8, 0xEAECEFF1, 0xF2F1EFEF, 0xEEEDEDED, 0xEFF1F5FA, 0xFFFFFFFF, 0xFFFFFFFF, + 0xFFFFFBF6, 0xF2F0EFEF, 0xF1F2F3F3, 0xF3F1EFEE, 0xEDEDEDED, 0xEFF2F5FA, 0xFEFFFFFF, 0xFFFFFFFF, 0xFFFDFAF7, + 0xF5F4F4F5, 0xF6F7F6F5, 0xF3F1F0EF, 0xEEEEEEEF, 0xF1F3F6FA, 0xFDFFFFFF, 0xFFFFFFFF, 0xFFFCFAF8, 0xF7F6F7F8, + 0xF8F8F7F5, 0xF5F3F2F1, 0xF0F0F0F1, 0xF3F5F8FA, 0xFCFDFDFD, 0xFDFEFEFE, 0xFDFBFAF9, 0xF8F9F9FA, 0xFAF9F8F7, + 0xF7F5F3F3, 0xF3F2F3F4, 0xF5F7F9FB, 0xFDFDFEFE, 0xFEFEFEFD, 0xFCFBFAFA, 0xF9FAFAFB, 0xFBFAF9F8, 0xF8F7F6F5, + 0xF5F5F5F6, 0xF7F9FAFC, 0xFDFEFEFF, 0xFFFFFEFD, 0xFDFBFBFA, 0xFAFAFBFB, 0xFBFBFBFA, 0xFAF9F8F7, 0xF7F7F8F8, + 0xF9FAFBFC, 0xFEFFFFFF, 0xFFFFFEFD, 0xFCFCFBFB, 0xFBFBFBFC, 0xFCFCFCFB, 0xFBFAFAFA, 0xFAFAFAFA, 0xFBFBFCFD, + 0xFEFFFFFF, 0xFFFFFEFE, 0xFDFCFCFC, 0xFBFCFCFD, 0xFDFDFDFC, 0xFCFCFBFB, 0xFBFBFBFC, 0xFCFCFDFE, 0xFFFFFFFF, + 0xFFFFFFFE, 0xFEFDFDFD, 0xFDFDFDFD, 0xFEFEFDFD, 0xFDFDFDFD, 0xFDFDFDFD, 0xFDFDFEFE, 0xFFFFFFFF, 0xFFFFFFFE, + 0xFEFEFEFD, 0xFDFEFEFE, 0xFEFEFEFE, 0xFEFEFEFE, 0xFEFEFEFE, 0xFEFEFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFE, + 0xFEFEFFFF, 0xFFFFFFFE, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, + 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, + 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, +}; + +static UNK_TYPE vertices1[] = { + 0x00420271, 0xFFBE0000, 0x060006C2, 0x3E52C2FF, 0x000002BC, 0x00000000, 0x07000800, 0x007800FF, 0x005D0271, + 0x00000000, 0x080006C2, 0x575200FF, 0x00BD01DB, 0xFFB20000, 0x07000419, 0x5E3FD9FF, 0x00BD01DB, 0x004E0000, + 0x09000419, 0x5E3F27FF, 0x01AF001B, 0x00000000, 0x08000005, 0x6B3500FF, 0x0131001B, 0x01310000, 0x0A000005, + 0x4C354CFF, 0x000002BC, 0x00000000, 0x09000800, 0x007800FF, 0x00420271, 0x00420000, 0x0A0006C2, 0x3E523EFF, + 0x004E01DB, 0x00BD0000, 0x0B000419, 0x273F5EFF, 0x0000001B, 0x01AF0000, 0x0C000005, 0x00356BFF, 0x000002BC, + 0x00000000, 0x0B000800, 0x007800FF, 0x00000271, 0x005D0000, 0x0C0006C2, 0x005257FF, 0xFFB201DB, 0x00BD0000, + 0x0D000419, 0xD93F5EFF, 0xFECF001B, 0x01310000, 0x0E000005, 0xB4354CFF, 0x000002BC, 0x00000000, 0x0D000800, + 0x007800FF, 0xFFBE0271, 0x00420000, 0x0E0006C2, 0xC2523EFF, 0xFF4301DB, 0x004E0000, 0x0F000419, 0xA23F27FF, + 0xFE51001B, 0x00000000, 0x10000005, 0x953500FF, 0xFFA30271, 0x00000000, 0x100006C2, 0xA95200FF, 0xFF4301DB, + 0xFFB20000, 0x11000419, 0xA23FD9FF, 0xFE51001B, 0x00000000, 0x00000005, 0x953500FF, 0xFF4301DB, 0xFFB20000, + 0x01000419, 0xA23FD9FF, 0xFECF001B, 0xFECF0000, 0x02000005, 0xB435B4FF, 0xFFA30271, 0x00000000, 0x000006C2, + 0xA95200FF, 0x000002BC, 0x00000000, 0x01000800, 0x007800FF, 0xFFBE0271, 0xFFBE0000, 0x020006C2, 0xC252C2FF, + 0xFFB201DB, 0xFF430000, 0x03000419, 0xD93FA2FF, 0x0000001B, 0xFE510000, 0x04000005, 0x003595FF, 0x000002BC, + 0x00000000, 0x03000800, 0x007800FF, 0x00000271, 0xFFA30000, 0x040006C2, 0x0052A9FF, 0x004E01DB, 0xFF430000, + 0x05000419, 0x273FA2FF, +}; + +static UNK_TYPE vertices2[] = { + 0x0000001B, 0xFE510000, 0x04000005, 0x003595FF, 0x004E01DB, 0xFF430000, 0x05000419, 0x273FA2FF, 0x0131001B, + 0xFECF0000, 0x06000005, 0x4C35B4FF, 0x00000271, 0xFFA30000, 0x040006C2, 0x0052A9FF, 0x000002BC, 0x00000000, + 0x05000800, 0x007800FF, 0x00420271, 0xFFBE0000, 0x060006C2, 0x3E52C2FF, 0x00BD01DB, 0xFFB20000, 0x07000419, + 0x5E3FD9FF, 0x01AF001B, 0x00000000, 0x08000005, 0x6B3500FF, 0xFFBE0271, 0x00420000, 0x060006C2, 0xC2523EFF, + 0x000002BC, 0x00000000, 0x07000800, 0x007800FF, 0xFFA30271, 0x00000000, 0x080006C2, 0xA95200FF, +}; + +static Gfx textureDL[] = { + gsDPPipeSync(), + gsDPSetTextureLUT(G_TT_NONE), + gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON), + gsDPLoadTextureBlock(texture2, G_IM_FMT_I, G_IM_SIZ_8b, 32, 64, 0, G_TX_NOMIRROR | G_TX_WRAP, + G_TX_MIRROR | G_TX_WRAP, 5, 6, 1, 15), + gsDPLoadMultiBlock(texture1, 0x0100, 1, G_IM_FMT_I, G_IM_SIZ_8b, 32, 64, 0, G_TX_NOMIRROR | G_TX_WRAP, + G_TX_MIRROR | G_TX_WRAP, 5, 6, 13, 14), + gsDPSetCombineLERP(TEXEL1, PRIMITIVE, ENV_ALPHA, TEXEL0, TEXEL1, 0, ENVIRONMENT, TEXEL0, PRIMITIVE, ENVIRONMENT, + COMBINED, ENVIRONMENT, COMBINED, 0, PRIMITIVE, 0), + gsDPSetRenderMode(G_RM_PASS, G_RM_ZB_CLD_SURF2), + gsSPClearGeometryMode(G_CULL_BACK | G_FOG | G_TEXTURE_GEN | G_TEXTURE_GEN_LINEAR), + gsSPSetGeometryMode(G_LIGHTING), + gsSPEndDisplayList(), +}; + +static Gfx vertexDL[] = { + gsSPVertex(vertices1, 32, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSP2Triangles(3, 2, 4, 0, 3, 4, 5, 0), + gsSP2Triangles(5, 4, 6, 0, 2, 7, 8, 0), + gsSP2Triangles(2, 8, 4, 0, 4, 8, 9, 0), + gsSP2Triangles(4, 9, 6, 0, 6, 9, 10, 0), + gsSP2Triangles(8, 11, 12, 0, 8, 12, 9, 0), + gsSP2Triangles(9, 12, 13, 0, 9, 13, 10, 0), + gsSP2Triangles(10, 13, 14, 0, 12, 15, 16, 0), + gsSP2Triangles(12, 16, 13, 0, 13, 16, 17, 0), + gsSP2Triangles(13, 17, 14, 0, 14, 17, 18, 0), + gsSP2Triangles(16, 19, 17, 0, 17, 19, 20, 0), + gsSP2Triangles(17, 20, 18, 0, 21, 22, 23, 0), + gsSP2Triangles(24, 25, 26, 0, 24, 26, 22, 0), + gsSP2Triangles(22, 26, 27, 0, 22, 27, 23, 0), + gsSP2Triangles(23, 27, 28, 0, 26, 29, 30, 0), + gsSP2Triangles(26, 30, 27, 0, 27, 30, 31, 0), + gsSP1Triangle(27, 31, 28, 0), + gsSPVertex(vertices2, 11, 0), + gsSP2Triangles(0, 1, 2, 0, 3, 4, 5, 0), + gsSP2Triangles(3, 5, 1, 0, 1, 5, 6, 0), + gsSP2Triangles(1, 6, 2, 0, 2, 6, 7, 0), + gsSP1Triangle(8, 9, 10, 0), + gsSPEndDisplayList(), +}; 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 cd1734d25c..3f981ff2bf 100644 --- a/src/overlays/actors/ovl_Arrow_Light/z_arrow_light.c +++ b/src/overlays/actors/ovl_Arrow_Light/z_arrow_light.c @@ -1,6 +1,13 @@ -#include "z_arrow_light.h" +/* + * File: z_arrow_light.c + * Overlay: ovl_Arrow_Light + * Description: Light Arrow actor. Spawned by and attached to a normal arrow. + */ -#define ROOM 0x00 +#include "z_arrow_light.h" +#include "../ovl_En_Arrow/z_en_arrow.h" + +#define ROOM 0x00 #define FLAGS 0x02000010 void ArrowLight_Init(ArrowLight* this, GlobalContext* globalCtx); @@ -8,9 +15,13 @@ void ArrowLight_Destroy(ArrowLight* this, GlobalContext* globalCtx); void ArrowLight_Update(ArrowLight* this, GlobalContext* globalCtx); void ArrowLight_Draw(ArrowLight* this, GlobalContext* globalCtx); -/* -const ActorInit Arrow_Light_InitVars = -{ +void ArrowLight_Charge(ArrowLight* this, GlobalContext* globalCtx); +void ArrowLight_Fly(ArrowLight* this, GlobalContext* globalCtx); +void ArrowLight_Hit(ArrowLight* this, GlobalContext* globalCtx); + +#include "z_arrow_light_gfx.c" + +const ActorInit Arrow_Light_InitVars = { ACTOR_ARROW_LIGHT, ACTORTYPE_ITEMACTION, ROOM, @@ -22,21 +33,213 @@ const ActorInit Arrow_Light_InitVars = (ActorFunc)ArrowLight_Update, (ActorFunc)ArrowLight_Draw, }; -*/ -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Arrow_Light/func_80869CB0.s") -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Arrow_Light/ArrowLight_Init.s") +static InitChainEntry initChain[] = { + ICHAIN_F32(unk_F4, 2000, ICHAIN_STOP), +}; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Arrow_Light/ArrowLight_Destroy.s") +void ArrowLight_SetupAction(ArrowLight* this, ActorFunc* actionFunc) { + this->actionFunc = actionFunc; +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Arrow_Light/func_80869D78.s") +void ArrowLight_Init(ArrowLight* this, GlobalContext* globalCtx) { + Actor_ProcessInitChain(&this->actor, initChain); + this->radius = 0; + this->unk_160 = 1.0f; + ArrowLight_SetupAction(this, ArrowLight_Charge); + Actor_SetScale(&this->actor, 0.01f); + this->alpha = 0x82; + this->timer = 0; + this->unk_164 = 0.0f; +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Arrow_Light/func_80869E6C.s") +void ArrowLight_Destroy(ArrowLight* this, GlobalContext* globalCtx) { + func_800876C8(globalCtx); + // Translates to: ""Disappearance" = Disappearance" + LOG_STRING("消滅", "../z_arrow_light.c", 403); +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Arrow_Light/func_80869EBC.s") +void ArrowLight_Charge(ArrowLight* this, GlobalContext* globalCtx) { + EnArrow* arrow; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Arrow_Light/func_8086A088.s") + arrow = this->actor.attachedA; + if ((arrow == NULL) || (arrow->actor.update == NULL)) { + Actor_Kill(&this->actor); + return; + } -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Arrow_Light/ArrowLight_Update.s") + if (this->radius < 10) { + this->radius += 1; + } + // copy position and rotation from the attached arrow + this->actor.posRot.pos = arrow->actor.posRot.pos; + this->actor.shape.rot = arrow->actor.shape.rot; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Arrow_Light/ArrowLight_Draw.s") + func_8002F974(&this->actor, NA_SE_PL_ARROW_CHARGE_LIGHT); + + // If arrow's attached is null, Link has fired the arrow + if (arrow->actor.attachedA == NULL) { + this->unkPos = this->actor.posRot.pos; + this->radius = 10; + ArrowLight_SetupAction(this, ArrowLight_Fly); + this->alpha = 0xFF; + } +} + +void func_80869E6C(Vec3f* unkPos, Vec3f* lightPos, f32 scale) { + unkPos->x += ((lightPos->x - unkPos->x) * scale); + unkPos->y += ((lightPos->y - unkPos->y) * scale); + unkPos->z += ((lightPos->z - unkPos->z) * scale); +} + +void ArrowLight_Hit(ArrowLight* this, GlobalContext* globalCtx) { + f32 scale; + f32 offset; + u16 timer; + + if (this->actor.unk_F0 < 50.0f) { + scale = 10.0f; + } else { + if (950.0f < this->actor.unk_F0) { + scale = 310.0f; + } else { + scale = this->actor.unk_F0; + scale = ((scale - 50.0f) * (1.0f / 3.0f)) + 10.0f; + } + } + + timer = this->timer; + if (timer != 0) { + this->timer -= 1; + + if (this->timer >= 8) { + offset = ((this->timer - 8) * (1.0f / 24.0f)); + offset = SQ(offset); + this->radius = (((1.0f - offset) * scale) + 10.0f); + this->unk_160 += ((2.0f - this->unk_160) * 0.1f); + if (this->timer < 16) { + if (1) {} + this->alpha = ((this->timer * 0x23) - 0x118); + } + } + } + + if (this->timer >= 9) { + if (this->unk_164 < 1.0f) { + this->unk_164 += 0.25f; + } + } else { + if (this->unk_164 > 0.0f) { + this->unk_164 -= 0.125f; + } + } + + if (this->timer < 8) { + this->alpha = 0; + } + + if (this->timer == 0) { + this->timer = 255; + Actor_Kill(&this->actor); + } +} + +void ArrowLight_Fly(ArrowLight* this, GlobalContext* globalCtx) { + EnArrow* arrow; + f32 distanceScaled; + s32 pad; + + arrow = this->actor.attachedA; + if ((arrow == NULL) || (arrow->actor.update == NULL)) { + Actor_Kill(&this->actor); + return; + } + // copy position and rotation from the attached arrow + this->actor.posRot.pos = arrow->actor.posRot.pos; + this->actor.shape.rot = arrow->actor.shape.rot; + distanceScaled = Math_Vec3f_DistXYZ(&this->unkPos, &this->actor.posRot.pos) * (1.0f / 24.0f); + this->unk_160 = distanceScaled; + if (distanceScaled < 1.0f) { + this->unk_160 = 1.0f; + } + func_80869E6C(&this->unkPos, &this->actor.posRot.pos, 0.05f); + + if (arrow->hitWall & 1) { + Audio_PlayActorSound2(&this->actor, NA_SE_IT_EXPLOSION_LIGHT); + ArrowLight_SetupAction(this, ArrowLight_Hit); + this->timer = 32; + this->alpha = 0xFF; + } else if (arrow->timer < 34) { + if (this->alpha < 0x23) { + Actor_Kill(&this->actor); + } else { + this->alpha -= 0x19; + } + } +} + +void ArrowLight_Update(ArrowLight* this, GlobalContext* globalCtx) { + if (globalCtx->msgCtx.msgMode == 0xD || globalCtx->msgCtx.msgMode == 0x11) { + Actor_Kill(&this->actor); + } else { + this->actionFunc(this, globalCtx); + } +} + +void ArrowLight_Draw(ArrowLight* this, GlobalContext* globalCtx) { + s32 pad1; + s32 pad2; + u32 stateFrames; + GraphicsContext* gfxCtx; + Actor* tranform; + EnArrow* arrow; + Gfx* dispRefs[4]; + + stateFrames = globalCtx->state.frames; + arrow = this->actor.attachedA; + if (1) {} + + if ((arrow != NULL) && (arrow->actor.update != NULL) && (this->timer < 255)) { + if (1) {} + tranform = (arrow->hitWall & 2) ? &this->actor : &arrow->actor; + // clang-format off + gfxCtx = globalCtx->state.gfxCtx; Graph_OpenDisps(dispRefs, globalCtx->state.gfxCtx, "../z_arrow_light.c", 598); + // clang-format on + Matrix_Translate(tranform->posRot.pos.x, tranform->posRot.pos.y, tranform->posRot.pos.z, MTXMODE_NEW); + Matrix_RotateY(tranform->shape.rot.y * (M_PI / 32768), MTXMODE_APPLY); + Matrix_RotateX(tranform->shape.rot.x * (M_PI / 32768), MTXMODE_APPLY); + Matrix_RotateZ(tranform->shape.rot.z * (M_PI / 32768), MTXMODE_APPLY); + Matrix_Scale(0.01f, 0.01f, 0.01f, MTXMODE_APPLY); + + // Draw yellow effect over the screen when arrow hits + if (this->unk_164 > 0) { + gfxCtx->polyXlu.p = func_800937C0(gfxCtx->polyXlu.p); + gDPSetPrimColor(gfxCtx->polyXlu.p++, 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(gfxCtx->polyXlu.p++, G_AD_DISABLE); + gDPSetColorDither(gfxCtx->polyXlu.p++, G_CD_DISABLE); + gDPFillRectangle(gfxCtx->polyXlu.p++, 0, 0, SCREEN_WIDTH - 1, SCREEN_HEIGHT - 1); + } + + // Draw light on the arrow + func_80093D84(globalCtx->state.gfxCtx); + gDPSetPrimColor(gfxCtx->polyXlu.p++, 0x80, 0x80, 0xFF, 0xFF, 0xAA, this->alpha); + gDPSetEnvColor(gfxCtx->polyXlu.p++, 0xFF, 0xFF, 0x00, 0x80); + Matrix_RotateZYX(0x4000, 0x0, 0x0, MTXMODE_APPLY); + if (this->timer != 0) { + Matrix_Translate(0.0f, 0.0f, 0.0f, MTXMODE_APPLY); + } else { + Matrix_Translate(0.0f, 1500.0f, 0.0f, MTXMODE_APPLY); + } + 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(gfxCtx->polyXlu.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_arrow_light.c", 648), + G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + gSPDisplayList(gfxCtx->polyXlu.p++, textureDL); + gSPDisplayList(gfxCtx->polyXlu.p++, + 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(gfxCtx->polyXlu.p++, vertexDL); + Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_arrow_light.c", 664); + } +} diff --git a/src/overlays/actors/ovl_Arrow_Light/z_arrow_light.h b/src/overlays/actors/ovl_Arrow_Light/z_arrow_light.h index 095d0083fb..11b0b7ac1f 100644 --- a/src/overlays/actors/ovl_Arrow_Light/z_arrow_light.h +++ b/src/overlays/actors/ovl_Arrow_Light/z_arrow_light.h @@ -4,10 +4,15 @@ #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ Actor actor; - /* 0x014C */ char unk_14C[0x20]; + /* 0x014C */ s16 radius; + /* 0x014E */ u16 timer; + /* 0x0150 */ u8 alpha; + /* 0x0154 */ Vec3f unkPos; + /* 0x0160 */ f32 unk_160; + /* 0x0164 */ f32 unk_164; + /* 0x0168 */ ActorFunc actionFunc; } ArrowLight; // size = 0x016C extern const ActorInit Arrow_Light_InitVars; diff --git a/src/overlays/actors/ovl_Arrow_Light/z_arrow_light_gfx.c b/src/overlays/actors/ovl_Arrow_Light/z_arrow_light_gfx.c new file mode 100644 index 0000000000..3f6dfd7cef --- /dev/null +++ b/src/overlays/actors/ovl_Arrow_Light/z_arrow_light_gfx.c @@ -0,0 +1,190 @@ +#include "z_arrow_light.h" + +static UNK_TYPE texture1[] = { + 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, + 0x00000000, 0x00000001, 0x00000000, 0x00000102, 0x01000001, 0x00000000, 0x00000000, 0x00010000, 0x00000000, + 0x00000001, 0x00000000, 0x00000204, 0x02000101, 0x00000000, 0x00000000, 0x00010101, 0x00000001, 0x00000001, + 0x00000000, 0x00000307, 0x03010102, 0x00000000, 0x00000000, 0x01010102, 0x00000002, 0x01010001, 0x00000000, + 0x00010509, 0x04010103, 0x01000000, 0x00000000, 0x01020202, 0x00000104, 0x03020101, 0x00000000, 0x0001060C, + 0x06010103, 0x01000000, 0x00000000, 0x02020202, 0x00000206, 0x05040101, 0x00000000, 0x0001080F, 0x07010103, + 0x01000001, 0x00000000, 0x03030202, 0x00010408, 0x07060201, 0x00000000, 0x00010911, 0x08010103, 0x01000001, + 0x00000001, 0x04040303, 0x0101050B, 0x0A080301, 0x00000000, 0x00020B14, 0x0A010103, 0x01000001, 0x00010102, + 0x06060403, 0x0203070D, 0x0C0A0401, 0x00000000, 0x00030D17, 0x0B020103, 0x01010001, 0x00010205, 0x09080503, + 0x0205090E, 0x0E0D0501, 0x00000000, 0x01050F18, 0x0C020102, 0x01010001, 0x00010408, 0x0D0B0502, 0x03070B0F, + 0x0F0F0601, 0x00000000, 0x02081219, 0x0D030102, 0x00010001, 0x0001050B, 0x130F0702, 0x04080B0F, 0x10110801, + 0x00000000, 0x030C1419, 0x0E040101, 0x00010001, 0x0001070F, 0x19140A03, 0x05090B0E, 0x10130A02, 0x00000001, + 0x05121719, 0x0E040100, 0x00010102, 0x01020A13, 0x1F1A0F06, 0x06090A0C, 0x10150B03, 0x01000001, 0x08181B19, + 0x0F050201, 0x01020102, 0x02040D18, 0x2721140A, 0x080A0A0C, 0x11160D04, 0x02020001, 0x0B1E1E19, 0x10070403, + 0x02030202, 0x0408111D, 0x2F2A1B0F, 0x0A0B0B0D, 0x12180F06, 0x04040101, 0x0E242119, 0x11090606, 0x04040304, + 0x070C1623, 0x38322214, 0x0E0D0E10, 0x141A1108, 0x06060102, 0x112A241A, 0x120B0909, 0x06050507, 0x0B111C29, + 0x413B291B, 0x13101216, 0x181B1209, 0x08080304, 0x152F271B, 0x140E0C0C, 0x0907080B, 0x10172230, 0x4A433223, + 0x1813161D, 0x1D1E140B, 0x0A0A0608, 0x1A342B1E, 0x17110F0F, 0x0C0B0D11, 0x171F2A38, 0x534C3B2B, 0x1E161C25, + 0x2221160D, 0x0B0C0A0E, 0x21393023, 0x1B151211, 0x0F0F1217, 0x1E273240, 0x5C564534, 0x251B242F, 0x2924190F, + 0x0E0E0F17, 0x293E372B, 0x21181513, 0x1113181E, 0x26303B48, 0x655F4E3E, 0x2D222D3A, 0x30271C13, 0x11111520, + 0x32453F35, 0x281D1714, 0x14181E25, 0x2F3A4551, 0x6F695746, 0x362B3744, 0x372A1F17, 0x15151D2A, 0x3D4D483F, + 0x31231A14, 0x171E252E, 0x38444F5B, 0x7974614F, 0x4036404C, 0x3C2D231D, 0x1A1A2637, 0x4957524A, 0x3A2A1D15, + 0x1A252E37, 0x43505B66, 0x837F6C59, 0x4A414750, 0x3F2E2723, 0x21213245, 0x57625D54, 0x43312216, 0x1F2D3741, + 0x4D5B6671, 0x8E8B7662, 0x544B4D51, 0x3F302C2C, 0x2B2D4054, 0x656D675E, 0x4C3A281A, 0x2536414B, 0x5867717B, + 0x9896816C, 0x5E545150, 0x3F323337, 0x383C5063, 0x71777168, 0x56432F21, 0x2C3F4B56, 0x63727C86, 0xA2A08B76, + 0x685D5651, 0x3F343A43, 0x484D5F70, 0x7D827B71, 0x5F4C3829, 0x34465462, 0x6F7C8690, 0xACA99581, 0x72655B53, + 0x42394450, 0x585E6D7C, 0x878C8479, 0x68574334, 0x3D4E5E6E, 0x7B88919A, 0xB4B09E8C, 0x7C6E6155, 0x46414F5F, + 0x676E7B87, 0x92958C80, 0x71625041, 0x4857697A, 0x86929BA3, 0xBBB7A796, 0x86776658, 0x4D4B5C6E, 0x777D8791, + 0x9C9F9487, 0x7A6D5C4F, 0x54617486, 0x919CA4AB, 0xC2BBAFA1, 0x907F6C5D, 0x55576A7E, 0x8589929A, 0xA5A99D90, + 0x8478695E, 0x5F697F93, 0x9DA6ACB2, 0xC8BFB6AC, 0x9A877465, 0x6064788D, 0x92949BA1, 0xADB2A89C, 0x8F83766C, + 0x6A718AA1, 0xA9AFB2B8, 0xCEC3BDB6, 0xA4907E70, 0x6C72879B, 0x9C9CA2A8, 0xB5BBB3A9, 0x9B8E8279, 0x737693AE, + 0xB4B6B9BE, 0xD5C9C5BF, 0xAF9C8B7E, 0x7A8094A5, 0xA4A0A7B0, 0xBDC5C0B7, 0xA8998E85, 0x7B7B9AB7, 0xBDBEC0C5, + 0xDBCFCCC8, 0xBAA9998E, 0x898E9FAD, 0xA8A1ACB8, 0xC6CECCC5, 0xB6A4988F, 0x8381A0BE, 0xC4C6C8CD, 0xE0D4D3D1, + 0xC5B7A89D, 0x989CA8B3, 0xABA2B0C0, 0xCED8D8D2, 0xC2AEA298, 0x8C89A6C3, 0xCACED1D5, 0xE5DBDAD8, 0xD0C4B6AB, + 0xA6A8B1B8, 0xAEA4B5C7, 0xD6E0E3DE, 0xCDB7ABA2, 0x9590ACC9, 0xD0D5D9DC, 0xEBE1E0DE, 0xDAD1C4B9, 0xB2B2B8BC, + 0xB1A7B9CE, 0xDEE8ECE8, 0xD6BDB3AC, 0x9E98B3CE, 0xD6DBE0E3, 0xF0E9E6E3, 0xE3DDD2C6, 0xBCBABEC0, 0xB4AABED5, + 0xE5EFF3F0, 0xDDC2BBB6, 0xA79FB9D4, 0xDCE2E7E9, 0xF5F0ECE7, 0xEAE8DED2, 0xC6C1C2C3, 0xB7ADC4DD, 0xEBF3F8F5, + 0xE1C6C2C1, 0xB1A7BFD8, 0xE1E7EDF0, 0xF9F5F1EB, 0xF0F0E9DD, 0xCFC7C7C6, 0xBBB1CBE5, 0xF0F5FBF7, 0xE3CACACC, + 0xBBB0C5DC, 0xE5ECF4F6, 0xFCF9F5EE, 0xF5F7F0E7, 0xD7CDCCCB, 0xBFB7D2EB, 0xF4F7FBF6, 0xE4CDD2D6, 0xC6B9CBE0, + 0xE9F1F9FB, 0xFDFCF8F2, 0xF9FAF6EE, 0xDFD5D3D0, 0xC5BDD9F0, 0xF7F9FBF4, 0xE5D0D9E0, 0xD1C2D2E4, 0xEDF5FCFE, + 0xFEFDFAF4, 0xFBFCF9F3, 0xE6DDDAD7, 0xCBC3DEF4, 0xFAFBFCF3, 0xE5D3DEE8, 0xDBCDDAE9, 0xF2F8FEFF, 0xFEFDFCF6, + 0xFCFDFCF7, 0xECE4E2DF, 0xD2C9E3F7, 0xFCFDFBF3, 0xE5D6E4EF, 0xE3D6E1EE, 0xF6FAFEFF, 0xFEFDFDF8, 0xFCFDFDFA, + 0xF1EAE9E7, 0xD9CFE7F9, 0xFEFEFBF3, 0xE7DBE9F4, 0xEBDFE8F3, 0xF9FCFFFF, 0xFEFDFDFA, 0xFDFDFEFC, 0xF5EFEFEE, + 0xE0D5ECFB, 0xFFFEFBF3, 0xE9E1EEF8, 0xF0E6EEF6, 0xFCFDFFFF, 0xFEFDFEFC, 0xFEFDFEFE, 0xF8F4F4F3, 0xE7DDF1FD, + 0xFFFEFBF3, 0xECE7F3FC, 0xF5ECF2F9, 0xFDFEFFFF, 0xFEFDFFFE, 0xFFFDFEFE, 0xFAF7F8F7, 0xEDE5F5FE, 0xFFFEFBF5, + 0xF0EDF7FD, 0xF9F1F5FA, 0xFEFFFFFF, 0xFEFDFFFF, 0xFFFEFEFF, 0xFCFAFAFA, 0xF2ECF8FE, 0xFFFEFCF7, 0xF4F3FAFE, + 0xFBF6F8FB, 0xFEFFFFFF, 0xFEFDFFFF, 0xFFFEFEFF, 0xFDFCFCFC, 0xF7F2FBFF, 0xFFFEFCFA, 0xF8F7FCFF, 0xFEFAFBFC, + 0xFFFFFFFF, 0xFEFEFFFF, 0xFFFFFFFF, 0xFEFDFEFD, 0xFAF7FCFF, 0xFFFEFDFC, 0xFCFBFDFF, 0xFFFDFDFD, 0xFFFFFFFF, + 0xFFFEFFFF, 0xFFFFFFFF, 0xFFFEFEFE, 0xFCFAFDFF, 0xFFFEFEFE, 0xFEFDFEFF, 0xFFFFFEFD, 0xFFFFFFFF, 0xFFFFFFFF, + 0xFFFFFFFF, 0xFFFFFFFF, 0xFDFCFEFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFE, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, + 0xFFFFFFFF, 0xFEFEFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, + 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, + 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, + 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, + 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, + 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, + 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, +}; + +static UNK_TYPE texture2[] = { + 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, + 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, + 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, + 0x00000001, 0x00000000, 0x00000000, 0x00000001, 0x01000000, 0x00000102, 0x02010000, 0x00000001, 0x01010202, + 0x00000000, 0x00000000, 0x00000202, 0x02000000, 0x01010205, 0x07050200, 0x00000001, 0x01010304, 0x02010000, + 0x00000000, 0x00000305, 0x04010001, 0x05030307, 0x0A090401, 0x00000101, 0x01020206, 0x05030200, 0x00000000, + 0x01010408, 0x08030003, 0x08080607, 0x09090602, 0x01000001, 0x01010104, 0x05060603, 0x02010002, 0x0505060A, + 0x0C080404, 0x07090707, 0x06050709, 0x07010000, 0x01010101, 0x05080B0A, 0x06020205, 0x090A0A0C, 0x0F0E0A05, + 0x05080905, 0x05040810, 0x10060000, 0x00010102, 0x050A1113, 0x0E080608, 0x0A0C0D10, 0x1514120D, 0x0E0C0D0B, + 0x09080B15, 0x190F0402, 0x01000308, 0x0A0F161A, 0x180F0A0A, 0x0A0B0B12, 0x191B2A20, 0x221B1F1B, 0x1815141C, + 0x22170806, 0x03030611, 0x1A1F201E, 0x1C140E0E, 0x0D0E0F11, 0x181D2F3D, 0x3F333532, 0x2C261F24, 0x2E230F0D, + 0x0A090E18, 0x242E2D24, 0x1B141010, 0x11161813, 0x1618274A, 0x4E464948, 0x42383030, 0x39311712, 0x16151F24, + 0x2331362A, 0x1B111013, 0x191D201C, 0x1E273145, 0x4F51565B, 0x584C4140, 0x4A3F1C14, 0x1E202D32, 0x242B3631, + 0x22140F14, 0x1D23221D, 0x273C4A4E, 0x675F636D, 0x70645452, 0x564C2616, 0x2D363842, 0x38333F3F, 0x35241817, + 0x242C2A25, 0x2F4F656C, 0x948A7E81, 0x887D6A63, 0x60583B2F, 0x4454575F, 0x5B555C5E, 0x56493E34, 0x39414644, + 0x49627089, 0xBBBAA89B, 0x9B917A70, 0x67595152, 0x677A8184, 0x857F7A7C, 0x756D6A63, 0x5C5D626E, 0x767F8795, + 0xC4D1CABB, 0xB5A68C82, 0x7D706B76, 0x8B969DA7, 0xAEA69592, 0x928C8B8A, 0x857D8094, 0xA5AAA8A5, 0xC4CEC9C7, + 0xC2B69E94, 0x948F8991, 0x9EA4A9B7, 0xBEBDAFA2, 0xA2A49F9A, 0x99959BB7, 0xC9CECAC4, 0xD7CDC8C8, 0xCBC8B6AB, + 0xAAAAA7A0, 0xA0A2ACBD, 0xC6CCC9BD, 0xB4BAB6A8, 0xA3A3AECF, 0xE3E4E0DE, 0xE6DBD4CE, 0xD0D0C6BA, 0xB6B6B3A7, + 0x9FA7B4C7, 0xD5D7D8D3, 0xC9C9CDBF, 0xB1B2BED9, 0xF2ECE3E5, 0xECEAE1DA, 0xDBDDD7CB, 0xC2BFBCB4, 0xADB4C4D7, + 0xE4E7E4DD, 0xD6D6E0DC, 0xC7BABFD4, 0xE9E8DFE2, 0xF0F4EDE8, 0xE6E7E7DD, 0xCFC9CAC9, 0xC8CEDCEA, 0xF3F6F1E7, + 0xE0DEE3E7, 0xDAC2C3D6, 0xE4E8E3E5, 0xF7FBF8F1, 0xECEAEFEB, 0xDFDCDDE0, 0xE2E4E7EF, 0xF7FCFAF4, 0xEFE9E5E7, + 0xE2CDC8D7, 0xE5E9EAEE, 0xFDFEFCF7, 0xF1EBEDF0, 0xE9E8EDF1, 0xF3F0EEF0, 0xF5FBFBF8, 0xF7F3E9E2, 0xDDD6D3E1, + 0xEBEBEBF4, 0xFCFEFEFC, 0xF6F0F1F4, 0xEDEAF3FA, 0xFCF5EBEA, 0xF0F8F8F6, 0xF7F6EEE6, 0xE2E0E4ED, 0xEDE9E1EE, + 0xFAFFFDFD, 0xFAF7F7F7, 0xF2EFF6FB, 0xFBF2E1DF, 0xEEF8F6F2, 0xF4F6F2EE, 0xEAE7ECF2, 0xEEE6E0E5, 0xF6FCFCFD, + 0xFDFCFCF9, 0xF2F0F5FA, 0xFAF3DED8, 0xE8F7F7F3, 0xF4F8F7F6, 0xF2EEEEF0, 0xECE5E2E5, 0xF8FBF5F7, 0xFAFBFAF5, + 0xEBE7F4FC, 0xFAF6E8DD, 0xE8F8FCF8, 0xF8F9FAFA, 0xF9F4EEE9, 0xE4DFE0E9, 0xF9FAF1EE, 0xF2F5F7F5, 0xEBE1EDFB, + 0xFBFAF5EF, 0xF4FCFEFD, 0xFBF8F8FB, 0xFBF7F2EA, 0xE4DCD8E5, 0xF6FBF0EA, 0xECEFF3F2, 0xEDE5EAF9, 0xFDFCFDFC, + 0xFCFDFDFC, 0xF9F5F7FA, 0xFCF9F6F2, 0xEBE0D6E1, 0xEDF9F5EE, 0xEDEEF0F0, 0xEEEBEFFA, 0xFEFEFFFC, 0xF9F6F8FB, + 0xFAF7F6FA, 0xFDFDFBFA, 0xF7E8DCDB, 0xECF7F9F4, 0xF3F1F0EF, 0xECECF3FC, 0xFEFEFEF9, 0xF1EDEEF7, 0xFBFAF9FC, + 0xFEFEFDFC, 0xFBF3DFE0, 0xF0F5FBFA, 0xF7F3F3F4, 0xF1EFF2F8, 0xFAFCFEFA, 0xF1EAE7F0, 0xFAFEFDFE, 0xFFFEFEFD, + 0xFDFBE7E9, 0xF6FBFDFB, 0xF8F3F2F7, 0xF9F4EFF0, 0xF3F6FBFB, 0xF5EEEDF0, 0xFAFFFFFF, 0xFEFDFDFE, 0xFEFDF7F0, + 0xF9FDFCFA, 0xF5ECEAF4, 0xFCF8ECE8, 0xEBEFF7FC, 0xF8F6F7F6, 0xF9FCFEFD, 0xFBFAF8FB, 0xFEFFFEF7, 0xF3FAFCF7, + 0xEFE4E1EA, 0xF7F8EBE1, 0xE4EAEDF5, 0xF6F3F7F8, 0xF7F9FAF9, 0xF5F3F1F0, 0xF4FBFFFA, 0xECEEF6F4, 0xECE1DBE1, + 0xEFF5EDE0, 0xE0E2E0E6, 0xEDEBEFF2, 0xF3F6F6F5, 0xEEECEDE6, 0xE2EEFEFA, 0xEAE3E6E6, 0xE5E2DEDF, 0xE7EDE7DD, + 0xDBDDD8DA, 0xE5E6E8ED, 0xEEF2F4EF, 0xE3D9DFE4, 0xDDE2F7FB, 0xF2E5D8D2, 0xD4DDE3DB, 0xD7DCDCD4, 0xCFD1D5DC, + 0xE6E7E8E8, 0xE5E9EBE3, 0xD1C5CEE0, 0xE2E2F3FD, 0xF8EAD6C2, 0xC1CDDCD7, 0xC5BFC4C1, 0xB7B9CCE7, 0xF0EDE2DD, + 0xD8D4D7CA, 0xB4AFBFD6, 0xE4EBF2FC, 0xEEEAD8C2, 0xBABECCCF, 0xB9A1A3AA, 0xA6A2B0DB, 0xF0E9D8CE, 0xC6BFBDAE, + 0x9292ACCC, 0xE0E4E3EB, 0xCFD5CFBF, 0xB3AEB1B6, 0xA68D8A95, 0x9A99A1C2, 0xE3DBC6BA, 0xB4ACA292, 0x757299C0, + 0xD7D8CBC6, 0xA5B3BAB0, 0xA59A9293, 0x8C7A757E, 0x889198AE, 0xCACAB7A7, 0xA09C9480, 0x63597696, 0xAEC0BEA8, + 0x8C959F97, 0x89807772, 0x6752536B, 0x79808896, 0xAEB8A894, 0x827E796B, 0x59556374, 0x849EB6A5, 0x918F8D7B, + 0x6A676A66, 0x53363453, 0x6A6D6E76, 0x8A9D9E90, 0x73625D58, 0x5157605F, 0x5E749CA7, 0x96898163, 0x4E506064, + 0x4A2A1E36, 0x565D5B5F, 0x697D8D8C, 0x714E4240, 0x44525E59, 0x5161869C, 0x81776D54, 0x3D3A4D5A, 0x46281B22, + 0x363E424A, 0x545D6E7B, 0x714F3630, 0x313E4E4C, 0x44537384, 0x625B4E3E, 0x2E293646, 0x37201C20, 0x1E1D1F2D, + 0x3E454A59, 0x5F4D2D20, 0x2229363E, 0x3B4A6A70, 0x453C3329, 0x211F2835, 0x2A1A1B20, 0x1307050F, 0x242C2933, + 0x43442C18, 0x15151C2A, 0x3140655C, 0x251B1F1B, 0x15161F27, 0x261D1C20, 0x15040005, 0x141E1516, 0x26312716, + 0x0E0C0D19, 0x28385556, 0x170D1511, 0x0A0B141E, 0x2222201F, 0x170B0403, 0x0D190F0B, 0x151F1B10, 0x0B08050C, + 0x17264546, 0x130C140C, 0x03030C12, 0x13181F1C, 0x16100A07, 0x090E0F09, 0x11160F08, 0x0C0F0A09, 0x0F1B2E32, + 0x12171D11, 0x0301070D, 0x0B0D1414, 0x110F110F, 0x0A07070A, 0x11150B04, 0x0C15130F, 0x0E0E1B23, 0x10172113, + 0x0401050C, 0x0E09090B, 0x09090E13, 0x10090505, 0x0D120C04, 0x07141911, 0x0C0A1016, 0x09101811, 0x05020308, + 0x0D090606, 0x0504060C, 0x110F0903, 0x060B0804, 0x030A100D, 0x0A090B0C, 0x05060A06, 0x01010204, 0x07080403, + 0x02010307, 0x0A0D0B04, 0x02020302, 0x02030606, 0x04040708, 0x02020200, 0x00000201, 0x02030200, 0x00000102, + 0x05060704, 0x01000001, 0x01020201, 0x00010406, 0x01000201, 0x00000000, 0x00000000, 0x00000001, 0x02020202, + 0x01000000, 0x00000101, 0x00000102, 0x00000100, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, + 0x00000100, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, + 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, + 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, +}; + +static UNK_TYPE vertices1[] = { + 0x00420271, 0xFFBE0000, 0x060006C2, 0x3E52C2FF, 0x000002BC, 0x00000000, 0x07000800, 0x007800FF, 0x005D0271, + 0x00000000, 0x080006C2, 0x575200FF, 0x00BD01DB, 0xFFB20000, 0x07000419, 0x5E3FD9FF, 0x00BD01DB, 0x004E0000, + 0x09000419, 0x5E3F27FF, 0x01AF001B, 0x00000000, 0x08000005, 0x6B3500FF, 0x0131001B, 0x01310000, 0x0A000005, + 0x4C354CFF, 0x000002BC, 0x00000000, 0x09000800, 0x007800FF, 0x00420271, 0x00420000, 0x0A0006C2, 0x3E523EFF, + 0x004E01DB, 0x00BD0000, 0x0B000419, 0x273F5EFF, 0x0000001B, 0x01AF0000, 0x0C000005, 0x00356BFF, 0x000002BC, + 0x00000000, 0x0B000800, 0x007800FF, 0x00000271, 0x005D0000, 0x0C0006C2, 0x005257FF, 0xFFB201DB, 0x00BD0000, + 0x0D000419, 0xD93F5EFF, 0xFECF001B, 0x01310000, 0x0E000005, 0xB4354CFF, 0x000002BC, 0x00000000, 0x0D000800, + 0x007800FF, 0xFFBE0271, 0x00420000, 0x0E0006C2, 0xC2523EFF, 0xFF4301DB, 0x004E0000, 0x0F000419, 0xA23F27FF, + 0xFE51001B, 0x00000000, 0x10000005, 0x953500FF, 0xFFA30271, 0x00000000, 0x100006C2, 0xA95200FF, 0xFF4301DB, + 0xFFB20000, 0x11000419, 0xA23FD9FF, 0xFE51001B, 0x00000000, 0x00000005, 0x953500FF, 0xFF4301DB, 0xFFB20000, + 0x01000419, 0xA23FD9FF, 0xFECF001B, 0xFECF0000, 0x02000005, 0xB435B4FF, 0xFFA30271, 0x00000000, 0x000006C2, + 0xA95200FF, 0x000002BC, 0x00000000, 0x01000800, 0x007800FF, 0xFFBE0271, 0xFFBE0000, 0x020006C2, 0xC252C2FF, + 0xFFB201DB, 0xFF430000, 0x03000419, 0xD93FA2FF, 0x0000001B, 0xFE510000, 0x04000005, 0x003595FF, 0x000002BC, + 0x00000000, 0x03000800, 0x007800FF, 0x00000271, 0xFFA30000, 0x040006C2, 0x0052A9FF, 0x004E01DB, 0xFF430000, + 0x05000419, 0x273FA2FF, +}; + +static UNK_TYPE vertices2[] = { + 0x0000001B, 0xFE510000, 0x04000005, 0x003595FF, 0x004E01DB, 0xFF430000, 0x05000419, 0x273FA2FF, 0x0131001B, + 0xFECF0000, 0x06000005, 0x4C35B4FF, 0x00000271, 0xFFA30000, 0x040006C2, 0x0052A9FF, 0x000002BC, 0x00000000, + 0x05000800, 0x007800FF, 0x00420271, 0xFFBE0000, 0x060006C2, 0x3E52C2FF, 0x00BD01DB, 0xFFB20000, 0x07000419, + 0x5E3FD9FF, 0x01AF001B, 0x00000000, 0x08000005, 0x6B3500FF, 0xFFBE0271, 0x00420000, 0x060006C2, 0xC2523EFF, + 0x000002BC, 0x00000000, 0x07000800, 0x007800FF, 0xFFA30271, 0x00000000, 0x080006C2, 0xA95200FF, +}; + +static Gfx textureDL[] = { + gsDPPipeSync(), + gsDPSetTextureLUT(G_TT_NONE), + gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON), + gsDPLoadTextureBlock(texture1, G_IM_FMT_I, G_IM_SIZ_8b, 32, 64, 0, G_TX_NOMIRROR | G_TX_WRAP, + G_TX_MIRROR | G_TX_WRAP, 5, 6, 13, 15), + gsDPLoadMultiBlock(texture2, 0x0100, 1, G_IM_FMT_I, G_IM_SIZ_8b, 32, 64, 0, G_TX_NOMIRROR | G_TX_WRAP, + G_TX_MIRROR | G_TX_WRAP, 5, 6, 14, 14), + gsDPSetCombineLERP(TEXEL1, PRIMITIVE, ENV_ALPHA, TEXEL0, TEXEL1, 1, ENVIRONMENT, TEXEL0, PRIMITIVE, ENVIRONMENT, + COMBINED, ENVIRONMENT, COMBINED, 0, PRIMITIVE, 0), + gsDPSetRenderMode(G_RM_PASS, G_RM_ZB_CLD_SURF2), + gsSPClearGeometryMode(G_CULL_BACK | G_FOG | G_TEXTURE_GEN | G_TEXTURE_GEN_LINEAR), + gsSPSetGeometryMode(G_LIGHTING), + gsSPEndDisplayList(), +}; + +static Gfx vertexDL[] = { + gsSPVertex(vertices1, 32, 0), + gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0), + gsSP2Triangles(3, 2, 4, 0, 3, 4, 5, 0), + gsSP2Triangles(5, 4, 6, 0, 2, 7, 8, 0), + gsSP2Triangles(2, 8, 4, 0, 4, 8, 9, 0), + gsSP2Triangles(4, 9, 6, 0, 6, 9, 10, 0), + gsSP2Triangles(8, 11, 12, 0, 8, 12, 9, 0), + gsSP2Triangles(9, 12, 13, 0, 9, 13, 10, 0), + gsSP2Triangles(10, 13, 14, 0, 12, 15, 16, 0), + gsSP2Triangles(12, 16, 13, 0, 13, 16, 17, 0), + gsSP2Triangles(13, 17, 14, 0, 14, 17, 18, 0), + gsSP2Triangles(16, 19, 17, 0, 17, 19, 20, 0), + gsSP2Triangles(17, 20, 18, 0, 21, 22, 23, 0), + gsSP2Triangles(24, 25, 26, 0, 24, 26, 22, 0), + gsSP2Triangles(22, 26, 27, 0, 22, 27, 23, 0), + gsSP2Triangles(23, 27, 28, 0, 26, 29, 30, 0), + gsSP2Triangles(26, 30, 27, 0, 27, 30, 31, 0), + gsSP1Triangle(27, 31, 28, 0), + gsSPVertex(vertices2, 11, 0), + gsSP2Triangles(0, 1, 2, 0, 3, 4, 5, 0), + gsSP2Triangles(3, 5, 1, 0, 1, 5, 6, 0), + gsSP2Triangles(1, 6, 2, 0, 2, 6, 7, 0), + gsSP1Triangle(8, 9, 10, 0), + gsSPEndDisplayList(), +}; diff --git a/src/overlays/actors/ovl_Bg_Bdan_Objects/z_bg_bdan_objects.c b/src/overlays/actors/ovl_Bg_Bdan_Objects/z_bg_bdan_objects.c index f1b5366cb8..e5d5c0aae1 100644 --- a/src/overlays/actors/ovl_Bg_Bdan_Objects/z_bg_bdan_objects.c +++ b/src/overlays/actors/ovl_Bg_Bdan_Objects/z_bg_bdan_objects.c @@ -1,6 +1,6 @@ #include "z_bg_bdan_objects.h" -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x00000010 void BgBdanObjects_Init(BgBdanObjects* this, GlobalContext* globalCtx); @@ -9,8 +9,7 @@ void BgBdanObjects_Update(BgBdanObjects* this, GlobalContext* globalCtx); void BgBdanObjects_Draw(BgBdanObjects* this, GlobalContext* globalCtx); /* -const ActorInit Bg_Bdan_Objects_InitVars = -{ +const ActorInit Bg_Bdan_Objects_InitVars = { ACTOR_BG_BDAN_OBJECTS, ACTORTYPE_BG, ROOM, diff --git a/src/overlays/actors/ovl_Bg_Bdan_Objects/z_bg_bdan_objects.h b/src/overlays/actors/ovl_Bg_Bdan_Objects/z_bg_bdan_objects.h index a3741853eb..b8f17306ca 100644 --- a/src/overlays/actors/ovl_Bg_Bdan_Objects/z_bg_bdan_objects.h +++ b/src/overlays/actors/ovl_Bg_Bdan_Objects/z_bg_bdan_objects.h @@ -4,8 +4,7 @@ #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ Actor actor; /* 0x014C */ char unk_14C[0x70]; } BgBdanObjects; // size = 0x01BC diff --git a/src/overlays/actors/ovl_Bg_Bdan_Switch/z_bg_bdan_switch.c b/src/overlays/actors/ovl_Bg_Bdan_Switch/z_bg_bdan_switch.c index 4a9005cac6..4c39fe657e 100644 --- a/src/overlays/actors/ovl_Bg_Bdan_Switch/z_bg_bdan_switch.c +++ b/src/overlays/actors/ovl_Bg_Bdan_Switch/z_bg_bdan_switch.c @@ -2,29 +2,26 @@ * File: z_bg_bdan_switch.c * Overlay: Bg_Bdan_Switch * Description: Switches (Inside Lord Jabu-Jabu) -*/ + */ #include #include // BgBdanSwitch.actor.params & 0xFF -typedef enum -{ - BLUE, - YELLOW_HEAVY, - YELLOW, - YELLOW_TALL_1, - YELLOW_TALL_2 +typedef enum { + /* 0x00 */ BLUE, + /* 0x01 */ YELLOW_HEAVY, + /* 0x02 */ YELLOW, + /* 0x03 */ YELLOW_TALL_1, + /* 0x04 */ YELLOW_TALL_2 } BgBdanSwitchType; -typedef struct -{ +typedef struct { /* 0x00 */ char unk_00[0x2E]; /* 0x2E */ s16 unk_2E; } ColliderCustomHelper; -typedef struct -{ +typedef struct { /* 0x00 */ Collider base; /* 0x18 */ char unk_18[0x4]; /* 0x1C */ ColliderCustomHelper* unk_1C; @@ -37,8 +34,7 @@ typedef struct /* 0x46 */ Vec3s position; } ColliderCustomMain; // size = 0x4C -typedef struct -{ +typedef struct { /* 0x0000 */ Actor actor; /* 0x014C */ u32 dynaPolyId; /* 0x0150 */ f32 unk_150; @@ -60,7 +56,7 @@ typedef struct /* 0x01DD */ char unk_1DD[0x3]; } BgBdanSwitch; // size = 0x01E0 -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x00000010 static void BgBdanSwitch_Init(BgBdanSwitch* this, GlobalContext* globalCtx); @@ -96,8 +92,7 @@ static void func_8086DCE8(BgBdanSwitch* this, GlobalContext* globalCtx); static void func_8086DDA8(BgBdanSwitch* this); static void func_8086DDC0(BgBdanSwitch* this, GlobalContext* globalCtx); -const ActorInit Bg_Bdan_Switch_InitVars = -{ +const ActorInit Bg_Bdan_Switch_InitVars = { ACTOR_BG_BDAN_SWITCH, ACTORTYPE_SWITCH, ROOM, @@ -114,30 +109,20 @@ extern UNK_PTR D_06005CF8; extern UNK_PTR D_060061A0; extern UNK_PTR D_06005A20; -static u32 D_8086E0A0[] = -{ - 0x00000000, 0x00000000, 0x00000000, 0xEFC1FFFE, 0x00000000, 0x00010100, 0x00000000, 0x00780000, 0x01720064 -}; +static u32 D_8086E0A0[] = { 0x00000000, 0x00000000, 0x00000000, 0xEFC1FFFE, 0x00000000, + 0x00010100, 0x00000000, 0x00780000, 0x01720064 }; -static u32 D_8086E0C4[] = -{ - 0x0A000939, 0x20000000, 0x00000001, &D_8086E0A0 -}; +static u32 D_8086E0C4[] = { 0x0A000939, 0x20000000, 0x00000001, &D_8086E0A0 }; -static InitChainEntry initChain[] = -{ +static InitChainEntry initChain[] = { ICHAIN_F32(unk_F4, 1400, ICHAIN_CONTINUE), ICHAIN_F32(unk_F8, 500, ICHAIN_CONTINUE), - ICHAIN_F32(unk_FC, 1200, ICHAIN_STOP) + ICHAIN_F32(unk_FC, 1200, ICHAIN_STOP), }; -static u32 D_8086E0E0[] = -{ - 0x00000000, 0x430C0000, 0x00000000, 0x00000000 -}; +static u32 D_8086E0E0[] = { 0x00000000, 0x430C0000, 0x00000000, 0x00000000 }; -static void func_8086D010(BgBdanSwitch* this, GlobalContext* globalCtx, u32 collision, DynaPolyMoveFlag flag) -{ +static void func_8086D010(BgBdanSwitch* this, GlobalContext* globalCtx, u32 collision, DynaPolyMoveFlag flag) { s16 pad1; u32 local_c = 0; s16 pad2; @@ -145,32 +130,26 @@ static void func_8086D010(BgBdanSwitch* this, GlobalContext* globalCtx, u32 coll DynaPolyInfo_SetActorMove(&this->actor, flag); DynaPolyInfo_Alloc(collision, &local_c); this->dynaPolyId = DynaPolyInfo_RegisterActor(globalCtx, &globalCtx->colCtx.dyna, &this->actor, local_c); - if (this->dynaPolyId == 0x32) - { - osSyncPrintf("Warning : move BG 登録失敗(%s %d)(name %d)(arg_data 0x%04x)\n", "../z_bg_bdan_switch.c", 325, this->actor.id, this->actor.params); + if (this->dynaPolyId == 0x32) { + osSyncPrintf("Warning : move BG 登録失敗(%s %d)(name %d)(arg_data 0x%04x)\n", "../z_bg_bdan_switch.c", 325, + this->actor.id, this->actor.params); } } -static void func_8086D098(BgBdanSwitch* this, GlobalContext* globalCtx) -{ +static void func_8086D098(BgBdanSwitch* this, GlobalContext* globalCtx) { Actor* actor = &this->actor; func_8005BBF8(globalCtx, &this->collider, actor); func_8005C050(globalCtx, &this->collider, actor, &D_8086E0C4, &this->collider.unk_20); } -static void func_8086D0EC(BgBdanSwitch* this) -{ - if (this->unk_1CC > 0) - { +static void func_8086D0EC(BgBdanSwitch* this) { + if (this->unk_1CC > 0) { this->unk_1CC += 0x5DC; - } - else - { + } else { this->unk_1CC += 0xFA0; } - switch (this->actor.params & 0xFF) - { + switch (this->actor.params & 0xFF) { case BLUE: case YELLOW_HEAVY: case YELLOW: @@ -187,29 +166,24 @@ static void func_8086D0EC(BgBdanSwitch* this) this->actor.shape.unk_08 = 1.2f / this->unk_1D0; } -static void BgBdanSwitch_Init(BgBdanSwitch* this, GlobalContext* globalCtx) -{ +static void BgBdanSwitch_Init(BgBdanSwitch* this, GlobalContext* globalCtx) { s32 pad[2]; s16 type; s32 flag; - + type = this->actor.params & 0xFF; Actor_ProcessInitChain(&this->actor, initChain); - if (type == YELLOW_TALL_1 || type == YELLOW_TALL_2) - { + if (type == YELLOW_TALL_1 || type == YELLOW_TALL_2) { this->actor.scale.z = 0.05f; this->actor.scale.x = 0.05f; - } - else - { + } else { this->actor.scale.z = 0.1f; this->actor.scale.x = 0.1f; } this->actor.scale.y = 0.0f; Actor_SetHeight(&this->actor, 10.0f); - switch (type) - { + switch (type) { case BLUE: case YELLOW_HEAVY: case YELLOW: @@ -224,37 +198,27 @@ static void BgBdanSwitch_Init(BgBdanSwitch* this, GlobalContext* globalCtx) flag = Flags_GetSwitch(globalCtx, (this->actor.params >> 8) & 0x3F); - switch (type) - { + switch (type) { case BLUE: case YELLOW: - if (flag) - { + if (flag) { func_8086D730(this); - } - else - { + } else { func_8086D5C4(this); } break; case YELLOW_HEAVY: - if (flag) - { + if (flag) { func_8086DB24(this); - } - else - { + } else { func_8086D86C(this); } break; case YELLOW_TALL_1: case YELLOW_TALL_2: - if (flag) - { + if (flag) { func_8086DCCC(this); - } - else - { + } else { func_8086DB4C(this); } break; @@ -266,10 +230,8 @@ static void BgBdanSwitch_Init(BgBdanSwitch* this, GlobalContext* globalCtx) osSyncPrintf("(巨大魚ダンジョン 専用スイッチ)(arg_data 0x%04x)\n", this->actor.params); } -static void BgBdanSwitch_Destroy(BgBdanSwitch* this, GlobalContext* globalCtx) -{ - switch(this->actor.params & 0xFF) - { +static void BgBdanSwitch_Destroy(BgBdanSwitch* this, GlobalContext* globalCtx) { + switch (this->actor.params & 0xFF) { case BLUE: case YELLOW_HEAVY: case YELLOW: @@ -281,76 +243,59 @@ static void BgBdanSwitch_Destroy(BgBdanSwitch* this, GlobalContext* globalCtx) } } -static void func_8086D4B4(BgBdanSwitch* this, GlobalContext* globalCtx) -{ +static void func_8086D4B4(BgBdanSwitch* this, GlobalContext* globalCtx) { s32 pad; s32 type; - if (!Flags_GetSwitch(globalCtx, (this->actor.params >> 8) & 0x3F)) - { + if (!Flags_GetSwitch(globalCtx, (this->actor.params >> 8) & 0x3F)) { type = this->actor.params & 0xFF; Flags_SetSwitch(globalCtx, (this->actor.params >> 8) & 0x3F); - if (type == BLUE || type == YELLOW_TALL_2) - { + if (type == BLUE || type == YELLOW_TALL_2) { func_800806BC(globalCtx, &this->actor, 0x4807); - } - else - { + } else { func_800806BC(globalCtx, &this->actor, 0x4802); } } } -static void func_8086D548(BgBdanSwitch* this, GlobalContext* globalCtx) -{ - if (Flags_GetSwitch(globalCtx, (this->actor.params >> 8) & 0x3F)) - { +static void func_8086D548(BgBdanSwitch* this, GlobalContext* globalCtx) { + if (Flags_GetSwitch(globalCtx, (this->actor.params >> 8) & 0x3F)) { Flags_UnsetSwitch(globalCtx, (this->actor.params >> 8) & 0x3F); - if ((this->actor.params & 0xFF) == YELLOW_TALL_2) - { + if ((this->actor.params & 0xFF) == YELLOW_TALL_2) { func_800806BC(globalCtx, &this->actor, 0x4807); } } } -static void func_8086D5C4(BgBdanSwitch* this) -{ +static void func_8086D5C4(BgBdanSwitch* this) { this->updateFunc = &func_8086D5E0; this->unk_1C8 = 1.0f; } -static void func_8086D5E0(BgBdanSwitch* this, GlobalContext* globalCtx) -{ - switch (this->actor.params & 0xFF) - { +static void func_8086D5E0(BgBdanSwitch* this, GlobalContext* globalCtx) { + switch (this->actor.params & 0xFF) { case BLUE: - if (func_800435B4(&this->actor)) - { + if (func_800435B4(&this->actor)) { func_8086D67C(this); func_8086D4B4(this, globalCtx); } break; case YELLOW: - if (func_8004356C(&this->actor)) - { + if (func_8004356C(&this->actor)) { func_8086D67C(this); func_8086D4B4(this, globalCtx); } } } -static void func_8086D67C(BgBdanSwitch* this) -{ +static void func_8086D67C(BgBdanSwitch* this) { this->updateFunc = &func_8086D694; this->unk_1DA = 0x64; } -static void func_8086D694(BgBdanSwitch* this, GlobalContext* globalCtx) -{ - if ((func_8005B198() == this->actor.type) || (this->unk_1DA <= 0)) - { +static void func_8086D694(BgBdanSwitch* this, GlobalContext* globalCtx) { + if ((func_8005B198() == this->actor.type) || (this->unk_1DA <= 0)) { this->unk_1C8 -= 0.2f; - if (this->unk_1C8 <= 0.1f) - { + if (this->unk_1C8 <= 0.1f) { func_8086D730(this); Audio_PlayActorSound2(&this->actor, NA_SE_EV_FOOT_SWITCH); func_800AA000(this->actor.waterSurfaceDist, 0x78, 0x14, 0xA); @@ -358,97 +303,76 @@ static void func_8086D694(BgBdanSwitch* this, GlobalContext* globalCtx) } } -static void func_8086D730(BgBdanSwitch* this) -{ +static void func_8086D730(BgBdanSwitch* this) { this->unk_1C8 = 0.1f; this->updateFunc = &func_8086D754; this->unk_1D8 = 6; } -static void func_8086D754(BgBdanSwitch* this, GlobalContext* globalCtx) -{ - switch (this->actor.params & 0xFF) - { +static void func_8086D754(BgBdanSwitch* this, GlobalContext* globalCtx) { + switch (this->actor.params & 0xFF) { case BLUE: - if (!func_800435B4(&this->actor)) - { - if (this->unk_1D8 <= 0) - { + if (!func_800435B4(&this->actor)) { + if (this->unk_1D8 <= 0) { func_8086D7FC(this); func_8086D548(this, globalCtx); } - } - else - { + } else { this->unk_1D8 = 6; } break; case YELLOW: - if (!Flags_GetSwitch(globalCtx, (this->actor.params >> 8) & 0x3F)) - { + if (!Flags_GetSwitch(globalCtx, (this->actor.params >> 8) & 0x3F)) { func_8086D7FC(this); } } } -static void func_8086D7FC(BgBdanSwitch* this) -{ +static void func_8086D7FC(BgBdanSwitch* this) { this->updateFunc = &func_8086D80C; } -static void func_8086D80C(BgBdanSwitch* this, GlobalContext* globalCtx) -{ +static void func_8086D80C(BgBdanSwitch* this, GlobalContext* globalCtx) { this->unk_1C8 += 0.2f; - if (this->unk_1C8 >= 1.0f) - { + if (this->unk_1C8 >= 1.0f) { func_8086D5C4(this); Audio_PlayActorSound2(&this->actor, NA_SE_EV_FOOT_SWITCH); } } -static void func_8086D86C(BgBdanSwitch* this) -{ +static void func_8086D86C(BgBdanSwitch* this) { this->updateFunc = &func_8086D888; this->unk_1C8 = 1.0f; } -static void func_8086D888(BgBdanSwitch* this, GlobalContext* globalCtx) -{ - if (func_8004356C(&this->actor)) - { +static void func_8086D888(BgBdanSwitch* this, GlobalContext* globalCtx) { + if (func_8004356C(&this->actor)) { func_8086D8BC(this); } } -static void func_8086D8BC(BgBdanSwitch* this) -{ +static void func_8086D8BC(BgBdanSwitch* this) { this->updateFunc = &func_8086D8CC; } -static void func_8086D8CC(BgBdanSwitch* this, GlobalContext* globalCtx) -{ +static void func_8086D8CC(BgBdanSwitch* this, GlobalContext* globalCtx) { this->unk_1C8 -= 0.2f; - if (this->unk_1C8 <= 0.6f) - { + if (this->unk_1C8 <= 0.6f) { func_8086D9F8(this); Audio_PlayActorSound2(&this->actor, NA_SE_EV_FOOT_SWITCH); func_800AA000(this->actor.waterSurfaceDist, 0x78, 0x14, 0xA); } } -static void func_8086D944(BgBdanSwitch* this) -{ +static void func_8086D944(BgBdanSwitch* this) { this->updateFunc = &func_8086D95C; this->unk_1DA = 0x64; } -static void func_8086D95C(BgBdanSwitch* this, GlobalContext* globalCtx) -{ - if ((func_8005B198() == this->actor.type) || (this->unk_1DA <= 0)) - { +static void func_8086D95C(BgBdanSwitch* this, GlobalContext* globalCtx) { + if ((func_8005B198() == this->actor.type) || (this->unk_1DA <= 0)) { this->unk_1C8 -= 0.2f; - if (this->unk_1C8 <= 0.1f) - { + if (this->unk_1C8 <= 0.1f) { func_8086DB24(this); Audio_PlayActorSound2(&this->actor, NA_SE_EV_FOOT_SWITCH); func_800AA000(this->actor.waterSurfaceDist, 0x78, 0x14, 0xA); @@ -456,90 +380,69 @@ static void func_8086D95C(BgBdanSwitch* this, GlobalContext* globalCtx) } } -static void func_8086D9F8(BgBdanSwitch* this) -{ +static void func_8086D9F8(BgBdanSwitch* this) { this->unk_1C8 = 0.6f; this->updateFunc = &func_8086DA1C; this->unk_1D8 = 6; } -static void func_8086DA1C(BgBdanSwitch* this, GlobalContext* globalCtx) -{ +static void func_8086DA1C(BgBdanSwitch* this, GlobalContext* globalCtx) { Actor* heldActor = PLAYER->heldActor; - if (func_8004356C(&this->actor)) - { - if (heldActor != NULL && heldActor->id == ACTOR_EN_RU1) - { - if (this->unk_1D8 <= 0) - { + if (func_8004356C(&this->actor)) { + if (heldActor != NULL && heldActor->id == ACTOR_EN_RU1) { + if (this->unk_1D8 <= 0) { func_8086D944(this); func_8086D4B4(this, globalCtx); } - } - else - { + } else { this->unk_1D8 = 6; } - } - else - { - if (this->unk_1D8 <= 0) - { + } else { + if (this->unk_1D8 <= 0) { func_8086DAB4(this); } } } -static void func_8086DAB4(BgBdanSwitch* this) -{ +static void func_8086DAB4(BgBdanSwitch* this) { this->updateFunc = &func_8086DAC4; } -static void func_8086DAC4(BgBdanSwitch* this, GlobalContext* globalCtx) -{ +static void func_8086DAC4(BgBdanSwitch* this, GlobalContext* globalCtx) { this->unk_1C8 += 0.2f; - if (this->unk_1C8 >= 1.0f) - { + if (this->unk_1C8 >= 1.0f) { func_8086D86C(this); Audio_PlayActorSound2(&this->actor, NA_SE_EV_FOOT_SWITCH); } } -static void func_8086DB24(BgBdanSwitch* this) -{ +static void func_8086DB24(BgBdanSwitch* this) { this->unk_1C8 = 0.1f; this->updateFunc = &func_8086DB40; } -static void func_8086DB40(BgBdanSwitch* this, GlobalContext* globalCtx) -{ - +static void func_8086DB40(BgBdanSwitch* this, GlobalContext* globalCtx) { } -static void func_8086DB4C(BgBdanSwitch* this) -{ +static void func_8086DB4C(BgBdanSwitch* this) { this->updateFunc = &func_8086DB68; this->unk_1C8 = 2.0f; } -static void func_8086DB68(BgBdanSwitch* this, GlobalContext* globalCtx) -{ - switch (this->actor.params & 0xFF) - { +static void func_8086DB68(BgBdanSwitch* this, GlobalContext* globalCtx) { + switch (this->actor.params & 0xFF) { default: return; case YELLOW_TALL_1: - if (((this->collider.base.collideFlags & 2) != 0) && this->unk_1D8 <= 0) - { + if (((this->collider.base.collideFlags & 2) != 0) && this->unk_1D8 <= 0) { this->unk_1D8 = 0xA; func_8086DC30(this); func_8086D4B4(this, globalCtx); } break; case YELLOW_TALL_2: - if (((this->collider.base.collideFlags & 2) != 0) && ((this->unk_1DC & 2) == 0) && this->unk_1D8 <= 0) - { + if (((this->collider.base.collideFlags & 2) != 0) && ((this->unk_1DC & 2) == 0) && this->unk_1D8 <= 0) { this->unk_1D8 = 0xA; func_8086DC30(this); func_8086D4B4(this, globalCtx); @@ -547,44 +450,35 @@ static void func_8086DB68(BgBdanSwitch* this, GlobalContext* globalCtx) } } -static void func_8086DC30(BgBdanSwitch* this) -{ +static void func_8086DC30(BgBdanSwitch* this) { this->updateFunc = &func_8086DC48; this->unk_1DA = 0x64; } -static void func_8086DC48(BgBdanSwitch* this, GlobalContext* globalCtx) -{ - if ((func_8005B198() == this->actor.type) || (this->unk_1DA <= 0)) - { +static void func_8086DC48(BgBdanSwitch* this, GlobalContext* globalCtx) { + if ((func_8005B198() == this->actor.type) || (this->unk_1DA <= 0)) { this->unk_1C8 -= 0.3f; - if (this->unk_1C8 <= 1.0f) - { + if (this->unk_1C8 <= 1.0f) { func_8086DCCC(this); Audio_PlayActorSound2(&this->actor, NA_SE_EV_FOOT_SWITCH); } } } -static void func_8086DCCC(BgBdanSwitch* this) -{ +static void func_8086DCCC(BgBdanSwitch* this) { this->updateFunc = &func_8086DCE8; this->unk_1C8 = 1.0f; } -static void func_8086DCE8(BgBdanSwitch* this, GlobalContext* globalCtx) -{ - switch (this->actor.params & 0xFF) - { +static void func_8086DCE8(BgBdanSwitch* this, GlobalContext* globalCtx) { + switch (this->actor.params & 0xFF) { case YELLOW_TALL_1: - if (!Flags_GetSwitch(globalCtx, (this->actor.params >> 8) & 0x3F)) - { + if (!Flags_GetSwitch(globalCtx, (this->actor.params >> 8) & 0x3F)) { func_8086DDA8(this); } break; case YELLOW_TALL_2: - if (((this->collider.base.collideFlags & 2) != 0) && ((this->unk_1DC & 2) == 0) && (this->unk_1D8 <= 0)) - { + if (((this->collider.base.collideFlags & 2) != 0) && ((this->unk_1DC & 2) == 0) && (this->unk_1D8 <= 0)) { this->unk_1D8 = 0xA; func_8086DDA8(this); func_8086D548(this, globalCtx); @@ -592,45 +486,38 @@ static void func_8086DCE8(BgBdanSwitch* this, GlobalContext* globalCtx) } } -static void func_8086DDA8(BgBdanSwitch* this) -{ +static void func_8086DDA8(BgBdanSwitch* this) { this->updateFunc = &func_8086DDC0; this->unk_1DA = 0x64; } -static void func_8086DDC0(BgBdanSwitch* this, GlobalContext* globalCtx) -{ - if ((((this->actor.params & 0xFF) != YELLOW_TALL_2) || (func_8005B198() == this->actor.type)) || (this->unk_1DA <= 0)) - { +static void func_8086DDC0(BgBdanSwitch* this, GlobalContext* globalCtx) { + if ((((this->actor.params & 0xFF) != YELLOW_TALL_2) || (func_8005B198() == this->actor.type)) || + (this->unk_1DA <= 0)) { this->unk_1C8 += 0.3f; - if (this->unk_1C8 >= 2.0f) - { + if (this->unk_1C8 >= 2.0f) { func_8086DB4C(this); Audio_PlayActorSound2(&this->actor, NA_SE_EV_FOOT_SWITCH); } } } -static void BgBdanSwitch_Update(BgBdanSwitch* this, GlobalContext* globalCtx) -{ +static void BgBdanSwitch_Update(BgBdanSwitch* this, GlobalContext* globalCtx) { s32 pad; s32 type; s32 pad2; - if (this->unk_1DA > 0) - { + if (this->unk_1DA > 0) { this->unk_1DA -= 1; } this->updateFunc(this, globalCtx); func_8086D0EC(this); type = this->actor.params & 0xFF; - if (type != 3 && type != 4) - { + if (type != 3 && type != 4) { this->unk_1D8 -= 1; return; } - if (!func_8008E988(globalCtx) && this->unk_1D8 > 0) - { + if (!func_8008E988(globalCtx) && this->unk_1D8 > 0) { this->unk_1D8 -= 1; } pad = this->collider.base.collideFlags; @@ -641,17 +528,15 @@ static void BgBdanSwitch_Update(BgBdanSwitch* this, GlobalContext* globalCtx) Actor_CollisionCheck_SetOT(globalCtx, &globalCtx->sub_11E60, &this->collider); } -static void func_8086DF58(BgBdanSwitch* this, GlobalContext* globalCtx, UNK_TYPE arg2) -{ - func_800D1694(this->actor.posRot.pos.x, this->actor.posRot.pos.y + (this->actor.shape.unk_08 * this->unk_1D0), this->actor.posRot.pos.z, &this->actor.shape.rot); +static void func_8086DF58(BgBdanSwitch* this, GlobalContext* globalCtx, UNK_TYPE arg2) { + func_800D1694(this->actor.posRot.pos.x, this->actor.posRot.pos.y + (this->actor.shape.unk_08 * this->unk_1D0), + this->actor.posRot.pos.z, &this->actor.shape.rot); Matrix_Scale(this->unk_1D4, this->unk_1D0, this->unk_1D4, MTXMODE_APPLY); - Draw_DListOpa(globalCtx, arg2); + Gfx_DrawDListOpa(globalCtx, arg2); } -static void BgBdanSwitch_Draw(BgBdanSwitch* this, GlobalContext* globalCtx) -{ - switch (this->actor.params & 0xFF) - { +static void BgBdanSwitch_Draw(BgBdanSwitch* this, GlobalContext* globalCtx) { + switch (this->actor.params & 0xFF) { case YELLOW_HEAVY: case YELLOW: func_8086DF58(this, globalCtx, &D_060061A0); diff --git a/src/overlays/actors/ovl_Bg_Bom_Guard/z_bg_bom_guard.c b/src/overlays/actors/ovl_Bg_Bom_Guard/z_bg_bom_guard.c index ecd44ee0a8..6c6a8db38e 100644 --- a/src/overlays/actors/ovl_Bg_Bom_Guard/z_bg_bom_guard.c +++ b/src/overlays/actors/ovl_Bg_Bom_Guard/z_bg_bom_guard.c @@ -2,13 +2,13 @@ * File: z_bg_bom_guard.c * Overlay: Bg_Bom_Guard * Description: -*/ + */ #include "z_bg_bom_guard.h" #include -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x00000010 static void BgBomGuard_Init(BgBomGuard* this, GlobalContext* globalCtx); @@ -17,8 +17,7 @@ static void BgBomGuard_Update(BgBomGuard* this, GlobalContext* globalCtx); static void func_8086E638(BgBomGuard* this, GlobalContext* globalCtx); -const ActorInit Bg_Bom_Guard_InitVars = -{ +const ActorInit Bg_Bom_Guard_InitVars = { ACTOR_BG_BOM_GUARD, ACTORTYPE_PROP, ROOM, @@ -33,13 +32,11 @@ const ActorInit Bg_Bom_Guard_InitVars = extern u32 D_06001C40; -static void BgBomGuard_SetupAction(BgBomGuard* this, ActorFunc actionFunc) -{ +static void BgBomGuard_SetupAction(BgBomGuard* this, ActorFunc actionFunc) { this->actionFunc = actionFunc; } -static void BgBomGuard_Init(BgBomGuard* this, GlobalContext* globalCtx) -{ +static void BgBomGuard_Init(BgBomGuard* this, GlobalContext* globalCtx) { s32 pad[2]; Actor* thisx = &this->dyna.actor; s32 local_c = 0; @@ -58,26 +55,20 @@ static void BgBomGuard_Init(BgBomGuard* this, GlobalContext* globalCtx) BgBomGuard_SetupAction(this, func_8086E638); } -static void BgBomGuard_Destroy(BgBomGuard* this, GlobalContext* globalCtx) -{ +static void BgBomGuard_Destroy(BgBomGuard* this, GlobalContext* globalCtx) { DynaPolyInfo_Free(globalCtx, &globalCtx->colCtx.dyna, this->dyna.dynaPolyId); } -static void func_8086E638(BgBomGuard* this, GlobalContext* globalCtx) -{ +static void func_8086E638(BgBomGuard* this, GlobalContext* globalCtx) { Actor* it = globalCtx->actorCtx.actorList[ACTORTYPE_NPC].first; Actor* thisx = &this->dyna.actor; this->unk_168 = 0; - while (it != 0) - { - if (it->id == ACTOR_EN_BOM_BOWL_MAN) - { - if ((((EnBomBowlMan*)it)->unk_258 != 0) && - (fabsf(globalCtx->view.eye.x) > -20.0f) && - (fabsf(globalCtx->view.eye.y) > 110.0f)) - { + while (it != 0) { + if (it->id == ACTOR_EN_BOM_BOWL_MAN) { + if ((((EnBomBowlMan*)it)->unk_258 != 0) && (fabsf(globalCtx->view.eye.x) > -20.0f) && + (fabsf(globalCtx->view.eye.y) > 110.0f)) { this->unk_168 = 1; } break; @@ -85,17 +76,13 @@ static void func_8086E638(BgBomGuard* this, GlobalContext* globalCtx) it = it->next; } - if (this->unk_168 == 0) - { + if (this->unk_168 == 0) { thisx->posRot.pos.y = sREG(64) + -200.0f; - } - else - { + } else { thisx->posRot.pos.y = 0.0f; } } -static void BgBomGuard_Update(BgBomGuard* this, GlobalContext* globalCtx) -{ +static void BgBomGuard_Update(BgBomGuard* this, GlobalContext* globalCtx) { this->actionFunc(this, globalCtx); } diff --git a/src/overlays/actors/ovl_Bg_Bom_Guard/z_bg_bom_guard.h b/src/overlays/actors/ovl_Bg_Bom_Guard/z_bg_bom_guard.h index 7f59b8ddf6..539b1096bb 100644 --- a/src/overlays/actors/ovl_Bg_Bom_Guard/z_bg_bom_guard.h +++ b/src/overlays/actors/ovl_Bg_Bom_Guard/z_bg_bom_guard.h @@ -6,8 +6,7 @@ #include "../ovl_En_Bom_Bowl_Man/z_en_bom_bowl_man.h" -typedef struct -{ +typedef struct { /* 0x0000 */ DynaPolyActor dyna; /* 0x0164 */ ActorFunc actionFunc; /* 0x0168 */ u8 unk_168; diff --git a/src/overlays/actors/ovl_Bg_Bombwall/z_bg_bombwall.c b/src/overlays/actors/ovl_Bg_Bombwall/z_bg_bombwall.c index 038390492b..f6b861eb02 100644 --- a/src/overlays/actors/ovl_Bg_Bombwall/z_bg_bombwall.c +++ b/src/overlays/actors/ovl_Bg_Bombwall/z_bg_bombwall.c @@ -1,6 +1,6 @@ #include "z_bg_bombwall.h" -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x00400000 void BgBombwall_Init(BgBombwall* this, GlobalContext* globalCtx); @@ -9,8 +9,7 @@ void BgBombwall_Update(BgBombwall* this, GlobalContext* globalCtx); void BgBombwall_Draw(BgBombwall* this, GlobalContext* globalCtx); /* -const ActorInit Bg_Bombwall_InitVars = -{ +const ActorInit Bg_Bombwall_InitVars = { ACTOR_BG_BOMBWALL, ACTORTYPE_BG, ROOM, diff --git a/src/overlays/actors/ovl_Bg_Bombwall/z_bg_bombwall.h b/src/overlays/actors/ovl_Bg_Bombwall/z_bg_bombwall.h index 71ac27a9ba..a16b9953da 100644 --- a/src/overlays/actors/ovl_Bg_Bombwall/z_bg_bombwall.h +++ b/src/overlays/actors/ovl_Bg_Bombwall/z_bg_bombwall.h @@ -4,8 +4,7 @@ #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ Actor actor; /* 0x014C */ char unk_14C[0x158]; } BgBombwall; // size = 0x02A4 diff --git a/src/overlays/actors/ovl_Bg_Bowl_Wall/z_bg_bowl_wall.c b/src/overlays/actors/ovl_Bg_Bowl_Wall/z_bg_bowl_wall.c index d4f9fadce6..94caa74c10 100644 --- a/src/overlays/actors/ovl_Bg_Bowl_Wall/z_bg_bowl_wall.c +++ b/src/overlays/actors/ovl_Bg_Bowl_Wall/z_bg_bowl_wall.c @@ -1,6 +1,6 @@ #include "z_bg_bowl_wall.h" -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x00000030 void BgBowlWall_Init(BgBowlWall* this, GlobalContext* globalCtx); @@ -9,8 +9,7 @@ void BgBowlWall_Update(BgBowlWall* this, GlobalContext* globalCtx); void BgBowlWall_Draw(BgBowlWall* this, GlobalContext* globalCtx); /* -const ActorInit Bg_Bowl_Wall_InitVars = -{ +const ActorInit Bg_Bowl_Wall_InitVars = { ACTOR_BG_BOWL_WALL, ACTORTYPE_PROP, ROOM, diff --git a/src/overlays/actors/ovl_Bg_Bowl_Wall/z_bg_bowl_wall.h b/src/overlays/actors/ovl_Bg_Bowl_Wall/z_bg_bowl_wall.h index 365c301426..26f70c5ba6 100644 --- a/src/overlays/actors/ovl_Bg_Bowl_Wall/z_bg_bowl_wall.h +++ b/src/overlays/actors/ovl_Bg_Bowl_Wall/z_bg_bowl_wall.h @@ -4,8 +4,7 @@ #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ Actor actor; /* 0x014C */ char unk_14C[0x3C]; } BgBowlWall; // size = 0x0188 diff --git a/src/overlays/actors/ovl_Bg_Breakwall/z_bg_breakwall.c b/src/overlays/actors/ovl_Bg_Breakwall/z_bg_breakwall.c index ef3776bec6..9458d03a6a 100644 --- a/src/overlays/actors/ovl_Bg_Breakwall/z_bg_breakwall.c +++ b/src/overlays/actors/ovl_Bg_Breakwall/z_bg_breakwall.c @@ -1,6 +1,6 @@ #include "z_bg_breakwall.h" -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x00000010 void BgBreakwall_Init(BgBreakwall* this, GlobalContext* globalCtx); @@ -8,8 +8,7 @@ void BgBreakwall_Destroy(BgBreakwall* this, GlobalContext* globalCtx); void BgBreakwall_Update(BgBreakwall* this, GlobalContext* globalCtx); /* -const ActorInit Bg_Breakwall_InitVars = -{ +const ActorInit Bg_Breakwall_InitVars = { ACTOR_BG_BREAKWALL, ACTORTYPE_BG, ROOM, diff --git a/src/overlays/actors/ovl_Bg_Breakwall/z_bg_breakwall.h b/src/overlays/actors/ovl_Bg_Breakwall/z_bg_breakwall.h index ce803a1a36..9495d4afc5 100644 --- a/src/overlays/actors/ovl_Bg_Breakwall/z_bg_breakwall.h +++ b/src/overlays/actors/ovl_Bg_Breakwall/z_bg_breakwall.h @@ -4,8 +4,7 @@ #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ Actor actor; /* 0x014C */ char unk_14C[0xA4]; } BgBreakwall; // size = 0x01F0 diff --git a/src/overlays/actors/ovl_Bg_Ddan_Jd/z_bg_ddan_jd.c b/src/overlays/actors/ovl_Bg_Ddan_Jd/z_bg_ddan_jd.c index aa60cee7bd..fe107255ea 100644 --- a/src/overlays/actors/ovl_Bg_Ddan_Jd/z_bg_ddan_jd.c +++ b/src/overlays/actors/ovl_Bg_Ddan_Jd/z_bg_ddan_jd.c @@ -1,6 +1,6 @@ #include "z_bg_ddan_jd.h" -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x00000030 void BgDdanJd_Init(BgDdanJd* this, GlobalContext* globalCtx); @@ -9,8 +9,7 @@ void BgDdanJd_Update(BgDdanJd* this, GlobalContext* globalCtx); void BgDdanJd_Draw(BgDdanJd* this, GlobalContext* globalCtx); /* -const ActorInit Bg_Ddan_Jd_InitVars = -{ +const ActorInit Bg_Ddan_Jd_InitVars = { ACTOR_BG_DDAN_JD, ACTORTYPE_BG, ROOM, @@ -36,6 +35,3 @@ const ActorInit Bg_Ddan_Jd_InitVars = #pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Ddan_Jd/BgDdanJd_Update.s") #pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Ddan_Jd/BgDdanJd_Draw.s") - - - diff --git a/src/overlays/actors/ovl_Bg_Ddan_Jd/z_bg_ddan_jd.h b/src/overlays/actors/ovl_Bg_Ddan_Jd/z_bg_ddan_jd.h index 0f4c909107..e71bd1bab8 100644 --- a/src/overlays/actors/ovl_Bg_Ddan_Jd/z_bg_ddan_jd.h +++ b/src/overlays/actors/ovl_Bg_Ddan_Jd/z_bg_ddan_jd.h @@ -4,8 +4,7 @@ #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ Actor actor; /* 0x014C */ char unk_14C[0x24]; } BgDdanJd; // size = 0x0170 diff --git a/src/overlays/actors/ovl_Bg_Ddan_Kd/z_bg_ddan_kd.c b/src/overlays/actors/ovl_Bg_Ddan_Kd/z_bg_ddan_kd.c index 2ce9ca13e4..8d397e6408 100644 --- a/src/overlays/actors/ovl_Bg_Ddan_Kd/z_bg_ddan_kd.c +++ b/src/overlays/actors/ovl_Bg_Ddan_Kd/z_bg_ddan_kd.c @@ -1,6 +1,6 @@ #include "z_bg_ddan_kd.h" -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x00000010 void BgDdanKd_Init(BgDdanKd* this, GlobalContext* globalCtx); @@ -9,8 +9,7 @@ void BgDdanKd_Update(BgDdanKd* this, GlobalContext* globalCtx); void BgDdanKd_Draw(BgDdanKd* this, GlobalContext* globalCtx); /* -const ActorInit Bg_Ddan_Kd_InitVars = -{ +const ActorInit Bg_Ddan_Kd_InitVars = { ACTOR_BG_DDAN_KD, ACTORTYPE_BG, ROOM, diff --git a/src/overlays/actors/ovl_Bg_Ddan_Kd/z_bg_ddan_kd.h b/src/overlays/actors/ovl_Bg_Ddan_Kd/z_bg_ddan_kd.h index 506265edb8..920ad7bbb9 100644 --- a/src/overlays/actors/ovl_Bg_Ddan_Kd/z_bg_ddan_kd.h +++ b/src/overlays/actors/ovl_Bg_Ddan_Kd/z_bg_ddan_kd.h @@ -4,8 +4,7 @@ #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ Actor actor; /* 0x014C */ char unk_14C[0x7C]; } BgDdanKd; // size = 0x01C8 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 7d70a8e366..e5b649f7b4 100644 --- a/src/overlays/actors/ovl_Bg_Dodoago/z_bg_dodoago.c +++ b/src/overlays/actors/ovl_Bg_Dodoago/z_bg_dodoago.c @@ -1,6 +1,6 @@ #include "z_bg_dodoago.h" -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x00000000 void BgDodoago_Init(BgDodoago* this, GlobalContext* globalCtx); @@ -9,8 +9,7 @@ void BgDodoago_Update(BgDodoago* this, GlobalContext* globalCtx); void BgDodoago_Draw(BgDodoago* this, GlobalContext* globalCtx); /* -const ActorInit Bg_Dodoago_InitVars = -{ +const ActorInit Bg_Dodoago_InitVars = { ACTOR_BG_DODOAGO, ACTORTYPE_BG, ROOM, @@ -42,4 +41,3 @@ const ActorInit Bg_Dodoago_InitVars = #pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Dodoago/BgDodoago_Update.s") #pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Dodoago/BgDodoago_Draw.s") - diff --git a/src/overlays/actors/ovl_Bg_Dodoago/z_bg_dodoago.h b/src/overlays/actors/ovl_Bg_Dodoago/z_bg_dodoago.h index 4ed426f8e5..d9723c5ffa 100644 --- a/src/overlays/actors/ovl_Bg_Dodoago/z_bg_dodoago.h +++ b/src/overlays/actors/ovl_Bg_Dodoago/z_bg_dodoago.h @@ -4,8 +4,7 @@ #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ Actor actor; /* 0x014C */ char unk_14C[0x104]; } BgDodoago; // size = 0x0250 diff --git a/src/overlays/actors/ovl_Bg_Dy_Yoseizo/z_bg_dy_yoseizo.c b/src/overlays/actors/ovl_Bg_Dy_Yoseizo/z_bg_dy_yoseizo.c index 0f30328291..e1021f9a5a 100644 --- a/src/overlays/actors/ovl_Bg_Dy_Yoseizo/z_bg_dy_yoseizo.c +++ b/src/overlays/actors/ovl_Bg_Dy_Yoseizo/z_bg_dy_yoseizo.c @@ -1,6 +1,6 @@ #include "z_bg_dy_yoseizo.h" -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x02000030 void BgDyYoseizo_Init(BgDyYoseizo* this, GlobalContext* globalCtx); @@ -8,8 +8,7 @@ void BgDyYoseizo_Destroy(BgDyYoseizo* this, GlobalContext* globalCtx); void BgDyYoseizo_Update(BgDyYoseizo* this, GlobalContext* globalCtx); /* -const ActorInit Bg_Dy_Yoseizo_InitVars = -{ +const ActorInit Bg_Dy_Yoseizo_InitVars = { ACTOR_BG_DY_YOSEIZO, ACTORTYPE_PROP, ROOM, diff --git a/src/overlays/actors/ovl_Bg_Dy_Yoseizo/z_bg_dy_yoseizo.h b/src/overlays/actors/ovl_Bg_Dy_Yoseizo/z_bg_dy_yoseizo.h index ab11be53b1..2ab814b2f7 100644 --- a/src/overlays/actors/ovl_Bg_Dy_Yoseizo/z_bg_dy_yoseizo.h +++ b/src/overlays/actors/ovl_Bg_Dy_Yoseizo/z_bg_dy_yoseizo.h @@ -4,8 +4,7 @@ #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ Actor actor; /* 0x014C */ char unk_14C[0x3768]; } BgDyYoseizo; // size = 0x38B4 diff --git a/src/overlays/actors/ovl_Bg_Ganon_Otyuka/z_bg_ganon_otyuka.c b/src/overlays/actors/ovl_Bg_Ganon_Otyuka/z_bg_ganon_otyuka.c index 4fce310049..6b65fa52c4 100644 --- a/src/overlays/actors/ovl_Bg_Ganon_Otyuka/z_bg_ganon_otyuka.c +++ b/src/overlays/actors/ovl_Bg_Ganon_Otyuka/z_bg_ganon_otyuka.c @@ -1,6 +1,6 @@ #include "z_bg_ganon_otyuka.h" -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x00000030 void BgGanonOtyuka_Init(BgGanonOtyuka* this, GlobalContext* globalCtx); @@ -9,8 +9,7 @@ void BgGanonOtyuka_Update(BgGanonOtyuka* this, GlobalContext* globalCtx); void BgGanonOtyuka_Draw(BgGanonOtyuka* this, GlobalContext* globalCtx); /* -const ActorInit Bg_Ganon_Otyuka_InitVars = -{ +const ActorInit Bg_Ganon_Otyuka_InitVars = { ACTOR_BG_GANON_OTYUKA, ACTORTYPE_PROP, ROOM, diff --git a/src/overlays/actors/ovl_Bg_Ganon_Otyuka/z_bg_ganon_otyuka.h b/src/overlays/actors/ovl_Bg_Ganon_Otyuka/z_bg_ganon_otyuka.h index 6210ae7235..5ff64f5555 100644 --- a/src/overlays/actors/ovl_Bg_Ganon_Otyuka/z_bg_ganon_otyuka.h +++ b/src/overlays/actors/ovl_Bg_Ganon_Otyuka/z_bg_ganon_otyuka.h @@ -4,8 +4,7 @@ #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ Actor actor; /* 0x014C */ char unk_14C[0x40]; } BgGanonOtyuka; // size = 0x018C 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 baa83eb800..5b19fc6db0 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 @@ -1,16 +1,27 @@ +/* + * File: z_bg_gate_shutter.c + * Overlay: Bg_Gate_Shutter + * Description: + */ + #include "z_bg_gate_shutter.h" -#define ROOM 0x00 +#include + +#define ROOM 0x00 #define FLAGS 0x00000000 -void BgGateShutter_Init(BgGateShutter* this, GlobalContext* globalCtx); -void BgGateShutter_Destroy(BgGateShutter* this, GlobalContext* globalCtx); -void BgGateShutter_Update(BgGateShutter* this, GlobalContext* globalCtx); -void BgGateShutter_Draw(BgGateShutter* this, GlobalContext* globalCtx); +static void BgGateShutter_Init(BgGateShutter* this, GlobalContext* globalCtx); +static void BgGateShutter_Destroy(BgGateShutter* this, GlobalContext* globalCtx); +static void BgGateShutter_Update(BgGateShutter* this, GlobalContext* globalCtx); +static void BgGateShutter_Draw(BgGateShutter* this, GlobalContext* globalCtx); -/* -const ActorInit Bg_Gate_Shutter_InitVars = -{ +static void func_8087828C(BgGateShutter* this, GlobalContext* globalCtx); +static void func_80878300(BgGateShutter* this, GlobalContext* globalCtx); +static void func_808783AC(BgGateShutter* this, GlobalContext* globalCtx); +static void func_808783D4(BgGateShutter* this, GlobalContext* globalCtx); + +const ActorInit Bg_Gate_Shutter_InitVars = { ACTOR_BG_GATE_SHUTTER, ACTORTYPE_ITEMACTION, ROOM, @@ -22,19 +33,107 @@ const ActorInit Bg_Gate_Shutter_InitVars = (ActorFunc)BgGateShutter_Update, (ActorFunc)BgGateShutter_Draw, }; -*/ -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Gate_Shutter/BgGateShutter_Init.s") -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Gate_Shutter/BgGateShutter_Destroy.s") +extern UNK_TYPE D_06001CD0; +extern UNK_TYPE D_06001DA8; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Gate_Shutter/func_8087828C.s") +static void BgGateShutter_Init(BgGateShutter* this, GlobalContext* globalCtx) { + s32 pad[2]; + Actor* thisx = &this->dyna.actor; + s32 local_c = 0; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Gate_Shutter/func_80878300.s") + DynaPolyInfo_SetActorMove(thisx, 0); + DynaPolyInfo_Alloc(&D_06001DA8, &local_c); + this->dyna.dynaPolyId = DynaPolyInfo_RegisterActor(globalCtx, &globalCtx->colCtx.dyna, thisx, local_c); + this->somePosX = thisx->posRot.pos.x; + this->somePosY = thisx->posRot.pos.y; + this->somePosZ = thisx->posRot.pos.z; + if ((gSaveContext.inf_table[7] & 0x40) || (gSaveContext.event_chk_inf[4] & 0x20)) { + if (globalCtx->sceneNum == SCENE_SPOT01) { + thisx->posRot.pos.x = -89.0f; + thisx->posRot.pos.z = -1375.0f; + } + } + thisx->scale.x = 1.0f; + thisx->scale.y = 1.0f; + thisx->scale.z = 1.0f; + osSyncPrintf("\n\n"); + osSyncPrintf(VT_FGCOL(GREEN) " ☆☆☆☆☆ 柵でたなぁ ☆☆☆☆☆ \n" VT_RST); + this->actionFunc = (ActorFunc)func_8087828C; +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Gate_Shutter/func_808783AC.s") +static void BgGateShutter_Destroy(BgGateShutter* this, GlobalContext* globalCtx) { + DynaPolyInfo_Free(globalCtx, &globalCtx->colCtx.dyna, this->dyna.dynaPolyId); +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Gate_Shutter/func_808783D4.s") +static void func_8087828C(BgGateShutter* this, GlobalContext* globalCtx) { + if (this->unk_168 == 1 && !(gSaveContext.inf_table[7] & 0x40)) { + this->unk_178 = 2; + this->actionFunc = (ActorFunc)func_80878300; + } else if (this->unk_168 == 2) { + this->unk_178 = 2; + this->actionFunc = (ActorFunc)func_80878300; + } else if (this->unk_168 < 0) { + this->unk_178 = 2; + this->actionFunc = (ActorFunc)func_808783D4; + } +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Gate_Shutter/BgGateShutter_Update.s") +static void func_80878300(BgGateShutter* this, GlobalContext* globalCtx) { + Actor* thisx = &this->dyna.actor; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Gate_Shutter/BgGateShutter_Draw.s") + if (this->unk_178 == 0) { + Audio_PlayActorSound2(thisx, 0x2067); + thisx->posRot.pos.x -= 2.0f; + Math_SmoothScaleMaxF(&thisx->posRot.pos.z, -1375.0f, 0.8f, 0.3f); + if (thisx->posRot.pos.x < -89.0f) { + Audio_PlayActorSound2(thisx, NA_SE_EV_BRIDGE_OPEN_STOP); + this->unk_178 = 0x1E; + this->actionFunc = (ActorFunc)func_808783AC; + } + } +} + +static void func_808783AC(BgGateShutter* this, GlobalContext* globalCtx) { + if (this->unk_178 == 0) { + this->unk_168 = 0; + this->actionFunc = (ActorFunc)func_8087828C; + } +} + +static void func_808783D4(BgGateShutter* this, GlobalContext* globalCtx) { + Actor* thisx = &this->dyna.actor; + + if (this->unk_178 == 0) { + Audio_PlayActorSound2(thisx, 0x2067); + thisx->posRot.pos.x += 2.0f; + Math_SmoothScaleMaxF(&thisx->posRot.pos.z, -1350.0f, 0.8f, 0.3f); + if (thisx->posRot.pos.x > 90.0f) { + thisx->posRot.pos.x = 91.0f; + Audio_PlayActorSound2(thisx, NA_SE_EV_BRIDGE_OPEN_STOP); + this->unk_178 = 30; + this->actionFunc = (ActorFunc)func_808783AC; + } + } +} + +static void BgGateShutter_Update(BgGateShutter* this, GlobalContext* globalCtx) { + if (this->unk_178 != 0) { + this->unk_178 -= 1; + } + this->actionFunc(this, globalCtx); +} + +static void BgGateShutter_Draw(BgGateShutter* this, GlobalContext* globalCtx) { + GraphicsContext* gfxCtx = globalCtx->state.gfxCtx; + Gfx* dispRefs[4]; + + Graph_OpenDisps(dispRefs, globalCtx->state.gfxCtx, "../z_bg_gate_shutter.c", 323); + func_80093D18(globalCtx->state.gfxCtx); + + gSPMatrix(gfxCtx->polyOpa.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_bg_gate_shutter.c", 328), + G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + gSPDisplayList(gfxCtx->polyOpa.p++, &D_06001CD0); + + Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_bg_gate_shutter.c", 333); +} diff --git a/src/overlays/actors/ovl_Bg_Gate_Shutter/z_bg_gate_shutter.h b/src/overlays/actors/ovl_Bg_Gate_Shutter/z_bg_gate_shutter.h index 0ba1fccc8b..84c3afb408 100644 --- a/src/overlays/actors/ovl_Bg_Gate_Shutter/z_bg_gate_shutter.h +++ b/src/overlays/actors/ovl_Bg_Gate_Shutter/z_bg_gate_shutter.h @@ -4,10 +4,14 @@ #include #include -typedef struct -{ - /* 0x0000 */ Actor actor; - /* 0x014C */ char unk_14C[0x30]; +typedef struct { + /* 0x0000 */ DynaPolyActor dyna; + /* 0x0164 */ ActorFunc actionFunc; + /* 0x0168 */ s16 unk_168; + /* 0x016C */ f32 somePosX; + /* 0x0170 */ f32 somePosY; + /* 0x0174 */ f32 somePosZ; + /* 0x0178 */ s16 unk_178; } BgGateShutter; // size = 0x017C extern const ActorInit Bg_Gate_Shutter_InitVars; 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 cce0fe8e99..282304736e 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 @@ -1,16 +1,23 @@ +/* + * File: z_bg_gjyo_bridge.c + * Overlay: ovl_Bg_Gjyo_Bridge + * Description: Rainbow Bridge outside Ganon's Castle + */ + #include "z_bg_gjyo_bridge.h" -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x00000000 -void BgGjyoBridge_Init(BgGjyoBridge* this, GlobalContext* globalCtx); -void BgGjyoBridge_Destroy(BgGjyoBridge* this, GlobalContext* globalCtx); -void BgGjyoBridge_Update(BgGjyoBridge* this, GlobalContext* globalCtx); -void BgGjyoBridge_Draw(BgGjyoBridge* this, GlobalContext* globalCtx); +static void BgGjyoBridge_Init(BgGjyoBridge* this, GlobalContext* globalCtx); +static void BgGjyoBridge_Destroy(BgGjyoBridge* this, GlobalContext* globalCtx); +static void BgGjyoBridge_Update(BgGjyoBridge* this, GlobalContext* globalCtx); +static void BgGjyoBridge_Draw(BgGjyoBridge* this, GlobalContext* globalCtx); +static void func_808787A4(BgGjyoBridge* this, GlobalContext* globalCtx); +static void BgGjyoBridge_TriggerCutscene(BgGjyoBridge* this, GlobalContext* globalCtx); +static void BgGjyoBridge_SpawnBridge(BgGjyoBridge* this, GlobalContext* globalCtx); -/* -const ActorInit Bg_Gjyo_Bridge_InitVars = -{ +const ActorInit Bg_Gjyo_Bridge_InitVars = { ACTOR_BG_GJYO_BRIDGE, ACTORTYPE_PROP, ROOM, @@ -22,17 +29,96 @@ const ActorInit Bg_Gjyo_Bridge_InitVars = (ActorFunc)BgGjyoBridge_Update, (ActorFunc)BgGjyoBridge_Draw, }; -*/ -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Gjyo_Bridge/BgGjyoBridge_Init.s") -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Gjyo_Bridge/BgGjyoBridge_Destroy.s") +InitChainEntry initChain[] = { + ICHAIN_F32(unk_F8, 800, ICHAIN_CONTINUE), + ICHAIN_VEC3F_DIV1000(scale, 100, ICHAIN_STOP), +}; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Gjyo_Bridge/func_808787A4.s") +extern UNK_TYPE D_06000600; +extern UNK_TYPE D_06000DB8; +extern UNK_TYPE D_02002640; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Gjyo_Bridge/func_808787B0.s") +void BgGjyoBridge_Init(BgGjyoBridge* this, GlobalContext* globalCtx) { + s32 pad; + DynaCollisionContext* dynaCollisionContext; + s32 local_c; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Gjyo_Bridge/func_80878904.s") + local_c = 0; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Gjyo_Bridge/BgGjyoBridge_Update.s") + Actor_ProcessInitChain(&this->dyna, &initChain); + DynaPolyInfo_SetActorMove(this, 0); + DynaPolyInfo_Alloc(&D_06000DB8, &local_c); -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Gjyo_Bridge/BgGjyoBridge_Draw.s") + dynaCollisionContext = &globalCtx->colCtx.dyna; + + this->dyna.dynaPolyId = DynaPolyInfo_RegisterActor(globalCtx, dynaCollisionContext, this, local_c); + + if (gSaveContext.event_chk_inf[4] & 0x2000) { + this->actionFunc = func_808787A4; + } else { + this->dyna.actor.draw = NULL; + func_8003EBF8(globalCtx, dynaCollisionContext, this->dyna.dynaPolyId); + this->actionFunc = BgGjyoBridge_TriggerCutscene; + } +} + +void BgGjyoBridge_Destroy(BgGjyoBridge* this, GlobalContext* globalCtx) { + DynaPolyInfo_Free(globalCtx, &globalCtx->colCtx.dyna, this->dyna.dynaPolyId); +} + +void func_808787A4(BgGjyoBridge* this, GlobalContext* globalCtx) { +} + +void BgGjyoBridge_TriggerCutscene(BgGjyoBridge* this, GlobalContext* globalCtx) { + Player* player = PLAYER; + + if ((gBitFlags[3] & gSaveContext.quest_items) && (gBitFlags[4] & gSaveContext.quest_items) && + (INV_CONTENT(ITEM_ARROW_LIGHT) == ITEM_ARROW_LIGHT) && (player->actor.posRot.pos.x > -70.0f) && + (player->actor.posRot.pos.x < 300.0f) && (player->actor.posRot.pos.y > 1340.0f) && + (player->actor.posRot.pos.z > 1340.0f) && (player->actor.posRot.pos.z < 1662.0f) && + (func_800BFC84(globalCtx) == 0)) { + globalCtx->csCtx.segment = SEGMENTED_TO_VIRTUAL(&D_02002640); + gSaveContext.cutscene_trigger = 1; + this->actionFunc = BgGjyoBridge_SpawnBridge; + } +} + +void BgGjyoBridge_SpawnBridge(BgGjyoBridge* this, GlobalContext* globalCtx) { + if ((globalCtx->csCtx.state != 0) && (globalCtx->csCtx.actorActions[2] != NULL) && + (globalCtx->csCtx.actorActions[2]->action == 2)) { + this->dyna.actor.draw = &BgGjyoBridge_Draw; + func_8003EC50(globalCtx, &globalCtx->colCtx.dyna, this->dyna.dynaPolyId); + gSaveContext.event_chk_inf[4] |= 0x2000; + } +} + +void BgGjyoBridge_Update(BgGjyoBridge* this, GlobalContext* globalCtx) { + this->actionFunc(&this->dyna.actor, globalCtx); +} + +void BgGjyoBridge_Draw(BgGjyoBridge* this, GlobalContext* globalCtx) { + s32 pad; + GraphicsContext* gfxCtx; + Gfx* dispRefs[4]; + + gfxCtx = globalCtx->state.gfxCtx; + + Graph_OpenDisps(dispRefs, globalCtx->state.gfxCtx, "../z_bg_gjyo_bridge.c", 260); + func_80093D84(globalCtx->state.gfxCtx); + + gSPSegment(gfxCtx->polyXlu.p++, 8, + Gfx_TexScroll(globalCtx->state.gfxCtx, globalCtx->gameplayFrames & 127, + globalCtx->gameplayFrames * -3 & 127, 32, 32)); + + gSPSegment(gfxCtx->polyXlu.p++, 9, + Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 0, -globalCtx->gameplayFrames & 127, 32, 32, 1, 0, + globalCtx->gameplayFrames & 127, 32, 32)); + + gSPMatrix(gfxCtx->polyXlu.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_bg_gjyo_bridge.c", 281), + G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + + gSPDisplayList(gfxCtx->polyXlu.p++, &D_06000600); + + Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_bg_gjyo_bridge.c", 285); +} diff --git a/src/overlays/actors/ovl_Bg_Gjyo_Bridge/z_bg_gjyo_bridge.h b/src/overlays/actors/ovl_Bg_Gjyo_Bridge/z_bg_gjyo_bridge.h index 7d9b5ed751..8b74aac99e 100644 --- a/src/overlays/actors/ovl_Bg_Gjyo_Bridge/z_bg_gjyo_bridge.h +++ b/src/overlays/actors/ovl_Bg_Gjyo_Bridge/z_bg_gjyo_bridge.h @@ -4,10 +4,9 @@ #include #include -typedef struct -{ - /* 0x0000 */ Actor actor; - /* 0x014C */ char unk_14C[0x1C]; +typedef struct { + /* 0x0000 */ DynaPolyActor dyna; + /* 0x0164 */ ActorFunc actionFunc; } BgGjyoBridge; // size = 0x0168 extern const ActorInit Bg_Gjyo_Bridge_InitVars; 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 8bbd6da107..e4f20e07e5 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 @@ -1,6 +1,6 @@ #include "z_bg_gnd_darkmeiro.h" -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x00000030 void BgGndDarkmeiro_Init(BgGndDarkmeiro* this, GlobalContext* globalCtx); @@ -8,8 +8,7 @@ void BgGndDarkmeiro_Destroy(BgGndDarkmeiro* this, GlobalContext* globalCtx); void BgGndDarkmeiro_Update(BgGndDarkmeiro* this, GlobalContext* globalCtx); /* -const ActorInit Bg_Gnd_Darkmeiro_InitVars = -{ +const ActorInit Bg_Gnd_Darkmeiro_InitVars = { ACTOR_BG_GND_DARKMEIRO, ACTORTYPE_PROP, ROOM, diff --git a/src/overlays/actors/ovl_Bg_Gnd_Darkmeiro/z_bg_gnd_darkmeiro.h b/src/overlays/actors/ovl_Bg_Gnd_Darkmeiro/z_bg_gnd_darkmeiro.h index a9f4ab84cd..0137cb5123 100644 --- a/src/overlays/actors/ovl_Bg_Gnd_Darkmeiro/z_bg_gnd_darkmeiro.h +++ b/src/overlays/actors/ovl_Bg_Gnd_Darkmeiro/z_bg_gnd_darkmeiro.h @@ -4,8 +4,7 @@ #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ Actor actor; /* 0x014C */ char unk_14C[0x24]; } BgGndDarkmeiro; // size = 0x0170 diff --git a/src/overlays/actors/ovl_Bg_Gnd_Firemeiro/z_bg_gnd_firemeiro.c b/src/overlays/actors/ovl_Bg_Gnd_Firemeiro/z_bg_gnd_firemeiro.c index 037e3af4e7..80cb6139fa 100644 --- a/src/overlays/actors/ovl_Bg_Gnd_Firemeiro/z_bg_gnd_firemeiro.c +++ b/src/overlays/actors/ovl_Bg_Gnd_Firemeiro/z_bg_gnd_firemeiro.c @@ -1,6 +1,6 @@ #include "z_bg_gnd_firemeiro.h" -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x00000030 void BgGndFiremeiro_Init(BgGndFiremeiro* this, GlobalContext* globalCtx); @@ -9,8 +9,7 @@ void BgGndFiremeiro_Update(BgGndFiremeiro* this, GlobalContext* globalCtx); void BgGndFiremeiro_Draw(BgGndFiremeiro* this, GlobalContext* globalCtx); /* -const ActorInit Bg_Gnd_Firemeiro_InitVars = -{ +const ActorInit Bg_Gnd_Firemeiro_InitVars = { ACTOR_BG_GND_FIREMEIRO, ACTORTYPE_PROP, ROOM, diff --git a/src/overlays/actors/ovl_Bg_Gnd_Firemeiro/z_bg_gnd_firemeiro.h b/src/overlays/actors/ovl_Bg_Gnd_Firemeiro/z_bg_gnd_firemeiro.h index 10a26d04c7..b469b6d344 100644 --- a/src/overlays/actors/ovl_Bg_Gnd_Firemeiro/z_bg_gnd_firemeiro.h +++ b/src/overlays/actors/ovl_Bg_Gnd_Firemeiro/z_bg_gnd_firemeiro.h @@ -4,8 +4,7 @@ #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ Actor actor; /* 0x014C */ char unk_14C[0x2C]; } BgGndFiremeiro; // size = 0x0178 diff --git a/src/overlays/actors/ovl_Bg_Gnd_Iceblock/z_bg_gnd_iceblock.c b/src/overlays/actors/ovl_Bg_Gnd_Iceblock/z_bg_gnd_iceblock.c index b728ab7ba6..f3411be9c7 100644 --- a/src/overlays/actors/ovl_Bg_Gnd_Iceblock/z_bg_gnd_iceblock.c +++ b/src/overlays/actors/ovl_Bg_Gnd_Iceblock/z_bg_gnd_iceblock.c @@ -1,6 +1,6 @@ #include "z_bg_gnd_iceblock.h" -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x00000030 void BgGndIceblock_Init(BgGndIceblock* this, GlobalContext* globalCtx); @@ -9,8 +9,7 @@ void BgGndIceblock_Update(BgGndIceblock* this, GlobalContext* globalCtx); void BgGndIceblock_Draw(BgGndIceblock* this, GlobalContext* globalCtx); /* -const ActorInit Bg_Gnd_Iceblock_InitVars = -{ +const ActorInit Bg_Gnd_Iceblock_InitVars = { ACTOR_BG_GND_ICEBLOCK, ACTORTYPE_PROP, ROOM, @@ -48,4 +47,3 @@ const ActorInit Bg_Gnd_Iceblock_InitVars = #pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Gnd_Iceblock/BgGndIceblock_Update.s") #pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Gnd_Iceblock/BgGndIceblock_Draw.s") - diff --git a/src/overlays/actors/ovl_Bg_Gnd_Iceblock/z_bg_gnd_iceblock.h b/src/overlays/actors/ovl_Bg_Gnd_Iceblock/z_bg_gnd_iceblock.h index f40ac8cbcc..b7e0af4d9c 100644 --- a/src/overlays/actors/ovl_Bg_Gnd_Iceblock/z_bg_gnd_iceblock.h +++ b/src/overlays/actors/ovl_Bg_Gnd_Iceblock/z_bg_gnd_iceblock.h @@ -4,8 +4,7 @@ #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ Actor actor; /* 0x014C */ char unk_14C[0x28]; } BgGndIceblock; // size = 0x0174 diff --git a/src/overlays/actors/ovl_Bg_Gnd_Nisekabe/z_bg_gnd_nisekabe.c b/src/overlays/actors/ovl_Bg_Gnd_Nisekabe/z_bg_gnd_nisekabe.c index 34820a1c9a..4d0fa15d03 100644 --- a/src/overlays/actors/ovl_Bg_Gnd_Nisekabe/z_bg_gnd_nisekabe.c +++ b/src/overlays/actors/ovl_Bg_Gnd_Nisekabe/z_bg_gnd_nisekabe.c @@ -2,18 +2,17 @@ * File: z_bg_gnd_nisekabe.c * Overlay: ovl_Bg_Gnd_Nisekabe * Description: 2D Stone Wall -*/ + */ #include #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ Actor actor; } ActorGndNisekabe; // size = 0x014C -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x00000010 static void Init(ActorGndNisekabe* this, GlobalContext* globalCtx); @@ -21,8 +20,7 @@ static void Destroy(ActorGndNisekabe* this, GlobalContext* globalCtx); static void Update(ActorGndNisekabe* this, GlobalContext* globalCtx); static void Draw(ActorGndNisekabe* this, GlobalContext* globalCtx); -const ActorInit Bg_Gnd_Nisekabe_InitVars = -{ +const ActorInit Bg_Gnd_Nisekabe_InitVars = { ACTOR_BG_GND_NISEKABE, ACTORTYPE_PROP, ROOM, @@ -35,45 +33,30 @@ const ActorInit Bg_Gnd_Nisekabe_InitVars = (ActorFunc)Draw, }; -static u32 segmentAddr[] = -{ - 0x06009230, - 0x0600A390, - 0x0600B4A0 -}; +static u32 segmentAddr[] = { 0x06009230, 0x0600A390, 0x0600B4A0 }; -static void Init(ActorGndNisekabe* this, GlobalContext* globalCtx) -{ +static void Init(ActorGndNisekabe* this, GlobalContext* globalCtx) { Actor_SetScale(&this->actor, 0.1); this->actor.unk_F4 = 3000.0; } -static void Destroy(ActorGndNisekabe* this, GlobalContext* globalCtx) -{ +static void Destroy(ActorGndNisekabe* this, GlobalContext* globalCtx) { } -static void Update(ActorGndNisekabe* this, GlobalContext* globalCtx) -{ - if (globalCtx->actorCtx.unk_03 != 0) - { +static void Update(ActorGndNisekabe* this, GlobalContext* globalCtx) { + if (globalCtx->actorCtx.unk_03 != 0) { this->actor.flags |= 0x80; - } - else - { + } else { this->actor.flags &= 0xFFFFFF7F; } } -static void Draw(ActorGndNisekabe* this, GlobalContext* globalCtx) -{ +static void Draw(ActorGndNisekabe* this, GlobalContext* globalCtx) { u32 index = this->actor.params & 0xFF; - if ((this->actor.flags & 0x80) == 0x80) - { - Draw_DListXlu(globalCtx, segmentAddr[index]); - } - else - { - Draw_DListOpa(globalCtx, segmentAddr[index]); + if ((this->actor.flags & 0x80) == 0x80) { + Gfx_DrawDListXlu(globalCtx, segmentAddr[index]); + } else { + Gfx_DrawDListOpa(globalCtx, segmentAddr[index]); } } 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 559dd9a6f8..c4e6477121 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 @@ -1,6 +1,6 @@ #include "z_bg_gnd_soulmeiro.h" -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x00000000 void BgGndSoulmeiro_Init(BgGndSoulmeiro* this, GlobalContext* globalCtx); @@ -9,8 +9,7 @@ void BgGndSoulmeiro_Update(BgGndSoulmeiro* this, GlobalContext* globalCtx); void BgGndSoulmeiro_Draw(BgGndSoulmeiro* this, GlobalContext* globalCtx); /* -const ActorInit Bg_Gnd_Soulmeiro_InitVars = -{ +const ActorInit Bg_Gnd_Soulmeiro_InitVars = { ACTOR_BG_GND_SOULMEIRO, ACTORTYPE_PROP, ROOM, diff --git a/src/overlays/actors/ovl_Bg_Gnd_Soulmeiro/z_bg_gnd_soulmeiro.h b/src/overlays/actors/ovl_Bg_Gnd_Soulmeiro/z_bg_gnd_soulmeiro.h index 34fe10639f..1382a62f06 100644 --- a/src/overlays/actors/ovl_Bg_Gnd_Soulmeiro/z_bg_gnd_soulmeiro.h +++ b/src/overlays/actors/ovl_Bg_Gnd_Soulmeiro/z_bg_gnd_soulmeiro.h @@ -4,8 +4,7 @@ #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ Actor actor; /* 0x014C */ char unk_14C[0x54]; } BgGndSoulmeiro; // size = 0x01A0 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 4e2eeffc71..056676cb61 100644 --- a/src/overlays/actors/ovl_Bg_Haka/z_bg_haka.c +++ b/src/overlays/actors/ovl_Bg_Haka/z_bg_haka.c @@ -1,6 +1,6 @@ #include "z_bg_haka.h" -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x00000000 void BgHaka_Init(BgHaka* this, GlobalContext* globalCtx); @@ -9,8 +9,7 @@ void BgHaka_Update(BgHaka* this, GlobalContext* globalCtx); void BgHaka_Draw(BgHaka* this, GlobalContext* globalCtx); /* -const ActorInit Bg_Haka_InitVars = -{ +const ActorInit Bg_Haka_InitVars = { ACTOR_BG_HAKA, ACTORTYPE_BG, ROOM, diff --git a/src/overlays/actors/ovl_Bg_Haka/z_bg_haka.h b/src/overlays/actors/ovl_Bg_Haka/z_bg_haka.h index dda5c3645f..40142a6d76 100644 --- a/src/overlays/actors/ovl_Bg_Haka/z_bg_haka.h +++ b/src/overlays/actors/ovl_Bg_Haka/z_bg_haka.h @@ -4,8 +4,7 @@ #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ Actor actor; /* 0x014C */ char unk_14C[0x1C]; } BgHaka; // size = 0x0168 diff --git a/src/overlays/actors/ovl_Bg_Haka_Gate/z_bg_haka_gate.c b/src/overlays/actors/ovl_Bg_Haka_Gate/z_bg_haka_gate.c index e4022a278d..f5f8b7cb78 100644 --- a/src/overlays/actors/ovl_Bg_Haka_Gate/z_bg_haka_gate.c +++ b/src/overlays/actors/ovl_Bg_Haka_Gate/z_bg_haka_gate.c @@ -1,6 +1,6 @@ #include "z_bg_haka_gate.h" -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x00000000 void BgHakaGate_Init(BgHakaGate* this, GlobalContext* globalCtx); @@ -9,8 +9,7 @@ void BgHakaGate_Update(BgHakaGate* this, GlobalContext* globalCtx); void BgHakaGate_Draw(BgHakaGate* this, GlobalContext* globalCtx); /* -const ActorInit Bg_Haka_Gate_InitVars = -{ +const ActorInit Bg_Haka_Gate_InitVars = { ACTOR_BG_HAKA_GATE, ACTORTYPE_PROP, ROOM, @@ -52,4 +51,3 @@ const ActorInit Bg_Haka_Gate_InitVars = #pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Haka_Gate/func_8087C85C.s") #pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Haka_Gate/BgHakaGate_Draw.s") - diff --git a/src/overlays/actors/ovl_Bg_Haka_Gate/z_bg_haka_gate.h b/src/overlays/actors/ovl_Bg_Haka_Gate/z_bg_haka_gate.h index 6d8dcbd8c6..17cbd7542f 100644 --- a/src/overlays/actors/ovl_Bg_Haka_Gate/z_bg_haka_gate.h +++ b/src/overlays/actors/ovl_Bg_Haka_Gate/z_bg_haka_gate.h @@ -4,8 +4,7 @@ #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ Actor actor; /* 0x014C */ char unk_14C[0x28]; } BgHakaGate; // size = 0x0174 diff --git a/src/overlays/actors/ovl_Bg_Haka_Huta/z_bg_haka_huta.c b/src/overlays/actors/ovl_Bg_Haka_Huta/z_bg_haka_huta.c index 16df9b3596..803382600e 100644 --- a/src/overlays/actors/ovl_Bg_Haka_Huta/z_bg_haka_huta.c +++ b/src/overlays/actors/ovl_Bg_Haka_Huta/z_bg_haka_huta.c @@ -1,6 +1,6 @@ #include "z_bg_haka_huta.h" -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x00000010 void BgHakaHuta_Init(BgHakaHuta* this, GlobalContext* globalCtx); @@ -9,8 +9,7 @@ void BgHakaHuta_Update(BgHakaHuta* this, GlobalContext* globalCtx); void BgHakaHuta_Draw(BgHakaHuta* this, GlobalContext* globalCtx); /* -const ActorInit Bg_Haka_Huta_InitVars = -{ +const ActorInit Bg_Haka_Huta_InitVars = { ACTOR_BG_HAKA_HUTA, ACTORTYPE_BG, ROOM, diff --git a/src/overlays/actors/ovl_Bg_Haka_Huta/z_bg_haka_huta.h b/src/overlays/actors/ovl_Bg_Haka_Huta/z_bg_haka_huta.h index a87b0253e6..7d23ebe985 100644 --- a/src/overlays/actors/ovl_Bg_Haka_Huta/z_bg_haka_huta.h +++ b/src/overlays/actors/ovl_Bg_Haka_Huta/z_bg_haka_huta.h @@ -4,8 +4,7 @@ #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ Actor actor; /* 0x014C */ char unk_14C[0x20]; } BgHakaHuta; // size = 0x016C diff --git a/src/overlays/actors/ovl_Bg_Haka_Megane/z_bg_haka_megane.c b/src/overlays/actors/ovl_Bg_Haka_Megane/z_bg_haka_megane.c index ed1e39a4ea..c8b7862c4d 100644 --- a/src/overlays/actors/ovl_Bg_Haka_Megane/z_bg_haka_megane.c +++ b/src/overlays/actors/ovl_Bg_Haka_Megane/z_bg_haka_megane.c @@ -1,15 +1,24 @@ +/* + * File: z_bg_haka_megane.c + * Overlay: ovl_Bg_Haka_Megane + * Description: + */ + #include "z_bg_haka_megane.h" -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x000000B0 -void BgHakaMegane_Init(BgHakaMegane* this, GlobalContext* globalCtx); -void BgHakaMegane_Destroy(BgHakaMegane* this, GlobalContext* globalCtx); -void BgHakaMegane_Update(BgHakaMegane* this, GlobalContext* globalCtx); +static void BgHakaMegane_Init(BgHakaMegane* this, GlobalContext* globalCtx); +static void BgHakaMegane_Destroy(BgHakaMegane* this, GlobalContext* globalCtx); +static void BgHakaMegane_Update(BgHakaMegane* this, GlobalContext* globalCtx); -/* -const ActorInit Bg_Haka_Megane_InitVars = -{ +static void func_8087DB24(BgHakaMegane* this, GlobalContext* globalCtx); +static void func_8087DBF0(BgHakaMegane* this, GlobalContext* globalCtx); +static void func_8087DC64(BgHakaMegane* this, GlobalContext* globalCtx); +static void func_8087DC94(BgHakaMegane* this, GlobalContext* globalCtx); + +const ActorInit Bg_Haka_Megane_InitVars = { ACTOR_BG_HAKA_MEGANE, ACTORTYPE_PROP, ROOM, @@ -21,20 +30,96 @@ const ActorInit Bg_Haka_Megane_InitVars = (ActorFunc)BgHakaMegane_Update, NULL, }; -*/ -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Haka_Megane/BgHakaMegane_Init.s") -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Haka_Megane/BgHakaMegane_Destroy.s") +static InitChainEntry initChain[] = { + ICHAIN_VEC3F_DIV1000(scale, 100, ICHAIN_STOP), +}; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Haka_Megane/func_8087DB24.s") +static UNK_TYPE collisions[] = { + 0x06001830, 0x06001AB8, 0x00000000, 0x06004330, 0x060044D0, 0x00000000, 0x06004780, + 0x06004940, 0x00000000, 0x06004B00, 0x00000000, 0x06004CC0, 0x00000000, +}; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Haka_Megane/func_8087DBF0.s") +static UNK_TYPE dlists[] = { + 0x06001060, 0x06001920, 0x060003F0, 0x060040F0, 0x060043B0, 0x06001120, 0x060045A0, + 0x060047F0, 0x060018F0, 0x060049B0, 0x06003CF0, 0x06004B70, 0x06002ED0, +}; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Haka_Megane/func_8087DC64.s") +extern UNK_TYPE D_06001250; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Haka_Megane/BgHakaMegane_Update.s") +static void BgHakaMegane_Init(BgHakaMegane* this, GlobalContext* globalCtx) { + Actor* thisx = &this->dyna.actor; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Haka_Megane/func_8087DC94.s") + Actor_ProcessInitChain(thisx, initChain); + DynaPolyInfo_SetActorMove(thisx, 0); + if (thisx->params < 3) { + this->objBankIndex = Object_GetIndex(&globalCtx->objectCtx, OBJECT_HAKACH_OBJECTS); + } else { + this->objBankIndex = Object_GetIndex(&globalCtx->objectCtx, OBJECT_HAKA_OBJECTS); + } + if (this->objBankIndex < 0) { + Actor_Kill(thisx); + } else { + this->actionFunc = (ActorFunc)func_8087DB24; + } +} +static void BgHakaMegane_Destroy(BgHakaMegane* this, GlobalContext* globalCtx) { + DynaPolyInfo_Free(globalCtx, &globalCtx->colCtx.dyna, this->dyna.dynaPolyId); +} + +static void func_8087DB24(BgHakaMegane* this, GlobalContext* globalCtx) { + s32 localC; + UNK_TYPE collision; + + if (Object_IsLoaded(&globalCtx->objectCtx, this->objBankIndex)) { + this->dyna.actor.objBankIndex = this->objBankIndex; + this->dyna.actor.draw = (ActorFunc)func_8087DC94; + Actor_SetObjectDependency(globalCtx, &this->dyna.actor); + if (globalCtx->roomCtx.curRoom.showInvisActors) { + this->actionFunc = (ActorFunc)func_8087DBF0; + collision = collisions[this->dyna.actor.params]; + if (collision != 0) { + DynaPolyInfo_Alloc(collision, &localC); + this->dyna.dynaPolyId = + DynaPolyInfo_RegisterActor(globalCtx, &globalCtx->colCtx.dyna, &this->dyna.actor, localC); + } + } else { + this->actionFunc = (ActorFunc)func_8087DC64; + } + } +} + +static void func_8087DBF0(BgHakaMegane* this, GlobalContext* globalCtx) { + Actor* thisx = &this->dyna.actor; + if (globalCtx->actorCtx.unk_03 != 0) { + thisx->flags |= 0x80; + func_8003EBF8(globalCtx, &globalCtx->colCtx.dyna, this->dyna.dynaPolyId); + } else { + thisx->flags &= ~0x80; + func_8003EC50(globalCtx, &globalCtx->colCtx.dyna, this->dyna.dynaPolyId); + } +} + +static void func_8087DC64(BgHakaMegane* this, GlobalContext* globalCtx) { +} + +static void BgHakaMegane_Update(BgHakaMegane* this, GlobalContext* globalCtx) { + this->actionFunc(this, globalCtx); +} + +static void func_8087DC94(BgHakaMegane* this, GlobalContext* globalCtx) { + Actor* thisx = &this->dyna.actor; + + if ((thisx->flags & 0x80) == 0x80) { + Gfx_DrawDListXlu(globalCtx, dlists[thisx->params]); + } else { + Gfx_DrawDListOpa(globalCtx, dlists[thisx->params]); + } + + if (thisx->params == 0) { + Gfx_DrawDListXlu(globalCtx, &D_06001250); + } +} diff --git a/src/overlays/actors/ovl_Bg_Haka_Megane/z_bg_haka_megane.h b/src/overlays/actors/ovl_Bg_Haka_Megane/z_bg_haka_megane.h index 722caa107c..18d029aeb3 100644 --- a/src/overlays/actors/ovl_Bg_Haka_Megane/z_bg_haka_megane.h +++ b/src/overlays/actors/ovl_Bg_Haka_Megane/z_bg_haka_megane.h @@ -4,10 +4,12 @@ #include #include -typedef struct -{ - /* 0x0000 */ Actor actor; - /* 0x014C */ char unk_14C[0x20]; +typedef struct { + /* 0x0000 */ DynaPolyActor dyna; + /* 0x0164 */ ActorFunc actionFunc; + /* 0x0168 */ char unk_168[0x1]; + /* 0x0169 */ s8 objBankIndex; + /* 0x016A */ char unk_16A[0x2]; } BgHakaMegane; // size = 0x016C extern const ActorInit Bg_Haka_Megane_InitVars; diff --git a/src/overlays/actors/ovl_Bg_Haka_MeganeBG/z_bg_haka_meganebg.c b/src/overlays/actors/ovl_Bg_Haka_MeganeBG/z_bg_haka_meganebg.c index acdf9ac6d2..a60362a988 100644 --- a/src/overlays/actors/ovl_Bg_Haka_MeganeBG/z_bg_haka_meganebg.c +++ b/src/overlays/actors/ovl_Bg_Haka_MeganeBG/z_bg_haka_meganebg.c @@ -1,6 +1,6 @@ #include "z_bg_haka_meganebg.h" -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x00000000 void BgHakaMeganeBG_Init(BgHakaMeganeBG* this, GlobalContext* globalCtx); @@ -9,8 +9,7 @@ void BgHakaMeganeBG_Update(BgHakaMeganeBG* this, GlobalContext* globalCtx); void BgHakaMeganeBG_Draw(BgHakaMeganeBG* this, GlobalContext* globalCtx); /* -const ActorInit Bg_Haka_MeganeBG_InitVars = -{ +const ActorInit Bg_Haka_MeganeBG_InitVars = { ACTOR_BG_HAKA_MEGANEBG, ACTORTYPE_BG, ROOM, diff --git a/src/overlays/actors/ovl_Bg_Haka_MeganeBG/z_bg_haka_meganebg.h b/src/overlays/actors/ovl_Bg_Haka_MeganeBG/z_bg_haka_meganebg.h index c079c8438b..67bd9e5f3e 100644 --- a/src/overlays/actors/ovl_Bg_Haka_MeganeBG/z_bg_haka_meganebg.h +++ b/src/overlays/actors/ovl_Bg_Haka_MeganeBG/z_bg_haka_meganebg.h @@ -4,8 +4,7 @@ #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ Actor actor; /* 0x014C */ char unk_14C[0x20]; } BgHakaMeganeBG; // size = 0x016C diff --git a/src/overlays/actors/ovl_Bg_Haka_Sgami/z_bg_haka_sgami.c b/src/overlays/actors/ovl_Bg_Haka_Sgami/z_bg_haka_sgami.c index da3dfbe035..d85c5dbf89 100644 --- a/src/overlays/actors/ovl_Bg_Haka_Sgami/z_bg_haka_sgami.c +++ b/src/overlays/actors/ovl_Bg_Haka_Sgami/z_bg_haka_sgami.c @@ -1,6 +1,6 @@ #include "z_bg_haka_sgami.h" -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x00000011 void BgHakaSgami_Init(BgHakaSgami* this, GlobalContext* globalCtx); @@ -8,8 +8,7 @@ void BgHakaSgami_Destroy(BgHakaSgami* this, GlobalContext* globalCtx); void BgHakaSgami_Update(BgHakaSgami* this, GlobalContext* globalCtx); /* -const ActorInit Bg_Haka_Sgami_InitVars = -{ +const ActorInit Bg_Haka_Sgami_InitVars = { ACTOR_BG_HAKA_SGAMI, ACTORTYPE_PROP, ROOM, diff --git a/src/overlays/actors/ovl_Bg_Haka_Sgami/z_bg_haka_sgami.h b/src/overlays/actors/ovl_Bg_Haka_Sgami/z_bg_haka_sgami.h index 81cb928247..0059304f7c 100644 --- a/src/overlays/actors/ovl_Bg_Haka_Sgami/z_bg_haka_sgami.h +++ b/src/overlays/actors/ovl_Bg_Haka_Sgami/z_bg_haka_sgami.h @@ -4,8 +4,7 @@ #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ Actor actor; /* 0x014C */ char unk_14C[0x1EC]; } BgHakaSgami; // size = 0x0338 diff --git a/src/overlays/actors/ovl_Bg_Haka_Ship/z_bg_haka_ship.c b/src/overlays/actors/ovl_Bg_Haka_Ship/z_bg_haka_ship.c index f7e7dee7a6..db2dd668c0 100644 --- a/src/overlays/actors/ovl_Bg_Haka_Ship/z_bg_haka_ship.c +++ b/src/overlays/actors/ovl_Bg_Haka_Ship/z_bg_haka_ship.c @@ -1,6 +1,6 @@ #include "z_bg_haka_ship.h" -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x00000030 void BgHakaShip_Init(BgHakaShip* this, GlobalContext* globalCtx); @@ -9,8 +9,7 @@ void BgHakaShip_Update(BgHakaShip* this, GlobalContext* globalCtx); void BgHakaShip_Draw(BgHakaShip* this, GlobalContext* globalCtx); /* -const ActorInit Bg_Haka_Ship_InitVars = -{ +const ActorInit Bg_Haka_Ship_InitVars = { ACTOR_BG_HAKA_SHIP, ACTORTYPE_BG, ROOM, diff --git a/src/overlays/actors/ovl_Bg_Haka_Ship/z_bg_haka_ship.h b/src/overlays/actors/ovl_Bg_Haka_Ship/z_bg_haka_ship.h index 67d947d9f2..58645f3a36 100644 --- a/src/overlays/actors/ovl_Bg_Haka_Ship/z_bg_haka_ship.h +++ b/src/overlays/actors/ovl_Bg_Haka_Ship/z_bg_haka_ship.h @@ -4,8 +4,7 @@ #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ Actor actor; /* 0x014C */ char unk_14C[0x2C]; } BgHakaShip; // size = 0x0178 diff --git a/src/overlays/actors/ovl_Bg_Haka_Trap/z_bg_haka_trap.c b/src/overlays/actors/ovl_Bg_Haka_Trap/z_bg_haka_trap.c index 7b6a2c48a1..4961c344b1 100644 --- a/src/overlays/actors/ovl_Bg_Haka_Trap/z_bg_haka_trap.c +++ b/src/overlays/actors/ovl_Bg_Haka_Trap/z_bg_haka_trap.c @@ -1,6 +1,6 @@ #include "z_bg_haka_trap.h" -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x00000000 void BgHakaTrap_Init(BgHakaTrap* this, GlobalContext* globalCtx); @@ -9,8 +9,7 @@ void BgHakaTrap_Update(BgHakaTrap* this, GlobalContext* globalCtx); void BgHakaTrap_Draw(BgHakaTrap* this, GlobalContext* globalCtx); /* -const ActorInit Bg_Haka_Trap_InitVars = -{ +const ActorInit Bg_Haka_Trap_InitVars = { ACTOR_BG_HAKA_TRAP, ACTORTYPE_BG, ROOM, diff --git a/src/overlays/actors/ovl_Bg_Haka_Trap/z_bg_haka_trap.h b/src/overlays/actors/ovl_Bg_Haka_Trap/z_bg_haka_trap.h index a7bc324ca4..5585c68b6e 100644 --- a/src/overlays/actors/ovl_Bg_Haka_Trap/z_bg_haka_trap.h +++ b/src/overlays/actors/ovl_Bg_Haka_Trap/z_bg_haka_trap.h @@ -4,8 +4,7 @@ #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ Actor actor; /* 0x014C */ char unk_14C[0x150]; } BgHakaTrap; // size = 0x029C 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 a95976c7b7..7d644832ac 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 @@ -1,6 +1,6 @@ #include "z_bg_haka_tubo.h" -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x00000010 void BgHakaTubo_Init(BgHakaTubo* this, GlobalContext* globalCtx); @@ -9,8 +9,7 @@ void BgHakaTubo_Update(BgHakaTubo* this, GlobalContext* globalCtx); void BgHakaTubo_Draw(BgHakaTubo* this, GlobalContext* globalCtx); /* -const ActorInit Bg_Haka_Tubo_InitVars = -{ +const ActorInit Bg_Haka_Tubo_InitVars = { ACTOR_BG_HAKA_TUBO, ACTORTYPE_BG, ROOM, diff --git a/src/overlays/actors/ovl_Bg_Haka_Tubo/z_bg_haka_tubo.h b/src/overlays/actors/ovl_Bg_Haka_Tubo/z_bg_haka_tubo.h index 0ed6c47ace..b968c39005 100644 --- a/src/overlays/actors/ovl_Bg_Haka_Tubo/z_bg_haka_tubo.h +++ b/src/overlays/actors/ovl_Bg_Haka_Tubo/z_bg_haka_tubo.h @@ -4,8 +4,7 @@ #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ Actor actor; /* 0x014C */ char unk_14C[0xB8]; } BgHakaTubo; // size = 0x0204 diff --git a/src/overlays/actors/ovl_Bg_Haka_Water/z_bg_haka_water.c b/src/overlays/actors/ovl_Bg_Haka_Water/z_bg_haka_water.c index ba8bea230b..348a262312 100644 --- a/src/overlays/actors/ovl_Bg_Haka_Water/z_bg_haka_water.c +++ b/src/overlays/actors/ovl_Bg_Haka_Water/z_bg_haka_water.c @@ -1,6 +1,6 @@ #include "z_bg_haka_water.h" -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x00000030 void BgHakaWater_Init(BgHakaWater* this, GlobalContext* globalCtx); @@ -9,8 +9,7 @@ void BgHakaWater_Update(BgHakaWater* this, GlobalContext* globalCtx); void BgHakaWater_Draw(BgHakaWater* this, GlobalContext* globalCtx); /* -const ActorInit Bg_Haka_Water_InitVars = -{ +const ActorInit Bg_Haka_Water_InitVars = { ACTOR_BG_HAKA_WATER, ACTORTYPE_PROP, ROOM, diff --git a/src/overlays/actors/ovl_Bg_Haka_Water/z_bg_haka_water.h b/src/overlays/actors/ovl_Bg_Haka_Water/z_bg_haka_water.h index ca188cfe65..a45e557115 100644 --- a/src/overlays/actors/ovl_Bg_Haka_Water/z_bg_haka_water.h +++ b/src/overlays/actors/ovl_Bg_Haka_Water/z_bg_haka_water.h @@ -4,8 +4,7 @@ #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ Actor actor; /* 0x014C */ char unk_14C[0x8]; } BgHakaWater; // size = 0x0154 diff --git a/src/overlays/actors/ovl_Bg_Haka_Zou/z_bg_haka_zou.c b/src/overlays/actors/ovl_Bg_Haka_Zou/z_bg_haka_zou.c index 1365a45516..e43e56bc44 100644 --- a/src/overlays/actors/ovl_Bg_Haka_Zou/z_bg_haka_zou.c +++ b/src/overlays/actors/ovl_Bg_Haka_Zou/z_bg_haka_zou.c @@ -1,6 +1,6 @@ #include "z_bg_haka_zou.h" -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x00000010 void BgHakaZou_Init(BgHakaZou* this, GlobalContext* globalCtx); @@ -8,8 +8,7 @@ void BgHakaZou_Destroy(BgHakaZou* this, GlobalContext* globalCtx); void BgHakaZou_Update(BgHakaZou* this, GlobalContext* globalCtx); /* -const ActorInit Bg_Haka_Zou_InitVars = -{ +const ActorInit Bg_Haka_Zou_InitVars = { ACTOR_BG_HAKA_ZOU, ACTORTYPE_PROP, ROOM, diff --git a/src/overlays/actors/ovl_Bg_Haka_Zou/z_bg_haka_zou.h b/src/overlays/actors/ovl_Bg_Haka_Zou/z_bg_haka_zou.h index 739edab305..9336251a14 100644 --- a/src/overlays/actors/ovl_Bg_Haka_Zou/z_bg_haka_zou.h +++ b/src/overlays/actors/ovl_Bg_Haka_Zou/z_bg_haka_zou.h @@ -4,8 +4,7 @@ #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ Actor actor; /* 0x014C */ char unk_14C[0x6C]; } BgHakaZou; // size = 0x01B8 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 a68e5de7aa..10b8ffff04 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 @@ -1,6 +1,6 @@ #include "z_bg_heavy_block.h" -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x00000000 void BgHeavyBlock_Init(BgHeavyBlock* this, GlobalContext* globalCtx); @@ -9,8 +9,7 @@ void BgHeavyBlock_Update(BgHeavyBlock* this, GlobalContext* globalCtx); void BgHeavyBlock_Draw(BgHeavyBlock* this, GlobalContext* globalCtx); /* -const ActorInit Bg_Heavy_Block_InitVars = -{ +const ActorInit Bg_Heavy_Block_InitVars = { ACTOR_BG_HEAVY_BLOCK, ACTORTYPE_BG, ROOM, diff --git a/src/overlays/actors/ovl_Bg_Heavy_Block/z_bg_heavy_block.h b/src/overlays/actors/ovl_Bg_Heavy_Block/z_bg_heavy_block.h index 63ebafd878..17c5ad63c9 100644 --- a/src/overlays/actors/ovl_Bg_Heavy_Block/z_bg_heavy_block.h +++ b/src/overlays/actors/ovl_Bg_Heavy_Block/z_bg_heavy_block.h @@ -4,8 +4,7 @@ #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ Actor actor; /* 0x014C */ char unk_14C[0x2C]; } BgHeavyBlock; // size = 0x0178 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 1f173679b0..a23d1c8995 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 @@ -1,6 +1,6 @@ #include "z_bg_hidan_curtain.h" -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x00000010 void BgHidanCurtain_Init(BgHidanCurtain* this, GlobalContext* globalCtx); @@ -9,8 +9,7 @@ void BgHidanCurtain_Update(BgHidanCurtain* this, GlobalContext* globalCtx); void BgHidanCurtain_Draw(BgHidanCurtain* this, GlobalContext* globalCtx); /* -const ActorInit Bg_Hidan_Curtain_InitVars = -{ +const ActorInit Bg_Hidan_Curtain_InitVars = { ACTOR_BG_HIDAN_CURTAIN, ACTORTYPE_PROP, ROOM, diff --git a/src/overlays/actors/ovl_Bg_Hidan_Curtain/z_bg_hidan_curtain.h b/src/overlays/actors/ovl_Bg_Hidan_Curtain/z_bg_hidan_curtain.h index 7db2eed1b0..45b444e8dd 100644 --- a/src/overlays/actors/ovl_Bg_Hidan_Curtain/z_bg_hidan_curtain.h +++ b/src/overlays/actors/ovl_Bg_Hidan_Curtain/z_bg_hidan_curtain.h @@ -4,8 +4,7 @@ #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ Actor actor; /* 0x014C */ char unk_14C[0x58]; } BgHidanCurtain; // size = 0x01A4 diff --git a/src/overlays/actors/ovl_Bg_Hidan_Dalm/z_bg_hidan_dalm.c b/src/overlays/actors/ovl_Bg_Hidan_Dalm/z_bg_hidan_dalm.c index 9dc30828ba..95dc821835 100644 --- a/src/overlays/actors/ovl_Bg_Hidan_Dalm/z_bg_hidan_dalm.c +++ b/src/overlays/actors/ovl_Bg_Hidan_Dalm/z_bg_hidan_dalm.c @@ -1,6 +1,6 @@ #include "z_bg_hidan_dalm.h" -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x00000000 void BgHidanDalm_Init(BgHidanDalm* this, GlobalContext* globalCtx); @@ -9,8 +9,7 @@ void BgHidanDalm_Update(BgHidanDalm* this, GlobalContext* globalCtx); void BgHidanDalm_Draw(BgHidanDalm* this, GlobalContext* globalCtx); /* -const ActorInit Bg_Hidan_Dalm_InitVars = -{ +const ActorInit Bg_Hidan_Dalm_InitVars = { ACTOR_BG_HIDAN_DALM, ACTORTYPE_BG, ROOM, @@ -36,6 +35,3 @@ const ActorInit Bg_Hidan_Dalm_InitVars = #pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Dalm/func_808862D8.s") #pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Dalm/BgHidanDalm_Draw.s") - - - diff --git a/src/overlays/actors/ovl_Bg_Hidan_Dalm/z_bg_hidan_dalm.h b/src/overlays/actors/ovl_Bg_Hidan_Dalm/z_bg_hidan_dalm.h index 5aeec9aec9..aa3e8ca7ff 100644 --- a/src/overlays/actors/ovl_Bg_Hidan_Dalm/z_bg_hidan_dalm.h +++ b/src/overlays/actors/ovl_Bg_Hidan_Dalm/z_bg_hidan_dalm.h @@ -4,8 +4,7 @@ #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ Actor actor; /* 0x014C */ char unk_14C[0x1B0]; } BgHidanDalm; // size = 0x02FC 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 f6eac5535b..b211245cb0 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 @@ -6,7 +6,7 @@ #include "z_bg_hidan_firewall.h" -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x00000000 const ActorInit Bg_Hidan_Firewall_InitVars = diff --git a/src/overlays/actors/ovl_Bg_Hidan_Fslift/z_bg_hidan_fslift.c b/src/overlays/actors/ovl_Bg_Hidan_Fslift/z_bg_hidan_fslift.c index 1f4b36c70c..1178b38e29 100644 --- a/src/overlays/actors/ovl_Bg_Hidan_Fslift/z_bg_hidan_fslift.c +++ b/src/overlays/actors/ovl_Bg_Hidan_Fslift/z_bg_hidan_fslift.c @@ -2,11 +2,11 @@ * File: z_bg_hidan_fslift.c * Overlay: Bg_Hidan_Fslift * Description: -*/ + */ #include "z_bg_hidan_fslift.h" -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x00000010 static void BgHidanFslift_Init(BgHidanFslift* this, GlobalContext* globalCtx); @@ -21,8 +21,7 @@ static void func_808870D8(BgHidanFslift* this, GlobalContext* globalCtx); extern u32 D_0600B630; extern u32 D_0600E1E8; -const ActorInit Bg_Hidan_Fslift_InitVars = -{ +const ActorInit Bg_Hidan_Fslift_InitVars = { ACTOR_BG_HIDAN_FSLIFT, ACTORTYPE_BG, ROOM, @@ -35,37 +34,33 @@ const ActorInit Bg_Hidan_Fslift_InitVars = (ActorFunc)BgHidanFslift_Draw, }; -static InitChainEntry initChain[] = -{ +static InitChainEntry initChain[] = { ICHAIN_VEC3F_DIV1000(scale, 100, ICHAIN_CONTINUE), ICHAIN_F32(unk_F8, 300, ICHAIN_CONTINUE), ICHAIN_F32(unk_FC, 350, ICHAIN_CONTINUE), - ICHAIN_F32(unk_F4, 2000, ICHAIN_STOP) + ICHAIN_F32(unk_F4, 2000, ICHAIN_STOP), }; -static void BgHidanFslift_Init(BgHidanFslift* this, GlobalContext* globalCtx) -{ +static void BgHidanFslift_Init(BgHidanFslift* this, GlobalContext* globalCtx) { s32 pad[2]; s32 local_c = 0; Actor* thisx = &this->dyna.actor; - + Actor_ProcessInitChain(thisx, initChain); DynaPolyInfo_SetActorMove(thisx, 1); DynaPolyInfo_Alloc(&D_0600E1E8, &local_c); this->dyna.dynaPolyId = DynaPolyInfo_RegisterActor(globalCtx, &globalCtx->colCtx.dyna, thisx, local_c); - if (Actor_SpawnAttached(&globalCtx->actorCtx, thisx, globalCtx, ACTOR_OBJ_HSBLOCK, thisx->posRot.pos.x, thisx->posRot.pos.y + 40.0f, thisx->posRot.pos.z + -28.0f, 0, 0, 0, 2) == NULL) - { + if (Actor_SpawnAttached(&globalCtx->actorCtx, thisx, globalCtx, ACTOR_OBJ_HSBLOCK, thisx->posRot.pos.x, + thisx->posRot.pos.y + 40.0f, thisx->posRot.pos.z + -28.0f, 0, 0, 0, 2) == NULL) { Actor_Kill(thisx); return; } this->actionFunc = func_80886FCC; } -static void func_80886F24(BgHidanFslift* this) -{ +static void func_80886F24(BgHidanFslift* this) { Actor* thisx = &this->dyna.actor; - if (thisx->attachedB != NULL && thisx->attachedB->update != NULL) - { + if (thisx->attachedB != NULL && thisx->attachedB->update != NULL) { thisx->attachedB->posRot.pos.x = thisx->posRot.pos.x; thisx->attachedB->posRot.pos.y = thisx->posRot.pos.y + 40.0f; thisx->attachedB->posRot.pos.z = thisx->posRot.pos.z + -28.0f; @@ -74,107 +69,82 @@ static void func_80886F24(BgHidanFslift* this) thisx->attachedB = NULL; } -static void BgHidanFslift_Destroy(BgHidanFslift* this, GlobalContext* globalCtx) -{ +static void BgHidanFslift_Destroy(BgHidanFslift* this, GlobalContext* globalCtx) { DynaPolyInfo_Free(globalCtx, &globalCtx->colCtx.dyna, this->dyna.dynaPolyId); } -static void func_80886FB4(BgHidanFslift* this) -{ +static void func_80886FB4(BgHidanFslift* this) { this->unk_168 = 0x28; this->actionFunc = func_80886FCC; } -static void func_80886FCC(BgHidanFslift* this, GlobalContext* globalCtx) -{ +static void func_80886FCC(BgHidanFslift* this, GlobalContext* globalCtx) { UNK_TYPE somebool; Actor* thisx = &this->dyna.actor; DECR(this->unk_168); - if (this->unk_168 == 0) - { + if (this->unk_168 == 0) { somebool = 0; - if ((thisx->posRot.pos.y - thisx->initPosRot.pos.y) < 0.5f) - { + if ((thisx->posRot.pos.y - thisx->initPosRot.pos.y) < 0.5f) { somebool = 1; } - if (func_80043590(thisx)) - { - if (somebool) - { + if (func_80043590(thisx)) { + if (somebool) { this->actionFunc = func_808870D8; return; } } - if (!somebool) - { + if (!somebool) { this->actionFunc = func_8088706C; } } } -static void func_8088706C(BgHidanFslift* this, GlobalContext* globalCtx) -{ +static void func_8088706C(BgHidanFslift* this, GlobalContext* globalCtx) { Actor* thisx = &this->dyna.actor; - if (Math_ApproxF(&thisx->posRot.pos.y, thisx->initPosRot.pos.y, 4.0f)) - { + if (Math_ApproxF(&thisx->posRot.pos.y, thisx->initPosRot.pos.y, 4.0f)) { Audio_PlayActorSound2(thisx, NA_SE_EV_BLOCK_BOUND); func_80886FB4(this); - } - else - { + } else { func_8002F974(thisx, 0x20b9); } func_80886F24(this); } -static void func_808870D8(BgHidanFslift* this, GlobalContext* globalCtx) -{ +static void func_808870D8(BgHidanFslift* this, GlobalContext* globalCtx) { Actor* thisx = &this->dyna.actor; - if (func_80043590(thisx)) - { - if (Math_ApproxF(&thisx->posRot.pos.y, thisx->initPosRot.pos.y + 790.0f, 4.0f)) - { + if (func_80043590(thisx)) { + if (Math_ApproxF(&thisx->posRot.pos.y, thisx->initPosRot.pos.y + 790.0f, 4.0f)) { Audio_PlayActorSound2(thisx, NA_SE_EV_BLOCK_BOUND); func_80886FB4(this); - } - else - { + } else { func_8002F974(thisx, 0x20b9); } - } - else - { + } else { func_80886FB4(this); } func_80886F24(this); } -static void BgHidanFslift_Update(BgHidanFslift* this, GlobalContext* globalCtx) -{ +static void BgHidanFslift_Update(BgHidanFslift* this, GlobalContext* globalCtx) { Actor* thisx = &this->dyna.actor; this->actionFunc(this, globalCtx); - if (func_8004356C(thisx)) - { - if (this->unk_16A == 0) - { + if (func_8004356C(thisx)) { + if (this->unk_16A == 0) { this->unk_16A = 3; } func_8005A77C(globalCtx->cameraCtx.activeCameraPtrs[0], 0x30); return; } - if (func_8004356C(thisx) == 0) - { - if (this->unk_16A != 0) - { + if (func_8004356C(thisx) == 0) { + if (this->unk_16A != 0) { func_8005A77C(globalCtx->cameraCtx.activeCameraPtrs[0], 3); } this->unk_16A = 0; } } -static void BgHidanFslift_Draw(BgHidanFslift* this, GlobalContext* globalCtx) -{ - Draw_DListOpa(globalCtx, &D_0600B630); +static void BgHidanFslift_Draw(BgHidanFslift* this, GlobalContext* globalCtx) { + Gfx_DrawDListOpa(globalCtx, &D_0600B630); } diff --git a/src/overlays/actors/ovl_Bg_Hidan_Fslift/z_bg_hidan_fslift.h b/src/overlays/actors/ovl_Bg_Hidan_Fslift/z_bg_hidan_fslift.h index 39b01cdd2e..72ba3b6238 100644 --- a/src/overlays/actors/ovl_Bg_Hidan_Fslift/z_bg_hidan_fslift.h +++ b/src/overlays/actors/ovl_Bg_Hidan_Fslift/z_bg_hidan_fslift.h @@ -4,8 +4,7 @@ #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ DynaPolyActor dyna; /* 0x0164 */ ActorFunc actionFunc; /* 0x0168 */ s16 unk_168; 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 49e0df5462..81767dc57d 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 @@ -1,6 +1,6 @@ #include "z_bg_hidan_fwbig.h" -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x00000010 void BgHidanFwbig_Init(BgHidanFwbig* this, GlobalContext* globalCtx); @@ -9,8 +9,7 @@ void BgHidanFwbig_Update(BgHidanFwbig* this, GlobalContext* globalCtx); void BgHidanFwbig_Draw(BgHidanFwbig* this, GlobalContext* globalCtx); /* -const ActorInit Bg_Hidan_Fwbig_InitVars = -{ +const ActorInit Bg_Hidan_Fwbig_InitVars = { ACTOR_BG_HIDAN_FWBIG, ACTORTYPE_PROP, ROOM, 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 047d5ec930..9e034748b4 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 @@ -4,8 +4,7 @@ #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ Actor actor; /* 0x014C */ char unk_14C[0x54]; } BgHidanFwbig; // size = 0x01A0 diff --git a/src/overlays/actors/ovl_Bg_Hidan_Hamstep/z_bg_hidan_hamstep.c b/src/overlays/actors/ovl_Bg_Hidan_Hamstep/z_bg_hidan_hamstep.c index 3abcef7ce2..b64ae73c99 100644 --- a/src/overlays/actors/ovl_Bg_Hidan_Hamstep/z_bg_hidan_hamstep.c +++ b/src/overlays/actors/ovl_Bg_Hidan_Hamstep/z_bg_hidan_hamstep.c @@ -1,6 +1,6 @@ #include "z_bg_hidan_hamstep.h" -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x00000000 void BgHidanHamstep_Init(BgHidanHamstep* this, GlobalContext* globalCtx); @@ -9,8 +9,7 @@ void BgHidanHamstep_Update(BgHidanHamstep* this, GlobalContext* globalCtx); void BgHidanHamstep_Draw(BgHidanHamstep* this, GlobalContext* globalCtx); /* -const ActorInit Bg_Hidan_Hamstep_InitVars = -{ +const ActorInit Bg_Hidan_Hamstep_InitVars = { ACTOR_BG_HIDAN_HAMSTEP, ACTORTYPE_BG, ROOM, diff --git a/src/overlays/actors/ovl_Bg_Hidan_Hamstep/z_bg_hidan_hamstep.h b/src/overlays/actors/ovl_Bg_Hidan_Hamstep/z_bg_hidan_hamstep.h index 6de37dba6d..5d04123025 100644 --- a/src/overlays/actors/ovl_Bg_Hidan_Hamstep/z_bg_hidan_hamstep.h +++ b/src/overlays/actors/ovl_Bg_Hidan_Hamstep/z_bg_hidan_hamstep.h @@ -4,8 +4,7 @@ #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ Actor actor; /* 0x014C */ char unk_14C[0xFC]; } BgHidanHamstep; // size = 0x0248 diff --git a/src/overlays/actors/ovl_Bg_Hidan_Hrock/z_bg_hidan_hrock.c b/src/overlays/actors/ovl_Bg_Hidan_Hrock/z_bg_hidan_hrock.c index 246db3a95c..b455d36ca1 100644 --- a/src/overlays/actors/ovl_Bg_Hidan_Hrock/z_bg_hidan_hrock.c +++ b/src/overlays/actors/ovl_Bg_Hidan_Hrock/z_bg_hidan_hrock.c @@ -1,6 +1,6 @@ #include "z_bg_hidan_hrock.h" -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x00000000 void BgHidanHrock_Init(BgHidanHrock* this, GlobalContext* globalCtx); @@ -9,8 +9,7 @@ void BgHidanHrock_Update(BgHidanHrock* this, GlobalContext* globalCtx); void BgHidanHrock_Draw(BgHidanHrock* this, GlobalContext* globalCtx); /* -const ActorInit Bg_Hidan_Hrock_InitVars = -{ +const ActorInit Bg_Hidan_Hrock_InitVars = { ACTOR_BG_HIDAN_HROCK, ACTORTYPE_BG, ROOM, diff --git a/src/overlays/actors/ovl_Bg_Hidan_Hrock/z_bg_hidan_hrock.h b/src/overlays/actors/ovl_Bg_Hidan_Hrock/z_bg_hidan_hrock.h index 7eabc91821..c2f58676db 100644 --- a/src/overlays/actors/ovl_Bg_Hidan_Hrock/z_bg_hidan_hrock.h +++ b/src/overlays/actors/ovl_Bg_Hidan_Hrock/z_bg_hidan_hrock.h @@ -4,8 +4,7 @@ #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ Actor actor; /* 0x014C */ char unk_14C[0xF8]; } BgHidanHrock; // size = 0x0244 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 cc80e92acb..582c3eca43 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 @@ -1,6 +1,6 @@ #include "z_bg_hidan_kousi.h" -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x00000010 void BgHidanKousi_Init(BgHidanKousi* this, GlobalContext* globalCtx); @@ -9,8 +9,7 @@ void BgHidanKousi_Update(BgHidanKousi* this, GlobalContext* globalCtx); void BgHidanKousi_Draw(BgHidanKousi* this, GlobalContext* globalCtx); /* -const ActorInit Bg_Hidan_Kousi_InitVars = -{ +const ActorInit Bg_Hidan_Kousi_InitVars = { ACTOR_BG_HIDAN_KOUSI, ACTORTYPE_PROP, ROOM, diff --git a/src/overlays/actors/ovl_Bg_Hidan_Kousi/z_bg_hidan_kousi.h b/src/overlays/actors/ovl_Bg_Hidan_Kousi/z_bg_hidan_kousi.h index 3b43ccbb44..a7aed6b28b 100644 --- a/src/overlays/actors/ovl_Bg_Hidan_Kousi/z_bg_hidan_kousi.h +++ b/src/overlays/actors/ovl_Bg_Hidan_Kousi/z_bg_hidan_kousi.h @@ -4,8 +4,7 @@ #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ Actor actor; /* 0x014C */ char unk_14C[0x20]; } BgHidanKousi; // size = 0x016C diff --git a/src/overlays/actors/ovl_Bg_Hidan_Kowarerukabe/z_bg_hidan_kowarerukabe.c b/src/overlays/actors/ovl_Bg_Hidan_Kowarerukabe/z_bg_hidan_kowarerukabe.c index 6c7a96a123..0182fe234c 100644 --- a/src/overlays/actors/ovl_Bg_Hidan_Kowarerukabe/z_bg_hidan_kowarerukabe.c +++ b/src/overlays/actors/ovl_Bg_Hidan_Kowarerukabe/z_bg_hidan_kowarerukabe.c @@ -1,6 +1,6 @@ #include "z_bg_hidan_kowarerukabe.h" -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x00000000 void BgHidanKowarerukabe_Init(BgHidanKowarerukabe* this, GlobalContext* globalCtx); @@ -9,8 +9,7 @@ void BgHidanKowarerukabe_Update(BgHidanKowarerukabe* this, GlobalContext* global void BgHidanKowarerukabe_Draw(BgHidanKowarerukabe* this, GlobalContext* globalCtx); /* -const ActorInit Bg_Hidan_Kowarerukabe_InitVars = -{ +const ActorInit Bg_Hidan_Kowarerukabe_InitVars = { ACTOR_BG_HIDAN_KOWARERUKABE, ACTORTYPE_BG, ROOM, diff --git a/src/overlays/actors/ovl_Bg_Hidan_Kowarerukabe/z_bg_hidan_kowarerukabe.h b/src/overlays/actors/ovl_Bg_Hidan_Kowarerukabe/z_bg_hidan_kowarerukabe.h index 4950d16209..0cec631daa 100644 --- a/src/overlays/actors/ovl_Bg_Hidan_Kowarerukabe/z_bg_hidan_kowarerukabe.h +++ b/src/overlays/actors/ovl_Bg_Hidan_Kowarerukabe/z_bg_hidan_kowarerukabe.h @@ -4,8 +4,7 @@ #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ Actor actor; /* 0x014C */ char unk_14C[0x78]; } BgHidanKowarerukabe; // size = 0x01C4 diff --git a/src/overlays/actors/ovl_Bg_Hidan_Rock/z_bg_hidan_rock.c b/src/overlays/actors/ovl_Bg_Hidan_Rock/z_bg_hidan_rock.c index 351cd0f107..5a04973c16 100644 --- a/src/overlays/actors/ovl_Bg_Hidan_Rock/z_bg_hidan_rock.c +++ b/src/overlays/actors/ovl_Bg_Hidan_Rock/z_bg_hidan_rock.c @@ -1,6 +1,6 @@ #include "z_bg_hidan_rock.h" -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x00000000 void BgHidanRock_Init(BgHidanRock* this, GlobalContext* globalCtx); @@ -9,8 +9,7 @@ void BgHidanRock_Update(BgHidanRock* this, GlobalContext* globalCtx); void BgHidanRock_Draw(BgHidanRock* this, GlobalContext* globalCtx); /* -const ActorInit Bg_Hidan_Rock_InitVars = -{ +const ActorInit Bg_Hidan_Rock_InitVars = { ACTOR_BG_HIDAN_ROCK, ACTORTYPE_BG, ROOM, diff --git a/src/overlays/actors/ovl_Bg_Hidan_Rock/z_bg_hidan_rock.h b/src/overlays/actors/ovl_Bg_Hidan_Rock/z_bg_hidan_rock.h index 17c2aa9f23..7b44289fef 100644 --- a/src/overlays/actors/ovl_Bg_Hidan_Rock/z_bg_hidan_rock.h +++ b/src/overlays/actors/ovl_Bg_Hidan_Rock/z_bg_hidan_rock.h @@ -4,8 +4,7 @@ #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ Actor actor; /* 0x014C */ char unk_14C[0x7C]; } BgHidanRock; // size = 0x01C8 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 fdec662734..322b096410 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 @@ -1,6 +1,6 @@ #include "z_bg_hidan_rsekizou.h" -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x00000000 void BgHidanRsekizou_Init(BgHidanRsekizou* this, GlobalContext* globalCtx); @@ -9,8 +9,7 @@ void BgHidanRsekizou_Update(BgHidanRsekizou* this, GlobalContext* globalCtx); void BgHidanRsekizou_Draw(BgHidanRsekizou* this, GlobalContext* globalCtx); /* -const ActorInit Bg_Hidan_Rsekizou_InitVars = -{ +const ActorInit Bg_Hidan_Rsekizou_InitVars = { ACTOR_BG_HIDAN_RSEKIZOU, ACTORTYPE_BG, ROOM, diff --git a/src/overlays/actors/ovl_Bg_Hidan_Rsekizou/z_bg_hidan_rsekizou.h b/src/overlays/actors/ovl_Bg_Hidan_Rsekizou/z_bg_hidan_rsekizou.h index 190723bc95..c7d08acc7f 100644 --- a/src/overlays/actors/ovl_Bg_Hidan_Rsekizou/z_bg_hidan_rsekizou.h +++ b/src/overlays/actors/ovl_Bg_Hidan_Rsekizou/z_bg_hidan_rsekizou.h @@ -4,8 +4,7 @@ #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ Actor actor; /* 0x014C */ char unk_14C[0x1BC]; } BgHidanRsekizou; // size = 0x0308 diff --git a/src/overlays/actors/ovl_Bg_Hidan_Sekizou/z_bg_hidan_sekizou.c b/src/overlays/actors/ovl_Bg_Hidan_Sekizou/z_bg_hidan_sekizou.c index ee750dba95..e2db894cd7 100644 --- a/src/overlays/actors/ovl_Bg_Hidan_Sekizou/z_bg_hidan_sekizou.c +++ b/src/overlays/actors/ovl_Bg_Hidan_Sekizou/z_bg_hidan_sekizou.c @@ -1,6 +1,6 @@ #include "z_bg_hidan_sekizou.h" -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x00000000 void BgHidanSekizou_Init(BgHidanSekizou* this, GlobalContext* globalCtx); @@ -9,8 +9,7 @@ void BgHidanSekizou_Update(BgHidanSekizou* this, GlobalContext* globalCtx); void BgHidanSekizou_Draw(BgHidanSekizou* this, GlobalContext* globalCtx); /* -const ActorInit Bg_Hidan_Sekizou_InitVars = -{ +const ActorInit Bg_Hidan_Sekizou_InitVars = { ACTOR_BG_HIDAN_SEKIZOU, ACTORTYPE_BG, ROOM, diff --git a/src/overlays/actors/ovl_Bg_Hidan_Sekizou/z_bg_hidan_sekizou.h b/src/overlays/actors/ovl_Bg_Hidan_Sekizou/z_bg_hidan_sekizou.h index 52e588a88e..26c0af193f 100644 --- a/src/overlays/actors/ovl_Bg_Hidan_Sekizou/z_bg_hidan_sekizou.h +++ b/src/overlays/actors/ovl_Bg_Hidan_Sekizou/z_bg_hidan_sekizou.h @@ -4,8 +4,7 @@ #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ Actor actor; /* 0x014C */ char unk_14C[0x1C8]; } BgHidanSekizou; // size = 0x0314 diff --git a/src/overlays/actors/ovl_Bg_Hidan_Sima/z_bg_hidan_sima.c b/src/overlays/actors/ovl_Bg_Hidan_Sima/z_bg_hidan_sima.c index 7af7ccaa12..6e94db4704 100644 --- a/src/overlays/actors/ovl_Bg_Hidan_Sima/z_bg_hidan_sima.c +++ b/src/overlays/actors/ovl_Bg_Hidan_Sima/z_bg_hidan_sima.c @@ -1,6 +1,6 @@ #include "z_bg_hidan_sima.h" -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x00000000 void BgHidanSima_Init(BgHidanSima* this, GlobalContext* globalCtx); @@ -9,8 +9,7 @@ void BgHidanSima_Update(BgHidanSima* this, GlobalContext* globalCtx); void BgHidanSima_Draw(BgHidanSima* this, GlobalContext* globalCtx); /* -const ActorInit Bg_Hidan_Sima_InitVars = -{ +const ActorInit Bg_Hidan_Sima_InitVars = { ACTOR_BG_HIDAN_SIMA, ACTORTYPE_BG, ROOM, diff --git a/src/overlays/actors/ovl_Bg_Hidan_Sima/z_bg_hidan_sima.h b/src/overlays/actors/ovl_Bg_Hidan_Sima/z_bg_hidan_sima.h index 7f1df8300d..d0dbbe1f21 100644 --- a/src/overlays/actors/ovl_Bg_Hidan_Sima/z_bg_hidan_sima.h +++ b/src/overlays/actors/ovl_Bg_Hidan_Sima/z_bg_hidan_sima.h @@ -4,8 +4,7 @@ #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ Actor actor; /* 0x014C */ char unk_14C[0xC0]; } BgHidanSima; // size = 0x020C diff --git a/src/overlays/actors/ovl_Bg_Hidan_Syoku/z_bg_hidan_syoku.c b/src/overlays/actors/ovl_Bg_Hidan_Syoku/z_bg_hidan_syoku.c index 95c8d4937d..baca6cd799 100644 --- a/src/overlays/actors/ovl_Bg_Hidan_Syoku/z_bg_hidan_syoku.c +++ b/src/overlays/actors/ovl_Bg_Hidan_Syoku/z_bg_hidan_syoku.c @@ -2,13 +2,12 @@ * File: z_bg_hidan_syoku.c * Overlay: Bg_Hidan_Syoku * Description: Stone Elevator in the Fire Temple -*/ + */ #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ Actor actor; /* 0x014C */ u32 dynaPolyId; /* 0x0150 */ f32 unk_150; @@ -16,12 +15,12 @@ typedef struct /* 0x0158 */ u32 unk_158; /* 0x015C */ u32 unk_15C; /* 0x0160 */ u8 unk_160; - /* 0x0164 */ ActorFunc updateFunc; - /* 0x0168 */ s16 unk_168; - /* 0x016A */ s16 unk_16A; + /* 0x0164 */ ActorFunc updateFunc; + /* 0x0168 */ s16 unk_168; + /* 0x016A */ s16 unk_16A; } ActorHidanSyoku; // size = 0x016C -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x00000010 static void Init(ActorHidanSyoku* this, GlobalContext* globalCtx); @@ -32,8 +31,7 @@ static void func_8088F62C(ActorHidanSyoku* this, GlobalContext* globalCtx); static void Update(ActorHidanSyoku* this, GlobalContext* globalCtx); static void Draw(ActorHidanSyoku* this, GlobalContext* globalCtx); -const ActorInit Bg_Hidan_Syoku_InitVars = -{ +const ActorInit Bg_Hidan_Syoku_InitVars = { ACTOR_BG_HIDAN_SYOKU, ACTORTYPE_BG, ROOM, @@ -46,16 +44,14 @@ const ActorInit Bg_Hidan_Syoku_InitVars = (ActorFunc)Draw, }; -static InitChainEntry initChain[] = -{ - ICHAIN_VEC3F_DIV1000(scale, 100, ICHAIN_STOP) +static InitChainEntry initChain[] = { + ICHAIN_VEC3F_DIV1000(scale, 100, ICHAIN_STOP), }; extern UNK_PTR D_0600A7E0; extern UNK_PTR D_0600E568; -static void Init(ActorHidanSyoku* this, GlobalContext* globalCtx) -{ +static void Init(ActorHidanSyoku* this, GlobalContext* globalCtx) { s32 pad[2]; u32 local_c = 0; @@ -67,104 +63,78 @@ static void Init(ActorHidanSyoku* this, GlobalContext* globalCtx) this->actor.initPosRot.pos.y += 540.0f; } -static void Destroy(ActorHidanSyoku* this, GlobalContext* globalCtx) -{ +static void Destroy(ActorHidanSyoku* this, GlobalContext* globalCtx) { DynaPolyInfo_Free(globalCtx, &globalCtx->colCtx.dyna, this->dynaPolyId); } -static void func_8088F47C(ActorHidanSyoku* this) -{ +static void func_8088F47C(ActorHidanSyoku* this) { this->unk_16A = 0x3c; Audio_PlayActorSound2(&this->actor, NA_SE_EV_BLOCK_BOUND); this->updateFunc = &func_8088F62C; } -static void func_8088F4B8(ActorHidanSyoku* this, GlobalContext* globalCtx) -{ - if (Flags_GetClear(globalCtx, this->actor.room) && func_8004356C(&this->actor)) - { +static void func_8088F4B8(ActorHidanSyoku* this, GlobalContext* globalCtx) { + if (Flags_GetClear(globalCtx, this->actor.room) && func_8004356C(&this->actor)) { this->unk_16A = 0x8c; this->updateFunc = &func_8088F514; } } -static void func_8088F514(ActorHidanSyoku* this, GlobalContext* globalCtx) -{ - if (this->unk_16A != 0) - { +static void func_8088F514(ActorHidanSyoku* this, GlobalContext* globalCtx) { + if (this->unk_16A != 0) { this->unk_16A -= 1; } this->actor.posRot.pos.y = (cosf(this->unk_16A * (M_PI / 140)) * 540.0f) + this->actor.initPosRot.pos.y; - if (this->unk_16A == 0) - { + if (this->unk_16A == 0) { func_8088F47C(this); - } - else - { + } else { func_8002F974(&this->actor, 0x20b9); } } -static void func_8088F5A0(ActorHidanSyoku* this, GlobalContext* globalCtx) -{ - if (this->unk_16A != 0) - { +static void func_8088F5A0(ActorHidanSyoku* this, GlobalContext* globalCtx) { + if (this->unk_16A != 0) { this->unk_16A -= 1; } this->actor.posRot.pos.y = this->actor.initPosRot.pos.y - (cosf(this->unk_16A * (M_PI / 140)) * 540.0f); - if (this->unk_16A == 0) - { + if (this->unk_16A == 0) { func_8088F47C(this); - } - else - { + } else { func_8002F974(&this->actor, 0x20b9); } } -static void func_8088F62C(ActorHidanSyoku* this, GlobalContext* globalCtx) -{ - if (this->unk_16A != 0) - { +static void func_8088F62C(ActorHidanSyoku* this, GlobalContext* globalCtx) { + if (this->unk_16A != 0) { this->unk_16A -= 1; } - if (this->unk_16A == 0) - { + if (this->unk_16A == 0) { this->unk_16A = 0x8c; - if (this->actor.posRot.pos.y < this->actor.initPosRot.pos.y) - { + if (this->actor.posRot.pos.y < this->actor.initPosRot.pos.y) { this->updateFunc = &func_8088F514; - } - else - { + } else { this->updateFunc = &func_8088F5A0; } } } -static void Update(ActorHidanSyoku* this, GlobalContext* globalCtx) -{ +static void Update(ActorHidanSyoku* this, GlobalContext* globalCtx) { this->updateFunc(this, globalCtx); - if (func_8004356C(&this->actor)) - { - if (this->unk_168 == 0) - { + if (func_8004356C(&this->actor)) { + if (this->unk_168 == 0) { this->unk_168 = 3; } func_8005A77C(globalCtx->cameraCtx.activeCameraPtrs[0], 0x30); return; } - if (!func_8004356C(&this->actor)) - { - if (this->unk_168 != 0) - { + if (!func_8004356C(&this->actor)) { + if (this->unk_168 != 0) { func_8005A77C(globalCtx->cameraCtx.activeCameraPtrs[0], 3); } this->unk_168 = 0; } } -static void Draw(ActorHidanSyoku* this, GlobalContext* globalCtx) -{ - Draw_DListOpa(globalCtx, &D_0600A7E0); +static void Draw(ActorHidanSyoku* this, GlobalContext* globalCtx) { + Gfx_DrawDListOpa(globalCtx, &D_0600A7E0); } diff --git a/src/overlays/actors/ovl_Bg_Ice_Objects/z_bg_ice_objects.c b/src/overlays/actors/ovl_Bg_Ice_Objects/z_bg_ice_objects.c index 3ccd7a4fa7..f41597a140 100644 --- a/src/overlays/actors/ovl_Bg_Ice_Objects/z_bg_ice_objects.c +++ b/src/overlays/actors/ovl_Bg_Ice_Objects/z_bg_ice_objects.c @@ -1,6 +1,6 @@ #include "z_bg_ice_objects.h" -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x00000000 void BgIceObjects_Init(BgIceObjects* this, GlobalContext* globalCtx); @@ -9,8 +9,7 @@ void BgIceObjects_Update(BgIceObjects* this, GlobalContext* globalCtx); void BgIceObjects_Draw(BgIceObjects* this, GlobalContext* globalCtx); /* -const ActorInit Bg_Ice_Objects_InitVars = -{ +const ActorInit Bg_Ice_Objects_InitVars = { ACTOR_BG_ICE_OBJECTS, ACTORTYPE_PROP, ROOM, diff --git a/src/overlays/actors/ovl_Bg_Ice_Objects/z_bg_ice_objects.h b/src/overlays/actors/ovl_Bg_Ice_Objects/z_bg_ice_objects.h index ff8d5232da..b258abe517 100644 --- a/src/overlays/actors/ovl_Bg_Ice_Objects/z_bg_ice_objects.h +++ b/src/overlays/actors/ovl_Bg_Ice_Objects/z_bg_ice_objects.h @@ -4,8 +4,7 @@ #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ Actor actor; /* 0x014C */ char unk_14C[0x28]; } BgIceObjects; // size = 0x0174 diff --git a/src/overlays/actors/ovl_Bg_Ice_Shelter/z_bg_ice_shelter.c b/src/overlays/actors/ovl_Bg_Ice_Shelter/z_bg_ice_shelter.c index 3ebc6346da..436f9eafdc 100644 --- a/src/overlays/actors/ovl_Bg_Ice_Shelter/z_bg_ice_shelter.c +++ b/src/overlays/actors/ovl_Bg_Ice_Shelter/z_bg_ice_shelter.c @@ -1,6 +1,6 @@ #include "z_bg_ice_shelter.h" -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x00000000 void BgIceShelter_Init(BgIceShelter* this, GlobalContext* globalCtx); @@ -9,8 +9,7 @@ void BgIceShelter_Update(BgIceShelter* this, GlobalContext* globalCtx); void BgIceShelter_Draw(BgIceShelter* this, GlobalContext* globalCtx); /* -const ActorInit Bg_Ice_Shelter_InitVars = -{ +const ActorInit Bg_Ice_Shelter_InitVars = { ACTOR_BG_ICE_SHELTER, ACTORTYPE_BG, ROOM, diff --git a/src/overlays/actors/ovl_Bg_Ice_Shelter/z_bg_ice_shelter.h b/src/overlays/actors/ovl_Bg_Ice_Shelter/z_bg_ice_shelter.h index 5f42358a2d..bf9d7aad73 100644 --- a/src/overlays/actors/ovl_Bg_Ice_Shelter/z_bg_ice_shelter.h +++ b/src/overlays/actors/ovl_Bg_Ice_Shelter/z_bg_ice_shelter.h @@ -4,8 +4,7 @@ #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ Actor actor; /* 0x014C */ char unk_14C[0xB8]; } BgIceShelter; // size = 0x0204 diff --git a/src/overlays/actors/ovl_Bg_Ice_Shutter/z_bg_ice_shutter.c b/src/overlays/actors/ovl_Bg_Ice_Shutter/z_bg_ice_shutter.c index 81ca533027..1e295d5842 100644 --- a/src/overlays/actors/ovl_Bg_Ice_Shutter/z_bg_ice_shutter.c +++ b/src/overlays/actors/ovl_Bg_Ice_Shutter/z_bg_ice_shutter.c @@ -1,6 +1,6 @@ #include "z_bg_ice_shutter.h" -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x00000010 void BgIceShutter_Init(BgIceShutter* this, GlobalContext* globalCtx); @@ -9,8 +9,7 @@ void BgIceShutter_Update(BgIceShutter* this, GlobalContext* globalCtx); void BgIceShutter_Draw(BgIceShutter* this, GlobalContext* globalCtx); /* -const ActorInit Bg_Ice_Shutter_InitVars = -{ +const ActorInit Bg_Ice_Shutter_InitVars = { ACTOR_BG_ICE_SHUTTER, ACTORTYPE_PROP, ROOM, @@ -38,6 +37,3 @@ const ActorInit Bg_Ice_Shutter_InitVars = #pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Ice_Shutter/BgIceShutter_Update.s") #pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Ice_Shutter/BgIceShutter_Draw.s") - - - diff --git a/src/overlays/actors/ovl_Bg_Ice_Shutter/z_bg_ice_shutter.h b/src/overlays/actors/ovl_Bg_Ice_Shutter/z_bg_ice_shutter.h index f425c21edf..08d8caafea 100644 --- a/src/overlays/actors/ovl_Bg_Ice_Shutter/z_bg_ice_shutter.h +++ b/src/overlays/actors/ovl_Bg_Ice_Shutter/z_bg_ice_shutter.h @@ -4,8 +4,7 @@ #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ Actor actor; /* 0x014C */ char unk_14C[0x1C]; } BgIceShutter; // size = 0x0168 diff --git a/src/overlays/actors/ovl_Bg_Ice_Turara/z_bg_ice_turara.c b/src/overlays/actors/ovl_Bg_Ice_Turara/z_bg_ice_turara.c index 99a5b9fb55..1b269d0fc8 100644 --- a/src/overlays/actors/ovl_Bg_Ice_Turara/z_bg_ice_turara.c +++ b/src/overlays/actors/ovl_Bg_Ice_Turara/z_bg_ice_turara.c @@ -1,6 +1,6 @@ #include "z_bg_ice_turara.h" -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x00000000 void BgIceTurara_Init(BgIceTurara* this, GlobalContext* globalCtx); @@ -9,8 +9,7 @@ void BgIceTurara_Update(BgIceTurara* this, GlobalContext* globalCtx); void BgIceTurara_Draw(BgIceTurara* this, GlobalContext* globalCtx); /* -const ActorInit Bg_Ice_Turara_InitVars = -{ +const ActorInit Bg_Ice_Turara_InitVars = { ACTOR_BG_ICE_TURARA, ACTORTYPE_PROP, ROOM, diff --git a/src/overlays/actors/ovl_Bg_Ice_Turara/z_bg_ice_turara.h b/src/overlays/actors/ovl_Bg_Ice_Turara/z_bg_ice_turara.h index 1e1fcc87a6..850af930ec 100644 --- a/src/overlays/actors/ovl_Bg_Ice_Turara/z_bg_ice_turara.h +++ b/src/overlays/actors/ovl_Bg_Ice_Turara/z_bg_ice_turara.h @@ -4,8 +4,7 @@ #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ Actor actor; /* 0x014C */ char unk_14C[0x6C]; } BgIceTurara; // size = 0x01B8 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 1187a276bf..1e0d352efe 100644 --- a/src/overlays/actors/ovl_Bg_Ingate/z_bg_ingate.c +++ b/src/overlays/actors/ovl_Bg_Ingate/z_bg_ingate.c @@ -1,6 +1,6 @@ #include "z_bg_ingate.h" -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x00000000 void BgIngate_Init(BgIngate* this, GlobalContext* globalCtx); @@ -9,8 +9,7 @@ void BgIngate_Update(BgIngate* this, GlobalContext* globalCtx); void BgIngate_Draw(BgIngate* this, GlobalContext* globalCtx); /* -const ActorInit Bg_Ingate_InitVars = -{ +const ActorInit Bg_Ingate_InitVars = { ACTOR_BG_INGATE, ACTORTYPE_PROP, ROOM, diff --git a/src/overlays/actors/ovl_Bg_Ingate/z_bg_ingate.h b/src/overlays/actors/ovl_Bg_Ingate/z_bg_ingate.h index ea6980aad7..0205b7721c 100644 --- a/src/overlays/actors/ovl_Bg_Ingate/z_bg_ingate.h +++ b/src/overlays/actors/ovl_Bg_Ingate/z_bg_ingate.h @@ -4,8 +4,7 @@ #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ Actor actor; /* 0x014C */ char unk_14C[0x1C]; } BgIngate; // size = 0x0168 diff --git a/src/overlays/actors/ovl_Bg_Jya_1flift/z_bg_jya_1flift.c b/src/overlays/actors/ovl_Bg_Jya_1flift/z_bg_jya_1flift.c index 303ee5fd70..cc58fdae75 100644 --- a/src/overlays/actors/ovl_Bg_Jya_1flift/z_bg_jya_1flift.c +++ b/src/overlays/actors/ovl_Bg_Jya_1flift/z_bg_jya_1flift.c @@ -1,6 +1,6 @@ #include "z_bg_jya_1flift.h" -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x00000010 void BgJya1flift_Init(BgJya1flift* this, GlobalContext* globalCtx); @@ -9,8 +9,7 @@ void BgJya1flift_Update(BgJya1flift* this, GlobalContext* globalCtx); void BgJya1flift_Draw(BgJya1flift* this, GlobalContext* globalCtx); /* -const ActorInit Bg_Jya_1flift_InitVars = -{ +const ActorInit Bg_Jya_1flift_InitVars = { ACTOR_BG_JYA_1FLIFT, ACTORTYPE_BG, ROOM, diff --git a/src/overlays/actors/ovl_Bg_Jya_1flift/z_bg_jya_1flift.h b/src/overlays/actors/ovl_Bg_Jya_1flift/z_bg_jya_1flift.h index 7796b4aa01..0cabc4bbf9 100644 --- a/src/overlays/actors/ovl_Bg_Jya_1flift/z_bg_jya_1flift.h +++ b/src/overlays/actors/ovl_Bg_Jya_1flift/z_bg_jya_1flift.h @@ -4,8 +4,7 @@ #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ Actor actor; /* 0x014C */ char unk_14C[0x70]; } BgJya1flift; // size = 0x01BC diff --git a/src/overlays/actors/ovl_Bg_Jya_Amishutter/z_bg_jya_amishutter.c b/src/overlays/actors/ovl_Bg_Jya_Amishutter/z_bg_jya_amishutter.c index 1178ce90ea..5c625673e3 100644 --- a/src/overlays/actors/ovl_Bg_Jya_Amishutter/z_bg_jya_amishutter.c +++ b/src/overlays/actors/ovl_Bg_Jya_Amishutter/z_bg_jya_amishutter.c @@ -2,20 +2,19 @@ * File: z_bg_jya_amishutter.c * Overlay: Bg_Jya_Amishutter * Description: Circular Metal Grate (Spirit Temple) -*/ + */ #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ Actor actor; /* 0x014C */ u32 dynaPolyId; /* 0x0150 */ char unk_150[0x14]; /* 0x0164 */ void (*updateFunc)(Actor*); } BgJyaAmishutter; // size = 0x0168 -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x00000000 static void BgJyaAmishutter_Init(BgJyaAmishutter* this, GlobalContext* globalCtx); @@ -32,8 +31,7 @@ static void func_808934C0(BgJyaAmishutter* this); static void func_808934FC(BgJyaAmishutter* this); static void func_8089350C(BgJyaAmishutter* this); -const ActorInit Bg_Jya_Amishutter_InitVars = -{ +const ActorInit Bg_Jya_Amishutter_InitVars = { ACTOR_BG_JYA_AMISHUTTER, ACTORTYPE_BG, ROOM, @@ -46,19 +44,17 @@ const ActorInit Bg_Jya_Amishutter_InitVars = (ActorFunc)BgJyaAmishutter_Draw, }; -static InitChainEntry initChain[] = -{ +static InitChainEntry initChain[] = { ICHAIN_VEC3F_DIV1000(scale, 100, ICHAIN_CONTINUE), ICHAIN_F32(unk_F4, 1000, ICHAIN_CONTINUE), ICHAIN_F32(unk_F8, 200, ICHAIN_CONTINUE), - ICHAIN_F32(unk_FC, 1000, ICHAIN_STOP) + ICHAIN_F32(unk_FC, 1000, ICHAIN_STOP), }; extern UNK_TYPE D_0600C4C8; extern UNK_TYPE D_0600C0A0; -static void func_808932C0(BgJyaAmishutter* this, GlobalContext* globalCtx, u32 collision, DynaPolyMoveFlag flag) -{ +static void func_808932C0(BgJyaAmishutter* this, GlobalContext* globalCtx, u32 collision, DynaPolyMoveFlag flag) { s16 pad1; u32 local_c = 0; s16 pad2; @@ -66,95 +62,74 @@ static void func_808932C0(BgJyaAmishutter* this, GlobalContext* globalCtx, u32 c DynaPolyInfo_SetActorMove(&this->actor, flag); DynaPolyInfo_Alloc(collision, &local_c); this->dynaPolyId = DynaPolyInfo_RegisterActor(globalCtx, &globalCtx->colCtx.dyna, &this->actor, local_c); - if (this->dynaPolyId == 0x32) - { - osSyncPrintf("Warning : move BG 登録失敗(%s %d)(name %d)(arg_data 0x%04x)\n", "../z_bg_jya_amishutter.c", 129, this->actor.id, this->actor.params); + if (this->dynaPolyId == 0x32) { + osSyncPrintf("Warning : move BG 登録失敗(%s %d)(name %d)(arg_data 0x%04x)\n", "../z_bg_jya_amishutter.c", 129, + this->actor.id, this->actor.params); } } -static void BgJyaAmishutter_Init(BgJyaAmishutter* this, GlobalContext* globalCtx) -{ +static void BgJyaAmishutter_Init(BgJyaAmishutter* this, GlobalContext* globalCtx) { func_808932C0(this, globalCtx, &D_0600C4C8, 0); Actor_ProcessInitChain(&this->actor, initChain); func_808933BC(this); } -static void BgJyaAmishutter_Destroy(BgJyaAmishutter* this, GlobalContext* globalCtx) -{ +static void BgJyaAmishutter_Destroy(BgJyaAmishutter* this, GlobalContext* globalCtx) { DynaPolyInfo_Free(globalCtx, &globalCtx->colCtx.dyna, this->dynaPolyId); } -static void func_808933BC(BgJyaAmishutter* this) -{ +static void func_808933BC(BgJyaAmishutter* this) { this->updateFunc = func_808933CC; } -static void func_808933CC(BgJyaAmishutter* this) -{ - if (this->actor.xzDistanceFromLink < 60.0f) - { - if (fabsf(this->actor.yDistanceFromLink) < 30.0f) - { +static void func_808933CC(BgJyaAmishutter* this) { + if (this->actor.xzDistanceFromLink < 60.0f) { + if (fabsf(this->actor.yDistanceFromLink) < 30.0f) { func_80893428(this); } } } -static void func_80893428(BgJyaAmishutter* this) -{ +static void func_80893428(BgJyaAmishutter* this) { this->updateFunc = func_80893438; } -static void func_80893438(BgJyaAmishutter* this) -{ - if (Math_ApproxF(&this->actor.posRot.pos.y, this->actor.initPosRot.pos.y + 100.0f, 3.0f)) - { +static void func_80893438(BgJyaAmishutter* this) { + if (Math_ApproxF(&this->actor.posRot.pos.y, this->actor.initPosRot.pos.y + 100.0f, 3.0f)) { func_808934B0(this); Audio_PlayActorSound2(&this->actor, NA_SE_EV_METALDOOR_STOP); - } - else - { + } else { func_8002F974(&this->actor, 0x2036); } } -static void func_808934B0(BgJyaAmishutter* this) -{ +static void func_808934B0(BgJyaAmishutter* this) { this->updateFunc = func_808934C0; } -static void func_808934C0(BgJyaAmishutter* this) -{ - if (this->actor.xzDistanceFromLink > 300.0f) - { +static void func_808934C0(BgJyaAmishutter* this) { + if (this->actor.xzDistanceFromLink > 300.0f) { func_808934FC(this); } } -static void func_808934FC(BgJyaAmishutter* this) -{ +static void func_808934FC(BgJyaAmishutter* this) { this->updateFunc = func_8089350C; } -static void func_8089350C(BgJyaAmishutter* this) -{ - if (Math_ApproxF(&this->actor.posRot.pos.y, this->actor.initPosRot.pos.y, 3.0f)) - { - func_808933BC(this); +static void func_8089350C(BgJyaAmishutter* this) { + if (Math_ApproxF(&this->actor.posRot.pos.y, this->actor.initPosRot.pos.y, 3.0f)) { + func_808933BC(this); Audio_PlayActorSound2(&this->actor, NA_SE_EV_METALDOOR_STOP); - } - else - { + } else { func_8002F974(&this->actor, 0x2036); } } -static void BgJyaAmishutter_Update(BgJyaAmishutter* this, GlobalContext* globalCtx) -{ +static void BgJyaAmishutter_Update(BgJyaAmishutter* this, GlobalContext* globalCtx) { this->updateFunc(this); } -static void BgJyaAmishutter_Draw(BgJyaAmishutter* this, GlobalContext* globalCtx) -{ - Draw_DListOpa(globalCtx, &D_0600C0A0); +static void BgJyaAmishutter_Draw(BgJyaAmishutter* this, GlobalContext* globalCtx) { + Gfx_DrawDListOpa(globalCtx, &D_0600C0A0); } diff --git a/src/overlays/actors/ovl_Bg_Jya_Bigmirror/z_bg_jya_bigmirror.c b/src/overlays/actors/ovl_Bg_Jya_Bigmirror/z_bg_jya_bigmirror.c index abfd9bb9b9..dfd6a817b7 100644 --- a/src/overlays/actors/ovl_Bg_Jya_Bigmirror/z_bg_jya_bigmirror.c +++ b/src/overlays/actors/ovl_Bg_Jya_Bigmirror/z_bg_jya_bigmirror.c @@ -1,6 +1,6 @@ #include "z_bg_jya_bigmirror.h" -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x00000030 void BgJyaBigmirror_Init(BgJyaBigmirror* this, GlobalContext* globalCtx); @@ -9,8 +9,7 @@ void BgJyaBigmirror_Update(BgJyaBigmirror* this, GlobalContext* globalCtx); void BgJyaBigmirror_Draw(BgJyaBigmirror* this, GlobalContext* globalCtx); /* -const ActorInit Bg_Jya_Bigmirror_InitVars = -{ +const ActorInit Bg_Jya_Bigmirror_InitVars = { ACTOR_BG_JYA_BIGMIRROR, ACTORTYPE_BG, ROOM, diff --git a/src/overlays/actors/ovl_Bg_Jya_Bigmirror/z_bg_jya_bigmirror.h b/src/overlays/actors/ovl_Bg_Jya_Bigmirror/z_bg_jya_bigmirror.h index 2884a1541a..af7cb1594d 100644 --- a/src/overlays/actors/ovl_Bg_Jya_Bigmirror/z_bg_jya_bigmirror.h +++ b/src/overlays/actors/ovl_Bg_Jya_Bigmirror/z_bg_jya_bigmirror.h @@ -4,8 +4,7 @@ #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ Actor actor; /* 0x014C */ char unk_14C[0x28]; } BgJyaBigmirror; // size = 0x0174 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 4498ddeffe..f149e3e018 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 @@ -1,6 +1,6 @@ #include "z_bg_jya_block.h" -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x00000000 void BgJyaBlock_Init(BgJyaBlock* this, GlobalContext* globalCtx); @@ -9,8 +9,7 @@ void BgJyaBlock_Update(BgJyaBlock* this, GlobalContext* globalCtx); void BgJyaBlock_Draw(BgJyaBlock* this, GlobalContext* globalCtx); /* -const ActorInit Bg_Jya_Block_InitVars = -{ +const ActorInit Bg_Jya_Block_InitVars = { ACTOR_BG_JYA_BLOCK, ACTORTYPE_PROP, ROOM, diff --git a/src/overlays/actors/ovl_Bg_Jya_Block/z_bg_jya_block.h b/src/overlays/actors/ovl_Bg_Jya_Block/z_bg_jya_block.h index e44c4508e6..c4975cbab3 100644 --- a/src/overlays/actors/ovl_Bg_Jya_Block/z_bg_jya_block.h +++ b/src/overlays/actors/ovl_Bg_Jya_Block/z_bg_jya_block.h @@ -4,8 +4,7 @@ #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ Actor actor; /* 0x014C */ char unk_14C[0x18]; } BgJyaBlock; // size = 0x0164 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 8e7fbd7cc8..c9b3362d85 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,6 +1,6 @@ #include "z_bg_jya_bombchuiwa.h" -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x00000001 void BgJyaBombchuiwa_Init(BgJyaBombchuiwa* this, GlobalContext* globalCtx); @@ -9,8 +9,7 @@ void BgJyaBombchuiwa_Update(BgJyaBombchuiwa* this, GlobalContext* globalCtx); void BgJyaBombchuiwa_Draw(BgJyaBombchuiwa* this, GlobalContext* globalCtx); /* -const ActorInit Bg_Jya_Bombchuiwa_InitVars = -{ +const ActorInit Bg_Jya_Bombchuiwa_InitVars = { ACTOR_BG_JYA_BOMBCHUIWA, ACTORTYPE_BG, ROOM, 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 1ad9d826bd..bcb45f9fbb 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 @@ -4,8 +4,7 @@ #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ Actor actor; /* 0x014C */ char unk_14C[0x6C]; } BgJyaBombchuiwa; // size = 0x01B8 diff --git a/src/overlays/actors/ovl_Bg_Jya_Bombiwa/z_bg_jya_bombiwa.c b/src/overlays/actors/ovl_Bg_Jya_Bombiwa/z_bg_jya_bombiwa.c index bd6ecca8f8..1b13877d1d 100644 --- a/src/overlays/actors/ovl_Bg_Jya_Bombiwa/z_bg_jya_bombiwa.c +++ b/src/overlays/actors/ovl_Bg_Jya_Bombiwa/z_bg_jya_bombiwa.c @@ -1,6 +1,6 @@ #include "z_bg_jya_bombiwa.h" -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x00000000 void BgJyaBombiwa_Init(BgJyaBombiwa* this, GlobalContext* globalCtx); @@ -9,8 +9,7 @@ void BgJyaBombiwa_Update(BgJyaBombiwa* this, GlobalContext* globalCtx); void BgJyaBombiwa_Draw(BgJyaBombiwa* this, GlobalContext* globalCtx); /* -const ActorInit Bg_Jya_Bombiwa_InitVars = -{ +const ActorInit Bg_Jya_Bombiwa_InitVars = { ACTOR_BG_JYA_BOMBIWA, ACTORTYPE_BG, ROOM, diff --git a/src/overlays/actors/ovl_Bg_Jya_Bombiwa/z_bg_jya_bombiwa.h b/src/overlays/actors/ovl_Bg_Jya_Bombiwa/z_bg_jya_bombiwa.h index 0e9c972eab..38b0e769b9 100644 --- a/src/overlays/actors/ovl_Bg_Jya_Bombiwa/z_bg_jya_bombiwa.h +++ b/src/overlays/actors/ovl_Bg_Jya_Bombiwa/z_bg_jya_bombiwa.h @@ -4,8 +4,7 @@ #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ Actor actor; /* 0x014C */ char unk_14C[0x7C]; } BgJyaBombiwa; // size = 0x01C8 diff --git a/src/overlays/actors/ovl_Bg_Jya_Cobra/z_bg_jya_cobra.c b/src/overlays/actors/ovl_Bg_Jya_Cobra/z_bg_jya_cobra.c index 406d352a90..15c138c387 100644 --- a/src/overlays/actors/ovl_Bg_Jya_Cobra/z_bg_jya_cobra.c +++ b/src/overlays/actors/ovl_Bg_Jya_Cobra/z_bg_jya_cobra.c @@ -1,6 +1,6 @@ #include "z_bg_jya_cobra.h" -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x00000010 void BgJyaCobra_Init(BgJyaCobra* this, GlobalContext* globalCtx); @@ -9,8 +9,7 @@ void BgJyaCobra_Update(BgJyaCobra* this, GlobalContext* globalCtx); void BgJyaCobra_Draw(BgJyaCobra* this, GlobalContext* globalCtx); /* -const ActorInit Bg_Jya_Cobra_InitVars = -{ +const ActorInit Bg_Jya_Cobra_InitVars = { ACTOR_BG_JYA_COBRA, ACTORTYPE_PROP, ROOM, diff --git a/src/overlays/actors/ovl_Bg_Jya_Cobra/z_bg_jya_cobra.h b/src/overlays/actors/ovl_Bg_Jya_Cobra/z_bg_jya_cobra.h index 5f37401fa1..6ae32f2363 100644 --- a/src/overlays/actors/ovl_Bg_Jya_Cobra/z_bg_jya_cobra.h +++ b/src/overlays/actors/ovl_Bg_Jya_Cobra/z_bg_jya_cobra.h @@ -4,8 +4,7 @@ #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ Actor actor; /* 0x014C */ char unk_14C[0x1058]; } BgJyaCobra; // size = 0x11A4 diff --git a/src/overlays/actors/ovl_Bg_Jya_Goroiwa/z_bg_jya_goroiwa.c b/src/overlays/actors/ovl_Bg_Jya_Goroiwa/z_bg_jya_goroiwa.c index 306886f0a8..708400e173 100644 --- a/src/overlays/actors/ovl_Bg_Jya_Goroiwa/z_bg_jya_goroiwa.c +++ b/src/overlays/actors/ovl_Bg_Jya_Goroiwa/z_bg_jya_goroiwa.c @@ -1,6 +1,6 @@ #include "z_bg_jya_goroiwa.h" -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x00000010 void BgJyaGoroiwa_Init(BgJyaGoroiwa* this, GlobalContext* globalCtx); @@ -9,8 +9,7 @@ void BgJyaGoroiwa_Update(BgJyaGoroiwa* this, GlobalContext* globalCtx); void BgJyaGoroiwa_Draw(BgJyaGoroiwa* this, GlobalContext* globalCtx); /* -const ActorInit Bg_Jya_Goroiwa_InitVars = -{ +const ActorInit Bg_Jya_Goroiwa_InitVars = { ACTOR_BG_JYA_GOROIWA, ACTORTYPE_PROP, ROOM, diff --git a/src/overlays/actors/ovl_Bg_Jya_Goroiwa/z_bg_jya_goroiwa.h b/src/overlays/actors/ovl_Bg_Jya_Goroiwa/z_bg_jya_goroiwa.h index 7dcd17837e..6ded63227c 100644 --- a/src/overlays/actors/ovl_Bg_Jya_Goroiwa/z_bg_jya_goroiwa.h +++ b/src/overlays/actors/ovl_Bg_Jya_Goroiwa/z_bg_jya_goroiwa.h @@ -4,8 +4,7 @@ #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ Actor actor; /* 0x014C */ char unk_14C[0x70]; } BgJyaGoroiwa; // size = 0x01BC diff --git a/src/overlays/actors/ovl_Bg_Jya_Haheniron/z_bg_jya_haheniron.c b/src/overlays/actors/ovl_Bg_Jya_Haheniron/z_bg_jya_haheniron.c index 98d5d4ff00..49c5e5a9f1 100644 --- a/src/overlays/actors/ovl_Bg_Jya_Haheniron/z_bg_jya_haheniron.c +++ b/src/overlays/actors/ovl_Bg_Jya_Haheniron/z_bg_jya_haheniron.c @@ -1,6 +1,6 @@ #include "z_bg_jya_haheniron.h" -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x00000010 void BgJyaHaheniron_Init(BgJyaHaheniron* this, GlobalContext* globalCtx); @@ -9,8 +9,7 @@ void BgJyaHaheniron_Update(BgJyaHaheniron* this, GlobalContext* globalCtx); void BgJyaHaheniron_Draw(BgJyaHaheniron* this, GlobalContext* globalCtx); /* -const ActorInit Bg_Jya_Haheniron_InitVars = -{ +const ActorInit Bg_Jya_Haheniron_InitVars = { ACTOR_BG_JYA_HAHENIRON, ACTORTYPE_PROP, ROOM, diff --git a/src/overlays/actors/ovl_Bg_Jya_Haheniron/z_bg_jya_haheniron.h b/src/overlays/actors/ovl_Bg_Jya_Haheniron/z_bg_jya_haheniron.h index 310431c04a..6160c7a79e 100644 --- a/src/overlays/actors/ovl_Bg_Jya_Haheniron/z_bg_jya_haheniron.h +++ b/src/overlays/actors/ovl_Bg_Jya_Haheniron/z_bg_jya_haheniron.h @@ -4,8 +4,7 @@ #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ Actor actor; /* 0x014C */ char unk_14C[0x68]; } BgJyaHaheniron; // size = 0x01B4 diff --git a/src/overlays/actors/ovl_Bg_Jya_Ironobj/z_bg_jya_ironobj.c b/src/overlays/actors/ovl_Bg_Jya_Ironobj/z_bg_jya_ironobj.c index 416a171f19..ad9934743a 100644 --- a/src/overlays/actors/ovl_Bg_Jya_Ironobj/z_bg_jya_ironobj.c +++ b/src/overlays/actors/ovl_Bg_Jya_Ironobj/z_bg_jya_ironobj.c @@ -1,6 +1,6 @@ #include "z_bg_jya_ironobj.h" -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x00000000 void BgJyaIronobj_Init(BgJyaIronobj* this, GlobalContext* globalCtx); @@ -9,8 +9,7 @@ void BgJyaIronobj_Update(BgJyaIronobj* this, GlobalContext* globalCtx); void BgJyaIronobj_Draw(BgJyaIronobj* this, GlobalContext* globalCtx); /* -const ActorInit Bg_Jya_Ironobj_InitVars = -{ +const ActorInit Bg_Jya_Ironobj_InitVars = { ACTOR_BG_JYA_IRONOBJ, ACTORTYPE_PROP, ROOM, diff --git a/src/overlays/actors/ovl_Bg_Jya_Ironobj/z_bg_jya_ironobj.h b/src/overlays/actors/ovl_Bg_Jya_Ironobj/z_bg_jya_ironobj.h index ac5bcbaae5..8146f09036 100644 --- a/src/overlays/actors/ovl_Bg_Jya_Ironobj/z_bg_jya_ironobj.h +++ b/src/overlays/actors/ovl_Bg_Jya_Ironobj/z_bg_jya_ironobj.h @@ -4,8 +4,7 @@ #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ Actor actor; /* 0x014C */ char unk_14C[0x68]; } BgJyaIronobj; // size = 0x01B4 diff --git a/src/overlays/actors/ovl_Bg_Jya_Kanaami/z_bg_jya_kanaami.c b/src/overlays/actors/ovl_Bg_Jya_Kanaami/z_bg_jya_kanaami.c index 509c27cc71..7bf4de13eb 100644 --- a/src/overlays/actors/ovl_Bg_Jya_Kanaami/z_bg_jya_kanaami.c +++ b/src/overlays/actors/ovl_Bg_Jya_Kanaami/z_bg_jya_kanaami.c @@ -2,13 +2,12 @@ * File: z_bg_jya_kanaami.c * Overlay: Bg_Jya_Kanaami * Description: Climbable Metal Grating (Fire Temple) -*/ + */ #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ Actor actor; /* 0x014C */ u32 dynaPolyId; /* 0x014C */ char unk_150[0x14]; @@ -17,7 +16,7 @@ typedef struct /* 0x016A */ s16 unk_16A; } BgJyaKanaami; // size = 0x016C -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x00000000 static void BgJyaKanaami_Init(BgJyaKanaami* this, GlobalContext* globalCtx); @@ -31,8 +30,7 @@ static void func_8089993C(BgJyaKanaami* this); static void func_80899950(BgJyaKanaami* this, GlobalContext* globalCtx); static void func_80899A08(BgJyaKanaami* this); -const ActorInit Bg_Jya_Kanaami_InitVars = -{ +const ActorInit Bg_Jya_Kanaami_InitVars = { ACTOR_BG_JYA_KANAAMI, ACTORTYPE_BG, ROOM, @@ -45,19 +43,17 @@ const ActorInit Bg_Jya_Kanaami_InitVars = (ActorFunc)BgJyaKanaami_Draw, }; -static InitChainEntry initChain[] = -{ +static InitChainEntry initChain[] = { ICHAIN_VEC3F_DIV1000(scale, 100, ICHAIN_CONTINUE), ICHAIN_F32(unk_F4, 1000, ICHAIN_CONTINUE), ICHAIN_F32(unk_F8, 700, ICHAIN_CONTINUE), - ICHAIN_F32(unk_FC, 1000, ICHAIN_STOP) + ICHAIN_F32(unk_FC, 1000, ICHAIN_STOP), }; extern u32 D_0600F000; extern u32 D_0600F208; -static void func_80899740(BgJyaKanaami* this, GlobalContext* globalCtx, u32 collision, DynaPolyMoveFlag flag) -{ +static void func_80899740(BgJyaKanaami* this, GlobalContext* globalCtx, u32 collision, DynaPolyMoveFlag flag) { s32 pad; s32 local_c = 0; s32 pad2; @@ -65,92 +61,75 @@ static void func_80899740(BgJyaKanaami* this, GlobalContext* globalCtx, u32 coll DynaPolyInfo_SetActorMove(&this->actor, flag); DynaPolyInfo_Alloc(collision, &local_c); this->dynaPolyId = DynaPolyInfo_RegisterActor(globalCtx, &globalCtx->colCtx.dyna, &this->actor, local_c); - if (this->dynaPolyId == 0x32) - { - osSyncPrintf("Warning : move BG 登録失敗(%s %d)(name %d)(arg_data 0x%04x)\n", "../z_bg_jya_kanaami.c", 145, this->actor.id, this->actor.params); + if (this->dynaPolyId == 0x32) { + osSyncPrintf("Warning : move BG 登録失敗(%s %d)(name %d)(arg_data 0x%04x)\n", "../z_bg_jya_kanaami.c", 145, + this->actor.id, this->actor.params); } } -static void BgJyaKanaami_Init(BgJyaKanaami* this, GlobalContext* globalCtx) -{ +static void BgJyaKanaami_Init(BgJyaKanaami* this, GlobalContext* globalCtx) { func_80899740(this, globalCtx, &D_0600F208, 0); Actor_ProcessInitChain(&this->actor, initChain); - if (Flags_GetSwitch(globalCtx, this->actor.params & 0x3F)) - { + if (Flags_GetSwitch(globalCtx, this->actor.params & 0x3F)) { func_80899A08(this); - } - else - { + } else { func_80899880(this); } osSyncPrintf("(jya 金網)(arg_data 0x%04x)\n", this->actor.params); } -static void BgJyaKanaami_Destroy(BgJyaKanaami* this, GlobalContext* globalCtx) -{ +static void BgJyaKanaami_Destroy(BgJyaKanaami* this, GlobalContext* globalCtx) { DynaPolyInfo_Free(globalCtx, &globalCtx->colCtx.dyna, this->dynaPolyId); } -static void func_80899880(BgJyaKanaami* this) -{ +static void func_80899880(BgJyaKanaami* this) { this->updateFunc = func_80899894; this->unk_16A = 0; } -static void func_80899894(BgJyaKanaami* this, GlobalContext* globalCtx) -{ - if (Flags_GetSwitch(globalCtx, this->actor.params & 0x3F) || this->unk_16A > 0) - { - if (this->actor.posRot.pos.x > -1000.0f && this->unk_16A == 0) - { +static void func_80899894(BgJyaKanaami* this, GlobalContext* globalCtx) { + if (Flags_GetSwitch(globalCtx, this->actor.params & 0x3F) || this->unk_16A > 0) { + if (this->actor.posRot.pos.x > -1000.0f && this->unk_16A == 0) { func_800800F8(globalCtx, 0xD7A, -0x63, &this->actor, 0); } this->unk_16A += 1; - if (this->unk_16A >= 0xA) - { + if (this->unk_16A >= 0xA) { func_8089993C(this); } } } -static void func_8089993C(BgJyaKanaami* this) -{ +static void func_8089993C(BgJyaKanaami* this) { this->updateFunc = func_80899950; this->unk_168 = 0; } -static void func_80899950(BgJyaKanaami* this, GlobalContext* globalCtx) -{ +static void func_80899950(BgJyaKanaami* this, GlobalContext* globalCtx) { s32 pad[2]; s32 var; this->unk_168 += 0x20; - if (Math_ApproxUpdateScaledS(&this->actor.posRot.rot.x, 0x4000, this->unk_168)) - { + if (Math_ApproxUpdateScaledS(&this->actor.posRot.rot.x, 0x4000, this->unk_168)) { func_80899A08(this); Audio_PlayActorSound2(&this->actor, NA_SE_EV_TRAP_BOUND); - var = func_80092F88(globalCtx->cameraCtx.activeCameraPtrs[globalCtx->cameraCtx.unk_5C0], 3); - func_80092DAC(var, 25000); - func_80092E70(var, 2, 0, 0, 0); - func_80092DF0(var, 0x10); + var = Quake_Add(globalCtx->cameraCtx.activeCameraPtrs[globalCtx->cameraCtx.unk_5C0], 3); + Quake_SetSpeed(var, 25000); + Quake_SetQuakeValues(var, 2, 0, 0, 0); + Quake_SetCountdown(var, 0x10); } } -static void func_80899A08(BgJyaKanaami* this) -{ +static void func_80899A08(BgJyaKanaami* this) { this->updateFunc = 0; this->actor.posRot.rot.x = 0x4000; } -static void BgJyaKanaami_Update(BgJyaKanaami* this, GlobalContext* globalCtx) -{ - if (this->updateFunc) - { +static void BgJyaKanaami_Update(BgJyaKanaami* this, GlobalContext* globalCtx) { + if (this->updateFunc) { this->updateFunc(this, globalCtx); } this->actor.shape.rot.x = this->actor.posRot.rot.x; } -static void BgJyaKanaami_Draw(BgJyaKanaami* this, GlobalContext* globalCtx) -{ - Draw_DListOpa(globalCtx, &D_0600F000); +static void BgJyaKanaami_Draw(BgJyaKanaami* this, GlobalContext* globalCtx) { + Gfx_DrawDListOpa(globalCtx, &D_0600F000); } diff --git a/src/overlays/actors/ovl_Bg_Jya_Lift/z_bg_jya_lift.c b/src/overlays/actors/ovl_Bg_Jya_Lift/z_bg_jya_lift.c index 665ea107b3..b2fdf1bfab 100644 --- a/src/overlays/actors/ovl_Bg_Jya_Lift/z_bg_jya_lift.c +++ b/src/overlays/actors/ovl_Bg_Jya_Lift/z_bg_jya_lift.c @@ -1,6 +1,6 @@ #include "z_bg_jya_lift.h" -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x00000010 void BgJyaLift_Init(BgJyaLift* this, GlobalContext* globalCtx); @@ -9,8 +9,7 @@ void BgJyaLift_Update(BgJyaLift* this, GlobalContext* globalCtx); void BgJyaLift_Draw(BgJyaLift* this, GlobalContext* globalCtx); /* -const ActorInit Bg_Jya_Lift_InitVars = -{ +const ActorInit Bg_Jya_Lift_InitVars = { ACTOR_BG_JYA_LIFT, ACTORTYPE_BG, ROOM, diff --git a/src/overlays/actors/ovl_Bg_Jya_Lift/z_bg_jya_lift.h b/src/overlays/actors/ovl_Bg_Jya_Lift/z_bg_jya_lift.h index 02298abfa3..02ecd34b14 100644 --- a/src/overlays/actors/ovl_Bg_Jya_Lift/z_bg_jya_lift.h +++ b/src/overlays/actors/ovl_Bg_Jya_Lift/z_bg_jya_lift.h @@ -4,8 +4,7 @@ #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ Actor actor; /* 0x014C */ char unk_14C[0x20]; } BgJyaLift; // size = 0x016C 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 1aa895c33a..027aca3bfc 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 @@ -1,6 +1,6 @@ #include "z_bg_jya_megami.h" -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x00000000 void BgJyaMegami_Init(BgJyaMegami* this, GlobalContext* globalCtx); @@ -9,8 +9,7 @@ void BgJyaMegami_Update(BgJyaMegami* this, GlobalContext* globalCtx); void BgJyaMegami_Draw(BgJyaMegami* this, GlobalContext* globalCtx); /* -const ActorInit Bg_Jya_Megami_InitVars = -{ +const ActorInit Bg_Jya_Megami_InitVars = { ACTOR_BG_JYA_MEGAMI, ACTORTYPE_BG, ROOM, diff --git a/src/overlays/actors/ovl_Bg_Jya_Megami/z_bg_jya_megami.h b/src/overlays/actors/ovl_Bg_Jya_Megami/z_bg_jya_megami.h index fdb8f1cde5..8a6e850f1a 100644 --- a/src/overlays/actors/ovl_Bg_Jya_Megami/z_bg_jya_megami.h +++ b/src/overlays/actors/ovl_Bg_Jya_Megami/z_bg_jya_megami.h @@ -4,8 +4,7 @@ #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ Actor actor; /* 0x014C */ char unk_14C[0x1F0]; } BgJyaMegami; // size = 0x033C diff --git a/src/overlays/actors/ovl_Bg_Jya_Zurerukabe/z_bg_jya_zurerukabe.c b/src/overlays/actors/ovl_Bg_Jya_Zurerukabe/z_bg_jya_zurerukabe.c index f4077d719f..9ff3088d1a 100644 --- a/src/overlays/actors/ovl_Bg_Jya_Zurerukabe/z_bg_jya_zurerukabe.c +++ b/src/overlays/actors/ovl_Bg_Jya_Zurerukabe/z_bg_jya_zurerukabe.c @@ -1,6 +1,6 @@ #include "z_bg_jya_zurerukabe.h" -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x00000010 void BgJyaZurerukabe_Init(BgJyaZurerukabe* this, GlobalContext* globalCtx); @@ -9,8 +9,7 @@ void BgJyaZurerukabe_Update(BgJyaZurerukabe* this, GlobalContext* globalCtx); void BgJyaZurerukabe_Draw(BgJyaZurerukabe* this, GlobalContext* globalCtx); /* -const ActorInit Bg_Jya_Zurerukabe_InitVars = -{ +const ActorInit Bg_Jya_Zurerukabe_InitVars = { ACTOR_BG_JYA_ZURERUKABE, ACTORTYPE_BG, ROOM, diff --git a/src/overlays/actors/ovl_Bg_Jya_Zurerukabe/z_bg_jya_zurerukabe.h b/src/overlays/actors/ovl_Bg_Jya_Zurerukabe/z_bg_jya_zurerukabe.h index edac4a1d65..d12cfe1d14 100644 --- a/src/overlays/actors/ovl_Bg_Jya_Zurerukabe/z_bg_jya_zurerukabe.h +++ b/src/overlays/actors/ovl_Bg_Jya_Zurerukabe/z_bg_jya_zurerukabe.h @@ -4,8 +4,7 @@ #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ Actor actor; /* 0x014C */ char unk_14C[0x24]; } BgJyaZurerukabe; // size = 0x0170 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 5d94b4ff3e..f3dd3407eb 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 @@ -1,6 +1,6 @@ #include "z_bg_menkuri_eye.h" -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x00000020 void BgMenkuriEye_Init(BgMenkuriEye* this, GlobalContext* globalCtx); @@ -9,8 +9,7 @@ void BgMenkuriEye_Update(BgMenkuriEye* this, GlobalContext* globalCtx); void BgMenkuriEye_Draw(BgMenkuriEye* this, GlobalContext* globalCtx); /* -const ActorInit Bg_Menkuri_Eye_InitVars = -{ +const ActorInit Bg_Menkuri_Eye_InitVars = { ACTOR_BG_MENKURI_EYE, ACTORTYPE_BG, ROOM, @@ -30,4 +29,3 @@ const ActorInit Bg_Menkuri_Eye_InitVars = #pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Menkuri_Eye/BgMenkuriEye_Update.s") #pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Menkuri_Eye/BgMenkuriEye_Draw.s") - diff --git a/src/overlays/actors/ovl_Bg_Menkuri_Eye/z_bg_menkuri_eye.h b/src/overlays/actors/ovl_Bg_Menkuri_Eye/z_bg_menkuri_eye.h index dea622d054..9bbfa6ad00 100644 --- a/src/overlays/actors/ovl_Bg_Menkuri_Eye/z_bg_menkuri_eye.h +++ b/src/overlays/actors/ovl_Bg_Menkuri_Eye/z_bg_menkuri_eye.h @@ -4,8 +4,7 @@ #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ Actor actor; /* 0x014C */ char unk_14C[0x64]; } BgMenkuriEye; // size = 0x01B0 diff --git a/src/overlays/actors/ovl_Bg_Menkuri_Kaiten/z_bg_menkuri_kaiten.c b/src/overlays/actors/ovl_Bg_Menkuri_Kaiten/z_bg_menkuri_kaiten.c index 028d0046ba..12fe63b800 100644 --- a/src/overlays/actors/ovl_Bg_Menkuri_Kaiten/z_bg_menkuri_kaiten.c +++ b/src/overlays/actors/ovl_Bg_Menkuri_Kaiten/z_bg_menkuri_kaiten.c @@ -2,7 +2,7 @@ * File: z_bg_menkuri_kaiten.c * Overlay: Bg_Menkuri_Kaiten * Description: Large rotating stone ring used in Gerudo Training Grounds and Forest Temple. -*/ + */ #include #include @@ -10,14 +10,13 @@ extern u32 D_060038D0; extern u32 D_060042D8; -typedef struct -{ +typedef struct { /* 0x0000 */ Actor actor; - /* 0x014C */ u32 dynaPolyId; - /* 0x0150 */ char unk_150[0x14]; + /* 0x014C */ u32 dynaPolyId; + /* 0x0150 */ char unk_150[0x14]; } ActorMenkuriKaiten; // size = 0x0164 -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x00000030 static void Init(ActorMenkuriKaiten* this, GlobalContext* globalCtx); @@ -25,8 +24,7 @@ static void Destroy(ActorMenkuriKaiten* this, GlobalContext* globalCtx); static void Update(ActorMenkuriKaiten* this, GlobalContext* globalCtx); static void Draw(ActorMenkuriKaiten* this, GlobalContext* globalCtx); -const ActorInit Bg_Menkuri_Kaiten_InitVars = -{ +const ActorInit Bg_Menkuri_Kaiten_InitVars = { ACTOR_BG_MENKURI_KAITEN, ACTORTYPE_BG, ROOM, @@ -39,13 +37,11 @@ const ActorInit Bg_Menkuri_Kaiten_InitVars = (ActorFunc)Draw, }; -static InitChainEntry initChain[] = -{ - ICHAIN_VEC3F_DIV1000(scale, 100, ICHAIN_STOP) +static InitChainEntry initChain[] = { + ICHAIN_VEC3F_DIV1000(scale, 100, ICHAIN_STOP), }; -static void Init(ActorMenkuriKaiten* this, GlobalContext* globalCtx) -{ +static void Init(ActorMenkuriKaiten* this, GlobalContext* globalCtx) { s32 pad[2]; u32 local_c = 0; @@ -55,21 +51,17 @@ static void Init(ActorMenkuriKaiten* this, GlobalContext* globalCtx) this->dynaPolyId = DynaPolyInfo_RegisterActor(globalCtx, &globalCtx->colCtx.dyna, &this->actor, local_c); } -static void Destroy(ActorMenkuriKaiten* this, GlobalContext* globalCtx) -{ +static void Destroy(ActorMenkuriKaiten* this, GlobalContext* globalCtx) { DynaPolyInfo_Free(globalCtx, &globalCtx->colCtx.dyna, this->dynaPolyId); } -static void Update(ActorMenkuriKaiten* this, GlobalContext* globalCtx) -{ - if (!Flags_GetSwitch(globalCtx, this->actor.params) && func_80043590(&this->actor)) - { +static void Update(ActorMenkuriKaiten* this, GlobalContext* globalCtx) { + if (!Flags_GetSwitch(globalCtx, this->actor.params) && func_80043590(&this->actor)) { func_8002F974(&this->actor, 0x2024); this->actor.shape.rot.y += 0x80; } } -static void Draw(ActorMenkuriKaiten* this, GlobalContext* globalCtx) -{ - Draw_DListOpa(globalCtx, &D_060038D0); +static void Draw(ActorMenkuriKaiten* this, GlobalContext* globalCtx) { + Gfx_DrawDListOpa(globalCtx, &D_060038D0); } diff --git a/src/overlays/actors/ovl_Bg_Menkuri_Nisekabe/z_bg_menkuri_nisekabe.c b/src/overlays/actors/ovl_Bg_Menkuri_Nisekabe/z_bg_menkuri_nisekabe.c index e58040fc22..352621740f 100644 --- a/src/overlays/actors/ovl_Bg_Menkuri_Nisekabe/z_bg_menkuri_nisekabe.c +++ b/src/overlays/actors/ovl_Bg_Menkuri_Nisekabe/z_bg_menkuri_nisekabe.c @@ -2,17 +2,16 @@ * File: z_bg_menkuri_nisekabe.c * Overlay: ovl_Bg_Menkuri_Nisekabe * Description: False Stone Walls (Gerudo Training Grounds) -*/ + */ #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ Actor actor; } BgMenkuriNisekabe; // size = 0x014C -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x00000000 static void Init(BgMenkuriNisekabe* this, GlobalContext* globalCtx); @@ -20,8 +19,7 @@ static void Destroy(BgMenkuriNisekabe* this, GlobalContext* globalCtx); static void Update(BgMenkuriNisekabe* this, GlobalContext* globalCtx); static void Draw(BgMenkuriNisekabe* this, GlobalContext* globalCtx); -const ActorInit Bg_Menkuri_Nisekabe_InitVars = -{ +const ActorInit Bg_Menkuri_Nisekabe_InitVars = { ACTOR_BG_MENKURI_NISEKABE, ACTORTYPE_PROP, ROOM, @@ -34,44 +32,29 @@ const ActorInit Bg_Menkuri_Nisekabe_InitVars = (ActorFunc)Draw, }; -static u32 segmentAddr[] = -{ - 0x06002280, - 0x06002BC0 -}; +static u32 segmentAddr[] = { 0x06002280, 0x06002BC0 }; -static void Init(BgMenkuriNisekabe* this, GlobalContext* globalCtx) -{ +static void Init(BgMenkuriNisekabe* this, GlobalContext* globalCtx) { Actor_SetScale(&this->actor, 0.1f); } -static void Destroy(BgMenkuriNisekabe* this,GlobalContext* globalCtx) -{ - +static void Destroy(BgMenkuriNisekabe* this, GlobalContext* globalCtx) { } -static void Update(BgMenkuriNisekabe* this, GlobalContext* globalCtx) -{ - if (globalCtx->actorCtx.unk_03 != 0) - { +static void Update(BgMenkuriNisekabe* this, GlobalContext* globalCtx) { + if (globalCtx->actorCtx.unk_03 != 0) { this->actor.flags |= 0x80; - } - else - { + } else { this->actor.flags &= ~0x80; } } -static void Draw(BgMenkuriNisekabe* this, GlobalContext* globalCtx) -{ +static void Draw(BgMenkuriNisekabe* this, GlobalContext* globalCtx) { u32 index = this->actor.params & 0xFF; - if ((this->actor.flags & 0x80) == 0x80) - { - Draw_DListXlu(globalCtx, segmentAddr[index]); - } - else - { - Draw_DListOpa(globalCtx, segmentAddr[index]); + if ((this->actor.flags & 0x80) == 0x80) { + Gfx_DrawDListXlu(globalCtx, segmentAddr[index]); + } else { + Gfx_DrawDListOpa(globalCtx, segmentAddr[index]); } } diff --git a/src/overlays/actors/ovl_Bg_Mizu_Bwall/z_bg_mizu_bwall.c b/src/overlays/actors/ovl_Bg_Mizu_Bwall/z_bg_mizu_bwall.c index 89fbc967b9..924cc04af7 100644 --- a/src/overlays/actors/ovl_Bg_Mizu_Bwall/z_bg_mizu_bwall.c +++ b/src/overlays/actors/ovl_Bg_Mizu_Bwall/z_bg_mizu_bwall.c @@ -1,6 +1,6 @@ #include "z_bg_mizu_bwall.h" -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x00000010 void BgMizuBwall_Init(BgMizuBwall* this, GlobalContext* globalCtx); @@ -9,8 +9,7 @@ void BgMizuBwall_Update(BgMizuBwall* this, GlobalContext* globalCtx); void BgMizuBwall_Draw(BgMizuBwall* this, GlobalContext* globalCtx); /* -const ActorInit Bg_Mizu_Bwall_InitVars = -{ +const ActorInit Bg_Mizu_Bwall_InitVars = { ACTOR_BG_MIZU_BWALL, ACTORTYPE_BG, ROOM, diff --git a/src/overlays/actors/ovl_Bg_Mizu_Bwall/z_bg_mizu_bwall.h b/src/overlays/actors/ovl_Bg_Mizu_Bwall/z_bg_mizu_bwall.h index dba523ae17..c2cac4d00a 100644 --- a/src/overlays/actors/ovl_Bg_Mizu_Bwall/z_bg_mizu_bwall.h +++ b/src/overlays/actors/ovl_Bg_Mizu_Bwall/z_bg_mizu_bwall.h @@ -4,8 +4,7 @@ #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ Actor actor; /* 0x014C */ char unk_14C[0x170]; } BgMizuBwall; // size = 0x02BC diff --git a/src/overlays/actors/ovl_Bg_Mizu_Movebg/z_bg_mizu_movebg.c b/src/overlays/actors/ovl_Bg_Mizu_Movebg/z_bg_mizu_movebg.c index 999a3891cc..6b0911c0c1 100644 --- a/src/overlays/actors/ovl_Bg_Mizu_Movebg/z_bg_mizu_movebg.c +++ b/src/overlays/actors/ovl_Bg_Mizu_Movebg/z_bg_mizu_movebg.c @@ -1,6 +1,6 @@ #include "z_bg_mizu_movebg.h" -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x00000010 void BgMizuMovebg_Init(BgMizuMovebg* this, GlobalContext* globalCtx); @@ -9,8 +9,7 @@ void BgMizuMovebg_Update(BgMizuMovebg* this, GlobalContext* globalCtx); void BgMizuMovebg_Draw(BgMizuMovebg* this, GlobalContext* globalCtx); /* -const ActorInit Bg_Mizu_Movebg_InitVars = -{ +const ActorInit Bg_Mizu_Movebg_InitVars = { ACTOR_BG_MIZU_MOVEBG, ACTORTYPE_BG, ROOM, @@ -40,4 +39,3 @@ const ActorInit Bg_Mizu_Movebg_InitVars = #pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Mizu_Movebg/BgMizuMovebg_Update.s") #pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Mizu_Movebg/BgMizuMovebg_Draw.s") - diff --git a/src/overlays/actors/ovl_Bg_Mizu_Movebg/z_bg_mizu_movebg.h b/src/overlays/actors/ovl_Bg_Mizu_Movebg/z_bg_mizu_movebg.h index c1a9a9de84..6fc6e82178 100644 --- a/src/overlays/actors/ovl_Bg_Mizu_Movebg/z_bg_mizu_movebg.h +++ b/src/overlays/actors/ovl_Bg_Mizu_Movebg/z_bg_mizu_movebg.h @@ -4,8 +4,7 @@ #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ Actor actor; /* 0x014C */ char unk_14C[0x3C]; } BgMizuMovebg; // size = 0x0188 diff --git a/src/overlays/actors/ovl_Bg_Mizu_Shutter/z_bg_mizu_shutter.c b/src/overlays/actors/ovl_Bg_Mizu_Shutter/z_bg_mizu_shutter.c index f79aa0ab32..e2db36f0df 100644 --- a/src/overlays/actors/ovl_Bg_Mizu_Shutter/z_bg_mizu_shutter.c +++ b/src/overlays/actors/ovl_Bg_Mizu_Shutter/z_bg_mizu_shutter.c @@ -1,6 +1,6 @@ #include "z_bg_mizu_shutter.h" -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x00000010 void BgMizuShutter_Init(BgMizuShutter* this, GlobalContext* globalCtx); @@ -9,8 +9,7 @@ void BgMizuShutter_Update(BgMizuShutter* this, GlobalContext* globalCtx); void BgMizuShutter_Draw(BgMizuShutter* this, GlobalContext* globalCtx); /* -const ActorInit Bg_Mizu_Shutter_InitVars = -{ +const ActorInit Bg_Mizu_Shutter_InitVars = { ACTOR_BG_MIZU_SHUTTER, ACTORTYPE_PROP, ROOM, diff --git a/src/overlays/actors/ovl_Bg_Mizu_Shutter/z_bg_mizu_shutter.h b/src/overlays/actors/ovl_Bg_Mizu_Shutter/z_bg_mizu_shutter.h index 405de54870..0e046eff1e 100644 --- a/src/overlays/actors/ovl_Bg_Mizu_Shutter/z_bg_mizu_shutter.h +++ b/src/overlays/actors/ovl_Bg_Mizu_Shutter/z_bg_mizu_shutter.h @@ -4,8 +4,7 @@ #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ Actor actor; /* 0x014C */ char unk_14C[0x44]; } BgMizuShutter; // size = 0x0190 diff --git a/src/overlays/actors/ovl_Bg_Mizu_Uzu/z_bg_mizu_uzu.c b/src/overlays/actors/ovl_Bg_Mizu_Uzu/z_bg_mizu_uzu.c index b56662c90c..d4a4bebc28 100644 --- a/src/overlays/actors/ovl_Bg_Mizu_Uzu/z_bg_mizu_uzu.c +++ b/src/overlays/actors/ovl_Bg_Mizu_Uzu/z_bg_mizu_uzu.c @@ -2,18 +2,17 @@ * File: z_bg_mizu_uzu.c * Overlay: ovl_Bg_Mizu_Uzu * Description: Water Noise -*/ + */ #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ DynaPolyActor dyna; /* 0x0164 */ ActorFunc actionFunc; } BgMizuUzu; // size = 0x0168 -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x00000000 static void BgMizuUzu_Init(BgMizuUzu* this, GlobalContext* globalCtx); @@ -21,8 +20,7 @@ static void BgMizuUzu_Destroy(BgMizuUzu* this, GlobalContext* globalCtx); static void BgMizuUzu_Update(BgMizuUzu* this, GlobalContext* globalCtx); static void BgMizuUzu_Draw(BgMizuUzu* this, GlobalContext* globalCtx); -const ActorInit Bg_Mizu_Uzu_InitVars = -{ +const ActorInit Bg_Mizu_Uzu_InitVars = { ACTOR_BG_MIZU_UZU, ACTORTYPE_PROP, ROOM, @@ -35,19 +33,17 @@ const ActorInit Bg_Mizu_Uzu_InitVars = (ActorFunc)BgMizuUzu_Draw, }; -static InitChainEntry initChain[] = -{ +static InitChainEntry initChain[] = { ICHAIN_F32(unk_F8, 1000, ICHAIN_CONTINUE), ICHAIN_F32(unk_FC, 1000, ICHAIN_CONTINUE), - ICHAIN_VEC3F_DIV1000(scale, 100, ICHAIN_STOP) + ICHAIN_VEC3F_DIV1000(scale, 100, ICHAIN_STOP), }; extern u32 D_060074EC; static void func_8089F788(BgMizuUzu* this, GlobalContext* globalCtx); -static void BgMizuUzu_Init(BgMizuUzu* this, GlobalContext* globalCtx) -{ +static void BgMizuUzu_Init(BgMizuUzu* this, GlobalContext* globalCtx) { s32 pad[2]; s32 local_c = 0; Actor* thisx = &this->dyna.actor; @@ -58,32 +54,24 @@ static void BgMizuUzu_Init(BgMizuUzu* this, GlobalContext* globalCtx) this->actionFunc = func_8089F788; } -static void BgMizuUzu_Destroy(BgMizuUzu* this, GlobalContext* globalCtx) -{ +static void BgMizuUzu_Destroy(BgMizuUzu* this, GlobalContext* globalCtx) { DynaPolyInfo_Free(globalCtx, &globalCtx->colCtx.dyna, this->dyna.dynaPolyId); } -static void func_8089F788(BgMizuUzu* this, GlobalContext* globalCtx) -{ +static void func_8089F788(BgMizuUzu* this, GlobalContext* globalCtx) { Actor* thisx = &this->dyna.actor; - if (PLAYER->currentBoots == 1) - { + if (PLAYER->currentBoots == 1) { func_8003EBF8(globalCtx, &globalCtx->colCtx.dyna, this->dyna.dynaPolyId); - } - else - { + } else { func_8003EC50(globalCtx, &globalCtx->colCtx.dyna, this->dyna.dynaPolyId); } Audio_PlayActorSound2(thisx, 0x20CD); thisx->shape.rot.y += 0x1C0; } -static void BgMizuUzu_Update(BgMizuUzu* this, GlobalContext* globalCtx) -{ +static void BgMizuUzu_Update(BgMizuUzu* this, GlobalContext* globalCtx) { this->actionFunc(this, globalCtx); } -static void BgMizuUzu_Draw(BgMizuUzu* this, GlobalContext* globalCtx) -{ - +static void BgMizuUzu_Draw(BgMizuUzu* this, GlobalContext* globalCtx) { } 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 f7caeab759..542b4fe817 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 @@ -1,6 +1,6 @@ #include "z_bg_mizu_water.h" -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x00000030 void BgMizuWater_Init(BgMizuWater* this, GlobalContext* globalCtx); @@ -9,8 +9,7 @@ void BgMizuWater_Update(BgMizuWater* this, GlobalContext* globalCtx); void BgMizuWater_Draw(BgMizuWater* this, GlobalContext* globalCtx); /* -const ActorInit Bg_Mizu_Water_InitVars = -{ +const ActorInit Bg_Mizu_Water_InitVars = { ACTOR_BG_MIZU_WATER, ACTORTYPE_BG, ROOM, diff --git a/src/overlays/actors/ovl_Bg_Mizu_Water/z_bg_mizu_water.h b/src/overlays/actors/ovl_Bg_Mizu_Water/z_bg_mizu_water.h index e9c00f9802..1d90ac5def 100644 --- a/src/overlays/actors/ovl_Bg_Mizu_Water/z_bg_mizu_water.h +++ b/src/overlays/actors/ovl_Bg_Mizu_Water/z_bg_mizu_water.h @@ -4,8 +4,7 @@ #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ Actor actor; /* 0x014C */ char unk_14C[0x14]; } BgMizuWater; // size = 0x0160 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 0143568bf4..1d59fcd809 100644 --- a/src/overlays/actors/ovl_Bg_Mjin/z_bg_mjin.c +++ b/src/overlays/actors/ovl_Bg_Mjin/z_bg_mjin.c @@ -2,11 +2,11 @@ * File: z_bg_mjin.c * Overlay: ovl_Bg_Mjin * Description: Warp Pad -*/ + */ #include "z_bg_mjin.h" -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x00000010 static void BgMjin_SetupAction(BgMjin* this, ActorFunc actionFunc); @@ -17,8 +17,7 @@ static void func_808A0920(BgMjin* this, GlobalContext* globalCtx); static void BgMjin_Update(BgMjin* this, GlobalContext* globalCtx); static void BgMjin_Draw(BgMjin* this, GlobalContext* globalCtx); -const ActorInit Bg_Mjin_InitVars = -{ +const ActorInit Bg_Mjin_InitVars = { ACTOR_BG_MJIN, ACTORTYPE_BG, ROOM, @@ -36,51 +35,43 @@ extern u32 D_06000140; extern u32 D_06000330; extern u32 D_06000658; -static InitChainEntry initChain[] = -{ +static InitChainEntry initChain[] = { ICHAIN_VEC3F_DIV1000(scale, 1000, ICHAIN_CONTINUE), ICHAIN_F32(unk_F4, 4000, ICHAIN_CONTINUE), ICHAIN_F32(unk_F8, 400, ICHAIN_CONTINUE), - ICHAIN_F32(unk_FC, 400, ICHAIN_STOP) + ICHAIN_F32(unk_FC, 400, ICHAIN_STOP), }; -static s16 objectTbl[] = { OBJECT_MJIN_FLASH, OBJECT_MJIN_DARK, OBJECT_MJIN_FLAME, OBJECT_MJIN_ICE, OBJECT_MJIN_SOUL, OBJECT_MJIN_WIND }; +static s16 objectTbl[] = { OBJECT_MJIN_FLASH, OBJECT_MJIN_DARK, OBJECT_MJIN_FLAME, + OBJECT_MJIN_ICE, OBJECT_MJIN_SOUL, OBJECT_MJIN_WIND }; -static void BgMjin_SetupAction(BgMjin* this, ActorFunc actionFunc) -{ +static void BgMjin_SetupAction(BgMjin* this, ActorFunc actionFunc) { this->actionFunc = actionFunc; } -static void BgMjin_Init(BgMjin* this, GlobalContext* globalCtx) -{ +static void BgMjin_Init(BgMjin* this, GlobalContext* globalCtx) { Actor* thisx = &this->dyna.actor; s8 objBankIndex; Actor_ProcessInitChain(thisx, initChain); objBankIndex = Object_GetIndex(&globalCtx->objectCtx, (thisx->params != 0 ? OBJECT_MJIN : OBJECT_MJIN_OKA)); this->objBankIndex = objBankIndex; - if (objBankIndex < 0) - { + if (objBankIndex < 0) { Actor_Kill(thisx); - } - else - { + } else { BgMjin_SetupAction(this, &func_808A0850); } } -static void BgMjin_Destroy(BgMjin* this, GlobalContext* globalCtx) -{ +static void BgMjin_Destroy(BgMjin* this, GlobalContext* globalCtx) { DynaPolyInfo_Free(globalCtx, &globalCtx->colCtx.dyna, this->dyna.dynaPolyId); } -static void func_808A0850(BgMjin* this, GlobalContext* globalCtx) -{ +static void func_808A0850(BgMjin* this, GlobalContext* globalCtx) { u32 local_c; u32 collision; - if (Object_IsLoaded(&globalCtx->objectCtx, this->objBankIndex)) - { + if (Object_IsLoaded(&globalCtx->objectCtx, this->objBankIndex)) { local_c = 0; this->dyna.actor.flags &= ~0x10; this->dyna.actor.objBankIndex = this->objBankIndex; @@ -88,47 +79,41 @@ static void func_808A0850(BgMjin* this, GlobalContext* globalCtx) DynaPolyInfo_SetActorMove(&this->dyna.actor, 0); collision = this->dyna.actor.params != 0 ? &D_06000658 : &D_06000330; DynaPolyInfo_Alloc(collision, &local_c); - this->dyna.dynaPolyId = DynaPolyInfo_RegisterActor(globalCtx, &globalCtx->colCtx.dyna, &this->dyna.actor, local_c); + this->dyna.dynaPolyId = + DynaPolyInfo_RegisterActor(globalCtx, &globalCtx->colCtx.dyna, &this->dyna.actor, local_c); BgMjin_SetupAction(this, &func_808A0920); this->dyna.actor.draw = &BgMjin_Draw; } } -static void func_808A0920(BgMjin* this, GlobalContext* globalCtx) -{ - +static void func_808A0920(BgMjin* this, GlobalContext* globalCtx) { } -static void BgMjin_Update(BgMjin* this, GlobalContext* globalCtx) -{ +static void BgMjin_Update(BgMjin* this, GlobalContext* globalCtx) { this->actionFunc(this, globalCtx); } -static void BgMjin_Draw(BgMjin* this, GlobalContext* globalCtx) -{ +static void BgMjin_Draw(BgMjin* this, GlobalContext* globalCtx) { s32 objBankIndex; u32 dlist; GraphicsContext* gfxCtx = globalCtx->state.gfxCtx; - Gfx* gfxArr[4]; + Gfx* dispRefs[4]; s32 pad; - func_800C6AC4(gfxArr, globalCtx->state.gfxCtx, "../z_bg_mjin.c", 250); - if (this->dyna.actor.params != 0) - { + Graph_OpenDisps(dispRefs, globalCtx->state.gfxCtx, "../z_bg_mjin.c", 250); + if (this->dyna.actor.params != 0) { objBankIndex = Object_GetIndex(&globalCtx->objectCtx, objectTbl[this->dyna.actor.params - 1]); - if (objBankIndex >= 0) - { + if (objBankIndex >= 0) { gSegments[6] = PHYSICAL_TO_VIRTUAL(globalCtx->objectCtx.status[objBankIndex].segment); } gSPSegment(gfxCtx->polyOpa.p++, 0x08, SEGMENTED_TO_VIRTUAL(&D_06000000)); dlist = &D_06000330; - } - else - { + } else { dlist = &D_06000140; } func_80093D18(globalCtx->state.gfxCtx); - gSPMatrix(gfxCtx->polyOpa.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_bg_mjin.c", 285), G_MTX_NOPUSH | G_MTX_MODELVIEW | G_MTX_LOAD); + gSPMatrix(gfxCtx->polyOpa.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_bg_mjin.c", 285), + G_MTX_NOPUSH | G_MTX_MODELVIEW | G_MTX_LOAD); gSPDisplayList(gfxCtx->polyOpa.p++, dlist); - func_800C6B54(gfxArr, globalCtx->state.gfxCtx, "../z_bg_mjin.c", 288); + Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_bg_mjin.c", 288); } diff --git a/src/overlays/actors/ovl_Bg_Mjin/z_bg_mjin.h b/src/overlays/actors/ovl_Bg_Mjin/z_bg_mjin.h index eec94e3231..f3dc4e62e0 100644 --- a/src/overlays/actors/ovl_Bg_Mjin/z_bg_mjin.h +++ b/src/overlays/actors/ovl_Bg_Mjin/z_bg_mjin.h @@ -4,8 +4,7 @@ #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ DynaPolyActor dyna; /* 0x0164 */ s8 objBankIndex; /* 0x0168 */ ActorFunc actionFunc; 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 2aa818897f..d6e0e2401e 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 @@ -1,6 +1,6 @@ #include "z_bg_mori_bigst.h" -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x00000010 void BgMoriBigst_Init(BgMoriBigst* this, GlobalContext* globalCtx); @@ -8,8 +8,7 @@ void BgMoriBigst_Destroy(BgMoriBigst* this, GlobalContext* globalCtx); void BgMoriBigst_Update(BgMoriBigst* this, GlobalContext* globalCtx); /* -const ActorInit Bg_Mori_Bigst_InitVars = -{ +const ActorInit Bg_Mori_Bigst_InitVars = { ACTOR_BG_MORI_BIGST, ACTORTYPE_BG, ROOM, diff --git a/src/overlays/actors/ovl_Bg_Mori_Bigst/z_bg_mori_bigst.h b/src/overlays/actors/ovl_Bg_Mori_Bigst/z_bg_mori_bigst.h index 8e9b0736c3..b9d1185741 100644 --- a/src/overlays/actors/ovl_Bg_Mori_Bigst/z_bg_mori_bigst.h +++ b/src/overlays/actors/ovl_Bg_Mori_Bigst/z_bg_mori_bigst.h @@ -4,8 +4,7 @@ #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ Actor actor; /* 0x014C */ char unk_14C[0x20]; } BgMoriBigst; // size = 0x016C 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 5bfcd4a728..583d621a13 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 @@ -1,6 +1,6 @@ #include "z_bg_mori_elevator.h" -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x00000010 void BgMoriElevator_Init(BgMoriElevator* this, GlobalContext* globalCtx); @@ -8,8 +8,7 @@ void BgMoriElevator_Destroy(BgMoriElevator* this, GlobalContext* globalCtx); void BgMoriElevator_Update(BgMoriElevator* this, GlobalContext* globalCtx); /* -const ActorInit Bg_Mori_Elevator_InitVars = -{ +const ActorInit Bg_Mori_Elevator_InitVars = { ACTOR_BG_MORI_ELEVATOR, ACTORTYPE_BG, ROOM, diff --git a/src/overlays/actors/ovl_Bg_Mori_Elevator/z_bg_mori_elevator.h b/src/overlays/actors/ovl_Bg_Mori_Elevator/z_bg_mori_elevator.h index 25ab5be59d..6f082503f9 100644 --- a/src/overlays/actors/ovl_Bg_Mori_Elevator/z_bg_mori_elevator.h +++ b/src/overlays/actors/ovl_Bg_Mori_Elevator/z_bg_mori_elevator.h @@ -4,8 +4,7 @@ #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ Actor actor; /* 0x014C */ char unk_14C[0x28]; } BgMoriElevator; // size = 0x0174 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 f3df1a1d31..5bab5345f3 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 @@ -1,6 +1,6 @@ #include "z_bg_mori_hashigo.h" -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x00000000 void BgMoriHashigo_Init(BgMoriHashigo* this, GlobalContext* globalCtx); @@ -8,8 +8,7 @@ void BgMoriHashigo_Destroy(BgMoriHashigo* this, GlobalContext* globalCtx); void BgMoriHashigo_Update(BgMoriHashigo* this, GlobalContext* globalCtx); /* -const ActorInit Bg_Mori_Hashigo_InitVars = -{ +const ActorInit Bg_Mori_Hashigo_InitVars = { ACTOR_BG_MORI_HASHIGO, ACTORTYPE_BG, ROOM, diff --git a/src/overlays/actors/ovl_Bg_Mori_Hashigo/z_bg_mori_hashigo.h b/src/overlays/actors/ovl_Bg_Mori_Hashigo/z_bg_mori_hashigo.h index e776ac96fe..6136cb76d7 100644 --- a/src/overlays/actors/ovl_Bg_Mori_Hashigo/z_bg_mori_hashigo.h +++ b/src/overlays/actors/ovl_Bg_Mori_Hashigo/z_bg_mori_hashigo.h @@ -4,8 +4,7 @@ #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ Actor actor; /* 0x014C */ char unk_14C[0x84]; } BgMoriHashigo; // size = 0x01D0 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 c5e37ef0ab..3c6f144ee0 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 @@ -1,6 +1,6 @@ #include "z_bg_mori_hashira4.h" -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x00000010 void BgMoriHashira4_Init(BgMoriHashira4* this, GlobalContext* globalCtx); @@ -8,8 +8,7 @@ void BgMoriHashira4_Destroy(BgMoriHashira4* this, GlobalContext* globalCtx); void BgMoriHashira4_Update(BgMoriHashira4* this, GlobalContext* globalCtx); /* -const ActorInit Bg_Mori_Hashira4_InitVars = -{ +const ActorInit Bg_Mori_Hashira4_InitVars = { ACTOR_BG_MORI_HASHIRA4, ACTORTYPE_BG, ROOM, @@ -45,4 +44,3 @@ const ActorInit Bg_Mori_Hashira4_InitVars = #pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Mori_Hashira4/BgMoriHashira4_Update.s") #pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Mori_Hashira4/func_808A3484.s") - diff --git a/src/overlays/actors/ovl_Bg_Mori_Hashira4/z_bg_mori_hashira4.h b/src/overlays/actors/ovl_Bg_Mori_Hashira4/z_bg_mori_hashira4.h index 5a13463d31..bdaa4a740c 100644 --- a/src/overlays/actors/ovl_Bg_Mori_Hashira4/z_bg_mori_hashira4.h +++ b/src/overlays/actors/ovl_Bg_Mori_Hashira4/z_bg_mori_hashira4.h @@ -4,8 +4,7 @@ #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ Actor actor; /* 0x014C */ char unk_14C[0x20]; } BgMoriHashira4; // size = 0x016C 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 58b7f4c2f0..e2e73a086d 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 @@ -1,6 +1,6 @@ #include "z_bg_mori_hineri.h" -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x00000030 void BgMoriHineri_Init(BgMoriHineri* this, GlobalContext* globalCtx); @@ -8,8 +8,7 @@ void BgMoriHineri_Destroy(BgMoriHineri* this, GlobalContext* globalCtx); void BgMoriHineri_Update(BgMoriHineri* this, GlobalContext* globalCtx); /* -const ActorInit Bg_Mori_Hineri_InitVars = -{ +const ActorInit Bg_Mori_Hineri_InitVars = { ACTOR_BG_MORI_HINERI, ACTORTYPE_BG, ROOM, diff --git a/src/overlays/actors/ovl_Bg_Mori_Hineri/z_bg_mori_hineri.h b/src/overlays/actors/ovl_Bg_Mori_Hineri/z_bg_mori_hineri.h index 36f5973fcb..430556237b 100644 --- a/src/overlays/actors/ovl_Bg_Mori_Hineri/z_bg_mori_hineri.h +++ b/src/overlays/actors/ovl_Bg_Mori_Hineri/z_bg_mori_hineri.h @@ -4,8 +4,7 @@ #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ Actor actor; /* 0x014C */ char unk_14C[0x20]; } BgMoriHineri; // size = 0x016C 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 cf4c4cb668..4836532199 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 @@ -1,6 +1,6 @@ #include "z_bg_mori_idomizu.h" -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x00000030 void BgMoriIdomizu_Init(BgMoriIdomizu* this, GlobalContext* globalCtx); @@ -8,8 +8,7 @@ void BgMoriIdomizu_Destroy(BgMoriIdomizu* this, GlobalContext* globalCtx); void BgMoriIdomizu_Update(BgMoriIdomizu* this, GlobalContext* globalCtx); /* -const ActorInit Bg_Mori_Idomizu_InitVars = -{ +const ActorInit Bg_Mori_Idomizu_InitVars = { ACTOR_BG_MORI_IDOMIZU, ACTORTYPE_BG, ROOM, diff --git a/src/overlays/actors/ovl_Bg_Mori_Idomizu/z_bg_mori_idomizu.h b/src/overlays/actors/ovl_Bg_Mori_Idomizu/z_bg_mori_idomizu.h index 38f5302158..2f95a92828 100644 --- a/src/overlays/actors/ovl_Bg_Mori_Idomizu/z_bg_mori_idomizu.h +++ b/src/overlays/actors/ovl_Bg_Mori_Idomizu/z_bg_mori_idomizu.h @@ -4,8 +4,7 @@ #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ Actor actor; /* 0x014C */ char unk_14C[0x14]; } BgMoriIdomizu; // size = 0x0160 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 5bcd3a9df1..a8afb41487 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 @@ -1,6 +1,6 @@ #include "z_bg_mori_kaitenkabe.h" -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x00000000 void BgMoriKaitenkabe_Init(BgMoriKaitenkabe* this, GlobalContext* globalCtx); @@ -8,8 +8,7 @@ void BgMoriKaitenkabe_Destroy(BgMoriKaitenkabe* this, GlobalContext* globalCtx); void BgMoriKaitenkabe_Update(BgMoriKaitenkabe* this, GlobalContext* globalCtx); /* -const ActorInit Bg_Mori_Kaitenkabe_InitVars = -{ +const ActorInit Bg_Mori_Kaitenkabe_InitVars = { ACTOR_BG_MORI_KAITENKABE, ACTORTYPE_BG, ROOM, diff --git a/src/overlays/actors/ovl_Bg_Mori_Kaitenkabe/z_bg_mori_kaitenkabe.h b/src/overlays/actors/ovl_Bg_Mori_Kaitenkabe/z_bg_mori_kaitenkabe.h index 6f37fcaf39..16f34297e8 100644 --- a/src/overlays/actors/ovl_Bg_Mori_Kaitenkabe/z_bg_mori_kaitenkabe.h +++ b/src/overlays/actors/ovl_Bg_Mori_Kaitenkabe/z_bg_mori_kaitenkabe.h @@ -4,8 +4,7 @@ #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ Actor actor; /* 0x014C */ char unk_14C[0x3C]; } BgMoriKaitenkabe; // size = 0x0188 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 34fe919384..02b931495c 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 @@ -1,6 +1,6 @@ #include "z_bg_mori_rakkatenjo.h" -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x00000030 void BgMoriRakkatenjo_Init(BgMoriRakkatenjo* this, GlobalContext* globalCtx); @@ -8,8 +8,7 @@ void BgMoriRakkatenjo_Destroy(BgMoriRakkatenjo* this, GlobalContext* globalCtx); void BgMoriRakkatenjo_Update(BgMoriRakkatenjo* this, GlobalContext* globalCtx); /* -const ActorInit Bg_Mori_Rakkatenjo_InitVars = -{ +const ActorInit Bg_Mori_Rakkatenjo_InitVars = { ACTOR_BG_MORI_RAKKATENJO, ACTORTYPE_BG, ROOM, diff --git a/src/overlays/actors/ovl_Bg_Mori_Rakkatenjo/z_bg_mori_rakkatenjo.h b/src/overlays/actors/ovl_Bg_Mori_Rakkatenjo/z_bg_mori_rakkatenjo.h index 572069596f..a32e9aa375 100644 --- a/src/overlays/actors/ovl_Bg_Mori_Rakkatenjo/z_bg_mori_rakkatenjo.h +++ b/src/overlays/actors/ovl_Bg_Mori_Rakkatenjo/z_bg_mori_rakkatenjo.h @@ -4,8 +4,7 @@ #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ Actor actor; /* 0x014C */ char unk_14C[0x2C]; } BgMoriRakkatenjo; // size = 0x0178 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 3271de6882..7ac4e8e4af 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 @@ -1,6 +1,6 @@ #include "z_bg_po_event.h" -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x00000000 void BgPoEvent_Init(BgPoEvent* this, GlobalContext* globalCtx); @@ -9,8 +9,7 @@ void BgPoEvent_Update(BgPoEvent* this, GlobalContext* globalCtx); void BgPoEvent_Draw(BgPoEvent* this, GlobalContext* globalCtx); /* -const ActorInit Bg_Po_Event_InitVars = -{ +const ActorInit Bg_Po_Event_InitVars = { ACTOR_BG_PO_EVENT, ACTORTYPE_BG, ROOM, @@ -66,4 +65,3 @@ const ActorInit Bg_Po_Event_InitVars = #pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Po_Event/BgPoEvent_Update.s") #pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Po_Event/BgPoEvent_Draw.s") - diff --git a/src/overlays/actors/ovl_Bg_Po_Event/z_bg_po_event.h b/src/overlays/actors/ovl_Bg_Po_Event/z_bg_po_event.h index ed3fb4b4a3..26e67f46c5 100644 --- a/src/overlays/actors/ovl_Bg_Po_Event/z_bg_po_event.h +++ b/src/overlays/actors/ovl_Bg_Po_Event/z_bg_po_event.h @@ -4,8 +4,7 @@ #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ Actor actor; /* 0x014C */ char unk_14C[0xFC]; } BgPoEvent; // size = 0x0248 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 0384263531..2fd1e75f16 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 @@ -1,6 +1,6 @@ #include "z_bg_po_syokudai.h" -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x00000000 void BgPoSyokudai_Init(BgPoSyokudai* this, GlobalContext* globalCtx); @@ -9,8 +9,7 @@ void BgPoSyokudai_Update(BgPoSyokudai* this, GlobalContext* globalCtx); void BgPoSyokudai_Draw(BgPoSyokudai* this, GlobalContext* globalCtx); /* -const ActorInit Bg_Po_Syokudai_InitVars = -{ +const ActorInit Bg_Po_Syokudai_InitVars = { ACTOR_BG_PO_SYOKUDAI, ACTORTYPE_PROP, ROOM, diff --git a/src/overlays/actors/ovl_Bg_Po_Syokudai/z_bg_po_syokudai.h b/src/overlays/actors/ovl_Bg_Po_Syokudai/z_bg_po_syokudai.h index 8f230a312a..ae63a79d35 100644 --- a/src/overlays/actors/ovl_Bg_Po_Syokudai/z_bg_po_syokudai.h +++ b/src/overlays/actors/ovl_Bg_Po_Syokudai/z_bg_po_syokudai.h @@ -4,8 +4,7 @@ #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ Actor actor; /* 0x014C */ char unk_14C[0x64]; } BgPoSyokudai; // size = 0x01B0 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 e870466ddf..ad13f0c331 100644 --- a/src/overlays/actors/ovl_Bg_Pushbox/z_bg_pushbox.c +++ b/src/overlays/actors/ovl_Bg_Pushbox/z_bg_pushbox.c @@ -2,11 +2,11 @@ * File: z_bg_pushbox.c * Overlay: ovl_Bg_Pushbox * Description: -*/ + */ #include "z_bg_pushbox.h" -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x00000000 static void func_808A8AE0(BgPushbox* this, ActorFunc actionFunc); @@ -16,8 +16,7 @@ static void func_808A8BAC(BgPushbox* this, GlobalContext* globalCtx); static void BgPushbox_Update(BgPushbox* this, GlobalContext* globalCtx); static void BgPushbox_Draw(BgPushbox* this, GlobalContext* globalCtx); -const ActorInit Bg_Pushbox_InitVars = -{ +const ActorInit Bg_Pushbox_InitVars = { ACTOR_BG_PUSHBOX, ACTORTYPE_BG, ROOM, @@ -33,18 +32,15 @@ const ActorInit Bg_Pushbox_InitVars = extern u32 D_06000000; extern u32 D_06000350; -static InitChainEntry initChain[] = -{ - ICHAIN_F32_DIV1000(gravity, -2000, ICHAIN_STOP) +static InitChainEntry initChain[] = { + ICHAIN_F32_DIV1000(gravity, -2000, ICHAIN_STOP), }; -static void func_808A8AE0(BgPushbox* this, ActorFunc actionFunc) -{ +static void func_808A8AE0(BgPushbox* this, ActorFunc actionFunc) { this->actionFunc = actionFunc; } -static void BgPushbox_Init(BgPushbox* this, GlobalContext* globalCtx) -{ +static void BgPushbox_Init(BgPushbox* this, GlobalContext* globalCtx) { s32 pad[2]; u32 local_c = 0; Actor* thisx = &this->dyna.actor; @@ -57,38 +53,34 @@ static void BgPushbox_Init(BgPushbox* this, GlobalContext* globalCtx) func_808A8AE0(this, &func_808A8BAC); } -static void BgPushbox_Destroy(BgPushbox* this, GlobalContext* globalCtx) -{ +static void BgPushbox_Destroy(BgPushbox* this, GlobalContext* globalCtx) { DynaPolyInfo_Free(globalCtx, &globalCtx->colCtx.dyna, this->dyna.dynaPolyId); } -static void func_808A8BAC(BgPushbox* this, GlobalContext* globalCtx) -{ +static void func_808A8BAC(BgPushbox* this, GlobalContext* globalCtx) { Actor* thisx = &this->dyna.actor; thisx->speedXZ += this->dyna.unk_150 * 0.2f; - thisx->speedXZ = (thisx->speedXZ < -1.0f) ? -1.0f : - ((thisx->speedXZ > 1.0f) ? 1.0f : - thisx->speedXZ); + thisx->speedXZ = (thisx->speedXZ < -1.0f) ? -1.0f : ((thisx->speedXZ > 1.0f) ? 1.0f : thisx->speedXZ); Math_ApproxF(&thisx->speedXZ, 0.0f, 0.2f); thisx->posRot.rot.y = this->dyna.unk_158; Actor_MoveForward(thisx); func_8002E4B4(globalCtx, thisx, 20.0f, 40.0f, 40.0f, 0x1D); } -static void BgPushbox_Update(BgPushbox* this, GlobalContext* globalCtx){ +static void BgPushbox_Update(BgPushbox* this, GlobalContext* globalCtx) { this->actionFunc(this, globalCtx); func_8002DF90(this); } -static void BgPushbox_Draw(BgPushbox* this, GlobalContext* globalCtx) -{ +static void BgPushbox_Draw(BgPushbox* this, GlobalContext* globalCtx) { GraphicsContext* gfxCtx = globalCtx->state.gfxCtx; - Gfx* gfxArr[5]; + Gfx* dispRefs[5]; - func_800C6AC4(gfxArr, globalCtx->state.gfxCtx, "../z_bg_pushbox.c", 263); + Graph_OpenDisps(dispRefs, globalCtx->state.gfxCtx, "../z_bg_pushbox.c", 263); func_80093D18(globalCtx->state.gfxCtx); - gSPMatrix(gfxCtx->polyOpa.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_bg_pushbox.c", 269), G_MTX_NOPUSH | G_MTX_MODELVIEW | G_MTX_LOAD); + gSPMatrix(gfxCtx->polyOpa.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_bg_pushbox.c", 269), + G_MTX_NOPUSH | G_MTX_MODELVIEW | G_MTX_LOAD); gSPDisplayList(gfxCtx->polyOpa.p++, &D_06000000); - func_800C6B54(gfxArr, globalCtx->state.gfxCtx, "../z_bg_pushbox.c", 272); + Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_bg_pushbox.c", 272); } diff --git a/src/overlays/actors/ovl_Bg_Pushbox/z_bg_pushbox.h b/src/overlays/actors/ovl_Bg_Pushbox/z_bg_pushbox.h index 02c7007ed8..2eaa88edeb 100644 --- a/src/overlays/actors/ovl_Bg_Pushbox/z_bg_pushbox.h +++ b/src/overlays/actors/ovl_Bg_Pushbox/z_bg_pushbox.h @@ -4,8 +4,7 @@ #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ DynaPolyActor dyna; /* 0x0164 */ ActorFunc actionFunc; } BgPushbox; // size = 0x0168 diff --git a/src/overlays/actors/ovl_Bg_Relay_Objects/z_bg_relay_objects.c b/src/overlays/actors/ovl_Bg_Relay_Objects/z_bg_relay_objects.c index 5a8da07ce2..19a950888a 100644 --- a/src/overlays/actors/ovl_Bg_Relay_Objects/z_bg_relay_objects.c +++ b/src/overlays/actors/ovl_Bg_Relay_Objects/z_bg_relay_objects.c @@ -1,6 +1,6 @@ #include "z_bg_relay_objects.h" -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x00000010 void BgRelayObjects_Init(BgRelayObjects* this, GlobalContext* globalCtx); @@ -9,8 +9,7 @@ void BgRelayObjects_Update(BgRelayObjects* this, GlobalContext* globalCtx); void BgRelayObjects_Draw(BgRelayObjects* this, GlobalContext* globalCtx); /* -const ActorInit Bg_Relay_Objects_InitVars = -{ +const ActorInit Bg_Relay_Objects_InitVars = { ACTOR_BG_RELAY_OBJECTS, ACTORTYPE_BG, ROOM, diff --git a/src/overlays/actors/ovl_Bg_Relay_Objects/z_bg_relay_objects.h b/src/overlays/actors/ovl_Bg_Relay_Objects/z_bg_relay_objects.h index 1552ff38cb..bb12bea5a8 100644 --- a/src/overlays/actors/ovl_Bg_Relay_Objects/z_bg_relay_objects.h +++ b/src/overlays/actors/ovl_Bg_Relay_Objects/z_bg_relay_objects.h @@ -4,8 +4,7 @@ #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ Actor actor; /* 0x014C */ char unk_14C[0x20]; } BgRelayObjects; // size = 0x016C diff --git a/src/overlays/actors/ovl_Bg_Spot00_Break/z_bg_spot00_break.c b/src/overlays/actors/ovl_Bg_Spot00_Break/z_bg_spot00_break.c index 80ca6b1111..d23cc9a054 100644 --- a/src/overlays/actors/ovl_Bg_Spot00_Break/z_bg_spot00_break.c +++ b/src/overlays/actors/ovl_Bg_Spot00_Break/z_bg_spot00_break.c @@ -2,20 +2,19 @@ * File: z_bg_spot00_break.c * Overlay: ovl_Bg_Spot00_Break * Description: Broken drawbridge in Hyrule Field. -*/ + */ #include #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ Actor actor; - /* 0x014C */ u32 dynaPolyId; - /* 0x0150 */ char unk_150[0x14]; + /* 0x014C */ u32 dynaPolyId; + /* 0x0150 */ char unk_150[0x14]; } ActorSpot00Break; // size = 0x0164 -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x00000000 static void Init(ActorSpot00Break* this, GlobalContext* globalCtx); @@ -23,8 +22,7 @@ static void Destroy(ActorSpot00Break* this, GlobalContext* globalCtx); static void Update(ActorSpot00Break* this, GlobalContext* globalCtx); static void Draw(ActorSpot00Break* this, GlobalContext* globalCtx); -const ActorInit Bg_Spot00_Break_InitVars = -{ +const ActorInit Bg_Spot00_Break_InitVars = { ACTOR_BG_SPOT00_BREAK, ACTORTYPE_PROP, ROOM, @@ -37,62 +35,49 @@ const ActorInit Bg_Spot00_Break_InitVars = (ActorFunc)Draw, }; -static InitChainEntry initChain[] = -{ +static InitChainEntry initChain[] = { ICHAIN_F32(unk_F8, 1200, ICHAIN_CONTINUE), ICHAIN_F32(unk_FC, 1200, ICHAIN_CONTINUE), ICHAIN_F32(unk_F4, 2000, ICHAIN_CONTINUE), - ICHAIN_VEC3F_DIV1000(scale, 1000, ICHAIN_STOP) + ICHAIN_VEC3F_DIV1000(scale, 1000, ICHAIN_STOP), }; -extern D_06000AF0; //segmented address: 0x06000AF0 -extern D_06000908; //segmented address: 0x06000908 -extern D_06000980; //segmented address: 0x06000980 -extern D_06000440; //segmented address: 0x06000440 +extern D_06000AF0; // segmented address: 0x06000AF0 +extern D_06000908; // segmented address: 0x06000908 +extern D_06000980; // segmented address: 0x06000980 +extern D_06000440; // segmented address: 0x06000440 -static void Init(ActorSpot00Break* this, GlobalContext* globalCtx) -{ +static void Init(ActorSpot00Break* this, GlobalContext* globalCtx) { s32 pad[2]; u32 local_c = 0; Actor_ProcessInitChain(&this->actor, initChain); DynaPolyInfo_SetActorMove(&this->actor, 0); - if (this->actor.params == 1) - { + if (this->actor.params == 1) { DynaPolyInfo_Alloc(&D_06000AF0, &local_c); - } - else - { + } else { DynaPolyInfo_Alloc(&D_06000908, &local_c); } this->dynaPolyId = DynaPolyInfo_RegisterActor(globalCtx, &globalCtx->colCtx.dyna, &this->actor, local_c); - if (LINK_IS_CHILD) - { + if (LINK_IS_CHILD) { Actor_Kill(&this->actor); } } -static void Destroy(ActorSpot00Break* this, GlobalContext* globalCtx) -{ +static void Destroy(ActorSpot00Break* this, GlobalContext* globalCtx) { DynaPolyInfo_Free(globalCtx, &globalCtx->colCtx.dyna, this->dynaPolyId); } -static void Update(ActorSpot00Break* this, GlobalContext* globalCtx) -{ - +static void Update(ActorSpot00Break* this, GlobalContext* globalCtx) { } -static void Draw(ActorSpot00Break* this, GlobalContext* globalCtx) -{ - if (this->actor.params == 1) - { - Draw_DListOpa(globalCtx, &D_06000980); - } - else - { - Draw_DListOpa(globalCtx, &D_06000440); +static void Draw(ActorSpot00Break* this, GlobalContext* globalCtx) { + if (this->actor.params == 1) { + Gfx_DrawDListOpa(globalCtx, &D_06000980); + } else { + Gfx_DrawDListOpa(globalCtx, &D_06000440); } } diff --git a/src/overlays/actors/ovl_Bg_Spot00_Hanebasi/z_bg_spot00_hanebasi.c b/src/overlays/actors/ovl_Bg_Spot00_Hanebasi/z_bg_spot00_hanebasi.c index ff9f65d0dd..69f4180bbb 100644 --- a/src/overlays/actors/ovl_Bg_Spot00_Hanebasi/z_bg_spot00_hanebasi.c +++ b/src/overlays/actors/ovl_Bg_Spot00_Hanebasi/z_bg_spot00_hanebasi.c @@ -1,6 +1,6 @@ #include "z_bg_spot00_hanebasi.h" -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x00000010 void BgSpot00Hanebasi_Init(BgSpot00Hanebasi* this, GlobalContext* globalCtx); @@ -9,8 +9,7 @@ void BgSpot00Hanebasi_Update(BgSpot00Hanebasi* this, GlobalContext* globalCtx); void BgSpot00Hanebasi_Draw(BgSpot00Hanebasi* this, GlobalContext* globalCtx); /* -const ActorInit Bg_Spot00_Hanebasi_InitVars = -{ +const ActorInit Bg_Spot00_Hanebasi_InitVars = { ACTOR_BG_SPOT00_HANEBASI, ACTORTYPE_BG, ROOM, diff --git a/src/overlays/actors/ovl_Bg_Spot00_Hanebasi/z_bg_spot00_hanebasi.h b/src/overlays/actors/ovl_Bg_Spot00_Hanebasi/z_bg_spot00_hanebasi.h index 76b7cebf0b..b0349e7894 100644 --- a/src/overlays/actors/ovl_Bg_Spot00_Hanebasi/z_bg_spot00_hanebasi.h +++ b/src/overlays/actors/ovl_Bg_Spot00_Hanebasi/z_bg_spot00_hanebasi.h @@ -4,8 +4,7 @@ #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ Actor actor; /* 0x014C */ char unk_14C[0x34]; } BgSpot00Hanebasi; // size = 0x0180 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 a9cd342a23..39a02d7f9d 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 @@ -2,13 +2,12 @@ * File: z_bg_spot01_fusya.c * Overlay: Bg_Spot01_Fusya * Description: Windmill Sails -*/ + */ #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ Actor actor; /* 0x014C */ ActorFunc actionFunc; /* 0x0150 */ char unk_150[0x4]; @@ -17,7 +16,7 @@ typedef struct /* 0x015C */ f32 unk_15C; } BgSpot01Fusya; // size = 0x0160 -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x00000010 static void BgSpot01Fusya_Init(BgSpot01Fusya* this, GlobalContext* globalCtx); @@ -27,8 +26,7 @@ static void BgSpot01Fusya_Draw(BgSpot01Fusya* this, GlobalContext* globalCtx); static void func_808AAA50(BgSpot01Fusya* this, GlobalContext* globalCtx); -const ActorInit Bg_Spot01_Fusya_InitVars = -{ +const ActorInit Bg_Spot01_Fusya_InitVars = { ACTOR_BG_SPOT01_FUSYA, ACTORTYPE_BG, ROOM, @@ -41,45 +39,37 @@ const ActorInit Bg_Spot01_Fusya_InitVars = (ActorFunc)BgSpot01Fusya_Draw, }; -static InitChainEntry initChain[] = -{ +static InitChainEntry initChain[] = { ICHAIN_VEC3F_DIV1000(scale, 100, ICHAIN_CONTINUE), ICHAIN_F32(unk_F4, 12800, ICHAIN_CONTINUE), ICHAIN_F32(unk_F8, 1300, ICHAIN_CONTINUE), - ICHAIN_F32(unk_FC, 1300, ICHAIN_STOP) + ICHAIN_F32(unk_FC, 1300, ICHAIN_STOP), }; extern u32 D_06000100; -static void BgSpot01Fusya_SetupAction(BgSpot01Fusya* this, ActorFunc actionFunc) -{ +static void BgSpot01Fusya_SetupAction(BgSpot01Fusya* this, ActorFunc actionFunc) { this->actionFunc = actionFunc; } -static void BgSpot01Fusya_Init(BgSpot01Fusya* this, GlobalContext* globalCtx) -{ +static void BgSpot01Fusya_Init(BgSpot01Fusya* this, GlobalContext* globalCtx) { Actor_ProcessInitChain(&this->actor, initChain); this->unk_154 = 100.0f; this->unk_158 = 100.0f; this->unk_15C = 0.5f; - if (gSaveContext.scene_setup_index < 4) - { + if (gSaveContext.scene_setup_index < 4) { gSaveContext.event_chk_inf[6] &= 0xFFDF; } BgSpot01Fusya_SetupAction(this, func_808AAA50); } -static void BgSpot01Fusya_Destroy(BgSpot01Fusya* this, GlobalContext* globalCtx) -{ - +static void BgSpot01Fusya_Destroy(BgSpot01Fusya* this, GlobalContext* globalCtx) { } -static void func_808AAA50(BgSpot01Fusya* this, GlobalContext* globalCtx) -{ +static void func_808AAA50(BgSpot01Fusya* this, GlobalContext* globalCtx) { f32 temp; Actor* thisx = &this->actor; - if (gSaveContext.event_chk_inf[6] & 0x20) - { + if (gSaveContext.event_chk_inf[6] & 0x20) { this->unk_158 = 1800.0f; } thisx->shape.rot.z += this->unk_154; @@ -88,22 +78,20 @@ static void func_808AAA50(BgSpot01Fusya* this, GlobalContext* globalCtx) Math_SmoothScaleMaxF(&this->unk_154, this->unk_158, this->unk_15C, 100.0f); } -static void BgSpot01Fusya_Update(BgSpot01Fusya* this, GlobalContext* globalCtx) -{ +static void BgSpot01Fusya_Update(BgSpot01Fusya* this, GlobalContext* globalCtx) { this->actionFunc(this, globalCtx); } -static void BgSpot01Fusya_Draw(BgSpot01Fusya* this, GlobalContext* globalCtx) -{ +static void BgSpot01Fusya_Draw(BgSpot01Fusya* this, GlobalContext* globalCtx) { GraphicsContext* gfxCtx = globalCtx->state.gfxCtx; - Gfx* gfxArr[4]; + Gfx* dispRefs[4]; - func_800C6AC4(gfxArr, globalCtx->state.gfxCtx, "../z_bg_spot01_fusya.c", 210); + Graph_OpenDisps(dispRefs, globalCtx->state.gfxCtx, "../z_bg_spot01_fusya.c", 210); func_80093D18(globalCtx->state.gfxCtx); gSPMatrix(gfxCtx->polyOpa.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_bg_spot01_fusya.c", 214), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPDisplayList(gfxCtx->polyOpa.p++, &D_06000100); - func_800C6B54(gfxArr, globalCtx->state.gfxCtx, "../z_bg_spot01_fusya.c", 219); + Graph_CloseDisps(dispRefs, 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 9e80e4d085..d1db93f4af 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 @@ -1,6 +1,6 @@ #include "z_bg_spot01_idohashira.h" -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x00000010 void BgSpot01Idohashira_Init(BgSpot01Idohashira* this, GlobalContext* globalCtx); @@ -9,8 +9,7 @@ void BgSpot01Idohashira_Update(BgSpot01Idohashira* this, GlobalContext* globalCt void BgSpot01Idohashira_Draw(BgSpot01Idohashira* this, GlobalContext* globalCtx); /* -const ActorInit Bg_Spot01_Idohashira_InitVars = -{ +const ActorInit Bg_Spot01_Idohashira_InitVars = { ACTOR_BG_SPOT01_IDOHASHIRA, ACTORTYPE_PROP, ROOM, diff --git a/src/overlays/actors/ovl_Bg_Spot01_Idohashira/z_bg_spot01_idohashira.h b/src/overlays/actors/ovl_Bg_Spot01_Idohashira/z_bg_spot01_idohashira.h index 73ac76f1dd..e828535164 100644 --- a/src/overlays/actors/ovl_Bg_Spot01_Idohashira/z_bg_spot01_idohashira.h +++ b/src/overlays/actors/ovl_Bg_Spot01_Idohashira/z_bg_spot01_idohashira.h @@ -4,8 +4,7 @@ #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ Actor actor; /* 0x014C */ char unk_14C[0x28]; } BgSpot01Idohashira; // size = 0x0174 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 4a7357fae8..4c20b31221 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 @@ -1,6 +1,6 @@ #include "z_bg_spot01_idomizu.h" -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x00000020 void BgSpot01Idomizu_Init(BgSpot01Idomizu* this, GlobalContext* globalCtx); @@ -9,8 +9,7 @@ void BgSpot01Idomizu_Update(BgSpot01Idomizu* this, GlobalContext* globalCtx); void BgSpot01Idomizu_Draw(BgSpot01Idomizu* this, GlobalContext* globalCtx); /* -const ActorInit Bg_Spot01_Idomizu_InitVars = -{ +const ActorInit Bg_Spot01_Idomizu_InitVars = { ACTOR_BG_SPOT01_IDOMIZU, ACTORTYPE_BG, ROOM, diff --git a/src/overlays/actors/ovl_Bg_Spot01_Idomizu/z_bg_spot01_idomizu.h b/src/overlays/actors/ovl_Bg_Spot01_Idomizu/z_bg_spot01_idomizu.h index 7735b626d4..e2a45cc9e5 100644 --- a/src/overlays/actors/ovl_Bg_Spot01_Idomizu/z_bg_spot01_idomizu.h +++ b/src/overlays/actors/ovl_Bg_Spot01_Idomizu/z_bg_spot01_idomizu.h @@ -4,8 +4,7 @@ #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ Actor actor; /* 0x014C */ char unk_14C[0xC]; } BgSpot01Idomizu; // size = 0x0158 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 7c6ef6c872..84ba76bb23 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 @@ -2,18 +2,17 @@ * File: z_bg_spot01_idosoko.c * Overlay: Bg_Spot01_Idosoko * Description: Stone blocking entrance to Bottom of the Well -*/ + */ #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ DynaPolyActor dyna; /* 0x0164 */ ActorFunc actionFunc; } BgSpot01Idosoko; // size = 0x0168 -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x00000010 static void BgSpot01Idosoko_Init(BgSpot01Idosoko* this, GlobalContext* globalCtx); @@ -23,8 +22,7 @@ static void BgSpot01Idosoko_Draw(BgSpot01Idosoko* this, GlobalContext* globalCtx static void func_808ABF54(BgSpot01Idosoko* this, GlobalContext* globalCtx); -const ActorInit Bg_Spot01_Idosoko_InitVars = -{ +const ActorInit Bg_Spot01_Idosoko_InitVars = { ACTOR_BG_SPOT01_IDOSOKO, ACTORTYPE_BG, ROOM, @@ -37,20 +35,17 @@ const ActorInit Bg_Spot01_Idosoko_InitVars = (ActorFunc)BgSpot01Idosoko_Draw, }; -static InitChainEntry initChain[] = -{ - ICHAIN_VEC3F_DIV1000(scale, 100, ICHAIN_STOP) +static InitChainEntry initChain[] = { + ICHAIN_VEC3F_DIV1000(scale, 100, ICHAIN_STOP), }; extern u32 D_06003C64; -static void BgSpot01Idosoko_SetupAction(BgSpot01Idosoko* this, ActorFunc actionFunc) -{ +static void BgSpot01Idosoko_SetupAction(BgSpot01Idosoko* this, ActorFunc actionFunc) { this->actionFunc = actionFunc; } -static void BgSpot01Idosoko_Init(BgSpot01Idosoko* this, GlobalContext* globalCtx) -{ +static void BgSpot01Idosoko_Init(BgSpot01Idosoko* this, GlobalContext* globalCtx) { s32 pad[2]; s32 local_c = 0; Actor* thisx = &this->dyna.actor; @@ -58,44 +53,36 @@ static void BgSpot01Idosoko_Init(BgSpot01Idosoko* this, GlobalContext* globalCtx Actor_ProcessInitChain(thisx, initChain); DynaPolyInfo_Alloc(&D_06003C64, &local_c); this->dyna.dynaPolyId = DynaPolyInfo_RegisterActor(globalCtx, &globalCtx->colCtx.dyna, thisx, local_c); - if (LINK_IS_CHILD) - { + if (LINK_IS_CHILD) { Actor_Kill(thisx); - } - else - { + } else { BgSpot01Idosoko_SetupAction(this, func_808ABF54); } } -static void BgSpot01Idosoko_Destroy(BgSpot01Idosoko* this, GlobalContext* globalCtx) -{ +static void BgSpot01Idosoko_Destroy(BgSpot01Idosoko* this, GlobalContext* globalCtx) { DynaPolyInfo_Free(globalCtx, &globalCtx->colCtx.dyna, this->dyna.dynaPolyId); } -static void func_808ABF54(BgSpot01Idosoko* this, GlobalContext* globalCtx) -{ - +static void func_808ABF54(BgSpot01Idosoko* this, GlobalContext* globalCtx) { } -static void BgSpot01Idosoko_Update(BgSpot01Idosoko* this, GlobalContext* globalCtx) -{ +static void BgSpot01Idosoko_Update(BgSpot01Idosoko* this, GlobalContext* globalCtx) { this->actionFunc(this, globalCtx); } extern u32 D_06003B20; -static void BgSpot01Idosoko_Draw(BgSpot01Idosoko* this, GlobalContext* globalCtx) -{ +static void BgSpot01Idosoko_Draw(BgSpot01Idosoko* this, GlobalContext* globalCtx) { GraphicsContext* gfxCtx = globalCtx->state.gfxCtx; - Gfx* gfxArr[4]; + Gfx* dispRefs[4]; - func_800C6AC4(gfxArr, globalCtx->state.gfxCtx, "../z_bg_spot01_idosoko.c", 162); + Graph_OpenDisps(dispRefs, globalCtx->state.gfxCtx, "../z_bg_spot01_idosoko.c", 162); func_80093D18(globalCtx->state.gfxCtx); gSPMatrix(gfxCtx->polyOpa.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_bg_spot01_idosoko.c", 166), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPDisplayList(gfxCtx->polyOpa.p++, &D_06003B20); - func_800C6B54(gfxArr, globalCtx->state.gfxCtx, "../z_bg_spot01_idosoko.c", 171); + Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_bg_spot01_idosoko.c", 171); } diff --git a/src/overlays/actors/ovl_Bg_Spot01_Objects2/z_bg_spot01_objects2.c b/src/overlays/actors/ovl_Bg_Spot01_Objects2/z_bg_spot01_objects2.c index db61823bc2..7ca2db2abb 100644 --- a/src/overlays/actors/ovl_Bg_Spot01_Objects2/z_bg_spot01_objects2.c +++ b/src/overlays/actors/ovl_Bg_Spot01_Objects2/z_bg_spot01_objects2.c @@ -1,6 +1,6 @@ #include "z_bg_spot01_objects2.h" -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x00000010 void BgSpot01Objects2_Init(BgSpot01Objects2* this, GlobalContext* globalCtx); @@ -8,8 +8,7 @@ void BgSpot01Objects2_Destroy(BgSpot01Objects2* this, GlobalContext* globalCtx); void BgSpot01Objects2_Update(BgSpot01Objects2* this, GlobalContext* globalCtx); /* -const ActorInit Bg_Spot01_Objects2_InitVars = -{ +const ActorInit Bg_Spot01_Objects2_InitVars = { ACTOR_BG_SPOT01_OBJECTS2, ACTORTYPE_BG, ROOM, diff --git a/src/overlays/actors/ovl_Bg_Spot01_Objects2/z_bg_spot01_objects2.h b/src/overlays/actors/ovl_Bg_Spot01_Objects2/z_bg_spot01_objects2.h index 2974744384..500a119ecb 100644 --- a/src/overlays/actors/ovl_Bg_Spot01_Objects2/z_bg_spot01_objects2.h +++ b/src/overlays/actors/ovl_Bg_Spot01_Objects2/z_bg_spot01_objects2.h @@ -4,8 +4,7 @@ #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ Actor actor; /* 0x014C */ char unk_14C[0x34]; } BgSpot01Objects2; // size = 0x0180 diff --git a/src/overlays/actors/ovl_Bg_Spot02_Objects/z_bg_spot02_objects.c b/src/overlays/actors/ovl_Bg_Spot02_Objects/z_bg_spot02_objects.c index 42eab0a1ef..adaf6c8a92 100644 --- a/src/overlays/actors/ovl_Bg_Spot02_Objects/z_bg_spot02_objects.c +++ b/src/overlays/actors/ovl_Bg_Spot02_Objects/z_bg_spot02_objects.c @@ -1,6 +1,6 @@ #include "z_bg_spot02_objects.h" -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x00000030 void BgSpot02Objects_Init(BgSpot02Objects* this, GlobalContext* globalCtx); @@ -9,8 +9,7 @@ void BgSpot02Objects_Update(BgSpot02Objects* this, GlobalContext* globalCtx); void BgSpot02Objects_Draw(BgSpot02Objects* this, GlobalContext* globalCtx); /* -const ActorInit Bg_Spot02_Objects_InitVars = -{ +const ActorInit Bg_Spot02_Objects_InitVars = { ACTOR_BG_SPOT02_OBJECTS, ACTORTYPE_BG, ROOM, diff --git a/src/overlays/actors/ovl_Bg_Spot02_Objects/z_bg_spot02_objects.h b/src/overlays/actors/ovl_Bg_Spot02_Objects/z_bg_spot02_objects.h index 075e53b13a..8960981df1 100644 --- a/src/overlays/actors/ovl_Bg_Spot02_Objects/z_bg_spot02_objects.h +++ b/src/overlays/actors/ovl_Bg_Spot02_Objects/z_bg_spot02_objects.h @@ -4,8 +4,7 @@ #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ Actor actor; /* 0x014C */ char unk_14C[0x28]; } BgSpot02Objects; // size = 0x0174 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 a0bcdaff19..141ee2299f 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 @@ -1,6 +1,6 @@ #include "z_bg_spot03_taki.h" -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x00000030 void BgSpot03Taki_Init(BgSpot03Taki* this, GlobalContext* globalCtx); @@ -9,8 +9,7 @@ void BgSpot03Taki_Update(BgSpot03Taki* this, GlobalContext* globalCtx); void BgSpot03Taki_Draw(BgSpot03Taki* this, GlobalContext* globalCtx); /* -const ActorInit Bg_Spot03_Taki_InitVars = -{ +const ActorInit Bg_Spot03_Taki_InitVars = { ACTOR_BG_SPOT03_TAKI, ACTORTYPE_BG, ROOM, diff --git a/src/overlays/actors/ovl_Bg_Spot03_Taki/z_bg_spot03_taki.h b/src/overlays/actors/ovl_Bg_Spot03_Taki/z_bg_spot03_taki.h index 242d6c2cda..ba99052668 100644 --- a/src/overlays/actors/ovl_Bg_Spot03_Taki/z_bg_spot03_taki.h +++ b/src/overlays/actors/ovl_Bg_Spot03_Taki/z_bg_spot03_taki.h @@ -4,8 +4,7 @@ #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ Actor actor; /* 0x014C */ char unk_14C[0x2C]; } BgSpot03Taki; // size = 0x0178 diff --git a/src/overlays/actors/ovl_Bg_Spot05_Soko/z_bg_spot05_soko.c b/src/overlays/actors/ovl_Bg_Spot05_Soko/z_bg_spot05_soko.c index b54b188258..49840b428d 100644 --- a/src/overlays/actors/ovl_Bg_Spot05_Soko/z_bg_spot05_soko.c +++ b/src/overlays/actors/ovl_Bg_Spot05_Soko/z_bg_spot05_soko.c @@ -1,16 +1,26 @@ +/* + * File: z_bg_spot05_soko.c + * Overlay: ovl_Bg_Spot05_Soko + * Description: Sacred Forest Meadow Entities + */ + #include "z_bg_spot05_soko.h" -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x00000000 -void BgSpot05Soko_Init(BgSpot05Soko* this, GlobalContext* globalCtx); -void BgSpot05Soko_Destroy(BgSpot05Soko* this, GlobalContext* globalCtx); -void BgSpot05Soko_Update(BgSpot05Soko* this, GlobalContext* globalCtx); -void BgSpot05Soko_Draw(BgSpot05Soko* this, GlobalContext* globalCtx); +static void BgSpot05Soko_Init(BgSpot05Soko* this, GlobalContext* globalCtx); +static void BgSpot05Soko_Destroy(BgSpot05Soko* this, GlobalContext* globalCtx); +static void BgSpot05Soko_Update(BgSpot05Soko* this, GlobalContext* globalCtx); +static void BgSpot05Soko_Draw(BgSpot05Soko* this, GlobalContext* globalCtx); +static void func_808AE5A8(BgSpot05Soko* this, GlobalContext* globalCtx); +static void func_808AE5B4(BgSpot05Soko* this, GlobalContext* globalCtx); +static void func_808AE630(BgSpot05Soko* this, GlobalContext* globalCtx); -/* -const ActorInit Bg_Spot05_Soko_InitVars = -{ +extern Gfx* D_060012C0; +extern Gfx* D_06000918; + +const ActorInit Bg_Spot05_Soko_InitVars = { ACTOR_BG_SPOT05_SOKO, ACTORTYPE_PROP, ROOM, @@ -22,20 +32,78 @@ const ActorInit Bg_Spot05_Soko_InitVars = (ActorFunc)BgSpot05Soko_Update, (ActorFunc)BgSpot05Soko_Draw, }; -*/ -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Spot05_Soko/BgSpot05Soko_Init.s") -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Spot05_Soko/BgSpot05Soko_Destroy.s") +static InitChainEntry initChain[] = { + ICHAIN_VEC3F_DIV1000(scale, 100, ICHAIN_STOP), +}; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Spot05_Soko/func_808AE5A8.s") +static Gfx* dListTbl[] = { + 0x06000840, + 0x06001190, +}; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Spot05_Soko/func_808AE5B4.s") +static void BgSpot05Soko_Init(BgSpot05Soko* this, GlobalContext* globalCtx) { -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Spot05_Soko/func_808AE630.s") + Actor* thisx = &this->dyna.actor; + u32 pad1; + u32 sp24; + u32 pad2; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Spot05_Soko/BgSpot05Soko_Update.s") + sp24 = 0; + Actor_ProcessInitChain(thisx, initChain); + this->switchFlag = (thisx->params >> 8) & 0xFF; + thisx->params &= 0xFF; + DynaPolyInfo_SetActorMove(thisx, DPM_UNK); + if (thisx->params == 0) { + DynaPolyInfo_Alloc(&D_06000918, &sp24); + if (LINK_IS_ADULT) { + Actor_Kill(thisx); + } else { + this->actionFunc = func_808AE5A8; + } + } else { + DynaPolyInfo_Alloc(&D_060012C0, &sp24); + if (Flags_GetSwitch(globalCtx, this->switchFlag) != 0) { + Actor_Kill(thisx); + } else { + this->actionFunc = func_808AE5B4; + thisx->flags |= 0x10; + } + } + this->dyna.dynaPolyId = DynaPolyInfo_RegisterActor(globalCtx, &globalCtx->colCtx.dyna, thisx, sp24); +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Spot05_Soko/BgSpot05Soko_Draw.s") +static void BgSpot05Soko_Destroy(BgSpot05Soko* this, GlobalContext* globalCtx) { + DynaPolyInfo_Free(globalCtx, &globalCtx->colCtx.dyna, this->dyna.dynaPolyId); +} +static void func_808AE5A8(BgSpot05Soko* this, GlobalContext* globalCtx) { +} +static void func_808AE5B4(BgSpot05Soko* this, GlobalContext* globalCtx) { + Actor* thisx = &this->dyna.actor; + if (Flags_GetSwitch(globalCtx, this->switchFlag)) { + Audio_PlaySoundAtPosition(globalCtx, &thisx->posRot.pos, 0x1E, NA_SE_EV_METALDOOR_CLOSE); + Actor_SetHeight(thisx, 50.0f); + func_80080480(globalCtx, thisx); + this->actionFunc = func_808AE630; + thisx->speedXZ = 0.5f; + } +} +static void func_808AE630(BgSpot05Soko* this, GlobalContext* globalCtx) { + Actor* thisx = &this->dyna.actor; + + thisx->speedXZ *= 1.5f; + if (Math_ApproxF(&thisx->posRot.pos.y, thisx->initPosRot.pos.y - 120.0f, thisx->speedXZ) != 0) { + Actor_Kill(thisx); + } +} + +static void BgSpot05Soko_Update(BgSpot05Soko* this, GlobalContext* globalCtx) { + this->actionFunc(this, globalCtx); +} + +static void BgSpot05Soko_Draw(BgSpot05Soko* this, GlobalContext* globalCtx) { + Gfx_DrawDListOpa(globalCtx, dListTbl[this->dyna.actor.params]); +} diff --git a/src/overlays/actors/ovl_Bg_Spot05_Soko/z_bg_spot05_soko.h b/src/overlays/actors/ovl_Bg_Spot05_Soko/z_bg_spot05_soko.h index d44173d853..bea4a9f338 100644 --- a/src/overlays/actors/ovl_Bg_Spot05_Soko/z_bg_spot05_soko.h +++ b/src/overlays/actors/ovl_Bg_Spot05_Soko/z_bg_spot05_soko.h @@ -4,10 +4,10 @@ #include #include -typedef struct -{ - /* 0x0000 */ Actor actor; - /* 0x014C */ char unk_14C[0x20]; +typedef struct { + /* 0x0000 */ DynaPolyActor dyna; + /* 0x0164 */ ActorFunc actionFunc; + /* 0x0168 */ s32 switchFlag; } BgSpot05Soko; // size = 0x016C extern const ActorInit Bg_Spot05_Soko_InitVars; diff --git a/src/overlays/actors/ovl_Bg_Spot06_Objects/z_bg_spot06_objects.c b/src/overlays/actors/ovl_Bg_Spot06_Objects/z_bg_spot06_objects.c index 0e7d3df219..afad380c5c 100644 --- a/src/overlays/actors/ovl_Bg_Spot06_Objects/z_bg_spot06_objects.c +++ b/src/overlays/actors/ovl_Bg_Spot06_Objects/z_bg_spot06_objects.c @@ -1,6 +1,6 @@ #include "z_bg_spot06_objects.h" -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x00000200 void BgSpot06Objects_Init(BgSpot06Objects* this, GlobalContext* globalCtx); @@ -9,8 +9,7 @@ void BgSpot06Objects_Update(BgSpot06Objects* this, GlobalContext* globalCtx); void BgSpot06Objects_Draw(BgSpot06Objects* this, GlobalContext* globalCtx); /* -const ActorInit Bg_Spot06_Objects_InitVars = -{ +const ActorInit Bg_Spot06_Objects_InitVars = { ACTOR_BG_SPOT06_OBJECTS, ACTORTYPE_PROP, ROOM, diff --git a/src/overlays/actors/ovl_Bg_Spot06_Objects/z_bg_spot06_objects.h b/src/overlays/actors/ovl_Bg_Spot06_Objects/z_bg_spot06_objects.h index f2e06d2ea3..8714e39425 100644 --- a/src/overlays/actors/ovl_Bg_Spot06_Objects/z_bg_spot06_objects.h +++ b/src/overlays/actors/ovl_Bg_Spot06_Objects/z_bg_spot06_objects.h @@ -4,8 +4,7 @@ #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ Actor actor; /* 0x014C */ char unk_14C[0x84]; } BgSpot06Objects; // size = 0x01D0 diff --git a/src/overlays/actors/ovl_Bg_Spot07_Taki/z_bg_spot07_taki.c b/src/overlays/actors/ovl_Bg_Spot07_Taki/z_bg_spot07_taki.c index 04d6b4fe8d..8e1fdfd645 100644 --- a/src/overlays/actors/ovl_Bg_Spot07_Taki/z_bg_spot07_taki.c +++ b/src/overlays/actors/ovl_Bg_Spot07_Taki/z_bg_spot07_taki.c @@ -1,6 +1,6 @@ #include "z_bg_spot07_taki.h" -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x00000030 void BgSpot07Taki_Init(BgSpot07Taki* this, GlobalContext* globalCtx); @@ -9,8 +9,7 @@ void BgSpot07Taki_Update(BgSpot07Taki* this, GlobalContext* globalCtx); void BgSpot07Taki_Draw(BgSpot07Taki* this, GlobalContext* globalCtx); /* -const ActorInit Bg_Spot07_Taki_InitVars = -{ +const ActorInit Bg_Spot07_Taki_InitVars = { ACTOR_BG_SPOT07_TAKI, ACTORTYPE_BG, ROOM, diff --git a/src/overlays/actors/ovl_Bg_Spot07_Taki/z_bg_spot07_taki.h b/src/overlays/actors/ovl_Bg_Spot07_Taki/z_bg_spot07_taki.h index aa2e959136..03c3f84d06 100644 --- a/src/overlays/actors/ovl_Bg_Spot07_Taki/z_bg_spot07_taki.h +++ b/src/overlays/actors/ovl_Bg_Spot07_Taki/z_bg_spot07_taki.h @@ -4,8 +4,7 @@ #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ Actor actor; /* 0x014C */ char unk_14C[0x1C]; } BgSpot07Taki; // size = 0x0168 diff --git a/src/overlays/actors/ovl_Bg_Spot08_Bakudankabe/z_bg_spot08_bakudankabe.c b/src/overlays/actors/ovl_Bg_Spot08_Bakudankabe/z_bg_spot08_bakudankabe.c index 6b2ec19a86..c816388be8 100644 --- a/src/overlays/actors/ovl_Bg_Spot08_Bakudankabe/z_bg_spot08_bakudankabe.c +++ b/src/overlays/actors/ovl_Bg_Spot08_Bakudankabe/z_bg_spot08_bakudankabe.c @@ -1,6 +1,6 @@ #include "z_bg_spot08_bakudankabe.h" -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x00400000 void BgSpot08Bakudankabe_Init(BgSpot08Bakudankabe* this, GlobalContext* globalCtx); @@ -9,8 +9,7 @@ void BgSpot08Bakudankabe_Update(BgSpot08Bakudankabe* this, GlobalContext* global void BgSpot08Bakudankabe_Draw(BgSpot08Bakudankabe* this, GlobalContext* globalCtx); /* -const ActorInit Bg_Spot08_Bakudankabe_InitVars = -{ +const ActorInit Bg_Spot08_Bakudankabe_InitVars = { ACTOR_BG_SPOT08_BAKUDANKABE, ACTORTYPE_BG, ROOM, diff --git a/src/overlays/actors/ovl_Bg_Spot08_Bakudankabe/z_bg_spot08_bakudankabe.h b/src/overlays/actors/ovl_Bg_Spot08_Bakudankabe/z_bg_spot08_bakudankabe.h index 2f69deee89..61f4a49033 100644 --- a/src/overlays/actors/ovl_Bg_Spot08_Bakudankabe/z_bg_spot08_bakudankabe.h +++ b/src/overlays/actors/ovl_Bg_Spot08_Bakudankabe/z_bg_spot08_bakudankabe.h @@ -4,8 +4,7 @@ #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ Actor actor; /* 0x014C */ char unk_14C[0xF8]; } BgSpot08Bakudankabe; // size = 0x0244 diff --git a/src/overlays/actors/ovl_Bg_Spot08_Iceblock/z_bg_spot08_iceblock.c b/src/overlays/actors/ovl_Bg_Spot08_Iceblock/z_bg_spot08_iceblock.c index f09dff924a..6bcf1f8ded 100644 --- a/src/overlays/actors/ovl_Bg_Spot08_Iceblock/z_bg_spot08_iceblock.c +++ b/src/overlays/actors/ovl_Bg_Spot08_Iceblock/z_bg_spot08_iceblock.c @@ -1,6 +1,6 @@ #include "z_bg_spot08_iceblock.h" -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x00000000 void BgSpot08Iceblock_Init(BgSpot08Iceblock* this, GlobalContext* globalCtx); @@ -9,8 +9,7 @@ void BgSpot08Iceblock_Update(BgSpot08Iceblock* this, GlobalContext* globalCtx); void BgSpot08Iceblock_Draw(BgSpot08Iceblock* this, GlobalContext* globalCtx); /* -const ActorInit Bg_Spot08_Iceblock_InitVars = -{ +const ActorInit Bg_Spot08_Iceblock_InitVars = { ACTOR_BG_SPOT08_ICEBLOCK, ACTORTYPE_BG, ROOM, diff --git a/src/overlays/actors/ovl_Bg_Spot08_Iceblock/z_bg_spot08_iceblock.h b/src/overlays/actors/ovl_Bg_Spot08_Iceblock/z_bg_spot08_iceblock.h index 0b35be6050..52ba109cfd 100644 --- a/src/overlays/actors/ovl_Bg_Spot08_Iceblock/z_bg_spot08_iceblock.h +++ b/src/overlays/actors/ovl_Bg_Spot08_Iceblock/z_bg_spot08_iceblock.h @@ -4,8 +4,7 @@ #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ Actor actor; /* 0x014C */ char unk_14C[0x50]; } BgSpot08Iceblock; // size = 0x019C 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 199c382bbb..273371e9cf 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 @@ -1,16 +1,24 @@ +/* + * File: z_bg_spot09_obj.c + * Overlay: ovl_Bg_Spot09_Obj + * Description: + */ + #include "z_bg_spot09_obj.h" -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x00000000 -void BgSpot09Obj_Init(BgSpot09Obj* this, GlobalContext* globalCtx); -void BgSpot09Obj_Destroy(BgSpot09Obj* this, GlobalContext* globalCtx); -void BgSpot09Obj_Update(BgSpot09Obj* this, GlobalContext* globalCtx); -void BgSpot09Obj_Draw(BgSpot09Obj* this, GlobalContext* globalCtx); +static void BgSpot09Obj_Init(BgSpot09Obj* this, GlobalContext* globalCtx); +static void BgSpot09Obj_Destroy(BgSpot09Obj* this, GlobalContext* globalCtx); +static void BgSpot09Obj_Update(BgSpot09Obj* this, GlobalContext* globalCtx); +static void BgSpot09Obj_Draw(BgSpot09Obj* this, GlobalContext* globalCtx); -/* -const ActorInit Bg_Spot09_Obj_InitVars = -{ +static s32 func_808B1AE0(BgSpot09Obj* this, GlobalContext* globalCtx); +static s32 func_808B1BA0(BgSpot09Obj* this, GlobalContext* globalCtx); +static s32 func_808B1BEC(BgSpot09Obj* this, GlobalContext* globalCtx); + +const ActorInit Bg_Spot09_Obj_InitVars = { ACTOR_BG_SPOT09_OBJ, ACTORTYPE_BG, ROOM, @@ -22,25 +30,155 @@ const ActorInit Bg_Spot09_Obj_InitVars = (ActorFunc)BgSpot09Obj_Update, (ActorFunc)BgSpot09Obj_Draw, }; -*/ -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Spot09_Obj/func_808B1AE0.s") -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Spot09_Obj/func_808B1BA0.s") +static u32 D_808B1F90[] = { 0x00000000, 0x06005520, 0x0600283C, 0x06008458, 0x06007580 }; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Spot09_Obj/func_808B1BEC.s") +static s32 (*D_808B1FA4[])(BgSpot09Obj* this, GlobalContext* globalCtx) = { + func_808B1BEC, + func_808B1AE0, + func_808B1BA0, +}; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Spot09_Obj/func_808B1C70.s") +static InitChainEntry initChain1[] = { + ICHAIN_F32(unk_F4, 7200, ICHAIN_CONTINUE), + ICHAIN_F32(unk_F8, 3000, ICHAIN_CONTINUE), + ICHAIN_F32(unk_FC, 7200, ICHAIN_STOP), +}; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Spot09_Obj/func_808B1CEC.s") +static InitChainEntry initChain2[] = { + ICHAIN_F32(unk_F4, 7200, ICHAIN_CONTINUE), + ICHAIN_F32(unk_F8, 800, ICHAIN_CONTINUE), + ICHAIN_F32(unk_FC, 1500, ICHAIN_STOP), +}; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Spot09_Obj/func_808B1D18.s") +static u32 dlists[] = { 0x06000100, 0x06003970, 0x06001120, 0x06007D40, 0x06006210 }; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Spot09_Obj/func_808B1D44.s") +extern UNK_TYPE D_06008010; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Spot09_Obj/BgSpot09Obj_Init.s") +static s32 func_808B1AE0(BgSpot09Obj* this, GlobalContext* globalCtx) { + s32 carpentersRescued; + Actor* thisx = &this->dyna.actor; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Spot09_Obj/BgSpot09Obj_Destroy.s") + if (gSaveContext.scene_setup_index >= 4) { + return thisx->params == 0; + } -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Spot09_Obj/BgSpot09Obj_Update.s") + carpentersRescued = (gSaveContext.event_chk_inf[9] & 0xF) == 0xF; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Spot09_Obj/BgSpot09Obj_Draw.s") + if (LINK_AGE_IN_YEARS == YEARS_ADULT) { + switch (thisx->params) { + case 0: + return 0; + case 1: + return !carpentersRescued; + case 4: + return carpentersRescued; + case 3: + return 1; + } + } else { + return thisx->params == 2; + } + + return 0; +} + +static s32 func_808B1BA0(BgSpot09Obj* this, GlobalContext* globalCtx) { + Actor* thisx = &this->dyna.actor; + if (thisx->params == 3) { + Actor_SetScale(thisx, 0.1f); + } else { + Actor_SetScale(thisx, 1.0f); + } + return 1; +} + +static s32 func_808B1BEC(BgSpot09Obj* this, GlobalContext* globalCtx) { + Actor* thisx = &this->dyna.actor; + s32 localC = 0; + s32 pad[2]; + + if (D_808B1F90[thisx->params] != 0) { + DynaPolyInfo_SetActorMove(thisx, 0); + DynaPolyInfo_Alloc(D_808B1F90[thisx->params], &localC); + this->dyna.dynaPolyId = DynaPolyInfo_RegisterActor(globalCtx, &globalCtx->colCtx.dyna, thisx, localC); + } + return 1; +} + +static s32 func_808B1C70(BgSpot09Obj* this, GlobalContext* globalCtx) { + s32 i; + for (i = 0; i < ARRAY_COUNT(D_808B1FA4); i++) { + if (!D_808B1FA4[i](this, globalCtx)) { + return 0; + } + } + return 1; +} + +static s32 func_808B1CEC(BgSpot09Obj* this, GlobalContext* globalCtx) { + Actor_ProcessInitChain(&this->dyna.actor, &initChain1); + return 1; +} + +static s32 func_808B1D18(BgSpot09Obj* this, GlobalContext* globalCtx) { + Actor_ProcessInitChain(&this->dyna.actor, &initChain2); + return 1; +} + +static s32 func_808B1D44(BgSpot09Obj* this, GlobalContext* globalCtx) { + if (this->dyna.actor.params == 3) { + return func_808B1D18(this, globalCtx); + } else { + return func_808B1CEC(this, globalCtx); + } +} + +static void BgSpot09Obj_Init(BgSpot09Obj* this, GlobalContext* globalCtx) { + Actor* thisx = &this->dyna.actor; + + osSyncPrintf("Spot09 Object [arg_data : 0x%04x](大工救出フラグ 0x%x)\n", thisx->params, + gSaveContext.event_chk_inf[9] & 0xF); + thisx->params &= 0xFF; + if ((thisx->params < 0) || (thisx->params >= 5)) { + osSyncPrintf("Error : Spot 09 object の arg_data が判別出来ない(%s %d)(arg_data 0x%04x)\n", + "../z_bg_spot09_obj.c", 322, thisx->params); + } + + if (!func_808B1C70(this, globalCtx)) { + Actor_Kill(thisx); + } else if (!func_808B1D44(this, globalCtx)) { + Actor_Kill(thisx); + } +} + +static void BgSpot09Obj_Destroy(BgSpot09Obj* this, GlobalContext* globalCtx) { + DynaCollisionContext* dynaColCtx = &globalCtx->colCtx.dyna; + Actor* thisx = &this->dyna.actor; + + if (thisx->params != 0) { + DynaPolyInfo_Free(globalCtx, dynaColCtx, this->dyna.dynaPolyId); + } +} + +static void BgSpot09Obj_Update(BgSpot09Obj* this, GlobalContext* globalCtx) { +} + +static void BgSpot09Obj_Draw(BgSpot09Obj* this, GlobalContext* globalCtx) { + Actor* thisx = &this->dyna.actor; + GraphicsContext* gfxCtx; + Gfx* dispRefs[3]; + + Gfx_DrawDListOpa(globalCtx, dlists[thisx->params]); + if (thisx->params == 3) { + gfxCtx = globalCtx->state.gfxCtx; + Graph_OpenDisps(dispRefs, globalCtx->state.gfxCtx, "../z_bg_spot09_obj.c", 388); + func_80093D84(globalCtx->state.gfxCtx); + + gSPMatrix(gfxCtx->polyXlu.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_bg_spot09_obj.c", 391), + G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + gSPDisplayList(gfxCtx->polyXlu.p++, &D_06008010); + + Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_bg_spot09_obj.c", 396); + } +} diff --git a/src/overlays/actors/ovl_Bg_Spot09_Obj/z_bg_spot09_obj.h b/src/overlays/actors/ovl_Bg_Spot09_Obj/z_bg_spot09_obj.h index 21dedca5fc..5537972197 100644 --- a/src/overlays/actors/ovl_Bg_Spot09_Obj/z_bg_spot09_obj.h +++ b/src/overlays/actors/ovl_Bg_Spot09_Obj/z_bg_spot09_obj.h @@ -4,10 +4,9 @@ #include #include -typedef struct -{ - /* 0x0000 */ Actor actor; - /* 0x014C */ char unk_14C[0x1C]; +typedef struct { + /* 0x0000 */ DynaPolyActor dyna; + /* 0x0164 */ char unk_164[0x04]; } BgSpot09Obj; // size = 0x0168 extern const ActorInit Bg_Spot09_Obj_InitVars; diff --git a/src/overlays/actors/ovl_Bg_Spot11_Bakudankabe/z_bg_spot11_bakudankabe.c b/src/overlays/actors/ovl_Bg_Spot11_Bakudankabe/z_bg_spot11_bakudankabe.c index ab85ada086..484621a61a 100644 --- a/src/overlays/actors/ovl_Bg_Spot11_Bakudankabe/z_bg_spot11_bakudankabe.c +++ b/src/overlays/actors/ovl_Bg_Spot11_Bakudankabe/z_bg_spot11_bakudankabe.c @@ -1,6 +1,6 @@ #include "z_bg_spot11_bakudankabe.h" -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x00000030 void BgSpot11Bakudankabe_Init(BgSpot11Bakudankabe* this, GlobalContext* globalCtx); @@ -9,8 +9,7 @@ void BgSpot11Bakudankabe_Update(BgSpot11Bakudankabe* this, GlobalContext* global void BgSpot11Bakudankabe_Draw(BgSpot11Bakudankabe* this, GlobalContext* globalCtx); /* -const ActorInit Bg_Spot11_Bakudankabe_InitVars = -{ +const ActorInit Bg_Spot11_Bakudankabe_InitVars = { ACTOR_BG_SPOT11_BAKUDANKABE, ACTORTYPE_BG, ROOM, diff --git a/src/overlays/actors/ovl_Bg_Spot11_Bakudankabe/z_bg_spot11_bakudankabe.h b/src/overlays/actors/ovl_Bg_Spot11_Bakudankabe/z_bg_spot11_bakudankabe.h index 22b2eec71f..0ec8df015d 100644 --- a/src/overlays/actors/ovl_Bg_Spot11_Bakudankabe/z_bg_spot11_bakudankabe.h +++ b/src/overlays/actors/ovl_Bg_Spot11_Bakudankabe/z_bg_spot11_bakudankabe.h @@ -4,8 +4,7 @@ #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ Actor actor; /* 0x014C */ char unk_14C[0x64]; } BgSpot11Bakudankabe; // size = 0x01B0 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 cd556b53f6..8c56db0ce1 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,14 +1,13 @@ #include "z_bg_spot11_oasis.h" -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x00000010 void BgSpot11Oasis_Init(BgSpot11Oasis* this, GlobalContext* globalCtx); void BgSpot11Oasis_Update(BgSpot11Oasis* this, GlobalContext* globalCtx); /* -const ActorInit Bg_Spot11_Oasis_InitVars = -{ +const ActorInit Bg_Spot11_Oasis_InitVars = { ACTOR_BG_SPOT11_OASIS, ACTORTYPE_BG, ROOM, 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 d3cb66bdef..1a798a3b8f 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 @@ -4,8 +4,7 @@ #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ Actor actor; /* 0x014C */ char unk_14C[0x8]; } BgSpot11Oasis; // size = 0x0154 diff --git a/src/overlays/actors/ovl_Bg_Spot12_Gate/z_bg_spot12_gate.c b/src/overlays/actors/ovl_Bg_Spot12_Gate/z_bg_spot12_gate.c index 479fc12d2e..2e4db5f649 100644 --- a/src/overlays/actors/ovl_Bg_Spot12_Gate/z_bg_spot12_gate.c +++ b/src/overlays/actors/ovl_Bg_Spot12_Gate/z_bg_spot12_gate.c @@ -1,16 +1,29 @@ +/* + * File: z_bg_spot12_gate.c + * Overlay: Bg_Spot12_Gate + * Description: + */ + #include "z_bg_spot12_gate.h" -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x00000000 -void BgSpot12Gate_Init(BgSpot12Gate* this, GlobalContext* globalCtx); -void BgSpot12Gate_Destroy(BgSpot12Gate* this, GlobalContext* globalCtx); -void BgSpot12Gate_Update(BgSpot12Gate* this, GlobalContext* globalCtx); -void BgSpot12Gate_Draw(BgSpot12Gate* this, GlobalContext* globalCtx); +static void BgSpot12Gate_Init(BgSpot12Gate* this, GlobalContext* globalCtx); +static void BgSpot12Gate_Destroy(BgSpot12Gate* this, GlobalContext* globalCtx); +static void BgSpot12Gate_Update(BgSpot12Gate* this, GlobalContext* globalCtx); +static void BgSpot12Gate_Draw(BgSpot12Gate* this, GlobalContext* globalCtx); -/* -const ActorInit Bg_Spot12_Gate_InitVars = -{ +static void func_808B30C0(BgSpot12Gate* this); +static void func_808B30D8(BgSpot12Gate* this, GlobalContext* globalCtx); +static void func_808B3134(BgSpot12Gate* this); +static void func_808B314C(BgSpot12Gate* this, GlobalContext* globalCtx); +static void func_808B317C(BgSpot12Gate* this); +static void func_808B318C(BgSpot12Gate* this, GlobalContext* globalCtx); +static void func_808B3274(BgSpot12Gate* this); +static void func_808B3298(BgSpot12Gate* this, GlobalContext* globalCtx); + +const ActorInit Bg_Spot12_Gate_InitVars = { ACTOR_BG_SPOT12_GATE, ACTORTYPE_BG, ROOM, @@ -22,29 +35,113 @@ const ActorInit Bg_Spot12_Gate_InitVars = (ActorFunc)BgSpot12Gate_Update, (ActorFunc)BgSpot12Gate_Draw, }; -*/ -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Spot12_Gate/func_808B2F90.s") -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Spot12_Gate/BgSpot12Gate_Init.s") +static InitChainEntry initChain[] = { + ICHAIN_VEC3F_DIV1000(scale, 100, ICHAIN_CONTINUE), + ICHAIN_F32(unk_F4, 2500, ICHAIN_CONTINUE), + ICHAIN_F32(unk_F8, 500, ICHAIN_CONTINUE), + ICHAIN_F32(unk_FC, 1200, ICHAIN_STOP), +}; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Spot12_Gate/BgSpot12Gate_Destroy.s") +extern UNK_TYPE D_06001080; +extern UNK_TYPE D_060011EC; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Spot12_Gate/func_808B30C0.s") +static void func_808B2F90(BgSpot12Gate* this, GlobalContext* globalCtx, UNK_TYPE collision, DynaPolyMoveFlag flags) { + Actor* thisx = &this->dyna.actor; + s32 localC = 0; + s32 pad[2]; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Spot12_Gate/func_808B30D8.s") + DynaPolyInfo_SetActorMove(thisx, flags); + DynaPolyInfo_Alloc(collision, &localC); + this->dyna.dynaPolyId = DynaPolyInfo_RegisterActor(globalCtx, &globalCtx->colCtx.dyna, thisx, localC); + if (this->dyna.dynaPolyId == 0x32) { + osSyncPrintf("Warning : move BG 登録失敗(%s %d)(name %d)(arg_data 0x%04x)\n", "../z_bg_spot12_gate.c", 145, + thisx->id, thisx->params); + } +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Spot12_Gate/func_808B3134.s") +static void BgSpot12Gate_Init(BgSpot12Gate* this, GlobalContext* globalCtx) { + Actor* thisx = &this->dyna.actor; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Spot12_Gate/func_808B314C.s") + func_808B2F90(this, globalCtx, &D_060011EC, 0); + Actor_ProcessInitChain(thisx, initChain); -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Spot12_Gate/func_808B317C.s") + if (Flags_GetSwitch(globalCtx, thisx->params & 0x3F)) { + func_808B3274(this); + } else { + func_808B30C0(this); + } +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Spot12_Gate/func_808B318C.s") +static void BgSpot12Gate_Destroy(BgSpot12Gate* this, GlobalContext* globalCtx) { + DynaPolyInfo_Free(globalCtx, &globalCtx->colCtx.dyna, this->dyna.dynaPolyId); +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Spot12_Gate/func_808B3274.s") +static void func_808B30C0(BgSpot12Gate* this) { + Actor* thisx = &this->dyna.actor; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Spot12_Gate/func_808B3298.s") + this->actionFunc = (ActorFunc)func_808B30D8; + thisx->posRot.pos.y = thisx->initPosRot.pos.y; +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Spot12_Gate/BgSpot12Gate_Update.s") +static void func_808B30D8(BgSpot12Gate* this, GlobalContext* globalCtx) { + Actor* thisx = &this->dyna.actor; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Spot12_Gate/BgSpot12Gate_Draw.s") + if (Flags_GetSwitch(globalCtx, thisx->params & 0x3F)) { + func_808B3134(this); + func_800800F8(globalCtx, 0x1040, -0x63, thisx, 0); + } +} + +static void func_808B3134(BgSpot12Gate* this) { + this->actionFunc = (ActorFunc)func_808B314C; + this->unk_168 = 0x28; +} + +static void func_808B314C(BgSpot12Gate* this, GlobalContext* globalCtx) { + if (this->unk_168 <= 0) { + func_808B317C(this); + } +} + +static void func_808B317C(BgSpot12Gate* this) { + this->actionFunc = (ActorFunc)func_808B318C; +} + +static void func_808B318C(BgSpot12Gate* this, GlobalContext* globalCtx) { + Actor* thisx = &this->dyna.actor; + s32 var; + + Math_ApproxF(&thisx->velocity.y, 1.6f, 0.03f); + if (Math_ApproxF(&thisx->posRot.pos.y, thisx->initPosRot.pos.y + 200.0f, thisx->velocity.y)) { + func_808B3274(this); + var = Quake_Add(globalCtx->cameraCtx.activeCameraPtrs[globalCtx->cameraCtx.unk_5C0], 3); + Quake_SetSpeed(var, -0x3CB0); + Quake_SetQuakeValues(var, 3, 0, 0, 0); + Quake_SetCountdown(var, 0xC); + Audio_PlayActorSound2(thisx, NA_SE_EV_BRIDGE_OPEN_STOP); + } else { + func_8002F974(thisx, 0x2067); + } +} + +static void func_808B3274(BgSpot12Gate* this) { + Actor* thisx = &this->dyna.actor; + + this->actionFunc = (ActorFunc)func_808B3298; + thisx->posRot.pos.y = thisx->initPosRot.pos.y + 200.0f; +} + +static void func_808B3298(BgSpot12Gate* this, GlobalContext* globalCtx) { +} + +static void BgSpot12Gate_Update(BgSpot12Gate* this, GlobalContext* globalCtx) { + if (this->unk_168 > 0) { + this->unk_168 -= 1; + } + this->actionFunc(this, globalCtx); +} + +static void BgSpot12Gate_Draw(BgSpot12Gate* this, GlobalContext* globalCtx) { + Gfx_DrawDListOpa(globalCtx, &D_06001080); +} diff --git a/src/overlays/actors/ovl_Bg_Spot12_Gate/z_bg_spot12_gate.h b/src/overlays/actors/ovl_Bg_Spot12_Gate/z_bg_spot12_gate.h index 0ce1c02927..9ba6dc086d 100644 --- a/src/overlays/actors/ovl_Bg_Spot12_Gate/z_bg_spot12_gate.h +++ b/src/overlays/actors/ovl_Bg_Spot12_Gate/z_bg_spot12_gate.h @@ -4,10 +4,10 @@ #include #include -typedef struct -{ - /* 0x0000 */ Actor actor; - /* 0x014C */ char unk_14C[0x20]; +typedef struct { + /* 0x0000 */ DynaPolyActor dyna; + /* 0x0164 */ ActorFunc actionFunc; + /* 0x0168 */ s16 unk_168; } BgSpot12Gate; // size = 0x016C extern const ActorInit Bg_Spot12_Gate_InitVars; diff --git a/src/overlays/actors/ovl_Bg_Spot12_Saku/z_bg_spot12_saku.c b/src/overlays/actors/ovl_Bg_Spot12_Saku/z_bg_spot12_saku.c index 3297978f4f..2764211558 100644 --- a/src/overlays/actors/ovl_Bg_Spot12_Saku/z_bg_spot12_saku.c +++ b/src/overlays/actors/ovl_Bg_Spot12_Saku/z_bg_spot12_saku.c @@ -1,16 +1,27 @@ +/* + * File: z_bg_spot12_saku.c + * Overlay: Bg_Spot12_Saku + * Description: + */ + #include "z_bg_spot12_saku.h" -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x00000000 -void BgSpot12Saku_Init(BgSpot12Saku* this, GlobalContext* globalCtx); -void BgSpot12Saku_Destroy(BgSpot12Saku* this, GlobalContext* globalCtx); -void BgSpot12Saku_Update(BgSpot12Saku* this, GlobalContext* globalCtx); -void BgSpot12Saku_Draw(BgSpot12Saku* this, GlobalContext* globalCtx); +static void BgSpot12Saku_Init(BgSpot12Saku* this, GlobalContext* globalCtx); +static void BgSpot12Saku_Destroy(BgSpot12Saku* this, GlobalContext* globalCtx); +static void BgSpot12Saku_Update(BgSpot12Saku* this, GlobalContext* globalCtx); +static void BgSpot12Saku_Draw(BgSpot12Saku* this, GlobalContext* globalCtx); -/* -const ActorInit Bg_Spot12_Saku_InitVars = -{ +static void func_808B3550(BgSpot12Saku* this); +static void func_808B357C(BgSpot12Saku* this, GlobalContext* globalCtx); +static void func_808B35E4(BgSpot12Saku* this); +static void func_808B3604(BgSpot12Saku* this, GlobalContext* globalCtx); +static void func_808B3714(BgSpot12Saku* this); +static void func_808B37AC(BgSpot12Saku* this, GlobalContext* globalCtx); + +const ActorInit Bg_Spot12_Saku_InitVars = { ACTOR_BG_SPOT12_SAKU, ACTORTYPE_BG, ROOM, @@ -22,25 +33,107 @@ const ActorInit Bg_Spot12_Saku_InitVars = (ActorFunc)BgSpot12Saku_Update, (ActorFunc)BgSpot12Saku_Draw, }; -*/ -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Spot12_Saku/func_808B3420.s") -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Spot12_Saku/BgSpot12Saku_Init.s") +static InitChainEntry initChain[] = { + ICHAIN_VEC3F_DIV1000(scale, 100, ICHAIN_CONTINUE), + ICHAIN_F32(unk_F4, 1200, ICHAIN_CONTINUE), + ICHAIN_F32(unk_F8, 500, ICHAIN_CONTINUE), + ICHAIN_F32(unk_FC, 1000, ICHAIN_STOP), +}; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Spot12_Saku/BgSpot12Saku_Destroy.s") +extern Gfx D_06002260[]; +extern UNK_TYPE D_0600238C; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Spot12_Saku/func_808B3550.s") +static void func_808B3420(BgSpot12Saku* this, GlobalContext* globalCtx, UNK_TYPE collision, DynaPolyMoveFlag flags) { + Actor* thisx = &this->dyna.actor; + s32 localC = 0; + s32 pad[2]; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Spot12_Saku/func_808B357C.s") + DynaPolyInfo_SetActorMove(thisx, flags); + DynaPolyInfo_Alloc(collision, &localC); + this->dyna.dynaPolyId = DynaPolyInfo_RegisterActor(globalCtx, &globalCtx->colCtx.dyna, thisx, localC); + if (this->dyna.dynaPolyId == 0x32) { + osSyncPrintf("Warning : move BG 登録失敗(%s %d)(name %d)(arg_data 0x%04x)\n", "../z_bg_spot12_saku.c", 140, + thisx->id, thisx->params); + } +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Spot12_Saku/func_808B35E4.s") +static void BgSpot12Saku_Init(BgSpot12Saku* this, GlobalContext* globalCtx) { + Actor* thisx = &this->dyna.actor; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Spot12_Saku/func_808B3604.s") + func_808B3420(this, globalCtx, &D_0600238C, 0); + Actor_ProcessInitChain(thisx, initChain); + if (Flags_GetSwitch(globalCtx, thisx->params & 0x3F)) { + func_808B3714(this); + } else { + func_808B3550(this); + } +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Spot12_Saku/func_808B3714.s") +static void BgSpot12Saku_Destroy(BgSpot12Saku* this, GlobalContext* globalCtx) { + DynaPolyInfo_Free(globalCtx, &globalCtx->colCtx.dyna, this->dyna.dynaPolyId); +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Spot12_Saku/func_808B37AC.s") +static void func_808B3550(BgSpot12Saku* this) { + Actor* thisx = &this->dyna.actor; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Spot12_Saku/BgSpot12Saku_Update.s") + this->actionFunc = func_808B357C; + thisx->scale.x = 0.1f; + thisx->posRot.pos.x = thisx->initPosRot.pos.x; + thisx->posRot.pos.z = thisx->initPosRot.pos.z; +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Spot12_Saku/BgSpot12Saku_Draw.s") +static void func_808B357C(BgSpot12Saku* this, GlobalContext* globalCtx) { + Actor* thisx = &this->dyna.actor; + + if (Flags_GetSwitch(globalCtx, thisx->params & 0x3F)) { + func_808B35E4(this); + this->unk_168 = 0x14; + func_800800F8(globalCtx, 0x104A, -0x63, thisx, 0); + } +} + +static void func_808B35E4(BgSpot12Saku* this) { + if (this->unk_168 == 0) { + this->actionFunc = func_808B3604; + } +} + +static void func_808B3604(BgSpot12Saku* this, GlobalContext* globalCtx) { + f32 temp_ret = Math_SmoothScaleMaxMinF(&this->dyna.actor.scale.x, 0.001f / 0.14f, 0.16f, 0.0022f, 0.001f); + f32 temp_f18 = ((0.1f - this->dyna.actor.scale.x) * 840.0f); + + this->dyna.actor.posRot.pos.x = + this->dyna.actor.initPosRot.pos.x - (Math_Sins(this->dyna.actor.shape.rot.y + 0x4000) * temp_f18); + this->dyna.actor.posRot.pos.z = + this->dyna.actor.initPosRot.pos.z - (Math_Coss(this->dyna.actor.shape.rot.y + 0x4000) * temp_f18); + if (fabsf(temp_ret) < 0.0001f) { + func_808B3714(this); + Audio_PlayActorSound2(&this->dyna.actor, 0x280E); + } else { + func_8002F974(&this->dyna.actor, 0x2067); + } +} + +static void func_808B3714(BgSpot12Saku* this) { + Actor* thisx = &this->dyna.actor; + + this->actionFunc = func_808B37AC; + thisx->scale.x = 0.001f / 0.14f; + thisx->posRot.pos.x = thisx->initPosRot.pos.x - (Math_Sins(thisx->shape.rot.y + 0x4000) * 78.0f); + thisx->posRot.pos.z = thisx->initPosRot.pos.z - (Math_Coss(thisx->shape.rot.y + 0x4000) * 78.0f); +} + +static void func_808B37AC(BgSpot12Saku* this, GlobalContext* globalCtx) { +} + +static void BgSpot12Saku_Update(BgSpot12Saku* this, GlobalContext* globalCtx) { + if (this->unk_168 > 0) { + this->unk_168 -= 1; + } + this->actionFunc(this, globalCtx); +} + +static void BgSpot12Saku_Draw(BgSpot12Saku* this, GlobalContext* globalCtx) { + Gfx_DrawDListOpa(globalCtx, &D_06002260); +} diff --git a/src/overlays/actors/ovl_Bg_Spot12_Saku/z_bg_spot12_saku.h b/src/overlays/actors/ovl_Bg_Spot12_Saku/z_bg_spot12_saku.h index d2a559245e..f6d018d888 100644 --- a/src/overlays/actors/ovl_Bg_Spot12_Saku/z_bg_spot12_saku.h +++ b/src/overlays/actors/ovl_Bg_Spot12_Saku/z_bg_spot12_saku.h @@ -4,10 +4,10 @@ #include #include -typedef struct -{ - /* 0x0000 */ Actor actor; - /* 0x014C */ char unk_14C[0x20]; +typedef struct { + /* 0x0000 */ DynaPolyActor dyna; + /* 0x0164 */ ActorFunc actionFunc; + /* 0x0168 */ s16 unk_168; } BgSpot12Saku; // size = 0x016C extern const ActorInit Bg_Spot12_Saku_InitVars; diff --git a/src/overlays/actors/ovl_Bg_Spot15_Rrbox/z_bg_spot15_rrbox.c b/src/overlays/actors/ovl_Bg_Spot15_Rrbox/z_bg_spot15_rrbox.c index 1091061b4f..8ee4e80acd 100644 --- a/src/overlays/actors/ovl_Bg_Spot15_Rrbox/z_bg_spot15_rrbox.c +++ b/src/overlays/actors/ovl_Bg_Spot15_Rrbox/z_bg_spot15_rrbox.c @@ -1,6 +1,6 @@ #include "z_bg_spot15_rrbox.h" -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x00000000 void BgSpot15Rrbox_Init(BgSpot15Rrbox* this, GlobalContext* globalCtx); @@ -9,8 +9,7 @@ void BgSpot15Rrbox_Update(BgSpot15Rrbox* this, GlobalContext* globalCtx); void BgSpot15Rrbox_Draw(BgSpot15Rrbox* this, GlobalContext* globalCtx); /* -const ActorInit Bg_Spot15_Rrbox_InitVars = -{ +const ActorInit Bg_Spot15_Rrbox_InitVars = { ACTOR_BG_SPOT15_RRBOX, ACTORTYPE_BG, ROOM, diff --git a/src/overlays/actors/ovl_Bg_Spot15_Rrbox/z_bg_spot15_rrbox.h b/src/overlays/actors/ovl_Bg_Spot15_Rrbox/z_bg_spot15_rrbox.h index 2d717d023a..864fb5f466 100644 --- a/src/overlays/actors/ovl_Bg_Spot15_Rrbox/z_bg_spot15_rrbox.h +++ b/src/overlays/actors/ovl_Bg_Spot15_Rrbox/z_bg_spot15_rrbox.h @@ -4,8 +4,7 @@ #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ Actor actor; /* 0x014C */ char unk_14C[0x38]; } BgSpot15Rrbox; // size = 0x0184 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 aa3208cfe6..89d589bb71 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 @@ -2,11 +2,11 @@ * File: z_bg_spot15_saku.c * Overlay: ovl_Bg_Spot15_Saku * Description: -*/ + */ #include "z_bg_spot15_saku.h" -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x00000000 void BgSpot15Saku_Init(BgSpot15Saku* this, GlobalContext* globalCtx); @@ -18,8 +18,7 @@ void func_808B4930(BgSpot15Saku* this, GlobalContext* globalCtx); void func_808B4978(BgSpot15Saku* this, GlobalContext* globalCtx); void func_808B4A04(BgSpot15Saku* this, GlobalContext* globalCtx); -const ActorInit Bg_Spot15_Saku_InitVars = -{ +const ActorInit Bg_Spot15_Saku_InitVars = { ACTOR_BG_SPOT15_SAKU, ACTORTYPE_ITEMACTION, ROOM, @@ -35,8 +34,7 @@ const ActorInit Bg_Spot15_Saku_InitVars = extern u32 D_060003C0; extern u32 D_060004D0; -void BgSpot15Saku_Init(BgSpot15Saku* this, GlobalContext* globalCtx) -{ +void BgSpot15Saku_Init(BgSpot15Saku* this, GlobalContext* globalCtx) { s32 pad[2]; Actor* thisx = &this->dyna.actor; s32 local_c = 0; @@ -50,44 +48,29 @@ void BgSpot15Saku_Init(BgSpot15Saku* this, GlobalContext* globalCtx) this->unk_170 = thisx->posRot.pos.x; this->unk_174 = thisx->posRot.pos.y; this->unk_178 = thisx->posRot.pos.z; - if ((gSaveContext.inf_table[7] & 2) != 0) - { + if ((gSaveContext.inf_table[7] & 2) != 0) { thisx->posRot.pos.z = 2659.0f; } this->actionFunc = func_808B4930; } -void BgSpot15Saku_Destroy(BgSpot15Saku* this, GlobalContext* globalCtx) -{ +void BgSpot15Saku_Destroy(BgSpot15Saku* this, GlobalContext* globalCtx) { DynaPolyInfo_Free(globalCtx, &globalCtx->colCtx.dyna, this->dyna.dynaPolyId); } -#ifdef NON_MATCHING -// regalloc differences -void func_808B4930(BgSpot15Saku* this, GlobalContext* globalCtx) -{ - void* temp = this->unk_168; - void* temp2 = this->unk_16C; - - if ((temp != NULL || temp2 != NULL) && !(gSaveContext.inf_table[7] & 2)) - { +void func_808B4930(BgSpot15Saku* this, GlobalContext* globalCtx) { + if (this->unk_168 && !(gSaveContext.inf_table[7] & 2)) { this->unk_17C = 2; this->actionFunc = func_808B4978; } } -#else -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Spot15_Saku/func_808B4930.s") -#endif -void func_808B4978(BgSpot15Saku* this, GlobalContext* globalCtx) -{ +void func_808B4978(BgSpot15Saku* this, GlobalContext* globalCtx) { Actor* thisx = &this->dyna.actor; - if (!this->unk_17C) - { + if (!this->unk_17C) { Audio_PlayActorSound2(thisx, 0x2067); thisx->posRot.pos.z -= 2.0f; - if (thisx->posRot.pos.z < 2660.0f) - { + if (thisx->posRot.pos.z < 2660.0f) { Audio_PlayActorSound2(thisx, 0x280E); this->unk_17C = 0x1E; this->actionFunc = func_808B4A04; @@ -95,38 +78,28 @@ void func_808B4978(BgSpot15Saku* this, GlobalContext* globalCtx) } } -#ifdef NON_MATCHING -// single regalloc difference -void func_808B4A04(BgSpot15Saku* this, GlobalContext* globalCtx) -{ - if (this->unk_17C == 0) - { - this->unk_168 = 0 & 0xFFFFFFFFFFFFFFFF; - this->unk_16C = 0 & 0xFFFFFFFFFFFFFFFF; +void func_808B4A04(BgSpot15Saku* this, GlobalContext* globalCtx) { + if (!this->unk_17C) { + this->unk_168 = 0; this->actionFunc = func_808B4930; } } -#else -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Spot15_Saku/func_808B4A04.s") -#endif -void BgSpot15Saku_Update(BgSpot15Saku* this, GlobalContext* globalCtx) -{ +void BgSpot15Saku_Update(BgSpot15Saku* this, GlobalContext* globalCtx) { DECR(this->unk_17C); this->actionFunc(this, globalCtx); } -void BgSpot15Saku_Draw(BgSpot15Saku* this, GlobalContext* globalCtx) -{ +void BgSpot15Saku_Draw(BgSpot15Saku* this, GlobalContext* globalCtx) { GraphicsContext* gfxCtx = globalCtx->state.gfxCtx; - Gfx* gfxArr[4]; + Gfx* dispRefs[4]; - func_800C6AC4(gfxArr, globalCtx->state.gfxCtx, "../z_bg_spot15_saku.c", 259); + Graph_OpenDisps(dispRefs, globalCtx->state.gfxCtx, "../z_bg_spot15_saku.c", 259); func_80093D84(globalCtx->state.gfxCtx); gSPMatrix(gfxCtx->polyXlu.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_bg_spot15_saku.c", 263), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPDisplayList(gfxCtx->polyXlu.p++, &D_060003C0); - func_800C6B54(gfxArr, globalCtx->state.gfxCtx, "../z_bg_spot15_saku.c", 268); + Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_bg_spot15_saku.c", 268); } diff --git a/src/overlays/actors/ovl_Bg_Spot15_Saku/z_bg_spot15_saku.h b/src/overlays/actors/ovl_Bg_Spot15_Saku/z_bg_spot15_saku.h index 171ea2a56c..d39b38dced 100644 --- a/src/overlays/actors/ovl_Bg_Spot15_Saku/z_bg_spot15_saku.h +++ b/src/overlays/actors/ovl_Bg_Spot15_Saku/z_bg_spot15_saku.h @@ -4,12 +4,10 @@ #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ DynaPolyActor dyna; /* 0x0164 */ ActorFunc actionFunc; - /* 0x0168 */ UNK_PTR unk_168; - /* 0x016C */ UNK_PTR unk_16C; + /* 0x0168 */ u64 unk_168; /* 0x0170 */ f32 unk_170; /* 0x0174 */ f32 unk_174; /* 0x0174 */ f32 unk_178; 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 d400221d14..9c6b04d41d 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 @@ -1,6 +1,6 @@ #include "z_bg_spot16_bombstone.h" -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x00000010 void BgSpot16Bombstone_Init(BgSpot16Bombstone* this, GlobalContext* globalCtx); @@ -9,8 +9,7 @@ void BgSpot16Bombstone_Update(BgSpot16Bombstone* this, GlobalContext* globalCtx) void BgSpot16Bombstone_Draw(BgSpot16Bombstone* this, GlobalContext* globalCtx); /* -const ActorInit Bg_Spot16_Bombstone_InitVars = -{ +const ActorInit Bg_Spot16_Bombstone_InitVars = { ACTOR_BG_SPOT16_BOMBSTONE, ACTORTYPE_PROP, ROOM, diff --git a/src/overlays/actors/ovl_Bg_Spot16_Bombstone/z_bg_spot16_bombstone.h b/src/overlays/actors/ovl_Bg_Spot16_Bombstone/z_bg_spot16_bombstone.h index 110146e8a5..6b783597f9 100644 --- a/src/overlays/actors/ovl_Bg_Spot16_Bombstone/z_bg_spot16_bombstone.h +++ b/src/overlays/actors/ovl_Bg_Spot16_Bombstone/z_bg_spot16_bombstone.h @@ -4,8 +4,7 @@ #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ Actor actor; /* 0x014C */ char unk_14C[0xCC]; } BgSpot16Bombstone; // size = 0x0218 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 6b1159eaa0..cd9616168c 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 @@ -1,6 +1,6 @@ #include "z_bg_spot16_doughnut.h" -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x00000000 void BgSpot16Doughnut_Init(BgSpot16Doughnut* this, GlobalContext* globalCtx); @@ -9,8 +9,7 @@ void BgSpot16Doughnut_Update(BgSpot16Doughnut* this, GlobalContext* globalCtx); void BgSpot16Doughnut_Draw(BgSpot16Doughnut* this, GlobalContext* globalCtx); /* -const ActorInit Bg_Spot16_Doughnut_InitVars = -{ +const ActorInit Bg_Spot16_Doughnut_InitVars = { ACTOR_BG_SPOT16_DOUGHNUT, ACTORTYPE_PROP, ROOM, diff --git a/src/overlays/actors/ovl_Bg_Spot16_Doughnut/z_bg_spot16_doughnut.h b/src/overlays/actors/ovl_Bg_Spot16_Doughnut/z_bg_spot16_doughnut.h index 2a4edd3af7..e5d67ef288 100644 --- a/src/overlays/actors/ovl_Bg_Spot16_Doughnut/z_bg_spot16_doughnut.h +++ b/src/overlays/actors/ovl_Bg_Spot16_Doughnut/z_bg_spot16_doughnut.h @@ -4,8 +4,7 @@ #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ Actor actor; /* 0x014C */ char unk_14C[0x8]; } BgSpot16Doughnut; // size = 0x0154 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 233f372510..900c932df5 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 @@ -1,6 +1,6 @@ #include "z_bg_spot17_bakudankabe.h" -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x00000000 void BgSpot17Bakudankabe_Init(BgSpot17Bakudankabe* this, GlobalContext* globalCtx); @@ -9,8 +9,7 @@ void BgSpot17Bakudankabe_Update(BgSpot17Bakudankabe* this, GlobalContext* global void BgSpot17Bakudankabe_Draw(BgSpot17Bakudankabe* this, GlobalContext* globalCtx); /* -const ActorInit Bg_Spot17_Bakudankabe_InitVars = -{ +const ActorInit Bg_Spot17_Bakudankabe_InitVars = { ACTOR_BG_SPOT17_BAKUDANKABE, ACTORTYPE_BG, ROOM, diff --git a/src/overlays/actors/ovl_Bg_Spot17_Bakudankabe/z_bg_spot17_bakudankabe.h b/src/overlays/actors/ovl_Bg_Spot17_Bakudankabe/z_bg_spot17_bakudankabe.h index 0a7bdaa4b7..ae924fa65a 100644 --- a/src/overlays/actors/ovl_Bg_Spot17_Bakudankabe/z_bg_spot17_bakudankabe.h +++ b/src/overlays/actors/ovl_Bg_Spot17_Bakudankabe/z_bg_spot17_bakudankabe.h @@ -4,8 +4,7 @@ #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ Actor actor; /* 0x014C */ char unk_14C[0x18]; } BgSpot17Bakudankabe; // size = 0x0164 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 a105f6359c..5e992d216b 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 @@ -1,6 +1,6 @@ #include "z_bg_spot17_funen.h" -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x00000030 void BgSpot17Funen_Init(BgSpot17Funen* this, GlobalContext* globalCtx); @@ -8,8 +8,7 @@ void BgSpot17Funen_Destroy(BgSpot17Funen* this, GlobalContext* globalCtx); void BgSpot17Funen_Update(BgSpot17Funen* this, GlobalContext* globalCtx); /* -const ActorInit Bg_Spot17_Funen_InitVars = -{ +const ActorInit Bg_Spot17_Funen_InitVars = { ACTOR_BG_SPOT17_FUNEN, ACTORTYPE_SWITCH, ROOM, diff --git a/src/overlays/actors/ovl_Bg_Spot17_Funen/z_bg_spot17_funen.h b/src/overlays/actors/ovl_Bg_Spot17_Funen/z_bg_spot17_funen.h index 6ce42d70cc..a0dde3dd85 100644 --- a/src/overlays/actors/ovl_Bg_Spot17_Funen/z_bg_spot17_funen.h +++ b/src/overlays/actors/ovl_Bg_Spot17_Funen/z_bg_spot17_funen.h @@ -4,8 +4,7 @@ #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ Actor actor; } BgSpot17Funen; // size = 0x014C diff --git a/src/overlays/actors/ovl_Bg_Spot18_Basket/z_bg_spot18_basket.c b/src/overlays/actors/ovl_Bg_Spot18_Basket/z_bg_spot18_basket.c index acc207c4ab..bb918f85fb 100644 --- a/src/overlays/actors/ovl_Bg_Spot18_Basket/z_bg_spot18_basket.c +++ b/src/overlays/actors/ovl_Bg_Spot18_Basket/z_bg_spot18_basket.c @@ -1,6 +1,6 @@ #include "z_bg_spot18_basket.h" -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x00000010 void BgSpot18Basket_Init(BgSpot18Basket* this, GlobalContext* globalCtx); @@ -9,8 +9,7 @@ void BgSpot18Basket_Update(BgSpot18Basket* this, GlobalContext* globalCtx); void BgSpot18Basket_Draw(BgSpot18Basket* this, GlobalContext* globalCtx); /* -const ActorInit Bg_Spot18_Basket_InitVars = -{ +const ActorInit Bg_Spot18_Basket_InitVars = { ACTOR_BG_SPOT18_BASKET, ACTORTYPE_PROP, ROOM, diff --git a/src/overlays/actors/ovl_Bg_Spot18_Basket/z_bg_spot18_basket.h b/src/overlays/actors/ovl_Bg_Spot18_Basket/z_bg_spot18_basket.h index 6640c8b85a..602cdb0798 100644 --- a/src/overlays/actors/ovl_Bg_Spot18_Basket/z_bg_spot18_basket.h +++ b/src/overlays/actors/ovl_Bg_Spot18_Basket/z_bg_spot18_basket.h @@ -4,8 +4,7 @@ #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ Actor actor; /* 0x014C */ char unk_14C[0xD0]; } BgSpot18Basket; // size = 0x021C diff --git a/src/overlays/actors/ovl_Bg_Spot18_Futa/z_bg_spot18_futa.c b/src/overlays/actors/ovl_Bg_Spot18_Futa/z_bg_spot18_futa.c index 2146b2b190..b82daf2d63 100644 --- a/src/overlays/actors/ovl_Bg_Spot18_Futa/z_bg_spot18_futa.c +++ b/src/overlays/actors/ovl_Bg_Spot18_Futa/z_bg_spot18_futa.c @@ -2,17 +2,16 @@ * File: z_bg_spot18_futa.c * Overlay: ovl_Bg_Spot18_Futa * Description: The lid to a goron jar. -*/ + */ #include #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ Actor actor; - /* 0x014C */ u32 dynaPolyId; - /* 0x0150 */ u32 unk_150[0x5]; + /* 0x014C */ u32 dynaPolyId; + /* 0x0150 */ u32 unk_150[0x5]; } ActorSpot18Futa; // size = 0x0154 #define ROOM 0x00 @@ -23,8 +22,7 @@ static void Destroy(ActorSpot18Futa* this, GlobalContext* globalCtx); static void Update(ActorSpot18Futa* this, GlobalContext* globalCtx); static void Draw(ActorSpot18Futa* this, GlobalContext* globalCtx); -const ActorInit Bg_Spot18_Futa_InitVars = -{ +const ActorInit Bg_Spot18_Futa_InitVars = { ACTOR_BG_SPOT18_FUTA, ACTORTYPE_PROP, ROOM, @@ -37,19 +35,17 @@ const ActorInit Bg_Spot18_Futa_InitVars = (ActorFunc)Draw, }; -static InitChainEntry initChain[] = -{ +static InitChainEntry initChain[] = { ICHAIN_VEC3F_DIV1000(scale, 100, ICHAIN_CONTINUE), ICHAIN_F32(unk_F4, 1000, ICHAIN_CONTINUE), ICHAIN_F32(unk_F8, 500, ICHAIN_CONTINUE), - ICHAIN_F32(unk_FC, 1000, ICHAIN_STOP) + ICHAIN_F32(unk_FC, 1000, ICHAIN_STOP), }; -extern u32 DL_SPOT18_FUTA; // 0x6000368 +extern u32 DL_SPOT18_FUTA; // 0x6000368 extern u32 DL_SPOT18_FUTA2; // 0x6000150 -static void Init(ActorSpot18Futa* this, GlobalContext* globalCtx) -{ +static void Init(ActorSpot18Futa* this, GlobalContext* globalCtx) { s32 pad[2]; u32 sp1C = 0; @@ -59,32 +55,25 @@ static void Init(ActorSpot18Futa* this, GlobalContext* globalCtx) Actor_ProcessInitChain(&this->actor, initChain); } -static void Destroy(ActorSpot18Futa* this, GlobalContext* globalCtx) -{ +static void Destroy(ActorSpot18Futa* this, GlobalContext* globalCtx) { DynaPolyInfo_Free(globalCtx, &globalCtx->colCtx.dyna, this->dynaPolyId); } -static void Update(ActorSpot18Futa* this, GlobalContext* globalCtx) -{ +static void Update(ActorSpot18Futa* this, GlobalContext* globalCtx) { s32 iVar1; - if (this->actor.attachedA == NULL) - { + if (this->actor.attachedA == NULL) { iVar1 = Math_ApproxF(&this->actor.scale.x, 0, 0.005); - if (iVar1 != 0) - { + if (iVar1 != 0) { Actor_Kill(&this->actor); - } - else - { + } else { this->actor.scale.z = this->actor.scale.x; this->actor.scale.y = this->actor.scale.x; } } } -static void Draw(ActorSpot18Futa* this, GlobalContext* globalCtx) -{ - Draw_DListOpa(globalCtx, &DL_SPOT18_FUTA2); +static void Draw(ActorSpot18Futa* this, GlobalContext* globalCtx) { + Gfx_DrawDListOpa(globalCtx, &DL_SPOT18_FUTA2); } diff --git a/src/overlays/actors/ovl_Bg_Spot18_Obj/z_bg_spot18_obj.c b/src/overlays/actors/ovl_Bg_Spot18_Obj/z_bg_spot18_obj.c index 4020fc96d2..0b3e5d9c0d 100644 --- a/src/overlays/actors/ovl_Bg_Spot18_Obj/z_bg_spot18_obj.c +++ b/src/overlays/actors/ovl_Bg_Spot18_Obj/z_bg_spot18_obj.c @@ -1,6 +1,6 @@ #include "z_bg_spot18_obj.h" -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x00000000 void BgSpot18Obj_Init(BgSpot18Obj* this, GlobalContext* globalCtx); @@ -9,8 +9,7 @@ void BgSpot18Obj_Update(BgSpot18Obj* this, GlobalContext* globalCtx); void BgSpot18Obj_Draw(BgSpot18Obj* this, GlobalContext* globalCtx); /* -const ActorInit Bg_Spot18_Obj_InitVars = -{ +const ActorInit Bg_Spot18_Obj_InitVars = { ACTOR_BG_SPOT18_OBJ, ACTORTYPE_BG, ROOM, diff --git a/src/overlays/actors/ovl_Bg_Spot18_Obj/z_bg_spot18_obj.h b/src/overlays/actors/ovl_Bg_Spot18_Obj/z_bg_spot18_obj.h index 6d3dd11d6d..0e64ee38bd 100644 --- a/src/overlays/actors/ovl_Bg_Spot18_Obj/z_bg_spot18_obj.h +++ b/src/overlays/actors/ovl_Bg_Spot18_Obj/z_bg_spot18_obj.h @@ -4,8 +4,7 @@ #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ Actor actor; /* 0x014C */ char unk_14C[0x20]; } BgSpot18Obj; // size = 0x016C diff --git a/src/overlays/actors/ovl_Bg_Spot18_Shutter/z_bg_spot18_shutter.c b/src/overlays/actors/ovl_Bg_Spot18_Shutter/z_bg_spot18_shutter.c index c551a419a8..1868bbf983 100644 --- a/src/overlays/actors/ovl_Bg_Spot18_Shutter/z_bg_spot18_shutter.c +++ b/src/overlays/actors/ovl_Bg_Spot18_Shutter/z_bg_spot18_shutter.c @@ -1,6 +1,6 @@ #include "z_bg_spot18_shutter.h" -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x00000030 void BgSpot18Shutter_Init(BgSpot18Shutter* this, GlobalContext* globalCtx); @@ -9,8 +9,7 @@ void BgSpot18Shutter_Update(BgSpot18Shutter* this, GlobalContext* globalCtx); void BgSpot18Shutter_Draw(BgSpot18Shutter* this, GlobalContext* globalCtx); /* -const ActorInit Bg_Spot18_Shutter_InitVars = -{ +const ActorInit Bg_Spot18_Shutter_InitVars = { ACTOR_BG_SPOT18_SHUTTER, ACTORTYPE_PROP, ROOM, @@ -40,6 +39,3 @@ const ActorInit Bg_Spot18_Shutter_InitVars = #pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Spot18_Shutter/BgSpot18Shutter_Update.s") #pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Spot18_Shutter/BgSpot18Shutter_Draw.s") - - - diff --git a/src/overlays/actors/ovl_Bg_Spot18_Shutter/z_bg_spot18_shutter.h b/src/overlays/actors/ovl_Bg_Spot18_Shutter/z_bg_spot18_shutter.h index cb5b8bb8f5..ec8ba7caf2 100644 --- a/src/overlays/actors/ovl_Bg_Spot18_Shutter/z_bg_spot18_shutter.h +++ b/src/overlays/actors/ovl_Bg_Spot18_Shutter/z_bg_spot18_shutter.h @@ -4,8 +4,7 @@ #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ Actor actor; /* 0x014C */ char unk_14C[0x1C]; } BgSpot18Shutter; // size = 0x0168 diff --git a/src/overlays/actors/ovl_Bg_Sst_Floor/z_bg_sst_floor.c b/src/overlays/actors/ovl_Bg_Sst_Floor/z_bg_sst_floor.c index 02050e74eb..e69d3b4064 100644 --- a/src/overlays/actors/ovl_Bg_Sst_Floor/z_bg_sst_floor.c +++ b/src/overlays/actors/ovl_Bg_Sst_Floor/z_bg_sst_floor.c @@ -1,6 +1,6 @@ #include "z_bg_sst_floor.h" -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x00000030 void BgSstFloor_Init(BgSstFloor* this, GlobalContext* globalCtx); @@ -9,8 +9,7 @@ void BgSstFloor_Update(BgSstFloor* this, GlobalContext* globalCtx); void BgSstFloor_Draw(BgSstFloor* this, GlobalContext* globalCtx); /* -const ActorInit Bg_Sst_Floor_InitVars = -{ +const ActorInit Bg_Sst_Floor_InitVars = { ACTOR_BG_SST_FLOOR, ACTORTYPE_BG, ROOM, diff --git a/src/overlays/actors/ovl_Bg_Sst_Floor/z_bg_sst_floor.h b/src/overlays/actors/ovl_Bg_Sst_Floor/z_bg_sst_floor.h index 9333dd51e8..2cec575530 100644 --- a/src/overlays/actors/ovl_Bg_Sst_Floor/z_bg_sst_floor.h +++ b/src/overlays/actors/ovl_Bg_Sst_Floor/z_bg_sst_floor.h @@ -4,8 +4,7 @@ #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ Actor actor; /* 0x014C */ char unk_14C[0x20]; } BgSstFloor; // size = 0x016C diff --git a/src/overlays/actors/ovl_Bg_Toki_Hikari/z_bg_toki_hikari.c b/src/overlays/actors/ovl_Bg_Toki_Hikari/z_bg_toki_hikari.c index f1a3b465d3..626c95ed1e 100644 --- a/src/overlays/actors/ovl_Bg_Toki_Hikari/z_bg_toki_hikari.c +++ b/src/overlays/actors/ovl_Bg_Toki_Hikari/z_bg_toki_hikari.c @@ -1,6 +1,6 @@ #include "z_bg_toki_hikari.h" -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x00000020 void BgTokiHikari_Init(BgTokiHikari* this, GlobalContext* globalCtx); @@ -9,8 +9,7 @@ void BgTokiHikari_Update(BgTokiHikari* this, GlobalContext* globalCtx); void BgTokiHikari_Draw(BgTokiHikari* this, GlobalContext* globalCtx); /* -const ActorInit Bg_Toki_Hikari_InitVars = -{ +const ActorInit Bg_Toki_Hikari_InitVars = { ACTOR_BG_TOKI_HIKARI, ACTORTYPE_BG, ROOM, diff --git a/src/overlays/actors/ovl_Bg_Toki_Hikari/z_bg_toki_hikari.h b/src/overlays/actors/ovl_Bg_Toki_Hikari/z_bg_toki_hikari.h index 1f45607f14..d0e0a3c3c5 100644 --- a/src/overlays/actors/ovl_Bg_Toki_Hikari/z_bg_toki_hikari.h +++ b/src/overlays/actors/ovl_Bg_Toki_Hikari/z_bg_toki_hikari.h @@ -4,8 +4,7 @@ #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ Actor actor; /* 0x014C */ char unk_14C[0x8]; } BgTokiHikari; // size = 0x0154 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 4b75128177..6c04ed552a 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 @@ -1,16 +1,156 @@ +/* + * File: z_bg_toki_swd.c + * Overlay: ovl_Bg_Toki_Swd + * Description: Master Sword (Contains Cutscenes) + */ + #include "z_bg_toki_swd.h" -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x00000010 -void BgTokiSwd_Init(BgTokiSwd* this, GlobalContext* globalCtx); -void BgTokiSwd_Destroy(BgTokiSwd* this, GlobalContext* globalCtx); -void BgTokiSwd_Update(BgTokiSwd* this, GlobalContext* globalCtx); -void BgTokiSwd_Draw(BgTokiSwd* this, GlobalContext* globalCtx); +static void BgTokiSwd_Init(BgTokiSwd* this, GlobalContext* globalCtx); +static void BgTokiSwd_Destroy(BgTokiSwd* this, GlobalContext* globalCtx); +static void BgTokiSwd_Update(BgTokiSwd* this, GlobalContext* globalCtx); +static void BgTokiSwd_Draw(BgTokiSwd* this, GlobalContext* globalCtx); +static void BgTokiSwd_SetupAction(BgTokiSwd* this, ActorFunc actionFunc); +static void func_808BAF40(BgTokiSwd* this, GlobalContext* globalCtx); +static void func_808BB0AC(BgTokiSwd* this, GlobalContext* globalCtx); +static void func_808BB128(BgTokiSwd* this, GlobalContext* globalCtx); -/* -const ActorInit Bg_Toki_Swd_InitVars = -{ +extern u32 D_06001BD0; + +static u32 D_808BB2F0[] = { + 0x00000009, 0x000001A9, 0x0000000A, 0x00000001, 0x000C0000, 0x01000000, 0x00000000, 0x00000000, 0x00000036, + 0x00000034, 0x00000000, 0x00000036, 0x00000034, 0x00000000, 0x00000000, 0x00000000, 0x00000004, 0x00000001, + 0x0002006E, 0x006F0000, 0x00000000, 0x00000000, 0xFFFFFFE3, 0xFFFFFFC5, 0x00000000, 0xFFFFFFE3, 0xFFFFFFC5, + 0x00000000, 0x00000000, 0x00000000, 0x00000003, 0x00000001, 0x000A006E, 0x006F0000, 0x00000000, 0x00000000, + 0x0000002E, 0xFFFFFFE6, 0x00000000, 0x0000002E, 0xFFFFFFE6, 0x00000000, 0x00000000, 0x00000000, 0x000003E8, + 0x00000001, 0x000800E6, 0x00E700E7, 0x0000002D, 0x00000001, 0x000100D2, 0x00E600E6, 0x00000001, 0x00010000, + 0x00F10000, 0x00000000, 0x42700000, 0xFFD60048, 0xFFD9018C, 0x00000000, 0x42700000, 0xFFD60048, 0xFFD9019D, + 0x00000000, 0x42700000, 0xFFD60048, 0xFFD901AE, 0x00000000, 0x42700000, 0xFFD60048, 0xFFD902A8, 0x00000000, + 0x42700000, 0xFFD60048, 0xFFD90000, 0x00000000, 0x42700000, 0xFFD60048, 0xFFD9007A, 0x00000000, 0x42700000, + 0xFFD60048, 0xFFD90064, 0x00000000, 0x42700000, 0xFFD60048, 0xFFD90074, 0xFF000000, 0x42700000, 0xFFD60048, + 0xFFD9005F, 0x00000001, 0x00010050, 0x01960000, 0x00000000, 0x42700000, 0xFFFF005F, 0xFFED2F73, 0x00000000, + 0x42700000, 0xFFFF005F, 0xFFED6B2F, 0x00000000, 0x42700000, 0xFFFF005F, 0xFFED6169, 0x00000000, 0x42700000, + 0xFFFF005F, 0xFFED0000, 0x00000000, 0x42700000, 0xFFFF005F, 0xFFED0005, 0x00000000, 0x42700000, 0xFFFF0081, + 0xFFDE7961, 0x00000000, 0x42700000, 0xFFFF00AD, 0xFFED742F, 0x00000000, 0x42700000, 0xFFEF00D9, 0xFFEC2E64, + 0x00000000, 0x42700000, 0xFFE80148, 0xFFF40000, 0x00000000, 0x42700000, 0xFFE501FD, 0xFFFE2F73, 0x00000000, + 0x42700000, 0xFFD7032D, 0x000A6B2F, 0x00000000, 0x42700000, 0xFFC40505, 0x00266D61, 0x00000000, 0x42700000, + 0xFFC60776, 0x005B0000, 0x00000000, 0x42700000, 0xFFCB09DE, 0x00850005, 0x00000000, 0x42700000, 0xFFDF0D75, + 0x00C17961, 0x00000000, 0x42700000, 0x00000F78, 0x00E1742F, 0x00000000, 0x42700000, 0x000710DD, 0x00F56565, + 0x00000000, 0x42700000, 0x000710DC, 0x00F50000, 0x00000000, 0x42700000, 0x000710DC, 0x00F52F73, 0xFF000000, + 0x42700000, 0x000710DC, 0x00F56B2F, 0x00000002, 0x00010000, 0x010E0000, 0x0000001E, 0x42700000, 0xFFEC0055, + 0xFFF72F73, 0x0000001E, 0x42700000, 0xFFEC0055, 0xFFF76B2F, 0x0000001E, 0x42700000, 0xFFEC0055, 0xFFF76169, + 0x0000001E, 0x42700000, 0xFFEC0055, 0xFFF70000, 0x0000001E, 0x42700000, 0xFFEC0055, 0xFFF70005, 0x0000001E, + 0x42700000, 0xFFEC0055, 0xFFF77961, 0x0000001E, 0x42700000, 0xFFEC0055, 0xFFF7742F, 0x0000001E, 0x42700000, + 0xFFEC0055, 0xFFF72E64, 0xFF00001E, 0x42700000, 0xFFEC0055, 0xFFF70000, 0x00000002, 0x00010050, 0x01A90000, + 0x00000005, 0x42700000, 0xFFFF0070, 0x00072F73, 0x00000005, 0x42700000, 0xFFFF0070, 0x00076B2F, 0x00000005, + 0x42700000, 0xFFFF0070, 0x00076169, 0x00000005, 0x42700000, 0xFFFF0070, 0x00070000, 0x0000000F, 0x42700000, + 0xFFFF0070, 0x00070005, 0x00000014, 0x42700000, 0xFFFF0075, 0x00077961, 0x00000019, 0x42700000, 0xFFFF0075, + 0x0007742F, 0x00000019, 0x42700000, 0xFFFF0075, 0x00072E64, 0x00000014, 0x42700000, 0xFFFF0075, 0x00070000, + 0x00000014, 0x42700000, 0xFFFF0075, 0x00072F73, 0x00000014, 0x42700000, 0xFFFF0075, 0x00076B2F, 0x00000014, + 0x42700000, 0xFFFF0075, 0x00076D61, 0x00000014, 0x42700000, 0xFFFF0075, 0x00070000, 0x00000014, 0x42700000, + 0xFFFF0075, 0x00070005, 0x00000014, 0x42700000, 0xFFFF0075, 0x00077961, 0x00000014, 0x42700000, 0xFFFF0075, + 0x0007742F, 0x00000014, 0x42700000, 0xFFFF0075, 0x00076565, 0x00000014, 0x42700000, 0xFFFF0075, 0x00070000, + 0x00000014, 0x42700000, 0xFFFF0075, 0x00072F73, 0xFF000014, 0x42700000, 0xFFFF0075, 0x00076B2F, 0xFFFFFFFF, + 0x00000000, 0x00000000, 0x00000000, +}; + +static u32 D_808BB7A0[] = { + 0x00000009, 0x00000170, 0x00000001, 0x00010000, 0x007E0000, 0x00000000, 0x42700000, 0xFFFF0065, 0xFF92616D, + 0x00000000, 0x42200000, 0xFFFF0065, 0xFF926964, 0x00000000, 0x42200000, 0xFFFF0065, 0xFF9200FB, 0x00000000, + 0x42200000, 0xFFFF0065, 0xFF920111, 0x00000000, 0x42200000, 0xFFFF0065, 0xFF93012D, 0x00000000, 0x42200000, + 0xFFFF0047, 0xFF920033, 0x00000000, 0x42200000, 0xFFFF0048, 0xFF9200FB, 0x00000000, 0x42200000, 0xFFFF0048, + 0xFF9200FB, 0x00000000, 0x42200000, 0xFFFF0048, 0xFF922F68, 0xFF000000, 0x42200000, 0xFFFF0048, 0xFF92612F, + 0x00000001, 0x0001003A, 0x01530000, 0x00000000, 0x42700001, 0xFFF7006A, 0xFFFDA1BC, 0x00000000, 0x42700000, + 0xFFF7006A, 0xFFFDA5F3, 0x00000000, 0x42700000, 0xFFF7006A, 0xFFFDA5EB, 0x00000000, 0x42700000, 0xFFF7006A, + 0xFFFDA5A2, 0x00000000, 0x42700000, 0xFFBD006C, 0xFFCBBAEE, 0x00000000, 0x42700000, 0xFFBD006C, 0xFFCBC9B8, + 0x00000000, 0x42700000, 0xFFBD006C, 0xFFCB0020, 0x00000000, 0x42700000, 0xFFBD006C, 0xFFCBA5A4, 0x00000000, + 0x42700000, 0xFFBD006C, 0xFFCB0020, 0x00000000, 0x42700000, 0xFFAD0066, 0xFFD6A5E1, 0x00000000, 0x42700000, + 0xFF8C0051, 0xFFEDA5D0, 0x00000000, 0x42700000, 0xFF8A0051, 0x00360020, 0x00000000, 0x42700000, 0xFF96004E, + 0x0074A5A6, 0x00000000, 0x42700000, 0xFFE5004B, 0x00E2A5E5, 0x00000000, 0x42700000, 0x00790052, 0x0138C0AE, + 0x00000000, 0x42700000, 0x0128004C, 0x0176A5E5, 0x00000000, 0x42700000, 0x02350050, 0x01010020, 0x00000000, + 0x42700000, 0x02660050, 0xFFFFA5EB, 0x00000000, 0x42700000, 0x02520050, 0xFF6FA5E1, 0x00000000, 0x42700000, + 0x01DB0050, 0xFE840020, 0x00000000, 0x42700000, 0x01430050, 0xFDFFA5E1, 0x00000000, 0x42700000, 0x00C00050, + 0xFDC2A5D0, 0x00000000, 0x42700000, 0xFFD30050, 0xFDA40020, 0x00000000, 0x42700000, 0xFF720050, 0xFDB3A5A6, + 0x00000000, 0x42700000, 0xFF1C0050, 0xFDCEA5E5, 0x00000000, 0x42700000, 0xFE88005D, 0xFE23C0AE, 0x00000000, + 0x42700000, 0xFDB8005F, 0xFF49A5E5, 0x00000000, 0x42700000, 0xFD9B005F, 0xFFDE0020, 0xFF000000, 0x42700000, + 0xFDAD005F, 0x00A1A5EB, 0x00000002, 0x00010000, 0x009B0000, 0x00000005, 0x4221999A, 0xFFFF006F, 0x0005A1BC, + 0x00000005, 0x42200000, 0xFFFF006F, 0x0005A5F3, 0x00000005, 0x42200000, 0xFFFF006F, 0x0005A5EB, 0x0000000F, + 0x42200000, 0xFFFF006F, 0x0005A5A2, 0x0000000F, 0x42200000, 0xFFFF006F, 0x0005BAEE, 0x0000000F, 0x42200000, + 0xFFFF0068, 0x0008C9B8, 0x00000005, 0x42200000, 0xFFFF0068, 0x00080020, 0x0000001E, 0x42200000, 0xFFFF0068, + 0x0008A5A4, 0x0000001E, 0x42200000, 0xFFFF0068, 0x00080020, 0xFF00001E, 0x42200000, 0xFFFF0068, 0x0008A5E1, + 0x00000002, 0x0001003A, 0x01700000, 0x00000005, 0x42700001, 0x00000078, 0x000CA1BC, 0x00000005, 0x42700000, + 0x00000078, 0x000CA5F3, 0x00000005, 0x42700000, 0x00000078, 0x000CA5EB, 0x0000000A, 0x42700000, 0x00000078, + 0x000CA5A2, 0x00000005, 0x42700000, 0xFFFF005F, 0x000BBAEE, 0x00000005, 0x42700000, 0xFFFF005F, 0x000BC9B8, + 0x00000005, 0x42700000, 0xFFFF005F, 0x000B0020, 0x00000005, 0x42700000, 0xFFFF005F, 0x000BA5A4, 0x00000005, + 0x42700000, 0xFFFF005F, 0x000B0020, 0x0000000A, 0x42700000, 0xFFFD005F, 0x0008A5E1, 0x0000000A, 0x42700000, + 0xFFFD005F, 0x0008A5D0, 0x0000000A, 0x42700000, 0xFFFD005F, 0x00080020, 0x0000000A, 0x42700000, 0xFFFD005F, + 0x0008A5A6, 0x0000000A, 0x42700000, 0xFFFD005F, 0x0008A5E5, 0x0000000A, 0x42700000, 0xFFFD005F, 0x0008C0AE, + 0x0000000A, 0x42700000, 0xFFFD005F, 0x0008A5E5, 0x0000000A, 0x42700000, 0xFFFD005F, 0x00080020, 0x0000000A, + 0x42700000, 0xFFFD005F, 0x0008A5EB, 0x0000000A, 0x42700000, 0xFFFD005F, 0x0008A5E1, 0x0000000A, 0x42700000, + 0xFFFD005F, 0x00080020, 0x0000000F, 0x42700000, 0xFFFD005F, 0x0008A5E1, 0x0000000F, 0x42700000, 0xFFFD005F, + 0x0008A5D0, 0x0000000F, 0x42700000, 0xFFFD005F, 0x00080020, 0x0000000F, 0x42700000, 0xFFFD005F, 0x0008A5A6, + 0x0000000F, 0x42700000, 0xFFFD005F, 0x0008A5E5, 0x0000000F, 0x42700000, 0xFFFD005F, 0x0008C0AE, 0x0000000F, + 0x42700000, 0xFFFD005F, 0x0008A5E5, 0x0000000F, 0x42700000, 0xFFFD005F, 0x00080020, 0xFF00001E, 0x42700000, + 0xFFFD005F, 0x0008A5EB, 0x0000000A, 0x00000001, 0x000C0000, 0x00B40000, 0x00000000, 0x00000000, 0x0000001C, + 0xFFFFFFF6, 0x00000000, 0xFFFFFFF2, 0x00000009, 0x00000000, 0xBE6EEEEF, 0x00000000, 0x00000004, 0x00000001, + 0x0002005A, 0x005B0000, 0x00000000, 0x00000000, 0xFFFFFFF2, 0x00000024, 0x00000000, 0xFFFFFFF2, 0x00000024, + 0x00000000, 0x00000000, 0x00000000, 0x00000003, 0x00000001, 0x000A005A, 0x005B0000, 0x00000000, 0x00000000, + 0xFFFFFFF8, 0xFFFFFFDD, 0x00000000, 0xFFFFFFF8, 0xFFFFFFDD, 0x00000000, 0x00000000, 0x00000000, 0x0000002D, + 0x00000001, 0x000100BE, 0x00D200D2, 0x000003E8, 0x00000001, 0x000800D2, 0x00D300D3, 0xFFFFFFFF, 0x00000000, + 0x00000000, 0x00000000, +}; + +static u32 D_808BBD90[] = { + 0x0000000B, 0x00000BB8, 0x00000021, 0x00000001, 0x00010000, 0x0BB80000, 0x00000000, 0x00000000, 0xFFFFFFF8, + 0xFFFFFFFF, 0x00000000, 0xFFFFFFF8, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000000, 0x0000000A, 0x00000003, + 0x00050000, 0x00010000, 0x80000000, 0x00000000, 0x00000000, 0x00000334, 0x00000000, 0x00000000, 0x00000334, + 0x00000000, 0x00000000, 0x00000001, 0x00020001, 0x00100000, 0x80000000, 0x00000000, 0x00000000, 0x00000334, + 0x00000000, 0x00000000, 0x000002D0, 0x00000000, 0x00000000, 0x00000001, 0x00050010, 0x00B00000, 0x80000000, + 0x00000000, 0x00000000, 0x000002D0, 0x00000000, 0x00000000, 0x000002D0, 0x00000000, 0x00000000, 0x00000001, + 0x0000003E, 0x00000003, 0x00040028, 0x00467D74, 0x00000000, 0xFFFFFFFF, 0x00000031, 0x000002CF, 0x00000001, + 0x0000002F, 0x000002AF, 0x3D888889, 0xBD888889, 0xBD888889, 0x00040046, 0x00DC8010, 0x00000000, 0x00000001, + 0x0000002F, 0x000002AF, 0x00000000, 0x00000086, 0x00000015, 0xBBDA740E, 0x3F147AE1, 0x3BDA740E, 0x000200DC, + 0x01108000, 0x00000000, 0x00000000, 0x00000086, 0x00000015, 0x00000000, 0x00000065, 0x00000002, 0x00000000, + 0xBF227627, 0x00000000, 0x00000003, 0x00000001, 0x000C0154, 0x01550000, 0x00000000, 0xFFFFFFFF, 0x00000000, + 0xFFFFFFFD, 0xFFFFFFFF, 0x00000000, 0xFFFFFFFD, 0x00000000, 0x00000000, 0x00000000, 0x00000013, 0x00000006, + 0xFFFF0000, 0x0032FFFF, 0xFFFFFFFF, 0x70E60032, 0x003C0000, 0x00000000, 0xFFFF003C, 0x00FAFFFF, 0xFFFFFFFF, + 0x70E700FA, 0x01040000, 0x00000000, 0xFFFF0104, 0x0122FFFF, 0xFFFFFFFF, 0x70E80122, 0x01400000, 0x00000000, + 0x00000001, 0x00010000, 0x00FB0000, 0x00000000, 0x42700000, 0xFFC5000C, 0x02B20222, 0x00000000, 0x42700000, + 0xFFC5000C, 0x02B200FA, 0x00000000, 0x42700000, 0xFFC5000C, 0x02B20000, 0x00000000, 0x42700000, 0xFFC5000C, + 0x02B20000, 0x00000000, 0x42700000, 0xFFC5000C, 0x02B20000, 0x00000000, 0x42700000, 0xFFE10018, 0x02BD0000, + 0x00000000, 0x42700000, 0xFFE10018, 0x02BD0000, 0x00000000, 0x42700000, 0xFFE10018, 0x02BD0000, 0x00000000, + 0x42700000, 0xFFE10018, 0x02BD2D70, 0x00000000, 0x42700000, 0xFFE10018, 0x02BD0085, 0x00000000, 0x42700000, + 0xFFE10018, 0x02BD01E6, 0xFF000000, 0x42700000, 0xFFE10018, 0x02BD0000, 0x00000001, 0x0001005A, 0x014B0000, + 0x00000000, 0x42700000, 0xFF66005C, 0x00EC0222, 0x00000000, 0x42700000, 0xFF66005C, 0x00EC00FA, 0x00000000, + 0x42700000, 0xFF66005C, 0x00EC0000, 0x00000000, 0x42700000, 0xFF66005C, 0x00EC0000, 0x00000000, 0x42700000, + 0xFF66005C, 0x00EC0000, 0x00000000, 0x42700000, 0xFF66005C, 0x00EC0000, 0x00000000, 0x42700000, 0xFF66005C, + 0x00EC0000, 0x00000000, 0x42700000, 0xFF66005C, 0x00EC0000, 0xFF000000, 0x42700000, 0xFF66005C, 0x00EC2D70, + 0x00000001, 0x000100DC, 0x01EB0000, 0x00000000, 0x42700001, 0xFFFE007A, 0x00270222, 0x00000000, 0x42700001, + 0xFFFE007A, 0x002700FA, 0x00000000, 0x42700001, 0xFFFE0066, 0x00270000, 0x00000000, 0x42700001, 0xFFFE005A, + 0x00270000, 0x00000000, 0x42700001, 0xFFFE0051, 0x003E0000, 0x00000000, 0x42700001, 0xFFFE0051, 0x003E0000, + 0x00000000, 0x42700001, 0xFFFE0051, 0x003E0000, 0x00000000, 0x42700001, 0xFFFE0051, 0x003E0000, 0x00000000, + 0x42700001, 0xFFFE0051, 0x003E2D70, 0xFF000000, 0x42700001, 0xFFFE0051, 0x003E0085, 0x00000002, 0x00010000, + 0x01180000, 0x0000001E, 0x42700000, 0x002B0034, 0x02CC0222, 0x0000001E, 0x42700000, 0x002B0034, 0x02CC00FA, + 0x0000000A, 0x42700000, 0x002B0034, 0x02CC0000, 0x0000000A, 0x42700000, 0x002B0034, 0x02CC0000, 0x0000000A, + 0x42700000, 0x002B0034, 0x02CC0000, 0x0000000A, 0x42700000, 0x003F0056, 0x02D20000, 0x0000001E, 0x42700000, + 0x003F0056, 0x02D20000, 0x0000001E, 0x42700000, 0x003F0056, 0x02D20000, 0x0000001E, 0x42700000, 0x003F0056, + 0x02D22D70, 0x0000001E, 0x42700000, 0x003F0055, 0x02D10085, 0x0000001E, 0x42700000, 0x003F0055, 0x02D101E6, + 0xFF00001E, 0x42700000, 0x003E0055, 0x02D10000, 0x00000002, 0x0001005A, 0x01680000, 0x0000001E, 0x42700000, + 0xFF970053, 0x016E0222, 0x0000001E, 0x42700000, 0xFF980053, 0x016C00FA, 0x0000001E, 0x42700000, 0xFFC10053, + 0x01530000, 0x0000001E, 0x42700000, 0xFFF00063, 0x00FF0000, 0x0000001E, 0x42700000, 0xFFE2006F, 0x00B10000, + 0x0000001E, 0x42700000, 0xFFB00070, 0x00790000, 0x0000001E, 0x42700000, 0xFFB00070, 0x00790000, 0x0000001E, + 0x42700000, 0xFFB00070, 0x00790000, 0xFF00001E, 0x42700000, 0xFFB00070, 0x00792D70, 0x00000002, 0x000100DC, + 0x02080000, 0x0000001E, 0x42700001, 0x00000089, 0xFFC90222, 0x0000001E, 0x42700001, 0x00000089, 0xFFC900FA, + 0x0000001E, 0x42700001, 0x00000075, 0xFFC90000, 0x0000001E, 0x42700001, 0x00000069, 0xFFC90000, 0x0000001E, + 0x42700001, 0x00000062, 0xFFE10000, 0x0000001E, 0x42700001, 0x00000062, 0xFFE10000, 0x0000001E, 0x42700001, + 0x00000062, 0xFFE10000, 0x0000001E, 0x42700001, 0x00000062, 0xFFE10000, 0x0000001E, 0x42700001, 0x00000062, + 0xFFE12D70, 0xFF00001E, 0x42700001, 0x00000062, 0xFFE10085, 0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000000, +}; + +const ActorInit Bg_Toki_Swd_InitVars = { ACTOR_BG_TOKI_SWD, ACTORTYPE_PROP, ROOM, @@ -22,19 +162,136 @@ const ActorInit Bg_Toki_Swd_InitVars = (ActorFunc)BgTokiSwd_Update, (ActorFunc)BgTokiSwd_Draw, }; -*/ -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Toki_Swd/func_808BAE40.s") -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Toki_Swd/BgTokiSwd_Init.s") +static ColliderCylinderInit colliderInit = { + 0x0A, 0x00, 0x00, 0x39, 0x12, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFFCFFFFF, 0x00, 0x00, + 0x00, 0x00, 0xFFCFFFFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0000, 0x0001, 0x0000, 0x000A, 0x0046, 0x0000, +}; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Toki_Swd/BgTokiSwd_Destroy.s") +static Sub98Init4 sub98Init = { + 0x0A, + 0x0023, + 0x0064, + 0xFF, +}; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Toki_Swd/func_808BAF40.s") +static InitChainEntry initChain[] = { + ICHAIN_VEC3F_DIV1000(scale, 0x19, ICHAIN_STOP), +}; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Toki_Swd/func_808BB0AC.s") +static void BgTokiSwd_SetupAction(BgTokiSwd* this, ActorFunc actionFunc) { + this->actionFunc = actionFunc; +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Toki_Swd/func_808BB128.s") +static void BgTokiSwd_Init(BgTokiSwd* this, GlobalContext* globalCtx) { + ColliderCylinderMain* collision; + Actor* thisx = &this->actor; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Toki_Swd/BgTokiSwd_Update.s") + Actor_ProcessInitChain(thisx, initChain); + this->actor.shape.unk_08 = 800.0f; + BgTokiSwd_SetupAction(thisx, func_808BAF40); + collision = &this->collider; + if (LINK_IS_ADULT) { + thisx->draw = NULL; + } -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Toki_Swd/BgTokiSwd_Draw.s") + if (gSaveContext.scene_setup_index == 5) { + globalCtx->unk_11D30[0] = 0xFF; + } + + ActorCollider_AllocCylinder(globalCtx, collision); + ActorCollider_InitCylinder(globalCtx, collision, thisx, &colliderInit); + ActorCollider_Cylinder_Update(thisx, collision); + func_80061ED4(&thisx->sub_98, 0, &sub98Init); +} + +static void BgTokiSwd_Destroy(BgTokiSwd* this, GlobalContext* globalCtx) { + ColliderCylinderMain* collider = &this->collider; + ActorCollider_FreeCylinder(globalCtx, collider); +} + +static void func_808BAF40(BgTokiSwd* this, GlobalContext* globalCtx) { + if (((gSaveContext.event_chk_inf[4] & 0x8000) == 0) && (gSaveContext.scene_setup_index < 4) && + (func_8002E12C(&this->actor, 800.0f, 0x7530) != 0) && (func_800BFC84(globalCtx) == 0)) { + gSaveContext.event_chk_inf[4] |= 0x8000; + globalCtx->csCtx.segment = D_808BBD90; + gSaveContext.cutscene_trigger = 1; + } + if (LINK_IS_CHILD || ((gSaveContext.event_chk_inf[5] & 0x20) != 0)) { + if (func_8002F410(&this->actor, globalCtx) != 0) { + if (LINK_IS_CHILD) { + Item_Give(globalCtx, ITEM_SWORD_MASTER); + globalCtx->csCtx.segment = D_808BB2F0; + } else { + globalCtx->csCtx.segment = D_808BB7A0; + } + Audio_SetBGM(NA_BGM_STOP); + Audio_SetBGM(NA_SE_PL_BOUND_DIRT); + gSaveContext.cutscene_trigger = 1; + this->actor.attachedA = 0; + BgTokiSwd_SetupAction(this, func_808BB0AC); + } else { + if (func_8002E084(&this->actor, 0x2000) != 0) { + func_8002F580(&this->actor, globalCtx); + } + } + } + if (gSaveContext.scene_setup_index == 5) { + if (globalCtx->unk_11D30[0] > 0) { + globalCtx->unk_11D30[0]--; + } else { + globalCtx->unk_11D30[0] = 0; + } + } +} + +static void func_808BB0AC(BgTokiSwd* this, GlobalContext* globalCtx) { + Player* player; + + // if attached is set, sword has been pulled/placed from the pedestal + if (func_8002F410(&this->actor, globalCtx) != 0) { + if (LINK_IS_CHILD) { + Audio_PlayActorSound2(&this->actor, NA_SE_IT_SWORD_PUTAWAY_STN); + this->actor.draw = NULL; // sword has been pulled, dont draw sword + } else { + this->actor.draw = BgTokiSwd_Draw; // sword has been placed, draw the master sword + } + BgTokiSwd_SetupAction(this, func_808BB128); + } else { + player = PLAYER; + player->interactRangeActor = &this->actor; + } +} + +static void func_808BB128(BgTokiSwd* this, GlobalContext* globalCtx) { + if ((func_8006C4A4(globalCtx, 1) != 0) && (globalCtx->unk_11D30[0] < 0xFF)) { + globalCtx->unk_11D30[0] += 5; + } +} + +static void BgTokiSwd_Update(BgTokiSwd* this, GlobalContext* globalCtx) { + this->actionFunc(&this->actor, globalCtx); + Actor_CollisionCheck_SetOT(globalCtx, &globalCtx->sub_11E60, &this->collider); +} + +static void BgTokiSwd_Draw(BgTokiSwd* this, GlobalContext* globalCtx) { + s32 pad[4]; + GameState* state; + GraphicsContext* gfxCtx; + Gfx* dispRefs[4]; + state = &globalCtx->state; + gfxCtx = globalCtx->state.gfxCtx; + + Graph_OpenDisps(dispRefs, state->gfxCtx, "../z_bg_toki_swd.c", 727); + func_80093D18(globalCtx->state.gfxCtx); + + func_8002EBCC(&this->actor, globalCtx, 0); + + gSPSegment(gfxCtx->polyOpa.p++, 0x08, + Gfx_TexScroll(globalCtx->state.gfxCtx, 0, -(globalCtx->gameplayFrames % 0x80), 32, 32)); + gSPMatrix(gfxCtx->polyOpa.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_bg_toki_swd.c", 742), + G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + gSPDisplayList(gfxCtx->polyOpa.p++, &D_06001BD0); + + Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_bg_toki_swd.c", 776); +} diff --git a/src/overlays/actors/ovl_Bg_Toki_Swd/z_bg_toki_swd.h b/src/overlays/actors/ovl_Bg_Toki_Swd/z_bg_toki_swd.h index 535268eb27..4fd13fbb0b 100644 --- a/src/overlays/actors/ovl_Bg_Toki_Swd/z_bg_toki_swd.h +++ b/src/overlays/actors/ovl_Bg_Toki_Swd/z_bg_toki_swd.h @@ -4,10 +4,10 @@ #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ Actor actor; - /* 0x014C */ char unk_14C[0x50]; + /* 0x014C */ ActorFunc actionFunc; + /* 0x0150 */ ColliderCylinderMain collider; } BgTokiSwd; // size = 0x019C extern const ActorInit Bg_Toki_Swd_InitVars; 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 1234536404..3ba91b2052 100644 --- a/src/overlays/actors/ovl_Bg_Treemouth/z_bg_treemouth.c +++ b/src/overlays/actors/ovl_Bg_Treemouth/z_bg_treemouth.c @@ -1,6 +1,6 @@ #include "z_bg_treemouth.h" -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x00000030 void BgTreemouth_Init(BgTreemouth* this, GlobalContext* globalCtx); @@ -9,8 +9,7 @@ void BgTreemouth_Update(BgTreemouth* this, GlobalContext* globalCtx); void BgTreemouth_Draw(BgTreemouth* this, GlobalContext* globalCtx); /* -const ActorInit Bg_Treemouth_InitVars = -{ +const ActorInit Bg_Treemouth_InitVars = { ACTOR_BG_TREEMOUTH, ACTORTYPE_BG, ROOM, diff --git a/src/overlays/actors/ovl_Bg_Treemouth/z_bg_treemouth.h b/src/overlays/actors/ovl_Bg_Treemouth/z_bg_treemouth.h index 82a53bffd4..04ebf7f946 100644 --- a/src/overlays/actors/ovl_Bg_Treemouth/z_bg_treemouth.h +++ b/src/overlays/actors/ovl_Bg_Treemouth/z_bg_treemouth.h @@ -4,8 +4,7 @@ #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ Actor actor; /* 0x014C */ char unk_14C[0x24]; } BgTreemouth; // size = 0x0170 diff --git a/src/overlays/actors/ovl_Bg_Umajump/z_bg_umajump.c b/src/overlays/actors/ovl_Bg_Umajump/z_bg_umajump.c index dfeff5acb8..9e0118502b 100644 --- a/src/overlays/actors/ovl_Bg_Umajump/z_bg_umajump.c +++ b/src/overlays/actors/ovl_Bg_Umajump/z_bg_umajump.c @@ -2,20 +2,19 @@ * File: z_bg_umajump.c * Overlay: ovl_Bg_Umajump * Description: Hoppable horse fence -*/ + */ #include #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ Actor actor; - /* 0x014C */ u32 dynaPolyId; - /* 0x0150 */ char unk_150[0x14]; + /* 0x014C */ u32 dynaPolyId; + /* 0x0150 */ char unk_150[0x14]; } ActorBgUmajump; // size = 0x0164 -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x00000000 static void Init(ActorBgUmajump* this, GlobalContext* globalCtx); @@ -23,8 +22,7 @@ static void Destroy(ActorBgUmajump* this, GlobalContext* globalCtx); static void Update(ActorBgUmajump* this, GlobalContext* globalCtx); static void Draw(ActorBgUmajump* this, GlobalContext* globalCtx); -const ActorInit Bg_Umajump_InitVars = -{ +const ActorInit Bg_Umajump_InitVars = { ACTOR_BG_UMAJUMP, ACTORTYPE_PROP, ROOM, @@ -34,19 +32,17 @@ const ActorInit Bg_Umajump_InitVars = (ActorFunc)Init, (ActorFunc)Destroy, (ActorFunc)Update, - (ActorFunc)Draw + (ActorFunc)Draw, }; -extern D_06001438; //segmented address: 0x06001438 -extern D_06001220; //segmented address: 0x06001220 +extern D_06001438; // segmented address: 0x06001438 +extern D_06001220; // segmented address: 0x06001220 -static InitChainEntry initChain[] = -{ - ICHAIN_VEC3F_DIV1000(scale, 100, ICHAIN_STOP) +static InitChainEntry initChain[] = { + ICHAIN_VEC3F_DIV1000(scale, 100, ICHAIN_STOP), }; -static void Init(ActorBgUmajump* this, GlobalContext* globalCtx) -{ +static void Init(ActorBgUmajump* this, GlobalContext* globalCtx) { s32 pad[2]; u32 sp24 = 0; @@ -55,10 +51,8 @@ static void Init(ActorBgUmajump* this, GlobalContext* globalCtx) DynaPolyInfo_Alloc(&D_06001438, &sp24); this->dynaPolyId = DynaPolyInfo_RegisterActor(globalCtx, &globalCtx->colCtx.dyna, &this->actor, sp24); - if (this->actor.params == 1) - { - if ((!Flags_GetEventChkInf(0x18)) && (DREG(1) == 0)) - { + if (this->actor.params == 1) { + if ((!Flags_GetEventChkInf(0x18)) && (DREG(1) == 0)) { Actor_Kill(&this->actor); return; } @@ -66,17 +60,13 @@ static void Init(ActorBgUmajump* this, GlobalContext* globalCtx) } } -static void Destroy(ActorBgUmajump* this, GlobalContext* globalCtx) -{ +static void Destroy(ActorBgUmajump* this, GlobalContext* globalCtx) { DynaPolyInfo_Free(globalCtx, &globalCtx->colCtx.dyna, this->dynaPolyId); } -static void Update(ActorBgUmajump* this, GlobalContext* globalCtx) -{ - +static void Update(ActorBgUmajump* this, GlobalContext* globalCtx) { } -static void Draw(ActorBgUmajump* this, GlobalContext* globalCtx) -{ - Draw_DListOpa(globalCtx, &D_06001220); +static void Draw(ActorBgUmajump* this, GlobalContext* globalCtx) { + Gfx_DrawDListOpa(globalCtx, &D_06001220); } diff --git a/src/overlays/actors/ovl_Bg_Vb_Sima/z_bg_vb_sima.c b/src/overlays/actors/ovl_Bg_Vb_Sima/z_bg_vb_sima.c index 81d3a61e2b..88fae70528 100644 --- a/src/overlays/actors/ovl_Bg_Vb_Sima/z_bg_vb_sima.c +++ b/src/overlays/actors/ovl_Bg_Vb_Sima/z_bg_vb_sima.c @@ -1,6 +1,6 @@ #include "z_bg_vb_sima.h" -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x00000000 void BgVbSima_Init(BgVbSima* this, GlobalContext* globalCtx); @@ -9,8 +9,7 @@ void BgVbSima_Update(BgVbSima* this, GlobalContext* globalCtx); void BgVbSima_Draw(BgVbSima* this, GlobalContext* globalCtx); /* -const ActorInit Bg_Vb_Sima_InitVars = -{ +const ActorInit Bg_Vb_Sima_InitVars = { ACTOR_BG_VB_SIMA, ACTORTYPE_BG, ROOM, diff --git a/src/overlays/actors/ovl_Bg_Vb_Sima/z_bg_vb_sima.h b/src/overlays/actors/ovl_Bg_Vb_Sima/z_bg_vb_sima.h index 9ebf0b72e5..019b2b1b3a 100644 --- a/src/overlays/actors/ovl_Bg_Vb_Sima/z_bg_vb_sima.h +++ b/src/overlays/actors/ovl_Bg_Vb_Sima/z_bg_vb_sima.h @@ -4,8 +4,7 @@ #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ Actor actor; /* 0x014C */ char unk_14C[0x30]; } BgVbSima; // size = 0x017C 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 b5b2c87ce5..57e671fbd2 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 @@ -1,6 +1,6 @@ #include "z_bg_ydan_hasi.h" -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x00000030 void BgYdanHasi_Init(BgYdanHasi* this, GlobalContext* globalCtx); @@ -9,8 +9,7 @@ void BgYdanHasi_Update(BgYdanHasi* this, GlobalContext* globalCtx); void BgYdanHasi_Draw(BgYdanHasi* this, GlobalContext* globalCtx); /* -const ActorInit Bg_Ydan_Hasi_InitVars = -{ +const ActorInit Bg_Ydan_Hasi_InitVars = { ACTOR_BG_YDAN_HASI, ACTORTYPE_BG, ROOM, diff --git a/src/overlays/actors/ovl_Bg_Ydan_Hasi/z_bg_ydan_hasi.h b/src/overlays/actors/ovl_Bg_Ydan_Hasi/z_bg_ydan_hasi.h index a3c63196f9..e28f071d96 100644 --- a/src/overlays/actors/ovl_Bg_Ydan_Hasi/z_bg_ydan_hasi.h +++ b/src/overlays/actors/ovl_Bg_Ydan_Hasi/z_bg_ydan_hasi.h @@ -4,8 +4,7 @@ #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ Actor actor; /* 0x014C */ char unk_14C[0x20]; } BgYdanHasi; // size = 0x016C diff --git a/src/overlays/actors/ovl_Bg_Ydan_Maruta/z_bg_ydan_maruta.c b/src/overlays/actors/ovl_Bg_Ydan_Maruta/z_bg_ydan_maruta.c index 069100d59e..653e10c887 100644 --- a/src/overlays/actors/ovl_Bg_Ydan_Maruta/z_bg_ydan_maruta.c +++ b/src/overlays/actors/ovl_Bg_Ydan_Maruta/z_bg_ydan_maruta.c @@ -1,6 +1,6 @@ #include "z_bg_ydan_maruta.h" -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x00000000 void BgYdanMaruta_Init(BgYdanMaruta* this, GlobalContext* globalCtx); @@ -9,8 +9,7 @@ void BgYdanMaruta_Update(BgYdanMaruta* this, GlobalContext* globalCtx); void BgYdanMaruta_Draw(BgYdanMaruta* this, GlobalContext* globalCtx); /* -const ActorInit Bg_Ydan_Maruta_InitVars = -{ +const ActorInit Bg_Ydan_Maruta_InitVars = { ACTOR_BG_YDAN_MARUTA, ACTORTYPE_PROP, ROOM, @@ -40,6 +39,3 @@ const ActorInit Bg_Ydan_Maruta_InitVars = #pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Ydan_Maruta/BgYdanMaruta_Update.s") #pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Ydan_Maruta/BgYdanMaruta_Draw.s") - - - diff --git a/src/overlays/actors/ovl_Bg_Ydan_Maruta/z_bg_ydan_maruta.h b/src/overlays/actors/ovl_Bg_Ydan_Maruta/z_bg_ydan_maruta.h index 03f82f48b3..45120c41d6 100644 --- a/src/overlays/actors/ovl_Bg_Ydan_Maruta/z_bg_ydan_maruta.h +++ b/src/overlays/actors/ovl_Bg_Ydan_Maruta/z_bg_ydan_maruta.h @@ -4,8 +4,7 @@ #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ Actor actor; /* 0x014C */ char unk_14C[0xF8]; } BgYdanMaruta; // size = 0x0244 diff --git a/src/overlays/actors/ovl_Bg_Ydan_Sp/z_bg_ydan_sp.c b/src/overlays/actors/ovl_Bg_Ydan_Sp/z_bg_ydan_sp.c index 79b7234961..5db87323ba 100644 --- a/src/overlays/actors/ovl_Bg_Ydan_Sp/z_bg_ydan_sp.c +++ b/src/overlays/actors/ovl_Bg_Ydan_Sp/z_bg_ydan_sp.c @@ -1,6 +1,6 @@ #include "z_bg_ydan_sp.h" -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x00000000 void BgYdanSp_Init(BgYdanSp* this, GlobalContext* globalCtx); @@ -9,8 +9,7 @@ void BgYdanSp_Update(BgYdanSp* this, GlobalContext* globalCtx); void BgYdanSp_Draw(BgYdanSp* this, GlobalContext* globalCtx); /* -const ActorInit Bg_Ydan_Sp_InitVars = -{ +const ActorInit Bg_Ydan_Sp_InitVars = { ACTOR_BG_YDAN_SP, ACTORTYPE_BG, ROOM, diff --git a/src/overlays/actors/ovl_Bg_Ydan_Sp/z_bg_ydan_sp.h b/src/overlays/actors/ovl_Bg_Ydan_Sp/z_bg_ydan_sp.h index 3d70d8a79b..371d348bad 100644 --- a/src/overlays/actors/ovl_Bg_Ydan_Sp/z_bg_ydan_sp.h +++ b/src/overlays/actors/ovl_Bg_Ydan_Sp/z_bg_ydan_sp.h @@ -4,8 +4,7 @@ #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ Actor actor; /* 0x014C */ char unk_14C[0xFC]; } BgYdanSp; // size = 0x0248 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 5bc3369bb2..d10c9ea57d 100644 --- a/src/overlays/actors/ovl_Bg_Zg/z_bg_zg.c +++ b/src/overlays/actors/ovl_Bg_Zg/z_bg_zg.c @@ -1,16 +1,39 @@ +/* + * File: z_bg_zg.c + * Overlay: ovl_Bg_Zg + * Description: Metal bars (Ganon's Castle) + */ + #include "z_bg_zg.h" -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x00000010 -void BgZg_Init(BgZg* this, GlobalContext* globalCtx); -void BgZg_Destroy(BgZg* this, GlobalContext* globalCtx); -void BgZg_Update(BgZg* this, GlobalContext* globalCtx); -void BgZg_Draw(BgZg* this, GlobalContext* globalCtx); +static void BgZg_Init(BgZg* this, GlobalContext* globalCtx); +static void BgZg_Destroy(BgZg* this, GlobalContext* globalCtx); +static void BgZg_Update(BgZg* this, GlobalContext* globalCtx); +static void BgZg_Draw(BgZg* this, GlobalContext* globalCtx); +static void func_808C0C50(BgZg* this); +static s32 func_808C0C98(BgZg* this, GlobalContext* globalCtx); +static s32 func_808C0CC8(BgZg* this); +static void func_808C0CD4(BgZg* this, GlobalContext* globalCtx); +static void func_808C0D08(BgZg* this, GlobalContext* globalCtx); +static void func_808C0EEC(BgZg* this, GlobalContext* globalCtx); -/* -const ActorInit Bg_Zg_InitVars = -{ +static const ActorFunc actionFuncs[] = { + (ActorFunc)func_808C0CD4, + (ActorFunc)func_808C0D08, +}; + +static InitChainEntry initChain[] = { + ICHAIN_VEC3F_DIV1000(scale, 1000, ICHAIN_STOP), +}; + +static const ActorFunc drawFuncs[] = { + (ActorFunc)func_808C0EEC, +}; + +const ActorInit Bg_Zg_InitVars = { ACTOR_BG_ZG, ACTORTYPE_NPC, ROOM, @@ -22,23 +45,104 @@ const ActorInit Bg_Zg_InitVars = (ActorFunc)BgZg_Update, (ActorFunc)BgZg_Draw, }; -*/ -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Zg/BgZg_Destroy.s") -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Zg/func_808C0C50.s") +extern u32 D_06001080; +extern u32 D_060011D4; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Zg/func_808C0C98.s") +static void BgZg_Destroy(BgZg* this, GlobalContext* globalCtx) { + DynaPolyInfo_Free(globalCtx, &globalCtx->colCtx.dyna, this->dyna.dynaPolyId); +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Zg/func_808C0CC8.s") +static void func_808C0C50(BgZg* this) { + Audio_PlaySoundGeneral(NA_SE_EV_METALDOOR_OPEN, &this->dyna.actor.unk_E4, 4, &D_801333E0, &D_801333E0, &D_801333E8); +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Zg/func_808C0CD4.s") +static s32 func_808C0C98(BgZg* this, GlobalContext* globalCtx) { + Actor* thisx = &this->dyna.actor; + s32 flag = (thisx->params >> 8) & 0xFF; + return Flags_GetSwitch(globalCtx, flag); +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Zg/func_808C0D08.s") +static s32 func_808C0CC8(BgZg* this) { + s32 flag = this->dyna.actor.params & 0xFF; + return flag; +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Zg/BgZg_Update.s") +static void func_808C0CD4(BgZg* this, GlobalContext* globalCtx) { + if (func_808C0C98(this, globalCtx) != 0) { + this->action = 1; + func_808C0C50(this); + } +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Zg/BgZg_Init.s") +static void func_808C0D08(BgZg* this, GlobalContext* globalCtx) { + Actor* thisx = &this->dyna.actor; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Zg/func_808C0EEC.s") + thisx->posRot.pos.y += (kREG(16) + 20.0f) * 1.2f; + if ((((kREG(17) + 200.0f) * 1.2f) + thisx->initPosRot.pos.y) <= thisx->posRot.pos.y) { + Actor_Kill(thisx); + } +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Zg/BgZg_Draw.s") +static void BgZg_Update(BgZg* this, GlobalContext* globalCtx) { + s32 action = this->action; + + if (((action < 0) || (1 < action)) || (actionFuncs[action] == NULL)) { + // Translates to: "Main Mode is wrong!!!!!!!!!!!!!!!!!!!!!!!!!" + osSyncPrintf(VT_FGCOL(RED) "メインモードがおかしい!!!!!!!!!!!!!!!!!!!!!!!!!\n" VT_RST); + } else { + actionFuncs[action](&this->dyna.actor, globalCtx); + } +} + +static void BgZg_Init(BgZg* this, GlobalContext* globalCtx) { + s32 sp20[2]; + Actor* thisx = &this->dyna.actor; + u32 local_c; + + Actor_ProcessInitChain(thisx, initChain); + DynaPolyInfo_SetActorMove(thisx, DPM_UNK); + local_c = 0; + DynaPolyInfo_Alloc(&D_060011D4, &local_c); + this->dyna.dynaPolyId = DynaPolyInfo_RegisterActor(globalCtx, &globalCtx->colCtx.dyna, thisx, local_c); + if ((func_808C0CC8(this) == 8) || (func_808C0CC8(this) == 9)) { + thisx->scale.x = thisx->scale.x * 1.3f; + thisx->scale.z = thisx->scale.z * 1.3f; + thisx->scale.y = thisx->scale.y * 1.2f; + } + + this->action = 0; + this->drawConfig = 0; + if (func_808C0C98(this, globalCtx) != 0) { + Actor_Kill(thisx); + } +} + +static void func_808C0EEC(BgZg* this, GlobalContext* globalCtx) { + + GraphicsContext* gfxCtx; + GraphicsContext* tempgfxCtx; // oddly needs this to match + Gfx* dispRefs[4]; + + tempgfxCtx = globalCtx->state.gfxCtx; + gfxCtx = tempgfxCtx; + Graph_OpenDisps(dispRefs, gfxCtx, "../z_bg_zg.c", 311); + + func_80093D18(gfxCtx); + gSPMatrix(gfxCtx->polyOpa.p++, Matrix_NewMtx(gfxCtx, "../z_bg_zg.c", 315), + G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + + gSPDisplayList(gfxCtx->polyOpa.p++, &D_06001080); + Graph_CloseDisps(dispRefs, gfxCtx, "../z_bg_zg.c", 320); +} + +static void BgZg_Draw(BgZg* this, GlobalContext* globalCtx) { + s32 action = this->drawConfig; + + if (((action < 0) || (action > 0)) || drawFuncs[action] == NULL) { + // Translates to: "Drawing mode is wrong !!!!!!!!!!!!!!!!!!!!!!!!!" + osSyncPrintf(VT_FGCOL(RED) "描画モードがおかしい!!!!!!!!!!!!!!!!!!!!!!!!!\n" VT_RST); + } else { + drawFuncs[action](this, globalCtx); + } +} diff --git a/src/overlays/actors/ovl_Bg_Zg/z_bg_zg.h b/src/overlays/actors/ovl_Bg_Zg/z_bg_zg.h index 3a856be401..ab959e101b 100644 --- a/src/overlays/actors/ovl_Bg_Zg/z_bg_zg.h +++ b/src/overlays/actors/ovl_Bg_Zg/z_bg_zg.h @@ -3,11 +3,12 @@ #include #include +#include -typedef struct -{ - /* 0x0000 */ Actor actor; - /* 0x014C */ char unk_14C[0x20]; +typedef struct { + /* 0x0000 */ DynaPolyActor dyna; + /* 0x0164 */ s32 action; + /* 0x0168 */ s32 drawConfig; } BgZg; // size = 0x016C extern const ActorInit Bg_Zg_InitVars; diff --git a/src/overlays/actors/ovl_Boss_Dodongo/z_boss_dodongo.c b/src/overlays/actors/ovl_Boss_Dodongo/z_boss_dodongo.c index 68cff5fa7e..02583c9a6b 100644 --- a/src/overlays/actors/ovl_Boss_Dodongo/z_boss_dodongo.c +++ b/src/overlays/actors/ovl_Boss_Dodongo/z_boss_dodongo.c @@ -1,6 +1,6 @@ #include "z_boss_dodongo.h" -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x00000035 void BossDodongo_Init(BossDodongo* this, GlobalContext* globalCtx); @@ -9,8 +9,7 @@ void BossDodongo_Update(BossDodongo* this, GlobalContext* globalCtx); void BossDodongo_Draw(BossDodongo* this, GlobalContext* globalCtx); /* -const ActorInit Boss_Dodongo_InitVars = -{ +const ActorInit Boss_Dodongo_InitVars = { ACTOR_EN_DODONGO, ACTORTYPE_BOSS, ROOM, diff --git a/src/overlays/actors/ovl_Boss_Dodongo/z_boss_dodongo.h b/src/overlays/actors/ovl_Boss_Dodongo/z_boss_dodongo.h index 080bffc72b..49a07c917d 100644 --- a/src/overlays/actors/ovl_Boss_Dodongo/z_boss_dodongo.h +++ b/src/overlays/actors/ovl_Boss_Dodongo/z_boss_dodongo.h @@ -4,8 +4,7 @@ #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ Actor actor; /* 0x014C */ char unk_14C[0x16D4]; } BossDodongo; // size = 0x1820 diff --git a/src/overlays/actors/ovl_Boss_Fd/z_boss_fd.c b/src/overlays/actors/ovl_Boss_Fd/z_boss_fd.c index 40e2274ca8..ac7f21165b 100644 --- a/src/overlays/actors/ovl_Boss_Fd/z_boss_fd.c +++ b/src/overlays/actors/ovl_Boss_Fd/z_boss_fd.c @@ -1,6 +1,6 @@ #include "z_boss_fd.h" -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x00000035 void BossFd_Init(BossFd* this, GlobalContext* globalCtx); @@ -9,8 +9,7 @@ void BossFd_Update(BossFd* this, GlobalContext* globalCtx); void BossFd_Draw(BossFd* this, GlobalContext* globalCtx); /* -const ActorInit Boss_Fd_InitVars = -{ +const ActorInit Boss_Fd_InitVars = { ACTOR_BOSS_FD, ACTORTYPE_BOSS, ROOM, diff --git a/src/overlays/actors/ovl_Boss_Fd/z_boss_fd.h b/src/overlays/actors/ovl_Boss_Fd/z_boss_fd.h index ae578e7464..be2c70ca7e 100644 --- a/src/overlays/actors/ovl_Boss_Fd/z_boss_fd.h +++ b/src/overlays/actors/ovl_Boss_Fd/z_boss_fd.h @@ -4,8 +4,7 @@ #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ Actor actor; /* 0x014C */ char unk_14C[0x4254]; } BossFd; // size = 0x43A0 diff --git a/src/overlays/actors/ovl_Boss_Fd2/z_boss_fd2.c b/src/overlays/actors/ovl_Boss_Fd2/z_boss_fd2.c index e51697fc73..9fb62f18d0 100644 --- a/src/overlays/actors/ovl_Boss_Fd2/z_boss_fd2.c +++ b/src/overlays/actors/ovl_Boss_Fd2/z_boss_fd2.c @@ -1,6 +1,6 @@ #include "z_boss_fd2.h" -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x00000035 void BossFd2_Init(BossFd2* this, GlobalContext* globalCtx); @@ -9,8 +9,7 @@ void BossFd2_Update(BossFd2* this, GlobalContext* globalCtx); void BossFd2_Draw(BossFd2* this, GlobalContext* globalCtx); /* -const ActorInit Boss_Fd2_InitVars = -{ +const ActorInit Boss_Fd2_InitVars = { ACTOR_BOSS_FD2, ACTORTYPE_BOSS, ROOM, diff --git a/src/overlays/actors/ovl_Boss_Fd2/z_boss_fd2.h b/src/overlays/actors/ovl_Boss_Fd2/z_boss_fd2.h index c935af8c0e..3d37e66ba9 100644 --- a/src/overlays/actors/ovl_Boss_Fd2/z_boss_fd2.h +++ b/src/overlays/actors/ovl_Boss_Fd2/z_boss_fd2.h @@ -4,8 +4,7 @@ #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ Actor actor; /* 0x014C */ char unk_14C[0x1530]; } BossFd2; // size = 0x167C diff --git a/src/overlays/actors/ovl_Boss_Ganon/z_boss_ganon.c b/src/overlays/actors/ovl_Boss_Ganon/z_boss_ganon.c index cd14e40388..a9947929c8 100644 --- a/src/overlays/actors/ovl_Boss_Ganon/z_boss_ganon.c +++ b/src/overlays/actors/ovl_Boss_Ganon/z_boss_ganon.c @@ -1,6 +1,6 @@ #include "z_boss_ganon.h" -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x00000035 void BossGanon_Init(BossGanon* this, GlobalContext* globalCtx); @@ -9,8 +9,7 @@ void BossGanon_Update(BossGanon* this, GlobalContext* globalCtx); void BossGanon_Draw(BossGanon* this, GlobalContext* globalCtx); /* -const ActorInit Boss_Ganon_InitVars = -{ +const ActorInit Boss_Ganon_InitVars = { ACTOR_BOSS_GANON, ACTORTYPE_BOSS, ROOM, @@ -158,4 +157,3 @@ const ActorInit Boss_Ganon_InitVars = #pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808E3564.s") #pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Boss_Ganon/func_808E3D84.s") - diff --git a/src/overlays/actors/ovl_Boss_Ganon/z_boss_ganon.h b/src/overlays/actors/ovl_Boss_Ganon/z_boss_ganon.h index 058196fb5b..2be2e94ed5 100644 --- a/src/overlays/actors/ovl_Boss_Ganon/z_boss_ganon.h +++ b/src/overlays/actors/ovl_Boss_Ganon/z_boss_ganon.h @@ -4,8 +4,7 @@ #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ Actor actor; /* 0x014C */ char unk_14C[0x5D0]; } BossGanon; // size = 0x071C diff --git a/src/overlays/actors/ovl_Boss_Ganon2/z_boss_ganon2.c b/src/overlays/actors/ovl_Boss_Ganon2/z_boss_ganon2.c index 2b45483587..2b01583980 100644 --- a/src/overlays/actors/ovl_Boss_Ganon2/z_boss_ganon2.c +++ b/src/overlays/actors/ovl_Boss_Ganon2/z_boss_ganon2.c @@ -1,6 +1,6 @@ #include "z_boss_ganon2.h" -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x00000035 void BossGanon2_Init(BossGanon2* this, GlobalContext* globalCtx); @@ -9,8 +9,7 @@ void BossGanon2_Update(BossGanon2* this, GlobalContext* globalCtx); void BossGanon2_Draw(BossGanon2* this, GlobalContext* globalCtx); /* -const ActorInit Boss_Ganon2_InitVars = -{ +const ActorInit Boss_Ganon2_InitVars = { ACTOR_BOSS_GANON2, ACTORTYPE_BOSS, ROOM, @@ -132,4 +131,3 @@ const ActorInit Boss_Ganon2_InitVars = #pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_809069F8.s") #pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Boss_Ganon2/func_80906AB0.s") - diff --git a/src/overlays/actors/ovl_Boss_Ganon2/z_boss_ganon2.h b/src/overlays/actors/ovl_Boss_Ganon2/z_boss_ganon2.h index 9c5d15019b..6b6db36c5e 100644 --- a/src/overlays/actors/ovl_Boss_Ganon2/z_boss_ganon2.h +++ b/src/overlays/actors/ovl_Boss_Ganon2/z_boss_ganon2.h @@ -4,8 +4,7 @@ #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ Actor actor; /* 0x014C */ char unk_14C[0x798]; } BossGanon2; // size = 0x08E4 diff --git a/src/overlays/actors/ovl_Boss_Ganondrof/z_boss_ganondrof.c b/src/overlays/actors/ovl_Boss_Ganondrof/z_boss_ganondrof.c index 91f88442b4..9be8ee8a5f 100644 --- a/src/overlays/actors/ovl_Boss_Ganondrof/z_boss_ganondrof.c +++ b/src/overlays/actors/ovl_Boss_Ganondrof/z_boss_ganondrof.c @@ -1,6 +1,6 @@ #include "z_boss_ganondrof.h" -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x00000035 void BossGanondrof_Init(BossGanondrof* this, GlobalContext* globalCtx); @@ -9,8 +9,7 @@ void BossGanondrof_Update(BossGanondrof* this, GlobalContext* globalCtx); void BossGanondrof_Draw(BossGanondrof* this, GlobalContext* globalCtx); /* -const ActorInit Boss_Ganondrof_InitVars = -{ +const ActorInit Boss_Ganondrof_InitVars = { ACTOR_BOSS_GANONDROF, ACTORTYPE_BOSS, ROOM, diff --git a/src/overlays/actors/ovl_Boss_Ganondrof/z_boss_ganondrof.h b/src/overlays/actors/ovl_Boss_Ganondrof/z_boss_ganondrof.h index 599bc0a416..914c6f93cd 100644 --- a/src/overlays/actors/ovl_Boss_Ganondrof/z_boss_ganondrof.h +++ b/src/overlays/actors/ovl_Boss_Ganondrof/z_boss_ganondrof.h @@ -4,8 +4,7 @@ #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ Actor actor; /* 0x014C */ char unk_14C[0x42C]; } BossGanondrof; // size = 0x0578 diff --git a/src/overlays/actors/ovl_Boss_Goma/z_boss_goma.c b/src/overlays/actors/ovl_Boss_Goma/z_boss_goma.c index c69737c805..5292e63a7e 100644 --- a/src/overlays/actors/ovl_Boss_Goma/z_boss_goma.c +++ b/src/overlays/actors/ovl_Boss_Goma/z_boss_goma.c @@ -1,6 +1,6 @@ #include "z_boss_goma.h" -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x00000035 void BossGoma_Init(BossGoma* this, GlobalContext* globalCtx); @@ -9,8 +9,7 @@ void BossGoma_Update(BossGoma* this, GlobalContext* globalCtx); void BossGoma_Draw(BossGoma* this, GlobalContext* globalCtx); /* -const ActorInit Boss_Goma_InitVars = -{ +const ActorInit Boss_Goma_InitVars = { ACTOR_BOSS_GOMA, ACTORTYPE_BOSS, ROOM, diff --git a/src/overlays/actors/ovl_Boss_Goma/z_boss_goma.h b/src/overlays/actors/ovl_Boss_Goma/z_boss_goma.h index f2f4bed056..1688420d95 100644 --- a/src/overlays/actors/ovl_Boss_Goma/z_boss_goma.h +++ b/src/overlays/actors/ovl_Boss_Goma/z_boss_goma.h @@ -4,8 +4,7 @@ #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ Actor actor; /* 0x014C */ char unk_14C[0x9D0]; } BossGoma; // size = 0x0B1C diff --git a/src/overlays/actors/ovl_Boss_Mo/z_boss_mo.c b/src/overlays/actors/ovl_Boss_Mo/z_boss_mo.c index 64465f48d0..96262d3207 100644 --- a/src/overlays/actors/ovl_Boss_Mo/z_boss_mo.c +++ b/src/overlays/actors/ovl_Boss_Mo/z_boss_mo.c @@ -1,6 +1,6 @@ #include "z_boss_mo.h" -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x00000035 void BossMo_Init(BossMo* this, GlobalContext* globalCtx); @@ -9,8 +9,7 @@ void BossMo_Update(BossMo* this, GlobalContext* globalCtx); void BossMo_Draw(BossMo* this, GlobalContext* globalCtx); /* -const ActorInit Boss_Mo_InitVars = -{ +const ActorInit Boss_Mo_InitVars = { ACTOR_BOSS_MO, ACTORTYPE_BOSS, ROOM, @@ -74,4 +73,3 @@ const ActorInit Boss_Mo_InitVars = #pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Boss_Mo/func_80925480.s") #pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Boss_Mo/func_80925C18.s") - diff --git a/src/overlays/actors/ovl_Boss_Mo/z_boss_mo.h b/src/overlays/actors/ovl_Boss_Mo/z_boss_mo.h index d2097fae4f..f8d42f3b94 100644 --- a/src/overlays/actors/ovl_Boss_Mo/z_boss_mo.h +++ b/src/overlays/actors/ovl_Boss_Mo/z_boss_mo.h @@ -4,8 +4,7 @@ #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ Actor actor; /* 0x014C */ char unk_14C[0x1440]; } BossMo; // size = 0x158C diff --git a/src/overlays/actors/ovl_Boss_Sst/z_boss_sst.c b/src/overlays/actors/ovl_Boss_Sst/z_boss_sst.c index 82eaf37e83..de391f92fb 100644 --- a/src/overlays/actors/ovl_Boss_Sst/z_boss_sst.c +++ b/src/overlays/actors/ovl_Boss_Sst/z_boss_sst.c @@ -1,6 +1,6 @@ #include "z_boss_sst.h" -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x00000435 void BossSst_Init(BossSst* this, GlobalContext* globalCtx); @@ -9,8 +9,7 @@ void BossSst_Update(BossSst* this, GlobalContext* globalCtx); void BossSst_Draw(BossSst* this, GlobalContext* globalCtx); /* -const ActorInit Boss_Sst_InitVars = -{ +const ActorInit Boss_Sst_InitVars = { ACTOR_BOSS_SST, ACTORTYPE_BOSS, ROOM, @@ -306,4 +305,3 @@ const ActorInit Boss_Sst_InitVars = #pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_809360FC.s") #pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Boss_Sst/func_8093639C.s") - diff --git a/src/overlays/actors/ovl_Boss_Sst/z_boss_sst.h b/src/overlays/actors/ovl_Boss_Sst/z_boss_sst.h index a490941799..5a68f78104 100644 --- a/src/overlays/actors/ovl_Boss_Sst/z_boss_sst.h +++ b/src/overlays/actors/ovl_Boss_Sst/z_boss_sst.h @@ -4,8 +4,7 @@ #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ Actor actor; /* 0x014C */ char unk_14C[0x94C]; } BossSst; // size = 0x0A98 diff --git a/src/overlays/actors/ovl_Boss_Tw/z_boss_tw.c b/src/overlays/actors/ovl_Boss_Tw/z_boss_tw.c index 29925e7110..2c69d0438b 100644 --- a/src/overlays/actors/ovl_Boss_Tw/z_boss_tw.c +++ b/src/overlays/actors/ovl_Boss_Tw/z_boss_tw.c @@ -1,6 +1,6 @@ #include "z_boss_tw.h" -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x00000035 void BossTw_Init(BossTw* this, GlobalContext* globalCtx); @@ -9,8 +9,7 @@ void BossTw_Update(BossTw* this, GlobalContext* globalCtx); void BossTw_Draw(BossTw* this, GlobalContext* globalCtx); /* -const ActorInit Boss_Tw_InitVars = -{ +const ActorInit Boss_Tw_InitVars = { ACTOR_BOSS_TW, ACTORTYPE_BOSS, ROOM, @@ -202,4 +201,3 @@ const ActorInit Boss_Tw_InitVars = #pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8094A6D8.s") #pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Boss_Tw/func_8094A740.s") - diff --git a/src/overlays/actors/ovl_Boss_Tw/z_boss_tw.h b/src/overlays/actors/ovl_Boss_Tw/z_boss_tw.h index ad2e3006c2..4fe49f172e 100644 --- a/src/overlays/actors/ovl_Boss_Tw/z_boss_tw.h +++ b/src/overlays/actors/ovl_Boss_Tw/z_boss_tw.h @@ -4,8 +4,7 @@ #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ Actor actor; /* 0x014C */ char unk_14C[0x568]; } BossTw; // size = 0x06B4 diff --git a/src/overlays/actors/ovl_Boss_Va/z_boss_va.c b/src/overlays/actors/ovl_Boss_Va/z_boss_va.c index 1b706f0568..e96a00d6c7 100644 --- a/src/overlays/actors/ovl_Boss_Va/z_boss_va.c +++ b/src/overlays/actors/ovl_Boss_Va/z_boss_va.c @@ -1,6 +1,6 @@ #include "z_boss_va.h" -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x00000035 void BossVa_Init(BossVa* this, GlobalContext* globalCtx); @@ -9,8 +9,7 @@ void BossVa_Update(BossVa* this, GlobalContext* globalCtx); void BossVa_Draw(BossVa* this, GlobalContext* globalCtx); /* -const ActorInit Boss_Va_InitVars = -{ +const ActorInit Boss_Va_InitVars = { ACTOR_BOSS_VA, ACTORTYPE_BOSS, ROOM, @@ -176,4 +175,3 @@ const ActorInit Boss_Va_InitVars = #pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Boss_Va/func_8095BBD0.s") #pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Boss_Va/func_8095BD24.s") - diff --git a/src/overlays/actors/ovl_Boss_Va/z_boss_va.h b/src/overlays/actors/ovl_Boss_Va/z_boss_va.h index 188cf6fa16..4649741234 100644 --- a/src/overlays/actors/ovl_Boss_Va/z_boss_va.h +++ b/src/overlays/actors/ovl_Boss_Va/z_boss_va.h @@ -4,8 +4,7 @@ #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ Actor actor; /* 0x014C */ char unk_14C[0x26C]; } BossVa; // size = 0x03B8 diff --git a/src/overlays/actors/ovl_Demo_6K/z_demo_6k.c b/src/overlays/actors/ovl_Demo_6K/z_demo_6k.c index a85be15722..3ff8fe0b6f 100644 --- a/src/overlays/actors/ovl_Demo_6K/z_demo_6k.c +++ b/src/overlays/actors/ovl_Demo_6K/z_demo_6k.c @@ -1,6 +1,6 @@ #include "z_demo_6k.h" -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x00000010 void Demo6K_Init(Demo6K* this, GlobalContext* globalCtx); @@ -8,8 +8,7 @@ void Demo6K_Destroy(Demo6K* this, GlobalContext* globalCtx); void Demo6K_Update(Demo6K* this, GlobalContext* globalCtx); /* -const ActorInit Demo_6K_InitVars = -{ +const ActorInit Demo_6K_InitVars = { ACTOR_DEMO_6K, ACTORTYPE_PROP, ROOM, diff --git a/src/overlays/actors/ovl_Demo_6K/z_demo_6k.h b/src/overlays/actors/ovl_Demo_6K/z_demo_6k.h index 3fd4cb929f..6a75229c55 100644 --- a/src/overlays/actors/ovl_Demo_6K/z_demo_6k.h +++ b/src/overlays/actors/ovl_Demo_6K/z_demo_6k.h @@ -4,8 +4,7 @@ #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ Actor actor; /* 0x014C */ char unk_14C[0x148]; } Demo6K; // size = 0x0294 diff --git a/src/overlays/actors/ovl_Demo_Du/z_demo_du.c b/src/overlays/actors/ovl_Demo_Du/z_demo_du.c index e5b0a70786..7de6e24a55 100644 --- a/src/overlays/actors/ovl_Demo_Du/z_demo_du.c +++ b/src/overlays/actors/ovl_Demo_Du/z_demo_du.c @@ -1,6 +1,6 @@ #include "z_demo_du.h" -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x00000010 void DemoDu_Init(DemoDu* this, GlobalContext* globalCtx); @@ -9,8 +9,7 @@ void DemoDu_Update(DemoDu* this, GlobalContext* globalCtx); void DemoDu_Draw(DemoDu* this, GlobalContext* globalCtx); /* -const ActorInit Demo_Du_InitVars = -{ +const ActorInit Demo_Du_InitVars = { ACTOR_DEMO_DU, ACTORTYPE_NPC, ROOM, diff --git a/src/overlays/actors/ovl_Demo_Du/z_demo_du.h b/src/overlays/actors/ovl_Demo_Du/z_demo_du.h index 4b83fa4cc0..7e7c7625ed 100644 --- a/src/overlays/actors/ovl_Demo_Du/z_demo_du.h +++ b/src/overlays/actors/ovl_Demo_Du/z_demo_du.h @@ -4,8 +4,7 @@ #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ Actor actor; /* 0x014C */ char unk_14C[0x68]; } DemoDu; // size = 0x01B4 diff --git a/src/overlays/actors/ovl_Demo_Ec/z_demo_ec.c b/src/overlays/actors/ovl_Demo_Ec/z_demo_ec.c index 755fe69418..a52882a0ed 100644 --- a/src/overlays/actors/ovl_Demo_Ec/z_demo_ec.c +++ b/src/overlays/actors/ovl_Demo_Ec/z_demo_ec.c @@ -1,6 +1,6 @@ #include "z_demo_ec.h" -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x00000010 void DemoEc_Init(DemoEc* this, GlobalContext* globalCtx); @@ -9,8 +9,7 @@ void DemoEc_Update(DemoEc* this, GlobalContext* globalCtx); void DemoEc_Draw(DemoEc* this, GlobalContext* globalCtx); /* -const ActorInit Demo_Ec_InitVars = -{ +const ActorInit Demo_Ec_InitVars = { ACTOR_DEMO_EC, ACTORTYPE_NPC, ROOM, diff --git a/src/overlays/actors/ovl_Demo_Ec/z_demo_ec.h b/src/overlays/actors/ovl_Demo_Ec/z_demo_ec.h index a8fdd9f4a6..749dff3d6c 100644 --- a/src/overlays/actors/ovl_Demo_Ec/z_demo_ec.h +++ b/src/overlays/actors/ovl_Demo_Ec/z_demo_ec.h @@ -4,8 +4,7 @@ #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ Actor actor; /* 0x014C */ char unk_14C[0x5C]; } DemoEc; // size = 0x01A8 diff --git a/src/overlays/actors/ovl_Demo_Effect/z_demo_effect.c b/src/overlays/actors/ovl_Demo_Effect/z_demo_effect.c index 656e660eef..4c8e87eb4a 100644 --- a/src/overlays/actors/ovl_Demo_Effect/z_demo_effect.c +++ b/src/overlays/actors/ovl_Demo_Effect/z_demo_effect.c @@ -1,6 +1,6 @@ #include "z_demo_effect.h" -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x00000030 void DemoEffect_Init(DemoEffect* this, GlobalContext* globalCtx); @@ -8,8 +8,7 @@ void DemoEffect_Destroy(DemoEffect* this, GlobalContext* globalCtx); void DemoEffect_Update(DemoEffect* this, GlobalContext* globalCtx); /* -const ActorInit Demo_Effect_InitVars = -{ +const ActorInit Demo_Effect_InitVars = { ACTOR_DEMO_EFFECT, ACTORTYPE_BG, ROOM, diff --git a/src/overlays/actors/ovl_Demo_Effect/z_demo_effect.h b/src/overlays/actors/ovl_Demo_Effect/z_demo_effect.h index ad6052a754..8c6e3c99d4 100644 --- a/src/overlays/actors/ovl_Demo_Effect/z_demo_effect.h +++ b/src/overlays/actors/ovl_Demo_Effect/z_demo_effect.h @@ -4,8 +4,7 @@ #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ Actor actor; /* 0x014C */ char unk_14C[0x54]; } DemoEffect; // size = 0x01A0 diff --git a/src/overlays/actors/ovl_Demo_Ext/z_demo_ext.c b/src/overlays/actors/ovl_Demo_Ext/z_demo_ext.c index 9d5aa45d67..5d19fffd48 100644 --- a/src/overlays/actors/ovl_Demo_Ext/z_demo_ext.c +++ b/src/overlays/actors/ovl_Demo_Ext/z_demo_ext.c @@ -1,6 +1,6 @@ #include "z_demo_ext.h" -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x00000010 void DemoExt_Init(DemoExt* this, GlobalContext* globalCtx); @@ -9,8 +9,7 @@ void DemoExt_Update(DemoExt* this, GlobalContext* globalCtx); void DemoExt_Draw(DemoExt* this, GlobalContext* globalCtx); /* -const ActorInit Demo_Ext_InitVars = -{ +const ActorInit Demo_Ext_InitVars = { ACTOR_DEMO_EXT, ACTORTYPE_NPC, ROOM, diff --git a/src/overlays/actors/ovl_Demo_Ext/z_demo_ext.h b/src/overlays/actors/ovl_Demo_Ext/z_demo_ext.h index 32e3f5d291..3bd5f8a3de 100644 --- a/src/overlays/actors/ovl_Demo_Ext/z_demo_ext.h +++ b/src/overlays/actors/ovl_Demo_Ext/z_demo_ext.h @@ -4,8 +4,7 @@ #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ Actor actor; /* 0x014C */ char unk_14C[0x38]; } DemoExt; // size = 0x0184 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 91d539939a..e4f632a9c6 100644 --- a/src/overlays/actors/ovl_Demo_Geff/z_demo_geff.c +++ b/src/overlays/actors/ovl_Demo_Geff/z_demo_geff.c @@ -1,16 +1,48 @@ +/* + * File: z_demo_geff.c + * Overlay: Demo_Geff + * Description: + */ + #include "z_demo_geff.h" -#define ROOM 0x00 +#include + +#define ROOM 0x00 #define FLAGS 0x00000030 -void DemoGeff_Init(DemoGeff* this, GlobalContext* globalCtx); -void DemoGeff_Destroy(DemoGeff* this, GlobalContext* globalCtx); -void DemoGeff_Update(DemoGeff* this, GlobalContext* globalCtx); -void DemoGeff_Draw(DemoGeff* this, GlobalContext* globalCtx); +static void DemoGeff_Init(DemoGeff* this, GlobalContext* globalCtx); +static void DemoGeff_Destroy(DemoGeff* this, GlobalContext* globalCtx); +static void DemoGeff_Update(DemoGeff* this, GlobalContext* globalCtx); +static void DemoGeff_Draw(DemoGeff* this, GlobalContext* globalCtx); -/* -const ActorInit Demo_Geff_InitVars = -{ +static void func_80978030(DemoGeff* this, GlobalContext* globalCtx); + +static void func_809783D4(DemoGeff* this, GlobalContext* globalCtx); +static void func_80978308(DemoGeff* this, GlobalContext* globalCtx); + +static void func_809784D4(DemoGeff* this, GlobalContext* globalCtx); +static void func_80978344(DemoGeff* this, GlobalContext* globalCtx); + +s16 objectIds[] = { + OBJECT_GEFF, OBJECT_GEFF, OBJECT_GEFF, OBJECT_GEFF, OBJECT_GEFF, OBJECT_GEFF, OBJECT_GEFF, OBJECT_GEFF, OBJECT_GEFF, +}; + +ActorFunc scaleFuncs[] = { + (ActorFunc)func_80978030, (ActorFunc)func_80978030, (ActorFunc)func_80978030, + (ActorFunc)func_80978030, (ActorFunc)func_80978030, (ActorFunc)func_80978030, + (ActorFunc)func_80978030, (ActorFunc)func_80978030, (ActorFunc)func_80978030, +}; +ActorFunc actionFuncs[] = { + (ActorFunc)func_809783D4, + (ActorFunc)func_80978308, +}; +ActorFunc drawFuncs[] = { + (ActorFunc)func_809784D4, + (ActorFunc)func_80978344, +}; + +const ActorInit Demo_Geff_InitVars = { ACTOR_DEMO_GEFF, ACTORTYPE_BOSS, ROOM, @@ -22,33 +54,175 @@ const ActorInit Demo_Geff_InitVars = (ActorFunc)DemoGeff_Update, (ActorFunc)DemoGeff_Draw, }; -*/ -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Geff/DemoGeff_Destroy.s") -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Geff/DemoGeff_Init.s") +extern UNK_TYPE D_06000EA0; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Geff/func_80977EA8.s") +static void DemoGeff_Destroy(DemoGeff* this, GlobalContext* globalCtx) { +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Geff/func_80977F80.s") +static void DemoGeff_Init(DemoGeff* this, GlobalContext* globalCtx) { + if (this->actor.params < 0 || this->actor.params >= 9) { + osSyncPrintf(VT_FGCOL(RED) "Demo_Geff_Actor_ct:arg_dataがおかしい!!!!!!!!!!!!\n" VT_RST); + Actor_Kill(&this->actor); + return; + } + this->action = 0; + this->drawConfig = 0; +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Geff/func_80978030.s") +static void func_80977EA8(GlobalContext* globalCtx, u32 dlist) { + GraphicsContext* gfxCtx = globalCtx->state.gfxCtx; + Gfx* dispRefs[5]; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Geff/func_809780E0.s") + Graph_OpenDisps(dispRefs, gfxCtx, "../z_demo_geff.c", 181); + func_80093D18(gfxCtx); -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Geff/func_809781FC.s") + gSPMatrix(gfxCtx->polyOpa.p++, Matrix_NewMtx(gfxCtx, "../z_demo_geff.c", 183), + G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + gSPDisplayList(gfxCtx->polyOpa.p++, dlist); + gSPPopMatrix(gfxCtx->polyOpa.p++, G_MTX_MODELVIEW); -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Geff/func_809782A0.s") + Graph_CloseDisps(dispRefs, gfxCtx, "../z_demo_geff.c", 188); +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Geff/func_80978308.s") +static void func_80977F80(DemoGeff* this, GlobalContext* globalCtx) { + s32 pad[2]; + s32 objBankIndex = this->objBankIndex; + GraphicsContext* gfxCtx = globalCtx->state.gfxCtx; + Gfx* dispRefs[5]; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Geff/func_80978344.s") + Graph_OpenDisps(dispRefs, gfxCtx, "../z_demo_geff.c", 204); -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Geff/func_80978370.s") + gSPSegment(gfxCtx->polyOpa.p++, 0x06, globalCtx->objectCtx.status[objBankIndex].segment); + gSegments[6] = PHYSICAL_TO_VIRTUAL(globalCtx->objectCtx.status[objBankIndex].segment); -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Geff/func_809783D4.s") + // Necessary to match + if (!globalCtx) {} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Geff/DemoGeff_Update.s") + Graph_CloseDisps(dispRefs, gfxCtx, "../z_demo_geff.c", 212); +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Geff/func_809784D4.s") +static void func_80978030(DemoGeff* this, GlobalContext* globalCtx) { + Vec3f* thisScale = &this->actor.scale; + this->action = 1; + this->drawConfig = 1; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Geff/DemoGeff_Draw.s") + switch (this->actor.params) { + case 0: + case 3: + case 6: + thisScale->x = (kREG(7) * 0.01f) + 0.3f; + thisScale->y = (kREG(8) * 0.01f) + 0.3f; + thisScale->z = (kREG(9) * 0.01f) + 0.3f; + break; + case 1: + case 4: + case 7: + thisScale->x = (kREG(10) * 0.01f) + 0.15f; + thisScale->y = (kREG(11) * 0.01f) + 0.29f; + thisScale->z = (kREG(12) * 0.01f) + 0.12f; + break; + default: + thisScale->x = (kREG(13) * 0.01f) + 0.1f; + thisScale->y = (kREG(14) * 0.01f) + 0.15f; + thisScale->z = (kREG(15) * 0.01f) + 0.2f; + break; + } +} + +static void func_809781FC(DemoGeff* this, GlobalContext* globalCtx) { + s32 targetParams = 2; + Actor* propIt; + + if (this->demoGt == NULL) { + propIt = globalCtx->actorCtx.actorList[ACTORTYPE_PROP].first; + if ((this->actor.params != 0) && (this->actor.params != 1) && (this->actor.params != 2)) { + targetParams = 2; + } else { + targetParams = 1; + } + while (propIt != NULL) { + if (propIt->id == ACTOR_DEMO_GT && propIt->params == targetParams) { + this->deltaPosX = this->actor.posRot.pos.x - propIt->posRot.pos.x; + this->deltaPosY = this->actor.posRot.pos.y - propIt->posRot.pos.y; + this->deltaPosZ = this->actor.posRot.pos.z - propIt->posRot.pos.z; + this->demoGt = propIt; + } + propIt = propIt->next; + } + } +} + +static void func_809782A0(DemoGeff* this, GlobalContext* globalCtx) { + DemoGt* demoGt = this->demoGt; + s16 params = this->actor.params; + if (demoGt != NULL && (params != 6) && (params != 7) && (params != 8)) { + this->actor.posRot.pos.x = demoGt->actor.posRot.pos.x + this->deltaPosX; + this->actor.posRot.pos.y = demoGt->actor.posRot.pos.y + this->deltaPosY; + this->actor.posRot.pos.z = demoGt->actor.posRot.pos.z + this->deltaPosZ; + } +} + +static void func_80978308(DemoGeff* this, GlobalContext* globalCtx) { + func_809781FC(this, globalCtx); + func_809782A0(this, globalCtx); + func_80978030(this, globalCtx); +} + +static void func_80978344(DemoGeff* this, GlobalContext* globalCtx) { + func_80977EA8(globalCtx, &D_06000EA0); +} + +static void func_80978370(DemoGeff* this, GlobalContext* globalCtx) { + s16 params = this->actor.params; + ActorFunc actorFunc = scaleFuncs[params]; + if (actorFunc == NULL) { + osSyncPrintf(VT_FGCOL(RED) " Demo_Geff_main_init:初期化処理がおかしいarg_data = %d!\n" VT_RST, params); + Actor_Kill(&this->actor); + return; + } + actorFunc(this, globalCtx); +} + +static void func_809783D4(DemoGeff* this, GlobalContext* globalCtx) { + ObjectContext* objCtx = &globalCtx->objectCtx; + Actor* thisx = &this->actor; + s32 params = thisx->params; + s16 objectId = objectIds[params]; + s32 objBankIndex = Object_GetIndex(objCtx, objectId); + s32 pad; + + if (objBankIndex < 0) { + osSyncPrintf(VT_FGCOL(RED) "Demo_Geff_main_bank:バンクを読めない arg_data = %d!\n" VT_RST, params); + Actor_Kill(thisx); + return; + } + if (Object_IsLoaded(objCtx, objBankIndex)) { + this->objBankIndex = objBankIndex; + func_80978370(this, globalCtx); + } +} + +static void DemoGeff_Update(DemoGeff* this, GlobalContext* globalCtx) { + if (this->action < 0 || this->action >= 2 || actionFuncs[this->action] == NULL) { + osSyncPrintf(VT_FGCOL(RED) "メインモードがおかしい!!!!!!!!!!!!!!!!!!!!!!!!!\n" VT_RST); + return; + } + actionFuncs[this->action](this, globalCtx); +} + +static void func_809784D4(DemoGeff* this, GlobalContext* globalCtx) { +} + +static void DemoGeff_Draw(DemoGeff* this, GlobalContext* globalCtx) { + s32 drawConfig = this->drawConfig; + s16 pad; + if (drawConfig < 0 || drawConfig >= 2 || drawFuncs[drawConfig] == NULL) { + osSyncPrintf(VT_FGCOL(RED) "描画モードがおかしい!!!!!!!!!!!!!!!!!!!!!!!!!\n" VT_RST); + return; + } + if (drawConfig != 0) { + func_80977F80(this, globalCtx); + } + drawFuncs[drawConfig](this, globalCtx); +} diff --git a/src/overlays/actors/ovl_Demo_Geff/z_demo_geff.h b/src/overlays/actors/ovl_Demo_Geff/z_demo_geff.h index 6b8bf972b0..3438bada7b 100644 --- a/src/overlays/actors/ovl_Demo_Geff/z_demo_geff.h +++ b/src/overlays/actors/ovl_Demo_Geff/z_demo_geff.h @@ -4,10 +4,17 @@ #include #include -typedef struct -{ +#include "../ovl_Demo_Gt/z_demo_gt.h" + +typedef struct { /* 0x0000 */ Actor actor; - /* 0x014C */ char unk_14C[0x1C]; + /* 0x014C */ s32 action; + /* 0x0150 */ s32 drawConfig; + /* 0x0154 */ s32 objBankIndex; + /* 0x0158 */ DemoGt* demoGt; + /* 0x015C */ f32 deltaPosX; + /* 0x0160 */ f32 deltaPosY; + /* 0x0164 */ f32 deltaPosZ; } DemoGeff; // size = 0x0168 extern const ActorInit Demo_Geff_InitVars; diff --git a/src/overlays/actors/ovl_Demo_Gj/z_demo_gj.c b/src/overlays/actors/ovl_Demo_Gj/z_demo_gj.c index 6b317aae0e..63b636bd59 100644 --- a/src/overlays/actors/ovl_Demo_Gj/z_demo_gj.c +++ b/src/overlays/actors/ovl_Demo_Gj/z_demo_gj.c @@ -1,6 +1,6 @@ #include "z_demo_gj.h" -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x00000030 void DemoGj_Init(DemoGj* this, GlobalContext* globalCtx); @@ -9,8 +9,7 @@ void DemoGj_Update(DemoGj* this, GlobalContext* globalCtx); void DemoGj_Draw(DemoGj* this, GlobalContext* globalCtx); /* -const ActorInit Demo_Gj_InitVars = -{ +const ActorInit Demo_Gj_InitVars = { ACTOR_DEMO_GJ, ACTORTYPE_PROP, ROOM, diff --git a/src/overlays/actors/ovl_Demo_Gj/z_demo_gj.h b/src/overlays/actors/ovl_Demo_Gj/z_demo_gj.h index 7b55ee8801..7ecc19ffd5 100644 --- a/src/overlays/actors/ovl_Demo_Gj/z_demo_gj.h +++ b/src/overlays/actors/ovl_Demo_Gj/z_demo_gj.h @@ -4,8 +4,7 @@ #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ Actor actor; /* 0x014C */ char unk_14C[0x12C]; } DemoGj; // size = 0x0278 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 4ed28c7486..a340b09921 100644 --- a/src/overlays/actors/ovl_Demo_Go/z_demo_go.c +++ b/src/overlays/actors/ovl_Demo_Go/z_demo_go.c @@ -2,11 +2,13 @@ * File: z_demo_go.c * Overlay: Demo_Go * Description: -*/ + */ #include "z_demo_go.h" -#define ROOM 0x00 +#include + +#define ROOM 0x00 #define FLAGS 0x00000010 void DemoGo_Init(DemoGo* this, GlobalContext* globalCtx); @@ -25,27 +27,18 @@ void func_8097D130(DemoGo* this, GlobalContext* globalCtx); void func_8097D290(DemoGo* this, GlobalContext* globalCtx); void func_8097D29C(DemoGo* this, GlobalContext* globalCtx); -u32 D_8097D440[] = {0x0600CE80, 0x0600D280, 0x0600D680}; +UNK_PTR D_8097D440[] = { 0x0600CE80, 0x0600D280, 0x0600D680 }; -ActorFunc D_8097D44C[] = -{ - func_8097CFDC, - func_8097CFFC, - func_8097D01C, - func_8097D058, - func_8097D088, - func_8097D0D0, - func_8097D130 +ActorFunc D_8097D44C[] = { + func_8097CFDC, func_8097CFFC, func_8097D01C, func_8097D058, func_8097D088, func_8097D0D0, func_8097D130, }; -ActorFunc D_8097D468[] = -{ +ActorFunc D_8097D468[] = { func_8097D290, - func_8097D29C + func_8097D29C, }; -const ActorInit Demo_Go_InitVars = -{ +const ActorInit Demo_Go_InitVars = { ACTOR_DEMO_GO, ACTORTYPE_NPC, ROOM, @@ -58,15 +51,14 @@ const ActorInit Demo_Go_InitVars = (ActorFunc)DemoGo_Draw, }; -extern u32 D_060029A8; -extern u32 D_0600FEF0; -extern u32 D_06004930; +extern AnimationHeader D_060029A8; +extern AnimationHeader D_06004930; +extern UNK_TYPE D_0600E680; +extern SkeletonHeader D_0600FEF0; -UNK_TYPE func_8097C870(DemoGo *this) -{ +UNK_TYPE func_8097C870(DemoGo* this) { s32 ret; - switch (this->actor.params) - { + switch (this->actor.params) { case 0: ret = 3; break; @@ -74,8 +66,7 @@ UNK_TYPE func_8097C870(DemoGo *this) ret = 4; break; default: - if (1) - { + if (1) { ret = 5; } break; @@ -83,145 +74,118 @@ UNK_TYPE func_8097C870(DemoGo *this) return ret; } -void func_8097C8A8(DemoGo* this, GlobalContext* globalCtx) -{ +void func_8097C8A8(DemoGo* this, GlobalContext* globalCtx) { s32 pad[2]; Actor* thisx = &this->actor; Vec3f* sp20; Vec3f* sp1C; - if ((thisx->params == 0) || (thisx->params == 1)) - { + if ((thisx->params == 0) || (thisx->params == 1)) { func_800A6E10(&globalCtx->mf_11D60, &thisx->posRot.pos, &sp20, &sp1C); Audio_PlaySoundAtPosition(globalCtx, &sp20, 0x14, 0x28A0); } } -void DemoGo_Destroy(DemoGo* this, GlobalContext* globalCtx) -{ - func_800A56F0(&this->skelAnime, globalCtx); +void DemoGo_Destroy(DemoGo* this, GlobalContext* globalCtx) { + SkelAnime_Free(&this->skelAnime, globalCtx); } -void func_8097C930(DemoGo* this) -{ +void func_8097C930(DemoGo* this) { s16* something = &this->unk_192; s16* other = &this->unk_190; s32 pad[3]; - s16 phi_v0; - if (*something == 0) { phi_v0 = 0; } else { *something -= 1; phi_v0 = *something;} - - if (phi_v0 == 0) - { + if (DECR(*something) == 0) { *something = Math_Rand_S16Offset(0x3C, 0x3C); } *other = *something; - if (*other >= 3) - { + if (*other >= 3) { *other = 0; } } -void func_8097C9B8(DemoGo* this) -{ +void func_8097C9B8(DemoGo* this) { func_80078914(&this->actor.unk_E4, NA_SE_EN_DODO_M_GND); } -void func_8097C9DC(DemoGo* this) -{ +void func_8097C9DC(DemoGo* this) { s32 pad[2]; - if (func_800A56C8(&this->skelAnime, 12.0f) || func_800A56C8(&this->skelAnime, 25.0f)) - { + if (func_800A56C8(&this->skelAnime, 12.0f) || func_800A56C8(&this->skelAnime, 25.0f)) { func_80078914(&this->actor.unk_E4, NA_SE_EN_MORIBLIN_WALK); } } -void func_8097CA30(DemoGo* this, GlobalContext* globalCtx) -{ +void func_8097CA30(DemoGo* this, GlobalContext* globalCtx) { func_8002E4B4(globalCtx, &this->actor, 75.0f, 30.0f, 30.0f, 5); } -void func_8097CA78(DemoGo* this, GlobalContext* globalCtx) -{ +void func_8097CA78(DemoGo* this, GlobalContext* globalCtx) { s16 pad; Vec3f vec = this->actor.posRot.pos; func_80033480(globalCtx, &vec, kREG(11) + 100.0f, kREG(12) + 0xA, kREG(13) + 0x12C, kREG(14), 0); func_8097C9B8(this); } -// Not equivalent, I believe in part due to actorAction->endPos being the wrong type, holding floats instead of ints -#ifdef NON_MATCHING void func_8097CB0C(DemoGo* this, GlobalContext* globalCtx) { Actor* thisx = &this->actor; + PosRot* posRot = &thisx->posRot; CutsceneContext* csCtx = &globalCtx->csCtx; - Vec3f startPos; - f32 temp_ret; CsCmdActorAction* actorAction; + f32 temp_ret; + s32 pad; + Vec3f startPos; + Vec3f endPos; - if (globalCtx->csCtx.state != 0) - { + if (globalCtx->csCtx.state != 0) { actorAction = csCtx->actorActions[func_8097C870(this)]; - if (actorAction != 0) - { + if (actorAction != NULL) { temp_ret = func_8006F93C(actorAction->endFrame, actorAction->startFrame, csCtx->frames); - startPos = actorAction->startPos; - thisx->posRot.pos.x = (((actorAction->endPos.x - startPos.x) * temp_ret) + startPos.x); - thisx->posRot.pos.y = (((actorAction->endPos.y - startPos.y) * temp_ret) + startPos.y); - thisx->posRot.pos.z = (((actorAction->endPos.z - startPos.z) * temp_ret) + startPos.z); - thisx->shape.rot.y = actorAction->rot.y; - thisx->posRot.rot.y = actorAction->rot.y; + startPos.x = actorAction->startPos.x; + startPos.y = actorAction->startPos.y; + startPos.z = actorAction->startPos.z; + endPos.x = actorAction->endPos.x; + endPos.y = actorAction->endPos.y; + endPos.z = actorAction->endPos.z; + posRot->pos.x = (((endPos.x - startPos.x) * temp_ret) + startPos.x); + posRot->pos.y = (((endPos.y - startPos.y) * temp_ret) + startPos.y); + posRot->pos.z = (((endPos.z - startPos.z) * temp_ret) + startPos.z); + posRot->rot.y = thisx->shape.rot.y = actorAction->rot.y; } } } -#else -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Go/func_8097CB0C.s") -#endif -void func_8097CC08(DemoGo* this) -{ +void func_8097CC08(DemoGo* this) { f32 something = this->unk_19C; - if (something < 8.0f) - { + if (something < 8.0f) { this->actor.speedXZ = (((kREG(15) * 0.01f) + 1.2f) * 0.125f) * something; - } - else - { + } else { this->actor.speedXZ = (kREG(15) * 0.01f) + 1.2f; } Actor_MoveForward(&this->actor); } -void func_8097CCC0(DemoGo* this) -{ +void func_8097CCC0(DemoGo* this) { Actor_MoveForward(&this->actor); } -void func_8097CCE0(DemoGo* this, GlobalContext* globalCtx) -{ +void func_8097CCE0(DemoGo* this, GlobalContext* globalCtx) { CsCmdActorAction* actorAction; Actor* thisx = &this->actor; s32 rotYDelta; s32 newRotY; s32 thisRotY; - if (globalCtx->csCtx.state != 0) - { + if (globalCtx->csCtx.state != 0) { actorAction = globalCtx->csCtx.actorActions[func_8097C870(this)]; - if (actorAction != 0) - { + if (actorAction != NULL) { thisRotY = thisx->posRot.rot.y; rotYDelta = actorAction->rot.y - thisRotY; - if ((rotYDelta > -(kREG(16) + 0x96)) && (rotYDelta < kREG(16) + 0x96)) - { + if ((rotYDelta > -(kREG(16) + 0x96)) && (rotYDelta < kREG(16) + 0x96)) { newRotY = actorAction->rot.y; - } - else if (rotYDelta > 0) - { + } else if (rotYDelta > 0) { newRotY = (thisRotY + kREG(16)) + 0x96; - } - else - { - newRotY = (thisRotY - kREG(16)) - 0x96; + } else { + newRotY = (thisRotY - kREG(16)) - 0x96; } thisx->shape.rot.y = newRotY; thisx->posRot.rot.y = newRotY; @@ -229,21 +193,17 @@ void func_8097CCE0(DemoGo* this, GlobalContext* globalCtx) } } -UNK_TYPE DemoGo_FrameUpdateMatrix(DemoGo* this) -{ +UNK_TYPE DemoGo_FrameUpdateMatrix(DemoGo* this) { return SkelAnime_FrameUpdateMatrix(&this->skelAnime); } -// This is probably at least close to equivalent but not necessarily so #ifdef NON_MATCHING -UNK_TYPE func_8097CDB0(DemoGo* this, GlobalContext* globalCtx, u16 csCmdActorAction) -{ +// return value isn't produced in the same way +s32 func_8097CDB0(DemoGo* this, GlobalContext* globalCtx, u16 csCmdActorAction) { CutsceneContext* csCtx = &globalCtx->csCtx; CsCmdActorAction* actorAction = csCtx->actorActions[func_8097C870(this)]; - if (csCtx->state != 0) - { - if (actorAction != 0 && actorAction->action == csCmdActorAction) - { + if (csCtx->state != 0) { + if (actorAction != NULL && actorAction->action == csCmdActorAction) { return 1; } } @@ -253,15 +213,12 @@ UNK_TYPE func_8097CDB0(DemoGo* this, GlobalContext* globalCtx, u16 csCmdActorAct #pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Go/func_8097CDB0.s") #endif -void func_8097CE10(DemoGo* this, GlobalContext* globalCtx) -{ +void func_8097CE10(DemoGo* this, GlobalContext* globalCtx) { this->action = 1; } -void func_8097CE20(DemoGo* this, GlobalContext* globalCtx) -{ - if (func_8097CDB0(this, globalCtx, 2)) - { +void func_8097CE20(DemoGo* this, GlobalContext* globalCtx) { + if (func_8097CDB0(this, globalCtx, 2)) { this->action = 2; this->drawConfig = 1; func_8097CB0C(this, globalCtx); @@ -269,75 +226,62 @@ void func_8097CE20(DemoGo* this, GlobalContext* globalCtx) } } -void func_8097CE78(DemoGo* this, GlobalContext* globalCtx) -{ +void func_8097CE78(DemoGo* this, GlobalContext* globalCtx) { CutsceneContext* csCtx = &globalCtx->csCtx; CsCmdActorAction* actorAction; - if (globalCtx->csCtx.state != 0) - { + if (globalCtx->csCtx.state != 0) { actorAction = csCtx->actorActions[func_8097C870(this)]; - if (actorAction != 0 && csCtx->frames >= actorAction->endFrame) - { + if (actorAction != NULL && csCtx->frames >= actorAction->endFrame) { func_8097CA78(this, globalCtx); this->action = 3; } } } -void func_8097CEEC(DemoGo* this, GlobalContext* globalCtx) -{ - if (func_8097CDB0(this, globalCtx, 3)) - { +void func_8097CEEC(DemoGo* this, GlobalContext* globalCtx) { + if (func_8097CDB0(this, globalCtx, 3)) { this->action = 4; } } -void func_8097CF20(DemoGo* this, GlobalContext* globalCtx, UNK_TYPE arg2) -{ - UNK_PTR animation = &D_060029A8; - if (arg2 != 0) - { - SkelAnime_ChangeAnimation(&this->skelAnime, animation, 1.0f, 0.0f, SkelAnime_GetFrameCount(animation), 0, -8.0f); +void func_8097CF20(DemoGo* this, GlobalContext* globalCtx, UNK_TYPE arg2) { + AnimationHeader* animation = &D_060029A8; + if (arg2 != 0) { + SkelAnime_ChangeAnim(&this->skelAnime, animation, 1.0f, 0.0f, + SkelAnime_GetFrameCount(&animation->genericHeader), 0, -8.0f); this->action = 5; this->unk_19C = 0.0f; } } -void func_8097CF9C(DemoGo* this) -{ +void func_8097CF9C(DemoGo* this) { this->unk_19C += 1.0f; - if (this->unk_19C >= 8.0f) - { + if (this->unk_19C >= 8.0f) { this->action = 6; } } -void func_8097CFDC(DemoGo* this, GlobalContext* globalCtx) -{ +void func_8097CFDC(DemoGo* this, GlobalContext* globalCtx) { func_8097CE10(this, globalCtx); } -void func_8097CFFC(DemoGo* this, GlobalContext* globalCtx) -{ +void func_8097CFFC(DemoGo* this, GlobalContext* globalCtx) { func_8097CE20(this, globalCtx); } -void func_8097D01C(DemoGo* this, GlobalContext* globalCtx) -{ +void func_8097D01C(DemoGo* this, GlobalContext* globalCtx) { func_8097CB0C(this, globalCtx); func_8097CA30(this, globalCtx); func_8097CE78(this, globalCtx); } -void func_8097D058(DemoGo* this, GlobalContext* globalCtx) -{ +void func_8097D058(DemoGo* this, GlobalContext* globalCtx) { func_8097CA30(this, globalCtx); func_8097CEEC(this, globalCtx); } -void func_8097D088(DemoGo* this, GlobalContext* globalCtx) -{ +void func_8097D088(DemoGo* this, GlobalContext* globalCtx) { UNK_TYPE something; func_8097CA30(this, globalCtx); something = DemoGo_FrameUpdateMatrix(this); @@ -345,8 +289,7 @@ void func_8097D088(DemoGo* this, GlobalContext* globalCtx) func_8097CF20(this, globalCtx, something); } -void func_8097D0D0(DemoGo* this, GlobalContext* globalCtx) -{ +void func_8097D0D0(DemoGo* this, GlobalContext* globalCtx) { func_8097CCE0(this, globalCtx); func_8097CCC0(this); func_8097CA30(this, globalCtx); @@ -355,8 +298,7 @@ void func_8097D0D0(DemoGo* this, GlobalContext* globalCtx) func_8097C9DC(this); func_8097CF9C(this); } -void func_8097D130(DemoGo* this, GlobalContext* globalCtx) -{ +void func_8097D130(DemoGo* this, GlobalContext* globalCtx) { func_8097CCE0(this, globalCtx); func_8097CC08(this); func_8097CA30(this, globalCtx); @@ -365,58 +307,52 @@ void func_8097D130(DemoGo* this, GlobalContext* globalCtx) func_8097C9DC(this); } -void DemoGo_Update(DemoGo* this, GlobalContext* globalCtx) -{ - if (this->action < 0 || this->action >= 7 || D_8097D44C[this->action] == 0) - { - osSyncPrintf("メインモードがおかしい!!!!!!!!!!!!!!!!!!!!!!!!!\n"); +void DemoGo_Update(DemoGo* this, GlobalContext* globalCtx) { + if (this->action < 0 || this->action >= 7 || D_8097D44C[this->action] == 0) { + osSyncPrintf(VT_FGCOL(RED) "メインモードがおかしい!!!!!!!!!!!!!!!!!!!!!!!!!\n" VT_RST); return; } D_8097D44C[this->action](this, globalCtx); } -void DemoGo_Init(DemoGo* this, GlobalContext* globalCtx) -{ - UNK_PTR animation = &D_06004930; +void DemoGo_Init(DemoGo* this, GlobalContext* globalCtx) { s16 pad; - + AnimationHeader* animation = &D_06004930; + ActorShape_Init(&this->actor.shape, 0.0f, ActorShadow_DrawFunc_Circle, 30.0f); - func_800A46F8(globalCtx, &this->skelAnime, &D_0600FEF0, 0, 0, 0, 0); - SkelAnime_ChangeAnimation(&this->skelAnime, animation, 1.0f, 0.0f, SkelAnime_GetFrameCount(animation), 2, 0.0f); + SkelAnime_InitSV(globalCtx, &this->skelAnime, &D_0600FEF0, NULL, NULL, NULL, 0); + SkelAnime_ChangeAnim(&this->skelAnime, animation, 1.0f, 0.0f, SkelAnime_GetFrameCount(&animation->genericHeader), 2, + 0.0f); this->action = 0; } -void func_8097D290(DemoGo* this, GlobalContext* globalCtx) -{ - +void func_8097D290(DemoGo* this, GlobalContext* globalCtx) { } -// Not equivalent yet - the gSPSegment calls are probably the main issue -#ifdef NON_MATCHING -extern u32 D_0600E680; -void func_8097D29C(DemoGo* this, GlobalContext* globalCtx) -{ - u32 addr = D_8097D440[this->unk_190]; - GraphicsContext* gfxCtx = &globalCtx->state.gfxCtx; - Gfx* gfxArr[4]; +void func_8097D29C(DemoGo* this, GlobalContext* globalCtx) { + s32 pad; + s16 temp = this->unk_190; + SkelAnime* skelAnime = &this->skelAnime; + void* srcSegment8 = D_8097D440[temp]; + void* srcSegment9 = &D_0600E680; + GraphicsContext* gfxCtx = globalCtx->state.gfxCtx; + Gfx* dispRefs[4]; + + Graph_OpenDisps(dispRefs, globalCtx->state.gfxCtx, "../z_demo_go.c", 732); - func_800C6AC4(gfxArr, globalCtx->state.gfxCtx, "../z_demo_go.c", 732); func_80093D18(globalCtx->state.gfxCtx); + gSPSegment(gfxCtx->polyOpa.p++, 0x08, SEGMENTED_TO_VIRTUAL(srcSegment8)); + gSPSegment(gfxCtx->polyOpa.p++, 0x09, SEGMENTED_TO_VIRTUAL(srcSegment9)); - gSPSegment(gfxCtx->polyOpa.p++, 0x08, SEGMENTED_TO_VIRTUAL(addr)); - gSPSegment(gfxCtx->polyOpa.p++, 0x09, SEGMENTED_TO_VIRTUAL(D_0600E680)); + SkelAnime_DrawSV(globalCtx, skelAnime->skeleton, skelAnime->actorDrawTbl, skelAnime->dListCount, NULL, NULL, + &this->actor); - func_800A1AC8(globalCtx, this->skelAnime.limbIndex, this->skelAnime.actorDrawTbl, this->skelAnime.dListCount, 0, 0, &this->actor); - func_800C6B54(gfxArr, globalCtx->state.gfxCtx, "../z_demo_go.c", 746); + Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_demo_go.c", 746); } -#else -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Go/func_8097D29C.s") -#endif void DemoGo_Draw(DemoGo* this, GlobalContext* globalCtx) { - if (this->drawConfig < 0 || this->drawConfig >= 2 || D_8097D468[this->drawConfig] == 0) - { - osSyncPrintf("描画モードがおかしい!!!!!!!!!!!!!!!!!!!!!!!!!\n"); + if (this->drawConfig < 0 || this->drawConfig >= 2 || D_8097D468[this->drawConfig] == 0) { + osSyncPrintf(VT_FGCOL(RED) "描画モードがおかしい!!!!!!!!!!!!!!!!!!!!!!!!!\n" VT_RST); return; } D_8097D468[this->drawConfig](this, globalCtx); diff --git a/src/overlays/actors/ovl_Demo_Go/z_demo_go.h b/src/overlays/actors/ovl_Demo_Go/z_demo_go.h index bc8ae977c0..4c67507efa 100644 --- a/src/overlays/actors/ovl_Demo_Go/z_demo_go.h +++ b/src/overlays/actors/ovl_Demo_Go/z_demo_go.h @@ -4,11 +4,9 @@ #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ Actor actor; /* 0x014C */ SkelAnime skelAnime; - /* 0x018C */ char unk_18C[0x4]; /* 0x0190 */ s16 unk_190; /* 0x0192 */ s16 unk_192; /* 0x0194 */ s32 action; diff --git a/src/overlays/actors/ovl_Demo_Gt/z_demo_gt.c b/src/overlays/actors/ovl_Demo_Gt/z_demo_gt.c index 20cfaea446..b09a261ffc 100644 --- a/src/overlays/actors/ovl_Demo_Gt/z_demo_gt.c +++ b/src/overlays/actors/ovl_Demo_Gt/z_demo_gt.c @@ -1,6 +1,6 @@ #include "z_demo_gt.h" -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x00000030 void DemoGt_Init(DemoGt* this, GlobalContext* globalCtx); @@ -9,8 +9,7 @@ void DemoGt_Update(DemoGt* this, GlobalContext* globalCtx); void DemoGt_Draw(DemoGt* this, GlobalContext* globalCtx); /* -const ActorInit Demo_Gt_InitVars = -{ +const ActorInit Demo_Gt_InitVars = { ACTOR_DEMO_GT, ACTORTYPE_PROP, ROOM, diff --git a/src/overlays/actors/ovl_Demo_Gt/z_demo_gt.h b/src/overlays/actors/ovl_Demo_Gt/z_demo_gt.h index adad6369eb..42d0ce5c4d 100644 --- a/src/overlays/actors/ovl_Demo_Gt/z_demo_gt.h +++ b/src/overlays/actors/ovl_Demo_Gt/z_demo_gt.h @@ -4,8 +4,7 @@ #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ Actor actor; /* 0x014C */ char unk_14C[0x5C]; } DemoGt; // size = 0x01A8 diff --git a/src/overlays/actors/ovl_Demo_Ik/z_demo_ik.c b/src/overlays/actors/ovl_Demo_Ik/z_demo_ik.c index 62db83bd26..31c99ae648 100644 --- a/src/overlays/actors/ovl_Demo_Ik/z_demo_ik.c +++ b/src/overlays/actors/ovl_Demo_Ik/z_demo_ik.c @@ -1,6 +1,6 @@ #include "z_demo_ik.h" -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x00000010 void DemoIk_Init(DemoIk* this, GlobalContext* globalCtx); @@ -9,8 +9,7 @@ void DemoIk_Update(DemoIk* this, GlobalContext* globalCtx); void DemoIk_Draw(DemoIk* this, GlobalContext* globalCtx); /* -const ActorInit Demo_Ik_InitVars = -{ +const ActorInit Demo_Ik_InitVars = { ACTOR_DEMO_IK, ACTORTYPE_NPC, ROOM, diff --git a/src/overlays/actors/ovl_Demo_Ik/z_demo_ik.h b/src/overlays/actors/ovl_Demo_Ik/z_demo_ik.h index d0515daedb..83d98cfff9 100644 --- a/src/overlays/actors/ovl_Demo_Ik/z_demo_ik.h +++ b/src/overlays/actors/ovl_Demo_Ik/z_demo_ik.h @@ -4,8 +4,7 @@ #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ Actor actor; /* 0x014C */ char unk_14C[0x68]; } DemoIk; // size = 0x01B4 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 4846b47a1b..ea42fdb521 100644 --- a/src/overlays/actors/ovl_Demo_Im/z_demo_im.c +++ b/src/overlays/actors/ovl_Demo_Im/z_demo_im.c @@ -1,6 +1,6 @@ #include "z_demo_im.h" -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x00000011 void DemoIm_Init(DemoIm* this, GlobalContext* globalCtx); @@ -9,8 +9,7 @@ void DemoIm_Update(DemoIm* this, GlobalContext* globalCtx); void DemoIm_Draw(DemoIm* this, GlobalContext* globalCtx); /* -const ActorInit Demo_Im_InitVars = -{ +const ActorInit Demo_Im_InitVars = { ACTOR_DEMO_IM, ACTORTYPE_NPC, ROOM, diff --git a/src/overlays/actors/ovl_Demo_Im/z_demo_im.h b/src/overlays/actors/ovl_Demo_Im/z_demo_im.h index df3255b3a9..9329900aaa 100644 --- a/src/overlays/actors/ovl_Demo_Im/z_demo_im.h +++ b/src/overlays/actors/ovl_Demo_Im/z_demo_im.h @@ -4,8 +4,7 @@ #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ Actor actor; /* 0x014C */ char unk_14C[0x1B0]; } DemoIm; // size = 0x02FC diff --git a/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo.c b/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo.c index f8cc3054a3..35f85bd400 100644 --- a/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo.c +++ b/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo.c @@ -1,6 +1,6 @@ #include "z_demo_kankyo.h" -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x00000030 void DemoKankyo_Init(DemoKankyo* this, GlobalContext* globalCtx); @@ -9,8 +9,7 @@ void DemoKankyo_Update(DemoKankyo* this, GlobalContext* globalCtx); void DemoKankyo_Draw(DemoKankyo* this, GlobalContext* globalCtx); /* -const ActorInit Demo_Kankyo_InitVars = -{ +const ActorInit Demo_Kankyo_InitVars = { ACTOR_DEMO_KANKYO, ACTORTYPE_BG, ROOM, @@ -70,4 +69,3 @@ const ActorInit Demo_Kankyo_InitVars = #pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_8098ABC0.s") #pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Kankyo/func_8098B354.s") - diff --git a/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo.h b/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo.h index 4a3d741477..42d7366cbc 100644 --- a/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo.h +++ b/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo.h @@ -4,8 +4,7 @@ #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ Actor actor; /* 0x014C */ char unk_14C[0x4B8]; } DemoKankyo; // size = 0x0604 diff --git a/src/overlays/actors/ovl_Demo_Kekkai/z_demo_kekkai.c b/src/overlays/actors/ovl_Demo_Kekkai/z_demo_kekkai.c index 6b1398901e..4df16f7cdf 100644 --- a/src/overlays/actors/ovl_Demo_Kekkai/z_demo_kekkai.c +++ b/src/overlays/actors/ovl_Demo_Kekkai/z_demo_kekkai.c @@ -1,6 +1,6 @@ #include "z_demo_kekkai.h" -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x00000030 void DemoKekkai_Init(DemoKekkai* this, GlobalContext* globalCtx); @@ -9,8 +9,7 @@ void DemoKekkai_Update(DemoKekkai* this, GlobalContext* globalCtx); void DemoKekkai_Draw(DemoKekkai* this, GlobalContext* globalCtx); /* -const ActorInit Demo_Kekkai_InitVars = -{ +const ActorInit Demo_Kekkai_InitVars = { ACTOR_DEMO_KEKKAI, ACTORTYPE_ITEMACTION, ROOM, diff --git a/src/overlays/actors/ovl_Demo_Kekkai/z_demo_kekkai.h b/src/overlays/actors/ovl_Demo_Kekkai/z_demo_kekkai.h index 7248e00b1d..4dda63a5cc 100644 --- a/src/overlays/actors/ovl_Demo_Kekkai/z_demo_kekkai.h +++ b/src/overlays/actors/ovl_Demo_Kekkai/z_demo_kekkai.h @@ -4,8 +4,7 @@ #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ Actor actor; /* 0x014C */ char unk_14C[0xB0]; } DemoKekkai; // size = 0x01FC 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 211a6ecc51..179dee1e86 100644 --- a/src/overlays/actors/ovl_Demo_Sa/z_demo_sa.c +++ b/src/overlays/actors/ovl_Demo_Sa/z_demo_sa.c @@ -1,6 +1,6 @@ #include "z_demo_sa.h" -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x00000010 void DemoSa_Init(DemoSa* this, GlobalContext* globalCtx); @@ -9,8 +9,7 @@ void DemoSa_Update(DemoSa* this, GlobalContext* globalCtx); void DemoSa_Draw(DemoSa* this, GlobalContext* globalCtx); /* -const ActorInit Demo_Sa_InitVars = -{ +const ActorInit Demo_Sa_InitVars = { ACTOR_DEMO_SA, ACTORTYPE_NPC, ROOM, diff --git a/src/overlays/actors/ovl_Demo_Sa/z_demo_sa.h b/src/overlays/actors/ovl_Demo_Sa/z_demo_sa.h index b873eb12c9..1d17aef02f 100644 --- a/src/overlays/actors/ovl_Demo_Sa/z_demo_sa.h +++ b/src/overlays/actors/ovl_Demo_Sa/z_demo_sa.h @@ -4,8 +4,7 @@ #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ Actor actor; /* 0x014C */ char unk_14C[0x68]; } DemoSa; // size = 0x01B4 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 02f60bd706..8c3faa1f5d 100644 --- a/src/overlays/actors/ovl_Demo_Shd/z_demo_shd.c +++ b/src/overlays/actors/ovl_Demo_Shd/z_demo_shd.c @@ -1,6 +1,6 @@ #include "z_demo_shd.h" -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x00000030 void DemoShd_Init(DemoShd* this, GlobalContext* globalCtx); @@ -9,8 +9,7 @@ void DemoShd_Update(DemoShd* this, GlobalContext* globalCtx); void DemoShd_Draw(DemoShd* this, GlobalContext* globalCtx); /* -const ActorInit Demo_Shd_InitVars = -{ +const ActorInit Demo_Shd_InitVars = { ACTOR_DEMO_SHD, ACTORTYPE_ITEMACTION, ROOM, diff --git a/src/overlays/actors/ovl_Demo_Shd/z_demo_shd.h b/src/overlays/actors/ovl_Demo_Shd/z_demo_shd.h index dc7921a0d0..f074cfb9d1 100644 --- a/src/overlays/actors/ovl_Demo_Shd/z_demo_shd.h +++ b/src/overlays/actors/ovl_Demo_Shd/z_demo_shd.h @@ -4,8 +4,7 @@ #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ Actor actor; /* 0x014C */ char unk_14C[0x8]; } DemoShd; // size = 0x0154 diff --git a/src/overlays/actors/ovl_Demo_Tre_Lgt/z_demo_tre_lgt.c b/src/overlays/actors/ovl_Demo_Tre_Lgt/z_demo_tre_lgt.c index acbb4a7e07..2f8466814b 100644 --- a/src/overlays/actors/ovl_Demo_Tre_Lgt/z_demo_tre_lgt.c +++ b/src/overlays/actors/ovl_Demo_Tre_Lgt/z_demo_tre_lgt.c @@ -1,6 +1,6 @@ #include "z_demo_tre_lgt.h" -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x00000010 void DemoTreLgt_Init(DemoTreLgt* this, GlobalContext* globalCtx); @@ -9,8 +9,7 @@ void DemoTreLgt_Update(DemoTreLgt* this, GlobalContext* globalCtx); void DemoTreLgt_Draw(DemoTreLgt* this, GlobalContext* globalCtx); /* -const ActorInit Demo_Tre_Lgt_InitVars = -{ +const ActorInit Demo_Tre_Lgt_InitVars = { ACTOR_DEMO_TRE_LGT, ACTORTYPE_ITEMACTION, ROOM, diff --git a/src/overlays/actors/ovl_Demo_Tre_Lgt/z_demo_tre_lgt.h b/src/overlays/actors/ovl_Demo_Tre_Lgt/z_demo_tre_lgt.h index ad5345ab3f..4016a8f162 100644 --- a/src/overlays/actors/ovl_Demo_Tre_Lgt/z_demo_tre_lgt.h +++ b/src/overlays/actors/ovl_Demo_Tre_Lgt/z_demo_tre_lgt.h @@ -4,8 +4,7 @@ #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ Actor actor; /* 0x014C */ char unk_14C[0x30]; } DemoTreLgt; // size = 0x017C 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 c2a0716d72..369943aca9 100644 --- a/src/overlays/actors/ovl_Door_Ana/z_door_ana.c +++ b/src/overlays/actors/ovl_Door_Ana/z_door_ana.c @@ -1,16 +1,26 @@ +/* + * File: z_door_ana.c + * Overlay: ovl_Door_Ana + * Description: Grottos Entrances/Exits + */ + #include "z_door_ana.h" -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x02000000 -void DoorAna_Init(DoorAna* this, GlobalContext* globalCtx); -void DoorAna_Destroy(DoorAna* this, GlobalContext* globalCtx); -void DoorAna_Update(DoorAna* this, GlobalContext* globalCtx); -void DoorAna_Draw(DoorAna* this, GlobalContext* globalCtx); +static void DoorAna_Init(DoorAna* this, GlobalContext* globalCtx); +static void DoorAna_Destroy(DoorAna* this, GlobalContext* globalCtx); +static void DoorAna_Update(DoorAna* this, GlobalContext* globalCtx); +static void DoorAna_Draw(DoorAna* this, GlobalContext* globalCtx); -/* -const ActorInit Door_Ana_InitVars = -{ +static void DoorAna_SetupAction(DoorAna* this, ActorFunc func); + +static void DoorAna_Update_Hidden(DoorAna* this, GlobalContext* globalCtx); +static void DoorAna_Update_Open(DoorAna* this, GlobalContext* globalCtx); +static void DoorAna_Update_Entering(DoorAna* this, GlobalContext* globalCtx); + +const ActorInit Door_Ana_InitVars = { ACTOR_DOOR_ANA, ACTORTYPE_ITEMACTION, ROOM, @@ -22,19 +32,146 @@ const ActorInit Door_Ana_InitVars = (ActorFunc)DoorAna_Update, (ActorFunc)DoorAna_Draw, }; -*/ -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Door_Ana/func_80993EF0.s") -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Door_Ana/DoorAna_Init.s") +// initial collision data +static ColliderCylinderInit colliderInit = { + 0x0A, 0x00, 0x09, 0x00, 0x00, 0x01, 0x00, 0x00, 0x02, 0x00, 0x00, + 0x00, 0x00000000, 0x00, 0x00, 0x00, 0x00, 0x00000048, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x01, 0x00, 0x00, 0x0032, 0x000A, 0x0000, 0x0000, 0x0000, 0x0000, +}; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Door_Ana/DoorAna_Destroy.s") +// array of entrance table entries to grotto destinations +static s16 entrances[] = { + 0x036D, 0x003F, 0x0598, 0x059C, 0x05A0, 0x05A4, 0x05A8, 0x05AC, + 0x05B0, 0x05B4, 0x05B8, 0x05BC, 0x05C0, 0x05C4, 0x05FC, +}; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Door_Ana/func_80993FEC.s") +// display list +extern Gfx* D_05001390; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Door_Ana/func_80994124.s") +// sets current actionFunc to be ran on next update call +static void DoorAna_SetupAction(DoorAna* this, ActorFunc func) { + this->actionFunc = func; +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Door_Ana/func_809942D8.s") +static void DoorAna_Init(DoorAna* this, GlobalContext* globalCtx) { + ColliderCylinderMain* collider; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Door_Ana/DoorAna_Update.s") + this->actor.shape.rot.z = 0; + this->actor.shape.rot.y = this->actor.shape.rot.z; + // init block for grottos that are initially "hidden" (require explosives/hammer/song of storms to open) + if ((this->actor.params & 0x300) != 0) { + // only allocate collider for grottos that need bombing/hammering open + if ((this->actor.params & 0x200) != 0) { + collider = &this->collider; + ActorCollider_AllocCylinder(globalCtx, collider); + ActorCollider_InitCylinder(globalCtx, collider, &this->actor, &colliderInit); + } else { + this->actor.flags |= 0x10; + } + Actor_SetScale(&this->actor, 0); + DoorAna_SetupAction(this, (ActorFunc)&DoorAna_Update_Hidden); + } else { + DoorAna_SetupAction(this, (ActorFunc)&DoorAna_Update_Open); + } + this->actor.unk_1F = 0; +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Door_Ana/DoorAna_Draw.s") +static void DoorAna_Destroy(DoorAna* this, GlobalContext* globalCtx) { + // free collider if it has one + if ((this->actor.params & 0x200) != 0) { + ActorCollider_FreeCylinder(globalCtx, &this->collider); + } +} + +// update routine for grottos that are currently "hidden"/unopened +static void DoorAna_Update_Hidden(DoorAna* this, GlobalContext* globalCtx) { + bool openGrotto = false; + if ((this->actor.params & 0x200) == 0) { + // opening with song of storms + if (this->actor.waterSurfaceDist < 40000.0f && func_8006C4A4(globalCtx, 5) != 0) { + openGrotto = true; + this->actor.flags &= ~0x10; + } + } else { + // bombing/hammering open a grotto + if ((this->collider.base.collideFlags & 2) != 0) { + openGrotto = true; + ActorCollider_FreeCylinder(globalCtx, &this->collider); + } else { + ActorCollider_Cylinder_Update(&this->actor, &this->collider); + Actor_CollisionCheck_SetAC(globalCtx, &globalCtx->sub_11E60, &this->collider); + } + } + // open the grotto + if (openGrotto) { + this->actor.params &= ~0x0300; + DoorAna_SetupAction(this, (ActorFunc)&DoorAna_Update_Open); + Audio_PlaySoundGeneral(NA_SE_SY_CORRECT_CHIME, &D_801333D4, 4, &D_801333E0, &D_801333E0, &D_801333E8); + } + func_8002F5F0(&this->actor, globalCtx); +} + +// update routine for grottos that are open +static void DoorAna_Update_Open(DoorAna* this, GlobalContext* globalCtx) { + Player* player; + s32 destinationIdx; + + player = PLAYER; + if (Math_ApproxF(&this->actor.scale.x, 0.01f, 0.001f) != 0) { + if ((this->actor.unk_1F != 0) && (globalCtx->sceneLoadFlag == 0) && (player->stateFlags1 & 0x80000000) && + (player->unk_84F == 0)) { + destinationIdx = ((this->actor.params >> 0xC) & 7) - 1; + func_800C0AF4(globalCtx, 1, 0x4FF); + gSaveContext.respawn[RESPAWN_MODE_RETURN].pos.y = this->actor.posRot.pos.y; + gSaveContext.respawn[RESPAWN_MODE_RETURN].yaw = this->actor.initPosRot.rot.y; + gSaveContext.respawn[RESPAWN_MODE_RETURN].data = this->actor.params & 0xFFFF; + if (destinationIdx < 0) { + destinationIdx = this->actor.initPosRot.rot.z + 1; + } + globalCtx->nextEntranceIndex = entrances[destinationIdx]; + DoorAna_SetupAction(this, (ActorFunc)&DoorAna_Update_Entering); + } else { + if (func_8008E988(globalCtx) == 0 && !(player->stateFlags1 & 0x8800000) && + this->actor.xzDistanceFromLink <= 15.0f && -50.0f <= this->actor.yDistanceFromLink && + this->actor.yDistanceFromLink <= 15.0f) { + player->stateFlags1 |= 0x80000000; + this->actor.unk_1F = 1; + } else { + this->actor.unk_1F = 0; + } + } + } + Actor_SetScale(&this->actor, this->actor.scale.x); +} + +// update function for after the player has triggered the grotto +static void DoorAna_Update_Entering(DoorAna* this, GlobalContext* globalCtx) { + Player* player; + + if (this->actor.yDistanceFromLink <= 0.0f && 15.0f < this->actor.xzDistanceFromLink) { + player = PLAYER; + player->actor.posRot.pos.x = Math_Sins(this->actor.rotTowardsLinkY) * 15.0f + this->actor.posRot.pos.x; + player->actor.posRot.pos.z = Math_Coss(this->actor.rotTowardsLinkY) * 15.0f + this->actor.posRot.pos.z; + } +} + +static void DoorAna_Update(DoorAna* this, GlobalContext* globalCtx) { + this->actionFunc(this, globalCtx); + // changes the grottos facing angle based on camera angle + this->actor.shape.rot.y = + func_8005A9F4(globalCtx->cameraCtx.activeCameraPtrs[globalCtx->cameraCtx.unk_5C0]) + 0x8000; +} + +static void DoorAna_Draw(DoorAna* this, GlobalContext* globalCtx) { + GraphicsContext* gfxCtx = globalCtx->state.gfxCtx; + Gfx** dList = &D_05001390; // required for stack placement? + Gfx* dispRefs[3]; + + Graph_OpenDisps(dispRefs, globalCtx->state.gfxCtx, "../z_door_ana.c", 440); + func_80093D84(globalCtx->state.gfxCtx); + gSPMatrix(gfxCtx->polyXlu.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_door_ana.c", 446), + G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + gSPDisplayList(gfxCtx->polyXlu.p++, dList); + Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_door_ana.c", 449); +} diff --git a/src/overlays/actors/ovl_Door_Ana/z_door_ana.h b/src/overlays/actors/ovl_Door_Ana/z_door_ana.h index db3fd5aa26..98718e330d 100644 --- a/src/overlays/actors/ovl_Door_Ana/z_door_ana.h +++ b/src/overlays/actors/ovl_Door_Ana/z_door_ana.h @@ -4,10 +4,10 @@ #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ Actor actor; - /* 0x014C */ char unk_14C[0x50]; + /* 0x014C */ ColliderCylinderMain collider; + /* 0x0198 */ ActorFunc actionFunc; } DoorAna; // size = 0x019C extern const ActorInit Door_Ana_InitVars; 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 2b5616a38e..81bfd1e101 100644 --- a/src/overlays/actors/ovl_Door_Gerudo/z_door_gerudo.c +++ b/src/overlays/actors/ovl_Door_Gerudo/z_door_gerudo.c @@ -1,6 +1,6 @@ #include "z_door_gerudo.h" -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x00000000 void DoorGerudo_Init(DoorGerudo* this, GlobalContext* globalCtx); @@ -9,8 +9,7 @@ void DoorGerudo_Update(DoorGerudo* this, GlobalContext* globalCtx); void DoorGerudo_Draw(DoorGerudo* this, GlobalContext* globalCtx); /* -const ActorInit Door_Gerudo_InitVars = -{ +const ActorInit Door_Gerudo_InitVars = { ACTOR_DOOR_GERUDO, ACTORTYPE_ITEMACTION, ROOM, diff --git a/src/overlays/actors/ovl_Door_Gerudo/z_door_gerudo.h b/src/overlays/actors/ovl_Door_Gerudo/z_door_gerudo.h index e8ef9ecc96..9d067bafcf 100644 --- a/src/overlays/actors/ovl_Door_Gerudo/z_door_gerudo.h +++ b/src/overlays/actors/ovl_Door_Gerudo/z_door_gerudo.h @@ -4,8 +4,7 @@ #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ Actor actor; /* 0x014C */ char unk_14C[0x20]; } DoorGerudo; // size = 0x016C diff --git a/src/overlays/actors/ovl_Door_Killer/z_door_killer.c b/src/overlays/actors/ovl_Door_Killer/z_door_killer.c index 469cbf509a..65ee03982a 100644 --- a/src/overlays/actors/ovl_Door_Killer/z_door_killer.c +++ b/src/overlays/actors/ovl_Door_Killer/z_door_killer.c @@ -1,6 +1,6 @@ #include "z_door_killer.h" -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x00000010 void DoorKiller_Init(DoorKiller* this, GlobalContext* globalCtx); @@ -8,8 +8,7 @@ void DoorKiller_Destroy(DoorKiller* this, GlobalContext* globalCtx); void DoorKiller_Update(DoorKiller* this, GlobalContext* globalCtx); /* -const ActorInit Door_Killer_InitVars = -{ +const ActorInit Door_Killer_InitVars = { ACTOR_DOOR_KILLER, ACTORTYPE_BG, ROOM, diff --git a/src/overlays/actors/ovl_Door_Killer/z_door_killer.h b/src/overlays/actors/ovl_Door_Killer/z_door_killer.h index 24b6be0d94..61e98f9768 100644 --- a/src/overlays/actors/ovl_Door_Killer/z_door_killer.h +++ b/src/overlays/actors/ovl_Door_Killer/z_door_killer.h @@ -4,8 +4,7 @@ #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ Actor actor; /* 0x014C */ char unk_14C[0x138]; } DoorKiller; // size = 0x0284 diff --git a/src/overlays/actors/ovl_Door_Shutter/z_door_shutter.c b/src/overlays/actors/ovl_Door_Shutter/z_door_shutter.c index 0b0b0cbba4..7301db73e1 100644 --- a/src/overlays/actors/ovl_Door_Shutter/z_door_shutter.c +++ b/src/overlays/actors/ovl_Door_Shutter/z_door_shutter.c @@ -1,6 +1,6 @@ #include "z_door_shutter.h" -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x00000010 void DoorShutter_Init(DoorShutter* this, GlobalContext* globalCtx); @@ -9,8 +9,7 @@ void DoorShutter_Update(DoorShutter* this, GlobalContext* globalCtx); void DoorShutter_Draw(DoorShutter* this, GlobalContext* globalCtx); /* -const ActorInit Door_Shutter_InitVars = -{ +const ActorInit Door_Shutter_InitVars = { ACTOR_DOOR_SHUTTER, ACTORTYPE_DOOR, ROOM, diff --git a/src/overlays/actors/ovl_Door_Shutter/z_door_shutter.h b/src/overlays/actors/ovl_Door_Shutter/z_door_shutter.h index 0c0e688c87..3958d04c09 100644 --- a/src/overlays/actors/ovl_Door_Shutter/z_door_shutter.h +++ b/src/overlays/actors/ovl_Door_Shutter/z_door_shutter.h @@ -4,8 +4,7 @@ #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ Actor actor; /* 0x014C */ char unk_14C[0x2C]; } DoorShutter; // size = 0x0178 diff --git a/src/overlays/actors/ovl_Door_Toki/z_door_toki.c b/src/overlays/actors/ovl_Door_Toki/z_door_toki.c index ca210be91d..7ad3af1293 100644 --- a/src/overlays/actors/ovl_Door_Toki/z_door_toki.c +++ b/src/overlays/actors/ovl_Door_Toki/z_door_toki.c @@ -2,50 +2,38 @@ * File: z_door_toki.c * Overlay: ovl_Door_Toki * Description: Manages collision for the Door of Time. -*/ + */ #include #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ Actor actor; - /* 0x014C */ u32 dynaPolyId; - /* 0x0150 */ u8 unk_150[0x18]; + /* 0x014C */ u32 dynaPolyId; + /* 0x0150 */ u8 unk_150[0x18]; } ActorDoorToki; // size = 0x0168 -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x00000000 static void Init(ActorDoorToki* this, GlobalContext* globalCtx); static void Destroy(ActorDoorToki* this, GlobalContext* globalCtx); static void Update(ActorDoorToki* this, GlobalContext* globalCtx); -const ActorInit Door_Toki_InitVars = -{ - ACTOR_DOOR_TOKI, - ACTORTYPE_BG, - ROOM, - FLAGS, - OBJECT_TOKI_OBJECTS, - sizeof(ActorDoorToki), - (ActorFunc)Init, - (ActorFunc)Destroy, - (ActorFunc)Update, - NULL +const ActorInit Door_Toki_InitVars = { + ACTOR_DOOR_TOKI, ACTORTYPE_BG, ROOM, FLAGS, OBJECT_TOKI_OBJECTS, sizeof(ActorDoorToki), (ActorFunc)Init, + (ActorFunc)Destroy, (ActorFunc)Update, NULL, }; // This has to be defined in the linker to produce a proper lui addiu pair extern u32 DOOR_TOKI_COLLISION_DATA; -static InitChainEntry initChain[] = -{ - ICHAIN_VEC3F_DIV1000(scale, 1000, ICHAIN_STOP) +static InitChainEntry initChain[] = { + ICHAIN_VEC3F_DIV1000(scale, 1000, ICHAIN_STOP), }; -static void Init(ActorDoorToki* this, GlobalContext* globalCtx) -{ +static void Init(ActorDoorToki* this, GlobalContext* globalCtx) { s32 pad[2]; u32 sp1C = 0; @@ -55,15 +43,14 @@ static void Init(ActorDoorToki* this, GlobalContext* globalCtx) this->dynaPolyId = DynaPolyInfo_RegisterActor(globalCtx, &globalCtx->colCtx.dyna, &this->actor, sp1C); } -static void Destroy(ActorDoorToki* this, GlobalContext* globalCtx) -{ +static void Destroy(ActorDoorToki* this, GlobalContext* globalCtx) { DynaPolyInfo_Free(globalCtx, &globalCtx->colCtx.dyna, this->dynaPolyId); } -static void Update(ActorDoorToki* this, GlobalContext* globalCtx) -{ - if (gSaveContext.event_chk_inf[4] & 0x800) +static void Update(ActorDoorToki* this, GlobalContext* globalCtx) { + if (gSaveContext.event_chk_inf[4] & 0x800) { func_8003EBF8(globalCtx, &globalCtx->colCtx.dyna, this->dynaPolyId); - else + } else { func_8003EC50(globalCtx, &globalCtx->colCtx.dyna, this->dynaPolyId); + } } diff --git a/src/overlays/actors/ovl_Door_Warp1/z_door_warp1.c b/src/overlays/actors/ovl_Door_Warp1/z_door_warp1.c index 0a2bfdaed4..3f8030c736 100644 --- a/src/overlays/actors/ovl_Door_Warp1/z_door_warp1.c +++ b/src/overlays/actors/ovl_Door_Warp1/z_door_warp1.c @@ -1,6 +1,6 @@ #include "z_door_warp1.h" -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x00000000 void DoorWarp1_Init(DoorWarp1* this, GlobalContext* globalCtx); @@ -9,8 +9,7 @@ void DoorWarp1_Update(DoorWarp1* this, GlobalContext* globalCtx); void DoorWarp1_Draw(DoorWarp1* this, GlobalContext* globalCtx); /* -const ActorInit Door_Warp1_InitVars = -{ +const ActorInit Door_Warp1_InitVars = { ACTOR_DOOR_WARP1, ACTORTYPE_ITEMACTION, ROOM, @@ -96,4 +95,3 @@ const ActorInit Door_Warp1_InitVars = #pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Door_Warp1/func_8099B5EC.s") #pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Door_Warp1/DoorWarp1_Draw.s") - diff --git a/src/overlays/actors/ovl_Door_Warp1/z_door_warp1.h b/src/overlays/actors/ovl_Door_Warp1/z_door_warp1.h index 150fcf89e3..96a6ef1004 100644 --- a/src/overlays/actors/ovl_Door_Warp1/z_door_warp1.h +++ b/src/overlays/actors/ovl_Door_Warp1/z_door_warp1.h @@ -4,8 +4,7 @@ #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ Actor actor; /* 0x014C */ char unk_14C[0xA4]; } DoorWarp1; // size = 0x01F0 diff --git a/src/overlays/actors/ovl_Efc_Erupc/z_efc_erupc.c b/src/overlays/actors/ovl_Efc_Erupc/z_efc_erupc.c index 02a1f6f89f..e7caf77073 100644 --- a/src/overlays/actors/ovl_Efc_Erupc/z_efc_erupc.c +++ b/src/overlays/actors/ovl_Efc_Erupc/z_efc_erupc.c @@ -1,6 +1,6 @@ #include "z_efc_erupc.h" -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x00000030 void EfcErupc_Init(EfcErupc* this, GlobalContext* globalCtx); @@ -9,8 +9,7 @@ void EfcErupc_Update(EfcErupc* this, GlobalContext* globalCtx); void EfcErupc_Draw(EfcErupc* this, GlobalContext* globalCtx); /* -const ActorInit Efc_Erupc_InitVars = -{ +const ActorInit Efc_Erupc_InitVars = { ACTOR_EFC_ERUPC, ACTORTYPE_ITEMACTION, ROOM, diff --git a/src/overlays/actors/ovl_Efc_Erupc/z_efc_erupc.h b/src/overlays/actors/ovl_Efc_Erupc/z_efc_erupc.h index 6d82aa44d4..237abbb5e7 100644 --- a/src/overlays/actors/ovl_Efc_Erupc/z_efc_erupc.h +++ b/src/overlays/actors/ovl_Efc_Erupc/z_efc_erupc.h @@ -4,8 +4,7 @@ #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ Actor actor; /* 0x014C */ char unk_14C[0x1780]; } EfcErupc; // size = 0x18CC diff --git a/src/overlays/actors/ovl_Eff_Dust/z_eff_dust.c b/src/overlays/actors/ovl_Eff_Dust/z_eff_dust.c index 871b3d6975..18f1856e7e 100644 --- a/src/overlays/actors/ovl_Eff_Dust/z_eff_dust.c +++ b/src/overlays/actors/ovl_Eff_Dust/z_eff_dust.c @@ -1,6 +1,6 @@ #include "z_eff_dust.h" -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x00000030 void EffDust_Init(EffDust* this, GlobalContext* globalCtx); @@ -9,8 +9,7 @@ void EffDust_Update(EffDust* this, GlobalContext* globalCtx); void EffDust_Draw(EffDust* this, GlobalContext* globalCtx); /* -const ActorInit Eff_Dust_InitVars = -{ +const ActorInit Eff_Dust_InitVars = { ACTOR_EFF_DUST, ACTORTYPE_NPC, ROOM, diff --git a/src/overlays/actors/ovl_Eff_Dust/z_eff_dust.h b/src/overlays/actors/ovl_Eff_Dust/z_eff_dust.h index 35ee2c81ea..7f7628f545 100644 --- a/src/overlays/actors/ovl_Eff_Dust/z_eff_dust.h +++ b/src/overlays/actors/ovl_Eff_Dust/z_eff_dust.h @@ -4,8 +4,7 @@ #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ Actor actor; /* 0x014C */ char unk_14C[0x41C]; } EffDust; // size = 0x0568 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 2304bc97f7..9fa507fef0 100644 --- a/src/overlays/actors/ovl_Elf_Msg/z_elf_msg.c +++ b/src/overlays/actors/ovl_Elf_Msg/z_elf_msg.c @@ -1,6 +1,6 @@ #include "z_elf_msg.h" -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x00000010 void ElfMsg_Init(ElfMsg* this, GlobalContext* globalCtx); @@ -9,8 +9,7 @@ void ElfMsg_Update(ElfMsg* this, GlobalContext* globalCtx); void ElfMsg_Draw(ElfMsg* this, GlobalContext* globalCtx); /* -const ActorInit Elf_Msg_InitVars = -{ +const ActorInit Elf_Msg_InitVars = { ACTOR_ELF_MSG, ACTORTYPE_ITEMACTION, ROOM, diff --git a/src/overlays/actors/ovl_Elf_Msg/z_elf_msg.h b/src/overlays/actors/ovl_Elf_Msg/z_elf_msg.h index fe81cd8a94..d702df439a 100644 --- a/src/overlays/actors/ovl_Elf_Msg/z_elf_msg.h +++ b/src/overlays/actors/ovl_Elf_Msg/z_elf_msg.h @@ -4,8 +4,7 @@ #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ Actor actor; /* 0x014C */ char unk_14C[0x4]; } ElfMsg; // size = 0x0150 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 93e7ec11cb..3ed1c377e8 100644 --- a/src/overlays/actors/ovl_Elf_Msg2/z_elf_msg2.c +++ b/src/overlays/actors/ovl_Elf_Msg2/z_elf_msg2.c @@ -1,6 +1,6 @@ #include "z_elf_msg2.h" -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x00000010 void ElfMsg2_Init(ElfMsg2* this, GlobalContext* globalCtx); @@ -9,8 +9,7 @@ void ElfMsg2_Update(ElfMsg2* this, GlobalContext* globalCtx); void ElfMsg2_Draw(ElfMsg2* this, GlobalContext* globalCtx); /* -const ActorInit Elf_Msg2_InitVars = -{ +const ActorInit Elf_Msg2_InitVars = { ACTOR_ELF_MSG2, ACTORTYPE_BG, ROOM, diff --git a/src/overlays/actors/ovl_Elf_Msg2/z_elf_msg2.h b/src/overlays/actors/ovl_Elf_Msg2/z_elf_msg2.h index b1520dad5f..e2989dcaaa 100644 --- a/src/overlays/actors/ovl_Elf_Msg2/z_elf_msg2.h +++ b/src/overlays/actors/ovl_Elf_Msg2/z_elf_msg2.h @@ -4,8 +4,7 @@ #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ Actor actor; /* 0x014C */ char unk_14C[0x4]; } ElfMsg2; // size = 0x0150 diff --git a/src/overlays/actors/ovl_En_Am/z_en_am.c b/src/overlays/actors/ovl_En_Am/z_en_am.c index 7c0677b5f6..0939cffe21 100644 --- a/src/overlays/actors/ovl_En_Am/z_en_am.c +++ b/src/overlays/actors/ovl_En_Am/z_en_am.c @@ -1,6 +1,6 @@ #include "z_en_am.h" -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x04000015 void EnAm_Init(EnAm* this, GlobalContext* globalCtx); @@ -9,8 +9,7 @@ void EnAm_Update(EnAm* this, GlobalContext* globalCtx); void EnAm_Draw(EnAm* this, GlobalContext* globalCtx); /* -const ActorInit En_Am_InitVars = -{ +const ActorInit En_Am_InitVars = { ACTOR_EN_AM, ACTORTYPE_ENEMY, ROOM, diff --git a/src/overlays/actors/ovl_En_Am/z_en_am.h b/src/overlays/actors/ovl_En_Am/z_en_am.h index 3213146799..22862bdf8b 100644 --- a/src/overlays/actors/ovl_En_Am/z_en_am.h +++ b/src/overlays/actors/ovl_En_Am/z_en_am.h @@ -4,8 +4,7 @@ #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ Actor actor; /* 0x014C */ char unk_14C[0x240]; } EnAm; // size = 0x038C 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 bf0cc6b585..a71924b895 100644 --- a/src/overlays/actors/ovl_En_Ani/z_en_ani.c +++ b/src/overlays/actors/ovl_En_Ani/z_en_ani.c @@ -1,6 +1,6 @@ #include "z_en_ani.h" -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x00000009 void EnAni_Init(EnAni* this, GlobalContext* globalCtx); @@ -9,8 +9,7 @@ void EnAni_Update(EnAni* this, GlobalContext* globalCtx); void EnAni_Draw(EnAni* this, GlobalContext* globalCtx); /* -const ActorInit En_Ani_InitVars = -{ +const ActorInit En_Ani_InitVars = { ACTOR_EN_ANI, ACTORTYPE_NPC, ROOM, diff --git a/src/overlays/actors/ovl_En_Ani/z_en_ani.h b/src/overlays/actors/ovl_En_Ani/z_en_ani.h index 05b739e3d5..45b7e37208 100644 --- a/src/overlays/actors/ovl_En_Ani/z_en_ani.h +++ b/src/overlays/actors/ovl_En_Ani/z_en_ani.h @@ -4,8 +4,7 @@ #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ Actor actor; /* 0x014C */ char unk_14C[0x168]; } EnAni; // size = 0x02B4 diff --git a/src/overlays/actors/ovl_En_Anubice/z_en_anubice.c b/src/overlays/actors/ovl_En_Anubice/z_en_anubice.c index d116d2b745..b089c5f80d 100644 --- a/src/overlays/actors/ovl_En_Anubice/z_en_anubice.c +++ b/src/overlays/actors/ovl_En_Anubice/z_en_anubice.c @@ -1,6 +1,6 @@ #include "z_en_anubice.h" -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x00000015 void EnAnubice_Init(EnAnubice* this, GlobalContext* globalCtx); @@ -9,8 +9,7 @@ void EnAnubice_Update(EnAnubice* this, GlobalContext* globalCtx); void EnAnubice_Draw(EnAnubice* this, GlobalContext* globalCtx); /* -const ActorInit En_Anubice_InitVars = -{ +const ActorInit En_Anubice_InitVars = { ACTOR_EN_ANUBICE, ACTORTYPE_ENEMY, ROOM, diff --git a/src/overlays/actors/ovl_En_Anubice/z_en_anubice.h b/src/overlays/actors/ovl_En_Anubice/z_en_anubice.h index c93250b0d1..e99538465c 100644 --- a/src/overlays/actors/ovl_En_Anubice/z_en_anubice.h +++ b/src/overlays/actors/ovl_En_Anubice/z_en_anubice.h @@ -4,8 +4,7 @@ #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ Actor actor; /* 0x014C */ char unk_14C[0x1C8]; } EnAnubice; // size = 0x0314 diff --git a/src/overlays/actors/ovl_En_Anubice_Fire/z_en_anubice_fire.c b/src/overlays/actors/ovl_En_Anubice_Fire/z_en_anubice_fire.c index c4ed61f64d..897bf9d421 100644 --- a/src/overlays/actors/ovl_En_Anubice_Fire/z_en_anubice_fire.c +++ b/src/overlays/actors/ovl_En_Anubice_Fire/z_en_anubice_fire.c @@ -1,6 +1,6 @@ #include "z_en_anubice_fire.h" -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x00000010 void EnAnubiceFire_Init(EnAnubiceFire* this, GlobalContext* globalCtx); @@ -9,8 +9,7 @@ void EnAnubiceFire_Update(EnAnubiceFire* this, GlobalContext* globalCtx); void EnAnubiceFire_Draw(EnAnubiceFire* this, GlobalContext* globalCtx); /* -const ActorInit En_Anubice_Fire_InitVars = -{ +const ActorInit En_Anubice_Fire_InitVars = { ACTOR_EN_ANUBICE_FIRE, ACTORTYPE_ENEMY, ROOM, diff --git a/src/overlays/actors/ovl_En_Anubice_Fire/z_en_anubice_fire.h b/src/overlays/actors/ovl_En_Anubice_Fire/z_en_anubice_fire.h index 99d9f4b9de..56d42b7890 100644 --- a/src/overlays/actors/ovl_En_Anubice_Fire/z_en_anubice_fire.h +++ b/src/overlays/actors/ovl_En_Anubice_Fire/z_en_anubice_fire.h @@ -4,8 +4,7 @@ #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ Actor actor; /* 0x014C */ char unk_14C[0xA8]; } EnAnubiceFire; // size = 0x01F4 diff --git a/src/overlays/actors/ovl_En_Anubice_Tag/z_en_anubice_tag.c b/src/overlays/actors/ovl_En_Anubice_Tag/z_en_anubice_tag.c index 8ea7fe4b45..9717d199e1 100644 --- a/src/overlays/actors/ovl_En_Anubice_Tag/z_en_anubice_tag.c +++ b/src/overlays/actors/ovl_En_Anubice_Tag/z_en_anubice_tag.c @@ -2,14 +2,15 @@ * File: z_en_anubice_tag.c * Overlay: ovl_En_Anubice_Tag * Description: Spawns and manages the Anubis enemy -*/ + */ #include #include -//temp struct until we can reference other actors outside of their file -typedef struct -{ +#include + +// temp struct until we can reference other actors outside of their file +typedef struct { /* 0x0000 */ Actor actor; /* 0x014C */ char unk_14C[0x10E]; /* 0x025A */ s16 unk_25A; @@ -20,15 +21,14 @@ typedef struct /* 0x0264 */ char unk_264[0xB0]; } EnAnubice; // size = 0x0314 -typedef struct -{ +typedef struct { /* 0x0000 */ Actor actor; /* 0x014C */ ActorFunc actionFunc; /* 0x0150 */ EnAnubice* anubis; /* 0x0154 */ f32 triggerRange; } EnAnubiceTag; // size = 0x0158 -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x00000010 static void EnAnubiceTag_Init(EnAnubiceTag* this, GlobalContext* globalCtx); @@ -38,8 +38,7 @@ static void EnAnubiceTag_ManageAnubis(EnAnubiceTag* this, GlobalContext* globalC static void EnAnubiceTag_Update(EnAnubiceTag* this, GlobalContext* globalCtx); static void EnAnubiceTag_Draw(EnAnubiceTag* this, GlobalContext* globalCtx); -const ActorInit En_Anubice_Tag_InitVars = -{ +const ActorInit En_Anubice_Tag_InitVars = { ACTOR_EN_ANUBICE_TAG, ACTORTYPE_SWITCH, ROOM, @@ -52,103 +51,79 @@ const ActorInit En_Anubice_Tag_InitVars = (ActorFunc)EnAnubiceTag_Draw, }; -static void EnAnubiceTag_Init(EnAnubiceTag* this, GlobalContext* globalCtx) -{ +static void EnAnubiceTag_Init(EnAnubiceTag* this, GlobalContext* globalCtx) { osSyncPrintf("\n\n"); //"Anubis control tag generated" - osSyncPrintf("☆☆☆☆☆ アヌビス制御タグ発生 ☆☆☆☆☆ %d\n", this->actor.params); + osSyncPrintf(VT_FGCOL(GREEN) "☆☆☆☆☆ アヌビス制御タグ発生 ☆☆☆☆☆ %d\n" VT_RST, this->actor.params); - if (this->actor.params < (s16)0xFFFF) - { + if (this->actor.params < (s16)0xFFFF) { this->actor.params = 0; } - if (this->actor.params != 0) - { + if (this->actor.params != 0) { this->triggerRange = this->actor.params * 40.0f; } this->actionFunc = &EnAnubiceTag_SpawnAnubis; } -static void EnAnubiceTag_Destroy(EnAnubiceTag* this, GlobalContext* globalCtx) -{ - +static void EnAnubiceTag_Destroy(EnAnubiceTag* this, GlobalContext* globalCtx) { } -static void EnAnubiceTag_SpawnAnubis(EnAnubiceTag* this, GlobalContext* globalCtx) -{ - this->anubis = Actor_SpawnAttached(&globalCtx->actorCtx, &this->actor, globalCtx, ACTOR_EN_ANUBICE, - this->actor.posRot.pos.x, this->actor.posRot.pos.y, this->actor.posRot.pos.z, - 0, this->actor.rotTowardsLinkY, 0, 0); +static void EnAnubiceTag_SpawnAnubis(EnAnubiceTag* this, GlobalContext* globalCtx) { + this->anubis = + Actor_SpawnAttached(&globalCtx->actorCtx, &this->actor, globalCtx, ACTOR_EN_ANUBICE, this->actor.posRot.pos.x, + this->actor.posRot.pos.y, this->actor.posRot.pos.z, 0, this->actor.rotTowardsLinkY, 0, 0); - if (this->anubis != NULL) - { + if (this->anubis != NULL) { this->actionFunc = &EnAnubiceTag_ManageAnubis; } } -static void EnAnubiceTag_ManageAnubis(EnAnubiceTag* this, GlobalContext* globalCtx) -{ +static void EnAnubiceTag_ManageAnubis(EnAnubiceTag* this, GlobalContext* globalCtx) { EnAnubice* anubis; Vec3f offset; - - if (this->anubis != NULL) - { + + if (this->anubis != NULL) { anubis = this->anubis; - if (anubis->actor.update == NULL) - { + if (anubis->actor.update == NULL) { return; } - } - else - { + } else { Actor_Kill(this); return; } - if (anubis->unk_25A != 0) - { + if (anubis->unk_25A != 0) { Actor_Kill(this); return; } - if (this->actor.xzDistanceFromLink < (200.0f + this->triggerRange)) - { - if (anubis->unk_260 == 0) - { - if (anubis->unk_262 == 0) - { + if (this->actor.xzDistanceFromLink < (200.0f + this->triggerRange)) { + if (anubis->unk_260 == 0) { + if (anubis->unk_262 == 0) { anubis->unk_25E = 1; offset.x = -Math_Sins(this->actor.rotTowardsLinkY) * this->actor.xzDistanceFromLink; offset.z = -Math_Coss(this->actor.rotTowardsLinkY) * this->actor.xzDistanceFromLink; - Math_SmoothScaleMaxF(&anubis->actor.posRot.pos.x, - (this->actor.posRot.pos.x + offset.x), 0.3f, 10.0f); - Math_SmoothScaleMaxF(&anubis->actor.posRot.pos.z, - (this->actor.posRot.pos.z + offset.z), 0.3f, 10.0f); + Math_SmoothScaleMaxF(&anubis->actor.posRot.pos.x, (this->actor.posRot.pos.x + offset.x), 0.3f, 10.0f); + Math_SmoothScaleMaxF(&anubis->actor.posRot.pos.z, (this->actor.posRot.pos.z + offset.z), 0.3f, 10.0f); return; } } - } - else - { - if (anubis->unk_25E != 0) - { + } else { + if (anubis->unk_25E != 0) { anubis->unk_260 = 1; } } } -static void EnAnubiceTag_Update(EnAnubiceTag* this, GlobalContext* globalCtx) -{ +static void EnAnubiceTag_Update(EnAnubiceTag* this, GlobalContext* globalCtx) { this->actionFunc(this, globalCtx); } -static void EnAnubiceTag_Draw(EnAnubiceTag* this, GlobalContext* globalCtx) -{ - if (BREG(0) != 0) - { +static void EnAnubiceTag_Draw(EnAnubiceTag* this, GlobalContext* globalCtx) { + if (BREG(0) != 0) { DebugDisplay_AddObject(this->actor.posRot.pos.x, this->actor.posRot.pos.y, this->actor.posRot.pos.z, - this->actor.posRot.rot.x, this->actor.posRot.rot.y, this->actor.posRot.rot.z, - 1.0f, 1.0f, 1.0f, 0xFF, 0, 0, 0xFF, 4, globalCtx->state.gfxCtx); + this->actor.posRot.rot.x, this->actor.posRot.rot.y, this->actor.posRot.rot.z, 1.0f, 1.0f, + 1.0f, 0xFF, 0, 0, 0xFF, 4, globalCtx->state.gfxCtx); } } diff --git a/src/overlays/actors/ovl_En_Arow_Trap/z_en_arow_trap.c b/src/overlays/actors/ovl_En_Arow_Trap/z_en_arow_trap.c index 4f39cbb0be..cc1e84bb5a 100644 --- a/src/overlays/actors/ovl_En_Arow_Trap/z_en_arow_trap.c +++ b/src/overlays/actors/ovl_En_Arow_Trap/z_en_arow_trap.c @@ -2,64 +2,48 @@ * File: z_en_arow_trap.c * Overlay: ovl_En_Arow_Trap * Description: An unused trap that reflects arrows. -*/ + */ #include #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ Actor actor; - /* 0x014C */ u32 unk_14C; - /* 0x0150 */ u32 attackTimer; + /* 0x014C */ u32 unk_14C; + /* 0x0150 */ u32 attackTimer; } ActorEnArowTrap; // size = 0x0154 -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x00000010 static void Init(ActorEnArowTrap* this, GlobalContext* globalCtx); static void Destroy(ActorEnArowTrap* this, GlobalContext* globalCtx); static void Update(ActorEnArowTrap* this, GlobalContext* globalCtx); -const ActorInit En_Arow_Trap_InitVars = -{ - ACTOR_EN_AROW_TRAP, - ACTORTYPE_PROP, - ROOM, - FLAGS, - OBJECT_GAMEPLAY_KEEP, - sizeof(ActorEnArowTrap), - (ActorFunc)Init, - (ActorFunc)Destroy, - (ActorFunc)Update, - NULL +const ActorInit En_Arow_Trap_InitVars = { + ACTOR_EN_AROW_TRAP, ACTORTYPE_PROP, ROOM, FLAGS, OBJECT_GAMEPLAY_KEEP, sizeof(ActorEnArowTrap), (ActorFunc)Init, + (ActorFunc)Destroy, (ActorFunc)Update, NULL, }; -static void Init(ActorEnArowTrap* this, GlobalContext* globalCtx) -{ +static void Init(ActorEnArowTrap* this, GlobalContext* globalCtx) { Actor_SetScale(&this->actor, 0.01); this->unk_14C = 0; this->attackTimer = 80; this->actor.posRot2.pos = this->actor.posRot.pos; } -static void Destroy(ActorEnArowTrap* this, GlobalContext* globalCtx) -{ +static void Destroy(ActorEnArowTrap* this, GlobalContext* globalCtx) { } -static void Update(ActorEnArowTrap* this, GlobalContext* globalCtx) -{ - if (this->actor.xzDistanceFromLink <= 400) - { +static void Update(ActorEnArowTrap* this, GlobalContext* globalCtx) { + if (this->actor.xzDistanceFromLink <= 400) { this->attackTimer--; - if (this->attackTimer == 0) - { - Actor_Spawn(&globalCtx->actorCtx, globalCtx, ACTOR_EN_ARROW, - this->actor.posRot.pos.x, this->actor.posRot.pos.y, this->actor.posRot.pos.z, - this->actor.shape.rot.x, this->actor.shape.rot.y, this->actor.shape.rot.z, - 0xFFFFFFFF); + if (this->attackTimer == 0) { + Actor_Spawn(&globalCtx->actorCtx, globalCtx, ACTOR_EN_ARROW, this->actor.posRot.pos.x, + this->actor.posRot.pos.y, this->actor.posRot.pos.z, this->actor.shape.rot.x, + this->actor.shape.rot.y, this->actor.shape.rot.z, 0xFFFFFFFF); this->attackTimer = 80; } } diff --git a/src/overlays/actors/ovl_En_Arrow/z_en_arrow.c b/src/overlays/actors/ovl_En_Arrow/z_en_arrow.c index 5eccf70449..a4f9ce389b 100644 --- a/src/overlays/actors/ovl_En_Arrow/z_en_arrow.c +++ b/src/overlays/actors/ovl_En_Arrow/z_en_arrow.c @@ -1,6 +1,6 @@ #include "z_en_arrow.h" -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x00000030 void EnArrow_Init(EnArrow* this, GlobalContext* globalCtx); @@ -9,8 +9,7 @@ void EnArrow_Update(EnArrow* this, GlobalContext* globalCtx); void EnArrow_Draw(EnArrow* this, GlobalContext* globalCtx); /* -const ActorInit En_Arrow_InitVars = -{ +const ActorInit En_Arrow_InitVars = { ACTOR_EN_ARROW, ACTORTYPE_ITEMACTION, ROOM, diff --git a/src/overlays/actors/ovl_En_Arrow/z_en_arrow.h b/src/overlays/actors/ovl_En_Arrow/z_en_arrow.h index 9ee4d7fd8b..3ac1e13ac5 100644 --- a/src/overlays/actors/ovl_En_Arrow/z_en_arrow.h +++ b/src/overlays/actors/ovl_En_Arrow/z_en_arrow.h @@ -4,10 +4,12 @@ #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ Actor actor; - /* 0x014C */ char unk_14C[0x114]; + /* 0x014C */ char unk_14C[0xFC]; + /* 0x0248 */ u8 timer; // used for dissapearing when flying or hitting a wall + /* 0x0249 */ u8 hitWall; + /* 0x024A */ char unk_24A[0x16]; } EnArrow; // size = 0x0260 extern const ActorInit En_Arrow_InitVars; 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 d44e38cd5d..f7841a75c3 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 @@ -1,6 +1,6 @@ #include "z_en_attack_niw.h" -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x00000010 void EnAttackNiw_Init(EnAttackNiw* this, GlobalContext* globalCtx); @@ -9,8 +9,7 @@ void EnAttackNiw_Update(EnAttackNiw* this, GlobalContext* globalCtx); void EnAttackNiw_Draw(EnAttackNiw* this, GlobalContext* globalCtx); /* -const ActorInit En_Attack_Niw_InitVars = -{ +const ActorInit En_Attack_Niw_InitVars = { ACTOR_EN_ATTACK_NIW, ACTORTYPE_ENEMY, ROOM, diff --git a/src/overlays/actors/ovl_En_Attack_Niw/z_en_attack_niw.h b/src/overlays/actors/ovl_En_Attack_Niw/z_en_attack_niw.h index b4eaf8c106..e1184b8e86 100644 --- a/src/overlays/actors/ovl_En_Attack_Niw/z_en_attack_niw.h +++ b/src/overlays/actors/ovl_En_Attack_Niw/z_en_attack_niw.h @@ -4,8 +4,7 @@ #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ Actor actor; /* 0x014C */ char unk_14C[0x19C]; } EnAttackNiw; // size = 0x02E8 diff --git a/src/overlays/actors/ovl_En_Ba/z_en_ba.c b/src/overlays/actors/ovl_En_Ba/z_en_ba.c index 709fd4d72b..1d1df7898e 100644 --- a/src/overlays/actors/ovl_En_Ba/z_en_ba.c +++ b/src/overlays/actors/ovl_En_Ba/z_en_ba.c @@ -1,6 +1,6 @@ #include "z_en_ba.h" -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x00000015 void EnBa_Init(EnBa* this, GlobalContext* globalCtx); @@ -9,8 +9,7 @@ void EnBa_Update(EnBa* this, GlobalContext* globalCtx); void EnBa_Draw(EnBa* this, GlobalContext* globalCtx); /* -const ActorInit En_Ba_InitVars = -{ +const ActorInit En_Ba_InitVars = { ACTOR_EN_BA, ACTORTYPE_ENEMY, ROOM, diff --git a/src/overlays/actors/ovl_En_Ba/z_en_ba.h b/src/overlays/actors/ovl_En_Ba/z_en_ba.h index 837b04b83e..dddb2e475a 100644 --- a/src/overlays/actors/ovl_En_Ba/z_en_ba.h +++ b/src/overlays/actors/ovl_En_Ba/z_en_ba.h @@ -4,8 +4,7 @@ #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ Actor actor; /* 0x014C */ char unk_14C[0x274]; } EnBa; // size = 0x03C0 diff --git a/src/overlays/actors/ovl_En_Bb/z_en_bb.c b/src/overlays/actors/ovl_En_Bb/z_en_bb.c index 1cf09e8a98..365363811f 100644 --- a/src/overlays/actors/ovl_En_Bb/z_en_bb.c +++ b/src/overlays/actors/ovl_En_Bb/z_en_bb.c @@ -1,6 +1,6 @@ #include "z_en_bb.h" -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x01000015 void EnBb_Init(EnBb* this, GlobalContext* globalCtx); @@ -9,8 +9,7 @@ void EnBb_Update(EnBb* this, GlobalContext* globalCtx); void EnBb_Draw(EnBb* this, GlobalContext* globalCtx); /* -const ActorInit En_Bb_InitVars = -{ +const ActorInit En_Bb_InitVars = { ACTOR_EN_BB, ACTORTYPE_ENEMY, ROOM, diff --git a/src/overlays/actors/ovl_En_Bb/z_en_bb.h b/src/overlays/actors/ovl_En_Bb/z_en_bb.h index d5961b0047..f44c5b981a 100644 --- a/src/overlays/actors/ovl_En_Bb/z_en_bb.h +++ b/src/overlays/actors/ovl_En_Bb/z_en_bb.h @@ -4,8 +4,7 @@ #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ Actor actor; /* 0x014C */ char unk_14C[0x1DC]; } EnBb; // size = 0x0328 diff --git a/src/overlays/actors/ovl_En_Bdfire/z_en_bdfire.c b/src/overlays/actors/ovl_En_Bdfire/z_en_bdfire.c index 6e8296d232..9df5b6ef14 100644 --- a/src/overlays/actors/ovl_En_Bdfire/z_en_bdfire.c +++ b/src/overlays/actors/ovl_En_Bdfire/z_en_bdfire.c @@ -1,6 +1,6 @@ #include "z_en_bdfire.h" -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x00000030 void EnBdfire_Init(EnBdfire* this, GlobalContext* globalCtx); @@ -9,8 +9,7 @@ void EnBdfire_Update(EnBdfire* this, GlobalContext* globalCtx); void EnBdfire_Draw(EnBdfire* this, GlobalContext* globalCtx); /* -const ActorInit En_Bdfire_InitVars = -{ +const ActorInit En_Bdfire_InitVars = { ACTOR_PLAYER, ACTORTYPE_ENEMY, ROOM, diff --git a/src/overlays/actors/ovl_En_Bdfire/z_en_bdfire.h b/src/overlays/actors/ovl_En_Bdfire/z_en_bdfire.h index b9708ec64c..c226f5f42e 100644 --- a/src/overlays/actors/ovl_En_Bdfire/z_en_bdfire.h +++ b/src/overlays/actors/ovl_En_Bdfire/z_en_bdfire.h @@ -4,8 +4,7 @@ #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ Actor actor; /* 0x014C */ char unk_14C[0x98]; } EnBdfire; // size = 0x01E4 diff --git a/src/overlays/actors/ovl_En_Bigokuta/z_en_bigokuta.c b/src/overlays/actors/ovl_En_Bigokuta/z_en_bigokuta.c index 0f50335e42..35797342d0 100644 --- a/src/overlays/actors/ovl_En_Bigokuta/z_en_bigokuta.c +++ b/src/overlays/actors/ovl_En_Bigokuta/z_en_bigokuta.c @@ -1,6 +1,6 @@ #include "z_en_bigokuta.h" -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x00000035 void EnBigokuta_Init(EnBigokuta* this, GlobalContext* globalCtx); @@ -9,8 +9,7 @@ void EnBigokuta_Update(EnBigokuta* this, GlobalContext* globalCtx); void EnBigokuta_Draw(EnBigokuta* this, GlobalContext* globalCtx); /* -const ActorInit En_Bigokuta_InitVars = -{ +const ActorInit En_Bigokuta_InitVars = { ACTOR_EN_BIGOKUTA, ACTORTYPE_ENEMY, ROOM, diff --git a/src/overlays/actors/ovl_En_Bigokuta/z_en_bigokuta.h b/src/overlays/actors/ovl_En_Bigokuta/z_en_bigokuta.h index a0df60028d..aed87b3d7c 100644 --- a/src/overlays/actors/ovl_En_Bigokuta/z_en_bigokuta.h +++ b/src/overlays/actors/ovl_En_Bigokuta/z_en_bigokuta.h @@ -4,8 +4,7 @@ #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ Actor actor; /* 0x014C */ char unk_14C[0x238]; } EnBigokuta; // size = 0x0384 diff --git a/src/overlays/actors/ovl_En_Bili/z_en_bili.c b/src/overlays/actors/ovl_En_Bili/z_en_bili.c index 89358438dd..1da26efb71 100644 --- a/src/overlays/actors/ovl_En_Bili/z_en_bili.c +++ b/src/overlays/actors/ovl_En_Bili/z_en_bili.c @@ -1,6 +1,6 @@ #include "z_en_bili.h" -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x00005005 void EnBili_Init(EnBili* this, GlobalContext* globalCtx); @@ -9,8 +9,7 @@ void EnBili_Update(EnBili* this, GlobalContext* globalCtx); void EnBili_Draw(EnBili* this, GlobalContext* globalCtx); /* -const ActorInit En_Bili_InitVars = -{ +const ActorInit En_Bili_InitVars = { ACTOR_EN_BILI, ACTORTYPE_ENEMY, ROOM, diff --git a/src/overlays/actors/ovl_En_Bili/z_en_bili.h b/src/overlays/actors/ovl_En_Bili/z_en_bili.h index 29f11d3699..e98b229e64 100644 --- a/src/overlays/actors/ovl_En_Bili/z_en_bili.h +++ b/src/overlays/actors/ovl_En_Bili/z_en_bili.h @@ -4,8 +4,7 @@ #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ Actor actor; /* 0x014C */ char unk_14C[0xD4]; } EnBili; // size = 0x0220 diff --git a/src/overlays/actors/ovl_En_Bird/z_en_bird.c b/src/overlays/actors/ovl_En_Bird/z_en_bird.c index af726a6d68..984bd07a21 100644 --- a/src/overlays/actors/ovl_En_Bird/z_en_bird.c +++ b/src/overlays/actors/ovl_En_Bird/z_en_bird.c @@ -2,34 +2,32 @@ * File: z_en_bird.c * Overlay: ovl_En_Bird * Description: The projectile fired by deku scrubs and octaroks. -*/ + */ #include #include -typedef struct -{ - /* 0x0000 */ Actor actor; +typedef struct { + /* 0x0000 */ Actor actor; /* 0x014C */ SkelAnime skelAnime; - /* 0x018C */ char unk_18C[0x4]; /* 0x0190 */ ActorFunc updateFunc; - /* 0x0194 */ u32 unk_194; - /* 0x0198 */ s32 unk_198; - /* 0x019C */ s16 unk_19C; - /* 0x019E */ char unk_19E[0x2]; - /* 0x01A0 */ f32 unk_1A0; - /* 0x01A4 */ f32 unk_1A4; - /* 0x01A8 */ f32 unk_1A8; - /* 0x01AC */ f32 unk_1AC; - /* 0x01B0 */ f32 unk_1B0; - /* 0x01B4 */ f32 unk_1B4; - /* 0x01B8 */ f32 unk_1B8; - /* 0x01BC */ f32 unk_1BC; - /* 0x01C0 */ s16 unk_1C0; - /* 0x01C2 */ char unk_1C2[0x1A]; + /* 0x0194 */ u32 unk_194; + /* 0x0198 */ s32 unk_198; + /* 0x019C */ s16 unk_19C; + /* 0x019E */ char unk_19E[0x2]; + /* 0x01A0 */ f32 unk_1A0; + /* 0x01A4 */ f32 unk_1A4; + /* 0x01A8 */ f32 unk_1A8; + /* 0x01AC */ f32 unk_1AC; + /* 0x01B0 */ f32 unk_1B0; + /* 0x01B4 */ f32 unk_1B4; + /* 0x01B8 */ f32 unk_1B8; + /* 0x01BC */ f32 unk_1BC; + /* 0x01C0 */ s16 unk_1C0; + /* 0x01C2 */ char unk_1C2[0x1A]; } EnBird; // size = 0x01C4 -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x00000000 void EnBird_Init(EnBird* this, GlobalContext* globalCtx); @@ -42,8 +40,7 @@ void EnBird_SetNewUpdate(EnBird* this, ActorFunc updateFunc); void func_809C1D60(EnBird* this, GlobalContext* globalCtx); void func_809C1CAC(EnBird* this, s16 params); -const ActorInit En_Bird_InitVars = -{ +const ActorInit En_Bird_InitVars = { ACTOR_EN_BIRD, ACTORTYPE_PROP, ROOM, @@ -56,21 +53,18 @@ const ActorInit En_Bird_InitVars = (ActorFunc)EnBird_Draw, }; -static InitChainEntry initChain[] = -{ - ICHAIN_F32(unk_4C, 5600, ICHAIN_STOP) +static InitChainEntry initChain[] = { + ICHAIN_F32(unk_4C, 5600, ICHAIN_STOP), }; -extern u32 D_0600006C; -extern u32 D_06002190; +extern AnimationHeader D_0600006C; +extern SkeletonHeader D_06002190; -void EnBird_SetNewUpdate(EnBird* this, ActorFunc newUpdateFunc) -{ +void EnBird_SetNewUpdate(EnBird* this, ActorFunc newUpdateFunc) { this->updateFunc = newUpdateFunc; } -void EnBird_Init(EnBird* this, GlobalContext* globalCtx) -{ +void EnBird_Init(EnBird* this, GlobalContext* globalCtx) { Actor_ProcessInitChain(&this->actor, initChain); Actor_SetScale(&this->actor, 0.01); SkelAnime_Init(globalCtx, &this->skelAnime, &D_06002190, &D_0600006C, 0, 0, 0); @@ -89,66 +83,51 @@ void EnBird_Init(EnBird* this, GlobalContext* globalCtx) func_809C1CAC(this, this->actor.params); } -void EnBird_Destroy(EnBird* this, GlobalContext* globalCtx) -{ - +void EnBird_Destroy(EnBird* this, GlobalContext* globalCtx) { } -#ifdef NON_MATCHING -// D_0600006C address is reused when it shouldn't be -// also minor ordering differences -void func_809C1CAC(EnBird* this, s16 params) -{ +void func_809C1CAC(EnBird* this, s16 params) { f32 frameCount = SkelAnime_GetFrameCount(&D_0600006C); f32 playbackSpeed = this->unk_19C ? 0.0f : 1.0f; + AnimationHeader* anim = &D_0600006C; + this->unk_198 = Math_Rand_S16Offset(5, 0x23); - SkelAnime_ChangeAnimation(&this->skelAnime, &D_0600006C, playbackSpeed, 0.0f, frameCount, 0, 0.0f); + SkelAnime_ChangeAnim(&this->skelAnime, anim, playbackSpeed, 0.0f, frameCount, 0, 0.0f); EnBird_SetNewUpdate(this, func_809C1D60); } -#else -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Bird/func_809C1CAC.s") -#endif -void func_809C1D60(EnBird* this, GlobalContext* globalCtx) -{ +void func_809C1D60(EnBird* this, GlobalContext* globalCtx) { f32 fVar2 = sinf(this->unk_1B4); this->actor.shape.unk_08 = this->actor.shape.unk_08 + fVar2 * this->unk_1A0; Math_SmoothScaleMaxMinF(&this->actor.speedXZ, 0.0f, 0.1f, 0.5f, 0.0f); - if (this->unk_19C != 0) - { + if (this->unk_19C != 0) { this->skelAnime.animPlaybackSpeed = this->actor.speedXZ + this->actor.speedXZ; } SkelAnime_FrameUpdateMatrix(&this->skelAnime); this->unk_198 -= 1; - if (this->unk_198 <= 0) - { + if (this->unk_198 <= 0) { func_809C1E00(this, this->actor.params); } } -void func_809C1E00(EnBird* this, s16 params) -{ +void func_809C1E00(EnBird* this, s16 params) { this->unk_198 = Math_Rand_S16Offset(0x14, 0x2D); EnBird_SetNewUpdate(this, (ActorFunc)func_809C1E40); } - -void func_809C1E40(EnBird* this, GlobalContext* globalCtx) -{ +void func_809C1E40(EnBird* this, GlobalContext* globalCtx) { f32 fVar4 = sinf(this->unk_1B4); this->actor.shape.unk_08 += fVar4 * this->unk_1A0; Math_SmoothScaleMaxMinF(&this->actor.speedXZ, this->unk_1A8, 0.1f, this->unk_1AC, 0.0f); - if (this->unk_1B0 < Math_Vec3f_DistXZ(&this->actor.posRot.pos, &this->actor.initPosRot.pos) || this->unk_198 < 4) - { - func_80077B58(&this->actor.posRot.rot.y, Math_Vec3f_Yaw(&this->actor.posRot.pos, &this->actor.initPosRot.pos), this->unk_1C0); - } - else - { + if (this->unk_1B0 < Math_Vec3f_DistXZ(&this->actor.posRot.pos, &this->actor.initPosRot.pos) || this->unk_198 < 4) { + func_80077B58(&this->actor.posRot.rot.y, Math_Vec3f_Yaw(&this->actor.posRot.pos, &this->actor.initPosRot.pos), + this->unk_1C0); + } else { fVar4 = sinf(this->unk_1B4); this->actor.posRot.rot.y += (s16)(fVar4 * this->unk_1A4); } @@ -156,19 +135,16 @@ void func_809C1E40(EnBird* this, GlobalContext* globalCtx) this->actor.shape.rot.y = this->actor.posRot.rot.y; SkelAnime_FrameUpdateMatrix(&this->skelAnime); this->unk_198 -= 1; - if (this->unk_198 < 0) - { + if (this->unk_198 < 0) { func_809C1CAC(this, this->actor.params); } } -void EnBird_Update(EnBird* this, GlobalContext* globalCtx) -{ +void EnBird_Update(EnBird* this, GlobalContext* globalCtx) { this->unk_1B4 += this->unk_1B8; this->updateFunc(this, globalCtx); } -void EnBird_Draw(EnBird* this, GlobalContext* globalCtx) -{ - SkelAnime_Draw(globalCtx, this->skelAnime.limbIndex, this->skelAnime.actorDrawTbl, 0, NULL, NULL); +void EnBird_Draw(EnBird* this, GlobalContext* globalCtx) { + SkelAnime_Draw(globalCtx, this->skelAnime.skeleton, this->skelAnime.actorDrawTbl, 0, NULL, NULL); } 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 85d6c5d851..99af0e2603 100644 --- a/src/overlays/actors/ovl_En_Blkobj/z_en_blkobj.c +++ b/src/overlays/actors/ovl_En_Blkobj/z_en_blkobj.c @@ -1,6 +1,6 @@ #include "z_en_blkobj.h" -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x00000030 void EnBlkobj_Init(EnBlkobj* this, GlobalContext* globalCtx); @@ -9,8 +9,7 @@ void EnBlkobj_Update(EnBlkobj* this, GlobalContext* globalCtx); void EnBlkobj_Draw(EnBlkobj* this, GlobalContext* globalCtx); /* -const ActorInit En_Blkobj_InitVars = -{ +const ActorInit En_Blkobj_InitVars = { ACTOR_EN_BLKOBJ, ACTORTYPE_PROP, ROOM, diff --git a/src/overlays/actors/ovl_En_Blkobj/z_en_blkobj.h b/src/overlays/actors/ovl_En_Blkobj/z_en_blkobj.h index 93d53fd06f..1bceccc739 100644 --- a/src/overlays/actors/ovl_En_Blkobj/z_en_blkobj.h +++ b/src/overlays/actors/ovl_En_Blkobj/z_en_blkobj.h @@ -4,8 +4,7 @@ #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ Actor actor; /* 0x014C */ char unk_14C[0x20]; } EnBlkobj; // size = 0x016C 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 1313f7d37c..b51142f9c0 100644 --- a/src/overlays/actors/ovl_En_Bom/z_en_bom.c +++ b/src/overlays/actors/ovl_En_Bom/z_en_bom.c @@ -1,6 +1,6 @@ #include "z_en_bom.h" -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x00000030 void EnBom_Init(EnBom* this, GlobalContext* globalCtx); @@ -9,8 +9,7 @@ void EnBom_Update(EnBom* this, GlobalContext* globalCtx); void EnBom_Draw(EnBom* this, GlobalContext* globalCtx); /* -const ActorInit En_Bom_InitVars = -{ +const ActorInit En_Bom_InitVars = { ACTOR_EN_BOM, ACTORTYPE_EXPLOSIVES, ROOM, diff --git a/src/overlays/actors/ovl_En_Bom/z_en_bom.h b/src/overlays/actors/ovl_En_Bom/z_en_bom.h index ce9f141c32..0e971d9316 100644 --- a/src/overlays/actors/ovl_En_Bom/z_en_bom.h +++ b/src/overlays/actors/ovl_En_Bom/z_en_bom.h @@ -4,8 +4,7 @@ #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ Actor actor; /* 0x014C */ char unk_14C[0xBC]; } EnBom; // size = 0x0208 diff --git a/src/overlays/actors/ovl_En_Bom_Bowl_Man/z_en_bom_bowl_man.c b/src/overlays/actors/ovl_En_Bom_Bowl_Man/z_en_bom_bowl_man.c index e3136d3907..9387f303d5 100644 --- a/src/overlays/actors/ovl_En_Bom_Bowl_Man/z_en_bom_bowl_man.c +++ b/src/overlays/actors/ovl_En_Bom_Bowl_Man/z_en_bom_bowl_man.c @@ -1,6 +1,6 @@ #include "z_en_bom_bowl_man.h" -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x08000039 void EnBomBowlMan_Init(EnBomBowlMan* this, GlobalContext* globalCtx); @@ -9,8 +9,7 @@ void EnBomBowlMan_Update(EnBomBowlMan* this, GlobalContext* globalCtx); void EnBomBowlMan_Draw(EnBomBowlMan* this, GlobalContext* globalCtx); /* -const ActorInit En_Bom_Bowl_Man_InitVars = -{ +const ActorInit En_Bom_Bowl_Man_InitVars = { ACTOR_EN_BOM_BOWL_MAN, ACTORTYPE_NPC, ROOM, diff --git a/src/overlays/actors/ovl_En_Bom_Bowl_Man/z_en_bom_bowl_man.h b/src/overlays/actors/ovl_En_Bom_Bowl_Man/z_en_bom_bowl_man.h index cd4bde14d3..27fdd364c9 100644 --- a/src/overlays/actors/ovl_En_Bom_Bowl_Man/z_en_bom_bowl_man.h +++ b/src/overlays/actors/ovl_En_Bom_Bowl_Man/z_en_bom_bowl_man.h @@ -4,8 +4,7 @@ #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ Actor actor; /* 0x014C */ char unk_14C[0x10C]; /* 0x0258 */ u8 unk_258; diff --git a/src/overlays/actors/ovl_En_Bom_Bowl_Pit/z_en_bom_bowl_pit.c b/src/overlays/actors/ovl_En_Bom_Bowl_Pit/z_en_bom_bowl_pit.c index f5c80248be..d2ed6e9344 100644 --- a/src/overlays/actors/ovl_En_Bom_Bowl_Pit/z_en_bom_bowl_pit.c +++ b/src/overlays/actors/ovl_En_Bom_Bowl_Pit/z_en_bom_bowl_pit.c @@ -1,6 +1,6 @@ #include "z_en_bom_bowl_pit.h" -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x00000010 void EnBomBowlPit_Init(EnBomBowlPit* this, GlobalContext* globalCtx); @@ -8,8 +8,7 @@ void EnBomBowlPit_Destroy(EnBomBowlPit* this, GlobalContext* globalCtx); void EnBomBowlPit_Update(EnBomBowlPit* this, GlobalContext* globalCtx); /* -const ActorInit En_Bom_Bowl_Pit_InitVars = -{ +const ActorInit En_Bom_Bowl_Pit_InitVars = { ACTOR_EN_BOM_BOWL_PIT, ACTORTYPE_PROP, ROOM, diff --git a/src/overlays/actors/ovl_En_Bom_Bowl_Pit/z_en_bom_bowl_pit.h b/src/overlays/actors/ovl_En_Bom_Bowl_Pit/z_en_bom_bowl_pit.h index 99e6b0e2f4..84d85c978d 100644 --- a/src/overlays/actors/ovl_En_Bom_Bowl_Pit/z_en_bom_bowl_pit.h +++ b/src/overlays/actors/ovl_En_Bom_Bowl_Pit/z_en_bom_bowl_pit.h @@ -4,8 +4,7 @@ #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ Actor actor; /* 0x014C */ char unk_14C[0x35B8]; } EnBomBowlPit; // size = 0x3704 diff --git a/src/overlays/actors/ovl_En_Bom_Chu/z_en_bom_chu.c b/src/overlays/actors/ovl_En_Bom_Chu/z_en_bom_chu.c index 6e45fa3082..9347f06866 100644 --- a/src/overlays/actors/ovl_En_Bom_Chu/z_en_bom_chu.c +++ b/src/overlays/actors/ovl_En_Bom_Chu/z_en_bom_chu.c @@ -1,6 +1,6 @@ #include "z_en_bom_chu.h" -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x00000010 void EnBomChu_Init(EnBomChu* this, GlobalContext* globalCtx); @@ -9,8 +9,7 @@ void EnBomChu_Update(EnBomChu* this, GlobalContext* globalCtx); void EnBomChu_Draw(EnBomChu* this, GlobalContext* globalCtx); /* -const ActorInit En_Bom_Chu_InitVars = -{ +const ActorInit En_Bom_Chu_InitVars = { ACTOR_EN_BOM_CHU, ACTORTYPE_EXPLOSIVES, ROOM, diff --git a/src/overlays/actors/ovl_En_Bom_Chu/z_en_bom_chu.h b/src/overlays/actors/ovl_En_Bom_Chu/z_en_bom_chu.h index 4221392c2a..a6c90ea11a 100644 --- a/src/overlays/actors/ovl_En_Bom_Chu/z_en_bom_chu.h +++ b/src/overlays/actors/ovl_En_Bom_Chu/z_en_bom_chu.h @@ -4,8 +4,7 @@ #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ Actor actor; /* 0x014C */ char unk_14C[0x98]; } EnBomChu; // size = 0x01E4 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 c9b1bc035e..9e3e41b1f7 100644 --- a/src/overlays/actors/ovl_En_Bombf/z_en_bombf.c +++ b/src/overlays/actors/ovl_En_Bombf/z_en_bombf.c @@ -1,6 +1,6 @@ #include "z_en_bombf.h" -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x00000011 void EnBombf_Init(EnBombf* this, GlobalContext* globalCtx); @@ -9,8 +9,7 @@ void EnBombf_Update(EnBombf* this, GlobalContext* globalCtx); void EnBombf_Draw(EnBombf* this, GlobalContext* globalCtx); /* -const ActorInit En_Bombf_InitVars = -{ +const ActorInit En_Bombf_InitVars = { ACTOR_EN_BOMBF, ACTORTYPE_PROP, ROOM, diff --git a/src/overlays/actors/ovl_En_Bombf/z_en_bombf.h b/src/overlays/actors/ovl_En_Bombf/z_en_bombf.h index 3ffe1fa6a6..513dd6b0cc 100644 --- a/src/overlays/actors/ovl_En_Bombf/z_en_bombf.h +++ b/src/overlays/actors/ovl_En_Bombf/z_en_bombf.h @@ -4,8 +4,7 @@ #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ Actor actor; /* 0x014C */ char unk_14C[0xC4]; } EnBombf; // size = 0x0210 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 da3921c246..0104711d11 100644 --- a/src/overlays/actors/ovl_En_Boom/z_en_boom.c +++ b/src/overlays/actors/ovl_En_Boom/z_en_boom.c @@ -2,11 +2,11 @@ * File: z_en_boom.c * Overlay: ovl_En_Boom * Description: Thrown Boomerang. Actor spawns when thrown and is killed when caught. -*/ + */ #include "z_en_boom.h" -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x00000030 static void EnBoom_SetupAction(EnBoom* this, ActorFunc* actionFunc); @@ -16,8 +16,7 @@ static void EnBoom_Fly(EnBoom* this, GlobalContext* globalCtx); static void EnBoom_Update(EnBoom* this, GlobalContext* globalCtx); static void EnBoom_Draw(EnBoom* this, GlobalContext* globalCtx); -const ActorInit En_Boom_InitVars = -{ +const ActorInit En_Boom_InitVars = { ACTOR_EN_BOOM, ACTORTYPE_MISC, ROOM, @@ -27,37 +26,36 @@ const ActorInit En_Boom_InitVars = (ActorFunc)EnBoom_Init, (ActorFunc)EnBoom_Destroy, (ActorFunc)EnBoom_Update, - (ActorFunc)EnBoom_Draw + (ActorFunc)EnBoom_Draw, }; // Related to collision, should be moved somewhere else when collision_check is decompiled. // Seems to be made up of a bunch of substructs, but I didnt do too much digging. // This is probably not accurate. -typedef struct -{ - u8 unk_00; - u8 unk_01; - u8 unk_02; - u8 unk_03; - u8 unk_04; - u8 unk_05; +typedef struct { + u8 unk_00; + u8 unk_01; + u8 unk_02; + u8 unk_03; + u8 unk_04; + u8 unk_05; u16 pad_06; - u8 unk_08; - u8 pad_09; - u8 pad_0A; - u8 pad_0B; + u8 unk_08; + u8 pad_09; + u8 pad_0A; + u8 pad_0B; u32 unk_0C; - u8 unk_10; - u8 unk_11; + u8 unk_10; + u8 unk_11; u16 pad_12; u32 unk_14; - u8 unk_18; - u8 unk_19; + u8 unk_18; + u8 unk_19; u16 pad_1A; - u8 unk_1C; - u8 unk_1D; - u8 unk_1E; - u8 pad_1F; + u8 unk_1C; + u8 unk_1D; + u8 unk_1E; + u8 pad_1F; u32 unk_20; u32 unk_24; u32 unk_28; @@ -70,35 +68,30 @@ typedef struct u32 unk_44; u32 unk_48; u32 unk_4C; -} unkCollision; //size = 0x50 +} unkCollision; // size = 0x50 -static unkCollision col = -{ - 0x0A, 0x09, 0x00, 0x00, 0x08, 0x03, 0x0000, 0x02, 0x00, 0x00, 0x00, 0x00000010, - 0x00, 0x01, 0x0000, 0xFFCFFFFF, 0x00, 0x00, 0x0000, 0x05, 0x00, 0x00, 0x00, - 0x00000000, 0x00000000, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, 0x00000000, 0x00000000, +static unkCollision col = { + 0x0A, 0x09, 0x00, 0x00, 0x08, 0x03, 0x0000, 0x02, 0x00, + 0x00, 0x00, 0x00000010, 0x00, 0x01, 0x0000, 0xFFCFFFFF, 0x00, 0x00, + 0x0000, 0x05, 0x00, 0x00, 0x00, 0x00000000, 0x00000000, 0x00000000, 0x00000000, + 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, }; -static InitChainEntry initChain[] = -{ +static InitChainEntry initChain[] = { ICHAIN_S8(unk_1F, 5, ICHAIN_CONTINUE), ICHAIN_VEC3S(shape.rot, 0, ICHAIN_STOP), }; static Vec3f mtxSrc1 = { -960.0f, 0.0f, 0.0f }; -static Vec3f mtxSrc2 = { 960.0f, 0.0f, 0.0f }; +static Vec3f mtxSrc2 = { 960.0f, 0.0f, 0.0f }; extern D_0400C808; -static void EnBoom_SetupAction(EnBoom* this, ActorFunc* actionFunc) -{ +static void EnBoom_SetupAction(EnBoom* this, ActorFunc* actionFunc) { this->actionFunc = actionFunc; } -static void EnBoom_Init(EnBoom* this, GlobalContext* globalCtx) -{ +static void EnBoom_Init(EnBoom* this, GlobalContext* globalCtx) { u32 pad; TrailEffect trail; @@ -138,14 +131,12 @@ static void EnBoom_Init(EnBoom* this, GlobalContext* globalCtx) EnBoom_SetupAction(this, &EnBoom_Fly); } -static void EnBoom_Destroy(EnBoom* this, GlobalContext* globalCtx) -{ +static void EnBoom_Destroy(EnBoom* this, GlobalContext* globalCtx) { func_8002709C(globalCtx, this->effect); func_8005D060(globalCtx, &this->collider); } -static void EnBoom_Fly(EnBoom* this, GlobalContext* globalCtx) -{ +static void EnBoom_Fly(EnBoom* this, GlobalContext* globalCtx) { Actor* target; Player* player; s32 collided; @@ -165,8 +156,7 @@ static void EnBoom_Fly(EnBoom* this, GlobalContext* globalCtx) target = this->moveTo; // If the boomerang is moving toward a targeted actor, handle setting the proper x and y angle to fly toward it. - if (target != NULL) - { + if (target != NULL) { yawTarget = func_8002DAC0(&this->actor, &target->posRot2.pos); yawDiff = this->actor.posRot.rot.y - yawTarget; @@ -174,23 +164,21 @@ static void EnBoom_Fly(EnBoom* this, GlobalContext* globalCtx) pitchDiff = this->actor.posRot.rot.x - pitchTarget; distXYZScale = ((200.0f - Math_Vec3f_DistXYZ(&this->actor.posRot.pos, &target->posRot2.pos)) * 0.005f); - if (distXYZScale < 0.12f) + if (distXYZScale < 0.12f) { distXYZScale = 0.12f; - - if ((target != (Actor*)player) && ((target->update == NULL) || (ABS(yawDiff) > 0x4000))) - { + } + + if ((target != (Actor*)player) && ((target->update == NULL) || (ABS(yawDiff) > 0x4000))) { // BUG: This condition is why the boomerang will randomly fly off in a the down left direction sometimes. // If the actor targetted is not Link and the difference between the 2 y angles is greater than 0x4000, // the moveTo pointer is nulled and it flies off in a seemingly random direction. this->moveTo = NULL; - } - else - { + } else { Math_ApproxUpdateScaledS(&this->actor.posRot.rot.y, yawTarget, (s16)(ABS(yawDiff) * distXYZScale)); Math_ApproxUpdateScaledS(&this->actor.posRot.rot.x, pitchTarget, (s16)(ABS(pitchDiff) * distXYZScale)); } } - + // Set xyz speed, move forward, and play the boomerang sound func_8002D9A4(&this->actor, 12.0f); Actor_MoveForward(&this->actor); @@ -199,42 +187,33 @@ static void EnBoom_Fly(EnBoom* this, GlobalContext* globalCtx) // If the boomerang collides with EnItem00 or a Skulltula token, set grabbed pointer to pick it up collided = (this->collider.colliderFlags & 0x2); collided = (!!(collided)); - if (collided) - { - if (((this->collider.at->id == ACTOR_EN_ITEM00) || (this->collider.at->id == ACTOR_EN_SI))) - { + if (collided) { + if (((this->collider.at->id == ACTOR_EN_ITEM00) || (this->collider.at->id == ACTOR_EN_SI))) { this->grabbed = this->collider.at; - if (this->collider.at->id == ACTOR_EN_SI) - { + if (this->collider.at->id == ACTOR_EN_SI) { this->collider.at->flags |= 0x2000; } } } - - // Decrement the return timer and check if its 0. If it is, check if Link can catch it and handle accordingly. + + // Decrement the return timer and check if its 0. If it is, check if Link can catch it and handle accordingly. // Otherwise handle grabbing and colliding. - if (DECR(this->returnTimer) == 0) - { + if (DECR(this->returnTimer) == 0) { distFromLink = Math_Vec3f_DistXYZ(&this->actor.posRot.pos, &player->actor.posRot2.pos); this->moveTo = player; - //If the boomerang is less than 40 units away from Link, he can catch it. - if (distFromLink < 40.0f) - { + // If the boomerang is less than 40 units away from Link, he can catch it. + if (distFromLink < 40.0f) { target = this->grabbed; - if (target != NULL) - { + if (target != NULL) { Math_Vec3f_Copy(&target->posRot.pos, &player->actor.posRot.pos); // If the grabbed actor is EnItem00 (HP/Key etc) set gravity and flags so it falls in front of Link. // Otherwise if its a Skulltula Token, just set flags so he collides with it to collect it. - if (target->id == ACTOR_EN_ITEM00) - { + if (target->id == ACTOR_EN_ITEM00) { target->gravity = -0.9f; target->bgCheckFlags &= ~0x03; - } - else - { + } else { target->flags &= ~0x2000; } } @@ -242,42 +221,34 @@ static void EnBoom_Fly(EnBoom* this, GlobalContext* globalCtx) player->stateFlags1 &= ~0x02000000; Actor_Kill(&this->actor); } - } - else - { + } else { collided = (this->collider.colliderFlags & 0x2); collided = (!!(collided)); - if (collided) - { + if (collided) { // Copy the position from the prevous frame to the boomerang to start the bounce back. Math_Vec3f_Copy(&this->actor.posRot.pos, &this->actor.pos4); - } - else - { + } else { collided = func_8003DE84(&globalCtx->colCtx, &this->actor.pos4, &this->actor.posRot.pos, &hitPoint, - &this->actor.wallPoly, 1, 1, 1, 1, &hitDynaID); + &this->actor.wallPoly, 1, 1, 1, 1, &hitDynaID); - if (collided != 0) - { + if (collided != 0) { // If the boomerang coolides with something and its is a Jabu Object actor with params equal to 0, then - // set collided to 0 so that the boomerang will go through the wall. + // set collided to 0 so that the boomerang will go through the wall. // Otherwise play a clank sound and keep collided set to bounce back. if ((func_8002F9EC(globalCtx, &this->actor, this->actor.wallPoly, hitDynaID, &hitPoint) != 0) || - ((hitDynaID != 0x32) && ((hitActor = DynaPolyInfo_GetActor(&globalCtx->colCtx, hitDynaID)) != NULL) && (hitActor->actor.id == ACTOR_BG_BDAN_OBJECTS) && (hitActor->actor.params == 0))) - { + ((hitDynaID != 0x32) && + ((hitActor = DynaPolyInfo_GetActor(&globalCtx->colCtx, hitDynaID)) != NULL) && + (hitActor->actor.id == ACTOR_BG_BDAN_OBJECTS) && (hitActor->actor.params == 0))) { collided = 0; - } - else - { + } else { func_80062D60(globalCtx, &hitPoint); - } + } } } - + // If the boomerang needs to bounce back, set x and y angle accordingly. // Set timer to 0 and set return actor to player so it goes back to Link. - if (collided != 0) - { + if (collided != 0) { this->actor.posRot.rot.x = -this->actor.posRot.rot.x; this->actor.posRot.rot.y += 0x8000; this->moveTo = player; @@ -288,48 +259,40 @@ static void EnBoom_Fly(EnBoom* this, GlobalContext* globalCtx) // If the actor the boomerang is holding has a null update function, set grabbed to null. // Otherwise, copy the position from the boomerang to the actor to move it. target = this->grabbed; - if (target != NULL) - { - if (target->update == NULL) - { + if (target != NULL) { + if (target->update == NULL) { this->grabbed = NULL; - } - else - { + } else { Math_Vec3f_Copy(&target->posRot.pos, &this->actor.posRot.pos); } } } -static void EnBoom_Update(EnBoom* this, GlobalContext* globalCtx) -{ +static void EnBoom_Update(EnBoom* this, GlobalContext* globalCtx) { Player* player = PLAYER; - if (!(player->stateFlags1 & 0x20000000)) - { + if (!(player->stateFlags1 & 0x20000000)) { this->actionFunc(this, globalCtx); Actor_SetHeight(&this->actor, 0.0f); this->activeTimer = this->activeTimer + 1; } } -static void EnBoom_Draw(EnBoom* this, GlobalContext* globalCtx) -{ +static void EnBoom_Draw(EnBoom* this, GlobalContext* globalCtx) { s32 pad; Vec3f mtxDest1; Vec3f mtxDest2; GraphicsContext* gfxCtx; - Gfx* gfxArr[4]; + Gfx* dispRefs[4]; gfxCtx = globalCtx->state.gfxCtx; - func_800C6AC4(gfxArr, globalCtx->state.gfxCtx, "../z_en_boom.c", 567); + Graph_OpenDisps(dispRefs, globalCtx->state.gfxCtx, "../z_en_boom.c", 567); Matrix_RotateY(this->actor.posRot.rot.y * 0.0000958738f, MTXMODE_APPLY); Matrix_RotateZ(0.7669904f, MTXMODE_APPLY); Matrix_RotateX(this->actor.posRot.rot.x * 0.0000958738f, MTXMODE_APPLY); Matrix_MultVec3f(&mtxSrc1, &mtxDest1); Matrix_MultVec3f(&mtxSrc2, &mtxDest2); - if (func_80090480(globalCtx, &this->collider, &this->unk_1DC, &mtxDest1, &mtxDest2) != 0) - { + if (func_80090480(globalCtx, &this->collider, &this->unk_1DC, &mtxDest1, &mtxDest2) != 0) { func_8001FDF0(func_80026B0C(this->effect), &mtxDest1, &mtxDest2); } @@ -340,5 +303,5 @@ static void EnBoom_Draw(EnBoom* this, GlobalContext* globalCtx) G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPDisplayList(gfxCtx->polyOpa.p++, &D_0400C808); - func_800C6B54(gfxArr, globalCtx->state.gfxCtx, "../z_en_boom.c", 604); + Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_en_boom.c", 604); } diff --git a/src/overlays/actors/ovl_En_Boom/z_en_boom.h b/src/overlays/actors/ovl_En_Boom/z_en_boom.h index 1dd70eb49c..473fe4060a 100644 --- a/src/overlays/actors/ovl_En_Boom/z_en_boom.h +++ b/src/overlays/actors/ovl_En_Boom/z_en_boom.h @@ -4,8 +4,7 @@ #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ Actor actor; /* 0x014C */ Collider collider; /* 0x0164 */ char unk_164[0x68]; 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 2cd3cc8ece..f1343a3036 100644 --- a/src/overlays/actors/ovl_En_Box/z_en_box.c +++ b/src/overlays/actors/ovl_En_Box/z_en_box.c @@ -1,6 +1,6 @@ #include "z_en_box.h" -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x00000000 void EnBox_Init(EnBox* this, GlobalContext* globalCtx); @@ -9,8 +9,7 @@ void EnBox_Update(EnBox* this, GlobalContext* globalCtx); void EnBox_Draw(EnBox* this, GlobalContext* globalCtx); /* -const ActorInit En_Box_InitVars = -{ +const ActorInit En_Box_InitVars = { Chest, ACTORTYPE_CHEST, ROOM, diff --git a/src/overlays/actors/ovl_En_Box/z_en_box.h b/src/overlays/actors/ovl_En_Box/z_en_box.h index 7410fd7bab..69243cde30 100644 --- a/src/overlays/actors/ovl_En_Box/z_en_box.h +++ b/src/overlays/actors/ovl_En_Box/z_en_box.h @@ -4,8 +4,7 @@ #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ Actor actor; /* 0x014C */ char unk_14C[0xB0]; } EnBox; // size = 0x01FC diff --git a/src/overlays/actors/ovl_En_Brob/z_en_brob.c b/src/overlays/actors/ovl_En_Brob/z_en_brob.c index fe49fa8767..4ac1f7190a 100644 --- a/src/overlays/actors/ovl_En_Brob/z_en_brob.c +++ b/src/overlays/actors/ovl_En_Brob/z_en_brob.c @@ -1,6 +1,6 @@ #include "z_en_brob.h" -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x00000005 void EnBrob_Init(EnBrob* this, GlobalContext* globalCtx); @@ -9,8 +9,7 @@ void EnBrob_Update(EnBrob* this, GlobalContext* globalCtx); void EnBrob_Draw(EnBrob* this, GlobalContext* globalCtx); /* -const ActorInit En_Brob_InitVars = -{ +const ActorInit En_Brob_InitVars = { ACTOR_EN_BROB, ACTORTYPE_ENEMY, ROOM, diff --git a/src/overlays/actors/ovl_En_Brob/z_en_brob.h b/src/overlays/actors/ovl_En_Brob/z_en_brob.h index dfeb43901e..5e7eb39ffb 100644 --- a/src/overlays/actors/ovl_En_Brob/z_en_brob.h +++ b/src/overlays/actors/ovl_En_Brob/z_en_brob.h @@ -4,8 +4,7 @@ #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ Actor actor; /* 0x014C */ char unk_14C[0x174]; } EnBrob; // size = 0x02C0 diff --git a/src/overlays/actors/ovl_En_Bubble/z_en_bubble.c b/src/overlays/actors/ovl_En_Bubble/z_en_bubble.c index 6587f45927..8297e46808 100644 --- a/src/overlays/actors/ovl_En_Bubble/z_en_bubble.c +++ b/src/overlays/actors/ovl_En_Bubble/z_en_bubble.c @@ -1,6 +1,6 @@ #include "z_en_bubble.h" -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x00000001 void EnBubble_Init(EnBubble* this, GlobalContext* globalCtx); @@ -9,8 +9,7 @@ void EnBubble_Update(EnBubble* this, GlobalContext* globalCtx); void EnBubble_Draw(EnBubble* this, GlobalContext* globalCtx); /* -const ActorInit En_Bubble_InitVars = -{ +const ActorInit En_Bubble_InitVars = { ACTOR_EN_BUBBLE, ACTORTYPE_ENEMY, ROOM, diff --git a/src/overlays/actors/ovl_En_Bubble/z_en_bubble.h b/src/overlays/actors/ovl_En_Bubble/z_en_bubble.h index c54c573a16..71ee1c728c 100644 --- a/src/overlays/actors/ovl_En_Bubble/z_en_bubble.h +++ b/src/overlays/actors/ovl_En_Bubble/z_en_bubble.h @@ -4,8 +4,7 @@ #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ Actor actor; /* 0x014C */ char unk_14C[0x114]; } EnBubble; // size = 0x0260 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 647cb10de7..4d5098aa88 100644 --- a/src/overlays/actors/ovl_En_Butte/z_en_butte.c +++ b/src/overlays/actors/ovl_En_Butte/z_en_butte.c @@ -1,6 +1,6 @@ #include "z_en_butte.h" -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x00000000 void EnButte_Init(EnButte* this, GlobalContext* globalCtx); @@ -9,8 +9,7 @@ void EnButte_Update(EnButte* this, GlobalContext* globalCtx); void EnButte_Draw(EnButte* this, GlobalContext* globalCtx); /* -const ActorInit En_Butte_InitVars = -{ +const ActorInit En_Butte_InitVars = { ACTOR_EN_BUTTE, ACTORTYPE_ITEMACTION, ROOM, diff --git a/src/overlays/actors/ovl_En_Butte/z_en_butte.h b/src/overlays/actors/ovl_En_Butte/z_en_butte.h index 759789c02c..1ebc03e530 100644 --- a/src/overlays/actors/ovl_En_Butte/z_en_butte.h +++ b/src/overlays/actors/ovl_En_Butte/z_en_butte.h @@ -4,8 +4,7 @@ #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ Actor actor; /* 0x014C */ char unk_14C[0x11C]; } EnButte; // size = 0x0268 diff --git a/src/overlays/actors/ovl_En_Bw/z_en_bw.c b/src/overlays/actors/ovl_En_Bw/z_en_bw.c index 66d2c3626e..11403fabcd 100644 --- a/src/overlays/actors/ovl_En_Bw/z_en_bw.c +++ b/src/overlays/actors/ovl_En_Bw/z_en_bw.c @@ -1,6 +1,6 @@ #include "z_en_bw.h" -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x00000015 void EnBw_Init(EnBw* this, GlobalContext* globalCtx); @@ -9,8 +9,7 @@ void EnBw_Update(EnBw* this, GlobalContext* globalCtx); void EnBw_Draw(EnBw* this, GlobalContext* globalCtx); /* -const ActorInit En_Bw_InitVars = -{ +const ActorInit En_Bw_InitVars = { ACTOR_EN_BW, ACTORTYPE_ENEMY, ROOM, diff --git a/src/overlays/actors/ovl_En_Bw/z_en_bw.h b/src/overlays/actors/ovl_En_Bw/z_en_bw.h index 7d6dc660ac..75c530f530 100644 --- a/src/overlays/actors/ovl_En_Bw/z_en_bw.h +++ b/src/overlays/actors/ovl_En_Bw/z_en_bw.h @@ -4,8 +4,7 @@ #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ Actor actor; /* 0x014C */ char unk_14C[0x1E0]; } EnBw; // size = 0x032C 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 70f6261c5f..c459e99345 100644 --- a/src/overlays/actors/ovl_En_Bx/z_en_bx.c +++ b/src/overlays/actors/ovl_En_Bx/z_en_bx.c @@ -1,6 +1,6 @@ #include "z_en_bx.h" -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x00000010 void EnBx_Init(EnBx* this, GlobalContext* globalCtx); @@ -9,8 +9,7 @@ void EnBx_Update(EnBx* this, GlobalContext* globalCtx); void EnBx_Draw(EnBx* this, GlobalContext* globalCtx); /* -const ActorInit En_Bx_InitVars = -{ +const ActorInit En_Bx_InitVars = { ACTOR_EN_BX, ACTORTYPE_ENEMY, ROOM, diff --git a/src/overlays/actors/ovl_En_Bx/z_en_bx.h b/src/overlays/actors/ovl_En_Bx/z_en_bx.h index b86e858759..548e622b57 100644 --- a/src/overlays/actors/ovl_En_Bx/z_en_bx.h +++ b/src/overlays/actors/ovl_En_Bx/z_en_bx.h @@ -4,8 +4,7 @@ #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ Actor actor; /* 0x014C */ char unk_14C[0x14C]; } EnBx; // size = 0x0298 diff --git a/src/overlays/actors/ovl_En_Changer/z_en_changer.c b/src/overlays/actors/ovl_En_Changer/z_en_changer.c index bc89faafa3..50ff45aeab 100644 --- a/src/overlays/actors/ovl_En_Changer/z_en_changer.c +++ b/src/overlays/actors/ovl_En_Changer/z_en_changer.c @@ -1,6 +1,6 @@ #include "z_en_changer.h" -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x00000000 void EnChanger_Init(EnChanger* this, GlobalContext* globalCtx); @@ -8,8 +8,7 @@ void EnChanger_Destroy(EnChanger* this, GlobalContext* globalCtx); void EnChanger_Update(EnChanger* this, GlobalContext* globalCtx); /* -const ActorInit En_Changer_InitVars = -{ +const ActorInit En_Changer_InitVars = { ACTOR_EN_CHANGER, ACTORTYPE_PROP, ROOM, diff --git a/src/overlays/actors/ovl_En_Changer/z_en_changer.h b/src/overlays/actors/ovl_En_Changer/z_en_changer.h index df13fff6f2..7d65022c98 100644 --- a/src/overlays/actors/ovl_En_Changer/z_en_changer.h +++ b/src/overlays/actors/ovl_En_Changer/z_en_changer.h @@ -4,8 +4,7 @@ #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ Actor actor; /* 0x014C */ char unk_14C[0x20]; } EnChanger; // size = 0x016C diff --git a/src/overlays/actors/ovl_En_Clear_Tag/z_en_clear_tag.c b/src/overlays/actors/ovl_En_Clear_Tag/z_en_clear_tag.c index b3a31c0fd2..65764bcdb3 100644 --- a/src/overlays/actors/ovl_En_Clear_Tag/z_en_clear_tag.c +++ b/src/overlays/actors/ovl_En_Clear_Tag/z_en_clear_tag.c @@ -1,6 +1,6 @@ #include "z_en_clear_tag.h" -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x00000035 void EnClearTag_Init(EnClearTag* this, GlobalContext* globalCtx); @@ -9,8 +9,7 @@ void EnClearTag_Update(EnClearTag* this, GlobalContext* globalCtx); void EnClearTag_Draw(EnClearTag* this, GlobalContext* globalCtx); /* -const ActorInit En_Clear_Tag_InitVars = -{ +const ActorInit En_Clear_Tag_InitVars = { ACTOR_EN_CLEAR_TAG, ACTORTYPE_BOSS, ROOM, @@ -44,4 +43,3 @@ const ActorInit En_Clear_Tag_InitVars = #pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Clear_Tag/func_809D5004.s") #pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Clear_Tag/func_809D53CC.s") - diff --git a/src/overlays/actors/ovl_En_Clear_Tag/z_en_clear_tag.h b/src/overlays/actors/ovl_En_Clear_Tag/z_en_clear_tag.h index 707fc7f5a4..e3ea98d2cb 100644 --- a/src/overlays/actors/ovl_En_Clear_Tag/z_en_clear_tag.h +++ b/src/overlays/actors/ovl_En_Clear_Tag/z_en_clear_tag.h @@ -4,8 +4,7 @@ #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ Actor actor; /* 0x014C */ char unk_14C[0xB8]; } EnClearTag; // size = 0x0204 diff --git a/src/overlays/actors/ovl_En_Cow/z_en_cow.c b/src/overlays/actors/ovl_En_Cow/z_en_cow.c index bd9ae92128..da5c0d47aa 100644 --- a/src/overlays/actors/ovl_En_Cow/z_en_cow.c +++ b/src/overlays/actors/ovl_En_Cow/z_en_cow.c @@ -1,6 +1,6 @@ #include "z_en_cow.h" -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x00000009 void EnCow_Init(EnCow* this, GlobalContext* globalCtx); @@ -9,8 +9,7 @@ void EnCow_Update(EnCow* this, GlobalContext* globalCtx); void EnCow_Draw(EnCow* this, GlobalContext* globalCtx); /* -const ActorInit En_Cow_InitVars = -{ +const ActorInit En_Cow_InitVars = { ACTOR_EN_COW, ACTORTYPE_NPC, ROOM, diff --git a/src/overlays/actors/ovl_En_Cow/z_en_cow.h b/src/overlays/actors/ovl_En_Cow/z_en_cow.h index 57be216b4f..7b44f77718 100644 --- a/src/overlays/actors/ovl_En_Cow/z_en_cow.h +++ b/src/overlays/actors/ovl_En_Cow/z_en_cow.h @@ -4,8 +4,7 @@ #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ Actor actor; /* 0x014C */ char unk_14C[0x134]; } EnCow; // size = 0x0280 diff --git a/src/overlays/actors/ovl_En_Crow/z_en_crow.c b/src/overlays/actors/ovl_En_Crow/z_en_crow.c index d00d419264..c32ad4be85 100644 --- a/src/overlays/actors/ovl_En_Crow/z_en_crow.c +++ b/src/overlays/actors/ovl_En_Crow/z_en_crow.c @@ -1,6 +1,6 @@ #include "z_en_crow.h" -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x00005005 void EnCrow_Init(EnCrow* this, GlobalContext* globalCtx); @@ -9,8 +9,7 @@ void EnCrow_Update(EnCrow* this, GlobalContext* globalCtx); void EnCrow_Draw(EnCrow* this, GlobalContext* globalCtx); /* -const ActorInit En_Crow_InitVars = -{ +const ActorInit En_Crow_InitVars = { ACTOR_EN_CROW, ACTORTYPE_ENEMY, ROOM, diff --git a/src/overlays/actors/ovl_En_Crow/z_en_crow.h b/src/overlays/actors/ovl_En_Crow/z_en_crow.h index 4a7d8652c3..fab96e46fd 100644 --- a/src/overlays/actors/ovl_En_Crow/z_en_crow.h +++ b/src/overlays/actors/ovl_En_Crow/z_en_crow.h @@ -4,8 +4,7 @@ #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ Actor actor; /* 0x014C */ char unk_14C[0x14C]; } EnCrow; // size = 0x0298 diff --git a/src/overlays/actors/ovl_En_Cs/z_en_cs.c b/src/overlays/actors/ovl_En_Cs/z_en_cs.c index 003bc39406..6aeabe7b0b 100644 --- a/src/overlays/actors/ovl_En_Cs/z_en_cs.c +++ b/src/overlays/actors/ovl_En_Cs/z_en_cs.c @@ -1,6 +1,6 @@ #include "z_en_cs.h" -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x00000009 void EnCs_Init(EnCs* this, GlobalContext* globalCtx); @@ -9,8 +9,7 @@ void EnCs_Update(EnCs* this, GlobalContext* globalCtx); void EnCs_Draw(EnCs* this, GlobalContext* globalCtx); /* -const ActorInit En_Cs_InitVars = -{ +const ActorInit En_Cs_InitVars = { ACTOR_EN_CS, ACTORTYPE_NPC, ROOM, diff --git a/src/overlays/actors/ovl_En_Cs/z_en_cs.h b/src/overlays/actors/ovl_En_Cs/z_en_cs.h index e792341d23..0e4ebf4354 100644 --- a/src/overlays/actors/ovl_En_Cs/z_en_cs.h +++ b/src/overlays/actors/ovl_En_Cs/z_en_cs.h @@ -4,8 +4,7 @@ #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ Actor actor; /* 0x014C */ char unk_14C[0x1F8]; } EnCs; // size = 0x0344 diff --git a/src/overlays/actors/ovl_En_Daiku/z_en_daiku.c b/src/overlays/actors/ovl_En_Daiku/z_en_daiku.c index eb3a8a2c57..2f6bee036b 100644 --- a/src/overlays/actors/ovl_En_Daiku/z_en_daiku.c +++ b/src/overlays/actors/ovl_En_Daiku/z_en_daiku.c @@ -1,6 +1,6 @@ #include "z_en_daiku.h" -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x00000019 void EnDaiku_Init(EnDaiku* this, GlobalContext* globalCtx); @@ -9,8 +9,7 @@ void EnDaiku_Update(EnDaiku* this, GlobalContext* globalCtx); void EnDaiku_Draw(EnDaiku* this, GlobalContext* globalCtx); /* -const ActorInit En_Daiku_InitVars = -{ +const ActorInit En_Daiku_InitVars = { ACTOR_EN_DAIKU, ACTORTYPE_NPC, ROOM, diff --git a/src/overlays/actors/ovl_En_Daiku/z_en_daiku.h b/src/overlays/actors/ovl_En_Daiku/z_en_daiku.h index e30b4cbb60..6aeb560733 100644 --- a/src/overlays/actors/ovl_En_Daiku/z_en_daiku.h +++ b/src/overlays/actors/ovl_En_Daiku/z_en_daiku.h @@ -4,8 +4,7 @@ #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ Actor actor; /* 0x014C */ char unk_14C[0x200]; } EnDaiku; // size = 0x034C diff --git a/src/overlays/actors/ovl_En_Daiku_Kakariko/z_en_daiku_kakariko.c b/src/overlays/actors/ovl_En_Daiku_Kakariko/z_en_daiku_kakariko.c index 7f6effe716..63c836c316 100644 --- a/src/overlays/actors/ovl_En_Daiku_Kakariko/z_en_daiku_kakariko.c +++ b/src/overlays/actors/ovl_En_Daiku_Kakariko/z_en_daiku_kakariko.c @@ -1,6 +1,6 @@ #include "z_en_daiku_kakariko.h" -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x00000019 void EnDaikuKakariko_Init(EnDaikuKakariko* this, GlobalContext* globalCtx); @@ -9,8 +9,7 @@ void EnDaikuKakariko_Update(EnDaikuKakariko* this, GlobalContext* globalCtx); void EnDaikuKakariko_Draw(EnDaikuKakariko* this, GlobalContext* globalCtx); /* -const ActorInit En_Daiku_Kakariko_InitVars = -{ +const ActorInit En_Daiku_Kakariko_InitVars = { ACTOR_EN_DAIKU_KAKARIKO, ACTORTYPE_NPC, ROOM, diff --git a/src/overlays/actors/ovl_En_Daiku_Kakariko/z_en_daiku_kakariko.h b/src/overlays/actors/ovl_En_Daiku_Kakariko/z_en_daiku_kakariko.h index 6592043b68..f706015b57 100644 --- a/src/overlays/actors/ovl_En_Daiku_Kakariko/z_en_daiku_kakariko.h +++ b/src/overlays/actors/ovl_En_Daiku_Kakariko/z_en_daiku_kakariko.h @@ -4,8 +4,7 @@ #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ Actor actor; /* 0x014C */ char unk_14C[0x1BC]; } EnDaikuKakariko; // size = 0x0308 diff --git a/src/overlays/actors/ovl_En_Dekubaba/z_en_dekubaba.c b/src/overlays/actors/ovl_En_Dekubaba/z_en_dekubaba.c index 43dd06da1f..cf130f8ac3 100644 --- a/src/overlays/actors/ovl_En_Dekubaba/z_en_dekubaba.c +++ b/src/overlays/actors/ovl_En_Dekubaba/z_en_dekubaba.c @@ -1,6 +1,6 @@ #include "z_en_dekubaba.h" -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x00000005 void EnDekubaba_Init(EnDekubaba* this, GlobalContext* globalCtx); @@ -9,8 +9,7 @@ void EnDekubaba_Update(EnDekubaba* this, GlobalContext* globalCtx); void EnDekubaba_Draw(EnDekubaba* this, GlobalContext* globalCtx); /* -const ActorInit En_Dekubaba_InitVars = -{ +const ActorInit En_Dekubaba_InitVars = { ACTOR_EN_DEKUBABA, ACTORTYPE_ENEMY, ROOM, diff --git a/src/overlays/actors/ovl_En_Dekubaba/z_en_dekubaba.h b/src/overlays/actors/ovl_En_Dekubaba/z_en_dekubaba.h index 96eec70eff..21cad286ab 100644 --- a/src/overlays/actors/ovl_En_Dekubaba/z_en_dekubaba.h +++ b/src/overlays/actors/ovl_En_Dekubaba/z_en_dekubaba.h @@ -4,8 +4,7 @@ #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ Actor actor; /* 0x014C */ char unk_14C[0x2CC]; } EnDekubaba; // size = 0x0418 diff --git a/src/overlays/actors/ovl_En_Dekunuts/z_en_dekunuts.c b/src/overlays/actors/ovl_En_Dekunuts/z_en_dekunuts.c index 034d881812..58e2584327 100644 --- a/src/overlays/actors/ovl_En_Dekunuts/z_en_dekunuts.c +++ b/src/overlays/actors/ovl_En_Dekunuts/z_en_dekunuts.c @@ -1,6 +1,6 @@ #include "z_en_dekunuts.h" -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x00000005 void EnDekunuts_Init(EnDekunuts* this, GlobalContext* globalCtx); @@ -9,8 +9,7 @@ void EnDekunuts_Update(EnDekunuts* this, GlobalContext* globalCtx); void EnDekunuts_Draw(EnDekunuts* this, GlobalContext* globalCtx); /* -const ActorInit En_Dekunuts_InitVars = -{ +const ActorInit En_Dekunuts_InitVars = { ACTOR_EN_DEKUNUTS, ACTORTYPE_ENEMY, ROOM, diff --git a/src/overlays/actors/ovl_En_Dekunuts/z_en_dekunuts.h b/src/overlays/actors/ovl_En_Dekunuts/z_en_dekunuts.h index 838af2bd3b..60db09f886 100644 --- a/src/overlays/actors/ovl_En_Dekunuts/z_en_dekunuts.h +++ b/src/overlays/actors/ovl_En_Dekunuts/z_en_dekunuts.h @@ -4,8 +4,7 @@ #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ Actor actor; /* 0x014C */ char unk_14C[0x1C8]; } EnDekunuts; // size = 0x0314 diff --git a/src/overlays/actors/ovl_En_Dh/z_en_dh.c b/src/overlays/actors/ovl_En_Dh/z_en_dh.c index 94ed51fec5..7a78e56c28 100644 --- a/src/overlays/actors/ovl_En_Dh/z_en_dh.c +++ b/src/overlays/actors/ovl_En_Dh/z_en_dh.c @@ -1,6 +1,6 @@ #include "z_en_dh.h" -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x00000415 void EnDh_Init(EnDh* this, GlobalContext* globalCtx); @@ -9,8 +9,7 @@ void EnDh_Update(EnDh* this, GlobalContext* globalCtx); void EnDh_Draw(EnDh* this, GlobalContext* globalCtx); /* -const ActorInit En_Dh_InitVars = -{ +const ActorInit En_Dh_InitVars = { ACTOR_EN_DH, ACTORTYPE_ENEMY, ROOM, diff --git a/src/overlays/actors/ovl_En_Dh/z_en_dh.h b/src/overlays/actors/ovl_En_Dh/z_en_dh.h index 1d11cf00ef..de718b72ac 100644 --- a/src/overlays/actors/ovl_En_Dh/z_en_dh.h +++ b/src/overlays/actors/ovl_En_Dh/z_en_dh.h @@ -4,8 +4,7 @@ #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ Actor actor; /* 0x014C */ char unk_14C[0x1D8]; } EnDh; // size = 0x0324 diff --git a/src/overlays/actors/ovl_En_Dha/z_en_dha.c b/src/overlays/actors/ovl_En_Dha/z_en_dha.c index 24a9e9d8e3..4a8e640919 100644 --- a/src/overlays/actors/ovl_En_Dha/z_en_dha.c +++ b/src/overlays/actors/ovl_En_Dha/z_en_dha.c @@ -1,6 +1,6 @@ #include "z_en_dha.h" -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x00000015 void EnDha_Init(EnDha* this, GlobalContext* globalCtx); @@ -9,8 +9,7 @@ void EnDha_Update(EnDha* this, GlobalContext* globalCtx); void EnDha_Draw(EnDha* this, GlobalContext* globalCtx); /* -const ActorInit En_Dha_InitVars = -{ +const ActorInit En_Dha_InitVars = { ACTOR_EN_DHA, ACTORTYPE_ENEMY, ROOM, diff --git a/src/overlays/actors/ovl_En_Dha/z_en_dha.h b/src/overlays/actors/ovl_En_Dha/z_en_dha.h index c3debba7e3..4bf3641969 100644 --- a/src/overlays/actors/ovl_En_Dha/z_en_dha.h +++ b/src/overlays/actors/ovl_En_Dha/z_en_dha.h @@ -4,8 +4,7 @@ #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ Actor actor; /* 0x014C */ char unk_14C[0x214]; } EnDha; // size = 0x0360 diff --git a/src/overlays/actors/ovl_En_Diving_Game/z_en_diving_game.c b/src/overlays/actors/ovl_En_Diving_Game/z_en_diving_game.c index 1162d8f9fe..5e3dab74c0 100644 --- a/src/overlays/actors/ovl_En_Diving_Game/z_en_diving_game.c +++ b/src/overlays/actors/ovl_En_Diving_Game/z_en_diving_game.c @@ -1,6 +1,6 @@ #include "z_en_diving_game.h" -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x00000019 void EnDivingGame_Init(EnDivingGame* this, GlobalContext* globalCtx); @@ -9,8 +9,7 @@ void EnDivingGame_Update(EnDivingGame* this, GlobalContext* globalCtx); void EnDivingGame_Draw(EnDivingGame* this, GlobalContext* globalCtx); /* -const ActorInit En_Diving_Game_InitVars = -{ +const ActorInit En_Diving_Game_InitVars = { ACTOR_EN_DIVING_GAME, ACTORTYPE_NPC, ROOM, diff --git a/src/overlays/actors/ovl_En_Diving_Game/z_en_diving_game.h b/src/overlays/actors/ovl_En_Diving_Game/z_en_diving_game.h index 94bafbcdbf..04b34a3d99 100644 --- a/src/overlays/actors/ovl_En_Diving_Game/z_en_diving_game.h +++ b/src/overlays/actors/ovl_En_Diving_Game/z_en_diving_game.h @@ -4,8 +4,7 @@ #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ Actor actor; /* 0x014C */ char unk_14C[0x24C]; } EnDivingGame; // size = 0x0398 diff --git a/src/overlays/actors/ovl_En_Dns/z_en_dns.c b/src/overlays/actors/ovl_En_Dns/z_en_dns.c index 7edfcc1c93..a9b31e2c84 100644 --- a/src/overlays/actors/ovl_En_Dns/z_en_dns.c +++ b/src/overlays/actors/ovl_En_Dns/z_en_dns.c @@ -1,6 +1,6 @@ #include "z_en_dns.h" -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x00000009 void EnDns_Init(EnDns* this, GlobalContext* globalCtx); @@ -9,8 +9,7 @@ void EnDns_Update(EnDns* this, GlobalContext* globalCtx); void EnDns_Draw(EnDns* this, GlobalContext* globalCtx); /* -const ActorInit En_Dns_InitVars = -{ +const ActorInit En_Dns_InitVars = { ACTOR_EN_DNS, ACTORTYPE_BG, ROOM, diff --git a/src/overlays/actors/ovl_En_Dns/z_en_dns.h b/src/overlays/actors/ovl_En_Dns/z_en_dns.h index 868fa7a51a..32720a0a3c 100644 --- a/src/overlays/actors/ovl_En_Dns/z_en_dns.h +++ b/src/overlays/actors/ovl_En_Dns/z_en_dns.h @@ -4,8 +4,7 @@ #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ Actor actor; /* 0x014C */ char unk_14C[0x17C]; } EnDns; // size = 0x02C8 diff --git a/src/overlays/actors/ovl_En_Dnt_Demo/z_en_dnt_demo.c b/src/overlays/actors/ovl_En_Dnt_Demo/z_en_dnt_demo.c index bcb0ea1df2..1863ff2b27 100644 --- a/src/overlays/actors/ovl_En_Dnt_Demo/z_en_dnt_demo.c +++ b/src/overlays/actors/ovl_En_Dnt_Demo/z_en_dnt_demo.c @@ -1,6 +1,6 @@ #include "z_en_dnt_demo.h" -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x00000000 void EnDntDemo_Init(EnDntDemo* this, GlobalContext* globalCtx); @@ -8,8 +8,7 @@ void EnDntDemo_Destroy(EnDntDemo* this, GlobalContext* globalCtx); void EnDntDemo_Update(EnDntDemo* this, GlobalContext* globalCtx); /* -const ActorInit En_Dnt_Demo_InitVars = -{ +const ActorInit En_Dnt_Demo_InitVars = { ACTOR_EN_DNT_DEMO, ACTORTYPE_PROP, ROOM, diff --git a/src/overlays/actors/ovl_En_Dnt_Demo/z_en_dnt_demo.h b/src/overlays/actors/ovl_En_Dnt_Demo/z_en_dnt_demo.h index 3aecc6c9a4..70933f292f 100644 --- a/src/overlays/actors/ovl_En_Dnt_Demo/z_en_dnt_demo.h +++ b/src/overlays/actors/ovl_En_Dnt_Demo/z_en_dnt_demo.h @@ -4,8 +4,7 @@ #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ Actor actor; /* 0x014C */ char unk_14C[0xB4]; } EnDntDemo; // size = 0x0200 diff --git a/src/overlays/actors/ovl_En_Dnt_Jiji/z_en_dnt_jiji.c b/src/overlays/actors/ovl_En_Dnt_Jiji/z_en_dnt_jiji.c index 52151a95c7..1dd9a0a295 100644 --- a/src/overlays/actors/ovl_En_Dnt_Jiji/z_en_dnt_jiji.c +++ b/src/overlays/actors/ovl_En_Dnt_Jiji/z_en_dnt_jiji.c @@ -1,6 +1,6 @@ #include "z_en_dnt_jiji.h" -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x00000019 void EnDntJiji_Init(EnDntJiji* this, GlobalContext* globalCtx); @@ -9,8 +9,7 @@ void EnDntJiji_Update(EnDntJiji* this, GlobalContext* globalCtx); void EnDntJiji_Draw(EnDntJiji* this, GlobalContext* globalCtx); /* -const ActorInit En_Dnt_Jiji_InitVars = -{ +const ActorInit En_Dnt_Jiji_InitVars = { ACTOR_EN_DNT_JIJI, ACTORTYPE_NPC, ROOM, diff --git a/src/overlays/actors/ovl_En_Dnt_Jiji/z_en_dnt_jiji.h b/src/overlays/actors/ovl_En_Dnt_Jiji/z_en_dnt_jiji.h index ae85ff3f86..9d9af938d4 100644 --- a/src/overlays/actors/ovl_En_Dnt_Jiji/z_en_dnt_jiji.h +++ b/src/overlays/actors/ovl_En_Dnt_Jiji/z_en_dnt_jiji.h @@ -4,8 +4,7 @@ #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ Actor actor; /* 0x014C */ char unk_14C[0x15C]; } EnDntJiji; // size = 0x02A8 diff --git a/src/overlays/actors/ovl_En_Dnt_Nomal/z_en_dnt_nomal.c b/src/overlays/actors/ovl_En_Dnt_Nomal/z_en_dnt_nomal.c index c0e938e600..9dc2ff08c3 100644 --- a/src/overlays/actors/ovl_En_Dnt_Nomal/z_en_dnt_nomal.c +++ b/src/overlays/actors/ovl_En_Dnt_Nomal/z_en_dnt_nomal.c @@ -1,6 +1,6 @@ #include "z_en_dnt_nomal.h" -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x00000030 void EnDntNomal_Init(EnDntNomal* this, GlobalContext* globalCtx); @@ -8,8 +8,7 @@ void EnDntNomal_Destroy(EnDntNomal* this, GlobalContext* globalCtx); void EnDntNomal_Update(EnDntNomal* this, GlobalContext* globalCtx); /* -const ActorInit En_Dnt_Nomal_InitVars = -{ +const ActorInit En_Dnt_Nomal_InitVars = { ACTOR_EN_DNT_NOMAL, ACTORTYPE_PROP, ROOM, diff --git a/src/overlays/actors/ovl_En_Dnt_Nomal/z_en_dnt_nomal.h b/src/overlays/actors/ovl_En_Dnt_Nomal/z_en_dnt_nomal.h index 76edc1a55e..517e023113 100644 --- a/src/overlays/actors/ovl_En_Dnt_Nomal/z_en_dnt_nomal.h +++ b/src/overlays/actors/ovl_En_Dnt_Nomal/z_en_dnt_nomal.h @@ -4,8 +4,7 @@ #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ Actor actor; /* 0x014C */ char unk_14C[0x214]; } EnDntNomal; // size = 0x0360 diff --git a/src/overlays/actors/ovl_En_Dodojr/z_en_dodojr.c b/src/overlays/actors/ovl_En_Dodojr/z_en_dodojr.c index f48eed4dcb..7622173678 100644 --- a/src/overlays/actors/ovl_En_Dodojr/z_en_dodojr.c +++ b/src/overlays/actors/ovl_En_Dodojr/z_en_dodojr.c @@ -1,6 +1,6 @@ #include "z_en_dodojr.h" -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x00000005 void EnDodojr_Init(EnDodojr* this, GlobalContext* globalCtx); @@ -9,8 +9,7 @@ void EnDodojr_Update(EnDodojr* this, GlobalContext* globalCtx); void EnDodojr_Draw(EnDodojr* this, GlobalContext* globalCtx); /* -const ActorInit En_Dodojr_InitVars = -{ +const ActorInit En_Dodojr_InitVars = { ACTOR_EN_DODOJR, ACTORTYPE_ENEMY, ROOM, diff --git a/src/overlays/actors/ovl_En_Dodojr/z_en_dodojr.h b/src/overlays/actors/ovl_En_Dodojr/z_en_dodojr.h index a12d8284f3..5ed8290a3e 100644 --- a/src/overlays/actors/ovl_En_Dodojr/z_en_dodojr.h +++ b/src/overlays/actors/ovl_En_Dodojr/z_en_dodojr.h @@ -4,8 +4,7 @@ #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ Actor actor; /* 0x014C */ char unk_14C[0x174]; } EnDodojr; // size = 0x02C0 diff --git a/src/overlays/actors/ovl_En_Dodongo/z_en_dodongo.c b/src/overlays/actors/ovl_En_Dodongo/z_en_dodongo.c index 3d90f3eda5..745c490969 100644 --- a/src/overlays/actors/ovl_En_Dodongo/z_en_dodongo.c +++ b/src/overlays/actors/ovl_En_Dodongo/z_en_dodongo.c @@ -1,6 +1,6 @@ #include "z_en_dodongo.h" -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x00000015 void EnDodongo_Init(EnDodongo* this, GlobalContext* globalCtx); @@ -9,8 +9,7 @@ void EnDodongo_Update(EnDodongo* this, GlobalContext* globalCtx); void EnDodongo_Draw(EnDodongo* this, GlobalContext* globalCtx); /* -const ActorInit En_Dodongo_InitVars = -{ +const ActorInit En_Dodongo_InitVars = { ACTOR_EN_DODONGO, ACTORTYPE_ENEMY, ROOM, diff --git a/src/overlays/actors/ovl_En_Dodongo/z_en_dodongo.h b/src/overlays/actors/ovl_En_Dodongo/z_en_dodongo.h index f181465adc..874eabcdc1 100644 --- a/src/overlays/actors/ovl_En_Dodongo/z_en_dodongo.h +++ b/src/overlays/actors/ovl_En_Dodongo/z_en_dodongo.h @@ -4,8 +4,7 @@ #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ Actor actor; /* 0x014C */ char unk_14C[0x5DC]; } EnDodongo; // size = 0x0728 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 38eaca0058..cb1a536040 100644 --- a/src/overlays/actors/ovl_En_Dog/z_en_dog.c +++ b/src/overlays/actors/ovl_En_Dog/z_en_dog.c @@ -1,16 +1,27 @@ +/* + * File: z_en_dog.c + * Overlay: ovl_En_Dog + * Description: Dog actor that Link can interact with + */ + #include "z_en_dog.h" -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x00000000 -void EnDog_Init(EnDog* this, GlobalContext* globalCtx); -void EnDog_Destroy(EnDog* this, GlobalContext* globalCtx); -void EnDog_Update(EnDog* this, GlobalContext* globalCtx); -void EnDog_Draw(EnDog* this, GlobalContext* globalCtx); +static void EnDog_Init(EnDog* this, GlobalContext* globalCtx); +static void EnDog_Destroy(EnDog* this, GlobalContext* globalCtx); +static void EnDog_Update(EnDog* this, GlobalContext* globalCtx); +static void EnDog_Draw(EnDog* this, GlobalContext* globalCtx); -/* -const ActorInit En_Dog_InitVars = -{ +static void EnDog_FollowPath(EnDog* this, GlobalContext* globalCtx); +static void EnDog_ChooseMovement(EnDog* this, GlobalContext* globalCtx); +static void EnDog_FollowLink(EnDog* this, GlobalContext* globalCtx); +static void EnDog_RunAway(EnDog* this, GlobalContext* globalCtx); +static void EnDog_FaceLink(EnDog* this, GlobalContext* globalCtx); +static void EnDog_Wait(EnDog* this, GlobalContext* globalCtx); + +const ActorInit En_Dog_InitVars = { ACTOR_EN_DOG, ACTORTYPE_NPC, ROOM, @@ -22,41 +33,449 @@ const ActorInit En_Dog_InitVars = (ActorFunc)EnDog_Update, (ActorFunc)EnDog_Draw, }; -*/ -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Dog/func_809FAFD0.s") -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Dog/func_809FB038.s") +static ColliderCylinderInit cylinderInit = { + 0x06, 0x00, 0x09, 0x39, 0x10, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00000000, + 0x00, 0x00, 0x00, 0x00, 0xFFCFFFFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Dog/func_809FB0A0.s") + 0x0010, 0x0014, 0x0000, 0x0000, 0x0000, 0x0000, +}; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Dog/func_809FB108.s") +static Sub98Init5 sub98Data = { + 0x00, // health + 0x0000, // unk_10 + 0x0000, // unk_12 + 0x0000, // unk_14 + 0x32, // mass +}; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Dog/func_809FB29C.s") +static struct_80034EC0_Entry animations[] = { + { 0x06001368, 1.0f, 0.0f, -1.0f, 0x00, 0.0f }, { 0x06001368, 1.0f, 0.0f, -1.0f, 0x00, -6.0f }, + { 0x06000D78, 1.0f, 0.0f, -1.0f, 0x00, -6.0f }, { 0x06000278, 1.0f, 0.0f, -1.0f, 0x00, -6.0f }, + { 0x06001150, 1.0f, 0.0f, 4.0f, 0x02, -6.0f }, { 0x06001150, 1.0f, 5.0f, 25.0f, 0x04, -6.0f }, + { 0x06000928, 1.0f, 0.0f, 6.0f, 0x02, -6.0f }, { 0x06000C28, 1.0f, 0.0f, -1.0f, 0x00, -6.0f }, +}; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Dog/func_809FB320.s") +// Bandaid fix for a lw vs lh issue in EnDog_FollowPath. Roman will look at it later. +typedef union { + /* 0x00 */ s32 entry; + struct { + s16 unk_0; + s16 unk_2; + }; +} s16ArrEntry; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Dog/func_809FB3AC.s") +typedef enum { + /* 0x00 */ DOG_WALK, + /* 0x01 */ DOG_RUN, + /* 0x02 */ DOG_BARK, + /* 0x03 */ DOG_SIT, + /* 0x04 */ DOG_SIT_2, + /* 0x05 */ DOG_BOW, + /* 0x06 */ DOG_BOW_2, +} DogBehavior; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Dog/EnDog_Init.s") +extern SkeletonHeader D_06007290; +extern AnimationHeader D_06001368; +extern AnimationHeader D_06000D78; +extern AnimationHeader D_06000278; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Dog/EnDog_Destroy.s") +static void EnDog_PlayWalkSFX(EnDog* this) { + AnimationHeader* walk = &D_06001368; + if (this->skelAnime.animCurrentSeg == walk) { + if ((this->skelAnime.animCurrentFrame == 1.0f) || (this->skelAnime.animCurrentFrame == 7.0f)) { + Audio_PlayActorSound2(&this->actor, NA_SE_EV_CHIBI_WALK); + } + } +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Dog/func_809FB6C4.s") +static void EnDog_PlayRunSFX(EnDog* this) { + AnimationHeader* run = &D_06000D78; + if (this->skelAnime.animCurrentSeg == run) { + if ((this->skelAnime.animCurrentFrame == 2.0f) || (this->skelAnime.animCurrentFrame == 4.0f)) { + Audio_PlayActorSound2(&this->actor, NA_SE_EV_CHIBI_WALK); + } + } +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Dog/func_809FB858.s") +static void EnDog_PlayBarkSFX(EnDog* this) { + AnimationHeader* bark = &D_06000278; + if (this->skelAnime.animCurrentSeg == bark) { + if ((this->skelAnime.animCurrentFrame == 13.0f) || (this->skelAnime.animCurrentFrame == 19.0f)) { + Audio_PlayActorSound2(&this->actor, NA_SE_EV_SMALL_DOG_BARK); + } + } +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Dog/func_809FB940.s") +static s32 EnDog_PlayAnimAndSFX(EnDog* this) { + s32 animation; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Dog/func_809FBABC.s") + if (this->behavior != this->nextBehavior) { + if (this->nextBehavior == DOG_SIT_2) { + this->nextBehavior = DOG_SIT; + } + if (this->nextBehavior == DOG_BOW_2) { + this->nextBehavior = DOG_BOW; + } -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Dog/func_809FBB64.s") + this->behavior = this->nextBehavior; + switch (this->behavior) { + case DOG_WALK: + animation = 1; + break; + case DOG_RUN: + animation = 2; + break; + case DOG_BARK: + animation = 3; + break; + case DOG_SIT: + animation = 4; + break; + case DOG_BOW: + animation = 6; + break; + } + func_80034EC0(&this->skelAnime, &animations, animation); + } -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Dog/func_809FBC6C.s") + switch (this->behavior) { + case DOG_SIT: + if (func_800A56C8(&this->skelAnime, this->skelAnime.animFrameCount) != 0) { + func_80034EC0(&this->skelAnime, &animations, 5); + this->behavior = this->nextBehavior = DOG_SIT_2; + } + break; + case DOG_BOW: + if (func_800A56C8(&this->skelAnime, this->skelAnime.animFrameCount) != 0) { + func_80034EC0(&this->skelAnime, &animations, 7); + this->behavior = this->nextBehavior = DOG_BOW_2; + } + break; + case DOG_WALK: + EnDog_PlayWalkSFX(this); + break; + case DOG_RUN: + EnDog_PlayRunSFX(this); + break; + case DOG_BARK: + EnDog_PlayBarkSFX(this); + if (this) {} // needed for regalloc + break; + } + return 0; +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Dog/EnDog_Update.s") +static s8 EnDog_CanFollow(EnDog* this, GlobalContext* globalCtx) { + if ((this->collider.base.collideFlags & 2)) { + this->collider.base.collideFlags &= ~2; + return 2; + } -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Dog/func_809FBD8C.s") + if (globalCtx->sceneNum == SCENE_MARKET_DAY) { + return 0; + } -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Dog/func_809FBDA4.s") + if ((this->collider.base.maskB & 1)) { + this->collider.base.maskB &= ~1; + if (gSaveContext.dogParams != 0) { + return 0; + } + gSaveContext.dogParams = (this->actor.params & 0x7FFF); + return 1; + } -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Dog/EnDog_Draw.s") + return 0; +} + +static EnDog_UpdateWaypoint(EnDog* this, GlobalContext* globalCtx) { + s32 change; + + if (this->path == NULL) { + return 0; + } + + if (this->reverse) { + change = -1; + } else { + change = 1; + } + + this->waypoint += change; + + if (this->reverse) { + if (this->waypoint < 0) { + this->waypoint = this->path->count - 1; + } + } else { + if ((this->path->count - 1) < this->waypoint) { + this->waypoint = 0; + } + } + + return 1; +} + +static s32 EnDog_Orient(EnDog* this, GlobalContext* globalCtx) { + s16 targetYaw; + f32 waypointDistSq; + + waypointDistSq = Path_OrientAndGetDistSq(&this->actor, this->path, this->waypoint, &targetYaw); + Math_SmoothScaleMaxMinS(&this->actor.posRot.rot.y, targetYaw, 10, 1000, 1); + + if ((waypointDistSq > 0.0f) && (waypointDistSq < 1000.0f)) { + return EnDog_UpdateWaypoint(this, globalCtx); + } else { + return 0; + } +} + +static void EnDog_Init(EnDog* this, GlobalContext* globalCtx) { + SkelAnime* skelAnime; + s16 followingDog; + ColliderCylinderMain* collider; + + collider = &this->collider; + ActorShape_Init(&this->actor.shape, 0.0f, ActorShadow_DrawFunc_Circle, 24.0f); + skelAnime = &this->skelAnime; + SkelAnime_InitSV(globalCtx, skelAnime, &D_06007290, NULL, &this->unk_1F4, &this->unk_242, 13); + func_80034EC0(skelAnime, animations, 0); + + if ((this->actor.params & 0x8000) == 0) { + this->actor.params = (this->actor.params & 0xF0FF) | ((((this->actor.params & 0x0F00) >> 8) + 1) << 8); + } + + followingDog = ((gSaveContext.dogParams & 0x0F00) >> 8); + if (followingDog == ((this->actor.params & 0x0F00) >> 8) && ((this->actor.params & 0x8000) == 0)) { + Actor_Kill(&this->actor); + return; + } + + ActorCollider_AllocCylinder(globalCtx, collider); + ActorCollider_InitCylinder(globalCtx, collider, &this->actor, &cylinderInit); + func_80061EFC(&this->actor.sub_98, 0, &sub98Data); + Actor_SetScale(&this->actor, 0.0075f); + this->waypoint = 0; + this->actor.gravity = -1.0f; + this->path = Path_GetByIndex(globalCtx, (this->actor.params & 0x00F0) >> 4, 0xF); + + switch (globalCtx->sceneNum) { + case SCENE_MARKET_NIGHT: + if ((!gSaveContext.dogIsLost) && (((this->actor.params & 0x0F00) >> 8) == 1)) { + Actor_Kill(&this->actor); + } + break; + case SCENE_IMPA: // Richard's Home + if ((u32)(this->actor.params & 0x8000) == 0) { + if (!gSaveContext.dogIsLost) { + this->nextBehavior = DOG_SIT; + this->actionFunc = EnDog_Wait; + this->actor.speedXZ = 0.0f; + return; + } else { + Actor_Kill(&this->actor); + return; + } + } + break; + } + + if ((u32)(this->actor.params & 0x8000) != 0) { + this->nextBehavior = DOG_WALK; + this->actionFunc = EnDog_FollowLink; + } else { + this->nextBehavior = DOG_SIT; + this->actionFunc = EnDog_ChooseMovement; + } +} + +static void EnDog_Destroy(EnDog* this, GlobalContext* globalCtx) { + ColliderCylinderMain* collider = &this->collider; + ActorCollider_FreeCylinder(globalCtx, collider); +} + +static void EnDog_FollowPath(EnDog* this, GlobalContext* globalCtx) { + s16ArrEntry behaviors[] = { DOG_SIT, DOG_BOW, DOG_BARK }; + s16ArrEntry unused[] = { 40, 80, 20 }; + f32 speed; + s32 frame; + + if (EnDog_CanFollow(this, globalCtx) == 1) { + this->actionFunc = EnDog_FollowLink; + } + + if (DECR(this->behaviorTimer) != 0) { + if (this->nextBehavior == DOG_WALK) { + speed = 1.0f; + } else { + speed = 4.0f; + } + Math_SmoothScaleMaxMinF(&this->actor.speedXZ, speed, 0.4f, 1.0f, 0.0f); + EnDog_Orient(this, globalCtx); + this->actor.shape.rot = this->actor.posRot.rot; + + // Used to change between two text boxes for Richard's owner in the Market Day scene + // depending on where he is on his path. En_Hy checks these event flags. + if (this->waypoint < 9) { + // Richard is close to her, text says something about his coat + gSaveContext.event_inf[3] |= 1; + } else { + // Richard is far, text says something about running fast + gSaveContext.event_inf[3] &= ~1; + } + } else { + frame = globalCtx->state.frames % 3; + this->nextBehavior = behaviors[frame].entry; + // no clue why they're using the action id to calculate timer. possibly meant to use the unused array? + this->behaviorTimer = Math_Rand_S16Offset(60, behaviors[frame].unk_2); + this->actionFunc = EnDog_ChooseMovement; + } +} + +static void EnDog_ChooseMovement(EnDog* this, GlobalContext* globalCtx) { + if (EnDog_CanFollow(this, globalCtx) == 1) { + this->actionFunc = EnDog_FollowLink; + } + + if (DECR(this->behaviorTimer) == 0) { + this->behaviorTimer = Math_Rand_S16Offset(200, 100); + if (globalCtx->state.frames % 2) { + this->nextBehavior = DOG_WALK; + } else { + this->nextBehavior = DOG_RUN; + } + + if (this->nextBehavior == DOG_RUN) { + this->behaviorTimer /= 2; + } + this->actionFunc = EnDog_FollowPath; + } + Math_SmoothScaleMaxMinF(&this->actor.speedXZ, 0.0f, 0.4f, 1.0f, 0.0f); +} + +static void EnDog_FollowLink(EnDog* this, GlobalContext* globalCtx) { + f32 speed; + + if (gSaveContext.dogParams == 0) { + this->nextBehavior = DOG_SIT; + this->actionFunc = EnDog_Wait; + this->actor.speedXZ = 0.0f; + return; + } + + if (this->actor.xzDistanceFromLink > 400.0f) { + if (this->nextBehavior != DOG_SIT && this->nextBehavior != DOG_SIT_2) { + this->nextBehavior = DOG_BOW; + } + gSaveContext.dogParams = 0; + speed = 0.0f; + } else if (this->actor.xzDistanceFromLink > 100.0f) { + this->nextBehavior = DOG_RUN; + speed = 4.0f; + } else if (this->actor.xzDistanceFromLink < 40.0f) { + if (this->nextBehavior != DOG_BOW && this->nextBehavior != DOG_BOW_2) { + this->nextBehavior = DOG_BOW; + } + speed = 0.0f; + } else { + this->nextBehavior = DOG_WALK; + speed = 1.0f; + } + + Math_SmoothScaleMaxF(&this->actor.speedXZ, speed, 0.6f, 1.0f); + + if (!(this->actor.xzDistanceFromLink > 400.0f)) { + Math_SmoothScaleMaxMinS(&this->actor.posRot.rot.y, this->actor.rotTowardsLinkY, 10, 1000, 1); + this->actor.shape.rot = this->actor.posRot.rot; + } +} + +static void EnDog_RunAway(EnDog* this, GlobalContext* globalCtx) { + if (this->actor.xzDistanceFromLink < 200.0f) { + Math_SmoothScaleMaxF(&this->actor.speedXZ, 4.0f, 0.6f, 1.0f); + Math_SmoothScaleMaxMinS(&this->actor.posRot.rot.y, (this->actor.rotTowardsLinkY ^ 0x8000), 10, 1000, 1); + } else { + this->actionFunc = EnDog_FaceLink; + } + this->actor.shape.rot = this->actor.posRot.rot; +} + +static void EnDog_FaceLink(EnDog* this, GlobalContext* globalCtx) { + s16 rotTowardLink; + s16 prevRotY; + f32 absAngleDiff; + + // if the dog is more than 200 units away from Link, turn to face him then wait + if (200.0f <= this->actor.xzDistanceFromLink) { + this->nextBehavior = DOG_WALK; + + Math_SmoothScaleMaxF(&this->actor.speedXZ, 1.0f, 0.6f, 1.0f); + + rotTowardLink = this->actor.rotTowardsLinkY; + prevRotY = this->actor.posRot.rot.y; + Math_SmoothScaleMaxMinS(&this->actor.posRot.rot.y, rotTowardLink, 10, 1000, 1); + + absAngleDiff = this->actor.posRot.rot.y; + absAngleDiff -= prevRotY; + absAngleDiff = fabsf(absAngleDiff); + if (absAngleDiff < 200.0f) { + this->nextBehavior = DOG_SIT; + this->actionFunc = EnDog_Wait; + this->actor.speedXZ = 0.0f; + } + } else { + this->nextBehavior = DOG_RUN; + this->actionFunc = EnDog_RunAway; + } + this->actor.shape.rot = this->actor.posRot.rot; +} + +static void EnDog_Wait(EnDog* this, GlobalContext* globalCtx) { + this->unusedAngle = (this->actor.rotTowardsLinkY - this->actor.shape.rot.y); + + // If another dog is following Link and he gets within 200 units of waiting dog, run away + if ((gSaveContext.dogParams != 0) && (this->actor.xzDistanceFromLink < 200.0f)) { + this->nextBehavior = DOG_RUN; + this->actionFunc = EnDog_RunAway; + } +} + +static void EnDog_Update(EnDog* this, GlobalContext* globalCtx) { + s32 pad1; + s32 pad2; + + EnDog_PlayAnimAndSFX(this); + SkelAnime_FrameUpdateMatrix(&this->skelAnime); + func_8002E4B4(globalCtx, &this->actor, this->collider.dim.radius, this->collider.dim.height * 0.5f, 0.0f, 5); + Actor_MoveForward(&this->actor); + this->actionFunc(this, globalCtx); + ActorCollider_Cylinder_Update(&this->actor, &this->collider); + Actor_CollisionCheck_SetOT(globalCtx, &globalCtx->sub_11E60, &this->collider); +} + +static UNK_TYPE EnDog_Callback1(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot, + Actor* actor) { + return 0; +} + +static void EnDog_Callback2(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec3s* rot, Actor* actor) { +} + +static void EnDog_Draw(EnDog* this, GlobalContext* globalCtx) { + s32 pad; + Color_RGBA8 colors[] = { { 0xFF, 0xFF, 0xC8, 0x00 }, { 0x96, 0x64, 0x32, 0x00 } }; + GraphicsContext* gfxCtx; + Gfx* dispRefs[4]; + + gfxCtx = globalCtx->state.gfxCtx; + Graph_OpenDisps(dispRefs, globalCtx->state.gfxCtx, "../z_en_dog.c", 972); + func_80093D18(globalCtx->state.gfxCtx); + + gDPPipeSync(gfxCtx->polyOpa.p++); + gDPSetEnvColor(gfxCtx->polyOpa.p++, 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.actorDrawTbl, this->skelAnime.dListCount, + EnDog_Callback1, EnDog_Callback2, &this->actor); + Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_en_dog.c", 994); +} diff --git a/src/overlays/actors/ovl_En_Dog/z_en_dog.h b/src/overlays/actors/ovl_En_Dog/z_en_dog.h index 2d574f85dc..30dda5534b 100644 --- a/src/overlays/actors/ovl_En_Dog/z_en_dog.h +++ b/src/overlays/actors/ovl_En_Dog/z_en_dog.h @@ -4,10 +4,24 @@ #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ Actor actor; - /* 0x014C */ char unk_14C[0x144]; + /* 0x014C */ SkelAnime skelAnime; + /* 0x0190 */ ActorFunc actionFunc; + /* 0x0194 */ ColliderCylinderMain collider; + /* 0x01E0 */ Path* path; + /* 0x01E4 */ u8 reverse; + /* 0x01E6 */ s16 waypoint; + /* 0x01E8 */ s16 unusedAngle; + /* 0x01EA */ s16 pad1; + /* 0x01EC */ s16 behaviorTimer; + /* 0x01EE */ s16 pad2; + /* 0x01F0 */ s16 nextBehavior; + /* 0x01F2 */ s16 behavior; + /* 0x01F4 */ u8 unk_1F4; // I believe this and the rest below belong to something skelanime + /* 0x01F5 */ char unk_1F5[0x4D]; + /* 0x0242 */ u8 unk_242; + /* 0x0243 */ char unk_243[0x4D]; } EnDog; // size = 0x0290 extern const ActorInit En_Dog_InitVars; diff --git a/src/overlays/actors/ovl_En_Door/z_en_door.c b/src/overlays/actors/ovl_En_Door/z_en_door.c index 4773451998..e561236de9 100644 --- a/src/overlays/actors/ovl_En_Door/z_en_door.c +++ b/src/overlays/actors/ovl_En_Door/z_en_door.c @@ -1,6 +1,6 @@ #include "z_en_door.h" -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x00000010 void EnDoor_Init(EnDoor* this, GlobalContext* globalCtx); @@ -9,8 +9,7 @@ void EnDoor_Update(EnDoor* this, GlobalContext* globalCtx); void EnDoor_Draw(EnDoor* this, GlobalContext* globalCtx); /* -const ActorInit En_Door_InitVars = -{ +const ActorInit En_Door_InitVars = { ACTOR_EN_DOOR, ACTORTYPE_DOOR, ROOM, diff --git a/src/overlays/actors/ovl_En_Door/z_en_door.h b/src/overlays/actors/ovl_En_Door/z_en_door.h index b696902510..dd0fac0624 100644 --- a/src/overlays/actors/ovl_En_Door/z_en_door.h +++ b/src/overlays/actors/ovl_En_Door/z_en_door.h @@ -4,8 +4,7 @@ #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ Actor actor; /* 0x014C */ char unk_14C[0x8C]; } EnDoor; // size = 0x01D8 diff --git a/src/overlays/actors/ovl_En_Ds/z_en_ds.c b/src/overlays/actors/ovl_En_Ds/z_en_ds.c index 9c3506c55b..2c843f87eb 100644 --- a/src/overlays/actors/ovl_En_Ds/z_en_ds.c +++ b/src/overlays/actors/ovl_En_Ds/z_en_ds.c @@ -1,6 +1,12 @@ +/* + * File: z_en_ds.c + * Overlay: ovl_En_Ds + * Description: Potion Shop Granny + */ + #include "z_en_ds.h" -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x00000009 void EnDs_Init(EnDs* this, GlobalContext* globalCtx); @@ -8,9 +14,25 @@ void EnDs_Destroy(EnDs* this, GlobalContext* globalCtx); void EnDs_Update(EnDs* this, GlobalContext* globalCtx); void EnDs_Draw(EnDs* this, GlobalContext* globalCtx); -/* -const ActorInit En_Ds_InitVars = -{ +void EnDs_Talk(EnDs* this, GlobalContext* globalCtx); +void EnDs_TalkNoEmptyBottle(EnDs* this, GlobalContext* globalCtx); +void EnDs_TalkAfterGiveOddPotion(EnDs* this, GlobalContext* globalCtx); +void EnDs_DisplayOddPotionText(EnDs* this, GlobalContext* globalCtx); +void EnDs_GiveOddPotion(EnDs* this, GlobalContext* globalCtx); +void EnDs_TalkAfterBrewOddPotion(EnDs* this, GlobalContext* globalCtx); +void EnDs_BrewOddPotion3(EnDs* this, GlobalContext* globalCtx); +void EnDs_BrewOddPotion2(EnDs* this, GlobalContext* globalCtx); +void EnDs_BrewOddPotion1(EnDs* this, GlobalContext* globalCtx); +void EnDs_OfferOddPotion(EnDs* this, GlobalContext* globalCtx); +int EnDs_CheckRupeesAndBottle(); +void EnDs_GiveBluePotion(EnDs* this, GlobalContext* globalCtx); +void EnDs_OfferBluePotion(EnDs* this, GlobalContext* globalCtx); +void EnDs_Wait(EnDs* this, GlobalContext* globalCtx); + +UNK_TYPE func_809FDA38(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot, EnDs* this); +void func_809FDA7C(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec3s* rot, Actor* this); + +const ActorInit En_Ds_InitVars = { ACTOR_EN_DS, ACTORTYPE_NPC, ROOM, @@ -22,46 +44,250 @@ const ActorInit En_Ds_InitVars = (ActorFunc)EnDs_Update, (ActorFunc)EnDs_Draw, }; -*/ -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ds/EnDs_Init.s") -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ds/EnDs_Destroy.s") +extern SkeletonHeader D_06004768; +extern AnimationHeader D_0600039C; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ds/func_809FD10C.s") +Vec3f mtxSrc = { 1100.0f, 500.0f, 0.0f }; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ds/func_809FD160.s") +void EnDs_Init(EnDs* this, GlobalContext* globalCtx) { + SkelAnime* skelAnime = &this->skelAnime; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ds/func_809FD1CC.s") + ActorShape_Init(&this->actor.shape, 0.0f, ActorShadow_DrawFunc_Circle, 36.0f); + SkelAnime_InitSV(globalCtx, skelAnime, &D_06004768, &D_0600039C, &this->actorDrawTable, &this->unk_1B4, 6); + SkelAnime_ChangeAnimDefaultStop(&this->skelAnime, &D_0600039C); -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ds/func_809FD224.s") + this->actor.sub_98.mass = 0xFF; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ds/func_809FD284.s") + Actor_SetScale(this, 0.013f); -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ds/func_809FD2EC.s") + this->actionFunc = EnDs_Wait; + this->actor.unk_1F = 1; + this->unk_1E8 = 0; + this->actor.flags &= ~0x1; + this->unk_1E4 = 0.0f; +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ds/func_809FD368.s") +void EnDs_Destroy(EnDs* this, GlobalContext* globalCtx) { +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ds/func_809FD40C.s") +void EnDs_Talk(EnDs* this, GlobalContext* globalCtx) { + if (func_8002F334(&this->actor, globalCtx) != 0) { + this->actionFunc = EnDs_Wait; + this->actor.flags &= ~0x10000; + } + this->unk_1E8 |= 1; +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ds/func_809FD460.s") +void EnDs_TalkNoEmptyBottle(EnDs* this, GlobalContext* globalCtx) { + if ((func_8010BDBC(&globalCtx->msgCtx) == 5) && (func_80106BC8(globalCtx) != 0)) { + func_80106CCC(globalCtx); + this->actionFunc = EnDs_Wait; + } + this->unk_1E8 |= 1; +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ds/func_809FD500.s") +void EnDs_TalkAfterGiveOddPotion(EnDs* this, GlobalContext* globalCtx) { + if (func_8002F194(&this->actor, globalCtx) != 0) { + this->actionFunc = EnDs_Talk; + } else { + this->actor.flags |= 0x10000; + func_8002F2CC(&this->actor, globalCtx, 1000.0f); + } +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ds/func_809FD5CC.s") +void EnDs_DisplayOddPotionText(EnDs* this, GlobalContext* globalCtx) { + if (func_8002F334(&this->actor, globalCtx) != 0) { + this->actor.textId = 0x504F; + this->actionFunc = EnDs_TalkAfterGiveOddPotion; + this->actor.flags &= ~0x100; + gSaveContext.item_get_inf[3] |= 1; + } +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ds/func_809FD61C.s") +void EnDs_GiveOddPotion(EnDs* this, GlobalContext* globalCtx) { + if (func_8002F410(&this->actor, globalCtx) != 0) { + this->actor.attachedA = NULL; + this->actionFunc = EnDs_DisplayOddPotionText; + gSaveContext.timer_2_state = 0; + } else { + func_8002F434(&this->actor, globalCtx, GI_ODD_POTION, 10000.0f, 50.0f); + } +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ds/func_809FD67C.s") +void EnDs_TalkAfterBrewOddPotion(EnDs* this, GlobalContext* globalCtx) { + if ((func_8010BDBC(&globalCtx->msgCtx) == 5) && (func_80106BC8(globalCtx) != 0)) { + func_80106CCC(globalCtx); + this->actionFunc = EnDs_GiveOddPotion; + func_8002F434(&this->actor, globalCtx, GI_ODD_POTION, 10000.0f, 50.0f); + } +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ds/func_809FD7B4.s") +void EnDs_BrewOddPotion3(EnDs* this, GlobalContext* globalCtx) { + if (this->brewTimer > 0) { + this->brewTimer -= 1; + } else { + this->actionFunc = EnDs_TalkAfterBrewOddPotion; + func_8010B720(globalCtx, 0x504D); + } -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ds/EnDs_Update.s") + Math_ApproxF(&this->unk_1E4, 0, 0.03f); + func_800773A8(globalCtx, this->unk_1E4 * (2.0f - this->unk_1E4), 0.0f, 0.1f, 1.0f); +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ds/func_809FDA38.s") +void EnDs_BrewOddPotion2(EnDs* this, GlobalContext* globalCtx) { + if (this->brewTimer > 0) { + this->brewTimer -= 1; + } else { + this->actionFunc = EnDs_BrewOddPotion3; + this->brewTimer = 60; + Flags_UnsetSwitch(globalCtx, 0x3F); + } +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ds/func_809FDA7C.s") +void EnDs_BrewOddPotion1(EnDs* this, GlobalContext* globalCtx) { + if (this->brewTimer > 0) { + this->brewTimer -= 1; + } else { + this->actionFunc = EnDs_BrewOddPotion2; + this->brewTimer = 20; + } -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ds/EnDs_Draw.s") + Math_ApproxF(&this->unk_1E4, 1.0f, 0.01f); + func_800773A8(globalCtx, this->unk_1E4 * (2.0f - this->unk_1E4), 0.0f, 0.1f, 1.0f); +} +void EnDs_OfferOddPotion(EnDs* this, GlobalContext* globalCtx) { + Player* player = PLAYER; + if ((func_8010BDBC(&globalCtx->msgCtx) == 4) && (func_80106BC8(globalCtx) != 0)) { + switch (globalCtx->msgCtx.choiceIndex) { + case 0: // yes + this->actionFunc = EnDs_BrewOddPotion1; + this->brewTimer = 60; + Flags_SetSwitch(globalCtx, 0x3F); + globalCtx->msgCtx.msgMode = 0x37; + player->exchangeItemId = 0; + break; + case 1: // no + func_8010B720(globalCtx, 0x504C); + this->actionFunc = EnDs_Talk; + } + } +} +int EnDs_CheckRupeesAndBottle() { + if (gSaveContext.rupees < 100) { + return 0; + } else if (Inventory_HasEmptyBottle() == 0) { + return 1; + } else { + return 2; + } +} + +void EnDs_GiveBluePotion(EnDs* this, GlobalContext* globalCtx) { + if (func_8002F410(&this->actor, globalCtx) != 0) { + this->actor.attachedA = NULL; + this->actionFunc = EnDs_Talk; + } else { + func_8002F434(&this->actor, globalCtx, GI_POTION_BLUE, 10000.0f, 50.0f); + } +} + +void EnDs_OfferBluePotion(EnDs* this, GlobalContext* globalCtx) { + if ((func_8010BDBC(&globalCtx->msgCtx) == 4) && (func_80106BC8(globalCtx) != 0)) { + switch (globalCtx->msgCtx.choiceIndex) { + case 0: // yes + switch (EnDs_CheckRupeesAndBottle()) { + case 0: // have less than 100 rupees + func_8010B720(globalCtx, 0x500E); + break; + case 1: // have 100 rupees but no empty bottle + func_8010B720(globalCtx, 0x96); + this->actionFunc = EnDs_TalkNoEmptyBottle; + return; + case 2: // have 100 rupees and empty bottle + Rupees_ChangeBy(-100); + this->actor.flags &= ~0x10000; + func_8002F434(this, globalCtx, GI_POTION_BLUE, 10000.0f, 50.0f); + this->actionFunc = EnDs_GiveBluePotion; + return; + } + break; + case 1: // no + func_8010B720(globalCtx, 0x500D); + } + this->actionFunc = EnDs_Talk; + } +} + +void EnDs_Wait(EnDs* this, GlobalContext* globalCtx) { + Player* player = PLAYER; + s16 unkAngle; + + if (func_8002F194(&this->actor, globalCtx) != 0) { + if (func_8002F368(globalCtx) == 8) { + Audio_PlaySoundGeneral(NA_SE_SY_TRE_BOX_APPEAR, &D_801333D4, 4, &D_801333E0, &D_801333E0, &D_801333E8); + player->actor.textId = 0x504A; + this->actionFunc = EnDs_OfferOddPotion; + } else if (gSaveContext.item_get_inf[3] & 1) { + player->actor.textId = 0x500C; + this->actionFunc = EnDs_OfferBluePotion; + } else { + if (INV_CONTENT(ITEM_ODD_MUSHROOM) == ITEM_ODD_MUSHROOM) { + player->actor.textId = 0x5049; + } else { + player->actor.textId = 0x5048; + } + this->actionFunc = EnDs_Talk; + } + } else { + unkAngle = this->actor.rotTowardsLinkY - this->actor.shape.rot.y; + this->actor.textId = 0x5048; + + if ((ABS(unkAngle) < 0x2151) && (this->actor.xzDistanceFromLink < 200.0f)) { + func_8002F298(this, globalCtx, 100.0f, 8); + this->unk_1E8 |= 1; + } + } +} + +void EnDs_Update(EnDs* this, GlobalContext* globalCtx) { + if (SkelAnime_FrameUpdateMatrix(&this->skelAnime) != 0) { + this->skelAnime.animCurrentFrame = 0.0f; + } + + this->actionFunc(this, globalCtx); + + if (this->unk_1E8 & 1) { + func_80038290(globalCtx, this, &this->unk_1D8, &this->unk_1DE, this->actor.posRot2.pos); + } else { + Math_SmoothScaleMaxMinS(&this->unk_1D8.x, 0, 6, 0x1838, 100); + Math_SmoothScaleMaxMinS(&this->unk_1D8.y, 0, 6, 0x1838, 100); + Math_SmoothScaleMaxMinS(&this->unk_1DE.x, 0, 6, 0x1838, 100); + Math_SmoothScaleMaxMinS(&this->unk_1DE.y, 0, 6, 0x1838, 100); + } +} + +UNK_TYPE func_809FDA38(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot, EnDs* this) { + EnDs* enDs = this; + + if (limbIndex == 5) { + rot->x += this->unk_1D8.y; + rot->z += this->unk_1D8.x; + } + return 0; +} + +void func_809FDA7C(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec3s* rot, Actor* actor) { + if (limbIndex == 5) { + Matrix_MultVec3f(&mtxSrc, &actor->posRot2.pos); + } +} + +void EnDs_Draw(EnDs* this, GlobalContext* globalCtx) { + func_800943C8(globalCtx->state.gfxCtx); + SkelAnime_DrawSV(globalCtx, this->skelAnime.skeleton, this->skelAnime.actorDrawTbl, this->skelAnime.dListCount, + &func_809FDA38, &func_809FDA7C, this); +} diff --git a/src/overlays/actors/ovl_En_Ds/z_en_ds.h b/src/overlays/actors/ovl_En_Ds/z_en_ds.h index c99c150c02..7a1f4e9c9e 100644 --- a/src/overlays/actors/ovl_En_Ds/z_en_ds.h +++ b/src/overlays/actors/ovl_En_Ds/z_en_ds.h @@ -4,10 +4,19 @@ #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ Actor actor; - /* 0x014C */ char unk_14C[0xA4]; + /* 0x014C */ SkelAnime skelAnime; + /* 0x0190 */ Vec3s actorDrawTable; + /* 0x0196 */ char unk_194[0x1E]; + /* 0x01B4 */ Vec3s unk_1B4; + /* 0x01BA */ char unk_1B8[0x1E]; + /* 0x01D8 */ Vec3s unk_1D8; + /* 0x01DE */ Vec3s unk_1DE; + /* 0x01E4 */ float unk_1E4; + /* 0x01E8 */ u16 unk_1E8; + /* 0x01EA */ u16 brewTimer; + /* 0x01EC */ ActorFunc actionFunc; } EnDs; // size = 0x01F0 extern const ActorInit En_Ds_InitVars; diff --git a/src/overlays/actors/ovl_En_Du/z_en_du.c b/src/overlays/actors/ovl_En_Du/z_en_du.c index 880e2688a4..e2f28f55b3 100644 --- a/src/overlays/actors/ovl_En_Du/z_en_du.c +++ b/src/overlays/actors/ovl_En_Du/z_en_du.c @@ -1,6 +1,6 @@ #include "z_en_du.h" -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x02000009 void EnDu_Init(EnDu* this, GlobalContext* globalCtx); @@ -9,8 +9,7 @@ void EnDu_Update(EnDu* this, GlobalContext* globalCtx); void EnDu_Draw(EnDu* this, GlobalContext* globalCtx); /* -const ActorInit En_Du_InitVars = -{ +const ActorInit En_Du_InitVars = { ACTOR_EN_DU, ACTORTYPE_NPC, ROOM, diff --git a/src/overlays/actors/ovl_En_Du/z_en_du.h b/src/overlays/actors/ovl_En_Du/z_en_du.h index 8e79b4578c..8941e278bb 100644 --- a/src/overlays/actors/ovl_En_Du/z_en_du.h +++ b/src/overlays/actors/ovl_En_Du/z_en_du.h @@ -4,8 +4,7 @@ #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ Actor actor; /* 0x014C */ char unk_14C[0xD0]; } EnDu; // size = 0x021C 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 2e7292896b..33ff934ec3 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 @@ -1,6 +1,6 @@ #include "z_en_dy_extra.h" -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x00000030 void EnDyExtra_Init(EnDyExtra* this, GlobalContext* globalCtx); @@ -9,8 +9,7 @@ void EnDyExtra_Update(EnDyExtra* this, GlobalContext* globalCtx); void EnDyExtra_Draw(EnDyExtra* this, GlobalContext* globalCtx); /* -const ActorInit En_Dy_Extra_InitVars = -{ +const ActorInit En_Dy_Extra_InitVars = { ACTOR_EN_DY_EXTRA, ACTORTYPE_PROP, ROOM, diff --git a/src/overlays/actors/ovl_En_Dy_Extra/z_en_dy_extra.h b/src/overlays/actors/ovl_En_Dy_Extra/z_en_dy_extra.h index 65fba617a7..c29c9363f9 100644 --- a/src/overlays/actors/ovl_En_Dy_Extra/z_en_dy_extra.h +++ b/src/overlays/actors/ovl_En_Dy_Extra/z_en_dy_extra.h @@ -4,8 +4,7 @@ #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ Actor actor; /* 0x014C */ char unk_14C[0x28]; } EnDyExtra; // size = 0x0174 diff --git a/src/overlays/actors/ovl_En_Eg/z_en_eg.c b/src/overlays/actors/ovl_En_Eg/z_en_eg.c index 249ee02aed..b6ef202b44 100644 --- a/src/overlays/actors/ovl_En_Eg/z_en_eg.c +++ b/src/overlays/actors/ovl_En_Eg/z_en_eg.c @@ -2,17 +2,16 @@ * File: z_en_eg.c * Overlay: ovl_En_Eg * Description: Zelda's Path in Ganon Castle Escape? -*/ + */ #include #include #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ Actor actor; - /* 0x014C */ s32 funcIndex; + /* 0x014C */ s32 funcIndex; } ActorEg; // size = 0x0154 #define ROOM 0x00 @@ -26,41 +25,30 @@ static void Update(ActorEg* this, GlobalContext* globalCtx); static void Draw(ActorEg* this, GlobalContext* globalCtx); static bool hasVoidedOut = false; -static const ActorFunc funcTbl[] = { (ActorFunc)func_809FFDC8 }; +static const ActorFunc funcTbl[] = { + (ActorFunc)func_809FFDC8, +}; -const ActorInit En_Eg_InitVars = -{ - ACTOR_EN_EG, - ACTORTYPE_ITEMACTION, - ROOM, - FLAGS, - OBJECT_ZL2, - sizeof(ActorEg), - (ActorFunc)Init, - (ActorFunc)Destroy, - (ActorFunc)Update, +const ActorInit En_Eg_InitVars = { + ACTOR_EN_EG, ACTORTYPE_ITEMACTION, ROOM, + FLAGS, OBJECT_ZL2, sizeof(ActorEg), + (ActorFunc)Init, (ActorFunc)Destroy, (ActorFunc)Update, (ActorFunc)Draw, }; -static void PlayVoidOutSFX() -{ +static void PlayVoidOutSFX() { func_800788CC(NA_SE_OC_ABYSS); } -static void Destroy(ActorEg* this, GlobalContext* globalCtx) -{ +static void Destroy(ActorEg* this, GlobalContext* globalCtx) { } -static void Init(ActorEg* this, GlobalContext* globalCtx) -{ +static void Init(ActorEg* this, GlobalContext* globalCtx) { this->funcIndex = 0; } -static void func_809FFDC8(ActorEg* this, GlobalContext* globalCtx) -{ - if (!hasVoidedOut && (gSaveContext.timer_2_value < 1) && - Flags_GetSwitch(globalCtx, 0x36) && (kREG(0) == 0)) - { +static void func_809FFDC8(ActorEg* this, GlobalContext* globalCtx) { + if (!hasVoidedOut && (gSaveContext.timer_2_value < 1) && Flags_GetSwitch(globalCtx, 0x36) && (kREG(0) == 0)) { // Void the player out func_800C0C88(globalCtx); gSaveContext.respawn_flag = -2; @@ -71,21 +59,16 @@ static void func_809FFDC8(ActorEg* this, GlobalContext* globalCtx) } } -static void Update(ActorEg* this, GlobalContext* globalCtx) -{ +static void Update(ActorEg* this, GlobalContext* globalCtx) { s32 funcIndex = this->funcIndex; - if (((funcIndex < 0) || (0 < funcIndex)) || (funcTbl[funcIndex] == NULL)) - { + if (((funcIndex < 0) || (0 < funcIndex)) || (funcTbl[funcIndex] == NULL)) { // Translates to: "Main Mode is wrong!!!!!!!!!!!!!!!!!!!!!!!!!" osSyncPrintf(VT_FGCOL(RED) "メインモードがおかしい!!!!!!!!!!!!!!!!!!!!!!!!!\n" VT_RST); - } - else - { + } else { funcTbl[funcIndex](this, globalCtx); } } -static void Draw(ActorEg* this, GlobalContext* globalCtx) -{ +static void Draw(ActorEg* this, GlobalContext* globalCtx) { } diff --git a/src/overlays/actors/ovl_En_Eiyer/z_en_eiyer.c b/src/overlays/actors/ovl_En_Eiyer/z_en_eiyer.c index 1ec6fbca82..8c305bed06 100644 --- a/src/overlays/actors/ovl_En_Eiyer/z_en_eiyer.c +++ b/src/overlays/actors/ovl_En_Eiyer/z_en_eiyer.c @@ -1,6 +1,6 @@ #include "z_en_eiyer.h" -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x00000005 void EnEiyer_Init(EnEiyer* this, GlobalContext* globalCtx); @@ -9,8 +9,7 @@ void EnEiyer_Update(EnEiyer* this, GlobalContext* globalCtx); void EnEiyer_Draw(EnEiyer* this, GlobalContext* globalCtx); /* -const ActorInit En_Eiyer_InitVars = -{ +const ActorInit En_Eiyer_InitVars = { ACTOR_EN_EIYER, ACTORTYPE_ENEMY, ROOM, diff --git a/src/overlays/actors/ovl_En_Eiyer/z_en_eiyer.h b/src/overlays/actors/ovl_En_Eiyer/z_en_eiyer.h index 73ccc4c35a..27e109ab39 100644 --- a/src/overlays/actors/ovl_En_Eiyer/z_en_eiyer.h +++ b/src/overlays/actors/ovl_En_Eiyer/z_en_eiyer.h @@ -4,8 +4,7 @@ #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ Actor actor; /* 0x014C */ char unk_14C[0x188]; } EnEiyer; // size = 0x02D4 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 8d34c6458b..30784c6b89 100644 --- a/src/overlays/actors/ovl_En_Elf/z_en_elf.c +++ b/src/overlays/actors/ovl_En_Elf/z_en_elf.c @@ -1,6 +1,6 @@ #include "z_en_elf.h" -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x02000030 void EnElf_Init(EnElf* this, GlobalContext* globalCtx); @@ -9,8 +9,7 @@ void EnElf_Update(EnElf* this, GlobalContext* globalCtx); void EnElf_Draw(EnElf* this, GlobalContext* globalCtx); /* -const ActorInit En_Elf_InitVars = -{ +const ActorInit En_Elf_InitVars = { ACTOR_EN_ELF, ACTORTYPE_ITEMACTION, ROOM, 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 ecc3bf5bdc..559d07103f 100644 --- a/src/overlays/actors/ovl_En_Elf/z_en_elf.h +++ b/src/overlays/actors/ovl_En_Elf/z_en_elf.h @@ -4,8 +4,7 @@ #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ Actor actor; /* 0x014C */ char unk_14C[0x184]; } EnElf; // size = 0x02D0 diff --git a/src/overlays/actors/ovl_En_Encount1/z_en_encount1.c b/src/overlays/actors/ovl_En_Encount1/z_en_encount1.c index 3a7f1e7222..4a5b99da69 100644 --- a/src/overlays/actors/ovl_En_Encount1/z_en_encount1.c +++ b/src/overlays/actors/ovl_En_Encount1/z_en_encount1.c @@ -1,14 +1,13 @@ #include "z_en_encount1.h" -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x08000010 void EnEncount1_Init(EnEncount1* this, GlobalContext* globalCtx); void EnEncount1_Update(EnEncount1* this, GlobalContext* globalCtx); /* -const ActorInit En_Encount1_InitVars = -{ +const ActorInit En_Encount1_InitVars = { ACTOR_EN_ENCOUNT1, ACTORTYPE_PROP, ROOM, diff --git a/src/overlays/actors/ovl_En_Encount1/z_en_encount1.h b/src/overlays/actors/ovl_En_Encount1/z_en_encount1.h index 843a271f3f..d5a2702948 100644 --- a/src/overlays/actors/ovl_En_Encount1/z_en_encount1.h +++ b/src/overlays/actors/ovl_En_Encount1/z_en_encount1.h @@ -4,8 +4,7 @@ #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ Actor actor; /* 0x014C */ char unk_14C[0x24]; } EnEncount1; // size = 0x0170 diff --git a/src/overlays/actors/ovl_En_Encount2/z_en_encount2.c b/src/overlays/actors/ovl_En_Encount2/z_en_encount2.c index 854720464b..606d0814d9 100644 --- a/src/overlays/actors/ovl_En_Encount2/z_en_encount2.c +++ b/src/overlays/actors/ovl_En_Encount2/z_en_encount2.c @@ -1,6 +1,6 @@ #include "z_en_encount2.h" -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x00000030 void EnEncount2_Init(EnEncount2* this, GlobalContext* globalCtx); @@ -8,8 +8,7 @@ void EnEncount2_Update(EnEncount2* this, GlobalContext* globalCtx); void EnEncount2_Draw(EnEncount2* this, GlobalContext* globalCtx); /* -const ActorInit En_Encount2_InitVars = -{ +const ActorInit En_Encount2_InitVars = { ACTOR_EN_ENCOUNT2, ACTORTYPE_ENEMY, ROOM, diff --git a/src/overlays/actors/ovl_En_Encount2/z_en_encount2.h b/src/overlays/actors/ovl_En_Encount2/z_en_encount2.h index 7b04e6a9cf..e286022ea8 100644 --- a/src/overlays/actors/ovl_En_Encount2/z_en_encount2.h +++ b/src/overlays/actors/ovl_En_Encount2/z_en_encount2.h @@ -4,8 +4,7 @@ #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ Actor actor; /* 0x014C */ char unk_14C[0x8D4]; } EnEncount2; // size = 0x0A20 diff --git a/src/overlays/actors/ovl_En_Ex_Item/z_en_ex_item.c b/src/overlays/actors/ovl_En_Ex_Item/z_en_ex_item.c index 86428d40be..e070af7720 100644 --- a/src/overlays/actors/ovl_En_Ex_Item/z_en_ex_item.c +++ b/src/overlays/actors/ovl_En_Ex_Item/z_en_ex_item.c @@ -1,6 +1,6 @@ #include "z_en_ex_item.h" -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x00000030 void EnExItem_Init(EnExItem* this, GlobalContext* globalCtx); @@ -9,8 +9,7 @@ void EnExItem_Update(EnExItem* this, GlobalContext* globalCtx); void EnExItem_Draw(EnExItem* this, GlobalContext* globalCtx); /* -const ActorInit En_Ex_Item_InitVars = -{ +const ActorInit En_Ex_Item_InitVars = { ACTOR_EN_EX_ITEM, ACTORTYPE_PROP, ROOM, diff --git a/src/overlays/actors/ovl_En_Ex_Item/z_en_ex_item.h b/src/overlays/actors/ovl_En_Ex_Item/z_en_ex_item.h index ea27019aae..c70a494b90 100644 --- a/src/overlays/actors/ovl_En_Ex_Item/z_en_ex_item.h +++ b/src/overlays/actors/ovl_En_Ex_Item/z_en_ex_item.h @@ -4,8 +4,7 @@ #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ Actor actor; /* 0x014C */ char unk_14C[0x38]; } EnExItem; // size = 0x0184 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 03c2d7a21f..a361adf2ad 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 @@ -1,6 +1,6 @@ #include "z_en_ex_ruppy.h" -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x00000010 void EnExRuppy_Init(EnExRuppy* this, GlobalContext* globalCtx); @@ -9,8 +9,7 @@ void EnExRuppy_Update(EnExRuppy* this, GlobalContext* globalCtx); void EnExRuppy_Draw(EnExRuppy* this, GlobalContext* globalCtx); /* -const ActorInit En_Ex_Ruppy_InitVars = -{ +const ActorInit En_Ex_Ruppy_InitVars = { ACTOR_EN_EX_RUPPY, ACTORTYPE_PROP, ROOM, diff --git a/src/overlays/actors/ovl_En_Ex_Ruppy/z_en_ex_ruppy.h b/src/overlays/actors/ovl_En_Ex_Ruppy/z_en_ex_ruppy.h index accdfb6233..c56dbf8376 100644 --- a/src/overlays/actors/ovl_En_Ex_Ruppy/z_en_ex_ruppy.h +++ b/src/overlays/actors/ovl_En_Ex_Ruppy/z_en_ex_ruppy.h @@ -4,8 +4,7 @@ #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ Actor actor; /* 0x014C */ char unk_14C[0x18]; } EnExRuppy; // size = 0x0164 diff --git a/src/overlays/actors/ovl_En_Fd/z_en_fd.c b/src/overlays/actors/ovl_En_Fd/z_en_fd.c index 328e1965af..4466d986f9 100644 --- a/src/overlays/actors/ovl_En_Fd/z_en_fd.c +++ b/src/overlays/actors/ovl_En_Fd/z_en_fd.c @@ -1,6 +1,6 @@ #include "z_en_fd.h" -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x00000215 void EnFd_Init(EnFd* this, GlobalContext* globalCtx); @@ -9,8 +9,7 @@ void EnFd_Update(EnFd* this, GlobalContext* globalCtx); void EnFd_Draw(EnFd* this, GlobalContext* globalCtx); /* -const ActorInit En_Fd_InitVars = -{ +const ActorInit En_Fd_InitVars = { ACTOR_EN_FD, ACTORTYPE_ENEMY, ROOM, diff --git a/src/overlays/actors/ovl_En_Fd/z_en_fd.h b/src/overlays/actors/ovl_En_Fd/z_en_fd.h index a96e301f8a..b8a4291fbd 100644 --- a/src/overlays/actors/ovl_En_Fd/z_en_fd.h +++ b/src/overlays/actors/ovl_En_Fd/z_en_fd.h @@ -4,8 +4,7 @@ #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ Actor actor; /* 0x014C */ char unk_14C[0x3094]; } EnFd; // size = 0x31E0 diff --git a/src/overlays/actors/ovl_En_Fd_Fire/z_en_fd_fire.c b/src/overlays/actors/ovl_En_Fd_Fire/z_en_fd_fire.c index 7db6b42193..38e5aedc62 100644 --- a/src/overlays/actors/ovl_En_Fd_Fire/z_en_fd_fire.c +++ b/src/overlays/actors/ovl_En_Fd_Fire/z_en_fd_fire.c @@ -1,6 +1,6 @@ #include "z_en_fd_fire.h" -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x00000015 void EnFdFire_Init(EnFdFire* this, GlobalContext* globalCtx); @@ -9,8 +9,7 @@ void EnFdFire_Update(EnFdFire* this, GlobalContext* globalCtx); void EnFdFire_Draw(EnFdFire* this, GlobalContext* globalCtx); /* -const ActorInit En_Fd_Fire_InitVars = -{ +const ActorInit En_Fd_Fire_InitVars = { ACTOR_EN_FD_FIRE, ACTORTYPE_ENEMY, ROOM, diff --git a/src/overlays/actors/ovl_En_Fd_Fire/z_en_fd_fire.h b/src/overlays/actors/ovl_En_Fd_Fire/z_en_fd_fire.h index ae0e2e14ea..6403c2dcb0 100644 --- a/src/overlays/actors/ovl_En_Fd_Fire/z_en_fd_fire.h +++ b/src/overlays/actors/ovl_En_Fd_Fire/z_en_fd_fire.h @@ -4,8 +4,7 @@ #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ Actor actor; /* 0x014C */ char unk_14C[0x60]; } EnFdFire; // size = 0x01AC 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 dfc7aacdb9..fd5656ea63 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 @@ -1,6 +1,6 @@ #include "z_en_fhg_fire.h" -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x00000030 void EnFhgFire_Init(EnFhgFire* this, GlobalContext* globalCtx); @@ -9,8 +9,7 @@ void EnFhgFire_Update(EnFhgFire* this, GlobalContext* globalCtx); void EnFhgFire_Draw(EnFhgFire* this, GlobalContext* globalCtx); /* -const ActorInit En_Fhg_Fire_InitVars = -{ +const ActorInit En_Fhg_Fire_InitVars = { ACTOR_PLAYER, ACTORTYPE_BOSS, ROOM, diff --git a/src/overlays/actors/ovl_En_Fhg_Fire/z_en_fhg_fire.h b/src/overlays/actors/ovl_En_Fhg_Fire/z_en_fhg_fire.h index 480e79da75..c3a27e7438 100644 --- a/src/overlays/actors/ovl_En_Fhg_Fire/z_en_fhg_fire.h +++ b/src/overlays/actors/ovl_En_Fhg_Fire/z_en_fhg_fire.h @@ -4,8 +4,7 @@ #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ Actor actor; /* 0x014C */ char unk_14C[0xB8]; } EnFhgFire; // size = 0x0204 diff --git a/src/overlays/actors/ovl_En_Fire_Rock/z_en_fire_rock.c b/src/overlays/actors/ovl_En_Fire_Rock/z_en_fire_rock.c index e0756f70b9..65f0887180 100644 --- a/src/overlays/actors/ovl_En_Fire_Rock/z_en_fire_rock.c +++ b/src/overlays/actors/ovl_En_Fire_Rock/z_en_fire_rock.c @@ -1,6 +1,6 @@ #include "z_en_fire_rock.h" -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x00000030 void EnFireRock_Init(EnFireRock* this, GlobalContext* globalCtx); @@ -9,8 +9,7 @@ void EnFireRock_Update(EnFireRock* this, GlobalContext* globalCtx); void EnFireRock_Draw(EnFireRock* this, GlobalContext* globalCtx); /* -const ActorInit En_Fire_Rock_InitVars = -{ +const ActorInit En_Fire_Rock_InitVars = { ACTOR_EN_FIRE_ROCK, ACTORTYPE_ENEMY, ROOM, diff --git a/src/overlays/actors/ovl_En_Fire_Rock/z_en_fire_rock.h b/src/overlays/actors/ovl_En_Fire_Rock/z_en_fire_rock.h index b8ed87b6b6..e8b1758a13 100644 --- a/src/overlays/actors/ovl_En_Fire_Rock/z_en_fire_rock.h +++ b/src/overlays/actors/ovl_En_Fire_Rock/z_en_fire_rock.h @@ -4,8 +4,7 @@ #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ Actor actor; /* 0x014C */ char unk_14C[0x94]; } EnFireRock; // size = 0x01E0 diff --git a/src/overlays/actors/ovl_En_Firefly/z_en_firefly.c b/src/overlays/actors/ovl_En_Firefly/z_en_firefly.c index 3b3f25c8e1..b1244235d5 100644 --- a/src/overlays/actors/ovl_En_Firefly/z_en_firefly.c +++ b/src/overlays/actors/ovl_En_Firefly/z_en_firefly.c @@ -1,6 +1,6 @@ #include "z_en_firefly.h" -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x00005005 void EnFirefly_Init(EnFirefly* this, GlobalContext* globalCtx); @@ -9,8 +9,7 @@ void EnFirefly_Update(EnFirefly* this, GlobalContext* globalCtx); void EnFirefly_Draw(EnFirefly* this, GlobalContext* globalCtx); /* -const ActorInit En_Firefly_InitVars = -{ +const ActorInit En_Firefly_InitVars = { ACTOR_EN_FIREFLY, ACTORTYPE_ENEMY, ROOM, diff --git a/src/overlays/actors/ovl_En_Firefly/z_en_firefly.h b/src/overlays/actors/ovl_En_Firefly/z_en_firefly.h index 6de17fea14..f5d6c8b13d 100644 --- a/src/overlays/actors/ovl_En_Firefly/z_en_firefly.h +++ b/src/overlays/actors/ovl_En_Firefly/z_en_firefly.h @@ -4,8 +4,7 @@ #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ Actor actor; /* 0x014C */ char unk_14C[0x228]; } EnFirefly; // size = 0x0374 diff --git a/src/overlays/actors/ovl_En_Fish/z_en_fish.c b/src/overlays/actors/ovl_En_Fish/z_en_fish.c index 50a95ed186..7308fa8ab9 100644 --- a/src/overlays/actors/ovl_En_Fish/z_en_fish.c +++ b/src/overlays/actors/ovl_En_Fish/z_en_fish.c @@ -1,6 +1,6 @@ #include "z_en_fish.h" -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x00000000 void EnFish_Init(EnFish* this, GlobalContext* globalCtx); @@ -9,8 +9,7 @@ void EnFish_Update(EnFish* this, GlobalContext* globalCtx); void EnFish_Draw(EnFish* this, GlobalContext* globalCtx); /* -const ActorInit En_Fish_InitVars = -{ +const ActorInit En_Fish_InitVars = { ACTOR_EN_FISH, ACTORTYPE_ITEMACTION, ROOM, diff --git a/src/overlays/actors/ovl_En_Fish/z_en_fish.h b/src/overlays/actors/ovl_En_Fish/z_en_fish.h index 6092a2a232..9144ef12c9 100644 --- a/src/overlays/actors/ovl_En_Fish/z_en_fish.h +++ b/src/overlays/actors/ovl_En_Fish/z_en_fish.h @@ -4,8 +4,7 @@ #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ Actor actor; /* 0x014C */ char unk_14C[0x108]; } EnFish; // size = 0x0254 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 347ee0b999..adc48b934b 100644 --- a/src/overlays/actors/ovl_En_Floormas/z_en_floormas.c +++ b/src/overlays/actors/ovl_En_Floormas/z_en_floormas.c @@ -1,6 +1,6 @@ #include "z_en_floormas.h" -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x00000405 void EnFloormas_Init(EnFloormas* this, GlobalContext* globalCtx); @@ -9,8 +9,7 @@ void EnFloormas_Update(EnFloormas* this, GlobalContext* globalCtx); void EnFloormas_Draw(EnFloormas* this, GlobalContext* globalCtx); /* -const ActorInit En_Floormas_InitVars = -{ +const ActorInit En_Floormas_InitVars = { ACTOR_EN_FLOORMAS, ACTORTYPE_ENEMY, ROOM, diff --git a/src/overlays/actors/ovl_En_Floormas/z_en_floormas.h b/src/overlays/actors/ovl_En_Floormas/z_en_floormas.h index 646fff24bc..fd7c3ea0c1 100644 --- a/src/overlays/actors/ovl_En_Floormas/z_en_floormas.h +++ b/src/overlays/actors/ovl_En_Floormas/z_en_floormas.h @@ -4,8 +4,7 @@ #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ Actor actor; /* 0x014C */ char unk_14C[0x1C8]; } EnFloormas; // size = 0x0314 diff --git a/src/overlays/actors/ovl_En_Fr/z_en_fr.c b/src/overlays/actors/ovl_En_Fr/z_en_fr.c index 39e707d548..ff905fec14 100644 --- a/src/overlays/actors/ovl_En_Fr/z_en_fr.c +++ b/src/overlays/actors/ovl_En_Fr/z_en_fr.c @@ -1,6 +1,6 @@ #include "z_en_fr.h" -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x02000019 void EnFr_Init(EnFr* this, GlobalContext* globalCtx); @@ -8,8 +8,7 @@ void EnFr_Destroy(EnFr* this, GlobalContext* globalCtx); void EnFr_Update(EnFr* this, GlobalContext* globalCtx); /* -const ActorInit En_Fr_InitVars = -{ +const ActorInit En_Fr_InitVars = { ACTOR_EN_FR, ACTORTYPE_NPC, ROOM, diff --git a/src/overlays/actors/ovl_En_Fr/z_en_fr.h b/src/overlays/actors/ovl_En_Fr/z_en_fr.h index 5513c891c1..eaddf83acd 100644 --- a/src/overlays/actors/ovl_En_Fr/z_en_fr.h +++ b/src/overlays/actors/ovl_En_Fr/z_en_fr.h @@ -4,8 +4,7 @@ #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ Actor actor; /* 0x014C */ char unk_14C[0x278]; } EnFr; // size = 0x03C4 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 458f42e9ff..afcdcb3a55 100644 --- a/src/overlays/actors/ovl_En_Fu/z_en_fu.c +++ b/src/overlays/actors/ovl_En_Fu/z_en_fu.c @@ -1,6 +1,6 @@ #include "z_en_fu.h" -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x02000019 void EnFu_Init(EnFu* this, GlobalContext* globalCtx); @@ -9,8 +9,7 @@ void EnFu_Update(EnFu* this, GlobalContext* globalCtx); void EnFu_Draw(EnFu* this, GlobalContext* globalCtx); /* -const ActorInit En_Fu_InitVars = -{ +const ActorInit En_Fu_InitVars = { ACTOR_EN_FU, ACTORTYPE_NPC, ROOM, @@ -52,4 +51,3 @@ const ActorInit En_Fu_InitVars = #pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Fu/func_80A1E26C.s") #pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Fu/EnFu_Draw.s") - diff --git a/src/overlays/actors/ovl_En_Fu/z_en_fu.h b/src/overlays/actors/ovl_En_Fu/z_en_fu.h index d55bc54466..58e1802b29 100644 --- a/src/overlays/actors/ovl_En_Fu/z_en_fu.h +++ b/src/overlays/actors/ovl_En_Fu/z_en_fu.h @@ -4,8 +4,7 @@ #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ Actor actor; /* 0x014C */ char unk_14C[0x164]; } EnFu; // size = 0x02B0 diff --git a/src/overlays/actors/ovl_En_Fw/z_en_fw.c b/src/overlays/actors/ovl_En_Fw/z_en_fw.c index 66b4b79a2a..be1295087e 100644 --- a/src/overlays/actors/ovl_En_Fw/z_en_fw.c +++ b/src/overlays/actors/ovl_En_Fw/z_en_fw.c @@ -1,6 +1,6 @@ #include "z_en_fw.h" -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x00000215 void EnFw_Init(EnFw* this, GlobalContext* globalCtx); @@ -9,8 +9,7 @@ void EnFw_Update(EnFw* this, GlobalContext* globalCtx); void EnFw_Draw(EnFw* this, GlobalContext* globalCtx); /* -const ActorInit En_Fw_InitVars = -{ +const ActorInit En_Fw_InitVars = { ACTOR_EN_FW, ACTORTYPE_ENEMY, ROOM, diff --git a/src/overlays/actors/ovl_En_Fw/z_en_fw.h b/src/overlays/actors/ovl_En_Fw/z_en_fw.h index 498be04158..df3ea6cf74 100644 --- a/src/overlays/actors/ovl_En_Fw/z_en_fw.h +++ b/src/overlays/actors/ovl_En_Fw/z_en_fw.h @@ -4,8 +4,7 @@ #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ Actor actor; /* 0x014C */ char unk_14C[0x5B4]; } EnFw; // size = 0x0700 diff --git a/src/overlays/actors/ovl_En_Fz/z_en_fz.c b/src/overlays/actors/ovl_En_Fz/z_en_fz.c index 763f67783f..9978639d7f 100644 --- a/src/overlays/actors/ovl_En_Fz/z_en_fz.c +++ b/src/overlays/actors/ovl_En_Fz/z_en_fz.c @@ -1,6 +1,6 @@ #include "z_en_fz.h" -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x00000415 void EnFz_Init(EnFz* this, GlobalContext* globalCtx); @@ -9,8 +9,7 @@ void EnFz_Update(EnFz* this, GlobalContext* globalCtx); void EnFz_Draw(EnFz* this, GlobalContext* globalCtx); /* -const ActorInit En_Fz_InitVars = -{ +const ActorInit En_Fz_InitVars = { ACTOR_EN_FZ, ACTORTYPE_ENEMY, ROOM, diff --git a/src/overlays/actors/ovl_En_Fz/z_en_fz.h b/src/overlays/actors/ovl_En_Fz/z_en_fz.h index a174fa5289..2424186a2e 100644 --- a/src/overlays/actors/ovl_En_Fz/z_en_fz.h +++ b/src/overlays/actors/ovl_En_Fz/z_en_fz.h @@ -4,8 +4,7 @@ #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ Actor actor; /* 0x014C */ char unk_14C[0xA88]; } EnFz; // size = 0x0BD4 diff --git a/src/overlays/actors/ovl_En_G_Switch/z_en_g_switch.c b/src/overlays/actors/ovl_En_G_Switch/z_en_g_switch.c index e7034f656e..f871217f70 100644 --- a/src/overlays/actors/ovl_En_G_Switch/z_en_g_switch.c +++ b/src/overlays/actors/ovl_En_G_Switch/z_en_g_switch.c @@ -1,6 +1,6 @@ #include "z_en_g_switch.h" -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x00000030 void EnGSwitch_Init(EnGSwitch* this, GlobalContext* globalCtx); @@ -8,8 +8,7 @@ void EnGSwitch_Destroy(EnGSwitch* this, GlobalContext* globalCtx); void EnGSwitch_Update(EnGSwitch* this, GlobalContext* globalCtx); /* -const ActorInit En_G_Switch_InitVars = -{ +const ActorInit En_G_Switch_InitVars = { ACTOR_EN_G_SWITCH, ACTORTYPE_PROP, ROOM, diff --git a/src/overlays/actors/ovl_En_G_Switch/z_en_g_switch.h b/src/overlays/actors/ovl_En_G_Switch/z_en_g_switch.h index cc39ade23f..9f265dffaa 100644 --- a/src/overlays/actors/ovl_En_G_Switch/z_en_g_switch.h +++ b/src/overlays/actors/ovl_En_G_Switch/z_en_g_switch.h @@ -4,8 +4,7 @@ #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ Actor actor; /* 0x014C */ char unk_14C[0x11AC]; } EnGSwitch; // size = 0x12F8 diff --git a/src/overlays/actors/ovl_En_Ganon_Mant/z_en_ganon_mant.c b/src/overlays/actors/ovl_En_Ganon_Mant/z_en_ganon_mant.c index 1f63663588..171cd39082 100644 --- a/src/overlays/actors/ovl_En_Ganon_Mant/z_en_ganon_mant.c +++ b/src/overlays/actors/ovl_En_Ganon_Mant/z_en_ganon_mant.c @@ -1,6 +1,6 @@ #include "z_en_ganon_mant.h" -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x00000030 void EnGanonMant_Init(EnGanonMant* this, GlobalContext* globalCtx); @@ -9,8 +9,7 @@ void EnGanonMant_Update(EnGanonMant* this, GlobalContext* globalCtx); void EnGanonMant_Draw(EnGanonMant* this, GlobalContext* globalCtx); /* -const ActorInit En_Ganon_Mant_InitVars = -{ +const ActorInit En_Ganon_Mant_InitVars = { ACTOR_EN_GANON_MANT, ACTORTYPE_BOSS, ROOM, diff --git a/src/overlays/actors/ovl_En_Ganon_Mant/z_en_ganon_mant.h b/src/overlays/actors/ovl_En_Ganon_Mant/z_en_ganon_mant.h index e4048f8078..065813074a 100644 --- a/src/overlays/actors/ovl_En_Ganon_Mant/z_en_ganon_mant.h +++ b/src/overlays/actors/ovl_En_Ganon_Mant/z_en_ganon_mant.h @@ -4,8 +4,7 @@ #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ Actor actor; /* 0x014C */ char unk_14C[0x15BC]; } EnGanonMant; // size = 0x1708 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 c24f656ae1..b901238dae 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 @@ -2,18 +2,17 @@ * File: z_en_ganon_organ.c * Overlay: ovl_En_Ganon_Organ * Description: The organ that Ganondorf plays in the cutscene before the fight. Includes carpet and scenery as well. -*/ + */ #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ Actor actor; /* 0x014C */ char unk_14C[0x4]; } EnGanonOrgan; // size = 0x0150 -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x00000030 void EnGanonOrgan_Init(EnGanonOrgan* this, GlobalContext* globalCtx); @@ -21,8 +20,7 @@ void EnGanonOrgan_Destroy(EnGanonOrgan* this, GlobalContext* globalCtx); void EnGanonOrgan_Update(EnGanonOrgan* this, GlobalContext* globalCtx); void EnGanonOrgan_Draw(EnGanonOrgan* this, GlobalContext* globalCtx); -const ActorInit En_Ganon_Organ_InitVars = -{ +const ActorInit En_Ganon_Organ_InitVars = { ACTOR_EN_GANON_ORGAN, ACTORTYPE_BOSS, ROOM, @@ -35,46 +33,38 @@ const ActorInit En_Ganon_Organ_InitVars = (ActorFunc)EnGanonOrgan_Draw, }; -//temp local struct to represent ganondorf, remove when we can reference other overlays -typedef struct -{ +// temp local struct to represent ganondorf, remove when we can reference other overlays +typedef struct { /* 0x0000 */ Actor actor; /* 0x014C */ char unk_14C[0x5CC]; /* 0x0718 */ s16 organFadeTimer; /* 0x071A */ char unk_71A[0x2]; } BossGanon; // size = 0x071C -extern D_80A2CCA8; //remove when data is decompiled -extern D_80A2EAB0; //remove when data is decompiled +extern D_80A2CCA8; // remove when data is decompiled +extern D_80A2EAB0; // remove when data is decompiled -void EnGanonOrgan_Init(EnGanonOrgan* this, GlobalContext* globalCtx) -{ +void EnGanonOrgan_Init(EnGanonOrgan* this, GlobalContext* globalCtx) { this->actor.flags &= ~1; } -void EnGanonOrgan_Destroy(EnGanonOrgan* this, GlobalContext* globalCtx) -{ - +void EnGanonOrgan_Destroy(EnGanonOrgan* this, GlobalContext* globalCtx) { } -void EnGanonOrgan_Update(EnGanonOrgan* this, GlobalContext* globalCtx) -{ +void EnGanonOrgan_Update(EnGanonOrgan* this, GlobalContext* globalCtx) { BossGanon* dorf; osSyncPrintf("ORGAN MOVE 1\n"); - if (this->actor.params == 1) - { + if (this->actor.params == 1) { dorf = (BossGanon*)this->actor.attachedA; - if (dorf->organFadeTimer == 0) - { + if (dorf->organFadeTimer == 0) { Actor_Kill(&this->actor); } } osSyncPrintf("ORGAN MOVE 2\n"); } -Gfx* EnGanonOrgan_EmptyDList(GraphicsContext* gfxCtx) -{ +Gfx* EnGanonOrgan_EmptyDList(GraphicsContext* gfxCtx) { Gfx* displayList; displayList = Graph_Alloc(gfxCtx, sizeof(Gfx)); @@ -82,24 +72,23 @@ Gfx* EnGanonOrgan_EmptyDList(GraphicsContext* gfxCtx) return displayList; } -Gfx* func_80A280BC(GraphicsContext* gfxCtx, BossGanon* dorf) -{ +Gfx* func_80A280BC(GraphicsContext* gfxCtx, BossGanon* dorf) { Gfx* displayList; Gfx* displayListHead; displayList = Graph_Alloc(gfxCtx, 4 * sizeof(Gfx)); displayListHead = displayList; gDPPipeSync(displayListHead++); - do { if (1) { } } while(0); + do { + if (1) {} + } while (0); gDPSetEnvColor(displayListHead++, 0x19, 0x14, 0x00, dorf->organFadeTimer); - gDPSetRenderMode(displayListHead++, AA_EN | Z_CMP | IM_RD | CLR_ON_CVG | - CVG_DST_WRAP | ZMODE_XLU | FORCE_BL | G_RM_FOG_SHADE_A, G_RM_AA_ZB_XLU_SURF2); + gDPSetRenderMode(displayListHead++, G_RM_FOG_SHADE_A, G_RM_AA_ZB_XLU_SURF2); gSPEndDisplayList(displayListHead); return displayList; } -Gfx* func_80A28148(GraphicsContext* gfxCtx, BossGanon* dorf) -{ +Gfx* func_80A28148(GraphicsContext* gfxCtx, BossGanon* dorf) { Gfx* displayList; Gfx* displayListHead; @@ -107,42 +96,39 @@ Gfx* func_80A28148(GraphicsContext* gfxCtx, BossGanon* dorf) displayListHead = displayList; gDPPipeSync(displayListHead++); - do { if (1) { } } while(0); + do { + if (1) {} + } while (0); gDPSetEnvColor(displayListHead++, 0x00, 0x00, 0x00, dorf->organFadeTimer); - gDPSetRenderMode(displayListHead++, AA_EN | Z_CMP | IM_RD | CLR_ON_CVG | - CVG_DST_WRAP | ZMODE_XLU | FORCE_BL | G_RM_FOG_SHADE_A, G_RM_AA_ZB_XLU_SURF2); + gDPSetRenderMode(displayListHead++, G_RM_FOG_SHADE_A, G_RM_AA_ZB_XLU_SURF2); gSPEndDisplayList(displayListHead); return displayList; } -void EnGanonOrgan_Draw(EnGanonOrgan* this, GlobalContext* globalCtx) -{ +void EnGanonOrgan_Draw(EnGanonOrgan* this, GlobalContext* globalCtx) { BossGanon* dorf; u32 pad; GraphicsContext* gfxCtx; - Gfx* gfxArr[3]; + Gfx* dispRefs[3]; dorf = (BossGanon*)this->actor.attachedA; gfxCtx = globalCtx->state.gfxCtx; - func_800C6AC4(&gfxArr, globalCtx->state.gfxCtx, "../z_en_ganon_organ.c", 205); + Graph_OpenDisps(dispRefs, globalCtx->state.gfxCtx, "../z_en_ganon_organ.c", 205); osSyncPrintf("ORGAN DRAW 1\n"); func_80093D18(globalCtx->state.gfxCtx); - if ((this->actor.params == 1) && (dorf->organFadeTimer != 0xff)) - { + if ((this->actor.params == 1) && (dorf->organFadeTimer != 0xff)) { gSPSegment(gfxCtx->polyOpa.p++, 0x08, func_80A280BC(globalCtx->state.gfxCtx, dorf)); gSPSegment(gfxCtx->polyOpa.p++, 0x09, func_80A28148(globalCtx->state.gfxCtx, dorf)); - } - else - { + } else { gSPSegment(gfxCtx->polyOpa.p++, 0x08, EnGanonOrgan_EmptyDList(globalCtx->state.gfxCtx)); gSPSegment(gfxCtx->polyOpa.p++, 0x09, EnGanonOrgan_EmptyDList(globalCtx->state.gfxCtx)); } Matrix_Translate(0.0f, 0.0f, 0.0f, MTXMODE_NEW); gSPMatrix(gfxCtx->polyOpa.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_ganon_organ.c", 221), - G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPDisplayList(gfxCtx->polyOpa.p++, &D_80A2CCA8); gSPDisplayList(gfxCtx->polyOpa.p++, &D_80A2EAB0); osSyncPrintf("ORGAN DRAW 2\n"); - func_800C6B54(gfxArr, globalCtx->state.gfxCtx, "../z_en_ganon_organ.c", 230); + Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_en_ganon_organ.c", 230); } diff --git a/src/overlays/actors/ovl_En_Gb/z_en_gb.c b/src/overlays/actors/ovl_En_Gb/z_en_gb.c index 72cda6cf94..69ef58ef7d 100644 --- a/src/overlays/actors/ovl_En_Gb/z_en_gb.c +++ b/src/overlays/actors/ovl_En_Gb/z_en_gb.c @@ -1,6 +1,6 @@ #include "z_en_gb.h" -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x00000009 void EnGb_Init(EnGb* this, GlobalContext* globalCtx); @@ -9,8 +9,7 @@ void EnGb_Update(EnGb* this, GlobalContext* globalCtx); void EnGb_Draw(EnGb* this, GlobalContext* globalCtx); /* -const ActorInit En_Gb_InitVars = -{ +const ActorInit En_Gb_InitVars = { ACTOR_EN_GB, ACTORTYPE_NPC, ROOM, diff --git a/src/overlays/actors/ovl_En_Gb/z_en_gb.h b/src/overlays/actors/ovl_En_Gb/z_en_gb.h index d9a285fdcb..11d0d4fae8 100644 --- a/src/overlays/actors/ovl_En_Gb/z_en_gb.h +++ b/src/overlays/actors/ovl_En_Gb/z_en_gb.h @@ -4,8 +4,7 @@ #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ Actor actor; /* 0x014C */ char unk_14C[0x2EC]; } EnGb; // size = 0x0438 diff --git a/src/overlays/actors/ovl_En_Ge1/z_en_ge1.c b/src/overlays/actors/ovl_En_Ge1/z_en_ge1.c index 15c97f5e49..9eb5b93903 100644 --- a/src/overlays/actors/ovl_En_Ge1/z_en_ge1.c +++ b/src/overlays/actors/ovl_En_Ge1/z_en_ge1.c @@ -1,6 +1,6 @@ #include "z_en_ge1.h" -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x00000009 void EnGe1_Init(EnGe1* this, GlobalContext* globalCtx); @@ -9,8 +9,7 @@ void EnGe1_Update(EnGe1* this, GlobalContext* globalCtx); void EnGe1_Draw(EnGe1* this, GlobalContext* globalCtx); /* -const ActorInit En_Ge1_InitVars = -{ +const ActorInit En_Ge1_InitVars = { ACTOR_EN_GE1, ACTORTYPE_NPC, ROOM, diff --git a/src/overlays/actors/ovl_En_Ge1/z_en_ge1.h b/src/overlays/actors/ovl_En_Ge1/z_en_ge1.h index a814745388..3b7c60e966 100644 --- a/src/overlays/actors/ovl_En_Ge1/z_en_ge1.h +++ b/src/overlays/actors/ovl_En_Ge1/z_en_ge1.h @@ -4,8 +4,7 @@ #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ Actor actor; /* 0x014C */ char unk_14C[0x170]; } EnGe1; // size = 0x02BC diff --git a/src/overlays/actors/ovl_En_Ge2/z_en_ge2.c b/src/overlays/actors/ovl_En_Ge2/z_en_ge2.c index 86950c46b2..4a9c2e08c6 100644 --- a/src/overlays/actors/ovl_En_Ge2/z_en_ge2.c +++ b/src/overlays/actors/ovl_En_Ge2/z_en_ge2.c @@ -1,6 +1,6 @@ #include "z_en_ge2.h" -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x00000019 void EnGe2_Init(EnGe2* this, GlobalContext* globalCtx); @@ -9,8 +9,7 @@ void EnGe2_Update(EnGe2* this, GlobalContext* globalCtx); void EnGe2_Draw(EnGe2* this, GlobalContext* globalCtx); /* -const ActorInit En_Ge2_InitVars = -{ +const ActorInit En_Ge2_InitVars = { ACTOR_EN_GE2, ACTORTYPE_NPC, ROOM, diff --git a/src/overlays/actors/ovl_En_Ge2/z_en_ge2.h b/src/overlays/actors/ovl_En_Ge2/z_en_ge2.h index 2a3ad727bf..31798fa869 100644 --- a/src/overlays/actors/ovl_En_Ge2/z_en_ge2.h +++ b/src/overlays/actors/ovl_En_Ge2/z_en_ge2.h @@ -4,8 +4,7 @@ #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ Actor actor; /* 0x014C */ char unk_14C[0x1C0]; } EnGe2; // size = 0x030C diff --git a/src/overlays/actors/ovl_En_Ge3/z_en_ge3.c b/src/overlays/actors/ovl_En_Ge3/z_en_ge3.c index 740a9f535c..739372634b 100644 --- a/src/overlays/actors/ovl_En_Ge3/z_en_ge3.c +++ b/src/overlays/actors/ovl_En_Ge3/z_en_ge3.c @@ -1,6 +1,6 @@ #include "z_en_ge3.h" -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x00000019 void EnGe3_Init(EnGe3* this, GlobalContext* globalCtx); @@ -9,8 +9,7 @@ void EnGe3_Update(EnGe3* this, GlobalContext* globalCtx); void EnGe3_Draw(EnGe3* this, GlobalContext* globalCtx); /* -const ActorInit En_Ge3_InitVars = -{ +const ActorInit En_Ge3_InitVars = { ACTOR_EN_GE3, ACTORTYPE_NPC, ROOM, diff --git a/src/overlays/actors/ovl_En_Ge3/z_en_ge3.h b/src/overlays/actors/ovl_En_Ge3/z_en_ge3.h index 0ebc827a3a..746cc1e2a7 100644 --- a/src/overlays/actors/ovl_En_Ge3/z_en_ge3.h +++ b/src/overlays/actors/ovl_En_Ge3/z_en_ge3.h @@ -4,8 +4,7 @@ #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ Actor actor; /* 0x014C */ char unk_14C[0x1C8]; } EnGe3; // size = 0x0314 diff --git a/src/overlays/actors/ovl_En_GeldB/z_en_geldb.c b/src/overlays/actors/ovl_En_GeldB/z_en_geldb.c index 97de2d617d..adcd4d177f 100644 --- a/src/overlays/actors/ovl_En_GeldB/z_en_geldb.c +++ b/src/overlays/actors/ovl_En_GeldB/z_en_geldb.c @@ -1,6 +1,6 @@ #include "z_en_geldb.h" -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x00000015 void EnGeldB_Init(EnGeldB* this, GlobalContext* globalCtx); @@ -9,8 +9,7 @@ void EnGeldB_Update(EnGeldB* this, GlobalContext* globalCtx); void EnGeldB_Draw(EnGeldB* this, GlobalContext* globalCtx); /* -const ActorInit En_GeldB_InitVars = -{ +const ActorInit En_GeldB_InitVars = { ACTOR_EN_GELDB, ACTORTYPE_ENEMY, ROOM, diff --git a/src/overlays/actors/ovl_En_GeldB/z_en_geldb.h b/src/overlays/actors/ovl_En_GeldB/z_en_geldb.h index 743545a8bc..dfc77d4c96 100644 --- a/src/overlays/actors/ovl_En_GeldB/z_en_geldb.h +++ b/src/overlays/actors/ovl_En_GeldB/z_en_geldb.h @@ -4,8 +4,7 @@ #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ Actor actor; /* 0x014C */ char unk_14C[0x398]; } EnGeldB; // size = 0x04E4 diff --git a/src/overlays/actors/ovl_En_GirlA/z_en_girla.c b/src/overlays/actors/ovl_En_GirlA/z_en_girla.c index cde8f017b0..6ada4bc893 100644 --- a/src/overlays/actors/ovl_En_GirlA/z_en_girla.c +++ b/src/overlays/actors/ovl_En_GirlA/z_en_girla.c @@ -1,6 +1,6 @@ #include "z_en_girla.h" -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x00000019 void EnGirlA_Init(EnGirlA* this, GlobalContext* globalCtx); @@ -8,8 +8,7 @@ void EnGirlA_Destroy(EnGirlA* this, GlobalContext* globalCtx); void EnGirlA_Update(EnGirlA* this, GlobalContext* globalCtx); /* -const ActorInit En_GirlA_InitVars = -{ +const ActorInit En_GirlA_InitVars = { ACTOR_EN_GIRLA, ACTORTYPE_PROP, ROOM, diff --git a/src/overlays/actors/ovl_En_GirlA/z_en_girla.h b/src/overlays/actors/ovl_En_GirlA/z_en_girla.h index 106616016e..ee750bd851 100644 --- a/src/overlays/actors/ovl_En_GirlA/z_en_girla.h +++ b/src/overlays/actors/ovl_En_GirlA/z_en_girla.h @@ -4,8 +4,7 @@ #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ Actor actor; /* 0x014C */ char unk_14C[0x88]; } EnGirlA; // size = 0x01D4 diff --git a/src/overlays/actors/ovl_En_Gm/z_en_gm.c b/src/overlays/actors/ovl_En_Gm/z_en_gm.c index 424c8c81ec..c6bc1c6a98 100644 --- a/src/overlays/actors/ovl_En_Gm/z_en_gm.c +++ b/src/overlays/actors/ovl_En_Gm/z_en_gm.c @@ -1,6 +1,6 @@ #include "z_en_gm.h" -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x00000019 void EnGm_Init(EnGm* this, GlobalContext* globalCtx); @@ -8,8 +8,7 @@ void EnGm_Destroy(EnGm* this, GlobalContext* globalCtx); void EnGm_Update(EnGm* this, GlobalContext* globalCtx); /* -const ActorInit En_Gm_InitVars = -{ +const ActorInit En_Gm_InitVars = { ACTOR_EN_GM, ACTORTYPE_NPC, ROOM, diff --git a/src/overlays/actors/ovl_En_Gm/z_en_gm.h b/src/overlays/actors/ovl_En_Gm/z_en_gm.h index f5a2922df2..4c0f3ce9aa 100644 --- a/src/overlays/actors/ovl_En_Gm/z_en_gm.h +++ b/src/overlays/actors/ovl_En_Gm/z_en_gm.h @@ -4,8 +4,7 @@ #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ Actor actor; /* 0x014C */ char unk_14C[0x184]; } EnGm; // size = 0x02D0 diff --git a/src/overlays/actors/ovl_En_Go/z_en_go.c b/src/overlays/actors/ovl_En_Go/z_en_go.c index 4ef81ccb8d..da3f031231 100644 --- a/src/overlays/actors/ovl_En_Go/z_en_go.c +++ b/src/overlays/actors/ovl_En_Go/z_en_go.c @@ -1,6 +1,6 @@ #include "z_en_go.h" -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x00000039 void EnGo_Init(EnGo* this, GlobalContext* globalCtx); @@ -9,8 +9,7 @@ void EnGo_Update(EnGo* this, GlobalContext* globalCtx); void EnGo_Draw(EnGo* this, GlobalContext* globalCtx); /* -const ActorInit En_Go_InitVars = -{ +const ActorInit En_Go_InitVars = { ACTOR_EN_GO, ACTORTYPE_NPC, ROOM, diff --git a/src/overlays/actors/ovl_En_Go/z_en_go.h b/src/overlays/actors/ovl_En_Go/z_en_go.h index 4ba9bd25dc..a29a392d0e 100644 --- a/src/overlays/actors/ovl_En_Go/z_en_go.h +++ b/src/overlays/actors/ovl_En_Go/z_en_go.h @@ -4,8 +4,7 @@ #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ Actor actor; /* 0x014C */ char unk_14C[0x57C]; } EnGo; // size = 0x06C8 diff --git a/src/overlays/actors/ovl_En_Go2/z_en_go2.c b/src/overlays/actors/ovl_En_Go2/z_en_go2.c index e7273e162f..3023d35640 100644 --- a/src/overlays/actors/ovl_En_Go2/z_en_go2.c +++ b/src/overlays/actors/ovl_En_Go2/z_en_go2.c @@ -1,6 +1,6 @@ #include "z_en_go2.h" -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x00000039 void EnGo2_Init(EnGo2* this, GlobalContext* globalCtx); @@ -9,8 +9,7 @@ void EnGo2_Update(EnGo2* this, GlobalContext* globalCtx); void EnGo2_Draw(EnGo2* this, GlobalContext* globalCtx); /* -const ActorInit En_Go2_InitVars = -{ +const ActorInit En_Go2_InitVars = { ACTOR_EN_GO2, ACTORTYPE_NPC, ROOM, diff --git a/src/overlays/actors/ovl_En_Go2/z_en_go2.h b/src/overlays/actors/ovl_En_Go2/z_en_go2.h index 67e0e37025..c0507cd12b 100644 --- a/src/overlays/actors/ovl_En_Go2/z_en_go2.h +++ b/src/overlays/actors/ovl_En_Go2/z_en_go2.h @@ -4,8 +4,7 @@ #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ Actor actor; /* 0x014C */ char unk_14C[0x454]; } EnGo2; // size = 0x05A0 diff --git a/src/overlays/actors/ovl_En_Goma/z_en_goma.c b/src/overlays/actors/ovl_En_Goma/z_en_goma.c index a7195a2257..e9352ab070 100644 --- a/src/overlays/actors/ovl_En_Goma/z_en_goma.c +++ b/src/overlays/actors/ovl_En_Goma/z_en_goma.c @@ -1,6 +1,6 @@ #include "z_en_goma.h" -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x00000035 void EnGoma_Init(EnGoma* this, GlobalContext* globalCtx); @@ -9,8 +9,7 @@ void EnGoma_Update(EnGoma* this, GlobalContext* globalCtx); void EnGoma_Draw(EnGoma* this, GlobalContext* globalCtx); /* -const ActorInit En_Goma_InitVars = -{ +const ActorInit En_Goma_InitVars = { ACTOR_BOSS_GOMA, ACTORTYPE_ENEMY, ROOM, diff --git a/src/overlays/actors/ovl_En_Goma/z_en_goma.h b/src/overlays/actors/ovl_En_Goma/z_en_goma.h index 153a91f12a..23501da8c1 100644 --- a/src/overlays/actors/ovl_En_Goma/z_en_goma.h +++ b/src/overlays/actors/ovl_En_Goma/z_en_goma.h @@ -4,8 +4,7 @@ #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ Actor actor; /* 0x014C */ char unk_14C[0x258]; } EnGoma; // size = 0x03A4 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 5134ac716f..cad9e75fbd 100644 --- a/src/overlays/actors/ovl_En_Goroiwa/z_en_goroiwa.c +++ b/src/overlays/actors/ovl_En_Goroiwa/z_en_goroiwa.c @@ -1,6 +1,6 @@ #include "z_en_goroiwa.h" -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x00000010 void EnGoroiwa_Init(EnGoroiwa* this, GlobalContext* globalCtx); @@ -9,8 +9,7 @@ void EnGoroiwa_Update(EnGoroiwa* this, GlobalContext* globalCtx); void EnGoroiwa_Draw(EnGoroiwa* this, GlobalContext* globalCtx); /* -const ActorInit En_Goroiwa_InitVars = -{ +const ActorInit En_Goroiwa_InitVars = { ACTOR_EN_GOROIWA, ACTORTYPE_PROP, ROOM, diff --git a/src/overlays/actors/ovl_En_Goroiwa/z_en_goroiwa.h b/src/overlays/actors/ovl_En_Goroiwa/z_en_goroiwa.h index 0cd104fa8b..e98804eac5 100644 --- a/src/overlays/actors/ovl_En_Goroiwa/z_en_goroiwa.h +++ b/src/overlays/actors/ovl_En_Goroiwa/z_en_goroiwa.h @@ -4,8 +4,7 @@ #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ Actor actor; /* 0x014C */ char unk_14C[0x88]; } EnGoroiwa; // size = 0x01D4 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 44f0b60af8..a77a3fef79 100644 --- a/src/overlays/actors/ovl_En_Gs/z_en_gs.c +++ b/src/overlays/actors/ovl_En_Gs/z_en_gs.c @@ -1,6 +1,6 @@ #include "z_en_gs.h" -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x02000009 void EnGs_Init(EnGs* this, GlobalContext* globalCtx); @@ -9,8 +9,7 @@ void EnGs_Update(EnGs* this, GlobalContext* globalCtx); void EnGs_Draw(EnGs* this, GlobalContext* globalCtx); /* -const ActorInit En_Gs_InitVars = -{ +const ActorInit En_Gs_InitVars = { ACTOR_EN_GS, ACTORTYPE_PROP, ROOM, diff --git a/src/overlays/actors/ovl_En_Gs/z_en_gs.h b/src/overlays/actors/ovl_En_Gs/z_en_gs.h index 673107fb74..edbb4ac95e 100644 --- a/src/overlays/actors/ovl_En_Gs/z_en_gs.h +++ b/src/overlays/actors/ovl_En_Gs/z_en_gs.h @@ -4,8 +4,7 @@ #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ Actor actor; /* 0x014C */ char unk_14C[0xBC]; } EnGs; // size = 0x0208 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 59588610bf..071a83801f 100644 --- a/src/overlays/actors/ovl_En_Guest/z_en_guest.c +++ b/src/overlays/actors/ovl_En_Guest/z_en_guest.c @@ -1,6 +1,6 @@ #include "z_en_guest.h" -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x00000019 void EnGuest_Init(EnGuest* this, GlobalContext* globalCtx); @@ -8,8 +8,7 @@ void EnGuest_Destroy(EnGuest* this, GlobalContext* globalCtx); void EnGuest_Update(EnGuest* this, GlobalContext* globalCtx); /* -const ActorInit En_Guest_InitVars = -{ +const ActorInit En_Guest_InitVars = { ACTOR_EN_GUEST, ACTORTYPE_NPC, ROOM, diff --git a/src/overlays/actors/ovl_En_Guest/z_en_guest.h b/src/overlays/actors/ovl_En_Guest/z_en_guest.h index 51c27ca385..450012f6d9 100644 --- a/src/overlays/actors/ovl_En_Guest/z_en_guest.h +++ b/src/overlays/actors/ovl_En_Guest/z_en_guest.h @@ -4,8 +4,7 @@ #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ Actor actor; /* 0x014C */ char unk_14C[0x1C4]; } EnGuest; // size = 0x0310 diff --git a/src/overlays/actors/ovl_En_Hata/z_en_hata.c b/src/overlays/actors/ovl_En_Hata/z_en_hata.c index 8191104e12..ec66c0888b 100644 --- a/src/overlays/actors/ovl_En_Hata/z_en_hata.c +++ b/src/overlays/actors/ovl_En_Hata/z_en_hata.c @@ -1,6 +1,6 @@ #include "z_en_hata.h" -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x00000000 void EnHata_Init(EnHata* this, GlobalContext* globalCtx); @@ -9,8 +9,7 @@ void EnHata_Update(EnHata* this, GlobalContext* globalCtx); void EnHata_Draw(EnHata* this, GlobalContext* globalCtx); /* -const ActorInit En_Hata_InitVars = -{ +const ActorInit En_Hata_InitVars = { ACTOR_EN_HATA, ACTORTYPE_PROP, ROOM, diff --git a/src/overlays/actors/ovl_En_Hata/z_en_hata.h b/src/overlays/actors/ovl_En_Hata/z_en_hata.h index fc6fc37bd6..f95f7192ae 100644 --- a/src/overlays/actors/ovl_En_Hata/z_en_hata.h +++ b/src/overlays/actors/ovl_En_Hata/z_en_hata.h @@ -4,8 +4,7 @@ #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ Actor actor; /* 0x014C */ char unk_14C[0x130]; } EnHata; // size = 0x027C diff --git a/src/overlays/actors/ovl_En_Heishi1/z_en_heishi1.c b/src/overlays/actors/ovl_En_Heishi1/z_en_heishi1.c index 5799f22868..b7d547d372 100644 --- a/src/overlays/actors/ovl_En_Heishi1/z_en_heishi1.c +++ b/src/overlays/actors/ovl_En_Heishi1/z_en_heishi1.c @@ -1,6 +1,6 @@ #include "z_en_heishi1.h" -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x00000010 void EnHeishi1_Init(EnHeishi1* this, GlobalContext* globalCtx); @@ -9,8 +9,7 @@ void EnHeishi1_Update(EnHeishi1* this, GlobalContext* globalCtx); void EnHeishi1_Draw(EnHeishi1* this, GlobalContext* globalCtx); /* -const ActorInit En_Heishi1_InitVars = -{ +const ActorInit En_Heishi1_InitVars = { ACTOR_PLAYER, ACTORTYPE_NPC, ROOM, diff --git a/src/overlays/actors/ovl_En_Heishi1/z_en_heishi1.h b/src/overlays/actors/ovl_En_Heishi1/z_en_heishi1.h index a49f8272d3..d6f5cf38b6 100644 --- a/src/overlays/actors/ovl_En_Heishi1/z_en_heishi1.h +++ b/src/overlays/actors/ovl_En_Heishi1/z_en_heishi1.h @@ -4,8 +4,7 @@ #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ Actor actor; /* 0x014C */ char unk_14C[0x160]; } EnHeishi1; // size = 0x02AC 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 a5c256692a..d62494a2ba 100644 --- a/src/overlays/actors/ovl_En_Heishi2/z_en_heishi2.c +++ b/src/overlays/actors/ovl_En_Heishi2/z_en_heishi2.c @@ -1,6 +1,6 @@ #include "z_en_heishi2.h" -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x00000009 void EnHeishi2_Init(EnHeishi2* this, GlobalContext* globalCtx); @@ -9,8 +9,7 @@ void EnHeishi2_Update(EnHeishi2* this, GlobalContext* globalCtx); void EnHeishi2_Draw(EnHeishi2* this, GlobalContext* globalCtx); /* -const ActorInit En_Heishi2_InitVars = -{ +const ActorInit En_Heishi2_InitVars = { ACTOR_EN_HEISHI2, ACTORTYPE_NPC, ROOM, diff --git a/src/overlays/actors/ovl_En_Heishi2/z_en_heishi2.h b/src/overlays/actors/ovl_En_Heishi2/z_en_heishi2.h index 3360f9756b..97e0208bfe 100644 --- a/src/overlays/actors/ovl_En_Heishi2/z_en_heishi2.h +++ b/src/overlays/actors/ovl_En_Heishi2/z_en_heishi2.h @@ -4,8 +4,7 @@ #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ Actor actor; /* 0x014C */ char unk_14C[0x298]; } EnHeishi2; // size = 0x03E4 diff --git a/src/overlays/actors/ovl_En_Heishi3/z_en_heishi3.c b/src/overlays/actors/ovl_En_Heishi3/z_en_heishi3.c index f095edde2c..c47b28b4ed 100644 --- a/src/overlays/actors/ovl_En_Heishi3/z_en_heishi3.c +++ b/src/overlays/actors/ovl_En_Heishi3/z_en_heishi3.c @@ -1,6 +1,6 @@ #include "z_en_heishi3.h" -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x00000000 void EnHeishi3_Init(EnHeishi3* this, GlobalContext* globalCtx); @@ -9,8 +9,7 @@ void EnHeishi3_Update(EnHeishi3* this, GlobalContext* globalCtx); void EnHeishi3_Draw(EnHeishi3* this, GlobalContext* globalCtx); /* -const ActorInit En_Heishi3_InitVars = -{ +const ActorInit En_Heishi3_InitVars = { ACTOR_EN_HEISHI3, ACTORTYPE_NPC, ROOM, diff --git a/src/overlays/actors/ovl_En_Heishi3/z_en_heishi3.h b/src/overlays/actors/ovl_En_Heishi3/z_en_heishi3.h index 8d0b448104..8657e22e0b 100644 --- a/src/overlays/actors/ovl_En_Heishi3/z_en_heishi3.h +++ b/src/overlays/actors/ovl_En_Heishi3/z_en_heishi3.h @@ -4,8 +4,7 @@ #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ Actor actor; /* 0x014C */ char unk_14C[0x17C]; } EnHeishi3; // size = 0x02C8 diff --git a/src/overlays/actors/ovl_En_Heishi4/z_en_heishi4.c b/src/overlays/actors/ovl_En_Heishi4/z_en_heishi4.c index 3a9825bc8a..63ef25296b 100644 --- a/src/overlays/actors/ovl_En_Heishi4/z_en_heishi4.c +++ b/src/overlays/actors/ovl_En_Heishi4/z_en_heishi4.c @@ -1,6 +1,6 @@ #include "z_en_heishi4.h" -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x00000009 void EnHeishi4_Init(EnHeishi4* this, GlobalContext* globalCtx); @@ -9,8 +9,7 @@ void EnHeishi4_Update(EnHeishi4* this, GlobalContext* globalCtx); void EnHeishi4_Draw(EnHeishi4* this, GlobalContext* globalCtx); /* -const ActorInit En_Heishi4_InitVars = -{ +const ActorInit En_Heishi4_InitVars = { ACTOR_EN_HEISHI4, ACTORTYPE_NPC, ROOM, diff --git a/src/overlays/actors/ovl_En_Heishi4/z_en_heishi4.h b/src/overlays/actors/ovl_En_Heishi4/z_en_heishi4.h index f70c1372aa..5030657514 100644 --- a/src/overlays/actors/ovl_En_Heishi4/z_en_heishi4.h +++ b/src/overlays/actors/ovl_En_Heishi4/z_en_heishi4.h @@ -4,8 +4,7 @@ #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ Actor actor; /* 0x014C */ char unk_14C[0x1BC]; } EnHeishi4; // size = 0x0308 diff --git a/src/overlays/actors/ovl_En_Hintnuts/z_en_hintnuts.c b/src/overlays/actors/ovl_En_Hintnuts/z_en_hintnuts.c index 2531f4c74a..a06cc52739 100644 --- a/src/overlays/actors/ovl_En_Hintnuts/z_en_hintnuts.c +++ b/src/overlays/actors/ovl_En_Hintnuts/z_en_hintnuts.c @@ -1,6 +1,6 @@ #include "z_en_hintnuts.h" -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x00000005 void EnHintnuts_Init(EnHintnuts* this, GlobalContext* globalCtx); @@ -9,8 +9,7 @@ void EnHintnuts_Update(EnHintnuts* this, GlobalContext* globalCtx); void EnHintnuts_Draw(EnHintnuts* this, GlobalContext* globalCtx); /* -const ActorInit En_Hintnuts_InitVars = -{ +const ActorInit En_Hintnuts_InitVars = { ACTOR_EN_HINTNUTS, ACTORTYPE_ENEMY, ROOM, diff --git a/src/overlays/actors/ovl_En_Hintnuts/z_en_hintnuts.h b/src/overlays/actors/ovl_En_Hintnuts/z_en_hintnuts.h index c46fb5a236..d04fddf3d7 100644 --- a/src/overlays/actors/ovl_En_Hintnuts/z_en_hintnuts.h +++ b/src/overlays/actors/ovl_En_Hintnuts/z_en_hintnuts.h @@ -4,8 +4,7 @@ #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ Actor actor; /* 0x014C */ char unk_14C[0x114]; } EnHintnuts; // size = 0x0260 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 867f4f8ec4..3d24d7812b 100644 --- a/src/overlays/actors/ovl_En_Holl/z_en_holl.c +++ b/src/overlays/actors/ovl_En_Holl/z_en_holl.c @@ -1,6 +1,6 @@ #include "z_en_holl.h" -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x00000010 void EnHoll_Init(EnHoll* this, GlobalContext* globalCtx); @@ -9,8 +9,7 @@ void EnHoll_Update(EnHoll* this, GlobalContext* globalCtx); void EnHoll_Draw(EnHoll* this, GlobalContext* globalCtx); /* -const ActorInit En_Holl_InitVars = -{ +const ActorInit En_Holl_InitVars = { ACTOR_EN_HOLL, ACTORTYPE_DOOR, ROOM, diff --git a/src/overlays/actors/ovl_En_Holl/z_en_holl.h b/src/overlays/actors/ovl_En_Holl/z_en_holl.h index a67f29af66..dbdc1c46aa 100644 --- a/src/overlays/actors/ovl_En_Holl/z_en_holl.h +++ b/src/overlays/actors/ovl_En_Holl/z_en_holl.h @@ -4,8 +4,7 @@ #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ Actor actor; /* 0x014C */ char unk_14C[0x8]; } EnHoll; // size = 0x0154 diff --git a/src/overlays/actors/ovl_En_Honotrap/z_en_honotrap.c b/src/overlays/actors/ovl_En_Honotrap/z_en_honotrap.c index 0e3230dc45..eb9bd021ea 100644 --- a/src/overlays/actors/ovl_En_Honotrap/z_en_honotrap.c +++ b/src/overlays/actors/ovl_En_Honotrap/z_en_honotrap.c @@ -1,6 +1,6 @@ #include "z_en_honotrap.h" -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x00000010 void EnHonotrap_Init(EnHonotrap* this, GlobalContext* globalCtx); @@ -9,8 +9,7 @@ void EnHonotrap_Update(EnHonotrap* this, GlobalContext* globalCtx); void EnHonotrap_Draw(EnHonotrap* this, GlobalContext* globalCtx); /* -const ActorInit En_Honotrap_InitVars = -{ +const ActorInit En_Honotrap_InitVars = { ACTOR_EN_HONOTRAP, ACTORTYPE_PROP, ROOM, diff --git a/src/overlays/actors/ovl_En_Honotrap/z_en_honotrap.h b/src/overlays/actors/ovl_En_Honotrap/z_en_honotrap.h index 64d6555602..180c02198e 100644 --- a/src/overlays/actors/ovl_En_Honotrap/z_en_honotrap.h +++ b/src/overlays/actors/ovl_En_Honotrap/z_en_honotrap.h @@ -4,8 +4,7 @@ #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ Actor actor; /* 0x014C */ char unk_14C[0xF8]; } EnHonotrap; // size = 0x0244 diff --git a/src/overlays/actors/ovl_En_Horse/z_en_horse.c b/src/overlays/actors/ovl_En_Horse/z_en_horse.c index 9ff037fe2f..6ec7c4c506 100644 --- a/src/overlays/actors/ovl_En_Horse/z_en_horse.c +++ b/src/overlays/actors/ovl_En_Horse/z_en_horse.c @@ -1,6 +1,6 @@ #include "z_en_horse.h" -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x00000010 void EnHorse_Init(EnHorse* this, GlobalContext* globalCtx); @@ -9,8 +9,7 @@ void EnHorse_Update(EnHorse* this, GlobalContext* globalCtx); void EnHorse_Draw(EnHorse* this, GlobalContext* globalCtx); /* -const ActorInit En_Horse_InitVars = -{ +const ActorInit En_Horse_InitVars = { ACTOR_EN_HORSE, ACTORTYPE_BG, ROOM, diff --git a/src/overlays/actors/ovl_En_Horse/z_en_horse.h b/src/overlays/actors/ovl_En_Horse/z_en_horse.h index 50f30d4ff6..d019746285 100644 --- a/src/overlays/actors/ovl_En_Horse/z_en_horse.h +++ b/src/overlays/actors/ovl_En_Horse/z_en_horse.h @@ -4,8 +4,7 @@ #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ Actor actor; /* 0x014C */ char unk_14C[0x2B0]; } EnHorse; // size = 0x03FC diff --git a/src/overlays/actors/ovl_En_Horse_Game_Check/z_en_horse_game_check.c b/src/overlays/actors/ovl_En_Horse_Game_Check/z_en_horse_game_check.c index 5516523617..a90d34cd5b 100644 --- a/src/overlays/actors/ovl_En_Horse_Game_Check/z_en_horse_game_check.c +++ b/src/overlays/actors/ovl_En_Horse_Game_Check/z_en_horse_game_check.c @@ -1,6 +1,6 @@ #include "z_en_horse_game_check.h" -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x00000010 void EnHorseGameCheck_Init(EnHorseGameCheck* this, GlobalContext* globalCtx); @@ -9,8 +9,7 @@ void EnHorseGameCheck_Update(EnHorseGameCheck* this, GlobalContext* globalCtx); void EnHorseGameCheck_Draw(EnHorseGameCheck* this, GlobalContext* globalCtx); /* -const ActorInit En_Horse_Game_Check_InitVars = -{ +const ActorInit En_Horse_Game_Check_InitVars = { ACTOR_EN_HORSE_GAME_CHECK, ACTORTYPE_BG, ROOM, diff --git a/src/overlays/actors/ovl_En_Horse_Game_Check/z_en_horse_game_check.h b/src/overlays/actors/ovl_En_Horse_Game_Check/z_en_horse_game_check.h index 9b166fd014..4b36416149 100644 --- a/src/overlays/actors/ovl_En_Horse_Game_Check/z_en_horse_game_check.h +++ b/src/overlays/actors/ovl_En_Horse_Game_Check/z_en_horse_game_check.h @@ -4,8 +4,7 @@ #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ Actor actor; /* 0x014C */ char unk_14C[0x58]; } EnHorseGameCheck; // size = 0x01A4 diff --git a/src/overlays/actors/ovl_En_Horse_Ganon/z_en_horse_ganon.c b/src/overlays/actors/ovl_En_Horse_Ganon/z_en_horse_ganon.c index a6ebaa483d..5a4f8266f7 100644 --- a/src/overlays/actors/ovl_En_Horse_Ganon/z_en_horse_ganon.c +++ b/src/overlays/actors/ovl_En_Horse_Ganon/z_en_horse_ganon.c @@ -1,6 +1,6 @@ #include "z_en_horse_ganon.h" -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x00000010 void EnHorseGanon_Init(EnHorseGanon* this, GlobalContext* globalCtx); @@ -9,8 +9,7 @@ void EnHorseGanon_Update(EnHorseGanon* this, GlobalContext* globalCtx); void EnHorseGanon_Draw(EnHorseGanon* this, GlobalContext* globalCtx); /* -const ActorInit En_Horse_Ganon_InitVars = -{ +const ActorInit En_Horse_Ganon_InitVars = { ACTOR_EN_HORSE_GANON, ACTORTYPE_BG, ROOM, diff --git a/src/overlays/actors/ovl_En_Horse_Ganon/z_en_horse_ganon.h b/src/overlays/actors/ovl_En_Horse_Ganon/z_en_horse_ganon.h index ba9e941714..dc777e1325 100644 --- a/src/overlays/actors/ovl_En_Horse_Ganon/z_en_horse_ganon.h +++ b/src/overlays/actors/ovl_En_Horse_Ganon/z_en_horse_ganon.h @@ -4,8 +4,7 @@ #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ Actor actor; /* 0x014C */ char unk_14C[0x15C]; } EnHorseGanon; // size = 0x02A8 diff --git a/src/overlays/actors/ovl_En_Horse_Link_Child/z_en_horse_link_child.c b/src/overlays/actors/ovl_En_Horse_Link_Child/z_en_horse_link_child.c index 1daafb990a..8e86242098 100644 --- a/src/overlays/actors/ovl_En_Horse_Link_Child/z_en_horse_link_child.c +++ b/src/overlays/actors/ovl_En_Horse_Link_Child/z_en_horse_link_child.c @@ -1,6 +1,6 @@ #include "z_en_horse_link_child.h" -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x02000010 void EnHorseLinkChild_Init(EnHorseLinkChild* this, GlobalContext* globalCtx); @@ -9,8 +9,7 @@ void EnHorseLinkChild_Update(EnHorseLinkChild* this, GlobalContext* globalCtx); void EnHorseLinkChild_Draw(EnHorseLinkChild* this, GlobalContext* globalCtx); /* -const ActorInit En_Horse_Link_Child_InitVars = -{ +const ActorInit En_Horse_Link_Child_InitVars = { ACTOR_EN_HORSE_LINK_CHILD, ACTORTYPE_BG, ROOM, diff --git a/src/overlays/actors/ovl_En_Horse_Link_Child/z_en_horse_link_child.h b/src/overlays/actors/ovl_En_Horse_Link_Child/z_en_horse_link_child.h index c37c1ef3cf..f4aac29510 100644 --- a/src/overlays/actors/ovl_En_Horse_Link_Child/z_en_horse_link_child.h +++ b/src/overlays/actors/ovl_En_Horse_Link_Child/z_en_horse_link_child.h @@ -4,8 +4,7 @@ #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ Actor actor; /* 0x014C */ char unk_14C[0x158]; } EnHorseLinkChild; // size = 0x02A4 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 cc9a5a4a2d..69ced1610b 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 @@ -1,6 +1,6 @@ #include "z_en_horse_normal.h" -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x00000000 void EnHorseNormal_Init(EnHorseNormal* this, GlobalContext* globalCtx); @@ -9,8 +9,7 @@ void EnHorseNormal_Update(EnHorseNormal* this, GlobalContext* globalCtx); void EnHorseNormal_Draw(EnHorseNormal* this, GlobalContext* globalCtx); /* -const ActorInit En_Horse_Normal_InitVars = -{ +const ActorInit En_Horse_Normal_InitVars = { ACTOR_EN_HORSE_NORMAL, ACTORTYPE_BG, ROOM, diff --git a/src/overlays/actors/ovl_En_Horse_Normal/z_en_horse_normal.h b/src/overlays/actors/ovl_En_Horse_Normal/z_en_horse_normal.h index 7ee00d78ac..bea6647a98 100644 --- a/src/overlays/actors/ovl_En_Horse_Normal/z_en_horse_normal.h +++ b/src/overlays/actors/ovl_En_Horse_Normal/z_en_horse_normal.h @@ -4,8 +4,7 @@ #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ Actor actor; /* 0x014C */ char unk_14C[0x1DC]; } EnHorseNormal; // size = 0x0328 diff --git a/src/overlays/actors/ovl_En_Horse_Zelda/z_en_horse_zelda.c b/src/overlays/actors/ovl_En_Horse_Zelda/z_en_horse_zelda.c index 03ac2db446..7cc04e5435 100644 --- a/src/overlays/actors/ovl_En_Horse_Zelda/z_en_horse_zelda.c +++ b/src/overlays/actors/ovl_En_Horse_Zelda/z_en_horse_zelda.c @@ -1,6 +1,6 @@ #include "z_en_horse_zelda.h" -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x00000010 void EnHorseZelda_Init(EnHorseZelda* this, GlobalContext* globalCtx); @@ -9,8 +9,7 @@ void EnHorseZelda_Update(EnHorseZelda* this, GlobalContext* globalCtx); void EnHorseZelda_Draw(EnHorseZelda* this, GlobalContext* globalCtx); /* -const ActorInit En_Horse_Zelda_InitVars = -{ +const ActorInit En_Horse_Zelda_InitVars = { ACTOR_EN_HORSE_ZELDA, ACTORTYPE_BG, ROOM, diff --git a/src/overlays/actors/ovl_En_Horse_Zelda/z_en_horse_zelda.h b/src/overlays/actors/ovl_En_Horse_Zelda/z_en_horse_zelda.h index 2e050baf3d..e6f4d88736 100644 --- a/src/overlays/actors/ovl_En_Horse_Zelda/z_en_horse_zelda.h +++ b/src/overlays/actors/ovl_En_Horse_Zelda/z_en_horse_zelda.h @@ -4,8 +4,7 @@ #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ Actor actor; /* 0x014C */ char unk_14C[0x15C]; } EnHorseZelda; // size = 0x02A8 diff --git a/src/overlays/actors/ovl_En_Hs/z_en_hs.c b/src/overlays/actors/ovl_En_Hs/z_en_hs.c index bfecaf8fd5..a81eee8b8d 100644 --- a/src/overlays/actors/ovl_En_Hs/z_en_hs.c +++ b/src/overlays/actors/ovl_En_Hs/z_en_hs.c @@ -1,6 +1,6 @@ #include "z_en_hs.h" -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x00000009 void EnHs_Init(EnHs* this, GlobalContext* globalCtx); @@ -9,8 +9,7 @@ void EnHs_Update(EnHs* this, GlobalContext* globalCtx); void EnHs_Draw(EnHs* this, GlobalContext* globalCtx); /* -const ActorInit En_Hs_InitVars = -{ +const ActorInit En_Hs_InitVars = { ACTOR_EN_HS, ACTORTYPE_NPC, ROOM, diff --git a/src/overlays/actors/ovl_En_Hs/z_en_hs.h b/src/overlays/actors/ovl_En_Hs/z_en_hs.h index f8820dcf88..8adc56204a 100644 --- a/src/overlays/actors/ovl_En_Hs/z_en_hs.h +++ b/src/overlays/actors/ovl_En_Hs/z_en_hs.h @@ -4,8 +4,7 @@ #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ Actor actor; /* 0x014C */ char unk_14C[0x164]; } EnHs; // size = 0x02B0 diff --git a/src/overlays/actors/ovl_En_Hs2/z_en_hs2.c b/src/overlays/actors/ovl_En_Hs2/z_en_hs2.c index 374c3fb178..97fb28ea12 100644 --- a/src/overlays/actors/ovl_En_Hs2/z_en_hs2.c +++ b/src/overlays/actors/ovl_En_Hs2/z_en_hs2.c @@ -1,6 +1,6 @@ #include "z_en_hs2.h" -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x00000009 void EnHs2_Init(EnHs2* this, GlobalContext* globalCtx); @@ -9,8 +9,7 @@ void EnHs2_Update(EnHs2* this, GlobalContext* globalCtx); void EnHs2_Draw(EnHs2* this, GlobalContext* globalCtx); /* -const ActorInit En_Hs2_InitVars = -{ +const ActorInit En_Hs2_InitVars = { ACTOR_EN_HS2, ACTORTYPE_NPC, ROOM, diff --git a/src/overlays/actors/ovl_En_Hs2/z_en_hs2.h b/src/overlays/actors/ovl_En_Hs2/z_en_hs2.h index 9bd26e37e9..cf3ff6d6c9 100644 --- a/src/overlays/actors/ovl_En_Hs2/z_en_hs2.h +++ b/src/overlays/actors/ovl_En_Hs2/z_en_hs2.h @@ -4,8 +4,7 @@ #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ Actor actor; /* 0x014C */ char unk_14C[0x164]; } EnHs2; // size = 0x02B0 diff --git a/src/overlays/actors/ovl_En_Hy/z_en_hy.c b/src/overlays/actors/ovl_En_Hy/z_en_hy.c index 5ee36de620..75a6185d87 100644 --- a/src/overlays/actors/ovl_En_Hy/z_en_hy.c +++ b/src/overlays/actors/ovl_En_Hy/z_en_hy.c @@ -1,6 +1,6 @@ #include "z_en_hy.h" -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x00000019 void EnHy_Init(EnHy* this, GlobalContext* globalCtx); @@ -9,8 +9,7 @@ void EnHy_Update(EnHy* this, GlobalContext* globalCtx); void EnHy_Draw(EnHy* this, GlobalContext* globalCtx); /* -const ActorInit En_Hy_InitVars = -{ +const ActorInit En_Hy_InitVars = { ACTOR_EN_HY, ACTORTYPE_NPC, ROOM, diff --git a/src/overlays/actors/ovl_En_Hy/z_en_hy.h b/src/overlays/actors/ovl_En_Hy/z_en_hy.h index 5e0f578195..60c865a8a6 100644 --- a/src/overlays/actors/ovl_En_Hy/z_en_hy.h +++ b/src/overlays/actors/ovl_En_Hy/z_en_hy.h @@ -4,8 +4,7 @@ #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ Actor actor; /* 0x014C */ char unk_14C[0x1E8]; } EnHy; // size = 0x0334 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 496feb0150..2e62e5bc49 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 @@ -1,6 +1,6 @@ #include "z_en_ice_hono.h" -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x00000000 void EnIceHono_Init(EnIceHono* this, GlobalContext* globalCtx); @@ -9,8 +9,7 @@ void EnIceHono_Update(EnIceHono* this, GlobalContext* globalCtx); void EnIceHono_Draw(EnIceHono* this, GlobalContext* globalCtx); /* -const ActorInit En_Ice_Hono_InitVars = -{ +const ActorInit En_Ice_Hono_InitVars = { ACTOR_EN_ICE_HONO, ACTORTYPE_ITEMACTION, ROOM, diff --git a/src/overlays/actors/ovl_En_Ice_Hono/z_en_ice_hono.h b/src/overlays/actors/ovl_En_Ice_Hono/z_en_ice_hono.h index afe286bdfe..064a7ce08a 100644 --- a/src/overlays/actors/ovl_En_Ice_Hono/z_en_ice_hono.h +++ b/src/overlays/actors/ovl_En_Ice_Hono/z_en_ice_hono.h @@ -4,8 +4,7 @@ #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ Actor actor; /* 0x014C */ char unk_14C[0x70]; } EnIceHono; // size = 0x01BC diff --git a/src/overlays/actors/ovl_En_Ik/z_en_ik.c b/src/overlays/actors/ovl_En_Ik/z_en_ik.c index a06da30ed8..8233f73d91 100644 --- a/src/overlays/actors/ovl_En_Ik/z_en_ik.c +++ b/src/overlays/actors/ovl_En_Ik/z_en_ik.c @@ -1,6 +1,6 @@ #include "z_en_ik.h" -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x00000010 void EnIk_Init(EnIk* this, GlobalContext* globalCtx); @@ -9,8 +9,7 @@ void EnIk_Update(EnIk* this, GlobalContext* globalCtx); void EnIk_Draw(EnIk* this, GlobalContext* globalCtx); /* -const ActorInit En_Ik_InitVars = -{ +const ActorInit En_Ik_InitVars = { ACTOR_EN_IK, ACTORTYPE_BOSS, ROOM, @@ -164,4 +163,3 @@ const ActorInit En_Ik_InitVars = #pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A781CC.s") #pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ik/EnIk_Init.s") - diff --git a/src/overlays/actors/ovl_En_Ik/z_en_ik.h b/src/overlays/actors/ovl_En_Ik/z_en_ik.h index bb1699367e..3ccf47aae4 100644 --- a/src/overlays/actors/ovl_En_Ik/z_en_ik.h +++ b/src/overlays/actors/ovl_En_Ik/z_en_ik.h @@ -4,8 +4,7 @@ #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ Actor actor; /* 0x014C */ char unk_14C[0x390]; } EnIk; // size = 0x04DC diff --git a/src/overlays/actors/ovl_En_In/z_en_in.c b/src/overlays/actors/ovl_En_In/z_en_in.c index bacfc6ea32..2617d2aa8a 100644 --- a/src/overlays/actors/ovl_En_In/z_en_in.c +++ b/src/overlays/actors/ovl_En_In/z_en_in.c @@ -1,6 +1,6 @@ #include "z_en_in.h" -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x00000019 void EnIn_Init(EnIn* this, GlobalContext* globalCtx); @@ -9,8 +9,7 @@ void EnIn_Update(EnIn* this, GlobalContext* globalCtx); void EnIn_Draw(EnIn* this, GlobalContext* globalCtx); /* -const ActorInit En_In_InitVars = -{ +const ActorInit En_In_InitVars = { ACTOR_EN_IN, ACTORTYPE_NPC, ROOM, diff --git a/src/overlays/actors/ovl_En_In/z_en_in.h b/src/overlays/actors/ovl_En_In/z_en_in.h index ae29d2173a..a1addb31a3 100644 --- a/src/overlays/actors/ovl_En_In/z_en_in.h +++ b/src/overlays/actors/ovl_En_In/z_en_in.h @@ -4,8 +4,7 @@ #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ Actor actor; /* 0x014C */ char unk_14C[0x25C]; } EnIn; // size = 0x03A8 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 e351674a17..fe931c2774 100644 --- a/src/overlays/actors/ovl_En_Insect/z_en_insect.c +++ b/src/overlays/actors/ovl_En_Insect/z_en_insect.c @@ -1,6 +1,6 @@ #include "z_en_insect.h" -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x00000000 void EnInsect_Init(EnInsect* this, GlobalContext* globalCtx); @@ -9,8 +9,7 @@ void EnInsect_Update(EnInsect* this, GlobalContext* globalCtx); void EnInsect_Draw(EnInsect* this, GlobalContext* globalCtx); /* -const ActorInit En_Insect_InitVars = -{ +const ActorInit En_Insect_InitVars = { ACTOR_EN_INSECT, ACTORTYPE_ITEMACTION, ROOM, diff --git a/src/overlays/actors/ovl_En_Insect/z_en_insect.h b/src/overlays/actors/ovl_En_Insect/z_en_insect.h index a75acd1c25..f077314636 100644 --- a/src/overlays/actors/ovl_En_Insect/z_en_insect.h +++ b/src/overlays/actors/ovl_En_Insect/z_en_insect.h @@ -4,8 +4,7 @@ #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ Actor actor; /* 0x014C */ char unk_14C[0x1E0]; } EnInsect; // size = 0x032C 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 0d5ce67505..4b04945aeb 100644 --- a/src/overlays/actors/ovl_En_Ishi/z_en_ishi.c +++ b/src/overlays/actors/ovl_En_Ishi/z_en_ishi.c @@ -1,6 +1,6 @@ #include "z_en_ishi.h" -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x00800000 void EnIshi_Init(EnIshi* this, GlobalContext* globalCtx); @@ -9,8 +9,7 @@ void EnIshi_Update(EnIshi* this, GlobalContext* globalCtx); void EnIshi_Draw(EnIshi* this, GlobalContext* globalCtx); /* -const ActorInit En_Ishi_InitVars = -{ +const ActorInit En_Ishi_InitVars = { ACTOR_EN_ISHI, ACTORTYPE_PROP, ROOM, diff --git a/src/overlays/actors/ovl_En_Ishi/z_en_ishi.h b/src/overlays/actors/ovl_En_Ishi/z_en_ishi.h index 33dd5d53cc..1d4a2f5d6b 100644 --- a/src/overlays/actors/ovl_En_Ishi/z_en_ishi.h +++ b/src/overlays/actors/ovl_En_Ishi/z_en_ishi.h @@ -4,8 +4,7 @@ #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ Actor actor; /* 0x014C */ char unk_14C[0x50]; } EnIshi; // size = 0x019C diff --git a/src/overlays/actors/ovl_En_It/z_en_it.c b/src/overlays/actors/ovl_En_It/z_en_it.c index 60b2614512..e96f5b1f50 100644 --- a/src/overlays/actors/ovl_En_It/z_en_it.c +++ b/src/overlays/actors/ovl_En_It/z_en_it.c @@ -2,16 +2,15 @@ * File: z_en_it.c * Overlay: ovl_En_It * Description: Dampe's Minigame digging spot hitboxes -*/ + */ #include #include #include -typedef struct -{ - /* 0x0000 */ Actor actor; - /* 0x014C */ u32 unk_14C; +typedef struct { + /* 0x0000 */ Actor actor; + /* 0x014C */ u32 unk_14C; /* 0x0150 */ ColliderCylinderMain cylinderCollider; } ActorIt; // size = 0x019C @@ -22,53 +21,23 @@ static void Init(ActorIt* this, GlobalContext* globalCtx); static void Destroy(ActorIt* this, GlobalContext* globalCtx); static void Update(ActorIt* this, GlobalContext* globalCtx); -static ColliderCylinderInit cylinderInitData = -{ - 0x0A, 0x00, 0x00, 0x05, - 0x10, 0x01, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, - 0x00000000, - 0x00, 0x00, 0x00, 0x00, - 0x00000000, - 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x01, 0x00, - 0x0028, - 0x000A, - 0x00000000000000000000, +static ColliderCylinderInit cylinderInitData = { + 0x0A, 0x00, 0x00, 0x05, 0x10, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00000000, 0x00, 0x00, + 0x00, 0x00, 0x00000000, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0000, 0x0001, 0x0000, 0x0028, 0x000A, 0x0000, }; -static u8 damageTblInitData[] = -{ - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0x00, - 0xFF, - 0x00, - 0x00, - 0x00 +static u8 damageTblInitData[] = { + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0x00, 0x00, 0x00, }; -const ActorInit En_It_InitVars = -{ - ACTOR_EN_IT, - ACTORTYPE_PROP, - ROOM, - FLAGS, - OBJECT_GAMEPLAY_KEEP, - sizeof(ActorIt), - (ActorFunc)Init, - (ActorFunc)Destroy, - (ActorFunc)Update, +const ActorInit En_It_InitVars = { + ACTOR_EN_IT, ACTORTYPE_PROP, ROOM, + FLAGS, OBJECT_GAMEPLAY_KEEP, sizeof(ActorIt), + (ActorFunc)Init, (ActorFunc)Destroy, (ActorFunc)Update, (ActorFunc)NULL, }; -static void Init(ActorIt* this, GlobalContext* globalCtx) -{ +static void Init(ActorIt* this, GlobalContext* globalCtx) { ActorIt* it = this; it->actor.params = 0x0D05; @@ -77,15 +46,13 @@ static void Init(ActorIt* this, GlobalContext* globalCtx) func_80061EFC(&it->actor.sub_98.damageChart, 0, &damageTblInitData); // Init Damage Chart } -static void Destroy(ActorIt* this, GlobalContext* globalCtx) -{ +static void Destroy(ActorIt* this, GlobalContext* globalCtx) { ActorIt* it = this; ActorCollider_FreeCylinder(globalCtx, &it->cylinderCollider); } -static void Update(ActorIt* this, GlobalContext* globalCtx) -{ +static void Update(ActorIt* this, GlobalContext* globalCtx) { s32 pad; ActorIt* it = this; diff --git a/src/overlays/actors/ovl_En_Jj/z_en_jj.c b/src/overlays/actors/ovl_En_Jj/z_en_jj.c index c683a7138d..0e5ea72232 100644 --- a/src/overlays/actors/ovl_En_Jj/z_en_jj.c +++ b/src/overlays/actors/ovl_En_Jj/z_en_jj.c @@ -1,6 +1,6 @@ #include "z_en_jj.h" -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x00000030 void EnJj_Init(EnJj* this, GlobalContext* globalCtx); @@ -9,8 +9,7 @@ void EnJj_Update(EnJj* this, GlobalContext* globalCtx); void EnJj_Draw(EnJj* this, GlobalContext* globalCtx); /* -const ActorInit En_Jj_InitVars = -{ +const ActorInit En_Jj_InitVars = { ACTOR_EN_JJ, ACTORTYPE_ITEMACTION, ROOM, diff --git a/src/overlays/actors/ovl_En_Jj/z_en_jj.h b/src/overlays/actors/ovl_En_Jj/z_en_jj.h index c41ae27dfc..27a95976b1 100644 --- a/src/overlays/actors/ovl_En_Jj/z_en_jj.h +++ b/src/overlays/actors/ovl_En_Jj/z_en_jj.h @@ -4,8 +4,7 @@ #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ Actor actor; /* 0x014C */ char unk_14C[0x1C8]; } EnJj; // size = 0x0314 diff --git a/src/overlays/actors/ovl_En_Js/z_en_js.c b/src/overlays/actors/ovl_En_Js/z_en_js.c index 024b18260d..1e6b1681ad 100644 --- a/src/overlays/actors/ovl_En_Js/z_en_js.c +++ b/src/overlays/actors/ovl_En_Js/z_en_js.c @@ -1,6 +1,6 @@ #include "z_en_js.h" -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x00000009 void EnJs_Init(EnJs* this, GlobalContext* globalCtx); @@ -9,8 +9,7 @@ void EnJs_Update(EnJs* this, GlobalContext* globalCtx); void EnJs_Draw(EnJs* this, GlobalContext* globalCtx); /* -const ActorInit En_Js_InitVars = -{ +const ActorInit En_Js_InitVars = { ACTOR_EN_JS, ACTORTYPE_NPC, ROOM, @@ -54,6 +53,3 @@ const ActorInit En_Js_InitVars = #pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Js/func_80A895F4.s") #pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Js/EnJs_Draw.s") - - - diff --git a/src/overlays/actors/ovl_En_Js/z_en_js.h b/src/overlays/actors/ovl_En_Js/z_en_js.h index 1ffc115b94..c224fd7112 100644 --- a/src/overlays/actors/ovl_En_Js/z_en_js.h +++ b/src/overlays/actors/ovl_En_Js/z_en_js.h @@ -4,8 +4,7 @@ #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ Actor actor; /* 0x014C */ char unk_14C[0x144]; } EnJs; // size = 0x0290 diff --git a/src/overlays/actors/ovl_En_Jsjutan/z_en_jsjutan.c b/src/overlays/actors/ovl_En_Jsjutan/z_en_jsjutan.c index f84d6e45a9..b9c546d2b4 100644 --- a/src/overlays/actors/ovl_En_Jsjutan/z_en_jsjutan.c +++ b/src/overlays/actors/ovl_En_Jsjutan/z_en_jsjutan.c @@ -1,6 +1,6 @@ #include "z_en_jsjutan.h" -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x00000009 void EnJsjutan_Init(EnJsjutan* this, GlobalContext* globalCtx); @@ -9,8 +9,7 @@ void EnJsjutan_Update(EnJsjutan* this, GlobalContext* globalCtx); void EnJsjutan_Draw(EnJsjutan* this, GlobalContext* globalCtx); /* -const ActorInit En_Jsjutan_InitVars = -{ +const ActorInit En_Jsjutan_InitVars = { ACTOR_EN_JSJUTAN, ACTORTYPE_NPC, ROOM, @@ -34,4 +33,3 @@ const ActorInit En_Jsjutan_InitVars = #pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Jsjutan/EnJsjutan_Update.s") #pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Jsjutan/EnJsjutan_Draw.s") - diff --git a/src/overlays/actors/ovl_En_Jsjutan/z_en_jsjutan.h b/src/overlays/actors/ovl_En_Jsjutan/z_en_jsjutan.h index d38b4495b1..f8e824fed7 100644 --- a/src/overlays/actors/ovl_En_Jsjutan/z_en_jsjutan.h +++ b/src/overlays/actors/ovl_En_Jsjutan/z_en_jsjutan.h @@ -4,8 +4,7 @@ #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ Actor actor; /* 0x014C */ char unk_14C[0x2C]; } EnJsjutan; // size = 0x0178 diff --git a/src/overlays/actors/ovl_En_Kakasi/z_en_kakasi.c b/src/overlays/actors/ovl_En_Kakasi/z_en_kakasi.c index e9f9f540ca..40f2f10dcd 100644 --- a/src/overlays/actors/ovl_En_Kakasi/z_en_kakasi.c +++ b/src/overlays/actors/ovl_En_Kakasi/z_en_kakasi.c @@ -1,6 +1,6 @@ #include "z_en_kakasi.h" -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x02000009 void EnKakasi_Init(EnKakasi* this, GlobalContext* globalCtx); @@ -9,8 +9,7 @@ void EnKakasi_Update(EnKakasi* this, GlobalContext* globalCtx); void EnKakasi_Draw(EnKakasi* this, GlobalContext* globalCtx); /* -const ActorInit En_Kakasi_InitVars = -{ +const ActorInit En_Kakasi_InitVars = { ACTOR_EN_KAKASI, ACTORTYPE_NPC, ROOM, diff --git a/src/overlays/actors/ovl_En_Kakasi/z_en_kakasi.h b/src/overlays/actors/ovl_En_Kakasi/z_en_kakasi.h index 915fbb92f9..6e7b67f83a 100644 --- a/src/overlays/actors/ovl_En_Kakasi/z_en_kakasi.h +++ b/src/overlays/actors/ovl_En_Kakasi/z_en_kakasi.h @@ -4,8 +4,7 @@ #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ Actor actor; /* 0x014C */ char unk_14C[0xC0]; } EnKakasi; // size = 0x020C diff --git a/src/overlays/actors/ovl_En_Kakasi2/z_en_kakasi2.c b/src/overlays/actors/ovl_En_Kakasi2/z_en_kakasi2.c index 4305db7488..63ca13aa17 100644 --- a/src/overlays/actors/ovl_En_Kakasi2/z_en_kakasi2.c +++ b/src/overlays/actors/ovl_En_Kakasi2/z_en_kakasi2.c @@ -1,6 +1,6 @@ #include "z_en_kakasi2.h" -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x0A000031 void EnKakasi2_Init(EnKakasi2* this, GlobalContext* globalCtx); @@ -8,8 +8,7 @@ void EnKakasi2_Destroy(EnKakasi2* this, GlobalContext* globalCtx); void EnKakasi2_Update(EnKakasi2* this, GlobalContext* globalCtx); /* -const ActorInit En_Kakasi2_InitVars = -{ +const ActorInit En_Kakasi2_InitVars = { ACTOR_EN_KAKASI2, ACTORTYPE_PROP, ROOM, diff --git a/src/overlays/actors/ovl_En_Kakasi2/z_en_kakasi2.h b/src/overlays/actors/ovl_En_Kakasi2/z_en_kakasi2.h index b14e22f812..21b8e99bcc 100644 --- a/src/overlays/actors/ovl_En_Kakasi2/z_en_kakasi2.h +++ b/src/overlays/actors/ovl_En_Kakasi2/z_en_kakasi2.h @@ -4,8 +4,7 @@ #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ Actor actor; /* 0x014C */ char unk_14C[0xAC]; } EnKakasi2; // size = 0x01F8 diff --git a/src/overlays/actors/ovl_En_Kakasi3/z_en_kakasi3.c b/src/overlays/actors/ovl_En_Kakasi3/z_en_kakasi3.c index 436e79806c..f20570467c 100644 --- a/src/overlays/actors/ovl_En_Kakasi3/z_en_kakasi3.c +++ b/src/overlays/actors/ovl_En_Kakasi3/z_en_kakasi3.c @@ -1,6 +1,6 @@ #include "z_en_kakasi3.h" -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x02000009 void EnKakasi3_Init(EnKakasi3* this, GlobalContext* globalCtx); @@ -9,8 +9,7 @@ void EnKakasi3_Update(EnKakasi3* this, GlobalContext* globalCtx); void EnKakasi3_Draw(EnKakasi3* this, GlobalContext* globalCtx); /* -const ActorInit En_Kakasi3_InitVars = -{ +const ActorInit En_Kakasi3_InitVars = { ACTOR_EN_KAKASI3, ACTORTYPE_NPC, ROOM, diff --git a/src/overlays/actors/ovl_En_Kakasi3/z_en_kakasi3.h b/src/overlays/actors/ovl_En_Kakasi3/z_en_kakasi3.h index 2e5ba888a5..f05a1da965 100644 --- a/src/overlays/actors/ovl_En_Kakasi3/z_en_kakasi3.h +++ b/src/overlays/actors/ovl_En_Kakasi3/z_en_kakasi3.h @@ -4,8 +4,7 @@ #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ Actor actor; /* 0x014C */ char unk_14C[0xC0]; } EnKakasi3; // size = 0x020C diff --git a/src/overlays/actors/ovl_En_Kanban/z_en_kanban.c b/src/overlays/actors/ovl_En_Kanban/z_en_kanban.c index 315958ee33..080967817f 100644 --- a/src/overlays/actors/ovl_En_Kanban/z_en_kanban.c +++ b/src/overlays/actors/ovl_En_Kanban/z_en_kanban.c @@ -1,6 +1,6 @@ #include "z_en_kanban.h" -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x00000019 void EnKanban_Init(EnKanban* this, GlobalContext* globalCtx); @@ -9,8 +9,7 @@ void EnKanban_Update(EnKanban* this, GlobalContext* globalCtx); void EnKanban_Draw(EnKanban* this, GlobalContext* globalCtx); /* -const ActorInit En_Kanban_InitVars = -{ +const ActorInit En_Kanban_InitVars = { ACTOR_EN_KANBAN, ACTORTYPE_PROP, ROOM, diff --git a/src/overlays/actors/ovl_En_Kanban/z_en_kanban.h b/src/overlays/actors/ovl_En_Kanban/z_en_kanban.h index 4571f5db3b..4fcef5126d 100644 --- a/src/overlays/actors/ovl_En_Kanban/z_en_kanban.h +++ b/src/overlays/actors/ovl_En_Kanban/z_en_kanban.h @@ -4,8 +4,7 @@ #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ Actor actor; /* 0x014C */ char unk_14C[0xA0]; } EnKanban; // size = 0x01EC diff --git a/src/overlays/actors/ovl_En_Karebaba/z_en_karebaba.c b/src/overlays/actors/ovl_En_Karebaba/z_en_karebaba.c index 46057f2f48..807cd3c235 100644 --- a/src/overlays/actors/ovl_En_Karebaba/z_en_karebaba.c +++ b/src/overlays/actors/ovl_En_Karebaba/z_en_karebaba.c @@ -1,6 +1,6 @@ #include "z_en_karebaba.h" -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x00000005 void EnKarebaba_Init(EnKarebaba* this, GlobalContext* globalCtx); @@ -9,8 +9,7 @@ void EnKarebaba_Update(EnKarebaba* this, GlobalContext* globalCtx); void EnKarebaba_Draw(EnKarebaba* this, GlobalContext* globalCtx); /* -const ActorInit En_Karebaba_InitVars = -{ +const ActorInit En_Karebaba_InitVars = { ACTOR_EN_KAREBABA, ACTORTYPE_ENEMY, ROOM, diff --git a/src/overlays/actors/ovl_En_Karebaba/z_en_karebaba.h b/src/overlays/actors/ovl_En_Karebaba/z_en_karebaba.h index 3f9f88811a..61bb985245 100644 --- a/src/overlays/actors/ovl_En_Karebaba/z_en_karebaba.h +++ b/src/overlays/actors/ovl_En_Karebaba/z_en_karebaba.h @@ -4,8 +4,7 @@ #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ Actor actor; /* 0x014C */ char unk_14C[0x144]; } EnKarebaba; // size = 0x0290 diff --git a/src/overlays/actors/ovl_En_Ko/z_en_ko.c b/src/overlays/actors/ovl_En_Ko/z_en_ko.c index db1f932ba6..cb84c75994 100644 --- a/src/overlays/actors/ovl_En_Ko/z_en_ko.c +++ b/src/overlays/actors/ovl_En_Ko/z_en_ko.c @@ -1,6 +1,6 @@ #include "z_en_ko.h" -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x00000019 void EnKo_Init(EnKo* this, GlobalContext* globalCtx); @@ -9,8 +9,7 @@ void EnKo_Update(EnKo* this, GlobalContext* globalCtx); void EnKo_Draw(EnKo* this, GlobalContext* globalCtx); /* -const ActorInit En_Ko_InitVars = -{ +const ActorInit En_Ko_InitVars = { ACTOR_EN_KO, ACTORTYPE_NPC, ROOM, diff --git a/src/overlays/actors/ovl_En_Ko/z_en_ko.h b/src/overlays/actors/ovl_En_Ko/z_en_ko.h index 87561ad639..cc6498ddda 100644 --- a/src/overlays/actors/ovl_En_Ko/z_en_ko.h +++ b/src/overlays/actors/ovl_En_Ko/z_en_ko.h @@ -4,8 +4,7 @@ #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ Actor actor; /* 0x014C */ char unk_14C[0x1D8]; } EnKo; // size = 0x0324 diff --git a/src/overlays/actors/ovl_En_Kusa/z_en_kusa.c b/src/overlays/actors/ovl_En_Kusa/z_en_kusa.c index c39532a647..6983341329 100644 --- a/src/overlays/actors/ovl_En_Kusa/z_en_kusa.c +++ b/src/overlays/actors/ovl_En_Kusa/z_en_kusa.c @@ -1,6 +1,6 @@ #include "z_en_kusa.h" -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x00800010 void EnKusa_Init(EnKusa* this, GlobalContext* globalCtx); @@ -8,8 +8,7 @@ void EnKusa_Destroy(EnKusa* this, GlobalContext* globalCtx); void EnKusa_Update(EnKusa* this, GlobalContext* globalCtx); /* -const ActorInit En_Kusa_InitVars = -{ +const ActorInit En_Kusa_InitVars = { ACTOR_EN_KUSA, ACTORTYPE_PROP, ROOM, diff --git a/src/overlays/actors/ovl_En_Kusa/z_en_kusa.h b/src/overlays/actors/ovl_En_Kusa/z_en_kusa.h index 90e846566c..5ab94474c0 100644 --- a/src/overlays/actors/ovl_En_Kusa/z_en_kusa.h +++ b/src/overlays/actors/ovl_En_Kusa/z_en_kusa.h @@ -4,8 +4,7 @@ #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ Actor actor; /* 0x014C */ char unk_14C[0x54]; } EnKusa; // size = 0x01A0 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 5e518d987f..fedd9bfc8c 100644 --- a/src/overlays/actors/ovl_En_Kz/z_en_kz.c +++ b/src/overlays/actors/ovl_En_Kz/z_en_kz.c @@ -1,6 +1,6 @@ #include "z_en_kz.h" -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x00000009 void EnKz_Init(EnKz* this, GlobalContext* globalCtx); @@ -9,8 +9,7 @@ void EnKz_Update(EnKz* this, GlobalContext* globalCtx); void EnKz_Draw(EnKz* this, GlobalContext* globalCtx); /* -const ActorInit En_Kz_InitVars = -{ +const ActorInit En_Kz_InitVars = { ACTOR_EN_KZ, ACTORTYPE_NPC, ROOM, diff --git a/src/overlays/actors/ovl_En_Kz/z_en_kz.h b/src/overlays/actors/ovl_En_Kz/z_en_kz.h index e9564196b4..3ef60df623 100644 --- a/src/overlays/actors/ovl_En_Kz/z_en_kz.h +++ b/src/overlays/actors/ovl_En_Kz/z_en_kz.h @@ -4,8 +4,7 @@ #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ Actor actor; /* 0x014C */ char unk_14C[0x18C]; } EnKz; // size = 0x02D8 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 42558635ff..cc38ff519e 100644 --- a/src/overlays/actors/ovl_En_Light/z_en_light.c +++ b/src/overlays/actors/ovl_En_Light/z_en_light.c @@ -1,6 +1,6 @@ #include "z_en_light.h" -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x00000000 void EnLight_Init(EnLight* this, GlobalContext* globalCtx); @@ -9,8 +9,7 @@ void EnLight_Update(EnLight* this, GlobalContext* globalCtx); void EnLight_Draw(EnLight* this, GlobalContext* globalCtx); /* -const ActorInit En_Light_InitVars = -{ +const ActorInit En_Light_InitVars = { ACTOR_EN_LIGHT, ACTORTYPE_ITEMACTION, ROOM, diff --git a/src/overlays/actors/ovl_En_Light/z_en_light.h b/src/overlays/actors/ovl_En_Light/z_en_light.h index 5ef50d44ee..2cc729a4ef 100644 --- a/src/overlays/actors/ovl_En_Light/z_en_light.h +++ b/src/overlays/actors/ovl_En_Light/z_en_light.h @@ -4,8 +4,7 @@ #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ Actor actor; /* 0x014C */ char unk_14C[0x18]; } EnLight; // size = 0x0164 diff --git a/src/overlays/actors/ovl_En_Lightbox/z_en_lightbox.c b/src/overlays/actors/ovl_En_Lightbox/z_en_lightbox.c index 4ae592df73..e0e30d1932 100644 --- a/src/overlays/actors/ovl_En_Lightbox/z_en_lightbox.c +++ b/src/overlays/actors/ovl_En_Lightbox/z_en_lightbox.c @@ -1,16 +1,20 @@ +/* + * File: z_en_lightbox.c + * Overlay: ovl_En_Lightbox + * Description: + */ + #include "z_en_lightbox.h" -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x00000010 -void EnLightbox_Init(EnLightbox* this, GlobalContext* globalCtx); -void EnLightbox_Destroy(EnLightbox* this, GlobalContext* globalCtx); -void EnLightbox_Update(EnLightbox* this, GlobalContext* globalCtx); -void EnLightbox_Draw(EnLightbox* this, GlobalContext* globalCtx); +static void EnLightbox_Init(EnLightbox* this, GlobalContext* globalCtx); +static void EnLightbox_Destroy(EnLightbox* this, GlobalContext* globalCtx); +static void EnLightbox_Update(EnLightbox* this, GlobalContext* globalCtx); +static void EnLightbox_Draw(EnLightbox* this, GlobalContext* globalCtx); -/* -const ActorInit En_Lightbox_InitVars = -{ +const ActorInit En_Lightbox_InitVars = { ACTOR_EN_LIGHTBOX, ACTORTYPE_PROP, ROOM, @@ -22,11 +26,88 @@ const ActorInit En_Lightbox_InitVars = (ActorFunc)EnLightbox_Update, (ActorFunc)EnLightbox_Draw, }; -*/ -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Lightbox/EnLightbox_Init.s") -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Lightbox/EnLightbox_Destroy.s") +extern u32 D_06000B70; +extern u32 D_06001F10; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Lightbox/EnLightbox_Update.s") +static void EnLightbox_Init(EnLightbox* this, GlobalContext* globalCtx) { + u32 local_c = 0; + Actor* thisx = &this->dyna.actor; + s32 pad[4]; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Lightbox/EnLightbox_Draw.s") + switch (thisx->params) { + case 0: + Actor_SetScale(thisx, 0.025f); + break; + case 1: + Actor_SetScale(thisx, 0.05f); + break; + case 2: + Actor_SetScale(thisx, 0.075f); + break; + case 3: + Actor_SetScale(thisx, 0.1f); + default: + break; + } + + thisx->posRot2.pos = thisx->posRot.pos; + thisx->sub_98.unk_10 = 0x1E; + thisx->sub_98.unk_12 = 0x32; + ActorShape_Init(&thisx->shape, 0.0f, ActorShadow_DrawFunc_Circle, 6.0f); + this->dyna.unk_160 = 0; + this->dyna.unk_15C = 0; + thisx->unk_1F = 0; + thisx->gravity = -2.0f; + DynaPolyInfo_Alloc(&D_06001F10, &local_c); + this->dyna.dynaPolyId = DynaPolyInfo_RegisterActor(globalCtx, &globalCtx->colCtx.dyna, thisx, local_c); +} + +static void EnLightbox_Destroy(EnLightbox* this, GlobalContext* globalCtx) { + DynaPolyInfo_Free(globalCtx, &globalCtx->colCtx.dyna, this->dyna.dynaPolyId); +} + +static void EnLightbox_Update(EnLightbox* this, GlobalContext* globalCtx) { + Actor* thisx = &this->dyna.actor; + + if (this->dyna.unk_162 != 0) { + if (func_8002F5A0(thisx, globalCtx)) { + this->dyna.unk_162 = 0; + } + } else { + if (func_8002F410(thisx, globalCtx)) { + this->dyna.unk_162++; + } else { + if (thisx->speedXZ) { + if (thisx->bgCheckFlags & 8) { + thisx->posRot.rot.y = (thisx->posRot.rot.y + thisx->unk_7E) - thisx->posRot.rot.y; + Audio_PlaySoundGeneral(NA_SE_EV_BOMB_BOUND, &thisx->unk_E4, 4, &D_801333E0, &D_801333E0, + &D_801333E8); + thisx->speedXZ *= 0.7f; + thisx->bgCheckFlags &= ~0x8; + } + } + + if ((thisx->bgCheckFlags & 1) == 0) { + Math_ApproxF(&thisx->speedXZ, 0, IREG(57) / 100.0f); + } else { + Math_ApproxF(&thisx->speedXZ, 0, IREG(58) / 100.0f); + if ((thisx->bgCheckFlags & 2) && (thisx->velocity.y < IREG(59) / 100.0f)) { + Audio_PlaySoundGeneral(NA_SE_EV_BOMB_BOUND, &thisx->unk_E4, 4, &D_801333E0, &D_801333E0, + &D_801333E8); + thisx->velocity.y *= IREG(60) / 100.0f; + thisx->bgCheckFlags &= ~0x1; + } else { + func_8002F580(thisx, globalCtx); + } + } + } + } + Actor_MoveForward(thisx); + func_8002E4B4(globalCtx, thisx, thisx->sub_98.unk_12, thisx->sub_98.unk_10, thisx->sub_98.unk_10, 0x1D); + thisx->posRot2.pos = thisx->posRot.pos; +} + +static void EnLightbox_Draw(EnLightbox* this, GlobalContext* globalCtx) { + Gfx_DrawDListOpa(globalCtx, &D_06000B70); +} diff --git a/src/overlays/actors/ovl_En_Lightbox/z_en_lightbox.h b/src/overlays/actors/ovl_En_Lightbox/z_en_lightbox.h index 29bdf530bb..6da101d0f0 100644 --- a/src/overlays/actors/ovl_En_Lightbox/z_en_lightbox.h +++ b/src/overlays/actors/ovl_En_Lightbox/z_en_lightbox.h @@ -4,10 +4,8 @@ #include #include -typedef struct -{ - /* 0x0000 */ Actor actor; - /* 0x014C */ char unk_14C[0x18]; +typedef struct { + /* 0x0000 */ DynaPolyActor dyna; } EnLightbox; // size = 0x0164 extern const ActorInit En_Lightbox_InitVars; diff --git a/src/overlays/actors/ovl_En_M_Fire1/z_en_m_fire1.c b/src/overlays/actors/ovl_En_M_Fire1/z_en_m_fire1.c index 55ecd36d85..5d4affcf75 100644 --- a/src/overlays/actors/ovl_En_M_Fire1/z_en_m_fire1.c +++ b/src/overlays/actors/ovl_En_M_Fire1/z_en_m_fire1.c @@ -2,86 +2,61 @@ * File: z_en_m_fire1.c * Overlay: ovl_En_M_Fire1 * Description: The attack from a Deku Nut. Spawned by ovl_En_Arrow. -*/ + */ #include #include #include -typedef struct -{ - /* 0x0000 */ Actor actor; +typedef struct { + /* 0x0000 */ Actor actor; /* 0x014C */ ColliderCylinderMain capsule; - /* 0x0198 */ f32 unk_0198; + /* 0x0198 */ f32 unk_0198; } ActorMFire; // size = 0x019C -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x00000000 static void Init(ActorMFire* this, GlobalContext* globalCtx); static void Destroy(ActorMFire* this, GlobalContext* globalCtx); static void Update(ActorMFire* this, GlobalContext* globalCtx); -const ActorInit En_M_Fire1_InitVars = -{ - ACTOR_EN_M_FIRE1, - ACTORTYPE_MISC, - ROOM, - FLAGS, - OBJECT_GAMEPLAY_KEEP, - sizeof(ActorMFire), - (ActorFunc)Init, - (ActorFunc)Destroy, - (ActorFunc)Update, - NULL +const ActorInit En_M_Fire1_InitVars = { + ACTOR_EN_M_FIRE1, ACTORTYPE_MISC, ROOM, FLAGS, OBJECT_GAMEPLAY_KEEP, sizeof(ActorMFire), (ActorFunc)Init, + (ActorFunc)Destroy, (ActorFunc)Update, NULL, }; -static ColliderCylinderInit cylinderInitData = -{ - 0x0A, 0x09, 0x00, 0x00, - 0x08, 0x01, 0x00, 0x00, - 0x02, 0x00, 0x00, 0x00, - 0x00000001, - 0x00, 0x00, 0x00, 0x00, - 0xFFCFFFFF, - 0x00, 0x00, 0x00, 0x00, - 0x19, 0x00, 0x00, 0x00, - 0x00C8, - 0x00C8, - 0x00000000000000000000, +static ColliderCylinderInit cylinderInitData = { + 0x0A, 0x09, 0x00, 0x00, 0x08, 0x01, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00000001, 0x00, 0x00, + 0x00, 0x00, 0xFFCFFFFF, 0x00, 0x00, 0x00, 0x00, 0x19, 0x0000, 0x0000, 0x0000, 0x00C8, 0x00C8, 0x0000, }; -static void Init(ActorMFire* this, GlobalContext* globalCtx) -{ +static void Init(ActorMFire* this, GlobalContext* globalCtx) { s32 pad; ActorMFire* thisLocal; thisLocal = this; - if (this->actor.params < 0) + if (this->actor.params < 0) { Actor_ChangeType(globalCtx, &globalCtx->actorCtx, &thisLocal->actor, ACTORTYPE_ITEMACTION); + } ActorCollider_AllocCylinder(globalCtx, &thisLocal->capsule); ActorCollider_InitCylinder(globalCtx, &thisLocal->capsule, &thisLocal->actor, &cylinderInitData); } -static void Destroy(ActorMFire* this, GlobalContext* globalCtx) -{ +static void Destroy(ActorMFire* this, GlobalContext* globalCtx) { ColliderCylinderMain* capsule = &this->capsule; ActorCollider_FreeCylinder(globalCtx, capsule); } -static void Update(ActorMFire* this, GlobalContext* globalCtx) -{ +static void Update(ActorMFire* this, GlobalContext* globalCtx) { s32 pad; ActorMFire* thisLocal = this; - if (Math_ApproxF(&thisLocal->unk_0198, 1.0, 0.2)) - { + if (Math_ApproxF(&thisLocal->unk_0198, 1.0, 0.2)) { Actor_Kill(&this->actor); - } - else - { + } else { ActorCollider_Cylinder_Update(&thisLocal->actor, &thisLocal->capsule); Actor_CollisionCheck_SetAT(globalCtx, &globalCtx->sub_11E60, &thisLocal->capsule); } diff --git a/src/overlays/actors/ovl_En_M_Thunder/z_en_m_thunder.c b/src/overlays/actors/ovl_En_M_Thunder/z_en_m_thunder.c index c1f2603d52..b5b66a347a 100644 --- a/src/overlays/actors/ovl_En_M_Thunder/z_en_m_thunder.c +++ b/src/overlays/actors/ovl_En_M_Thunder/z_en_m_thunder.c @@ -1,6 +1,6 @@ #include "z_en_m_thunder.h" -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x00000000 void EnMThunder_Init(EnMThunder* this, GlobalContext* globalCtx); @@ -9,8 +9,7 @@ void EnMThunder_Update(EnMThunder* this, GlobalContext* globalCtx); void EnMThunder_Draw(EnMThunder* this, GlobalContext* globalCtx); /* -const ActorInit En_M_Thunder_InitVars = -{ +const ActorInit En_M_Thunder_InitVars = { ACTOR_EN_M_THUNDER, ACTORTYPE_ITEMACTION, ROOM, diff --git a/src/overlays/actors/ovl_En_M_Thunder/z_en_m_thunder.h b/src/overlays/actors/ovl_En_M_Thunder/z_en_m_thunder.h index 971f4826b9..ab3552ef9c 100644 --- a/src/overlays/actors/ovl_En_M_Thunder/z_en_m_thunder.h +++ b/src/overlays/actors/ovl_En_M_Thunder/z_en_m_thunder.h @@ -4,8 +4,7 @@ #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ Actor actor; /* 0x014C */ char unk_14C[0x80]; } EnMThunder; // size = 0x01CC 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 a29f5688ed..56fe512673 100644 --- a/src/overlays/actors/ovl_En_Ma1/z_en_ma1.c +++ b/src/overlays/actors/ovl_En_Ma1/z_en_ma1.c @@ -1,6 +1,6 @@ #include "z_en_ma1.h" -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x02000039 void EnMa1_Init(EnMa1* this, GlobalContext* globalCtx); @@ -9,8 +9,7 @@ void EnMa1_Update(EnMa1* this, GlobalContext* globalCtx); void EnMa1_Draw(EnMa1* this, GlobalContext* globalCtx); /* -const ActorInit En_Ma1_InitVars = -{ +const ActorInit En_Ma1_InitVars = { ACTOR_EN_MA1, ACTORTYPE_NPC, ROOM, diff --git a/src/overlays/actors/ovl_En_Ma1/z_en_ma1.h b/src/overlays/actors/ovl_En_Ma1/z_en_ma1.h index 8df5ea2ccb..16d1c5aead 100644 --- a/src/overlays/actors/ovl_En_Ma1/z_en_ma1.h +++ b/src/overlays/actors/ovl_En_Ma1/z_en_ma1.h @@ -4,8 +4,7 @@ #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ Actor actor; /* 0x014C */ char unk_14C[0xC4]; } EnMa1; // size = 0x0210 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 dd27fe06f1..6728ff6d34 100644 --- a/src/overlays/actors/ovl_En_Ma2/z_en_ma2.c +++ b/src/overlays/actors/ovl_En_Ma2/z_en_ma2.c @@ -1,6 +1,6 @@ #include "z_en_ma2.h" -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x02000039 void EnMa2_Init(EnMa2* this, GlobalContext* globalCtx); @@ -9,8 +9,7 @@ void EnMa2_Update(EnMa2* this, GlobalContext* globalCtx); void EnMa2_Draw(EnMa2* this, GlobalContext* globalCtx); /* -const ActorInit En_Ma2_InitVars = -{ +const ActorInit En_Ma2_InitVars = { ACTOR_EN_MA2, ACTORTYPE_NPC, ROOM, diff --git a/src/overlays/actors/ovl_En_Ma2/z_en_ma2.h b/src/overlays/actors/ovl_En_Ma2/z_en_ma2.h index faeb94e31a..456fe9e86a 100644 --- a/src/overlays/actors/ovl_En_Ma2/z_en_ma2.h +++ b/src/overlays/actors/ovl_En_Ma2/z_en_ma2.h @@ -4,8 +4,7 @@ #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ Actor actor; /* 0x014C */ char unk_14C[0x138]; } EnMa2; // size = 0x0284 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 927a914fd0..87c01eff48 100644 --- a/src/overlays/actors/ovl_En_Ma3/z_en_ma3.c +++ b/src/overlays/actors/ovl_En_Ma3/z_en_ma3.c @@ -1,6 +1,6 @@ #include "z_en_ma3.h" -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x00000039 void EnMa3_Init(EnMa3* this, GlobalContext* globalCtx); @@ -9,8 +9,7 @@ void EnMa3_Update(EnMa3* this, GlobalContext* globalCtx); void EnMa3_Draw(EnMa3* this, GlobalContext* globalCtx); /* -const ActorInit En_Ma3_InitVars = -{ +const ActorInit En_Ma3_InitVars = { ACTOR_EN_MA3, ACTORTYPE_NPC, ROOM, diff --git a/src/overlays/actors/ovl_En_Ma3/z_en_ma3.h b/src/overlays/actors/ovl_En_Ma3/z_en_ma3.h index b014fbc42d..1771ccc14c 100644 --- a/src/overlays/actors/ovl_En_Ma3/z_en_ma3.h +++ b/src/overlays/actors/ovl_En_Ma3/z_en_ma3.h @@ -4,8 +4,7 @@ #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ Actor actor; /* 0x014C */ char unk_14C[0x138]; } EnMa3; // size = 0x0284 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 483dcef84f..a763911bf6 100644 --- a/src/overlays/actors/ovl_En_Mag/z_en_mag.c +++ b/src/overlays/actors/ovl_En_Mag/z_en_mag.c @@ -1,6 +1,6 @@ #include "z_en_mag.h" -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x00000030 void EnMag_Init(EnMag* this, GlobalContext* globalCtx); @@ -9,8 +9,7 @@ void EnMag_Update(EnMag* this, GlobalContext* globalCtx); void EnMag_Draw(EnMag* this, GlobalContext* globalCtx); /* -const ActorInit En_Mag_InitVars = -{ +const ActorInit En_Mag_InitVars = { ACTOR_EN_MAG, ACTORTYPE_PROP, ROOM, diff --git a/src/overlays/actors/ovl_En_Mag/z_en_mag.h b/src/overlays/actors/ovl_En_Mag/z_en_mag.h index a5f6b88997..77e0b361ab 100644 --- a/src/overlays/actors/ovl_En_Mag/z_en_mag.h +++ b/src/overlays/actors/ovl_En_Mag/z_en_mag.h @@ -4,8 +4,7 @@ #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ Actor actor; /* 0x014C */ char unk_14C[0xE1DC]; } EnMag; // size = 0xE328 diff --git a/src/overlays/actors/ovl_En_Mb/z_en_mb.c b/src/overlays/actors/ovl_En_Mb/z_en_mb.c index 634f63f97e..94451d199e 100644 --- a/src/overlays/actors/ovl_En_Mb/z_en_mb.c +++ b/src/overlays/actors/ovl_En_Mb/z_en_mb.c @@ -1,6 +1,6 @@ #include "z_en_mb.h" -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x00000015 void EnMb_Init(EnMb* this, GlobalContext* globalCtx); @@ -9,8 +9,7 @@ void EnMb_Update(EnMb* this, GlobalContext* globalCtx); void EnMb_Draw(EnMb* this, GlobalContext* globalCtx); /* -const ActorInit En_Mb_InitVars = -{ +const ActorInit En_Mb_InitVars = { ACTOR_EN_MB, ACTORTYPE_ENEMY, ROOM, diff --git a/src/overlays/actors/ovl_En_Mb/z_en_mb.h b/src/overlays/actors/ovl_En_Mb/z_en_mb.h index ed4a0796f5..49171df5d7 100644 --- a/src/overlays/actors/ovl_En_Mb/z_en_mb.h +++ b/src/overlays/actors/ovl_En_Mb/z_en_mb.h @@ -4,8 +4,7 @@ #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ Actor actor; /* 0x014C */ char unk_14C[0x3C0]; } EnMb; // size = 0x050C 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 b72b739fad..1dd9c3cfe4 100644 --- a/src/overlays/actors/ovl_En_Md/z_en_md.c +++ b/src/overlays/actors/ovl_En_Md/z_en_md.c @@ -1,6 +1,6 @@ #include "z_en_md.h" -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x02000019 void EnMd_Init(EnMd* this, GlobalContext* globalCtx); @@ -9,8 +9,7 @@ void EnMd_Update(EnMd* this, GlobalContext* globalCtx); void EnMd_Draw(EnMd* this, GlobalContext* globalCtx); /* -const ActorInit En_Md_InitVars = -{ +const ActorInit En_Md_InitVars = { ACTOR_EN_MD, ACTORTYPE_NPC, ROOM, diff --git a/src/overlays/actors/ovl_En_Md/z_en_md.h b/src/overlays/actors/ovl_En_Md/z_en_md.h index 7b20229f05..1da1f5d22c 100644 --- a/src/overlays/actors/ovl_En_Md/z_en_md.h +++ b/src/overlays/actors/ovl_En_Md/z_en_md.h @@ -4,8 +4,7 @@ #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ Actor actor; /* 0x014C */ char unk_14C[0x1D8]; } EnMd; // size = 0x0324 diff --git a/src/overlays/actors/ovl_En_Mk/z_en_mk.c b/src/overlays/actors/ovl_En_Mk/z_en_mk.c index da0c4c0b79..795f8d1ea4 100644 --- a/src/overlays/actors/ovl_En_Mk/z_en_mk.c +++ b/src/overlays/actors/ovl_En_Mk/z_en_mk.c @@ -1,6 +1,6 @@ #include "z_en_mk.h" -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x00000019 void EnMk_Init(EnMk* this, GlobalContext* globalCtx); @@ -9,8 +9,7 @@ void EnMk_Update(EnMk* this, GlobalContext* globalCtx); void EnMk_Draw(EnMk* this, GlobalContext* globalCtx); /* -const ActorInit En_Mk_InitVars = -{ +const ActorInit En_Mk_InitVars = { ACTOR_EN_MK, ACTORTYPE_NPC, ROOM, diff --git a/src/overlays/actors/ovl_En_Mk/z_en_mk.h b/src/overlays/actors/ovl_En_Mk/z_en_mk.h index b636ac3ce2..0a090eff9f 100644 --- a/src/overlays/actors/ovl_En_Mk/z_en_mk.h +++ b/src/overlays/actors/ovl_En_Mk/z_en_mk.h @@ -4,8 +4,7 @@ #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ Actor actor; /* 0x014C */ char unk_14C[0x13C]; } EnMk; // size = 0x0288 diff --git a/src/overlays/actors/ovl_En_Mm/z_en_mm.c b/src/overlays/actors/ovl_En_Mm/z_en_mm.c index 11dd6370a6..7e70419f40 100644 --- a/src/overlays/actors/ovl_En_Mm/z_en_mm.c +++ b/src/overlays/actors/ovl_En_Mm/z_en_mm.c @@ -1,6 +1,6 @@ #include "z_en_mm.h" -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x00000019 void EnMm_Init(EnMm* this, GlobalContext* globalCtx); @@ -9,8 +9,7 @@ void EnMm_Update(EnMm* this, GlobalContext* globalCtx); void EnMm_Draw(EnMm* this, GlobalContext* globalCtx); /* -const ActorInit En_Mm_InitVars = -{ +const ActorInit En_Mm_InitVars = { ACTOR_EN_MM, ACTORTYPE_NPC, ROOM, diff --git a/src/overlays/actors/ovl_En_Mm/z_en_mm.h b/src/overlays/actors/ovl_En_Mm/z_en_mm.h index b9bc8f713b..405ed9fd46 100644 --- a/src/overlays/actors/ovl_En_Mm/z_en_mm.h +++ b/src/overlays/actors/ovl_En_Mm/z_en_mm.h @@ -4,8 +4,7 @@ #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ Actor actor; /* 0x014C */ char unk_14C[0x1D4]; } EnMm; // size = 0x0320 diff --git a/src/overlays/actors/ovl_En_Mm2/z_en_mm2.c b/src/overlays/actors/ovl_En_Mm2/z_en_mm2.c index 50ad29a779..9f6773a8f1 100644 --- a/src/overlays/actors/ovl_En_Mm2/z_en_mm2.c +++ b/src/overlays/actors/ovl_En_Mm2/z_en_mm2.c @@ -1,6 +1,6 @@ #include "z_en_mm2.h" -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x00000019 void EnMm2_Init(EnMm2* this, GlobalContext* globalCtx); @@ -9,8 +9,7 @@ void EnMm2_Update(EnMm2* this, GlobalContext* globalCtx); void EnMm2_Draw(EnMm2* this, GlobalContext* globalCtx); /* -const ActorInit En_Mm2_InitVars = -{ +const ActorInit En_Mm2_InitVars = { ACTOR_EN_MM2, ACTORTYPE_NPC, ROOM, diff --git a/src/overlays/actors/ovl_En_Mm2/z_en_mm2.h b/src/overlays/actors/ovl_En_Mm2/z_en_mm2.h index 27ce017292..700c18a6c1 100644 --- a/src/overlays/actors/ovl_En_Mm2/z_en_mm2.h +++ b/src/overlays/actors/ovl_En_Mm2/z_en_mm2.h @@ -4,8 +4,7 @@ #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ Actor actor; /* 0x014C */ char unk_14C[0x170]; } EnMm2; // size = 0x02BC diff --git a/src/overlays/actors/ovl_En_Ms/dlists.c b/src/overlays/actors/ovl_En_Ms/dlists.c index 356c05d216..d3229c2483 100644 --- a/src/overlays/actors/ovl_En_Ms/dlists.c +++ b/src/overlays/actors/ovl_En_Ms/dlists.c @@ -1,3 +1 @@ #include "dlists.h" - - diff --git a/src/overlays/actors/ovl_En_Ms/z_en_ms.c b/src/overlays/actors/ovl_En_Ms/z_en_ms.c index 3c20bd1b1b..44ae6dae29 100644 --- a/src/overlays/actors/ovl_En_Ms/z_en_ms.c +++ b/src/overlays/actors/ovl_En_Ms/z_en_ms.c @@ -2,16 +2,14 @@ * File: z_en_ms.c * Overlay: ovl_En_Ms * Description: Magic Bean Salesman -*/ + */ #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ Actor actor; /* 0x014C */ SkelAnime skelAnime; - /* 0x018C */ char unk_18C[0x4]; /* 0x0190 */ UNK_PTR unkSkelAnimeStruct; /* 0x0194 */ char unk_194[0x32]; /* 0x01C6 */ s16 unk_1C6; @@ -21,7 +19,7 @@ typedef struct /* 0x024C */ s16 activeTimer; } EnMs; // size = 0x0250 -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x00000009 static void EnMs_SetOfferText(EnMs* this, GlobalContext* globalCtx); @@ -34,8 +32,7 @@ static void EnMs_TalkAfterBuy(EnMs* this, GlobalContext* globalCtx); static void EnMs_Update(EnMs* this, GlobalContext* globalCtx); static void EnMs_Draw(EnMs* this, GlobalContext* globalCtx); -const ActorInit En_Ms_InitVars = -{ +const ActorInit En_Ms_InitVars = { ACTOR_EN_MS, ACTORTYPE_NPC, ROOM, @@ -48,63 +45,49 @@ const ActorInit En_Ms_InitVars = (ActorFunc)EnMs_Draw, }; -static s32 unk_col_80AB0320[] = -{ -0x0A000939, 0x01000000, -0x00000000, 0x00000000, -0x00000000, 0xFFCFFFFF, -0x00000000, 0x00010100, -0x00160025, 0x00000000, -0x00000000 +static s32 unk_col_80AB0320[] = { + 0x0A000939, 0x01000000, 0x00000000, 0x00000000, 0x00000000, 0xFFCFFFFF, + 0x00000000, 0x00010100, 0x00160025, 0x00000000, 0x00000000, }; -static s16 prices[] = -{ - 10, 20, 30, 40, 50, 60, 70, 80, 90, 100 +static s16 prices[] = { + 10, 20, 30, 40, 50, 60, 70, 80, 90, 100, }; -static u16 offerTextIds[] = -{ - 0x405E, 0x405F, 0x4060, 0x4061, 0x4062, - 0x4063, 0x4064, 0x4065, 0x4066, 0x4067 +static u16 offerTextIds[] = { + 0x405E, 0x405F, 0x4060, 0x4061, 0x4062, 0x4063, 0x4064, 0x4065, 0x4066, 0x4067, }; -static InitChainEntry initChain[] = -{ +static InitChainEntry initChain[] = { ICHAIN_U8(unk_1F, 2, ICHAIN_CONTINUE), - ICHAIN_F32(unk_4C, 500, ICHAIN_STOP) + ICHAIN_F32(unk_4C, 500, ICHAIN_STOP), }; -extern D_060005EC; -extern D_06003DC0; +extern AnimationHeader D_060005EC; +extern SkeletonHeader D_06003DC0; -static void EnMs_SetOfferText(EnMs* this, GlobalContext* globalCtx) -{ - this->actor.textId = func_8006C360(globalCtx, 0x1B); - if (this->actor.textId == 0) - { - if (BEANS_BOUGHT >= 10) - { +static void EnMs_SetOfferText(EnMs* this, GlobalContext* globalCtx) { + this->actor.textId = Text_GetFaceReaction(globalCtx, 0x1B); + if (this->actor.textId == 0) { + if (BEANS_BOUGHT >= 10) { this->actor.textId = 0x406B; - return; + } else { + this->actor.textId = offerTextIds[BEANS_BOUGHT]; } - this->actor.textId = offerTextIds[BEANS_BOUGHT]; } } -static void EnMs_Init(EnMs* this, GlobalContext* globalCtx) -{ +static void EnMs_Init(EnMs* this, GlobalContext* globalCtx) { s32 pad1; s32 pad2; - if (LINK_AGE_IN_YEARS != YEARS_CHILD) - { + if (LINK_AGE_IN_YEARS != YEARS_CHILD) { Actor_Kill(&this->actor); return; } Actor_ProcessInitChain(&this->actor, initChain); - func_800A46F8(globalCtx, &this->skelAnime, &D_06003DC0, &D_060005EC, - &this->unkSkelAnimeStruct, &this->unk_1C6, 9); //skelanime_mtx_init + SkelAnime_InitSV(globalCtx, &this->skelAnime, &D_06003DC0, &D_060005EC, &this->unkSkelAnimeStruct, &this->unk_1C6, + 9); ActorCollider_AllocCylinder(globalCtx, &this->collider); func_8005C450(globalCtx, &this->collider, this, &unk_col_80AB0320); ActorShape_Init(&this->actor.shape, 0.0f, ActorShadow_DrawFunc_Circle, 35.0f); @@ -120,70 +103,57 @@ static void EnMs_Init(EnMs* this, GlobalContext* globalCtx) this->actionFunc = EnMs_Wait; } -static void EnMs_Destroy(EnMs* this, GlobalContext* globalCtx) -{ +static void EnMs_Destroy(EnMs* this, GlobalContext* globalCtx) { ColliderCylinderMain* collider = &this->collider; ActorCollider_FreeCylinder(globalCtx, collider); } -static void EnMs_Wait(EnMs* this, GlobalContext* globalCtx) -{ +static void EnMs_Wait(EnMs* this, GlobalContext* globalCtx) { s16 unkAngle; unkAngle = this->actor.rotTowardsLinkY - this->actor.shape.rot.y; EnMs_SetOfferText(&this->actor, globalCtx); - if (func_8002F194(&this->actor, globalCtx) != 0) //if talk is initiated - { + if (func_8002F194(&this->actor, globalCtx) != 0) { // if talk is initiated this->actionFunc = &EnMs_Talk; return; } - if ((this->actor.xzDistanceFromLink < 90.0f) && (ABS(unkAngle) < 0x2000)) //talk range - { + if ((this->actor.xzDistanceFromLink < 90.0f) && (ABS(unkAngle) < 0x2000)) { // talk range func_8002F2CC(&this->actor, globalCtx, 90.0f); } } -static void EnMs_Talk(EnMs* this, GlobalContext* globalCtx) -{ +static void EnMs_Talk(EnMs* this, GlobalContext* globalCtx) { u8 dialogState; dialogState = func_8010BDBC(&globalCtx->msgCtx); - if (dialogState != 4) - { - if ((dialogState == 6) && (func_80106BC8(globalCtx) != 0)) //advanced final textbox - { + if (dialogState != 4) { + if ((dialogState == 6) && (func_80106BC8(globalCtx) != 0)) { // advanced final textbox this->actionFunc = &EnMs_Wait; } - } - else - { - if(func_80106BC8(globalCtx) != 0) - { - switch (globalCtx->msgCtx.choiceIndex) - { - case 0: //yes - if (gSaveContext.rupees < prices[BEANS_BOUGHT]) - { - func_8010B720(globalCtx, 0x4069); //not enough rupees text + } else { + if (func_80106BC8(globalCtx) != 0) { + switch (globalCtx->msgCtx.choiceIndex) { + case 0: // yes + if (gSaveContext.rupees < prices[BEANS_BOUGHT]) { + func_8010B720(globalCtx, 0x4069); // not enough rupees text return; } func_8002F434(&this->actor, globalCtx, GI_BEAN, 90.0f, 10.0f); this->actionFunc = &EnMs_Sell; return; - case 1: //no + case 1: // no func_8010B720(globalCtx, 0x4068); - default: return; + default: + return; } } } } -static void EnMs_Sell(EnMs* this, GlobalContext* globalCtx) -{ - if (func_8002F410(&this->actor, globalCtx) != 0) //if attached is set - { - Rupees_ChangeBy(-prices[BEANS_BOUGHT]); //decrease ruppees +static void EnMs_Sell(EnMs* this, GlobalContext* globalCtx) { + if (func_8002F410(&this->actor, globalCtx) != 0) { // if attached is set + Rupees_ChangeBy(-prices[BEANS_BOUGHT]); // decrease ruppees this->actor.attachedA = NULL; this->actionFunc = &EnMs_TalkAfterBuy; return; @@ -191,18 +161,15 @@ static void EnMs_Sell(EnMs* this, GlobalContext* globalCtx) func_8002F434(&this->actor, globalCtx, GI_BEAN, 90.0f, 10.0f); } -static void EnMs_TalkAfterBuy(EnMs* this, GlobalContext* globalCtx) -{ - //if dialog state is 6 and player responded to textbox - if ((func_8010BDBC(&globalCtx->msgCtx)) == 6 && (func_80106BC8(globalCtx) != 0)) - { +static void EnMs_TalkAfterBuy(EnMs* this, GlobalContext* globalCtx) { + // if dialog state is 6 and player responded to textbox + if ((func_8010BDBC(&globalCtx->msgCtx)) == 6 && (func_80106BC8(globalCtx) != 0)) { func_8010B720(globalCtx, 0x406C); this->actionFunc = &EnMs_Talk; } } -static void EnMs_Update(EnMs* this, GlobalContext* globalCtx) -{ +static void EnMs_Update(EnMs* this, GlobalContext* globalCtx) { s32 pad1; s32 pad2; @@ -213,8 +180,7 @@ static void EnMs_Update(EnMs* this, GlobalContext* globalCtx) SkelAnime_FrameUpdateMatrix(&this->skelAnime); this->actionFunc(this, globalCtx); - if (gSaveContext.entrance_index == 0x157 && gSaveContext.scene_setup_index == 8) //ride carpet if in credits - { + if (gSaveContext.entrance_index == 0x157 && gSaveContext.scene_setup_index == 8) { // ride carpet if in credits Actor_MoveForward(&this->actor); osSyncPrintf("OOOHHHHHH %f\n", this->actor.velocity.y); func_8002E4B4(globalCtx, &this->actor, 0.0f, 0.0f, 0.0f, 4); @@ -223,9 +189,8 @@ static void EnMs_Update(EnMs* this, GlobalContext* globalCtx) Actor_CollisionCheck_SetOT(globalCtx, &globalCtx->sub_11E60, &this->collider); } -void EnMs_Draw(EnMs* this, GlobalContext* globalCtx) -{ +void EnMs_Draw(EnMs* this, GlobalContext* globalCtx) { func_80093D18(globalCtx->state.gfxCtx); - func_800A1AC8(globalCtx, this->skelAnime.limbIndex, this->skelAnime.actorDrawTbl, - this->skelAnime.dListCount, 0, 0, &this->actor); + SkelAnime_DrawSV(globalCtx, this->skelAnime.skeleton, this->skelAnime.actorDrawTbl, this->skelAnime.dListCount, + NULL, NULL, &this->actor); } diff --git a/src/overlays/actors/ovl_En_Mu/z_en_mu.c b/src/overlays/actors/ovl_En_Mu/z_en_mu.c index 003f40e92b..cf0a64bc0e 100644 --- a/src/overlays/actors/ovl_En_Mu/z_en_mu.c +++ b/src/overlays/actors/ovl_En_Mu/z_en_mu.c @@ -1,6 +1,6 @@ #include "z_en_mu.h" -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x00000009 void EnMu_Init(EnMu* this, GlobalContext* globalCtx); @@ -9,8 +9,7 @@ void EnMu_Update(EnMu* this, GlobalContext* globalCtx); void EnMu_Draw(EnMu* this, GlobalContext* globalCtx); /* -const ActorInit En_Mu_InitVars = -{ +const ActorInit En_Mu_InitVars = { ACTOR_EN_MU, ACTORTYPE_NPC, ROOM, diff --git a/src/overlays/actors/ovl_En_Mu/z_en_mu.h b/src/overlays/actors/ovl_En_Mu/z_en_mu.h index 12236c7c1d..f8a1fd4c08 100644 --- a/src/overlays/actors/ovl_En_Mu/z_en_mu.h +++ b/src/overlays/actors/ovl_En_Mu/z_en_mu.h @@ -4,8 +4,7 @@ #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ Actor actor; /* 0x014C */ char unk_14C[0x100]; } EnMu; // size = 0x024C diff --git a/src/overlays/actors/ovl_En_Nb/z_en_nb.c b/src/overlays/actors/ovl_En_Nb/z_en_nb.c index 9fb939c914..f864f9f25c 100644 --- a/src/overlays/actors/ovl_En_Nb/z_en_nb.c +++ b/src/overlays/actors/ovl_En_Nb/z_en_nb.c @@ -1,6 +1,6 @@ #include "z_en_nb.h" -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x00000010 void EnNb_Init(EnNb* this, GlobalContext* globalCtx); @@ -9,8 +9,7 @@ void EnNb_Update(EnNb* this, GlobalContext* globalCtx); void EnNb_Draw(EnNb* this, GlobalContext* globalCtx); /* -const ActorInit En_Nb_InitVars = -{ +const ActorInit En_Nb_InitVars = { ACTOR_EN_NB, ACTORTYPE_NPC, ROOM, diff --git a/src/overlays/actors/ovl_En_Nb/z_en_nb.h b/src/overlays/actors/ovl_En_Nb/z_en_nb.h index df20f1cf64..cdfb468d21 100644 --- a/src/overlays/actors/ovl_En_Nb/z_en_nb.h +++ b/src/overlays/actors/ovl_En_Nb/z_en_nb.h @@ -4,8 +4,7 @@ #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ Actor actor; /* 0x014C */ char unk_14C[0x1DC]; } EnNb; // size = 0x0328 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 bae1f92168..ceea1510f7 100644 --- a/src/overlays/actors/ovl_En_Niw/z_en_niw.c +++ b/src/overlays/actors/ovl_En_Niw/z_en_niw.c @@ -1,6 +1,6 @@ #include "z_en_niw.h" -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x00800010 void EnNiw_Init(EnNiw* this, GlobalContext* globalCtx); @@ -9,8 +9,7 @@ void EnNiw_Update(EnNiw* this, GlobalContext* globalCtx); void EnNiw_Draw(EnNiw* this, GlobalContext* globalCtx); /* -const ActorInit En_Niw_InitVars = -{ +const ActorInit En_Niw_InitVars = { ACTOR_EN_NIW, ACTORTYPE_PROP, ROOM, 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 92486e6548..e5706c393a 100644 --- a/src/overlays/actors/ovl_En_Niw/z_en_niw.h +++ b/src/overlays/actors/ovl_En_Niw/z_en_niw.h @@ -4,8 +4,7 @@ #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ Actor actor; /* 0x014C */ char unk_14C[0x66C]; } EnNiw; // size = 0x07B8 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 6c591bf4a8..a9cfad506d 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 @@ -1,6 +1,6 @@ #include "z_en_niw_girl.h" -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x00000019 void EnNiwGirl_Init(EnNiwGirl* this, GlobalContext* globalCtx); @@ -9,8 +9,7 @@ void EnNiwGirl_Update(EnNiwGirl* this, GlobalContext* globalCtx); void EnNiwGirl_Draw(EnNiwGirl* this, GlobalContext* globalCtx); /* -const ActorInit En_Niw_Girl_InitVars = -{ +const ActorInit En_Niw_Girl_InitVars = { ACTOR_EN_NIW_GIRL, ACTORTYPE_NPC, ROOM, diff --git a/src/overlays/actors/ovl_En_Niw_Girl/z_en_niw_girl.h b/src/overlays/actors/ovl_En_Niw_Girl/z_en_niw_girl.h index a18fe9b09a..879b626f58 100644 --- a/src/overlays/actors/ovl_En_Niw_Girl/z_en_niw_girl.h +++ b/src/overlays/actors/ovl_En_Niw_Girl/z_en_niw_girl.h @@ -4,8 +4,7 @@ #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ Actor actor; /* 0x014C */ char unk_14C[0x1B0]; } EnNiwGirl; // size = 0x02FC diff --git a/src/overlays/actors/ovl_En_Niw_Lady/z_en_niw_lady.c b/src/overlays/actors/ovl_En_Niw_Lady/z_en_niw_lady.c index 0cf4c9951c..c56b051507 100644 --- a/src/overlays/actors/ovl_En_Niw_Lady/z_en_niw_lady.c +++ b/src/overlays/actors/ovl_En_Niw_Lady/z_en_niw_lady.c @@ -1,6 +1,6 @@ #include "z_en_niw_lady.h" -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x00000019 void EnNiwLady_Init(EnNiwLady* this, GlobalContext* globalCtx); @@ -8,8 +8,7 @@ void EnNiwLady_Destroy(EnNiwLady* this, GlobalContext* globalCtx); void EnNiwLady_Update(EnNiwLady* this, GlobalContext* globalCtx); /* -const ActorInit En_Niw_Lady_InitVars = -{ +const ActorInit En_Niw_Lady_InitVars = { ACTOR_EN_NIW_LADY, ACTORTYPE_NPC, ROOM, diff --git a/src/overlays/actors/ovl_En_Niw_Lady/z_en_niw_lady.h b/src/overlays/actors/ovl_En_Niw_Lady/z_en_niw_lady.h index f57dfa7f87..787b7cf90d 100644 --- a/src/overlays/actors/ovl_En_Niw_Lady/z_en_niw_lady.h +++ b/src/overlays/actors/ovl_En_Niw_Lady/z_en_niw_lady.h @@ -4,8 +4,7 @@ #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ Actor actor; /* 0x014C */ char unk_14C[0x1B0]; } EnNiwLady; // size = 0x02FC 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 8145e5e581..ad8c86e93c 100644 --- a/src/overlays/actors/ovl_En_Nutsball/z_en_nutsball.c +++ b/src/overlays/actors/ovl_En_Nutsball/z_en_nutsball.c @@ -2,7 +2,7 @@ * File: z_en_nutsball.c * Overlay: ovl_En_Nutsball * Description: The projectile fired by deku scrubs and octoroks. -*/ + */ #include "z_en_nutsball.h" @@ -16,8 +16,7 @@ static void func_80ABBB34(EnNutsball* this, GlobalContext* globalCtx); static void func_80ABBBA8(EnNutsball* this, GlobalContext* globalCtx); static void EnNutsball_Draw(EnNutsball* this, GlobalContext* globalCtx); -const ActorInit En_Nutsball_InitVars = -{ +const ActorInit En_Nutsball_InitVars = { ACTOR_EN_NUTSBALL, ACTORTYPE_PROP, ROOM, @@ -30,27 +29,16 @@ const ActorInit En_Nutsball_InitVars = (ActorFunc)NULL, }; -static ColliderCylinderInit cylinderInitData = -{ - 0xa, 0x11, 0x9, 0x39, - 0x20, 0x1, { 0x0, 0x0 }, - 0x0, { 0x0, 0x0, 0x0 }, - 0xffcfffff, - 0x0, 0x8, { 0x0, 0x0} , - 0xffcfffff, - { 0x0, 0x0, 0x0, 0x0 }, - 0x11, 0x1, 0x1, 0x0, - 0xd, - 0xd, - 0x0, - { 0x0, 0x0, 0x0 } +static ColliderCylinderInit cylinderInitData = { + 0x0A, 0x11, 0x09, 0x39, 0x20, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0xFFCFFFFF, 0x00, 0x08, 0x00, 0x00, 0xFFCFFFFF, 0x00, 0x00, 0x00, 0x00, + 0x11, 0x01, 0x01, 0x00, 0x000D, 0x000D, 0x0000, 0x0000, 0x0000, 0x0000, }; static s16 objectTbl[] = { OBJECT_DEKUNUTS, OBJECT_HINTNUTS, OBJECT_SHOPNUTS, OBJECT_DNS, OBJECT_DNK }; static u32 dListTbl[] = { 0x06002028, 0x060012F0, 0x06004008, 0x06002410, 0x06001890 }; -static void EnNutsball_Init(EnNutsball* this, GlobalContext* globalCtx) -{ +static void EnNutsball_Init(EnNutsball* this, GlobalContext* globalCtx) { s32 pad[2]; ActorShape_Init(&this->actor.shape, 400.0f, ActorShadow_DrawFunc_Circle, 13.0f); @@ -58,22 +46,20 @@ static void EnNutsball_Init(EnNutsball* this, GlobalContext* globalCtx) ActorCollider_InitCylinder(globalCtx, &this->collider, &this->actor, &cylinderInitData); this->objBankIndex = Object_GetIndex(&globalCtx->objectCtx, objectTbl[this->actor.params]); - if (this->objBankIndex < 0) + if (this->objBankIndex < 0) { Actor_Kill(&this->actor); - else + } else { this->actionFunc = (ActorFunc)func_80ABBB34; + } } -static void EnNutsball_Destroy(EnNutsball* this, GlobalContext* globalCtx) -{ +static void EnNutsball_Destroy(EnNutsball* this, GlobalContext* globalCtx) { ColliderCylinderMain* collider = &this->collider; ActorCollider_FreeCylinder(globalCtx, collider); } -static void func_80ABBB34(EnNutsball* this, GlobalContext* globalCtx) -{ - if (Object_IsLoaded(&globalCtx->objectCtx, this->objBankIndex)) - { +static void func_80ABBB34(EnNutsball* this, GlobalContext* globalCtx) { + if (Object_IsLoaded(&globalCtx->objectCtx, this->objBankIndex)) { this->actor.objBankIndex = this->objBankIndex; this->actor.draw = (ActorFunc)EnNutsball_Draw; this->actor.shape.rot.y = 0; @@ -83,31 +69,26 @@ static void func_80ABBB34(EnNutsball* this, GlobalContext* globalCtx) } } -static void func_80ABBBA8(EnNutsball* this, GlobalContext* globalCtx) -{ +static void func_80ABBBA8(EnNutsball* this, GlobalContext* globalCtx) { Player* player = PLAYER; Vec3s sp4C; Vec3f sp40; this->timer--; - if (this->timer == 0) + if (this->timer == 0) { this->actor.gravity = -1; + } this->actor.initPosRot.rot.z += 0x2AA8; - if ((this->actor.bgCheckFlags & 8) || (this->actor.bgCheckFlags & 1) || - (this->collider.base.colliderFlags & 2) || (this->collider.base.collideFlags & 2) || - (this->collider.base.maskA & 2)) - { + if ((this->actor.bgCheckFlags & 8) || (this->actor.bgCheckFlags & 1) || (this->collider.base.colliderFlags & 2) || + (this->collider.base.collideFlags & 2) || (this->collider.base.maskA & 2)) { // Checking if the player is using a shield that reflects projectiles // And if so, reflects the projectile on impact - if ((player->currentShield == 1) || ((player->currentShield == 2) && LINK_IS_ADULT)) - { - if ((this->collider.base.colliderFlags & 2) && - (this->collider.base.colliderFlags & 0x10) && - (this->collider.base.colliderFlags & 4)) - { + if ((player->currentShield == 1) || ((player->currentShield == 2) && LINK_IS_ADULT)) { + if ((this->collider.base.colliderFlags & 2) && (this->collider.base.colliderFlags & 0x10) && + (this->collider.base.colliderFlags & 4)) { this->collider.base.colliderFlags &= ~0x16; this->collider.base.colliderFlags |= 0x08; @@ -126,22 +107,19 @@ static void func_80ABBBA8(EnNutsball* this, GlobalContext* globalCtx) func_800297A4(globalCtx, &sp40, 0x40C00000, 0, 7, 3, 15, -1, 10, 0); Audio_PlaySoundAtPosition(globalCtx, &this->actor.posRot.pos, 20, NA_SE_EN_OCTAROCK_ROCK); Actor_Kill(&this->actor); - } - else - { - if (this->timer == -300) + } else { + if (this->timer == -300) { Actor_Kill(&this->actor); + } } } -static void EnNutsball_Update(EnNutsball* this, GlobalContext* globalCtx) -{ +static void EnNutsball_Update(EnNutsball* this, GlobalContext* globalCtx) { EnNutsball* nutsball = this; Player* player = PLAYER; s32 pad; - if (!(player->stateFlags1 & 0x300000C0) || (nutsball->actionFunc == (ActorFunc)func_80ABBB34)) - { + if (!(player->stateFlags1 & 0x300000C0) || (nutsball->actionFunc == (ActorFunc)func_80ABBB34)) { nutsball->actionFunc(nutsball, globalCtx); Actor_MoveForward(&nutsball->actor); @@ -156,18 +134,18 @@ static void EnNutsball_Update(EnNutsball* this, GlobalContext* globalCtx) } } -static void EnNutsball_Draw(EnNutsball* this, GlobalContext* globalCtx) -{ +static void EnNutsball_Draw(EnNutsball* this, GlobalContext* globalCtx) { GraphicsContext* gfxCtx = globalCtx->state.gfxCtx; - Gfx* gfxArr[5]; + Gfx* dispRefs[5]; - func_800C6AC4(gfxArr, globalCtx->state.gfxCtx, "../z_en_nutsball.c", 327); + Graph_OpenDisps(dispRefs, globalCtx->state.gfxCtx, "../z_en_nutsball.c", 327); func_80093D18(globalCtx->state.gfxCtx); Matrix_Mult(&globalCtx->mf_11DA0, MTXMODE_APPLY); Matrix_RotateZ(this->actor.initPosRot.rot.z * 9.58738e-05f, MTXMODE_APPLY); - gSPMatrix(gfxCtx->polyOpa.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_nutsball.c", 333), G_MTX_MODELVIEW | G_MTX_LOAD); + gSPMatrix(gfxCtx->polyOpa.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_nutsball.c", 333), + G_MTX_MODELVIEW | G_MTX_LOAD); gSPDisplayList(gfxCtx->polyOpa.p++, dListTbl[this->actor.params]); - func_800C6B54(gfxArr, globalCtx->state.gfxCtx, "../z_en_nutsball.c", 337); + Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_en_nutsball.c", 337); } diff --git a/src/overlays/actors/ovl_En_Nutsball/z_en_nutsball.h b/src/overlays/actors/ovl_En_Nutsball/z_en_nutsball.h index 317cc53f4b..50d12e96a3 100644 --- a/src/overlays/actors/ovl_En_Nutsball/z_en_nutsball.h +++ b/src/overlays/actors/ovl_En_Nutsball/z_en_nutsball.h @@ -4,8 +4,7 @@ #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ Actor actor; /* 0x014C */ ActorFunc actionFunc; /* 0x0150 */ s8 objBankIndex; diff --git a/src/overlays/actors/ovl_En_Nwc/z_en_nwc.c b/src/overlays/actors/ovl_En_Nwc/z_en_nwc.c index e6867b4f30..16954fbb86 100644 --- a/src/overlays/actors/ovl_En_Nwc/z_en_nwc.c +++ b/src/overlays/actors/ovl_En_Nwc/z_en_nwc.c @@ -1,6 +1,6 @@ #include "z_en_nwc.h" -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x00000030 void EnNwc_Init(EnNwc* this, GlobalContext* globalCtx); @@ -9,8 +9,7 @@ void EnNwc_Update(EnNwc* this, GlobalContext* globalCtx); void EnNwc_Draw(EnNwc* this, GlobalContext* globalCtx); /* -const ActorInit En_Nwc_InitVars = -{ +const ActorInit En_Nwc_InitVars = { ACTOR_EN_NWC, ACTORTYPE_PROP, ROOM, diff --git a/src/overlays/actors/ovl_En_Nwc/z_en_nwc.h b/src/overlays/actors/ovl_En_Nwc/z_en_nwc.h index d40769ca99..ab8470fafe 100644 --- a/src/overlays/actors/ovl_En_Nwc/z_en_nwc.h +++ b/src/overlays/actors/ovl_En_Nwc/z_en_nwc.h @@ -4,8 +4,7 @@ #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ Actor actor; /* 0x014C */ char unk_14C[0x5E8]; } EnNwc; // size = 0x0734 diff --git a/src/overlays/actors/ovl_En_Ny/z_en_ny.c b/src/overlays/actors/ovl_En_Ny/z_en_ny.c index 62ff461199..811da6c573 100644 --- a/src/overlays/actors/ovl_En_Ny/z_en_ny.c +++ b/src/overlays/actors/ovl_En_Ny/z_en_ny.c @@ -1,6 +1,6 @@ #include "z_en_ny.h" -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x00000005 void EnNy_Init(EnNy* this, GlobalContext* globalCtx); @@ -9,8 +9,7 @@ void EnNy_Update(EnNy* this, GlobalContext* globalCtx); void EnNy_Draw(EnNy* this, GlobalContext* globalCtx); /* -const ActorInit En_Ny_InitVars = -{ +const ActorInit En_Ny_InitVars = { ACTOR_EN_NY, ACTORTYPE_ENEMY, ROOM, diff --git a/src/overlays/actors/ovl_En_Ny/z_en_ny.h b/src/overlays/actors/ovl_En_Ny/z_en_ny.h index dc978b6aa7..5de276a97c 100644 --- a/src/overlays/actors/ovl_En_Ny/z_en_ny.h +++ b/src/overlays/actors/ovl_En_Ny/z_en_ny.h @@ -4,8 +4,7 @@ #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ Actor actor; /* 0x014C */ char unk_14C[0x16C]; } EnNy; // size = 0x02B8 diff --git a/src/overlays/actors/ovl_En_OE2/z_en_oe2.c b/src/overlays/actors/ovl_En_OE2/z_en_oe2.c index 4d35e0a859..9d4b366928 100644 --- a/src/overlays/actors/ovl_En_OE2/z_en_oe2.c +++ b/src/overlays/actors/ovl_En_OE2/z_en_oe2.c @@ -2,20 +2,19 @@ * File: z_en_oe2.c * Overlay: ovl_En_Oe2 * Description: Blue Navi Target. Probably unused since NPC's are blue and they do not use this actor. -*/ + */ #include #include #include -typedef struct -{ - /* 0x0000 */ Actor actor; - /* 0x014C */ char unk_14C[0x44]; - /* 0x0190 */ ActorFunc updateFunc; +typedef struct { + /* 0x0000 */ Actor actor; + /* 0x014C */ char unk_14C[0x44]; + /* 0x0190 */ ActorFunc updateFunc; } ActorEnOE2; // size = 0x0194 -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x00000009 static void func_80ABE6A0(ActorEnOE2* this, ActorFunc func); @@ -25,46 +24,29 @@ static void func_80ABE6DC(ActorEnOE2* this, GlobalContext* globalCtx); static void Update(ActorEnOE2* this, GlobalContext* globalCtx); static void Draw(ActorEnOE2* this, GlobalContext* globalCtx); -const ActorInit En_OE2_InitVars = -{ - ACTOR_EN_OE2, - ACTORTYPE_NPC, - ROOM, - FLAGS, - OBJECT_OE2, - sizeof(ActorEnOE2), - (ActorFunc)Init, - (ActorFunc)Destroy, - (ActorFunc)Update, - (ActorFunc)Draw +const ActorInit En_OE2_InitVars = { + ACTOR_EN_OE2, ACTORTYPE_NPC, ROOM, + FLAGS, OBJECT_OE2, sizeof(ActorEnOE2), + (ActorFunc)Init, (ActorFunc)Destroy, (ActorFunc)Update, + (ActorFunc)Draw, }; -static void func_80ABE6A0(ActorEnOE2* this, ActorFunc func) -{ +static void func_80ABE6A0(ActorEnOE2* this, ActorFunc func) { this->updateFunc = func; } -static void Init(ActorEnOE2* this, GlobalContext* globalCtx) -{ +static void Init(ActorEnOE2* this, GlobalContext* globalCtx) { func_80ABE6A0(this, (ActorFunc)func_80ABE6DC); } -static void Destroy(ActorEnOE2* this, GlobalContext* globalCtx) -{ - +static void Destroy(ActorEnOE2* this, GlobalContext* globalCtx) { } -static void func_80ABE6DC(ActorEnOE2* this, GlobalContext* globalCtx) -{ - +static void func_80ABE6DC(ActorEnOE2* this, GlobalContext* globalCtx) { } -static void Update(ActorEnOE2* this, GlobalContext* globalCtx) -{ - +static void Update(ActorEnOE2* this, GlobalContext* globalCtx) { } -static void Draw(ActorEnOE2* this, GlobalContext* globalCtx) -{ - +static void Draw(ActorEnOE2* this, GlobalContext* globalCtx) { } diff --git a/src/overlays/actors/ovl_En_Okarina_Effect/z_en_okarina_effect.c b/src/overlays/actors/ovl_En_Okarina_Effect/z_en_okarina_effect.c index 4812ca329e..baf298eb1f 100644 --- a/src/overlays/actors/ovl_En_Okarina_Effect/z_en_okarina_effect.c +++ b/src/overlays/actors/ovl_En_Okarina_Effect/z_en_okarina_effect.c @@ -2,19 +2,20 @@ * File: z_en_okarina_effect.c * Overlay: ovl_En_Okarina_Effect * Description: Manages the storm created when playing Song of Storms -*/ + */ #include #include -typedef struct -{ +#include + +typedef struct { /* 0x0000 */ Actor actor; /* 0x014C */ u16 timer; /* 0x0150 */ ActorFunc actionFunc; } EnOkarinaEffect; // size = 0x0154 -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x02000010 static void EnOkarinaEffect_SetupAction(EnOkarinaEffect* this, ActorFunc* newActionFunc); @@ -24,8 +25,7 @@ static void EnOkarinaEffect_TriggerStorm(EnOkarinaEffect* this, GlobalContext* g static void EnOkarinaEffect_ManageStorm(EnOkarinaEffect* this, GlobalContext* globalCtx); static void EnOkarinaEffect_Update(EnOkarinaEffect* this, GlobalContext* globalCtx); -const ActorInit En_Okarina_Effect_InitVars = -{ +const ActorInit En_Okarina_Effect_InitVars = { ACTOR_EN_OKARINA_EFFECT, ACTORTYPE_ITEMACTION, ROOM, @@ -38,111 +38,88 @@ const ActorInit En_Okarina_Effect_InitVars = NULL, }; -static void EnOkarinaEffect_SetupAction(EnOkarinaEffect* this, ActorFunc* newActionFunc) -{ +static void EnOkarinaEffect_SetupAction(EnOkarinaEffect* this, ActorFunc* newActionFunc) { this->actionFunc = newActionFunc; } -static void EnOkarinaEffect_Destroy(EnOkarinaEffect* this, GlobalContext* globalCtx) -{ +static void EnOkarinaEffect_Destroy(EnOkarinaEffect* this, GlobalContext* globalCtx) { globalCtx->unk_10B16[0] = 0; - if ((D_8011FB30 != 4) && (D_8011FB30 != 5) && (globalCtx->gloomySkyEvent == 1)) - { - globalCtx->gloomySkyEvent = 2; //end gloomy sky + if ((D_8011FB30 != 4) && (D_8011FB30 != 5) && (globalCtx->gloomySkyEvent == 1)) { + globalCtx->gloomySkyEvent = 2; // end gloomy sky func_80077684(globalCtx); } - globalCtx->lightning = 2; //end lightning + globalCtx->lightning = 2; // end lightning } -static void EnOkarinaEffect_Init(EnOkarinaEffect* this, GlobalContext* globalCtx) -{ +static void EnOkarinaEffect_Init(EnOkarinaEffect* this, GlobalContext* globalCtx) { osSyncPrintf("\n\n"); //"Ocarina Storm Effect" - osSyncPrintf("☆☆☆☆☆ オカリナあらし効果ビカビカビカ〜 ☆☆☆☆☆ \n"); + osSyncPrintf(VT_FGCOL(YELLOW) "☆☆☆☆☆ オカリナあらし効果ビカビカビカ〜 ☆☆☆☆☆ \n" VT_RST); osSyncPrintf("\n\n"); - if (globalCtx->unk_10B12[1] != 0) - { - Actor_Kill(&this->actor); //kill if an instance is already spawned + if (globalCtx->unk_10B12[1] != 0) { + Actor_Kill(&this->actor); // kill if an instance is already spawned } EnOkarinaEffect_SetupAction(this, &EnOkarinaEffect_TriggerStorm); } -static void EnOkarinaEffect_TriggerStorm(EnOkarinaEffect* this, GlobalContext* globalCtx) -{ - this->timer = 400; //20 seconds - globalCtx->unk_10B16[0] = 20; //rain intensity target - globalCtx->gloomySkyEvent = 1; //start gloomy sky - if ((D_8011FB30 != 0) || globalCtx->gloomySky != 0) - { +static void EnOkarinaEffect_TriggerStorm(EnOkarinaEffect* this, GlobalContext* globalCtx) { + this->timer = 400; // 20 seconds + globalCtx->unk_10B16[0] = 20; // rain intensity target + globalCtx->gloomySkyEvent = 1; // start gloomy sky + if ((D_8011FB30 != 0) || globalCtx->gloomySky != 0) { globalCtx->unk_10B02 = 1; } - globalCtx->lightning = 1; //start lightning + globalCtx->lightning = 1; // start lightning func_80077624(globalCtx); EnOkarinaEffect_SetupAction(this, &EnOkarinaEffect_ManageStorm); } -static void EnOkarinaEffect_ManageStorm(EnOkarinaEffect* this, GlobalContext* globalCtx) -{ - func_8006C438(globalCtx, 5); //clear bean grow env flag - if (((globalCtx->pauseCtx.state == 0) && (globalCtx->unk_10A20 == 0) && - (globalCtx->msgCtx.unk_E300 == 0) && (func_800C0D28(globalCtx) == 0) - && ((globalCtx->unk_1241B == 0) || (gSaveContext.game_mode != 0))) - || (this->timer >= 250)) - { - if (globalCtx->unk_10A42 != 0 || globalCtx->unk_10A43 != 1) - { +static void EnOkarinaEffect_ManageStorm(EnOkarinaEffect* this, GlobalContext* globalCtx) { + func_8006C438(globalCtx, 5); // clear bean grow env flag + if (((globalCtx->pauseCtx.state == 0) && (globalCtx->unk_10A20 == 0) && (globalCtx->msgCtx.unk_E300 == 0) && + (func_800C0D28(globalCtx) == 0) && ((globalCtx->unk_1241B == 0) || (gSaveContext.game_mode != 0))) || + (this->timer >= 250)) { + if (globalCtx->unk_10A42 != 0 || globalCtx->unk_10A43 != 1) { this->timer--; } osSyncPrintf("\nthis->timer=[%d]", this->timer); - if (this->timer == 308) - { + if (this->timer == 308) { //"Let's grow some beans" osSyncPrintf("\n\n\n豆よ のびろ 指定\n\n\n"); - func_8006C3D0(globalCtx, 5); //set bean grow env flag + func_8006C3D0(globalCtx, 5); // set bean grow env flag } } - if (D_8011FB38 != 0) - { + if (D_8011FB38 != 0) { this->timer = 0; } - if (this->timer == 0) - { + if (this->timer == 0) { globalCtx->unk_10B16[0] = 0; - if (globalCtx->csCtx.state == 0) - { + if (globalCtx->csCtx.state == 0) { func_80077684(globalCtx); - } - else - if (func_800FA0B4(0) == 1) - { + } else if (func_800FA0B4(0) == 1) { func_800F6D58(0xF, 1, 0); func_800F6D58(0xE, 1, 0); } osSyncPrintf("\n\n\nE_wether_flg=[%d]", D_8011FB30); osSyncPrintf("\nrain_evt_trg=[%d]\n\n", globalCtx->gloomySkyEvent); - if (D_8011FB30 == 0 && (globalCtx->gloomySkyEvent == 1)) - { - globalCtx->gloomySkyEvent = 2; //end gloomy sky - } - else - { + if (D_8011FB30 == 0 && (globalCtx->gloomySkyEvent == 1)) { + globalCtx->gloomySkyEvent = 2; // end gloomy sky + } else { globalCtx->gloomySkyEvent = 0; globalCtx->unk_10B02 = 0; } - globalCtx->lightning = 2; //end lightning + globalCtx->lightning = 2; // end lightning Actor_Kill(&this->actor); } } -static void EnOkarinaEffect_Update(EnOkarinaEffect* this, GlobalContext* globalCtx) -{ +static void EnOkarinaEffect_Update(EnOkarinaEffect* this, GlobalContext* globalCtx) { this->actionFunc(this, globalCtx); - if (BREG(0) != 0) - { + if (BREG(0) != 0) { DebugDisplay_AddObject(this->actor.posRot.pos.x, this->actor.posRot.pos.y, this->actor.posRot.pos.z, - this->actor.posRot.rot.x, this->actor.posRot.rot.y, this->actor.posRot.rot.z, - 1.0f, 1.0f, 1.0f, 0xFF, 0, 0xFF, 0xFF, 4, globalCtx->state.gfxCtx); + this->actor.posRot.rot.x, this->actor.posRot.rot.y, this->actor.posRot.rot.z, 1.0f, 1.0f, + 1.0f, 0xFF, 0, 0xFF, 0xFF, 4, globalCtx->state.gfxCtx); } } diff --git a/src/overlays/actors/ovl_En_Okarina_Tag/z_en_okarina_tag.c b/src/overlays/actors/ovl_En_Okarina_Tag/z_en_okarina_tag.c index fbb6ea8bb5..0c18b62d4d 100644 --- a/src/overlays/actors/ovl_En_Okarina_Tag/z_en_okarina_tag.c +++ b/src/overlays/actors/ovl_En_Okarina_Tag/z_en_okarina_tag.c @@ -1,6 +1,6 @@ #include "z_en_okarina_tag.h" -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x02000010 void EnOkarinaTag_Init(EnOkarinaTag* this, GlobalContext* globalCtx); @@ -8,8 +8,7 @@ void EnOkarinaTag_Destroy(EnOkarinaTag* this, GlobalContext* globalCtx); void EnOkarinaTag_Update(EnOkarinaTag* this, GlobalContext* globalCtx); /* -const ActorInit En_Okarina_Tag_InitVars = -{ +const ActorInit En_Okarina_Tag_InitVars = { ACTOR_EN_OKARINA_TAG, ACTORTYPE_PROP, ROOM, diff --git a/src/overlays/actors/ovl_En_Okarina_Tag/z_en_okarina_tag.h b/src/overlays/actors/ovl_En_Okarina_Tag/z_en_okarina_tag.h index 1320eb6a07..309b9ef2ec 100644 --- a/src/overlays/actors/ovl_En_Okarina_Tag/z_en_okarina_tag.h +++ b/src/overlays/actors/ovl_En_Okarina_Tag/z_en_okarina_tag.h @@ -4,8 +4,7 @@ #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ Actor actor; /* 0x014C */ char unk_14C[0x14]; } EnOkarinaTag; // size = 0x0160 diff --git a/src/overlays/actors/ovl_En_Okuta/z_en_okuta.c b/src/overlays/actors/ovl_En_Okuta/z_en_okuta.c index 9d6fb9d2b5..468ec54c33 100644 --- a/src/overlays/actors/ovl_En_Okuta/z_en_okuta.c +++ b/src/overlays/actors/ovl_En_Okuta/z_en_okuta.c @@ -1,6 +1,6 @@ #include "z_en_okuta.h" -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x00000005 void EnOkuta_Init(EnOkuta* this, GlobalContext* globalCtx); @@ -9,8 +9,7 @@ void EnOkuta_Update(EnOkuta* this, GlobalContext* globalCtx); void EnOkuta_Draw(EnOkuta* this, GlobalContext* globalCtx); /* -const ActorInit En_Okuta_InitVars = -{ +const ActorInit En_Okuta_InitVars = { ACTOR_EN_OKUTA, ACTORTYPE_ENEMY, ROOM, diff --git a/src/overlays/actors/ovl_En_Okuta/z_en_okuta.h b/src/overlays/actors/ovl_En_Okuta/z_en_okuta.h index ba034417a3..11718e1402 100644 --- a/src/overlays/actors/ovl_En_Okuta/z_en_okuta.h +++ b/src/overlays/actors/ovl_En_Okuta/z_en_okuta.h @@ -4,8 +4,7 @@ #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ Actor actor; /* 0x014C */ char unk_14C[0x270]; } EnOkuta; // size = 0x03BC diff --git a/src/overlays/actors/ovl_En_Ossan/z_en_ossan.c b/src/overlays/actors/ovl_En_Ossan/z_en_ossan.c index 0a3da67c7e..8e98fcdc49 100644 --- a/src/overlays/actors/ovl_En_Ossan/z_en_ossan.c +++ b/src/overlays/actors/ovl_En_Ossan/z_en_ossan.c @@ -1,6 +1,6 @@ #include "z_en_ossan.h" -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x00000019 void EnOssan_Init(EnOssan* this, GlobalContext* globalCtx); @@ -8,8 +8,7 @@ void EnOssan_Destroy(EnOssan* this, GlobalContext* globalCtx); void EnOssan_Update(EnOssan* this, GlobalContext* globalCtx); /* -const ActorInit En_Ossan_InitVars = -{ +const ActorInit En_Ossan_InitVars = { ACTOR_EN_OSSAN, ACTORTYPE_NPC, ROOM, diff --git a/src/overlays/actors/ovl_En_Ossan/z_en_ossan.h b/src/overlays/actors/ovl_En_Ossan/z_en_ossan.h index 53ffc2f992..494bd29c9a 100644 --- a/src/overlays/actors/ovl_En_Ossan/z_en_ossan.h +++ b/src/overlays/actors/ovl_En_Ossan/z_en_ossan.h @@ -4,8 +4,7 @@ #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ Actor actor; /* 0x014C */ char unk_14C[0x18C]; } EnOssan; // size = 0x02D8 diff --git a/src/overlays/actors/ovl_En_Owl/z_en_owl.c b/src/overlays/actors/ovl_En_Owl/z_en_owl.c index 71a387205c..8c59bdecc1 100644 --- a/src/overlays/actors/ovl_En_Owl/z_en_owl.c +++ b/src/overlays/actors/ovl_En_Owl/z_en_owl.c @@ -1,6 +1,6 @@ #include "z_en_owl.h" -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x00000019 void EnOwl_Init(EnOwl* this, GlobalContext* globalCtx); @@ -9,8 +9,7 @@ void EnOwl_Update(EnOwl* this, GlobalContext* globalCtx); void EnOwl_Draw(EnOwl* this, GlobalContext* globalCtx); /* -const ActorInit En_Owl_InitVars = -{ +const ActorInit En_Owl_InitVars = { ACTOR_EN_OWL, ACTORTYPE_NPC, ROOM, diff --git a/src/overlays/actors/ovl_En_Owl/z_en_owl.h b/src/overlays/actors/ovl_En_Owl/z_en_owl.h index 7905a9a555..7ea9981230 100644 --- a/src/overlays/actors/ovl_En_Owl/z_en_owl.h +++ b/src/overlays/actors/ovl_En_Owl/z_en_owl.h @@ -4,8 +4,7 @@ #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ Actor actor; /* 0x014C */ char unk_14C[0x2C8]; } EnOwl; // size = 0x0414 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 3c7701a84b..e177e39154 100644 --- a/src/overlays/actors/ovl_En_Part/z_en_part.c +++ b/src/overlays/actors/ovl_En_Part/z_en_part.c @@ -1,6 +1,6 @@ #include "z_en_part.h" -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x00000010 void EnPart_Init(EnPart* this, GlobalContext* globalCtx); @@ -9,8 +9,7 @@ void EnPart_Update(EnPart* this, GlobalContext* globalCtx); void EnPart_Draw(EnPart* this, GlobalContext* globalCtx); /* -const ActorInit En_Part_InitVars = -{ +const ActorInit En_Part_InitVars = { ACTOR_EN_PART, ACTORTYPE_ITEMACTION, ROOM, diff --git a/src/overlays/actors/ovl_En_Part/z_en_part.h b/src/overlays/actors/ovl_En_Part/z_en_part.h index c98a3e0873..83b79ff263 100644 --- a/src/overlays/actors/ovl_En_Part/z_en_part.h +++ b/src/overlays/actors/ovl_En_Part/z_en_part.h @@ -4,8 +4,7 @@ #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ Actor actor; /* 0x014C */ char unk_14C[0x10]; } EnPart; // size = 0x015C diff --git a/src/overlays/actors/ovl_En_Peehat/z_en_peehat.c b/src/overlays/actors/ovl_En_Peehat/z_en_peehat.c index 0e72785315..50e2893d80 100644 --- a/src/overlays/actors/ovl_En_Peehat/z_en_peehat.c +++ b/src/overlays/actors/ovl_En_Peehat/z_en_peehat.c @@ -1,6 +1,6 @@ #include "z_en_peehat.h" -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x01000015 void EnPeehat_Init(EnPeehat* this, GlobalContext* globalCtx); @@ -9,8 +9,7 @@ void EnPeehat_Update(EnPeehat* this, GlobalContext* globalCtx); void EnPeehat_Draw(EnPeehat* this, GlobalContext* globalCtx); /* -const ActorInit En_Peehat_InitVars = -{ +const ActorInit En_Peehat_InitVars = { ACTOR_EN_PEEHAT, ACTORTYPE_ENEMY, ROOM, diff --git a/src/overlays/actors/ovl_En_Peehat/z_en_peehat.h b/src/overlays/actors/ovl_En_Peehat/z_en_peehat.h index f43f3452e8..6472e19f15 100644 --- a/src/overlays/actors/ovl_En_Peehat/z_en_peehat.h +++ b/src/overlays/actors/ovl_En_Peehat/z_en_peehat.h @@ -4,8 +4,7 @@ #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ Actor actor; /* 0x014C */ char unk_14C[0x2E0]; } EnPeehat; // size = 0x042C diff --git a/src/overlays/actors/ovl_En_Po_Desert/z_en_po_desert.c b/src/overlays/actors/ovl_En_Po_Desert/z_en_po_desert.c index ea70957c7d..a1d68a6f21 100644 --- a/src/overlays/actors/ovl_En_Po_Desert/z_en_po_desert.c +++ b/src/overlays/actors/ovl_En_Po_Desert/z_en_po_desert.c @@ -1,6 +1,6 @@ #include "z_en_po_desert.h" -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x00001090 void EnPoDesert_Init(EnPoDesert* this, GlobalContext* globalCtx); @@ -9,8 +9,7 @@ void EnPoDesert_Update(EnPoDesert* this, GlobalContext* globalCtx); void EnPoDesert_Draw(EnPoDesert* this, GlobalContext* globalCtx); /* -const ActorInit En_Po_Desert_InitVars = -{ +const ActorInit En_Po_Desert_InitVars = { ACTOR_EN_PO_DESERT, ACTORTYPE_BG, ROOM, diff --git a/src/overlays/actors/ovl_En_Po_Desert/z_en_po_desert.h b/src/overlays/actors/ovl_En_Po_Desert/z_en_po_desert.h index ed76b2980f..2ec01d80f4 100644 --- a/src/overlays/actors/ovl_En_Po_Desert/z_en_po_desert.h +++ b/src/overlays/actors/ovl_En_Po_Desert/z_en_po_desert.h @@ -4,8 +4,7 @@ #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ Actor actor; /* 0x014C */ char unk_14C[0x138]; } EnPoDesert; // size = 0x0284 diff --git a/src/overlays/actors/ovl_En_Po_Field/z_en_po_field.c b/src/overlays/actors/ovl_En_Po_Field/z_en_po_field.c index f5eb512b15..f3024f2547 100644 --- a/src/overlays/actors/ovl_En_Po_Field/z_en_po_field.c +++ b/src/overlays/actors/ovl_En_Po_Field/z_en_po_field.c @@ -1,6 +1,6 @@ #include "z_en_po_field.h" -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x00001035 void EnPoField_Init(EnPoField* this, GlobalContext* globalCtx); @@ -9,8 +9,7 @@ void EnPoField_Update(EnPoField* this, GlobalContext* globalCtx); void EnPoField_Draw(EnPoField* this, GlobalContext* globalCtx); /* -const ActorInit En_Po_Field_InitVars = -{ +const ActorInit En_Po_Field_InitVars = { ACTOR_EN_PO_FIELD, ACTORTYPE_ENEMY, ROOM, @@ -104,4 +103,3 @@ const ActorInit En_Po_Field_InitVars = #pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD6BF4.s") #pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Po_Field/func_80AD6C4C.s") - diff --git a/src/overlays/actors/ovl_En_Po_Field/z_en_po_field.h b/src/overlays/actors/ovl_En_Po_Field/z_en_po_field.h index 2a9b5d637f..b02ef552b9 100644 --- a/src/overlays/actors/ovl_En_Po_Field/z_en_po_field.h +++ b/src/overlays/actors/ovl_En_Po_Field/z_en_po_field.h @@ -4,8 +4,7 @@ #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ Actor actor; /* 0x014C */ char unk_14C[0x190]; } EnPoField; // size = 0x02DC diff --git a/src/overlays/actors/ovl_En_Po_Relay/z_en_po_relay.c b/src/overlays/actors/ovl_En_Po_Relay/z_en_po_relay.c index b394185037..ec50de4b6f 100644 --- a/src/overlays/actors/ovl_En_Po_Relay/z_en_po_relay.c +++ b/src/overlays/actors/ovl_En_Po_Relay/z_en_po_relay.c @@ -1,6 +1,6 @@ #include "z_en_po_relay.h" -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x00011019 void EnPoRelay_Init(EnPoRelay* this, GlobalContext* globalCtx); @@ -9,8 +9,7 @@ void EnPoRelay_Update(EnPoRelay* this, GlobalContext* globalCtx); void EnPoRelay_Draw(EnPoRelay* this, GlobalContext* globalCtx); /* -const ActorInit En_Po_Relay_InitVars = -{ +const ActorInit En_Po_Relay_InitVars = { ACTOR_EN_PO_RELAY, ACTORTYPE_NPC, ROOM, diff --git a/src/overlays/actors/ovl_En_Po_Relay/z_en_po_relay.h b/src/overlays/actors/ovl_En_Po_Relay/z_en_po_relay.h index 6fe030c5c5..a0206ed18e 100644 --- a/src/overlays/actors/ovl_En_Po_Relay/z_en_po_relay.h +++ b/src/overlays/actors/ovl_En_Po_Relay/z_en_po_relay.h @@ -4,8 +4,7 @@ #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ Actor actor; /* 0x014C */ char unk_14C[0x190]; } EnPoRelay; // size = 0x02DC diff --git a/src/overlays/actors/ovl_En_Po_Sisters/z_en_po_sisters.c b/src/overlays/actors/ovl_En_Po_Sisters/z_en_po_sisters.c index 6926df62b4..5e5c6c7cee 100644 --- a/src/overlays/actors/ovl_En_Po_Sisters/z_en_po_sisters.c +++ b/src/overlays/actors/ovl_En_Po_Sisters/z_en_po_sisters.c @@ -1,6 +1,6 @@ #include "z_en_po_sisters.h" -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x00005215 void EnPoSisters_Init(EnPoSisters* this, GlobalContext* globalCtx); @@ -9,8 +9,7 @@ void EnPoSisters_Update(EnPoSisters* this, GlobalContext* globalCtx); void EnPoSisters_Draw(EnPoSisters* this, GlobalContext* globalCtx); /* -const ActorInit En_Po_Sisters_InitVars = -{ +const ActorInit En_Po_Sisters_InitVars = { ACTOR_EN_PO_SISTERS, ACTORTYPE_ENEMY, ROOM, diff --git a/src/overlays/actors/ovl_En_Po_Sisters/z_en_po_sisters.h b/src/overlays/actors/ovl_En_Po_Sisters/z_en_po_sisters.h index ba7ba23cf7..c6c42f566b 100644 --- a/src/overlays/actors/ovl_En_Po_Sisters/z_en_po_sisters.h +++ b/src/overlays/actors/ovl_En_Po_Sisters/z_en_po_sisters.h @@ -4,8 +4,7 @@ #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ Actor actor; /* 0x014C */ char unk_14C[0x1EC]; } EnPoSisters; // size = 0x0338 diff --git a/src/overlays/actors/ovl_En_Poh/z_en_poh.c b/src/overlays/actors/ovl_En_Poh/z_en_poh.c index e01235e574..a05d23ce29 100644 --- a/src/overlays/actors/ovl_En_Poh/z_en_poh.c +++ b/src/overlays/actors/ovl_En_Poh/z_en_poh.c @@ -1,6 +1,6 @@ #include "z_en_poh.h" -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x00001015 void EnPoh_Init(EnPoh* this, GlobalContext* globalCtx); @@ -8,8 +8,7 @@ void EnPoh_Destroy(EnPoh* this, GlobalContext* globalCtx); void EnPoh_Update(EnPoh* this, GlobalContext* globalCtx); /* -const ActorInit En_Poh_InitVars = -{ +const ActorInit En_Poh_InitVars = { ACTOR_EN_POH, ACTORTYPE_ENEMY, ROOM, diff --git a/src/overlays/actors/ovl_En_Poh/z_en_poh.h b/src/overlays/actors/ovl_En_Poh/z_en_poh.h index 3f546e8606..d86bb95ec0 100644 --- a/src/overlays/actors/ovl_En_Poh/z_en_poh.h +++ b/src/overlays/actors/ovl_En_Poh/z_en_poh.h @@ -4,8 +4,7 @@ #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ Actor actor; /* 0x014C */ char unk_14C[0x25C]; } EnPoh; // size = 0x03A8 diff --git a/src/overlays/actors/ovl_En_Pu_box/z_en_pu_box.c b/src/overlays/actors/ovl_En_Pu_box/z_en_pu_box.c index d20bd1a651..f8da2fd8ec 100644 --- a/src/overlays/actors/ovl_En_Pu_box/z_en_pu_box.c +++ b/src/overlays/actors/ovl_En_Pu_box/z_en_pu_box.c @@ -2,11 +2,11 @@ * File: z_en_pu_box.c * Overlay: ovl_En_Pu_Box * Description: An unused stone cube. -*/ + */ #include "z_en_pu_box.h" -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x00000010 static void EnPubox_Init(EnPubox* this, GlobalContext* globalCtx); @@ -14,8 +14,7 @@ static void EnPubox_Destroy(EnPubox* this, GlobalContext* globalCtx); static void EnPubox_Update(EnPubox* this, GlobalContext* globalCtx); static void EnPubox_Draw(EnPubox* this, GlobalContext* globalCtx); -const ActorInit En_Pu_box_InitVars = -{ +const ActorInit En_Pu_box_InitVars = { ACTOR_EN_PU_BOX, ACTORTYPE_BG, ROOM, @@ -31,13 +30,11 @@ const ActorInit En_Pu_box_InitVars = extern u32 D_06000380; extern u32 D_060006D0; -static void EnPubox_Init(EnPubox* this, GlobalContext* globalCtx) -{ +static void EnPubox_Init(EnPubox* this, GlobalContext* globalCtx) { u32 local_c = 0; Actor* thisx = &this->dyna.actor; - switch(thisx->params) - { + switch (thisx->params) { case 0: Actor_SetScale(thisx, 0.0025f); break; @@ -66,23 +63,18 @@ static void EnPubox_Init(EnPubox* this, GlobalContext* globalCtx) this->dyna.dynaPolyId = DynaPolyInfo_RegisterActor(globalCtx, &globalCtx->colCtx.dyna, thisx, local_c); } -static void EnPubox_Destroy(EnPubox* this, GlobalContext* globalCtx) -{ +static void EnPubox_Destroy(EnPubox* this, GlobalContext* globalCtx) { DynaPolyInfo_Free(globalCtx, &globalCtx->colCtx.dyna, this->dyna.dynaPolyId); } -static void EnPubox_Update(EnPubox* this, GlobalContext* globalCtx) -{ +static void EnPubox_Update(EnPubox* this, GlobalContext* globalCtx) { Actor* thisx = &this->dyna.actor; thisx->speedXZ += this->dyna.unk_150; thisx->posRot.rot.y = this->dyna.unk_158; - thisx->speedXZ = (thisx->speedXZ < -2.5f) ? -2.5f : - ((thisx->speedXZ > 2.5f) ? 2.5f : - thisx->speedXZ); + thisx->speedXZ = (thisx->speedXZ < -2.5f) ? -2.5f : ((thisx->speedXZ > 2.5f) ? 2.5f : thisx->speedXZ); Math_SmoothScaleMaxMinF(&thisx->speedXZ, 0.0f, 1.0f, 1.0f, 0.0f); - if (thisx->speedXZ != 0.0f) - { + if (thisx->speedXZ != 0.0f) { Audio_PlaySoundGeneral(0x200A, &thisx->unk_E4, 4, &D_801333E0, &D_801333E0, &D_801333E8); } this->dyna.unk_154 = 0.0f; @@ -92,7 +84,6 @@ static void EnPubox_Update(EnPubox* this, GlobalContext* globalCtx) thisx->posRot2.pos = thisx->posRot.pos; } -static void EnPubox_Draw(EnPubox* this, GlobalContext* globalCtx) -{ - Draw_DListOpa(globalCtx, &D_06000380); +static void EnPubox_Draw(EnPubox* this, GlobalContext* globalCtx) { + Gfx_DrawDListOpa(globalCtx, &D_06000380); } diff --git a/src/overlays/actors/ovl_En_Pu_box/z_en_pu_box.h b/src/overlays/actors/ovl_En_Pu_box/z_en_pu_box.h index 6aa1ec66dd..b92b70c764 100644 --- a/src/overlays/actors/ovl_En_Pu_box/z_en_pu_box.h +++ b/src/overlays/actors/ovl_En_Pu_box/z_en_pu_box.h @@ -4,8 +4,7 @@ #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ DynaPolyActor dyna; /* 0x0164 */ u32 unk_164; } EnPubox; // size = 0x0168 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 9414f012e8..393552557b 100644 --- a/src/overlays/actors/ovl_En_Rd/z_en_rd.c +++ b/src/overlays/actors/ovl_En_Rd/z_en_rd.c @@ -1,6 +1,6 @@ #include "z_en_rd.h" -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x00000415 void EnRd_Init(EnRd* this, GlobalContext* globalCtx); @@ -9,8 +9,7 @@ void EnRd_Update(EnRd* this, GlobalContext* globalCtx); void EnRd_Draw(EnRd* this, GlobalContext* globalCtx); /* -const ActorInit En_Rd_InitVars = -{ +const ActorInit En_Rd_InitVars = { ACTOR_EN_RD, ACTORTYPE_ENEMY, ROOM, diff --git a/src/overlays/actors/ovl_En_Rd/z_en_rd.h b/src/overlays/actors/ovl_En_Rd/z_en_rd.h index b889da5a22..da0b003b60 100644 --- a/src/overlays/actors/ovl_En_Rd/z_en_rd.h +++ b/src/overlays/actors/ovl_En_Rd/z_en_rd.h @@ -4,8 +4,7 @@ #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ Actor actor; /* 0x014C */ char unk_14C[0x220]; } EnRd; // size = 0x036C 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 bbe37addaf..afbc515ca2 100644 --- a/src/overlays/actors/ovl_En_Reeba/z_en_reeba.c +++ b/src/overlays/actors/ovl_En_Reeba/z_en_reeba.c @@ -1,6 +1,6 @@ #include "z_en_reeba.h" -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x08000015 void EnReeba_Init(EnReeba* this, GlobalContext* globalCtx); @@ -9,8 +9,7 @@ void EnReeba_Update(EnReeba* this, GlobalContext* globalCtx); void EnReeba_Draw(EnReeba* this, GlobalContext* globalCtx); /* -const ActorInit En_Reeba_InitVars = -{ +const ActorInit En_Reeba_InitVars = { ACTOR_EN_REEBA, ACTORTYPE_MISC, ROOM, diff --git a/src/overlays/actors/ovl_En_Reeba/z_en_reeba.h b/src/overlays/actors/ovl_En_Reeba/z_en_reeba.h index 9bf94bc805..f5adf86a23 100644 --- a/src/overlays/actors/ovl_En_Reeba/z_en_reeba.h +++ b/src/overlays/actors/ovl_En_Reeba/z_en_reeba.h @@ -4,8 +4,7 @@ #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ Actor actor; /* 0x014C */ char unk_14C[0x190]; } EnReeba; // size = 0x02DC diff --git a/src/overlays/actors/ovl_En_River_Sound/z_en_river_sound.c b/src/overlays/actors/ovl_En_River_Sound/z_en_river_sound.c index 001f1f72d8..46eddbd721 100644 --- a/src/overlays/actors/ovl_En_River_Sound/z_en_river_sound.c +++ b/src/overlays/actors/ovl_En_River_Sound/z_en_river_sound.c @@ -1,6 +1,6 @@ #include "z_en_river_sound.h" -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x00000030 void EnRiverSound_Init(EnRiverSound* this, GlobalContext* globalCtx); @@ -9,8 +9,7 @@ void EnRiverSound_Update(EnRiverSound* this, GlobalContext* globalCtx); void EnRiverSound_Draw(EnRiverSound* this, GlobalContext* globalCtx); /* -const ActorInit En_River_Sound_InitVars = -{ +const ActorInit En_River_Sound_InitVars = { ACTOR_EN_RIVER_SOUND, ACTORTYPE_BG, ROOM, diff --git a/src/overlays/actors/ovl_En_River_Sound/z_en_river_sound.h b/src/overlays/actors/ovl_En_River_Sound/z_en_river_sound.h index bcf1e16abe..b1c159d819 100644 --- a/src/overlays/actors/ovl_En_River_Sound/z_en_river_sound.h +++ b/src/overlays/actors/ovl_En_River_Sound/z_en_river_sound.h @@ -4,8 +4,7 @@ #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ Actor actor; /* 0x014C */ char unk_14C[0x4]; } EnRiverSound; // size = 0x0150 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 4de9d7ab57..ee90fefb68 100644 --- a/src/overlays/actors/ovl_En_Rl/z_en_rl.c +++ b/src/overlays/actors/ovl_En_Rl/z_en_rl.c @@ -1,6 +1,6 @@ #include "z_en_rl.h" -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x00000010 void EnRl_Init(EnRl* this, GlobalContext* globalCtx); @@ -9,8 +9,7 @@ void EnRl_Update(EnRl* this, GlobalContext* globalCtx); void EnRl_Draw(EnRl* this, GlobalContext* globalCtx); /* -const ActorInit En_Rl_InitVars = -{ +const ActorInit En_Rl_InitVars = { ACTOR_EN_RL, ACTORTYPE_NPC, ROOM, diff --git a/src/overlays/actors/ovl_En_Rl/z_en_rl.h b/src/overlays/actors/ovl_En_Rl/z_en_rl.h index a9c961eb4b..219f5d2405 100644 --- a/src/overlays/actors/ovl_En_Rl/z_en_rl.h +++ b/src/overlays/actors/ovl_En_Rl/z_en_rl.h @@ -4,8 +4,7 @@ #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ Actor actor; /* 0x014C */ char unk_14C[0x60]; } EnRl; // size = 0x01AC diff --git a/src/overlays/actors/ovl_En_Rr/z_en_rr.c b/src/overlays/actors/ovl_En_Rr/z_en_rr.c index cd9cf7ea69..78350277b0 100644 --- a/src/overlays/actors/ovl_En_Rr/z_en_rr.c +++ b/src/overlays/actors/ovl_En_Rr/z_en_rr.c @@ -1,6 +1,6 @@ #include "z_en_rr.h" -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x00000435 void EnRr_Init(EnRr* this, GlobalContext* globalCtx); @@ -9,8 +9,7 @@ void EnRr_Update(EnRr* this, GlobalContext* globalCtx); void EnRr_Draw(EnRr* this, GlobalContext* globalCtx); /* -const ActorInit En_Rr_InitVars = -{ +const ActorInit En_Rr_InitVars = { ACTOR_EN_RR, ACTORTYPE_ENEMY, ROOM, diff --git a/src/overlays/actors/ovl_En_Rr/z_en_rr.h b/src/overlays/actors/ovl_En_Rr/z_en_rr.h index 0a393589ee..0da6399002 100644 --- a/src/overlays/actors/ovl_En_Rr/z_en_rr.h +++ b/src/overlays/actors/ovl_En_Rr/z_en_rr.h @@ -4,8 +4,7 @@ #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ Actor actor; /* 0x014C */ char unk_14C[0x2278]; } EnRr; // size = 0x23C4 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 f9a497e0bb..52b7571cbd 100644 --- a/src/overlays/actors/ovl_En_Ru1/z_en_ru1.c +++ b/src/overlays/actors/ovl_En_Ru1/z_en_ru1.c @@ -1,6 +1,6 @@ #include "z_en_ru1.h" -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x04000011 void EnRu1_Init(EnRu1* this, GlobalContext* globalCtx); @@ -9,8 +9,7 @@ void EnRu1_Update(EnRu1* this, GlobalContext* globalCtx); void EnRu1_Draw(EnRu1* this, GlobalContext* globalCtx); /* -const ActorInit En_Ru1_InitVars = -{ +const ActorInit En_Ru1_InitVars = { ACTOR_EN_RU1, ACTORTYPE_NPC, ROOM, diff --git a/src/overlays/actors/ovl_En_Ru1/z_en_ru1.h b/src/overlays/actors/ovl_En_Ru1/z_en_ru1.h index 2504a23a6c..ddce050cb6 100644 --- a/src/overlays/actors/ovl_En_Ru1/z_en_ru1.h +++ b/src/overlays/actors/ovl_En_Ru1/z_en_ru1.h @@ -4,8 +4,7 @@ #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ Actor actor; /* 0x014C */ char unk_14C[0x250]; } EnRu1; // size = 0x039C 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 238d25c5d3..8b0829275d 100644 --- a/src/overlays/actors/ovl_En_Ru2/z_en_ru2.c +++ b/src/overlays/actors/ovl_En_Ru2/z_en_ru2.c @@ -1,16 +1,79 @@ +/* + * File: z_en_ru2.c + * Overlay: En_Ru2 + * Description: + */ + #include "z_en_ru2.h" -#define ROOM 0x00 +#include + +#define ROOM 0x00 #define FLAGS 0x00000010 -void EnRu2_Init(EnRu2* this, GlobalContext* globalCtx); -void EnRu2_Destroy(EnRu2* this, GlobalContext* globalCtx); -void EnRu2_Update(EnRu2* this, GlobalContext* globalCtx); -void EnRu2_Draw(EnRu2* this, GlobalContext* globalCtx); +static void EnRu2_Init(EnRu2* this, GlobalContext* globalCtx); +static void EnRu2_Destroy(EnRu2* this, GlobalContext* globalCtx); +static void EnRu2_Update(EnRu2* this, GlobalContext* globalCtx); +static void EnRu2_Draw(EnRu2* this, GlobalContext* globalCtx); -/* -const ActorInit En_Ru2_InitVars = -{ +static void func_80AF2CB4(EnRu2* this, GlobalContext* globalCtx); +static void func_80AF2CD4(EnRu2* this, GlobalContext* globalCtx); +static void func_80AF2CF4(EnRu2* this, GlobalContext* globalCtx); +static void func_80AF2D2C(EnRu2* this, GlobalContext* globalCtx); +static void func_80AF2D6C(EnRu2* this, GlobalContext* globalCtx); +static void func_80AF2DAC(EnRu2* this, GlobalContext* globalCtx); +static void func_80AF2DEC(EnRu2* this, GlobalContext* globalCtx); +static void func_80AF3144(EnRu2* this, GlobalContext* globalCtx); +static void func_80AF3174(EnRu2* this, GlobalContext* globalCtx); +static void func_80AF31C8(EnRu2* this, GlobalContext* globalCtx); +static void func_80AF3604(EnRu2* this, GlobalContext* globalCtx); +static void func_80AF3624(EnRu2* this, GlobalContext* globalCtx); +static void func_80AF366C(EnRu2* this, GlobalContext* globalCtx); +static void func_80AF36AC(EnRu2* this, GlobalContext* globalCtx); +static void func_80AF3BC8(EnRu2* this, GlobalContext* globalCtx); +static void func_80AF3C04(EnRu2* this, GlobalContext* globalCtx); +static void func_80AF3C64(EnRu2* this, GlobalContext* globalCtx); +static void func_80AF3CB8(EnRu2* this, GlobalContext* globalCtx); +static void func_80AF3D0C(EnRu2* this, GlobalContext* globalCtx); +static void func_80AF3D60(EnRu2* this, GlobalContext* globalCtx); + +static void func_80AF3F14(EnRu2* this, GlobalContext* globalCtx); +static void func_80AF3F20(EnRu2* this, GlobalContext* globalCtx); +static void func_80AF321C(EnRu2* this, GlobalContext* globalCtx); + +static void func_80AF2AB4(EnRu2* this, GlobalContext* globalCtx); + +static ColliderCylinderInit D_80AF40E0 = { + 0x0A, 0x00, 0x09, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00000000, 0x00, 0x00, 0x00, 0x00, 0x00000080, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x01, 0x00, 0x00, 0x001E, 0x0064, 0x0000, 0x0000, 0x0000, 0x0000, +}; + +static u32 D_80AF410C[] = { + 0x06000F20, + 0x060022E0, + 0x06002AE0, +}; + +static u32 D_80AF4118 = 0; + +#include "z_en_ru2_cutscene_data.c" + +static ActorFunc D_80AF50BC[] = { + (ActorFunc)func_80AF2CB4, (ActorFunc)func_80AF2CD4, (ActorFunc)func_80AF2CF4, (ActorFunc)func_80AF2D2C, + (ActorFunc)func_80AF2D6C, (ActorFunc)func_80AF2DAC, (ActorFunc)func_80AF2DEC, (ActorFunc)func_80AF3144, + (ActorFunc)func_80AF3174, (ActorFunc)func_80AF31C8, (ActorFunc)func_80AF3604, (ActorFunc)func_80AF3624, + (ActorFunc)func_80AF366C, (ActorFunc)func_80AF36AC, (ActorFunc)func_80AF3BC8, (ActorFunc)func_80AF3C04, + (ActorFunc)func_80AF3C64, (ActorFunc)func_80AF3CB8, (ActorFunc)func_80AF3D0C, (ActorFunc)func_80AF3D60, +}; + +static ActorFunc D_80AF510C[] = { + (ActorFunc)func_80AF3F14, + (ActorFunc)func_80AF3F20, + (ActorFunc)func_80AF321C, +}; + +const ActorInit En_Ru2_InitVars = { ACTOR_EN_RU2, ACTORTYPE_NPC, ROOM, @@ -22,155 +85,728 @@ const ActorInit En_Ru2_InitVars = (ActorFunc)EnRu2_Update, (ActorFunc)EnRu2_Draw, }; -*/ -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF2550.s") -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF259C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru2/EnRu2_Destroy.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF2608.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF2690.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF26A0.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF26AC.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF26D0.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF2744.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF278C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF27AC.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF27D0.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF281C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF2868.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF28E8.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF2978.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF2994.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF29DC.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF2A38.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF2AB4.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF2B44.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF2B94.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF2BC0.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF2C54.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF2C68.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF2CB4.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF2CD4.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF2CF4.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF2D2C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF2D6C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF2DAC.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF2DEC.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF2E1C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF2E64.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF2E84.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF2F04.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF2F58.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF30AC.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF3144.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF3174.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF31C8.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF321C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF3394.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF33E0.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF346C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF34A4.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF34F0.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF3530.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF3564.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF3604.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF3624.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF366C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF36AC.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF36EC.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF3718.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF3744.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF37AC.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF37CC.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF383C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF3878.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF38D0.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF390C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF39DC.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF3ADC.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF3B74.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF3BC8.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF3C04.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF3C64.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF3CB8.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF3D0C.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF3D60.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru2/EnRu2_Update.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru2/EnRu2_Init.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF3F14.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF3F20.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru2/EnRu2_Draw.s") +extern AnimationHeader* D_060004CC; +extern SkeletonHeader* D_0600C700; +extern AnimationHeader* D_0600D3DC; +extern AnimationHeader* D_0600DCAC; +extern AnimationHeader* D_06000DE8; +extern AnimationHeader* D_0600E630; +extern AnimationHeader* D_0600F03C; +extern AnimationHeader* D_0600F8B8; + +static void func_80AF2550(EnRu2* this, GlobalContext* globalCtx) { + EnRu2* thisLocal = this; + ActorCollider_AllocCylinder(globalCtx, &thisLocal->collider); + func_8005C450(globalCtx, &thisLocal->collider, &this->actor, &D_80AF40E0); +} + +static void func_80AF259C(EnRu2* this, GlobalContext* globalCtx) { + s32 pad; + ColliderCylinderMain* collider = &this->collider; + Actor* thisx = &this->actor; + s32 pad2[2]; + + ActorCollider_Cylinder_Update(thisx, collider); + Actor_CollisionCheck_SetAC(globalCtx, &globalCtx->sub_11E60, collider); +} + +static void EnRu2_Destroy(EnRu2* this, GlobalContext* globalCtx) { + ColliderCylinderMain* collider = &this->collider; + ActorCollider_FreeCylinder(globalCtx, collider); +} + +static void func_80AF2608(EnRu2* this) { + s32 pad[3]; + s16* unk_2A6 = &this->unk_2A6; + s16* unk_2A4 = &this->unk_2A4; + + if (!DECR(*unk_2A6)) { + *unk_2A6 = Math_Rand_S16Offset(0x3C, 0x3C); + } + + *unk_2A4 = *unk_2A6; + if (*unk_2A4 >= 3) { + *unk_2A4 = 0; + } +} + +s32 func_80AF2690(EnRu2* this) { + s32 params_shift = this->actor.params >> 8; + return params_shift & 0xFF; +} + +s32 func_80AF26A0(EnRu2* this) { + s16 params = this->actor.params; + return params & 0xFF; +} + +static void func_80AF26AC(EnRu2* this) { + this->action = 7; + this->drawConfig = 0; + this->unk_2B4 = 0; + this->unk_2B8 = 0; + this->actor.shape.unk_14 = 0; + this->unk_2B0 = 0.0f; +} + +static void func_80AF26D0(EnRu2* this, GlobalContext* globalCtx) { + s32 one; // Needed to match + if (globalCtx->csCtx.state == 0) { + if (D_80AF4118 != 0) { + if (this->actor.params == 2) { + func_80AF26AC(this); + } + D_80AF4118 = 0; + return; + } + } else { + one = 1; + if (D_80AF4118 == 0) { + D_80AF4118 = one; + } + } +} + +static void func_80AF2744(EnRu2* this, GlobalContext* globalCtx) { + func_8002E4B4(globalCtx, &this->actor, 75.0f, 30.0f, 30.0f, 4); +} + +s32 EnRu2_FrameUpdateMatrix(EnRu2* this) { + return SkelAnime_FrameUpdateMatrix(&this->skelAnime); +} + +CsCmdActorAction* func_80AF27AC(GlobalContext* globalCtx, s32 actorActionIdx) { + if (globalCtx->csCtx.state != 0) { + return globalCtx->csCtx.actorActions[actorActionIdx]; + } + return NULL; +} + +s32 func_80AF27D0(EnRu2* this, GlobalContext* globalCtx, u16 arg2, s32 actorActionIdx) { + CsCmdActorAction* csCmdActorAction = func_80AF27AC(globalCtx, actorActionIdx); + + if (csCmdActorAction != NULL && csCmdActorAction->action == arg2) { + return 1; + } + return 0; +} + +s32 func_80AF281C(EnRu2* this, GlobalContext* globalCtx, u16 arg2, s32 actorActionIdx) { + CsCmdActorAction* csCmdActorAction = func_80AF27AC(globalCtx, actorActionIdx); + + if (csCmdActorAction != NULL && csCmdActorAction->action != arg2) { + return 1; + } + return 0; +} + +static void func_80AF2868(EnRu2* this, GlobalContext* globalCtx, u32 actorActionIdx) { + CsCmdActorAction* csCmdActorAction = func_80AF27AC(globalCtx, actorActionIdx); + s16 newRotY; + Actor* thisx = &this->actor; + + if (csCmdActorAction != NULL) { + thisx->posRot.pos.x = csCmdActorAction->startPos.x; + thisx->posRot.pos.y = csCmdActorAction->startPos.y; + thisx->posRot.pos.z = csCmdActorAction->startPos.z; + newRotY = csCmdActorAction->rot.y; + thisx->shape.rot.y = newRotY; + thisx->posRot.rot.y = newRotY; + } +} + +static void func_80AF28E8(EnRu2* this, AnimationHeader* animation, u8 arg2, f32 transitionRate, s32 arg4) { + f32 frameCount = SkelAnime_GetFrameCount(&animation->genericHeader); + f32 playbackSpeed; + f32 unk0; + f32 fc; + + if (arg4 == 0) { + unk0 = 0.0f; + fc = frameCount; + playbackSpeed = 1.0f; + } else { + unk0 = frameCount; + fc = 0.0f; + playbackSpeed = -1.0f; + } + + SkelAnime_ChangeAnim(&this->skelAnime, animation, playbackSpeed, unk0, fc, arg2, transitionRate); +} + +static void func_80AF2978(EnRu2* this, GlobalContext* globalCtx) { + this->actor.shape.unk_08 += 83.333336f; +} + +static void func_80AF2994(EnRu2* this, GlobalContext* globalCtx) { + func_80AF28E8(this, &D_06000DE8, 0, 0.0f, 0); + this->actor.shape.unk_08 = -10000.0f; +} + +static void func_80AF29DC(EnRu2* this, GlobalContext* globalCtx) { + Actor* thisx = &this->actor; + f32 posX = thisx->posRot.pos.x; + f32 posY = thisx->posRot.pos.y; + f32 posZ = thisx->posRot.pos.z; + Actor_SpawnAttached(&globalCtx->actorCtx, &this->actor, globalCtx, ACTOR_DOOR_WARP1, posX, posY, posZ, 0, 0, 0, 2); +} + +static void func_80AF2A38(EnRu2* this, GlobalContext* globalCtx) { + Player* player = PLAYER; + f32 posX = player->actor.posRot.pos.x; + f32 posY = player->actor.posRot.pos.y + 50.0f; + f32 posZ = player->actor.posRot.pos.z; + + Actor_SpawnAttached(&globalCtx->actorCtx, &this->actor, globalCtx, ACTOR_DEMO_EFFECT, posX, posY, posZ, 0, 0, 0, + 10); + Item_Give(globalCtx, ITEM_MEDALLION_WATER); +} + +static void func_80AF2AB4(EnRu2* this, GlobalContext* globalCtx) { + s32 pad[2]; + Player* player; + s16 temp; + + if (gSaveContext.chamber_cutscene_num == 2 && gSaveContext.scene_setup_index < 4) { + player = PLAYER; + this->action = 1; + globalCtx->csCtx.segment = &D_80AF411C; + gSaveContext.cutscene_trigger = 2; + Item_Give(globalCtx, ITEM_MEDALLION_WATER); + temp = this->actor.posRot.rot.y + 0x8000; + player->actor.shape.rot.y = temp; + player->actor.posRot.rot.y = temp; + } +} + +static void func_80AF2B44(EnRu2* this, GlobalContext* globalCtx) { + CutsceneContext* csCtx = &globalCtx->csCtx; + CsCmdActorAction* csCmdActorAction; + if (csCtx->state != 0) { + csCmdActorAction = csCtx->actorActions[3]; + if (csCmdActorAction != NULL && csCmdActorAction->action == 2) { + this->action = 2; + this->drawConfig = 1; + func_80AF29DC(this, globalCtx); + } + } +} + +static void func_80AF2B94(EnRu2* this) { + if (this->actor.shape.unk_08 >= 0.0f) { + this->action = 3; + this->actor.shape.unk_08 = 0.0f; + } +} + +static void func_80AF2BC0(EnRu2* this, GlobalContext* globalCtx) { + AnimationHeader* animation = &D_0600D3DC; + CsCmdActorAction* csCmdActorAction; + if (globalCtx->csCtx.state != 0) { + csCmdActorAction = globalCtx->csCtx.actorActions[3]; + if (csCmdActorAction != NULL && csCmdActorAction->action == 3) { + SkelAnime_ChangeAnim(&this->skelAnime, animation, 1.0f, 0.0f, SkelAnime_GetFrameCount(animation), 2, 0.0f); + this->action = 4; + } + } +} + +static void func_80AF2C54(EnRu2* this, UNK_TYPE arg1) { + if (arg1 != 0) { + this->action = 5; + } +} + +static void func_80AF2C68(EnRu2* this, GlobalContext* globalCtx) { + CsCmdActorAction* csCmdActorAction; + if (globalCtx->csCtx.state != 0) { + csCmdActorAction = globalCtx->csCtx.actorActions[6]; + if (csCmdActorAction != NULL && csCmdActorAction->action == 2) { + this->action = 6; + func_80AF2A38(this, globalCtx); + } + } +} + +static void func_80AF2CB4(EnRu2* this, GlobalContext* globalCtx) { + func_80AF2AB4(this, globalCtx); +} + +static void func_80AF2CD4(EnRu2* this, GlobalContext* globalCtx) { + func_80AF2B44(this, globalCtx); +} + +static void func_80AF2CF4(EnRu2* this, GlobalContext* globalCtx) { + func_80AF2978(this, globalCtx); + EnRu2_FrameUpdateMatrix(this); + func_80AF2608(this); + func_80AF2B94(this); +} + +static void func_80AF2D2C(EnRu2* this, GlobalContext* globalCtx) { + func_80AF2744(this, globalCtx); + EnRu2_FrameUpdateMatrix(this); + func_80AF2608(this); + func_80AF2BC0(this, globalCtx); +} + +static void func_80AF2D6C(EnRu2* this, GlobalContext* globalCtx) { + UNK_TYPE something; + + func_80AF2744(this, globalCtx); + something = EnRu2_FrameUpdateMatrix(this); + func_80AF2608(this); + func_80AF2C54(this, something); +} + +static void func_80AF2DAC(EnRu2* this, GlobalContext* globalCtx) { + func_80AF2744(this, globalCtx); + EnRu2_FrameUpdateMatrix(this); + func_80AF2608(this); + func_80AF2C68(this, globalCtx); +} + +static void func_80AF2DEC(EnRu2* this, GlobalContext* globalCtx) { + func_80AF2744(this, globalCtx); + EnRu2_FrameUpdateMatrix(this); + func_80AF2608(this); +} + +static void func_80AF2E1C(EnRu2* this, GlobalContext* globalCtx) { + func_80AF28E8(this, &D_060004CC, 2, 0.0f, 0); + this->action = 7; + this->actor.shape.unk_14 = 0; +} + +static void func_80AF2E64() { + func_800788CC(NA_SE_SY_WHITE_OUT_T); +} + +static void func_80AF2E84(EnRu2* this, GlobalContext* globalCtx) { + Actor_SpawnAttached(&globalCtx->actorCtx, &this->actor, globalCtx, ACTOR_DEMO_6K, this->actor.posRot.pos.x, + kREG(19) + 24.0f + this->actor.posRot.pos.y, this->actor.posRot.pos.z, 0, 0, 0, 8); +} + +static void func_80AF2F04(EnRu2* this, GlobalContext* globalCtx) { + if (func_80AF27D0(this, globalCtx, 4, 3)) { + this->action = 8; + this->drawConfig = 2; + this->unk_2B4 = 0; + this->actor.shape.unk_14 = 0; + this->unk_2B0 = 0.0f; + func_80AF2E64(); + } +} + +static void func_80AF2F58(EnRu2* this, GlobalContext* globalCtx) { + f32* unk_2B0 = &this->unk_2B0; + s32 something; + + if (func_80AF27D0(this, globalCtx, 4, 3)) { + *unk_2B0 += 1.0f; + if (*unk_2B0 >= kREG(5) + 10.0f) { + this->action = 9; + this->drawConfig = 1; + *unk_2B0 = kREG(5) + 10.0f; + this->unk_2B4 = 0xFF; + this->actor.shape.unk_14 = 0xFF; + return; + } + } else { + *unk_2B0 -= 1.0f; + if (*unk_2B0 <= 0.0f) { + this->action = 7; + this->drawConfig = 0; + *unk_2B0 = 0.0f; + this->unk_2B4 = 0; + this->actor.shape.unk_14 = 0; + return; + } + } + something = (*unk_2B0 / (kREG(5) + 10.0f)) * 255.0f; + this->unk_2B4 = something; + this->actor.shape.unk_14 = something; +} + +static void func_80AF30AC(EnRu2* this, GlobalContext* globalCtx) { + if (func_80AF281C(this, globalCtx, 4, 3)) { + this->action = 8; + this->drawConfig = 2; + this->unk_2B0 = kREG(5) + 10.0f; + this->unk_2B4 = 0xFF; + if (this->unk_2B8 == 0) { + func_80AF2E84(this, globalCtx); + this->unk_2B8 = 1; + } + this->actor.shape.unk_14 = 0xFF; + } +} + +static void func_80AF3144(EnRu2* this, GlobalContext* globalCtx) { + func_80AF2F04(this, globalCtx); + func_80AF26D0(this, globalCtx); +} + +static void func_80AF3174(EnRu2* this, GlobalContext* globalCtx) { + func_80AF2744(this, globalCtx); + EnRu2_FrameUpdateMatrix(this); + func_80AF2608(this); + func_80AF2F58(this, globalCtx); + func_80AF26D0(this, globalCtx); +} + +static void func_80AF31C8(EnRu2* this, GlobalContext* globalCtx) { + func_80AF2744(this, globalCtx); + EnRu2_FrameUpdateMatrix(this); + func_80AF2608(this); + func_80AF30AC(this, globalCtx); + func_80AF26D0(this, globalCtx); +} + +static void func_80AF321C(EnRu2* this, GlobalContext* globalCtx) { + s32 pad[2]; + s16 temp = this->unk_2A4; + UNK_PTR addr = D_80AF410C[temp]; + SkelAnime* skelAnime = &this->skelAnime; + GraphicsContext* gfxCtx = globalCtx->state.gfxCtx; + Gfx* dispRefs[4]; + + Graph_OpenDisps(dispRefs, globalCtx->state.gfxCtx, "../z_en_ru2_inKenjyanomaDemo02.c", 264); + func_80093D84(globalCtx->state.gfxCtx); + + gSPSegment(gfxCtx->polyXlu.p++, 0x08, SEGMENTED_TO_VIRTUAL(addr)); + gSPSegment(gfxCtx->polyXlu.p++, 0x09, SEGMENTED_TO_VIRTUAL(addr)); + gDPSetEnvColor(gfxCtx->polyXlu.p++, 0x00, 0x00, 0x00, this->unk_2B4); + gSPSegment(gfxCtx->polyXlu.p++, 0x0C, &D_80116280[0]); + + gfxCtx->polyXlu.p = SkelAnime_DrawSV2(globalCtx, skelAnime->skeleton, skelAnime->actorDrawTbl, + skelAnime->dListCount, NULL, NULL, NULL, gfxCtx->polyXlu.p); + + Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_en_ru2_inKenjyanomaDemo02.c", 291); +} + +static void func_80AF3394(EnRu2* this, GlobalContext* globalCtx) { + func_80AF28E8(this, &D_0600E630, 0, 0.0f, 0); + this->action = 10; + this->drawConfig = 0; + this->actor.shape.unk_14 = 0; +} + +static void func_80AF33E0(EnRu2* this) { + f32* unk_2B0 = &this->unk_2B0; + f32 temp_f0; + s32 temp_f18; + + *unk_2B0 += 1.0f; + + temp_f0 = kREG(17) + 10.0f; + if (temp_f0 <= *unk_2B0) { + this->unk_2B4 = 0xFF; + this->actor.shape.unk_14 = 0xFF; + } else { + temp_f18 = (*unk_2B0 / temp_f0) * 255.0f; + this->unk_2B4 = temp_f18; + this->actor.shape.unk_14 = temp_f18; + } +} + +static void func_80AF346C(EnRu2* this, GlobalContext* globalCtx) { + func_80AF2868(this, globalCtx, 3); + this->action = 11; + this->drawConfig = 2; +} + +static void func_80AF34A4(EnRu2* this) { + if (this->unk_2B0 >= kREG(17) + 10.0f) { + this->action = 12; + this->drawConfig = 1; + } +} + +static void func_80AF34F0(EnRu2* this) { + func_80AF28E8(this, &D_0600DCAC, 2, 0.0f, 0); + this->action = 13; +} + +static void func_80AF3530(EnRu2* this, UNK_TYPE arg1) { + if (arg1 != 0) { + func_80AF28E8(this, &D_0600F03C, 0, 0.0f, 0); + } +} + +static void func_80AF3564(EnRu2* this, GlobalContext* globalCtx) { + CsCmdActorAction* csCmdActorAction = func_80AF27AC(globalCtx, 3); + s32 action; + s32 unk_2BC; + + if (csCmdActorAction != NULL) { + action = csCmdActorAction->action; + unk_2BC = this->unk_2BC; + if (action != unk_2BC) { + switch (action) { + case 7: + func_80AF346C(this, globalCtx); + break; + case 8: + func_80AF34F0(this); + break; + default: + osSyncPrintf("En_Ru2_inEnding_Check_DemoMode:そんな動作は無い!!!!!!!!\n"); + break; + } + this->unk_2BC = action; + } + } +} + +static void func_80AF3604(EnRu2* this, GlobalContext* globalCtx) { + func_80AF3564(this, globalCtx); +} + +static void func_80AF3624(EnRu2* this, GlobalContext* globalCtx) { + func_80AF2744(this, globalCtx); + EnRu2_FrameUpdateMatrix(this); + func_80AF2608(this); + func_80AF33E0(this); + func_80AF34A4(this); +} + +static void func_80AF366C(EnRu2* this, GlobalContext* globalCtx) { + func_80AF2744(this, globalCtx); + EnRu2_FrameUpdateMatrix(this); + func_80AF2608(this); + func_80AF3564(this, globalCtx); +} + +static void func_80AF36AC(EnRu2* this, GlobalContext* globalCtx) { + UNK_TYPE something; + + func_80AF2744(this, globalCtx); + something = EnRu2_FrameUpdateMatrix(this); + func_80AF2608(this); + func_80AF3530(this, something); +} + +static void func_80AF36EC(EnRu2* this, GlobalContext* globalCtx) { + Flags_SetSwitch(globalCtx, func_80AF2690(this)); +} + +s32 func_80AF3718(EnRu2* this, GlobalContext* globalCtx) { + return Flags_GetSwitch(globalCtx, func_80AF2690(this)); +} + +static void func_80AF3744(EnRu2* this, GlobalContext* globalCtx) { + if (func_80AF3718(this, globalCtx)) { + Actor_Kill(&this->actor); + } else { + func_80AF28E8(this, &D_06000DE8, 0, 0.0f, 0); + this->action = 14; + this->drawConfig = 1; + } +} + +static void func_80AF37AC() { + func_800F5C64(0x51); +} + +static void func_80AF37CC(EnRu2* this) { + f32 funcFloat; + this->unk_2C0 += 1; + funcFloat = func_8006F9BC((kREG(2) + 0x96) & 0xFFFF, 0, this->unk_2C0, 8, 0); + this->actor.posRot.pos.y = this->actor.initPosRot.pos.y + (300.0f * funcFloat); +} + +s32 func_80AF383C(EnRu2* this, GlobalContext* globalCtx) { + Player* player = PLAYER; + f32 thisPosX = this->actor.posRot.pos.x; + f32 playerPosX = player->actor.posRot.pos.x; + if (playerPosX - thisPosX >= -202.0f) { + return 1; + } + return 0; +} + +static void func_80AF3878(EnRu2* this, GlobalContext* globalCtx) { + if (func_80AF383C(this, globalCtx) && !func_800BFC84(globalCtx)) { + this->action = 16; + func_800800F8(globalCtx, 0xC3A, -0x63, &this->actor, 0); + } +} + +static void func_80AF38D0(EnRu2* this, GlobalContext* globalCtx) { + this->action = 16; + func_800800F8(globalCtx, 0xC3A, -0x63, &this->actor, 0); +} + +static void func_80AF390C(EnRu2* this, GlobalContext* globalCtx) { + f32* unk_2C4 = &this->unk_2C4; + *unk_2C4 += 1.0f; + if (*unk_2C4 == kREG(6) + 40.0f) { + func_80AF37AC(); + } else if (*unk_2C4 > kREG(4) + 50.0f) { + this->actor.textId = 0x403E; + func_8010B680(globalCtx, this->actor.textId, 0); + this->action = 17; + } +} + +static void func_80AF39DC(EnRu2* this, GlobalContext* globalCtx) { + s32 pad; + MessageContext* msgCtx; + s32 pad2; + u8 dialogState; + Player* player; + s32 pad3; + + msgCtx = &globalCtx->msgCtx; + dialogState = func_8010BDBC(msgCtx); + + if (dialogState == 3) { + if (this->unk_2C3 != 3) { + osSyncPrintf("おれが小松だ！ \n"); + this->unk_2C2++; + if (this->unk_2C2 % 6 == 3) { + player = PLAYER; + osSyncPrintf("うおりゃー！ \n"); + func_8005B1A4(globalCtx->cameraCtx.activeCameraPtrs[globalCtx->cameraCtx.unk_5C0]); + player->actor.posRot.pos.x = 820.0f; + player->actor.posRot.pos.y = 0.0f; + player->actor.posRot.pos.z = 180.0f; + } + } + } + + this->unk_2C3 = dialogState; + if (func_8010BDBC(msgCtx) == 2) { + this->action = 18; + func_8005B1A4(globalCtx->cameraCtx.activeCameraPtrs[globalCtx->cameraCtx.unk_5C0]); + } +} + +static void func_80AF3ADC(EnRu2* this, GlobalContext* globalCtx) { + this->unk_2C4 += 1.0f; + if (this->unk_2C4 > kREG(5) + 100.0f) { + func_80AF28E8(this, &D_0600F8B8, 0, -12.0f, 0); + this->action = 0x13; + func_80AF36EC(this, globalCtx); + } +} + +static void func_80AF3B74(EnRu2* this, GlobalContext* globalCtx) { + if (this->unk_2C0 > (((u16)(kREG(3) + 0x28)) + ((u16)(kREG(2) + 0x96)) & 0xFFFF)) { + Actor_Kill(&this->actor); + } +} + +static void func_80AF3BC8(EnRu2* this, GlobalContext* globalCtx) { + func_80AF3878(this, globalCtx); + Actor_SetHeight(&this->actor, 50.0f); + func_80AF259C(this, globalCtx); +} + +static void func_80AF3C04(EnRu2* this, GlobalContext* globalCtx) { + func_80AF2744(this, globalCtx); + func_80AF259C(this, globalCtx); + EnRu2_FrameUpdateMatrix(this); + func_80AF2608(this); + Actor_SetHeight(&this->actor, 50.0f); + func_80AF38D0(this, globalCtx); +} + +static void func_80AF3C64(EnRu2* this, GlobalContext* globalCtx) { + func_80AF2744(this, globalCtx); + EnRu2_FrameUpdateMatrix(this); + func_80AF2608(this); + Actor_SetHeight(&this->actor, 50.0f); + func_80AF390C(this, globalCtx); +} + +static void func_80AF3CB8(EnRu2* this, GlobalContext* globalCtx) { + func_80AF2744(this, globalCtx); + EnRu2_FrameUpdateMatrix(this); + func_80AF2608(this); + Actor_SetHeight(&this->actor, 50.0f); + func_80AF39DC(this, globalCtx); +} + +static void func_80AF3D0C(EnRu2* this, GlobalContext* globalCtx) { + func_80AF2744(this, globalCtx); + EnRu2_FrameUpdateMatrix(this); + func_80AF2608(this); + Actor_SetHeight(&this->actor, 50.0f); + func_80AF3ADC(this, globalCtx); +} + +static void func_80AF3D60(EnRu2* this, GlobalContext* globalCtx) { + func_80AF37CC(this); + func_80AF2744(this, globalCtx); + EnRu2_FrameUpdateMatrix(this); + func_80AF2608(this); + Actor_SetHeight(&this->actor, 50.0f); + func_80AF3B74(this, globalCtx); +} + +static void EnRu2_Update(EnRu2* this, GlobalContext* globalCtx) { + if (this->action < 0 || this->action >= 20 || D_80AF50BC[this->action] == 0) { + osSyncPrintf(VT_FGCOL(RED) "メインモードがおかしい!!!!!!!!!!!!!!!!!!!!!!!!!\n" VT_RST); + return; + } + D_80AF50BC[this->action](this, globalCtx); +} + +static void EnRu2_Init(EnRu2* this, GlobalContext* globalCtx) { + ActorShape_Init(&this->actor.shape, 0.0f, ActorShadow_DrawFunc_Circle, 30.0f); + func_80AF2550(this, globalCtx); + SkelAnime_InitSV(globalCtx, &this->skelAnime, &D_0600C700, NULL, &this->unk_190, &this->unk_21A, 0x17); + + switch (func_80AF26A0(this)) { + case 2: + func_80AF2E1C(this, globalCtx); + break; + case 3: + func_80AF3394(this, globalCtx); + break; + case 4: + func_80AF3744(this, globalCtx); + break; + default: + func_80AF2994(this, globalCtx); + break; + } + + this->unk_2C2 = 0; + this->unk_2C3 = 3; +} + +static void func_80AF3F14(EnRu2* this, GlobalContext* globalCtx) { +} + +static void func_80AF3F20(EnRu2* this, GlobalContext* globalCtx) { + s32 pad[2]; + s16 temp = this->unk_2A4; + UNK_PTR addr = D_80AF410C[temp]; + SkelAnime* skelAnime = &this->skelAnime; + GraphicsContext* gfxCtx = globalCtx->state.gfxCtx; + Gfx* dispRefs[4]; + + Graph_OpenDisps(dispRefs, globalCtx->state.gfxCtx, "../z_en_ru2.c", 642); + func_80093D18(globalCtx->state.gfxCtx); + + gSPSegment(gfxCtx->polyOpa.p++, 0x08, SEGMENTED_TO_VIRTUAL(addr)); + gSPSegment(gfxCtx->polyOpa.p++, 0x09, SEGMENTED_TO_VIRTUAL(addr)); + gDPSetEnvColor(gfxCtx->polyOpa.p++, 0x00, 0x00, 0x00, 0xFF); + gSPSegment(gfxCtx->polyOpa.p++, 0x0C, &D_80116280[2]); + + SkelAnime_DrawSV(globalCtx, skelAnime->skeleton, skelAnime->actorDrawTbl, skelAnime->dListCount, NULL, NULL, + &this->actor); + Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_en_ru2.c", 663); +} + +static void EnRu2_Draw(EnRu2* this, GlobalContext* globalCtx) { + if (this->drawConfig < 0 || this->drawConfig >= 3 || D_80AF510C[this->drawConfig] == 0) { + osSyncPrintf(VT_FGCOL(RED) "描画モードがおかしい!!!!!!!!!!!!!!!!!!!!!!!!!\n" VT_RST); + return; + } + D_80AF510C[this->drawConfig](this, globalCtx); +} diff --git a/src/overlays/actors/ovl_En_Ru2/z_en_ru2.h b/src/overlays/actors/ovl_En_Ru2/z_en_ru2.h index 0d727163dd..441e6ccc51 100644 --- a/src/overlays/actors/ovl_En_Ru2/z_en_ru2.h +++ b/src/overlays/actors/ovl_En_Ru2/z_en_ru2.h @@ -4,10 +4,26 @@ #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ Actor actor; - /* 0x014C */ char unk_14C[0x1C8]; + /* 0x014C */ SkelAnime skelAnime; + /* 0x0190 */ s8 unk_190; // likely a struct + /* 0x0191 */ char unk_191[0x89]; + /* 0x021A */ s8 unk_21A; // another of the same struct + /* 0x021B */ char unk_21B[0x89]; + /* 0x02A4 */ s16 unk_2A4; + /* 0x02A6 */ s16 unk_2A6; + /* 0x02A8 */ s32 action; + /* 0x02AC */ s32 drawConfig; + /* 0x02B0 */ f32 unk_2B0; + /* 0x02B4 */ u32 unk_2B4; + /* 0x02B8 */ s32 unk_2B8; + /* 0x02BC */ s32 unk_2BC; + /* 0x02C0 */ u16 unk_2C0; + /* 0x02C2 */ u8 unk_2C2; + /* 0x02C3 */ u8 unk_2C3; + /* 0x02C4 */ f32 unk_2C4; + /* 0x02C8 */ ColliderCylinderMain collider; } EnRu2; // size = 0x0314 extern const ActorInit En_Ru2_InitVars; diff --git a/src/overlays/actors/ovl_En_Ru2/z_en_ru2_cutscene_data.c b/src/overlays/actors/ovl_En_Ru2/z_en_ru2_cutscene_data.c new file mode 100644 index 0000000000..8f8d3cb13f --- /dev/null +++ b/src/overlays/actors/ovl_En_Ru2/z_en_ru2_cutscene_data.c @@ -0,0 +1,116 @@ +#include "z_en_ru2.h" + +static u32 D_80AF411C[] = { + 0x00000023, 0x00000D0A, 0x00000020, 0x00000001, 0x00010000, 0x0BB80000, 0x00000000, 0x00000000, 0xFFFFFFFC, + 0x00000002, 0x00000000, 0xFFFFFFFC, 0x00000002, 0x00000000, 0x00000000, 0x00000000, 0x0000001F, 0x00000005, + 0x00010000, 0x033D0000, 0x00000000, 0x00000000, 0x000000D8, 0x00000000, 0x00000000, 0x000000D8, 0x00000000, + 0x00000000, 0x00000000, 0x00000000, 0x0002033D, 0x033E0000, 0x00000000, 0x00000000, 0x000000D8, 0x00000000, + 0x00000000, 0x000000D8, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0004033E, 0x03820000, 0x00000000, + 0x00000000, 0x000000D8, 0x00000000, 0x00000000, 0x000000D8, 0x00000000, 0x00000000, 0x00000000, 0x00000000, + 0x00020382, 0x03B40000, 0x00000000, 0x00000000, 0x000000D8, 0x00000000, 0x00000000, 0x00000052, 0x00000000, + 0x00000000, 0xC02B851F, 0x00000000, 0x000303B4, 0x0D0A0000, 0x00000000, 0x00000000, 0x00000052, 0x00000000, + 0x00000000, 0x00000052, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000000A, 0x00000005, 0x000D0000, + 0x00F00000, 0x00000000, 0x00000000, 0x00000006, 0x00000000, 0x00000000, 0x00000006, 0x00000000, 0x00000000, + 0x00000000, 0x00000000, 0x000500F0, 0x02080000, 0x40000000, 0x00000000, 0x00000006, 0x00000000, 0x00000000, + 0x00000006, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00030208, 0x02260000, 0x40000000, 0x00000000, + 0x00000006, 0x00000000, 0x00000000, 0x00000006, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00050226, + 0x03210000, 0x40000000, 0x00000000, 0x00000006, 0x00000000, 0x00000000, 0x00000006, 0x00000000, 0x00000000, + 0x00000000, 0x00000000, 0x00130321, 0x07A40000, 0xC0000000, 0x00000000, 0x00000006, 0x00000000, 0x00000000, + 0x00000006, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000031, 0x00000001, 0x00010000, 0x0BB80000, + 0x00000000, 0x00000000, 0xFFFFFFF0, 0xFFFFFF87, 0x00000000, 0xFFFFFFF0, 0xFFFFFF87, 0x00000000, 0x00000000, + 0x00000000, 0x00000004, 0x00000005, 0x00050000, 0x01800000, 0x00000000, 0xFFFFFFA1, 0x00000000, 0x00000058, + 0xFFFFFFA1, 0x00000000, 0x00000058, 0x00000000, 0x00000000, 0x00000000, 0x00060180, 0x01C60000, 0x00000000, + 0xFFFFFFA1, 0x00000000, 0x00000058, 0xFFFFFFA1, 0x00000000, 0x00000058, 0x00000000, 0x00000000, 0x00000000, + 0x000501C6, 0x022A0000, 0x00000000, 0xFFFFFFA1, 0x00000000, 0x00000058, 0xFFFFFFA1, 0x00000000, 0x00000058, + 0x00000000, 0x00000000, 0x00000000, 0x0006022A, 0x02700000, 0x00000000, 0xFFFFFFA1, 0x00000000, 0x00000058, + 0xFFFFFFA1, 0x00000000, 0x00000058, 0x00000000, 0x00000000, 0x00000000, 0x00050270, 0x0BB90000, 0x00000000, + 0xFFFFFFA1, 0x00000000, 0x00000058, 0xFFFFFFA1, 0x00000000, 0x00000058, 0x00000000, 0x00000000, 0x00000000, + 0x00000027, 0x00000001, 0x00010000, 0x0BB80000, 0x00000000, 0x00000000, 0x00000000, 0xFFFFFFFE, 0x00000000, + 0x00000000, 0xFFFFFFFE, 0x00000000, 0x00000000, 0x00000000, 0x0000002A, 0x00000003, 0x00010000, 0x00920000, + 0x00000000, 0x000000C3, 0x00000006, 0x00000000, 0x000000C3, 0x00000006, 0x00000000, 0x00000000, 0x00000000, + 0x00000000, 0x00020092, 0x02F20000, 0x00000000, 0x000000C3, 0x00000006, 0x00000000, 0x000000C3, 0x00000006, + 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x000302F2, 0x0A440000, 0x00000000, 0x000000C3, 0x00000006, + 0x00000000, 0x000000C3, 0x00000006, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0000002D, 0x00000001, + 0x0001032A, 0x03370337, 0x0000002D, 0x00000001, 0x00050339, 0x03570357, 0x0000002D, 0x00000001, 0x00010442, + 0x04610461, 0x00000001, 0x00010000, 0x012D0000, 0x00000000, 0x432F65F8, 0xFD97001E, 0x00470000, 0x00000000, + 0x432F65F8, 0xFD97001E, 0x00471FBC, 0x00000000, 0x432F65F8, 0xFD97001E, 0x0047D5E0, 0x00000000, 0x432F65F8, + 0xFD97001E, 0x00470000, 0x00000000, 0x432F65F8, 0xFD97001E, 0x00471F98, 0x00000000, 0x432F65F8, 0xFD97001E, + 0x00470000, 0x00000000, 0x4311CC7C, 0xFE38006B, 0x00380000, 0x00000000, 0x42726667, 0xFFB40036, 0x00470164, + 0x00000000, 0x42726667, 0x00740036, 0x00602100, 0x00000000, 0x42726667, 0x00EC000B, 0x00400049, 0x00000000, + 0x42726667, 0x00EC000B, 0x0040204C, 0x00000000, 0x42726667, 0x00EC000B, 0x0040E990, 0xFF000000, 0x42726667, + 0x00EC000B, 0x00400000, 0x00000001, 0x00010107, 0x05CC0000, 0x00000000, 0x4228E87B, 0x00A10035, 0x001A0000, + 0x00000000, 0x4228E87B, 0x00A10035, 0x001A1FBC, 0x00000000, 0x4228E87B, 0x00A10035, 0x001AD5E0, 0x00000000, + 0x4228E87B, 0x00820009, 0x00600000, 0x00000000, 0x4228E87B, 0x00820009, 0x00601F98, 0x00000000, 0x4228E87B, + 0x00820009, 0x00600000, 0x00000000, 0x4228E87B, 0x00820009, 0x00600000, 0xFF000000, 0x4228E87B, 0x00820009, + 0x00600164, 0x00000001, 0x0001017F, 0x05C20000, 0x00000000, 0x428C743C, 0x00CF002D, 0x00220000, 0x00000000, + 0x428C743C, 0x00CF002D, 0x00221FBC, 0x00000000, 0x428C743C, 0x00CF002D, 0x0022D5E0, 0x00000000, 0x428C743C, + 0x00CF002D, 0x00220000, 0xFF000000, 0x428C743C, 0x00CF002D, 0x00221F98, 0x00000001, 0x000101C5, 0x06080000, + 0x00000000, 0x42341BB1, 0xFFC6005A, 0x00460000, 0x00000000, 0x42341BB1, 0xFFC6005A, 0x00461FBC, 0x00000000, + 0x42341BB1, 0xFFC6005A, 0x0046D5E0, 0x00000000, 0x42341BB1, 0xFFC6005A, 0x00460000, 0xFF000000, 0x42341BB1, + 0xFFC6005A, 0x00461F98, 0x00000001, 0x00010229, 0x066C0000, 0x00000000, 0x428C743C, 0x00CF002D, 0x00220000, + 0x00000000, 0x428C743C, 0x00CF002D, 0x00221FBC, 0x00000000, 0x428C743C, 0x00CF002D, 0x0022D5E0, 0x00000000, + 0x428C743C, 0x00CF002D, 0x00220000, 0xFF000000, 0x428C743C, 0x00CF002D, 0x00221F98, 0x00000001, 0x0001026F, + 0x06B20000, 0x00000000, 0x4271B55A, 0x00A1003B, 0x00000000, 0x00000000, 0x4271B55A, 0x00A1003B, 0x00001FBC, + 0x00000000, 0x4271B55A, 0x00A1003B, 0x0000D5E0, 0x00000000, 0x4271B55A, 0x00A1003B, 0x00000000, 0xFF000000, + 0x4271B55A, 0x00A1003B, 0x00001F98, 0x00000001, 0x000102B5, 0x06F80000, 0x00000000, 0x4271B55A, 0x00970052, + 0x00230000, 0x00000000, 0x4271B55A, 0x00970052, 0x00231FBC, 0x00000000, 0x4271B55A, 0x00970052, 0x0023D5E0, + 0x00000000, 0x4271B55A, 0x00970052, 0x00230000, 0xFF000000, 0x4271B55A, 0x00970052, 0x00231F98, 0x00000001, + 0x000102FB, 0x03B00000, 0x00000000, 0x4271B55A, 0x00E60007, 0x00180000, 0x00000000, 0x4271B55A, 0x00E60007, + 0x00181FBC, 0x00000000, 0x4271B55A, 0x00E60007, 0x0018D5E0, 0x00000000, 0x4271B55A, 0x00CF003E, 0x000F0000, + 0x00000000, 0x428CDAA2, 0x00E600F0, 0x00181F98, 0x00000000, 0x428CDAA2, 0x00E600F0, 0x00180000, 0x00000000, + 0x428CDAA2, 0x00E600F0, 0x00180000, 0xFF000000, 0x428CDAA2, 0x00E600F0, 0x00180164, 0x00000001, 0x00010337, + 0x048D0000, 0x00000000, 0x42700000, 0x000D0356, 0x00020000, 0x00000000, 0x42700000, 0x00090355, 0x00051FBC, + 0x00000000, 0x42700000, 0xFFFD0355, 0x0005D5E0, 0x00000000, 0x42700000, 0xFFF70355, 0xFFFA0000, 0x00000000, + 0x42700000, 0xFFFE0354, 0xFFEF1F98, 0x00000000, 0x42700000, 0x00090354, 0xFFEF0000, 0x00000000, 0x42700000, + 0x00100354, 0xFFFA0000, 0x00000000, 0x42700000, 0x00090354, 0x00050164, 0xFF000000, 0x42700000, 0xFFFD0353, + 0x00052100, 0x00000005, 0x00010383, 0x08200000, 0x00000000, 0x4289332C, 0x00000021, 0xFFE50000, 0x00000000, + 0x4289332C, 0x00000021, 0xFFE51FBC, 0x00000000, 0x4289332C, 0x00000044, 0xFFE6D5E0, 0x00000000, 0x4289332C, + 0x00000067, 0xFFE60000, 0x00000000, 0x4289332C, 0x00000067, 0xFFE61F98, 0x00000000, 0x4289332C, 0x00000067, + 0xFFE60000, 0x00000000, 0x4289332C, 0x00000067, 0xFFE60000, 0xFF000000, 0x4289332C, 0x00000067, 0xFFE60164, + 0x00000002, 0x00010000, 0x014A0000, 0x001E0014, 0x432F65F8, 0xFD77FFB5, 0x00650000, 0x00E20014, 0x432F65F8, + 0xFD74FFB5, 0x00621FBC, 0x001E0014, 0x432F65F8, 0xFD6EFFB5, 0x0057D5E0, 0x00E20014, 0x432F65F8, 0xFD5A007F, + 0x00470000, 0x00000014, 0x432F65F8, 0xFD290000, 0x00471F98, 0x00000014, 0x4311CC7C, 0xFDFF0000, 0x002B0000, + 0x0000001E, 0x42726667, 0xFEA30059, 0x002F0000, 0x0000001E, 0x42726667, 0x0006003D, 0x00010164, 0x0000001E, + 0x42726667, 0x00210042, 0x001C2100, 0x0000001E, 0x42726667, 0x009E002A, 0x00010049, 0x0000001E, 0x42726667, + 0x009E002A, 0x0001204C, 0x0000001E, 0x42726667, 0x009E002A, 0x0001E990, 0xFF00001E, 0x42726667, 0x009E002A, + 0x00010000, 0x00000002, 0x00010107, 0x05E90000, 0x0000001E, 0x4228E87B, 0x0142003E, 0xFF860000, 0x0000001E, + 0x4228E87B, 0x0142003E, 0xFF861FBC, 0x00000032, 0x4228E87B, 0x0142003E, 0xFF86D5E0, 0x00000032, 0x4228E87B, + 0x00E8003F, 0xFFAD0000, 0x0000001E, 0x4228E87B, 0x00E8003F, 0xFFAD1F98, 0x000003E8, 0x4228E87B, 0x00E8003F, + 0xFFAD0000, 0x0000001E, 0x4228E87B, 0x00E8003F, 0xFFAD0000, 0xFF00001E, 0x4228E87B, 0x00E8003F, 0xFFAD0164, + 0x00000002, 0x0001017F, 0x05DF0000, 0x0000001E, 0x428C743C, 0x0033003E, 0xFF970000, 0x0000001E, 0x428C743C, + 0x0033003E, 0xFF971FBC, 0x000003E8, 0x428C743C, 0x0033003E, 0xFF97D5E0, 0x0000001E, 0x428C743C, 0x0033003E, + 0xFF970000, 0xFF00001E, 0x428C743C, 0x0033003E, 0xFF971F98, 0x00000002, 0x000101C5, 0x06250000, 0x0000001E, + 0x42341BB1, 0x00660016, 0xFFE10000, 0x0000001E, 0x42341BB1, 0x00660016, 0xFFE11FBC, 0x000003E8, 0x42341BB1, + 0x00660016, 0xFFE1D5E0, 0x0000001E, 0x42341BB1, 0x00660016, 0xFFE10000, 0xFF00001E, 0x42341BB1, 0x00660016, + 0xFFE11F98, 0x00000002, 0x00010229, 0x06890000, 0x0000001E, 0x428C743C, 0x0033003E, 0xFF970000, 0x0000001E, + 0x428C743C, 0x0033003E, 0xFF971FBC, 0x000003E8, 0x428C743C, 0x0033003E, 0xFF97D5E0, 0x0000001E, 0x428C743C, + 0x0033003E, 0xFF970000, 0xFF00001E, 0x428C743C, 0x0033003E, 0xFF971F98, 0x00000002, 0x0001026F, 0x06CF0000, + 0x0000001E, 0x4271B55A, 0x015B0016, 0x00000000, 0x0000001E, 0x4271B55A, 0x015B0016, 0x00001FBC, 0x000003E8, + 0x4271B55A, 0x015B0016, 0x0000D5E0, 0x0000001E, 0x4271B55A, 0x015B0016, 0x00000000, 0xFF00001E, 0x4271B55A, + 0x015B0016, 0x00001F98, 0x00000002, 0x000102B5, 0x07150000, 0x0000001E, 0x4271B55A, 0x0102FFE2, 0xFFCA0000, + 0x0000001E, 0x4271B55A, 0x0102FFE2, 0xFFCA1FBC, 0x000003E8, 0x4271B55A, 0x0102FFE2, 0xFFCAD5E0, 0x0000001E, + 0x4271B55A, 0x0102FFE2, 0xFFCA0000, 0xFF00001E, 0x4271B55A, 0x0102FFE2, 0xFFCA1F98, 0x00000002, 0x000102FB, + 0x03CD0000, 0x0000001E, 0x4271B55A, 0x00600069, 0xFFE30000, 0x00000028, 0x4271B55A, 0x00600069, 0xFFE31FBC, + 0x0000000F, 0x4271B55A, 0x00600069, 0xFFE3D5E0, 0x0000000F, 0x42701BC0, 0x006E00C4, 0xFFE60000, 0x00000014, + 0x428CDAA2, 0x00B9018F, 0x00061F98, 0x0000001E, 0x428CDAA2, 0x00B9018F, 0x00060000, 0x0000001E, 0x428CDAA2, + 0x00B9018F, 0x00060000, 0xFF00001E, 0x428CDAA2, 0x00B9018F, 0x00060164, 0x00000002, 0x00010337, 0x04BE0000, + 0x00000032, 0x42700000, 0x00030006, 0xFFFA0000, 0x00000028, 0x42700000, 0x00030006, 0xFFFA1FBC, 0x0000001E, + 0x424BFFF7, 0x00030006, 0xFFFAD5E0, 0x00000014, 0x41A4CC7E, 0x00030006, 0xFFFA0000, 0x00000033, 0x412CCC23, + 0x00030006, 0xFFFA1F98, 0x00000032, 0x412665BD, 0x00030006, 0xFFFA0000, 0x00000032, 0x412665BD, 0x00030006, + 0xFFFA0000, 0x00000032, 0x4123328A, 0x00030006, 0xFFFA0164, 0xFF000032, 0x412FFF56, 0x00030006, 0xFFFA2100, + 0x00000006, 0x00010383, 0x083D0000, 0x0000001E, 0x4289332C, 0x00000064, 0x00050000, 0x0000001E, 0x4289332C, + 0x00000065, 0x00061FBC, 0x0000001E, 0x4289332C, 0x00010063, 0x0029D5E0, 0x0000001E, 0x4289332C, 0x0000002A, + 0x00100000, 0x0000001E, 0x4289332C, 0x0000002A, 0x00101F98, 0x000003E8, 0x4289332C, 0x0000002A, 0x00100000, + 0x0000001E, 0x4289332C, 0x0000002A, 0x00100000, 0xFF00001E, 0x4289332C, 0x0000002A, 0x00100164, 0x0000003E, + 0x00000001, 0x00040000, 0x0BB8C10F, 0x00000000, 0x0000004D, 0x00000050, 0xFFFFFFFE, 0x00000000, 0x00000050, + 0x00000000, 0xBCD242E7, 0x00000000, 0x3CD242E7, 0x00000013, 0x0000000E, 0xFFFF0000, 0x018AFFFF, 0xFFFFFFFF, + 0x4041018A, 0x01BC0000, 0x00000000, 0xFFFF01BC, 0x01D0FFFF, 0xFFFFFFFF, 0x404601D0, 0x021F0000, 0x00000000, + 0xFFFF021F, 0x0234FFFF, 0xFFFFFFFF, 0x40490234, 0x02650000, 0x00000000, 0xFFFF0265, 0x027AFFFF, 0xFFFFFFFF, + 0x4047027A, 0x02AC0000, 0x00000000, 0xFFFF02AC, 0x02C0FFFF, 0xFFFFFFFF, 0x404A02C0, 0x02EE0000, 0x00000000, + 0xFFFF02EE, 0x043DFFFF, 0xFFFFFFFF, 0x003D043D, 0x04420000, 0x00000000, 0xFFFF0442, 0x047EFFFF, 0xFFFFFFFF, + 0x4042047E, 0x04880000, 0x00000000, 0x000003E8, 0x00000001, 0x001504A6, 0x04BD04BD, 0x00000056, 0x00000001, + 0x00440384, 0x03850000, 0x00000000, 0x00000000, 0xFFFFFFC7, 0x00000034, 0x00000000, 0xFFFFFFC7, 0x00000034, + 0x00000000, 0x00000000, 0x00000000, 0x0000007C, 0x00000001, 0x00040320, 0x03520000, 0x00000000, 0x00000000, + 0xFFFFFFC6, 0x00000030, 0x00000000, 0xFFFFFFC6, 0x00000030, 0x00000000, 0x00000000, 0x00000000, 0xFFFFFFFF, + 0x00000000, +}; diff --git a/src/overlays/actors/ovl_En_Sa/z_en_sa.c b/src/overlays/actors/ovl_En_Sa/z_en_sa.c index 3ad852beab..1e8c95a2db 100644 --- a/src/overlays/actors/ovl_En_Sa/z_en_sa.c +++ b/src/overlays/actors/ovl_En_Sa/z_en_sa.c @@ -1,6 +1,6 @@ #include "z_en_sa.h" -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x02000019 void EnSa_Init(EnSa* this, GlobalContext* globalCtx); @@ -9,8 +9,7 @@ void EnSa_Update(EnSa* this, GlobalContext* globalCtx); void EnSa_Draw(EnSa* this, GlobalContext* globalCtx); /* -const ActorInit En_Sa_InitVars = -{ +const ActorInit En_Sa_InitVars = { ACTOR_EN_SA, ACTORTYPE_NPC, ROOM, diff --git a/src/overlays/actors/ovl_En_Sa/z_en_sa.h b/src/overlays/actors/ovl_En_Sa/z_en_sa.h index 62393e6ede..2afd947990 100644 --- a/src/overlays/actors/ovl_En_Sa/z_en_sa.h +++ b/src/overlays/actors/ovl_En_Sa/z_en_sa.h @@ -4,8 +4,7 @@ #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ Actor actor; /* 0x014C */ char unk_14C[0x1A0]; } EnSa; // size = 0x02EC diff --git a/src/overlays/actors/ovl_En_Sb/z_en_sb.c b/src/overlays/actors/ovl_En_Sb/z_en_sb.c index 1bb726ee2a..a396c9d0c0 100644 --- a/src/overlays/actors/ovl_En_Sb/z_en_sb.c +++ b/src/overlays/actors/ovl_En_Sb/z_en_sb.c @@ -1,6 +1,6 @@ #include "z_en_sb.h" -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x00000005 void EnSb_Init(EnSb* this, GlobalContext* globalCtx); @@ -9,8 +9,7 @@ void EnSb_Update(EnSb* this, GlobalContext* globalCtx); void EnSb_Draw(EnSb* this, GlobalContext* globalCtx); /* -const ActorInit En_Sb_InitVars = -{ +const ActorInit En_Sb_InitVars = { ACTOR_EN_SB, ACTORTYPE_ENEMY, ROOM, diff --git a/src/overlays/actors/ovl_En_Sb/z_en_sb.h b/src/overlays/actors/ovl_En_Sb/z_en_sb.h index c8873d3c7c..d07cb4318e 100644 --- a/src/overlays/actors/ovl_En_Sb/z_en_sb.h +++ b/src/overlays/actors/ovl_En_Sb/z_en_sb.h @@ -4,8 +4,7 @@ #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ Actor actor; /* 0x014C */ char unk_14C[0xBC]; } EnSb; // size = 0x0208 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 b23bf2d7bb..9ebf49ef59 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 @@ -2,18 +2,17 @@ * File: z_en_scene_change.c * Overlay: ovl_En_Scene_Change * Description: Unknown (Broken Actor) -*/ + */ #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ Actor actor; /* 0x014C */ ActorFunc updateFunc; } EnSceneChange; // size = 0x0150 -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x00000000 static void EnSceneChange_Init(EnSceneChange* this, GlobalContext* globalCtx); @@ -23,8 +22,7 @@ static void EnSceneChange_Draw(EnSceneChange* this, GlobalContext* globalCtx); static void func_80AF8C70(EnSceneChange* this, ActorFunc updateFunc); static void func_80AF8CAC(EnSceneChange* this, GlobalContext* globalCtx); -const ActorInit En_Scene_Change_InitVars = -{ +const ActorInit En_Scene_Change_InitVars = { ACTOR_EN_SCENE_CHANGE, ACTORTYPE_PROP, ROOM, @@ -37,50 +35,41 @@ const ActorInit En_Scene_Change_InitVars = (ActorFunc)EnSceneChange_Draw, }; - -static void func_80AF8C70(EnSceneChange* this, ActorFunc updateFunc) -{ +static void func_80AF8C70(EnSceneChange* this, ActorFunc updateFunc) { this->updateFunc = updateFunc; } -static void EnSceneChange_Init(EnSceneChange* this, GlobalContext* globalCtx) -{ +static void EnSceneChange_Init(EnSceneChange* this, GlobalContext* globalCtx) { func_80AF8C70(this, func_80AF8CAC); } -static void EnSceneChange_Destroy(EnSceneChange* this, GlobalContext* globalCtx) -{ - +static void EnSceneChange_Destroy(EnSceneChange* this, GlobalContext* globalCtx) { } -static void func_80AF8CAC(EnSceneChange* this, GlobalContext* globalCtx) -{ - +static void func_80AF8CAC(EnSceneChange* this, GlobalContext* globalCtx) { } -static void EnSceneChange_Update(EnSceneChange* this, GlobalContext* globalCtx) -{ +static void EnSceneChange_Update(EnSceneChange* this, GlobalContext* globalCtx) { this->updateFunc(&this->actor, globalCtx); } -static void EnSceneChange_Draw(EnSceneChange* this, GlobalContext* globalCtx) -{ +static void EnSceneChange_Draw(EnSceneChange* this, GlobalContext* globalCtx) { s32 pad[0x2]; Gfx* displayList; s32 pad1[0x2]; Gfx* displayListHead; GraphicsContext* gfxCtx; - Gfx* gfxArr[4]; - + Gfx* dispRefs[4]; + displayList = Graph_Alloc(globalCtx->state.gfxCtx, 0x3C0); - + gfxCtx = globalCtx->state.gfxCtx; - - func_800C6AC4(gfxArr, globalCtx->state.gfxCtx, "../z_en_scene_change.c", 290); + + Graph_OpenDisps(dispRefs, globalCtx->state.gfxCtx, "../z_en_scene_change.c", 290); displayListHead = displayList; gSPSegment(gfxCtx->polyOpa.p++, 0x0C, displayListHead); func_80093D18(globalCtx->state.gfxCtx); - func_800C6B54(gfxArr, globalCtx->state.gfxCtx, "../z_en_scene_change.c", 386); + Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_en_scene_change.c", 386); } diff --git a/src/overlays/actors/ovl_En_Sda/z_en_sda.c b/src/overlays/actors/ovl_En_Sda/z_en_sda.c index f7f94a2e17..b388a07669 100644 --- a/src/overlays/actors/ovl_En_Sda/z_en_sda.c +++ b/src/overlays/actors/ovl_En_Sda/z_en_sda.c @@ -1,6 +1,6 @@ #include "z_en_sda.h" -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x00000030 void EnSda_Init(EnSda* this, GlobalContext* globalCtx); @@ -9,8 +9,7 @@ void EnSda_Update(EnSda* this, GlobalContext* globalCtx); void EnSda_Draw(EnSda* this, GlobalContext* globalCtx); /* -const ActorInit En_Sda_InitVars = -{ +const ActorInit En_Sda_InitVars = { ACTOR_EN_SDA, ACTORTYPE_BOSS, ROOM, @@ -36,4 +35,3 @@ const ActorInit En_Sda_InitVars = #pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Sda/func_80AF95C4.s") #pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Sda/func_80AF9C70.s") - diff --git a/src/overlays/actors/ovl_En_Sda/z_en_sda.h b/src/overlays/actors/ovl_En_Sda/z_en_sda.h index 4ae165daa4..3f90433a31 100644 --- a/src/overlays/actors/ovl_En_Sda/z_en_sda.h +++ b/src/overlays/actors/ovl_En_Sda/z_en_sda.h @@ -4,8 +4,7 @@ #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ Actor actor; } EnSda; // size = 0x014C diff --git a/src/overlays/actors/ovl_En_Shopnuts/z_en_shopnuts.c b/src/overlays/actors/ovl_En_Shopnuts/z_en_shopnuts.c index 4de770cbbd..de318c5245 100644 --- a/src/overlays/actors/ovl_En_Shopnuts/z_en_shopnuts.c +++ b/src/overlays/actors/ovl_En_Shopnuts/z_en_shopnuts.c @@ -1,6 +1,6 @@ #include "z_en_shopnuts.h" -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x00000005 void EnShopnuts_Init(EnShopnuts* this, GlobalContext* globalCtx); @@ -9,8 +9,7 @@ void EnShopnuts_Update(EnShopnuts* this, GlobalContext* globalCtx); void EnShopnuts_Draw(EnShopnuts* this, GlobalContext* globalCtx); /* -const ActorInit En_Shopnuts_InitVars = -{ +const ActorInit En_Shopnuts_InitVars = { ACTOR_EN_SHOPNUTS, ACTORTYPE_ENEMY, ROOM, diff --git a/src/overlays/actors/ovl_En_Shopnuts/z_en_shopnuts.h b/src/overlays/actors/ovl_En_Shopnuts/z_en_shopnuts.h index ca72fc92e7..162173b1d0 100644 --- a/src/overlays/actors/ovl_En_Shopnuts/z_en_shopnuts.h +++ b/src/overlays/actors/ovl_En_Shopnuts/z_en_shopnuts.h @@ -4,8 +4,7 @@ #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ Actor actor; /* 0x014C */ char unk_14C[0x170]; } EnShopnuts; // size = 0x02BC diff --git a/src/overlays/actors/ovl_En_Si/z_en_si.c b/src/overlays/actors/ovl_En_Si/z_en_si.c index 8459c35682..54fb3a7b87 100644 --- a/src/overlays/actors/ovl_En_Si/z_en_si.c +++ b/src/overlays/actors/ovl_En_Si/z_en_si.c @@ -1,6 +1,6 @@ #include "z_en_si.h" -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x00000201 void EnSi_Init(EnSi* this, GlobalContext* globalCtx); @@ -9,8 +9,7 @@ void EnSi_Update(EnSi* this, GlobalContext* globalCtx); void EnSi_Draw(EnSi* this, GlobalContext* globalCtx); /* -const ActorInit En_Si_InitVars = -{ +const ActorInit En_Si_InitVars = { ACTOR_EN_SI, ACTORTYPE_ITEMACTION, ROOM, @@ -38,6 +37,3 @@ const ActorInit En_Si_InitVars = #pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Si/EnSi_Update.s") #pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Si/EnSi_Draw.s") - - - diff --git a/src/overlays/actors/ovl_En_Si/z_en_si.h b/src/overlays/actors/ovl_En_Si/z_en_si.h index c6409c5d93..a185c3f2d3 100644 --- a/src/overlays/actors/ovl_En_Si/z_en_si.h +++ b/src/overlays/actors/ovl_En_Si/z_en_si.h @@ -4,8 +4,7 @@ #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ Actor actor; /* 0x014C */ char unk_14C[0x54]; } EnSi; // size = 0x01A0 diff --git a/src/overlays/actors/ovl_En_Siofuki/z_en_siofuki.c b/src/overlays/actors/ovl_En_Siofuki/z_en_siofuki.c index c4eaae0b30..72ba9806c1 100644 --- a/src/overlays/actors/ovl_En_Siofuki/z_en_siofuki.c +++ b/src/overlays/actors/ovl_En_Siofuki/z_en_siofuki.c @@ -1,6 +1,6 @@ #include "z_en_siofuki.h" -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x00000030 void EnSiofuki_Init(EnSiofuki* this, GlobalContext* globalCtx); @@ -9,8 +9,7 @@ void EnSiofuki_Update(EnSiofuki* this, GlobalContext* globalCtx); void EnSiofuki_Draw(EnSiofuki* this, GlobalContext* globalCtx); /* -const ActorInit En_Siofuki_InitVars = -{ +const ActorInit En_Siofuki_InitVars = { ACTOR_EN_SIOFUKI, ACTORTYPE_BG, ROOM, diff --git a/src/overlays/actors/ovl_En_Siofuki/z_en_siofuki.h b/src/overlays/actors/ovl_En_Siofuki/z_en_siofuki.h index fa7c479f74..a30af51dd0 100644 --- a/src/overlays/actors/ovl_En_Siofuki/z_en_siofuki.h +++ b/src/overlays/actors/ovl_En_Siofuki/z_en_siofuki.h @@ -4,8 +4,7 @@ #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ Actor actor; /* 0x014C */ char unk_14C[0x54]; } EnSiofuki; // size = 0x01A0 diff --git a/src/overlays/actors/ovl_En_Skb/z_en_skb.c b/src/overlays/actors/ovl_En_Skb/z_en_skb.c index 09d9072040..e9faac31eb 100644 --- a/src/overlays/actors/ovl_En_Skb/z_en_skb.c +++ b/src/overlays/actors/ovl_En_Skb/z_en_skb.c @@ -1,6 +1,6 @@ #include "z_en_skb.h" -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x00000015 void EnSkb_Init(EnSkb* this, GlobalContext* globalCtx); @@ -9,8 +9,7 @@ void EnSkb_Update(EnSkb* this, GlobalContext* globalCtx); void EnSkb_Draw(EnSkb* this, GlobalContext* globalCtx); /* -const ActorInit En_Skb_InitVars = -{ +const ActorInit En_Skb_InitVars = { ACTOR_EN_SKB, ACTORTYPE_ENEMY, ROOM, diff --git a/src/overlays/actors/ovl_En_Skb/z_en_skb.h b/src/overlays/actors/ovl_En_Skb/z_en_skb.h index fcdf838caf..326be9e01b 100644 --- a/src/overlays/actors/ovl_En_Skb/z_en_skb.h +++ b/src/overlays/actors/ovl_En_Skb/z_en_skb.h @@ -4,8 +4,7 @@ #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ Actor actor; /* 0x014C */ char unk_14C[0x1F8]; } EnSkb; // size = 0x0344 diff --git a/src/overlays/actors/ovl_En_Skj/z_en_skj.c b/src/overlays/actors/ovl_En_Skj/z_en_skj.c index b1195e3f03..930a99cfe4 100644 --- a/src/overlays/actors/ovl_En_Skj/z_en_skj.c +++ b/src/overlays/actors/ovl_En_Skj/z_en_skj.c @@ -1,6 +1,6 @@ #include "z_en_skj.h" -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x02000015 void EnSkj_Init(EnSkj* this, GlobalContext* globalCtx); @@ -9,8 +9,7 @@ void EnSkj_Update(EnSkj* this, GlobalContext* globalCtx); void EnSkj_Draw(EnSkj* this, GlobalContext* globalCtx); /* -const ActorInit En_Skj_InitVars = -{ +const ActorInit En_Skj_InitVars = { ACTOR_EN_SKJ, ACTORTYPE_ENEMY, ROOM, @@ -212,4 +211,3 @@ const ActorInit En_Skj_InitVars = #pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Skj/func_80B014E4.s") #pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Skj/EnSkj_Draw.s") - diff --git a/src/overlays/actors/ovl_En_Skj/z_en_skj.h b/src/overlays/actors/ovl_En_Skj/z_en_skj.h index 5a0b897c5f..65b0ffaa08 100644 --- a/src/overlays/actors/ovl_En_Skj/z_en_skj.h +++ b/src/overlays/actors/ovl_En_Skj/z_en_skj.h @@ -4,8 +4,7 @@ #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ Actor actor; /* 0x014C */ char unk_14C[0x1B4]; } EnSkj; // size = 0x0300 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 46eb75c122..43e50e2447 100644 --- a/src/overlays/actors/ovl_En_Skjneedle/z_en_skjneedle.c +++ b/src/overlays/actors/ovl_En_Skjneedle/z_en_skjneedle.c @@ -1,6 +1,6 @@ #include "z_en_skjneedle.h" -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x00000205 void EnSkjneedle_Init(EnSkjneedle* this, GlobalContext* globalCtx); @@ -9,8 +9,7 @@ void EnSkjneedle_Update(EnSkjneedle* this, GlobalContext* globalCtx); void EnSkjneedle_Draw(EnSkjneedle* this, GlobalContext* globalCtx); /* -const ActorInit En_Skjneedle_InitVars = -{ +const ActorInit En_Skjneedle_InitVars = { ACTOR_EN_SKJNEEDLE, ACTORTYPE_ENEMY, ROOM, diff --git a/src/overlays/actors/ovl_En_Skjneedle/z_en_skjneedle.h b/src/overlays/actors/ovl_En_Skjneedle/z_en_skjneedle.h index f80c035a3d..32ea97d942 100644 --- a/src/overlays/actors/ovl_En_Skjneedle/z_en_skjneedle.h +++ b/src/overlays/actors/ovl_En_Skjneedle/z_en_skjneedle.h @@ -4,8 +4,7 @@ #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ Actor actor; /* 0x014C */ char unk_14C[0x9C]; } EnSkjneedle; // size = 0x01E8 diff --git a/src/overlays/actors/ovl_En_Ssh/z_en_ssh.c b/src/overlays/actors/ovl_En_Ssh/z_en_ssh.c index 3c154511c1..150aeb3630 100644 --- a/src/overlays/actors/ovl_En_Ssh/z_en_ssh.c +++ b/src/overlays/actors/ovl_En_Ssh/z_en_ssh.c @@ -1,6 +1,6 @@ #include "z_en_ssh.h" -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x00000035 void EnSsh_Init(EnSsh* this, GlobalContext* globalCtx); @@ -9,8 +9,7 @@ void EnSsh_Update(EnSsh* this, GlobalContext* globalCtx); void EnSsh_Draw(EnSsh* this, GlobalContext* globalCtx); /* -const ActorInit En_Ssh_InitVars = -{ +const ActorInit En_Ssh_InitVars = { ACTOR_EN_SSH, ACTORTYPE_NPC, ROOM, diff --git a/src/overlays/actors/ovl_En_Ssh/z_en_ssh.h b/src/overlays/actors/ovl_En_Ssh/z_en_ssh.h index 66cbe1228b..ba67891656 100644 --- a/src/overlays/actors/ovl_En_Ssh/z_en_ssh.h +++ b/src/overlays/actors/ovl_En_Ssh/z_en_ssh.h @@ -4,8 +4,7 @@ #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ Actor actor; /* 0x014C */ char unk_14C[0x488]; } EnSsh; // size = 0x05D4 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 b86d70c99a..5d6d999b20 100644 --- a/src/overlays/actors/ovl_En_St/z_en_st.c +++ b/src/overlays/actors/ovl_En_St/z_en_st.c @@ -1,6 +1,6 @@ #include "z_en_st.h" -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x00000035 void EnSt_Init(EnSt* this, GlobalContext* globalCtx); @@ -9,8 +9,7 @@ void EnSt_Update(EnSt* this, GlobalContext* globalCtx); void EnSt_Draw(EnSt* this, GlobalContext* globalCtx); /* -const ActorInit En_St_InitVars = -{ +const ActorInit En_St_InitVars = { ACTOR_EN_ST, ACTORTYPE_ENEMY, ROOM, diff --git a/src/overlays/actors/ovl_En_St/z_en_st.h b/src/overlays/actors/ovl_En_St/z_en_st.h index 1948ef4aa8..52a2e3d75f 100644 --- a/src/overlays/actors/ovl_En_St/z_en_st.h +++ b/src/overlays/actors/ovl_En_St/z_en_st.h @@ -4,8 +4,7 @@ #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ Actor actor; /* 0x014C */ char unk_14C[0x430]; } EnSt; // size = 0x057C diff --git a/src/overlays/actors/ovl_En_Sth/z_en_sth.c b/src/overlays/actors/ovl_En_Sth/z_en_sth.c index 06af7dc629..9aef65cc14 100644 --- a/src/overlays/actors/ovl_En_Sth/z_en_sth.c +++ b/src/overlays/actors/ovl_En_Sth/z_en_sth.c @@ -1,6 +1,6 @@ #include "z_en_sth.h" -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x00000019 void EnSth_Init(EnSth* this, GlobalContext* globalCtx); @@ -8,8 +8,7 @@ void EnSth_Destroy(EnSth* this, GlobalContext* globalCtx); void EnSth_Update(EnSth* this, GlobalContext* globalCtx); /* -const ActorInit En_Sth_InitVars = -{ +const ActorInit En_Sth_InitVars = { ACTOR_EN_STH, ACTORTYPE_NPC, ROOM, diff --git a/src/overlays/actors/ovl_En_Sth/z_en_sth.h b/src/overlays/actors/ovl_En_Sth/z_en_sth.h index 5d42f29b70..041dca283f 100644 --- a/src/overlays/actors/ovl_En_Sth/z_en_sth.h +++ b/src/overlays/actors/ovl_En_Sth/z_en_sth.h @@ -4,8 +4,7 @@ #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ Actor actor; /* 0x014C */ char unk_14C[0x170]; } EnSth; // size = 0x02BC diff --git a/src/overlays/actors/ovl_En_Stream/z_en_stream.c b/src/overlays/actors/ovl_En_Stream/z_en_stream.c index 39a14fc8c3..99f4198942 100644 --- a/src/overlays/actors/ovl_En_Stream/z_en_stream.c +++ b/src/overlays/actors/ovl_En_Stream/z_en_stream.c @@ -1,6 +1,6 @@ #include "z_en_stream.h" -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x00000010 void EnStream_Init(EnStream* this, GlobalContext* globalCtx); @@ -9,8 +9,7 @@ void EnStream_Update(EnStream* this, GlobalContext* globalCtx); void EnStream_Draw(EnStream* this, GlobalContext* globalCtx); /* -const ActorInit En_Stream_InitVars = -{ +const ActorInit En_Stream_InitVars = { ACTOR_EN_STREAM, ACTORTYPE_BG, ROOM, diff --git a/src/overlays/actors/ovl_En_Stream/z_en_stream.h b/src/overlays/actors/ovl_En_Stream/z_en_stream.h index a03a883092..85cd7d46aa 100644 --- a/src/overlays/actors/ovl_En_Stream/z_en_stream.h +++ b/src/overlays/actors/ovl_En_Stream/z_en_stream.h @@ -4,8 +4,7 @@ #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ Actor actor; /* 0x014C */ char unk_14C[0xC]; } EnStream; // size = 0x0158 diff --git a/src/overlays/actors/ovl_En_Sw/z_en_sw.c b/src/overlays/actors/ovl_En_Sw/z_en_sw.c index 8b9423d1ad..826a2b50c8 100644 --- a/src/overlays/actors/ovl_En_Sw/z_en_sw.c +++ b/src/overlays/actors/ovl_En_Sw/z_en_sw.c @@ -1,6 +1,6 @@ #include "z_en_sw.h" -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x00000015 void EnSw_Init(EnSw* this, GlobalContext* globalCtx); @@ -9,8 +9,7 @@ void EnSw_Update(EnSw* this, GlobalContext* globalCtx); void EnSw_Draw(EnSw* this, GlobalContext* globalCtx); /* -const ActorInit En_Sw_InitVars = -{ +const ActorInit En_Sw_InitVars = { ACTOR_EN_SW, ACTORTYPE_NPC, ROOM, diff --git a/src/overlays/actors/ovl_En_Sw/z_en_sw.h b/src/overlays/actors/ovl_En_Sw/z_en_sw.h index 6fe25d3931..fa3dde25aa 100644 --- a/src/overlays/actors/ovl_En_Sw/z_en_sw.h +++ b/src/overlays/actors/ovl_En_Sw/z_en_sw.h @@ -4,8 +4,7 @@ #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ Actor actor; /* 0x014C */ char unk_14C[0x38C]; } EnSw; // size = 0x04D8 diff --git a/src/overlays/actors/ovl_En_Syateki_Itm/z_en_syateki_itm.c b/src/overlays/actors/ovl_En_Syateki_Itm/z_en_syateki_itm.c index e5ea597dbb..64c8844759 100644 --- a/src/overlays/actors/ovl_En_Syateki_Itm/z_en_syateki_itm.c +++ b/src/overlays/actors/ovl_En_Syateki_Itm/z_en_syateki_itm.c @@ -1,6 +1,6 @@ #include "z_en_syateki_itm.h" -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x00000010 void EnSyatekiItm_Init(EnSyatekiItm* this, GlobalContext* globalCtx); @@ -8,8 +8,7 @@ void EnSyatekiItm_Destroy(EnSyatekiItm* this, GlobalContext* globalCtx); void EnSyatekiItm_Update(EnSyatekiItm* this, GlobalContext* globalCtx); /* -const ActorInit En_Syateki_Itm_InitVars = -{ +const ActorInit En_Syateki_Itm_InitVars = { ACTOR_EN_SYATEKI_ITM, ACTORTYPE_PROP, ROOM, diff --git a/src/overlays/actors/ovl_En_Syateki_Itm/z_en_syateki_itm.h b/src/overlays/actors/ovl_En_Syateki_Itm/z_en_syateki_itm.h index c720d252e2..499252a875 100644 --- a/src/overlays/actors/ovl_En_Syateki_Itm/z_en_syateki_itm.h +++ b/src/overlays/actors/ovl_En_Syateki_Itm/z_en_syateki_itm.h @@ -4,8 +4,7 @@ #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ Actor actor; /* 0x014C */ char unk_14C[0x8C]; } EnSyatekiItm; // size = 0x01D8 diff --git a/src/overlays/actors/ovl_En_Syateki_Man/z_en_syateki_man.c b/src/overlays/actors/ovl_En_Syateki_Man/z_en_syateki_man.c index 9cb98966dd..6721a5666e 100644 --- a/src/overlays/actors/ovl_En_Syateki_Man/z_en_syateki_man.c +++ b/src/overlays/actors/ovl_En_Syateki_Man/z_en_syateki_man.c @@ -1,6 +1,6 @@ #include "z_en_syateki_man.h" -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x08000019 void EnSyatekiMan_Init(EnSyatekiMan* this, GlobalContext* globalCtx); @@ -9,8 +9,7 @@ void EnSyatekiMan_Update(EnSyatekiMan* this, GlobalContext* globalCtx); void EnSyatekiMan_Draw(EnSyatekiMan* this, GlobalContext* globalCtx); /* -const ActorInit En_Syateki_Man_InitVars = -{ +const ActorInit En_Syateki_Man_InitVars = { ACTOR_EN_SYATEKI_MAN, ACTORTYPE_NPC, ROOM, diff --git a/src/overlays/actors/ovl_En_Syateki_Man/z_en_syateki_man.h b/src/overlays/actors/ovl_En_Syateki_Man/z_en_syateki_man.h index c7e4f7d04f..5053a29c73 100644 --- a/src/overlays/actors/ovl_En_Syateki_Man/z_en_syateki_man.h +++ b/src/overlays/actors/ovl_En_Syateki_Man/z_en_syateki_man.h @@ -4,8 +4,7 @@ #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ Actor actor; /* 0x014C */ char unk_14C[0xE0]; } EnSyatekiMan; // size = 0x022C 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 178ca2939a..f27fcd9022 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 @@ -1,6 +1,6 @@ #include "z_en_syateki_niw.h" -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x00000010 void EnSyatekiNiw_Init(EnSyatekiNiw* this, GlobalContext* globalCtx); @@ -9,8 +9,7 @@ void EnSyatekiNiw_Update(EnSyatekiNiw* this, GlobalContext* globalCtx); void EnSyatekiNiw_Draw(EnSyatekiNiw* this, GlobalContext* globalCtx); /* -const ActorInit En_Syateki_Niw_InitVars = -{ +const ActorInit En_Syateki_Niw_InitVars = { ACTOR_EN_SYATEKI_NIW, ACTORTYPE_PROP, ROOM, diff --git a/src/overlays/actors/ovl_En_Syateki_Niw/z_en_syateki_niw.h b/src/overlays/actors/ovl_En_Syateki_Niw/z_en_syateki_niw.h index 55b0693ee9..1ad7a1b9e5 100644 --- a/src/overlays/actors/ovl_En_Syateki_Niw/z_en_syateki_niw.h +++ b/src/overlays/actors/ovl_En_Syateki_Niw/z_en_syateki_niw.h @@ -4,8 +4,7 @@ #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ Actor actor; /* 0x014C */ char unk_14C[0x314]; } EnSyatekiNiw; // size = 0x0460 diff --git a/src/overlays/actors/ovl_En_Ta/z_en_ta.c b/src/overlays/actors/ovl_En_Ta/z_en_ta.c index ff905b4f8a..e57e4acd0f 100644 --- a/src/overlays/actors/ovl_En_Ta/z_en_ta.c +++ b/src/overlays/actors/ovl_En_Ta/z_en_ta.c @@ -1,6 +1,6 @@ #include "z_en_ta.h" -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x00000009 void EnTa_Init(EnTa* this, GlobalContext* globalCtx); @@ -9,8 +9,7 @@ void EnTa_Update(EnTa* this, GlobalContext* globalCtx); void EnTa_Draw(EnTa* this, GlobalContext* globalCtx); /* -const ActorInit En_Ta_InitVars = -{ +const ActorInit En_Ta_InitVars = { ACTOR_EN_TA, ACTORTYPE_NPC, ROOM, diff --git a/src/overlays/actors/ovl_En_Ta/z_en_ta.h b/src/overlays/actors/ovl_En_Ta/z_en_ta.h index 45f431e1fa..87f51efc4b 100644 --- a/src/overlays/actors/ovl_En_Ta/z_en_ta.h +++ b/src/overlays/actors/ovl_En_Ta/z_en_ta.h @@ -4,8 +4,7 @@ #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ Actor actor; /* 0x014C */ char unk_14C[0x19C]; } EnTa; // size = 0x02E8 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 94055a81e1..ed828866c9 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 @@ -1,6 +1,6 @@ #include "z_en_takara_man.h" -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x08000039 void EnTakaraMan_Init(EnTakaraMan* this, GlobalContext* globalCtx); @@ -9,8 +9,7 @@ void EnTakaraMan_Update(EnTakaraMan* this, GlobalContext* globalCtx); void EnTakaraMan_Draw(EnTakaraMan* this, GlobalContext* globalCtx); /* -const ActorInit En_Takara_Man_InitVars = -{ +const ActorInit En_Takara_Man_InitVars = { ACTOR_EN_TAKARA_MAN, ACTORTYPE_NPC, ROOM, diff --git a/src/overlays/actors/ovl_En_Takara_Man/z_en_takara_man.h b/src/overlays/actors/ovl_En_Takara_Man/z_en_takara_man.h index 874b9e9db9..11f49f16e8 100644 --- a/src/overlays/actors/ovl_En_Takara_Man/z_en_takara_man.h +++ b/src/overlays/actors/ovl_En_Takara_Man/z_en_takara_man.h @@ -4,8 +4,7 @@ #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ Actor actor; /* 0x014C */ char unk_14C[0xEC]; } EnTakaraMan; // size = 0x0238 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 2be9a331d2..b4b2ec070b 100644 --- a/src/overlays/actors/ovl_En_Tana/z_en_tana.c +++ b/src/overlays/actors/ovl_En_Tana/z_en_tana.c @@ -1,15 +1,21 @@ +/* + * File: z_en_tana.c + * Overlay: ovl_En_Tana + * Description: Shop Shelves + */ + #include "z_en_tana.h" -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x00000009 -void EnTana_Init(EnTana* this, GlobalContext* globalCtx); -void EnTana_Destroy(EnTana* this, GlobalContext* globalCtx); -void EnTana_Update(EnTana* this, GlobalContext* globalCtx); +static void EnTana_Init(EnTana* this, GlobalContext* globalCtx); +static void EnTana_Destroy(EnTana* this, GlobalContext* globalCtx); +static void EnTana_Update(EnTana* this, GlobalContext* globalCtx); +static void func_80B17FC4(EnTana* this, GlobalContext* globalCtx); +static void func_80B1809C(EnTana* this, GlobalContext* globalCtx); -/* -const ActorInit En_Tana_InitVars = -{ +const ActorInit En_Tana_InitVars = { ACTOR_EN_TANA, ACTORTYPE_PROP, ROOM, @@ -21,13 +27,70 @@ const ActorInit En_Tana_InitVars = (ActorFunc)EnTana_Update, NULL, }; -*/ -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Tana/EnTana_Init.s") -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Tana/EnTana_Destroy.s") +static char* shelfTypes[] = { + "木の棚", // "Wooden Shelves" + "石の棚", // "Stone Shelves" +}; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Tana/EnTana_Update.s") +static const ActorFunc drawFuncs[] = { + (ActorFunc)func_80B17FC4, + (ActorFunc)func_80B1809C, + (ActorFunc)func_80B1809C, +}; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Tana/func_80B17FC4.s") +static Gfx* dListTbl[] = { + 0x06000B80, + 0x060027E8, + 0x060027E8, +}; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Tana/func_80B1809C.s") +static Gfx* dListTbl2[] = { + NULL, + 0x06000E08, + 0x06001608, +}; + +static void EnTana_Init(EnTana* this, GlobalContext* globalCtx) { + Actor* thisx = &this->actor; + osSyncPrintf("☆☆☆ %s ☆☆☆\n", shelfTypes[thisx->params]); + Actor_SetScale(thisx, 1.0f); + thisx->flags &= ~1; + thisx->draw = drawFuncs[thisx->params]; +} + +static void EnTana_Destroy(EnTana* this, GlobalContext* globalCtx) { +} + +static void EnTana_Update(EnTana* this, GlobalContext* globalCtx) { +} + +static void func_80B17FC4(EnTana* this, GlobalContext* globalCtx) { + + Actor* thisx = &this->actor; + GraphicsContext* gfxCtx; + Gfx* dispRefs[4]; + + gfxCtx = globalCtx->state.gfxCtx; + Graph_OpenDisps(dispRefs, globalCtx->state.gfxCtx, "../z_en_tana.c", 148); + func_80093D18(globalCtx->state.gfxCtx); + gSPMatrix(gfxCtx->polyOpa.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_tana.c", 152), + G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + gSPDisplayList(gfxCtx->polyOpa.p++, dListTbl[thisx->params]); + Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_en_tana.c", 157); +} + +static void func_80B1809C(EnTana* this, GlobalContext* globalCtx) { + Actor* thisx = &this->actor; + GraphicsContext* gfxCtx; + Gfx* dispRefs[4]; + + gfxCtx = globalCtx->state.gfxCtx; + Graph_OpenDisps(dispRefs, globalCtx->state.gfxCtx, "../z_en_tana.c", 163); + func_80093D18(globalCtx->state.gfxCtx); + gSPSegment(gfxCtx->polyOpa.p++, 0x08, SEGMENTED_TO_VIRTUAL(dListTbl2[thisx->params])); + gSPMatrix(gfxCtx->polyOpa.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_tana.c", 169), + G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + gSPDisplayList(gfxCtx->polyOpa.p++, dListTbl[thisx->params]); + Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_en_tana.c", 174); +} diff --git a/src/overlays/actors/ovl_En_Tana/z_en_tana.h b/src/overlays/actors/ovl_En_Tana/z_en_tana.h index dc09b884ca..cee15e7527 100644 --- a/src/overlays/actors/ovl_En_Tana/z_en_tana.h +++ b/src/overlays/actors/ovl_En_Tana/z_en_tana.h @@ -4,8 +4,7 @@ #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ Actor actor; } EnTana; // size = 0x014C diff --git a/src/overlays/actors/ovl_En_Test/z_en_test.c b/src/overlays/actors/ovl_En_Test/z_en_test.c index c9bd3b20da..ea54423748 100644 --- a/src/overlays/actors/ovl_En_Test/z_en_test.c +++ b/src/overlays/actors/ovl_En_Test/z_en_test.c @@ -1,6 +1,6 @@ #include "z_en_test.h" -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x00000015 void EnTest_Init(EnTest* this, GlobalContext* globalCtx); @@ -9,8 +9,7 @@ void EnTest_Update(EnTest* this, GlobalContext* globalCtx); void EnTest_Draw(EnTest* this, GlobalContext* globalCtx); /* -const ActorInit En_Test_InitVars = -{ +const ActorInit En_Test_InitVars = { ACTOR_EN_TEST, ACTORTYPE_ENEMY, ROOM, diff --git a/src/overlays/actors/ovl_En_Test/z_en_test.h b/src/overlays/actors/ovl_En_Test/z_en_test.h index 4f8341896f..0ed753ca5c 100644 --- a/src/overlays/actors/ovl_En_Test/z_en_test.h +++ b/src/overlays/actors/ovl_En_Test/z_en_test.h @@ -4,8 +4,7 @@ #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ Actor actor; /* 0x014C */ char unk_14C[0x7DC]; } EnTest; // size = 0x0928 diff --git a/src/overlays/actors/ovl_En_Tg/z_en_tg.c b/src/overlays/actors/ovl_En_Tg/z_en_tg.c index 9869550a16..12b02484b4 100644 --- a/src/overlays/actors/ovl_En_Tg/z_en_tg.c +++ b/src/overlays/actors/ovl_En_Tg/z_en_tg.c @@ -1,6 +1,6 @@ #include "z_en_tg.h" -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x00000009 void EnTg_Init(EnTg* this, GlobalContext* globalCtx); @@ -9,8 +9,7 @@ void EnTg_Update(EnTg* this, GlobalContext* globalCtx); void EnTg_Draw(EnTg* this, GlobalContext* globalCtx); /* -const ActorInit En_Tg_InitVars = -{ +const ActorInit En_Tg_InitVars = { ACTOR_EN_TG, ACTORTYPE_NPC, ROOM, diff --git a/src/overlays/actors/ovl_En_Tg/z_en_tg.h b/src/overlays/actors/ovl_En_Tg/z_en_tg.h index b9f2be3808..3fda08222e 100644 --- a/src/overlays/actors/ovl_En_Tg/z_en_tg.h +++ b/src/overlays/actors/ovl_En_Tg/z_en_tg.h @@ -4,8 +4,7 @@ #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ Actor actor; /* 0x014C */ char unk_14C[0xC0]; } EnTg; // size = 0x020C diff --git a/src/overlays/actors/ovl_En_Tite/z_en_tite.c b/src/overlays/actors/ovl_En_Tite/z_en_tite.c index afddf7c339..ec3c9b19e4 100644 --- a/src/overlays/actors/ovl_En_Tite/z_en_tite.c +++ b/src/overlays/actors/ovl_En_Tite/z_en_tite.c @@ -1,6 +1,6 @@ #include "z_en_tite.h" -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x00000015 void EnTite_Init(EnTite* this, GlobalContext* globalCtx); @@ -9,8 +9,7 @@ void EnTite_Update(EnTite* this, GlobalContext* globalCtx); void EnTite_Draw(EnTite* this, GlobalContext* globalCtx); /* -const ActorInit En_Tite_InitVars = -{ +const ActorInit En_Tite_InitVars = { ACTOR_EN_TITE, ACTORTYPE_ENEMY, ROOM, diff --git a/src/overlays/actors/ovl_En_Tite/z_en_tite.h b/src/overlays/actors/ovl_En_Tite/z_en_tite.h index a147c3bbfd..f7d7fdc4a2 100644 --- a/src/overlays/actors/ovl_En_Tite/z_en_tite.h +++ b/src/overlays/actors/ovl_En_Tite/z_en_tite.h @@ -4,8 +4,7 @@ #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ Actor actor; /* 0x014C */ char unk_14C[0x22C]; } EnTite; // size = 0x0378 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 04943e8722..35c0977e2b 100644 --- a/src/overlays/actors/ovl_En_Tk/z_en_tk.c +++ b/src/overlays/actors/ovl_En_Tk/z_en_tk.c @@ -1,16 +1,43 @@ +/* + * File: z_en_tk.c + * Overlay: ovl_En_Tk + * Description: Dampe NPC from "Dampe's Heart-Pounding Gravedigging Tour" + */ + #include "z_en_tk.h" -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x00000009 +s32 EnTk_CheckNextSpot(EnTk* this, GlobalContext* globalCtx); void EnTk_Init(EnTk* this, GlobalContext* globalCtx); void EnTk_Destroy(EnTk* this, GlobalContext* globalCtx); +void EnTk_Rest(EnTk* this, GlobalContext* globalCtx); +void EnTk_Walk(EnTk* this, GlobalContext* globalCtx); +void EnTk_Dig(EnTk* this, GlobalContext* globalCtx); void EnTk_Update(EnTk* this, GlobalContext* globalCtx); void EnTk_Draw(EnTk* this, GlobalContext* globalCtx); -/* -const ActorInit En_Tk_InitVars = -{ +extern UNK_TYPE D_04051DB0; +extern UNK_TYPE D_040521B0; +extern UNK_TYPE D_040525B0; +extern UNK_TYPE D_040529B0; +extern UNK_TYPE D_04052DB0; +extern UNK_TYPE D_040531B0; +extern UNK_TYPE D_040535B0; +extern UNK_TYPE D_040539B0; +extern AnimationHeader D_06001144; +extern AnimationHeader D_06001FA8; +extern AnimationHeader D_06002F84; +extern UNK_TYPE D_06003B40; +extern UNK_TYPE D_06004340; +extern UNK_TYPE D_06004B40; +extern Gfx D_0600ACE0[]; +extern Gfx D_0600BC90[]; +extern Gfx D_0600BCA0[]; +extern SkeletonHeader D_0600BE40; + +const ActorInit En_Tk_InitVars = { ACTOR_EN_TK, ACTORTYPE_NPC, ROOM, @@ -22,57 +49,720 @@ const ActorInit En_Tk_InitVars = (ActorFunc)EnTk_Update, (ActorFunc)EnTk_Draw, }; -*/ -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Tk/func_80B1B900.s") -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Tk/func_80B1B9A4.s") +void EnTkEff_Create(EnTk* this, Vec3f* pos, Vec3f* speed, Vec3f* accel, u8 duration, f32 size, f32 growth) { + s16 i; + EnTkEff* eff = this->eff; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Tk/func_80B1BAB0.s") + for (i = 0; i < ARRAY_COUNT(this->eff); i++) { + if (eff->active != 1) { + eff->size = size; + eff->growth = growth; + eff->timeTotal = eff->timeLeft = duration; + eff->active = 1; + eff->pos = *pos; + eff->accel = *accel; + eff->speed = *speed; + break; + } + eff++; + } +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Tk/func_80B1BDDC.s") +void EnTkEff_Update(EnTk* this) { + s16 i; + EnTkEff* eff; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Tk/func_80B1BE94.s") + eff = this->eff; + for (i = 0; i < ARRAY_COUNT(this->eff); i++) { + if (eff->active != 0) { + eff->timeLeft--; + if (eff->timeLeft == 0) { + eff->active = 0; + } + eff->accel.x = Math_Rand_ZeroOne() * 0.4f - 0.2f; + eff->accel.z = Math_Rand_ZeroOne() * 0.4f - 0.2f; + eff->pos.x += eff->speed.x; + eff->pos.y += eff->speed.y; + eff->pos.z += eff->speed.z; + eff->speed.x += eff->accel.x; + eff->speed.y += eff->accel.y; + eff->speed.z += eff->accel.z; + eff->size += eff->growth; + } + eff++; + } +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Tk/func_80B1BF14.s") +void EnTkEff_Draw(EnTk* this, GlobalContext* globalCtx) { + static UNK_PTR images[] = { + &D_040539B0, &D_040535B0, &D_040531B0, &D_04052DB0, &D_040529B0, &D_040525B0, &D_040521B0, &D_04051DB0, + }; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Tk/func_80B1BF8C.s") + EnTkEff* eff = this->eff; + GraphicsContext* gfxCtx; + s16 gfxSetup; + s16 i; + s16 alpha; + s16 imageIdx; + Gfx* dispRefs[4]; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Tk/func_80B1C00C.s") + /* + * This assignment always occurs before a call to Graph_OpenDisps which + * makes me suspect that they're inside a macro where the function call + * is present only for debug builds. Same for Graph_CloseDisps most likely. + */ + gfxCtx = globalCtx->state.gfxCtx; + Graph_OpenDisps(dispRefs, globalCtx->state.gfxCtx, "../z_en_tk_eff.c", 114); -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Tk/func_80B1C0D0.s") + gfxSetup = 0; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Tk/func_80B1C154.s") + /* + * Same code is generated without the if, + * but that would make the do...while redundant so there's probably an if. + */ + do { + if (1) { + func_80093D84(globalCtx->state.gfxCtx); + } + } while (0); -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Tk/func_80B1C23C.s") + for (i = 0; i < ARRAY_COUNT(this->eff); i++) { + if (eff->active != 0) { + if (gfxSetup == 0) { + gfxCtx->polyXlu.p = Gfx_CallSetupDL(gfxCtx->polyXlu.p, 0); + gSPDisplayList(gfxCtx->polyXlu.p++, D_0600BC90); + gDPSetEnvColor(gfxCtx->polyXlu.p++, 0x64, 0x3C, 0x14, 0x00); + gfxSetup = 1; + } -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Tk/func_80B1C2B4.s") + alpha = eff->timeLeft * (255.f / eff->timeTotal); + gDPSetPrimColor(gfxCtx->polyXlu.p++, 0, 0, 0xAA, 0x82, 0x5A, alpha); -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Tk/func_80B1C3DC.s") + gDPPipeSync(gfxCtx->polyXlu.p++); + 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(gfxCtx->polyXlu.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_tk_eff.c", 140), + G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Tk/func_80B1C54C.s") + imageIdx = eff->timeLeft * ((f32)ARRAY_COUNT(images) / eff->timeTotal); + gSPSegment(gfxCtx->polyXlu.p++, 0x08, SEGMENTED_TO_VIRTUAL(images[imageIdx])); -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Tk/func_80B1C5A0.s") + gSPDisplayList(gfxCtx->polyXlu.p++, D_0600BCA0); + } + eff++; + } -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Tk/func_80B1C738.s") + Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_en_tk_eff.c", 154); +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Tk/func_80B1C8F0.s") +s32 EnTkEff_CreateDflt(EnTk* this, Vec3f* pos, u8 duration, f32 size, f32 growth, f32 yAccelMax) { + Vec3f speed = { 0.f, 0.f, 0.f }; + Vec3f accel = { 0.f, 0.3f, 0.f }; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Tk/EnTk_Init.s") + accel.y += Math_Rand_ZeroOne() * yAccelMax; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Tk/EnTk_Destroy.s") + EnTkEff_Create(this, pos, &speed, &accel, duration, size, growth); -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Tk/func_80B1CC04.s") + return 0; +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Tk/func_80B1CE28.s") +/** z_en_tk_eff.c ends here probably **/ -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Tk/func_80B1CEF8.s") +static ColliderCylinderInit D_80B1D508 = { + 0x0A, 0x00, 0x00, 0x39, 0x20, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00000000, 0x00, 0x00, 0x00, 0x00, 0x00000000, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x01, 0x00, 0x001E, 0x0034, 0x0000, 0x0000, 0x0000, 0x0000, +}; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Tk/EnTk_Update.s") +static Sub98Init5 D_80B1D534 = { + 0x00, 0x0000, 0x0000, 0x0000, 0xFF, +}; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Tk/func_80B1D200.s") +void EnTk_RestAnim(EnTk* this, GlobalContext* globalCtx) { + AnimationHeader* anim = &D_06002F84; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Tk/func_80B1D278.s") + SkelAnime_ChangeAnim(&this->skelAnim, anim, 1.f, 0.f, SkelAnime_GetFrameCount(&D_06002F84.genericHeader), 0, -10.f); -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Tk/func_80B1D2E4.s") + this->actionCountdown = Math_Rand_S16Offset(60, 60); + this->actor.speedXZ = 0.f; +} -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Tk/EnTk_Draw.s") +void EnTk_WalkAnim(EnTk* this, GlobalContext* globalCtx) { + AnimationHeader* anim = &D_06001FA8; + + SkelAnime_ChangeAnim(&this->skelAnim, anim, 1.f, 0.f, SkelAnime_GetFrameCount(&D_06002F84.genericHeader), 0, -10.f); + + this->actionCountdown = Math_Rand_S16Offset(240, 240); +} + +void EnTk_DigAnim(EnTk* this, GlobalContext* globalCtx) { + AnimationHeader* anim = &D_06001144; + + SkelAnime_ChangeAnim(&this->skelAnim, anim, 1.f, 0.f, SkelAnime_GetFrameCount(&D_06001144.genericHeader), 0, -10.f); + + if (EnTk_CheckNextSpot(this, globalCtx) >= 0) { + this->validDigHere = 1; + } +} + +void EnTk_UpdateEyes(EnTk* this) { + if (DECR(this->blinkCountdown) == 0) { + this->eyeImageIdx++; + if (this->eyeImageIdx > 2) { + this->blinkCycles--; + if (this->blinkCycles < 0) { + this->blinkCountdown = Math_Rand_S16Offset(30, 30); + this->blinkCycles = 2; + if (Math_Rand_ZeroOne() > 0.5f) { + this->blinkCycles++; + } + } + this->eyeImageIdx = 0; + } + } +} + +s32 EnTk_CheckFacingPlayer(EnTk* this) { + s16 v0; + s16 v1; + + if (this->actor.waterSurfaceDist > 10000.f) { + return 0; + } + + v0 = this->actor.shape.rot.y; + v0 -= this->h_21E; + v0 -= this->headRot; + + v1 = this->actor.rotTowardsLinkY - v0; + if (ABS(v1) < 0x1554) { + return 1; + } else { + return 0; + } +} + +s32 EnTk_CheckNextSpot(EnTk* this, GlobalContext* globalCtx) { + Actor* prop; + f32 dxz; + f32 dy; + + prop = globalCtx->actorCtx.actorList[ACTORTYPE_PROP].first; + + while (prop != NULL) { + if (prop->id != ACTOR_EN_IT) { + prop = prop->next; + continue; + } + + if (prop == this->currentSpot) { + prop = prop->next; + continue; + } + + dy = prop->posRot.pos.y - this->actor.unk_80; + dxz = func_8002DB8C(&this->actor, prop); + if (dxz > 40.f || dy > 10.f) { + prop = prop->next; + continue; + } + + this->currentSpot = prop; + return prop->params; + } + + return -1; +} + +void EnTk_CheckCurrentSpot(EnTk* this) { + f32 dxz; + f32 dy; + + if (this->currentSpot != NULL) { + dy = this->currentSpot->posRot.pos.y - this->actor.unk_80; + dxz = func_8002DB8C(&this->actor, this->currentSpot); + if (dxz > 40.f || dy > 10.f) { + this->currentSpot = NULL; + } + } +} + +f32 EnTk_Step(EnTk* this, GlobalContext* globalCtx) { + f32 stepFrames[] = { 36.f, 10.f }; + f32 a1_; + s32 i; + + if (this->skelAnim.animCurrentFrame == 0.f || this->skelAnim.animCurrentFrame == 25.f) { + Audio_PlayActorSound2(&this->actor, NA_SE_EN_MORIBLIN_WALK); + } + + if (this->skelAnim.animCurrentSeg != &D_06001FA8) { + return 0.f; + } + + a1_ = this->skelAnim.animCurrentFrame; + for (i = 0; i < ARRAY_COUNT(stepFrames); i++) { + if (a1_ < stepFrames[i] + 12.f && a1_ >= stepFrames[i]) { + break; + } + } + if (i >= ARRAY_COUNT(stepFrames)) { + return 0.f; + } else { + a1_ = (0x8000 / 12.f) * (a1_ - stepFrames[i]); + return Math_Sins(a1_) * 2.f; + } +} + +s32 EnTk_Orient(EnTk* this, GlobalContext* globalCtx) { + Path* path; + Vec3s* point; + f32 dx; + f32 dz; + + if (this->actor.params < 0) { + return 1; + } + + path = &globalCtx->setupPathList[0]; + point = SEGMENTED_TO_VIRTUAL(path->points); + point += this->currentWaypoint; + + dx = point->x - this->actor.posRot.pos.x; + dz = point->z - this->actor.posRot.pos.z; + + Math_SmoothScaleMaxMinS(&this->actor.shape.rot.y, Math_atan2f(dx, dz) * (0x8000 / M_PI), 10, 1000, 1); + this->actor.posRot.rot = this->actor.shape.rot; + + if (SQ(dx) + SQ(dz) < 10.f) { + this->currentWaypoint++; + if (this->currentWaypoint >= path->count) { + this->currentWaypoint = 0; + } + + return 0; + } else { + return 1; + } +} + +u16 func_80B1C54C(GlobalContext* globalCtx, Actor* a1) { + u16 ret; + + ret = Text_GetFaceReaction(globalCtx, 14); + if (ret != 0) { + return ret; + } + + if (gSaveContext.inf_table[13] & 0x0200) { + /* "Do you want me to dig here? ..." */ + return 0x5019; + } else { + /* "Hey kid! ..." */ + return 0x5018; + } +} + +s16 func_80B1C5A0(GlobalContext* globalCtx, Actor* actor) { + s32 ret = 1; + + switch (func_8010BDBC(&globalCtx->msgCtx)) { + case 0: + case 1: + break; + case 2: + /* "I am the boss of the carpenters ..." (wtf?) */ + if (actor->textId == 0x5028) { + gSaveContext.inf_table[13] |= 0x0100; + } + ret = 0; + break; + case 3: + break; + case 4: + if (func_80106BC8(globalCtx) != 0 && (actor->textId == 0x5018 || actor->textId == 0x5019)) { + if (globalCtx->msgCtx.choiceIndex == 1) { + /* "Thanks a lot!" */ + actor->textId = 0x0084; + } else if (gSaveContext.rupees < 10) { + /* "You don't have enough Rupees!" */ + actor->textId = 0x0085; + } else { + globalCtx->msgCtx.msgMode = 0x37; + Rupees_ChangeBy(-10); + gSaveContext.inf_table[13] |= 0x0200; + return 2; + } + func_8010B720(globalCtx, actor->textId); + gSaveContext.inf_table[13] |= 0x0200; + } + break; + case 5: + if (func_80106BC8(globalCtx) != 0 && (actor->textId == 0x0084 || actor->textId == 0x0085)) { + func_80106CCC(globalCtx); + ret = 0; + } + break; + case 6: + case 7: + case 8: + case 9: + break; + } + + return ret; +} + +s32 EnTk_ChooseReward(EnTk* this) { + f32 luck; + s32 reward; + + luck = Math_Rand_ZeroOne(); + + if (luck < 0.4f) { + reward = 0; + } else if (luck < 0.7) { + reward = 1; + } else if (luck < 0.9) { + reward = 2; + } else { + reward = 3; + } + + switch (reward) { + case 0: + if (this->rewardCount[0] < 8) { + this->rewardCount[0] += 1; + return reward; + } + break; + case 1: + if (this->rewardCount[1] < 4) { + this->rewardCount[1] += 1; + return reward; + } + break; + case 2: + if (this->rewardCount[2] < 2) { + this->rewardCount[2] += 1; + return reward; + } + break; + case 3: + if (this->rewardCount[3] < 1) { + this->rewardCount[3] += 1; + return reward; + } + break; + } + + if (this->rewardCount[0] < 8) { + this->rewardCount[0] += 1; + reward = 0; + } else if (this->rewardCount[1] < 4) { + this->rewardCount[1] += 1; + reward = 1; + } else if (this->rewardCount[2] < 2) { + this->rewardCount[2] += 1; + reward = 2; + } else if (this->rewardCount[3] < 1) { + this->rewardCount[3] += 1; + reward = 3; + } else { + reward = 0; + this->rewardCount[0] = 1; + this->rewardCount[1] = 0; + this->rewardCount[2] = 0; + this->rewardCount[3] = 0; + } + + return reward; +} + +void EnTk_DigEff(EnTk* this) { + Vec3f pos = { 0.f, 0.f, 0.f }; + Vec3f speed = { 0.f, 0.f, 0.f }; + Vec3f accel = { 0.f, 0.3f, 0.f }; + + if (this->skelAnim.animCurrentFrame >= 32.f && this->skelAnim.animCurrentFrame < 40.f) { + pos.x = (Math_Rand_ZeroOne() - 0.5f) * 12.f + this->v3f_304.x; + pos.y = (Math_Rand_ZeroOne() - 0.5f) * 8.f + this->v3f_304.y; + pos.z = (Math_Rand_ZeroOne() - 0.5f) * 12.f + this->v3f_304.z; + EnTkEff_CreateDflt(this, &pos, 12, 0.2f, 0.1f, 0.f); + } +} + +void EnTk_Init(EnTk* this, GlobalContext* globalCtx) { + EnTk* thisAgain = this; + AnimationHeader* anim = &D_06002F84; + + ActorShape_Init(&thisAgain->actor.shape, 0, ActorShadow_DrawFunc_Circle, 24.f); + + SkelAnime_InitSV(globalCtx, &thisAgain->skelAnim, &D_0600BE40, NULL, thisAgain->hz_22A, thisAgain->hz_296, 18); + SkelAnime_ChangeAnim(&thisAgain->skelAnim, anim, 1.f, 0.f, SkelAnime_GetFrameCount(&D_06002F84.genericHeader), 0, + 0.f); + + ActorCollider_AllocCylinder(globalCtx, &thisAgain->collider); + ActorCollider_InitCylinder(globalCtx, &thisAgain->collider, &thisAgain->actor, &D_80B1D508); + + func_80061EFC(&thisAgain->actor.sub_98, NULL, &D_80B1D534); + + if (gSaveContext.day_time <= 0xC000 || gSaveContext.day_time >= 0xE000 || !LINK_IS_CHILD || + globalCtx->sceneNum != SCENE_SPOT02) { + Actor_Kill(&thisAgain->actor); + return; + } + + Actor_SetScale(&thisAgain->actor, 0.01f); + + thisAgain->actor.unk_1F = 6; + thisAgain->actor.gravity = -0.1f; + thisAgain->currentReward = -1; + thisAgain->currentSpot = NULL; + thisAgain->actionFunc = EnTk_Rest; +} + +void EnTk_Destroy(EnTk* this, GlobalContext* globalCtx) { + EnTk* thisAgain = this; + ActorCollider_FreeCylinder(globalCtx, &thisAgain->collider); +} + +void EnTk_Rest(EnTk* this, GlobalContext* globalCtx) { + s16 v1; + s16 a1_; + + if (this->h_1E0 != 0) { + v1 = this->actor.shape.rot.y; + v1 -= this->h_21E; + v1 = this->actor.rotTowardsLinkY - v1; + + if (this->h_1E0 == 2) { + EnTk_DigAnim(this, globalCtx); + this->h_1E0 = 0; + this->actionFunc = EnTk_Dig; + return; + } + + func_800343CC(globalCtx, &this->actor, &this->h_1E0, this->collider.dim.radius + 30.f, func_80B1C54C, + func_80B1C5A0); + } else if (EnTk_CheckFacingPlayer(this) != 0) { + v1 = this->actor.shape.rot.y; + v1 -= this->h_21E; + v1 = this->actor.rotTowardsLinkY - v1; + + this->actionCountdown = 0; + func_800343CC(globalCtx, &this->actor, &this->h_1E0, this->collider.dim.radius + 30.f, func_80B1C54C, + func_80B1C5A0); + } else if (func_8002F194(&this->actor, globalCtx) != 0) { + v1 = this->actor.shape.rot.y; + v1 -= this->h_21E; + v1 = this->actor.rotTowardsLinkY - v1; + + this->actionCountdown = 0; + this->h_1E0 = 1; + } else if (DECR(this->actionCountdown) == 0) { + EnTk_WalkAnim(this, globalCtx); + this->actionFunc = EnTk_Walk; + + /*! @bug v1 is uninitialized past this branch */ + } else { + v1 = 0; + } + + a1_ = CLAMP(-v1, 1270, 10730); + Math_SmoothScaleMaxMinS(&this->headRot, a1_, 6, 1000, 1); +} + +void EnTk_Walk(EnTk* this, GlobalContext* globalCtx) { + if (this->h_1E0 == 2) { + EnTk_DigAnim(this, globalCtx); + this->h_1E0 = 0; + this->actionFunc = EnTk_Dig; + } else { + this->actor.speedXZ = EnTk_Step(this, globalCtx); + EnTk_Orient(this, globalCtx); + Math_SmoothScaleMaxMinS(&this->headRot, 0, 6, 1000, 1); + EnTk_CheckCurrentSpot(this); + + DECR(this->actionCountdown); + if (EnTk_CheckFacingPlayer(this) != 0 || this->actionCountdown == 0) { + EnTk_RestAnim(this, globalCtx); + this->actionFunc = EnTk_Rest; + } + } +} + +void EnTk_Dig(EnTk* this, GlobalContext* globalCtx) { + Vec3f rewardOrigin; + Vec3f rewardPos; + s32 rewardParams[] = { + 0x0000, /* Green rupee */ + 0x0001, /* Blue rupee */ + 0x0002, /* Red rupee */ + 0x0014, /* Purple rupee */ + 0x0006, /* Heart piece */ + }; + + EnTk_DigEff(this); + + if (this->skelAnim.animCurrentFrame == 32.f) { + /* What's gonna come out? */ + Audio_PlayActorSound2(&this->actor, NA_SE_EV_DIG_UP); + + this->rewardTimer = 0; + + if (this->validDigHere == 1) { + rewardOrigin.x = 0.f; + rewardOrigin.y = 0.f; + rewardOrigin.z = -40.f; + + Matrix_RotateY(this->actor.shape.rot.y, MTXMODE_NEW); + Matrix_MultVec3f(&rewardOrigin, &rewardPos); + + rewardPos.x += this->actor.posRot.pos.x; + rewardPos.y += this->actor.posRot.pos.y; + rewardPos.z += this->actor.posRot.pos.z; + + this->currentReward = EnTk_ChooseReward(this); + if (this->currentReward == 3) { + /* + * Upgrade the purple rupee reward to the heart piece if this + * is the first grand prize dig. + */ + if ((gSaveContext.item_get_inf[1] & 0x1000) == 0) { + gSaveContext.item_get_inf[1] |= 0x1000; + this->currentReward = 4; + } + } + + Item_DropCollectible(globalCtx, &rewardPos, rewardParams[this->currentReward]); + } + } + + if (this->skelAnim.animCurrentFrame >= 32.f && this->rewardTimer == 10) { + /* Play a reward sound shortly after digging */ + if (this->validDigHere == 0) { + /* Bad dig spot */ + Audio_PlayActorSound2(&this->actor, NA_SE_SY_ERROR); + } else if (this->currentReward == 4) { + /* Heart piece */ + Audio_PlaySoundGeneral(NA_SE_SY_CORRECT_CHIME, &D_801333D4, 4, &D_801333E0, &D_801333E0, &D_801333E8); + } else { + /* Rupee */ + Audio_PlayActorSound2(&this->actor, NA_SE_SY_TRE_BOX_APPEAR); + } + } + this->rewardTimer++; + + if (func_800A56C8(&this->skelAnim, this->skelAnim.animFrameCount) != 0) { + if (this->currentReward < 0) { + /* "Nope, nothing here!" */ + func_8010B680(globalCtx, 0x501A, 0); + } else { + func_80106CCC(globalCtx); + } + + EnTk_RestAnim(this, globalCtx); + + this->currentReward = -1; + this->validDigHere = 0; + this->actionFunc = EnTk_Rest; + } +} + +void EnTk_Update(EnTk* this, GlobalContext* globalCtx) { + EnTk* thisAgain = this; + ColliderCylinderMain* collider = &thisAgain->collider; + + ActorCollider_Cylinder_Update(&thisAgain->actor, collider); + Actor_CollisionCheck_SetOT(globalCtx, &globalCtx->sub_11E60, collider); + + SkelAnime_FrameUpdateMatrix(&thisAgain->skelAnim); + + Actor_MoveForward(&thisAgain->actor); + + func_8002E4B4(globalCtx, &thisAgain->actor, 40.f, 10.f, 0.f, 5); + + thisAgain->actionFunc(thisAgain, globalCtx); + + EnTkEff_Update(thisAgain); + + EnTk_UpdateEyes(thisAgain); +} + +void func_80B1D200(GlobalContext* globalCtx) { + GraphicsContext* gfxCtx; + Gfx* dispRefs[4]; + + gfxCtx = globalCtx->state.gfxCtx; + Graph_OpenDisps(dispRefs, globalCtx->state.gfxCtx, "../z_en_tk.c", 1188); + + gSPDisplayList(gfxCtx->polyOpa.p++, D_0600ACE0); + + Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_en_tk.c", 1190); +} + +s32 func_80B1D278(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot, Actor* actor) { + EnTk* tk = (EnTk*)actor; + + switch (limbIndex) { + /* Limb 15 - Head */ + case 15: + tk->h_21E = rot->y; + break; + /* Limb 16 - Jaw */ + case 16: + tk->h_21E += rot->y; + rot->y += tk->headRot; + break; + } + + return 0; +} + +void func_80B1D2E4(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec3s* rot, Actor* actor) { + EnTk* this = (EnTk*)actor; + Vec3f sp28 = { 0.f, 0.f, 4600.f }; + Vec3f sp1C = { 0.f, 0.f, 0.f }; + + /* Limb 16 - Jaw */ + if (limbIndex == 16) { + Matrix_MultVec3f(&sp1C, &this->actor.posRot2.pos); + } + + /* Limb 14 - Neck */ + if (limbIndex == 14) { + Matrix_MultVec3f(&sp28, &this->v3f_304); + func_80B1D200(globalCtx); + } +} + +void EnTk_Draw(EnTk* this, GlobalContext* globalCtx) { + static UNK_PTR eyeImages[] = { + &D_06003B40, + &D_06004340, + &D_06004B40, + }; + + EnTk* thisAgain = this; + GraphicsContext* gfxCtx; + Gfx* dispRefs[4]; + + Matrix_Push(); + EnTkEff_Draw(thisAgain, globalCtx); + Matrix_Pull(); + + gfxCtx = globalCtx->state.gfxCtx; + Graph_OpenDisps(dispRefs, globalCtx->state.gfxCtx, "../z_en_tk.c", 1294); + + func_80093D18(globalCtx->state.gfxCtx); + + gSPSegment(gfxCtx->polyOpa.p++, 0x08, SEGMENTED_TO_VIRTUAL(eyeImages[thisAgain->eyeImageIdx])); + + SkelAnime_DrawSV(globalCtx, thisAgain->skelAnim.skeleton, thisAgain->skelAnim.actorDrawTbl, + thisAgain->skelAnim.dListCount, func_80B1D278, func_80B1D2E4, &thisAgain->actor); + + Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_en_tk.c", 1312); +} diff --git a/src/overlays/actors/ovl_En_Tk/z_en_tk.h b/src/overlays/actors/ovl_En_Tk/z_en_tk.h index 9f6b3323b0..5d3f67fe83 100644 --- a/src/overlays/actors/ovl_En_Tk/z_en_tk.h +++ b/src/overlays/actors/ovl_En_Tk/z_en_tk.h @@ -4,11 +4,48 @@ #include #include -typedef struct -{ - /* 0x0000 */ Actor actor; - /* 0x014C */ char unk_14C[0x624]; -} EnTk; // size = 0x0770 +/* Dirt particle effect */ +typedef struct { + /* 0x0000 */ u8 active; + /* 0x0001 */ u8 timeLeft; + /* 0x0002 */ u8 timeTotal; + /* 0x0004 */ f32 size; + /* 0x0008 */ f32 growth; + /* 0x000C */ char unk_C[0x8]; + /* 0x0014 */ Vec3f pos; + /* 0x0020 */ Vec3f speed; + /* 0x002C */ Vec3f accel; +} EnTkEff; // size = 0x0038 + +typedef struct EnTk EnTk; + +typedef void EnTkFunc(EnTk* this, GlobalContext* globalCtx); + +struct EnTk { + /* 0x0000 */ Actor actor; + /* 0x014C */ SkelAnime skelAnim; + /* 0x0190 */ EnTkFunc* actionFunc; + /* 0x0194 */ ColliderCylinderMain collider; + /* 0x01E0 */ s16 h_1E0; + /* 0x01E2 */ char unk_1E2[0x26]; + /* 0x0208 */ u8 validDigHere; + /* 0x0209 */ u8 rewardCount[4]; + /* 0x0210 */ Actor* currentSpot; + /* 0x0214 */ s32 currentReward; + /* 0x0218 */ s16 blinkCycles; + /* 0x021A */ s16 rewardTimer; + /* 0x021C */ s16 actionCountdown; + /* 0x021E */ s16 h_21E; + /* 0x0220 */ char unk_220[0x2]; + /* 0x0222 */ s16 eyeImageIdx; + /* 0x0224 */ s16 blinkCountdown; + /* 0x0226 */ s16 headRot; + /* 0x0228 */ s16 currentWaypoint; + /* 0x022A */ u16 hz_22A[54]; + /* 0x022A */ u16 hz_296[55]; + /* 0x0304 */ Vec3f v3f_304; + /* 0x0310 */ EnTkEff eff[20]; +}; // size = 0x0770 extern const ActorInit En_Tk_InitVars; diff --git a/src/overlays/actors/ovl_En_Torch/z_en_torch.c b/src/overlays/actors/ovl_En_Torch/z_en_torch.c index e3c3f73ae7..7c973a93cc 100644 --- a/src/overlays/actors/ovl_En_Torch/z_en_torch.c +++ b/src/overlays/actors/ovl_En_Torch/z_en_torch.c @@ -2,56 +2,37 @@ * File: z_en_torch.c * Overlay: ovl_En_Torch * Description: Spawns a chest with the appropriate contents then unloads. Used in grottos. -*/ + */ #include #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ Actor actor; } ActorEnTorch; // size = 0x014C -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x00000000 static void Init(ActorEnTorch* this, GlobalContext* globalCtx); -const ActorInit En_Torch_InitVars = -{ - ACTOR_EN_TORCH, - ACTORTYPE_ITEMACTION, - ROOM, - FLAGS, - OBJECT_GAMEPLAY_KEEP, - sizeof(ActorEnTorch), - (ActorFunc)Init, - NULL, - NULL, - NULL +const ActorInit En_Torch_InitVars = { + ACTOR_EN_TORCH, ACTORTYPE_ITEMACTION, ROOM, FLAGS, OBJECT_GAMEPLAY_KEEP, + sizeof(ActorEnTorch), (ActorFunc)Init, NULL, NULL, NULL, }; static u8 sChestContents[] = { - GI_RUPEE_BLUE, - GI_RUPEE_RED, - GI_RUPEE_GOLD, - GI_BOMBS_20, - GI_BOMBS_1, - GI_BOMBS_1, - GI_BOMBS_1, - GI_BOMBS_1 - }; + GI_RUPEE_BLUE, GI_RUPEE_RED, GI_RUPEE_GOLD, GI_BOMBS_20, GI_BOMBS_1, GI_BOMBS_1, GI_BOMBS_1, GI_BOMBS_1, +}; -static void Init(ActorEnTorch* this, GlobalContext* globalCtx) -{ +static void Init(ActorEnTorch* this, GlobalContext* globalCtx) { s8 returnData = gSaveContext.respawn[RESPAWN_MODE_RETURN].data; /* Spawn chest with desired contents. Contents are passed to en_torch from grotto params via Save Context. */ - Actor_Spawn(&globalCtx->actorCtx, globalCtx, ACTOR_EN_BOX, - this->actor.posRot.pos.x, this->actor.posRot.pos.y, this->actor.posRot.pos.z, - 0, this->actor.shape.rot.y, 0, + Actor_Spawn(&globalCtx->actorCtx, globalCtx, ACTOR_EN_BOX, this->actor.posRot.pos.x, this->actor.posRot.pos.y, + this->actor.posRot.pos.z, 0, this->actor.shape.rot.y, 0, (sChestContents[(returnData >> 0x5) & 0x7] << 0x5) | 0x5000 | (returnData & 0x1F)); Actor_Kill(&this->actor); diff --git a/src/overlays/actors/ovl_En_Torch2/z_en_torch2.c b/src/overlays/actors/ovl_En_Torch2/z_en_torch2.c index b7b44893b8..45d4c18990 100644 --- a/src/overlays/actors/ovl_En_Torch2/z_en_torch2.c +++ b/src/overlays/actors/ovl_En_Torch2/z_en_torch2.c @@ -1,6 +1,6 @@ #include "z_en_torch2.h" -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x00000035 void EnTorch2_Init(EnTorch2* this, GlobalContext* globalCtx); @@ -9,8 +9,7 @@ void EnTorch2_Update(EnTorch2* this, GlobalContext* globalCtx); void EnTorch2_Draw(EnTorch2* this, GlobalContext* globalCtx); /* -const ActorInit En_Torch2_InitVars = -{ +const ActorInit En_Torch2_InitVars = { ACTOR_EN_TORCH2, ACTORTYPE_BOSS, ROOM, @@ -40,4 +39,3 @@ const ActorInit En_Torch2_InitVars = #pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Torch2/func_80B1F7D4.s") #pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Torch2/EnTorch2_Draw.s") - diff --git a/src/overlays/actors/ovl_En_Torch2/z_en_torch2.h b/src/overlays/actors/ovl_En_Torch2/z_en_torch2.h index 627af71f2a..9f730e7f4c 100644 --- a/src/overlays/actors/ovl_En_Torch2/z_en_torch2.h +++ b/src/overlays/actors/ovl_En_Torch2/z_en_torch2.h @@ -4,8 +4,7 @@ #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ Actor actor; /* 0x014C */ char unk_14C[0x948]; } EnTorch2; // size = 0x0A94 diff --git a/src/overlays/actors/ovl_En_Toryo/z_en_toryo.c b/src/overlays/actors/ovl_En_Toryo/z_en_toryo.c index b532e71422..ec322d13cd 100644 --- a/src/overlays/actors/ovl_En_Toryo/z_en_toryo.c +++ b/src/overlays/actors/ovl_En_Toryo/z_en_toryo.c @@ -1,6 +1,6 @@ #include "z_en_toryo.h" -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x00000009 void EnToryo_Init(EnToryo* this, GlobalContext* globalCtx); @@ -9,8 +9,7 @@ void EnToryo_Update(EnToryo* this, GlobalContext* globalCtx); void EnToryo_Draw(EnToryo* this, GlobalContext* globalCtx); /* -const ActorInit En_Toryo_InitVars = -{ +const ActorInit En_Toryo_InitVars = { ACTOR_EN_TORYO, ACTORTYPE_NPC, ROOM, diff --git a/src/overlays/actors/ovl_En_Toryo/z_en_toryo.h b/src/overlays/actors/ovl_En_Toryo/z_en_toryo.h index 977b152e73..2367c6f547 100644 --- a/src/overlays/actors/ovl_En_Toryo/z_en_toryo.h +++ b/src/overlays/actors/ovl_En_Toryo/z_en_toryo.h @@ -4,8 +4,7 @@ #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ Actor actor; /* 0x014C */ char unk_14C[0x194]; } EnToryo; // size = 0x02E0 diff --git a/src/overlays/actors/ovl_En_Tp/z_en_tp.c b/src/overlays/actors/ovl_En_Tp/z_en_tp.c index 24f149bd33..500aa4573b 100644 --- a/src/overlays/actors/ovl_En_Tp/z_en_tp.c +++ b/src/overlays/actors/ovl_En_Tp/z_en_tp.c @@ -1,6 +1,6 @@ #include "z_en_tp.h" -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x00000000 void EnTp_Init(EnTp* this, GlobalContext* globalCtx); @@ -9,8 +9,7 @@ void EnTp_Update(EnTp* this, GlobalContext* globalCtx); void EnTp_Draw(EnTp* this, GlobalContext* globalCtx); /* -const ActorInit En_Tp_InitVars = -{ +const ActorInit En_Tp_InitVars = { ACTOR_EN_TP, ACTORTYPE_ENEMY, ROOM, diff --git a/src/overlays/actors/ovl_En_Tp/z_en_tp.h b/src/overlays/actors/ovl_En_Tp/z_en_tp.h index 9a6f2e5ff8..5b2f6950ab 100644 --- a/src/overlays/actors/ovl_En_Tp/z_en_tp.h +++ b/src/overlays/actors/ovl_En_Tp/z_en_tp.h @@ -4,8 +4,7 @@ #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ Actor actor; /* 0x014C */ char unk_14C[0x8C]; } EnTp; // size = 0x01D8 diff --git a/src/overlays/actors/ovl_En_Tr/z_en_tr.c b/src/overlays/actors/ovl_En_Tr/z_en_tr.c index 480ad6b869..ae1160abea 100644 --- a/src/overlays/actors/ovl_En_Tr/z_en_tr.c +++ b/src/overlays/actors/ovl_En_Tr/z_en_tr.c @@ -1,6 +1,6 @@ #include "z_en_tr.h" -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x00000010 void EnTr_Init(EnTr* this, GlobalContext* globalCtx); @@ -9,8 +9,7 @@ void EnTr_Update(EnTr* this, GlobalContext* globalCtx); void EnTr_Draw(EnTr* this, GlobalContext* globalCtx); /* -const ActorInit En_Tr_InitVars = -{ +const ActorInit En_Tr_InitVars = { ACTOR_EN_TR, ACTORTYPE_NPC, ROOM, diff --git a/src/overlays/actors/ovl_En_Tr/z_en_tr.h b/src/overlays/actors/ovl_En_Tr/z_en_tr.h index 429cfbba1c..ee8b8d06d0 100644 --- a/src/overlays/actors/ovl_En_Tr/z_en_tr.h +++ b/src/overlays/actors/ovl_En_Tr/z_en_tr.h @@ -4,8 +4,7 @@ #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ Actor actor; /* 0x014C */ char unk_14C[0x19C]; } EnTr; // size = 0x02E8 diff --git a/src/overlays/actors/ovl_En_Trap/z_en_trap.c b/src/overlays/actors/ovl_En_Trap/z_en_trap.c index 09c45fd277..b4dcc2f2f3 100644 --- a/src/overlays/actors/ovl_En_Trap/z_en_trap.c +++ b/src/overlays/actors/ovl_En_Trap/z_en_trap.c @@ -1,6 +1,6 @@ #include "z_en_trap.h" -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x00000010 void EnTrap_Init(EnTrap* this, GlobalContext* globalCtx); @@ -9,8 +9,7 @@ void EnTrap_Update(EnTrap* this, GlobalContext* globalCtx); void EnTrap_Draw(EnTrap* this, GlobalContext* globalCtx); /* -const ActorInit En_Trap_InitVars = -{ +const ActorInit En_Trap_InitVars = { ACTOR_EN_TRAP, ACTORTYPE_BG, ROOM, diff --git a/src/overlays/actors/ovl_En_Trap/z_en_trap.h b/src/overlays/actors/ovl_En_Trap/z_en_trap.h index 563e704052..118ea8b935 100644 --- a/src/overlays/actors/ovl_En_Trap/z_en_trap.h +++ b/src/overlays/actors/ovl_En_Trap/z_en_trap.h @@ -4,8 +4,7 @@ #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ Actor actor; /* 0x014C */ char unk_14C[0xA0]; } EnTrap; // size = 0x01EC diff --git a/src/overlays/actors/ovl_En_Tubo_Trap/z_en_tubo_trap.c b/src/overlays/actors/ovl_En_Tubo_Trap/z_en_tubo_trap.c index 712272eed5..0d27f285e2 100644 --- a/src/overlays/actors/ovl_En_Tubo_Trap/z_en_tubo_trap.c +++ b/src/overlays/actors/ovl_En_Tubo_Trap/z_en_tubo_trap.c @@ -2,50 +2,30 @@ * File: z_en_tubo_trap.c * Overlay: ovl_En_Tubo_Trap * Description: Flying pot enemy -*/ + */ -#include -#include +#include "z_en_tubo_trap.h" -typedef struct -{ - /* 0x0000 */ Actor actor; - /* 0x014C */ ActorFunc playfunc; - /* 0x0150 */ f32 pos_y_seek; - /* 0x0154 */ Vec3f pos_init; - /* 0x0160 */ ColliderCylinderMain capsule; -} EnTuboTrap; // size = 0x01AC +#include void EnTuboTrap_Init(EnTuboTrap* this, GlobalContext* globalCtx); void EnTuboTrap_Destroy(EnTuboTrap* this, GlobalContext* globalCtx); void EnTuboTrap_Update(EnTuboTrap* this, GlobalContext* globalCtx); void EnTuboTrap_Draw(EnTuboTrap* this, GlobalContext* globalCtx); -void EnTuboTrap_TestLevitate(EnTuboTrap* this, GlobalContext* globalCtx); -void EnTuboTrap_InitializeAttack(EnTuboTrap* this, GlobalContext* globalCtx); +void EnTuboTrap_WaitForProximity(EnTuboTrap* this, GlobalContext* globalCtx); +void EnTuboTrap_Levitate(EnTuboTrap* this, GlobalContext* globalCtx); void EnTuboTrap_Fly(EnTuboTrap* this, GlobalContext* globalCtx); -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x00000010 -static ColliderCylinderInit cylinderInitData = -{ - 0x0A, 0x11, 0x09, 0x00, 0x20, 0x01, - 0x00, 0x00, - 0x00, - 0x00, 0x00, 0x00, - 0xFFCFFFFF, - 0x00, 0x04, - 0x00, 0x00, - 0xFFCFFFFF, - 0x00, 0x00, 0x00, 0x00, - 0x01, 0x01, 0x00, - 0x00, - 0x0009, 0x0017, 0x0000, - 0x0000, 0x0000, 0x0000 +static ColliderCylinderInit cylinderInitData = { + 0x0A, 0x11, 0x09, 0x00, 0x20, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0xFFCFFFFF, 0x00, 0x04, 0x00, 0x00, 0xFFCFFFFF, 0x00, 0x00, 0x00, 0x00, + 0x01, 0x01, 0x00, 0x00, 0x0009, 0x0017, 0x0000, 0x0000, 0x0000, 0x0000, }; -ActorInit En_Tubo_Trap_InitVars = -{ +const ActorInit En_Tubo_Trap_InitVars = { ACTOR_EN_TUBO_TRAP, ACTORTYPE_PROP, ROOM, @@ -58,321 +38,258 @@ ActorInit En_Tubo_Trap_InitVars = (ActorFunc)EnTuboTrap_Draw, }; -extern u32 DL_SHARD; -extern u32 DL_TUBO; +extern UNK_TYPE D_05017A60; +extern Gfx D_05017870[]; -void EnTuboTrap_Init(EnTuboTrap* this, GlobalContext* globalCtx) -{ +void EnTuboTrap_Init(EnTuboTrap* this, GlobalContext* globalCtx) { s32 pad; ActorShape_Init(&this->actor.shape, 0.0f, ActorShadow_DrawFunc_Circle, 2.0f); osSyncPrintf("\n\n"); - osSyncPrintf("\x1b[32m☆☆☆☆☆ 壷トラップ ☆☆☆☆☆ %x\n\x1b[m", this->actor.params); - ActorCollider_AllocCylinder(globalCtx, &this->capsule); - ActorCollider_InitCylinder(globalCtx, &this->capsule, &this->actor, &cylinderInitData); + osSyncPrintf(VT_FGCOL(GREEN) "☆☆☆☆☆ 壷トラップ ☆☆☆☆☆ %x\n" VT_RST, this->actor.params); // "Urn Trap" + ActorCollider_AllocCylinder(globalCtx, &this->collider); + ActorCollider_InitCylinder(globalCtx, &this->collider, &this->actor, &cylinderInitData); Actor_SetScale(&this->actor, 0.1f); - this->playfunc = (ActorFunc*)EnTuboTrap_TestLevitate; + this->actionFunc = (ActorFunc)EnTuboTrap_WaitForProximity; } -void EnTuboTrap_Destroy(EnTuboTrap* this, GlobalContext* globalCtx) -{ - ColliderCylinderMain* capsule = &this->capsule; - ActorCollider_FreeCylinder(globalCtx, capsule); +void EnTuboTrap_Destroy(EnTuboTrap* this, GlobalContext* globalCtx) { + ColliderCylinderMain* collider = &this->collider; + ActorCollider_FreeCylinder(globalCtx, collider); } -void EnTuboTrap_DropCollectible(EnTuboTrap* this, GlobalContext* globalCtx) -{ +void EnTuboTrap_DropCollectible(EnTuboTrap* this, GlobalContext* globalCtx) { s16 params = this->actor.params; - s16 param1 = (params >> 6) & 0x03FF; - if (param1 >= 0 && param1 < 0x1A) - { - Item_DropCollectible(globalCtx, &this->actor.posRot, param1 | ((params & 0x03F) << 8)); + s16 param3FF = (params >> 6) & 0x3FF; + if (param3FF >= 0 && param3FF < 0x1A) { + Item_DropCollectible(globalCtx, &this->actor.posRot, param3FF | ((params & 0x3F) << 8)); } } #ifdef NON_MATCHING -void EnTuboTrap_Fragments(EnTuboTrap* this, GlobalContext* globalCtx) -{ - u32 uVar1; - s32 rando_seed = 0; - s32 shard_count = 0; +// regalloc and stack usage differences, most likely the same differences as EnTuboTrap_SpawnWaterFragments +void EnTuboTrap_SpawnFragments(EnTuboTrap* this, GlobalContext* globalCtx) { + Vec3f* actorPos; + f32 rand; + f32 cos; + f32 sin; + u32 addr; + Vec3f spC8; + Vec3f spBC; + s16 var; + s32 temp; + s32 i; - /* spawn fragments */ - do - { - Vec3f burst_depth[2]; - f32 rng; + addr = &D_05017A60; + actorPos = &this->actor.posRot.pos; - /* burst_depth_x */ - burst_depth[0].x = Math_Sins(rando_seed) * 8.0f; - burst_depth[0].y = (Math_Rand_ZeroOne() * 5.0f) + 2.0f; - burst_depth[0].z = Math_Coss(rando_seed) * 8.0f; + for (i = 0, var = 0; i < 15; i++, var += 20000) { + sin = Math_Sins(var); + cos = Math_Coss(var); + spC8.x = sin * 8.0f; + spC8.y = (Math_Rand_ZeroOne() * 5.0f) + 2.0f; + spC8.z = cos * 8.0f; - /* burst_depth_y */ - burst_depth[1].x = (f32)(burst_depth[0].x * 0.23f); - burst_depth[1].y = (f32)(Math_Rand_ZeroOne() * 5.0f) + 2.0f; - burst_depth[1].z = (f32)(burst_depth[0].z * 0.23f); + spBC.x = spC8.x * 0.23f; + spBC.y = (Math_Rand_ZeroOne() * 5.0f) + 2.0f; + spBC.z = spC8.z * 0.23f; - VEC3_ADD(burst_depth[0], this->actor.posRot.pos) + spC8.x += actorPos->x; + spC8.y += actorPos->y; + spC8.z += actorPos->z; - rng = Math_Rand_ZeroOne(); - - if (rng < 0.2f) - { - uVar1 = 0x60; - } - else - { - uVar1 = 0x20; - - if (rng < 0.6f) - { - uVar1 = 0x40; - } + rand = Math_Rand_ZeroOne(); + if (rand < 0.2f) { + temp = 96; + } else if (rand < 0.6f) { + temp = 64; + } else { + temp = 32; } - /* The Heavy Lifting */ - Effect_SpawnFragment(globalCtx, &burst_depth[0], &burst_depth[1], &this->actor.posRot.pos, -239, uVar1, 10, 10, 0, - (Math_Rand_ZeroOne() * 65.0f) + 15.0f, 0, 0x20, 0x3C, -1, 3, DL_SHARD); - - shard_count++; - rando_seed = (s32)((rando_seed + 0x4E20) * 0x10000) >> 0x10; + Effect_SpawnFragment(globalCtx, &spC8, &spBC, actorPos, -240, temp, 10, 10, 0, + (Math_Rand_ZeroOne() * 65.0f) + 15.0f, 0, 32, 60, -1, 3, addr); } - while(shard_count != 15); - func_80033480(globalCtx, &this->actor.posRot.pos, 30.0f, 4, 20, 50, 0); + func_80033480(globalCtx, actorPos, 30.0f, 4, 20, 50, 0); } #else -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Tubo_Trap/EnTuboTrap_Fragments.s") +#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Tubo_Trap/EnTuboTrap_SpawnFragments.s") #endif #ifdef NON_MATCHING -void EnTuboTrap_FragmentsWater(EnTuboTrap* this, GlobalContext* globalCtx) -{ - u32 uVar1; - s32 rando_seed = 0; - s32 shard_count = 0; - Vec3f burst_depth[2]; - f32 rng; +// regalloc and stack usage differences, most likely the same differences as EnTuboTrap_SpawnFragments +void EnTuboTrap_SpawnWaterFragments(EnTuboTrap* this, GlobalContext* globalCtx) { + Vec3f* actorPos; + f32 rand; + f32 cos; + f32 sin; + u32 addr; + Vec3f spC8; + Vec3f spBC; + s16 var; + s32 temp; + s32 i; - Math_Vec3f_Copy(&burst_depth[0], &this->actor.posRot.pos); - burst_depth[0].y += this->actor.waterSurfaceDist; + addr = &D_05017A60; + actorPos = &this->actor.posRot.pos; - /* spawn a small splash */ - func_8002949C(globalCtx, &burst_depth[0], 0, 0, 0, 0x190); + spC8 = *actorPos; + spC8.y += this->actor.unk_84; - /* spawn fragments */ - do - { - /* burst_depth_x */ - burst_depth[0].x = Math_Sins(rando_seed) * 8.0f; - burst_depth[0].y = (Math_Rand_ZeroOne() * 5.0f) + 2.0f; - burst_depth[0].z = Math_Coss(rando_seed) * 8.0f; + func_8002949C(globalCtx, &spC8, 0, 0, 0, 400); - /* burst_depth_y */ - burst_depth[1].x = (f32)(burst_depth[0].x * 0.23f); - burst_depth[1].y = (f32)(Math_Rand_ZeroOne() * 5.0f) + 2.0f; - burst_depth[1].z = (f32)(burst_depth[0].z * 0.23f); + for (i = 0, var = 0; i < 15; i++, var += 20000) { + sin = Math_Sins(var); + cos = Math_Coss(var); + spC8.x = sin * 8.0f; + spC8.y = (Math_Rand_ZeroOne() * 5.0f) + 2.0f; + spC8.z = cos * 8.0f; - VEC3_ADD(burst_depth[0], this->actor.posRot.pos) + spBC.x = spC8.x * 0.23f; + spBC.y = (Math_Rand_ZeroOne() * 4.0f) + 2.0f; + spBC.z = spC8.z * 0.23f; - rng = Math_Rand_ZeroOne(); + spC8.x += actorPos->x; + spC8.y += actorPos->y; + spC8.z += actorPos->z; - if (rng < 0.2f) - { - uVar1 = 0x60; - } - else - { - uVar1 = 0x20; - - if (rng < 0.6f) - { - uVar1 = 0x40; - } + rand = Math_Rand_ZeroOne(); + if (rand < 0.2f) { + temp = 64; + } else { + temp = 32; } - /* The Heavy Lifting */ - Effect_SpawnFragment(globalCtx, &burst_depth[0], &burst_depth[1], &this->actor.posRot.pos, -239, uVar1, - 10, 10, 0, (Math_Rand_ZeroOne() * 65.0f) + 15.0f, 0, 0x20, 0x3C, -1, 3, DL_SHARD); - shard_count++; - rando_seed = (s32)((rando_seed + 0x4E20) * 0x10000) >> 0x10; + Effect_SpawnFragment(globalCtx, &spC8, &spBC, actorPos, -180, temp, 30, 30, 0, + (Math_Rand_ZeroOne() * 65.0f) + 15.0f, 0, 32, 70, -1, 3, addr); } - while(shard_count != 15); - - func_80033480(globalCtx, &this->actor.posRot.pos, 30.0f, 4, 20, 50, 0); } #else -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Tubo_Trap/EnTuboTrap_FragmentsWater.s") +#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Tubo_Trap/EnTuboTrap_SpawnWaterFragments.s") #endif #ifdef NON_MATCHING -void EnTuboTrap_TestCollider(EnTuboTrap* this, GlobalContext* globalCtx) -{ - u8 bVar1, bVar2; - u16 uVar3; - Actor* collided_this; +void EnTuboTrap_HandleImpact(EnTuboTrap* this, GlobalContext* globalCtx) { + s32 pad; Player* player = PLAYER; - if (!(this->actor.bgCheckFlags & 20)) - { - bVar1 = this->capsule.base.colliderFlags; + if ((this->actor.bgCheckFlags & 0x20) && (this->actor.unk_84 > 15.0f)) { + EnTuboTrap_SpawnWaterFragments(this, globalCtx); + Audio_PlaySoundAtPosition(globalCtx, &this->actor.posRot.pos, 40, NA_SE_EV_BOMB_DROP_WATER); + EnTuboTrap_DropCollectible(this, globalCtx); + Actor_Kill(&this->actor); + return; } - else - { - if (this->actor.waterSurfaceDist > 15.0f) - { - EnTuboTrap_FragmentsWater(this, globalCtx); - Audio_PlaySoundAtPosition(globalCtx, &this->actor.posRot.pos, 40, NA_SE_EV_BOMB_DROP_WATER); + + if (this->collider.base.colliderFlags & 4) { + this->collider.base.colliderFlags &= ~4; + EnTuboTrap_SpawnFragments(this, globalCtx); + Audio_PlaySoundAtPosition(globalCtx, &this->actor.posRot.pos, 40, NA_SE_IT_SHIELD_REFLECT_SW); + Audio_PlaySoundAtPosition(globalCtx, &this->actor.posRot.pos, 40, NA_SE_EV_POT_BROKEN); + EnTuboTrap_DropCollectible(this, globalCtx); + Actor_Kill(&this->actor); + return; + } + + if (this->collider.base.collideFlags & 2) { + this->collider.base.collideFlags &= ~2; + EnTuboTrap_SpawnFragments(this, globalCtx); + Audio_PlaySoundAtPosition(globalCtx, &this->actor.posRot.pos, 40, NA_SE_EV_EXPLOSION); + Audio_PlaySoundAtPosition(globalCtx, &this->actor.posRot.pos, 40, NA_SE_EV_POT_BROKEN); + EnTuboTrap_DropCollectible(this, globalCtx); + Actor_Kill(&this->actor); + return; + } + + if (this->collider.base.colliderFlags & 2) { + this->collider.base.colliderFlags &= ~2; + if (this->collider.base.at == &player->actor) { + EnTuboTrap_SpawnFragments(this, globalCtx); + Audio_PlaySoundAtPosition(globalCtx, &this->actor.posRot.pos, 40, NA_SE_EV_POT_BROKEN); + Audio_PlaySoundAtPosition(globalCtx, &player->actor.posRot.pos, 40, 0x83E); EnTuboTrap_DropCollectible(this, globalCtx); Actor_Kill(&this->actor); return; } - - bVar1 = this->capsule.base.collideFlags; } - if (!(bVar1 & 4)) - { - bVar2 = this->capsule.base.collideFlags; - if (!(bVar2 & 2)) - { - if (!(bVar1 & 2)) - { - uVar3 = this->actor.bgCheckFlags; - } - else - { - collided_this = this->capsule.base.actor; - this->capsule.base.colliderFlags = bVar1 & 0xFD; - - if (collided_this == &player->actor) - { - EnTuboTrap_Fragments(this, globalCtx); - Audio_PlaySoundAtPosition(globalCtx, &this->actor.posRot.pos, 0x28, NA_SE_EV_POT_BROKEN); - Audio_PlaySoundAtPosition(globalCtx, &player->actor.posRot.pos, 0x28, NA_SE_PL_BODY_HIT); - EnTuboTrap_DropCollectible(this, globalCtx); - Actor_Kill(&this->actor); - return; - } - uVar3 = this->actor.bgCheckFlags; - } - - if ((uVar3 & 8) || (uVar3 & 1)) - { - EnTuboTrap_Fragments(this, globalCtx); - Audio_PlaySoundAtPosition(globalCtx, &this->actor.posRot.pos, 0x28, NA_SE_EV_POT_BROKEN); - EnTuboTrap_DropCollectible(this, globalCtx); - Actor_Kill(&this->actor); - } - } - else - { - this->capsule.base.collideFlags = bVar2 & 0xFD; - EnTuboTrap_Fragments(this, globalCtx); - Audio_PlaySoundAtPosition(globalCtx, &this->actor.posRot.pos, 0x28, NA_SE_EV_EXPLOSION); - Audio_PlaySoundAtPosition(globalCtx, &this->actor.posRot.pos, 0x28, NA_SE_EV_POT_BROKEN); - EnTuboTrap_DropCollectible(this, globalCtx); - Actor_Kill(&this->actor); - } - } - else - { - this->capsule.base.colliderFlags = bVar1 & 0xFB; - EnTuboTrap_Fragments(this, globalCtx); - Audio_PlaySoundAtPosition(globalCtx, &this->actor.posRot.pos, 0x28, NA_SE_IT_SHIELD_REFLECT_SW); - Audio_PlaySoundAtPosition(globalCtx, &this->actor.posRot.pos, 0x28, NA_SE_EV_POT_BROKEN); + if ((this->actor.bgCheckFlags & 8) || (this->actor.bgCheckFlags & 1)) { + EnTuboTrap_SpawnFragments(this, globalCtx); + Audio_PlaySoundAtPosition(globalCtx, &this->actor.posRot.pos, 40, NA_SE_EV_POT_BROKEN); EnTuboTrap_DropCollectible(this, globalCtx); Actor_Kill(&this->actor); + return; } } #else -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Tubo_Trap/EnTuboTrap_TestCollider.s") +#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Tubo_Trap/EnTuboTrap_HandleImpact.s") #endif -#ifdef NON_MATCHING -void EnTuboTrap_TestLevitate(EnTuboTrap* this, GlobalContext* globalCtx) -{ +void EnTuboTrap_WaitForProximity(EnTuboTrap* this, GlobalContext* globalCtx) { Player* player = PLAYER; - f32 seekY; + f32 targetHeight; - if (BREG(2) != 0) - { - osSyncPrintf("[32m☆☆☆☆☆ わて ☆☆☆☆☆ %f\n", globalCtx, this->actor.posRot.pos.y); - osSyncPrintf("[32m☆☆☆☆☆ おいどん ☆☆☆☆☆ %f\n"); + if (BREG(2) != 0) { + osSyncPrintf(VT_FGCOL(GREEN) "☆☆☆☆☆ わて ☆☆☆☆☆ %f\n" VT_RST, this->actor.posRot.pos.y); // "You" + osSyncPrintf(VT_FGCOL(GREEN) "☆☆☆☆☆ おいどん ☆☆☆☆☆ %f\n" VT_RST, player->actor.posRot.pos.y); // "Me" osSyncPrintf("\n\n"); } - if (this->actor.xzDistanceFromLink < 200.00000000 && this->actor.posRot.pos.y <= player->actor.posRot.pos.y) - { + if (this->actor.xzDistanceFromLink < 200.0f && this->actor.posRot.pos.y <= player->actor.posRot.pos.y) { Actor_ChangeType(globalCtx, &globalCtx->actorCtx, this, ACTORTYPE_ENEMY); this->actor.flags |= 1; - seekY = (f32)gSaveContext.link_age * -10.00000000 + 40.00000000; - this->pos_y_seek = player->actor.posRot.pos.y; + targetHeight = 40.0f + -10.0f * gSaveContext.link_age; - if (this->pos_y_seek < this->actor.posRot.pos.y) - this->pos_y_seek = this->actor.posRot.pos.y + seekY; - - this->actor.initPosRot.pos = this->actor.posRot.pos; + this->targetY = player->actor.posRot.pos.y + targetHeight; + if (this->targetY < this->actor.posRot.pos.y) { + this->targetY = this->actor.posRot.pos.y + targetHeight; + } + this->originPos = this->actor.posRot.pos; Audio_PlayActorSound2(this, NA_SE_EV_POT_MOVE_START); - this->playfunc = (ActorFunc)EnTuboTrap_InitializeAttack; + this->actionFunc = (ActorFunc)EnTuboTrap_Levitate; } } -#else -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Tubo_Trap/EnTuboTrap_TestLevitate.s") -#endif -#ifdef NON_MATCHING -void EnTuboTrap_InitializeAttack(EnTuboTrap* this, GlobalContext* globalCtx) -{ - this->actor.posRot.rot.y += 5000; - Math_SmoothScaleMaxF(&this->actor.posRot.pos.y, this->pos_y_seek, 0.8f, 3.0f); /* Tween levitation */ +void EnTuboTrap_Levitate(EnTuboTrap* this, GlobalContext* globalCtx) { + this->actor.shape.rot.y += 5000; + Math_SmoothScaleMaxF(&this->actor.posRot.pos.y, this->targetY, 0.8f, 3.0f); - if (ABS(this->actor.posRot.pos.y - this->pos_y_seek) < 10.0f) - { + if (fabsf(this->actor.posRot.pos.y - this->targetY) < 10.0f) { this->actor.speedXZ = 10.0f; this->actor.posRot.rot.y = this->actor.rotTowardsLinkY; - this->playfunc = (ActorFunc)EnTuboTrap_Fly; + this->actionFunc = (ActorFunc)EnTuboTrap_Fly; } } -#else -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Tubo_Trap/EnTuboTrap_InitializeAttack.s") -#endif -#ifdef NON_MATCHING -void EnTuboTrap_Fly(EnTuboTrap* this, GlobalContext* globalCtx) -{ - Vec3f pos_delta; +void EnTuboTrap_Fly(EnTuboTrap* this, GlobalContext* globalCtx) { + f32 dx = this->originPos.x - this->actor.posRot.pos.x; + f32 dy = this->originPos.y - this->actor.posRot.pos.y; + f32 dz = this->originPos.z - this->actor.posRot.pos.z; - VEC3_SUB(pos_delta, this->pos_init, this->actor.posRot.pos); - Audio_PlayActorSound2(&this->actor, NA_SE_EN_TUBOOCK_FLY); + Audio_PlayActorSound2(&this->actor, 0x3037); - if (240.0f < sqrtf(SQ(pos_delta.x) + SQ(pos_delta.y) + SQ(pos_delta.z))) - Math_SmoothScaleMaxF(&this->actor.gravity, -3.0f, 0.2f, 0.5f); /* Tween to ground */ + if (240.0f < sqrtf(SQ(dx) + SQ(dy) + SQ(dz))) { + Math_SmoothScaleMaxF(&this->actor.gravity, -3.0f, 0.2f, 0.5f); + } - this->actor.posRot.rot.y += 5000; - EnTuboTrap_TestCollider(this, globalCtx); + this->actor.shape.rot.y += 5000; + EnTuboTrap_HandleImpact(this, globalCtx); } -#else -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Tubo_Trap/EnTuboTrap_Fly.s") -#endif -#ifdef NON_MATCHING -void EnTuboTrap_Update(EnTuboTrap* this, GlobalContext* globalCtx) -{ - this->playfunc(this, globalCtx); - Actor_MoveForward(&this->actor); /* Probably to haul ass towards Link */ - func_8002E4B4(globalCtx, &this->actor, 10.0f, 10.0f, 20.0f, 0x1D); /* Necessary for drawing a shadow */ - Actor_SetHeight(&this->actor, 0.0f); - ActorCollider_Cylinder_Update(&this->actor, &this->capsule); - Actor_CollisionCheck_SetAC(globalCtx, &globalCtx->sub_11E60, &this->capsule); - Actor_CollisionCheck_SetAT(globalCtx, &globalCtx->sub_11E60, &this->capsule); -} -#else -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Tubo_Trap/EnTuboTrap_Update.s") -#endif +void EnTuboTrap_Update(EnTuboTrap* this, GlobalContext* globalCtx) { + EnTuboTrap* tuboTrap = this; + SubGlobalContext11E60* sub_11E60 = &globalCtx->sub_11E60; -void EnTuboTrap_Draw(EnTuboTrap* this, GlobalContext* globalCtx) -{ - Draw_DListOpa(globalCtx, &DL_TUBO); + tuboTrap->actionFunc(tuboTrap, globalCtx); + Actor_MoveForward(&tuboTrap->actor); + func_8002E4B4(globalCtx, &tuboTrap->actor, 10.0f, 10.0f, 20.0f, 0x1D); + Actor_SetHeight(&tuboTrap->actor, 0.0f); + ActorCollider_Cylinder_Update(&tuboTrap->actor, &tuboTrap->collider); + Actor_CollisionCheck_SetAC(globalCtx, sub_11E60, &tuboTrap->collider); + Actor_CollisionCheck_SetAT(globalCtx, sub_11E60, &tuboTrap->collider); +} + +void EnTuboTrap_Draw(EnTuboTrap* this, GlobalContext* globalCtx) { + Gfx_DrawDListOpa(globalCtx, D_05017870); } diff --git a/src/overlays/actors/ovl_En_Tubo_Trap/z_en_tubo_trap.h b/src/overlays/actors/ovl_En_Tubo_Trap/z_en_tubo_trap.h new file mode 100644 index 0000000000..c734b043ce --- /dev/null +++ b/src/overlays/actors/ovl_En_Tubo_Trap/z_en_tubo_trap.h @@ -0,0 +1,17 @@ +#ifndef _Z_EN_TUBO_TRAP_H_ +#define _Z_EN_TUBO_TRAP_H_ + +#include +#include + +typedef struct { + /* 0x0000 */ Actor actor; + /* 0x014C */ ActorFunc actionFunc; + /* 0x0150 */ f32 targetY; + /* 0x0154 */ Vec3f originPos; + /* 0x0160 */ ColliderCylinderMain collider; +} EnTuboTrap; // size = 0x01AC + +extern const ActorInit En_Tubo_Trap_InitVars; + +#endif diff --git a/src/overlays/actors/ovl_En_Vali/z_en_vali.c b/src/overlays/actors/ovl_En_Vali/z_en_vali.c index 9a55707a3b..29cae7a222 100644 --- a/src/overlays/actors/ovl_En_Vali/z_en_vali.c +++ b/src/overlays/actors/ovl_En_Vali/z_en_vali.c @@ -1,6 +1,6 @@ #include "z_en_vali.h" -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x00001015 void EnVali_Init(EnVali* this, GlobalContext* globalCtx); @@ -9,8 +9,7 @@ void EnVali_Update(EnVali* this, GlobalContext* globalCtx); void EnVali_Draw(EnVali* this, GlobalContext* globalCtx); /* -const ActorInit En_Vali_InitVars = -{ +const ActorInit En_Vali_InitVars = { ACTOR_EN_VALI, ACTORTYPE_ENEMY, ROOM, diff --git a/src/overlays/actors/ovl_En_Vali/z_en_vali.h b/src/overlays/actors/ovl_En_Vali/z_en_vali.h index 9725c2e318..92ff5c5f33 100644 --- a/src/overlays/actors/ovl_En_Vali/z_en_vali.h +++ b/src/overlays/actors/ovl_En_Vali/z_en_vali.h @@ -4,8 +4,7 @@ #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ Actor actor; /* 0x014C */ char unk_14C[0x2FC]; } EnVali; // size = 0x0448 diff --git a/src/overlays/actors/ovl_En_Vase/z_en_vase.c b/src/overlays/actors/ovl_En_Vase/z_en_vase.c index f5ccb7f14d..1ba1683859 100644 --- a/src/overlays/actors/ovl_En_Vase/z_en_vase.c +++ b/src/overlays/actors/ovl_En_Vase/z_en_vase.c @@ -2,52 +2,41 @@ * File: z_en_vase.c * Overlay: ovl_En_Vase * Description: An unused, orange pot based on ALTTP. Lacks collision. -*/ + */ #include #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ Actor actor; } ActorEnVase; // size = 0x014C -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x00000010 static void Init(ActorEnVase* this, GlobalContext* globalCtx); static void Destroy(ActorEnVase* this, GlobalContext* globalCtx); static void Draw(ActorEnVase* this, GlobalContext* globalCtx); -const ActorInit En_Vase_InitVars = -{ - ACTOR_EN_VASE, - ACTORTYPE_PROP, - ROOM, - FLAGS, - OBJECT_VASE, - sizeof(ActorEnVase), - (ActorFunc)Init, - (ActorFunc)Destroy, - (ActorFunc)Actor_Noop, - (ActorFunc)Draw +const ActorInit En_Vase_InitVars = { + ACTOR_EN_VASE, ACTORTYPE_PROP, ROOM, + FLAGS, OBJECT_VASE, sizeof(ActorEnVase), + (ActorFunc)Init, (ActorFunc)Destroy, (ActorFunc)Actor_Noop, + (ActorFunc)Draw, }; extern u32 DL_VASE; -static void Init(ActorEnVase* this, GlobalContext* globalCtx) -{ +static void Init(ActorEnVase* this, GlobalContext* globalCtx) { Actor_SetScale(&this->actor, 0.01f); this->actor.posRot2.pos = this->actor.posRot.pos; ActorShape_Init(&this->actor.shape, 0.0f, ActorShadow_DrawFunc_Circle, 6.0f); } -static void Destroy(ActorEnVase* this, GlobalContext* globalCtx) -{ +static void Destroy(ActorEnVase* this, GlobalContext* globalCtx) { } -static void Draw(ActorEnVase* this, GlobalContext* globalCtx) -{ - Draw_DListOpa(globalCtx, &DL_VASE); +static void Draw(ActorEnVase* this, GlobalContext* globalCtx) { + Gfx_DrawDListOpa(globalCtx, &DL_VASE); } diff --git a/src/overlays/actors/ovl_En_Vb_Ball/z_en_vb_ball.c b/src/overlays/actors/ovl_En_Vb_Ball/z_en_vb_ball.c index c0f7c6a636..36de850e5f 100644 --- a/src/overlays/actors/ovl_En_Vb_Ball/z_en_vb_ball.c +++ b/src/overlays/actors/ovl_En_Vb_Ball/z_en_vb_ball.c @@ -1,6 +1,6 @@ #include "z_en_vb_ball.h" -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x00000030 void EnVbBall_Init(EnVbBall* this, GlobalContext* globalCtx); @@ -9,8 +9,7 @@ void EnVbBall_Update(EnVbBall* this, GlobalContext* globalCtx); void EnVbBall_Draw(EnVbBall* this, GlobalContext* globalCtx); /* -const ActorInit En_Vb_Ball_InitVars = -{ +const ActorInit En_Vb_Ball_InitVars = { ACTOR_PLAYER, ACTORTYPE_BOSS, ROOM, diff --git a/src/overlays/actors/ovl_En_Vb_Ball/z_en_vb_ball.h b/src/overlays/actors/ovl_En_Vb_Ball/z_en_vb_ball.h index 60177a9f36..6a97868754 100644 --- a/src/overlays/actors/ovl_En_Vb_Ball/z_en_vb_ball.h +++ b/src/overlays/actors/ovl_En_Vb_Ball/z_en_vb_ball.h @@ -4,8 +4,7 @@ #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ Actor actor; /* 0x014C */ char unk_14C[0x68]; } EnVbBall; // size = 0x01B4 diff --git a/src/overlays/actors/ovl_En_Viewer/z_en_viewer.c b/src/overlays/actors/ovl_En_Viewer/z_en_viewer.c index 961cc513e6..cf6fdda264 100644 --- a/src/overlays/actors/ovl_En_Viewer/z_en_viewer.c +++ b/src/overlays/actors/ovl_En_Viewer/z_en_viewer.c @@ -1,6 +1,6 @@ #include "z_en_viewer.h" -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x00000010 void EnViewer_Init(EnViewer* this, GlobalContext* globalCtx); @@ -9,8 +9,7 @@ void EnViewer_Update(EnViewer* this, GlobalContext* globalCtx); void EnViewer_Draw(EnViewer* this, GlobalContext* globalCtx); /* -const ActorInit En_Viewer_InitVars = -{ +const ActorInit En_Viewer_InitVars = { ACTOR_EN_VIEWER, ACTORTYPE_ITEMACTION, ROOM, @@ -70,4 +69,3 @@ const ActorInit En_Viewer_InitVars = #pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Viewer/func_80B2C8AC.s") #pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Viewer/func_80B2CC1C.s") - diff --git a/src/overlays/actors/ovl_En_Viewer/z_en_viewer.h b/src/overlays/actors/ovl_En_Viewer/z_en_viewer.h index cfd8d786a7..6fb70b5045 100644 --- a/src/overlays/actors/ovl_En_Viewer/z_en_viewer.h +++ b/src/overlays/actors/ovl_En_Viewer/z_en_viewer.h @@ -4,8 +4,7 @@ #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ Actor actor; /* 0x014C */ char unk_14C[0x4AC]; } EnViewer; // size = 0x05F8 diff --git a/src/overlays/actors/ovl_En_Vm/z_en_vm.c b/src/overlays/actors/ovl_En_Vm/z_en_vm.c index 63dca9ee7d..188b524f76 100644 --- a/src/overlays/actors/ovl_En_Vm/z_en_vm.c +++ b/src/overlays/actors/ovl_En_Vm/z_en_vm.c @@ -1,6 +1,6 @@ #include "z_en_vm.h" -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x00000011 void EnVm_Init(EnVm* this, GlobalContext* globalCtx); @@ -9,8 +9,7 @@ void EnVm_Update(EnVm* this, GlobalContext* globalCtx); void EnVm_Draw(EnVm* this, GlobalContext* globalCtx); /* -const ActorInit En_Vm_InitVars = -{ +const ActorInit En_Vm_InitVars = { ACTOR_EN_VM, ACTORTYPE_ENEMY, ROOM, diff --git a/src/overlays/actors/ovl_En_Vm/z_en_vm.h b/src/overlays/actors/ovl_En_Vm/z_en_vm.h index 44bc0ad470..34ce379127 100644 --- a/src/overlays/actors/ovl_En_Vm/z_en_vm.h +++ b/src/overlays/actors/ovl_En_Vm/z_en_vm.h @@ -4,8 +4,7 @@ #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ Actor actor; /* 0x014C */ char unk_14C[0x268]; } EnVm; // size = 0x03B4 diff --git a/src/overlays/actors/ovl_En_Wall_Tubo/z_en_wall_tubo.c b/src/overlays/actors/ovl_En_Wall_Tubo/z_en_wall_tubo.c index e7b284c307..07df431aee 100644 --- a/src/overlays/actors/ovl_En_Wall_Tubo/z_en_wall_tubo.c +++ b/src/overlays/actors/ovl_En_Wall_Tubo/z_en_wall_tubo.c @@ -1,6 +1,6 @@ #include "z_en_wall_tubo.h" -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x00000010 void EnWallTubo_Init(EnWallTubo* this, GlobalContext* globalCtx); @@ -8,8 +8,7 @@ void EnWallTubo_Destroy(EnWallTubo* this, GlobalContext* globalCtx); void EnWallTubo_Update(EnWallTubo* this, GlobalContext* globalCtx); /* -const ActorInit En_Wall_Tubo_InitVars = -{ +const ActorInit En_Wall_Tubo_InitVars = { ACTOR_EN_WALL_TUBO, ACTORTYPE_PROP, ROOM, diff --git a/src/overlays/actors/ovl_En_Wall_Tubo/z_en_wall_tubo.h b/src/overlays/actors/ovl_En_Wall_Tubo/z_en_wall_tubo.h index 22819eddef..c26e459646 100644 --- a/src/overlays/actors/ovl_En_Wall_Tubo/z_en_wall_tubo.h +++ b/src/overlays/actors/ovl_En_Wall_Tubo/z_en_wall_tubo.h @@ -4,8 +4,7 @@ #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ Actor actor; /* 0x014C */ char unk_14C[0x24]; } EnWallTubo; // size = 0x0170 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 7fb710eeaf..b17544c460 100644 --- a/src/overlays/actors/ovl_En_Wallmas/z_en_wallmas.c +++ b/src/overlays/actors/ovl_En_Wallmas/z_en_wallmas.c @@ -2,46 +2,43 @@ * File: z_en_wallmas * Overlay: En_Wallmas * Description: Wallmaster (Ceiling monster) -*/ + */ #include "z_en_wallmas.h" -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x00000015 #define TIMER_SCALE 0.0062500000931322574615478515625f #define DEGREE_60_RAD 1.0471975803375244140625f #define DEGREE_15_RAD 0.261799395084381103515625f -#define DAMAGE_EFFECT_BURN 2 -#define DAMAGE_EFFECT_STUN_WHITE 4 -#define DAMAGE_EFFECT_STUN_BLUE 1 +#define DAMAGE_EFFECT_BURN 2 +#define DAMAGE_EFFECT_STUN_WHITE 4 +#define DAMAGE_EFFECT_STUN_BLUE 1 static void EnWallmas_Init(EnWallmas* this, GlobalContext* globalCtx); static void EnWallmas_Destroy(EnWallmas* this, GlobalContext* globalCtx); -static void EnWallmas_TimerInit(EnWallmas *this, GlobalContext *globalCtx); -static void EnWallmas_ProximityOrSwitchInit(EnWallmas *this); -static void EnWallmas_WaitToDrop(EnWallmas *this, GlobalContext *globalCtx); -static void EnWallmas_Drop(EnWallmas *this, GlobalContext *globalCtx); -static void EnWallmas_Land(EnWallmas *this, GlobalContext *globalCtx); -static void EnWallmas_Stand(EnWallmas *this, GlobalContext *globalCtx); -static void EnWallmas_JumpToCeiling(EnWallmas *this, GlobalContext *globalCtx); -static void EnWallmas_ReturnToCeiling(EnWallmas *this, GlobalContext *globalCtx); -static void EnWallmas_TakeDamage(EnWallmas *this, GlobalContext *globalCtx); -static void EnWallmas_DamageCoolDown(EnWallmas *this, GlobalContext *globalCtx); -static void EnWallmas_Die(EnWallmas *this, GlobalContext *globalCtx); -static void EnWallmas_TakePlayer(EnWallmas *this, GlobalContext *globalCtx); -static void EnWallmas_WaitForProximity(EnWallmas *this, GlobalContext *globalCtx); -static void EnWallmas_WaitForSwitchFlag(EnWallmas *this, GlobalContext *globalCtx); -static void EnWallmas_Stun(EnWallmas *this, GlobalContext *globalCtx); +static void EnWallmas_TimerInit(EnWallmas* this, GlobalContext* globalCtx); +static void EnWallmas_ProximityOrSwitchInit(EnWallmas* this); +static void EnWallmas_WaitToDrop(EnWallmas* this, GlobalContext* globalCtx); +static void EnWallmas_Drop(EnWallmas* this, GlobalContext* globalCtx); +static void EnWallmas_Land(EnWallmas* this, GlobalContext* globalCtx); +static void EnWallmas_Stand(EnWallmas* this, GlobalContext* globalCtx); +static void EnWallmas_JumpToCeiling(EnWallmas* this, GlobalContext* globalCtx); +static void EnWallmas_ReturnToCeiling(EnWallmas* this, GlobalContext* globalCtx); +static void EnWallmas_TakeDamage(EnWallmas* this, GlobalContext* globalCtx); +static void EnWallmas_DamageCoolDown(EnWallmas* this, GlobalContext* globalCtx); +static void EnWallmas_Die(EnWallmas* this, GlobalContext* globalCtx); +static void EnWallmas_TakePlayer(EnWallmas* this, GlobalContext* globalCtx); +static void EnWallmas_WaitForProximity(EnWallmas* this, GlobalContext* globalCtx); +static void EnWallmas_WaitForSwitchFlag(EnWallmas* this, GlobalContext* globalCtx); +static void EnWallmas_Stun(EnWallmas* this, GlobalContext* globalCtx); static void EnWallmas_Update(EnWallmas* this, GlobalContext* globalCtx); -static void EnWallmas_Walk(EnWallmas *this, GlobalContext *globalCtx); -static s32 EnWallMas_UpdatePos(GlobalContext *globalCtx, s32 arg1, s32 arg2, Actor *arg3, void *arg4, EnWallmas *arg5); -static void EnWallmas_DrawOpa(GlobalContext *globalCtx, s32 arg1, s32 arg2, s32 arg3); +static void EnWallmas_Walk(EnWallmas* this, GlobalContext* globalCtx); static void EnWallmas_Draw(EnWallmas* this, GlobalContext* globalCtx); -const ActorInit En_Wallmas_InitVars = -{ +const ActorInit En_Wallmas_InitVars = { ACTOR_EN_WALLMAS, ACTORTYPE_ENEMY, ROOM, @@ -54,167 +51,25 @@ const ActorInit En_Wallmas_InitVars = (ActorFunc)EnWallmas_Draw, }; -static ColliderCylinderInit colCylinderInit = -{ - { - 0x00, - 0x00, - 0x09, - 0x39, - 0x10, - 0x01, - { - 0x00, - 0x00, - }, - }, - { - 0x00, - { - 0x00, - 0x00, - 0x00, - }, - 0x00000000, - 0x00, - 0x00, - { - 0x00, - 0x00, - }, - 0xFFCFFFFF, - { - 0x00, - 0x00, - 0x00, - 0x00 - }, - 0x00, - 0x01, - 0x01, - 0x00, - }, - { - 0x001E, - 0x0028, - 0x0000, - { - 0x0000, - 0x0000, - 0x0000, - }, - }, +static ColliderCylinderInit colCylinderInit = { + 0x00, 0x00, 0x09, 0x39, 0x10, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00000000, 0x00, 0x00, 0x00, 0x00, 0xFFCFFFFF, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x01, 0x01, 0x00, 0x001E, 0x0028, 0x0000, 0x0000, 0x0000, 0x0000, }; -static SubActor98Init subActor98Init = -{ +static Sub98Init4 sub98Init = { 0x04, 0x001E, 0x0028, 0x96, }; -static ActorDamageChart damageChart = -{ - { - { - 0x1, 0x0, - }, - { - 0x0, 0x2, - }, - { - 0x0, 0x1, - }, - { - 0x0, 0x2, - }, - { - 0x1, 0x0, - }, - { - 0x0, 0x2, - }, - { - 0x0, 0x2, - }, - { - 0x1, 0x0, - }, - { - 0x0, 0x1, - }, - { - 0x0, 0x2, - }, - { - 0x0, 0x4, - }, - { - 0x2, 0x4, - }, - { - 0x0, 0x2, - }, - { - 0x4, 0x4, - }, - { - 0x0, 0x4, - }, - { - 0x0, 0x2, - }, - { - 0x0, 0x2, - }, - { - 0x2, 0x4, - }, - { - 0x0, 0x0, - }, - { - 0x4, 0x4, - }, - { - 0x0, 0x0, - }, - { - 0x0, 0x0, - }, - { - 0x0, 0x1, - }, - { - 0x0, 0x4, - }, - { - 0x0, 0x2, - }, - { - 0x0, 0x2, - }, - { - 0x0, 0x8, - }, - { - 0x0, 0x4, - }, - { - 0x0, 0x0, - }, - { - 0x0, 0x0, - }, - { - 0x0, 0x4, - }, - { - 0x0, 0x0, - }, - } -}; +static ActorDamageChart damageChart = { { + { 0x1, 0x0 }, { 0x0, 0x2 }, { 0x0, 0x1 }, { 0x0, 0x2 }, { 0x1, 0x0 }, { 0x0, 0x2 }, { 0x0, 0x2 }, { 0x1, 0x0 }, + { 0x0, 0x1 }, { 0x0, 0x2 }, { 0x0, 0x4 }, { 0x2, 0x4 }, { 0x0, 0x2 }, { 0x4, 0x4 }, { 0x0, 0x4 }, { 0x0, 0x2 }, + { 0x0, 0x2 }, { 0x2, 0x4 }, { 0x0, 0x0 }, { 0x4, 0x4 }, { 0x0, 0x0 }, { 0x0, 0x0 }, { 0x0, 0x1 }, { 0x0, 0x4 }, + { 0x0, 0x2 }, { 0x0, 0x2 }, { 0x0, 0x8 }, { 0x0, 0x4 }, { 0x0, 0x0 }, { 0x0, 0x0 }, { 0x0, 0x4 }, { 0x0, 0x0 }, +} }; static InitChainEntry initChain[3] = { ICHAIN_S8(naviEnemyId, 0x30, 1), @@ -222,69 +77,55 @@ static InitChainEntry initChain[3] = { ICHAIN_F32_DIV1000(gravity, 0xFA24, 0), }; -static Vec3f D_80B30D70 = -{ - 0.0f, 0.0f, 0.0f, -}; +static Vec3f D_80B30D70 = { 0.0f, 0.0f, 0.0f }; -extern u32 D_06000EA4; -extern u32 D_06000590; -extern u32 D_0600299C; -extern u32 D_06008FB0; -extern u32 D_06009DB0; -extern u32 D_060019CC; -extern u32 D_06009520; -extern u32 D_06009244; -extern u32 D_060041F4; -extern u32 D_0600A054; -extern u32 D_06008688; -extern u32 D_04049210; +extern AnimationHeader D_06000EA4; +extern AnimationHeader D_06000590; +extern AnimationHeader D_0600299C; +extern SkeletonHeader D_06008FB0; +extern AnimationHeader D_06009DB0; +extern AnimationHeader D_060019CC; +extern AnimationHeader D_06009520; +extern AnimationHeader D_06009244; +extern AnimationHeader D_060041F4; +extern AnimationHeader D_0600A054; +extern Gfx D_06008688[]; -static void EnWallmas_Init(EnWallmas *this, GlobalContext *globalCtx) -{ - EnWallmas *this2 = this; +static void EnWallmas_Init(EnWallmas* this, GlobalContext* globalCtx) { + EnWallmas* this2 = this; Actor_ProcessInitChain(&this->actor, initChain); ActorShape_Init(&this->actor.shape, 0, NULL, 0.5f); - func_800A46F8(globalCtx, &this->skelAnime, &D_06008FB0, - &D_06009DB0, &this->unkSkelAnimeStruct, &this->unk_22e, - 0x19); + SkelAnime_InitSV(globalCtx, &this->skelAnime, &D_06008FB0, &D_06009DB0, &this->unkSkelAnimeStruct, &this->unk_22e, + 0x19); ActorCollider_AllocCylinder(globalCtx, &this->colCylinder); ActorCollider_InitCylinder(globalCtx, &this->colCylinder, &this->actor, &colCylinderInit); - func_80061ED4(&this->actor.sub_98, &damageChart, &subActor98Init); + func_80061ED4(&this->actor.sub_98, &damageChart, &sub98Init); this2->switchFlag = (u8)(this2->actor.params >> 0x8); this->actor.params = this->actor.params & 0xFF; - if (this->actor.params == WMT_FLAG) - { - if (Flags_GetSwitch(globalCtx, this->switchFlag) != 0) - { + if (this->actor.params == WMT_FLAG) { + if (Flags_GetSwitch(globalCtx, this->switchFlag) != 0) { Actor_Kill(&this->actor); return; } EnWallmas_ProximityOrSwitchInit(this); - } - else if (this->actor.params == WMT_PROXIMITY) - { + } else if (this->actor.params == WMT_PROXIMITY) { EnWallmas_ProximityOrSwitchInit(this); - } - else - { + } else { EnWallmas_TimerInit(this, globalCtx); } } -static void EnWallmas_Destroy(EnWallmas *this, GlobalContext *globalCtx) -{ - ColliderCylinderMain *col = &this->colCylinder; +static void EnWallmas_Destroy(EnWallmas* this, GlobalContext* globalCtx) { + ColliderCylinderMain* col = &this->colCylinder; ActorCollider_FreeCylinder(globalCtx, col); } -static void EnWallmas_TimerInit(EnWallmas *this, GlobalContext *globalCtx) -{ - Player *player = PLAYER; +static void EnWallmas_TimerInit(EnWallmas* this, GlobalContext* globalCtx) { + Player* player = PLAYER; this->actor.flags &= ~1; this->actor.flags |= 0x20; @@ -296,14 +137,12 @@ static void EnWallmas_TimerInit(EnWallmas *this, GlobalContext *globalCtx) this->actionFunc = (ActorFunc)&EnWallmas_WaitToDrop; } -static void EnWallmas_DropStart(EnWallmas *this, GlobalContext *globalCtx) -{ - Player *player = PLAYER; - u32 *objSegChangeAnime = &D_0600299C; +static void EnWallmas_DropStart(EnWallmas* this, GlobalContext* globalCtx) { + Player* player = PLAYER; + AnimationHeader* objSegChangeAnime = &D_0600299C; - SkelAnime_ChangeAnimation(&this->skelAnime, objSegChangeAnime, 0.0f, - 20.0f, (f32) SkelAnime_GetFrameCount(&D_0600299C), - 2, 0.0f); + SkelAnime_ChangeAnim(&this->skelAnime, objSegChangeAnime, 0.0f, 20.0f, (f32)SkelAnime_GetFrameCount(&D_0600299C), 2, + 0.0f); this->unk_2c4 = player->actor.posRot.pos.y; this->actor.posRot.pos.y = player->actor.posRot.pos.y + 300.0f; @@ -314,63 +153,52 @@ static void EnWallmas_DropStart(EnWallmas *this, GlobalContext *globalCtx) this->actionFunc = (ActorFunc)&EnWallmas_Drop; } -static void EnWallmas_LandStart(EnWallmas *this, GlobalContext *globalCtx) -{ - u32 *objSegFrameCount = &D_060019CC; - u32 *objSegChangeAnime = &D_060019CC; +static void EnWallmas_LandStart(EnWallmas* this, GlobalContext* globalCtx) { + AnimationHeader* objSegFrameCount = &D_060019CC; + AnimationHeader* objSegChangeAnime = &D_060019CC; - SkelAnime_ChangeAnimation(&this->skelAnime, objSegChangeAnime, 1.0f, - 41.0f, SkelAnime_GetFrameCount(objSegFrameCount), - 2, -3.0f); + SkelAnime_ChangeAnim(&this->skelAnime, objSegChangeAnime, 1.0f, 41.0f, SkelAnime_GetFrameCount(objSegFrameCount), 2, + -3.0f); func_80033260(globalCtx, &this->actor, &this->actor.posRot.pos, 15.0f, 6, 20.0f, 0x12C, 0x64, 1); Audio_PlayActorSound2(&this->actor, NA_SE_EN_FALL_LAND); this->actionFunc = (ActorFunc)&EnWallmas_Land; } -static void EnWallmas_StandStart(EnWallmas *this) -{ - func_800A51E8(&this->skelAnime, &D_0600A054); +static void EnWallmas_StandStart(EnWallmas* this) { + SkelAnime_ChangeAnimDefaultStop(&this->skelAnime, &D_0600A054); this->actionFunc = (ActorFunc)&EnWallmas_Stand; } -static void EnWallmas_WalkStart(EnWallmas *this) -{ - func_800A529C(&this->skelAnime, &D_060041F4, 3.0f, &this->actor); +static void EnWallmas_WalkStart(EnWallmas* this) { + SkelAnime_ChangeAnimPlaybackStop(&this->skelAnime, &D_060041F4, 3.0f); this->actionFunc = (ActorFunc)&EnWallmas_Walk; this->actor.speedXZ = 3.0f; } -static void EnWallmas_JumpToCeilingStart(EnWallmas *this) -{ - func_800A51E8(&this->skelAnime, &D_06009244); +static void EnWallmas_JumpToCeilingStart(EnWallmas* this) { + SkelAnime_ChangeAnimDefaultStop(&this->skelAnime, &D_06009244); this->actionFunc = (ActorFunc)&EnWallmas_JumpToCeiling; this->actor.speedXZ = 0.0f; } -static void EnWallmas_ReturnToCeilingStart(EnWallmas *this) -{ - u32 *objSegFrameCount = &D_060019CC; - u32 *objSegChangeAnime = &D_060019CC; +static void EnWallmas_ReturnToCeilingStart(EnWallmas* this) { + AnimationHeader* objSegFrameCount = &D_060019CC; + AnimationHeader* objSegChangeAnime = &D_060019CC; this->timer = 0; this->actor.speedXZ = 0.0f; - SkelAnime_ChangeAnimation(&this->skelAnime, objSegChangeAnime, 3.0f, - 0.0f, (f32) SkelAnime_GetFrameCount(objSegFrameCount), - 2, -3.0f); + SkelAnime_ChangeAnim(&this->skelAnime, objSegChangeAnime, 3.0f, 0.0f, + (f32)SkelAnime_GetFrameCount(objSegFrameCount), 2, -3.0f); this->actionFunc = (ActorFunc)&EnWallmas_ReturnToCeiling; } -static void EnWallmas_TakeDamageStart(EnWallmas *this) -{ - func_800A5240(&this->skelAnime, &D_06000590, -3.0f); - if ((this->colCylinder.body.colliding->toucher.flags & 0x1F824) != 0) - { +static void EnWallmas_TakeDamageStart(EnWallmas* this) { + SkelAnime_ChangeAnimTransitionStop(&this->skelAnime, &D_06000590, -3.0f); + if ((this->colCylinder.body.colliding->toucher.flags & 0x1F824) != 0) { this->actor.posRot.rot.y = this->colCylinder.base.ac->posRot.rot.y; - } - else - { + } else { this->actor.posRot.rot.y = func_8002DA78(&this->actor, this->colCylinder.base.ac) + 0x8000; } @@ -380,31 +208,27 @@ static void EnWallmas_TakeDamageStart(EnWallmas *this) this->actor.velocity.y = 10.0f; } -static void EnWallmas_DamageCoolDownStart(EnWallmas *this) -{ - func_800A51E8(&this->skelAnime, &D_06000EA4); +static void EnWallmas_DamageCoolDownStart(EnWallmas* this) { + SkelAnime_ChangeAnimDefaultStop(&this->skelAnime, &D_06000EA4); this->actor.speedXZ = 0.0f; this->actor.velocity.y = 0.0f; this->actor.posRot.rot.y = this->actor.shape.rot.y; this->actionFunc = (ActorFunc)&EnWallmas_DamageCoolDown; } -static void EnWallMas_DieBegin(EnWallmas *this, GlobalContext *globalCtx) -{ +static void EnWallMas_DieBegin(EnWallmas* this, GlobalContext* globalCtx) { this->actor.speedXZ = 0.0f; this->actor.velocity.y = 0.0f; - func_8002A6B8(globalCtx, &this->actor.posRot.pos, &D_80B30D70, - &D_80B30D70, 0xFA, -0xA, 0xFF, 0xFF, 0xFF, 0xFF, - 0, 0, 0xFF, 1, 9, 1); + func_8002A6B8(globalCtx, &this->actor.posRot.pos, &D_80B30D70, &D_80B30D70, 0xFA, -0xA, 0xFF, 0xFF, 0xFF, 0xFF, 0, + 0, 0xFF, 1, 9, 1); Item_DropCollectibleRandom(globalCtx, &this->actor, &this->actor.posRot.pos, 0xC0); this->actionFunc = (ActorFunc)&EnWallmas_Die; } -static void EnWallmas_TakePlayerBegin(EnWallmas *this, GlobalContext *globalCtx) -{ - func_800A5240(&this->skelAnime, &D_06009520, -5.0f); +static void EnWallmas_TakePlayerBegin(EnWallmas* this, GlobalContext* globalCtx) { + SkelAnime_ChangeAnimTransitionStop(&this->skelAnime, &D_06009520, -5.0f); this->timer = -0x1e; this->actionFunc = (ActorFunc)&EnWallmas_TakePlayer; this->actor.speedXZ = 0.0f; @@ -415,33 +239,24 @@ static void EnWallmas_TakePlayerBegin(EnWallmas *this, GlobalContext *globalCtx) func_800800F8(globalCtx, 0x251C, 0x270F, &this->actor, 0); } -static void EnWallmas_ProximityOrSwitchInit(EnWallmas *this) -{ +static void EnWallmas_ProximityOrSwitchInit(EnWallmas* this) { this->timer = 0; this->actor.draw = NULL; this->actor.flags = this->actor.flags & ~1; - if (this->actor.params == WMT_PROXIMITY) - { + if (this->actor.params == WMT_PROXIMITY) { this->actionFunc = (ActorFunc)&EnWallmas_WaitForProximity; - } - else - { + } else { this->actionFunc = (ActorFunc)&EnWallmas_WaitForSwitchFlag; } } -static void EnWallmas_StunBegin(EnWallmas *this) -{ - SkelAnime_ChangeAnimation(&this->skelAnime, &D_060019CC, 1.5f, 0, - 20.0f, 2, -3.0f); +static void EnWallmas_StunBegin(EnWallmas* this) { + SkelAnime_ChangeAnim(&this->skelAnime, &D_060019CC, 1.5f, 0, 20.0f, 2, -3.0f); this->actor.speedXZ = 0.0f; - if (this->actor.sub_98.damageEffect == 4) - { + if (this->actor.sub_98.damageEffect == 4) { func_8003426C(&this->actor, -0x8000, 0xFF, 0, 0x50); - } - else - { + } else { func_8003426C(&this->actor, 0, 0xFF, 0, 0x50); Audio_PlayActorSound2(&this->actor, NA_SE_EN_GOMA_JR_FREEZE); } @@ -450,10 +265,9 @@ static void EnWallmas_StunBegin(EnWallmas *this) this->actionFunc = (ActorFunc)&EnWallmas_Stun; } -static void EnWallmas_WaitToDrop(EnWallmas *this, GlobalContext *globalCtx) -{ - Vec3f *playerPos; - Player *player; +static void EnWallmas_WaitToDrop(EnWallmas* this, GlobalContext* globalCtx) { + Vec3f* playerPos; + Player* player; player = PLAYER; playerPos = &player->actor.posRot.pos; @@ -461,159 +275,119 @@ static void EnWallmas_WaitToDrop(EnWallmas *this, GlobalContext *globalCtx) this->actor.unk_80 = player->actor.unk_80; this->actor.floorPoly = player->actor.floorPoly; - if (this->timer != 0) - { + if (this->timer != 0) { this->timer--; } - if (((s32)(player->stateFlags1 << 0xB) < 0) - || ((s32)(player->stateFlags1 << 4) < 0) - || ((player->actor.bgCheckFlags & 1) == 0) - || ((this->actor.params == 1) && (320.0f < Math_Vec3f_DistXZ(&this->actor.initPosRot.pos, playerPos)))) - { + if (((s32)(player->stateFlags1 << 0xB) < 0) || ((s32)(player->stateFlags1 << 4) < 0) || + ((player->actor.bgCheckFlags & 1) == 0) || + ((this->actor.params == 1) && (320.0f < Math_Vec3f_DistXZ(&this->actor.initPosRot.pos, playerPos)))) { func_800F8D04(NA_SE_EN_FALL_AIM); this->timer = 0x82; } - if (this->timer == 0x50) - { + if (this->timer == 0x50) { Audio_PlayActorSound2(&this->actor, NA_SE_EN_FALL_AIM); } - if (this->timer == 0) - { + if (this->timer == 0) { EnWallmas_DropStart(this, globalCtx); } } -static void EnWallmas_Drop(EnWallmas *this, GlobalContext *globalCtx) -{ - Player *player = PLAYER; - if ((func_8008E988(globalCtx) == 0) && - (player->stateFlags2 & 0x10) == 0 && - (player->unk_A78 >= 0) && - (this->actor.xzDistanceFromLink < 30.0f) && - (this->actor.yDistanceFromLink < -5.0f) && - (-(f32)(player->unk_4DA + 0xA) < this->actor.yDistanceFromLink)) - { +static void EnWallmas_Drop(EnWallmas* this, GlobalContext* globalCtx) { + Player* player = PLAYER; + if ((func_8008E988(globalCtx) == 0) && (player->stateFlags2 & 0x10) == 0 && (player->unk_A78 >= 0) && + (this->actor.xzDistanceFromLink < 30.0f) && (this->actor.yDistanceFromLink < -5.0f) && + (-(f32)(player->unk_4DA + 0xA) < this->actor.yDistanceFromLink)) { EnWallmas_TakePlayerBegin(this, globalCtx); } } -static void EnWallmas_Land(EnWallmas *this, GlobalContext *globalCtx) -{ - if (SkelAnime_FrameUpdateMatrix(&this->skelAnime) != 0) - { +static void EnWallmas_Land(EnWallmas* this, GlobalContext* globalCtx) { + if (SkelAnime_FrameUpdateMatrix(&this->skelAnime) != 0) { EnWallmas_StandStart(this); } } -static void EnWallmas_Stand(EnWallmas *this, GlobalContext *globalCtx) -{ - if (SkelAnime_FrameUpdateMatrix(&this->skelAnime) != 0) - { +static void EnWallmas_Stand(EnWallmas* this, GlobalContext* globalCtx) { + if (SkelAnime_FrameUpdateMatrix(&this->skelAnime) != 0) { EnWallmas_WalkStart(this); } Math_ApproxUpdateScaledS(&this->actor.posRot.rot.y, this->actor.rotTowardsLinkY + 0x8000, 0xB6); } -static void EnWallmas_Walk(EnWallmas *this, GlobalContext *globalCtx) -{ - if (SkelAnime_FrameUpdateMatrix(&this->skelAnime) != 0) - { +static void EnWallmas_Walk(EnWallmas* this, GlobalContext* globalCtx) { + if (SkelAnime_FrameUpdateMatrix(&this->skelAnime) != 0) { EnWallmas_JumpToCeilingStart(this); } - Math_ApproxUpdateScaledS(&this->actor.posRot.rot.y, - (s16)((s32)this->actor.rotTowardsLinkY + 0x8000), - 0xB6); + Math_ApproxUpdateScaledS(&this->actor.posRot.rot.y, (s16)((s32)this->actor.rotTowardsLinkY + 0x8000), 0xB6); - if ((func_800A56C8(&this->skelAnime, 0.0f) != 0) || - (func_800A56C8(&this->skelAnime, 12.0f) != 0) || - (func_800A56C8(&this->skelAnime, 24.0f) != 0) || - (func_800A56C8(&this->skelAnime, 36.0f) != 0)) - { + if ((func_800A56C8(&this->skelAnime, 0.0f) != 0) || (func_800A56C8(&this->skelAnime, 12.0f) != 0) || + (func_800A56C8(&this->skelAnime, 24.0f) != 0) || (func_800A56C8(&this->skelAnime, 36.0f) != 0)) { Audio_PlayActorSound2(&this->actor, NA_SE_EN_FALL_WALK); } } -static void EnWallmas_JumpToCeiling(EnWallmas *this, GlobalContext *globalCtx) -{ - if (SkelAnime_FrameUpdateMatrix(&this->skelAnime) != 0) - { +static void EnWallmas_JumpToCeiling(EnWallmas* this, GlobalContext* globalCtx) { + if (SkelAnime_FrameUpdateMatrix(&this->skelAnime) != 0) { EnWallmas_ReturnToCeilingStart(this); } } -static void EnWallmas_ReturnToCeiling(EnWallmas *this, GlobalContext *globalCtx) -{ - Player *player = PLAYER; +static void EnWallmas_ReturnToCeiling(EnWallmas* this, GlobalContext* globalCtx) { + Player* player = PLAYER; SkelAnime_FrameUpdateMatrix(&this->skelAnime); - if (this->skelAnime.animCurrentFrame > 20.0f) - { + if (this->skelAnime.animCurrentFrame > 20.0f) { this->timer += 9; this->actor.posRot.pos.y = this->actor.posRot.pos.y + 30.0f; } - if (func_800A56C8(&this->skelAnime, 20.0f) != 0) - { + if (func_800A56C8(&this->skelAnime, 20.0f) != 0) { Audio_PlayActorSound2(&this->actor, NA_SE_EN_FALL_UP); } - if (this->actor.yDistanceFromLink < -900.0f) - { - if (this->actor.params == WMT_FLAG) - { + if (this->actor.yDistanceFromLink < -900.0f) { + if (this->actor.params == WMT_FLAG) { Actor_Kill(&this->actor); return; } - if (this->actor.params == WMT_TIMER || Math_Vec3f_DistXZ(&this->actor.initPosRot.pos, &player->actor.posRot.pos) < 200.0f) - { + if (this->actor.params == WMT_TIMER || + Math_Vec3f_DistXZ(&this->actor.initPosRot.pos, &player->actor.posRot.pos) < 200.0f) { EnWallmas_TimerInit(this, globalCtx); return; - } - else - { + } else { EnWallmas_ProximityOrSwitchInit(this); } } } -static void EnWallmas_TakeDamage(EnWallmas *this, GlobalContext *globalCtx) -{ - if (SkelAnime_FrameUpdateMatrix(&this->skelAnime) != 0) - { - if (this->actor.sub_98.health == 0) - { +static void EnWallmas_TakeDamage(EnWallmas* this, GlobalContext* globalCtx) { + if (SkelAnime_FrameUpdateMatrix(&this->skelAnime) != 0) { + if (this->actor.sub_98.health == 0) { EnWallMas_DieBegin(this, globalCtx); - } - else - { + } else { EnWallmas_DamageCoolDownStart(this); } } - if (func_800A56C8(&this->skelAnime, 13.0f) != 0) - { + if (func_800A56C8(&this->skelAnime, 13.0f) != 0) { Audio_PlayActorSound2(&this->actor, NA_SE_EN_DODO_M_GND); } Math_ApproxF(&this->actor.speedXZ, 0.0f, 0.2f); } -static void EnWallmas_DamageCoolDown(EnWallmas *this, GlobalContext *globalCtx) -{ - if (SkelAnime_FrameUpdateMatrix(&this->skelAnime) != 0) - { +static void EnWallmas_DamageCoolDown(EnWallmas* this, GlobalContext* globalCtx) { + if (SkelAnime_FrameUpdateMatrix(&this->skelAnime) != 0) { EnWallmas_ReturnToCeilingStart(this); } } -static void EnWallmas_Die(EnWallmas *this, GlobalContext *globalCtx) -{ - if (Math_ApproxF(&this->actor.scale.x, 0.0f, 0.0015) != 0) - { +static void EnWallmas_Die(EnWallmas* this, GlobalContext* globalCtx) { + if (Math_ApproxF(&this->actor.scale.x, 0.0f, 0.0015) != 0) { Actor_SetScale(&this->actor, 0.01f); Item_DropCollectibleRandom(globalCtx, &this->actor, &this->actor.posRot.pos, 0xC0); Actor_Kill(&this->actor); @@ -622,153 +396,112 @@ static void EnWallmas_Die(EnWallmas *this, GlobalContext *globalCtx) this->actor.scale.y = this->actor.scale.x; } -static void EnWallmas_TakePlayer(EnWallmas *this, GlobalContext *globalCtx) -{ - Player *player; +static void EnWallmas_TakePlayer(EnWallmas* this, GlobalContext* globalCtx) { + Player* player; player = PLAYER; - if (func_800A56C8(&this->skelAnime, 1.0f) != 0) - { - if (LINK_IS_CHILD) - { + if (func_800A56C8(&this->skelAnime, 1.0f) != 0) { + if (LINK_IS_CHILD) { func_8002F7DC(&this->actor, NA_SE_VO_LI_DAMAGE_S_KID); - } - else - { + } else { func_8002F7DC(&this->actor, NA_SE_VO_LI_DAMAGE_S); } Audio_PlayActorSound2(&this->actor, NA_SE_EN_FALL_CATCH); } - if (SkelAnime_FrameUpdateMatrix(&this->skelAnime) != 0) - { + if (SkelAnime_FrameUpdateMatrix(&this->skelAnime) != 0) { player->actor.posRot.pos.x = this->actor.posRot.pos.x; player->actor.posRot.pos.z = this->actor.posRot.pos.z; - if (this->timer < 0) - { + if (this->timer < 0) { this->actor.posRot.pos.y = this->actor.posRot.pos.y + 2.0f; - } - else - { + } else { this->actor.posRot.pos.y = this->actor.posRot.pos.y + 10.0f; } - if (gSaveContext.link_age != 0) - { + if (gSaveContext.link_age != 0) { player->actor.posRot.pos.y = this->actor.posRot.pos.y - 30.0f; - } - else - { + } else { player->actor.posRot.pos.y = this->actor.posRot.pos.y - 50.0f; } - if (this->timer == -0x1E) - { - if (gSaveContext.link_age != 0) - { + if (this->timer == -0x1E) { + if (gSaveContext.link_age != 0) { func_8002F7DC(&this->actor, NA_SE_VO_LI_TAKEN_AWAY_KID); - } - else - { + } else { func_8002F7DC(&this->actor, NA_SE_VO_LI_TAKEN_AWAY); } } - if (this->timer == 0) - { + if (this->timer == 0) { Audio_PlayActorSound2(&this->actor, NA_SE_EN_FALL_UP); } this->timer = this->timer + 2; - } - else - { - Math_ApproxF(&this->actor.posRot.pos.y, player->actor.posRot.pos.y + (gSaveContext.link_age != 0 ? 30.0f : 50.0f) , 5.0f); + } else { + Math_ApproxF(&this->actor.posRot.pos.y, + player->actor.posRot.pos.y + (gSaveContext.link_age != 0 ? 30.0f : 50.0f), 5.0f); } Math_ApproxF(&this->actor.posRot.pos.x, player->actor.posRot.pos.x, 3.0f); Math_ApproxF(&this->actor.posRot.pos.z, player->actor.posRot.pos.z, 3.0f); - if (this->timer == 0x1E) - { + if (this->timer == 0x1E) { func_80078884(NA_SE_OC_ABYSS); func_800C0C88(globalCtx); } } -static void EnWallmas_WaitForProximity(EnWallmas *this, GlobalContext *globalCtx) -{ - Player *player = PLAYER; - if (Math_Vec3f_DistXZ(&this->actor.initPosRot.pos, &player->actor.posRot.pos) < 200.0f) - { +static void EnWallmas_WaitForProximity(EnWallmas* this, GlobalContext* globalCtx) { + Player* player = PLAYER; + if (Math_Vec3f_DistXZ(&this->actor.initPosRot.pos, &player->actor.posRot.pos) < 200.0f) { EnWallmas_TimerInit(this, globalCtx); } } -static void EnWallmas_WaitForSwitchFlag(EnWallmas *this, GlobalContext *globalCtx) -{ - if (Flags_GetSwitch(globalCtx, this->switchFlag) != 0) - { +static void EnWallmas_WaitForSwitchFlag(EnWallmas* this, GlobalContext* globalCtx) { + if (Flags_GetSwitch(globalCtx, this->switchFlag) != 0) { EnWallmas_TimerInit(this, globalCtx); this->timer = 0x51; } } -static void EnWallmas_Stun(EnWallmas *this, GlobalContext *globalCtx) -{ +static void EnWallmas_Stun(EnWallmas* this, GlobalContext* globalCtx) { SkelAnime_FrameUpdateMatrix(&this->skelAnime); - if (this->timer != 0) - { + if (this->timer != 0) { this->timer--; } - if (this->timer == 0) - { - if (this->actor.sub_98.health == 0) - { + if (this->timer == 0) { + if (this->actor.sub_98.health == 0) { EnWallMas_DieBegin(this, globalCtx); - } - else - { + } else { EnWallmas_ReturnToCeilingStart(this); } } } -static void EnWallmas_ColUpdate(EnWallmas *this, GlobalContext *globalCtx) -{ - if ((this->colCylinder.base.collideFlags & 2) != 0) - { +static void EnWallmas_ColUpdate(EnWallmas* this, GlobalContext* globalCtx) { + if ((this->colCylinder.base.collideFlags & 2) != 0) { this->colCylinder.base.collideFlags &= ~2; func_80035650(&this->actor, &this->colCylinder.body, 1); - if ((this->actor.sub_98.damageEffect != 0) || (this->actor.sub_98.damage != 0)) - { - if (Actor_ApplyDamage(&this->actor) == 0) - { + if ((this->actor.sub_98.damageEffect != 0) || (this->actor.sub_98.damage != 0)) { + if (Actor_ApplyDamage(&this->actor) == 0) { func_80032C7C(globalCtx, &this->actor); Audio_PlayActorSound2(&this->actor, NA_SE_EN_FALL_DEAD); this->actor.flags &= ~1; - } - else - { - if (this->actor.sub_98.damage != 0) - { + } else { + if (this->actor.sub_98.damage != 0) { Audio_PlayActorSound2(&this->actor, NA_SE_EN_FALL_DAMAGE); } } if ((this->actor.sub_98.damageEffect == DAMAGE_EFFECT_STUN_WHITE) || - (this->actor.sub_98.damageEffect == DAMAGE_EFFECT_STUN_BLUE)) - { - if (this->actionFunc != (ActorFunc)&EnWallmas_Stun) - { + (this->actor.sub_98.damageEffect == DAMAGE_EFFECT_STUN_BLUE)) { + if (this->actionFunc != (ActorFunc)&EnWallmas_Stun) { EnWallmas_StunBegin(this); } - } - else - { - if (this->actor.sub_98.damageEffect == DAMAGE_EFFECT_BURN) - { + } else { + if (this->actor.sub_98.damageEffect == DAMAGE_EFFECT_BURN) { func_8002A65C(globalCtx, &this->actor, &this->actor.posRot.pos, 0x28, 0x28); } @@ -778,9 +511,8 @@ static void EnWallmas_ColUpdate(EnWallmas *this, GlobalContext *globalCtx) } } -static void EnWallmas_Update(EnWallmas *this, GlobalContext *globalCtx) -{ - EnWallmas *this2 = this; +static void EnWallmas_Update(EnWallmas* this, GlobalContext* globalCtx) { + EnWallmas* this2 = this; char pad[4]; EnWallmas_ColUpdate(this2, globalCtx); @@ -789,115 +521,101 @@ static void EnWallmas_Update(EnWallmas *this, GlobalContext *globalCtx) if ((this2->actionFunc == (ActorFunc)&EnWallmas_WaitToDrop) || (this2->actionFunc == (ActorFunc)&EnWallmas_WaitForProximity) || (this2->actionFunc == (ActorFunc)&EnWallmas_TakePlayer) || - (this2->actionFunc == (ActorFunc)&EnWallmas_WaitForSwitchFlag)) - { + (this2->actionFunc == (ActorFunc)&EnWallmas_WaitForSwitchFlag)) { return; } if ((this2->actionFunc != (ActorFunc)&EnWallmas_ReturnToCeiling) && - (this2->actionFunc != (ActorFunc)&EnWallmas_TakePlayer)) - { + (this2->actionFunc != (ActorFunc)&EnWallmas_TakePlayer)) { Actor_MoveForward(&this->actor); } - if (this2->actionFunc != (ActorFunc)&EnWallmas_Drop) - { + if (this2->actionFunc != (ActorFunc)&EnWallmas_Drop) { func_8002E4B4(globalCtx, &this2->actor, 20.0f, 25.0f, 0.0f, 0x1D); - } - else if (this2->actor.posRot.pos.y <= this2->unk_2c4) - { + } else if (this2->actor.posRot.pos.y <= this2->unk_2c4) { this2->actor.posRot.pos.y = this2->unk_2c4; this2->actor.velocity.y = 0.0f; EnWallmas_LandStart(this2, globalCtx); } - if ((this2->actionFunc != (ActorFunc)&EnWallmas_Die) && - (this2->actionFunc != (ActorFunc)&EnWallmas_Drop)) - { + if ((this2->actionFunc != (ActorFunc)&EnWallmas_Die) && (this2->actionFunc != (ActorFunc)&EnWallmas_Drop)) { ActorCollider_Cylinder_Update(&this2->actor, &this2->colCylinder); Actor_CollisionCheck_SetOT(globalCtx, &globalCtx->sub_11E60, &this2->colCylinder); - if ((this2->actionFunc != (ActorFunc)&EnWallmas_TakeDamage) && - (this2->actor.bgCheckFlags & 1) != 0 && - (this2->actor.freeze == 0)) - { + if ((this2->actionFunc != (ActorFunc)&EnWallmas_TakeDamage) && (this2->actor.bgCheckFlags & 1) != 0 && + (this2->actor.freeze == 0)) { Actor_CollisionCheck_SetAC(globalCtx, &globalCtx->sub_11E60, &this2->colCylinder); } } Actor_SetHeight(&this2->actor, 25.0f); - if (this->actionFunc == (ActorFunc)&EnWallmas_TakeDamage) - { + if (this->actionFunc == (ActorFunc)&EnWallmas_TakeDamage) { return; } this2->actor.shape.rot.y = this2->actor.posRot.rot.y; } -static void EnWallmas_DrawXlu(EnWallmas *this, GlobalContext *globalCtx) -{ +static void EnWallmas_DrawXlu(EnWallmas* this, GlobalContext* globalCtx) { char pad[8]; MtxF mf; - GraphicsContext *gfxCtx; + GraphicsContext* gfxCtx; f32 xzScale; - Gfx *gfx[3]; + Gfx* dispRefs[3]; if ((this->actor.floorPoly == NULL) || - ((this->timer >= 0x51) && (this->actionFunc != (ActorFunc)&EnWallmas_Stun))) - { + ((this->timer >= 0x51) && (this->actionFunc != (ActorFunc)&EnWallmas_Stun))) { return; } - gfxCtx = globalCtx->state.gfxCtx; func_800C6AC4(gfx, globalCtx->state.gfxCtx, "../z_en_wallmas.c", 1386); + // clang-format off + gfxCtx = globalCtx->state.gfxCtx; Graph_OpenDisps(dispRefs, globalCtx->state.gfxCtx, "../z_en_wallmas.c", 1386); + // clang-format on + func_80094044(globalCtx->state.gfxCtx); gDPSetPrimColor(gfxCtx->polyXlu.p++, 0, 0, 0x00, 0x00, 0x00, 0xFF); func_80038A28(this->actor.floorPoly, this->actor.posRot.pos.x, this->actor.unk_80, this->actor.posRot.pos.z, &mf); Matrix_Mult(&mf, MTXMODE_NEW); - if ((this->actionFunc != (ActorFunc)EnWallmas_WaitToDrop) && (this->actionFunc != (ActorFunc)EnWallmas_ReturnToCeiling) && - (this->actionFunc != (ActorFunc)EnWallmas_TakePlayer) && (this->actionFunc != (ActorFunc)EnWallmas_WaitForSwitchFlag)) - { + if ((this->actionFunc != (ActorFunc)EnWallmas_WaitToDrop) && + (this->actionFunc != (ActorFunc)EnWallmas_ReturnToCeiling) && + (this->actionFunc != (ActorFunc)EnWallmas_TakePlayer) && + (this->actionFunc != (ActorFunc)EnWallmas_WaitForSwitchFlag)) { xzScale = this->actor.scale.x * 50.0f; - } - else - { + } else { xzScale = ((0x50 - this->timer) >= 0x51 ? 0x50 : (0x50 - this->timer)) * TIMER_SCALE; } Matrix_Scale(xzScale, 1.0f, xzScale, MTXMODE_APPLY); gSPMatrix(gfxCtx->polyXlu.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_wallmas.c", 1421), G_MTX_LOAD); gSPDisplayList(gfxCtx->polyXlu.p++, &D_04049210); - func_800C6B54(gfx, globalCtx->state.gfxCtx, "../z_en_wallmas.c", 1426); + Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_en_wallmas.c", 1426); } -static s32 EnWallMas_UpdatePos(GlobalContext *globalCtx, s32 arg1, s32 arg2, Actor *arg3, void *arg4, EnWallmas *arg5) -{ - if (arg1 == 1) - { - if (arg5->actionFunc != (ActorFunc)EnWallmas_TakePlayer) - { - arg3->initPosRot.pos.x = arg3->initPosRot.pos.x - 1600.0f; - } - else - { - arg3->initPosRot.pos.x = arg3->initPosRot.pos.x - ((1600.0f * (arg5->skelAnime.animFrameCount - arg5->skelAnime.animCurrentFrame)) / arg5->skelAnime.animFrameCount); +static s32 EnWallMas_UpdatePos(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot, + Actor* actor) { + EnWallmas* this = (EnWallmas*)actor; + if (limbIndex == 1) { + if (this->actionFunc != (ActorFunc)EnWallmas_TakePlayer) { + pos->z -= 1600.0f; + } else { + pos->z -= ((1600.0f * (this->skelAnime.animFrameCount - this->skelAnime.animCurrentFrame)) / + this->skelAnime.animFrameCount); } } return 0; } -static void EnWallmas_DrawOpa(GlobalContext *globalCtx, s32 arg1, s32 arg2, s32 arg3) -{ - GraphicsContext *gfxCtx; - Gfx *gfx[4]; +static void EnWallmas_DrawOpa(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec3s* rot, Actor* actor) { + GraphicsContext* gfxCtx; + Gfx* dispRefs[4]; - if (arg1 == 2) - { + if (limbIndex == 2) { gfxCtx = globalCtx->state.gfxCtx; - func_800C6AC4(&gfx, globalCtx->state.gfxCtx, "../z_en_wallmas.c", 1478); + Graph_OpenDisps(dispRefs, globalCtx->state.gfxCtx, "../z_en_wallmas.c", 1478); Matrix_Push(); Matrix_Translate(1600.0f, -700.0f, -1700.0f, MTXMODE_APPLY); Matrix_RotateY(DEGREE_60_RAD, MTXMODE_APPLY); @@ -905,20 +623,19 @@ static void EnWallmas_DrawOpa(GlobalContext *globalCtx, s32 arg1, s32 arg2, s32 Matrix_Scale(2.0f, 2.0f, 2.0f, MTXMODE_APPLY); gSPMatrix(gfxCtx->polyOpa.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_wallmas.c", 1489), G_MTX_LOAD); - gSPDisplayList(gfxCtx->polyOpa.p++, &D_06008688); + gSPDisplayList(gfxCtx->polyOpa.p++, D_06008688); Matrix_Pull(); - func_800C6B54(&gfx, globalCtx->state.gfxCtx, "../z_en_wallmas.c", 1495); + Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_en_wallmas.c", 1495); } } -static void EnWallmas_Draw(EnWallmas *this, GlobalContext *globalCtx) -{ - if (this->actionFunc != (ActorFunc)&EnWallmas_WaitToDrop) - { +static void EnWallmas_Draw(EnWallmas* this, GlobalContext* globalCtx) { + if (this->actionFunc != (ActorFunc)&EnWallmas_WaitToDrop) { func_80093D18(globalCtx->state.gfxCtx); - func_800A1AC8(globalCtx, this->skelAnime.limbIndex, this->skelAnime.actorDrawTbl, this->skelAnime.dListCount, &EnWallMas_UpdatePos, &EnWallmas_DrawOpa, &this->actor); + SkelAnime_DrawSV(globalCtx, this->skelAnime.skeleton, this->skelAnime.actorDrawTbl, this->skelAnime.dListCount, + &EnWallMas_UpdatePos, &EnWallmas_DrawOpa, &this->actor); } EnWallmas_DrawXlu(this, globalCtx); -} \ No newline at end of file +} diff --git a/src/overlays/actors/ovl_En_Wallmas/z_en_wallmas.h b/src/overlays/actors/ovl_En_Wallmas/z_en_wallmas.h index ffa407b3cb..1855cdd332 100644 --- a/src/overlays/actors/ovl_En_Wallmas/z_en_wallmas.h +++ b/src/overlays/actors/ovl_En_Wallmas/z_en_wallmas.h @@ -5,16 +5,14 @@ #include typedef enum { - WMT_TIMER, - WMT_PROXIMITY, - WMT_FLAG, + /* 0x00 */ WMT_TIMER, + /* 0x01 */ WMT_PROXIMITY, + /* 0x02 */ WMT_FLAG } WallmasType; -typedef struct -{ +typedef struct { /* 0x0000 */ Actor actor; /* 0x014C */ SkelAnime skelAnime; - /* 0x018C */ char unk_18C[0x4]; /* 0x0190 */ ActorFunc actionFunc; /* 0x0194 */ s16 timer; /* 0x0196 */ s16 switchFlag; diff --git a/src/overlays/actors/ovl_En_Weather_Tag/z_en_weather_tag.c b/src/overlays/actors/ovl_En_Weather_Tag/z_en_weather_tag.c index ebe2a89f64..7c1d9bf7b4 100644 --- a/src/overlays/actors/ovl_En_Weather_Tag/z_en_weather_tag.c +++ b/src/overlays/actors/ovl_En_Weather_Tag/z_en_weather_tag.c @@ -1,6 +1,6 @@ #include "z_en_weather_tag.h" -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x00000010 void EnWeatherTag_Init(EnWeatherTag* this, GlobalContext* globalCtx); @@ -8,8 +8,7 @@ void EnWeatherTag_Destroy(EnWeatherTag* this, GlobalContext* globalCtx); void EnWeatherTag_Update(EnWeatherTag* this, GlobalContext* globalCtx); /* -const ActorInit En_Weather_Tag_InitVars = -{ +const ActorInit En_Weather_Tag_InitVars = { ACTOR_EN_WEATHER_TAG, ACTORTYPE_PROP, ROOM, diff --git a/src/overlays/actors/ovl_En_Weather_Tag/z_en_weather_tag.h b/src/overlays/actors/ovl_En_Weather_Tag/z_en_weather_tag.h index 13bebb7568..366c6d8945 100644 --- a/src/overlays/actors/ovl_En_Weather_Tag/z_en_weather_tag.h +++ b/src/overlays/actors/ovl_En_Weather_Tag/z_en_weather_tag.h @@ -4,8 +4,7 @@ #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ Actor actor; /* 0x014C */ char unk_14C[0x8]; } EnWeatherTag; // size = 0x0154 diff --git a/src/overlays/actors/ovl_En_Weiyer/z_en_weiyer.c b/src/overlays/actors/ovl_En_Weiyer/z_en_weiyer.c index c6c0100083..846409a0b1 100644 --- a/src/overlays/actors/ovl_En_Weiyer/z_en_weiyer.c +++ b/src/overlays/actors/ovl_En_Weiyer/z_en_weiyer.c @@ -1,6 +1,6 @@ #include "z_en_weiyer.h" -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x00000005 void EnWeiyer_Init(EnWeiyer* this, GlobalContext* globalCtx); @@ -9,8 +9,7 @@ void EnWeiyer_Update(EnWeiyer* this, GlobalContext* globalCtx); void EnWeiyer_Draw(EnWeiyer* this, GlobalContext* globalCtx); /* -const ActorInit En_Weiyer_InitVars = -{ +const ActorInit En_Weiyer_InitVars = { ACTOR_EN_WEIYER, ACTORTYPE_ENEMY, ROOM, diff --git a/src/overlays/actors/ovl_En_Weiyer/z_en_weiyer.h b/src/overlays/actors/ovl_En_Weiyer/z_en_weiyer.h index d0286b66b7..384d37a4df 100644 --- a/src/overlays/actors/ovl_En_Weiyer/z_en_weiyer.h +++ b/src/overlays/actors/ovl_En_Weiyer/z_en_weiyer.h @@ -4,8 +4,7 @@ #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ Actor actor; /* 0x014C */ char unk_14C[0x184]; } EnWeiyer; // size = 0x02D0 diff --git a/src/overlays/actors/ovl_En_Wf/z_en_wf.c b/src/overlays/actors/ovl_En_Wf/z_en_wf.c index a4ab4557ab..6bbd5ed315 100644 --- a/src/overlays/actors/ovl_En_Wf/z_en_wf.c +++ b/src/overlays/actors/ovl_En_Wf/z_en_wf.c @@ -1,6 +1,6 @@ #include "z_en_wf.h" -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x00000015 void EnWf_Init(EnWf* this, GlobalContext* globalCtx); @@ -9,8 +9,7 @@ void EnWf_Update(EnWf* this, GlobalContext* globalCtx); void EnWf_Draw(EnWf* this, GlobalContext* globalCtx); /* -const ActorInit En_Wf_InitVars = -{ +const ActorInit En_Wf_InitVars = { ACTOR_EN_WF, ACTORTYPE_ENEMY, ROOM, diff --git a/src/overlays/actors/ovl_En_Wf/z_en_wf.h b/src/overlays/actors/ovl_En_Wf/z_en_wf.h index ef1a8bcfed..9d71bbe8ef 100644 --- a/src/overlays/actors/ovl_En_Wf/z_en_wf.h +++ b/src/overlays/actors/ovl_En_Wf/z_en_wf.h @@ -4,8 +4,7 @@ #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ Actor actor; /* 0x014C */ char unk_14C[0x390]; } EnWf; // size = 0x04DC diff --git a/src/overlays/actors/ovl_En_Wonder_Item/z_en_wonder_item.c b/src/overlays/actors/ovl_En_Wonder_Item/z_en_wonder_item.c index 45a8b18a1b..e8383a72ea 100644 --- a/src/overlays/actors/ovl_En_Wonder_Item/z_en_wonder_item.c +++ b/src/overlays/actors/ovl_En_Wonder_Item/z_en_wonder_item.c @@ -1,6 +1,6 @@ #include "z_en_wonder_item.h" -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x00000000 void EnWonderItem_Init(EnWonderItem* this, GlobalContext* globalCtx); @@ -8,8 +8,7 @@ void EnWonderItem_Destroy(EnWonderItem* this, GlobalContext* globalCtx); void EnWonderItem_Update(EnWonderItem* this, GlobalContext* globalCtx); /* -const ActorInit En_Wonder_Item_InitVars = -{ +const ActorInit En_Wonder_Item_InitVars = { ACTOR_EN_WONDER_ITEM, ACTORTYPE_PROP, ROOM, @@ -43,4 +42,3 @@ const ActorInit En_Wonder_Item_InitVars = #pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Wonder_Item/func_80B38B78.s") #pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Wonder_Item/EnWonderItem_Update.s") - diff --git a/src/overlays/actors/ovl_En_Wonder_Item/z_en_wonder_item.h b/src/overlays/actors/ovl_En_Wonder_Item/z_en_wonder_item.h index ba600c6028..d858c5f3c6 100644 --- a/src/overlays/actors/ovl_En_Wonder_Item/z_en_wonder_item.h +++ b/src/overlays/actors/ovl_En_Wonder_Item/z_en_wonder_item.h @@ -4,8 +4,7 @@ #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ Actor actor; /* 0x014C */ char unk_14C[0x84]; } EnWonderItem; // size = 0x01D0 diff --git a/src/overlays/actors/ovl_En_Wonder_Talk/z_en_wonder_talk.c b/src/overlays/actors/ovl_En_Wonder_Talk/z_en_wonder_talk.c index b87c21866f..8d353b14f0 100644 --- a/src/overlays/actors/ovl_En_Wonder_Talk/z_en_wonder_talk.c +++ b/src/overlays/actors/ovl_En_Wonder_Talk/z_en_wonder_talk.c @@ -1,6 +1,6 @@ #include "z_en_wonder_talk.h" -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x08000009 void EnWonderTalk_Init(EnWonderTalk* this, GlobalContext* globalCtx); @@ -8,8 +8,7 @@ void EnWonderTalk_Destroy(EnWonderTalk* this, GlobalContext* globalCtx); void EnWonderTalk_Update(EnWonderTalk* this, GlobalContext* globalCtx); /* -const ActorInit En_Wonder_Talk_InitVars = -{ +const ActorInit En_Wonder_Talk_InitVars = { ACTOR_EN_WONDER_TALK, ACTORTYPE_PROP, ROOM, diff --git a/src/overlays/actors/ovl_En_Wonder_Talk/z_en_wonder_talk.h b/src/overlays/actors/ovl_En_Wonder_Talk/z_en_wonder_talk.h index ca519abd1b..0febeaaab7 100644 --- a/src/overlays/actors/ovl_En_Wonder_Talk/z_en_wonder_talk.h +++ b/src/overlays/actors/ovl_En_Wonder_Talk/z_en_wonder_talk.h @@ -4,8 +4,7 @@ #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ Actor actor; /* 0x014C */ char unk_14C[0x1C]; } EnWonderTalk; // size = 0x0168 diff --git a/src/overlays/actors/ovl_En_Wonder_Talk2/z_en_wonder_talk2.c b/src/overlays/actors/ovl_En_Wonder_Talk2/z_en_wonder_talk2.c index 17ce0a5b4c..ebcb7b6625 100644 --- a/src/overlays/actors/ovl_En_Wonder_Talk2/z_en_wonder_talk2.c +++ b/src/overlays/actors/ovl_En_Wonder_Talk2/z_en_wonder_talk2.c @@ -1,6 +1,6 @@ #include "z_en_wonder_talk2.h" -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x08000009 void EnWonderTalk2_Init(EnWonderTalk2* this, GlobalContext* globalCtx); @@ -8,8 +8,7 @@ void EnWonderTalk2_Destroy(EnWonderTalk2* this, GlobalContext* globalCtx); void EnWonderTalk2_Update(EnWonderTalk2* this, GlobalContext* globalCtx); /* -const ActorInit En_Wonder_Talk2_InitVars = -{ +const ActorInit En_Wonder_Talk2_InitVars = { ACTOR_EN_WONDER_TALK2, ACTORTYPE_ITEMACTION, ROOM, diff --git a/src/overlays/actors/ovl_En_Wonder_Talk2/z_en_wonder_talk2.h b/src/overlays/actors/ovl_En_Wonder_Talk2/z_en_wonder_talk2.h index d9756df6fe..fe59248a76 100644 --- a/src/overlays/actors/ovl_En_Wonder_Talk2/z_en_wonder_talk2.h +++ b/src/overlays/actors/ovl_En_Wonder_Talk2/z_en_wonder_talk2.h @@ -4,8 +4,7 @@ #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ Actor actor; /* 0x014C */ char unk_14C[0x24]; } EnWonderTalk2; // size = 0x0170 diff --git a/src/overlays/actors/ovl_En_Wood02/z_en_wood02.c b/src/overlays/actors/ovl_En_Wood02/z_en_wood02.c index 9a28576839..802c153f1d 100644 --- a/src/overlays/actors/ovl_En_Wood02/z_en_wood02.c +++ b/src/overlays/actors/ovl_En_Wood02/z_en_wood02.c @@ -1,6 +1,6 @@ #include "z_en_wood02.h" -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x00000000 void EnWood02_Init(EnWood02* this, GlobalContext* globalCtx); @@ -9,8 +9,7 @@ void EnWood02_Update(EnWood02* this, GlobalContext* globalCtx); void EnWood02_Draw(EnWood02* this, GlobalContext* globalCtx); /* -const ActorInit En_Wood02_InitVars = -{ +const ActorInit En_Wood02_InitVars = { ACTOR_EN_WOOD02, ACTORTYPE_PROP, ROOM, @@ -34,4 +33,3 @@ const ActorInit En_Wood02_InitVars = #pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Wood02/EnWood02_Update.s") #pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Wood02/EnWood02_Draw.s") - diff --git a/src/overlays/actors/ovl_En_Wood02/z_en_wood02.h b/src/overlays/actors/ovl_En_Wood02/z_en_wood02.h index 785dd78d03..1ddd777bff 100644 --- a/src/overlays/actors/ovl_En_Wood02/z_en_wood02.h +++ b/src/overlays/actors/ovl_En_Wood02/z_en_wood02.h @@ -4,8 +4,7 @@ #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ Actor actor; /* 0x014C */ char unk_14C[0x58]; } EnWood02; // size = 0x01A4 diff --git a/src/overlays/actors/ovl_En_Xc/z_en_xc.c b/src/overlays/actors/ovl_En_Xc/z_en_xc.c index 8740418da2..2692a409d2 100644 --- a/src/overlays/actors/ovl_En_Xc/z_en_xc.c +++ b/src/overlays/actors/ovl_En_Xc/z_en_xc.c @@ -1,6 +1,6 @@ #include "z_en_xc.h" -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x00000010 void EnXc_Init(EnXc* this, GlobalContext* globalCtx); @@ -9,8 +9,7 @@ void EnXc_Update(EnXc* this, GlobalContext* globalCtx); void EnXc_Draw(EnXc* this, GlobalContext* globalCtx); /* -const ActorInit En_Xc_InitVars = -{ +const ActorInit En_Xc_InitVars = { ACTOR_EN_XC, ACTORTYPE_NPC, ROOM, @@ -498,4 +497,3 @@ const ActorInit En_Xc_InitVars = #pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Xc/func_80B41BA4.s") #pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Xc/EnXc_Draw.s") - diff --git a/src/overlays/actors/ovl_En_Xc/z_en_xc.h b/src/overlays/actors/ovl_En_Xc/z_en_xc.h index 813fa65d0f..9a3039119a 100644 --- a/src/overlays/actors/ovl_En_Xc/z_en_xc.h +++ b/src/overlays/actors/ovl_En_Xc/z_en_xc.h @@ -4,8 +4,7 @@ #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ Actor actor; /* 0x014C */ char unk_14C[0x1F0]; } EnXc; // size = 0x033C diff --git a/src/overlays/actors/ovl_En_Yabusame_Mark/z_en_yabusame_mark.c b/src/overlays/actors/ovl_En_Yabusame_Mark/z_en_yabusame_mark.c index ce68e7f1ce..f053a21c29 100644 --- a/src/overlays/actors/ovl_En_Yabusame_Mark/z_en_yabusame_mark.c +++ b/src/overlays/actors/ovl_En_Yabusame_Mark/z_en_yabusame_mark.c @@ -1,6 +1,6 @@ #include "z_en_yabusame_mark.h" -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x00000000 void EnYabusameMark_Init(EnYabusameMark* this, GlobalContext* globalCtx); @@ -8,8 +8,7 @@ void EnYabusameMark_Destroy(EnYabusameMark* this, GlobalContext* globalCtx); void EnYabusameMark_Update(EnYabusameMark* this, GlobalContext* globalCtx); /* -const ActorInit En_Yabusame_Mark_InitVars = -{ +const ActorInit En_Yabusame_Mark_InitVars = { ACTOR_EN_YABUSAME_MARK, ACTORTYPE_PROP, ROOM, diff --git a/src/overlays/actors/ovl_En_Yabusame_Mark/z_en_yabusame_mark.h b/src/overlays/actors/ovl_En_Yabusame_Mark/z_en_yabusame_mark.h index 547e7ec0eb..b53b9e6e7d 100644 --- a/src/overlays/actors/ovl_En_Yabusame_Mark/z_en_yabusame_mark.h +++ b/src/overlays/actors/ovl_En_Yabusame_Mark/z_en_yabusame_mark.h @@ -4,8 +4,7 @@ #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ Actor actor; /* 0x014C */ char unk_14C[0xC4]; } EnYabusameMark; // size = 0x0210 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 769ff86d84..693d1801c2 100644 --- a/src/overlays/actors/ovl_En_Yukabyun/z_en_yukabyun.c +++ b/src/overlays/actors/ovl_En_Yukabyun/z_en_yukabyun.c @@ -1,6 +1,6 @@ #include "z_en_yukabyun.h" -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x00000010 void EnYukabyun_Init(EnYukabyun* this, GlobalContext* globalCtx); @@ -9,8 +9,7 @@ void EnYukabyun_Update(EnYukabyun* this, GlobalContext* globalCtx); void EnYukabyun_Draw(EnYukabyun* this, GlobalContext* globalCtx); /* -const ActorInit En_Yukabyun_InitVars = -{ +const ActorInit En_Yukabyun_InitVars = { ACTOR_EN_YUKABYUN, ACTORTYPE_ENEMY, ROOM, diff --git a/src/overlays/actors/ovl_En_Yukabyun/z_en_yukabyun.h b/src/overlays/actors/ovl_En_Yukabyun/z_en_yukabyun.h index 596e159eaa..19aab38e09 100644 --- a/src/overlays/actors/ovl_En_Yukabyun/z_en_yukabyun.h +++ b/src/overlays/actors/ovl_En_Yukabyun/z_en_yukabyun.h @@ -4,8 +4,7 @@ #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ Actor actor; /* 0x014C */ char unk_14C[0x54]; } EnYukabyun; // size = 0x01A0 diff --git a/src/overlays/actors/ovl_En_Zf/z_en_zf.c b/src/overlays/actors/ovl_En_Zf/z_en_zf.c index d3523a4535..6b5c2a6459 100644 --- a/src/overlays/actors/ovl_En_Zf/z_en_zf.c +++ b/src/overlays/actors/ovl_En_Zf/z_en_zf.c @@ -1,6 +1,6 @@ #include "z_en_zf.h" -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x00000015 void EnZf_Init(EnZf* this, GlobalContext* globalCtx); @@ -9,8 +9,7 @@ void EnZf_Update(EnZf* this, GlobalContext* globalCtx); void EnZf_Draw(EnZf* this, GlobalContext* globalCtx); /* -const ActorInit En_Zf_InitVars = -{ +const ActorInit En_Zf_InitVars = { ACTOR_EN_ZF, ACTORTYPE_ENEMY, ROOM, @@ -134,4 +133,3 @@ const ActorInit En_Zf_InitVars = #pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B49C2C.s") #pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Zf/func_80B49E4C.s") - diff --git a/src/overlays/actors/ovl_En_Zf/z_en_zf.h b/src/overlays/actors/ovl_En_Zf/z_en_zf.h index 077309579b..1ca95b82a6 100644 --- a/src/overlays/actors/ovl_En_Zf/z_en_zf.h +++ b/src/overlays/actors/ovl_En_Zf/z_en_zf.h @@ -4,8 +4,7 @@ #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ Actor actor; /* 0x014C */ char unk_14C[0x41C]; } EnZf; // size = 0x0568 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 628cb6b10c..2cc382efb1 100644 --- a/src/overlays/actors/ovl_En_Zl1/z_en_zl1.c +++ b/src/overlays/actors/ovl_En_Zl1/z_en_zl1.c @@ -1,6 +1,6 @@ #include "z_en_zl1.h" -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x00000019 void EnZl1_Init(EnZl1* this, GlobalContext* globalCtx); @@ -9,8 +9,7 @@ void EnZl1_Update(EnZl1* this, GlobalContext* globalCtx); void EnZl1_Draw(EnZl1* this, GlobalContext* globalCtx); /* -const ActorInit En_Zl1_InitVars = -{ +const ActorInit En_Zl1_InitVars = { ACTOR_EN_ZL1, ACTORTYPE_NPC, ROOM, diff --git a/src/overlays/actors/ovl_En_Zl1/z_en_zl1.h b/src/overlays/actors/ovl_En_Zl1/z_en_zl1.h index 7ac10d9deb..cd1c981099 100644 --- a/src/overlays/actors/ovl_En_Zl1/z_en_zl1.h +++ b/src/overlays/actors/ovl_En_Zl1/z_en_zl1.h @@ -4,8 +4,7 @@ #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ Actor actor; /* 0x014C */ char unk_14C[0xC0]; } EnZl1; // size = 0x020C 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 9379f2c188..eb67587b49 100644 --- a/src/overlays/actors/ovl_En_Zl2/z_en_zl2.c +++ b/src/overlays/actors/ovl_En_Zl2/z_en_zl2.c @@ -1,6 +1,6 @@ #include "z_en_zl2.h" -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x00000010 void EnZl2_Init(EnZl2* this, GlobalContext* globalCtx); @@ -9,8 +9,7 @@ void EnZl2_Update(EnZl2* this, GlobalContext* globalCtx); void EnZl2_Draw(EnZl2* this, GlobalContext* globalCtx); /* -const ActorInit En_Zl2_InitVars = -{ +const ActorInit En_Zl2_InitVars = { ACTOR_EN_ZL2, ACTORTYPE_NPC, ROOM, diff --git a/src/overlays/actors/ovl_En_Zl2/z_en_zl2.h b/src/overlays/actors/ovl_En_Zl2/z_en_zl2.h index 092d1d2a3f..bc51e995b4 100644 --- a/src/overlays/actors/ovl_En_Zl2/z_en_zl2.h +++ b/src/overlays/actors/ovl_En_Zl2/z_en_zl2.h @@ -4,8 +4,7 @@ #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ Actor actor; /* 0x014C */ char unk_14C[0x134]; } EnZl2; // size = 0x0280 diff --git a/src/overlays/actors/ovl_En_Zl3/z_en_zl3.c b/src/overlays/actors/ovl_En_Zl3/z_en_zl3.c index 1544c010ed..8bc7fd6fff 100644 --- a/src/overlays/actors/ovl_En_Zl3/z_en_zl3.c +++ b/src/overlays/actors/ovl_En_Zl3/z_en_zl3.c @@ -1,6 +1,6 @@ #include "z_en_zl3.h" -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x00000010 void EnZl3_Init(EnZl3* this, GlobalContext* globalCtx); @@ -9,8 +9,7 @@ void EnZl3_Update(EnZl3* this, GlobalContext* globalCtx); void EnZl3_Draw(EnZl3* this, GlobalContext* globalCtx); /* -const ActorInit En_Zl3_InitVars = -{ +const ActorInit En_Zl3_InitVars = { ACTOR_EN_ZL3, ACTORTYPE_NPC, ROOM, diff --git a/src/overlays/actors/ovl_En_Zl3/z_en_zl3.h b/src/overlays/actors/ovl_En_Zl3/z_en_zl3.h index 2d79f615cf..6ddea4df83 100644 --- a/src/overlays/actors/ovl_En_Zl3/z_en_zl3.h +++ b/src/overlays/actors/ovl_En_Zl3/z_en_zl3.h @@ -4,8 +4,7 @@ #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ Actor actor; /* 0x014C */ char unk_14C[0x2D4]; } EnZl3; // size = 0x0420 diff --git a/src/overlays/actors/ovl_En_Zl4/z_en_zl4.c b/src/overlays/actors/ovl_En_Zl4/z_en_zl4.c index dac255337d..38a9bef697 100644 --- a/src/overlays/actors/ovl_En_Zl4/z_en_zl4.c +++ b/src/overlays/actors/ovl_En_Zl4/z_en_zl4.c @@ -1,6 +1,6 @@ #include "z_en_zl4.h" -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x00000019 void EnZl4_Init(EnZl4* this, GlobalContext* globalCtx); @@ -9,8 +9,7 @@ void EnZl4_Update(EnZl4* this, GlobalContext* globalCtx); void EnZl4_Draw(EnZl4* this, GlobalContext* globalCtx); /* -const ActorInit En_Zl4_InitVars = -{ +const ActorInit En_Zl4_InitVars = { ACTOR_EN_ZL4, ACTORTYPE_NPC, ROOM, diff --git a/src/overlays/actors/ovl_En_Zl4/z_en_zl4.h b/src/overlays/actors/ovl_En_Zl4/z_en_zl4.h index 59aacef8fb..64766821ce 100644 --- a/src/overlays/actors/ovl_En_Zl4/z_en_zl4.h +++ b/src/overlays/actors/ovl_En_Zl4/z_en_zl4.h @@ -4,8 +4,7 @@ #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ Actor actor; /* 0x014C */ char unk_14C[0x1A4]; } EnZl4; // size = 0x02F0 diff --git a/src/overlays/actors/ovl_En_Zo/z_en_zo.c b/src/overlays/actors/ovl_En_Zo/z_en_zo.c index 3dba87d598..4c806476e0 100644 --- a/src/overlays/actors/ovl_En_Zo/z_en_zo.c +++ b/src/overlays/actors/ovl_En_Zo/z_en_zo.c @@ -1,6 +1,6 @@ #include "z_en_zo.h" -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x00000009 void EnZo_Init(EnZo* this, GlobalContext* globalCtx); @@ -9,8 +9,7 @@ void EnZo_Update(EnZo* this, GlobalContext* globalCtx); void EnZo_Draw(EnZo* this, GlobalContext* globalCtx); /* -const ActorInit En_Zo_InitVars = -{ +const ActorInit En_Zo_InitVars = { ACTOR_EN_ZO, ACTORTYPE_NPC, ROOM, diff --git a/src/overlays/actors/ovl_En_Zo/z_en_zo.h b/src/overlays/actors/ovl_En_Zo/z_en_zo.h index 86fe3db233..cc751d35b6 100644 --- a/src/overlays/actors/ovl_En_Zo/z_en_zo.h +++ b/src/overlays/actors/ovl_En_Zo/z_en_zo.h @@ -4,8 +4,7 @@ #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ Actor actor; /* 0x014C */ char unk_14C[0x55C]; } EnZo; // size = 0x06A8 diff --git a/src/overlays/actors/ovl_En_fHG/z_en_fhg.c b/src/overlays/actors/ovl_En_fHG/z_en_fhg.c index 14b5cf5b7d..1f6fbfbbe1 100644 --- a/src/overlays/actors/ovl_En_fHG/z_en_fhg.c +++ b/src/overlays/actors/ovl_En_fHG/z_en_fhg.c @@ -1,6 +1,6 @@ #include "z_en_fhg.h" -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x00000010 void EnfHG_Init(EnfHG* this, GlobalContext* globalCtx); @@ -9,8 +9,7 @@ void EnfHG_Update(EnfHG* this, GlobalContext* globalCtx); void EnfHG_Draw(EnfHG* this, GlobalContext* globalCtx); /* -const ActorInit En_fHG_InitVars = -{ +const ActorInit En_fHG_InitVars = { ACTOR_EN_FHG, ACTORTYPE_BG, ROOM, diff --git a/src/overlays/actors/ovl_En_fHG/z_en_fhg.h b/src/overlays/actors/ovl_En_fHG/z_en_fhg.h index 7051e5c3ee..6aef028f7d 100644 --- a/src/overlays/actors/ovl_En_fHG/z_en_fhg.h +++ b/src/overlays/actors/ovl_En_fHG/z_en_fhg.h @@ -4,8 +4,7 @@ #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ Actor actor; /* 0x014C */ char unk_14C[0x148]; } EnfHG; // size = 0x0294 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 0a60b82461..8a605455aa 100644 --- a/src/overlays/actors/ovl_End_Title/z_end_title.c +++ b/src/overlays/actors/ovl_End_Title/z_end_title.c @@ -1,6 +1,6 @@ #include "z_end_title.h" -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x00000030 void EndTitle_Init(EndTitle* this, GlobalContext* globalCtx); @@ -9,8 +9,7 @@ void EndTitle_Update(EndTitle* this, GlobalContext* globalCtx); void EndTitle_Draw(EndTitle* this, GlobalContext* globalCtx); /* -const ActorInit End_Title_InitVars = -{ +const ActorInit End_Title_InitVars = { ACTOR_END_TITLE, ACTORTYPE_ITEMACTION, ROOM, diff --git a/src/overlays/actors/ovl_End_Title/z_end_title.h b/src/overlays/actors/ovl_End_Title/z_end_title.h index 6a7a2b260d..60448c1153 100644 --- a/src/overlays/actors/ovl_End_Title/z_end_title.h +++ b/src/overlays/actors/ovl_End_Title/z_end_title.h @@ -4,8 +4,7 @@ #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ Actor actor; /* 0x014C */ char unk_14C[0x4]; } EndTitle; // size = 0x0150 diff --git a/src/overlays/actors/ovl_Fishing/z_fishing.c b/src/overlays/actors/ovl_Fishing/z_fishing.c index 226fee15be..baa2d30933 100644 --- a/src/overlays/actors/ovl_Fishing/z_fishing.c +++ b/src/overlays/actors/ovl_Fishing/z_fishing.c @@ -1,6 +1,6 @@ #include "z_fishing.h" -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x00000010 void Fishing_Init(Fishing* this, GlobalContext* globalCtx); @@ -9,8 +9,7 @@ void Fishing_Update(Fishing* this, GlobalContext* globalCtx); void Fishing_Draw(Fishing* this, GlobalContext* globalCtx); /* -const ActorInit Fishing_InitVars = -{ +const ActorInit Fishing_InitVars = { ACTOR_FISHING, ACTORTYPE_NPC, ROOM, @@ -114,4 +113,3 @@ const ActorInit Fishing_InitVars = #pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Fishing/func_80B7A140.s") #pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Fishing/func_80B7A278.s") - diff --git a/src/overlays/actors/ovl_Fishing/z_fishing.h b/src/overlays/actors/ovl_Fishing/z_fishing.h index c59d17494b..7fcc3229c8 100644 --- a/src/overlays/actors/ovl_Fishing/z_fishing.h +++ b/src/overlays/actors/ovl_Fishing/z_fishing.h @@ -4,8 +4,7 @@ #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ Actor actor; /* 0x014C */ char unk_14C[0x404]; } Fishing; // size = 0x0550 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 4056aa2db0..d1e9fed3ca 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 @@ -1,6 +1,6 @@ #include "z_item_b_heart.h" -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x00000000 void ItemBHeart_Init(ItemBHeart* this, GlobalContext* globalCtx); @@ -9,8 +9,7 @@ void ItemBHeart_Update(ItemBHeart* this, GlobalContext* globalCtx); void ItemBHeart_Draw(ItemBHeart* this, GlobalContext* globalCtx); /* -const ActorInit Item_B_Heart_InitVars = -{ +const ActorInit Item_B_Heart_InitVars = { ACTOR_ITEM_B_HEART, ACTORTYPE_MISC, ROOM, diff --git a/src/overlays/actors/ovl_Item_B_Heart/z_item_b_heart.h b/src/overlays/actors/ovl_Item_B_Heart/z_item_b_heart.h index 452507e66e..b21f4e36d1 100644 --- a/src/overlays/actors/ovl_Item_B_Heart/z_item_b_heart.h +++ b/src/overlays/actors/ovl_Item_B_Heart/z_item_b_heart.h @@ -4,8 +4,7 @@ #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ Actor actor; /* 0x014C */ char unk_14C[0x20]; } ItemBHeart; // size = 0x016C diff --git a/src/overlays/actors/ovl_Item_Etcetera/z_item_etcetera.c b/src/overlays/actors/ovl_Item_Etcetera/z_item_etcetera.c index ca79c029ba..ee8297b042 100644 --- a/src/overlays/actors/ovl_Item_Etcetera/z_item_etcetera.c +++ b/src/overlays/actors/ovl_Item_Etcetera/z_item_etcetera.c @@ -1,6 +1,6 @@ #include "z_item_etcetera.h" -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x00000010 void ItemEtcetera_Init(ItemEtcetera* this, GlobalContext* globalCtx); @@ -8,8 +8,7 @@ void ItemEtcetera_Destroy(ItemEtcetera* this, GlobalContext* globalCtx); void ItemEtcetera_Update(ItemEtcetera* this, GlobalContext* globalCtx); /* -const ActorInit Item_Etcetera_InitVars = -{ +const ActorInit Item_Etcetera_InitVars = { ACTOR_ITEM_ETCETERA, ACTORTYPE_PROP, ROOM, diff --git a/src/overlays/actors/ovl_Item_Etcetera/z_item_etcetera.h b/src/overlays/actors/ovl_Item_Etcetera/z_item_etcetera.h index e349929750..f2968c1061 100644 --- a/src/overlays/actors/ovl_Item_Etcetera/z_item_etcetera.h +++ b/src/overlays/actors/ovl_Item_Etcetera/z_item_etcetera.h @@ -4,8 +4,7 @@ #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ Actor actor; /* 0x014C */ char unk_14C[0x14]; } ItemEtcetera; // size = 0x0160 diff --git a/src/overlays/actors/ovl_Item_Inbox/z_item_inbox.c b/src/overlays/actors/ovl_Item_Inbox/z_item_inbox.c index 402a0164a3..e84c5c390e 100644 --- a/src/overlays/actors/ovl_Item_Inbox/z_item_inbox.c +++ b/src/overlays/actors/ovl_Item_Inbox/z_item_inbox.c @@ -2,15 +2,14 @@ * File: z_item_inbox.c * Overlay: ovl_Item_Inbox * Description: Zelda's magic to open gates. -*/ + */ #include #include #include -typedef struct -{ - /* 0x0000 */ Actor actor; +typedef struct { + /* 0x0000 */ Actor actor; /* 0x014C */ ActorFunc updateFunc; } ActorItemInbox; // size = 0x0154 @@ -23,8 +22,7 @@ static void func_80B86020(ActorItemInbox* this, GlobalContext* globalCtx); static void Update(ActorItemInbox* this, GlobalContext* globalCtx); static void Draw(ActorItemInbox* this, GlobalContext* globalCtx); -const ActorInit Item_Inbox_InitVars = -{ +const ActorInit Item_Inbox_InitVars = { ACTOR_ITEM_INBOX, ACTORTYPE_NPC, ROOM, @@ -37,29 +35,25 @@ const ActorInit Item_Inbox_InitVars = (ActorFunc)Draw, }; -static void Init(ActorItemInbox* this, GlobalContext* globalCtx) -{ +static void Init(ActorItemInbox* this, GlobalContext* globalCtx) { this->updateFunc = (ActorFunc)func_80B86020; Actor_SetScale(&this->actor, 0.2); } -static void Destroy(ActorItemInbox* this, GlobalContext* globalCtx) -{ +static void Destroy(ActorItemInbox* this, GlobalContext* globalCtx) { } -static void func_80B86020(ActorItemInbox* this, GlobalContext* globalCtx) -{ - if (Flags_GetTreasure(globalCtx, (this->actor.params >> 8) & 0x1F)) +static void func_80B86020(ActorItemInbox* this, GlobalContext* globalCtx) { + if (Flags_GetTreasure(globalCtx, (this->actor.params >> 8) & 0x1F)) { Actor_Kill(&this->actor); + } } -static void Update(ActorItemInbox* this, GlobalContext* globalCtx) -{ +static void Update(ActorItemInbox* this, GlobalContext* globalCtx) { this->updateFunc(this, globalCtx); } -static void Draw(ActorItemInbox* this, GlobalContext* globalCtx) -{ +static void Draw(ActorItemInbox* this, GlobalContext* globalCtx) { func_8002EBCC(&this->actor, globalCtx, 0); func_8002ED80(&this->actor, globalCtx, 0); func_800694A0(globalCtx, this->actor.params & 0xFF); diff --git a/src/overlays/actors/ovl_Item_Ocarina/z_item_ocarina.c b/src/overlays/actors/ovl_Item_Ocarina/z_item_ocarina.c index 2830c7a36b..4c62ecb28e 100644 --- a/src/overlays/actors/ovl_Item_Ocarina/z_item_ocarina.c +++ b/src/overlays/actors/ovl_Item_Ocarina/z_item_ocarina.c @@ -1,6 +1,6 @@ #include "z_item_ocarina.h" -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x00000010 void ItemOcarina_Init(ItemOcarina* this, GlobalContext* globalCtx); @@ -9,8 +9,7 @@ void ItemOcarina_Update(ItemOcarina* this, GlobalContext* globalCtx); void ItemOcarina_Draw(ItemOcarina* this, GlobalContext* globalCtx); /* -const ActorInit Item_Ocarina_InitVars = -{ +const ActorInit Item_Ocarina_InitVars = { ACTOR_ITEM_OCARINA, ACTORTYPE_ITEMACTION, ROOM, diff --git a/src/overlays/actors/ovl_Item_Ocarina/z_item_ocarina.h b/src/overlays/actors/ovl_Item_Ocarina/z_item_ocarina.h index c4485290a1..ecfd75e9e9 100644 --- a/src/overlays/actors/ovl_Item_Ocarina/z_item_ocarina.h +++ b/src/overlays/actors/ovl_Item_Ocarina/z_item_ocarina.h @@ -4,8 +4,7 @@ #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ Actor actor; /* 0x014C */ char unk_14C[0x8]; } ItemOcarina; // size = 0x0154 diff --git a/src/overlays/actors/ovl_Item_Shield/z_item_shield.c b/src/overlays/actors/ovl_Item_Shield/z_item_shield.c index 74bfbe8116..f4936f70fe 100644 --- a/src/overlays/actors/ovl_Item_Shield/z_item_shield.c +++ b/src/overlays/actors/ovl_Item_Shield/z_item_shield.c @@ -1,6 +1,6 @@ #include "z_item_shield.h" -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x00000010 void ItemShield_Init(ItemShield* this, GlobalContext* globalCtx); @@ -9,8 +9,7 @@ void ItemShield_Update(ItemShield* this, GlobalContext* globalCtx); void ItemShield_Draw(ItemShield* this, GlobalContext* globalCtx); /* -const ActorInit Item_Shield_InitVars = -{ +const ActorInit Item_Shield_InitVars = { ACTOR_ITEM_SHIELD, ACTORTYPE_ITEMACTION, ROOM, diff --git a/src/overlays/actors/ovl_Item_Shield/z_item_shield.h b/src/overlays/actors/ovl_Item_Shield/z_item_shield.h index 3dec65ab15..ea09856ba6 100644 --- a/src/overlays/actors/ovl_Item_Shield/z_item_shield.h +++ b/src/overlays/actors/ovl_Item_Shield/z_item_shield.h @@ -4,8 +4,7 @@ #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ Actor actor; /* 0x014C */ char unk_14C[0xC0]; } ItemShield; // size = 0x020C diff --git a/src/overlays/actors/ovl_Magic_Dark/z_magic_dark.c b/src/overlays/actors/ovl_Magic_Dark/z_magic_dark.c index 84b049b0c8..1f57a7bbda 100644 --- a/src/overlays/actors/ovl_Magic_Dark/z_magic_dark.c +++ b/src/overlays/actors/ovl_Magic_Dark/z_magic_dark.c @@ -1,6 +1,6 @@ #include "z_magic_dark.h" -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x02000010 void MagicDark_Init(MagicDark* this, GlobalContext* globalCtx); @@ -9,8 +9,7 @@ void MagicDark_Update(MagicDark* this, GlobalContext* globalCtx); void MagicDark_Draw(MagicDark* this, GlobalContext* globalCtx); /* -const ActorInit Magic_Dark_InitVars = -{ +const ActorInit Magic_Dark_InitVars = { ACTOR_MAGIC_DARK, ACTORTYPE_ITEMACTION, ROOM, diff --git a/src/overlays/actors/ovl_Magic_Dark/z_magic_dark.h b/src/overlays/actors/ovl_Magic_Dark/z_magic_dark.h index c76cc54ad2..737fb79d0b 100644 --- a/src/overlays/actors/ovl_Magic_Dark/z_magic_dark.h +++ b/src/overlays/actors/ovl_Magic_Dark/z_magic_dark.h @@ -4,8 +4,7 @@ #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ Actor actor; /* 0x014C */ char unk_14C[0x18]; } MagicDark; // size = 0x0164 diff --git a/src/overlays/actors/ovl_Magic_Fire/z_magic_fire.c b/src/overlays/actors/ovl_Magic_Fire/z_magic_fire.c index 782956beb3..0f0ad4ea4b 100644 --- a/src/overlays/actors/ovl_Magic_Fire/z_magic_fire.c +++ b/src/overlays/actors/ovl_Magic_Fire/z_magic_fire.c @@ -1,6 +1,6 @@ #include "z_magic_fire.h" -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x02000010 void MagicFire_Init(MagicFire* this, GlobalContext* globalCtx); @@ -9,8 +9,7 @@ void MagicFire_Update(MagicFire* this, GlobalContext* globalCtx); void MagicFire_Draw(MagicFire* this, GlobalContext* globalCtx); /* -const ActorInit Magic_Fire_InitVars = -{ +const ActorInit Magic_Fire_InitVars = { ACTOR_MAGIC_FIRE, ACTORTYPE_ITEMACTION, ROOM, diff --git a/src/overlays/actors/ovl_Magic_Fire/z_magic_fire.h b/src/overlays/actors/ovl_Magic_Fire/z_magic_fire.h index c72dd6b0b4..581b609571 100644 --- a/src/overlays/actors/ovl_Magic_Fire/z_magic_fire.h +++ b/src/overlays/actors/ovl_Magic_Fire/z_magic_fire.h @@ -4,8 +4,7 @@ #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ Actor actor; /* 0x014C */ char unk_14C[0x60]; } MagicFire; // size = 0x01AC 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 4ae4f7984e..34b89509db 100644 --- a/src/overlays/actors/ovl_Magic_Wind/z_magic_wind.c +++ b/src/overlays/actors/ovl_Magic_Wind/z_magic_wind.c @@ -1,6 +1,6 @@ #include "z_magic_wind.h" -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x02000010 void MagicWind_Init(MagicWind* this, GlobalContext* globalCtx); @@ -9,8 +9,7 @@ void MagicWind_Update(MagicWind* this, GlobalContext* globalCtx); void MagicWind_Draw(MagicWind* this, GlobalContext* globalCtx); /* -const ActorInit Magic_Wind_InitVars = -{ +const ActorInit Magic_Wind_InitVars = { ACTOR_MAGIC_WIND, ACTORTYPE_ITEMACTION, ROOM, diff --git a/src/overlays/actors/ovl_Magic_Wind/z_magic_wind.h b/src/overlays/actors/ovl_Magic_Wind/z_magic_wind.h index e95d5c29aa..7544a85cd6 100644 --- a/src/overlays/actors/ovl_Magic_Wind/z_magic_wind.h +++ b/src/overlays/actors/ovl_Magic_Wind/z_magic_wind.h @@ -4,8 +4,7 @@ #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ Actor actor; /* 0x014C */ char unk_14C[0x28]; } MagicWind; // size = 0x0174 diff --git a/src/overlays/actors/ovl_Mir_Ray/z_mir_ray.c b/src/overlays/actors/ovl_Mir_Ray/z_mir_ray.c index 9d12a43bd5..4a5c247c5b 100644 --- a/src/overlays/actors/ovl_Mir_Ray/z_mir_ray.c +++ b/src/overlays/actors/ovl_Mir_Ray/z_mir_ray.c @@ -1,6 +1,6 @@ #include "z_mir_ray.h" -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x00000030 void MirRay_Init(MirRay* this, GlobalContext* globalCtx); @@ -9,8 +9,7 @@ void MirRay_Update(MirRay* this, GlobalContext* globalCtx); void MirRay_Draw(MirRay* this, GlobalContext* globalCtx); /* -const ActorInit Mir_Ray_InitVars = -{ +const ActorInit Mir_Ray_InitVars = { ACTOR_MIR_RAY, ACTORTYPE_ITEMACTION, ROOM, diff --git a/src/overlays/actors/ovl_Mir_Ray/z_mir_ray.h b/src/overlays/actors/ovl_Mir_Ray/z_mir_ray.h index d27c6a2fb2..cd3d6bbd98 100644 --- a/src/overlays/actors/ovl_Mir_Ray/z_mir_ray.h +++ b/src/overlays/actors/ovl_Mir_Ray/z_mir_ray.h @@ -4,8 +4,7 @@ #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ Actor actor; /* 0x014C */ char unk_14C[0x164]; } MirRay; // size = 0x02B0 diff --git a/src/overlays/actors/ovl_Obj_Bean/z_obj_bean.c b/src/overlays/actors/ovl_Obj_Bean/z_obj_bean.c index 76688efa1c..ae03298aad 100644 --- a/src/overlays/actors/ovl_Obj_Bean/z_obj_bean.c +++ b/src/overlays/actors/ovl_Obj_Bean/z_obj_bean.c @@ -1,6 +1,6 @@ #include "z_obj_bean.h" -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x00400000 void ObjBean_Init(ObjBean* this, GlobalContext* globalCtx); @@ -9,8 +9,7 @@ void ObjBean_Update(ObjBean* this, GlobalContext* globalCtx); void ObjBean_Draw(ObjBean* this, GlobalContext* globalCtx); /* -const ActorInit Obj_Bean_InitVars = -{ +const ActorInit Obj_Bean_InitVars = { ACTOR_OBJ_BEAN, ACTORTYPE_BG, ROOM, diff --git a/src/overlays/actors/ovl_Obj_Bean/z_obj_bean.h b/src/overlays/actors/ovl_Obj_Bean/z_obj_bean.h index c6de07526f..dcfbf9787c 100644 --- a/src/overlays/actors/ovl_Obj_Bean/z_obj_bean.h +++ b/src/overlays/actors/ovl_Obj_Bean/z_obj_bean.h @@ -4,8 +4,7 @@ #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ Actor actor; /* 0x014C */ char unk_14C[0xAC]; } ObjBean; // size = 0x01F8 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 078def3e56..06596da0f6 100644 --- a/src/overlays/actors/ovl_Obj_Blockstop/z_obj_blockstop.c +++ b/src/overlays/actors/ovl_Obj_Blockstop/z_obj_blockstop.c @@ -2,26 +2,24 @@ * File: z_obj_blockstop.c * Overlay: ovl_Obj_Blockstop * Description: Stops blocks and sets relevant flags when the block is in position. -*/ + */ #include #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ Actor actor; } ActorObjBlockstop; // size = 0x014C -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x00000000 static void Init(ActorObjBlockstop* this, GlobalContext* globalCtx); static void Destroy(ActorObjBlockstop* this, GlobalContext* globalCtx); static void Update(ActorObjBlockstop* this, GlobalContext* globalCtx); -const ActorInit Obj_Blockstop_InitVars = -{ +const ActorInit Obj_Blockstop_InitVars = { ACTOR_OBJ_BLOCKSTOP, ACTORTYPE_PROP, ROOM, @@ -31,40 +29,37 @@ const ActorInit Obj_Blockstop_InitVars = (ActorFunc)Init, (ActorFunc)Destroy, (ActorFunc)Update, - NULL + NULL, }; -static void Init(ActorObjBlockstop* this, GlobalContext* globalCtx) -{ - if (Flags_GetSwitch(globalCtx, this->actor.params)) +static void Init(ActorObjBlockstop* this, GlobalContext* globalCtx) { + if (Flags_GetSwitch(globalCtx, this->actor.params)) { Actor_Kill(&this->actor); - else + } else { this->actor.posRot.pos.y += 1; + } } -static void Destroy(ActorObjBlockstop* this, GlobalContext* globalCtx) -{ +static void Destroy(ActorObjBlockstop* this, GlobalContext* globalCtx) { } -static void Update(ActorObjBlockstop* this, GlobalContext* globalCtx) -{ +static void Update(ActorObjBlockstop* this, GlobalContext* globalCtx) { DynaPolyActor* dynaActor; s32 pad; Vec3f sp4C; u32 sp48; s32 pad2; - if (func_8003DF10(&globalCtx->colCtx, &this->actor.initPosRot.pos, &this->actor.posRot.pos, - &sp4C, &this->actor.floorPoly, 0, 0, 1, 1, &sp48, &this->actor)) - { + if (func_8003DF10(&globalCtx->colCtx, &this->actor.initPosRot.pos, &this->actor.posRot.pos, &sp4C, + &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 == 0xFF)) { + if (((dynaActor->actor.params & 0x000F) == 3) || ((dynaActor->actor.params & 0x000F) == 7)) { func_80078884(NA_SE_SY_CORRECT_CHIME); - else + } else { func_80078884(NA_SE_SY_TRE_BOX_APPEAR); + } Flags_SetSwitch(globalCtx, this->actor.params); Actor_Kill(&this->actor); diff --git a/src/overlays/actors/ovl_Obj_Bombiwa/z_obj_bombiwa.c b/src/overlays/actors/ovl_Obj_Bombiwa/z_obj_bombiwa.c index 00b720f420..b333a5bfa3 100644 --- a/src/overlays/actors/ovl_Obj_Bombiwa/z_obj_bombiwa.c +++ b/src/overlays/actors/ovl_Obj_Bombiwa/z_obj_bombiwa.c @@ -1,16 +1,23 @@ +/* + * File: z_obj_bombiwa.c + * Overlay: ovl_Obj_Bombiwa + * Description: Round, brown, breakable boulder + */ + #include "z_obj_bombiwa.h" -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x00000000 -void ObjBombiwa_Init(ObjBombiwa* this, GlobalContext* globalCtx); -void ObjBombiwa_Destroy(ObjBombiwa* this, GlobalContext* globalCtx); -void ObjBombiwa_Update(ObjBombiwa* this, GlobalContext* globalCtx); -void ObjBombiwa_Draw(ObjBombiwa* this, GlobalContext* globalCtx); +static void ObjBombiwa_Init(ObjBombiwa* this, GlobalContext* globalCtx); +static void ObjBombiwa_Destroy(ObjBombiwa* this, GlobalContext* globalCtx); +static void ObjBombiwa_Update(ObjBombiwa* this, GlobalContext* globalCtx); +static void ObjBombiwa_Draw(ObjBombiwa* this, GlobalContext* globalCtx); -/* -const ActorInit Obj_Bombiwa_InitVars = -{ +static void ObjBombiwa_InitCollision(ObjBombiwa* this, GlobalContext* globalCtx); +static void ObjBombiwa_Break(ObjBombiwa* this, GlobalContext* globalCtx); + +const ActorInit Obj_Bombiwa_InitVars = { ACTOR_OBJ_BOMBIWA, ACTORTYPE_PROP, ROOM, @@ -22,18 +29,108 @@ const ActorInit Obj_Bombiwa_InitVars = (ActorFunc)ObjBombiwa_Update, (ActorFunc)ObjBombiwa_Draw, }; -*/ -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Obj_Bombiwa/func_80B915F0.s") -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Obj_Bombiwa/ObjBombiwa_Init.s") +static ColliderCylinderInit colliderInit = { + 0x0C, 0x00, 0x0D, 0x39, 0x20, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00000000, 0x00, 0x00, 0x00, 0x00, 0x4FC1FFFE, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x01, 0x01, 0x00, 0x0037, 0x0046, 0x0000, 0x0000, 0x0000, 0x0000, +}; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Obj_Bombiwa/ObjBombiwa_Destroy.s") +static u32 damageChart[] = { + 0x0000000C, + 0x003CFF00, +}; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Obj_Bombiwa/func_80B91738.s") +static InitChainEntry initChain[] = { + ICHAIN_VEC3F_DIV1000(scale, 0x64, ICHAIN_CONTINUE), + ICHAIN_F32(unk_F4, 0x7D0, ICHAIN_CONTINUE), + ICHAIN_F32(unk_F8, 0x15E, ICHAIN_CONTINUE), + ICHAIN_F32(unk_FC, 0x3E8, ICHAIN_STOP), +}; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Obj_Bombiwa/ObjBombiwa_Update.s") +static s16 effectScales[] = { + 17, 14, 10, 8, 7, 5, 3, 2, +}; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Obj_Bombiwa/ObjBombiwa_Draw.s") +extern Gfx* D_060009E0; // dlist +static void ObjBombiwa_InitCollision(ObjBombiwa* this, GlobalContext* globalCtx) { + ObjBombiwa* thisLocal = this; + ActorCollider_AllocCylinder(globalCtx, &thisLocal->collider); + ActorCollider_InitCylinder(globalCtx, &thisLocal->collider, &thisLocal->actor, &colliderInit); + ActorCollider_Cylinder_Update(&thisLocal->actor, &thisLocal->collider); +} +static void ObjBombiwa_Init(ObjBombiwa* this, GlobalContext* globalCtx) { + Actor_ProcessInitChain(&this->actor, initChain); + ObjBombiwa_InitCollision(this, globalCtx); + if ((Flags_GetSwitch(globalCtx, this->actor.params & 0x3F) != 0)) { + Actor_Kill(&this->actor); + } else { + func_80061ED4(&this->actor.sub_98.damageChart, NULL, damageChart); + if (this->actor.shape.rot.y == 0) { + s16 rand = (s16)Math_Rand_ZeroFloat(65536.0f); + this->actor.posRot.rot.y = rand; + this->actor.shape.rot.y = rand; + } + this->actor.shape.unk_08 = -200.0f; + this->actor.posRot.pos.y = this->actor.initPosRot.pos.y + 20.0f; + } +} +static void ObjBombiwa_Destroy(ObjBombiwa* this, GlobalContext* globalCtx) { + ActorCollider_FreeCylinder(globalCtx, &this->collider); +} + +static void ObjBombiwa_Break(ObjBombiwa* this, GlobalContext* globalCtx) { + Vec3f temp_s2; + Vec3f temp_s3; + Gfx** dlist; + s16 u0; + s16 scale; + s32 i; + + dlist = &D_060009E0; + for (i = 0; i < ARRAY_COUNT(effectScales); i++) { + temp_s2.x = ((Math_Rand_ZeroOne() - 0.5f) * 10.0f) + this->actor.initPosRot.pos.x; + temp_s2.y = ((Math_Rand_ZeroOne() * 5.0f) + this->actor.initPosRot.pos.y) + 8.0f; + temp_s2.z = ((Math_Rand_ZeroOne() - 0.5f) * 10.0f) + this->actor.initPosRot.pos.z; + temp_s3.x = (Math_Rand_ZeroOne() - 0.5f) * 15.0f; + temp_s3.y = (Math_Rand_ZeroOne() * 16.0f) + 5.0f; + temp_s3.z = (Math_Rand_ZeroOne() - 0.5f) * 15.0f; + scale = effectScales[i]; + u0 = (scale >= 11) ? 37 : 33; + Effect_SpawnFragment(globalCtx, &temp_s2, &temp_s3, &temp_s2, -400, u0, 10, 2, 0, scale, 1, 0, 80, -1, + OBJECT_BOMBIWA, dlist); + } + func_80033480(globalCtx, &this->actor.posRot.pos, 60.0f, 8, 100, 160, 1); +} + +static void ObjBombiwa_Update(ObjBombiwa* this, GlobalContext* globalCtx) { + SubGlobalContext11E60* sub_11E60; + ColliderCylinderMain* collider; + + if (func_80033684(globalCtx, &this->actor) != NULL || + ((this->collider.base.collideFlags & 2) != 0 && + (this->collider.body.colliding->toucher.flags & 0x40000040) != 0)) { + ObjBombiwa_Break(this, globalCtx); + Flags_SetSwitch(globalCtx, this->actor.params & 0x3F); + Audio_PlaySoundAtPosition(globalCtx, &this->actor.posRot.pos, 80, NA_SE_EV_WALL_BROKEN); + if (((this->actor.params >> 0xF) & 1) != 0) { + func_80078884(NA_SE_SY_CORRECT_CHIME); + } + Actor_Kill(&this->actor); + } else { + this->collider.base.collideFlags &= ~0x2; + if (this->actor.xzDistanceFromLink < 800.0f) { + sub_11E60 = &globalCtx->sub_11E60; + collider = &this->collider; + Actor_CollisionCheck_SetAC(globalCtx, sub_11E60, collider); + Actor_CollisionCheck_SetOT(globalCtx, sub_11E60, collider); + } + } +} + +static void ObjBombiwa_Draw(ObjBombiwa* this, GlobalContext* globalCtx) { + Gfx_DrawDListOpa(globalCtx, &D_060009E0); +} diff --git a/src/overlays/actors/ovl_Obj_Bombiwa/z_obj_bombiwa.h b/src/overlays/actors/ovl_Obj_Bombiwa/z_obj_bombiwa.h index ccffafb599..9f1c2797b8 100644 --- a/src/overlays/actors/ovl_Obj_Bombiwa/z_obj_bombiwa.h +++ b/src/overlays/actors/ovl_Obj_Bombiwa/z_obj_bombiwa.h @@ -4,10 +4,9 @@ #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ Actor actor; - /* 0x014C */ char unk_14C[0x4C]; + /* 0x014C */ ColliderCylinderMain collider; } ObjBombiwa; // size = 0x0198 extern const ActorInit Obj_Bombiwa_InitVars; 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 24d4a38145..1811ad2d6e 100644 --- a/src/overlays/actors/ovl_Obj_Comb/z_obj_comb.c +++ b/src/overlays/actors/ovl_Obj_Comb/z_obj_comb.c @@ -1,6 +1,12 @@ +/* + * File: z_obj_comb.c + * Overlay: ovl_Obj_Comb + * Description: Beehive + */ + #include "z_obj_comb.h" -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x00000000 void ObjComb_Init(ObjComb* this, GlobalContext* globalCtx); @@ -8,9 +14,12 @@ void ObjComb_Destroy(ObjComb* this, GlobalContext* globalCtx); void ObjComb_Update(ObjComb* this, GlobalContext* globalCtx); void ObjComb_Draw(ObjComb* this, GlobalContext* globalCtx); -/* -const ActorInit Obj_Comb_InitVars = -{ +void ObjComb_Break(ObjComb* this, GlobalContext* globalCtx); +void ObjComb_ChooseItemDrop(ObjComb* this, GlobalContext* globalCtx); +void ObjComb_SetWait(ObjComb* this); +void ObjComb_Wait(ObjComb* this, GlobalContext* globalCtx); + +const ActorInit Obj_Comb_InitVars = { ACTOR_OBJ_COMB, ACTORTYPE_PROP, ROOM, @@ -22,19 +31,178 @@ const ActorInit Obj_Comb_InitVars = (ActorFunc)ObjComb_Update, (ActorFunc)ObjComb_Draw, }; -*/ -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Obj_Comb/func_80B91B60.s") -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Obj_Comb/func_80B91E4C.s") +UNK_TYPE D_80B922E0[] = { + 0x00000000, 0x00000000, 0x00000000, 0x4001FFFE, 0x00000000, 0x00010100, 0x00000000, 0x00000000, 0x000F0064, +}; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Obj_Comb/ObjComb_Init.s") +UNK_TYPE D_80B92304[] = { + 0x0A000909, + 0x20000000, + 0x00000001, + &D_80B922E0, +}; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Obj_Comb/ObjComb_Destroy.s") +static InitChainEntry initChain[] = { + ICHAIN_VEC3F_DIV1000(scale, 100, ICHAIN_CONTINUE), + ICHAIN_F32(unk_F4, 1100, ICHAIN_CONTINUE), + ICHAIN_F32(unk_F8, 100, ICHAIN_CONTINUE), + ICHAIN_F32(unk_FC, 900, ICHAIN_STOP), +}; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Obj_Comb/func_80B91FB0.s") +extern UNK_TYPE D_050095B0; +extern UNK_TYPE D_05009940; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Obj_Comb/func_80B91FC0.s") +void ObjComb_Break(ObjComb* this, GlobalContext* globalCtx) { + Vec3f pos1; + Vec3f posSum; + Vec3f pos2; + Gfx** dlist = &D_05009940; + s16 scale; + s16 angle = 0; + s16 gravityInfluence; + u8 u0; + u8 rotSpeed; + f32 rand1; + f32 rand2; + s32 i; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Obj_Comb/ObjComb_Update.s") + for (i = 0; i < 31; i++) { + angle += 20000; + rand1 = Math_Rand_ZeroOne() * 10.0f; -#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Obj_Comb/ObjComb_Draw.s") + pos1.x = Math_Sins(angle) * rand1; + pos1.y = (i - 15) * 0.7f; + pos1.z = Math_Coss(angle) * rand1; + + Math_Vec3f_Sum(&pos1, &this->actor.posRot.pos, &posSum); + + pos2.x = (Math_Rand_ZeroOne() - 0.5f) + pos1.x * 0.5f; + pos2.y = (Math_Rand_ZeroOne() - 0.5f) + pos1.y * 0.6f; + pos2.z = (Math_Rand_ZeroOne() - 0.5f) + pos1.z * 0.5f; + + scale = Math_Rand_ZeroOne() * 72.0f + 25.0f; + if (scale < 40) { + gravityInfluence = -200; + rotSpeed = 40; + } else if (scale < 70) { + gravityInfluence = -280; + rotSpeed = 30; + } else { + gravityInfluence = -340; + rotSpeed = 20; + } + + rand2 = Math_Rand_ZeroOne(); + if (rand2 < 0.1f) { + u0 = 96; + } else if (rand2 < 0.8f) { + u0 = 64; + } else { + u0 = 32; + } + Effect_SpawnFragment(globalCtx, &posSum, &pos2, &posSum, gravityInfluence, u0, rotSpeed, 4, 0, scale, 0, 0, 80, + -1, 2, dlist); + } + + posSum.x = this->actor.posRot.pos.x; + posSum.y = this->actor.posRot.pos.y - 10.0f; + posSum.z = this->actor.posRot.pos.z; + func_80033480(globalCtx, &posSum, 40.0f, 6, 70, 60, 1); +} + +void ObjComb_ChooseItemDrop(ObjComb* this, GlobalContext* globalCtx) { + s16 params = this->actor.params & 0x1F; + + if ((params > 0) || (params < 0x1A)) { + if (params == 6) { + if (Flags_GetCollectible(globalCtx, (this->actor.params >> 8) & 0x3F)) { + params = -1; + } else { + params = (params | (((this->actor.params >> 8) & 0x3F) << 8)); + } + } else if (Math_Rand_ZeroOne() < 0.5f) { + params = -1; + } + if (params >= 0) { + Item_DropCollectible(globalCtx, &this->actor.posRot, params); + } + } +} + +void ObjComb_Init(ObjComb* this, GlobalContext* globalCtx) { + s32 pad; + + Actor_ProcessInitChain(&this->actor, &initChain); + func_8005BBF8(globalCtx, &this->collider); + func_8005C050(globalCtx, &this->collider, this, &D_80B92304, &this->colliderBody); + ObjComb_SetWait(this); +} + +void ObjComb_Destroy(ObjComb* this, GlobalContext* globalCtx) { + func_8005BCC8(globalCtx, &this->collider); +} + +void ObjComb_SetWait(ObjComb* this) { + this->actionFunc = ObjComb_Wait; +} + +void ObjComb_Wait(ObjComb* this, GlobalContext* globalCtx) { + s32 toucherFlags; + + this->unk_1B0 -= 50; + if (this->unk_1B0 < 0) { + this->unk_1B0 = 0; + } + + if ((this->collider.collideFlags & 0x2) != 0) { + this->collider.collideFlags &= ~0x2; + toucherFlags = this->colliderBodyPtr->colliding->toucher.flags; + if (toucherFlags & 0x4001F866) { + this->unk_1B0 = 1500; + } else { + ObjComb_Break(this, globalCtx); + ObjComb_ChooseItemDrop(this, globalCtx); + Actor_Kill(this); + } + } else { + Actor_CollisionCheck_SetAC(globalCtx, &globalCtx->sub_11E60, &this->collider); + } + + if (this->actor.update != NULL) { + Actor_CollisionCheck_SetOT(globalCtx, &globalCtx->sub_11E60, &this->collider); + } +} + +void ObjComb_Update(ObjComb* this, GlobalContext* globalCtx) { + this->unk_1B2 += 12000; + this->actionFunc(&this->actor, globalCtx); + this->actor.shape.rot.x = Math_Sins(this->unk_1B2) * this->unk_1B0 + this->actor.initPosRot.rot.x; +} + +void ObjComb_Draw(ObjComb* this, GlobalContext* globalCtx) { + s32 pad; + GraphicsContext* gfxCtx; + Gfx* dispRefs[4]; + + gfxCtx = globalCtx->state.gfxCtx; + + Graph_OpenDisps(dispRefs, globalCtx->state.gfxCtx, "../z_obj_comb.c", 369); + func_80093D18(globalCtx->state.gfxCtx); + + Matrix_Translate(this->actor.posRot.pos.x, this->actor.posRot.pos.y + (118.0f * this->actor.scale.y), + this->actor.posRot.pos.z, 0); + Matrix_RotateY(this->actor.shape.rot.y * 0.0000958738f, 1); + Matrix_RotateX(this->actor.shape.rot.x * 0.0000958738f, 1); + Matrix_RotateZ(this->actor.shape.rot.z * 0.0000958738f, 1); + 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(gfxCtx->polyOpa.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_obj_comb.c", 394), + G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); + + gSPDisplayList(gfxCtx->polyOpa.p++, &D_050095B0); + + func_800628A4(0, &this->collider); + Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_obj_comb.c", 402); +} diff --git a/src/overlays/actors/ovl_Obj_Comb/z_obj_comb.h b/src/overlays/actors/ovl_Obj_Comb/z_obj_comb.h index 03947d8dd7..fcd17464c8 100644 --- a/src/overlays/actors/ovl_Obj_Comb/z_obj_comb.h +++ b/src/overlays/actors/ovl_Obj_Comb/z_obj_comb.h @@ -4,10 +4,16 @@ #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ Actor actor; - /* 0x014C */ char unk_14C[0x68]; + /* 0x014C */ ActorFunc actionFunc; + /* 0x0150 */ Collider collider; + /* 0x0168 */ char unk_168[0x4]; + /* 0x016C */ ColliderBody* colliderBodyPtr; + /* 0x0170 */ ColliderBody colliderBody; + /* 0x0198 */ char unk_198[0x18]; + /* 0x01B0 */ s16 unk_1B0; + /* 0x01B2 */ s16 unk_1B2; } ObjComb; // size = 0x01B4 extern const ActorInit Obj_Comb_InitVars; 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 fc9d1f60bf..0369f30f70 100644 --- a/src/overlays/actors/ovl_Obj_Dekujr/z_obj_dekujr.c +++ b/src/overlays/actors/ovl_Obj_Dekujr/z_obj_dekujr.c @@ -1,6 +1,6 @@ #include "z_obj_dekujr.h" -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x00000009 void ObjDekujr_Init(ObjDekujr* this, GlobalContext* globalCtx); @@ -9,8 +9,7 @@ void ObjDekujr_Update(ObjDekujr* this, GlobalContext* globalCtx); void ObjDekujr_Draw(ObjDekujr* this, GlobalContext* globalCtx); /* -const ActorInit Obj_Dekujr_InitVars = -{ +const ActorInit Obj_Dekujr_InitVars = { ACTOR_OBJ_DEKUJR, ACTORTYPE_NPC, ROOM, diff --git a/src/overlays/actors/ovl_Obj_Dekujr/z_obj_dekujr.h b/src/overlays/actors/ovl_Obj_Dekujr/z_obj_dekujr.h index 87548b8fc0..06c79f327a 100644 --- a/src/overlays/actors/ovl_Obj_Dekujr/z_obj_dekujr.h +++ b/src/overlays/actors/ovl_Obj_Dekujr/z_obj_dekujr.h @@ -4,8 +4,7 @@ #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ Actor actor; /* 0x014C */ char unk_14C[0x58]; } ObjDekujr; // size = 0x01A4 diff --git a/src/overlays/actors/ovl_Obj_Elevator/z_obj_elevator.c b/src/overlays/actors/ovl_Obj_Elevator/z_obj_elevator.c index cbd00953b5..da113c4e32 100644 --- a/src/overlays/actors/ovl_Obj_Elevator/z_obj_elevator.c +++ b/src/overlays/actors/ovl_Obj_Elevator/z_obj_elevator.c @@ -2,11 +2,11 @@ * File: z_obj_elevator.c * Overlay: Obj_Elevator * Description: Stone Dungeon Elevator -*/ + */ #include "z_obj_elevator.h" -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x00000000 #define SIZE_PARAM 1 @@ -21,8 +21,7 @@ static void func_80B92C80(ObjElevator* this, GlobalContext* globalCtx); static void func_80B92D20(ObjElevator* this); static void func_80B92D44(ObjElevator* this, GlobalContext* globalCtx); -const ActorInit Obj_Elevator_InitVars = -{ +const ActorInit Obj_Elevator_InitVars = { ACTOR_OBJ_ELEVATOR, ACTORTYPE_BG, ROOM, @@ -35,25 +34,22 @@ const ActorInit Obj_Elevator_InitVars = (ActorFunc)ObjElevator_Draw, }; -static InitChainEntry initChain[] = -{ +static InitChainEntry initChain[] = { ICHAIN_F32(unk_F4, 2000, ICHAIN_CONTINUE), ICHAIN_F32(unk_F8, 600, ICHAIN_CONTINUE), - ICHAIN_F32(unk_FC, 2000, ICHAIN_STOP) + ICHAIN_F32(unk_FC, 2000, ICHAIN_STOP), }; -static f32 sizes[] = {0.1f, 0.05f}; +static f32 sizes[] = { 0.1f, 0.05f }; extern u32 D_06000180; extern u32 D_06000360; -static void ObjElevator_SetupAction(ObjElevator* this, ActorFunc actionFunc) -{ +static void ObjElevator_SetupAction(ObjElevator* this, ActorFunc actionFunc) { this->actionFunc = actionFunc; } -static void func_80B92B08(ObjElevator* this, GlobalContext* globalCtx, u32 collision, DynaPolyMoveFlag flag) -{ +static void func_80B92B08(ObjElevator* this, GlobalContext* globalCtx, u32 collision, DynaPolyMoveFlag flag) { s16 pad1; u32 local_c = 0; s16 pad2; @@ -62,14 +58,13 @@ static void func_80B92B08(ObjElevator* this, GlobalContext* globalCtx, u32 colli DynaPolyInfo_SetActorMove(thisx, flag); DynaPolyInfo_Alloc(collision, &local_c); this->dyna.dynaPolyId = DynaPolyInfo_RegisterActor(globalCtx, &globalCtx->colCtx.dyna, thisx, local_c); - if (this->dyna.dynaPolyId == 0x32) - { - osSyncPrintf("Warning : move BG 登録失敗(%s %d)(name %d)(arg_data 0x%04x)\n", "../z_obj_elevator.c", 136, thisx->id, thisx->params); + if (this->dyna.dynaPolyId == 0x32) { + osSyncPrintf("Warning : move BG 登録失敗(%s %d)(name %d)(arg_data 0x%04x)\n", "../z_obj_elevator.c", 136, + thisx->id, thisx->params); } } -static void ObjElevator_Init(ObjElevator* this, GlobalContext* globalCtx) -{ +static void ObjElevator_Init(ObjElevator* this, GlobalContext* globalCtx) { f32 temp_f0; Actor* thisx = &this->dyna.actor; @@ -82,64 +77,49 @@ static void ObjElevator_Init(ObjElevator* this, GlobalContext* globalCtx) osSyncPrintf("(Dungeon Elevator)(arg_data 0x%04x)\n", thisx->params); } -static void ObjElevator_Destroy(ObjElevator* this, GlobalContext* globalCtx) -{ +static void ObjElevator_Destroy(ObjElevator* this, GlobalContext* globalCtx) { DynaPolyInfo_Free(globalCtx, &globalCtx->colCtx.dyna, this->dyna.dynaPolyId); } -static void func_80B92C5C(ObjElevator* this) -{ +static void func_80B92C5C(ObjElevator* this) { ObjElevator_SetupAction(this, func_80B92C80); } -static void func_80B92C80(ObjElevator* this, GlobalContext* globalCtx) -{ +static void func_80B92C80(ObjElevator* this, GlobalContext* globalCtx) { f32 sub; Actor* thisx = &this->dyna.actor; - if ((this->dyna.unk_160 & 2) && !(this->unk_170 & 2)) - { + if ((this->dyna.unk_160 & 2) && !(this->unk_170 & 2)) { sub = thisx->posRot.pos.y - thisx->initPosRot.pos.y; - if (fabsf(sub) < 0.1f) - { + if (fabsf(sub) < 0.1f) { this->unk_168 = thisx->initPosRot.pos.y + ((thisx->params >> 0xC) & 0xF) * 80.0f; - } - else - { + } else { this->unk_168 = thisx->initPosRot.pos.y; } func_80B92D20(this); } } -static void func_80B92D20(ObjElevator* this) -{ +static void func_80B92D20(ObjElevator* this) { ObjElevator_SetupAction(this, func_80B92D44); } -static void func_80B92D44(ObjElevator* this, GlobalContext* globalCtx) -{ +static void func_80B92D44(ObjElevator* this, GlobalContext* globalCtx) { Actor* thisx = &this->dyna.actor; - if (fabsf(Math_SmoothScaleMaxMinF(&thisx->posRot.pos.y, this->unk_168, 1.0f, this->unk_16C, 0.0f)) < 0.001f) - { + if (fabsf(Math_SmoothScaleMaxMinF(&thisx->posRot.pos.y, this->unk_168, 1.0f, this->unk_16C, 0.0f)) < 0.001f) { Audio_PlayActorSound2(thisx, NA_SE_EV_FOOT_SWITCH); func_80B92C5C(this); - } - else - { + } else { Audio_PlayActorSound2(thisx, 0x201E); } } -static void ObjElevator_Update(ObjElevator* this, GlobalContext* globalCtx) -{ - if (this->actionFunc) - { +static void ObjElevator_Update(ObjElevator* this, GlobalContext* globalCtx) { + if (this->actionFunc) { this->actionFunc(this, globalCtx); } this->unk_170 = this->dyna.unk_160; } -static void ObjElevator_Draw(ObjElevator* this, GlobalContext* globalCtx) -{ - Draw_DListOpa(globalCtx, &D_06000180); +static void ObjElevator_Draw(ObjElevator* this, GlobalContext* globalCtx) { + Gfx_DrawDListOpa(globalCtx, &D_06000180); } diff --git a/src/overlays/actors/ovl_Obj_Elevator/z_obj_elevator.h b/src/overlays/actors/ovl_Obj_Elevator/z_obj_elevator.h index 5f93abe84e..0d7e05bf3c 100644 --- a/src/overlays/actors/ovl_Obj_Elevator/z_obj_elevator.h +++ b/src/overlays/actors/ovl_Obj_Elevator/z_obj_elevator.h @@ -4,8 +4,7 @@ #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ DynaPolyActor dyna; /* 0x0164 */ ActorFunc actionFunc; /* 0x0168 */ f32 unk_168; diff --git a/src/overlays/actors/ovl_Obj_Hamishi/z_obj_hamishi.c b/src/overlays/actors/ovl_Obj_Hamishi/z_obj_hamishi.c index bcdffe4790..2b89979907 100644 --- a/src/overlays/actors/ovl_Obj_Hamishi/z_obj_hamishi.c +++ b/src/overlays/actors/ovl_Obj_Hamishi/z_obj_hamishi.c @@ -1,6 +1,6 @@ #include "z_obj_hamishi.h" -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x00000000 void ObjHamishi_Init(ObjHamishi* this, GlobalContext* globalCtx); @@ -9,8 +9,7 @@ void ObjHamishi_Update(ObjHamishi* this, GlobalContext* globalCtx); void ObjHamishi_Draw(ObjHamishi* this, GlobalContext* globalCtx); /* -const ActorInit Obj_Hamishi_InitVars = -{ +const ActorInit Obj_Hamishi_InitVars = { ACTOR_OBJ_HAMISHI, ACTORTYPE_PROP, ROOM, diff --git a/src/overlays/actors/ovl_Obj_Hamishi/z_obj_hamishi.h b/src/overlays/actors/ovl_Obj_Hamishi/z_obj_hamishi.h index e00e4fe815..d411caf3a0 100644 --- a/src/overlays/actors/ovl_Obj_Hamishi/z_obj_hamishi.h +++ b/src/overlays/actors/ovl_Obj_Hamishi/z_obj_hamishi.h @@ -4,8 +4,7 @@ #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ Actor actor; /* 0x014C */ char unk_14C[0x5C]; } ObjHamishi; // size = 0x01A8 diff --git a/src/overlays/actors/ovl_Obj_Hana/z_obj_hana.c b/src/overlays/actors/ovl_Obj_Hana/z_obj_hana.c index 6196c47f06..dd397901dc 100644 --- a/src/overlays/actors/ovl_Obj_Hana/z_obj_hana.c +++ b/src/overlays/actors/ovl_Obj_Hana/z_obj_hana.c @@ -1,6 +1,6 @@ #include "z_obj_hana.h" -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x00000000 void ObjHana_Init(ObjHana* this, GlobalContext* globalCtx); @@ -9,8 +9,7 @@ void ObjHana_Update(ObjHana* this, GlobalContext* globalCtx); void ObjHana_Draw(ObjHana* this, GlobalContext* globalCtx); /* -const ActorInit Obj_Hana_InitVars = -{ +const ActorInit Obj_Hana_InitVars = { ACTOR_OBJ_HANA, ACTORTYPE_PROP, ROOM, @@ -30,6 +29,3 @@ const ActorInit Obj_Hana_InitVars = #pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Obj_Hana/ObjHana_Update.s") #pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Obj_Hana/ObjHana_Draw.s") - - - diff --git a/src/overlays/actors/ovl_Obj_Hana/z_obj_hana.h b/src/overlays/actors/ovl_Obj_Hana/z_obj_hana.h index 5c4749a02d..0feb73700b 100644 --- a/src/overlays/actors/ovl_Obj_Hana/z_obj_hana.h +++ b/src/overlays/actors/ovl_Obj_Hana/z_obj_hana.h @@ -4,8 +4,7 @@ #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ Actor actor; /* 0x014C */ char unk_14C[0x4C]; } ObjHana; // size = 0x0198 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 027f1d04a9..75422d0b73 100644 --- a/src/overlays/actors/ovl_Obj_Hsblock/z_obj_hsblock.c +++ b/src/overlays/actors/ovl_Obj_Hsblock/z_obj_hsblock.c @@ -1,6 +1,6 @@ #include "z_obj_hsblock.h" -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x00000000 void ObjHsblock_Init(ObjHsblock* this, GlobalContext* globalCtx); @@ -9,8 +9,7 @@ void ObjHsblock_Update(ObjHsblock* this, GlobalContext* globalCtx); void ObjHsblock_Draw(ObjHsblock* this, GlobalContext* globalCtx); /* -const ActorInit Obj_Hsblock_InitVars = -{ +const ActorInit Obj_Hsblock_InitVars = { ACTOR_OBJ_HSBLOCK, ACTORTYPE_BG, ROOM, diff --git a/src/overlays/actors/ovl_Obj_Hsblock/z_obj_hsblock.h b/src/overlays/actors/ovl_Obj_Hsblock/z_obj_hsblock.h index b004f2d8e2..2311f5d8bc 100644 --- a/src/overlays/actors/ovl_Obj_Hsblock/z_obj_hsblock.h +++ b/src/overlays/actors/ovl_Obj_Hsblock/z_obj_hsblock.h @@ -4,8 +4,7 @@ #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ Actor actor; /* 0x014C */ char unk_14C[0x1C]; } ObjHsblock; // size = 0x0168 diff --git a/src/overlays/actors/ovl_Obj_Ice_Poly/z_obj_ice_poly.c b/src/overlays/actors/ovl_Obj_Ice_Poly/z_obj_ice_poly.c index 39a6eb9b74..14cbd08e18 100644 --- a/src/overlays/actors/ovl_Obj_Ice_Poly/z_obj_ice_poly.c +++ b/src/overlays/actors/ovl_Obj_Ice_Poly/z_obj_ice_poly.c @@ -1,6 +1,6 @@ #include "z_obj_ice_poly.h" -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x00000010 void ObjIcePoly_Init(ObjIcePoly* this, GlobalContext* globalCtx); @@ -9,8 +9,7 @@ void ObjIcePoly_Update(ObjIcePoly* this, GlobalContext* globalCtx); void ObjIcePoly_Draw(ObjIcePoly* this, GlobalContext* globalCtx); /* -const ActorInit Obj_Ice_Poly_InitVars = -{ +const ActorInit Obj_Ice_Poly_InitVars = { ACTOR_OBJ_ICE_POLY, ACTORTYPE_PROP, ROOM, diff --git a/src/overlays/actors/ovl_Obj_Ice_Poly/z_obj_ice_poly.h b/src/overlays/actors/ovl_Obj_Ice_Poly/z_obj_ice_poly.h index cc5168fa4e..1a549e6790 100644 --- a/src/overlays/actors/ovl_Obj_Ice_Poly/z_obj_ice_poly.h +++ b/src/overlays/actors/ovl_Obj_Ice_Poly/z_obj_ice_poly.h @@ -4,8 +4,7 @@ #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ Actor actor; /* 0x014C */ char unk_14C[0xA0]; } ObjIcePoly; // size = 0x01EC diff --git a/src/overlays/actors/ovl_Obj_Kibako/z_obj_kibako.c b/src/overlays/actors/ovl_Obj_Kibako/z_obj_kibako.c index 726033ba58..8adc1d88e8 100644 --- a/src/overlays/actors/ovl_Obj_Kibako/z_obj_kibako.c +++ b/src/overlays/actors/ovl_Obj_Kibako/z_obj_kibako.c @@ -1,6 +1,6 @@ #include "z_obj_kibako.h" -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x04000010 void ObjKibako_Init(ObjKibako* this, GlobalContext* globalCtx); @@ -9,8 +9,7 @@ void ObjKibako_Update(ObjKibako* this, GlobalContext* globalCtx); void ObjKibako_Draw(ObjKibako* this, GlobalContext* globalCtx); /* -const ActorInit Obj_Kibako_InitVars = -{ +const ActorInit Obj_Kibako_InitVars = { ACTOR_OBJ_KIBAKO, ACTORTYPE_PROP, ROOM, diff --git a/src/overlays/actors/ovl_Obj_Kibako/z_obj_kibako.h b/src/overlays/actors/ovl_Obj_Kibako/z_obj_kibako.h index cf0c603f16..f6ec5b7681 100644 --- a/src/overlays/actors/ovl_Obj_Kibako/z_obj_kibako.h +++ b/src/overlays/actors/ovl_Obj_Kibako/z_obj_kibako.h @@ -4,8 +4,7 @@ #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ Actor actor; /* 0x014C */ char unk_14C[0x50]; } ObjKibako; // size = 0x019C diff --git a/src/overlays/actors/ovl_Obj_Kibako2/z_obj_kibako2.c b/src/overlays/actors/ovl_Obj_Kibako2/z_obj_kibako2.c index a158b029dd..e9cfeab898 100644 --- a/src/overlays/actors/ovl_Obj_Kibako2/z_obj_kibako2.c +++ b/src/overlays/actors/ovl_Obj_Kibako2/z_obj_kibako2.c @@ -1,6 +1,6 @@ #include "z_obj_kibako2.h" -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x00000000 void ObjKibako2_Init(ObjKibako2* this, GlobalContext* globalCtx); @@ -9,8 +9,7 @@ void ObjKibako2_Update(ObjKibako2* this, GlobalContext* globalCtx); void ObjKibako2_Draw(ObjKibako2* this, GlobalContext* globalCtx); /* -const ActorInit Obj_Kibako2_InitVars = -{ +const ActorInit Obj_Kibako2_InitVars = { ACTOR_OBJ_KIBAKO2, ACTORTYPE_BG, ROOM, diff --git a/src/overlays/actors/ovl_Obj_Kibako2/z_obj_kibako2.h b/src/overlays/actors/ovl_Obj_Kibako2/z_obj_kibako2.h index d49de8784b..31e7ff4a09 100644 --- a/src/overlays/actors/ovl_Obj_Kibako2/z_obj_kibako2.h +++ b/src/overlays/actors/ovl_Obj_Kibako2/z_obj_kibako2.h @@ -4,8 +4,7 @@ #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ Actor actor; /* 0x014C */ char unk_14C[0x6C]; } ObjKibako2; // size = 0x01B8 diff --git a/src/overlays/actors/ovl_Obj_Lift/z_obj_lift.c b/src/overlays/actors/ovl_Obj_Lift/z_obj_lift.c index 22f510dc1e..7880566526 100644 --- a/src/overlays/actors/ovl_Obj_Lift/z_obj_lift.c +++ b/src/overlays/actors/ovl_Obj_Lift/z_obj_lift.c @@ -1,6 +1,6 @@ #include "z_obj_lift.h" -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x00000010 void ObjLift_Init(ObjLift* this, GlobalContext* globalCtx); @@ -9,8 +9,7 @@ void ObjLift_Update(ObjLift* this, GlobalContext* globalCtx); void ObjLift_Draw(ObjLift* this, GlobalContext* globalCtx); /* -const ActorInit Obj_Lift_InitVars = -{ +const ActorInit Obj_Lift_InitVars = { ACTOR_OBJ_LIFT, ACTORTYPE_BG, ROOM, diff --git a/src/overlays/actors/ovl_Obj_Lift/z_obj_lift.h b/src/overlays/actors/ovl_Obj_Lift/z_obj_lift.h index 030ec997e0..d964a978ea 100644 --- a/src/overlays/actors/ovl_Obj_Lift/z_obj_lift.h +++ b/src/overlays/actors/ovl_Obj_Lift/z_obj_lift.h @@ -4,8 +4,7 @@ #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ Actor actor; /* 0x014C */ char unk_14C[0x24]; } ObjLift; // size = 0x0170 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 f4d0e31192..83d2361d49 100644 --- a/src/overlays/actors/ovl_Obj_Lightswitch/z_obj_lightswitch.c +++ b/src/overlays/actors/ovl_Obj_Lightswitch/z_obj_lightswitch.c @@ -1,6 +1,6 @@ #include "z_obj_lightswitch.h" -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x00000010 void ObjLightswitch_Init(ObjLightswitch* this, GlobalContext* globalCtx); @@ -9,8 +9,7 @@ void ObjLightswitch_Update(ObjLightswitch* this, GlobalContext* globalCtx); void ObjLightswitch_Draw(ObjLightswitch* this, GlobalContext* globalCtx); /* -const ActorInit Obj_Lightswitch_InitVars = -{ +const ActorInit Obj_Lightswitch_InitVars = { ACTOR_OBJ_LIGHTSWITCH, ACTORTYPE_SWITCH, ROOM, diff --git a/src/overlays/actors/ovl_Obj_Lightswitch/z_obj_lightswitch.h b/src/overlays/actors/ovl_Obj_Lightswitch/z_obj_lightswitch.h index 42a1d5d744..5c4733fd60 100644 --- a/src/overlays/actors/ovl_Obj_Lightswitch/z_obj_lightswitch.h +++ b/src/overlays/actors/ovl_Obj_Lightswitch/z_obj_lightswitch.h @@ -4,8 +4,7 @@ #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ Actor actor; /* 0x014C */ char unk_14C[0x78]; } ObjLightswitch; // size = 0x01C4 diff --git a/src/overlays/actors/ovl_Obj_Makekinsuta/z_obj_makekinsuta.c b/src/overlays/actors/ovl_Obj_Makekinsuta/z_obj_makekinsuta.c index f43c01bb13..65ff6f8d26 100644 --- a/src/overlays/actors/ovl_Obj_Makekinsuta/z_obj_makekinsuta.c +++ b/src/overlays/actors/ovl_Obj_Makekinsuta/z_obj_makekinsuta.c @@ -2,21 +2,20 @@ * File: z_obj_makekinsuta.c * Overlay: ovl_Obj_Makekinsuta * Description: Skulltula Sprouting from Bean Spot. -*/ + */ #include #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ Actor actor; /* 0x014C */ ActorFunc actionFunc; /* 0x150 */ s16 unk_150; /* 0x152 */ s16 unk_152; } ObjMakekinsuta; // size = 0x0154 -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x00000010 static void ObjMakekinsuta_Init(ObjMakekinsuta* this, GlobalContext* globalCtx); @@ -24,8 +23,7 @@ static void ObjMakekinsuta_Update(ObjMakekinsuta* this, GlobalContext* globalCtx static void func_80B98320(ObjMakekinsuta* this, GlobalContext* globalCtx); static void func_80B983D4(ObjMakekinsuta* this, GlobalContext* globalCtx); -const ActorInit Obj_Makekinsuta_InitVars = -{ +const ActorInit Obj_Makekinsuta_InitVars = { ACTOR_OBJ_MAKEKINSUTA, ACTORTYPE_ITEMACTION, ROOM, @@ -38,49 +36,39 @@ const ActorInit Obj_Makekinsuta_InitVars = NULL, }; -static void ObjMakekinsuta_Init(ObjMakekinsuta* this, GlobalContext* globalCtx) -{ - if ((this->actor.params & 0x6000) == 0x4000) - { +static void ObjMakekinsuta_Init(ObjMakekinsuta* this, GlobalContext* globalCtx) { + if ((this->actor.params & 0x6000) == 0x4000) { osSyncPrintf(VT_FGCOL(BLUE)); - // Translation: Gold Star Enemy(arg_data %x) + // Translation: Gold Star Enemy(arg_data %x) osSyncPrintf("金スタ発生敵(arg_data %x)\n", this->actor.params); osSyncPrintf(VT_RST); - } - else - { + } else { osSyncPrintf(VT_COL(YELLOW, BLACK)); - // Translation: Invalid Argument (arg_data %x)(%s %d) + // Translation: Invalid Argument (arg_data %x)(%s %d) osSyncPrintf("引数不正 (arg_data %x)(%s %d)\n", this->actor.params, "../z_obj_makekinsuta.c", 119); osSyncPrintf(VT_RST); } this->actionFunc = func_80B98320; } -static void func_80B98320(ObjMakekinsuta* this,GlobalContext* globalCtx) -{ - if (this->unk_152 != 0) - { - if (this->unk_150 >= 0x3C && !func_8002DEEC(PLAYER)) - { - Actor_Spawn(&globalCtx->actorCtx, globalCtx, ACTOR_EN_SW, - this->actor.posRot.pos.x, this->actor.posRot.pos.y, this->actor.posRot.pos.z, - 0, this->actor.shape.rot.y, 0, (this->actor.params | 0x8000)); - this->actionFunc = &func_80B983D4; - return; - } +static void func_80B98320(ObjMakekinsuta* this, GlobalContext* globalCtx) { + if (this->unk_152 != 0) { + if (this->unk_150 >= 0x3C && !func_8002DEEC(PLAYER)) { + Actor_Spawn(&globalCtx->actorCtx, globalCtx, ACTOR_EN_SW, this->actor.posRot.pos.x, + this->actor.posRot.pos.y, this->actor.posRot.pos.z, 0, this->actor.shape.rot.y, 0, + (this->actor.params | 0x8000)); + this->actionFunc = &func_80B983D4; + return; + } this->unk_150 = this->unk_150 + 1; return; } - this->unk_150 = 0; + this->unk_150 = 0; } -static void func_80B983D4(ObjMakekinsuta* this, GlobalContext* globalCtx) -{ - +static void func_80B983D4(ObjMakekinsuta* this, GlobalContext* globalCtx) { } -static void ObjMakekinsuta_Update(ObjMakekinsuta* this, GlobalContext* globalCtx) -{ +static void ObjMakekinsuta_Update(ObjMakekinsuta* this, GlobalContext* globalCtx) { this->actionFunc(&this->actor, globalCtx); } 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 ad8ed94938..1900eb462c 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,13 @@ #include "z_obj_makeoshihiki.h" -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x00000020 void ObjMakeoshihiki_Init(ObjMakeoshihiki* this, GlobalContext* globalCtx); void ObjMakeoshihiki_Draw(ObjMakeoshihiki* this, GlobalContext* globalCtx); /* -const ActorInit Obj_Makeoshihiki_InitVars = -{ +const ActorInit Obj_Makeoshihiki_InitVars = { ACTOR_OBJ_MAKEOSHIHIKI, ACTORTYPE_PROP, ROOM, diff --git a/src/overlays/actors/ovl_Obj_Makeoshihiki/z_obj_makeoshihiki.h b/src/overlays/actors/ovl_Obj_Makeoshihiki/z_obj_makeoshihiki.h index f3e14dd51c..c74da7055d 100644 --- a/src/overlays/actors/ovl_Obj_Makeoshihiki/z_obj_makeoshihiki.h +++ b/src/overlays/actors/ovl_Obj_Makeoshihiki/z_obj_makeoshihiki.h @@ -4,8 +4,7 @@ #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ Actor actor; } ObjMakeoshihiki; // size = 0x014C diff --git a/src/overlays/actors/ovl_Obj_Mure/z_obj_mure.c b/src/overlays/actors/ovl_Obj_Mure/z_obj_mure.c index 47f1739a82..67dc8c0b35 100644 --- a/src/overlays/actors/ovl_Obj_Mure/z_obj_mure.c +++ b/src/overlays/actors/ovl_Obj_Mure/z_obj_mure.c @@ -1,6 +1,6 @@ #include "z_obj_mure.h" -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x00000000 void ObjMure_Init(ObjMure* this, GlobalContext* globalCtx); @@ -8,8 +8,7 @@ void ObjMure_Destroy(ObjMure* this, GlobalContext* globalCtx); void ObjMure_Update(ObjMure* this, GlobalContext* globalCtx); /* -const ActorInit Obj_Mure_InitVars = -{ +const ActorInit Obj_Mure_InitVars = { ACTOR_OBJ_MURE, ACTORTYPE_ITEMACTION, ROOM, diff --git a/src/overlays/actors/ovl_Obj_Mure/z_obj_mure.h b/src/overlays/actors/ovl_Obj_Mure/z_obj_mure.h index 266b23bf9d..f52a99457b 100644 --- a/src/overlays/actors/ovl_Obj_Mure/z_obj_mure.h +++ b/src/overlays/actors/ovl_Obj_Mure/z_obj_mure.h @@ -4,8 +4,7 @@ #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ Actor actor; /* 0x014C */ char unk_14C[0x60]; } ObjMure; // size = 0x01AC diff --git a/src/overlays/actors/ovl_Obj_Mure2/z_obj_mure2.c b/src/overlays/actors/ovl_Obj_Mure2/z_obj_mure2.c index a53c84c165..e8654d8416 100644 --- a/src/overlays/actors/ovl_Obj_Mure2/z_obj_mure2.c +++ b/src/overlays/actors/ovl_Obj_Mure2/z_obj_mure2.c @@ -1,14 +1,13 @@ #include "z_obj_mure2.h" -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x00000000 void ObjMure2_Init(ObjMure2* this, GlobalContext* globalCtx); void ObjMure2_Update(ObjMure2* this, GlobalContext* globalCtx); /* -const ActorInit Obj_Mure2_InitVars = -{ +const ActorInit Obj_Mure2_InitVars = { ACTOR_OBJ_MURE2, ACTORTYPE_PROP, ROOM, diff --git a/src/overlays/actors/ovl_Obj_Mure2/z_obj_mure2.h b/src/overlays/actors/ovl_Obj_Mure2/z_obj_mure2.h index 9ff8e3be26..cf5879ab2b 100644 --- a/src/overlays/actors/ovl_Obj_Mure2/z_obj_mure2.h +++ b/src/overlays/actors/ovl_Obj_Mure2/z_obj_mure2.h @@ -4,8 +4,7 @@ #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ Actor actor; /* 0x014C */ char unk_14C[0x3C]; } ObjMure2; // size = 0x0188 diff --git a/src/overlays/actors/ovl_Obj_Mure3/z_obj_mure3.c b/src/overlays/actors/ovl_Obj_Mure3/z_obj_mure3.c index bc8effe0f8..ff6168d255 100644 --- a/src/overlays/actors/ovl_Obj_Mure3/z_obj_mure3.c +++ b/src/overlays/actors/ovl_Obj_Mure3/z_obj_mure3.c @@ -1,6 +1,6 @@ #include "z_obj_mure3.h" -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x00000000 void ObjMure3_Init(ObjMure3* this, GlobalContext* globalCtx); @@ -8,8 +8,7 @@ void ObjMure3_Destroy(ObjMure3* this, GlobalContext* globalCtx); void ObjMure3_Update(ObjMure3* this, GlobalContext* globalCtx); /* -const ActorInit Obj_Mure3_InitVars = -{ +const ActorInit Obj_Mure3_InitVars = { ACTOR_OBJ_MURE3, ACTORTYPE_BG, ROOM, diff --git a/src/overlays/actors/ovl_Obj_Mure3/z_obj_mure3.h b/src/overlays/actors/ovl_Obj_Mure3/z_obj_mure3.h index 5c8fa8d6c4..e66ee67d25 100644 --- a/src/overlays/actors/ovl_Obj_Mure3/z_obj_mure3.h +++ b/src/overlays/actors/ovl_Obj_Mure3/z_obj_mure3.h @@ -4,8 +4,7 @@ #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ Actor actor; /* 0x014C */ char unk_14C[0x24]; } ObjMure3; // size = 0x0170 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 3de3e5734c..3f95cbb2cf 100644 --- a/src/overlays/actors/ovl_Obj_Oshihiki/z_obj_oshihiki.c +++ b/src/overlays/actors/ovl_Obj_Oshihiki/z_obj_oshihiki.c @@ -1,6 +1,6 @@ #include "z_obj_oshihiki.h" -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x00000010 void ObjOshihiki_Init(ObjOshihiki* this, GlobalContext* globalCtx); @@ -9,8 +9,7 @@ void ObjOshihiki_Update(ObjOshihiki* this, GlobalContext* globalCtx); void ObjOshihiki_Draw(ObjOshihiki* this, GlobalContext* globalCtx); /* -const ActorInit Obj_Oshihiki_InitVars = -{ +const ActorInit Obj_Oshihiki_InitVars = { ACTOR_OBJ_OSHIHIKI, ACTORTYPE_PROP, ROOM, 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 c10e454edf..a8c6c3fc8e 100644 --- a/src/overlays/actors/ovl_Obj_Oshihiki/z_obj_oshihiki.h +++ b/src/overlays/actors/ovl_Obj_Oshihiki/z_obj_oshihiki.h @@ -4,8 +4,7 @@ #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ Actor actor; /* 0x014C */ char unk_14C[0x88]; } ObjOshihiki; // size = 0x01D4 diff --git a/src/overlays/actors/ovl_Obj_Roomtimer/z_obj_roomtimer.c b/src/overlays/actors/ovl_Obj_Roomtimer/z_obj_roomtimer.c index 5b6bf5ac64..6689ab0121 100644 --- a/src/overlays/actors/ovl_Obj_Roomtimer/z_obj_roomtimer.c +++ b/src/overlays/actors/ovl_Obj_Roomtimer/z_obj_roomtimer.c @@ -2,20 +2,19 @@ * File: z_obj_roomtimer.c * Overlay: ovl_Obj_Roomtimer * Description: -*/ + */ #include #include #include -typedef struct -{ - /* 0x0000 */ Actor actor; +typedef struct { + /* 0x0000 */ Actor actor; /* 0x014C */ ActorFunc updateFunc; - /* 0x0150 */ u32 switchFlag; + /* 0x0150 */ u32 switchFlag; } ActorRoomTimer; // size = 0x0154 -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x00000010 static void Init(ActorRoomTimer* this, GlobalContext* globalCtx); @@ -24,8 +23,7 @@ static void Update(ActorRoomTimer* this, GlobalContext* globalCtx); static void func_80B9D054(ActorRoomTimer* this, GlobalContext* globalCtx); static void func_80B9D0B0(ActorRoomTimer* this, GlobalContext* globalCtx); -const ActorInit Obj_Roomtimer_InitVars = -{ +const ActorInit Obj_Roomtimer_InitVars = { ACTOR_OBJ_ROOMTIMER, ACTORTYPE_ENEMY, ROOM, @@ -38,61 +36,54 @@ const ActorInit Obj_Roomtimer_InitVars = (ActorFunc)NULL, }; -static void Init(ActorRoomTimer* this, GlobalContext* globalCtx) -{ +static void Init(ActorRoomTimer* this, GlobalContext* globalCtx) { s16 params = this->actor.params; this->switchFlag = (params >> 10) & 0x3F; this->actor.params = params & 0x3FF; params = this->actor.params; - if (params != 0x3FF) - { - if (params > 600) + if (params != 0x3FF) { + if (params > 600) { this->actor.params = 600; - else + } else { this->actor.params = params; + } } this->updateFunc = (ActorFunc)func_80B9D054; } -static void Destroy(ActorRoomTimer* this, GlobalContext* globalCtx) -{ - if (this->actor.params != 0x3FF) - { - if (gSaveContext.timer_1_value > 0) +static void Destroy(ActorRoomTimer* this, GlobalContext* globalCtx) { + if (this->actor.params != 0x3FF) { + if (gSaveContext.timer_1_value > 0) { gSaveContext.timer_1_state = 10; + } } } -static void func_80B9D054(ActorRoomTimer* this, GlobalContext* globalCtx) -{ - if (this->actor.params != 0x3FF) +static void func_80B9D054(ActorRoomTimer* this, GlobalContext* globalCtx) { + if (this->actor.params != 0x3FF) { func_80088B34(this->actor.params); + } Actor_ChangeType(globalCtx, &globalCtx->actorCtx, &this->actor, ACTORTYPE_PROP); this->updateFunc = (ActorFunc)func_80B9D0B0; } -static void func_80B9D0B0(ActorRoomTimer* this, GlobalContext* globalCtx) -{ - if (Flags_GetTempClear(globalCtx, this->actor.room)) - { - if (this->actor.params != 0x3FF) +static void func_80B9D0B0(ActorRoomTimer* this, GlobalContext* globalCtx) { + if (Flags_GetTempClear(globalCtx, this->actor.room)) { + if (this->actor.params != 0x3FF) { gSaveContext.timer_1_state = 10; + } Flags_SetClear(globalCtx, this->actor.room); Flags_SetSwitch(globalCtx, this->switchFlag); func_80078884(NA_SE_SY_CORRECT_CHIME); Actor_Kill(&this->actor); - } - else - { - if (this->actor.params != 0x3FF) - { - if (gSaveContext.timer_1_value == 0) - { + } else { + if (this->actor.params != 0x3FF) { + if (gSaveContext.timer_1_value == 0) { Audio_PlaySoundGeneral(NA_SE_OC_ABYSS, &D_801333D4, 4, &D_801333E0, &D_801333E0, &D_801333E8); func_800C0B60(globalCtx); // Void Out Actor_Kill(&this->actor); @@ -101,7 +92,6 @@ static void func_80B9D0B0(ActorRoomTimer* this, GlobalContext* globalCtx) } } -static void Update(ActorRoomTimer* this, GlobalContext* globalCtx) -{ +static void Update(ActorRoomTimer* this, GlobalContext* globalCtx) { this->updateFunc(this, globalCtx); } diff --git a/src/overlays/actors/ovl_Obj_Switch/z_obj_switch.c b/src/overlays/actors/ovl_Obj_Switch/z_obj_switch.c index 3be1b0ad34..bca0894b91 100644 --- a/src/overlays/actors/ovl_Obj_Switch/z_obj_switch.c +++ b/src/overlays/actors/ovl_Obj_Switch/z_obj_switch.c @@ -1,6 +1,6 @@ #include "z_obj_switch.h" -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x00000010 void ObjSwitch_Init(ObjSwitch* this, GlobalContext* globalCtx); @@ -9,8 +9,7 @@ void ObjSwitch_Update(ObjSwitch* this, GlobalContext* globalCtx); void ObjSwitch_Draw(ObjSwitch* this, GlobalContext* globalCtx); /* -const ActorInit Obj_Switch_InitVars = -{ +const ActorInit Obj_Switch_InitVars = { ACTOR_OBJ_SWITCH, ACTORTYPE_SWITCH, ROOM, diff --git a/src/overlays/actors/ovl_Obj_Switch/z_obj_switch.h b/src/overlays/actors/ovl_Obj_Switch/z_obj_switch.h index 7e94e6e732..05953d002a 100644 --- a/src/overlays/actors/ovl_Obj_Switch/z_obj_switch.h +++ b/src/overlays/actors/ovl_Obj_Switch/z_obj_switch.h @@ -4,8 +4,7 @@ #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ Actor actor; /* 0x014C */ char unk_14C[0x10C]; } ObjSwitch; // size = 0x0258 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 79c658a70a..83fbf3eb78 100644 --- a/src/overlays/actors/ovl_Obj_Syokudai/z_obj_syokudai.c +++ b/src/overlays/actors/ovl_Obj_Syokudai/z_obj_syokudai.c @@ -1,6 +1,6 @@ #include "z_obj_syokudai.h" -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x00000410 void ObjSyokudai_Init(ObjSyokudai* this, GlobalContext* globalCtx); @@ -9,8 +9,7 @@ void ObjSyokudai_Update(ObjSyokudai* this, GlobalContext* globalCtx); void ObjSyokudai_Draw(ObjSyokudai* this, GlobalContext* globalCtx); /* -const ActorInit Obj_Syokudai_InitVars = -{ +const ActorInit Obj_Syokudai_InitVars = { ACTOR_OBJ_SYOKUDAI, ACTORTYPE_PROP, ROOM, @@ -30,4 +29,3 @@ const ActorInit Obj_Syokudai_InitVars = #pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Obj_Syokudai/ObjSyokudai_Update.s") #pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Obj_Syokudai/ObjSyokudai_Draw.s") - diff --git a/src/overlays/actors/ovl_Obj_Syokudai/z_obj_syokudai.h b/src/overlays/actors/ovl_Obj_Syokudai/z_obj_syokudai.h index d9c323dd44..a19fef9b41 100644 --- a/src/overlays/actors/ovl_Obj_Syokudai/z_obj_syokudai.h +++ b/src/overlays/actors/ovl_Obj_Syokudai/z_obj_syokudai.h @@ -4,8 +4,7 @@ #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ Actor actor; /* 0x014C */ char unk_14C[0xB0]; } ObjSyokudai; // size = 0x01FC diff --git a/src/overlays/actors/ovl_Obj_Timeblock/z_obj_timeblock.c b/src/overlays/actors/ovl_Obj_Timeblock/z_obj_timeblock.c index e0755c0920..4edecb082b 100644 --- a/src/overlays/actors/ovl_Obj_Timeblock/z_obj_timeblock.c +++ b/src/overlays/actors/ovl_Obj_Timeblock/z_obj_timeblock.c @@ -1,6 +1,6 @@ #include "z_obj_timeblock.h" -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x0A000011 void ObjTimeblock_Init(ObjTimeblock* this, GlobalContext* globalCtx); @@ -9,8 +9,7 @@ void ObjTimeblock_Update(ObjTimeblock* this, GlobalContext* globalCtx); void ObjTimeblock_Draw(ObjTimeblock* this, GlobalContext* globalCtx); /* -const ActorInit Obj_Timeblock_InitVars = -{ +const ActorInit Obj_Timeblock_InitVars = { ACTOR_OBJ_TIMEBLOCK, ACTORTYPE_ITEMACTION, ROOM, diff --git a/src/overlays/actors/ovl_Obj_Timeblock/z_obj_timeblock.h b/src/overlays/actors/ovl_Obj_Timeblock/z_obj_timeblock.h index 41d8764e09..eb337b5136 100644 --- a/src/overlays/actors/ovl_Obj_Timeblock/z_obj_timeblock.h +++ b/src/overlays/actors/ovl_Obj_Timeblock/z_obj_timeblock.h @@ -4,8 +4,7 @@ #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ Actor actor; /* 0x014C */ char unk_14C[0x30]; } ObjTimeblock; // size = 0x017C diff --git a/src/overlays/actors/ovl_Obj_Tsubo/z_obj_tsubo.c b/src/overlays/actors/ovl_Obj_Tsubo/z_obj_tsubo.c index 5440caeea1..6eb47ed986 100644 --- a/src/overlays/actors/ovl_Obj_Tsubo/z_obj_tsubo.c +++ b/src/overlays/actors/ovl_Obj_Tsubo/z_obj_tsubo.c @@ -1,6 +1,6 @@ #include "z_obj_tsubo.h" -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x00800010 void ObjTsubo_Init(ObjTsubo* this, GlobalContext* globalCtx); @@ -8,8 +8,7 @@ void ObjTsubo_Destroy(ObjTsubo* this, GlobalContext* globalCtx); void ObjTsubo_Update(ObjTsubo* this, GlobalContext* globalCtx); /* -const ActorInit Obj_Tsubo_InitVars = -{ +const ActorInit Obj_Tsubo_InitVars = { ACTOR_OBJ_TSUBO, ACTORTYPE_PROP, ROOM, diff --git a/src/overlays/actors/ovl_Obj_Tsubo/z_obj_tsubo.h b/src/overlays/actors/ovl_Obj_Tsubo/z_obj_tsubo.h index 1cb8e3d03a..7d0bd71315 100644 --- a/src/overlays/actors/ovl_Obj_Tsubo/z_obj_tsubo.h +++ b/src/overlays/actors/ovl_Obj_Tsubo/z_obj_tsubo.h @@ -4,8 +4,7 @@ #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ Actor actor; /* 0x014C */ char unk_14C[0x54]; } ObjTsubo; // size = 0x01A0 diff --git a/src/overlays/actors/ovl_Obj_Warp2block/z_obj_warp2block.c b/src/overlays/actors/ovl_Obj_Warp2block/z_obj_warp2block.c index 084a477afb..fb3a372c28 100644 --- a/src/overlays/actors/ovl_Obj_Warp2block/z_obj_warp2block.c +++ b/src/overlays/actors/ovl_Obj_Warp2block/z_obj_warp2block.c @@ -1,6 +1,6 @@ #include "z_obj_warp2block.h" -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x0A000011 void ObjWarp2block_Init(ObjWarp2block* this, GlobalContext* globalCtx); @@ -9,8 +9,7 @@ void ObjWarp2block_Update(ObjWarp2block* this, GlobalContext* globalCtx); void ObjWarp2block_Draw(ObjWarp2block* this, GlobalContext* globalCtx); /* -const ActorInit Obj_Warp2block_InitVars = -{ +const ActorInit Obj_Warp2block_InitVars = { ACTOR_OBJ_WARP2BLOCK, ACTORTYPE_ITEMACTION, ROOM, diff --git a/src/overlays/actors/ovl_Obj_Warp2block/z_obj_warp2block.h b/src/overlays/actors/ovl_Obj_Warp2block/z_obj_warp2block.h index 8918cdcdb6..768a85afdc 100644 --- a/src/overlays/actors/ovl_Obj_Warp2block/z_obj_warp2block.h +++ b/src/overlays/actors/ovl_Obj_Warp2block/z_obj_warp2block.h @@ -4,8 +4,7 @@ #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ Actor actor; /* 0x014C */ char unk_14C[0x2C]; } ObjWarp2block; // size = 0x0178 diff --git a/src/overlays/actors/ovl_Object_Kankyo/z_object_kankyo.c b/src/overlays/actors/ovl_Object_Kankyo/z_object_kankyo.c index 83236cda15..4da1a95751 100644 --- a/src/overlays/actors/ovl_Object_Kankyo/z_object_kankyo.c +++ b/src/overlays/actors/ovl_Object_Kankyo/z_object_kankyo.c @@ -1,6 +1,6 @@ #include "z_object_kankyo.h" -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x02000030 void ObjectKankyo_Init(ObjectKankyo* this, GlobalContext* globalCtx); @@ -9,8 +9,7 @@ void ObjectKankyo_Update(ObjectKankyo* this, GlobalContext* globalCtx); void ObjectKankyo_Draw(ObjectKankyo* this, GlobalContext* globalCtx); /* -const ActorInit Object_Kankyo_InitVars = -{ +const ActorInit Object_Kankyo_InitVars = { ACTOR_OBJECT_KANKYO, ACTORTYPE_ITEMACTION, ROOM, diff --git a/src/overlays/actors/ovl_Object_Kankyo/z_object_kankyo.h b/src/overlays/actors/ovl_Object_Kankyo/z_object_kankyo.h index 99afff0768..1b47732923 100644 --- a/src/overlays/actors/ovl_Object_Kankyo/z_object_kankyo.h +++ b/src/overlays/actors/ovl_Object_Kankyo/z_object_kankyo.h @@ -4,8 +4,7 @@ #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ Actor actor; /* 0x014C */ char unk_14C[0x1514]; } ObjectKankyo; // size = 0x1660 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 cdd7de0561..f8c5b83e20 100644 --- a/src/overlays/actors/ovl_Oceff_Spot/z_oceff_spot.c +++ b/src/overlays/actors/ovl_Oceff_Spot/z_oceff_spot.c @@ -1,6 +1,6 @@ #include "z_oceff_spot.h" -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x02000010 void OceffSpot_Init(OceffSpot* this, GlobalContext* globalCtx); @@ -9,8 +9,7 @@ void OceffSpot_Update(OceffSpot* this, GlobalContext* globalCtx); void OceffSpot_Draw(OceffSpot* this, GlobalContext* globalCtx); /* -const ActorInit Oceff_Spot_InitVars = -{ +const ActorInit Oceff_Spot_InitVars = { ACTOR_OCEFF_SPOT, ACTORTYPE_ITEMACTION, ROOM, diff --git a/src/overlays/actors/ovl_Oceff_Spot/z_oceff_spot.h b/src/overlays/actors/ovl_Oceff_Spot/z_oceff_spot.h index 1552a52aed..aa0121833b 100644 --- a/src/overlays/actors/ovl_Oceff_Spot/z_oceff_spot.h +++ b/src/overlays/actors/ovl_Oceff_Spot/z_oceff_spot.h @@ -4,8 +4,7 @@ #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ Actor actor; /* 0x014C */ char unk_14C[0x34]; } OceffSpot; // size = 0x0180 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 10b22404ef..eb81f0a02b 100644 --- a/src/overlays/actors/ovl_Oceff_Storm/z_oceff_storm.c +++ b/src/overlays/actors/ovl_Oceff_Storm/z_oceff_storm.c @@ -1,6 +1,6 @@ #include "z_oceff_storm.h" -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x02000030 void OceffStorm_Init(OceffStorm* this, GlobalContext* globalCtx); @@ -9,8 +9,7 @@ void OceffStorm_Update(OceffStorm* this, GlobalContext* globalCtx); void OceffStorm_Draw(OceffStorm* this, GlobalContext* globalCtx); /* -const ActorInit Oceff_Storm_InitVars = -{ +const ActorInit Oceff_Storm_InitVars = { ACTOR_OCEFF_STORM, ACTORTYPE_ITEMACTION, ROOM, diff --git a/src/overlays/actors/ovl_Oceff_Storm/z_oceff_storm.h b/src/overlays/actors/ovl_Oceff_Storm/z_oceff_storm.h index 75fd1ffe14..51623ec8f3 100644 --- a/src/overlays/actors/ovl_Oceff_Storm/z_oceff_storm.h +++ b/src/overlays/actors/ovl_Oceff_Storm/z_oceff_storm.h @@ -4,8 +4,7 @@ #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ Actor actor; /* 0x014C */ char unk_14C[0xC]; } OceffStorm; // size = 0x0158 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 a5310aff19..cad1ecdbfe 100644 --- a/src/overlays/actors/ovl_Oceff_Wipe/z_oceff_wipe.c +++ b/src/overlays/actors/ovl_Oceff_Wipe/z_oceff_wipe.c @@ -1,6 +1,6 @@ #include "z_oceff_wipe.h" -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x02000010 void OceffWipe_Init(OceffWipe* this, GlobalContext* globalCtx); @@ -9,8 +9,7 @@ void OceffWipe_Update(OceffWipe* this, GlobalContext* globalCtx); void OceffWipe_Draw(OceffWipe* this, GlobalContext* globalCtx); /* -const ActorInit Oceff_Wipe_InitVars = -{ +const ActorInit Oceff_Wipe_InitVars = { ACTOR_OCEFF_WIPE, ACTORTYPE_ITEMACTION, ROOM, diff --git a/src/overlays/actors/ovl_Oceff_Wipe/z_oceff_wipe.h b/src/overlays/actors/ovl_Oceff_Wipe/z_oceff_wipe.h index cd2e3f6ffb..6cda7cfe43 100644 --- a/src/overlays/actors/ovl_Oceff_Wipe/z_oceff_wipe.h +++ b/src/overlays/actors/ovl_Oceff_Wipe/z_oceff_wipe.h @@ -4,8 +4,7 @@ #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ Actor actor; /* 0x014C */ char unk_14C[0x4]; } OceffWipe; // size = 0x0150 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 ce20d0406a..f15afc1c59 100644 --- a/src/overlays/actors/ovl_Oceff_Wipe2/z_oceff_wipe2.c +++ b/src/overlays/actors/ovl_Oceff_Wipe2/z_oceff_wipe2.c @@ -1,6 +1,6 @@ #include "z_oceff_wipe2.h" -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x02000010 void OceffWipe2_Init(OceffWipe2* this, GlobalContext* globalCtx); @@ -9,8 +9,7 @@ void OceffWipe2_Update(OceffWipe2* this, GlobalContext* globalCtx); void OceffWipe2_Draw(OceffWipe2* this, GlobalContext* globalCtx); /* -const ActorInit Oceff_Wipe2_InitVars = -{ +const ActorInit Oceff_Wipe2_InitVars = { ACTOR_OCEFF_WIPE2, ACTORTYPE_ITEMACTION, ROOM, diff --git a/src/overlays/actors/ovl_Oceff_Wipe2/z_oceff_wipe2.h b/src/overlays/actors/ovl_Oceff_Wipe2/z_oceff_wipe2.h index 5835387723..63417a3efa 100644 --- a/src/overlays/actors/ovl_Oceff_Wipe2/z_oceff_wipe2.h +++ b/src/overlays/actors/ovl_Oceff_Wipe2/z_oceff_wipe2.h @@ -4,8 +4,7 @@ #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ Actor actor; /* 0x014C */ char unk_14C[0x4]; } OceffWipe2; // size = 0x0150 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 00e6ec8abe..138bd0486e 100644 --- a/src/overlays/actors/ovl_Oceff_Wipe3/z_oceff_wipe3.c +++ b/src/overlays/actors/ovl_Oceff_Wipe3/z_oceff_wipe3.c @@ -1,6 +1,6 @@ #include "z_oceff_wipe3.h" -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x02000010 void OceffWipe3_Init(OceffWipe3* this, GlobalContext* globalCtx); @@ -9,8 +9,7 @@ void OceffWipe3_Update(OceffWipe3* this, GlobalContext* globalCtx); void OceffWipe3_Draw(OceffWipe3* this, GlobalContext* globalCtx); /* -const ActorInit Oceff_Wipe3_InitVars = -{ +const ActorInit Oceff_Wipe3_InitVars = { ACTOR_OCEFF_WIPE3, ACTORTYPE_ITEMACTION, ROOM, diff --git a/src/overlays/actors/ovl_Oceff_Wipe3/z_oceff_wipe3.h b/src/overlays/actors/ovl_Oceff_Wipe3/z_oceff_wipe3.h index c5937e8eba..1564054464 100644 --- a/src/overlays/actors/ovl_Oceff_Wipe3/z_oceff_wipe3.h +++ b/src/overlays/actors/ovl_Oceff_Wipe3/z_oceff_wipe3.h @@ -4,8 +4,7 @@ #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ Actor actor; /* 0x014C */ char unk_14C[0x4]; } OceffWipe3; // size = 0x0150 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 cae47b2ac6..df85e2b07a 100644 --- a/src/overlays/actors/ovl_Oceff_Wipe4/z_oceff_wipe4.c +++ b/src/overlays/actors/ovl_Oceff_Wipe4/z_oceff_wipe4.c @@ -1,6 +1,6 @@ #include "z_oceff_wipe4.h" -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x02000010 void OceffWipe4_Init(OceffWipe4* this, GlobalContext* globalCtx); @@ -9,8 +9,7 @@ void OceffWipe4_Update(OceffWipe4* this, GlobalContext* globalCtx); void OceffWipe4_Draw(OceffWipe4* this, GlobalContext* globalCtx); /* -const ActorInit Oceff_Wipe4_InitVars = -{ +const ActorInit Oceff_Wipe4_InitVars = { ACTOR_OCEFF_WIPE4, ACTORTYPE_ITEMACTION, ROOM, diff --git a/src/overlays/actors/ovl_Oceff_Wipe4/z_oceff_wipe4.h b/src/overlays/actors/ovl_Oceff_Wipe4/z_oceff_wipe4.h index 1d586388da..ba47313545 100644 --- a/src/overlays/actors/ovl_Oceff_Wipe4/z_oceff_wipe4.h +++ b/src/overlays/actors/ovl_Oceff_Wipe4/z_oceff_wipe4.h @@ -4,8 +4,7 @@ #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ Actor actor; /* 0x014C */ char unk_14C[0x4]; } OceffWipe4; // size = 0x0150 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 4ab2513bd0..e07455820a 100644 --- a/src/overlays/actors/ovl_Shot_Sun/z_shot_sun.c +++ b/src/overlays/actors/ovl_Shot_Sun/z_shot_sun.c @@ -1,6 +1,6 @@ #include "z_shot_sun.h" -#define ROOM 0x00 +#define ROOM 0x00 #define FLAGS 0x00000009 void ShotSun_Init(ShotSun* this, GlobalContext* globalCtx); @@ -8,8 +8,7 @@ void ShotSun_Destroy(ShotSun* this, GlobalContext* globalCtx); void ShotSun_Update(ShotSun* this, GlobalContext* globalCtx); /* -const ActorInit Shot_Sun_InitVars = -{ +const ActorInit Shot_Sun_InitVars = { ACTOR_SHOT_SUN, ACTORTYPE_PROP, ROOM, diff --git a/src/overlays/actors/ovl_Shot_Sun/z_shot_sun.h b/src/overlays/actors/ovl_Shot_Sun/z_shot_sun.h index 8bdaaaed3c..6a0c9b88db 100644 --- a/src/overlays/actors/ovl_Shot_Sun/z_shot_sun.h +++ b/src/overlays/actors/ovl_Shot_Sun/z_shot_sun.h @@ -4,8 +4,7 @@ #include #include -typedef struct -{ +typedef struct { /* 0x0000 */ Actor actor; /* 0x014C */ char unk_14C[0x5C]; } ShotSun; // size = 0x01A8 diff --git a/src/overlays/actors/ovl_player_actor/z_player.c b/src/overlays/actors/ovl_player_actor/z_player.c index 4f73c36e9a..ffed1b22a1 100644 --- a/src/overlays/actors/ovl_player_actor/z_player.c +++ b/src/overlays/actors/ovl_player_actor/z_player.c @@ -1094,7 +1094,3 @@ #pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_808530E0.s") #pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_player_actor/func_80853148.s") - - - - diff --git a/src/overlays/effects/ovl_Effect_Ss_Blast/z_effect_ss_blast.c b/src/overlays/effects/ovl_Effect_Ss_Blast/z_effect_ss_blast.c index 0a741f327f..77c3b7629f 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Blast/z_effect_ss_blast.c +++ b/src/overlays/effects/ovl_Effect_Ss_Blast/z_effect_ss_blast.c @@ -6,7 +6,3 @@ #pragma GLOBAL_ASM("asm/non_matchings/overlays/effects/ovl_Effect_Ss_Blast/func_8099EF08.s") #pragma GLOBAL_ASM("asm/non_matchings/overlays/effects/ovl_Effect_Ss_Blast/func_8099F0AC.s") - - - - diff --git a/src/overlays/effects/ovl_Effect_Ss_Bomb/z_effect_ss_bomb.c b/src/overlays/effects/ovl_Effect_Ss_Bomb/z_effect_ss_bomb.c index 1d90bd98de..45fe73bc88 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Bomb/z_effect_ss_bomb.c +++ b/src/overlays/effects/ovl_Effect_Ss_Bomb/z_effect_ss_bomb.c @@ -6,7 +6,3 @@ #pragma GLOBAL_ASM("asm/non_matchings/overlays/effects/ovl_Effect_Ss_Bomb/func_8099F274.s") #pragma GLOBAL_ASM("asm/non_matchings/overlays/effects/ovl_Effect_Ss_Bomb/func_8099F4D8.s") - - - - diff --git a/src/overlays/effects/ovl_Effect_Ss_Bomb2/z_effect_ss_bomb2.c b/src/overlays/effects/ovl_Effect_Ss_Bomb2/z_effect_ss_bomb2.c index f7dc03af7f..b4985f3bbd 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Bomb2/z_effect_ss_bomb2.c +++ b/src/overlays/effects/ovl_Effect_Ss_Bomb2/z_effect_ss_bomb2.c @@ -8,7 +8,3 @@ #pragma GLOBAL_ASM("asm/non_matchings/overlays/effects/ovl_Effect_Ss_Bomb2/func_8099F960.s") #pragma GLOBAL_ASM("asm/non_matchings/overlays/effects/ovl_Effect_Ss_Bomb2/func_8099FCCC.s") - - - - diff --git a/src/overlays/effects/ovl_Effect_Ss_Bubble/z_effect_ss_bubble.c b/src/overlays/effects/ovl_Effect_Ss_Bubble/z_effect_ss_bubble.c index 275826cdbe..8ee11f8e53 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Bubble/z_effect_ss_bubble.c +++ b/src/overlays/effects/ovl_Effect_Ss_Bubble/z_effect_ss_bubble.c @@ -6,7 +6,3 @@ #pragma GLOBAL_ASM("asm/non_matchings/overlays/effects/ovl_Effect_Ss_Bubble/func_809A01CC.s") #pragma GLOBAL_ASM("asm/non_matchings/overlays/effects/ovl_Effect_Ss_Bubble/func_809A0360.s") - - - - diff --git a/src/overlays/effects/ovl_Effect_Ss_D_Fire/z_effect_ss_d_fire.c b/src/overlays/effects/ovl_Effect_Ss_D_Fire/z_effect_ss_d_fire.c index 5a073cf053..be8a0129cc 100644 --- a/src/overlays/effects/ovl_Effect_Ss_D_Fire/z_effect_ss_d_fire.c +++ b/src/overlays/effects/ovl_Effect_Ss_D_Fire/z_effect_ss_d_fire.c @@ -6,7 +6,3 @@ #pragma GLOBAL_ASM("asm/non_matchings/overlays/effects/ovl_Effect_Ss_D_Fire/func_809A0698.s") #pragma GLOBAL_ASM("asm/non_matchings/overlays/effects/ovl_Effect_Ss_D_Fire/func_809A090C.s") - - - - diff --git a/src/overlays/effects/ovl_Effect_Ss_Dead_Db/z_effect_ss_dead_db.c b/src/overlays/effects/ovl_Effect_Ss_Dead_Db/z_effect_ss_dead_db.c index 7235707b13..4f75a5671a 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Dead_Db/z_effect_ss_dead_db.c +++ b/src/overlays/effects/ovl_Effect_Ss_Dead_Db/z_effect_ss_dead_db.c @@ -6,7 +6,3 @@ #pragma GLOBAL_ASM("asm/non_matchings/overlays/effects/ovl_Effect_Ss_Dead_Db/func_809A0BB8.s") #pragma GLOBAL_ASM("asm/non_matchings/overlays/effects/ovl_Effect_Ss_Dead_Db/func_809A0DB4.s") - - - - diff --git a/src/overlays/effects/ovl_Effect_Ss_Dead_Dd/z_effect_ss_dead_dd.c b/src/overlays/effects/ovl_Effect_Ss_Dead_Dd/z_effect_ss_dead_dd.c index 22c0311300..582ea22b0e 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Dead_Dd/z_effect_ss_dead_dd.c +++ b/src/overlays/effects/ovl_Effect_Ss_Dead_Dd/z_effect_ss_dead_dd.c @@ -6,6 +6,3 @@ #pragma GLOBAL_ASM("asm/non_matchings/overlays/effects/ovl_Effect_Ss_Dead_Dd/func_809A12B4.s") #pragma GLOBAL_ASM("asm/non_matchings/overlays/effects/ovl_Effect_Ss_Dead_Dd/func_809A14B0.s") - - - diff --git a/src/overlays/effects/ovl_Effect_Ss_Dead_Ds/z_effect_ss_dead_ds.c b/src/overlays/effects/ovl_Effect_Ss_Dead_Ds/z_effect_ss_dead_ds.c index e3fd6e9a35..d4995444ae 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Dead_Ds/z_effect_ss_dead_ds.c +++ b/src/overlays/effects/ovl_Effect_Ss_Dead_Ds/z_effect_ss_dead_ds.c @@ -6,7 +6,3 @@ #pragma GLOBAL_ASM("asm/non_matchings/overlays/effects/ovl_Effect_Ss_Dead_Ds/func_809A16F4.s") #pragma GLOBAL_ASM("asm/non_matchings/overlays/effects/ovl_Effect_Ss_Dead_Ds/func_809A1A08.s") - - - - diff --git a/src/overlays/effects/ovl_Effect_Ss_Dead_Sound/z_effect_ss_dead_sound.c b/src/overlays/effects/ovl_Effect_Ss_Dead_Sound/z_effect_ss_dead_sound.c index db2ecc7746..722d468899 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Dead_Sound/z_effect_ss_dead_sound.c +++ b/src/overlays/effects/ovl_Effect_Ss_Dead_Sound/z_effect_ss_dead_sound.c @@ -4,6 +4,3 @@ #pragma GLOBAL_ASM("asm/non_matchings/overlays/effects/ovl_Effect_Ss_Dead_Sound/func_809A1B30.s") #pragma GLOBAL_ASM("asm/non_matchings/overlays/effects/ovl_Effect_Ss_Dead_Sound/func_809A1BD8.s") - - - diff --git a/src/overlays/effects/ovl_Effect_Ss_Dt_Bubble/z_effect_ss_dt_bubble.c b/src/overlays/effects/ovl_Effect_Ss_Dt_Bubble/z_effect_ss_dt_bubble.c index 1049a55678..45f0eb9bf3 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Dt_Bubble/z_effect_ss_dt_bubble.c +++ b/src/overlays/effects/ovl_Effect_Ss_Dt_Bubble/z_effect_ss_dt_bubble.c @@ -6,7 +6,3 @@ #pragma GLOBAL_ASM("asm/non_matchings/overlays/effects/ovl_Effect_Ss_Dt_Bubble/func_809A1F04.s") #pragma GLOBAL_ASM("asm/non_matchings/overlays/effects/ovl_Effect_Ss_Dt_Bubble/func_809A2180.s") - - - - diff --git a/src/overlays/effects/ovl_Effect_Ss_Dust/z_effect_ss_dust.c b/src/overlays/effects/ovl_Effect_Ss_Dust/z_effect_ss_dust.c index 338cfd8e19..497360c137 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Dust/z_effect_ss_dust.c +++ b/src/overlays/effects/ovl_Effect_Ss_Dust/z_effect_ss_dust.c @@ -8,7 +8,3 @@ #pragma GLOBAL_ASM("asm/non_matchings/overlays/effects/ovl_Effect_Ss_Dust/func_809A27F0.s") #pragma GLOBAL_ASM("asm/non_matchings/overlays/effects/ovl_Effect_Ss_Dust/func_809A28EC.s") - - - - diff --git a/src/overlays/effects/ovl_Effect_Ss_En_Fire/z_effect_ss_en_fire.c b/src/overlays/effects/ovl_Effect_Ss_En_Fire/z_effect_ss_en_fire.c index a6476bef80..eb6d647d6d 100644 --- a/src/overlays/effects/ovl_Effect_Ss_En_Fire/z_effect_ss_en_fire.c +++ b/src/overlays/effects/ovl_Effect_Ss_En_Fire/z_effect_ss_en_fire.c @@ -6,7 +6,3 @@ #pragma GLOBAL_ASM("asm/non_matchings/overlays/effects/ovl_Effect_Ss_En_Fire/func_809A2D28.s") #pragma GLOBAL_ASM("asm/non_matchings/overlays/effects/ovl_Effect_Ss_En_Fire/func_809A3060.s") - - - - diff --git a/src/overlays/effects/ovl_Effect_Ss_En_Ice/z_effect_ss_en_ice.c b/src/overlays/effects/ovl_Effect_Ss_En_Ice/z_effect_ss_en_ice.c index 757e7d236a..b34074f312 100644 --- a/src/overlays/effects/ovl_Effect_Ss_En_Ice/z_effect_ss_en_ice.c +++ b/src/overlays/effects/ovl_Effect_Ss_En_Ice/z_effect_ss_en_ice.c @@ -8,7 +8,3 @@ #pragma GLOBAL_ASM("asm/non_matchings/overlays/effects/ovl_Effect_Ss_En_Ice/func_809A3988.s") #pragma GLOBAL_ASM("asm/non_matchings/overlays/effects/ovl_Effect_Ss_En_Ice/func_809A3B60.s") - - - - diff --git a/src/overlays/effects/ovl_Effect_Ss_Extra/z_effect_ss_extra.c b/src/overlays/effects/ovl_Effect_Ss_Extra/z_effect_ss_extra.c index 2fa975eea4..d3c9b4edbf 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Extra/z_effect_ss_extra.c +++ b/src/overlays/effects/ovl_Effect_Ss_Extra/z_effect_ss_extra.c @@ -6,6 +6,3 @@ #pragma GLOBAL_ASM("asm/non_matchings/overlays/effects/ovl_Effect_Ss_Extra/func_809A3E00.s") #pragma GLOBAL_ASM("asm/non_matchings/overlays/effects/ovl_Effect_Ss_Extra/func_809A3FF8.s") - - - diff --git a/src/overlays/effects/ovl_Effect_Ss_Fcircle/z_effect_ss_fcircle.c b/src/overlays/effects/ovl_Effect_Ss_Fcircle/z_effect_ss_fcircle.c index 5bc17afa5c..3da011570b 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Fcircle/z_effect_ss_fcircle.c +++ b/src/overlays/effects/ovl_Effect_Ss_Fcircle/z_effect_ss_fcircle.c @@ -6,7 +6,3 @@ #pragma GLOBAL_ASM("asm/non_matchings/overlays/effects/ovl_Effect_Ss_Fcircle/func_809A41DC.s") #pragma GLOBAL_ASM("asm/non_matchings/overlays/effects/ovl_Effect_Ss_Fcircle/func_809A44E0.s") - - - - diff --git a/src/overlays/effects/ovl_Effect_Ss_Fhg_Flash/z_effect_ss_fhg_flash.c b/src/overlays/effects/ovl_Effect_Ss_Fhg_Flash/z_effect_ss_fhg_flash.c index 54a2d1e595..c04ee27c9f 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Fhg_Flash/z_effect_ss_fhg_flash.c +++ b/src/overlays/effects/ovl_Effect_Ss_Fhg_Flash/z_effect_ss_fhg_flash.c @@ -10,7 +10,3 @@ #pragma GLOBAL_ASM("asm/non_matchings/overlays/effects/ovl_Effect_Ss_Fhg_Flash/func_809A4E28.s") #pragma GLOBAL_ASM("asm/non_matchings/overlays/effects/ovl_Effect_Ss_Fhg_Flash/func_809A4EC0.s") - - - - diff --git a/src/overlays/effects/ovl_Effect_Ss_Fire_Tail/z_effect_ss_fire_tail.c b/src/overlays/effects/ovl_Effect_Ss_Fire_Tail/z_effect_ss_fire_tail.c index 101a40861a..09ef8ed751 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Fire_Tail/z_effect_ss_fire_tail.c +++ b/src/overlays/effects/ovl_Effect_Ss_Fire_Tail/z_effect_ss_fire_tail.c @@ -6,7 +6,3 @@ #pragma GLOBAL_ASM("asm/non_matchings/overlays/effects/ovl_Effect_Ss_Fire_Tail/func_809A5858.s") #pragma GLOBAL_ASM("asm/non_matchings/overlays/effects/ovl_Effect_Ss_Fire_Tail/func_809A5D98.s") - - - - diff --git a/src/overlays/effects/ovl_Effect_Ss_G_Fire/z_effect_ss_g_fire.c b/src/overlays/effects/ovl_Effect_Ss_G_Fire/z_effect_ss_g_fire.c index 2c1d6c4f55..943976af01 100644 --- a/src/overlays/effects/ovl_Effect_Ss_G_Fire/z_effect_ss_g_fire.c +++ b/src/overlays/effects/ovl_Effect_Ss_G_Fire/z_effect_ss_g_fire.c @@ -6,6 +6,3 @@ #pragma GLOBAL_ASM("asm/non_matchings/overlays/effects/ovl_Effect_Ss_G_Fire/func_809A6010.s") #pragma GLOBAL_ASM("asm/non_matchings/overlays/effects/ovl_Effect_Ss_G_Fire/func_809A60B4.s") - - - diff --git a/src/overlays/effects/ovl_Effect_Ss_G_Magma/z_effect_ss_g_magma.c b/src/overlays/effects/ovl_Effect_Ss_G_Magma/z_effect_ss_g_magma.c index fa5a5d09b0..6dc514c3b8 100644 --- a/src/overlays/effects/ovl_Effect_Ss_G_Magma/z_effect_ss_g_magma.c +++ b/src/overlays/effects/ovl_Effect_Ss_G_Magma/z_effect_ss_g_magma.c @@ -6,6 +6,3 @@ #pragma GLOBAL_ASM("asm/non_matchings/overlays/effects/ovl_Effect_Ss_G_Magma/func_809A62A8.s") #pragma GLOBAL_ASM("asm/non_matchings/overlays/effects/ovl_Effect_Ss_G_Magma/func_809A6300.s") - - - diff --git a/src/overlays/effects/ovl_Effect_Ss_G_Magma2/z_effect_ss_g_magma2.c b/src/overlays/effects/ovl_Effect_Ss_G_Magma2/z_effect_ss_g_magma2.c index fae1da5642..23d10a5ac1 100644 --- a/src/overlays/effects/ovl_Effect_Ss_G_Magma2/z_effect_ss_g_magma2.c +++ b/src/overlays/effects/ovl_Effect_Ss_G_Magma2/z_effect_ss_g_magma2.c @@ -6,7 +6,3 @@ #pragma GLOBAL_ASM("asm/non_matchings/overlays/effects/ovl_Effect_Ss_G_Magma2/func_809A6568.s") #pragma GLOBAL_ASM("asm/non_matchings/overlays/effects/ovl_Effect_Ss_G_Magma2/func_809A67C0.s") - - - - diff --git a/src/overlays/effects/ovl_Effect_Ss_G_Ripple/z_effect_ss_g_ripple.c b/src/overlays/effects/ovl_Effect_Ss_G_Ripple/z_effect_ss_g_ripple.c index c8213252b6..169d45524f 100644 --- a/src/overlays/effects/ovl_Effect_Ss_G_Ripple/z_effect_ss_g_ripple.c +++ b/src/overlays/effects/ovl_Effect_Ss_G_Ripple/z_effect_ss_g_ripple.c @@ -8,7 +8,3 @@ #pragma GLOBAL_ASM("asm/non_matchings/overlays/effects/ovl_Effect_Ss_G_Ripple/func_809A6D08.s") #pragma GLOBAL_ASM("asm/non_matchings/overlays/effects/ovl_Effect_Ss_G_Ripple/func_809A6D40.s") - - - - diff --git a/src/overlays/effects/ovl_Effect_Ss_G_Spk/z_effect_ss_g_spk.c b/src/overlays/effects/ovl_Effect_Ss_G_Spk/z_effect_ss_g_spk.c index 63654bf9fe..50c1df035f 100644 --- a/src/overlays/effects/ovl_Effect_Ss_G_Spk/z_effect_ss_g_spk.c +++ b/src/overlays/effects/ovl_Effect_Ss_G_Spk/z_effect_ss_g_spk.c @@ -8,7 +8,3 @@ #pragma GLOBAL_ASM("asm/non_matchings/overlays/effects/ovl_Effect_Ss_G_Spk/func_809A72C0.s") #pragma GLOBAL_ASM("asm/non_matchings/overlays/effects/ovl_Effect_Ss_G_Spk/func_809A73C8.s") - - - - diff --git a/src/overlays/effects/ovl_Effect_Ss_G_Splash/z_effect_ss_g_splash.c b/src/overlays/effects/ovl_Effect_Ss_G_Splash/z_effect_ss_g_splash.c index 90867018c6..87496873a1 100644 --- a/src/overlays/effects/ovl_Effect_Ss_G_Splash/z_effect_ss_g_splash.c +++ b/src/overlays/effects/ovl_Effect_Ss_G_Splash/z_effect_ss_g_splash.c @@ -6,7 +6,3 @@ #pragma GLOBAL_ASM("asm/non_matchings/overlays/effects/ovl_Effect_Ss_G_Splash/func_809A7760.s") #pragma GLOBAL_ASM("asm/non_matchings/overlays/effects/ovl_Effect_Ss_G_Splash/func_809A7864.s") - - - - diff --git a/src/overlays/effects/ovl_Effect_Ss_Hahen/z_effect_ss_hahen.c b/src/overlays/effects/ovl_Effect_Ss_Hahen/z_effect_ss_hahen.c index 3f89cfcd1c..4dca04f290 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Hahen/z_effect_ss_hahen.c +++ b/src/overlays/effects/ovl_Effect_Ss_Hahen/z_effect_ss_hahen.c @@ -10,7 +10,3 @@ #pragma GLOBAL_ASM("asm/non_matchings/overlays/effects/ovl_Effect_Ss_Hahen/func_809A7D9C.s") #pragma GLOBAL_ASM("asm/non_matchings/overlays/effects/ovl_Effect_Ss_Hahen/func_809A7F84.s") - - - - diff --git a/src/overlays/effects/ovl_Effect_Ss_HitMark/z_effect_ss_hitmark.c b/src/overlays/effects/ovl_Effect_Ss_HitMark/z_effect_ss_hitmark.c index d09dc3ef74..7574886edb 100644 --- a/src/overlays/effects/ovl_Effect_Ss_HitMark/z_effect_ss_hitmark.c +++ b/src/overlays/effects/ovl_Effect_Ss_HitMark/z_effect_ss_hitmark.c @@ -6,7 +6,3 @@ #pragma GLOBAL_ASM("asm/non_matchings/overlays/effects/ovl_Effect_Ss_HitMark/func_809A824C.s") #pragma GLOBAL_ASM("asm/non_matchings/overlays/effects/ovl_Effect_Ss_HitMark/func_809A8484.s") - - - - diff --git a/src/overlays/effects/ovl_Effect_Ss_Ice_Piece/z_effect_ss_ice_piece.c b/src/overlays/effects/ovl_Effect_Ss_Ice_Piece/z_effect_ss_ice_piece.c index af7c0472d9..91092b680f 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Ice_Piece/z_effect_ss_ice_piece.c +++ b/src/overlays/effects/ovl_Effect_Ss_Ice_Piece/z_effect_ss_ice_piece.c @@ -6,7 +6,3 @@ #pragma GLOBAL_ASM("asm/non_matchings/overlays/effects/ovl_Effect_Ss_Ice_Piece/func_809A8850.s") #pragma GLOBAL_ASM("asm/non_matchings/overlays/effects/ovl_Effect_Ss_Ice_Piece/func_809A8AC0.s") - - - - diff --git a/src/overlays/effects/ovl_Effect_Ss_Ice_Smoke/z_effect_ss_ice_smoke.c b/src/overlays/effects/ovl_Effect_Ss_Ice_Smoke/z_effect_ss_ice_smoke.c index a0952b1dd0..ff7c85ba14 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Ice_Smoke/z_effect_ss_ice_smoke.c +++ b/src/overlays/effects/ovl_Effect_Ss_Ice_Smoke/z_effect_ss_ice_smoke.c @@ -6,7 +6,3 @@ #pragma GLOBAL_ASM("asm/non_matchings/overlays/effects/ovl_Effect_Ss_Ice_Smoke/func_809A8D18.s") #pragma GLOBAL_ASM("asm/non_matchings/overlays/effects/ovl_Effect_Ss_Ice_Smoke/func_809A9030.s") - - - - diff --git a/src/overlays/effects/ovl_Effect_Ss_K_Fire/z_effect_ss_k_fire.c b/src/overlays/effects/ovl_Effect_Ss_K_Fire/z_effect_ss_k_fire.c index e45dd75de1..6e6749a9bf 100644 --- a/src/overlays/effects/ovl_Effect_Ss_K_Fire/z_effect_ss_k_fire.c +++ b/src/overlays/effects/ovl_Effect_Ss_K_Fire/z_effect_ss_k_fire.c @@ -6,7 +6,3 @@ #pragma GLOBAL_ASM("asm/non_matchings/overlays/effects/ovl_Effect_Ss_K_Fire/func_809A9280.s") #pragma GLOBAL_ASM("asm/non_matchings/overlays/effects/ovl_Effect_Ss_K_Fire/func_809A951C.s") - - - - diff --git a/src/overlays/effects/ovl_Effect_Ss_Kakera/z_effect_ss_kakera.c b/src/overlays/effects/ovl_Effect_Ss_Kakera/z_effect_ss_kakera.c index 3d53bc0fbf..1b1cd9d50d 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Kakera/z_effect_ss_kakera.c +++ b/src/overlays/effects/ovl_Effect_Ss_Kakera/z_effect_ss_kakera.c @@ -36,7 +36,3 @@ #pragma GLOBAL_ASM("asm/non_matchings/overlays/effects/ovl_Effect_Ss_Kakera/func_809AA230.s") #pragma GLOBAL_ASM("asm/non_matchings/overlays/effects/ovl_Effect_Ss_Kakera/func_809AA430.s") - - - - diff --git a/src/overlays/effects/ovl_Effect_Ss_KiraKira/z_effect_ss_kirakira.c b/src/overlays/effects/ovl_Effect_Ss_KiraKira/z_effect_ss_kirakira.c index 432e20cad1..553f117911 100644 --- a/src/overlays/effects/ovl_Effect_Ss_KiraKira/z_effect_ss_kirakira.c +++ b/src/overlays/effects/ovl_Effect_Ss_KiraKira/z_effect_ss_kirakira.c @@ -10,7 +10,3 @@ #pragma GLOBAL_ASM("asm/non_matchings/overlays/effects/ovl_Effect_Ss_KiraKira/func_809AACAC.s") #pragma GLOBAL_ASM("asm/non_matchings/overlays/effects/ovl_Effect_Ss_KiraKira/func_809AAD6C.s") - - - - diff --git a/src/overlays/effects/ovl_Effect_Ss_Lightning/z_effect_ss_lightning.c b/src/overlays/effects/ovl_Effect_Ss_Lightning/z_effect_ss_lightning.c index 4e6ff2656c..cf29b1521e 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Lightning/z_effect_ss_lightning.c +++ b/src/overlays/effects/ovl_Effect_Ss_Lightning/z_effect_ss_lightning.c @@ -8,7 +8,3 @@ #pragma GLOBAL_ASM("asm/non_matchings/overlays/effects/ovl_Effect_Ss_Lightning/func_809AB078.s") #pragma GLOBAL_ASM("asm/non_matchings/overlays/effects/ovl_Effect_Ss_Lightning/func_809AB338.s") - - - - diff --git a/src/overlays/effects/ovl_Effect_Ss_Sibuki/z_effect_ss_sibuki.c b/src/overlays/effects/ovl_Effect_Ss_Sibuki/z_effect_ss_sibuki.c index 6f401acae7..5daf2d6cb2 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Sibuki/z_effect_ss_sibuki.c +++ b/src/overlays/effects/ovl_Effect_Ss_Sibuki/z_effect_ss_sibuki.c @@ -6,7 +6,3 @@ #pragma GLOBAL_ASM("asm/non_matchings/overlays/effects/ovl_Effect_Ss_Sibuki/func_809AB7EC.s") #pragma GLOBAL_ASM("asm/non_matchings/overlays/effects/ovl_Effect_Ss_Sibuki/func_809AB9DC.s") - - - - diff --git a/src/overlays/effects/ovl_Effect_Ss_Sibuki2/z_effect_ss_sibuki2.c b/src/overlays/effects/ovl_Effect_Ss_Sibuki2/z_effect_ss_sibuki2.c index 637b117b94..9a080975fc 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Sibuki2/z_effect_ss_sibuki2.c +++ b/src/overlays/effects/ovl_Effect_Ss_Sibuki2/z_effect_ss_sibuki2.c @@ -6,7 +6,3 @@ #pragma GLOBAL_ASM("asm/non_matchings/overlays/effects/ovl_Effect_Ss_Sibuki2/func_809ABE0C.s") #pragma GLOBAL_ASM("asm/non_matchings/overlays/effects/ovl_Effect_Ss_Sibuki2/func_809AC030.s") - - - - diff --git a/src/overlays/effects/ovl_Effect_Ss_Solder_Srch_Ball/z_eff_ss_solder_srch_ball.c b/src/overlays/effects/ovl_Effect_Ss_Solder_Srch_Ball/z_eff_ss_solder_srch_ball.c index 7eda76d1a0..9b84df0bdf 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Solder_Srch_Ball/z_eff_ss_solder_srch_ball.c +++ b/src/overlays/effects/ovl_Effect_Ss_Solder_Srch_Ball/z_eff_ss_solder_srch_ball.c @@ -4,6 +4,3 @@ #pragma GLOBAL_ASM("asm/non_matchings/overlays/effects/ovl_Effect_Ss_Solder_Srch_Ball/func_809AC130.s") #pragma GLOBAL_ASM("asm/non_matchings/overlays/effects/ovl_Effect_Ss_Solder_Srch_Ball/func_809AC1AC.s") - - - diff --git a/src/overlays/effects/ovl_Effect_Ss_Stick/z_effect_ss_stick.c b/src/overlays/effects/ovl_Effect_Ss_Stick/z_effect_ss_stick.c index 7648629ae6..1fc5e5b32f 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Stick/z_effect_ss_stick.c +++ b/src/overlays/effects/ovl_Effect_Ss_Stick/z_effect_ss_stick.c @@ -6,7 +6,3 @@ #pragma GLOBAL_ASM("asm/non_matchings/overlays/effects/ovl_Effect_Ss_Stick/func_809AC42C.s") #pragma GLOBAL_ASM("asm/non_matchings/overlays/effects/ovl_Effect_Ss_Stick/func_809AC604.s") - - - - diff --git a/src/overlays/effects/ovl_Effect_Ss_Stone1/z_effect_ss_stone1.c b/src/overlays/effects/ovl_Effect_Ss_Stone1/z_effect_ss_stone1.c index b2cdb6fa3a..04790b4279 100644 --- a/src/overlays/effects/ovl_Effect_Ss_Stone1/z_effect_ss_stone1.c +++ b/src/overlays/effects/ovl_Effect_Ss_Stone1/z_effect_ss_stone1.c @@ -6,7 +6,3 @@ #pragma GLOBAL_ASM("asm/non_matchings/overlays/effects/ovl_Effect_Ss_Stone1/func_809AC78C.s") #pragma GLOBAL_ASM("asm/non_matchings/overlays/effects/ovl_Effect_Ss_Stone1/func_809AC9C0.s") - - - - diff --git a/src/overlays/gamestates/ovl_file_choose/z_file_choose.c b/src/overlays/gamestates/ovl_file_choose/z_file_choose.c index eae5fd28b9..d17fb10b10 100644 --- a/src/overlays/gamestates/ovl_file_choose/z_file_choose.c +++ b/src/overlays/gamestates/ovl_file_choose/z_file_choose.c @@ -138,4 +138,6 @@ #pragma GLOBAL_ASM("asm/non_matchings/overlays/gamestates/ovl_file_choose/func_808113A8.s") +#pragma GLOBAL_ASM("asm/non_matchings/overlays/gamestates/ovl_file_choose/func_80811A18.s") + #pragma GLOBAL_ASM("asm/non_matchings/overlays/gamestates/ovl_file_choose/func_80811A20.s") diff --git a/src/overlays/gamestates/ovl_opening/z_opening.c b/src/overlays/gamestates/ovl_opening/z_opening.c index fa0e7e0484..61113886a6 100644 --- a/src/overlays/gamestates/ovl_opening/z_opening.c +++ b/src/overlays/gamestates/ovl_opening/z_opening.c @@ -2,41 +2,34 @@ * File: z_opening.c * Overlay: ovl_opening * Description: Initializes the game into the title screen -*/ + */ #include #include -static void Opening_SetNextGameState(OpeningContext* this) -{ +static void Opening_SetNextGameState(OpeningContext* this) { gSaveContext.game_mode = 1; this->state.running = false; gSaveContext.link_age = 0; func_800A82C8(); gSaveContext.cutscene_index = 0xFFF3; gSaveContext.scene_setup_index = 7; - this->state.init = func_800BCA64; this->state.size = sizeof(GlobalContext); + SET_NEXT_GAMESTATE(&this->state, func_800BCA64, GlobalContext); } -static void func_80803C5C(OpeningContext* this) -{ - +static void func_80803C5C(OpeningContext* this) { } -static void Opening_Update(OpeningContext* this) -{ +static void Opening_Update(OpeningContext* this) { func_80095248(this->state.gfxCtx, 0, 0, 0); Opening_SetNextGameState(this); func_80803C5C(this); } -static void Opening_Destroy(OpeningContext* this) -{ - +void Opening_Destroy(OpeningContext* this) { } -void Opening_Init(OpeningContext* this) -{ +void Opening_Init(OpeningContext* this) { R_UPDATE_RATE = 1; Matrix_Init(&this->state); func_800AA278(&this->view, this->state.gfxCtx); diff --git a/src/overlays/gamestates/ovl_title/z_title.c b/src/overlays/gamestates/ovl_title/z_title.c index 4053f152bc..a6f58ef054 100644 --- a/src/overlays/gamestates/ovl_title/z_title.c +++ b/src/overlays/gamestates/ovl_title/z_title.c @@ -2,27 +2,186 @@ * File: z_title.c * Overlay: ovl_title * Description: Displays the Nintendo Logo -*/ + */ #include #include +#include -#pragma GLOBAL_ASM("asm/non_matchings/overlays/gamestates/ovl_title/func_80800000.s") +extern Gfx D_01002720[]; +extern u8 D_01001800[]; +extern u8 D_01000000[]; -void func_80800128(TitleContext* this) -{ - this->unk_1E1 = 1; +void Title_PrintBuildInfo(Gfx** gfxp) { + Gfx* g; + GfxPrint* printer; + + g = *gfxp; + g = func_8009411C(g); + printer = alloca(0x30); + GfxPrint_Ctor(printer); + GfxPrint_Open(printer, g); + GfxPrint_SetColor(printer, 0xFF, 0x9B, 0xFF, 0xFF); + GfxPrint_SetPos(printer, 9, 21); + GfxPrint_Printf(printer, "NOT MARIO CLUB VERSION"); + GfxPrint_SetColor(printer, 0xFF, 0xFF, 0xFF, 0xFF); + GfxPrint_SetPos(printer, 7, 23); + GfxPrint_Printf(printer, "[Creator:%s]", gBuildTeam); + GfxPrint_SetPos(printer, 7, 24); + GfxPrint_Printf(printer, "[Date:%s]", gBuildDate); + g = GfxPrint_Close(printer); + GfxPrint_Dtor(printer); + *gfxp = g; } -#pragma GLOBAL_ASM("asm/non_matchings/overlays/gamestates/ovl_title/func_80800134.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/gamestates/ovl_title/func_808001C8.s") - -#pragma GLOBAL_ASM("asm/non_matchings/overlays/gamestates/ovl_title/func_8080073C.s") - -void func_80800858(TitleContext* this) -{ - func_800A9AD0(this, &this->unk_1D0); +// Note: In other rom versions this function also updates unk_1D4, coverAlpha, addAlpha, visibleDuration to calculate +// the fade-in/fade-out + the duration of the n64 logo animation +void Title_Calc(TitleContext* this) { + this->exit = 1; } -#pragma GLOBAL_ASM("asm/non_matchings/overlays/gamestates/ovl_title/func_80800878.s") +void Title_InitView(TitleContext* this, f32 x, f32 y, f32 z) { + View* view; + Vec3f v1; + Vec3f v2; + Vec3f v3; + + view = &this->view; + v3.z = 0; + v3.x = 0; + v2.z = 0; + v2.y = 0; + v2.x = 0; + v1.x = x; + v1.y = y; + v1.z = z; + v3.y = 1.0; + + func_800AA460(view, 30.0f, 10.0f, 12800.0f); + func_800AA358(view, &v1, &v2, &v3); + func_800AAA50(view, 0xF); +} + +void Title_Draw(TitleContext* this) { + static s16 sTitleRotY = 0; + static u32 D_808009A4 = 0; + static Lights1 sTitleLights = gdSPDefLights1(0x64, 0x64, 0x64, 0xFF, 0xFF, 0xFF, 0x45, 0x45, 0x45); + + u16 y; + u16 idx; + char pad1[0x4]; + Vec3f v3; + Vec3f v1; + Vec3f v2; + char pad2[0x8]; + GraphicsContext* gfxCtx = this->state.gfxCtx; + Gfx* dispRefs[4]; + + Graph_OpenDisps(dispRefs, this->state.gfxCtx, "../z_title.c", 395); + + v3.x = 69; + v3.y = 69; + v3.z = 69; + v2.x = -4949.148; + v2.y = 4002.5417; + v1.x = 0; + v1.y = 0; + v1.z = 0; + v2.z = 1119.0837; + + func_8002EABC(&v1, &v2, &v3, this->state.gfxCtx); + gSPSetLights1(gfxCtx->polyOpa.p++, sTitleLights); + Title_InitView(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_RotateZYX(0, sTitleRotY, 0, MTXMODE_APPLY); + + gSPMatrix(gfxCtx->polyOpa.p++, Matrix_NewMtx(this->state.gfxCtx, "../z_title.c", 424), G_MTX_LOAD); + gSPDisplayList(gfxCtx->polyOpa.p++, &D_01002720); + func_800944C4(this->state.gfxCtx); + gDPPipeSync(gfxCtx->polyOpa.p++); + gDPSetCycleType(gfxCtx->polyOpa.p++, G_CYC_2CYCLE); + gDPSetRenderMode(gfxCtx->polyOpa.p++, G_RM_XLU_SURF2, G_RM_OPA_CI | CVG_DST_WRAP); + gDPSetCombineLERP(gfxCtx->polyOpa.p++, TEXEL1, PRIMITIVE, ENV_ALPHA, TEXEL0, 0, 0, 0, TEXEL0, PRIMITIVE, + ENVIRONMENT, COMBINED, ENVIRONMENT, COMBINED, 0, PRIMITIVE, 0); + gDPSetPrimColor(gfxCtx->polyOpa.p++, 0, 0, 170, 255, 255, 255); + gDPSetEnvColor(gfxCtx->polyOpa.p++, 0, 0, 255, 128); + + gDPLoadMultiBlock(gfxCtx->polyOpa.p++, &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(gfxCtx->polyOpa.p++, &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(gfxCtx->polyOpa.p++, 1, this->uls, (this->ult & 0x7F) - idx * 4, 0, 0); + gSPTextureRectangle(gfxCtx->polyOpa.p++, 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); + + sTitleRotY += 300; + + Graph_CloseDisps(dispRefs, this->state.gfxCtx, "../z_title.c", 483); +} + +void Title_Update(TitleContext* this) { + GraphicsContext* gfxCtx = this->state.gfxCtx; + u32 pad; + Gfx* dispRefs[4]; + u32 pad2; + Gfx* gfx[2]; + + Graph_OpenDisps(dispRefs, this->state.gfxCtx, "../z_title.c", 494); + + gSPSegment(gfxCtx->polyOpa.p++, 0, NULL); + gSPSegment(gfxCtx->polyOpa.p++, 1, this->staticSegment); + func_80095248(this->state.gfxCtx, 0, 0, 0); + Title_Calc(this); + Title_Draw(this); + if (D_8012DBC0) { + gfx[0] = gfxCtx->polyOpa.p; + Title_PrintBuildInfo(&gfx); + gfxCtx->polyOpa.p = gfx[0]; + } + if (this->exit) { + gSaveContext.seq_index = -1; + gSaveContext.night_sfx = -1; + gSaveContext.game_mode = 1; + this->state.running = false; + SET_NEXT_GAMESTATE(&this->state, Opening_Init, OpeningContext); + } + + Graph_CloseDisps(dispRefs, this->state.gfxCtx, "../z_title.c", 541); +} + +void Title_Destroy(TitleContext* this) { + func_800A9AD0(this, &this->sram); +} + +void Title_Init(TitleContext* this) { + u32 size = (u32)_nintendo_rogo_staticSegmentRomEnd - (u32)_nintendo_rogo_staticSegmentRomStart; + u32 pad; + + this->staticSegment = Game_Alloc(&this->state, size, "../z_title.c", 611); + osSyncPrintf("z_title.c\n"); + if (this->staticSegment == NULL) { + __assert("this->staticSegment != NULL", "../z_title.c", 614); + } + DmaMgr_SendRequest1(this->staticSegment, (u32)_nintendo_rogo_staticSegmentRomStart, size, "../z_title.c", 615); + R_UPDATE_RATE = 1; + Matrix_Init(&this->state); + func_800AA278(&this->view, this->state.gfxCtx); + this->state.main = Title_Update; + this->state.destroy = Title_Destroy; + this->exit = false; + gSaveContext.file_num = 0xFF; + func_800A9CD4(&this->state, &this->sram); + this->ult = 0; + this->unk_1D4 = 0x14; + this->coverAlpha = 0xFF; + this->addAlpha = -3; + this->visibleDuration = 0x3C; +} diff --git a/tools/asm_processor/build.py b/tools/asm_processor/build.py index b30f80104e..2c760dcf27 100644 --- a/tools/asm_processor/build.py +++ b/tools/asm_processor/build.py @@ -43,6 +43,7 @@ try: print() print(' '.join(shlex.quote(x) for x in compile_cmdline)) print() + sys.exit(55) # To keep the preprocessed file: # os._exit(1) diff --git a/tools/asmdiff-old.sh b/tools/asmdiff-old.sh deleted file mode 100644 index 66b986662b..0000000000 --- a/tools/asmdiff-old.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/bash - -OBJDUMP="${MIPS_BINUTILS_PREFIX}objdump -D -bbinary -mmips -EB" -OPTIONS="--start-address=$(($1)) --stop-address=$(($1 + $2))" -$OBJDUMP $OPTIONS baserom.z64 > baserom.dump -$OBJDUMP $OPTIONS zelda_ocarina_mq_dbg.z64 > zelda_ocarina_mq_dbg.dump -diff baserom.dump zelda_ocarina_mq_dbg.dump | colordiff diff --git a/tools/ido5.3_compiler/LICENSE.md b/tools/ido5.3_compiler/LICENSE.md old mode 100644 new mode 100755 diff --git a/tools/overlayhelpers/batchdisasm/symbols.txt b/tools/overlayhelpers/batchdisasm/symbols.txt index 06a0679c79..43c4b98bba 100644 --- a/tools/overlayhelpers/batchdisasm/symbols.txt +++ b/tools/overlayhelpers/batchdisasm/symbols.txt @@ -47,8 +47,8 @@ func_80033748 Actor_ChangeType func_80033940 Actor_SetTextWithPrefix func_80033EF8 Math_Rand_ZeroFloat func_80033F20 Math_Rand_CenteredFloat -func_80035260 Draw_DListOpa -func_80035324 Draw_DListXlu +func_80035260 Gfx_DrawDListOpa +func_80035324 Gfx_DrawDListXlu func_800353F4 Actor_FindNearby func_80035628 Actor_ApplyDamage func_80035B4C Flags_GetEventChkInf @@ -112,7 +112,7 @@ func_800A15C8 SkelAnime_Draw func_800A2000 SkelAnime_GetFrameCount func_800A457C SkelAnime_Init func_800A49FC SkelAnime_FrameUpdateMatrix -func_800A51A0 SkelAnime_ChangeAnimation +func_800A51A0 SkelAnime_ChangeAnim func_800C5484 Game_Alloc func_800C69CC Graph_Alloc func_800D0664 atan2s diff --git a/tools/regconvert.py b/tools/regconvert.py new file mode 100644 index 0000000000..fdc1090b67 --- /dev/null +++ b/tools/regconvert.py @@ -0,0 +1,23 @@ +#!/usr/bin/env python3 + +import argparse + +GROUP_SIZE = 0x60 +DATA_OFFSET = 0x14 + +REGISTER_NAMES = " SOPQMYDUIZCNKXcsiWAVHGmnBdkb" + +def get_reg_macro(offset): + reg = (offset - DATA_OFFSET) // 2 + group = reg // GROUP_SIZE + reg_in_group = reg % GROUP_SIZE + return "%cREG(%d)\n" % (REGISTER_NAMES[group], reg_in_group) + +def main(): + parser = argparse.ArgumentParser(description="Converts a GameInfo offset to a REG macro.") + parser.add_argument("offset", help="offset to GameInfo in hexadecimal") + args = parser.parse_args() + print(get_reg_macro(int(args.offset, 16))) + +if __name__ == "__main__": + main() diff --git a/undefined_syms.txt b/undefined_syms.txt index 85597f291b..4847e3b1a6 100644 --- a/undefined_syms.txt +++ b/undefined_syms.txt @@ -55,10 +55,10 @@ D_A4600024 = 0xA4600024; D_A4600028 = 0xA4600028; D_A460002C = 0xA460002C; D_A4600030 = 0xA4600030; -D_A4800000 = 0xA4800000; //SI_DRAM_ADDR_REG -D_A4800004 = 0xA4800004; //SI_PIF_ADDR_RD64B_REG -D_A4800010 = 0xA4800010; //SI_PIF_ADDR_WR64B_REG -D_A4800018 = 0xA4800018; //SI_STATUS_REG +D_A4800000 = 0xA4800000; // SI_DRAM_ADDR_REG +D_A4800004 = 0xA4800004; // SI_PIF_ADDR_RD64B_REG +D_A4800010 = 0xA4800010; // SI_PIF_ADDR_WR64B_REG +D_A4800018 = 0xA4800018; // SI_STATUS_REG // segment addresses D_02000000 = 0x02000000; @@ -140,8 +140,8 @@ D_0703811C = 0x0703811C; D_080895C0 = 0x080895C0; // z_en_tubo_trap -DL_TUBO = 0x05017870; -DL_SHARD = 0x05017A60; +D_05017870 = 0x05017870; +D_05017A60 = 0x05017A60; // z_en_vase DL_VASE = 0x06000000; @@ -149,6 +149,17 @@ DL_VASE = 0x06000000; // z_door_toki DOOR_TOKI_COLLISION_DATA = 0x06007888; +// z_bg_spot09_obj +D_06008010 = 0x06008010; + +// z_bg_spot12_gate +D_06001080 = 0x06001080; +D_060011EC = 0x060011EC; + +// z_bg_spot12_saku +D_06002260 = 0x06002260; +D_0600238C = 0x0600238C; + // z_bg_spot18_futa DL_SPOT18_FUTA = 0x06000368; DL_SPOT18_FUTA2 = 0x06000150; @@ -205,7 +216,7 @@ D_060074EC = 0x060074EC; D_060038FC = 0x060038FC; D_06002590 = 0x06002590; -//z_en_ms +// z_en_ms D_060005EC = 0x060005EC; D_06003DC0 = 0x06003DC0; @@ -239,6 +250,10 @@ D_06000B70 = 0x06000B70; // z_effect_ss_extra D_06000DC0 = 0x06000DC0; +// z_bg_gate_shutter +D_06001CD0 = 0x06001CD0; +D_06001DA8 = 0x06001DA8; + // z_bg_gjyo_bridge D_06000600 = 0x06000600; D_06000DB8 = 0x06000DB8; @@ -254,6 +269,9 @@ D_060003C0 = 0x060003C0; D_060030A0 = 0x060030A0; D_06003158 = 0x06003158; +// z_bg_haka_megane +D_06001250 = 0x06001250; + // z_bg_haka_meganebg D_06005334 = 0x06005334; D_06009168 = 0x06009168; @@ -275,6 +293,7 @@ D_01AA3DC0 = 0x01AA3DC0; D_01AA1000 = 0x01AA1000; D_01002720 = 0x01002720; D_01001800 = 0x01001800; +D_01000000 = 0x01000000; // z_shot_sun D_02007020 = 0x02007020; @@ -282,6 +301,9 @@ D_02007020 = 0x02007020; // z_effect_ss_g_splash D_04027DF0 = 0x04027DF0; +// z_demo_geff +D_06000EA0 = 0x06000EA0; + // z_demo_go D_060029A8 = 0x060029A8; D_06004930 = 0x06004930; @@ -309,6 +331,26 @@ D_06008604 = 0x06008604; D_06001420 = 0x06001420; D_06009A90 = 0x06009A90; +// z_en_tk +D_04051DB0 = 0x04051DB0; +D_040521B0 = 0x040521B0; +D_040525B0 = 0x040525B0; +D_040529B0 = 0x040529B0; +D_04052DB0 = 0x04052DB0; +D_040531B0 = 0x040531B0; +D_040535B0 = 0x040535B0; +D_040539B0 = 0x040539B0; +D_06001144 = 0x06001144; +D_06001FA8 = 0x06001FA8; +D_06002F84 = 0x06002F84; +D_06003B40 = 0x06003B40; +D_06004340 = 0x06004340; +D_06004B40 = 0x06004B40; +D_0600ACE0 = 0x0600ACE0; +D_0600BC90 = 0x0600BC90; +D_0600BCA0 = 0x0600BCA0; +D_0600BE40 = 0x0600BE40; + // z_arms_hook D_0602B288 = 0x0602B288; D_0602AFF0 = 0x0602AFF0; @@ -373,6 +415,19 @@ D_060006D0 = 0x060006D0; D_06000000 = 0x06000000; D_06000350 = 0x06000350; +// z_en_ru2 +D_060004CC = 0x060004CC; +D_06000F20 = 0x06000F20; +D_060022E0 = 0x060022E0; +D_06002AE0 = 0x06002AE0; +D_0600C700 = 0x0600C700; +D_0600D3DC = 0x0600D3DC; +D_0600DCAC = 0x0600DCAC; +D_06000DE8 = 0x06000DE8; +D_0600E630 = 0x0600E630; +D_0600F03C = 0x0600F03C; +D_0600F8B8 = 0x0600F8B8; + // z_bg_mjin D_06000140 = 0x06000140; D_06000330 = 0x06000330; @@ -390,7 +445,41 @@ D_06009244 = 0x06009244; D_060041F4 = 0x060041F4; D_0600A054 = 0x0600A054; D_06008688 = 0x06008688; -D_04049210 = 0x04049210; + +// z_en_lightbox +D_06000B70 = 0x06000B70; +D_06001F10 = 0x06001F10; + +// z_en_dog +D_06007290 = 0x06007290; +D_06001368 = 0x06001368; +D_06000D78 = 0x06000D78; +D_06000278 = 0x06000278; + +// z_obj_bombiwa +D_060009E0 = 0x060009E0; + +// z_bg_toki_swd +D_06001BD0 = 0x06001BD0; + +// z_bg_zg +D_060011D4 = 0x060011D4; +D_06001080 = 0x06001080; + +// z_skelanime +link_animetion_segment = 0x07000000; + +// z_en_ds +D_06004768 = 0x06004768; +D_0600039C = 0x0600039C; + +// z_bg_spot05_soko +D_06000918 = 0x06000918; +D_060012C0 = 0x060012C0; + +// z_obj_comb +D_050095B0 = 0x050095B0; +D_05009940 = 0x05009940; // z_bg_hidan_firewall D_0600DA80 = 0x0600DA80;